diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
index ed440a0c5cc..77dc75fd567 100644
--- a/.github/CODEOWNERS
+++ b/.github/CODEOWNERS
@@ -20,7 +20,8 @@
 /TRIAGE.md @chipkent @rcaudy
 /licenses @chipkent @rcaudy
 /docker @devinrsmith @jcferretti @rcaudy
-/engine/function/ @chipkent @kosak @rcaudy
-/py @chipkent @jmao-denver @rcaudy
-/R @chipkent @alexpeters1208 @rcaudy
-*.proto @devinrsmith @nbauernfeind @niloc132 @rcaudy
+/engine/function/ @chipkent @kosak @rcaudy @cpwright
+/py @chipkent @jmao-denver @rcaudy @cpwright
+/R @chipkent @rcaudy @cpwright
+*.proto @devinrsmith @nbauernfeind @niloc132 @rcaudy @cpwright
+*.gwt.xml @niloc132 @rcaudy @nbauernfeind @cpwright
diff --git a/.github/dependabot.yml b/.github/dependabot.yml
index 5ace4600a1f..425314d8db0 100644
--- a/.github/dependabot.yml
+++ b/.github/dependabot.yml
@@ -2,5 +2,29 @@ version: 2
 updates:
   - package-ecosystem: "github-actions"
     directory: "/"
+    open-pull-requests-limit: 99
     schedule:
       interval: "weekly"
+    commit-message:
+      prefix: "chore(github-actions)"
+    labels:
+      - "NoDocumentationNeeded"
+      - "NoReleaseNotesNeeded"
+      - "version-bump"
+    assignees:
+      - "devinrsmith"
+      - "stanbrub"
+  - package-ecosystem: "gradle"
+    directory: "/"
+    open-pull-requests-limit: 99
+    schedule:
+      interval: "weekly"
+    commit-message:
+      prefix: "chore(gradle)"
+    labels:
+      - "NoDocumentationNeeded"
+      - "NoReleaseNotesNeeded"
+      - "version-bump"
+    assignees:
+      - "devinrsmith"
+      - "rcaudy"
diff --git a/.github/scripts/gradle-properties.sh b/.github/scripts/gradle-properties.sh
index 88f00dce804..5a468670ef0 100755
--- a/.github/scripts/gradle-properties.sh
+++ b/.github/scripts/gradle-properties.sh
@@ -39,6 +39,10 @@ JAVA_INSTALL_PATHS="${JAVA_INSTALL_PATHS}${JAVA_HOME_20_X64:+$JAVA_HOME_20_X64,}
 JAVA_INSTALL_PATHS="${JAVA_INSTALL_PATHS}${JAVA_HOME_21_X64:+$JAVA_HOME_21_X64,}"
 JAVA_INSTALL_PATHS="${JAVA_INSTALL_PATHS}${JAVA_HOME_22_X64:+$JAVA_HOME_22_X64,}"
 JAVA_INSTALL_PATHS="${JAVA_INSTALL_PATHS}${JAVA_HOME_23_X64:+$JAVA_HOME_23_X64,}"
+JAVA_INSTALL_PATHS="${JAVA_INSTALL_PATHS}${JAVA_HOME_24_X64:+$JAVA_HOME_24_X64,}"
+JAVA_INSTALL_PATHS="${JAVA_INSTALL_PATHS}${JAVA_HOME_25_X64:+$JAVA_HOME_25_X64,}"
+JAVA_INSTALL_PATHS="${JAVA_INSTALL_PATHS}${JAVA_HOME_26_X64:+$JAVA_HOME_26_X64,}"
+JAVA_INSTALL_PATHS="${JAVA_INSTALL_PATHS}${JAVA_HOME_27_X64:+$JAVA_HOME_27_X64,}"
 
 # Our CI JDKs should be pre-provisioned and invoked correctly,
 # we shouldn't rely on gradle for any of this logic.
diff --git a/.github/workflows/build-ci.yml b/.github/workflows/build-ci.yml
index 3c250fcfc54..a8eecea3f1f 100644
--- a/.github/workflows/build-ci.yml
+++ b/.github/workflows/build-ci.yml
@@ -29,6 +29,9 @@ jobs:
           distribution: 'temurin'
           java-version: '17'
 
+      - name: Setup Gradle
+        uses: gradle/actions/setup-gradle@v4
+
       - name: Set JAVA_HOME
         run: echo "JAVA_HOME=${{ steps.setup-java-11.outputs.path }}" >> $GITHUB_ENV
 
@@ -88,11 +91,7 @@ jobs:
           password: ${{ secrets.GITHUB_TOKEN }}
 
       - name: Create Dockerfile and context
-        uses: burrunan/gradle-cache-action@v1
-        with:
-          job-id: build-server
-          arguments: --scan outputVersion docker-server-slim:prepareDocker docker-server:prepareDockerAll
-          gradle-version: wrapper
+        run: ./gradlew --scan outputVersion docker-server-slim:prepareDocker docker-server:prepareDockerAll
 
       - name: Get Deephaven Version
         id: deephaven_version
@@ -103,7 +102,7 @@ jobs:
       # https://github.com/docker/build-push-action/blob/master/docs/advanced/cache.md#github-cache
       # https://github.com/docker/buildx/pull/535
       - name: Docker build server
-        uses: docker/build-push-action@v5
+        uses: docker/build-push-action@v6
         with:
           build-args: |
             BASE=deephaven/server-base:local-build
@@ -116,7 +115,7 @@ jobs:
 
       # Note: server-slim does not need BASE/SERVER build-args like the other server images
       - name: Docker build server slim
-        uses: docker/build-push-action@v5
+        uses: docker/build-push-action@v6
         with:
           build-args: |
             DEEPHAVEN_VERSION=${{ steps.deephaven_version.outputs.deephaven_version }}
@@ -158,6 +157,9 @@ jobs:
           distribution: 'temurin'
           java-version: '11'
 
+      - name: Setup Gradle
+        uses: gradle/actions/setup-gradle@v4
+
       - name: Set JAVA_HOME
         run: echo "JAVA_HOME=${{ steps.setup-java-11.outputs.path }}" >> $GITHUB_ENV
 
@@ -182,11 +184,7 @@ jobs:
           password: ${{ secrets.GITHUB_TOKEN }}
 
       - name: Create Dockerfile and context
-        uses: burrunan/gradle-cache-action@v1
-        with:
-          job-id: build-web
-          arguments: --scan outputVersion docker-web-plugin-packager:prepareDocker
-          gradle-version: wrapper
+        run: ./gradlew --scan outputVersion docker-web-plugin-packager:prepareDocker
 
       - name: Get Deephaven Version
         id: deephaven_version
@@ -194,7 +192,7 @@ jobs:
           echo "deephaven_version=$(cat build/version)" >> $GITHUB_OUTPUT
 
       - name: Docker build
-        uses: docker/build-push-action@v5
+        uses: docker/build-push-action@v6
         with:
           build-args: |
             DEEPHAVEN_VERSION=${{ steps.deephaven_version.outputs.deephaven_version }}
diff --git a/.github/workflows/check-ci.yml b/.github/workflows/check-ci.yml
index 56485ce65bb..37b1592322a 100644
--- a/.github/workflows/check-ci.yml
+++ b/.github/workflows/check-ci.yml
@@ -33,6 +33,9 @@ jobs:
           distribution: 'temurin'
           java-version: '17'
 
+      - name: Setup Gradle
+        uses: gradle/actions/setup-gradle@v4
+
       - name: Set JAVA_HOME
         run: echo "JAVA_HOME=${{ steps.setup-java-11.outputs.path }}" >> $GITHUB_ENV
 
@@ -42,11 +45,7 @@ jobs:
           cat gradle.properties
 
       - name: Check
-        uses: burrunan/gradle-cache-action@v1
-        with:
-          job-id: checks
-          arguments: --scan --continue check
-          gradle-version: wrapper
+        run: ./gradlew --scan --continue check
 
       - name: Upload Test Results
         uses: actions/upload-artifact@v4
diff --git a/.github/workflows/cla.yml b/.github/workflows/cla.yml
index d337a5782cf..1cf714dca75 100644
--- a/.github/workflows/cla.yml
+++ b/.github/workflows/cla.yml
@@ -21,7 +21,7 @@ jobs:
     steps:
       - name: "CLA Assistant"
         if: (github.event.comment.body == 'recheck' || github.event.comment.body == 'I have read the CLA Document and I hereby sign the CLA') || github.event_name == 'pull_request_target'
-        uses: cla-assistant/github-action@v2.4.0
+        uses: cla-assistant/github-action@v2.6.1
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
           PERSONAL_ACCESS_TOKEN : ${{ secrets.CLA_PERSONAL_ACCESS_TOKEN }}
diff --git a/.github/workflows/conventional-pr-check.yml b/.github/workflows/conventional-pr-check.yml
new file mode 100644
index 00000000000..8eb4be6bda7
--- /dev/null
+++ b/.github/workflows/conventional-pr-check.yml
@@ -0,0 +1,40 @@
+name: 'Conventional PR'
+
+on:
+  pull_request_target:
+    types:
+      - opened
+      - edited
+      - synchronize
+
+jobs:
+  pr-check:
+    runs-on: ubuntu-22.04
+    steps:
+      - uses: amannn/action-semantic-pull-request@v5
+        id: lint_pr_title
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+
+      - uses: marocchino/sticky-pull-request-comment@v2
+        # When the previous steps fails, the workflow would stop. By adding this
+        # condition you can continue the execution with the populated error message.
+        if: always() && (steps.lint_pr_title.outputs.error_message != null)
+        with:
+          header: pr-title-lint-error
+          message: |
+            Pull Request titles must follow the [Conventional Commits specification](https://www.conventionalcommits.org/en/v1.0.0/).
+            Breaking changes that are expected to impact users must include "BREAKING CHANGE: <description>" at the end of the PR description. 
+
+            Details:
+
+            ```
+            ${{ steps.lint_pr_title.outputs.error_message }}
+            ```
+
+      # Delete a previous comment when the issue has been resolved
+      - if: ${{ steps.lint_pr_title.outputs.error_message == null }}
+        uses: marocchino/sticky-pull-request-comment@v2
+        with:
+          header: pr-title-lint-error
+          delete: true
diff --git a/.github/workflows/create-docs-issues.yml b/.github/workflows/create-docs-issues.yml
index 77f52569deb..6e6fc938ea5 100644
--- a/.github/workflows/create-docs-issues.yml
+++ b/.github/workflows/create-docs-issues.yml
@@ -26,7 +26,7 @@ jobs:
             await script({github, context});
 
       - name: Slack Failure Message
-        uses: slackapi/slack-github-action@v1.26.0
+        uses: slackapi/slack-github-action@v1.27.0
         id: slack-failure-message
         if: failure() && github.ref == 'refs/heads/main' && github.repository_owner == 'deephaven'
         env:
diff --git a/.github/workflows/dependency-submission.yml b/.github/workflows/dependency-submission.yml
index 634846a22af..9d217aa7743 100644
--- a/.github/workflows/dependency-submission.yml
+++ b/.github/workflows/dependency-submission.yml
@@ -30,7 +30,7 @@ jobs:
           cat gradle.properties
 
       - name: Generate and submit dependency graph
-        uses: gradle/actions/dependency-submission@v3
+        uses: gradle/actions/dependency-submission@v4
         env:
           # Dependencies derived from :server-jetty-app runtimeClasspath get a "runtime" scope and everything else gets
           # a "development" scope. Ideally, gradle would be able to pass along the finer dependency details (for
diff --git a/.github/workflows/docs-ci.yml b/.github/workflows/docs-ci.yml
index cafe7d6c53e..34e75095638 100644
--- a/.github/workflows/docs-ci.yml
+++ b/.github/workflows/docs-ci.yml
@@ -16,7 +16,7 @@ jobs:
           cd tmp-deephaven-core-v2/${{ github.ref_name }}/
           mkdir -p javadoc pydoc client-api
           cd client-api
-          mkdir -p javascript python cpp-examples cpp r
+          mkdir -p javascript python cpp-examples cpp r protobuf
           
       - name: Deploy Directories
         if: ${{ github.event_name == 'push' }}
@@ -31,7 +31,7 @@ jobs:
           remote_key: ${{ secrets.DEEPHAVEN_CORE_SSH_KEY }}
   symlink:
     if: ${{ github.event_name == 'push' && startsWith(github.ref, 'refs/heads/release/v') }}
-    needs: [javadoc, typedoc, pydoc, cppdoc, rdoc]
+    needs: [javadoc, typedoc, pydoc, cppdoc, rdoc, protodoc]
     runs-on: ubuntu-22.04
     steps:
       - name: Setup Git
@@ -84,6 +84,9 @@ jobs:
           distribution: 'temurin'
           java-version: '17'
 
+      - name: Setup Gradle
+        uses: gradle/actions/setup-gradle@v4
+
       - name: Set JAVA_HOME
         run: echo "JAVA_HOME=${{ steps.setup-java-11.outputs.path }}" >> $GITHUB_ENV
 
@@ -93,12 +96,8 @@ jobs:
           cat gradle.properties
 
       - name: All Javadoc
-        uses: burrunan/gradle-cache-action@v1
-        with:
-          job-id: allJavadoc
-          arguments: --scan outputVersion combined-javadoc:allJavadoc
-          gradle-version: wrapper
-          
+        run: ./gradlew --scan outputVersion combined-javadoc:allJavadoc
+
       - name: Get Deephaven Version
         id: dhc-version
         run: echo "version=$(cat build/version)" >> $GITHUB_OUTPUT
@@ -147,6 +146,9 @@ jobs:
           distribution: 'temurin'
           java-version: '17'
 
+      - name: Setup Gradle
+        uses: gradle/actions/setup-gradle@v4
+
       - name: Set JAVA_HOME
         run: echo "JAVA_HOME=${{ steps.setup-java-11.outputs.path }}" >> $GITHUB_ENV
 
@@ -156,12 +158,8 @@ jobs:
           cat gradle.properties
 
       - name: Run typedoc on JS API
-        uses: burrunan/gradle-cache-action@v1
-        with:
-          job-id: typedoc
-          arguments: --scan outputVersion :web-client-api:types:typedoc
-          gradle-version: wrapper
-          
+        run: ./gradlew --scan outputVersion :web-client-api:types:typedoc
+
       - name: Get Deephaven Version
         id: dhc-version
         run: echo "version=$(cat build/version)" >> $GITHUB_OUTPUT
@@ -210,6 +208,9 @@ jobs:
           distribution: 'temurin'
           java-version: '17'
 
+      - name: Setup Gradle
+        uses: gradle/actions/setup-gradle@v4
+
       - name: Set JAVA_HOME
         run: echo "JAVA_HOME=${{ steps.setup-java-11.outputs.path }}" >> $GITHUB_ENV
 
@@ -219,12 +220,8 @@ jobs:
           cat gradle.properties
 
       - name: Generate Python Docs
-        uses: burrunan/gradle-cache-action@v1
-        with:
-          job-id: pythonDocs
-          arguments: --scan outputVersion sphinx:pythonDocs sphinx:pydeephavenDocs
-          gradle-version: wrapper
- 
+        run: ./gradlew --scan outputVersion sphinx:pythonDocs sphinx:pydeephavenDocs
+
       - name: Get Deephaven Version
         id: dhc-version
         run: echo "version=$(cat build/version)" >> $GITHUB_OUTPUT
@@ -293,6 +290,9 @@ jobs:
           distribution: 'temurin'
           java-version: '11'
 
+      - name: Setup Gradle
+        uses: gradle/actions/setup-gradle@v4
+
       - name: Set JAVA_HOME
         run: echo "JAVA_HOME=${{ steps.setup-java-11.outputs.path }}" >> $GITHUB_ENV
 
@@ -302,12 +302,8 @@ jobs:
           cat gradle.properties
 
       - name: Generate C++ Docs
-        uses: burrunan/gradle-cache-action@v1
-        with:
-          job-id: cppDocs
-          arguments: --scan outputVersion sphinx:cppClientDocs sphinx:cppExamplesDocs
-          gradle-version: wrapper
-         
+        run: ./gradlew --scan outputVersion sphinx:cppClientDocs sphinx:cppExamplesDocs
+
       - name: Get Deephaven Version
         id: dhc-version
         run: echo "version=$(cat build/version)" >> $GITHUB_OUTPUT
@@ -368,6 +364,9 @@ jobs:
           distribution: 'temurin'
           java-version: '11'
 
+      - name: Setup Gradle
+        uses: gradle/actions/setup-gradle@v4
+
       - name: Set JAVA_HOME
         run: echo "JAVA_HOME=${{ steps.setup-java-11.outputs.path }}" >> $GITHUB_ENV
 
@@ -377,12 +376,8 @@ jobs:
           cat gradle.properties
 
       - name: Generate R Docs
-        uses: burrunan/gradle-cache-action@v1
-        with:
-          job-id: rDocs
-          arguments: --scan outputVersion R:rClientSite
-          gradle-version: wrapper
-          
+        run: ./gradlew --scan outputVersion R:rClientSite
+
       - name: Get Deephaven Version
         id: dhc-version
         run: echo "version=$(cat build/version)" >> $GITHUB_OUTPUT
@@ -409,3 +404,57 @@ jobs:
       - name: Upload JVM Error Logs
         uses: actions/upload-artifact@v4
         if: failure()
+
+  protodoc:
+    needs: [makedirs]
+    runs-on: ubuntu-22.04
+    concurrency:
+      group: protodoc-${{ github.workflow }}-${{ github.ref }}
+      cancel-in-progress: ${{ github.ref != 'refs/heads/main' }}
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v4
+
+      - name: Setup JDK 11
+        id: setup-java-11
+        uses: actions/setup-java@v4
+        with:
+          distribution: 'temurin'
+          java-version: '11'
+
+      - name: Setup Gradle
+        uses: gradle/actions/setup-gradle@v4
+
+      - name: Set JAVA_HOME
+        run: echo "JAVA_HOME=${{ steps.setup-java-11.outputs.path }}" >> $GITHUB_ENV
+
+      - name: Setup gradle properties
+        run: |
+          .github/scripts/gradle-properties.sh >> gradle.properties
+          cat gradle.properties
+
+      - name: Generate Protobuf Docs
+        run: ./gradlew --scan outputVersion :proto:proto-backplane-grpc:generateProtobuf
+
+      - name: Get Deephaven Version
+        id: dhc-version
+        run: echo "version=$(cat build/version)" >> $GITHUB_OUTPUT
+
+      - name: Upload Protobuf Docs
+        if: ${{ github.event_name == 'push' }}
+        uses: actions/upload-artifact@v4
+        with:
+          name: protobuf-docs-${{ steps.dhc-version.outputs.version }}
+          path: 'proto/proto-backplane-grpc/build/generated/source/proto/main/proto-doc/single-html/index.html'
+
+      - name: Deploy Protobuf Docs
+        if: ${{ github.event_name == 'push' }}
+        uses: burnett01/rsync-deployments@5.2
+        with:
+          switches: -rlptDvz --delete
+          path: proto/proto-backplane-grpc/build/generated/source/proto/main/proto-doc/single-html/index.html
+          remote_path: deephaven-core-v2/${{ github.ref_name }}/client-api/protobuf/
+          remote_host: ${{ secrets.DOCS_HOST }}
+          remote_port: ${{ secrets.DOCS_PORT }}
+          remote_user: ${{ secrets.DOCS_USER }}
+          remote_key: ${{ secrets.DEEPHAVEN_CORE_SSH_KEY }}
\ No newline at end of file
diff --git a/.github/workflows/links.yml b/.github/workflows/links.yml
new file mode 100644
index 00000000000..3757953eb31
--- /dev/null
+++ b/.github/workflows/links.yml
@@ -0,0 +1,28 @@
+name: Links
+
+on:
+  repository_dispatch:
+  workflow_dispatch:
+  schedule:
+    - cron: "00 18 * * *"
+
+jobs:
+  linkChecker:
+    runs-on: ubuntu-latest
+    permissions:
+      issues: write
+    if: ${{ github.repository_owner == 'deephaven' }}
+    steps:
+      - uses: actions/checkout@v4
+
+      - name: Link Checker
+        id: lychee
+        uses: lycheeverse/lychee-action@v2
+
+      - name: Create Issue From File
+        if: env.lychee_exit_code != 0
+        uses: peter-evans/create-issue-from-file@v5
+        with:
+          title: Link Checker Report
+          content-filepath: ./lychee/out.md
+          labels: report, automated issue
diff --git a/.github/workflows/nightly-check-ci.yml b/.github/workflows/nightly-check-ci.yml
index c306f5bf42e..e433c63df30 100644
--- a/.github/workflows/nightly-check-ci.yml
+++ b/.github/workflows/nightly-check-ci.yml
@@ -7,7 +7,7 @@ on:
     # 2AM EST == 6AM UTC
     - cron:  '0 6 * * *'
   push:
-    branches: [ 'nightly/**', 'release/v*' ]
+    branches: [ 'nightly/**', 'release/v*', 'dependabot/**' ]
 
 jobs:
   nightly:
@@ -15,7 +15,7 @@ jobs:
       fail-fast: false
       matrix:
         gradle-task: ['check', 'testSerial', 'testParallel', 'testOutOfBand']
-        test-jvm-version: ['11', '17', '21', '22']
+        test-jvm-version: ['11', '17', '21', '23']
     if: ${{ github.repository_owner == 'deephaven' || github.event_name != 'schedule' }}
     runs-on: ubuntu-22.04
     concurrency:
@@ -48,12 +48,15 @@ jobs:
           distribution: 'temurin'
           java-version: '21'
 
-      - name: Setup JDK 22
-        id: setup-java-22
+      - name: Setup JDK 23
+        id: setup-java-23
         uses: actions/setup-java@v4
         with:
           distribution: 'temurin'
-          java-version: '22'
+          java-version: '23'
+
+      - name: Setup Gradle
+        uses: gradle/actions/setup-gradle@v4
 
       - name: Set JAVA_HOME
         run: echo "JAVA_HOME=${{ steps.setup-java-11.outputs.path }}" >> $GITHUB_ENV
@@ -64,11 +67,7 @@ jobs:
           cat gradle.properties
 
       - name: Run gradle ${{ matrix.gradle-task }} on java ${{ matrix.test-jvm-version }}
-        uses: burrunan/gradle-cache-action@v1
-        with:
-          job-id: gradle-run
-          arguments: --scan --continue --rerun-tasks ${{ matrix.gradle-task }} -PtestRuntimeVersion=${{ matrix.test-jvm-version }}
-          gradle-version: wrapper
+        run: ./gradlew --scan --continue --rerun-tasks ${{ matrix.gradle-task }} -PtestRuntimeVersion=${{ matrix.test-jvm-version }}
 
       - name: Upload Test Results
         uses: actions/upload-artifact@v4
@@ -91,7 +90,7 @@ jobs:
 
       - name: Publish Test Results
         uses: scacap/action-surefire-report@v1
-        if: ${{ github.repository_owner == 'deephaven' }}
+        if: ${{ github.repository_owner == 'deephaven' && github.ref == 'refs/heads/main' }}
         env:
           NODE_OPTIONS: '--max_old_space_size=4096'
         with:
@@ -101,9 +100,9 @@ jobs:
           report_paths: '**/build/test-results/*/TEST-*.xml'
 
       - name: Slack Nightly Failure
-        uses: slackapi/slack-github-action@v1.26.0
+        uses: slackapi/slack-github-action@v1.27.0
         id: slack-nightly-failure
-        if: ${{ failure() && github.repository_owner == 'deephaven' }}
+        if: ${{ failure() && github.repository_owner == 'deephaven' && github.ref == 'refs/heads/main' }}
         with:
           payload: |
             {
diff --git a/.github/workflows/nightly-image-check.yml b/.github/workflows/nightly-image-check.yml
index 310dacb144d..e2f75b3a15f 100644
--- a/.github/workflows/nightly-image-check.yml
+++ b/.github/workflows/nightly-image-check.yml
@@ -20,6 +20,9 @@ jobs:
           distribution: 'temurin'
           java-version: '11'
 
+      - name: Setup Gradle
+        uses: gradle/actions/setup-gradle@v4
+
       - name: Set JAVA_HOME
         run: echo "JAVA_HOME=${{ steps.setup-java-11.outputs.path }}" >> $GITHUB_ENV
 
@@ -29,14 +32,10 @@ jobs:
           cat gradle.properties
 
       - name: Run gradle
-        uses: burrunan/gradle-cache-action@v1
-        with:
-          job-id: image-compare
-          arguments: --continue pullImage compareImage
-          gradle-version: wrapper
+        run: ./gradlew --continue pullImage compareImage
 
       - name: Notify Slack
-        uses: slackapi/slack-github-action@v1.26.0
+        uses: slackapi/slack-github-action@v1.27.0
         id: notify-slack
         if: ${{ failure() }}
         env:
diff --git a/.github/workflows/nightly-publish-ci.yml b/.github/workflows/nightly-publish-ci.yml
new file mode 100644
index 00000000000..927c0b2009a
--- /dev/null
+++ b/.github/workflows/nightly-publish-ci.yml
@@ -0,0 +1,67 @@
+name: Nightly Publish CI
+
+on:
+  schedule:
+    # 1AM EST == 5AM UTC
+    - cron:  '0 5 * * *'
+
+concurrency:
+  group: ${{ github.workflow }}-${{ github.ref }}
+  cancel-in-progress: false
+
+jobs:
+  nightly-publish:
+    runs-on: ubuntu-24.04
+    if: ${{ github.repository_owner == 'deephaven' }}
+
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v4
+
+      - name: Setup JDK 11
+        id: setup-java-11
+        uses: actions/setup-java@v4
+        with:
+          distribution: 'temurin'
+          java-version: '11'
+
+      - name: Setup JDK 17
+        id: setup-java-17
+        uses: actions/setup-java@v4
+        with:
+          distribution: 'temurin'
+          java-version: '17'
+
+      - name: Setup Gradle
+        uses: gradle/actions/setup-gradle@v4
+
+      - name: Set JAVA_HOME
+        run: echo "JAVA_HOME=${{ steps.setup-java-11.outputs.path }}" >> $GITHUB_ENV
+
+      - name: Setup gradle properties
+        run: |
+          .github/scripts/gradle-properties.sh >> gradle.properties
+          cat gradle.properties
+
+      - name: Publish to OSSRH snapshots repository
+        # We are not worried here about using --no-parallel (as we are with release publishing), since publishing
+        # snapshots does not even create staging repositories.
+        run: ./gradlew publish
+        env:
+          ORG_GRADLE_PROJECT_ossrhUsername: ${{ secrets.SONATYPE_USERNAME }}
+          ORG_GRADLE_PROJECT_ossrhPassword: ${{ secrets.SONATYPE_PASSWORD }}
+          ORG_GRADLE_PROJECT_signingKey: ${{ secrets.CI_AT_DEEPHAVEN_KEY }}
+          ORG_GRADLE_PROJECT_signingPassword: ${{ secrets.CI_AT_DEEPHAVEN_PASSWORD }}
+          ORG_GRADLE_PROJECT_signingRequired: true
+
+      - name: Slack Nightly Failure
+        uses: slackapi/slack-github-action@v1.27.0
+        id: slack-nightly-failure
+        if: failure()
+        with:
+          payload: |
+            {
+              "slack_message": "Nightly publish failure @ ${{ github.head_ref }} ${{ github.sha }}"
+            }
+        env:
+          SLACK_WEBHOOK_URL: ${{ secrets.SLACK_WEBHOOK_NIGHTLY_FAILURE }}
diff --git a/.github/workflows/publish-ci.yml b/.github/workflows/publish-ci.yml
index 53dc8335ad0..65c6ef8b60d 100644
--- a/.github/workflows/publish-ci.yml
+++ b/.github/workflows/publish-ci.yml
@@ -33,6 +33,9 @@ jobs:
           distribution: 'temurin'
           java-version: '17'
 
+      - name: Setup Gradle
+        uses: gradle/actions/setup-gradle@v4
+
       - name: Set JAVA_HOME
         run: echo "JAVA_HOME=${{ steps.setup-java-11.outputs.path }}" >> $GITHUB_ENV
 
@@ -51,20 +54,12 @@ jobs:
 
       - name: Build all artifacts, publish to Maven Local
         if: ${{ !startsWith(github.ref, 'refs/heads/release/v') }}
-        uses: burrunan/gradle-cache-action@v1
-        with:
-          job-id: publish-local
-          arguments: server-netty-app:build server-jetty-app:build py-server:build py-embedded-server:build py-client:build py-client-ticking:build web-client-api:types:build publishToMavenLocal
-          gradle-version: wrapper
+        run: ./gradlew server-netty-app:build server-jetty-app:build py-server:build py-embedded-server:build py-client:build py-client-ticking:build web-client-api:types:build publishToMavenLocal
 
       - name: Build all artifacts, publish to Sonatype for staging to Maven Central
         if: ${{ startsWith(github.ref, 'refs/heads/release/v') }}
-        uses: burrunan/gradle-cache-action@v1
-        with:
-          job-id: publish
-          # We need to be explicit here about no parallelism to ensure we don't create disjointed staging repositories.
-          arguments: --no-parallel server-netty-app:build server-jetty-app:build py-server:build py-embedded-server:build py-client:build py-client-ticking:build web-client-api:types:build publish
-          gradle-version: wrapper
+        # We need to be explicit here about no parallelism to ensure we don't create disjointed staging repositories.
+        run: ./gradlew --no-parallel server-netty-app:build server-jetty-app:build py-server:build py-embedded-server:build py-client:build py-client-ticking:build web-client-api:types:build publish
         env:
           ORG_GRADLE_PROJECT_ossrhUsername: ${{ secrets.SONATYPE_USERNAME }}
           ORG_GRADLE_PROJECT_ossrhPassword: ${{ secrets.SONATYPE_PASSWORD }}
diff --git a/.github/workflows/quick-ci.yml b/.github/workflows/quick-ci.yml
index 56c51ede52f..8416bf485c5 100644
--- a/.github/workflows/quick-ci.yml
+++ b/.github/workflows/quick-ci.yml
@@ -27,6 +27,9 @@ jobs:
           distribution: 'temurin'
           java-version: '11'
 
+      - name: Setup Gradle
+        uses: gradle/actions/setup-gradle@v4
+
       - name: Set JAVA_HOME
         run: echo "JAVA_HOME=${{ steps.setup-java-11.outputs.path }}" >> $GITHUB_ENV
 
@@ -36,12 +39,8 @@ jobs:
           cat gradle.properties
 
       - name: Quick Task
-        uses: burrunan/gradle-cache-action@v1
-        with:
-          job-id: quick-task
-          # Even though quick includes spotlessCheck, we want to make sure it runs first and fails ASAP for quick feedback
-          arguments: --scan spotlessCheck quick
-          gradle-version: wrapper
+        # Even though quick includes spotlessCheck, we want to make sure it runs first and fails ASAP for quick feedback
+        run: ./gradlew --scan spotlessCheck quick
 
       - name: Upload JVM Error Logs
         uses: actions/upload-artifact@v4
@@ -64,4 +63,4 @@ jobs:
         run: pip install vermin==1.6.0
 
       - name: Verify minimum version support
-        run: vermin -t=3.8 --no-tips --eval-annotations --violations py/server/deephaven py/client py/client-ticking py/embedded-server
+        run: vermin -t=3.8 --no-tips --eval-annotations --violations --feature fstring-self-doc --feature union-types py/server/deephaven py/client py/client-ticking py/embedded-server
diff --git a/.github/workflows/tag-base-images.yml b/.github/workflows/tag-base-images.yml
index 3ce799ed989..910391c0c00 100644
--- a/.github/workflows/tag-base-images.yml
+++ b/.github/workflows/tag-base-images.yml
@@ -29,9 +29,12 @@ jobs:
           distribution: 'temurin'
           java-version: '17'
 
+      - name: Setup Gradle
+        uses: gradle/actions/setup-gradle@v4
+
       - name: Setup Crane
         if: ${{ startsWith(github.ref, 'refs/heads/release/v') }}
-        uses: imjasonh/setup-crane@v0.3
+        uses: imjasonh/setup-crane@v0.4
 
       - name: Set JAVA_HOME
         run: echo "JAVA_HOME=${{ steps.setup-java-11.outputs.path }}" >> $GITHUB_ENV
@@ -50,11 +53,7 @@ jobs:
           password: ${{ secrets.GITHUB_TOKEN }}
 
       - name: Create Crane scripts
-        uses: burrunan/gradle-cache-action@v1
-        with:
-          job-id: crane-scripts
-          arguments: createCraneTagScript
-          gradle-version: wrapper
+        run: ./gradlew createCraneTagScript
 
       - name: Tag upstream images
         if: ${{ startsWith(github.ref, 'refs/heads/release/v') }}
diff --git a/.github/workflows/update-web.yml b/.github/workflows/update-web.yml
index be6a7357ab3..a467a16d65e 100644
--- a/.github/workflows/update-web.yml
+++ b/.github/workflows/update-web.yml
@@ -33,7 +33,7 @@ jobs:
           sed -i "s/^ARG CHART_VERSION=.*/ARG CHART_VERSION=$CHART_VERSION/" ./web/client-ui/Dockerfile
           sed -i "s/^ARG WIDGET_VERSION=.*/ARG WIDGET_VERSION=$WIDGET_VERSION/" ./web/client-ui/Dockerfile
       - name: Create Pull Request
-        uses: peter-evans/create-pull-request@v6
+        uses: peter-evans/create-pull-request@v7
         env:
           WEB_VERSION: ${{steps.web_versions.outputs.WEB_VERSION}}
         with:
diff --git a/.lycheeignore b/.lycheeignore
new file mode 100644
index 00000000000..af1ffb5766d
--- /dev/null
+++ b/.lycheeignore
@@ -0,0 +1,7 @@
+http://localhost:
+https://localhost:
+https://docs.deephaven.io/
+https://10.0.1.50:8123/iris/connection.json
+https://deephaven.io/core/release/vX.Y.Z/javadoc
+https://github.com/deephaven/deephaven.io
+https://developer.mozilla.org/en-US/docs/Web/API/Transferable
diff --git a/Base/build.gradle b/Base/build.gradle
index 872cf943208..dfca5c784f1 100644
--- a/Base/build.gradle
+++ b/Base/build.gradle
@@ -7,14 +7,15 @@ dependencies {
 
     api project(':clock')
 
-    implementation depTrove3
-    compileOnlyApi depAnnotations
-    implementation depCommonsLang3
+    implementation libs.trove
+    compileOnlyApi libs.jetbrains.annotations
+    implementation libs.commons.lang3
 
-    api 'io.deephaven:hash:0.1.0'
+    api libs.deephaven.hash
 
-    Classpaths.inheritJUnitClassic(project, 'testImplementation')
-    Classpaths.inheritJMock(project, 'testImplementation')
+    testImplementation libs.junit4
+    testImplementation libs.jmock.junit4
+    testImplementation libs.jmock.imposters
     testImplementation project(":base-test-utils")
 }
 
diff --git a/Base/gradle.properties b/Base/gradle.properties
index c186bbfdde1..9e8588f2620 100644
--- a/Base/gradle.properties
+++ b/Base/gradle.properties
@@ -1 +1,2 @@
 io.deephaven.project.ProjectType=JAVA_PUBLIC
+languageLevel=8
diff --git a/Base/src/main/java/io/deephaven/base/FileUtils.java b/Base/src/main/java/io/deephaven/base/FileUtils.java
index 7650308821e..820e733c0a9 100644
--- a/Base/src/main/java/io/deephaven/base/FileUtils.java
+++ b/Base/src/main/java/io/deephaven/base/FileUtils.java
@@ -282,7 +282,7 @@ public static URI convertToURI(final String source, final boolean isDirectory) {
                 return convertToURI(new File(uri), isDirectory);
             }
             String path = uri.getPath();
-            final boolean endsWithSlash = path.charAt(path.length() - 1) == URI_SEPARATOR_CHAR;
+            final boolean endsWithSlash = !path.isEmpty() && path.charAt(path.length() - 1) == URI_SEPARATOR_CHAR;
             if (!isDirectory && endsWithSlash) {
                 throw new IllegalArgumentException("Non-directory URI should not end with a slash: " + uri);
             }
@@ -324,6 +324,11 @@ public static URI convertToURI(final File file, final boolean isDirectory) {
         if (isDirectory && absPath.charAt(absPath.length() - 1) != URI_SEPARATOR_CHAR) {
             absPath = absPath + URI_SEPARATOR_CHAR;
         }
+        if (absPath.charAt(0) != URI_SEPARATOR_CHAR) {
+            absPath = URI_SEPARATOR_CHAR + absPath;
+            // ^This is especially useful for Windows where the absolute path does not start with a slash.
+            // For example, for absolute path "C:\path\to\file", the URI would be "file:/C:/path/to/file".
+        }
         try {
             return new URI(FILE_URI_SCHEME, null, absPath, null);
         } catch (final URISyntaxException e) {
diff --git a/Base/src/main/java/io/deephaven/base/MathUtil.java b/Base/src/main/java/io/deephaven/base/MathUtil.java
index 555409a709b..f9755cb14f0 100644
--- a/Base/src/main/java/io/deephaven/base/MathUtil.java
+++ b/Base/src/main/java/io/deephaven/base/MathUtil.java
@@ -129,6 +129,20 @@ public static int roundUpPowerOf2(int x) {
         return Math.max(Integer.highestOneBit(x - 1) << 1, 1);
     }
 
+    /**
+     * Rounds up to the next power of 2 for {@code x}; if {@code x} is already a power of 2, {@code x} will be returned.
+     * Values outside the range {@code 1 <= x <= Long.MAX_VALUE} will return {@code 1}.
+     *
+     * <p>
+     * Equivalent to {@code Math.max(Long.highestOneBit(x - 1) << 1, 1)}.
+     *
+     * @param x the value
+     * @return the next power of 2 for {@code x}
+     */
+    public static long roundUpPowerOf2(long x) {
+        return Math.max(Long.highestOneBit(x - 1) << 1, 1);
+    }
+
     /**
      * Rounds up to the next power of 2 for {@code size <= MAX_POWER_OF_2}, otherwise returns
      * {@link ArrayUtil#MAX_ARRAY_SIZE}.
diff --git a/Stats/src/main/java/io/deephaven/stats/util/OSUtil.java b/Base/src/main/java/io/deephaven/base/OSUtil.java
similarity index 98%
rename from Stats/src/main/java/io/deephaven/stats/util/OSUtil.java
rename to Base/src/main/java/io/deephaven/base/OSUtil.java
index 4eceea9a42b..91167f03dfc 100644
--- a/Stats/src/main/java/io/deephaven/stats/util/OSUtil.java
+++ b/Base/src/main/java/io/deephaven/base/OSUtil.java
@@ -1,7 +1,7 @@
 //
 // Copyright (c) 2016-2024 Deephaven Data Labs and Patent Pending
 //
-package io.deephaven.stats.util;
+package io.deephaven.base;
 
 import org.jetbrains.annotations.NotNull;
 
diff --git a/Base/src/main/java/io/deephaven/base/ringbuffer/AggregatingByteRingBuffer.java b/Base/src/main/java/io/deephaven/base/ringbuffer/AggregatingByteRingBuffer.java
index f4f2ce461a8..5f42dfcd519 100644
--- a/Base/src/main/java/io/deephaven/base/ringbuffer/AggregatingByteRingBuffer.java
+++ b/Base/src/main/java/io/deephaven/base/ringbuffer/AggregatingByteRingBuffer.java
@@ -434,11 +434,16 @@ public void clear() {
         final long prevHead = internalBuffer.head;
         final int prevSize = size();
 
-        internalBuffer.clear();
+        // Reset the pointers in the ring buffer without clearing the storage array. This leaves existing `identityVal`
+        // entries in place for the next `evaluate()` call.
+        internalBuffer.head = internalBuffer.tail = 0;
 
         calcHead = calcTail = 0;
-        // Reset the cleared storage entries to the identity value
+
+        // Reset the previously populated storage entries to the identity value. After this call, all entries in the
+        // storage buffer are `identityVal`
         fillWithIdentityVal(prevHead, prevSize);
+
         // Reset the tree buffer with the identity value
         Arrays.fill(treeStorage, identityVal);
     }
diff --git a/Base/src/main/java/io/deephaven/base/ringbuffer/AggregatingCharRingBuffer.java b/Base/src/main/java/io/deephaven/base/ringbuffer/AggregatingCharRingBuffer.java
index e931ba3f1c6..f6148c481ed 100644
--- a/Base/src/main/java/io/deephaven/base/ringbuffer/AggregatingCharRingBuffer.java
+++ b/Base/src/main/java/io/deephaven/base/ringbuffer/AggregatingCharRingBuffer.java
@@ -430,11 +430,16 @@ public void clear() {
         final long prevHead = internalBuffer.head;
         final int prevSize = size();
 
-        internalBuffer.clear();
+        // Reset the pointers in the ring buffer without clearing the storage array. This leaves existing `identityVal`
+        // entries in place for the next `evaluate()` call.
+        internalBuffer.head = internalBuffer.tail = 0;
 
         calcHead = calcTail = 0;
-        // Reset the cleared storage entries to the identity value
+
+        // Reset the previously populated storage entries to the identity value. After this call, all entries in the
+        // storage buffer are `identityVal`
         fillWithIdentityVal(prevHead, prevSize);
+
         // Reset the tree buffer with the identity value
         Arrays.fill(treeStorage, identityVal);
     }
diff --git a/Base/src/main/java/io/deephaven/base/ringbuffer/AggregatingDoubleRingBuffer.java b/Base/src/main/java/io/deephaven/base/ringbuffer/AggregatingDoubleRingBuffer.java
index 516474e31ac..cd5963e54ec 100644
--- a/Base/src/main/java/io/deephaven/base/ringbuffer/AggregatingDoubleRingBuffer.java
+++ b/Base/src/main/java/io/deephaven/base/ringbuffer/AggregatingDoubleRingBuffer.java
@@ -434,11 +434,16 @@ public void clear() {
         final long prevHead = internalBuffer.head;
         final int prevSize = size();
 
-        internalBuffer.clear();
+        // Reset the pointers in the ring buffer without clearing the storage array. This leaves existing `identityVal`
+        // entries in place for the next `evaluate()` call.
+        internalBuffer.head = internalBuffer.tail = 0;
 
         calcHead = calcTail = 0;
-        // Reset the cleared storage entries to the identity value
+
+        // Reset the previously populated storage entries to the identity value. After this call, all entries in the
+        // storage buffer are `identityVal`
         fillWithIdentityVal(prevHead, prevSize);
+
         // Reset the tree buffer with the identity value
         Arrays.fill(treeStorage, identityVal);
     }
diff --git a/Base/src/main/java/io/deephaven/base/ringbuffer/AggregatingFloatRingBuffer.java b/Base/src/main/java/io/deephaven/base/ringbuffer/AggregatingFloatRingBuffer.java
index fedb32a7ab5..f6d6b43a619 100644
--- a/Base/src/main/java/io/deephaven/base/ringbuffer/AggregatingFloatRingBuffer.java
+++ b/Base/src/main/java/io/deephaven/base/ringbuffer/AggregatingFloatRingBuffer.java
@@ -434,11 +434,16 @@ public void clear() {
         final long prevHead = internalBuffer.head;
         final int prevSize = size();
 
-        internalBuffer.clear();
+        // Reset the pointers in the ring buffer without clearing the storage array. This leaves existing `identityVal`
+        // entries in place for the next `evaluate()` call.
+        internalBuffer.head = internalBuffer.tail = 0;
 
         calcHead = calcTail = 0;
-        // Reset the cleared storage entries to the identity value
+
+        // Reset the previously populated storage entries to the identity value. After this call, all entries in the
+        // storage buffer are `identityVal`
         fillWithIdentityVal(prevHead, prevSize);
+
         // Reset the tree buffer with the identity value
         Arrays.fill(treeStorage, identityVal);
     }
diff --git a/Base/src/main/java/io/deephaven/base/ringbuffer/AggregatingIntRingBuffer.java b/Base/src/main/java/io/deephaven/base/ringbuffer/AggregatingIntRingBuffer.java
index 9794c76ec0d..b542a07d8d5 100644
--- a/Base/src/main/java/io/deephaven/base/ringbuffer/AggregatingIntRingBuffer.java
+++ b/Base/src/main/java/io/deephaven/base/ringbuffer/AggregatingIntRingBuffer.java
@@ -434,11 +434,16 @@ public void clear() {
         final long prevHead = internalBuffer.head;
         final int prevSize = size();
 
-        internalBuffer.clear();
+        // Reset the pointers in the ring buffer without clearing the storage array. This leaves existing `identityVal`
+        // entries in place for the next `evaluate()` call.
+        internalBuffer.head = internalBuffer.tail = 0;
 
         calcHead = calcTail = 0;
-        // Reset the cleared storage entries to the identity value
+
+        // Reset the previously populated storage entries to the identity value. After this call, all entries in the
+        // storage buffer are `identityVal`
         fillWithIdentityVal(prevHead, prevSize);
+
         // Reset the tree buffer with the identity value
         Arrays.fill(treeStorage, identityVal);
     }
diff --git a/Base/src/main/java/io/deephaven/base/ringbuffer/AggregatingLongRingBuffer.java b/Base/src/main/java/io/deephaven/base/ringbuffer/AggregatingLongRingBuffer.java
index c402fe5db2f..da3b07750f5 100644
--- a/Base/src/main/java/io/deephaven/base/ringbuffer/AggregatingLongRingBuffer.java
+++ b/Base/src/main/java/io/deephaven/base/ringbuffer/AggregatingLongRingBuffer.java
@@ -434,11 +434,16 @@ public void clear() {
         final long prevHead = internalBuffer.head;
         final int prevSize = size();
 
-        internalBuffer.clear();
+        // Reset the pointers in the ring buffer without clearing the storage array. This leaves existing `identityVal`
+        // entries in place for the next `evaluate()` call.
+        internalBuffer.head = internalBuffer.tail = 0;
 
         calcHead = calcTail = 0;
-        // Reset the cleared storage entries to the identity value
+
+        // Reset the previously populated storage entries to the identity value. After this call, all entries in the
+        // storage buffer are `identityVal`
         fillWithIdentityVal(prevHead, prevSize);
+
         // Reset the tree buffer with the identity value
         Arrays.fill(treeStorage, identityVal);
     }
diff --git a/Base/src/main/java/io/deephaven/base/ringbuffer/AggregatingObjectRingBuffer.java b/Base/src/main/java/io/deephaven/base/ringbuffer/AggregatingObjectRingBuffer.java
index b064b8a4383..1c6eb1d8c46 100644
--- a/Base/src/main/java/io/deephaven/base/ringbuffer/AggregatingObjectRingBuffer.java
+++ b/Base/src/main/java/io/deephaven/base/ringbuffer/AggregatingObjectRingBuffer.java
@@ -434,11 +434,16 @@ public void clear() {
         final long prevHead = internalBuffer.head;
         final int prevSize = size();
 
-        internalBuffer.clear();
+        // Reset the pointers in the ring buffer without clearing the storage array. This leaves existing `identityVal`
+        // entries in place for the next `evaluate()` call.
+        internalBuffer.head = internalBuffer.tail = 0;
 
         calcHead = calcTail = 0;
-        // Reset the cleared storage entries to the identity value
+
+        // Reset the previously populated storage entries to the identity value. After this call, all entries in the
+        // storage buffer are `identityVal`
         fillWithIdentityVal(prevHead, prevSize);
+
         // Reset the tree buffer with the identity value
         Arrays.fill(treeStorage, identityVal);
     }
diff --git a/Base/src/main/java/io/deephaven/base/ringbuffer/AggregatingShortRingBuffer.java b/Base/src/main/java/io/deephaven/base/ringbuffer/AggregatingShortRingBuffer.java
index 1e6707cb473..9e4a1c27aca 100644
--- a/Base/src/main/java/io/deephaven/base/ringbuffer/AggregatingShortRingBuffer.java
+++ b/Base/src/main/java/io/deephaven/base/ringbuffer/AggregatingShortRingBuffer.java
@@ -434,11 +434,16 @@ public void clear() {
         final long prevHead = internalBuffer.head;
         final int prevSize = size();
 
-        internalBuffer.clear();
+        // Reset the pointers in the ring buffer without clearing the storage array. This leaves existing `identityVal`
+        // entries in place for the next `evaluate()` call.
+        internalBuffer.head = internalBuffer.tail = 0;
 
         calcHead = calcTail = 0;
-        // Reset the cleared storage entries to the identity value
+
+        // Reset the previously populated storage entries to the identity value. After this call, all entries in the
+        // storage buffer are `identityVal`
         fillWithIdentityVal(prevHead, prevSize);
+
         // Reset the tree buffer with the identity value
         Arrays.fill(treeStorage, identityVal);
     }
diff --git a/Base/src/main/java/io/deephaven/base/ringbuffer/ByteRingBuffer.java b/Base/src/main/java/io/deephaven/base/ringbuffer/ByteRingBuffer.java
index aede7521309..fa8b5a891d1 100644
--- a/Base/src/main/java/io/deephaven/base/ringbuffer/ByteRingBuffer.java
+++ b/Base/src/main/java/io/deephaven/base/ringbuffer/ByteRingBuffer.java
@@ -9,6 +9,7 @@
 
 import io.deephaven.base.MathUtil;
 import io.deephaven.base.verify.Assert;
+import org.jetbrains.annotations.TestOnly;
 
 import java.io.Serializable;
 import java.util.NoSuchElementException;
@@ -19,7 +20,7 @@
  * {@code long} values. Head and tail will not wrap around; instead we use storage arrays sized to 2^N to allow fast
  * determination of storage indices through a mask operation.
  */
-public class ByteRingBuffer implements Serializable {
+public class ByteRingBuffer implements RingBuffer, Serializable {
     static final long FIXUP_THRESHOLD = 1L << 62;
     final boolean growable;
     byte[] storage;
@@ -32,7 +33,7 @@ public class ByteRingBuffer implements Serializable {
      *
      * @param capacity minimum capacity of the ring buffer
      */
-    public ByteRingBuffer(int capacity) {
+    public ByteRingBuffer(final int capacity) {
         this(capacity, true);
     }
 
@@ -42,7 +43,7 @@ public ByteRingBuffer(int capacity) {
      * @param capacity minimum capacity of ring buffer
      * @param growable whether to allow growth when the buffer is full.
      */
-    public ByteRingBuffer(int capacity, boolean growable) {
+    public ByteRingBuffer(final int capacity, final boolean growable) {
         Assert.leq(capacity, "ByteRingBuffer capacity", MathUtil.MAX_POWER_OF_2);
 
         this.growable = growable;
@@ -59,7 +60,7 @@ public ByteRingBuffer(int capacity, boolean growable) {
      * 
      * @param increase Increase amount. The ring buffer's capacity will be increased by at least this amount.
      */
-    protected void grow(int increase) {
+    protected void grow(final int increase) {
         final int size = size();
         final long newCapacity = (long) storage.length + increase;
         // assert that we are not asking for the impossible
@@ -83,7 +84,7 @@ protected void grow(int increase) {
      * 
      * @param dest The destination buffer.
      */
-    protected void copyRingBufferToArray(byte[] dest) {
+    protected void copyRingBufferToArray(final byte[] dest) {
         final int size = size();
         final int storageHead = (int) (head & mask);
 
@@ -99,27 +100,35 @@ protected void copyRingBufferToArray(byte[] dest) {
         System.arraycopy(storage, 0, dest, firstCopyLen, secondCopyLen);
     }
 
+    @Override
     public boolean isFull() {
         return size() == storage.length;
     }
 
+    @Override
     public boolean isEmpty() {
         return tail == head;
     }
 
+    @Override
     public int size() {
         return Math.toIntExact(tail - head);
     }
 
+    @Override
     public int capacity() {
         return storage.length;
     }
 
+    @Override
     public int remaining() {
         return storage.length - size();
     }
 
+    @Override
     public void clear() {
+        // region object-bulk-clear
+        // endregion object-bulk-clear
         tail = head = 0;
     }
 
@@ -131,7 +140,7 @@ public void clear() {
      * @throws UnsupportedOperationException when {@code growable} is {@code false} and buffer is full
      * @return {@code true} if the byte was added successfully
      */
-    public boolean add(byte e) {
+    public boolean add(final byte e) {
         if (isFull()) {
             if (!growable) {
                 throw new UnsupportedOperationException("Ring buffer is full and growth is disabled");
@@ -151,7 +160,8 @@ public boolean add(byte e) {
      * @param count the minimum number of empty entries in the buffer after this call
      * @throws UnsupportedOperationException when {@code growable} is {@code false} and buffer is full
      */
-    public void ensureRemaining(int count) {
+    @Override
+    public void ensureRemaining(final int count) {
         if (remaining() < count) {
             if (!growable) {
                 throw new UnsupportedOperationException("Ring buffer is full and growth is disabled");
@@ -168,7 +178,7 @@ public void ensureRemaining(int count) {
      *
      * @param e the value to add to the buffer
      */
-    public void addUnsafe(byte e) {
+    public void addUnsafe(final byte e) {
         // This is an extremely paranoid wrap check that in all likelihood will never run. With FIXUP_THRESHOLD at
         // 1 << 62, and the user pushing 2^32 values per second(!), it will take 68 years to wrap this counter .
         if (tail >= FIXUP_THRESHOLD) {
@@ -188,7 +198,7 @@ public void addUnsafe(byte e) {
      * @param notFullResult value to return is the buffer is not full
      * @return the overwritten entry if the buffer is full, the provided value otherwise
      */
-    public byte addOverwrite(byte e, byte notFullResult) {
+    public byte addOverwrite(final byte e, final byte notFullResult) {
         byte val = notFullResult;
         if (isFull()) {
             val = remove();
@@ -204,7 +214,7 @@ public byte addOverwrite(byte e, byte notFullResult) {
      * @param e the byte to be added to the buffer
      * @return true if the value was added successfully, false otherwise
      */
-    public boolean offer(byte e) {
+    public boolean offer(final byte e) {
         if (isFull()) {
             return false;
         }
@@ -218,7 +228,7 @@ public boolean offer(byte e) {
      * @param count The number of elements to remove.
      * @throws NoSuchElementException if the buffer is empty
      */
-    public byte[] remove(int count) {
+    public byte[] remove(final int count) {
         final int size = size();
         if (size < count) {
             throw new NoSuchElementException();
@@ -264,7 +274,7 @@ public byte removeUnsafe() {
      * @param onEmpty the value to return if the ring buffer is empty
      * @return The removed element if the ring buffer was non-empty, otherwise the value of 'onEmpty'
      */
-    public byte poll(byte onEmpty) {
+    public byte poll(final byte onEmpty) {
         if (isEmpty()) {
             return onEmpty;
         }
@@ -291,7 +301,7 @@ public byte element() {
      * @param onEmpty the value to return if the ring buffer is empty
      * @return The head element if the ring buffer is non-empty, otherwise the value of 'onEmpty'
      */
-    public byte peek(byte onEmpty) {
+    public byte peek(final byte onEmpty) {
         if (isEmpty()) {
             return onEmpty;
         }
@@ -314,7 +324,7 @@ public byte front() {
      * @throws NoSuchElementException if the buffer is empty
      * @return The element at the specified offset
      */
-    public byte front(int offset) {
+    public byte front(final int offset) {
         if (offset < 0 || offset >= size()) {
             throw new NoSuchElementException();
         }
@@ -341,7 +351,7 @@ public byte back() {
      * @param onEmpty the value to return if the ring buffer is empty
      * @return The tail element if the ring buffer is non-empty, otherwise the value of 'onEmpty'
      */
-    public byte peekBack(byte onEmpty) {
+    public byte peekBack(final byte onEmpty) {
         if (isEmpty()) {
             return onEmpty;
         }
@@ -385,4 +395,14 @@ public void remove() {
             throw new UnsupportedOperationException();
         }
     }
+
+    /**
+     * Get the storage array for this ring buffer. This is intended for testing and debugging purposes only.
+     *
+     * @return The storage array for this ring buffer.
+     */
+    @TestOnly
+    public byte[] getStorage() {
+        return storage;
+    }
 }
diff --git a/Base/src/main/java/io/deephaven/base/ringbuffer/CharRingBuffer.java b/Base/src/main/java/io/deephaven/base/ringbuffer/CharRingBuffer.java
index 68c58a866e7..84bff19d07e 100644
--- a/Base/src/main/java/io/deephaven/base/ringbuffer/CharRingBuffer.java
+++ b/Base/src/main/java/io/deephaven/base/ringbuffer/CharRingBuffer.java
@@ -5,6 +5,7 @@
 
 import io.deephaven.base.MathUtil;
 import io.deephaven.base.verify.Assert;
+import org.jetbrains.annotations.TestOnly;
 
 import java.io.Serializable;
 import java.util.NoSuchElementException;
@@ -15,7 +16,7 @@
  * {@code long} values. Head and tail will not wrap around; instead we use storage arrays sized to 2^N to allow fast
  * determination of storage indices through a mask operation.
  */
-public class CharRingBuffer implements Serializable {
+public class CharRingBuffer implements RingBuffer, Serializable {
     static final long FIXUP_THRESHOLD = 1L << 62;
     final boolean growable;
     char[] storage;
@@ -28,7 +29,7 @@ public class CharRingBuffer implements Serializable {
      *
      * @param capacity minimum capacity of the ring buffer
      */
-    public CharRingBuffer(int capacity) {
+    public CharRingBuffer(final int capacity) {
         this(capacity, true);
     }
 
@@ -38,7 +39,7 @@ public CharRingBuffer(int capacity) {
      * @param capacity minimum capacity of ring buffer
      * @param growable whether to allow growth when the buffer is full.
      */
-    public CharRingBuffer(int capacity, boolean growable) {
+    public CharRingBuffer(final int capacity, final boolean growable) {
         Assert.leq(capacity, "CharRingBuffer capacity", MathUtil.MAX_POWER_OF_2);
 
         this.growable = growable;
@@ -55,7 +56,7 @@ public CharRingBuffer(int capacity, boolean growable) {
      * 
      * @param increase Increase amount. The ring buffer's capacity will be increased by at least this amount.
      */
-    protected void grow(int increase) {
+    protected void grow(final int increase) {
         final int size = size();
         final long newCapacity = (long) storage.length + increase;
         // assert that we are not asking for the impossible
@@ -79,7 +80,7 @@ protected void grow(int increase) {
      * 
      * @param dest The destination buffer.
      */
-    protected void copyRingBufferToArray(char[] dest) {
+    protected void copyRingBufferToArray(final char[] dest) {
         final int size = size();
         final int storageHead = (int) (head & mask);
 
@@ -95,27 +96,35 @@ protected void copyRingBufferToArray(char[] dest) {
         System.arraycopy(storage, 0, dest, firstCopyLen, secondCopyLen);
     }
 
+    @Override
     public boolean isFull() {
         return size() == storage.length;
     }
 
+    @Override
     public boolean isEmpty() {
         return tail == head;
     }
 
+    @Override
     public int size() {
         return Math.toIntExact(tail - head);
     }
 
+    @Override
     public int capacity() {
         return storage.length;
     }
 
+    @Override
     public int remaining() {
         return storage.length - size();
     }
 
+    @Override
     public void clear() {
+        // region object-bulk-clear
+        // endregion object-bulk-clear
         tail = head = 0;
     }
 
@@ -127,7 +136,7 @@ public void clear() {
      * @throws UnsupportedOperationException when {@code growable} is {@code false} and buffer is full
      * @return {@code true} if the char was added successfully
      */
-    public boolean add(char e) {
+    public boolean add(final char e) {
         if (isFull()) {
             if (!growable) {
                 throw new UnsupportedOperationException("Ring buffer is full and growth is disabled");
@@ -147,7 +156,8 @@ public boolean add(char e) {
      * @param count the minimum number of empty entries in the buffer after this call
      * @throws UnsupportedOperationException when {@code growable} is {@code false} and buffer is full
      */
-    public void ensureRemaining(int count) {
+    @Override
+    public void ensureRemaining(final int count) {
         if (remaining() < count) {
             if (!growable) {
                 throw new UnsupportedOperationException("Ring buffer is full and growth is disabled");
@@ -164,7 +174,7 @@ public void ensureRemaining(int count) {
      *
      * @param e the value to add to the buffer
      */
-    public void addUnsafe(char e) {
+    public void addUnsafe(final char e) {
         // This is an extremely paranoid wrap check that in all likelihood will never run. With FIXUP_THRESHOLD at
         // 1 << 62, and the user pushing 2^32 values per second(!), it will take 68 years to wrap this counter .
         if (tail >= FIXUP_THRESHOLD) {
@@ -184,7 +194,7 @@ public void addUnsafe(char e) {
      * @param notFullResult value to return is the buffer is not full
      * @return the overwritten entry if the buffer is full, the provided value otherwise
      */
-    public char addOverwrite(char e, char notFullResult) {
+    public char addOverwrite(final char e, final char notFullResult) {
         char val = notFullResult;
         if (isFull()) {
             val = remove();
@@ -200,7 +210,7 @@ public char addOverwrite(char e, char notFullResult) {
      * @param e the char to be added to the buffer
      * @return true if the value was added successfully, false otherwise
      */
-    public boolean offer(char e) {
+    public boolean offer(final char e) {
         if (isFull()) {
             return false;
         }
@@ -214,7 +224,7 @@ public boolean offer(char e) {
      * @param count The number of elements to remove.
      * @throws NoSuchElementException if the buffer is empty
      */
-    public char[] remove(int count) {
+    public char[] remove(final int count) {
         final int size = size();
         if (size < count) {
             throw new NoSuchElementException();
@@ -260,7 +270,7 @@ public char removeUnsafe() {
      * @param onEmpty the value to return if the ring buffer is empty
      * @return The removed element if the ring buffer was non-empty, otherwise the value of 'onEmpty'
      */
-    public char poll(char onEmpty) {
+    public char poll(final char onEmpty) {
         if (isEmpty()) {
             return onEmpty;
         }
@@ -287,7 +297,7 @@ public char element() {
      * @param onEmpty the value to return if the ring buffer is empty
      * @return The head element if the ring buffer is non-empty, otherwise the value of 'onEmpty'
      */
-    public char peek(char onEmpty) {
+    public char peek(final char onEmpty) {
         if (isEmpty()) {
             return onEmpty;
         }
@@ -310,7 +320,7 @@ public char front() {
      * @throws NoSuchElementException if the buffer is empty
      * @return The element at the specified offset
      */
-    public char front(int offset) {
+    public char front(final int offset) {
         if (offset < 0 || offset >= size()) {
             throw new NoSuchElementException();
         }
@@ -337,7 +347,7 @@ public char back() {
      * @param onEmpty the value to return if the ring buffer is empty
      * @return The tail element if the ring buffer is non-empty, otherwise the value of 'onEmpty'
      */
-    public char peekBack(char onEmpty) {
+    public char peekBack(final char onEmpty) {
         if (isEmpty()) {
             return onEmpty;
         }
@@ -381,4 +391,14 @@ public void remove() {
             throw new UnsupportedOperationException();
         }
     }
+
+    /**
+     * Get the storage array for this ring buffer. This is intended for testing and debugging purposes only.
+     *
+     * @return The storage array for this ring buffer.
+     */
+    @TestOnly
+    public char[] getStorage() {
+        return storage;
+    }
 }
diff --git a/Base/src/main/java/io/deephaven/base/ringbuffer/DoubleRingBuffer.java b/Base/src/main/java/io/deephaven/base/ringbuffer/DoubleRingBuffer.java
index 8e942f8937a..2c28fbdd469 100644
--- a/Base/src/main/java/io/deephaven/base/ringbuffer/DoubleRingBuffer.java
+++ b/Base/src/main/java/io/deephaven/base/ringbuffer/DoubleRingBuffer.java
@@ -9,6 +9,7 @@
 
 import io.deephaven.base.MathUtil;
 import io.deephaven.base.verify.Assert;
+import org.jetbrains.annotations.TestOnly;
 
 import java.io.Serializable;
 import java.util.NoSuchElementException;
@@ -19,7 +20,7 @@
  * {@code long} values. Head and tail will not wrap around; instead we use storage arrays sized to 2^N to allow fast
  * determination of storage indices through a mask operation.
  */
-public class DoubleRingBuffer implements Serializable {
+public class DoubleRingBuffer implements RingBuffer, Serializable {
     static final long FIXUP_THRESHOLD = 1L << 62;
     final boolean growable;
     double[] storage;
@@ -32,7 +33,7 @@ public class DoubleRingBuffer implements Serializable {
      *
      * @param capacity minimum capacity of the ring buffer
      */
-    public DoubleRingBuffer(int capacity) {
+    public DoubleRingBuffer(final int capacity) {
         this(capacity, true);
     }
 
@@ -42,7 +43,7 @@ public DoubleRingBuffer(int capacity) {
      * @param capacity minimum capacity of ring buffer
      * @param growable whether to allow growth when the buffer is full.
      */
-    public DoubleRingBuffer(int capacity, boolean growable) {
+    public DoubleRingBuffer(final int capacity, final boolean growable) {
         Assert.leq(capacity, "DoubleRingBuffer capacity", MathUtil.MAX_POWER_OF_2);
 
         this.growable = growable;
@@ -59,7 +60,7 @@ public DoubleRingBuffer(int capacity, boolean growable) {
      * 
      * @param increase Increase amount. The ring buffer's capacity will be increased by at least this amount.
      */
-    protected void grow(int increase) {
+    protected void grow(final int increase) {
         final int size = size();
         final long newCapacity = (long) storage.length + increase;
         // assert that we are not asking for the impossible
@@ -83,7 +84,7 @@ protected void grow(int increase) {
      * 
      * @param dest The destination buffer.
      */
-    protected void copyRingBufferToArray(double[] dest) {
+    protected void copyRingBufferToArray(final double[] dest) {
         final int size = size();
         final int storageHead = (int) (head & mask);
 
@@ -99,27 +100,35 @@ protected void copyRingBufferToArray(double[] dest) {
         System.arraycopy(storage, 0, dest, firstCopyLen, secondCopyLen);
     }
 
+    @Override
     public boolean isFull() {
         return size() == storage.length;
     }
 
+    @Override
     public boolean isEmpty() {
         return tail == head;
     }
 
+    @Override
     public int size() {
         return Math.toIntExact(tail - head);
     }
 
+    @Override
     public int capacity() {
         return storage.length;
     }
 
+    @Override
     public int remaining() {
         return storage.length - size();
     }
 
+    @Override
     public void clear() {
+        // region object-bulk-clear
+        // endregion object-bulk-clear
         tail = head = 0;
     }
 
@@ -131,7 +140,7 @@ public void clear() {
      * @throws UnsupportedOperationException when {@code growable} is {@code false} and buffer is full
      * @return {@code true} if the double was added successfully
      */
-    public boolean add(double e) {
+    public boolean add(final double e) {
         if (isFull()) {
             if (!growable) {
                 throw new UnsupportedOperationException("Ring buffer is full and growth is disabled");
@@ -151,7 +160,8 @@ public boolean add(double e) {
      * @param count the minimum number of empty entries in the buffer after this call
      * @throws UnsupportedOperationException when {@code growable} is {@code false} and buffer is full
      */
-    public void ensureRemaining(int count) {
+    @Override
+    public void ensureRemaining(final int count) {
         if (remaining() < count) {
             if (!growable) {
                 throw new UnsupportedOperationException("Ring buffer is full and growth is disabled");
@@ -168,7 +178,7 @@ public void ensureRemaining(int count) {
      *
      * @param e the value to add to the buffer
      */
-    public void addUnsafe(double e) {
+    public void addUnsafe(final double e) {
         // This is an extremely paranoid wrap check that in all likelihood will never run. With FIXUP_THRESHOLD at
         // 1 << 62, and the user pushing 2^32 values per second(!), it will take 68 years to wrap this counter .
         if (tail >= FIXUP_THRESHOLD) {
@@ -188,7 +198,7 @@ public void addUnsafe(double e) {
      * @param notFullResult value to return is the buffer is not full
      * @return the overwritten entry if the buffer is full, the provided value otherwise
      */
-    public double addOverwrite(double e, double notFullResult) {
+    public double addOverwrite(final double e, final double notFullResult) {
         double val = notFullResult;
         if (isFull()) {
             val = remove();
@@ -204,7 +214,7 @@ public double addOverwrite(double e, double notFullResult) {
      * @param e the double to be added to the buffer
      * @return true if the value was added successfully, false otherwise
      */
-    public boolean offer(double e) {
+    public boolean offer(final double e) {
         if (isFull()) {
             return false;
         }
@@ -218,7 +228,7 @@ public boolean offer(double e) {
      * @param count The number of elements to remove.
      * @throws NoSuchElementException if the buffer is empty
      */
-    public double[] remove(int count) {
+    public double[] remove(final int count) {
         final int size = size();
         if (size < count) {
             throw new NoSuchElementException();
@@ -264,7 +274,7 @@ public double removeUnsafe() {
      * @param onEmpty the value to return if the ring buffer is empty
      * @return The removed element if the ring buffer was non-empty, otherwise the value of 'onEmpty'
      */
-    public double poll(double onEmpty) {
+    public double poll(final double onEmpty) {
         if (isEmpty()) {
             return onEmpty;
         }
@@ -291,7 +301,7 @@ public double element() {
      * @param onEmpty the value to return if the ring buffer is empty
      * @return The head element if the ring buffer is non-empty, otherwise the value of 'onEmpty'
      */
-    public double peek(double onEmpty) {
+    public double peek(final double onEmpty) {
         if (isEmpty()) {
             return onEmpty;
         }
@@ -314,7 +324,7 @@ public double front() {
      * @throws NoSuchElementException if the buffer is empty
      * @return The element at the specified offset
      */
-    public double front(int offset) {
+    public double front(final int offset) {
         if (offset < 0 || offset >= size()) {
             throw new NoSuchElementException();
         }
@@ -341,7 +351,7 @@ public double back() {
      * @param onEmpty the value to return if the ring buffer is empty
      * @return The tail element if the ring buffer is non-empty, otherwise the value of 'onEmpty'
      */
-    public double peekBack(double onEmpty) {
+    public double peekBack(final double onEmpty) {
         if (isEmpty()) {
             return onEmpty;
         }
@@ -385,4 +395,14 @@ public void remove() {
             throw new UnsupportedOperationException();
         }
     }
+
+    /**
+     * Get the storage array for this ring buffer. This is intended for testing and debugging purposes only.
+     *
+     * @return The storage array for this ring buffer.
+     */
+    @TestOnly
+    public double[] getStorage() {
+        return storage;
+    }
 }
diff --git a/Base/src/main/java/io/deephaven/base/ringbuffer/FloatRingBuffer.java b/Base/src/main/java/io/deephaven/base/ringbuffer/FloatRingBuffer.java
index 16c8751c447..d432710383e 100644
--- a/Base/src/main/java/io/deephaven/base/ringbuffer/FloatRingBuffer.java
+++ b/Base/src/main/java/io/deephaven/base/ringbuffer/FloatRingBuffer.java
@@ -9,6 +9,7 @@
 
 import io.deephaven.base.MathUtil;
 import io.deephaven.base.verify.Assert;
+import org.jetbrains.annotations.TestOnly;
 
 import java.io.Serializable;
 import java.util.NoSuchElementException;
@@ -19,7 +20,7 @@
  * {@code long} values. Head and tail will not wrap around; instead we use storage arrays sized to 2^N to allow fast
  * determination of storage indices through a mask operation.
  */
-public class FloatRingBuffer implements Serializable {
+public class FloatRingBuffer implements RingBuffer, Serializable {
     static final long FIXUP_THRESHOLD = 1L << 62;
     final boolean growable;
     float[] storage;
@@ -32,7 +33,7 @@ public class FloatRingBuffer implements Serializable {
      *
      * @param capacity minimum capacity of the ring buffer
      */
-    public FloatRingBuffer(int capacity) {
+    public FloatRingBuffer(final int capacity) {
         this(capacity, true);
     }
 
@@ -42,7 +43,7 @@ public FloatRingBuffer(int capacity) {
      * @param capacity minimum capacity of ring buffer
      * @param growable whether to allow growth when the buffer is full.
      */
-    public FloatRingBuffer(int capacity, boolean growable) {
+    public FloatRingBuffer(final int capacity, final boolean growable) {
         Assert.leq(capacity, "FloatRingBuffer capacity", MathUtil.MAX_POWER_OF_2);
 
         this.growable = growable;
@@ -59,7 +60,7 @@ public FloatRingBuffer(int capacity, boolean growable) {
      * 
      * @param increase Increase amount. The ring buffer's capacity will be increased by at least this amount.
      */
-    protected void grow(int increase) {
+    protected void grow(final int increase) {
         final int size = size();
         final long newCapacity = (long) storage.length + increase;
         // assert that we are not asking for the impossible
@@ -83,7 +84,7 @@ protected void grow(int increase) {
      * 
      * @param dest The destination buffer.
      */
-    protected void copyRingBufferToArray(float[] dest) {
+    protected void copyRingBufferToArray(final float[] dest) {
         final int size = size();
         final int storageHead = (int) (head & mask);
 
@@ -99,27 +100,35 @@ protected void copyRingBufferToArray(float[] dest) {
         System.arraycopy(storage, 0, dest, firstCopyLen, secondCopyLen);
     }
 
+    @Override
     public boolean isFull() {
         return size() == storage.length;
     }
 
+    @Override
     public boolean isEmpty() {
         return tail == head;
     }
 
+    @Override
     public int size() {
         return Math.toIntExact(tail - head);
     }
 
+    @Override
     public int capacity() {
         return storage.length;
     }
 
+    @Override
     public int remaining() {
         return storage.length - size();
     }
 
+    @Override
     public void clear() {
+        // region object-bulk-clear
+        // endregion object-bulk-clear
         tail = head = 0;
     }
 
@@ -131,7 +140,7 @@ public void clear() {
      * @throws UnsupportedOperationException when {@code growable} is {@code false} and buffer is full
      * @return {@code true} if the float was added successfully
      */
-    public boolean add(float e) {
+    public boolean add(final float e) {
         if (isFull()) {
             if (!growable) {
                 throw new UnsupportedOperationException("Ring buffer is full and growth is disabled");
@@ -151,7 +160,8 @@ public boolean add(float e) {
      * @param count the minimum number of empty entries in the buffer after this call
      * @throws UnsupportedOperationException when {@code growable} is {@code false} and buffer is full
      */
-    public void ensureRemaining(int count) {
+    @Override
+    public void ensureRemaining(final int count) {
         if (remaining() < count) {
             if (!growable) {
                 throw new UnsupportedOperationException("Ring buffer is full and growth is disabled");
@@ -168,7 +178,7 @@ public void ensureRemaining(int count) {
      *
      * @param e the value to add to the buffer
      */
-    public void addUnsafe(float e) {
+    public void addUnsafe(final float e) {
         // This is an extremely paranoid wrap check that in all likelihood will never run. With FIXUP_THRESHOLD at
         // 1 << 62, and the user pushing 2^32 values per second(!), it will take 68 years to wrap this counter .
         if (tail >= FIXUP_THRESHOLD) {
@@ -188,7 +198,7 @@ public void addUnsafe(float e) {
      * @param notFullResult value to return is the buffer is not full
      * @return the overwritten entry if the buffer is full, the provided value otherwise
      */
-    public float addOverwrite(float e, float notFullResult) {
+    public float addOverwrite(final float e, final float notFullResult) {
         float val = notFullResult;
         if (isFull()) {
             val = remove();
@@ -204,7 +214,7 @@ public float addOverwrite(float e, float notFullResult) {
      * @param e the float to be added to the buffer
      * @return true if the value was added successfully, false otherwise
      */
-    public boolean offer(float e) {
+    public boolean offer(final float e) {
         if (isFull()) {
             return false;
         }
@@ -218,7 +228,7 @@ public boolean offer(float e) {
      * @param count The number of elements to remove.
      * @throws NoSuchElementException if the buffer is empty
      */
-    public float[] remove(int count) {
+    public float[] remove(final int count) {
         final int size = size();
         if (size < count) {
             throw new NoSuchElementException();
@@ -264,7 +274,7 @@ public float removeUnsafe() {
      * @param onEmpty the value to return if the ring buffer is empty
      * @return The removed element if the ring buffer was non-empty, otherwise the value of 'onEmpty'
      */
-    public float poll(float onEmpty) {
+    public float poll(final float onEmpty) {
         if (isEmpty()) {
             return onEmpty;
         }
@@ -291,7 +301,7 @@ public float element() {
      * @param onEmpty the value to return if the ring buffer is empty
      * @return The head element if the ring buffer is non-empty, otherwise the value of 'onEmpty'
      */
-    public float peek(float onEmpty) {
+    public float peek(final float onEmpty) {
         if (isEmpty()) {
             return onEmpty;
         }
@@ -314,7 +324,7 @@ public float front() {
      * @throws NoSuchElementException if the buffer is empty
      * @return The element at the specified offset
      */
-    public float front(int offset) {
+    public float front(final int offset) {
         if (offset < 0 || offset >= size()) {
             throw new NoSuchElementException();
         }
@@ -341,7 +351,7 @@ public float back() {
      * @param onEmpty the value to return if the ring buffer is empty
      * @return The tail element if the ring buffer is non-empty, otherwise the value of 'onEmpty'
      */
-    public float peekBack(float onEmpty) {
+    public float peekBack(final float onEmpty) {
         if (isEmpty()) {
             return onEmpty;
         }
@@ -385,4 +395,14 @@ public void remove() {
             throw new UnsupportedOperationException();
         }
     }
+
+    /**
+     * Get the storage array for this ring buffer. This is intended for testing and debugging purposes only.
+     *
+     * @return The storage array for this ring buffer.
+     */
+    @TestOnly
+    public float[] getStorage() {
+        return storage;
+    }
 }
diff --git a/Base/src/main/java/io/deephaven/base/ringbuffer/IntRingBuffer.java b/Base/src/main/java/io/deephaven/base/ringbuffer/IntRingBuffer.java
index 80a47f0a389..ca83c1715d8 100644
--- a/Base/src/main/java/io/deephaven/base/ringbuffer/IntRingBuffer.java
+++ b/Base/src/main/java/io/deephaven/base/ringbuffer/IntRingBuffer.java
@@ -9,6 +9,7 @@
 
 import io.deephaven.base.MathUtil;
 import io.deephaven.base.verify.Assert;
+import org.jetbrains.annotations.TestOnly;
 
 import java.io.Serializable;
 import java.util.NoSuchElementException;
@@ -19,7 +20,7 @@
  * {@code long} values. Head and tail will not wrap around; instead we use storage arrays sized to 2^N to allow fast
  * determination of storage indices through a mask operation.
  */
-public class IntRingBuffer implements Serializable {
+public class IntRingBuffer implements RingBuffer, Serializable {
     static final long FIXUP_THRESHOLD = 1L << 62;
     final boolean growable;
     int[] storage;
@@ -32,7 +33,7 @@ public class IntRingBuffer implements Serializable {
      *
      * @param capacity minimum capacity of the ring buffer
      */
-    public IntRingBuffer(int capacity) {
+    public IntRingBuffer(final int capacity) {
         this(capacity, true);
     }
 
@@ -42,7 +43,7 @@ public IntRingBuffer(int capacity) {
      * @param capacity minimum capacity of ring buffer
      * @param growable whether to allow growth when the buffer is full.
      */
-    public IntRingBuffer(int capacity, boolean growable) {
+    public IntRingBuffer(final int capacity, final boolean growable) {
         Assert.leq(capacity, "IntRingBuffer capacity", MathUtil.MAX_POWER_OF_2);
 
         this.growable = growable;
@@ -59,7 +60,7 @@ public IntRingBuffer(int capacity, boolean growable) {
      * 
      * @param increase Increase amount. The ring buffer's capacity will be increased by at least this amount.
      */
-    protected void grow(int increase) {
+    protected void grow(final int increase) {
         final int size = size();
         final long newCapacity = (long) storage.length + increase;
         // assert that we are not asking for the impossible
@@ -83,7 +84,7 @@ protected void grow(int increase) {
      * 
      * @param dest The destination buffer.
      */
-    protected void copyRingBufferToArray(int[] dest) {
+    protected void copyRingBufferToArray(final int[] dest) {
         final int size = size();
         final int storageHead = (int) (head & mask);
 
@@ -99,27 +100,35 @@ protected void copyRingBufferToArray(int[] dest) {
         System.arraycopy(storage, 0, dest, firstCopyLen, secondCopyLen);
     }
 
+    @Override
     public boolean isFull() {
         return size() == storage.length;
     }
 
+    @Override
     public boolean isEmpty() {
         return tail == head;
     }
 
+    @Override
     public int size() {
         return Math.toIntExact(tail - head);
     }
 
+    @Override
     public int capacity() {
         return storage.length;
     }
 
+    @Override
     public int remaining() {
         return storage.length - size();
     }
 
+    @Override
     public void clear() {
+        // region object-bulk-clear
+        // endregion object-bulk-clear
         tail = head = 0;
     }
 
@@ -131,7 +140,7 @@ public void clear() {
      * @throws UnsupportedOperationException when {@code growable} is {@code false} and buffer is full
      * @return {@code true} if the int was added successfully
      */
-    public boolean add(int e) {
+    public boolean add(final int e) {
         if (isFull()) {
             if (!growable) {
                 throw new UnsupportedOperationException("Ring buffer is full and growth is disabled");
@@ -151,7 +160,8 @@ public boolean add(int e) {
      * @param count the minimum number of empty entries in the buffer after this call
      * @throws UnsupportedOperationException when {@code growable} is {@code false} and buffer is full
      */
-    public void ensureRemaining(int count) {
+    @Override
+    public void ensureRemaining(final int count) {
         if (remaining() < count) {
             if (!growable) {
                 throw new UnsupportedOperationException("Ring buffer is full and growth is disabled");
@@ -168,7 +178,7 @@ public void ensureRemaining(int count) {
      *
      * @param e the value to add to the buffer
      */
-    public void addUnsafe(int e) {
+    public void addUnsafe(final int e) {
         // This is an extremely paranoid wrap check that in all likelihood will never run. With FIXUP_THRESHOLD at
         // 1 << 62, and the user pushing 2^32 values per second(!), it will take 68 years to wrap this counter .
         if (tail >= FIXUP_THRESHOLD) {
@@ -188,7 +198,7 @@ public void addUnsafe(int e) {
      * @param notFullResult value to return is the buffer is not full
      * @return the overwritten entry if the buffer is full, the provided value otherwise
      */
-    public int addOverwrite(int e, int notFullResult) {
+    public int addOverwrite(final int e, final int notFullResult) {
         int val = notFullResult;
         if (isFull()) {
             val = remove();
@@ -204,7 +214,7 @@ public int addOverwrite(int e, int notFullResult) {
      * @param e the int to be added to the buffer
      * @return true if the value was added successfully, false otherwise
      */
-    public boolean offer(int e) {
+    public boolean offer(final int e) {
         if (isFull()) {
             return false;
         }
@@ -218,7 +228,7 @@ public boolean offer(int e) {
      * @param count The number of elements to remove.
      * @throws NoSuchElementException if the buffer is empty
      */
-    public int[] remove(int count) {
+    public int[] remove(final int count) {
         final int size = size();
         if (size < count) {
             throw new NoSuchElementException();
@@ -264,7 +274,7 @@ public int removeUnsafe() {
      * @param onEmpty the value to return if the ring buffer is empty
      * @return The removed element if the ring buffer was non-empty, otherwise the value of 'onEmpty'
      */
-    public int poll(int onEmpty) {
+    public int poll(final int onEmpty) {
         if (isEmpty()) {
             return onEmpty;
         }
@@ -291,7 +301,7 @@ public int element() {
      * @param onEmpty the value to return if the ring buffer is empty
      * @return The head element if the ring buffer is non-empty, otherwise the value of 'onEmpty'
      */
-    public int peek(int onEmpty) {
+    public int peek(final int onEmpty) {
         if (isEmpty()) {
             return onEmpty;
         }
@@ -314,7 +324,7 @@ public int front() {
      * @throws NoSuchElementException if the buffer is empty
      * @return The element at the specified offset
      */
-    public int front(int offset) {
+    public int front(final int offset) {
         if (offset < 0 || offset >= size()) {
             throw new NoSuchElementException();
         }
@@ -341,7 +351,7 @@ public int back() {
      * @param onEmpty the value to return if the ring buffer is empty
      * @return The tail element if the ring buffer is non-empty, otherwise the value of 'onEmpty'
      */
-    public int peekBack(int onEmpty) {
+    public int peekBack(final int onEmpty) {
         if (isEmpty()) {
             return onEmpty;
         }
@@ -385,4 +395,14 @@ public void remove() {
             throw new UnsupportedOperationException();
         }
     }
+
+    /**
+     * Get the storage array for this ring buffer. This is intended for testing and debugging purposes only.
+     *
+     * @return The storage array for this ring buffer.
+     */
+    @TestOnly
+    public int[] getStorage() {
+        return storage;
+    }
 }
diff --git a/Base/src/main/java/io/deephaven/base/ringbuffer/LongRingBuffer.java b/Base/src/main/java/io/deephaven/base/ringbuffer/LongRingBuffer.java
index de5f8df9c90..43d9312711f 100644
--- a/Base/src/main/java/io/deephaven/base/ringbuffer/LongRingBuffer.java
+++ b/Base/src/main/java/io/deephaven/base/ringbuffer/LongRingBuffer.java
@@ -9,6 +9,7 @@
 
 import io.deephaven.base.MathUtil;
 import io.deephaven.base.verify.Assert;
+import org.jetbrains.annotations.TestOnly;
 
 import java.io.Serializable;
 import java.util.NoSuchElementException;
@@ -19,7 +20,7 @@
  * {@code long} values. Head and tail will not wrap around; instead we use storage arrays sized to 2^N to allow fast
  * determination of storage indices through a mask operation.
  */
-public class LongRingBuffer implements Serializable {
+public class LongRingBuffer implements RingBuffer, Serializable {
     static final long FIXUP_THRESHOLD = 1L << 62;
     final boolean growable;
     long[] storage;
@@ -32,7 +33,7 @@ public class LongRingBuffer implements Serializable {
      *
      * @param capacity minimum capacity of the ring buffer
      */
-    public LongRingBuffer(int capacity) {
+    public LongRingBuffer(final int capacity) {
         this(capacity, true);
     }
 
@@ -42,7 +43,7 @@ public LongRingBuffer(int capacity) {
      * @param capacity minimum capacity of ring buffer
      * @param growable whether to allow growth when the buffer is full.
      */
-    public LongRingBuffer(int capacity, boolean growable) {
+    public LongRingBuffer(final int capacity, final boolean growable) {
         Assert.leq(capacity, "LongRingBuffer capacity", MathUtil.MAX_POWER_OF_2);
 
         this.growable = growable;
@@ -59,7 +60,7 @@ public LongRingBuffer(int capacity, boolean growable) {
      * 
      * @param increase Increase amount. The ring buffer's capacity will be increased by at least this amount.
      */
-    protected void grow(int increase) {
+    protected void grow(final int increase) {
         final int size = size();
         final long newCapacity = (long) storage.length + increase;
         // assert that we are not asking for the impossible
@@ -83,7 +84,7 @@ protected void grow(int increase) {
      * 
      * @param dest The destination buffer.
      */
-    protected void copyRingBufferToArray(long[] dest) {
+    protected void copyRingBufferToArray(final long[] dest) {
         final int size = size();
         final int storageHead = (int) (head & mask);
 
@@ -99,27 +100,35 @@ protected void copyRingBufferToArray(long[] dest) {
         System.arraycopy(storage, 0, dest, firstCopyLen, secondCopyLen);
     }
 
+    @Override
     public boolean isFull() {
         return size() == storage.length;
     }
 
+    @Override
     public boolean isEmpty() {
         return tail == head;
     }
 
+    @Override
     public int size() {
         return Math.toIntExact(tail - head);
     }
 
+    @Override
     public int capacity() {
         return storage.length;
     }
 
+    @Override
     public int remaining() {
         return storage.length - size();
     }
 
+    @Override
     public void clear() {
+        // region object-bulk-clear
+        // endregion object-bulk-clear
         tail = head = 0;
     }
 
@@ -131,7 +140,7 @@ public void clear() {
      * @throws UnsupportedOperationException when {@code growable} is {@code false} and buffer is full
      * @return {@code true} if the long was added successfully
      */
-    public boolean add(long e) {
+    public boolean add(final long e) {
         if (isFull()) {
             if (!growable) {
                 throw new UnsupportedOperationException("Ring buffer is full and growth is disabled");
@@ -151,7 +160,8 @@ public boolean add(long e) {
      * @param count the minimum number of empty entries in the buffer after this call
      * @throws UnsupportedOperationException when {@code growable} is {@code false} and buffer is full
      */
-    public void ensureRemaining(int count) {
+    @Override
+    public void ensureRemaining(final int count) {
         if (remaining() < count) {
             if (!growable) {
                 throw new UnsupportedOperationException("Ring buffer is full and growth is disabled");
@@ -168,7 +178,7 @@ public void ensureRemaining(int count) {
      *
      * @param e the value to add to the buffer
      */
-    public void addUnsafe(long e) {
+    public void addUnsafe(final long e) {
         // This is an extremely paranoid wrap check that in all likelihood will never run. With FIXUP_THRESHOLD at
         // 1 << 62, and the user pushing 2^32 values per second(!), it will take 68 years to wrap this counter .
         if (tail >= FIXUP_THRESHOLD) {
@@ -188,7 +198,7 @@ public void addUnsafe(long e) {
      * @param notFullResult value to return is the buffer is not full
      * @return the overwritten entry if the buffer is full, the provided value otherwise
      */
-    public long addOverwrite(long e, long notFullResult) {
+    public long addOverwrite(final long e, final long notFullResult) {
         long val = notFullResult;
         if (isFull()) {
             val = remove();
@@ -204,7 +214,7 @@ public long addOverwrite(long e, long notFullResult) {
      * @param e the long to be added to the buffer
      * @return true if the value was added successfully, false otherwise
      */
-    public boolean offer(long e) {
+    public boolean offer(final long e) {
         if (isFull()) {
             return false;
         }
@@ -218,7 +228,7 @@ public boolean offer(long e) {
      * @param count The number of elements to remove.
      * @throws NoSuchElementException if the buffer is empty
      */
-    public long[] remove(int count) {
+    public long[] remove(final int count) {
         final int size = size();
         if (size < count) {
             throw new NoSuchElementException();
@@ -264,7 +274,7 @@ public long removeUnsafe() {
      * @param onEmpty the value to return if the ring buffer is empty
      * @return The removed element if the ring buffer was non-empty, otherwise the value of 'onEmpty'
      */
-    public long poll(long onEmpty) {
+    public long poll(final long onEmpty) {
         if (isEmpty()) {
             return onEmpty;
         }
@@ -291,7 +301,7 @@ public long element() {
      * @param onEmpty the value to return if the ring buffer is empty
      * @return The head element if the ring buffer is non-empty, otherwise the value of 'onEmpty'
      */
-    public long peek(long onEmpty) {
+    public long peek(final long onEmpty) {
         if (isEmpty()) {
             return onEmpty;
         }
@@ -314,7 +324,7 @@ public long front() {
      * @throws NoSuchElementException if the buffer is empty
      * @return The element at the specified offset
      */
-    public long front(int offset) {
+    public long front(final int offset) {
         if (offset < 0 || offset >= size()) {
             throw new NoSuchElementException();
         }
@@ -341,7 +351,7 @@ public long back() {
      * @param onEmpty the value to return if the ring buffer is empty
      * @return The tail element if the ring buffer is non-empty, otherwise the value of 'onEmpty'
      */
-    public long peekBack(long onEmpty) {
+    public long peekBack(final long onEmpty) {
         if (isEmpty()) {
             return onEmpty;
         }
@@ -385,4 +395,14 @@ public void remove() {
             throw new UnsupportedOperationException();
         }
     }
+
+    /**
+     * Get the storage array for this ring buffer. This is intended for testing and debugging purposes only.
+     *
+     * @return The storage array for this ring buffer.
+     */
+    @TestOnly
+    public long[] getStorage() {
+        return storage;
+    }
 }
diff --git a/Base/src/main/java/io/deephaven/base/ringbuffer/ObjectRingBuffer.java b/Base/src/main/java/io/deephaven/base/ringbuffer/ObjectRingBuffer.java
index ad93ddd1f43..4c7dc788602 100644
--- a/Base/src/main/java/io/deephaven/base/ringbuffer/ObjectRingBuffer.java
+++ b/Base/src/main/java/io/deephaven/base/ringbuffer/ObjectRingBuffer.java
@@ -11,6 +11,7 @@
 
 import io.deephaven.base.MathUtil;
 import io.deephaven.base.verify.Assert;
+import org.jetbrains.annotations.TestOnly;
 
 import java.io.Serializable;
 import java.util.NoSuchElementException;
@@ -21,7 +22,7 @@
  * {@code long} values. Head and tail will not wrap around; instead we use storage arrays sized to 2^N to allow fast
  * determination of storage indices through a mask operation.
  */
-public class ObjectRingBuffer<T> implements Serializable {
+public class ObjectRingBuffer<T> implements RingBuffer, Serializable {
     static final long FIXUP_THRESHOLD = 1L << 62;
     final boolean growable;
     T[] storage;
@@ -34,7 +35,7 @@ public class ObjectRingBuffer<T> implements Serializable {
      *
      * @param capacity minimum capacity of the ring buffer
      */
-    public ObjectRingBuffer(int capacity) {
+    public ObjectRingBuffer(final int capacity) {
         this(capacity, true);
     }
 
@@ -44,7 +45,7 @@ public ObjectRingBuffer(int capacity) {
      * @param capacity minimum capacity of ring buffer
      * @param growable whether to allow growth when the buffer is full.
      */
-    public ObjectRingBuffer(int capacity, boolean growable) {
+    public ObjectRingBuffer(final int capacity, final boolean growable) {
         Assert.leq(capacity, "ObjectRingBuffer capacity", MathUtil.MAX_POWER_OF_2);
 
         this.growable = growable;
@@ -61,7 +62,7 @@ public ObjectRingBuffer(int capacity, boolean growable) {
      * 
      * @param increase Increase amount. The ring buffer's capacity will be increased by at least this amount.
      */
-    protected void grow(int increase) {
+    protected void grow(final int increase) {
         final int size = size();
         final long newCapacity = (long) storage.length + increase;
         // assert that we are not asking for the impossible
@@ -85,7 +86,7 @@ protected void grow(int increase) {
      * 
      * @param dest The destination buffer.
      */
-    protected void copyRingBufferToArray(T[] dest) {
+    protected void copyRingBufferToArray(final T[] dest) {
         final int size = size();
         final int storageHead = (int) (head & mask);
 
@@ -101,27 +102,43 @@ protected void copyRingBufferToArray(T[] dest) {
         System.arraycopy(storage, 0, dest, firstCopyLen, secondCopyLen);
     }
 
+    @Override
     public boolean isFull() {
         return size() == storage.length;
     }
 
+    @Override
     public boolean isEmpty() {
         return tail == head;
     }
 
+    @Override
     public int size() {
         return Math.toIntExact(tail - head);
     }
 
+    @Override
     public int capacity() {
         return storage.length;
     }
 
+    @Override
     public int remaining() {
         return storage.length - size();
     }
 
+    @Override
     public void clear() {
+        // region object-bulk-clear
+        final int storageHead = (int) (head & mask);
+        final int size = size();
+        // firstLen is either the size of the ring buffer or the distance from head to the end of the storage array.
+        final int firstLen = Math.min(storage.length - storageHead, size);
+        // secondLen is the number of elements remaining from the first clear.
+        final int secondLen = size - firstLen;
+        Arrays.fill(storage, storageHead, storageHead + firstLen, null);
+        Arrays.fill(storage, 0, secondLen, null);
+        // endregion object-bulk-clear
         tail = head = 0;
     }
 
@@ -133,7 +150,7 @@ public void clear() {
      * @throws UnsupportedOperationException when {@code growable} is {@code false} and buffer is full
      * @return {@code true} if the Object was added successfully
      */
-    public boolean add(T e) {
+    public boolean add(final T e) {
         if (isFull()) {
             if (!growable) {
                 throw new UnsupportedOperationException("Ring buffer is full and growth is disabled");
@@ -153,7 +170,8 @@ public boolean add(T e) {
      * @param count the minimum number of empty entries in the buffer after this call
      * @throws UnsupportedOperationException when {@code growable} is {@code false} and buffer is full
      */
-    public void ensureRemaining(int count) {
+    @Override
+    public void ensureRemaining(final int count) {
         if (remaining() < count) {
             if (!growable) {
                 throw new UnsupportedOperationException("Ring buffer is full and growth is disabled");
@@ -170,7 +188,7 @@ public void ensureRemaining(int count) {
      *
      * @param e the value to add to the buffer
      */
-    public void addUnsafe(T e) {
+    public void addUnsafe(final T e) {
         // This is an extremely paranoid wrap check that in all likelihood will never run. With FIXUP_THRESHOLD at
         // 1 << 62, and the user pushing 2^32 values per second(!), it will take 68 years to wrap this counter .
         if (tail >= FIXUP_THRESHOLD) {
@@ -190,7 +208,7 @@ public void addUnsafe(T e) {
      * @param notFullResult value to return is the buffer is not full
      * @return the overwritten entry if the buffer is full, the provided value otherwise
      */
-    public T addOverwrite(T e, T notFullResult) {
+    public T addOverwrite(final T e, final T notFullResult) {
         T val = notFullResult;
         if (isFull()) {
             val = remove();
@@ -206,7 +224,7 @@ public T addOverwrite(T e, T notFullResult) {
      * @param e the Object to be added to the buffer
      * @return true if the value was added successfully, false otherwise
      */
-    public boolean offer(T e) {
+    public boolean offer(final T e) {
         if (isFull()) {
             return false;
         }
@@ -220,7 +238,7 @@ public boolean offer(T e) {
      * @param count The number of elements to remove.
      * @throws NoSuchElementException if the buffer is empty
      */
-    public T[] remove(int count) {
+    public T[] remove(final int count) {
         final int size = size();
         if (size < count) {
             throw new NoSuchElementException();
@@ -281,7 +299,7 @@ public T removeUnsafe() {
      * @param onEmpty the value to return if the ring buffer is empty
      * @return The removed element if the ring buffer was non-empty, otherwise the value of 'onEmpty'
      */
-    public T poll(T onEmpty) {
+    public T poll(final T onEmpty) {
         if (isEmpty()) {
             return onEmpty;
         }
@@ -308,7 +326,7 @@ public T element() {
      * @param onEmpty the value to return if the ring buffer is empty
      * @return The head element if the ring buffer is non-empty, otherwise the value of 'onEmpty'
      */
-    public T peek(T onEmpty) {
+    public T peek(final T onEmpty) {
         if (isEmpty()) {
             return onEmpty;
         }
@@ -331,7 +349,7 @@ public T front() {
      * @throws NoSuchElementException if the buffer is empty
      * @return The element at the specified offset
      */
-    public T front(int offset) {
+    public T front(final int offset) {
         if (offset < 0 || offset >= size()) {
             throw new NoSuchElementException();
         }
@@ -358,7 +376,7 @@ public T back() {
      * @param onEmpty the value to return if the ring buffer is empty
      * @return The tail element if the ring buffer is non-empty, otherwise the value of 'onEmpty'
      */
-    public T peekBack(T onEmpty) {
+    public T peekBack(final T onEmpty) {
         if (isEmpty()) {
             return onEmpty;
         }
@@ -402,4 +420,14 @@ public void remove() {
             throw new UnsupportedOperationException();
         }
     }
+
+    /**
+     * Get the storage array for this ring buffer. This is intended for testing and debugging purposes only.
+     *
+     * @return The storage array for this ring buffer.
+     */
+    @TestOnly
+    public T[] getStorage() {
+        return storage;
+    }
 }
diff --git a/Base/src/main/java/io/deephaven/base/ringbuffer/RingBuffer.java b/Base/src/main/java/io/deephaven/base/ringbuffer/RingBuffer.java
new file mode 100644
index 00000000000..4c9f0b55a3e
--- /dev/null
+++ b/Base/src/main/java/io/deephaven/base/ringbuffer/RingBuffer.java
@@ -0,0 +1,79 @@
+//
+// Copyright (c) 2016-2024 Deephaven Data Labs and Patent Pending
+//
+package io.deephaven.base.ringbuffer;
+
+import org.jetbrains.annotations.NotNull;
+
+/**
+ * Generic interface for a ring buffer and factory methods for buffer creation.
+ */
+public interface RingBuffer {
+    @NotNull
+    static <T> RingBuffer makeRingBuffer(
+            @NotNull final Class<?> dataType,
+            final int capacity,
+            final boolean growable) {
+        final RingBuffer result;
+        if (dataType == char.class || dataType == Character.class) {
+            result = new CharRingBuffer(capacity, growable);
+        } else if (dataType == byte.class || dataType == Byte.class) {
+            result = new ByteRingBuffer(capacity, growable);
+        } else if (dataType == double.class || dataType == Double.class) {
+            result = new DoubleRingBuffer(capacity, growable);
+        } else if (dataType == float.class || dataType == Float.class) {
+            result = new FloatRingBuffer(capacity, growable);
+        } else if (dataType == int.class || dataType == Integer.class) {
+            result = new IntRingBuffer(capacity, growable);
+        } else if (dataType == long.class || dataType == Long.class) {
+            result = new LongRingBuffer(capacity, growable);
+        } else if (dataType == short.class || dataType == Short.class) {
+            result = new ShortRingBuffer(capacity, growable);
+        } else {
+            result = new ObjectRingBuffer<T>(capacity, growable);
+        }
+        return result;
+    }
+
+    /**
+     * Whether the buffer is completely full.
+     */
+    boolean isFull();
+
+    /**
+     * Whether the buffer is entirely empty.
+     */
+    boolean isEmpty();
+
+    /**
+     * Return how many items are currently in the buffer.
+     */
+    int size();
+
+    /**
+     * Return how many items can fit in the buffer at its current capacity. If the buffer can grow, this number can
+     * change.
+     */
+    int capacity();
+
+    /**
+     * Return how many free slots exist in this buffer at its current capacity.
+     */
+    int remaining();
+
+    /**
+     * Clear the buffer of all values. If this is an object ring buffer, this will additionally set all values to
+     * {@code null}.
+     */
+    void clear();
+
+    /**
+     * Ensure that at least {@code count} free slots are available in the buffer. If the buffer is growable, the
+     * capacity may be increased to accommodate the new slots. If the buffer is not growable and there are insufficient
+     * free slots, an {@link UnsupportedOperationException} will be thrown.
+     *
+     * @param count the number of free slots to ensure are available
+     * @throws UnsupportedOperationException if the buffer is not growable and there are insufficient free slots
+     */
+    void ensureRemaining(int count);
+}
diff --git a/Base/src/main/java/io/deephaven/base/ringbuffer/ShortRingBuffer.java b/Base/src/main/java/io/deephaven/base/ringbuffer/ShortRingBuffer.java
index 89619fb839c..94076d3a40f 100644
--- a/Base/src/main/java/io/deephaven/base/ringbuffer/ShortRingBuffer.java
+++ b/Base/src/main/java/io/deephaven/base/ringbuffer/ShortRingBuffer.java
@@ -9,6 +9,7 @@
 
 import io.deephaven.base.MathUtil;
 import io.deephaven.base.verify.Assert;
+import org.jetbrains.annotations.TestOnly;
 
 import java.io.Serializable;
 import java.util.NoSuchElementException;
@@ -19,7 +20,7 @@
  * {@code long} values. Head and tail will not wrap around; instead we use storage arrays sized to 2^N to allow fast
  * determination of storage indices through a mask operation.
  */
-public class ShortRingBuffer implements Serializable {
+public class ShortRingBuffer implements RingBuffer, Serializable {
     static final long FIXUP_THRESHOLD = 1L << 62;
     final boolean growable;
     short[] storage;
@@ -32,7 +33,7 @@ public class ShortRingBuffer implements Serializable {
      *
      * @param capacity minimum capacity of the ring buffer
      */
-    public ShortRingBuffer(int capacity) {
+    public ShortRingBuffer(final int capacity) {
         this(capacity, true);
     }
 
@@ -42,7 +43,7 @@ public ShortRingBuffer(int capacity) {
      * @param capacity minimum capacity of ring buffer
      * @param growable whether to allow growth when the buffer is full.
      */
-    public ShortRingBuffer(int capacity, boolean growable) {
+    public ShortRingBuffer(final int capacity, final boolean growable) {
         Assert.leq(capacity, "ShortRingBuffer capacity", MathUtil.MAX_POWER_OF_2);
 
         this.growable = growable;
@@ -59,7 +60,7 @@ public ShortRingBuffer(int capacity, boolean growable) {
      * 
      * @param increase Increase amount. The ring buffer's capacity will be increased by at least this amount.
      */
-    protected void grow(int increase) {
+    protected void grow(final int increase) {
         final int size = size();
         final long newCapacity = (long) storage.length + increase;
         // assert that we are not asking for the impossible
@@ -83,7 +84,7 @@ protected void grow(int increase) {
      * 
      * @param dest The destination buffer.
      */
-    protected void copyRingBufferToArray(short[] dest) {
+    protected void copyRingBufferToArray(final short[] dest) {
         final int size = size();
         final int storageHead = (int) (head & mask);
 
@@ -99,27 +100,35 @@ protected void copyRingBufferToArray(short[] dest) {
         System.arraycopy(storage, 0, dest, firstCopyLen, secondCopyLen);
     }
 
+    @Override
     public boolean isFull() {
         return size() == storage.length;
     }
 
+    @Override
     public boolean isEmpty() {
         return tail == head;
     }
 
+    @Override
     public int size() {
         return Math.toIntExact(tail - head);
     }
 
+    @Override
     public int capacity() {
         return storage.length;
     }
 
+    @Override
     public int remaining() {
         return storage.length - size();
     }
 
+    @Override
     public void clear() {
+        // region object-bulk-clear
+        // endregion object-bulk-clear
         tail = head = 0;
     }
 
@@ -131,7 +140,7 @@ public void clear() {
      * @throws UnsupportedOperationException when {@code growable} is {@code false} and buffer is full
      * @return {@code true} if the short was added successfully
      */
-    public boolean add(short e) {
+    public boolean add(final short e) {
         if (isFull()) {
             if (!growable) {
                 throw new UnsupportedOperationException("Ring buffer is full and growth is disabled");
@@ -151,7 +160,8 @@ public boolean add(short e) {
      * @param count the minimum number of empty entries in the buffer after this call
      * @throws UnsupportedOperationException when {@code growable} is {@code false} and buffer is full
      */
-    public void ensureRemaining(int count) {
+    @Override
+    public void ensureRemaining(final int count) {
         if (remaining() < count) {
             if (!growable) {
                 throw new UnsupportedOperationException("Ring buffer is full and growth is disabled");
@@ -168,7 +178,7 @@ public void ensureRemaining(int count) {
      *
      * @param e the value to add to the buffer
      */
-    public void addUnsafe(short e) {
+    public void addUnsafe(final short e) {
         // This is an extremely paranoid wrap check that in all likelihood will never run. With FIXUP_THRESHOLD at
         // 1 << 62, and the user pushing 2^32 values per second(!), it will take 68 years to wrap this counter .
         if (tail >= FIXUP_THRESHOLD) {
@@ -188,7 +198,7 @@ public void addUnsafe(short e) {
      * @param notFullResult value to return is the buffer is not full
      * @return the overwritten entry if the buffer is full, the provided value otherwise
      */
-    public short addOverwrite(short e, short notFullResult) {
+    public short addOverwrite(final short e, final short notFullResult) {
         short val = notFullResult;
         if (isFull()) {
             val = remove();
@@ -204,7 +214,7 @@ public short addOverwrite(short e, short notFullResult) {
      * @param e the short to be added to the buffer
      * @return true if the value was added successfully, false otherwise
      */
-    public boolean offer(short e) {
+    public boolean offer(final short e) {
         if (isFull()) {
             return false;
         }
@@ -218,7 +228,7 @@ public boolean offer(short e) {
      * @param count The number of elements to remove.
      * @throws NoSuchElementException if the buffer is empty
      */
-    public short[] remove(int count) {
+    public short[] remove(final int count) {
         final int size = size();
         if (size < count) {
             throw new NoSuchElementException();
@@ -264,7 +274,7 @@ public short removeUnsafe() {
      * @param onEmpty the value to return if the ring buffer is empty
      * @return The removed element if the ring buffer was non-empty, otherwise the value of 'onEmpty'
      */
-    public short poll(short onEmpty) {
+    public short poll(final short onEmpty) {
         if (isEmpty()) {
             return onEmpty;
         }
@@ -291,7 +301,7 @@ public short element() {
      * @param onEmpty the value to return if the ring buffer is empty
      * @return The head element if the ring buffer is non-empty, otherwise the value of 'onEmpty'
      */
-    public short peek(short onEmpty) {
+    public short peek(final short onEmpty) {
         if (isEmpty()) {
             return onEmpty;
         }
@@ -314,7 +324,7 @@ public short front() {
      * @throws NoSuchElementException if the buffer is empty
      * @return The element at the specified offset
      */
-    public short front(int offset) {
+    public short front(final int offset) {
         if (offset < 0 || offset >= size()) {
             throw new NoSuchElementException();
         }
@@ -341,7 +351,7 @@ public short back() {
      * @param onEmpty the value to return if the ring buffer is empty
      * @return The tail element if the ring buffer is non-empty, otherwise the value of 'onEmpty'
      */
-    public short peekBack(short onEmpty) {
+    public short peekBack(final short onEmpty) {
         if (isEmpty()) {
             return onEmpty;
         }
@@ -385,4 +395,14 @@ public void remove() {
             throw new UnsupportedOperationException();
         }
     }
+
+    /**
+     * Get the storage array for this ring buffer. This is intended for testing and debugging purposes only.
+     *
+     * @return The storage array for this ring buffer.
+     */
+    @TestOnly
+    public short[] getStorage() {
+        return storage;
+    }
 }
diff --git a/Base/src/main/java/io/deephaven/base/stats/Composite.java b/Base/src/main/java/io/deephaven/base/stats/Composite.java
index 81c66d4f55f..676bf593bf3 100644
--- a/Base/src/main/java/io/deephaven/base/stats/Composite.java
+++ b/Base/src/main/java/io/deephaven/base/stats/Composite.java
@@ -25,13 +25,13 @@ public Composite(long now, Value... values) {
 
     // ----------------------------------------------------------------
     private static Value[] checkValues(Value[] values) {
-        Require.neqNull(values, "values", 1);
-        Require.gtZero(values.length, "values.length", 1);
-        Require.neqNull(values[0], "values[0]", 1);
+        Require.neqNull(values, "values");
+        Require.gtZero(values.length, "values.length");
+        Require.neqNull(values[0], "values[0]");
         char typeTag = values[0].getTypeTag();
         for (int nIndex = 1; nIndex < values.length; nIndex++) {
-            Require.neqNull(values[nIndex], "values[nIndex]", 1);
-            Require.eq(values[nIndex].getTypeTag(), "values[nIndex].getTypeTag()", typeTag, "typeTag", 1);
+            Require.neqNull(values[nIndex], "values[nIndex]");
+            Require.eq(values[nIndex].getTypeTag(), "values[nIndex].getTypeTag()", typeTag, "typeTag");
         }
         return values;
     }
diff --git a/Base/src/main/java/io/deephaven/base/verify/Assert.java b/Base/src/main/java/io/deephaven/base/verify/Assert.java
index 4e01086ae14..ee33fe7af0a 100644
--- a/Base/src/main/java/io/deephaven/base/verify/Assert.java
+++ b/Base/src/main/java/io/deephaven/base/verify/Assert.java
@@ -3,7 +3,6 @@
 //
 package io.deephaven.base.verify;
 
-import java.awt.EventQueue;
 import java.util.function.Consumer;
 
 // --------------------------------------------------------------------
@@ -24,12 +23,6 @@
  * <li>void valuesNeverOccur(value0, name0, value1, name1, ... )
  * </ul>
  * <ul>
- * <li>void holdsLock/notHoldsLock(Object, String name)
- * </ul>
- * <ul>
- * <li>void instanceOf/notInstanceOf(Object, String name, Class type[, int numCallsBelowRequirer])
- * </ul>
- * <ul>
  * <li>void eq/neq(boolean/char/byte/short/int/long/float/double, String name0,
  * boolean/char/byte/short/int/long/float/double[, String name1])
  * <li>void lt/leq/gt/geq(char/byte/short/int/long/float/double, String name0, char/byte/short/int/long/float/double[,
@@ -317,67 +310,6 @@ public static AssertionFailure valueNeverOccurs(double d, String name) {
         return null;
     }
 
-    // ################################################################
-    // holdsLock, notHoldsLock
-
-    // ----------------------------------------------------------------
-    /** assert (o != null &amp;&amp; (current thread holds o's lock)) */
-    public static void holdsLock(Object o, String name) {
-        neqNull(o, "o");
-        if (!Thread.holdsLock(o)) {
-            fail("\"" + Thread.currentThread().getName() + "\".holdsLock(" + name + ")");
-        }
-    }
-
-    // ----------------------------------------------------------------
-    /** assert (o != null &amp;&amp; !(current thread holds o's lock)) */
-    public static void notHoldsLock(Object o, String name) {
-        neqNull(o, "o");
-        if (Thread.holdsLock(o)) {
-            fail("!\"" + Thread.currentThread().getName() + "\".holdsLock(" + name + ")");
-        }
-    }
-
-    // ################################################################
-    // instanceOf, notInstanceOf
-
-    // ----------------------------------------------------------------
-    /** assert (o instanceof type) */
-    public static void instanceOf(Object o, String name, Class<?> type) {
-        if (!type.isInstance(o)) {
-            fail(name + " instanceof " + type, null == o ? ExceptionMessageUtil.valueAndName(o, name)
-                    : name + " instanceof " + o.getClass() + " (" + ExceptionMessageUtil.valueAndName(o, name) + ")");
-        }
-    }
-
-    // ----------------------------------------------------------------
-    /** assert !(o instanceof type) */
-    public static void notInstanceOf(Object o, String name, Class<?> type) {
-        if (type.isInstance(o)) {
-            fail("!(" + name + " instanceof " + type + ")",
-                    name + " instanceof " + o.getClass() + " (" + ExceptionMessageUtil.valueAndName(o, name) + ")");
-        }
-    }
-
-    // ################################################################
-    // isAWTThread, isNotAWTThread
-
-    // ----------------------------------------------------------------
-    /** assert (current thread is AWT Event Dispatch Thread) */
-    public static void isAWTThread() {
-        if (!EventQueue.isDispatchThread()) {
-            fail("\"" + Thread.currentThread().getName() + "\".isAWTThread()");
-        }
-    }
-
-    // ----------------------------------------------------------------
-    /** assert (current thread is AWT Event Dispatch Thread) */
-    public static void isNotAWTThread() {
-        if (EventQueue.isDispatchThread()) {
-            fail("!\"" + Thread.currentThread().getName() + "\".isAWTThread()");
-        }
-    }
-
     // ################################################################
     // eq (primitiveValue == primitiveValue)
 
diff --git a/Base/src/main/java/io/deephaven/base/verify/Require.java b/Base/src/main/java/io/deephaven/base/verify/Require.java
index 8b5dbef0961..19607f45aea 100644
--- a/Base/src/main/java/io/deephaven/base/verify/Require.java
+++ b/Base/src/main/java/io/deephaven/base/verify/Require.java
@@ -5,9 +5,7 @@
 
 import org.jetbrains.annotations.NotNull;
 
-import java.awt.EventQueue;
 import java.util.Collection;
-import java.util.Collections;
 import java.util.Map;
 import java.util.Objects;
 import java.util.function.Consumer;
@@ -18,42 +16,35 @@
  * <p>
  * Methods:
  * <ul>
- * <li>void requirement(boolean condition, String conditionText[, String detailMessage][, int numCallsBelowRequirer])
- * <li>void requirement(boolean condition, String conditionText, value0, String name0, value1, String name1, ... [, int
- * numCallsBelowRequirer])
+ * <li>void requirement(boolean condition, String conditionText[, String detailMessage])
+ * <li>void requirement(boolean condition, String conditionText, value0, String name0, value1, String name1, ... )
  * </ul>
  * <ul>
- * <li>void statementNeverExecuted([int numCallsBelowRequirer])
- * <li>void statementNeverExecuted(String statementDescription[, int numCallsBelowRequirer])
- * <li>void exceptionNeverCaught(Exception caughtException[, int numCallsBelowRequirer])
- * <li>void exceptionNeverCaught(String tryStatementDescription, Exception caughtException[, int numCallsBelowRequirer])
- * <li>void valueNeverOccurs(value, String name[, int numCallsBelowRequirer])
- * <li>void valuesNeverOccur(value0, name0, value1, name1, ... [, int numCallsBelowRequirer])
- * </ul>
- * <ul>
- * <li>void holdsLock/notHoldsLock(Object, String name[, int numCallsBelowRequirer])
- * </ul>
- * <ul>
- * <li>void instanceOf/notInstanceOf(Object, String name, Class type[, int numCallsBelowRequirer])
+ * <li>void statementNeverExecuted()
+ * <li>void statementNeverExecuted(String statementDescription)
+ * <li>void exceptionNeverCaught(Exception caughtException)
+ * <li>void exceptionNeverCaught(String tryStatementDescription, Exception caughtException)
+ * <li>void valueNeverOccurs(value, String name)
+ * <li>void valuesNeverOccur(value0, name0, value1, name1, ... )
  * </ul>
  * <ul>
  * <li>void eq/neq(boolean/char/byte/short/int/long/float/double, String name0,
- * boolean/char/byte/short/int/long/float/double[, String name1][, int numCallsBelowRequirer])
+ * boolean/char/byte/short/int/long/float/double[, String name1])
  * <li>void lt/leq/gt/geq(char/byte/short/int/long/float/double, String name0, char/byte/short/int/long/float/double[,
- * String name1][, int numCallsBelowRequirer])
+ * String name1])
  * </ul>
  * <ul>
- * <li>void eqFalse/neqFalse/eqTrue/neqTrue(boolean, String name[, int numCallsBelowRequirer])
- * <li>void eqZero/neqZero(char/byte/short/int/long/float/double, String name[, int numCallsBelowRequirer])
- * <li>void ltZero/leqZero/gtZero/geqZero(byte/short/int/long/float/double, String name[, int numCallsBelowRequirer])
+ * <li>void eqFalse/neqFalse/eqTrue/neqTrue(boolean, String name)
+ * <li>void eqZero/neqZero(char/byte/short/int/long/float/double, String name)
+ * <li>void ltZero/leqZero/gtZero/geqZero(byte/short/int/long/float/double, String name)
  * </ul>
  * <ul>
- * <li>void eq/neq(Object, name0, Object[, name1][, int numCallsBelowRequirer])
- * <li>void eqNull/neqNull(Object, String name[, int numCallsBelowRequirer])
+ * <li>void eq/neq(Object, name0, Object[, name1])
+ * <li>void eqNull/neqNull(Object, String name)
  * </ul>
  * <ul>
- * <li>void equals(Object, String name0, Object, String name1[, int numCallsBelowRequirer])
- * <li>void nonempty(String, String name[, int numCallsBelowRequirer])
+ * <li>void equals(Object, String name0, Object, String name1)
+ * <li>void nonempty(String, String name)
  * </ul>
  * <p>
  * Naming Rationale:
@@ -89,10 +80,9 @@ private Require() {}
     // Handle failed requirements
 
     // ----------------------------------------------------------------
-    private static void fail(String conditionText, int numCallsBelowRequirer) {
+    private static void fail(String conditionText) {
         final RequirementFailure requirementFailure = new RequirementFailure(
-                ExceptionMessageUtil.failureMessage("Requirement", "required", conditionText, null),
-                numCallsBelowRequirer + 1);
+                ExceptionMessageUtil.failureMessage("Requirement", "required", conditionText, null));
         if (onFailureCallback != null) {
             try {
                 onFailureCallback.accept(requirementFailure);
@@ -103,10 +93,9 @@ private static void fail(String conditionText, int numCallsBelowRequirer) {
     }
 
     // ----------------------------------------------------------------
-    private static void fail(String conditionText, String detailMessage, int numCallsBelowRequirer) {
+    private static void fail(String conditionText, String detailMessage) {
         final RequirementFailure requirementFailure = new RequirementFailure(
-                ExceptionMessageUtil.failureMessage("Requirement", "required", conditionText, detailMessage),
-                numCallsBelowRequirer + 1);
+                ExceptionMessageUtil.failureMessage("Requirement", "required", conditionText, detailMessage));
         if (onFailureCallback != null) {
             try {
                 onFailureCallback.accept(requirementFailure);
@@ -120,248 +109,143 @@ private static void fail(String conditionText, String detailMessage, int numCall
     // requirement
 
     // ----------------------------------------------------------------
-    /**
-     * require (condition, conditionText)
-     */
-    public static void requirement(boolean condition, String conditionText, int numCallsBelowRequirer) {
-        if (!(condition)) {
-            fail(conditionText, numCallsBelowRequirer + 1);
-        }
-    }
 
     public static void requirement(boolean condition, String conditionText) {
-        requirement(condition, conditionText, 1);
-    }
-
-    // ----------------------------------------------------------------
-    /**
-     * require (condition, conditionText, detailMessage)
-     */
-    public static void requirement(boolean condition, String conditionText, String detailMessage,
-            int numCallsBelowRequirer) {
         if (!(condition)) {
-            fail(conditionText, detailMessage, numCallsBelowRequirer + 1);
+            fail(conditionText);
         }
     }
 
-    public static void requirement(boolean condition, String conditionText, String detailMessage) {
-        requirement(condition, conditionText, detailMessage, 1);
-    }
-
     // ----------------------------------------------------------------
-    /**
-     * require (condition, Object o0, String name0, ... )
-     */
-    public static void requirement(boolean condition, String conditionText, Object o0, String name0,
-            int numCallsBelowRequirer) {
+
+    public static void requirement(boolean condition, String conditionText, String detailMessage) {
         if (!(condition)) {
-            fail(conditionText, ExceptionMessageUtil.valueAndName(o0, name0), numCallsBelowRequirer + 1);
+            fail(conditionText, detailMessage);
         }
     }
 
-    public static void requirement(boolean condition, String conditionText, Object o0, String name0) {
-        requirement(condition, conditionText, o0, name0, 1);
-    }
+    // ----------------------------------------------------------------
 
-    public static void requirement(boolean condition, String conditionText, Object o0, String name0, Object o1,
-            String name1, int numCallsBelowRequirer) {
+    public static void requirement(boolean condition, String conditionText, Object o0, String name0) {
         if (!(condition)) {
-            fail(conditionText, ExceptionMessageUtil.valueAndName(o0, name0, o1, name1), numCallsBelowRequirer + 1);
+            fail(conditionText, ExceptionMessageUtil.valueAndName(o0, name0));
         }
     }
 
     public static void requirement(boolean condition, String conditionText, Object o0, String name0, Object o1,
             String name1) {
-        requirement(condition, conditionText, o0, name0, o1, name1, 1);
-    }
-
-    public static void requirement(boolean condition, String conditionText, Object o0, String name0, Object o1,
-            String name1, Object o2, String name2, int numCallsBelowRequirer) {
-        if (!(condition)) {
-            fail(conditionText, ExceptionMessageUtil.valueAndName(o0, name0, o1, name1, o2, name2),
-                    numCallsBelowRequirer + 1);
-        }
-    }
-
-    public static void requirement(boolean condition, String conditionText, long o0, String name0, long o1,
-            String name1, long o2, String name2, int numCallsBelowRequirer) {
         if (!(condition)) {
-            fail(conditionText, ExceptionMessageUtil.valueAndName(o0, name0, o1, name1, o2, name2),
-                    numCallsBelowRequirer + 1);
+            fail(conditionText, ExceptionMessageUtil.valueAndName(o0, name0, o1, name1));
         }
     }
 
     public static void requirement(boolean condition, String conditionText, Object o0, String name0, Object o1,
             String name1, Object o2, String name2) {
-        requirement(condition, conditionText, o0, name0, o1, name1, o2, name2, 1);
+        if (!(condition)) {
+            fail(conditionText, ExceptionMessageUtil.valueAndName(o0, name0, o1, name1, o2, name2));
+        }
     }
 
     public static void requirement(boolean condition, String conditionText, long o0, String name0, long o1,
             String name1, long o2, String name2) {
-        requirement(condition, conditionText, o0, name0, o1, name1, o2, name2, 1);
-    }
-
-    public static void requirement(boolean condition, String conditionText, Object o0, String name0, Object o1,
-            String name1, Object o2, String name2, Object o3, String name3, int numCallsBelowRequirer) {
         if (!(condition)) {
-            fail(conditionText, ExceptionMessageUtil.valueAndName(o0, name0, o1, name1, o2, name2, o3, name3),
-                    numCallsBelowRequirer + 1);
+            fail(conditionText, ExceptionMessageUtil.valueAndName(o0, name0, o1, name1, o2, name2));
         }
     }
 
     public static void requirement(boolean condition, String conditionText, Object o0, String name0, Object o1,
             String name1, Object o2, String name2, Object o3, String name3) {
-        requirement(condition, conditionText, o0, name0, o1, name1, o2, name2, o3, name3, 1);
-    }
-
-    // ----------------------------------------------------------------
-    /**
-     * require (condition, boolean b0, String name0, ... )
-     */
-    public static void requirement(boolean condition, String conditionText, boolean b0, String name0,
-            int numCallsBelowRequirer) {
         if (!(condition)) {
-            fail(conditionText, ExceptionMessageUtil.valueAndName(b0, name0), numCallsBelowRequirer + 1);
+            fail(conditionText, ExceptionMessageUtil.valueAndName(o0, name0, o1, name1, o2, name2, o3, name3));
         }
     }
 
-    public static void requirement(boolean condition, String conditionText, boolean b0, String name0) {
-        requirement(condition, conditionText, b0, name0, 1);
-    }
+    // ----------------------------------------------------------------
 
-    public static void requirement(boolean condition, String conditionText, boolean b0, String name0, boolean b1,
-            String name1, int numCallsBelowRequirer) {
+    public static void requirement(boolean condition, String conditionText, boolean b0, String name0) {
         if (!(condition)) {
-            fail(conditionText, ExceptionMessageUtil.valueAndName(b0, name0, b1, name1), numCallsBelowRequirer + 1);
+            fail(conditionText, ExceptionMessageUtil.valueAndName(b0, name0));
         }
     }
 
     public static void requirement(boolean condition, String conditionText, boolean b0, String name0, boolean b1,
             String name1) {
-        requirement(condition, conditionText, b0, name0, b1, name1, 1);
-    }
-
-    public static void requirement(boolean condition, String conditionText, boolean b0, String name0, double d1,
-            String name1, int numCallsBelowRequirer) {
         if (!(condition)) {
-            fail(conditionText, ExceptionMessageUtil.concat(ExceptionMessageUtil.valueAndName(b0, name0),
-                    ExceptionMessageUtil.valueAndName(d1, name1)), numCallsBelowRequirer + 1);
+            fail(conditionText, ExceptionMessageUtil.valueAndName(b0, name0, b1, name1));
         }
     }
 
     public static void requirement(boolean condition, String conditionText, boolean b0, String name0, double d1,
             String name1) {
-        requirement(condition, conditionText, b0, name0, d1, name1, 1);
-    }
-
-    public static void requirement(boolean condition, String conditionText, boolean b0, String name0, boolean b1,
-            String name1, boolean b2, String name2, int numCallsBelowRequirer) {
         if (!(condition)) {
-            fail(conditionText, ExceptionMessageUtil.valueAndName(b0, name0, b1, name1, b2, name2),
-                    numCallsBelowRequirer + 1);
+            fail(conditionText, ExceptionMessageUtil.concat(ExceptionMessageUtil.valueAndName(b0, name0),
+                    ExceptionMessageUtil.valueAndName(d1, name1)));
         }
     }
 
     public static void requirement(boolean condition, String conditionText, boolean b0, String name0, boolean b1,
             String name1, boolean b2, String name2) {
-        requirement(condition, conditionText, b0, name0, b1, name1, b2, name2, 1);
-    }
-
-    public static void requirement(boolean condition, String conditionText, boolean b0, String name0, boolean b1,
-            String name1, boolean b2, String name2, boolean b3, String name3, int numCallsBelowRequirer) {
         if (!(condition)) {
-            fail(conditionText, ExceptionMessageUtil.valueAndName(b0, name0, b1, name1, b2, name2, b3, name3),
-                    numCallsBelowRequirer + 1);
+            fail(conditionText, ExceptionMessageUtil.valueAndName(b0, name0, b1, name1, b2, name2));
         }
     }
 
     public static void requirement(boolean condition, String conditionText, boolean b0, String name0, boolean b1,
             String name1, boolean b2, String name2, boolean b3, String name3) {
-        requirement(condition, conditionText, b0, name0, b1, name1, b2, name2, b3, name3, 1);
-    }
-
-    // ----------------------------------------------------------------
-    /**
-     * require (condition, int i0, String name0, ... )
-     */
-    public static void requirement(boolean condition, String conditionText, int i0, String name0,
-            int numCallsBelowRequirer) {
         if (!(condition)) {
-            fail(conditionText, ExceptionMessageUtil.valueAndName(i0, name0), numCallsBelowRequirer + 1);
+            fail(conditionText, ExceptionMessageUtil.valueAndName(b0, name0, b1, name1, b2, name2, b3, name3));
         }
     }
 
-    public static void requirement(boolean condition, String conditionText, int i0, String name0) {
-        requirement(condition, conditionText, i0, name0, 1);
-    }
+    // ----------------------------------------------------------------
 
-    public static void requirement(boolean condition, String conditionText, int i0, String name0, int i1, String name1,
-            int numCallsBelowRequirer) {
+    public static void requirement(boolean condition, String conditionText, int i0, String name0) {
         if (!(condition)) {
-            fail(conditionText, ExceptionMessageUtil.valueAndName(i0, name0, i1, name1), numCallsBelowRequirer + 1);
+            fail(conditionText, ExceptionMessageUtil.valueAndName(i0, name0));
         }
     }
 
     public static void requirement(boolean condition, String conditionText, int i0, String name0, int i1,
             String name1) {
-        requirement(condition, conditionText, i0, name0, i1, name1, 1);
-    }
-
-    // ----------------------------------------------------------------
-    /**
-     * require (condition, long l0, String name0, ... )
-     */
-    public static void requirement(boolean condition, String conditionText, long l0, String name0,
-            int numCallsBelowRequirer) {
         if (!(condition)) {
-            fail(conditionText, ExceptionMessageUtil.valueAndName(l0, name0), numCallsBelowRequirer + 1);
+            fail(conditionText, ExceptionMessageUtil.valueAndName(i0, name0, i1, name1));
         }
     }
 
+    // ----------------------------------------------------------------
+
     public static void requirement(boolean condition, String conditionText, long l0, String name0) {
-        requirement(condition, conditionText, l0, name0, 1);
+        if (!(condition)) {
+            fail(conditionText, ExceptionMessageUtil.valueAndName(l0, name0));
+        }
     }
 
     // ################################################################
     // statementNeverExecuted
 
     // ----------------------------------------------------------------
-    /**
-     * require (this statement is never executed)
-     */
-    public static RequirementFailure statementNeverExecuted(int numCallsBelowRequirer) {
-        fail("statement is never executed", numCallsBelowRequirer + 1);
-        return null;
-    }
 
     public static RequirementFailure statementNeverExecuted() {
-        return statementNeverExecuted(1);
+        fail("statement is never executed");
+        return null;
     }
 
     // ----------------------------------------------------------------
-    /**
-     * require (statementDescription is never executed)
-     */
-    public static RequirementFailure statementNeverExecuted(String statementDescription, int numCallsBelowRequirer) {
-        fail(statementDescription + " is never executed", numCallsBelowRequirer + 1);
-        return null;
-    }
 
     public static RequirementFailure statementNeverExecuted(String statementDescription) {
-        return statementNeverExecuted(statementDescription, 1);
+        fail(statementDescription + " is never executed");
+        return null;
     }
 
     // ################################################################
     // exceptionNeverCaught
 
     // ----------------------------------------------------------------
-    /**
-     * require (this exception is never caught, Exception e)
-     */
-    public static RequirementFailure exceptionNeverCaught(Exception e, int numCallsBelowRequirer) {
+
+    public static RequirementFailure exceptionNeverCaught(Exception e) {
         try {
             fail(e.getClass().getName() + " is never caught",
-                    e.getClass().getName() + "(" + e.getMessage() + ") caught", numCallsBelowRequirer + 1);
+                    e.getClass().getName() + "(" + e.getMessage() + ") caught");
         } catch (RequirementFailure requirementFailure) {
             requirementFailure.initCause(e);
             throw requirementFailure;
@@ -369,19 +253,11 @@ public static RequirementFailure exceptionNeverCaught(Exception e, int numCallsB
         return null;
     }
 
-    public static RequirementFailure exceptionNeverCaught(Exception e) {
-        return exceptionNeverCaught(e, 1);
-    }
-
     // ----------------------------------------------------------------
-    /**
-     * require (tryStatementDescription succeeds, Exception e)
-     */
-    public static RequirementFailure exceptionNeverCaught(String tryStatementDescription, Exception e,
-            int numCallsBelowRequirer) {
+
+    public static RequirementFailure exceptionNeverCaught(String tryStatementDescription, Exception e) {
         try {
-            fail(tryStatementDescription + " succeeds", e.getClass().getName() + "(" + e.getMessage() + ") caught",
-                    numCallsBelowRequirer + 1);
+            fail(tryStatementDescription + " succeeds", e.getClass().getName() + "(" + e.getMessage() + ") caught");
         } catch (RequirementFailure requirementFailure) {
             requirementFailure.initCause(e);
             throw requirementFailure;
@@ -389,1409 +265,763 @@ public static RequirementFailure exceptionNeverCaught(String tryStatementDescrip
         return null;
     }
 
-    public static RequirementFailure exceptionNeverCaught(String tryStatementDescription, Exception e) {
-        return exceptionNeverCaught(tryStatementDescription, e, 1);
-    }
-
     // ################################################################
     // valueNeverOccurs
 
     // ----------------------------------------------------------------
-    /**
-     * require (this value never occurs, Object o, name)
-     */
-    public static RequirementFailure valueNeverOccurs(Object o, String name, int numCallsBelowRequirer) {
-        fail(ExceptionMessageUtil.valueAndName(o, name) + " never occurs", numCallsBelowRequirer + 1);
-        return null;
-    }
 
     public static RequirementFailure valueNeverOccurs(Object o, String name) {
-        return valueNeverOccurs(o, name, 1);
+        fail(ExceptionMessageUtil.valueAndName(o, name) + " never occurs");
+        return null;
     }
 
     // ----------------------------------------------------------------
-    /**
-     * require (this value never occurs, boolean b, name)
-     */
-    public static RequirementFailure valueNeverOccurs(boolean b, String name, int numCallsBelowRequirer) {
-        fail(ExceptionMessageUtil.valueAndName(b, name) + " never occurs", numCallsBelowRequirer + 1);
-        return null;
-    }
 
     public static RequirementFailure valueNeverOccurs(boolean b, String name) {
-        return valueNeverOccurs(b, name, 1);
+        fail(ExceptionMessageUtil.valueAndName(b, name) + " never occurs");
+        return null;
     }
 
     // ----------------------------------------------------------------
-    /**
-     * require (this value never occurs, char c, name)
-     */
-    public static RequirementFailure valueNeverOccurs(char c, String name, int numCallsBelowRequirer) {
-        fail(ExceptionMessageUtil.valueAndName(c, name) + " never occurs", numCallsBelowRequirer + 1);
-        return null;
-    }
 
     public static RequirementFailure valueNeverOccurs(char c, String name) {
-        return valueNeverOccurs(c, name, 1);
+        fail(ExceptionMessageUtil.valueAndName(c, name) + " never occurs");
+        return null;
     }
 
     // ----------------------------------------------------------------
-    /**
-     * require (this value never occurs, byte b, name)
-     */
-    public static RequirementFailure valueNeverOccurs(byte b, String name, int numCallsBelowRequirer) {
-        fail(ExceptionMessageUtil.valueAndName(b, name) + " never occurs", numCallsBelowRequirer + 1);
-        return null;
-    }
 
     public static RequirementFailure valueNeverOccurs(byte b, String name) {
-        return valueNeverOccurs(b, name, 1);
+        fail(ExceptionMessageUtil.valueAndName(b, name) + " never occurs");
+        return null;
     }
 
     // ----------------------------------------------------------------
-    /**
-     * require (this value never occurs, short s, name)
-     */
-    public static RequirementFailure valueNeverOccurs(short s, String name, int numCallsBelowRequirer) {
-        fail(ExceptionMessageUtil.valueAndName(s, name) + " never occurs", numCallsBelowRequirer + 1);
-        return null;
-    }
 
     public static RequirementFailure valueNeverOccurs(short s, String name) {
-        return valueNeverOccurs(s, name, 1);
+        fail(ExceptionMessageUtil.valueAndName(s, name) + " never occurs");
+        return null;
     }
 
     // ----------------------------------------------------------------
-    /**
-     * require (this value never occurs, int i, name)
-     */
-    public static RequirementFailure valueNeverOccurs(int i, String name, int numCallsBelowRequirer) {
-        fail(ExceptionMessageUtil.valueAndName(i, name) + " never occurs", numCallsBelowRequirer + 1);
-        return null;
-    }
 
     public static RequirementFailure valueNeverOccurs(int i, String name) {
-        return valueNeverOccurs(i, name, 1);
+        fail(ExceptionMessageUtil.valueAndName(i, name) + " never occurs");
+        return null;
     }
 
     // ----------------------------------------------------------------
-    /**
-     * require (this value never occurs, long l, name)
-     */
-    public static RequirementFailure valueNeverOccurs(long l, String name, int numCallsBelowRequirer) {
-        fail(ExceptionMessageUtil.valueAndName(l, name) + " never occurs", numCallsBelowRequirer + 1);
-        return null;
-    }
 
     public static RequirementFailure valueNeverOccurs(long l, String name) {
-        return valueNeverOccurs(l, name, 1);
+        fail(ExceptionMessageUtil.valueAndName(l, name) + " never occurs");
+        return null;
     }
 
     // ----------------------------------------------------------------
-    /**
-     * require (this value never occurs, float f, name)
-     */
-    public static RequirementFailure valueNeverOccurs(float f, String name, int numCallsBelowRequirer) {
-        fail(ExceptionMessageUtil.valueAndName(f, name) + " never occurs", numCallsBelowRequirer + 1);
-        return null;
-    }
 
     public static RequirementFailure valueNeverOccurs(float f, String name) {
-        return valueNeverOccurs(f, name, 1);
+        fail(ExceptionMessageUtil.valueAndName(f, name) + " never occurs");
+        return null;
     }
 
     // ----------------------------------------------------------------
-    /**
-     * require (this value never occurs, double d, name)
-     */
-    public static RequirementFailure valueNeverOccurs(double d, String name, int numCallsBelowRequirer) {
-        fail(ExceptionMessageUtil.valueAndName(d, name) + " never occurs", numCallsBelowRequirer + 1);
-        return null;
-    }
 
     public static RequirementFailure valueNeverOccurs(double d, String name) {
-        return valueNeverOccurs(d, name, 1);
+        fail(ExceptionMessageUtil.valueAndName(d, name) + " never occurs");
+        return null;
     }
 
     // ################################################################
-    // holdsLock, notHoldsLock
+    // eq (primitiveValue == primitiveValue)
 
     // ----------------------------------------------------------------
-    /**
-     * require (o != null &amp;&amp; (current thread holds o's lock))
-     */
-    public static void holdsLock(Object o, String name, int numCallsBelowRequirer) {
-        neqNull(o, "o");
-        if (!Thread.holdsLock(o)) {
-            fail("\"" + Thread.currentThread().getName() + "\".holdsLock(" + name + ")", numCallsBelowRequirer + 1);
+
+    public static void eq(boolean b0, String name0, boolean b1, String name1) {
+        if (!(b0 == b1)) {
+            fail(name0 + " == " + name1, ExceptionMessageUtil.valueAndName(b0, name0, b1, name1));
         }
     }
 
-    public static void holdsLock(Object o, String name) {
-        holdsLock(o, name, 1);
+    public static void eq(boolean b0, String name0, boolean b1) {
+        if (!(b0 == b1)) {
+            fail(name0 + " == " + b1, ExceptionMessageUtil.valueAndName(b0, name0));
+        }
     }
 
     // ----------------------------------------------------------------
-    /**
-     * require (o != null &amp;&amp; !(current thread holds o's lock))
-     */
-    public static void notHoldsLock(Object o, String name, int numCallsBelowRequirer) {
-        neqNull(o, "o");
-        if (Thread.holdsLock(o)) {
-            fail("!\"" + Thread.currentThread().getName() + "\".holdsLock(" + name + ")", numCallsBelowRequirer + 1);
+
+    public static void eq(char c0, String name0, char c1, String name1) {
+        if (!(c0 == c1)) {
+            fail(name0 + " == " + name1, ExceptionMessageUtil.valueAndName(c0, name0, c1, name1));
         }
     }
 
-    public static void notHoldsLock(Object o, String name) {
-        notHoldsLock(o, name, 1);
+    public static void eq(char c0, String name0, char c1) {
+        if (!(c0 == c1)) {
+            fail(name0 + " == " + ExceptionMessageUtil.valueString(c1), ExceptionMessageUtil.valueAndName(c0, name0));
+        }
     }
 
-
-    // ################################################################
-    // instanceOf, notInstanceOf
-
     // ----------------------------------------------------------------
-    /**
-     * require (o instanceof type)
-     */
-    public static <T> void instanceOf(Object o, String name, Class<T> type, int numCallsBelowRequirer) {
-        if (!type.isInstance(o)) {
-            fail(name + " instanceof " + type, null == o ? ExceptionMessageUtil.valueAndName(o, name)
-                    : name + " instanceof " + o.getClass() + " (" + ExceptionMessageUtil.valueAndName(o, name) + ")",
-                    numCallsBelowRequirer + 1);
+
+    public static void eq(byte b0, String name0, byte b1, String name1) {
+        if (!(b0 == b1)) {
+            fail(name0 + " == " + name1, ExceptionMessageUtil.valueAndName(b0, name0, b1, name1));
         }
     }
 
-    public static <T> void instanceOf(Object o, String name, Class<T> type) {
-        instanceOf(o, name, type, 1);
+    public static void eq(byte b0, String name0, byte b1) {
+        if (!(b0 == b1)) {
+            fail(name0 + " == " + b1, ExceptionMessageUtil.valueAndName(b0, name0));
+        }
     }
 
     // ----------------------------------------------------------------
-    /**
-     * require !(o instanceof type)
-     */
-    public static <T> void notInstanceOf(Object o, String name, Class<T> type, int numCallsBelowRequirer) {
-        if (type.isInstance(o)) {
-            fail("!(" + name + " instanceof " + type + ")",
-                    name + " instanceof " + o.getClass() + " (" + ExceptionMessageUtil.valueAndName(o, name) + ")",
-                    numCallsBelowRequirer + 1);
+
+    public static void eq(short s0, String name0, short s1, String name1) {
+        if (!(s0 == s1)) {
+            fail(name0 + " == " + name1, ExceptionMessageUtil.valueAndName(s0, name0, s1, name1));
         }
     }
 
-    public static <T> void notInstanceOf(Object o, String name, Class<T> type) {
-        notInstanceOf(o, name, type, 1);
+    public static void eq(short s0, String name0, short s1) {
+        if (!(s0 == s1)) {
+            fail(name0 + " == " + s1, ExceptionMessageUtil.valueAndName(s0, name0));
+        }
     }
 
-    // ################################################################
-    // isAWTThread, isNotAWTThread
-
     // ----------------------------------------------------------------
-    /**
-     * require (current thread is AWT Event Dispatch Thread)
-     */
-    public static void isAWTThread() {
-        isAWTThread(1);
+
+    public static void eq(int i0, String name0, int i1, String name1) {
+        if (!(i0 == i1)) {
+            fail(name0 + " == " + name1, ExceptionMessageUtil.valueAndName(i0, name0, i1, name1));
+        }
     }
 
-    public static void isAWTThread(int numCallsBelowRequirer) {
-        if (!EventQueue.isDispatchThread()) {
-            fail("\"" + Thread.currentThread().getName() + "\".isAWTThread()", numCallsBelowRequirer + 1);
+    public static void eq(int i0, String name0, int i1) {
+        if (!(i0 == i1)) {
+            fail(name0 + " == " + i1, ExceptionMessageUtil.valueAndName(i0, name0));
         }
     }
 
     // ----------------------------------------------------------------
-    /**
-     * require (current thread is AWT Event Dispatch Thread)
-     */
-    public static void isNotAWTThread() {
-        isNotAWTThread(1);
-    }
 
-    public static void isNotAWTThread(int numCallsBelowRequirer) {
-        if (EventQueue.isDispatchThread()) {
-            fail("!\"" + Thread.currentThread().getName() + "\".isAWTThread()", numCallsBelowRequirer + 1);
+    public static void eq(long l0, String name0, long l1, String name1) {
+        if (!(l0 == l1)) {
+            fail(name0 + " == " + name1, ExceptionMessageUtil.valueAndName(l0, name0, l1, name1));
         }
     }
 
-    // ################################################################
-    // eq (primitiveValue == primitiveValue)
+    public static void eq(long l0, String name0, long l1) {
+        if (!(l0 == l1)) {
+            fail(name0 + " == " + l1, ExceptionMessageUtil.valueAndName(l0, name0));
+        }
+    }
 
     // ----------------------------------------------------------------
     /**
-     * require (b0 == b1)
+     * require (f0 == f1)
      */
-    public static void eq(boolean b0, String name0, boolean b1, String name1, int numCallsBelowRequirer) {
-        if (!(b0 == b1)) {
-            fail(name0 + " == " + name1, ExceptionMessageUtil.valueAndName(b0, name0, b1, name1),
-                    numCallsBelowRequirer + 1);
+    public static void eq(float f0, String name0, float f1, String name1) {
+        if (!(f0 == f1)) {
+            fail(name0 + " == " + name1, ExceptionMessageUtil.valueAndName(f0, name0, f1, name1));
         }
     }
 
-    public static void eq(boolean b0, String name0, boolean b1, String name1) {
-        eq(b0, name0, b1, name1, 1);
+    public static void eq(float f0, String name0, float f1) {
+        if (!(f0 == f1)) {
+            fail(name0 + " == " + f1, ExceptionMessageUtil.valueAndName(f0, name0));
+        }
     }
 
-    public static void eq(boolean b0, String name0, boolean b1, int numCallsBelowRequirer) {
-        if (!(b0 == b1)) {
-            fail(name0 + " == " + b1, ExceptionMessageUtil.valueAndName(b0, name0), numCallsBelowRequirer + 1);
+    // ----------------------------------------------------------------
+
+    public static void eq(double d0, String name0, double d1, String name1) {
+        if (!(d0 == d1)) {
+            fail(name0 + " == " + name1, ExceptionMessageUtil.valueAndName(d0, name0, d1, name1));
         }
     }
 
-    public static void eq(boolean b0, String name0, boolean b1) {
-        eq(b0, name0, b1, 1);
+    public static void eq(double d0, String name0, double d1) {
+        if (!(d0 == d1)) {
+            fail(name0 + " == " + d1, ExceptionMessageUtil.valueAndName(d0, name0));
+        }
     }
 
+    // ################################################################
+    // neq (primitiveValue != primitiveValue)
+
     // ----------------------------------------------------------------
-    /**
-     * require (c0 == c1)
-     */
-    public static void eq(char c0, String name0, char c1, String name1, int numCallsBelowRequirer) {
-        if (!(c0 == c1)) {
-            fail(name0 + " == " + name1, ExceptionMessageUtil.valueAndName(c0, name0, c1, name1),
-                    numCallsBelowRequirer + 1);
+
+    public static void neq(boolean b0, String name0, boolean b1, String name1) {
+        if (!(b0 != b1)) {
+            fail(name0 + " != " + name1, ExceptionMessageUtil.valueAndName(b0, name0, b1, name1));
         }
     }
 
-    public static void eq(char c0, String name0, char c1, String name1) {
-        eq(c0, name0, c1, name1, 1);
+    public static void neq(boolean b0, String name0, boolean b1) {
+        if (!(b0 != b1)) {
+            fail(name0 + " != " + b1, ExceptionMessageUtil.valueAndName(b0, name0));
+        }
     }
 
-    public static void eq(char c0, String name0, char c1, int numCallsBelowRequirer) {
-        if (!(c0 == c1)) {
-            fail(name0 + " == " + ExceptionMessageUtil.valueString(c1), ExceptionMessageUtil.valueAndName(c0, name0),
-                    numCallsBelowRequirer + 1);
+    // ----------------------------------------------------------------
+
+    public static void neq(char c0, String name0, char c1, String name1) {
+        if (!(c0 != c1)) {
+            fail(name0 + " != " + name1, ExceptionMessageUtil.valueAndName(c0, name0, c1, name1));
         }
     }
 
-    public static void eq(char c0, String name0, char c1) {
-        eq(c0, name0, c1, 1);
+    public static void neq(char c0, String name0, char c1) {
+        if (!(c0 != c1)) {
+            fail(name0 + " != " + ExceptionMessageUtil.valueString(c1), ExceptionMessageUtil.valueAndName(c0, name0));
+        }
     }
 
     // ----------------------------------------------------------------
-    /**
-     * require (b0 == b1)
-     */
-    public static void eq(byte b0, String name0, byte b1, String name1, int numCallsBelowRequirer) {
-        if (!(b0 == b1)) {
-            fail(name0 + " == " + name1, ExceptionMessageUtil.valueAndName(b0, name0, b1, name1),
-                    numCallsBelowRequirer + 1);
-        }
-    }
 
-    public static void eq(byte b0, String name0, byte b1, String name1) {
-        eq(b0, name0, b1, name1, 1);
+    public static void neq(byte b0, String name0, byte b1, String name1) {
+        if (!(b0 != b1)) {
+            fail(name0 + " != " + name1, ExceptionMessageUtil.valueAndName(b0, name0, b1, name1));
+        }
     }
 
-    public static void eq(byte b0, String name0, byte b1, int numCallsBelowRequirer) {
-        if (!(b0 == b1)) {
-            fail(name0 + " == " + b1, ExceptionMessageUtil.valueAndName(b0, name0), numCallsBelowRequirer + 1);
+    public static void neq(byte b0, String name0, byte b1) {
+        if (!(b0 != b1)) {
+            fail(name0 + " != " + b1, ExceptionMessageUtil.valueAndName(b0, name0));
         }
     }
 
-    public static void eq(byte b0, String name0, byte b1) {
-        eq(b0, name0, b1, 1);
-    }
-
-    // ----------------------------------------------------------------
-    /**
-     * require (s0 == s1)
-     */
-    public static void eq(short s0, String name0, short s1, String name1, int numCallsBelowRequirer) {
-        if (!(s0 == s1)) {
-            fail(name0 + " == " + name1, ExceptionMessageUtil.valueAndName(s0, name0, s1, name1),
-                    numCallsBelowRequirer + 1);
-        }
-    }
-
-    public static void eq(short s0, String name0, short s1, String name1) {
-        eq(s0, name0, s1, name1, 1);
-    }
-
-    public static void eq(short s0, String name0, short s1, int numCallsBelowRequirer) {
-        if (!(s0 == s1)) {
-            fail(name0 + " == " + s1, ExceptionMessageUtil.valueAndName(s0, name0), numCallsBelowRequirer + 1);
-        }
-    }
-
-    public static void eq(short s0, String name0, short s1) {
-        eq(s0, name0, s1, 1);
-    }
-
-    // ----------------------------------------------------------------
-    /**
-     * require (i0 == i1)
-     */
-    public static void eq(int i0, String name0, int i1, String name1, int numCallsBelowRequirer) {
-        if (!(i0 == i1)) {
-            fail(name0 + " == " + name1, ExceptionMessageUtil.valueAndName(i0, name0, i1, name1),
-                    numCallsBelowRequirer + 1);
-        }
-    }
-
-    public static void eq(int i0, String name0, int i1, String name1) {
-        eq(i0, name0, i1, name1, 1);
-    }
-
-    public static void eq(int i0, String name0, int i1, int numCallsBelowRequirer) {
-        if (!(i0 == i1)) {
-            fail(name0 + " == " + i1, ExceptionMessageUtil.valueAndName(i0, name0), numCallsBelowRequirer + 1);
-        }
-    }
-
-    public static void eq(int i0, String name0, int i1) {
-        eq(i0, name0, i1, 1);
-    }
-
-    // ----------------------------------------------------------------
-    /**
-     * require (l0 == l1)
-     */
-    public static void eq(long l0, String name0, long l1, String name1, int numCallsBelowRequirer) {
-        if (!(l0 == l1)) {
-            fail(name0 + " == " + name1, ExceptionMessageUtil.valueAndName(l0, name0, l1, name1),
-                    numCallsBelowRequirer + 1);
-        }
-    }
-
-    public static void eq(long l0, String name0, long l1, String name1) {
-        eq(l0, name0, l1, name1, 1);
-    }
-
-    public static void eq(long l0, String name0, long l1, int numCallsBelowRequirer) {
-        if (!(l0 == l1)) {
-            fail(name0 + " == " + l1, ExceptionMessageUtil.valueAndName(l0, name0), numCallsBelowRequirer + 1);
-        }
-    }
-
-    public static void eq(long l0, String name0, long l1) {
-        eq(l0, name0, l1, 1);
-    }
-
-    // ----------------------------------------------------------------
-    /**
-     * require (f0 == f1)
-     */
-    public static void eq(float f0, String name0, float f1, String name1, int numCallsBelowRequirer) {
-        if (!(f0 == f1)) {
-            fail(name0 + " == " + name1, ExceptionMessageUtil.valueAndName(f0, name0, f1, name1),
-                    numCallsBelowRequirer + 1);
-        }
-    }
-
-    public static void eq(float f0, String name0, float f1, String name1) {
-        eq(f0, name0, f1, name1, 1);
-    }
-
-    public static void eq(float f0, String name0, float f1, int numCallsBelowRequirer) {
-        if (!(f0 == f1)) {
-            fail(name0 + " == " + f1, ExceptionMessageUtil.valueAndName(f0, name0), numCallsBelowRequirer + 1);
-        }
-    }
-
-    public static void eq(float f0, String name0, float f1) {
-        eq(f0, name0, f1, 1);
-    }
-
-    // ----------------------------------------------------------------
-    /**
-     * require (d0 == d1)
-     */
-    public static void eq(double d0, String name0, double d1, String name1, int numCallsBelowRequirer) {
-        if (!(d0 == d1)) {
-            fail(name0 + " == " + name1, ExceptionMessageUtil.valueAndName(d0, name0, d1, name1),
-                    numCallsBelowRequirer + 1);
-        }
-    }
-
-    public static void eq(double d0, String name0, double d1, String name1) {
-        eq(d0, name0, d1, name1, 1);
-    }
-
-    public static void eq(double d0, String name0, double d1, int numCallsBelowRequirer) {
-        if (!(d0 == d1)) {
-            fail(name0 + " == " + d1, ExceptionMessageUtil.valueAndName(d0, name0), numCallsBelowRequirer + 1);
-        }
-    }
-
-    public static void eq(double d0, String name0, double d1) {
-        eq(d0, name0, d1, 1);
-    }
-
-    // ################################################################
-    // neq (primitiveValue != primitiveValue)
-
-    // ----------------------------------------------------------------
-    /**
-     * require (b0 != b1)
-     */
-    public static void neq(boolean b0, String name0, boolean b1, String name1, int numCallsBelowRequirer) {
-        if (!(b0 != b1)) {
-            fail(name0 + " != " + name1, ExceptionMessageUtil.valueAndName(b0, name0, b1, name1),
-                    numCallsBelowRequirer + 1);
-        }
-    }
-
-    public static void neq(boolean b0, String name0, boolean b1, String name1) {
-        neq(b0, name0, b1, name1, 1);
-    }
-
-    public static void neq(boolean b0, String name0, boolean b1, int numCallsBelowRequirer) {
-        if (!(b0 != b1)) {
-            fail(name0 + " != " + b1, ExceptionMessageUtil.valueAndName(b0, name0), numCallsBelowRequirer + 1);
-        }
-    }
-
-    public static void neq(boolean b0, String name0, boolean b1) {
-        neq(b0, name0, b1, 1);
-    }
-
-    // ----------------------------------------------------------------
-    /**
-     * require (c0 != c1)
-     */
-    public static void neq(char c0, String name0, char c1, String name1, int numCallsBelowRequirer) {
-        if (!(c0 != c1)) {
-            fail(name0 + " != " + name1, ExceptionMessageUtil.valueAndName(c0, name0, c1, name1),
-                    numCallsBelowRequirer + 1);
-        }
-    }
-
-    public static void neq(char c0, String name0, char c1, String name1) {
-        neq(c0, name0, c1, name1, 1);
-    }
-
-    public static void neq(char c0, String name0, char c1, int numCallsBelowRequirer) {
-        if (!(c0 != c1)) {
-            fail(name0 + " != " + ExceptionMessageUtil.valueString(c1), ExceptionMessageUtil.valueAndName(c0, name0),
-                    numCallsBelowRequirer + 1);
-        }
-    }
-
-    public static void neq(char c0, String name0, char c1) {
-        neq(c0, name0, c1, 1);
-    }
-
     // ----------------------------------------------------------------
-    /**
-     * require (b0 != b1)
-     */
-    public static void neq(byte b0, String name0, byte b1, String name1, int numCallsBelowRequirer) {
-        if (!(b0 != b1)) {
-            fail(name0 + " != " + name1, ExceptionMessageUtil.valueAndName(b0, name0, b1, name1),
-                    numCallsBelowRequirer + 1);
-        }
-    }
-
-    public static void neq(byte b0, String name0, byte b1, String name1) {
-        neq(b0, name0, b1, name1, 1);
-    }
-
-    public static void neq(byte b0, String name0, byte b1, int numCallsBelowRequirer) {
-        if (!(b0 != b1)) {
-            fail(name0 + " != " + b1, ExceptionMessageUtil.valueAndName(b0, name0), numCallsBelowRequirer + 1);
-        }
-    }
-
-    public static void neq(byte b0, String name0, byte b1) {
-        neq(b0, name0, b1, 1);
-    }
-
-    // ----------------------------------------------------------------
-    /**
-     * require (s0 != s1)
-     */
-    public static void neq(short s0, String name0, short s1, String name1, int numCallsBelowRequirer) {
-        if (!(s0 != s1)) {
-            fail(name0 + " != " + name1, ExceptionMessageUtil.valueAndName(s0, name0, s1, name1),
-                    numCallsBelowRequirer + 1);
-        }
-    }
 
     public static void neq(short s0, String name0, short s1, String name1) {
-        neq(s0, name0, s1, name1, 1);
-    }
-
-    public static void neq(short s0, String name0, short s1, int numCallsBelowRequirer) {
         if (!(s0 != s1)) {
-            fail(name0 + " != " + s1, ExceptionMessageUtil.valueAndName(s0, name0), numCallsBelowRequirer + 1);
+            fail(name0 + " != " + name1, ExceptionMessageUtil.valueAndName(s0, name0, s1, name1));
         }
     }
 
     public static void neq(short s0, String name0, short s1) {
-        neq(s0, name0, s1, 1);
+        if (!(s0 != s1)) {
+            fail(name0 + " != " + s1, ExceptionMessageUtil.valueAndName(s0, name0));
+        }
     }
 
     // ----------------------------------------------------------------
-    /**
-     * require (i0 != i1)
-     */
-    public static int neq(int i0, String name0, int i1, String name1, int numCallsBelowRequirer) {
-        if (!(i0 != i1)) {
-            fail(name0 + " != " + name1, ExceptionMessageUtil.valueAndName(i0, name0, i1, name1),
-                    numCallsBelowRequirer + 1);
-        }
-        return i0;
-    }
 
     public static int neq(int i0, String name0, int i1, String name1) {
-        return neq(i0, name0, i1, name1, 1);
-    }
-
-    public static void neq(int i0, String name0, int i1, int numCallsBelowRequirer) {
         if (!(i0 != i1)) {
-            fail(name0 + " != " + i1, ExceptionMessageUtil.valueAndName(i0, name0), numCallsBelowRequirer + 1);
+            fail(name0 + " != " + name1, ExceptionMessageUtil.valueAndName(i0, name0, i1, name1));
         }
+        return i0;
     }
 
     public static void neq(int i0, String name0, int i1) {
-        neq(i0, name0, i1, 1);
+        if (!(i0 != i1)) {
+            fail(name0 + " != " + i1, ExceptionMessageUtil.valueAndName(i0, name0));
+        }
     }
 
     // ----------------------------------------------------------------
-    /**
-     * require (l0 != l1)
-     */
-    public static void neq(long l0, String name0, long l1, String name1, int numCallsBelowRequirer) {
-        if (!(l0 != l1)) {
-            fail(name0 + " != " + name1, ExceptionMessageUtil.valueAndName(l0, name0, l1, name1),
-                    numCallsBelowRequirer + 1);
-        }
-    }
 
     public static void neq(long l0, String name0, long l1, String name1) {
-        neq(l0, name0, l1, name1, 1);
-    }
-
-    public static void neq(long l0, String name0, long l1, int numCallsBelowRequirer) {
         if (!(l0 != l1)) {
-            fail(name0 + " != " + l1, ExceptionMessageUtil.valueAndName(l0, name0), numCallsBelowRequirer + 1);
+            fail(name0 + " != " + name1, ExceptionMessageUtil.valueAndName(l0, name0, l1, name1));
         }
     }
 
     public static void neq(long l0, String name0, long l1) {
-        neq(l0, name0, l1, 1);
+        if (!(l0 != l1)) {
+            fail(name0 + " != " + l1, ExceptionMessageUtil.valueAndName(l0, name0));
+        }
     }
 
     // ----------------------------------------------------------------
-    /**
-     * require (f0 != f1)
-     */
-    public static void neq(float f0, String name0, float f1, String name1, int numCallsBelowRequirer) {
-        if (!(f0 != f1)) {
-            fail(name0 + " != " + name1, ExceptionMessageUtil.valueAndName(f0, name0, f1, name1),
-                    numCallsBelowRequirer + 1);
-        }
-    }
 
     public static void neq(float f0, String name0, float f1, String name1) {
-        neq(f0, name0, f1, name1, 1);
-    }
-
-    public static void neq(float f0, String name0, float f1, int numCallsBelowRequirer) {
         if (!(f0 != f1)) {
-            fail(name0 + " != " + f1, ExceptionMessageUtil.valueAndName(f0, name0), numCallsBelowRequirer + 1);
+            fail(name0 + " != " + name1, ExceptionMessageUtil.valueAndName(f0, name0, f1, name1));
         }
     }
 
     public static void neq(float f0, String name0, float f1) {
-        neq(f0, name0, f1, 1);
+        if (!(f0 != f1)) {
+            fail(name0 + " != " + f1, ExceptionMessageUtil.valueAndName(f0, name0));
+        }
     }
 
     // ----------------------------------------------------------------
-    /**
-     * require (d0 != d1)
-     */
-    public static void neq(double d0, String name0, double d1, String name1, int numCallsBelowRequirer) {
-        if (!(d0 != d1)) {
-            fail(name0 + " != " + name1, ExceptionMessageUtil.valueAndName(d0, name0, d1, name1),
-                    numCallsBelowRequirer + 1);
-        }
-    }
 
     public static void neq(double d0, String name0, double d1, String name1) {
-        neq(d0, name0, d1, name1, 1);
-    }
-
-    public static void neq(double d0, String name0, double d1, int numCallsBelowRequirer) {
         if (!(d0 != d1)) {
-            fail(name0 + " != " + d1, ExceptionMessageUtil.valueAndName(d0, name0), numCallsBelowRequirer + 1);
+            fail(name0 + " != " + name1, ExceptionMessageUtil.valueAndName(d0, name0, d1, name1));
         }
     }
 
     public static void neq(double d0, String name0, double d1) {
-        neq(d0, name0, d1, 1);
+        if (!(d0 != d1)) {
+            fail(name0 + " != " + d1, ExceptionMessageUtil.valueAndName(d0, name0));
+        }
     }
 
     // ################################################################
     // lt (primitiveValue < primitiveValue)
 
     // ----------------------------------------------------------------
-    /**
-     * require (c0 &lt; c1)
-     */
-    public static char lt(char c0, String name0, char c1, String name1, int numCallsBelowRequirer) {
-        if (!(c0 < c1)) {
-            fail(name0 + " < " + name1, ExceptionMessageUtil.valueAndName(c0, name0, c1, name1),
-                    numCallsBelowRequirer + 1);
-        }
-        return c0;
-    }
 
     public static char lt(char c0, String name0, char c1, String name1) {
-        return lt(c0, name0, c1, name1, 1);
-    }
-
-    public static char lt(char c0, String name0, char c1, int numCallsBelowRequirer) {
         if (!(c0 < c1)) {
-            fail(name0 + " < " + ExceptionMessageUtil.valueString(c1), ExceptionMessageUtil.valueAndName(c0, name0),
-                    numCallsBelowRequirer + 1);
+            fail(name0 + " < " + name1, ExceptionMessageUtil.valueAndName(c0, name0, c1, name1));
         }
         return c0;
     }
 
     public static char lt(char c0, String name0, char c1) {
-        return lt(c0, name0, c1, 1);
+        if (!(c0 < c1)) {
+            fail(name0 + " < " + ExceptionMessageUtil.valueString(c1), ExceptionMessageUtil.valueAndName(c0, name0));
+        }
+        return c0;
     }
 
     // ----------------------------------------------------------------
-    /**
-     * require (b0 &lt; b1)
-     */
-    public static byte lt(byte b0, String name0, byte b1, String name1, int numCallsBelowRequirer) {
-        if (!(b0 < b1)) {
-            fail(name0 + " < " + name1, ExceptionMessageUtil.valueAndName(b0, name0, b1, name1),
-                    numCallsBelowRequirer + 1);
-        }
-        return b0;
-    }
 
     public static byte lt(byte b0, String name0, byte b1, String name1) {
-        return lt(b0, name0, b1, name1, 1);
-    }
-
-    public static byte lt(byte b0, String name0, byte b1, int numCallsBelowRequirer) {
         if (!(b0 < b1)) {
-            fail(name0 + " < " + b1, ExceptionMessageUtil.valueAndName(b0, name0), numCallsBelowRequirer + 1);
+            fail(name0 + " < " + name1, ExceptionMessageUtil.valueAndName(b0, name0, b1, name1));
         }
         return b0;
     }
 
     public static byte lt(byte b0, String name0, byte b1) {
-        return lt(b0, name0, b1, 1);
+        if (!(b0 < b1)) {
+            fail(name0 + " < " + b1, ExceptionMessageUtil.valueAndName(b0, name0));
+        }
+        return b0;
     }
 
     // ----------------------------------------------------------------
-    /**
-     * require (s0 &lt; s1)
-     */
-    public static short lt(short s0, String name0, short s1, String name1, int numCallsBelowRequirer) {
-        if (!(s0 < s1)) {
-            fail(name0 + " < " + name1, ExceptionMessageUtil.valueAndName(s0, name0, s1, name1),
-                    numCallsBelowRequirer + 1);
-        }
-        return s0;
-    }
 
     public static short lt(short s0, String name0, short s1, String name1) {
-        return lt(s0, name0, s1, name1, 1);
-    }
-
-    public static short lt(short s0, String name0, short s1, int numCallsBelowRequirer) {
         if (!(s0 < s1)) {
-            fail(name0 + " < " + s1, ExceptionMessageUtil.valueAndName(s0, name0), numCallsBelowRequirer + 1);
+            fail(name0 + " < " + name1, ExceptionMessageUtil.valueAndName(s0, name0, s1, name1));
         }
         return s0;
     }
 
     public static short lt(short s0, String name0, short s1) {
-        return lt(s0, name0, s1, 1);
+        if (!(s0 < s1)) {
+            fail(name0 + " < " + s1, ExceptionMessageUtil.valueAndName(s0, name0));
+        }
+        return s0;
     }
 
     // ----------------------------------------------------------------
-    /**
-     * require (i0 &lt; i1)
-     */
-    public static int lt(int i0, String name0, int i1, String name1, int numCallsBelowRequirer) {
-        if (!(i0 < i1)) {
-            fail(name0 + " < " + name1, ExceptionMessageUtil.valueAndName(i0, name0, i1, name1),
-                    numCallsBelowRequirer + 1);
-        }
-        return i0;
-    }
 
     public static int lt(int i0, String name0, int i1, String name1) {
-        return lt(i0, name0, i1, name1, 1);
-    }
-
-    public static int lt(int i0, String name0, int i1, int numCallsBelowRequirer) {
         if (!(i0 < i1)) {
-            fail(name0 + " < " + i1, ExceptionMessageUtil.valueAndName(i0, name0), numCallsBelowRequirer + 1);
+            fail(name0 + " < " + name1, ExceptionMessageUtil.valueAndName(i0, name0, i1, name1));
         }
         return i0;
     }
 
     public static int lt(int i0, String name0, int i1) {
-        return lt(i0, name0, i1, 1);
+        if (!(i0 < i1)) {
+            fail(name0 + " < " + i1, ExceptionMessageUtil.valueAndName(i0, name0));
+        }
+        return i0;
     }
 
     // ----------------------------------------------------------------
-    /**
-     * require (l0 &lt; l1)
-     */
-    public static long lt(long l0, String name0, long l1, String name1, int numCallsBelowRequirer) {
-        if (!(l0 < l1)) {
-            fail(name0 + " < " + name1, ExceptionMessageUtil.valueAndName(l0, name0, l1, name1),
-                    numCallsBelowRequirer + 1);
-        }
-        return l0;
-    }
 
     public static long lt(long l0, String name0, long l1, String name1) {
-        return lt(l0, name0, l1, name1, 1);
-    }
-
-    public static long lt(long l0, String name0, long l1, int numCallsBelowRequirer) {
         if (!(l0 < l1)) {
-            fail(name0 + " < " + l1, ExceptionMessageUtil.valueAndName(l0, name0), numCallsBelowRequirer + 1);
+            fail(name0 + " < " + name1, ExceptionMessageUtil.valueAndName(l0, name0, l1, name1));
         }
         return l0;
     }
 
     public static long lt(long l0, String name0, long l1) {
-        return lt(l0, name0, l1, 1);
+        if (!(l0 < l1)) {
+            fail(name0 + " < " + l1, ExceptionMessageUtil.valueAndName(l0, name0));
+        }
+        return l0;
     }
 
     // ----------------------------------------------------------------
-    /**
-     * require (f0 &lt; f1)
-     */
-    public static float lt(float f0, String name0, float f1, String name1, int numCallsBelowRequirer) {
-        if (!(f0 < f1)) {
-            fail(name0 + " < " + name1, ExceptionMessageUtil.valueAndName(f0, name0, f1, name1),
-                    numCallsBelowRequirer + 1);
-        }
-        return f0;
-    }
 
     public static float lt(float f0, String name0, float f1, String name1) {
-        return lt(f0, name0, f1, name1, 1);
-    }
-
-    public static float lt(float f0, String name0, float f1, int numCallsBelowRequirer) {
         if (!(f0 < f1)) {
-            fail(name0 + " < " + f1, ExceptionMessageUtil.valueAndName(f0, name0), numCallsBelowRequirer + 1);
+            fail(name0 + " < " + name1, ExceptionMessageUtil.valueAndName(f0, name0, f1, name1));
         }
         return f0;
     }
 
     public static float lt(float f0, String name0, float f1) {
-        return lt(f0, name0, f1, 1);
+        if (!(f0 < f1)) {
+            fail(name0 + " < " + f1, ExceptionMessageUtil.valueAndName(f0, name0));
+        }
+        return f0;
     }
 
     // ----------------------------------------------------------------
-    /**
-     * require (d0 &lt; d1)
-     */
-    public static double lt(double d0, String name0, double d1, String name1, int numCallsBelowRequirer) {
-        if (!(d0 < d1)) {
-            fail(name0 + " < " + name1, ExceptionMessageUtil.valueAndName(d0, name0, d1, name1),
-                    numCallsBelowRequirer + 1);
-        }
-        return d0;
-    }
 
     public static double lt(double d0, String name0, double d1, String name1) {
-        return lt(d0, name0, d1, name1, 1);
-    }
-
-    public static double lt(double d0, String name0, double d1, int numCallsBelowRequirer) {
         if (!(d0 < d1)) {
-            fail(name0 + " < " + d1, ExceptionMessageUtil.valueAndName(d0, name0), numCallsBelowRequirer + 1);
+            fail(name0 + " < " + name1, ExceptionMessageUtil.valueAndName(d0, name0, d1, name1));
         }
         return d0;
     }
 
     public static double lt(double d0, String name0, double d1) {
-        return lt(d0, name0, d1, 1);
+        if (!(d0 < d1)) {
+            fail(name0 + " < " + d1, ExceptionMessageUtil.valueAndName(d0, name0));
+        }
+        return d0;
     }
 
     // ################################################################
     // leq (primitiveValue <= primitiveValue)
 
     // ----------------------------------------------------------------
-    /**
-     * require (c0 &lt;= c1)
-     */
-    public static char leq(char c0, String name0, char c1, String name1, int numCallsBelowRequirer) {
-        if (!(c0 <= c1)) {
-            fail(name0 + " <= " + name1, ExceptionMessageUtil.valueAndName(c0, name0, c1, name1),
-                    numCallsBelowRequirer + 1);
-        }
-        return c0;
-    }
 
     public static char leq(char c0, String name0, char c1, String name1) {
-        return leq(c0, name0, c1, name1, 1);
-    }
-
-    public static char leq(char c0, String name0, char c1, int numCallsBelowRequirer) {
         if (!(c0 <= c1)) {
-            fail(name0 + " <= " + ExceptionMessageUtil.valueString(c1), ExceptionMessageUtil.valueAndName(c0, name0),
-                    numCallsBelowRequirer + 1);
+            fail(name0 + " <= " + name1, ExceptionMessageUtil.valueAndName(c0, name0, c1, name1));
         }
         return c0;
     }
 
     public static char leq(char c0, String name0, char c1) {
-        return leq(c0, name0, c1, 1);
+        if (!(c0 <= c1)) {
+            fail(name0 + " <= " + ExceptionMessageUtil.valueString(c1), ExceptionMessageUtil.valueAndName(c0, name0));
+        }
+        return c0;
     }
 
     // ----------------------------------------------------------------
-    /**
-     * require (b0 &lt;= b1)
-     */
-    public static byte leq(byte b0, String name0, byte b1, String name1, int numCallsBelowRequirer) {
-        if (!(b0 <= b1)) {
-            fail(name0 + " <= " + name1, ExceptionMessageUtil.valueAndName(b0, name0, b1, name1),
-                    numCallsBelowRequirer + 1);
-        }
-        return b0;
-    }
 
     public static byte leq(byte b0, String name0, byte b1, String name1) {
-        return leq(b0, name0, b1, name1, 1);
-    }
-
-    public static byte leq(byte b0, String name0, byte b1, int numCallsBelowRequirer) {
         if (!(b0 <= b1)) {
-            fail(name0 + " <= " + b1, ExceptionMessageUtil.valueAndName(b0, name0), numCallsBelowRequirer + 1);
+            fail(name0 + " <= " + name1, ExceptionMessageUtil.valueAndName(b0, name0, b1, name1));
         }
         return b0;
     }
 
     public static byte leq(byte b0, String name0, byte b1) {
-        return leq(b0, name0, b1, 1);
+        if (!(b0 <= b1)) {
+            fail(name0 + " <= " + b1, ExceptionMessageUtil.valueAndName(b0, name0));
+        }
+        return b0;
     }
 
     // ----------------------------------------------------------------
-    /**
-     * require (s0 &lt;= s1)
-     */
-    public static short leq(short s0, String name0, short s1, String name1, int numCallsBelowRequirer) {
-        if (!(s0 <= s1)) {
-            fail(name0 + " <= " + name1, ExceptionMessageUtil.valueAndName(s0, name0, s1, name1),
-                    numCallsBelowRequirer + 1);
-        }
-        return s0;
-    }
 
     public static short leq(short s0, String name0, short s1, String name1) {
-        return leq(s0, name0, s1, name1, 1);
-    }
-
-    public static short leq(short s0, String name0, short s1, int numCallsBelowRequirer) {
         if (!(s0 <= s1)) {
-            fail(name0 + " <= " + s1, ExceptionMessageUtil.valueAndName(s0, name0), numCallsBelowRequirer + 1);
+            fail(name0 + " <= " + name1, ExceptionMessageUtil.valueAndName(s0, name0, s1, name1));
         }
         return s0;
     }
 
     public static short leq(short s0, String name0, short s1) {
-        return leq(s0, name0, s1, 1);
+        if (!(s0 <= s1)) {
+            fail(name0 + " <= " + s1, ExceptionMessageUtil.valueAndName(s0, name0));
+        }
+        return s0;
     }
 
     // ----------------------------------------------------------------
-    /**
-     * require (i0 &lt;= i1)
-     */
-    public static int leq(int i0, String name0, int i1, String name1, int numCallsBelowRequirer) {
-        if (!(i0 <= i1)) {
-            fail(name0 + " <= " + name1, ExceptionMessageUtil.valueAndName(i0, name0, i1, name1),
-                    numCallsBelowRequirer + 1);
-        }
-        return i0;
-    }
 
     public static int leq(int i0, String name0, int i1, String name1) {
-        return leq(i0, name0, i1, name1, 1);
-    }
-
-    public static int leq(int i0, String name0, int i1, int numCallsBelowRequirer) {
         if (!(i0 <= i1)) {
-            fail(name0 + " <= " + i1, ExceptionMessageUtil.valueAndName(i0, name0), numCallsBelowRequirer + 1);
+            fail(name0 + " <= " + name1, ExceptionMessageUtil.valueAndName(i0, name0, i1, name1));
         }
         return i0;
     }
 
     public static int leq(int i0, String name0, int i1) {
-        return leq(i0, name0, i1, 1);
+        if (!(i0 <= i1)) {
+            fail(name0 + " <= " + i1, ExceptionMessageUtil.valueAndName(i0, name0));
+        }
+        return i0;
     }
 
     // ----------------------------------------------------------------
-    /**
-     * require (l0 &lt;= l1)
-     */
-    public static long leq(long l0, String name0, long l1, String name1, int numCallsBelowRequirer) {
-        if (!(l0 <= l1)) {
-            fail(name0 + " <= " + name1, ExceptionMessageUtil.valueAndName(l0, name0, l1, name1),
-                    numCallsBelowRequirer + 1);
-        }
-        return l0;
-    }
 
     public static long leq(long l0, String name0, long l1, String name1) {
-        return leq(l0, name0, l1, name1, 1);
-    }
-
-    public static long leq(long l0, String name0, long l1, int numCallsBelowRequirer) {
         if (!(l0 <= l1)) {
-            fail(name0 + " <= " + l1, ExceptionMessageUtil.valueAndName(l0, name0), numCallsBelowRequirer + 1);
+            fail(name0 + " <= " + name1, ExceptionMessageUtil.valueAndName(l0, name0, l1, name1));
         }
         return l0;
     }
 
     public static long leq(long l0, String name0, long l1) {
-        return leq(l0, name0, l1, 1);
+        if (!(l0 <= l1)) {
+            fail(name0 + " <= " + l1, ExceptionMessageUtil.valueAndName(l0, name0));
+        }
+        return l0;
     }
 
     // ----------------------------------------------------------------
-    /**
-     * require (f0 &lt;= f1)
-     */
-    public static float leq(float f0, String name0, float f1, String name1, int numCallsBelowRequirer) {
-        if (!(f0 <= f1)) {
-            fail(name0 + " <= " + name1, ExceptionMessageUtil.valueAndName(f0, name0, f1, name1),
-                    numCallsBelowRequirer + 1);
-        }
-        return f0;
-    }
 
     public static float leq(float f0, String name0, float f1, String name1) {
-        return leq(f0, name0, f1, name1, 1);
-    }
-
-    public static float leq(float f0, String name0, float f1, int numCallsBelowRequirer) {
         if (!(f0 <= f1)) {
-            fail(name0 + " <= " + f1, ExceptionMessageUtil.valueAndName(f0, name0), numCallsBelowRequirer + 1);
+            fail(name0 + " <= " + name1, ExceptionMessageUtil.valueAndName(f0, name0, f1, name1));
         }
         return f0;
     }
 
     public static float leq(float f0, String name0, float f1) {
-        return leq(f0, name0, f1, 1);
+        if (!(f0 <= f1)) {
+            fail(name0 + " <= " + f1, ExceptionMessageUtil.valueAndName(f0, name0));
+        }
+        return f0;
     }
 
     // ----------------------------------------------------------------
-    /**
-     * require (d0 &lt;= d1)
-     */
-    public static double leq(double d0, String name0, double d1, String name1, int numCallsBelowRequirer) {
-        if (!(d0 <= d1)) {
-            fail(name0 + " <= " + name1, ExceptionMessageUtil.valueAndName(d0, name0, d1, name1),
-                    numCallsBelowRequirer + 1);
-        }
-        return d0;
-    }
 
     public static double leq(double d0, String name0, double d1, String name1) {
-        return leq(d0, name0, d1, name1, 1);
-    }
-
-    public static double leq(double d0, String name0, double d1, int numCallsBelowRequirer) {
         if (!(d0 <= d1)) {
-            fail(name0 + " <= " + d1, ExceptionMessageUtil.valueAndName(d0, name0), numCallsBelowRequirer + 1);
+            fail(name0 + " <= " + name1, ExceptionMessageUtil.valueAndName(d0, name0, d1, name1));
         }
         return d0;
     }
 
     public static double leq(double d0, String name0, double d1) {
-        return leq(d0, name0, d1, 1);
+        if (!(d0 <= d1)) {
+            fail(name0 + " <= " + d1, ExceptionMessageUtil.valueAndName(d0, name0));
+        }
+        return d0;
     }
 
     // ################################################################
     // gt (primitiveValue > primitiveValue)
 
     // ----------------------------------------------------------------
-    /**
-     * require (c0 &gt; c1)
-     */
-    public static char gt(char c0, String name0, char c1, String name1, int numCallsBelowRequirer) {
-        if (!(c0 > c1)) {
-            fail(name0 + " > " + name1, ExceptionMessageUtil.valueAndName(c0, name0, c1, name1),
-                    numCallsBelowRequirer + 1);
-        }
-        return c0;
-    }
 
     public static char gt(char c0, String name0, char c1, String name1) {
-        return gt(c0, name0, c1, name1, 1);
-    }
-
-    public static char gt(char c0, String name0, char c1, int numCallsBelowRequirer) {
         if (!(c0 > c1)) {
-            fail(name0 + " > " + ExceptionMessageUtil.valueString(c1), ExceptionMessageUtil.valueAndName(c0, name0),
-                    numCallsBelowRequirer + 1);
+            fail(name0 + " > " + name1, ExceptionMessageUtil.valueAndName(c0, name0, c1, name1));
         }
         return c0;
     }
 
     public static char gt(char c0, String name0, char c1) {
-        return gt(c0, name0, c1, 1);
+        if (!(c0 > c1)) {
+            fail(name0 + " > " + ExceptionMessageUtil.valueString(c1), ExceptionMessageUtil.valueAndName(c0, name0));
+        }
+        return c0;
     }
 
     // ----------------------------------------------------------------
-    /**
-     * require (b0 &gt; b1)
-     */
-    public static byte gt(byte b0, String name0, byte b1, String name1, int numCallsBelowRequirer) {
-        if (!(b0 > b1)) {
-            fail(name0 + " > " + name1, ExceptionMessageUtil.valueAndName(b0, name0, b1, name1),
-                    numCallsBelowRequirer + 1);
-        }
-        return b0;
-    }
 
     public static byte gt(byte b0, String name0, byte b1, String name1) {
-        return gt(b0, name0, b1, name1, 1);
-    }
-
-    public static byte gt(byte b0, String name0, byte b1, int numCallsBelowRequirer) {
         if (!(b0 > b1)) {
-            fail(name0 + " > " + b1, ExceptionMessageUtil.valueAndName(b0, name0), numCallsBelowRequirer + 1);
+            fail(name0 + " > " + name1, ExceptionMessageUtil.valueAndName(b0, name0, b1, name1));
         }
         return b0;
     }
 
     public static byte gt(byte b0, String name0, byte b1) {
-        return gt(b0, name0, b1, 1);
+        if (!(b0 > b1)) {
+            fail(name0 + " > " + b1, ExceptionMessageUtil.valueAndName(b0, name0));
+        }
+        return b0;
     }
 
     // ----------------------------------------------------------------
-    /**
-     * require (s0 &gt; s1)
-     */
-    public static short gt(short s0, String name0, short s1, String name1, int numCallsBelowRequirer) {
-        if (!(s0 > s1)) {
-            fail(name0 + " > " + name1, ExceptionMessageUtil.valueAndName(s0, name0, s1, name1),
-                    numCallsBelowRequirer + 1);
-        }
-        return s0;
-    }
 
     public static short gt(short s0, String name0, short s1, String name1) {
-        return gt(s0, name0, s1, name1, 1);
-    }
-
-    public static short gt(short s0, String name0, short s1, int numCallsBelowRequirer) {
         if (!(s0 > s1)) {
-            fail(name0 + " > " + s1, ExceptionMessageUtil.valueAndName(s0, name0), numCallsBelowRequirer + 1);
+            fail(name0 + " > " + name1, ExceptionMessageUtil.valueAndName(s0, name0, s1, name1));
         }
         return s0;
     }
 
     public static short gt(short s0, String name0, short s1) {
-        return gt(s0, name0, s1, 1);
+        if (!(s0 > s1)) {
+            fail(name0 + " > " + s1, ExceptionMessageUtil.valueAndName(s0, name0));
+        }
+        return s0;
     }
 
     // ----------------------------------------------------------------
-    /**
-     * require (i0 &gt; i1)
-     */
-    public static int gt(int i0, String name0, int i1, String name1, int numCallsBelowRequirer) {
-        if (!(i0 > i1)) {
-            fail(name0 + " > " + name1, ExceptionMessageUtil.valueAndName(i0, name0, i1, name1),
-                    numCallsBelowRequirer + 1);
-        }
-        return i0;
-    }
 
     public static int gt(int i0, String name0, int i1, String name1) {
-        return gt(i0, name0, i1, name1, 1);
-    }
-
-    public static int gt(int i0, String name0, int i1, int numCallsBelowRequirer) {
         if (!(i0 > i1)) {
-            fail(name0 + " > " + i1, ExceptionMessageUtil.valueAndName(i0, name0), numCallsBelowRequirer + 1);
+            fail(name0 + " > " + name1, ExceptionMessageUtil.valueAndName(i0, name0, i1, name1));
         }
         return i0;
     }
 
     public static int gt(int i0, String name0, int i1) {
-        return gt(i0, name0, i1, 1);
+        if (!(i0 > i1)) {
+            fail(name0 + " > " + i1, ExceptionMessageUtil.valueAndName(i0, name0));
+        }
+        return i0;
     }
 
     // ----------------------------------------------------------------
-    /**
-     * require (l0 &gt; l1)
-     */
-    public static long gt(long l0, String name0, long l1, String name1, int numCallsBelowRequirer) {
-        if (!(l0 > l1)) {
-            fail(name0 + " > " + name1, ExceptionMessageUtil.valueAndName(l0, name0, l1, name1),
-                    numCallsBelowRequirer + 1);
-        }
-        return l0;
-    }
 
     public static long gt(long l0, String name0, long l1, String name1) {
-        return gt(l0, name0, l1, name1, 1);
-    }
-
-    public static long gt(long l0, String name0, long l1, int numCallsBelowRequirer) {
         if (!(l0 > l1)) {
-            fail(name0 + " > " + l1, ExceptionMessageUtil.valueAndName(l0, name0), numCallsBelowRequirer + 1);
+            fail(name0 + " > " + name1, ExceptionMessageUtil.valueAndName(l0, name0, l1, name1));
         }
         return l0;
     }
 
     public static long gt(long l0, String name0, long l1) {
-        return gt(l0, name0, l1, 1);
+        if (!(l0 > l1)) {
+            fail(name0 + " > " + l1, ExceptionMessageUtil.valueAndName(l0, name0));
+        }
+        return l0;
     }
 
     // ----------------------------------------------------------------
-    /**
-     * require (f0 &gt; f1)
-     */
-    public static float gt(float f0, String name0, float f1, String name1, int numCallsBelowRequirer) {
-        if (!(f0 > f1)) {
-            fail(name0 + " > " + name1, ExceptionMessageUtil.valueAndName(f0, name0, f1, name1),
-                    numCallsBelowRequirer + 1);
-        }
-        return f0;
-    }
 
     public static float gt(float f0, String name0, float f1, String name1) {
-        return gt(f0, name0, f1, name1, 1);
-    }
-
-    public static float gt(float f0, String name0, float f1, int numCallsBelowRequirer) {
         if (!(f0 > f1)) {
-            fail(name0 + " > " + f1, ExceptionMessageUtil.valueAndName(f0, name0), numCallsBelowRequirer + 1);
+            fail(name0 + " > " + name1, ExceptionMessageUtil.valueAndName(f0, name0, f1, name1));
         }
         return f0;
     }
 
     public static float gt(float f0, String name0, float f1) {
-        return gt(f0, name0, f1, 1);
+        if (!(f0 > f1)) {
+            fail(name0 + " > " + f1, ExceptionMessageUtil.valueAndName(f0, name0));
+        }
+        return f0;
     }
 
     // ----------------------------------------------------------------
-    /**
-     * require (d0 &gt; d1)
-     */
-    public static double gt(double d0, String name0, double d1, String name1, int numCallsBelowRequirer) {
-        if (!(d0 > d1)) {
-            fail(name0 + " > " + name1, ExceptionMessageUtil.valueAndName(d0, name0, d1, name1),
-                    numCallsBelowRequirer + 1);
-        }
-        return d0;
-    }
 
     public static double gt(double d0, String name0, double d1, String name1) {
-        return gt(d0, name0, d1, name1, 1);
-    }
-
-    public static double gt(double d0, String name0, double d1, int numCallsBelowRequirer) {
         if (!(d0 > d1)) {
-            fail(name0 + " > " + d1, ExceptionMessageUtil.valueAndName(d0, name0), numCallsBelowRequirer + 1);
+            fail(name0 + " > " + name1, ExceptionMessageUtil.valueAndName(d0, name0, d1, name1));
         }
         return d0;
     }
 
     public static double gt(double d0, String name0, double d1) {
-        return gt(d0, name0, d1, 1);
+        if (!(d0 > d1)) {
+            fail(name0 + " > " + d1, ExceptionMessageUtil.valueAndName(d0, name0));
+        }
+        return d0;
     }
 
     // ################################################################
     // geq (primitiveValue >= primitiveValue)
 
     // ----------------------------------------------------------------
-    /**
-     * require (c0 &gt;= c1)
-     */
-    public static char geq(char c0, String name0, char c1, String name1, int numCallsBelowRequirer) {
-        if (!(c0 >= c1)) {
-            fail(name0 + " >= " + name1, ExceptionMessageUtil.valueAndName(c0, name0, c1, name1),
-                    numCallsBelowRequirer + 1);
-        }
-        return c0;
-    }
 
     public static char geq(char c0, String name0, char c1, String name1) {
-        return geq(c0, name0, c1, name1, 1);
-    }
-
-    public static char geq(char c0, String name0, char c1, int numCallsBelowRequirer) {
         if (!(c0 >= c1)) {
-            fail(name0 + " >= " + ExceptionMessageUtil.valueString(c1), ExceptionMessageUtil.valueAndName(c0, name0),
-                    numCallsBelowRequirer + 1);
-        }
-        return c0;
-    }
-
-    public static char geq(char c0, String name0, char c1) {
-        return geq(c0, name0, c1, 1);
-    }
-
-    // ----------------------------------------------------------------
-    /**
-     * require (b0 &gt;= b1)
-     */
-    public static byte geq(byte b0, String name0, byte b1, String name1, int numCallsBelowRequirer) {
-        if (!(b0 >= b1)) {
-            fail(name0 + " >= " + name1, ExceptionMessageUtil.valueAndName(b0, name0, b1, name1),
-                    numCallsBelowRequirer + 1);
+            fail(name0 + " >= " + name1, ExceptionMessageUtil.valueAndName(c0, name0, c1, name1));
         }
-        return b0;
+        return c0;
     }
 
-    public static byte geq(byte b0, String name0, byte b1, String name1) {
-        return geq(b0, name0, b1, name1, 1);
+    public static char geq(char c0, String name0, char c1) {
+        if (!(c0 >= c1)) {
+            fail(name0 + " >= " + ExceptionMessageUtil.valueString(c1), ExceptionMessageUtil.valueAndName(c0, name0));
+        }
+        return c0;
     }
 
-    public static byte geq(byte b0, String name0, byte b1, int numCallsBelowRequirer) {
+    // ----------------------------------------------------------------
+
+    public static byte geq(byte b0, String name0, byte b1, String name1) {
         if (!(b0 >= b1)) {
-            fail(name0 + " >= " + b1, ExceptionMessageUtil.valueAndName(b0, name0), numCallsBelowRequirer + 1);
+            fail(name0 + " >= " + name1, ExceptionMessageUtil.valueAndName(b0, name0, b1, name1));
         }
         return b0;
     }
 
     public static byte geq(byte b0, String name0, byte b1) {
-        return geq(b0, name0, b1, 1);
+        if (!(b0 >= b1)) {
+            fail(name0 + " >= " + b1, ExceptionMessageUtil.valueAndName(b0, name0));
+        }
+        return b0;
     }
 
     // ----------------------------------------------------------------
-    /**
-     * require (s0 &gt;= s1)
-     */
-    public static short geq(short s0, String name0, short s1, String name1, int numCallsBelowRequirer) {
-        if (!(s0 >= s1)) {
-            fail(name0 + " >= " + name1, ExceptionMessageUtil.valueAndName(s0, name0, s1, name1),
-                    numCallsBelowRequirer + 1);
-        }
-        return s0;
-    }
 
     public static short geq(short s0, String name0, short s1, String name1) {
-        return geq(s0, name0, s1, name1, 1);
-    }
-
-    public static short geq(short s0, String name0, short s1, int numCallsBelowRequirer) {
         if (!(s0 >= s1)) {
-            fail(name0 + " >= " + s1, ExceptionMessageUtil.valueAndName(s0, name0), numCallsBelowRequirer + 1);
+            fail(name0 + " >= " + name1, ExceptionMessageUtil.valueAndName(s0, name0, s1, name1));
         }
         return s0;
     }
 
     public static short geq(short s0, String name0, short s1) {
-        return geq(s0, name0, s1, 1);
+        if (!(s0 >= s1)) {
+            fail(name0 + " >= " + s1, ExceptionMessageUtil.valueAndName(s0, name0));
+        }
+        return s0;
     }
 
     // ----------------------------------------------------------------
-    /**
-     * require (i0 &gt;= i1)
-     */
-    public static int geq(int i0, String name0, int i1, String name1, int numCallsBelowRequirer) {
-        if (!(i0 >= i1)) {
-            fail(name0 + " >= " + name1, ExceptionMessageUtil.valueAndName(i0, name0, i1, name1),
-                    numCallsBelowRequirer + 1);
-        }
-        return i0;
-    }
 
     public static int geq(int i0, String name0, int i1, String name1) {
-        return geq(i0, name0, i1, name1, 1);
-    }
-
-    public static int geq(int i0, String name0, int i1, int numCallsBelowRequirer) {
         if (!(i0 >= i1)) {
-            fail(name0 + " >= " + i1, ExceptionMessageUtil.valueAndName(i0, name0), numCallsBelowRequirer + 1);
+            fail(name0 + " >= " + name1, ExceptionMessageUtil.valueAndName(i0, name0, i1, name1));
         }
         return i0;
     }
 
     public static int geq(int i0, String name0, int i1) {
-        return geq(i0, name0, i1, 1);
+        if (!(i0 >= i1)) {
+            fail(name0 + " >= " + i1, ExceptionMessageUtil.valueAndName(i0, name0));
+        }
+        return i0;
     }
 
     // ----------------------------------------------------------------
-    /**
-     * require (l0 &gt;= l1)
-     */
-    public static long geq(long l0, String name0, long l1, String name1, int numCallsBelowRequirer) {
-        if (!(l0 >= l1)) {
-            fail(name0 + " >= " + name1, ExceptionMessageUtil.valueAndName(l0, name0, l1, name1),
-                    numCallsBelowRequirer + 1);
-        }
-        return l0;
-    }
 
     public static long geq(long l0, String name0, long l1, String name1) {
-        return geq(l0, name0, l1, name1, 1);
-    }
-
-    public static long geq(long l0, String name0, long l1, int numCallsBelowRequirer) {
         if (!(l0 >= l1)) {
-            fail(name0 + " >= " + l1, ExceptionMessageUtil.valueAndName(l0, name0), numCallsBelowRequirer + 1);
+            fail(name0 + " >= " + name1, ExceptionMessageUtil.valueAndName(l0, name0, l1, name1));
         }
         return l0;
     }
 
     public static long geq(long l0, String name0, long l1) {
-        return geq(l0, name0, l1, 1);
+        if (!(l0 >= l1)) {
+            fail(name0 + " >= " + l1, ExceptionMessageUtil.valueAndName(l0, name0));
+        }
+        return l0;
     }
 
     // ----------------------------------------------------------------
-    /**
-     * require (f0 &gt;= f1)
-     */
-    public static float geq(float f0, String name0, float f1, String name1, int numCallsBelowRequirer) {
-        if (!(f0 >= f1)) {
-            fail(name0 + " >= " + name1, ExceptionMessageUtil.valueAndName(f0, name0, f1, name1),
-                    numCallsBelowRequirer + 1);
-        }
-        return f0;
-    }
 
     public static float geq(float f0, String name0, float f1, String name1) {
-        return geq(f0, name0, f1, name1, 1);
-    }
-
-    public static float geq(float f0, String name0, float f1, int numCallsBelowRequirer) {
         if (!(f0 >= f1)) {
-            fail(name0 + " >= " + f1, ExceptionMessageUtil.valueAndName(f0, name0), numCallsBelowRequirer + 1);
+            fail(name0 + " >= " + name1, ExceptionMessageUtil.valueAndName(f0, name0, f1, name1));
         }
         return f0;
     }
 
     public static float geq(float f0, String name0, float f1) {
-        return geq(f0, name0, f1, 1);
+        if (!(f0 >= f1)) {
+            fail(name0 + " >= " + f1, ExceptionMessageUtil.valueAndName(f0, name0));
+        }
+        return f0;
     }
 
     // ----------------------------------------------------------------
-    /**
-     * require (d0 &gt;= d1)
-     */
-    public static double geq(double d0, String name0, double d1, String name1, int numCallsBelowRequirer) {
-        if (!(d0 >= d1)) {
-            fail(name0 + " >= " + name1, ExceptionMessageUtil.valueAndName(d0, name0, d1, name1),
-                    numCallsBelowRequirer + 1);
-        }
-        return d0;
-    }
 
     public static double geq(double d0, String name0, double d1, String name1) {
-        return geq(d0, name0, d1, name1, 1);
-    }
-
-    public static double geq(double d0, String name0, double d1, int numCallsBelowRequirer) {
         if (!(d0 >= d1)) {
-            fail(name0 + " >= " + d1, ExceptionMessageUtil.valueAndName(d0, name0), numCallsBelowRequirer + 1);
+            fail(name0 + " >= " + name1, ExceptionMessageUtil.valueAndName(d0, name0, d1, name1));
         }
         return d0;
     }
 
     public static double geq(double d0, String name0, double d1) {
-        return geq(d0, name0, d1, 1);
+        if (!(d0 >= d1)) {
+            fail(name0 + " >= " + d1, ExceptionMessageUtil.valueAndName(d0, name0));
+        }
+        return d0;
     }
 
     // ################################################################
@@ -1799,696 +1029,418 @@ public static double geq(double d0, String name0, double d1) {
 
     // ----------------------------------------------------------------
 
-    /**
-     * require (b == false)
-     */
-    public static void eqFalse(boolean b, String name, int numCallsBelowRequirer) {
+    public static void eqFalse(boolean b, String name) {
         if (!(false == b)) {
-            fail(name + " == false", ExceptionMessageUtil.valueAndName(b, name), numCallsBelowRequirer + 1);
+            fail(name + " == false", ExceptionMessageUtil.valueAndName(b, name));
         }
     }
 
-    public static void eqFalse(boolean b, String name) {
-        eqFalse(b, name, 1);
-    }
-
     // ----------------------------------------------------------------
-    /**
-     * require (b != false)
-     */
-    public static void neqFalse(boolean b, String name, int numCallsBelowRequirer) {
-        if (!(false != b)) {
-            fail(name + " != false", ExceptionMessageUtil.valueAndName(b, name), numCallsBelowRequirer + 1);
-        }
-    }
 
     public static void neqFalse(boolean b, String name) {
-        neqFalse(b, name, 1);
+        if (!(false != b)) {
+            fail(name + " != false", ExceptionMessageUtil.valueAndName(b, name));
+        }
     }
 
     // ----------------------------------------------------------------
-    /**
-     * require (b == true)
-     */
-    public static void eqTrue(boolean b, String name, int numCallsBelowRequirer) {
-        if (!(true == b)) {
-            fail(name + " == true", ExceptionMessageUtil.valueAndName(b, name), numCallsBelowRequirer + 1);
-        }
-    }
 
     public static void eqTrue(boolean b, String name) {
-        eqTrue(b, name, 1);
+        if (!(true == b)) {
+            fail(name + " == true", ExceptionMessageUtil.valueAndName(b, name));
+        }
     }
 
     // ----------------------------------------------------------------
-    /**
-     * require (b != true)
-     */
-    public static void neqTrue(boolean b, String name, int numCallsBelowRequirer) {
-        if (!(true != b)) {
-            fail(name + " != true", ExceptionMessageUtil.valueAndName(b, name), numCallsBelowRequirer + 1);
-        }
-    }
 
     public static void neqTrue(boolean b, String name) {
-        neqTrue(b, name, 1);
+        if (!(true != b)) {
+            fail(name + " != true", ExceptionMessageUtil.valueAndName(b, name));
+        }
     }
 
     // ################################################################
     // eqZero (primitiveValue == 0)
 
     // ----------------------------------------------------------------
-    /**
-     * require (c == 0)
-     */
-    public static void eqZero(char c, String name, int numCallsBelowRequirer) {
-        if (!(0 == c)) {
-            fail(name + " == 0", ExceptionMessageUtil.valueAndName(c, name), numCallsBelowRequirer + 1);
-        }
-    }
 
     public static void eqZero(char c, String name) {
-        eqZero(c, name, 1);
+        if (!(0 == c)) {
+            fail(name + " == 0", ExceptionMessageUtil.valueAndName(c, name));
+        }
     }
 
     // ----------------------------------------------------------------
-    /**
-     * require (b == 0)
-     */
-    public static void eqZero(byte b, String name, int numCallsBelowRequirer) {
-        if (!(0 == b)) {
-            fail(name + " == 0", ExceptionMessageUtil.valueAndName(b, name), numCallsBelowRequirer + 1);
-        }
-    }
 
     public static void eqZero(byte b, String name) {
-        eqZero(b, name, 1);
+        if (!(0 == b)) {
+            fail(name + " == 0", ExceptionMessageUtil.valueAndName(b, name));
+        }
     }
 
     // ----------------------------------------------------------------
-    /**
-     * require (s == 0)
-     */
-    public static void eqZero(short s, String name, int numCallsBelowRequirer) {
-        if (!(0 == s)) {
-            fail(name + " == 0", ExceptionMessageUtil.valueAndName(s, name), numCallsBelowRequirer + 1);
-        }
-    }
 
     public static void eqZero(short s, String name) {
-        eqZero(s, name, 1);
+        if (!(0 == s)) {
+            fail(name + " == 0", ExceptionMessageUtil.valueAndName(s, name));
+        }
     }
 
     // ----------------------------------------------------------------
-    /**
-     * require (i == 0)
-     */
-    public static void eqZero(int i, String name, int numCallsBelowRequirer) {
-        if (!(0 == i)) {
-            fail(name + " == 0", ExceptionMessageUtil.valueAndName(i, name), numCallsBelowRequirer + 1);
-        }
-    }
 
     public static void eqZero(int i, String name) {
-        eqZero(i, name, 1);
+        if (!(0 == i)) {
+            fail(name + " == 0", ExceptionMessageUtil.valueAndName(i, name));
+        }
     }
 
     // ----------------------------------------------------------------
-    /**
-     * require (l == 0)
-     */
-    public static void eqZero(long l, String name, int numCallsBelowRequirer) {
-        if (!(0 == l)) {
-            fail(name + " == 0", ExceptionMessageUtil.valueAndName(l, name), numCallsBelowRequirer + 1);
-        }
-    }
 
     public static void eqZero(long l, String name) {
-        eqZero(l, name, 1);
+        if (!(0 == l)) {
+            fail(name + " == 0", ExceptionMessageUtil.valueAndName(l, name));
+        }
     }
 
     // ----------------------------------------------------------------
-    /**
-     * require (f == 0)
-     */
-    public static void eqZero(float f, String name, int numCallsBelowRequirer) {
-        if (!(0 == f)) {
-            fail(name + " == 0", ExceptionMessageUtil.valueAndName(f, name), numCallsBelowRequirer + 1);
-        }
-    }
 
     public static void eqZero(float f, String name) {
-        eqZero(f, name, 1);
+        if (!(0 == f)) {
+            fail(name + " == 0", ExceptionMessageUtil.valueAndName(f, name));
+        }
     }
 
     // ----------------------------------------------------------------
-    /**
-     * require (d == 0)
-     */
-    public static void eqZero(double d, String name, int numCallsBelowRequirer) {
-        if (!(0 == d)) {
-            fail(name + " == 0", ExceptionMessageUtil.valueAndName(d, name), numCallsBelowRequirer + 1);
-        }
-    }
 
     public static void eqZero(double d, String name) {
-        eqZero(d, name, 1);
+        if (!(0 == d)) {
+            fail(name + " == 0", ExceptionMessageUtil.valueAndName(d, name));
+        }
     }
 
     // ################################################################
     // neqZero (primitiveValue != 0)
 
     // ----------------------------------------------------------------
-    /**
-     * require (c != 0)
-     */
-    public static char neqZero(char c, String name, int numCallsBelowRequirer) {
+
+    public static char neqZero(char c, String name) {
         if (!(0 != c)) {
-            fail(name + " != 0", ExceptionMessageUtil.valueAndName(c, name), numCallsBelowRequirer + 1);
+            fail(name + " != 0", ExceptionMessageUtil.valueAndName(c, name));
         }
         return c;
     }
 
-    public static char neqZero(char c, String name) {
-        return neqZero(c, name, 1);
-    }
-
     // ----------------------------------------------------------------
-    /**
-     * require (b != 0)
-     */
-    public static byte neqZero(byte b, String name, int numCallsBelowRequirer) {
+
+    public static byte neqZero(byte b, String name) {
         if (!(0 != b)) {
-            fail(name + " != 0", ExceptionMessageUtil.valueAndName(b, name), numCallsBelowRequirer + 1);
+            fail(name + " != 0", ExceptionMessageUtil.valueAndName(b, name));
         }
         return b;
     }
 
-    public static byte neqZero(byte b, String name) {
-        return neqZero(b, name, 1);
-    }
-
     // ----------------------------------------------------------------
-    /**
-     * require (s != 0)
-     */
-    public static short neqZero(short s, String name, int numCallsBelowRequirer) {
+
+    public static short neqZero(short s, String name) {
         if (!(0 != s)) {
-            fail(name + " != 0", ExceptionMessageUtil.valueAndName(s, name), numCallsBelowRequirer + 1);
+            fail(name + " != 0", ExceptionMessageUtil.valueAndName(s, name));
         }
         return s;
     }
 
-    public static short neqZero(short s, String name) {
-        return neqZero(s, name, 1);
-    }
-
     // ----------------------------------------------------------------
-    /**
-     * require (i != 0)
-     */
-    public static int neqZero(int i, String name, int numCallsBelowRequirer) {
+
+    public static int neqZero(int i, String name) {
         if (!(0 != i)) {
-            fail(name + " != 0", ExceptionMessageUtil.valueAndName(i, name), numCallsBelowRequirer + 1);
+            fail(name + " != 0", ExceptionMessageUtil.valueAndName(i, name));
         }
         return i;
     }
 
-    public static int neqZero(int i, String name) {
-        return neqZero(i, name, 1);
-    }
-
     // ----------------------------------------------------------------
-    /**
-     * require (l != 0)
-     */
-    public static long neqZero(long l, String name, int numCallsBelowRequirer) {
+
+    public static long neqZero(long l, String name) {
         if (!(0 != l)) {
-            fail(name + " != 0", ExceptionMessageUtil.valueAndName(l, name), numCallsBelowRequirer + 1);
+            fail(name + " != 0", ExceptionMessageUtil.valueAndName(l, name));
         }
         return l;
     }
 
-    public static long neqZero(long l, String name) {
-        return neqZero(l, name, 1);
-    }
-
     // ----------------------------------------------------------------
-    /**
-     * require (f != 0)
-     */
-    public static float neqZero(float f, String name, int numCallsBelowRequirer) {
+
+    public static float neqZero(float f, String name) {
         if (!(0 != f)) {
-            fail(name + " != 0", ExceptionMessageUtil.valueAndName(f, name), numCallsBelowRequirer + 1);
+            fail(name + " != 0", ExceptionMessageUtil.valueAndName(f, name));
         }
         return f;
     }
 
-    public static float neqZero(float f, String name) {
-        return neqZero(f, name, 1);
-    }
-
     // ----------------------------------------------------------------
-    /**
-     * require (d != 0)
-     */
-    public static double neqZero(double d, String name, int numCallsBelowRequirer) {
+
+    public static double neqZero(double d, String name) {
         if (!(0 != d)) {
-            fail(name + " != 0", ExceptionMessageUtil.valueAndName(d, name), numCallsBelowRequirer + 1);
+            fail(name + " != 0", ExceptionMessageUtil.valueAndName(d, name));
         }
         return d;
     }
 
-    public static double neqZero(double d, String name) {
-        return neqZero(d, name, 1);
-    }
-
     // ################################################################
     // ltZero (primitiveValue < 0)
 
     // ----------------------------------------------------------------
-    /**
-     * require (b &lt; 0)
-     */
-    public static byte ltZero(byte b, String name, int numCallsBelowRequirer) {
+
+    public static byte ltZero(byte b, String name) {
         if (!(b < 0)) {
-            fail(name + " < 0", ExceptionMessageUtil.valueAndName(b, name), numCallsBelowRequirer + 1);
+            fail(name + " < 0", ExceptionMessageUtil.valueAndName(b, name));
         }
         return b;
     }
 
-    public static byte ltZero(byte b, String name) {
-        return ltZero(b, name, 1);
-    }
-
     // ----------------------------------------------------------------
-    /**
-     * require (s &lt; 0)
-     */
-    public static short ltZero(short s, String name, int numCallsBelowRequirer) {
+
+    public static short ltZero(short s, String name) {
         if (!(s < 0)) {
-            fail(name + " < 0", ExceptionMessageUtil.valueAndName(s, name), numCallsBelowRequirer + 1);
+            fail(name + " < 0", ExceptionMessageUtil.valueAndName(s, name));
         }
         return s;
     }
 
-    public static short ltZero(short s, String name) {
-        return ltZero(s, name, 1);
-    }
-
     // ----------------------------------------------------------------
-    /**
-     * require (i &lt; 0)
-     */
-    public static int ltZero(int i, String name, int numCallsBelowRequirer) {
+
+    public static int ltZero(int i, String name) {
         if (!(i < 0)) {
-            fail(name + " < 0", ExceptionMessageUtil.valueAndName(i, name), numCallsBelowRequirer + 1);
+            fail(name + " < 0", ExceptionMessageUtil.valueAndName(i, name));
         }
         return i;
     }
 
-    public static int ltZero(int i, String name) {
-        return ltZero(i, name, 1);
-    }
-
     // ----------------------------------------------------------------
-    /**
-     * require (l &lt; 0)
-     */
-    public static long ltZero(long l, String name, int numCallsBelowRequirer) {
+
+    public static long ltZero(long l, String name) {
         if (!(l < 0)) {
-            fail(name + " < 0", ExceptionMessageUtil.valueAndName(l, name), numCallsBelowRequirer + 1);
+            fail(name + " < 0", ExceptionMessageUtil.valueAndName(l, name));
         }
         return l;
     }
 
-    public static long ltZero(long l, String name) {
-        return ltZero(l, name, 1);
-    }
-
     // ----------------------------------------------------------------
-    /**
-     * require (f &lt; 0)
-     */
-    public static float ltZero(float f, String name, int numCallsBelowRequirer) {
+
+    public static float ltZero(float f, String name) {
         if (!(f < 0)) {
-            fail(name + " < 0", ExceptionMessageUtil.valueAndName(f, name), numCallsBelowRequirer + 1);
+            fail(name + " < 0", ExceptionMessageUtil.valueAndName(f, name));
         }
         return f;
     }
 
-    public static float ltZero(float f, String name) {
-        return ltZero(f, name, 1);
-    }
-
     // ----------------------------------------------------------------
-    /**
-     * require (d &lt; 0)
-     */
-    public static double ltZero(double d, String name, int numCallsBelowRequirer) {
+
+    public static double ltZero(double d, String name) {
         if (!(d < 0)) {
-            fail(name + " < 0", ExceptionMessageUtil.valueAndName(d, name), numCallsBelowRequirer + 1);
+            fail(name + " < 0", ExceptionMessageUtil.valueAndName(d, name));
         }
         return d;
     }
 
-    public static double ltZero(double d, String name) {
-        return ltZero(d, name, 1);
-    }
-
     // ################################################################
     // leqZero (primitiveValue <= 0)
 
     // ----------------------------------------------------------------
-    /**
-     * require (b &lt;= 0)
-     */
-    public static byte leqZero(byte b, String name, int numCallsBelowRequirer) {
+
+    public static byte leqZero(byte b, String name) {
         if (!(b <= 0)) {
-            fail(name + " <= 0", ExceptionMessageUtil.valueAndName(b, name), numCallsBelowRequirer + 1);
+            fail(name + " <= 0", ExceptionMessageUtil.valueAndName(b, name));
         }
         return b;
     }
 
-    public static byte leqZero(byte b, String name) {
-        return leqZero(b, name, 1);
-    }
-
     // ----------------------------------------------------------------
-    /**
-     * require (s &lt;= 0)
-     */
-    public static short leqZero(short s, String name, int numCallsBelowRequirer) {
+
+    public static short leqZero(short s, String name) {
         if (!(s <= 0)) {
-            fail(name + " <= 0", ExceptionMessageUtil.valueAndName(s, name), numCallsBelowRequirer + 1);
+            fail(name + " <= 0", ExceptionMessageUtil.valueAndName(s, name));
         }
         return s;
     }
 
-    public static short leqZero(short s, String name) {
-        return leqZero(s, name, 1);
-    }
-
     // ----------------------------------------------------------------
-    /**
-     * require (i &lt;= 0)
-     */
-    public static int leqZero(int i, String name, int numCallsBelowRequirer) {
-        if (!(i <= 0)) {
-            fail(name + " <= 0", ExceptionMessageUtil.valueAndName(i, name), numCallsBelowRequirer + 1);
-        }
-        return i;
-    }
 
     public static int leqZero(int i, String name) {
-        return leqZero(i, name, 1);
+        if (!(i <= 0)) {
+            fail(name + " <= 0", ExceptionMessageUtil.valueAndName(i, name));
+        }
+        return i;
     }
 
     // ----------------------------------------------------------------
-    /**
-     * require (l &lt;= 0)
-     */
-    public static long leqZero(long l, String name, int numCallsBelowRequirer) {
+
+    public static long leqZero(long l, String name) {
         if (!(l <= 0)) {
-            fail(name + " <= 0", ExceptionMessageUtil.valueAndName(l, name), numCallsBelowRequirer + 1);
+            fail(name + " <= 0", ExceptionMessageUtil.valueAndName(l, name));
         }
         return l;
     }
 
-    public static long leqZero(long l, String name) {
-        return leqZero(l, name, 1);
-    }
-
     // ----------------------------------------------------------------
-    /**
-     * require (f &lt;= 0)
-     */
-    public static float leqZero(float f, String name, int numCallsBelowRequirer) {
+
+    public static float leqZero(float f, String name) {
         if (!(f <= 0)) {
-            fail(name + " <= 0", ExceptionMessageUtil.valueAndName(f, name), numCallsBelowRequirer + 1);
+            fail(name + " <= 0", ExceptionMessageUtil.valueAndName(f, name));
         }
         return f;
     }
 
-    public static float leqZero(float f, String name) {
-        return leqZero(f, name, 1);
-    }
-
     // ----------------------------------------------------------------
-    /**
-     * require (d &lt;= 0)
-     */
-    public static double leqZero(double d, String name, int numCallsBelowRequirer) {
+
+    public static double leqZero(double d, String name) {
         if (!(d <= 0)) {
-            fail(name + " <= 0", ExceptionMessageUtil.valueAndName(d, name), numCallsBelowRequirer + 1);
+            fail(name + " <= 0", ExceptionMessageUtil.valueAndName(d, name));
         }
         return d;
     }
 
-    public static double leqZero(double d, String name) {
-        return leqZero(d, name, 1);
-    }
-
     // ################################################################
     // gtZero (primitiveValue > 0)
 
     // ----------------------------------------------------------------
-    /**
-     * require (b &gt; 0)
-     */
-    public static byte gtZero(byte b, String name, int numCallsBelowRequirer) {
+
+    public static byte gtZero(byte b, String name) {
         if (!(b > 0)) {
-            fail(name + " > 0", ExceptionMessageUtil.valueAndName(b, name), numCallsBelowRequirer + 1);
+            fail(name + " > 0", ExceptionMessageUtil.valueAndName(b, name));
         }
         return b;
     }
 
-    public static byte gtZero(byte b, String name) {
-        return gtZero(b, name, 1);
-    }
-
     // ----------------------------------------------------------------
-    /**
-     * require (s &gt; 0)
-     */
-    public static short gtZero(short s, String name, int numCallsBelowRequirer) {
+
+    public static short gtZero(short s, String name) {
         if (!(s > 0)) {
-            fail(name + " > 0", ExceptionMessageUtil.valueAndName(s, name), numCallsBelowRequirer + 1);
+            fail(name + " > 0", ExceptionMessageUtil.valueAndName(s, name));
         }
         return s;
     }
 
-    public static short gtZero(short s, String name) {
-        return gtZero(s, name, 1);
-    }
-
     // ----------------------------------------------------------------
-    /**
-     * require (i &gt; 0)
-     */
-    public static int gtZero(int i, String name, int numCallsBelowRequirer) {
+
+    public static int gtZero(int i, String name) {
         if (!(i > 0)) {
-            fail(name + " > 0", ExceptionMessageUtil.valueAndName(i, name), numCallsBelowRequirer + 1);
+            fail(name + " > 0", ExceptionMessageUtil.valueAndName(i, name));
         }
         return i;
     }
 
-    public static int gtZero(int i, String name) {
-        return gtZero(i, name, 1);
-    }
-
     // ----------------------------------------------------------------
-    /**
-     * require (l &gt; 0)
-     */
-    public static long gtZero(long l, String name, int numCallsBelowRequirer) {
+
+    public static long gtZero(long l, String name) {
         if (!(l > 0)) {
-            fail(name + " > 0", ExceptionMessageUtil.valueAndName(l, name), numCallsBelowRequirer + 1);
+            fail(name + " > 0", ExceptionMessageUtil.valueAndName(l, name));
         }
         return l;
     }
 
-    public static long gtZero(long l, String name) {
-        return gtZero(l, name, 1);
-    }
-
     // ----------------------------------------------------------------
-    /**
-     * require (f &gt; 0)
-     */
-    public static float gtZero(float f, String name, int numCallsBelowRequirer) {
+
+    public static float gtZero(float f, String name) {
         if (!(f > 0)) {
-            fail(name + " > 0", ExceptionMessageUtil.valueAndName(f, name), numCallsBelowRequirer + 1);
+            fail(name + " > 0", ExceptionMessageUtil.valueAndName(f, name));
         }
         return f;
     }
 
-    public static float gtZero(float f, String name) {
-        return gtZero(f, name, 1);
-    }
-
     // ----------------------------------------------------------------
-    /**
-     * require (d > 0)
-     */
-    public static double gtZero(double d, String name, int numCallsBelowRequirer) {
+
+    public static double gtZero(double d, String name) {
         if (!(d > 0)) {
-            fail(name + " > 0", ExceptionMessageUtil.valueAndName(d, name), numCallsBelowRequirer + 1);
+            fail(name + " > 0", ExceptionMessageUtil.valueAndName(d, name));
         }
         return d;
     }
 
-    public static double gtZero(double d, String name) {
-        return gtZero(d, name, 1);
-    }
-
     // ################################################################
     // geqZero (primitiveValue >= 0)
 
     // ----------------------------------------------------------------
-    /**
-     * require (b &gt;= 0)
-     */
-    public static byte geqZero(byte b, String name, int numCallsBelowRequirer) {
+
+    public static byte geqZero(byte b, String name) {
         if (!(b >= 0)) {
-            fail(name + " >= 0", ExceptionMessageUtil.valueAndName(b, name), numCallsBelowRequirer + 1);
+            fail(name + " >= 0", ExceptionMessageUtil.valueAndName(b, name));
         }
         return b;
     }
 
-    public static byte geqZero(byte b, String name) {
-        return geqZero(b, name, 1);
-    }
-
     // ----------------------------------------------------------------
-    /**
-     * require (s &gt;= 0)
-     */
-    public static short geqZero(short s, String name, int numCallsBelowRequirer) {
+
+    public static short geqZero(short s, String name) {
         if (!(s >= 0)) {
-            fail(name + " >= 0", ExceptionMessageUtil.valueAndName(s, name), numCallsBelowRequirer + 1);
+            fail(name + " >= 0", ExceptionMessageUtil.valueAndName(s, name));
         }
         return s;
     }
 
-    public static short geqZero(short s, String name) {
-        return geqZero(s, name, 1);
-    }
-
     // ----------------------------------------------------------------
-    /**
-     * require (i &gt;= 0)
-     */
-    public static int geqZero(int i, String name, int numCallsBelowRequirer) {
+
+    public static int geqZero(int i, String name) {
         if (!(i >= 0)) {
-            fail(name + " >= 0", ExceptionMessageUtil.valueAndName(i, name), numCallsBelowRequirer + 1);
+            fail(name + " >= 0", ExceptionMessageUtil.valueAndName(i, name));
         }
         return i;
     }
 
-    public static int geqZero(int i, String name) {
-        return geqZero(i, name, 1);
-    }
-
     // ----------------------------------------------------------------
-    /**
-     * require (l &gt;= 0)
-     */
-    public static long geqZero(long l, String name, int numCallsBelowRequirer) {
+
+    public static long geqZero(long l, String name) {
         if (!(l >= 0)) {
-            fail(name + " >= 0", ExceptionMessageUtil.valueAndName(l, name), numCallsBelowRequirer + 1);
+            fail(name + " >= 0", ExceptionMessageUtil.valueAndName(l, name));
         }
         return l;
     }
 
-    public static long geqZero(long l, String name) {
-        return geqZero(l, name, 1);
-    }
-
     // ----------------------------------------------------------------
-    /**
-     * require (f &gt;= 0)
-     */
-    public static float geqZero(float f, String name, int numCallsBelowRequirer) {
+
+    public static float geqZero(float f, String name) {
         if (!(f >= 0)) {
-            fail(name + " >= 0", ExceptionMessageUtil.valueAndName(f, name), numCallsBelowRequirer + 1);
+            fail(name + " >= 0", ExceptionMessageUtil.valueAndName(f, name));
         }
         return f;
     }
 
-    public static float geqZero(float f, String name) {
-        return geqZero(f, name, 1);
-    }
-
     // ----------------------------------------------------------------
-    /**
-     * require (d &gt;= 0)
-     */
-    public static double geqZero(double d, String name, int numCallsBelowRequirer) {
+
+    public static double geqZero(double d, String name) {
         if (!(d >= 0)) {
-            fail(name + " >= 0", ExceptionMessageUtil.valueAndName(d, name), numCallsBelowRequirer + 1);
+            fail(name + " >= 0", ExceptionMessageUtil.valueAndName(d, name));
         }
         return d;
     }
 
-    public static double geqZero(double d, String name) {
-        return geqZero(d, name, 1);
-    }
-
     // ################################################################
     // eq, neq (Object ==/!= Object)
 
     // ----------------------------------------------------------------
 
-    /**
-     * require (o0 == o1)
-     */
-    public static void eq(Object o0, String name0, Object o1, String name1, int numCallsBelowRequirer) {
-        if (!(o0 == o1)) {
-            fail(name0 + " == " + name1, ExceptionMessageUtil.valueAndName(o0, name0, o1, name1),
-                    numCallsBelowRequirer + 1);
-        }
-    }
-
     public static void eq(Object o0, String name0, Object o1, String name1) {
-        eq(o0, name0, o1, name1, 1);
-    }
-
-    public static void eq(Object o0, String name0, Object o1, int numCallsBelowRequirer) {
         if (!(o0 == o1)) {
-            fail(name0 + " == " + ExceptionMessageUtil.valueString(o1), ExceptionMessageUtil.valueAndName(o0, name0),
-                    numCallsBelowRequirer + 1);
+            fail(name0 + " == " + name1, ExceptionMessageUtil.valueAndName(o0, name0, o1, name1));
         }
     }
 
     public static void eq(Object o0, String name0, Object o1) {
-        eq(o0, name0, o1, 1);
+        if (!(o0 == o1)) {
+            fail(name0 + " == " + ExceptionMessageUtil.valueString(o1), ExceptionMessageUtil.valueAndName(o0, name0));
+        }
     }
 
     // ----------------------------------------------------------------
-    /**
-     * require (o0 != o1)
-     */
-    public static void neq(Object o0, String name0, Object o1, String name1, int numCallsBelowRequirer) {
-        if (!(o0 != o1)) {
-            fail(name0 + " != " + name1, ExceptionMessageUtil.valueAndName(o0, name0, o1, name1),
-                    numCallsBelowRequirer + 1);
-        }
-    }
 
     public static void neq(Object o0, String name0, Object o1, String name1) {
-        neq(o0, name0, o1, name1, 1);
-    }
-
-    public static void neq(Object o0, String name0, Object o1, int numCallsBelowRequirer) {
         if (!(o0 != o1)) {
-            fail(name0 + " != " + ExceptionMessageUtil.valueString(o1), ExceptionMessageUtil.valueAndName(o0, name0),
-                    numCallsBelowRequirer + 1);
+            fail(name0 + " != " + name1, ExceptionMessageUtil.valueAndName(o0, name0, o1, name1));
         }
     }
 
     public static void neq(Object o0, String name0, Object o1) {
-        neq(o0, name0, o1, 1);
+        if (!(o0 != o1)) {
+            fail(name0 + " != " + ExceptionMessageUtil.valueString(o1), ExceptionMessageUtil.valueAndName(o0, name0));
+        }
     }
 
 
@@ -2496,98 +1448,54 @@ public static void neq(Object o0, String name0, Object o1) {
     // eqNull, neqNull (Object ==/!= null)
 
     // ----------------------------------------------------------------
-    /**
-     * require (o == null)
-     */
-    public static void eqNull(Object o, String name, int numCallsBelowRequirer) {
-        if (!(null == o)) {
-            fail(name + " == null", ExceptionMessageUtil.valueAndName(o, name), numCallsBelowRequirer + 1);
-        }
-    }
 
     public static void eqNull(Object o, String name) {
-        eqNull(o, name, 1);
+        if (!(null == o)) {
+            fail(name + " == null", ExceptionMessageUtil.valueAndName(o, name));
+        }
     }
 
     // ----------------------------------------------------------------
-    /**
-     * require (o != null)
-     */
+
     @NotNull
-    public static <T> T neqNull(T o, String name, int numCallsBelowRequirer) {
+    public static <T> T neqNull(T o, String name) {
         if (!(null != o)) {
-            fail(name + " != null", ExceptionMessageUtil.valueAndName(o, name), numCallsBelowRequirer + 1);
+            fail(name + " != null", ExceptionMessageUtil.valueAndName(o, name));
         }
         return o;
     }
 
-    @NotNull
-    public static <T> T neqNull(T o, String name) {
-        return neqNull(o, name, 1);
-    }
-
     // ----------------------------------------------------------------
-    /**
-     * require (o != NaN)
-     */
-    public static double neqNaN(double o, String name, int numCallsBelowRequirer) {
+
+    public static double neqNaN(double o, String name) {
         if (Double.isNaN(o)) {
-            fail(name + " != NaN", ExceptionMessageUtil.valueAndName(o, name), numCallsBelowRequirer + 1);
+            fail(name + " != NaN", ExceptionMessageUtil.valueAndName(o, name));
         }
         return o;
     }
 
-    public static double neqNaN(double o, String name) {
-        return neqNaN(o, name, 1);
-    }
-
     // ----------------------------------------------------------------
-    /**
-     * require (o != +/-Inf)
-     */
-    public static double neqInf(double o, String name, int numCallsBelowRequirer) {
+
+    public static double neqInf(double o, String name) {
         if (Double.isInfinite(o)) {
-            fail(name + " != +/-Inf", ExceptionMessageUtil.valueAndName(o, name), numCallsBelowRequirer + 1);
+            fail(name + " != +/-Inf", ExceptionMessageUtil.valueAndName(o, name));
         }
         return o;
     }
 
-    public static double neqInf(double o, String name) {
-        return neqInf(o, name, 1);
-    }
-
     // ################################################################
     // equals (Object.equals(Object))
 
     // ----------------------------------------------------------------
-    /**
-     * require (o0 != null &amp;&amp; o1 != null &amp;&amp; o0.equals(o1))
-     */
-    public static void equals(Object o0, String name0, Object o1, String name1, int numCallsBelowRequirer) {
-        neqNull(o0, name0, numCallsBelowRequirer + 1);
-        neqNull(o1, name1, numCallsBelowRequirer + 1);
-        if (!(o0.equals(o1))) {
-            fail(name0 + ".equals(" + name1 + ")", ExceptionMessageUtil.valueAndName(o0, name0, o1, name1),
-                    numCallsBelowRequirer + 1);
-        }
-    }
 
     /**
      * require (o0 != null &amp;&amp; o1 != null &amp;&amp; o0.equals(o1))
      */
     public static void equals(Object o0, String name0, Object o1, String name1) {
-        equals(o0, name0, o1, name1, 1);
-    }
-
-    /**
-     * require (o0 != null &amp;&amp; o1 != null &amp;&amp; o0.equals(o1))
-     */
-    public static void equals(Object o0, String name0, Object o1, int numCallsBelowRequirer) {
-        neqNull(o0, name0, numCallsBelowRequirer + 1);
-        neqNull(o1, "o1", numCallsBelowRequirer + 1);
+        neqNull(o0, name0);
+        neqNull(o1, name1);
         if (!(o0.equals(o1))) {
-            fail(name0 + ".equals(" + ExceptionMessageUtil.valueString(o1) + ")",
-                    ExceptionMessageUtil.valueAndName(o0, name0), numCallsBelowRequirer + 1);
+            fail(name0 + ".equals(" + name1 + ")", ExceptionMessageUtil.valueAndName(o0, name0, o1, name1));
         }
     }
 
@@ -2595,38 +1503,24 @@ public static void equals(Object o0, String name0, Object o1, int numCallsBelowR
      * require (o0 != null &amp;&amp; o1 != null &amp;&amp; o0.equals(o1))
      */
     public static void equals(Object o0, String name0, Object o1) {
-        equals(o0, name0, o1, 1);
+        neqNull(o0, name0);
+        neqNull(o1, "o1");
+        if (!(o0.equals(o1))) {
+            fail(name0 + ".equals(" + ExceptionMessageUtil.valueString(o1) + ")",
+                    ExceptionMessageUtil.valueAndName(o0, name0));
+        }
     }
 
     // ----------------------------------------------------------------
-    /**
-     * require (o0 != null &amp;&amp; o1 != null &amp;&amp; !o0.equals(o1))
-     */
-    public static void notEquals(Object o0, String name0, Object o1, String name1, int numCallsBelowRequirer) {
-        neqNull(o0, name0, numCallsBelowRequirer + 1);
-        neqNull(o1, name1, numCallsBelowRequirer + 1);
-        if (o0.equals(o1)) {
-            fail("!" + name0 + ".equals(" + name1 + ")", ExceptionMessageUtil.valueAndName(o0, name0, o1, name1),
-                    numCallsBelowRequirer + 1);
-        }
-    }
 
     /**
      * require (o0 != null &amp;&amp; o1 != null &amp;&amp; !o0.equals(o1))
      */
     public static void notEquals(Object o0, String name0, Object o1, String name1) {
-        notEquals(o0, name0, o1, name1, 1);
-    }
-
-    /**
-     * require (o0 != null &amp;&amp; o1 != null &amp;&amp; !o0.equals(o1))
-     */
-    public static void notEquals(Object o0, String name0, Object o1, int numCallsBelowRequirer) {
-        neqNull(o0, name0, numCallsBelowRequirer + 1);
-        neqNull(o1, "o1", numCallsBelowRequirer + 1);
+        neqNull(o0, name0);
+        neqNull(o1, name1);
         if (o0.equals(o1)) {
-            fail("!" + name0 + ".equals(" + ExceptionMessageUtil.valueString(o1) + ")",
-                    ExceptionMessageUtil.valueAndName(o0, name0), numCallsBelowRequirer + 1);
+            fail("!" + name0 + ".equals(" + name1 + ")", ExceptionMessageUtil.valueAndName(o0, name0, o1, name1));
         }
     }
 
@@ -2634,228 +1528,160 @@ public static void notEquals(Object o0, String name0, Object o1, int numCallsBel
      * require (o0 != null &amp;&amp; o1 != null &amp;&amp; !o0.equals(o1))
      */
     public static void notEquals(Object o0, String name0, Object o1) {
-        notEquals(o0, name0, o1, 1);
+        neqNull(o0, name0);
+        neqNull(o1, "o1");
+        if (o0.equals(o1)) {
+            fail("!" + name0 + ".equals(" + ExceptionMessageUtil.valueString(o1) + ")",
+                    ExceptionMessageUtil.valueAndName(o0, name0));
+        }
     }
 
     // ################################################################
     // nonempty (String.equals(nonempty))
 
     // ----------------------------------------------------------------
-    /**
-     * require (s != null &amp;&amp; s.length() &gt; 0)
-     */
-    public static String nonempty(String s, String name, int numCallsBelowRequirer) {
-        neqNull(s, name, numCallsBelowRequirer + 1);
+
+    public static String nonempty(String s, String name) {
+        neqNull(s, name);
         if (!(s.length() > 0)) {
-            fail(name + ".length() > 0", ExceptionMessageUtil.valueAndName(s, name), numCallsBelowRequirer + 1);
+            fail(name + ".length() > 0", ExceptionMessageUtil.valueAndName(s, name));
         }
         return s;
     }
 
-    public static String nonempty(String s, String name) {
-        return nonempty(s, name, 1);
-    }
-
     // ################################################################
 
     // ----------------------------------------------------------------
-    /** require (collection != null &amp;&amp; collection.contains(element)) */
+
     public static <C extends Collection<T>, T> C contains(C collection, String collectionName, T element,
-            String elementName, int numCallsBelowRequirer) {
-        neqNull(collection, collectionName, numCallsBelowRequirer + 1);
+            String elementName) {
+        neqNull(collection, collectionName);
         if (!(collection.contains(element))) {
             fail(collectionName + ".contains(" + elementName + ")",
-                    ExceptionMessageUtil.valueAndName(element, elementName), numCallsBelowRequirer + 1);
+                    ExceptionMessageUtil.valueAndName(element, elementName));
         }
         return collection;
     }
 
-    public static <C extends Collection<T>, T> C contains(C collection, String collectionName, T element,
-            String elementName) {
-        return contains(collection, collectionName, element, elementName, 1);
-    }
-
     // ----------------------------------------------------------------
-    /** require (collection != null &amp;&amp; !collection.contains(element)) */
+
     public static <C extends Collection<T>, T> C notContains(C collection, String collectionName, T element,
-            String elementName, int numCallsBelowRequirer) {
-        neqNull(collection, collectionName, numCallsBelowRequirer + 1);
+            String elementName) {
+        neqNull(collection, collectionName);
         if (collection.contains(element)) {
             fail("!" + collectionName + ".contains(" + elementName + ")",
-                    ExceptionMessageUtil.valueAndName(element, elementName), numCallsBelowRequirer + 1);
+                    ExceptionMessageUtil.valueAndName(element, elementName));
         }
         return collection;
     }
 
-    public static <C extends Collection<T>, T> C notContains(C collection, String collectionName, T element,
-            String elementName) {
-        return notContains(collection, collectionName, element, elementName, 1);
-    }
-
     // ----------------------------------------------------------------
-    /** require (collection != null &amp;&amp; !collection.stream().anyMatch(Objects::isNull) */
-    public static <C extends Collection<T>, T> C notContainsNull(C collection, String collectionName,
-            int numCallsBelowRequirer) {
-        neqNull(collection, collectionName, numCallsBelowRequirer + 1);
+
+    public static <C extends Collection<T>, T> C notContainsNull(C collection, String collectionName) {
+        neqNull(collection, collectionName);
         if (collection.stream().anyMatch(Objects::isNull)) {
-            fail(collectionName + " does not contain null", numCallsBelowRequirer + 1);
+            fail(collectionName + " does not contain null");
         }
         return collection;
     }
 
-    public static <C extends Collection<T>, T> C notContainsNull(C collection, String collectionName) {
-        return notContainsNull(collection, collectionName, 1);
-    }
-
     // ----------------------------------------------------------------
-    /** require (map != null &amp;&amp; map.containsKey(key)) */
-    public static <M extends Map<K, V>, K, V> M containsKey(M map, String mapName, K key, String keyName,
-            int numCallsBelowRequirer) {
-        neqNull(map, mapName, numCallsBelowRequirer + 1);
+
+    public static <M extends Map<K, V>, K, V> M containsKey(M map, String mapName, K key, String keyName) {
+        neqNull(map, mapName);
         if (!(map.containsKey(key))) {
-            fail(mapName + ".containsKey(" + keyName + ")", ExceptionMessageUtil.valueAndName(key, keyName),
-                    numCallsBelowRequirer + 1);
+            fail(mapName + ".containsKey(" + keyName + ")", ExceptionMessageUtil.valueAndName(key, keyName));
         }
         return map;
     }
 
-    public static <M extends Map<K, V>, K, V> M containsKey(M map, String mapName, K key, String keyName) {
-        return containsKey(map, mapName, key, keyName, 1);
-    }
-
     // ----------------------------------------------------------------
-    /** require (map != null &amp;&amp; !map.containsKey(element)) */
-    public static <M extends Map<K, V>, K, V> M notContainsKey(M map, String mapName, K key, String keyName,
-            int numCallsBelowRequirer) {
-        neqNull(map, mapName, numCallsBelowRequirer + 1);
+
+    public static <M extends Map<K, V>, K, V> M notContainsKey(M map, String mapName, K key, String keyName) {
+        neqNull(map, mapName);
         if (map.containsKey(key)) {
-            fail("!" + mapName + ".containsKey(" + keyName + ")", ExceptionMessageUtil.valueAndName(key, keyName),
-                    numCallsBelowRequirer + 1);
+            fail("!" + mapName + ".containsKey(" + keyName + ")", ExceptionMessageUtil.valueAndName(key, keyName));
         }
         return map;
     }
 
-    public static <M extends Map<K, V>, K, V> M notContainsKey(M map, String mapName, K key, String keyName) {
-        return notContainsKey(map, mapName, key, keyName, 1);
-    }
-
     // ----------------------------------------------------------------
+
     /** require (offset &gt;= 0 &amp;&amp; offset &lt; length) */
-    public static int inRange(int offset, String offsetName, int length, String lengthName, int numCallsBelowRequirer) {
+    public static int inRange(int offset, String offsetName, int length, String lengthName) {
         if (!(offset >= 0)) {
-            fail(offsetName + " >= 0", ExceptionMessageUtil.valueAndName(offset, offsetName),
-                    numCallsBelowRequirer + 1);
+            fail(offsetName + " >= 0", ExceptionMessageUtil.valueAndName(offset, offsetName));
         } else if (!(offset < length)) {
             fail(offsetName + " < " + lengthName,
-                    ExceptionMessageUtil.valueAndName(offset, offsetName, length, lengthName),
-                    numCallsBelowRequirer + 1);
+                    ExceptionMessageUtil.valueAndName(offset, offsetName, length, lengthName));
         }
         return offset;
     }
 
-    /** require (offset &gt;= 0 &amp;&amp; offset &lt; length) */
-    public static int inRange(int offset, String offsetName, int length, String lengthName) {
-        return inRange(offset, offsetName, length, lengthName, 1);
-    }
-
     // ----------------------------------------------------------------
+
     /** require (offset &gt;= start &amp;&amp; offset &lt; end) */
-    public static int inRange(int offset, String offsetName, int start, String startName, int end, String endName,
-            int numCallsBelowRequirer) {
+    public static int inRange(int offset, String offsetName, int start, String startName, int end, String endName) {
         if (!(offset >= start)) {
             fail(offsetName + " >= " + startName,
-                    ExceptionMessageUtil.valueAndName(offset, offsetName, start, startName), numCallsBelowRequirer + 1);
+                    ExceptionMessageUtil.valueAndName(offset, offsetName, start, startName));
         } else if (!(offset < end)) {
-            fail(offsetName + " < " + endName, ExceptionMessageUtil.valueAndName(offset, offsetName, end, endName),
-                    numCallsBelowRequirer + 1);
+            fail(offsetName + " < " + endName, ExceptionMessageUtil.valueAndName(offset, offsetName, end, endName));
         }
         return offset;
     }
 
-    /** require (offset &gt;= start &amp;&amp; offset &lt; end) */
-    public static int inRange(int offset, String offsetName, int start, String startName, int end, String endName) {
-        return inRange(offset, offsetName, start, startName, end, endName, 1);
-    }
-
     // ----------------------------------------------------------------
+
     /** require (offset &gt;= 0 &amp;&amp; offset &lt; length) */
-    public static long inRange(long offset, String offsetName, long length, String lengthName,
-            int numCallsBelowRequirer) {
+    public static long inRange(long offset, String offsetName, long length, String lengthName) {
         if (!(offset >= 0L)) {
-            fail(offsetName + " >= 0L", ExceptionMessageUtil.valueAndName(offset, offsetName),
-                    numCallsBelowRequirer + 1);
+            fail(offsetName + " >= 0L", ExceptionMessageUtil.valueAndName(offset, offsetName));
         } else if (!(offset < length)) {
             fail(offsetName + " < " + lengthName,
-                    ExceptionMessageUtil.valueAndName(offset, offsetName, length, lengthName),
-                    numCallsBelowRequirer + 1);
+                    ExceptionMessageUtil.valueAndName(offset, offsetName, length, lengthName));
         }
         return offset;
     }
 
-    /** require (offset &gt;= 0 &amp;&amp; offset &lt; length) */
-    public static long inRange(long offset, String offsetName, long length, String lengthName) {
-        return inRange(offset, offsetName, length, lengthName, 1);
-    }
-
     // ----------------------------------------------------------------
+
     /** require (offset &gt;= start &amp;&amp; offset &lt; end) */
-    public static long inRange(long offset, String offsetName, long start, String startName, long end, String endName,
-            int numCallsBelowRequirer) {
+    public static long inRange(long offset, String offsetName, long start, String startName, long end, String endName) {
         if (!(offset >= start)) {
             fail(offsetName + " >= " + startName,
-                    ExceptionMessageUtil.valueAndName(offset, offsetName, start, startName), numCallsBelowRequirer + 1);
+                    ExceptionMessageUtil.valueAndName(offset, offsetName, start, startName));
         } else if (!(offset < end)) {
-            fail(offsetName + " < " + endName, ExceptionMessageUtil.valueAndName(offset, offsetName, end, endName),
-                    numCallsBelowRequirer + 1);
+            fail(offsetName + " < " + endName, ExceptionMessageUtil.valueAndName(offset, offsetName, end, endName));
         }
         return offset;
     }
 
-    /** require (offset &gt;= start &amp;&amp; offset &lt; end) */
-    public static long inRange(long offset, String offsetName, long start, String startName, long end, String endName) {
-        return inRange(offset, offsetName, start, startName, end, endName, 1);
-    }
-
     // ################################################################
 
     /** require d != {Infinity, -Infinity, NaN}. */
-    public static double normalized(double d, String name, int numCallsBelowRequirer) {
+    public static double normalized(double d, String name) {
         if (!(!Double.isNaN(d) && !Double.isInfinite(d))) {
-            fail(name + " is normalized (not infinity or NaN)", ExceptionMessageUtil.valueAndName(d, name),
-                    numCallsBelowRequirer + 1);
+            fail(name + " is normalized (not infinity or NaN)", ExceptionMessageUtil.valueAndName(d, name));
         }
         return d;
     }
 
-    /** require d != {Infinity, -Infinity, NaN}. */
-    public static double normalized(double d, String name) {
-        return normalized(d, name, 1);
-    }
-
-    public static <T> T[] nonEmpty(final T[] a, final String name, final int numCallsBelowRequirer) {
-        neqNull(a, name, numCallsBelowRequirer + 1);
+    public static <T> T[] nonEmpty(final T[] a, final String name) {
+        neqNull(a, name);
         if (!(a.length > 0)) {
-            fail(name + ".length > 0", ExceptionMessageUtil.valueAndName(a, name), numCallsBelowRequirer + 1);
+            fail(name + ".length > 0", ExceptionMessageUtil.valueAndName(a, name));
         }
         return a;
     }
 
-    public static <T> T[] nonEmpty(final T[] a, final String name) {
-        return nonEmpty(a, name, 1);
-    }
-
-    public static int[] lengthEqual(final int[] a, final String name, final int length,
-            final int numCallsBelowRequirer) {
+    public static int[] lengthEqual(final int[] a, final String name, final int length) {
         if (!(a.length == length)) {
-            fail(name + ".length == " + length, ExceptionMessageUtil.valueAndName(a, name), numCallsBelowRequirer + 1);
+            fail(name + ".length == " + length, ExceptionMessageUtil.valueAndName(a, name));
         }
         return a;
     }
 
-    public static int[] lengthEqual(final int[] a, final String name, final int length) {
-        return lengthEqual(a, name, length, 1);
-    }
-
     public static <T> T[] elementsNeqNull(final T[] elements, final String name) {
         neqNull(elements, name);
         for (int i = 0; i < elements.length; i++) {
@@ -2909,7 +1735,7 @@ public static void elementsNeqInf(final double[][] elements, String name) {
     public static void isSquare(double[][] m, String name) {
         for (int i = 0; i < m.length; i++) {
             if (m[i].length != m.length) {
-                fail("Matrix is not square: " + name, "matrix is not square: " + name, 1);
+                fail("Matrix is not square: " + name, "matrix is not square: " + name);
             }
         }
     }
@@ -2924,7 +1750,7 @@ public static double inRange(double trialValue, double endPointA, double endPoin
         }
         if (trialValue < minRange || maxRange < trialValue) {
             fail(name + " = " + trialValue + " is expected to be in the range of [" + minRange + "," + maxRange
-                    + "] but was not", 1);
+                    + "] but was not");
         }
         return trialValue;
     }
@@ -2939,7 +1765,7 @@ public static float inRange(float trialValue, float endPointA, float endPointB,
         }
         if (trialValue < minRange || maxRange < trialValue) {
             fail(name + " = " + trialValue + " is expected to be in the range of [" + minRange + "," + maxRange
-                    + "] but was not", 1);
+                    + "] but was not");
         }
         return trialValue;
     }
diff --git a/Base/src/main/java/io/deephaven/base/verify/RequirementFailure.java b/Base/src/main/java/io/deephaven/base/verify/RequirementFailure.java
index bfdb2caf4ce..a06810be2d0 100644
--- a/Base/src/main/java/io/deephaven/base/verify/RequirementFailure.java
+++ b/Base/src/main/java/io/deephaven/base/verify/RequirementFailure.java
@@ -3,122 +3,17 @@
 //
 package io.deephaven.base.verify;
 
-import java.io.PrintStream;
-import java.io.PrintWriter;
-import java.io.StringWriter;
-
 // ----------------------------------------------------------------
 /**
  * {@link RuntimeException} to be thrown on requirement failures.
  */
 public class RequirementFailure extends RuntimeException {
 
-    /**
-     * The number of stack frames that should be removed from the stack to find the method whose requirements did not
-     * hold.
-     */
-    private int m_nCallsBelowRequirer;
-
-    // ----------------------------------------------------------------
-    public RequirementFailure(String message, int nCallsBelowRequirer) {
+    public RequirementFailure(String message) {
         super(message);
-        m_nCallsBelowRequirer = nCallsBelowRequirer;
     }
 
-    // ----------------------------------------------------------------
-    public RequirementFailure(String message, Exception caughtException, int nCallsBelowRequirer) {
+    public RequirementFailure(String message, Exception caughtException) {
         super(message, caughtException);
-        m_nCallsBelowRequirer = nCallsBelowRequirer;
-    }
-
-    // ----------------------------------------------------------------
-    /**
-     * Gets the number of stack frames that should be removed from the stack to find the caller which failed to meet
-     * requirements.
-     */
-    public int getNumCallsBelowRequirer() {
-        return m_nCallsBelowRequirer;
-    }
-
-    // ----------------------------------------------------------------
-    @Override
-    public void printStackTrace() {
-        printStackTrace(System.err);
-    }
-
-    // ----------------------------------------------------------------
-    @Override
-    public void printStackTrace(PrintStream s) {
-        s.print(getFixedStackTrace());
-    }
-
-    // ----------------------------------------------------------------
-    @Override
-    public void printStackTrace(PrintWriter s) {
-        s.print(getFixedStackTrace());
-    }
-
-    // ----------------------------------------------------------------
-    /**
-     * Gets a stack trace with a line added identifying the offending stack frame.
-     */
-    private StringBuffer getFixedStackTrace() {
-        StringBuffer sb = getOriginalStackTrace();
-
-        String sStackTrace = sb.toString();
-        int nInsertPoint = sStackTrace.indexOf("\n\tat ");
-        for (int nCount = m_nCallsBelowRequirer; nCount >= 0; nCount--) {
-            nInsertPoint = sStackTrace.indexOf("\n\tat ", nInsertPoint + 1);
-        }
-        if (-1 != nInsertPoint) {
-            sb.insert(nInsertPoint, "\n    (culprit:)");
-        }
-        return sb;
-    }
-
-    // ----------------------------------------------------------------
-    /**
-     * Gets the unmodified stack trace, instead of the one with the culprit identified.
-     */
-    public StringBuffer getOriginalStackTrace() {
-        StringWriter stringWriter = new StringWriter();
-        PrintWriter printWriter = new PrintWriter(stringWriter);
-        super.printStackTrace(printWriter);
-        printWriter.close();
-        return stringWriter.getBuffer();
-    }
-
-    // ----------------------------------------------------------------
-    /**
-     * If this stack frame caused the exception, adjust the culprit to be the caller. Used when a delegating method
-     * can't verify all requirements itself but shouldn't receive the blame.
-     */
-    public RequirementFailure adjustForDelegatingMethod() {
-        if (isThisStackFrameCulprit(1)) {
-            m_nCallsBelowRequirer++;
-        }
-        return this;
-    }
-
-    // ----------------------------------------------------------------
-    /**
-     * If this stack frame caused the exception, adjust the culprit to be the caller. Used when a delegating method
-     * can't verify all requirements itself but shouldn't receive the blame.
-     */
-    public RequirementFailure adjustForDelegatingMethodAndSyntheticAccessor() {
-        if (isThisStackFrameCulprit(0)) {
-            m_nCallsBelowRequirer += 2;
-        }
-        return this;
-    }
-
-    // ----------------------------------------------------------------
-    /**
-     * Returns true if this stack frame is blamed for causing the exception.
-     */
-    public boolean isThisStackFrameCulprit(int nFramesBelowTargetFrame) {
-        StackTraceElement[] stackTrace = new Throwable().getStackTrace();
-        StackTraceElement[] failureStackTrace = getStackTrace();
-        return failureStackTrace.length - m_nCallsBelowRequirer == stackTrace.length - nFramesBelowTargetFrame;
     }
 }
diff --git a/Base/src/main/resources/io/deephaven/base/Base.gwt.xml b/Base/src/main/resources/io/deephaven/base/Base.gwt.xml
new file mode 100644
index 00000000000..6cf87067eae
--- /dev/null
+++ b/Base/src/main/resources/io/deephaven/base/Base.gwt.xml
@@ -0,0 +1,4 @@
+<module>
+    <source path="" includes="MathUtil.java" />
+    <source path="verify" />
+</module>
diff --git a/Base/src/test/java/io/deephaven/base/FileUtilsTest.java b/Base/src/test/java/io/deephaven/base/FileUtilsTest.java
index fc00e5802cb..3cf4c7433d8 100644
--- a/Base/src/test/java/io/deephaven/base/FileUtilsTest.java
+++ b/Base/src/test/java/io/deephaven/base/FileUtilsTest.java
@@ -53,6 +53,9 @@ public void testConvertToS3URI() throws URISyntaxException {
         // Check if multiple slashes get normalized
         Assert.assertEquals("s3://bucket/key/", FileUtils.convertToURI("s3://bucket///key///", true).toString());
 
+        // Check if trailing slash gets added to bucket root
+        Assert.assertEquals("s3://bucket/", FileUtils.convertToURI("s3://bucket", true).toString());
+
         try {
             FileUtils.convertToURI("", false);
             Assert.fail("Expected IllegalArgumentException");
diff --git a/Base/src/test/java/io/deephaven/base/TestLowGarbageArrayIntegerMap.java b/Base/src/test/java/io/deephaven/base/TestLowGarbageArrayIntegerMap.java
index 2822fad3f89..1cbf65e239b 100644
--- a/Base/src/test/java/io/deephaven/base/TestLowGarbageArrayIntegerMap.java
+++ b/Base/src/test/java/io/deephaven/base/TestLowGarbageArrayIntegerMap.java
@@ -59,8 +59,7 @@ public void testLowGarbageArrayIntegerMap() {
         try {
             integerToStringMap.put(-1, "negative one");
             fail("expected bad index to fail");
-        } catch (RequirementFailure requirementFailure) {
-            assertTrue(requirementFailure.isThisStackFrameCulprit(-1));
+        } catch (RequirementFailure expected) {
         }
 
         try {
diff --git a/Base/src/test/java/io/deephaven/base/pool/TestThreadSafeLenientFixedSizePool.java b/Base/src/test/java/io/deephaven/base/pool/TestThreadSafeLenientFixedSizePool.java
index fddf945354f..03bd44ec840 100644
--- a/Base/src/test/java/io/deephaven/base/pool/TestThreadSafeLenientFixedSizePool.java
+++ b/Base/src/test/java/io/deephaven/base/pool/TestThreadSafeLenientFixedSizePool.java
@@ -142,8 +142,8 @@ public void testThreadSafeLenientFixedSizePoolNoFactory() {
         // too small
         try {
             new ThreadSafeLenientFixedSizePool<Object>(6, m_mockObjectFactory, m_mockClearingProcedure);
-        } catch (RequirementFailure requirementFailure) {
-            assertTrue(requirementFailure.isThisStackFrameCulprit(0));
+            fail("expected to throw");
+        } catch (RequirementFailure expected) {
         }
 
         // minimum size
@@ -156,15 +156,15 @@ public void testThreadSafeLenientFixedSizePoolNoFactory() {
         // no factory
         try {
             ThreadSafeLenientFixedSizePool.FACTORY.create(OBJECTS.length, null, m_mockClearingProcedure);
-        } catch (RequirementFailure requirementFailure) {
-            assertTrue(requirementFailure.isThisStackFrameCulprit(0));
+            fail("expected to throw");
+        } catch (RequirementFailure expected) {
         }
 
         // too small
         try {
             ThreadSafeLenientFixedSizePool.FACTORY.create(6, m_mockObjectFactory, m_mockClearingProcedure);
-        } catch (RequirementFailure requirementFailure) {
-            assertTrue(requirementFailure.isThisStackFrameCulprit(0));
+            fail("expected to throw");
+        } catch (RequirementFailure expected) {
         }
 
         // minimum size
diff --git a/Base/src/test/java/io/deephaven/base/ringbuffer/AggregatingByteRingBufferTest.java b/Base/src/test/java/io/deephaven/base/ringbuffer/AggregatingByteRingBufferTest.java
deleted file mode 100644
index 553f3bf7222..00000000000
--- a/Base/src/test/java/io/deephaven/base/ringbuffer/AggregatingByteRingBufferTest.java
+++ /dev/null
@@ -1,192 +0,0 @@
-//
-// Copyright (c) 2016-2024 Deephaven Data Labs and Patent Pending
-//
-// ****** AUTO-GENERATED CLASS - DO NOT EDIT MANUALLY
-// ****** Edit AggregatingCharRingBufferTest and run "./gradlew replicateRingBuffers" to regenerate
-//
-// @formatter:off
-package io.deephaven.base.ringbuffer;
-
-import junit.framework.TestCase;
-
-import java.util.NoSuchElementException;
-import java.util.Random;
-
-public class AggregatingByteRingBufferTest extends TestCase {
-
-    private void assertEmpty(AggregatingByteRingBuffer rb) {
-        assertTrue(rb.isEmpty());
-        assertEquals(0, rb.size());
-
-        try {
-            rb.remove();
-            fail("queue should be empty");
-        } catch (NoSuchElementException x) {
-            // expected
-        }
-
-        try {
-            rb.element();
-            fail("queue should be empty");
-        } catch (NoSuchElementException x) {
-            // expected
-        }
-    }
-
-    public void testLargeAmounts() {
-        final AggregatingByteRingBuffer rb = new AggregatingByteRingBuffer(3, (byte) 0, (a, b) -> (byte) (a + b));
-
-        // move the head and tail off zero
-        for (int i = 0; i < 1000; i++) {
-            rb.add((byte) i);
-        }
-        for (int i = 0; i < 1000; i++) {
-            rb.remove();
-        }
-
-        for (int i = 0; i < 10_000; i++)
-            rb.add((byte) i);
-
-        for (int i = 10_000; i < 1_000_000; i++) {
-            rb.add((byte) i);
-            assertEquals((byte) (i - 10_000 + 1), rb.front(1));
-            assertEquals((byte) (i - 10_000), rb.remove());
-            assertEquals(rb.remaining(), rb.capacity() - rb.size());
-        }
-    }
-
-    public void testEvaluateMinLargeAmounts() {
-        final AggregatingByteRingBuffer rb =
-                new AggregatingByteRingBuffer(3, Byte.MAX_VALUE, (a, b) -> (byte) Math.min(a, b));
-        for (int i = 0; i < 10_000; i++)
-            rb.add((byte) i);
-
-        final int maxVal = (int) Math.min(Byte.MAX_VALUE, 1_000_000);
-
-        for (int i = 10_000; i < maxVal; i++) {
-            rb.add((byte) i);
-            assertEquals((byte) (i - 10_000) + 1, rb.front(1));
-            assertEquals((byte) (i - 10_000), rb.evaluate()); // front of queue is min
-            assertEquals((byte) (i - 10_000), rb.remove());
-        }
-    }
-
-    public void testEvaluateMaxLargeAmounts() {
-        final AggregatingByteRingBuffer rb =
-                new AggregatingByteRingBuffer(3, Byte.MIN_VALUE, (a, b) -> (byte) Math.max(a, b));
-        for (int i = 0; i < 10_000; i++)
-            rb.add((byte) i);
-
-        final int maxVal = (int) Math.min(Byte.MAX_VALUE, 1_000_000);
-
-        for (int i = 10_000; i < maxVal; i++) {
-            rb.add((byte) i);
-            assertEquals((byte) (i - 10_000 + 1), rb.front(1));
-            assertEquals((byte) i, rb.evaluate()); // last value added is max
-            assertEquals((byte) (i - 10_000), rb.remove());
-        }
-    }
-
-    // region non-byte-tests
-    // Tests removed due to limitations of byte storage
-    // endregion non-byte-tests
-
-    public void testPushPopUnsafe() {
-        final AggregatingByteRingBuffer rb =
-                new AggregatingByteRingBuffer(3, (byte) -Byte.MAX_VALUE, (a, b) -> (byte) Math.max(a, b));
-        // move the head and tail off zero
-        rb.ensureRemaining(100);
-        for (byte i = 0; i < 100; i++) {
-            rb.addUnsafe(i);
-        }
-        for (byte i = 0; i < 100; i++) {
-            assertEquals(rb.removeUnsafe(), i);
-        }
-
-        // do it again with an offset
-        rb.ensureRemaining(100);
-        for (byte i = 0; i < 100; i++) {
-            rb.addUnsafe((byte) (i + (byte) 1000));
-        }
-        for (byte i = 0; i < 100; i++) {
-            assertEquals(rb.removeUnsafe(), i + (byte) 1000);
-        }
-
-        for (byte i = 0; i < 100; i++) {
-            rb.addUnsafe((byte) (i + (byte) 1000));
-        }
-        rb.clear();
-
-        for (byte i = 0; i < 100; i++) {
-            rb.add(i);
-        }
-        assertEquals((byte) 99, rb.evaluate()); // last value added is max
-    }
-
-    public void testPopMultiple() {
-        final AggregatingByteRingBuffer rb = new AggregatingByteRingBuffer(3, (byte) 0, (a, b) -> (byte) (a + b));
-
-        for (int step = 0; step < 10; step++) {
-            rb.ensureRemaining(100);
-            for (byte i = 0; i < 100; i++) {
-                rb.addUnsafe(i);
-            }
-
-            if (step % 2 == 0) {
-                rb.evaluate();
-            }
-
-            try {
-                byte[] values = rb.remove(101);
-                fail("popping more values than size() should fail");
-            } catch (NoSuchElementException x) {
-                // expected
-            }
-
-            byte[] values = rb.remove(100);
-            for (byte i = 0; i < 100; i++) {
-                assertEquals(values[(int) i], i);
-            }
-            assertEmpty(rb);
-        }
-    }
-
-    public void testSpecialCaseA() {
-        // overlapping push and pop ranges with popTail < pushTail
-        final AggregatingByteRingBuffer rb = new AggregatingByteRingBuffer(4, (byte) 0, (a, b) -> (byte) (a + b));
-        rb.add((byte) 1);
-        assertEquals((byte) 1, rb.remove());
-        rb.add((byte) 2);
-        rb.add((byte) 3);
-        assertEquals((byte) 5, rb.evaluate());
-    }
-
-    public void testSpecialCaseB() {
-        // push the full capacity while wrapped
-        final AggregatingByteRingBuffer rb = new AggregatingByteRingBuffer(64, (byte) 0, (a, b) -> (byte) (a + b));
-        rb.add((byte) 1);
-        assertEquals((byte) 1, rb.remove());
-
-        for (int i = 0; i < 64; i++) {
-            rb.add((byte) 1);
-        }
-        assertEquals((byte) 64, rb.evaluate());
-    }
-
-    public void testSpecialCaseC() {
-        // overlapping push and pop ranges with popTail < pushTail
-        final AggregatingByteRingBuffer rb = new AggregatingByteRingBuffer(16, (byte) 0, (a, b) -> (byte) (a + b));
-        // move pointers to middle of storage
-        for (int i = 0; i < 8; i++) {
-            rb.add((byte) 1);
-            rb.remove();
-        }
-        assertEquals((byte) 0, rb.evaluate());
-
-        for (int i = 0; i < 11; i++) {
-            rb.add((byte) 1);
-        }
-        rb.remove();
-        assertEquals((byte) 10, rb.evaluate());
-    }
-}
diff --git a/Base/src/test/java/io/deephaven/base/ringbuffer/AggregatingCharRingBufferTest.java b/Base/src/test/java/io/deephaven/base/ringbuffer/AggregatingCharRingBufferTest.java
deleted file mode 100644
index f0d682477d8..00000000000
--- a/Base/src/test/java/io/deephaven/base/ringbuffer/AggregatingCharRingBufferTest.java
+++ /dev/null
@@ -1,329 +0,0 @@
-//
-// Copyright (c) 2016-2024 Deephaven Data Labs and Patent Pending
-//
-package io.deephaven.base.ringbuffer;
-
-import junit.framework.TestCase;
-
-import java.util.NoSuchElementException;
-import java.util.Random;
-
-public class AggregatingCharRingBufferTest extends TestCase {
-
-    private void assertEmpty(AggregatingCharRingBuffer rb) {
-        assertTrue(rb.isEmpty());
-        assertEquals(0, rb.size());
-
-        try {
-            rb.remove();
-            fail("queue should be empty");
-        } catch (NoSuchElementException x) {
-            // expected
-        }
-
-        try {
-            rb.element();
-            fail("queue should be empty");
-        } catch (NoSuchElementException x) {
-            // expected
-        }
-    }
-
-    public void testLargeAmounts() {
-        final AggregatingCharRingBuffer rb = new AggregatingCharRingBuffer(3, (char) 0, (a, b) -> (char) (a + b));
-
-        // move the head and tail off zero
-        for (int i = 0; i < 1000; i++) {
-            rb.add((char) i);
-        }
-        for (int i = 0; i < 1000; i++) {
-            rb.remove();
-        }
-
-        for (int i = 0; i < 10_000; i++)
-            rb.add((char) i);
-
-        for (int i = 10_000; i < 1_000_000; i++) {
-            rb.add((char) i);
-            assertEquals((char) (i - 10_000 + 1), rb.front(1));
-            assertEquals((char) (i - 10_000), rb.remove());
-            assertEquals(rb.remaining(), rb.capacity() - rb.size());
-        }
-    }
-
-    public void testEvaluateMinLargeAmounts() {
-        final AggregatingCharRingBuffer rb =
-                new AggregatingCharRingBuffer(3, Character.MAX_VALUE, (a, b) -> (char) Math.min(a, b));
-        for (int i = 0; i < 10_000; i++)
-            rb.add((char) i);
-
-        final int maxVal = (int) Math.min(Character.MAX_VALUE, 1_000_000);
-
-        for (int i = 10_000; i < maxVal; i++) {
-            rb.add((char) i);
-            assertEquals((char) (i - 10_000) + 1, rb.front(1));
-            assertEquals((char) (i - 10_000), rb.evaluate()); // front of queue is min
-            assertEquals((char) (i - 10_000), rb.remove());
-        }
-    }
-
-    public void testEvaluateMaxLargeAmounts() {
-        final AggregatingCharRingBuffer rb =
-                new AggregatingCharRingBuffer(3, Character.MIN_VALUE, (a, b) -> (char) Math.max(a, b));
-        for (int i = 0; i < 10_000; i++)
-            rb.add((char) i);
-
-        final int maxVal = (int) Math.min(Character.MAX_VALUE, 1_000_000);
-
-        for (int i = 10_000; i < maxVal; i++) {
-            rb.add((char) i);
-            assertEquals((char) (i - 10_000 + 1), rb.front(1));
-            assertEquals((char) i, rb.evaluate()); // last value added is max
-            assertEquals((char) (i - 10_000), rb.remove());
-        }
-    }
-
-    // region non-byte-tests
-
-    public void testEvaluateSumLargeAmounts() {
-        final AggregatingCharRingBuffer rb = new AggregatingCharRingBuffer(3, (char) 0, (a, b) -> (char) (a + b));
-        char runningSum = (char) 0;
-
-        for (char i = 0; i < 1_000; i++) {
-            rb.add(i);
-            runningSum += i;
-        }
-
-        // stay small enough to avoid charing errors but prove the concept
-        for (char i = 1_000; i < 10_000; i++) {
-            rb.add(i);
-            runningSum += i; // add the current value
-            assertEquals((char) (i - 1_000 + 1), rb.front(1));
-
-            assertEquals(runningSum, rb.evaluate());
-
-            assertEquals((char) (i - 1_000), rb.remove());
-            runningSum -= i - 1_000; // remove the value 1_0000 ago
-
-            assertEquals(runningSum, rb.evaluate());
-        }
-    }
-
-    /***
-     * Return the sum of 0 to N-1
-     */
-    private char sum0toN(char n) {
-        if (n == (char) 0) {
-            return (char) 0; // not negative zero, sigh
-        }
-        return (char) (n * (n - 1) / 2);
-    }
-
-    public void testEvaluationEdgeCase() {
-        AggregatingCharRingBuffer rb = new AggregatingCharRingBuffer(512, (char) 0, (a, b) -> (char) (a + b));
-
-        rb.addIdentityValue();
-        assertEquals((char) 0, rb.evaluate());
-        rb.clear();
-
-        final char PRIME = (char) 97;
-        final char PRIME_SUM = sum0toN(PRIME);
-        final Random rnd = new Random(0xDEADBEEF);
-
-        // specific test for push or wrap around
-        for (int step = 0; step < 100; step++) {
-            for (char i = 0; i < PRIME; i++) {
-                rb.addUnsafe(i);
-            }
-            assertEquals(PRIME_SUM, rb.evaluate());
-
-            for (char i = 0; i < PRIME; i++) {
-                rb.removeUnsafe();
-            }
-            assertEquals((char) 0, rb.evaluate());
-            // not a copy/paste error, call this twice
-            assertEquals((char) 0, rb.evaluate());
-        }
-
-        // specific test for push & wrap around
-        for (int step = 0; step < 100; step++) {
-            for (char i = 0; i < PRIME; i++) {
-                rb.addUnsafe(i);
-            }
-            for (char i = 0; i < PRIME; i++) {
-                rb.removeUnsafe();
-            }
-            assertEquals((char) 0, rb.evaluate());
-            // not a copy/paste error, call this twice
-            assertEquals((char) 0, rb.evaluate());
-        }
-
-        // push random amounts and test
-        for (int step = 0; step < 100; step++) {
-            final char OFFSET = (char) rnd.nextInt((int) PRIME);
-
-            for (char i = 0; i < OFFSET; i++) {
-                rb.addUnsafe(i);
-            }
-            assertEquals(sum0toN(OFFSET), rb.evaluate());
-
-            for (char i = OFFSET; i < PRIME; i++) {
-                rb.addUnsafe(i);
-            }
-            assertEquals(PRIME_SUM, rb.evaluate());
-
-            for (char i = 0; i < PRIME; i++) {
-                rb.removeUnsafe();
-            }
-            assertEquals((char) 0, rb.evaluate());
-        }
-
-        // pop random amounts and test
-        for (int step = 0; step < 100; step++) {
-            final char OFFSET = (char) rnd.nextInt((int) PRIME);
-            for (char i = 0; i < PRIME; i++) {
-                rb.addUnsafe(i);
-            }
-            assertEquals(PRIME_SUM, rb.evaluate());
-
-            for (char i = 0; i < OFFSET; i++) {
-                rb.removeUnsafe();
-            }
-            assertEquals(PRIME_SUM - sum0toN(OFFSET), rb.evaluate());
-
-            for (char i = 0; i < (PRIME - OFFSET); i++) {
-                rb.removeUnsafe();
-            }
-            assertEquals((char) 0, rb.evaluate());
-        }
-
-
-        rb = new AggregatingCharRingBuffer(512, (char) 0, (a, b) -> (char) (a + b));
-        // need to get the buffer to state where we have clean pushes and a wrapped pop
-
-        // move the pointers close to the end
-        for (char i = 0; i < 500; i++) {
-            rb.addUnsafe(i);
-            rb.removeUnsafe();
-        }
-        assertEquals((char) 0, rb.evaluate());
-        assertEmpty(rb);
-
-        // push past the end
-        for (char i = 0; i < 200; i++) {
-            rb.addUnsafe(i);
-        }
-        assertEquals(sum0toN((char) 200), rb.evaluate());
-
-        // one more push to dirty the pushes
-        rb.addUnsafe((char) 201);
-
-        // pop past the end
-        for (char i = 0; i < 200; i++) {
-            rb.removeUnsafe();
-        }
-
-        // only thing in the buffer is the final push
-        assertEquals((char) 201, rb.evaluate());
-    }
-    // endregion non-byte-tests
-
-    public void testPushPopUnsafe() {
-        final AggregatingCharRingBuffer rb =
-                new AggregatingCharRingBuffer(3, (char) -Character.MAX_VALUE, (a, b) -> (char) Math.max(a, b));
-        // move the head and tail off zero
-        rb.ensureRemaining(100);
-        for (char i = 0; i < 100; i++) {
-            rb.addUnsafe(i);
-        }
-        for (char i = 0; i < 100; i++) {
-            assertEquals(rb.removeUnsafe(), i);
-        }
-
-        // do it again with an offset
-        rb.ensureRemaining(100);
-        for (char i = 0; i < 100; i++) {
-            rb.addUnsafe((char) (i + (char) 1000));
-        }
-        for (char i = 0; i < 100; i++) {
-            assertEquals(rb.removeUnsafe(), i + (char) 1000);
-        }
-
-        for (char i = 0; i < 100; i++) {
-            rb.addUnsafe((char) (i + (char) 1000));
-        }
-        rb.clear();
-
-        for (char i = 0; i < 100; i++) {
-            rb.add(i);
-        }
-        assertEquals((char) 99, rb.evaluate()); // last value added is max
-    }
-
-    public void testPopMultiple() {
-        final AggregatingCharRingBuffer rb = new AggregatingCharRingBuffer(3, (char) 0, (a, b) -> (char) (a + b));
-
-        for (int step = 0; step < 10; step++) {
-            rb.ensureRemaining(100);
-            for (char i = 0; i < 100; i++) {
-                rb.addUnsafe(i);
-            }
-
-            if (step % 2 == 0) {
-                rb.evaluate();
-            }
-
-            try {
-                char[] values = rb.remove(101);
-                fail("popping more values than size() should fail");
-            } catch (NoSuchElementException x) {
-                // expected
-            }
-
-            char[] values = rb.remove(100);
-            for (char i = 0; i < 100; i++) {
-                assertEquals(values[(int) i], i);
-            }
-            assertEmpty(rb);
-        }
-    }
-
-    public void testSpecialCaseA() {
-        // overlapping push and pop ranges with popTail < pushTail
-        final AggregatingCharRingBuffer rb = new AggregatingCharRingBuffer(4, (char) 0, (a, b) -> (char) (a + b));
-        rb.add((char) 1);
-        assertEquals((char) 1, rb.remove());
-        rb.add((char) 2);
-        rb.add((char) 3);
-        assertEquals((char) 5, rb.evaluate());
-    }
-
-    public void testSpecialCaseB() {
-        // push the full capacity while wrapped
-        final AggregatingCharRingBuffer rb = new AggregatingCharRingBuffer(64, (char) 0, (a, b) -> (char) (a + b));
-        rb.add((char) 1);
-        assertEquals((char) 1, rb.remove());
-
-        for (int i = 0; i < 64; i++) {
-            rb.add((char) 1);
-        }
-        assertEquals((char) 64, rb.evaluate());
-    }
-
-    public void testSpecialCaseC() {
-        // overlapping push and pop ranges with popTail < pushTail
-        final AggregatingCharRingBuffer rb = new AggregatingCharRingBuffer(16, (char) 0, (a, b) -> (char) (a + b));
-        // move pointers to middle of storage
-        for (int i = 0; i < 8; i++) {
-            rb.add((char) 1);
-            rb.remove();
-        }
-        assertEquals((char) 0, rb.evaluate());
-
-        for (int i = 0; i < 11; i++) {
-            rb.add((char) 1);
-        }
-        rb.remove();
-        assertEquals((char) 10, rb.evaluate());
-    }
-}
diff --git a/Base/src/test/java/io/deephaven/base/ringbuffer/AggregatingDoubleRingBufferTest.java b/Base/src/test/java/io/deephaven/base/ringbuffer/AggregatingDoubleRingBufferTest.java
deleted file mode 100644
index 078dc150a6e..00000000000
--- a/Base/src/test/java/io/deephaven/base/ringbuffer/AggregatingDoubleRingBufferTest.java
+++ /dev/null
@@ -1,333 +0,0 @@
-//
-// Copyright (c) 2016-2024 Deephaven Data Labs and Patent Pending
-//
-// ****** AUTO-GENERATED CLASS - DO NOT EDIT MANUALLY
-// ****** Edit AggregatingCharRingBufferTest and run "./gradlew replicateRingBuffers" to regenerate
-//
-// @formatter:off
-package io.deephaven.base.ringbuffer;
-
-import junit.framework.TestCase;
-
-import java.util.NoSuchElementException;
-import java.util.Random;
-
-public class AggregatingDoubleRingBufferTest extends TestCase {
-
-    private void assertEmpty(AggregatingDoubleRingBuffer rb) {
-        assertTrue(rb.isEmpty());
-        assertEquals(0, rb.size());
-
-        try {
-            rb.remove();
-            fail("queue should be empty");
-        } catch (NoSuchElementException x) {
-            // expected
-        }
-
-        try {
-            rb.element();
-            fail("queue should be empty");
-        } catch (NoSuchElementException x) {
-            // expected
-        }
-    }
-
-    public void testLargeAmounts() {
-        final AggregatingDoubleRingBuffer rb = new AggregatingDoubleRingBuffer(3, (double) 0, (a, b) -> (double) (a + b));
-
-        // move the head and tail off zero
-        for (int i = 0; i < 1000; i++) {
-            rb.add((double) i);
-        }
-        for (int i = 0; i < 1000; i++) {
-            rb.remove();
-        }
-
-        for (int i = 0; i < 10_000; i++)
-            rb.add((double) i);
-
-        for (int i = 10_000; i < 1_000_000; i++) {
-            rb.add((double) i);
-            assertEquals((double) (i - 10_000 + 1), rb.front(1));
-            assertEquals((double) (i - 10_000), rb.remove());
-            assertEquals(rb.remaining(), rb.capacity() - rb.size());
-        }
-    }
-
-    public void testEvaluateMinLargeAmounts() {
-        final AggregatingDoubleRingBuffer rb =
-                new AggregatingDoubleRingBuffer(3, Double.MAX_VALUE, (a, b) -> (double) Math.min(a, b));
-        for (int i = 0; i < 10_000; i++)
-            rb.add((double) i);
-
-        final int maxVal = (int) Math.min(Double.MAX_VALUE, 1_000_000);
-
-        for (int i = 10_000; i < maxVal; i++) {
-            rb.add((double) i);
-            assertEquals((double) (i - 10_000) + 1, rb.front(1));
-            assertEquals((double) (i - 10_000), rb.evaluate()); // front of queue is min
-            assertEquals((double) (i - 10_000), rb.remove());
-        }
-    }
-
-    public void testEvaluateMaxLargeAmounts() {
-        final AggregatingDoubleRingBuffer rb =
-                new AggregatingDoubleRingBuffer(3, Double.MIN_VALUE, (a, b) -> (double) Math.max(a, b));
-        for (int i = 0; i < 10_000; i++)
-            rb.add((double) i);
-
-        final int maxVal = (int) Math.min(Double.MAX_VALUE, 1_000_000);
-
-        for (int i = 10_000; i < maxVal; i++) {
-            rb.add((double) i);
-            assertEquals((double) (i - 10_000 + 1), rb.front(1));
-            assertEquals((double) i, rb.evaluate()); // last value added is max
-            assertEquals((double) (i - 10_000), rb.remove());
-        }
-    }
-
-    // region non-byte-tests
-
-    public void testEvaluateSumLargeAmounts() {
-        final AggregatingDoubleRingBuffer rb = new AggregatingDoubleRingBuffer(3, (double) 0, (a, b) -> (double) (a + b));
-        double runningSum = (double) 0;
-
-        for (double i = 0; i < 1_000; i++) {
-            rb.add(i);
-            runningSum += i;
-        }
-
-        // stay small enough to avoid doubleing errors but prove the concept
-        for (double i = 1_000; i < 10_000; i++) {
-            rb.add(i);
-            runningSum += i; // add the current value
-            assertEquals((double) (i - 1_000 + 1), rb.front(1));
-
-            assertEquals(runningSum, rb.evaluate());
-
-            assertEquals((double) (i - 1_000), rb.remove());
-            runningSum -= i - 1_000; // remove the value 1_0000 ago
-
-            assertEquals(runningSum, rb.evaluate());
-        }
-    }
-
-    /***
-     * Return the sum of 0 to N-1
-     */
-    private double sum0toN(double n) {
-        if (n == (double) 0) {
-            return (double) 0; // not negative zero, sigh
-        }
-        return (double) (n * (n - 1) / 2);
-    }
-
-    public void testEvaluationEdgeCase() {
-        AggregatingDoubleRingBuffer rb = new AggregatingDoubleRingBuffer(512, (double) 0, (a, b) -> (double) (a + b));
-
-        rb.addIdentityValue();
-        assertEquals((double) 0, rb.evaluate());
-        rb.clear();
-
-        final double PRIME = (double) 97;
-        final double PRIME_SUM = sum0toN(PRIME);
-        final Random rnd = new Random(0xDEADBEEF);
-
-        // specific test for push or wrap around
-        for (int step = 0; step < 100; step++) {
-            for (double i = 0; i < PRIME; i++) {
-                rb.addUnsafe(i);
-            }
-            assertEquals(PRIME_SUM, rb.evaluate());
-
-            for (double i = 0; i < PRIME; i++) {
-                rb.removeUnsafe();
-            }
-            assertEquals((double) 0, rb.evaluate());
-            // not a copy/paste error, call this twice
-            assertEquals((double) 0, rb.evaluate());
-        }
-
-        // specific test for push & wrap around
-        for (int step = 0; step < 100; step++) {
-            for (double i = 0; i < PRIME; i++) {
-                rb.addUnsafe(i);
-            }
-            for (double i = 0; i < PRIME; i++) {
-                rb.removeUnsafe();
-            }
-            assertEquals((double) 0, rb.evaluate());
-            // not a copy/paste error, call this twice
-            assertEquals((double) 0, rb.evaluate());
-        }
-
-        // push random amounts and test
-        for (int step = 0; step < 100; step++) {
-            final double OFFSET = (double) rnd.nextInt((int) PRIME);
-
-            for (double i = 0; i < OFFSET; i++) {
-                rb.addUnsafe(i);
-            }
-            assertEquals(sum0toN(OFFSET), rb.evaluate());
-
-            for (double i = OFFSET; i < PRIME; i++) {
-                rb.addUnsafe(i);
-            }
-            assertEquals(PRIME_SUM, rb.evaluate());
-
-            for (double i = 0; i < PRIME; i++) {
-                rb.removeUnsafe();
-            }
-            assertEquals((double) 0, rb.evaluate());
-        }
-
-        // pop random amounts and test
-        for (int step = 0; step < 100; step++) {
-            final double OFFSET = (double) rnd.nextInt((int) PRIME);
-            for (double i = 0; i < PRIME; i++) {
-                rb.addUnsafe(i);
-            }
-            assertEquals(PRIME_SUM, rb.evaluate());
-
-            for (double i = 0; i < OFFSET; i++) {
-                rb.removeUnsafe();
-            }
-            assertEquals(PRIME_SUM - sum0toN(OFFSET), rb.evaluate());
-
-            for (double i = 0; i < (PRIME - OFFSET); i++) {
-                rb.removeUnsafe();
-            }
-            assertEquals((double) 0, rb.evaluate());
-        }
-
-
-        rb = new AggregatingDoubleRingBuffer(512, (double) 0, (a, b) -> (double) (a + b));
-        // need to get the buffer to state where we have clean pushes and a wrapped pop
-
-        // move the pointers close to the end
-        for (double i = 0; i < 500; i++) {
-            rb.addUnsafe(i);
-            rb.removeUnsafe();
-        }
-        assertEquals((double) 0, rb.evaluate());
-        assertEmpty(rb);
-
-        // push past the end
-        for (double i = 0; i < 200; i++) {
-            rb.addUnsafe(i);
-        }
-        assertEquals(sum0toN((double) 200), rb.evaluate());
-
-        // one more push to dirty the pushes
-        rb.addUnsafe((double) 201);
-
-        // pop past the end
-        for (double i = 0; i < 200; i++) {
-            rb.removeUnsafe();
-        }
-
-        // only thing in the buffer is the final push
-        assertEquals((double) 201, rb.evaluate());
-    }
-    // endregion non-byte-tests
-
-    public void testPushPopUnsafe() {
-        final AggregatingDoubleRingBuffer rb =
-                new AggregatingDoubleRingBuffer(3, (double) -Double.MAX_VALUE, (a, b) -> (double) Math.max(a, b));
-        // move the head and tail off zero
-        rb.ensureRemaining(100);
-        for (double i = 0; i < 100; i++) {
-            rb.addUnsafe(i);
-        }
-        for (double i = 0; i < 100; i++) {
-            assertEquals(rb.removeUnsafe(), i);
-        }
-
-        // do it again with an offset
-        rb.ensureRemaining(100);
-        for (double i = 0; i < 100; i++) {
-            rb.addUnsafe((double) (i + (double) 1000));
-        }
-        for (double i = 0; i < 100; i++) {
-            assertEquals(rb.removeUnsafe(), i + (double) 1000);
-        }
-
-        for (double i = 0; i < 100; i++) {
-            rb.addUnsafe((double) (i + (double) 1000));
-        }
-        rb.clear();
-
-        for (double i = 0; i < 100; i++) {
-            rb.add(i);
-        }
-        assertEquals((double) 99, rb.evaluate()); // last value added is max
-    }
-
-    public void testPopMultiple() {
-        final AggregatingDoubleRingBuffer rb = new AggregatingDoubleRingBuffer(3, (double) 0, (a, b) -> (double) (a + b));
-
-        for (int step = 0; step < 10; step++) {
-            rb.ensureRemaining(100);
-            for (double i = 0; i < 100; i++) {
-                rb.addUnsafe(i);
-            }
-
-            if (step % 2 == 0) {
-                rb.evaluate();
-            }
-
-            try {
-                double[] values = rb.remove(101);
-                fail("popping more values than size() should fail");
-            } catch (NoSuchElementException x) {
-                // expected
-            }
-
-            double[] values = rb.remove(100);
-            for (double i = 0; i < 100; i++) {
-                assertEquals(values[(int) i], i);
-            }
-            assertEmpty(rb);
-        }
-    }
-
-    public void testSpecialCaseA() {
-        // overlapping push and pop ranges with popTail < pushTail
-        final AggregatingDoubleRingBuffer rb = new AggregatingDoubleRingBuffer(4, (double) 0, (a, b) -> (double) (a + b));
-        rb.add((double) 1);
-        assertEquals((double) 1, rb.remove());
-        rb.add((double) 2);
-        rb.add((double) 3);
-        assertEquals((double) 5, rb.evaluate());
-    }
-
-    public void testSpecialCaseB() {
-        // push the full capacity while wrapped
-        final AggregatingDoubleRingBuffer rb = new AggregatingDoubleRingBuffer(64, (double) 0, (a, b) -> (double) (a + b));
-        rb.add((double) 1);
-        assertEquals((double) 1, rb.remove());
-
-        for (int i = 0; i < 64; i++) {
-            rb.add((double) 1);
-        }
-        assertEquals((double) 64, rb.evaluate());
-    }
-
-    public void testSpecialCaseC() {
-        // overlapping push and pop ranges with popTail < pushTail
-        final AggregatingDoubleRingBuffer rb = new AggregatingDoubleRingBuffer(16, (double) 0, (a, b) -> (double) (a + b));
-        // move pointers to middle of storage
-        for (int i = 0; i < 8; i++) {
-            rb.add((double) 1);
-            rb.remove();
-        }
-        assertEquals((double) 0, rb.evaluate());
-
-        for (int i = 0; i < 11; i++) {
-            rb.add((double) 1);
-        }
-        rb.remove();
-        assertEquals((double) 10, rb.evaluate());
-    }
-}
diff --git a/Base/src/test/java/io/deephaven/base/ringbuffer/AggregatingFloatRingBufferTest.java b/Base/src/test/java/io/deephaven/base/ringbuffer/AggregatingFloatRingBufferTest.java
deleted file mode 100644
index 08ea6c76190..00000000000
--- a/Base/src/test/java/io/deephaven/base/ringbuffer/AggregatingFloatRingBufferTest.java
+++ /dev/null
@@ -1,333 +0,0 @@
-//
-// Copyright (c) 2016-2024 Deephaven Data Labs and Patent Pending
-//
-// ****** AUTO-GENERATED CLASS - DO NOT EDIT MANUALLY
-// ****** Edit AggregatingCharRingBufferTest and run "./gradlew replicateRingBuffers" to regenerate
-//
-// @formatter:off
-package io.deephaven.base.ringbuffer;
-
-import junit.framework.TestCase;
-
-import java.util.NoSuchElementException;
-import java.util.Random;
-
-public class AggregatingFloatRingBufferTest extends TestCase {
-
-    private void assertEmpty(AggregatingFloatRingBuffer rb) {
-        assertTrue(rb.isEmpty());
-        assertEquals(0, rb.size());
-
-        try {
-            rb.remove();
-            fail("queue should be empty");
-        } catch (NoSuchElementException x) {
-            // expected
-        }
-
-        try {
-            rb.element();
-            fail("queue should be empty");
-        } catch (NoSuchElementException x) {
-            // expected
-        }
-    }
-
-    public void testLargeAmounts() {
-        final AggregatingFloatRingBuffer rb = new AggregatingFloatRingBuffer(3, (float) 0, (a, b) -> (float) (a + b));
-
-        // move the head and tail off zero
-        for (int i = 0; i < 1000; i++) {
-            rb.add((float) i);
-        }
-        for (int i = 0; i < 1000; i++) {
-            rb.remove();
-        }
-
-        for (int i = 0; i < 10_000; i++)
-            rb.add((float) i);
-
-        for (int i = 10_000; i < 1_000_000; i++) {
-            rb.add((float) i);
-            assertEquals((float) (i - 10_000 + 1), rb.front(1));
-            assertEquals((float) (i - 10_000), rb.remove());
-            assertEquals(rb.remaining(), rb.capacity() - rb.size());
-        }
-    }
-
-    public void testEvaluateMinLargeAmounts() {
-        final AggregatingFloatRingBuffer rb =
-                new AggregatingFloatRingBuffer(3, Float.MAX_VALUE, (a, b) -> (float) Math.min(a, b));
-        for (int i = 0; i < 10_000; i++)
-            rb.add((float) i);
-
-        final int maxVal = (int) Math.min(Float.MAX_VALUE, 1_000_000);
-
-        for (int i = 10_000; i < maxVal; i++) {
-            rb.add((float) i);
-            assertEquals((float) (i - 10_000) + 1, rb.front(1));
-            assertEquals((float) (i - 10_000), rb.evaluate()); // front of queue is min
-            assertEquals((float) (i - 10_000), rb.remove());
-        }
-    }
-
-    public void testEvaluateMaxLargeAmounts() {
-        final AggregatingFloatRingBuffer rb =
-                new AggregatingFloatRingBuffer(3, Float.MIN_VALUE, (a, b) -> (float) Math.max(a, b));
-        for (int i = 0; i < 10_000; i++)
-            rb.add((float) i);
-
-        final int maxVal = (int) Math.min(Float.MAX_VALUE, 1_000_000);
-
-        for (int i = 10_000; i < maxVal; i++) {
-            rb.add((float) i);
-            assertEquals((float) (i - 10_000 + 1), rb.front(1));
-            assertEquals((float) i, rb.evaluate()); // last value added is max
-            assertEquals((float) (i - 10_000), rb.remove());
-        }
-    }
-
-    // region non-byte-tests
-
-    public void testEvaluateSumLargeAmounts() {
-        final AggregatingFloatRingBuffer rb = new AggregatingFloatRingBuffer(3, (float) 0, (a, b) -> (float) (a + b));
-        float runningSum = (float) 0;
-
-        for (float i = 0; i < 1_000; i++) {
-            rb.add(i);
-            runningSum += i;
-        }
-
-        // stay small enough to avoid floating errors but prove the concept
-        for (float i = 1_000; i < 10_000; i++) {
-            rb.add(i);
-            runningSum += i; // add the current value
-            assertEquals((float) (i - 1_000 + 1), rb.front(1));
-
-            assertEquals(runningSum, rb.evaluate());
-
-            assertEquals((float) (i - 1_000), rb.remove());
-            runningSum -= i - 1_000; // remove the value 1_0000 ago
-
-            assertEquals(runningSum, rb.evaluate());
-        }
-    }
-
-    /***
-     * Return the sum of 0 to N-1
-     */
-    private float sum0toN(float n) {
-        if (n == (float) 0) {
-            return (float) 0; // not negative zero, sigh
-        }
-        return (float) (n * (n - 1) / 2);
-    }
-
-    public void testEvaluationEdgeCase() {
-        AggregatingFloatRingBuffer rb = new AggregatingFloatRingBuffer(512, (float) 0, (a, b) -> (float) (a + b));
-
-        rb.addIdentityValue();
-        assertEquals((float) 0, rb.evaluate());
-        rb.clear();
-
-        final float PRIME = (float) 97;
-        final float PRIME_SUM = sum0toN(PRIME);
-        final Random rnd = new Random(0xDEADBEEF);
-
-        // specific test for push or wrap around
-        for (int step = 0; step < 100; step++) {
-            for (float i = 0; i < PRIME; i++) {
-                rb.addUnsafe(i);
-            }
-            assertEquals(PRIME_SUM, rb.evaluate());
-
-            for (float i = 0; i < PRIME; i++) {
-                rb.removeUnsafe();
-            }
-            assertEquals((float) 0, rb.evaluate());
-            // not a copy/paste error, call this twice
-            assertEquals((float) 0, rb.evaluate());
-        }
-
-        // specific test for push & wrap around
-        for (int step = 0; step < 100; step++) {
-            for (float i = 0; i < PRIME; i++) {
-                rb.addUnsafe(i);
-            }
-            for (float i = 0; i < PRIME; i++) {
-                rb.removeUnsafe();
-            }
-            assertEquals((float) 0, rb.evaluate());
-            // not a copy/paste error, call this twice
-            assertEquals((float) 0, rb.evaluate());
-        }
-
-        // push random amounts and test
-        for (int step = 0; step < 100; step++) {
-            final float OFFSET = (float) rnd.nextInt((int) PRIME);
-
-            for (float i = 0; i < OFFSET; i++) {
-                rb.addUnsafe(i);
-            }
-            assertEquals(sum0toN(OFFSET), rb.evaluate());
-
-            for (float i = OFFSET; i < PRIME; i++) {
-                rb.addUnsafe(i);
-            }
-            assertEquals(PRIME_SUM, rb.evaluate());
-
-            for (float i = 0; i < PRIME; i++) {
-                rb.removeUnsafe();
-            }
-            assertEquals((float) 0, rb.evaluate());
-        }
-
-        // pop random amounts and test
-        for (int step = 0; step < 100; step++) {
-            final float OFFSET = (float) rnd.nextInt((int) PRIME);
-            for (float i = 0; i < PRIME; i++) {
-                rb.addUnsafe(i);
-            }
-            assertEquals(PRIME_SUM, rb.evaluate());
-
-            for (float i = 0; i < OFFSET; i++) {
-                rb.removeUnsafe();
-            }
-            assertEquals(PRIME_SUM - sum0toN(OFFSET), rb.evaluate());
-
-            for (float i = 0; i < (PRIME - OFFSET); i++) {
-                rb.removeUnsafe();
-            }
-            assertEquals((float) 0, rb.evaluate());
-        }
-
-
-        rb = new AggregatingFloatRingBuffer(512, (float) 0, (a, b) -> (float) (a + b));
-        // need to get the buffer to state where we have clean pushes and a wrapped pop
-
-        // move the pointers close to the end
-        for (float i = 0; i < 500; i++) {
-            rb.addUnsafe(i);
-            rb.removeUnsafe();
-        }
-        assertEquals((float) 0, rb.evaluate());
-        assertEmpty(rb);
-
-        // push past the end
-        for (float i = 0; i < 200; i++) {
-            rb.addUnsafe(i);
-        }
-        assertEquals(sum0toN((float) 200), rb.evaluate());
-
-        // one more push to dirty the pushes
-        rb.addUnsafe((float) 201);
-
-        // pop past the end
-        for (float i = 0; i < 200; i++) {
-            rb.removeUnsafe();
-        }
-
-        // only thing in the buffer is the final push
-        assertEquals((float) 201, rb.evaluate());
-    }
-    // endregion non-byte-tests
-
-    public void testPushPopUnsafe() {
-        final AggregatingFloatRingBuffer rb =
-                new AggregatingFloatRingBuffer(3, (float) -Float.MAX_VALUE, (a, b) -> (float) Math.max(a, b));
-        // move the head and tail off zero
-        rb.ensureRemaining(100);
-        for (float i = 0; i < 100; i++) {
-            rb.addUnsafe(i);
-        }
-        for (float i = 0; i < 100; i++) {
-            assertEquals(rb.removeUnsafe(), i);
-        }
-
-        // do it again with an offset
-        rb.ensureRemaining(100);
-        for (float i = 0; i < 100; i++) {
-            rb.addUnsafe((float) (i + (float) 1000));
-        }
-        for (float i = 0; i < 100; i++) {
-            assertEquals(rb.removeUnsafe(), i + (float) 1000);
-        }
-
-        for (float i = 0; i < 100; i++) {
-            rb.addUnsafe((float) (i + (float) 1000));
-        }
-        rb.clear();
-
-        for (float i = 0; i < 100; i++) {
-            rb.add(i);
-        }
-        assertEquals((float) 99, rb.evaluate()); // last value added is max
-    }
-
-    public void testPopMultiple() {
-        final AggregatingFloatRingBuffer rb = new AggregatingFloatRingBuffer(3, (float) 0, (a, b) -> (float) (a + b));
-
-        for (int step = 0; step < 10; step++) {
-            rb.ensureRemaining(100);
-            for (float i = 0; i < 100; i++) {
-                rb.addUnsafe(i);
-            }
-
-            if (step % 2 == 0) {
-                rb.evaluate();
-            }
-
-            try {
-                float[] values = rb.remove(101);
-                fail("popping more values than size() should fail");
-            } catch (NoSuchElementException x) {
-                // expected
-            }
-
-            float[] values = rb.remove(100);
-            for (float i = 0; i < 100; i++) {
-                assertEquals(values[(int) i], i);
-            }
-            assertEmpty(rb);
-        }
-    }
-
-    public void testSpecialCaseA() {
-        // overlapping push and pop ranges with popTail < pushTail
-        final AggregatingFloatRingBuffer rb = new AggregatingFloatRingBuffer(4, (float) 0, (a, b) -> (float) (a + b));
-        rb.add((float) 1);
-        assertEquals((float) 1, rb.remove());
-        rb.add((float) 2);
-        rb.add((float) 3);
-        assertEquals((float) 5, rb.evaluate());
-    }
-
-    public void testSpecialCaseB() {
-        // push the full capacity while wrapped
-        final AggregatingFloatRingBuffer rb = new AggregatingFloatRingBuffer(64, (float) 0, (a, b) -> (float) (a + b));
-        rb.add((float) 1);
-        assertEquals((float) 1, rb.remove());
-
-        for (int i = 0; i < 64; i++) {
-            rb.add((float) 1);
-        }
-        assertEquals((float) 64, rb.evaluate());
-    }
-
-    public void testSpecialCaseC() {
-        // overlapping push and pop ranges with popTail < pushTail
-        final AggregatingFloatRingBuffer rb = new AggregatingFloatRingBuffer(16, (float) 0, (a, b) -> (float) (a + b));
-        // move pointers to middle of storage
-        for (int i = 0; i < 8; i++) {
-            rb.add((float) 1);
-            rb.remove();
-        }
-        assertEquals((float) 0, rb.evaluate());
-
-        for (int i = 0; i < 11; i++) {
-            rb.add((float) 1);
-        }
-        rb.remove();
-        assertEquals((float) 10, rb.evaluate());
-    }
-}
diff --git a/Base/src/test/java/io/deephaven/base/ringbuffer/AggregatingIntRingBufferTest.java b/Base/src/test/java/io/deephaven/base/ringbuffer/AggregatingIntRingBufferTest.java
deleted file mode 100644
index 0a8445f6eab..00000000000
--- a/Base/src/test/java/io/deephaven/base/ringbuffer/AggregatingIntRingBufferTest.java
+++ /dev/null
@@ -1,333 +0,0 @@
-//
-// Copyright (c) 2016-2024 Deephaven Data Labs and Patent Pending
-//
-// ****** AUTO-GENERATED CLASS - DO NOT EDIT MANUALLY
-// ****** Edit AggregatingCharRingBufferTest and run "./gradlew replicateRingBuffers" to regenerate
-//
-// @formatter:off
-package io.deephaven.base.ringbuffer;
-
-import junit.framework.TestCase;
-
-import java.util.NoSuchElementException;
-import java.util.Random;
-
-public class AggregatingIntRingBufferTest extends TestCase {
-
-    private void assertEmpty(AggregatingIntRingBuffer rb) {
-        assertTrue(rb.isEmpty());
-        assertEquals(0, rb.size());
-
-        try {
-            rb.remove();
-            fail("queue should be empty");
-        } catch (NoSuchElementException x) {
-            // expected
-        }
-
-        try {
-            rb.element();
-            fail("queue should be empty");
-        } catch (NoSuchElementException x) {
-            // expected
-        }
-    }
-
-    public void testLargeAmounts() {
-        final AggregatingIntRingBuffer rb = new AggregatingIntRingBuffer(3, (int) 0, (a, b) -> (int) (a + b));
-
-        // move the head and tail off zero
-        for (int i = 0; i < 1000; i++) {
-            rb.add((int) i);
-        }
-        for (int i = 0; i < 1000; i++) {
-            rb.remove();
-        }
-
-        for (int i = 0; i < 10_000; i++)
-            rb.add((int) i);
-
-        for (int i = 10_000; i < 1_000_000; i++) {
-            rb.add((int) i);
-            assertEquals((int) (i - 10_000 + 1), rb.front(1));
-            assertEquals((int) (i - 10_000), rb.remove());
-            assertEquals(rb.remaining(), rb.capacity() - rb.size());
-        }
-    }
-
-    public void testEvaluateMinLargeAmounts() {
-        final AggregatingIntRingBuffer rb =
-                new AggregatingIntRingBuffer(3, Integer.MAX_VALUE, (a, b) -> (int) Math.min(a, b));
-        for (int i = 0; i < 10_000; i++)
-            rb.add((int) i);
-
-        final int maxVal = (int) Math.min(Integer.MAX_VALUE, 1_000_000);
-
-        for (int i = 10_000; i < maxVal; i++) {
-            rb.add((int) i);
-            assertEquals((int) (i - 10_000) + 1, rb.front(1));
-            assertEquals((int) (i - 10_000), rb.evaluate()); // front of queue is min
-            assertEquals((int) (i - 10_000), rb.remove());
-        }
-    }
-
-    public void testEvaluateMaxLargeAmounts() {
-        final AggregatingIntRingBuffer rb =
-                new AggregatingIntRingBuffer(3, Integer.MIN_VALUE, (a, b) -> (int) Math.max(a, b));
-        for (int i = 0; i < 10_000; i++)
-            rb.add((int) i);
-
-        final int maxVal = (int) Math.min(Integer.MAX_VALUE, 1_000_000);
-
-        for (int i = 10_000; i < maxVal; i++) {
-            rb.add((int) i);
-            assertEquals((int) (i - 10_000 + 1), rb.front(1));
-            assertEquals((int) i, rb.evaluate()); // last value added is max
-            assertEquals((int) (i - 10_000), rb.remove());
-        }
-    }
-
-    // region non-byte-tests
-
-    public void testEvaluateSumLargeAmounts() {
-        final AggregatingIntRingBuffer rb = new AggregatingIntRingBuffer(3, (int) 0, (a, b) -> (int) (a + b));
-        int runningSum = (int) 0;
-
-        for (int i = 0; i < 1_000; i++) {
-            rb.add(i);
-            runningSum += i;
-        }
-
-        // stay small enough to avoid inting errors but prove the concept
-        for (int i = 1_000; i < 10_000; i++) {
-            rb.add(i);
-            runningSum += i; // add the current value
-            assertEquals((int) (i - 1_000 + 1), rb.front(1));
-
-            assertEquals(runningSum, rb.evaluate());
-
-            assertEquals((int) (i - 1_000), rb.remove());
-            runningSum -= i - 1_000; // remove the value 1_0000 ago
-
-            assertEquals(runningSum, rb.evaluate());
-        }
-    }
-
-    /***
-     * Return the sum of 0 to N-1
-     */
-    private int sum0toN(int n) {
-        if (n == (int) 0) {
-            return (int) 0; // not negative zero, sigh
-        }
-        return (int) (n * (n - 1) / 2);
-    }
-
-    public void testEvaluationEdgeCase() {
-        AggregatingIntRingBuffer rb = new AggregatingIntRingBuffer(512, (int) 0, (a, b) -> (int) (a + b));
-
-        rb.addIdentityValue();
-        assertEquals((int) 0, rb.evaluate());
-        rb.clear();
-
-        final int PRIME = (int) 97;
-        final int PRIME_SUM = sum0toN(PRIME);
-        final Random rnd = new Random(0xDEADBEEF);
-
-        // specific test for push or wrap around
-        for (int step = 0; step < 100; step++) {
-            for (int i = 0; i < PRIME; i++) {
-                rb.addUnsafe(i);
-            }
-            assertEquals(PRIME_SUM, rb.evaluate());
-
-            for (int i = 0; i < PRIME; i++) {
-                rb.removeUnsafe();
-            }
-            assertEquals((int) 0, rb.evaluate());
-            // not a copy/paste error, call this twice
-            assertEquals((int) 0, rb.evaluate());
-        }
-
-        // specific test for push & wrap around
-        for (int step = 0; step < 100; step++) {
-            for (int i = 0; i < PRIME; i++) {
-                rb.addUnsafe(i);
-            }
-            for (int i = 0; i < PRIME; i++) {
-                rb.removeUnsafe();
-            }
-            assertEquals((int) 0, rb.evaluate());
-            // not a copy/paste error, call this twice
-            assertEquals((int) 0, rb.evaluate());
-        }
-
-        // push random amounts and test
-        for (int step = 0; step < 100; step++) {
-            final int OFFSET = (int) rnd.nextInt((int) PRIME);
-
-            for (int i = 0; i < OFFSET; i++) {
-                rb.addUnsafe(i);
-            }
-            assertEquals(sum0toN(OFFSET), rb.evaluate());
-
-            for (int i = OFFSET; i < PRIME; i++) {
-                rb.addUnsafe(i);
-            }
-            assertEquals(PRIME_SUM, rb.evaluate());
-
-            for (int i = 0; i < PRIME; i++) {
-                rb.removeUnsafe();
-            }
-            assertEquals((int) 0, rb.evaluate());
-        }
-
-        // pop random amounts and test
-        for (int step = 0; step < 100; step++) {
-            final int OFFSET = (int) rnd.nextInt((int) PRIME);
-            for (int i = 0; i < PRIME; i++) {
-                rb.addUnsafe(i);
-            }
-            assertEquals(PRIME_SUM, rb.evaluate());
-
-            for (int i = 0; i < OFFSET; i++) {
-                rb.removeUnsafe();
-            }
-            assertEquals(PRIME_SUM - sum0toN(OFFSET), rb.evaluate());
-
-            for (int i = 0; i < (PRIME - OFFSET); i++) {
-                rb.removeUnsafe();
-            }
-            assertEquals((int) 0, rb.evaluate());
-        }
-
-
-        rb = new AggregatingIntRingBuffer(512, (int) 0, (a, b) -> (int) (a + b));
-        // need to get the buffer to state where we have clean pushes and a wrapped pop
-
-        // move the pointers close to the end
-        for (int i = 0; i < 500; i++) {
-            rb.addUnsafe(i);
-            rb.removeUnsafe();
-        }
-        assertEquals((int) 0, rb.evaluate());
-        assertEmpty(rb);
-
-        // push past the end
-        for (int i = 0; i < 200; i++) {
-            rb.addUnsafe(i);
-        }
-        assertEquals(sum0toN((int) 200), rb.evaluate());
-
-        // one more push to dirty the pushes
-        rb.addUnsafe((int) 201);
-
-        // pop past the end
-        for (int i = 0; i < 200; i++) {
-            rb.removeUnsafe();
-        }
-
-        // only thing in the buffer is the final push
-        assertEquals((int) 201, rb.evaluate());
-    }
-    // endregion non-byte-tests
-
-    public void testPushPopUnsafe() {
-        final AggregatingIntRingBuffer rb =
-                new AggregatingIntRingBuffer(3, (int) -Integer.MAX_VALUE, (a, b) -> (int) Math.max(a, b));
-        // move the head and tail off zero
-        rb.ensureRemaining(100);
-        for (int i = 0; i < 100; i++) {
-            rb.addUnsafe(i);
-        }
-        for (int i = 0; i < 100; i++) {
-            assertEquals(rb.removeUnsafe(), i);
-        }
-
-        // do it again with an offset
-        rb.ensureRemaining(100);
-        for (int i = 0; i < 100; i++) {
-            rb.addUnsafe((int) (i + (int) 1000));
-        }
-        for (int i = 0; i < 100; i++) {
-            assertEquals(rb.removeUnsafe(), i + (int) 1000);
-        }
-
-        for (int i = 0; i < 100; i++) {
-            rb.addUnsafe((int) (i + (int) 1000));
-        }
-        rb.clear();
-
-        for (int i = 0; i < 100; i++) {
-            rb.add(i);
-        }
-        assertEquals((int) 99, rb.evaluate()); // last value added is max
-    }
-
-    public void testPopMultiple() {
-        final AggregatingIntRingBuffer rb = new AggregatingIntRingBuffer(3, (int) 0, (a, b) -> (int) (a + b));
-
-        for (int step = 0; step < 10; step++) {
-            rb.ensureRemaining(100);
-            for (int i = 0; i < 100; i++) {
-                rb.addUnsafe(i);
-            }
-
-            if (step % 2 == 0) {
-                rb.evaluate();
-            }
-
-            try {
-                int[] values = rb.remove(101);
-                fail("popping more values than size() should fail");
-            } catch (NoSuchElementException x) {
-                // expected
-            }
-
-            int[] values = rb.remove(100);
-            for (int i = 0; i < 100; i++) {
-                assertEquals(values[(int) i], i);
-            }
-            assertEmpty(rb);
-        }
-    }
-
-    public void testSpecialCaseA() {
-        // overlapping push and pop ranges with popTail < pushTail
-        final AggregatingIntRingBuffer rb = new AggregatingIntRingBuffer(4, (int) 0, (a, b) -> (int) (a + b));
-        rb.add((int) 1);
-        assertEquals((int) 1, rb.remove());
-        rb.add((int) 2);
-        rb.add((int) 3);
-        assertEquals((int) 5, rb.evaluate());
-    }
-
-    public void testSpecialCaseB() {
-        // push the full capacity while wrapped
-        final AggregatingIntRingBuffer rb = new AggregatingIntRingBuffer(64, (int) 0, (a, b) -> (int) (a + b));
-        rb.add((int) 1);
-        assertEquals((int) 1, rb.remove());
-
-        for (int i = 0; i < 64; i++) {
-            rb.add((int) 1);
-        }
-        assertEquals((int) 64, rb.evaluate());
-    }
-
-    public void testSpecialCaseC() {
-        // overlapping push and pop ranges with popTail < pushTail
-        final AggregatingIntRingBuffer rb = new AggregatingIntRingBuffer(16, (int) 0, (a, b) -> (int) (a + b));
-        // move pointers to middle of storage
-        for (int i = 0; i < 8; i++) {
-            rb.add((int) 1);
-            rb.remove();
-        }
-        assertEquals((int) 0, rb.evaluate());
-
-        for (int i = 0; i < 11; i++) {
-            rb.add((int) 1);
-        }
-        rb.remove();
-        assertEquals((int) 10, rb.evaluate());
-    }
-}
diff --git a/Base/src/test/java/io/deephaven/base/ringbuffer/AggregatingLongRingBufferTest.java b/Base/src/test/java/io/deephaven/base/ringbuffer/AggregatingLongRingBufferTest.java
deleted file mode 100644
index afb705fa793..00000000000
--- a/Base/src/test/java/io/deephaven/base/ringbuffer/AggregatingLongRingBufferTest.java
+++ /dev/null
@@ -1,333 +0,0 @@
-//
-// Copyright (c) 2016-2024 Deephaven Data Labs and Patent Pending
-//
-// ****** AUTO-GENERATED CLASS - DO NOT EDIT MANUALLY
-// ****** Edit AggregatingCharRingBufferTest and run "./gradlew replicateRingBuffers" to regenerate
-//
-// @formatter:off
-package io.deephaven.base.ringbuffer;
-
-import junit.framework.TestCase;
-
-import java.util.NoSuchElementException;
-import java.util.Random;
-
-public class AggregatingLongRingBufferTest extends TestCase {
-
-    private void assertEmpty(AggregatingLongRingBuffer rb) {
-        assertTrue(rb.isEmpty());
-        assertEquals(0, rb.size());
-
-        try {
-            rb.remove();
-            fail("queue should be empty");
-        } catch (NoSuchElementException x) {
-            // expected
-        }
-
-        try {
-            rb.element();
-            fail("queue should be empty");
-        } catch (NoSuchElementException x) {
-            // expected
-        }
-    }
-
-    public void testLargeAmounts() {
-        final AggregatingLongRingBuffer rb = new AggregatingLongRingBuffer(3, (long) 0, (a, b) -> (long) (a + b));
-
-        // move the head and tail off zero
-        for (int i = 0; i < 1000; i++) {
-            rb.add((long) i);
-        }
-        for (int i = 0; i < 1000; i++) {
-            rb.remove();
-        }
-
-        for (int i = 0; i < 10_000; i++)
-            rb.add((long) i);
-
-        for (int i = 10_000; i < 1_000_000; i++) {
-            rb.add((long) i);
-            assertEquals((long) (i - 10_000 + 1), rb.front(1));
-            assertEquals((long) (i - 10_000), rb.remove());
-            assertEquals(rb.remaining(), rb.capacity() - rb.size());
-        }
-    }
-
-    public void testEvaluateMinLargeAmounts() {
-        final AggregatingLongRingBuffer rb =
-                new AggregatingLongRingBuffer(3, Long.MAX_VALUE, (a, b) -> (long) Math.min(a, b));
-        for (int i = 0; i < 10_000; i++)
-            rb.add((long) i);
-
-        final int maxVal = (int) Math.min(Long.MAX_VALUE, 1_000_000);
-
-        for (int i = 10_000; i < maxVal; i++) {
-            rb.add((long) i);
-            assertEquals((long) (i - 10_000) + 1, rb.front(1));
-            assertEquals((long) (i - 10_000), rb.evaluate()); // front of queue is min
-            assertEquals((long) (i - 10_000), rb.remove());
-        }
-    }
-
-    public void testEvaluateMaxLargeAmounts() {
-        final AggregatingLongRingBuffer rb =
-                new AggregatingLongRingBuffer(3, Long.MIN_VALUE, (a, b) -> (long) Math.max(a, b));
-        for (int i = 0; i < 10_000; i++)
-            rb.add((long) i);
-
-        final int maxVal = (int) Math.min(Long.MAX_VALUE, 1_000_000);
-
-        for (int i = 10_000; i < maxVal; i++) {
-            rb.add((long) i);
-            assertEquals((long) (i - 10_000 + 1), rb.front(1));
-            assertEquals((long) i, rb.evaluate()); // last value added is max
-            assertEquals((long) (i - 10_000), rb.remove());
-        }
-    }
-
-    // region non-byte-tests
-
-    public void testEvaluateSumLargeAmounts() {
-        final AggregatingLongRingBuffer rb = new AggregatingLongRingBuffer(3, (long) 0, (a, b) -> (long) (a + b));
-        long runningSum = (long) 0;
-
-        for (long i = 0; i < 1_000; i++) {
-            rb.add(i);
-            runningSum += i;
-        }
-
-        // stay small enough to avoid longing errors but prove the concept
-        for (long i = 1_000; i < 10_000; i++) {
-            rb.add(i);
-            runningSum += i; // add the current value
-            assertEquals((long) (i - 1_000 + 1), rb.front(1));
-
-            assertEquals(runningSum, rb.evaluate());
-
-            assertEquals((long) (i - 1_000), rb.remove());
-            runningSum -= i - 1_000; // remove the value 1_0000 ago
-
-            assertEquals(runningSum, rb.evaluate());
-        }
-    }
-
-    /***
-     * Return the sum of 0 to N-1
-     */
-    private long sum0toN(long n) {
-        if (n == (long) 0) {
-            return (long) 0; // not negative zero, sigh
-        }
-        return (long) (n * (n - 1) / 2);
-    }
-
-    public void testEvaluationEdgeCase() {
-        AggregatingLongRingBuffer rb = new AggregatingLongRingBuffer(512, (long) 0, (a, b) -> (long) (a + b));
-
-        rb.addIdentityValue();
-        assertEquals((long) 0, rb.evaluate());
-        rb.clear();
-
-        final long PRIME = (long) 97;
-        final long PRIME_SUM = sum0toN(PRIME);
-        final Random rnd = new Random(0xDEADBEEF);
-
-        // specific test for push or wrap around
-        for (int step = 0; step < 100; step++) {
-            for (long i = 0; i < PRIME; i++) {
-                rb.addUnsafe(i);
-            }
-            assertEquals(PRIME_SUM, rb.evaluate());
-
-            for (long i = 0; i < PRIME; i++) {
-                rb.removeUnsafe();
-            }
-            assertEquals((long) 0, rb.evaluate());
-            // not a copy/paste error, call this twice
-            assertEquals((long) 0, rb.evaluate());
-        }
-
-        // specific test for push & wrap around
-        for (int step = 0; step < 100; step++) {
-            for (long i = 0; i < PRIME; i++) {
-                rb.addUnsafe(i);
-            }
-            for (long i = 0; i < PRIME; i++) {
-                rb.removeUnsafe();
-            }
-            assertEquals((long) 0, rb.evaluate());
-            // not a copy/paste error, call this twice
-            assertEquals((long) 0, rb.evaluate());
-        }
-
-        // push random amounts and test
-        for (int step = 0; step < 100; step++) {
-            final long OFFSET = (long) rnd.nextInt((int) PRIME);
-
-            for (long i = 0; i < OFFSET; i++) {
-                rb.addUnsafe(i);
-            }
-            assertEquals(sum0toN(OFFSET), rb.evaluate());
-
-            for (long i = OFFSET; i < PRIME; i++) {
-                rb.addUnsafe(i);
-            }
-            assertEquals(PRIME_SUM, rb.evaluate());
-
-            for (long i = 0; i < PRIME; i++) {
-                rb.removeUnsafe();
-            }
-            assertEquals((long) 0, rb.evaluate());
-        }
-
-        // pop random amounts and test
-        for (int step = 0; step < 100; step++) {
-            final long OFFSET = (long) rnd.nextInt((int) PRIME);
-            for (long i = 0; i < PRIME; i++) {
-                rb.addUnsafe(i);
-            }
-            assertEquals(PRIME_SUM, rb.evaluate());
-
-            for (long i = 0; i < OFFSET; i++) {
-                rb.removeUnsafe();
-            }
-            assertEquals(PRIME_SUM - sum0toN(OFFSET), rb.evaluate());
-
-            for (long i = 0; i < (PRIME - OFFSET); i++) {
-                rb.removeUnsafe();
-            }
-            assertEquals((long) 0, rb.evaluate());
-        }
-
-
-        rb = new AggregatingLongRingBuffer(512, (long) 0, (a, b) -> (long) (a + b));
-        // need to get the buffer to state where we have clean pushes and a wrapped pop
-
-        // move the pointers close to the end
-        for (long i = 0; i < 500; i++) {
-            rb.addUnsafe(i);
-            rb.removeUnsafe();
-        }
-        assertEquals((long) 0, rb.evaluate());
-        assertEmpty(rb);
-
-        // push past the end
-        for (long i = 0; i < 200; i++) {
-            rb.addUnsafe(i);
-        }
-        assertEquals(sum0toN((long) 200), rb.evaluate());
-
-        // one more push to dirty the pushes
-        rb.addUnsafe((long) 201);
-
-        // pop past the end
-        for (long i = 0; i < 200; i++) {
-            rb.removeUnsafe();
-        }
-
-        // only thing in the buffer is the final push
-        assertEquals((long) 201, rb.evaluate());
-    }
-    // endregion non-byte-tests
-
-    public void testPushPopUnsafe() {
-        final AggregatingLongRingBuffer rb =
-                new AggregatingLongRingBuffer(3, (long) -Long.MAX_VALUE, (a, b) -> (long) Math.max(a, b));
-        // move the head and tail off zero
-        rb.ensureRemaining(100);
-        for (long i = 0; i < 100; i++) {
-            rb.addUnsafe(i);
-        }
-        for (long i = 0; i < 100; i++) {
-            assertEquals(rb.removeUnsafe(), i);
-        }
-
-        // do it again with an offset
-        rb.ensureRemaining(100);
-        for (long i = 0; i < 100; i++) {
-            rb.addUnsafe((long) (i + (long) 1000));
-        }
-        for (long i = 0; i < 100; i++) {
-            assertEquals(rb.removeUnsafe(), i + (long) 1000);
-        }
-
-        for (long i = 0; i < 100; i++) {
-            rb.addUnsafe((long) (i + (long) 1000));
-        }
-        rb.clear();
-
-        for (long i = 0; i < 100; i++) {
-            rb.add(i);
-        }
-        assertEquals((long) 99, rb.evaluate()); // last value added is max
-    }
-
-    public void testPopMultiple() {
-        final AggregatingLongRingBuffer rb = new AggregatingLongRingBuffer(3, (long) 0, (a, b) -> (long) (a + b));
-
-        for (int step = 0; step < 10; step++) {
-            rb.ensureRemaining(100);
-            for (long i = 0; i < 100; i++) {
-                rb.addUnsafe(i);
-            }
-
-            if (step % 2 == 0) {
-                rb.evaluate();
-            }
-
-            try {
-                long[] values = rb.remove(101);
-                fail("popping more values than size() should fail");
-            } catch (NoSuchElementException x) {
-                // expected
-            }
-
-            long[] values = rb.remove(100);
-            for (long i = 0; i < 100; i++) {
-                assertEquals(values[(int) i], i);
-            }
-            assertEmpty(rb);
-        }
-    }
-
-    public void testSpecialCaseA() {
-        // overlapping push and pop ranges with popTail < pushTail
-        final AggregatingLongRingBuffer rb = new AggregatingLongRingBuffer(4, (long) 0, (a, b) -> (long) (a + b));
-        rb.add((long) 1);
-        assertEquals((long) 1, rb.remove());
-        rb.add((long) 2);
-        rb.add((long) 3);
-        assertEquals((long) 5, rb.evaluate());
-    }
-
-    public void testSpecialCaseB() {
-        // push the full capacity while wrapped
-        final AggregatingLongRingBuffer rb = new AggregatingLongRingBuffer(64, (long) 0, (a, b) -> (long) (a + b));
-        rb.add((long) 1);
-        assertEquals((long) 1, rb.remove());
-
-        for (int i = 0; i < 64; i++) {
-            rb.add((long) 1);
-        }
-        assertEquals((long) 64, rb.evaluate());
-    }
-
-    public void testSpecialCaseC() {
-        // overlapping push and pop ranges with popTail < pushTail
-        final AggregatingLongRingBuffer rb = new AggregatingLongRingBuffer(16, (long) 0, (a, b) -> (long) (a + b));
-        // move pointers to middle of storage
-        for (int i = 0; i < 8; i++) {
-            rb.add((long) 1);
-            rb.remove();
-        }
-        assertEquals((long) 0, rb.evaluate());
-
-        for (int i = 0; i < 11; i++) {
-            rb.add((long) 1);
-        }
-        rb.remove();
-        assertEquals((long) 10, rb.evaluate());
-    }
-}
diff --git a/Base/src/test/java/io/deephaven/base/ringbuffer/AggregatingObjectRingBufferTest.java b/Base/src/test/java/io/deephaven/base/ringbuffer/AggregatingObjectRingBufferTest.java
deleted file mode 100644
index 0f226b6e18d..00000000000
--- a/Base/src/test/java/io/deephaven/base/ringbuffer/AggregatingObjectRingBufferTest.java
+++ /dev/null
@@ -1,348 +0,0 @@
-//
-// Copyright (c) 2016-2024 Deephaven Data Labs and Patent Pending
-//
-package io.deephaven.base.ringbuffer;
-
-import junit.framework.TestCase;
-
-import java.math.BigInteger;
-import java.util.NoSuchElementException;
-import java.util.Random;
-
-public class AggregatingObjectRingBufferTest extends TestCase {
-
-    private void assertEmpty(AggregatingObjectRingBuffer rb) {
-        assertTrue(rb.isEmpty());
-        assertEquals(0, rb.size());
-
-        try {
-            rb.remove();
-            fail("queue should be empty");
-        } catch (NoSuchElementException x) {
-            // expected
-        }
-
-        try {
-            rb.element();
-            fail("queue should be empty");
-        } catch (NoSuchElementException x) {
-            // expected
-        }
-    }
-
-    public void testLargeAmounts() {
-        final BigInteger id = BigInteger.valueOf(0);
-        final AggregatingObjectRingBuffer<BigInteger> rb = new AggregatingObjectRingBuffer<>(3, id,
-                BigInteger::add);
-
-        // move the head and tail off zero
-        for (int i = 0; i < 1000; i++) {
-            rb.add(BigInteger.valueOf(i));
-        }
-        for (int i = 0; i < 1000; i++) {
-            rb.remove();
-        }
-
-        for (int i = 0; i < 10_000; i++)
-            rb.add(BigInteger.valueOf(i));
-
-        for (int i = 10_000; i < 1_000_000; i++) {
-            rb.add(BigInteger.valueOf(i));
-            assertEquals(BigInteger.valueOf(i - 10_000 + 1), rb.front(1));
-            assertEquals(BigInteger.valueOf(i - 10_000), rb.remove());
-            assertEquals(rb.remaining(), rb.capacity() - rb.size());
-        }
-    }
-
-    public void testEvaluateMinLargeAmounts() {
-        final BigInteger id = BigInteger.valueOf(Long.MAX_VALUE);
-        final AggregatingObjectRingBuffer<BigInteger> rb = new AggregatingObjectRingBuffer<>(3, id,
-                BigInteger::min);
-        for (int i = 0; i < 10_000; i++)
-            rb.add(BigInteger.valueOf(i));
-
-        for (int i = 10_000; i < 1_000_000; i++) {
-            rb.add(BigInteger.valueOf(i));
-            assertEquals(BigInteger.valueOf(i - 10_000 + 1), rb.front(1));
-            assertEquals(BigInteger.valueOf(i - 10_000), rb.evaluate()); // front of queue is min
-            assertEquals(BigInteger.valueOf(i - 10_000), rb.remove());
-        }
-    }
-
-    public void testEvaluateMaxLargeAmounts() {
-        final BigInteger id = BigInteger.valueOf(Long.MIN_VALUE);
-        final AggregatingObjectRingBuffer<BigInteger> rb = new AggregatingObjectRingBuffer<>(3, id,
-                BigInteger::max);
-        for (int i = 0; i < 10_000; i++)
-            rb.add(BigInteger.valueOf(i));
-
-        for (int i = 10_000; i < 1_000_000; i++) {
-            rb.add(BigInteger.valueOf(i));
-            assertEquals(BigInteger.valueOf(i - 10_000 + 1), rb.front(1));
-            assertEquals(BigInteger.valueOf(i), rb.evaluate()); // last value added is max
-            assertEquals(BigInteger.valueOf(i - 10_000), rb.remove());
-        }
-    }
-
-    // region non-byte-tests
-
-    public void testEvaluateSumLargeAmounts() {
-        final BigInteger id = BigInteger.valueOf(0);
-        final AggregatingObjectRingBuffer<BigInteger> rb = new AggregatingObjectRingBuffer<>(3, id,
-                BigInteger::add);
-        BigInteger runningSum = BigInteger.valueOf(0);
-
-        for (int i = 0; i < 1_000; i++) {
-            BigInteger val = BigInteger.valueOf(i);
-            rb.add(val);
-            runningSum = runningSum.add(val);
-        }
-
-        // stay small enough to avoid Objecting errors but prove the concept
-        for (int i = 1_000; i < 10_000; i++) {
-            BigInteger val = BigInteger.valueOf(i);
-            rb.add(val);
-            runningSum = runningSum.add(val);
-
-            assertEquals(BigInteger.valueOf(i - 1_000 + 1), rb.front(1));
-
-            assertEquals(runningSum, rb.evaluate());
-
-            assertEquals(BigInteger.valueOf(i - 1_000), rb.remove());
-            runningSum = runningSum.subtract(BigInteger.valueOf(i - 1_000));
-
-            assertEquals(runningSum, rb.evaluate());
-        }
-    }
-
-    /***
-     * Return the sum of 0 to N-1
-     */
-    private int sum0toN(int n) {
-        if (n == 0) {
-            return 0; // not negative zero, sigh
-        }
-        return (n * (n - 1) / 2);
-    }
-
-    public void testEvaluationEdgeCase() {
-        final BigInteger id = BigInteger.valueOf(0);
-        AggregatingObjectRingBuffer<BigInteger> rb = new AggregatingObjectRingBuffer<>(512, id,
-                BigInteger::add);
-
-        rb.addIdentityValue();
-        assertEquals(id, rb.evaluate());
-        rb.clear();
-
-        final int PRIME = 97;
-        final int PRIME_SUM = sum0toN(PRIME);
-        final Random rnd = new Random(0xDEADBEEF);
-
-        // specific test for push or wrap around
-        for (int step = 0; step < 100; step++) {
-            for (int i = 0; i < PRIME; i++) {
-                rb.addUnsafe(BigInteger.valueOf(i));
-            }
-            assertEquals(BigInteger.valueOf(PRIME_SUM), rb.evaluate());
-
-            for (int i = 0; i < PRIME; i++) {
-                rb.removeUnsafe();
-            }
-            assertEquals(id, rb.evaluate());
-            // not a copy/paste error, call this twice
-            assertEquals(id, rb.evaluate());
-        }
-
-        // specific test for push & wrap around
-        for (int step = 0; step < 100; step++) {
-            for (int i = 0; i < PRIME; i++) {
-                rb.addUnsafe(BigInteger.valueOf(i));
-            }
-            for (int i = 0; i < PRIME; i++) {
-                rb.removeUnsafe();
-            }
-            assertEquals(id, rb.evaluate());
-            // not a copy/paste error, call this twice
-            assertEquals(id, rb.evaluate());
-        }
-
-        // push random amounts and test
-        for (int step = 0; step < 100; step++) {
-            final int OFFSET = rnd.nextInt(PRIME);
-
-            for (int i = 0; i < OFFSET; i++) {
-                rb.addUnsafe(BigInteger.valueOf(i));
-            }
-            assertEquals(BigInteger.valueOf(sum0toN(OFFSET)), rb.evaluate());
-
-            for (int i = OFFSET; i < PRIME; i++) {
-                rb.addUnsafe(BigInteger.valueOf(i));
-            }
-            assertEquals(BigInteger.valueOf(PRIME_SUM), rb.evaluate());
-
-            for (int i = 0; i < PRIME; i++) {
-                rb.removeUnsafe();
-            }
-            assertEquals(id, rb.evaluate());
-        }
-
-        // pop random amounts and test
-        for (int step = 0; step < 100; step++) {
-            final int OFFSET = rnd.nextInt(PRIME);
-            for (int i = 0; i < PRIME; i++) {
-                rb.addUnsafe(BigInteger.valueOf(i));
-            }
-            assertEquals(BigInteger.valueOf(PRIME_SUM), rb.evaluate());
-
-            for (int i = 0; i < OFFSET; i++) {
-                rb.removeUnsafe();
-            }
-            assertEquals(BigInteger.valueOf(PRIME_SUM - sum0toN(OFFSET)), rb.evaluate());
-
-            for (int i = 0; i < (PRIME - OFFSET); i++) {
-                rb.removeUnsafe();
-            }
-            assertEquals(id, rb.evaluate());
-        }
-
-
-        rb.clear();
-        // need to get the buffer to state where we have clean pushes and a wrapped pop
-
-        // move the pointers close to the end
-        for (int i = 0; i < 500; i++) {
-            rb.addUnsafe(BigInteger.valueOf(i));
-            rb.removeUnsafe();
-        }
-        assertEquals(id, rb.evaluate());
-        assertEmpty(rb);
-
-        // push past the end
-        for (int i = 0; i < 200; i++) {
-            rb.addUnsafe(BigInteger.valueOf(i));
-        }
-        assertEquals(BigInteger.valueOf(sum0toN(200)), rb.evaluate());
-
-        // one more push to dirty the pushes
-        rb.addUnsafe(BigInteger.valueOf(201));
-
-        // pop past the end
-        for (int i = 0; i < 200; i++) {
-            rb.removeUnsafe();
-        }
-
-        // only thing in the buffer is the final push
-        assertEquals(BigInteger.valueOf(201), rb.evaluate());
-    }
-    // endregion non-byte-tests
-
-    public void testPushPopUnsafe() {
-        final BigInteger id = BigInteger.valueOf(Long.MIN_VALUE);
-        final AggregatingObjectRingBuffer<BigInteger> rb = new AggregatingObjectRingBuffer<>(512, id,
-                BigInteger::max);
-
-        // move the head and tail off zero
-        rb.ensureRemaining(100);
-        for (int i = 0; i < 100; i++) {
-            rb.addUnsafe(BigInteger.valueOf(i));
-        }
-        for (int i = 0; i < 100; i++) {
-            assertEquals(rb.removeUnsafe(), BigInteger.valueOf(i));
-        }
-
-        // do it again with an offset
-        rb.ensureRemaining(100);
-        for (int i = 0; i < 100; i++) {
-            rb.addUnsafe(BigInteger.valueOf(i + 1000));
-        }
-        for (int i = 0; i < 100; i++) {
-            assertEquals(rb.removeUnsafe(), BigInteger.valueOf(i + 1000));
-        }
-
-        for (int i = 0; i < 100; i++) {
-            rb.addUnsafe(BigInteger.valueOf(i + 1000));
-        }
-        rb.clear();
-
-        for (int i = 0; i < 100; i++) {
-            rb.addUnsafe(BigInteger.valueOf(i));
-        }
-        assertEquals(BigInteger.valueOf(99), rb.evaluate()); // last value added is max
-    }
-
-    public void testPopMultiple() {
-        final BigInteger id = BigInteger.valueOf(0);
-        AggregatingObjectRingBuffer<BigInteger> rb = new AggregatingObjectRingBuffer<>(512, id,
-                BigInteger::add);
-
-        for (int step = 0; step < 10; step++) {
-            rb.ensureRemaining(100);
-            for (int i = 0; i < 100; i++) {
-                rb.addUnsafe(BigInteger.valueOf(i));
-            }
-
-            if (step % 2 == 0) {
-                rb.evaluate();
-            }
-
-            try {
-                Object[] values = rb.remove(101);
-                fail("popping more values than size() should fail");
-            } catch (NoSuchElementException x) {
-                // expected
-            }
-
-            Object[] values = rb.remove(100);
-            for (int i = 0; i < 100; i++) {
-                assertEquals(values[i], BigInteger.valueOf(i));
-            }
-            assertEmpty(rb);
-        }
-    }
-
-    public void testSpecialCaseA() {
-        // overlapping push and pop ranges with popTail < pushTail
-        final BigInteger id = BigInteger.valueOf(0);
-        AggregatingObjectRingBuffer<BigInteger> rb = new AggregatingObjectRingBuffer<>(4, id,
-                BigInteger::add);
-        rb.add(BigInteger.valueOf(1));
-        assertEquals(BigInteger.valueOf(1), rb.remove());
-
-        rb.add(BigInteger.valueOf(2));
-        rb.add(BigInteger.valueOf(3));
-        assertEquals(BigInteger.valueOf(5), rb.evaluate());
-    }
-
-    public void testSpecialCaseB() {
-        // push the full capacity while wrapped
-        final BigInteger id = BigInteger.valueOf(0);
-        AggregatingObjectRingBuffer<BigInteger> rb = new AggregatingObjectRingBuffer<>(64, id,
-                BigInteger::add);
-        rb.add(BigInteger.valueOf(1));
-        assertEquals(BigInteger.valueOf(1), rb.remove());
-
-        for (int i = 0; i < 64; i++) {
-            rb.add(BigInteger.valueOf(1));
-        }
-        assertEquals(BigInteger.valueOf(64), rb.evaluate());
-    }
-
-    public void testSpecialCaseC() {
-        // overlapping push and pop ranges with popTail < pushTail
-        final BigInteger id = BigInteger.valueOf(0);
-        AggregatingObjectRingBuffer<BigInteger> rb = new AggregatingObjectRingBuffer<>(16, id,
-                BigInteger::add);
-        // move pointers to middle of storage
-        for (int i = 0; i < 8; i++) {
-            rb.add(BigInteger.valueOf(1));
-            rb.remove();
-        }
-        assertEquals(BigInteger.valueOf(0), rb.evaluate());
-
-        for (int i = 0; i < 11; i++) {
-            rb.add(BigInteger.valueOf(1));
-        }
-        rb.remove();
-        assertEquals(BigInteger.valueOf(10), rb.evaluate());
-    }
-}
diff --git a/Base/src/test/java/io/deephaven/base/ringbuffer/AggregatingShortRingBufferTest.java b/Base/src/test/java/io/deephaven/base/ringbuffer/AggregatingShortRingBufferTest.java
deleted file mode 100644
index fe77b88efb3..00000000000
--- a/Base/src/test/java/io/deephaven/base/ringbuffer/AggregatingShortRingBufferTest.java
+++ /dev/null
@@ -1,333 +0,0 @@
-//
-// Copyright (c) 2016-2024 Deephaven Data Labs and Patent Pending
-//
-// ****** AUTO-GENERATED CLASS - DO NOT EDIT MANUALLY
-// ****** Edit AggregatingCharRingBufferTest and run "./gradlew replicateRingBuffers" to regenerate
-//
-// @formatter:off
-package io.deephaven.base.ringbuffer;
-
-import junit.framework.TestCase;
-
-import java.util.NoSuchElementException;
-import java.util.Random;
-
-public class AggregatingShortRingBufferTest extends TestCase {
-
-    private void assertEmpty(AggregatingShortRingBuffer rb) {
-        assertTrue(rb.isEmpty());
-        assertEquals(0, rb.size());
-
-        try {
-            rb.remove();
-            fail("queue should be empty");
-        } catch (NoSuchElementException x) {
-            // expected
-        }
-
-        try {
-            rb.element();
-            fail("queue should be empty");
-        } catch (NoSuchElementException x) {
-            // expected
-        }
-    }
-
-    public void testLargeAmounts() {
-        final AggregatingShortRingBuffer rb = new AggregatingShortRingBuffer(3, (short) 0, (a, b) -> (short) (a + b));
-
-        // move the head and tail off zero
-        for (int i = 0; i < 1000; i++) {
-            rb.add((short) i);
-        }
-        for (int i = 0; i < 1000; i++) {
-            rb.remove();
-        }
-
-        for (int i = 0; i < 10_000; i++)
-            rb.add((short) i);
-
-        for (int i = 10_000; i < 1_000_000; i++) {
-            rb.add((short) i);
-            assertEquals((short) (i - 10_000 + 1), rb.front(1));
-            assertEquals((short) (i - 10_000), rb.remove());
-            assertEquals(rb.remaining(), rb.capacity() - rb.size());
-        }
-    }
-
-    public void testEvaluateMinLargeAmounts() {
-        final AggregatingShortRingBuffer rb =
-                new AggregatingShortRingBuffer(3, Short.MAX_VALUE, (a, b) -> (short) Math.min(a, b));
-        for (int i = 0; i < 10_000; i++)
-            rb.add((short) i);
-
-        final int maxVal = (int) Math.min(Short.MAX_VALUE, 1_000_000);
-
-        for (int i = 10_000; i < maxVal; i++) {
-            rb.add((short) i);
-            assertEquals((short) (i - 10_000) + 1, rb.front(1));
-            assertEquals((short) (i - 10_000), rb.evaluate()); // front of queue is min
-            assertEquals((short) (i - 10_000), rb.remove());
-        }
-    }
-
-    public void testEvaluateMaxLargeAmounts() {
-        final AggregatingShortRingBuffer rb =
-                new AggregatingShortRingBuffer(3, Short.MIN_VALUE, (a, b) -> (short) Math.max(a, b));
-        for (int i = 0; i < 10_000; i++)
-            rb.add((short) i);
-
-        final int maxVal = (int) Math.min(Short.MAX_VALUE, 1_000_000);
-
-        for (int i = 10_000; i < maxVal; i++) {
-            rb.add((short) i);
-            assertEquals((short) (i - 10_000 + 1), rb.front(1));
-            assertEquals((short) i, rb.evaluate()); // last value added is max
-            assertEquals((short) (i - 10_000), rb.remove());
-        }
-    }
-
-    // region non-byte-tests
-
-    public void testEvaluateSumLargeAmounts() {
-        final AggregatingShortRingBuffer rb = new AggregatingShortRingBuffer(3, (short) 0, (a, b) -> (short) (a + b));
-        short runningSum = (short) 0;
-
-        for (short i = 0; i < 1_000; i++) {
-            rb.add(i);
-            runningSum += i;
-        }
-
-        // stay small enough to avoid shorting errors but prove the concept
-        for (short i = 1_000; i < 10_000; i++) {
-            rb.add(i);
-            runningSum += i; // add the current value
-            assertEquals((short) (i - 1_000 + 1), rb.front(1));
-
-            assertEquals(runningSum, rb.evaluate());
-
-            assertEquals((short) (i - 1_000), rb.remove());
-            runningSum -= i - 1_000; // remove the value 1_0000 ago
-
-            assertEquals(runningSum, rb.evaluate());
-        }
-    }
-
-    /***
-     * Return the sum of 0 to N-1
-     */
-    private short sum0toN(short n) {
-        if (n == (short) 0) {
-            return (short) 0; // not negative zero, sigh
-        }
-        return (short) (n * (n - 1) / 2);
-    }
-
-    public void testEvaluationEdgeCase() {
-        AggregatingShortRingBuffer rb = new AggregatingShortRingBuffer(512, (short) 0, (a, b) -> (short) (a + b));
-
-        rb.addIdentityValue();
-        assertEquals((short) 0, rb.evaluate());
-        rb.clear();
-
-        final short PRIME = (short) 97;
-        final short PRIME_SUM = sum0toN(PRIME);
-        final Random rnd = new Random(0xDEADBEEF);
-
-        // specific test for push or wrap around
-        for (int step = 0; step < 100; step++) {
-            for (short i = 0; i < PRIME; i++) {
-                rb.addUnsafe(i);
-            }
-            assertEquals(PRIME_SUM, rb.evaluate());
-
-            for (short i = 0; i < PRIME; i++) {
-                rb.removeUnsafe();
-            }
-            assertEquals((short) 0, rb.evaluate());
-            // not a copy/paste error, call this twice
-            assertEquals((short) 0, rb.evaluate());
-        }
-
-        // specific test for push & wrap around
-        for (int step = 0; step < 100; step++) {
-            for (short i = 0; i < PRIME; i++) {
-                rb.addUnsafe(i);
-            }
-            for (short i = 0; i < PRIME; i++) {
-                rb.removeUnsafe();
-            }
-            assertEquals((short) 0, rb.evaluate());
-            // not a copy/paste error, call this twice
-            assertEquals((short) 0, rb.evaluate());
-        }
-
-        // push random amounts and test
-        for (int step = 0; step < 100; step++) {
-            final short OFFSET = (short) rnd.nextInt((int) PRIME);
-
-            for (short i = 0; i < OFFSET; i++) {
-                rb.addUnsafe(i);
-            }
-            assertEquals(sum0toN(OFFSET), rb.evaluate());
-
-            for (short i = OFFSET; i < PRIME; i++) {
-                rb.addUnsafe(i);
-            }
-            assertEquals(PRIME_SUM, rb.evaluate());
-
-            for (short i = 0; i < PRIME; i++) {
-                rb.removeUnsafe();
-            }
-            assertEquals((short) 0, rb.evaluate());
-        }
-
-        // pop random amounts and test
-        for (int step = 0; step < 100; step++) {
-            final short OFFSET = (short) rnd.nextInt((int) PRIME);
-            for (short i = 0; i < PRIME; i++) {
-                rb.addUnsafe(i);
-            }
-            assertEquals(PRIME_SUM, rb.evaluate());
-
-            for (short i = 0; i < OFFSET; i++) {
-                rb.removeUnsafe();
-            }
-            assertEquals(PRIME_SUM - sum0toN(OFFSET), rb.evaluate());
-
-            for (short i = 0; i < (PRIME - OFFSET); i++) {
-                rb.removeUnsafe();
-            }
-            assertEquals((short) 0, rb.evaluate());
-        }
-
-
-        rb = new AggregatingShortRingBuffer(512, (short) 0, (a, b) -> (short) (a + b));
-        // need to get the buffer to state where we have clean pushes and a wrapped pop
-
-        // move the pointers close to the end
-        for (short i = 0; i < 500; i++) {
-            rb.addUnsafe(i);
-            rb.removeUnsafe();
-        }
-        assertEquals((short) 0, rb.evaluate());
-        assertEmpty(rb);
-
-        // push past the end
-        for (short i = 0; i < 200; i++) {
-            rb.addUnsafe(i);
-        }
-        assertEquals(sum0toN((short) 200), rb.evaluate());
-
-        // one more push to dirty the pushes
-        rb.addUnsafe((short) 201);
-
-        // pop past the end
-        for (short i = 0; i < 200; i++) {
-            rb.removeUnsafe();
-        }
-
-        // only thing in the buffer is the final push
-        assertEquals((short) 201, rb.evaluate());
-    }
-    // endregion non-byte-tests
-
-    public void testPushPopUnsafe() {
-        final AggregatingShortRingBuffer rb =
-                new AggregatingShortRingBuffer(3, (short) -Short.MAX_VALUE, (a, b) -> (short) Math.max(a, b));
-        // move the head and tail off zero
-        rb.ensureRemaining(100);
-        for (short i = 0; i < 100; i++) {
-            rb.addUnsafe(i);
-        }
-        for (short i = 0; i < 100; i++) {
-            assertEquals(rb.removeUnsafe(), i);
-        }
-
-        // do it again with an offset
-        rb.ensureRemaining(100);
-        for (short i = 0; i < 100; i++) {
-            rb.addUnsafe((short) (i + (short) 1000));
-        }
-        for (short i = 0; i < 100; i++) {
-            assertEquals(rb.removeUnsafe(), i + (short) 1000);
-        }
-
-        for (short i = 0; i < 100; i++) {
-            rb.addUnsafe((short) (i + (short) 1000));
-        }
-        rb.clear();
-
-        for (short i = 0; i < 100; i++) {
-            rb.add(i);
-        }
-        assertEquals((short) 99, rb.evaluate()); // last value added is max
-    }
-
-    public void testPopMultiple() {
-        final AggregatingShortRingBuffer rb = new AggregatingShortRingBuffer(3, (short) 0, (a, b) -> (short) (a + b));
-
-        for (int step = 0; step < 10; step++) {
-            rb.ensureRemaining(100);
-            for (short i = 0; i < 100; i++) {
-                rb.addUnsafe(i);
-            }
-
-            if (step % 2 == 0) {
-                rb.evaluate();
-            }
-
-            try {
-                short[] values = rb.remove(101);
-                fail("popping more values than size() should fail");
-            } catch (NoSuchElementException x) {
-                // expected
-            }
-
-            short[] values = rb.remove(100);
-            for (short i = 0; i < 100; i++) {
-                assertEquals(values[(int) i], i);
-            }
-            assertEmpty(rb);
-        }
-    }
-
-    public void testSpecialCaseA() {
-        // overlapping push and pop ranges with popTail < pushTail
-        final AggregatingShortRingBuffer rb = new AggregatingShortRingBuffer(4, (short) 0, (a, b) -> (short) (a + b));
-        rb.add((short) 1);
-        assertEquals((short) 1, rb.remove());
-        rb.add((short) 2);
-        rb.add((short) 3);
-        assertEquals((short) 5, rb.evaluate());
-    }
-
-    public void testSpecialCaseB() {
-        // push the full capacity while wrapped
-        final AggregatingShortRingBuffer rb = new AggregatingShortRingBuffer(64, (short) 0, (a, b) -> (short) (a + b));
-        rb.add((short) 1);
-        assertEquals((short) 1, rb.remove());
-
-        for (int i = 0; i < 64; i++) {
-            rb.add((short) 1);
-        }
-        assertEquals((short) 64, rb.evaluate());
-    }
-
-    public void testSpecialCaseC() {
-        // overlapping push and pop ranges with popTail < pushTail
-        final AggregatingShortRingBuffer rb = new AggregatingShortRingBuffer(16, (short) 0, (a, b) -> (short) (a + b));
-        // move pointers to middle of storage
-        for (int i = 0; i < 8; i++) {
-            rb.add((short) 1);
-            rb.remove();
-        }
-        assertEquals((short) 0, rb.evaluate());
-
-        for (int i = 0; i < 11; i++) {
-            rb.add((short) 1);
-        }
-        rb.remove();
-        assertEquals((short) 10, rb.evaluate());
-    }
-}
diff --git a/Base/src/test/java/io/deephaven/base/ringbuffer/ByteRingBufferTest.java b/Base/src/test/java/io/deephaven/base/ringbuffer/ByteRingBufferTest.java
deleted file mode 100644
index 14e22525eb0..00000000000
--- a/Base/src/test/java/io/deephaven/base/ringbuffer/ByteRingBufferTest.java
+++ /dev/null
@@ -1,559 +0,0 @@
-//
-// Copyright (c) 2016-2024 Deephaven Data Labs and Patent Pending
-//
-// ****** AUTO-GENERATED CLASS - DO NOT EDIT MANUALLY
-// ****** Edit CharRingBufferTest and run "./gradlew replicateRingBuffers" to regenerate
-//
-// @formatter:off
-package io.deephaven.base.ringbuffer;
-
-import io.deephaven.base.ArrayUtil;
-import io.deephaven.base.verify.AssertionFailure;
-import junit.framework.TestCase;
-
-import java.util.NoSuchElementException;
-
-import static org.junit.Assert.assertThrows;
-
-public class ByteRingBufferTest extends TestCase {
-
-    final byte SENTINEL = Byte.MIN_VALUE;
-
-    private void assertEmpty(ByteRingBuffer rb) {
-        assertTrue(rb.isEmpty());
-        assertEquals(0, rb.size());
-
-        assertEquals(SENTINEL, rb.peek(SENTINEL));
-        try {
-            rb.element();
-            fail("queue should be empty");
-        } catch (NoSuchElementException x) {
-            // expected
-        }
-
-        assertEquals(SENTINEL, rb.poll(SENTINEL));
-        try {
-            rb.remove();
-            fail("queue should be empty");
-        } catch (NoSuchElementException x) {
-            // expected
-        }
-    }
-
-    private void assertFull(ByteRingBuffer rb) {
-        assertFalse(rb.isEmpty());
-        assertEquals(rb.capacity(), rb.size());
-    }
-
-    private void assertNotEmpty(ByteRingBuffer rb, int expectedSize, byte expectedHead) {
-        assertFalse(rb.isEmpty());
-        assertEquals(expectedSize, rb.size());
-
-        assertEquals(expectedHead, rb.peek(SENTINEL));
-        try {
-            assertEquals(expectedHead, rb.element());
-        } catch (NoSuchElementException x) {
-            fail("queue should not be empty");
-        }
-    }
-
-    private void assertAdd(ByteRingBuffer rb, byte newHead, int expectedSize, byte expectedHead) {
-        assertTrue(rb.add(newHead));
-        assertNotEmpty(rb, expectedSize, expectedHead);
-    }
-
-    private void assertOffer(ByteRingBuffer rb, byte newHead, int expectedSize, byte expectedHead) {
-        assertTrue(rb.offer(newHead));
-        assertNotEmpty(rb, expectedSize, expectedHead);
-    }
-
-    private void assertPoll(ByteRingBuffer rb, int expectedSize, byte expectedHead) {
-        assertNotEmpty(rb, expectedSize, expectedHead);
-        assertEquals(expectedHead, rb.poll(SENTINEL));
-    }
-
-    private void assertRemove(ByteRingBuffer rb, int expectedSize, byte expectedHead) {
-        assertNotEmpty(rb, expectedSize, expectedHead);
-        try {
-            assertEquals(expectedHead, rb.remove());
-        } catch (NoSuchElementException x) {
-            fail("queue should not be empty");
-        }
-    }
-
-    private void assertContents(ByteRingBuffer rb, byte... expectedData) {
-        final byte[] data = rb.getAll();
-        assertEquals(data.length, expectedData.length);
-        for (int ii = 0; ii < data.length; ii++) {
-            assertEquals(data[ii], expectedData[ii]);
-        }
-    }
-
-    private void assertArrayEquals(byte[] data, byte... expectedData) {
-        assertEquals(data.length, expectedData.length);
-        for (int ii = 0; ii < data.length; ii++) {
-            assertEquals(data[ii], expectedData[ii]);
-        }
-    }
-
-    byte A = 'A';
-    byte B = 'B';
-    byte C = 'C';
-    byte D = 'D';
-    byte E = 'E';
-    byte F = 'F';
-
-    public void testAddRemove() {
-
-        ByteRingBuffer rb = new ByteRingBuffer(3);
-
-        assertEmpty(rb);
-
-        assertAdd(rb, A, 1, A);
-        assertAdd(rb, B, 2, A);
-        assertAdd(rb, C, 3, A);
-        assertContents(rb, A, B, C);
-
-        assertRemove(rb, 3, A);
-        assertContents(rb, B, C);
-
-        assertRemove(rb, 2, B);
-        assertContents(rb, C);
-
-        assertRemove(rb, 1, C);
-        assertContents(rb);
-
-        assertEmpty(rb);
-
-        assertAdd(rb, A, 1, A);
-        assertAdd(rb, B, 2, A);
-        assertContents(rb, A, B);
-
-        assertRemove(rb, 2, A);
-        assertContents(rb, B);
-
-        assertAdd(rb, C, 2, B);
-        assertContents(rb, B, C);
-
-        assertRemove(rb, 2, B);
-        assertContents(rb, C);
-
-        assertRemove(rb, 1, C);
-        assertContents(rb);
-
-        assertEmpty(rb);
-
-        assertAdd(rb, A, 1, A);
-        assertRemove(rb, 1, A);
-        assertEmpty(rb);
-        assertAdd(rb, B, 1, B);
-        assertRemove(rb, 1, B);
-        assertEmpty(rb);
-        assertAdd(rb, C, 1, C);
-        assertRemove(rb, 1, C);
-        assertEmpty(rb);
-
-        assertAdd(rb, D, 1, D);
-        assertRemove(rb, 1, D);
-        assertEmpty(rb);
-        assertAdd(rb, E, 1, E);
-        assertRemove(rb, 1, E);
-        assertEmpty(rb);
-        assertAdd(rb, F, 1, F);
-        assertRemove(rb, 1, F);
-        assertEmpty(rb);
-
-        assertAdd(rb, A, 1, A);
-        assertAdd(rb, B, 2, A);
-        assertAdd(rb, C, 3, A);
-        assertContents(rb, A, B, C);
-
-        assertAdd(rb, D, 4, A);
-        assertAdd(rb, E, 5, A);
-        assertAdd(rb, F, 6, A);
-        assertContents(rb, A, B, C, D, E, F);
-
-        assertRemove(rb, 6, A);
-        assertRemove(rb, 5, B);
-        assertRemove(rb, 4, C);
-        assertRemove(rb, 3, D);
-        assertRemove(rb, 2, E);
-        assertRemove(rb, 1, F);
-        assertContents(rb);
-        assertEmpty(rb);
-    }
-
-    public void testOfferPoll() {
-        ByteRingBuffer rb = new ByteRingBuffer(3);
-
-        assertEmpty(rb);
-
-        assertOffer(rb, A, 1, A);
-        assertOffer(rb, B, 2, A);
-        assertOffer(rb, C, 3, A);
-
-        assertPoll(rb, 3, A);
-        assertPoll(rb, 2, B);
-        assertPoll(rb, 1, C);
-        assertEmpty(rb);
-
-        assertOffer(rb, A, 1, A);
-        assertOffer(rb, B, 2, A);
-        assertPoll(rb, 2, A);
-        assertOffer(rb, C, 2, B);
-        assertPoll(rb, 2, B);
-        assertPoll(rb, 1, C);
-        assertEmpty(rb);
-
-        assertOffer(rb, A, 1, A);
-        assertPoll(rb, 1, A);
-        assertEmpty(rb);
-        assertOffer(rb, B, 1, B);
-        assertPoll(rb, 1, B);
-        assertEmpty(rb);
-        assertOffer(rb, C, 1, C);
-        assertPoll(rb, 1, C);
-        assertEmpty(rb);
-
-        assertOffer(rb, D, 1, D);
-        assertPoll(rb, 1, D);
-        assertEmpty(rb);
-        assertOffer(rb, E, 1, E);
-        assertPoll(rb, 1, E);
-        assertEmpty(rb);
-        assertOffer(rb, F, 1, F);
-        assertPoll(rb, 1, F);
-        assertEmpty(rb);
-
-        assertOffer(rb, A, 1, A);
-        assertOffer(rb, B, 2, A);
-        assertOffer(rb, C, 3, A);
-        assertOffer(rb, D, 4, A);
-
-        assertAdd(rb, E, 5, A); // need one add to grow it from 4 to 8
-        assertOffer(rb, F, 6, A);
-
-        assertPoll(rb, 6, A);
-        assertPoll(rb, 5, B);
-        assertPoll(rb, 4, C);
-        assertPoll(rb, 3, D);
-        assertPoll(rb, 2, E);
-        assertPoll(rb, 1, F);
-        assertEmpty(rb);
-    }
-
-    public void testGrowSimple() {
-        ByteRingBuffer rb = new ByteRingBuffer(4);
-
-        assertAdd(rb, A, 1, A);
-        assertAdd(rb, B, 2, A);
-        assertAdd(rb, C, 3, A);
-        assertAdd(rb, D, 4, A);
-        assertFull(rb);
-
-        // remove one so head != 0
-        assertRemove(rb, 4, A);
-
-        assertAdd(rb, E, 4, B);
-        // this will grow; the elements are in a single contiguous block
-        assertAdd(rb, F, 5, B);
-
-        assertRemove(rb, 5, B);
-        assertRemove(rb, 4, C);
-        assertRemove(rb, 3, D);
-        assertRemove(rb, 2, E);
-        assertRemove(rb, 1, F);
-        assertEmpty(rb);
-    }
-
-    public void testGrowComplex() {
-        ByteRingBuffer rb = new ByteRingBuffer(5);
-
-        assertAdd(rb, A, 1, A);
-        assertAdd(rb, B, 2, A);
-        assertAdd(rb, C, 3, A);
-        assertRemove(rb, 3, A);
-        assertRemove(rb, 2, B);
-        assertRemove(rb, 1, C);
-        assertEmpty(rb);
-
-        assertAdd(rb, A, 1, A);
-        assertAdd(rb, B, 2, A);
-        assertAdd(rb, C, 3, A);
-        assertAdd(rb, D, 4, A);
-        assertAdd(rb, E, 5, A);
-
-        // this will grow; the elements are in two blocks
-        assertAdd(rb, F, 6, A);
-
-        assertRemove(rb, 6, A);
-        assertRemove(rb, 5, B);
-        assertRemove(rb, 4, C);
-        assertRemove(rb, 3, D);
-        assertRemove(rb, 2, E);
-        assertRemove(rb, 1, F);
-        assertEmpty(rb);
-    }
-
-    public void testIterator() {
-        ByteRingBuffer rb = new ByteRingBuffer(3);
-
-        ByteRingBuffer.Iterator iter = rb.iterator();
-        assertFalse(iter.hasNext());
-
-        assertAdd(rb, A, 1, A);
-        assertAdd(rb, B, 2, A);
-        assertAdd(rb, C, 3, A);
-
-        iter = rb.iterator();
-        assertTrue(iter.hasNext());
-        assertEquals(A, iter.next());
-        assertTrue(iter.hasNext());
-        assertEquals(B, iter.next());
-        assertTrue(iter.hasNext());
-        assertEquals(C, iter.next());
-        assertFalse(iter.hasNext());
-
-        assertRemove(rb, 3, A);
-        assertAdd(rb, D, 3, B);
-
-        iter = rb.iterator();
-        assertTrue(iter.hasNext());
-        assertEquals(B, iter.next());
-        assertTrue(iter.hasNext());
-        assertEquals(C, iter.next());
-        assertTrue(iter.hasNext());
-        assertEquals(D, iter.next());
-        assertFalse(iter.hasNext());
-
-        assertRemove(rb, 3, B);
-
-        iter = rb.iterator();
-        assertEquals(C, iter.next());
-        assertEquals(D, iter.next());
-        assertFalse(iter.hasNext());
-
-        assertAdd(rb, E, 3, C);
-        assertAdd(rb, F, 4, C);
-
-        iter = rb.iterator();
-        assertTrue(iter.hasNext());
-        assertEquals(C, iter.next());
-        assertTrue(iter.hasNext());
-        assertEquals(D, iter.next());
-        assertTrue(iter.hasNext());
-        assertEquals(E, iter.next());
-        assertTrue(iter.hasNext());
-        assertEquals(F, iter.next());
-        assertFalse(iter.hasNext());
-
-        final ByteRingBuffer.Iterator iterFinal = rb.iterator();
-
-        assertThrows(UnsupportedOperationException.class,
-                iterFinal::remove);
-    }
-
-    public void testBack() {
-        ByteRingBuffer rb = new ByteRingBuffer(5);
-
-        assertAdd(rb, A, 1, A);
-        assertEquals(rb.back(), A);
-
-        assertAdd(rb, B, 2, A);
-        assertAdd(rb, C, 3, A);
-        assertEquals(rb.back(), C);
-    }
-
-    public void testBackWhenEmpty() {
-        ByteRingBuffer rb = new ByteRingBuffer(5);
-        try {
-            rb.back();
-            fail("expected a NoSuchElement exception");
-        } catch (NoSuchElementException x) {
-            // expected
-        }
-    }
-
-    public void testBackTailIsZero() {
-        ByteRingBuffer rb = new ByteRingBuffer(5, false);
-
-        assertAdd(rb, A, 1, A);
-        assertAdd(rb, B, 2, A);
-        assertAdd(rb, C, 3, A);
-        assertAdd(rb, D, 4, A);
-        assertAdd(rb, E, 5, A);
-
-        assertRemove(rb, 5, A);
-        assertAdd(rb, F, 5, B);
-        assertEquals(rb.back(), F);
-    }
-
-    public void testLargeAmounts() {
-        ByteRingBuffer rb = new ByteRingBuffer(3);
-
-        for (int i = 0; i < 100; i++)
-            rb.add((byte) i);
-
-        for (int i = 100; i < 200; i++) {
-            rb.add((byte) i);
-            assertEquals((byte) (i - 100 + 1), rb.front(1));
-            assertEquals((byte) (i - 100), rb.poll(SENTINEL));
-        }
-
-        for (int i = 200; i < 300; i++) {
-            if (i < 299)
-                assertEquals((byte) (i - 100 + 1), rb.front(1));
-            assertEquals((byte) (i - 100), rb.poll(SENTINEL));
-        }
-    }
-
-    public void testAddExceptionWhenFull() {
-        ByteRingBuffer rb = new ByteRingBuffer(4, false);
-        assert (rb.add(A));
-        assert (rb.add(B));
-        assert (rb.add(C));
-        assert (rb.add(D));
-
-        // this should throw
-        assertThrows(UnsupportedOperationException.class,
-                () -> rb.add(E));
-    }
-
-    public void testAddOverwriteAndOffer() {
-        ByteRingBuffer rb = new ByteRingBuffer(4, false);
-        assert (4 == rb.remaining());
-
-        assert (F == rb.addOverwrite(A, F));
-        assert (3 == rb.remaining());
-
-        assert (F == rb.addOverwrite(B, F));
-        assert (2 == rb.remaining());
-
-        assert (F == rb.addOverwrite(C, F));
-        assert (1 == rb.remaining());
-
-        assert (F == rb.addOverwrite(D, F));
-        assert (0 == rb.remaining());
-
-        assert (rb.isFull());
-
-        // now full, should return first value
-        assert (A == rb.addOverwrite(E, F));
-        assert (B == rb.addOverwrite(F, F));
-        assert (rb.isFull());
-
-        // offer() testing
-        assert (!rb.offer(A));
-        assert (C == rb.remove());
-        assert (rb.offer(A));
-
-        // peek testing
-        assert (D == rb.front());
-        assert (E == rb.front(1));
-        assert (F == rb.front(2));
-        // this should throw
-        assertThrows(NoSuchElementException.class,
-                () -> rb.front(99));
-
-        assert (A == rb.peekBack(B));
-
-        // clear() testing
-        rb.clear();
-        assert (rb.isEmpty());
-
-        assert (A == rb.peekBack(A));
-    }
-
-
-    public void testMultipleRemove() {
-        ByteRingBuffer rb = new ByteRingBuffer(10, false);
-
-        // this should throw
-        assertThrows(NoSuchElementException.class,
-                rb::remove);
-
-        // this should throw
-        assertThrows(NoSuchElementException.class,
-                () -> rb.remove(1));
-
-        rb.add(A);
-        rb.add(B);
-
-        byte[] values = rb.remove(2);
-        assertArrayEquals(values, A, B);
-        assertEmpty(rb);
-
-        rb.add(C);
-        rb.add(D);
-        rb.add(E);
-        rb.add(F);
-
-        values = rb.remove(2);
-        assertArrayEquals(values, C, D);
-
-        values = rb.remove(2);
-        assertArrayEquals(values, E, F);
-        assertEmpty(rb);
-
-        rb.add(A);
-        rb.add(B);
-        rb.add(C);
-        rb.add(D);
-        rb.add(E);
-        rb.add(F);
-
-        values = rb.remove(6);
-        assertArrayEquals(values, A, B, C, D, E, F);
-        assertEmpty(rb);
-    }
-
-    public void testAddRemoveUnsafe() {
-        ByteRingBuffer rbNoGrow = new ByteRingBuffer(3, false);
-
-        // this should throw
-        assertThrows(UnsupportedOperationException.class,
-                () -> rbNoGrow.ensureRemaining(10));
-
-        rbNoGrow.ensureRemaining(3);
-        rbNoGrow.addUnsafe(A);
-        rbNoGrow.addUnsafe(B);
-        rbNoGrow.addUnsafe(C);
-
-        assertContents(rbNoGrow, A, B, C);
-
-        assertEquals(rbNoGrow.removeUnsafe(), A);
-        assertContents(rbNoGrow, B, C);
-
-        assertEquals(rbNoGrow.removeUnsafe(), B);
-        assertContents(rbNoGrow, C);
-
-        assertEquals(rbNoGrow.removeUnsafe(), C);
-        assertEmpty(rbNoGrow);
-
-
-        ByteRingBuffer rbGrow = new ByteRingBuffer(3, true);
-
-        for (int size = 10; size < 1_000_000; size *= 10) {
-            rbGrow.ensureRemaining(size);
-            assert (rbGrow.remaining() >= size);
-            for (int i = 0; i < size; i++) {
-                rbGrow.addUnsafe(A);
-            }
-        }
-    }
-
-    public void testOverflow() {
-        ByteRingBuffer rbA = new ByteRingBuffer(0);
-        // this should throw
-        assertThrows(AssertionFailure.class,
-                () -> rbA.ensureRemaining(ArrayUtil.MAX_ARRAY_SIZE + 1));
-
-        ByteRingBuffer rbB = new ByteRingBuffer(100);
-        for (int i = 0; i < 100; i++) {
-            rbB.addUnsafe(A);
-        }
-        // this should throw
-        assertThrows(AssertionFailure.class,
-                () -> rbB.ensureRemaining(ArrayUtil.MAX_ARRAY_SIZE - 100 + 1));
-    }
-}
diff --git a/Base/src/test/java/io/deephaven/base/ringbuffer/CharRingBufferTest.java b/Base/src/test/java/io/deephaven/base/ringbuffer/CharRingBufferTest.java
deleted file mode 100644
index e548ea634bf..00000000000
--- a/Base/src/test/java/io/deephaven/base/ringbuffer/CharRingBufferTest.java
+++ /dev/null
@@ -1,555 +0,0 @@
-//
-// Copyright (c) 2016-2024 Deephaven Data Labs and Patent Pending
-//
-package io.deephaven.base.ringbuffer;
-
-import io.deephaven.base.ArrayUtil;
-import io.deephaven.base.verify.AssertionFailure;
-import junit.framework.TestCase;
-
-import java.util.NoSuchElementException;
-
-import static org.junit.Assert.assertThrows;
-
-public class CharRingBufferTest extends TestCase {
-
-    final char SENTINEL = Character.MIN_VALUE;
-
-    private void assertEmpty(CharRingBuffer rb) {
-        assertTrue(rb.isEmpty());
-        assertEquals(0, rb.size());
-
-        assertEquals(SENTINEL, rb.peek(SENTINEL));
-        try {
-            rb.element();
-            fail("queue should be empty");
-        } catch (NoSuchElementException x) {
-            // expected
-        }
-
-        assertEquals(SENTINEL, rb.poll(SENTINEL));
-        try {
-            rb.remove();
-            fail("queue should be empty");
-        } catch (NoSuchElementException x) {
-            // expected
-        }
-    }
-
-    private void assertFull(CharRingBuffer rb) {
-        assertFalse(rb.isEmpty());
-        assertEquals(rb.capacity(), rb.size());
-    }
-
-    private void assertNotEmpty(CharRingBuffer rb, int expectedSize, char expectedHead) {
-        assertFalse(rb.isEmpty());
-        assertEquals(expectedSize, rb.size());
-
-        assertEquals(expectedHead, rb.peek(SENTINEL));
-        try {
-            assertEquals(expectedHead, rb.element());
-        } catch (NoSuchElementException x) {
-            fail("queue should not be empty");
-        }
-    }
-
-    private void assertAdd(CharRingBuffer rb, char newHead, int expectedSize, char expectedHead) {
-        assertTrue(rb.add(newHead));
-        assertNotEmpty(rb, expectedSize, expectedHead);
-    }
-
-    private void assertOffer(CharRingBuffer rb, char newHead, int expectedSize, char expectedHead) {
-        assertTrue(rb.offer(newHead));
-        assertNotEmpty(rb, expectedSize, expectedHead);
-    }
-
-    private void assertPoll(CharRingBuffer rb, int expectedSize, char expectedHead) {
-        assertNotEmpty(rb, expectedSize, expectedHead);
-        assertEquals(expectedHead, rb.poll(SENTINEL));
-    }
-
-    private void assertRemove(CharRingBuffer rb, int expectedSize, char expectedHead) {
-        assertNotEmpty(rb, expectedSize, expectedHead);
-        try {
-            assertEquals(expectedHead, rb.remove());
-        } catch (NoSuchElementException x) {
-            fail("queue should not be empty");
-        }
-    }
-
-    private void assertContents(CharRingBuffer rb, char... expectedData) {
-        final char[] data = rb.getAll();
-        assertEquals(data.length, expectedData.length);
-        for (int ii = 0; ii < data.length; ii++) {
-            assertEquals(data[ii], expectedData[ii]);
-        }
-    }
-
-    private void assertArrayEquals(char[] data, char... expectedData) {
-        assertEquals(data.length, expectedData.length);
-        for (int ii = 0; ii < data.length; ii++) {
-            assertEquals(data[ii], expectedData[ii]);
-        }
-    }
-
-    char A = 'A';
-    char B = 'B';
-    char C = 'C';
-    char D = 'D';
-    char E = 'E';
-    char F = 'F';
-
-    public void testAddRemove() {
-
-        CharRingBuffer rb = new CharRingBuffer(3);
-
-        assertEmpty(rb);
-
-        assertAdd(rb, A, 1, A);
-        assertAdd(rb, B, 2, A);
-        assertAdd(rb, C, 3, A);
-        assertContents(rb, A, B, C);
-
-        assertRemove(rb, 3, A);
-        assertContents(rb, B, C);
-
-        assertRemove(rb, 2, B);
-        assertContents(rb, C);
-
-        assertRemove(rb, 1, C);
-        assertContents(rb);
-
-        assertEmpty(rb);
-
-        assertAdd(rb, A, 1, A);
-        assertAdd(rb, B, 2, A);
-        assertContents(rb, A, B);
-
-        assertRemove(rb, 2, A);
-        assertContents(rb, B);
-
-        assertAdd(rb, C, 2, B);
-        assertContents(rb, B, C);
-
-        assertRemove(rb, 2, B);
-        assertContents(rb, C);
-
-        assertRemove(rb, 1, C);
-        assertContents(rb);
-
-        assertEmpty(rb);
-
-        assertAdd(rb, A, 1, A);
-        assertRemove(rb, 1, A);
-        assertEmpty(rb);
-        assertAdd(rb, B, 1, B);
-        assertRemove(rb, 1, B);
-        assertEmpty(rb);
-        assertAdd(rb, C, 1, C);
-        assertRemove(rb, 1, C);
-        assertEmpty(rb);
-
-        assertAdd(rb, D, 1, D);
-        assertRemove(rb, 1, D);
-        assertEmpty(rb);
-        assertAdd(rb, E, 1, E);
-        assertRemove(rb, 1, E);
-        assertEmpty(rb);
-        assertAdd(rb, F, 1, F);
-        assertRemove(rb, 1, F);
-        assertEmpty(rb);
-
-        assertAdd(rb, A, 1, A);
-        assertAdd(rb, B, 2, A);
-        assertAdd(rb, C, 3, A);
-        assertContents(rb, A, B, C);
-
-        assertAdd(rb, D, 4, A);
-        assertAdd(rb, E, 5, A);
-        assertAdd(rb, F, 6, A);
-        assertContents(rb, A, B, C, D, E, F);
-
-        assertRemove(rb, 6, A);
-        assertRemove(rb, 5, B);
-        assertRemove(rb, 4, C);
-        assertRemove(rb, 3, D);
-        assertRemove(rb, 2, E);
-        assertRemove(rb, 1, F);
-        assertContents(rb);
-        assertEmpty(rb);
-    }
-
-    public void testOfferPoll() {
-        CharRingBuffer rb = new CharRingBuffer(3);
-
-        assertEmpty(rb);
-
-        assertOffer(rb, A, 1, A);
-        assertOffer(rb, B, 2, A);
-        assertOffer(rb, C, 3, A);
-
-        assertPoll(rb, 3, A);
-        assertPoll(rb, 2, B);
-        assertPoll(rb, 1, C);
-        assertEmpty(rb);
-
-        assertOffer(rb, A, 1, A);
-        assertOffer(rb, B, 2, A);
-        assertPoll(rb, 2, A);
-        assertOffer(rb, C, 2, B);
-        assertPoll(rb, 2, B);
-        assertPoll(rb, 1, C);
-        assertEmpty(rb);
-
-        assertOffer(rb, A, 1, A);
-        assertPoll(rb, 1, A);
-        assertEmpty(rb);
-        assertOffer(rb, B, 1, B);
-        assertPoll(rb, 1, B);
-        assertEmpty(rb);
-        assertOffer(rb, C, 1, C);
-        assertPoll(rb, 1, C);
-        assertEmpty(rb);
-
-        assertOffer(rb, D, 1, D);
-        assertPoll(rb, 1, D);
-        assertEmpty(rb);
-        assertOffer(rb, E, 1, E);
-        assertPoll(rb, 1, E);
-        assertEmpty(rb);
-        assertOffer(rb, F, 1, F);
-        assertPoll(rb, 1, F);
-        assertEmpty(rb);
-
-        assertOffer(rb, A, 1, A);
-        assertOffer(rb, B, 2, A);
-        assertOffer(rb, C, 3, A);
-        assertOffer(rb, D, 4, A);
-
-        assertAdd(rb, E, 5, A); // need one add to grow it from 4 to 8
-        assertOffer(rb, F, 6, A);
-
-        assertPoll(rb, 6, A);
-        assertPoll(rb, 5, B);
-        assertPoll(rb, 4, C);
-        assertPoll(rb, 3, D);
-        assertPoll(rb, 2, E);
-        assertPoll(rb, 1, F);
-        assertEmpty(rb);
-    }
-
-    public void testGrowSimple() {
-        CharRingBuffer rb = new CharRingBuffer(4);
-
-        assertAdd(rb, A, 1, A);
-        assertAdd(rb, B, 2, A);
-        assertAdd(rb, C, 3, A);
-        assertAdd(rb, D, 4, A);
-        assertFull(rb);
-
-        // remove one so head != 0
-        assertRemove(rb, 4, A);
-
-        assertAdd(rb, E, 4, B);
-        // this will grow; the elements are in a single contiguous block
-        assertAdd(rb, F, 5, B);
-
-        assertRemove(rb, 5, B);
-        assertRemove(rb, 4, C);
-        assertRemove(rb, 3, D);
-        assertRemove(rb, 2, E);
-        assertRemove(rb, 1, F);
-        assertEmpty(rb);
-    }
-
-    public void testGrowComplex() {
-        CharRingBuffer rb = new CharRingBuffer(5);
-
-        assertAdd(rb, A, 1, A);
-        assertAdd(rb, B, 2, A);
-        assertAdd(rb, C, 3, A);
-        assertRemove(rb, 3, A);
-        assertRemove(rb, 2, B);
-        assertRemove(rb, 1, C);
-        assertEmpty(rb);
-
-        assertAdd(rb, A, 1, A);
-        assertAdd(rb, B, 2, A);
-        assertAdd(rb, C, 3, A);
-        assertAdd(rb, D, 4, A);
-        assertAdd(rb, E, 5, A);
-
-        // this will grow; the elements are in two blocks
-        assertAdd(rb, F, 6, A);
-
-        assertRemove(rb, 6, A);
-        assertRemove(rb, 5, B);
-        assertRemove(rb, 4, C);
-        assertRemove(rb, 3, D);
-        assertRemove(rb, 2, E);
-        assertRemove(rb, 1, F);
-        assertEmpty(rb);
-    }
-
-    public void testIterator() {
-        CharRingBuffer rb = new CharRingBuffer(3);
-
-        CharRingBuffer.Iterator iter = rb.iterator();
-        assertFalse(iter.hasNext());
-
-        assertAdd(rb, A, 1, A);
-        assertAdd(rb, B, 2, A);
-        assertAdd(rb, C, 3, A);
-
-        iter = rb.iterator();
-        assertTrue(iter.hasNext());
-        assertEquals(A, iter.next());
-        assertTrue(iter.hasNext());
-        assertEquals(B, iter.next());
-        assertTrue(iter.hasNext());
-        assertEquals(C, iter.next());
-        assertFalse(iter.hasNext());
-
-        assertRemove(rb, 3, A);
-        assertAdd(rb, D, 3, B);
-
-        iter = rb.iterator();
-        assertTrue(iter.hasNext());
-        assertEquals(B, iter.next());
-        assertTrue(iter.hasNext());
-        assertEquals(C, iter.next());
-        assertTrue(iter.hasNext());
-        assertEquals(D, iter.next());
-        assertFalse(iter.hasNext());
-
-        assertRemove(rb, 3, B);
-
-        iter = rb.iterator();
-        assertEquals(C, iter.next());
-        assertEquals(D, iter.next());
-        assertFalse(iter.hasNext());
-
-        assertAdd(rb, E, 3, C);
-        assertAdd(rb, F, 4, C);
-
-        iter = rb.iterator();
-        assertTrue(iter.hasNext());
-        assertEquals(C, iter.next());
-        assertTrue(iter.hasNext());
-        assertEquals(D, iter.next());
-        assertTrue(iter.hasNext());
-        assertEquals(E, iter.next());
-        assertTrue(iter.hasNext());
-        assertEquals(F, iter.next());
-        assertFalse(iter.hasNext());
-
-        final CharRingBuffer.Iterator iterFinal = rb.iterator();
-
-        assertThrows(UnsupportedOperationException.class,
-                iterFinal::remove);
-    }
-
-    public void testBack() {
-        CharRingBuffer rb = new CharRingBuffer(5);
-
-        assertAdd(rb, A, 1, A);
-        assertEquals(rb.back(), A);
-
-        assertAdd(rb, B, 2, A);
-        assertAdd(rb, C, 3, A);
-        assertEquals(rb.back(), C);
-    }
-
-    public void testBackWhenEmpty() {
-        CharRingBuffer rb = new CharRingBuffer(5);
-        try {
-            rb.back();
-            fail("expected a NoSuchElement exception");
-        } catch (NoSuchElementException x) {
-            // expected
-        }
-    }
-
-    public void testBackTailIsZero() {
-        CharRingBuffer rb = new CharRingBuffer(5, false);
-
-        assertAdd(rb, A, 1, A);
-        assertAdd(rb, B, 2, A);
-        assertAdd(rb, C, 3, A);
-        assertAdd(rb, D, 4, A);
-        assertAdd(rb, E, 5, A);
-
-        assertRemove(rb, 5, A);
-        assertAdd(rb, F, 5, B);
-        assertEquals(rb.back(), F);
-    }
-
-    public void testLargeAmounts() {
-        CharRingBuffer rb = new CharRingBuffer(3);
-
-        for (int i = 0; i < 100; i++)
-            rb.add((char) i);
-
-        for (int i = 100; i < 200; i++) {
-            rb.add((char) i);
-            assertEquals((char) (i - 100 + 1), rb.front(1));
-            assertEquals((char) (i - 100), rb.poll(SENTINEL));
-        }
-
-        for (int i = 200; i < 300; i++) {
-            if (i < 299)
-                assertEquals((char) (i - 100 + 1), rb.front(1));
-            assertEquals((char) (i - 100), rb.poll(SENTINEL));
-        }
-    }
-
-    public void testAddExceptionWhenFull() {
-        CharRingBuffer rb = new CharRingBuffer(4, false);
-        assert (rb.add(A));
-        assert (rb.add(B));
-        assert (rb.add(C));
-        assert (rb.add(D));
-
-        // this should throw
-        assertThrows(UnsupportedOperationException.class,
-                () -> rb.add(E));
-    }
-
-    public void testAddOverwriteAndOffer() {
-        CharRingBuffer rb = new CharRingBuffer(4, false);
-        assert (4 == rb.remaining());
-
-        assert (F == rb.addOverwrite(A, F));
-        assert (3 == rb.remaining());
-
-        assert (F == rb.addOverwrite(B, F));
-        assert (2 == rb.remaining());
-
-        assert (F == rb.addOverwrite(C, F));
-        assert (1 == rb.remaining());
-
-        assert (F == rb.addOverwrite(D, F));
-        assert (0 == rb.remaining());
-
-        assert (rb.isFull());
-
-        // now full, should return first value
-        assert (A == rb.addOverwrite(E, F));
-        assert (B == rb.addOverwrite(F, F));
-        assert (rb.isFull());
-
-        // offer() testing
-        assert (!rb.offer(A));
-        assert (C == rb.remove());
-        assert (rb.offer(A));
-
-        // peek testing
-        assert (D == rb.front());
-        assert (E == rb.front(1));
-        assert (F == rb.front(2));
-        // this should throw
-        assertThrows(NoSuchElementException.class,
-                () -> rb.front(99));
-
-        assert (A == rb.peekBack(B));
-
-        // clear() testing
-        rb.clear();
-        assert (rb.isEmpty());
-
-        assert (A == rb.peekBack(A));
-    }
-
-
-    public void testMultipleRemove() {
-        CharRingBuffer rb = new CharRingBuffer(10, false);
-
-        // this should throw
-        assertThrows(NoSuchElementException.class,
-                rb::remove);
-
-        // this should throw
-        assertThrows(NoSuchElementException.class,
-                () -> rb.remove(1));
-
-        rb.add(A);
-        rb.add(B);
-
-        char[] values = rb.remove(2);
-        assertArrayEquals(values, A, B);
-        assertEmpty(rb);
-
-        rb.add(C);
-        rb.add(D);
-        rb.add(E);
-        rb.add(F);
-
-        values = rb.remove(2);
-        assertArrayEquals(values, C, D);
-
-        values = rb.remove(2);
-        assertArrayEquals(values, E, F);
-        assertEmpty(rb);
-
-        rb.add(A);
-        rb.add(B);
-        rb.add(C);
-        rb.add(D);
-        rb.add(E);
-        rb.add(F);
-
-        values = rb.remove(6);
-        assertArrayEquals(values, A, B, C, D, E, F);
-        assertEmpty(rb);
-    }
-
-    public void testAddRemoveUnsafe() {
-        CharRingBuffer rbNoGrow = new CharRingBuffer(3, false);
-
-        // this should throw
-        assertThrows(UnsupportedOperationException.class,
-                () -> rbNoGrow.ensureRemaining(10));
-
-        rbNoGrow.ensureRemaining(3);
-        rbNoGrow.addUnsafe(A);
-        rbNoGrow.addUnsafe(B);
-        rbNoGrow.addUnsafe(C);
-
-        assertContents(rbNoGrow, A, B, C);
-
-        assertEquals(rbNoGrow.removeUnsafe(), A);
-        assertContents(rbNoGrow, B, C);
-
-        assertEquals(rbNoGrow.removeUnsafe(), B);
-        assertContents(rbNoGrow, C);
-
-        assertEquals(rbNoGrow.removeUnsafe(), C);
-        assertEmpty(rbNoGrow);
-
-
-        CharRingBuffer rbGrow = new CharRingBuffer(3, true);
-
-        for (int size = 10; size < 1_000_000; size *= 10) {
-            rbGrow.ensureRemaining(size);
-            assert (rbGrow.remaining() >= size);
-            for (int i = 0; i < size; i++) {
-                rbGrow.addUnsafe(A);
-            }
-        }
-    }
-
-    public void testOverflow() {
-        CharRingBuffer rbA = new CharRingBuffer(0);
-        // this should throw
-        assertThrows(AssertionFailure.class,
-                () -> rbA.ensureRemaining(ArrayUtil.MAX_ARRAY_SIZE + 1));
-
-        CharRingBuffer rbB = new CharRingBuffer(100);
-        for (int i = 0; i < 100; i++) {
-            rbB.addUnsafe(A);
-        }
-        // this should throw
-        assertThrows(AssertionFailure.class,
-                () -> rbB.ensureRemaining(ArrayUtil.MAX_ARRAY_SIZE - 100 + 1));
-    }
-}
diff --git a/Base/src/test/java/io/deephaven/base/ringbuffer/DoubleRingBufferTest.java b/Base/src/test/java/io/deephaven/base/ringbuffer/DoubleRingBufferTest.java
deleted file mode 100644
index 9503dbf246b..00000000000
--- a/Base/src/test/java/io/deephaven/base/ringbuffer/DoubleRingBufferTest.java
+++ /dev/null
@@ -1,559 +0,0 @@
-//
-// Copyright (c) 2016-2024 Deephaven Data Labs and Patent Pending
-//
-// ****** AUTO-GENERATED CLASS - DO NOT EDIT MANUALLY
-// ****** Edit CharRingBufferTest and run "./gradlew replicateRingBuffers" to regenerate
-//
-// @formatter:off
-package io.deephaven.base.ringbuffer;
-
-import io.deephaven.base.ArrayUtil;
-import io.deephaven.base.verify.AssertionFailure;
-import junit.framework.TestCase;
-
-import java.util.NoSuchElementException;
-
-import static org.junit.Assert.assertThrows;
-
-public class DoubleRingBufferTest extends TestCase {
-
-    final double SENTINEL = Double.MIN_VALUE;
-
-    private void assertEmpty(DoubleRingBuffer rb) {
-        assertTrue(rb.isEmpty());
-        assertEquals(0, rb.size());
-
-        assertEquals(SENTINEL, rb.peek(SENTINEL));
-        try {
-            rb.element();
-            fail("queue should be empty");
-        } catch (NoSuchElementException x) {
-            // expected
-        }
-
-        assertEquals(SENTINEL, rb.poll(SENTINEL));
-        try {
-            rb.remove();
-            fail("queue should be empty");
-        } catch (NoSuchElementException x) {
-            // expected
-        }
-    }
-
-    private void assertFull(DoubleRingBuffer rb) {
-        assertFalse(rb.isEmpty());
-        assertEquals(rb.capacity(), rb.size());
-    }
-
-    private void assertNotEmpty(DoubleRingBuffer rb, int expectedSize, double expectedHead) {
-        assertFalse(rb.isEmpty());
-        assertEquals(expectedSize, rb.size());
-
-        assertEquals(expectedHead, rb.peek(SENTINEL));
-        try {
-            assertEquals(expectedHead, rb.element());
-        } catch (NoSuchElementException x) {
-            fail("queue should not be empty");
-        }
-    }
-
-    private void assertAdd(DoubleRingBuffer rb, double newHead, int expectedSize, double expectedHead) {
-        assertTrue(rb.add(newHead));
-        assertNotEmpty(rb, expectedSize, expectedHead);
-    }
-
-    private void assertOffer(DoubleRingBuffer rb, double newHead, int expectedSize, double expectedHead) {
-        assertTrue(rb.offer(newHead));
-        assertNotEmpty(rb, expectedSize, expectedHead);
-    }
-
-    private void assertPoll(DoubleRingBuffer rb, int expectedSize, double expectedHead) {
-        assertNotEmpty(rb, expectedSize, expectedHead);
-        assertEquals(expectedHead, rb.poll(SENTINEL));
-    }
-
-    private void assertRemove(DoubleRingBuffer rb, int expectedSize, double expectedHead) {
-        assertNotEmpty(rb, expectedSize, expectedHead);
-        try {
-            assertEquals(expectedHead, rb.remove());
-        } catch (NoSuchElementException x) {
-            fail("queue should not be empty");
-        }
-    }
-
-    private void assertContents(DoubleRingBuffer rb, double... expectedData) {
-        final double[] data = rb.getAll();
-        assertEquals(data.length, expectedData.length);
-        for (int ii = 0; ii < data.length; ii++) {
-            assertEquals(data[ii], expectedData[ii]);
-        }
-    }
-
-    private void assertArrayEquals(double[] data, double... expectedData) {
-        assertEquals(data.length, expectedData.length);
-        for (int ii = 0; ii < data.length; ii++) {
-            assertEquals(data[ii], expectedData[ii]);
-        }
-    }
-
-    double A = 'A';
-    double B = 'B';
-    double C = 'C';
-    double D = 'D';
-    double E = 'E';
-    double F = 'F';
-
-    public void testAddRemove() {
-
-        DoubleRingBuffer rb = new DoubleRingBuffer(3);
-
-        assertEmpty(rb);
-
-        assertAdd(rb, A, 1, A);
-        assertAdd(rb, B, 2, A);
-        assertAdd(rb, C, 3, A);
-        assertContents(rb, A, B, C);
-
-        assertRemove(rb, 3, A);
-        assertContents(rb, B, C);
-
-        assertRemove(rb, 2, B);
-        assertContents(rb, C);
-
-        assertRemove(rb, 1, C);
-        assertContents(rb);
-
-        assertEmpty(rb);
-
-        assertAdd(rb, A, 1, A);
-        assertAdd(rb, B, 2, A);
-        assertContents(rb, A, B);
-
-        assertRemove(rb, 2, A);
-        assertContents(rb, B);
-
-        assertAdd(rb, C, 2, B);
-        assertContents(rb, B, C);
-
-        assertRemove(rb, 2, B);
-        assertContents(rb, C);
-
-        assertRemove(rb, 1, C);
-        assertContents(rb);
-
-        assertEmpty(rb);
-
-        assertAdd(rb, A, 1, A);
-        assertRemove(rb, 1, A);
-        assertEmpty(rb);
-        assertAdd(rb, B, 1, B);
-        assertRemove(rb, 1, B);
-        assertEmpty(rb);
-        assertAdd(rb, C, 1, C);
-        assertRemove(rb, 1, C);
-        assertEmpty(rb);
-
-        assertAdd(rb, D, 1, D);
-        assertRemove(rb, 1, D);
-        assertEmpty(rb);
-        assertAdd(rb, E, 1, E);
-        assertRemove(rb, 1, E);
-        assertEmpty(rb);
-        assertAdd(rb, F, 1, F);
-        assertRemove(rb, 1, F);
-        assertEmpty(rb);
-
-        assertAdd(rb, A, 1, A);
-        assertAdd(rb, B, 2, A);
-        assertAdd(rb, C, 3, A);
-        assertContents(rb, A, B, C);
-
-        assertAdd(rb, D, 4, A);
-        assertAdd(rb, E, 5, A);
-        assertAdd(rb, F, 6, A);
-        assertContents(rb, A, B, C, D, E, F);
-
-        assertRemove(rb, 6, A);
-        assertRemove(rb, 5, B);
-        assertRemove(rb, 4, C);
-        assertRemove(rb, 3, D);
-        assertRemove(rb, 2, E);
-        assertRemove(rb, 1, F);
-        assertContents(rb);
-        assertEmpty(rb);
-    }
-
-    public void testOfferPoll() {
-        DoubleRingBuffer rb = new DoubleRingBuffer(3);
-
-        assertEmpty(rb);
-
-        assertOffer(rb, A, 1, A);
-        assertOffer(rb, B, 2, A);
-        assertOffer(rb, C, 3, A);
-
-        assertPoll(rb, 3, A);
-        assertPoll(rb, 2, B);
-        assertPoll(rb, 1, C);
-        assertEmpty(rb);
-
-        assertOffer(rb, A, 1, A);
-        assertOffer(rb, B, 2, A);
-        assertPoll(rb, 2, A);
-        assertOffer(rb, C, 2, B);
-        assertPoll(rb, 2, B);
-        assertPoll(rb, 1, C);
-        assertEmpty(rb);
-
-        assertOffer(rb, A, 1, A);
-        assertPoll(rb, 1, A);
-        assertEmpty(rb);
-        assertOffer(rb, B, 1, B);
-        assertPoll(rb, 1, B);
-        assertEmpty(rb);
-        assertOffer(rb, C, 1, C);
-        assertPoll(rb, 1, C);
-        assertEmpty(rb);
-
-        assertOffer(rb, D, 1, D);
-        assertPoll(rb, 1, D);
-        assertEmpty(rb);
-        assertOffer(rb, E, 1, E);
-        assertPoll(rb, 1, E);
-        assertEmpty(rb);
-        assertOffer(rb, F, 1, F);
-        assertPoll(rb, 1, F);
-        assertEmpty(rb);
-
-        assertOffer(rb, A, 1, A);
-        assertOffer(rb, B, 2, A);
-        assertOffer(rb, C, 3, A);
-        assertOffer(rb, D, 4, A);
-
-        assertAdd(rb, E, 5, A); // need one add to grow it from 4 to 8
-        assertOffer(rb, F, 6, A);
-
-        assertPoll(rb, 6, A);
-        assertPoll(rb, 5, B);
-        assertPoll(rb, 4, C);
-        assertPoll(rb, 3, D);
-        assertPoll(rb, 2, E);
-        assertPoll(rb, 1, F);
-        assertEmpty(rb);
-    }
-
-    public void testGrowSimple() {
-        DoubleRingBuffer rb = new DoubleRingBuffer(4);
-
-        assertAdd(rb, A, 1, A);
-        assertAdd(rb, B, 2, A);
-        assertAdd(rb, C, 3, A);
-        assertAdd(rb, D, 4, A);
-        assertFull(rb);
-
-        // remove one so head != 0
-        assertRemove(rb, 4, A);
-
-        assertAdd(rb, E, 4, B);
-        // this will grow; the elements are in a single contiguous block
-        assertAdd(rb, F, 5, B);
-
-        assertRemove(rb, 5, B);
-        assertRemove(rb, 4, C);
-        assertRemove(rb, 3, D);
-        assertRemove(rb, 2, E);
-        assertRemove(rb, 1, F);
-        assertEmpty(rb);
-    }
-
-    public void testGrowComplex() {
-        DoubleRingBuffer rb = new DoubleRingBuffer(5);
-
-        assertAdd(rb, A, 1, A);
-        assertAdd(rb, B, 2, A);
-        assertAdd(rb, C, 3, A);
-        assertRemove(rb, 3, A);
-        assertRemove(rb, 2, B);
-        assertRemove(rb, 1, C);
-        assertEmpty(rb);
-
-        assertAdd(rb, A, 1, A);
-        assertAdd(rb, B, 2, A);
-        assertAdd(rb, C, 3, A);
-        assertAdd(rb, D, 4, A);
-        assertAdd(rb, E, 5, A);
-
-        // this will grow; the elements are in two blocks
-        assertAdd(rb, F, 6, A);
-
-        assertRemove(rb, 6, A);
-        assertRemove(rb, 5, B);
-        assertRemove(rb, 4, C);
-        assertRemove(rb, 3, D);
-        assertRemove(rb, 2, E);
-        assertRemove(rb, 1, F);
-        assertEmpty(rb);
-    }
-
-    public void testIterator() {
-        DoubleRingBuffer rb = new DoubleRingBuffer(3);
-
-        DoubleRingBuffer.Iterator iter = rb.iterator();
-        assertFalse(iter.hasNext());
-
-        assertAdd(rb, A, 1, A);
-        assertAdd(rb, B, 2, A);
-        assertAdd(rb, C, 3, A);
-
-        iter = rb.iterator();
-        assertTrue(iter.hasNext());
-        assertEquals(A, iter.next());
-        assertTrue(iter.hasNext());
-        assertEquals(B, iter.next());
-        assertTrue(iter.hasNext());
-        assertEquals(C, iter.next());
-        assertFalse(iter.hasNext());
-
-        assertRemove(rb, 3, A);
-        assertAdd(rb, D, 3, B);
-
-        iter = rb.iterator();
-        assertTrue(iter.hasNext());
-        assertEquals(B, iter.next());
-        assertTrue(iter.hasNext());
-        assertEquals(C, iter.next());
-        assertTrue(iter.hasNext());
-        assertEquals(D, iter.next());
-        assertFalse(iter.hasNext());
-
-        assertRemove(rb, 3, B);
-
-        iter = rb.iterator();
-        assertEquals(C, iter.next());
-        assertEquals(D, iter.next());
-        assertFalse(iter.hasNext());
-
-        assertAdd(rb, E, 3, C);
-        assertAdd(rb, F, 4, C);
-
-        iter = rb.iterator();
-        assertTrue(iter.hasNext());
-        assertEquals(C, iter.next());
-        assertTrue(iter.hasNext());
-        assertEquals(D, iter.next());
-        assertTrue(iter.hasNext());
-        assertEquals(E, iter.next());
-        assertTrue(iter.hasNext());
-        assertEquals(F, iter.next());
-        assertFalse(iter.hasNext());
-
-        final DoubleRingBuffer.Iterator iterFinal = rb.iterator();
-
-        assertThrows(UnsupportedOperationException.class,
-                iterFinal::remove);
-    }
-
-    public void testBack() {
-        DoubleRingBuffer rb = new DoubleRingBuffer(5);
-
-        assertAdd(rb, A, 1, A);
-        assertEquals(rb.back(), A);
-
-        assertAdd(rb, B, 2, A);
-        assertAdd(rb, C, 3, A);
-        assertEquals(rb.back(), C);
-    }
-
-    public void testBackWhenEmpty() {
-        DoubleRingBuffer rb = new DoubleRingBuffer(5);
-        try {
-            rb.back();
-            fail("expected a NoSuchElement exception");
-        } catch (NoSuchElementException x) {
-            // expected
-        }
-    }
-
-    public void testBackTailIsZero() {
-        DoubleRingBuffer rb = new DoubleRingBuffer(5, false);
-
-        assertAdd(rb, A, 1, A);
-        assertAdd(rb, B, 2, A);
-        assertAdd(rb, C, 3, A);
-        assertAdd(rb, D, 4, A);
-        assertAdd(rb, E, 5, A);
-
-        assertRemove(rb, 5, A);
-        assertAdd(rb, F, 5, B);
-        assertEquals(rb.back(), F);
-    }
-
-    public void testLargeAmounts() {
-        DoubleRingBuffer rb = new DoubleRingBuffer(3);
-
-        for (int i = 0; i < 100; i++)
-            rb.add((double) i);
-
-        for (int i = 100; i < 200; i++) {
-            rb.add((double) i);
-            assertEquals((double) (i - 100 + 1), rb.front(1));
-            assertEquals((double) (i - 100), rb.poll(SENTINEL));
-        }
-
-        for (int i = 200; i < 300; i++) {
-            if (i < 299)
-                assertEquals((double) (i - 100 + 1), rb.front(1));
-            assertEquals((double) (i - 100), rb.poll(SENTINEL));
-        }
-    }
-
-    public void testAddExceptionWhenFull() {
-        DoubleRingBuffer rb = new DoubleRingBuffer(4, false);
-        assert (rb.add(A));
-        assert (rb.add(B));
-        assert (rb.add(C));
-        assert (rb.add(D));
-
-        // this should throw
-        assertThrows(UnsupportedOperationException.class,
-                () -> rb.add(E));
-    }
-
-    public void testAddOverwriteAndOffer() {
-        DoubleRingBuffer rb = new DoubleRingBuffer(4, false);
-        assert (4 == rb.remaining());
-
-        assert (F == rb.addOverwrite(A, F));
-        assert (3 == rb.remaining());
-
-        assert (F == rb.addOverwrite(B, F));
-        assert (2 == rb.remaining());
-
-        assert (F == rb.addOverwrite(C, F));
-        assert (1 == rb.remaining());
-
-        assert (F == rb.addOverwrite(D, F));
-        assert (0 == rb.remaining());
-
-        assert (rb.isFull());
-
-        // now full, should return first value
-        assert (A == rb.addOverwrite(E, F));
-        assert (B == rb.addOverwrite(F, F));
-        assert (rb.isFull());
-
-        // offer() testing
-        assert (!rb.offer(A));
-        assert (C == rb.remove());
-        assert (rb.offer(A));
-
-        // peek testing
-        assert (D == rb.front());
-        assert (E == rb.front(1));
-        assert (F == rb.front(2));
-        // this should throw
-        assertThrows(NoSuchElementException.class,
-                () -> rb.front(99));
-
-        assert (A == rb.peekBack(B));
-
-        // clear() testing
-        rb.clear();
-        assert (rb.isEmpty());
-
-        assert (A == rb.peekBack(A));
-    }
-
-
-    public void testMultipleRemove() {
-        DoubleRingBuffer rb = new DoubleRingBuffer(10, false);
-
-        // this should throw
-        assertThrows(NoSuchElementException.class,
-                rb::remove);
-
-        // this should throw
-        assertThrows(NoSuchElementException.class,
-                () -> rb.remove(1));
-
-        rb.add(A);
-        rb.add(B);
-
-        double[] values = rb.remove(2);
-        assertArrayEquals(values, A, B);
-        assertEmpty(rb);
-
-        rb.add(C);
-        rb.add(D);
-        rb.add(E);
-        rb.add(F);
-
-        values = rb.remove(2);
-        assertArrayEquals(values, C, D);
-
-        values = rb.remove(2);
-        assertArrayEquals(values, E, F);
-        assertEmpty(rb);
-
-        rb.add(A);
-        rb.add(B);
-        rb.add(C);
-        rb.add(D);
-        rb.add(E);
-        rb.add(F);
-
-        values = rb.remove(6);
-        assertArrayEquals(values, A, B, C, D, E, F);
-        assertEmpty(rb);
-    }
-
-    public void testAddRemoveUnsafe() {
-        DoubleRingBuffer rbNoGrow = new DoubleRingBuffer(3, false);
-
-        // this should throw
-        assertThrows(UnsupportedOperationException.class,
-                () -> rbNoGrow.ensureRemaining(10));
-
-        rbNoGrow.ensureRemaining(3);
-        rbNoGrow.addUnsafe(A);
-        rbNoGrow.addUnsafe(B);
-        rbNoGrow.addUnsafe(C);
-
-        assertContents(rbNoGrow, A, B, C);
-
-        assertEquals(rbNoGrow.removeUnsafe(), A);
-        assertContents(rbNoGrow, B, C);
-
-        assertEquals(rbNoGrow.removeUnsafe(), B);
-        assertContents(rbNoGrow, C);
-
-        assertEquals(rbNoGrow.removeUnsafe(), C);
-        assertEmpty(rbNoGrow);
-
-
-        DoubleRingBuffer rbGrow = new DoubleRingBuffer(3, true);
-
-        for (int size = 10; size < 1_000_000; size *= 10) {
-            rbGrow.ensureRemaining(size);
-            assert (rbGrow.remaining() >= size);
-            for (int i = 0; i < size; i++) {
-                rbGrow.addUnsafe(A);
-            }
-        }
-    }
-
-    public void testOverflow() {
-        DoubleRingBuffer rbA = new DoubleRingBuffer(0);
-        // this should throw
-        assertThrows(AssertionFailure.class,
-                () -> rbA.ensureRemaining(ArrayUtil.MAX_ARRAY_SIZE + 1));
-
-        DoubleRingBuffer rbB = new DoubleRingBuffer(100);
-        for (int i = 0; i < 100; i++) {
-            rbB.addUnsafe(A);
-        }
-        // this should throw
-        assertThrows(AssertionFailure.class,
-                () -> rbB.ensureRemaining(ArrayUtil.MAX_ARRAY_SIZE - 100 + 1));
-    }
-}
diff --git a/Base/src/test/java/io/deephaven/base/ringbuffer/FloatRingBufferTest.java b/Base/src/test/java/io/deephaven/base/ringbuffer/FloatRingBufferTest.java
deleted file mode 100644
index ab8b865ccca..00000000000
--- a/Base/src/test/java/io/deephaven/base/ringbuffer/FloatRingBufferTest.java
+++ /dev/null
@@ -1,559 +0,0 @@
-//
-// Copyright (c) 2016-2024 Deephaven Data Labs and Patent Pending
-//
-// ****** AUTO-GENERATED CLASS - DO NOT EDIT MANUALLY
-// ****** Edit CharRingBufferTest and run "./gradlew replicateRingBuffers" to regenerate
-//
-// @formatter:off
-package io.deephaven.base.ringbuffer;
-
-import io.deephaven.base.ArrayUtil;
-import io.deephaven.base.verify.AssertionFailure;
-import junit.framework.TestCase;
-
-import java.util.NoSuchElementException;
-
-import static org.junit.Assert.assertThrows;
-
-public class FloatRingBufferTest extends TestCase {
-
-    final float SENTINEL = Float.MIN_VALUE;
-
-    private void assertEmpty(FloatRingBuffer rb) {
-        assertTrue(rb.isEmpty());
-        assertEquals(0, rb.size());
-
-        assertEquals(SENTINEL, rb.peek(SENTINEL));
-        try {
-            rb.element();
-            fail("queue should be empty");
-        } catch (NoSuchElementException x) {
-            // expected
-        }
-
-        assertEquals(SENTINEL, rb.poll(SENTINEL));
-        try {
-            rb.remove();
-            fail("queue should be empty");
-        } catch (NoSuchElementException x) {
-            // expected
-        }
-    }
-
-    private void assertFull(FloatRingBuffer rb) {
-        assertFalse(rb.isEmpty());
-        assertEquals(rb.capacity(), rb.size());
-    }
-
-    private void assertNotEmpty(FloatRingBuffer rb, int expectedSize, float expectedHead) {
-        assertFalse(rb.isEmpty());
-        assertEquals(expectedSize, rb.size());
-
-        assertEquals(expectedHead, rb.peek(SENTINEL));
-        try {
-            assertEquals(expectedHead, rb.element());
-        } catch (NoSuchElementException x) {
-            fail("queue should not be empty");
-        }
-    }
-
-    private void assertAdd(FloatRingBuffer rb, float newHead, int expectedSize, float expectedHead) {
-        assertTrue(rb.add(newHead));
-        assertNotEmpty(rb, expectedSize, expectedHead);
-    }
-
-    private void assertOffer(FloatRingBuffer rb, float newHead, int expectedSize, float expectedHead) {
-        assertTrue(rb.offer(newHead));
-        assertNotEmpty(rb, expectedSize, expectedHead);
-    }
-
-    private void assertPoll(FloatRingBuffer rb, int expectedSize, float expectedHead) {
-        assertNotEmpty(rb, expectedSize, expectedHead);
-        assertEquals(expectedHead, rb.poll(SENTINEL));
-    }
-
-    private void assertRemove(FloatRingBuffer rb, int expectedSize, float expectedHead) {
-        assertNotEmpty(rb, expectedSize, expectedHead);
-        try {
-            assertEquals(expectedHead, rb.remove());
-        } catch (NoSuchElementException x) {
-            fail("queue should not be empty");
-        }
-    }
-
-    private void assertContents(FloatRingBuffer rb, float... expectedData) {
-        final float[] data = rb.getAll();
-        assertEquals(data.length, expectedData.length);
-        for (int ii = 0; ii < data.length; ii++) {
-            assertEquals(data[ii], expectedData[ii]);
-        }
-    }
-
-    private void assertArrayEquals(float[] data, float... expectedData) {
-        assertEquals(data.length, expectedData.length);
-        for (int ii = 0; ii < data.length; ii++) {
-            assertEquals(data[ii], expectedData[ii]);
-        }
-    }
-
-    float A = 'A';
-    float B = 'B';
-    float C = 'C';
-    float D = 'D';
-    float E = 'E';
-    float F = 'F';
-
-    public void testAddRemove() {
-
-        FloatRingBuffer rb = new FloatRingBuffer(3);
-
-        assertEmpty(rb);
-
-        assertAdd(rb, A, 1, A);
-        assertAdd(rb, B, 2, A);
-        assertAdd(rb, C, 3, A);
-        assertContents(rb, A, B, C);
-
-        assertRemove(rb, 3, A);
-        assertContents(rb, B, C);
-
-        assertRemove(rb, 2, B);
-        assertContents(rb, C);
-
-        assertRemove(rb, 1, C);
-        assertContents(rb);
-
-        assertEmpty(rb);
-
-        assertAdd(rb, A, 1, A);
-        assertAdd(rb, B, 2, A);
-        assertContents(rb, A, B);
-
-        assertRemove(rb, 2, A);
-        assertContents(rb, B);
-
-        assertAdd(rb, C, 2, B);
-        assertContents(rb, B, C);
-
-        assertRemove(rb, 2, B);
-        assertContents(rb, C);
-
-        assertRemove(rb, 1, C);
-        assertContents(rb);
-
-        assertEmpty(rb);
-
-        assertAdd(rb, A, 1, A);
-        assertRemove(rb, 1, A);
-        assertEmpty(rb);
-        assertAdd(rb, B, 1, B);
-        assertRemove(rb, 1, B);
-        assertEmpty(rb);
-        assertAdd(rb, C, 1, C);
-        assertRemove(rb, 1, C);
-        assertEmpty(rb);
-
-        assertAdd(rb, D, 1, D);
-        assertRemove(rb, 1, D);
-        assertEmpty(rb);
-        assertAdd(rb, E, 1, E);
-        assertRemove(rb, 1, E);
-        assertEmpty(rb);
-        assertAdd(rb, F, 1, F);
-        assertRemove(rb, 1, F);
-        assertEmpty(rb);
-
-        assertAdd(rb, A, 1, A);
-        assertAdd(rb, B, 2, A);
-        assertAdd(rb, C, 3, A);
-        assertContents(rb, A, B, C);
-
-        assertAdd(rb, D, 4, A);
-        assertAdd(rb, E, 5, A);
-        assertAdd(rb, F, 6, A);
-        assertContents(rb, A, B, C, D, E, F);
-
-        assertRemove(rb, 6, A);
-        assertRemove(rb, 5, B);
-        assertRemove(rb, 4, C);
-        assertRemove(rb, 3, D);
-        assertRemove(rb, 2, E);
-        assertRemove(rb, 1, F);
-        assertContents(rb);
-        assertEmpty(rb);
-    }
-
-    public void testOfferPoll() {
-        FloatRingBuffer rb = new FloatRingBuffer(3);
-
-        assertEmpty(rb);
-
-        assertOffer(rb, A, 1, A);
-        assertOffer(rb, B, 2, A);
-        assertOffer(rb, C, 3, A);
-
-        assertPoll(rb, 3, A);
-        assertPoll(rb, 2, B);
-        assertPoll(rb, 1, C);
-        assertEmpty(rb);
-
-        assertOffer(rb, A, 1, A);
-        assertOffer(rb, B, 2, A);
-        assertPoll(rb, 2, A);
-        assertOffer(rb, C, 2, B);
-        assertPoll(rb, 2, B);
-        assertPoll(rb, 1, C);
-        assertEmpty(rb);
-
-        assertOffer(rb, A, 1, A);
-        assertPoll(rb, 1, A);
-        assertEmpty(rb);
-        assertOffer(rb, B, 1, B);
-        assertPoll(rb, 1, B);
-        assertEmpty(rb);
-        assertOffer(rb, C, 1, C);
-        assertPoll(rb, 1, C);
-        assertEmpty(rb);
-
-        assertOffer(rb, D, 1, D);
-        assertPoll(rb, 1, D);
-        assertEmpty(rb);
-        assertOffer(rb, E, 1, E);
-        assertPoll(rb, 1, E);
-        assertEmpty(rb);
-        assertOffer(rb, F, 1, F);
-        assertPoll(rb, 1, F);
-        assertEmpty(rb);
-
-        assertOffer(rb, A, 1, A);
-        assertOffer(rb, B, 2, A);
-        assertOffer(rb, C, 3, A);
-        assertOffer(rb, D, 4, A);
-
-        assertAdd(rb, E, 5, A); // need one add to grow it from 4 to 8
-        assertOffer(rb, F, 6, A);
-
-        assertPoll(rb, 6, A);
-        assertPoll(rb, 5, B);
-        assertPoll(rb, 4, C);
-        assertPoll(rb, 3, D);
-        assertPoll(rb, 2, E);
-        assertPoll(rb, 1, F);
-        assertEmpty(rb);
-    }
-
-    public void testGrowSimple() {
-        FloatRingBuffer rb = new FloatRingBuffer(4);
-
-        assertAdd(rb, A, 1, A);
-        assertAdd(rb, B, 2, A);
-        assertAdd(rb, C, 3, A);
-        assertAdd(rb, D, 4, A);
-        assertFull(rb);
-
-        // remove one so head != 0
-        assertRemove(rb, 4, A);
-
-        assertAdd(rb, E, 4, B);
-        // this will grow; the elements are in a single contiguous block
-        assertAdd(rb, F, 5, B);
-
-        assertRemove(rb, 5, B);
-        assertRemove(rb, 4, C);
-        assertRemove(rb, 3, D);
-        assertRemove(rb, 2, E);
-        assertRemove(rb, 1, F);
-        assertEmpty(rb);
-    }
-
-    public void testGrowComplex() {
-        FloatRingBuffer rb = new FloatRingBuffer(5);
-
-        assertAdd(rb, A, 1, A);
-        assertAdd(rb, B, 2, A);
-        assertAdd(rb, C, 3, A);
-        assertRemove(rb, 3, A);
-        assertRemove(rb, 2, B);
-        assertRemove(rb, 1, C);
-        assertEmpty(rb);
-
-        assertAdd(rb, A, 1, A);
-        assertAdd(rb, B, 2, A);
-        assertAdd(rb, C, 3, A);
-        assertAdd(rb, D, 4, A);
-        assertAdd(rb, E, 5, A);
-
-        // this will grow; the elements are in two blocks
-        assertAdd(rb, F, 6, A);
-
-        assertRemove(rb, 6, A);
-        assertRemove(rb, 5, B);
-        assertRemove(rb, 4, C);
-        assertRemove(rb, 3, D);
-        assertRemove(rb, 2, E);
-        assertRemove(rb, 1, F);
-        assertEmpty(rb);
-    }
-
-    public void testIterator() {
-        FloatRingBuffer rb = new FloatRingBuffer(3);
-
-        FloatRingBuffer.Iterator iter = rb.iterator();
-        assertFalse(iter.hasNext());
-
-        assertAdd(rb, A, 1, A);
-        assertAdd(rb, B, 2, A);
-        assertAdd(rb, C, 3, A);
-
-        iter = rb.iterator();
-        assertTrue(iter.hasNext());
-        assertEquals(A, iter.next());
-        assertTrue(iter.hasNext());
-        assertEquals(B, iter.next());
-        assertTrue(iter.hasNext());
-        assertEquals(C, iter.next());
-        assertFalse(iter.hasNext());
-
-        assertRemove(rb, 3, A);
-        assertAdd(rb, D, 3, B);
-
-        iter = rb.iterator();
-        assertTrue(iter.hasNext());
-        assertEquals(B, iter.next());
-        assertTrue(iter.hasNext());
-        assertEquals(C, iter.next());
-        assertTrue(iter.hasNext());
-        assertEquals(D, iter.next());
-        assertFalse(iter.hasNext());
-
-        assertRemove(rb, 3, B);
-
-        iter = rb.iterator();
-        assertEquals(C, iter.next());
-        assertEquals(D, iter.next());
-        assertFalse(iter.hasNext());
-
-        assertAdd(rb, E, 3, C);
-        assertAdd(rb, F, 4, C);
-
-        iter = rb.iterator();
-        assertTrue(iter.hasNext());
-        assertEquals(C, iter.next());
-        assertTrue(iter.hasNext());
-        assertEquals(D, iter.next());
-        assertTrue(iter.hasNext());
-        assertEquals(E, iter.next());
-        assertTrue(iter.hasNext());
-        assertEquals(F, iter.next());
-        assertFalse(iter.hasNext());
-
-        final FloatRingBuffer.Iterator iterFinal = rb.iterator();
-
-        assertThrows(UnsupportedOperationException.class,
-                iterFinal::remove);
-    }
-
-    public void testBack() {
-        FloatRingBuffer rb = new FloatRingBuffer(5);
-
-        assertAdd(rb, A, 1, A);
-        assertEquals(rb.back(), A);
-
-        assertAdd(rb, B, 2, A);
-        assertAdd(rb, C, 3, A);
-        assertEquals(rb.back(), C);
-    }
-
-    public void testBackWhenEmpty() {
-        FloatRingBuffer rb = new FloatRingBuffer(5);
-        try {
-            rb.back();
-            fail("expected a NoSuchElement exception");
-        } catch (NoSuchElementException x) {
-            // expected
-        }
-    }
-
-    public void testBackTailIsZero() {
-        FloatRingBuffer rb = new FloatRingBuffer(5, false);
-
-        assertAdd(rb, A, 1, A);
-        assertAdd(rb, B, 2, A);
-        assertAdd(rb, C, 3, A);
-        assertAdd(rb, D, 4, A);
-        assertAdd(rb, E, 5, A);
-
-        assertRemove(rb, 5, A);
-        assertAdd(rb, F, 5, B);
-        assertEquals(rb.back(), F);
-    }
-
-    public void testLargeAmounts() {
-        FloatRingBuffer rb = new FloatRingBuffer(3);
-
-        for (int i = 0; i < 100; i++)
-            rb.add((float) i);
-
-        for (int i = 100; i < 200; i++) {
-            rb.add((float) i);
-            assertEquals((float) (i - 100 + 1), rb.front(1));
-            assertEquals((float) (i - 100), rb.poll(SENTINEL));
-        }
-
-        for (int i = 200; i < 300; i++) {
-            if (i < 299)
-                assertEquals((float) (i - 100 + 1), rb.front(1));
-            assertEquals((float) (i - 100), rb.poll(SENTINEL));
-        }
-    }
-
-    public void testAddExceptionWhenFull() {
-        FloatRingBuffer rb = new FloatRingBuffer(4, false);
-        assert (rb.add(A));
-        assert (rb.add(B));
-        assert (rb.add(C));
-        assert (rb.add(D));
-
-        // this should throw
-        assertThrows(UnsupportedOperationException.class,
-                () -> rb.add(E));
-    }
-
-    public void testAddOverwriteAndOffer() {
-        FloatRingBuffer rb = new FloatRingBuffer(4, false);
-        assert (4 == rb.remaining());
-
-        assert (F == rb.addOverwrite(A, F));
-        assert (3 == rb.remaining());
-
-        assert (F == rb.addOverwrite(B, F));
-        assert (2 == rb.remaining());
-
-        assert (F == rb.addOverwrite(C, F));
-        assert (1 == rb.remaining());
-
-        assert (F == rb.addOverwrite(D, F));
-        assert (0 == rb.remaining());
-
-        assert (rb.isFull());
-
-        // now full, should return first value
-        assert (A == rb.addOverwrite(E, F));
-        assert (B == rb.addOverwrite(F, F));
-        assert (rb.isFull());
-
-        // offer() testing
-        assert (!rb.offer(A));
-        assert (C == rb.remove());
-        assert (rb.offer(A));
-
-        // peek testing
-        assert (D == rb.front());
-        assert (E == rb.front(1));
-        assert (F == rb.front(2));
-        // this should throw
-        assertThrows(NoSuchElementException.class,
-                () -> rb.front(99));
-
-        assert (A == rb.peekBack(B));
-
-        // clear() testing
-        rb.clear();
-        assert (rb.isEmpty());
-
-        assert (A == rb.peekBack(A));
-    }
-
-
-    public void testMultipleRemove() {
-        FloatRingBuffer rb = new FloatRingBuffer(10, false);
-
-        // this should throw
-        assertThrows(NoSuchElementException.class,
-                rb::remove);
-
-        // this should throw
-        assertThrows(NoSuchElementException.class,
-                () -> rb.remove(1));
-
-        rb.add(A);
-        rb.add(B);
-
-        float[] values = rb.remove(2);
-        assertArrayEquals(values, A, B);
-        assertEmpty(rb);
-
-        rb.add(C);
-        rb.add(D);
-        rb.add(E);
-        rb.add(F);
-
-        values = rb.remove(2);
-        assertArrayEquals(values, C, D);
-
-        values = rb.remove(2);
-        assertArrayEquals(values, E, F);
-        assertEmpty(rb);
-
-        rb.add(A);
-        rb.add(B);
-        rb.add(C);
-        rb.add(D);
-        rb.add(E);
-        rb.add(F);
-
-        values = rb.remove(6);
-        assertArrayEquals(values, A, B, C, D, E, F);
-        assertEmpty(rb);
-    }
-
-    public void testAddRemoveUnsafe() {
-        FloatRingBuffer rbNoGrow = new FloatRingBuffer(3, false);
-
-        // this should throw
-        assertThrows(UnsupportedOperationException.class,
-                () -> rbNoGrow.ensureRemaining(10));
-
-        rbNoGrow.ensureRemaining(3);
-        rbNoGrow.addUnsafe(A);
-        rbNoGrow.addUnsafe(B);
-        rbNoGrow.addUnsafe(C);
-
-        assertContents(rbNoGrow, A, B, C);
-
-        assertEquals(rbNoGrow.removeUnsafe(), A);
-        assertContents(rbNoGrow, B, C);
-
-        assertEquals(rbNoGrow.removeUnsafe(), B);
-        assertContents(rbNoGrow, C);
-
-        assertEquals(rbNoGrow.removeUnsafe(), C);
-        assertEmpty(rbNoGrow);
-
-
-        FloatRingBuffer rbGrow = new FloatRingBuffer(3, true);
-
-        for (int size = 10; size < 1_000_000; size *= 10) {
-            rbGrow.ensureRemaining(size);
-            assert (rbGrow.remaining() >= size);
-            for (int i = 0; i < size; i++) {
-                rbGrow.addUnsafe(A);
-            }
-        }
-    }
-
-    public void testOverflow() {
-        FloatRingBuffer rbA = new FloatRingBuffer(0);
-        // this should throw
-        assertThrows(AssertionFailure.class,
-                () -> rbA.ensureRemaining(ArrayUtil.MAX_ARRAY_SIZE + 1));
-
-        FloatRingBuffer rbB = new FloatRingBuffer(100);
-        for (int i = 0; i < 100; i++) {
-            rbB.addUnsafe(A);
-        }
-        // this should throw
-        assertThrows(AssertionFailure.class,
-                () -> rbB.ensureRemaining(ArrayUtil.MAX_ARRAY_SIZE - 100 + 1));
-    }
-}
diff --git a/Base/src/test/java/io/deephaven/base/ringbuffer/IntRingBufferTest.java b/Base/src/test/java/io/deephaven/base/ringbuffer/IntRingBufferTest.java
deleted file mode 100644
index 55fe5492f30..00000000000
--- a/Base/src/test/java/io/deephaven/base/ringbuffer/IntRingBufferTest.java
+++ /dev/null
@@ -1,559 +0,0 @@
-//
-// Copyright (c) 2016-2024 Deephaven Data Labs and Patent Pending
-//
-// ****** AUTO-GENERATED CLASS - DO NOT EDIT MANUALLY
-// ****** Edit CharRingBufferTest and run "./gradlew replicateRingBuffers" to regenerate
-//
-// @formatter:off
-package io.deephaven.base.ringbuffer;
-
-import io.deephaven.base.ArrayUtil;
-import io.deephaven.base.verify.AssertionFailure;
-import junit.framework.TestCase;
-
-import java.util.NoSuchElementException;
-
-import static org.junit.Assert.assertThrows;
-
-public class IntRingBufferTest extends TestCase {
-
-    final int SENTINEL = Integer.MIN_VALUE;
-
-    private void assertEmpty(IntRingBuffer rb) {
-        assertTrue(rb.isEmpty());
-        assertEquals(0, rb.size());
-
-        assertEquals(SENTINEL, rb.peek(SENTINEL));
-        try {
-            rb.element();
-            fail("queue should be empty");
-        } catch (NoSuchElementException x) {
-            // expected
-        }
-
-        assertEquals(SENTINEL, rb.poll(SENTINEL));
-        try {
-            rb.remove();
-            fail("queue should be empty");
-        } catch (NoSuchElementException x) {
-            // expected
-        }
-    }
-
-    private void assertFull(IntRingBuffer rb) {
-        assertFalse(rb.isEmpty());
-        assertEquals(rb.capacity(), rb.size());
-    }
-
-    private void assertNotEmpty(IntRingBuffer rb, int expectedSize, int expectedHead) {
-        assertFalse(rb.isEmpty());
-        assertEquals(expectedSize, rb.size());
-
-        assertEquals(expectedHead, rb.peek(SENTINEL));
-        try {
-            assertEquals(expectedHead, rb.element());
-        } catch (NoSuchElementException x) {
-            fail("queue should not be empty");
-        }
-    }
-
-    private void assertAdd(IntRingBuffer rb, int newHead, int expectedSize, int expectedHead) {
-        assertTrue(rb.add(newHead));
-        assertNotEmpty(rb, expectedSize, expectedHead);
-    }
-
-    private void assertOffer(IntRingBuffer rb, int newHead, int expectedSize, int expectedHead) {
-        assertTrue(rb.offer(newHead));
-        assertNotEmpty(rb, expectedSize, expectedHead);
-    }
-
-    private void assertPoll(IntRingBuffer rb, int expectedSize, int expectedHead) {
-        assertNotEmpty(rb, expectedSize, expectedHead);
-        assertEquals(expectedHead, rb.poll(SENTINEL));
-    }
-
-    private void assertRemove(IntRingBuffer rb, int expectedSize, int expectedHead) {
-        assertNotEmpty(rb, expectedSize, expectedHead);
-        try {
-            assertEquals(expectedHead, rb.remove());
-        } catch (NoSuchElementException x) {
-            fail("queue should not be empty");
-        }
-    }
-
-    private void assertContents(IntRingBuffer rb, int... expectedData) {
-        final int[] data = rb.getAll();
-        assertEquals(data.length, expectedData.length);
-        for (int ii = 0; ii < data.length; ii++) {
-            assertEquals(data[ii], expectedData[ii]);
-        }
-    }
-
-    private void assertArrayEquals(int[] data, int... expectedData) {
-        assertEquals(data.length, expectedData.length);
-        for (int ii = 0; ii < data.length; ii++) {
-            assertEquals(data[ii], expectedData[ii]);
-        }
-    }
-
-    int A = 'A';
-    int B = 'B';
-    int C = 'C';
-    int D = 'D';
-    int E = 'E';
-    int F = 'F';
-
-    public void testAddRemove() {
-
-        IntRingBuffer rb = new IntRingBuffer(3);
-
-        assertEmpty(rb);
-
-        assertAdd(rb, A, 1, A);
-        assertAdd(rb, B, 2, A);
-        assertAdd(rb, C, 3, A);
-        assertContents(rb, A, B, C);
-
-        assertRemove(rb, 3, A);
-        assertContents(rb, B, C);
-
-        assertRemove(rb, 2, B);
-        assertContents(rb, C);
-
-        assertRemove(rb, 1, C);
-        assertContents(rb);
-
-        assertEmpty(rb);
-
-        assertAdd(rb, A, 1, A);
-        assertAdd(rb, B, 2, A);
-        assertContents(rb, A, B);
-
-        assertRemove(rb, 2, A);
-        assertContents(rb, B);
-
-        assertAdd(rb, C, 2, B);
-        assertContents(rb, B, C);
-
-        assertRemove(rb, 2, B);
-        assertContents(rb, C);
-
-        assertRemove(rb, 1, C);
-        assertContents(rb);
-
-        assertEmpty(rb);
-
-        assertAdd(rb, A, 1, A);
-        assertRemove(rb, 1, A);
-        assertEmpty(rb);
-        assertAdd(rb, B, 1, B);
-        assertRemove(rb, 1, B);
-        assertEmpty(rb);
-        assertAdd(rb, C, 1, C);
-        assertRemove(rb, 1, C);
-        assertEmpty(rb);
-
-        assertAdd(rb, D, 1, D);
-        assertRemove(rb, 1, D);
-        assertEmpty(rb);
-        assertAdd(rb, E, 1, E);
-        assertRemove(rb, 1, E);
-        assertEmpty(rb);
-        assertAdd(rb, F, 1, F);
-        assertRemove(rb, 1, F);
-        assertEmpty(rb);
-
-        assertAdd(rb, A, 1, A);
-        assertAdd(rb, B, 2, A);
-        assertAdd(rb, C, 3, A);
-        assertContents(rb, A, B, C);
-
-        assertAdd(rb, D, 4, A);
-        assertAdd(rb, E, 5, A);
-        assertAdd(rb, F, 6, A);
-        assertContents(rb, A, B, C, D, E, F);
-
-        assertRemove(rb, 6, A);
-        assertRemove(rb, 5, B);
-        assertRemove(rb, 4, C);
-        assertRemove(rb, 3, D);
-        assertRemove(rb, 2, E);
-        assertRemove(rb, 1, F);
-        assertContents(rb);
-        assertEmpty(rb);
-    }
-
-    public void testOfferPoll() {
-        IntRingBuffer rb = new IntRingBuffer(3);
-
-        assertEmpty(rb);
-
-        assertOffer(rb, A, 1, A);
-        assertOffer(rb, B, 2, A);
-        assertOffer(rb, C, 3, A);
-
-        assertPoll(rb, 3, A);
-        assertPoll(rb, 2, B);
-        assertPoll(rb, 1, C);
-        assertEmpty(rb);
-
-        assertOffer(rb, A, 1, A);
-        assertOffer(rb, B, 2, A);
-        assertPoll(rb, 2, A);
-        assertOffer(rb, C, 2, B);
-        assertPoll(rb, 2, B);
-        assertPoll(rb, 1, C);
-        assertEmpty(rb);
-
-        assertOffer(rb, A, 1, A);
-        assertPoll(rb, 1, A);
-        assertEmpty(rb);
-        assertOffer(rb, B, 1, B);
-        assertPoll(rb, 1, B);
-        assertEmpty(rb);
-        assertOffer(rb, C, 1, C);
-        assertPoll(rb, 1, C);
-        assertEmpty(rb);
-
-        assertOffer(rb, D, 1, D);
-        assertPoll(rb, 1, D);
-        assertEmpty(rb);
-        assertOffer(rb, E, 1, E);
-        assertPoll(rb, 1, E);
-        assertEmpty(rb);
-        assertOffer(rb, F, 1, F);
-        assertPoll(rb, 1, F);
-        assertEmpty(rb);
-
-        assertOffer(rb, A, 1, A);
-        assertOffer(rb, B, 2, A);
-        assertOffer(rb, C, 3, A);
-        assertOffer(rb, D, 4, A);
-
-        assertAdd(rb, E, 5, A); // need one add to grow it from 4 to 8
-        assertOffer(rb, F, 6, A);
-
-        assertPoll(rb, 6, A);
-        assertPoll(rb, 5, B);
-        assertPoll(rb, 4, C);
-        assertPoll(rb, 3, D);
-        assertPoll(rb, 2, E);
-        assertPoll(rb, 1, F);
-        assertEmpty(rb);
-    }
-
-    public void testGrowSimple() {
-        IntRingBuffer rb = new IntRingBuffer(4);
-
-        assertAdd(rb, A, 1, A);
-        assertAdd(rb, B, 2, A);
-        assertAdd(rb, C, 3, A);
-        assertAdd(rb, D, 4, A);
-        assertFull(rb);
-
-        // remove one so head != 0
-        assertRemove(rb, 4, A);
-
-        assertAdd(rb, E, 4, B);
-        // this will grow; the elements are in a single contiguous block
-        assertAdd(rb, F, 5, B);
-
-        assertRemove(rb, 5, B);
-        assertRemove(rb, 4, C);
-        assertRemove(rb, 3, D);
-        assertRemove(rb, 2, E);
-        assertRemove(rb, 1, F);
-        assertEmpty(rb);
-    }
-
-    public void testGrowComplex() {
-        IntRingBuffer rb = new IntRingBuffer(5);
-
-        assertAdd(rb, A, 1, A);
-        assertAdd(rb, B, 2, A);
-        assertAdd(rb, C, 3, A);
-        assertRemove(rb, 3, A);
-        assertRemove(rb, 2, B);
-        assertRemove(rb, 1, C);
-        assertEmpty(rb);
-
-        assertAdd(rb, A, 1, A);
-        assertAdd(rb, B, 2, A);
-        assertAdd(rb, C, 3, A);
-        assertAdd(rb, D, 4, A);
-        assertAdd(rb, E, 5, A);
-
-        // this will grow; the elements are in two blocks
-        assertAdd(rb, F, 6, A);
-
-        assertRemove(rb, 6, A);
-        assertRemove(rb, 5, B);
-        assertRemove(rb, 4, C);
-        assertRemove(rb, 3, D);
-        assertRemove(rb, 2, E);
-        assertRemove(rb, 1, F);
-        assertEmpty(rb);
-    }
-
-    public void testIterator() {
-        IntRingBuffer rb = new IntRingBuffer(3);
-
-        IntRingBuffer.Iterator iter = rb.iterator();
-        assertFalse(iter.hasNext());
-
-        assertAdd(rb, A, 1, A);
-        assertAdd(rb, B, 2, A);
-        assertAdd(rb, C, 3, A);
-
-        iter = rb.iterator();
-        assertTrue(iter.hasNext());
-        assertEquals(A, iter.next());
-        assertTrue(iter.hasNext());
-        assertEquals(B, iter.next());
-        assertTrue(iter.hasNext());
-        assertEquals(C, iter.next());
-        assertFalse(iter.hasNext());
-
-        assertRemove(rb, 3, A);
-        assertAdd(rb, D, 3, B);
-
-        iter = rb.iterator();
-        assertTrue(iter.hasNext());
-        assertEquals(B, iter.next());
-        assertTrue(iter.hasNext());
-        assertEquals(C, iter.next());
-        assertTrue(iter.hasNext());
-        assertEquals(D, iter.next());
-        assertFalse(iter.hasNext());
-
-        assertRemove(rb, 3, B);
-
-        iter = rb.iterator();
-        assertEquals(C, iter.next());
-        assertEquals(D, iter.next());
-        assertFalse(iter.hasNext());
-
-        assertAdd(rb, E, 3, C);
-        assertAdd(rb, F, 4, C);
-
-        iter = rb.iterator();
-        assertTrue(iter.hasNext());
-        assertEquals(C, iter.next());
-        assertTrue(iter.hasNext());
-        assertEquals(D, iter.next());
-        assertTrue(iter.hasNext());
-        assertEquals(E, iter.next());
-        assertTrue(iter.hasNext());
-        assertEquals(F, iter.next());
-        assertFalse(iter.hasNext());
-
-        final IntRingBuffer.Iterator iterFinal = rb.iterator();
-
-        assertThrows(UnsupportedOperationException.class,
-                iterFinal::remove);
-    }
-
-    public void testBack() {
-        IntRingBuffer rb = new IntRingBuffer(5);
-
-        assertAdd(rb, A, 1, A);
-        assertEquals(rb.back(), A);
-
-        assertAdd(rb, B, 2, A);
-        assertAdd(rb, C, 3, A);
-        assertEquals(rb.back(), C);
-    }
-
-    public void testBackWhenEmpty() {
-        IntRingBuffer rb = new IntRingBuffer(5);
-        try {
-            rb.back();
-            fail("expected a NoSuchElement exception");
-        } catch (NoSuchElementException x) {
-            // expected
-        }
-    }
-
-    public void testBackTailIsZero() {
-        IntRingBuffer rb = new IntRingBuffer(5, false);
-
-        assertAdd(rb, A, 1, A);
-        assertAdd(rb, B, 2, A);
-        assertAdd(rb, C, 3, A);
-        assertAdd(rb, D, 4, A);
-        assertAdd(rb, E, 5, A);
-
-        assertRemove(rb, 5, A);
-        assertAdd(rb, F, 5, B);
-        assertEquals(rb.back(), F);
-    }
-
-    public void testLargeAmounts() {
-        IntRingBuffer rb = new IntRingBuffer(3);
-
-        for (int i = 0; i < 100; i++)
-            rb.add((int) i);
-
-        for (int i = 100; i < 200; i++) {
-            rb.add((int) i);
-            assertEquals((int) (i - 100 + 1), rb.front(1));
-            assertEquals((int) (i - 100), rb.poll(SENTINEL));
-        }
-
-        for (int i = 200; i < 300; i++) {
-            if (i < 299)
-                assertEquals((int) (i - 100 + 1), rb.front(1));
-            assertEquals((int) (i - 100), rb.poll(SENTINEL));
-        }
-    }
-
-    public void testAddExceptionWhenFull() {
-        IntRingBuffer rb = new IntRingBuffer(4, false);
-        assert (rb.add(A));
-        assert (rb.add(B));
-        assert (rb.add(C));
-        assert (rb.add(D));
-
-        // this should throw
-        assertThrows(UnsupportedOperationException.class,
-                () -> rb.add(E));
-    }
-
-    public void testAddOverwriteAndOffer() {
-        IntRingBuffer rb = new IntRingBuffer(4, false);
-        assert (4 == rb.remaining());
-
-        assert (F == rb.addOverwrite(A, F));
-        assert (3 == rb.remaining());
-
-        assert (F == rb.addOverwrite(B, F));
-        assert (2 == rb.remaining());
-
-        assert (F == rb.addOverwrite(C, F));
-        assert (1 == rb.remaining());
-
-        assert (F == rb.addOverwrite(D, F));
-        assert (0 == rb.remaining());
-
-        assert (rb.isFull());
-
-        // now full, should return first value
-        assert (A == rb.addOverwrite(E, F));
-        assert (B == rb.addOverwrite(F, F));
-        assert (rb.isFull());
-
-        // offer() testing
-        assert (!rb.offer(A));
-        assert (C == rb.remove());
-        assert (rb.offer(A));
-
-        // peek testing
-        assert (D == rb.front());
-        assert (E == rb.front(1));
-        assert (F == rb.front(2));
-        // this should throw
-        assertThrows(NoSuchElementException.class,
-                () -> rb.front(99));
-
-        assert (A == rb.peekBack(B));
-
-        // clear() testing
-        rb.clear();
-        assert (rb.isEmpty());
-
-        assert (A == rb.peekBack(A));
-    }
-
-
-    public void testMultipleRemove() {
-        IntRingBuffer rb = new IntRingBuffer(10, false);
-
-        // this should throw
-        assertThrows(NoSuchElementException.class,
-                rb::remove);
-
-        // this should throw
-        assertThrows(NoSuchElementException.class,
-                () -> rb.remove(1));
-
-        rb.add(A);
-        rb.add(B);
-
-        int[] values = rb.remove(2);
-        assertArrayEquals(values, A, B);
-        assertEmpty(rb);
-
-        rb.add(C);
-        rb.add(D);
-        rb.add(E);
-        rb.add(F);
-
-        values = rb.remove(2);
-        assertArrayEquals(values, C, D);
-
-        values = rb.remove(2);
-        assertArrayEquals(values, E, F);
-        assertEmpty(rb);
-
-        rb.add(A);
-        rb.add(B);
-        rb.add(C);
-        rb.add(D);
-        rb.add(E);
-        rb.add(F);
-
-        values = rb.remove(6);
-        assertArrayEquals(values, A, B, C, D, E, F);
-        assertEmpty(rb);
-    }
-
-    public void testAddRemoveUnsafe() {
-        IntRingBuffer rbNoGrow = new IntRingBuffer(3, false);
-
-        // this should throw
-        assertThrows(UnsupportedOperationException.class,
-                () -> rbNoGrow.ensureRemaining(10));
-
-        rbNoGrow.ensureRemaining(3);
-        rbNoGrow.addUnsafe(A);
-        rbNoGrow.addUnsafe(B);
-        rbNoGrow.addUnsafe(C);
-
-        assertContents(rbNoGrow, A, B, C);
-
-        assertEquals(rbNoGrow.removeUnsafe(), A);
-        assertContents(rbNoGrow, B, C);
-
-        assertEquals(rbNoGrow.removeUnsafe(), B);
-        assertContents(rbNoGrow, C);
-
-        assertEquals(rbNoGrow.removeUnsafe(), C);
-        assertEmpty(rbNoGrow);
-
-
-        IntRingBuffer rbGrow = new IntRingBuffer(3, true);
-
-        for (int size = 10; size < 1_000_000; size *= 10) {
-            rbGrow.ensureRemaining(size);
-            assert (rbGrow.remaining() >= size);
-            for (int i = 0; i < size; i++) {
-                rbGrow.addUnsafe(A);
-            }
-        }
-    }
-
-    public void testOverflow() {
-        IntRingBuffer rbA = new IntRingBuffer(0);
-        // this should throw
-        assertThrows(AssertionFailure.class,
-                () -> rbA.ensureRemaining(ArrayUtil.MAX_ARRAY_SIZE + 1));
-
-        IntRingBuffer rbB = new IntRingBuffer(100);
-        for (int i = 0; i < 100; i++) {
-            rbB.addUnsafe(A);
-        }
-        // this should throw
-        assertThrows(AssertionFailure.class,
-                () -> rbB.ensureRemaining(ArrayUtil.MAX_ARRAY_SIZE - 100 + 1));
-    }
-}
diff --git a/Base/src/test/java/io/deephaven/base/ringbuffer/LongRingBufferTest.java b/Base/src/test/java/io/deephaven/base/ringbuffer/LongRingBufferTest.java
deleted file mode 100644
index cd2bfdb1dff..00000000000
--- a/Base/src/test/java/io/deephaven/base/ringbuffer/LongRingBufferTest.java
+++ /dev/null
@@ -1,559 +0,0 @@
-//
-// Copyright (c) 2016-2024 Deephaven Data Labs and Patent Pending
-//
-// ****** AUTO-GENERATED CLASS - DO NOT EDIT MANUALLY
-// ****** Edit CharRingBufferTest and run "./gradlew replicateRingBuffers" to regenerate
-//
-// @formatter:off
-package io.deephaven.base.ringbuffer;
-
-import io.deephaven.base.ArrayUtil;
-import io.deephaven.base.verify.AssertionFailure;
-import junit.framework.TestCase;
-
-import java.util.NoSuchElementException;
-
-import static org.junit.Assert.assertThrows;
-
-public class LongRingBufferTest extends TestCase {
-
-    final long SENTINEL = Long.MIN_VALUE;
-
-    private void assertEmpty(LongRingBuffer rb) {
-        assertTrue(rb.isEmpty());
-        assertEquals(0, rb.size());
-
-        assertEquals(SENTINEL, rb.peek(SENTINEL));
-        try {
-            rb.element();
-            fail("queue should be empty");
-        } catch (NoSuchElementException x) {
-            // expected
-        }
-
-        assertEquals(SENTINEL, rb.poll(SENTINEL));
-        try {
-            rb.remove();
-            fail("queue should be empty");
-        } catch (NoSuchElementException x) {
-            // expected
-        }
-    }
-
-    private void assertFull(LongRingBuffer rb) {
-        assertFalse(rb.isEmpty());
-        assertEquals(rb.capacity(), rb.size());
-    }
-
-    private void assertNotEmpty(LongRingBuffer rb, int expectedSize, long expectedHead) {
-        assertFalse(rb.isEmpty());
-        assertEquals(expectedSize, rb.size());
-
-        assertEquals(expectedHead, rb.peek(SENTINEL));
-        try {
-            assertEquals(expectedHead, rb.element());
-        } catch (NoSuchElementException x) {
-            fail("queue should not be empty");
-        }
-    }
-
-    private void assertAdd(LongRingBuffer rb, long newHead, int expectedSize, long expectedHead) {
-        assertTrue(rb.add(newHead));
-        assertNotEmpty(rb, expectedSize, expectedHead);
-    }
-
-    private void assertOffer(LongRingBuffer rb, long newHead, int expectedSize, long expectedHead) {
-        assertTrue(rb.offer(newHead));
-        assertNotEmpty(rb, expectedSize, expectedHead);
-    }
-
-    private void assertPoll(LongRingBuffer rb, int expectedSize, long expectedHead) {
-        assertNotEmpty(rb, expectedSize, expectedHead);
-        assertEquals(expectedHead, rb.poll(SENTINEL));
-    }
-
-    private void assertRemove(LongRingBuffer rb, int expectedSize, long expectedHead) {
-        assertNotEmpty(rb, expectedSize, expectedHead);
-        try {
-            assertEquals(expectedHead, rb.remove());
-        } catch (NoSuchElementException x) {
-            fail("queue should not be empty");
-        }
-    }
-
-    private void assertContents(LongRingBuffer rb, long... expectedData) {
-        final long[] data = rb.getAll();
-        assertEquals(data.length, expectedData.length);
-        for (int ii = 0; ii < data.length; ii++) {
-            assertEquals(data[ii], expectedData[ii]);
-        }
-    }
-
-    private void assertArrayEquals(long[] data, long... expectedData) {
-        assertEquals(data.length, expectedData.length);
-        for (int ii = 0; ii < data.length; ii++) {
-            assertEquals(data[ii], expectedData[ii]);
-        }
-    }
-
-    long A = 'A';
-    long B = 'B';
-    long C = 'C';
-    long D = 'D';
-    long E = 'E';
-    long F = 'F';
-
-    public void testAddRemove() {
-
-        LongRingBuffer rb = new LongRingBuffer(3);
-
-        assertEmpty(rb);
-
-        assertAdd(rb, A, 1, A);
-        assertAdd(rb, B, 2, A);
-        assertAdd(rb, C, 3, A);
-        assertContents(rb, A, B, C);
-
-        assertRemove(rb, 3, A);
-        assertContents(rb, B, C);
-
-        assertRemove(rb, 2, B);
-        assertContents(rb, C);
-
-        assertRemove(rb, 1, C);
-        assertContents(rb);
-
-        assertEmpty(rb);
-
-        assertAdd(rb, A, 1, A);
-        assertAdd(rb, B, 2, A);
-        assertContents(rb, A, B);
-
-        assertRemove(rb, 2, A);
-        assertContents(rb, B);
-
-        assertAdd(rb, C, 2, B);
-        assertContents(rb, B, C);
-
-        assertRemove(rb, 2, B);
-        assertContents(rb, C);
-
-        assertRemove(rb, 1, C);
-        assertContents(rb);
-
-        assertEmpty(rb);
-
-        assertAdd(rb, A, 1, A);
-        assertRemove(rb, 1, A);
-        assertEmpty(rb);
-        assertAdd(rb, B, 1, B);
-        assertRemove(rb, 1, B);
-        assertEmpty(rb);
-        assertAdd(rb, C, 1, C);
-        assertRemove(rb, 1, C);
-        assertEmpty(rb);
-
-        assertAdd(rb, D, 1, D);
-        assertRemove(rb, 1, D);
-        assertEmpty(rb);
-        assertAdd(rb, E, 1, E);
-        assertRemove(rb, 1, E);
-        assertEmpty(rb);
-        assertAdd(rb, F, 1, F);
-        assertRemove(rb, 1, F);
-        assertEmpty(rb);
-
-        assertAdd(rb, A, 1, A);
-        assertAdd(rb, B, 2, A);
-        assertAdd(rb, C, 3, A);
-        assertContents(rb, A, B, C);
-
-        assertAdd(rb, D, 4, A);
-        assertAdd(rb, E, 5, A);
-        assertAdd(rb, F, 6, A);
-        assertContents(rb, A, B, C, D, E, F);
-
-        assertRemove(rb, 6, A);
-        assertRemove(rb, 5, B);
-        assertRemove(rb, 4, C);
-        assertRemove(rb, 3, D);
-        assertRemove(rb, 2, E);
-        assertRemove(rb, 1, F);
-        assertContents(rb);
-        assertEmpty(rb);
-    }
-
-    public void testOfferPoll() {
-        LongRingBuffer rb = new LongRingBuffer(3);
-
-        assertEmpty(rb);
-
-        assertOffer(rb, A, 1, A);
-        assertOffer(rb, B, 2, A);
-        assertOffer(rb, C, 3, A);
-
-        assertPoll(rb, 3, A);
-        assertPoll(rb, 2, B);
-        assertPoll(rb, 1, C);
-        assertEmpty(rb);
-
-        assertOffer(rb, A, 1, A);
-        assertOffer(rb, B, 2, A);
-        assertPoll(rb, 2, A);
-        assertOffer(rb, C, 2, B);
-        assertPoll(rb, 2, B);
-        assertPoll(rb, 1, C);
-        assertEmpty(rb);
-
-        assertOffer(rb, A, 1, A);
-        assertPoll(rb, 1, A);
-        assertEmpty(rb);
-        assertOffer(rb, B, 1, B);
-        assertPoll(rb, 1, B);
-        assertEmpty(rb);
-        assertOffer(rb, C, 1, C);
-        assertPoll(rb, 1, C);
-        assertEmpty(rb);
-
-        assertOffer(rb, D, 1, D);
-        assertPoll(rb, 1, D);
-        assertEmpty(rb);
-        assertOffer(rb, E, 1, E);
-        assertPoll(rb, 1, E);
-        assertEmpty(rb);
-        assertOffer(rb, F, 1, F);
-        assertPoll(rb, 1, F);
-        assertEmpty(rb);
-
-        assertOffer(rb, A, 1, A);
-        assertOffer(rb, B, 2, A);
-        assertOffer(rb, C, 3, A);
-        assertOffer(rb, D, 4, A);
-
-        assertAdd(rb, E, 5, A); // need one add to grow it from 4 to 8
-        assertOffer(rb, F, 6, A);
-
-        assertPoll(rb, 6, A);
-        assertPoll(rb, 5, B);
-        assertPoll(rb, 4, C);
-        assertPoll(rb, 3, D);
-        assertPoll(rb, 2, E);
-        assertPoll(rb, 1, F);
-        assertEmpty(rb);
-    }
-
-    public void testGrowSimple() {
-        LongRingBuffer rb = new LongRingBuffer(4);
-
-        assertAdd(rb, A, 1, A);
-        assertAdd(rb, B, 2, A);
-        assertAdd(rb, C, 3, A);
-        assertAdd(rb, D, 4, A);
-        assertFull(rb);
-
-        // remove one so head != 0
-        assertRemove(rb, 4, A);
-
-        assertAdd(rb, E, 4, B);
-        // this will grow; the elements are in a single contiguous block
-        assertAdd(rb, F, 5, B);
-
-        assertRemove(rb, 5, B);
-        assertRemove(rb, 4, C);
-        assertRemove(rb, 3, D);
-        assertRemove(rb, 2, E);
-        assertRemove(rb, 1, F);
-        assertEmpty(rb);
-    }
-
-    public void testGrowComplex() {
-        LongRingBuffer rb = new LongRingBuffer(5);
-
-        assertAdd(rb, A, 1, A);
-        assertAdd(rb, B, 2, A);
-        assertAdd(rb, C, 3, A);
-        assertRemove(rb, 3, A);
-        assertRemove(rb, 2, B);
-        assertRemove(rb, 1, C);
-        assertEmpty(rb);
-
-        assertAdd(rb, A, 1, A);
-        assertAdd(rb, B, 2, A);
-        assertAdd(rb, C, 3, A);
-        assertAdd(rb, D, 4, A);
-        assertAdd(rb, E, 5, A);
-
-        // this will grow; the elements are in two blocks
-        assertAdd(rb, F, 6, A);
-
-        assertRemove(rb, 6, A);
-        assertRemove(rb, 5, B);
-        assertRemove(rb, 4, C);
-        assertRemove(rb, 3, D);
-        assertRemove(rb, 2, E);
-        assertRemove(rb, 1, F);
-        assertEmpty(rb);
-    }
-
-    public void testIterator() {
-        LongRingBuffer rb = new LongRingBuffer(3);
-
-        LongRingBuffer.Iterator iter = rb.iterator();
-        assertFalse(iter.hasNext());
-
-        assertAdd(rb, A, 1, A);
-        assertAdd(rb, B, 2, A);
-        assertAdd(rb, C, 3, A);
-
-        iter = rb.iterator();
-        assertTrue(iter.hasNext());
-        assertEquals(A, iter.next());
-        assertTrue(iter.hasNext());
-        assertEquals(B, iter.next());
-        assertTrue(iter.hasNext());
-        assertEquals(C, iter.next());
-        assertFalse(iter.hasNext());
-
-        assertRemove(rb, 3, A);
-        assertAdd(rb, D, 3, B);
-
-        iter = rb.iterator();
-        assertTrue(iter.hasNext());
-        assertEquals(B, iter.next());
-        assertTrue(iter.hasNext());
-        assertEquals(C, iter.next());
-        assertTrue(iter.hasNext());
-        assertEquals(D, iter.next());
-        assertFalse(iter.hasNext());
-
-        assertRemove(rb, 3, B);
-
-        iter = rb.iterator();
-        assertEquals(C, iter.next());
-        assertEquals(D, iter.next());
-        assertFalse(iter.hasNext());
-
-        assertAdd(rb, E, 3, C);
-        assertAdd(rb, F, 4, C);
-
-        iter = rb.iterator();
-        assertTrue(iter.hasNext());
-        assertEquals(C, iter.next());
-        assertTrue(iter.hasNext());
-        assertEquals(D, iter.next());
-        assertTrue(iter.hasNext());
-        assertEquals(E, iter.next());
-        assertTrue(iter.hasNext());
-        assertEquals(F, iter.next());
-        assertFalse(iter.hasNext());
-
-        final LongRingBuffer.Iterator iterFinal = rb.iterator();
-
-        assertThrows(UnsupportedOperationException.class,
-                iterFinal::remove);
-    }
-
-    public void testBack() {
-        LongRingBuffer rb = new LongRingBuffer(5);
-
-        assertAdd(rb, A, 1, A);
-        assertEquals(rb.back(), A);
-
-        assertAdd(rb, B, 2, A);
-        assertAdd(rb, C, 3, A);
-        assertEquals(rb.back(), C);
-    }
-
-    public void testBackWhenEmpty() {
-        LongRingBuffer rb = new LongRingBuffer(5);
-        try {
-            rb.back();
-            fail("expected a NoSuchElement exception");
-        } catch (NoSuchElementException x) {
-            // expected
-        }
-    }
-
-    public void testBackTailIsZero() {
-        LongRingBuffer rb = new LongRingBuffer(5, false);
-
-        assertAdd(rb, A, 1, A);
-        assertAdd(rb, B, 2, A);
-        assertAdd(rb, C, 3, A);
-        assertAdd(rb, D, 4, A);
-        assertAdd(rb, E, 5, A);
-
-        assertRemove(rb, 5, A);
-        assertAdd(rb, F, 5, B);
-        assertEquals(rb.back(), F);
-    }
-
-    public void testLargeAmounts() {
-        LongRingBuffer rb = new LongRingBuffer(3);
-
-        for (int i = 0; i < 100; i++)
-            rb.add((long) i);
-
-        for (int i = 100; i < 200; i++) {
-            rb.add((long) i);
-            assertEquals((long) (i - 100 + 1), rb.front(1));
-            assertEquals((long) (i - 100), rb.poll(SENTINEL));
-        }
-
-        for (int i = 200; i < 300; i++) {
-            if (i < 299)
-                assertEquals((long) (i - 100 + 1), rb.front(1));
-            assertEquals((long) (i - 100), rb.poll(SENTINEL));
-        }
-    }
-
-    public void testAddExceptionWhenFull() {
-        LongRingBuffer rb = new LongRingBuffer(4, false);
-        assert (rb.add(A));
-        assert (rb.add(B));
-        assert (rb.add(C));
-        assert (rb.add(D));
-
-        // this should throw
-        assertThrows(UnsupportedOperationException.class,
-                () -> rb.add(E));
-    }
-
-    public void testAddOverwriteAndOffer() {
-        LongRingBuffer rb = new LongRingBuffer(4, false);
-        assert (4 == rb.remaining());
-
-        assert (F == rb.addOverwrite(A, F));
-        assert (3 == rb.remaining());
-
-        assert (F == rb.addOverwrite(B, F));
-        assert (2 == rb.remaining());
-
-        assert (F == rb.addOverwrite(C, F));
-        assert (1 == rb.remaining());
-
-        assert (F == rb.addOverwrite(D, F));
-        assert (0 == rb.remaining());
-
-        assert (rb.isFull());
-
-        // now full, should return first value
-        assert (A == rb.addOverwrite(E, F));
-        assert (B == rb.addOverwrite(F, F));
-        assert (rb.isFull());
-
-        // offer() testing
-        assert (!rb.offer(A));
-        assert (C == rb.remove());
-        assert (rb.offer(A));
-
-        // peek testing
-        assert (D == rb.front());
-        assert (E == rb.front(1));
-        assert (F == rb.front(2));
-        // this should throw
-        assertThrows(NoSuchElementException.class,
-                () -> rb.front(99));
-
-        assert (A == rb.peekBack(B));
-
-        // clear() testing
-        rb.clear();
-        assert (rb.isEmpty());
-
-        assert (A == rb.peekBack(A));
-    }
-
-
-    public void testMultipleRemove() {
-        LongRingBuffer rb = new LongRingBuffer(10, false);
-
-        // this should throw
-        assertThrows(NoSuchElementException.class,
-                rb::remove);
-
-        // this should throw
-        assertThrows(NoSuchElementException.class,
-                () -> rb.remove(1));
-
-        rb.add(A);
-        rb.add(B);
-
-        long[] values = rb.remove(2);
-        assertArrayEquals(values, A, B);
-        assertEmpty(rb);
-
-        rb.add(C);
-        rb.add(D);
-        rb.add(E);
-        rb.add(F);
-
-        values = rb.remove(2);
-        assertArrayEquals(values, C, D);
-
-        values = rb.remove(2);
-        assertArrayEquals(values, E, F);
-        assertEmpty(rb);
-
-        rb.add(A);
-        rb.add(B);
-        rb.add(C);
-        rb.add(D);
-        rb.add(E);
-        rb.add(F);
-
-        values = rb.remove(6);
-        assertArrayEquals(values, A, B, C, D, E, F);
-        assertEmpty(rb);
-    }
-
-    public void testAddRemoveUnsafe() {
-        LongRingBuffer rbNoGrow = new LongRingBuffer(3, false);
-
-        // this should throw
-        assertThrows(UnsupportedOperationException.class,
-                () -> rbNoGrow.ensureRemaining(10));
-
-        rbNoGrow.ensureRemaining(3);
-        rbNoGrow.addUnsafe(A);
-        rbNoGrow.addUnsafe(B);
-        rbNoGrow.addUnsafe(C);
-
-        assertContents(rbNoGrow, A, B, C);
-
-        assertEquals(rbNoGrow.removeUnsafe(), A);
-        assertContents(rbNoGrow, B, C);
-
-        assertEquals(rbNoGrow.removeUnsafe(), B);
-        assertContents(rbNoGrow, C);
-
-        assertEquals(rbNoGrow.removeUnsafe(), C);
-        assertEmpty(rbNoGrow);
-
-
-        LongRingBuffer rbGrow = new LongRingBuffer(3, true);
-
-        for (int size = 10; size < 1_000_000; size *= 10) {
-            rbGrow.ensureRemaining(size);
-            assert (rbGrow.remaining() >= size);
-            for (int i = 0; i < size; i++) {
-                rbGrow.addUnsafe(A);
-            }
-        }
-    }
-
-    public void testOverflow() {
-        LongRingBuffer rbA = new LongRingBuffer(0);
-        // this should throw
-        assertThrows(AssertionFailure.class,
-                () -> rbA.ensureRemaining(ArrayUtil.MAX_ARRAY_SIZE + 1));
-
-        LongRingBuffer rbB = new LongRingBuffer(100);
-        for (int i = 0; i < 100; i++) {
-            rbB.addUnsafe(A);
-        }
-        // this should throw
-        assertThrows(AssertionFailure.class,
-                () -> rbB.ensureRemaining(ArrayUtil.MAX_ARRAY_SIZE - 100 + 1));
-    }
-}
diff --git a/Base/src/test/java/io/deephaven/base/ringbuffer/ObjectRingBufferTest.java b/Base/src/test/java/io/deephaven/base/ringbuffer/ObjectRingBufferTest.java
deleted file mode 100644
index b7a9db4817e..00000000000
--- a/Base/src/test/java/io/deephaven/base/ringbuffer/ObjectRingBufferTest.java
+++ /dev/null
@@ -1,559 +0,0 @@
-//
-// Copyright (c) 2016-2024 Deephaven Data Labs and Patent Pending
-//
-// ****** AUTO-GENERATED CLASS - DO NOT EDIT MANUALLY
-// ****** Edit CharRingBufferTest and run "./gradlew replicateRingBuffers" to regenerate
-//
-// @formatter:off
-package io.deephaven.base.ringbuffer;
-
-import io.deephaven.base.ArrayUtil;
-import io.deephaven.base.verify.AssertionFailure;
-import junit.framework.TestCase;
-
-import java.util.NoSuchElementException;
-
-import static org.junit.Assert.assertThrows;
-
-public class ObjectRingBufferTest extends TestCase {
-
-    final Object SENTINEL = new Object();
-
-    private void assertEmpty(ObjectRingBuffer rb) {
-        assertTrue(rb.isEmpty());
-        assertEquals(0, rb.size());
-
-        assertEquals(SENTINEL, rb.peek(SENTINEL));
-        try {
-            rb.element();
-            fail("queue should be empty");
-        } catch (NoSuchElementException x) {
-            // expected
-        }
-
-        assertEquals(SENTINEL, rb.poll(SENTINEL));
-        try {
-            rb.remove();
-            fail("queue should be empty");
-        } catch (NoSuchElementException x) {
-            // expected
-        }
-    }
-
-    private void assertFull(ObjectRingBuffer rb) {
-        assertFalse(rb.isEmpty());
-        assertEquals(rb.capacity(), rb.size());
-    }
-
-    private void assertNotEmpty(ObjectRingBuffer rb, int expectedSize, Object expectedHead) {
-        assertFalse(rb.isEmpty());
-        assertEquals(expectedSize, rb.size());
-
-        assertEquals(expectedHead, rb.peek(SENTINEL));
-        try {
-            assertEquals(expectedHead, rb.element());
-        } catch (NoSuchElementException x) {
-            fail("queue should not be empty");
-        }
-    }
-
-    private void assertAdd(ObjectRingBuffer rb, Object newHead, int expectedSize, Object expectedHead) {
-        assertTrue(rb.add(newHead));
-        assertNotEmpty(rb, expectedSize, expectedHead);
-    }
-
-    private void assertOffer(ObjectRingBuffer rb, Object newHead, int expectedSize, Object expectedHead) {
-        assertTrue(rb.offer(newHead));
-        assertNotEmpty(rb, expectedSize, expectedHead);
-    }
-
-    private void assertPoll(ObjectRingBuffer rb, int expectedSize, Object expectedHead) {
-        assertNotEmpty(rb, expectedSize, expectedHead);
-        assertEquals(expectedHead, rb.poll(SENTINEL));
-    }
-
-    private void assertRemove(ObjectRingBuffer rb, int expectedSize, Object expectedHead) {
-        assertNotEmpty(rb, expectedSize, expectedHead);
-        try {
-            assertEquals(expectedHead, rb.remove());
-        } catch (NoSuchElementException x) {
-            fail("queue should not be empty");
-        }
-    }
-
-    private void assertContents(ObjectRingBuffer rb, Object... expectedData) {
-        final Object[] data = rb.getAll();
-        assertEquals(data.length, expectedData.length);
-        for (int ii = 0; ii < data.length; ii++) {
-            assertEquals(data[ii], expectedData[ii]);
-        }
-    }
-
-    private void assertArrayEquals(Object[] data, Object... expectedData) {
-        assertEquals(data.length, expectedData.length);
-        for (int ii = 0; ii < data.length; ii++) {
-            assertEquals(data[ii], expectedData[ii]);
-        }
-    }
-
-    Object A = 'A';
-    Object B = 'B';
-    Object C = 'C';
-    Object D = 'D';
-    Object E = 'E';
-    Object F = 'F';
-
-    public void testAddRemove() {
-
-        ObjectRingBuffer rb = new ObjectRingBuffer(3);
-
-        assertEmpty(rb);
-
-        assertAdd(rb, A, 1, A);
-        assertAdd(rb, B, 2, A);
-        assertAdd(rb, C, 3, A);
-        assertContents(rb, A, B, C);
-
-        assertRemove(rb, 3, A);
-        assertContents(rb, B, C);
-
-        assertRemove(rb, 2, B);
-        assertContents(rb, C);
-
-        assertRemove(rb, 1, C);
-        assertContents(rb);
-
-        assertEmpty(rb);
-
-        assertAdd(rb, A, 1, A);
-        assertAdd(rb, B, 2, A);
-        assertContents(rb, A, B);
-
-        assertRemove(rb, 2, A);
-        assertContents(rb, B);
-
-        assertAdd(rb, C, 2, B);
-        assertContents(rb, B, C);
-
-        assertRemove(rb, 2, B);
-        assertContents(rb, C);
-
-        assertRemove(rb, 1, C);
-        assertContents(rb);
-
-        assertEmpty(rb);
-
-        assertAdd(rb, A, 1, A);
-        assertRemove(rb, 1, A);
-        assertEmpty(rb);
-        assertAdd(rb, B, 1, B);
-        assertRemove(rb, 1, B);
-        assertEmpty(rb);
-        assertAdd(rb, C, 1, C);
-        assertRemove(rb, 1, C);
-        assertEmpty(rb);
-
-        assertAdd(rb, D, 1, D);
-        assertRemove(rb, 1, D);
-        assertEmpty(rb);
-        assertAdd(rb, E, 1, E);
-        assertRemove(rb, 1, E);
-        assertEmpty(rb);
-        assertAdd(rb, F, 1, F);
-        assertRemove(rb, 1, F);
-        assertEmpty(rb);
-
-        assertAdd(rb, A, 1, A);
-        assertAdd(rb, B, 2, A);
-        assertAdd(rb, C, 3, A);
-        assertContents(rb, A, B, C);
-
-        assertAdd(rb, D, 4, A);
-        assertAdd(rb, E, 5, A);
-        assertAdd(rb, F, 6, A);
-        assertContents(rb, A, B, C, D, E, F);
-
-        assertRemove(rb, 6, A);
-        assertRemove(rb, 5, B);
-        assertRemove(rb, 4, C);
-        assertRemove(rb, 3, D);
-        assertRemove(rb, 2, E);
-        assertRemove(rb, 1, F);
-        assertContents(rb);
-        assertEmpty(rb);
-    }
-
-    public void testOfferPoll() {
-        ObjectRingBuffer rb = new ObjectRingBuffer(3);
-
-        assertEmpty(rb);
-
-        assertOffer(rb, A, 1, A);
-        assertOffer(rb, B, 2, A);
-        assertOffer(rb, C, 3, A);
-
-        assertPoll(rb, 3, A);
-        assertPoll(rb, 2, B);
-        assertPoll(rb, 1, C);
-        assertEmpty(rb);
-
-        assertOffer(rb, A, 1, A);
-        assertOffer(rb, B, 2, A);
-        assertPoll(rb, 2, A);
-        assertOffer(rb, C, 2, B);
-        assertPoll(rb, 2, B);
-        assertPoll(rb, 1, C);
-        assertEmpty(rb);
-
-        assertOffer(rb, A, 1, A);
-        assertPoll(rb, 1, A);
-        assertEmpty(rb);
-        assertOffer(rb, B, 1, B);
-        assertPoll(rb, 1, B);
-        assertEmpty(rb);
-        assertOffer(rb, C, 1, C);
-        assertPoll(rb, 1, C);
-        assertEmpty(rb);
-
-        assertOffer(rb, D, 1, D);
-        assertPoll(rb, 1, D);
-        assertEmpty(rb);
-        assertOffer(rb, E, 1, E);
-        assertPoll(rb, 1, E);
-        assertEmpty(rb);
-        assertOffer(rb, F, 1, F);
-        assertPoll(rb, 1, F);
-        assertEmpty(rb);
-
-        assertOffer(rb, A, 1, A);
-        assertOffer(rb, B, 2, A);
-        assertOffer(rb, C, 3, A);
-        assertOffer(rb, D, 4, A);
-
-        assertAdd(rb, E, 5, A); // need one add to grow it from 4 to 8
-        assertOffer(rb, F, 6, A);
-
-        assertPoll(rb, 6, A);
-        assertPoll(rb, 5, B);
-        assertPoll(rb, 4, C);
-        assertPoll(rb, 3, D);
-        assertPoll(rb, 2, E);
-        assertPoll(rb, 1, F);
-        assertEmpty(rb);
-    }
-
-    public void testGrowSimple() {
-        ObjectRingBuffer rb = new ObjectRingBuffer(4);
-
-        assertAdd(rb, A, 1, A);
-        assertAdd(rb, B, 2, A);
-        assertAdd(rb, C, 3, A);
-        assertAdd(rb, D, 4, A);
-        assertFull(rb);
-
-        // remove one so head != 0
-        assertRemove(rb, 4, A);
-
-        assertAdd(rb, E, 4, B);
-        // this will grow; the elements are in a single contiguous block
-        assertAdd(rb, F, 5, B);
-
-        assertRemove(rb, 5, B);
-        assertRemove(rb, 4, C);
-        assertRemove(rb, 3, D);
-        assertRemove(rb, 2, E);
-        assertRemove(rb, 1, F);
-        assertEmpty(rb);
-    }
-
-    public void testGrowComplex() {
-        ObjectRingBuffer rb = new ObjectRingBuffer(5);
-
-        assertAdd(rb, A, 1, A);
-        assertAdd(rb, B, 2, A);
-        assertAdd(rb, C, 3, A);
-        assertRemove(rb, 3, A);
-        assertRemove(rb, 2, B);
-        assertRemove(rb, 1, C);
-        assertEmpty(rb);
-
-        assertAdd(rb, A, 1, A);
-        assertAdd(rb, B, 2, A);
-        assertAdd(rb, C, 3, A);
-        assertAdd(rb, D, 4, A);
-        assertAdd(rb, E, 5, A);
-
-        // this will grow; the elements are in two blocks
-        assertAdd(rb, F, 6, A);
-
-        assertRemove(rb, 6, A);
-        assertRemove(rb, 5, B);
-        assertRemove(rb, 4, C);
-        assertRemove(rb, 3, D);
-        assertRemove(rb, 2, E);
-        assertRemove(rb, 1, F);
-        assertEmpty(rb);
-    }
-
-    public void testIterator() {
-        ObjectRingBuffer rb = new ObjectRingBuffer(3);
-
-        ObjectRingBuffer.Iterator iter = rb.iterator();
-        assertFalse(iter.hasNext());
-
-        assertAdd(rb, A, 1, A);
-        assertAdd(rb, B, 2, A);
-        assertAdd(rb, C, 3, A);
-
-        iter = rb.iterator();
-        assertTrue(iter.hasNext());
-        assertEquals(A, iter.next());
-        assertTrue(iter.hasNext());
-        assertEquals(B, iter.next());
-        assertTrue(iter.hasNext());
-        assertEquals(C, iter.next());
-        assertFalse(iter.hasNext());
-
-        assertRemove(rb, 3, A);
-        assertAdd(rb, D, 3, B);
-
-        iter = rb.iterator();
-        assertTrue(iter.hasNext());
-        assertEquals(B, iter.next());
-        assertTrue(iter.hasNext());
-        assertEquals(C, iter.next());
-        assertTrue(iter.hasNext());
-        assertEquals(D, iter.next());
-        assertFalse(iter.hasNext());
-
-        assertRemove(rb, 3, B);
-
-        iter = rb.iterator();
-        assertEquals(C, iter.next());
-        assertEquals(D, iter.next());
-        assertFalse(iter.hasNext());
-
-        assertAdd(rb, E, 3, C);
-        assertAdd(rb, F, 4, C);
-
-        iter = rb.iterator();
-        assertTrue(iter.hasNext());
-        assertEquals(C, iter.next());
-        assertTrue(iter.hasNext());
-        assertEquals(D, iter.next());
-        assertTrue(iter.hasNext());
-        assertEquals(E, iter.next());
-        assertTrue(iter.hasNext());
-        assertEquals(F, iter.next());
-        assertFalse(iter.hasNext());
-
-        final ObjectRingBuffer.Iterator iterFinal = rb.iterator();
-
-        assertThrows(UnsupportedOperationException.class,
-                iterFinal::remove);
-    }
-
-    public void testBack() {
-        ObjectRingBuffer rb = new ObjectRingBuffer(5);
-
-        assertAdd(rb, A, 1, A);
-        assertEquals(rb.back(), A);
-
-        assertAdd(rb, B, 2, A);
-        assertAdd(rb, C, 3, A);
-        assertEquals(rb.back(), C);
-    }
-
-    public void testBackWhenEmpty() {
-        ObjectRingBuffer rb = new ObjectRingBuffer(5);
-        try {
-            rb.back();
-            fail("expected a NoSuchElement exception");
-        } catch (NoSuchElementException x) {
-            // expected
-        }
-    }
-
-    public void testBackTailIsZero() {
-        ObjectRingBuffer rb = new ObjectRingBuffer(5, false);
-
-        assertAdd(rb, A, 1, A);
-        assertAdd(rb, B, 2, A);
-        assertAdd(rb, C, 3, A);
-        assertAdd(rb, D, 4, A);
-        assertAdd(rb, E, 5, A);
-
-        assertRemove(rb, 5, A);
-        assertAdd(rb, F, 5, B);
-        assertEquals(rb.back(), F);
-    }
-
-    public void testLargeAmounts() {
-        ObjectRingBuffer rb = new ObjectRingBuffer(3);
-
-        for (int i = 0; i < 100; i++)
-            rb.add((Object) i);
-
-        for (int i = 100; i < 200; i++) {
-            rb.add((Object) i);
-            assertEquals((Object) (i - 100 + 1), rb.front(1));
-            assertEquals((Object) (i - 100), rb.poll(SENTINEL));
-        }
-
-        for (int i = 200; i < 300; i++) {
-            if (i < 299)
-                assertEquals((Object) (i - 100 + 1), rb.front(1));
-            assertEquals((Object) (i - 100), rb.poll(SENTINEL));
-        }
-    }
-
-    public void testAddExceptionWhenFull() {
-        ObjectRingBuffer rb = new ObjectRingBuffer(4, false);
-        assert (rb.add(A));
-        assert (rb.add(B));
-        assert (rb.add(C));
-        assert (rb.add(D));
-
-        // this should throw
-        assertThrows(UnsupportedOperationException.class,
-                () -> rb.add(E));
-    }
-
-    public void testAddOverwriteAndOffer() {
-        ObjectRingBuffer rb = new ObjectRingBuffer(4, false);
-        assert (4 == rb.remaining());
-
-        assert (F == rb.addOverwrite(A, F));
-        assert (3 == rb.remaining());
-
-        assert (F == rb.addOverwrite(B, F));
-        assert (2 == rb.remaining());
-
-        assert (F == rb.addOverwrite(C, F));
-        assert (1 == rb.remaining());
-
-        assert (F == rb.addOverwrite(D, F));
-        assert (0 == rb.remaining());
-
-        assert (rb.isFull());
-
-        // now full, should return first value
-        assert (A == rb.addOverwrite(E, F));
-        assert (B == rb.addOverwrite(F, F));
-        assert (rb.isFull());
-
-        // offer() testing
-        assert (!rb.offer(A));
-        assert (C == rb.remove());
-        assert (rb.offer(A));
-
-        // peek testing
-        assert (D == rb.front());
-        assert (E == rb.front(1));
-        assert (F == rb.front(2));
-        // this should throw
-        assertThrows(NoSuchElementException.class,
-                () -> rb.front(99));
-
-        assert (A == rb.peekBack(B));
-
-        // clear() testing
-        rb.clear();
-        assert (rb.isEmpty());
-
-        assert (A == rb.peekBack(A));
-    }
-
-
-    public void testMultipleRemove() {
-        ObjectRingBuffer rb = new ObjectRingBuffer(10, false);
-
-        // this should throw
-        assertThrows(NoSuchElementException.class,
-                rb::remove);
-
-        // this should throw
-        assertThrows(NoSuchElementException.class,
-                () -> rb.remove(1));
-
-        rb.add(A);
-        rb.add(B);
-
-        Object[] values = rb.remove(2);
-        assertArrayEquals(values, A, B);
-        assertEmpty(rb);
-
-        rb.add(C);
-        rb.add(D);
-        rb.add(E);
-        rb.add(F);
-
-        values = rb.remove(2);
-        assertArrayEquals(values, C, D);
-
-        values = rb.remove(2);
-        assertArrayEquals(values, E, F);
-        assertEmpty(rb);
-
-        rb.add(A);
-        rb.add(B);
-        rb.add(C);
-        rb.add(D);
-        rb.add(E);
-        rb.add(F);
-
-        values = rb.remove(6);
-        assertArrayEquals(values, A, B, C, D, E, F);
-        assertEmpty(rb);
-    }
-
-    public void testAddRemoveUnsafe() {
-        ObjectRingBuffer rbNoGrow = new ObjectRingBuffer(3, false);
-
-        // this should throw
-        assertThrows(UnsupportedOperationException.class,
-                () -> rbNoGrow.ensureRemaining(10));
-
-        rbNoGrow.ensureRemaining(3);
-        rbNoGrow.addUnsafe(A);
-        rbNoGrow.addUnsafe(B);
-        rbNoGrow.addUnsafe(C);
-
-        assertContents(rbNoGrow, A, B, C);
-
-        assertEquals(rbNoGrow.removeUnsafe(), A);
-        assertContents(rbNoGrow, B, C);
-
-        assertEquals(rbNoGrow.removeUnsafe(), B);
-        assertContents(rbNoGrow, C);
-
-        assertEquals(rbNoGrow.removeUnsafe(), C);
-        assertEmpty(rbNoGrow);
-
-
-        ObjectRingBuffer rbGrow = new ObjectRingBuffer(3, true);
-
-        for (int size = 10; size < 1_000_000; size *= 10) {
-            rbGrow.ensureRemaining(size);
-            assert (rbGrow.remaining() >= size);
-            for (int i = 0; i < size; i++) {
-                rbGrow.addUnsafe(A);
-            }
-        }
-    }
-
-    public void testOverflow() {
-        ObjectRingBuffer rbA = new ObjectRingBuffer(0);
-        // this should throw
-        assertThrows(AssertionFailure.class,
-                () -> rbA.ensureRemaining(ArrayUtil.MAX_ARRAY_SIZE + 1));
-
-        ObjectRingBuffer rbB = new ObjectRingBuffer(100);
-        for (int i = 0; i < 100; i++) {
-            rbB.addUnsafe(A);
-        }
-        // this should throw
-        assertThrows(AssertionFailure.class,
-                () -> rbB.ensureRemaining(ArrayUtil.MAX_ARRAY_SIZE - 100 + 1));
-    }
-}
diff --git a/Base/src/test/java/io/deephaven/base/ringbuffer/ShortRingBufferTest.java b/Base/src/test/java/io/deephaven/base/ringbuffer/ShortRingBufferTest.java
deleted file mode 100644
index baff6f06fbd..00000000000
--- a/Base/src/test/java/io/deephaven/base/ringbuffer/ShortRingBufferTest.java
+++ /dev/null
@@ -1,559 +0,0 @@
-//
-// Copyright (c) 2016-2024 Deephaven Data Labs and Patent Pending
-//
-// ****** AUTO-GENERATED CLASS - DO NOT EDIT MANUALLY
-// ****** Edit CharRingBufferTest and run "./gradlew replicateRingBuffers" to regenerate
-//
-// @formatter:off
-package io.deephaven.base.ringbuffer;
-
-import io.deephaven.base.ArrayUtil;
-import io.deephaven.base.verify.AssertionFailure;
-import junit.framework.TestCase;
-
-import java.util.NoSuchElementException;
-
-import static org.junit.Assert.assertThrows;
-
-public class ShortRingBufferTest extends TestCase {
-
-    final short SENTINEL = Short.MIN_VALUE;
-
-    private void assertEmpty(ShortRingBuffer rb) {
-        assertTrue(rb.isEmpty());
-        assertEquals(0, rb.size());
-
-        assertEquals(SENTINEL, rb.peek(SENTINEL));
-        try {
-            rb.element();
-            fail("queue should be empty");
-        } catch (NoSuchElementException x) {
-            // expected
-        }
-
-        assertEquals(SENTINEL, rb.poll(SENTINEL));
-        try {
-            rb.remove();
-            fail("queue should be empty");
-        } catch (NoSuchElementException x) {
-            // expected
-        }
-    }
-
-    private void assertFull(ShortRingBuffer rb) {
-        assertFalse(rb.isEmpty());
-        assertEquals(rb.capacity(), rb.size());
-    }
-
-    private void assertNotEmpty(ShortRingBuffer rb, int expectedSize, short expectedHead) {
-        assertFalse(rb.isEmpty());
-        assertEquals(expectedSize, rb.size());
-
-        assertEquals(expectedHead, rb.peek(SENTINEL));
-        try {
-            assertEquals(expectedHead, rb.element());
-        } catch (NoSuchElementException x) {
-            fail("queue should not be empty");
-        }
-    }
-
-    private void assertAdd(ShortRingBuffer rb, short newHead, int expectedSize, short expectedHead) {
-        assertTrue(rb.add(newHead));
-        assertNotEmpty(rb, expectedSize, expectedHead);
-    }
-
-    private void assertOffer(ShortRingBuffer rb, short newHead, int expectedSize, short expectedHead) {
-        assertTrue(rb.offer(newHead));
-        assertNotEmpty(rb, expectedSize, expectedHead);
-    }
-
-    private void assertPoll(ShortRingBuffer rb, int expectedSize, short expectedHead) {
-        assertNotEmpty(rb, expectedSize, expectedHead);
-        assertEquals(expectedHead, rb.poll(SENTINEL));
-    }
-
-    private void assertRemove(ShortRingBuffer rb, int expectedSize, short expectedHead) {
-        assertNotEmpty(rb, expectedSize, expectedHead);
-        try {
-            assertEquals(expectedHead, rb.remove());
-        } catch (NoSuchElementException x) {
-            fail("queue should not be empty");
-        }
-    }
-
-    private void assertContents(ShortRingBuffer rb, short... expectedData) {
-        final short[] data = rb.getAll();
-        assertEquals(data.length, expectedData.length);
-        for (int ii = 0; ii < data.length; ii++) {
-            assertEquals(data[ii], expectedData[ii]);
-        }
-    }
-
-    private void assertArrayEquals(short[] data, short... expectedData) {
-        assertEquals(data.length, expectedData.length);
-        for (int ii = 0; ii < data.length; ii++) {
-            assertEquals(data[ii], expectedData[ii]);
-        }
-    }
-
-    short A = 'A';
-    short B = 'B';
-    short C = 'C';
-    short D = 'D';
-    short E = 'E';
-    short F = 'F';
-
-    public void testAddRemove() {
-
-        ShortRingBuffer rb = new ShortRingBuffer(3);
-
-        assertEmpty(rb);
-
-        assertAdd(rb, A, 1, A);
-        assertAdd(rb, B, 2, A);
-        assertAdd(rb, C, 3, A);
-        assertContents(rb, A, B, C);
-
-        assertRemove(rb, 3, A);
-        assertContents(rb, B, C);
-
-        assertRemove(rb, 2, B);
-        assertContents(rb, C);
-
-        assertRemove(rb, 1, C);
-        assertContents(rb);
-
-        assertEmpty(rb);
-
-        assertAdd(rb, A, 1, A);
-        assertAdd(rb, B, 2, A);
-        assertContents(rb, A, B);
-
-        assertRemove(rb, 2, A);
-        assertContents(rb, B);
-
-        assertAdd(rb, C, 2, B);
-        assertContents(rb, B, C);
-
-        assertRemove(rb, 2, B);
-        assertContents(rb, C);
-
-        assertRemove(rb, 1, C);
-        assertContents(rb);
-
-        assertEmpty(rb);
-
-        assertAdd(rb, A, 1, A);
-        assertRemove(rb, 1, A);
-        assertEmpty(rb);
-        assertAdd(rb, B, 1, B);
-        assertRemove(rb, 1, B);
-        assertEmpty(rb);
-        assertAdd(rb, C, 1, C);
-        assertRemove(rb, 1, C);
-        assertEmpty(rb);
-
-        assertAdd(rb, D, 1, D);
-        assertRemove(rb, 1, D);
-        assertEmpty(rb);
-        assertAdd(rb, E, 1, E);
-        assertRemove(rb, 1, E);
-        assertEmpty(rb);
-        assertAdd(rb, F, 1, F);
-        assertRemove(rb, 1, F);
-        assertEmpty(rb);
-
-        assertAdd(rb, A, 1, A);
-        assertAdd(rb, B, 2, A);
-        assertAdd(rb, C, 3, A);
-        assertContents(rb, A, B, C);
-
-        assertAdd(rb, D, 4, A);
-        assertAdd(rb, E, 5, A);
-        assertAdd(rb, F, 6, A);
-        assertContents(rb, A, B, C, D, E, F);
-
-        assertRemove(rb, 6, A);
-        assertRemove(rb, 5, B);
-        assertRemove(rb, 4, C);
-        assertRemove(rb, 3, D);
-        assertRemove(rb, 2, E);
-        assertRemove(rb, 1, F);
-        assertContents(rb);
-        assertEmpty(rb);
-    }
-
-    public void testOfferPoll() {
-        ShortRingBuffer rb = new ShortRingBuffer(3);
-
-        assertEmpty(rb);
-
-        assertOffer(rb, A, 1, A);
-        assertOffer(rb, B, 2, A);
-        assertOffer(rb, C, 3, A);
-
-        assertPoll(rb, 3, A);
-        assertPoll(rb, 2, B);
-        assertPoll(rb, 1, C);
-        assertEmpty(rb);
-
-        assertOffer(rb, A, 1, A);
-        assertOffer(rb, B, 2, A);
-        assertPoll(rb, 2, A);
-        assertOffer(rb, C, 2, B);
-        assertPoll(rb, 2, B);
-        assertPoll(rb, 1, C);
-        assertEmpty(rb);
-
-        assertOffer(rb, A, 1, A);
-        assertPoll(rb, 1, A);
-        assertEmpty(rb);
-        assertOffer(rb, B, 1, B);
-        assertPoll(rb, 1, B);
-        assertEmpty(rb);
-        assertOffer(rb, C, 1, C);
-        assertPoll(rb, 1, C);
-        assertEmpty(rb);
-
-        assertOffer(rb, D, 1, D);
-        assertPoll(rb, 1, D);
-        assertEmpty(rb);
-        assertOffer(rb, E, 1, E);
-        assertPoll(rb, 1, E);
-        assertEmpty(rb);
-        assertOffer(rb, F, 1, F);
-        assertPoll(rb, 1, F);
-        assertEmpty(rb);
-
-        assertOffer(rb, A, 1, A);
-        assertOffer(rb, B, 2, A);
-        assertOffer(rb, C, 3, A);
-        assertOffer(rb, D, 4, A);
-
-        assertAdd(rb, E, 5, A); // need one add to grow it from 4 to 8
-        assertOffer(rb, F, 6, A);
-
-        assertPoll(rb, 6, A);
-        assertPoll(rb, 5, B);
-        assertPoll(rb, 4, C);
-        assertPoll(rb, 3, D);
-        assertPoll(rb, 2, E);
-        assertPoll(rb, 1, F);
-        assertEmpty(rb);
-    }
-
-    public void testGrowSimple() {
-        ShortRingBuffer rb = new ShortRingBuffer(4);
-
-        assertAdd(rb, A, 1, A);
-        assertAdd(rb, B, 2, A);
-        assertAdd(rb, C, 3, A);
-        assertAdd(rb, D, 4, A);
-        assertFull(rb);
-
-        // remove one so head != 0
-        assertRemove(rb, 4, A);
-
-        assertAdd(rb, E, 4, B);
-        // this will grow; the elements are in a single contiguous block
-        assertAdd(rb, F, 5, B);
-
-        assertRemove(rb, 5, B);
-        assertRemove(rb, 4, C);
-        assertRemove(rb, 3, D);
-        assertRemove(rb, 2, E);
-        assertRemove(rb, 1, F);
-        assertEmpty(rb);
-    }
-
-    public void testGrowComplex() {
-        ShortRingBuffer rb = new ShortRingBuffer(5);
-
-        assertAdd(rb, A, 1, A);
-        assertAdd(rb, B, 2, A);
-        assertAdd(rb, C, 3, A);
-        assertRemove(rb, 3, A);
-        assertRemove(rb, 2, B);
-        assertRemove(rb, 1, C);
-        assertEmpty(rb);
-
-        assertAdd(rb, A, 1, A);
-        assertAdd(rb, B, 2, A);
-        assertAdd(rb, C, 3, A);
-        assertAdd(rb, D, 4, A);
-        assertAdd(rb, E, 5, A);
-
-        // this will grow; the elements are in two blocks
-        assertAdd(rb, F, 6, A);
-
-        assertRemove(rb, 6, A);
-        assertRemove(rb, 5, B);
-        assertRemove(rb, 4, C);
-        assertRemove(rb, 3, D);
-        assertRemove(rb, 2, E);
-        assertRemove(rb, 1, F);
-        assertEmpty(rb);
-    }
-
-    public void testIterator() {
-        ShortRingBuffer rb = new ShortRingBuffer(3);
-
-        ShortRingBuffer.Iterator iter = rb.iterator();
-        assertFalse(iter.hasNext());
-
-        assertAdd(rb, A, 1, A);
-        assertAdd(rb, B, 2, A);
-        assertAdd(rb, C, 3, A);
-
-        iter = rb.iterator();
-        assertTrue(iter.hasNext());
-        assertEquals(A, iter.next());
-        assertTrue(iter.hasNext());
-        assertEquals(B, iter.next());
-        assertTrue(iter.hasNext());
-        assertEquals(C, iter.next());
-        assertFalse(iter.hasNext());
-
-        assertRemove(rb, 3, A);
-        assertAdd(rb, D, 3, B);
-
-        iter = rb.iterator();
-        assertTrue(iter.hasNext());
-        assertEquals(B, iter.next());
-        assertTrue(iter.hasNext());
-        assertEquals(C, iter.next());
-        assertTrue(iter.hasNext());
-        assertEquals(D, iter.next());
-        assertFalse(iter.hasNext());
-
-        assertRemove(rb, 3, B);
-
-        iter = rb.iterator();
-        assertEquals(C, iter.next());
-        assertEquals(D, iter.next());
-        assertFalse(iter.hasNext());
-
-        assertAdd(rb, E, 3, C);
-        assertAdd(rb, F, 4, C);
-
-        iter = rb.iterator();
-        assertTrue(iter.hasNext());
-        assertEquals(C, iter.next());
-        assertTrue(iter.hasNext());
-        assertEquals(D, iter.next());
-        assertTrue(iter.hasNext());
-        assertEquals(E, iter.next());
-        assertTrue(iter.hasNext());
-        assertEquals(F, iter.next());
-        assertFalse(iter.hasNext());
-
-        final ShortRingBuffer.Iterator iterFinal = rb.iterator();
-
-        assertThrows(UnsupportedOperationException.class,
-                iterFinal::remove);
-    }
-
-    public void testBack() {
-        ShortRingBuffer rb = new ShortRingBuffer(5);
-
-        assertAdd(rb, A, 1, A);
-        assertEquals(rb.back(), A);
-
-        assertAdd(rb, B, 2, A);
-        assertAdd(rb, C, 3, A);
-        assertEquals(rb.back(), C);
-    }
-
-    public void testBackWhenEmpty() {
-        ShortRingBuffer rb = new ShortRingBuffer(5);
-        try {
-            rb.back();
-            fail("expected a NoSuchElement exception");
-        } catch (NoSuchElementException x) {
-            // expected
-        }
-    }
-
-    public void testBackTailIsZero() {
-        ShortRingBuffer rb = new ShortRingBuffer(5, false);
-
-        assertAdd(rb, A, 1, A);
-        assertAdd(rb, B, 2, A);
-        assertAdd(rb, C, 3, A);
-        assertAdd(rb, D, 4, A);
-        assertAdd(rb, E, 5, A);
-
-        assertRemove(rb, 5, A);
-        assertAdd(rb, F, 5, B);
-        assertEquals(rb.back(), F);
-    }
-
-    public void testLargeAmounts() {
-        ShortRingBuffer rb = new ShortRingBuffer(3);
-
-        for (int i = 0; i < 100; i++)
-            rb.add((short) i);
-
-        for (int i = 100; i < 200; i++) {
-            rb.add((short) i);
-            assertEquals((short) (i - 100 + 1), rb.front(1));
-            assertEquals((short) (i - 100), rb.poll(SENTINEL));
-        }
-
-        for (int i = 200; i < 300; i++) {
-            if (i < 299)
-                assertEquals((short) (i - 100 + 1), rb.front(1));
-            assertEquals((short) (i - 100), rb.poll(SENTINEL));
-        }
-    }
-
-    public void testAddExceptionWhenFull() {
-        ShortRingBuffer rb = new ShortRingBuffer(4, false);
-        assert (rb.add(A));
-        assert (rb.add(B));
-        assert (rb.add(C));
-        assert (rb.add(D));
-
-        // this should throw
-        assertThrows(UnsupportedOperationException.class,
-                () -> rb.add(E));
-    }
-
-    public void testAddOverwriteAndOffer() {
-        ShortRingBuffer rb = new ShortRingBuffer(4, false);
-        assert (4 == rb.remaining());
-
-        assert (F == rb.addOverwrite(A, F));
-        assert (3 == rb.remaining());
-
-        assert (F == rb.addOverwrite(B, F));
-        assert (2 == rb.remaining());
-
-        assert (F == rb.addOverwrite(C, F));
-        assert (1 == rb.remaining());
-
-        assert (F == rb.addOverwrite(D, F));
-        assert (0 == rb.remaining());
-
-        assert (rb.isFull());
-
-        // now full, should return first value
-        assert (A == rb.addOverwrite(E, F));
-        assert (B == rb.addOverwrite(F, F));
-        assert (rb.isFull());
-
-        // offer() testing
-        assert (!rb.offer(A));
-        assert (C == rb.remove());
-        assert (rb.offer(A));
-
-        // peek testing
-        assert (D == rb.front());
-        assert (E == rb.front(1));
-        assert (F == rb.front(2));
-        // this should throw
-        assertThrows(NoSuchElementException.class,
-                () -> rb.front(99));
-
-        assert (A == rb.peekBack(B));
-
-        // clear() testing
-        rb.clear();
-        assert (rb.isEmpty());
-
-        assert (A == rb.peekBack(A));
-    }
-
-
-    public void testMultipleRemove() {
-        ShortRingBuffer rb = new ShortRingBuffer(10, false);
-
-        // this should throw
-        assertThrows(NoSuchElementException.class,
-                rb::remove);
-
-        // this should throw
-        assertThrows(NoSuchElementException.class,
-                () -> rb.remove(1));
-
-        rb.add(A);
-        rb.add(B);
-
-        short[] values = rb.remove(2);
-        assertArrayEquals(values, A, B);
-        assertEmpty(rb);
-
-        rb.add(C);
-        rb.add(D);
-        rb.add(E);
-        rb.add(F);
-
-        values = rb.remove(2);
-        assertArrayEquals(values, C, D);
-
-        values = rb.remove(2);
-        assertArrayEquals(values, E, F);
-        assertEmpty(rb);
-
-        rb.add(A);
-        rb.add(B);
-        rb.add(C);
-        rb.add(D);
-        rb.add(E);
-        rb.add(F);
-
-        values = rb.remove(6);
-        assertArrayEquals(values, A, B, C, D, E, F);
-        assertEmpty(rb);
-    }
-
-    public void testAddRemoveUnsafe() {
-        ShortRingBuffer rbNoGrow = new ShortRingBuffer(3, false);
-
-        // this should throw
-        assertThrows(UnsupportedOperationException.class,
-                () -> rbNoGrow.ensureRemaining(10));
-
-        rbNoGrow.ensureRemaining(3);
-        rbNoGrow.addUnsafe(A);
-        rbNoGrow.addUnsafe(B);
-        rbNoGrow.addUnsafe(C);
-
-        assertContents(rbNoGrow, A, B, C);
-
-        assertEquals(rbNoGrow.removeUnsafe(), A);
-        assertContents(rbNoGrow, B, C);
-
-        assertEquals(rbNoGrow.removeUnsafe(), B);
-        assertContents(rbNoGrow, C);
-
-        assertEquals(rbNoGrow.removeUnsafe(), C);
-        assertEmpty(rbNoGrow);
-
-
-        ShortRingBuffer rbGrow = new ShortRingBuffer(3, true);
-
-        for (int size = 10; size < 1_000_000; size *= 10) {
-            rbGrow.ensureRemaining(size);
-            assert (rbGrow.remaining() >= size);
-            for (int i = 0; i < size; i++) {
-                rbGrow.addUnsafe(A);
-            }
-        }
-    }
-
-    public void testOverflow() {
-        ShortRingBuffer rbA = new ShortRingBuffer(0);
-        // this should throw
-        assertThrows(AssertionFailure.class,
-                () -> rbA.ensureRemaining(ArrayUtil.MAX_ARRAY_SIZE + 1));
-
-        ShortRingBuffer rbB = new ShortRingBuffer(100);
-        for (int i = 0; i < 100; i++) {
-            rbB.addUnsafe(A);
-        }
-        // this should throw
-        assertThrows(AssertionFailure.class,
-                () -> rbB.ensureRemaining(ArrayUtil.MAX_ARRAY_SIZE - 100 + 1));
-    }
-}
diff --git a/Base/src/test/java/io/deephaven/base/ringbuffer/TestAggregatingByteRingBuffer.java b/Base/src/test/java/io/deephaven/base/ringbuffer/TestAggregatingByteRingBuffer.java
new file mode 100644
index 00000000000..38e238159f5
--- /dev/null
+++ b/Base/src/test/java/io/deephaven/base/ringbuffer/TestAggregatingByteRingBuffer.java
@@ -0,0 +1,192 @@
+//
+// Copyright (c) 2016-2024 Deephaven Data Labs and Patent Pending
+//
+// ****** AUTO-GENERATED CLASS - DO NOT EDIT MANUALLY
+// ****** Edit TestAggregatingCharRingBuffer and run "./gradlew replicateRingBuffers" to regenerate
+//
+// @formatter:off
+package io.deephaven.base.ringbuffer;
+
+import junit.framework.TestCase;
+
+import java.util.NoSuchElementException;
+import java.util.Random;
+
+public class TestAggregatingByteRingBuffer extends TestCase {
+
+    private void assertEmpty(AggregatingByteRingBuffer rb) {
+        assertTrue(rb.isEmpty());
+        assertEquals(0, rb.size());
+
+        try {
+            rb.remove();
+            fail("queue should be empty");
+        } catch (NoSuchElementException x) {
+            // expected
+        }
+
+        try {
+            rb.element();
+            fail("queue should be empty");
+        } catch (NoSuchElementException x) {
+            // expected
+        }
+    }
+
+    public void testLargeAmounts() {
+        final AggregatingByteRingBuffer rb = new AggregatingByteRingBuffer(3, (byte) 0, (a, b) -> (byte) (a + b));
+
+        // move the head and tail off zero
+        for (int i = 0; i < 1000; i++) {
+            rb.add((byte) i);
+        }
+        for (int i = 0; i < 1000; i++) {
+            rb.remove();
+        }
+
+        for (int i = 0; i < 10_000; i++)
+            rb.add((byte) i);
+
+        for (int i = 10_000; i < 1_000_000; i++) {
+            rb.add((byte) i);
+            assertEquals((byte) (i - 10_000 + 1), rb.front(1));
+            assertEquals((byte) (i - 10_000), rb.remove());
+            assertEquals(rb.remaining(), rb.capacity() - rb.size());
+        }
+    }
+
+    public void testEvaluateMinLargeAmounts() {
+        final AggregatingByteRingBuffer rb =
+                new AggregatingByteRingBuffer(3, Byte.MAX_VALUE, (a, b) -> (byte) Math.min(a, b));
+        for (int i = 0; i < 10_000; i++)
+            rb.add((byte) i);
+
+        final int maxVal = (int) Math.min(Byte.MAX_VALUE, 1_000_000);
+
+        for (int i = 10_000; i < maxVal; i++) {
+            rb.add((byte) i);
+            assertEquals((byte) (i - 10_000) + 1, rb.front(1));
+            assertEquals((byte) (i - 10_000), rb.evaluate()); // front of queue is min
+            assertEquals((byte) (i - 10_000), rb.remove());
+        }
+    }
+
+    public void testEvaluateMaxLargeAmounts() {
+        final AggregatingByteRingBuffer rb =
+                new AggregatingByteRingBuffer(3, Byte.MIN_VALUE, (a, b) -> (byte) Math.max(a, b));
+        for (int i = 0; i < 10_000; i++)
+            rb.add((byte) i);
+
+        final int maxVal = (int) Math.min(Byte.MAX_VALUE, 1_000_000);
+
+        for (int i = 10_000; i < maxVal; i++) {
+            rb.add((byte) i);
+            assertEquals((byte) (i - 10_000 + 1), rb.front(1));
+            assertEquals((byte) i, rb.evaluate()); // last value added is max
+            assertEquals((byte) (i - 10_000), rb.remove());
+        }
+    }
+
+    // region non-byte-tests
+    // Tests removed due to limitations of byte storage
+    // endregion non-byte-tests
+
+    public void testPushPopUnsafe() {
+        final AggregatingByteRingBuffer rb =
+                new AggregatingByteRingBuffer(3, (byte) -Byte.MAX_VALUE, (a, b) -> (byte) Math.max(a, b));
+        // move the head and tail off zero
+        rb.ensureRemaining(100);
+        for (byte i = 0; i < 100; i++) {
+            rb.addUnsafe(i);
+        }
+        for (byte i = 0; i < 100; i++) {
+            assertEquals(rb.removeUnsafe(), i);
+        }
+
+        // do it again with an offset
+        rb.ensureRemaining(100);
+        for (byte i = 0; i < 100; i++) {
+            rb.addUnsafe((byte) (i + (byte) 1000));
+        }
+        for (byte i = 0; i < 100; i++) {
+            assertEquals(rb.removeUnsafe(), i + (byte) 1000);
+        }
+
+        for (byte i = 0; i < 100; i++) {
+            rb.addUnsafe((byte) (i + (byte) 1000));
+        }
+        rb.clear();
+
+        for (byte i = 0; i < 100; i++) {
+            rb.add(i);
+        }
+        assertEquals((byte) 99, rb.evaluate()); // last value added is max
+    }
+
+    public void testPopMultiple() {
+        final AggregatingByteRingBuffer rb = new AggregatingByteRingBuffer(3, (byte) 0, (a, b) -> (byte) (a + b));
+
+        for (int step = 0; step < 10; step++) {
+            rb.ensureRemaining(100);
+            for (byte i = 0; i < 100; i++) {
+                rb.addUnsafe(i);
+            }
+
+            if (step % 2 == 0) {
+                rb.evaluate();
+            }
+
+            try {
+                byte[] values = rb.remove(101);
+                fail("popping more values than size() should fail");
+            } catch (NoSuchElementException x) {
+                // expected
+            }
+
+            byte[] values = rb.remove(100);
+            for (byte i = 0; i < 100; i++) {
+                assertEquals(values[(int) i], i);
+            }
+            assertEmpty(rb);
+        }
+    }
+
+    public void testSpecialCaseA() {
+        // overlapping push and pop ranges with popTail < pushTail
+        final AggregatingByteRingBuffer rb = new AggregatingByteRingBuffer(4, (byte) 0, (a, b) -> (byte) (a + b));
+        rb.add((byte) 1);
+        assertEquals((byte) 1, rb.remove());
+        rb.add((byte) 2);
+        rb.add((byte) 3);
+        assertEquals((byte) 5, rb.evaluate());
+    }
+
+    public void testSpecialCaseB() {
+        // push the full capacity while wrapped
+        final AggregatingByteRingBuffer rb = new AggregatingByteRingBuffer(64, (byte) 0, (a, b) -> (byte) (a + b));
+        rb.add((byte) 1);
+        assertEquals((byte) 1, rb.remove());
+
+        for (int i = 0; i < 64; i++) {
+            rb.add((byte) 1);
+        }
+        assertEquals((byte) 64, rb.evaluate());
+    }
+
+    public void testSpecialCaseC() {
+        // overlapping push and pop ranges with popTail < pushTail
+        final AggregatingByteRingBuffer rb = new AggregatingByteRingBuffer(16, (byte) 0, (a, b) -> (byte) (a + b));
+        // move pointers to middle of storage
+        for (int i = 0; i < 8; i++) {
+            rb.add((byte) 1);
+            rb.remove();
+        }
+        assertEquals((byte) 0, rb.evaluate());
+
+        for (int i = 0; i < 11; i++) {
+            rb.add((byte) 1);
+        }
+        rb.remove();
+        assertEquals((byte) 10, rb.evaluate());
+    }
+}
diff --git a/Base/src/test/java/io/deephaven/base/ringbuffer/TestAggregatingCharRingBuffer.java b/Base/src/test/java/io/deephaven/base/ringbuffer/TestAggregatingCharRingBuffer.java
new file mode 100644
index 00000000000..9ac48986faa
--- /dev/null
+++ b/Base/src/test/java/io/deephaven/base/ringbuffer/TestAggregatingCharRingBuffer.java
@@ -0,0 +1,329 @@
+//
+// Copyright (c) 2016-2024 Deephaven Data Labs and Patent Pending
+//
+package io.deephaven.base.ringbuffer;
+
+import junit.framework.TestCase;
+
+import java.util.NoSuchElementException;
+import java.util.Random;
+
+public class TestAggregatingCharRingBuffer extends TestCase {
+
+    private void assertEmpty(AggregatingCharRingBuffer rb) {
+        assertTrue(rb.isEmpty());
+        assertEquals(0, rb.size());
+
+        try {
+            rb.remove();
+            fail("queue should be empty");
+        } catch (NoSuchElementException x) {
+            // expected
+        }
+
+        try {
+            rb.element();
+            fail("queue should be empty");
+        } catch (NoSuchElementException x) {
+            // expected
+        }
+    }
+
+    public void testLargeAmounts() {
+        final AggregatingCharRingBuffer rb = new AggregatingCharRingBuffer(3, (char) 0, (a, b) -> (char) (a + b));
+
+        // move the head and tail off zero
+        for (int i = 0; i < 1000; i++) {
+            rb.add((char) i);
+        }
+        for (int i = 0; i < 1000; i++) {
+            rb.remove();
+        }
+
+        for (int i = 0; i < 10_000; i++)
+            rb.add((char) i);
+
+        for (int i = 10_000; i < 1_000_000; i++) {
+            rb.add((char) i);
+            assertEquals((char) (i - 10_000 + 1), rb.front(1));
+            assertEquals((char) (i - 10_000), rb.remove());
+            assertEquals(rb.remaining(), rb.capacity() - rb.size());
+        }
+    }
+
+    public void testEvaluateMinLargeAmounts() {
+        final AggregatingCharRingBuffer rb =
+                new AggregatingCharRingBuffer(3, Character.MAX_VALUE, (a, b) -> (char) Math.min(a, b));
+        for (int i = 0; i < 10_000; i++)
+            rb.add((char) i);
+
+        final int maxVal = (int) Math.min(Character.MAX_VALUE, 1_000_000);
+
+        for (int i = 10_000; i < maxVal; i++) {
+            rb.add((char) i);
+            assertEquals((char) (i - 10_000) + 1, rb.front(1));
+            assertEquals((char) (i - 10_000), rb.evaluate()); // front of queue is min
+            assertEquals((char) (i - 10_000), rb.remove());
+        }
+    }
+
+    public void testEvaluateMaxLargeAmounts() {
+        final AggregatingCharRingBuffer rb =
+                new AggregatingCharRingBuffer(3, Character.MIN_VALUE, (a, b) -> (char) Math.max(a, b));
+        for (int i = 0; i < 10_000; i++)
+            rb.add((char) i);
+
+        final int maxVal = (int) Math.min(Character.MAX_VALUE, 1_000_000);
+
+        for (int i = 10_000; i < maxVal; i++) {
+            rb.add((char) i);
+            assertEquals((char) (i - 10_000 + 1), rb.front(1));
+            assertEquals((char) i, rb.evaluate()); // last value added is max
+            assertEquals((char) (i - 10_000), rb.remove());
+        }
+    }
+
+    // region non-byte-tests
+
+    public void testEvaluateSumLargeAmounts() {
+        final AggregatingCharRingBuffer rb = new AggregatingCharRingBuffer(3, (char) 0, (a, b) -> (char) (a + b));
+        char runningSum = (char) 0;
+
+        for (char i = 0; i < 1_000; i++) {
+            rb.add(i);
+            runningSum += i;
+        }
+
+        // stay small enough to avoid charing errors but prove the concept
+        for (char i = 1_000; i < 10_000; i++) {
+            rb.add(i);
+            runningSum += i; // add the current value
+            assertEquals((char) (i - 1_000 + 1), rb.front(1));
+
+            assertEquals(runningSum, rb.evaluate());
+
+            assertEquals((char) (i - 1_000), rb.remove());
+            runningSum -= i - 1_000; // remove the value 1_0000 ago
+
+            assertEquals(runningSum, rb.evaluate());
+        }
+    }
+
+    /***
+     * Return the sum of 0 to N-1
+     */
+    private char sum0toN(char n) {
+        if (n == (char) 0) {
+            return (char) 0; // not negative zero, sigh
+        }
+        return (char) (n * (n - 1) / 2);
+    }
+
+    public void testEvaluationEdgeCase() {
+        AggregatingCharRingBuffer rb = new AggregatingCharRingBuffer(512, (char) 0, (a, b) -> (char) (a + b));
+
+        rb.addIdentityValue();
+        assertEquals((char) 0, rb.evaluate());
+        rb.clear();
+
+        final char PRIME = (char) 97;
+        final char PRIME_SUM = sum0toN(PRIME);
+        final Random rnd = new Random(0xDEADBEEF);
+
+        // specific test for push or wrap around
+        for (int step = 0; step < 100; step++) {
+            for (char i = 0; i < PRIME; i++) {
+                rb.addUnsafe(i);
+            }
+            assertEquals(PRIME_SUM, rb.evaluate());
+
+            for (char i = 0; i < PRIME; i++) {
+                rb.removeUnsafe();
+            }
+            assertEquals((char) 0, rb.evaluate());
+            // not a copy/paste error, call this twice
+            assertEquals((char) 0, rb.evaluate());
+        }
+
+        // specific test for push & wrap around
+        for (int step = 0; step < 100; step++) {
+            for (char i = 0; i < PRIME; i++) {
+                rb.addUnsafe(i);
+            }
+            for (char i = 0; i < PRIME; i++) {
+                rb.removeUnsafe();
+            }
+            assertEquals((char) 0, rb.evaluate());
+            // not a copy/paste error, call this twice
+            assertEquals((char) 0, rb.evaluate());
+        }
+
+        // push random amounts and test
+        for (int step = 0; step < 100; step++) {
+            final char OFFSET = (char) rnd.nextInt((int) PRIME);
+
+            for (char i = 0; i < OFFSET; i++) {
+                rb.addUnsafe(i);
+            }
+            assertEquals(sum0toN(OFFSET), rb.evaluate());
+
+            for (char i = OFFSET; i < PRIME; i++) {
+                rb.addUnsafe(i);
+            }
+            assertEquals(PRIME_SUM, rb.evaluate());
+
+            for (char i = 0; i < PRIME; i++) {
+                rb.removeUnsafe();
+            }
+            assertEquals((char) 0, rb.evaluate());
+        }
+
+        // pop random amounts and test
+        for (int step = 0; step < 100; step++) {
+            final char OFFSET = (char) rnd.nextInt((int) PRIME);
+            for (char i = 0; i < PRIME; i++) {
+                rb.addUnsafe(i);
+            }
+            assertEquals(PRIME_SUM, rb.evaluate());
+
+            for (char i = 0; i < OFFSET; i++) {
+                rb.removeUnsafe();
+            }
+            assertEquals(PRIME_SUM - sum0toN(OFFSET), rb.evaluate());
+
+            for (char i = 0; i < (PRIME - OFFSET); i++) {
+                rb.removeUnsafe();
+            }
+            assertEquals((char) 0, rb.evaluate());
+        }
+
+
+        rb = new AggregatingCharRingBuffer(512, (char) 0, (a, b) -> (char) (a + b));
+        // need to get the buffer to state where we have clean pushes and a wrapped pop
+
+        // move the pointers close to the end
+        for (char i = 0; i < 500; i++) {
+            rb.addUnsafe(i);
+            rb.removeUnsafe();
+        }
+        assertEquals((char) 0, rb.evaluate());
+        assertEmpty(rb);
+
+        // push past the end
+        for (char i = 0; i < 200; i++) {
+            rb.addUnsafe(i);
+        }
+        assertEquals(sum0toN((char) 200), rb.evaluate());
+
+        // one more push to dirty the pushes
+        rb.addUnsafe((char) 201);
+
+        // pop past the end
+        for (char i = 0; i < 200; i++) {
+            rb.removeUnsafe();
+        }
+
+        // only thing in the buffer is the final push
+        assertEquals((char) 201, rb.evaluate());
+    }
+    // endregion non-byte-tests
+
+    public void testPushPopUnsafe() {
+        final AggregatingCharRingBuffer rb =
+                new AggregatingCharRingBuffer(3, (char) -Character.MAX_VALUE, (a, b) -> (char) Math.max(a, b));
+        // move the head and tail off zero
+        rb.ensureRemaining(100);
+        for (char i = 0; i < 100; i++) {
+            rb.addUnsafe(i);
+        }
+        for (char i = 0; i < 100; i++) {
+            assertEquals(rb.removeUnsafe(), i);
+        }
+
+        // do it again with an offset
+        rb.ensureRemaining(100);
+        for (char i = 0; i < 100; i++) {
+            rb.addUnsafe((char) (i + (char) 1000));
+        }
+        for (char i = 0; i < 100; i++) {
+            assertEquals(rb.removeUnsafe(), i + (char) 1000);
+        }
+
+        for (char i = 0; i < 100; i++) {
+            rb.addUnsafe((char) (i + (char) 1000));
+        }
+        rb.clear();
+
+        for (char i = 0; i < 100; i++) {
+            rb.add(i);
+        }
+        assertEquals((char) 99, rb.evaluate()); // last value added is max
+    }
+
+    public void testPopMultiple() {
+        final AggregatingCharRingBuffer rb = new AggregatingCharRingBuffer(3, (char) 0, (a, b) -> (char) (a + b));
+
+        for (int step = 0; step < 10; step++) {
+            rb.ensureRemaining(100);
+            for (char i = 0; i < 100; i++) {
+                rb.addUnsafe(i);
+            }
+
+            if (step % 2 == 0) {
+                rb.evaluate();
+            }
+
+            try {
+                char[] values = rb.remove(101);
+                fail("popping more values than size() should fail");
+            } catch (NoSuchElementException x) {
+                // expected
+            }
+
+            char[] values = rb.remove(100);
+            for (char i = 0; i < 100; i++) {
+                assertEquals(values[(int) i], i);
+            }
+            assertEmpty(rb);
+        }
+    }
+
+    public void testSpecialCaseA() {
+        // overlapping push and pop ranges with popTail < pushTail
+        final AggregatingCharRingBuffer rb = new AggregatingCharRingBuffer(4, (char) 0, (a, b) -> (char) (a + b));
+        rb.add((char) 1);
+        assertEquals((char) 1, rb.remove());
+        rb.add((char) 2);
+        rb.add((char) 3);
+        assertEquals((char) 5, rb.evaluate());
+    }
+
+    public void testSpecialCaseB() {
+        // push the full capacity while wrapped
+        final AggregatingCharRingBuffer rb = new AggregatingCharRingBuffer(64, (char) 0, (a, b) -> (char) (a + b));
+        rb.add((char) 1);
+        assertEquals((char) 1, rb.remove());
+
+        for (int i = 0; i < 64; i++) {
+            rb.add((char) 1);
+        }
+        assertEquals((char) 64, rb.evaluate());
+    }
+
+    public void testSpecialCaseC() {
+        // overlapping push and pop ranges with popTail < pushTail
+        final AggregatingCharRingBuffer rb = new AggregatingCharRingBuffer(16, (char) 0, (a, b) -> (char) (a + b));
+        // move pointers to middle of storage
+        for (int i = 0; i < 8; i++) {
+            rb.add((char) 1);
+            rb.remove();
+        }
+        assertEquals((char) 0, rb.evaluate());
+
+        for (int i = 0; i < 11; i++) {
+            rb.add((char) 1);
+        }
+        rb.remove();
+        assertEquals((char) 10, rb.evaluate());
+    }
+}
diff --git a/Base/src/test/java/io/deephaven/base/ringbuffer/TestAggregatingDoubleRingBuffer.java b/Base/src/test/java/io/deephaven/base/ringbuffer/TestAggregatingDoubleRingBuffer.java
new file mode 100644
index 00000000000..d5883a5a598
--- /dev/null
+++ b/Base/src/test/java/io/deephaven/base/ringbuffer/TestAggregatingDoubleRingBuffer.java
@@ -0,0 +1,333 @@
+//
+// Copyright (c) 2016-2024 Deephaven Data Labs and Patent Pending
+//
+// ****** AUTO-GENERATED CLASS - DO NOT EDIT MANUALLY
+// ****** Edit TestAggregatingCharRingBuffer and run "./gradlew replicateRingBuffers" to regenerate
+//
+// @formatter:off
+package io.deephaven.base.ringbuffer;
+
+import junit.framework.TestCase;
+
+import java.util.NoSuchElementException;
+import java.util.Random;
+
+public class TestAggregatingDoubleRingBuffer extends TestCase {
+
+    private void assertEmpty(AggregatingDoubleRingBuffer rb) {
+        assertTrue(rb.isEmpty());
+        assertEquals(0, rb.size());
+
+        try {
+            rb.remove();
+            fail("queue should be empty");
+        } catch (NoSuchElementException x) {
+            // expected
+        }
+
+        try {
+            rb.element();
+            fail("queue should be empty");
+        } catch (NoSuchElementException x) {
+            // expected
+        }
+    }
+
+    public void testLargeAmounts() {
+        final AggregatingDoubleRingBuffer rb = new AggregatingDoubleRingBuffer(3, (double) 0, (a, b) -> (double) (a + b));
+
+        // move the head and tail off zero
+        for (int i = 0; i < 1000; i++) {
+            rb.add((double) i);
+        }
+        for (int i = 0; i < 1000; i++) {
+            rb.remove();
+        }
+
+        for (int i = 0; i < 10_000; i++)
+            rb.add((double) i);
+
+        for (int i = 10_000; i < 1_000_000; i++) {
+            rb.add((double) i);
+            assertEquals((double) (i - 10_000 + 1), rb.front(1));
+            assertEquals((double) (i - 10_000), rb.remove());
+            assertEquals(rb.remaining(), rb.capacity() - rb.size());
+        }
+    }
+
+    public void testEvaluateMinLargeAmounts() {
+        final AggregatingDoubleRingBuffer rb =
+                new AggregatingDoubleRingBuffer(3, Double.MAX_VALUE, (a, b) -> (double) Math.min(a, b));
+        for (int i = 0; i < 10_000; i++)
+            rb.add((double) i);
+
+        final int maxVal = (int) Math.min(Double.MAX_VALUE, 1_000_000);
+
+        for (int i = 10_000; i < maxVal; i++) {
+            rb.add((double) i);
+            assertEquals((double) (i - 10_000) + 1, rb.front(1));
+            assertEquals((double) (i - 10_000), rb.evaluate()); // front of queue is min
+            assertEquals((double) (i - 10_000), rb.remove());
+        }
+    }
+
+    public void testEvaluateMaxLargeAmounts() {
+        final AggregatingDoubleRingBuffer rb =
+                new AggregatingDoubleRingBuffer(3, Double.MIN_VALUE, (a, b) -> (double) Math.max(a, b));
+        for (int i = 0; i < 10_000; i++)
+            rb.add((double) i);
+
+        final int maxVal = (int) Math.min(Double.MAX_VALUE, 1_000_000);
+
+        for (int i = 10_000; i < maxVal; i++) {
+            rb.add((double) i);
+            assertEquals((double) (i - 10_000 + 1), rb.front(1));
+            assertEquals((double) i, rb.evaluate()); // last value added is max
+            assertEquals((double) (i - 10_000), rb.remove());
+        }
+    }
+
+    // region non-byte-tests
+
+    public void testEvaluateSumLargeAmounts() {
+        final AggregatingDoubleRingBuffer rb = new AggregatingDoubleRingBuffer(3, (double) 0, (a, b) -> (double) (a + b));
+        double runningSum = (double) 0;
+
+        for (double i = 0; i < 1_000; i++) {
+            rb.add(i);
+            runningSum += i;
+        }
+
+        // stay small enough to avoid doubleing errors but prove the concept
+        for (double i = 1_000; i < 10_000; i++) {
+            rb.add(i);
+            runningSum += i; // add the current value
+            assertEquals((double) (i - 1_000 + 1), rb.front(1));
+
+            assertEquals(runningSum, rb.evaluate());
+
+            assertEquals((double) (i - 1_000), rb.remove());
+            runningSum -= i - 1_000; // remove the value 1_0000 ago
+
+            assertEquals(runningSum, rb.evaluate());
+        }
+    }
+
+    /***
+     * Return the sum of 0 to N-1
+     */
+    private double sum0toN(double n) {
+        if (n == (double) 0) {
+            return (double) 0; // not negative zero, sigh
+        }
+        return (double) (n * (n - 1) / 2);
+    }
+
+    public void testEvaluationEdgeCase() {
+        AggregatingDoubleRingBuffer rb = new AggregatingDoubleRingBuffer(512, (double) 0, (a, b) -> (double) (a + b));
+
+        rb.addIdentityValue();
+        assertEquals((double) 0, rb.evaluate());
+        rb.clear();
+
+        final double PRIME = (double) 97;
+        final double PRIME_SUM = sum0toN(PRIME);
+        final Random rnd = new Random(0xDEADBEEF);
+
+        // specific test for push or wrap around
+        for (int step = 0; step < 100; step++) {
+            for (double i = 0; i < PRIME; i++) {
+                rb.addUnsafe(i);
+            }
+            assertEquals(PRIME_SUM, rb.evaluate());
+
+            for (double i = 0; i < PRIME; i++) {
+                rb.removeUnsafe();
+            }
+            assertEquals((double) 0, rb.evaluate());
+            // not a copy/paste error, call this twice
+            assertEquals((double) 0, rb.evaluate());
+        }
+
+        // specific test for push & wrap around
+        for (int step = 0; step < 100; step++) {
+            for (double i = 0; i < PRIME; i++) {
+                rb.addUnsafe(i);
+            }
+            for (double i = 0; i < PRIME; i++) {
+                rb.removeUnsafe();
+            }
+            assertEquals((double) 0, rb.evaluate());
+            // not a copy/paste error, call this twice
+            assertEquals((double) 0, rb.evaluate());
+        }
+
+        // push random amounts and test
+        for (int step = 0; step < 100; step++) {
+            final double OFFSET = (double) rnd.nextInt((int) PRIME);
+
+            for (double i = 0; i < OFFSET; i++) {
+                rb.addUnsafe(i);
+            }
+            assertEquals(sum0toN(OFFSET), rb.evaluate());
+
+            for (double i = OFFSET; i < PRIME; i++) {
+                rb.addUnsafe(i);
+            }
+            assertEquals(PRIME_SUM, rb.evaluate());
+
+            for (double i = 0; i < PRIME; i++) {
+                rb.removeUnsafe();
+            }
+            assertEquals((double) 0, rb.evaluate());
+        }
+
+        // pop random amounts and test
+        for (int step = 0; step < 100; step++) {
+            final double OFFSET = (double) rnd.nextInt((int) PRIME);
+            for (double i = 0; i < PRIME; i++) {
+                rb.addUnsafe(i);
+            }
+            assertEquals(PRIME_SUM, rb.evaluate());
+
+            for (double i = 0; i < OFFSET; i++) {
+                rb.removeUnsafe();
+            }
+            assertEquals(PRIME_SUM - sum0toN(OFFSET), rb.evaluate());
+
+            for (double i = 0; i < (PRIME - OFFSET); i++) {
+                rb.removeUnsafe();
+            }
+            assertEquals((double) 0, rb.evaluate());
+        }
+
+
+        rb = new AggregatingDoubleRingBuffer(512, (double) 0, (a, b) -> (double) (a + b));
+        // need to get the buffer to state where we have clean pushes and a wrapped pop
+
+        // move the pointers close to the end
+        for (double i = 0; i < 500; i++) {
+            rb.addUnsafe(i);
+            rb.removeUnsafe();
+        }
+        assertEquals((double) 0, rb.evaluate());
+        assertEmpty(rb);
+
+        // push past the end
+        for (double i = 0; i < 200; i++) {
+            rb.addUnsafe(i);
+        }
+        assertEquals(sum0toN((double) 200), rb.evaluate());
+
+        // one more push to dirty the pushes
+        rb.addUnsafe((double) 201);
+
+        // pop past the end
+        for (double i = 0; i < 200; i++) {
+            rb.removeUnsafe();
+        }
+
+        // only thing in the buffer is the final push
+        assertEquals((double) 201, rb.evaluate());
+    }
+    // endregion non-byte-tests
+
+    public void testPushPopUnsafe() {
+        final AggregatingDoubleRingBuffer rb =
+                new AggregatingDoubleRingBuffer(3, (double) -Double.MAX_VALUE, (a, b) -> (double) Math.max(a, b));
+        // move the head and tail off zero
+        rb.ensureRemaining(100);
+        for (double i = 0; i < 100; i++) {
+            rb.addUnsafe(i);
+        }
+        for (double i = 0; i < 100; i++) {
+            assertEquals(rb.removeUnsafe(), i);
+        }
+
+        // do it again with an offset
+        rb.ensureRemaining(100);
+        for (double i = 0; i < 100; i++) {
+            rb.addUnsafe((double) (i + (double) 1000));
+        }
+        for (double i = 0; i < 100; i++) {
+            assertEquals(rb.removeUnsafe(), i + (double) 1000);
+        }
+
+        for (double i = 0; i < 100; i++) {
+            rb.addUnsafe((double) (i + (double) 1000));
+        }
+        rb.clear();
+
+        for (double i = 0; i < 100; i++) {
+            rb.add(i);
+        }
+        assertEquals((double) 99, rb.evaluate()); // last value added is max
+    }
+
+    public void testPopMultiple() {
+        final AggregatingDoubleRingBuffer rb = new AggregatingDoubleRingBuffer(3, (double) 0, (a, b) -> (double) (a + b));
+
+        for (int step = 0; step < 10; step++) {
+            rb.ensureRemaining(100);
+            for (double i = 0; i < 100; i++) {
+                rb.addUnsafe(i);
+            }
+
+            if (step % 2 == 0) {
+                rb.evaluate();
+            }
+
+            try {
+                double[] values = rb.remove(101);
+                fail("popping more values than size() should fail");
+            } catch (NoSuchElementException x) {
+                // expected
+            }
+
+            double[] values = rb.remove(100);
+            for (double i = 0; i < 100; i++) {
+                assertEquals(values[(int) i], i);
+            }
+            assertEmpty(rb);
+        }
+    }
+
+    public void testSpecialCaseA() {
+        // overlapping push and pop ranges with popTail < pushTail
+        final AggregatingDoubleRingBuffer rb = new AggregatingDoubleRingBuffer(4, (double) 0, (a, b) -> (double) (a + b));
+        rb.add((double) 1);
+        assertEquals((double) 1, rb.remove());
+        rb.add((double) 2);
+        rb.add((double) 3);
+        assertEquals((double) 5, rb.evaluate());
+    }
+
+    public void testSpecialCaseB() {
+        // push the full capacity while wrapped
+        final AggregatingDoubleRingBuffer rb = new AggregatingDoubleRingBuffer(64, (double) 0, (a, b) -> (double) (a + b));
+        rb.add((double) 1);
+        assertEquals((double) 1, rb.remove());
+
+        for (int i = 0; i < 64; i++) {
+            rb.add((double) 1);
+        }
+        assertEquals((double) 64, rb.evaluate());
+    }
+
+    public void testSpecialCaseC() {
+        // overlapping push and pop ranges with popTail < pushTail
+        final AggregatingDoubleRingBuffer rb = new AggregatingDoubleRingBuffer(16, (double) 0, (a, b) -> (double) (a + b));
+        // move pointers to middle of storage
+        for (int i = 0; i < 8; i++) {
+            rb.add((double) 1);
+            rb.remove();
+        }
+        assertEquals((double) 0, rb.evaluate());
+
+        for (int i = 0; i < 11; i++) {
+            rb.add((double) 1);
+        }
+        rb.remove();
+        assertEquals((double) 10, rb.evaluate());
+    }
+}
diff --git a/Base/src/test/java/io/deephaven/base/ringbuffer/TestAggregatingFloatRingBuffer.java b/Base/src/test/java/io/deephaven/base/ringbuffer/TestAggregatingFloatRingBuffer.java
new file mode 100644
index 00000000000..9116bea7b9d
--- /dev/null
+++ b/Base/src/test/java/io/deephaven/base/ringbuffer/TestAggregatingFloatRingBuffer.java
@@ -0,0 +1,333 @@
+//
+// Copyright (c) 2016-2024 Deephaven Data Labs and Patent Pending
+//
+// ****** AUTO-GENERATED CLASS - DO NOT EDIT MANUALLY
+// ****** Edit TestAggregatingCharRingBuffer and run "./gradlew replicateRingBuffers" to regenerate
+//
+// @formatter:off
+package io.deephaven.base.ringbuffer;
+
+import junit.framework.TestCase;
+
+import java.util.NoSuchElementException;
+import java.util.Random;
+
+public class TestAggregatingFloatRingBuffer extends TestCase {
+
+    private void assertEmpty(AggregatingFloatRingBuffer rb) {
+        assertTrue(rb.isEmpty());
+        assertEquals(0, rb.size());
+
+        try {
+            rb.remove();
+            fail("queue should be empty");
+        } catch (NoSuchElementException x) {
+            // expected
+        }
+
+        try {
+            rb.element();
+            fail("queue should be empty");
+        } catch (NoSuchElementException x) {
+            // expected
+        }
+    }
+
+    public void testLargeAmounts() {
+        final AggregatingFloatRingBuffer rb = new AggregatingFloatRingBuffer(3, (float) 0, (a, b) -> (float) (a + b));
+
+        // move the head and tail off zero
+        for (int i = 0; i < 1000; i++) {
+            rb.add((float) i);
+        }
+        for (int i = 0; i < 1000; i++) {
+            rb.remove();
+        }
+
+        for (int i = 0; i < 10_000; i++)
+            rb.add((float) i);
+
+        for (int i = 10_000; i < 1_000_000; i++) {
+            rb.add((float) i);
+            assertEquals((float) (i - 10_000 + 1), rb.front(1));
+            assertEquals((float) (i - 10_000), rb.remove());
+            assertEquals(rb.remaining(), rb.capacity() - rb.size());
+        }
+    }
+
+    public void testEvaluateMinLargeAmounts() {
+        final AggregatingFloatRingBuffer rb =
+                new AggregatingFloatRingBuffer(3, Float.MAX_VALUE, (a, b) -> (float) Math.min(a, b));
+        for (int i = 0; i < 10_000; i++)
+            rb.add((float) i);
+
+        final int maxVal = (int) Math.min(Float.MAX_VALUE, 1_000_000);
+
+        for (int i = 10_000; i < maxVal; i++) {
+            rb.add((float) i);
+            assertEquals((float) (i - 10_000) + 1, rb.front(1));
+            assertEquals((float) (i - 10_000), rb.evaluate()); // front of queue is min
+            assertEquals((float) (i - 10_000), rb.remove());
+        }
+    }
+
+    public void testEvaluateMaxLargeAmounts() {
+        final AggregatingFloatRingBuffer rb =
+                new AggregatingFloatRingBuffer(3, Float.MIN_VALUE, (a, b) -> (float) Math.max(a, b));
+        for (int i = 0; i < 10_000; i++)
+            rb.add((float) i);
+
+        final int maxVal = (int) Math.min(Float.MAX_VALUE, 1_000_000);
+
+        for (int i = 10_000; i < maxVal; i++) {
+            rb.add((float) i);
+            assertEquals((float) (i - 10_000 + 1), rb.front(1));
+            assertEquals((float) i, rb.evaluate()); // last value added is max
+            assertEquals((float) (i - 10_000), rb.remove());
+        }
+    }
+
+    // region non-byte-tests
+
+    public void testEvaluateSumLargeAmounts() {
+        final AggregatingFloatRingBuffer rb = new AggregatingFloatRingBuffer(3, (float) 0, (a, b) -> (float) (a + b));
+        float runningSum = (float) 0;
+
+        for (float i = 0; i < 1_000; i++) {
+            rb.add(i);
+            runningSum += i;
+        }
+
+        // stay small enough to avoid floating errors but prove the concept
+        for (float i = 1_000; i < 10_000; i++) {
+            rb.add(i);
+            runningSum += i; // add the current value
+            assertEquals((float) (i - 1_000 + 1), rb.front(1));
+
+            assertEquals(runningSum, rb.evaluate());
+
+            assertEquals((float) (i - 1_000), rb.remove());
+            runningSum -= i - 1_000; // remove the value 1_0000 ago
+
+            assertEquals(runningSum, rb.evaluate());
+        }
+    }
+
+    /***
+     * Return the sum of 0 to N-1
+     */
+    private float sum0toN(float n) {
+        if (n == (float) 0) {
+            return (float) 0; // not negative zero, sigh
+        }
+        return (float) (n * (n - 1) / 2);
+    }
+
+    public void testEvaluationEdgeCase() {
+        AggregatingFloatRingBuffer rb = new AggregatingFloatRingBuffer(512, (float) 0, (a, b) -> (float) (a + b));
+
+        rb.addIdentityValue();
+        assertEquals((float) 0, rb.evaluate());
+        rb.clear();
+
+        final float PRIME = (float) 97;
+        final float PRIME_SUM = sum0toN(PRIME);
+        final Random rnd = new Random(0xDEADBEEF);
+
+        // specific test for push or wrap around
+        for (int step = 0; step < 100; step++) {
+            for (float i = 0; i < PRIME; i++) {
+                rb.addUnsafe(i);
+            }
+            assertEquals(PRIME_SUM, rb.evaluate());
+
+            for (float i = 0; i < PRIME; i++) {
+                rb.removeUnsafe();
+            }
+            assertEquals((float) 0, rb.evaluate());
+            // not a copy/paste error, call this twice
+            assertEquals((float) 0, rb.evaluate());
+        }
+
+        // specific test for push & wrap around
+        for (int step = 0; step < 100; step++) {
+            for (float i = 0; i < PRIME; i++) {
+                rb.addUnsafe(i);
+            }
+            for (float i = 0; i < PRIME; i++) {
+                rb.removeUnsafe();
+            }
+            assertEquals((float) 0, rb.evaluate());
+            // not a copy/paste error, call this twice
+            assertEquals((float) 0, rb.evaluate());
+        }
+
+        // push random amounts and test
+        for (int step = 0; step < 100; step++) {
+            final float OFFSET = (float) rnd.nextInt((int) PRIME);
+
+            for (float i = 0; i < OFFSET; i++) {
+                rb.addUnsafe(i);
+            }
+            assertEquals(sum0toN(OFFSET), rb.evaluate());
+
+            for (float i = OFFSET; i < PRIME; i++) {
+                rb.addUnsafe(i);
+            }
+            assertEquals(PRIME_SUM, rb.evaluate());
+
+            for (float i = 0; i < PRIME; i++) {
+                rb.removeUnsafe();
+            }
+            assertEquals((float) 0, rb.evaluate());
+        }
+
+        // pop random amounts and test
+        for (int step = 0; step < 100; step++) {
+            final float OFFSET = (float) rnd.nextInt((int) PRIME);
+            for (float i = 0; i < PRIME; i++) {
+                rb.addUnsafe(i);
+            }
+            assertEquals(PRIME_SUM, rb.evaluate());
+
+            for (float i = 0; i < OFFSET; i++) {
+                rb.removeUnsafe();
+            }
+            assertEquals(PRIME_SUM - sum0toN(OFFSET), rb.evaluate());
+
+            for (float i = 0; i < (PRIME - OFFSET); i++) {
+                rb.removeUnsafe();
+            }
+            assertEquals((float) 0, rb.evaluate());
+        }
+
+
+        rb = new AggregatingFloatRingBuffer(512, (float) 0, (a, b) -> (float) (a + b));
+        // need to get the buffer to state where we have clean pushes and a wrapped pop
+
+        // move the pointers close to the end
+        for (float i = 0; i < 500; i++) {
+            rb.addUnsafe(i);
+            rb.removeUnsafe();
+        }
+        assertEquals((float) 0, rb.evaluate());
+        assertEmpty(rb);
+
+        // push past the end
+        for (float i = 0; i < 200; i++) {
+            rb.addUnsafe(i);
+        }
+        assertEquals(sum0toN((float) 200), rb.evaluate());
+
+        // one more push to dirty the pushes
+        rb.addUnsafe((float) 201);
+
+        // pop past the end
+        for (float i = 0; i < 200; i++) {
+            rb.removeUnsafe();
+        }
+
+        // only thing in the buffer is the final push
+        assertEquals((float) 201, rb.evaluate());
+    }
+    // endregion non-byte-tests
+
+    public void testPushPopUnsafe() {
+        final AggregatingFloatRingBuffer rb =
+                new AggregatingFloatRingBuffer(3, (float) -Float.MAX_VALUE, (a, b) -> (float) Math.max(a, b));
+        // move the head and tail off zero
+        rb.ensureRemaining(100);
+        for (float i = 0; i < 100; i++) {
+            rb.addUnsafe(i);
+        }
+        for (float i = 0; i < 100; i++) {
+            assertEquals(rb.removeUnsafe(), i);
+        }
+
+        // do it again with an offset
+        rb.ensureRemaining(100);
+        for (float i = 0; i < 100; i++) {
+            rb.addUnsafe((float) (i + (float) 1000));
+        }
+        for (float i = 0; i < 100; i++) {
+            assertEquals(rb.removeUnsafe(), i + (float) 1000);
+        }
+
+        for (float i = 0; i < 100; i++) {
+            rb.addUnsafe((float) (i + (float) 1000));
+        }
+        rb.clear();
+
+        for (float i = 0; i < 100; i++) {
+            rb.add(i);
+        }
+        assertEquals((float) 99, rb.evaluate()); // last value added is max
+    }
+
+    public void testPopMultiple() {
+        final AggregatingFloatRingBuffer rb = new AggregatingFloatRingBuffer(3, (float) 0, (a, b) -> (float) (a + b));
+
+        for (int step = 0; step < 10; step++) {
+            rb.ensureRemaining(100);
+            for (float i = 0; i < 100; i++) {
+                rb.addUnsafe(i);
+            }
+
+            if (step % 2 == 0) {
+                rb.evaluate();
+            }
+
+            try {
+                float[] values = rb.remove(101);
+                fail("popping more values than size() should fail");
+            } catch (NoSuchElementException x) {
+                // expected
+            }
+
+            float[] values = rb.remove(100);
+            for (float i = 0; i < 100; i++) {
+                assertEquals(values[(int) i], i);
+            }
+            assertEmpty(rb);
+        }
+    }
+
+    public void testSpecialCaseA() {
+        // overlapping push and pop ranges with popTail < pushTail
+        final AggregatingFloatRingBuffer rb = new AggregatingFloatRingBuffer(4, (float) 0, (a, b) -> (float) (a + b));
+        rb.add((float) 1);
+        assertEquals((float) 1, rb.remove());
+        rb.add((float) 2);
+        rb.add((float) 3);
+        assertEquals((float) 5, rb.evaluate());
+    }
+
+    public void testSpecialCaseB() {
+        // push the full capacity while wrapped
+        final AggregatingFloatRingBuffer rb = new AggregatingFloatRingBuffer(64, (float) 0, (a, b) -> (float) (a + b));
+        rb.add((float) 1);
+        assertEquals((float) 1, rb.remove());
+
+        for (int i = 0; i < 64; i++) {
+            rb.add((float) 1);
+        }
+        assertEquals((float) 64, rb.evaluate());
+    }
+
+    public void testSpecialCaseC() {
+        // overlapping push and pop ranges with popTail < pushTail
+        final AggregatingFloatRingBuffer rb = new AggregatingFloatRingBuffer(16, (float) 0, (a, b) -> (float) (a + b));
+        // move pointers to middle of storage
+        for (int i = 0; i < 8; i++) {
+            rb.add((float) 1);
+            rb.remove();
+        }
+        assertEquals((float) 0, rb.evaluate());
+
+        for (int i = 0; i < 11; i++) {
+            rb.add((float) 1);
+        }
+        rb.remove();
+        assertEquals((float) 10, rb.evaluate());
+    }
+}
diff --git a/Base/src/test/java/io/deephaven/base/ringbuffer/TestAggregatingIntRingBuffer.java b/Base/src/test/java/io/deephaven/base/ringbuffer/TestAggregatingIntRingBuffer.java
new file mode 100644
index 00000000000..1d225bfd233
--- /dev/null
+++ b/Base/src/test/java/io/deephaven/base/ringbuffer/TestAggregatingIntRingBuffer.java
@@ -0,0 +1,333 @@
+//
+// Copyright (c) 2016-2024 Deephaven Data Labs and Patent Pending
+//
+// ****** AUTO-GENERATED CLASS - DO NOT EDIT MANUALLY
+// ****** Edit TestAggregatingCharRingBuffer and run "./gradlew replicateRingBuffers" to regenerate
+//
+// @formatter:off
+package io.deephaven.base.ringbuffer;
+
+import junit.framework.TestCase;
+
+import java.util.NoSuchElementException;
+import java.util.Random;
+
+public class TestAggregatingIntRingBuffer extends TestCase {
+
+    private void assertEmpty(AggregatingIntRingBuffer rb) {
+        assertTrue(rb.isEmpty());
+        assertEquals(0, rb.size());
+
+        try {
+            rb.remove();
+            fail("queue should be empty");
+        } catch (NoSuchElementException x) {
+            // expected
+        }
+
+        try {
+            rb.element();
+            fail("queue should be empty");
+        } catch (NoSuchElementException x) {
+            // expected
+        }
+    }
+
+    public void testLargeAmounts() {
+        final AggregatingIntRingBuffer rb = new AggregatingIntRingBuffer(3, (int) 0, (a, b) -> (int) (a + b));
+
+        // move the head and tail off zero
+        for (int i = 0; i < 1000; i++) {
+            rb.add((int) i);
+        }
+        for (int i = 0; i < 1000; i++) {
+            rb.remove();
+        }
+
+        for (int i = 0; i < 10_000; i++)
+            rb.add((int) i);
+
+        for (int i = 10_000; i < 1_000_000; i++) {
+            rb.add((int) i);
+            assertEquals((int) (i - 10_000 + 1), rb.front(1));
+            assertEquals((int) (i - 10_000), rb.remove());
+            assertEquals(rb.remaining(), rb.capacity() - rb.size());
+        }
+    }
+
+    public void testEvaluateMinLargeAmounts() {
+        final AggregatingIntRingBuffer rb =
+                new AggregatingIntRingBuffer(3, Integer.MAX_VALUE, (a, b) -> (int) Math.min(a, b));
+        for (int i = 0; i < 10_000; i++)
+            rb.add((int) i);
+
+        final int maxVal = (int) Math.min(Integer.MAX_VALUE, 1_000_000);
+
+        for (int i = 10_000; i < maxVal; i++) {
+            rb.add((int) i);
+            assertEquals((int) (i - 10_000) + 1, rb.front(1));
+            assertEquals((int) (i - 10_000), rb.evaluate()); // front of queue is min
+            assertEquals((int) (i - 10_000), rb.remove());
+        }
+    }
+
+    public void testEvaluateMaxLargeAmounts() {
+        final AggregatingIntRingBuffer rb =
+                new AggregatingIntRingBuffer(3, Integer.MIN_VALUE, (a, b) -> (int) Math.max(a, b));
+        for (int i = 0; i < 10_000; i++)
+            rb.add((int) i);
+
+        final int maxVal = (int) Math.min(Integer.MAX_VALUE, 1_000_000);
+
+        for (int i = 10_000; i < maxVal; i++) {
+            rb.add((int) i);
+            assertEquals((int) (i - 10_000 + 1), rb.front(1));
+            assertEquals((int) i, rb.evaluate()); // last value added is max
+            assertEquals((int) (i - 10_000), rb.remove());
+        }
+    }
+
+    // region non-byte-tests
+
+    public void testEvaluateSumLargeAmounts() {
+        final AggregatingIntRingBuffer rb = new AggregatingIntRingBuffer(3, (int) 0, (a, b) -> (int) (a + b));
+        int runningSum = (int) 0;
+
+        for (int i = 0; i < 1_000; i++) {
+            rb.add(i);
+            runningSum += i;
+        }
+
+        // stay small enough to avoid inting errors but prove the concept
+        for (int i = 1_000; i < 10_000; i++) {
+            rb.add(i);
+            runningSum += i; // add the current value
+            assertEquals((int) (i - 1_000 + 1), rb.front(1));
+
+            assertEquals(runningSum, rb.evaluate());
+
+            assertEquals((int) (i - 1_000), rb.remove());
+            runningSum -= i - 1_000; // remove the value 1_0000 ago
+
+            assertEquals(runningSum, rb.evaluate());
+        }
+    }
+
+    /***
+     * Return the sum of 0 to N-1
+     */
+    private int sum0toN(int n) {
+        if (n == (int) 0) {
+            return (int) 0; // not negative zero, sigh
+        }
+        return (int) (n * (n - 1) / 2);
+    }
+
+    public void testEvaluationEdgeCase() {
+        AggregatingIntRingBuffer rb = new AggregatingIntRingBuffer(512, (int) 0, (a, b) -> (int) (a + b));
+
+        rb.addIdentityValue();
+        assertEquals((int) 0, rb.evaluate());
+        rb.clear();
+
+        final int PRIME = (int) 97;
+        final int PRIME_SUM = sum0toN(PRIME);
+        final Random rnd = new Random(0xDEADBEEF);
+
+        // specific test for push or wrap around
+        for (int step = 0; step < 100; step++) {
+            for (int i = 0; i < PRIME; i++) {
+                rb.addUnsafe(i);
+            }
+            assertEquals(PRIME_SUM, rb.evaluate());
+
+            for (int i = 0; i < PRIME; i++) {
+                rb.removeUnsafe();
+            }
+            assertEquals((int) 0, rb.evaluate());
+            // not a copy/paste error, call this twice
+            assertEquals((int) 0, rb.evaluate());
+        }
+
+        // specific test for push & wrap around
+        for (int step = 0; step < 100; step++) {
+            for (int i = 0; i < PRIME; i++) {
+                rb.addUnsafe(i);
+            }
+            for (int i = 0; i < PRIME; i++) {
+                rb.removeUnsafe();
+            }
+            assertEquals((int) 0, rb.evaluate());
+            // not a copy/paste error, call this twice
+            assertEquals((int) 0, rb.evaluate());
+        }
+
+        // push random amounts and test
+        for (int step = 0; step < 100; step++) {
+            final int OFFSET = (int) rnd.nextInt((int) PRIME);
+
+            for (int i = 0; i < OFFSET; i++) {
+                rb.addUnsafe(i);
+            }
+            assertEquals(sum0toN(OFFSET), rb.evaluate());
+
+            for (int i = OFFSET; i < PRIME; i++) {
+                rb.addUnsafe(i);
+            }
+            assertEquals(PRIME_SUM, rb.evaluate());
+
+            for (int i = 0; i < PRIME; i++) {
+                rb.removeUnsafe();
+            }
+            assertEquals((int) 0, rb.evaluate());
+        }
+
+        // pop random amounts and test
+        for (int step = 0; step < 100; step++) {
+            final int OFFSET = (int) rnd.nextInt((int) PRIME);
+            for (int i = 0; i < PRIME; i++) {
+                rb.addUnsafe(i);
+            }
+            assertEquals(PRIME_SUM, rb.evaluate());
+
+            for (int i = 0; i < OFFSET; i++) {
+                rb.removeUnsafe();
+            }
+            assertEquals(PRIME_SUM - sum0toN(OFFSET), rb.evaluate());
+
+            for (int i = 0; i < (PRIME - OFFSET); i++) {
+                rb.removeUnsafe();
+            }
+            assertEquals((int) 0, rb.evaluate());
+        }
+
+
+        rb = new AggregatingIntRingBuffer(512, (int) 0, (a, b) -> (int) (a + b));
+        // need to get the buffer to state where we have clean pushes and a wrapped pop
+
+        // move the pointers close to the end
+        for (int i = 0; i < 500; i++) {
+            rb.addUnsafe(i);
+            rb.removeUnsafe();
+        }
+        assertEquals((int) 0, rb.evaluate());
+        assertEmpty(rb);
+
+        // push past the end
+        for (int i = 0; i < 200; i++) {
+            rb.addUnsafe(i);
+        }
+        assertEquals(sum0toN((int) 200), rb.evaluate());
+
+        // one more push to dirty the pushes
+        rb.addUnsafe((int) 201);
+
+        // pop past the end
+        for (int i = 0; i < 200; i++) {
+            rb.removeUnsafe();
+        }
+
+        // only thing in the buffer is the final push
+        assertEquals((int) 201, rb.evaluate());
+    }
+    // endregion non-byte-tests
+
+    public void testPushPopUnsafe() {
+        final AggregatingIntRingBuffer rb =
+                new AggregatingIntRingBuffer(3, (int) -Integer.MAX_VALUE, (a, b) -> (int) Math.max(a, b));
+        // move the head and tail off zero
+        rb.ensureRemaining(100);
+        for (int i = 0; i < 100; i++) {
+            rb.addUnsafe(i);
+        }
+        for (int i = 0; i < 100; i++) {
+            assertEquals(rb.removeUnsafe(), i);
+        }
+
+        // do it again with an offset
+        rb.ensureRemaining(100);
+        for (int i = 0; i < 100; i++) {
+            rb.addUnsafe((int) (i + (int) 1000));
+        }
+        for (int i = 0; i < 100; i++) {
+            assertEquals(rb.removeUnsafe(), i + (int) 1000);
+        }
+
+        for (int i = 0; i < 100; i++) {
+            rb.addUnsafe((int) (i + (int) 1000));
+        }
+        rb.clear();
+
+        for (int i = 0; i < 100; i++) {
+            rb.add(i);
+        }
+        assertEquals((int) 99, rb.evaluate()); // last value added is max
+    }
+
+    public void testPopMultiple() {
+        final AggregatingIntRingBuffer rb = new AggregatingIntRingBuffer(3, (int) 0, (a, b) -> (int) (a + b));
+
+        for (int step = 0; step < 10; step++) {
+            rb.ensureRemaining(100);
+            for (int i = 0; i < 100; i++) {
+                rb.addUnsafe(i);
+            }
+
+            if (step % 2 == 0) {
+                rb.evaluate();
+            }
+
+            try {
+                int[] values = rb.remove(101);
+                fail("popping more values than size() should fail");
+            } catch (NoSuchElementException x) {
+                // expected
+            }
+
+            int[] values = rb.remove(100);
+            for (int i = 0; i < 100; i++) {
+                assertEquals(values[(int) i], i);
+            }
+            assertEmpty(rb);
+        }
+    }
+
+    public void testSpecialCaseA() {
+        // overlapping push and pop ranges with popTail < pushTail
+        final AggregatingIntRingBuffer rb = new AggregatingIntRingBuffer(4, (int) 0, (a, b) -> (int) (a + b));
+        rb.add((int) 1);
+        assertEquals((int) 1, rb.remove());
+        rb.add((int) 2);
+        rb.add((int) 3);
+        assertEquals((int) 5, rb.evaluate());
+    }
+
+    public void testSpecialCaseB() {
+        // push the full capacity while wrapped
+        final AggregatingIntRingBuffer rb = new AggregatingIntRingBuffer(64, (int) 0, (a, b) -> (int) (a + b));
+        rb.add((int) 1);
+        assertEquals((int) 1, rb.remove());
+
+        for (int i = 0; i < 64; i++) {
+            rb.add((int) 1);
+        }
+        assertEquals((int) 64, rb.evaluate());
+    }
+
+    public void testSpecialCaseC() {
+        // overlapping push and pop ranges with popTail < pushTail
+        final AggregatingIntRingBuffer rb = new AggregatingIntRingBuffer(16, (int) 0, (a, b) -> (int) (a + b));
+        // move pointers to middle of storage
+        for (int i = 0; i < 8; i++) {
+            rb.add((int) 1);
+            rb.remove();
+        }
+        assertEquals((int) 0, rb.evaluate());
+
+        for (int i = 0; i < 11; i++) {
+            rb.add((int) 1);
+        }
+        rb.remove();
+        assertEquals((int) 10, rb.evaluate());
+    }
+}
diff --git a/Base/src/test/java/io/deephaven/base/ringbuffer/TestAggregatingLongRingBuffer.java b/Base/src/test/java/io/deephaven/base/ringbuffer/TestAggregatingLongRingBuffer.java
new file mode 100644
index 00000000000..cd765139f27
--- /dev/null
+++ b/Base/src/test/java/io/deephaven/base/ringbuffer/TestAggregatingLongRingBuffer.java
@@ -0,0 +1,333 @@
+//
+// Copyright (c) 2016-2024 Deephaven Data Labs and Patent Pending
+//
+// ****** AUTO-GENERATED CLASS - DO NOT EDIT MANUALLY
+// ****** Edit TestAggregatingCharRingBuffer and run "./gradlew replicateRingBuffers" to regenerate
+//
+// @formatter:off
+package io.deephaven.base.ringbuffer;
+
+import junit.framework.TestCase;
+
+import java.util.NoSuchElementException;
+import java.util.Random;
+
+public class TestAggregatingLongRingBuffer extends TestCase {
+
+    private void assertEmpty(AggregatingLongRingBuffer rb) {
+        assertTrue(rb.isEmpty());
+        assertEquals(0, rb.size());
+
+        try {
+            rb.remove();
+            fail("queue should be empty");
+        } catch (NoSuchElementException x) {
+            // expected
+        }
+
+        try {
+            rb.element();
+            fail("queue should be empty");
+        } catch (NoSuchElementException x) {
+            // expected
+        }
+    }
+
+    public void testLargeAmounts() {
+        final AggregatingLongRingBuffer rb = new AggregatingLongRingBuffer(3, (long) 0, (a, b) -> (long) (a + b));
+
+        // move the head and tail off zero
+        for (int i = 0; i < 1000; i++) {
+            rb.add((long) i);
+        }
+        for (int i = 0; i < 1000; i++) {
+            rb.remove();
+        }
+
+        for (int i = 0; i < 10_000; i++)
+            rb.add((long) i);
+
+        for (int i = 10_000; i < 1_000_000; i++) {
+            rb.add((long) i);
+            assertEquals((long) (i - 10_000 + 1), rb.front(1));
+            assertEquals((long) (i - 10_000), rb.remove());
+            assertEquals(rb.remaining(), rb.capacity() - rb.size());
+        }
+    }
+
+    public void testEvaluateMinLargeAmounts() {
+        final AggregatingLongRingBuffer rb =
+                new AggregatingLongRingBuffer(3, Long.MAX_VALUE, (a, b) -> (long) Math.min(a, b));
+        for (int i = 0; i < 10_000; i++)
+            rb.add((long) i);
+
+        final int maxVal = (int) Math.min(Long.MAX_VALUE, 1_000_000);
+
+        for (int i = 10_000; i < maxVal; i++) {
+            rb.add((long) i);
+            assertEquals((long) (i - 10_000) + 1, rb.front(1));
+            assertEquals((long) (i - 10_000), rb.evaluate()); // front of queue is min
+            assertEquals((long) (i - 10_000), rb.remove());
+        }
+    }
+
+    public void testEvaluateMaxLargeAmounts() {
+        final AggregatingLongRingBuffer rb =
+                new AggregatingLongRingBuffer(3, Long.MIN_VALUE, (a, b) -> (long) Math.max(a, b));
+        for (int i = 0; i < 10_000; i++)
+            rb.add((long) i);
+
+        final int maxVal = (int) Math.min(Long.MAX_VALUE, 1_000_000);
+
+        for (int i = 10_000; i < maxVal; i++) {
+            rb.add((long) i);
+            assertEquals((long) (i - 10_000 + 1), rb.front(1));
+            assertEquals((long) i, rb.evaluate()); // last value added is max
+            assertEquals((long) (i - 10_000), rb.remove());
+        }
+    }
+
+    // region non-byte-tests
+
+    public void testEvaluateSumLargeAmounts() {
+        final AggregatingLongRingBuffer rb = new AggregatingLongRingBuffer(3, (long) 0, (a, b) -> (long) (a + b));
+        long runningSum = (long) 0;
+
+        for (long i = 0; i < 1_000; i++) {
+            rb.add(i);
+            runningSum += i;
+        }
+
+        // stay small enough to avoid longing errors but prove the concept
+        for (long i = 1_000; i < 10_000; i++) {
+            rb.add(i);
+            runningSum += i; // add the current value
+            assertEquals((long) (i - 1_000 + 1), rb.front(1));
+
+            assertEquals(runningSum, rb.evaluate());
+
+            assertEquals((long) (i - 1_000), rb.remove());
+            runningSum -= i - 1_000; // remove the value 1_0000 ago
+
+            assertEquals(runningSum, rb.evaluate());
+        }
+    }
+
+    /***
+     * Return the sum of 0 to N-1
+     */
+    private long sum0toN(long n) {
+        if (n == (long) 0) {
+            return (long) 0; // not negative zero, sigh
+        }
+        return (long) (n * (n - 1) / 2);
+    }
+
+    public void testEvaluationEdgeCase() {
+        AggregatingLongRingBuffer rb = new AggregatingLongRingBuffer(512, (long) 0, (a, b) -> (long) (a + b));
+
+        rb.addIdentityValue();
+        assertEquals((long) 0, rb.evaluate());
+        rb.clear();
+
+        final long PRIME = (long) 97;
+        final long PRIME_SUM = sum0toN(PRIME);
+        final Random rnd = new Random(0xDEADBEEF);
+
+        // specific test for push or wrap around
+        for (int step = 0; step < 100; step++) {
+            for (long i = 0; i < PRIME; i++) {
+                rb.addUnsafe(i);
+            }
+            assertEquals(PRIME_SUM, rb.evaluate());
+
+            for (long i = 0; i < PRIME; i++) {
+                rb.removeUnsafe();
+            }
+            assertEquals((long) 0, rb.evaluate());
+            // not a copy/paste error, call this twice
+            assertEquals((long) 0, rb.evaluate());
+        }
+
+        // specific test for push & wrap around
+        for (int step = 0; step < 100; step++) {
+            for (long i = 0; i < PRIME; i++) {
+                rb.addUnsafe(i);
+            }
+            for (long i = 0; i < PRIME; i++) {
+                rb.removeUnsafe();
+            }
+            assertEquals((long) 0, rb.evaluate());
+            // not a copy/paste error, call this twice
+            assertEquals((long) 0, rb.evaluate());
+        }
+
+        // push random amounts and test
+        for (int step = 0; step < 100; step++) {
+            final long OFFSET = (long) rnd.nextInt((int) PRIME);
+
+            for (long i = 0; i < OFFSET; i++) {
+                rb.addUnsafe(i);
+            }
+            assertEquals(sum0toN(OFFSET), rb.evaluate());
+
+            for (long i = OFFSET; i < PRIME; i++) {
+                rb.addUnsafe(i);
+            }
+            assertEquals(PRIME_SUM, rb.evaluate());
+
+            for (long i = 0; i < PRIME; i++) {
+                rb.removeUnsafe();
+            }
+            assertEquals((long) 0, rb.evaluate());
+        }
+
+        // pop random amounts and test
+        for (int step = 0; step < 100; step++) {
+            final long OFFSET = (long) rnd.nextInt((int) PRIME);
+            for (long i = 0; i < PRIME; i++) {
+                rb.addUnsafe(i);
+            }
+            assertEquals(PRIME_SUM, rb.evaluate());
+
+            for (long i = 0; i < OFFSET; i++) {
+                rb.removeUnsafe();
+            }
+            assertEquals(PRIME_SUM - sum0toN(OFFSET), rb.evaluate());
+
+            for (long i = 0; i < (PRIME - OFFSET); i++) {
+                rb.removeUnsafe();
+            }
+            assertEquals((long) 0, rb.evaluate());
+        }
+
+
+        rb = new AggregatingLongRingBuffer(512, (long) 0, (a, b) -> (long) (a + b));
+        // need to get the buffer to state where we have clean pushes and a wrapped pop
+
+        // move the pointers close to the end
+        for (long i = 0; i < 500; i++) {
+            rb.addUnsafe(i);
+            rb.removeUnsafe();
+        }
+        assertEquals((long) 0, rb.evaluate());
+        assertEmpty(rb);
+
+        // push past the end
+        for (long i = 0; i < 200; i++) {
+            rb.addUnsafe(i);
+        }
+        assertEquals(sum0toN((long) 200), rb.evaluate());
+
+        // one more push to dirty the pushes
+        rb.addUnsafe((long) 201);
+
+        // pop past the end
+        for (long i = 0; i < 200; i++) {
+            rb.removeUnsafe();
+        }
+
+        // only thing in the buffer is the final push
+        assertEquals((long) 201, rb.evaluate());
+    }
+    // endregion non-byte-tests
+
+    public void testPushPopUnsafe() {
+        final AggregatingLongRingBuffer rb =
+                new AggregatingLongRingBuffer(3, (long) -Long.MAX_VALUE, (a, b) -> (long) Math.max(a, b));
+        // move the head and tail off zero
+        rb.ensureRemaining(100);
+        for (long i = 0; i < 100; i++) {
+            rb.addUnsafe(i);
+        }
+        for (long i = 0; i < 100; i++) {
+            assertEquals(rb.removeUnsafe(), i);
+        }
+
+        // do it again with an offset
+        rb.ensureRemaining(100);
+        for (long i = 0; i < 100; i++) {
+            rb.addUnsafe((long) (i + (long) 1000));
+        }
+        for (long i = 0; i < 100; i++) {
+            assertEquals(rb.removeUnsafe(), i + (long) 1000);
+        }
+
+        for (long i = 0; i < 100; i++) {
+            rb.addUnsafe((long) (i + (long) 1000));
+        }
+        rb.clear();
+
+        for (long i = 0; i < 100; i++) {
+            rb.add(i);
+        }
+        assertEquals((long) 99, rb.evaluate()); // last value added is max
+    }
+
+    public void testPopMultiple() {
+        final AggregatingLongRingBuffer rb = new AggregatingLongRingBuffer(3, (long) 0, (a, b) -> (long) (a + b));
+
+        for (int step = 0; step < 10; step++) {
+            rb.ensureRemaining(100);
+            for (long i = 0; i < 100; i++) {
+                rb.addUnsafe(i);
+            }
+
+            if (step % 2 == 0) {
+                rb.evaluate();
+            }
+
+            try {
+                long[] values = rb.remove(101);
+                fail("popping more values than size() should fail");
+            } catch (NoSuchElementException x) {
+                // expected
+            }
+
+            long[] values = rb.remove(100);
+            for (long i = 0; i < 100; i++) {
+                assertEquals(values[(int) i], i);
+            }
+            assertEmpty(rb);
+        }
+    }
+
+    public void testSpecialCaseA() {
+        // overlapping push and pop ranges with popTail < pushTail
+        final AggregatingLongRingBuffer rb = new AggregatingLongRingBuffer(4, (long) 0, (a, b) -> (long) (a + b));
+        rb.add((long) 1);
+        assertEquals((long) 1, rb.remove());
+        rb.add((long) 2);
+        rb.add((long) 3);
+        assertEquals((long) 5, rb.evaluate());
+    }
+
+    public void testSpecialCaseB() {
+        // push the full capacity while wrapped
+        final AggregatingLongRingBuffer rb = new AggregatingLongRingBuffer(64, (long) 0, (a, b) -> (long) (a + b));
+        rb.add((long) 1);
+        assertEquals((long) 1, rb.remove());
+
+        for (int i = 0; i < 64; i++) {
+            rb.add((long) 1);
+        }
+        assertEquals((long) 64, rb.evaluate());
+    }
+
+    public void testSpecialCaseC() {
+        // overlapping push and pop ranges with popTail < pushTail
+        final AggregatingLongRingBuffer rb = new AggregatingLongRingBuffer(16, (long) 0, (a, b) -> (long) (a + b));
+        // move pointers to middle of storage
+        for (int i = 0; i < 8; i++) {
+            rb.add((long) 1);
+            rb.remove();
+        }
+        assertEquals((long) 0, rb.evaluate());
+
+        for (int i = 0; i < 11; i++) {
+            rb.add((long) 1);
+        }
+        rb.remove();
+        assertEquals((long) 10, rb.evaluate());
+    }
+}
diff --git a/Base/src/test/java/io/deephaven/base/ringbuffer/TestAggregatingObjectRingBuffer.java b/Base/src/test/java/io/deephaven/base/ringbuffer/TestAggregatingObjectRingBuffer.java
new file mode 100644
index 00000000000..09595fba70b
--- /dev/null
+++ b/Base/src/test/java/io/deephaven/base/ringbuffer/TestAggregatingObjectRingBuffer.java
@@ -0,0 +1,348 @@
+//
+// Copyright (c) 2016-2024 Deephaven Data Labs and Patent Pending
+//
+package io.deephaven.base.ringbuffer;
+
+import junit.framework.TestCase;
+
+import java.math.BigInteger;
+import java.util.NoSuchElementException;
+import java.util.Random;
+
+public class TestAggregatingObjectRingBuffer extends TestCase {
+
+    private void assertEmpty(AggregatingObjectRingBuffer rb) {
+        assertTrue(rb.isEmpty());
+        assertEquals(0, rb.size());
+
+        try {
+            rb.remove();
+            fail("queue should be empty");
+        } catch (NoSuchElementException x) {
+            // expected
+        }
+
+        try {
+            rb.element();
+            fail("queue should be empty");
+        } catch (NoSuchElementException x) {
+            // expected
+        }
+    }
+
+    public void testLargeAmounts() {
+        final BigInteger id = BigInteger.valueOf(0);
+        final AggregatingObjectRingBuffer<BigInteger> rb = new AggregatingObjectRingBuffer<>(3, id,
+                BigInteger::add);
+
+        // move the head and tail off zero
+        for (int i = 0; i < 1000; i++) {
+            rb.add(BigInteger.valueOf(i));
+        }
+        for (int i = 0; i < 1000; i++) {
+            rb.remove();
+        }
+
+        for (int i = 0; i < 10_000; i++)
+            rb.add(BigInteger.valueOf(i));
+
+        for (int i = 10_000; i < 1_000_000; i++) {
+            rb.add(BigInteger.valueOf(i));
+            assertEquals(BigInteger.valueOf(i - 10_000 + 1), rb.front(1));
+            assertEquals(BigInteger.valueOf(i - 10_000), rb.remove());
+            assertEquals(rb.remaining(), rb.capacity() - rb.size());
+        }
+    }
+
+    public void testEvaluateMinLargeAmounts() {
+        final BigInteger id = BigInteger.valueOf(Long.MAX_VALUE);
+        final AggregatingObjectRingBuffer<BigInteger> rb = new AggregatingObjectRingBuffer<>(3, id,
+                BigInteger::min);
+        for (int i = 0; i < 10_000; i++)
+            rb.add(BigInteger.valueOf(i));
+
+        for (int i = 10_000; i < 1_000_000; i++) {
+            rb.add(BigInteger.valueOf(i));
+            assertEquals(BigInteger.valueOf(i - 10_000 + 1), rb.front(1));
+            assertEquals(BigInteger.valueOf(i - 10_000), rb.evaluate()); // front of queue is min
+            assertEquals(BigInteger.valueOf(i - 10_000), rb.remove());
+        }
+    }
+
+    public void testEvaluateMaxLargeAmounts() {
+        final BigInteger id = BigInteger.valueOf(Long.MIN_VALUE);
+        final AggregatingObjectRingBuffer<BigInteger> rb = new AggregatingObjectRingBuffer<>(3, id,
+                BigInteger::max);
+        for (int i = 0; i < 10_000; i++)
+            rb.add(BigInteger.valueOf(i));
+
+        for (int i = 10_000; i < 1_000_000; i++) {
+            rb.add(BigInteger.valueOf(i));
+            assertEquals(BigInteger.valueOf(i - 10_000 + 1), rb.front(1));
+            assertEquals(BigInteger.valueOf(i), rb.evaluate()); // last value added is max
+            assertEquals(BigInteger.valueOf(i - 10_000), rb.remove());
+        }
+    }
+
+    // region non-byte-tests
+
+    public void testEvaluateSumLargeAmounts() {
+        final BigInteger id = BigInteger.valueOf(0);
+        final AggregatingObjectRingBuffer<BigInteger> rb = new AggregatingObjectRingBuffer<>(3, id,
+                BigInteger::add);
+        BigInteger runningSum = BigInteger.valueOf(0);
+
+        for (int i = 0; i < 1_000; i++) {
+            BigInteger val = BigInteger.valueOf(i);
+            rb.add(val);
+            runningSum = runningSum.add(val);
+        }
+
+        // stay small enough to avoid Objecting errors but prove the concept
+        for (int i = 1_000; i < 10_000; i++) {
+            BigInteger val = BigInteger.valueOf(i);
+            rb.add(val);
+            runningSum = runningSum.add(val);
+
+            assertEquals(BigInteger.valueOf(i - 1_000 + 1), rb.front(1));
+
+            assertEquals(runningSum, rb.evaluate());
+
+            assertEquals(BigInteger.valueOf(i - 1_000), rb.remove());
+            runningSum = runningSum.subtract(BigInteger.valueOf(i - 1_000));
+
+            assertEquals(runningSum, rb.evaluate());
+        }
+    }
+
+    /***
+     * Return the sum of 0 to N-1
+     */
+    private int sum0toN(int n) {
+        if (n == 0) {
+            return 0; // not negative zero, sigh
+        }
+        return (n * (n - 1) / 2);
+    }
+
+    public void testEvaluationEdgeCase() {
+        final BigInteger id = BigInteger.valueOf(0);
+        AggregatingObjectRingBuffer<BigInteger> rb = new AggregatingObjectRingBuffer<>(512, id,
+                BigInteger::add);
+
+        rb.addIdentityValue();
+        assertEquals(id, rb.evaluate());
+        rb.clear();
+
+        final int PRIME = 97;
+        final int PRIME_SUM = sum0toN(PRIME);
+        final Random rnd = new Random(0xDEADBEEF);
+
+        // specific test for push or wrap around
+        for (int step = 0; step < 100; step++) {
+            for (int i = 0; i < PRIME; i++) {
+                rb.addUnsafe(BigInteger.valueOf(i));
+            }
+            assertEquals(BigInteger.valueOf(PRIME_SUM), rb.evaluate());
+
+            for (int i = 0; i < PRIME; i++) {
+                rb.removeUnsafe();
+            }
+            assertEquals(id, rb.evaluate());
+            // not a copy/paste error, call this twice
+            assertEquals(id, rb.evaluate());
+        }
+
+        // specific test for push & wrap around
+        for (int step = 0; step < 100; step++) {
+            for (int i = 0; i < PRIME; i++) {
+                rb.addUnsafe(BigInteger.valueOf(i));
+            }
+            for (int i = 0; i < PRIME; i++) {
+                rb.removeUnsafe();
+            }
+            assertEquals(id, rb.evaluate());
+            // not a copy/paste error, call this twice
+            assertEquals(id, rb.evaluate());
+        }
+
+        // push random amounts and test
+        for (int step = 0; step < 100; step++) {
+            final int OFFSET = rnd.nextInt(PRIME);
+
+            for (int i = 0; i < OFFSET; i++) {
+                rb.addUnsafe(BigInteger.valueOf(i));
+            }
+            assertEquals(BigInteger.valueOf(sum0toN(OFFSET)), rb.evaluate());
+
+            for (int i = OFFSET; i < PRIME; i++) {
+                rb.addUnsafe(BigInteger.valueOf(i));
+            }
+            assertEquals(BigInteger.valueOf(PRIME_SUM), rb.evaluate());
+
+            for (int i = 0; i < PRIME; i++) {
+                rb.removeUnsafe();
+            }
+            assertEquals(id, rb.evaluate());
+        }
+
+        // pop random amounts and test
+        for (int step = 0; step < 100; step++) {
+            final int OFFSET = rnd.nextInt(PRIME);
+            for (int i = 0; i < PRIME; i++) {
+                rb.addUnsafe(BigInteger.valueOf(i));
+            }
+            assertEquals(BigInteger.valueOf(PRIME_SUM), rb.evaluate());
+
+            for (int i = 0; i < OFFSET; i++) {
+                rb.removeUnsafe();
+            }
+            assertEquals(BigInteger.valueOf(PRIME_SUM - sum0toN(OFFSET)), rb.evaluate());
+
+            for (int i = 0; i < (PRIME - OFFSET); i++) {
+                rb.removeUnsafe();
+            }
+            assertEquals(id, rb.evaluate());
+        }
+
+
+        rb.clear();
+        // need to get the buffer to state where we have clean pushes and a wrapped pop
+
+        // move the pointers close to the end
+        for (int i = 0; i < 500; i++) {
+            rb.addUnsafe(BigInteger.valueOf(i));
+            rb.removeUnsafe();
+        }
+        assertEquals(id, rb.evaluate());
+        assertEmpty(rb);
+
+        // push past the end
+        for (int i = 0; i < 200; i++) {
+            rb.addUnsafe(BigInteger.valueOf(i));
+        }
+        assertEquals(BigInteger.valueOf(sum0toN(200)), rb.evaluate());
+
+        // one more push to dirty the pushes
+        rb.addUnsafe(BigInteger.valueOf(201));
+
+        // pop past the end
+        for (int i = 0; i < 200; i++) {
+            rb.removeUnsafe();
+        }
+
+        // only thing in the buffer is the final push
+        assertEquals(BigInteger.valueOf(201), rb.evaluate());
+    }
+    // endregion non-byte-tests
+
+    public void testPushPopUnsafe() {
+        final BigInteger id = BigInteger.valueOf(Long.MIN_VALUE);
+        final AggregatingObjectRingBuffer<BigInteger> rb = new AggregatingObjectRingBuffer<>(512, id,
+                BigInteger::max);
+
+        // move the head and tail off zero
+        rb.ensureRemaining(100);
+        for (int i = 0; i < 100; i++) {
+            rb.addUnsafe(BigInteger.valueOf(i));
+        }
+        for (int i = 0; i < 100; i++) {
+            assertEquals(rb.removeUnsafe(), BigInteger.valueOf(i));
+        }
+
+        // do it again with an offset
+        rb.ensureRemaining(100);
+        for (int i = 0; i < 100; i++) {
+            rb.addUnsafe(BigInteger.valueOf(i + 1000));
+        }
+        for (int i = 0; i < 100; i++) {
+            assertEquals(rb.removeUnsafe(), BigInteger.valueOf(i + 1000));
+        }
+
+        for (int i = 0; i < 100; i++) {
+            rb.addUnsafe(BigInteger.valueOf(i + 1000));
+        }
+        rb.clear();
+
+        for (int i = 0; i < 100; i++) {
+            rb.addUnsafe(BigInteger.valueOf(i));
+        }
+        assertEquals(BigInteger.valueOf(99), rb.evaluate()); // last value added is max
+    }
+
+    public void testPopMultiple() {
+        final BigInteger id = BigInteger.valueOf(0);
+        AggregatingObjectRingBuffer<BigInteger> rb = new AggregatingObjectRingBuffer<>(512, id,
+                BigInteger::add);
+
+        for (int step = 0; step < 10; step++) {
+            rb.ensureRemaining(100);
+            for (int i = 0; i < 100; i++) {
+                rb.addUnsafe(BigInteger.valueOf(i));
+            }
+
+            if (step % 2 == 0) {
+                rb.evaluate();
+            }
+
+            try {
+                Object[] values = rb.remove(101);
+                fail("popping more values than size() should fail");
+            } catch (NoSuchElementException x) {
+                // expected
+            }
+
+            Object[] values = rb.remove(100);
+            for (int i = 0; i < 100; i++) {
+                assertEquals(values[i], BigInteger.valueOf(i));
+            }
+            assertEmpty(rb);
+        }
+    }
+
+    public void testSpecialCaseA() {
+        // overlapping push and pop ranges with popTail < pushTail
+        final BigInteger id = BigInteger.valueOf(0);
+        AggregatingObjectRingBuffer<BigInteger> rb = new AggregatingObjectRingBuffer<>(4, id,
+                BigInteger::add);
+        rb.add(BigInteger.valueOf(1));
+        assertEquals(BigInteger.valueOf(1), rb.remove());
+
+        rb.add(BigInteger.valueOf(2));
+        rb.add(BigInteger.valueOf(3));
+        assertEquals(BigInteger.valueOf(5), rb.evaluate());
+    }
+
+    public void testSpecialCaseB() {
+        // push the full capacity while wrapped
+        final BigInteger id = BigInteger.valueOf(0);
+        AggregatingObjectRingBuffer<BigInteger> rb = new AggregatingObjectRingBuffer<>(64, id,
+                BigInteger::add);
+        rb.add(BigInteger.valueOf(1));
+        assertEquals(BigInteger.valueOf(1), rb.remove());
+
+        for (int i = 0; i < 64; i++) {
+            rb.add(BigInteger.valueOf(1));
+        }
+        assertEquals(BigInteger.valueOf(64), rb.evaluate());
+    }
+
+    public void testSpecialCaseC() {
+        // overlapping push and pop ranges with popTail < pushTail
+        final BigInteger id = BigInteger.valueOf(0);
+        AggregatingObjectRingBuffer<BigInteger> rb = new AggregatingObjectRingBuffer<>(16, id,
+                BigInteger::add);
+        // move pointers to middle of storage
+        for (int i = 0; i < 8; i++) {
+            rb.add(BigInteger.valueOf(1));
+            rb.remove();
+        }
+        assertEquals(BigInteger.valueOf(0), rb.evaluate());
+
+        for (int i = 0; i < 11; i++) {
+            rb.add(BigInteger.valueOf(1));
+        }
+        rb.remove();
+        assertEquals(BigInteger.valueOf(10), rb.evaluate());
+    }
+}
diff --git a/Base/src/test/java/io/deephaven/base/ringbuffer/TestAggregatingShortRingBuffer.java b/Base/src/test/java/io/deephaven/base/ringbuffer/TestAggregatingShortRingBuffer.java
new file mode 100644
index 00000000000..7c50f50faac
--- /dev/null
+++ b/Base/src/test/java/io/deephaven/base/ringbuffer/TestAggregatingShortRingBuffer.java
@@ -0,0 +1,333 @@
+//
+// Copyright (c) 2016-2024 Deephaven Data Labs and Patent Pending
+//
+// ****** AUTO-GENERATED CLASS - DO NOT EDIT MANUALLY
+// ****** Edit TestAggregatingCharRingBuffer and run "./gradlew replicateRingBuffers" to regenerate
+//
+// @formatter:off
+package io.deephaven.base.ringbuffer;
+
+import junit.framework.TestCase;
+
+import java.util.NoSuchElementException;
+import java.util.Random;
+
+public class TestAggregatingShortRingBuffer extends TestCase {
+
+    private void assertEmpty(AggregatingShortRingBuffer rb) {
+        assertTrue(rb.isEmpty());
+        assertEquals(0, rb.size());
+
+        try {
+            rb.remove();
+            fail("queue should be empty");
+        } catch (NoSuchElementException x) {
+            // expected
+        }
+
+        try {
+            rb.element();
+            fail("queue should be empty");
+        } catch (NoSuchElementException x) {
+            // expected
+        }
+    }
+
+    public void testLargeAmounts() {
+        final AggregatingShortRingBuffer rb = new AggregatingShortRingBuffer(3, (short) 0, (a, b) -> (short) (a + b));
+
+        // move the head and tail off zero
+        for (int i = 0; i < 1000; i++) {
+            rb.add((short) i);
+        }
+        for (int i = 0; i < 1000; i++) {
+            rb.remove();
+        }
+
+        for (int i = 0; i < 10_000; i++)
+            rb.add((short) i);
+
+        for (int i = 10_000; i < 1_000_000; i++) {
+            rb.add((short) i);
+            assertEquals((short) (i - 10_000 + 1), rb.front(1));
+            assertEquals((short) (i - 10_000), rb.remove());
+            assertEquals(rb.remaining(), rb.capacity() - rb.size());
+        }
+    }
+
+    public void testEvaluateMinLargeAmounts() {
+        final AggregatingShortRingBuffer rb =
+                new AggregatingShortRingBuffer(3, Short.MAX_VALUE, (a, b) -> (short) Math.min(a, b));
+        for (int i = 0; i < 10_000; i++)
+            rb.add((short) i);
+
+        final int maxVal = (int) Math.min(Short.MAX_VALUE, 1_000_000);
+
+        for (int i = 10_000; i < maxVal; i++) {
+            rb.add((short) i);
+            assertEquals((short) (i - 10_000) + 1, rb.front(1));
+            assertEquals((short) (i - 10_000), rb.evaluate()); // front of queue is min
+            assertEquals((short) (i - 10_000), rb.remove());
+        }
+    }
+
+    public void testEvaluateMaxLargeAmounts() {
+        final AggregatingShortRingBuffer rb =
+                new AggregatingShortRingBuffer(3, Short.MIN_VALUE, (a, b) -> (short) Math.max(a, b));
+        for (int i = 0; i < 10_000; i++)
+            rb.add((short) i);
+
+        final int maxVal = (int) Math.min(Short.MAX_VALUE, 1_000_000);
+
+        for (int i = 10_000; i < maxVal; i++) {
+            rb.add((short) i);
+            assertEquals((short) (i - 10_000 + 1), rb.front(1));
+            assertEquals((short) i, rb.evaluate()); // last value added is max
+            assertEquals((short) (i - 10_000), rb.remove());
+        }
+    }
+
+    // region non-byte-tests
+
+    public void testEvaluateSumLargeAmounts() {
+        final AggregatingShortRingBuffer rb = new AggregatingShortRingBuffer(3, (short) 0, (a, b) -> (short) (a + b));
+        short runningSum = (short) 0;
+
+        for (short i = 0; i < 1_000; i++) {
+            rb.add(i);
+            runningSum += i;
+        }
+
+        // stay small enough to avoid shorting errors but prove the concept
+        for (short i = 1_000; i < 10_000; i++) {
+            rb.add(i);
+            runningSum += i; // add the current value
+            assertEquals((short) (i - 1_000 + 1), rb.front(1));
+
+            assertEquals(runningSum, rb.evaluate());
+
+            assertEquals((short) (i - 1_000), rb.remove());
+            runningSum -= i - 1_000; // remove the value 1_0000 ago
+
+            assertEquals(runningSum, rb.evaluate());
+        }
+    }
+
+    /***
+     * Return the sum of 0 to N-1
+     */
+    private short sum0toN(short n) {
+        if (n == (short) 0) {
+            return (short) 0; // not negative zero, sigh
+        }
+        return (short) (n * (n - 1) / 2);
+    }
+
+    public void testEvaluationEdgeCase() {
+        AggregatingShortRingBuffer rb = new AggregatingShortRingBuffer(512, (short) 0, (a, b) -> (short) (a + b));
+
+        rb.addIdentityValue();
+        assertEquals((short) 0, rb.evaluate());
+        rb.clear();
+
+        final short PRIME = (short) 97;
+        final short PRIME_SUM = sum0toN(PRIME);
+        final Random rnd = new Random(0xDEADBEEF);
+
+        // specific test for push or wrap around
+        for (int step = 0; step < 100; step++) {
+            for (short i = 0; i < PRIME; i++) {
+                rb.addUnsafe(i);
+            }
+            assertEquals(PRIME_SUM, rb.evaluate());
+
+            for (short i = 0; i < PRIME; i++) {
+                rb.removeUnsafe();
+            }
+            assertEquals((short) 0, rb.evaluate());
+            // not a copy/paste error, call this twice
+            assertEquals((short) 0, rb.evaluate());
+        }
+
+        // specific test for push & wrap around
+        for (int step = 0; step < 100; step++) {
+            for (short i = 0; i < PRIME; i++) {
+                rb.addUnsafe(i);
+            }
+            for (short i = 0; i < PRIME; i++) {
+                rb.removeUnsafe();
+            }
+            assertEquals((short) 0, rb.evaluate());
+            // not a copy/paste error, call this twice
+            assertEquals((short) 0, rb.evaluate());
+        }
+
+        // push random amounts and test
+        for (int step = 0; step < 100; step++) {
+            final short OFFSET = (short) rnd.nextInt((int) PRIME);
+
+            for (short i = 0; i < OFFSET; i++) {
+                rb.addUnsafe(i);
+            }
+            assertEquals(sum0toN(OFFSET), rb.evaluate());
+
+            for (short i = OFFSET; i < PRIME; i++) {
+                rb.addUnsafe(i);
+            }
+            assertEquals(PRIME_SUM, rb.evaluate());
+
+            for (short i = 0; i < PRIME; i++) {
+                rb.removeUnsafe();
+            }
+            assertEquals((short) 0, rb.evaluate());
+        }
+
+        // pop random amounts and test
+        for (int step = 0; step < 100; step++) {
+            final short OFFSET = (short) rnd.nextInt((int) PRIME);
+            for (short i = 0; i < PRIME; i++) {
+                rb.addUnsafe(i);
+            }
+            assertEquals(PRIME_SUM, rb.evaluate());
+
+            for (short i = 0; i < OFFSET; i++) {
+                rb.removeUnsafe();
+            }
+            assertEquals(PRIME_SUM - sum0toN(OFFSET), rb.evaluate());
+
+            for (short i = 0; i < (PRIME - OFFSET); i++) {
+                rb.removeUnsafe();
+            }
+            assertEquals((short) 0, rb.evaluate());
+        }
+
+
+        rb = new AggregatingShortRingBuffer(512, (short) 0, (a, b) -> (short) (a + b));
+        // need to get the buffer to state where we have clean pushes and a wrapped pop
+
+        // move the pointers close to the end
+        for (short i = 0; i < 500; i++) {
+            rb.addUnsafe(i);
+            rb.removeUnsafe();
+        }
+        assertEquals((short) 0, rb.evaluate());
+        assertEmpty(rb);
+
+        // push past the end
+        for (short i = 0; i < 200; i++) {
+            rb.addUnsafe(i);
+        }
+        assertEquals(sum0toN((short) 200), rb.evaluate());
+
+        // one more push to dirty the pushes
+        rb.addUnsafe((short) 201);
+
+        // pop past the end
+        for (short i = 0; i < 200; i++) {
+            rb.removeUnsafe();
+        }
+
+        // only thing in the buffer is the final push
+        assertEquals((short) 201, rb.evaluate());
+    }
+    // endregion non-byte-tests
+
+    public void testPushPopUnsafe() {
+        final AggregatingShortRingBuffer rb =
+                new AggregatingShortRingBuffer(3, (short) -Short.MAX_VALUE, (a, b) -> (short) Math.max(a, b));
+        // move the head and tail off zero
+        rb.ensureRemaining(100);
+        for (short i = 0; i < 100; i++) {
+            rb.addUnsafe(i);
+        }
+        for (short i = 0; i < 100; i++) {
+            assertEquals(rb.removeUnsafe(), i);
+        }
+
+        // do it again with an offset
+        rb.ensureRemaining(100);
+        for (short i = 0; i < 100; i++) {
+            rb.addUnsafe((short) (i + (short) 1000));
+        }
+        for (short i = 0; i < 100; i++) {
+            assertEquals(rb.removeUnsafe(), i + (short) 1000);
+        }
+
+        for (short i = 0; i < 100; i++) {
+            rb.addUnsafe((short) (i + (short) 1000));
+        }
+        rb.clear();
+
+        for (short i = 0; i < 100; i++) {
+            rb.add(i);
+        }
+        assertEquals((short) 99, rb.evaluate()); // last value added is max
+    }
+
+    public void testPopMultiple() {
+        final AggregatingShortRingBuffer rb = new AggregatingShortRingBuffer(3, (short) 0, (a, b) -> (short) (a + b));
+
+        for (int step = 0; step < 10; step++) {
+            rb.ensureRemaining(100);
+            for (short i = 0; i < 100; i++) {
+                rb.addUnsafe(i);
+            }
+
+            if (step % 2 == 0) {
+                rb.evaluate();
+            }
+
+            try {
+                short[] values = rb.remove(101);
+                fail("popping more values than size() should fail");
+            } catch (NoSuchElementException x) {
+                // expected
+            }
+
+            short[] values = rb.remove(100);
+            for (short i = 0; i < 100; i++) {
+                assertEquals(values[(int) i], i);
+            }
+            assertEmpty(rb);
+        }
+    }
+
+    public void testSpecialCaseA() {
+        // overlapping push and pop ranges with popTail < pushTail
+        final AggregatingShortRingBuffer rb = new AggregatingShortRingBuffer(4, (short) 0, (a, b) -> (short) (a + b));
+        rb.add((short) 1);
+        assertEquals((short) 1, rb.remove());
+        rb.add((short) 2);
+        rb.add((short) 3);
+        assertEquals((short) 5, rb.evaluate());
+    }
+
+    public void testSpecialCaseB() {
+        // push the full capacity while wrapped
+        final AggregatingShortRingBuffer rb = new AggregatingShortRingBuffer(64, (short) 0, (a, b) -> (short) (a + b));
+        rb.add((short) 1);
+        assertEquals((short) 1, rb.remove());
+
+        for (int i = 0; i < 64; i++) {
+            rb.add((short) 1);
+        }
+        assertEquals((short) 64, rb.evaluate());
+    }
+
+    public void testSpecialCaseC() {
+        // overlapping push and pop ranges with popTail < pushTail
+        final AggregatingShortRingBuffer rb = new AggregatingShortRingBuffer(16, (short) 0, (a, b) -> (short) (a + b));
+        // move pointers to middle of storage
+        for (int i = 0; i < 8; i++) {
+            rb.add((short) 1);
+            rb.remove();
+        }
+        assertEquals((short) 0, rb.evaluate());
+
+        for (int i = 0; i < 11; i++) {
+            rb.add((short) 1);
+        }
+        rb.remove();
+        assertEquals((short) 10, rb.evaluate());
+    }
+}
diff --git a/Base/src/test/java/io/deephaven/base/ringbuffer/TestByteRingBuffer.java b/Base/src/test/java/io/deephaven/base/ringbuffer/TestByteRingBuffer.java
new file mode 100644
index 00000000000..70e8914efcb
--- /dev/null
+++ b/Base/src/test/java/io/deephaven/base/ringbuffer/TestByteRingBuffer.java
@@ -0,0 +1,561 @@
+//
+// Copyright (c) 2016-2024 Deephaven Data Labs and Patent Pending
+//
+// ****** AUTO-GENERATED CLASS - DO NOT EDIT MANUALLY
+// ****** Edit TestCharRingBuffer and run "./gradlew replicateRingBuffers" to regenerate
+//
+// @formatter:off
+package io.deephaven.base.ringbuffer;
+
+import io.deephaven.base.ArrayUtil;
+import io.deephaven.base.verify.AssertionFailure;
+import junit.framework.TestCase;
+
+import java.util.NoSuchElementException;
+
+import static org.junit.Assert.assertThrows;
+
+public class TestByteRingBuffer extends TestCase {
+
+    final byte SENTINEL = Byte.MIN_VALUE;
+
+    private void assertEmpty(ByteRingBuffer rb) {
+        assertTrue(rb.isEmpty());
+        assertEquals(0, rb.size());
+
+        assertEquals(SENTINEL, rb.peek(SENTINEL));
+        try {
+            rb.element();
+            fail("queue should be empty");
+        } catch (NoSuchElementException x) {
+            // expected
+        }
+
+        assertEquals(SENTINEL, rb.poll(SENTINEL));
+        try {
+            rb.remove();
+            fail("queue should be empty");
+        } catch (NoSuchElementException x) {
+            // expected
+        }
+        // region empty-test
+        // endregion empty-test
+    }
+
+    private void assertFull(ByteRingBuffer rb) {
+        assertFalse(rb.isEmpty());
+        assertEquals(rb.capacity(), rb.size());
+    }
+
+    private void assertNotEmpty(ByteRingBuffer rb, int expectedSize, byte expectedHead) {
+        assertFalse(rb.isEmpty());
+        assertEquals(expectedSize, rb.size());
+
+        assertEquals(expectedHead, rb.peek(SENTINEL));
+        try {
+            assertEquals(expectedHead, rb.element());
+        } catch (NoSuchElementException x) {
+            fail("queue should not be empty");
+        }
+    }
+
+    private void assertAdd(ByteRingBuffer rb, byte newHead, int expectedSize, byte expectedHead) {
+        assertTrue(rb.add(newHead));
+        assertNotEmpty(rb, expectedSize, expectedHead);
+    }
+
+    private void assertOffer(ByteRingBuffer rb, byte newHead, int expectedSize, byte expectedHead) {
+        assertTrue(rb.offer(newHead));
+        assertNotEmpty(rb, expectedSize, expectedHead);
+    }
+
+    private void assertPoll(ByteRingBuffer rb, int expectedSize, byte expectedHead) {
+        assertNotEmpty(rb, expectedSize, expectedHead);
+        assertEquals(expectedHead, rb.poll(SENTINEL));
+    }
+
+    private void assertRemove(ByteRingBuffer rb, int expectedSize, byte expectedHead) {
+        assertNotEmpty(rb, expectedSize, expectedHead);
+        try {
+            assertEquals(expectedHead, rb.remove());
+        } catch (NoSuchElementException x) {
+            fail("queue should not be empty");
+        }
+    }
+
+    private void assertContents(ByteRingBuffer rb, byte... expectedData) {
+        final byte[] data = rb.getAll();
+        assertEquals(data.length, expectedData.length);
+        for (int ii = 0; ii < data.length; ii++) {
+            assertEquals(data[ii], expectedData[ii]);
+        }
+    }
+
+    private void assertArrayEquals(byte[] data, byte... expectedData) {
+        assertEquals(data.length, expectedData.length);
+        for (int ii = 0; ii < data.length; ii++) {
+            assertEquals(data[ii], expectedData[ii]);
+        }
+    }
+
+    byte A = 'A';
+    byte B = 'B';
+    byte C = 'C';
+    byte D = 'D';
+    byte E = 'E';
+    byte F = 'F';
+
+    public void testAddRemove() {
+
+        ByteRingBuffer rb = new ByteRingBuffer(3);
+
+        assertEmpty(rb);
+
+        assertAdd(rb, A, 1, A);
+        assertAdd(rb, B, 2, A);
+        assertAdd(rb, C, 3, A);
+        assertContents(rb, A, B, C);
+
+        assertRemove(rb, 3, A);
+        assertContents(rb, B, C);
+
+        assertRemove(rb, 2, B);
+        assertContents(rb, C);
+
+        assertRemove(rb, 1, C);
+        assertContents(rb);
+
+        assertEmpty(rb);
+
+        assertAdd(rb, A, 1, A);
+        assertAdd(rb, B, 2, A);
+        assertContents(rb, A, B);
+
+        assertRemove(rb, 2, A);
+        assertContents(rb, B);
+
+        assertAdd(rb, C, 2, B);
+        assertContents(rb, B, C);
+
+        assertRemove(rb, 2, B);
+        assertContents(rb, C);
+
+        assertRemove(rb, 1, C);
+        assertContents(rb);
+
+        assertEmpty(rb);
+
+        assertAdd(rb, A, 1, A);
+        assertRemove(rb, 1, A);
+        assertEmpty(rb);
+        assertAdd(rb, B, 1, B);
+        assertRemove(rb, 1, B);
+        assertEmpty(rb);
+        assertAdd(rb, C, 1, C);
+        assertRemove(rb, 1, C);
+        assertEmpty(rb);
+
+        assertAdd(rb, D, 1, D);
+        assertRemove(rb, 1, D);
+        assertEmpty(rb);
+        assertAdd(rb, E, 1, E);
+        assertRemove(rb, 1, E);
+        assertEmpty(rb);
+        assertAdd(rb, F, 1, F);
+        assertRemove(rb, 1, F);
+        assertEmpty(rb);
+
+        assertAdd(rb, A, 1, A);
+        assertAdd(rb, B, 2, A);
+        assertAdd(rb, C, 3, A);
+        assertContents(rb, A, B, C);
+
+        assertAdd(rb, D, 4, A);
+        assertAdd(rb, E, 5, A);
+        assertAdd(rb, F, 6, A);
+        assertContents(rb, A, B, C, D, E, F);
+
+        assertRemove(rb, 6, A);
+        assertRemove(rb, 5, B);
+        assertRemove(rb, 4, C);
+        assertRemove(rb, 3, D);
+        assertRemove(rb, 2, E);
+        assertRemove(rb, 1, F);
+        assertContents(rb);
+        assertEmpty(rb);
+    }
+
+    public void testOfferPoll() {
+        ByteRingBuffer rb = new ByteRingBuffer(3);
+
+        assertEmpty(rb);
+
+        assertOffer(rb, A, 1, A);
+        assertOffer(rb, B, 2, A);
+        assertOffer(rb, C, 3, A);
+
+        assertPoll(rb, 3, A);
+        assertPoll(rb, 2, B);
+        assertPoll(rb, 1, C);
+        assertEmpty(rb);
+
+        assertOffer(rb, A, 1, A);
+        assertOffer(rb, B, 2, A);
+        assertPoll(rb, 2, A);
+        assertOffer(rb, C, 2, B);
+        assertPoll(rb, 2, B);
+        assertPoll(rb, 1, C);
+        assertEmpty(rb);
+
+        assertOffer(rb, A, 1, A);
+        assertPoll(rb, 1, A);
+        assertEmpty(rb);
+        assertOffer(rb, B, 1, B);
+        assertPoll(rb, 1, B);
+        assertEmpty(rb);
+        assertOffer(rb, C, 1, C);
+        assertPoll(rb, 1, C);
+        assertEmpty(rb);
+
+        assertOffer(rb, D, 1, D);
+        assertPoll(rb, 1, D);
+        assertEmpty(rb);
+        assertOffer(rb, E, 1, E);
+        assertPoll(rb, 1, E);
+        assertEmpty(rb);
+        assertOffer(rb, F, 1, F);
+        assertPoll(rb, 1, F);
+        assertEmpty(rb);
+
+        assertOffer(rb, A, 1, A);
+        assertOffer(rb, B, 2, A);
+        assertOffer(rb, C, 3, A);
+        assertOffer(rb, D, 4, A);
+
+        assertAdd(rb, E, 5, A); // need one add to grow it from 4 to 8
+        assertOffer(rb, F, 6, A);
+
+        assertPoll(rb, 6, A);
+        assertPoll(rb, 5, B);
+        assertPoll(rb, 4, C);
+        assertPoll(rb, 3, D);
+        assertPoll(rb, 2, E);
+        assertPoll(rb, 1, F);
+        assertEmpty(rb);
+    }
+
+    public void testGrowSimple() {
+        ByteRingBuffer rb = new ByteRingBuffer(4);
+
+        assertAdd(rb, A, 1, A);
+        assertAdd(rb, B, 2, A);
+        assertAdd(rb, C, 3, A);
+        assertAdd(rb, D, 4, A);
+        assertFull(rb);
+
+        // remove one so head != 0
+        assertRemove(rb, 4, A);
+
+        assertAdd(rb, E, 4, B);
+        // this will grow; the elements are in a single contiguous block
+        assertAdd(rb, F, 5, B);
+
+        assertRemove(rb, 5, B);
+        assertRemove(rb, 4, C);
+        assertRemove(rb, 3, D);
+        assertRemove(rb, 2, E);
+        assertRemove(rb, 1, F);
+        assertEmpty(rb);
+    }
+
+    public void testGrowComplex() {
+        ByteRingBuffer rb = new ByteRingBuffer(5);
+
+        assertAdd(rb, A, 1, A);
+        assertAdd(rb, B, 2, A);
+        assertAdd(rb, C, 3, A);
+        assertRemove(rb, 3, A);
+        assertRemove(rb, 2, B);
+        assertRemove(rb, 1, C);
+        assertEmpty(rb);
+
+        assertAdd(rb, A, 1, A);
+        assertAdd(rb, B, 2, A);
+        assertAdd(rb, C, 3, A);
+        assertAdd(rb, D, 4, A);
+        assertAdd(rb, E, 5, A);
+
+        // this will grow; the elements are in two blocks
+        assertAdd(rb, F, 6, A);
+
+        assertRemove(rb, 6, A);
+        assertRemove(rb, 5, B);
+        assertRemove(rb, 4, C);
+        assertRemove(rb, 3, D);
+        assertRemove(rb, 2, E);
+        assertRemove(rb, 1, F);
+        assertEmpty(rb);
+    }
+
+    public void testIterator() {
+        ByteRingBuffer rb = new ByteRingBuffer(3);
+
+        ByteRingBuffer.Iterator iter = rb.iterator();
+        assertFalse(iter.hasNext());
+
+        assertAdd(rb, A, 1, A);
+        assertAdd(rb, B, 2, A);
+        assertAdd(rb, C, 3, A);
+
+        iter = rb.iterator();
+        assertTrue(iter.hasNext());
+        assertEquals(A, iter.next());
+        assertTrue(iter.hasNext());
+        assertEquals(B, iter.next());
+        assertTrue(iter.hasNext());
+        assertEquals(C, iter.next());
+        assertFalse(iter.hasNext());
+
+        assertRemove(rb, 3, A);
+        assertAdd(rb, D, 3, B);
+
+        iter = rb.iterator();
+        assertTrue(iter.hasNext());
+        assertEquals(B, iter.next());
+        assertTrue(iter.hasNext());
+        assertEquals(C, iter.next());
+        assertTrue(iter.hasNext());
+        assertEquals(D, iter.next());
+        assertFalse(iter.hasNext());
+
+        assertRemove(rb, 3, B);
+
+        iter = rb.iterator();
+        assertEquals(C, iter.next());
+        assertEquals(D, iter.next());
+        assertFalse(iter.hasNext());
+
+        assertAdd(rb, E, 3, C);
+        assertAdd(rb, F, 4, C);
+
+        iter = rb.iterator();
+        assertTrue(iter.hasNext());
+        assertEquals(C, iter.next());
+        assertTrue(iter.hasNext());
+        assertEquals(D, iter.next());
+        assertTrue(iter.hasNext());
+        assertEquals(E, iter.next());
+        assertTrue(iter.hasNext());
+        assertEquals(F, iter.next());
+        assertFalse(iter.hasNext());
+
+        final ByteRingBuffer.Iterator iterFinal = rb.iterator();
+
+        assertThrows(UnsupportedOperationException.class,
+                iterFinal::remove);
+    }
+
+    public void testBack() {
+        ByteRingBuffer rb = new ByteRingBuffer(5);
+
+        assertAdd(rb, A, 1, A);
+        assertEquals(rb.back(), A);
+
+        assertAdd(rb, B, 2, A);
+        assertAdd(rb, C, 3, A);
+        assertEquals(rb.back(), C);
+    }
+
+    public void testBackWhenEmpty() {
+        ByteRingBuffer rb = new ByteRingBuffer(5);
+        try {
+            rb.back();
+            fail("expected a NoSuchElement exception");
+        } catch (NoSuchElementException x) {
+            // expected
+        }
+    }
+
+    public void testBackTailIsZero() {
+        ByteRingBuffer rb = new ByteRingBuffer(5, false);
+
+        assertAdd(rb, A, 1, A);
+        assertAdd(rb, B, 2, A);
+        assertAdd(rb, C, 3, A);
+        assertAdd(rb, D, 4, A);
+        assertAdd(rb, E, 5, A);
+
+        assertRemove(rb, 5, A);
+        assertAdd(rb, F, 5, B);
+        assertEquals(rb.back(), F);
+    }
+
+    public void testLargeAmounts() {
+        ByteRingBuffer rb = new ByteRingBuffer(3);
+
+        for (int i = 0; i < 100; i++)
+            rb.add((byte) i);
+
+        for (int i = 100; i < 200; i++) {
+            rb.add((byte) i);
+            assertEquals((byte) (i - 100 + 1), rb.front(1));
+            assertEquals((byte) (i - 100), rb.poll(SENTINEL));
+        }
+
+        for (int i = 200; i < 300; i++) {
+            if (i < 299)
+                assertEquals((byte) (i - 100 + 1), rb.front(1));
+            assertEquals((byte) (i - 100), rb.poll(SENTINEL));
+        }
+    }
+
+    public void testAddExceptionWhenFull() {
+        ByteRingBuffer rb = new ByteRingBuffer(4, false);
+        assert (rb.add(A));
+        assert (rb.add(B));
+        assert (rb.add(C));
+        assert (rb.add(D));
+
+        // this should throw
+        assertThrows(UnsupportedOperationException.class,
+                () -> rb.add(E));
+    }
+
+    public void testAddOverwriteAndOffer() {
+        ByteRingBuffer rb = new ByteRingBuffer(4, false);
+        assert (4 == rb.remaining());
+
+        assert (F == rb.addOverwrite(A, F));
+        assert (3 == rb.remaining());
+
+        assert (F == rb.addOverwrite(B, F));
+        assert (2 == rb.remaining());
+
+        assert (F == rb.addOverwrite(C, F));
+        assert (1 == rb.remaining());
+
+        assert (F == rb.addOverwrite(D, F));
+        assert (0 == rb.remaining());
+
+        assert (rb.isFull());
+
+        // now full, should return first value
+        assert (A == rb.addOverwrite(E, F));
+        assert (B == rb.addOverwrite(F, F));
+        assert (rb.isFull());
+
+        // offer() testing
+        assert (!rb.offer(A));
+        assert (C == rb.remove());
+        assert (rb.offer(A));
+
+        // peek testing
+        assert (D == rb.front());
+        assert (E == rb.front(1));
+        assert (F == rb.front(2));
+        // this should throw
+        assertThrows(NoSuchElementException.class,
+                () -> rb.front(99));
+
+        assert (A == rb.peekBack(B));
+
+        // clear() testing
+        rb.clear();
+        assert (rb.isEmpty());
+
+        assert (A == rb.peekBack(A));
+    }
+
+
+    public void testMultipleRemove() {
+        ByteRingBuffer rb = new ByteRingBuffer(10, false);
+
+        // this should throw
+        assertThrows(NoSuchElementException.class,
+                rb::remove);
+
+        // this should throw
+        assertThrows(NoSuchElementException.class,
+                () -> rb.remove(1));
+
+        rb.add(A);
+        rb.add(B);
+
+        byte[] values = rb.remove(2);
+        assertArrayEquals(values, A, B);
+        assertEmpty(rb);
+
+        rb.add(C);
+        rb.add(D);
+        rb.add(E);
+        rb.add(F);
+
+        values = rb.remove(2);
+        assertArrayEquals(values, C, D);
+
+        values = rb.remove(2);
+        assertArrayEquals(values, E, F);
+        assertEmpty(rb);
+
+        rb.add(A);
+        rb.add(B);
+        rb.add(C);
+        rb.add(D);
+        rb.add(E);
+        rb.add(F);
+
+        values = rb.remove(6);
+        assertArrayEquals(values, A, B, C, D, E, F);
+        assertEmpty(rb);
+    }
+
+    public void testAddRemoveUnsafe() {
+        ByteRingBuffer rbNoGrow = new ByteRingBuffer(3, false);
+
+        // this should throw
+        assertThrows(UnsupportedOperationException.class,
+                () -> rbNoGrow.ensureRemaining(10));
+
+        rbNoGrow.ensureRemaining(3);
+        rbNoGrow.addUnsafe(A);
+        rbNoGrow.addUnsafe(B);
+        rbNoGrow.addUnsafe(C);
+
+        assertContents(rbNoGrow, A, B, C);
+
+        assertEquals(rbNoGrow.removeUnsafe(), A);
+        assertContents(rbNoGrow, B, C);
+
+        assertEquals(rbNoGrow.removeUnsafe(), B);
+        assertContents(rbNoGrow, C);
+
+        assertEquals(rbNoGrow.removeUnsafe(), C);
+        assertEmpty(rbNoGrow);
+
+
+        ByteRingBuffer rbGrow = new ByteRingBuffer(3, true);
+
+        for (int size = 10; size < 1_000_000; size *= 10) {
+            rbGrow.ensureRemaining(size);
+            assert (rbGrow.remaining() >= size);
+            for (int i = 0; i < size; i++) {
+                rbGrow.addUnsafe(A);
+            }
+        }
+    }
+
+    public void testOverflow() {
+        ByteRingBuffer rbA = new ByteRingBuffer(0);
+        // this should throw
+        assertThrows(AssertionFailure.class,
+                () -> rbA.ensureRemaining(ArrayUtil.MAX_ARRAY_SIZE + 1));
+
+        ByteRingBuffer rbB = new ByteRingBuffer(100);
+        for (int i = 0; i < 100; i++) {
+            rbB.addUnsafe(A);
+        }
+        // this should throw
+        assertThrows(AssertionFailure.class,
+                () -> rbB.ensureRemaining(ArrayUtil.MAX_ARRAY_SIZE - 100 + 1));
+    }
+}
diff --git a/Base/src/test/java/io/deephaven/base/ringbuffer/TestCharRingBuffer.java b/Base/src/test/java/io/deephaven/base/ringbuffer/TestCharRingBuffer.java
new file mode 100644
index 00000000000..ec76bb60bdc
--- /dev/null
+++ b/Base/src/test/java/io/deephaven/base/ringbuffer/TestCharRingBuffer.java
@@ -0,0 +1,557 @@
+//
+// Copyright (c) 2016-2024 Deephaven Data Labs and Patent Pending
+//
+package io.deephaven.base.ringbuffer;
+
+import io.deephaven.base.ArrayUtil;
+import io.deephaven.base.verify.AssertionFailure;
+import junit.framework.TestCase;
+
+import java.util.NoSuchElementException;
+
+import static org.junit.Assert.assertThrows;
+
+public class TestCharRingBuffer extends TestCase {
+
+    final char SENTINEL = Character.MIN_VALUE;
+
+    private void assertEmpty(CharRingBuffer rb) {
+        assertTrue(rb.isEmpty());
+        assertEquals(0, rb.size());
+
+        assertEquals(SENTINEL, rb.peek(SENTINEL));
+        try {
+            rb.element();
+            fail("queue should be empty");
+        } catch (NoSuchElementException x) {
+            // expected
+        }
+
+        assertEquals(SENTINEL, rb.poll(SENTINEL));
+        try {
+            rb.remove();
+            fail("queue should be empty");
+        } catch (NoSuchElementException x) {
+            // expected
+        }
+        // region empty-test
+        // endregion empty-test
+    }
+
+    private void assertFull(CharRingBuffer rb) {
+        assertFalse(rb.isEmpty());
+        assertEquals(rb.capacity(), rb.size());
+    }
+
+    private void assertNotEmpty(CharRingBuffer rb, int expectedSize, char expectedHead) {
+        assertFalse(rb.isEmpty());
+        assertEquals(expectedSize, rb.size());
+
+        assertEquals(expectedHead, rb.peek(SENTINEL));
+        try {
+            assertEquals(expectedHead, rb.element());
+        } catch (NoSuchElementException x) {
+            fail("queue should not be empty");
+        }
+    }
+
+    private void assertAdd(CharRingBuffer rb, char newHead, int expectedSize, char expectedHead) {
+        assertTrue(rb.add(newHead));
+        assertNotEmpty(rb, expectedSize, expectedHead);
+    }
+
+    private void assertOffer(CharRingBuffer rb, char newHead, int expectedSize, char expectedHead) {
+        assertTrue(rb.offer(newHead));
+        assertNotEmpty(rb, expectedSize, expectedHead);
+    }
+
+    private void assertPoll(CharRingBuffer rb, int expectedSize, char expectedHead) {
+        assertNotEmpty(rb, expectedSize, expectedHead);
+        assertEquals(expectedHead, rb.poll(SENTINEL));
+    }
+
+    private void assertRemove(CharRingBuffer rb, int expectedSize, char expectedHead) {
+        assertNotEmpty(rb, expectedSize, expectedHead);
+        try {
+            assertEquals(expectedHead, rb.remove());
+        } catch (NoSuchElementException x) {
+            fail("queue should not be empty");
+        }
+    }
+
+    private void assertContents(CharRingBuffer rb, char... expectedData) {
+        final char[] data = rb.getAll();
+        assertEquals(data.length, expectedData.length);
+        for (int ii = 0; ii < data.length; ii++) {
+            assertEquals(data[ii], expectedData[ii]);
+        }
+    }
+
+    private void assertArrayEquals(char[] data, char... expectedData) {
+        assertEquals(data.length, expectedData.length);
+        for (int ii = 0; ii < data.length; ii++) {
+            assertEquals(data[ii], expectedData[ii]);
+        }
+    }
+
+    char A = 'A';
+    char B = 'B';
+    char C = 'C';
+    char D = 'D';
+    char E = 'E';
+    char F = 'F';
+
+    public void testAddRemove() {
+
+        CharRingBuffer rb = new CharRingBuffer(3);
+
+        assertEmpty(rb);
+
+        assertAdd(rb, A, 1, A);
+        assertAdd(rb, B, 2, A);
+        assertAdd(rb, C, 3, A);
+        assertContents(rb, A, B, C);
+
+        assertRemove(rb, 3, A);
+        assertContents(rb, B, C);
+
+        assertRemove(rb, 2, B);
+        assertContents(rb, C);
+
+        assertRemove(rb, 1, C);
+        assertContents(rb);
+
+        assertEmpty(rb);
+
+        assertAdd(rb, A, 1, A);
+        assertAdd(rb, B, 2, A);
+        assertContents(rb, A, B);
+
+        assertRemove(rb, 2, A);
+        assertContents(rb, B);
+
+        assertAdd(rb, C, 2, B);
+        assertContents(rb, B, C);
+
+        assertRemove(rb, 2, B);
+        assertContents(rb, C);
+
+        assertRemove(rb, 1, C);
+        assertContents(rb);
+
+        assertEmpty(rb);
+
+        assertAdd(rb, A, 1, A);
+        assertRemove(rb, 1, A);
+        assertEmpty(rb);
+        assertAdd(rb, B, 1, B);
+        assertRemove(rb, 1, B);
+        assertEmpty(rb);
+        assertAdd(rb, C, 1, C);
+        assertRemove(rb, 1, C);
+        assertEmpty(rb);
+
+        assertAdd(rb, D, 1, D);
+        assertRemove(rb, 1, D);
+        assertEmpty(rb);
+        assertAdd(rb, E, 1, E);
+        assertRemove(rb, 1, E);
+        assertEmpty(rb);
+        assertAdd(rb, F, 1, F);
+        assertRemove(rb, 1, F);
+        assertEmpty(rb);
+
+        assertAdd(rb, A, 1, A);
+        assertAdd(rb, B, 2, A);
+        assertAdd(rb, C, 3, A);
+        assertContents(rb, A, B, C);
+
+        assertAdd(rb, D, 4, A);
+        assertAdd(rb, E, 5, A);
+        assertAdd(rb, F, 6, A);
+        assertContents(rb, A, B, C, D, E, F);
+
+        assertRemove(rb, 6, A);
+        assertRemove(rb, 5, B);
+        assertRemove(rb, 4, C);
+        assertRemove(rb, 3, D);
+        assertRemove(rb, 2, E);
+        assertRemove(rb, 1, F);
+        assertContents(rb);
+        assertEmpty(rb);
+    }
+
+    public void testOfferPoll() {
+        CharRingBuffer rb = new CharRingBuffer(3);
+
+        assertEmpty(rb);
+
+        assertOffer(rb, A, 1, A);
+        assertOffer(rb, B, 2, A);
+        assertOffer(rb, C, 3, A);
+
+        assertPoll(rb, 3, A);
+        assertPoll(rb, 2, B);
+        assertPoll(rb, 1, C);
+        assertEmpty(rb);
+
+        assertOffer(rb, A, 1, A);
+        assertOffer(rb, B, 2, A);
+        assertPoll(rb, 2, A);
+        assertOffer(rb, C, 2, B);
+        assertPoll(rb, 2, B);
+        assertPoll(rb, 1, C);
+        assertEmpty(rb);
+
+        assertOffer(rb, A, 1, A);
+        assertPoll(rb, 1, A);
+        assertEmpty(rb);
+        assertOffer(rb, B, 1, B);
+        assertPoll(rb, 1, B);
+        assertEmpty(rb);
+        assertOffer(rb, C, 1, C);
+        assertPoll(rb, 1, C);
+        assertEmpty(rb);
+
+        assertOffer(rb, D, 1, D);
+        assertPoll(rb, 1, D);
+        assertEmpty(rb);
+        assertOffer(rb, E, 1, E);
+        assertPoll(rb, 1, E);
+        assertEmpty(rb);
+        assertOffer(rb, F, 1, F);
+        assertPoll(rb, 1, F);
+        assertEmpty(rb);
+
+        assertOffer(rb, A, 1, A);
+        assertOffer(rb, B, 2, A);
+        assertOffer(rb, C, 3, A);
+        assertOffer(rb, D, 4, A);
+
+        assertAdd(rb, E, 5, A); // need one add to grow it from 4 to 8
+        assertOffer(rb, F, 6, A);
+
+        assertPoll(rb, 6, A);
+        assertPoll(rb, 5, B);
+        assertPoll(rb, 4, C);
+        assertPoll(rb, 3, D);
+        assertPoll(rb, 2, E);
+        assertPoll(rb, 1, F);
+        assertEmpty(rb);
+    }
+
+    public void testGrowSimple() {
+        CharRingBuffer rb = new CharRingBuffer(4);
+
+        assertAdd(rb, A, 1, A);
+        assertAdd(rb, B, 2, A);
+        assertAdd(rb, C, 3, A);
+        assertAdd(rb, D, 4, A);
+        assertFull(rb);
+
+        // remove one so head != 0
+        assertRemove(rb, 4, A);
+
+        assertAdd(rb, E, 4, B);
+        // this will grow; the elements are in a single contiguous block
+        assertAdd(rb, F, 5, B);
+
+        assertRemove(rb, 5, B);
+        assertRemove(rb, 4, C);
+        assertRemove(rb, 3, D);
+        assertRemove(rb, 2, E);
+        assertRemove(rb, 1, F);
+        assertEmpty(rb);
+    }
+
+    public void testGrowComplex() {
+        CharRingBuffer rb = new CharRingBuffer(5);
+
+        assertAdd(rb, A, 1, A);
+        assertAdd(rb, B, 2, A);
+        assertAdd(rb, C, 3, A);
+        assertRemove(rb, 3, A);
+        assertRemove(rb, 2, B);
+        assertRemove(rb, 1, C);
+        assertEmpty(rb);
+
+        assertAdd(rb, A, 1, A);
+        assertAdd(rb, B, 2, A);
+        assertAdd(rb, C, 3, A);
+        assertAdd(rb, D, 4, A);
+        assertAdd(rb, E, 5, A);
+
+        // this will grow; the elements are in two blocks
+        assertAdd(rb, F, 6, A);
+
+        assertRemove(rb, 6, A);
+        assertRemove(rb, 5, B);
+        assertRemove(rb, 4, C);
+        assertRemove(rb, 3, D);
+        assertRemove(rb, 2, E);
+        assertRemove(rb, 1, F);
+        assertEmpty(rb);
+    }
+
+    public void testIterator() {
+        CharRingBuffer rb = new CharRingBuffer(3);
+
+        CharRingBuffer.Iterator iter = rb.iterator();
+        assertFalse(iter.hasNext());
+
+        assertAdd(rb, A, 1, A);
+        assertAdd(rb, B, 2, A);
+        assertAdd(rb, C, 3, A);
+
+        iter = rb.iterator();
+        assertTrue(iter.hasNext());
+        assertEquals(A, iter.next());
+        assertTrue(iter.hasNext());
+        assertEquals(B, iter.next());
+        assertTrue(iter.hasNext());
+        assertEquals(C, iter.next());
+        assertFalse(iter.hasNext());
+
+        assertRemove(rb, 3, A);
+        assertAdd(rb, D, 3, B);
+
+        iter = rb.iterator();
+        assertTrue(iter.hasNext());
+        assertEquals(B, iter.next());
+        assertTrue(iter.hasNext());
+        assertEquals(C, iter.next());
+        assertTrue(iter.hasNext());
+        assertEquals(D, iter.next());
+        assertFalse(iter.hasNext());
+
+        assertRemove(rb, 3, B);
+
+        iter = rb.iterator();
+        assertEquals(C, iter.next());
+        assertEquals(D, iter.next());
+        assertFalse(iter.hasNext());
+
+        assertAdd(rb, E, 3, C);
+        assertAdd(rb, F, 4, C);
+
+        iter = rb.iterator();
+        assertTrue(iter.hasNext());
+        assertEquals(C, iter.next());
+        assertTrue(iter.hasNext());
+        assertEquals(D, iter.next());
+        assertTrue(iter.hasNext());
+        assertEquals(E, iter.next());
+        assertTrue(iter.hasNext());
+        assertEquals(F, iter.next());
+        assertFalse(iter.hasNext());
+
+        final CharRingBuffer.Iterator iterFinal = rb.iterator();
+
+        assertThrows(UnsupportedOperationException.class,
+                iterFinal::remove);
+    }
+
+    public void testBack() {
+        CharRingBuffer rb = new CharRingBuffer(5);
+
+        assertAdd(rb, A, 1, A);
+        assertEquals(rb.back(), A);
+
+        assertAdd(rb, B, 2, A);
+        assertAdd(rb, C, 3, A);
+        assertEquals(rb.back(), C);
+    }
+
+    public void testBackWhenEmpty() {
+        CharRingBuffer rb = new CharRingBuffer(5);
+        try {
+            rb.back();
+            fail("expected a NoSuchElement exception");
+        } catch (NoSuchElementException x) {
+            // expected
+        }
+    }
+
+    public void testBackTailIsZero() {
+        CharRingBuffer rb = new CharRingBuffer(5, false);
+
+        assertAdd(rb, A, 1, A);
+        assertAdd(rb, B, 2, A);
+        assertAdd(rb, C, 3, A);
+        assertAdd(rb, D, 4, A);
+        assertAdd(rb, E, 5, A);
+
+        assertRemove(rb, 5, A);
+        assertAdd(rb, F, 5, B);
+        assertEquals(rb.back(), F);
+    }
+
+    public void testLargeAmounts() {
+        CharRingBuffer rb = new CharRingBuffer(3);
+
+        for (int i = 0; i < 100; i++)
+            rb.add((char) i);
+
+        for (int i = 100; i < 200; i++) {
+            rb.add((char) i);
+            assertEquals((char) (i - 100 + 1), rb.front(1));
+            assertEquals((char) (i - 100), rb.poll(SENTINEL));
+        }
+
+        for (int i = 200; i < 300; i++) {
+            if (i < 299)
+                assertEquals((char) (i - 100 + 1), rb.front(1));
+            assertEquals((char) (i - 100), rb.poll(SENTINEL));
+        }
+    }
+
+    public void testAddExceptionWhenFull() {
+        CharRingBuffer rb = new CharRingBuffer(4, false);
+        assert (rb.add(A));
+        assert (rb.add(B));
+        assert (rb.add(C));
+        assert (rb.add(D));
+
+        // this should throw
+        assertThrows(UnsupportedOperationException.class,
+                () -> rb.add(E));
+    }
+
+    public void testAddOverwriteAndOffer() {
+        CharRingBuffer rb = new CharRingBuffer(4, false);
+        assert (4 == rb.remaining());
+
+        assert (F == rb.addOverwrite(A, F));
+        assert (3 == rb.remaining());
+
+        assert (F == rb.addOverwrite(B, F));
+        assert (2 == rb.remaining());
+
+        assert (F == rb.addOverwrite(C, F));
+        assert (1 == rb.remaining());
+
+        assert (F == rb.addOverwrite(D, F));
+        assert (0 == rb.remaining());
+
+        assert (rb.isFull());
+
+        // now full, should return first value
+        assert (A == rb.addOverwrite(E, F));
+        assert (B == rb.addOverwrite(F, F));
+        assert (rb.isFull());
+
+        // offer() testing
+        assert (!rb.offer(A));
+        assert (C == rb.remove());
+        assert (rb.offer(A));
+
+        // peek testing
+        assert (D == rb.front());
+        assert (E == rb.front(1));
+        assert (F == rb.front(2));
+        // this should throw
+        assertThrows(NoSuchElementException.class,
+                () -> rb.front(99));
+
+        assert (A == rb.peekBack(B));
+
+        // clear() testing
+        rb.clear();
+        assert (rb.isEmpty());
+
+        assert (A == rb.peekBack(A));
+    }
+
+
+    public void testMultipleRemove() {
+        CharRingBuffer rb = new CharRingBuffer(10, false);
+
+        // this should throw
+        assertThrows(NoSuchElementException.class,
+                rb::remove);
+
+        // this should throw
+        assertThrows(NoSuchElementException.class,
+                () -> rb.remove(1));
+
+        rb.add(A);
+        rb.add(B);
+
+        char[] values = rb.remove(2);
+        assertArrayEquals(values, A, B);
+        assertEmpty(rb);
+
+        rb.add(C);
+        rb.add(D);
+        rb.add(E);
+        rb.add(F);
+
+        values = rb.remove(2);
+        assertArrayEquals(values, C, D);
+
+        values = rb.remove(2);
+        assertArrayEquals(values, E, F);
+        assertEmpty(rb);
+
+        rb.add(A);
+        rb.add(B);
+        rb.add(C);
+        rb.add(D);
+        rb.add(E);
+        rb.add(F);
+
+        values = rb.remove(6);
+        assertArrayEquals(values, A, B, C, D, E, F);
+        assertEmpty(rb);
+    }
+
+    public void testAddRemoveUnsafe() {
+        CharRingBuffer rbNoGrow = new CharRingBuffer(3, false);
+
+        // this should throw
+        assertThrows(UnsupportedOperationException.class,
+                () -> rbNoGrow.ensureRemaining(10));
+
+        rbNoGrow.ensureRemaining(3);
+        rbNoGrow.addUnsafe(A);
+        rbNoGrow.addUnsafe(B);
+        rbNoGrow.addUnsafe(C);
+
+        assertContents(rbNoGrow, A, B, C);
+
+        assertEquals(rbNoGrow.removeUnsafe(), A);
+        assertContents(rbNoGrow, B, C);
+
+        assertEquals(rbNoGrow.removeUnsafe(), B);
+        assertContents(rbNoGrow, C);
+
+        assertEquals(rbNoGrow.removeUnsafe(), C);
+        assertEmpty(rbNoGrow);
+
+
+        CharRingBuffer rbGrow = new CharRingBuffer(3, true);
+
+        for (int size = 10; size < 1_000_000; size *= 10) {
+            rbGrow.ensureRemaining(size);
+            assert (rbGrow.remaining() >= size);
+            for (int i = 0; i < size; i++) {
+                rbGrow.addUnsafe(A);
+            }
+        }
+    }
+
+    public void testOverflow() {
+        CharRingBuffer rbA = new CharRingBuffer(0);
+        // this should throw
+        assertThrows(AssertionFailure.class,
+                () -> rbA.ensureRemaining(ArrayUtil.MAX_ARRAY_SIZE + 1));
+
+        CharRingBuffer rbB = new CharRingBuffer(100);
+        for (int i = 0; i < 100; i++) {
+            rbB.addUnsafe(A);
+        }
+        // this should throw
+        assertThrows(AssertionFailure.class,
+                () -> rbB.ensureRemaining(ArrayUtil.MAX_ARRAY_SIZE - 100 + 1));
+    }
+}
diff --git a/Base/src/test/java/io/deephaven/base/ringbuffer/TestDoubleRingBuffer.java b/Base/src/test/java/io/deephaven/base/ringbuffer/TestDoubleRingBuffer.java
new file mode 100644
index 00000000000..df5286cbf02
--- /dev/null
+++ b/Base/src/test/java/io/deephaven/base/ringbuffer/TestDoubleRingBuffer.java
@@ -0,0 +1,561 @@
+//
+// Copyright (c) 2016-2024 Deephaven Data Labs and Patent Pending
+//
+// ****** AUTO-GENERATED CLASS - DO NOT EDIT MANUALLY
+// ****** Edit TestCharRingBuffer and run "./gradlew replicateRingBuffers" to regenerate
+//
+// @formatter:off
+package io.deephaven.base.ringbuffer;
+
+import io.deephaven.base.ArrayUtil;
+import io.deephaven.base.verify.AssertionFailure;
+import junit.framework.TestCase;
+
+import java.util.NoSuchElementException;
+
+import static org.junit.Assert.assertThrows;
+
+public class TestDoubleRingBuffer extends TestCase {
+
+    final double SENTINEL = Double.MIN_VALUE;
+
+    private void assertEmpty(DoubleRingBuffer rb) {
+        assertTrue(rb.isEmpty());
+        assertEquals(0, rb.size());
+
+        assertEquals(SENTINEL, rb.peek(SENTINEL));
+        try {
+            rb.element();
+            fail("queue should be empty");
+        } catch (NoSuchElementException x) {
+            // expected
+        }
+
+        assertEquals(SENTINEL, rb.poll(SENTINEL));
+        try {
+            rb.remove();
+            fail("queue should be empty");
+        } catch (NoSuchElementException x) {
+            // expected
+        }
+        // region empty-test
+        // endregion empty-test
+    }
+
+    private void assertFull(DoubleRingBuffer rb) {
+        assertFalse(rb.isEmpty());
+        assertEquals(rb.capacity(), rb.size());
+    }
+
+    private void assertNotEmpty(DoubleRingBuffer rb, int expectedSize, double expectedHead) {
+        assertFalse(rb.isEmpty());
+        assertEquals(expectedSize, rb.size());
+
+        assertEquals(expectedHead, rb.peek(SENTINEL));
+        try {
+            assertEquals(expectedHead, rb.element());
+        } catch (NoSuchElementException x) {
+            fail("queue should not be empty");
+        }
+    }
+
+    private void assertAdd(DoubleRingBuffer rb, double newHead, int expectedSize, double expectedHead) {
+        assertTrue(rb.add(newHead));
+        assertNotEmpty(rb, expectedSize, expectedHead);
+    }
+
+    private void assertOffer(DoubleRingBuffer rb, double newHead, int expectedSize, double expectedHead) {
+        assertTrue(rb.offer(newHead));
+        assertNotEmpty(rb, expectedSize, expectedHead);
+    }
+
+    private void assertPoll(DoubleRingBuffer rb, int expectedSize, double expectedHead) {
+        assertNotEmpty(rb, expectedSize, expectedHead);
+        assertEquals(expectedHead, rb.poll(SENTINEL));
+    }
+
+    private void assertRemove(DoubleRingBuffer rb, int expectedSize, double expectedHead) {
+        assertNotEmpty(rb, expectedSize, expectedHead);
+        try {
+            assertEquals(expectedHead, rb.remove());
+        } catch (NoSuchElementException x) {
+            fail("queue should not be empty");
+        }
+    }
+
+    private void assertContents(DoubleRingBuffer rb, double... expectedData) {
+        final double[] data = rb.getAll();
+        assertEquals(data.length, expectedData.length);
+        for (int ii = 0; ii < data.length; ii++) {
+            assertEquals(data[ii], expectedData[ii]);
+        }
+    }
+
+    private void assertArrayEquals(double[] data, double... expectedData) {
+        assertEquals(data.length, expectedData.length);
+        for (int ii = 0; ii < data.length; ii++) {
+            assertEquals(data[ii], expectedData[ii]);
+        }
+    }
+
+    double A = 'A';
+    double B = 'B';
+    double C = 'C';
+    double D = 'D';
+    double E = 'E';
+    double F = 'F';
+
+    public void testAddRemove() {
+
+        DoubleRingBuffer rb = new DoubleRingBuffer(3);
+
+        assertEmpty(rb);
+
+        assertAdd(rb, A, 1, A);
+        assertAdd(rb, B, 2, A);
+        assertAdd(rb, C, 3, A);
+        assertContents(rb, A, B, C);
+
+        assertRemove(rb, 3, A);
+        assertContents(rb, B, C);
+
+        assertRemove(rb, 2, B);
+        assertContents(rb, C);
+
+        assertRemove(rb, 1, C);
+        assertContents(rb);
+
+        assertEmpty(rb);
+
+        assertAdd(rb, A, 1, A);
+        assertAdd(rb, B, 2, A);
+        assertContents(rb, A, B);
+
+        assertRemove(rb, 2, A);
+        assertContents(rb, B);
+
+        assertAdd(rb, C, 2, B);
+        assertContents(rb, B, C);
+
+        assertRemove(rb, 2, B);
+        assertContents(rb, C);
+
+        assertRemove(rb, 1, C);
+        assertContents(rb);
+
+        assertEmpty(rb);
+
+        assertAdd(rb, A, 1, A);
+        assertRemove(rb, 1, A);
+        assertEmpty(rb);
+        assertAdd(rb, B, 1, B);
+        assertRemove(rb, 1, B);
+        assertEmpty(rb);
+        assertAdd(rb, C, 1, C);
+        assertRemove(rb, 1, C);
+        assertEmpty(rb);
+
+        assertAdd(rb, D, 1, D);
+        assertRemove(rb, 1, D);
+        assertEmpty(rb);
+        assertAdd(rb, E, 1, E);
+        assertRemove(rb, 1, E);
+        assertEmpty(rb);
+        assertAdd(rb, F, 1, F);
+        assertRemove(rb, 1, F);
+        assertEmpty(rb);
+
+        assertAdd(rb, A, 1, A);
+        assertAdd(rb, B, 2, A);
+        assertAdd(rb, C, 3, A);
+        assertContents(rb, A, B, C);
+
+        assertAdd(rb, D, 4, A);
+        assertAdd(rb, E, 5, A);
+        assertAdd(rb, F, 6, A);
+        assertContents(rb, A, B, C, D, E, F);
+
+        assertRemove(rb, 6, A);
+        assertRemove(rb, 5, B);
+        assertRemove(rb, 4, C);
+        assertRemove(rb, 3, D);
+        assertRemove(rb, 2, E);
+        assertRemove(rb, 1, F);
+        assertContents(rb);
+        assertEmpty(rb);
+    }
+
+    public void testOfferPoll() {
+        DoubleRingBuffer rb = new DoubleRingBuffer(3);
+
+        assertEmpty(rb);
+
+        assertOffer(rb, A, 1, A);
+        assertOffer(rb, B, 2, A);
+        assertOffer(rb, C, 3, A);
+
+        assertPoll(rb, 3, A);
+        assertPoll(rb, 2, B);
+        assertPoll(rb, 1, C);
+        assertEmpty(rb);
+
+        assertOffer(rb, A, 1, A);
+        assertOffer(rb, B, 2, A);
+        assertPoll(rb, 2, A);
+        assertOffer(rb, C, 2, B);
+        assertPoll(rb, 2, B);
+        assertPoll(rb, 1, C);
+        assertEmpty(rb);
+
+        assertOffer(rb, A, 1, A);
+        assertPoll(rb, 1, A);
+        assertEmpty(rb);
+        assertOffer(rb, B, 1, B);
+        assertPoll(rb, 1, B);
+        assertEmpty(rb);
+        assertOffer(rb, C, 1, C);
+        assertPoll(rb, 1, C);
+        assertEmpty(rb);
+
+        assertOffer(rb, D, 1, D);
+        assertPoll(rb, 1, D);
+        assertEmpty(rb);
+        assertOffer(rb, E, 1, E);
+        assertPoll(rb, 1, E);
+        assertEmpty(rb);
+        assertOffer(rb, F, 1, F);
+        assertPoll(rb, 1, F);
+        assertEmpty(rb);
+
+        assertOffer(rb, A, 1, A);
+        assertOffer(rb, B, 2, A);
+        assertOffer(rb, C, 3, A);
+        assertOffer(rb, D, 4, A);
+
+        assertAdd(rb, E, 5, A); // need one add to grow it from 4 to 8
+        assertOffer(rb, F, 6, A);
+
+        assertPoll(rb, 6, A);
+        assertPoll(rb, 5, B);
+        assertPoll(rb, 4, C);
+        assertPoll(rb, 3, D);
+        assertPoll(rb, 2, E);
+        assertPoll(rb, 1, F);
+        assertEmpty(rb);
+    }
+
+    public void testGrowSimple() {
+        DoubleRingBuffer rb = new DoubleRingBuffer(4);
+
+        assertAdd(rb, A, 1, A);
+        assertAdd(rb, B, 2, A);
+        assertAdd(rb, C, 3, A);
+        assertAdd(rb, D, 4, A);
+        assertFull(rb);
+
+        // remove one so head != 0
+        assertRemove(rb, 4, A);
+
+        assertAdd(rb, E, 4, B);
+        // this will grow; the elements are in a single contiguous block
+        assertAdd(rb, F, 5, B);
+
+        assertRemove(rb, 5, B);
+        assertRemove(rb, 4, C);
+        assertRemove(rb, 3, D);
+        assertRemove(rb, 2, E);
+        assertRemove(rb, 1, F);
+        assertEmpty(rb);
+    }
+
+    public void testGrowComplex() {
+        DoubleRingBuffer rb = new DoubleRingBuffer(5);
+
+        assertAdd(rb, A, 1, A);
+        assertAdd(rb, B, 2, A);
+        assertAdd(rb, C, 3, A);
+        assertRemove(rb, 3, A);
+        assertRemove(rb, 2, B);
+        assertRemove(rb, 1, C);
+        assertEmpty(rb);
+
+        assertAdd(rb, A, 1, A);
+        assertAdd(rb, B, 2, A);
+        assertAdd(rb, C, 3, A);
+        assertAdd(rb, D, 4, A);
+        assertAdd(rb, E, 5, A);
+
+        // this will grow; the elements are in two blocks
+        assertAdd(rb, F, 6, A);
+
+        assertRemove(rb, 6, A);
+        assertRemove(rb, 5, B);
+        assertRemove(rb, 4, C);
+        assertRemove(rb, 3, D);
+        assertRemove(rb, 2, E);
+        assertRemove(rb, 1, F);
+        assertEmpty(rb);
+    }
+
+    public void testIterator() {
+        DoubleRingBuffer rb = new DoubleRingBuffer(3);
+
+        DoubleRingBuffer.Iterator iter = rb.iterator();
+        assertFalse(iter.hasNext());
+
+        assertAdd(rb, A, 1, A);
+        assertAdd(rb, B, 2, A);
+        assertAdd(rb, C, 3, A);
+
+        iter = rb.iterator();
+        assertTrue(iter.hasNext());
+        assertEquals(A, iter.next());
+        assertTrue(iter.hasNext());
+        assertEquals(B, iter.next());
+        assertTrue(iter.hasNext());
+        assertEquals(C, iter.next());
+        assertFalse(iter.hasNext());
+
+        assertRemove(rb, 3, A);
+        assertAdd(rb, D, 3, B);
+
+        iter = rb.iterator();
+        assertTrue(iter.hasNext());
+        assertEquals(B, iter.next());
+        assertTrue(iter.hasNext());
+        assertEquals(C, iter.next());
+        assertTrue(iter.hasNext());
+        assertEquals(D, iter.next());
+        assertFalse(iter.hasNext());
+
+        assertRemove(rb, 3, B);
+
+        iter = rb.iterator();
+        assertEquals(C, iter.next());
+        assertEquals(D, iter.next());
+        assertFalse(iter.hasNext());
+
+        assertAdd(rb, E, 3, C);
+        assertAdd(rb, F, 4, C);
+
+        iter = rb.iterator();
+        assertTrue(iter.hasNext());
+        assertEquals(C, iter.next());
+        assertTrue(iter.hasNext());
+        assertEquals(D, iter.next());
+        assertTrue(iter.hasNext());
+        assertEquals(E, iter.next());
+        assertTrue(iter.hasNext());
+        assertEquals(F, iter.next());
+        assertFalse(iter.hasNext());
+
+        final DoubleRingBuffer.Iterator iterFinal = rb.iterator();
+
+        assertThrows(UnsupportedOperationException.class,
+                iterFinal::remove);
+    }
+
+    public void testBack() {
+        DoubleRingBuffer rb = new DoubleRingBuffer(5);
+
+        assertAdd(rb, A, 1, A);
+        assertEquals(rb.back(), A);
+
+        assertAdd(rb, B, 2, A);
+        assertAdd(rb, C, 3, A);
+        assertEquals(rb.back(), C);
+    }
+
+    public void testBackWhenEmpty() {
+        DoubleRingBuffer rb = new DoubleRingBuffer(5);
+        try {
+            rb.back();
+            fail("expected a NoSuchElement exception");
+        } catch (NoSuchElementException x) {
+            // expected
+        }
+    }
+
+    public void testBackTailIsZero() {
+        DoubleRingBuffer rb = new DoubleRingBuffer(5, false);
+
+        assertAdd(rb, A, 1, A);
+        assertAdd(rb, B, 2, A);
+        assertAdd(rb, C, 3, A);
+        assertAdd(rb, D, 4, A);
+        assertAdd(rb, E, 5, A);
+
+        assertRemove(rb, 5, A);
+        assertAdd(rb, F, 5, B);
+        assertEquals(rb.back(), F);
+    }
+
+    public void testLargeAmounts() {
+        DoubleRingBuffer rb = new DoubleRingBuffer(3);
+
+        for (int i = 0; i < 100; i++)
+            rb.add((double) i);
+
+        for (int i = 100; i < 200; i++) {
+            rb.add((double) i);
+            assertEquals((double) (i - 100 + 1), rb.front(1));
+            assertEquals((double) (i - 100), rb.poll(SENTINEL));
+        }
+
+        for (int i = 200; i < 300; i++) {
+            if (i < 299)
+                assertEquals((double) (i - 100 + 1), rb.front(1));
+            assertEquals((double) (i - 100), rb.poll(SENTINEL));
+        }
+    }
+
+    public void testAddExceptionWhenFull() {
+        DoubleRingBuffer rb = new DoubleRingBuffer(4, false);
+        assert (rb.add(A));
+        assert (rb.add(B));
+        assert (rb.add(C));
+        assert (rb.add(D));
+
+        // this should throw
+        assertThrows(UnsupportedOperationException.class,
+                () -> rb.add(E));
+    }
+
+    public void testAddOverwriteAndOffer() {
+        DoubleRingBuffer rb = new DoubleRingBuffer(4, false);
+        assert (4 == rb.remaining());
+
+        assert (F == rb.addOverwrite(A, F));
+        assert (3 == rb.remaining());
+
+        assert (F == rb.addOverwrite(B, F));
+        assert (2 == rb.remaining());
+
+        assert (F == rb.addOverwrite(C, F));
+        assert (1 == rb.remaining());
+
+        assert (F == rb.addOverwrite(D, F));
+        assert (0 == rb.remaining());
+
+        assert (rb.isFull());
+
+        // now full, should return first value
+        assert (A == rb.addOverwrite(E, F));
+        assert (B == rb.addOverwrite(F, F));
+        assert (rb.isFull());
+
+        // offer() testing
+        assert (!rb.offer(A));
+        assert (C == rb.remove());
+        assert (rb.offer(A));
+
+        // peek testing
+        assert (D == rb.front());
+        assert (E == rb.front(1));
+        assert (F == rb.front(2));
+        // this should throw
+        assertThrows(NoSuchElementException.class,
+                () -> rb.front(99));
+
+        assert (A == rb.peekBack(B));
+
+        // clear() testing
+        rb.clear();
+        assert (rb.isEmpty());
+
+        assert (A == rb.peekBack(A));
+    }
+
+
+    public void testMultipleRemove() {
+        DoubleRingBuffer rb = new DoubleRingBuffer(10, false);
+
+        // this should throw
+        assertThrows(NoSuchElementException.class,
+                rb::remove);
+
+        // this should throw
+        assertThrows(NoSuchElementException.class,
+                () -> rb.remove(1));
+
+        rb.add(A);
+        rb.add(B);
+
+        double[] values = rb.remove(2);
+        assertArrayEquals(values, A, B);
+        assertEmpty(rb);
+
+        rb.add(C);
+        rb.add(D);
+        rb.add(E);
+        rb.add(F);
+
+        values = rb.remove(2);
+        assertArrayEquals(values, C, D);
+
+        values = rb.remove(2);
+        assertArrayEquals(values, E, F);
+        assertEmpty(rb);
+
+        rb.add(A);
+        rb.add(B);
+        rb.add(C);
+        rb.add(D);
+        rb.add(E);
+        rb.add(F);
+
+        values = rb.remove(6);
+        assertArrayEquals(values, A, B, C, D, E, F);
+        assertEmpty(rb);
+    }
+
+    public void testAddRemoveUnsafe() {
+        DoubleRingBuffer rbNoGrow = new DoubleRingBuffer(3, false);
+
+        // this should throw
+        assertThrows(UnsupportedOperationException.class,
+                () -> rbNoGrow.ensureRemaining(10));
+
+        rbNoGrow.ensureRemaining(3);
+        rbNoGrow.addUnsafe(A);
+        rbNoGrow.addUnsafe(B);
+        rbNoGrow.addUnsafe(C);
+
+        assertContents(rbNoGrow, A, B, C);
+
+        assertEquals(rbNoGrow.removeUnsafe(), A);
+        assertContents(rbNoGrow, B, C);
+
+        assertEquals(rbNoGrow.removeUnsafe(), B);
+        assertContents(rbNoGrow, C);
+
+        assertEquals(rbNoGrow.removeUnsafe(), C);
+        assertEmpty(rbNoGrow);
+
+
+        DoubleRingBuffer rbGrow = new DoubleRingBuffer(3, true);
+
+        for (int size = 10; size < 1_000_000; size *= 10) {
+            rbGrow.ensureRemaining(size);
+            assert (rbGrow.remaining() >= size);
+            for (int i = 0; i < size; i++) {
+                rbGrow.addUnsafe(A);
+            }
+        }
+    }
+
+    public void testOverflow() {
+        DoubleRingBuffer rbA = new DoubleRingBuffer(0);
+        // this should throw
+        assertThrows(AssertionFailure.class,
+                () -> rbA.ensureRemaining(ArrayUtil.MAX_ARRAY_SIZE + 1));
+
+        DoubleRingBuffer rbB = new DoubleRingBuffer(100);
+        for (int i = 0; i < 100; i++) {
+            rbB.addUnsafe(A);
+        }
+        // this should throw
+        assertThrows(AssertionFailure.class,
+                () -> rbB.ensureRemaining(ArrayUtil.MAX_ARRAY_SIZE - 100 + 1));
+    }
+}
diff --git a/Base/src/test/java/io/deephaven/base/ringbuffer/TestFloatRingBuffer.java b/Base/src/test/java/io/deephaven/base/ringbuffer/TestFloatRingBuffer.java
new file mode 100644
index 00000000000..be56827979b
--- /dev/null
+++ b/Base/src/test/java/io/deephaven/base/ringbuffer/TestFloatRingBuffer.java
@@ -0,0 +1,561 @@
+//
+// Copyright (c) 2016-2024 Deephaven Data Labs and Patent Pending
+//
+// ****** AUTO-GENERATED CLASS - DO NOT EDIT MANUALLY
+// ****** Edit TestCharRingBuffer and run "./gradlew replicateRingBuffers" to regenerate
+//
+// @formatter:off
+package io.deephaven.base.ringbuffer;
+
+import io.deephaven.base.ArrayUtil;
+import io.deephaven.base.verify.AssertionFailure;
+import junit.framework.TestCase;
+
+import java.util.NoSuchElementException;
+
+import static org.junit.Assert.assertThrows;
+
+public class TestFloatRingBuffer extends TestCase {
+
+    final float SENTINEL = Float.MIN_VALUE;
+
+    private void assertEmpty(FloatRingBuffer rb) {
+        assertTrue(rb.isEmpty());
+        assertEquals(0, rb.size());
+
+        assertEquals(SENTINEL, rb.peek(SENTINEL));
+        try {
+            rb.element();
+            fail("queue should be empty");
+        } catch (NoSuchElementException x) {
+            // expected
+        }
+
+        assertEquals(SENTINEL, rb.poll(SENTINEL));
+        try {
+            rb.remove();
+            fail("queue should be empty");
+        } catch (NoSuchElementException x) {
+            // expected
+        }
+        // region empty-test
+        // endregion empty-test
+    }
+
+    private void assertFull(FloatRingBuffer rb) {
+        assertFalse(rb.isEmpty());
+        assertEquals(rb.capacity(), rb.size());
+    }
+
+    private void assertNotEmpty(FloatRingBuffer rb, int expectedSize, float expectedHead) {
+        assertFalse(rb.isEmpty());
+        assertEquals(expectedSize, rb.size());
+
+        assertEquals(expectedHead, rb.peek(SENTINEL));
+        try {
+            assertEquals(expectedHead, rb.element());
+        } catch (NoSuchElementException x) {
+            fail("queue should not be empty");
+        }
+    }
+
+    private void assertAdd(FloatRingBuffer rb, float newHead, int expectedSize, float expectedHead) {
+        assertTrue(rb.add(newHead));
+        assertNotEmpty(rb, expectedSize, expectedHead);
+    }
+
+    private void assertOffer(FloatRingBuffer rb, float newHead, int expectedSize, float expectedHead) {
+        assertTrue(rb.offer(newHead));
+        assertNotEmpty(rb, expectedSize, expectedHead);
+    }
+
+    private void assertPoll(FloatRingBuffer rb, int expectedSize, float expectedHead) {
+        assertNotEmpty(rb, expectedSize, expectedHead);
+        assertEquals(expectedHead, rb.poll(SENTINEL));
+    }
+
+    private void assertRemove(FloatRingBuffer rb, int expectedSize, float expectedHead) {
+        assertNotEmpty(rb, expectedSize, expectedHead);
+        try {
+            assertEquals(expectedHead, rb.remove());
+        } catch (NoSuchElementException x) {
+            fail("queue should not be empty");
+        }
+    }
+
+    private void assertContents(FloatRingBuffer rb, float... expectedData) {
+        final float[] data = rb.getAll();
+        assertEquals(data.length, expectedData.length);
+        for (int ii = 0; ii < data.length; ii++) {
+            assertEquals(data[ii], expectedData[ii]);
+        }
+    }
+
+    private void assertArrayEquals(float[] data, float... expectedData) {
+        assertEquals(data.length, expectedData.length);
+        for (int ii = 0; ii < data.length; ii++) {
+            assertEquals(data[ii], expectedData[ii]);
+        }
+    }
+
+    float A = 'A';
+    float B = 'B';
+    float C = 'C';
+    float D = 'D';
+    float E = 'E';
+    float F = 'F';
+
+    public void testAddRemove() {
+
+        FloatRingBuffer rb = new FloatRingBuffer(3);
+
+        assertEmpty(rb);
+
+        assertAdd(rb, A, 1, A);
+        assertAdd(rb, B, 2, A);
+        assertAdd(rb, C, 3, A);
+        assertContents(rb, A, B, C);
+
+        assertRemove(rb, 3, A);
+        assertContents(rb, B, C);
+
+        assertRemove(rb, 2, B);
+        assertContents(rb, C);
+
+        assertRemove(rb, 1, C);
+        assertContents(rb);
+
+        assertEmpty(rb);
+
+        assertAdd(rb, A, 1, A);
+        assertAdd(rb, B, 2, A);
+        assertContents(rb, A, B);
+
+        assertRemove(rb, 2, A);
+        assertContents(rb, B);
+
+        assertAdd(rb, C, 2, B);
+        assertContents(rb, B, C);
+
+        assertRemove(rb, 2, B);
+        assertContents(rb, C);
+
+        assertRemove(rb, 1, C);
+        assertContents(rb);
+
+        assertEmpty(rb);
+
+        assertAdd(rb, A, 1, A);
+        assertRemove(rb, 1, A);
+        assertEmpty(rb);
+        assertAdd(rb, B, 1, B);
+        assertRemove(rb, 1, B);
+        assertEmpty(rb);
+        assertAdd(rb, C, 1, C);
+        assertRemove(rb, 1, C);
+        assertEmpty(rb);
+
+        assertAdd(rb, D, 1, D);
+        assertRemove(rb, 1, D);
+        assertEmpty(rb);
+        assertAdd(rb, E, 1, E);
+        assertRemove(rb, 1, E);
+        assertEmpty(rb);
+        assertAdd(rb, F, 1, F);
+        assertRemove(rb, 1, F);
+        assertEmpty(rb);
+
+        assertAdd(rb, A, 1, A);
+        assertAdd(rb, B, 2, A);
+        assertAdd(rb, C, 3, A);
+        assertContents(rb, A, B, C);
+
+        assertAdd(rb, D, 4, A);
+        assertAdd(rb, E, 5, A);
+        assertAdd(rb, F, 6, A);
+        assertContents(rb, A, B, C, D, E, F);
+
+        assertRemove(rb, 6, A);
+        assertRemove(rb, 5, B);
+        assertRemove(rb, 4, C);
+        assertRemove(rb, 3, D);
+        assertRemove(rb, 2, E);
+        assertRemove(rb, 1, F);
+        assertContents(rb);
+        assertEmpty(rb);
+    }
+
+    public void testOfferPoll() {
+        FloatRingBuffer rb = new FloatRingBuffer(3);
+
+        assertEmpty(rb);
+
+        assertOffer(rb, A, 1, A);
+        assertOffer(rb, B, 2, A);
+        assertOffer(rb, C, 3, A);
+
+        assertPoll(rb, 3, A);
+        assertPoll(rb, 2, B);
+        assertPoll(rb, 1, C);
+        assertEmpty(rb);
+
+        assertOffer(rb, A, 1, A);
+        assertOffer(rb, B, 2, A);
+        assertPoll(rb, 2, A);
+        assertOffer(rb, C, 2, B);
+        assertPoll(rb, 2, B);
+        assertPoll(rb, 1, C);
+        assertEmpty(rb);
+
+        assertOffer(rb, A, 1, A);
+        assertPoll(rb, 1, A);
+        assertEmpty(rb);
+        assertOffer(rb, B, 1, B);
+        assertPoll(rb, 1, B);
+        assertEmpty(rb);
+        assertOffer(rb, C, 1, C);
+        assertPoll(rb, 1, C);
+        assertEmpty(rb);
+
+        assertOffer(rb, D, 1, D);
+        assertPoll(rb, 1, D);
+        assertEmpty(rb);
+        assertOffer(rb, E, 1, E);
+        assertPoll(rb, 1, E);
+        assertEmpty(rb);
+        assertOffer(rb, F, 1, F);
+        assertPoll(rb, 1, F);
+        assertEmpty(rb);
+
+        assertOffer(rb, A, 1, A);
+        assertOffer(rb, B, 2, A);
+        assertOffer(rb, C, 3, A);
+        assertOffer(rb, D, 4, A);
+
+        assertAdd(rb, E, 5, A); // need one add to grow it from 4 to 8
+        assertOffer(rb, F, 6, A);
+
+        assertPoll(rb, 6, A);
+        assertPoll(rb, 5, B);
+        assertPoll(rb, 4, C);
+        assertPoll(rb, 3, D);
+        assertPoll(rb, 2, E);
+        assertPoll(rb, 1, F);
+        assertEmpty(rb);
+    }
+
+    public void testGrowSimple() {
+        FloatRingBuffer rb = new FloatRingBuffer(4);
+
+        assertAdd(rb, A, 1, A);
+        assertAdd(rb, B, 2, A);
+        assertAdd(rb, C, 3, A);
+        assertAdd(rb, D, 4, A);
+        assertFull(rb);
+
+        // remove one so head != 0
+        assertRemove(rb, 4, A);
+
+        assertAdd(rb, E, 4, B);
+        // this will grow; the elements are in a single contiguous block
+        assertAdd(rb, F, 5, B);
+
+        assertRemove(rb, 5, B);
+        assertRemove(rb, 4, C);
+        assertRemove(rb, 3, D);
+        assertRemove(rb, 2, E);
+        assertRemove(rb, 1, F);
+        assertEmpty(rb);
+    }
+
+    public void testGrowComplex() {
+        FloatRingBuffer rb = new FloatRingBuffer(5);
+
+        assertAdd(rb, A, 1, A);
+        assertAdd(rb, B, 2, A);
+        assertAdd(rb, C, 3, A);
+        assertRemove(rb, 3, A);
+        assertRemove(rb, 2, B);
+        assertRemove(rb, 1, C);
+        assertEmpty(rb);
+
+        assertAdd(rb, A, 1, A);
+        assertAdd(rb, B, 2, A);
+        assertAdd(rb, C, 3, A);
+        assertAdd(rb, D, 4, A);
+        assertAdd(rb, E, 5, A);
+
+        // this will grow; the elements are in two blocks
+        assertAdd(rb, F, 6, A);
+
+        assertRemove(rb, 6, A);
+        assertRemove(rb, 5, B);
+        assertRemove(rb, 4, C);
+        assertRemove(rb, 3, D);
+        assertRemove(rb, 2, E);
+        assertRemove(rb, 1, F);
+        assertEmpty(rb);
+    }
+
+    public void testIterator() {
+        FloatRingBuffer rb = new FloatRingBuffer(3);
+
+        FloatRingBuffer.Iterator iter = rb.iterator();
+        assertFalse(iter.hasNext());
+
+        assertAdd(rb, A, 1, A);
+        assertAdd(rb, B, 2, A);
+        assertAdd(rb, C, 3, A);
+
+        iter = rb.iterator();
+        assertTrue(iter.hasNext());
+        assertEquals(A, iter.next());
+        assertTrue(iter.hasNext());
+        assertEquals(B, iter.next());
+        assertTrue(iter.hasNext());
+        assertEquals(C, iter.next());
+        assertFalse(iter.hasNext());
+
+        assertRemove(rb, 3, A);
+        assertAdd(rb, D, 3, B);
+
+        iter = rb.iterator();
+        assertTrue(iter.hasNext());
+        assertEquals(B, iter.next());
+        assertTrue(iter.hasNext());
+        assertEquals(C, iter.next());
+        assertTrue(iter.hasNext());
+        assertEquals(D, iter.next());
+        assertFalse(iter.hasNext());
+
+        assertRemove(rb, 3, B);
+
+        iter = rb.iterator();
+        assertEquals(C, iter.next());
+        assertEquals(D, iter.next());
+        assertFalse(iter.hasNext());
+
+        assertAdd(rb, E, 3, C);
+        assertAdd(rb, F, 4, C);
+
+        iter = rb.iterator();
+        assertTrue(iter.hasNext());
+        assertEquals(C, iter.next());
+        assertTrue(iter.hasNext());
+        assertEquals(D, iter.next());
+        assertTrue(iter.hasNext());
+        assertEquals(E, iter.next());
+        assertTrue(iter.hasNext());
+        assertEquals(F, iter.next());
+        assertFalse(iter.hasNext());
+
+        final FloatRingBuffer.Iterator iterFinal = rb.iterator();
+
+        assertThrows(UnsupportedOperationException.class,
+                iterFinal::remove);
+    }
+
+    public void testBack() {
+        FloatRingBuffer rb = new FloatRingBuffer(5);
+
+        assertAdd(rb, A, 1, A);
+        assertEquals(rb.back(), A);
+
+        assertAdd(rb, B, 2, A);
+        assertAdd(rb, C, 3, A);
+        assertEquals(rb.back(), C);
+    }
+
+    public void testBackWhenEmpty() {
+        FloatRingBuffer rb = new FloatRingBuffer(5);
+        try {
+            rb.back();
+            fail("expected a NoSuchElement exception");
+        } catch (NoSuchElementException x) {
+            // expected
+        }
+    }
+
+    public void testBackTailIsZero() {
+        FloatRingBuffer rb = new FloatRingBuffer(5, false);
+
+        assertAdd(rb, A, 1, A);
+        assertAdd(rb, B, 2, A);
+        assertAdd(rb, C, 3, A);
+        assertAdd(rb, D, 4, A);
+        assertAdd(rb, E, 5, A);
+
+        assertRemove(rb, 5, A);
+        assertAdd(rb, F, 5, B);
+        assertEquals(rb.back(), F);
+    }
+
+    public void testLargeAmounts() {
+        FloatRingBuffer rb = new FloatRingBuffer(3);
+
+        for (int i = 0; i < 100; i++)
+            rb.add((float) i);
+
+        for (int i = 100; i < 200; i++) {
+            rb.add((float) i);
+            assertEquals((float) (i - 100 + 1), rb.front(1));
+            assertEquals((float) (i - 100), rb.poll(SENTINEL));
+        }
+
+        for (int i = 200; i < 300; i++) {
+            if (i < 299)
+                assertEquals((float) (i - 100 + 1), rb.front(1));
+            assertEquals((float) (i - 100), rb.poll(SENTINEL));
+        }
+    }
+
+    public void testAddExceptionWhenFull() {
+        FloatRingBuffer rb = new FloatRingBuffer(4, false);
+        assert (rb.add(A));
+        assert (rb.add(B));
+        assert (rb.add(C));
+        assert (rb.add(D));
+
+        // this should throw
+        assertThrows(UnsupportedOperationException.class,
+                () -> rb.add(E));
+    }
+
+    public void testAddOverwriteAndOffer() {
+        FloatRingBuffer rb = new FloatRingBuffer(4, false);
+        assert (4 == rb.remaining());
+
+        assert (F == rb.addOverwrite(A, F));
+        assert (3 == rb.remaining());
+
+        assert (F == rb.addOverwrite(B, F));
+        assert (2 == rb.remaining());
+
+        assert (F == rb.addOverwrite(C, F));
+        assert (1 == rb.remaining());
+
+        assert (F == rb.addOverwrite(D, F));
+        assert (0 == rb.remaining());
+
+        assert (rb.isFull());
+
+        // now full, should return first value
+        assert (A == rb.addOverwrite(E, F));
+        assert (B == rb.addOverwrite(F, F));
+        assert (rb.isFull());
+
+        // offer() testing
+        assert (!rb.offer(A));
+        assert (C == rb.remove());
+        assert (rb.offer(A));
+
+        // peek testing
+        assert (D == rb.front());
+        assert (E == rb.front(1));
+        assert (F == rb.front(2));
+        // this should throw
+        assertThrows(NoSuchElementException.class,
+                () -> rb.front(99));
+
+        assert (A == rb.peekBack(B));
+
+        // clear() testing
+        rb.clear();
+        assert (rb.isEmpty());
+
+        assert (A == rb.peekBack(A));
+    }
+
+
+    public void testMultipleRemove() {
+        FloatRingBuffer rb = new FloatRingBuffer(10, false);
+
+        // this should throw
+        assertThrows(NoSuchElementException.class,
+                rb::remove);
+
+        // this should throw
+        assertThrows(NoSuchElementException.class,
+                () -> rb.remove(1));
+
+        rb.add(A);
+        rb.add(B);
+
+        float[] values = rb.remove(2);
+        assertArrayEquals(values, A, B);
+        assertEmpty(rb);
+
+        rb.add(C);
+        rb.add(D);
+        rb.add(E);
+        rb.add(F);
+
+        values = rb.remove(2);
+        assertArrayEquals(values, C, D);
+
+        values = rb.remove(2);
+        assertArrayEquals(values, E, F);
+        assertEmpty(rb);
+
+        rb.add(A);
+        rb.add(B);
+        rb.add(C);
+        rb.add(D);
+        rb.add(E);
+        rb.add(F);
+
+        values = rb.remove(6);
+        assertArrayEquals(values, A, B, C, D, E, F);
+        assertEmpty(rb);
+    }
+
+    public void testAddRemoveUnsafe() {
+        FloatRingBuffer rbNoGrow = new FloatRingBuffer(3, false);
+
+        // this should throw
+        assertThrows(UnsupportedOperationException.class,
+                () -> rbNoGrow.ensureRemaining(10));
+
+        rbNoGrow.ensureRemaining(3);
+        rbNoGrow.addUnsafe(A);
+        rbNoGrow.addUnsafe(B);
+        rbNoGrow.addUnsafe(C);
+
+        assertContents(rbNoGrow, A, B, C);
+
+        assertEquals(rbNoGrow.removeUnsafe(), A);
+        assertContents(rbNoGrow, B, C);
+
+        assertEquals(rbNoGrow.removeUnsafe(), B);
+        assertContents(rbNoGrow, C);
+
+        assertEquals(rbNoGrow.removeUnsafe(), C);
+        assertEmpty(rbNoGrow);
+
+
+        FloatRingBuffer rbGrow = new FloatRingBuffer(3, true);
+
+        for (int size = 10; size < 1_000_000; size *= 10) {
+            rbGrow.ensureRemaining(size);
+            assert (rbGrow.remaining() >= size);
+            for (int i = 0; i < size; i++) {
+                rbGrow.addUnsafe(A);
+            }
+        }
+    }
+
+    public void testOverflow() {
+        FloatRingBuffer rbA = new FloatRingBuffer(0);
+        // this should throw
+        assertThrows(AssertionFailure.class,
+                () -> rbA.ensureRemaining(ArrayUtil.MAX_ARRAY_SIZE + 1));
+
+        FloatRingBuffer rbB = new FloatRingBuffer(100);
+        for (int i = 0; i < 100; i++) {
+            rbB.addUnsafe(A);
+        }
+        // this should throw
+        assertThrows(AssertionFailure.class,
+                () -> rbB.ensureRemaining(ArrayUtil.MAX_ARRAY_SIZE - 100 + 1));
+    }
+}
diff --git a/Base/src/test/java/io/deephaven/base/ringbuffer/TestIntRingBuffer.java b/Base/src/test/java/io/deephaven/base/ringbuffer/TestIntRingBuffer.java
new file mode 100644
index 00000000000..afc4509b8ef
--- /dev/null
+++ b/Base/src/test/java/io/deephaven/base/ringbuffer/TestIntRingBuffer.java
@@ -0,0 +1,561 @@
+//
+// Copyright (c) 2016-2024 Deephaven Data Labs and Patent Pending
+//
+// ****** AUTO-GENERATED CLASS - DO NOT EDIT MANUALLY
+// ****** Edit TestCharRingBuffer and run "./gradlew replicateRingBuffers" to regenerate
+//
+// @formatter:off
+package io.deephaven.base.ringbuffer;
+
+import io.deephaven.base.ArrayUtil;
+import io.deephaven.base.verify.AssertionFailure;
+import junit.framework.TestCase;
+
+import java.util.NoSuchElementException;
+
+import static org.junit.Assert.assertThrows;
+
+public class TestIntRingBuffer extends TestCase {
+
+    final int SENTINEL = Integer.MIN_VALUE;
+
+    private void assertEmpty(IntRingBuffer rb) {
+        assertTrue(rb.isEmpty());
+        assertEquals(0, rb.size());
+
+        assertEquals(SENTINEL, rb.peek(SENTINEL));
+        try {
+            rb.element();
+            fail("queue should be empty");
+        } catch (NoSuchElementException x) {
+            // expected
+        }
+
+        assertEquals(SENTINEL, rb.poll(SENTINEL));
+        try {
+            rb.remove();
+            fail("queue should be empty");
+        } catch (NoSuchElementException x) {
+            // expected
+        }
+        // region empty-test
+        // endregion empty-test
+    }
+
+    private void assertFull(IntRingBuffer rb) {
+        assertFalse(rb.isEmpty());
+        assertEquals(rb.capacity(), rb.size());
+    }
+
+    private void assertNotEmpty(IntRingBuffer rb, int expectedSize, int expectedHead) {
+        assertFalse(rb.isEmpty());
+        assertEquals(expectedSize, rb.size());
+
+        assertEquals(expectedHead, rb.peek(SENTINEL));
+        try {
+            assertEquals(expectedHead, rb.element());
+        } catch (NoSuchElementException x) {
+            fail("queue should not be empty");
+        }
+    }
+
+    private void assertAdd(IntRingBuffer rb, int newHead, int expectedSize, int expectedHead) {
+        assertTrue(rb.add(newHead));
+        assertNotEmpty(rb, expectedSize, expectedHead);
+    }
+
+    private void assertOffer(IntRingBuffer rb, int newHead, int expectedSize, int expectedHead) {
+        assertTrue(rb.offer(newHead));
+        assertNotEmpty(rb, expectedSize, expectedHead);
+    }
+
+    private void assertPoll(IntRingBuffer rb, int expectedSize, int expectedHead) {
+        assertNotEmpty(rb, expectedSize, expectedHead);
+        assertEquals(expectedHead, rb.poll(SENTINEL));
+    }
+
+    private void assertRemove(IntRingBuffer rb, int expectedSize, int expectedHead) {
+        assertNotEmpty(rb, expectedSize, expectedHead);
+        try {
+            assertEquals(expectedHead, rb.remove());
+        } catch (NoSuchElementException x) {
+            fail("queue should not be empty");
+        }
+    }
+
+    private void assertContents(IntRingBuffer rb, int... expectedData) {
+        final int[] data = rb.getAll();
+        assertEquals(data.length, expectedData.length);
+        for (int ii = 0; ii < data.length; ii++) {
+            assertEquals(data[ii], expectedData[ii]);
+        }
+    }
+
+    private void assertArrayEquals(int[] data, int... expectedData) {
+        assertEquals(data.length, expectedData.length);
+        for (int ii = 0; ii < data.length; ii++) {
+            assertEquals(data[ii], expectedData[ii]);
+        }
+    }
+
+    int A = 'A';
+    int B = 'B';
+    int C = 'C';
+    int D = 'D';
+    int E = 'E';
+    int F = 'F';
+
+    public void testAddRemove() {
+
+        IntRingBuffer rb = new IntRingBuffer(3);
+
+        assertEmpty(rb);
+
+        assertAdd(rb, A, 1, A);
+        assertAdd(rb, B, 2, A);
+        assertAdd(rb, C, 3, A);
+        assertContents(rb, A, B, C);
+
+        assertRemove(rb, 3, A);
+        assertContents(rb, B, C);
+
+        assertRemove(rb, 2, B);
+        assertContents(rb, C);
+
+        assertRemove(rb, 1, C);
+        assertContents(rb);
+
+        assertEmpty(rb);
+
+        assertAdd(rb, A, 1, A);
+        assertAdd(rb, B, 2, A);
+        assertContents(rb, A, B);
+
+        assertRemove(rb, 2, A);
+        assertContents(rb, B);
+
+        assertAdd(rb, C, 2, B);
+        assertContents(rb, B, C);
+
+        assertRemove(rb, 2, B);
+        assertContents(rb, C);
+
+        assertRemove(rb, 1, C);
+        assertContents(rb);
+
+        assertEmpty(rb);
+
+        assertAdd(rb, A, 1, A);
+        assertRemove(rb, 1, A);
+        assertEmpty(rb);
+        assertAdd(rb, B, 1, B);
+        assertRemove(rb, 1, B);
+        assertEmpty(rb);
+        assertAdd(rb, C, 1, C);
+        assertRemove(rb, 1, C);
+        assertEmpty(rb);
+
+        assertAdd(rb, D, 1, D);
+        assertRemove(rb, 1, D);
+        assertEmpty(rb);
+        assertAdd(rb, E, 1, E);
+        assertRemove(rb, 1, E);
+        assertEmpty(rb);
+        assertAdd(rb, F, 1, F);
+        assertRemove(rb, 1, F);
+        assertEmpty(rb);
+
+        assertAdd(rb, A, 1, A);
+        assertAdd(rb, B, 2, A);
+        assertAdd(rb, C, 3, A);
+        assertContents(rb, A, B, C);
+
+        assertAdd(rb, D, 4, A);
+        assertAdd(rb, E, 5, A);
+        assertAdd(rb, F, 6, A);
+        assertContents(rb, A, B, C, D, E, F);
+
+        assertRemove(rb, 6, A);
+        assertRemove(rb, 5, B);
+        assertRemove(rb, 4, C);
+        assertRemove(rb, 3, D);
+        assertRemove(rb, 2, E);
+        assertRemove(rb, 1, F);
+        assertContents(rb);
+        assertEmpty(rb);
+    }
+
+    public void testOfferPoll() {
+        IntRingBuffer rb = new IntRingBuffer(3);
+
+        assertEmpty(rb);
+
+        assertOffer(rb, A, 1, A);
+        assertOffer(rb, B, 2, A);
+        assertOffer(rb, C, 3, A);
+
+        assertPoll(rb, 3, A);
+        assertPoll(rb, 2, B);
+        assertPoll(rb, 1, C);
+        assertEmpty(rb);
+
+        assertOffer(rb, A, 1, A);
+        assertOffer(rb, B, 2, A);
+        assertPoll(rb, 2, A);
+        assertOffer(rb, C, 2, B);
+        assertPoll(rb, 2, B);
+        assertPoll(rb, 1, C);
+        assertEmpty(rb);
+
+        assertOffer(rb, A, 1, A);
+        assertPoll(rb, 1, A);
+        assertEmpty(rb);
+        assertOffer(rb, B, 1, B);
+        assertPoll(rb, 1, B);
+        assertEmpty(rb);
+        assertOffer(rb, C, 1, C);
+        assertPoll(rb, 1, C);
+        assertEmpty(rb);
+
+        assertOffer(rb, D, 1, D);
+        assertPoll(rb, 1, D);
+        assertEmpty(rb);
+        assertOffer(rb, E, 1, E);
+        assertPoll(rb, 1, E);
+        assertEmpty(rb);
+        assertOffer(rb, F, 1, F);
+        assertPoll(rb, 1, F);
+        assertEmpty(rb);
+
+        assertOffer(rb, A, 1, A);
+        assertOffer(rb, B, 2, A);
+        assertOffer(rb, C, 3, A);
+        assertOffer(rb, D, 4, A);
+
+        assertAdd(rb, E, 5, A); // need one add to grow it from 4 to 8
+        assertOffer(rb, F, 6, A);
+
+        assertPoll(rb, 6, A);
+        assertPoll(rb, 5, B);
+        assertPoll(rb, 4, C);
+        assertPoll(rb, 3, D);
+        assertPoll(rb, 2, E);
+        assertPoll(rb, 1, F);
+        assertEmpty(rb);
+    }
+
+    public void testGrowSimple() {
+        IntRingBuffer rb = new IntRingBuffer(4);
+
+        assertAdd(rb, A, 1, A);
+        assertAdd(rb, B, 2, A);
+        assertAdd(rb, C, 3, A);
+        assertAdd(rb, D, 4, A);
+        assertFull(rb);
+
+        // remove one so head != 0
+        assertRemove(rb, 4, A);
+
+        assertAdd(rb, E, 4, B);
+        // this will grow; the elements are in a single contiguous block
+        assertAdd(rb, F, 5, B);
+
+        assertRemove(rb, 5, B);
+        assertRemove(rb, 4, C);
+        assertRemove(rb, 3, D);
+        assertRemove(rb, 2, E);
+        assertRemove(rb, 1, F);
+        assertEmpty(rb);
+    }
+
+    public void testGrowComplex() {
+        IntRingBuffer rb = new IntRingBuffer(5);
+
+        assertAdd(rb, A, 1, A);
+        assertAdd(rb, B, 2, A);
+        assertAdd(rb, C, 3, A);
+        assertRemove(rb, 3, A);
+        assertRemove(rb, 2, B);
+        assertRemove(rb, 1, C);
+        assertEmpty(rb);
+
+        assertAdd(rb, A, 1, A);
+        assertAdd(rb, B, 2, A);
+        assertAdd(rb, C, 3, A);
+        assertAdd(rb, D, 4, A);
+        assertAdd(rb, E, 5, A);
+
+        // this will grow; the elements are in two blocks
+        assertAdd(rb, F, 6, A);
+
+        assertRemove(rb, 6, A);
+        assertRemove(rb, 5, B);
+        assertRemove(rb, 4, C);
+        assertRemove(rb, 3, D);
+        assertRemove(rb, 2, E);
+        assertRemove(rb, 1, F);
+        assertEmpty(rb);
+    }
+
+    public void testIterator() {
+        IntRingBuffer rb = new IntRingBuffer(3);
+
+        IntRingBuffer.Iterator iter = rb.iterator();
+        assertFalse(iter.hasNext());
+
+        assertAdd(rb, A, 1, A);
+        assertAdd(rb, B, 2, A);
+        assertAdd(rb, C, 3, A);
+
+        iter = rb.iterator();
+        assertTrue(iter.hasNext());
+        assertEquals(A, iter.next());
+        assertTrue(iter.hasNext());
+        assertEquals(B, iter.next());
+        assertTrue(iter.hasNext());
+        assertEquals(C, iter.next());
+        assertFalse(iter.hasNext());
+
+        assertRemove(rb, 3, A);
+        assertAdd(rb, D, 3, B);
+
+        iter = rb.iterator();
+        assertTrue(iter.hasNext());
+        assertEquals(B, iter.next());
+        assertTrue(iter.hasNext());
+        assertEquals(C, iter.next());
+        assertTrue(iter.hasNext());
+        assertEquals(D, iter.next());
+        assertFalse(iter.hasNext());
+
+        assertRemove(rb, 3, B);
+
+        iter = rb.iterator();
+        assertEquals(C, iter.next());
+        assertEquals(D, iter.next());
+        assertFalse(iter.hasNext());
+
+        assertAdd(rb, E, 3, C);
+        assertAdd(rb, F, 4, C);
+
+        iter = rb.iterator();
+        assertTrue(iter.hasNext());
+        assertEquals(C, iter.next());
+        assertTrue(iter.hasNext());
+        assertEquals(D, iter.next());
+        assertTrue(iter.hasNext());
+        assertEquals(E, iter.next());
+        assertTrue(iter.hasNext());
+        assertEquals(F, iter.next());
+        assertFalse(iter.hasNext());
+
+        final IntRingBuffer.Iterator iterFinal = rb.iterator();
+
+        assertThrows(UnsupportedOperationException.class,
+                iterFinal::remove);
+    }
+
+    public void testBack() {
+        IntRingBuffer rb = new IntRingBuffer(5);
+
+        assertAdd(rb, A, 1, A);
+        assertEquals(rb.back(), A);
+
+        assertAdd(rb, B, 2, A);
+        assertAdd(rb, C, 3, A);
+        assertEquals(rb.back(), C);
+    }
+
+    public void testBackWhenEmpty() {
+        IntRingBuffer rb = new IntRingBuffer(5);
+        try {
+            rb.back();
+            fail("expected a NoSuchElement exception");
+        } catch (NoSuchElementException x) {
+            // expected
+        }
+    }
+
+    public void testBackTailIsZero() {
+        IntRingBuffer rb = new IntRingBuffer(5, false);
+
+        assertAdd(rb, A, 1, A);
+        assertAdd(rb, B, 2, A);
+        assertAdd(rb, C, 3, A);
+        assertAdd(rb, D, 4, A);
+        assertAdd(rb, E, 5, A);
+
+        assertRemove(rb, 5, A);
+        assertAdd(rb, F, 5, B);
+        assertEquals(rb.back(), F);
+    }
+
+    public void testLargeAmounts() {
+        IntRingBuffer rb = new IntRingBuffer(3);
+
+        for (int i = 0; i < 100; i++)
+            rb.add((int) i);
+
+        for (int i = 100; i < 200; i++) {
+            rb.add((int) i);
+            assertEquals((int) (i - 100 + 1), rb.front(1));
+            assertEquals((int) (i - 100), rb.poll(SENTINEL));
+        }
+
+        for (int i = 200; i < 300; i++) {
+            if (i < 299)
+                assertEquals((int) (i - 100 + 1), rb.front(1));
+            assertEquals((int) (i - 100), rb.poll(SENTINEL));
+        }
+    }
+
+    public void testAddExceptionWhenFull() {
+        IntRingBuffer rb = new IntRingBuffer(4, false);
+        assert (rb.add(A));
+        assert (rb.add(B));
+        assert (rb.add(C));
+        assert (rb.add(D));
+
+        // this should throw
+        assertThrows(UnsupportedOperationException.class,
+                () -> rb.add(E));
+    }
+
+    public void testAddOverwriteAndOffer() {
+        IntRingBuffer rb = new IntRingBuffer(4, false);
+        assert (4 == rb.remaining());
+
+        assert (F == rb.addOverwrite(A, F));
+        assert (3 == rb.remaining());
+
+        assert (F == rb.addOverwrite(B, F));
+        assert (2 == rb.remaining());
+
+        assert (F == rb.addOverwrite(C, F));
+        assert (1 == rb.remaining());
+
+        assert (F == rb.addOverwrite(D, F));
+        assert (0 == rb.remaining());
+
+        assert (rb.isFull());
+
+        // now full, should return first value
+        assert (A == rb.addOverwrite(E, F));
+        assert (B == rb.addOverwrite(F, F));
+        assert (rb.isFull());
+
+        // offer() testing
+        assert (!rb.offer(A));
+        assert (C == rb.remove());
+        assert (rb.offer(A));
+
+        // peek testing
+        assert (D == rb.front());
+        assert (E == rb.front(1));
+        assert (F == rb.front(2));
+        // this should throw
+        assertThrows(NoSuchElementException.class,
+                () -> rb.front(99));
+
+        assert (A == rb.peekBack(B));
+
+        // clear() testing
+        rb.clear();
+        assert (rb.isEmpty());
+
+        assert (A == rb.peekBack(A));
+    }
+
+
+    public void testMultipleRemove() {
+        IntRingBuffer rb = new IntRingBuffer(10, false);
+
+        // this should throw
+        assertThrows(NoSuchElementException.class,
+                rb::remove);
+
+        // this should throw
+        assertThrows(NoSuchElementException.class,
+                () -> rb.remove(1));
+
+        rb.add(A);
+        rb.add(B);
+
+        int[] values = rb.remove(2);
+        assertArrayEquals(values, A, B);
+        assertEmpty(rb);
+
+        rb.add(C);
+        rb.add(D);
+        rb.add(E);
+        rb.add(F);
+
+        values = rb.remove(2);
+        assertArrayEquals(values, C, D);
+
+        values = rb.remove(2);
+        assertArrayEquals(values, E, F);
+        assertEmpty(rb);
+
+        rb.add(A);
+        rb.add(B);
+        rb.add(C);
+        rb.add(D);
+        rb.add(E);
+        rb.add(F);
+
+        values = rb.remove(6);
+        assertArrayEquals(values, A, B, C, D, E, F);
+        assertEmpty(rb);
+    }
+
+    public void testAddRemoveUnsafe() {
+        IntRingBuffer rbNoGrow = new IntRingBuffer(3, false);
+
+        // this should throw
+        assertThrows(UnsupportedOperationException.class,
+                () -> rbNoGrow.ensureRemaining(10));
+
+        rbNoGrow.ensureRemaining(3);
+        rbNoGrow.addUnsafe(A);
+        rbNoGrow.addUnsafe(B);
+        rbNoGrow.addUnsafe(C);
+
+        assertContents(rbNoGrow, A, B, C);
+
+        assertEquals(rbNoGrow.removeUnsafe(), A);
+        assertContents(rbNoGrow, B, C);
+
+        assertEquals(rbNoGrow.removeUnsafe(), B);
+        assertContents(rbNoGrow, C);
+
+        assertEquals(rbNoGrow.removeUnsafe(), C);
+        assertEmpty(rbNoGrow);
+
+
+        IntRingBuffer rbGrow = new IntRingBuffer(3, true);
+
+        for (int size = 10; size < 1_000_000; size *= 10) {
+            rbGrow.ensureRemaining(size);
+            assert (rbGrow.remaining() >= size);
+            for (int i = 0; i < size; i++) {
+                rbGrow.addUnsafe(A);
+            }
+        }
+    }
+
+    public void testOverflow() {
+        IntRingBuffer rbA = new IntRingBuffer(0);
+        // this should throw
+        assertThrows(AssertionFailure.class,
+                () -> rbA.ensureRemaining(ArrayUtil.MAX_ARRAY_SIZE + 1));
+
+        IntRingBuffer rbB = new IntRingBuffer(100);
+        for (int i = 0; i < 100; i++) {
+            rbB.addUnsafe(A);
+        }
+        // this should throw
+        assertThrows(AssertionFailure.class,
+                () -> rbB.ensureRemaining(ArrayUtil.MAX_ARRAY_SIZE - 100 + 1));
+    }
+}
diff --git a/Base/src/test/java/io/deephaven/base/ringbuffer/TestLongRingBuffer.java b/Base/src/test/java/io/deephaven/base/ringbuffer/TestLongRingBuffer.java
new file mode 100644
index 00000000000..f1aa4105a1e
--- /dev/null
+++ b/Base/src/test/java/io/deephaven/base/ringbuffer/TestLongRingBuffer.java
@@ -0,0 +1,561 @@
+//
+// Copyright (c) 2016-2024 Deephaven Data Labs and Patent Pending
+//
+// ****** AUTO-GENERATED CLASS - DO NOT EDIT MANUALLY
+// ****** Edit TestCharRingBuffer and run "./gradlew replicateRingBuffers" to regenerate
+//
+// @formatter:off
+package io.deephaven.base.ringbuffer;
+
+import io.deephaven.base.ArrayUtil;
+import io.deephaven.base.verify.AssertionFailure;
+import junit.framework.TestCase;
+
+import java.util.NoSuchElementException;
+
+import static org.junit.Assert.assertThrows;
+
+public class TestLongRingBuffer extends TestCase {
+
+    final long SENTINEL = Long.MIN_VALUE;
+
+    private void assertEmpty(LongRingBuffer rb) {
+        assertTrue(rb.isEmpty());
+        assertEquals(0, rb.size());
+
+        assertEquals(SENTINEL, rb.peek(SENTINEL));
+        try {
+            rb.element();
+            fail("queue should be empty");
+        } catch (NoSuchElementException x) {
+            // expected
+        }
+
+        assertEquals(SENTINEL, rb.poll(SENTINEL));
+        try {
+            rb.remove();
+            fail("queue should be empty");
+        } catch (NoSuchElementException x) {
+            // expected
+        }
+        // region empty-test
+        // endregion empty-test
+    }
+
+    private void assertFull(LongRingBuffer rb) {
+        assertFalse(rb.isEmpty());
+        assertEquals(rb.capacity(), rb.size());
+    }
+
+    private void assertNotEmpty(LongRingBuffer rb, int expectedSize, long expectedHead) {
+        assertFalse(rb.isEmpty());
+        assertEquals(expectedSize, rb.size());
+
+        assertEquals(expectedHead, rb.peek(SENTINEL));
+        try {
+            assertEquals(expectedHead, rb.element());
+        } catch (NoSuchElementException x) {
+            fail("queue should not be empty");
+        }
+    }
+
+    private void assertAdd(LongRingBuffer rb, long newHead, int expectedSize, long expectedHead) {
+        assertTrue(rb.add(newHead));
+        assertNotEmpty(rb, expectedSize, expectedHead);
+    }
+
+    private void assertOffer(LongRingBuffer rb, long newHead, int expectedSize, long expectedHead) {
+        assertTrue(rb.offer(newHead));
+        assertNotEmpty(rb, expectedSize, expectedHead);
+    }
+
+    private void assertPoll(LongRingBuffer rb, int expectedSize, long expectedHead) {
+        assertNotEmpty(rb, expectedSize, expectedHead);
+        assertEquals(expectedHead, rb.poll(SENTINEL));
+    }
+
+    private void assertRemove(LongRingBuffer rb, int expectedSize, long expectedHead) {
+        assertNotEmpty(rb, expectedSize, expectedHead);
+        try {
+            assertEquals(expectedHead, rb.remove());
+        } catch (NoSuchElementException x) {
+            fail("queue should not be empty");
+        }
+    }
+
+    private void assertContents(LongRingBuffer rb, long... expectedData) {
+        final long[] data = rb.getAll();
+        assertEquals(data.length, expectedData.length);
+        for (int ii = 0; ii < data.length; ii++) {
+            assertEquals(data[ii], expectedData[ii]);
+        }
+    }
+
+    private void assertArrayEquals(long[] data, long... expectedData) {
+        assertEquals(data.length, expectedData.length);
+        for (int ii = 0; ii < data.length; ii++) {
+            assertEquals(data[ii], expectedData[ii]);
+        }
+    }
+
+    long A = 'A';
+    long B = 'B';
+    long C = 'C';
+    long D = 'D';
+    long E = 'E';
+    long F = 'F';
+
+    public void testAddRemove() {
+
+        LongRingBuffer rb = new LongRingBuffer(3);
+
+        assertEmpty(rb);
+
+        assertAdd(rb, A, 1, A);
+        assertAdd(rb, B, 2, A);
+        assertAdd(rb, C, 3, A);
+        assertContents(rb, A, B, C);
+
+        assertRemove(rb, 3, A);
+        assertContents(rb, B, C);
+
+        assertRemove(rb, 2, B);
+        assertContents(rb, C);
+
+        assertRemove(rb, 1, C);
+        assertContents(rb);
+
+        assertEmpty(rb);
+
+        assertAdd(rb, A, 1, A);
+        assertAdd(rb, B, 2, A);
+        assertContents(rb, A, B);
+
+        assertRemove(rb, 2, A);
+        assertContents(rb, B);
+
+        assertAdd(rb, C, 2, B);
+        assertContents(rb, B, C);
+
+        assertRemove(rb, 2, B);
+        assertContents(rb, C);
+
+        assertRemove(rb, 1, C);
+        assertContents(rb);
+
+        assertEmpty(rb);
+
+        assertAdd(rb, A, 1, A);
+        assertRemove(rb, 1, A);
+        assertEmpty(rb);
+        assertAdd(rb, B, 1, B);
+        assertRemove(rb, 1, B);
+        assertEmpty(rb);
+        assertAdd(rb, C, 1, C);
+        assertRemove(rb, 1, C);
+        assertEmpty(rb);
+
+        assertAdd(rb, D, 1, D);
+        assertRemove(rb, 1, D);
+        assertEmpty(rb);
+        assertAdd(rb, E, 1, E);
+        assertRemove(rb, 1, E);
+        assertEmpty(rb);
+        assertAdd(rb, F, 1, F);
+        assertRemove(rb, 1, F);
+        assertEmpty(rb);
+
+        assertAdd(rb, A, 1, A);
+        assertAdd(rb, B, 2, A);
+        assertAdd(rb, C, 3, A);
+        assertContents(rb, A, B, C);
+
+        assertAdd(rb, D, 4, A);
+        assertAdd(rb, E, 5, A);
+        assertAdd(rb, F, 6, A);
+        assertContents(rb, A, B, C, D, E, F);
+
+        assertRemove(rb, 6, A);
+        assertRemove(rb, 5, B);
+        assertRemove(rb, 4, C);
+        assertRemove(rb, 3, D);
+        assertRemove(rb, 2, E);
+        assertRemove(rb, 1, F);
+        assertContents(rb);
+        assertEmpty(rb);
+    }
+
+    public void testOfferPoll() {
+        LongRingBuffer rb = new LongRingBuffer(3);
+
+        assertEmpty(rb);
+
+        assertOffer(rb, A, 1, A);
+        assertOffer(rb, B, 2, A);
+        assertOffer(rb, C, 3, A);
+
+        assertPoll(rb, 3, A);
+        assertPoll(rb, 2, B);
+        assertPoll(rb, 1, C);
+        assertEmpty(rb);
+
+        assertOffer(rb, A, 1, A);
+        assertOffer(rb, B, 2, A);
+        assertPoll(rb, 2, A);
+        assertOffer(rb, C, 2, B);
+        assertPoll(rb, 2, B);
+        assertPoll(rb, 1, C);
+        assertEmpty(rb);
+
+        assertOffer(rb, A, 1, A);
+        assertPoll(rb, 1, A);
+        assertEmpty(rb);
+        assertOffer(rb, B, 1, B);
+        assertPoll(rb, 1, B);
+        assertEmpty(rb);
+        assertOffer(rb, C, 1, C);
+        assertPoll(rb, 1, C);
+        assertEmpty(rb);
+
+        assertOffer(rb, D, 1, D);
+        assertPoll(rb, 1, D);
+        assertEmpty(rb);
+        assertOffer(rb, E, 1, E);
+        assertPoll(rb, 1, E);
+        assertEmpty(rb);
+        assertOffer(rb, F, 1, F);
+        assertPoll(rb, 1, F);
+        assertEmpty(rb);
+
+        assertOffer(rb, A, 1, A);
+        assertOffer(rb, B, 2, A);
+        assertOffer(rb, C, 3, A);
+        assertOffer(rb, D, 4, A);
+
+        assertAdd(rb, E, 5, A); // need one add to grow it from 4 to 8
+        assertOffer(rb, F, 6, A);
+
+        assertPoll(rb, 6, A);
+        assertPoll(rb, 5, B);
+        assertPoll(rb, 4, C);
+        assertPoll(rb, 3, D);
+        assertPoll(rb, 2, E);
+        assertPoll(rb, 1, F);
+        assertEmpty(rb);
+    }
+
+    public void testGrowSimple() {
+        LongRingBuffer rb = new LongRingBuffer(4);
+
+        assertAdd(rb, A, 1, A);
+        assertAdd(rb, B, 2, A);
+        assertAdd(rb, C, 3, A);
+        assertAdd(rb, D, 4, A);
+        assertFull(rb);
+
+        // remove one so head != 0
+        assertRemove(rb, 4, A);
+
+        assertAdd(rb, E, 4, B);
+        // this will grow; the elements are in a single contiguous block
+        assertAdd(rb, F, 5, B);
+
+        assertRemove(rb, 5, B);
+        assertRemove(rb, 4, C);
+        assertRemove(rb, 3, D);
+        assertRemove(rb, 2, E);
+        assertRemove(rb, 1, F);
+        assertEmpty(rb);
+    }
+
+    public void testGrowComplex() {
+        LongRingBuffer rb = new LongRingBuffer(5);
+
+        assertAdd(rb, A, 1, A);
+        assertAdd(rb, B, 2, A);
+        assertAdd(rb, C, 3, A);
+        assertRemove(rb, 3, A);
+        assertRemove(rb, 2, B);
+        assertRemove(rb, 1, C);
+        assertEmpty(rb);
+
+        assertAdd(rb, A, 1, A);
+        assertAdd(rb, B, 2, A);
+        assertAdd(rb, C, 3, A);
+        assertAdd(rb, D, 4, A);
+        assertAdd(rb, E, 5, A);
+
+        // this will grow; the elements are in two blocks
+        assertAdd(rb, F, 6, A);
+
+        assertRemove(rb, 6, A);
+        assertRemove(rb, 5, B);
+        assertRemove(rb, 4, C);
+        assertRemove(rb, 3, D);
+        assertRemove(rb, 2, E);
+        assertRemove(rb, 1, F);
+        assertEmpty(rb);
+    }
+
+    public void testIterator() {
+        LongRingBuffer rb = new LongRingBuffer(3);
+
+        LongRingBuffer.Iterator iter = rb.iterator();
+        assertFalse(iter.hasNext());
+
+        assertAdd(rb, A, 1, A);
+        assertAdd(rb, B, 2, A);
+        assertAdd(rb, C, 3, A);
+
+        iter = rb.iterator();
+        assertTrue(iter.hasNext());
+        assertEquals(A, iter.next());
+        assertTrue(iter.hasNext());
+        assertEquals(B, iter.next());
+        assertTrue(iter.hasNext());
+        assertEquals(C, iter.next());
+        assertFalse(iter.hasNext());
+
+        assertRemove(rb, 3, A);
+        assertAdd(rb, D, 3, B);
+
+        iter = rb.iterator();
+        assertTrue(iter.hasNext());
+        assertEquals(B, iter.next());
+        assertTrue(iter.hasNext());
+        assertEquals(C, iter.next());
+        assertTrue(iter.hasNext());
+        assertEquals(D, iter.next());
+        assertFalse(iter.hasNext());
+
+        assertRemove(rb, 3, B);
+
+        iter = rb.iterator();
+        assertEquals(C, iter.next());
+        assertEquals(D, iter.next());
+        assertFalse(iter.hasNext());
+
+        assertAdd(rb, E, 3, C);
+        assertAdd(rb, F, 4, C);
+
+        iter = rb.iterator();
+        assertTrue(iter.hasNext());
+        assertEquals(C, iter.next());
+        assertTrue(iter.hasNext());
+        assertEquals(D, iter.next());
+        assertTrue(iter.hasNext());
+        assertEquals(E, iter.next());
+        assertTrue(iter.hasNext());
+        assertEquals(F, iter.next());
+        assertFalse(iter.hasNext());
+
+        final LongRingBuffer.Iterator iterFinal = rb.iterator();
+
+        assertThrows(UnsupportedOperationException.class,
+                iterFinal::remove);
+    }
+
+    public void testBack() {
+        LongRingBuffer rb = new LongRingBuffer(5);
+
+        assertAdd(rb, A, 1, A);
+        assertEquals(rb.back(), A);
+
+        assertAdd(rb, B, 2, A);
+        assertAdd(rb, C, 3, A);
+        assertEquals(rb.back(), C);
+    }
+
+    public void testBackWhenEmpty() {
+        LongRingBuffer rb = new LongRingBuffer(5);
+        try {
+            rb.back();
+            fail("expected a NoSuchElement exception");
+        } catch (NoSuchElementException x) {
+            // expected
+        }
+    }
+
+    public void testBackTailIsZero() {
+        LongRingBuffer rb = new LongRingBuffer(5, false);
+
+        assertAdd(rb, A, 1, A);
+        assertAdd(rb, B, 2, A);
+        assertAdd(rb, C, 3, A);
+        assertAdd(rb, D, 4, A);
+        assertAdd(rb, E, 5, A);
+
+        assertRemove(rb, 5, A);
+        assertAdd(rb, F, 5, B);
+        assertEquals(rb.back(), F);
+    }
+
+    public void testLargeAmounts() {
+        LongRingBuffer rb = new LongRingBuffer(3);
+
+        for (int i = 0; i < 100; i++)
+            rb.add((long) i);
+
+        for (int i = 100; i < 200; i++) {
+            rb.add((long) i);
+            assertEquals((long) (i - 100 + 1), rb.front(1));
+            assertEquals((long) (i - 100), rb.poll(SENTINEL));
+        }
+
+        for (int i = 200; i < 300; i++) {
+            if (i < 299)
+                assertEquals((long) (i - 100 + 1), rb.front(1));
+            assertEquals((long) (i - 100), rb.poll(SENTINEL));
+        }
+    }
+
+    public void testAddExceptionWhenFull() {
+        LongRingBuffer rb = new LongRingBuffer(4, false);
+        assert (rb.add(A));
+        assert (rb.add(B));
+        assert (rb.add(C));
+        assert (rb.add(D));
+
+        // this should throw
+        assertThrows(UnsupportedOperationException.class,
+                () -> rb.add(E));
+    }
+
+    public void testAddOverwriteAndOffer() {
+        LongRingBuffer rb = new LongRingBuffer(4, false);
+        assert (4 == rb.remaining());
+
+        assert (F == rb.addOverwrite(A, F));
+        assert (3 == rb.remaining());
+
+        assert (F == rb.addOverwrite(B, F));
+        assert (2 == rb.remaining());
+
+        assert (F == rb.addOverwrite(C, F));
+        assert (1 == rb.remaining());
+
+        assert (F == rb.addOverwrite(D, F));
+        assert (0 == rb.remaining());
+
+        assert (rb.isFull());
+
+        // now full, should return first value
+        assert (A == rb.addOverwrite(E, F));
+        assert (B == rb.addOverwrite(F, F));
+        assert (rb.isFull());
+
+        // offer() testing
+        assert (!rb.offer(A));
+        assert (C == rb.remove());
+        assert (rb.offer(A));
+
+        // peek testing
+        assert (D == rb.front());
+        assert (E == rb.front(1));
+        assert (F == rb.front(2));
+        // this should throw
+        assertThrows(NoSuchElementException.class,
+                () -> rb.front(99));
+
+        assert (A == rb.peekBack(B));
+
+        // clear() testing
+        rb.clear();
+        assert (rb.isEmpty());
+
+        assert (A == rb.peekBack(A));
+    }
+
+
+    public void testMultipleRemove() {
+        LongRingBuffer rb = new LongRingBuffer(10, false);
+
+        // this should throw
+        assertThrows(NoSuchElementException.class,
+                rb::remove);
+
+        // this should throw
+        assertThrows(NoSuchElementException.class,
+                () -> rb.remove(1));
+
+        rb.add(A);
+        rb.add(B);
+
+        long[] values = rb.remove(2);
+        assertArrayEquals(values, A, B);
+        assertEmpty(rb);
+
+        rb.add(C);
+        rb.add(D);
+        rb.add(E);
+        rb.add(F);
+
+        values = rb.remove(2);
+        assertArrayEquals(values, C, D);
+
+        values = rb.remove(2);
+        assertArrayEquals(values, E, F);
+        assertEmpty(rb);
+
+        rb.add(A);
+        rb.add(B);
+        rb.add(C);
+        rb.add(D);
+        rb.add(E);
+        rb.add(F);
+
+        values = rb.remove(6);
+        assertArrayEquals(values, A, B, C, D, E, F);
+        assertEmpty(rb);
+    }
+
+    public void testAddRemoveUnsafe() {
+        LongRingBuffer rbNoGrow = new LongRingBuffer(3, false);
+
+        // this should throw
+        assertThrows(UnsupportedOperationException.class,
+                () -> rbNoGrow.ensureRemaining(10));
+
+        rbNoGrow.ensureRemaining(3);
+        rbNoGrow.addUnsafe(A);
+        rbNoGrow.addUnsafe(B);
+        rbNoGrow.addUnsafe(C);
+
+        assertContents(rbNoGrow, A, B, C);
+
+        assertEquals(rbNoGrow.removeUnsafe(), A);
+        assertContents(rbNoGrow, B, C);
+
+        assertEquals(rbNoGrow.removeUnsafe(), B);
+        assertContents(rbNoGrow, C);
+
+        assertEquals(rbNoGrow.removeUnsafe(), C);
+        assertEmpty(rbNoGrow);
+
+
+        LongRingBuffer rbGrow = new LongRingBuffer(3, true);
+
+        for (int size = 10; size < 1_000_000; size *= 10) {
+            rbGrow.ensureRemaining(size);
+            assert (rbGrow.remaining() >= size);
+            for (int i = 0; i < size; i++) {
+                rbGrow.addUnsafe(A);
+            }
+        }
+    }
+
+    public void testOverflow() {
+        LongRingBuffer rbA = new LongRingBuffer(0);
+        // this should throw
+        assertThrows(AssertionFailure.class,
+                () -> rbA.ensureRemaining(ArrayUtil.MAX_ARRAY_SIZE + 1));
+
+        LongRingBuffer rbB = new LongRingBuffer(100);
+        for (int i = 0; i < 100; i++) {
+            rbB.addUnsafe(A);
+        }
+        // this should throw
+        assertThrows(AssertionFailure.class,
+                () -> rbB.ensureRemaining(ArrayUtil.MAX_ARRAY_SIZE - 100 + 1));
+    }
+}
diff --git a/Base/src/test/java/io/deephaven/base/ringbuffer/TestObjectRingBuffer.java b/Base/src/test/java/io/deephaven/base/ringbuffer/TestObjectRingBuffer.java
new file mode 100644
index 00000000000..1dab28f6731
--- /dev/null
+++ b/Base/src/test/java/io/deephaven/base/ringbuffer/TestObjectRingBuffer.java
@@ -0,0 +1,564 @@
+//
+// Copyright (c) 2016-2024 Deephaven Data Labs and Patent Pending
+//
+// ****** AUTO-GENERATED CLASS - DO NOT EDIT MANUALLY
+// ****** Edit TestCharRingBuffer and run "./gradlew replicateRingBuffers" to regenerate
+//
+// @formatter:off
+package io.deephaven.base.ringbuffer;
+
+import io.deephaven.base.ArrayUtil;
+import io.deephaven.base.verify.AssertionFailure;
+import junit.framework.TestCase;
+
+import java.util.NoSuchElementException;
+
+import static org.junit.Assert.assertThrows;
+
+public class TestObjectRingBuffer extends TestCase {
+
+    final Object SENTINEL = new Object();
+
+    private void assertEmpty(ObjectRingBuffer rb) {
+        assertTrue(rb.isEmpty());
+        assertEquals(0, rb.size());
+
+        assertEquals(SENTINEL, rb.peek(SENTINEL));
+        try {
+            rb.element();
+            fail("queue should be empty");
+        } catch (NoSuchElementException x) {
+            // expected
+        }
+
+        assertEquals(SENTINEL, rb.poll(SENTINEL));
+        try {
+            rb.remove();
+            fail("queue should be empty");
+        } catch (NoSuchElementException x) {
+            // expected
+        }
+        // region empty-test
+        for (Object val : rb.getStorage()) {
+            assertNull(val);
+        }
+        // endregion empty-test
+    }
+
+    private void assertFull(ObjectRingBuffer rb) {
+        assertFalse(rb.isEmpty());
+        assertEquals(rb.capacity(), rb.size());
+    }
+
+    private void assertNotEmpty(ObjectRingBuffer rb, int expectedSize, Object expectedHead) {
+        assertFalse(rb.isEmpty());
+        assertEquals(expectedSize, rb.size());
+
+        assertEquals(expectedHead, rb.peek(SENTINEL));
+        try {
+            assertEquals(expectedHead, rb.element());
+        } catch (NoSuchElementException x) {
+            fail("queue should not be empty");
+        }
+    }
+
+    private void assertAdd(ObjectRingBuffer rb, Object newHead, int expectedSize, Object expectedHead) {
+        assertTrue(rb.add(newHead));
+        assertNotEmpty(rb, expectedSize, expectedHead);
+    }
+
+    private void assertOffer(ObjectRingBuffer rb, Object newHead, int expectedSize, Object expectedHead) {
+        assertTrue(rb.offer(newHead));
+        assertNotEmpty(rb, expectedSize, expectedHead);
+    }
+
+    private void assertPoll(ObjectRingBuffer rb, int expectedSize, Object expectedHead) {
+        assertNotEmpty(rb, expectedSize, expectedHead);
+        assertEquals(expectedHead, rb.poll(SENTINEL));
+    }
+
+    private void assertRemove(ObjectRingBuffer rb, int expectedSize, Object expectedHead) {
+        assertNotEmpty(rb, expectedSize, expectedHead);
+        try {
+            assertEquals(expectedHead, rb.remove());
+        } catch (NoSuchElementException x) {
+            fail("queue should not be empty");
+        }
+    }
+
+    private void assertContents(ObjectRingBuffer rb, Object... expectedData) {
+        final Object[] data = rb.getAll();
+        assertEquals(data.length, expectedData.length);
+        for (int ii = 0; ii < data.length; ii++) {
+            assertEquals(data[ii], expectedData[ii]);
+        }
+    }
+
+    private void assertArrayEquals(Object[] data, Object... expectedData) {
+        assertEquals(data.length, expectedData.length);
+        for (int ii = 0; ii < data.length; ii++) {
+            assertEquals(data[ii], expectedData[ii]);
+        }
+    }
+
+    Object A = 'A';
+    Object B = 'B';
+    Object C = 'C';
+    Object D = 'D';
+    Object E = 'E';
+    Object F = 'F';
+
+    public void testAddRemove() {
+
+        ObjectRingBuffer rb = new ObjectRingBuffer(3);
+
+        assertEmpty(rb);
+
+        assertAdd(rb, A, 1, A);
+        assertAdd(rb, B, 2, A);
+        assertAdd(rb, C, 3, A);
+        assertContents(rb, A, B, C);
+
+        assertRemove(rb, 3, A);
+        assertContents(rb, B, C);
+
+        assertRemove(rb, 2, B);
+        assertContents(rb, C);
+
+        assertRemove(rb, 1, C);
+        assertContents(rb);
+
+        assertEmpty(rb);
+
+        assertAdd(rb, A, 1, A);
+        assertAdd(rb, B, 2, A);
+        assertContents(rb, A, B);
+
+        assertRemove(rb, 2, A);
+        assertContents(rb, B);
+
+        assertAdd(rb, C, 2, B);
+        assertContents(rb, B, C);
+
+        assertRemove(rb, 2, B);
+        assertContents(rb, C);
+
+        assertRemove(rb, 1, C);
+        assertContents(rb);
+
+        assertEmpty(rb);
+
+        assertAdd(rb, A, 1, A);
+        assertRemove(rb, 1, A);
+        assertEmpty(rb);
+        assertAdd(rb, B, 1, B);
+        assertRemove(rb, 1, B);
+        assertEmpty(rb);
+        assertAdd(rb, C, 1, C);
+        assertRemove(rb, 1, C);
+        assertEmpty(rb);
+
+        assertAdd(rb, D, 1, D);
+        assertRemove(rb, 1, D);
+        assertEmpty(rb);
+        assertAdd(rb, E, 1, E);
+        assertRemove(rb, 1, E);
+        assertEmpty(rb);
+        assertAdd(rb, F, 1, F);
+        assertRemove(rb, 1, F);
+        assertEmpty(rb);
+
+        assertAdd(rb, A, 1, A);
+        assertAdd(rb, B, 2, A);
+        assertAdd(rb, C, 3, A);
+        assertContents(rb, A, B, C);
+
+        assertAdd(rb, D, 4, A);
+        assertAdd(rb, E, 5, A);
+        assertAdd(rb, F, 6, A);
+        assertContents(rb, A, B, C, D, E, F);
+
+        assertRemove(rb, 6, A);
+        assertRemove(rb, 5, B);
+        assertRemove(rb, 4, C);
+        assertRemove(rb, 3, D);
+        assertRemove(rb, 2, E);
+        assertRemove(rb, 1, F);
+        assertContents(rb);
+        assertEmpty(rb);
+    }
+
+    public void testOfferPoll() {
+        ObjectRingBuffer rb = new ObjectRingBuffer(3);
+
+        assertEmpty(rb);
+
+        assertOffer(rb, A, 1, A);
+        assertOffer(rb, B, 2, A);
+        assertOffer(rb, C, 3, A);
+
+        assertPoll(rb, 3, A);
+        assertPoll(rb, 2, B);
+        assertPoll(rb, 1, C);
+        assertEmpty(rb);
+
+        assertOffer(rb, A, 1, A);
+        assertOffer(rb, B, 2, A);
+        assertPoll(rb, 2, A);
+        assertOffer(rb, C, 2, B);
+        assertPoll(rb, 2, B);
+        assertPoll(rb, 1, C);
+        assertEmpty(rb);
+
+        assertOffer(rb, A, 1, A);
+        assertPoll(rb, 1, A);
+        assertEmpty(rb);
+        assertOffer(rb, B, 1, B);
+        assertPoll(rb, 1, B);
+        assertEmpty(rb);
+        assertOffer(rb, C, 1, C);
+        assertPoll(rb, 1, C);
+        assertEmpty(rb);
+
+        assertOffer(rb, D, 1, D);
+        assertPoll(rb, 1, D);
+        assertEmpty(rb);
+        assertOffer(rb, E, 1, E);
+        assertPoll(rb, 1, E);
+        assertEmpty(rb);
+        assertOffer(rb, F, 1, F);
+        assertPoll(rb, 1, F);
+        assertEmpty(rb);
+
+        assertOffer(rb, A, 1, A);
+        assertOffer(rb, B, 2, A);
+        assertOffer(rb, C, 3, A);
+        assertOffer(rb, D, 4, A);
+
+        assertAdd(rb, E, 5, A); // need one add to grow it from 4 to 8
+        assertOffer(rb, F, 6, A);
+
+        assertPoll(rb, 6, A);
+        assertPoll(rb, 5, B);
+        assertPoll(rb, 4, C);
+        assertPoll(rb, 3, D);
+        assertPoll(rb, 2, E);
+        assertPoll(rb, 1, F);
+        assertEmpty(rb);
+    }
+
+    public void testGrowSimple() {
+        ObjectRingBuffer rb = new ObjectRingBuffer(4);
+
+        assertAdd(rb, A, 1, A);
+        assertAdd(rb, B, 2, A);
+        assertAdd(rb, C, 3, A);
+        assertAdd(rb, D, 4, A);
+        assertFull(rb);
+
+        // remove one so head != 0
+        assertRemove(rb, 4, A);
+
+        assertAdd(rb, E, 4, B);
+        // this will grow; the elements are in a single contiguous block
+        assertAdd(rb, F, 5, B);
+
+        assertRemove(rb, 5, B);
+        assertRemove(rb, 4, C);
+        assertRemove(rb, 3, D);
+        assertRemove(rb, 2, E);
+        assertRemove(rb, 1, F);
+        assertEmpty(rb);
+    }
+
+    public void testGrowComplex() {
+        ObjectRingBuffer rb = new ObjectRingBuffer(5);
+
+        assertAdd(rb, A, 1, A);
+        assertAdd(rb, B, 2, A);
+        assertAdd(rb, C, 3, A);
+        assertRemove(rb, 3, A);
+        assertRemove(rb, 2, B);
+        assertRemove(rb, 1, C);
+        assertEmpty(rb);
+
+        assertAdd(rb, A, 1, A);
+        assertAdd(rb, B, 2, A);
+        assertAdd(rb, C, 3, A);
+        assertAdd(rb, D, 4, A);
+        assertAdd(rb, E, 5, A);
+
+        // this will grow; the elements are in two blocks
+        assertAdd(rb, F, 6, A);
+
+        assertRemove(rb, 6, A);
+        assertRemove(rb, 5, B);
+        assertRemove(rb, 4, C);
+        assertRemove(rb, 3, D);
+        assertRemove(rb, 2, E);
+        assertRemove(rb, 1, F);
+        assertEmpty(rb);
+    }
+
+    public void testIterator() {
+        ObjectRingBuffer rb = new ObjectRingBuffer(3);
+
+        ObjectRingBuffer.Iterator iter = rb.iterator();
+        assertFalse(iter.hasNext());
+
+        assertAdd(rb, A, 1, A);
+        assertAdd(rb, B, 2, A);
+        assertAdd(rb, C, 3, A);
+
+        iter = rb.iterator();
+        assertTrue(iter.hasNext());
+        assertEquals(A, iter.next());
+        assertTrue(iter.hasNext());
+        assertEquals(B, iter.next());
+        assertTrue(iter.hasNext());
+        assertEquals(C, iter.next());
+        assertFalse(iter.hasNext());
+
+        assertRemove(rb, 3, A);
+        assertAdd(rb, D, 3, B);
+
+        iter = rb.iterator();
+        assertTrue(iter.hasNext());
+        assertEquals(B, iter.next());
+        assertTrue(iter.hasNext());
+        assertEquals(C, iter.next());
+        assertTrue(iter.hasNext());
+        assertEquals(D, iter.next());
+        assertFalse(iter.hasNext());
+
+        assertRemove(rb, 3, B);
+
+        iter = rb.iterator();
+        assertEquals(C, iter.next());
+        assertEquals(D, iter.next());
+        assertFalse(iter.hasNext());
+
+        assertAdd(rb, E, 3, C);
+        assertAdd(rb, F, 4, C);
+
+        iter = rb.iterator();
+        assertTrue(iter.hasNext());
+        assertEquals(C, iter.next());
+        assertTrue(iter.hasNext());
+        assertEquals(D, iter.next());
+        assertTrue(iter.hasNext());
+        assertEquals(E, iter.next());
+        assertTrue(iter.hasNext());
+        assertEquals(F, iter.next());
+        assertFalse(iter.hasNext());
+
+        final ObjectRingBuffer.Iterator iterFinal = rb.iterator();
+
+        assertThrows(UnsupportedOperationException.class,
+                iterFinal::remove);
+    }
+
+    public void testBack() {
+        ObjectRingBuffer rb = new ObjectRingBuffer(5);
+
+        assertAdd(rb, A, 1, A);
+        assertEquals(rb.back(), A);
+
+        assertAdd(rb, B, 2, A);
+        assertAdd(rb, C, 3, A);
+        assertEquals(rb.back(), C);
+    }
+
+    public void testBackWhenEmpty() {
+        ObjectRingBuffer rb = new ObjectRingBuffer(5);
+        try {
+            rb.back();
+            fail("expected a NoSuchElement exception");
+        } catch (NoSuchElementException x) {
+            // expected
+        }
+    }
+
+    public void testBackTailIsZero() {
+        ObjectRingBuffer rb = new ObjectRingBuffer(5, false);
+
+        assertAdd(rb, A, 1, A);
+        assertAdd(rb, B, 2, A);
+        assertAdd(rb, C, 3, A);
+        assertAdd(rb, D, 4, A);
+        assertAdd(rb, E, 5, A);
+
+        assertRemove(rb, 5, A);
+        assertAdd(rb, F, 5, B);
+        assertEquals(rb.back(), F);
+    }
+
+    public void testLargeAmounts() {
+        ObjectRingBuffer rb = new ObjectRingBuffer(3);
+
+        for (int i = 0; i < 100; i++)
+            rb.add((Object) i);
+
+        for (int i = 100; i < 200; i++) {
+            rb.add((Object) i);
+            assertEquals((Object) (i - 100 + 1), rb.front(1));
+            assertEquals((Object) (i - 100), rb.poll(SENTINEL));
+        }
+
+        for (int i = 200; i < 300; i++) {
+            if (i < 299)
+                assertEquals((Object) (i - 100 + 1), rb.front(1));
+            assertEquals((Object) (i - 100), rb.poll(SENTINEL));
+        }
+    }
+
+    public void testAddExceptionWhenFull() {
+        ObjectRingBuffer rb = new ObjectRingBuffer(4, false);
+        assert (rb.add(A));
+        assert (rb.add(B));
+        assert (rb.add(C));
+        assert (rb.add(D));
+
+        // this should throw
+        assertThrows(UnsupportedOperationException.class,
+                () -> rb.add(E));
+    }
+
+    public void testAddOverwriteAndOffer() {
+        ObjectRingBuffer rb = new ObjectRingBuffer(4, false);
+        assert (4 == rb.remaining());
+
+        assert (F == rb.addOverwrite(A, F));
+        assert (3 == rb.remaining());
+
+        assert (F == rb.addOverwrite(B, F));
+        assert (2 == rb.remaining());
+
+        assert (F == rb.addOverwrite(C, F));
+        assert (1 == rb.remaining());
+
+        assert (F == rb.addOverwrite(D, F));
+        assert (0 == rb.remaining());
+
+        assert (rb.isFull());
+
+        // now full, should return first value
+        assert (A == rb.addOverwrite(E, F));
+        assert (B == rb.addOverwrite(F, F));
+        assert (rb.isFull());
+
+        // offer() testing
+        assert (!rb.offer(A));
+        assert (C == rb.remove());
+        assert (rb.offer(A));
+
+        // peek testing
+        assert (D == rb.front());
+        assert (E == rb.front(1));
+        assert (F == rb.front(2));
+        // this should throw
+        assertThrows(NoSuchElementException.class,
+                () -> rb.front(99));
+
+        assert (A == rb.peekBack(B));
+
+        // clear() testing
+        rb.clear();
+        assert (rb.isEmpty());
+
+        assert (A == rb.peekBack(A));
+    }
+
+
+    public void testMultipleRemove() {
+        ObjectRingBuffer rb = new ObjectRingBuffer(10, false);
+
+        // this should throw
+        assertThrows(NoSuchElementException.class,
+                rb::remove);
+
+        // this should throw
+        assertThrows(NoSuchElementException.class,
+                () -> rb.remove(1));
+
+        rb.add(A);
+        rb.add(B);
+
+        Object[] values = rb.remove(2);
+        assertArrayEquals(values, A, B);
+        assertEmpty(rb);
+
+        rb.add(C);
+        rb.add(D);
+        rb.add(E);
+        rb.add(F);
+
+        values = rb.remove(2);
+        assertArrayEquals(values, C, D);
+
+        values = rb.remove(2);
+        assertArrayEquals(values, E, F);
+        assertEmpty(rb);
+
+        rb.add(A);
+        rb.add(B);
+        rb.add(C);
+        rb.add(D);
+        rb.add(E);
+        rb.add(F);
+
+        values = rb.remove(6);
+        assertArrayEquals(values, A, B, C, D, E, F);
+        assertEmpty(rb);
+    }
+
+    public void testAddRemoveUnsafe() {
+        ObjectRingBuffer rbNoGrow = new ObjectRingBuffer(3, false);
+
+        // this should throw
+        assertThrows(UnsupportedOperationException.class,
+                () -> rbNoGrow.ensureRemaining(10));
+
+        rbNoGrow.ensureRemaining(3);
+        rbNoGrow.addUnsafe(A);
+        rbNoGrow.addUnsafe(B);
+        rbNoGrow.addUnsafe(C);
+
+        assertContents(rbNoGrow, A, B, C);
+
+        assertEquals(rbNoGrow.removeUnsafe(), A);
+        assertContents(rbNoGrow, B, C);
+
+        assertEquals(rbNoGrow.removeUnsafe(), B);
+        assertContents(rbNoGrow, C);
+
+        assertEquals(rbNoGrow.removeUnsafe(), C);
+        assertEmpty(rbNoGrow);
+
+
+        ObjectRingBuffer rbGrow = new ObjectRingBuffer(3, true);
+
+        for (int size = 10; size < 1_000_000; size *= 10) {
+            rbGrow.ensureRemaining(size);
+            assert (rbGrow.remaining() >= size);
+            for (int i = 0; i < size; i++) {
+                rbGrow.addUnsafe(A);
+            }
+        }
+    }
+
+    public void testOverflow() {
+        ObjectRingBuffer rbA = new ObjectRingBuffer(0);
+        // this should throw
+        assertThrows(AssertionFailure.class,
+                () -> rbA.ensureRemaining(ArrayUtil.MAX_ARRAY_SIZE + 1));
+
+        ObjectRingBuffer rbB = new ObjectRingBuffer(100);
+        for (int i = 0; i < 100; i++) {
+            rbB.addUnsafe(A);
+        }
+        // this should throw
+        assertThrows(AssertionFailure.class,
+                () -> rbB.ensureRemaining(ArrayUtil.MAX_ARRAY_SIZE - 100 + 1));
+    }
+}
diff --git a/Base/src/test/java/io/deephaven/base/ringbuffer/TestShortRingBuffer.java b/Base/src/test/java/io/deephaven/base/ringbuffer/TestShortRingBuffer.java
new file mode 100644
index 00000000000..c436efdead7
--- /dev/null
+++ b/Base/src/test/java/io/deephaven/base/ringbuffer/TestShortRingBuffer.java
@@ -0,0 +1,561 @@
+//
+// Copyright (c) 2016-2024 Deephaven Data Labs and Patent Pending
+//
+// ****** AUTO-GENERATED CLASS - DO NOT EDIT MANUALLY
+// ****** Edit TestCharRingBuffer and run "./gradlew replicateRingBuffers" to regenerate
+//
+// @formatter:off
+package io.deephaven.base.ringbuffer;
+
+import io.deephaven.base.ArrayUtil;
+import io.deephaven.base.verify.AssertionFailure;
+import junit.framework.TestCase;
+
+import java.util.NoSuchElementException;
+
+import static org.junit.Assert.assertThrows;
+
+public class TestShortRingBuffer extends TestCase {
+
+    final short SENTINEL = Short.MIN_VALUE;
+
+    private void assertEmpty(ShortRingBuffer rb) {
+        assertTrue(rb.isEmpty());
+        assertEquals(0, rb.size());
+
+        assertEquals(SENTINEL, rb.peek(SENTINEL));
+        try {
+            rb.element();
+            fail("queue should be empty");
+        } catch (NoSuchElementException x) {
+            // expected
+        }
+
+        assertEquals(SENTINEL, rb.poll(SENTINEL));
+        try {
+            rb.remove();
+            fail("queue should be empty");
+        } catch (NoSuchElementException x) {
+            // expected
+        }
+        // region empty-test
+        // endregion empty-test
+    }
+
+    private void assertFull(ShortRingBuffer rb) {
+        assertFalse(rb.isEmpty());
+        assertEquals(rb.capacity(), rb.size());
+    }
+
+    private void assertNotEmpty(ShortRingBuffer rb, int expectedSize, short expectedHead) {
+        assertFalse(rb.isEmpty());
+        assertEquals(expectedSize, rb.size());
+
+        assertEquals(expectedHead, rb.peek(SENTINEL));
+        try {
+            assertEquals(expectedHead, rb.element());
+        } catch (NoSuchElementException x) {
+            fail("queue should not be empty");
+        }
+    }
+
+    private void assertAdd(ShortRingBuffer rb, short newHead, int expectedSize, short expectedHead) {
+        assertTrue(rb.add(newHead));
+        assertNotEmpty(rb, expectedSize, expectedHead);
+    }
+
+    private void assertOffer(ShortRingBuffer rb, short newHead, int expectedSize, short expectedHead) {
+        assertTrue(rb.offer(newHead));
+        assertNotEmpty(rb, expectedSize, expectedHead);
+    }
+
+    private void assertPoll(ShortRingBuffer rb, int expectedSize, short expectedHead) {
+        assertNotEmpty(rb, expectedSize, expectedHead);
+        assertEquals(expectedHead, rb.poll(SENTINEL));
+    }
+
+    private void assertRemove(ShortRingBuffer rb, int expectedSize, short expectedHead) {
+        assertNotEmpty(rb, expectedSize, expectedHead);
+        try {
+            assertEquals(expectedHead, rb.remove());
+        } catch (NoSuchElementException x) {
+            fail("queue should not be empty");
+        }
+    }
+
+    private void assertContents(ShortRingBuffer rb, short... expectedData) {
+        final short[] data = rb.getAll();
+        assertEquals(data.length, expectedData.length);
+        for (int ii = 0; ii < data.length; ii++) {
+            assertEquals(data[ii], expectedData[ii]);
+        }
+    }
+
+    private void assertArrayEquals(short[] data, short... expectedData) {
+        assertEquals(data.length, expectedData.length);
+        for (int ii = 0; ii < data.length; ii++) {
+            assertEquals(data[ii], expectedData[ii]);
+        }
+    }
+
+    short A = 'A';
+    short B = 'B';
+    short C = 'C';
+    short D = 'D';
+    short E = 'E';
+    short F = 'F';
+
+    public void testAddRemove() {
+
+        ShortRingBuffer rb = new ShortRingBuffer(3);
+
+        assertEmpty(rb);
+
+        assertAdd(rb, A, 1, A);
+        assertAdd(rb, B, 2, A);
+        assertAdd(rb, C, 3, A);
+        assertContents(rb, A, B, C);
+
+        assertRemove(rb, 3, A);
+        assertContents(rb, B, C);
+
+        assertRemove(rb, 2, B);
+        assertContents(rb, C);
+
+        assertRemove(rb, 1, C);
+        assertContents(rb);
+
+        assertEmpty(rb);
+
+        assertAdd(rb, A, 1, A);
+        assertAdd(rb, B, 2, A);
+        assertContents(rb, A, B);
+
+        assertRemove(rb, 2, A);
+        assertContents(rb, B);
+
+        assertAdd(rb, C, 2, B);
+        assertContents(rb, B, C);
+
+        assertRemove(rb, 2, B);
+        assertContents(rb, C);
+
+        assertRemove(rb, 1, C);
+        assertContents(rb);
+
+        assertEmpty(rb);
+
+        assertAdd(rb, A, 1, A);
+        assertRemove(rb, 1, A);
+        assertEmpty(rb);
+        assertAdd(rb, B, 1, B);
+        assertRemove(rb, 1, B);
+        assertEmpty(rb);
+        assertAdd(rb, C, 1, C);
+        assertRemove(rb, 1, C);
+        assertEmpty(rb);
+
+        assertAdd(rb, D, 1, D);
+        assertRemove(rb, 1, D);
+        assertEmpty(rb);
+        assertAdd(rb, E, 1, E);
+        assertRemove(rb, 1, E);
+        assertEmpty(rb);
+        assertAdd(rb, F, 1, F);
+        assertRemove(rb, 1, F);
+        assertEmpty(rb);
+
+        assertAdd(rb, A, 1, A);
+        assertAdd(rb, B, 2, A);
+        assertAdd(rb, C, 3, A);
+        assertContents(rb, A, B, C);
+
+        assertAdd(rb, D, 4, A);
+        assertAdd(rb, E, 5, A);
+        assertAdd(rb, F, 6, A);
+        assertContents(rb, A, B, C, D, E, F);
+
+        assertRemove(rb, 6, A);
+        assertRemove(rb, 5, B);
+        assertRemove(rb, 4, C);
+        assertRemove(rb, 3, D);
+        assertRemove(rb, 2, E);
+        assertRemove(rb, 1, F);
+        assertContents(rb);
+        assertEmpty(rb);
+    }
+
+    public void testOfferPoll() {
+        ShortRingBuffer rb = new ShortRingBuffer(3);
+
+        assertEmpty(rb);
+
+        assertOffer(rb, A, 1, A);
+        assertOffer(rb, B, 2, A);
+        assertOffer(rb, C, 3, A);
+
+        assertPoll(rb, 3, A);
+        assertPoll(rb, 2, B);
+        assertPoll(rb, 1, C);
+        assertEmpty(rb);
+
+        assertOffer(rb, A, 1, A);
+        assertOffer(rb, B, 2, A);
+        assertPoll(rb, 2, A);
+        assertOffer(rb, C, 2, B);
+        assertPoll(rb, 2, B);
+        assertPoll(rb, 1, C);
+        assertEmpty(rb);
+
+        assertOffer(rb, A, 1, A);
+        assertPoll(rb, 1, A);
+        assertEmpty(rb);
+        assertOffer(rb, B, 1, B);
+        assertPoll(rb, 1, B);
+        assertEmpty(rb);
+        assertOffer(rb, C, 1, C);
+        assertPoll(rb, 1, C);
+        assertEmpty(rb);
+
+        assertOffer(rb, D, 1, D);
+        assertPoll(rb, 1, D);
+        assertEmpty(rb);
+        assertOffer(rb, E, 1, E);
+        assertPoll(rb, 1, E);
+        assertEmpty(rb);
+        assertOffer(rb, F, 1, F);
+        assertPoll(rb, 1, F);
+        assertEmpty(rb);
+
+        assertOffer(rb, A, 1, A);
+        assertOffer(rb, B, 2, A);
+        assertOffer(rb, C, 3, A);
+        assertOffer(rb, D, 4, A);
+
+        assertAdd(rb, E, 5, A); // need one add to grow it from 4 to 8
+        assertOffer(rb, F, 6, A);
+
+        assertPoll(rb, 6, A);
+        assertPoll(rb, 5, B);
+        assertPoll(rb, 4, C);
+        assertPoll(rb, 3, D);
+        assertPoll(rb, 2, E);
+        assertPoll(rb, 1, F);
+        assertEmpty(rb);
+    }
+
+    public void testGrowSimple() {
+        ShortRingBuffer rb = new ShortRingBuffer(4);
+
+        assertAdd(rb, A, 1, A);
+        assertAdd(rb, B, 2, A);
+        assertAdd(rb, C, 3, A);
+        assertAdd(rb, D, 4, A);
+        assertFull(rb);
+
+        // remove one so head != 0
+        assertRemove(rb, 4, A);
+
+        assertAdd(rb, E, 4, B);
+        // this will grow; the elements are in a single contiguous block
+        assertAdd(rb, F, 5, B);
+
+        assertRemove(rb, 5, B);
+        assertRemove(rb, 4, C);
+        assertRemove(rb, 3, D);
+        assertRemove(rb, 2, E);
+        assertRemove(rb, 1, F);
+        assertEmpty(rb);
+    }
+
+    public void testGrowComplex() {
+        ShortRingBuffer rb = new ShortRingBuffer(5);
+
+        assertAdd(rb, A, 1, A);
+        assertAdd(rb, B, 2, A);
+        assertAdd(rb, C, 3, A);
+        assertRemove(rb, 3, A);
+        assertRemove(rb, 2, B);
+        assertRemove(rb, 1, C);
+        assertEmpty(rb);
+
+        assertAdd(rb, A, 1, A);
+        assertAdd(rb, B, 2, A);
+        assertAdd(rb, C, 3, A);
+        assertAdd(rb, D, 4, A);
+        assertAdd(rb, E, 5, A);
+
+        // this will grow; the elements are in two blocks
+        assertAdd(rb, F, 6, A);
+
+        assertRemove(rb, 6, A);
+        assertRemove(rb, 5, B);
+        assertRemove(rb, 4, C);
+        assertRemove(rb, 3, D);
+        assertRemove(rb, 2, E);
+        assertRemove(rb, 1, F);
+        assertEmpty(rb);
+    }
+
+    public void testIterator() {
+        ShortRingBuffer rb = new ShortRingBuffer(3);
+
+        ShortRingBuffer.Iterator iter = rb.iterator();
+        assertFalse(iter.hasNext());
+
+        assertAdd(rb, A, 1, A);
+        assertAdd(rb, B, 2, A);
+        assertAdd(rb, C, 3, A);
+
+        iter = rb.iterator();
+        assertTrue(iter.hasNext());
+        assertEquals(A, iter.next());
+        assertTrue(iter.hasNext());
+        assertEquals(B, iter.next());
+        assertTrue(iter.hasNext());
+        assertEquals(C, iter.next());
+        assertFalse(iter.hasNext());
+
+        assertRemove(rb, 3, A);
+        assertAdd(rb, D, 3, B);
+
+        iter = rb.iterator();
+        assertTrue(iter.hasNext());
+        assertEquals(B, iter.next());
+        assertTrue(iter.hasNext());
+        assertEquals(C, iter.next());
+        assertTrue(iter.hasNext());
+        assertEquals(D, iter.next());
+        assertFalse(iter.hasNext());
+
+        assertRemove(rb, 3, B);
+
+        iter = rb.iterator();
+        assertEquals(C, iter.next());
+        assertEquals(D, iter.next());
+        assertFalse(iter.hasNext());
+
+        assertAdd(rb, E, 3, C);
+        assertAdd(rb, F, 4, C);
+
+        iter = rb.iterator();
+        assertTrue(iter.hasNext());
+        assertEquals(C, iter.next());
+        assertTrue(iter.hasNext());
+        assertEquals(D, iter.next());
+        assertTrue(iter.hasNext());
+        assertEquals(E, iter.next());
+        assertTrue(iter.hasNext());
+        assertEquals(F, iter.next());
+        assertFalse(iter.hasNext());
+
+        final ShortRingBuffer.Iterator iterFinal = rb.iterator();
+
+        assertThrows(UnsupportedOperationException.class,
+                iterFinal::remove);
+    }
+
+    public void testBack() {
+        ShortRingBuffer rb = new ShortRingBuffer(5);
+
+        assertAdd(rb, A, 1, A);
+        assertEquals(rb.back(), A);
+
+        assertAdd(rb, B, 2, A);
+        assertAdd(rb, C, 3, A);
+        assertEquals(rb.back(), C);
+    }
+
+    public void testBackWhenEmpty() {
+        ShortRingBuffer rb = new ShortRingBuffer(5);
+        try {
+            rb.back();
+            fail("expected a NoSuchElement exception");
+        } catch (NoSuchElementException x) {
+            // expected
+        }
+    }
+
+    public void testBackTailIsZero() {
+        ShortRingBuffer rb = new ShortRingBuffer(5, false);
+
+        assertAdd(rb, A, 1, A);
+        assertAdd(rb, B, 2, A);
+        assertAdd(rb, C, 3, A);
+        assertAdd(rb, D, 4, A);
+        assertAdd(rb, E, 5, A);
+
+        assertRemove(rb, 5, A);
+        assertAdd(rb, F, 5, B);
+        assertEquals(rb.back(), F);
+    }
+
+    public void testLargeAmounts() {
+        ShortRingBuffer rb = new ShortRingBuffer(3);
+
+        for (int i = 0; i < 100; i++)
+            rb.add((short) i);
+
+        for (int i = 100; i < 200; i++) {
+            rb.add((short) i);
+            assertEquals((short) (i - 100 + 1), rb.front(1));
+            assertEquals((short) (i - 100), rb.poll(SENTINEL));
+        }
+
+        for (int i = 200; i < 300; i++) {
+            if (i < 299)
+                assertEquals((short) (i - 100 + 1), rb.front(1));
+            assertEquals((short) (i - 100), rb.poll(SENTINEL));
+        }
+    }
+
+    public void testAddExceptionWhenFull() {
+        ShortRingBuffer rb = new ShortRingBuffer(4, false);
+        assert (rb.add(A));
+        assert (rb.add(B));
+        assert (rb.add(C));
+        assert (rb.add(D));
+
+        // this should throw
+        assertThrows(UnsupportedOperationException.class,
+                () -> rb.add(E));
+    }
+
+    public void testAddOverwriteAndOffer() {
+        ShortRingBuffer rb = new ShortRingBuffer(4, false);
+        assert (4 == rb.remaining());
+
+        assert (F == rb.addOverwrite(A, F));
+        assert (3 == rb.remaining());
+
+        assert (F == rb.addOverwrite(B, F));
+        assert (2 == rb.remaining());
+
+        assert (F == rb.addOverwrite(C, F));
+        assert (1 == rb.remaining());
+
+        assert (F == rb.addOverwrite(D, F));
+        assert (0 == rb.remaining());
+
+        assert (rb.isFull());
+
+        // now full, should return first value
+        assert (A == rb.addOverwrite(E, F));
+        assert (B == rb.addOverwrite(F, F));
+        assert (rb.isFull());
+
+        // offer() testing
+        assert (!rb.offer(A));
+        assert (C == rb.remove());
+        assert (rb.offer(A));
+
+        // peek testing
+        assert (D == rb.front());
+        assert (E == rb.front(1));
+        assert (F == rb.front(2));
+        // this should throw
+        assertThrows(NoSuchElementException.class,
+                () -> rb.front(99));
+
+        assert (A == rb.peekBack(B));
+
+        // clear() testing
+        rb.clear();
+        assert (rb.isEmpty());
+
+        assert (A == rb.peekBack(A));
+    }
+
+
+    public void testMultipleRemove() {
+        ShortRingBuffer rb = new ShortRingBuffer(10, false);
+
+        // this should throw
+        assertThrows(NoSuchElementException.class,
+                rb::remove);
+
+        // this should throw
+        assertThrows(NoSuchElementException.class,
+                () -> rb.remove(1));
+
+        rb.add(A);
+        rb.add(B);
+
+        short[] values = rb.remove(2);
+        assertArrayEquals(values, A, B);
+        assertEmpty(rb);
+
+        rb.add(C);
+        rb.add(D);
+        rb.add(E);
+        rb.add(F);
+
+        values = rb.remove(2);
+        assertArrayEquals(values, C, D);
+
+        values = rb.remove(2);
+        assertArrayEquals(values, E, F);
+        assertEmpty(rb);
+
+        rb.add(A);
+        rb.add(B);
+        rb.add(C);
+        rb.add(D);
+        rb.add(E);
+        rb.add(F);
+
+        values = rb.remove(6);
+        assertArrayEquals(values, A, B, C, D, E, F);
+        assertEmpty(rb);
+    }
+
+    public void testAddRemoveUnsafe() {
+        ShortRingBuffer rbNoGrow = new ShortRingBuffer(3, false);
+
+        // this should throw
+        assertThrows(UnsupportedOperationException.class,
+                () -> rbNoGrow.ensureRemaining(10));
+
+        rbNoGrow.ensureRemaining(3);
+        rbNoGrow.addUnsafe(A);
+        rbNoGrow.addUnsafe(B);
+        rbNoGrow.addUnsafe(C);
+
+        assertContents(rbNoGrow, A, B, C);
+
+        assertEquals(rbNoGrow.removeUnsafe(), A);
+        assertContents(rbNoGrow, B, C);
+
+        assertEquals(rbNoGrow.removeUnsafe(), B);
+        assertContents(rbNoGrow, C);
+
+        assertEquals(rbNoGrow.removeUnsafe(), C);
+        assertEmpty(rbNoGrow);
+
+
+        ShortRingBuffer rbGrow = new ShortRingBuffer(3, true);
+
+        for (int size = 10; size < 1_000_000; size *= 10) {
+            rbGrow.ensureRemaining(size);
+            assert (rbGrow.remaining() >= size);
+            for (int i = 0; i < size; i++) {
+                rbGrow.addUnsafe(A);
+            }
+        }
+    }
+
+    public void testOverflow() {
+        ShortRingBuffer rbA = new ShortRingBuffer(0);
+        // this should throw
+        assertThrows(AssertionFailure.class,
+                () -> rbA.ensureRemaining(ArrayUtil.MAX_ARRAY_SIZE + 1));
+
+        ShortRingBuffer rbB = new ShortRingBuffer(100);
+        for (int i = 0; i < 100; i++) {
+            rbB.addUnsafe(A);
+        }
+        // this should throw
+        assertThrows(AssertionFailure.class,
+                () -> rbB.ensureRemaining(ArrayUtil.MAX_ARRAY_SIZE - 100 + 1));
+    }
+}
diff --git a/BenchmarkSupport/BenchmarkSupport.gradle b/BenchmarkSupport/BenchmarkSupport.gradle
index 77fc4fd9b50..d9e0a7dab27 100644
--- a/BenchmarkSupport/BenchmarkSupport.gradle
+++ b/BenchmarkSupport/BenchmarkSupport.gradle
@@ -2,14 +2,6 @@ plugins {
     id 'io.deephaven.project.register'
 }
 
-configurations {
-    implementation.extendsFrom dhBenchmarkSupport
-
-    testImplementation.extendsFrom fishIoTest
-
-    testRuntimeOnly.extendsFrom fishDataGenerator
-}
-
 sourceSets {
     main {
         java {
@@ -32,14 +24,17 @@ dependencies {
     implementation project(':extensions-parquet-table')
     implementation project(':extensions-parquet-base')
     implementation project(':Configuration')
-    implementation 'org.openjdk.jmh:jmh-core:1.20'
+    implementation libs.jmh.core
+
+    implementation libs.univocity.parsers
 
     testImplementation project(':engine-test-utils')
+    testImplementation project(path: ':Base', configuration: 'tests')
 
     testRuntimeOnly project(path: ':configs')
     testRuntimeOnly project(path: ':test-configs')
     testRuntimeOnly project(':Numerics')
 
     testRuntimeOnly project(':log-to-slf4j')
-    Classpaths.inheritSlf4j(project, 'slf4j-simple', 'testRuntimeOnly')
+    testRuntimeOnly libs.slf4j.simple
 }
diff --git a/BenchmarkSupport/src/main/java/io/deephaven/benchmarking/generator/EnumStringGenerator.java b/BenchmarkSupport/src/main/java/io/deephaven/benchmarking/generator/EnumStringGenerator.java
index 0217bdd9040..b313b8c1d80 100644
--- a/BenchmarkSupport/src/main/java/io/deephaven/benchmarking/generator/EnumStringGenerator.java
+++ b/BenchmarkSupport/src/main/java/io/deephaven/benchmarking/generator/EnumStringGenerator.java
@@ -3,7 +3,6 @@
 //
 package io.deephaven.benchmarking.generator;
 
-import io.deephaven.datastructures.util.CollectionUtil;
 import io.deephaven.benchmarking.generator.random.ExtendedRandom;
 import org.jetbrains.annotations.NotNull;
 
@@ -50,7 +49,7 @@ public void init(@NotNull ExtendedRandom random) {
             enums.add(super.get());
         }
 
-        enumVals = enums.toArray(CollectionUtil.ZERO_LENGTH_STRING_ARRAY);
+        enumVals = enums.toArray(String[]::new);
     }
 
     public String get() {
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index ee7139bbf00..39aea6d0072 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -31,7 +31,7 @@ Over time, forks will get out of sync with the upstream repository.  To stay up
 * Follow these directions on [Syncing A Fork](https://docs.github.com/en/github/collaborating-with-issues-and-pull-requests/syncing-a-fork).
 
 ## Building and Running
-For instructions on building and running, see [Build and launch from source](https://deephaven.io/core/docs/how-to-guides/launch-build/).
+For instructions on building and running, see [Build and launch from source](https://deephaven.io/core/docs/getting-started/launch-build/).
 
 ## Creating a Pull Request
 Pull requests can be created through the GitHub website or through the GitHub CLI.
diff --git a/ClientSupport/ClientSupport.gradle b/ClientSupport/ClientSupport.gradle
index b4b426ef3c2..091a7200751 100644
--- a/ClientSupport/ClientSupport.gradle
+++ b/ClientSupport/ClientSupport.gradle
@@ -2,24 +2,20 @@ plugins {
     id 'io.deephaven.project.register'
 }
 
-configurations {
-    implementation.extendsFrom dhConsole
-}
-
 dependencies {
     implementation project(':engine-table')
     implementation project(':engine-function')
     implementation project(':log-factory')
     implementation project(':Configuration')
-    implementation depCommonsLang3
+    implementation libs.commons.lang3
 
     testImplementation project(':engine-test-utils')
-    Classpaths.inheritJUnitClassic(project, 'testImplementation')
-    Classpaths.inheritJUnitPlatform(project)
-    Classpaths.inheritAssertJ(project)
+    testImplementation libs.junit4
+    testImplementation platform(libs.junit.bom)
+    testImplementation libs.assertj
 
     testRuntimeOnly project(':log-to-slf4j'),
             project(path: ':configs'),
             project(path: ':test-configs')
-    Classpaths.inheritSlf4j(project, 'slf4j-simple', 'testRuntimeOnly')
+    testRuntimeOnly libs.slf4j.simple
 }
diff --git a/Configuration/build.gradle b/Configuration/build.gradle
index c804e169f7b..0a24f6759b5 100644
--- a/Configuration/build.gradle
+++ b/Configuration/build.gradle
@@ -1,22 +1,27 @@
 plugins {
+    id 'java-library'
     id 'io.deephaven.project.register'
 }
 
 dependencies {
+    api libs.trove
+
     implementation project(':Base')
-    implementation project(':DataStructures')
     implementation project(':IO')
     implementation project(':log-factory')
-    implementation depCommonsLang3
-    Classpaths.inheritJUnitClassic(project, 'testImplementation')
-    Classpaths.inheritJMock(project, 'testImplementation')
+    implementation libs.commons.lang3
+    testImplementation libs.junit4
+    testImplementation libs.jmock.junit4
+    testImplementation libs.jmock.imposters
 
-    Classpaths.inheritAutoService(project)
+    compileOnly libs.autoservice
+    annotationProcessor libs.autoservice.compiler
 
     testImplementation project(path: ':Base', configuration: 'tests')
+    testImplementation libs.commons.compress
 
     testRuntimeOnly project(':log-to-slf4j')
-    Classpaths.inheritSlf4j(project, 'slf4j-simple', 'testRuntimeOnly')
+    testRuntimeOnly libs.slf4j.simple
 }
 
 sourceSets {
diff --git a/Configuration/gradle.properties b/Configuration/gradle.properties
index c186bbfdde1..9e8588f2620 100644
--- a/Configuration/gradle.properties
+++ b/Configuration/gradle.properties
@@ -1 +1,2 @@
 io.deephaven.project.ProjectType=JAVA_PUBLIC
+languageLevel=8
diff --git a/Configuration/src/main/java/io/deephaven/configuration/CacheDir.java b/Configuration/src/main/java/io/deephaven/configuration/CacheDir.java
index 40441103898..ad403708959 100644
--- a/Configuration/src/main/java/io/deephaven/configuration/CacheDir.java
+++ b/Configuration/src/main/java/io/deephaven/configuration/CacheDir.java
@@ -4,6 +4,7 @@
 package io.deephaven.configuration;
 
 import java.nio.file.Path;
+import java.nio.file.Paths;
 import java.util.Optional;
 
 /**
@@ -30,9 +31,8 @@ public final class CacheDir {
      * @return the cache dir
      */
     public static Path get() {
-        return viaProperty()
-                .or(CacheDir::viaEnvVar)
-                .map(Path::of)
+        return getOptional()
+                .map(Paths::get)
                 .orElseGet(CacheDir::viaTmpDir);
     }
 
@@ -45,12 +45,20 @@ public static Path get() {
      * @return the cache directory
      */
     public static Path getOrSet(String defaultValue) {
-        final String existing = viaProperty().or(CacheDir::viaEnvVar).orElse(null);
+        final String existing = getOptional().orElse(null);
         if (existing != null) {
-            return Path.of(existing);
+            return Paths.get(existing);
         }
         System.setProperty(PROPERTY, defaultValue);
-        return Path.of(defaultValue);
+        return Paths.get(defaultValue);
+    }
+
+    private static Optional<String> getOptional() {
+        Optional<String> optional = viaProperty();
+        if (!optional.isPresent()) {
+            optional = viaEnvVar();
+        }
+        return optional;
     }
 
     private static Optional<String> viaProperty() {
@@ -62,6 +70,6 @@ private static Optional<String> viaEnvVar() {
     }
 
     private static Path viaTmpDir() {
-        return Path.of(System.getProperty(JAVA_IO_TMPDIR), "deephaven", "cache");
+        return Paths.get(System.getProperty(JAVA_IO_TMPDIR), "deephaven", "cache");
     }
 }
diff --git a/Configuration/src/main/java/io/deephaven/configuration/ConfigDir.java b/Configuration/src/main/java/io/deephaven/configuration/ConfigDir.java
index bd1f5afb083..8c1a2aca2b4 100644
--- a/Configuration/src/main/java/io/deephaven/configuration/ConfigDir.java
+++ b/Configuration/src/main/java/io/deephaven/configuration/ConfigDir.java
@@ -5,6 +5,7 @@
 
 import java.nio.file.Files;
 import java.nio.file.Path;
+import java.nio.file.Paths;
 import java.util.Optional;
 
 public final class ConfigDir {
@@ -21,9 +22,7 @@ public final class ConfigDir {
      * @return the config directory
      */
     public static Optional<Path> get() {
-        return viaProperty()
-                .or(ConfigDir::viaEnvVar)
-                .map(Path::of);
+        return getOptional().map(Paths::get);
     }
 
     /**
@@ -35,14 +34,12 @@ public static Optional<Path> get() {
      * @return the config directory
      */
     public static Path getOrSet(String defaultValue) {
-        final String existing = viaProperty()
-                .or(ConfigDir::viaEnvVar)
-                .orElse(null);
+        final String existing = getOptional().orElse(null);
         if (existing != null) {
-            return Path.of(existing);
+            return Paths.get(existing);
         }
         System.setProperty(PROPERTY, defaultValue);
-        return Path.of(defaultValue);
+        return Paths.get(defaultValue);
     }
 
     /**
@@ -53,10 +50,11 @@ public static Path getOrSet(String defaultValue) {
      * @return the configuration file
      */
     public static String configurationFile() {
-        return Optional
-                .ofNullable(System.getProperty(ROOT_FILE_PROP))
-                .or(ConfigDir::configDirectoryFileIfExists)
-                .orElse(DEFAULT_CONFIGURATION_FILE);
+        Optional<String> optional = Optional.ofNullable(System.getProperty(ROOT_FILE_PROP));
+        if (!optional.isPresent()) {
+            optional = configDirectoryFileIfExists();
+        }
+        return optional.orElse(DEFAULT_CONFIGURATION_FILE);
     }
 
     private static Optional<String> configDirectoryFileIfExists() {
@@ -66,6 +64,14 @@ private static Optional<String> configDirectoryFileIfExists() {
                 .map(Path::toString);
     }
 
+    private static Optional<String> getOptional() {
+        Optional<String> optional = viaProperty();
+        if (!optional.isPresent()) {
+            optional = viaEnvVar();
+        }
+        return optional;
+    }
+
     private static Path defaultFileName(Path p) {
         return p.resolve(DEFAULT_CONFIG_FILE_NAME);
     }
diff --git a/Configuration/src/main/java/io/deephaven/configuration/Configuration.java b/Configuration/src/main/java/io/deephaven/configuration/Configuration.java
index 49933a696a5..ffc6f4d541b 100644
--- a/Configuration/src/main/java/io/deephaven/configuration/Configuration.java
+++ b/Configuration/src/main/java/io/deephaven/configuration/Configuration.java
@@ -4,54 +4,186 @@
 package io.deephaven.configuration;
 
 import io.deephaven.internal.log.Bootstrap;
-import io.deephaven.io.logger.Logger;
 import io.deephaven.internal.log.LoggerFactory;
+import io.deephaven.io.logger.Logger;
 import org.jetbrains.annotations.NotNull;
 
-import java.io.*;
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.IOException;
+import java.io.PrintWriter;
 import java.time.ZoneId;
 import java.util.*;
+import java.util.concurrent.ConcurrentHashMap;
+import java.util.function.Supplier;
 
 /**
  * Utility class to provide an enhanced view and common access point for java properties files, as well as common
  * configuration pieces.
  */
 @SuppressWarnings({"WeakerAccess", "unused"})
-public class Configuration extends PropertyFile {
-
+public abstract class Configuration extends PropertyFile {
     public static final String QUIET_PROPERTY = "configuration.quiet";
 
-    private static NullableConfiguration INSTANCE = null;
-
     private static final Logger log = LoggerFactory.getLogger(Configuration.class);
 
+    private static Configuration DEFAULT;
+    private static final Map<String, Configuration> NAMED_CONFIGURATIONS = new ConcurrentHashMap<>();
+    private final Supplier<ConfigurationContext> contextSupplier;
+
     // This should never be null to meet the contract for getContextKeyValues()
     private Collection<String> contextKeys = Collections.emptySet();
 
+    /**
+     * The default Configuration implementation, which loads properties from the default property file in addition to
+     * System properties.
+     */
+    private static class Default extends Configuration {
+        Default(@NotNull final Supplier<ConfigurationContext> contextSupplier) {
+            super(contextSupplier);
+            init();
+        }
+
+        @Override
+        protected String determinePropertyFile() {
+            return ConfigDir.configurationFile();
+        }
+
+        @SuppressWarnings("unused")
+        public String getPropertyNullable(String propertyName) {
+            return properties.getProperty(propertyName);
+        }
+    }
+
+    /**
+     * A Named configuration that loads values from the file defined by the property `Configuration.name.rootFile`.
+     */
+    private static class Named extends Configuration {
+        private final String name;
+
+        Named(@NotNull final String name, @NotNull final Supplier<ConfigurationContext> contextSupplier) {
+            super(contextSupplier);
+            this.name = name;
+            init();
+        }
+
+        @Override
+        protected String determinePropertyFile() {
+            final String propFile = System.getProperty("Configuration." + name + ".rootFile");
+            if (propFile == null) {
+                throw new ConfigurationException("No property file defined for named configuration " + name);
+            }
+
+            return propFile;
+        }
+    }
+
     /**
      * Get the default Configuration instance.
      *
      * @return the single instance of Configuration allowed in an application
      */
     public static Configuration getInstance() {
-        if (INSTANCE == null) {
-            INSTANCE = new NullableConfiguration();
+        if (DEFAULT == null) {
+            DEFAULT = new Default(DefaultConfigurationContext::new);
         }
-        return INSTANCE;
+        return DEFAULT;
+    }
+
+    /**
+     * Get the {@link Configuration} for the specified name.
+     *
+     * @param name the name of the configuration to load
+     * @return the named configuration.
+     * @throws ConfigurationException if the named configuration could not be loaded.
+     */
+    public static Configuration getNamed(@NotNull final String name) throws ConfigurationException {
+        return NAMED_CONFIGURATIONS.computeIfAbsent(name, (k) -> {
+            try {
+                return new Named(name, DefaultConfigurationContext::new);
+            } catch (ConfigurationException ex) {
+                throw new ConfigurationException("Unable to load named configuration " + name, ex);
+            }
+        });
+    }
+
+    /**
+     * Clear all currently loaded Configurations so that they may be loaded anew.
+     */
+    public static void reset() {
+        DEFAULT = null;
+        NAMED_CONFIGURATIONS.clear();
+    }
+
+    /**
+     * Clear the specified named Configuration so it may be loaded anew.
+     *
+     * @param name the Configuration to clear.
+     */
+    public static void reset(@NotNull final String name) {
+        NAMED_CONFIGURATIONS.remove(name);
+    }
+
+    /**
+     * Create a new, non-cached, default Configuration instance.
+     *
+     * @return a new Configuration instance, guaranteed to not be cached.
+     */
+    public static Configuration newStandaloneConfiguration() {
+        return newStandaloneConfiguration(DefaultConfigurationContext::new);
+    }
+
+    /**
+     * Create a new, non-cached, default Configuration instance.
+     *
+     * @param contextSupplier the supplier for {@link ConfigurationContext}
+     * @return a new Configuration instance, guaranteed to not be cached.
+     */
+    public static Configuration newStandaloneConfiguration(
+            @NotNull final Supplier<ConfigurationContext> contextSupplier) {
+        return new Default(contextSupplier);
+    }
+
+    /**
+     * Create a new, non-cached, named Configuration instance.
+     *
+     * @param name the configuration name
+     * @return a new Configuration instance, guaranteed to not be cached.
+     */
+    public static Configuration newStandaloneConfiguration(@NotNull final String name) {
+        return newStandaloneConfiguration(name, DefaultConfigurationContext::new);
     }
 
+    /**
+     * Create a new, non-cached, named Configuration instance.
+     *
+     * @param name the configuration name
+     * @param contextSupplier the supplier for {@link ConfigurationContext}
+     * @return a new Configuration instance, guaranteed to not be cached.
+     */
     @SuppressWarnings("UnusedReturnValue")
-    public static Configuration newConfigurationForTesting() {
-        return new Configuration();
+    public static Configuration newStandaloneConfiguration(
+            @NotNull final String name,
+            @NotNull final Supplier<ConfigurationContext> contextSupplier) {
+        return new Named(name, contextSupplier);
+    }
+
+    protected Configuration(@NotNull final Supplier<ConfigurationContext> contextSupplier) {
+        this.contextSupplier = contextSupplier;
     }
 
-    protected Configuration() {
+    /**
+     * Initialize the configuration. This will be sensitive to any system properties that configure the property file
+     * path.
+     */
+    protected void init() {
         final String configurationFile;
         try {
             configurationFile = reloadProperties();
         } catch (IOException x) {
             throw new ConfigurationException("Could not process configuration from file", x);
         }
+
         // The quiet property is available because things like shell scripts may be parsing our System.out and they
         // don't want to have to deal with these log messages
         if (!isQuiet()) {
@@ -68,7 +200,7 @@ protected Configuration() {
      * @throws ConfigurationException if the property stream cannot be opened
      */
     private void load(String fileName, boolean ignoreScope) throws IOException, ConfigurationException {
-        final ParsedProperties temp = new ParsedProperties(ignoreScope);
+        final ParsedProperties temp = new ParsedProperties(ignoreScope, contextSupplier.get());
         // we explicitly want to set 'properties' here so that if we get an error while loading, anything before that
         // error shows up.
         // That is very helpful in debugging.
@@ -175,6 +307,8 @@ public String reloadProperties() throws IOException, ConfigurationException {
         return reloadProperties(false);
     }
 
+    protected abstract String determinePropertyFile();
+
     /**
      * Reload properties, optionally ignoring scope sections - used for testing
      *
@@ -184,7 +318,7 @@ public String reloadProperties() throws IOException, ConfigurationException {
      * @throws ConfigurationException if the property stream cannot be opened
      */
     String reloadProperties(boolean ignoreScope) throws IOException, ConfigurationException {
-        final String propertyFile = ConfigDir.configurationFile();
+        final String propertyFile = determinePropertyFile();
         load(propertyFile, ignoreScope);
         // If any system properties exist with the same name as a property that's been declared final, that will
         // generate an exception the same way it would inside the properties file.
@@ -192,23 +326,6 @@ String reloadProperties(boolean ignoreScope) throws IOException, ConfigurationEx
         return propertyFile;
     }
 
-    /**
-     * ONLY the service factory is allowed to get null properties and ONLY for the purposes of using default profiles
-     * when one doesn't exist. This has been relocated here after many people are using defaults/nulls in the code when
-     * it's not allowed.
-     */
-    @SuppressWarnings("WeakerAccess")
-    public static class NullableConfiguration extends Configuration {
-        NullableConfiguration() {
-            super();
-        }
-
-        @SuppressWarnings("unused")
-        public String getPropertyNullable(String propertyName) {
-            return properties.getProperty(propertyName);
-        }
-    }
-
     // only used by main() method below, normally configs are loaded from the classpath
     private Properties load(String path, String propFileName) throws IOException {
         final Properties temp = new ParsedProperties();
@@ -216,7 +333,6 @@ private Properties load(String path, String propFileName) throws IOException {
         return temp;
     }
 
-
     /**
      * The following main method compares two directories of prop files and outputs a CSV report of the differences.
      * Usually run before the release of a new version into prod
@@ -257,7 +373,7 @@ public static void main(String[] args) {
     private static String propFileDiffReport(Set<String> includedProperties, String dir1, String file1, String dir2,
             String file2, String dir3, String file3, boolean useDiffKeys) throws IOException {
         StringBuilder out = new StringBuilder();
-        Configuration configuration = new Configuration();
+        Configuration configuration = new Default(DefaultConfigurationContext::new);
         Properties leftProperties = configuration.load(dir1, file1);
         Properties rightProperties = configuration.load(dir2, file2);
         Properties right2Properties;
diff --git a/Configuration/src/main/java/io/deephaven/configuration/ConfigurationContext.java b/Configuration/src/main/java/io/deephaven/configuration/ConfigurationContext.java
index e9becf5f777..73d27453da5 100644
--- a/Configuration/src/main/java/io/deephaven/configuration/ConfigurationContext.java
+++ b/Configuration/src/main/java/io/deephaven/configuration/ConfigurationContext.java
@@ -3,132 +3,27 @@
 //
 package io.deephaven.configuration;
 
-import java.net.InetAddress;
-import java.net.UnknownHostException;
-import java.util.*;
+import java.util.Collection;
+import java.util.List;
 
 /**
- * A class for determining the environment that a configuration is running within.
+ * An interface for classes that determine the environment a {@link Configuration} is running within.
  */
-class ConfigurationContext {
-    // Note that we explicitly use 'host' as a value in the configuration files.
-    // If a system property named 'host' exists, it will be ignored.
-    private static final String HOSTNAME = "host";
-    // Note that we explicitly allow the use of 'process' as a shorthand for 'process.name' in the configuration files.
-    // If a system property named 'process' exists, it will be ignored in favor of 'process.name'.
-    static final String PROCESS_NAME_PROPERTY = "process";
-
-    final private Map<String, String> contextItems;
-    final private Collection<String> hostOptions;
-
-    /**
-     * Create a ConfigurationContext and preload the non-system tokens.
-     */
-    public ConfigurationContext() {
-        contextItems = new HashMap<>();
-        hostOptions = new ArrayList<>();
-        contextItems.put(PROCESS_NAME_PROPERTY, getSystemProperty("process.name"));
-    }
-
+public interface ConfigurationContext {
     /**
      * Check whether the current system context matches one of the requested values in the specified scope
-     * 
+     *
      * @param token The name of the property to check
      * @param targetValues A list of possible values for the specified property, such as 'process.name=foo'
      * @return True if the specified property currently has a value equal to one of the target values, false otherwise.
      */
-    public boolean matches(final String token, final List<String> targetValues) {
-        // Mostly this is just checking system properties, but we also have one special case; the hostname is allowed to
-        // be several different potential values (short name, FQDN, etc), so we have to check that separately.
-        if (token.toLowerCase().equals(HOSTNAME)) {
-            if (hostOptions.isEmpty()) {
-                populateHostnames();
-            }
-            for (String aHostName : hostOptions) {
-                if (targetValues.contains(aHostName.toLowerCase()))
-                    return true;
-            }
-            return false;
-        } else {
-            // check that the token value in the context matches for the current scope item
-            final String contextValue = getContextItem(token);
-            if (contextValue == null)
-                return false;
-            return targetValues.contains(contextValue);
-        }
-    }
-
-    /**
-     * Retrieve a specified context item. These are usually but not necessarily system properties or a small number of
-     * other environmental factors.
-     * 
-     * @param token The name of the context item to look up.
-     * @return The current value of the specified context item, or null if no value exists.
-     */
-    private String getContextItem(final String token) {
-        if (contextItems.containsKey(token)) {
-            return contextItems.get(token);
-        }
-        // If we don't have an existing context item by this name, see if we have a matching system property
-        return getSystemProperty(token);
-    }
-
-    /**
-     * Get the hostname of the current system where this is running, along with the IP address and fully-qualified name.
-     */
-    private void populateHostnames() {
-        try {
-            final InetAddress address = InetAddress.getLocalHost();
-            // allow the machine to be identified by its hostname
-            final String hostName = address.getHostName();
-            hostOptions.add(hostName);
-
-            // Allow the machine to be identified by its IP address
-            final String numericalAddress = address.getHostAddress();
-            hostOptions.add(numericalAddress);
-
-            // Allow the machine to be specified by the fully-qualified domain name - if available.
-            // If we can't get the FQDN, this just returns the IP address, so don't repeat that.
-            final String fqdn = address.getCanonicalHostName();
-            if (!fqdn.equals(numericalAddress)) {
-                hostOptions.add(address.getCanonicalHostName());
-            }
-            // Also allow the machine to be specified by the simple machine name, if one exists.
-            final int dotPosition = hostName.indexOf(".");
-            // If the name is X.y, then also allow just the leading 'X'
-            if (dotPosition > 0) {
-                // noinspection RedundantStringOperation
-                hostOptions.add(address.getHostName().substring(0, dotPosition));
-            }
-
-        } catch (UnknownHostException e) {
-            // If somehow we can't get the current host name, then don't apply any host-specific parameters.
-            System.err.println("Unable to get current host name. Host-specific configuration items will be ignored.");
-        }
-    }
-
-    /**
-     * Retrieve and store a specified system property's value.
-     * 
-     * @param propertyName The system property to look up. If a value exists, it will be cached for later retrieval.
-     * @return The value of the requested system property, or null if the property has no set value.
-     */
-    private String getSystemProperty(final String propertyName) {
-        final String propVal = System.getProperty(propertyName);
-        if (propVal != null) {
-            contextItems.put(propertyName, propVal);
-        }
-        return propVal;
-    }
+    boolean matches(String token, List<String> targetValues);
 
     /**
-     * Return the configuration contexts. This is the list of system properties that may have been used to parse the
-     * configuration file. This collection will be immutable.
+     * Return the configuration contexts. This is the list of properties that may have been used to parse the
+     * configuration file. Implementations must be sure to return an immutable collection.
      *
      * @return the configuration contexts.
      */
-    Collection<String> getContextKeyValues() {
-        // Create a new HashSet, so that changes to the underlying contextItems don't find their way back to the caller
-        return Collections.unmodifiableCollection(new HashSet<>(contextItems.keySet()));
-    }
+    Collection<String> getContextKeyValues();
 }
diff --git a/Configuration/src/main/java/io/deephaven/configuration/DataDir.java b/Configuration/src/main/java/io/deephaven/configuration/DataDir.java
index d2866ae8162..5a5bdfaacbb 100644
--- a/Configuration/src/main/java/io/deephaven/configuration/DataDir.java
+++ b/Configuration/src/main/java/io/deephaven/configuration/DataDir.java
@@ -4,6 +4,7 @@
 package io.deephaven.configuration;
 
 import java.nio.file.Path;
+import java.nio.file.Paths;
 import java.util.Optional;
 
 public class DataDir {
@@ -22,10 +23,7 @@ public class DataDir {
      * @return the data directory
      */
     public static Path get() {
-        return Path.of(viaProperty()
-                .or(DataDir::viaWorkspace)
-                .or(DataDir::viaEnvironmentVariable)
-                .orElse(DEFAULT_DATA_DIR));
+        return Paths.get(getOptional().orElse(DEFAULT_DATA_DIR));
     }
 
     /**
@@ -37,15 +35,23 @@ public static Path get() {
      * @return the data directory
      */
     public static Path getOrSet(String defaultValue) {
-        final String existing = viaProperty()
-                .or(DataDir::viaWorkspace)
-                .or(DataDir::viaEnvironmentVariable)
-                .orElse(null);
+        final String existing = getOptional().orElse(null);
         if (existing != null) {
-            return Path.of(existing);
+            return Paths.get(existing);
         }
         System.setProperty(PROPERTY, defaultValue);
-        return Path.of(defaultValue);
+        return Paths.get(defaultValue);
+    }
+
+    private static Optional<String> getOptional() {
+        Optional<String> optional = viaProperty();
+        if (!optional.isPresent()) {
+            optional = viaWorkspace();
+        }
+        if (!optional.isPresent()) {
+            optional = viaEnvironmentVariable();
+        }
+        return optional;
     }
 
     private static Optional<String> viaProperty() {
diff --git a/Configuration/src/main/java/io/deephaven/configuration/DefaultConfigurationContext.java b/Configuration/src/main/java/io/deephaven/configuration/DefaultConfigurationContext.java
new file mode 100644
index 00000000000..64049ab4858
--- /dev/null
+++ b/Configuration/src/main/java/io/deephaven/configuration/DefaultConfigurationContext.java
@@ -0,0 +1,123 @@
+//
+// Copyright (c) 2016-2024 Deephaven Data Labs and Patent Pending
+//
+package io.deephaven.configuration;
+
+import java.net.InetAddress;
+import java.net.UnknownHostException;
+import java.util.*;
+
+/**
+ * Default {@link ConfigurationContext} implementation.
+ */
+public class DefaultConfigurationContext implements ConfigurationContext {
+    // Note that we explicitly use 'host' as a value in the configuration files.
+    // If a system property named 'host' exists, it will be ignored.
+    private static final String HOSTNAME = "host";
+    // Note that we explicitly allow the use of 'process' as a shorthand for 'process.name' in the configuration files.
+    // If a system property named 'process' exists, it will be ignored in favor of 'process.name'.
+    static final String PROCESS_NAME_PROPERTY = "process";
+
+    final private Map<String, String> contextItems;
+    final private Collection<String> hostOptions;
+
+    /**
+     * Create a ConfigurationContext and preload the non-system tokens.
+     */
+    public DefaultConfigurationContext() {
+        contextItems = new HashMap<>();
+        hostOptions = new ArrayList<>();
+        contextItems.put(PROCESS_NAME_PROPERTY, getSystemProperty("process.name"));
+    }
+
+    @Override
+    public boolean matches(final String token, final List<String> targetValues) {
+        // Mostly this is just checking system properties, but we also have one special case; the hostname is allowed to
+        // be several different potential values (short name, FQDN, etc), so we have to check that separately.
+        if (token.toLowerCase().equals(HOSTNAME)) {
+            if (hostOptions.isEmpty()) {
+                populateHostnames();
+            }
+            for (String aHostName : hostOptions) {
+                if (targetValues.contains(aHostName.toLowerCase()))
+                    return true;
+            }
+            return false;
+        } else {
+            // check that the token value in the context matches for the current scope item
+            final String contextValue = getContextItem(token);
+            if (contextValue == null)
+                return false;
+            return targetValues.contains(contextValue);
+        }
+    }
+
+    /**
+     * Retrieve a specified context item. These are usually but not necessarily system properties or a small number of
+     * other environmental factors.
+     * 
+     * @param token The name of the context item to look up.
+     * @return The current value of the specified context item, or null if no value exists.
+     */
+    private String getContextItem(final String token) {
+        if (contextItems.containsKey(token)) {
+            return contextItems.get(token);
+        }
+        // If we don't have an existing context item by this name, see if we have a matching system property
+        return getSystemProperty(token);
+    }
+
+    /**
+     * Get the hostname of the current system where this is running, along with the IP address and fully-qualified name.
+     */
+    private void populateHostnames() {
+        try {
+            final InetAddress address = InetAddress.getLocalHost();
+            // allow the machine to be identified by its hostname
+            final String hostName = address.getHostName();
+            hostOptions.add(hostName);
+
+            // Allow the machine to be identified by its IP address
+            final String numericalAddress = address.getHostAddress();
+            hostOptions.add(numericalAddress);
+
+            // Allow the machine to be specified by the fully-qualified domain name - if available.
+            // If we can't get the FQDN, this just returns the IP address, so don't repeat that.
+            final String fqdn = address.getCanonicalHostName();
+            if (!fqdn.equals(numericalAddress)) {
+                hostOptions.add(address.getCanonicalHostName());
+            }
+            // Also allow the machine to be specified by the simple machine name, if one exists.
+            final int dotPosition = hostName.indexOf(".");
+            // If the name is X.y, then also allow just the leading 'X'
+            if (dotPosition > 0) {
+                // noinspection RedundantStringOperation
+                hostOptions.add(address.getHostName().substring(0, dotPosition));
+            }
+
+        } catch (UnknownHostException e) {
+            // If somehow we can't get the current host name, then don't apply any host-specific parameters.
+            System.err.println("Unable to get current host name. Host-specific configuration items will be ignored.");
+        }
+    }
+
+    /**
+     * Retrieve and store a specified system property's value.
+     * 
+     * @param propertyName The system property to look up. If a value exists, it will be cached for later retrieval.
+     * @return The value of the requested system property, or null if the property has no set value.
+     */
+    private String getSystemProperty(final String propertyName) {
+        final String propVal = System.getProperty(propertyName);
+        if (propVal != null) {
+            contextItems.put(propertyName, propVal);
+        }
+        return propVal;
+    }
+
+    @Override
+    public Collection<String> getContextKeyValues() {
+        // Create a new HashSet, so that changes to the underlying contextItems don't find their way back to the caller
+        return Collections.unmodifiableCollection(new HashSet<>(contextItems.keySet()));
+    }
+}
diff --git a/Configuration/src/main/java/io/deephaven/configuration/ParsedProperties.java b/Configuration/src/main/java/io/deephaven/configuration/ParsedProperties.java
index 888d082b451..bb05427883a 100644
--- a/Configuration/src/main/java/io/deephaven/configuration/ParsedProperties.java
+++ b/Configuration/src/main/java/io/deephaven/configuration/ParsedProperties.java
@@ -3,17 +3,17 @@
 //
 package io.deephaven.configuration;
 
+import io.deephaven.internal.log.LoggerFactory;
+import io.deephaven.io.logger.Logger;
+import org.apache.commons.lang3.StringEscapeUtils;
+import org.jetbrains.annotations.NotNull;
+
 import java.io.*;
 import java.util.*;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 import java.util.stream.Collectors;
 
-import io.deephaven.io.logger.Logger;
-import io.deephaven.internal.log.LoggerFactory;
-import org.apache.commons.lang3.StringEscapeUtils;
-import org.jetbrains.annotations.NotNull;
-
 /**
  * Class for reading in a customized properties file, applying only the locally-relevant properties and keeping track of
  * which properties may not be further modified. Maintains the ordering of the properties from the input file.
@@ -105,7 +105,18 @@ public ParsedProperties() {
      *        PropertyInspector when checking whether required or disallowed properties are present.
      */
     public ParsedProperties(final boolean ignoreScopes) {
-        context = new ConfigurationContext();
+        this(ignoreScopes, new DefaultConfigurationContext());
+    }
+
+    /**
+     * A constructor that starts with no existing scoped or final properties.
+     *
+     * @param ignoreScopes True if this parser should ignore scope restrictions, false otherwise. Used by the
+     *        PropertyInspector when checking whether required or disallowed properties are present.
+     * @param context the {@link ConfigurationContext} for determining environment settings
+     */
+    public ParsedProperties(final boolean ignoreScopes, @NotNull final ConfigurationContext context) {
+        this.context = context;
         finalProperties = new HashSet<>();
         lineNumbers = new HashMap<>();
         props = new LinkedHashMap<>();
diff --git a/Configuration/src/main/java/io/deephaven/configuration/PropertyFile.java b/Configuration/src/main/java/io/deephaven/configuration/PropertyFile.java
index 3a7d13f96f9..4d38a3d0011 100644
--- a/Configuration/src/main/java/io/deephaven/configuration/PropertyFile.java
+++ b/Configuration/src/main/java/io/deephaven/configuration/PropertyFile.java
@@ -5,7 +5,6 @@
 
 import io.deephaven.base.verify.Assert;
 import io.deephaven.base.verify.Require;
-import io.deephaven.datastructures.util.CollectionUtil;
 import io.deephaven.io.logger.Logger;
 import gnu.trove.set.TIntSet;
 import gnu.trove.set.hash.TIntHashSet;
@@ -15,6 +14,7 @@
 
 import java.io.FileInputStream;
 import java.io.IOException;
+import java.io.Serializable;
 import java.lang.reflect.Field;
 import java.lang.reflect.Modifier;
 import java.util.BitSet;
@@ -474,7 +474,10 @@ public TIntHashSet getIntHashSetFromProperty(final String propertyName) {
     }
 
     public Set<String> getStringSetFromProperty(final String propertyName) {
-        Set<String> set = CollectionUtil.setFromArray(getProperty(propertyName).split("[, ]"));
+        String[] data = getProperty(propertyName).split("[, ]");
+        Require.neqNull(data, "data");
+        Set<String> set = new LinkedHashSet<>(Arrays.asList(data));
+        Require.eq(set.size(), "set.size()", data.length, "data.length");
         set.remove("");
         return set;
     }
@@ -499,13 +502,101 @@ public Set<String> getNameStringSetFromProperty(final String propertyName) {
         final String propertyValue = getProperty(propertyName).trim();
         switch (propertyValue) {
             case "*":
-                return CollectionUtil.universalSet();
+                // noinspection unchecked
+                return (Set<String>) UNIVERSAL_SET;
             case "":
                 return Collections.emptySet();
             default:
-                Set<String> result = CollectionUtil.setFromArray(propertyValue.split("[, ]+"));
-                result.remove("");
-                return result;
+                String[] data = propertyValue.split("[, ]+");
+                Require.neqNull(data, "data");
+                Set<String> set = new LinkedHashSet<>(Arrays.asList(data));
+                Require.eq(set.size(), "set.size()", data.length, "data.length");
+                set.remove("");
+                return set;
+        }
+    }
+
+
+    /**
+     * The universal set (immutable). This set is serializable.
+     */
+    @SuppressWarnings("rawtypes")
+    private static final Set UNIVERSAL_SET = new UniversalSet();
+
+    /**
+     * A set that contains everything. Iteration is not supported - only containment checks.
+     */
+    private static class UniversalSet<T> implements Set<T>, Serializable {
+
+        private static final long serialVersionUID = 1L;
+
+        private Object readResolve() {
+            return UNIVERSAL_SET;
+        }
+
+        @Override
+        public int size() {
+            throw new UnsupportedOperationException();
+        }
+
+        @Override
+        public boolean isEmpty() {
+            return false;
+        }
+
+        @Override
+        public boolean contains(Object o) {
+            return true;
+        }
+
+        @Override
+        public Iterator<T> iterator() {
+            throw new UnsupportedOperationException();
+        }
+
+        @Override
+        public Object[] toArray() {
+            throw new UnsupportedOperationException();
+        }
+
+        @Override
+        public boolean add(Object o) {
+            throw new UnsupportedOperationException();
+        }
+
+        @Override
+        public boolean remove(Object o) {
+            throw new UnsupportedOperationException();
+        }
+
+        @Override
+        public boolean containsAll(Collection<?> c) {
+            return true;
+        }
+
+        @Override
+        public boolean addAll(Collection<? extends T> c) {
+            throw new UnsupportedOperationException();
+        }
+
+        @Override
+        public boolean retainAll(Collection<?> c) {
+            throw new UnsupportedOperationException();
+        }
+
+        @Override
+        public boolean removeAll(Collection<?> c) {
+            throw new UnsupportedOperationException();
+        }
+
+        @Override
+        public void clear() {
+            throw new UnsupportedOperationException();
+        }
+
+        @Override
+        public <T> T[] toArray(T[] a) {
+            throw new UnsupportedOperationException();
         }
     }
 
diff --git a/Configuration/src/test/java/io/deephaven/configuration/TestConfiguration.java b/Configuration/src/test/java/io/deephaven/configuration/TestConfiguration.java
index 925fca10d16..472956e726e 100644
--- a/Configuration/src/test/java/io/deephaven/configuration/TestConfiguration.java
+++ b/Configuration/src/test/java/io/deephaven/configuration/TestConfiguration.java
@@ -105,7 +105,7 @@ public void testProperties() {
 
         try {
             System.setProperty(FILENAME_PROPERTY, "nonexistent");
-            Configuration.newConfigurationForTesting();
+            Configuration.newStandaloneConfiguration();
             fail("Expected exception");
         } catch (ConfigurationException expected) {
             // Expected
@@ -192,7 +192,7 @@ public void testReservedKeywordAsDeclaration() {
      * an on-the-fly property
      */
     public void testContext() throws Exception {
-        final String oldProcessName = System.getProperty(ConfigurationContext.PROCESS_NAME_PROPERTY);
+        final String oldProcessName = System.getProperty(DefaultConfigurationContext.PROCESS_NAME_PROPERTY);
         final String testProp = "testproperty";
         try {
             System.setProperty(FILENAME_PROPERTY, "resources/test-context.prop");
@@ -255,7 +255,7 @@ public void testContext() throws Exception {
     }
 
     public void testContextIgnoreScope() throws Exception {
-        final String oldProcessName = System.getProperty(ConfigurationContext.PROCESS_NAME_PROPERTY);
+        final String oldProcessName = System.getProperty(DefaultConfigurationContext.PROCESS_NAME_PROPERTY);
         final String testProp = "testproperty";
         try {
             System.setProperty(FILENAME_PROPERTY, "resources/test-context.prop");
@@ -324,7 +324,7 @@ public void testIncludeFinal() {
      */
     private void runTestsOnFinalKeyword(final String filename, final String contextName, final String beforeValue,
             final String finalTestValue, final String includeValue) {
-        final String oldProcessName = System.getProperty(ConfigurationContext.PROCESS_NAME_PROPERTY);
+        final String oldProcessName = System.getProperty(DefaultConfigurationContext.PROCESS_NAME_PROPERTY);
         final String testPropContextIdentifier = "testbatch";
         final String beforeTestProperty = "beforetest";
         final String finalTestProperty = "finaltest";
@@ -358,7 +358,7 @@ private void runTestsOnFinalKeyword(final String filename, final String contextN
 
         } finally {
             if (oldProcessName != null)
-                System.setProperty(ConfigurationContext.PROCESS_NAME_PROPERTY, oldProcessName);
+                System.setProperty(DefaultConfigurationContext.PROCESS_NAME_PROPERTY, oldProcessName);
             System.clearProperty(testPropContextIdentifier);
         }
     }
@@ -455,7 +455,7 @@ public void testShowHistory() {
                             +
                             "java.base/java.lang.reflect.Method.invoke(Method.java:580)\n",
                     history.get(0).fileName);
-        } else if ("22".equals(javaVersion)) {
+        } else if ("23".equals(javaVersion)) {
             assertEquals(
                     "<not from configuration file>: io.deephaven.configuration.TestConfiguration.testShowHistory(TestConfiguration.java:428)\n"
                             +
@@ -469,5 +469,95 @@ public void testShowHistory() {
         System.out.println("-------------- End show history -----------------");
     }
 
-
+    public void testNamedConfiguration() {
+        System.setProperty(FILENAME_PROPERTY, "resources/lib-tests.prop");
+        System.setProperty("Configuration.Test1.rootFile", "resources/test1.prop");
+        System.setProperty("Configuration.Test2.rootFile", "resources/test2.prop");
+        System.setProperty("Configuration.Test3.rootFile", "resources/test3.prop");
+
+        Configuration dc = Configuration.getInstance();
+        Configuration c1 = Configuration.getNamed("Test1");
+        Configuration c2 = Configuration.getNamed("Test2");
+        Configuration c3 = Configuration.getNamed("Test3");
+
+        assertEquals("cache", dc.getProperty("cacheDir"));
+        assertNull(c1.getStringWithDefault("cacheDir", null));
+        assertNull(c2.getStringWithDefault("cacheDir", null));
+        assertNull(c3.getStringWithDefault("cacheDir", null));
+
+        assertNull(dc.getStringWithDefault("test1", null));
+        assertEquals("true", c1.getProperty("test1"));
+        assertNull(c2.getStringWithDefault("test1", null));
+        assertNull(c3.getStringWithDefault("test1", null));
+
+        assertNull(dc.getStringWithDefault("test2", null));
+        assertNull(c1.getStringWithDefault("test2", null));
+        assertEquals("true", c2.getProperty("test2"));
+        assertNull(c3.getStringWithDefault("test2", null));
+
+        assertNull(dc.getStringWithDefault("test3", null));
+        // test1 imports test3, so expected.
+        assertEquals("true", c1.getProperty("test3"));
+        assertNull(c2.getStringWithDefault("test3", null));
+        assertEquals("true", c3.getProperty("test3"));
+
+        // We'll try a reset of one of them
+        System.setProperty("Configuration.Test1.rootFile", "resources/test2.prop");
+        Configuration.reset("Test1");
+        dc = Configuration.getInstance();
+        c1 = Configuration.getNamed("Test1");
+        c2 = Configuration.getNamed("Test2");
+        c3 = Configuration.getNamed("Test3");
+
+        assertEquals("cache", dc.getProperty("cacheDir"));
+        assertNull(c1.getStringWithDefault("cacheDir", null));
+        assertNull(c2.getStringWithDefault("cacheDir", null));
+        assertNull(c3.getStringWithDefault("cacheDir", null));
+
+        assertNull(dc.getStringWithDefault("test1", null));
+        assertNull(c1.getStringWithDefault("test1", null));
+        assertNull(c2.getStringWithDefault("test1", null));
+        assertNull(c3.getStringWithDefault("test1", null));
+
+        assertNull(dc.getStringWithDefault("test2", null));
+        assertEquals("true", c1.getProperty("test2"));
+        assertEquals("true", c2.getProperty("test2"));
+        assertNull(c3.getStringWithDefault("test2", null));
+
+        assertNull(dc.getStringWithDefault("test3", null));
+        assertNull(c1.getStringWithDefault("test3", null));
+        assertNull(c2.getStringWithDefault("test3", null));
+        assertEquals("true", c3.getProperty("test3"));
+
+        // Reset all of them
+        System.setProperty(FILENAME_PROPERTY, "resources/test-multiline.prop");
+        System.setProperty("Configuration.Test1.rootFile", "resources/lib-tests.prop");
+        System.setProperty("Configuration.Test2.rootFile", "resources/test3.prop");
+        System.setProperty("Configuration.Test3.rootFile", "resources/test2.prop");
+        Configuration.reset();
+        dc = Configuration.getInstance();
+        c1 = Configuration.getNamed("Test1");
+        c2 = Configuration.getNamed("Test2");
+        c3 = Configuration.getNamed("Test3");
+
+        assertEquals("abcdefghi", dc.getProperty("foo"));
+        assertNull(c1.getStringWithDefault("foo", null));
+        assertNull(c2.getStringWithDefault("foo", null));
+        assertNull(c3.getStringWithDefault("foo", null));
+
+        assertNull(dc.getStringWithDefault("cache", null));
+        assertEquals("cache", c1.getProperty("cacheDir"));
+        assertNull(c2.getStringWithDefault("cache", null));
+        assertNull(c3.getStringWithDefault("cache", null));
+
+        assertNull(dc.getStringWithDefault("test3", null));
+        assertNull(c1.getStringWithDefault("test3", null));
+        assertEquals("true", c2.getProperty("test3"));
+        assertNull(c3.getStringWithDefault("test3", null));
+
+        assertNull(dc.getStringWithDefault("test2", null));
+        assertNull(c1.getStringWithDefault("test2", null));
+        assertNull(c2.getStringWithDefault("test2", null));
+        assertEquals("true", c3.getProperty("test2"));
+    }
 }
diff --git a/Container/build.gradle b/Container/build.gradle
index 896d88dc8ae..0a72d603a1b 100644
--- a/Container/build.gradle
+++ b/Container/build.gradle
@@ -4,7 +4,7 @@ plugins {
 }
 
 dependencies {
-    Classpaths.inheritJUnitClassic(project, 'testImplementation')
+    testImplementation libs.junit4
 }
 
 spotless {
diff --git a/DHProcess/build.gradle b/DHProcess/build.gradle
index 70d36dd9ff4..5b88f86eed7 100644
--- a/DHProcess/build.gradle
+++ b/DHProcess/build.gradle
@@ -5,10 +5,10 @@ plugins {
 }
 
 dependencies {
-  annotationProcessor 'org.immutables:value:2.8.1'
-  compileOnly 'org.immutables:value-annotations:2.8.1'
+  annotationProcessor libs.immutables.value
+  compileOnly libs.immutables.value.annotations
 
-  implementation ('com.github.oshi:oshi-core:5.8.3') {
+  implementation (libs.oshi.core) {
     because 'it is able to greatly simplify collection of system information'
   }
 }
diff --git a/DataStructures/src/main/java/io/deephaven/datastructures/util/CollectionUtil.java b/DataStructures/src/main/java/io/deephaven/datastructures/util/CollectionUtil.java
index a6b3f6b99df..87bfeda61e1 100644
--- a/DataStructures/src/main/java/io/deephaven/datastructures/util/CollectionUtil.java
+++ b/DataStructures/src/main/java/io/deephaven/datastructures/util/CollectionUtil.java
@@ -3,21 +3,15 @@
 //
 package io.deephaven.datastructures.util;
 
-import java.io.Serializable;
-import java.util.*;
-
-import io.deephaven.base.verify.Require;
-import io.deephaven.base.verify.RequirementFailure;
-import org.jetbrains.annotations.NotNull;
-
 // --------------------------------------------------------------------
 /**
  * Utility methods for creating collections.
  */
+@Deprecated(forRemoval = true)
 public class CollectionUtil {
 
-    public static final byte[] ZERO_LENGTH_BYTE_ARRAY = new byte[0];
     public static final short[] ZERO_LENGTH_SHORT_ARRAY = new short[0];
+    public static final byte[] ZERO_LENGTH_BYTE_ARRAY = new byte[0];
     public static final int[] ZERO_LENGTH_INT_ARRAY = new int[0];
     public static final int[][] ZERO_LENGTH_INT_ARRAY_ARRAY = new int[0][];
     public static final long[] ZERO_LENGTH_LONG_ARRAY = new long[0];
@@ -27,295 +21,4 @@ public class CollectionUtil {
     public static final Object[] ZERO_LENGTH_OBJECT_ARRAY = new Object[0];
     public static final String[] ZERO_LENGTH_STRING_ARRAY = new String[0];
     public static final String[][] ZERO_LENGTH_STRING_ARRAY_ARRAY = new String[0][];
-
-    // ----------------------------------------------------------------
-    public static <K, V> Map<K, V> unmodifiableMapFromArray(Class<K> typeK, Class<V> typeV, Object... data) {
-        try {
-            return Collections.unmodifiableMap(mapFromArray(typeK, typeV, data));
-        } catch (RequirementFailure e) {
-            throw e.adjustForDelegatingMethod();
-        }
-    }
-
-    // ----------------------------------------------------------------
-    public static <K, V> Map<K, V> unmodifiableInvertMap(Map<V, K> sourceMap) {
-        try {
-            return Collections.unmodifiableMap(invertMap(sourceMap));
-        } catch (RequirementFailure e) {
-            throw e.adjustForDelegatingMethod();
-        }
-    }
-
-    // ----------------------------------------------------------------
-    public static <E> Set<E> unmodifiableSetFromArray(E... data) {
-        try {
-            return Collections.unmodifiableSet(setFromArray(data));
-        } catch (RequirementFailure e) {
-            throw e.adjustForDelegatingMethod();
-        }
-    }
-
-    // ----------------------------------------------------------------
-    @SuppressWarnings({"unchecked"})
-    public static <K, V> Map<K, V> mapFromArray(Class<K> typeK, Class<V> typeV, Object... data) {
-        return mapFromArray(typeK, typeV, false, data);
-    }
-
-    // ----------------------------------------------------------------
-    @SuppressWarnings({"unchecked"})
-    public static <K, V> Map<K, V> mapFromArray(Class<K> typeK, Class<V> typeV, final boolean allowDuplicateKeys,
-            Object... data) {
-        Require.neqNull(data, "data");
-        Require.requirement(0 == data.length % 2, "0==data.length%2");
-        Map<K, V> map = newSizedLinkedHashMap(data.length / 2);
-        for (int nIndex = 0; nIndex < data.length; nIndex += 2) {
-            Object key = data[nIndex];
-            if (null != key) {
-                Require.instanceOf(key, "key", typeK);
-            }
-            if (!allowDuplicateKeys) {
-                Require.requirement(false == map.containsKey(key), "false==map.containsKey(data[nIndex])", key,
-                        "data[nIndex]");
-            }
-            Object value = data[nIndex + 1];
-            if (null != value) {
-                Require.instanceOf(value, "value", typeV);
-            }
-            map.put((K) key, (V) value);
-        }
-        return map;
-    }
-
-    // ----------------------------------------------------------------
-    public static <K, V> Map<K, V> invertMap(Map<V, K> sourceMap) {
-        Require.neqNull(sourceMap, "sourceMap");
-        Map<K, V> targetMap = newSizedLinkedHashMap(sourceMap.size());
-        for (Map.Entry<V, K> entry : sourceMap.entrySet()) {
-            K key = entry.getValue();
-            V value = entry.getKey();
-            Require.requirement(false == targetMap.containsKey(key), "false==targetMap.containsKey(key)", key, "key");
-            targetMap.put(key, value);
-        }
-        return targetMap;
-    }
-
-    // ----------------------------------------------------------------
-    public static <E> Set<E> setFromArray(E... data) {
-        Require.neqNull(data, "data");
-        Set<E> set = newSizedLinkedHashSet(data.length);
-        for (E elem : data) {
-            Require.requirement(set.add(elem), "set.add(elem)");
-        }
-        return set;
-    }
-
-    // ----------------------------------------------------------------
-    public static <TYPE> Set<TYPE> setFromArray(@NotNull final Class<TYPE> type, @NotNull final Object... data) {
-        final Set<TYPE> set = newSizedLinkedHashSet(data.length);
-        for (final Object elem : data) {
-            Require.requirement(elem == null || type.isInstance(elem), "elem == null || type.isInstance(elem)");
-            // noinspection unchecked
-            Require.requirement(set.add((TYPE) elem), "set.add((TYPE)elem)");
-        }
-        return set;
-    }
-
-    // ----------------------------------------------------------------
-    public static <E> List<E> listFromArray(E... data) {
-        Require.neqNull(data, "data");
-        List<E> list = new ArrayList<E>(data.length);
-        for (E elem : data) {
-            list.add(elem);
-        }
-        return list;
-    }
-
-    // ----------------------------------------------------------------
-    /**
-     * Returns an empty {@link HashMap} with a big enough capacity such that the given number of entries can be added
-     * without resizing.
-     */
-    public static <K, V> Map<K, V> newSizedHashMap(int nEntries) {
-        return new HashMap<K, V>((nEntries + 1) * 4 / 3);
-    }
-
-    // ----------------------------------------------------------------
-    /**
-     * Returns an empty {@link LinkedHashMap} with a big enough capacity such that the given number of entries can be
-     * added without resizing.
-     */
-    public static <K, V> Map<K, V> newSizedLinkedHashMap(int nEntries) {
-        return new LinkedHashMap<K, V>((nEntries + 1) * 4 / 3);
-    }
-
-    // ----------------------------------------------------------------
-    /**
-     * Returns an empty {@link HashSet} with a big enough capacity such that the given number of entries can be added
-     * without resizing.
-     */
-    public static <E> Set<E> newSizedHashSet(int nEntries) {
-        return new HashSet<E>((nEntries + 1) * 4 / 3);
-    }
-
-    // ----------------------------------------------------------------
-    /**
-     * Returns an empty {@link LinkedHashSet} with a big enough capacity such that the given number of entries can be
-     * added without resizing.
-     */
-    public static <E> Set<E> newSizedLinkedHashSet(int nEntries) {
-        return new LinkedHashSet<E>((nEntries + 1) * 4 / 3);
-    }
-
-    // ----------------------------------------------------------------
-    /** Converts a List of Doubles to an array of doubles. */
-    public static double[] convertDoublesToPrimitiveArray(Collection<Double> collection) {
-        double[] array = new double[collection.size()];
-        Iterator<Double> iter = collection.iterator();
-        for (int nIndex = 0; nIndex < array.length; nIndex++) {
-            array[nIndex] = iter.next();
-        }
-        return array;
-    }
-
-    // ----------------------------------------------------------------
-    /** Converts a Collection of Integers to an array of ints. */
-    public static int[] convertIntegersToPrimitiveArray(Collection<Integer> collection) {
-        int[] array = new int[collection.size()];
-        Iterator<Integer> iter = collection.iterator();
-        for (int nIndex = 0; nIndex < array.length; nIndex++) {
-            array[nIndex] = iter.next();
-        }
-        return array;
-    }
-
-    // ----------------------------------------------------------------
-    /** Converts a Collection of Integers to an array of ints. */
-    public static long[] convertLongsToPrimitiveArray(Collection<Long> collection) {
-        long[] array = new long[collection.size()];
-        Iterator<Long> iter = collection.iterator();
-        for (int nIndex = 0; nIndex < array.length; nIndex++) {
-            array[nIndex] = iter.next();
-        }
-        return array;
-    }
-
-    // ----------------------------------------------------------------
-    /** Shuffles the elements in an array. */
-    public static <E> void shuffle(E[] elems, Random random) {
-        for (int nIndex = elems.length; nIndex > 1; nIndex--) {
-            int nChoice = random.nextInt(nIndex);
-            int nSwapWith = nIndex - 1;
-            if (nChoice != nSwapWith) {
-                E temp = elems[nSwapWith];
-                elems[nSwapWith] = elems[nChoice];
-                elems[nChoice] = temp;
-            }
-        }
-    }
-
-    // ----------------------------------------------------------------
-    /** Determines if an array contains a null. */
-    public static <E> boolean containsNull(E[] elems) {
-        for (E e : elems) {
-            if (e == null) {
-                return true;
-            }
-        }
-
-        return false;
-    }
-
-
-    // ----------------------------------------------------------------
-    // Support for "universal" sets - really just for convenience.
-
-    /**
-     * The universal set (immutable). This set is serializable.
-     */
-    public static final Set UNIVERSAL_SET = new UniversalSet();
-
-    /**
-     * Returns the universal set (immutable). This set is serializable.
-     */
-    @SuppressWarnings("unchecked")
-    public static <T> Set<T> universalSet() {
-        return (Set<T>) UNIVERSAL_SET;
-    }
-
-    /**
-     * A set that contains everything. Iteration is not supported - only containment checks.
-     */
-    private static class UniversalSet<T> implements Set<T>, Serializable {
-
-        private static final long serialVersionUID = 1L;
-
-        private Object readResolve() {
-            return UNIVERSAL_SET;
-        }
-
-        @Override
-        public int size() {
-            throw new UnsupportedOperationException();
-        }
-
-        @Override
-        public boolean isEmpty() {
-            return false;
-        }
-
-        @Override
-        public boolean contains(Object o) {
-            return true;
-        }
-
-        @Override
-        public Iterator<T> iterator() {
-            throw new UnsupportedOperationException();
-        }
-
-        @Override
-        public Object[] toArray() {
-            throw new UnsupportedOperationException();
-        }
-
-        @Override
-        public boolean add(Object o) {
-            throw new UnsupportedOperationException();
-        }
-
-        @Override
-        public boolean remove(Object o) {
-            throw new UnsupportedOperationException();
-        }
-
-        @Override
-        public boolean containsAll(Collection<?> c) {
-            return true;
-        }
-
-        @Override
-        public boolean addAll(Collection<? extends T> c) {
-            throw new UnsupportedOperationException();
-        }
-
-        @Override
-        public boolean retainAll(Collection<?> c) {
-            throw new UnsupportedOperationException();
-        }
-
-        @Override
-        public boolean removeAll(Collection<?> c) {
-            throw new UnsupportedOperationException();
-        }
-
-        @Override
-        public void clear() {
-            throw new UnsupportedOperationException();
-        }
-
-        @Override
-        public <T> T[] toArray(T[] a) {
-            throw new UnsupportedOperationException();
-        }
-    }
 }
diff --git a/Generators/Generators.gradle b/Generators/Generators.gradle
index 7af8ed074e1..7322d5adba5 100644
--- a/Generators/Generators.gradle
+++ b/Generators/Generators.gradle
@@ -6,8 +6,6 @@ plugins {
 evaluationDependsOn Docker.registryProject('python')
 
 configurations {
-    implementation.extendsFrom jdom
-    testImplementation.extendsFrom fishBaseTest
     combinedJavadoc
 }
 
@@ -17,17 +15,19 @@ dependencies {
     implementation project(':extensions-csv')
     implementation project(':extensions-kafka')
     implementation project(':extensions-parquet-table')
-    implementation depTrove3
+    implementation libs.trove
 
-    Classpaths.inheritGroovy(project, 'groovy', 'implementation')
-    Classpaths.inheritGroovy(project, 'groovy-json', 'implementation')
+    implementation libs.groovy
+    implementation libs.groovy.json
 
     runtimeOnly project(path: ':configs')
     runtimeOnly project(path: ':test-configs')
     runtimeOnly project(':extensions-kafka')
 
     runtimeOnly project(':log-to-slf4j')
-    Classpaths.inheritLogbackClassic(project)
+    runtimeOnly libs.logback.classic
+
+    testImplementation project(path: ':Base', configuration: 'tests')
 
     testRuntimeOnly project(path: ':configs')
     testRuntimeOnly project(path: ':test-configs')
diff --git a/Generators/src/main/java/io/deephaven/gen/JavaFunction.java b/Generators/src/main/java/io/deephaven/gen/JavaFunction.java
index c8b10db53cf..2f4639f0a80 100644
--- a/Generators/src/main/java/io/deephaven/gen/JavaFunction.java
+++ b/Generators/src/main/java/io/deephaven/gen/JavaFunction.java
@@ -3,20 +3,24 @@
 //
 package io.deephaven.gen;
 
-import io.deephaven.util.type.TypeUtils;
 import org.jetbrains.annotations.NotNull;
 
 import java.lang.reflect.Method;
 import java.lang.reflect.Parameter;
+import java.lang.reflect.ParameterizedType;
 import java.lang.reflect.Type;
 import java.lang.reflect.TypeVariable;
+import java.lang.reflect.WildcardType;
 import java.util.Arrays;
+import java.util.Collection;
+import java.util.HashSet;
 import java.util.Objects;
+import java.util.Set;
 import java.util.logging.Logger;
 
 /**
  * A Java function description for use in code generation.
- *
+ * <p>
  * JavaFunctions are equal if they have the same method names and parameter types.
  */
 public class JavaFunction implements Comparable<JavaFunction> {
@@ -147,13 +151,102 @@ public Class<?> getReturnClass() {
         }
 
         try {
-            return TypeUtils.getErasedType(returnType);
+            return getErasedType(returnType);
         } catch (UnsupportedOperationException e) {
             log.warning("Unable to determine Class from returnType=" + returnType.getTypeName());
             return null;
         }
     }
 
+    /**
+     * Determine the Class from the Type.
+     */
+    private static Class<?> getErasedType(Type paramType) {
+        if (paramType instanceof Class) {
+            return (Class<?>) paramType;
+        } else if (paramType instanceof ParameterizedType) {
+            return (Class<?>) // We are asking the parameterized type for its raw type, which is always Class
+            ((ParameterizedType) paramType).getRawType();
+        } else if (paramType instanceof WildcardType) {
+            final Type[] upper = ((WildcardType) paramType).getUpperBounds();
+            return getErasedType(upper[0]);
+        } else if (paramType instanceof java.lang.reflect.TypeVariable) {
+            final Type[] bounds = ((TypeVariable<?>) paramType).getBounds();
+            if (bounds.length > 1) {
+                Class<?>[] erasedBounds = new Class[bounds.length];
+                Class<?> weakest = null;
+                for (int i = 0; i < erasedBounds.length; i++) {
+                    erasedBounds[i] = getErasedType(bounds[i]);
+                    if (i == 0) {
+                        weakest = erasedBounds[i];
+                    } else {
+                        weakest = getWeakest(weakest, erasedBounds[i]);
+                    }
+                    // If we are erased to object, stop erasing...
+                    if (weakest == Object.class) {
+                        break;
+                    }
+                }
+                return weakest;
+            }
+            return getErasedType(bounds[0]);
+        } else {
+            throw new UnsupportedOperationException();
+        }
+    }
+
+    /**
+     * Determine the weakest parent of the two provided Classes.
+     *
+     * @param one one class to compare
+     * @param two the other class to compare
+     * @return the weakest parent Class
+     */
+    private static Class<?> getWeakest(Class<?> one, Class<?> two) {
+        if (one.isAssignableFrom(two)) {
+            return one;
+        } else if (two.isAssignableFrom(one)) {
+            return two;
+        }
+        // No luck on quick check... Look in interfaces.
+        Set<Class<?>> oneInterfaces = getFlattenedInterfaces(one);
+        Set<Class<?>> twoInterfaces = getFlattenedInterfaces(two);
+        // Keep only shared interfaces
+        oneInterfaces.retainAll(twoInterfaces);
+        Class<?> strongest = Object.class;
+        for (Class<?> cls : oneInterfaces) {
+            // There is a winning type...
+            if (strongest.isAssignableFrom(cls)) {
+                strongest = cls;
+            } else if (!cls.isAssignableFrom(strongest)) {
+                return Object.class;
+            }
+        }
+        // Will be Object.class if there were no shared interfaces (or shared interfaces were not compatible).
+        return strongest;
+    }
+
+    private static Set<Class<?>> getFlattenedInterfaces(Class<?> cls) {
+        final Set<Class<?>> set = new HashSet<>();
+        while (cls != null && cls != Object.class) {
+            for (Class<?> iface : cls.getInterfaces()) {
+                collectInterfaces(set, iface);
+            }
+            cls = cls.getSuperclass();
+        }
+        return set;
+    }
+
+    private static void collectInterfaces(final Collection<Class<?>> into, final Class<?> cls) {
+        if (into.add(cls)) {
+            for (final Class<?> iface : cls.getInterfaces()) {
+                if (into.add(iface)) {
+                    collectInterfaces(into, iface);
+                }
+            }
+        }
+    }
+
     public Type[] getParameterTypes() {
         return parameterTypes;
     }
diff --git a/Generators/src/main/java/io/deephaven/libs/StaticCalendarMethodsGenerator.java b/Generators/src/main/java/io/deephaven/libs/StaticCalendarMethodsGenerator.java
index b22ed2a4b58..5f737258e47 100644
--- a/Generators/src/main/java/io/deephaven/libs/StaticCalendarMethodsGenerator.java
+++ b/Generators/src/main/java/io/deephaven/libs/StaticCalendarMethodsGenerator.java
@@ -79,6 +79,7 @@ public static void main(String[] args) throws ClassNotFoundException, IOExceptio
         excludes.add("description");
         excludes.add("firstValidDate");
         excludes.add("lastValidDate");
+        excludes.add("clearCache");
 
         StaticCalendarMethodsGenerator gen =
                 new StaticCalendarMethodsGenerator(gradleTask, packageName, className, imports,
diff --git a/Generators/src/main/java/io/deephaven/plot/util/GenerateFigureImmutable.java b/Generators/src/main/java/io/deephaven/plot/util/GenerateFigureImmutable.java
index 8731b1c7969..f8d685549b6 100644
--- a/Generators/src/main/java/io/deephaven/plot/util/GenerateFigureImmutable.java
+++ b/Generators/src/main/java/io/deephaven/plot/util/GenerateFigureImmutable.java
@@ -834,7 +834,7 @@ private static String createMultiSeriesArgs(JavaFunction f) {
         final String[] names = f.getParameterNames();
         String args = String.join(", ", names);
         if (!names[names.length - 1].equals("keys")) {
-            args += ", io.deephaven.datastructures.util.CollectionUtil.ZERO_LENGTH_OBJECT_ARRAY";
+            args += ", io.deephaven.util.type.ArrayTypeUtils.EMPTY_OBJECT_ARRAY";
         }
 
         return args;
diff --git a/Generators/src/main/java/io/deephaven/plot/util/GeneratePyV2FigureAPI.java b/Generators/src/main/java/io/deephaven/plot/util/GeneratePyV2FigureAPI.java
index bcf065d55e5..93db0505dc5 100644
--- a/Generators/src/main/java/io/deephaven/plot/util/GeneratePyV2FigureAPI.java
+++ b/Generators/src/main/java/io/deephaven/plot/util/GeneratePyV2FigureAPI.java
@@ -1280,7 +1280,7 @@ private static List<PyFunc> getPyFuncs() {
         rst.add(new PyFunc("y_ticks_minor", SEQUENTIAL, new String[] {"yMinorTicks", "yMinorTicksVisible"}, null,
                 "Updates the configuration for minor ticks of the y-Axis."));
         rst.add(new PyFunc("y_twin", SINGLETON, new String[] {"twinY"}, null,
-                "Creates a new Axes which shares the y-Axis with the current Axes. For example, this is used for creating plots with a common x-axis but two different y-axes."));
+                "Creates a new Axes which shares the y-Axis with the current Axes. For example, this is used for creating plots with a common y-axis but two different x-axes."));
         rst.add(new PyFunc("series", SEQUENTIAL, new String[] {"series", "group", "seriesColor", "toolTipPattern",
                 "xToolTipPattern", "yToolTipPattern", "errorBarColor", "gradientVisible", "seriesNamingFunction"}, null,
                 "Gets a specific data series and updates the data series's configurations."));
diff --git a/IO/build.gradle b/IO/build.gradle
index 84e77e52d67..f84060f0416 100644
--- a/IO/build.gradle
+++ b/IO/build.gradle
@@ -5,10 +5,11 @@ plugins {
 dependencies {
     implementation project(':Base')
     implementation project(':SevenZip')
-    implementation depCommonsCompress
+    implementation libs.commons.compress
     testImplementation project(path: ':Base', configuration: 'tests')
-    Classpaths.inheritJUnitClassic(project, 'testImplementation')
-    Classpaths.inheritJMock(project, 'testImplementation')
+    testImplementation libs.junit4
+    testImplementation libs.jmock.junit4
+    testImplementation libs.jmock.imposters
 }
 
 sourceSets {
diff --git a/IO/gradle.properties b/IO/gradle.properties
index c186bbfdde1..9e8588f2620 100644
--- a/IO/gradle.properties
+++ b/IO/gradle.properties
@@ -1 +1,2 @@
 io.deephaven.project.ProjectType=JAVA_PUBLIC
+languageLevel=8
diff --git a/IO/src/main/java/io/deephaven/io/log/LogEntry.java b/IO/src/main/java/io/deephaven/io/log/LogEntry.java
index 124dadd77ff..78ce12051e3 100644
--- a/IO/src/main/java/io/deephaven/io/log/LogEntry.java
+++ b/IO/src/main/java/io/deephaven/io/log/LogEntry.java
@@ -8,6 +8,7 @@
 import io.deephaven.base.log.LogOutputAppendable;
 import io.deephaven.base.text.TimestampBuffer;
 import io.deephaven.base.text.TimestampBufferMicros;
+import org.jetbrains.annotations.ApiStatus;
 
 import java.nio.ByteBuffer;
 
@@ -105,7 +106,7 @@ default LogEntry appendDouble(Double f) {
      * @return the resulting {@code LogEntry}
      */
     default LogEntry appendDouble(final double doubleValue, final int decimalPlaces) {
-        return appendDoubleDecimalPlacesImpl(this, doubleValue, decimalPlaces, decimalPlaces);
+        return Helper.appendDoubleDecimalPlacesImpl(this, doubleValue, decimalPlaces, decimalPlaces);
     }
 
     /**
@@ -121,82 +122,86 @@ default LogEntry appendDouble(final double doubleValue, final int decimalPlaces)
      */
     default LogEntry appendDouble(final double doubleValue, final int decimalPlaces,
             final int maxTrailingZeroesToDiscard) {
-        return appendDoubleDecimalPlacesImpl(this, doubleValue, decimalPlaces,
+        return Helper.appendDoubleDecimalPlacesImpl(this, doubleValue, decimalPlaces,
                 decimalPlaces - maxTrailingZeroesToDiscard);
     }
 
-    private static LogEntry appendDoubleDecimalPlacesImpl(
-            LogEntry entry, final double doubleValue, final int roundToDecimalPlaces, final int minDecimalPlaces) {
-        if (roundToDecimalPlaces < 0 || roundToDecimalPlaces > 9) {
-            throw new IllegalArgumentException("Invalid value for decimalPlaces = " + roundToDecimalPlaces);
-        }
-        final int roundToAsPowerOf10 = MathUtil.pow10(roundToDecimalPlaces);
-        final boolean negative = doubleValue < 0.0;
-        final long longWeightedValue;
-        if (negative) {
-            longWeightedValue = -(long) (-0.5 + doubleValue * roundToAsPowerOf10);
-        } else {
-            longWeightedValue = (long) (0.5 + doubleValue * roundToAsPowerOf10);
-        }
-        final long integral = longWeightedValue / roundToAsPowerOf10;
-        if (negative) {
-            entry = entry.append(-integral);
-        } else {
-            entry = entry.append(integral);
-        }
-        if (roundToDecimalPlaces == 0) {
-            return entry;
-        }
-        int fractional = (int) (longWeightedValue % roundToAsPowerOf10);
-        int actualDecimalPlaces = roundToDecimalPlaces;
-        while (minDecimalPlaces < actualDecimalPlaces && fractional > 0 && (fractional % 10 == 0)) {
-            fractional /= 10;
-            --actualDecimalPlaces;
-        }
-        if (minDecimalPlaces == 0 && fractional == 0) {
-            return entry;
-        }
-        entry = entry.append(".");
-        final int base10FractionalDigits = MathUtil.base10digits(fractional);
-        final int leadingZeroes = actualDecimalPlaces - base10FractionalDigits;
-        switch (leadingZeroes) {
-            case 9:
-                entry = entry.append("000000000");
-            case 8:
-                entry = entry.append("00000000");
-                break;
-            case 7:
-                entry = entry.append("0000000");
-                break;
-            case 6:
-                entry = entry.append("000000");
-                break;
-            case 5:
-                entry = entry.append("00000");
-                break;
-            case 4:
-                entry = entry.append("0000");
-                break;
-            case 3:
-                entry = entry.append("000");
-                break;
-            case 2:
-                entry = entry.append("00");
-                break;
-            case 1:
-                entry = entry.append("0");
-                break;
-        }
-        if (fractional == 0) {
-            return entry;
-        }
-        return entry.append(fractional);
-    }
-
     LogEntry nf();
 
     LogEntry nl();
 
+    @ApiStatus.Internal
+    final class Helper {
+        private Helper() {}
+
+        private static LogEntry appendDoubleDecimalPlacesImpl(
+                LogEntry entry, final double doubleValue, final int roundToDecimalPlaces, final int minDecimalPlaces) {
+            if (roundToDecimalPlaces < 0 || roundToDecimalPlaces > 9) {
+                throw new IllegalArgumentException("Invalid value for decimalPlaces = " + roundToDecimalPlaces);
+            }
+            final int roundToAsPowerOf10 = MathUtil.pow10(roundToDecimalPlaces);
+            final boolean negative = doubleValue < 0.0;
+            final long longWeightedValue;
+            if (negative) {
+                longWeightedValue = -(long) (-0.5 + doubleValue * roundToAsPowerOf10);
+            } else {
+                longWeightedValue = (long) (0.5 + doubleValue * roundToAsPowerOf10);
+            }
+            final long integral = longWeightedValue / roundToAsPowerOf10;
+            if (negative) {
+                entry = entry.append(-integral);
+            } else {
+                entry = entry.append(integral);
+            }
+            if (roundToDecimalPlaces == 0) {
+                return entry;
+            }
+            int fractional = (int) (longWeightedValue % roundToAsPowerOf10);
+            int actualDecimalPlaces = roundToDecimalPlaces;
+            while (minDecimalPlaces < actualDecimalPlaces && fractional > 0 && (fractional % 10 == 0)) {
+                fractional /= 10;
+                --actualDecimalPlaces;
+            }
+            if (minDecimalPlaces == 0 && fractional == 0) {
+                return entry;
+            }
+            entry = entry.append(".");
+            final int base10FractionalDigits = MathUtil.base10digits(fractional);
+            final int leadingZeroes = actualDecimalPlaces - base10FractionalDigits;
+            switch (leadingZeroes) {
+                case 9:
+                    entry = entry.append("000000000");
+                case 8:
+                    entry = entry.append("00000000");
+                    break;
+                case 7:
+                    entry = entry.append("0000000");
+                    break;
+                case 6:
+                    entry = entry.append("000000");
+                    break;
+                case 5:
+                    entry = entry.append("00000");
+                    break;
+                case 4:
+                    entry = entry.append("0000");
+                    break;
+                case 3:
+                    entry = entry.append("000");
+                    break;
+                case 2:
+                    entry = entry.append("00");
+                    break;
+                case 1:
+                    entry = entry.append("0");
+                    break;
+            }
+            if (fractional == 0) {
+                return entry;
+            }
+            return entry.append(fractional);
+        }
+    }
 
     // ---------------------------------------------------------------------------------------------
     // null implementation
diff --git a/IO/src/main/java/io/deephaven/io/streams/ByteBufferInputStream.java b/IO/src/main/java/io/deephaven/io/streams/ByteBufferInputStream.java
index 7522906028b..f125e827a1a 100644
--- a/IO/src/main/java/io/deephaven/io/streams/ByteBufferInputStream.java
+++ b/IO/src/main/java/io/deephaven/io/streams/ByteBufferInputStream.java
@@ -10,37 +10,27 @@
 import java.nio.BufferUnderflowException;
 import java.nio.ByteBuffer;
 
-import io.deephaven.base.string.cache.CharSequenceAdapterBuilder;
-import io.deephaven.base.string.cache.StringCache;
 import org.jetbrains.annotations.NotNull;
 
 /**
  * This is an InputStream implementation which reads from a java.nio.ByteBuffer. If a read operation crosses the end of
  * the buffer, the BufferUnderflowException is converted to an EOFException.
- *
- * The stream contains no state other than that in in the buffer itself, so the buffer can be exchanged at will with the
+ * <p>
+ * The stream contains no state other than the buffer itself, so the buffer can be exchanged at will with the
  * setBuffer() method.
+ * <p>
+ * Endianness is determined by the provided buffer itself.
  */
 public class ByteBufferInputStream extends java.io.InputStream implements DataInput {
 
     /** the buffer from which we read */
     protected ByteBuffer buf;
 
-    private char[] utfChars;
-
-    /**
-     * The DataOutput interface always writes bytes in big-endian order, while ByteBuffer allows the order to be big- or
-     * little-endian. Set this flag true to assume that the buffer is bid-endian, or false to check the buffer's order
-     * at each write.
-     */
-    // protected static final boolean ASSUME_BIG_ENDIAN = true;
-
     /**
      * Construct a new stream which reads from a byte buffer/
      */
     public ByteBufferInputStream(ByteBuffer buf) {
         this.buf = buf;
-        this.utfChars = new char[0];
     }
 
     /**
@@ -64,7 +54,7 @@ public int read() throws IOException {
     }
 
     @Override
-    public int read(byte b[]) throws IOException {
+    public int read(byte[] b) throws IOException {
         int n = Math.min(buf.remaining(), b.length);
         if (n == 0 && b.length > 0) {
             return -1;
@@ -74,7 +64,7 @@ public int read(byte b[]) throws IOException {
     }
 
     @Override
-    public int read(byte b[], int off, int len) throws IOException {
+    public int read(byte[] b, int off, int len) throws IOException {
         int n = Math.min(buf.remaining(), len);
         if (n == 0 && len > 0) {
             return -1;
@@ -123,7 +113,7 @@ public boolean markSupported() {
     // -----------------------------------------------------------------------------------
 
     @Override
-    public void readFully(byte b[]) throws IOException {
+    public void readFully(byte[] b) throws IOException {
         try {
             buf.get(b, 0, b.length);
         } catch (BufferUnderflowException x) {
@@ -132,7 +122,7 @@ public void readFully(byte b[]) throws IOException {
     }
 
     @Override
-    public void readFully(byte b[], int off, int len) throws IOException {
+    public void readFully(byte[] b, int off, int len) throws IOException {
         try {
             buf.get(b, off, len);
         } catch (BufferUnderflowException x) {
@@ -307,6 +297,7 @@ public String readLine() throws IOException {
         return new String(chars);
     }
 
+    @NotNull
     @Override
     public String readUTF() throws IOException {
         int length = 0;
@@ -341,48 +332,4 @@ public String readUTF() throws IOException {
 
         return new String(chars, 0, length);
     }
-
-    public String readUTF(@NotNull final CharSequenceAdapterBuilder output,
-            @NotNull final StringCache<String> cache) throws IOException {
-        readUTF(output);
-        return cache.getCachedString(output);
-    }
-
-    public void readUTF(@NotNull final CharSequenceAdapterBuilder output) throws IOException {
-        int total = readUnsignedShort();
-
-        output.clear().reserveCapacity(total);
-
-        while (total > 0) {
-            final int b1 = buf.get();
-            if ((b1 & 0x80) == 0) {
-                output.append((char) (b1 & 0xff));
-                total--;
-            } else if ((b1 & 0xe0) == 0xc0) {
-                final int b2 = buf.get();
-                if ((b2 & 0xc0) != 0x80) {
-                    throw new UTFDataFormatException("malformed second byte " + b2);
-                }
-                output.append((char) (((b1 & 0x1F) << 6) | (b2 & 0x3F)));
-                total -= 2;
-            } else if ((b1 & 0xf0) == 0xe0) {
-                final int b2 = buf.get();
-                final int b3 = buf.get();
-                if ((b2 & 0xc0) != 0x80 || (b3 & 0xc0) != 0x80) {
-                    throw new UTFDataFormatException("malformed second byte " + b2 + " or third byte " + b3);
-                }
-                output.append((char) (((b1 & 0x0F) << 12) | ((b2 & 0x3F) << 6) | (b3 & 0x3F)));
-                total -= 3;
-            } else {
-                throw new UTFDataFormatException("malformed first byte " + b1);
-            }
-        }
-    }
-
-    public void read(ByteBuffer dest, int length) {
-        final int sourceLimit = buf.limit();
-        buf.limit(buf.position() + length); // Constrain buf.remaining() to length
-        dest.put(buf);
-        buf.limit(sourceLimit);
-    }
 }
diff --git a/IO/src/main/java/io/deephaven/io/streams/ByteBufferOutputStream.java b/IO/src/main/java/io/deephaven/io/streams/ByteBufferOutputStream.java
index 8a901f26718..1cbfcca9ec2 100644
--- a/IO/src/main/java/io/deephaven/io/streams/ByteBufferOutputStream.java
+++ b/IO/src/main/java/io/deephaven/io/streams/ByteBufferOutputStream.java
@@ -252,7 +252,7 @@ public ByteBufferOutputStream appendByteBuffer(ByteBuffer bb) throws IOException
         final int origLimit = bb.limit();
         int remaining;
         while ((remaining = buf.remaining()) < bb.remaining()) {
-            buf.put(bb.limit(bb.position() + remaining));
+            buf.put((ByteBuffer) bb.limit(bb.position() + remaining));
             bb.limit(origLimit);
             updateBuffer(buf.capacity());
         }
diff --git a/IO/src/main/resources/io/deephaven/io/IO.gwt.xml b/IO/src/main/resources/io/deephaven/io/IO.gwt.xml
new file mode 100644
index 00000000000..51000b6cea3
--- /dev/null
+++ b/IO/src/main/resources/io/deephaven/io/IO.gwt.xml
@@ -0,0 +1,3 @@
+<module>
+    <source path="streams" includes="ByteBufferInputStream.java" />
+</module>
diff --git a/Integrations/build.gradle b/Integrations/build.gradle
index e651390a5ac..d289e4e65ed 100644
--- a/Integrations/build.gradle
+++ b/Integrations/build.gradle
@@ -9,19 +9,17 @@ plugins {
 
 evaluationDependsOn ':docker-server-jetty'
 
-configurations {
-    implementation.extendsFrom dhIntegrations
-    testImplementation.extendsFrom fishBaseTest
-}
-
 dependencies {
 
     implementation project(':engine-table')
     implementation project(':plugin')
     implementation project(':Configuration')
     implementation project(':log-factory')
+    implementation project(":util-thread")
+    implementation libs.commons.lang3
 
     testImplementation project(':engine-test-utils')
+    testImplementation project(path: ':Base', configuration: 'tests')
 
     // Needed for CalendarInit
     testRuntimeOnly TestTools.projectDependency(project, 'engine-time')
@@ -65,6 +63,7 @@ def runInDocker = { String name, String sourcePath, List<String> command, Closur
             from("${sourcePath}/../client") {
                 include 'setup.py'
                 include 'pydeephaven/**'
+                include 'deephaven_core/**'
                 include 'README.md'
                 into 'python/client'
             }
diff --git a/Integrations/src/main/java/io/deephaven/integrations/python/PythonDeephavenSession.java b/Integrations/src/main/java/io/deephaven/integrations/python/PythonDeephavenSession.java
index f14f3459504..f8b69e9d0ae 100644
--- a/Integrations/src/main/java/io/deephaven/integrations/python/PythonDeephavenSession.java
+++ b/Integrations/src/main/java/io/deephaven/integrations/python/PythonDeephavenSession.java
@@ -57,8 +57,25 @@ public class PythonDeephavenSession extends AbstractScriptSession<PythonSnapshot
     private static final String DEFAULT_SCRIPT_PATH = Configuration.getInstance()
             .getStringWithDefault("PythonDeephavenSession.defaultScriptPath", ".");
 
+    /**
+     * This is following the convention set by io.deephaven.server.config.ConfigServiceGrpcImpl / dh-defaults.prop of
+     * relaying version information to the client via Configuration properties.
+     */
+    private static final String PYTHON_VERSION_PROPERTY = "python.version";
+
     public static String SCRIPT_TYPE = "Python";
 
+    private static void setPythonVersion(Configuration configuration) {
+        final String pythonVersion;
+        try (final PyModule platformModule = PyModule.importModule("platform")) {
+            pythonVersion = platformModule.call(String.class, "python_version", new Class[0], new Object[0]);
+        } catch (RuntimeException e) {
+            log.warn(e).append("Unable to retrieve python version").endl();
+            return;
+        }
+        configuration.setProperty(PYTHON_VERSION_PROPERTY, pythonVersion);
+    }
+
     private final PythonEvaluator evaluator;
     private final PythonScope<PyObject> scope;
     private final PythonScriptSessionModule module;
@@ -67,6 +84,10 @@ public class PythonDeephavenSession extends AbstractScriptSession<PythonSnapshot
     /**
      * Create a Python ScriptSession.
      *
+     * <p>
+     * Sets the configuration property {@value PYTHON_VERSION_PROPERTY} to the value returned from the python code
+     * {@code platform.python_version()}.
+     *
      * @param updateGraph the default update graph to install for the repl
      * @param operationInitializer the default operation initializer to install for the repl
      * @param objectTypeLookup the object type lookup
@@ -96,16 +117,19 @@ public PythonDeephavenSession(
 
         registerJavaExecutor(threadInitializationFactory);
         publishInitial();
+
+        final Configuration configuration = Configuration.getInstance();
         /*
          * And now the user-defined initialization scripts, if any.
          */
         if (runInitScripts) {
-            String[] scripts = Configuration.getInstance().getProperty("PythonDeephavenSession.initScripts").split(",");
+            String[] scripts = configuration.getProperty("PythonDeephavenSession.initScripts").split(",");
 
             for (String script : scripts) {
                 runScript(script);
             }
         }
+        setPythonVersion(configuration);
     }
 
     /**
diff --git a/Integrations/src/main/java/io/deephaven/integrations/python/PythonInputTableStatusListenerAdapter.java b/Integrations/src/main/java/io/deephaven/integrations/python/PythonInputTableStatusListenerAdapter.java
new file mode 100644
index 00000000000..0949d483020
--- /dev/null
+++ b/Integrations/src/main/java/io/deephaven/integrations/python/PythonInputTableStatusListenerAdapter.java
@@ -0,0 +1,61 @@
+//
+// Copyright (c) 2016-2024 Deephaven Data Labs and Patent Pending
+//
+package io.deephaven.integrations.python;
+
+import io.deephaven.engine.util.input.InputTableStatusListener;
+import io.deephaven.internal.log.LoggerFactory;
+import io.deephaven.io.logger.Logger;
+import io.deephaven.util.annotations.ScriptApi;
+import org.apache.commons.lang3.exception.ExceptionUtils;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
+import org.jpy.PyObject;
+
+import java.util.Objects;
+
+@ScriptApi
+public class PythonInputTableStatusListenerAdapter implements InputTableStatusListener {
+
+    private static final Logger log = LoggerFactory.getLogger(PythonInputTableStatusListenerAdapter.class);
+    private final PyObject pyOnSuccessCallback;
+    private final PyObject pyOnErrorCallback;
+
+    /**
+     * Create a Python InputTable status listener.
+     *
+     * @param pyOnSuccessCallback The Python onSuccess callback function.
+     * @param pyOnErrorCallback The Python onError callback function.
+     */
+    private PythonInputTableStatusListenerAdapter(@Nullable PyObject pyOnSuccessCallback,
+            @NotNull PyObject pyOnErrorCallback) {
+        this.pyOnSuccessCallback = pyOnSuccessCallback;
+        this.pyOnErrorCallback = pyOnErrorCallback;
+    }
+
+    public static PythonInputTableStatusListenerAdapter create(@Nullable PyObject pyOnSuccessCallback,
+            @NotNull PyObject pyOnErrorCallback) {
+        return new PythonInputTableStatusListenerAdapter(pyOnSuccessCallback,
+                Objects.requireNonNull(pyOnErrorCallback, "Python on_error callback cannot be None"));
+    }
+
+    @Override
+    public void onError(Throwable originalException) {
+        try {
+            pyOnErrorCallback.call("__call__", ExceptionUtils.getStackTrace(originalException));
+        } catch (Throwable e) {
+            // If the Python onFailure callback fails, log the new exception
+            // and continue with the original exception.
+            log.error().append("Python on_error callback failed: ").append(e).endl();
+        }
+    }
+
+    @Override
+    public void onSuccess() {
+        if (pyOnSuccessCallback != null && !pyOnSuccessCallback.isNone()) {
+            pyOnSuccessCallback.call("__call__");
+        } else {
+            InputTableStatusListener.super.onSuccess();
+        }
+    }
+}
diff --git a/Integrations/src/main/java/io/deephaven/integrations/python/PythonListenerTableUpdateDataReader.java b/Integrations/src/main/java/io/deephaven/integrations/python/PythonListenerTableUpdateDataReader.java
deleted file mode 100644
index 1a0180f04df..00000000000
--- a/Integrations/src/main/java/io/deephaven/integrations/python/PythonListenerTableUpdateDataReader.java
+++ /dev/null
@@ -1,110 +0,0 @@
-//
-// Copyright (c) 2016-2024 Deephaven Data Labs and Patent Pending
-//
-package io.deephaven.integrations.python;
-
-import io.deephaven.chunk.ChunkType;
-import io.deephaven.chunk.ResettableWritableChunk;
-import io.deephaven.chunk.attributes.Values;
-import io.deephaven.engine.rowset.RowSequence;
-import io.deephaven.engine.table.ChunkSource;
-import io.deephaven.engine.table.ColumnSource;
-import io.deephaven.engine.table.SharedContext;
-import io.deephaven.engine.table.TableUpdate;
-import io.deephaven.util.SafeCloseable;
-import org.jetbrains.annotations.NotNull;
-
-import java.lang.reflect.Array;
-import java.util.Arrays;
-
-/**
- * An efficient reader for a Python table listener to extract columnar data based on the {@link RowSequence} in the
- * {@link TableUpdate}
- */
-public class PythonListenerTableUpdateDataReader {
-
-    /**
-     * Factory method for instance of {@link Context}
-     *
-     * @param chunkCapacity
-     * @param columnSources
-     * @return {@link Context}
-     */
-    public static io.deephaven.engine.table.Context makeContext(final int chunkCapacity,
-            @NotNull final ColumnSource<?>... columnSources) {
-        return new Context(chunkCapacity, columnSources);
-    }
-
-    /**
-     * Create a context that can be reused to read all the chunks of a row sequence
-     */
-    private static class Context implements io.deephaven.engine.table.Context {
-
-        private final SharedContext sharedContext;
-        private final ChunkSource.FillContext[] fillContexts;
-        private final ResettableWritableChunk<Values>[] resettableChunks;
-
-        private Context(final int chunkCapacity, @NotNull final ColumnSource<?>... columnSources) {
-            sharedContext = SharedContext.makeSharedContext();
-            fillContexts = Arrays.stream(columnSources).map(cs -> cs.makeFillContext(chunkCapacity, sharedContext))
-                    .toArray(ChunkSource.FillContext[]::new);
-            // noinspection unchecked
-            resettableChunks =
-                    Arrays.stream(columnSources).map(cs -> cs.getChunkType().<Values>makeResettableWritableChunk())
-                            .toArray(ResettableWritableChunk[]::new);
-        }
-
-        @Override
-        public void close() {
-            sharedContext.close();
-            for (final SafeCloseable closeable : fillContexts) {
-                closeable.close();
-            }
-            for (final SafeCloseable closeable : resettableChunks) {
-                closeable.close();
-            }
-        }
-    }
-
-    /**
-     * Copy data from a table by chunks into a 2D array
-     *
-     * @param context the context used in filling the output array
-     * @param rowSeq indices of the rows of the table to put into the 2D array
-     * @param columnSources columns of data to put into the 2D array
-     * @return a 2D array
-     */
-    public static Object[] readChunkColumnMajor(@NotNull final io.deephaven.engine.table.Context context,
-            final RowSequence rowSeq,
-            final ColumnSource<?>[] columnSources, final boolean prev) {
-        final int nRows = rowSeq.intSize();
-        final int nCols = columnSources.length;
-        final Object[] arrays = Arrays.stream(columnSources).map(cs -> {
-            final ChunkType chunkType = cs.getChunkType();
-            if (chunkType == ChunkType.Object) {
-                return Array.newInstance(cs.getType(), rowSeq.intSize());
-            }
-            return cs.getChunkType().makeArray(rowSeq.intSize());
-        }).toArray(Object[]::new);
-        final Context typedContext = (Context) context;
-
-        for (int ci = 0; ci < nCols; ++ci) {
-            final ChunkSource.FillContext fillContext = typedContext.fillContexts[ci];
-            final ResettableWritableChunk<Values> chunk = typedContext.resettableChunks[ci];
-            final Object array = arrays[ci];
-            chunk.resetFromArray(array, 0, nRows);
-            final ColumnSource<?> colSrc = columnSources[ci];
-
-            // noinspection unchecked
-            if (prev) {
-                colSrc.fillPrevChunk(fillContext, chunk, rowSeq);
-            } else {
-                colSrc.fillChunk(fillContext, chunk, rowSeq);
-            }
-            chunk.clear();
-        }
-        typedContext.sharedContext.reset();
-
-        return arrays;
-    }
-}
diff --git a/Integrations/src/main/java/io/deephaven/integrations/python/PythonMergedListenerAdapter.java b/Integrations/src/main/java/io/deephaven/integrations/python/PythonMergedListenerAdapter.java
new file mode 100644
index 00000000000..0a43aae2ac7
--- /dev/null
+++ b/Integrations/src/main/java/io/deephaven/integrations/python/PythonMergedListenerAdapter.java
@@ -0,0 +1,123 @@
+//
+// Copyright (c) 2016-2024 Deephaven Data Labs and Patent Pending
+//
+package io.deephaven.integrations.python;
+
+import io.deephaven.engine.context.ExecutionContext;
+import io.deephaven.engine.rowset.RowSetFactory;
+import io.deephaven.engine.rowset.RowSetShiftData;
+import io.deephaven.engine.table.ModifiedColumnSet;
+import io.deephaven.engine.table.TableListener;
+import io.deephaven.engine.table.TableUpdate;
+import io.deephaven.engine.table.impl.ListenerRecorder;
+import io.deephaven.engine.table.impl.MergedListener;
+import io.deephaven.engine.table.impl.TableUpdateImpl;
+import io.deephaven.engine.updategraph.NotificationQueue;
+import io.deephaven.engine.updategraph.UpdateGraph;
+import io.deephaven.internal.log.LoggerFactory;
+import io.deephaven.io.logger.Logger;
+import io.deephaven.util.SafeCloseable;
+import io.deephaven.util.annotations.ScriptApi;
+import org.apache.commons.lang3.exception.ExceptionUtils;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
+import org.jpy.PyObject;
+
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Objects;
+import java.util.stream.Stream;
+
+/**
+ * A Deephaven merged listener which fires when any of its bound listener recorders has updates and all of its
+ * dependencies have been satisfied. The listener then invokes the Python listener object.
+ *
+ * The Python listener object must be a Python MergedListener instance that provides a "_process" method implementation
+ * with no argument.
+ */
+@ScriptApi
+public class PythonMergedListenerAdapter extends MergedListener {
+    private static final Logger log = LoggerFactory.getLogger(PythonMergedListenerAdapter.class);
+
+    private final PyObject pyListenerCallable;
+    private final PyObject pyOnFailureCallback;
+
+    /**
+     * Create a Python merged listener.
+     *
+     * @param recorders The listener recorders to which this listener will subscribe.
+     * @param dependencies The tables that must be satisfied before this listener is executed.
+     * @param listenerDescription A description for the UpdatePerformanceTracker to append to its entry description, may
+     *        be null.
+     * @param pyListener Python listener object.
+     */
+    private PythonMergedListenerAdapter(
+            @NotNull ListenerRecorder[] recorders,
+            @Nullable NotificationQueue.Dependency[] dependencies,
+            @Nullable String listenerDescription,
+            @NotNull PyObject pyListener,
+            @NotNull PyObject pyOnFailureCallback) {
+        super(Arrays.asList(recorders), Arrays.asList(dependencies), listenerDescription, null);
+        Arrays.stream(recorders).forEach(rec -> rec.setMergedListener(this));
+        this.pyListenerCallable = PythonUtils.pyMergeListenerFunc(Objects.requireNonNull(pyListener));
+        this.pyOnFailureCallback = Objects.requireNonNull(pyOnFailureCallback);
+    }
+
+    public static PythonMergedListenerAdapter create(
+            @NotNull ListenerRecorder[] recorders,
+            @Nullable NotificationQueue.Dependency[] dependencies,
+            @Nullable String listenerDescription,
+            @NotNull PyObject pyListener,
+            @NotNull PyObject pyOnFailureCallback) {
+        if (recorders.length < 2) {
+            throw new IllegalArgumentException("At least two listener recorders must be provided");
+        }
+
+        final NotificationQueue.Dependency[] allItems =
+                Stream.concat(Arrays.stream(recorders), Arrays.stream(dependencies))
+                        .filter(Objects::nonNull)
+                        .toArray(NotificationQueue.Dependency[]::new);
+
+        final UpdateGraph updateGraph = allItems[0].getUpdateGraph(allItems);
+
+        try (final SafeCloseable ignored = ExecutionContext.getContext().withUpdateGraph(updateGraph).open()) {
+            return new PythonMergedListenerAdapter(recorders, dependencies, listenerDescription, pyListener,
+                    pyOnFailureCallback);
+        }
+    }
+
+    public ArrayList<TableUpdate> currentRowsAsUpdates() {
+        final ArrayList<TableUpdate> updates = new ArrayList<>();
+        for (ListenerRecorder recorder : getRecorders()) {
+            final TableUpdate update = new TableUpdateImpl(
+                    recorder.getParent().getRowSet().copy(),
+                    RowSetFactory.empty(),
+                    RowSetFactory.empty(),
+                    RowSetShiftData.EMPTY,
+                    ModifiedColumnSet.EMPTY);
+            updates.add(update);
+        }
+        return updates;
+    }
+
+    @Override
+    protected void process() {
+        pyListenerCallable.call("__call__");
+    }
+
+    @Override
+    protected void propagateErrorDownstream(boolean fromProcess, @NotNull Throwable error,
+            TableListener.@Nullable Entry entry) {
+        if (!pyOnFailureCallback.isNone()) {
+            try {
+                pyOnFailureCallback.call("__call__", ExceptionUtils.getStackTrace(error));
+            } catch (Exception e2) {
+                // If the Python onFailure callback fails, log the new exception
+                // and continue with the original exception.
+                log.error().append("Python on_error callback failed: ").append(e2).endl();
+            }
+        } else {
+            log.error().append("Python on_error callback is None: ").append(ExceptionUtils.getStackTrace(error)).endl();
+        }
+    }
+}
diff --git a/Integrations/src/main/java/io/deephaven/integrations/python/PythonReplayListenerAdapter.java b/Integrations/src/main/java/io/deephaven/integrations/python/PythonReplayListenerAdapter.java
index b6eae8bcda5..8df5e544224 100644
--- a/Integrations/src/main/java/io/deephaven/integrations/python/PythonReplayListenerAdapter.java
+++ b/Integrations/src/main/java/io/deephaven/integrations/python/PythonReplayListenerAdapter.java
@@ -3,6 +3,7 @@
 //
 package io.deephaven.integrations.python;
 
+import org.apache.commons.lang3.exception.ExceptionUtils;
 import io.deephaven.engine.context.ExecutionContext;
 import io.deephaven.engine.table.Table;
 import io.deephaven.engine.table.TableUpdate;
@@ -14,12 +15,16 @@
 import io.deephaven.engine.rowset.RowSetShiftData;
 import io.deephaven.engine.updategraph.NotificationQueue;
 import io.deephaven.engine.updategraph.UpdateGraph;
+import io.deephaven.internal.log.LoggerFactory;
+import io.deephaven.io.logger.Logger;
 import io.deephaven.util.SafeCloseable;
 import io.deephaven.util.annotations.ScriptApi;
+import org.jetbrains.annotations.NotNull;
 import org.jpy.PyObject;
 
 import javax.annotation.Nullable;
 import java.util.Arrays;
+import java.util.Objects;
 
 
 /**
@@ -33,7 +38,10 @@
 public class PythonReplayListenerAdapter extends InstrumentedTableUpdateListenerAdapter
         implements TableSnapshotReplayer {
     private static final long serialVersionUID = -8882402061960621245L;
-    private final PyObject pyCallable;
+    private static final Logger log = LoggerFactory.getLogger(PythonReplayListenerAdapter.class);
+
+    private final PyObject pyListenerCallable;
+    private final PyObject pyOnFailureCallback;
     private final NotificationQueue.Dependency[] dependencies;
 
     /**
@@ -43,22 +51,34 @@ public class PythonReplayListenerAdapter extends InstrumentedTableUpdateListener
      *        null.
      * @param source The source table to which this listener will subscribe.
      * @param retain Whether a hard reference to this listener should be maintained to prevent it from being collected.
-     * @param pyObjectIn Python listener object.
+     * @param pyListener Python listener object.
      * @param dependencies The tables that must be satisfied before this listener is executed.
      */
-    public static PythonReplayListenerAdapter create(@Nullable String description, Table source, boolean retain,
-            PyObject pyObjectIn, NotificationQueue.Dependency... dependencies) {
+    public static PythonReplayListenerAdapter create(
+            @Nullable String description,
+            @NotNull Table source,
+            boolean retain,
+            @NotNull PyObject pyListener,
+            @NotNull PyObject pyOnFailureCallback,
+            @Nullable NotificationQueue.Dependency... dependencies) {
         final UpdateGraph updateGraph = source.getUpdateGraph(dependencies);
         try (final SafeCloseable ignored = ExecutionContext.getContext().withUpdateGraph(updateGraph).open()) {
-            return new PythonReplayListenerAdapter(description, source, retain, pyObjectIn, dependencies);
+            return new PythonReplayListenerAdapter(description, source, retain, pyListener, pyOnFailureCallback,
+                    dependencies);
         }
     }
 
-    private PythonReplayListenerAdapter(@Nullable String description, Table source, boolean retain, PyObject pyObjectIn,
-            NotificationQueue.Dependency... dependencies) {
+    private PythonReplayListenerAdapter(
+            @Nullable String description,
+            @NotNull Table source,
+            boolean retain,
+            @NotNull PyObject pyListener,
+            @NotNull PyObject pyOnFailureCallback,
+            @Nullable NotificationQueue.Dependency... dependencies) {
         super(description, source, retain);
         this.dependencies = dependencies;
-        this.pyCallable = PythonUtils.pyListenerFunc(pyObjectIn);
+        this.pyListenerCallable = PythonUtils.pyListenerFunc(Objects.requireNonNull(pyListener));
+        this.pyOnFailureCallback = Objects.requireNonNull(pyOnFailureCallback);
     }
 
     @Override
@@ -69,13 +89,30 @@ public void replay() {
         final TableUpdate update =
                 new TableUpdateImpl(source.getRowSet(), emptyRowSet, emptyRowSet, emptyShift, emptyColumnSet);
         final boolean isReplay = true;
-        pyCallable.call("__call__", update, isReplay);
+        pyListenerCallable.call("__call__", update, isReplay);
     }
 
     @Override
     public void onUpdate(final TableUpdate update) {
         final boolean isReplay = false;
-        pyCallable.call("__call__", update, isReplay);
+        pyListenerCallable.call("__call__", update, isReplay);
+    }
+
+    @Override
+    public void onFailureInternal(Throwable originalException, Entry sourceEntry) {
+        if (!pyOnFailureCallback.isNone()) {
+            try {
+                pyOnFailureCallback.call("__call__", ExceptionUtils.getStackTrace(originalException));
+            } catch (Throwable e) {
+                // If the Python onFailure callback fails, log the new exception
+                // and continue with the original exception.
+                log.error().append("Python on_error callback failed: ").append(e).endl();
+            }
+        } else {
+            log.error().append("Python on_error callback is None: ")
+                    .append(ExceptionUtils.getStackTrace(originalException)).endl();
+        }
+        super.onFailureInternal(originalException, sourceEntry);
     }
 
     @Override
@@ -83,4 +120,8 @@ public boolean canExecute(final long step) {
         return super.canExecute(step)
                 && (dependencies.length == 0 || Arrays.stream(dependencies).allMatch(t -> t.satisfied(step)));
     }
+
+    public boolean isFailed() {
+        return failed;
+    }
 }
diff --git a/Integrations/src/main/java/io/deephaven/integrations/python/PythonTableDataReader.java b/Integrations/src/main/java/io/deephaven/integrations/python/PythonTableDataReader.java
new file mode 100644
index 00000000000..9334952b9db
--- /dev/null
+++ b/Integrations/src/main/java/io/deephaven/integrations/python/PythonTableDataReader.java
@@ -0,0 +1,110 @@
+//
+// Copyright (c) 2016-2024 Deephaven Data Labs and Patent Pending
+//
+package io.deephaven.integrations.python;
+
+import io.deephaven.chunk.ChunkType;
+import io.deephaven.chunk.ResettableWritableChunk;
+import io.deephaven.chunk.attributes.Values;
+import io.deephaven.engine.rowset.RowSequence;
+import io.deephaven.engine.table.ChunkSource;
+import io.deephaven.engine.table.ColumnSource;
+import io.deephaven.engine.table.SharedContext;
+import io.deephaven.engine.table.TableUpdate;
+import io.deephaven.util.SafeCloseable;
+import org.jetbrains.annotations.NotNull;
+
+import java.lang.reflect.Array;
+import java.util.Arrays;
+
+/**
+ * An efficient reader for a Python table listener to extract columnar data based on the {@link RowSequence} in the
+ * {@link TableUpdate}
+ */
+public class PythonTableDataReader {
+
+    /**
+     * Factory method for instance of {@link Context}
+     *
+     * @param chunkCapacity
+     * @param columnSources
+     * @return {@link Context}
+     */
+    public static io.deephaven.engine.table.Context makeContext(final int chunkCapacity,
+            @NotNull final ColumnSource<?>... columnSources) {
+        return new Context(chunkCapacity, columnSources);
+    }
+
+    /**
+     * Create a context that can be reused to read all the chunks of a row sequence
+     */
+    private static class Context implements io.deephaven.engine.table.Context {
+
+        private final SharedContext sharedContext;
+        private final ChunkSource.FillContext[] fillContexts;
+        private final ResettableWritableChunk<Values>[] resettableChunks;
+
+        private Context(final int chunkCapacity, @NotNull final ColumnSource<?>... columnSources) {
+            sharedContext = SharedContext.makeSharedContext();
+            fillContexts = Arrays.stream(columnSources).map(cs -> cs.makeFillContext(chunkCapacity, sharedContext))
+                    .toArray(ChunkSource.FillContext[]::new);
+            // noinspection unchecked
+            resettableChunks =
+                    Arrays.stream(columnSources).map(cs -> cs.getChunkType().<Values>makeResettableWritableChunk())
+                            .toArray(ResettableWritableChunk[]::new);
+        }
+
+        @Override
+        public void close() {
+            sharedContext.close();
+            for (final SafeCloseable closeable : fillContexts) {
+                closeable.close();
+            }
+            for (final SafeCloseable closeable : resettableChunks) {
+                closeable.close();
+            }
+        }
+    }
+
+    /**
+     * Copy data from a table by chunks into a 2D array
+     *
+     * @param context the context used in filling the output array
+     * @param rowSeq indices of the rows of the table to put into the 2D array
+     * @param columnSources columns of data to put into the 2D array
+     * @return a 2D array
+     */
+    public static Object[] readChunkColumnMajor(@NotNull final io.deephaven.engine.table.Context context,
+            final RowSequence rowSeq,
+            final ColumnSource<?>[] columnSources, final boolean prev) {
+        final int nRows = rowSeq.intSize();
+        final int nCols = columnSources.length;
+        final Object[] arrays = Arrays.stream(columnSources).map(cs -> {
+            final ChunkType chunkType = cs.getChunkType();
+            if (chunkType == ChunkType.Object) {
+                return Array.newInstance(cs.getType(), rowSeq.intSize());
+            }
+            return cs.getChunkType().makeArray(rowSeq.intSize());
+        }).toArray(Object[]::new);
+        final Context typedContext = (Context) context;
+
+        for (int ci = 0; ci < nCols; ++ci) {
+            final ChunkSource.FillContext fillContext = typedContext.fillContexts[ci];
+            final ResettableWritableChunk<Values> chunk = typedContext.resettableChunks[ci];
+            final Object array = arrays[ci];
+            chunk.resetFromArray(array, 0, nRows);
+            final ColumnSource<?> colSrc = columnSources[ci];
+
+            // noinspection unchecked
+            if (prev) {
+                colSrc.fillPrevChunk(fillContext, chunk, rowSeq);
+            } else {
+                colSrc.fillChunk(fillContext, chunk, rowSeq);
+            }
+            chunk.clear();
+        }
+        typedContext.sharedContext.reset();
+
+        return arrays;
+    }
+}
diff --git a/Integrations/src/main/java/io/deephaven/integrations/python/PythonUtils.java b/Integrations/src/main/java/io/deephaven/integrations/python/PythonUtils.java
index 5d3d861fa21..6ab80722f61 100644
--- a/Integrations/src/main/java/io/deephaven/integrations/python/PythonUtils.java
+++ b/Integrations/src/main/java/io/deephaven/integrations/python/PythonUtils.java
@@ -23,6 +23,18 @@ static PyObject pyListenerFunc(final PyObject pyObject) {
         return pyCallable(pyObject, "on_update");
     }
 
+    /**
+     * Gets the python function that should be called by a merged listener. The input can be either (1) a callable or
+     * (2) an object which provides an "_process" method.
+     *
+     * @param pyObject python listener object. This should either be a callable or an object which provides an
+     *        "_process" method.
+     * @return python function that should be called by a merged listener.
+     * @throws IllegalArgumentException python listener object is not a valid listener.
+     */
+    static PyObject pyMergeListenerFunc(final PyObject pyObject) {
+        return pyCallable(pyObject, "_process");
+    }
 
     /**
      * Creates a callable PyObject, either using method.apply() or __call__(), if the pyObjectIn has such methods
diff --git a/ModelFarm/ModelFarm.gradle b/ModelFarm/ModelFarm.gradle
index ebc780ea05d..e2eb2e79e0a 100644
--- a/ModelFarm/ModelFarm.gradle
+++ b/ModelFarm/ModelFarm.gradle
@@ -7,10 +7,6 @@ plugins {
     id 'java-library'
 }
 
-configurations {
-    testImplementation.extendsFrom fishBaseTest
-}
-
 dependencies {
     api project(':engine-table')
     api project(':engine-time')
@@ -21,10 +17,11 @@ dependencies {
     runtimeOnly project(':configs')
 
     testImplementation project(':engine-test-utils')
+    testImplementation project(path: ':Base', configuration: 'tests')
     testRuntimeOnly project(':Numerics')
 
     testRuntimeOnly project(':log-to-slf4j')
     testRuntimeOnly project(':configs')
     testRuntimeOnly project(':test-configs')
-    Classpaths.inheritSlf4j(project, 'slf4j-simple', 'testRuntimeOnly')
+    testRuntimeOnly libs.slf4j.simple
 }
diff --git a/Numerics/Numerics.gradle b/Numerics/Numerics.gradle
index d5b654b7346..1059c4424f8 100644
--- a/Numerics/Numerics.gradle
+++ b/Numerics/Numerics.gradle
@@ -3,22 +3,20 @@ plugins {
     id 'java-library'
 }
 
-configurations {
-    implementation.extendsFrom dhNumerics
-    testImplementation.extendsFrom fishBaseTest
-}
-
 dependencies {
     api project(':engine-time')
     implementation project(':engine-function')
     implementation project(':log-factory')
+    implementation libs.jama
+    implementation libs.commons.math3
 
     testImplementation project(':base-test-utils')
+    testImplementation project(path: ':Base', configuration: 'tests')
     testRuntimeOnly project(path: ':configs')
     testRuntimeOnly project(path: ':test-configs')
 
     testRuntimeOnly project(':log-to-slf4j'),
             project(path: ':configs'),
             project(path: ':test-configs')
-    Classpaths.inheritSlf4j(project, 'slf4j-simple', 'testRuntimeOnly')
+    testRuntimeOnly libs.slf4j.simple
 }
diff --git a/Plot/Plot.gradle b/Plot/Plot.gradle
index 3face152c26..2623b342174 100644
--- a/Plot/Plot.gradle
+++ b/Plot/Plot.gradle
@@ -3,35 +3,34 @@ plugins {
     id 'java-library'
 }
 
-configurations {
-    implementation.extendsFrom dhPlot
-
-    testImplementation.extendsFrom fishIoTest
-}
-
 dependencies {
 
     api project(':engine-api')
+    implementation project(':Base')
     implementation project(':engine-table')
     implementation project(':engine-function')
     implementation project(':engine-tuple')
     implementation project(':log-factory')
+    implementation project(':Configuration')
 
-    Classpaths.inheritGroovy(project, 'groovy', 'api')
-    Classpaths.inheritGroovy(project, 'groovy-json', 'implementation')
-    Classpaths.inheritAutoService(project)
+    api libs.groovy
+    implementation libs.groovy.json
+    compileOnly libs.autoservice
+    annotationProcessor libs.autoservice.compiler
 
-    compileOnly 'javax.inject:javax.inject:1'
+    compileOnly libs.javax.inject
 
-    Classpaths.inheritGuava(project)
+    implementation libs.guava
+    implementation libs.commons.lang3
 
     testImplementation project(':engine-test-utils')
     testImplementation TestTools.projectDependency(project, 'engine-time')
+    testImplementation project(path: ':Base', configuration: 'tests')
 
     testRuntimeOnly project(':configs')
     testRuntimeOnly project(':test-configs')
     testRuntimeOnly project(':Numerics')
 
     testRuntimeOnly project(':log-to-slf4j')
-    Classpaths.inheritSlf4j(project, 'slf4j-simple', 'testRuntimeOnly')
+    testRuntimeOnly libs.slf4j.simple
 }
diff --git a/Plot/src/main/java/io/deephaven/plot/AxesImpl.java b/Plot/src/main/java/io/deephaven/plot/AxesImpl.java
index dab4dbe75ce..2535736ba56 100644
--- a/Plot/src/main/java/io/deephaven/plot/AxesImpl.java
+++ b/Plot/src/main/java/io/deephaven/plot/AxesImpl.java
@@ -5,7 +5,7 @@
 
 import io.deephaven.api.ColumnName;
 import io.deephaven.api.agg.Aggregation;
-import io.deephaven.datastructures.util.CollectionUtil;
+import io.deephaven.engine.context.ExecutionContext;
 import io.deephaven.engine.table.impl.MemoizedOperationKey;
 import io.deephaven.plot.axisformatters.AxisFormat;
 import io.deephaven.plot.axisformatters.NanosAxisFormat;
@@ -278,24 +278,11 @@ private static SelectableDataSet getAggregatedSelectableDataSet(final Selectable
         }
         final Collection<? extends Aggregation> aggs = aggSupplier.get();
         final Collection<? extends ColumnName> columnNames = ColumnName.from(cols);
-        final Function<Table, Table> applyAggs = t -> t.aggBy(aggs, columnNames);
+        ExecutionContext ctx = ExecutionContext.newBuilder().captureQueryCompiler().build();
+        final Function<Table, Table> applyAggs = t -> ctx.apply(() -> t.aggBy(aggs, columnNames));
         return sds.transform(MemoizedOperationKey.aggBy(aggs, false, null, columnNames), applyAggs);
     }
 
-    private static SelectableDataSet getLastBySelectableDataSet(final SelectableDataSet sds, final String... columns) {
-        final List<String> cols = new ArrayList<>();
-        Collections.addAll(cols, columns);
-        return getLastBySelectableDataSet(sds, cols);
-    }
-
-    private static SelectableDataSet getLastBySelectableDataSet(final SelectableDataSet sds,
-            final Collection<String> columns) {
-        if (sds instanceof SelectableDataSetOneClick) {
-            Collections.addAll(columns, ((SelectableDataSetOneClick) sds).getByColumns());
-        }
-        return sds.transform(columns, t -> ((Table) t).lastBy(columns));
-    }
-
     public Set<SwappableTable> getSwappableTables() {
         final Set<SwappableTable> result = new HashSet<>();
 
@@ -1583,7 +1570,7 @@ public IntervalXYDataSeriesArray histPlot(final Comparable seriesName, final Sel
         final List<String> allCols = new ArrayList<>(byCols);
         allCols.add(x);
         final SwappableTable ht = sds.getSwappableTable(seriesName, chart, tableTransform,
-                allCols.toArray(CollectionUtil.ZERO_LENGTH_STRING_ARRAY));
+                allCols.toArray(String[]::new));
         return histPlot(seriesName, ht);
     }
 
@@ -1607,7 +1594,7 @@ public IntervalXYDataSeriesArray histPlot(final Comparable seriesName, final Sel
         final List<String> allCols = new ArrayList<>(byCols);
         allCols.add(x);
         final SwappableTable ht = sds.getSwappableTable(seriesName, chart, tableTransform,
-                allCols.toArray(CollectionUtil.ZERO_LENGTH_STRING_ARRAY));
+                allCols.toArray(String[]::new));
         return histPlot(seriesName, ht);
     }
 
@@ -1653,7 +1640,7 @@ public CategoryDataSeriesSwappablePartitionedTable catHistPlot(final Comparable
         }
 
         final Function<Table, Table> tableTransform = (Function<Table, Table> & Serializable) t -> PlotUtils
-                .createCategoryHistogramTable(t, cols.toArray(CollectionUtil.ZERO_LENGTH_STRING_ARRAY));
+                .createCategoryHistogramTable(t, cols.toArray(String[]::new));
         final SwappableTable counts = sds.getSwappableTable(seriesName, chart, tableTransform, categories,
                 CategoryDataSeries.CAT_SERIES_ORDER_COLUMN);
         final CategoryDataSeriesSwappablePartitionedTable ds = new CategoryDataSeriesSwappablePartitionedTable(this,
diff --git a/Plot/src/main/java/io/deephaven/plot/BaseFigureImpl.java b/Plot/src/main/java/io/deephaven/plot/BaseFigureImpl.java
index 28faaf0f4a7..278d52c0639 100644
--- a/Plot/src/main/java/io/deephaven/plot/BaseFigureImpl.java
+++ b/Plot/src/main/java/io/deephaven/plot/BaseFigureImpl.java
@@ -5,7 +5,6 @@
 
 import io.deephaven.api.Selectable;
 import io.deephaven.configuration.Configuration;
-import io.deephaven.datastructures.util.CollectionUtil;
 import io.deephaven.engine.table.PartitionedTable;
 import io.deephaven.plot.errors.*;
 import io.deephaven.plot.util.functions.FigureImplFunction;
@@ -491,7 +490,7 @@ public void consolidatePartitionedTables() {
             final Map<Set<String>, PartitionedTable> byColMap = new HashMap<>();
             for (final PartitionedTableHandle h : hs) {
                 final Set<String> keyColumns = h.getKeyColumns();
-                final String[] keyColumnsArray = keyColumns.toArray(CollectionUtil.ZERO_LENGTH_STRING_ARRAY);
+                final String[] keyColumnsArray = keyColumns.toArray(String[]::new);
 
                 final PartitionedTable partitionedTable = byColMap.computeIfAbsent(keyColumns,
                         x -> {
diff --git a/Plot/src/main/java/io/deephaven/plot/FigureImpl.java b/Plot/src/main/java/io/deephaven/plot/FigureImpl.java
index c6e8a2613f9..ebbbf0b6b72 100644
--- a/Plot/src/main/java/io/deephaven/plot/FigureImpl.java
+++ b/Plot/src/main/java/io/deephaven/plot/FigureImpl.java
@@ -3172,7 +3172,7 @@ private FigureImpl applyFunctionalProperties() {
             DataSeries result = ((DataSeries) series).errorBarColor( errorBarColor);
             return make((DataSeriesInternal)result);
         } else if(series instanceof MultiSeries) {
-                final MultiSeries result = ((MultiSeries) series).errorBarColor(errorBarColor, io.deephaven.datastructures.util.CollectionUtil.ZERO_LENGTH_OBJECT_ARRAY);
+                final MultiSeries result = ((MultiSeries) series).errorBarColor(errorBarColor, io.deephaven.util.type.ArrayTypeUtils.EMPTY_OBJECT_ARRAY);
                 return make((SeriesInternal) result);
         } else {
             throw new PlotUnsupportedOperationException("Series type does not support this method.  seriesType=" + series.getClass() + " method='@Override public  FigureImpl errorBarColor( int errorBarColor )'", figure);
@@ -3186,7 +3186,7 @@ private FigureImpl applyFunctionalProperties() {
             DataSeries result = ((DataSeries) series).errorBarColor( errorBarColor);
             return make((DataSeriesInternal)result);
         } else if(series instanceof MultiSeries) {
-                final MultiSeries result = ((MultiSeries) series).errorBarColor(errorBarColor, io.deephaven.datastructures.util.CollectionUtil.ZERO_LENGTH_OBJECT_ARRAY);
+                final MultiSeries result = ((MultiSeries) series).errorBarColor(errorBarColor, io.deephaven.util.type.ArrayTypeUtils.EMPTY_OBJECT_ARRAY);
                 return make((SeriesInternal) result);
         } else {
             throw new PlotUnsupportedOperationException("Series type does not support this method.  seriesType=" + series.getClass() + " method='@Override public  FigureImpl errorBarColor( io.deephaven.gui.color.Paint errorBarColor )'", figure);
@@ -3200,7 +3200,7 @@ private FigureImpl applyFunctionalProperties() {
             DataSeries result = ((DataSeries) series).errorBarColor( errorBarColor);
             return make((DataSeriesInternal)result);
         } else if(series instanceof MultiSeries) {
-                final MultiSeries result = ((MultiSeries) series).errorBarColor(errorBarColor, io.deephaven.datastructures.util.CollectionUtil.ZERO_LENGTH_OBJECT_ARRAY);
+                final MultiSeries result = ((MultiSeries) series).errorBarColor(errorBarColor, io.deephaven.util.type.ArrayTypeUtils.EMPTY_OBJECT_ARRAY);
                 return make((SeriesInternal) result);
         } else {
             throw new PlotUnsupportedOperationException("Series type does not support this method.  seriesType=" + series.getClass() + " method='@Override public  FigureImpl errorBarColor( java.lang.String errorBarColor )'", figure);
@@ -3214,7 +3214,7 @@ private FigureImpl applyFunctionalProperties() {
             DataSeries result = ((DataSeries) series).gradientVisible( gradientVisible);
             return make((DataSeriesInternal)result);
         } else if(series instanceof MultiSeries) {
-                final MultiSeries result = ((MultiSeries) series).gradientVisible(gradientVisible, io.deephaven.datastructures.util.CollectionUtil.ZERO_LENGTH_OBJECT_ARRAY);
+                final MultiSeries result = ((MultiSeries) series).gradientVisible(gradientVisible, io.deephaven.util.type.ArrayTypeUtils.EMPTY_OBJECT_ARRAY);
                 return make((SeriesInternal) result);
         } else {
             throw new PlotUnsupportedOperationException("Series type does not support this method.  seriesType=" + series.getClass() + " method='@Override public  FigureImpl gradientVisible( boolean gradientVisible )'", figure);
@@ -3228,7 +3228,7 @@ private FigureImpl applyFunctionalProperties() {
             DataSeries result = ((DataSeries) series).lineColor( color);
             return make((DataSeriesInternal)result);
         } else if(series instanceof MultiSeries) {
-                final MultiSeries result = ((MultiSeries) series).lineColor(color, io.deephaven.datastructures.util.CollectionUtil.ZERO_LENGTH_OBJECT_ARRAY);
+                final MultiSeries result = ((MultiSeries) series).lineColor(color, io.deephaven.util.type.ArrayTypeUtils.EMPTY_OBJECT_ARRAY);
                 return make((SeriesInternal) result);
         } else {
             throw new PlotUnsupportedOperationException("Series type does not support this method.  seriesType=" + series.getClass() + " method='@Override public  FigureImpl lineColor( int color )'", figure);
@@ -3242,7 +3242,7 @@ private FigureImpl applyFunctionalProperties() {
             DataSeries result = ((DataSeries) series).lineColor( color);
             return make((DataSeriesInternal)result);
         } else if(series instanceof MultiSeries) {
-                final MultiSeries result = ((MultiSeries) series).lineColor(color, io.deephaven.datastructures.util.CollectionUtil.ZERO_LENGTH_OBJECT_ARRAY);
+                final MultiSeries result = ((MultiSeries) series).lineColor(color, io.deephaven.util.type.ArrayTypeUtils.EMPTY_OBJECT_ARRAY);
                 return make((SeriesInternal) result);
         } else {
             throw new PlotUnsupportedOperationException("Series type does not support this method.  seriesType=" + series.getClass() + " method='@Override public  FigureImpl lineColor( io.deephaven.gui.color.Paint color )'", figure);
@@ -3256,7 +3256,7 @@ private FigureImpl applyFunctionalProperties() {
             DataSeries result = ((DataSeries) series).lineColor( color);
             return make((DataSeriesInternal)result);
         } else if(series instanceof MultiSeries) {
-                final MultiSeries result = ((MultiSeries) series).lineColor(color, io.deephaven.datastructures.util.CollectionUtil.ZERO_LENGTH_OBJECT_ARRAY);
+                final MultiSeries result = ((MultiSeries) series).lineColor(color, io.deephaven.util.type.ArrayTypeUtils.EMPTY_OBJECT_ARRAY);
                 return make((SeriesInternal) result);
         } else {
             throw new PlotUnsupportedOperationException("Series type does not support this method.  seriesType=" + series.getClass() + " method='@Override public  FigureImpl lineColor( java.lang.String color )'", figure);
@@ -3270,7 +3270,7 @@ private FigureImpl applyFunctionalProperties() {
             DataSeries result = ((DataSeries) series).lineStyle( lineStyle);
             return make((DataSeriesInternal)result);
         } else if(series instanceof MultiSeries) {
-                final MultiSeries result = ((MultiSeries) series).lineStyle(lineStyle, io.deephaven.datastructures.util.CollectionUtil.ZERO_LENGTH_OBJECT_ARRAY);
+                final MultiSeries result = ((MultiSeries) series).lineStyle(lineStyle, io.deephaven.util.type.ArrayTypeUtils.EMPTY_OBJECT_ARRAY);
                 return make((SeriesInternal) result);
         } else {
             throw new PlotUnsupportedOperationException("Series type does not support this method.  seriesType=" + series.getClass() + " method='@Override public  FigureImpl lineStyle( io.deephaven.plot.LineStyle lineStyle )'", figure);
@@ -3284,7 +3284,7 @@ private FigureImpl applyFunctionalProperties() {
             DataSeries result = ((DataSeries) series).linesVisible( visible);
             return make((DataSeriesInternal)result);
         } else if(series instanceof MultiSeries) {
-                final MultiSeries result = ((MultiSeries) series).linesVisible(visible, io.deephaven.datastructures.util.CollectionUtil.ZERO_LENGTH_OBJECT_ARRAY);
+                final MultiSeries result = ((MultiSeries) series).linesVisible(visible, io.deephaven.util.type.ArrayTypeUtils.EMPTY_OBJECT_ARRAY);
                 return make((SeriesInternal) result);
         } else {
             throw new PlotUnsupportedOperationException("Series type does not support this method.  seriesType=" + series.getClass() + " method='@Override public  FigureImpl linesVisible( java.lang.Boolean visible )'", figure);
@@ -3298,7 +3298,7 @@ private FigureImpl applyFunctionalProperties() {
             DataSeries result = ((DataSeries) series).pointColor( pointColor);
             return make((DataSeriesInternal)result);
         } else if(series instanceof MultiSeries) {
-                final MultiSeries result = ((MultiSeries) series).pointColor(pointColor, io.deephaven.datastructures.util.CollectionUtil.ZERO_LENGTH_OBJECT_ARRAY);
+                final MultiSeries result = ((MultiSeries) series).pointColor(pointColor, io.deephaven.util.type.ArrayTypeUtils.EMPTY_OBJECT_ARRAY);
                 return make((SeriesInternal) result);
         } else {
             throw new PlotUnsupportedOperationException("Series type does not support this method.  seriesType=" + series.getClass() + " method='@Override public  FigureImpl pointColor( int pointColor )'", figure);
@@ -3312,7 +3312,7 @@ private FigureImpl applyFunctionalProperties() {
             DataSeries result = ((DataSeries) series).pointColor( pointColor);
             return make((DataSeriesInternal)result);
         } else if(series instanceof MultiSeries) {
-                final MultiSeries result = ((MultiSeries) series).pointColor(pointColor, io.deephaven.datastructures.util.CollectionUtil.ZERO_LENGTH_OBJECT_ARRAY);
+                final MultiSeries result = ((MultiSeries) series).pointColor(pointColor, io.deephaven.util.type.ArrayTypeUtils.EMPTY_OBJECT_ARRAY);
                 return make((SeriesInternal) result);
         } else {
             throw new PlotUnsupportedOperationException("Series type does not support this method.  seriesType=" + series.getClass() + " method='@Override public  FigureImpl pointColor( io.deephaven.gui.color.Paint pointColor )'", figure);
@@ -3326,7 +3326,7 @@ private FigureImpl applyFunctionalProperties() {
             DataSeries result = ((DataSeries) series).pointColor( pointColor);
             return make((DataSeriesInternal)result);
         } else if(series instanceof MultiSeries) {
-                final MultiSeries result = ((MultiSeries) series).pointColor(pointColor, io.deephaven.datastructures.util.CollectionUtil.ZERO_LENGTH_OBJECT_ARRAY);
+                final MultiSeries result = ((MultiSeries) series).pointColor(pointColor, io.deephaven.util.type.ArrayTypeUtils.EMPTY_OBJECT_ARRAY);
                 return make((SeriesInternal) result);
         } else {
             throw new PlotUnsupportedOperationException("Series type does not support this method.  seriesType=" + series.getClass() + " method='@Override public  FigureImpl pointColor( java.lang.String pointColor )'", figure);
@@ -3340,7 +3340,7 @@ private FigureImpl applyFunctionalProperties() {
             DataSeries result = ((DataSeries) series).pointLabel( pointLabel);
             return make((DataSeriesInternal)result);
         } else if(series instanceof MultiSeries) {
-                final MultiSeries result = ((MultiSeries) series).pointLabel(pointLabel, io.deephaven.datastructures.util.CollectionUtil.ZERO_LENGTH_OBJECT_ARRAY);
+                final MultiSeries result = ((MultiSeries) series).pointLabel(pointLabel, io.deephaven.util.type.ArrayTypeUtils.EMPTY_OBJECT_ARRAY);
                 return make((SeriesInternal) result);
         } else {
             throw new PlotUnsupportedOperationException("Series type does not support this method.  seriesType=" + series.getClass() + " method='@Override public  FigureImpl pointLabel( java.lang.Object pointLabel )'", figure);
@@ -3354,7 +3354,7 @@ private FigureImpl applyFunctionalProperties() {
             DataSeries result = ((DataSeries) series).pointLabelFormat( pointLabelFormat);
             return make((DataSeriesInternal)result);
         } else if(series instanceof MultiSeries) {
-                final MultiSeries result = ((MultiSeries) series).pointLabelFormat(pointLabelFormat, io.deephaven.datastructures.util.CollectionUtil.ZERO_LENGTH_OBJECT_ARRAY);
+                final MultiSeries result = ((MultiSeries) series).pointLabelFormat(pointLabelFormat, io.deephaven.util.type.ArrayTypeUtils.EMPTY_OBJECT_ARRAY);
                 return make((SeriesInternal) result);
         } else {
             throw new PlotUnsupportedOperationException("Series type does not support this method.  seriesType=" + series.getClass() + " method='@Override public  FigureImpl pointLabelFormat( java.lang.String pointLabelFormat )'", figure);
@@ -3368,7 +3368,7 @@ private FigureImpl applyFunctionalProperties() {
             DataSeries result = ((DataSeries) series).pointShape( pointShape);
             return make((DataSeriesInternal)result);
         } else if(series instanceof MultiSeries) {
-                final MultiSeries result = ((MultiSeries) series).pointShape(pointShape, io.deephaven.datastructures.util.CollectionUtil.ZERO_LENGTH_OBJECT_ARRAY);
+                final MultiSeries result = ((MultiSeries) series).pointShape(pointShape, io.deephaven.util.type.ArrayTypeUtils.EMPTY_OBJECT_ARRAY);
                 return make((SeriesInternal) result);
         } else {
             throw new PlotUnsupportedOperationException("Series type does not support this method.  seriesType=" + series.getClass() + " method='@Override public  FigureImpl pointShape( io.deephaven.gui.shape.Shape pointShape )'", figure);
@@ -3382,7 +3382,7 @@ private FigureImpl applyFunctionalProperties() {
             DataSeries result = ((DataSeries) series).pointShape( pointShape);
             return make((DataSeriesInternal)result);
         } else if(series instanceof MultiSeries) {
-                final MultiSeries result = ((MultiSeries) series).pointShape(pointShape, io.deephaven.datastructures.util.CollectionUtil.ZERO_LENGTH_OBJECT_ARRAY);
+                final MultiSeries result = ((MultiSeries) series).pointShape(pointShape, io.deephaven.util.type.ArrayTypeUtils.EMPTY_OBJECT_ARRAY);
                 return make((SeriesInternal) result);
         } else {
             throw new PlotUnsupportedOperationException("Series type does not support this method.  seriesType=" + series.getClass() + " method='@Override public  FigureImpl pointShape( java.lang.String pointShape )'", figure);
@@ -3396,7 +3396,7 @@ private FigureImpl applyFunctionalProperties() {
             DataSeries result = ((DataSeries) series).pointSize( pointSize);
             return make((DataSeriesInternal)result);
         } else if(series instanceof MultiSeries) {
-                final MultiSeries result = ((MultiSeries) series).pointSize(pointSize, io.deephaven.datastructures.util.CollectionUtil.ZERO_LENGTH_OBJECT_ARRAY);
+                final MultiSeries result = ((MultiSeries) series).pointSize(pointSize, io.deephaven.util.type.ArrayTypeUtils.EMPTY_OBJECT_ARRAY);
                 return make((SeriesInternal) result);
         } else {
             throw new PlotUnsupportedOperationException("Series type does not support this method.  seriesType=" + series.getClass() + " method='@Override public  FigureImpl pointSize( double pointSize )'", figure);
@@ -3410,7 +3410,7 @@ private FigureImpl applyFunctionalProperties() {
             DataSeries result = ((DataSeries) series).pointSize( pointSize);
             return make((DataSeriesInternal)result);
         } else if(series instanceof MultiSeries) {
-                final MultiSeries result = ((MultiSeries) series).pointSize(pointSize, io.deephaven.datastructures.util.CollectionUtil.ZERO_LENGTH_OBJECT_ARRAY);
+                final MultiSeries result = ((MultiSeries) series).pointSize(pointSize, io.deephaven.util.type.ArrayTypeUtils.EMPTY_OBJECT_ARRAY);
                 return make((SeriesInternal) result);
         } else {
             throw new PlotUnsupportedOperationException("Series type does not support this method.  seriesType=" + series.getClass() + " method='@Override public  FigureImpl pointSize( int pointSize )'", figure);
@@ -3424,7 +3424,7 @@ private FigureImpl applyFunctionalProperties() {
             DataSeries result = ((DataSeries) series).pointSize( pointSize);
             return make((DataSeriesInternal)result);
         } else if(series instanceof MultiSeries) {
-                final MultiSeries result = ((MultiSeries) series).pointSize(pointSize, io.deephaven.datastructures.util.CollectionUtil.ZERO_LENGTH_OBJECT_ARRAY);
+                final MultiSeries result = ((MultiSeries) series).pointSize(pointSize, io.deephaven.util.type.ArrayTypeUtils.EMPTY_OBJECT_ARRAY);
                 return make((SeriesInternal) result);
         } else {
             throw new PlotUnsupportedOperationException("Series type does not support this method.  seriesType=" + series.getClass() + " method='@Override public  FigureImpl pointSize( java.lang.Number pointSize )'", figure);
@@ -3438,7 +3438,7 @@ private FigureImpl applyFunctionalProperties() {
             DataSeries result = ((DataSeries) series).pointSize( pointSize);
             return make((DataSeriesInternal)result);
         } else if(series instanceof MultiSeries) {
-                final MultiSeries result = ((MultiSeries) series).pointSize(pointSize, io.deephaven.datastructures.util.CollectionUtil.ZERO_LENGTH_OBJECT_ARRAY);
+                final MultiSeries result = ((MultiSeries) series).pointSize(pointSize, io.deephaven.util.type.ArrayTypeUtils.EMPTY_OBJECT_ARRAY);
                 return make((SeriesInternal) result);
         } else {
             throw new PlotUnsupportedOperationException("Series type does not support this method.  seriesType=" + series.getClass() + " method='@Override public  FigureImpl pointSize( long pointSize )'", figure);
@@ -3452,7 +3452,7 @@ private FigureImpl applyFunctionalProperties() {
             DataSeries result = ((DataSeries) series).pointsVisible( visible);
             return make((DataSeriesInternal)result);
         } else if(series instanceof MultiSeries) {
-                final MultiSeries result = ((MultiSeries) series).pointsVisible(visible, io.deephaven.datastructures.util.CollectionUtil.ZERO_LENGTH_OBJECT_ARRAY);
+                final MultiSeries result = ((MultiSeries) series).pointsVisible(visible, io.deephaven.util.type.ArrayTypeUtils.EMPTY_OBJECT_ARRAY);
                 return make((SeriesInternal) result);
         } else {
             throw new PlotUnsupportedOperationException("Series type does not support this method.  seriesType=" + series.getClass() + " method='@Override public  FigureImpl pointsVisible( java.lang.Boolean visible )'", figure);
@@ -3466,7 +3466,7 @@ private FigureImpl applyFunctionalProperties() {
             DataSeries result = ((DataSeries) series).seriesColor( color);
             return make((DataSeriesInternal)result);
         } else if(series instanceof MultiSeries) {
-                final MultiSeries result = ((MultiSeries) series).seriesColor(color, io.deephaven.datastructures.util.CollectionUtil.ZERO_LENGTH_OBJECT_ARRAY);
+                final MultiSeries result = ((MultiSeries) series).seriesColor(color, io.deephaven.util.type.ArrayTypeUtils.EMPTY_OBJECT_ARRAY);
                 return make((SeriesInternal) result);
         } else {
             throw new PlotUnsupportedOperationException("Series type does not support this method.  seriesType=" + series.getClass() + " method='@Override public  FigureImpl seriesColor( int color )'", figure);
@@ -3480,7 +3480,7 @@ private FigureImpl applyFunctionalProperties() {
             DataSeries result = ((DataSeries) series).seriesColor( color);
             return make((DataSeriesInternal)result);
         } else if(series instanceof MultiSeries) {
-                final MultiSeries result = ((MultiSeries) series).seriesColor(color, io.deephaven.datastructures.util.CollectionUtil.ZERO_LENGTH_OBJECT_ARRAY);
+                final MultiSeries result = ((MultiSeries) series).seriesColor(color, io.deephaven.util.type.ArrayTypeUtils.EMPTY_OBJECT_ARRAY);
                 return make((SeriesInternal) result);
         } else {
             throw new PlotUnsupportedOperationException("Series type does not support this method.  seriesType=" + series.getClass() + " method='@Override public  FigureImpl seriesColor( io.deephaven.gui.color.Paint color )'", figure);
@@ -3494,7 +3494,7 @@ private FigureImpl applyFunctionalProperties() {
             DataSeries result = ((DataSeries) series).seriesColor( color);
             return make((DataSeriesInternal)result);
         } else if(series instanceof MultiSeries) {
-                final MultiSeries result = ((MultiSeries) series).seriesColor(color, io.deephaven.datastructures.util.CollectionUtil.ZERO_LENGTH_OBJECT_ARRAY);
+                final MultiSeries result = ((MultiSeries) series).seriesColor(color, io.deephaven.util.type.ArrayTypeUtils.EMPTY_OBJECT_ARRAY);
                 return make((SeriesInternal) result);
         } else {
             throw new PlotUnsupportedOperationException("Series type does not support this method.  seriesType=" + series.getClass() + " method='@Override public  FigureImpl seriesColor( java.lang.String color )'", figure);
@@ -3508,7 +3508,7 @@ private FigureImpl applyFunctionalProperties() {
             DataSeries result = ((DataSeries) series).toolTipPattern( toolTipPattern);
             return make((DataSeriesInternal)result);
         } else if(series instanceof MultiSeries) {
-                final MultiSeries result = ((MultiSeries) series).toolTipPattern(toolTipPattern, io.deephaven.datastructures.util.CollectionUtil.ZERO_LENGTH_OBJECT_ARRAY);
+                final MultiSeries result = ((MultiSeries) series).toolTipPattern(toolTipPattern, io.deephaven.util.type.ArrayTypeUtils.EMPTY_OBJECT_ARRAY);
                 return make((SeriesInternal) result);
         } else {
             throw new PlotUnsupportedOperationException("Series type does not support this method.  seriesType=" + series.getClass() + " method='@Override public  FigureImpl toolTipPattern( java.lang.String toolTipPattern )'", figure);
@@ -3522,7 +3522,7 @@ private FigureImpl applyFunctionalProperties() {
             DataSeries result = ((DataSeries) series).xToolTipPattern( xToolTipPattern);
             return make((DataSeriesInternal)result);
         } else if(series instanceof MultiSeries) {
-                final MultiSeries result = ((MultiSeries) series).xToolTipPattern(xToolTipPattern, io.deephaven.datastructures.util.CollectionUtil.ZERO_LENGTH_OBJECT_ARRAY);
+                final MultiSeries result = ((MultiSeries) series).xToolTipPattern(xToolTipPattern, io.deephaven.util.type.ArrayTypeUtils.EMPTY_OBJECT_ARRAY);
                 return make((SeriesInternal) result);
         } else {
             throw new PlotUnsupportedOperationException("Series type does not support this method.  seriesType=" + series.getClass() + " method='@Override public  FigureImpl xToolTipPattern( java.lang.String xToolTipPattern )'", figure);
@@ -3536,7 +3536,7 @@ private FigureImpl applyFunctionalProperties() {
             DataSeries result = ((DataSeries) series).yToolTipPattern( yToolTipPattern);
             return make((DataSeriesInternal)result);
         } else if(series instanceof MultiSeries) {
-                final MultiSeries result = ((MultiSeries) series).yToolTipPattern(yToolTipPattern, io.deephaven.datastructures.util.CollectionUtil.ZERO_LENGTH_OBJECT_ARRAY);
+                final MultiSeries result = ((MultiSeries) series).yToolTipPattern(yToolTipPattern, io.deephaven.util.type.ArrayTypeUtils.EMPTY_OBJECT_ARRAY);
                 return make((SeriesInternal) result);
         } else {
             throw new PlotUnsupportedOperationException("Series type does not support this method.  seriesType=" + series.getClass() + " method='@Override public  FigureImpl yToolTipPattern( java.lang.String yToolTipPattern )'", figure);
@@ -3550,7 +3550,7 @@ private FigureImpl applyFunctionalProperties() {
             CategoryDataSeries result = ((CategoryDataSeries) series).group( group);
             return make((DataSeriesInternal)result);
         } else if(series instanceof MultiSeries) {
-                final MultiSeries result = ((MultiSeries) series).group(group, io.deephaven.datastructures.util.CollectionUtil.ZERO_LENGTH_OBJECT_ARRAY);
+                final MultiSeries result = ((MultiSeries) series).group(group, io.deephaven.util.type.ArrayTypeUtils.EMPTY_OBJECT_ARRAY);
                 return make((SeriesInternal) result);
         } else {
             throw new PlotUnsupportedOperationException("Series type does not support this method.  seriesType=" + series.getClass() + " method='@Override public  FigureImpl group( int group )'", figure);
@@ -3564,7 +3564,7 @@ private FigureImpl applyFunctionalProperties() {
             CategoryDataSeries result = ((CategoryDataSeries) series).piePercentLabelFormat( pieLabelFormat);
             return make((DataSeriesInternal)result);
         } else if(series instanceof MultiSeries) {
-                final MultiSeries result = ((MultiSeries) series).piePercentLabelFormat(pieLabelFormat, io.deephaven.datastructures.util.CollectionUtil.ZERO_LENGTH_OBJECT_ARRAY);
+                final MultiSeries result = ((MultiSeries) series).piePercentLabelFormat(pieLabelFormat, io.deephaven.util.type.ArrayTypeUtils.EMPTY_OBJECT_ARRAY);
                 return make((SeriesInternal) result);
         } else {
             throw new PlotUnsupportedOperationException("Series type does not support this method.  seriesType=" + series.getClass() + " method='@Override public  FigureImpl piePercentLabelFormat( java.lang.String pieLabelFormat )'", figure);
@@ -3578,7 +3578,7 @@ private FigureImpl applyFunctionalProperties() {
             CategoryDataSeries result = ((CategoryDataSeries) series).pointColor( t, category, pointColor);
             return make((DataSeriesInternal)result);
         } else if(series instanceof MultiSeries) {
-                final MultiSeries result = ((MultiSeries) series).pointColor(t, category, pointColor, io.deephaven.datastructures.util.CollectionUtil.ZERO_LENGTH_OBJECT_ARRAY);
+                final MultiSeries result = ((MultiSeries) series).pointColor(t, category, pointColor, io.deephaven.util.type.ArrayTypeUtils.EMPTY_OBJECT_ARRAY);
                 return make((SeriesInternal) result);
         } else {
             throw new PlotUnsupportedOperationException("Series type does not support this method.  seriesType=" + series.getClass() + " method='@Override public  FigureImpl pointColor( io.deephaven.engine.table.Table t, java.lang.String category, java.lang.String pointColor )'", figure);
@@ -3592,7 +3592,7 @@ private FigureImpl applyFunctionalProperties() {
             CategoryDataSeries result = ((CategoryDataSeries) series).pointColor( sds, category, pointColor);
             return make((DataSeriesInternal)result);
         } else if(series instanceof MultiSeries) {
-                final MultiSeries result = ((MultiSeries) series).pointColor(sds, category, pointColor, io.deephaven.datastructures.util.CollectionUtil.ZERO_LENGTH_OBJECT_ARRAY);
+                final MultiSeries result = ((MultiSeries) series).pointColor(sds, category, pointColor, io.deephaven.util.type.ArrayTypeUtils.EMPTY_OBJECT_ARRAY);
                 return make((SeriesInternal) result);
         } else {
             throw new PlotUnsupportedOperationException("Series type does not support this method.  seriesType=" + series.getClass() + " method='@Override public  FigureImpl pointColor( io.deephaven.plot.filters.SelectableDataSet sds, java.lang.String category, java.lang.String pointColor )'", figure);
@@ -3606,7 +3606,7 @@ private FigureImpl applyFunctionalProperties() {
             CategoryDataSeries result = ((CategoryDataSeries) series).pointColor( category, pointColor);
             return make((DataSeriesInternal)result);
         } else if(series instanceof MultiSeries) {
-                final MultiSeries result = ((MultiSeries) series).pointColor(category, pointColor, io.deephaven.datastructures.util.CollectionUtil.ZERO_LENGTH_OBJECT_ARRAY);
+                final MultiSeries result = ((MultiSeries) series).pointColor(category, pointColor, io.deephaven.util.type.ArrayTypeUtils.EMPTY_OBJECT_ARRAY);
                 return make((SeriesInternal) result);
         } else {
             throw new PlotUnsupportedOperationException("Series type does not support this method.  seriesType=" + series.getClass() + " method='@Override public  FigureImpl pointColor( java.lang.Comparable category, int pointColor )'", figure);
@@ -3620,7 +3620,7 @@ private FigureImpl applyFunctionalProperties() {
             CategoryDataSeries result = ((CategoryDataSeries) series).pointColor( category, pointColor);
             return make((DataSeriesInternal)result);
         } else if(series instanceof MultiSeries) {
-                final MultiSeries result = ((MultiSeries) series).pointColor(category, pointColor, io.deephaven.datastructures.util.CollectionUtil.ZERO_LENGTH_OBJECT_ARRAY);
+                final MultiSeries result = ((MultiSeries) series).pointColor(category, pointColor, io.deephaven.util.type.ArrayTypeUtils.EMPTY_OBJECT_ARRAY);
                 return make((SeriesInternal) result);
         } else {
             throw new PlotUnsupportedOperationException("Series type does not support this method.  seriesType=" + series.getClass() + " method='@Override public  FigureImpl pointColor( java.lang.Comparable category, io.deephaven.gui.color.Paint pointColor )'", figure);
@@ -3634,7 +3634,7 @@ private FigureImpl applyFunctionalProperties() {
             CategoryDataSeries result = ((CategoryDataSeries) series).pointColor( category, pointColor);
             return make((DataSeriesInternal)result);
         } else if(series instanceof MultiSeries) {
-                final MultiSeries result = ((MultiSeries) series).pointColor(category, pointColor, io.deephaven.datastructures.util.CollectionUtil.ZERO_LENGTH_OBJECT_ARRAY);
+                final MultiSeries result = ((MultiSeries) series).pointColor(category, pointColor, io.deephaven.util.type.ArrayTypeUtils.EMPTY_OBJECT_ARRAY);
                 return make((SeriesInternal) result);
         } else {
             throw new PlotUnsupportedOperationException("Series type does not support this method.  seriesType=" + series.getClass() + " method='@Override public  FigureImpl pointColor( java.lang.Comparable category, java.lang.String pointColor )'", figure);
@@ -3648,7 +3648,7 @@ private FigureImpl applyFunctionalProperties() {
             CategoryDataSeries result = ((CategoryDataSeries) series).pointLabel( t, category, pointLabel);
             return make((DataSeriesInternal)result);
         } else if(series instanceof MultiSeries) {
-                final MultiSeries result = ((MultiSeries) series).pointLabel(t, category, pointLabel, io.deephaven.datastructures.util.CollectionUtil.ZERO_LENGTH_OBJECT_ARRAY);
+                final MultiSeries result = ((MultiSeries) series).pointLabel(t, category, pointLabel, io.deephaven.util.type.ArrayTypeUtils.EMPTY_OBJECT_ARRAY);
                 return make((SeriesInternal) result);
         } else {
             throw new PlotUnsupportedOperationException("Series type does not support this method.  seriesType=" + series.getClass() + " method='@Override public  FigureImpl pointLabel( io.deephaven.engine.table.Table t, java.lang.String category, java.lang.String pointLabel )'", figure);
@@ -3662,7 +3662,7 @@ private FigureImpl applyFunctionalProperties() {
             CategoryDataSeries result = ((CategoryDataSeries) series).pointLabel( sds, category, pointLabel);
             return make((DataSeriesInternal)result);
         } else if(series instanceof MultiSeries) {
-                final MultiSeries result = ((MultiSeries) series).pointLabel(sds, category, pointLabel, io.deephaven.datastructures.util.CollectionUtil.ZERO_LENGTH_OBJECT_ARRAY);
+                final MultiSeries result = ((MultiSeries) series).pointLabel(sds, category, pointLabel, io.deephaven.util.type.ArrayTypeUtils.EMPTY_OBJECT_ARRAY);
                 return make((SeriesInternal) result);
         } else {
             throw new PlotUnsupportedOperationException("Series type does not support this method.  seriesType=" + series.getClass() + " method='@Override public  FigureImpl pointLabel( io.deephaven.plot.filters.SelectableDataSet sds, java.lang.String category, java.lang.String pointLabel )'", figure);
@@ -3676,7 +3676,7 @@ private FigureImpl applyFunctionalProperties() {
             CategoryDataSeries result = ((CategoryDataSeries) series).pointLabel( category, pointLabel);
             return make((DataSeriesInternal)result);
         } else if(series instanceof MultiSeries) {
-                final MultiSeries result = ((MultiSeries) series).pointLabel(category, pointLabel, io.deephaven.datastructures.util.CollectionUtil.ZERO_LENGTH_OBJECT_ARRAY);
+                final MultiSeries result = ((MultiSeries) series).pointLabel(category, pointLabel, io.deephaven.util.type.ArrayTypeUtils.EMPTY_OBJECT_ARRAY);
                 return make((SeriesInternal) result);
         } else {
             throw new PlotUnsupportedOperationException("Series type does not support this method.  seriesType=" + series.getClass() + " method='@Override public  FigureImpl pointLabel( java.lang.Comparable category, java.lang.Object pointLabel )'", figure);
@@ -3690,7 +3690,7 @@ private FigureImpl applyFunctionalProperties() {
             CategoryDataSeries result = ((CategoryDataSeries) series).pointShape( pointShapes);
             return make((DataSeriesInternal)result);
         } else if(series instanceof MultiSeries) {
-                final MultiSeries result = ((MultiSeries) series).pointShape(pointShapes, io.deephaven.datastructures.util.CollectionUtil.ZERO_LENGTH_OBJECT_ARRAY);
+                final MultiSeries result = ((MultiSeries) series).pointShape(pointShapes, io.deephaven.util.type.ArrayTypeUtils.EMPTY_OBJECT_ARRAY);
                 return make((SeriesInternal) result);
         } else {
             throw new PlotUnsupportedOperationException("Series type does not support this method.  seriesType=" + series.getClass() + " method='@Override public  FigureImpl pointShape( groovy.lang.Closure<java.lang.String> pointShapes )'", figure);
@@ -3704,7 +3704,7 @@ private FigureImpl applyFunctionalProperties() {
             CategoryDataSeries result = ((CategoryDataSeries) series).pointShape( t, category, pointShape);
             return make((DataSeriesInternal)result);
         } else if(series instanceof MultiSeries) {
-                final MultiSeries result = ((MultiSeries) series).pointShape(t, category, pointShape, io.deephaven.datastructures.util.CollectionUtil.ZERO_LENGTH_OBJECT_ARRAY);
+                final MultiSeries result = ((MultiSeries) series).pointShape(t, category, pointShape, io.deephaven.util.type.ArrayTypeUtils.EMPTY_OBJECT_ARRAY);
                 return make((SeriesInternal) result);
         } else {
             throw new PlotUnsupportedOperationException("Series type does not support this method.  seriesType=" + series.getClass() + " method='@Override public  FigureImpl pointShape( io.deephaven.engine.table.Table t, java.lang.String category, java.lang.String pointShape )'", figure);
@@ -3718,7 +3718,7 @@ private FigureImpl applyFunctionalProperties() {
             CategoryDataSeries result = ((CategoryDataSeries) series).pointShape( sds, category, pointShape);
             return make((DataSeriesInternal)result);
         } else if(series instanceof MultiSeries) {
-                final MultiSeries result = ((MultiSeries) series).pointShape(sds, category, pointShape, io.deephaven.datastructures.util.CollectionUtil.ZERO_LENGTH_OBJECT_ARRAY);
+                final MultiSeries result = ((MultiSeries) series).pointShape(sds, category, pointShape, io.deephaven.util.type.ArrayTypeUtils.EMPTY_OBJECT_ARRAY);
                 return make((SeriesInternal) result);
         } else {
             throw new PlotUnsupportedOperationException("Series type does not support this method.  seriesType=" + series.getClass() + " method='@Override public  FigureImpl pointShape( io.deephaven.plot.filters.SelectableDataSet sds, java.lang.String category, java.lang.String pointShape )'", figure);
@@ -3732,7 +3732,7 @@ private FigureImpl applyFunctionalProperties() {
             CategoryDataSeries result = ((CategoryDataSeries) series).pointShape( category, pointShape);
             return make((DataSeriesInternal)result);
         } else if(series instanceof MultiSeries) {
-                final MultiSeries result = ((MultiSeries) series).pointShape(category, pointShape, io.deephaven.datastructures.util.CollectionUtil.ZERO_LENGTH_OBJECT_ARRAY);
+                final MultiSeries result = ((MultiSeries) series).pointShape(category, pointShape, io.deephaven.util.type.ArrayTypeUtils.EMPTY_OBJECT_ARRAY);
                 return make((SeriesInternal) result);
         } else {
             throw new PlotUnsupportedOperationException("Series type does not support this method.  seriesType=" + series.getClass() + " method='@Override public  FigureImpl pointShape( java.lang.Comparable category, io.deephaven.gui.shape.Shape pointShape )'", figure);
@@ -3746,7 +3746,7 @@ private FigureImpl applyFunctionalProperties() {
             CategoryDataSeries result = ((CategoryDataSeries) series).pointShape( category, pointShape);
             return make((DataSeriesInternal)result);
         } else if(series instanceof MultiSeries) {
-                final MultiSeries result = ((MultiSeries) series).pointShape(category, pointShape, io.deephaven.datastructures.util.CollectionUtil.ZERO_LENGTH_OBJECT_ARRAY);
+                final MultiSeries result = ((MultiSeries) series).pointShape(category, pointShape, io.deephaven.util.type.ArrayTypeUtils.EMPTY_OBJECT_ARRAY);
                 return make((SeriesInternal) result);
         } else {
             throw new PlotUnsupportedOperationException("Series type does not support this method.  seriesType=" + series.getClass() + " method='@Override public  FigureImpl pointShape( java.lang.Comparable category, java.lang.String pointShape )'", figure);
@@ -3760,7 +3760,7 @@ private FigureImpl applyFunctionalProperties() {
             CategoryDataSeries result = ((CategoryDataSeries) series).pointShape( pointShapes);
             return make((DataSeriesInternal)result);
         } else if(series instanceof MultiSeries) {
-                final MultiSeries result = ((MultiSeries) series).pointShape(pointShapes, io.deephaven.datastructures.util.CollectionUtil.ZERO_LENGTH_OBJECT_ARRAY);
+                final MultiSeries result = ((MultiSeries) series).pointShape(pointShapes, io.deephaven.util.type.ArrayTypeUtils.EMPTY_OBJECT_ARRAY);
                 return make((SeriesInternal) result);
         } else {
             throw new PlotUnsupportedOperationException("Series type does not support this method.  seriesType=" + series.getClass() + " method='@Override public  FigureImpl pointShape( java.util.function.Function<java.lang.Comparable, java.lang.String> pointShapes )'", figure);
@@ -3774,7 +3774,7 @@ private FigureImpl applyFunctionalProperties() {
             CategoryDataSeries result = ((CategoryDataSeries) series).pointSize( t, category, pointSize);
             return make((DataSeriesInternal)result);
         } else if(series instanceof MultiSeries) {
-                final MultiSeries result = ((MultiSeries) series).pointSize(t, category, pointSize, io.deephaven.datastructures.util.CollectionUtil.ZERO_LENGTH_OBJECT_ARRAY);
+                final MultiSeries result = ((MultiSeries) series).pointSize(t, category, pointSize, io.deephaven.util.type.ArrayTypeUtils.EMPTY_OBJECT_ARRAY);
                 return make((SeriesInternal) result);
         } else {
             throw new PlotUnsupportedOperationException("Series type does not support this method.  seriesType=" + series.getClass() + " method='@Override public  FigureImpl pointSize( io.deephaven.engine.table.Table t, java.lang.String category, java.lang.String pointSize )'", figure);
@@ -3788,7 +3788,7 @@ private FigureImpl applyFunctionalProperties() {
             CategoryDataSeries result = ((CategoryDataSeries) series).pointSize( sds, category, pointSize);
             return make((DataSeriesInternal)result);
         } else if(series instanceof MultiSeries) {
-                final MultiSeries result = ((MultiSeries) series).pointSize(sds, category, pointSize, io.deephaven.datastructures.util.CollectionUtil.ZERO_LENGTH_OBJECT_ARRAY);
+                final MultiSeries result = ((MultiSeries) series).pointSize(sds, category, pointSize, io.deephaven.util.type.ArrayTypeUtils.EMPTY_OBJECT_ARRAY);
                 return make((SeriesInternal) result);
         } else {
             throw new PlotUnsupportedOperationException("Series type does not support this method.  seriesType=" + series.getClass() + " method='@Override public  FigureImpl pointSize( io.deephaven.plot.filters.SelectableDataSet sds, java.lang.String category, java.lang.String pointSize )'", figure);
@@ -3802,7 +3802,7 @@ private FigureImpl applyFunctionalProperties() {
             CategoryDataSeries result = ((CategoryDataSeries) series).pointSize( category, pointSize);
             return make((DataSeriesInternal)result);
         } else if(series instanceof MultiSeries) {
-                final MultiSeries result = ((MultiSeries) series).pointSize(category, pointSize, io.deephaven.datastructures.util.CollectionUtil.ZERO_LENGTH_OBJECT_ARRAY);
+                final MultiSeries result = ((MultiSeries) series).pointSize(category, pointSize, io.deephaven.util.type.ArrayTypeUtils.EMPTY_OBJECT_ARRAY);
                 return make((SeriesInternal) result);
         } else {
             throw new PlotUnsupportedOperationException("Series type does not support this method.  seriesType=" + series.getClass() + " method='@Override public  FigureImpl pointSize( java.lang.Comparable category, double pointSize )'", figure);
@@ -3816,7 +3816,7 @@ private FigureImpl applyFunctionalProperties() {
             CategoryDataSeries result = ((CategoryDataSeries) series).pointSize( category, pointSize);
             return make((DataSeriesInternal)result);
         } else if(series instanceof MultiSeries) {
-                final MultiSeries result = ((MultiSeries) series).pointSize(category, pointSize, io.deephaven.datastructures.util.CollectionUtil.ZERO_LENGTH_OBJECT_ARRAY);
+                final MultiSeries result = ((MultiSeries) series).pointSize(category, pointSize, io.deephaven.util.type.ArrayTypeUtils.EMPTY_OBJECT_ARRAY);
                 return make((SeriesInternal) result);
         } else {
             throw new PlotUnsupportedOperationException("Series type does not support this method.  seriesType=" + series.getClass() + " method='@Override public  FigureImpl pointSize( java.lang.Comparable category, int pointSize )'", figure);
@@ -3830,7 +3830,7 @@ private FigureImpl applyFunctionalProperties() {
             CategoryDataSeries result = ((CategoryDataSeries) series).pointSize( category, pointSize);
             return make((DataSeriesInternal)result);
         } else if(series instanceof MultiSeries) {
-                final MultiSeries result = ((MultiSeries) series).pointSize(category, pointSize, io.deephaven.datastructures.util.CollectionUtil.ZERO_LENGTH_OBJECT_ARRAY);
+                final MultiSeries result = ((MultiSeries) series).pointSize(category, pointSize, io.deephaven.util.type.ArrayTypeUtils.EMPTY_OBJECT_ARRAY);
                 return make((SeriesInternal) result);
         } else {
             throw new PlotUnsupportedOperationException("Series type does not support this method.  seriesType=" + series.getClass() + " method='@Override public  FigureImpl pointSize( java.lang.Comparable category, java.lang.Number pointSize )'", figure);
@@ -3844,7 +3844,7 @@ private FigureImpl applyFunctionalProperties() {
             CategoryDataSeries result = ((CategoryDataSeries) series).pointSize( category, pointSize);
             return make((DataSeriesInternal)result);
         } else if(series instanceof MultiSeries) {
-                final MultiSeries result = ((MultiSeries) series).pointSize(category, pointSize, io.deephaven.datastructures.util.CollectionUtil.ZERO_LENGTH_OBJECT_ARRAY);
+                final MultiSeries result = ((MultiSeries) series).pointSize(category, pointSize, io.deephaven.util.type.ArrayTypeUtils.EMPTY_OBJECT_ARRAY);
                 return make((SeriesInternal) result);
         } else {
             throw new PlotUnsupportedOperationException("Series type does not support this method.  seriesType=" + series.getClass() + " method='@Override public  FigureImpl pointSize( java.lang.Comparable category, long pointSize )'", figure);
@@ -4628,7 +4628,7 @@ private FigureImpl applyFunctionalProperties() {
             XYDataSeries result = ((XYDataSeries) series).pointColor( pointColors);
             return make((DataSeriesInternal)result);
         } else if(series instanceof MultiSeries) {
-                final MultiSeries result = ((MultiSeries) series).pointColor(pointColors, io.deephaven.datastructures.util.CollectionUtil.ZERO_LENGTH_OBJECT_ARRAY);
+                final MultiSeries result = ((MultiSeries) series).pointColor(pointColors, io.deephaven.util.type.ArrayTypeUtils.EMPTY_OBJECT_ARRAY);
                 return make((SeriesInternal) result);
         } else {
             throw new PlotUnsupportedOperationException("Series type does not support this method.  seriesType=" + series.getClass() + " method='@Override public  FigureImpl pointColor( int... pointColors )'", figure);
@@ -4642,7 +4642,7 @@ private FigureImpl applyFunctionalProperties() {
             XYDataSeries result = ((XYDataSeries) series).pointColor( t, pointColors);
             return make((DataSeriesInternal)result);
         } else if(series instanceof MultiSeries) {
-                final MultiSeries result = ((MultiSeries) series).pointColor(t, pointColors, io.deephaven.datastructures.util.CollectionUtil.ZERO_LENGTH_OBJECT_ARRAY);
+                final MultiSeries result = ((MultiSeries) series).pointColor(t, pointColors, io.deephaven.util.type.ArrayTypeUtils.EMPTY_OBJECT_ARRAY);
                 return make((SeriesInternal) result);
         } else {
             throw new PlotUnsupportedOperationException("Series type does not support this method.  seriesType=" + series.getClass() + " method='@Override public  FigureImpl pointColor( io.deephaven.engine.table.Table t, java.lang.String pointColors )'", figure);
@@ -4656,7 +4656,7 @@ private FigureImpl applyFunctionalProperties() {
             XYDataSeries result = ((XYDataSeries) series).pointColor( pointColor);
             return make((DataSeriesInternal)result);
         } else if(series instanceof MultiSeries) {
-                final MultiSeries result = ((MultiSeries) series).pointColor(pointColor, io.deephaven.datastructures.util.CollectionUtil.ZERO_LENGTH_OBJECT_ARRAY);
+                final MultiSeries result = ((MultiSeries) series).pointColor(pointColor, io.deephaven.util.type.ArrayTypeUtils.EMPTY_OBJECT_ARRAY);
                 return make((SeriesInternal) result);
         } else {
             throw new PlotUnsupportedOperationException("Series type does not support this method.  seriesType=" + series.getClass() + " method='@Override public  FigureImpl pointColor( io.deephaven.gui.color.Paint... pointColor )'", figure);
@@ -4670,7 +4670,7 @@ private FigureImpl applyFunctionalProperties() {
             XYDataSeries result = ((XYDataSeries) series).pointColor( sds, pointColors);
             return make((DataSeriesInternal)result);
         } else if(series instanceof MultiSeries) {
-                final MultiSeries result = ((MultiSeries) series).pointColor(sds, pointColors, io.deephaven.datastructures.util.CollectionUtil.ZERO_LENGTH_OBJECT_ARRAY);
+                final MultiSeries result = ((MultiSeries) series).pointColor(sds, pointColors, io.deephaven.util.type.ArrayTypeUtils.EMPTY_OBJECT_ARRAY);
                 return make((SeriesInternal) result);
         } else {
             throw new PlotUnsupportedOperationException("Series type does not support this method.  seriesType=" + series.getClass() + " method='@Override public  FigureImpl pointColor( io.deephaven.plot.filters.SelectableDataSet sds, java.lang.String pointColors )'", figure);
@@ -4684,7 +4684,7 @@ private FigureImpl applyFunctionalProperties() {
             XYDataSeries result = ((XYDataSeries) series).pointColor( pointColors);
             return make((DataSeriesInternal)result);
         } else if(series instanceof MultiSeries) {
-                final MultiSeries result = ((MultiSeries) series).pointColor(pointColors, io.deephaven.datastructures.util.CollectionUtil.ZERO_LENGTH_OBJECT_ARRAY);
+                final MultiSeries result = ((MultiSeries) series).pointColor(pointColors, io.deephaven.util.type.ArrayTypeUtils.EMPTY_OBJECT_ARRAY);
                 return make((SeriesInternal) result);
         } else {
             throw new PlotUnsupportedOperationException("Series type does not support this method.  seriesType=" + series.getClass() + " method='@Override public  FigureImpl pointColor( java.lang.Integer... pointColors )'", figure);
@@ -4698,7 +4698,7 @@ private FigureImpl applyFunctionalProperties() {
             XYDataSeries result = ((XYDataSeries) series).pointColor( pointColors);
             return make((DataSeriesInternal)result);
         } else if(series instanceof MultiSeries) {
-                final MultiSeries result = ((MultiSeries) series).pointColor(pointColors, io.deephaven.datastructures.util.CollectionUtil.ZERO_LENGTH_OBJECT_ARRAY);
+                final MultiSeries result = ((MultiSeries) series).pointColor(pointColors, io.deephaven.util.type.ArrayTypeUtils.EMPTY_OBJECT_ARRAY);
                 return make((SeriesInternal) result);
         } else {
             throw new PlotUnsupportedOperationException("Series type does not support this method.  seriesType=" + series.getClass() + " method='@Override public  FigureImpl pointColor( java.lang.String... pointColors )'", figure);
@@ -4712,7 +4712,7 @@ private FigureImpl applyFunctionalProperties() {
             XYDataSeries result = ((XYDataSeries) series).pointColorInteger( colors);
             return make((DataSeriesInternal)result);
         } else if(series instanceof MultiSeries) {
-                final MultiSeries result = ((MultiSeries) series).pointColorInteger(colors, io.deephaven.datastructures.util.CollectionUtil.ZERO_LENGTH_OBJECT_ARRAY);
+                final MultiSeries result = ((MultiSeries) series).pointColorInteger(colors, io.deephaven.util.type.ArrayTypeUtils.EMPTY_OBJECT_ARRAY);
                 return make((SeriesInternal) result);
         } else {
             throw new PlotUnsupportedOperationException("Series type does not support this method.  seriesType=" + series.getClass() + " method='@Override public  FigureImpl pointColorInteger( io.deephaven.plot.datasets.data.IndexableData<java.lang.Integer> colors )'", figure);
@@ -4726,7 +4726,7 @@ private FigureImpl applyFunctionalProperties() {
             XYDataSeries result = ((XYDataSeries) series).pointLabel( t, pointLabel);
             return make((DataSeriesInternal)result);
         } else if(series instanceof MultiSeries) {
-                final MultiSeries result = ((MultiSeries) series).pointLabel(t, pointLabel, io.deephaven.datastructures.util.CollectionUtil.ZERO_LENGTH_OBJECT_ARRAY);
+                final MultiSeries result = ((MultiSeries) series).pointLabel(t, pointLabel, io.deephaven.util.type.ArrayTypeUtils.EMPTY_OBJECT_ARRAY);
                 return make((SeriesInternal) result);
         } else {
             throw new PlotUnsupportedOperationException("Series type does not support this method.  seriesType=" + series.getClass() + " method='@Override public  FigureImpl pointLabel( io.deephaven.engine.table.Table t, java.lang.String pointLabel )'", figure);
@@ -4740,7 +4740,7 @@ private FigureImpl applyFunctionalProperties() {
             XYDataSeries result = ((XYDataSeries) series).pointLabel( pointLabels);
             return make((DataSeriesInternal)result);
         } else if(series instanceof MultiSeries) {
-                final MultiSeries result = ((MultiSeries) series).pointLabel(pointLabels, io.deephaven.datastructures.util.CollectionUtil.ZERO_LENGTH_OBJECT_ARRAY);
+                final MultiSeries result = ((MultiSeries) series).pointLabel(pointLabels, io.deephaven.util.type.ArrayTypeUtils.EMPTY_OBJECT_ARRAY);
                 return make((SeriesInternal) result);
         } else {
             throw new PlotUnsupportedOperationException("Series type does not support this method.  seriesType=" + series.getClass() + " method='@Override public  FigureImpl pointLabel( io.deephaven.plot.datasets.data.IndexableData<?> pointLabels )'", figure);
@@ -4754,7 +4754,7 @@ private FigureImpl applyFunctionalProperties() {
             XYDataSeries result = ((XYDataSeries) series).pointLabel( sds, pointLabel);
             return make((DataSeriesInternal)result);
         } else if(series instanceof MultiSeries) {
-                final MultiSeries result = ((MultiSeries) series).pointLabel(sds, pointLabel, io.deephaven.datastructures.util.CollectionUtil.ZERO_LENGTH_OBJECT_ARRAY);
+                final MultiSeries result = ((MultiSeries) series).pointLabel(sds, pointLabel, io.deephaven.util.type.ArrayTypeUtils.EMPTY_OBJECT_ARRAY);
                 return make((SeriesInternal) result);
         } else {
             throw new PlotUnsupportedOperationException("Series type does not support this method.  seriesType=" + series.getClass() + " method='@Override public  FigureImpl pointLabel( io.deephaven.plot.filters.SelectableDataSet sds, java.lang.String pointLabel )'", figure);
@@ -4768,7 +4768,7 @@ private FigureImpl applyFunctionalProperties() {
             XYDataSeries result = ((XYDataSeries) series).pointLabel( pointLabels);
             return make((DataSeriesInternal)result);
         } else if(series instanceof MultiSeries) {
-                final MultiSeries result = ((MultiSeries) series).pointLabel(pointLabels, io.deephaven.datastructures.util.CollectionUtil.ZERO_LENGTH_OBJECT_ARRAY);
+                final MultiSeries result = ((MultiSeries) series).pointLabel(pointLabels, io.deephaven.util.type.ArrayTypeUtils.EMPTY_OBJECT_ARRAY);
                 return make((SeriesInternal) result);
         } else {
             throw new PlotUnsupportedOperationException("Series type does not support this method.  seriesType=" + series.getClass() + " method='@Override public  FigureImpl pointLabel( java.lang.Object... pointLabels )'", figure);
@@ -4782,7 +4782,7 @@ private FigureImpl applyFunctionalProperties() {
             XYDataSeries result = ((XYDataSeries) series).pointShape( t, pointShape);
             return make((DataSeriesInternal)result);
         } else if(series instanceof MultiSeries) {
-                final MultiSeries result = ((MultiSeries) series).pointShape(t, pointShape, io.deephaven.datastructures.util.CollectionUtil.ZERO_LENGTH_OBJECT_ARRAY);
+                final MultiSeries result = ((MultiSeries) series).pointShape(t, pointShape, io.deephaven.util.type.ArrayTypeUtils.EMPTY_OBJECT_ARRAY);
                 return make((SeriesInternal) result);
         } else {
             throw new PlotUnsupportedOperationException("Series type does not support this method.  seriesType=" + series.getClass() + " method='@Override public  FigureImpl pointShape( io.deephaven.engine.table.Table t, java.lang.String pointShape )'", figure);
@@ -4796,7 +4796,7 @@ private FigureImpl applyFunctionalProperties() {
             XYDataSeries result = ((XYDataSeries) series).pointShape( pointShapes);
             return make((DataSeriesInternal)result);
         } else if(series instanceof MultiSeries) {
-                final MultiSeries result = ((MultiSeries) series).pointShape(pointShapes, io.deephaven.datastructures.util.CollectionUtil.ZERO_LENGTH_OBJECT_ARRAY);
+                final MultiSeries result = ((MultiSeries) series).pointShape(pointShapes, io.deephaven.util.type.ArrayTypeUtils.EMPTY_OBJECT_ARRAY);
                 return make((SeriesInternal) result);
         } else {
             throw new PlotUnsupportedOperationException("Series type does not support this method.  seriesType=" + series.getClass() + " method='@Override public  FigureImpl pointShape( io.deephaven.gui.shape.Shape... pointShapes )'", figure);
@@ -4810,7 +4810,7 @@ private FigureImpl applyFunctionalProperties() {
             XYDataSeries result = ((XYDataSeries) series).pointShape( pointShapes);
             return make((DataSeriesInternal)result);
         } else if(series instanceof MultiSeries) {
-                final MultiSeries result = ((MultiSeries) series).pointShape(pointShapes, io.deephaven.datastructures.util.CollectionUtil.ZERO_LENGTH_OBJECT_ARRAY);
+                final MultiSeries result = ((MultiSeries) series).pointShape(pointShapes, io.deephaven.util.type.ArrayTypeUtils.EMPTY_OBJECT_ARRAY);
                 return make((SeriesInternal) result);
         } else {
             throw new PlotUnsupportedOperationException("Series type does not support this method.  seriesType=" + series.getClass() + " method='@Override public  FigureImpl pointShape( io.deephaven.plot.datasets.data.IndexableData<java.lang.String> pointShapes )'", figure);
@@ -4824,7 +4824,7 @@ private FigureImpl applyFunctionalProperties() {
             XYDataSeries result = ((XYDataSeries) series).pointShape( sds, pointShape);
             return make((DataSeriesInternal)result);
         } else if(series instanceof MultiSeries) {
-                final MultiSeries result = ((MultiSeries) series).pointShape(sds, pointShape, io.deephaven.datastructures.util.CollectionUtil.ZERO_LENGTH_OBJECT_ARRAY);
+                final MultiSeries result = ((MultiSeries) series).pointShape(sds, pointShape, io.deephaven.util.type.ArrayTypeUtils.EMPTY_OBJECT_ARRAY);
                 return make((SeriesInternal) result);
         } else {
             throw new PlotUnsupportedOperationException("Series type does not support this method.  seriesType=" + series.getClass() + " method='@Override public  FigureImpl pointShape( io.deephaven.plot.filters.SelectableDataSet sds, java.lang.String pointShape )'", figure);
@@ -4838,7 +4838,7 @@ private FigureImpl applyFunctionalProperties() {
             XYDataSeries result = ((XYDataSeries) series).pointShape( pointShapes);
             return make((DataSeriesInternal)result);
         } else if(series instanceof MultiSeries) {
-                final MultiSeries result = ((MultiSeries) series).pointShape(pointShapes, io.deephaven.datastructures.util.CollectionUtil.ZERO_LENGTH_OBJECT_ARRAY);
+                final MultiSeries result = ((MultiSeries) series).pointShape(pointShapes, io.deephaven.util.type.ArrayTypeUtils.EMPTY_OBJECT_ARRAY);
                 return make((SeriesInternal) result);
         } else {
             throw new PlotUnsupportedOperationException("Series type does not support this method.  seriesType=" + series.getClass() + " method='@Override public  FigureImpl pointShape( java.lang.String... pointShapes )'", figure);
@@ -4852,7 +4852,7 @@ private FigureImpl applyFunctionalProperties() {
             XYDataSeries result = ((XYDataSeries) series).pointSize( pointSizes);
             return make((DataSeriesInternal)result);
         } else if(series instanceof MultiSeries) {
-                final MultiSeries result = ((MultiSeries) series).pointSize(pointSizes, io.deephaven.datastructures.util.CollectionUtil.ZERO_LENGTH_OBJECT_ARRAY);
+                final MultiSeries result = ((MultiSeries) series).pointSize(pointSizes, io.deephaven.util.type.ArrayTypeUtils.EMPTY_OBJECT_ARRAY);
                 return make((SeriesInternal) result);
         } else {
             throw new PlotUnsupportedOperationException("Series type does not support this method.  seriesType=" + series.getClass() + " method='@Override public  FigureImpl pointSize( double... pointSizes )'", figure);
@@ -4866,7 +4866,7 @@ private FigureImpl applyFunctionalProperties() {
             XYDataSeries result = ((XYDataSeries) series).pointSize( pointSizes);
             return make((DataSeriesInternal)result);
         } else if(series instanceof MultiSeries) {
-                final MultiSeries result = ((MultiSeries) series).pointSize(pointSizes, io.deephaven.datastructures.util.CollectionUtil.ZERO_LENGTH_OBJECT_ARRAY);
+                final MultiSeries result = ((MultiSeries) series).pointSize(pointSizes, io.deephaven.util.type.ArrayTypeUtils.EMPTY_OBJECT_ARRAY);
                 return make((SeriesInternal) result);
         } else {
             throw new PlotUnsupportedOperationException("Series type does not support this method.  seriesType=" + series.getClass() + " method='@Override public  FigureImpl pointSize( int... pointSizes )'", figure);
@@ -4880,7 +4880,7 @@ private FigureImpl applyFunctionalProperties() {
             XYDataSeries result = ((XYDataSeries) series).pointSize( t, pointSizes);
             return make((DataSeriesInternal)result);
         } else if(series instanceof MultiSeries) {
-                final MultiSeries result = ((MultiSeries) series).pointSize(t, pointSizes, io.deephaven.datastructures.util.CollectionUtil.ZERO_LENGTH_OBJECT_ARRAY);
+                final MultiSeries result = ((MultiSeries) series).pointSize(t, pointSizes, io.deephaven.util.type.ArrayTypeUtils.EMPTY_OBJECT_ARRAY);
                 return make((SeriesInternal) result);
         } else {
             throw new PlotUnsupportedOperationException("Series type does not support this method.  seriesType=" + series.getClass() + " method='@Override public  FigureImpl pointSize( io.deephaven.engine.table.Table t, java.lang.String pointSizes )'", figure);
@@ -4894,7 +4894,7 @@ private FigureImpl applyFunctionalProperties() {
             XYDataSeries result = ((XYDataSeries) series).pointSize( pointSizes);
             return make((DataSeriesInternal)result);
         } else if(series instanceof MultiSeries) {
-                final MultiSeries result = ((MultiSeries) series).pointSize(pointSizes, io.deephaven.datastructures.util.CollectionUtil.ZERO_LENGTH_OBJECT_ARRAY);
+                final MultiSeries result = ((MultiSeries) series).pointSize(pointSizes, io.deephaven.util.type.ArrayTypeUtils.EMPTY_OBJECT_ARRAY);
                 return make((SeriesInternal) result);
         } else {
             throw new PlotUnsupportedOperationException("Series type does not support this method.  seriesType=" + series.getClass() + " method='@Override public  FigureImpl pointSize( io.deephaven.plot.datasets.data.IndexableData<java.lang.Double> pointSizes )'", figure);
@@ -4908,7 +4908,7 @@ private FigureImpl applyFunctionalProperties() {
             XYDataSeries result = ((XYDataSeries) series).pointSize( sds, pointSize);
             return make((DataSeriesInternal)result);
         } else if(series instanceof MultiSeries) {
-                final MultiSeries result = ((MultiSeries) series).pointSize(sds, pointSize, io.deephaven.datastructures.util.CollectionUtil.ZERO_LENGTH_OBJECT_ARRAY);
+                final MultiSeries result = ((MultiSeries) series).pointSize(sds, pointSize, io.deephaven.util.type.ArrayTypeUtils.EMPTY_OBJECT_ARRAY);
                 return make((SeriesInternal) result);
         } else {
             throw new PlotUnsupportedOperationException("Series type does not support this method.  seriesType=" + series.getClass() + " method='@Override public  FigureImpl pointSize( io.deephaven.plot.filters.SelectableDataSet sds, java.lang.String pointSize )'", figure);
@@ -4922,7 +4922,7 @@ private FigureImpl applyFunctionalProperties() {
             XYDataSeries result = ((XYDataSeries) series).pointSize( pointSizes);
             return make((DataSeriesInternal)result);
         } else if(series instanceof MultiSeries) {
-                final MultiSeries result = ((MultiSeries) series).pointSize(pointSizes, io.deephaven.datastructures.util.CollectionUtil.ZERO_LENGTH_OBJECT_ARRAY);
+                final MultiSeries result = ((MultiSeries) series).pointSize(pointSizes, io.deephaven.util.type.ArrayTypeUtils.EMPTY_OBJECT_ARRAY);
                 return make((SeriesInternal) result);
         } else {
             throw new PlotUnsupportedOperationException("Series type does not support this method.  seriesType=" + series.getClass() + " method='@Override public  FigureImpl pointSize( long... pointSizes )'", figure);
@@ -4969,7 +4969,7 @@ private FigureImpl applyFunctionalProperties() {
             CategoryDataSeries result = ((CategoryDataSeries) series).pointColor( pointColor);
             return make((DataSeriesInternal)result);
         } else if(series instanceof MultiSeries) {
-                final MultiSeries result = ((MultiSeries) series).pointColor(pointColor, io.deephaven.datastructures.util.CollectionUtil.ZERO_LENGTH_OBJECT_ARRAY);
+                final MultiSeries result = ((MultiSeries) series).pointColor(pointColor, io.deephaven.util.type.ArrayTypeUtils.EMPTY_OBJECT_ARRAY);
                 return make((SeriesInternal) result);
         } else {
             throw new PlotUnsupportedOperationException("Series type does not support this method.  seriesType=" + series.getClass() + " method='@Override public <CATEGORY extends java.lang.Comparable,COLOR extends io.deephaven.gui.color.Paint> FigureImpl pointColor( java.util.Map<CATEGORY, COLOR> pointColor )'", figure);
@@ -4994,7 +4994,7 @@ private FigureImpl applyFunctionalProperties() {
             CategoryDataSeries result = ((CategoryDataSeries) series).pointColorInteger( colors);
             return make((DataSeriesInternal)result);
         } else if(series instanceof MultiSeries) {
-                final MultiSeries result = ((MultiSeries) series).pointColorInteger(colors, io.deephaven.datastructures.util.CollectionUtil.ZERO_LENGTH_OBJECT_ARRAY);
+                final MultiSeries result = ((MultiSeries) series).pointColorInteger(colors, io.deephaven.util.type.ArrayTypeUtils.EMPTY_OBJECT_ARRAY);
                 return make((SeriesInternal) result);
         } else {
             throw new PlotUnsupportedOperationException("Series type does not support this method.  seriesType=" + series.getClass() + " method='@Override public <CATEGORY extends java.lang.Comparable,COLOR extends java.lang.Integer> FigureImpl pointColorInteger( java.util.Map<CATEGORY, COLOR> colors )'", figure);
@@ -5019,7 +5019,7 @@ private FigureImpl applyFunctionalProperties() {
             CategoryDataSeries result = ((CategoryDataSeries) series).pointLabel( pointLabels);
             return make((DataSeriesInternal)result);
         } else if(series instanceof MultiSeries) {
-                final MultiSeries result = ((MultiSeries) series).pointLabel(pointLabels, io.deephaven.datastructures.util.CollectionUtil.ZERO_LENGTH_OBJECT_ARRAY);
+                final MultiSeries result = ((MultiSeries) series).pointLabel(pointLabels, io.deephaven.util.type.ArrayTypeUtils.EMPTY_OBJECT_ARRAY);
                 return make((SeriesInternal) result);
         } else {
             throw new PlotUnsupportedOperationException("Series type does not support this method.  seriesType=" + series.getClass() + " method='@Override public <CATEGORY extends java.lang.Comparable,LABEL> FigureImpl pointLabel( java.util.Map<CATEGORY, LABEL> pointLabels )'", figure);
@@ -5044,7 +5044,7 @@ private FigureImpl applyFunctionalProperties() {
             CategoryDataSeries result = ((CategoryDataSeries) series).pointSize( categories, pointSizes);
             return make((DataSeriesInternal)result);
         } else if(series instanceof MultiSeries) {
-                final MultiSeries result = ((MultiSeries) series).pointSize(categories, pointSizes, io.deephaven.datastructures.util.CollectionUtil.ZERO_LENGTH_OBJECT_ARRAY);
+                final MultiSeries result = ((MultiSeries) series).pointSize(categories, pointSizes, io.deephaven.util.type.ArrayTypeUtils.EMPTY_OBJECT_ARRAY);
                 return make((SeriesInternal) result);
         } else {
             throw new PlotUnsupportedOperationException("Series type does not support this method.  seriesType=" + series.getClass() + " method='@Override public <CATEGORY extends java.lang.Comparable,NUMBER extends java.lang.Number> FigureImpl pointSize( CATEGORY[] categories, NUMBER[] pointSizes )'", figure);
@@ -5058,7 +5058,7 @@ private FigureImpl applyFunctionalProperties() {
             CategoryDataSeries result = ((CategoryDataSeries) series).pointSize( pointSizes);
             return make((DataSeriesInternal)result);
         } else if(series instanceof MultiSeries) {
-                final MultiSeries result = ((MultiSeries) series).pointSize(pointSizes, io.deephaven.datastructures.util.CollectionUtil.ZERO_LENGTH_OBJECT_ARRAY);
+                final MultiSeries result = ((MultiSeries) series).pointSize(pointSizes, io.deephaven.util.type.ArrayTypeUtils.EMPTY_OBJECT_ARRAY);
                 return make((SeriesInternal) result);
         } else {
             throw new PlotUnsupportedOperationException("Series type does not support this method.  seriesType=" + series.getClass() + " method='@Override public <CATEGORY extends java.lang.Comparable,NUMBER extends java.lang.Number> FigureImpl pointSize( java.util.Map<CATEGORY, NUMBER> pointSizes )'", figure);
@@ -5094,7 +5094,7 @@ private FigureImpl applyFunctionalProperties() {
             CategoryDataSeries result = ((CategoryDataSeries) series).pointShape( pointShapes);
             return make((DataSeriesInternal)result);
         } else if(series instanceof MultiSeries) {
-                final MultiSeries result = ((MultiSeries) series).pointShape(pointShapes, io.deephaven.datastructures.util.CollectionUtil.ZERO_LENGTH_OBJECT_ARRAY);
+                final MultiSeries result = ((MultiSeries) series).pointShape(pointShapes, io.deephaven.util.type.ArrayTypeUtils.EMPTY_OBJECT_ARRAY);
                 return make((SeriesInternal) result);
         } else {
             throw new PlotUnsupportedOperationException("Series type does not support this method.  seriesType=" + series.getClass() + " method='@Override public <CATEGORY extends java.lang.Comparable> FigureImpl pointShape( java.util.Map<CATEGORY, java.lang.String> pointShapes )'", figure);
@@ -5108,7 +5108,7 @@ private FigureImpl applyFunctionalProperties() {
             CategoryDataSeries result = ((CategoryDataSeries) series).pointSize( categories, pointSizes);
             return make((DataSeriesInternal)result);
         } else if(series instanceof MultiSeries) {
-                final MultiSeries result = ((MultiSeries) series).pointSize(categories, pointSizes, io.deephaven.datastructures.util.CollectionUtil.ZERO_LENGTH_OBJECT_ARRAY);
+                final MultiSeries result = ((MultiSeries) series).pointSize(categories, pointSizes, io.deephaven.util.type.ArrayTypeUtils.EMPTY_OBJECT_ARRAY);
                 return make((SeriesInternal) result);
         } else {
             throw new PlotUnsupportedOperationException("Series type does not support this method.  seriesType=" + series.getClass() + " method='@Override public <CATEGORY extends java.lang.Comparable> FigureImpl pointSize( CATEGORY[] categories, double[] pointSizes )'", figure);
@@ -5122,7 +5122,7 @@ private FigureImpl applyFunctionalProperties() {
             CategoryDataSeries result = ((CategoryDataSeries) series).pointSize( categories, pointSizes);
             return make((DataSeriesInternal)result);
         } else if(series instanceof MultiSeries) {
-                final MultiSeries result = ((MultiSeries) series).pointSize(categories, pointSizes, io.deephaven.datastructures.util.CollectionUtil.ZERO_LENGTH_OBJECT_ARRAY);
+                final MultiSeries result = ((MultiSeries) series).pointSize(categories, pointSizes, io.deephaven.util.type.ArrayTypeUtils.EMPTY_OBJECT_ARRAY);
                 return make((SeriesInternal) result);
         } else {
             throw new PlotUnsupportedOperationException("Series type does not support this method.  seriesType=" + series.getClass() + " method='@Override public <CATEGORY extends java.lang.Comparable> FigureImpl pointSize( CATEGORY[] categories, int[] pointSizes )'", figure);
@@ -5136,7 +5136,7 @@ private FigureImpl applyFunctionalProperties() {
             CategoryDataSeries result = ((CategoryDataSeries) series).pointSize( categories, pointSizes);
             return make((DataSeriesInternal)result);
         } else if(series instanceof MultiSeries) {
-                final MultiSeries result = ((MultiSeries) series).pointSize(categories, pointSizes, io.deephaven.datastructures.util.CollectionUtil.ZERO_LENGTH_OBJECT_ARRAY);
+                final MultiSeries result = ((MultiSeries) series).pointSize(categories, pointSizes, io.deephaven.util.type.ArrayTypeUtils.EMPTY_OBJECT_ARRAY);
                 return make((SeriesInternal) result);
         } else {
             throw new PlotUnsupportedOperationException("Series type does not support this method.  seriesType=" + series.getClass() + " method='@Override public <CATEGORY extends java.lang.Comparable> FigureImpl pointSize( CATEGORY[] categories, long[] pointSizes )'", figure);
@@ -5194,7 +5194,7 @@ private FigureImpl applyFunctionalProperties() {
             CategoryDataSeries result = ((CategoryDataSeries) series).pointColor( pointColor);
             return make((DataSeriesInternal)result);
         } else if(series instanceof MultiSeries) {
-                final MultiSeries result = ((MultiSeries) series).pointColor(pointColor, io.deephaven.datastructures.util.CollectionUtil.ZERO_LENGTH_OBJECT_ARRAY);
+                final MultiSeries result = ((MultiSeries) series).pointColor(pointColor, io.deephaven.util.type.ArrayTypeUtils.EMPTY_OBJECT_ARRAY);
                 return make((SeriesInternal) result);
         } else {
             throw new PlotUnsupportedOperationException("Series type does not support this method.  seriesType=" + series.getClass() + " method='@Override public <COLOR extends io.deephaven.gui.color.Paint> FigureImpl pointColor( groovy.lang.Closure<COLOR> pointColor )'", figure);
@@ -5208,7 +5208,7 @@ private FigureImpl applyFunctionalProperties() {
             CategoryDataSeries result = ((CategoryDataSeries) series).pointColor( pointColor);
             return make((DataSeriesInternal)result);
         } else if(series instanceof MultiSeries) {
-                final MultiSeries result = ((MultiSeries) series).pointColor(pointColor, io.deephaven.datastructures.util.CollectionUtil.ZERO_LENGTH_OBJECT_ARRAY);
+                final MultiSeries result = ((MultiSeries) series).pointColor(pointColor, io.deephaven.util.type.ArrayTypeUtils.EMPTY_OBJECT_ARRAY);
                 return make((SeriesInternal) result);
         } else {
             throw new PlotUnsupportedOperationException("Series type does not support this method.  seriesType=" + series.getClass() + " method='@Override public <COLOR extends io.deephaven.gui.color.Paint> FigureImpl pointColor( java.util.function.Function<java.lang.Comparable, COLOR> pointColor )'", figure);
@@ -5244,7 +5244,7 @@ private FigureImpl applyFunctionalProperties() {
             CategoryDataSeries result = ((CategoryDataSeries) series).pointColorInteger( colors);
             return make((DataSeriesInternal)result);
         } else if(series instanceof MultiSeries) {
-                final MultiSeries result = ((MultiSeries) series).pointColorInteger(colors, io.deephaven.datastructures.util.CollectionUtil.ZERO_LENGTH_OBJECT_ARRAY);
+                final MultiSeries result = ((MultiSeries) series).pointColorInteger(colors, io.deephaven.util.type.ArrayTypeUtils.EMPTY_OBJECT_ARRAY);
                 return make((SeriesInternal) result);
         } else {
             throw new PlotUnsupportedOperationException("Series type does not support this method.  seriesType=" + series.getClass() + " method='@Override public <COLOR extends java.lang.Integer> FigureImpl pointColorInteger( groovy.lang.Closure<COLOR> colors )'", figure);
@@ -5258,7 +5258,7 @@ private FigureImpl applyFunctionalProperties() {
             CategoryDataSeries result = ((CategoryDataSeries) series).pointColorInteger( colors);
             return make((DataSeriesInternal)result);
         } else if(series instanceof MultiSeries) {
-                final MultiSeries result = ((MultiSeries) series).pointColorInteger(colors, io.deephaven.datastructures.util.CollectionUtil.ZERO_LENGTH_OBJECT_ARRAY);
+                final MultiSeries result = ((MultiSeries) series).pointColorInteger(colors, io.deephaven.util.type.ArrayTypeUtils.EMPTY_OBJECT_ARRAY);
                 return make((SeriesInternal) result);
         } else {
             throw new PlotUnsupportedOperationException("Series type does not support this method.  seriesType=" + series.getClass() + " method='@Override public <COLOR extends java.lang.Integer> FigureImpl pointColorInteger( java.util.function.Function<java.lang.Comparable, COLOR> colors )'", figure);
@@ -5294,7 +5294,7 @@ private FigureImpl applyFunctionalProperties() {
             CategoryDataSeries result = ((CategoryDataSeries) series).pointLabel( pointLabels);
             return make((DataSeriesInternal)result);
         } else if(series instanceof MultiSeries) {
-                final MultiSeries result = ((MultiSeries) series).pointLabel(pointLabels, io.deephaven.datastructures.util.CollectionUtil.ZERO_LENGTH_OBJECT_ARRAY);
+                final MultiSeries result = ((MultiSeries) series).pointLabel(pointLabels, io.deephaven.util.type.ArrayTypeUtils.EMPTY_OBJECT_ARRAY);
                 return make((SeriesInternal) result);
         } else {
             throw new PlotUnsupportedOperationException("Series type does not support this method.  seriesType=" + series.getClass() + " method='@Override public <LABEL> FigureImpl pointLabel( groovy.lang.Closure<LABEL> pointLabels )'", figure);
@@ -5308,7 +5308,7 @@ private FigureImpl applyFunctionalProperties() {
             CategoryDataSeries result = ((CategoryDataSeries) series).pointLabel( pointLabels);
             return make((DataSeriesInternal)result);
         } else if(series instanceof MultiSeries) {
-                final MultiSeries result = ((MultiSeries) series).pointLabel(pointLabels, io.deephaven.datastructures.util.CollectionUtil.ZERO_LENGTH_OBJECT_ARRAY);
+                final MultiSeries result = ((MultiSeries) series).pointLabel(pointLabels, io.deephaven.util.type.ArrayTypeUtils.EMPTY_OBJECT_ARRAY);
                 return make((SeriesInternal) result);
         } else {
             throw new PlotUnsupportedOperationException("Series type does not support this method.  seriesType=" + series.getClass() + " method='@Override public <LABEL> FigureImpl pointLabel( java.util.function.Function<java.lang.Comparable, LABEL> pointLabels )'", figure);
@@ -5344,7 +5344,7 @@ private FigureImpl applyFunctionalProperties() {
             CategoryDataSeries result = ((CategoryDataSeries) series).pointSize( pointSizes);
             return make((DataSeriesInternal)result);
         } else if(series instanceof MultiSeries) {
-                final MultiSeries result = ((MultiSeries) series).pointSize(pointSizes, io.deephaven.datastructures.util.CollectionUtil.ZERO_LENGTH_OBJECT_ARRAY);
+                final MultiSeries result = ((MultiSeries) series).pointSize(pointSizes, io.deephaven.util.type.ArrayTypeUtils.EMPTY_OBJECT_ARRAY);
                 return make((SeriesInternal) result);
         } else {
             throw new PlotUnsupportedOperationException("Series type does not support this method.  seriesType=" + series.getClass() + " method='@Override public <NUMBER extends java.lang.Number> FigureImpl pointSize( groovy.lang.Closure<NUMBER> pointSizes )'", figure);
@@ -5358,7 +5358,7 @@ private FigureImpl applyFunctionalProperties() {
             CategoryDataSeries result = ((CategoryDataSeries) series).pointSize( pointSizes);
             return make((DataSeriesInternal)result);
         } else if(series instanceof MultiSeries) {
-                final MultiSeries result = ((MultiSeries) series).pointSize(pointSizes, io.deephaven.datastructures.util.CollectionUtil.ZERO_LENGTH_OBJECT_ARRAY);
+                final MultiSeries result = ((MultiSeries) series).pointSize(pointSizes, io.deephaven.util.type.ArrayTypeUtils.EMPTY_OBJECT_ARRAY);
                 return make((SeriesInternal) result);
         } else {
             throw new PlotUnsupportedOperationException("Series type does not support this method.  seriesType=" + series.getClass() + " method='@Override public <NUMBER extends java.lang.Number> FigureImpl pointSize( java.util.function.Function<java.lang.Comparable, NUMBER> pointSizes )'", figure);
@@ -5405,7 +5405,7 @@ private FigureImpl applyFunctionalProperties() {
             XYDataSeries result = ((XYDataSeries) series).pointColor( pointColor);
             return make((DataSeriesInternal)result);
         } else if(series instanceof MultiSeries) {
-                final MultiSeries result = ((MultiSeries) series).pointColor(pointColor, io.deephaven.datastructures.util.CollectionUtil.ZERO_LENGTH_OBJECT_ARRAY);
+                final MultiSeries result = ((MultiSeries) series).pointColor(pointColor, io.deephaven.util.type.ArrayTypeUtils.EMPTY_OBJECT_ARRAY);
                 return make((SeriesInternal) result);
         } else {
             throw new PlotUnsupportedOperationException("Series type does not support this method.  seriesType=" + series.getClass() + " method='@Override public <T extends io.deephaven.gui.color.Paint> FigureImpl pointColor( io.deephaven.plot.datasets.data.IndexableData<T> pointColor )'", figure);
@@ -5430,7 +5430,7 @@ private FigureImpl applyFunctionalProperties() {
             XYDataSeries result = ((XYDataSeries) series).pointSize( pointSizes);
             return make((DataSeriesInternal)result);
         } else if(series instanceof MultiSeries) {
-                final MultiSeries result = ((MultiSeries) series).pointSize(pointSizes, io.deephaven.datastructures.util.CollectionUtil.ZERO_LENGTH_OBJECT_ARRAY);
+                final MultiSeries result = ((MultiSeries) series).pointSize(pointSizes, io.deephaven.util.type.ArrayTypeUtils.EMPTY_OBJECT_ARRAY);
                 return make((SeriesInternal) result);
         } else {
             throw new PlotUnsupportedOperationException("Series type does not support this method.  seriesType=" + series.getClass() + " method='@Override public <T extends java.lang.Number> FigureImpl pointSize( T[] pointSizes )'", figure);
diff --git a/Plot/src/main/java/io/deephaven/plot/FigureWidget.java b/Plot/src/main/java/io/deephaven/plot/FigureWidget.java
index 063d72ed507..789c36c6eca 100644
--- a/Plot/src/main/java/io/deephaven/plot/FigureWidget.java
+++ b/Plot/src/main/java/io/deephaven/plot/FigureWidget.java
@@ -3,7 +3,6 @@
 //
 package io.deephaven.plot;
 
-import io.deephaven.datastructures.util.CollectionUtil;
 import io.deephaven.engine.liveness.DelegatingLivenessNode;
 import io.deephaven.engine.liveness.LivenessArtifact;
 import io.deephaven.engine.liveness.LivenessNode;
@@ -68,6 +67,6 @@ public void setValidGroups(final String... validGroups) {
 
     @ScriptApi
     public void setValidGroups(final Collection<String> validGroups) {
-        setValidGroups(validGroups.toArray(CollectionUtil.ZERO_LENGTH_STRING_ARRAY));
+        setValidGroups(validGroups.toArray(String[]::new));
     }
 }
diff --git a/Plot/src/main/java/io/deephaven/plot/datasets/multiseries/AbstractMultiSeries.java b/Plot/src/main/java/io/deephaven/plot/datasets/multiseries/AbstractMultiSeries.java
index b8bbbf46c80..5df283c53b1 100644
--- a/Plot/src/main/java/io/deephaven/plot/datasets/multiseries/AbstractMultiSeries.java
+++ b/Plot/src/main/java/io/deephaven/plot/datasets/multiseries/AbstractMultiSeries.java
@@ -218,7 +218,7 @@ private List<SERIES> getSeries() {
     @Override
     // this should be run under a seriesLock
     public void addSeries(SERIES series, Object key) {
-        Assert.holdsLock(seriesLock, "seriesLock");
+        Assert.assertion(Thread.holdsLock(seriesLock), "Thread.holdsLock(seriesLock)");
 
         if (seriesKeys == null) {
             seriesKeys = new HashSet<>();
diff --git a/Plot/src/main/java/io/deephaven/plot/filters/SelectableDataSet.java b/Plot/src/main/java/io/deephaven/plot/filters/SelectableDataSet.java
index 702b7d81d39..7db0829920f 100644
--- a/Plot/src/main/java/io/deephaven/plot/filters/SelectableDataSet.java
+++ b/Plot/src/main/java/io/deephaven/plot/filters/SelectableDataSet.java
@@ -9,7 +9,6 @@
 import io.deephaven.engine.table.TableDefinition;
 import org.jetbrains.annotations.NotNull;
 
-import java.util.Collection;
 import java.util.function.Function;
 
 /**
@@ -45,19 +44,6 @@ default SwappableTable getSwappableTable(final Comparable seriesName, final Char
         return getSwappableTable(seriesName, chart, null, cols);
     }
 
-    /**
-     * Gets a version of the SelectableDataSet with a lastBy applied to the tables.
-     *
-     * @param groupByColumns The grouping columns for the lastBy
-     * @return a new SelectableDataSet with lastBy applied
-     *
-     * @deprecated This method will be removed in a future release, use {@link #transform(Object, Function)} instead.
-     */
-    @Deprecated()
-    default SelectableDataSet<KEY_TYPE, VALUE_TYPE> getLastBy(final Collection<String> groupByColumns) {
-        return transform(groupByColumns, t -> t.lastBy(groupByColumns));
-    }
-
     /**
      * Produces a derivative {@link SelectableDataSet} with the specified transformation applied to all internal tables.
      *
diff --git a/Plot/src/main/java/io/deephaven/plot/util/ArgumentValidations.java b/Plot/src/main/java/io/deephaven/plot/util/ArgumentValidations.java
index f23c4c28920..c1fe62ead63 100644
--- a/Plot/src/main/java/io/deephaven/plot/util/ArgumentValidations.java
+++ b/Plot/src/main/java/io/deephaven/plot/util/ArgumentValidations.java
@@ -4,7 +4,6 @@
 package io.deephaven.plot.util;
 
 import io.deephaven.base.verify.Require;
-import io.deephaven.base.verify.RequirementFailure;
 import io.deephaven.configuration.Configuration;
 import io.deephaven.engine.table.ColumnDefinition;
 import io.deephaven.plot.datasets.data.IndexableNumericData;
@@ -13,6 +12,7 @@
 import io.deephaven.plot.util.tables.TableHandle;
 import io.deephaven.engine.table.Table;
 import io.deephaven.engine.table.TableDefinition;
+import io.deephaven.util.type.NumericTypeUtils;
 import io.deephaven.util.type.TypeUtils;
 import org.apache.commons.lang3.ClassUtils;
 
@@ -362,24 +362,24 @@ public static boolean isTime(final Class c, final PlotInfo plotInfo) {
     }
 
     /**
-     * Whether the class is {@link TypeUtils#isNumeric(Class)} or {@link #isTime(Class, PlotInfo)}
+     * Whether the class is {@link NumericTypeUtils#isNumeric(Class)} or {@link #isTime(Class, PlotInfo)}
      *
      * @param c class
      * @return true if {@code c} is a numeric or time class, false otherwise
      */
     public static boolean isNumericOrTime(final Class c) {
-        return TypeUtils.isNumeric(c) || isTime(c, null);
+        return NumericTypeUtils.isNumeric(c) || isTime(c, null);
     }
 
     /**
-     * Whether the class is {@link TypeUtils#isNumeric(Class)} or {@link #isTime(Class, PlotInfo)}
+     * Whether the class is {@link NumericTypeUtils#isNumeric(Class)} or {@link #isTime(Class, PlotInfo)}
      *
      * @param c class
      * @param plotInfo source of the exception
      * @return true if {@code c} is a numeric or time class, false otherwise
      */
     public static boolean isNumericOrTime(final Class c, final PlotInfo plotInfo) {
-        return TypeUtils.isNumeric(c) || isTime(c, plotInfo);
+        return NumericTypeUtils.isNumeric(c) || isTime(c, plotInfo);
     }
 
     /**
@@ -419,7 +419,7 @@ public static boolean isTime(final SelectableDataSet sds, final String column, f
     }
 
     /**
-     * Whether the column's data type {@link TypeUtils#isPrimitiveNumeric(Class)}.
+     * Whether the column's data type {@link NumericTypeUtils#isPrimitiveNumeric(Class)}.
      *
      * @param t table
      * @param column column
@@ -428,11 +428,11 @@ public static boolean isTime(final SelectableDataSet sds, final String column, f
      */
     public static boolean isPrimitiveNumeric(final Table t, final String column, final PlotInfo plotInfo) {
         assertNotNull(t, "t", plotInfo);
-        return TypeUtils.isPrimitiveNumeric(getColumnType(t, column, plotInfo));
+        return NumericTypeUtils.isPrimitiveNumeric(getColumnType(t, column, plotInfo));
     }
 
     /**
-     * Whether the column's data type {@link TypeUtils#isBoxedNumeric(Class)}.
+     * Whether the column's data type {@link NumericTypeUtils#isBoxedNumeric(Class)}.
      *
      * @param t table
      * @param column column
@@ -441,11 +441,11 @@ public static boolean isPrimitiveNumeric(final Table t, final String column, fin
      */
     public static boolean isBoxedNumeric(final Table t, final String column, final PlotInfo plotInfo) {
         assertNotNull(t, "t", plotInfo);
-        return TypeUtils.isBoxedNumeric(getColumnType(t, column, plotInfo));
+        return NumericTypeUtils.isBoxedNumeric(getColumnType(t, column, plotInfo));
     }
 
     /**
-     * Whether the column's data type {@link TypeUtils#isNumeric(Class)}.
+     * Whether the column's data type {@link NumericTypeUtils#isNumeric(Class)}.
      *
      * @param t table
      * @param column column
@@ -454,11 +454,11 @@ public static boolean isBoxedNumeric(final Table t, final String column, final P
      */
     public static boolean isNumeric(final Table t, final String column, final PlotInfo plotInfo) {
         assertNotNull(t, "t", plotInfo);
-        return TypeUtils.isNumeric(getColumnType(t, column, plotInfo));
+        return NumericTypeUtils.isNumeric(getColumnType(t, column, plotInfo));
     }
 
     /**
-     * Whether the column's data type {@link TypeUtils#isNumeric(Class)}.
+     * Whether the column's data type {@link NumericTypeUtils#isNumeric(Class)}.
      *
      * @param t table
      * @param column column
@@ -467,11 +467,11 @@ public static boolean isNumeric(final Table t, final String column, final PlotIn
      */
     public static boolean isNumeric(final TableDefinition t, final String column, final PlotInfo plotInfo) {
         assertNotNull(t, "t", plotInfo);
-        return TypeUtils.isNumeric(getColumnType(t, column, plotInfo));
+        return NumericTypeUtils.isNumeric(getColumnType(t, column, plotInfo));
     }
 
     /**
-     * Whether the column's data type {@link TypeUtils#isNumeric(Class)}.
+     * Whether the column's data type {@link NumericTypeUtils#isNumeric(Class)}.
      *
      * @param sds selectable dataset
      * @param column column
@@ -480,7 +480,7 @@ public static boolean isNumeric(final TableDefinition t, final String column, fi
      */
     public static boolean isNumeric(final SelectableDataSet sds, final String column, final PlotInfo plotInfo) {
         assertNotNull(sds, "t", plotInfo);
-        return TypeUtils.isNumeric(getColumnType(sds, column, plotInfo));
+        return NumericTypeUtils.isNumeric(getColumnType(sds, column, plotInfo));
     }
 
     /**
@@ -583,7 +583,7 @@ public static void assertIsTime(final TableDefinition t, final String column, fi
 
     /**
      * Requires the column's data type to be a numeric primitive as defined in
-     * {@link TypeUtils#isPrimitiveNumeric(Class)}
+     * {@link NumericTypeUtils#isPrimitiveNumeric(Class)}
      *
      * @throws RuntimeException if the column's data type isn't a numeric primitive
      * @param t table
@@ -598,7 +598,7 @@ public static void assertIsPrimitiveNumeric(final Table t, final String column,
 
     /**
      * Requires the column's data type to be a numeric primitive as defined in
-     * {@link TypeUtils#isPrimitiveNumeric(Class)}
+     * {@link NumericTypeUtils#isPrimitiveNumeric(Class)}
      *
      * @throws RuntimeException if the column's data type isn't a numeric primitive
      * @param t table
@@ -616,7 +616,7 @@ public static void assertIsPrimitiveNumeric(final Table t, final String column,
 
     /**
      * Requires the column's data type to be an instance of {@link Number} as defined in
-     * {@link TypeUtils#isBoxedNumeric(Class)}
+     * {@link NumericTypeUtils#isBoxedNumeric(Class)}
      *
      * @throws RuntimeException if the column's data type isn't an instance of {@link Number}
      * @param t table
@@ -631,7 +631,7 @@ public static void assertIsBoxedNumeric(final Table t, final String column, fina
 
     /**
      * Requires the column's data type to be an instance of {@link Number} as defined in
-     * {@link TypeUtils#isBoxedNumeric(Class)}
+     * {@link NumericTypeUtils#isBoxedNumeric(Class)}
      *
      * @throws RuntimeException if the column's data type isn't an instance of {@link Number}
      * @param t table
@@ -649,7 +649,7 @@ public static void assertIsBoxedNumeric(final Table t, final String column, fina
 
 
     /**
-     * Requires the column's data type to be a numeric instance as defined in {@link TypeUtils#isNumeric(Class)}
+     * Requires the column's data type to be a numeric instance as defined in {@link NumericTypeUtils#isNumeric(Class)}
      *
      * @throws PlotRuntimeException if the column's data type isn't a numeric instance
      * @param t table
@@ -663,7 +663,7 @@ public static void assertIsNumeric(final Table t, final String column, final Plo
 
 
     /**
-     * Requires the column's data type to be a numeric instance as defined in {@link TypeUtils#isNumeric(Class)}
+     * Requires the column's data type to be a numeric instance as defined in {@link NumericTypeUtils#isNumeric(Class)}
      *
      * @throws PlotRuntimeException if the column's data type isn't a numeric instance
      * @param t table
@@ -677,7 +677,7 @@ public static void assertIsNumeric(final TableDefinition t, final String column,
 
 
     /**
-     * Requires the column's data type to be a numeric instance as defined in {@link TypeUtils#isNumeric(Class)}
+     * Requires the column's data type to be a numeric instance as defined in {@link NumericTypeUtils#isNumeric(Class)}
      *
      * @throws PlotRuntimeException if the column's data type isn't a numeric instance
      * @param t table
@@ -695,7 +695,7 @@ public static void assertIsNumeric(final Table t, final String column, final Str
 
 
     /**
-     * Requires the column's data type to be a numeric instance as defined in {@link TypeUtils#isNumeric(Class)}
+     * Requires the column's data type to be a numeric instance as defined in {@link NumericTypeUtils#isNumeric(Class)}
      *
      * @throws PlotRuntimeException if the column's data type isn't a numeric instance
      * @param t table
@@ -713,7 +713,7 @@ public static void assertIsNumeric(final TableDefinition t, final String column,
 
 
     /**
-     * Requires the column's data type to be a numeric instance as defined in {@link TypeUtils#isNumeric(Class)}
+     * Requires the column's data type to be a numeric instance as defined in {@link NumericTypeUtils#isNumeric(Class)}
      *
      * @throws PlotRuntimeException if the column's data type isn't a numeric instance
      * @param sds selectable dataset
diff --git a/Plot/src/main/java/io/deephaven/plot/util/PlotUtils.java b/Plot/src/main/java/io/deephaven/plot/util/PlotUtils.java
index 0e7ad86ae14..662d22c785b 100644
--- a/Plot/src/main/java/io/deephaven/plot/util/PlotUtils.java
+++ b/Plot/src/main/java/io/deephaven/plot/util/PlotUtils.java
@@ -6,7 +6,6 @@
 import io.deephaven.api.ColumnName;
 import io.deephaven.api.agg.Aggregation;
 import io.deephaven.base.verify.Require;
-import io.deephaven.datastructures.util.CollectionUtil;
 import io.deephaven.engine.table.impl.QueryTable;
 import io.deephaven.engine.table.vectors.ColumnVectors;
 import io.deephaven.plot.ChartImpl;
@@ -724,7 +723,7 @@ public static Table createCategoryTable(final Table t, final String[] catColumns
         final List<String> lastColumns = t.getDefinition().getColumnNames();
         lastColumns.removeAll(Arrays.asList(catColumns));
         final QueryTable result = (QueryTable) t.aggBy(
-                createCategoryAggs(AggLast(lastColumns.toArray(CollectionUtil.ZERO_LENGTH_STRING_ARRAY))),
+                createCategoryAggs(AggLast(lastColumns.toArray(String[]::new))),
                 ColumnName.from(catColumns));
 
         // We must explicitly copy attributes because we are doing a modified manual first/lastBy which will not
diff --git a/Plot/src/test/java/io/deephaven/plot/example_plots/SimpleXYTable.java b/Plot/src/test/java/io/deephaven/plot/example_plots/SimpleXYTable.java
index 77cc49fe474..27065a57dd6 100644
--- a/Plot/src/test/java/io/deephaven/plot/example_plots/SimpleXYTable.java
+++ b/Plot/src/test/java/io/deephaven/plot/example_plots/SimpleXYTable.java
@@ -9,8 +9,6 @@
 import io.deephaven.engine.table.Table;
 import io.deephaven.engine.util.TableTools;
 
-import static io.deephaven.plot.filters.Selectables.oneClick;
-
 public class SimpleXYTable {
 
     public static void main(String[] args) {
diff --git a/R/build.gradle b/R/build.gradle
index 85583260473..7e542cd1597 100644
--- a/R/build.gradle
+++ b/R/build.gradle
@@ -138,7 +138,7 @@ def rClientDoc = Docker.registerDockerTask(project, 'rClientDoc') {
                    ''')
         runCommand('''echo "status = tryCatch(" \
                            "   {" \
-                           "      install.packages('roxygen2', repos='https://cran.r-project.org'); " \
+                           "      install.packages('roxygen2'); " \
                            "      0" \
                            "   }," \
                            "  error=function(e) 1," \
@@ -179,7 +179,7 @@ def rClientSite = Docker.registerDockerTask(project, 'rClientSite') {
         runCommand("mkdir -p ${prefix}/src/rdeephaven/docs")
         runCommand('''echo "status = tryCatch(" \
                            "   {" \
-                           "      install.packages('pkgdown', repos='https://cran.r-project.org'); " \
+                           "      install.packages('pkgdown'); " \
                            "      0" \
                            "   }," \
                            "  error=function(e) 1," \
diff --git a/R/rdeephaven/DESCRIPTION b/R/rdeephaven/DESCRIPTION
index 29216160e10..42cfac130e0 100644
--- a/R/rdeephaven/DESCRIPTION
+++ b/R/rdeephaven/DESCRIPTION
@@ -1,10 +1,11 @@
 Package: rdeephaven
 Type: Package
 Title: R Client for Deephaven Core
-Version: 0.35.0
+Version: 0.38.0
 Date: 2023-05-12
 Author: Deephaven Data Labs
 Maintainer: Alex Peters <alexpeters@deephaven.io>
+URL: https://deephaven.io/core/client-api/r/
 Description: The `rdeephaven` package provides an R API for communicating with the Deephaven server and working with Deephaven tables.
              In this release, we support connecting to the Deephaven server with three authentication methods including anonymous,
              username/password, and general key/value authentication. Once the connection has been established, we provide the tools to
diff --git a/R/rdeephaven/README.md b/R/rdeephaven/README.md
index eec85cd5371..20db4b660ba 100644
--- a/R/rdeephaven/README.md
+++ b/R/rdeephaven/README.md
@@ -23,11 +23,11 @@ The R Client provides the following functionalities:
    -   Construct and execute complex queries
    -   Retrieve references to tables on the server
    -   Pull table data into an [Arrow RecordBatchReader](https://arrow.apache.org/docs/r/reference/RecordBatchReader.html),
-an [Arrow Table](https://arrow.apache.org/docs/r/reference/Table.html),
+an [Arrow Table](https://arrow.apache.org/docs/6.0/r/reference/Table.html),
 a [dplyr Tibble](https://tibble.tidyverse.org),
 or an [R Data Frame](https://stat.ethz.ch/R-manual/R-devel/library/base/html/data.frame.html)
    -   Create new tables on the server from an [Arrow RecordBatchReader](https://arrow.apache.org/docs/r/reference/RecordBatchReader.html),
-an [Arrow Table](https://arrow.apache.org/docs/r/reference/Table.html),
+an [Arrow Table](https://arrow.apache.org/docs/6.0/r/reference/Table.html),
 a [dplyr Tibble](https://tibble.tidyverse.org),
 or an [R Data Frame](https://stat.ethz.ch/R-manual/R-devel/library/base/html/data.frame.html)
    -   Call Deephaven table methods with familiar R functions
@@ -36,7 +36,8 @@ or an [R Data Frame](https://stat.ethz.ch/R-manual/R-devel/library/base/html/dat
 
 Currently, the R client is only supported on Ubuntu 20.04 or 22.04 and must be built from source.
 
-0. We need a working installation of R on the machine where the R client will be built.
+0. We need a working installation of R on the machine where the R client will be built,
+   plus the necessary dependencies for building and creating vignettes.
    The R client requires R 4.1.2 or newer; you can install R from the standard packages
    made available by Ubuntu 22.04.  If you want a newer R version or if you are running in
    Ubuntu 20.04, you should install R from CRAN:
@@ -51,96 +52,69 @@ Currently, the R client is only supported on Ubuntu 20.04 or 22.04 and must be b
        sudo tee -a /etc/apt/sources.list.d/r-project.list
 
    # update the apt package list
-   $ apt update
+   $ apt -y update
 
    # install R
-   $ sudo apt install r-base r-recommended
+   $ sudo apt -y install r-base r-recommended
    ```
 
-1. Build the cpp-client (and any dependent libraries) according to the instructions in
-   https://github.com/deephaven/deephaven-core/blob/main/cpp-client/README.md.
-   Follow the instructions at least to the point for "Build and install Deephaven C++ client".
-   At that point you would have both the Deephaven C++ client and any C++ libraries it depends on,
-   all installed in a particular directory of your choosing.  In what follows we assume that
-   directory is `/path/to/dhcpp`.   Independently of where that directory is in your
-   chosen installation, a file called `env.sh` should exist on it, and a `local` subdirectory
-   as well.
-
-2. Choose a directory where the Deephaven R client source code will live.
-   Here, the source code will be downloaded into a new directory called `rdeephaven`.
-   Navigate into that directory and clone this subdirectory of `deephaven-core` using git's sparse-checkout:
-   ```bash
-   mkdir rdeephaven
-   cd rdeephaven
-   git init
-   git remote add -f origin https://github.com/deephaven/deephaven-core.git
-   git config core.sparseCheckout true
-   echo "R/rdeephaven" >> .git/info/sparse-checkout
-   git pull origin main
+   Independently of R itself, install the OS packages required for building vignettes: `libxml2-dev` and `pandoc`
    ```
-
-3. Set environment variables from the C++ client installation required for building the package.
-   Use:
+   # required during the build for vignettes
+   $ sudo apt -y install libxml2-dev pandoc 
    ```
+
+1. Build the Deephaven C++ client (and dependencies) according to the instructions in the
+   [Deephaven C++ client installation guide](https://github.com/deephaven/deephaven-core/blob/main/cpp-client/README.md).
+   Follow the instructions at least through "Build and Install Deephaven C++ client". After that, you will have both the
+   Deephaven C++ client and any C++ libraries it depends on installed in a particular directory of your choosing.
+   In what follows, we assume that directory is `/path/to/dhcpp`.
+
+3. Set environment variables from the C++ client installation required for building the R client:
+   ```bash
    source /path/to/dhcpp/env.sh
    ```
-   where `/path/to/dhcpp` is the directory you created in step (1) above.
-   You can ensure the environment variables that are necessary for the steps
-   that follow are set by checking their values by running the commands:
-   
+   where `/path/to/dhcpp` is the directory you created in step 1 above.
+   Ensure the necessary environment variables are set by checking their values as follows:
    ```
    echo $DHCPP
    echo $LD_LIBRARY_PATH
+   echo $NCPUS
+   echo $CMAKE_PREFIX_PATH
    ```
 
-   Both environment variables need to be defined for installing the package in the
-   instructions below.  Once the package is installed, you will only need
-   `LD_LIBRARY_PATH` to be set in the R session where you intend to use the `rdeephaven` library.
-   If you are starting R from the command line, you can set the environment variable as explained
-   above.  If you are using RStudio, see the note in the following point.
-
-   Refer to the instructions on the C++ client installation for more details on the `dhcpp` directory.
-
    For faster compilation of the R client and its dependencies (particularly the Arrow R client),
-   use the following commands:
+   use the following command:
    ```bash
-    export NCPUS=`getconf _NPROCESSORS_ONLN`
     export MAKE="make -j$NCPUS"
    ```
+   
+   Refer to the instructions on the C++ client installation for more details on the `dhcpp` directory.
+
+4. The C++ client installation will have left you with a local clone of the full [Deephaven Core Git repository](https://github.com/deephaven/deephaven-core).
+   Navigate to the `deephaven-core/R/rdeephaven` directory within that clone.
+
+   If you prefer to have an isolated directory where the Deephaven R client source code will live, use git's sparse-checkout:
+   ```bash
+   mkdir rdeephaven
+   cd rdeephaven
+   git init
+   git remote add -f origin https://github.com/deephaven/deephaven-core.git
+   git config core.sparseCheckout true
+   echo "R/rdeephaven" >> .git/info/sparse-checkout
+   git pull origin main
+   ```
 
-4. Start an R console inside the rdeephaven directory. In that console, install the dephaven client dependencies
-   (since we are building from source, dependencies will not be automatically pulled in):
+5. Start an R console inside the `rdeephaven` directory by running `R`. In that console, install the Deephaven R client dependencies:
    ```r
-   install.packages(c('Rcpp', 'arrow', 'R6', 'dplyr'))
+   install.packages(c('Rcpp', 'arrow', 'R6', 'dplyr', 'xml2', 'rmarkdown', 'knitr'))
    ```
-   Then, exit the R console with `quit()`. From the rdeephaven directory, build and install the R client:
+   Then, exit the R console with `quit()`. From the `rdeephaven` directory, build and install the R client:
    ```r
    cd .. && R CMD build rdeephaven && R CMD INSTALL --no-multiarch --with-keep.source rdeephaven_*.tar.gz && rm rdeephaven_*.tar.gz
    ```
    This is needed over the typical `install.packages()` to ensure that the vignettes get built and installed.
 
-
-   **NOTE**
-
-   If using RStudio for this step, the environment variables that were set in step 3 may not persist into the RStudio
-   R environment if RStudio is not a child process of the shell where the environment variables were set
-   (ie, if RStudio is not started from that same shell and after the environment variables are set in that shell).
-   R supports using a `.Renviron` file for settings like this.  You can generate the right content to add
-   to your .Renviron file (or for creating a new one) using the script under `etc/generate-dotRenviron-lines.sh`
-
-   You can create a new `.Renviron` file under the `deephave-core` directory with the lines producing by running
-   the `etc/generate-dotRenviron-lines.sh` in the same shell where you set the environment variables;
-   the script will give you the right content for the `.Renviron` file.
-   Then, create a new R project from the existing `deephaven-core` directory using RStudio, and the corresponding
-   R session will inherit all the necessary environment variables for successful compilation.
-
-   If RStudio Server is being used, all of the above must be followed for successful compilation. _In addition_,
-   use the output from the script `etc/generate-rserverdotconf-lines.sh` and add them to the `rserver.conf` file
-   for the RStudio Server installation (the location of that file may depend on your particular RStudio server
-   installation, but a common location is `/etc/rstudio/rserver.conf`).
-   
-
-
 6. Now, run
    ```r
    library(rdeephaven)
@@ -149,28 +123,73 @@ Currently, the R client is only supported on Ubuntu 20.04 or 22.04 and must be b
    
    For an introduction to the package, run `vignette("rdeephaven")`.
 
-
-**NOTE**
-
-If an error like this occurs in step 4:
-```bash
-client.cpp:7:10: fatal error: deephaven/client/client.h: No such file or directory
- 7 | #include "deephaven/client/client.h"
-   |          ^~~~~~~~~~~~~~~~~~~~~~~~~~~
-compilation terminated.
-```
-this means that the C++ compiler does not know where to find the relevant header files for the Deephaven C++ client. This can happen for a handul of reasons:
-1. Step 1 was skipped, and the Deephaven C++ client was not installed. In this case, please ensure that the client is installed before attempting to build the R client.
-2. The Deephaven C++ client is installed, but the `DHCPP` environment variable is not set. To test this, run
+7. The `LD_LIBRARY_PATH` environment variable set in step 2 is necessary for loading the R client once it is installed.
+   Therefore, you must set `LD_LIBRARY_PATH` manually at the start of each session by running the following command:
    ```bash
-   echo $DHCPP
+   source /path/to/dhcpp/env.sh
    ```
-   If this returns an empty string, set `DHCPP` according to the instructions in step 1 with
+   This will set `LD_LIBRARY_PATH`, as well as the other environment variables from step 2.
+   
+   If you would rather not have to run this command every time you open a new session, you can add the following to `$HOME/.profile`:
    ```bash
-   export DHCPP=/path/to/dhcpp
+   # source DHCPP env variables if dhcpp directory exists
+   current_dhcpp_dir=/path/to/dhcpp"
+   if [ -d "$current_dhcpp_dir" ] ; then
+       source "$current_dhcpp_dir"/env.sh
+   fi
    ```
-3. The Deephaven C++ client is installed and the `DHCPP` environment variable is set, but the current project is not configured to allow the compiler to access the Deephaven `dhcpp` and `src` directories. This is more difficult to give advice on, as it is an IDE-dependent problem. Consult your IDE's documentation on C/C++ compiler include paths for more information.
+   This will automatically set `LD_LIBRARY_PATH` at the beginning of every session _for this user_, so that any process (R or RStudio) may access its value.
+   If you move the dhcpp directory, or need to point R to another version of it, `current_dhcpp_dir` should be modified accordingly.
+
+## Common Errors
+
+- **Cannot compile the R client**
 
+   If an error like this occurs in step 4:
+   ```bash
+   client.cpp:7:10: fatal error: deephaven/client/client.h: No such file or directory
+    7 | #include "deephaven/client/client.h"
+      |          ^~~~~~~~~~~~~~~~~~~~~~~~~~~
+   compilation terminated.
+   ```
+   this means that the C++ compiler does not know where to find the relevant header files for the Deephaven C++ client. This can happen for a handul of reasons:
+   1. Step 1 was skipped, and the Deephaven C++ client was not installed. In this case, please ensure that the client is installed before attempting to build the R client.
+   2. The Deephaven C++ client is installed, but the `DHCPP` environment variable is not set. To test this, run
+      ```bash
+      echo $DHCPP
+      ```
+      If this returns an empty string, set `DHCPP` according to the instructions in step 2a with
+      ```bash
+      source /path/to/dhcpp/env.sh
+      ```
+   3. The Deephaven C++ client is installed and the `DHCPP` environment variable is set, but the current project is not configured to allow the compiler
+      to access the Deephaven `dhcpp` and `src` directories. This is more difficult to give advice on, as it is an IDE-dependent problem. Consult your IDE's
+      documentation on C/C++ compiler include paths for more information.
+
+  - **Cannot load the R client**
+
+      Once the R client is successfully installed, you may try to load it at a later date, only to find this error:
+     ```bash
+      > library(rdeephaven)
+      Error: package or namespace load failed for ‘rdeephaven’ in dyn.load(file, DLLpath = DLLpath, ...):
+       unable to load shared object '/home/user/R/x86_64-pc-linux-gnu-library/4.4/rdeephaven/libs/rdeephaven.so':
+        libdhclient.so: cannot open shared object file: No such file or directory
+      ```
+      This very likely means that the `LD_LIBRARY_PATH` environment variable is not set. To rectify this, run
+      ```bash
+      source /path/to/dhcpp/env.sh
+      ```
+      from the parent session and try again. Alternatively, see step 6 for a way to solve this problem semi-permanently.
+
+      RStudio presents its own solution to this problem that RStudio users may want to use instead of the semi-permanent solution in step 6.
+      RStudio supports using a `.Renviron` file for setting environment variables. If the correct environment variables are currently set (see step 2),
+      you can generate the right content for a `.Renviron` file by running the script at `etc/generate-dotRenviron-lines.sh`. Then, copy the output
+      of that script into a new file called `.Renviron`, and save it in the `deephaven-core` directory. Then, create a new R project from the existing
+      `deephaven-core` directory using RStudio, and the corresponding R session will inherit all the necessary environment variables for successful compilation.
+
+      If RStudio Server is being used, the `.Renviron` files _must_ be set for successful compilation. _In addition_, run the `etc/generate-rserverdotconf-lines.sh` script,
+      and the script's outputs to the `rserver.conf` file for the RStudio Server installation (the location of that file may depend on your particular RStudio server
+      installation, but a common location is `/etc/rstudio/rserver.conf`).
 
 ## Running the unit tests
 
diff --git a/README.md b/README.md
index 1afb7589164..727f527b5ee 100644
--- a/README.md
+++ b/README.md
@@ -31,18 +31,18 @@ This README is intended to provide a high-level overview of the installation and
 | Go            | No                 | Yes                |
 | R             | No                 | Yes                |
 
-Deephaven's client APIs use [gRPC](https://grpc.io/), [protobuf](https://github.com/deephaven/deephaven-core/tree/main/proto/proto-backplane-grpc/src/main/proto/deephaven/proto), [Apache Arrow Flight](https://arrow.apache.org/docs/format/Flight.html), and [Barrage](https://github.com/deephaven/barrage) to handle ticking data. Users who wish to build their own client APIs can use these tools to do so.
+Deephaven's client APIs use [gRPC](https://grpc.io/), [protobuf](https://github.com/deephaven/deephaven-core/tree/main/proto/proto-backplane-grpc/src/main/proto/deephaven_core/proto), [Apache Arrow Flight](https://arrow.apache.org/docs/format/Flight.html), and [Barrage](https://github.com/deephaven/barrage) to handle ticking data. Users who wish to build their own client APIs can use these tools to do so.
 
 The following list contains documentation links for installation instructions and more:
 
 - Python
-  - [Run from Docker](https://deephaven.io/core/docs/tutorials/quickstart/)
-  - [pip-installed](https://deephaven.io/core/docs/tutorials/quickstart-pip/)
+  - [Run from Docker](https://deephaven.io/core/docs/getting-started/quickstart/)
+  - [pip-installed](https://deephaven.io/core/docs/getting-started/pip-install/)
 - Groovy
-  - [Run from Docker](https://deephaven.io/core/groovy/docs/tutorials/quickstart/)
+  - [Run from Docker](https://deephaven.io/core/docs/getting-started/quickstart/)
 - [Python client](https://pypi.org/project/pydeephaven/)
 - [Java client](https://deephaven.io/core/docs/how-to-guides/java-client/)
-- [JS client](https://deephaven.io/core/docs/reference/js-api/documentation/)
+- [JS client](https://deephaven.io/core/client-api/javascript/modules/dh.html)
 - [Go client](https://pkg.go.dev/github.com/deephaven/deephaven-core/go)
 - [R client](https://github.com/deephaven/deephaven-core/blob/main/R/rdeephaven/README.md)
 
@@ -52,10 +52,10 @@ The Deephaven server can be installed and instantiated [from Docker](#from-docke
 
 ### From Docker
 
-This is the easiest way to get started with Deephaven. For complete instructions, see our [quickstart for Docker](https://deephaven.io/core/docs/tutorials/quickstart/). The table below shows installation dependencies.
+This is the easiest way to get started with Deephaven. For complete instructions, see our [quickstart for Docker](https://deephaven.io/core/docs/getting-started/quickstart/). The table below shows installation dependencies.
 
 | Dependency     | Version  | OS      | Required/Recommended |
-| -------------- | -------- | --------| -------------------- |
+| -------------- | -------- | ------- | -------------------- |
 | Docker         | ^20.10.8 | All     | Required             |
 | Docker compose | ^2       | All     | Recommended          |
 | Windows        | 10+      | Windows | Required             |
@@ -77,7 +77,7 @@ docker run --rm --name deephaven -p 10000:10000 ghcr.io/deephaven/server:latest
 docker run --rm name deephaven -p 10000:10000 ghcr.io/deephaven/server-slim:latest
 ```
 
-Users who wish to customize their deployment should use Docker Compose. Deephaven offers a multitude of pre-made [docker-compose.yml files](https://deephaven.io/core/docs/tutorials/quickstart/#choose-a-deployment) to choose from. To get started, all that's required is to download a file, pull the images, and start the server.
+Users who wish to customize their deployment should use Docker Compose. Deephaven offers a multitude of pre-made [docker-compose.yml files](https://deephaven.io/core/docs/getting-started/docker-install/#choose-a-deployment) to choose from. To get started, all that's required is to download a file, pull the images, and start the server.
 
 **Python with Docker Compose**
 
@@ -109,7 +109,7 @@ docker compose up
 
 ### pip-installed Deephaven
 
-Users who wish to use Python but not Docker should use [pip-installed Deephaven](https://deephaven.io/core/docs/tutorials/quickstart-pip/). For users with Windows operating systems, WSL is **not** required to use Deephaven this way.
+Users who wish to use Python but not Docker should use [pip-installed Deephaven](https://deephaven.io/core/docs/getting-started/pip-install/). For users with Windows operating systems, WSL is **not** required to use Deephaven this way.
 
 ```sh
 pip install --upgrade pip setuptools wheel
@@ -127,7 +127,7 @@ The input arguments to `Server` specify to bind to the Deephaven server on port
 
 ### Built from source
 
-Users who wish to modify source code and contribute to the project should build Deephaven from source. For complete instructions, see [How to build Deephaven from source](https://deephaven.io/core/docs/how-to-guides/launch-build/).
+Users who wish to modify source code and contribute to the project should build Deephaven from source. For complete instructions, see [How to build Deephaven from source](https://deephaven.io/core/docs/getting-started/launch-build/).
 
 Building and running Deephaven requires a few software packages.
 
@@ -151,7 +151,7 @@ docker run hello-world
 ```
 
 > **_NOTE:_** Internally, the Java build process will use [Gradle Auto Provisioning](https://docs.gradle.org/current/userguide/toolchains.html#sec:provisioning)
-to download and use the appropriate Java version for building and testing.
+> to download and use the appropriate Java version for building and testing.
 
 > **_NOTE:_** On Windows, all commands must be run inside a WSL 2 terminal.
 
@@ -182,13 +182,14 @@ cd deephaven-core
 #### Debugging
 
 You can debug the server by adding the `-Pdebug` flag, and then attaching a debugger to port 5005. This can be used in conjunction with other flags. For example, if you wanted to debug a server and startup with Groovy:
+
 ```sh
 ./gradlew server-jetty-app:run -Pgroovy -Pdebug
 ```
 
 ## Get the authentication key
 
-Deephaven, by default, uses [pre-shared key authentication](https://deephaven.io/core/docs/how-to-guides/authentication/auth-psk/) to authenticate against unauthorized access. 
+Deephaven, by default, uses [pre-shared key authentication](https://deephaven.io/core/docs/how-to-guides/authentication/auth-psk/) to authenticate against unauthorized access.
 
 ### Deephaven run from Docker
 
@@ -269,12 +270,12 @@ t = left.join(right, "DeptID", "DeptName, DeptTelephone=Telephone")
 
 ## Resources
 
-* [Help!](https://github.com/deephaven/deephaven-core/discussions/969)
-* [Deephaven Community Slack](https://deephaven.io/slack)
-* [Discussions](https://github.com/deephaven/deephaven-core/discussions)
-* [Deephaven Community Core docs](https://deephaven.io/core/docs/)
-* [Java API docs](https://deephaven.io/core/javadoc/)
-* [Python API docs](https://deephaven.io/core/pydoc/)
+- [Help!](https://github.com/deephaven/deephaven-core/discussions/969)
+- [Deephaven Community Slack](https://deephaven.io/slack)
+- [Discussions](https://github.com/deephaven/deephaven-core/discussions)
+- [Deephaven Community Core docs](https://deephaven.io/core/docs/)
+- [Java API docs](https://deephaven.io/core/javadoc/)
+- [Python API docs](https://deephaven.io/core/pydoc/)
 
 ## Contributing
 
diff --git a/RELEASE.md b/RELEASE.md
index 7fe5e8f7c8e..ea96f9d9984 100644
--- a/RELEASE.md
+++ b/RELEASE.md
@@ -283,6 +283,7 @@ mention the version explicitly. These files are listed below:
 #
 gradle.properties
 R/rdeephaven/DESCRIPTION
+cpp-client/deephaven/CMakeLists.txt
 ```
 
 This leaves the files "ready" for the next regular release, and also ensures any build done from
diff --git a/SECURITY.md b/SECURITY.md
new file mode 100644
index 00000000000..2851202e0f6
--- /dev/null
+++ b/SECURITY.md
@@ -0,0 +1,9 @@
+# Security Policy
+
+## Reporting a Vulnerability
+
+We strongly encourage you to report potential security vulnerabilities via one of the following methods:
+
+* A private GitHub security advisory, https://github.com/deephaven/deephaven-core/security/advisories/new
+* An email to Deephaven's private security list, security@deephaven.io
+
diff --git a/SevenZip/gradle.properties b/SevenZip/gradle.properties
index 1c0cc01b600..ecbff9a0779 100644
--- a/SevenZip/gradle.properties
+++ b/SevenZip/gradle.properties
@@ -1 +1,2 @@
 io.deephaven.project.ProjectType=JAVA_EXTERNAL
+languageLevel=8
diff --git a/Stats/build.gradle b/Stats/build.gradle
index bac1cdce147..939380a7fa1 100644
--- a/Stats/build.gradle
+++ b/Stats/build.gradle
@@ -9,13 +9,14 @@ dependencies {
     implementation project(':Configuration')
     implementation project(':log-factory')
     implementation project(':engine-context')
-    compileOnly 'com.google.code.java-allocation-instrumenter:java-allocation-instrumenter:3.3.0'
+    implementation project(':util-thread')
+    compileOnly libs.google.java.allocation.instrumenter
 
     testImplementation project(path: ':Base', configuration: 'tests')
 
     testRuntimeOnly project(':log-to-slf4j')
-    Classpaths.inheritSlf4j(project, 'slf4j-simple', 'testRuntimeOnly')
-    Classpaths.inheritJUnitClassic(project, 'testImplementation')
+    testRuntimeOnly libs.slf4j.simple
+    testImplementation libs.junit4
 }
 
 test {
diff --git a/Stats/src/main/java/io/deephaven/stats/StatsCPUCollector.java b/Stats/src/main/java/io/deephaven/stats/StatsCPUCollector.java
index 2ca37c16cef..b4f3a05a259 100644
--- a/Stats/src/main/java/io/deephaven/stats/StatsCPUCollector.java
+++ b/Stats/src/main/java/io/deephaven/stats/StatsCPUCollector.java
@@ -7,7 +7,7 @@
 import io.deephaven.configuration.Configuration;
 import io.deephaven.internal.log.LoggerFactory;
 import io.deephaven.io.logger.Logger;
-import io.deephaven.stats.util.OSUtil;
+import io.deephaven.base.OSUtil;
 import io.deephaven.base.stats.*;
 import io.deephaven.hash.KeyedLongObjectHash;
 import io.deephaven.hash.KeyedLongObjectHashMap;
diff --git a/TableLogger/TableLogger.gradle b/TableLogger/TableLogger.gradle
index a4173ac368d..b950ec4544a 100644
--- a/TableLogger/TableLogger.gradle
+++ b/TableLogger/TableLogger.gradle
@@ -5,11 +5,12 @@ plugins {
 dependencies {
     implementation project(':Base')
     implementation project(':Util')
+    implementation project(":util-pool")
     testRuntimeOnly project(path: ':configs')
     testRuntimeOnly project(path: ':test-configs')
 
     runtimeOnly project(path: ':configs')
 
     testRuntimeOnly project(':log-to-slf4j')
-    Classpaths.inheritSlf4j(project, 'slf4j-simple', 'testRuntimeOnly')
+    testRuntimeOnly libs.slf4j.simple
 }
diff --git a/Util/Util.gradle b/Util/Util.gradle
index 08b74258a7f..9bdd1deeab5 100644
--- a/Util/Util.gradle
+++ b/Util/Util.gradle
@@ -3,24 +3,25 @@ plugins {
     id 'io.deephaven.project.register'
 }
 
-configurations {
-    implementation.extendsFrom configurations.dhUtil, commonsLang3
-    testImplementation.extendsFrom fishBaseTest
-}
-
 dependencies {
     api project(':engine-query-constants')
+    implementation project(':Base')
     implementation project(':log-factory')
+    implementation libs.jdom2
+    implementation libs.commons.compress
+
+    implementation project(':Configuration')
 
     testRuntimeOnly project(path: ':configs')
     testRuntimeOnly project(path: ':test-configs')
 
     testRuntimeOnly project(':log-to-slf4j')
-    Classpaths.inheritSlf4j(project, 'slf4j-simple', 'testRuntimeOnly')
+    testRuntimeOnly libs.slf4j.simple
 
-    Classpaths.inheritJUnitPlatform(project)
     testImplementation project(':base-test-utils')
-    testImplementation 'org.junit.jupiter:junit-jupiter'
-    testRuntimeOnly 'org.junit.jupiter:junit-jupiter-engine'
-    testRuntimeOnly 'org.junit.platform:junit-platform-launcher'
+    testImplementation project(path: ':Base', configuration: 'tests')
+    testImplementation platform(libs.junit.bom)
+    testImplementation libs.junit.jupiter
+    testRuntimeOnly libs.junit.jupiter.engine
+    testRuntimeOnly libs.junit.platform.launcher
 }
diff --git a/Util/channel/build.gradle b/Util/channel/build.gradle
index 4d479e69526..397bdeda530 100644
--- a/Util/channel/build.gradle
+++ b/Util/channel/build.gradle
@@ -10,15 +10,15 @@ dependencies {
     implementation project(':Util')
 
     // For CountingInputStream
-    Classpaths.inheritGuava(project)
+    implementation libs.guava
 
-    compileOnly depAnnotations
+    compileOnly libs.jetbrains.annotations
 
-    Classpaths.inheritJUnitPlatform(project)
-    Classpaths.inheritAssertJ(project)
-    testImplementation 'org.junit.jupiter:junit-jupiter'
-    testRuntimeOnly 'org.junit.jupiter:junit-jupiter-engine'
-    testRuntimeOnly 'org.junit.platform:junit-platform-launcher'
+    testImplementation libs.assertj
+    testImplementation platform(libs.junit.bom)
+    testImplementation libs.junit.jupiter
+    testRuntimeOnly libs.junit.jupiter.engine
+    testRuntimeOnly libs.junit.platform.launcher
 }
 
 test {
diff --git a/Util/channel/src/main/java/io/deephaven/util/channel/BaseSeekableChannelContext.java b/Util/channel/src/main/java/io/deephaven/util/channel/BaseSeekableChannelContext.java
index 42f32ce2b62..3099c0b2601 100644
--- a/Util/channel/src/main/java/io/deephaven/util/channel/BaseSeekableChannelContext.java
+++ b/Util/channel/src/main/java/io/deephaven/util/channel/BaseSeekableChannelContext.java
@@ -8,29 +8,54 @@
 import org.jetbrains.annotations.Nullable;
 
 import javax.annotation.OverridingMethodsMustInvokeSuper;
+import java.util.HashMap;
+import java.util.Map;
 import java.util.function.Supplier;
 
 public class BaseSeekableChannelContext implements SeekableChannelContext {
+
+    /**
+     * A sentinel value to indicate that a resource is {@code null}.
+     */
+    private static final SafeCloseable NULL_SENTINEL = () -> {
+    };
+
     /**
-     * An opaque resource object hosted by this context.
+     * An empty cache of resources.
      */
-    private SafeCloseable resource;
+    private static final Map<String, SafeCloseable> EMPTY_CACHE = Map.of();
+
+    /**
+     * A cache of opaque resource objects hosted by this context.
+     */
+    private Map<String, SafeCloseable> resourceCache = EMPTY_CACHE;
 
     @Override
     @Nullable
-    public final SafeCloseable apply(@NotNull final Supplier<SafeCloseable> resourceFactory) {
+    public final <T extends SafeCloseable> T getCachedResource(
+            final String key,
+            @NotNull final Supplier<T> resourceFactory) {
+        SafeCloseable resource;
+        if (resourceCache == EMPTY_CACHE) {
+            resourceCache = new HashMap<>(1);
+            resource = null;
+        } else {
+            resource = resourceCache.get(key);
+            if (resource == NULL_SENTINEL) {
+                return null;
+            }
+        }
         if (resource == null) {
-            resource = resourceFactory.get();
+            resourceCache.put(key, (resource = resourceFactory.get()) == null ? NULL_SENTINEL : resource);
         }
-        return resource;
+        // noinspection unchecked
+        return (T) resource;
     }
 
     @Override
     @OverridingMethodsMustInvokeSuper
     public void close() {
-        if (resource != null) {
-            resource.close();
-            resource = null;
-        }
+        SafeCloseable.closeAll(resourceCache.values().iterator());
+        resourceCache = EMPTY_CACHE;
     }
 }
diff --git a/Util/channel/src/main/java/io/deephaven/util/channel/CachedChannelProvider.java b/Util/channel/src/main/java/io/deephaven/util/channel/CachedChannelProvider.java
index bb5bafda49b..84c2872c108 100644
--- a/Util/channel/src/main/java/io/deephaven/util/channel/CachedChannelProvider.java
+++ b/Util/channel/src/main/java/io/deephaven/util/channel/CachedChannelProvider.java
@@ -17,7 +17,6 @@
 import java.net.URI;
 import java.nio.ByteBuffer;
 import java.nio.channels.SeekableByteChannel;
-import java.nio.file.Path;
 import java.util.*;
 import java.util.stream.Stream;
 
@@ -87,10 +86,14 @@ public boolean isCompatibleWith(@NotNull final SeekableChannelContext channelCon
         return wrappedProvider.isCompatibleWith(channelContext);
     }
 
+    @Override
+    public boolean exists(@NotNull final URI uri) {
+        return wrappedProvider.exists(uri);
+    }
+
     @Override
     public SeekableByteChannel getReadChannel(@NotNull final SeekableChannelContext channelContext,
-            @NotNull final URI uri)
-            throws IOException {
+            @NotNull final URI uri) throws IOException {
         final String uriString = uri.toString();
         final KeyedObjectHashMap<String, PerPathPool> channelPool = channelPools.get(ChannelType.Read);
         final CachedChannel result = tryGetPooledChannel(uriString, channelPool);
@@ -107,15 +110,9 @@ public InputStream getInputStream(final SeekableByteChannel channel, final int s
     }
 
     @Override
-    public SeekableByteChannel getWriteChannel(@NotNull final Path path, final boolean append) throws IOException {
-        final String pathKey = path.toAbsolutePath().toString();
-        final ChannelType channelType = append ? ChannelType.WriteAppend : ChannelType.Write;
-        final KeyedObjectHashMap<String, PerPathPool> channelPool = channelPools.get(channelType);
-        final CachedChannel result = tryGetPooledChannel(pathKey, channelPool);
-        return result == null
-                ? new CachedChannel(wrappedProvider.getWriteChannel(path, append), channelType, pathKey)
-                : result.position(append ? result.size() : 0); // The seek isn't really necessary for append; will be at
-        // end no matter what.
+    public final CompletableOutputStream getOutputStream(@NotNull final URI uri, final int bufferSizeHint)
+            throws IOException {
+        return wrappedProvider.getOutputStream(uri, bufferSizeHint);
     }
 
     @Override
@@ -168,7 +165,7 @@ private synchronized void returnPoolableChannel(@NotNull final CachedChannel cac
     }
 
     private long advanceClock() {
-        Assert.holdsLock(this, "this");
+        Assert.assertion(Thread.holdsLock(this), "Thread.holdsLock(this)");
         final long newClock = ++logicalClock;
         if (newClock > 0) {
             return newClock;
diff --git a/Util/channel/src/main/java/io/deephaven/util/channel/CompletableOutputStream.java b/Util/channel/src/main/java/io/deephaven/util/channel/CompletableOutputStream.java
new file mode 100644
index 00000000000..28f3b8af129
--- /dev/null
+++ b/Util/channel/src/main/java/io/deephaven/util/channel/CompletableOutputStream.java
@@ -0,0 +1,51 @@
+//
+// Copyright (c) 2016-2024 Deephaven Data Labs and Patent Pending
+//
+package io.deephaven.util.channel;
+
+import java.io.IOException;
+import java.io.OutputStream;
+
+/**
+ * An {@link OutputStream} that can be marked as done, completed, or rolled back.
+ * <p>
+ * The {@link #done()} method is used to flush all buffered data to the underlying storage, {@link #complete()} to
+ * finalize the write operation, and {@link #rollback()} to cancel the write. Closing this output stream without calling
+ * complete will not flush data to the underlying storage.
+ * <p>
+ * One usage pattern can be like this:
+ * 
+ * <pre>
+ * try (final CompletableOutputStream outputStream = CreateCompletableOutputStream()) {
+ *     try {
+ *         IOUtils.copy(inputStream, outputStream);
+ *         outputStream.done(); // Optional; use this to flush buffered data without completing the stream
+ *         outputStream.complete();
+ *     } catch (IOException e) {
+ *         outputStream.rollback();
+ *     }
+ * }
+ * </pre>
+ */
+public abstract class CompletableOutputStream extends OutputStream {
+
+    /**
+     * Flush all buffered data to the underlying storage. This is optional and should be called after the user is done
+     * writing to the output stream. All writes to the output stream after calling this method will lead to an
+     * {@link IOException}.
+     */
+    public abstract void done() throws IOException;
+
+    /**
+     * Flush all buffered data and save all written data to the underlying storage. This method should be called after
+     * the user is done writing to the output stream. All writes to the output stream after calling this method will
+     * lead to an {@link IOException}.
+     */
+    public abstract void complete() throws IOException;
+
+    /**
+     * Try to roll back any data written to the underlying storage, reverting back to the original state before opening
+     * this stream. This is an optional operation, as some implementations may not be able to support it.
+     */
+    public abstract void rollback() throws IOException;
+}
diff --git a/Util/channel/src/main/java/io/deephaven/util/channel/LocalFSChannelProvider.java b/Util/channel/src/main/java/io/deephaven/util/channel/LocalFSChannelProvider.java
deleted file mode 100644
index 7b7b23b24ba..00000000000
--- a/Util/channel/src/main/java/io/deephaven/util/channel/LocalFSChannelProvider.java
+++ /dev/null
@@ -1,81 +0,0 @@
-//
-// Copyright (c) 2016-2024 Deephaven Data Labs and Patent Pending
-//
-package io.deephaven.util.channel;
-
-import io.deephaven.base.FileUtils;
-import org.jetbrains.annotations.NotNull;
-import org.jetbrains.annotations.Nullable;
-
-import java.io.BufferedInputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.net.URI;
-import java.nio.channels.FileChannel;
-import java.nio.channels.SeekableByteChannel;
-import java.nio.file.Files;
-import java.nio.file.Path;
-import java.nio.file.StandardOpenOption;
-import java.util.stream.Stream;
-
-public class LocalFSChannelProvider implements SeekableChannelsProvider {
-    private static final int MAX_READ_BUFFER_SIZE = 1 << 16; // 64 KiB
-
-    @Override
-    public SeekableChannelContext makeContext() {
-        // No additional context required for local FS
-        return SeekableChannelContext.NULL;
-    }
-
-    @Override
-    public boolean isCompatibleWith(@Nullable final SeekableChannelContext channelContext) {
-        // Context is not used, hence always compatible
-        return true;
-    }
-
-    @Override
-    public SeekableByteChannel getReadChannel(@Nullable final SeekableChannelContext channelContext,
-            @NotNull final URI uri)
-            throws IOException {
-        // context is unused here
-        return FileChannel.open(Path.of(uri), StandardOpenOption.READ);
-    }
-
-    @Override
-    public InputStream getInputStream(final SeekableByteChannel channel, final int sizeHint) {
-        // FileChannel is not buffered, need to buffer
-        final int bufferSize = Math.min(sizeHint, MAX_READ_BUFFER_SIZE);
-        return new BufferedInputStream(Channels.newInputStreamNoClose(channel), bufferSize);
-    }
-
-    @Override
-    public SeekableByteChannel getWriteChannel(@NotNull final Path filePath, final boolean append) throws IOException {
-        final FileChannel result = FileChannel.open(filePath,
-                StandardOpenOption.WRITE,
-                StandardOpenOption.CREATE,
-                append ? StandardOpenOption.APPEND : StandardOpenOption.TRUNCATE_EXISTING);
-        if (append) {
-            result.position(result.size());
-        } else {
-            result.position(0);
-        }
-        return result;
-    }
-
-    @Override
-    public final Stream<URI> list(@NotNull final URI directory) throws IOException {
-        // Assuming that the URI is a file, not a directory. The caller should manage file vs. directory handling in
-        // the processor.
-        return Files.list(Path.of(directory)).map(path -> FileUtils.convertToURI(path, false));
-    }
-
-    @Override
-    public final Stream<URI> walk(@NotNull final URI directory) throws IOException {
-        // Assuming that the URI is a file, not a directory. The caller should manage file vs. directory handling in
-        // the processor.
-        return Files.walk(Path.of(directory)).map(path -> FileUtils.convertToURI(path, false));
-    }
-
-    @Override
-    public void close() {}
-}
diff --git a/Util/channel/src/main/java/io/deephaven/util/channel/SeekableChannelContext.java b/Util/channel/src/main/java/io/deephaven/util/channel/SeekableChannelContext.java
index 5d202707432..7c0470a39bd 100644
--- a/Util/channel/src/main/java/io/deephaven/util/channel/SeekableChannelContext.java
+++ b/Util/channel/src/main/java/io/deephaven/util/channel/SeekableChannelContext.java
@@ -3,7 +3,6 @@
 //
 package io.deephaven.util.channel;
 
-import java.util.function.Function;
 import io.deephaven.util.SafeCloseable;
 import org.jetbrains.annotations.Nullable;
 
@@ -12,10 +11,11 @@
 /**
  * Context object for reading and writing to channels created by {@link SeekableChannelsProvider}.
  * <p>
- * The context object can hold a {@link SafeCloseable} resource, which can be plugged into the context by calling the
- * {@link #apply(Supplier)} method. The resource will be closed when the context is closed.
+ * The context object can hold {@link SafeCloseable} resources corresponding to {@link String} keys, which can be
+ * plugged into the context by calling the {@link #getCachedResource(String, Supplier)} method. These resources will be
+ * closed when the context is closed.
  */
-public interface SeekableChannelContext extends Function<Supplier<SafeCloseable>, SafeCloseable>, SafeCloseable {
+public interface SeekableChannelContext extends SafeCloseable {
 
     SeekableChannelContext NULL = SeekableChannelContextNull.NULL_CONTEXT_INSTANCE;
 
@@ -39,11 +39,12 @@ static ContextHolder ensureContext(SeekableChannelsProvider provider, SeekableCh
     }
 
     /**
-     * If this instance holds a resource, return it. Otherwise, use the resource factory to create a new resource, store
-     * it, and return it. This method can return a {@code null} if the factory returns a {@code null}.
+     * If this instance holds a resource corresponding to the given key, return it. Otherwise, use the resource factory
+     * to create a new resource, store it, and return it. This method can return a {@code null} if the factory returns a
+     * {@code null}.
      */
     @Nullable
-    SafeCloseable apply(Supplier<SafeCloseable> resourceFactory);
+    <T extends SafeCloseable> T getCachedResource(String key, Supplier<T> resourceFactory);
 
     /**
      * Release any resources associated with this context. The context should not be used afterward.
diff --git a/Util/channel/src/main/java/io/deephaven/util/channel/SeekableChannelContextNull.java b/Util/channel/src/main/java/io/deephaven/util/channel/SeekableChannelContextNull.java
index 35a9fa80198..9e02493c967 100644
--- a/Util/channel/src/main/java/io/deephaven/util/channel/SeekableChannelContextNull.java
+++ b/Util/channel/src/main/java/io/deephaven/util/channel/SeekableChannelContextNull.java
@@ -13,7 +13,7 @@ enum SeekableChannelContextNull implements SeekableChannelContext {
 
     @Override
     @Nullable
-    public SafeCloseable apply(final Supplier<SafeCloseable> resourceFactory) {
+    public <T extends SafeCloseable> T getCachedResource(final String key, final Supplier<T> resourceFactory) {
         return null;
     }
 }
diff --git a/Util/channel/src/main/java/io/deephaven/util/channel/SeekableChannelsProvider.java b/Util/channel/src/main/java/io/deephaven/util/channel/SeekableChannelsProvider.java
index aca50b64cbf..c2adf817e29 100644
--- a/Util/channel/src/main/java/io/deephaven/util/channel/SeekableChannelsProvider.java
+++ b/Util/channel/src/main/java/io/deephaven/util/channel/SeekableChannelsProvider.java
@@ -10,8 +10,6 @@
 import java.io.InputStream;
 import java.net.URI;
 import java.nio.channels.SeekableByteChannel;
-import java.nio.file.Path;
-import java.nio.file.Paths;
 import java.util.stream.Stream;
 
 import static io.deephaven.base.FileUtils.convertToURI;
@@ -58,6 +56,14 @@ default SeekableChannelContext makeSingleUseContext() {
      */
     boolean isCompatibleWith(@NotNull SeekableChannelContext channelContext);
 
+    /**
+     * Returns true if the given URI exists in the underlying storage.
+     *
+     * @param uri the URI to check
+     * @return true if the URI exists
+     */
+    boolean exists(@NotNull URI uri);
+
     default SeekableByteChannel getReadChannel(@NotNull SeekableChannelContext channelContext, @NotNull String uriStr)
             throws IOException {
         return getReadChannel(channelContext, convertToURI(uriStr, false));
@@ -84,11 +90,17 @@ SeekableByteChannel getReadChannel(@NotNull SeekableChannelContext channelContex
      */
     InputStream getInputStream(SeekableByteChannel channel, int sizeHint) throws IOException;
 
-    default SeekableByteChannel getWriteChannel(@NotNull final String path, final boolean append) throws IOException {
-        return getWriteChannel(Paths.get(path), append);
-    }
+    /**
+     * Creates a {@link CompletableOutputStream} to write to the given URI.
+     *
+     * @param uri the URI to write to
+     * @param bufferSizeHint the number of bytes the caller expects to buffer before flushing
+     * @return the output stream
+     * @throws IOException if an IO exception occurs
+     * @see CompletableOutputStream
+     */
+    CompletableOutputStream getOutputStream(@NotNull final URI uri, int bufferSizeHint) throws IOException;
 
-    SeekableByteChannel getWriteChannel(@NotNull Path path, boolean append) throws IOException;
 
     /**
      * Returns a stream of URIs, the elements of which are the entries in the directory. The listing is non-recursive.
diff --git a/Util/channel/src/main/java/io/deephaven/util/channel/SeekableChannelsProviderLoader.java b/Util/channel/src/main/java/io/deephaven/util/channel/SeekableChannelsProviderLoader.java
index 98ab4d8c583..ee2508ce2ca 100644
--- a/Util/channel/src/main/java/io/deephaven/util/channel/SeekableChannelsProviderLoader.java
+++ b/Util/channel/src/main/java/io/deephaven/util/channel/SeekableChannelsProviderLoader.java
@@ -6,7 +6,6 @@
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
-import java.net.URI;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.ServiceLoader;
@@ -19,11 +18,22 @@ public final class SeekableChannelsProviderLoader {
 
     private static volatile SeekableChannelsProviderLoader instance;
 
+    /**
+     * Get a static a {@link SeekableChannelsProviderLoader} instance that is loading with
+     * {@link SeekableChannelsProviderPlugin} provided via {@link ServiceLoader#load(Class)}.
+     *
+     * @return The {@link SeekableChannelsProviderLoader} instance.
+     */
     public static SeekableChannelsProviderLoader getInstance() {
-        if (instance == null) {
-            instance = new SeekableChannelsProviderLoader();
+        SeekableChannelsProviderLoader localInstance;
+        if ((localInstance = instance) == null) {
+            synchronized (SeekableChannelsProviderLoader.class) {
+                if ((localInstance = instance) == null) {
+                    instance = localInstance = new SeekableChannelsProviderLoader();
+                }
+            }
         }
-        return instance;
+        return localInstance;
     }
 
     private final List<SeekableChannelsProviderPlugin> providers;
@@ -37,21 +47,19 @@ private SeekableChannelsProviderLoader() {
     }
 
     /**
-     * Create a new {@link SeekableChannelsProvider} compatible for reading from and writing to the given URI, using the
-     * plugins loaded by the {@link ServiceLoader}. For example, for a "S3" URI, we will create a
-     * {@link SeekableChannelsProvider} which can read files from S3.
+     * Create a new {@link SeekableChannelsProvider} compatible for reading from and writing to the given URI scheme.
+     * For example, for a "S3" URI, we will create a {@link SeekableChannelsProvider} which can read files from S3.
      *
-     * @param uri The URI
+     * @param uriScheme The URI scheme
      * @param specialInstructions An optional object to pass special instructions to the provider.
-     * @return A {@link SeekableChannelsProvider} for the given URI.
+     * @return A {@link SeekableChannelsProvider} for the given URI scheme.
      */
-    public SeekableChannelsProvider fromServiceLoader(@NotNull final URI uri,
-            @Nullable final Object specialInstructions) {
+    public SeekableChannelsProvider load(@NotNull final String uriScheme, @Nullable final Object specialInstructions) {
         for (final SeekableChannelsProviderPlugin plugin : providers) {
-            if (plugin.isCompatible(uri, specialInstructions)) {
-                return plugin.createProvider(uri, specialInstructions);
+            if (plugin.isCompatible(uriScheme, specialInstructions)) {
+                return plugin.createProvider(uriScheme, specialInstructions);
             }
         }
-        throw new UnsupportedOperationException("No plugin found for uri: " + uri);
+        throw new UnsupportedOperationException("No plugin found for uri scheme: " + uriScheme);
     }
 }
diff --git a/Util/channel/src/main/java/io/deephaven/util/channel/SeekableChannelsProviderPlugin.java b/Util/channel/src/main/java/io/deephaven/util/channel/SeekableChannelsProviderPlugin.java
index 4ae6ae6d76b..e0f21741cb8 100644
--- a/Util/channel/src/main/java/io/deephaven/util/channel/SeekableChannelsProviderPlugin.java
+++ b/Util/channel/src/main/java/io/deephaven/util/channel/SeekableChannelsProviderPlugin.java
@@ -6,20 +6,18 @@
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
-import java.net.URI;
-
 /**
  * A plugin interface for providing {@link SeekableChannelsProvider} implementations for different URI schemes, e.g. S3.
  * Check out {@link SeekableChannelsProviderLoader} for more details.
  */
 public interface SeekableChannelsProviderPlugin {
     /**
-     * Check if this plugin is compatible with the given URI and config object.
+     * Check if this plugin is compatible with the given URI scheme and config object.
      */
-    boolean isCompatible(@NotNull URI uri, @Nullable Object config);
+    boolean isCompatible(@NotNull String uriScheme, @Nullable Object config);
 
     /**
-     * Create a {@link SeekableChannelsProvider} for the given URI and config object.
+     * Create a {@link SeekableChannelsProvider} for the given URI scheme and config object.
      */
-    SeekableChannelsProvider createProvider(@NotNull URI uri, @Nullable Object object);
+    SeekableChannelsProvider createProvider(@NotNull String uriScheme, @Nullable Object object);
 }
diff --git a/Util/channel/src/test/java/io/deephaven/util/channel/CachedChannelProviderTest.java b/Util/channel/src/test/java/io/deephaven/util/channel/CachedChannelProviderTest.java
index bd9d9428dba..5fa45196075 100644
--- a/Util/channel/src/test/java/io/deephaven/util/channel/CachedChannelProviderTest.java
+++ b/Util/channel/src/test/java/io/deephaven/util/channel/CachedChannelProviderTest.java
@@ -13,7 +13,6 @@
 import java.net.URI;
 import java.nio.ByteBuffer;
 import java.nio.channels.SeekableByteChannel;
-import java.nio.file.Path;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.concurrent.atomic.AtomicInteger;
@@ -54,50 +53,17 @@ public void testSimpleRead() throws IOException {
     }
 
     @Test
-    public void testSimpleReadWrite() throws IOException {
+    public void testSimplePooledReadChannelClose() throws IOException {
         SeekableChannelsProvider wrappedProvider = new TestChannelProvider();
         CachedChannelProvider cachedChannelProvider = CachedChannelProvider.create(wrappedProvider, 100);
         for (int i = 0; i < 1000; i++) {
-            SeekableByteChannel rc =
-                    ((i / 100) % 2 == 0 ? cachedChannelProvider.getReadChannel(wrappedProvider.makeContext(), "r" + i)
-                            : cachedChannelProvider.getWriteChannel("w" + i, false));
+            SeekableByteChannel rc = cachedChannelProvider.getReadChannel(wrappedProvider.makeContext(), "r" + i);
             rc.close();
         }
         assertEquals(900, closed.size());
         assertTrue(closed.get(0).endsWith("r0"));
     }
 
-    @Test
-    public void testSimpleWrite() throws IOException {
-        SeekableChannelsProvider wrappedProvider = new TestChannelProvider();
-        CachedChannelProvider cachedChannelProvider = CachedChannelProvider.create(wrappedProvider, 100);
-        for (int i = 0; i < 1000; i++) {
-            SeekableByteChannel rc = cachedChannelProvider.getWriteChannel("w" + i, false);
-            // Call write to hit the assertions inside the mock channel
-            final ByteBuffer buffer = ByteBuffer.allocate(1);
-            rc.write(buffer);
-            rc.close();
-        }
-        assertEquals(900, closed.size());
-        for (int i = 0; i < 900; i++) {
-            assertTrue(closed.get(i).endsWith("w" + (i)));
-        }
-    }
-
-    @Test
-    public void testSimpleAppend() throws IOException {
-        SeekableChannelsProvider wrappedProvider = new TestChannelProvider();
-        CachedChannelProvider cachedChannelProvider = CachedChannelProvider.create(wrappedProvider, 100);
-        for (int i = 0; i < 1000; i++) {
-            SeekableByteChannel rc = cachedChannelProvider.getWriteChannel("a" + i, true);
-            rc.close();
-        }
-        assertEquals(900, closed.size());
-        for (int i = 0; i < 900; i++) {
-            assertTrue(closed.get(i).endsWith("a" + (i)));
-        }
-    }
-
     @Test
     public void testCloseOrder() throws IOException {
         SeekableChannelsProvider wrappedProvider = new TestChannelProvider();
@@ -147,33 +113,6 @@ public void testReuse() throws IOException {
         assertEquals(0, closed.size());
     }
 
-    @Test
-    public void testReuse10() throws IOException {
-        final SeekableChannelsProvider wrappedProvider = new TestChannelProvider();
-        final CachedChannelProvider cachedChannelProvider = CachedChannelProvider.create(wrappedProvider, 100);
-        final SeekableByteChannel[] someResult = new SeekableByteChannel[100];
-        for (int pi = 0; pi < 10; ++pi) {
-            for (int ci = 0; ci < 10; ++ci) {
-                someResult[pi * 10 + ci] = cachedChannelProvider.getWriteChannel("w" + pi % 10, false);
-            }
-            for (int ci = 0; ci < 10; ++ci) {
-                someResult[pi * 10 + 9 - ci].close();
-            }
-        }
-        for (int step = 0; step < 10; ++step) {
-            final SeekableByteChannel[] reused = new SeekableByteChannel[100];
-            for (int ri = 0; ri < 100; ++ri) {
-                SeekableByteChannel rc = cachedChannelProvider.getWriteChannel("w" + (ri / 10) % 10, false);
-                assertSame(rc, someResult[ri % 100]);
-                reused[ri] = rc;
-            }
-            for (int ri = 0; ri < 100; ++ri) {
-                reused[99 - ri].close();
-            }
-        }
-        assertEquals(0, closed.size());
-    }
-
     @Test
     void testRewrapCachedChannelProvider() {
         final SeekableChannelsProvider wrappedProvider = new TestChannelProvider();
@@ -192,8 +131,9 @@ private class TestChannelProvider implements SeekableChannelsProvider {
 
         private final class TestChannelContext implements SeekableChannelContext {
             @Override
-            public @Nullable SafeCloseable apply(Supplier<SafeCloseable> resourceFactory) {
-                throw new UnsupportedOperationException("apply");
+            @Nullable
+            public <T extends SafeCloseable> T getCachedResource(final String key, final Supplier<T> resourceFactory) {
+                throw new UnsupportedOperationException("getCachedResource");
             }
         }
 
@@ -207,6 +147,11 @@ public boolean isCompatibleWith(@NotNull SeekableChannelContext channelContext)
             return channelContext == SeekableChannelContext.NULL;
         }
 
+        @Override
+        public boolean exists(@NotNull URI uri) {
+            throw new UnsupportedOperationException("exists");
+        }
+
         @Override
         public SeekableByteChannel getReadChannel(@NotNull SeekableChannelContext channelContext,
                 @NotNull String path) {
@@ -225,13 +170,8 @@ public SeekableByteChannel getReadChannel(@NotNull SeekableChannelContext channe
         }
 
         @Override
-        public SeekableByteChannel getWriteChannel(@NotNull String path, boolean append) {
-            return new TestMockChannel(count.getAndIncrement(), path);
-        }
-
-        @Override
-        public SeekableByteChannel getWriteChannel(@NotNull Path path, boolean append) {
-            return new TestMockChannel(count.getAndIncrement(), path.toString());
+        public CompletableOutputStream getOutputStream(@NotNull final URI uri, int bufferSizeHint) {
+            throw new UnsupportedOperationException("getOutputStream");
         }
 
         @Override
diff --git a/Util/function/build.gradle b/Util/function/build.gradle
index 6b0feeb4d9f..ffa2c915bc2 100644
--- a/Util/function/build.gradle
+++ b/Util/function/build.gradle
@@ -5,14 +5,15 @@ plugins {
 
 dependencies {
     api project(':qst-type')
+    implementation project(':engine-query-constants')
 
-    compileOnly depAnnotations
+    compileOnly libs.jetbrains.annotations
 
-    Classpaths.inheritJUnitPlatform(project)
-    Classpaths.inheritAssertJ(project)
-    testImplementation 'org.junit.jupiter:junit-jupiter'
-    testRuntimeOnly 'org.junit.jupiter:junit-jupiter-engine'
-    testRuntimeOnly 'org.junit.platform:junit-platform-launcher'
+    testImplementation libs.assertj
+    testImplementation platform(libs.junit.bom)
+    testImplementation libs.junit.jupiter
+    testRuntimeOnly libs.junit.jupiter.engine
+    testRuntimeOnly libs.junit.platform.launcher
 }
 
 test {
diff --git a/extensions/kafka/src/main/java/io/deephaven/kafka/UnboxTransform.java b/Util/function/src/main/java/io/deephaven/function/UnboxTransform.java
similarity index 87%
rename from extensions/kafka/src/main/java/io/deephaven/kafka/UnboxTransform.java
rename to Util/function/src/main/java/io/deephaven/function/UnboxTransform.java
index 945bc4f3425..6c4301e2bba 100644
--- a/extensions/kafka/src/main/java/io/deephaven/kafka/UnboxTransform.java
+++ b/Util/function/src/main/java/io/deephaven/function/UnboxTransform.java
@@ -1,18 +1,8 @@
 //
 // Copyright (c) 2016-2024 Deephaven Data Labs and Patent Pending
 //
-package io.deephaven.kafka;
-
-import io.deephaven.function.ToByteFunction;
-import io.deephaven.function.ToCharFunction;
-import io.deephaven.function.ToDoubleFunction;
-import io.deephaven.function.ToFloatFunction;
-import io.deephaven.function.ToIntFunction;
-import io.deephaven.function.ToLongFunction;
-import io.deephaven.function.ToObjectFunction;
-import io.deephaven.function.ToPrimitiveFunction;
-import io.deephaven.function.ToShortFunction;
-import io.deephaven.function.TypedFunction;
+package io.deephaven.function;
+
 import io.deephaven.qst.type.ArrayType;
 import io.deephaven.qst.type.BoxedBooleanType;
 import io.deephaven.qst.type.BoxedByteType;
@@ -27,12 +17,13 @@
 import io.deephaven.qst.type.GenericType;
 import io.deephaven.qst.type.InstantType;
 import io.deephaven.qst.type.StringType;
-import io.deephaven.util.type.TypeUtils;
 
 import java.util.Objects;
 import java.util.Optional;
 
-class UnboxTransform {
+import static io.deephaven.util.QueryConstants.*;
+
+public class UnboxTransform {
 
     private static final ToByteFunction<Byte> UNBOX_BYTE = TypeUtils::unbox;
     private static final ToCharFunction<Character> UNBOX_CHAR = TypeUtils::unbox;
@@ -40,7 +31,7 @@ class UnboxTransform {
     private static final ToIntFunction<Integer> UNBOX_INT = TypeUtils::unbox;
     private static final ToLongFunction<Long> UNBOX_LONG = TypeUtils::unbox;
     private static final ToFloatFunction<Float> UNBOX_FLOAT = TypeUtils::unbox;
-    private static final ToDoubleFunction<Double> UNBOX_DOULE = TypeUtils::unbox;
+    private static final ToDoubleFunction<Double> UNBOX_DOUBLE = TypeUtils::unbox;
 
     /**
      * Returns the Deephaven unboxed equivalent of {@code f}. Relevant for all {@link BoxedType boxed types} except the
@@ -161,7 +152,7 @@ public static <T> ToFloatFunction<T> unboxFloat(ToObjectFunction<T, Float> f) {
      * @see TypeUtils#unbox(Double)
      */
     public static <T> ToDoubleFunction<T> unboxDouble(ToObjectFunction<T, Double> f) {
-        return f.mapToDouble(UNBOX_DOULE);
+        return f.mapToDouble(UNBOX_DOUBLE);
     }
 
     private enum UnboxFunctionVisitor implements TypedFunction.Visitor<Object, ToPrimitiveFunction<Object>> {
@@ -264,4 +255,36 @@ public ToPrimitiveFunction<T> visit(BoxedDoubleType doubleType) {
             return unboxDouble(f.cast(doubleType));
         }
     }
+
+    // TODO: Clean up dependencies to be able to use io.deephaven.util.type.TypeUtils.
+    private static class TypeUtils {
+        public static byte unbox(Byte value) {
+            return (value == null ? NULL_BYTE : value);
+        }
+
+        public static char unbox(Character value) {
+            return (value == null ? NULL_CHAR : value);
+        }
+
+        public static double unbox(Double value) {
+            return (value == null ? NULL_DOUBLE : value);
+        }
+
+        public static float unbox(Float value) {
+            return (value == null ? NULL_FLOAT : value);
+        }
+
+        public static int unbox(Integer value) {
+            return (value == null ? NULL_INT : value);
+        }
+
+        public static long unbox(Long value) {
+            return (value == null ? NULL_LONG : value);
+        }
+
+        public static short unbox(Short value) {
+            return (value == null ? NULL_SHORT : value);
+        }
+
+    }
 }
diff --git a/Util/immutables/build.gradle b/Util/immutables/build.gradle
index c785c9e8fe6..491886a8bec 100644
--- a/Util/immutables/build.gradle
+++ b/Util/immutables/build.gradle
@@ -4,5 +4,5 @@ plugins {
 }
 
 dependencies {
-    compileOnlyApi 'org.immutables:value-annotations:2.9.2'
+    compileOnlyApi libs.immutables.value.annotations
 }
diff --git a/Util/immutables/gradle.properties b/Util/immutables/gradle.properties
index 4d202c2484f..d7a5121a152 100644
--- a/Util/immutables/gradle.properties
+++ b/Util/immutables/gradle.properties
@@ -1,2 +1,2 @@
 io.deephaven.project.ProjectType=JAVA_LOCAL
-languageLevel=8
\ No newline at end of file
+languageLevel=8
diff --git a/Util/pool/build.gradle b/Util/pool/build.gradle
new file mode 100644
index 00000000000..28fc23d26eb
--- /dev/null
+++ b/Util/pool/build.gradle
@@ -0,0 +1,23 @@
+plugins {
+    id 'java-library'
+    id 'io.deephaven.project.register'
+}
+
+description 'util-pool: Optional extensions of the io.deephaven.base.pool module'
+
+dependencies {
+    api project(':Base')
+    api project(":IO")
+
+    compileOnly libs.jetbrains.annotations
+
+    testImplementation platform(libs.junit.bom)
+    testImplementation libs.junit.jupiter
+    testRuntimeOnly libs.junit.jupiter.engine
+    testRuntimeOnly libs.junit.platform.launcher
+    testImplementation project(path: ':Base', configuration: 'tests')
+}
+
+test {
+    useJUnitPlatform()
+}
diff --git a/Util/pool/gradle.properties b/Util/pool/gradle.properties
new file mode 100644
index 00000000000..9e8588f2620
--- /dev/null
+++ b/Util/pool/gradle.properties
@@ -0,0 +1,2 @@
+io.deephaven.project.ProjectType=JAVA_PUBLIC
+languageLevel=8
diff --git a/Util/src/main/java/io/deephaven/util/pool/PoolEx.java b/Util/pool/src/main/java/io/deephaven/util/pool/PoolEx.java
similarity index 100%
rename from Util/src/main/java/io/deephaven/util/pool/PoolEx.java
rename to Util/pool/src/main/java/io/deephaven/util/pool/PoolEx.java
diff --git a/Util/src/main/java/io/deephaven/util/pool/ThreadSafeFixedSizePool.java b/Util/pool/src/main/java/io/deephaven/util/pool/ThreadSafeFixedSizePool.java
similarity index 100%
rename from Util/src/main/java/io/deephaven/util/pool/ThreadSafeFixedSizePool.java
rename to Util/pool/src/main/java/io/deephaven/util/pool/ThreadSafeFixedSizePool.java
diff --git a/Util/src/main/java/io/deephaven/util/pool/ThreadSafeLenientFixedSizePool.java b/Util/pool/src/main/java/io/deephaven/util/pool/ThreadSafeLenientFixedSizePool.java
similarity index 100%
rename from Util/src/main/java/io/deephaven/util/pool/ThreadSafeLenientFixedSizePool.java
rename to Util/pool/src/main/java/io/deephaven/util/pool/ThreadSafeLenientFixedSizePool.java
diff --git a/Util/src/test/java/io/deephaven/util/pool/TestThreadSafeFixedSizePool.java b/Util/pool/src/test/java/io/deephaven/util/pool/TestThreadSafeFixedSizePool.java
similarity index 97%
rename from Util/src/test/java/io/deephaven/util/pool/TestThreadSafeFixedSizePool.java
rename to Util/pool/src/test/java/io/deephaven/util/pool/TestThreadSafeFixedSizePool.java
index e87ccbbf7f6..e5d6fa5e45d 100644
--- a/Util/src/test/java/io/deephaven/util/pool/TestThreadSafeFixedSizePool.java
+++ b/Util/pool/src/test/java/io/deephaven/util/pool/TestThreadSafeFixedSizePool.java
@@ -7,13 +7,15 @@
 import io.deephaven.base.pool.MockClearingProcedure;
 import io.deephaven.base.pool.Pool;
 import io.deephaven.base.verify.RequirementFailure;
-import junit.framework.TestCase;
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.*;
 
 // --------------------------------------------------------------------
 /**
  * Tests for {@link io.deephaven.base.pool.ThreadSafeFixedSizePool}.
  */
-public class TestThreadSafeFixedSizePool extends TestCase {
+public class TestThreadSafeFixedSizePool {
 
     private MockFactory<Object> m_mockObjectFactory;
     private MockClearingProcedure<Object> m_mockClearingProcedure;
@@ -27,6 +29,7 @@ public class TestThreadSafeFixedSizePool extends TestCase {
     };
 
     // ----------------------------------------------------------------
+    @Test
     public void testThreadSafeFixedSizePool() {
         m_mockObjectFactory = new MockFactory<Object>();
         m_mockClearingProcedure = new MockClearingProcedure<Object>();
@@ -82,6 +85,7 @@ public void testThreadSafeFixedSizePool() {
     }
 
     // ----------------------------------------------------------------
+    @Test
     public void testThreadSafeFixedSizePoolNoClearingProcedure() {
         m_mockObjectFactory = new MockFactory<Object>();
         m_mockClearingProcedure = new MockClearingProcedure<Object>();
@@ -112,6 +116,7 @@ public void testThreadSafeFixedSizePoolNoClearingProcedure() {
     }
 
     // ----------------------------------------------------------------
+    @Test
     public void testThreadSafeFixedSizePoolNoFactory() {
         m_mockObjectFactory = new MockFactory<Object>();
         m_mockClearingProcedure = new MockClearingProcedure<Object>();
diff --git a/Util/src/test/java/io/deephaven/util/pool/TestThreadSafeLenientFixedSizePool.java b/Util/pool/src/test/java/io/deephaven/util/pool/TestThreadSafeLenientFixedSizePool.java
similarity index 93%
rename from Util/src/test/java/io/deephaven/util/pool/TestThreadSafeLenientFixedSizePool.java
rename to Util/pool/src/test/java/io/deephaven/util/pool/TestThreadSafeLenientFixedSizePool.java
index 81b6eee97de..2b645408cf3 100644
--- a/Util/src/test/java/io/deephaven/util/pool/TestThreadSafeLenientFixedSizePool.java
+++ b/Util/pool/src/test/java/io/deephaven/util/pool/TestThreadSafeLenientFixedSizePool.java
@@ -7,15 +7,17 @@
 import io.deephaven.base.pool.MockClearingProcedure;
 import io.deephaven.base.pool.Pool;
 import io.deephaven.base.verify.RequirementFailure;
-import junit.framework.TestCase;
+import org.junit.jupiter.api.Test;
 
 import java.util.function.Function;
 
+import static org.junit.jupiter.api.Assertions.*;
+
 // --------------------------------------------------------------------
 /**
  * Tests for {@link io.deephaven.base.pool.ThreadSafeLenientFixedSizePool}.
  */
-public class TestThreadSafeLenientFixedSizePool extends TestCase {
+public class TestThreadSafeLenientFixedSizePool {
 
     private MockFactory<Object> m_mockObjectFactory;
     private MockClearingProcedure<Object> m_mockClearingProcedure;
@@ -29,6 +31,7 @@ public class TestThreadSafeLenientFixedSizePool extends TestCase {
     };
 
     // ----------------------------------------------------------------
+    @Test
     public void testThreadSafeLenientFixedSizePool() {
         m_mockObjectFactory = new MockFactory<Object>();
         m_mockClearingProcedure = new MockClearingProcedure<Object>();
@@ -93,6 +96,7 @@ public void testThreadSafeLenientFixedSizePool() {
     }
 
     // ----------------------------------------------------------------
+    @Test
     public void testThreadSafeLenientFixedSizePoolNoClearingProcedure() {
         m_mockObjectFactory = new MockFactory<Object>();
         m_mockClearingProcedure = new MockClearingProcedure<Object>();
@@ -125,6 +129,7 @@ public void testThreadSafeLenientFixedSizePoolNoClearingProcedure() {
     }
 
     // ----------------------------------------------------------------
+    @Test
     public void testThreadSafeLenientFixedSizePoolNoFactory() {
         m_mockObjectFactory = new MockFactory<Object>();
         m_mockClearingProcedure = new MockClearingProcedure<Object>();
@@ -147,8 +152,8 @@ public void testThreadSafeLenientFixedSizePoolNoFactory() {
         try {
             new io.deephaven.base.pool.ThreadSafeLenientFixedSizePool<Object>(6, m_mockObjectFactory,
                     m_mockClearingProcedure);
-        } catch (RequirementFailure requirementFailure) {
-            assertTrue(requirementFailure.isThisStackFrameCulprit(0));
+            fail("expected to throw");
+        } catch (RequirementFailure expected) {
         }
 
         // minimum size
@@ -162,16 +167,16 @@ public void testThreadSafeLenientFixedSizePoolNoFactory() {
         try {
             io.deephaven.base.pool.ThreadSafeLenientFixedSizePool.FACTORY.create(OBJECTS.length, null,
                     m_mockClearingProcedure);
-        } catch (RequirementFailure requirementFailure) {
-            assertTrue(requirementFailure.isThisStackFrameCulprit(0));
+            fail("expected to throw");
+        } catch (RequirementFailure expected) {
         }
 
         // too small
         try {
             io.deephaven.base.pool.ThreadSafeLenientFixedSizePool.FACTORY.create(6, m_mockObjectFactory,
                     m_mockClearingProcedure);
-        } catch (RequirementFailure requirementFailure) {
-            assertTrue(requirementFailure.isThisStackFrameCulprit(0));
+            fail("expected to throw");
+        } catch (RequirementFailure expected) {
         }
 
         // minimum size
diff --git a/Util/processenvironment/build.gradle b/Util/processenvironment/build.gradle
new file mode 100644
index 00000000000..0911276f3da
--- /dev/null
+++ b/Util/processenvironment/build.gradle
@@ -0,0 +1,17 @@
+plugins {
+    id 'java-library'
+    id 'io.deephaven.project.register'
+}
+
+description 'util-processenvironment: Deephaven ProcessEnvironment and default implementations'
+
+dependencies {
+    api project(':Configuration')
+    api project(':IO')
+
+    implementation project(':util-thread')
+    implementation project(':log-factory')
+    implementation project(':Base')
+
+    compileOnly libs.jetbrains.annotations
+}
diff --git a/Util/processenvironment/gradle.properties b/Util/processenvironment/gradle.properties
new file mode 100644
index 00000000000..9e8588f2620
--- /dev/null
+++ b/Util/processenvironment/gradle.properties
@@ -0,0 +1,2 @@
+io.deephaven.project.ProjectType=JAVA_PUBLIC
+languageLevel=8
diff --git a/Util/src/main/java/io/deephaven/util/process/BaseProcessEnvironment.java b/Util/processenvironment/src/main/java/io/deephaven/util/process/BaseProcessEnvironment.java
similarity index 100%
rename from Util/src/main/java/io/deephaven/util/process/BaseProcessEnvironment.java
rename to Util/processenvironment/src/main/java/io/deephaven/util/process/BaseProcessEnvironment.java
diff --git a/Util/src/main/java/io/deephaven/util/process/DefaultFatalErrorReporter.java b/Util/processenvironment/src/main/java/io/deephaven/util/process/DefaultFatalErrorReporter.java
similarity index 100%
rename from Util/src/main/java/io/deephaven/util/process/DefaultFatalErrorReporter.java
rename to Util/processenvironment/src/main/java/io/deephaven/util/process/DefaultFatalErrorReporter.java
diff --git a/Util/src/main/java/io/deephaven/util/process/DefaultProcessEnvironment.java b/Util/processenvironment/src/main/java/io/deephaven/util/process/DefaultProcessEnvironment.java
similarity index 100%
rename from Util/src/main/java/io/deephaven/util/process/DefaultProcessEnvironment.java
rename to Util/processenvironment/src/main/java/io/deephaven/util/process/DefaultProcessEnvironment.java
diff --git a/Util/src/main/java/io/deephaven/util/process/FatalErrorReporter.java b/Util/processenvironment/src/main/java/io/deephaven/util/process/FatalErrorReporter.java
similarity index 100%
rename from Util/src/main/java/io/deephaven/util/process/FatalErrorReporter.java
rename to Util/processenvironment/src/main/java/io/deephaven/util/process/FatalErrorReporter.java
diff --git a/Util/src/main/java/io/deephaven/util/process/FatalErrorReporterBase.java b/Util/processenvironment/src/main/java/io/deephaven/util/process/FatalErrorReporterBase.java
similarity index 100%
rename from Util/src/main/java/io/deephaven/util/process/FatalErrorReporterBase.java
rename to Util/processenvironment/src/main/java/io/deephaven/util/process/FatalErrorReporterBase.java
diff --git a/Util/src/main/java/io/deephaven/util/process/LoggerShutdownTask.java b/Util/processenvironment/src/main/java/io/deephaven/util/process/LoggerShutdownTask.java
similarity index 100%
rename from Util/src/main/java/io/deephaven/util/process/LoggerShutdownTask.java
rename to Util/processenvironment/src/main/java/io/deephaven/util/process/LoggerShutdownTask.java
diff --git a/Util/src/main/java/io/deephaven/util/process/OnetimeShutdownTask.java b/Util/processenvironment/src/main/java/io/deephaven/util/process/OnetimeShutdownTask.java
similarity index 100%
rename from Util/src/main/java/io/deephaven/util/process/OnetimeShutdownTask.java
rename to Util/processenvironment/src/main/java/io/deephaven/util/process/OnetimeShutdownTask.java
diff --git a/Util/src/main/java/io/deephaven/util/process/ProcessEnvironment.java b/Util/processenvironment/src/main/java/io/deephaven/util/process/ProcessEnvironment.java
similarity index 100%
rename from Util/src/main/java/io/deephaven/util/process/ProcessEnvironment.java
rename to Util/processenvironment/src/main/java/io/deephaven/util/process/ProcessEnvironment.java
diff --git a/Util/src/main/java/io/deephaven/util/process/ShutdownManager.java b/Util/processenvironment/src/main/java/io/deephaven/util/process/ShutdownManager.java
similarity index 100%
rename from Util/src/main/java/io/deephaven/util/process/ShutdownManager.java
rename to Util/processenvironment/src/main/java/io/deephaven/util/process/ShutdownManager.java
diff --git a/Util/src/main/java/io/deephaven/util/process/ShutdownManagerImpl.java b/Util/processenvironment/src/main/java/io/deephaven/util/process/ShutdownManagerImpl.java
similarity index 100%
rename from Util/src/main/java/io/deephaven/util/process/ShutdownManagerImpl.java
rename to Util/processenvironment/src/main/java/io/deephaven/util/process/ShutdownManagerImpl.java
diff --git a/Util/src/main/java/io/deephaven/util/EncodingUtil.java b/Util/src/main/java/io/deephaven/util/EncodingUtil.java
deleted file mode 100644
index 81009c7774d..00000000000
--- a/Util/src/main/java/io/deephaven/util/EncodingUtil.java
+++ /dev/null
@@ -1,119 +0,0 @@
-//
-// Copyright (c) 2016-2024 Deephaven Data Labs and Patent Pending
-//
-package io.deephaven.util;
-
-import io.deephaven.base.string.EncodingInfo;
-import org.apache.commons.io.ByteOrderMark;
-import org.jetbrains.annotations.NotNull;
-
-import java.nio.BufferOverflowException;
-import java.nio.BufferUnderflowException;
-import java.nio.ByteBuffer;
-import java.nio.CharBuffer;
-import java.nio.charset.CharacterCodingException;
-import java.nio.charset.Charset;
-import java.nio.charset.CharsetDecoder;
-import java.nio.charset.CharsetEncoder;
-import java.util.Arrays;
-
-public class EncodingUtil {
-    @SuppressWarnings("WeakerAccess")
-    public static final ByteOrderMark[] EMPTY_BOM_ARRAY = new ByteOrderMark[0];
-
-    /**
-     * Get the {@link EncodingInfo} associated with a particular {@link Charset}
-     *
-     * @param charSet The charset
-     * @return the matching {@link EncodingInfo}
-     * @throws IllegalArgumentException if there is no associated encoding
-     */
-    @NotNull
-    public static EncodingInfo getEncodingInfoForCharset(@NotNull Charset charSet) throws IllegalArgumentException {
-        return getEncodingInfoForCharset(charSet.name());
-    }
-
-    /**
-     * Get the {@link EncodingInfo} associated with a particular charset name
-     *
-     * @param charsetName the charset
-     * @return the matching {@link EncodingInfo}
-     * @throws IllegalArgumentException if there is no associated encoding
-     */
-    public static EncodingInfo getEncodingInfoForCharset(@NotNull String charsetName) {
-        return Arrays.stream(EncodingInfo.values())
-                .filter(info -> info.getCharset().name().equals(charsetName))
-                .findFirst()
-                .orElseThrow(() -> new IllegalArgumentException("No EncodingInfo for " + charsetName));
-    }
-
-    /**
-     * Get an array containing the possible {@link ByteOrderMark byte order marks} that could be present within a file
-     * of the specified encoding. This is intended for use with {@link org.apache.commons.io.input.BOMInputStream}
-     *
-     * @param encoding The encoding.
-     * @return An array containing the possible {@link ByteOrderMark BOMs} for the encoding.
-     */
-    @NotNull
-    public static ByteOrderMark[] getBOMsForEncoding(EncodingInfo encoding) {
-        switch (encoding) {
-            case UTF_8:
-                return new ByteOrderMark[] {ByteOrderMark.UTF_8};
-            case UTF_16BE:
-                return new ByteOrderMark[] {ByteOrderMark.UTF_16BE};
-            case UTF_16LE:
-                return new ByteOrderMark[] {ByteOrderMark.UTF_16LE};
-            case UTF_16:
-                return new ByteOrderMark[] {ByteOrderMark.UTF_16BE, ByteOrderMark.UTF_16LE};
-        }
-
-        return EMPTY_BOM_ARRAY;
-    }
-
-    /**
-     * Encode the given string in UTF-8 format into the given ByteBuffer. The string is encoded as an int length
-     * followed by the encoded bytes.
-     *
-     * @param destination a ByteBuffer in which to encode the string. The buffer must be big enough for the encoded
-     *        string.
-     * @param value the String value to encode.
-     * @throws BufferOverflowException if the destination isn't big enough.
-     */
-    public static void putUtf8String(@NotNull final ByteBuffer destination, @NotNull final String value) {
-        final int initialPosition = destination.position();
-        destination.position(initialPosition + Integer.BYTES);
-        final CharsetEncoder encoder = EncodingInfo.UTF_8.getEncoder().reset();
-        if (!encoder.encode(CharBuffer.wrap(value), destination, true).isUnderflow()
-                || !encoder.flush(destination).isUnderflow()) {
-            throw new BufferOverflowException();
-        }
-        destination.putInt(initialPosition, destination.position() - initialPosition - Integer.BYTES);
-    }
-
-    /**
-     * Extract a UTF-8 encoded string from the given buffer. The buffer must be positioned at the start of the encoding,
-     * which is an int length followed by the UTF-8 encoded bytes. The buffer is advanced to the end of the string.
-     *
-     * @param source a ByteBuffer positioned at the string encoded as length + UTF-8 encoded bytes.
-     * @return a new String extracted from the buffer
-     * @throws BufferUnderflowException if there isn't enough data in the source ByteBuffer
-     * @throws IllegalArgumentException if there is a decoding error
-     */
-    public static String getUtf8String(@NotNull final ByteBuffer source) {
-        final int length = source.getInt();
-        final int initialLimit = source.limit();
-        final CharsetDecoder decoder = EncodingInfo.UTF_8.getDecoder().reset();
-        if (length > source.remaining()) {
-            throw new BufferUnderflowException();
-        }
-        source.limit(source.position() + length);
-        final String result;
-        try {
-            result = decoder.decode(source).toString();
-        } catch (CharacterCodingException e) {
-            throw new IllegalArgumentException("Unexpectedly failed to decode input bytes", e);
-        }
-        source.limit(initialLimit);
-        return result;
-    }
-}
diff --git a/Util/src/main/java/io/deephaven/util/MultiException.java b/Util/src/main/java/io/deephaven/util/MultiException.java
index f2dcc13a90c..e5ce94740c8 100644
--- a/Util/src/main/java/io/deephaven/util/MultiException.java
+++ b/Util/src/main/java/io/deephaven/util/MultiException.java
@@ -105,7 +105,7 @@ public void printStackTrace(PrintStream s) {
     @Override
     public String getMessage() {
         StringBuilder sb = new StringBuilder();
-        sb.append(super.getMessage()).append(": \n");
+        sb.append(super.getMessage()).append(":\n");
         for (int i = 0; i < causes.length; i++) {
             sb.append("Cause ").append(i).append(": ");
             sb.append(causes[i].toString());
diff --git a/Util/src/main/java/io/deephaven/util/SimpleTypeMap.java b/Util/src/main/java/io/deephaven/util/SimpleTypeMap.java
index 7b15c86f8b5..c1ab8b67abb 100644
--- a/Util/src/main/java/io/deephaven/util/SimpleTypeMap.java
+++ b/Util/src/main/java/io/deephaven/util/SimpleTypeMap.java
@@ -7,17 +7,56 @@
 
 public final class SimpleTypeMap<V> {
 
-    public static <V> SimpleTypeMap<V> create(V forBoolean, V forChar, V forByte, V forShort, V forInt, V forLong,
-            V forFloat, V forDouble, V forObject) {
+    /**
+     * Create a mapping from type {@link Class classes} to a value.
+     *
+     * @param forBoolean The mapping for {@code boolean} types (<em>note</em> {@link Boolean} maps to {@code forObject})
+     * @param forChar The mapping for {@code char} and {@link Character} types
+     * @param forByte The mapping for {@code byte} and {@link Byte} types
+     * @param forShort The mapping for {@code short} and {@link Short} types
+     * @param forInt The mapping for {@code int} and {@link Integer} types
+     * @param forLong The mapping for {@code long} and {@link Long} types
+     * @param forFloat The mapping for {@code float} and {@link Float} types
+     * @param forDouble The mapping for {@code double} and {@link Double} types
+     * @param forObject The mapping for all other types
+     * @return A SimpleTypeMap to the provided values
+     */
+    public static <V> SimpleTypeMap<V> create(
+            V forBoolean,
+            V forChar,
+            V forByte,
+            V forShort,
+            V forInt,
+            V forLong,
+            V forFloat,
+            V forDouble,
+            V forObject) {
         final HashMap<Class<?>, V> map = new HashMap<>();
+
         map.put(boolean.class, forBoolean);
+        // Note: Booleans are treated as Objects, unlike other boxed primitives
+
         map.put(char.class, forChar);
+        map.put(Character.class, forChar);
+
         map.put(byte.class, forByte);
+        map.put(Byte.class, forByte);
+
         map.put(short.class, forShort);
+        map.put(Short.class, forShort);
+
         map.put(int.class, forInt);
+        map.put(Integer.class, forInt);
+
         map.put(long.class, forLong);
+        map.put(Long.class, forLong);
+
         map.put(float.class, forFloat);
+        map.put(Float.class, forFloat);
+
         map.put(double.class, forDouble);
+        map.put(Double.class, forDouble);
+
         return new SimpleTypeMap<>(map, forObject);
     }
 
diff --git a/Util/src/main/java/io/deephaven/util/Utils.java b/Util/src/main/java/io/deephaven/util/Utils.java
index 686412b17a6..8645ac598aa 100644
--- a/Util/src/main/java/io/deephaven/util/Utils.java
+++ b/Util/src/main/java/io/deephaven/util/Utils.java
@@ -375,19 +375,12 @@ public static String getSimpleNameFor(@NotNull Class<?> objectClass) {
     /**
      * require (o instanceof type)
      */
-    public static <T> T castTo(Object o, String name, Class<T> type, int numCallsBelowRequirer) {
-        io.deephaven.base.verify.Require.instanceOf(o, name, type, numCallsBelowRequirer);
+    public static <T> T castTo(Object o, String name, Class<T> type) {
+        io.deephaven.base.verify.Require.requirement(type.isInstance(o), name);
         // noinspection unchecked
         return (T) o;
     }
 
-    /**
-     * require (o instanceof type)
-     */
-    public static <T> T castTo(Object o, String name, Class<T> type) {
-        return castTo(o, name, type, 1);
-    }
-
     /**
      * Describe the object in a standardized format without accessing its fields or otherwise risking interacting with
      * partially-initialized state.
diff --git a/Util/src/main/java/io/deephaven/util/codec/CodecCache.java b/Util/src/main/java/io/deephaven/util/codec/CodecCache.java
deleted file mode 100644
index ee920c5171d..00000000000
--- a/Util/src/main/java/io/deephaven/util/codec/CodecCache.java
+++ /dev/null
@@ -1,104 +0,0 @@
-//
-// Copyright (c) 2016-2024 Deephaven Data Labs and Patent Pending
-//
-package io.deephaven.util.codec;
-
-import io.deephaven.base.verify.Require;
-import org.jetbrains.annotations.NotNull;
-import org.jetbrains.annotations.Nullable;
-
-import java.lang.reflect.Constructor;
-import java.lang.reflect.InvocationTargetException;
-import java.math.BigDecimal;
-import java.math.BigInteger;
-import java.time.LocalDate;
-import java.time.LocalTime;
-import java.time.ZonedDateTime;
-import java.util.HashMap;
-import java.util.Map;
-
-/**
- * Cache for {@link ObjectCodec} instances.
- */
-public enum CodecCache {
-
-    DEFAULT;
-
-    /**
-     * Cached item.
-     */
-    private static class Item {
-
-        @NotNull
-        private final ObjectCodec<?> codec;
-
-        private Item(@NotNull final String className,
-                @Nullable final String arguments) {
-            Require.neqNull(className, "className");
-
-            final Class<? extends ObjectCodec> codecClass;
-            try {
-                // noinspection unchecked
-                codecClass = (Class<? extends ObjectCodec>) Class.forName(className);
-            } catch (ClassNotFoundException e) {
-                throw new CodecCacheException("Unknown codec class " + className, e);
-            }
-            final Constructor<? extends ObjectCodec> codecConstructor;
-            try {
-                codecConstructor = codecClass.getConstructor(String.class);
-            } catch (NoSuchMethodException e) {
-                throw new CodecCacheException("Codec class " + codecClass + " is missing expected String constructor",
-                        e);
-            }
-            try {
-                codec = codecConstructor.newInstance(arguments);
-            } catch (InstantiationException | IllegalAccessException | InvocationTargetException
-                    | ClassCastException e) {
-                throw new CodecCacheException(
-                        "Failed to instantiate codec of type " + codecClass + " from arguments " + arguments, e);
-            }
-        }
-    }
-
-    private final Map<String, Map<String, Item>> items = new HashMap<>();
-
-    /**
-     * Get or create a cached {@link ObjectCodec}.
-     *
-     * @param className The class name
-     * @param arguments The constructor arguments
-     * @param <TYPE> The encoding type
-     * @return The corresponding {@link ObjectCodec}
-     * @throws CodecCacheException If an error occurred while instantiating the named codec class from the supplied
-     *         arguments
-     */
-    public synchronized <TYPE> ObjectCodec<TYPE> getCodec(@NotNull final String className,
-            @Nullable final String arguments) {
-        // noinspection unchecked
-        return (ObjectCodec<TYPE>) items
-                .computeIfAbsent(className, (cn) -> new HashMap<>())
-                .computeIfAbsent(arguments, (a) -> new Item(className, a)).codec;
-    }
-
-    /**
-     * Get the default {@link ObjectCodec} class to use for the given column type.
-     *
-     * @param dataType The column data type
-     * @return The name of the default {@link ObjectCodec} subclass to use for encoding the given type
-     */
-    public static String getDefaultCodecClass(@NotNull final Class<?> dataType) {
-        if (dataType.equals(LocalDate.class)) {
-            return LocalDateCodec.class.getName();
-        } else if (dataType.equals(LocalTime.class)) {
-            return LocalTimeCodec.class.getName();
-        } else if (dataType.equals(BigDecimal.class)) {
-            return BigDecimalCodec.class.getName();
-        } else if (dataType.equals(BigInteger.class)) {
-            return BigIntegerCodec.class.getName();
-        } else if (dataType.equals(ZonedDateTime.class)) {
-            return ZonedDateTimeCodec.class.getName();
-        } else {
-            return null;
-        }
-    }
-}
diff --git a/Util/src/main/java/io/deephaven/util/codec/ObjectDecoder.java b/Util/src/main/java/io/deephaven/util/codec/ObjectDecoder.java
deleted file mode 100644
index 6e52078c0d4..00000000000
--- a/Util/src/main/java/io/deephaven/util/codec/ObjectDecoder.java
+++ /dev/null
@@ -1,57 +0,0 @@
-//
-// Copyright (c) 2016-2024 Deephaven Data Labs and Patent Pending
-//
-package io.deephaven.util.codec;
-
-import io.deephaven.base.verify.Assert;
-import org.jetbrains.annotations.NotNull;
-import org.jetbrains.annotations.Nullable;
-
-/**
- * <p>
- * Codec superinterface for Object translation from byte arrays for serialization and deserialization.
- * <p>
- * Implementations must follow several rules to enable correct usage:
- * <ol>
- * <li>They must be stateless or designed for concurrent use (e.g. by using only ThreadLocal state), as they will
- * generally be cached and re-used.</li>
- * <li>They must not modify their inputs in any way, retain references to their inputs, or return results that retain
- * references to their inputs.</li>
- * </ol>
- */
-public interface ObjectDecoder<TYPE> {
-    /**
-     * The value which represents variable width columns.
-     */
-    int VARIABLE_WIDTH_SENTINEL = Integer.MIN_VALUE;
-
-    /**
-     * Decode an object from an array of bytes.
-     *
-     * @param input The input byte array containing bytes to decode
-     * @param offset The offset into the byte array to start decoding from
-     * @param length The length of the byte array to decode from, starting at the offset
-     * @return The output object, possibly null
-     */
-    @Nullable
-    TYPE decode(@NotNull byte[] input, int offset, int length);
-
-    /**
-     * What width byte array does this ObjectCodec expect to encode and decode?
-     *
-     * @return VARIABLE_WIDTH_SENTINEL if the codec must encode and decode variable width columns, otherwise the fixed
-     *         size of byte array that must be decoded and encoded.
-     */
-    int expectedObjectWidth();
-
-    /**
-     * Verify that this codec is capable of supporting a column that has an actual width of {@code actualWidth}.
-     *
-     * @param actualWidth the actual width of the instantiated column
-     * @throws IllegalArgumentException if {@code actualWidth} is not compatible with this codec
-     */
-    default void checkWidth(int actualWidth) throws IllegalArgumentException {
-        final int expectedWidth = expectedObjectWidth();
-        Assert.eq(expectedWidth, "expectedWidth", actualWidth, "actualWidth");
-    }
-}
diff --git a/Util/src/main/java/io/deephaven/util/compare/BooleanComparisons.java b/Util/src/main/java/io/deephaven/util/compare/BooleanComparisons.java
new file mode 100644
index 00000000000..50a5f47c943
--- /dev/null
+++ b/Util/src/main/java/io/deephaven/util/compare/BooleanComparisons.java
@@ -0,0 +1,89 @@
+//
+// Copyright (c) 2016-2024 Deephaven Data Labs and Patent Pending
+//
+package io.deephaven.util.compare;
+
+public class BooleanComparisons {
+
+    /**
+     * Compares two booleans with {@code false} before {@code true}.
+     *
+     * @param lhs the first value
+     * @param rhs the second value
+     * @return the value {@code 0} if {@code lhs} is equal to {@code rhs}; a value less than {@code 0} if {@code lhs} is
+     *         less than {@code rhs}; and a value greater than {@code 0} if {@code lhs} is greater than {@code rhs}
+     */
+    public static int compare(boolean lhs, boolean rhs) {
+        return Boolean.compare(lhs, rhs);
+    }
+
+    /**
+     * Compare two booleans for equality consistent with {@link #compare(boolean, boolean)}; that is
+     * {@code compare(lhs, rhs) == 0 ⇒ eq(lhs, rhs)} and {@code compare(lhs, rhs) != 0 ⇒ !eq(lhs, rhs)}.
+     *
+     * <p>
+     * Logically equivalent to {@code compare(lhs, rhs) == 0}.
+     *
+     * @param lhs the first value
+     * @param rhs the second value
+     * @return {@code true} if the values are equal, {@code false} otherwise
+     */
+    public static boolean eq(boolean lhs, boolean rhs) {
+        return lhs == rhs;
+    }
+
+    /**
+     * Returns a hash code for a {@code boolean} value consistent with {@link #eq(boolean, boolean)}; that is,
+     * {@code eq(x, y) ⇒ hashCode(x) == hashCode(y)}.
+     *
+     * @param x the value to hash
+     * @return a hash code value for a {@code boolean} value
+     */
+    public static int hashCode(boolean x) {
+        return Boolean.hashCode(x);
+    }
+
+    /**
+     * Logically equivalent to {@code compare(lhs, rhs) > 0}.
+     *
+     * @param lhs the first value
+     * @param rhs the second value
+     * @return {@code true} iff {@code lhs} is greater than {@code rhs}
+     */
+    public static boolean gt(boolean lhs, boolean rhs) {
+        return compare(lhs, rhs) > 0;
+    }
+
+    /**
+     * Logically equivalent to {@code compare(lhs, rhs) < 0}.
+     *
+     * @param lhs the first value
+     * @param rhs the second value
+     * @return {@code true} iff {@code lhs} is less than {@code rhs}
+     */
+    public static boolean lt(boolean lhs, boolean rhs) {
+        return compare(lhs, rhs) < 0;
+    }
+
+    /**
+     * Logically equivalent to {@code compare(lhs, rhs) >= 0}.
+     *
+     * @param lhs the first value
+     * @param rhs the second value
+     * @return {@code true} iff {@code lhs} is greater than or equal to {@code rhs}
+     */
+    public static boolean geq(boolean lhs, boolean rhs) {
+        return compare(lhs, rhs) >= 0;
+    }
+
+    /**
+     * Logically equivalent to {@code compare(lhs, rhs) <= 0}.
+     *
+     * @param lhs the first value
+     * @param rhs the second value
+     * @return {@code true} iff {@code lhs} is less than or equal to {@code rhs}
+     */
+    public static boolean leq(boolean lhs, boolean rhs) {
+        return compare(lhs, rhs) <= 0;
+    }
+}
diff --git a/Util/src/main/java/io/deephaven/util/compare/ByteComparisons.java b/Util/src/main/java/io/deephaven/util/compare/ByteComparisons.java
index 8d1bae73ce3..38982985098 100644
--- a/Util/src/main/java/io/deephaven/util/compare/ByteComparisons.java
+++ b/Util/src/main/java/io/deephaven/util/compare/ByteComparisons.java
@@ -3,29 +3,94 @@
 //
 package io.deephaven.util.compare;
 
+import io.deephaven.util.QueryConstants;
+
 public class ByteComparisons {
 
+    /**
+     * Compares two bytes according to the following rules:
+     *
+     * <ul>
+     * <li>{@link QueryConstants#NULL_BYTE} is less than all other {@code byte} values</li>
+     * <li>Otherwise, normal {@code byte} comparison logic is used</li>
+     * </ul>
+     *
+     * @param lhs the first value
+     * @param rhs the second value
+     * @return the value {@code 0} if {@code lhs} is equal to {@code rhs}; a value less than {@code 0} if {@code lhs} is
+     *         less than {@code rhs}; and a value greater than {@code 0} if {@code lhs} is greater than {@code rhs}
+     */
     public static int compare(byte lhs, byte rhs) {
         return Byte.compare(lhs, rhs);
     }
 
+    /**
+     * Compare two bytes for equality consistent with {@link #compare(byte, byte)}; that is
+     * {@code compare(lhs, rhs) == 0 ⇒ eq(lhs, rhs)} and {@code compare(lhs, rhs) != 0 ⇒ !eq(lhs, rhs)}.
+     *
+     * <p>
+     * Logically equivalent to {@code compare(lhs, rhs) == 0}.
+     *
+     * @param lhs the first value
+     * @param rhs the second value
+     * @return {@code true} if the values are equal, {@code false} otherwise
+     */
     public static boolean eq(byte lhs, byte rhs) {
         return lhs == rhs;
     }
 
+    /**
+     * Returns a hash code for a {@code byte} value consistent with {@link #eq(byte, byte)}; that is,
+     * {@code eq(x, y) ⇒ hashCode(x) == hashCode(y)}.
+     *
+     * @param x the value to hash
+     * @return a hash code value for a {@code byte} value
+     */
+    public static int hashCode(byte x) {
+        return Byte.hashCode(x);
+    }
+
+    /**
+     * Logically equivalent to {@code compare(lhs, rhs) > 0}.
+     *
+     * @param lhs the first value
+     * @param rhs the second value
+     * @return {@code true} iff {@code lhs} is greater than {@code rhs}
+     */
     public static boolean gt(byte lhs, byte rhs) {
-        return compare(lhs, rhs) > 0;
+        return lhs > rhs;
     }
 
+    /**
+     * Logically equivalent to {@code compare(lhs, rhs) < 0}.
+     *
+     * @param lhs the first value
+     * @param rhs the second value
+     * @return {@code true} iff {@code lhs} is less than {@code rhs}
+     */
     public static boolean lt(byte lhs, byte rhs) {
-        return compare(lhs, rhs) < 0;
+        return lhs < rhs;
     }
 
+    /**
+     * Logically equivalent to {@code compare(lhs, rhs) >= 0}.
+     *
+     * @param lhs the first value
+     * @param rhs the second value
+     * @return {@code true} iff {@code lhs} is greater than or equal to {@code rhs}
+     */
     public static boolean geq(byte lhs, byte rhs) {
-        return compare(lhs, rhs) >= 0;
+        return lhs >= rhs;
     }
 
+    /**
+     * Logically equivalent to {@code compare(lhs, rhs) <= 0}.
+     *
+     * @param lhs the first value
+     * @param rhs the second value
+     * @return {@code true} iff {@code lhs} is less than or equal to {@code rhs}
+     */
     public static boolean leq(byte lhs, byte rhs) {
-        return compare(lhs, rhs) <= 0;
+        return lhs <= rhs;
     }
 }
diff --git a/Util/src/main/java/io/deephaven/util/compare/CharComparisons.java b/Util/src/main/java/io/deephaven/util/compare/CharComparisons.java
index 4ce91de5c49..b78eaa5dc72 100644
--- a/Util/src/main/java/io/deephaven/util/compare/CharComparisons.java
+++ b/Util/src/main/java/io/deephaven/util/compare/CharComparisons.java
@@ -7,6 +7,23 @@
 
 public class CharComparisons {
 
+    /**
+     * Compares two chars according to the following rules:
+     *
+     * <ul>
+     * <li>{@link QueryConstants#NULL_CHAR} is less than all other {@code char} values</li>
+     * <li>Otherwise, normal {@code char} comparison logic is used</li>
+     * </ul>
+     *
+     * <p>
+     * Note: this differs from the Java language numerical comparison operators {@code <, <=, >=, >} and
+     * {@link Character#compare(char, char)}.
+     *
+     * @param lhs the first value
+     * @param rhs the second value
+     * @return the value {@code 0} if {@code lhs} is equal to {@code rhs}; a value less than {@code 0} if {@code lhs} is
+     *         less than {@code rhs}; and a value greater than {@code 0} if {@code lhs} is greater than {@code rhs}
+     */
     public static int compare(char lhs, char rhs) {
         if (lhs == rhs) {
             return 0;
@@ -20,23 +37,77 @@ public static int compare(char lhs, char rhs) {
         return Character.compare(lhs, rhs);
     }
 
+    /**
+     * Compare two chars for equality consistent with {@link #compare(char, char)}; that is
+     * {@code compare(lhs, rhs) == 0 ⇒ eq(lhs, rhs)} and {@code compare(lhs, rhs) != 0 ⇒ !eq(lhs, rhs)}.
+     *
+     * <p>
+     * Logically equivalent to {@code compare(lhs, rhs) == 0}.
+     *
+     * @param lhs the first value
+     * @param rhs the second value
+     * @return {@code true} if the values are equal, {@code false} otherwise
+     */
     public static boolean eq(char lhs, char rhs) {
         return lhs == rhs;
     }
 
+    /**
+     * Returns a hash code for a {@code char} value consistent with {@link #eq(char, char)}; that is,
+     * {@code eq(x, y) ⇒ hashCode(x) == hashCode(y)}.
+     *
+     * @param x the value to hash
+     * @return a hash code value for a {@code char} value
+     */
+    public static int hashCode(char x) {
+        return Character.hashCode(x);
+    }
+
+    /**
+     * Logically equivalent to {@code compare(lhs, rhs) > 0}.
+     *
+     * @param lhs the first value
+     * @param rhs the second value
+     * @return {@code true} iff {@code lhs} is greater than {@code rhs}
+     */
     public static boolean gt(char lhs, char rhs) {
-        return compare(lhs, rhs) > 0;
+        // return compare(lhs, rhs) > 0;
+        return !leq(lhs, rhs);
     }
 
+    /**
+     * Logically equivalent to {@code compare(lhs, rhs) < 0}.
+     *
+     * @param lhs the first value
+     * @param rhs the second value
+     * @return {@code true} iff {@code lhs} is less than {@code rhs}
+     */
     public static boolean lt(char lhs, char rhs) {
-        return compare(lhs, rhs) < 0;
+        // return compare(lhs, rhs) < 0;
+        return (lhs < rhs || lhs == QueryConstants.NULL_CHAR) && rhs != QueryConstants.NULL_CHAR;
     }
 
+    /**
+     * Logically equivalent to {@code compare(lhs, rhs) >= 0}.
+     *
+     * @param lhs the first value
+     * @param rhs the second value
+     * @return {@code true} iff {@code lhs} is greater than or equal to {@code rhs}
+     */
     public static boolean geq(char lhs, char rhs) {
-        return compare(lhs, rhs) >= 0;
+        // return compare(lhs, rhs) >= 0;
+        return !lt(lhs, rhs);
     }
 
+    /**
+     * Logically equivalent to {@code compare(lhs, rhs) <= 0}.
+     *
+     * @param lhs the first value
+     * @param rhs the second value
+     * @return {@code true} iff {@code lhs} is less than or equal to {@code rhs}
+     */
     public static boolean leq(char lhs, char rhs) {
-        return compare(lhs, rhs) <= 0;
+        // return compare(lhs, rhs) <= 0;
+        return (lhs <= rhs && rhs != QueryConstants.NULL_CHAR) || lhs == QueryConstants.NULL_CHAR;
     }
 }
diff --git a/Util/src/main/java/io/deephaven/util/compare/DoubleComparisons.java b/Util/src/main/java/io/deephaven/util/compare/DoubleComparisons.java
index 62f1b39d6ad..5ef3b0faf2f 100644
--- a/Util/src/main/java/io/deephaven/util/compare/DoubleComparisons.java
+++ b/Util/src/main/java/io/deephaven/util/compare/DoubleComparisons.java
@@ -7,6 +7,29 @@
 
 public class DoubleComparisons {
 
+    private static final int ZERO_HASHCODE = Double.hashCode(0.0);
+
+    /**
+     * Compares two doubles according to the following rules:
+     *
+     * <ul>
+     * <li>{@link QueryConstants#NULL_DOUBLE} is less than all other {@code double} values (including
+     * {@link Double#NEGATIVE_INFINITY})</li>
+     * <li>{@code 0.0} and {@code -0.0} are equal</li>
+     * <li>{@link Double#NaN} (and all other {@code double} {@code NaN} representations) is equal to {@link Double#NaN}
+     * and greater than all other {@code double} values (including {@link Double#POSITIVE_INFINITY})</li>
+     * <li>Otherwise, normal {@code double} comparison logic is used</li>
+     * </ul>
+     *
+     * <p>
+     * Note: this differs from the Java language numerical comparison operators {@code <, <=, ==, >=, >} and
+     * {@link Double#compare(double, double)}.
+     *
+     * @param lhs the first value
+     * @param rhs the second value
+     * @return the value {@code 0} if {@code lhs} is equal to {@code rhs}; a value less than {@code 0} if {@code lhs} is
+     *         less than {@code rhs}; and a value greater than {@code 0} if {@code lhs} is greater than {@code rhs}
+     */
     public static int compare(double lhs, double rhs) {
         // Note this intentionally makes -0.0 and 0.0 compare equal
         if (lhs == rhs) {
@@ -33,23 +56,84 @@ public static int compare(double lhs, double rhs) {
         return lhs < rhs ? -1 : 1;
     }
 
+    /**
+     * Compare two doubles for equality consistent with {@link #compare(double, double)}; that is
+     * {@code compare(lhs, rhs) == 0 ⇒ eq(lhs, rhs)} and {@code compare(lhs, rhs) != 0 ⇒ !eq(lhs, rhs)}.
+     *
+     * <p>
+     * Logically equivalent to {@code compare(lhs, rhs) == 0}.
+     *
+     * @param lhs the first value
+     * @param rhs the second value
+     * @return {@code true} if the values are equal, {@code false} otherwise
+     */
     public static boolean eq(double lhs, double rhs) {
-        return (Double.isNaN(lhs) && Double.isNaN(rhs)) || lhs == rhs;
+        return lhs == rhs || (Double.isNaN(lhs) && Double.isNaN(rhs));
+    }
+
+    /**
+     * Returns a hash code for a {@code double} value consistent with {@link #eq(double, double)}; that is,
+     * {@code eq(x, y) ⇒ hashCode(x) == hashCode(y)}.
+     *
+     * @param x the value to hash
+     * @return a hash code value for a {@code double} value
+     */
+    public static int hashCode(double x) {
+        // Note this intentionally makes -0.0 and 0.0 hashcode equal
+        return x == 0.0
+                ? ZERO_HASHCODE
+                : Double.hashCode(x);
     }
 
+    /**
+     * Logically equivalent to {@code compare(lhs, rhs) > 0}.
+     *
+     * @param lhs the first value
+     * @param rhs the second value
+     * @return {@code true} iff {@code lhs} is greater than {@code rhs}
+     */
     public static boolean gt(double lhs, double rhs) {
-        return compare(lhs, rhs) > 0;
+        // return compare(lhs, rhs) > 0;
+        return !leq(lhs, rhs);
     }
 
+    /**
+     * Logically equivalent to {@code compare(lhs, rhs) < 0}.
+     *
+     * @param lhs the first value
+     * @param rhs the second value
+     * @return {@code true} iff {@code lhs} is less than {@code rhs}
+     */
     public static boolean lt(double lhs, double rhs) {
-        return compare(lhs, rhs) < 0;
+        // return compare(lhs, rhs) < 0;
+        return !geq(lhs, rhs);
     }
 
+    /**
+     * Logically equivalent to {@code compare(lhs, rhs) >= 0}.
+     *
+     * @param lhs the first value
+     * @param rhs the second value
+     * @return {@code true} iff {@code lhs} is greater than or equal to {@code rhs}
+     */
     public static boolean geq(double lhs, double rhs) {
-        return compare(lhs, rhs) >= 0;
+        // return compare(lhs, rhs) >= 0;
+        return (lhs >= rhs && lhs != QueryConstants.NULL_DOUBLE)
+                || Double.isNaN(lhs)
+                || rhs == QueryConstants.NULL_DOUBLE;
     }
 
+    /**
+     * Logically equivalent to {@code compare(lhs, rhs) <= 0}.
+     *
+     * @param lhs the first value
+     * @param rhs the second value
+     * @return {@code true} iff {@code lhs} is less than or equal to {@code rhs}
+     */
     public static boolean leq(double lhs, double rhs) {
-        return compare(lhs, rhs) <= 0;
+        // return compare(lhs, rhs) <= 0;
+        return (lhs <= rhs && rhs != QueryConstants.NULL_DOUBLE)
+                || lhs == QueryConstants.NULL_DOUBLE
+                || Double.isNaN(rhs);
     }
 }
diff --git a/Util/src/main/java/io/deephaven/util/compare/FloatComparisons.java b/Util/src/main/java/io/deephaven/util/compare/FloatComparisons.java
index 417dc5f396e..145786e27e5 100644
--- a/Util/src/main/java/io/deephaven/util/compare/FloatComparisons.java
+++ b/Util/src/main/java/io/deephaven/util/compare/FloatComparisons.java
@@ -7,6 +7,29 @@
 
 public class FloatComparisons {
 
+    private static final int ZERO_HASHCODE = Float.hashCode(0.0f);
+
+    /**
+     * Compares two floats according to the following rules:
+     *
+     * <ul>
+     * <li>{@link QueryConstants#NULL_FLOAT} is less than all other {@code float} values (including
+     * {@link Float#NEGATIVE_INFINITY})</li>
+     * <li>{@code 0.0} and {@code -0.0} are equal</li>
+     * <li>{@link Float#NaN} (and all other float {@code NaN} representations) is equal to {@link Float#NaN} and greater
+     * than all other {@code float} values (including {@link Float#POSITIVE_INFINITY})</li>
+     * <li>Otherwise, normal {@code float} comparison logic is used</li>
+     * </ul>
+     *
+     * <p>
+     * Note: this differs from the Java language numerical comparison operators {@code <, <=, ==, >=, >} and
+     * {@link Float#compare(float, float)}.
+     *
+     * @param lhs the first value
+     * @param rhs the second value
+     * @return the value {@code 0} if {@code lhs} is equal to {@code rhs}; a value less than {@code 0} if {@code lhs} is
+     *         less than {@code rhs}; and a value greater than {@code 0} if {@code lhs} is greater than {@code rhs}
+     */
     public static int compare(float lhs, float rhs) {
         // Note this intentionally makes -0.0 and 0.0 compare equal
         if (lhs == rhs) {
@@ -33,23 +56,84 @@ public static int compare(float lhs, float rhs) {
         return lhs < rhs ? -1 : 1;
     }
 
+    /**
+     * Compare two floats for equality consistent with {@link #compare(float, float)}; that is
+     * {@code compare(lhs, rhs) == 0 ⇒ eq(lhs, rhs)} and {@code compare(lhs, rhs) != 0 ⇒ !eq(lhs, rhs)}.
+     *
+     * <p>
+     * Logically equivalent to {@code compare(lhs, rhs) == 0}.
+     *
+     * @param lhs the first value
+     * @param rhs the second value
+     * @return {@code true} if the values are equal, {@code false} otherwise
+     */
     public static boolean eq(float lhs, float rhs) {
-        return (Float.isNaN(lhs) && Float.isNaN(rhs)) || lhs == rhs;
+        return lhs == rhs || (Float.isNaN(lhs) && Float.isNaN(rhs));
+    }
+
+    /**
+     * Returns a hash code for a {@code float} value consistent with {@link #eq(float, float)}; that is,
+     * {@code eq(x, y) ⇒ hashCode(x) == hashCode(y)}.
+     *
+     * @param x the value to hash
+     * @return a hash code value for a {@code float} value
+     */
+    public static int hashCode(float x) {
+        // Note this intentionally makes -0.0f and 0.0f hashcode equal
+        return x == 0.0f
+                ? ZERO_HASHCODE
+                : Float.hashCode(x);
     }
 
+    /**
+     * Logically equivalent to {@code compare(lhs, rhs) > 0}.
+     *
+     * @param lhs the first value
+     * @param rhs the second value
+     * @return {@code true} iff {@code lhs} is greater than {@code rhs}
+     */
     public static boolean gt(float lhs, float rhs) {
-        return compare(lhs, rhs) > 0;
+        // return compare(lhs, rhs) > 0;
+        return !leq(lhs, rhs);
     }
 
+    /**
+     * Logically equivalent to {@code compare(lhs, rhs) < 0}.
+     *
+     * @param lhs the first value
+     * @param rhs the second value
+     * @return {@code true} iff {@code lhs} is less than {@code rhs}
+     */
     public static boolean lt(float lhs, float rhs) {
-        return compare(lhs, rhs) < 0;
+        // return compare(lhs, rhs) < 0;
+        return !geq(lhs, rhs);
     }
 
+    /**
+     * Logically equivalent to {@code compare(lhs, rhs) >= 0}.
+     *
+     * @param lhs the first value
+     * @param rhs the second value
+     * @return {@code true} iff {@code lhs} is greater than or equal to {@code rhs}
+     */
     public static boolean geq(float lhs, float rhs) {
-        return compare(lhs, rhs) >= 0;
+        // return compare(lhs, rhs) >= 0;
+        return (lhs >= rhs && lhs != QueryConstants.NULL_FLOAT)
+                || Float.isNaN(lhs)
+                || rhs == QueryConstants.NULL_FLOAT;
     }
 
+    /**
+     * Logically equivalent to {@code compare(lhs, rhs) <= 0}.
+     *
+     * @param lhs the first value
+     * @param rhs the second value
+     * @return {@code true} iff {@code lhs} is less than or equal to {@code rhs}
+     */
     public static boolean leq(float lhs, float rhs) {
-        return compare(lhs, rhs) <= 0;
+        // return compare(lhs, rhs) <= 0;
+        return (lhs <= rhs && rhs != QueryConstants.NULL_FLOAT)
+                || lhs == QueryConstants.NULL_FLOAT
+                || Float.isNaN(rhs);
     }
 }
diff --git a/Util/src/main/java/io/deephaven/util/compare/IntComparisons.java b/Util/src/main/java/io/deephaven/util/compare/IntComparisons.java
index 58e86ced0df..42878b34cd6 100644
--- a/Util/src/main/java/io/deephaven/util/compare/IntComparisons.java
+++ b/Util/src/main/java/io/deephaven/util/compare/IntComparisons.java
@@ -3,29 +3,94 @@
 //
 package io.deephaven.util.compare;
 
+import io.deephaven.util.QueryConstants;
+
 public class IntComparisons {
 
+    /**
+     * Compares two ints according to the following rules:
+     *
+     * <ul>
+     * <li>{@link QueryConstants#NULL_INT} is less than all other {@code int} values</li>
+     * <li>Otherwise, normal {@code int} comparison logic is used</li>
+     * </ul>
+     *
+     * @param lhs the first value
+     * @param rhs the second value
+     * @return the value {@code 0} if {@code lhs} is equal to {@code rhs}; a value less than {@code 0} if {@code lhs} is
+     *         less than {@code rhs}; and a value greater than {@code 0} if {@code lhs} is greater than {@code rhs}
+     */
     public static int compare(int lhs, int rhs) {
         return Integer.compare(lhs, rhs);
     }
 
+    /**
+     * Compare two ints for equality consistent with {@link #compare(int, int)}; that is
+     * {@code compare(lhs, rhs) == 0 ⇒ eq(lhs, rhs)} and {@code compare(lhs, rhs) != 0 ⇒ !eq(lhs, rhs)}.
+     *
+     * <p>
+     * Logically equivalent to {@code compare(lhs, rhs) == 0}.
+     * 
+     * @param lhs the first value
+     * @param rhs the second value
+     * @return {@code true} if the values are equal, {@code false} otherwise
+     */
     public static boolean eq(int lhs, int rhs) {
         return lhs == rhs;
     }
 
+    /**
+     * Returns a hash code for a {@code int} value consistent with {@link #eq(int, int)}; that is,
+     * {@code eq(x, y) ⇒ hashCode(x) == hashCode(y)}.
+     *
+     * @param x the value to hash
+     * @return a hash code value for a {@code double} value
+     */
+    public static int hashCode(int x) {
+        return Integer.hashCode(x);
+    }
+
+    /**
+     * Logically equivalent to {@code compare(lhs, rhs) > 0}.
+     *
+     * @param lhs the first value
+     * @param rhs the second value
+     * @return {@code true} iff {@code lhs} is greater than {@code rhs}
+     */
     public static boolean gt(int lhs, int rhs) {
-        return compare(lhs, rhs) > 0;
+        return lhs > rhs;
     }
 
+    /**
+     * Logically equivalent to {@code compare(lhs, rhs) < 0}.
+     *
+     * @param lhs the first value
+     * @param rhs the second value
+     * @return {@code true} iff {@code lhs} is less than {@code rhs}
+     */
     public static boolean lt(int lhs, int rhs) {
-        return compare(lhs, rhs) < 0;
+        return lhs < rhs;
     }
 
+    /**
+     * Logically equivalent to {@code compare(lhs, rhs) >= 0}.
+     *
+     * @param lhs the first value
+     * @param rhs the second value
+     * @return {@code true} iff {@code lhs} is greater than or equal to {@code rhs}
+     */
     public static boolean geq(int lhs, int rhs) {
-        return compare(lhs, rhs) >= 0;
+        return lhs >= rhs;
     }
 
+    /**
+     * Logically equivalent to {@code compare(lhs, rhs) <= 0}.
+     *
+     * @param lhs the first value
+     * @param rhs the second value
+     * @return {@code true} iff {@code lhs} is less than or equal to {@code rhs}
+     */
     public static boolean leq(int lhs, int rhs) {
-        return compare(lhs, rhs) <= 0;
+        return lhs <= rhs;
     }
 }
diff --git a/Util/src/main/java/io/deephaven/util/compare/LongComparisons.java b/Util/src/main/java/io/deephaven/util/compare/LongComparisons.java
index f76d647cd0b..98f08c61709 100644
--- a/Util/src/main/java/io/deephaven/util/compare/LongComparisons.java
+++ b/Util/src/main/java/io/deephaven/util/compare/LongComparisons.java
@@ -3,29 +3,94 @@
 //
 package io.deephaven.util.compare;
 
+import io.deephaven.util.QueryConstants;
+
 public class LongComparisons {
 
+    /**
+     * Compares two longs according to the following rules:
+     *
+     * <ul>
+     * <li>{@link QueryConstants#NULL_LONG} is less than all other {@code long} values</li>
+     * <li>Otherwise, normal {@code long} comparison logic is used</li>
+     * </ul>
+     *
+     * @param lhs the first value
+     * @param rhs the second value
+     * @return the value {@code 0} if {@code lhs} is equal to {@code rhs}; a value less than {@code 0} if {@code lhs} is
+     *         less than {@code rhs}; and a value greater than {@code 0} if {@code lhs} is greater than {@code rhs}
+     */
     public static int compare(long lhs, long rhs) {
         return Long.compare(lhs, rhs);
     }
 
+    /**
+     * Compare two longs for equality consistent with {@link #compare(long, long)}; that is
+     * {@code compare(lhs, rhs) == 0 ⇒ eq(lhs, rhs)} and {@code compare(lhs, rhs) != 0 ⇒ !eq(lhs, rhs)}.
+     *
+     * <p>
+     * Logically equivalent to {@code compare(lhs, rhs) == 0}.
+     * 
+     * @param lhs the first value
+     * @param rhs the second value
+     * @return {@code true} if the values are equal, {@code false} otherwise
+     */
     public static boolean eq(long lhs, long rhs) {
         return lhs == rhs;
     }
 
+    /**
+     * Returns a hash code for a {@code long} value consistent with {@link #eq(long, long)}; that is,
+     * {@code eq(x, y) ⇒ hashCode(x) == hashCode(y)}.
+     *
+     * @param x the value to hash
+     * @return a hash code value for a {@code long} value
+     */
+    public static int hashCode(long x) {
+        return Long.hashCode(x);
+    }
+
+    /**
+     * Logically equivalent to {@code compare(lhs, rhs) > 0}.
+     *
+     * @param lhs the first value
+     * @param rhs the second value
+     * @return {@code true} iff {@code lhs} is greater than {@code rhs}
+     */
     public static boolean gt(long lhs, long rhs) {
-        return compare(lhs, rhs) > 0;
+        return lhs > rhs;
     }
 
+    /**
+     * Logically equivalent to {@code compare(lhs, rhs) < 0}.
+     *
+     * @param lhs the first value
+     * @param rhs the second value
+     * @return {@code true} iff {@code lhs} is less than {@code rhs}
+     */
     public static boolean lt(long lhs, long rhs) {
-        return compare(lhs, rhs) < 0;
+        return lhs < rhs;
     }
 
+    /**
+     * Logically equivalent to {@code compare(lhs, rhs) >= 0}.
+     *
+     * @param lhs the first value
+     * @param rhs the second value
+     * @return {@code true} iff {@code lhs} is greater than or equal to {@code rhs}
+     */
     public static boolean geq(long lhs, long rhs) {
-        return compare(lhs, rhs) >= 0;
+        return lhs >= rhs;
     }
 
+    /**
+     * Logically equivalent to {@code compare(lhs, rhs) <= 0}.
+     *
+     * @param lhs the first value
+     * @param rhs the second value
+     * @return {@code true} iff {@code lhs} is less than or equal to {@code rhs}
+     */
     public static boolean leq(long lhs, long rhs) {
-        return compare(lhs, rhs) <= 0;
+        return lhs <= rhs;
     }
 }
diff --git a/Util/src/main/java/io/deephaven/util/compare/ObjectComparisons.java b/Util/src/main/java/io/deephaven/util/compare/ObjectComparisons.java
index 91388d41570..3ccc0e2ad43 100644
--- a/Util/src/main/java/io/deephaven/util/compare/ObjectComparisons.java
+++ b/Util/src/main/java/io/deephaven/util/compare/ObjectComparisons.java
@@ -7,6 +7,19 @@
 
 public class ObjectComparisons {
 
+    /**
+     * Compares two Objects according to the following rules:
+     *
+     * <ul>
+     * <li>{@code null} is less than all other values</li>
+     * <li>Otherwise, {@link Comparable#compareTo(Object)} is used</li>
+     * </ul>
+     *
+     * @param lhs the first value
+     * @param rhs the second value
+     * @return the value {@code 0} if {@code lhs} is equal to {@code rhs}; a value less than {@code 0} if {@code lhs} is
+     *         less than {@code rhs}; and a value greater than {@code 0} if {@code lhs} is greater than {@code rhs}
+     */
     public static int compare(Object lhs, Object rhs) {
         if (lhs == rhs) {
             return 0;
@@ -21,22 +34,72 @@ public static int compare(Object lhs, Object rhs) {
         return ((Comparable) lhs).compareTo(rhs);
     }
 
+    /**
+     * Compare two Objects for equality consistent with {@link #compare(Object, Object)}; that is
+     * {@code compare(lhs, rhs) == 0 ⇒ eq(lhs, rhs)} and {@code compare(lhs, rhs) != 0 ⇒ !eq(lhs, rhs)}.
+     *
+     * <p>
+     * Logically equivalent to {@code compare(lhs, rhs) == 0}.
+     * 
+     * @param lhs the first value
+     * @param rhs the second value
+     * @return {@code true} if the values are equal, {@code false} otherwise
+     */
     public static boolean eq(Object lhs, Object rhs) {
         return Objects.equals(lhs, rhs);
     }
 
+    /**
+     * Returns a hash code for an {@code Object} value consistent with {@link #eq(Object, Object)}; that is,
+     * {@code eq(x, y) ⇒ hashCode(x) == hashCode(y)}.
+     *
+     * @param x the value to hash
+     * @return a hash code value for an {@code Object} value
+     */
+    public static int hashCode(Object x) {
+        return Objects.hashCode(x);
+    }
+
+    /**
+     * Logically equivalent to {@code compare(lhs, rhs) > 0}.
+     *
+     * @param lhs the first value
+     * @param rhs the second value
+     * @return {@code true} iff {@code lhs} is greater than {@code rhs}
+     */
     public static boolean gt(Object lhs, Object rhs) {
         return compare(lhs, rhs) > 0;
     }
 
+    /**
+     * Logically equivalent to {@code compare(lhs, rhs) < 0}.
+     *
+     * @param lhs the first value
+     * @param rhs the second value
+     * @return {@code true} iff {@code lhs} is less than {@code rhs}
+     */
     public static boolean lt(Object lhs, Object rhs) {
         return compare(lhs, rhs) < 0;
     }
 
+    /**
+     * Logically equivalent to {@code compare(lhs, rhs) >= 0}.
+     *
+     * @param lhs the first value
+     * @param rhs the second value
+     * @return {@code true} iff {@code lhs} is greater than or equal to {@code rhs}
+     */
     public static boolean geq(Object lhs, Object rhs) {
         return compare(lhs, rhs) >= 0;
     }
 
+    /**
+     * Logically equivalent to {@code compare(lhs, rhs) <= 0}.
+     *
+     * @param lhs the first value
+     * @param rhs the second value
+     * @return {@code true} iff {@code lhs} is less than or equal to {@code rhs}
+     */
     public static boolean leq(Object lhs, Object rhs) {
         return compare(lhs, rhs) <= 0;
     }
diff --git a/Util/src/main/java/io/deephaven/util/compare/ShortComparisons.java b/Util/src/main/java/io/deephaven/util/compare/ShortComparisons.java
index 91cc9d0bb29..7e34fc38142 100644
--- a/Util/src/main/java/io/deephaven/util/compare/ShortComparisons.java
+++ b/Util/src/main/java/io/deephaven/util/compare/ShortComparisons.java
@@ -3,29 +3,94 @@
 //
 package io.deephaven.util.compare;
 
+import io.deephaven.util.QueryConstants;
+
 public class ShortComparisons {
 
+    /**
+     * Compares two shorts according to the following rules:
+     *
+     * <ul>
+     * <li>{@link QueryConstants#NULL_SHORT} is less than all other {@code short} values</li>
+     * <li>Otherwise, normal {@code short} comparison logic is used</li>
+     * </ul>
+     *
+     * @param lhs the first value
+     * @param rhs the second value
+     * @return the value {@code 0} if {@code lhs} is equal to {@code rhs}; a value less than {@code 0} if {@code lhs} is
+     *         less than {@code rhs}; and a value greater than {@code 0} if {@code lhs} is greater than {@code rhs}
+     */
     public static int compare(short lhs, short rhs) {
         return Short.compare(lhs, rhs);
     }
 
+    /**
+     * Compare two shorts for equality consistent with {@link #compare(short, short)}; that is
+     * {@code compare(lhs, rhs) == 0 ⇒ eq(lhs, rhs)} and {@code compare(lhs, rhs) != 0 ⇒ !eq(lhs, rhs)}.
+     *
+     * <p>
+     * Logically equivalent to {@code compare(lhs, rhs) == 0}.
+     * 
+     * @param lhs the first value
+     * @param rhs the second value
+     * @return {@code true} if the values are equal, {@code false} otherwise
+     */
     public static boolean eq(short lhs, short rhs) {
         return lhs == rhs;
     }
 
+    /**
+     * Returns a hash code for a {@code short} value consistent with {@link #eq(short, short)}; that is,
+     * {@code eq(x, y) ⇒ hashCode(x) == hashCode(y)}.
+     *
+     * @param x the value to hash
+     * @return a hash code value for a {@code short} value
+     */
+    public static int hashCode(short x) {
+        return Short.hashCode(x);
+    }
+
+    /**
+     * Logically equivalent to {@code compare(lhs, rhs) > 0}.
+     *
+     * @param lhs the first value
+     * @param rhs the second value
+     * @return {@code true} iff {@code lhs} is greater than {@code rhs}
+     */
     public static boolean gt(short lhs, short rhs) {
-        return compare(lhs, rhs) > 0;
+        return lhs > rhs;
     }
 
+    /**
+     * Logically equivalent to {@code compare(lhs, rhs) < 0}.
+     *
+     * @param lhs the first value
+     * @param rhs the second value
+     * @return {@code true} iff {@code lhs} is less than {@code rhs}
+     */
     public static boolean lt(short lhs, short rhs) {
-        return compare(lhs, rhs) < 0;
+        return lhs < rhs;
     }
 
+    /**
+     * Logically equivalent to {@code compare(lhs, rhs) >= 0}.
+     *
+     * @param lhs the first value
+     * @param rhs the second value
+     * @return {@code true} iff {@code lhs} is greater than or equal to {@code rhs}
+     */
     public static boolean geq(short lhs, short rhs) {
-        return compare(lhs, rhs) >= 0;
+        return lhs >= rhs;
     }
 
+    /**
+     * Logically equivalent to {@code compare(lhs, rhs) <= 0}.
+     *
+     * @param lhs the first value
+     * @param rhs the second value
+     * @return {@code true} iff {@code lhs} is less than or equal to {@code rhs}
+     */
     public static boolean leq(short lhs, short rhs) {
-        return compare(lhs, rhs) <= 0;
+        return lhs <= rhs;
     }
 }
diff --git a/Util/src/main/java/io/deephaven/util/compare/package-info.java b/Util/src/main/java/io/deephaven/util/compare/package-info.java
new file mode 100644
index 00000000000..6299c954f96
--- /dev/null
+++ b/Util/src/main/java/io/deephaven/util/compare/package-info.java
@@ -0,0 +1,8 @@
+/**
+ * The Deephaven compare package serves as a low-level building block for Deephaven's sort order and equality testing.
+ * Deephaven sort order is "nulls first". For floating-point primitives, the sort order is also "NaNs last" and
+ * {@code +0.0} equals {@code -0.0}. The "eq" method for each type is consistent with the "compare" method; that is,
+ * {@code compare(lhs, rhs) == 0 ⇒ eq(lhs, rhs)} and {@code compare(lhs, rhs) != 0 ⇒ !eq(lhs, rhs)}. The "hashCode"
+ * method for each type is consistent with the "eq" method; that is, {@code eq(x, y) ⇒ hashCode(x) == hashCode(y)}.
+ */
+package io.deephaven.util.compare;
diff --git a/Util/src/main/java/io/deephaven/util/datastructures/SubscriptionSet.java b/Util/src/main/java/io/deephaven/util/datastructures/SubscriptionSet.java
index 0d9fc96a8c0..cc76ffe0c44 100644
--- a/Util/src/main/java/io/deephaven/util/datastructures/SubscriptionSet.java
+++ b/Util/src/main/java/io/deephaven/util/datastructures/SubscriptionSet.java
@@ -7,6 +7,7 @@
 import io.deephaven.base.reference.WeakReferenceWrapper;
 import io.deephaven.base.verify.Assert;
 import io.deephaven.base.verify.Require;
+import org.apache.commons.lang3.function.TriConsumer;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
@@ -54,7 +55,7 @@ private boolean isActive() {
          * Activate this subscription entry. Must hold the lock on the enclosing subscription set.
          */
         public void activate() {
-            Assert.holdsLock(SubscriptionSet.this, "SubscriptionSet.this");
+            Assert.assertion(Thread.holdsLock(SubscriptionSet.this), "Thread.holdsLock(SubscriptionSet.this)");
             active = true;
         }
     }
@@ -219,6 +220,36 @@ public final <NOTIFICATION_TYPE> boolean deliverNotification(
         return initialSize > 0 && size == 0;
     }
 
+    /**
+     * Dispatch a notification to all subscribers. Clean up any GC'd subscriptions.
+     *
+     * @param procedure The notification procedure to invoke
+     * @param firstNotification The first item to deliver
+     * @param secondNotification The second item to deliver (must be of the same type as {@code firstNotification})
+     * @param activeOnly Whether to restrict this notification to active subscriptions only
+     * @return Whether this operation caused the set to become <b>empty</b>
+     */
+    public final <NOTIFICATION_TYPE> boolean deliverNotification(
+            @NotNull final TriConsumer<LISTENER_TYPE, NOTIFICATION_TYPE, NOTIFICATION_TYPE> procedure,
+            @Nullable final NOTIFICATION_TYPE firstNotification,
+            @Nullable final NOTIFICATION_TYPE secondNotification,
+            final boolean activeOnly) {
+        final int initialSize = size;
+        for (int si = 0; si < size;) {
+            final Entry currentEntry = subscriptions[si];
+            final LISTENER_TYPE currentListener = currentEntry.getListener();
+            if (currentListener == null) {
+                removeAt(si);
+                continue; // si is not incremented in this case - we'll reconsider the same slot if necessary.
+            }
+            if (!activeOnly || currentEntry.isActive()) {
+                procedure.accept(currentListener, firstNotification, secondNotification);
+            }
+            ++si;
+        }
+        return initialSize > 0 && size == 0;
+    }
+
     private void removeAt(final int subscriptionIndex) {
         final int lastSubscriptionIndex = --size;
         subscriptions[subscriptionIndex] = subscriptions[lastSubscriptionIndex];
diff --git a/Util/src/main/java/io/deephaven/util/reference/CleanupReferenceProcessor.java b/Util/src/main/java/io/deephaven/util/reference/CleanupReferenceProcessor.java
index a452e9967e7..c4b613997df 100644
--- a/Util/src/main/java/io/deephaven/util/reference/CleanupReferenceProcessor.java
+++ b/Util/src/main/java/io/deephaven/util/reference/CleanupReferenceProcessor.java
@@ -6,14 +6,21 @@
 import io.deephaven.base.reference.CleanupReference;
 import io.deephaven.base.verify.Require;
 import io.deephaven.configuration.Configuration;
+import io.deephaven.internal.log.LoggerFactory;
 import io.deephaven.io.logger.Logger;
 import io.deephaven.util.Utils;
 import io.deephaven.util.annotations.TestUseOnly;
-import io.deephaven.internal.log.LoggerFactory;
 import org.jetbrains.annotations.NotNull;
 
+import java.lang.ref.PhantomReference;
 import java.lang.ref.Reference;
 import java.lang.ref.ReferenceQueue;
+import java.lang.ref.SoftReference;
+import java.lang.ref.WeakReference;
+import java.util.Collections;
+import java.util.Objects;
+import java.util.Set;
+import java.util.concurrent.ConcurrentHashMap;
 
 /**
  * Utility for draining a reference queue of {@link CleanupReference}s and invoking their cleanup methods.
@@ -57,9 +64,9 @@ public interface ExceptionHandler {
     private final ExceptionHandler exceptionHandler;
 
     /**
-     * The reference queue from the most recent initialization.
+     * The drain queue from the most recent initialization.
      */
-    private volatile ReferenceQueue<?> referenceQueue;
+    private volatile DrainQueue drainQueue;
 
     /**
      * The cleaner thread from the most recent initialization, guarded by the lock on {@code this}.
@@ -98,29 +105,113 @@ public CleanupReferenceProcessor(
      *         {@link CleanupReferenceProcessor} instance
      */
     public <RT> ReferenceQueue<RT> getReferenceQueue() {
-        ReferenceQueue localQueue;
-        if ((localQueue = referenceQueue) == null) {
+        return getDrainQueue().referenceQueue();
+    }
+
+    private DrainQueue getDrainQueue() {
+        DrainQueue localQueue;
+        if ((localQueue = drainQueue) == null) {
             synchronized (this) {
-                if ((localQueue = referenceQueue) == null) {
-                    referenceQueue = localQueue = new ReferenceQueue<>();
-                    cleanerThread = new Thread(new DrainQueue(localQueue),
+                if ((localQueue = drainQueue) == null) {
+                    drainQueue = localQueue = new DrainQueue(new ReferenceQueue<>());
+                    cleanerThread = new Thread(localQueue,
                             "CleanupReferenceProcessor-" + name + "-drainingThread");
                     cleanerThread.setDaemon(true);
                     cleanerThread.start();
                 }
             }
         }
-        // noinspection unchecked
         return localQueue;
     }
 
+    /**
+     * Registers a {@code referent} and a cleaning {@code action} to run when the {@code referent} becomes phantom
+     * reachable.
+     *
+     * <p>
+     * The most efficient use is to explicitly invoke the {@link CleanupReference#cleanup() cleanup} method when the
+     * {@code referent} is closed or no longer needed. Otherwise, the cleaning {@code action} will be invoked when
+     * {@code referent} has become phantom reachable. The {@code action} will not be invoked more than once.
+     *
+     * <p>
+     * The cleaning {@code action} must <b>not</b> refer to the {@code referent} being registered. If so, the
+     * {@code referent} will never become phantom reachable and the cleaning {@code action} will never be invoked
+     * automatically.
+     *
+     * <p>
+     * Note: while the caller is encouraged to hold onto the cleanup reference to allow for explicit
+     * {@link CleanupReference#cleanup() cleanup} invocation, they are not required to as this cleanup reference
+     * processor will hold onto the reference.
+     *
+     * @param referent the object to monitor
+     * @param action a {@code Runnable} to invoke when the referent becomes phantom reachable
+     * @return a cleanup reference instance
+     */
+    public <T> CleanupReference<T> registerPhantom(T referent, Runnable action) {
+        return getDrainQueue().registerPhantom(referent, action);
+    }
+
+    /**
+     * Registers a {@code referent} and a cleaning {@code action} to run when the {@code referent} becomes weakly
+     * reachable.
+     *
+     * <p>
+     * The most efficient use is to explicitly invoke the {@link CleanupReference#cleanup() cleanup} method when the
+     * {@code referent} is closed or no longer needed. Otherwise, the cleaning {@code action} will be invoked when
+     * {@code referent} has become weakly reachable. The {@code action} will not be invoked more than once.
+     *
+     * <p>
+     * The cleaning {@code action} must <b>not</b> refer to the {@code referent} being registered. If so, the
+     * {@code referent} will never become weakly reachable and the cleaning {@code action} will never be invoked
+     * automatically.
+     *
+     * <p>
+     * Note: while the caller is encouraged to hold onto the cleanup reference to allow for explicit
+     * {@link CleanupReference#cleanup() cleanup} invocation, they are not required to as this cleanup reference
+     * processor will hold onto the reference.
+     *
+     * @param referent the object to monitor
+     * @param action a {@code Runnable} to invoke when the referent becomes weakly reachable
+     * @return a cleanup reference instance
+     */
+    public <T> CleanupReference<T> registerWeak(T referent, Runnable action) {
+        return getDrainQueue().registerWeak(referent, action);
+    }
+
+    /**
+     * Registers a {@code referent} and a cleaning {@code action} to run when the {@code referent} becomes softly
+     * reachable.
+     *
+     * <p>
+     * The most efficient use is to explicitly invoke the {@link CleanupReference#cleanup() cleanup} method when the
+     * {@code referent} is closed or no longer needed. Otherwise, the cleaning {@code action} will be invoked when
+     * {@code referent} has become softly reachable. The {@code action} will not be invoked more than once.
+     *
+     * <p>
+     * The cleaning {@code action} must <b>not</b> refer to the {@code referent} being registered. If so, the
+     * {@code referent} will never become softly reachable and the cleaning {@code action} will never be invoked
+     * automatically.
+     *
+     * <p>
+     * Note: while the caller is encouraged to hold onto the cleanup reference to allow for explicit
+     * {@link CleanupReference#cleanup() cleanup} invocation, they are not required to as this cleanup reference
+     * processor will hold onto the reference.
+     *
+     * @param referent the object to monitor
+     * @param action a {@code Runnable} to invoke when the referent becomes softly reachable
+     * @return a cleanup reference instance
+     */
+    public <T> CleanupReference<T> registerSoft(T referent, Runnable action) {
+        return getDrainQueue().registerSoft(referent, action);
+    }
+
     /**
      * Reset this instance so that the next call to {@link #getReferenceQueue()} will re-initialize it and provide a new
      * queue. Results in the prompt termination of the daemon thread that may have been draining the existing queue.
      */
     @TestUseOnly
     public final synchronized void resetForUnitTests() {
-        referenceQueue = null;
+        drainQueue = null;
         if (cleanerThread != null) {
             cleanerThread.interrupt();
             cleanerThread = null;
@@ -132,33 +223,139 @@ public final synchronized void resetForUnitTests() {
      */
     private class DrainQueue implements Runnable {
 
-        private final ReferenceQueue<?> localQueue;
+        private final ReferenceQueue<?> referenceQueue;
+        private final Set<RegisteredCleanupReference<?>> registrations;
 
-        private DrainQueue(ReferenceQueue<?> localQueue) {
-            this.localQueue = localQueue;
+        private DrainQueue(ReferenceQueue<?> referenceQueue) {
+            this.referenceQueue = Objects.requireNonNull(referenceQueue);
+            this.registrations = Collections.newSetFromMap(new ConcurrentHashMap<>());
+        }
+
+        public <T> ReferenceQueue<T> referenceQueue() {
+            // noinspection unchecked
+            return (ReferenceQueue<T>) referenceQueue;
+        }
+
+        public <T> CleanupReference<T> registerPhantom(T referent, Runnable action) {
+            final PhantomCleanupRef<T> ref = new PhantomCleanupRef<>(referent, referenceQueue(), action);
+            registrations.add(ref);
+            return ref;
+        }
+
+        public <T> CleanupReference<T> registerWeak(T referent, Runnable action) {
+            final WeakCleanupRef<T> ref = new WeakCleanupRef<>(referent, referenceQueue(), action);
+            registrations.add(ref);
+            return ref;
+        }
+
+        public <T> CleanupReference<T> registerSoft(T referent, Runnable action) {
+            final SoftCleanupRef<T> ref = new SoftCleanupRef<>(referent, referenceQueue(), action);
+            registrations.add(ref);
+            return ref;
         }
 
         @Override
         public void run() {
-            while (localQueue == referenceQueue) {
+            while (this == drainQueue) {
                 final Reference<?> reference;
                 try {
-                    reference = localQueue.remove(shutdownCheckDelayMillis);
+                    reference = referenceQueue.remove(shutdownCheckDelayMillis);
                 } catch (InterruptedException ignored) {
                     continue;
                 }
                 if (reference instanceof CleanupReference) {
+                    final CleanupReference<?> ref = (CleanupReference<?>) reference;
                     try {
                         if (LOG_CLEANED_REFERENCES) {
                             log.info().append("CleanupReferenceProcessor-").append(name).append(", cleaning ")
                                     .append(Utils.REFERENT_FORMATTER, reference).endl();
                         }
-                        ((CleanupReference<?>) reference).cleanup();
+                        ref.cleanup();
                     } catch (Exception e) {
-                        exceptionHandler.accept(log, (CleanupReference<?>) reference, e);
+                        exceptionHandler.accept(log, ref, e);
+                    } finally {
+                        if (ref instanceof RegisteredCleanupReference) {
+                            registrations.remove(ref);
+                        }
                     }
                 }
             }
         }
     }
+
+    interface RegisteredCleanupReference<T> extends CleanupReference<T> {
+
+    }
+
+    private static class PhantomCleanupRef<T> extends PhantomReference<T> implements RegisteredCleanupReference<T> {
+        private Runnable action;
+
+        PhantomCleanupRef(T referent, ReferenceQueue<? super T> q, Runnable action) {
+            super(referent, q);
+            this.action = Objects.requireNonNull(action);
+            Reference.reachabilityFence(referent);
+            Reference.reachabilityFence(q);
+        }
+
+        @Override
+        public void cleanup() {
+            final Runnable cleanup;
+            synchronized (this) {
+                if (action == null) {
+                    return;
+                }
+                cleanup = action;
+                action = null;
+            }
+            cleanup.run();
+        }
+    }
+
+    private static class WeakCleanupRef<T> extends WeakReference<T> implements RegisteredCleanupReference<T> {
+        private Runnable action;
+
+        WeakCleanupRef(T referent, ReferenceQueue<? super T> q, Runnable action) {
+            super(referent, q);
+            this.action = Objects.requireNonNull(action);
+            Reference.reachabilityFence(referent);
+            Reference.reachabilityFence(q);
+        }
+
+        @Override
+        public void cleanup() {
+            final Runnable cleanup;
+            synchronized (this) {
+                if (action == null) {
+                    return;
+                }
+                cleanup = action;
+                action = null;
+            }
+            cleanup.run();
+        }
+    }
+
+    private static class SoftCleanupRef<T> extends SoftReference<T> implements RegisteredCleanupReference<T> {
+        private Runnable action;
+
+        SoftCleanupRef(T referent, ReferenceQueue<? super T> q, Runnable action) {
+            super(referent, q);
+            this.action = Objects.requireNonNull(action);
+            Reference.reachabilityFence(referent);
+            Reference.reachabilityFence(q);
+        }
+
+        @Override
+        public void cleanup() {
+            final Runnable cleanup;
+            synchronized (this) {
+                if (action == null) {
+                    return;
+                }
+                cleanup = action;
+                action = null;
+            }
+            cleanup.run();
+        }
+    }
 }
diff --git a/Util/src/main/java/io/deephaven/util/text/SplitIgnoreQuotes.java b/Util/src/main/java/io/deephaven/util/text/SplitIgnoreQuotes.java
index 54ccb033a81..09a900bc76d 100644
--- a/Util/src/main/java/io/deephaven/util/text/SplitIgnoreQuotes.java
+++ b/Util/src/main/java/io/deephaven/util/text/SplitIgnoreQuotes.java
@@ -3,8 +3,6 @@
 //
 package io.deephaven.util.text;
 
-import io.deephaven.datastructures.util.CollectionUtil;
-
 import java.util.ArrayList;
 import java.util.List;
 
@@ -56,7 +54,7 @@ public String[] split(String string, char splitter) {
         // Check if there is one last value left
         addCurrentValue();
 
-        return values.toArray(CollectionUtil.ZERO_LENGTH_STRING_ARRAY);
+        return values.toArray(String[]::new);
     }
 
     private void processQuote(char c) {
diff --git a/Util/src/main/java/io/deephaven/util/type/ArrayTypeUtils.java b/Util/src/main/java/io/deephaven/util/type/ArrayTypeUtils.java
index c2d03f75a04..748032914ae 100644
--- a/Util/src/main/java/io/deephaven/util/type/ArrayTypeUtils.java
+++ b/Util/src/main/java/io/deephaven/util/type/ArrayTypeUtils.java
@@ -5,11 +5,7 @@
 
 import io.deephaven.base.verify.Require;
 
-import java.lang.reflect.Array;
 import java.util.Arrays;
-import java.util.Collection;
-import java.util.Iterator;
-import java.util.Set;
 
 import static io.deephaven.util.QueryConstants.*;
 
@@ -28,54 +24,28 @@ public class ArrayTypeUtils {
     public static final double[] EMPTY_DOUBLE_ARRAY = new double[0];
     public static final Object[] EMPTY_OBJECT_ARRAY = new Object[0];
     public static final String[] EMPTY_STRING_ARRAY = new String[0];
+    public static final String[][] EMPTY_STRING_ARRAY_ARRAY = new String[0][];
     public static final Boolean[] EMPTY_BOOLEANBOXED_ARRAY = new Boolean[0];
 
-    public static ArrayAccessor getArrayAccessor(Object array) {
-        final Class<?> c = array.getClass();
-        if (c.equals(Boolean[].class)) {
+    public static ArrayAccessor<?> getArrayAccessor(Object array) {
+        if (array instanceof Boolean[]) {
             return new BooleanArrayAccessor((Boolean[]) array);
-        } else if (c.equals(byte[].class)) {
+        } else if (array instanceof byte[]) {
             return new ByteArrayAccessor((byte[]) array);
-        } else if (c.equals(char[].class)) {
+        } else if (array instanceof char[]) {
             return new CharArrayAccessor((char[]) array);
-        } else if (c.equals(double[].class)) {
+        } else if (array instanceof double[]) {
             return new DoubleArrayAccessor((double[]) array);
-        } else if (c.equals(float[].class)) {
+        } else if (array instanceof float[]) {
             return new FloatArrayAccessor((float[]) array);
-        } else if (c.equals(int[].class)) {
+        } else if (array instanceof int[]) {
             return new IntArrayAccessor((int[]) array);
-        } else if (c.equals(long[].class)) {
+        } else if (array instanceof long[]) {
             return new LongArrayAccessor((long[]) array);
-        } else if (c.equals(short[].class)) {
+        } else if (array instanceof short[]) {
             return new ShortArrayAccessor((short[]) array);
         } else {
-            return new ObjectArrayAccessor((Object[]) array);
-        }
-    }
-
-    public static ArrayAccessor createArrayAccessor(Object element, int size) {
-        if (element == null) {
-            return new ObjectArrayAccessor(new Object[size]);
-        }
-        final Class<?> c = element.getClass();
-        if (c.equals(boolean.class) || c.equals(Boolean.class)) {
-            return new BooleanArrayAccessor(booleanNullArray(size));
-        } else if (c.equals(byte.class) || c.equals(Byte.class)) {
-            return new ByteArrayAccessor(byteNullArray(size));
-        } else if (c.equals(char.class) || c.equals(Character.class)) {
-            return new CharArrayAccessor(charNullArray(size));
-        } else if (c.equals(double.class) || c.equals(Double.class)) {
-            return new DoubleArrayAccessor(doubleNullArray(size));
-        } else if (c.equals(float.class) || c.equals(Float.class)) {
-            return new FloatArrayAccessor(floatNullArray(size));
-        } else if (c.equals(int.class) || c.equals(Integer.class)) {
-            return new IntArrayAccessor(intNullArray(size));
-        } else if (c.equals(long.class) || c.equals(Long.class)) {
-            return new LongArrayAccessor(longNullArray(size));
-        } else if (c.equals(short.class) || c.equals(Short.class)) {
-            return new ShortArrayAccessor(shortNullArray(size));
-        } else {
-            return new ObjectArrayAccessor((Object[]) Array.newInstance(c, size));
+            return new ObjectArrayAccessor<>((Object[]) array);
         }
     }
 
@@ -127,99 +97,6 @@ public static short[] shortNullArray(int size) {
         return result;
     }
 
-    public static Object toArray(Collection<?> objects, Class elementType) {
-        if (elementType == boolean.class) {
-            elementType = Boolean.class;
-        }
-        Object result = Array.newInstance(elementType, objects.size());
-        ArrayAccessor accessor = getArrayAccessor(result);
-        int i = 0;
-        for (Object object : objects) {
-            accessor.set(i++, object);
-        }
-        return result;
-    }
-
-    public static Object boxedToPrimitive(Set<?> objects, Class type) {
-        Iterator<?> it = objects.iterator();
-        if (objects.isEmpty()) {
-            Class primitiveType = io.deephaven.util.type.TypeUtils.getUnboxedType(type);
-            if (primitiveType == null) {
-                return Array.newInstance(type, 0);
-            } else {
-                return Array.newInstance(primitiveType, 0);
-            }
-        }
-        Object current = it.next();
-        ArrayAccessor resultAccessor = createArrayAccessor(current, objects.size());
-        int i = 0;
-        resultAccessor.set(i++, current);
-        while (it.hasNext()) {
-            current = it.next();
-            resultAccessor.set(i++, current);
-        }
-        return resultAccessor.getArray();
-    }
-
-    public static ArrayAccessor getArrayAccessorFromArray(Object arrayPrototype, int size) {
-        final Class<?> c = arrayPrototype.getClass();
-        if (c.equals(boolean[].class)) {
-            return new BooleanArrayAccessor(booleanNullArray(size));
-        } else if (c.equals(byte[].class)) {
-            return new ByteArrayAccessor(byteNullArray(size));
-        } else if (c.equals(char[].class)) {
-            return new CharArrayAccessor(charNullArray(size));
-        } else if (c.equals(double[].class)) {
-            return new DoubleArrayAccessor(doubleNullArray(size));
-        } else if (c.equals(float[].class)) {
-            return new FloatArrayAccessor(floatNullArray(size));
-        } else if (c.equals(int[].class)) {
-            return new IntArrayAccessor(intNullArray(size));
-        } else if (c.equals(long[].class)) {
-            return new LongArrayAccessor(longNullArray(size));
-        } else if (c.equals(short[].class)) {
-            return new ShortArrayAccessor(shortNullArray(size));
-        } else {
-            return new ObjectArrayAccessor((Object[]) Array.newInstance(c.getComponentType(), size));
-        }
-    }
-
-    public static Object toArray(Collection<?> objects) {
-        if (objects.size() == 0) {
-            return toArray(objects, Object.class);
-        }
-        Object prototype = objects.iterator().next();
-        if (prototype == null) {
-            return toArray(objects, Object.class);
-        }
-        Class ubType = TypeUtils.getUnboxedType(prototype.getClass());
-
-        return toArray(objects, (ubType == null ? prototype.getClass() : ubType));
-    }
-
-    public static ArrayAccessor getAccessorForElementType(Class componentType, int size) {
-        if (componentType.equals(boolean.class) || componentType.equals(Boolean.class)) {
-            return new BooleanArrayAccessor(booleanNullArray(size));
-        } else if (componentType.equals(byte.class) || componentType.equals(Byte.class)) {
-            return new ByteArrayAccessor(byteNullArray(size));
-        } else if (componentType.equals(char.class) || componentType.equals(Character.class)) {
-            return new CharArrayAccessor(charNullArray(size));
-        } else if (componentType.equals(double.class) || componentType.equals(Double.class)) {
-            return new DoubleArrayAccessor(doubleNullArray(size));
-        } else if (componentType.equals(float.class) || componentType.equals(Float.class)) {
-            return new FloatArrayAccessor(floatNullArray(size));
-        } else if (componentType.equals(int.class) || componentType.equals(Integer.class)) {
-            return new IntArrayAccessor(intNullArray(size));
-        } else if (componentType.equals(long.class) || componentType.equals(Long.class)) {
-            return new LongArrayAccessor(longNullArray(size));
-        } else if (componentType.equals(short.class) || componentType.equals(Short.class)) {
-            return new ShortArrayAccessor(shortNullArray(size));
-        } else {
-            return new ObjectArrayAccessor((Object[]) Array.newInstance(componentType, size));
-        }
-
-    }
-
     public static Character[] getBoxedArray(char[] referenceData) {
         Character[] result = new Character[referenceData.length];
         for (int i = 0; i < result.length; i++) {
@@ -425,22 +302,21 @@ public static Object[] getBoxedArray(Object value) {
             return null;
         }
 
-        final Class<?> c = value.getClass();
-        if (c.equals(boolean[].class)) {
+        if (value instanceof boolean[]) {
             return getBoxedArray((boolean[]) value);
-        } else if (c.equals(byte[].class)) {
+        } else if (value instanceof byte[]) {
             return getBoxedArray((byte[]) value);
-        } else if (c.equals(char[].class)) {
+        } else if (value instanceof char[]) {
             return getBoxedArray((char[]) value);
-        } else if (c.equals(double[].class)) {
+        } else if (value instanceof double[]) {
             return getBoxedArray((double[]) value);
-        } else if (c.equals(float[].class)) {
+        } else if (value instanceof float[]) {
             return getBoxedArray((float[]) value);
-        } else if (c.equals(int[].class)) {
+        } else if (value instanceof int[]) {
             return getBoxedArray((int[]) value);
-        } else if (c.equals(long[].class)) {
+        } else if (value instanceof long[]) {
             return getBoxedArray((long[]) value);
-        } else if (c.equals(short[].class)) {
+        } else if (value instanceof short[]) {
             return getBoxedArray((short[]) value);
         } else {
             return (Object[]) value;
@@ -448,47 +324,42 @@ public static Object[] getBoxedArray(Object value) {
     }
 
     public static boolean equals(Object actualValue, Object expectedValue) {
-        final Class<?> ct = actualValue.getClass().getComponentType();
-        if (Object.class.isAssignableFrom(ct)) {
-            return Arrays.equals((Object[]) actualValue, (Object[]) expectedValue);
-        } else if (byte.class.isAssignableFrom(ct)) {
+        if (actualValue instanceof byte[] && expectedValue instanceof byte[]) {
             return Arrays.equals((byte[]) actualValue, (byte[]) expectedValue);
-        } else if (char.class.isAssignableFrom(ct)) {
+        } else if (actualValue instanceof char[] && expectedValue instanceof char[]) {
             return Arrays.equals((char[]) actualValue, (char[]) expectedValue);
-        } else if (double.class.isAssignableFrom(ct)) {
+        } else if (actualValue instanceof double[] && expectedValue instanceof double[]) {
             return Arrays.equals((double[]) actualValue, (double[]) expectedValue);
-        } else if (float.class.isAssignableFrom(ct)) {
+        } else if (actualValue instanceof float[] && expectedValue instanceof float[]) {
             return Arrays.equals((float[]) actualValue, (float[]) expectedValue);
-        } else if (int.class.isAssignableFrom(ct)) {
+        } else if (actualValue instanceof int[] && expectedValue instanceof int[]) {
             return Arrays.equals((int[]) actualValue, (int[]) expectedValue);
-        } else if (long.class.isAssignableFrom(ct)) {
+        } else if (actualValue instanceof long[] && expectedValue instanceof long[]) {
             return Arrays.equals((long[]) actualValue, (long[]) expectedValue);
-        } else if (short.class.isAssignableFrom(ct)) {
+        } else if (actualValue instanceof short[] && expectedValue instanceof short[]) {
             return Arrays.equals((short[]) actualValue, (short[]) expectedValue);
+        } else {
+            return Arrays.equals((Object[]) actualValue, (Object[]) expectedValue);
         }
-        return false;
     }
 
     public static String toString(Object actualValue) {
-        final Class<?> ct = actualValue.getClass().getComponentType();
-        if (Object.class.isAssignableFrom(ct)) {
-            return Arrays.toString((Object[]) actualValue);
-        } else if (byte.class.isAssignableFrom(ct)) {
+        if (actualValue instanceof byte[]) {
             return Arrays.toString((byte[]) actualValue);
-        } else if (char.class.isAssignableFrom(ct)) {
+        } else if (actualValue instanceof char[]) {
             return Arrays.toString((char[]) actualValue);
-        } else if (double.class.isAssignableFrom(ct)) {
+        } else if (actualValue instanceof double[]) {
             return Arrays.toString((double[]) actualValue);
-        } else if (float.class.isAssignableFrom(ct)) {
+        } else if (actualValue instanceof float[]) {
             return Arrays.toString((float[]) actualValue);
-        } else if (int.class.isAssignableFrom(ct)) {
+        } else if (actualValue instanceof int[]) {
             return Arrays.toString((int[]) actualValue);
-        } else if (long.class.isAssignableFrom(ct)) {
+        } else if (actualValue instanceof long[]) {
             return Arrays.toString((long[]) actualValue);
-        } else if (short.class.isAssignableFrom(ct)) {
+        } else if (actualValue instanceof short[]) {
             return Arrays.toString((short[]) actualValue);
         }
-        return null;
+        return Arrays.toString((Object[]) actualValue);
     }
 
     public static String toString(boolean[] a, int offset, int length) {
@@ -673,10 +544,10 @@ public interface ArrayAccessor<T> {
 
     public static class ObjectArrayAccessor<T> implements ArrayAccessor<T> {
 
-        private T array[];
+        private final T[] array;
 
 
-        public ObjectArrayAccessor(T array[]) {
+        public ObjectArrayAccessor(T[] array) {
             this.array = array;
         }
 
@@ -716,9 +587,9 @@ public void copyArray(Object sourceArray, int pos, int length) {
 
     public static class BooleanArrayAccessor implements ArrayAccessor<Boolean> {
 
-        private Boolean array[];
+        private final Boolean[] array;
 
-        public BooleanArrayAccessor(Boolean array[]) {
+        public BooleanArrayAccessor(Boolean[] array) {
             this.array = array;
         }
 
@@ -760,9 +631,9 @@ public void copyArray(Object sourceArray, int pos, int length) {
 
     public static class ByteArrayAccessor implements ArrayAccessor<Byte> {
 
-        private byte array[];
+        private final byte[] array;
 
-        public ByteArrayAccessor(byte array[]) {
+        public ByteArrayAccessor(byte[] array) {
             this.array = array;
         }
 
@@ -803,9 +674,9 @@ public void copyArray(Object sourceArray, int pos, int length) {
     }
     public static class CharArrayAccessor implements ArrayAccessor<Character> {
 
-        private char array[];
+        private final char[] array;
 
-        public CharArrayAccessor(char array[]) {
+        public CharArrayAccessor(char[] array) {
             this.array = array;
         }
 
@@ -846,9 +717,9 @@ public void copyArray(Object sourceArray, int pos, int length) {
     }
     public static class DoubleArrayAccessor implements ArrayAccessor<Double> {
 
-        private double array[];
+        private final double[] array;
 
-        public DoubleArrayAccessor(double array[]) {
+        public DoubleArrayAccessor(double[] array) {
             this.array = array;
         }
 
@@ -889,9 +760,9 @@ public void copyArray(Object sourceArray, int pos, int length) {
     }
     public static class FloatArrayAccessor implements ArrayAccessor<Float> {
 
-        private float array[];
+        private final float[] array;
 
-        public FloatArrayAccessor(float array[]) {
+        public FloatArrayAccessor(float[] array) {
             this.array = array;
         }
 
@@ -932,9 +803,9 @@ public void copyArray(Object sourceArray, int pos, int length) {
     }
     public static class IntArrayAccessor implements ArrayAccessor<Integer> {
 
-        private int array[];
+        private final int[] array;
 
-        public IntArrayAccessor(int array[]) {
+        public IntArrayAccessor(int[] array) {
             this.array = array;
         }
 
@@ -980,9 +851,9 @@ public void copyArray(Object sourceArray, int pos, int length) {
     }
     public static class LongArrayAccessor implements ArrayAccessor<Long> {
 
-        private long array[];
+        private final long[] array;
 
-        public LongArrayAccessor(long array[]) {
+        public LongArrayAccessor(long[] array) {
             this.array = array;
         }
 
@@ -1024,9 +895,9 @@ public void copyArray(Object sourceArray, int pos, int length) {
     }
     public static class ShortArrayAccessor implements ArrayAccessor<Short> {
 
-        private short array[];
+        private final short[] array;
 
-        public ShortArrayAccessor(short array[]) {
+        public ShortArrayAccessor(short[] array) {
             this.array = array;
         }
 
diff --git a/Util/src/main/java/io/deephaven/util/type/NumericTypeUtils.java b/Util/src/main/java/io/deephaven/util/type/NumericTypeUtils.java
new file mode 100644
index 00000000000..95b300e12fd
--- /dev/null
+++ b/Util/src/main/java/io/deephaven/util/type/NumericTypeUtils.java
@@ -0,0 +1,54 @@
+//
+// Copyright (c) 2016-2024 Deephaven Data Labs and Patent Pending
+//
+package io.deephaven.util.type;
+
+import org.jetbrains.annotations.NotNull;
+
+import java.math.BigDecimal;
+import java.math.BigInteger;
+
+public class NumericTypeUtils {
+    private NumericTypeUtils() {}
+
+    /**
+     * Whether the class is an instance of {@link Number}.
+     *
+     * @param c class
+     * @return true if Number.class is assignable from {@code c}, false otherwise
+     */
+    public static boolean isBoxedNumeric(@NotNull final Class<?> c) {
+        return Number.class.isAssignableFrom(c);
+    }
+
+    /**
+     * Whether the class is {@link NumericTypeUtils#isPrimitiveNumeric(Class)} or {@link #isBoxedNumeric(Class)}
+     *
+     * @param c class
+     * @return true if {@code c} is numeric, false otherwise
+     */
+    public static boolean isNumeric(@NotNull final Class<?> c) {
+        return isPrimitiveNumeric(c) || isBoxedNumeric(c);
+    }
+
+    /**
+     * Whether the class is a {@link BigInteger} or {@link BigDecimal}
+     *
+     * @param type the class
+     * @return true if the type is BigInteger or BigDecimal, false otherwise
+     */
+    public static boolean isBigNumeric(Class<?> type) {
+        return BigInteger.class.isAssignableFrom(type) || BigDecimal.class.isAssignableFrom(type);
+    }
+
+    /**
+     * Whether the class is equal to one of the six numeric primitives: float, double, int, long, short, or byte.
+     *
+     * @param c class
+     * @return true if {@code c} is a numeric primitive, false otherwise
+     */
+    public static boolean isPrimitiveNumeric(@NotNull final Class<?> c) {
+        return c == double.class || c == float.class
+                || c == int.class || c == long.class || c == short.class || c == byte.class;
+    }
+}
diff --git a/Util/src/main/java/io/deephaven/util/type/TypeUtils.java b/Util/src/main/java/io/deephaven/util/type/TypeUtils.java
index 89cfd4e152c..e3ae220a4d4 100644
--- a/Util/src/main/java/io/deephaven/util/type/TypeUtils.java
+++ b/Util/src/main/java/io/deephaven/util/type/TypeUtils.java
@@ -5,18 +5,11 @@
 
 import org.jetbrains.annotations.NotNull;
 
-import java.io.*;
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
-import java.math.BigDecimal;
-import java.math.BigInteger;
-import java.time.Instant;
-import java.time.ZonedDateTime;
 import java.util.*;
 import java.util.stream.Collectors;
 
-import java.lang.reflect.*;
-
 import static io.deephaven.util.QueryConstants.*;
 
 /**
@@ -58,6 +51,10 @@ public class TypeUtils {
                 .unmodifiableMap(PRIMITIVE_TYPES.stream().collect(Collectors.toMap(Class::getName, type -> type)));
     }
 
+    /**
+     * Deprecated with no replacement.
+     */
+    @Deprecated
     @Retention(RetentionPolicy.RUNTIME)
     public @interface IsDateTime {
         boolean value() default true;
@@ -372,27 +369,6 @@ public static String nullConstantForType(Class<?> type) {
         }
     }
 
-    /**
-     * Whether the class is equal to one of the six numeric primitives: float, double, int, long, short, or byte.
-     *
-     * @param c class
-     * @return true if {@code c} is a numeric primitive, false otherwise
-     */
-    public static boolean isPrimitiveNumeric(@NotNull final Class<?> c) {
-        return c.equals(double.class) || c.equals(float.class)
-                || c.equals(int.class) || c.equals(long.class) || c.equals(short.class) || c.equals(byte.class);
-    }
-
-    /**
-     * Whether the class is an instance of {@link Number}.
-     *
-     * @param c class
-     * @return true if Number.class is assignable from {@code c}, false otherwise
-     */
-    public static boolean isBoxedNumeric(@NotNull final Class<?> c) {
-        return Number.class.isAssignableFrom(c);
-    }
-
     /**
      * Whether the class is equal to char.class.
      *
@@ -400,7 +376,7 @@ public static boolean isBoxedNumeric(@NotNull final Class<?> c) {
      * @return true if {@code c} equals char.class, false otherwise
      */
     public static boolean isPrimitiveChar(@NotNull final Class<?> c) {
-        return c.equals(char.class);
+        return c == char.class;
     }
 
     /**
@@ -410,7 +386,7 @@ public static boolean isPrimitiveChar(@NotNull final Class<?> c) {
      * @return true if Character.class is assignable from {@code c}, false otherwise
      */
     public static boolean isBoxedChar(@NotNull final Class<?> c) {
-        return Character.class.isAssignableFrom(c);
+        return Character.class == c;
     }
 
     /**
@@ -420,7 +396,7 @@ public static boolean isBoxedChar(@NotNull final Class<?> c) {
      * @return true if Integer.class is assignable from {@code c}, false otherwise
      */
     public static boolean isBoxedInteger(@NotNull final Class<?> c) {
-        return Integer.class.isAssignableFrom(c);
+        return Integer.class == c;
     }
 
     /**
@@ -430,7 +406,7 @@ public static boolean isBoxedInteger(@NotNull final Class<?> c) {
      * @return true if Long.class is assignable from {@code c}, false otherwise
      */
     public static boolean isBoxedLong(@NotNull final Class<?> c) {
-        return Long.class.isAssignableFrom(c);
+        return Long.class == c;
     }
 
     /**
@@ -440,7 +416,7 @@ public static boolean isBoxedLong(@NotNull final Class<?> c) {
      * @return true if Short.class is assignable from {@code c}, false otherwise
      */
     public static boolean isBoxedShort(@NotNull final Class<?> c) {
-        return Short.class.isAssignableFrom(c);
+        return Short.class == c;
     }
 
     /**
@@ -450,7 +426,7 @@ public static boolean isBoxedShort(@NotNull final Class<?> c) {
      * @return true if Float.class is assignable from {@code c}, false otherwise
      */
     public static boolean isBoxedFloat(@NotNull final Class<?> c) {
-        return Float.class.isAssignableFrom(c);
+        return Float.class == c;
     }
 
     /**
@@ -460,7 +436,7 @@ public static boolean isBoxedFloat(@NotNull final Class<?> c) {
      * @return true if Double.class is assignable from {@code c}, false otherwise
      */
     public static boolean isBoxedDouble(@NotNull final Class<?> c) {
-        return Double.class.isAssignableFrom(c);
+        return Double.class == c;
     }
 
     /**
@@ -470,7 +446,7 @@ public static boolean isBoxedDouble(@NotNull final Class<?> c) {
      * @return true if Byte.class is assignable from {@code c}, false otherwise
      */
     public static boolean isBoxedByte(@NotNull final Class<?> c) {
-        return Byte.class.isAssignableFrom(c);
+        return Byte.class == c;
     }
 
     /**
@@ -490,17 +466,7 @@ public static boolean isBoxedArithmetic(@NotNull final Class<?> c) {
      * @return true if Boolean.class is assignable from {@code c}, false otherwise
      */
     public static boolean isBoxedBoolean(@NotNull final Class<?> c) {
-        return Boolean.class.isAssignableFrom(c);
-    }
-
-    /**
-     * Whether the class is {@link #isPrimitiveNumeric(Class)} or {@link #isBoxedNumeric(Class)}
-     *
-     * @param c class
-     * @return true if {@code c} is numeric, false otherwise
-     */
-    public static boolean isNumeric(@NotNull final Class<?> c) {
-        return isPrimitiveNumeric(c) || isBoxedNumeric(c);
+        return Boolean.class == c;
     }
 
     /**
@@ -513,18 +479,6 @@ public static boolean isCharacter(@NotNull final Class<?> c) {
         return isPrimitiveChar(c) || isBoxedChar(c);
     }
 
-    /**
-     * Whether the class is an {@link Instant}, a {@link ZonedDateTime}, or annotated as {@link IsDateTime}.
-     *
-     * @param type The class.
-     * @return true if the type is a DateTime, {@link java.time.ZonedDateTime} or {@link Instant}.
-     */
-    public static boolean isDateTime(Class<?> type) {
-        return Instant.class.isAssignableFrom(type)
-                || ZonedDateTime.class.isAssignableFrom(type)
-                || (type.getAnnotation(IsDateTime.class) != null && type.getAnnotation(IsDateTime.class).value());
-    }
-
     /**
      * Whether the class is a {@link String}
      *
@@ -532,17 +486,7 @@ public static boolean isDateTime(Class<?> type) {
      * @return true if the type is a String, false otherwise
      */
     public static boolean isString(Class<?> type) {
-        return String.class.isAssignableFrom(type);
-    }
-
-    /**
-     * Whether the class is a {@link BigInteger} or {@link BigDecimal}
-     *
-     * @param type the class
-     * @return true if the type is BigInteger or BigDecimal, false otherwise
-     */
-    public static boolean isBigNumeric(Class<?> type) {
-        return BigInteger.class.isAssignableFrom(type) || BigDecimal.class.isAssignableFrom(type);
+        return String.class == type;
     }
 
     /**
@@ -555,232 +499,6 @@ public static boolean isFloatType(Class<?> type) {
         return type.equals(double.class) || type.equals(float.class) || isBoxedDouble(type) || isBoxedFloat(type);
     }
 
-    /**
-     * Converts an Object to a String for writing to a workspace. This is meant to be used in conjunction with
-     * {@code TypeUtils.fromString}. Strings, Numbers, and primitives will all convert using {@code Obect.toString}.
-     * Serializable objects will be encoded in base64. All others will return null.
-     *
-     * @param o the object to convert
-     * @return a String representation of the object, null if it cannot be converted
-     * @throws IOException if an IO error occurs during conversion
-     */
-    public static String objectToString(Object o) throws IOException {
-        if (o == null) {
-            return null;
-        }
-
-        final Class<?> type = o.getClass();
-        // isNumeric gets BigInteger and BigDecimal in addition to everything gotten by isConvertibleToPrimitive
-        if (type == String.class || isConvertibleToPrimitive(type) || isNumeric(type)) {
-            return o.toString();
-        } else if (o instanceof Serializable) {
-            return encode64Serializable((Serializable) o);
-        }
-
-        throw new RuntimeException(
-                "Failed to convert object of type " + type.getCanonicalName() + ".  Type not supported");
-    }
-
-    /**
-     * Creates an Object from a String. This is meant to be used in conjunction with {@code TypeUtils.objectToString}
-     * Strings, Numbers, and primitives will all parse using their boxed type parsing methods. Serializable types will
-     * be decoded from base64. Returns null if the String fails to parse.
-     *
-     * @param string the String to parse
-     * @param typeString the Canonical Name of the class type
-     * @return an object parsed from the String
-     * @throws RuntimeException if the string fails to parse
-     * @throws IOException if an IO error occurs during conversion
-     */
-    public static Optional<Object> fromString(String string, String typeString) throws IOException {
-        final Class<?> type;
-        try {
-            type = Class.forName(typeString);
-            return Optional.ofNullable(fromString(string, type));
-        } catch (ClassNotFoundException e) {
-            return Optional.empty();
-        }
-    }
-
-    /**
-     * Creates an Object from a String. This is meant to be used in conjunction with {@code TypeUtils.objectToString}
-     * Strings, Numbers, and primitives will all parse using their boxed type parsing methods. Serializable types will
-     * be decoded from base64. Returns null if the String fails to parse.
-     *
-     * @param string the String to parse
-     * @param type the type of the object
-     * @return an object parsed from the String
-     * @throws RuntimeException if the string fails to parse
-     * @throws IOException if an IO error occurs during conversion
-     */
-    public static Object fromString(String string, Class<?> type) throws IOException {
-        final Class<?> boxedType = getBoxedType(type);
-        try {
-            if (boxedType == String.class) {
-                return string;
-            } else if (boxedType == Boolean.class) {
-                return Boolean.parseBoolean(string);
-            } else if (boxedType == Integer.class) {
-                return Integer.parseInt(string);
-            } else if (boxedType == Double.class) {
-                return Double.parseDouble(string);
-            } else if (boxedType == Short.class) {
-                return Short.parseShort(string);
-            } else if (boxedType == Long.class) {
-                return Long.parseLong(string);
-            } else if (boxedType == Float.class) {
-                return Float.parseFloat(string);
-            } else if (boxedType == BigInteger.class) {
-                return new BigInteger(string);
-            } else if (boxedType == BigDecimal.class) {
-                return new BigDecimal(string);
-            } else if (boxedType == Byte.class) {
-                return Byte.parseByte(string);
-            } else if (boxedType == Character.class) {
-                return string.charAt(0);
-            } else if (Serializable.class.isAssignableFrom(boxedType)) {
-                return decode64Serializable(string);
-            }
-        } catch (IOException ioe) {
-            throw ioe;
-        } catch (Exception e) {
-            throw new RuntimeException("Failed to parse " + string + "into type " + type.getCanonicalName(), e);
-        }
-
-        throw new RuntimeException(
-                "Failed to parse " + string + "into type " + type.getCanonicalName() + ".  Type not supported");
-    }
-
-    /**
-     * Encodes a Serializable Object into base64 String.
-     *
-     * @param serializable the object to encode
-     * @return the base64 encoded string
-     * @throws IOException if the string cannot be encoded
-     */
-    public static String encode64Serializable(Serializable serializable) throws IOException {
-        try (ByteArrayOutputStream bos = new ByteArrayOutputStream();
-                ObjectOutputStream os = new ObjectOutputStream(bos)) {
-            os.writeObject(serializable);
-            return Base64.getEncoder().encodeToString(bos.toByteArray());
-        }
-    }
-
-    /**
-     * Decodes a Serializable Object from a base64 encoded String.
-     *
-     * @param string the base64 encoded String
-     * @return the encoded Object
-     * @throws IOException if the string cannot be decoded
-     * @throws ClassNotFoundException if the Object type is unknown
-     */
-    public static Object decode64Serializable(String string) throws IOException, ClassNotFoundException {
-        try (ObjectInputStream is =
-                new ObjectInputStream(new ByteArrayInputStream(Base64.getDecoder().decode(string)))) {
-            return is.readObject();
-        }
-    }
-
-    /**
-     * Determine the Class from the Type.
-     */
-    public static Class<?> getErasedType(Type paramType) {
-        if (paramType instanceof Class) {
-            return (Class<?>) paramType;
-        } else if (paramType instanceof ParameterizedType) {
-            return (Class<?>) // We are asking the parameterized type for it's raw type, which is always Class
-            ((ParameterizedType) paramType).getRawType();
-        } else if (paramType instanceof WildcardType) {
-            final Type[] upper = ((WildcardType) paramType).getUpperBounds();
-            return getErasedType(upper[0]);
-        } else if (paramType instanceof java.lang.reflect.TypeVariable) {
-            final Type[] bounds = ((TypeVariable<?>) paramType).getBounds();
-            if (bounds.length > 1) {
-                Class<?>[] erasedBounds = new Class[bounds.length];
-                Class<?> weakest = null;
-                for (int i = 0; i < erasedBounds.length; i++) {
-                    erasedBounds[i] = getErasedType(bounds[i]);
-                    if (i == 0) {
-                        weakest = erasedBounds[i];
-                    } else {
-                        weakest = getWeakest(weakest, erasedBounds[i]);
-                    }
-                    // If we are erased to object, stop erasing...
-                    if (weakest == Object.class) {
-                        break;
-                    }
-                }
-                return weakest;
-            }
-            return getErasedType(bounds[0]);
-        } else {
-            throw new UnsupportedOperationException();
-        }
-    }
-
-    /**
-     * Determine the weakest parent of the two provided Classes.
-     *
-     * @param one one class to compare
-     * @param two the other class to compare
-     * @return the weakest parent Class
-     */
-    private static Class<?> getWeakest(Class<?> one, Class<?> two) {
-        if (one.isAssignableFrom(two)) {
-            return one;
-        } else if (two.isAssignableFrom(one)) {
-            return two;
-        }
-        // No luck on quick check... Look in interfaces.
-        Set<Class<?>> oneInterfaces = getFlattenedInterfaces(one);
-        Set<Class<?>> twoInterfaces = getFlattenedInterfaces(two);
-        // Keep only shared interfaces
-        oneInterfaces.retainAll(twoInterfaces);
-        Class<?> strongest = Object.class;
-        for (Class<?> cls : oneInterfaces) {
-            // There is a winning type...
-            if (strongest.isAssignableFrom(cls)) {
-                strongest = cls;
-            } else if (!cls.isAssignableFrom(strongest)) {
-                return Object.class;
-            }
-        }
-        // Will be Object.class if there were no shared interfaces (or shared interfaces were not compatible).
-        return strongest;
-    }
-
-    private static Set<Class<?>> getFlattenedInterfaces(Class<?> cls) {
-        final Set<Class<?>> set = new HashSet<>();
-        while (cls != null && cls != Object.class) {
-            for (Class<?> iface : cls.getInterfaces()) {
-                collectInterfaces(set, iface);
-            }
-            cls = cls.getSuperclass();
-        }
-        return set;
-    }
-
-    private static void collectInterfaces(final Collection<Class<?>> into, final Class<?> cls) {
-        if (into.add(cls)) {
-            for (final Class<?> iface : cls.getInterfaces()) {
-                if (into.add(iface)) {
-                    collectInterfaces(into, iface);
-                }
-            }
-        }
-    }
-
-
-    public static Class<?> classForName(String className) throws ClassNotFoundException {
-        Class<?> result = primitiveClassNameToClass.get(className);
-        if (result == null) {
-            return Class.forName(className);
-        } else {
-            return result;
-        }
-
-    }
-
     public static abstract class TypeBoxer<T> {
         public abstract T get(T result);
     }
@@ -837,7 +555,7 @@ public Short get(Short result) {
                 }
             };
         } else {
-            return (TypeBoxer<T>) new TypeBoxer<Object>() {
+            return new TypeBoxer<>() {
                 @Override
                 public Object get(Object result) {
                     return result;
diff --git a/Util/src/main/resources/io/deephaven/Util.gwt.xml b/Util/src/main/resources/io/deephaven/Util.gwt.xml
new file mode 100644
index 00000000000..0a6e96c6463
--- /dev/null
+++ b/Util/src/main/resources/io/deephaven/Util.gwt.xml
@@ -0,0 +1,10 @@
+<module>
+    <inherits name="io.deephaven.base.Base" />
+    <source path="util" includes="SafeCloseable.java,SimpleTypeMap.java,QueryConstants.java,BooleanUtils.java" />
+    <source path="util/type" includes="ArrayTypeUtils.java,TypeUtils.java" />
+    <source path="util/codec" includes="ObjectDecoder.java" />
+    <source path="util/datastructures" includes="LongAbortableConsumer.java,LongRangeAbortableConsumer.java,LongRangeIterator.java,LongRangeConsumer.java,LongSizedDataStructure.java,SizeException.java,SegmentedSoftPool.java" />
+    <source path="util/mutable" />
+    <source path="util/compare" />
+    <source path="" includes="UncheckedDeephavenException.java" />
+</module>
diff --git a/Util/src/test/java/io/deephaven/util/compare/TestComparisons.java b/Util/src/test/java/io/deephaven/util/compare/TestComparisons.java
index c68c9c38792..e55dca86237 100644
--- a/Util/src/test/java/io/deephaven/util/compare/TestComparisons.java
+++ b/Util/src/test/java/io/deephaven/util/compare/TestComparisons.java
@@ -9,112 +9,581 @@
 
 public class TestComparisons {
 
+    @Test
+    public void testBoolBoolComparisons() {
+        // pairwise full
+        {
+            final boolean[] sorted = new boolean[] {
+                    false,
+                    true
+            };
+            for (int i = 0; i < sorted.length; ++i) {
+                eq(sorted[i], sorted[i]);
+                for (int j = i + 1; j < sorted.length; ++j) {
+                    lt(sorted[i], sorted[j]);
+                }
+            }
+        }
+    }
+
     @Test
     public void testCharCharComparisons() {
-        TestCase.assertTrue(CharComparisons.lt(QueryConstants.NULL_CHAR, 'A'));
-        TestCase.assertTrue(CharComparisons.gt('A', QueryConstants.NULL_CHAR));
-        TestCase.assertTrue(CharComparisons.eq(QueryConstants.NULL_CHAR, QueryConstants.NULL_CHAR));
-        TestCase.assertTrue(CharComparisons.lt('A', 'B'));
-        TestCase.assertFalse(CharComparisons.gt('A', 'B'));
-        TestCase.assertTrue(CharComparisons.eq(QueryConstants.NULL_CHAR, QueryConstants.NULL_CHAR));
-        TestCase.assertFalse(CharComparisons.eq('A', QueryConstants.NULL_CHAR));
+        // pairwise subset
+        {
+            final char[] sorted = new char[] {
+                    QueryConstants.NULL_CHAR,
+                    QueryConstants.MIN_CHAR,
+                    'A',
+                    'B',
+                    QueryConstants.MAX_CHAR
+            };
+            for (int i = 0; i < sorted.length; ++i) {
+                eq(sorted[i], sorted[i]);
+                for (int j = i + 1; j < sorted.length; ++j) {
+                    lt(sorted[i], sorted[j]);
+                }
+            }
+        }
+        // transitive full
+        {
+            char prev = QueryConstants.MIN_CHAR;
+            char next;
+            while ((next = (char) (prev + 1)) != QueryConstants.NULL_CHAR) {
+                lt(QueryConstants.NULL_CHAR, next);
+                lt(prev, next);
+                prev = next;
+            }
+        }
     }
 
     @Test
     public void testByteByteComparisons() {
-        TestCase.assertTrue(ByteComparisons.lt(QueryConstants.NULL_BYTE, (byte) 2));
-        TestCase.assertTrue(ByteComparisons.gt((byte) 2, QueryConstants.NULL_BYTE));
-        TestCase.assertTrue(ByteComparisons.eq(QueryConstants.NULL_BYTE, QueryConstants.NULL_BYTE));
-        TestCase.assertTrue(ByteComparisons.lt((byte) 2, (byte) 3));
-        TestCase.assertFalse(ByteComparisons.gt((byte) 2, (byte) 3));
-        TestCase.assertTrue(ByteComparisons.eq(QueryConstants.NULL_BYTE, QueryConstants.NULL_BYTE));
-        TestCase.assertFalse(ByteComparisons.eq((byte) 2, QueryConstants.NULL_BYTE));
+        // pairwise subset
+        {
+            final byte[] sorted = new byte[] {
+                    QueryConstants.NULL_BYTE,
+                    QueryConstants.MIN_BYTE,
+                    (byte) -1,
+                    (byte) 0,
+                    (byte) 1,
+                    (byte) 42,
+                    QueryConstants.MAX_BYTE
+            };
+            for (int i = 0; i < sorted.length; ++i) {
+                eq(sorted[i], sorted[i]);
+                for (int j = i + 1; j < sorted.length; ++j) {
+                    lt(sorted[i], sorted[j]);
+                }
+            }
+        }
+        // transitive full
+        {
+            byte prev = QueryConstants.NULL_BYTE;
+            byte next;
+            while ((next = (byte) (prev + 1)) != QueryConstants.MAX_BYTE) {
+                lt(QueryConstants.NULL_BYTE, next);
+                lt(prev, next);
+                prev = next;
+            }
+            lt(QueryConstants.NULL_BYTE, next);
+            lt(prev, next);
+        }
     }
 
     @Test
     public void testShortShortComparisons() {
-        TestCase.assertTrue(ShortComparisons.lt(QueryConstants.NULL_SHORT, (short) 2));
-        TestCase.assertTrue(ShortComparisons.gt((short) 2, QueryConstants.NULL_SHORT));
-        TestCase.assertTrue(ShortComparisons.eq(QueryConstants.NULL_SHORT, QueryConstants.NULL_SHORT));
-        TestCase.assertTrue(ShortComparisons.lt((short) 2, (short) 3));
-        TestCase.assertFalse(ShortComparisons.gt((short) 2, (short) 3));
-        TestCase.assertTrue(ShortComparisons.eq(QueryConstants.NULL_SHORT, QueryConstants.NULL_SHORT));
-        TestCase.assertFalse(ShortComparisons.eq((short) 2, QueryConstants.NULL_SHORT));
+        // pairwise subset
+        {
+            final short[] sorted = new short[] {
+                    QueryConstants.NULL_SHORT,
+                    QueryConstants.MIN_SHORT,
+                    (short) -1,
+                    (short) 0,
+                    (short) 1,
+                    (short) 42,
+                    QueryConstants.MAX_SHORT
+            };
+            for (int i = 0; i < sorted.length; ++i) {
+                eq(sorted[i], sorted[i]);
+                for (int j = i + 1; j < sorted.length; ++j) {
+                    lt(sorted[i], sorted[j]);
+                }
+            }
+        }
+        // transitive full
+        {
+            short prev = QueryConstants.NULL_SHORT;
+            short next;
+            while ((next = (short) (prev + 1)) != QueryConstants.MAX_SHORT) {
+                lt(QueryConstants.NULL_SHORT, next);
+                lt(prev, next);
+                prev = next;
+            }
+            lt(QueryConstants.NULL_SHORT, next);
+            lt(prev, next);
+        }
     }
 
     @Test
     public void testIntIntComparisons() {
-        TestCase.assertTrue(IntComparisons.lt(QueryConstants.NULL_INT, (int) 2));
-        TestCase.assertTrue(IntComparisons.gt(2, QueryConstants.NULL_INT));
-        TestCase.assertTrue(IntComparisons.eq(QueryConstants.NULL_INT, QueryConstants.NULL_INT));
-        TestCase.assertTrue(IntComparisons.lt(2, 3));
-        TestCase.assertFalse(IntComparisons.gt(2, 3));
-        TestCase.assertTrue(IntComparisons.eq(QueryConstants.NULL_INT, QueryConstants.NULL_INT));
-        TestCase.assertFalse(IntComparisons.eq(2, QueryConstants.NULL_INT));
+        // pairwise subset
+        {
+            final int[] sorted = new int[] {
+                    QueryConstants.NULL_INT,
+                    QueryConstants.MIN_INT,
+                    -1,
+                    0,
+                    1,
+                    42,
+                    QueryConstants.MAX_INT
+            };
+            for (int i = 0; i < sorted.length; ++i) {
+                eq(sorted[i], sorted[i]);
+                for (int j = i + 1; j < sorted.length; ++j) {
+                    lt(sorted[i], sorted[j]);
+                }
+            }
+        }
+        // transitive full; not too expensive, but probably not worth cost of running every time
+        // {
+        // int prev = QueryConstants.NULL_INT;
+        // int next;
+        // while ((next = prev + 1) != QueryConstants.MAX_INT) {
+        // lt(QueryConstants.NULL_INT, next);
+        // lt(prev, next);
+        // prev = next;
+        // }
+        // lt(QueryConstants.NULL_INT, next);
+        // lt(prev, next);
+        // }
     }
 
     @Test
     public void testLongLongComparisons() {
-        TestCase.assertTrue(LongComparisons.lt(QueryConstants.NULL_LONG, 2));
-        TestCase.assertTrue(LongComparisons.gt(2, QueryConstants.NULL_LONG));
-        TestCase.assertTrue(LongComparisons.eq(QueryConstants.NULL_LONG, QueryConstants.NULL_LONG));
-        TestCase.assertTrue(LongComparisons.lt(2, 3));
-        TestCase.assertFalse(LongComparisons.gt(2, 3));
-        TestCase.assertTrue(LongComparisons.eq(QueryConstants.NULL_LONG, QueryConstants.NULL_LONG));
-        TestCase.assertFalse(LongComparisons.eq(2, QueryConstants.NULL_LONG));
+        // pairwise subset
+        {
+            final long[] sorted = new long[] {
+                    QueryConstants.NULL_LONG,
+                    QueryConstants.MIN_LONG,
+                    -1L,
+                    0L,
+                    1L,
+                    42L,
+                    QueryConstants.MAX_LONG
+            };
+            for (int i = 0; i < sorted.length; ++i) {
+                eq(sorted[i], sorted[i]);
+                for (int j = i + 1; j < sorted.length; ++j) {
+                    lt(sorted[i], sorted[j]);
+                }
+            }
+        }
+        // transitive full too expensive
     }
 
     @Test
     public void testFloatFloatComparisons() {
-        TestCase.assertTrue(FloatComparisons.lt(QueryConstants.NULL_FLOAT, 1.0f));
-        TestCase.assertTrue(FloatComparisons.gt(2.0f, QueryConstants.NULL_FLOAT));
-        TestCase.assertTrue(FloatComparisons.eq(QueryConstants.NULL_FLOAT, QueryConstants.NULL_FLOAT));
-        TestCase.assertTrue(FloatComparisons.lt(2.0f, 100f));
-        TestCase.assertFalse(FloatComparisons.gt(2.0f, 100f));
-        TestCase.assertTrue(FloatComparisons.eq(QueryConstants.NULL_FLOAT, QueryConstants.NULL_FLOAT));
-        TestCase.assertTrue(FloatComparisons.eq(Float.NaN, Float.NaN));
-        TestCase.assertTrue(FloatComparisons.lt(QueryConstants.NULL_FLOAT, Float.NaN));
-        TestCase.assertTrue(FloatComparisons.lt(1, Float.NaN));
-        TestCase.assertTrue(FloatComparisons.eq(Float.NEGATIVE_INFINITY, Float.NEGATIVE_INFINITY));
-        TestCase.assertTrue(FloatComparisons.eq(Float.POSITIVE_INFINITY, Float.POSITIVE_INFINITY));
-        TestCase.assertTrue(FloatComparisons.gt(Float.POSITIVE_INFINITY, 7f));
-        TestCase.assertTrue(FloatComparisons.lt(Float.NEGATIVE_INFINITY, 7f));
-        TestCase.assertTrue(FloatComparisons.lt(7f, Float.POSITIVE_INFINITY));
-        TestCase.assertTrue(FloatComparisons.gt(7f, Float.NEGATIVE_INFINITY));
-        TestCase.assertEquals(0, FloatComparisons.compare(0f, -0.0f));
-        TestCase.assertEquals(0, FloatComparisons.compare(-0.0f, 0.0f));
-        TestCase.assertTrue(FloatComparisons.lt(Float.NEGATIVE_INFINITY, Float.POSITIVE_INFINITY));
-        TestCase.assertTrue(FloatComparisons.gt(Float.POSITIVE_INFINITY, Float.NEGATIVE_INFINITY));
-        TestCase.assertEquals(0, FloatComparisons.compare(Float.POSITIVE_INFINITY, Float.POSITIVE_INFINITY));
-        TestCase.assertEquals(0, FloatComparisons.compare(Float.NEGATIVE_INFINITY, Float.NEGATIVE_INFINITY));
-        TestCase.assertTrue(FloatComparisons.gt(Float.NaN, Float.POSITIVE_INFINITY));
-        TestCase.assertTrue(FloatComparisons.lt(Float.POSITIVE_INFINITY, Float.NaN));
+        // pairwise subset
+        {
+            final float[] sorted = new float[] {
+                    QueryConstants.NULL_FLOAT,
+                    Float.NEGATIVE_INFINITY,
+                    QueryConstants.MIN_FINITE_FLOAT,
+                    -1.0f,
+                    Math.nextDown(0.0f),
+                    0.0f,
+                    Math.nextUp(0.0f),
+                    1.0f,
+                    42.0f,
+                    QueryConstants.MAX_FINITE_FLOAT,
+                    Float.POSITIVE_INFINITY,
+                    Float.NaN
+            };
+            for (int i = 0; i < sorted.length; ++i) {
+                eq(sorted[i], sorted[i]);
+                for (int j = i + 1; j < sorted.length; ++j) {
+                    lt(sorted[i], sorted[j]);
+                }
+            }
+        }
+        // special cases
+        {
+            eq(-0.0f, 0.0f);
+            {
+                // These are the edges of float NaN representations, as documented by intBitsToFloat
+                for (int nanEdge : new int[] {
+                        0x7f800001,
+                        0x7fffffff,
+                        0xff800001,
+                        0xffffffff
+                }) {
+                    final float altNaN = Float.intBitsToFloat(nanEdge);
+                    eq(Float.NaN, altNaN);
+                    lt(QueryConstants.NULL_FLOAT, altNaN);
+                    lt(QueryConstants.MAX_FLOAT, altNaN);
+                }
+            }
+        }
+        // transitive full; expensive, but possible
+        // {
+        // double prev = Math.nextUp(QueryConstants.NULL_FLOAT);
+        // do {
+        // double next = Math.nextUp(prev);
+        // lt(QueryConstants.NULL_FLOAT, next);
+        // lt(prev, next);
+        // prev = next;
+        // } while (prev != Float.POSITIVE_INFINITY);
+        // }
     }
 
     @Test
     public void testDoubleDoubleComparisons() {
-        TestCase.assertTrue(DoubleComparisons.lt(QueryConstants.NULL_DOUBLE, 1.0));
-        TestCase.assertTrue(DoubleComparisons.gt(2.0, QueryConstants.NULL_DOUBLE));
-        TestCase.assertTrue(DoubleComparisons.eq(QueryConstants.NULL_DOUBLE, QueryConstants.NULL_DOUBLE));
-        TestCase.assertTrue(DoubleComparisons.lt(2.0, 100));
-        TestCase.assertFalse(DoubleComparisons.gt(2.0, 100));
-        TestCase.assertTrue(DoubleComparisons.eq(QueryConstants.NULL_DOUBLE, QueryConstants.NULL_DOUBLE));
-        TestCase.assertTrue(DoubleComparisons.eq(Double.NaN, Double.NaN));
-        TestCase.assertTrue(DoubleComparisons.lt(QueryConstants.NULL_DOUBLE, Double.NaN));
-        TestCase.assertTrue(DoubleComparisons.lt(1, Double.NaN));
-        TestCase.assertTrue(DoubleComparisons.eq(Double.NEGATIVE_INFINITY, Double.NEGATIVE_INFINITY));
-        TestCase.assertTrue(DoubleComparisons.eq(Double.POSITIVE_INFINITY, Double.POSITIVE_INFINITY));
-        TestCase.assertTrue(DoubleComparisons.gt(Double.POSITIVE_INFINITY, 7));
-        TestCase.assertTrue(DoubleComparisons.lt(Double.NEGATIVE_INFINITY, 7));
-        TestCase.assertTrue(DoubleComparisons.lt(7, Double.POSITIVE_INFINITY));
-        TestCase.assertTrue(DoubleComparisons.gt(7, Double.NEGATIVE_INFINITY));
-        TestCase.assertEquals(0, DoubleComparisons.compare(0, -0.0));
-        TestCase.assertEquals(0, DoubleComparisons.compare(-0.0, 0.0));
-        TestCase.assertTrue(DoubleComparisons.lt(Double.NEGATIVE_INFINITY, Double.POSITIVE_INFINITY));
-        TestCase.assertTrue(DoubleComparisons.gt(Double.POSITIVE_INFINITY, Double.NEGATIVE_INFINITY));
-        TestCase.assertEquals(0, DoubleComparisons.compare(Double.POSITIVE_INFINITY, Double.POSITIVE_INFINITY));
-        TestCase.assertEquals(0, DoubleComparisons.compare(Double.NEGATIVE_INFINITY, Double.NEGATIVE_INFINITY));
-        TestCase.assertTrue(DoubleComparisons.gt(Double.NaN, Double.POSITIVE_INFINITY));
-        TestCase.assertTrue(DoubleComparisons.lt(Double.POSITIVE_INFINITY, Double.NaN));
+        // pairwise subset
+        {
+            final double[] sorted = new double[] {
+                    QueryConstants.NULL_DOUBLE,
+                    Double.NEGATIVE_INFINITY,
+                    QueryConstants.MIN_FINITE_DOUBLE,
+                    -1.0,
+                    Math.nextDown(0.0),
+                    0.0,
+                    Math.nextUp(0.0),
+                    1.0,
+                    42.0,
+                    QueryConstants.MAX_FINITE_DOUBLE,
+                    Double.POSITIVE_INFINITY,
+                    Double.NaN
+            };
+            for (int i = 0; i < sorted.length; ++i) {
+                eq(sorted[i], sorted[i]);
+                for (int j = i + 1; j < sorted.length; ++j) {
+                    lt(sorted[i], sorted[j]);
+                }
+            }
+        }
+        // special cases
+        {
+            eq(-0.0, 0.0);
+            {
+                // These are the edges of double NaN representations, as documented by longBitsToDouble
+                for (long nanEdge : new long[] {
+                        0x7ff0000000000001L,
+                        0x7fffffffffffffffL,
+                        0xfff0000000000001L,
+                        0xffffffffffffffffL
+                }) {
+                    final double altNaN = Double.longBitsToDouble(nanEdge);
+                    eq(Double.NaN, altNaN);
+                    lt(QueryConstants.NULL_DOUBLE, altNaN);
+                    lt(QueryConstants.MAX_DOUBLE, altNaN);
+                }
+            }
+        }
+        // transitive full too expensive
+    }
+
+    private static void eq(boolean x, boolean y) {
+        // x == y
+        TestCase.assertEquals(0, BooleanComparisons.compare(x, y));
+        TestCase.assertTrue(BooleanComparisons.eq(x, y));
+        TestCase.assertFalse(BooleanComparisons.lt(x, y));
+        TestCase.assertTrue(BooleanComparisons.leq(x, y));
+        TestCase.assertFalse(BooleanComparisons.gt(x, y));
+        TestCase.assertTrue(BooleanComparisons.geq(x, y));
+
+        // y == x
+        TestCase.assertEquals(0, BooleanComparisons.compare(y, x));
+        TestCase.assertTrue(BooleanComparisons.eq(y, x));
+        TestCase.assertFalse(BooleanComparisons.lt(y, x));
+        TestCase.assertTrue(BooleanComparisons.leq(y, x));
+        TestCase.assertFalse(BooleanComparisons.gt(y, x));
+        TestCase.assertTrue(BooleanComparisons.geq(y, x));
+
+        TestCase.assertEquals(BooleanComparisons.hashCode(x), BooleanComparisons.hashCode(y));
+    }
+
+    private static void lt(boolean x, boolean y) {
+        // x < y
+        TestCase.assertTrue(BooleanComparisons.compare(x, y) < 0);
+        TestCase.assertFalse(BooleanComparisons.eq(x, y));
+        TestCase.assertTrue(BooleanComparisons.lt(x, y));
+        TestCase.assertTrue(BooleanComparisons.leq(x, y));
+        TestCase.assertFalse(BooleanComparisons.gt(x, y));
+        TestCase.assertFalse(BooleanComparisons.geq(x, y));
+
+        // y > x
+        TestCase.assertTrue(BooleanComparisons.compare(y, x) > 0);
+        TestCase.assertFalse(BooleanComparisons.eq(y, x));
+        TestCase.assertFalse(BooleanComparisons.lt(y, x));
+        TestCase.assertFalse(BooleanComparisons.leq(y, x));
+        TestCase.assertTrue(BooleanComparisons.gt(y, x));
+        TestCase.assertTrue(BooleanComparisons.geq(y, x));
+    }
+
+
+    private static void eq(char x, char y) {
+        // x == y
+        TestCase.assertEquals(0, CharComparisons.compare(x, y));
+        TestCase.assertTrue(CharComparisons.eq(x, y));
+        TestCase.assertFalse(CharComparisons.lt(x, y));
+        TestCase.assertTrue(CharComparisons.leq(x, y));
+        TestCase.assertFalse(CharComparisons.gt(x, y));
+        TestCase.assertTrue(CharComparisons.geq(x, y));
+
+        // y == x
+        TestCase.assertEquals(0, CharComparisons.compare(y, x));
+        TestCase.assertTrue(CharComparisons.eq(y, x));
+        TestCase.assertFalse(CharComparisons.lt(y, x));
+        TestCase.assertTrue(CharComparisons.leq(y, x));
+        TestCase.assertFalse(CharComparisons.gt(y, x));
+        TestCase.assertTrue(CharComparisons.geq(y, x));
+
+        TestCase.assertEquals(CharComparisons.hashCode(x), CharComparisons.hashCode(y));
+    }
+
+    private static void lt(char x, char y) {
+        // x < y
+        TestCase.assertTrue(CharComparisons.compare(x, y) < 0);
+        TestCase.assertFalse(CharComparisons.eq(x, y));
+        TestCase.assertTrue(CharComparisons.lt(x, y));
+        TestCase.assertTrue(CharComparisons.leq(x, y));
+        TestCase.assertFalse(CharComparisons.gt(x, y));
+        TestCase.assertFalse(CharComparisons.geq(x, y));
+
+        // y > x
+        TestCase.assertTrue(CharComparisons.compare(y, x) > 0);
+        TestCase.assertFalse(CharComparisons.eq(y, x));
+        TestCase.assertFalse(CharComparisons.lt(y, x));
+        TestCase.assertFalse(CharComparisons.leq(y, x));
+        TestCase.assertTrue(CharComparisons.gt(y, x));
+        TestCase.assertTrue(CharComparisons.geq(y, x));
+    }
+
+    private static void eq(byte x, byte y) {
+        // x == y
+        TestCase.assertEquals(0, ByteComparisons.compare(x, y));
+        TestCase.assertTrue(ByteComparisons.eq(x, y));
+        TestCase.assertFalse(ByteComparisons.lt(x, y));
+        TestCase.assertTrue(ByteComparisons.leq(x, y));
+        TestCase.assertFalse(ByteComparisons.gt(x, y));
+        TestCase.assertTrue(ByteComparisons.geq(x, y));
+
+        // y == x
+        TestCase.assertEquals(0, ByteComparisons.compare(y, x));
+        TestCase.assertTrue(ByteComparisons.eq(y, x));
+        TestCase.assertFalse(ByteComparisons.lt(y, x));
+        TestCase.assertTrue(ByteComparisons.leq(y, x));
+        TestCase.assertFalse(ByteComparisons.gt(y, x));
+        TestCase.assertTrue(ByteComparisons.geq(y, x));
+
+        TestCase.assertEquals(ByteComparisons.hashCode(x), ByteComparisons.hashCode(y));
+    }
+
+    private static void lt(byte x, byte y) {
+        // x < y
+        TestCase.assertTrue(ByteComparisons.compare(x, y) < 0);
+        TestCase.assertFalse(ByteComparisons.eq(x, y));
+        TestCase.assertTrue(ByteComparisons.lt(x, y));
+        TestCase.assertTrue(ByteComparisons.leq(x, y));
+        TestCase.assertFalse(ByteComparisons.gt(x, y));
+        TestCase.assertFalse(ByteComparisons.geq(x, y));
+
+        // y > x
+        TestCase.assertTrue(ByteComparisons.compare(y, x) > 0);
+        TestCase.assertFalse(ByteComparisons.eq(y, x));
+        TestCase.assertFalse(ByteComparisons.lt(y, x));
+        TestCase.assertFalse(ByteComparisons.leq(y, x));
+        TestCase.assertTrue(ByteComparisons.gt(y, x));
+        TestCase.assertTrue(ByteComparisons.geq(y, x));
+    }
+
+    private static void eq(short x, short y) {
+        // x == y
+        TestCase.assertEquals(0, ShortComparisons.compare(x, y));
+        TestCase.assertTrue(ShortComparisons.eq(x, y));
+        TestCase.assertFalse(ShortComparisons.lt(x, y));
+        TestCase.assertTrue(ShortComparisons.leq(x, y));
+        TestCase.assertFalse(ShortComparisons.gt(x, y));
+        TestCase.assertTrue(ShortComparisons.geq(x, y));
+
+        // y == x
+        TestCase.assertEquals(0, ShortComparisons.compare(y, x));
+        TestCase.assertTrue(ShortComparisons.eq(y, x));
+        TestCase.assertFalse(ShortComparisons.lt(y, x));
+        TestCase.assertTrue(ShortComparisons.leq(y, x));
+        TestCase.assertFalse(ShortComparisons.gt(y, x));
+        TestCase.assertTrue(ShortComparisons.geq(y, x));
+
+        TestCase.assertEquals(ShortComparisons.hashCode(x), ShortComparisons.hashCode(y));
+    }
+
+    private static void lt(short x, short y) {
+        // x < y
+        TestCase.assertTrue(ShortComparisons.compare(x, y) < 0);
+        TestCase.assertFalse(ShortComparisons.eq(x, y));
+        TestCase.assertTrue(ShortComparisons.lt(x, y));
+        TestCase.assertTrue(ShortComparisons.leq(x, y));
+        TestCase.assertFalse(ShortComparisons.gt(x, y));
+        TestCase.assertFalse(ShortComparisons.geq(x, y));
+
+        // y > x
+        TestCase.assertTrue(ShortComparisons.compare(y, x) > 0);
+        TestCase.assertFalse(ShortComparisons.eq(y, x));
+        TestCase.assertFalse(ShortComparisons.lt(y, x));
+        TestCase.assertFalse(ShortComparisons.leq(y, x));
+        TestCase.assertTrue(ShortComparisons.gt(y, x));
+        TestCase.assertTrue(ShortComparisons.geq(y, x));
+    }
+
+    private static void eq(int x, int y) {
+        // x == y
+        TestCase.assertEquals(0, IntComparisons.compare(x, y));
+        TestCase.assertTrue(IntComparisons.eq(x, y));
+        TestCase.assertFalse(IntComparisons.lt(x, y));
+        TestCase.assertTrue(IntComparisons.leq(x, y));
+        TestCase.assertFalse(IntComparisons.gt(x, y));
+        TestCase.assertTrue(IntComparisons.geq(x, y));
+
+        // y == x
+        TestCase.assertEquals(0, IntComparisons.compare(y, x));
+        TestCase.assertTrue(IntComparisons.eq(y, x));
+        TestCase.assertFalse(IntComparisons.lt(y, x));
+        TestCase.assertTrue(IntComparisons.leq(y, x));
+        TestCase.assertFalse(IntComparisons.gt(y, x));
+        TestCase.assertTrue(IntComparisons.geq(y, x));
+
+        TestCase.assertEquals(IntComparisons.hashCode(x), IntComparisons.hashCode(y));
+    }
+
+    private static void lt(int x, int y) {
+        // x < y
+        TestCase.assertTrue(IntComparisons.compare(x, y) < 0);
+        TestCase.assertFalse(IntComparisons.eq(x, y));
+        TestCase.assertTrue(IntComparisons.lt(x, y));
+        TestCase.assertTrue(IntComparisons.leq(x, y));
+        TestCase.assertFalse(IntComparisons.gt(x, y));
+        TestCase.assertFalse(IntComparisons.geq(x, y));
+
+        // y > x
+        TestCase.assertTrue(IntComparisons.compare(y, x) > 0);
+        TestCase.assertFalse(IntComparisons.eq(y, x));
+        TestCase.assertFalse(IntComparisons.lt(y, x));
+        TestCase.assertFalse(IntComparisons.leq(y, x));
+        TestCase.assertTrue(IntComparisons.gt(y, x));
+        TestCase.assertTrue(IntComparisons.geq(y, x));
+    }
+
+    private static void eq(long x, long y) {
+        // x == y
+        TestCase.assertEquals(0, LongComparisons.compare(x, y));
+        TestCase.assertTrue(LongComparisons.eq(x, y));
+        TestCase.assertFalse(LongComparisons.lt(x, y));
+        TestCase.assertTrue(LongComparisons.leq(x, y));
+        TestCase.assertFalse(LongComparisons.gt(x, y));
+        TestCase.assertTrue(LongComparisons.geq(x, y));
+
+        // y == x
+        TestCase.assertEquals(0, LongComparisons.compare(y, x));
+        TestCase.assertTrue(LongComparisons.eq(y, x));
+        TestCase.assertFalse(LongComparisons.lt(y, x));
+        TestCase.assertTrue(LongComparisons.leq(y, x));
+        TestCase.assertFalse(LongComparisons.gt(y, x));
+        TestCase.assertTrue(LongComparisons.geq(y, x));
+
+        TestCase.assertEquals(LongComparisons.hashCode(x), LongComparisons.hashCode(y));
+    }
+
+    private static void lt(long x, long y) {
+        // x < y
+        TestCase.assertTrue(LongComparisons.compare(x, y) < 0);
+        TestCase.assertFalse(LongComparisons.eq(x, y));
+        TestCase.assertTrue(LongComparisons.lt(x, y));
+        TestCase.assertTrue(LongComparisons.leq(x, y));
+        TestCase.assertFalse(LongComparisons.gt(x, y));
+        TestCase.assertFalse(LongComparisons.geq(x, y));
+
+        // y > x
+        TestCase.assertTrue(LongComparisons.compare(y, x) > 0);
+        TestCase.assertFalse(LongComparisons.eq(y, x));
+        TestCase.assertFalse(LongComparisons.lt(y, x));
+        TestCase.assertFalse(LongComparisons.leq(y, x));
+        TestCase.assertTrue(LongComparisons.gt(y, x));
+        TestCase.assertTrue(LongComparisons.geq(y, x));
+    }
+
+    private static void eq(float x, float y) {
+        // x == y
+        TestCase.assertEquals(0, FloatComparisons.compare(x, y));
+        TestCase.assertTrue(FloatComparisons.eq(x, y));
+        TestCase.assertFalse(FloatComparisons.lt(x, y));
+        TestCase.assertTrue(FloatComparisons.leq(x, y));
+        TestCase.assertFalse(FloatComparisons.gt(x, y));
+        TestCase.assertTrue(FloatComparisons.geq(x, y));
+
+        // y == x
+        TestCase.assertEquals(0, FloatComparisons.compare(y, x));
+        TestCase.assertTrue(FloatComparisons.eq(y, x));
+        TestCase.assertFalse(FloatComparisons.lt(y, x));
+        TestCase.assertTrue(FloatComparisons.leq(y, x));
+        TestCase.assertFalse(FloatComparisons.gt(y, x));
+        TestCase.assertTrue(FloatComparisons.geq(y, x));
+
+        TestCase.assertEquals(FloatComparisons.hashCode(x), FloatComparisons.hashCode(y));
+    }
+
+    private static void lt(float x, float y) {
+        // x < y
+        TestCase.assertTrue(FloatComparisons.compare(x, y) < 0);
+        TestCase.assertFalse(FloatComparisons.eq(x, y));
+        TestCase.assertTrue(FloatComparisons.lt(x, y));
+        TestCase.assertTrue(FloatComparisons.leq(x, y));
+        TestCase.assertFalse(FloatComparisons.gt(x, y));
+        TestCase.assertFalse(FloatComparisons.geq(x, y));
+
+        // y > x
+        TestCase.assertTrue(FloatComparisons.compare(y, x) > 0);
+        TestCase.assertFalse(FloatComparisons.eq(y, x));
+        TestCase.assertFalse(FloatComparisons.lt(y, x));
+        TestCase.assertFalse(FloatComparisons.leq(y, x));
+        TestCase.assertTrue(FloatComparisons.gt(y, x));
+        TestCase.assertTrue(FloatComparisons.geq(y, x));
+    }
+
+    private static void eq(double x, double y) {
+        // x == y
+        TestCase.assertEquals(0, DoubleComparisons.compare(x, y));
+        TestCase.assertTrue(DoubleComparisons.eq(x, y));
+        TestCase.assertFalse(DoubleComparisons.lt(x, y));
+        TestCase.assertTrue(DoubleComparisons.leq(x, y));
+        TestCase.assertFalse(DoubleComparisons.gt(x, y));
+        TestCase.assertTrue(DoubleComparisons.geq(x, y));
+
+        // y == x
+        TestCase.assertEquals(0, DoubleComparisons.compare(y, x));
+        TestCase.assertTrue(DoubleComparisons.eq(y, x));
+        TestCase.assertFalse(DoubleComparisons.lt(y, x));
+        TestCase.assertTrue(DoubleComparisons.leq(y, x));
+        TestCase.assertFalse(DoubleComparisons.gt(y, x));
+        TestCase.assertTrue(DoubleComparisons.geq(y, x));
+
+        TestCase.assertEquals(DoubleComparisons.hashCode(x), DoubleComparisons.hashCode(y));
+    }
+
+    private static void lt(double x, double y) {
+        // x < y
+        TestCase.assertTrue(DoubleComparisons.compare(x, y) < 0);
+        TestCase.assertFalse(DoubleComparisons.eq(x, y));
+        TestCase.assertTrue(DoubleComparisons.lt(x, y));
+        TestCase.assertTrue(DoubleComparisons.leq(x, y));
+        TestCase.assertFalse(DoubleComparisons.gt(x, y));
+        TestCase.assertFalse(DoubleComparisons.geq(x, y));
+
+        // y > x
+        TestCase.assertTrue(DoubleComparisons.compare(y, x) > 0);
+        TestCase.assertFalse(DoubleComparisons.eq(y, x));
+        TestCase.assertFalse(DoubleComparisons.lt(y, x));
+        TestCase.assertFalse(DoubleComparisons.leq(y, x));
+        TestCase.assertTrue(DoubleComparisons.gt(y, x));
+        TestCase.assertTrue(DoubleComparisons.geq(y, x));
     }
 }
diff --git a/Util/src/test/java/io/deephaven/util/files/TestDirWatchService.java b/Util/src/test/java/io/deephaven/util/files/TestDirWatchService.java
index 32bea6155b1..404f9d09192 100644
--- a/Util/src/test/java/io/deephaven/util/files/TestDirWatchService.java
+++ b/Util/src/test/java/io/deephaven/util/files/TestDirWatchService.java
@@ -15,7 +15,6 @@
 import java.util.function.BooleanSupplier;
 import java.util.stream.Collectors;
 
-import static io.deephaven.datastructures.util.CollectionUtil.ZERO_LENGTH_STRING_ARRAY;
 import static java.nio.file.StandardWatchEventKinds.ENTRY_CREATE;
 import static java.nio.file.StandardWatchEventKinds.ENTRY_DELETE;
 import static java.nio.file.StandardWatchEventKinds.ENTRY_MODIFY;
@@ -122,7 +121,7 @@ public void testBasicFilesJavaFileWatch() throws Exception {
             assertEquals(8, addedFiles.size());
             assertEquals(0, deletedFiles.size());
             assertEquals(0, modifiedFiles.size());
-            final String[] foundFiles = addedFiles.toArray(ZERO_LENGTH_STRING_ARRAY);
+            final String[] foundFiles = addedFiles.toArray(String[]::new);
             Arrays.sort(foundFiles);
             assertEquals(expectedResults, foundFiles);
         }
@@ -145,7 +144,7 @@ public void testBasicFilesJavaFileWatch() throws Exception {
             assertEquals(8, addedFiles.size());
             assertEquals(0, deletedFiles.size());
             assertEquals(8, modifiedFiles.size());
-            final String[] updatedFiles = modifiedFiles.toArray(ZERO_LENGTH_STRING_ARRAY);
+            final String[] updatedFiles = modifiedFiles.toArray(String[]::new);
             Arrays.sort(updatedFiles);
             assertEquals(expectedResults, updatedFiles);
         }
@@ -168,7 +167,7 @@ public void testBasicFilesJavaFileWatch() throws Exception {
             assertEquals(8, addedFiles.size());
             assertEquals(8, deletedFiles.size());
             assertEquals(8, modifiedFiles.size());
-            final String[] removedFiles = deletedFiles.toArray(ZERO_LENGTH_STRING_ARRAY);
+            final String[] removedFiles = deletedFiles.toArray(String[]::new);
             Arrays.sort(removedFiles);
             assertEquals(expectedResults, removedFiles);
         }
@@ -219,7 +218,7 @@ public void testBasicFilesPollFileWatch() throws Exception {
             assertEquals(6, addedFiles.size());
             assertEquals(0, deletedFiles.size());
             assertEquals(0, modifiedFiles.size());
-            final String[] foundFiles = addedFiles.toArray(ZERO_LENGTH_STRING_ARRAY);
+            final String[] foundFiles = addedFiles.toArray(String[]::new);
             Arrays.sort(foundFiles);
             assertEquals(expectedResults, foundFiles);
         }
@@ -244,7 +243,7 @@ public void testBasicFilesPollFileWatch() throws Exception {
             assertEquals(6, addedFiles.size());
             assertEquals(0, deletedFiles.size());
             assertEquals(6, modifiedFiles.size());
-            final String[] updatedFiles = modifiedFiles.toArray(ZERO_LENGTH_STRING_ARRAY);
+            final String[] updatedFiles = modifiedFiles.toArray(String[]::new);
             Arrays.sort(updatedFiles);
             assertEquals(expectedResults, updatedFiles);
         }
diff --git a/Util/src/test/java/io/deephaven/util/reference/CleanupReferenceProcessorTest.java b/Util/src/test/java/io/deephaven/util/reference/CleanupReferenceProcessorTest.java
new file mode 100644
index 00000000000..71711ea4bde
--- /dev/null
+++ b/Util/src/test/java/io/deephaven/util/reference/CleanupReferenceProcessorTest.java
@@ -0,0 +1,48 @@
+//
+// Copyright (c) 2016-2024 Deephaven Data Labs and Patent Pending
+//
+package io.deephaven.util.reference;
+
+import org.junit.Ignore;
+import org.junit.Test;
+
+import java.util.concurrent.CountDownLatch;
+import java.util.concurrent.TimeUnit;
+import java.util.concurrent.TimeoutException;
+import java.util.function.BiFunction;
+
+public class CleanupReferenceProcessorTest {
+
+    @Test
+    public void registerPhantom() throws InterruptedException, TimeoutException {
+        register(CleanupReferenceProcessor.getDefault()::registerPhantom);
+    }
+
+    @Test
+    public void registerWeak() throws InterruptedException, TimeoutException {
+        register(CleanupReferenceProcessor.getDefault()::registerWeak);
+    }
+
+    @Ignore("Soft references are harder to test, as they are cleared out at the discretion of the garbage collector based on memory pressure")
+    @Test
+    public void registerSoft() throws InterruptedException, TimeoutException {
+        register(CleanupReferenceProcessor.getDefault()::registerSoft);
+    }
+
+    private static void register(BiFunction<Object, Runnable, ?> bf) throws InterruptedException, TimeoutException {
+        final CountDownLatch latch = new CountDownLatch(1);
+        {
+            final Object obj = new Object();
+            bf.apply(obj, latch::countDown);
+        }
+        for (int i = 0; i < 20; ++i) {
+            System.gc();
+            if (latch.await(100, TimeUnit.MILLISECONDS)) {
+                break;
+            }
+        }
+        if (latch.getCount() != 0) {
+            throw new TimeoutException();
+        }
+    }
+}
diff --git a/Util/thread/build.gradle b/Util/thread/build.gradle
new file mode 100644
index 00000000000..ac43e2ca77b
--- /dev/null
+++ b/Util/thread/build.gradle
@@ -0,0 +1,15 @@
+plugins {
+    id 'java-library'
+    id 'io.deephaven.project.register'
+}
+
+description 'util-thread: Deephaven utilities for threading and thread dumps'
+
+dependencies {
+    api project(':IO')
+
+    implementation project(':Configuration')
+    implementation project(':log-factory')
+
+    compileOnly libs.jetbrains.annotations
+}
diff --git a/Util/thread/gradle.properties b/Util/thread/gradle.properties
new file mode 100644
index 00000000000..9e8588f2620
--- /dev/null
+++ b/Util/thread/gradle.properties
@@ -0,0 +1,2 @@
+io.deephaven.project.ProjectType=JAVA_PUBLIC
+languageLevel=8
diff --git a/Util/src/main/java/io/deephaven/util/thread/NamingThreadFactory.java b/Util/thread/src/main/java/io/deephaven/util/thread/NamingThreadFactory.java
similarity index 100%
rename from Util/src/main/java/io/deephaven/util/thread/NamingThreadFactory.java
rename to Util/thread/src/main/java/io/deephaven/util/thread/NamingThreadFactory.java
diff --git a/Util/src/main/java/io/deephaven/util/thread/ThreadDump.java b/Util/thread/src/main/java/io/deephaven/util/thread/ThreadDump.java
similarity index 100%
rename from Util/src/main/java/io/deephaven/util/thread/ThreadDump.java
rename to Util/thread/src/main/java/io/deephaven/util/thread/ThreadDump.java
diff --git a/Util/src/main/java/io/deephaven/util/thread/ThreadHelpers.java b/Util/thread/src/main/java/io/deephaven/util/thread/ThreadHelpers.java
similarity index 100%
rename from Util/src/main/java/io/deephaven/util/thread/ThreadHelpers.java
rename to Util/thread/src/main/java/io/deephaven/util/thread/ThreadHelpers.java
diff --git a/Util/src/main/java/io/deephaven/util/thread/ThreadInitializationFactory.java b/Util/thread/src/main/java/io/deephaven/util/thread/ThreadInitializationFactory.java
similarity index 100%
rename from Util/src/main/java/io/deephaven/util/thread/ThreadInitializationFactory.java
rename to Util/thread/src/main/java/io/deephaven/util/thread/ThreadInitializationFactory.java
diff --git a/application-mode/build.gradle b/application-mode/build.gradle
index 5a5b7827e61..8eb16c34d6c 100644
--- a/application-mode/build.gradle
+++ b/application-mode/build.gradle
@@ -6,18 +6,19 @@ plugins {
 dependencies {
     implementation project(':Integrations')
 
-    Classpaths.inheritImmutables(project)
+    compileOnly project(':util-immutables')
+    annotationProcessor libs.immutables.value
 
     // we'll rely on the engine-table module to provide the necessary groovy dependencies
-    Classpaths.inheritGroovy(project, 'groovy', 'compileOnly')
+    compileOnly libs.groovy
 
     api project(':proto:proto-backplane-grpc')
 
     implementation project(':Configuration')
 
-    Classpaths.inheritJUnitPlatform(project)
-    Classpaths.inheritAssertJ(project)
-    testImplementation 'org.junit.jupiter:junit-jupiter'
+    testImplementation libs.assertj
+    testImplementation platform(libs.junit.bom)
+    testImplementation libs.junit.jupiter
 }
 
 test {
diff --git a/authentication/build.gradle b/authentication/build.gradle
index ec74687be4d..19ec9e69f73 100644
--- a/authentication/build.gradle
+++ b/authentication/build.gradle
@@ -10,5 +10,5 @@ dependencies {
     implementation project(':log-factory')
     implementation project(':Configuration')
 
-    Classpaths.inheritArrow(project, 'flight-core', 'implementation')
+    implementation libs.arrow.flight.core
 }
diff --git a/authentication/example-providers/README.md b/authentication/example-providers/README.md
index 8a640bd829b..69a9bf6e9d7 100644
--- a/authentication/example-providers/README.md
+++ b/authentication/example-providers/README.md
@@ -1,23 +1,27 @@
 This directory contains several example authentication providers, which can be added to a deephaven-core classpath
-and configured to authenticate the user. 
+and configured to authenticate the user.
 
 As these are only examples and not intended to replace actual integrations, they may have some limitations in how
 they can be configured and deployed, but also are built as a single `.jar` file with no external dependencies or
 conflicts to manage.
 
 ### [Pre-Shared Key](psk)
+
 Allows a key (and user details) to be set via configuration, or a fresh one will be configured on startup. The login
-link and details will be logged on startup. 
+link and details will be logged on startup.
+
+### [Mutual TLS (mTLS)](mtls)
 
-### [Mutual TLS (mTLS)](mTLS)
 With a Mutual-TLS certificate on the client signed by an appropriate trusted Certificate Authority, the user's details
 can be read from the certificate and used on the server.
 
 ### [Simple PostgreSQL username/password](sql-username-password)
+
 Assumes a PostgreSQL database will be running (and JDBC connection string provided in configuration) with a table
 for users and their credentials, along with a table for allowed roles.
 
 ### [OpenID Connect via Keycloak](oidc)
+
 Delegates authentication to an OpenID Connect server (in this example using [Keycloak](https://keycloak.org/)), with
 the client first redirecting the user to authenticate and obtain a token, and the client validating that token for use
 in Deephaven.
diff --git a/authentication/example-providers/oidc/build.gradle b/authentication/example-providers/oidc/build.gradle
index 330637cb5fd..ca3ca0da322 100644
--- a/authentication/example-providers/oidc/build.gradle
+++ b/authentication/example-providers/oidc/build.gradle
@@ -1,4 +1,4 @@
 dependencies {
-    implementation 'org.pac4j:pac4j-oidc:5.7.0'
-    implementation 'org.pac4j:pac4j-http:5.7.0'
+    implementation libs.pac4j.oidc
+    implementation libs.pac4j.http
 }
\ No newline at end of file
diff --git a/authentication/example-providers/sql-username-password/build.gradle b/authentication/example-providers/sql-username-password/build.gradle
index e906792865e..09e844fced9 100644
--- a/authentication/example-providers/sql-username-password/build.gradle
+++ b/authentication/example-providers/sql-username-password/build.gradle
@@ -3,15 +3,15 @@ configurations {
     pwGen
 }
 dependencies {
-    implementation('org.postgresql:postgresql:42.7.1') {
+    implementation(libs.postgresql) {
         because 'Postgres driver to connect to a running DB to query for user information'
     }
-    implementation('org.mindrot:jbcrypt:0.4') {
+    implementation(libs.mindrot.jbcrypt) {
         because 'bcrypt is used in this example to ensure passwords are never stored or queried in plain text'
     }
 
     pwGen project(':log-to-stream')
-    Classpaths.inheritLogbackClassic(project, 'pwGen')
+    pwGen libs.logback.classic
 }
 
 shadowJar {
diff --git a/authorization-codegen/build.gradle b/authorization-codegen/build.gradle
index bb0e04b8234..5a06906fa89 100644
--- a/authorization-codegen/build.gradle
+++ b/authorization-codegen/build.gradle
@@ -10,8 +10,8 @@ description 'Deephaven Authorization Code Generator'
 dependencies {
     implementation project(':engine-api')
 
-    Classpaths.inheritGrpcPlatform(project, 'implementation')
-    implementation 'io.grpc:grpc-services'
+    implementation platform(libs.grpc.bom)
+    implementation libs.grpc.services
 
-    implementation 'com.squareup:javapoet:1.13.0'
+    implementation libs.squareup.javapoet
 }
diff --git a/authorization/README.md b/authorization/README.md
index a7c73aa748a..55755685829 100644
--- a/authorization/README.md
+++ b/authorization/README.md
@@ -56,4 +56,6 @@ DEEPHAVEN_VERSION=${DEEPHAVEN_VERSION}  PATH=authorization-codegen:$PATH protoc
      $ROOT_DIR/health.proto
 
 ./gradlew :authorization:spotlessApply
-```
\ No newline at end of file
+```
+
+For protoc versions 3.12.x - 3.14.x, the `--experimental_allow_proto3_optional` flag is needed.
diff --git a/authorization/build.gradle b/authorization/build.gradle
index 73880c041ec..6fddc8f4fec 100644
--- a/authorization/build.gradle
+++ b/authorization/build.gradle
@@ -9,9 +9,9 @@ dependencies {
     api project(':engine-api')
     api project(':proto:proto-backplane-grpc')
 
-    Classpaths.inheritGrpcPlatform(project, 'api')
-    api 'io.grpc:grpc-services'
-    Classpaths.inheritArrow(project, 'flight-core', 'api')
+    api platform(libs.grpc.bom)
+    api libs.grpc.services
+    api libs.arrow.flight.core
 
     implementation project(':log-factory')
 }
diff --git a/authorization/src/main/java/io/deephaven/auth/codegen/impl/TableServiceContextualAuthWiring.java b/authorization/src/main/java/io/deephaven/auth/codegen/impl/TableServiceContextualAuthWiring.java
index 9c86653d1f5..eea4999c8dd 100644
--- a/authorization/src/main/java/io/deephaven/auth/codegen/impl/TableServiceContextualAuthWiring.java
+++ b/authorization/src/main/java/io/deephaven/auth/codegen/impl/TableServiceContextualAuthWiring.java
@@ -34,6 +34,7 @@
 import io.deephaven.proto.backplane.grpc.SeekRowRequest;
 import io.deephaven.proto.backplane.grpc.SelectDistinctRequest;
 import io.deephaven.proto.backplane.grpc.SelectOrUpdateRequest;
+import io.deephaven.proto.backplane.grpc.SliceRequest;
 import io.deephaven.proto.backplane.grpc.SnapshotTableRequest;
 import io.deephaven.proto.backplane.grpc.SnapshotWhenTableRequest;
 import io.deephaven.proto.backplane.grpc.SortTableRequest;
@@ -534,6 +535,17 @@ void checkPermissionMetaTable(AuthContext authContext, MetaTableRequest request,
     void checkPermissionComputeColumnStatistics(AuthContext authContext,
             ColumnStatisticsRequest request, List<Table> sourceTables);
 
+    /**
+     * Authorize a request to Slice.
+     *
+     * @param authContext the authentication context of the request
+     * @param request the request to authorize
+     * @param sourceTables the operation's source tables
+     * @throws io.grpc.StatusRuntimeException if the user is not authorized to invoke Slice
+     */
+    void checkPermissionSlice(AuthContext authContext, SliceRequest request,
+            List<Table> sourceTables);
+
     /**
      * A default implementation that funnels all requests to invoke {@code checkPermission}.
      */
@@ -759,6 +771,11 @@ public void checkPermissionComputeColumnStatistics(AuthContext authContext,
                 ColumnStatisticsRequest request, List<Table> sourceTables) {
             checkPermission(authContext, sourceTables);
         }
+
+        public void checkPermissionSlice(AuthContext authContext, SliceRequest request,
+                List<Table> sourceTables) {
+            checkPermission(authContext, sourceTables);
+        }
     }
 
     /**
@@ -1089,5 +1106,12 @@ public void checkPermissionComputeColumnStatistics(AuthContext authContext,
                 delegate.checkPermissionComputeColumnStatistics(authContext, request, sourceTables);
             }
         }
+
+        public void checkPermissionSlice(AuthContext authContext, SliceRequest request,
+                List<Table> sourceTables) {
+            if (delegate != null) {
+                delegate.checkPermissionSlice(authContext, request, sourceTables);
+            }
+        }
     }
 }
diff --git a/base-test-utils/build.gradle b/base-test-utils/build.gradle
index e389b8a4e61..62d09ff511b 100644
--- a/base-test-utils/build.gradle
+++ b/base-test-utils/build.gradle
@@ -6,12 +6,13 @@ plugins {
 dependencies {
 
     implementation project(':Base')
-    implementation depTrove3
-    compileOnlyApi depAnnotations
-    implementation depCommonsLang3
+    implementation libs.trove
+    compileOnlyApi libs.jetbrains.annotations
+    implementation libs.commons.lang3
 
-    api 'io.deephaven:hash:0.1.0'
+    api libs.deephaven.hash
 
-    Classpaths.inheritJUnitClassic(project, 'api')
-    Classpaths.inheritJMock(project, 'api')
+    api libs.junit4
+    api libs.jmock.junit4
+    api libs.jmock.imposters
 }
diff --git a/buildSrc/build.gradle b/buildSrc/build.gradle
index a413615a03c..a57a1b78856 100644
--- a/buildSrc/build.gradle
+++ b/buildSrc/build.gradle
@@ -26,11 +26,11 @@ dependencies {
         because('needed by plugin com.bmuschko.docker-remote-api')
     }
 
-    implementation('com.avast.gradle:gradle-docker-compose-plugin:0.17.6') {
+    implementation('com.avast.gradle:gradle-docker-compose-plugin:0.17.12') {
         because('needed by plugin com.avast.gradle.docker-compose')
     }
 
-    implementation('com.diffplug.spotless:spotless-plugin-gradle:6.18.0') {
+    implementation('com.diffplug.spotless:spotless-plugin-gradle:6.25.0') {
         because('needed by plugin java-coding-conventions')
     }
 
diff --git a/buildSrc/src/main/groovy/Classpaths.groovy b/buildSrc/src/main/groovy/Classpaths.groovy
deleted file mode 100644
index df2877db0f0..00000000000
--- a/buildSrc/src/main/groovy/Classpaths.groovy
+++ /dev/null
@@ -1,359 +0,0 @@
-import groovy.transform.CompileStatic
-import org.gradle.api.Action
-import org.gradle.api.Project
-import org.gradle.api.artifacts.Configuration
-import org.gradle.api.artifacts.Dependency
-import org.gradle.api.internal.artifacts.dependencies.DefaultExternalModuleDependency
-import org.gradle.api.plugins.JavaPlugin
-import org.gradle.internal.Actions
-
-/**
- * A centralized utility for adding classpaths to projects.
- *
- * This is the most efficient way to standardize dependencies,
- * as it does not add any unnecessary configurations "just in case we need them"
- * (i.e. what was done in the original gradle refactor).
- *
- * To use:
- * Classpaths.inheritSomething(project)
- */
-@CompileStatic
-class Classpaths {
-
-    static final String ELEMENTAL_GROUP = 'com.google.elemental2'
-    static final String ELEMENTAL_VERSION = '1.2.1'
-
-    static final String GWT_GROUP = 'org.gwtproject'
-    static final String GWT_VERSION = '2.11.0'
-
-    static final String JAVA_PARSER_GROUP = 'com.github.javaparser'
-    static final String JAVA_PARSER_NAME = 'javaparser-core'
-    static final String JAVA_PARSER_VERSION = '3.23.0'
-    // TODO (core#1163): take advantage of symbol-solver-core
-//    static final String JAVA_PARSER_NAME = 'javaparser-symbol-solver-core'
-
-    static final String JAVAX_ANNOTATIONS_GROUP = 'javax.validation'
-    static final String JAVAX_ANNOTATIONS_NAME = 'validation-api'
-    static final String JAVAX_ANNOTATIONS_VERSION = '1.0.0.GA'
-
-    static final String JETTY_VERSION = '9.4.44.v20210927'
-
-    static final String JS_INTEROP_GROUP = 'com.google.jsinterop'
-    static final String JS_INTEROP_VERSION = '2.0.2'
-
-    static final String COMMONS_GROUP = 'org.apache.commons'
-
-    static final String ARROW_GROUP = 'org.apache.arrow'
-    static final String ARROW_VERSION = '13.0.0'
-
-    static final String SLF4J_GROUP = 'org.slf4j'
-    static final String SLF4J_VERSION = '2.0.11'
-
-    static final String FLATBUFFER_GROUP = 'com.google.flatbuffers'
-    static final String FLATBUFFER_NAME = 'flatbuffers-java'
-    static final String FLATBUFFER_VERSION = '1.12.0'
-
-    static final String DAGGER_GROUP = 'com.google.dagger'
-    static final String DAGGER_NAME = 'dagger'
-    static final String DAGGER_COMPILER = 'dagger-compiler'
-    static final String DAGGER_VERSION = '2.44'
-
-    static final String AUTOSERVICE_GROUP = 'com.google.auto.service'
-    static final String AUTOSERVICE_NAME = 'auto-service-annotations'
-    static final String AUTOSERVICE_COMPILER = 'auto-service'
-    static final String AUTOSERVICE_VERSION = '1.0.1'
-
-    static final String IMMUTABLES_GROUP = 'org.immutables'
-    static final String IMMUTABLES_NAME = 'value'
-    static final String IMMUTABLES_VERSION = '2.9.2'
-
-    static final String JUNIT_GROUP = 'org.junit'
-    static final String JUNIT_NAME = 'junit-bom'
-    static final String JUNIT_VERSION = '5.7.2'
-
-    static final String JUNIT_CLASSIC_GROUP = 'junit'
-    static final String JUNIT_CLASSIC_NAME = 'junit'
-    static final String JUNIT_CLASSIC_VERSION = '4.13.2'
-
-    static final String JMOCK_GROUP = 'org.jmock'
-    static final String JMOCK_JUNIT_NAME = 'jmock-junit4'
-    static final String JMOCK_IMPORSTERS_NAME = 'jmock-imposters'
-    static final String JMOCK_VERSION = '2.12.0'
-
-    static final String ASSERTJ_GROUP = 'org.assertj'
-    static final String ASSERTJ_NAME = 'assertj-core'
-    static final String ASSERTJ_VERSION = '3.19.0'
-
-    static final String LOGBACK_GROUP = 'ch.qos.logback'
-    static final String LOGBACK_NAME = 'logback-classic'
-    static final String LOGBACK_VERSION = '1.4.14'
-
-    static final String GROOVY_GROUP = 'org.codehaus.groovy'
-    static final String GROOVY_VERSION = '3.0.21'
-
-    static final String GRPC_GROUP = 'io.grpc'
-    static final String GRPC_NAME = 'grpc-bom'
-    // Only bump this in concert w/ BORINGSSL_VERSION
-    static final String GRPC_VERSION = '1.58.0'
-
-    // TODO(deephaven-core#1685): Create strategy around updating and maintaining protoc version
-    static final String PROTOBUF_GROUP = 'com.google.protobuf'
-    static final String PROTOBUF_NAME = 'protobuf-java'
-    static final String PROTOBUF_VERSION = '3.25.3'
-
-    // See dependency matrix for particular gRPC versions at https://github.com/grpc/grpc-java/blob/master/SECURITY.md#netty
-    static final String BORINGSSL_GROUP = 'io.netty'
-    static final String BORINGSSL_NAME = 'netty-tcnative-boringssl-static'
-    // Only bump this in concert w/ GRPC_VERSION
-    static final String BORINGSSL_VERSION = '2.0.61.Final'
-
-    static final String JACKSON_GROUP = 'com.fasterxml.jackson'
-    static final String JACKSON_NAME = 'jackson-bom'
-    static final String JACKSON_VERSION = '2.17.0'
-
-    static final String SSLCONTEXT_GROUP = 'io.github.hakky54'
-    static final String SSLCONTEXT_VERSION = '8.1.1'
-
-    static final String JETTY11_GROUP = 'org.eclipse.jetty'
-    static final String JETTY11_NAME = 'jetty-bom'
-    static final String JETTY11_VERSION = '11.0.20'
-
-    static final String GUAVA_GROUP = 'com.google.guava'
-    static final String GUAVA_NAME = 'guava'
-    static final String GUAVA_VERSION = '33.2.0-jre'
-
-    static final String HADOOP_GROUP = 'org.apache.hadoop'
-    static final String HADOOP_VERSION = '3.4.0'
-
-    static final String ICEBERG_GROUP = 'org.apache.iceberg'
-    static final String ICEBERG_VERSION = '1.5.2'
-
-    static final String AWSSDK_GROUP = 'software.amazon.awssdk'
-    static final String AWSSDK_VERSION = '2.24.5'
-
-    static final String TESTCONTAINER_GROUP = 'org.testcontainers'
-    static final String TESTCONTAINER_VERSION = '1.19.4'
-
-    static boolean addDependency(Configuration conf, String group, String name, String version, Action<? super DefaultExternalModuleDependency> configure = Actions.doNothing()) {
-        if (!conf.dependencies.find { it.name == name && it.group == group}) {
-            DefaultExternalModuleDependency dep = dependency group, name, version
-            configure.execute(dep)
-            conf.dependencies.add(dep)
-            true
-        }
-        false
-    }
-
-    static void addDependency(Configuration conf, Dependency dep) {
-        conf.dependencies.add(dep)
-    }
-
-    static DefaultExternalModuleDependency dependency(String group, String name, String version) {
-        new DefaultExternalModuleDependency(group, name, version)
-    }
-
-    static void inheritGwt(Project p, String name, String configName) {
-        Configuration config = p.configurations.getByName(configName)
-        if (addDependency(config, GWT_GROUP, name, GWT_VERSION)) {
-            // when we add gwt-dev, lets also force asm version, just to be safe.
-            name == 'gwt-dev' && config.resolutionStrategy {
-                force 'org.ow2.asm:asm:9.2'
-                force 'org.ow2.asm:asm-util:9.2'
-                force 'org.ow2.asm:asm-commons:9.2'
-            }
-        }
-    }
-
-    static void inheritJavaParser(Project p, String configName) {
-        Configuration config = p.configurations.getByName(configName)
-        addDependency config, JAVA_PARSER_GROUP, JAVA_PARSER_NAME, JAVA_PARSER_VERSION
-    }
-
-    static void inheritJavaxAnnotations(Project p, String configName) {
-        Configuration config = p.configurations.getByName(configName)
-        addDependency config, JAVAX_ANNOTATIONS_GROUP, JAVAX_ANNOTATIONS_NAME, JAVAX_ANNOTATIONS_VERSION
-    }
-
-    static void inheritJsInterop(Project p, String name, String configName) {
-        Configuration config = p.configurations.getByName(configName)
-        addDependency config, JS_INTEROP_GROUP, name,
-                // google is annoying, and have different versions released for the same groupId
-                // :base: is the only one that is different, so we'll use it in the ternary.
-                name == 'base'? '1.0.1' : JS_INTEROP_VERSION
-    }
-
-    static void inheritElemental(Project p, String name, String configName) {
-        Configuration config = p.configurations.getByName(configName)
-        addDependency config, ELEMENTAL_GROUP, name, ELEMENTAL_VERSION
-    }
-
-    static void inheritCommonsText(Project p, String configName) {
-        Configuration config = p.configurations.getByName(configName)
-        addDependency config, COMMONS_GROUP, 'commons-text', "1.10.0"
-    }
-
-    static void inheritArrow(Project p, String name, String configName) {
-        Configuration config = p.configurations.getByName(configName)
-        addDependency(config, ARROW_GROUP, name, ARROW_VERSION)
-    }
-
-    static void inheritFlatbuffer(Project p, String configName) {
-        Configuration config = p.configurations.getByName(configName)
-        addDependency(config, FLATBUFFER_GROUP, FLATBUFFER_NAME, FLATBUFFER_VERSION)
-    }
-
-    static void inheritDagger(Project p, boolean test = false) {
-        Configuration ic = p.configurations.getByName(test ? 'testImplementation' : 'implementation')
-        addDependency(ic, DAGGER_GROUP, DAGGER_NAME, DAGGER_VERSION)
-        Configuration ap = p.configurations.getByName(test ? 'testAnnotationProcessor' : 'annotationProcessor')
-        addDependency(ap, DAGGER_GROUP, DAGGER_COMPILER, DAGGER_VERSION)
-    }
-
-    /**
-     * Auto service is an annotation processor that will generate META-INF/services/ files.
-     *
-     * @see <a href="https://github.com/google/auto/tree/master/service">google/auto/tree/master/service</a>
-     */
-    static void inheritAutoService(Project p, boolean test = false) {
-        Configuration ic = p.configurations.getByName(test ? 'testCompileOnly' : 'compileOnly')
-        addDependency(ic, AUTOSERVICE_GROUP, AUTOSERVICE_NAME, AUTOSERVICE_VERSION)
-        Configuration ap = p.configurations.getByName(test ? 'testAnnotationProcessor' : 'annotationProcessor')
-        addDependency(ap, AUTOSERVICE_GROUP, AUTOSERVICE_COMPILER, AUTOSERVICE_VERSION)
-    }
-
-    static void inheritImmutables(Project p, boolean test = false) {
-        Configuration ap = p.configurations.getByName(test ? 'testAnnotationProcessor' : 'annotationProcessor')
-        addDependency(ap, IMMUTABLES_GROUP, IMMUTABLES_NAME, IMMUTABLES_VERSION)
-        p.getDependencies().add(test ? 'testCompileOnly' : 'compileOnly', p.project(':util-immutables'))
-    }
-
-    static void inheritJUnitClassic(Project p, String configName) {
-        Configuration config = p.configurations.getByName(configName)
-        addDependency(config, JUNIT_CLASSIC_GROUP, JUNIT_CLASSIC_NAME, JUNIT_CLASSIC_VERSION)
-    }
-
-    static void inheritJMock(Project p, String configName) {
-        Configuration config = p.configurations.getByName(configName)
-        addDependency(config, JMOCK_GROUP, JMOCK_JUNIT_NAME, JMOCK_VERSION)
-        addDependency(config, JMOCK_GROUP, JMOCK_IMPORSTERS_NAME, JMOCK_VERSION)
-    }
-
-    static void inheritJUnitPlatform(Project p, String configName = JavaPlugin.TEST_IMPLEMENTATION_CONFIGURATION_NAME) {
-        Configuration config = p.configurations.getByName(configName)
-        addDependency(config, p.getDependencies().platform(JUNIT_GROUP + ":" + JUNIT_NAME + ":" + JUNIT_VERSION))
-    }
-
-    static void inheritAssertJ(Project p, String configName = JavaPlugin.TEST_IMPLEMENTATION_CONFIGURATION_NAME) {
-        Configuration config = p.configurations.getByName(configName)
-        addDependency(config, ASSERTJ_GROUP, ASSERTJ_NAME, ASSERTJ_VERSION)
-    }
-
-    static void inheritLogbackClassic(Project p, String configName = JavaPlugin.RUNTIME_ONLY_CONFIGURATION_NAME) {
-        Configuration config = p.configurations.getByName(configName)
-        addDependency(config, LOGBACK_GROUP, LOGBACK_NAME, LOGBACK_VERSION)
-    }
-
-    static void inheritSlf4j(Project p, String name, String configName) {
-        Configuration config = p.configurations.getByName(configName)
-        addDependency(config, SLF4J_GROUP, name, SLF4J_VERSION)
-    }
-
-    static void inheritGroovy(Project p, String name, String configName) {
-        Configuration config = p.configurations.getByName(configName)
-        addDependency(config, GROOVY_GROUP, name, GROOVY_VERSION)
-    }
-
-    static void inheritGrpcPlatform(Project p, String configName = JavaPlugin.IMPLEMENTATION_CONFIGURATION_NAME) {
-        Configuration config = p.configurations.getByName(configName)
-        addDependency(config, p.getDependencies().platform(GRPC_GROUP + ":" + GRPC_NAME + ":" + GRPC_VERSION))
-    }
-
-    static void inheritProtobuf(Project p, String configName = JavaPlugin.IMPLEMENTATION_CONFIGURATION_NAME) {
-        Configuration config = p.configurations.getByName(configName)
-        addDependency(config, PROTOBUF_GROUP, PROTOBUF_NAME, PROTOBUF_VERSION)
-    }
-
-    static void inheritBoringSsl(Project p, String configName = JavaPlugin.RUNTIME_ONLY_CONFIGURATION_NAME) {
-        Configuration config = p.configurations.getByName(configName)
-        addDependency(config, BORINGSSL_GROUP, BORINGSSL_NAME, BORINGSSL_VERSION)
-    }
-
-    static void inheritJacksonPlatform(Project p, String configName = JavaPlugin.IMPLEMENTATION_CONFIGURATION_NAME) {
-        Configuration config = p.configurations.getByName(configName)
-        addDependency(config, p.getDependencies().platform("${JACKSON_GROUP}:${JACKSON_NAME}:${JACKSON_VERSION}"))
-    }
-
-    static void inheritSSLContext(Project p, String name, String configName = JavaPlugin.IMPLEMENTATION_CONFIGURATION_NAME) {
-        Configuration config = p.configurations.getByName(configName)
-        addDependency(config, SSLCONTEXT_GROUP, name, SSLCONTEXT_VERSION)
-    }
-
-    static void inheritJetty11Platform(Project p, String configName = JavaPlugin.IMPLEMENTATION_CONFIGURATION_NAME) {
-        Configuration config = p.configurations.getByName(configName)
-        addDependency(config, p.getDependencies().platform("${JETTY11_GROUP}:${JETTY11_NAME}:${JETTY11_VERSION}"))
-    }
-
-    static void inheritGuava(Project p, String configName = JavaPlugin.IMPLEMENTATION_CONFIGURATION_NAME) {
-        Configuration config = p.configurations.getByName(configName)
-        addDependency(config, GUAVA_GROUP, GUAVA_NAME, GUAVA_VERSION)
-    }
-
-    static void inheritParquetHadoop(Project p, String configName = JavaPlugin.IMPLEMENTATION_CONFIGURATION_NAME) {
-        Configuration config = p.configurations.getByName(configName)
-        addDependency(config, 'org.apache.parquet', 'parquet-hadoop', '1.14.0')
-    }
-
-    /** configName controls only the Configuration's classpath, all transitive dependencies are runtimeOnly */
-    static void inheritParquetHadoopConfiguration(Project p, String configName = JavaPlugin.IMPLEMENTATION_CONFIGURATION_NAME) {
-        Configuration config = p.configurations.getByName(configName)
-        addDependency(config, HADOOP_GROUP, 'hadoop-common', HADOOP_VERSION) {
-            it.setTransitive(false)
-            // Do not take any extra dependencies of this project transitively. We just want a few classes for
-            // configuration and compression codecs. For any additional required dependencies, add them separately, as
-            // done for woodstox, shaded-guava, etc. below. Or we can replace setTransitive(false) here with more
-            // exclusions (we want to avoid pulling in netty, loggers, jetty-util, guice and asm).
-        }
-
-        Configuration runtimeOnly = p.configurations.getByName(JavaPlugin.RUNTIME_ONLY_CONFIGURATION_NAME)
-        addDependency(runtimeOnly, 'com.fasterxml.woodstox', 'woodstox-core', '6.6.2') {
-            it.because('hadoop-common required dependency for Configuration')
-        }
-        addDependency(runtimeOnly, 'org.apache.hadoop.thirdparty', 'hadoop-shaded-guava', '1.2.0') {
-            it.because('hadoop-common required dependency for Configuration')
-        }
-        addDependency(runtimeOnly, 'commons-collections', 'commons-collections', '3.2.2') {
-            it.because('hadoop-common required dependency for Configuration')
-        }
-    }
-
-    static void inheritIcebergHadoop(Project p, String configName = JavaPlugin.IMPLEMENTATION_CONFIGURATION_NAME) {
-        Configuration config = p.configurations.getByName(configName)
-        addDependency(config, HADOOP_GROUP, 'hadoop-common', HADOOP_VERSION)
-        addDependency(config, HADOOP_GROUP, 'hadoop-hdfs-client', HADOOP_VERSION)
-    }
-
-
-    static void inheritIcebergCore(Project p, String configName = JavaPlugin.IMPLEMENTATION_CONFIGURATION_NAME) {
-        Configuration config = p.configurations.getByName(configName)
-        addDependency(config, p.getDependencies().platform(ICEBERG_GROUP + ":iceberg-bom:" + ICEBERG_VERSION))
-
-        addDependency(config, ICEBERG_GROUP, 'iceberg-core', ICEBERG_VERSION)
-        addDependency(config, ICEBERG_GROUP, 'iceberg-bundled-guava', ICEBERG_VERSION)
-    }
-
-    static void inheritAWSSDK(Project p, String configName = JavaPlugin.IMPLEMENTATION_CONFIGURATION_NAME) {
-        Configuration config = p.configurations.getByName(configName)
-        addDependency(config, p.getDependencies().platform(AWSSDK_GROUP + ":bom:" + AWSSDK_VERSION))
-
-        addDependency(config, AWSSDK_GROUP, 's3', AWSSDK_VERSION)
-        addDependency(config, AWSSDK_GROUP, 'aws-crt-client', AWSSDK_VERSION)
-    }
-
-    static void inheritTestContainers(Project p, String configName = JavaPlugin.TEST_IMPLEMENTATION_CONFIGURATION_NAME) {
-        Configuration config = p.configurations.getByName(configName)
-        addDependency(config, TESTCONTAINER_GROUP, 'testcontainers', TESTCONTAINER_VERSION)
-        addDependency(config, TESTCONTAINER_GROUP, 'junit-jupiter', TESTCONTAINER_VERSION)
-        addDependency(config, TESTCONTAINER_GROUP, 'localstack', TESTCONTAINER_VERSION)
-        addDependency(config, TESTCONTAINER_GROUP, 'minio', TESTCONTAINER_VERSION)
-    }
-}
diff --git a/buildSrc/src/main/groovy/GwtTools.groovy b/buildSrc/src/main/groovy/GwtTools.groovy
index c33b299c419..148eacfa0d4 100644
--- a/buildSrc/src/main/groovy/GwtTools.groovy
+++ b/buildSrc/src/main/groovy/GwtTools.groovy
@@ -7,6 +7,8 @@ import groovy.transform.CompileStatic
 import org.gradle.api.Project
 import org.gradle.api.artifacts.Configuration
 import org.gradle.api.artifacts.ProjectDependency
+import org.gradle.api.artifacts.VersionCatalogsExtension
+import org.gradle.api.artifacts.VersionConstraint
 import org.gradle.api.file.ConfigurableFileCollection
 import org.gradle.api.plugins.JavaPlugin
 import org.gradle.api.tasks.compile.JavaCompile
@@ -61,6 +63,7 @@ class GwtTools {
                 generateJsInteropExports = true
                 // TODO move this down a line when we want to give clients js that is not super strict / rigged to blow
                 checkAssertions = true
+                setExtraArgs('-includeJsInteropExports', 'io.deephaven.*')
                 if (gwtDev) {
                     saveSource = true
                     extra = extras
@@ -80,16 +83,20 @@ class GwtTools {
     }
 
     static void applyDefaults(Project p, GwtExtension gwt, boolean compile = false) {
-        gwt.gwtVersion = Classpaths.GWT_VERSION
-        gwt.jettyVersion = Classpaths.JETTY_VERSION
+        def libs = p.getExtensions().getByType(VersionCatalogsExtension).named("libs")
+        def gwtVersion = libs.findVersion("gwt").map(VersionConstraint::getRequiredVersion).orElseThrow()
+        def gwtJettyVersion = libs.findVersion("gwtJetty").map(VersionConstraint::getRequiredVersion).orElseThrow()
+
+        gwt.gwtVersion = gwtVersion
+        gwt.jettyVersion = gwtJettyVersion
         p.configurations.all { Configuration c ->
             c.resolutionStrategy.dependencySubstitution { sub ->
                 sub.substitute(sub.module("com.google.gwt:gwt-codeserver"))
-                        .using(sub.module("org.gwtproject:gwt-codeserver:${Classpaths.GWT_VERSION}"))
+                        .using(sub.module("org.gwtproject:gwt-codeserver:${gwtVersion}"))
                 sub.substitute(sub.module("com.google.gwt:gwt-user"))
-                        .using(sub.module("org.gwtproject:gwt-user:${Classpaths.GWT_VERSION}"))
+                        .using(sub.module("org.gwtproject:gwt-user:${gwtVersion}"))
                 sub.substitute(sub.module("com.google.gwt:gwt-dev"))
-                        .using(sub.module("org.gwtproject:gwt-dev:${Classpaths.GWT_VERSION}"))
+                        .using(sub.module("org.gwtproject:gwt-dev:${gwtVersion}"))
             }
         }
         if (compile) {
diff --git a/buildSrc/src/main/groovy/io.deephaven.hadoop-common-dependencies.gradle b/buildSrc/src/main/groovy/io.deephaven.hadoop-common-dependencies.gradle
new file mode 100644
index 00000000000..5ea0e697d17
--- /dev/null
+++ b/buildSrc/src/main/groovy/io.deephaven.hadoop-common-dependencies.gradle
@@ -0,0 +1,22 @@
+plugins {
+    id 'java'
+}
+
+dependencies {
+    implementation(libs.hadoop.common) {
+        transitive = false
+        // Do not take any extra dependencies of this project transitively. We just want a few classes for
+        // configuration and compression codecs. For any additional required dependencies, add them separately, as
+        // done for woodstox, shaded-guava, etc. below. Or we can replace setTransitive(false) here with more
+        // exclusions (we want to avoid pulling in netty, loggers, jetty-util, guice and asm).
+    }
+    runtimeOnly(libs.woodstox.core) {
+        because "hadoop-common required dependency for Configuration"
+    }
+    runtimeOnly(libs.hadoop.shaded.guava) {
+        because "hadoop-common required dependency for Configuration"
+    }
+    runtimeOnly(libs.commons.collections) {
+        because "hadoop-common required dependency for Configuration"
+    }
+}
diff --git a/buildSrc/src/main/groovy/io.deephaven.java-classpath-conventions.gradle b/buildSrc/src/main/groovy/io.deephaven.java-classpath-conventions.gradle
deleted file mode 100644
index 10f28e4205c..00000000000
--- a/buildSrc/src/main/groovy/io.deephaven.java-classpath-conventions.gradle
+++ /dev/null
@@ -1,80 +0,0 @@
-plugins {
-    id 'base'
-    id 'java'
-}
-
-// TODO(deephaven-core#1162): Adopt java-platform to manage versions
-ext {
-    depAnnotations = 'org.jetbrains:annotations:24.0.0'
-    depCommonsCompress = 'org.apache.commons:commons-compress:1.26.0'
-    depCommonsLang3 = 'org.apache.commons:commons-lang3:3.12.0'
-    depCommonsIo = 'commons-io:commons-io:2.11.0'
-    depJdom2 = 'org.jdom:jdom2:2.0.6.1'
-    depTrove3 = 'net.sf.trove4j:trove4j:3.0.3'
-}
-
-configurations {
-
-    commonsIo
-    jdom
-    math3
-    jama.extendsFrom math3
-    dxCompile
-    dxRuntime.extendsFrom dxCompile
-    mockrunner
-    junit
-
-    fishBase
-    fishIo.extendsFrom fishBase
-    fishDataStructure.extendsFrom fishIo
-    fishConfig.extendsFrom fishDataStructure
-    fishDataGenerator.extendsFrom jdom
-    fishNumerics.extendsFrom fishBase
-    fishBaseTest.extendsFrom junit
-    fishIoTest.extendsFrom fishBaseTest
-
-    dhNumerics.extendsFrom fishNumerics, jama
-    dhUtil.extendsFrom commonsIo, commonsLang3, commonsText, fishConfig, fishIo, jdom
-    dhPlot.extendsFrom dhUtil
-    dhBenchmarkSupport.extendsFrom fishData
-    dhIntegrations.extendsFrom math3
-}
-
-dependencies {
-
-    // First, one-off configurations for stuff we need "here and there"
-    jdom 'org.jdom:jdom2:2.0.6.1'
-    commonsLang3 'org.apache.commons:commons-lang3:3.12.0'
-    commonsText 'org.apache.commons:commons-text:1.10.0'
-    commonsIo 'commons-io:commons-io:2.11.0'
-    math3 'org.apache.commons:commons-math3:3.6.1'
-    jama 'gov.nist.math.jama:gov.nist.math.jama:1.1.1'
-    mockrunner 'com.mockrunner:mockrunner-jdbc:1.0.4'
-
-    Classpaths.inheritJUnitClassic(project, 'junit')
-    Classpaths.inheritJMock(project, 'junit')
-
-    // Now, all the various fish libs we depend on, with inherited dependencies matching
-    // the actual dependencies used in fishlib... if we were strongly coupled, we could skip
-    // having to maintain this...
-    fishBase project(':Base'),
-            'net.sf.trove4j:trove4j:3.0.3',
-            'org.jetbrains:annotations:24.0.0',
-            depCommonsCompress
-
-    fishIo project(':IO')
-
-    fishDataStructure project(':DataStructures')
-
-    fishConfig project(':Configuration')
-
-    fishBaseTest project(path: ':Base', configuration: 'tests')
-
-    fishIoTest project(path: ':IO', configuration: 'tests')
-
-    // https://mvnrepository.com/artifact/com.univocity/univocity-parsers
-    dhBenchmarkSupport 'com.univocity:univocity-parsers:2.6.0'
-
-    Classpaths.inheritJacksonPlatform(project, 'dhBenchmarkSupport')
-    dhBenchmarkSupport 'com.fasterxml.jackson.core:jackson-core'
-}
diff --git a/buildSrc/src/main/groovy/io.deephaven.java-common-conventions.gradle b/buildSrc/src/main/groovy/io.deephaven.java-common-conventions.gradle
index 291dcf03d23..58c0e11c37f 100644
--- a/buildSrc/src/main/groovy/io.deephaven.java-common-conventions.gradle
+++ b/buildSrc/src/main/groovy/io.deephaven.java-common-conventions.gradle
@@ -1,7 +1,6 @@
 plugins {
     id 'base'
     id 'java'
-    id 'io.deephaven.java-classpath-conventions'
     id 'io.deephaven.java-license-conventions'
     id 'io.deephaven.java-toolchain-conventions'
     id 'io.deephaven.java-jar-conventions'
diff --git a/buildSrc/src/main/groovy/io.deephaven.java-open-nio.gradle b/buildSrc/src/main/groovy/io.deephaven.java-open-nio.gradle
index a3c1b6f1a87..b24b0eecaa3 100644
--- a/buildSrc/src/main/groovy/io.deephaven.java-open-nio.gradle
+++ b/buildSrc/src/main/groovy/io.deephaven.java-open-nio.gradle
@@ -2,8 +2,8 @@ plugins {
   id 'java'
 }
 
-def runtimeVersion = Integer.parseInt((String)project.findProperty('runtimeVersion') ?: '11')
-def testRuntimeVersion = Integer.parseInt((String)project.findProperty('testRuntimeVersion') ?: '11')
+def runtimeVersion = Integer.parseInt((String)project.findProperty('runtimeVersion') ?: '21')
+def testRuntimeVersion = Integer.parseInt((String)project.findProperty('testRuntimeVersion') ?: '21')
 
 //    Caused by: java.lang.reflect.InaccessibleObjectException: Unable to make field long java.nio.Buffer.address accessible: module java.base does not "opens java.nio" to unnamed module @5a42bbf4
 //     at java.base/java.lang.reflect.AccessibleObject.checkCanSetAccessible(AccessibleObject.java:354)
diff --git a/buildSrc/src/main/groovy/io.deephaven.java-shadow-publishing-conventions.gradle b/buildSrc/src/main/groovy/io.deephaven.java-shadow-publishing-conventions.gradle
index ccb61709b22..72852b3af32 100644
--- a/buildSrc/src/main/groovy/io.deephaven.java-shadow-publishing-conventions.gradle
+++ b/buildSrc/src/main/groovy/io.deephaven.java-shadow-publishing-conventions.gradle
@@ -25,7 +25,9 @@ PublishingTools.setupPublications(project) { publication ->
   // the pom late enough to pick up gradle's own artifactId wiring from our archivesBaseName changes.
   // Also un-sets the classifier for the shadow jar, since we want this to be the default artifact
 //  project.shadow.component(publication)
-  publication.artifact(source: project.tasks.named("shadowJar"), classifier: '')
+  publication.artifact(source: project.tasks.named('shadowJar'), classifier: '')
+  publication.artifact(source: project.tasks.named('sourcesJar'))
+  publication.artifact(source: project.tasks.named('javadocJar'))
   publication.pom {
     withXml {
       def root = asNode()
diff --git a/buildSrc/src/main/groovy/io.deephaven.java-toolchain-conventions.gradle b/buildSrc/src/main/groovy/io.deephaven.java-toolchain-conventions.gradle
index 2a1322225bc..0d1ccae9553 100644
--- a/buildSrc/src/main/groovy/io.deephaven.java-toolchain-conventions.gradle
+++ b/buildSrc/src/main/groovy/io.deephaven.java-toolchain-conventions.gradle
@@ -4,15 +4,15 @@ plugins {
   id 'java'
 }
 
-def compilerVersion = Integer.parseInt((String)project.findProperty('compilerVersion') ?: '11')
+def compilerVersion = Integer.parseInt((String)project.findProperty('compilerVersion') ?: '21')
 def compilerVendor = project.hasProperty('compilerVendor') ?  JvmVendorSpec.matching((String)project.property('compilerVendor')): null
 
 def languageLevel = Integer.parseInt((String)project.findProperty('languageLevel') ?: '11')
-def runtimeVersion = Integer.parseInt((String)project.findProperty('runtimeVersion') ?: '11')
+def runtimeVersion = Integer.parseInt((String)project.findProperty('runtimeVersion') ?: '21')
 def runtimeVendor = project.hasProperty('runtimeVendor') ?  JvmVendorSpec.matching((String)project.property('runtimeVendor')): null
 
 def testLanguageLevel = Integer.parseInt((String)project.findProperty('testLanguageLevel') ?: '11')
-def testRuntimeVersion = Integer.parseInt((String)project.findProperty('testRuntimeVersion') ?: '11')
+def testRuntimeVersion = Integer.parseInt((String)project.findProperty('testRuntimeVersion') ?: '21')
 def testRuntimeVendor = project.hasProperty('testRuntimeVendor') ?  JvmVendorSpec.matching((String)project.property('testRuntimeVendor')): null
 
 if (languageLevel > compilerVersion) {
@@ -79,17 +79,50 @@ tasks.withType(JavaCompile).configureEach {
   options.incremental = true
   options.compilerArgs << '-parameters'
 
-  if (name == 'compileTestJava') {
+  if (name == 'compileJava') {
+    if (compilerVersion != languageLevel) {
+      options.release.set languageLevel
+      sourceCompatibility = languageLevel
+      targetCompatibility = languageLevel
+    }
+  } else {
+    // This assumes that any JavaCompile task _not_ named 'compileJava' wants to target the testLanguageLevel.
+    // If this does not hold in the future, we can update this logic.
     if (compilerVersion != testLanguageLevel) {
       options.release.set testLanguageLevel
+      sourceCompatibility = testLanguageLevel
+      targetCompatibility = testLanguageLevel
     }
-  } else {
+  }
+}
+
+tasks.withType(GroovyCompile).configureEach {
+  javaLauncher.set groovyCompilerLauncher
+
+  options.fork = true
+  options.forkOptions.memoryMaximumSize = '2G'
+  options.encoding = 'UTF-8'
+  options.incremental = true
+  options.compilerArgs << '-parameters'
+
+  if (name == 'compileGroovy') {
     if (compilerVersion != languageLevel) {
       options.release.set languageLevel
+      sourceCompatibility = languageLevel
+      targetCompatibility = languageLevel
+    }
+  } else {
+    // This assumes that any GroovyCompile task _not_ named 'compileGroovy' wants to target the testLanguageLevel.
+    // If this does not hold in the future, we can update this logic.
+    if (compilerVersion != testLanguageLevel) {
+      options.release.set testLanguageLevel
+      sourceCompatibility = testLanguageLevel
+      targetCompatibility = testLanguageLevel
     }
   }
 }
 
+
 def createCompilerDirectives = tasks.register('createCompilerDirectives') {
   def compilerDirectivesFile = project.layout.buildDirectory.file('dh-compiler-directives.txt')
   def compilerDirectivesText = new JsonBuilder([{
@@ -199,10 +232,6 @@ tasks.withType(Test).configureEach {
   jvmArgs += compilerArgs(compilerDirectivesFile.singleFile.path) + ["-XX:VMOptionsFile=${vmOptionsFile.singleFile.path}"] + START_OPTS
 }
 
-tasks.withType(GroovyCompile).configureEach {
-  javaLauncher.set groovyCompilerLauncher
-}
-
 JavaApplication application = extensions.findByType(JavaApplication)
 if (application) {
   application.applicationDistribution.into('etc') {
diff --git a/buildSrc/src/main/groovy/io.deephaven.optional-server-dependencies.gradle b/buildSrc/src/main/groovy/io.deephaven.optional-server-dependencies.gradle
new file mode 100644
index 00000000000..c6f0f82accd
--- /dev/null
+++ b/buildSrc/src/main/groovy/io.deephaven.optional-server-dependencies.gradle
@@ -0,0 +1,26 @@
+plugins {
+    id 'java'
+}
+
+dependencies {
+    if (!hasProperty('excludeHotspotImpl')) {
+        runtimeOnly project(':hotspot-impl')
+    }
+
+    if (!hasProperty('excludeClockImpl')) {
+        runtimeOnly project(':clock-impl')
+    }
+
+    if (!hasProperty('excludeSql')) {
+        runtimeOnly project(':engine-sql')
+    }
+
+    if (!hasProperty('excludeS3')) {
+        runtimeOnly project(':extensions-s3')
+        runtimeOnly project(':extensions-iceberg-s3')
+    }
+
+    if (!hasProperty('excludeJson')) {
+        runtimeOnly project(':extensions-json-jackson')
+    }
+}
diff --git a/buildSrc/src/main/groovy/io/deephaven/project/util/PublishingTools.groovy b/buildSrc/src/main/groovy/io/deephaven/project/util/PublishingTools.groovy
index 8d577fa0653..a870c2323f9 100644
--- a/buildSrc/src/main/groovy/io/deephaven/project/util/PublishingTools.groovy
+++ b/buildSrc/src/main/groovy/io/deephaven/project/util/PublishingTools.groovy
@@ -63,12 +63,16 @@ class PublishingTools {
         }
     }
 
+    static boolean isSnapshot(Project project) {
+        return ((String)project.version).endsWith('-SNAPSHOT')
+    }
+
     static void setupRepositories(Project project) {
         PublishingExtension publishingExtension = project.extensions.getByType(PublishingExtension)
         publishingExtension.repositories { repoHandler ->
             repoHandler.maven { MavenArtifactRepository repo ->
                 repo.name = REPO_NAME
-                repo.url = ((String)project.version).endsWith('SNAPSHOT') ? SNAPSHOT_REPO : RELEASE_REPO
+                repo.url = isSnapshot(project) ? SNAPSHOT_REPO : RELEASE_REPO
                 // ossrhUsername, ossrhPassword
                 repo.credentials(PasswordCredentials)
             }
@@ -145,7 +149,9 @@ class PublishingTools {
                     throw new IllegalStateException('Release error: env CI must be true')
                 }
                 def actualGithubRef = System.getenv('GITHUB_REF')
-                def expectedGithubRef = "refs/heads/release/v${p.version}"
+                def expectedGithubRef = isSnapshot(p)
+                        ? 'refs/heads/main'
+                        : "refs/heads/release/v${p.version}".toString()
                 if (actualGithubRef != expectedGithubRef) {
                     throw new IllegalStateException("Release error: env GITHUB_REF '${actualGithubRef}' does not match expected '${expectedGithubRef}'. Bad tag? Bump version?")
                 }
diff --git a/clock-impl/build.gradle b/clock-impl/build.gradle
index 470bb3d443a..22cf58023a7 100644
--- a/clock-impl/build.gradle
+++ b/clock-impl/build.gradle
@@ -6,15 +6,35 @@ description 'Implementation for the Clock service to obtain allocation-free prec
 
 dependencies {
     implementation project(':clock')
-    Classpaths.inheritAutoService(project)
+    compileOnly libs.autoservice
+    annotationProcessor libs.autoservice.compiler
+
+    testImplementation libs.assertj
+    testImplementation platform(libs.junit.bom)
+    testImplementation libs.junit.jupiter
+    testRuntimeOnly libs.junit.platform.launcher
+}
+
+test {
+    useJUnitPlatform()
 }
 
+// TODO(deephaven-core#6345): Improve build process for jars that depend on JVM internals
+// In the meantime, we can be relatively confident this JAR works for the multiple versions of java since we do nightly
+// tests with a range of testRuntimeVersions.
+
 tasks.withType(JavaCompile).configureEach {
     options.compilerArgs += ['--add-exports', 'java.base/jdk.internal.misc=ALL-UNNAMED']
-    // Explicitly set the source compatibility so gradle will invoke javac with `-source 11` instead of `--release`
-    sourceCompatibility = 11
+    // Explicitly unset release so gradle will invoke javac with `-source <languageLevel> -target <languageLevel>`
+    // instead of `--release <languageLevel>`, which would otherwise produce
+    // > error: exporting a package from system module java.base is not allowed with --release
+    options.release.unset()
 }
 
 tasks.withType(Javadoc).configureEach {
     options.addStringOption('-add-exports', 'java.base/jdk.internal.misc=ALL-UNNAMED')
 }
+
+tasks.withType(Test).configureEach {
+    jvmArgs += ['--add-exports', 'java.base/jdk.internal.misc=ALL-UNNAMED']
+}
diff --git a/clock-impl/src/test/java/io/deephaven/base/clock/SystemClockJdkInternalMiscVmTest.java b/clock-impl/src/test/java/io/deephaven/base/clock/SystemClockJdkInternalMiscVmTest.java
new file mode 100644
index 00000000000..b12ffb32dfc
--- /dev/null
+++ b/clock-impl/src/test/java/io/deephaven/base/clock/SystemClockJdkInternalMiscVmTest.java
@@ -0,0 +1,46 @@
+//
+// Copyright (c) 2016-2024 Deephaven Data Labs and Patent Pending
+//
+package io.deephaven.base.clock;
+
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+
+import java.time.Instant;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+class SystemClockJdkInternalMiscVmTest {
+
+    private SystemClockJdkInternalMiscVm SUT;
+
+    @BeforeEach
+    void setUp() {
+        SUT = new SystemClockJdkInternalMiscVm();
+    }
+
+    @Test
+    void currentTimeMillis() {
+        assertThat(SUT.currentTimeMillis()).isPositive();
+    }
+
+    @Test
+    void currentTimeMicros() {
+        assertThat(SUT.currentTimeMicros()).isPositive();
+    }
+
+    @Test
+    void currentTimeNanos() {
+        assertThat(SUT.currentTimeNanos()).isPositive();
+    }
+
+    @Test
+    void instantMillis() {
+        assertThat(SUT.instantMillis()).isAfter(Instant.EPOCH);
+    }
+
+    @Test
+    void instantNanos() {
+        assertThat(SUT.instantNanos()).isAfter(Instant.EPOCH);
+    }
+}
diff --git a/clock-impl/src/test/java/io/deephaven/base/clock/SystemClockTest.java b/clock-impl/src/test/java/io/deephaven/base/clock/SystemClockTest.java
new file mode 100644
index 00000000000..be6015a3d87
--- /dev/null
+++ b/clock-impl/src/test/java/io/deephaven/base/clock/SystemClockTest.java
@@ -0,0 +1,23 @@
+//
+// Copyright (c) 2016-2024 Deephaven Data Labs and Patent Pending
+//
+package io.deephaven.base.clock;
+
+import org.junit.jupiter.api.Test;
+
+import java.lang.reflect.InvocationTargetException;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+class SystemClockTest {
+    @Test
+    void of() throws ClassNotFoundException, InvocationTargetException, NoSuchMethodException,
+            InstantiationException, IllegalAccessException {
+        assertThat(SystemClock.of()).isExactlyInstanceOf(SystemClockJdkInternalMiscVm.class);
+    }
+
+    @Test
+    void serviceLoader() {
+        assertThat(SystemClock.serviceLoader()).get().isExactlyInstanceOf(SystemClockJdkInternalMiscVm.class);
+    }
+}
diff --git a/clock/gradle.properties b/clock/gradle.properties
index c186bbfdde1..9e8588f2620 100644
--- a/clock/gradle.properties
+++ b/clock/gradle.properties
@@ -1 +1,2 @@
 io.deephaven.project.ProjectType=JAVA_PUBLIC
+languageLevel=8
diff --git a/clock/src/main/java/io/deephaven/base/clock/SystemClock.java b/clock/src/main/java/io/deephaven/base/clock/SystemClock.java
index da22e6ee38e..27b14cbc522 100644
--- a/clock/src/main/java/io/deephaven/base/clock/SystemClock.java
+++ b/clock/src/main/java/io/deephaven/base/clock/SystemClock.java
@@ -62,7 +62,7 @@ static SystemClock of() throws ClassNotFoundException, NoSuchMethodException, In
             case DEFAULT:
                 return serviceLoader().orElse(systemUTC());
             case SERVICE_LOADER:
-                return serviceLoader().orElseThrow();
+                return serviceLoader().orElseThrow(() -> new IllegalStateException("Unable to load clock"));
             case SYSTEM_UTC:
                 return systemUTC();
             case SYSTEM_MILLIS:
diff --git a/codec/api/build.gradle b/codec/api/build.gradle
new file mode 100644
index 00000000000..8de35953673
--- /dev/null
+++ b/codec/api/build.gradle
@@ -0,0 +1,10 @@
+plugins {
+    id 'java-library'
+    id 'io.deephaven.project.register'
+}
+
+description 'Codec API: The base package for column codecs'
+
+dependencies {
+    compileOnly libs.jetbrains.annotations
+}
diff --git a/codec/api/gradle.properties b/codec/api/gradle.properties
new file mode 100644
index 00000000000..d14e3d77ef9
--- /dev/null
+++ b/codec/api/gradle.properties
@@ -0,0 +1,2 @@
+io.deephaven.project.ProjectType=JAVA_PUBLIC
+languageLevel=8
\ No newline at end of file
diff --git a/Util/src/main/java/io/deephaven/util/codec/ObjectCodec.java b/codec/api/src/main/java/io/deephaven/util/codec/ObjectCodec.java
similarity index 89%
rename from Util/src/main/java/io/deephaven/util/codec/ObjectCodec.java
rename to codec/api/src/main/java/io/deephaven/util/codec/ObjectCodec.java
index e1c96338778..def0542d264 100644
--- a/Util/src/main/java/io/deephaven/util/codec/ObjectCodec.java
+++ b/codec/api/src/main/java/io/deephaven/util/codec/ObjectCodec.java
@@ -24,14 +24,12 @@ public interface ObjectCodec<TYPE> extends ObjectDecoder<TYPE> {
 
     /**
      * Encode the specified input as an array of bytes. Note that it is up to the implementation how to encode null
-     * inputs. The use of a zero-length byte array (e.g.
-     * {@link io.deephaven.datastructures.util.CollectionUtil#ZERO_LENGTH_BYTE_ARRAY}) is strongly encouraged.
+     * inputs. The use of a zero-length byte array is strongly encouraged.
      *
      * @param input The input object, possibly null
      * @return The output byte array
      */
-    @NotNull
-    byte[] encode(@Nullable TYPE input);
+    byte @NotNull [] encode(@Nullable TYPE input);
 
     /**
      * Does this codec support encoding of null values?
diff --git a/codec/api/src/main/java/io/deephaven/util/codec/ObjectDecoder.java b/codec/api/src/main/java/io/deephaven/util/codec/ObjectDecoder.java
new file mode 100644
index 00000000000..033a7b876f4
--- /dev/null
+++ b/codec/api/src/main/java/io/deephaven/util/codec/ObjectDecoder.java
@@ -0,0 +1,79 @@
+//
+// Copyright (c) 2016-2024 Deephaven Data Labs and Patent Pending
+//
+package io.deephaven.util.codec;
+
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
+
+import java.nio.ByteBuffer;
+
+/**
+ * <p>
+ * Codec superinterface for Object translation from byte arrays for serialization and deserialization.
+ * <p>
+ * Implementations must follow several rules to enable correct usage:
+ * <ol>
+ * <li>They must be stateless or designed for concurrent use (e.g. by using only ThreadLocal state), as they will
+ * generally be cached and re-used.</li>
+ * <li>They must not modify their inputs in any way, retain references to their inputs, or return results that retain
+ * references to their inputs.</li>
+ * </ol>
+ */
+public interface ObjectDecoder<TYPE> {
+    /**
+     * The value which represents variable width columns.
+     */
+    int VARIABLE_WIDTH_SENTINEL = Integer.MIN_VALUE;
+
+    /**
+     * Decode an object from an array of bytes.
+     *
+     * @param input The input byte array containing bytes to decode
+     * @param offset The offset into the byte array to start decoding from
+     * @param length The number of bytes to decode, starting at the offset
+     * @return The output object, possibly null
+     */
+    @Nullable
+    TYPE decode(byte @NotNull [] input, int offset, int length);
+
+    /**
+     * Decode an object from a ByteBuffer. The position of the input buffer may or may not be modified by this method.
+     *
+     * @param buffer The input ByteBuffer containing bytes to decode
+     * @return The output object, possibly null
+     */
+    @Nullable
+    default TYPE decode(@NotNull final ByteBuffer buffer) {
+        if (buffer.hasArray()) {
+            return decode(buffer.array(), buffer.arrayOffset() + buffer.position(), buffer.remaining());
+        } else {
+            // Make a copy of the buffer's contents
+            final byte[] bytes = new byte[buffer.remaining()];
+            buffer.get(bytes);
+            return decode(bytes, 0, bytes.length);
+        }
+    }
+
+    /**
+     * What width byte array does this ObjectCodec expect to encode and decode?
+     *
+     * @return VARIABLE_WIDTH_SENTINEL if the codec must encode and decode variable width columns, otherwise the fixed
+     *         size of byte array that must be decoded and encoded.
+     */
+    int expectedObjectWidth();
+
+    /**
+     * Verify that this codec is capable of supporting a column that has an actual width of {@code actualWidth}.
+     *
+     * @param actualWidth the actual width of the instantiated column
+     * @throws IllegalArgumentException if {@code actualWidth} is not compatible with this codec
+     */
+    default void checkWidth(int actualWidth) throws IllegalArgumentException {
+        final int expectedWidth = expectedObjectWidth();
+        if (expectedWidth != actualWidth) {
+            throw new IllegalArgumentException(
+                    "Expected width `" + expectedWidth + "` does not match actual width `" + actualWidth + "`");
+        }
+    }
+}
diff --git a/codec/builtin/build.gradle b/codec/builtin/build.gradle
new file mode 100644
index 00000000000..055cd8de79e
--- /dev/null
+++ b/codec/builtin/build.gradle
@@ -0,0 +1,17 @@
+plugins {
+    id 'java-library'
+    id 'io.deephaven.project.register'
+}
+
+description 'Codec Builtin: Deephaven builtin codec implementations'
+
+dependencies {
+    api project(":codec-api")
+
+    implementation project(":Base")
+    implementation project(":engine-query-constants")
+
+    compileOnly libs.jetbrains.annotations
+
+    testImplementation libs.junit4
+}
diff --git a/codec/builtin/gradle.properties b/codec/builtin/gradle.properties
new file mode 100644
index 00000000000..c186bbfdde1
--- /dev/null
+++ b/codec/builtin/gradle.properties
@@ -0,0 +1 @@
+io.deephaven.project.ProjectType=JAVA_PUBLIC
diff --git a/Util/src/main/java/io/deephaven/util/codec/BigDecimalCodec.java b/codec/builtin/src/main/java/io/deephaven/util/codec/BigDecimalCodec.java
similarity index 92%
rename from Util/src/main/java/io/deephaven/util/codec/BigDecimalCodec.java
rename to codec/builtin/src/main/java/io/deephaven/util/codec/BigDecimalCodec.java
index 697b9acfa50..2f0d9fcdfa2 100644
--- a/Util/src/main/java/io/deephaven/util/codec/BigDecimalCodec.java
+++ b/codec/builtin/src/main/java/io/deephaven/util/codec/BigDecimalCodec.java
@@ -3,7 +3,6 @@
 //
 package io.deephaven.util.codec;
 
-import io.deephaven.datastructures.util.CollectionUtil;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
@@ -73,18 +72,18 @@ public BigDecimalCodec(@Nullable String arguments) {
         try {
             int _precision = 0, _scale = 0; // zero indicates unlimited precision/scale, variable width encoding
             boolean _strict = true;
-            if (arguments != null && arguments.trim().length() > 0) {
+            if (arguments != null && !arguments.trim().isEmpty()) {
                 final String[] tokens = arguments.split(",");
-                if (tokens.length > 0 && tokens[0].trim().length() > 0) {
+                if (tokens.length > 0 && !tokens[0].trim().isEmpty()) {
                     _precision = Integer.parseInt(tokens[0].trim());
                     if (_precision < 1) {
                         throw new IllegalArgumentException("Specified precision must be >= 1");
                     }
                 }
-                if (tokens.length > 1 && tokens[1].trim().length() > 0) {
+                if (tokens.length > 1 && !tokens[1].trim().isEmpty()) {
                     _scale = Integer.parseInt(tokens[1].trim());
                 }
-                if (tokens.length > 2 && tokens[2].trim().length() > 0) {
+                if (tokens.length > 2 && !tokens[2].trim().isEmpty()) {
                     String mode = tokens[2].trim();
                     switch (mode.toLowerCase()) {
                         case "allowrounding":
@@ -141,13 +140,12 @@ private void init() {
             final byte[] unscaledZero = BigDecimal.ZERO.unscaledValue().toByteArray();
             zeroBytes = new byte[Integer.BYTES + unscaledZero.length];
             Arrays.fill(zeroBytes, (byte) 0);
-            nullBytes = CollectionUtil.ZERO_LENGTH_BYTE_ARRAY;
+            nullBytes = CodecUtil.ZERO_LENGTH_BYTE_ARRAY;
         }
     }
 
-    @NotNull
     @Override
-    public byte[] encode(@Nullable final BigDecimal input) {
+    public byte @NotNull [] encode(@Nullable final BigDecimal input) {
         if (input == null) {
             return nullBytes;
         }
@@ -173,7 +171,7 @@ public byte[] encode(@Nullable final BigDecimal input) {
         // (i.e. too high a scale requires reducing precision to "make room")
         if ((value.precision() > this.precision || value.scale() > scale)) {
             if (strict) {
-                throw new IllegalArgumentException("Unable to encode value " + value.toString() + " with precision "
+                throw new IllegalArgumentException("Unable to encode value " + value + " with precision "
                         + precision + " scale " + scale);
             }
             final int targetPrecision = Math.min(precision, value.precision() - Math.max(0, value.scale() - scale));
@@ -194,7 +192,7 @@ public byte[] encode(@Nullable final BigDecimal input) {
         // copy unscaled bytes to proper size array
         final byte[] unscaledValue = value.unscaledValue().toByteArray();
         if (unscaledValue.length >= bytes.length) { // unscaled value must be at most one less than length of our buffer
-            throw new IllegalArgumentException("Value " + input.toString() + " is too large to encode with precision "
+            throw new IllegalArgumentException("Value " + input + " is too large to encode with precision "
                     + precision + " and scale " + scale);
         }
 
@@ -213,7 +211,7 @@ public byte[] encode(@Nullable final BigDecimal input) {
 
     @Nullable
     @Override
-    public BigDecimal decode(@NotNull final byte[] input, final int offset, final int length) {
+    public BigDecimal decode(final byte @NotNull [] input, final int offset, final int length) {
 
         // variable size value
         if (precision == 0) {
diff --git a/Util/src/main/java/io/deephaven/util/codec/BigIntegerCodec.java b/codec/builtin/src/main/java/io/deephaven/util/codec/BigIntegerCodec.java
similarity index 90%
rename from Util/src/main/java/io/deephaven/util/codec/BigIntegerCodec.java
rename to codec/builtin/src/main/java/io/deephaven/util/codec/BigIntegerCodec.java
index 024632e66cd..f9b19918cfe 100644
--- a/Util/src/main/java/io/deephaven/util/codec/BigIntegerCodec.java
+++ b/codec/builtin/src/main/java/io/deephaven/util/codec/BigIntegerCodec.java
@@ -32,7 +32,7 @@ public BigIntegerCodec(@Nullable String arguments) {
         // noinspection ConstantConditions
         try {
             int _precision = 0; // zero indicates unlimited precision, variable width encoding
-            if (arguments != null && arguments.trim().length() > 0) {
+            if (arguments != null && !arguments.trim().isEmpty()) {
                 _precision = Integer.parseInt(arguments.trim());
                 if (_precision < 1) {
                     throw new IllegalArgumentException("Specified precision must be >= 1");
@@ -61,9 +61,8 @@ public int getScale() {
         return 0;
     }
 
-    @NotNull
     @Override
-    public byte[] encode(@Nullable final BigInteger input) {
+    public byte @NotNull [] encode(@Nullable final BigInteger input) {
         return input == null
                 ? codec.encodedNullValue()
                 : codec.encode(new BigDecimal(input));
@@ -71,7 +70,7 @@ public byte[] encode(@Nullable final BigInteger input) {
 
     @Nullable
     @Override
-    public BigInteger decode(@NotNull final byte[] input, final int offset, final int length) {
+    public BigInteger decode(final byte @NotNull [] input, final int offset, final int length) {
         final BigDecimal bd = codec.decode(input, offset, length);
         return bd == null ? null : bd.toBigInteger();
     }
diff --git a/codec/builtin/src/main/java/io/deephaven/util/codec/CodecUtil.java b/codec/builtin/src/main/java/io/deephaven/util/codec/CodecUtil.java
new file mode 100644
index 00000000000..27c02c81625
--- /dev/null
+++ b/codec/builtin/src/main/java/io/deephaven/util/codec/CodecUtil.java
@@ -0,0 +1,68 @@
+//
+// Copyright (c) 2016-2024 Deephaven Data Labs and Patent Pending
+//
+package io.deephaven.util.codec;
+
+import io.deephaven.base.string.EncodingInfo;
+import org.jetbrains.annotations.NotNull;
+
+import java.nio.BufferOverflowException;
+import java.nio.BufferUnderflowException;
+import java.nio.ByteBuffer;
+import java.nio.CharBuffer;
+import java.nio.charset.CharacterCodingException;
+import java.nio.charset.CharsetDecoder;
+import java.nio.charset.CharsetEncoder;
+
+class CodecUtil {
+    public static final byte[] ZERO_LENGTH_BYTE_ARRAY = new byte[0];
+
+    private CodecUtil() {}
+
+    /**
+     * Encode the given string in UTF-8 format into the given ByteBuffer. The string is encoded as an int length
+     * followed by the encoded bytes.
+     *
+     * @param destination a ByteBuffer in which to encode the string. The buffer must be big enough for the encoded
+     *        string.
+     * @param value the String value to encode.
+     * @throws BufferOverflowException if the destination isn't big enough.
+     */
+    public static void putUtf8String(@NotNull final ByteBuffer destination, @NotNull final String value) {
+        final int initialPosition = destination.position();
+        destination.position(initialPosition + Integer.BYTES);
+        final CharsetEncoder encoder = EncodingInfo.UTF_8.getEncoder().reset();
+        if (!encoder.encode(CharBuffer.wrap(value), destination, true).isUnderflow()
+                || !encoder.flush(destination).isUnderflow()) {
+            throw new BufferOverflowException();
+        }
+        destination.putInt(initialPosition, destination.position() - initialPosition - Integer.BYTES);
+    }
+
+    /**
+     * Extract a UTF-8 encoded string from the given buffer. The buffer must be positioned at the start of the encoding,
+     * which is an int length followed by the UTF-8 encoded bytes. The buffer is advanced to the end of the string.
+     *
+     * @param source a ByteBuffer positioned at the string encoded as length + UTF-8 encoded bytes.
+     * @return a new String extracted from the buffer
+     * @throws BufferUnderflowException if there isn't enough data in the source ByteBuffer
+     * @throws IllegalArgumentException if there is a decoding error
+     */
+    public static String getUtf8String(@NotNull final ByteBuffer source) {
+        final int length = source.getInt();
+        final int initialLimit = source.limit();
+        final CharsetDecoder decoder = EncodingInfo.UTF_8.getDecoder().reset();
+        if (length > source.remaining()) {
+            throw new BufferUnderflowException();
+        }
+        source.limit(source.position() + length);
+        final String result;
+        try {
+            result = decoder.decode(source).toString();
+        } catch (CharacterCodingException e) {
+            throw new IllegalArgumentException("Unexpectedly failed to decode input bytes", e);
+        }
+        source.limit(initialLimit);
+        return result;
+    }
+}
diff --git a/Util/src/main/java/io/deephaven/util/codec/ExternalizableCodec.java b/codec/builtin/src/main/java/io/deephaven/util/codec/ExternalizableCodec.java
similarity index 84%
rename from Util/src/main/java/io/deephaven/util/codec/ExternalizableCodec.java
rename to codec/builtin/src/main/java/io/deephaven/util/codec/ExternalizableCodec.java
index eb2d42a2d9c..79585c8fc3b 100644
--- a/Util/src/main/java/io/deephaven/util/codec/ExternalizableCodec.java
+++ b/codec/builtin/src/main/java/io/deephaven/util/codec/ExternalizableCodec.java
@@ -7,6 +7,7 @@
 import org.jetbrains.annotations.Nullable;
 
 import java.io.*;
+import java.lang.reflect.InvocationTargetException;
 
 public class ExternalizableCodec<T extends Externalizable> implements ObjectCodec<T> {
 
@@ -21,9 +22,8 @@ public ExternalizableCodec(String className) {
         }
     }
 
-    @NotNull
     @Override
-    public byte[] encode(@Nullable T input) {
+    public byte @NotNull [] encode(@Nullable T input) {
         if (input == null) {
             throw new UnsupportedOperationException(getClass() + " does not support null input");
         }
@@ -55,16 +55,17 @@ public int getScale() {
 
     @Nullable
     @Override
-    public T decode(@NotNull byte[] input, int offset, int length) {
+    public T decode(byte @NotNull [] input, int offset, int length) {
         try {
             final ByteArrayInputStream byteInput = new ByteArrayInputStream(input, offset, length);
             final ObjectInputStream objectInput = new ObjectInputStream(byteInput);
-            T result = externalizableClass.newInstance();
+            T result = externalizableClass.getDeclaredConstructor().newInstance();
             result.readExternal(objectInput);
             return result;
         } catch (IOException e) {
             throw new UncheckedIOException(e);
-        } catch (IllegalAccessException | InstantiationException | ClassNotFoundException e) {
+        } catch (IllegalAccessException | InstantiationException | ClassNotFoundException | InvocationTargetException
+                | NoSuchMethodException e) {
             throw new RuntimeException(e);
         }
     }
diff --git a/Util/src/main/java/io/deephaven/util/codec/LocalDateCodec.java b/codec/builtin/src/main/java/io/deephaven/util/codec/LocalDateCodec.java
similarity index 97%
rename from Util/src/main/java/io/deephaven/util/codec/LocalDateCodec.java
rename to codec/builtin/src/main/java/io/deephaven/util/codec/LocalDateCodec.java
index 3870fa3ac57..20f60c42dd3 100644
--- a/Util/src/main/java/io/deephaven/util/codec/LocalDateCodec.java
+++ b/codec/builtin/src/main/java/io/deephaven/util/codec/LocalDateCodec.java
@@ -104,9 +104,8 @@ public int getScale() {
         return 0;
     }
 
-    @NotNull
     @Override
-    public byte[] encode(@Nullable final LocalDate input) {
+    public byte @NotNull [] encode(@Nullable final LocalDate input) {
         if (input == null) {
             if (nullBytes != null) {
                 return nullBytes;
@@ -157,7 +156,7 @@ public byte[] encode(@Nullable final LocalDate input) {
 
     @Nullable
     @Override
-    public LocalDate decode(@NotNull final byte[] input, final int offset, final int length) {
+    public LocalDate decode(final byte @NotNull [] input, final int offset, final int length) {
         final int year, month, dayOfMonth;
         if (input[offset] == NULL_INDICATOR) {
             return null;
diff --git a/Util/src/main/java/io/deephaven/util/codec/LocalTimeCodec.java b/codec/builtin/src/main/java/io/deephaven/util/codec/LocalTimeCodec.java
similarity index 97%
rename from Util/src/main/java/io/deephaven/util/codec/LocalTimeCodec.java
rename to codec/builtin/src/main/java/io/deephaven/util/codec/LocalTimeCodec.java
index 24aa7a9784c..013ebd01de4 100644
--- a/Util/src/main/java/io/deephaven/util/codec/LocalTimeCodec.java
+++ b/codec/builtin/src/main/java/io/deephaven/util/codec/LocalTimeCodec.java
@@ -99,9 +99,8 @@ public int getScale() {
         return 0;
     }
 
-    @NotNull
     @Override
-    public byte[] encode(@Nullable final LocalTime input) {
+    public byte @NotNull [] encode(@Nullable final LocalTime input) {
 
         if (input == null) {
             if (nullBytes != null) {
@@ -130,7 +129,7 @@ public byte[] encode(@Nullable final LocalTime input) {
 
     @Nullable
     @Override
-    public LocalTime decode(@NotNull final byte[] input, final int offset, final int length) {
+    public LocalTime decode(final byte @NotNull [] input, final int offset, final int length) {
         // test for null indicator (leading bit)
         if ((input[offset] & NULL_INDICATOR) != 0) {
             return null;
diff --git a/Util/src/main/java/io/deephaven/util/codec/MapCodec.java b/codec/builtin/src/main/java/io/deephaven/util/codec/MapCodec.java
similarity index 90%
rename from Util/src/main/java/io/deephaven/util/codec/MapCodec.java
rename to codec/builtin/src/main/java/io/deephaven/util/codec/MapCodec.java
index 6bd18bb96da..45dbd324b09 100644
--- a/Util/src/main/java/io/deephaven/util/codec/MapCodec.java
+++ b/codec/builtin/src/main/java/io/deephaven/util/codec/MapCodec.java
@@ -3,7 +3,6 @@
 //
 package io.deephaven.util.codec;
 
-import io.deephaven.datastructures.util.CollectionUtil;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
@@ -23,7 +22,6 @@
  */
 @SuppressWarnings("unused")
 public abstract class MapCodec<K, V> implements ObjectCodec<Map<K, V>> {
-    private static final byte[] nullBytes = CollectionUtil.ZERO_LENGTH_BYTE_ARRAY;
     private static final byte[] zeroBytes = new byte[4];
 
     private static final int MINIMUM_SCRATCH_CAPACITY = 4096;
@@ -47,13 +45,12 @@ public int getScale() {
         return 0;
     }
 
-    @NotNull
     @Override
-    public byte[] encode(@Nullable final Map<K, V> input) {
+    public byte @NotNull [] encode(@Nullable final Map<K, V> input) {
         if (input == null) {
-            return nullBytes;
+            return CodecUtil.ZERO_LENGTH_BYTE_ARRAY;
         }
-        if (input.size() == 0) {
+        if (input.isEmpty()) {
             return zeroBytes;
         }
 
@@ -115,11 +112,10 @@ private ByteBuffer encodeIntoBuffer(final ByteBuffer scratch, @NotNull Map<K, V>
 
     @Nullable
     @Override
-    public Map<K, V> decode(@NotNull final byte[] input, final int offset, final int length) {
-        if (input.length == 0) {
+    public Map<K, V> decode(@NotNull final ByteBuffer byteBuffer) {
+        if (byteBuffer.remaining() == 0) {
             return null;
         }
-        final ByteBuffer byteBuffer = ByteBuffer.wrap(input);
         final int size = byteBuffer.getInt();
         if (size == 0) {
             return Collections.emptyMap();
@@ -129,13 +125,22 @@ public Map<K, V> decode(@NotNull final byte[] input, final int offset, final int
             final V value = decodeValue(byteBuffer);
             return Collections.singletonMap(key, value);
         }
-        final LinkedHashMap<K, V> result = new LinkedHashMap<>(size);
+        final Map<K, V> result = new LinkedHashMap<>(size);
         for (int ii = 0; ii < size; ++ii) {
             result.put(decodeKey(byteBuffer), decodeValue(byteBuffer));
         }
         return Collections.unmodifiableMap(result);
     }
 
+    @Nullable
+    @Override
+    public Map<K, V> decode(final byte @NotNull [] input, final int offset, final int length) {
+        if (input.length == 0) {
+            return null;
+        }
+        return decode(ByteBuffer.wrap(input, offset, length));
+    }
+
     /**
      * Estimate the size of the encoded map.
      *
diff --git a/Util/src/main/java/io/deephaven/util/codec/SerializableCodec.java b/codec/builtin/src/main/java/io/deephaven/util/codec/SerializableCodec.java
similarity index 93%
rename from Util/src/main/java/io/deephaven/util/codec/SerializableCodec.java
rename to codec/builtin/src/main/java/io/deephaven/util/codec/SerializableCodec.java
index b9570299a49..9cd08f24abf 100644
--- a/Util/src/main/java/io/deephaven/util/codec/SerializableCodec.java
+++ b/codec/builtin/src/main/java/io/deephaven/util/codec/SerializableCodec.java
@@ -21,9 +21,8 @@ private SerializableCodec() {}
 
     public SerializableCodec(@SuppressWarnings("unused") String dummy) {}
 
-    @NotNull
     @Override
-    public byte[] encode(@Nullable T input) {
+    public byte @NotNull [] encode(@Nullable T input) {
         try {
             final ByteArrayOutputStream byteOutput = new ByteArrayOutputStream();
             final ObjectOutputStream objectOutput = new ObjectOutputStream(byteOutput);
@@ -52,7 +51,7 @@ public int getScale() {
 
     @Nullable
     @Override
-    public T decode(@NotNull byte[] input, int offset, int length) {
+    public T decode(byte @NotNull [] input, int offset, int length) {
         try {
             final ByteArrayInputStream byteInput = new ByteArrayInputStream(input, offset, length);
             final ObjectInputStream objectInput = new ObjectInputStream(byteInput);
diff --git a/Util/src/main/java/io/deephaven/util/codec/SimpleByteArrayCodec.java b/codec/builtin/src/main/java/io/deephaven/util/codec/SimpleByteArrayCodec.java
similarity index 84%
rename from Util/src/main/java/io/deephaven/util/codec/SimpleByteArrayCodec.java
rename to codec/builtin/src/main/java/io/deephaven/util/codec/SimpleByteArrayCodec.java
index e315e851b37..1dae95849ff 100644
--- a/Util/src/main/java/io/deephaven/util/codec/SimpleByteArrayCodec.java
+++ b/codec/builtin/src/main/java/io/deephaven/util/codec/SimpleByteArrayCodec.java
@@ -3,7 +3,6 @@
 //
 package io.deephaven.util.codec;
 
-import io.deephaven.datastructures.util.CollectionUtil;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
@@ -43,13 +42,14 @@ public SimpleByteArrayCodec(@Nullable final String arguments) {
         expectedWidth = size;
     }
 
-    @NotNull
     @Override
-    public byte[] encode(@Nullable final byte[] input) {
+    public byte @NotNull [] encode(final byte @Nullable [] input) {
         if (input == null) {
             throw new IllegalArgumentException(SimpleByteArrayCodec.class.getSimpleName() + " cannot encode nulls");
         }
-        return input;
+        final byte[] output = new byte[input.length];
+        System.arraycopy(input, 0, output, 0, input.length);
+        return output;
     }
 
     @Override
@@ -67,14 +67,10 @@ public int getScale() {
         return 0;
     }
 
-    @Nullable
     @Override
-    public byte[] decode(@NotNull final byte[] input, final int offset, final int length) {
+    public byte @Nullable [] decode(final byte @NotNull [] input, final int offset, final int length) {
         if (input.length == 0) {
-            return CollectionUtil.ZERO_LENGTH_BYTE_ARRAY;
-        }
-        if (offset == 0 && length == input.length) {
-            return input;
+            return CodecUtil.ZERO_LENGTH_BYTE_ARRAY;
         }
         final byte[] output = new byte[length];
         System.arraycopy(input, offset, output, 0, length);
diff --git a/Util/src/main/java/io/deephaven/util/codec/StringBooleanMapCodec.java b/codec/builtin/src/main/java/io/deephaven/util/codec/StringBooleanMapCodec.java
similarity index 100%
rename from Util/src/main/java/io/deephaven/util/codec/StringBooleanMapCodec.java
rename to codec/builtin/src/main/java/io/deephaven/util/codec/StringBooleanMapCodec.java
diff --git a/Util/src/main/java/io/deephaven/util/codec/StringDoubleMapCodec.java b/codec/builtin/src/main/java/io/deephaven/util/codec/StringDoubleMapCodec.java
similarity index 100%
rename from Util/src/main/java/io/deephaven/util/codec/StringDoubleMapCodec.java
rename to codec/builtin/src/main/java/io/deephaven/util/codec/StringDoubleMapCodec.java
diff --git a/Util/src/main/java/io/deephaven/util/codec/StringFloatMapCodec.java b/codec/builtin/src/main/java/io/deephaven/util/codec/StringFloatMapCodec.java
similarity index 100%
rename from Util/src/main/java/io/deephaven/util/codec/StringFloatMapCodec.java
rename to codec/builtin/src/main/java/io/deephaven/util/codec/StringFloatMapCodec.java
diff --git a/Util/src/main/java/io/deephaven/util/codec/StringIntMapCodec.java b/codec/builtin/src/main/java/io/deephaven/util/codec/StringIntMapCodec.java
similarity index 100%
rename from Util/src/main/java/io/deephaven/util/codec/StringIntMapCodec.java
rename to codec/builtin/src/main/java/io/deephaven/util/codec/StringIntMapCodec.java
diff --git a/Util/src/main/java/io/deephaven/util/codec/StringKeyedMapCodec.java b/codec/builtin/src/main/java/io/deephaven/util/codec/StringKeyedMapCodec.java
similarity index 88%
rename from Util/src/main/java/io/deephaven/util/codec/StringKeyedMapCodec.java
rename to codec/builtin/src/main/java/io/deephaven/util/codec/StringKeyedMapCodec.java
index 50650f1668d..a38124e360a 100644
--- a/Util/src/main/java/io/deephaven/util/codec/StringKeyedMapCodec.java
+++ b/codec/builtin/src/main/java/io/deephaven/util/codec/StringKeyedMapCodec.java
@@ -3,8 +3,6 @@
 //
 package io.deephaven.util.codec;
 
-import io.deephaven.util.EncodingUtil;
-
 import java.nio.ByteBuffer;
 import java.util.Map;
 
@@ -36,11 +34,11 @@ int estimateSize(Map<String, V> input) {
 
     @Override
     String decodeKey(ByteBuffer byteBuffer) {
-        return EncodingUtil.getUtf8String(byteBuffer);
+        return CodecUtil.getUtf8String(byteBuffer);
     }
 
     @Override
     void encodeKey(ByteBuffer scratch, String key) {
-        EncodingUtil.putUtf8String(scratch, key);
+        CodecUtil.putUtf8String(scratch, key);
     }
 }
diff --git a/Util/src/main/java/io/deephaven/util/codec/StringLongMapCodec.java b/codec/builtin/src/main/java/io/deephaven/util/codec/StringLongMapCodec.java
similarity index 100%
rename from Util/src/main/java/io/deephaven/util/codec/StringLongMapCodec.java
rename to codec/builtin/src/main/java/io/deephaven/util/codec/StringLongMapCodec.java
diff --git a/Util/src/main/java/io/deephaven/util/codec/StringStringMapCodec.java b/codec/builtin/src/main/java/io/deephaven/util/codec/StringStringMapCodec.java
similarity index 89%
rename from Util/src/main/java/io/deephaven/util/codec/StringStringMapCodec.java
rename to codec/builtin/src/main/java/io/deephaven/util/codec/StringStringMapCodec.java
index f85a6914759..4229d583460 100644
--- a/Util/src/main/java/io/deephaven/util/codec/StringStringMapCodec.java
+++ b/codec/builtin/src/main/java/io/deephaven/util/codec/StringStringMapCodec.java
@@ -3,7 +3,6 @@
 //
 package io.deephaven.util.codec;
 
-import io.deephaven.util.EncodingUtil;
 import org.jetbrains.annotations.Nullable;
 
 import java.nio.ByteBuffer;
@@ -40,11 +39,11 @@ int getValueSize() {
 
     @Override
     String decodeValue(ByteBuffer byteBuffer) {
-        return EncodingUtil.getUtf8String(byteBuffer);
+        return CodecUtil.getUtf8String(byteBuffer);
     }
 
     @Override
     void encodeValue(ByteBuffer scratch, String value) {
-        EncodingUtil.putUtf8String(scratch, value);
+        CodecUtil.putUtf8String(scratch, value);
     }
 }
diff --git a/Util/src/main/java/io/deephaven/util/codec/UTF8StringAsByteArrayCodec.java b/codec/builtin/src/main/java/io/deephaven/util/codec/UTF8StringAsByteArrayCodec.java
similarity index 93%
rename from Util/src/main/java/io/deephaven/util/codec/UTF8StringAsByteArrayCodec.java
rename to codec/builtin/src/main/java/io/deephaven/util/codec/UTF8StringAsByteArrayCodec.java
index 5f32d7568d9..df29640baee 100644
--- a/Util/src/main/java/io/deephaven/util/codec/UTF8StringAsByteArrayCodec.java
+++ b/codec/builtin/src/main/java/io/deephaven/util/codec/UTF8StringAsByteArrayCodec.java
@@ -44,9 +44,8 @@ public UTF8StringAsByteArrayCodec(@Nullable final String arguments) {
         expectedWidth = size;
     }
 
-    @NotNull
     @Override
-    public byte[] encode(@Nullable final String input) {
+    public byte @NotNull [] encode(@Nullable final String input) {
         if (input == null) {
             throw new IllegalArgumentException(
                     UTF8StringAsByteArrayCodec.class.getSimpleName() + " cannot encode nulls");
@@ -71,7 +70,7 @@ public int getScale() {
 
     @Nullable
     @Override
-    public String decode(@NotNull final byte[] input, final int offset, final int length) {
+    public String decode(final byte @NotNull [] input, final int offset, final int length) {
         return new String(input, offset, length, StandardCharsets.UTF_8);
     }
 
diff --git a/Util/src/main/java/io/deephaven/util/codec/ZonedDateTimeCodec.java b/codec/builtin/src/main/java/io/deephaven/util/codec/ZonedDateTimeCodec.java
similarity index 90%
rename from Util/src/main/java/io/deephaven/util/codec/ZonedDateTimeCodec.java
rename to codec/builtin/src/main/java/io/deephaven/util/codec/ZonedDateTimeCodec.java
index e5092332dcf..c928ff6b71f 100644
--- a/Util/src/main/java/io/deephaven/util/codec/ZonedDateTimeCodec.java
+++ b/codec/builtin/src/main/java/io/deephaven/util/codec/ZonedDateTimeCodec.java
@@ -3,7 +3,6 @@
 //
 package io.deephaven.util.codec;
 
-import io.deephaven.datastructures.util.CollectionUtil;
 import io.deephaven.util.QueryConstants;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
@@ -19,11 +18,10 @@ public class ZonedDateTimeCodec implements ObjectCodec<ZonedDateTime> {
 
     public ZonedDateTimeCodec(String args) {}
 
-    @NotNull
     @Override
-    public byte[] encode(@Nullable ZonedDateTime input) {
+    public byte @NotNull [] encode(@Nullable ZonedDateTime input) {
         if (input == null) {
-            return CollectionUtil.ZERO_LENGTH_BYTE_ARRAY;
+            return CodecUtil.ZERO_LENGTH_BYTE_ARRAY;
         }
 
         final int bufSize = computeSize(input);
@@ -40,7 +38,7 @@ public byte[] encode(@Nullable ZonedDateTime input) {
 
     @Nullable
     @Override
-    public ZonedDateTime decode(@NotNull byte[] input, int offset, int length) {
+    public ZonedDateTime decode(byte @NotNull [] input, int offset, int length) {
         if (length == 0) {
             return null;
         }
diff --git a/Util/src/test/java/io/deephaven/util/codec/BigDecimalCodecTest.java b/codec/builtin/src/test/java/io/deephaven/util/codec/BigDecimalCodecTest.java
similarity index 100%
rename from Util/src/test/java/io/deephaven/util/codec/BigDecimalCodecTest.java
rename to codec/builtin/src/test/java/io/deephaven/util/codec/BigDecimalCodecTest.java
diff --git a/Util/src/test/java/io/deephaven/util/codec/BigIntegerCodecTest.java b/codec/builtin/src/test/java/io/deephaven/util/codec/BigIntegerCodecTest.java
similarity index 100%
rename from Util/src/test/java/io/deephaven/util/codec/BigIntegerCodecTest.java
rename to codec/builtin/src/test/java/io/deephaven/util/codec/BigIntegerCodecTest.java
diff --git a/Util/src/test/java/io/deephaven/util/codec/LocalDateCodecTest.java b/codec/builtin/src/test/java/io/deephaven/util/codec/LocalDateCodecTest.java
similarity index 100%
rename from Util/src/test/java/io/deephaven/util/codec/LocalDateCodecTest.java
rename to codec/builtin/src/test/java/io/deephaven/util/codec/LocalDateCodecTest.java
diff --git a/Util/src/test/java/io/deephaven/util/codec/LocalTimeCodecTest.java b/codec/builtin/src/test/java/io/deephaven/util/codec/LocalTimeCodecTest.java
similarity index 100%
rename from Util/src/test/java/io/deephaven/util/codec/LocalTimeCodecTest.java
rename to codec/builtin/src/test/java/io/deephaven/util/codec/LocalTimeCodecTest.java
diff --git a/Util/src/test/java/io/deephaven/util/codec/ZonedDateTimeCodecTest.java b/codec/builtin/src/test/java/io/deephaven/util/codec/ZonedDateTimeCodecTest.java
similarity index 97%
rename from Util/src/test/java/io/deephaven/util/codec/ZonedDateTimeCodecTest.java
rename to codec/builtin/src/test/java/io/deephaven/util/codec/ZonedDateTimeCodecTest.java
index 6c17e3cba49..5564ab4f660 100644
--- a/Util/src/test/java/io/deephaven/util/codec/ZonedDateTimeCodecTest.java
+++ b/codec/builtin/src/test/java/io/deephaven/util/codec/ZonedDateTimeCodecTest.java
@@ -3,6 +3,7 @@
 //
 package io.deephaven.util.codec;
 
+import org.junit.Assert;
 import org.junit.Test;
 
 import java.time.Instant;
@@ -10,7 +11,6 @@
 import java.time.ZonedDateTime;
 
 import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.fail;
 
 public class ZonedDateTimeCodecTest {
     private void roundTripWithOffset(final ZonedDateTime value, final int offset) {
@@ -42,7 +42,7 @@ public void testMax() {
             roundTripWithOffset(ZonedDateTime.ofInstant(
                     Instant.ofEpochSecond(ZonedDateTimeCodec.MAX_CONVERTIBLE_SECONDS + 1),
                     ZoneId.of("America/New_York")), 0);
-            fail();
+            Assert.fail();
         } catch (IllegalArgumentException ignored) {
         }
 
diff --git a/codec/cache/build.gradle b/codec/cache/build.gradle
new file mode 100644
index 00000000000..d28f2793e9c
--- /dev/null
+++ b/codec/cache/build.gradle
@@ -0,0 +1,12 @@
+plugins {
+    id 'java-library'
+    id 'io.deephaven.project.register'
+}
+
+description 'Codec Cache: Deephaven Codec Cache'
+
+dependencies {
+    api project(":codec-api")
+
+    compileOnly libs.jetbrains.annotations
+}
diff --git a/codec/cache/gradle.properties b/codec/cache/gradle.properties
new file mode 100644
index 00000000000..c186bbfdde1
--- /dev/null
+++ b/codec/cache/gradle.properties
@@ -0,0 +1 @@
+io.deephaven.project.ProjectType=JAVA_PUBLIC
diff --git a/codec/cache/src/main/java/io/deephaven/util/codec/CodecCache.java b/codec/cache/src/main/java/io/deephaven/util/codec/CodecCache.java
new file mode 100644
index 00000000000..10c2517090f
--- /dev/null
+++ b/codec/cache/src/main/java/io/deephaven/util/codec/CodecCache.java
@@ -0,0 +1,76 @@
+//
+// Copyright (c) 2016-2024 Deephaven Data Labs and Patent Pending
+//
+package io.deephaven.util.codec;
+
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
+
+import java.lang.reflect.Constructor;
+import java.lang.reflect.InvocationTargetException;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.Objects;
+
+/**
+ * Cache for {@link ObjectCodec} instances.
+ */
+public enum CodecCache {
+    DEFAULT;
+
+    /**
+     * Cached item.
+     */
+    private static class Item {
+
+        @NotNull
+        private final ObjectCodec<?> codec;
+
+        private Item(@NotNull final String className,
+                @Nullable final String arguments) {
+            Objects.requireNonNull(className);
+
+            final Class<? extends ObjectCodec> codecClass;
+            try {
+                // noinspection unchecked
+                codecClass = (Class<? extends ObjectCodec>) Class.forName(className);
+            } catch (ClassNotFoundException e) {
+                throw new CodecCacheException("Unknown codec class " + className, e);
+            }
+            final Constructor<? extends ObjectCodec> codecConstructor;
+            try {
+                codecConstructor = codecClass.getConstructor(String.class);
+            } catch (NoSuchMethodException e) {
+                throw new CodecCacheException("Codec class " + codecClass + " is missing expected String constructor",
+                        e);
+            }
+            try {
+                codec = codecConstructor.newInstance(arguments);
+            } catch (InstantiationException | IllegalAccessException | InvocationTargetException
+                    | ClassCastException e) {
+                throw new CodecCacheException(
+                        "Failed to instantiate codec of type " + codecClass + " from arguments " + arguments, e);
+            }
+        }
+    }
+
+    private final Map<String, Map<String, Item>> items = new HashMap<>();
+
+    /**
+     * Get or create a cached {@link ObjectCodec}.
+     *
+     * @param className The class name
+     * @param arguments The constructor arguments
+     * @param <TYPE> The encoding type
+     * @return The corresponding {@link ObjectCodec}
+     * @throws CodecCacheException If an error occurred while instantiating the named codec class from the supplied
+     *         arguments
+     */
+    public synchronized <TYPE> ObjectCodec<TYPE> getCodec(@NotNull final String className,
+            @Nullable final String arguments) {
+        // noinspection unchecked
+        return (ObjectCodec<TYPE>) items
+                .computeIfAbsent(className, (cn) -> new HashMap<>())
+                .computeIfAbsent(arguments, (a) -> new Item(className, a)).codec;
+    }
+}
diff --git a/Util/src/main/java/io/deephaven/util/codec/CodecCacheException.java b/codec/cache/src/main/java/io/deephaven/util/codec/CodecCacheException.java
similarity index 100%
rename from Util/src/main/java/io/deephaven/util/codec/CodecCacheException.java
rename to codec/cache/src/main/java/io/deephaven/util/codec/CodecCacheException.java
diff --git a/codegen/build.gradle b/codegen/build.gradle
index f1e4c38a25e..d3bc3a69ba3 100644
--- a/codegen/build.gradle
+++ b/codegen/build.gradle
@@ -7,6 +7,6 @@ plugins {
 description 'Codegen: Code generation utilities'
 
 dependencies {
-    implementation 'org.freemarker:freemarker:2.3.31'
-    Classpaths.inheritJUnitClassic(project, 'testImplementation')
+    implementation libs.freemarker
+    testImplementation libs.junit4
 }
\ No newline at end of file
diff --git a/cog.toml b/cog.toml
new file mode 100644
index 00000000000..bf4a185fe6c
--- /dev/null
+++ b/cog.toml
@@ -0,0 +1,6 @@
+[changelog]
+path = "CHANGELOG.md"
+template = "deephaven-changelog"
+remote = "github.com"
+repository = "deephaven-core"
+owner = "deephaven"
\ No newline at end of file
diff --git a/containers/groovy-examples/README.md b/containers/groovy-examples/README.md
index 2d295145a99..42cd7104702 100644
--- a/containers/groovy-examples/README.md
+++ b/containers/groovy-examples/README.md
@@ -10,7 +10,7 @@ A Docker Compose deployment for [Deephaven](https://deephaven.io).
 
 ## Launch Deephaven
 
-For launch instructions, see the [README](https://github.com/deephaven/deephaven-core#launch-groovy--java-with-example-data).  For full instructions to work with Deephaven, see the [Quick start](https://deephaven.io/core/docs/tutorials/quickstart).
+For launch instructions, see the [README](https://github.com/deephaven/deephaven-core#launch-groovy--java-with-example-data).  For full instructions to work with Deephaven, see the [Quickstart](https://deephaven.io/core/groovy/docs/tutorials/quickstart/).
 
 To launch Deephaven, execute the following in your deployment directory:
 
diff --git a/containers/python-examples-redpanda/README.md b/containers/python-examples-redpanda/README.md
index 1082408865f..aa98f0c90c7 100644
--- a/containers/python-examples-redpanda/README.md
+++ b/containers/python-examples-redpanda/README.md
@@ -11,7 +11,7 @@ A Docker Compose deployment for [Deephaven](https://deephaven.io).
 
 ## Launch Deephaven
 
-For instructions on launching and using Kafka in Deephaven, see[How to connect to a Kafka stream](https://deephaven.io/core/groovy/docs/how-to-guides/data-import-export/kafka-stream/). For instructions on getting started with Deephaven, see the [Quickstart](https://deephaven.io/core/docs/tutorials/quickstart).
+For instructions on launching and using Kafka in Deephaven, see[How to connect to a Kafka stream](https://deephaven.io/core/groovy/docs/how-to-guides/data-import-export/kafka-stream/). For instructions on getting started with Deephaven, see the [Quickstart](https://deephaven.io/core/docs/getting-started/quickstart/).
 
 To launch Deephaven, execute the following in your deployment directory:
 
diff --git a/containers/python-examples/All-AI/README.md b/containers/python-examples/All-AI/README.md
index e3865505387..e676aa93179 100644
--- a/containers/python-examples/All-AI/README.md
+++ b/containers/python-examples/All-AI/README.md
@@ -14,7 +14,7 @@ A Docker Compose deployment for [Deephaven](https://deephaven.io).
 
 ## Launch Deephaven
 
-For launch instructions, see the [README](https://github.com/deephaven/deephaven-core#launch-python-with-example-data).  For full instructions to work with Deephaven, see the [Quick start](https://deephaven.io/core/docs/tutorials/quickstart).
+For launch instructions, see the [README](https://github.com/deephaven/deephaven-core#launch-python-with-example-data).  For full instructions to work with Deephaven, see the [Quick start](https://deephaven.io/core/docs/getting-started/quickstart/).
 
 To launch Deephaven, execute the following in your deployment directory:
 
diff --git a/containers/python-examples/NLTK/README.md b/containers/python-examples/NLTK/README.md
index 9c84a31c5a6..37ba92b9214 100644
--- a/containers/python-examples/NLTK/README.md
+++ b/containers/python-examples/NLTK/README.md
@@ -11,7 +11,7 @@ A Docker Compose deployment for [Deephaven](https://deephaven.io).
 
 ## Launch Deephaven
 
-For launch instructions, see the [README](https://github.com/deephaven/deephaven-core#launch-python-with-example-data).  For full instructions to work with Deephaven, see the [Quick start](https://deephaven.io/core/docs/tutorials/quickstart).
+For launch instructions, see the [README](https://github.com/deephaven/deephaven-core#launch-python-with-example-data).  For full instructions to work with Deephaven, see the [Quick start](https://deephaven.io/core/docs/getting-started/quickstart/).
 
 To launch Deephaven, execute the following in your deployment directory:
 
diff --git a/containers/python-examples/PyTorch/README.md b/containers/python-examples/PyTorch/README.md
index c2cae1968ce..13fe459feca 100644
--- a/containers/python-examples/PyTorch/README.md
+++ b/containers/python-examples/PyTorch/README.md
@@ -11,7 +11,7 @@ A Docker Compose deployment for [Deephaven](https://deephaven.io).
 
 ## Launch Deephaven
 
-For launch instructions, see the [README](https://github.com/deephaven/deephaven-core#launch-python-with-example-data).  For full instructions to work with Deephaven, see the [Quick start](https://deephaven.io/core/docs/tutorials/quickstart).
+For launch instructions, see the [README](https://github.com/deephaven/deephaven-core#launch-python-with-example-data).  For full instructions to work with Deephaven, see the [Quick start](https://deephaven.io/core/docs/getting-started/quickstart/).
 
 To launch Deephaven, execute the following in your deployment directory:
 
diff --git a/containers/python-examples/SciKit-Learn/README.md b/containers/python-examples/SciKit-Learn/README.md
index bc8d5253fed..913957acb25 100644
--- a/containers/python-examples/SciKit-Learn/README.md
+++ b/containers/python-examples/SciKit-Learn/README.md
@@ -11,7 +11,7 @@ A Docker Compose deployment for [Deephaven](https://deephaven.io).
 
 ## Launch Deephaven
 
-For launch instructions, see the [README](https://github.com/deephaven/deephaven-core#launch-python-with-example-data).  For full instructions to work with Deephaven, see the [Quick start](https://deephaven.io/core/docs/tutorials/quickstart).
+For launch instructions, see the [README](https://github.com/deephaven/deephaven-core#launch-python-with-example-data).  For full instructions to work with Deephaven, see the [Quick start](https://deephaven.io/core/docs/getting-started/quickstart/).
 
 To launch Deephaven, execute the following in your deployment directory:
 
diff --git a/containers/python-examples/TensorFlow/README.md b/containers/python-examples/TensorFlow/README.md
index e31fdbdb0f8..f147ec4958c 100644
--- a/containers/python-examples/TensorFlow/README.md
+++ b/containers/python-examples/TensorFlow/README.md
@@ -11,7 +11,7 @@ A Docker Compose deployment for [Deephaven](https://deephaven.io).
 
 ## Launch Deephaven
 
-For launch instructions, see the [README](https://github.com/deephaven/deephaven-core#launch-python-with-example-data).  For full instructions to work with Deephaven, see the [Quick start](https://deephaven.io/core/docs/tutorials/quickstart).
+For launch instructions, see the [README](https://github.com/deephaven/deephaven-core#launch-python-with-example-data).  For full instructions to work with Deephaven, see the [Quick start](https://deephaven.io/core/docs/getting-started/quickstart/).
 
 To launch Deephaven, execute the following in your deployment directory:
 
diff --git a/containers/python-examples/base/README.md b/containers/python-examples/base/README.md
index efbe018a81f..b7ab56d0cbc 100644
--- a/containers/python-examples/base/README.md
+++ b/containers/python-examples/base/README.md
@@ -10,7 +10,7 @@ A Docker Compose deployment for [Deephaven](https://deephaven.io).
 
 ## Launch Deephaven
 
-For launch instructions, see the [README](https://github.com/deephaven/deephaven-core#launch-python-with-example-data).  For full instructions to work with Deephaven, see the [Quick start](https://deephaven.io/core/docs/tutorials/quickstart).
+For launch instructions, see the [README](https://github.com/deephaven/deephaven-core#launch-python-with-example-data).  For full instructions to work with Deephaven, see the [Quick start](https://deephaven.io/core/docs/getting-started/quickstart/).
 
 To launch Deephaven, execute the following in your deployment directory:
 
diff --git a/containers/python-redpanda/README.md b/containers/python-redpanda/README.md
index 5e7645bb74b..77072bb202d 100644
--- a/containers/python-redpanda/README.md
+++ b/containers/python-redpanda/README.md
@@ -10,7 +10,7 @@ A Docker Compose deployment for [Deephaven](https://deephaven.io).
 
 ## Launch Deephaven
 
-For instructions on launching and using Kafka, see [How to connect to a Kafka stream](https://deephaven.io/core/docs/how-to-guides/data-import-export/kafka-stream/). For instructions on getting started with Deephaven, see the [Quickstart](https://deephaven.io/core/docs/tutorials/quickstart).
+For instructions on launching and using Kafka, see [How to connect to a Kafka stream](https://deephaven.io/core/docs/how-to-guides/data-import-export/kafka-stream/). For instructions on getting started with Deephaven, see the [Quickstart](https://deephaven.io/core/docs/getting-started/quickstart/).
 
 To launch Deephaven, execute the following in your deployment directory:
 
diff --git a/containers/python/All-AI/README.md b/containers/python/All-AI/README.md
index c71ae4c5c94..cd86fe95d76 100644
--- a/containers/python/All-AI/README.md
+++ b/containers/python/All-AI/README.md
@@ -13,7 +13,7 @@ A Docker Compose deployment for [Deephaven](https://deephaven.io).
 
 ## Launch Deephaven
 
-For launch instructions, see the [README](https://github.com/deephaven/deephaven-core#launch-python-with-example-data).  For full instructions to work with Deephaven, see the [Quick start](https://deephaven.io/core/docs/tutorials/quickstart).
+For launch instructions, see the [README](https://github.com/deephaven/deephaven-core#launch-python-with-example-data).  For full instructions to work with Deephaven, see the [Quick start](https://deephaven.io/core/docs/getting-started/quickstart/).
 
 To launch Deephaven, execute the following in your deployment directory:
 
diff --git a/containers/python/NLTK/README.md b/containers/python/NLTK/README.md
index 54e608603ef..f74de12677f 100644
--- a/containers/python/NLTK/README.md
+++ b/containers/python/NLTK/README.md
@@ -10,7 +10,7 @@ A Docker Compose deployment for [Deephaven](https://deephaven.io).
 
 ## Launch Deephaven
 
-For launch instructions, see the [README](https://github.com/deephaven/deephaven-core/#launch-python).  For full instructions to work with Deephaven, see the [Quick start](https://deephaven.io/core/docs/tutorials/quickstart).
+For launch instructions, see the [README](https://github.com/deephaven/deephaven-core/#launch-python).  For full instructions to work with Deephaven, see the [Quick start](https://deephaven.io/core/docs/getting-started/quickstart/).
 
 To launch Deephaven, execute the following in your deployment directory:
 
diff --git a/containers/python/PyTorch/README.md b/containers/python/PyTorch/README.md
index 3e276f39965..e768051d6d6 100644
--- a/containers/python/PyTorch/README.md
+++ b/containers/python/PyTorch/README.md
@@ -10,7 +10,7 @@ A Docker Compose deployment for [Deephaven](https://deephaven.io).
 
 ## Launch Deephaven
 
-For launch instructions, see the [README](https://github.com/deephaven/deephaven-core/#launch-python).  For full instructions to work with Deephaven, see the [Quick start](https://deephaven.io/core/docs/tutorials/quickstart).
+For launch instructions, see the [README](https://github.com/deephaven/deephaven-core/#launch-python).  For full instructions to work with Deephaven, see the [Quick start](https://deephaven.io/core/docs/getting-started/quickstart/).
 
 To launch Deephaven, execute the following in your deployment directory:
 
diff --git a/containers/python/SciKit-Learn/README.md b/containers/python/SciKit-Learn/README.md
index 9ddecaec399..20bb3c7402a 100644
--- a/containers/python/SciKit-Learn/README.md
+++ b/containers/python/SciKit-Learn/README.md
@@ -10,7 +10,7 @@ A Docker Compose deployment for [Deephaven](https://deephaven.io).
 
 ## Launch Deephaven
 
-For launch instructions, see the [README](https://github.com/deephaven/deephaven-core/#launch-python).  For full instructions to work with Deephaven, see the [Quick start](https://deephaven.io/core/docs/tutorials/quickstart).
+For launch instructions, see the [README](https://github.com/deephaven/deephaven-core/#launch-python).  For full instructions to work with Deephaven, see the [Quick start](https://deephaven.io/core/docs/getting-started/quickstart/).
 
 To launch Deephaven, execute the following in your deployment directory:
 
diff --git a/containers/python/TensorFlow/README.md b/containers/python/TensorFlow/README.md
index b208b794515..92f2aba00fa 100644
--- a/containers/python/TensorFlow/README.md
+++ b/containers/python/TensorFlow/README.md
@@ -10,7 +10,7 @@ A Docker Compose deployment for [Deephaven](https://deephaven.io).
 
 ## Launch Deephaven
 
-For launch instructions, see the [README](https://github.com/deephaven/deephaven-core#launch-python-with-example-data).  For full instructions to work with Deephaven, see the [Quick start](https://deephaven.io/core/docs/tutorials/quickstart).
+For launch instructions, see the [README](https://github.com/deephaven/deephaven-core#launch-python-with-example-data).  For full instructions to work with Deephaven, see the [Quick start](https://deephaven.io/core/docs/getting-started/quickstart/).
 
 To launch Deephaven, execute the following in your deployment directory:
 
diff --git a/containers/python/base/README.md b/containers/python/base/README.md
index c5e62a0a70a..0581f10cb00 100644
--- a/containers/python/base/README.md
+++ b/containers/python/base/README.md
@@ -9,7 +9,7 @@ A Docker Compose deployment for [Deephaven](https://deephaven.io).
 
 ## Launch Deephaven
 
-For launch instructions, see the [README](https://github.com/deephaven/deephaven-core/#launch-python).  For full instructions to work with Deephaven, see the [Quick start](https://deephaven.io/core/docs/tutorials/quickstart).
+For launch instructions, see the [README](https://github.com/deephaven/deephaven-core/#launch-python).  For full instructions to work with Deephaven, see the [Quick start](https://deephaven.io/core/docs/getting-started/quickstart/).
 
 To launch Deephaven, execute the following in your deployment directory:
 
diff --git a/cpp-client/README.md b/cpp-client/README.md
index d11aae49899..1100a188712 100644
--- a/cpp-client/README.md
+++ b/cpp-client/README.md
@@ -11,13 +11,26 @@ on them anymore so we do not guarantee they are current for those platforms.
 Instructions for Linux are below. Instructions for Windows are in the section
 that follows.
 
+# Before you build the client
+
+To actually use Deephaven, for example running these examples and unit
+tests, you will eventually need to have a server running. If you have
+an existing server running Deephaven Core, you should be able to
+connect to that. However, if you don't have one, you can follow the
+instructions [here](https://deephaven.io/core/docs/getting-started/launch-build/).
+
+Note that it is only possible to build a server on Linux. Building a server on
+Windows is not currently supported.
+
+You can build and install client libraries, tests, and examples
+without having a server installed. However you will eventually need to
+connect a server when you want to run them.
+
 # Building the C++ client on Ubuntu 22.04
 
 1. Start with an Ubuntu 22.04 install
 
-2. Get Deephaven running by following the instructions here: https://deephaven.io/core/docs/how-to-guides/launch-build/
-
-3. Get build tools
+2. Get build tools
    ```
    sudo apt update
    sudo apt install curl git g++ cmake make build-essential zlib1g-dev libbz2-dev libssl-dev pkg-config
@@ -25,7 +38,7 @@ that follows.
 
    See the notes at the end of this document if you need the equivalent packages for Fedora.
 
-4. Make a new directory for the Deephaven source code and assign that directory
+3. Make a new directory for the Deephaven source code and assign that directory
    to a temporary shell variable. This will make subsequent build steps easier.
    ```
    export DHSRC=$HOME/src/deephaven
@@ -33,13 +46,13 @@ that follows.
    cd $DHSRC
    ```
 
-5. Clone deephaven-core sources.
+4. Clone deephaven-core sources.
    ```
    cd $DHSRC
    git clone https://github.com/deephaven/deephaven-core.git
    ```
 
-6. Build and install dependencies for Deephaven C++ client.
+5. Build and install dependencies for Deephaven C++ client.
 
    The `build-dependencies.sh` script in this directory downloads,
    builds and installs the dependent libraries
@@ -67,7 +80,7 @@ that follows.
    export DHCPP=$HOME/dhcpp
    # If the directory already exists from a previous attempt, ensure is clean/empty
    mkdir -p $DHCPP
-   cp build-dependencies.sh $DHCPP
+   cp $DHSRC/build-dependencies.sh $DHCPP
    cd $DHCPP
    # Maybe edit build-dependencies.sh to reflect choices of build tools and build target, if you
    # want anything different than defaults; defaults are tested to work,
@@ -100,23 +113,21 @@ that follows.
    `CMAKE_PREFIX_PATH`.  This file is intended to be `source`'d
    from a shell where you plan to build the C++ client.
 
-7. Build and install Deephaven C++ client.  Running `build-dependencies.sh` should have
+6. Build and install Deephaven C++ client.  Running `build-dependencies.sh` should have
    created an `env.sh` file that we source below to set relevant environment variables for
    the build.
 
    ```
    source $DHCPP/env.sh
    cd $DHSRC/deephaven-core/cpp-client/deephaven/
-   mkdir build && cd build
-   cmake \
+   cmake -S . -B build \
        -DCMAKE_INSTALL_LIBDIR=lib \
        -DCMAKE_CXX_STANDARD=17 \
        -DCMAKE_INSTALL_PREFIX=${DHCPP} \
        -DCMAKE_BUILD_TYPE=RelWithDebInfo \
        -DBUILD_SHARED_LIBS=ON \
-       .. \
      && \
-       make -j$NCPUS install
+   VERBOSE=1 cmake --build build --target install -- -j$NCPUS
    ```
 
    If you need `make` to generate detailed output of the commands it is running
@@ -132,7 +143,7 @@ that follows.
    VERBOSE=1 make -j$NCPUS install 2>&1 | tee make-install.log
    ```
 
-8. Run one Deephaven example which uses the installed client.
+7. Run one Deephaven example which uses the installed client.
    This is a smoke test that the basic functionality
    is working end to end, and the build is properly configured.
    Note this assumes Deephaven server is running (see step 2),
@@ -144,7 +155,7 @@ that follows.
    ./hello_world
    ```
 
-9. (Optional) run the unit tests
+8. (Optional) run the unit tests
    This assumes the build created on step 7 is available in the same directory.
 
     ```
@@ -153,25 +164,25 @@ that follows.
     ./tests
     ```
 
-10. Building in different distributions or with older toolchains.
-    While we don't support other linux distributions or GCC versions earlier
-    than 11, this section provides some notes that may help you
-    in that situation.
-
-    * GCC 8 mixed with older versions of GNU as/binutils may fail to compile
-      `roaring.c` with an error similar to:
-      ```
-      /tmp/cczCvQKd.s: Assembler messages:
-      /tmp/cczCvQKd.s:45826: Error: no such instruction: `vpcompressb %zmm0,%zmm1{%k2}'
-      /tmp/cczCvQKd.s:46092: Error: no such instruction: `vpcompressb %zmm0,%zmm1{%k1}'
-      ```
-      In that case, add `-DCMAKE_C_FLAGS=-DCROARING_COMPILER_SUPPORTS_AVX512=0`
-      to the list of arguments to `cmake`.
-
-    * Some platforms combining old versions of GCC and cmake may fail
-      to set the cmake C++ standard to 17 without explicitly adding
-      `-DCMAKE_CXX_STANDARD=17` to the list of arguments to `cmake`.
-      Note the default mode for C++ is `-std=gnu++17` for GCC 11.
+9. Building in different distributions or with older toolchains.
+   While we don't support other linux distributions or GCC versions earlier
+   than 11, this section provides some notes that may help you
+   in that situation.
+
+   * GCC 8 mixed with older versions of GNU as/binutils may fail to compile
+     `roaring.c` with an error similar to:
+     ```
+     /tmp/cczCvQKd.s: Assembler messages:
+     /tmp/cczCvQKd.s:45826: Error: no such instruction: `vpcompressb %zmm0,%zmm1{%k2}'
+     /tmp/cczCvQKd.s:46092: Error: no such instruction: `vpcompressb %zmm0,%zmm1{%k1}'
+     ```
+     In that case, add `-DCMAKE_C_FLAGS=-DCROARING_COMPILER_SUPPORTS_AVX512=0`
+     to the list of arguments to `cmake`.
+
+   * Some platforms combining old versions of GCC and cmake may fail
+     to set the cmake C++ standard to 17 without explicitly adding
+     `-DCMAKE_CXX_STANDARD=17` to the list of arguments to `cmake`.
+     Note the default mode for C++ is `-std=gnu++17` for GCC 11.
 
 Notes
   (1) The standard assumptions for `Debug` and `Release` apply here.
@@ -207,69 +218,78 @@ Notes
 
 # Building the C++ client on Windows 10 / Windows 11
 
-1. Get Deephaven running by following the instructions here:
-
-   https://deephaven.io/core/docs/how-to-guides/launch-build/
-
-2. Install Visual Studio 2022 Community Edition (or Professional, or Enterprise)
+1. Install Visual Studio 2022 Community Edition (or Professional, or Enterprise)
    from here:
 
    https://visualstudio.microsoft.com/downloads/
 
    When the installer runs, select the workload "Desktop development with C++"
 
-3. Use your preferred version of git, or install Git from here:
+2. Use your preferred version of git, or install Git from here:
 
    https://git-scm.com/download/win
 
-4. We will do the actual build process inside a Visual Studio developer
+3. We will do the actual build process inside a Visual Studio developer
    command prompt. Run the developer command prompt by navigating here:
 
    Start -> V -> Visual Studio 2022 -> Developer Command Prompt for VS 2022
 
-5. Make a 'dhsrc' directory that will hold the two repositories: the vcpkg
+4. Make a 'dhsrc' directory that will hold the two repositories: the vcpkg
    package manager and Deephaven Core. Then make a 'dhinstall' directory that
    will hold the libraries and executables that are the result of this
-   build process.
+   build process.  You can decide on the locations you want for those directories,
+   the code below creates them under the home directory of the Windows user
+   running the command prompt; change the definitions of the environment variables
+   DHSRC and DHINSTALL if you decide to place them somewhere else.
+   
    ```
-   mkdir %HOMEDRIVE%%HOMEPATH%\dhsrc
-   mkdir %HOMEDRIVE%%HOMEPATH%\dhinstall
+   set DHSRC=%HOMEDRIVE%%HOMEPATH%\dhsrc
+   set DHINSTALL=%HOMEDRIVE%%HOMEPATH%\dhinstall
+   mkdir %DHSRC%
+   mkdir %DHINSTALL%
    ```
 
-6. Use git to clone the two repositories mentioned above.
+5. Use git to clone the two repositories mentioned above.
    If you are using Git for Windows, you can run the "Git Bash Shell"
    and type these commands into it:
    ```
-   cd $HOME/dhsrc
+   cd $HOME/dhsrc  # change if dhsrc on a different location
    git clone https://github.com/microsoft/vcpkg.git
    git clone https://github.com/deephaven/deephaven-core.git
    ```
 
-7. Come back to the Visual Studio developer command prompt and do the
-   one-time installation steps for vcpkg. Do not forget to set VCPKG_ROOT,
-   as our build scripts rely on it being set correctly.
+6. Come back to the Visual Studio developer command prompt and do the
+   one-time installation steps for vcpkg.
    ```
-   cd /d %HOMEDRIVE%%HOMEPATH%\dhsrc\vcpkg
+   cd /d %DHSRC%\vcpkg
    .\bootstrap-vcpkg.bat
-   set VCPKG_ROOT=%HOMEDRIVE%%HOMEPATH%\dhsrc\vcpkg
+   ```
+
+7. Set VCPKG_ROOT. Note that steps 8 and 9 both rely on it being set correctly.
+   If you come back to these instructions at a future date, make sure that VCPKG_ROOT
+   is set before re-running those steps.
+   ```
+   set VCPKG_ROOT=%DHSRC%\vcpkg
    ```
 
 8. Change to the Deephaven core directory and build/install the dependent
    packages. On my computer this process took about 20 minutes.
    ```
-   cd /d %HOMEDRIVE%%HOMEPATH%\dhsrc\deephaven-core\cpp-client\deephaven
+   cd /d %DHSRC%\deephaven-core\cpp-client\deephaven
    %VCPKG_ROOT%\vcpkg.exe install --triplet x64-windows
     ```
 
 9. Now configure the build for Deephaven Core:
    ``` 
-   cmake -B build -S . -DCMAKE_TOOLCHAIN_FILE=%VCPKG_ROOT%/scripts/buildsystems/vcpkg.cmake -DCMAKE_INSTALL_PREFIX=%HOMEDRIVE%%HOMEPATH%/dhinstall -DX_VCPKG_APPLOCAL_DEPS_INSTALL=ON
+   cmake -B build -S . -DCMAKE_TOOLCHAIN_FILE=%VCPKG_ROOT%/scripts/buildsystems/vcpkg.cmake -DCMAKE_INSTALL_PREFIX=%DHINSTALL% -DX_VCPKG_APPLOCAL_DEPS_INSTALL=ON
    ```
    
-10. Finally, build and install Deephaven Core:
-    ```
-    cmake --build build --target install
-    ```
+10. Finally, build and install Deephaven Core. Note that the build type (RelWithDebInfo) is specified differently for the Windows build
+    than it is for the Ubuntu build. For Windows, we specify the configuration type directly in the build step using the --config flag.
+   ```
+   # Replace '16' by the number of CPU threads you want to use for building
+   cmake --build build --config RelWithDebInfo --target install -- /p:CL_MPCount=16 -m:1
+   ```
 
 11. Run the tests.
     First, make sure Deephaven is running. If your Deephaven instance
@@ -282,6 +302,6 @@ Notes
 
     then run the tests executable:
     ```
-    cd /d %HOMEDRIVE%%HOMEPATH%\dhinstall\bin
+    cd /d %DHINSTALL%\bin
     .\dhclient_tests.exe
     ```
diff --git a/cpp-client/build-dependencies.sh b/cpp-client/build-dependencies.sh
index 7a1a3ac84e1..4b29f1f97e7 100755
--- a/cpp-client/build-dependencies.sh
+++ b/cpp-client/build-dependencies.sh
@@ -531,8 +531,8 @@ if [ "$CLONE_ZLIB" = "yes" ]; then
   echo
   echo "*** Clone zlib"
   cd $SRC
-  # Previously used version: v1.2.13
-  git clone $GIT_FLAGS -b v1.3 --depth 1 "${GITHUB_BASE_URL}/madler/zlib"
+  # Previously used version: v1.3
+  git clone $GIT_FLAGS -b v1.3.1 --depth 1 "${GITHUB_BASE_URL}/madler/zlib"
   echo "*** Cloning zlib DONE"
 fi
 if [ "$BUILD_ZLIB" = "yes" ]; then
@@ -562,8 +562,8 @@ if [ "$CLONE_PROTOBUF" = "yes" ]; then
   echo
   echo "*** Cloning protobuf"
   cd $SRC
-  # Previously used version: v3.21.2
-  git clone $GIT_FLAGS -b v25.3 --depth 1 "${GITHUB_BASE_URL}/protocolbuffers/protobuf.git"
+  # Previously used version: v25.3
+  git clone $GIT_FLAGS -b v28.1 --depth 1 "${GITHUB_BASE_URL}/protocolbuffers/protobuf.git"
   echo "*** Cloning protobuf DONE"
 fi
 if [ "$BUILD_PROTOBUF" = "yes" ]; then
@@ -592,8 +592,8 @@ if [ "$CLONE_RE2" = "yes" ]; then
   echo
   echo "*** Cloning re2"
   cd $SRC
-  # Previously used version: 2022-04-01
-  git clone $GIT_FLAGS -b 2022-06-01 --depth 1 "${GITHUB_BASE_URL}/google/re2.git"
+  # Previously used version: 2022-06-01
+  git clone $GIT_FLAGS -b 2024-07-02 --depth 1 "${GITHUB_BASE_URL}/google/re2.git"
   echo "*** Cloning re2 DONE"
 fi
 if [ "$BUILD_RE2" = "yes" ]; then
@@ -690,8 +690,8 @@ if [ "$CLONE_CARES" = "yes" ]; then
   echo
   echo "*** Clone ares"
   cd $SRC
-  # Previously used version: cares-1_18_1
-  git clone $GIT_FLAGS -b cares-1_28_1 --depth 1 "${GITHUB_BASE_URL}/c-ares/c-ares.git"
+  # Previously used version: cares-1_28_1
+  git clone $GIT_FLAGS -b v1.33.1 --depth 1 "${GITHUB_BASE_URL}/c-ares/c-ares.git"
   echo "*** Cloning ares DONE"
 fi
 if [ "$BUILD_CARES" = "yes" ]; then
@@ -723,8 +723,8 @@ if [ "$CLONE_GRPC" = "yes" ]; then
   echo
   echo "*** Clone grpc"
   cd $SRC
-  # Previously used version: v1.46.7
-  git clone $GIT_FLAGS -b v1.63.0 --depth 1 "${GITHUB_BASE_URL}/grpc/grpc"
+  # Previously used version: v1.63.0
+  git clone $GIT_FLAGS -b v1.66.1 --depth 1 "${GITHUB_BASE_URL}/grpc/grpc"
   echo "*** Cloning grpc DONE"
 fi
 if [ "$BUILD_GRPC" = "yes" ]; then
@@ -758,8 +758,8 @@ if [ "$CLONE_ARROW" = "yes" ]; then
   echo
   echo "*** Cloning arrow"
   cd $SRC
-  # Previously used version: apache-arrow-13.0.0
-  git clone $GIT_FLAGS -b apache-arrow-16.0.0 --depth 1 "${GITHUB_BASE_URL}/apache/arrow"
+  # Previously used version: apache-arrow-16.0.0
+  git clone $GIT_FLAGS -b apache-arrow-16.1.0 --depth 1 "${GITHUB_BASE_URL}/apache/arrow"
   echo "*** Cloning arrow DONE"
 fi
 if [ "$BUILD_ARROW" = "yes" ]; then
diff --git a/cpp-client/build.gradle b/cpp-client/build.gradle
index a615c404721..7fa53a921f8 100644
--- a/cpp-client/build.gradle
+++ b/cpp-client/build.gradle
@@ -1,5 +1,3 @@
-import io.deephaven.tools.docker.DiffTask
-
 plugins {
     id 'com.bmuschko.docker-remote-api'
     id 'io.deephaven.project.register'
@@ -24,29 +22,6 @@ spotless {
 evaluationDependsOn Docker.registryProject('cpp-clients-multi-base')
 evaluationDependsOn Docker.registryProject('manylinux2014_x86_64')
 
-configurations {
-    cpp {}
-}
-dependencies {
-    cpp project(path: ':proto:proto-backplane-grpc', configuration: 'cpp')
-}
-def protoSourceDir = layout.projectDirectory.dir('deephaven/dhclient/proto')
-def compare = tasks.register('compareProtobuf', DiffTask) {
-    expectedContents.set configurations.cpp
-    actualContents {
-        directory protoSourceDir
-    }
-    generateTask.set ':cpp-client:updateProtobuf'
-}
-// fail a "check" build if these are out of date
-tasks.getByName('quick').dependsOn(compare)
-
-tasks.register('updateProtobuf', Sync) {
-    finalizedBy compare
-    from configurations.cpp
-    into protoSourceDir
-}
-
 // start a grpc-api server
 String randomSuffix = UUID.randomUUID().toString();
 deephavenDocker {
@@ -68,11 +43,15 @@ def buildCppClientImage = Docker.registerDockerTask(project, 'cppClient') {
             include 'cpp-tests-to-junit.sh'
             include 'build-dependencies.sh'
             include 'deephaven/CMakeLists.txt'
+            include 'deephaven/cmake/**'
             include 'deephaven/dhcore/**'
             include 'deephaven/dhclient/**'
             include 'deephaven/examples/**'
             include 'deephaven/tests/**'
         }
+        from("../proto/proto-backplane-grpc/src/main") {
+            include 'proto/**'
+        }
     }
 
     dockerfile {
@@ -87,10 +66,12 @@ def buildCppClientImage = Docker.registerDockerTask(project, 'cppClient') {
                         ${prefix}/log
                    """)
         copyFile('deephaven/CMakeLists.txt',  "${prefix}/src/deephaven/")
+        copyFile('deephaven/cmake/',   "${prefix}/src/deephaven/cmake/")
         copyFile('deephaven/dhcore/',  "${prefix}/src/deephaven/dhcore/")
         copyFile('deephaven/dhclient/', "${prefix}/src/deephaven/dhclient/")
         copyFile('deephaven/examples/', "${prefix}/src/deephaven/examples/")
         copyFile('deephaven/tests/', "${prefix}/src/deephaven/tests/")
+        copyFile('proto/', "${prefix}/proto/proto-backplane-grpc/src/main/proto/")
         copyFile('cpp-tests-to-junit.sh', "${prefix}/bin/dhcpp")
         copyFile('build-dependencies.sh', "/tmp")
         runCommand("PREFIX='${prefix}'; BUILD_TYPE='${build_type}'; " +
diff --git a/cpp-client/deephaven/CMakeLists.txt b/cpp-client/deephaven/CMakeLists.txt
index 9cfc70db45a..0cdddc47491 100644
--- a/cpp-client/deephaven/CMakeLists.txt
+++ b/cpp-client/deephaven/CMakeLists.txt
@@ -8,6 +8,7 @@ endif()
 
 project(deephaven)
 
+set(deephaven_VERSION 0.38.0)
 set(CMAKE_CXX_STANDARD 17)
 
 # for CMAKE_INSTALL_{dir}
@@ -40,15 +41,46 @@ if(NOT DHCORE_ONLY)
         )
 
     install(TARGETS dhclient dhcore dhcore_static dhclient_tests
-        EXPORT deephavenConfig
+        EXPORT deephavenTargets
         ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}
         LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
         RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
         INCLUDES DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}
         )
 
-    install(EXPORT deephavenConfig
-        DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/deephaven
+      include(CMakePackageConfigHelpers)
+      write_basic_package_version_file(
+        "${CMAKE_CURRENT_BINARY_DIR}/deephaven/deephavenConfigVersion.cmake"
+        VERSION ${deephaven_VERSION}
+        COMPATIBILITY AnyNewerVersion
+        )
+
+      export(EXPORT deephavenTargets
+        FILE "${CMAKE_CURRENT_BINARY_DIR}/deephaven/deephavenTargets.cmake"
         NAMESPACE deephaven::
         )
+      configure_file(cmake/deephavenConfig.cmake
+        "${CMAKE_CURRENT_BINARY_DIR}/deephaven/deephavenConfig.cmake"
+        COPYONLY
+        )
+
+      set(ConfigPackageLocation ${CMAKE_INSTALL_LIBDIR}/cmake/deephaven)
+      install(EXPORT deephavenTargets
+        FILE
+        deephavenTargets.cmake
+        NAMESPACE
+        deephaven::
+        DESTINATION
+        ${ConfigPackageLocation}
+        )
+      install(
+        FILES
+        cmake/deephavenConfig.cmake
+        "${CMAKE_CURRENT_BINARY_DIR}/deephaven/deephavenConfigVersion.cmake"
+        DESTINATION
+        ${ConfigPackageLocation}
+        COMPONENT
+        Devel
+        )
+      
 endif()
diff --git a/cpp-client/deephaven/cmake/deephavenConfig.cmake b/cpp-client/deephaven/cmake/deephavenConfig.cmake
new file mode 100644
index 00000000000..cb42b4a1a54
--- /dev/null
+++ b/cpp-client/deephaven/cmake/deephavenConfig.cmake
@@ -0,0 +1,9 @@
+include(CMakeFindDependencyMacro)
+find_dependency(Arrow CONFIG REQUIRED)
+find_dependency(ArrowFlight CONFIG REQUIRED)
+find_dependency(Immer CONFIG REQUIRED)
+find_dependency(Protobuf CONFIG REQUIRED)
+find_dependency(gRPC CONFIG REQUIRED)
+find_dependency(Threads REQUIRED)
+
+include("${CMAKE_CURRENT_LIST_DIR}/deephavenTargets.cmake")
diff --git a/cpp-client/deephaven/dhclient/CMakeLists.txt b/cpp-client/deephaven/dhclient/CMakeLists.txt
index a9e510a4f61..23bd8e5e033 100644
--- a/cpp-client/deephaven/dhclient/CMakeLists.txt
+++ b/cpp-client/deephaven/dhclient/CMakeLists.txt
@@ -8,11 +8,55 @@ include(GNUInstallDirs)
 
 find_package(Arrow CONFIG REQUIRED)
 find_package(ArrowFlight CONFIG REQUIRED HINTS ${Arrow_DIR})
-find_package(Immer REQUIRED)
+find_package(Immer CONFIG REQUIRED)
 find_package(Protobuf CONFIG REQUIRED)
 find_package(gRPC CONFIG REQUIRED)
 find_package(Threads REQUIRED)
 
+set(PROTO_SRC_DIR
+  "${CMAKE_CURRENT_SOURCE_DIR}/../../../proto/proto-backplane-grpc/src/main/proto")
+set(PROTO_GEN_DIR
+  "${CMAKE_BINARY_DIR}/${PROJECT_NAME}/proto")
+set(PROTO_OUT_DIR "${PROTO_GEN_DIR}/deephaven_core/proto")
+
+set(PROTO_FILES
+    "${PROTO_SRC_DIR}/deephaven_core/proto/application.proto"
+    "${PROTO_SRC_DIR}/deephaven_core/proto/config.proto"
+    "${PROTO_SRC_DIR}/deephaven_core/proto/console.proto"
+    "${PROTO_SRC_DIR}/deephaven_core/proto/hierarchicaltable.proto"
+    "${PROTO_SRC_DIR}/deephaven_core/proto/inputtable.proto"
+    "${PROTO_SRC_DIR}/deephaven_core/proto/object.proto"
+    "${PROTO_SRC_DIR}/deephaven_core/proto/partitionedtable.proto"
+    "${PROTO_SRC_DIR}/deephaven_core/proto/session.proto"
+    "${PROTO_SRC_DIR}/deephaven_core/proto/storage.proto"
+    "${PROTO_SRC_DIR}/deephaven_core/proto/table.proto"
+    "${PROTO_SRC_DIR}/deephaven_core/proto/ticket.proto"
+)
+
+foreach(PROTO_FILE ${PROTO_FILES})
+  get_filename_component(BASENAME ${PROTO_FILE} NAME_WLE)
+  list(APPEND PROTO_GEN_FILES
+      "${PROTO_OUT_DIR}/${BASENAME}.grpc.pb.cc"
+      "${PROTO_OUT_DIR}/${BASENAME}.grpc.pb.h"
+      "${PROTO_OUT_DIR}/${BASENAME}.pb.cc"
+      "${PROTO_OUT_DIR}/${BASENAME}.pb.h"
+  )
+endforeach()
+
+add_custom_command(
+  OUTPUT ${PROTO_GEN_FILES}
+  COMMAND "${CMAKE_COMMAND}"
+  ARGS -E make_directory "${PROTO_OUT_DIR}"
+  COMMAND protobuf::protoc
+  ARGS "--plugin=protoc-gen-grpc=\$<TARGET_FILE:gRPC::grpc_cpp_plugin>"
+       "--cpp_out=${PROTO_GEN_DIR}"
+       "--grpc_out=${PROTO_GEN_DIR}"
+       "-I${PROTO_SRC_DIR}"
+       ${PROTO_FILES}
+  DEPENDS ${PROTO_FILES}
+  COMMENT "Generating protos"
+)
+
 set(ALL_FILES
     src/server/server.cc
     include/private/deephaven/client/server/server.h
@@ -44,6 +88,13 @@ set(ALL_FILES
     include/public/deephaven/client/flight.h
     include/public/deephaven/client/update_by.h
 
+    src/interop/client_interop.cc
+    src/interop/client_options_interop.cc
+    src/interop/update_by_interop.cc
+    include/public/deephaven/client/interop/client_interop.h
+    include/public/deephaven/client/interop/client_options_interop.h
+    include/public/deephaven/client/interop/update_by_interop.h
+
     src/subscription/subscribe_thread.cc
 
     include/private/deephaven/client/subscription/subscribe_thread.h
@@ -58,75 +109,39 @@ set(ALL_FILES
     include/public/deephaven/client/utility/arrow_util.h
     include/public/deephaven/client/utility/misc_types.h
     include/public/deephaven/client/utility/table_maker.h
-
-    proto/deephaven/proto/application.grpc.pb.cc
-    proto/deephaven/proto/application.grpc.pb.h
-    proto/deephaven/proto/application.pb.cc
-    proto/deephaven/proto/application.pb.h
-    proto/deephaven/proto/config.grpc.pb.cc
-    proto/deephaven/proto/config.grpc.pb.h
-    proto/deephaven/proto/config.pb.cc
-    proto/deephaven/proto/config.pb.h
-    proto/deephaven/proto/console.grpc.pb.cc
-    proto/deephaven/proto/console.grpc.pb.h
-    proto/deephaven/proto/console.pb.cc
-    proto/deephaven/proto/console.pb.h
-    proto/deephaven/proto/inputtable.grpc.pb.cc
-    proto/deephaven/proto/inputtable.grpc.pb.h
-    proto/deephaven/proto/inputtable.pb.cc
-    proto/deephaven/proto/inputtable.pb.h
-    proto/deephaven/proto/object.grpc.pb.cc
-    proto/deephaven/proto/object.grpc.pb.h
-    proto/deephaven/proto/object.pb.cc
-    proto/deephaven/proto/object.pb.h
-    proto/deephaven/proto/partitionedtable.grpc.pb.cc
-    proto/deephaven/proto/partitionedtable.grpc.pb.h
-    proto/deephaven/proto/partitionedtable.pb.cc
-    proto/deephaven/proto/partitionedtable.pb.h
-    proto/deephaven/proto/session.grpc.pb.cc
-    proto/deephaven/proto/session.grpc.pb.h
-    proto/deephaven/proto/session.pb.cc
-    proto/deephaven/proto/session.pb.h
-    proto/deephaven/proto/table.grpc.pb.cc
-    proto/deephaven/proto/table.grpc.pb.h
-    proto/deephaven/proto/table.pb.cc
-    proto/deephaven/proto/table.pb.h
-    proto/deephaven/proto/ticket.grpc.pb.cc
-    proto/deephaven/proto/ticket.grpc.pb.h
-    proto/deephaven/proto/ticket.pb.cc
-    proto/deephaven/proto/ticket.pb.h
 )
 
+list(APPEND ALL_FILES ${PROTO_GEN_FILES})
+
 add_library(dhclient SHARED ${ALL_FILES})
 
 # This is so deephaven::client works both when using the installed CMake config
 # and when using this project as a CMake subdirectory of your own project.
-add_library(deephaven::client ALIAS dhclient)
+add_library(deephaven::client ALIAS ${PROJECT_NAME})
 
-set_property(TARGET dhclient PROPERTY POSITION_INDEPENDENT_CODE ON)
+set_property(TARGET ${PROJECT_NAME} PROPERTY POSITION_INDEPENDENT_CODE ON)
 
 if (LINUX)
-    target_compile_options(dhclient PRIVATE -Wall -Werror -Wno-deprecated-declarations)
+    target_compile_options(${PROJECT_NAME} PRIVATE -Wall -Werror -Wno-deprecated-declarations)
 endif()
 
 if (WIN32)
-    set_property(TARGET dhclient PROPERTY WINDOWS_EXPORT_ALL_SYMBOLS ON)
+    set_property(TARGET ${PROJECT_NAME} PROPERTY WINDOWS_EXPORT_ALL_SYMBOLS ON)
     # /Wall is a bit too chatty so we stick with /W3
     # /bigobj needed because ticking/immer_table_state.cc compiles to something too large apparently
-    target_compile_options(dhclient PRIVATE /W3 /bigobj)
+    target_compile_options(${PROJECT_NAME} PRIVATE /W3 /bigobj)
 endif()
 
-target_include_directories(dhclient PRIVATE include/private)
-target_include_directories(dhclient PUBLIC $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include/public>)
+target_include_directories(${PROJECT_NAME} PRIVATE include/private)
+target_include_directories(${PROJECT_NAME} PUBLIC $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include/public>)
 # Protos and flatbuf are doing their own thing.
-target_include_directories(dhclient PRIVATE "./proto")
-target_include_directories(dhclient PRIVATE "./flatbuf")
+target_include_directories(${PROJECT_NAME} PRIVATE "${PROTO_GEN_DIR}")
+target_include_directories(${PROJECT_NAME} PRIVATE "./flatbuf")
 
-target_link_libraries(dhclient PUBLIC deephaven::dhcore)
+target_link_libraries(${PROJECT_NAME} PUBLIC deephaven::dhcore)
 
-target_link_libraries(dhclient PUBLIC ArrowFlight::arrow_flight_shared)
-target_link_libraries(dhclient PUBLIC Arrow::arrow_shared)
-target_link_libraries(dhclient PUBLIC immer)
-target_link_libraries(dhclient PUBLIC protobuf::libprotobuf)
-target_link_libraries(dhclient PUBLIC gRPC::grpc++)
-target_link_libraries(dhclient PUBLIC Threads::Threads)
+target_link_libraries(${PROJECT_NAME} PUBLIC ArrowFlight::arrow_flight_shared)
+target_link_libraries(${PROJECT_NAME} PUBLIC Arrow::arrow_shared)
+target_link_libraries(${PROJECT_NAME} PRIVATE protobuf::libprotobuf)
+target_link_libraries(${PROJECT_NAME} PRIVATE gRPC::grpc++)
+target_link_libraries(${PROJECT_NAME} PRIVATE Threads::Threads)
diff --git a/cpp-client/deephaven/dhclient/include/private/deephaven/client/arrowutil/arrow_column_source.h b/cpp-client/deephaven/dhclient/include/private/deephaven/client/arrowutil/arrow_column_source.h
index a4d8d1da18c..16b5c30e987 100644
--- a/cpp-client/deephaven/dhclient/include/private/deephaven/client/arrowutil/arrow_column_source.h
+++ b/cpp-client/deephaven/dhclient/include/private/deephaven/client/arrowutil/arrow_column_source.h
@@ -22,7 +22,8 @@ namespace internal {
 // null-ness by determining whether the optional has a value.
 // kTimestamp is its own special case, where nullness is determined by the underlying nanos
 // being equal to Deephaven's NULL_LONG.
-enum class ArrowProcessingStyle { kNormal, kBooleanOrString, kTimestamp };
+// kLocalDate and kLocalTime are like kTimestamp except they resolve to different data types.
+enum class ArrowProcessingStyle { kNormal, kBooleanOrString, kTimestamp, kLocalDate, kLocalTime };
 
 template<ArrowProcessingStyle Style, typename TColumnSourceBase, typename TArrowArray, typename TChunk>
 class GenericArrowColumnSource final : public TColumnSourceBase {
@@ -30,6 +31,8 @@ class GenericArrowColumnSource final : public TColumnSourceBase {
   using Chunk = deephaven::dhcore::chunk::Chunk;
   using ColumnSourceVisitor = deephaven::dhcore::column::ColumnSourceVisitor;
   using DateTime = deephaven::dhcore::DateTime;
+  using LocalDate = deephaven::dhcore::LocalDate;
+  using LocalTime = deephaven::dhcore::LocalTime;
   using RowSequence = deephaven::dhcore::container::RowSequence;
   using UInt64Chunk = deephaven::dhcore::chunk::UInt64Chunk;
 
@@ -98,6 +101,14 @@ class GenericArrowColumnSource final : public TColumnSourceBase {
         auto relative_end = min_end - src_segment_begin;
         const auto &innerp = *outerp;
 
+        static_assert(
+            Style == ArrowProcessingStyle::kNormal ||
+            Style == ArrowProcessingStyle::kBooleanOrString ||
+            Style == ArrowProcessingStyle::kTimestamp ||
+            Style == ArrowProcessingStyle::kLocalDate ||
+            Style == ArrowProcessingStyle::kLocalTime,
+            "Unexpected ArrowProcessingStyle");
+
         if constexpr (Style == ArrowProcessingStyle::kNormal) {
           // Process these types using pointer operations and the Deephaven Null convention
           const auto *src_beginp = innerp->raw_values() + relative_begin;
@@ -139,6 +150,34 @@ class GenericArrowColumnSource final : public TColumnSourceBase {
             *destp = DateTime::FromNanos(*ip);
             ++destp;
 
+            if (null_destp != nullptr) {
+              *null_destp = *ip == DeephavenTraits<int64_t>::kNullValue;
+              ++null_destp;
+            }
+          }
+        } else if constexpr (Style == ArrowProcessingStyle::kLocalDate) {
+          // Process these types using pointer operations and the Deephaven Null convention
+          const auto *src_beginp = innerp->raw_values() + relative_begin;
+          const auto *src_endp = innerp->raw_values() + relative_end;
+
+          for (const auto *ip = src_beginp; ip != src_endp; ++ip) {
+            *destp = LocalDate::FromMillis(*ip);
+            ++destp;
+
+            if (null_destp != nullptr) {
+              *null_destp = *ip == DeephavenTraits<int64_t>::kNullValue;
+              ++null_destp;
+            }
+          }
+        } else if constexpr (Style == ArrowProcessingStyle::kLocalTime) {
+          // Process these types using pointer operations and the Deephaven Null convention
+          const auto *src_beginp = innerp->raw_values() + relative_begin;
+          const auto *src_endp = innerp->raw_values() + relative_end;
+
+          for (const auto *ip = src_beginp; ip != src_endp; ++ip) {
+            *destp = LocalTime::FromNanos(*ip);
+            ++destp;
+
             if (null_destp != nullptr) {
               *null_destp = *ip == DeephavenTraits<int64_t>::kNullValue;
               ++null_destp;
@@ -223,4 +262,16 @@ using DateTimeArrowColumnSource = internal::GenericArrowColumnSource<
     deephaven::dhcore::column::DateTimeColumnSource,
     arrow::TimestampArray,
     deephaven::dhcore::chunk::DateTimeChunk>;
+
+using LocalDateArrowColumnSource = internal::GenericArrowColumnSource<
+    internal::ArrowProcessingStyle::kLocalDate,
+    deephaven::dhcore::column::LocalDateColumnSource,
+    arrow::Date64Array,
+    deephaven::dhcore::chunk::LocalDateChunk>;
+
+using LocalTimeArrowColumnSource = internal::GenericArrowColumnSource<
+    internal::ArrowProcessingStyle::kLocalTime,
+    deephaven::dhcore::column::LocalTimeColumnSource,
+    arrow::Time64Array,
+    deephaven::dhcore::chunk::LocalTimeChunk>;
 }  // namespace deephaven::client::arrowutil
diff --git a/cpp-client/deephaven/dhclient/include/private/deephaven/client/impl/aggregate_impl.h b/cpp-client/deephaven/dhclient/include/private/deephaven/client/impl/aggregate_impl.h
index 323f779e053..c7b3a2ea52d 100644
--- a/cpp-client/deephaven/dhclient/include/private/deephaven/client/impl/aggregate_impl.h
+++ b/cpp-client/deephaven/dhclient/include/private/deephaven/client/impl/aggregate_impl.h
@@ -4,10 +4,10 @@
 #pragma once
 
 #include <memory>
-#include "deephaven/proto/session.pb.h"
-#include "deephaven/proto/session.grpc.pb.h"
-#include "deephaven/proto/table.pb.h"
-#include "deephaven/proto/table.grpc.pb.h"
+#include "deephaven_core/proto/session.pb.h"
+#include "deephaven_core/proto/session.grpc.pb.h"
+#include "deephaven_core/proto/table.pb.h"
+#include "deephaven_core/proto/table.grpc.pb.h"
 
 namespace deephaven::client::impl {
 class AggregateImpl {
diff --git a/cpp-client/deephaven/dhclient/include/private/deephaven/client/impl/table_handle_impl.h b/cpp-client/deephaven/dhclient/include/private/deephaven/client/impl/table_handle_impl.h
index 6229befb7bd..2cc0ff5c412 100644
--- a/cpp-client/deephaven/dhclient/include/private/deephaven/client/impl/table_handle_impl.h
+++ b/cpp-client/deephaven/dhclient/include/private/deephaven/client/impl/table_handle_impl.h
@@ -14,10 +14,10 @@
 #include "deephaven/dhcore/clienttable/schema.h"
 #include "deephaven/dhcore/ticking/ticking.h"
 #include "deephaven/dhcore/types.h"
-#include "deephaven/proto/session.pb.h"
-#include "deephaven/proto/session.grpc.pb.h"
-#include "deephaven/proto/table.pb.h"
-#include "deephaven/proto/table.grpc.pb.h"
+#include "deephaven_core/proto/session.pb.h"
+#include "deephaven_core/proto/session.grpc.pb.h"
+#include "deephaven_core/proto/table.pb.h"
+#include "deephaven_core/proto/table.grpc.pb.h"
 
 namespace deephaven::client {
 class SortPair;
@@ -94,9 +94,6 @@ class TableHandleImpl : public std::enable_shared_from_this<TableHandleImpl> {
       std::vector<std::string> column_specs);
   [[nodiscard]]
   std::shared_ptr<TableHandleImpl>
-  PercentileBy(double percentile, std::vector<std::string> column_specs);
-  [[nodiscard]]
-  std::shared_ptr<TableHandleImpl>
   CountBy(std::string count_by_column, std::vector<std::string> column_specs);
   [[nodiscard]]
   std::shared_ptr<TableHandleImpl>
diff --git a/cpp-client/deephaven/dhclient/include/private/deephaven/client/impl/update_by_operation_impl.h b/cpp-client/deephaven/dhclient/include/private/deephaven/client/impl/update_by_operation_impl.h
index da7def59675..a27bf8b5e92 100644
--- a/cpp-client/deephaven/dhclient/include/private/deephaven/client/impl/update_by_operation_impl.h
+++ b/cpp-client/deephaven/dhclient/include/private/deephaven/client/impl/update_by_operation_impl.h
@@ -3,8 +3,8 @@
  */
 #pragma once
 
-#include "deephaven/proto/table.pb.h"
-#include "deephaven/proto/table.grpc.pb.h"
+#include "deephaven_core/proto/table.pb.h"
+#include "deephaven_core/proto/table.grpc.pb.h"
 
 namespace deephaven::client::impl {
 class UpdateByOperationImpl {
diff --git a/cpp-client/deephaven/dhclient/include/private/deephaven/client/server/server.h b/cpp-client/deephaven/dhclient/include/private/deephaven/client/server/server.h
index 1e3b35f5f67..adb5d24d392 100644
--- a/cpp-client/deephaven/dhclient/include/private/deephaven/client/server/server.h
+++ b/cpp-client/deephaven/dhclient/include/private/deephaven/client/server/server.h
@@ -18,20 +18,20 @@
 #include "deephaven/client/utility/executor.h"
 #include "deephaven/client/utility/misc_types.h"
 #include "deephaven/dhcore/utility/utility.h"
-#include "deephaven/proto/ticket.pb.h"
-#include "deephaven/proto/ticket.grpc.pb.h"
-#include "deephaven/proto/application.pb.h"
-#include "deephaven/proto/application.grpc.pb.h"
-#include "deephaven/proto/config.pb.h"
-#include "deephaven/proto/config.grpc.pb.h"
-#include "deephaven/proto/console.pb.h"
-#include "deephaven/proto/console.grpc.pb.h"
-#include "deephaven/proto/inputtable.pb.h"
-#include "deephaven/proto/inputtable.grpc.pb.h"
-#include "deephaven/proto/session.pb.h"
-#include "deephaven/proto/session.grpc.pb.h"
-#include "deephaven/proto/table.pb.h"
-#include "deephaven/proto/table.grpc.pb.h"
+#include "deephaven_core/proto/ticket.pb.h"
+#include "deephaven_core/proto/ticket.grpc.pb.h"
+#include "deephaven_core/proto/application.pb.h"
+#include "deephaven_core/proto/application.grpc.pb.h"
+#include "deephaven_core/proto/config.pb.h"
+#include "deephaven_core/proto/config.grpc.pb.h"
+#include "deephaven_core/proto/console.pb.h"
+#include "deephaven_core/proto/console.grpc.pb.h"
+#include "deephaven_core/proto/inputtable.pb.h"
+#include "deephaven_core/proto/inputtable.grpc.pb.h"
+#include "deephaven_core/proto/session.pb.h"
+#include "deephaven_core/proto/session.grpc.pb.h"
+#include "deephaven_core/proto/table.pb.h"
+#include "deephaven_core/proto/table.grpc.pb.h"
 
 namespace deephaven::client::server {
 namespace internal {
diff --git a/cpp-client/deephaven/dhclient/include/private/deephaven/client/subscription/subscribe_thread.h b/cpp-client/deephaven/dhclient/include/private/deephaven/client/subscription/subscribe_thread.h
index 2132c9e7eb0..9f3d2ec431e 100644
--- a/cpp-client/deephaven/dhclient/include/private/deephaven/client/subscription/subscribe_thread.h
+++ b/cpp-client/deephaven/dhclient/include/private/deephaven/client/subscription/subscribe_thread.h
@@ -8,7 +8,7 @@
 #include "deephaven/client/subscription/subscription_handle.h"
 #include "deephaven/dhcore/clienttable/client_table.h"
 #include "deephaven/dhcore/ticking/ticking.h"
-#include "deephaven/proto/ticket.pb.h"
+#include "deephaven_core/proto/ticket.pb.h"
 
 namespace deephaven::client::subscription {
 class SubscriptionThread {
diff --git a/cpp-client/deephaven/dhclient/include/public/deephaven/client/client.h b/cpp-client/deephaven/dhclient/include/public/deephaven/client/client.h
index 24c8f4924ae..4fcc3f884e4 100644
--- a/cpp-client/deephaven/dhclient/include/public/deephaven/client/client.h
+++ b/cpp-client/deephaven/dhclient/include/public/deephaven/client/client.h
@@ -141,6 +141,7 @@ class TableHandleManager {
    *   int64_t nanoseconds, or a string containing an ISO 8601 duration representation.
    * @param start_time When the table should start ticking, specified as a std::chrono::time_point,
    *   int64_t nanoseconds since the epoch, or a string containing an ISO 8601 time point specifier.
+   * @param blink_table Whether the table is a blink table
    * @return The TableHandle of the new table.
    */
   [[nodiscard]]
@@ -150,6 +151,7 @@ class TableHandleManager {
   /**
    * Creates an input table from an initial table. When key columns are provided, the InputTable
    * will be keyed, otherwise it will be append-only.
+   * @param initial_table The initial table
    * @param columns The set of key columns
    * @return A TableHandle referencing the new table
    */
@@ -189,6 +191,7 @@ class TableHandleManager {
   /**
    * Execute a script on the server. This assumes that the Client was created with a sessionType corresponding to
    * the language of the script (typically either "python" or "groovy") and that the code matches that language.
+   * @param code The script to be run on the server
    */
   void RunScript(std::string code) const;
 
@@ -299,7 +302,7 @@ class Client {
    * Factory method to Connect to a Deephaven server using the specified options.
    * @param target A connection string in the format host:port. For example "localhost:10000".
    * @param options An options object for setting options like authentication and script language.
-   * @return A Client object conneted to the Deephaven server.
+   * @return A Client object connected to the Deephaven server.
    */
   [[nodiscard]]
   static Client Connect(const std::string &target, const ClientOptions &options = {});
@@ -372,7 +375,7 @@ class Aggregate {
   /**
    * Copy constructor
    */
-  Aggregate(const Aggregate &other) noexcept;
+  Aggregate(const Aggregate &other);
   /**
    * Move constructor
    */
@@ -380,7 +383,7 @@ class Aggregate {
   /**
    * Copy assigment operator.
    */
-  Aggregate &operator=(const Aggregate &other) noexcept;
+  Aggregate &operator=(const Aggregate &other);
   /**
    * Move assigment operator.
    */
@@ -654,11 +657,12 @@ class Aggregate {
    * @param args The arguments to WAvg
    * @return An Aggregate object representing the aggregation
    */
-  template<typename ...Args>
+  template<typename WeightArg, typename ...Args>
   [[nodiscard]]
-  static Aggregate WAvg(Args &&...args) {
+  static Aggregate WAvg(WeightArg &&weight_column, Args &&...args) {
+    auto weight = internal::ConvertToString::ToString(std::forward<WeightArg>(weight_column));
     std::vector<std::string> vec{internal::ConvertToString::ToString(std::forward<Args>(args))...};
-    return WAvg(std::move(vec));
+    return WAvg(std::move(weight), std::move(vec));
   }
 
   /**
@@ -693,11 +697,19 @@ class AggregateCombo {
   static AggregateCombo Create(std::vector<Aggregate> vec);
 
   /**
-   * Move constructor.
+   * Copy constructor
+   */
+  AggregateCombo(const AggregateCombo &other);
+  /**
+   * Move constructor
    */
   AggregateCombo(AggregateCombo &&other) noexcept;
   /**
-   * Move assignment operator.
+   * Copy assigment operator.
+   */
+  AggregateCombo &operator=(const AggregateCombo &other);
+  /**
+   * Move assigment operator.
    */
   AggregateCombo &operator=(AggregateCombo &&other) noexcept;
 
@@ -1090,7 +1102,7 @@ class TableHandle {
    * A variadic form of By(std::vector<std::string>) const that takes a combination of
    * argument types.
    * @tparam Args Any combination of `std::string`, `std::string_view`, or `const char *`
-   * @param args The columns to UpdateView
+   * @param args Columns to group by
    * @return A TableHandle referencing the new table
    */
   template<typename ...Args>
@@ -1107,7 +1119,7 @@ class TableHandle {
    * A variadic form of By(AggregateCombo, std::vector<std::string>) const that takes a combination of
    * argument types.
    * @tparam Args Any combination of `std::string`, `std::string_view`, or `const char *`
-   * @param args The columns to UpdateView
+   * @param columnSpecs Columns to group by.
    * @return A TableHandle referencing the new table
    */
   template<typename ...Args>
@@ -1129,7 +1141,7 @@ class TableHandle {
    * A variadic form of MinBy(std::vector<std::string>) const that takes a combination of
    * argument types.
    * @tparam Args Any combination of `std::string`, `std::string_view`, or `const char *`
-   * @param args The columns to UpdateView
+   * @param columnSpecs Columns to group by.
    * @return A TableHandle referencing the new table
    */
   template<typename ...Args>
@@ -1151,7 +1163,7 @@ class TableHandle {
    * A variadic form of MaxBy(std::vector<std::string>) const that takes a combination of
    * argument types.
    * @tparam Args Any combination of `std::string`, `std::string_view`, or `const char *`
-   * @param args The columns
+   * @param args Columns to group by
    * @return A TableHandle referencing the new table
    */
   template<typename ...Args>
@@ -1173,7 +1185,7 @@ class TableHandle {
    * A variadic form of SumBy(std::vector<std::string>) const that takes a combination of
    * argument types.
    * @tparam Args Any combination of `std::string`, `std::string_view`, or `const char *`
-   * @param args The columns
+   * @param columnSpecs Columns to group by.
    * @return A TableHandle referencing the new table
    */
   template<typename ...Args>
@@ -1195,7 +1207,7 @@ class TableHandle {
    * A variadic form of AbsSumBy(std::vector<std::string>) const that takes a combination of
    * argument types.
    * @tparam Args Any combination of `std::string`, `std::string_view`, or `const char *`
-   * @param args The columns
+   * @param args Columns to group by.
    * @return A TableHandle referencing the new table
    */
   template<typename ...Args>
@@ -1217,7 +1229,7 @@ class TableHandle {
    * A variadic form of VarBy(std::vector<std::string>) const that takes a combination of
    * argument types.
    * @tparam Args Any combination of `std::string`, `std::string_view`, or `const char *`
-   * @param args The columns
+   * @param args The columns to group by
    * @return A TableHandle referencing the new table
    */
   template<typename ...Args>
@@ -1370,7 +1382,9 @@ class TableHandle {
    * @return A TableHandle referencing the new table
    */
   [[nodiscard]]
-  TableHandle PercentileBy(double percentile, std::vector<std::string> column_specs) const;
+  TableHandle PercentileBy(double percentile, std::vector<std::string> column_specs) const {
+    return PercentileBy(percentile, false, std::move(column_specs));
+  }
   /**
    * A variadic form of PercentileBy(double, std::vector<std::string>) const that takes a combination of
    * argument types.
@@ -1382,7 +1396,7 @@ class TableHandle {
   [[nodiscard]]
   TableHandle PercentileBy(double percentile, Args &&...args) const {
     std::vector<std::string> vec{internal::ConvertToString::ToString(std::forward<Args>(args))...};
-    return PercentileBy(percentile, std::move(vec));
+    return PercentileBy(percentile, false, std::forward<Args...>(args...));
   }
 
   /**
@@ -1876,7 +1890,7 @@ class TableHandle {
   /**
    * Unsubscribe from the table.
    */
-  void Unsubscribe(std::shared_ptr<SubscriptionHandle> callback);
+  void Unsubscribe(const std::shared_ptr<SubscriptionHandle> &handle);
 
   /**
    * Get access to the bytes of the Deephaven "Ticket" type (without having to reference the
diff --git a/cpp-client/deephaven/dhclient/include/public/deephaven/client/client_options.h b/cpp-client/deephaven/dhclient/include/public/deephaven/client/client_options.h
index f8207da083c..5f27a2769ff 100644
--- a/cpp-client/deephaven/dhclient/include/public/deephaven/client/client_options.h
+++ b/cpp-client/deephaven/dhclient/include/public/deephaven/client/client_options.h
@@ -73,7 +73,7 @@ class ClientOptions {
    * Configure whether to set server connections as TLS
    *
    * @param use_tls true if server connections should be TLS/SSL, false for insecure.
-   * @return *this, to be used for chaining
+   * @return *this, so that methods can be chained.
    */
   ClientOptions &SetUseTls(bool use_tls);
   /**
@@ -81,24 +81,24 @@ class ClientOptions {
    * Sets a PEM-encoded certificate root for server connections.  The empty string
    * means use system defaults.
    *
-   * @param pem a PEM encoded certificate chain.
-   * @return *this, to be used for chaining
+   * @param tls_root_certs a PEM encoded certificate chain.
+   * @return *this, so that methods can be chained.
    */
   ClientOptions &SetTlsRootCerts(std::string tls_root_certs);
   /**
    * Sets a PEM-encoded certificate for the client and use mutual TLS.
    * The empty string means don't use mutual TLS.
    *
-   * @param pem a PEM encoded certificate chain, or empty for no mutual TLS.
-   * @return *this, to be used for chaining
+   * @param client_cert_chain a PEM encoded certificate chain, or empty for no mutual TLS.
+   * @return *this, so that methods can be chained.
    */
   ClientOptions &SetClientCertChain(std::string client_cert_chain);
   /**
    * Sets a PEM-encoded private key for the client certificate chain when using
    * mutual TLS.
    *
-   * @param pem a PEM encoded private key.
-   * @return *this, to be used for chaining
+   * @param client_private_key a PEM encoded private key.
+   * @return *this, so that methods can be chained.
    */
   ClientOptions &SetClientPrivateKey(std::string client_private_key);
   /**
@@ -107,8 +107,8 @@ class ClientOptions {
    *
    * @example copt.setIntOption("grpc.min_reconnect_backoff_ms", 2000)
    * @param opt The option key.
-   * @param val The option valiue.
-   * @return *this, to be used for chaining
+   * @param val The option value.
+   * @return *this, so that methods can be chained.
    */
   ClientOptions &AddIntOption(std::string opt, int val);
   /**
@@ -117,8 +117,8 @@ class ClientOptions {
    *
    * @example copt.setStringOption("grpc.target_name_override", "idonthaveadnsforthishost")
    * @param opt The option key.
-   * @param val The option valiue.
-   * @return *this, to be used for chaining
+   * @param val The option value.
+   * @return *this, so that methods can be chained.
    */
   ClientOptions &AddStringOption(std::string opt, std::string val);
   /**
@@ -126,7 +126,7 @@ class ClientOptions {
    *
    * @param header_name The header name
    * @param header_value The header value
-   * @return *this, to be used for chaining
+   * @return *this, so that methods can be chained.
    */
   ClientOptions &AddExtraHeader(std::string header_name, std::string header_value);
   /**
diff --git a/cpp-client/deephaven/dhclient/include/public/deephaven/client/interop/client_interop.h b/cpp-client/deephaven/dhclient/include/public/deephaven/client/interop/client_interop.h
new file mode 100644
index 00000000000..e87ad5e6425
--- /dev/null
+++ b/cpp-client/deephaven/dhclient/include/public/deephaven/client/interop/client_interop.h
@@ -0,0 +1,678 @@
+/*
+ * Copyright (c) 2016-2024 Deephaven Data Labs and Patent Pending
+ */
+#include <cstdint>
+#include "deephaven/client/client.h"
+#include "deephaven/client/client_options.h"
+#include "deephaven/client/utility/table_maker.h"
+#include "deephaven/dhcore/interop/interop_util.h"
+
+
+namespace deephaven::client::interop {
+/**
+ * A thin wrapper about std::shared_ptr<ArrowTable>. Not really necessary but
+ * makes it easier for humans to map to the corresponding class on the C# side.
+ */
+struct ArrowTableSpWrapper {
+public:
+  explicit ArrowTableSpWrapper(std::shared_ptr<arrow::Table> table) : table_(std::move(table)) {}
+  std::shared_ptr<arrow::Table> table_;
+};
+
+/**
+ * This class exists so we don't get confused about what we are passing
+ * back and forth to .NET. Basically, like any other object, we need to
+ * heap-allocate this object and pass an opaque pointer back and forth
+ * to .NET. The fact that this object's only member is a shared pointer
+ * is irrelevant in terms of what we need to do.
+ */
+struct ClientTableSpWrapper {
+  using ClientTable = deephaven::dhcore::clienttable::ClientTable;
+public:
+  explicit ClientTableSpWrapper(std::shared_ptr<ClientTable> table) : table_(std::move(table)) {}
+  std::shared_ptr<ClientTable> table_;
+};
+}  // namespace deephaven::client::interop {
+
+extern "C" {
+void deephaven_client_TableHandleManager_dtor(
+    deephaven::dhcore::interop::NativePtr<deephaven::client::TableHandleManager> self);
+
+void deephaven_client_TableHandleManager_EmptyTable(
+    deephaven::dhcore::interop::NativePtr<deephaven::client::TableHandleManager> self,
+    int64_t size,
+    deephaven::dhcore::interop::NativePtr<deephaven::client::TableHandle> *result,
+    deephaven::dhcore::interop::ErrorStatus *status);
+
+void deephaven_client_TableHandleManager_FetchTable(
+    deephaven::dhcore::interop::NativePtr<deephaven::client::TableHandleManager> self,
+    const char *table_name,
+    deephaven::dhcore::interop::NativePtr<deephaven::client::TableHandle> *result,
+    deephaven::dhcore::interop::ErrorStatus *status);
+
+void deephaven_client_TableHandleManager_TimeTable(
+    deephaven::dhcore::interop::NativePtr<deephaven::client::TableHandleManager> self,
+    deephaven::dhcore::interop::NativePtr<deephaven::client::utility::DurationSpecifier> period,
+    deephaven::dhcore::interop::NativePtr<deephaven::client::utility::TimePointSpecifier> start_time,
+    deephaven::dhcore::interop::InteropBool blink_table,
+    deephaven::dhcore::interop::NativePtr<deephaven::client::TableHandle> *result,
+    deephaven::dhcore::interop::ErrorStatus *status);
+
+void deephaven_client_TableHandleManager_InputTable(
+    deephaven::dhcore::interop::NativePtr<deephaven::client::TableHandleManager> self,
+    deephaven::dhcore::interop::NativePtr<deephaven::client::TableHandle> initial_table,
+    const char **key_columns, int32_t num_key_columns,
+    deephaven::dhcore::interop::NativePtr<deephaven::client::TableHandle> *result,
+    deephaven::dhcore::interop::ErrorStatus *status);
+
+void deephaven_client_TableHandleManager_RunScript(
+    deephaven::dhcore::interop::NativePtr<deephaven::client::TableHandleManager> self,
+    const char *code,
+    deephaven::dhcore::interop::ErrorStatus *status);
+
+void deephaven_client_Client_Connect(const char *target,
+    deephaven::dhcore::interop::NativePtr<deephaven::client::ClientOptions> options,
+    deephaven::dhcore::interop::NativePtr<deephaven::client::Client> *result,
+    deephaven::dhcore::interop::ErrorStatus *status);
+
+void deephaven_client_Client_dtor(
+    deephaven::dhcore::interop::NativePtr<deephaven::client::Client> self);
+
+void deephaven_client_Client_Close(
+    deephaven::dhcore::interop::NativePtr<deephaven::client::Client> self,
+    deephaven::dhcore::interop::ErrorStatus *status);
+
+void deephaven_client_Client_GetManager(
+    deephaven::dhcore::interop::NativePtr<deephaven::client::Client> self,
+    deephaven::dhcore::interop::NativePtr<deephaven::client::TableHandleManager> *result,
+    deephaven::dhcore::interop::ErrorStatus *status);
+
+void deephaven_client_TableHandle_GetAttributes(
+    deephaven::dhcore::interop::NativePtr<deephaven::client::TableHandle> self,
+    int32_t *num_columns, int64_t *num_rows,
+    deephaven::dhcore::interop::InteropBool *is_static,
+    deephaven::dhcore::interop::ErrorStatus *status);
+
+void deephaven_client_TableHandle_GetSchema(
+    deephaven::dhcore::interop::NativePtr<deephaven::client::TableHandle> self,
+    int32_t num_columns,
+    deephaven::dhcore::interop::StringHandle *columns, int32_t *column_types,
+    deephaven::dhcore::interop::StringPoolHandle *string_pool_handle,
+    deephaven::dhcore::interop::ErrorStatus *status);
+
+void deephaven_client_TableHandle_dtor(
+    deephaven::dhcore::interop::NativePtr<deephaven::client::TableHandle> self);
+
+void deephaven_client_TableHandle_GetManager(
+    deephaven::dhcore::interop::NativePtr<deephaven::client::TableHandle> self,
+    deephaven::dhcore::interop::NativePtr<deephaven::client::TableHandleManager> *result,
+    deephaven::dhcore::interop::ErrorStatus *status);
+
+void deephaven_client_TableHandle_Where(
+    deephaven::dhcore::interop::NativePtr<deephaven::client::TableHandle> self,
+    const char *condition,
+    deephaven::dhcore::interop::NativePtr<deephaven::client::TableHandle> *result,
+    deephaven::dhcore::interop::ErrorStatus *status);
+
+void deephaven_client_TableHandle_Ungroup(
+    deephaven::dhcore::interop::NativePtr<deephaven::client::TableHandle> self,
+    deephaven::dhcore::interop::InteropBool null_fill,
+    const char **group_by_columns, int32_t num_group_by_columns,
+    deephaven::dhcore::interop::NativePtr<deephaven::client::TableHandle> *result,
+    deephaven::dhcore::interop::ErrorStatus *status);
+
+void deephaven_client_TableHandle_Sort(
+    deephaven::dhcore::interop::NativePtr<deephaven::client::TableHandle> self,
+    const char **columns,
+    const deephaven::dhcore::interop::InteropBool *ascendings,
+    const deephaven::dhcore::interop::InteropBool *abss,
+    int32_t num_sort_pairs,
+    deephaven::dhcore::interop::NativePtr<deephaven::client::TableHandle> *result,
+    deephaven::dhcore::interop::ErrorStatus *status);
+
+void deephaven_client_TableHandle_Select(
+    deephaven::dhcore::interop::NativePtr<deephaven::client::TableHandle> self,
+    const char **column_specs, int32_t num_column_specs,
+    deephaven::dhcore::interop::NativePtr<deephaven::client::TableHandle> *result,
+    deephaven::dhcore::interop::ErrorStatus *status);
+
+void deephaven_client_TableHandle_SelectDistinct(
+    deephaven::dhcore::interop::NativePtr<deephaven::client::TableHandle> self,
+    const char **column_specs, int32_t num_column_specs,
+    deephaven::dhcore::interop::NativePtr<deephaven::client::TableHandle> *result,
+    deephaven::dhcore::interop::ErrorStatus *status);
+
+void deephaven_client_TableHandle_View(
+    deephaven::dhcore::interop::NativePtr<deephaven::client::TableHandle> self,
+    const char **column_specs, int32_t num_column_specs,
+    deephaven::dhcore::interop::NativePtr<deephaven::client::TableHandle> *result,
+    deephaven::dhcore::interop::ErrorStatus *status);
+
+void deephaven_client_TableHandle_DropColumns(
+    deephaven::dhcore::interop::NativePtr<deephaven::client::TableHandle> self,
+    const char **column_specs, int32_t num_column_specs,
+    deephaven::dhcore::interop::NativePtr<deephaven::client::TableHandle> *result,
+    deephaven::dhcore::interop::ErrorStatus *status);
+
+void deephaven_client_TableHandle_Update(
+    deephaven::dhcore::interop::NativePtr<deephaven::client::TableHandle> self,
+    const char **column_specs, int32_t num_column_specs,
+    deephaven::dhcore::interop::NativePtr<deephaven::client::TableHandle> *result,
+    deephaven::dhcore::interop::ErrorStatus *status);
+
+void deephaven_client_TableHandle_LazyUpdate(
+    deephaven::dhcore::interop::NativePtr<deephaven::client::TableHandle> self,
+    const char **column_specs, int32_t num_column_specs,
+    deephaven::dhcore::interop::NativePtr<deephaven::client::TableHandle> *result,
+    deephaven::dhcore::interop::ErrorStatus *status);
+
+void deephaven_client_TableHandle_LastBy(
+    deephaven::dhcore::interop::NativePtr<deephaven::client::TableHandle> self,
+    const char **column_specs, int32_t num_column_specs,
+    deephaven::dhcore::interop::NativePtr<deephaven::client::TableHandle> *result,
+    deephaven::dhcore::interop::ErrorStatus *status);
+
+void deephaven_client_TableHandle_Head(
+    deephaven::dhcore::interop::NativePtr<deephaven::client::TableHandle> self,
+    int64_t num_rows,
+    deephaven::dhcore::interop::NativePtr<deephaven::client::TableHandle> *result,
+    deephaven::dhcore::interop::ErrorStatus *status);
+
+void deephaven_client_TableHandle_Tail(
+    deephaven::dhcore::interop::NativePtr<deephaven::client::TableHandle> self,
+    int64_t num_rows,
+    deephaven::dhcore::interop::NativePtr<deephaven::client::TableHandle> *result,
+    deephaven::dhcore::interop::ErrorStatus *status);
+
+void deephaven_client_TableHandle_Merge(
+    deephaven::dhcore::interop::NativePtr<deephaven::client::TableHandle> self,
+    const char *key_column,
+    deephaven::dhcore::interop::NativePtr<deephaven::client::TableHandle> *sources,
+    int32_t num_sources,
+    deephaven::dhcore::interop::NativePtr<deephaven::client::TableHandle> *result,
+    deephaven::dhcore::interop::ErrorStatus *status);
+
+void deephaven_client_TableHandle_CrossJoin(
+    deephaven::dhcore::interop::NativePtr<deephaven::client::TableHandle> self,
+    deephaven::dhcore::interop::NativePtr<deephaven::client::TableHandle> right_side,
+    const char **columns_to_match, int32_t num_columns_to_match,
+    const char **columns_to_add, int32_t num_columns_to_add,
+    deephaven::dhcore::interop::NativePtr<deephaven::client::TableHandle> *result,
+    deephaven::dhcore::interop::ErrorStatus *status);
+
+void deephaven_client_TableHandle_NaturalJoin(
+    deephaven::dhcore::interop::NativePtr<deephaven::client::TableHandle> self,
+    deephaven::dhcore::interop::NativePtr<deephaven::client::TableHandle> right_side,
+    const char **columns_to_match, int32_t num_columns_to_match,
+    const char **columns_to_add, int32_t num_columns_to_add,
+    deephaven::dhcore::interop::NativePtr<deephaven::client::TableHandle> *result,
+    deephaven::dhcore::interop::ErrorStatus *status);
+
+void deephaven_client_TableHandle_LeftOuterJoin(
+    deephaven::dhcore::interop::NativePtr<deephaven::client::TableHandle> self,
+    deephaven::dhcore::interop::NativePtr<deephaven::client::TableHandle> right_side,
+    const char **columns_to_match, int32_t num_columns_to_match,
+    const char **columns_to_add, int32_t num_columns_to_add,
+    deephaven::dhcore::interop::NativePtr<deephaven::client::TableHandle> *result,
+    deephaven::dhcore::interop::ErrorStatus *status);
+
+void deephaven_client_TableHandle_ExactJoin(
+    deephaven::dhcore::interop::NativePtr<deephaven::client::TableHandle> self,
+    deephaven::dhcore::interop::NativePtr<deephaven::client::TableHandle> right_side,
+    const char **columns_to_match, int32_t num_columns_to_match,
+    const char **columns_to_add, int32_t num_columns_to_add,
+    deephaven::dhcore::interop::NativePtr<deephaven::client::TableHandle> *result,
+    deephaven::dhcore::interop::ErrorStatus *status);
+
+void deephaven_client_TableHandle_Aj(
+    deephaven::dhcore::interop::NativePtr<deephaven::client::TableHandle> self,
+    deephaven::dhcore::interop::NativePtr<deephaven::client::TableHandle> right_side,
+    const char **columns_to_match, int32_t num_columns_to_match,
+    const char **columns_to_add, int32_t num_columns_to_add,
+    deephaven::dhcore::interop::NativePtr<deephaven::client::TableHandle> *result,
+    deephaven::dhcore::interop::ErrorStatus *status);
+
+void deephaven_client_TableHandle_Raj(
+    deephaven::dhcore::interop::NativePtr<deephaven::client::TableHandle> self,
+    deephaven::dhcore::interop::NativePtr<deephaven::client::TableHandle> right_side,
+    const char **columns_to_match, int32_t num_columns_to_match,
+    const char **columns_to_add, int32_t num_columns_to_add,
+    deephaven::dhcore::interop::NativePtr<deephaven::client::TableHandle> *result,
+    deephaven::dhcore::interop::ErrorStatus *status);
+
+void deephaven_client_TableHandle_UpdateBy(
+    deephaven::dhcore::interop::NativePtr<deephaven::client::TableHandle> self,
+    const deephaven::dhcore::interop::NativePtr<deephaven::client::UpdateByOperation> *ops,
+    int32_t num_ops,
+    const char **by, int32_t num_by,
+    deephaven::dhcore::interop::NativePtr<deephaven::client::TableHandle> *result,
+    deephaven::dhcore::interop::ErrorStatus *status);
+
+void deephaven_client_TableHandle_WhereIn(
+    deephaven::dhcore::interop::NativePtr<deephaven::client::TableHandle> self,
+    deephaven::dhcore::interop::NativePtr<deephaven::client::TableHandle> filter_table,
+    const char **column_specs, int32_t num_column_specs,
+    deephaven::dhcore::interop::NativePtr<deephaven::client::TableHandle> *result,
+    deephaven::dhcore::interop::ErrorStatus *status);
+
+void deephaven_client_TableHandle_AddTable(
+    deephaven::dhcore::interop::NativePtr<deephaven::client::TableHandle> self,
+    deephaven::dhcore::interop::NativePtr<deephaven::client::TableHandle> table_to_add,
+    deephaven::dhcore::interop::ErrorStatus *status);
+
+void deephaven_client_TableHandle_RemoveTable(
+    deephaven::dhcore::interop::NativePtr<deephaven::client::TableHandle> self,
+    deephaven::dhcore::interop::NativePtr<deephaven::client::TableHandle> table_to_remove,
+    deephaven::dhcore::interop::ErrorStatus *status);
+
+void deephaven_client_TableHandle_By(
+    deephaven::dhcore::interop::NativePtr<deephaven::client::TableHandle> self,
+    deephaven::dhcore::interop::NativePtr<deephaven::client::AggregateCombo> aggregate_combo,
+    const char **column_specs, int32_t num_column_specs,
+    deephaven::dhcore::interop::NativePtr<deephaven::client::TableHandle> *result,
+    deephaven::dhcore::interop::ErrorStatus *status);
+
+void deephaven_client_TableHandle_MinBy(
+    deephaven::dhcore::interop::NativePtr<deephaven::client::TableHandle> self,
+    const char **column_specs, int32_t num_column_specs,
+    deephaven::dhcore::interop::NativePtr<deephaven::client::TableHandle> *result,
+    deephaven::dhcore::interop::ErrorStatus *status);
+
+void deephaven_client_TableHandle_MaxBy(
+    deephaven::dhcore::interop::NativePtr<deephaven::client::TableHandle> self,
+    const char **column_specs, int32_t num_column_specs,
+    deephaven::dhcore::interop::NativePtr<deephaven::client::TableHandle> *result,
+    deephaven::dhcore::interop::ErrorStatus *status);
+
+void deephaven_client_TableHandle_SumBy(
+    deephaven::dhcore::interop::NativePtr<deephaven::client::TableHandle> self,
+    const char **column_specs, int32_t num_column_specs,
+    deephaven::dhcore::interop::NativePtr<deephaven::client::TableHandle> *result,
+    deephaven::dhcore::interop::ErrorStatus *status);
+
+void deephaven_client_TableHandle_AbsSumBy(
+    deephaven::dhcore::interop::NativePtr<deephaven::client::TableHandle> self,
+    const char **column_specs, int32_t num_column_specs,
+    deephaven::dhcore::interop::NativePtr<deephaven::client::TableHandle> *result,
+    deephaven::dhcore::interop::ErrorStatus *status);
+
+void deephaven_client_TableHandle_VarBy(
+    deephaven::dhcore::interop::NativePtr<deephaven::client::TableHandle> self,
+    const char **column_specs, int32_t num_column_specs,
+    deephaven::dhcore::interop::NativePtr<deephaven::client::TableHandle> *result,
+    deephaven::dhcore::interop::ErrorStatus *status);
+
+void deephaven_client_TableHandle_StdBy(
+    deephaven::dhcore::interop::NativePtr<deephaven::client::TableHandle> self,
+    const char **column_specs, int32_t num_column_specs,
+    deephaven::dhcore::interop::NativePtr<deephaven::client::TableHandle> *result,
+    deephaven::dhcore::interop::ErrorStatus *status);
+
+void deephaven_client_TableHandle_AvgBy(
+    deephaven::dhcore::interop::NativePtr<deephaven::client::TableHandle> self,
+    const char **column_specs, int32_t num_column_specs,
+    deephaven::dhcore::interop::NativePtr<deephaven::client::TableHandle> *result,
+    deephaven::dhcore::interop::ErrorStatus *status);
+
+void deephaven_client_TableHandle_LastBy(
+    deephaven::dhcore::interop::NativePtr<deephaven::client::TableHandle> self,
+    const char **column_specs, int32_t num_column_specs,
+    deephaven::dhcore::interop::NativePtr<deephaven::client::TableHandle> *result,
+    deephaven::dhcore::interop::ErrorStatus *status);
+
+void deephaven_client_TableHandle_FirstBy(
+    deephaven::dhcore::interop::NativePtr<deephaven::client::TableHandle> self,
+    const char **column_specs, int32_t num_column_specs,
+    deephaven::dhcore::interop::NativePtr<deephaven::client::TableHandle> *result,
+    deephaven::dhcore::interop::ErrorStatus *status);
+
+void deephaven_client_TableHandle_MedianBy(
+    deephaven::dhcore::interop::NativePtr<deephaven::client::TableHandle> self,
+    const char **column_specs, int32_t num_column_specs,
+    deephaven::dhcore::interop::NativePtr<deephaven::client::TableHandle> *result,
+    deephaven::dhcore::interop::ErrorStatus *status);
+
+void deephaven_client_TableHandle_PercentileBy(
+    deephaven::dhcore::interop::NativePtr<deephaven::client::TableHandle> self,
+    double percentile, deephaven::dhcore::interop::InteropBool avg_median,
+    const char **column_specs, int32_t num_column_specs,
+    deephaven::dhcore::interop::NativePtr<deephaven::client::TableHandle> *result,
+    deephaven::dhcore::interop::ErrorStatus *status);
+
+void deephaven_client_TableHandle_CountBy(
+    deephaven::dhcore::interop::NativePtr<deephaven::client::TableHandle> self,
+    const char *weightColumn,
+    const char **column_specs, int32_t num_column_specs,
+    deephaven::dhcore::interop::NativePtr<deephaven::client::TableHandle> *result,
+    deephaven::dhcore::interop::ErrorStatus *status);
+
+void deephaven_client_TableHandle_WavgBy(
+    deephaven::dhcore::interop::NativePtr<deephaven::client::TableHandle> self,
+    const char *weightColumn,
+    const char **column_specs, int32_t num_column_specs,
+    deephaven::dhcore::interop::NativePtr<deephaven::client::TableHandle> *result,
+    deephaven::dhcore::interop::ErrorStatus *status);
+
+void deephaven_client_TableHandle_BindToVariable(
+    deephaven::dhcore::interop::NativePtr<deephaven::client::TableHandle> self,
+    const char *variable,
+    deephaven::dhcore::interop::ErrorStatus *status);
+
+void deephaven_client_TableHandle_ToClientTable(
+    deephaven::dhcore::interop::NativePtr<deephaven::client::TableHandle> self,
+    deephaven::dhcore::interop::NativePtr<deephaven::client::interop::ClientTableSpWrapper> *client_table,
+    deephaven::dhcore::interop::ErrorStatus *status);
+
+void deephaven_client_TableHandle_ToString(
+    deephaven::dhcore::interop::NativePtr<deephaven::client::TableHandle> self,
+    deephaven::dhcore::interop::InteropBool want_headers,
+    deephaven::dhcore::interop::StringHandle *result_handle,
+    deephaven::dhcore::interop::StringPoolHandle *string_pool_handle,
+    deephaven::dhcore::interop::ErrorStatus *status);
+
+void deephaven_client_TableHandle_ToArrowTable(
+    deephaven::dhcore::interop::NativePtr<deephaven::client::TableHandle> self,
+    deephaven::dhcore::interop::NativePtr<deephaven::client::interop::ArrowTableSpWrapper> *result,
+    deephaven::dhcore::interop::ErrorStatus *status);
+
+using NativeOnUpdate = void(
+    deephaven::dhcore::interop::NativePtr<deephaven::dhcore::ticking::TickingUpdate> ticking_update);
+using NativeOnFailure = void(deephaven::dhcore::interop::StringHandle,
+    deephaven::dhcore::interop::StringPoolHandle);
+
+void deephaven_client_TableHandle_Subscribe(
+    deephaven::dhcore::interop::NativePtr<deephaven::client::TableHandle> self,
+    deephaven::dhcore::interop::NativePtr<NativeOnUpdate> native_on_update,
+    deephaven::dhcore::interop::NativePtr<NativeOnFailure> native_on_failure,
+    deephaven::dhcore::interop::NativePtr<std::shared_ptr<deephaven::client::subscription::SubscriptionHandle>> *native_subscription_handle,
+    deephaven::dhcore::interop::ErrorStatus *status);
+
+void deephaven_client_TableHandle_Unsubscribe(
+    deephaven::dhcore::interop::NativePtr<deephaven::client::TableHandle> self,
+    deephaven::dhcore::interop::NativePtr<std::shared_ptr<deephaven::client::subscription::SubscriptionHandle>> native_subscription_handle,
+    deephaven::dhcore::interop::ErrorStatus *status);
+
+void deephaven_client_SubscriptionHandle_dtor(
+    deephaven::dhcore::interop::NativePtr<std::shared_ptr<deephaven::client::subscription::SubscriptionHandle>> self);
+
+void deephaven_client_ArrowTable_dtor(
+    deephaven::dhcore::interop::NativePtr<deephaven::client::interop::ArrowTableSpWrapper> self);
+
+void deephaven_client_ArrowTable_GetDimensions(
+    deephaven::dhcore::interop::NativePtr<deephaven::client::interop::ArrowTableSpWrapper> self,
+    int32_t *num_columns, int64_t *num_rows,
+    deephaven::dhcore::interop::ErrorStatus *status);
+
+void deephaven_client_ArrowTable_GetSchema(
+    deephaven::dhcore::interop::NativePtr<deephaven::client::interop::ArrowTableSpWrapper> self,
+    int32_t num_columns,
+    deephaven::dhcore::interop::StringHandle *column_handles, int32_t *column_types,
+    deephaven::dhcore::interop::StringPoolHandle *string_pool_handle,
+    deephaven::dhcore::interop::ErrorStatus *status);
+
+void deephaven_client_ClientTable_dtor(
+    deephaven::dhcore::interop::NativePtr<deephaven::client::interop::ClientTableSpWrapper> self);
+
+void deephaven_client_ClientTable_GetDimensions(
+    deephaven::dhcore::interop::NativePtr<deephaven::client::interop::ClientTableSpWrapper> self,
+    int32_t *num_columns, int64_t *num_rows,
+    deephaven::dhcore::interop::ErrorStatus *status);
+
+void deephaven_client_ClientTable_Schema(
+    deephaven::dhcore::interop::NativePtr<deephaven::client::interop::ClientTableSpWrapper> self,
+    int32_t num_columns,
+    deephaven::dhcore::interop::StringHandle *column_handles,
+    int32_t *column_types,
+    deephaven::dhcore::interop::StringPoolHandle *string_pool_handle,
+    deephaven::dhcore::interop::ErrorStatus *status);
+
+void deephaven_client_ClientTable_ToString(
+    deephaven::dhcore::interop::NativePtr<deephaven::client::interop::ClientTableSpWrapper> self,
+    deephaven::dhcore::interop::InteropBool want_headers,
+    deephaven::dhcore::interop::InteropBool want_row_numbers,
+    deephaven::dhcore::interop::StringHandle *text_handle,
+    deephaven::dhcore::interop::StringPoolHandle *string_pool_handle,
+    deephaven::dhcore::interop::ErrorStatus *status);
+
+void deephaven_client_ClientTableHelper_GetInt8Column(
+    deephaven::dhcore::interop::NativePtr<deephaven::client::interop::ClientTableSpWrapper> self,
+    int32_t column_index, int8_t *data,
+    deephaven::dhcore::interop::InteropBool *optional_dest_null_flags, int64_t num_rows,
+    deephaven::dhcore::interop::StringPoolHandle *string_pool_handle,
+    deephaven::dhcore::interop::ErrorStatus *status);
+void deephaven_client_ClientTableHelper_GetInt16Column(
+    deephaven::dhcore::interop::NativePtr<deephaven::client::interop::ClientTableSpWrapper> self,
+    int32_t column_index, int16_t *data,
+    deephaven::dhcore::interop::InteropBool *optional_dest_null_flags, int64_t num_rows,
+    deephaven::dhcore::interop::StringPoolHandle *string_pool_handle,
+    deephaven::dhcore::interop::ErrorStatus *status);
+void deephaven_client_ClientTableHelper_GetInt32Column(
+    deephaven::dhcore::interop::NativePtr<deephaven::client::interop::ClientTableSpWrapper> self,
+    int32_t column_index, int32_t *data,
+    deephaven::dhcore::interop::InteropBool *optional_dest_null_flags, int64_t num_rows,
+    deephaven::dhcore::interop::StringPoolHandle *string_pool_handle,
+    deephaven::dhcore::interop::ErrorStatus *status);
+void deephaven_client_ClientTableHelper_GetInt64Column(
+    deephaven::dhcore::interop::NativePtr<deephaven::client::interop::ClientTableSpWrapper> self,
+    int32_t column_index, int64_t *data,
+    deephaven::dhcore::interop::InteropBool *optional_dest_null_flags, int64_t num_rows,
+    deephaven::dhcore::interop::StringPoolHandle *string_pool_handle,
+    deephaven::dhcore::interop::ErrorStatus *status);
+void deephaven_client_ClientTableHelper_GetFloatColumn(
+    deephaven::dhcore::interop::NativePtr<deephaven::client::interop::ClientTableSpWrapper> self,
+    int32_t column_index, float *data,
+    deephaven::dhcore::interop::InteropBool *optional_dest_null_flags, int64_t num_rows,
+    deephaven::dhcore::interop::StringPoolHandle *string_pool_handle,
+    deephaven::dhcore::interop::ErrorStatus *status);
+void deephaven_client_ClientTableHelper_GetDoubleColumn(
+    deephaven::dhcore::interop::NativePtr<deephaven::client::interop::ClientTableSpWrapper> self,
+    int32_t column_index, double *data,
+    deephaven::dhcore::interop::InteropBool *optional_dest_null_flags,
+    int64_t num_rows,
+    deephaven::dhcore::interop::StringPoolHandle *string_pool_handle,
+    deephaven::dhcore::interop::ErrorStatus *status);
+void deephaven_client_ClientTableHelper_GetCharAsInt16Column(
+    deephaven::dhcore::interop::NativePtr<deephaven::client::interop::ClientTableSpWrapper> self,
+    int32_t column_index, int16_t *data,
+    deephaven::dhcore::interop::InteropBool *optional_dest_null_flags,
+    int64_t num_rows,
+    deephaven::dhcore::interop::StringPoolHandle *string_pool_handle,
+    deephaven::dhcore::interop::ErrorStatus *status);
+void deephaven_client_ClientTableHelper_GetBooleanAsInteropBoolColumn(
+    deephaven::dhcore::interop::NativePtr<deephaven::client::interop::ClientTableSpWrapper> self,
+    int32_t column_index, int8_t *data,
+    deephaven::dhcore::interop::InteropBool *optional_dest_null_flags, int64_t num_rows,
+    deephaven::dhcore::interop::StringPoolHandle *string_pool_handle,
+    deephaven::dhcore::interop::ErrorStatus *status);
+void deephaven_client_ClientTableHelper_GetStringColumn(
+    deephaven::dhcore::interop::NativePtr<deephaven::client::interop::ClientTableSpWrapper> self,
+    int32_t column_index, deephaven::dhcore::interop::StringHandle *data,
+    deephaven::dhcore::interop::InteropBool *optional_dest_null_flags, int64_t num_rows,
+    deephaven::dhcore::interop::StringPoolHandle *string_pool_handle,
+    deephaven::dhcore::interop::ErrorStatus *status);
+void deephaven_client_ClientTableHelper_GetDateTimeAsInt64Column(
+    deephaven::dhcore::interop::NativePtr<deephaven::client::interop::ClientTableSpWrapper> self,
+    int32_t column_index, int64_t *data,
+    deephaven::dhcore::interop::InteropBool *optional_dest_null_flags, int64_t num_rows,
+    deephaven::dhcore::interop::StringPoolHandle *string_pool_handle,
+    deephaven::dhcore::interop::ErrorStatus *status);
+
+void deephaven_client_TickingUpdate_dtor(
+    deephaven::dhcore::interop::NativePtr<deephaven::dhcore::ticking::TickingUpdate> self);
+
+void deephaven_client_TickingUpdate_Current(
+    deephaven::dhcore::interop::NativePtr<deephaven::dhcore::ticking::TickingUpdate> self,
+    deephaven::dhcore::interop::NativePtr<deephaven::client::interop::ClientTableSpWrapper> *result,
+    deephaven::dhcore::interop::ErrorStatus *status);
+
+void deephaven_client_AggregateCombo_Create(
+    const deephaven::dhcore::interop::NativePtr<deephaven::client::Aggregate> *aggregate_ptrs,
+    int32_t num_aggregates,
+    deephaven::dhcore::interop::NativePtr<deephaven::client::AggregateCombo> *result,
+    deephaven::dhcore::interop::ErrorStatus *status);
+void deephaven_client_AggregateCombo_dtor(
+    deephaven::dhcore::interop::NativePtr<deephaven::client::AggregateCombo> self);
+
+void deephaven_client_Aggregate_dtor(
+    deephaven::dhcore::interop::NativePtr<deephaven::client::Aggregate> self);
+void deephaven_client_Aggregate_AbsSum(
+    const char **columns, int32_t num_columns,
+    deephaven::dhcore::interop::NativePtr<deephaven::client::Aggregate> *result,
+    deephaven::dhcore::interop::ErrorStatus *status);
+void deephaven_client_Aggregate_Group(
+    const char **columns, int32_t num_columns,
+    deephaven::dhcore::interop::NativePtr<deephaven::client::Aggregate> *result,
+    deephaven::dhcore::interop::ErrorStatus *status);
+void deephaven_client_Aggregate_Avg(
+    const char **columns, int32_t num_columns,
+    deephaven::dhcore::interop::NativePtr<deephaven::client::Aggregate> *result,
+    deephaven::dhcore::interop::ErrorStatus *status);
+void deephaven_client_Aggregate_Count(
+    const char *column,
+    deephaven::dhcore::interop::NativePtr<deephaven::client::Aggregate> *result,
+    deephaven::dhcore::interop::ErrorStatus *status);
+void deephaven_client_Aggregate_First(
+    const char **columns, int32_t num_columns,
+    deephaven::dhcore::interop::NativePtr<deephaven::client::Aggregate> *result,
+    deephaven::dhcore::interop::ErrorStatus *status);
+void deephaven_client_Aggregate_Last(
+    const char **columns, int32_t num_columns,
+    deephaven::dhcore::interop::NativePtr<deephaven::client::Aggregate> *result,
+    deephaven::dhcore::interop::ErrorStatus *status);
+void deephaven_client_Aggregate_Max(
+    const char **columns, int32_t num_columns,
+    deephaven::dhcore::interop::NativePtr<deephaven::client::Aggregate> *result,
+    deephaven::dhcore::interop::ErrorStatus *status);
+void deephaven_client_Aggregate_Med(
+    const char **columns, int32_t num_columns,
+    deephaven::dhcore::interop::NativePtr<deephaven::client::Aggregate> *result,
+    deephaven::dhcore::interop::ErrorStatus *status);
+void deephaven_client_Aggregate_Min(
+    const char **columns, int32_t num_columns,
+    deephaven::dhcore::interop::NativePtr<deephaven::client::Aggregate> *result,
+    deephaven::dhcore::interop::ErrorStatus *status);
+void deephaven_client_Aggregate_Pct(
+    double percentile, deephaven::dhcore::interop::InteropBool avg_median,
+    const char **columns, int32_t num_columns,
+    deephaven::dhcore::interop::NativePtr<deephaven::client::Aggregate> *result,
+    deephaven::dhcore::interop::ErrorStatus *status);
+void deephaven_client_Aggregate_Std(
+    const char **columns, int32_t num_columns,
+    deephaven::dhcore::interop::NativePtr<deephaven::client::Aggregate> *result,
+    deephaven::dhcore::interop::ErrorStatus *status);
+void deephaven_client_Aggregate_Sum(
+    const char **columns, int32_t num_columns,
+    deephaven::dhcore::interop::NativePtr<deephaven::client::Aggregate> *result,
+    deephaven::dhcore::interop::ErrorStatus *status);
+void deephaven_client_Aggregate_Var(
+    const char **columns, int32_t num_columns,
+    deephaven::dhcore::interop::NativePtr<deephaven::client::Aggregate> *result,
+    deephaven::dhcore::interop::ErrorStatus *status);
+void deephaven_client_Aggregate_WAvg(const char *weight,
+    const char **columns, int32_t num_columns,
+    deephaven::dhcore::interop::NativePtr<deephaven::client::Aggregate> *result,
+    deephaven::dhcore::interop::ErrorStatus *status);
+
+void deephaven_client_utility_DurationSpecifier_ctor_nanos(
+    int64_t nanos,
+    deephaven::dhcore::interop::NativePtr<deephaven::client::utility::DurationSpecifier> *result,
+    deephaven::dhcore::interop::ErrorStatus *status);
+void deephaven_client_utility_DurationSpecifier_ctor_durationstr(
+    const char *duration_str,
+    deephaven::dhcore::interop::NativePtr<deephaven::client::utility::DurationSpecifier> *result,
+    deephaven::dhcore::interop::ErrorStatus *status);
+void deephaven_client_utility_DurationSpecifier_dtor(
+    deephaven::dhcore::interop::NativePtr<deephaven::client::utility::DurationSpecifier> result);
+
+void deephaven_client_utility_TimePointSpecifier_ctor_nanos(
+    int64_t nanos,
+    deephaven::dhcore::interop::NativePtr<deephaven::client::utility::TimePointSpecifier> *result,
+    deephaven::dhcore::interop::ErrorStatus *status);
+void deephaven_client_utility_TimePointSpecifier_ctor_timepointstr(
+    const char *time_point_str,
+    deephaven::dhcore::interop::NativePtr<deephaven::client::utility::TimePointSpecifier> *result,
+    deephaven::dhcore::interop::ErrorStatus *status);
+void deephaven_client_utility_TimePointSpecifier_dtor(
+    deephaven::dhcore::interop::NativePtr<deephaven::client::utility::TimePointSpecifier> result);
+
+void deephaven_dhclient_utility_TableMaker_ctor(
+    deephaven::dhcore::interop::NativePtr<deephaven::client::utility::TableMaker> *result,
+    deephaven::dhcore::interop::ErrorStatus *status);
+void deephaven_dhclient_utility_TableMaker_dtor(
+    deephaven::dhcore::interop::NativePtr<deephaven::client::utility::TableMaker> self);
+void deephaven_dhclient_utility_TableMaker_MakeTable(
+    deephaven::dhcore::interop::NativePtr<deephaven::client::utility::TableMaker> self,
+    deephaven::dhcore::interop::NativePtr<deephaven::client::TableHandleManager> manager,
+    deephaven::dhcore::interop::NativePtr<deephaven::client::TableHandle> *result,
+    deephaven::dhcore::interop::ErrorStatus *status);
+void deephaven_dhclient_utility_TableMaker_AddColumn__CharAsInt16(
+    deephaven::dhcore::interop::NativePtr<deephaven::client::utility::TableMaker> self,
+    const char *name,
+    const int16_t *data,
+    int32_t length,
+    const deephaven::dhcore::interop::InteropBool *optional_nulls,
+    deephaven::dhcore::interop::ErrorStatus *status);
+void deephaven_dhclient_utility_TableMaker_AddColumn__Int8(
+    deephaven::dhcore::interop::NativePtr<deephaven::client::utility::TableMaker> self,
+    const char *name,
+    const int8_t *data,
+    int32_t length,
+    const deephaven::dhcore::interop::InteropBool *optional_nulls,
+    deephaven::dhcore::interop::ErrorStatus *status);
+void deephaven_dhclient_utility_TableMaker_AddColumn__Int16(
+    deephaven::dhcore::interop::NativePtr<deephaven::client::utility::TableMaker> self,
+    const char *name,
+    const int16_t *data,
+    int32_t length,
+    const deephaven::dhcore::interop::InteropBool *optional_nulls,
+    deephaven::dhcore::interop::ErrorStatus *status);
+void deephaven_dhclient_utility_TableMaker_AddColumn__Int32(
+    deephaven::dhcore::interop::NativePtr<deephaven::client::utility::TableMaker> self,
+    const char *name,
+    const int32_t *data,
+    int32_t length,
+    const deephaven::dhcore::interop::InteropBool *optional_nulls,
+    deephaven::dhcore::interop::ErrorStatus *status);
+void deephaven_dhclient_utility_TableMaker_AddColumn__Int64(
+    deephaven::dhcore::interop::NativePtr<deephaven::client::utility::TableMaker> self,
+    const char *name,
+    const int64_t *data,
+    int32_t length,
+    const deephaven::dhcore::interop::InteropBool *optional_nulls,
+    deephaven::dhcore::interop::ErrorStatus *status);
+void deephaven_dhclient_utility_TableMaker_AddColumn__Float(
+    deephaven::dhcore::interop::NativePtr<deephaven::client::utility::TableMaker> self,
+    const char *name,
+    const float *data,
+    int32_t length,
+    const deephaven::dhcore::interop::InteropBool *optional_nulls,
+    deephaven::dhcore::interop::ErrorStatus *status);
+void deephaven_dhclient_utility_TableMaker_AddColumn__Double(
+    deephaven::dhcore::interop::NativePtr<deephaven::client::utility::TableMaker> self,
+    const char *name,
+    const double *data,
+    int32_t length,
+    const deephaven::dhcore::interop::InteropBool *optional_nulls,
+    deephaven::dhcore::interop::ErrorStatus *status);
+void deephaven_dhclient_utility_TableMaker_AddColumn__BoolAsInteropBool(
+    deephaven::dhcore::interop::NativePtr<deephaven::client::utility::TableMaker> self,
+    const char *name,
+    const int8_t *data,
+    int32_t length,
+    const deephaven::dhcore::interop::InteropBool *optional_nulls,
+    deephaven::dhcore::interop::ErrorStatus *status);
+void deephaven_dhclient_utility_TableMaker_AddColumn__String(
+    deephaven::dhcore::interop::NativePtr<deephaven::client::utility::TableMaker> self,
+    const char *name,
+    const char **data,
+    int32_t length,
+    const deephaven::dhcore::interop::InteropBool *optional_nulls,
+    deephaven::dhcore::interop::ErrorStatus *status);
+void deephaven_dhclient_utility_TableMaker_AddColumn__DateTimeAsInt64(
+    deephaven::dhcore::interop::NativePtr<deephaven::client::utility::TableMaker> self,
+    const char *name,
+    const int64_t *data,
+    int32_t length,
+    const deephaven::dhcore::interop::InteropBool *optional_nulls,
+    deephaven::dhcore::interop::ErrorStatus *status);
+}  // extern "C"
diff --git a/cpp-client/deephaven/dhclient/include/public/deephaven/client/interop/client_options_interop.h b/cpp-client/deephaven/dhclient/include/public/deephaven/client/interop/client_options_interop.h
new file mode 100644
index 00000000000..033ddd0c720
--- /dev/null
+++ b/cpp-client/deephaven/dhclient/include/public/deephaven/client/interop/client_options_interop.h
@@ -0,0 +1,57 @@
+/*
+ * Copyright (c) 2016-2024 Deephaven Data Labs and Patent Pending
+ */
+#include <cstdint>
+#include "deephaven/client/client_options.h"
+#include "deephaven/dhcore/interop/interop_util.h"
+
+extern "C" {
+void deephaven_client_ClientOptions_ctor(
+    deephaven::dhcore::interop::NativePtr<deephaven::client::ClientOptions> *result,
+    deephaven::dhcore::interop::ErrorStatus *status);
+void deephaven_client_ClientOptions_dtor(
+    deephaven::dhcore::interop::NativePtr<deephaven::client::ClientOptions> self);
+void deephaven_client_ClientOptions_SetDefaultAuthentication(
+    deephaven::dhcore::interop::NativePtr<deephaven::client::ClientOptions> self,
+    deephaven::dhcore::interop::ErrorStatus *status);
+void deephaven_client_ClientOptions_SetBasicAuthentication(
+    deephaven::dhcore::interop::NativePtr<deephaven::client::ClientOptions> self,
+    const char *username, const char *password,
+    deephaven::dhcore::interop::ErrorStatus *status);
+void deephaven_client_ClientOptions_SetCustomAuthentication(
+    deephaven::dhcore::interop::NativePtr<deephaven::client::ClientOptions> self,
+    const char *authentication_key, const char *authentication_value,
+    deephaven::dhcore::interop::ErrorStatus *status);
+void deephaven_client_ClientOptions_SetSessionType(
+    deephaven::dhcore::interop::NativePtr<deephaven::client::ClientOptions> self,
+    const char *session_type,
+    deephaven::dhcore::interop::ErrorStatus *status);
+void deephaven_client_ClientOptions_SetUseTls(
+    deephaven::dhcore::interop::NativePtr<deephaven::client::ClientOptions> self,
+    deephaven::dhcore::interop::InteropBool use_tls,
+    deephaven::dhcore::interop::ErrorStatus *status);
+void deephaven_client_ClientOptions_SetTlsRootCerts(
+    deephaven::dhcore::interop::NativePtr<deephaven::client::ClientOptions> self,
+    const char *tls_root_certs,
+    deephaven::dhcore::interop::ErrorStatus *status);
+void deephaven_client_ClientOptions_SetClientCertChain(
+    deephaven::dhcore::interop::NativePtr<deephaven::client::ClientOptions> self,
+    const char *client_cert_chain,
+    deephaven::dhcore::interop::ErrorStatus *status);
+void deephaven_client_ClientOptions_SetClientPrivateKey(
+    deephaven::dhcore::interop::NativePtr<deephaven::client::ClientOptions> self,
+    const char *client_private_key,
+    deephaven::dhcore::interop::ErrorStatus *status);
+void deephaven_client_ClientOptions_AddIntOption(
+    deephaven::dhcore::interop::NativePtr<deephaven::client::ClientOptions> self,
+    const char *opt, int32_t val,
+    deephaven::dhcore::interop::ErrorStatus *status);
+void deephaven_client_ClientOptions_AddStringOption(
+    deephaven::dhcore::interop::NativePtr<deephaven::client::ClientOptions> self,
+    const char *opt, const char *val,
+    deephaven::dhcore::interop::ErrorStatus *status);
+void deephaven_client_ClientOptions_AddExtraHeader(
+    deephaven::dhcore::interop::NativePtr<deephaven::client::ClientOptions> self,
+    const char *header_name, const char *header_value,
+    deephaven::dhcore::interop::ErrorStatus *status);
+}  // extern "C"
diff --git a/cpp-client/deephaven/dhclient/include/public/deephaven/client/interop/update_by_interop.h b/cpp-client/deephaven/dhclient/include/public/deephaven/client/interop/update_by_interop.h
new file mode 100644
index 00000000000..660f3f9b62f
--- /dev/null
+++ b/cpp-client/deephaven/dhclient/include/public/deephaven/client/interop/update_by_interop.h
@@ -0,0 +1,195 @@
+/*
+ * Copyright (c) 2016-2024 Deephaven Data Labs and Patent Pending
+ */
+#include <cstdint>
+#include "deephaven/client/client.h"
+#include "deephaven/client/client_options.h"
+#include "deephaven/client/update_by.h"
+#include "deephaven/client/utility/table_maker.h"
+#include "deephaven/dhcore/interop/interop_util.h"
+
+
+extern "C" {
+void deephaven_client_UpdateByOperation_dtor(
+    deephaven::dhcore::interop::NativePtr<deephaven::client::UpdateByOperation> self);
+void deephaven_client_update_by_cumSum(
+    const char **cols, int32_t num_cols,
+    deephaven::dhcore::interop::NativePtr<deephaven::client::UpdateByOperation> *result,
+    deephaven::dhcore::interop::ErrorStatus *status);
+void deephaven_client_update_by_cumProd(
+    const char **cols, int32_t num_cols,
+    deephaven::dhcore::interop::NativePtr<deephaven::client::UpdateByOperation> *result,
+    deephaven::dhcore::interop::ErrorStatus *status);
+void deephaven_client_update_by_cumMin(
+    const char **cols, int32_t num_cols,
+    deephaven::dhcore::interop::NativePtr<deephaven::client::UpdateByOperation> *result,
+    deephaven::dhcore::interop::ErrorStatus *status);
+void deephaven_client_update_by_cumMax(
+    const char **cols, int32_t num_cols,
+    deephaven::dhcore::interop::NativePtr<deephaven::client::UpdateByOperation> *result,
+    deephaven::dhcore::interop::ErrorStatus *status);
+void deephaven_client_update_by_forwardFill(
+    const char **cols, int32_t num_cols,
+    deephaven::dhcore::interop::NativePtr<deephaven::client::UpdateByOperation> *result,
+    deephaven::dhcore::interop::ErrorStatus *status);
+void deephaven_client_update_by_delta(
+    const char **cols, int32_t num_cols,
+    deephaven::client::update_by::DeltaControl delta_control,
+    deephaven::dhcore::interop::NativePtr<deephaven::client::UpdateByOperation> *result,
+    deephaven::dhcore::interop::ErrorStatus *status);
+void deephaven_client_update_by_emaTick(double decay_ticks,
+    const char **cols, int32_t num_cols,
+    const deephaven::client::update_by::OperationControl *op_control,
+    deephaven::dhcore::interop::NativePtr<deephaven::client::UpdateByOperation> *result,
+    deephaven::dhcore::interop::ErrorStatus *status);
+void deephaven_client_update_by_emaTime(const char *timestamp_col,
+    deephaven::dhcore::interop::NativePtr<deephaven::client::utility::DurationSpecifier> decay_time,
+    const char **cols, int32_t num_cols,
+    const deephaven::client::update_by::OperationControl *op_control,
+    deephaven::dhcore::interop::NativePtr<deephaven::client::UpdateByOperation> *result,
+    deephaven::dhcore::interop::ErrorStatus *status);
+void deephaven_client_update_by_emsTick(double decay_ticks,
+    const char **cols, int32_t num_cols,
+    const deephaven::client::update_by::OperationControl *op_control,
+    deephaven::dhcore::interop::NativePtr<deephaven::client::UpdateByOperation> *result,
+    deephaven::dhcore::interop::ErrorStatus *status);
+void deephaven_client_update_by_emsTime(const char *timestamp_col,
+    deephaven::dhcore::interop::NativePtr<deephaven::client::utility::DurationSpecifier> decay_time,
+    const char **cols, int32_t num_cols,
+    const deephaven::client::update_by::OperationControl *op_control,
+    deephaven::dhcore::interop::NativePtr<deephaven::client::UpdateByOperation> *result,
+    deephaven::dhcore::interop::ErrorStatus *status);
+void deephaven_client_update_by_emminTick(double decay_ticks,
+    const char **cols, int32_t num_cols,
+    const deephaven::client::update_by::OperationControl *op_control,
+    deephaven::dhcore::interop::NativePtr<deephaven::client::UpdateByOperation> *result,
+    deephaven::dhcore::interop::ErrorStatus *status);
+void deephaven_client_update_by_emminTime(const char *timestamp_col,
+    deephaven::dhcore::interop::NativePtr<deephaven::client::utility::DurationSpecifier> decay_time,
+    const char **cols, int32_t num_cols,
+    const deephaven::client::update_by::OperationControl *op_control,
+    deephaven::dhcore::interop::NativePtr<deephaven::client::UpdateByOperation> *result,
+    deephaven::dhcore::interop::ErrorStatus *status);
+void deephaven_client_update_by_emmaxTick(double decay_ticks,
+    const char **cols, int32_t num_cols,
+    const deephaven::client::update_by::OperationControl *op_control,
+    deephaven::dhcore::interop::NativePtr<deephaven::client::UpdateByOperation> *result,
+    deephaven::dhcore::interop::ErrorStatus *status);
+void deephaven_client_update_by_emmaxTime(const char *timestamp_col,
+    deephaven::dhcore::interop::NativePtr<deephaven::client::utility::DurationSpecifier> decay_time,
+    const char **cols, int32_t num_cols,
+    const deephaven::client::update_by::OperationControl *op_control,
+    deephaven::dhcore::interop::NativePtr<deephaven::client::UpdateByOperation> *result,
+    deephaven::dhcore::interop::ErrorStatus *status);
+void deephaven_client_update_by_emstdTick(double decay_ticks,
+    const char **cols, int32_t num_cols,
+    const deephaven::client::update_by::OperationControl *op_control,
+    deephaven::dhcore::interop::NativePtr<deephaven::client::UpdateByOperation> *result,
+    deephaven::dhcore::interop::ErrorStatus *status);
+void deephaven_client_update_by_emstdTime(const char *timestamp_col,
+    deephaven::dhcore::interop::NativePtr<deephaven::client::utility::DurationSpecifier> decay_time,
+    const char **cols, int32_t num_cols,
+    const deephaven::client::update_by::OperationControl *op_control,
+    deephaven::dhcore::interop::NativePtr<deephaven::client::UpdateByOperation> *result,
+    deephaven::dhcore::interop::ErrorStatus *status);
+void deephaven_client_update_by_rollingSumTick(
+    const char **cols, int32_t num_cols,
+    int32_t rev_ticks, int32_t fwd_ticks,
+    deephaven::dhcore::interop::NativePtr<deephaven::client::UpdateByOperation> *result,
+    deephaven::dhcore::interop::ErrorStatus *status);
+void deephaven_client_update_by_rollingSumTime(const char *timestamp_col,
+    const char **cols, int32_t num_cols,
+    deephaven::dhcore::interop::NativePtr<deephaven::client::utility::DurationSpecifier> rev_time,
+    deephaven::dhcore::interop::NativePtr<deephaven::client::utility::DurationSpecifier> fwd_time,
+    deephaven::dhcore::interop::NativePtr<deephaven::client::UpdateByOperation> *result,
+    deephaven::dhcore::interop::ErrorStatus *status);
+void deephaven_client_update_by_rollingGroupTick(
+    const char **cols, int32_t num_cols,
+    int32_t rev_ticks, int32_t fwd_ticks,
+    deephaven::dhcore::interop::NativePtr<deephaven::client::UpdateByOperation> *result,
+    deephaven::dhcore::interop::ErrorStatus *status);
+void deephaven_client_update_by_rollingGroupTime(const char *timestamp_col,
+    const char **cols, int32_t num_cols,
+    deephaven::dhcore::interop::NativePtr<deephaven::client::utility::DurationSpecifier> rev_time,
+    deephaven::dhcore::interop::NativePtr<deephaven::client::utility::DurationSpecifier> fwd_time,
+    deephaven::dhcore::interop::NativePtr<deephaven::client::UpdateByOperation> *result,
+    deephaven::dhcore::interop::ErrorStatus *status);
+void deephaven_client_update_by_rollingAvgTick(
+    const char **cols, int32_t num_cols,
+    int32_t rev_ticks, int32_t fwd_ticks,
+    deephaven::dhcore::interop::NativePtr<deephaven::client::UpdateByOperation> *result,
+    deephaven::dhcore::interop::ErrorStatus *status);
+void deephaven_client_update_by_rollingAvgTime(const char *timestamp_col,
+    const char **cols, int32_t num_cols,
+    deephaven::dhcore::interop::NativePtr<deephaven::client::utility::DurationSpecifier> rev_time,
+    deephaven::dhcore::interop::NativePtr<deephaven::client::utility::DurationSpecifier> fwd_time,
+    deephaven::dhcore::interop::NativePtr<deephaven::client::UpdateByOperation> *result,
+    deephaven::dhcore::interop::ErrorStatus *status);
+void deephaven_client_update_by_rollingMinTick(
+    const char **cols, int32_t num_cols,
+    int32_t rev_ticks, int32_t fwd_ticks,
+    deephaven::dhcore::interop::NativePtr<deephaven::client::UpdateByOperation> *result,
+    deephaven::dhcore::interop::ErrorStatus *status);
+void deephaven_client_update_by_rollingMinTime(const char *timestamp_col,
+    const char **cols, int32_t num_cols,
+    deephaven::dhcore::interop::NativePtr<deephaven::client::utility::DurationSpecifier> rev_time,
+    deephaven::dhcore::interop::NativePtr<deephaven::client::utility::DurationSpecifier> fwd_time,
+    deephaven::dhcore::interop::NativePtr<deephaven::client::UpdateByOperation> *result,
+    deephaven::dhcore::interop::ErrorStatus *status);
+void deephaven_client_update_by_rollingMaxTick(
+    const char **cols, int32_t num_cols,
+    int32_t rev_ticks, int32_t fwd_ticks,
+    deephaven::dhcore::interop::NativePtr<deephaven::client::UpdateByOperation> *result,
+    deephaven::dhcore::interop::ErrorStatus *status);
+void deephaven_client_update_by_rollingMaxTime(const char *timestamp_col,
+    const char **cols, int32_t num_cols,
+    deephaven::dhcore::interop::NativePtr<deephaven::client::utility::DurationSpecifier> rev_time,
+    deephaven::dhcore::interop::NativePtr<deephaven::client::utility::DurationSpecifier> fwd_time,
+    deephaven::dhcore::interop::NativePtr<deephaven::client::UpdateByOperation> *result,
+    deephaven::dhcore::interop::ErrorStatus *status);
+void deephaven_client_update_by_rollingProdTick(
+    const char **cols, int32_t num_cols,
+    int32_t rev_ticks, int32_t fwd_ticks,
+    deephaven::dhcore::interop::NativePtr<deephaven::client::UpdateByOperation> *result,
+    deephaven::dhcore::interop::ErrorStatus *status);
+void deephaven_client_update_by_rollingProdTime(const char *timestamp_col,
+    const char **cols, int32_t num_cols,
+    deephaven::dhcore::interop::NativePtr<deephaven::client::utility::DurationSpecifier> rev_time,
+    deephaven::dhcore::interop::NativePtr<deephaven::client::utility::DurationSpecifier> fwd_time,
+    deephaven::dhcore::interop::NativePtr<deephaven::client::UpdateByOperation> *result,
+    deephaven::dhcore::interop::ErrorStatus *status);
+void deephaven_client_update_by_rollingCountTick(
+    const char **cols, int32_t num_cols,
+    int32_t rev_ticks, int32_t fwd_ticks,
+    deephaven::dhcore::interop::NativePtr<deephaven::client::UpdateByOperation> *result,
+    deephaven::dhcore::interop::ErrorStatus *status);
+void deephaven_client_update_by_rollingCountTime(const char *timestamp_col,
+    const char **cols, int32_t num_cols,
+    deephaven::dhcore::interop::NativePtr<deephaven::client::utility::DurationSpecifier> rev_time,
+    deephaven::dhcore::interop::NativePtr<deephaven::client::utility::DurationSpecifier> fwd_time,
+    deephaven::dhcore::interop::NativePtr<deephaven::client::UpdateByOperation> *result,
+    deephaven::dhcore::interop::ErrorStatus *status);
+void deephaven_client_update_by_rollingStdTick(
+    const char **cols, int32_t num_cols,
+    int32_t rev_ticks, int32_t fwd_ticks,
+    deephaven::dhcore::interop::NativePtr<deephaven::client::UpdateByOperation> *result,
+    deephaven::dhcore::interop::ErrorStatus *status);
+void deephaven_client_update_by_rollingStdTime(const char *timestamp_col,
+    const char **cols, int32_t num_cols,
+    deephaven::dhcore::interop::NativePtr<deephaven::client::utility::DurationSpecifier> rev_time,
+    deephaven::dhcore::interop::NativePtr<deephaven::client::utility::DurationSpecifier> fwd_time,
+    deephaven::dhcore::interop::NativePtr<deephaven::client::UpdateByOperation> *result,
+    deephaven::dhcore::interop::ErrorStatus *status);
+void deephaven_client_update_by_rollingWavgTick(const char *weight_col,
+    const char **cols, int32_t num_cols,
+    int32_t rev_ticks, int32_t fwd_ticks,
+    deephaven::dhcore::interop::NativePtr<deephaven::client::UpdateByOperation> *result,
+    deephaven::dhcore::interop::ErrorStatus *status);
+void deephaven_client_update_by_rollingWavgTime(const char *timestamp_col,
+    const char *weight_col,
+    const char **cols, int32_t num_cols,
+    deephaven::dhcore::interop::NativePtr<deephaven::client::utility::DurationSpecifier> rev_time,
+    deephaven::dhcore::interop::NativePtr<deephaven::client::utility::DurationSpecifier> fwd_time,
+    deephaven::dhcore::interop::NativePtr<deephaven::client::UpdateByOperation> *result,
+    deephaven::dhcore::interop::ErrorStatus *status);
+}  // extern "C"
diff --git a/cpp-client/deephaven/dhclient/include/public/deephaven/client/update_by.h b/cpp-client/deephaven/dhclient/include/public/deephaven/client/update_by.h
index 9c9b8a96d56..07a1bc1962c 100644
--- a/cpp-client/deephaven/dhclient/include/public/deephaven/client/update_by.h
+++ b/cpp-client/deephaven/dhclient/include/public/deephaven/client/update_by.h
@@ -60,15 +60,15 @@ namespace deephaven::client::update_by {
  * This enum is meant to be a parallel of the Java enum java.math.MathContext.
  * See https://docs.oracle.com/javase/8/docs/api/java/math/MathContext.html
  */
-enum class MathContext {
+enum class MathContext : int32_t {
   kUnlimited, kDecimal32, kDecimal64, kDecimal128
 };
 
-enum class BadDataBehavior {
+enum class BadDataBehavior : int32_t {
   kReset, kSkip, kThrow, kPoison
 };
 
-enum class DeltaControl {
+enum class DeltaControl : int32_t {
   kNullDominates, kValueDominates, kZeroDominates
 };
 
diff --git a/cpp-client/deephaven/dhclient/include/public/deephaven/client/utility/table_maker.h b/cpp-client/deephaven/dhclient/include/public/deephaven/client/utility/table_maker.h
index 5d89f846bf9..02f39647c82 100644
--- a/cpp-client/deephaven/dhclient/include/public/deephaven/client/utility/table_maker.h
+++ b/cpp-client/deephaven/dhclient/include/public/deephaven/client/utility/table_maker.h
@@ -30,6 +30,11 @@ class TypeConverter {
   [[nodiscard]]
   static TypeConverter CreateNew(const std::vector<T> &values);
 
+  template<typename T, typename GetValue, typename IsNull>
+  [[nodiscard]]
+  static TypeConverter CreateNew(const GetValue &get_value, const IsNull &is_null,
+      size_t size);
+
   TypeConverter(std::shared_ptr<arrow::DataType> data_type, std::string deephaven_type,
       std::shared_ptr<arrow::Array> column);
   ~TypeConverter();
@@ -107,6 +112,13 @@ class TableMaker {
   template<typename T>
   void AddColumn(std::string name, const std::vector<T> &values);
 
+  template<typename T>
+  void AddColumn(std::string name, const std::vector<std::optional<T>> &values);
+
+  template<typename T, typename GetValue, typename IsNull>
+  void AddColumn(std::string name, const GetValue &get_value, const IsNull &is_null,
+      size_t size);
+
   /**
    * Make the table. Call this after all your calls to AddColumn().
    * @param manager The TableHandleManager
@@ -128,8 +140,8 @@ template<typename T>
 struct TypeConverterTraits {
   // The below assert fires when this class is instantiated; i.e. when none of the specializations
   // match. It needs to be written this way (with "is_same<T,T>") because for technical reasons it
-  // needso be dependent on T, even if degenerately so.
-  static_assert(!std::is_same<T, T>::value, "TableMaker doesn't know how to work with this type");
+  // needs to be dependent on T, even if degenerately so.
+  static_assert(!std::is_same_v<T, T>, "TableMaker doesn't know how to work with this type");
 };
 
 // Implementation note: GetDeephavenTypeName() is better as a function rather than a constant,
@@ -137,8 +149,15 @@ struct TypeConverterTraits {
 
 template<>
 struct TypeConverterTraits<char16_t> {
-  using arrowType_t = arrow::UInt16Type;
-  using arrowBuilder_t = arrow::UInt16Builder;
+  static std::shared_ptr<arrow::DataType> GetDataType() {
+    return std::make_shared<arrow::UInt16Type>();
+  }
+  static arrow::UInt16Builder GetBuilder() {
+    return arrow::UInt16Builder();
+  }
+  static char16_t Reinterpret(char16_t o) {
+    return o;
+  }
   static std::string_view GetDeephavenTypeName() {
     return "char";
   }
@@ -146,8 +165,15 @@ struct TypeConverterTraits<char16_t> {
 
 template<>
 struct TypeConverterTraits<bool> {
-  using arrowType_t = arrow::BooleanType;
-  using arrowBuilder_t = arrow::BooleanBuilder;
+  static std::shared_ptr<arrow::DataType> GetDataType() {
+    return std::make_shared<arrow::BooleanType>();
+  }
+  static arrow::BooleanBuilder GetBuilder() {
+    return arrow::BooleanBuilder();
+  }
+  static bool Reinterpret(bool o) {
+    return o;
+  }
   static std::string_view GetDeephavenTypeName() {
     return "java.lang.Boolean";
   }
@@ -155,8 +181,15 @@ struct TypeConverterTraits<bool> {
 
 template<>
 struct TypeConverterTraits<int8_t> {
-  using arrowType_t = arrow::Int8Type;
-  using arrowBuilder_t = arrow::Int8Builder;
+  static std::shared_ptr<arrow::DataType> GetDataType() {
+    return std::make_shared<arrow::Int8Type>();
+  }
+  static arrow::Int8Builder GetBuilder() {
+    return arrow::Int8Builder();
+  }
+  static int8_t Reinterpret(int8_t o) {
+    return o;
+  }
   static std::string_view GetDeephavenTypeName() {
     return "byte";
   }
@@ -164,8 +197,15 @@ struct TypeConverterTraits<int8_t> {
 
 template<>
 struct TypeConverterTraits<int16_t> {
-  using arrowType_t = arrow::Int16Type;
-  using arrowBuilder_t = arrow::Int16Builder;
+  static std::shared_ptr<arrow::DataType> GetDataType() {
+    return std::make_shared<arrow::Int16Type>();
+  }
+  static arrow::Int16Builder GetBuilder() {
+    return arrow::Int16Builder();
+  }
+  static int16_t Reinterpret(int16_t o) {
+    return o;
+  }
   static std::string_view GetDeephavenTypeName() {
     return "short";
   }
@@ -173,8 +213,15 @@ struct TypeConverterTraits<int16_t> {
 
 template<>
 struct TypeConverterTraits<int32_t> {
-  using arrowType_t = arrow::Int32Type;
-  using arrowBuilder_t = arrow::Int32Builder;
+  static std::shared_ptr<arrow::DataType> GetDataType() {
+    return std::make_shared<arrow::Int32Type>();
+  }
+  static arrow::Int32Builder GetBuilder() {
+    return arrow::Int32Builder();
+  }
+  static int32_t Reinterpret(int32_t o) {
+    return o;
+  }
   static std::string_view GetDeephavenTypeName() {
     return "int";
   }
@@ -182,8 +229,15 @@ struct TypeConverterTraits<int32_t> {
 
 template<>
 struct TypeConverterTraits<int64_t> {
-  using arrowType_t = arrow::Int64Type;
-  using arrowBuilder_t = arrow::Int64Builder;
+  static std::shared_ptr<arrow::DataType> GetDataType() {
+    return std::make_shared<arrow::Int64Type>();
+  }
+  static arrow::Int64Builder GetBuilder() {
+    return arrow::Int64Builder();
+  }
+  static int64_t Reinterpret(int64_t o) {
+    return o;
+  }
   static std::string_view GetDeephavenTypeName() {
     return "long";
   }
@@ -191,8 +245,15 @@ struct TypeConverterTraits<int64_t> {
 
 template<>
 struct TypeConverterTraits<float> {
-  using arrowType_t = arrow::FloatType;
-  using arrowBuilder_t = arrow::FloatBuilder;
+  static std::shared_ptr<arrow::DataType> GetDataType() {
+    return std::make_shared<arrow::FloatType>();
+  }
+  static arrow::FloatBuilder GetBuilder() {
+    return arrow::FloatBuilder();
+  }
+  static float Reinterpret(float o) {
+    return o;
+  }
   static std::string_view GetDeephavenTypeName() {
     return "float";
   }
@@ -200,8 +261,15 @@ struct TypeConverterTraits<float> {
 
 template<>
 struct TypeConverterTraits<double> {
-  using arrowType_t = arrow::DoubleType;
-  using arrowBuilder_t = arrow::DoubleBuilder;
+  static std::shared_ptr<arrow::DataType> GetDataType() {
+    return std::make_shared<arrow::DoubleType>();
+  }
+  static arrow::DoubleBuilder GetBuilder() {
+    return arrow::DoubleBuilder();
+  }
+  static double Reinterpret(double o) {
+    return o;
+  }
   static std::string_view GetDeephavenTypeName() {
     return "double";
   }
@@ -209,18 +277,80 @@ struct TypeConverterTraits<double> {
 
 template<>
 struct TypeConverterTraits<std::string> {
-  using arrowType_t = arrow::StringType;
-  using arrowBuilder_t = arrow::StringBuilder;
+  static std::shared_ptr<arrow::DataType> GetDataType() {
+    return std::make_shared<arrow::StringType>();
+  }
+  static arrow::StringBuilder GetBuilder() {
+    return arrow::StringBuilder();
+  }
+  static const std::string &Reinterpret(const std::string &o) {
+    return o;
+  }
   static std::string_view GetDeephavenTypeName() {
     return "java.lang.String";
   }
 };
 
+template<>
+struct TypeConverterTraits<deephaven::dhcore::DateTime> {
+  static std::shared_ptr<arrow::DataType> GetDataType() {
+    return arrow::timestamp(arrow::TimeUnit::NANO, "UTC");
+  }
+  static arrow::TimestampBuilder GetBuilder() {
+    return arrow::TimestampBuilder(GetDataType(), arrow::default_memory_pool());
+  }
+  static int64_t Reinterpret(const deephaven::dhcore::DateTime &dt) {
+    return dt.Nanos();
+  }
+  static std::string_view GetDeephavenTypeName() {
+    return "java.time.ZonedDateTime";
+  }
+};
+
+template<>
+struct TypeConverterTraits<deephaven::dhcore::LocalDate> {
+  static std::shared_ptr<arrow::DataType> GetDataType() {
+    return arrow::date64();
+  }
+  static arrow::Date64Builder GetBuilder() {
+    return arrow::Date64Builder();
+  }
+  static int64_t Reinterpret(const deephaven::dhcore::LocalDate &o) {
+    return o.Millis();
+  }
+  static std::string_view GetDeephavenTypeName() {
+    return "java.time.LocalDate";
+  }
+};
+
+template<>
+struct TypeConverterTraits<deephaven::dhcore::LocalTime> {
+  static std::shared_ptr<arrow::DataType> GetDataType() {
+    return arrow::time64(arrow::TimeUnit::NANO);
+  }
+  static arrow::Time64Builder GetBuilder() {
+    return arrow::Time64Builder(GetDataType(), arrow::default_memory_pool());
+  }
+  static int64_t Reinterpret(const deephaven::dhcore::LocalTime &o) {
+    return o.Nanos();
+  }
+  static std::string_view GetDeephavenTypeName() {
+    return "java.time.LocalTime";
+  }
+};
+
 template<typename T>
 struct TypeConverterTraits<std::optional<T>> {
   using inner_t = TypeConverterTraits<T>;
-  using arrowType_t = typename inner_t::arrowType_t;
-  using arrowBuilder_t = typename inner_t::arrowBuilder_t;
+  static auto GetDataType() {
+    return inner_t::GetDataType();
+  }
+  static auto GetBuilder() {
+    return inner_t::GetBuilder();
+  }
+  static auto Reinterpret(const T &o) {
+    return inner_t::Reinterpret(o);
+  }
   static std::string_view GetDeephavenTypeName() {
     return TypeConverterTraits<T>::GetDeephavenTypeName();
   }
@@ -232,14 +362,14 @@ TypeConverter TypeConverter::CreateNew(const std::vector<T> &values) {
 
   typedef TypeConverterTraits<T> traits_t;
 
-  auto data_type = std::make_shared<typename traits_t::arrowType_t>();
+  auto data_type = traits_t::GetDataType();
+  auto builder = traits_t::GetBuilder();
 
-  typename traits_t::arrowBuilder_t builder;
   for (const auto &value : values) {
     bool valid;
     const auto *contained_value = TryGetContainedValue(&value, &valid);
     if (valid) {
-      OkOrThrow(DEEPHAVEN_LOCATION_EXPR(builder.Append(*contained_value)));
+      OkOrThrow(DEEPHAVEN_LOCATION_EXPR(builder.Append(traits_t::Reinterpret(*contained_value))));
     } else {
       OkOrThrow(DEEPHAVEN_LOCATION_EXPR(builder.AppendNull()));
     }
@@ -254,20 +384,20 @@ TypeConverter TypeConverter::CreateNew(const std::vector<T> &values) {
       std::move(array));
 }
 
-template<>
-inline TypeConverter TypeConverter::CreateNew(const std::vector<deephaven::dhcore::DateTime> &values) {
+template<typename T, typename GetValue, typename IsNull>
+TypeConverter TypeConverter::CreateNew(const GetValue &get_value, const IsNull &is_null,
+    size_t size) {
   using deephaven::client::utility::OkOrThrow;
 
-  // TODO(kosak): put somewhere
-  constexpr const char *kDeephavenTypeName = "java.time.ZonedDateTime";
+  typedef TypeConverterTraits<T> traits_t;
 
-  auto data_type = arrow::timestamp(arrow::TimeUnit::NANO, "UTC");
-  arrow::TimestampBuilder builder(data_type, arrow::default_memory_pool());
-  for (const auto &value : values) {
-    bool valid;
-    const auto *contained_value = TryGetContainedValue(&value, &valid);
-    if (valid) {
-      OkOrThrow(DEEPHAVEN_LOCATION_EXPR(builder.Append(contained_value->Nanos())));
+  auto data_type = traits_t::GetDataType();
+  auto builder = traits_t::GetBuilder();
+
+  for (size_t i = 0; i != size; ++i) {
+    if (!is_null(i)) {
+       OkOrThrow(DEEPHAVEN_LOCATION_EXPR(
+           builder.Append(traits_t::Reinterpret(get_value(i)))));
     } else {
       OkOrThrow(DEEPHAVEN_LOCATION_EXPR(builder.AppendNull()));
     }
@@ -275,16 +405,35 @@ inline TypeConverter TypeConverter::CreateNew(const std::vector<deephaven::dhcor
   auto builder_res = builder.Finish();
   if (!builder_res.ok()) {
     auto message = fmt::format("Error building array of type {}: {}",
-        kDeephavenTypeName, builder_res.status().ToString());
+        traits_t::GetDeephavenTypeName(), builder_res.status().ToString());
   }
   auto array = builder_res.ValueUnsafe();
-  return TypeConverter(std::move(data_type), kDeephavenTypeName, std::move(array));
+  return TypeConverter(std::move(data_type), std::string(traits_t::GetDeephavenTypeName()),
+      std::move(array));
 }
 }  // namespace internal
 
 template<typename T>
 void TableMaker::AddColumn(std::string name, const std::vector<T> &values) {
-  auto info = internal::TypeConverter::CreateNew(values);
+  // Specifying the return type here in this way (rather than const T &)
+  // allows us to deal with std::vector<bool>, which is very special, and would
+  // otherwise cause a compiler error, because of the way it is specialized.
+  auto get_value = [&](size_t index) -> typename std::vector<T>::const_reference { return values[index]; };
+  auto is_null = [](size_t /*index*/) { return false; };
+  return AddColumn<T>(std::move(name), get_value, is_null, values.size());
+}
+
+template<typename T>
+void TableMaker::AddColumn(std::string name, const std::vector<std::optional<T>> &values) {
+  auto get_value = [&](size_t index) -> const T& { return *values[index]; };
+  auto is_null = [&](size_t index) { return !values[index].has_value(); };
+  return AddColumn<T>(std::move(name), get_value, is_null, values.size());
+}
+
+template<typename T, typename GetValue, typename IsNull>
+void TableMaker::AddColumn(std::string name, const GetValue &get_value, const IsNull &is_null,
+    size_t size) {
+  auto info = internal::TypeConverter::CreateNew<T>(get_value, is_null, size);
   FinishAddColumn(std::move(name), std::move(info));
 }
 }  // namespace deephaven::client::utility
diff --git a/cpp-client/deephaven/dhclient/proto/deephaven/proto/application.grpc.pb.cc b/cpp-client/deephaven/dhclient/proto/deephaven/proto/application.grpc.pb.cc
deleted file mode 100644
index 1e2cd205f10..00000000000
--- a/cpp-client/deephaven/dhclient/proto/deephaven/proto/application.grpc.pb.cc
+++ /dev/null
@@ -1,87 +0,0 @@
-// Generated by the gRPC C++ plugin.
-// If you make any local change, they will be lost.
-// source: deephaven/proto/application.proto
-
-#include "deephaven/proto/application.pb.h"
-#include "deephaven/proto/application.grpc.pb.h"
-
-#include <functional>
-#include <grpcpp/support/async_stream.h>
-#include <grpcpp/support/async_unary_call.h>
-#include <grpcpp/impl/channel_interface.h>
-#include <grpcpp/impl/client_unary_call.h>
-#include <grpcpp/support/client_callback.h>
-#include <grpcpp/support/message_allocator.h>
-#include <grpcpp/support/method_handler.h>
-#include <grpcpp/impl/rpc_service_method.h>
-#include <grpcpp/support/server_callback.h>
-#include <grpcpp/impl/server_callback_handlers.h>
-#include <grpcpp/server_context.h>
-#include <grpcpp/impl/service_type.h>
-#include <grpcpp/support/sync_stream.h>
-namespace io {
-namespace deephaven {
-namespace proto {
-namespace backplane {
-namespace grpc {
-
-static const char* ApplicationService_method_names[] = {
-  "/io.deephaven.proto.backplane.grpc.ApplicationService/ListFields",
-};
-
-std::unique_ptr< ApplicationService::Stub> ApplicationService::NewStub(const std::shared_ptr< ::grpc::ChannelInterface>& channel, const ::grpc::StubOptions& options) {
-  (void)options;
-  std::unique_ptr< ApplicationService::Stub> stub(new ApplicationService::Stub(channel, options));
-  return stub;
-}
-
-ApplicationService::Stub::Stub(const std::shared_ptr< ::grpc::ChannelInterface>& channel, const ::grpc::StubOptions& options)
-  : channel_(channel), rpcmethod_ListFields_(ApplicationService_method_names[0], options.suffix_for_stats(),::grpc::internal::RpcMethod::SERVER_STREAMING, channel)
-  {}
-
-::grpc::ClientReader< ::io::deephaven::proto::backplane::grpc::FieldsChangeUpdate>* ApplicationService::Stub::ListFieldsRaw(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::ListFieldsRequest& request) {
-  return ::grpc::internal::ClientReaderFactory< ::io::deephaven::proto::backplane::grpc::FieldsChangeUpdate>::Create(channel_.get(), rpcmethod_ListFields_, context, request);
-}
-
-void ApplicationService::Stub::async::ListFields(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::ListFieldsRequest* request, ::grpc::ClientReadReactor< ::io::deephaven::proto::backplane::grpc::FieldsChangeUpdate>* reactor) {
-  ::grpc::internal::ClientCallbackReaderFactory< ::io::deephaven::proto::backplane::grpc::FieldsChangeUpdate>::Create(stub_->channel_.get(), stub_->rpcmethod_ListFields_, context, request, reactor);
-}
-
-::grpc::ClientAsyncReader< ::io::deephaven::proto::backplane::grpc::FieldsChangeUpdate>* ApplicationService::Stub::AsyncListFieldsRaw(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::ListFieldsRequest& request, ::grpc::CompletionQueue* cq, void* tag) {
-  return ::grpc::internal::ClientAsyncReaderFactory< ::io::deephaven::proto::backplane::grpc::FieldsChangeUpdate>::Create(channel_.get(), cq, rpcmethod_ListFields_, context, request, true, tag);
-}
-
-::grpc::ClientAsyncReader< ::io::deephaven::proto::backplane::grpc::FieldsChangeUpdate>* ApplicationService::Stub::PrepareAsyncListFieldsRaw(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::ListFieldsRequest& request, ::grpc::CompletionQueue* cq) {
-  return ::grpc::internal::ClientAsyncReaderFactory< ::io::deephaven::proto::backplane::grpc::FieldsChangeUpdate>::Create(channel_.get(), cq, rpcmethod_ListFields_, context, request, false, nullptr);
-}
-
-ApplicationService::Service::Service() {
-  AddMethod(new ::grpc::internal::RpcServiceMethod(
-      ApplicationService_method_names[0],
-      ::grpc::internal::RpcMethod::SERVER_STREAMING,
-      new ::grpc::internal::ServerStreamingHandler< ApplicationService::Service, ::io::deephaven::proto::backplane::grpc::ListFieldsRequest, ::io::deephaven::proto::backplane::grpc::FieldsChangeUpdate>(
-          [](ApplicationService::Service* service,
-             ::grpc::ServerContext* ctx,
-             const ::io::deephaven::proto::backplane::grpc::ListFieldsRequest* req,
-             ::grpc::ServerWriter<::io::deephaven::proto::backplane::grpc::FieldsChangeUpdate>* writer) {
-               return service->ListFields(ctx, req, writer);
-             }, this)));
-}
-
-ApplicationService::Service::~Service() {
-}
-
-::grpc::Status ApplicationService::Service::ListFields(::grpc::ServerContext* context, const ::io::deephaven::proto::backplane::grpc::ListFieldsRequest* request, ::grpc::ServerWriter< ::io::deephaven::proto::backplane::grpc::FieldsChangeUpdate>* writer) {
-  (void) context;
-  (void) request;
-  (void) writer;
-  return ::grpc::Status(::grpc::StatusCode::UNIMPLEMENTED, "");
-}
-
-
-}  // namespace io
-}  // namespace deephaven
-}  // namespace proto
-}  // namespace backplane
-}  // namespace grpc
-
diff --git a/cpp-client/deephaven/dhclient/proto/deephaven/proto/application.grpc.pb.h b/cpp-client/deephaven/dhclient/proto/deephaven/proto/application.grpc.pb.h
deleted file mode 100644
index 757643af23a..00000000000
--- a/cpp-client/deephaven/dhclient/proto/deephaven/proto/application.grpc.pb.h
+++ /dev/null
@@ -1,273 +0,0 @@
-// Generated by the gRPC C++ plugin.
-// If you make any local change, they will be lost.
-// source: deephaven/proto/application.proto
-// Original file comments:
-//
-// Copyright (c) 2016-2022 Deephaven Data Labs and Patent Pending
-#ifndef GRPC_deephaven_2fproto_2fapplication_2eproto__INCLUDED
-#define GRPC_deephaven_2fproto_2fapplication_2eproto__INCLUDED
-
-#include "deephaven/proto/application.pb.h"
-
-#include <functional>
-#include <grpcpp/generic/async_generic_service.h>
-#include <grpcpp/support/async_stream.h>
-#include <grpcpp/support/async_unary_call.h>
-#include <grpcpp/support/client_callback.h>
-#include <grpcpp/client_context.h>
-#include <grpcpp/completion_queue.h>
-#include <grpcpp/support/message_allocator.h>
-#include <grpcpp/support/method_handler.h>
-#include <grpcpp/impl/proto_utils.h>
-#include <grpcpp/impl/rpc_method.h>
-#include <grpcpp/support/server_callback.h>
-#include <grpcpp/impl/server_callback_handlers.h>
-#include <grpcpp/server_context.h>
-#include <grpcpp/impl/service_type.h>
-#include <grpcpp/support/status.h>
-#include <grpcpp/support/stub_options.h>
-#include <grpcpp/support/sync_stream.h>
-
-namespace io {
-namespace deephaven {
-namespace proto {
-namespace backplane {
-namespace grpc {
-
-//
-// Allows clients to list fields that are accessible to them.
-class ApplicationService final {
- public:
-  static constexpr char const* service_full_name() {
-    return "io.deephaven.proto.backplane.grpc.ApplicationService";
-  }
-  class StubInterface {
-   public:
-    virtual ~StubInterface() {}
-    //
-    // Request the list of the fields exposed via the worker.
-    //
-    // - The first received message contains all fields that are currently available
-    //   on the worker. None of these fields will be RemovedFields.
-    // - Subsequent messages modify the existing state. Fields are identified by
-    //   their ticket and may be replaced or removed.
-    std::unique_ptr< ::grpc::ClientReaderInterface< ::io::deephaven::proto::backplane::grpc::FieldsChangeUpdate>> ListFields(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::ListFieldsRequest& request) {
-      return std::unique_ptr< ::grpc::ClientReaderInterface< ::io::deephaven::proto::backplane::grpc::FieldsChangeUpdate>>(ListFieldsRaw(context, request));
-    }
-    std::unique_ptr< ::grpc::ClientAsyncReaderInterface< ::io::deephaven::proto::backplane::grpc::FieldsChangeUpdate>> AsyncListFields(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::ListFieldsRequest& request, ::grpc::CompletionQueue* cq, void* tag) {
-      return std::unique_ptr< ::grpc::ClientAsyncReaderInterface< ::io::deephaven::proto::backplane::grpc::FieldsChangeUpdate>>(AsyncListFieldsRaw(context, request, cq, tag));
-    }
-    std::unique_ptr< ::grpc::ClientAsyncReaderInterface< ::io::deephaven::proto::backplane::grpc::FieldsChangeUpdate>> PrepareAsyncListFields(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::ListFieldsRequest& request, ::grpc::CompletionQueue* cq) {
-      return std::unique_ptr< ::grpc::ClientAsyncReaderInterface< ::io::deephaven::proto::backplane::grpc::FieldsChangeUpdate>>(PrepareAsyncListFieldsRaw(context, request, cq));
-    }
-    class async_interface {
-     public:
-      virtual ~async_interface() {}
-      //
-      // Request the list of the fields exposed via the worker.
-      //
-      // - The first received message contains all fields that are currently available
-      //   on the worker. None of these fields will be RemovedFields.
-      // - Subsequent messages modify the existing state. Fields are identified by
-      //   their ticket and may be replaced or removed.
-      virtual void ListFields(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::ListFieldsRequest* request, ::grpc::ClientReadReactor< ::io::deephaven::proto::backplane::grpc::FieldsChangeUpdate>* reactor) = 0;
-    };
-    typedef class async_interface experimental_async_interface;
-    virtual class async_interface* async() { return nullptr; }
-    class async_interface* experimental_async() { return async(); }
-   private:
-    virtual ::grpc::ClientReaderInterface< ::io::deephaven::proto::backplane::grpc::FieldsChangeUpdate>* ListFieldsRaw(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::ListFieldsRequest& request) = 0;
-    virtual ::grpc::ClientAsyncReaderInterface< ::io::deephaven::proto::backplane::grpc::FieldsChangeUpdate>* AsyncListFieldsRaw(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::ListFieldsRequest& request, ::grpc::CompletionQueue* cq, void* tag) = 0;
-    virtual ::grpc::ClientAsyncReaderInterface< ::io::deephaven::proto::backplane::grpc::FieldsChangeUpdate>* PrepareAsyncListFieldsRaw(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::ListFieldsRequest& request, ::grpc::CompletionQueue* cq) = 0;
-  };
-  class Stub final : public StubInterface {
-   public:
-    Stub(const std::shared_ptr< ::grpc::ChannelInterface>& channel, const ::grpc::StubOptions& options = ::grpc::StubOptions());
-    std::unique_ptr< ::grpc::ClientReader< ::io::deephaven::proto::backplane::grpc::FieldsChangeUpdate>> ListFields(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::ListFieldsRequest& request) {
-      return std::unique_ptr< ::grpc::ClientReader< ::io::deephaven::proto::backplane::grpc::FieldsChangeUpdate>>(ListFieldsRaw(context, request));
-    }
-    std::unique_ptr< ::grpc::ClientAsyncReader< ::io::deephaven::proto::backplane::grpc::FieldsChangeUpdate>> AsyncListFields(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::ListFieldsRequest& request, ::grpc::CompletionQueue* cq, void* tag) {
-      return std::unique_ptr< ::grpc::ClientAsyncReader< ::io::deephaven::proto::backplane::grpc::FieldsChangeUpdate>>(AsyncListFieldsRaw(context, request, cq, tag));
-    }
-    std::unique_ptr< ::grpc::ClientAsyncReader< ::io::deephaven::proto::backplane::grpc::FieldsChangeUpdate>> PrepareAsyncListFields(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::ListFieldsRequest& request, ::grpc::CompletionQueue* cq) {
-      return std::unique_ptr< ::grpc::ClientAsyncReader< ::io::deephaven::proto::backplane::grpc::FieldsChangeUpdate>>(PrepareAsyncListFieldsRaw(context, request, cq));
-    }
-    class async final :
-      public StubInterface::async_interface {
-     public:
-      void ListFields(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::ListFieldsRequest* request, ::grpc::ClientReadReactor< ::io::deephaven::proto::backplane::grpc::FieldsChangeUpdate>* reactor) override;
-     private:
-      friend class Stub;
-      explicit async(Stub* stub): stub_(stub) { }
-      Stub* stub() { return stub_; }
-      Stub* stub_;
-    };
-    class async* async() override { return &async_stub_; }
-
-   private:
-    std::shared_ptr< ::grpc::ChannelInterface> channel_;
-    class async async_stub_{this};
-    ::grpc::ClientReader< ::io::deephaven::proto::backplane::grpc::FieldsChangeUpdate>* ListFieldsRaw(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::ListFieldsRequest& request) override;
-    ::grpc::ClientAsyncReader< ::io::deephaven::proto::backplane::grpc::FieldsChangeUpdate>* AsyncListFieldsRaw(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::ListFieldsRequest& request, ::grpc::CompletionQueue* cq, void* tag) override;
-    ::grpc::ClientAsyncReader< ::io::deephaven::proto::backplane::grpc::FieldsChangeUpdate>* PrepareAsyncListFieldsRaw(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::ListFieldsRequest& request, ::grpc::CompletionQueue* cq) override;
-    const ::grpc::internal::RpcMethod rpcmethod_ListFields_;
-  };
-  static std::unique_ptr<Stub> NewStub(const std::shared_ptr< ::grpc::ChannelInterface>& channel, const ::grpc::StubOptions& options = ::grpc::StubOptions());
-
-  class Service : public ::grpc::Service {
-   public:
-    Service();
-    virtual ~Service();
-    //
-    // Request the list of the fields exposed via the worker.
-    //
-    // - The first received message contains all fields that are currently available
-    //   on the worker. None of these fields will be RemovedFields.
-    // - Subsequent messages modify the existing state. Fields are identified by
-    //   their ticket and may be replaced or removed.
-    virtual ::grpc::Status ListFields(::grpc::ServerContext* context, const ::io::deephaven::proto::backplane::grpc::ListFieldsRequest* request, ::grpc::ServerWriter< ::io::deephaven::proto::backplane::grpc::FieldsChangeUpdate>* writer);
-  };
-  template <class BaseClass>
-  class WithAsyncMethod_ListFields : public BaseClass {
-   private:
-    void BaseClassMustBeDerivedFromService(const Service* /*service*/) {}
-   public:
-    WithAsyncMethod_ListFields() {
-      ::grpc::Service::MarkMethodAsync(0);
-    }
-    ~WithAsyncMethod_ListFields() override {
-      BaseClassMustBeDerivedFromService(this);
-    }
-    // disable synchronous version of this method
-    ::grpc::Status ListFields(::grpc::ServerContext* /*context*/, const ::io::deephaven::proto::backplane::grpc::ListFieldsRequest* /*request*/, ::grpc::ServerWriter< ::io::deephaven::proto::backplane::grpc::FieldsChangeUpdate>* /*writer*/) override {
-      abort();
-      return ::grpc::Status(::grpc::StatusCode::UNIMPLEMENTED, "");
-    }
-    void RequestListFields(::grpc::ServerContext* context, ::io::deephaven::proto::backplane::grpc::ListFieldsRequest* request, ::grpc::ServerAsyncWriter< ::io::deephaven::proto::backplane::grpc::FieldsChangeUpdate>* writer, ::grpc::CompletionQueue* new_call_cq, ::grpc::ServerCompletionQueue* notification_cq, void *tag) {
-      ::grpc::Service::RequestAsyncServerStreaming(0, context, request, writer, new_call_cq, notification_cq, tag);
-    }
-  };
-  typedef WithAsyncMethod_ListFields<Service > AsyncService;
-  template <class BaseClass>
-  class WithCallbackMethod_ListFields : public BaseClass {
-   private:
-    void BaseClassMustBeDerivedFromService(const Service* /*service*/) {}
-   public:
-    WithCallbackMethod_ListFields() {
-      ::grpc::Service::MarkMethodCallback(0,
-          new ::grpc::internal::CallbackServerStreamingHandler< ::io::deephaven::proto::backplane::grpc::ListFieldsRequest, ::io::deephaven::proto::backplane::grpc::FieldsChangeUpdate>(
-            [this](
-                   ::grpc::CallbackServerContext* context, const ::io::deephaven::proto::backplane::grpc::ListFieldsRequest* request) { return this->ListFields(context, request); }));
-    }
-    ~WithCallbackMethod_ListFields() override {
-      BaseClassMustBeDerivedFromService(this);
-    }
-    // disable synchronous version of this method
-    ::grpc::Status ListFields(::grpc::ServerContext* /*context*/, const ::io::deephaven::proto::backplane::grpc::ListFieldsRequest* /*request*/, ::grpc::ServerWriter< ::io::deephaven::proto::backplane::grpc::FieldsChangeUpdate>* /*writer*/) override {
-      abort();
-      return ::grpc::Status(::grpc::StatusCode::UNIMPLEMENTED, "");
-    }
-    virtual ::grpc::ServerWriteReactor< ::io::deephaven::proto::backplane::grpc::FieldsChangeUpdate>* ListFields(
-      ::grpc::CallbackServerContext* /*context*/, const ::io::deephaven::proto::backplane::grpc::ListFieldsRequest* /*request*/)  { return nullptr; }
-  };
-  typedef WithCallbackMethod_ListFields<Service > CallbackService;
-  typedef CallbackService ExperimentalCallbackService;
-  template <class BaseClass>
-  class WithGenericMethod_ListFields : public BaseClass {
-   private:
-    void BaseClassMustBeDerivedFromService(const Service* /*service*/) {}
-   public:
-    WithGenericMethod_ListFields() {
-      ::grpc::Service::MarkMethodGeneric(0);
-    }
-    ~WithGenericMethod_ListFields() override {
-      BaseClassMustBeDerivedFromService(this);
-    }
-    // disable synchronous version of this method
-    ::grpc::Status ListFields(::grpc::ServerContext* /*context*/, const ::io::deephaven::proto::backplane::grpc::ListFieldsRequest* /*request*/, ::grpc::ServerWriter< ::io::deephaven::proto::backplane::grpc::FieldsChangeUpdate>* /*writer*/) override {
-      abort();
-      return ::grpc::Status(::grpc::StatusCode::UNIMPLEMENTED, "");
-    }
-  };
-  template <class BaseClass>
-  class WithRawMethod_ListFields : public BaseClass {
-   private:
-    void BaseClassMustBeDerivedFromService(const Service* /*service*/) {}
-   public:
-    WithRawMethod_ListFields() {
-      ::grpc::Service::MarkMethodRaw(0);
-    }
-    ~WithRawMethod_ListFields() override {
-      BaseClassMustBeDerivedFromService(this);
-    }
-    // disable synchronous version of this method
-    ::grpc::Status ListFields(::grpc::ServerContext* /*context*/, const ::io::deephaven::proto::backplane::grpc::ListFieldsRequest* /*request*/, ::grpc::ServerWriter< ::io::deephaven::proto::backplane::grpc::FieldsChangeUpdate>* /*writer*/) override {
-      abort();
-      return ::grpc::Status(::grpc::StatusCode::UNIMPLEMENTED, "");
-    }
-    void RequestListFields(::grpc::ServerContext* context, ::grpc::ByteBuffer* request, ::grpc::ServerAsyncWriter< ::grpc::ByteBuffer>* writer, ::grpc::CompletionQueue* new_call_cq, ::grpc::ServerCompletionQueue* notification_cq, void *tag) {
-      ::grpc::Service::RequestAsyncServerStreaming(0, context, request, writer, new_call_cq, notification_cq, tag);
-    }
-  };
-  template <class BaseClass>
-  class WithRawCallbackMethod_ListFields : public BaseClass {
-   private:
-    void BaseClassMustBeDerivedFromService(const Service* /*service*/) {}
-   public:
-    WithRawCallbackMethod_ListFields() {
-      ::grpc::Service::MarkMethodRawCallback(0,
-          new ::grpc::internal::CallbackServerStreamingHandler< ::grpc::ByteBuffer, ::grpc::ByteBuffer>(
-            [this](
-                   ::grpc::CallbackServerContext* context, const::grpc::ByteBuffer* request) { return this->ListFields(context, request); }));
-    }
-    ~WithRawCallbackMethod_ListFields() override {
-      BaseClassMustBeDerivedFromService(this);
-    }
-    // disable synchronous version of this method
-    ::grpc::Status ListFields(::grpc::ServerContext* /*context*/, const ::io::deephaven::proto::backplane::grpc::ListFieldsRequest* /*request*/, ::grpc::ServerWriter< ::io::deephaven::proto::backplane::grpc::FieldsChangeUpdate>* /*writer*/) override {
-      abort();
-      return ::grpc::Status(::grpc::StatusCode::UNIMPLEMENTED, "");
-    }
-    virtual ::grpc::ServerWriteReactor< ::grpc::ByteBuffer>* ListFields(
-      ::grpc::CallbackServerContext* /*context*/, const ::grpc::ByteBuffer* /*request*/)  { return nullptr; }
-  };
-  typedef Service StreamedUnaryService;
-  template <class BaseClass>
-  class WithSplitStreamingMethod_ListFields : public BaseClass {
-   private:
-    void BaseClassMustBeDerivedFromService(const Service* /*service*/) {}
-   public:
-    WithSplitStreamingMethod_ListFields() {
-      ::grpc::Service::MarkMethodStreamed(0,
-        new ::grpc::internal::SplitServerStreamingHandler<
-          ::io::deephaven::proto::backplane::grpc::ListFieldsRequest, ::io::deephaven::proto::backplane::grpc::FieldsChangeUpdate>(
-            [this](::grpc::ServerContext* context,
-                   ::grpc::ServerSplitStreamer<
-                     ::io::deephaven::proto::backplane::grpc::ListFieldsRequest, ::io::deephaven::proto::backplane::grpc::FieldsChangeUpdate>* streamer) {
-                       return this->StreamedListFields(context,
-                         streamer);
-                  }));
-    }
-    ~WithSplitStreamingMethod_ListFields() override {
-      BaseClassMustBeDerivedFromService(this);
-    }
-    // disable regular version of this method
-    ::grpc::Status ListFields(::grpc::ServerContext* /*context*/, const ::io::deephaven::proto::backplane::grpc::ListFieldsRequest* /*request*/, ::grpc::ServerWriter< ::io::deephaven::proto::backplane::grpc::FieldsChangeUpdate>* /*writer*/) override {
-      abort();
-      return ::grpc::Status(::grpc::StatusCode::UNIMPLEMENTED, "");
-    }
-    // replace default version of method with split streamed
-    virtual ::grpc::Status StreamedListFields(::grpc::ServerContext* context, ::grpc::ServerSplitStreamer< ::io::deephaven::proto::backplane::grpc::ListFieldsRequest,::io::deephaven::proto::backplane::grpc::FieldsChangeUpdate>* server_split_streamer) = 0;
-  };
-  typedef WithSplitStreamingMethod_ListFields<Service > SplitStreamedService;
-  typedef WithSplitStreamingMethod_ListFields<Service > StreamedService;
-};
-
-}  // namespace grpc
-}  // namespace backplane
-}  // namespace proto
-}  // namespace deephaven
-}  // namespace io
-
-
-#endif  // GRPC_deephaven_2fproto_2fapplication_2eproto__INCLUDED
diff --git a/cpp-client/deephaven/dhclient/proto/deephaven/proto/application.pb.cc b/cpp-client/deephaven/dhclient/proto/deephaven/proto/application.pb.cc
deleted file mode 100644
index 543567783ab..00000000000
--- a/cpp-client/deephaven/dhclient/proto/deephaven/proto/application.pb.cc
+++ /dev/null
@@ -1,840 +0,0 @@
-// Generated by the protocol buffer compiler.  DO NOT EDIT!
-// source: deephaven/proto/application.proto
-
-#include "deephaven/proto/application.pb.h"
-
-#include <algorithm>
-#include "google/protobuf/io/coded_stream.h"
-#include "google/protobuf/extension_set.h"
-#include "google/protobuf/wire_format_lite.h"
-#include "google/protobuf/descriptor.h"
-#include "google/protobuf/generated_message_reflection.h"
-#include "google/protobuf/reflection_ops.h"
-#include "google/protobuf/wire_format.h"
-#include "google/protobuf/generated_message_tctable_impl.h"
-// @@protoc_insertion_point(includes)
-
-// Must be included last.
-#include "google/protobuf/port_def.inc"
-PROTOBUF_PRAGMA_INIT_SEG
-namespace _pb = ::google::protobuf;
-namespace _pbi = ::google::protobuf::internal;
-namespace _fl = ::google::protobuf::internal::field_layout;
-namespace io {
-namespace deephaven {
-namespace proto {
-namespace backplane {
-namespace grpc {
-      template <typename>
-PROTOBUF_CONSTEXPR ListFieldsRequest::ListFieldsRequest(::_pbi::ConstantInitialized) {}
-struct ListFieldsRequestDefaultTypeInternal {
-  PROTOBUF_CONSTEXPR ListFieldsRequestDefaultTypeInternal() : _instance(::_pbi::ConstantInitialized{}) {}
-  ~ListFieldsRequestDefaultTypeInternal() {}
-  union {
-    ListFieldsRequest _instance;
-  };
-};
-
-PROTOBUF_ATTRIBUTE_NO_DESTROY PROTOBUF_CONSTINIT
-    PROTOBUF_ATTRIBUTE_INIT_PRIORITY1 ListFieldsRequestDefaultTypeInternal _ListFieldsRequest_default_instance_;
-
-inline constexpr FieldInfo::Impl_::Impl_(
-    ::_pbi::ConstantInitialized) noexcept
-      : _cached_size_{0},
-        field_name_(
-            &::google::protobuf::internal::fixed_address_empty_string,
-            ::_pbi::ConstantInitialized()),
-        field_description_(
-            &::google::protobuf::internal::fixed_address_empty_string,
-            ::_pbi::ConstantInitialized()),
-        application_name_(
-            &::google::protobuf::internal::fixed_address_empty_string,
-            ::_pbi::ConstantInitialized()),
-        application_id_(
-            &::google::protobuf::internal::fixed_address_empty_string,
-            ::_pbi::ConstantInitialized()),
-        typed_ticket_{nullptr} {}
-
-template <typename>
-PROTOBUF_CONSTEXPR FieldInfo::FieldInfo(::_pbi::ConstantInitialized)
-    : _impl_(::_pbi::ConstantInitialized()) {}
-struct FieldInfoDefaultTypeInternal {
-  PROTOBUF_CONSTEXPR FieldInfoDefaultTypeInternal() : _instance(::_pbi::ConstantInitialized{}) {}
-  ~FieldInfoDefaultTypeInternal() {}
-  union {
-    FieldInfo _instance;
-  };
-};
-
-PROTOBUF_ATTRIBUTE_NO_DESTROY PROTOBUF_CONSTINIT
-    PROTOBUF_ATTRIBUTE_INIT_PRIORITY1 FieldInfoDefaultTypeInternal _FieldInfo_default_instance_;
-
-inline constexpr FieldsChangeUpdate::Impl_::Impl_(
-    ::_pbi::ConstantInitialized) noexcept
-      : created_{},
-        updated_{},
-        removed_{},
-        _cached_size_{0} {}
-
-template <typename>
-PROTOBUF_CONSTEXPR FieldsChangeUpdate::FieldsChangeUpdate(::_pbi::ConstantInitialized)
-    : _impl_(::_pbi::ConstantInitialized()) {}
-struct FieldsChangeUpdateDefaultTypeInternal {
-  PROTOBUF_CONSTEXPR FieldsChangeUpdateDefaultTypeInternal() : _instance(::_pbi::ConstantInitialized{}) {}
-  ~FieldsChangeUpdateDefaultTypeInternal() {}
-  union {
-    FieldsChangeUpdate _instance;
-  };
-};
-
-PROTOBUF_ATTRIBUTE_NO_DESTROY PROTOBUF_CONSTINIT
-    PROTOBUF_ATTRIBUTE_INIT_PRIORITY1 FieldsChangeUpdateDefaultTypeInternal _FieldsChangeUpdate_default_instance_;
-}  // namespace grpc
-}  // namespace backplane
-}  // namespace proto
-}  // namespace deephaven
-}  // namespace io
-static ::_pb::Metadata file_level_metadata_deephaven_2fproto_2fapplication_2eproto[3];
-static constexpr const ::_pb::EnumDescriptor**
-    file_level_enum_descriptors_deephaven_2fproto_2fapplication_2eproto = nullptr;
-static constexpr const ::_pb::ServiceDescriptor**
-    file_level_service_descriptors_deephaven_2fproto_2fapplication_2eproto = nullptr;
-const ::uint32_t TableStruct_deephaven_2fproto_2fapplication_2eproto::offsets[] PROTOBUF_SECTION_VARIABLE(
-    protodesc_cold) = {
-    ~0u,  // no _has_bits_
-    PROTOBUF_FIELD_OFFSET(::io::deephaven::proto::backplane::grpc::ListFieldsRequest, _internal_metadata_),
-    ~0u,  // no _extensions_
-    ~0u,  // no _oneof_case_
-    ~0u,  // no _weak_field_map_
-    ~0u,  // no _inlined_string_donated_
-    ~0u,  // no _split_
-    ~0u,  // no sizeof(Split)
-    ~0u,  // no _has_bits_
-    PROTOBUF_FIELD_OFFSET(::io::deephaven::proto::backplane::grpc::FieldsChangeUpdate, _internal_metadata_),
-    ~0u,  // no _extensions_
-    ~0u,  // no _oneof_case_
-    ~0u,  // no _weak_field_map_
-    ~0u,  // no _inlined_string_donated_
-    ~0u,  // no _split_
-    ~0u,  // no sizeof(Split)
-    PROTOBUF_FIELD_OFFSET(::io::deephaven::proto::backplane::grpc::FieldsChangeUpdate, _impl_.created_),
-    PROTOBUF_FIELD_OFFSET(::io::deephaven::proto::backplane::grpc::FieldsChangeUpdate, _impl_.updated_),
-    PROTOBUF_FIELD_OFFSET(::io::deephaven::proto::backplane::grpc::FieldsChangeUpdate, _impl_.removed_),
-    PROTOBUF_FIELD_OFFSET(::io::deephaven::proto::backplane::grpc::FieldInfo, _impl_._has_bits_),
-    PROTOBUF_FIELD_OFFSET(::io::deephaven::proto::backplane::grpc::FieldInfo, _internal_metadata_),
-    ~0u,  // no _extensions_
-    ~0u,  // no _oneof_case_
-    ~0u,  // no _weak_field_map_
-    ~0u,  // no _inlined_string_donated_
-    ~0u,  // no _split_
-    ~0u,  // no sizeof(Split)
-    PROTOBUF_FIELD_OFFSET(::io::deephaven::proto::backplane::grpc::FieldInfo, _impl_.typed_ticket_),
-    PROTOBUF_FIELD_OFFSET(::io::deephaven::proto::backplane::grpc::FieldInfo, _impl_.field_name_),
-    PROTOBUF_FIELD_OFFSET(::io::deephaven::proto::backplane::grpc::FieldInfo, _impl_.field_description_),
-    PROTOBUF_FIELD_OFFSET(::io::deephaven::proto::backplane::grpc::FieldInfo, _impl_.application_name_),
-    PROTOBUF_FIELD_OFFSET(::io::deephaven::proto::backplane::grpc::FieldInfo, _impl_.application_id_),
-    0,
-    ~0u,
-    ~0u,
-    ~0u,
-    ~0u,
-};
-
-static const ::_pbi::MigrationSchema
-    schemas[] PROTOBUF_SECTION_VARIABLE(protodesc_cold) = {
-        {0, -1, -1, sizeof(::io::deephaven::proto::backplane::grpc::ListFieldsRequest)},
-        {8, -1, -1, sizeof(::io::deephaven::proto::backplane::grpc::FieldsChangeUpdate)},
-        {19, 32, -1, sizeof(::io::deephaven::proto::backplane::grpc::FieldInfo)},
-};
-
-static const ::_pb::Message* const file_default_instances[] = {
-    &::io::deephaven::proto::backplane::grpc::_ListFieldsRequest_default_instance_._instance,
-    &::io::deephaven::proto::backplane::grpc::_FieldsChangeUpdate_default_instance_._instance,
-    &::io::deephaven::proto::backplane::grpc::_FieldInfo_default_instance_._instance,
-};
-const char descriptor_table_protodef_deephaven_2fproto_2fapplication_2eproto[] PROTOBUF_SECTION_VARIABLE(protodesc_cold) = {
-    "\n!deephaven/proto/application.proto\022!io."
-    "deephaven.proto.backplane.grpc\032\034deephave"
-    "n/proto/ticket.proto\"\023\n\021ListFieldsReques"
-    "t\"\321\001\n\022FieldsChangeUpdate\022=\n\007created\030\001 \003("
-    "\0132,.io.deephaven.proto.backplane.grpc.Fi"
-    "eldInfo\022=\n\007updated\030\002 \003(\0132,.io.deephaven."
-    "proto.backplane.grpc.FieldInfo\022=\n\007remove"
-    "d\030\003 \003(\0132,.io.deephaven.proto.backplane.g"
-    "rpc.FieldInfo\"\262\001\n\tFieldInfo\022D\n\014typed_tic"
-    "ket\030\001 \001(\0132..io.deephaven.proto.backplane"
-    ".grpc.TypedTicket\022\022\n\nfield_name\030\002 \001(\t\022\031\n"
-    "\021field_description\030\003 \001(\t\022\030\n\020application_"
-    "name\030\004 \001(\t\022\026\n\016application_id\030\005 \001(\t2\223\001\n\022A"
-    "pplicationService\022}\n\nListFields\0224.io.dee"
-    "phaven.proto.backplane.grpc.ListFieldsRe"
-    "quest\0325.io.deephaven.proto.backplane.grp"
-    "c.FieldsChangeUpdate\"\0000\001BGH\001P\001ZAgithub.c"
-    "om/deephaven/deephaven-core/go/internal/"
-    "proto/applicationb\006proto3"
-};
-static const ::_pbi::DescriptorTable* const descriptor_table_deephaven_2fproto_2fapplication_2eproto_deps[1] =
-    {
-        &::descriptor_table_deephaven_2fproto_2fticket_2eproto,
-};
-static ::absl::once_flag descriptor_table_deephaven_2fproto_2fapplication_2eproto_once;
-const ::_pbi::DescriptorTable descriptor_table_deephaven_2fproto_2fapplication_2eproto = {
-    false,
-    false,
-    745,
-    descriptor_table_protodef_deephaven_2fproto_2fapplication_2eproto,
-    "deephaven/proto/application.proto",
-    &descriptor_table_deephaven_2fproto_2fapplication_2eproto_once,
-    descriptor_table_deephaven_2fproto_2fapplication_2eproto_deps,
-    1,
-    3,
-    schemas,
-    file_default_instances,
-    TableStruct_deephaven_2fproto_2fapplication_2eproto::offsets,
-    file_level_metadata_deephaven_2fproto_2fapplication_2eproto,
-    file_level_enum_descriptors_deephaven_2fproto_2fapplication_2eproto,
-    file_level_service_descriptors_deephaven_2fproto_2fapplication_2eproto,
-};
-
-// This function exists to be marked as weak.
-// It can significantly speed up compilation by breaking up LLVM's SCC
-// in the .pb.cc translation units. Large translation units see a
-// reduction of more than 35% of walltime for optimized builds. Without
-// the weak attribute all the messages in the file, including all the
-// vtables and everything they use become part of the same SCC through
-// a cycle like:
-// GetMetadata -> descriptor table -> default instances ->
-//   vtables -> GetMetadata
-// By adding a weak function here we break the connection from the
-// individual vtables back into the descriptor table.
-PROTOBUF_ATTRIBUTE_WEAK const ::_pbi::DescriptorTable* descriptor_table_deephaven_2fproto_2fapplication_2eproto_getter() {
-  return &descriptor_table_deephaven_2fproto_2fapplication_2eproto;
-}
-// Force running AddDescriptors() at dynamic initialization time.
-PROTOBUF_ATTRIBUTE_INIT_PRIORITY2
-static ::_pbi::AddDescriptorsRunner dynamic_init_dummy_deephaven_2fproto_2fapplication_2eproto(&descriptor_table_deephaven_2fproto_2fapplication_2eproto);
-namespace io {
-namespace deephaven {
-namespace proto {
-namespace backplane {
-namespace grpc {
-// ===================================================================
-
-class ListFieldsRequest::_Internal {
- public:
-};
-
-ListFieldsRequest::ListFieldsRequest(::google::protobuf::Arena* arena)
-    : ::google::protobuf::internal::ZeroFieldsBase(arena) {
-  // @@protoc_insertion_point(arena_constructor:io.deephaven.proto.backplane.grpc.ListFieldsRequest)
-}
-ListFieldsRequest::ListFieldsRequest(
-    ::google::protobuf::Arena* arena,
-    const ListFieldsRequest& from)
-    : ::google::protobuf::internal::ZeroFieldsBase(arena) {
-  ListFieldsRequest* const _this = this;
-  (void)_this;
-  _internal_metadata_.MergeFrom<::google::protobuf::UnknownFieldSet>(
-      from._internal_metadata_);
-
-  // @@protoc_insertion_point(copy_constructor:io.deephaven.proto.backplane.grpc.ListFieldsRequest)
-}
-
-
-
-
-
-
-
-
-
-::google::protobuf::Metadata ListFieldsRequest::GetMetadata() const {
-  return ::_pbi::AssignDescriptors(
-      &descriptor_table_deephaven_2fproto_2fapplication_2eproto_getter, &descriptor_table_deephaven_2fproto_2fapplication_2eproto_once,
-      file_level_metadata_deephaven_2fproto_2fapplication_2eproto[0]);
-}
-// ===================================================================
-
-class FieldsChangeUpdate::_Internal {
- public:
-};
-
-FieldsChangeUpdate::FieldsChangeUpdate(::google::protobuf::Arena* arena)
-    : ::google::protobuf::Message(arena) {
-  SharedCtor(arena);
-  // @@protoc_insertion_point(arena_constructor:io.deephaven.proto.backplane.grpc.FieldsChangeUpdate)
-}
-inline PROTOBUF_NDEBUG_INLINE FieldsChangeUpdate::Impl_::Impl_(
-    ::google::protobuf::internal::InternalVisibility visibility, ::google::protobuf::Arena* arena,
-    const Impl_& from)
-      : created_{visibility, arena, from.created_},
-        updated_{visibility, arena, from.updated_},
-        removed_{visibility, arena, from.removed_},
-        _cached_size_{0} {}
-
-FieldsChangeUpdate::FieldsChangeUpdate(
-    ::google::protobuf::Arena* arena,
-    const FieldsChangeUpdate& from)
-    : ::google::protobuf::Message(arena) {
-  FieldsChangeUpdate* const _this = this;
-  (void)_this;
-  _internal_metadata_.MergeFrom<::google::protobuf::UnknownFieldSet>(
-      from._internal_metadata_);
-  new (&_impl_) Impl_(internal_visibility(), arena, from._impl_);
-
-  // @@protoc_insertion_point(copy_constructor:io.deephaven.proto.backplane.grpc.FieldsChangeUpdate)
-}
-inline PROTOBUF_NDEBUG_INLINE FieldsChangeUpdate::Impl_::Impl_(
-    ::google::protobuf::internal::InternalVisibility visibility,
-    ::google::protobuf::Arena* arena)
-      : created_{visibility, arena},
-        updated_{visibility, arena},
-        removed_{visibility, arena},
-        _cached_size_{0} {}
-
-inline void FieldsChangeUpdate::SharedCtor(::_pb::Arena* arena) {
-  new (&_impl_) Impl_(internal_visibility(), arena);
-}
-FieldsChangeUpdate::~FieldsChangeUpdate() {
-  // @@protoc_insertion_point(destructor:io.deephaven.proto.backplane.grpc.FieldsChangeUpdate)
-  _internal_metadata_.Delete<::google::protobuf::UnknownFieldSet>();
-  SharedDtor();
-}
-inline void FieldsChangeUpdate::SharedDtor() {
-  ABSL_DCHECK(GetArena() == nullptr);
-  _impl_.~Impl_();
-}
-
-PROTOBUF_NOINLINE void FieldsChangeUpdate::Clear() {
-// @@protoc_insertion_point(message_clear_start:io.deephaven.proto.backplane.grpc.FieldsChangeUpdate)
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  ::uint32_t cached_has_bits = 0;
-  // Prevent compiler warnings about cached_has_bits being unused
-  (void) cached_has_bits;
-
-  _impl_.created_.Clear();
-  _impl_.updated_.Clear();
-  _impl_.removed_.Clear();
-  _internal_metadata_.Clear<::google::protobuf::UnknownFieldSet>();
-}
-
-const char* FieldsChangeUpdate::_InternalParse(
-    const char* ptr, ::_pbi::ParseContext* ctx) {
-  ptr = ::_pbi::TcParser::ParseLoop(this, ptr, ctx, &_table_.header);
-  return ptr;
-}
-
-
-PROTOBUF_CONSTINIT PROTOBUF_ATTRIBUTE_INIT_PRIORITY1
-const ::_pbi::TcParseTable<2, 3, 3, 0, 2> FieldsChangeUpdate::_table_ = {
-  {
-    0,  // no _has_bits_
-    0, // no _extensions_
-    3, 24,  // max_field_number, fast_idx_mask
-    offsetof(decltype(_table_), field_lookup_table),
-    4294967288,  // skipmap
-    offsetof(decltype(_table_), field_entries),
-    3,  // num_field_entries
-    3,  // num_aux_entries
-    offsetof(decltype(_table_), aux_entries),
-    &_FieldsChangeUpdate_default_instance_._instance,
-    ::_pbi::TcParser::GenericFallback,  // fallback
-  }, {{
-    {::_pbi::TcParser::MiniParse, {}},
-    // repeated .io.deephaven.proto.backplane.grpc.FieldInfo created = 1;
-    {::_pbi::TcParser::FastMtR1,
-     {10, 63, 0, PROTOBUF_FIELD_OFFSET(FieldsChangeUpdate, _impl_.created_)}},
-    // repeated .io.deephaven.proto.backplane.grpc.FieldInfo updated = 2;
-    {::_pbi::TcParser::FastMtR1,
-     {18, 63, 1, PROTOBUF_FIELD_OFFSET(FieldsChangeUpdate, _impl_.updated_)}},
-    // repeated .io.deephaven.proto.backplane.grpc.FieldInfo removed = 3;
-    {::_pbi::TcParser::FastMtR1,
-     {26, 63, 2, PROTOBUF_FIELD_OFFSET(FieldsChangeUpdate, _impl_.removed_)}},
-  }}, {{
-    65535, 65535
-  }}, {{
-    // repeated .io.deephaven.proto.backplane.grpc.FieldInfo created = 1;
-    {PROTOBUF_FIELD_OFFSET(FieldsChangeUpdate, _impl_.created_), 0, 0,
-    (0 | ::_fl::kFcRepeated | ::_fl::kMessage | ::_fl::kTvTable)},
-    // repeated .io.deephaven.proto.backplane.grpc.FieldInfo updated = 2;
-    {PROTOBUF_FIELD_OFFSET(FieldsChangeUpdate, _impl_.updated_), 0, 1,
-    (0 | ::_fl::kFcRepeated | ::_fl::kMessage | ::_fl::kTvTable)},
-    // repeated .io.deephaven.proto.backplane.grpc.FieldInfo removed = 3;
-    {PROTOBUF_FIELD_OFFSET(FieldsChangeUpdate, _impl_.removed_), 0, 2,
-    (0 | ::_fl::kFcRepeated | ::_fl::kMessage | ::_fl::kTvTable)},
-  }}, {{
-    {::_pbi::TcParser::GetTable<::io::deephaven::proto::backplane::grpc::FieldInfo>()},
-    {::_pbi::TcParser::GetTable<::io::deephaven::proto::backplane::grpc::FieldInfo>()},
-    {::_pbi::TcParser::GetTable<::io::deephaven::proto::backplane::grpc::FieldInfo>()},
-  }}, {{
-  }},
-};
-
-::uint8_t* FieldsChangeUpdate::_InternalSerialize(
-    ::uint8_t* target,
-    ::google::protobuf::io::EpsCopyOutputStream* stream) const {
-  // @@protoc_insertion_point(serialize_to_array_start:io.deephaven.proto.backplane.grpc.FieldsChangeUpdate)
-  ::uint32_t cached_has_bits = 0;
-  (void)cached_has_bits;
-
-  // repeated .io.deephaven.proto.backplane.grpc.FieldInfo created = 1;
-  for (unsigned i = 0,
-      n = static_cast<unsigned>(this->_internal_created_size()); i < n; i++) {
-    const auto& repfield = this->_internal_created().Get(i);
-    target = ::google::protobuf::internal::WireFormatLite::
-        InternalWriteMessage(1, repfield, repfield.GetCachedSize(), target, stream);
-  }
-
-  // repeated .io.deephaven.proto.backplane.grpc.FieldInfo updated = 2;
-  for (unsigned i = 0,
-      n = static_cast<unsigned>(this->_internal_updated_size()); i < n; i++) {
-    const auto& repfield = this->_internal_updated().Get(i);
-    target = ::google::protobuf::internal::WireFormatLite::
-        InternalWriteMessage(2, repfield, repfield.GetCachedSize(), target, stream);
-  }
-
-  // repeated .io.deephaven.proto.backplane.grpc.FieldInfo removed = 3;
-  for (unsigned i = 0,
-      n = static_cast<unsigned>(this->_internal_removed_size()); i < n; i++) {
-    const auto& repfield = this->_internal_removed().Get(i);
-    target = ::google::protobuf::internal::WireFormatLite::
-        InternalWriteMessage(3, repfield, repfield.GetCachedSize(), target, stream);
-  }
-
-  if (PROTOBUF_PREDICT_FALSE(_internal_metadata_.have_unknown_fields())) {
-    target =
-        ::_pbi::WireFormat::InternalSerializeUnknownFieldsToArray(
-            _internal_metadata_.unknown_fields<::google::protobuf::UnknownFieldSet>(::google::protobuf::UnknownFieldSet::default_instance), target, stream);
-  }
-  // @@protoc_insertion_point(serialize_to_array_end:io.deephaven.proto.backplane.grpc.FieldsChangeUpdate)
-  return target;
-}
-
-::size_t FieldsChangeUpdate::ByteSizeLong() const {
-// @@protoc_insertion_point(message_byte_size_start:io.deephaven.proto.backplane.grpc.FieldsChangeUpdate)
-  ::size_t total_size = 0;
-
-  ::uint32_t cached_has_bits = 0;
-  // Prevent compiler warnings about cached_has_bits being unused
-  (void) cached_has_bits;
-
-  // repeated .io.deephaven.proto.backplane.grpc.FieldInfo created = 1;
-  total_size += 1UL * this->_internal_created_size();
-  for (const auto& msg : this->_internal_created()) {
-    total_size +=
-      ::google::protobuf::internal::WireFormatLite::MessageSize(msg);
-  }
-  // repeated .io.deephaven.proto.backplane.grpc.FieldInfo updated = 2;
-  total_size += 1UL * this->_internal_updated_size();
-  for (const auto& msg : this->_internal_updated()) {
-    total_size +=
-      ::google::protobuf::internal::WireFormatLite::MessageSize(msg);
-  }
-  // repeated .io.deephaven.proto.backplane.grpc.FieldInfo removed = 3;
-  total_size += 1UL * this->_internal_removed_size();
-  for (const auto& msg : this->_internal_removed()) {
-    total_size +=
-      ::google::protobuf::internal::WireFormatLite::MessageSize(msg);
-  }
-  return MaybeComputeUnknownFieldsSize(total_size, &_impl_._cached_size_);
-}
-
-const ::google::protobuf::Message::ClassData FieldsChangeUpdate::_class_data_ = {
-    FieldsChangeUpdate::MergeImpl,
-    nullptr,  // OnDemandRegisterArenaDtor
-};
-const ::google::protobuf::Message::ClassData* FieldsChangeUpdate::GetClassData() const {
-  return &_class_data_;
-}
-
-void FieldsChangeUpdate::MergeImpl(::google::protobuf::Message& to_msg, const ::google::protobuf::Message& from_msg) {
-  auto* const _this = static_cast<FieldsChangeUpdate*>(&to_msg);
-  auto& from = static_cast<const FieldsChangeUpdate&>(from_msg);
-  // @@protoc_insertion_point(class_specific_merge_from_start:io.deephaven.proto.backplane.grpc.FieldsChangeUpdate)
-  ABSL_DCHECK_NE(&from, _this);
-  ::uint32_t cached_has_bits = 0;
-  (void) cached_has_bits;
-
-  _this->_internal_mutable_created()->MergeFrom(
-      from._internal_created());
-  _this->_internal_mutable_updated()->MergeFrom(
-      from._internal_updated());
-  _this->_internal_mutable_removed()->MergeFrom(
-      from._internal_removed());
-  _this->_internal_metadata_.MergeFrom<::google::protobuf::UnknownFieldSet>(from._internal_metadata_);
-}
-
-void FieldsChangeUpdate::CopyFrom(const FieldsChangeUpdate& from) {
-// @@protoc_insertion_point(class_specific_copy_from_start:io.deephaven.proto.backplane.grpc.FieldsChangeUpdate)
-  if (&from == this) return;
-  Clear();
-  MergeFrom(from);
-}
-
-PROTOBUF_NOINLINE bool FieldsChangeUpdate::IsInitialized() const {
-  return true;
-}
-
-::_pbi::CachedSize* FieldsChangeUpdate::AccessCachedSize() const {
-  return &_impl_._cached_size_;
-}
-void FieldsChangeUpdate::InternalSwap(FieldsChangeUpdate* PROTOBUF_RESTRICT other) {
-  using std::swap;
-  _internal_metadata_.InternalSwap(&other->_internal_metadata_);
-  _impl_.created_.InternalSwap(&other->_impl_.created_);
-  _impl_.updated_.InternalSwap(&other->_impl_.updated_);
-  _impl_.removed_.InternalSwap(&other->_impl_.removed_);
-}
-
-::google::protobuf::Metadata FieldsChangeUpdate::GetMetadata() const {
-  return ::_pbi::AssignDescriptors(
-      &descriptor_table_deephaven_2fproto_2fapplication_2eproto_getter, &descriptor_table_deephaven_2fproto_2fapplication_2eproto_once,
-      file_level_metadata_deephaven_2fproto_2fapplication_2eproto[1]);
-}
-// ===================================================================
-
-class FieldInfo::_Internal {
- public:
-  using HasBits = decltype(std::declval<FieldInfo>()._impl_._has_bits_);
-  static constexpr ::int32_t kHasBitsOffset =
-    8 * PROTOBUF_FIELD_OFFSET(FieldInfo, _impl_._has_bits_);
-  static const ::io::deephaven::proto::backplane::grpc::TypedTicket& typed_ticket(const FieldInfo* msg);
-  static void set_has_typed_ticket(HasBits* has_bits) {
-    (*has_bits)[0] |= 1u;
-  }
-};
-
-const ::io::deephaven::proto::backplane::grpc::TypedTicket& FieldInfo::_Internal::typed_ticket(const FieldInfo* msg) {
-  return *msg->_impl_.typed_ticket_;
-}
-void FieldInfo::clear_typed_ticket() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  if (_impl_.typed_ticket_ != nullptr) _impl_.typed_ticket_->Clear();
-  _impl_._has_bits_[0] &= ~0x00000001u;
-}
-FieldInfo::FieldInfo(::google::protobuf::Arena* arena)
-    : ::google::protobuf::Message(arena) {
-  SharedCtor(arena);
-  // @@protoc_insertion_point(arena_constructor:io.deephaven.proto.backplane.grpc.FieldInfo)
-}
-inline PROTOBUF_NDEBUG_INLINE FieldInfo::Impl_::Impl_(
-    ::google::protobuf::internal::InternalVisibility visibility, ::google::protobuf::Arena* arena,
-    const Impl_& from)
-      : _has_bits_{from._has_bits_},
-        _cached_size_{0},
-        field_name_(arena, from.field_name_),
-        field_description_(arena, from.field_description_),
-        application_name_(arena, from.application_name_),
-        application_id_(arena, from.application_id_) {}
-
-FieldInfo::FieldInfo(
-    ::google::protobuf::Arena* arena,
-    const FieldInfo& from)
-    : ::google::protobuf::Message(arena) {
-  FieldInfo* const _this = this;
-  (void)_this;
-  _internal_metadata_.MergeFrom<::google::protobuf::UnknownFieldSet>(
-      from._internal_metadata_);
-  new (&_impl_) Impl_(internal_visibility(), arena, from._impl_);
-  ::uint32_t cached_has_bits = _impl_._has_bits_[0];
-  _impl_.typed_ticket_ = (cached_has_bits & 0x00000001u)
-                ? CreateMaybeMessage<::io::deephaven::proto::backplane::grpc::TypedTicket>(arena, *from._impl_.typed_ticket_)
-                : nullptr;
-
-  // @@protoc_insertion_point(copy_constructor:io.deephaven.proto.backplane.grpc.FieldInfo)
-}
-inline PROTOBUF_NDEBUG_INLINE FieldInfo::Impl_::Impl_(
-    ::google::protobuf::internal::InternalVisibility visibility,
-    ::google::protobuf::Arena* arena)
-      : _cached_size_{0},
-        field_name_(arena),
-        field_description_(arena),
-        application_name_(arena),
-        application_id_(arena) {}
-
-inline void FieldInfo::SharedCtor(::_pb::Arena* arena) {
-  new (&_impl_) Impl_(internal_visibility(), arena);
-  _impl_.typed_ticket_ = {};
-}
-FieldInfo::~FieldInfo() {
-  // @@protoc_insertion_point(destructor:io.deephaven.proto.backplane.grpc.FieldInfo)
-  _internal_metadata_.Delete<::google::protobuf::UnknownFieldSet>();
-  SharedDtor();
-}
-inline void FieldInfo::SharedDtor() {
-  ABSL_DCHECK(GetArena() == nullptr);
-  _impl_.field_name_.Destroy();
-  _impl_.field_description_.Destroy();
-  _impl_.application_name_.Destroy();
-  _impl_.application_id_.Destroy();
-  delete _impl_.typed_ticket_;
-  _impl_.~Impl_();
-}
-
-PROTOBUF_NOINLINE void FieldInfo::Clear() {
-// @@protoc_insertion_point(message_clear_start:io.deephaven.proto.backplane.grpc.FieldInfo)
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  ::uint32_t cached_has_bits = 0;
-  // Prevent compiler warnings about cached_has_bits being unused
-  (void) cached_has_bits;
-
-  _impl_.field_name_.ClearToEmpty();
-  _impl_.field_description_.ClearToEmpty();
-  _impl_.application_name_.ClearToEmpty();
-  _impl_.application_id_.ClearToEmpty();
-  cached_has_bits = _impl_._has_bits_[0];
-  if (cached_has_bits & 0x00000001u) {
-    ABSL_DCHECK(_impl_.typed_ticket_ != nullptr);
-    _impl_.typed_ticket_->Clear();
-  }
-  _impl_._has_bits_.Clear();
-  _internal_metadata_.Clear<::google::protobuf::UnknownFieldSet>();
-}
-
-const char* FieldInfo::_InternalParse(
-    const char* ptr, ::_pbi::ParseContext* ctx) {
-  ptr = ::_pbi::TcParser::ParseLoop(this, ptr, ctx, &_table_.header);
-  return ptr;
-}
-
-
-PROTOBUF_CONSTINIT PROTOBUF_ATTRIBUTE_INIT_PRIORITY1
-const ::_pbi::TcParseTable<3, 5, 1, 109, 2> FieldInfo::_table_ = {
-  {
-    PROTOBUF_FIELD_OFFSET(FieldInfo, _impl_._has_bits_),
-    0, // no _extensions_
-    5, 56,  // max_field_number, fast_idx_mask
-    offsetof(decltype(_table_), field_lookup_table),
-    4294967264,  // skipmap
-    offsetof(decltype(_table_), field_entries),
-    5,  // num_field_entries
-    1,  // num_aux_entries
-    offsetof(decltype(_table_), aux_entries),
-    &_FieldInfo_default_instance_._instance,
-    ::_pbi::TcParser::GenericFallback,  // fallback
-  }, {{
-    {::_pbi::TcParser::MiniParse, {}},
-    // .io.deephaven.proto.backplane.grpc.TypedTicket typed_ticket = 1;
-    {::_pbi::TcParser::FastMtS1,
-     {10, 0, 0, PROTOBUF_FIELD_OFFSET(FieldInfo, _impl_.typed_ticket_)}},
-    // string field_name = 2;
-    {::_pbi::TcParser::FastUS1,
-     {18, 63, 0, PROTOBUF_FIELD_OFFSET(FieldInfo, _impl_.field_name_)}},
-    // string field_description = 3;
-    {::_pbi::TcParser::FastUS1,
-     {26, 63, 0, PROTOBUF_FIELD_OFFSET(FieldInfo, _impl_.field_description_)}},
-    // string application_name = 4;
-    {::_pbi::TcParser::FastUS1,
-     {34, 63, 0, PROTOBUF_FIELD_OFFSET(FieldInfo, _impl_.application_name_)}},
-    // string application_id = 5;
-    {::_pbi::TcParser::FastUS1,
-     {42, 63, 0, PROTOBUF_FIELD_OFFSET(FieldInfo, _impl_.application_id_)}},
-    {::_pbi::TcParser::MiniParse, {}},
-    {::_pbi::TcParser::MiniParse, {}},
-  }}, {{
-    65535, 65535
-  }}, {{
-    // .io.deephaven.proto.backplane.grpc.TypedTicket typed_ticket = 1;
-    {PROTOBUF_FIELD_OFFSET(FieldInfo, _impl_.typed_ticket_), _Internal::kHasBitsOffset + 0, 0,
-    (0 | ::_fl::kFcOptional | ::_fl::kMessage | ::_fl::kTvTable)},
-    // string field_name = 2;
-    {PROTOBUF_FIELD_OFFSET(FieldInfo, _impl_.field_name_), -1, 0,
-    (0 | ::_fl::kFcSingular | ::_fl::kUtf8String | ::_fl::kRepAString)},
-    // string field_description = 3;
-    {PROTOBUF_FIELD_OFFSET(FieldInfo, _impl_.field_description_), -1, 0,
-    (0 | ::_fl::kFcSingular | ::_fl::kUtf8String | ::_fl::kRepAString)},
-    // string application_name = 4;
-    {PROTOBUF_FIELD_OFFSET(FieldInfo, _impl_.application_name_), -1, 0,
-    (0 | ::_fl::kFcSingular | ::_fl::kUtf8String | ::_fl::kRepAString)},
-    // string application_id = 5;
-    {PROTOBUF_FIELD_OFFSET(FieldInfo, _impl_.application_id_), -1, 0,
-    (0 | ::_fl::kFcSingular | ::_fl::kUtf8String | ::_fl::kRepAString)},
-  }}, {{
-    {::_pbi::TcParser::GetTable<::io::deephaven::proto::backplane::grpc::TypedTicket>()},
-  }}, {{
-    "\53\0\12\21\20\16\0\0"
-    "io.deephaven.proto.backplane.grpc.FieldInfo"
-    "field_name"
-    "field_description"
-    "application_name"
-    "application_id"
-  }},
-};
-
-::uint8_t* FieldInfo::_InternalSerialize(
-    ::uint8_t* target,
-    ::google::protobuf::io::EpsCopyOutputStream* stream) const {
-  // @@protoc_insertion_point(serialize_to_array_start:io.deephaven.proto.backplane.grpc.FieldInfo)
-  ::uint32_t cached_has_bits = 0;
-  (void)cached_has_bits;
-
-  cached_has_bits = _impl_._has_bits_[0];
-  // .io.deephaven.proto.backplane.grpc.TypedTicket typed_ticket = 1;
-  if (cached_has_bits & 0x00000001u) {
-    target = ::google::protobuf::internal::WireFormatLite::InternalWriteMessage(
-        1, _Internal::typed_ticket(this),
-        _Internal::typed_ticket(this).GetCachedSize(), target, stream);
-  }
-
-  // string field_name = 2;
-  if (!this->_internal_field_name().empty()) {
-    const std::string& _s = this->_internal_field_name();
-    ::google::protobuf::internal::WireFormatLite::VerifyUtf8String(
-        _s.data(), static_cast<int>(_s.length()), ::google::protobuf::internal::WireFormatLite::SERIALIZE, "io.deephaven.proto.backplane.grpc.FieldInfo.field_name");
-    target = stream->WriteStringMaybeAliased(2, _s, target);
-  }
-
-  // string field_description = 3;
-  if (!this->_internal_field_description().empty()) {
-    const std::string& _s = this->_internal_field_description();
-    ::google::protobuf::internal::WireFormatLite::VerifyUtf8String(
-        _s.data(), static_cast<int>(_s.length()), ::google::protobuf::internal::WireFormatLite::SERIALIZE, "io.deephaven.proto.backplane.grpc.FieldInfo.field_description");
-    target = stream->WriteStringMaybeAliased(3, _s, target);
-  }
-
-  // string application_name = 4;
-  if (!this->_internal_application_name().empty()) {
-    const std::string& _s = this->_internal_application_name();
-    ::google::protobuf::internal::WireFormatLite::VerifyUtf8String(
-        _s.data(), static_cast<int>(_s.length()), ::google::protobuf::internal::WireFormatLite::SERIALIZE, "io.deephaven.proto.backplane.grpc.FieldInfo.application_name");
-    target = stream->WriteStringMaybeAliased(4, _s, target);
-  }
-
-  // string application_id = 5;
-  if (!this->_internal_application_id().empty()) {
-    const std::string& _s = this->_internal_application_id();
-    ::google::protobuf::internal::WireFormatLite::VerifyUtf8String(
-        _s.data(), static_cast<int>(_s.length()), ::google::protobuf::internal::WireFormatLite::SERIALIZE, "io.deephaven.proto.backplane.grpc.FieldInfo.application_id");
-    target = stream->WriteStringMaybeAliased(5, _s, target);
-  }
-
-  if (PROTOBUF_PREDICT_FALSE(_internal_metadata_.have_unknown_fields())) {
-    target =
-        ::_pbi::WireFormat::InternalSerializeUnknownFieldsToArray(
-            _internal_metadata_.unknown_fields<::google::protobuf::UnknownFieldSet>(::google::protobuf::UnknownFieldSet::default_instance), target, stream);
-  }
-  // @@protoc_insertion_point(serialize_to_array_end:io.deephaven.proto.backplane.grpc.FieldInfo)
-  return target;
-}
-
-::size_t FieldInfo::ByteSizeLong() const {
-// @@protoc_insertion_point(message_byte_size_start:io.deephaven.proto.backplane.grpc.FieldInfo)
-  ::size_t total_size = 0;
-
-  ::uint32_t cached_has_bits = 0;
-  // Prevent compiler warnings about cached_has_bits being unused
-  (void) cached_has_bits;
-
-  // string field_name = 2;
-  if (!this->_internal_field_name().empty()) {
-    total_size += 1 + ::google::protobuf::internal::WireFormatLite::StringSize(
-                                    this->_internal_field_name());
-  }
-
-  // string field_description = 3;
-  if (!this->_internal_field_description().empty()) {
-    total_size += 1 + ::google::protobuf::internal::WireFormatLite::StringSize(
-                                    this->_internal_field_description());
-  }
-
-  // string application_name = 4;
-  if (!this->_internal_application_name().empty()) {
-    total_size += 1 + ::google::protobuf::internal::WireFormatLite::StringSize(
-                                    this->_internal_application_name());
-  }
-
-  // string application_id = 5;
-  if (!this->_internal_application_id().empty()) {
-    total_size += 1 + ::google::protobuf::internal::WireFormatLite::StringSize(
-                                    this->_internal_application_id());
-  }
-
-  // .io.deephaven.proto.backplane.grpc.TypedTicket typed_ticket = 1;
-  cached_has_bits = _impl_._has_bits_[0];
-  if (cached_has_bits & 0x00000001u) {
-    total_size +=
-        1 + ::google::protobuf::internal::WireFormatLite::MessageSize(*_impl_.typed_ticket_);
-  }
-
-  return MaybeComputeUnknownFieldsSize(total_size, &_impl_._cached_size_);
-}
-
-const ::google::protobuf::Message::ClassData FieldInfo::_class_data_ = {
-    FieldInfo::MergeImpl,
-    nullptr,  // OnDemandRegisterArenaDtor
-};
-const ::google::protobuf::Message::ClassData* FieldInfo::GetClassData() const {
-  return &_class_data_;
-}
-
-void FieldInfo::MergeImpl(::google::protobuf::Message& to_msg, const ::google::protobuf::Message& from_msg) {
-  auto* const _this = static_cast<FieldInfo*>(&to_msg);
-  auto& from = static_cast<const FieldInfo&>(from_msg);
-  // @@protoc_insertion_point(class_specific_merge_from_start:io.deephaven.proto.backplane.grpc.FieldInfo)
-  ABSL_DCHECK_NE(&from, _this);
-  ::uint32_t cached_has_bits = 0;
-  (void) cached_has_bits;
-
-  if (!from._internal_field_name().empty()) {
-    _this->_internal_set_field_name(from._internal_field_name());
-  }
-  if (!from._internal_field_description().empty()) {
-    _this->_internal_set_field_description(from._internal_field_description());
-  }
-  if (!from._internal_application_name().empty()) {
-    _this->_internal_set_application_name(from._internal_application_name());
-  }
-  if (!from._internal_application_id().empty()) {
-    _this->_internal_set_application_id(from._internal_application_id());
-  }
-  if ((from._impl_._has_bits_[0] & 0x00000001u) != 0) {
-    _this->_internal_mutable_typed_ticket()->::io::deephaven::proto::backplane::grpc::TypedTicket::MergeFrom(
-        from._internal_typed_ticket());
-  }
-  _this->_internal_metadata_.MergeFrom<::google::protobuf::UnknownFieldSet>(from._internal_metadata_);
-}
-
-void FieldInfo::CopyFrom(const FieldInfo& from) {
-// @@protoc_insertion_point(class_specific_copy_from_start:io.deephaven.proto.backplane.grpc.FieldInfo)
-  if (&from == this) return;
-  Clear();
-  MergeFrom(from);
-}
-
-PROTOBUF_NOINLINE bool FieldInfo::IsInitialized() const {
-  return true;
-}
-
-::_pbi::CachedSize* FieldInfo::AccessCachedSize() const {
-  return &_impl_._cached_size_;
-}
-void FieldInfo::InternalSwap(FieldInfo* PROTOBUF_RESTRICT other) {
-  using std::swap;
-  auto* arena = GetArena();
-  ABSL_DCHECK_EQ(arena, other->GetArena());
-  _internal_metadata_.InternalSwap(&other->_internal_metadata_);
-  swap(_impl_._has_bits_[0], other->_impl_._has_bits_[0]);
-  ::_pbi::ArenaStringPtr::InternalSwap(&_impl_.field_name_, &other->_impl_.field_name_, arena);
-  ::_pbi::ArenaStringPtr::InternalSwap(&_impl_.field_description_, &other->_impl_.field_description_, arena);
-  ::_pbi::ArenaStringPtr::InternalSwap(&_impl_.application_name_, &other->_impl_.application_name_, arena);
-  ::_pbi::ArenaStringPtr::InternalSwap(&_impl_.application_id_, &other->_impl_.application_id_, arena);
-  swap(_impl_.typed_ticket_, other->_impl_.typed_ticket_);
-}
-
-::google::protobuf::Metadata FieldInfo::GetMetadata() const {
-  return ::_pbi::AssignDescriptors(
-      &descriptor_table_deephaven_2fproto_2fapplication_2eproto_getter, &descriptor_table_deephaven_2fproto_2fapplication_2eproto_once,
-      file_level_metadata_deephaven_2fproto_2fapplication_2eproto[2]);
-}
-// @@protoc_insertion_point(namespace_scope)
-}  // namespace grpc
-}  // namespace backplane
-}  // namespace proto
-}  // namespace deephaven
-}  // namespace io
-namespace google {
-namespace protobuf {
-}  // namespace protobuf
-}  // namespace google
-// @@protoc_insertion_point(global_scope)
-#include "google/protobuf/port_undef.inc"
diff --git a/cpp-client/deephaven/dhclient/proto/deephaven/proto/application.pb.h b/cpp-client/deephaven/dhclient/proto/deephaven/proto/application.pb.h
deleted file mode 100644
index f3f10a21de8..00000000000
--- a/cpp-client/deephaven/dhclient/proto/deephaven/proto/application.pb.h
+++ /dev/null
@@ -1,1197 +0,0 @@
-// Generated by the protocol buffer compiler.  DO NOT EDIT!
-// source: deephaven/proto/application.proto
-// Protobuf C++ Version: 4.25.3
-
-#ifndef GOOGLE_PROTOBUF_INCLUDED_deephaven_2fproto_2fapplication_2eproto_2epb_2eh
-#define GOOGLE_PROTOBUF_INCLUDED_deephaven_2fproto_2fapplication_2eproto_2epb_2eh
-
-#include <limits>
-#include <string>
-#include <type_traits>
-#include <utility>
-
-#include "google/protobuf/port_def.inc"
-#if PROTOBUF_VERSION < 4025000
-#error "This file was generated by a newer version of protoc which is"
-#error "incompatible with your Protocol Buffer headers. Please update"
-#error "your headers."
-#endif  // PROTOBUF_VERSION
-
-#if 4025003 < PROTOBUF_MIN_PROTOC_VERSION
-#error "This file was generated by an older version of protoc which is"
-#error "incompatible with your Protocol Buffer headers. Please"
-#error "regenerate this file with a newer version of protoc."
-#endif  // PROTOBUF_MIN_PROTOC_VERSION
-#include "google/protobuf/port_undef.inc"
-#include "google/protobuf/io/coded_stream.h"
-#include "google/protobuf/arena.h"
-#include "google/protobuf/arenastring.h"
-#include "google/protobuf/generated_message_bases.h"
-#include "google/protobuf/generated_message_tctable_decl.h"
-#include "google/protobuf/generated_message_util.h"
-#include "google/protobuf/metadata_lite.h"
-#include "google/protobuf/generated_message_reflection.h"
-#include "google/protobuf/message.h"
-#include "google/protobuf/repeated_field.h"  // IWYU pragma: export
-#include "google/protobuf/extension_set.h"  // IWYU pragma: export
-#include "google/protobuf/unknown_field_set.h"
-#include "deephaven/proto/ticket.pb.h"
-// @@protoc_insertion_point(includes)
-
-// Must be included last.
-#include "google/protobuf/port_def.inc"
-
-#define PROTOBUF_INTERNAL_EXPORT_deephaven_2fproto_2fapplication_2eproto
-
-namespace google {
-namespace protobuf {
-namespace internal {
-class AnyMetadata;
-}  // namespace internal
-}  // namespace protobuf
-}  // namespace google
-
-// Internal implementation detail -- do not use these members.
-struct TableStruct_deephaven_2fproto_2fapplication_2eproto {
-  static const ::uint32_t offsets[];
-};
-extern const ::google::protobuf::internal::DescriptorTable
-    descriptor_table_deephaven_2fproto_2fapplication_2eproto;
-namespace io {
-namespace deephaven {
-namespace proto {
-namespace backplane {
-namespace grpc {
-class FieldInfo;
-struct FieldInfoDefaultTypeInternal;
-extern FieldInfoDefaultTypeInternal _FieldInfo_default_instance_;
-class FieldsChangeUpdate;
-struct FieldsChangeUpdateDefaultTypeInternal;
-extern FieldsChangeUpdateDefaultTypeInternal _FieldsChangeUpdate_default_instance_;
-class ListFieldsRequest;
-struct ListFieldsRequestDefaultTypeInternal;
-extern ListFieldsRequestDefaultTypeInternal _ListFieldsRequest_default_instance_;
-}  // namespace grpc
-}  // namespace backplane
-}  // namespace proto
-}  // namespace deephaven
-}  // namespace io
-namespace google {
-namespace protobuf {
-}  // namespace protobuf
-}  // namespace google
-
-namespace io {
-namespace deephaven {
-namespace proto {
-namespace backplane {
-namespace grpc {
-
-// ===================================================================
-
-
-// -------------------------------------------------------------------
-
-class ListFieldsRequest final :
-    public ::google::protobuf::internal::ZeroFieldsBase /* @@protoc_insertion_point(class_definition:io.deephaven.proto.backplane.grpc.ListFieldsRequest) */ {
- public:
-  inline ListFieldsRequest() : ListFieldsRequest(nullptr) {}
-  template<typename = void>
-  explicit PROTOBUF_CONSTEXPR ListFieldsRequest(::google::protobuf::internal::ConstantInitialized);
-
-  inline ListFieldsRequest(const ListFieldsRequest& from)
-      : ListFieldsRequest(nullptr, from) {}
-  ListFieldsRequest(ListFieldsRequest&& from) noexcept
-    : ListFieldsRequest() {
-    *this = ::std::move(from);
-  }
-
-  inline ListFieldsRequest& operator=(const ListFieldsRequest& from) {
-    CopyFrom(from);
-    return *this;
-  }
-  inline ListFieldsRequest& operator=(ListFieldsRequest&& from) noexcept {
-    if (this == &from) return *this;
-    if (GetArena() == from.GetArena()
-  #ifdef PROTOBUF_FORCE_COPY_IN_MOVE
-        && GetArena() != nullptr
-  #endif  // !PROTOBUF_FORCE_COPY_IN_MOVE
-    ) {
-      InternalSwap(&from);
-    } else {
-      CopyFrom(from);
-    }
-    return *this;
-  }
-
-  inline const ::google::protobuf::UnknownFieldSet& unknown_fields() const
-      ABSL_ATTRIBUTE_LIFETIME_BOUND {
-    return _internal_metadata_.unknown_fields<::google::protobuf::UnknownFieldSet>(::google::protobuf::UnknownFieldSet::default_instance);
-  }
-  inline ::google::protobuf::UnknownFieldSet* mutable_unknown_fields()
-      ABSL_ATTRIBUTE_LIFETIME_BOUND {
-    return _internal_metadata_.mutable_unknown_fields<::google::protobuf::UnknownFieldSet>();
-  }
-
-  static const ::google::protobuf::Descriptor* descriptor() {
-    return GetDescriptor();
-  }
-  static const ::google::protobuf::Descriptor* GetDescriptor() {
-    return default_instance().GetMetadata().descriptor;
-  }
-  static const ::google::protobuf::Reflection* GetReflection() {
-    return default_instance().GetMetadata().reflection;
-  }
-  static const ListFieldsRequest& default_instance() {
-    return *internal_default_instance();
-  }
-  static inline const ListFieldsRequest* internal_default_instance() {
-    return reinterpret_cast<const ListFieldsRequest*>(
-               &_ListFieldsRequest_default_instance_);
-  }
-  static constexpr int kIndexInFileMessages =
-    0;
-
-  friend void swap(ListFieldsRequest& a, ListFieldsRequest& b) {
-    a.Swap(&b);
-  }
-  inline void Swap(ListFieldsRequest* other) {
-    if (other == this) return;
-  #ifdef PROTOBUF_FORCE_COPY_IN_SWAP
-    if (GetArena() != nullptr &&
-        GetArena() == other->GetArena()) {
-   #else  // PROTOBUF_FORCE_COPY_IN_SWAP
-    if (GetArena() == other->GetArena()) {
-  #endif  // !PROTOBUF_FORCE_COPY_IN_SWAP
-      InternalSwap(other);
-    } else {
-      ::google::protobuf::internal::GenericSwap(this, other);
-    }
-  }
-  void UnsafeArenaSwap(ListFieldsRequest* other) {
-    if (other == this) return;
-    ABSL_DCHECK(GetArena() == other->GetArena());
-    InternalSwap(other);
-  }
-
-  // implements Message ----------------------------------------------
-
-  ListFieldsRequest* New(::google::protobuf::Arena* arena = nullptr) const final {
-    return CreateMaybeMessage<ListFieldsRequest>(arena);
-  }
-  using ::google::protobuf::internal::ZeroFieldsBase::CopyFrom;
-  inline void CopyFrom(const ListFieldsRequest& from) {
-    ::google::protobuf::internal::ZeroFieldsBase::CopyImpl(*this, from);
-  }
-  using ::google::protobuf::internal::ZeroFieldsBase::MergeFrom;
-  void MergeFrom(const ListFieldsRequest& from) {
-    ::google::protobuf::internal::ZeroFieldsBase::MergeImpl(*this, from);
-  }
-  public:
-
-  private:
-  friend class ::google::protobuf::internal::AnyMetadata;
-  static ::absl::string_view FullMessageName() {
-    return "io.deephaven.proto.backplane.grpc.ListFieldsRequest";
-  }
-  protected:
-  explicit ListFieldsRequest(::google::protobuf::Arena* arena);
-  ListFieldsRequest(::google::protobuf::Arena* arena, const ListFieldsRequest& from);
-  public:
-
-  ::google::protobuf::Metadata GetMetadata() const final;
-
-  // nested types ----------------------------------------------------
-
-  // accessors -------------------------------------------------------
-
-  // @@protoc_insertion_point(class_scope:io.deephaven.proto.backplane.grpc.ListFieldsRequest)
- private:
-  class _Internal;
-
-  friend class ::google::protobuf::MessageLite;
-  friend class ::google::protobuf::Arena;
-  template <typename T>
-  friend class ::google::protobuf::Arena::InternalHelper;
-  using InternalArenaConstructable_ = void;
-  using DestructorSkippable_ = void;
-  struct Impl_ {
-
-        inline explicit constexpr Impl_(
-            ::google::protobuf::internal::ConstantInitialized) noexcept;
-        inline explicit Impl_(::google::protobuf::internal::InternalVisibility visibility,
-                              ::google::protobuf::Arena* arena);
-        inline explicit Impl_(::google::protobuf::internal::InternalVisibility visibility,
-                              ::google::protobuf::Arena* arena, const Impl_& from);
-    PROTOBUF_TSAN_DECLARE_MEMBER
-  };
-  friend struct ::TableStruct_deephaven_2fproto_2fapplication_2eproto;
-};// -------------------------------------------------------------------
-
-class FieldInfo final :
-    public ::google::protobuf::Message /* @@protoc_insertion_point(class_definition:io.deephaven.proto.backplane.grpc.FieldInfo) */ {
- public:
-  inline FieldInfo() : FieldInfo(nullptr) {}
-  ~FieldInfo() override;
-  template<typename = void>
-  explicit PROTOBUF_CONSTEXPR FieldInfo(::google::protobuf::internal::ConstantInitialized);
-
-  inline FieldInfo(const FieldInfo& from)
-      : FieldInfo(nullptr, from) {}
-  FieldInfo(FieldInfo&& from) noexcept
-    : FieldInfo() {
-    *this = ::std::move(from);
-  }
-
-  inline FieldInfo& operator=(const FieldInfo& from) {
-    CopyFrom(from);
-    return *this;
-  }
-  inline FieldInfo& operator=(FieldInfo&& from) noexcept {
-    if (this == &from) return *this;
-    if (GetArena() == from.GetArena()
-  #ifdef PROTOBUF_FORCE_COPY_IN_MOVE
-        && GetArena() != nullptr
-  #endif  // !PROTOBUF_FORCE_COPY_IN_MOVE
-    ) {
-      InternalSwap(&from);
-    } else {
-      CopyFrom(from);
-    }
-    return *this;
-  }
-
-  inline const ::google::protobuf::UnknownFieldSet& unknown_fields() const
-      ABSL_ATTRIBUTE_LIFETIME_BOUND {
-    return _internal_metadata_.unknown_fields<::google::protobuf::UnknownFieldSet>(::google::protobuf::UnknownFieldSet::default_instance);
-  }
-  inline ::google::protobuf::UnknownFieldSet* mutable_unknown_fields()
-      ABSL_ATTRIBUTE_LIFETIME_BOUND {
-    return _internal_metadata_.mutable_unknown_fields<::google::protobuf::UnknownFieldSet>();
-  }
-
-  static const ::google::protobuf::Descriptor* descriptor() {
-    return GetDescriptor();
-  }
-  static const ::google::protobuf::Descriptor* GetDescriptor() {
-    return default_instance().GetMetadata().descriptor;
-  }
-  static const ::google::protobuf::Reflection* GetReflection() {
-    return default_instance().GetMetadata().reflection;
-  }
-  static const FieldInfo& default_instance() {
-    return *internal_default_instance();
-  }
-  static inline const FieldInfo* internal_default_instance() {
-    return reinterpret_cast<const FieldInfo*>(
-               &_FieldInfo_default_instance_);
-  }
-  static constexpr int kIndexInFileMessages =
-    2;
-
-  friend void swap(FieldInfo& a, FieldInfo& b) {
-    a.Swap(&b);
-  }
-  inline void Swap(FieldInfo* other) {
-    if (other == this) return;
-  #ifdef PROTOBUF_FORCE_COPY_IN_SWAP
-    if (GetArena() != nullptr &&
-        GetArena() == other->GetArena()) {
-   #else  // PROTOBUF_FORCE_COPY_IN_SWAP
-    if (GetArena() == other->GetArena()) {
-  #endif  // !PROTOBUF_FORCE_COPY_IN_SWAP
-      InternalSwap(other);
-    } else {
-      ::google::protobuf::internal::GenericSwap(this, other);
-    }
-  }
-  void UnsafeArenaSwap(FieldInfo* other) {
-    if (other == this) return;
-    ABSL_DCHECK(GetArena() == other->GetArena());
-    InternalSwap(other);
-  }
-
-  // implements Message ----------------------------------------------
-
-  FieldInfo* New(::google::protobuf::Arena* arena = nullptr) const final {
-    return CreateMaybeMessage<FieldInfo>(arena);
-  }
-  using ::google::protobuf::Message::CopyFrom;
-  void CopyFrom(const FieldInfo& from);
-  using ::google::protobuf::Message::MergeFrom;
-  void MergeFrom( const FieldInfo& from) {
-    FieldInfo::MergeImpl(*this, from);
-  }
-  private:
-  static void MergeImpl(::google::protobuf::Message& to_msg, const ::google::protobuf::Message& from_msg);
-  public:
-  PROTOBUF_ATTRIBUTE_REINITIALIZES void Clear() final;
-  bool IsInitialized() const final;
-
-  ::size_t ByteSizeLong() const final;
-  const char* _InternalParse(const char* ptr, ::google::protobuf::internal::ParseContext* ctx) final;
-  ::uint8_t* _InternalSerialize(
-      ::uint8_t* target, ::google::protobuf::io::EpsCopyOutputStream* stream) const final;
-  int GetCachedSize() const { return _impl_._cached_size_.Get(); }
-
-  private:
-  ::google::protobuf::internal::CachedSize* AccessCachedSize() const final;
-  void SharedCtor(::google::protobuf::Arena* arena);
-  void SharedDtor();
-  void InternalSwap(FieldInfo* other);
-
-  private:
-  friend class ::google::protobuf::internal::AnyMetadata;
-  static ::absl::string_view FullMessageName() {
-    return "io.deephaven.proto.backplane.grpc.FieldInfo";
-  }
-  protected:
-  explicit FieldInfo(::google::protobuf::Arena* arena);
-  FieldInfo(::google::protobuf::Arena* arena, const FieldInfo& from);
-  public:
-
-  static const ClassData _class_data_;
-  const ::google::protobuf::Message::ClassData*GetClassData() const final;
-
-  ::google::protobuf::Metadata GetMetadata() const final;
-
-  // nested types ----------------------------------------------------
-
-  // accessors -------------------------------------------------------
-
-  enum : int {
-    kFieldNameFieldNumber = 2,
-    kFieldDescriptionFieldNumber = 3,
-    kApplicationNameFieldNumber = 4,
-    kApplicationIdFieldNumber = 5,
-    kTypedTicketFieldNumber = 1,
-  };
-  // string field_name = 2;
-  void clear_field_name() ;
-  const std::string& field_name() const;
-  template <typename Arg_ = const std::string&, typename... Args_>
-  void set_field_name(Arg_&& arg, Args_... args);
-  std::string* mutable_field_name();
-  PROTOBUF_NODISCARD std::string* release_field_name();
-  void set_allocated_field_name(std::string* value);
-
-  private:
-  const std::string& _internal_field_name() const;
-  inline PROTOBUF_ALWAYS_INLINE void _internal_set_field_name(
-      const std::string& value);
-  std::string* _internal_mutable_field_name();
-
-  public:
-  // string field_description = 3;
-  void clear_field_description() ;
-  const std::string& field_description() const;
-  template <typename Arg_ = const std::string&, typename... Args_>
-  void set_field_description(Arg_&& arg, Args_... args);
-  std::string* mutable_field_description();
-  PROTOBUF_NODISCARD std::string* release_field_description();
-  void set_allocated_field_description(std::string* value);
-
-  private:
-  const std::string& _internal_field_description() const;
-  inline PROTOBUF_ALWAYS_INLINE void _internal_set_field_description(
-      const std::string& value);
-  std::string* _internal_mutable_field_description();
-
-  public:
-  // string application_name = 4;
-  void clear_application_name() ;
-  const std::string& application_name() const;
-  template <typename Arg_ = const std::string&, typename... Args_>
-  void set_application_name(Arg_&& arg, Args_... args);
-  std::string* mutable_application_name();
-  PROTOBUF_NODISCARD std::string* release_application_name();
-  void set_allocated_application_name(std::string* value);
-
-  private:
-  const std::string& _internal_application_name() const;
-  inline PROTOBUF_ALWAYS_INLINE void _internal_set_application_name(
-      const std::string& value);
-  std::string* _internal_mutable_application_name();
-
-  public:
-  // string application_id = 5;
-  void clear_application_id() ;
-  const std::string& application_id() const;
-  template <typename Arg_ = const std::string&, typename... Args_>
-  void set_application_id(Arg_&& arg, Args_... args);
-  std::string* mutable_application_id();
-  PROTOBUF_NODISCARD std::string* release_application_id();
-  void set_allocated_application_id(std::string* value);
-
-  private:
-  const std::string& _internal_application_id() const;
-  inline PROTOBUF_ALWAYS_INLINE void _internal_set_application_id(
-      const std::string& value);
-  std::string* _internal_mutable_application_id();
-
-  public:
-  // .io.deephaven.proto.backplane.grpc.TypedTicket typed_ticket = 1;
-  bool has_typed_ticket() const;
-  void clear_typed_ticket() ;
-  const ::io::deephaven::proto::backplane::grpc::TypedTicket& typed_ticket() const;
-  PROTOBUF_NODISCARD ::io::deephaven::proto::backplane::grpc::TypedTicket* release_typed_ticket();
-  ::io::deephaven::proto::backplane::grpc::TypedTicket* mutable_typed_ticket();
-  void set_allocated_typed_ticket(::io::deephaven::proto::backplane::grpc::TypedTicket* value);
-  void unsafe_arena_set_allocated_typed_ticket(::io::deephaven::proto::backplane::grpc::TypedTicket* value);
-  ::io::deephaven::proto::backplane::grpc::TypedTicket* unsafe_arena_release_typed_ticket();
-
-  private:
-  const ::io::deephaven::proto::backplane::grpc::TypedTicket& _internal_typed_ticket() const;
-  ::io::deephaven::proto::backplane::grpc::TypedTicket* _internal_mutable_typed_ticket();
-
-  public:
-  // @@protoc_insertion_point(class_scope:io.deephaven.proto.backplane.grpc.FieldInfo)
- private:
-  class _Internal;
-
-  friend class ::google::protobuf::internal::TcParser;
-  static const ::google::protobuf::internal::TcParseTable<
-      3, 5, 1,
-      109, 2>
-      _table_;
-  friend class ::google::protobuf::MessageLite;
-  friend class ::google::protobuf::Arena;
-  template <typename T>
-  friend class ::google::protobuf::Arena::InternalHelper;
-  using InternalArenaConstructable_ = void;
-  using DestructorSkippable_ = void;
-  struct Impl_ {
-
-        inline explicit constexpr Impl_(
-            ::google::protobuf::internal::ConstantInitialized) noexcept;
-        inline explicit Impl_(::google::protobuf::internal::InternalVisibility visibility,
-                              ::google::protobuf::Arena* arena);
-        inline explicit Impl_(::google::protobuf::internal::InternalVisibility visibility,
-                              ::google::protobuf::Arena* arena, const Impl_& from);
-    ::google::protobuf::internal::HasBits<1> _has_bits_;
-    mutable ::google::protobuf::internal::CachedSize _cached_size_;
-    ::google::protobuf::internal::ArenaStringPtr field_name_;
-    ::google::protobuf::internal::ArenaStringPtr field_description_;
-    ::google::protobuf::internal::ArenaStringPtr application_name_;
-    ::google::protobuf::internal::ArenaStringPtr application_id_;
-    ::io::deephaven::proto::backplane::grpc::TypedTicket* typed_ticket_;
-    PROTOBUF_TSAN_DECLARE_MEMBER
-  };
-  union { Impl_ _impl_; };
-  friend struct ::TableStruct_deephaven_2fproto_2fapplication_2eproto;
-};// -------------------------------------------------------------------
-
-class FieldsChangeUpdate final :
-    public ::google::protobuf::Message /* @@protoc_insertion_point(class_definition:io.deephaven.proto.backplane.grpc.FieldsChangeUpdate) */ {
- public:
-  inline FieldsChangeUpdate() : FieldsChangeUpdate(nullptr) {}
-  ~FieldsChangeUpdate() override;
-  template<typename = void>
-  explicit PROTOBUF_CONSTEXPR FieldsChangeUpdate(::google::protobuf::internal::ConstantInitialized);
-
-  inline FieldsChangeUpdate(const FieldsChangeUpdate& from)
-      : FieldsChangeUpdate(nullptr, from) {}
-  FieldsChangeUpdate(FieldsChangeUpdate&& from) noexcept
-    : FieldsChangeUpdate() {
-    *this = ::std::move(from);
-  }
-
-  inline FieldsChangeUpdate& operator=(const FieldsChangeUpdate& from) {
-    CopyFrom(from);
-    return *this;
-  }
-  inline FieldsChangeUpdate& operator=(FieldsChangeUpdate&& from) noexcept {
-    if (this == &from) return *this;
-    if (GetArena() == from.GetArena()
-  #ifdef PROTOBUF_FORCE_COPY_IN_MOVE
-        && GetArena() != nullptr
-  #endif  // !PROTOBUF_FORCE_COPY_IN_MOVE
-    ) {
-      InternalSwap(&from);
-    } else {
-      CopyFrom(from);
-    }
-    return *this;
-  }
-
-  inline const ::google::protobuf::UnknownFieldSet& unknown_fields() const
-      ABSL_ATTRIBUTE_LIFETIME_BOUND {
-    return _internal_metadata_.unknown_fields<::google::protobuf::UnknownFieldSet>(::google::protobuf::UnknownFieldSet::default_instance);
-  }
-  inline ::google::protobuf::UnknownFieldSet* mutable_unknown_fields()
-      ABSL_ATTRIBUTE_LIFETIME_BOUND {
-    return _internal_metadata_.mutable_unknown_fields<::google::protobuf::UnknownFieldSet>();
-  }
-
-  static const ::google::protobuf::Descriptor* descriptor() {
-    return GetDescriptor();
-  }
-  static const ::google::protobuf::Descriptor* GetDescriptor() {
-    return default_instance().GetMetadata().descriptor;
-  }
-  static const ::google::protobuf::Reflection* GetReflection() {
-    return default_instance().GetMetadata().reflection;
-  }
-  static const FieldsChangeUpdate& default_instance() {
-    return *internal_default_instance();
-  }
-  static inline const FieldsChangeUpdate* internal_default_instance() {
-    return reinterpret_cast<const FieldsChangeUpdate*>(
-               &_FieldsChangeUpdate_default_instance_);
-  }
-  static constexpr int kIndexInFileMessages =
-    1;
-
-  friend void swap(FieldsChangeUpdate& a, FieldsChangeUpdate& b) {
-    a.Swap(&b);
-  }
-  inline void Swap(FieldsChangeUpdate* other) {
-    if (other == this) return;
-  #ifdef PROTOBUF_FORCE_COPY_IN_SWAP
-    if (GetArena() != nullptr &&
-        GetArena() == other->GetArena()) {
-   #else  // PROTOBUF_FORCE_COPY_IN_SWAP
-    if (GetArena() == other->GetArena()) {
-  #endif  // !PROTOBUF_FORCE_COPY_IN_SWAP
-      InternalSwap(other);
-    } else {
-      ::google::protobuf::internal::GenericSwap(this, other);
-    }
-  }
-  void UnsafeArenaSwap(FieldsChangeUpdate* other) {
-    if (other == this) return;
-    ABSL_DCHECK(GetArena() == other->GetArena());
-    InternalSwap(other);
-  }
-
-  // implements Message ----------------------------------------------
-
-  FieldsChangeUpdate* New(::google::protobuf::Arena* arena = nullptr) const final {
-    return CreateMaybeMessage<FieldsChangeUpdate>(arena);
-  }
-  using ::google::protobuf::Message::CopyFrom;
-  void CopyFrom(const FieldsChangeUpdate& from);
-  using ::google::protobuf::Message::MergeFrom;
-  void MergeFrom( const FieldsChangeUpdate& from) {
-    FieldsChangeUpdate::MergeImpl(*this, from);
-  }
-  private:
-  static void MergeImpl(::google::protobuf::Message& to_msg, const ::google::protobuf::Message& from_msg);
-  public:
-  PROTOBUF_ATTRIBUTE_REINITIALIZES void Clear() final;
-  bool IsInitialized() const final;
-
-  ::size_t ByteSizeLong() const final;
-  const char* _InternalParse(const char* ptr, ::google::protobuf::internal::ParseContext* ctx) final;
-  ::uint8_t* _InternalSerialize(
-      ::uint8_t* target, ::google::protobuf::io::EpsCopyOutputStream* stream) const final;
-  int GetCachedSize() const { return _impl_._cached_size_.Get(); }
-
-  private:
-  ::google::protobuf::internal::CachedSize* AccessCachedSize() const final;
-  void SharedCtor(::google::protobuf::Arena* arena);
-  void SharedDtor();
-  void InternalSwap(FieldsChangeUpdate* other);
-
-  private:
-  friend class ::google::protobuf::internal::AnyMetadata;
-  static ::absl::string_view FullMessageName() {
-    return "io.deephaven.proto.backplane.grpc.FieldsChangeUpdate";
-  }
-  protected:
-  explicit FieldsChangeUpdate(::google::protobuf::Arena* arena);
-  FieldsChangeUpdate(::google::protobuf::Arena* arena, const FieldsChangeUpdate& from);
-  public:
-
-  static const ClassData _class_data_;
-  const ::google::protobuf::Message::ClassData*GetClassData() const final;
-
-  ::google::protobuf::Metadata GetMetadata() const final;
-
-  // nested types ----------------------------------------------------
-
-  // accessors -------------------------------------------------------
-
-  enum : int {
-    kCreatedFieldNumber = 1,
-    kUpdatedFieldNumber = 2,
-    kRemovedFieldNumber = 3,
-  };
-  // repeated .io.deephaven.proto.backplane.grpc.FieldInfo created = 1;
-  int created_size() const;
-  private:
-  int _internal_created_size() const;
-
-  public:
-  void clear_created() ;
-  ::io::deephaven::proto::backplane::grpc::FieldInfo* mutable_created(int index);
-  ::google::protobuf::RepeatedPtrField< ::io::deephaven::proto::backplane::grpc::FieldInfo >*
-      mutable_created();
-  private:
-  const ::google::protobuf::RepeatedPtrField<::io::deephaven::proto::backplane::grpc::FieldInfo>& _internal_created() const;
-  ::google::protobuf::RepeatedPtrField<::io::deephaven::proto::backplane::grpc::FieldInfo>* _internal_mutable_created();
-  public:
-  const ::io::deephaven::proto::backplane::grpc::FieldInfo& created(int index) const;
-  ::io::deephaven::proto::backplane::grpc::FieldInfo* add_created();
-  const ::google::protobuf::RepeatedPtrField< ::io::deephaven::proto::backplane::grpc::FieldInfo >&
-      created() const;
-  // repeated .io.deephaven.proto.backplane.grpc.FieldInfo updated = 2;
-  int updated_size() const;
-  private:
-  int _internal_updated_size() const;
-
-  public:
-  void clear_updated() ;
-  ::io::deephaven::proto::backplane::grpc::FieldInfo* mutable_updated(int index);
-  ::google::protobuf::RepeatedPtrField< ::io::deephaven::proto::backplane::grpc::FieldInfo >*
-      mutable_updated();
-  private:
-  const ::google::protobuf::RepeatedPtrField<::io::deephaven::proto::backplane::grpc::FieldInfo>& _internal_updated() const;
-  ::google::protobuf::RepeatedPtrField<::io::deephaven::proto::backplane::grpc::FieldInfo>* _internal_mutable_updated();
-  public:
-  const ::io::deephaven::proto::backplane::grpc::FieldInfo& updated(int index) const;
-  ::io::deephaven::proto::backplane::grpc::FieldInfo* add_updated();
-  const ::google::protobuf::RepeatedPtrField< ::io::deephaven::proto::backplane::grpc::FieldInfo >&
-      updated() const;
-  // repeated .io.deephaven.proto.backplane.grpc.FieldInfo removed = 3;
-  int removed_size() const;
-  private:
-  int _internal_removed_size() const;
-
-  public:
-  void clear_removed() ;
-  ::io::deephaven::proto::backplane::grpc::FieldInfo* mutable_removed(int index);
-  ::google::protobuf::RepeatedPtrField< ::io::deephaven::proto::backplane::grpc::FieldInfo >*
-      mutable_removed();
-  private:
-  const ::google::protobuf::RepeatedPtrField<::io::deephaven::proto::backplane::grpc::FieldInfo>& _internal_removed() const;
-  ::google::protobuf::RepeatedPtrField<::io::deephaven::proto::backplane::grpc::FieldInfo>* _internal_mutable_removed();
-  public:
-  const ::io::deephaven::proto::backplane::grpc::FieldInfo& removed(int index) const;
-  ::io::deephaven::proto::backplane::grpc::FieldInfo* add_removed();
-  const ::google::protobuf::RepeatedPtrField< ::io::deephaven::proto::backplane::grpc::FieldInfo >&
-      removed() const;
-  // @@protoc_insertion_point(class_scope:io.deephaven.proto.backplane.grpc.FieldsChangeUpdate)
- private:
-  class _Internal;
-
-  friend class ::google::protobuf::internal::TcParser;
-  static const ::google::protobuf::internal::TcParseTable<
-      2, 3, 3,
-      0, 2>
-      _table_;
-  friend class ::google::protobuf::MessageLite;
-  friend class ::google::protobuf::Arena;
-  template <typename T>
-  friend class ::google::protobuf::Arena::InternalHelper;
-  using InternalArenaConstructable_ = void;
-  using DestructorSkippable_ = void;
-  struct Impl_ {
-
-        inline explicit constexpr Impl_(
-            ::google::protobuf::internal::ConstantInitialized) noexcept;
-        inline explicit Impl_(::google::protobuf::internal::InternalVisibility visibility,
-                              ::google::protobuf::Arena* arena);
-        inline explicit Impl_(::google::protobuf::internal::InternalVisibility visibility,
-                              ::google::protobuf::Arena* arena, const Impl_& from);
-    ::google::protobuf::RepeatedPtrField< ::io::deephaven::proto::backplane::grpc::FieldInfo > created_;
-    ::google::protobuf::RepeatedPtrField< ::io::deephaven::proto::backplane::grpc::FieldInfo > updated_;
-    ::google::protobuf::RepeatedPtrField< ::io::deephaven::proto::backplane::grpc::FieldInfo > removed_;
-    mutable ::google::protobuf::internal::CachedSize _cached_size_;
-    PROTOBUF_TSAN_DECLARE_MEMBER
-  };
-  union { Impl_ _impl_; };
-  friend struct ::TableStruct_deephaven_2fproto_2fapplication_2eproto;
-};
-
-// ===================================================================
-
-
-
-
-// ===================================================================
-
-
-#ifdef __GNUC__
-#pragma GCC diagnostic push
-#pragma GCC diagnostic ignored "-Wstrict-aliasing"
-#endif  // __GNUC__
-// -------------------------------------------------------------------
-
-// ListFieldsRequest
-
-// -------------------------------------------------------------------
-
-// FieldsChangeUpdate
-
-// repeated .io.deephaven.proto.backplane.grpc.FieldInfo created = 1;
-inline int FieldsChangeUpdate::_internal_created_size() const {
-  return _internal_created().size();
-}
-inline int FieldsChangeUpdate::created_size() const {
-  return _internal_created_size();
-}
-inline void FieldsChangeUpdate::clear_created() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  _impl_.created_.Clear();
-}
-inline ::io::deephaven::proto::backplane::grpc::FieldInfo* FieldsChangeUpdate::mutable_created(int index)
-    ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  // @@protoc_insertion_point(field_mutable:io.deephaven.proto.backplane.grpc.FieldsChangeUpdate.created)
-  return _internal_mutable_created()->Mutable(index);
-}
-inline ::google::protobuf::RepeatedPtrField<::io::deephaven::proto::backplane::grpc::FieldInfo>* FieldsChangeUpdate::mutable_created()
-    ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  // @@protoc_insertion_point(field_mutable_list:io.deephaven.proto.backplane.grpc.FieldsChangeUpdate.created)
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  return _internal_mutable_created();
-}
-inline const ::io::deephaven::proto::backplane::grpc::FieldInfo& FieldsChangeUpdate::created(int index) const
-    ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  // @@protoc_insertion_point(field_get:io.deephaven.proto.backplane.grpc.FieldsChangeUpdate.created)
-  return _internal_created().Get(index);
-}
-inline ::io::deephaven::proto::backplane::grpc::FieldInfo* FieldsChangeUpdate::add_created() ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  ::io::deephaven::proto::backplane::grpc::FieldInfo* _add = _internal_mutable_created()->Add();
-  // @@protoc_insertion_point(field_add:io.deephaven.proto.backplane.grpc.FieldsChangeUpdate.created)
-  return _add;
-}
-inline const ::google::protobuf::RepeatedPtrField<::io::deephaven::proto::backplane::grpc::FieldInfo>& FieldsChangeUpdate::created() const
-    ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  // @@protoc_insertion_point(field_list:io.deephaven.proto.backplane.grpc.FieldsChangeUpdate.created)
-  return _internal_created();
-}
-inline const ::google::protobuf::RepeatedPtrField<::io::deephaven::proto::backplane::grpc::FieldInfo>&
-FieldsChangeUpdate::_internal_created() const {
-  PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race);
-  return _impl_.created_;
-}
-inline ::google::protobuf::RepeatedPtrField<::io::deephaven::proto::backplane::grpc::FieldInfo>*
-FieldsChangeUpdate::_internal_mutable_created() {
-  PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race);
-  return &_impl_.created_;
-}
-
-// repeated .io.deephaven.proto.backplane.grpc.FieldInfo updated = 2;
-inline int FieldsChangeUpdate::_internal_updated_size() const {
-  return _internal_updated().size();
-}
-inline int FieldsChangeUpdate::updated_size() const {
-  return _internal_updated_size();
-}
-inline void FieldsChangeUpdate::clear_updated() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  _impl_.updated_.Clear();
-}
-inline ::io::deephaven::proto::backplane::grpc::FieldInfo* FieldsChangeUpdate::mutable_updated(int index)
-    ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  // @@protoc_insertion_point(field_mutable:io.deephaven.proto.backplane.grpc.FieldsChangeUpdate.updated)
-  return _internal_mutable_updated()->Mutable(index);
-}
-inline ::google::protobuf::RepeatedPtrField<::io::deephaven::proto::backplane::grpc::FieldInfo>* FieldsChangeUpdate::mutable_updated()
-    ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  // @@protoc_insertion_point(field_mutable_list:io.deephaven.proto.backplane.grpc.FieldsChangeUpdate.updated)
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  return _internal_mutable_updated();
-}
-inline const ::io::deephaven::proto::backplane::grpc::FieldInfo& FieldsChangeUpdate::updated(int index) const
-    ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  // @@protoc_insertion_point(field_get:io.deephaven.proto.backplane.grpc.FieldsChangeUpdate.updated)
-  return _internal_updated().Get(index);
-}
-inline ::io::deephaven::proto::backplane::grpc::FieldInfo* FieldsChangeUpdate::add_updated() ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  ::io::deephaven::proto::backplane::grpc::FieldInfo* _add = _internal_mutable_updated()->Add();
-  // @@protoc_insertion_point(field_add:io.deephaven.proto.backplane.grpc.FieldsChangeUpdate.updated)
-  return _add;
-}
-inline const ::google::protobuf::RepeatedPtrField<::io::deephaven::proto::backplane::grpc::FieldInfo>& FieldsChangeUpdate::updated() const
-    ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  // @@protoc_insertion_point(field_list:io.deephaven.proto.backplane.grpc.FieldsChangeUpdate.updated)
-  return _internal_updated();
-}
-inline const ::google::protobuf::RepeatedPtrField<::io::deephaven::proto::backplane::grpc::FieldInfo>&
-FieldsChangeUpdate::_internal_updated() const {
-  PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race);
-  return _impl_.updated_;
-}
-inline ::google::protobuf::RepeatedPtrField<::io::deephaven::proto::backplane::grpc::FieldInfo>*
-FieldsChangeUpdate::_internal_mutable_updated() {
-  PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race);
-  return &_impl_.updated_;
-}
-
-// repeated .io.deephaven.proto.backplane.grpc.FieldInfo removed = 3;
-inline int FieldsChangeUpdate::_internal_removed_size() const {
-  return _internal_removed().size();
-}
-inline int FieldsChangeUpdate::removed_size() const {
-  return _internal_removed_size();
-}
-inline void FieldsChangeUpdate::clear_removed() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  _impl_.removed_.Clear();
-}
-inline ::io::deephaven::proto::backplane::grpc::FieldInfo* FieldsChangeUpdate::mutable_removed(int index)
-    ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  // @@protoc_insertion_point(field_mutable:io.deephaven.proto.backplane.grpc.FieldsChangeUpdate.removed)
-  return _internal_mutable_removed()->Mutable(index);
-}
-inline ::google::protobuf::RepeatedPtrField<::io::deephaven::proto::backplane::grpc::FieldInfo>* FieldsChangeUpdate::mutable_removed()
-    ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  // @@protoc_insertion_point(field_mutable_list:io.deephaven.proto.backplane.grpc.FieldsChangeUpdate.removed)
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  return _internal_mutable_removed();
-}
-inline const ::io::deephaven::proto::backplane::grpc::FieldInfo& FieldsChangeUpdate::removed(int index) const
-    ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  // @@protoc_insertion_point(field_get:io.deephaven.proto.backplane.grpc.FieldsChangeUpdate.removed)
-  return _internal_removed().Get(index);
-}
-inline ::io::deephaven::proto::backplane::grpc::FieldInfo* FieldsChangeUpdate::add_removed() ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  ::io::deephaven::proto::backplane::grpc::FieldInfo* _add = _internal_mutable_removed()->Add();
-  // @@protoc_insertion_point(field_add:io.deephaven.proto.backplane.grpc.FieldsChangeUpdate.removed)
-  return _add;
-}
-inline const ::google::protobuf::RepeatedPtrField<::io::deephaven::proto::backplane::grpc::FieldInfo>& FieldsChangeUpdate::removed() const
-    ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  // @@protoc_insertion_point(field_list:io.deephaven.proto.backplane.grpc.FieldsChangeUpdate.removed)
-  return _internal_removed();
-}
-inline const ::google::protobuf::RepeatedPtrField<::io::deephaven::proto::backplane::grpc::FieldInfo>&
-FieldsChangeUpdate::_internal_removed() const {
-  PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race);
-  return _impl_.removed_;
-}
-inline ::google::protobuf::RepeatedPtrField<::io::deephaven::proto::backplane::grpc::FieldInfo>*
-FieldsChangeUpdate::_internal_mutable_removed() {
-  PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race);
-  return &_impl_.removed_;
-}
-
-// -------------------------------------------------------------------
-
-// FieldInfo
-
-// .io.deephaven.proto.backplane.grpc.TypedTicket typed_ticket = 1;
-inline bool FieldInfo::has_typed_ticket() const {
-  bool value = (_impl_._has_bits_[0] & 0x00000001u) != 0;
-  PROTOBUF_ASSUME(!value || _impl_.typed_ticket_ != nullptr);
-  return value;
-}
-inline const ::io::deephaven::proto::backplane::grpc::TypedTicket& FieldInfo::_internal_typed_ticket() const {
-  PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race);
-  const ::io::deephaven::proto::backplane::grpc::TypedTicket* p = _impl_.typed_ticket_;
-  return p != nullptr ? *p : reinterpret_cast<const ::io::deephaven::proto::backplane::grpc::TypedTicket&>(::io::deephaven::proto::backplane::grpc::_TypedTicket_default_instance_);
-}
-inline const ::io::deephaven::proto::backplane::grpc::TypedTicket& FieldInfo::typed_ticket() const ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  // @@protoc_insertion_point(field_get:io.deephaven.proto.backplane.grpc.FieldInfo.typed_ticket)
-  return _internal_typed_ticket();
-}
-inline void FieldInfo::unsafe_arena_set_allocated_typed_ticket(::io::deephaven::proto::backplane::grpc::TypedTicket* value) {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  if (GetArena() == nullptr) {
-    delete reinterpret_cast<::google::protobuf::MessageLite*>(_impl_.typed_ticket_);
-  }
-  _impl_.typed_ticket_ = reinterpret_cast<::io::deephaven::proto::backplane::grpc::TypedTicket*>(value);
-  if (value != nullptr) {
-    _impl_._has_bits_[0] |= 0x00000001u;
-  } else {
-    _impl_._has_bits_[0] &= ~0x00000001u;
-  }
-  // @@protoc_insertion_point(field_unsafe_arena_set_allocated:io.deephaven.proto.backplane.grpc.FieldInfo.typed_ticket)
-}
-inline ::io::deephaven::proto::backplane::grpc::TypedTicket* FieldInfo::release_typed_ticket() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-
-  _impl_._has_bits_[0] &= ~0x00000001u;
-  ::io::deephaven::proto::backplane::grpc::TypedTicket* released = _impl_.typed_ticket_;
-  _impl_.typed_ticket_ = nullptr;
-#ifdef PROTOBUF_FORCE_COPY_IN_RELEASE
-  auto* old = reinterpret_cast<::google::protobuf::MessageLite*>(released);
-  released = ::google::protobuf::internal::DuplicateIfNonNull(released);
-  if (GetArena() == nullptr) {
-    delete old;
-  }
-#else   // PROTOBUF_FORCE_COPY_IN_RELEASE
-  if (GetArena() != nullptr) {
-    released = ::google::protobuf::internal::DuplicateIfNonNull(released);
-  }
-#endif  // !PROTOBUF_FORCE_COPY_IN_RELEASE
-  return released;
-}
-inline ::io::deephaven::proto::backplane::grpc::TypedTicket* FieldInfo::unsafe_arena_release_typed_ticket() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  // @@protoc_insertion_point(field_release:io.deephaven.proto.backplane.grpc.FieldInfo.typed_ticket)
-
-  _impl_._has_bits_[0] &= ~0x00000001u;
-  ::io::deephaven::proto::backplane::grpc::TypedTicket* temp = _impl_.typed_ticket_;
-  _impl_.typed_ticket_ = nullptr;
-  return temp;
-}
-inline ::io::deephaven::proto::backplane::grpc::TypedTicket* FieldInfo::_internal_mutable_typed_ticket() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  _impl_._has_bits_[0] |= 0x00000001u;
-  if (_impl_.typed_ticket_ == nullptr) {
-    auto* p = CreateMaybeMessage<::io::deephaven::proto::backplane::grpc::TypedTicket>(GetArena());
-    _impl_.typed_ticket_ = reinterpret_cast<::io::deephaven::proto::backplane::grpc::TypedTicket*>(p);
-  }
-  return _impl_.typed_ticket_;
-}
-inline ::io::deephaven::proto::backplane::grpc::TypedTicket* FieldInfo::mutable_typed_ticket() ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  ::io::deephaven::proto::backplane::grpc::TypedTicket* _msg = _internal_mutable_typed_ticket();
-  // @@protoc_insertion_point(field_mutable:io.deephaven.proto.backplane.grpc.FieldInfo.typed_ticket)
-  return _msg;
-}
-inline void FieldInfo::set_allocated_typed_ticket(::io::deephaven::proto::backplane::grpc::TypedTicket* value) {
-  ::google::protobuf::Arena* message_arena = GetArena();
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  if (message_arena == nullptr) {
-    delete reinterpret_cast<::google::protobuf::MessageLite*>(_impl_.typed_ticket_);
-  }
-
-  if (value != nullptr) {
-    ::google::protobuf::Arena* submessage_arena = reinterpret_cast<::google::protobuf::MessageLite*>(value)->GetArena();
-    if (message_arena != submessage_arena) {
-      value = ::google::protobuf::internal::GetOwnedMessage(message_arena, value, submessage_arena);
-    }
-    _impl_._has_bits_[0] |= 0x00000001u;
-  } else {
-    _impl_._has_bits_[0] &= ~0x00000001u;
-  }
-
-  _impl_.typed_ticket_ = reinterpret_cast<::io::deephaven::proto::backplane::grpc::TypedTicket*>(value);
-  // @@protoc_insertion_point(field_set_allocated:io.deephaven.proto.backplane.grpc.FieldInfo.typed_ticket)
-}
-
-// string field_name = 2;
-inline void FieldInfo::clear_field_name() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  _impl_.field_name_.ClearToEmpty();
-}
-inline const std::string& FieldInfo::field_name() const
-    ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  // @@protoc_insertion_point(field_get:io.deephaven.proto.backplane.grpc.FieldInfo.field_name)
-  return _internal_field_name();
-}
-template <typename Arg_, typename... Args_>
-inline PROTOBUF_ALWAYS_INLINE void FieldInfo::set_field_name(Arg_&& arg,
-                                                     Args_... args) {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  ;
-  _impl_.field_name_.Set(static_cast<Arg_&&>(arg), args..., GetArena());
-  // @@protoc_insertion_point(field_set:io.deephaven.proto.backplane.grpc.FieldInfo.field_name)
-}
-inline std::string* FieldInfo::mutable_field_name() ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  std::string* _s = _internal_mutable_field_name();
-  // @@protoc_insertion_point(field_mutable:io.deephaven.proto.backplane.grpc.FieldInfo.field_name)
-  return _s;
-}
-inline const std::string& FieldInfo::_internal_field_name() const {
-  PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race);
-  return _impl_.field_name_.Get();
-}
-inline void FieldInfo::_internal_set_field_name(const std::string& value) {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  ;
-  _impl_.field_name_.Set(value, GetArena());
-}
-inline std::string* FieldInfo::_internal_mutable_field_name() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  ;
-  return _impl_.field_name_.Mutable( GetArena());
-}
-inline std::string* FieldInfo::release_field_name() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  // @@protoc_insertion_point(field_release:io.deephaven.proto.backplane.grpc.FieldInfo.field_name)
-  return _impl_.field_name_.Release();
-}
-inline void FieldInfo::set_allocated_field_name(std::string* value) {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  _impl_.field_name_.SetAllocated(value, GetArena());
-  #ifdef PROTOBUF_FORCE_COPY_DEFAULT_STRING
-        if (_impl_.field_name_.IsDefault()) {
-          _impl_.field_name_.Set("", GetArena());
-        }
-  #endif  // PROTOBUF_FORCE_COPY_DEFAULT_STRING
-  // @@protoc_insertion_point(field_set_allocated:io.deephaven.proto.backplane.grpc.FieldInfo.field_name)
-}
-
-// string field_description = 3;
-inline void FieldInfo::clear_field_description() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  _impl_.field_description_.ClearToEmpty();
-}
-inline const std::string& FieldInfo::field_description() const
-    ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  // @@protoc_insertion_point(field_get:io.deephaven.proto.backplane.grpc.FieldInfo.field_description)
-  return _internal_field_description();
-}
-template <typename Arg_, typename... Args_>
-inline PROTOBUF_ALWAYS_INLINE void FieldInfo::set_field_description(Arg_&& arg,
-                                                     Args_... args) {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  ;
-  _impl_.field_description_.Set(static_cast<Arg_&&>(arg), args..., GetArena());
-  // @@protoc_insertion_point(field_set:io.deephaven.proto.backplane.grpc.FieldInfo.field_description)
-}
-inline std::string* FieldInfo::mutable_field_description() ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  std::string* _s = _internal_mutable_field_description();
-  // @@protoc_insertion_point(field_mutable:io.deephaven.proto.backplane.grpc.FieldInfo.field_description)
-  return _s;
-}
-inline const std::string& FieldInfo::_internal_field_description() const {
-  PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race);
-  return _impl_.field_description_.Get();
-}
-inline void FieldInfo::_internal_set_field_description(const std::string& value) {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  ;
-  _impl_.field_description_.Set(value, GetArena());
-}
-inline std::string* FieldInfo::_internal_mutable_field_description() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  ;
-  return _impl_.field_description_.Mutable( GetArena());
-}
-inline std::string* FieldInfo::release_field_description() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  // @@protoc_insertion_point(field_release:io.deephaven.proto.backplane.grpc.FieldInfo.field_description)
-  return _impl_.field_description_.Release();
-}
-inline void FieldInfo::set_allocated_field_description(std::string* value) {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  _impl_.field_description_.SetAllocated(value, GetArena());
-  #ifdef PROTOBUF_FORCE_COPY_DEFAULT_STRING
-        if (_impl_.field_description_.IsDefault()) {
-          _impl_.field_description_.Set("", GetArena());
-        }
-  #endif  // PROTOBUF_FORCE_COPY_DEFAULT_STRING
-  // @@protoc_insertion_point(field_set_allocated:io.deephaven.proto.backplane.grpc.FieldInfo.field_description)
-}
-
-// string application_name = 4;
-inline void FieldInfo::clear_application_name() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  _impl_.application_name_.ClearToEmpty();
-}
-inline const std::string& FieldInfo::application_name() const
-    ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  // @@protoc_insertion_point(field_get:io.deephaven.proto.backplane.grpc.FieldInfo.application_name)
-  return _internal_application_name();
-}
-template <typename Arg_, typename... Args_>
-inline PROTOBUF_ALWAYS_INLINE void FieldInfo::set_application_name(Arg_&& arg,
-                                                     Args_... args) {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  ;
-  _impl_.application_name_.Set(static_cast<Arg_&&>(arg), args..., GetArena());
-  // @@protoc_insertion_point(field_set:io.deephaven.proto.backplane.grpc.FieldInfo.application_name)
-}
-inline std::string* FieldInfo::mutable_application_name() ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  std::string* _s = _internal_mutable_application_name();
-  // @@protoc_insertion_point(field_mutable:io.deephaven.proto.backplane.grpc.FieldInfo.application_name)
-  return _s;
-}
-inline const std::string& FieldInfo::_internal_application_name() const {
-  PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race);
-  return _impl_.application_name_.Get();
-}
-inline void FieldInfo::_internal_set_application_name(const std::string& value) {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  ;
-  _impl_.application_name_.Set(value, GetArena());
-}
-inline std::string* FieldInfo::_internal_mutable_application_name() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  ;
-  return _impl_.application_name_.Mutable( GetArena());
-}
-inline std::string* FieldInfo::release_application_name() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  // @@protoc_insertion_point(field_release:io.deephaven.proto.backplane.grpc.FieldInfo.application_name)
-  return _impl_.application_name_.Release();
-}
-inline void FieldInfo::set_allocated_application_name(std::string* value) {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  _impl_.application_name_.SetAllocated(value, GetArena());
-  #ifdef PROTOBUF_FORCE_COPY_DEFAULT_STRING
-        if (_impl_.application_name_.IsDefault()) {
-          _impl_.application_name_.Set("", GetArena());
-        }
-  #endif  // PROTOBUF_FORCE_COPY_DEFAULT_STRING
-  // @@protoc_insertion_point(field_set_allocated:io.deephaven.proto.backplane.grpc.FieldInfo.application_name)
-}
-
-// string application_id = 5;
-inline void FieldInfo::clear_application_id() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  _impl_.application_id_.ClearToEmpty();
-}
-inline const std::string& FieldInfo::application_id() const
-    ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  // @@protoc_insertion_point(field_get:io.deephaven.proto.backplane.grpc.FieldInfo.application_id)
-  return _internal_application_id();
-}
-template <typename Arg_, typename... Args_>
-inline PROTOBUF_ALWAYS_INLINE void FieldInfo::set_application_id(Arg_&& arg,
-                                                     Args_... args) {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  ;
-  _impl_.application_id_.Set(static_cast<Arg_&&>(arg), args..., GetArena());
-  // @@protoc_insertion_point(field_set:io.deephaven.proto.backplane.grpc.FieldInfo.application_id)
-}
-inline std::string* FieldInfo::mutable_application_id() ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  std::string* _s = _internal_mutable_application_id();
-  // @@protoc_insertion_point(field_mutable:io.deephaven.proto.backplane.grpc.FieldInfo.application_id)
-  return _s;
-}
-inline const std::string& FieldInfo::_internal_application_id() const {
-  PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race);
-  return _impl_.application_id_.Get();
-}
-inline void FieldInfo::_internal_set_application_id(const std::string& value) {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  ;
-  _impl_.application_id_.Set(value, GetArena());
-}
-inline std::string* FieldInfo::_internal_mutable_application_id() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  ;
-  return _impl_.application_id_.Mutable( GetArena());
-}
-inline std::string* FieldInfo::release_application_id() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  // @@protoc_insertion_point(field_release:io.deephaven.proto.backplane.grpc.FieldInfo.application_id)
-  return _impl_.application_id_.Release();
-}
-inline void FieldInfo::set_allocated_application_id(std::string* value) {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  _impl_.application_id_.SetAllocated(value, GetArena());
-  #ifdef PROTOBUF_FORCE_COPY_DEFAULT_STRING
-        if (_impl_.application_id_.IsDefault()) {
-          _impl_.application_id_.Set("", GetArena());
-        }
-  #endif  // PROTOBUF_FORCE_COPY_DEFAULT_STRING
-  // @@protoc_insertion_point(field_set_allocated:io.deephaven.proto.backplane.grpc.FieldInfo.application_id)
-}
-
-#ifdef __GNUC__
-#pragma GCC diagnostic pop
-#endif  // __GNUC__
-
-// @@protoc_insertion_point(namespace_scope)
-}  // namespace grpc
-}  // namespace backplane
-}  // namespace proto
-}  // namespace deephaven
-}  // namespace io
-
-
-// @@protoc_insertion_point(global_scope)
-
-#include "google/protobuf/port_undef.inc"
-
-#endif  // GOOGLE_PROTOBUF_INCLUDED_deephaven_2fproto_2fapplication_2eproto_2epb_2eh
diff --git a/cpp-client/deephaven/dhclient/proto/deephaven/proto/config.grpc.pb.cc b/cpp-client/deephaven/dhclient/proto/deephaven/proto/config.grpc.pb.cc
deleted file mode 100644
index 80463846dd0..00000000000
--- a/cpp-client/deephaven/dhclient/proto/deephaven/proto/config.grpc.pb.cc
+++ /dev/null
@@ -1,136 +0,0 @@
-// Generated by the gRPC C++ plugin.
-// If you make any local change, they will be lost.
-// source: deephaven/proto/config.proto
-
-#include "deephaven/proto/config.pb.h"
-#include "deephaven/proto/config.grpc.pb.h"
-
-#include <functional>
-#include <grpcpp/support/async_stream.h>
-#include <grpcpp/support/async_unary_call.h>
-#include <grpcpp/impl/channel_interface.h>
-#include <grpcpp/impl/client_unary_call.h>
-#include <grpcpp/support/client_callback.h>
-#include <grpcpp/support/message_allocator.h>
-#include <grpcpp/support/method_handler.h>
-#include <grpcpp/impl/rpc_service_method.h>
-#include <grpcpp/support/server_callback.h>
-#include <grpcpp/impl/server_callback_handlers.h>
-#include <grpcpp/server_context.h>
-#include <grpcpp/impl/service_type.h>
-#include <grpcpp/support/sync_stream.h>
-namespace io {
-namespace deephaven {
-namespace proto {
-namespace backplane {
-namespace grpc {
-
-static const char* ConfigService_method_names[] = {
-  "/io.deephaven.proto.backplane.grpc.ConfigService/GetAuthenticationConstants",
-  "/io.deephaven.proto.backplane.grpc.ConfigService/GetConfigurationConstants",
-};
-
-std::unique_ptr< ConfigService::Stub> ConfigService::NewStub(const std::shared_ptr< ::grpc::ChannelInterface>& channel, const ::grpc::StubOptions& options) {
-  (void)options;
-  std::unique_ptr< ConfigService::Stub> stub(new ConfigService::Stub(channel, options));
-  return stub;
-}
-
-ConfigService::Stub::Stub(const std::shared_ptr< ::grpc::ChannelInterface>& channel, const ::grpc::StubOptions& options)
-  : channel_(channel), rpcmethod_GetAuthenticationConstants_(ConfigService_method_names[0], options.suffix_for_stats(),::grpc::internal::RpcMethod::NORMAL_RPC, channel)
-  , rpcmethod_GetConfigurationConstants_(ConfigService_method_names[1], options.suffix_for_stats(),::grpc::internal::RpcMethod::NORMAL_RPC, channel)
-  {}
-
-::grpc::Status ConfigService::Stub::GetAuthenticationConstants(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::AuthenticationConstantsRequest& request, ::io::deephaven::proto::backplane::grpc::AuthenticationConstantsResponse* response) {
-  return ::grpc::internal::BlockingUnaryCall< ::io::deephaven::proto::backplane::grpc::AuthenticationConstantsRequest, ::io::deephaven::proto::backplane::grpc::AuthenticationConstantsResponse, ::grpc::protobuf::MessageLite, ::grpc::protobuf::MessageLite>(channel_.get(), rpcmethod_GetAuthenticationConstants_, context, request, response);
-}
-
-void ConfigService::Stub::async::GetAuthenticationConstants(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::AuthenticationConstantsRequest* request, ::io::deephaven::proto::backplane::grpc::AuthenticationConstantsResponse* response, std::function<void(::grpc::Status)> f) {
-  ::grpc::internal::CallbackUnaryCall< ::io::deephaven::proto::backplane::grpc::AuthenticationConstantsRequest, ::io::deephaven::proto::backplane::grpc::AuthenticationConstantsResponse, ::grpc::protobuf::MessageLite, ::grpc::protobuf::MessageLite>(stub_->channel_.get(), stub_->rpcmethod_GetAuthenticationConstants_, context, request, response, std::move(f));
-}
-
-void ConfigService::Stub::async::GetAuthenticationConstants(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::AuthenticationConstantsRequest* request, ::io::deephaven::proto::backplane::grpc::AuthenticationConstantsResponse* response, ::grpc::ClientUnaryReactor* reactor) {
-  ::grpc::internal::ClientCallbackUnaryFactory::Create< ::grpc::protobuf::MessageLite, ::grpc::protobuf::MessageLite>(stub_->channel_.get(), stub_->rpcmethod_GetAuthenticationConstants_, context, request, response, reactor);
-}
-
-::grpc::ClientAsyncResponseReader< ::io::deephaven::proto::backplane::grpc::AuthenticationConstantsResponse>* ConfigService::Stub::PrepareAsyncGetAuthenticationConstantsRaw(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::AuthenticationConstantsRequest& request, ::grpc::CompletionQueue* cq) {
-  return ::grpc::internal::ClientAsyncResponseReaderHelper::Create< ::io::deephaven::proto::backplane::grpc::AuthenticationConstantsResponse, ::io::deephaven::proto::backplane::grpc::AuthenticationConstantsRequest, ::grpc::protobuf::MessageLite, ::grpc::protobuf::MessageLite>(channel_.get(), cq, rpcmethod_GetAuthenticationConstants_, context, request);
-}
-
-::grpc::ClientAsyncResponseReader< ::io::deephaven::proto::backplane::grpc::AuthenticationConstantsResponse>* ConfigService::Stub::AsyncGetAuthenticationConstantsRaw(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::AuthenticationConstantsRequest& request, ::grpc::CompletionQueue* cq) {
-  auto* result =
-    this->PrepareAsyncGetAuthenticationConstantsRaw(context, request, cq);
-  result->StartCall();
-  return result;
-}
-
-::grpc::Status ConfigService::Stub::GetConfigurationConstants(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::ConfigurationConstantsRequest& request, ::io::deephaven::proto::backplane::grpc::ConfigurationConstantsResponse* response) {
-  return ::grpc::internal::BlockingUnaryCall< ::io::deephaven::proto::backplane::grpc::ConfigurationConstantsRequest, ::io::deephaven::proto::backplane::grpc::ConfigurationConstantsResponse, ::grpc::protobuf::MessageLite, ::grpc::protobuf::MessageLite>(channel_.get(), rpcmethod_GetConfigurationConstants_, context, request, response);
-}
-
-void ConfigService::Stub::async::GetConfigurationConstants(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::ConfigurationConstantsRequest* request, ::io::deephaven::proto::backplane::grpc::ConfigurationConstantsResponse* response, std::function<void(::grpc::Status)> f) {
-  ::grpc::internal::CallbackUnaryCall< ::io::deephaven::proto::backplane::grpc::ConfigurationConstantsRequest, ::io::deephaven::proto::backplane::grpc::ConfigurationConstantsResponse, ::grpc::protobuf::MessageLite, ::grpc::protobuf::MessageLite>(stub_->channel_.get(), stub_->rpcmethod_GetConfigurationConstants_, context, request, response, std::move(f));
-}
-
-void ConfigService::Stub::async::GetConfigurationConstants(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::ConfigurationConstantsRequest* request, ::io::deephaven::proto::backplane::grpc::ConfigurationConstantsResponse* response, ::grpc::ClientUnaryReactor* reactor) {
-  ::grpc::internal::ClientCallbackUnaryFactory::Create< ::grpc::protobuf::MessageLite, ::grpc::protobuf::MessageLite>(stub_->channel_.get(), stub_->rpcmethod_GetConfigurationConstants_, context, request, response, reactor);
-}
-
-::grpc::ClientAsyncResponseReader< ::io::deephaven::proto::backplane::grpc::ConfigurationConstantsResponse>* ConfigService::Stub::PrepareAsyncGetConfigurationConstantsRaw(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::ConfigurationConstantsRequest& request, ::grpc::CompletionQueue* cq) {
-  return ::grpc::internal::ClientAsyncResponseReaderHelper::Create< ::io::deephaven::proto::backplane::grpc::ConfigurationConstantsResponse, ::io::deephaven::proto::backplane::grpc::ConfigurationConstantsRequest, ::grpc::protobuf::MessageLite, ::grpc::protobuf::MessageLite>(channel_.get(), cq, rpcmethod_GetConfigurationConstants_, context, request);
-}
-
-::grpc::ClientAsyncResponseReader< ::io::deephaven::proto::backplane::grpc::ConfigurationConstantsResponse>* ConfigService::Stub::AsyncGetConfigurationConstantsRaw(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::ConfigurationConstantsRequest& request, ::grpc::CompletionQueue* cq) {
-  auto* result =
-    this->PrepareAsyncGetConfigurationConstantsRaw(context, request, cq);
-  result->StartCall();
-  return result;
-}
-
-ConfigService::Service::Service() {
-  AddMethod(new ::grpc::internal::RpcServiceMethod(
-      ConfigService_method_names[0],
-      ::grpc::internal::RpcMethod::NORMAL_RPC,
-      new ::grpc::internal::RpcMethodHandler< ConfigService::Service, ::io::deephaven::proto::backplane::grpc::AuthenticationConstantsRequest, ::io::deephaven::proto::backplane::grpc::AuthenticationConstantsResponse, ::grpc::protobuf::MessageLite, ::grpc::protobuf::MessageLite>(
-          [](ConfigService::Service* service,
-             ::grpc::ServerContext* ctx,
-             const ::io::deephaven::proto::backplane::grpc::AuthenticationConstantsRequest* req,
-             ::io::deephaven::proto::backplane::grpc::AuthenticationConstantsResponse* resp) {
-               return service->GetAuthenticationConstants(ctx, req, resp);
-             }, this)));
-  AddMethod(new ::grpc::internal::RpcServiceMethod(
-      ConfigService_method_names[1],
-      ::grpc::internal::RpcMethod::NORMAL_RPC,
-      new ::grpc::internal::RpcMethodHandler< ConfigService::Service, ::io::deephaven::proto::backplane::grpc::ConfigurationConstantsRequest, ::io::deephaven::proto::backplane::grpc::ConfigurationConstantsResponse, ::grpc::protobuf::MessageLite, ::grpc::protobuf::MessageLite>(
-          [](ConfigService::Service* service,
-             ::grpc::ServerContext* ctx,
-             const ::io::deephaven::proto::backplane::grpc::ConfigurationConstantsRequest* req,
-             ::io::deephaven::proto::backplane::grpc::ConfigurationConstantsResponse* resp) {
-               return service->GetConfigurationConstants(ctx, req, resp);
-             }, this)));
-}
-
-ConfigService::Service::~Service() {
-}
-
-::grpc::Status ConfigService::Service::GetAuthenticationConstants(::grpc::ServerContext* context, const ::io::deephaven::proto::backplane::grpc::AuthenticationConstantsRequest* request, ::io::deephaven::proto::backplane::grpc::AuthenticationConstantsResponse* response) {
-  (void) context;
-  (void) request;
-  (void) response;
-  return ::grpc::Status(::grpc::StatusCode::UNIMPLEMENTED, "");
-}
-
-::grpc::Status ConfigService::Service::GetConfigurationConstants(::grpc::ServerContext* context, const ::io::deephaven::proto::backplane::grpc::ConfigurationConstantsRequest* request, ::io::deephaven::proto::backplane::grpc::ConfigurationConstantsResponse* response) {
-  (void) context;
-  (void) request;
-  (void) response;
-  return ::grpc::Status(::grpc::StatusCode::UNIMPLEMENTED, "");
-}
-
-
-}  // namespace io
-}  // namespace deephaven
-}  // namespace proto
-}  // namespace backplane
-}  // namespace grpc
-
diff --git a/cpp-client/deephaven/dhclient/proto/deephaven/proto/config.grpc.pb.h b/cpp-client/deephaven/dhclient/proto/deephaven/proto/config.grpc.pb.h
deleted file mode 100644
index 9214e8c8333..00000000000
--- a/cpp-client/deephaven/dhclient/proto/deephaven/proto/config.grpc.pb.h
+++ /dev/null
@@ -1,412 +0,0 @@
-// Generated by the gRPC C++ plugin.
-// If you make any local change, they will be lost.
-// source: deephaven/proto/config.proto
-// Original file comments:
-//
-// Copyright (c) 2016-2022 Deephaven Data Labs and Patent Pending
-#ifndef GRPC_deephaven_2fproto_2fconfig_2eproto__INCLUDED
-#define GRPC_deephaven_2fproto_2fconfig_2eproto__INCLUDED
-
-#include "deephaven/proto/config.pb.h"
-
-#include <functional>
-#include <grpcpp/generic/async_generic_service.h>
-#include <grpcpp/support/async_stream.h>
-#include <grpcpp/support/async_unary_call.h>
-#include <grpcpp/support/client_callback.h>
-#include <grpcpp/client_context.h>
-#include <grpcpp/completion_queue.h>
-#include <grpcpp/support/message_allocator.h>
-#include <grpcpp/support/method_handler.h>
-#include <grpcpp/impl/proto_utils.h>
-#include <grpcpp/impl/rpc_method.h>
-#include <grpcpp/support/server_callback.h>
-#include <grpcpp/impl/server_callback_handlers.h>
-#include <grpcpp/server_context.h>
-#include <grpcpp/impl/service_type.h>
-#include <grpcpp/support/status.h>
-#include <grpcpp/support/stub_options.h>
-#include <grpcpp/support/sync_stream.h>
-
-namespace io {
-namespace deephaven {
-namespace proto {
-namespace backplane {
-namespace grpc {
-
-// *
-// Provides simple configuration data to users. Unauthenticated users may call GetAuthenticationConstants
-// to discover hints on how they should proceed with providing their identity, while already-authenticated
-// clients may call GetConfigurationConstants for details on using the platform.
-class ConfigService final {
- public:
-  static constexpr char const* service_full_name() {
-    return "io.deephaven.proto.backplane.grpc.ConfigService";
-  }
-  class StubInterface {
-   public:
-    virtual ~StubInterface() {}
-    virtual ::grpc::Status GetAuthenticationConstants(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::AuthenticationConstantsRequest& request, ::io::deephaven::proto::backplane::grpc::AuthenticationConstantsResponse* response) = 0;
-    std::unique_ptr< ::grpc::ClientAsyncResponseReaderInterface< ::io::deephaven::proto::backplane::grpc::AuthenticationConstantsResponse>> AsyncGetAuthenticationConstants(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::AuthenticationConstantsRequest& request, ::grpc::CompletionQueue* cq) {
-      return std::unique_ptr< ::grpc::ClientAsyncResponseReaderInterface< ::io::deephaven::proto::backplane::grpc::AuthenticationConstantsResponse>>(AsyncGetAuthenticationConstantsRaw(context, request, cq));
-    }
-    std::unique_ptr< ::grpc::ClientAsyncResponseReaderInterface< ::io::deephaven::proto::backplane::grpc::AuthenticationConstantsResponse>> PrepareAsyncGetAuthenticationConstants(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::AuthenticationConstantsRequest& request, ::grpc::CompletionQueue* cq) {
-      return std::unique_ptr< ::grpc::ClientAsyncResponseReaderInterface< ::io::deephaven::proto::backplane::grpc::AuthenticationConstantsResponse>>(PrepareAsyncGetAuthenticationConstantsRaw(context, request, cq));
-    }
-    virtual ::grpc::Status GetConfigurationConstants(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::ConfigurationConstantsRequest& request, ::io::deephaven::proto::backplane::grpc::ConfigurationConstantsResponse* response) = 0;
-    std::unique_ptr< ::grpc::ClientAsyncResponseReaderInterface< ::io::deephaven::proto::backplane::grpc::ConfigurationConstantsResponse>> AsyncGetConfigurationConstants(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::ConfigurationConstantsRequest& request, ::grpc::CompletionQueue* cq) {
-      return std::unique_ptr< ::grpc::ClientAsyncResponseReaderInterface< ::io::deephaven::proto::backplane::grpc::ConfigurationConstantsResponse>>(AsyncGetConfigurationConstantsRaw(context, request, cq));
-    }
-    std::unique_ptr< ::grpc::ClientAsyncResponseReaderInterface< ::io::deephaven::proto::backplane::grpc::ConfigurationConstantsResponse>> PrepareAsyncGetConfigurationConstants(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::ConfigurationConstantsRequest& request, ::grpc::CompletionQueue* cq) {
-      return std::unique_ptr< ::grpc::ClientAsyncResponseReaderInterface< ::io::deephaven::proto::backplane::grpc::ConfigurationConstantsResponse>>(PrepareAsyncGetConfigurationConstantsRaw(context, request, cq));
-    }
-    class async_interface {
-     public:
-      virtual ~async_interface() {}
-      virtual void GetAuthenticationConstants(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::AuthenticationConstantsRequest* request, ::io::deephaven::proto::backplane::grpc::AuthenticationConstantsResponse* response, std::function<void(::grpc::Status)>) = 0;
-      virtual void GetAuthenticationConstants(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::AuthenticationConstantsRequest* request, ::io::deephaven::proto::backplane::grpc::AuthenticationConstantsResponse* response, ::grpc::ClientUnaryReactor* reactor) = 0;
-      virtual void GetConfigurationConstants(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::ConfigurationConstantsRequest* request, ::io::deephaven::proto::backplane::grpc::ConfigurationConstantsResponse* response, std::function<void(::grpc::Status)>) = 0;
-      virtual void GetConfigurationConstants(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::ConfigurationConstantsRequest* request, ::io::deephaven::proto::backplane::grpc::ConfigurationConstantsResponse* response, ::grpc::ClientUnaryReactor* reactor) = 0;
-    };
-    typedef class async_interface experimental_async_interface;
-    virtual class async_interface* async() { return nullptr; }
-    class async_interface* experimental_async() { return async(); }
-   private:
-    virtual ::grpc::ClientAsyncResponseReaderInterface< ::io::deephaven::proto::backplane::grpc::AuthenticationConstantsResponse>* AsyncGetAuthenticationConstantsRaw(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::AuthenticationConstantsRequest& request, ::grpc::CompletionQueue* cq) = 0;
-    virtual ::grpc::ClientAsyncResponseReaderInterface< ::io::deephaven::proto::backplane::grpc::AuthenticationConstantsResponse>* PrepareAsyncGetAuthenticationConstantsRaw(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::AuthenticationConstantsRequest& request, ::grpc::CompletionQueue* cq) = 0;
-    virtual ::grpc::ClientAsyncResponseReaderInterface< ::io::deephaven::proto::backplane::grpc::ConfigurationConstantsResponse>* AsyncGetConfigurationConstantsRaw(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::ConfigurationConstantsRequest& request, ::grpc::CompletionQueue* cq) = 0;
-    virtual ::grpc::ClientAsyncResponseReaderInterface< ::io::deephaven::proto::backplane::grpc::ConfigurationConstantsResponse>* PrepareAsyncGetConfigurationConstantsRaw(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::ConfigurationConstantsRequest& request, ::grpc::CompletionQueue* cq) = 0;
-  };
-  class Stub final : public StubInterface {
-   public:
-    Stub(const std::shared_ptr< ::grpc::ChannelInterface>& channel, const ::grpc::StubOptions& options = ::grpc::StubOptions());
-    ::grpc::Status GetAuthenticationConstants(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::AuthenticationConstantsRequest& request, ::io::deephaven::proto::backplane::grpc::AuthenticationConstantsResponse* response) override;
-    std::unique_ptr< ::grpc::ClientAsyncResponseReader< ::io::deephaven::proto::backplane::grpc::AuthenticationConstantsResponse>> AsyncGetAuthenticationConstants(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::AuthenticationConstantsRequest& request, ::grpc::CompletionQueue* cq) {
-      return std::unique_ptr< ::grpc::ClientAsyncResponseReader< ::io::deephaven::proto::backplane::grpc::AuthenticationConstantsResponse>>(AsyncGetAuthenticationConstantsRaw(context, request, cq));
-    }
-    std::unique_ptr< ::grpc::ClientAsyncResponseReader< ::io::deephaven::proto::backplane::grpc::AuthenticationConstantsResponse>> PrepareAsyncGetAuthenticationConstants(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::AuthenticationConstantsRequest& request, ::grpc::CompletionQueue* cq) {
-      return std::unique_ptr< ::grpc::ClientAsyncResponseReader< ::io::deephaven::proto::backplane::grpc::AuthenticationConstantsResponse>>(PrepareAsyncGetAuthenticationConstantsRaw(context, request, cq));
-    }
-    ::grpc::Status GetConfigurationConstants(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::ConfigurationConstantsRequest& request, ::io::deephaven::proto::backplane::grpc::ConfigurationConstantsResponse* response) override;
-    std::unique_ptr< ::grpc::ClientAsyncResponseReader< ::io::deephaven::proto::backplane::grpc::ConfigurationConstantsResponse>> AsyncGetConfigurationConstants(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::ConfigurationConstantsRequest& request, ::grpc::CompletionQueue* cq) {
-      return std::unique_ptr< ::grpc::ClientAsyncResponseReader< ::io::deephaven::proto::backplane::grpc::ConfigurationConstantsResponse>>(AsyncGetConfigurationConstantsRaw(context, request, cq));
-    }
-    std::unique_ptr< ::grpc::ClientAsyncResponseReader< ::io::deephaven::proto::backplane::grpc::ConfigurationConstantsResponse>> PrepareAsyncGetConfigurationConstants(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::ConfigurationConstantsRequest& request, ::grpc::CompletionQueue* cq) {
-      return std::unique_ptr< ::grpc::ClientAsyncResponseReader< ::io::deephaven::proto::backplane::grpc::ConfigurationConstantsResponse>>(PrepareAsyncGetConfigurationConstantsRaw(context, request, cq));
-    }
-    class async final :
-      public StubInterface::async_interface {
-     public:
-      void GetAuthenticationConstants(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::AuthenticationConstantsRequest* request, ::io::deephaven::proto::backplane::grpc::AuthenticationConstantsResponse* response, std::function<void(::grpc::Status)>) override;
-      void GetAuthenticationConstants(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::AuthenticationConstantsRequest* request, ::io::deephaven::proto::backplane::grpc::AuthenticationConstantsResponse* response, ::grpc::ClientUnaryReactor* reactor) override;
-      void GetConfigurationConstants(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::ConfigurationConstantsRequest* request, ::io::deephaven::proto::backplane::grpc::ConfigurationConstantsResponse* response, std::function<void(::grpc::Status)>) override;
-      void GetConfigurationConstants(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::ConfigurationConstantsRequest* request, ::io::deephaven::proto::backplane::grpc::ConfigurationConstantsResponse* response, ::grpc::ClientUnaryReactor* reactor) override;
-     private:
-      friend class Stub;
-      explicit async(Stub* stub): stub_(stub) { }
-      Stub* stub() { return stub_; }
-      Stub* stub_;
-    };
-    class async* async() override { return &async_stub_; }
-
-   private:
-    std::shared_ptr< ::grpc::ChannelInterface> channel_;
-    class async async_stub_{this};
-    ::grpc::ClientAsyncResponseReader< ::io::deephaven::proto::backplane::grpc::AuthenticationConstantsResponse>* AsyncGetAuthenticationConstantsRaw(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::AuthenticationConstantsRequest& request, ::grpc::CompletionQueue* cq) override;
-    ::grpc::ClientAsyncResponseReader< ::io::deephaven::proto::backplane::grpc::AuthenticationConstantsResponse>* PrepareAsyncGetAuthenticationConstantsRaw(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::AuthenticationConstantsRequest& request, ::grpc::CompletionQueue* cq) override;
-    ::grpc::ClientAsyncResponseReader< ::io::deephaven::proto::backplane::grpc::ConfigurationConstantsResponse>* AsyncGetConfigurationConstantsRaw(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::ConfigurationConstantsRequest& request, ::grpc::CompletionQueue* cq) override;
-    ::grpc::ClientAsyncResponseReader< ::io::deephaven::proto::backplane::grpc::ConfigurationConstantsResponse>* PrepareAsyncGetConfigurationConstantsRaw(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::ConfigurationConstantsRequest& request, ::grpc::CompletionQueue* cq) override;
-    const ::grpc::internal::RpcMethod rpcmethod_GetAuthenticationConstants_;
-    const ::grpc::internal::RpcMethod rpcmethod_GetConfigurationConstants_;
-  };
-  static std::unique_ptr<Stub> NewStub(const std::shared_ptr< ::grpc::ChannelInterface>& channel, const ::grpc::StubOptions& options = ::grpc::StubOptions());
-
-  class Service : public ::grpc::Service {
-   public:
-    Service();
-    virtual ~Service();
-    virtual ::grpc::Status GetAuthenticationConstants(::grpc::ServerContext* context, const ::io::deephaven::proto::backplane::grpc::AuthenticationConstantsRequest* request, ::io::deephaven::proto::backplane::grpc::AuthenticationConstantsResponse* response);
-    virtual ::grpc::Status GetConfigurationConstants(::grpc::ServerContext* context, const ::io::deephaven::proto::backplane::grpc::ConfigurationConstantsRequest* request, ::io::deephaven::proto::backplane::grpc::ConfigurationConstantsResponse* response);
-  };
-  template <class BaseClass>
-  class WithAsyncMethod_GetAuthenticationConstants : public BaseClass {
-   private:
-    void BaseClassMustBeDerivedFromService(const Service* /*service*/) {}
-   public:
-    WithAsyncMethod_GetAuthenticationConstants() {
-      ::grpc::Service::MarkMethodAsync(0);
-    }
-    ~WithAsyncMethod_GetAuthenticationConstants() override {
-      BaseClassMustBeDerivedFromService(this);
-    }
-    // disable synchronous version of this method
-    ::grpc::Status GetAuthenticationConstants(::grpc::ServerContext* /*context*/, const ::io::deephaven::proto::backplane::grpc::AuthenticationConstantsRequest* /*request*/, ::io::deephaven::proto::backplane::grpc::AuthenticationConstantsResponse* /*response*/) override {
-      abort();
-      return ::grpc::Status(::grpc::StatusCode::UNIMPLEMENTED, "");
-    }
-    void RequestGetAuthenticationConstants(::grpc::ServerContext* context, ::io::deephaven::proto::backplane::grpc::AuthenticationConstantsRequest* request, ::grpc::ServerAsyncResponseWriter< ::io::deephaven::proto::backplane::grpc::AuthenticationConstantsResponse>* response, ::grpc::CompletionQueue* new_call_cq, ::grpc::ServerCompletionQueue* notification_cq, void *tag) {
-      ::grpc::Service::RequestAsyncUnary(0, context, request, response, new_call_cq, notification_cq, tag);
-    }
-  };
-  template <class BaseClass>
-  class WithAsyncMethod_GetConfigurationConstants : public BaseClass {
-   private:
-    void BaseClassMustBeDerivedFromService(const Service* /*service*/) {}
-   public:
-    WithAsyncMethod_GetConfigurationConstants() {
-      ::grpc::Service::MarkMethodAsync(1);
-    }
-    ~WithAsyncMethod_GetConfigurationConstants() override {
-      BaseClassMustBeDerivedFromService(this);
-    }
-    // disable synchronous version of this method
-    ::grpc::Status GetConfigurationConstants(::grpc::ServerContext* /*context*/, const ::io::deephaven::proto::backplane::grpc::ConfigurationConstantsRequest* /*request*/, ::io::deephaven::proto::backplane::grpc::ConfigurationConstantsResponse* /*response*/) override {
-      abort();
-      return ::grpc::Status(::grpc::StatusCode::UNIMPLEMENTED, "");
-    }
-    void RequestGetConfigurationConstants(::grpc::ServerContext* context, ::io::deephaven::proto::backplane::grpc::ConfigurationConstantsRequest* request, ::grpc::ServerAsyncResponseWriter< ::io::deephaven::proto::backplane::grpc::ConfigurationConstantsResponse>* response, ::grpc::CompletionQueue* new_call_cq, ::grpc::ServerCompletionQueue* notification_cq, void *tag) {
-      ::grpc::Service::RequestAsyncUnary(1, context, request, response, new_call_cq, notification_cq, tag);
-    }
-  };
-  typedef WithAsyncMethod_GetAuthenticationConstants<WithAsyncMethod_GetConfigurationConstants<Service > > AsyncService;
-  template <class BaseClass>
-  class WithCallbackMethod_GetAuthenticationConstants : public BaseClass {
-   private:
-    void BaseClassMustBeDerivedFromService(const Service* /*service*/) {}
-   public:
-    WithCallbackMethod_GetAuthenticationConstants() {
-      ::grpc::Service::MarkMethodCallback(0,
-          new ::grpc::internal::CallbackUnaryHandler< ::io::deephaven::proto::backplane::grpc::AuthenticationConstantsRequest, ::io::deephaven::proto::backplane::grpc::AuthenticationConstantsResponse>(
-            [this](
-                   ::grpc::CallbackServerContext* context, const ::io::deephaven::proto::backplane::grpc::AuthenticationConstantsRequest* request, ::io::deephaven::proto::backplane::grpc::AuthenticationConstantsResponse* response) { return this->GetAuthenticationConstants(context, request, response); }));}
-    void SetMessageAllocatorFor_GetAuthenticationConstants(
-        ::grpc::MessageAllocator< ::io::deephaven::proto::backplane::grpc::AuthenticationConstantsRequest, ::io::deephaven::proto::backplane::grpc::AuthenticationConstantsResponse>* allocator) {
-      ::grpc::internal::MethodHandler* const handler = ::grpc::Service::GetHandler(0);
-      static_cast<::grpc::internal::CallbackUnaryHandler< ::io::deephaven::proto::backplane::grpc::AuthenticationConstantsRequest, ::io::deephaven::proto::backplane::grpc::AuthenticationConstantsResponse>*>(handler)
-              ->SetMessageAllocator(allocator);
-    }
-    ~WithCallbackMethod_GetAuthenticationConstants() override {
-      BaseClassMustBeDerivedFromService(this);
-    }
-    // disable synchronous version of this method
-    ::grpc::Status GetAuthenticationConstants(::grpc::ServerContext* /*context*/, const ::io::deephaven::proto::backplane::grpc::AuthenticationConstantsRequest* /*request*/, ::io::deephaven::proto::backplane::grpc::AuthenticationConstantsResponse* /*response*/) override {
-      abort();
-      return ::grpc::Status(::grpc::StatusCode::UNIMPLEMENTED, "");
-    }
-    virtual ::grpc::ServerUnaryReactor* GetAuthenticationConstants(
-      ::grpc::CallbackServerContext* /*context*/, const ::io::deephaven::proto::backplane::grpc::AuthenticationConstantsRequest* /*request*/, ::io::deephaven::proto::backplane::grpc::AuthenticationConstantsResponse* /*response*/)  { return nullptr; }
-  };
-  template <class BaseClass>
-  class WithCallbackMethod_GetConfigurationConstants : public BaseClass {
-   private:
-    void BaseClassMustBeDerivedFromService(const Service* /*service*/) {}
-   public:
-    WithCallbackMethod_GetConfigurationConstants() {
-      ::grpc::Service::MarkMethodCallback(1,
-          new ::grpc::internal::CallbackUnaryHandler< ::io::deephaven::proto::backplane::grpc::ConfigurationConstantsRequest, ::io::deephaven::proto::backplane::grpc::ConfigurationConstantsResponse>(
-            [this](
-                   ::grpc::CallbackServerContext* context, const ::io::deephaven::proto::backplane::grpc::ConfigurationConstantsRequest* request, ::io::deephaven::proto::backplane::grpc::ConfigurationConstantsResponse* response) { return this->GetConfigurationConstants(context, request, response); }));}
-    void SetMessageAllocatorFor_GetConfigurationConstants(
-        ::grpc::MessageAllocator< ::io::deephaven::proto::backplane::grpc::ConfigurationConstantsRequest, ::io::deephaven::proto::backplane::grpc::ConfigurationConstantsResponse>* allocator) {
-      ::grpc::internal::MethodHandler* const handler = ::grpc::Service::GetHandler(1);
-      static_cast<::grpc::internal::CallbackUnaryHandler< ::io::deephaven::proto::backplane::grpc::ConfigurationConstantsRequest, ::io::deephaven::proto::backplane::grpc::ConfigurationConstantsResponse>*>(handler)
-              ->SetMessageAllocator(allocator);
-    }
-    ~WithCallbackMethod_GetConfigurationConstants() override {
-      BaseClassMustBeDerivedFromService(this);
-    }
-    // disable synchronous version of this method
-    ::grpc::Status GetConfigurationConstants(::grpc::ServerContext* /*context*/, const ::io::deephaven::proto::backplane::grpc::ConfigurationConstantsRequest* /*request*/, ::io::deephaven::proto::backplane::grpc::ConfigurationConstantsResponse* /*response*/) override {
-      abort();
-      return ::grpc::Status(::grpc::StatusCode::UNIMPLEMENTED, "");
-    }
-    virtual ::grpc::ServerUnaryReactor* GetConfigurationConstants(
-      ::grpc::CallbackServerContext* /*context*/, const ::io::deephaven::proto::backplane::grpc::ConfigurationConstantsRequest* /*request*/, ::io::deephaven::proto::backplane::grpc::ConfigurationConstantsResponse* /*response*/)  { return nullptr; }
-  };
-  typedef WithCallbackMethod_GetAuthenticationConstants<WithCallbackMethod_GetConfigurationConstants<Service > > CallbackService;
-  typedef CallbackService ExperimentalCallbackService;
-  template <class BaseClass>
-  class WithGenericMethod_GetAuthenticationConstants : public BaseClass {
-   private:
-    void BaseClassMustBeDerivedFromService(const Service* /*service*/) {}
-   public:
-    WithGenericMethod_GetAuthenticationConstants() {
-      ::grpc::Service::MarkMethodGeneric(0);
-    }
-    ~WithGenericMethod_GetAuthenticationConstants() override {
-      BaseClassMustBeDerivedFromService(this);
-    }
-    // disable synchronous version of this method
-    ::grpc::Status GetAuthenticationConstants(::grpc::ServerContext* /*context*/, const ::io::deephaven::proto::backplane::grpc::AuthenticationConstantsRequest* /*request*/, ::io::deephaven::proto::backplane::grpc::AuthenticationConstantsResponse* /*response*/) override {
-      abort();
-      return ::grpc::Status(::grpc::StatusCode::UNIMPLEMENTED, "");
-    }
-  };
-  template <class BaseClass>
-  class WithGenericMethod_GetConfigurationConstants : public BaseClass {
-   private:
-    void BaseClassMustBeDerivedFromService(const Service* /*service*/) {}
-   public:
-    WithGenericMethod_GetConfigurationConstants() {
-      ::grpc::Service::MarkMethodGeneric(1);
-    }
-    ~WithGenericMethod_GetConfigurationConstants() override {
-      BaseClassMustBeDerivedFromService(this);
-    }
-    // disable synchronous version of this method
-    ::grpc::Status GetConfigurationConstants(::grpc::ServerContext* /*context*/, const ::io::deephaven::proto::backplane::grpc::ConfigurationConstantsRequest* /*request*/, ::io::deephaven::proto::backplane::grpc::ConfigurationConstantsResponse* /*response*/) override {
-      abort();
-      return ::grpc::Status(::grpc::StatusCode::UNIMPLEMENTED, "");
-    }
-  };
-  template <class BaseClass>
-  class WithRawMethod_GetAuthenticationConstants : public BaseClass {
-   private:
-    void BaseClassMustBeDerivedFromService(const Service* /*service*/) {}
-   public:
-    WithRawMethod_GetAuthenticationConstants() {
-      ::grpc::Service::MarkMethodRaw(0);
-    }
-    ~WithRawMethod_GetAuthenticationConstants() override {
-      BaseClassMustBeDerivedFromService(this);
-    }
-    // disable synchronous version of this method
-    ::grpc::Status GetAuthenticationConstants(::grpc::ServerContext* /*context*/, const ::io::deephaven::proto::backplane::grpc::AuthenticationConstantsRequest* /*request*/, ::io::deephaven::proto::backplane::grpc::AuthenticationConstantsResponse* /*response*/) override {
-      abort();
-      return ::grpc::Status(::grpc::StatusCode::UNIMPLEMENTED, "");
-    }
-    void RequestGetAuthenticationConstants(::grpc::ServerContext* context, ::grpc::ByteBuffer* request, ::grpc::ServerAsyncResponseWriter< ::grpc::ByteBuffer>* response, ::grpc::CompletionQueue* new_call_cq, ::grpc::ServerCompletionQueue* notification_cq, void *tag) {
-      ::grpc::Service::RequestAsyncUnary(0, context, request, response, new_call_cq, notification_cq, tag);
-    }
-  };
-  template <class BaseClass>
-  class WithRawMethod_GetConfigurationConstants : public BaseClass {
-   private:
-    void BaseClassMustBeDerivedFromService(const Service* /*service*/) {}
-   public:
-    WithRawMethod_GetConfigurationConstants() {
-      ::grpc::Service::MarkMethodRaw(1);
-    }
-    ~WithRawMethod_GetConfigurationConstants() override {
-      BaseClassMustBeDerivedFromService(this);
-    }
-    // disable synchronous version of this method
-    ::grpc::Status GetConfigurationConstants(::grpc::ServerContext* /*context*/, const ::io::deephaven::proto::backplane::grpc::ConfigurationConstantsRequest* /*request*/, ::io::deephaven::proto::backplane::grpc::ConfigurationConstantsResponse* /*response*/) override {
-      abort();
-      return ::grpc::Status(::grpc::StatusCode::UNIMPLEMENTED, "");
-    }
-    void RequestGetConfigurationConstants(::grpc::ServerContext* context, ::grpc::ByteBuffer* request, ::grpc::ServerAsyncResponseWriter< ::grpc::ByteBuffer>* response, ::grpc::CompletionQueue* new_call_cq, ::grpc::ServerCompletionQueue* notification_cq, void *tag) {
-      ::grpc::Service::RequestAsyncUnary(1, context, request, response, new_call_cq, notification_cq, tag);
-    }
-  };
-  template <class BaseClass>
-  class WithRawCallbackMethod_GetAuthenticationConstants : public BaseClass {
-   private:
-    void BaseClassMustBeDerivedFromService(const Service* /*service*/) {}
-   public:
-    WithRawCallbackMethod_GetAuthenticationConstants() {
-      ::grpc::Service::MarkMethodRawCallback(0,
-          new ::grpc::internal::CallbackUnaryHandler< ::grpc::ByteBuffer, ::grpc::ByteBuffer>(
-            [this](
-                   ::grpc::CallbackServerContext* context, const ::grpc::ByteBuffer* request, ::grpc::ByteBuffer* response) { return this->GetAuthenticationConstants(context, request, response); }));
-    }
-    ~WithRawCallbackMethod_GetAuthenticationConstants() override {
-      BaseClassMustBeDerivedFromService(this);
-    }
-    // disable synchronous version of this method
-    ::grpc::Status GetAuthenticationConstants(::grpc::ServerContext* /*context*/, const ::io::deephaven::proto::backplane::grpc::AuthenticationConstantsRequest* /*request*/, ::io::deephaven::proto::backplane::grpc::AuthenticationConstantsResponse* /*response*/) override {
-      abort();
-      return ::grpc::Status(::grpc::StatusCode::UNIMPLEMENTED, "");
-    }
-    virtual ::grpc::ServerUnaryReactor* GetAuthenticationConstants(
-      ::grpc::CallbackServerContext* /*context*/, const ::grpc::ByteBuffer* /*request*/, ::grpc::ByteBuffer* /*response*/)  { return nullptr; }
-  };
-  template <class BaseClass>
-  class WithRawCallbackMethod_GetConfigurationConstants : public BaseClass {
-   private:
-    void BaseClassMustBeDerivedFromService(const Service* /*service*/) {}
-   public:
-    WithRawCallbackMethod_GetConfigurationConstants() {
-      ::grpc::Service::MarkMethodRawCallback(1,
-          new ::grpc::internal::CallbackUnaryHandler< ::grpc::ByteBuffer, ::grpc::ByteBuffer>(
-            [this](
-                   ::grpc::CallbackServerContext* context, const ::grpc::ByteBuffer* request, ::grpc::ByteBuffer* response) { return this->GetConfigurationConstants(context, request, response); }));
-    }
-    ~WithRawCallbackMethod_GetConfigurationConstants() override {
-      BaseClassMustBeDerivedFromService(this);
-    }
-    // disable synchronous version of this method
-    ::grpc::Status GetConfigurationConstants(::grpc::ServerContext* /*context*/, const ::io::deephaven::proto::backplane::grpc::ConfigurationConstantsRequest* /*request*/, ::io::deephaven::proto::backplane::grpc::ConfigurationConstantsResponse* /*response*/) override {
-      abort();
-      return ::grpc::Status(::grpc::StatusCode::UNIMPLEMENTED, "");
-    }
-    virtual ::grpc::ServerUnaryReactor* GetConfigurationConstants(
-      ::grpc::CallbackServerContext* /*context*/, const ::grpc::ByteBuffer* /*request*/, ::grpc::ByteBuffer* /*response*/)  { return nullptr; }
-  };
-  template <class BaseClass>
-  class WithStreamedUnaryMethod_GetAuthenticationConstants : public BaseClass {
-   private:
-    void BaseClassMustBeDerivedFromService(const Service* /*service*/) {}
-   public:
-    WithStreamedUnaryMethod_GetAuthenticationConstants() {
-      ::grpc::Service::MarkMethodStreamed(0,
-        new ::grpc::internal::StreamedUnaryHandler<
-          ::io::deephaven::proto::backplane::grpc::AuthenticationConstantsRequest, ::io::deephaven::proto::backplane::grpc::AuthenticationConstantsResponse>(
-            [this](::grpc::ServerContext* context,
-                   ::grpc::ServerUnaryStreamer<
-                     ::io::deephaven::proto::backplane::grpc::AuthenticationConstantsRequest, ::io::deephaven::proto::backplane::grpc::AuthenticationConstantsResponse>* streamer) {
-                       return this->StreamedGetAuthenticationConstants(context,
-                         streamer);
-                  }));
-    }
-    ~WithStreamedUnaryMethod_GetAuthenticationConstants() override {
-      BaseClassMustBeDerivedFromService(this);
-    }
-    // disable regular version of this method
-    ::grpc::Status GetAuthenticationConstants(::grpc::ServerContext* /*context*/, const ::io::deephaven::proto::backplane::grpc::AuthenticationConstantsRequest* /*request*/, ::io::deephaven::proto::backplane::grpc::AuthenticationConstantsResponse* /*response*/) override {
-      abort();
-      return ::grpc::Status(::grpc::StatusCode::UNIMPLEMENTED, "");
-    }
-    // replace default version of method with streamed unary
-    virtual ::grpc::Status StreamedGetAuthenticationConstants(::grpc::ServerContext* context, ::grpc::ServerUnaryStreamer< ::io::deephaven::proto::backplane::grpc::AuthenticationConstantsRequest,::io::deephaven::proto::backplane::grpc::AuthenticationConstantsResponse>* server_unary_streamer) = 0;
-  };
-  template <class BaseClass>
-  class WithStreamedUnaryMethod_GetConfigurationConstants : public BaseClass {
-   private:
-    void BaseClassMustBeDerivedFromService(const Service* /*service*/) {}
-   public:
-    WithStreamedUnaryMethod_GetConfigurationConstants() {
-      ::grpc::Service::MarkMethodStreamed(1,
-        new ::grpc::internal::StreamedUnaryHandler<
-          ::io::deephaven::proto::backplane::grpc::ConfigurationConstantsRequest, ::io::deephaven::proto::backplane::grpc::ConfigurationConstantsResponse>(
-            [this](::grpc::ServerContext* context,
-                   ::grpc::ServerUnaryStreamer<
-                     ::io::deephaven::proto::backplane::grpc::ConfigurationConstantsRequest, ::io::deephaven::proto::backplane::grpc::ConfigurationConstantsResponse>* streamer) {
-                       return this->StreamedGetConfigurationConstants(context,
-                         streamer);
-                  }));
-    }
-    ~WithStreamedUnaryMethod_GetConfigurationConstants() override {
-      BaseClassMustBeDerivedFromService(this);
-    }
-    // disable regular version of this method
-    ::grpc::Status GetConfigurationConstants(::grpc::ServerContext* /*context*/, const ::io::deephaven::proto::backplane::grpc::ConfigurationConstantsRequest* /*request*/, ::io::deephaven::proto::backplane::grpc::ConfigurationConstantsResponse* /*response*/) override {
-      abort();
-      return ::grpc::Status(::grpc::StatusCode::UNIMPLEMENTED, "");
-    }
-    // replace default version of method with streamed unary
-    virtual ::grpc::Status StreamedGetConfigurationConstants(::grpc::ServerContext* context, ::grpc::ServerUnaryStreamer< ::io::deephaven::proto::backplane::grpc::ConfigurationConstantsRequest,::io::deephaven::proto::backplane::grpc::ConfigurationConstantsResponse>* server_unary_streamer) = 0;
-  };
-  typedef WithStreamedUnaryMethod_GetAuthenticationConstants<WithStreamedUnaryMethod_GetConfigurationConstants<Service > > StreamedUnaryService;
-  typedef Service SplitStreamedService;
-  typedef WithStreamedUnaryMethod_GetAuthenticationConstants<WithStreamedUnaryMethod_GetConfigurationConstants<Service > > StreamedService;
-};
-
-}  // namespace grpc
-}  // namespace backplane
-}  // namespace proto
-}  // namespace deephaven
-}  // namespace io
-
-
-#endif  // GRPC_deephaven_2fproto_2fconfig_2eproto__INCLUDED
diff --git a/cpp-client/deephaven/dhclient/proto/deephaven/proto/config.pb.cc b/cpp-client/deephaven/dhclient/proto/deephaven/proto/config.pb.cc
deleted file mode 100644
index fc01830df49..00000000000
--- a/cpp-client/deephaven/dhclient/proto/deephaven/proto/config.pb.cc
+++ /dev/null
@@ -1,1049 +0,0 @@
-// Generated by the protocol buffer compiler.  DO NOT EDIT!
-// source: deephaven/proto/config.proto
-
-#include "deephaven/proto/config.pb.h"
-
-#include <algorithm>
-#include "google/protobuf/io/coded_stream.h"
-#include "google/protobuf/extension_set.h"
-#include "google/protobuf/wire_format_lite.h"
-#include "google/protobuf/descriptor.h"
-#include "google/protobuf/generated_message_reflection.h"
-#include "google/protobuf/reflection_ops.h"
-#include "google/protobuf/wire_format.h"
-#include "google/protobuf/generated_message_tctable_impl.h"
-// @@protoc_insertion_point(includes)
-
-// Must be included last.
-#include "google/protobuf/port_def.inc"
-PROTOBUF_PRAGMA_INIT_SEG
-namespace _pb = ::google::protobuf;
-namespace _pbi = ::google::protobuf::internal;
-namespace _fl = ::google::protobuf::internal::field_layout;
-namespace io {
-namespace deephaven {
-namespace proto {
-namespace backplane {
-namespace grpc {
-      template <typename>
-PROTOBUF_CONSTEXPR ConfigurationConstantsRequest::ConfigurationConstantsRequest(::_pbi::ConstantInitialized) {}
-struct ConfigurationConstantsRequestDefaultTypeInternal {
-  PROTOBUF_CONSTEXPR ConfigurationConstantsRequestDefaultTypeInternal() : _instance(::_pbi::ConstantInitialized{}) {}
-  ~ConfigurationConstantsRequestDefaultTypeInternal() {}
-  union {
-    ConfigurationConstantsRequest _instance;
-  };
-};
-
-PROTOBUF_ATTRIBUTE_NO_DESTROY PROTOBUF_CONSTINIT
-    PROTOBUF_ATTRIBUTE_INIT_PRIORITY1 ConfigurationConstantsRequestDefaultTypeInternal _ConfigurationConstantsRequest_default_instance_;
-
-inline constexpr ConfigValue::Impl_::Impl_(
-    ::_pbi::ConstantInitialized) noexcept
-      : kind_{},
-        _cached_size_{0},
-        _oneof_case_{} {}
-
-template <typename>
-PROTOBUF_CONSTEXPR ConfigValue::ConfigValue(::_pbi::ConstantInitialized)
-    : _impl_(::_pbi::ConstantInitialized()) {}
-struct ConfigValueDefaultTypeInternal {
-  PROTOBUF_CONSTEXPR ConfigValueDefaultTypeInternal() : _instance(::_pbi::ConstantInitialized{}) {}
-  ~ConfigValueDefaultTypeInternal() {}
-  union {
-    ConfigValue _instance;
-  };
-};
-
-PROTOBUF_ATTRIBUTE_NO_DESTROY PROTOBUF_CONSTINIT
-    PROTOBUF_ATTRIBUTE_INIT_PRIORITY1 ConfigValueDefaultTypeInternal _ConfigValue_default_instance_;
-      template <typename>
-PROTOBUF_CONSTEXPR AuthenticationConstantsRequest::AuthenticationConstantsRequest(::_pbi::ConstantInitialized) {}
-struct AuthenticationConstantsRequestDefaultTypeInternal {
-  PROTOBUF_CONSTEXPR AuthenticationConstantsRequestDefaultTypeInternal() : _instance(::_pbi::ConstantInitialized{}) {}
-  ~AuthenticationConstantsRequestDefaultTypeInternal() {}
-  union {
-    AuthenticationConstantsRequest _instance;
-  };
-};
-
-PROTOBUF_ATTRIBUTE_NO_DESTROY PROTOBUF_CONSTINIT
-    PROTOBUF_ATTRIBUTE_INIT_PRIORITY1 AuthenticationConstantsRequestDefaultTypeInternal _AuthenticationConstantsRequest_default_instance_;
-      template <typename>
-PROTOBUF_CONSTEXPR ConfigurationConstantsResponse_ConfigValuesEntry_DoNotUse::ConfigurationConstantsResponse_ConfigValuesEntry_DoNotUse(::_pbi::ConstantInitialized) {}
-struct ConfigurationConstantsResponse_ConfigValuesEntry_DoNotUseDefaultTypeInternal {
-  PROTOBUF_CONSTEXPR ConfigurationConstantsResponse_ConfigValuesEntry_DoNotUseDefaultTypeInternal() : _instance(::_pbi::ConstantInitialized{}) {}
-  ~ConfigurationConstantsResponse_ConfigValuesEntry_DoNotUseDefaultTypeInternal() {}
-  union {
-    ConfigurationConstantsResponse_ConfigValuesEntry_DoNotUse _instance;
-  };
-};
-
-PROTOBUF_ATTRIBUTE_NO_DESTROY PROTOBUF_CONSTINIT
-    PROTOBUF_ATTRIBUTE_INIT_PRIORITY1 ConfigurationConstantsResponse_ConfigValuesEntry_DoNotUseDefaultTypeInternal _ConfigurationConstantsResponse_ConfigValuesEntry_DoNotUse_default_instance_;
-      template <typename>
-PROTOBUF_CONSTEXPR AuthenticationConstantsResponse_ConfigValuesEntry_DoNotUse::AuthenticationConstantsResponse_ConfigValuesEntry_DoNotUse(::_pbi::ConstantInitialized) {}
-struct AuthenticationConstantsResponse_ConfigValuesEntry_DoNotUseDefaultTypeInternal {
-  PROTOBUF_CONSTEXPR AuthenticationConstantsResponse_ConfigValuesEntry_DoNotUseDefaultTypeInternal() : _instance(::_pbi::ConstantInitialized{}) {}
-  ~AuthenticationConstantsResponse_ConfigValuesEntry_DoNotUseDefaultTypeInternal() {}
-  union {
-    AuthenticationConstantsResponse_ConfigValuesEntry_DoNotUse _instance;
-  };
-};
-
-PROTOBUF_ATTRIBUTE_NO_DESTROY PROTOBUF_CONSTINIT
-    PROTOBUF_ATTRIBUTE_INIT_PRIORITY1 AuthenticationConstantsResponse_ConfigValuesEntry_DoNotUseDefaultTypeInternal _AuthenticationConstantsResponse_ConfigValuesEntry_DoNotUse_default_instance_;
-
-inline constexpr ConfigurationConstantsResponse::Impl_::Impl_(
-    ::_pbi::ConstantInitialized) noexcept
-      : config_values_{},
-        _cached_size_{0} {}
-
-template <typename>
-PROTOBUF_CONSTEXPR ConfigurationConstantsResponse::ConfigurationConstantsResponse(::_pbi::ConstantInitialized)
-    : _impl_(::_pbi::ConstantInitialized()) {}
-struct ConfigurationConstantsResponseDefaultTypeInternal {
-  PROTOBUF_CONSTEXPR ConfigurationConstantsResponseDefaultTypeInternal() : _instance(::_pbi::ConstantInitialized{}) {}
-  ~ConfigurationConstantsResponseDefaultTypeInternal() {}
-  union {
-    ConfigurationConstantsResponse _instance;
-  };
-};
-
-PROTOBUF_ATTRIBUTE_NO_DESTROY PROTOBUF_CONSTINIT
-    PROTOBUF_ATTRIBUTE_INIT_PRIORITY1 ConfigurationConstantsResponseDefaultTypeInternal _ConfigurationConstantsResponse_default_instance_;
-
-inline constexpr AuthenticationConstantsResponse::Impl_::Impl_(
-    ::_pbi::ConstantInitialized) noexcept
-      : config_values_{},
-        _cached_size_{0} {}
-
-template <typename>
-PROTOBUF_CONSTEXPR AuthenticationConstantsResponse::AuthenticationConstantsResponse(::_pbi::ConstantInitialized)
-    : _impl_(::_pbi::ConstantInitialized()) {}
-struct AuthenticationConstantsResponseDefaultTypeInternal {
-  PROTOBUF_CONSTEXPR AuthenticationConstantsResponseDefaultTypeInternal() : _instance(::_pbi::ConstantInitialized{}) {}
-  ~AuthenticationConstantsResponseDefaultTypeInternal() {}
-  union {
-    AuthenticationConstantsResponse _instance;
-  };
-};
-
-PROTOBUF_ATTRIBUTE_NO_DESTROY PROTOBUF_CONSTINIT
-    PROTOBUF_ATTRIBUTE_INIT_PRIORITY1 AuthenticationConstantsResponseDefaultTypeInternal _AuthenticationConstantsResponse_default_instance_;
-}  // namespace grpc
-}  // namespace backplane
-}  // namespace proto
-}  // namespace deephaven
-}  // namespace io
-static ::_pb::Metadata file_level_metadata_deephaven_2fproto_2fconfig_2eproto[7];
-static constexpr const ::_pb::EnumDescriptor**
-    file_level_enum_descriptors_deephaven_2fproto_2fconfig_2eproto = nullptr;
-static constexpr const ::_pb::ServiceDescriptor**
-    file_level_service_descriptors_deephaven_2fproto_2fconfig_2eproto = nullptr;
-const ::uint32_t TableStruct_deephaven_2fproto_2fconfig_2eproto::offsets[] PROTOBUF_SECTION_VARIABLE(
-    protodesc_cold) = {
-    ~0u,  // no _has_bits_
-    PROTOBUF_FIELD_OFFSET(::io::deephaven::proto::backplane::grpc::AuthenticationConstantsRequest, _internal_metadata_),
-    ~0u,  // no _extensions_
-    ~0u,  // no _oneof_case_
-    ~0u,  // no _weak_field_map_
-    ~0u,  // no _inlined_string_donated_
-    ~0u,  // no _split_
-    ~0u,  // no sizeof(Split)
-    ~0u,  // no _has_bits_
-    PROTOBUF_FIELD_OFFSET(::io::deephaven::proto::backplane::grpc::ConfigurationConstantsRequest, _internal_metadata_),
-    ~0u,  // no _extensions_
-    ~0u,  // no _oneof_case_
-    ~0u,  // no _weak_field_map_
-    ~0u,  // no _inlined_string_donated_
-    ~0u,  // no _split_
-    ~0u,  // no sizeof(Split)
-    PROTOBUF_FIELD_OFFSET(::io::deephaven::proto::backplane::grpc::AuthenticationConstantsResponse_ConfigValuesEntry_DoNotUse, _has_bits_),
-    PROTOBUF_FIELD_OFFSET(::io::deephaven::proto::backplane::grpc::AuthenticationConstantsResponse_ConfigValuesEntry_DoNotUse, _internal_metadata_),
-    ~0u,  // no _extensions_
-    ~0u,  // no _oneof_case_
-    ~0u,  // no _weak_field_map_
-    ~0u,  // no _inlined_string_donated_
-    ~0u,  // no _split_
-    ~0u,  // no sizeof(Split)
-    PROTOBUF_FIELD_OFFSET(::io::deephaven::proto::backplane::grpc::AuthenticationConstantsResponse_ConfigValuesEntry_DoNotUse, key_),
-    PROTOBUF_FIELD_OFFSET(::io::deephaven::proto::backplane::grpc::AuthenticationConstantsResponse_ConfigValuesEntry_DoNotUse, value_),
-    0,
-    1,
-    ~0u,  // no _has_bits_
-    PROTOBUF_FIELD_OFFSET(::io::deephaven::proto::backplane::grpc::AuthenticationConstantsResponse, _internal_metadata_),
-    ~0u,  // no _extensions_
-    ~0u,  // no _oneof_case_
-    ~0u,  // no _weak_field_map_
-    ~0u,  // no _inlined_string_donated_
-    ~0u,  // no _split_
-    ~0u,  // no sizeof(Split)
-    PROTOBUF_FIELD_OFFSET(::io::deephaven::proto::backplane::grpc::AuthenticationConstantsResponse, _impl_.config_values_),
-    PROTOBUF_FIELD_OFFSET(::io::deephaven::proto::backplane::grpc::ConfigurationConstantsResponse_ConfigValuesEntry_DoNotUse, _has_bits_),
-    PROTOBUF_FIELD_OFFSET(::io::deephaven::proto::backplane::grpc::ConfigurationConstantsResponse_ConfigValuesEntry_DoNotUse, _internal_metadata_),
-    ~0u,  // no _extensions_
-    ~0u,  // no _oneof_case_
-    ~0u,  // no _weak_field_map_
-    ~0u,  // no _inlined_string_donated_
-    ~0u,  // no _split_
-    ~0u,  // no sizeof(Split)
-    PROTOBUF_FIELD_OFFSET(::io::deephaven::proto::backplane::grpc::ConfigurationConstantsResponse_ConfigValuesEntry_DoNotUse, key_),
-    PROTOBUF_FIELD_OFFSET(::io::deephaven::proto::backplane::grpc::ConfigurationConstantsResponse_ConfigValuesEntry_DoNotUse, value_),
-    0,
-    1,
-    ~0u,  // no _has_bits_
-    PROTOBUF_FIELD_OFFSET(::io::deephaven::proto::backplane::grpc::ConfigurationConstantsResponse, _internal_metadata_),
-    ~0u,  // no _extensions_
-    ~0u,  // no _oneof_case_
-    ~0u,  // no _weak_field_map_
-    ~0u,  // no _inlined_string_donated_
-    ~0u,  // no _split_
-    ~0u,  // no sizeof(Split)
-    PROTOBUF_FIELD_OFFSET(::io::deephaven::proto::backplane::grpc::ConfigurationConstantsResponse, _impl_.config_values_),
-    ~0u,  // no _has_bits_
-    PROTOBUF_FIELD_OFFSET(::io::deephaven::proto::backplane::grpc::ConfigValue, _internal_metadata_),
-    ~0u,  // no _extensions_
-    PROTOBUF_FIELD_OFFSET(::io::deephaven::proto::backplane::grpc::ConfigValue, _impl_._oneof_case_[0]),
-    ~0u,  // no _weak_field_map_
-    ~0u,  // no _inlined_string_donated_
-    ~0u,  // no _split_
-    ~0u,  // no sizeof(Split)
-    ::_pbi::kInvalidFieldOffsetTag,
-    PROTOBUF_FIELD_OFFSET(::io::deephaven::proto::backplane::grpc::ConfigValue, _impl_.kind_),
-};
-
-static const ::_pbi::MigrationSchema
-    schemas[] PROTOBUF_SECTION_VARIABLE(protodesc_cold) = {
-        {0, -1, -1, sizeof(::io::deephaven::proto::backplane::grpc::AuthenticationConstantsRequest)},
-        {8, -1, -1, sizeof(::io::deephaven::proto::backplane::grpc::ConfigurationConstantsRequest)},
-        {16, 26, -1, sizeof(::io::deephaven::proto::backplane::grpc::AuthenticationConstantsResponse_ConfigValuesEntry_DoNotUse)},
-        {28, -1, -1, sizeof(::io::deephaven::proto::backplane::grpc::AuthenticationConstantsResponse)},
-        {37, 47, -1, sizeof(::io::deephaven::proto::backplane::grpc::ConfigurationConstantsResponse_ConfigValuesEntry_DoNotUse)},
-        {49, -1, -1, sizeof(::io::deephaven::proto::backplane::grpc::ConfigurationConstantsResponse)},
-        {58, -1, -1, sizeof(::io::deephaven::proto::backplane::grpc::ConfigValue)},
-};
-
-static const ::_pb::Message* const file_default_instances[] = {
-    &::io::deephaven::proto::backplane::grpc::_AuthenticationConstantsRequest_default_instance_._instance,
-    &::io::deephaven::proto::backplane::grpc::_ConfigurationConstantsRequest_default_instance_._instance,
-    &::io::deephaven::proto::backplane::grpc::_AuthenticationConstantsResponse_ConfigValuesEntry_DoNotUse_default_instance_._instance,
-    &::io::deephaven::proto::backplane::grpc::_AuthenticationConstantsResponse_default_instance_._instance,
-    &::io::deephaven::proto::backplane::grpc::_ConfigurationConstantsResponse_ConfigValuesEntry_DoNotUse_default_instance_._instance,
-    &::io::deephaven::proto::backplane::grpc::_ConfigurationConstantsResponse_default_instance_._instance,
-    &::io::deephaven::proto::backplane::grpc::_ConfigValue_default_instance_._instance,
-};
-const char descriptor_table_protodef_deephaven_2fproto_2fconfig_2eproto[] PROTOBUF_SECTION_VARIABLE(protodesc_cold) = {
-    "\n\034deephaven/proto/config.proto\022!io.deeph"
-    "aven.proto.backplane.grpc\" \n\036Authenticat"
-    "ionConstantsRequest\"\037\n\035ConfigurationCons"
-    "tantsRequest\"\363\001\n\037AuthenticationConstants"
-    "Response\022k\n\rconfig_values\030\001 \003(\0132T.io.dee"
-    "phaven.proto.backplane.grpc.Authenticati"
-    "onConstantsResponse.ConfigValuesEntry\032c\n"
-    "\021ConfigValuesEntry\022\013\n\003key\030\001 \001(\t\022=\n\005value"
-    "\030\002 \001(\0132..io.deephaven.proto.backplane.gr"
-    "pc.ConfigValue:\0028\001\"\361\001\n\036ConfigurationCons"
-    "tantsResponse\022j\n\rconfig_values\030\001 \003(\0132S.i"
-    "o.deephaven.proto.backplane.grpc.Configu"
-    "rationConstantsResponse.ConfigValuesEntr"
-    "y\032c\n\021ConfigValuesEntry\022\013\n\003key\030\001 \001(\t\022=\n\005v"
-    "alue\030\002 \001(\0132..io.deephaven.proto.backplan"
-    "e.grpc.ConfigValue:\0028\001\"-\n\013ConfigValue\022\026\n"
-    "\014string_value\030\003 \001(\tH\000B\006\n\004kind2\334\002\n\rConfig"
-    "Service\022\245\001\n\032GetAuthenticationConstants\022A"
-    ".io.deephaven.proto.backplane.grpc.Authe"
-    "nticationConstantsRequest\032B.io.deephaven"
-    ".proto.backplane.grpc.AuthenticationCons"
-    "tantsResponse\"\000\022\242\001\n\031GetConfigurationCons"
-    "tants\022@.io.deephaven.proto.backplane.grp"
-    "c.ConfigurationConstantsRequest\032A.io.dee"
-    "phaven.proto.backplane.grpc.Configuratio"
-    "nConstantsResponse\"\000BBH\001P\001Z<github.com/d"
-    "eephaven/deephaven-core/go/internal/prot"
-    "o/configb\006proto3"
-};
-static ::absl::once_flag descriptor_table_deephaven_2fproto_2fconfig_2eproto_once;
-const ::_pbi::DescriptorTable descriptor_table_deephaven_2fproto_2fconfig_2eproto = {
-    false,
-    false,
-    1096,
-    descriptor_table_protodef_deephaven_2fproto_2fconfig_2eproto,
-    "deephaven/proto/config.proto",
-    &descriptor_table_deephaven_2fproto_2fconfig_2eproto_once,
-    nullptr,
-    0,
-    7,
-    schemas,
-    file_default_instances,
-    TableStruct_deephaven_2fproto_2fconfig_2eproto::offsets,
-    file_level_metadata_deephaven_2fproto_2fconfig_2eproto,
-    file_level_enum_descriptors_deephaven_2fproto_2fconfig_2eproto,
-    file_level_service_descriptors_deephaven_2fproto_2fconfig_2eproto,
-};
-
-// This function exists to be marked as weak.
-// It can significantly speed up compilation by breaking up LLVM's SCC
-// in the .pb.cc translation units. Large translation units see a
-// reduction of more than 35% of walltime for optimized builds. Without
-// the weak attribute all the messages in the file, including all the
-// vtables and everything they use become part of the same SCC through
-// a cycle like:
-// GetMetadata -> descriptor table -> default instances ->
-//   vtables -> GetMetadata
-// By adding a weak function here we break the connection from the
-// individual vtables back into the descriptor table.
-PROTOBUF_ATTRIBUTE_WEAK const ::_pbi::DescriptorTable* descriptor_table_deephaven_2fproto_2fconfig_2eproto_getter() {
-  return &descriptor_table_deephaven_2fproto_2fconfig_2eproto;
-}
-// Force running AddDescriptors() at dynamic initialization time.
-PROTOBUF_ATTRIBUTE_INIT_PRIORITY2
-static ::_pbi::AddDescriptorsRunner dynamic_init_dummy_deephaven_2fproto_2fconfig_2eproto(&descriptor_table_deephaven_2fproto_2fconfig_2eproto);
-namespace io {
-namespace deephaven {
-namespace proto {
-namespace backplane {
-namespace grpc {
-// ===================================================================
-
-class AuthenticationConstantsRequest::_Internal {
- public:
-};
-
-AuthenticationConstantsRequest::AuthenticationConstantsRequest(::google::protobuf::Arena* arena)
-    : ::google::protobuf::internal::ZeroFieldsBase(arena) {
-  // @@protoc_insertion_point(arena_constructor:io.deephaven.proto.backplane.grpc.AuthenticationConstantsRequest)
-}
-AuthenticationConstantsRequest::AuthenticationConstantsRequest(
-    ::google::protobuf::Arena* arena,
-    const AuthenticationConstantsRequest& from)
-    : ::google::protobuf::internal::ZeroFieldsBase(arena) {
-  AuthenticationConstantsRequest* const _this = this;
-  (void)_this;
-  _internal_metadata_.MergeFrom<::google::protobuf::UnknownFieldSet>(
-      from._internal_metadata_);
-
-  // @@protoc_insertion_point(copy_constructor:io.deephaven.proto.backplane.grpc.AuthenticationConstantsRequest)
-}
-
-
-
-
-
-
-
-
-
-::google::protobuf::Metadata AuthenticationConstantsRequest::GetMetadata() const {
-  return ::_pbi::AssignDescriptors(
-      &descriptor_table_deephaven_2fproto_2fconfig_2eproto_getter, &descriptor_table_deephaven_2fproto_2fconfig_2eproto_once,
-      file_level_metadata_deephaven_2fproto_2fconfig_2eproto[0]);
-}
-// ===================================================================
-
-class ConfigurationConstantsRequest::_Internal {
- public:
-};
-
-ConfigurationConstantsRequest::ConfigurationConstantsRequest(::google::protobuf::Arena* arena)
-    : ::google::protobuf::internal::ZeroFieldsBase(arena) {
-  // @@protoc_insertion_point(arena_constructor:io.deephaven.proto.backplane.grpc.ConfigurationConstantsRequest)
-}
-ConfigurationConstantsRequest::ConfigurationConstantsRequest(
-    ::google::protobuf::Arena* arena,
-    const ConfigurationConstantsRequest& from)
-    : ::google::protobuf::internal::ZeroFieldsBase(arena) {
-  ConfigurationConstantsRequest* const _this = this;
-  (void)_this;
-  _internal_metadata_.MergeFrom<::google::protobuf::UnknownFieldSet>(
-      from._internal_metadata_);
-
-  // @@protoc_insertion_point(copy_constructor:io.deephaven.proto.backplane.grpc.ConfigurationConstantsRequest)
-}
-
-
-
-
-
-
-
-
-
-::google::protobuf::Metadata ConfigurationConstantsRequest::GetMetadata() const {
-  return ::_pbi::AssignDescriptors(
-      &descriptor_table_deephaven_2fproto_2fconfig_2eproto_getter, &descriptor_table_deephaven_2fproto_2fconfig_2eproto_once,
-      file_level_metadata_deephaven_2fproto_2fconfig_2eproto[1]);
-}
-// ===================================================================
-
-AuthenticationConstantsResponse_ConfigValuesEntry_DoNotUse::AuthenticationConstantsResponse_ConfigValuesEntry_DoNotUse() {}
-AuthenticationConstantsResponse_ConfigValuesEntry_DoNotUse::AuthenticationConstantsResponse_ConfigValuesEntry_DoNotUse(::google::protobuf::Arena* arena)
-    : SuperType(arena) {}
-::google::protobuf::Metadata AuthenticationConstantsResponse_ConfigValuesEntry_DoNotUse::GetMetadata() const {
-  return ::_pbi::AssignDescriptors(
-      &descriptor_table_deephaven_2fproto_2fconfig_2eproto_getter, &descriptor_table_deephaven_2fproto_2fconfig_2eproto_once,
-      file_level_metadata_deephaven_2fproto_2fconfig_2eproto[2]);
-}
-// ===================================================================
-
-class AuthenticationConstantsResponse::_Internal {
- public:
-};
-
-AuthenticationConstantsResponse::AuthenticationConstantsResponse(::google::protobuf::Arena* arena)
-    : ::google::protobuf::Message(arena) {
-  SharedCtor(arena);
-  // @@protoc_insertion_point(arena_constructor:io.deephaven.proto.backplane.grpc.AuthenticationConstantsResponse)
-}
-inline PROTOBUF_NDEBUG_INLINE AuthenticationConstantsResponse::Impl_::Impl_(
-    ::google::protobuf::internal::InternalVisibility visibility, ::google::protobuf::Arena* arena,
-    const Impl_& from)
-      : config_values_{visibility, arena, from.config_values_},
-        _cached_size_{0} {}
-
-AuthenticationConstantsResponse::AuthenticationConstantsResponse(
-    ::google::protobuf::Arena* arena,
-    const AuthenticationConstantsResponse& from)
-    : ::google::protobuf::Message(arena) {
-  AuthenticationConstantsResponse* const _this = this;
-  (void)_this;
-  _internal_metadata_.MergeFrom<::google::protobuf::UnknownFieldSet>(
-      from._internal_metadata_);
-  new (&_impl_) Impl_(internal_visibility(), arena, from._impl_);
-
-  // @@protoc_insertion_point(copy_constructor:io.deephaven.proto.backplane.grpc.AuthenticationConstantsResponse)
-}
-inline PROTOBUF_NDEBUG_INLINE AuthenticationConstantsResponse::Impl_::Impl_(
-    ::google::protobuf::internal::InternalVisibility visibility,
-    ::google::protobuf::Arena* arena)
-      : config_values_{visibility, arena},
-        _cached_size_{0} {}
-
-inline void AuthenticationConstantsResponse::SharedCtor(::_pb::Arena* arena) {
-  new (&_impl_) Impl_(internal_visibility(), arena);
-}
-AuthenticationConstantsResponse::~AuthenticationConstantsResponse() {
-  // @@protoc_insertion_point(destructor:io.deephaven.proto.backplane.grpc.AuthenticationConstantsResponse)
-  _internal_metadata_.Delete<::google::protobuf::UnknownFieldSet>();
-  SharedDtor();
-}
-inline void AuthenticationConstantsResponse::SharedDtor() {
-  ABSL_DCHECK(GetArena() == nullptr);
-  _impl_.~Impl_();
-}
-
-PROTOBUF_NOINLINE void AuthenticationConstantsResponse::Clear() {
-// @@protoc_insertion_point(message_clear_start:io.deephaven.proto.backplane.grpc.AuthenticationConstantsResponse)
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  ::uint32_t cached_has_bits = 0;
-  // Prevent compiler warnings about cached_has_bits being unused
-  (void) cached_has_bits;
-
-  _impl_.config_values_.Clear();
-  _internal_metadata_.Clear<::google::protobuf::UnknownFieldSet>();
-}
-
-const char* AuthenticationConstantsResponse::_InternalParse(
-    const char* ptr, ::_pbi::ParseContext* ctx) {
-  ptr = ::_pbi::TcParser::ParseLoop(this, ptr, ctx, &_table_.header);
-  return ptr;
-}
-
-
-PROTOBUF_CONSTINIT PROTOBUF_ATTRIBUTE_INIT_PRIORITY1
-const ::_pbi::TcParseTable<0, 1, 2, 87, 2> AuthenticationConstantsResponse::_table_ = {
-  {
-    0,  // no _has_bits_
-    0, // no _extensions_
-    1, 0,  // max_field_number, fast_idx_mask
-    offsetof(decltype(_table_), field_lookup_table),
-    4294967294,  // skipmap
-    offsetof(decltype(_table_), field_entries),
-    1,  // num_field_entries
-    2,  // num_aux_entries
-    offsetof(decltype(_table_), aux_entries),
-    &_AuthenticationConstantsResponse_default_instance_._instance,
-    ::_pbi::TcParser::GenericFallback,  // fallback
-  }, {{
-    {::_pbi::TcParser::MiniParse, {}},
-  }}, {{
-    65535, 65535
-  }}, {{
-    // map<string, .io.deephaven.proto.backplane.grpc.ConfigValue> config_values = 1;
-    {PROTOBUF_FIELD_OFFSET(AuthenticationConstantsResponse, _impl_.config_values_), 0, 0,
-    (0 | ::_fl::kFcRepeated | ::_fl::kMap)},
-  }}, {{
-    {::_pbi::TcParser::GetMapAuxInfo<
-        decltype(AuthenticationConstantsResponse()._impl_.config_values_)>(
-        1, 0, 0, 9,
-        11)},
-    {::_pbi::TcParser::CreateInArenaStorageCb<::io::deephaven::proto::backplane::grpc::ConfigValue>},
-  }}, {{
-    "\101\15\0\0\0\0\0\0"
-    "io.deephaven.proto.backplane.grpc.AuthenticationConstantsResponse"
-    "config_values"
-  }},
-};
-
-::uint8_t* AuthenticationConstantsResponse::_InternalSerialize(
-    ::uint8_t* target,
-    ::google::protobuf::io::EpsCopyOutputStream* stream) const {
-  // @@protoc_insertion_point(serialize_to_array_start:io.deephaven.proto.backplane.grpc.AuthenticationConstantsResponse)
-  ::uint32_t cached_has_bits = 0;
-  (void)cached_has_bits;
-
-  // map<string, .io.deephaven.proto.backplane.grpc.ConfigValue> config_values = 1;
-  if (!_internal_config_values().empty()) {
-    using MapType = ::google::protobuf::Map<std::string, ::io::deephaven::proto::backplane::grpc::ConfigValue>;
-    using WireHelper = _pbi::MapEntryFuncs<std::string, ::io::deephaven::proto::backplane::grpc::ConfigValue,
-                                   _pbi::WireFormatLite::TYPE_STRING,
-                                   _pbi::WireFormatLite::TYPE_MESSAGE>;
-    const auto& field = _internal_config_values();
-
-    if (stream->IsSerializationDeterministic() && field.size() > 1) {
-      for (const auto& entry : ::google::protobuf::internal::MapSorterPtr<MapType>(field)) {
-        target = WireHelper::InternalSerialize(
-            1, entry.first, entry.second, target, stream);
-        ::google::protobuf::internal::WireFormatLite::VerifyUtf8String(
-            entry.first.data(), static_cast<int>(entry.first.length()),
- ::google::protobuf::internal::WireFormatLite::SERIALIZE, "io.deephaven.proto.backplane.grpc.AuthenticationConstantsResponse.config_values");
-      }
-    } else {
-      for (const auto& entry : field) {
-        target = WireHelper::InternalSerialize(
-            1, entry.first, entry.second, target, stream);
-        ::google::protobuf::internal::WireFormatLite::VerifyUtf8String(
-            entry.first.data(), static_cast<int>(entry.first.length()),
- ::google::protobuf::internal::WireFormatLite::SERIALIZE, "io.deephaven.proto.backplane.grpc.AuthenticationConstantsResponse.config_values");
-      }
-    }
-  }
-
-  if (PROTOBUF_PREDICT_FALSE(_internal_metadata_.have_unknown_fields())) {
-    target =
-        ::_pbi::WireFormat::InternalSerializeUnknownFieldsToArray(
-            _internal_metadata_.unknown_fields<::google::protobuf::UnknownFieldSet>(::google::protobuf::UnknownFieldSet::default_instance), target, stream);
-  }
-  // @@protoc_insertion_point(serialize_to_array_end:io.deephaven.proto.backplane.grpc.AuthenticationConstantsResponse)
-  return target;
-}
-
-::size_t AuthenticationConstantsResponse::ByteSizeLong() const {
-// @@protoc_insertion_point(message_byte_size_start:io.deephaven.proto.backplane.grpc.AuthenticationConstantsResponse)
-  ::size_t total_size = 0;
-
-  ::uint32_t cached_has_bits = 0;
-  // Prevent compiler warnings about cached_has_bits being unused
-  (void) cached_has_bits;
-
-  // map<string, .io.deephaven.proto.backplane.grpc.ConfigValue> config_values = 1;
-  total_size += 1 * ::google::protobuf::internal::FromIntSize(_internal_config_values_size());
-  for (const auto& entry : _internal_config_values()) {
-    total_size += _pbi::MapEntryFuncs<std::string, ::io::deephaven::proto::backplane::grpc::ConfigValue,
-                                   _pbi::WireFormatLite::TYPE_STRING,
-                                   _pbi::WireFormatLite::TYPE_MESSAGE>::ByteSizeLong(entry.first, entry.second);
-  }
-  return MaybeComputeUnknownFieldsSize(total_size, &_impl_._cached_size_);
-}
-
-const ::google::protobuf::Message::ClassData AuthenticationConstantsResponse::_class_data_ = {
-    AuthenticationConstantsResponse::MergeImpl,
-    nullptr,  // OnDemandRegisterArenaDtor
-};
-const ::google::protobuf::Message::ClassData* AuthenticationConstantsResponse::GetClassData() const {
-  return &_class_data_;
-}
-
-void AuthenticationConstantsResponse::MergeImpl(::google::protobuf::Message& to_msg, const ::google::protobuf::Message& from_msg) {
-  auto* const _this = static_cast<AuthenticationConstantsResponse*>(&to_msg);
-  auto& from = static_cast<const AuthenticationConstantsResponse&>(from_msg);
-  // @@protoc_insertion_point(class_specific_merge_from_start:io.deephaven.proto.backplane.grpc.AuthenticationConstantsResponse)
-  ABSL_DCHECK_NE(&from, _this);
-  ::uint32_t cached_has_bits = 0;
-  (void) cached_has_bits;
-
-  _this->_impl_.config_values_.MergeFrom(from._impl_.config_values_);
-  _this->_internal_metadata_.MergeFrom<::google::protobuf::UnknownFieldSet>(from._internal_metadata_);
-}
-
-void AuthenticationConstantsResponse::CopyFrom(const AuthenticationConstantsResponse& from) {
-// @@protoc_insertion_point(class_specific_copy_from_start:io.deephaven.proto.backplane.grpc.AuthenticationConstantsResponse)
-  if (&from == this) return;
-  Clear();
-  MergeFrom(from);
-}
-
-PROTOBUF_NOINLINE bool AuthenticationConstantsResponse::IsInitialized() const {
-  return true;
-}
-
-::_pbi::CachedSize* AuthenticationConstantsResponse::AccessCachedSize() const {
-  return &_impl_._cached_size_;
-}
-void AuthenticationConstantsResponse::InternalSwap(AuthenticationConstantsResponse* PROTOBUF_RESTRICT other) {
-  using std::swap;
-  _internal_metadata_.InternalSwap(&other->_internal_metadata_);
-  _impl_.config_values_.InternalSwap(&other->_impl_.config_values_);
-}
-
-::google::protobuf::Metadata AuthenticationConstantsResponse::GetMetadata() const {
-  return ::_pbi::AssignDescriptors(
-      &descriptor_table_deephaven_2fproto_2fconfig_2eproto_getter, &descriptor_table_deephaven_2fproto_2fconfig_2eproto_once,
-      file_level_metadata_deephaven_2fproto_2fconfig_2eproto[3]);
-}
-// ===================================================================
-
-ConfigurationConstantsResponse_ConfigValuesEntry_DoNotUse::ConfigurationConstantsResponse_ConfigValuesEntry_DoNotUse() {}
-ConfigurationConstantsResponse_ConfigValuesEntry_DoNotUse::ConfigurationConstantsResponse_ConfigValuesEntry_DoNotUse(::google::protobuf::Arena* arena)
-    : SuperType(arena) {}
-::google::protobuf::Metadata ConfigurationConstantsResponse_ConfigValuesEntry_DoNotUse::GetMetadata() const {
-  return ::_pbi::AssignDescriptors(
-      &descriptor_table_deephaven_2fproto_2fconfig_2eproto_getter, &descriptor_table_deephaven_2fproto_2fconfig_2eproto_once,
-      file_level_metadata_deephaven_2fproto_2fconfig_2eproto[4]);
-}
-// ===================================================================
-
-class ConfigurationConstantsResponse::_Internal {
- public:
-};
-
-ConfigurationConstantsResponse::ConfigurationConstantsResponse(::google::protobuf::Arena* arena)
-    : ::google::protobuf::Message(arena) {
-  SharedCtor(arena);
-  // @@protoc_insertion_point(arena_constructor:io.deephaven.proto.backplane.grpc.ConfigurationConstantsResponse)
-}
-inline PROTOBUF_NDEBUG_INLINE ConfigurationConstantsResponse::Impl_::Impl_(
-    ::google::protobuf::internal::InternalVisibility visibility, ::google::protobuf::Arena* arena,
-    const Impl_& from)
-      : config_values_{visibility, arena, from.config_values_},
-        _cached_size_{0} {}
-
-ConfigurationConstantsResponse::ConfigurationConstantsResponse(
-    ::google::protobuf::Arena* arena,
-    const ConfigurationConstantsResponse& from)
-    : ::google::protobuf::Message(arena) {
-  ConfigurationConstantsResponse* const _this = this;
-  (void)_this;
-  _internal_metadata_.MergeFrom<::google::protobuf::UnknownFieldSet>(
-      from._internal_metadata_);
-  new (&_impl_) Impl_(internal_visibility(), arena, from._impl_);
-
-  // @@protoc_insertion_point(copy_constructor:io.deephaven.proto.backplane.grpc.ConfigurationConstantsResponse)
-}
-inline PROTOBUF_NDEBUG_INLINE ConfigurationConstantsResponse::Impl_::Impl_(
-    ::google::protobuf::internal::InternalVisibility visibility,
-    ::google::protobuf::Arena* arena)
-      : config_values_{visibility, arena},
-        _cached_size_{0} {}
-
-inline void ConfigurationConstantsResponse::SharedCtor(::_pb::Arena* arena) {
-  new (&_impl_) Impl_(internal_visibility(), arena);
-}
-ConfigurationConstantsResponse::~ConfigurationConstantsResponse() {
-  // @@protoc_insertion_point(destructor:io.deephaven.proto.backplane.grpc.ConfigurationConstantsResponse)
-  _internal_metadata_.Delete<::google::protobuf::UnknownFieldSet>();
-  SharedDtor();
-}
-inline void ConfigurationConstantsResponse::SharedDtor() {
-  ABSL_DCHECK(GetArena() == nullptr);
-  _impl_.~Impl_();
-}
-
-PROTOBUF_NOINLINE void ConfigurationConstantsResponse::Clear() {
-// @@protoc_insertion_point(message_clear_start:io.deephaven.proto.backplane.grpc.ConfigurationConstantsResponse)
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  ::uint32_t cached_has_bits = 0;
-  // Prevent compiler warnings about cached_has_bits being unused
-  (void) cached_has_bits;
-
-  _impl_.config_values_.Clear();
-  _internal_metadata_.Clear<::google::protobuf::UnknownFieldSet>();
-}
-
-const char* ConfigurationConstantsResponse::_InternalParse(
-    const char* ptr, ::_pbi::ParseContext* ctx) {
-  ptr = ::_pbi::TcParser::ParseLoop(this, ptr, ctx, &_table_.header);
-  return ptr;
-}
-
-
-PROTOBUF_CONSTINIT PROTOBUF_ATTRIBUTE_INIT_PRIORITY1
-const ::_pbi::TcParseTable<0, 1, 2, 86, 2> ConfigurationConstantsResponse::_table_ = {
-  {
-    0,  // no _has_bits_
-    0, // no _extensions_
-    1, 0,  // max_field_number, fast_idx_mask
-    offsetof(decltype(_table_), field_lookup_table),
-    4294967294,  // skipmap
-    offsetof(decltype(_table_), field_entries),
-    1,  // num_field_entries
-    2,  // num_aux_entries
-    offsetof(decltype(_table_), aux_entries),
-    &_ConfigurationConstantsResponse_default_instance_._instance,
-    ::_pbi::TcParser::GenericFallback,  // fallback
-  }, {{
-    {::_pbi::TcParser::MiniParse, {}},
-  }}, {{
-    65535, 65535
-  }}, {{
-    // map<string, .io.deephaven.proto.backplane.grpc.ConfigValue> config_values = 1;
-    {PROTOBUF_FIELD_OFFSET(ConfigurationConstantsResponse, _impl_.config_values_), 0, 0,
-    (0 | ::_fl::kFcRepeated | ::_fl::kMap)},
-  }}, {{
-    {::_pbi::TcParser::GetMapAuxInfo<
-        decltype(ConfigurationConstantsResponse()._impl_.config_values_)>(
-        1, 0, 0, 9,
-        11)},
-    {::_pbi::TcParser::CreateInArenaStorageCb<::io::deephaven::proto::backplane::grpc::ConfigValue>},
-  }}, {{
-    "\100\15\0\0\0\0\0\0"
-    "io.deephaven.proto.backplane.grpc.ConfigurationConstantsResponse"
-    "config_values"
-  }},
-};
-
-::uint8_t* ConfigurationConstantsResponse::_InternalSerialize(
-    ::uint8_t* target,
-    ::google::protobuf::io::EpsCopyOutputStream* stream) const {
-  // @@protoc_insertion_point(serialize_to_array_start:io.deephaven.proto.backplane.grpc.ConfigurationConstantsResponse)
-  ::uint32_t cached_has_bits = 0;
-  (void)cached_has_bits;
-
-  // map<string, .io.deephaven.proto.backplane.grpc.ConfigValue> config_values = 1;
-  if (!_internal_config_values().empty()) {
-    using MapType = ::google::protobuf::Map<std::string, ::io::deephaven::proto::backplane::grpc::ConfigValue>;
-    using WireHelper = _pbi::MapEntryFuncs<std::string, ::io::deephaven::proto::backplane::grpc::ConfigValue,
-                                   _pbi::WireFormatLite::TYPE_STRING,
-                                   _pbi::WireFormatLite::TYPE_MESSAGE>;
-    const auto& field = _internal_config_values();
-
-    if (stream->IsSerializationDeterministic() && field.size() > 1) {
-      for (const auto& entry : ::google::protobuf::internal::MapSorterPtr<MapType>(field)) {
-        target = WireHelper::InternalSerialize(
-            1, entry.first, entry.second, target, stream);
-        ::google::protobuf::internal::WireFormatLite::VerifyUtf8String(
-            entry.first.data(), static_cast<int>(entry.first.length()),
- ::google::protobuf::internal::WireFormatLite::SERIALIZE, "io.deephaven.proto.backplane.grpc.ConfigurationConstantsResponse.config_values");
-      }
-    } else {
-      for (const auto& entry : field) {
-        target = WireHelper::InternalSerialize(
-            1, entry.first, entry.second, target, stream);
-        ::google::protobuf::internal::WireFormatLite::VerifyUtf8String(
-            entry.first.data(), static_cast<int>(entry.first.length()),
- ::google::protobuf::internal::WireFormatLite::SERIALIZE, "io.deephaven.proto.backplane.grpc.ConfigurationConstantsResponse.config_values");
-      }
-    }
-  }
-
-  if (PROTOBUF_PREDICT_FALSE(_internal_metadata_.have_unknown_fields())) {
-    target =
-        ::_pbi::WireFormat::InternalSerializeUnknownFieldsToArray(
-            _internal_metadata_.unknown_fields<::google::protobuf::UnknownFieldSet>(::google::protobuf::UnknownFieldSet::default_instance), target, stream);
-  }
-  // @@protoc_insertion_point(serialize_to_array_end:io.deephaven.proto.backplane.grpc.ConfigurationConstantsResponse)
-  return target;
-}
-
-::size_t ConfigurationConstantsResponse::ByteSizeLong() const {
-// @@protoc_insertion_point(message_byte_size_start:io.deephaven.proto.backplane.grpc.ConfigurationConstantsResponse)
-  ::size_t total_size = 0;
-
-  ::uint32_t cached_has_bits = 0;
-  // Prevent compiler warnings about cached_has_bits being unused
-  (void) cached_has_bits;
-
-  // map<string, .io.deephaven.proto.backplane.grpc.ConfigValue> config_values = 1;
-  total_size += 1 * ::google::protobuf::internal::FromIntSize(_internal_config_values_size());
-  for (const auto& entry : _internal_config_values()) {
-    total_size += _pbi::MapEntryFuncs<std::string, ::io::deephaven::proto::backplane::grpc::ConfigValue,
-                                   _pbi::WireFormatLite::TYPE_STRING,
-                                   _pbi::WireFormatLite::TYPE_MESSAGE>::ByteSizeLong(entry.first, entry.second);
-  }
-  return MaybeComputeUnknownFieldsSize(total_size, &_impl_._cached_size_);
-}
-
-const ::google::protobuf::Message::ClassData ConfigurationConstantsResponse::_class_data_ = {
-    ConfigurationConstantsResponse::MergeImpl,
-    nullptr,  // OnDemandRegisterArenaDtor
-};
-const ::google::protobuf::Message::ClassData* ConfigurationConstantsResponse::GetClassData() const {
-  return &_class_data_;
-}
-
-void ConfigurationConstantsResponse::MergeImpl(::google::protobuf::Message& to_msg, const ::google::protobuf::Message& from_msg) {
-  auto* const _this = static_cast<ConfigurationConstantsResponse*>(&to_msg);
-  auto& from = static_cast<const ConfigurationConstantsResponse&>(from_msg);
-  // @@protoc_insertion_point(class_specific_merge_from_start:io.deephaven.proto.backplane.grpc.ConfigurationConstantsResponse)
-  ABSL_DCHECK_NE(&from, _this);
-  ::uint32_t cached_has_bits = 0;
-  (void) cached_has_bits;
-
-  _this->_impl_.config_values_.MergeFrom(from._impl_.config_values_);
-  _this->_internal_metadata_.MergeFrom<::google::protobuf::UnknownFieldSet>(from._internal_metadata_);
-}
-
-void ConfigurationConstantsResponse::CopyFrom(const ConfigurationConstantsResponse& from) {
-// @@protoc_insertion_point(class_specific_copy_from_start:io.deephaven.proto.backplane.grpc.ConfigurationConstantsResponse)
-  if (&from == this) return;
-  Clear();
-  MergeFrom(from);
-}
-
-PROTOBUF_NOINLINE bool ConfigurationConstantsResponse::IsInitialized() const {
-  return true;
-}
-
-::_pbi::CachedSize* ConfigurationConstantsResponse::AccessCachedSize() const {
-  return &_impl_._cached_size_;
-}
-void ConfigurationConstantsResponse::InternalSwap(ConfigurationConstantsResponse* PROTOBUF_RESTRICT other) {
-  using std::swap;
-  _internal_metadata_.InternalSwap(&other->_internal_metadata_);
-  _impl_.config_values_.InternalSwap(&other->_impl_.config_values_);
-}
-
-::google::protobuf::Metadata ConfigurationConstantsResponse::GetMetadata() const {
-  return ::_pbi::AssignDescriptors(
-      &descriptor_table_deephaven_2fproto_2fconfig_2eproto_getter, &descriptor_table_deephaven_2fproto_2fconfig_2eproto_once,
-      file_level_metadata_deephaven_2fproto_2fconfig_2eproto[5]);
-}
-// ===================================================================
-
-class ConfigValue::_Internal {
- public:
-  static constexpr ::int32_t kOneofCaseOffset =
-    PROTOBUF_FIELD_OFFSET(::io::deephaven::proto::backplane::grpc::ConfigValue, _impl_._oneof_case_);
-};
-
-ConfigValue::ConfigValue(::google::protobuf::Arena* arena)
-    : ::google::protobuf::Message(arena) {
-  SharedCtor(arena);
-  // @@protoc_insertion_point(arena_constructor:io.deephaven.proto.backplane.grpc.ConfigValue)
-}
-inline PROTOBUF_NDEBUG_INLINE ConfigValue::Impl_::Impl_(
-    ::google::protobuf::internal::InternalVisibility visibility, ::google::protobuf::Arena* arena,
-    const Impl_& from)
-      : kind_{},
-        _cached_size_{0},
-        _oneof_case_{from._oneof_case_[0]} {}
-
-ConfigValue::ConfigValue(
-    ::google::protobuf::Arena* arena,
-    const ConfigValue& from)
-    : ::google::protobuf::Message(arena) {
-  ConfigValue* const _this = this;
-  (void)_this;
-  _internal_metadata_.MergeFrom<::google::protobuf::UnknownFieldSet>(
-      from._internal_metadata_);
-  new (&_impl_) Impl_(internal_visibility(), arena, from._impl_);
-  switch (kind_case()) {
-    case KIND_NOT_SET:
-      break;
-      case kStringValue:
-        new (&_impl_.kind_.string_value_) decltype(_impl_.kind_.string_value_){arena, from._impl_.kind_.string_value_};
-        break;
-  }
-
-  // @@protoc_insertion_point(copy_constructor:io.deephaven.proto.backplane.grpc.ConfigValue)
-}
-inline PROTOBUF_NDEBUG_INLINE ConfigValue::Impl_::Impl_(
-    ::google::protobuf::internal::InternalVisibility visibility,
-    ::google::protobuf::Arena* arena)
-      : kind_{},
-        _cached_size_{0},
-        _oneof_case_{} {}
-
-inline void ConfigValue::SharedCtor(::_pb::Arena* arena) {
-  new (&_impl_) Impl_(internal_visibility(), arena);
-}
-ConfigValue::~ConfigValue() {
-  // @@protoc_insertion_point(destructor:io.deephaven.proto.backplane.grpc.ConfigValue)
-  _internal_metadata_.Delete<::google::protobuf::UnknownFieldSet>();
-  SharedDtor();
-}
-inline void ConfigValue::SharedDtor() {
-  ABSL_DCHECK(GetArena() == nullptr);
-  if (has_kind()) {
-    clear_kind();
-  }
-  _impl_.~Impl_();
-}
-
-void ConfigValue::clear_kind() {
-// @@protoc_insertion_point(one_of_clear_start:io.deephaven.proto.backplane.grpc.ConfigValue)
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  switch (kind_case()) {
-    case kStringValue: {
-      _impl_.kind_.string_value_.Destroy();
-      break;
-    }
-    case KIND_NOT_SET: {
-      break;
-    }
-  }
-  _impl_._oneof_case_[0] = KIND_NOT_SET;
-}
-
-
-PROTOBUF_NOINLINE void ConfigValue::Clear() {
-// @@protoc_insertion_point(message_clear_start:io.deephaven.proto.backplane.grpc.ConfigValue)
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  ::uint32_t cached_has_bits = 0;
-  // Prevent compiler warnings about cached_has_bits being unused
-  (void) cached_has_bits;
-
-  clear_kind();
-  _internal_metadata_.Clear<::google::protobuf::UnknownFieldSet>();
-}
-
-const char* ConfigValue::_InternalParse(
-    const char* ptr, ::_pbi::ParseContext* ctx) {
-  ptr = ::_pbi::TcParser::ParseLoop(this, ptr, ctx, &_table_.header);
-  return ptr;
-}
-
-
-PROTOBUF_CONSTINIT PROTOBUF_ATTRIBUTE_INIT_PRIORITY1
-const ::_pbi::TcParseTable<0, 1, 0, 66, 2> ConfigValue::_table_ = {
-  {
-    0,  // no _has_bits_
-    0, // no _extensions_
-    3, 0,  // max_field_number, fast_idx_mask
-    offsetof(decltype(_table_), field_lookup_table),
-    4294967291,  // skipmap
-    offsetof(decltype(_table_), field_entries),
-    1,  // num_field_entries
-    0,  // num_aux_entries
-    offsetof(decltype(_table_), field_names),  // no aux_entries
-    &_ConfigValue_default_instance_._instance,
-    ::_pbi::TcParser::GenericFallback,  // fallback
-  }, {{
-    {::_pbi::TcParser::MiniParse, {}},
-  }}, {{
-    65535, 65535
-  }}, {{
-    // string string_value = 3;
-    {PROTOBUF_FIELD_OFFSET(ConfigValue, _impl_.kind_.string_value_), _Internal::kOneofCaseOffset + 0, 0,
-    (0 | ::_fl::kFcOneof | ::_fl::kUtf8String | ::_fl::kRepAString)},
-  }},
-  // no aux_entries
-  {{
-    "\55\14\0\0\0\0\0\0"
-    "io.deephaven.proto.backplane.grpc.ConfigValue"
-    "string_value"
-  }},
-};
-
-::uint8_t* ConfigValue::_InternalSerialize(
-    ::uint8_t* target,
-    ::google::protobuf::io::EpsCopyOutputStream* stream) const {
-  // @@protoc_insertion_point(serialize_to_array_start:io.deephaven.proto.backplane.grpc.ConfigValue)
-  ::uint32_t cached_has_bits = 0;
-  (void)cached_has_bits;
-
-  // string string_value = 3;
-  if (kind_case() == kStringValue) {
-    const std::string& _s = this->_internal_string_value();
-    ::google::protobuf::internal::WireFormatLite::VerifyUtf8String(
-        _s.data(), static_cast<int>(_s.length()), ::google::protobuf::internal::WireFormatLite::SERIALIZE, "io.deephaven.proto.backplane.grpc.ConfigValue.string_value");
-    target = stream->WriteStringMaybeAliased(3, _s, target);
-  }
-
-  if (PROTOBUF_PREDICT_FALSE(_internal_metadata_.have_unknown_fields())) {
-    target =
-        ::_pbi::WireFormat::InternalSerializeUnknownFieldsToArray(
-            _internal_metadata_.unknown_fields<::google::protobuf::UnknownFieldSet>(::google::protobuf::UnknownFieldSet::default_instance), target, stream);
-  }
-  // @@protoc_insertion_point(serialize_to_array_end:io.deephaven.proto.backplane.grpc.ConfigValue)
-  return target;
-}
-
-::size_t ConfigValue::ByteSizeLong() const {
-// @@protoc_insertion_point(message_byte_size_start:io.deephaven.proto.backplane.grpc.ConfigValue)
-  ::size_t total_size = 0;
-
-  ::uint32_t cached_has_bits = 0;
-  // Prevent compiler warnings about cached_has_bits being unused
-  (void) cached_has_bits;
-
-  switch (kind_case()) {
-    // string string_value = 3;
-    case kStringValue: {
-      total_size += 1 + ::google::protobuf::internal::WireFormatLite::StringSize(
-                                      this->_internal_string_value());
-      break;
-    }
-    case KIND_NOT_SET: {
-      break;
-    }
-  }
-  return MaybeComputeUnknownFieldsSize(total_size, &_impl_._cached_size_);
-}
-
-const ::google::protobuf::Message::ClassData ConfigValue::_class_data_ = {
-    ConfigValue::MergeImpl,
-    nullptr,  // OnDemandRegisterArenaDtor
-};
-const ::google::protobuf::Message::ClassData* ConfigValue::GetClassData() const {
-  return &_class_data_;
-}
-
-void ConfigValue::MergeImpl(::google::protobuf::Message& to_msg, const ::google::protobuf::Message& from_msg) {
-  auto* const _this = static_cast<ConfigValue*>(&to_msg);
-  auto& from = static_cast<const ConfigValue&>(from_msg);
-  // @@protoc_insertion_point(class_specific_merge_from_start:io.deephaven.proto.backplane.grpc.ConfigValue)
-  ABSL_DCHECK_NE(&from, _this);
-  ::uint32_t cached_has_bits = 0;
-  (void) cached_has_bits;
-
-  switch (from.kind_case()) {
-    case kStringValue: {
-      _this->_internal_set_string_value(from._internal_string_value());
-      break;
-    }
-    case KIND_NOT_SET: {
-      break;
-    }
-  }
-  _this->_internal_metadata_.MergeFrom<::google::protobuf::UnknownFieldSet>(from._internal_metadata_);
-}
-
-void ConfigValue::CopyFrom(const ConfigValue& from) {
-// @@protoc_insertion_point(class_specific_copy_from_start:io.deephaven.proto.backplane.grpc.ConfigValue)
-  if (&from == this) return;
-  Clear();
-  MergeFrom(from);
-}
-
-PROTOBUF_NOINLINE bool ConfigValue::IsInitialized() const {
-  return true;
-}
-
-::_pbi::CachedSize* ConfigValue::AccessCachedSize() const {
-  return &_impl_._cached_size_;
-}
-void ConfigValue::InternalSwap(ConfigValue* PROTOBUF_RESTRICT other) {
-  using std::swap;
-  _internal_metadata_.InternalSwap(&other->_internal_metadata_);
-  swap(_impl_.kind_, other->_impl_.kind_);
-  swap(_impl_._oneof_case_[0], other->_impl_._oneof_case_[0]);
-}
-
-::google::protobuf::Metadata ConfigValue::GetMetadata() const {
-  return ::_pbi::AssignDescriptors(
-      &descriptor_table_deephaven_2fproto_2fconfig_2eproto_getter, &descriptor_table_deephaven_2fproto_2fconfig_2eproto_once,
-      file_level_metadata_deephaven_2fproto_2fconfig_2eproto[6]);
-}
-// @@protoc_insertion_point(namespace_scope)
-}  // namespace grpc
-}  // namespace backplane
-}  // namespace proto
-}  // namespace deephaven
-}  // namespace io
-namespace google {
-namespace protobuf {
-}  // namespace protobuf
-}  // namespace google
-// @@protoc_insertion_point(global_scope)
-#include "google/protobuf/port_undef.inc"
diff --git a/cpp-client/deephaven/dhclient/proto/deephaven/proto/config.pb.h b/cpp-client/deephaven/dhclient/proto/deephaven/proto/config.pb.h
deleted file mode 100644
index 609b9fec12f..00000000000
--- a/cpp-client/deephaven/dhclient/proto/deephaven/proto/config.pb.h
+++ /dev/null
@@ -1,1206 +0,0 @@
-// Generated by the protocol buffer compiler.  DO NOT EDIT!
-// source: deephaven/proto/config.proto
-// Protobuf C++ Version: 4.25.3
-
-#ifndef GOOGLE_PROTOBUF_INCLUDED_deephaven_2fproto_2fconfig_2eproto_2epb_2eh
-#define GOOGLE_PROTOBUF_INCLUDED_deephaven_2fproto_2fconfig_2eproto_2epb_2eh
-
-#include <limits>
-#include <string>
-#include <type_traits>
-#include <utility>
-
-#include "google/protobuf/port_def.inc"
-#if PROTOBUF_VERSION < 4025000
-#error "This file was generated by a newer version of protoc which is"
-#error "incompatible with your Protocol Buffer headers. Please update"
-#error "your headers."
-#endif  // PROTOBUF_VERSION
-
-#if 4025003 < PROTOBUF_MIN_PROTOC_VERSION
-#error "This file was generated by an older version of protoc which is"
-#error "incompatible with your Protocol Buffer headers. Please"
-#error "regenerate this file with a newer version of protoc."
-#endif  // PROTOBUF_MIN_PROTOC_VERSION
-#include "google/protobuf/port_undef.inc"
-#include "google/protobuf/io/coded_stream.h"
-#include "google/protobuf/arena.h"
-#include "google/protobuf/arenastring.h"
-#include "google/protobuf/generated_message_bases.h"
-#include "google/protobuf/generated_message_tctable_decl.h"
-#include "google/protobuf/generated_message_util.h"
-#include "google/protobuf/metadata_lite.h"
-#include "google/protobuf/generated_message_reflection.h"
-#include "google/protobuf/message.h"
-#include "google/protobuf/repeated_field.h"  // IWYU pragma: export
-#include "google/protobuf/extension_set.h"  // IWYU pragma: export
-#include "google/protobuf/map.h"  // IWYU pragma: export
-#include "google/protobuf/map_entry.h"
-#include "google/protobuf/map_field_inl.h"
-#include "google/protobuf/unknown_field_set.h"
-// @@protoc_insertion_point(includes)
-
-// Must be included last.
-#include "google/protobuf/port_def.inc"
-
-#define PROTOBUF_INTERNAL_EXPORT_deephaven_2fproto_2fconfig_2eproto
-
-namespace google {
-namespace protobuf {
-namespace internal {
-class AnyMetadata;
-}  // namespace internal
-}  // namespace protobuf
-}  // namespace google
-
-// Internal implementation detail -- do not use these members.
-struct TableStruct_deephaven_2fproto_2fconfig_2eproto {
-  static const ::uint32_t offsets[];
-};
-extern const ::google::protobuf::internal::DescriptorTable
-    descriptor_table_deephaven_2fproto_2fconfig_2eproto;
-namespace io {
-namespace deephaven {
-namespace proto {
-namespace backplane {
-namespace grpc {
-class AuthenticationConstantsRequest;
-struct AuthenticationConstantsRequestDefaultTypeInternal;
-extern AuthenticationConstantsRequestDefaultTypeInternal _AuthenticationConstantsRequest_default_instance_;
-class AuthenticationConstantsResponse;
-struct AuthenticationConstantsResponseDefaultTypeInternal;
-extern AuthenticationConstantsResponseDefaultTypeInternal _AuthenticationConstantsResponse_default_instance_;
-class AuthenticationConstantsResponse_ConfigValuesEntry_DoNotUse;
-struct AuthenticationConstantsResponse_ConfigValuesEntry_DoNotUseDefaultTypeInternal;
-extern AuthenticationConstantsResponse_ConfigValuesEntry_DoNotUseDefaultTypeInternal _AuthenticationConstantsResponse_ConfigValuesEntry_DoNotUse_default_instance_;
-class ConfigValue;
-struct ConfigValueDefaultTypeInternal;
-extern ConfigValueDefaultTypeInternal _ConfigValue_default_instance_;
-class ConfigurationConstantsRequest;
-struct ConfigurationConstantsRequestDefaultTypeInternal;
-extern ConfigurationConstantsRequestDefaultTypeInternal _ConfigurationConstantsRequest_default_instance_;
-class ConfigurationConstantsResponse;
-struct ConfigurationConstantsResponseDefaultTypeInternal;
-extern ConfigurationConstantsResponseDefaultTypeInternal _ConfigurationConstantsResponse_default_instance_;
-class ConfigurationConstantsResponse_ConfigValuesEntry_DoNotUse;
-struct ConfigurationConstantsResponse_ConfigValuesEntry_DoNotUseDefaultTypeInternal;
-extern ConfigurationConstantsResponse_ConfigValuesEntry_DoNotUseDefaultTypeInternal _ConfigurationConstantsResponse_ConfigValuesEntry_DoNotUse_default_instance_;
-}  // namespace grpc
-}  // namespace backplane
-}  // namespace proto
-}  // namespace deephaven
-}  // namespace io
-namespace google {
-namespace protobuf {
-}  // namespace protobuf
-}  // namespace google
-
-namespace io {
-namespace deephaven {
-namespace proto {
-namespace backplane {
-namespace grpc {
-
-// ===================================================================
-
-
-// -------------------------------------------------------------------
-
-class ConfigurationConstantsRequest final :
-    public ::google::protobuf::internal::ZeroFieldsBase /* @@protoc_insertion_point(class_definition:io.deephaven.proto.backplane.grpc.ConfigurationConstantsRequest) */ {
- public:
-  inline ConfigurationConstantsRequest() : ConfigurationConstantsRequest(nullptr) {}
-  template<typename = void>
-  explicit PROTOBUF_CONSTEXPR ConfigurationConstantsRequest(::google::protobuf::internal::ConstantInitialized);
-
-  inline ConfigurationConstantsRequest(const ConfigurationConstantsRequest& from)
-      : ConfigurationConstantsRequest(nullptr, from) {}
-  ConfigurationConstantsRequest(ConfigurationConstantsRequest&& from) noexcept
-    : ConfigurationConstantsRequest() {
-    *this = ::std::move(from);
-  }
-
-  inline ConfigurationConstantsRequest& operator=(const ConfigurationConstantsRequest& from) {
-    CopyFrom(from);
-    return *this;
-  }
-  inline ConfigurationConstantsRequest& operator=(ConfigurationConstantsRequest&& from) noexcept {
-    if (this == &from) return *this;
-    if (GetArena() == from.GetArena()
-  #ifdef PROTOBUF_FORCE_COPY_IN_MOVE
-        && GetArena() != nullptr
-  #endif  // !PROTOBUF_FORCE_COPY_IN_MOVE
-    ) {
-      InternalSwap(&from);
-    } else {
-      CopyFrom(from);
-    }
-    return *this;
-  }
-
-  inline const ::google::protobuf::UnknownFieldSet& unknown_fields() const
-      ABSL_ATTRIBUTE_LIFETIME_BOUND {
-    return _internal_metadata_.unknown_fields<::google::protobuf::UnknownFieldSet>(::google::protobuf::UnknownFieldSet::default_instance);
-  }
-  inline ::google::protobuf::UnknownFieldSet* mutable_unknown_fields()
-      ABSL_ATTRIBUTE_LIFETIME_BOUND {
-    return _internal_metadata_.mutable_unknown_fields<::google::protobuf::UnknownFieldSet>();
-  }
-
-  static const ::google::protobuf::Descriptor* descriptor() {
-    return GetDescriptor();
-  }
-  static const ::google::protobuf::Descriptor* GetDescriptor() {
-    return default_instance().GetMetadata().descriptor;
-  }
-  static const ::google::protobuf::Reflection* GetReflection() {
-    return default_instance().GetMetadata().reflection;
-  }
-  static const ConfigurationConstantsRequest& default_instance() {
-    return *internal_default_instance();
-  }
-  static inline const ConfigurationConstantsRequest* internal_default_instance() {
-    return reinterpret_cast<const ConfigurationConstantsRequest*>(
-               &_ConfigurationConstantsRequest_default_instance_);
-  }
-  static constexpr int kIndexInFileMessages =
-    1;
-
-  friend void swap(ConfigurationConstantsRequest& a, ConfigurationConstantsRequest& b) {
-    a.Swap(&b);
-  }
-  inline void Swap(ConfigurationConstantsRequest* other) {
-    if (other == this) return;
-  #ifdef PROTOBUF_FORCE_COPY_IN_SWAP
-    if (GetArena() != nullptr &&
-        GetArena() == other->GetArena()) {
-   #else  // PROTOBUF_FORCE_COPY_IN_SWAP
-    if (GetArena() == other->GetArena()) {
-  #endif  // !PROTOBUF_FORCE_COPY_IN_SWAP
-      InternalSwap(other);
-    } else {
-      ::google::protobuf::internal::GenericSwap(this, other);
-    }
-  }
-  void UnsafeArenaSwap(ConfigurationConstantsRequest* other) {
-    if (other == this) return;
-    ABSL_DCHECK(GetArena() == other->GetArena());
-    InternalSwap(other);
-  }
-
-  // implements Message ----------------------------------------------
-
-  ConfigurationConstantsRequest* New(::google::protobuf::Arena* arena = nullptr) const final {
-    return CreateMaybeMessage<ConfigurationConstantsRequest>(arena);
-  }
-  using ::google::protobuf::internal::ZeroFieldsBase::CopyFrom;
-  inline void CopyFrom(const ConfigurationConstantsRequest& from) {
-    ::google::protobuf::internal::ZeroFieldsBase::CopyImpl(*this, from);
-  }
-  using ::google::protobuf::internal::ZeroFieldsBase::MergeFrom;
-  void MergeFrom(const ConfigurationConstantsRequest& from) {
-    ::google::protobuf::internal::ZeroFieldsBase::MergeImpl(*this, from);
-  }
-  public:
-
-  private:
-  friend class ::google::protobuf::internal::AnyMetadata;
-  static ::absl::string_view FullMessageName() {
-    return "io.deephaven.proto.backplane.grpc.ConfigurationConstantsRequest";
-  }
-  protected:
-  explicit ConfigurationConstantsRequest(::google::protobuf::Arena* arena);
-  ConfigurationConstantsRequest(::google::protobuf::Arena* arena, const ConfigurationConstantsRequest& from);
-  public:
-
-  ::google::protobuf::Metadata GetMetadata() const final;
-
-  // nested types ----------------------------------------------------
-
-  // accessors -------------------------------------------------------
-
-  // @@protoc_insertion_point(class_scope:io.deephaven.proto.backplane.grpc.ConfigurationConstantsRequest)
- private:
-  class _Internal;
-
-  friend class ::google::protobuf::MessageLite;
-  friend class ::google::protobuf::Arena;
-  template <typename T>
-  friend class ::google::protobuf::Arena::InternalHelper;
-  using InternalArenaConstructable_ = void;
-  using DestructorSkippable_ = void;
-  struct Impl_ {
-
-        inline explicit constexpr Impl_(
-            ::google::protobuf::internal::ConstantInitialized) noexcept;
-        inline explicit Impl_(::google::protobuf::internal::InternalVisibility visibility,
-                              ::google::protobuf::Arena* arena);
-        inline explicit Impl_(::google::protobuf::internal::InternalVisibility visibility,
-                              ::google::protobuf::Arena* arena, const Impl_& from);
-    PROTOBUF_TSAN_DECLARE_MEMBER
-  };
-  friend struct ::TableStruct_deephaven_2fproto_2fconfig_2eproto;
-};// -------------------------------------------------------------------
-
-class ConfigValue final :
-    public ::google::protobuf::Message /* @@protoc_insertion_point(class_definition:io.deephaven.proto.backplane.grpc.ConfigValue) */ {
- public:
-  inline ConfigValue() : ConfigValue(nullptr) {}
-  ~ConfigValue() override;
-  template<typename = void>
-  explicit PROTOBUF_CONSTEXPR ConfigValue(::google::protobuf::internal::ConstantInitialized);
-
-  inline ConfigValue(const ConfigValue& from)
-      : ConfigValue(nullptr, from) {}
-  ConfigValue(ConfigValue&& from) noexcept
-    : ConfigValue() {
-    *this = ::std::move(from);
-  }
-
-  inline ConfigValue& operator=(const ConfigValue& from) {
-    CopyFrom(from);
-    return *this;
-  }
-  inline ConfigValue& operator=(ConfigValue&& from) noexcept {
-    if (this == &from) return *this;
-    if (GetArena() == from.GetArena()
-  #ifdef PROTOBUF_FORCE_COPY_IN_MOVE
-        && GetArena() != nullptr
-  #endif  // !PROTOBUF_FORCE_COPY_IN_MOVE
-    ) {
-      InternalSwap(&from);
-    } else {
-      CopyFrom(from);
-    }
-    return *this;
-  }
-
-  inline const ::google::protobuf::UnknownFieldSet& unknown_fields() const
-      ABSL_ATTRIBUTE_LIFETIME_BOUND {
-    return _internal_metadata_.unknown_fields<::google::protobuf::UnknownFieldSet>(::google::protobuf::UnknownFieldSet::default_instance);
-  }
-  inline ::google::protobuf::UnknownFieldSet* mutable_unknown_fields()
-      ABSL_ATTRIBUTE_LIFETIME_BOUND {
-    return _internal_metadata_.mutable_unknown_fields<::google::protobuf::UnknownFieldSet>();
-  }
-
-  static const ::google::protobuf::Descriptor* descriptor() {
-    return GetDescriptor();
-  }
-  static const ::google::protobuf::Descriptor* GetDescriptor() {
-    return default_instance().GetMetadata().descriptor;
-  }
-  static const ::google::protobuf::Reflection* GetReflection() {
-    return default_instance().GetMetadata().reflection;
-  }
-  static const ConfigValue& default_instance() {
-    return *internal_default_instance();
-  }
-  enum KindCase {
-    kStringValue = 3,
-    KIND_NOT_SET = 0,
-  };
-
-  static inline const ConfigValue* internal_default_instance() {
-    return reinterpret_cast<const ConfigValue*>(
-               &_ConfigValue_default_instance_);
-  }
-  static constexpr int kIndexInFileMessages =
-    6;
-
-  friend void swap(ConfigValue& a, ConfigValue& b) {
-    a.Swap(&b);
-  }
-  inline void Swap(ConfigValue* other) {
-    if (other == this) return;
-  #ifdef PROTOBUF_FORCE_COPY_IN_SWAP
-    if (GetArena() != nullptr &&
-        GetArena() == other->GetArena()) {
-   #else  // PROTOBUF_FORCE_COPY_IN_SWAP
-    if (GetArena() == other->GetArena()) {
-  #endif  // !PROTOBUF_FORCE_COPY_IN_SWAP
-      InternalSwap(other);
-    } else {
-      ::google::protobuf::internal::GenericSwap(this, other);
-    }
-  }
-  void UnsafeArenaSwap(ConfigValue* other) {
-    if (other == this) return;
-    ABSL_DCHECK(GetArena() == other->GetArena());
-    InternalSwap(other);
-  }
-
-  // implements Message ----------------------------------------------
-
-  ConfigValue* New(::google::protobuf::Arena* arena = nullptr) const final {
-    return CreateMaybeMessage<ConfigValue>(arena);
-  }
-  using ::google::protobuf::Message::CopyFrom;
-  void CopyFrom(const ConfigValue& from);
-  using ::google::protobuf::Message::MergeFrom;
-  void MergeFrom( const ConfigValue& from) {
-    ConfigValue::MergeImpl(*this, from);
-  }
-  private:
-  static void MergeImpl(::google::protobuf::Message& to_msg, const ::google::protobuf::Message& from_msg);
-  public:
-  PROTOBUF_ATTRIBUTE_REINITIALIZES void Clear() final;
-  bool IsInitialized() const final;
-
-  ::size_t ByteSizeLong() const final;
-  const char* _InternalParse(const char* ptr, ::google::protobuf::internal::ParseContext* ctx) final;
-  ::uint8_t* _InternalSerialize(
-      ::uint8_t* target, ::google::protobuf::io::EpsCopyOutputStream* stream) const final;
-  int GetCachedSize() const { return _impl_._cached_size_.Get(); }
-
-  private:
-  ::google::protobuf::internal::CachedSize* AccessCachedSize() const final;
-  void SharedCtor(::google::protobuf::Arena* arena);
-  void SharedDtor();
-  void InternalSwap(ConfigValue* other);
-
-  private:
-  friend class ::google::protobuf::internal::AnyMetadata;
-  static ::absl::string_view FullMessageName() {
-    return "io.deephaven.proto.backplane.grpc.ConfigValue";
-  }
-  protected:
-  explicit ConfigValue(::google::protobuf::Arena* arena);
-  ConfigValue(::google::protobuf::Arena* arena, const ConfigValue& from);
-  public:
-
-  static const ClassData _class_data_;
-  const ::google::protobuf::Message::ClassData*GetClassData() const final;
-
-  ::google::protobuf::Metadata GetMetadata() const final;
-
-  // nested types ----------------------------------------------------
-
-  // accessors -------------------------------------------------------
-
-  enum : int {
-    kStringValueFieldNumber = 3,
-  };
-  // string string_value = 3;
-  bool has_string_value() const;
-  void clear_string_value() ;
-  const std::string& string_value() const;
-  template <typename Arg_ = const std::string&, typename... Args_>
-  void set_string_value(Arg_&& arg, Args_... args);
-  std::string* mutable_string_value();
-  PROTOBUF_NODISCARD std::string* release_string_value();
-  void set_allocated_string_value(std::string* value);
-
-  private:
-  const std::string& _internal_string_value() const;
-  inline PROTOBUF_ALWAYS_INLINE void _internal_set_string_value(
-      const std::string& value);
-  std::string* _internal_mutable_string_value();
-
-  public:
-  void clear_kind();
-  KindCase kind_case() const;
-  // @@protoc_insertion_point(class_scope:io.deephaven.proto.backplane.grpc.ConfigValue)
- private:
-  class _Internal;
-  void set_has_string_value();
-
-  inline bool has_kind() const;
-  inline void clear_has_kind();
-
-  friend class ::google::protobuf::internal::TcParser;
-  static const ::google::protobuf::internal::TcParseTable<
-      0, 1, 0,
-      66, 2>
-      _table_;
-  friend class ::google::protobuf::MessageLite;
-  friend class ::google::protobuf::Arena;
-  template <typename T>
-  friend class ::google::protobuf::Arena::InternalHelper;
-  using InternalArenaConstructable_ = void;
-  using DestructorSkippable_ = void;
-  struct Impl_ {
-
-        inline explicit constexpr Impl_(
-            ::google::protobuf::internal::ConstantInitialized) noexcept;
-        inline explicit Impl_(::google::protobuf::internal::InternalVisibility visibility,
-                              ::google::protobuf::Arena* arena);
-        inline explicit Impl_(::google::protobuf::internal::InternalVisibility visibility,
-                              ::google::protobuf::Arena* arena, const Impl_& from);
-    union KindUnion {
-      constexpr KindUnion() : _constinit_{} {}
-        ::google::protobuf::internal::ConstantInitialized _constinit_;
-      ::google::protobuf::internal::ArenaStringPtr string_value_;
-    } kind_;
-    mutable ::google::protobuf::internal::CachedSize _cached_size_;
-    ::uint32_t _oneof_case_[1];
-
-    PROTOBUF_TSAN_DECLARE_MEMBER
-  };
-  union { Impl_ _impl_; };
-  friend struct ::TableStruct_deephaven_2fproto_2fconfig_2eproto;
-};// -------------------------------------------------------------------
-
-class AuthenticationConstantsRequest final :
-    public ::google::protobuf::internal::ZeroFieldsBase /* @@protoc_insertion_point(class_definition:io.deephaven.proto.backplane.grpc.AuthenticationConstantsRequest) */ {
- public:
-  inline AuthenticationConstantsRequest() : AuthenticationConstantsRequest(nullptr) {}
-  template<typename = void>
-  explicit PROTOBUF_CONSTEXPR AuthenticationConstantsRequest(::google::protobuf::internal::ConstantInitialized);
-
-  inline AuthenticationConstantsRequest(const AuthenticationConstantsRequest& from)
-      : AuthenticationConstantsRequest(nullptr, from) {}
-  AuthenticationConstantsRequest(AuthenticationConstantsRequest&& from) noexcept
-    : AuthenticationConstantsRequest() {
-    *this = ::std::move(from);
-  }
-
-  inline AuthenticationConstantsRequest& operator=(const AuthenticationConstantsRequest& from) {
-    CopyFrom(from);
-    return *this;
-  }
-  inline AuthenticationConstantsRequest& operator=(AuthenticationConstantsRequest&& from) noexcept {
-    if (this == &from) return *this;
-    if (GetArena() == from.GetArena()
-  #ifdef PROTOBUF_FORCE_COPY_IN_MOVE
-        && GetArena() != nullptr
-  #endif  // !PROTOBUF_FORCE_COPY_IN_MOVE
-    ) {
-      InternalSwap(&from);
-    } else {
-      CopyFrom(from);
-    }
-    return *this;
-  }
-
-  inline const ::google::protobuf::UnknownFieldSet& unknown_fields() const
-      ABSL_ATTRIBUTE_LIFETIME_BOUND {
-    return _internal_metadata_.unknown_fields<::google::protobuf::UnknownFieldSet>(::google::protobuf::UnknownFieldSet::default_instance);
-  }
-  inline ::google::protobuf::UnknownFieldSet* mutable_unknown_fields()
-      ABSL_ATTRIBUTE_LIFETIME_BOUND {
-    return _internal_metadata_.mutable_unknown_fields<::google::protobuf::UnknownFieldSet>();
-  }
-
-  static const ::google::protobuf::Descriptor* descriptor() {
-    return GetDescriptor();
-  }
-  static const ::google::protobuf::Descriptor* GetDescriptor() {
-    return default_instance().GetMetadata().descriptor;
-  }
-  static const ::google::protobuf::Reflection* GetReflection() {
-    return default_instance().GetMetadata().reflection;
-  }
-  static const AuthenticationConstantsRequest& default_instance() {
-    return *internal_default_instance();
-  }
-  static inline const AuthenticationConstantsRequest* internal_default_instance() {
-    return reinterpret_cast<const AuthenticationConstantsRequest*>(
-               &_AuthenticationConstantsRequest_default_instance_);
-  }
-  static constexpr int kIndexInFileMessages =
-    0;
-
-  friend void swap(AuthenticationConstantsRequest& a, AuthenticationConstantsRequest& b) {
-    a.Swap(&b);
-  }
-  inline void Swap(AuthenticationConstantsRequest* other) {
-    if (other == this) return;
-  #ifdef PROTOBUF_FORCE_COPY_IN_SWAP
-    if (GetArena() != nullptr &&
-        GetArena() == other->GetArena()) {
-   #else  // PROTOBUF_FORCE_COPY_IN_SWAP
-    if (GetArena() == other->GetArena()) {
-  #endif  // !PROTOBUF_FORCE_COPY_IN_SWAP
-      InternalSwap(other);
-    } else {
-      ::google::protobuf::internal::GenericSwap(this, other);
-    }
-  }
-  void UnsafeArenaSwap(AuthenticationConstantsRequest* other) {
-    if (other == this) return;
-    ABSL_DCHECK(GetArena() == other->GetArena());
-    InternalSwap(other);
-  }
-
-  // implements Message ----------------------------------------------
-
-  AuthenticationConstantsRequest* New(::google::protobuf::Arena* arena = nullptr) const final {
-    return CreateMaybeMessage<AuthenticationConstantsRequest>(arena);
-  }
-  using ::google::protobuf::internal::ZeroFieldsBase::CopyFrom;
-  inline void CopyFrom(const AuthenticationConstantsRequest& from) {
-    ::google::protobuf::internal::ZeroFieldsBase::CopyImpl(*this, from);
-  }
-  using ::google::protobuf::internal::ZeroFieldsBase::MergeFrom;
-  void MergeFrom(const AuthenticationConstantsRequest& from) {
-    ::google::protobuf::internal::ZeroFieldsBase::MergeImpl(*this, from);
-  }
-  public:
-
-  private:
-  friend class ::google::protobuf::internal::AnyMetadata;
-  static ::absl::string_view FullMessageName() {
-    return "io.deephaven.proto.backplane.grpc.AuthenticationConstantsRequest";
-  }
-  protected:
-  explicit AuthenticationConstantsRequest(::google::protobuf::Arena* arena);
-  AuthenticationConstantsRequest(::google::protobuf::Arena* arena, const AuthenticationConstantsRequest& from);
-  public:
-
-  ::google::protobuf::Metadata GetMetadata() const final;
-
-  // nested types ----------------------------------------------------
-
-  // accessors -------------------------------------------------------
-
-  // @@protoc_insertion_point(class_scope:io.deephaven.proto.backplane.grpc.AuthenticationConstantsRequest)
- private:
-  class _Internal;
-
-  friend class ::google::protobuf::MessageLite;
-  friend class ::google::protobuf::Arena;
-  template <typename T>
-  friend class ::google::protobuf::Arena::InternalHelper;
-  using InternalArenaConstructable_ = void;
-  using DestructorSkippable_ = void;
-  struct Impl_ {
-
-        inline explicit constexpr Impl_(
-            ::google::protobuf::internal::ConstantInitialized) noexcept;
-        inline explicit Impl_(::google::protobuf::internal::InternalVisibility visibility,
-                              ::google::protobuf::Arena* arena);
-        inline explicit Impl_(::google::protobuf::internal::InternalVisibility visibility,
-                              ::google::protobuf::Arena* arena, const Impl_& from);
-    PROTOBUF_TSAN_DECLARE_MEMBER
-  };
-  friend struct ::TableStruct_deephaven_2fproto_2fconfig_2eproto;
-};// -------------------------------------------------------------------
-
-class ConfigurationConstantsResponse_ConfigValuesEntry_DoNotUse final
-    : public ::google::protobuf::internal::MapEntry<
-          ConfigurationConstantsResponse_ConfigValuesEntry_DoNotUse, std::string, ::io::deephaven::proto::backplane::grpc::ConfigValue,
-          ::google::protobuf::internal::WireFormatLite::TYPE_STRING,
-          ::google::protobuf::internal::WireFormatLite::TYPE_MESSAGE> {
- public:
-  using SuperType = ::google::protobuf::internal::MapEntry<
-      ConfigurationConstantsResponse_ConfigValuesEntry_DoNotUse, std::string, ::io::deephaven::proto::backplane::grpc::ConfigValue,
-      ::google::protobuf::internal::WireFormatLite::TYPE_STRING,
-      ::google::protobuf::internal::WireFormatLite::TYPE_MESSAGE>;
-  ConfigurationConstantsResponse_ConfigValuesEntry_DoNotUse();
-  template <typename = void>
-  explicit PROTOBUF_CONSTEXPR ConfigurationConstantsResponse_ConfigValuesEntry_DoNotUse(
-      ::google::protobuf::internal::ConstantInitialized);
-  explicit ConfigurationConstantsResponse_ConfigValuesEntry_DoNotUse(::google::protobuf::Arena* arena);
-  static const ConfigurationConstantsResponse_ConfigValuesEntry_DoNotUse* internal_default_instance() {
-    return reinterpret_cast<const ConfigurationConstantsResponse_ConfigValuesEntry_DoNotUse*>(
-        &_ConfigurationConstantsResponse_ConfigValuesEntry_DoNotUse_default_instance_);
-  }
-  static bool ValidateKey(std::string* s) {
-    return ::google::protobuf::internal::WireFormatLite::VerifyUtf8String(s->data(), static_cast<int>(s->size()), ::google::protobuf::internal::WireFormatLite::PARSE, "io.deephaven.proto.backplane.grpc.ConfigurationConstantsResponse.ConfigValuesEntry.key");
- }
-  static bool ValidateValue(void*) { return true; }
-  ::google::protobuf::Metadata GetMetadata() const final;
-  friend struct ::TableStruct_deephaven_2fproto_2fconfig_2eproto;
-};
-// -------------------------------------------------------------------
-
-class AuthenticationConstantsResponse_ConfigValuesEntry_DoNotUse final
-    : public ::google::protobuf::internal::MapEntry<
-          AuthenticationConstantsResponse_ConfigValuesEntry_DoNotUse, std::string, ::io::deephaven::proto::backplane::grpc::ConfigValue,
-          ::google::protobuf::internal::WireFormatLite::TYPE_STRING,
-          ::google::protobuf::internal::WireFormatLite::TYPE_MESSAGE> {
- public:
-  using SuperType = ::google::protobuf::internal::MapEntry<
-      AuthenticationConstantsResponse_ConfigValuesEntry_DoNotUse, std::string, ::io::deephaven::proto::backplane::grpc::ConfigValue,
-      ::google::protobuf::internal::WireFormatLite::TYPE_STRING,
-      ::google::protobuf::internal::WireFormatLite::TYPE_MESSAGE>;
-  AuthenticationConstantsResponse_ConfigValuesEntry_DoNotUse();
-  template <typename = void>
-  explicit PROTOBUF_CONSTEXPR AuthenticationConstantsResponse_ConfigValuesEntry_DoNotUse(
-      ::google::protobuf::internal::ConstantInitialized);
-  explicit AuthenticationConstantsResponse_ConfigValuesEntry_DoNotUse(::google::protobuf::Arena* arena);
-  static const AuthenticationConstantsResponse_ConfigValuesEntry_DoNotUse* internal_default_instance() {
-    return reinterpret_cast<const AuthenticationConstantsResponse_ConfigValuesEntry_DoNotUse*>(
-        &_AuthenticationConstantsResponse_ConfigValuesEntry_DoNotUse_default_instance_);
-  }
-  static bool ValidateKey(std::string* s) {
-    return ::google::protobuf::internal::WireFormatLite::VerifyUtf8String(s->data(), static_cast<int>(s->size()), ::google::protobuf::internal::WireFormatLite::PARSE, "io.deephaven.proto.backplane.grpc.AuthenticationConstantsResponse.ConfigValuesEntry.key");
- }
-  static bool ValidateValue(void*) { return true; }
-  ::google::protobuf::Metadata GetMetadata() const final;
-  friend struct ::TableStruct_deephaven_2fproto_2fconfig_2eproto;
-};
-// -------------------------------------------------------------------
-
-class ConfigurationConstantsResponse final :
-    public ::google::protobuf::Message /* @@protoc_insertion_point(class_definition:io.deephaven.proto.backplane.grpc.ConfigurationConstantsResponse) */ {
- public:
-  inline ConfigurationConstantsResponse() : ConfigurationConstantsResponse(nullptr) {}
-  ~ConfigurationConstantsResponse() override;
-  template<typename = void>
-  explicit PROTOBUF_CONSTEXPR ConfigurationConstantsResponse(::google::protobuf::internal::ConstantInitialized);
-
-  inline ConfigurationConstantsResponse(const ConfigurationConstantsResponse& from)
-      : ConfigurationConstantsResponse(nullptr, from) {}
-  ConfigurationConstantsResponse(ConfigurationConstantsResponse&& from) noexcept
-    : ConfigurationConstantsResponse() {
-    *this = ::std::move(from);
-  }
-
-  inline ConfigurationConstantsResponse& operator=(const ConfigurationConstantsResponse& from) {
-    CopyFrom(from);
-    return *this;
-  }
-  inline ConfigurationConstantsResponse& operator=(ConfigurationConstantsResponse&& from) noexcept {
-    if (this == &from) return *this;
-    if (GetArena() == from.GetArena()
-  #ifdef PROTOBUF_FORCE_COPY_IN_MOVE
-        && GetArena() != nullptr
-  #endif  // !PROTOBUF_FORCE_COPY_IN_MOVE
-    ) {
-      InternalSwap(&from);
-    } else {
-      CopyFrom(from);
-    }
-    return *this;
-  }
-
-  inline const ::google::protobuf::UnknownFieldSet& unknown_fields() const
-      ABSL_ATTRIBUTE_LIFETIME_BOUND {
-    return _internal_metadata_.unknown_fields<::google::protobuf::UnknownFieldSet>(::google::protobuf::UnknownFieldSet::default_instance);
-  }
-  inline ::google::protobuf::UnknownFieldSet* mutable_unknown_fields()
-      ABSL_ATTRIBUTE_LIFETIME_BOUND {
-    return _internal_metadata_.mutable_unknown_fields<::google::protobuf::UnknownFieldSet>();
-  }
-
-  static const ::google::protobuf::Descriptor* descriptor() {
-    return GetDescriptor();
-  }
-  static const ::google::protobuf::Descriptor* GetDescriptor() {
-    return default_instance().GetMetadata().descriptor;
-  }
-  static const ::google::protobuf::Reflection* GetReflection() {
-    return default_instance().GetMetadata().reflection;
-  }
-  static const ConfigurationConstantsResponse& default_instance() {
-    return *internal_default_instance();
-  }
-  static inline const ConfigurationConstantsResponse* internal_default_instance() {
-    return reinterpret_cast<const ConfigurationConstantsResponse*>(
-               &_ConfigurationConstantsResponse_default_instance_);
-  }
-  static constexpr int kIndexInFileMessages =
-    5;
-
-  friend void swap(ConfigurationConstantsResponse& a, ConfigurationConstantsResponse& b) {
-    a.Swap(&b);
-  }
-  inline void Swap(ConfigurationConstantsResponse* other) {
-    if (other == this) return;
-  #ifdef PROTOBUF_FORCE_COPY_IN_SWAP
-    if (GetArena() != nullptr &&
-        GetArena() == other->GetArena()) {
-   #else  // PROTOBUF_FORCE_COPY_IN_SWAP
-    if (GetArena() == other->GetArena()) {
-  #endif  // !PROTOBUF_FORCE_COPY_IN_SWAP
-      InternalSwap(other);
-    } else {
-      ::google::protobuf::internal::GenericSwap(this, other);
-    }
-  }
-  void UnsafeArenaSwap(ConfigurationConstantsResponse* other) {
-    if (other == this) return;
-    ABSL_DCHECK(GetArena() == other->GetArena());
-    InternalSwap(other);
-  }
-
-  // implements Message ----------------------------------------------
-
-  ConfigurationConstantsResponse* New(::google::protobuf::Arena* arena = nullptr) const final {
-    return CreateMaybeMessage<ConfigurationConstantsResponse>(arena);
-  }
-  using ::google::protobuf::Message::CopyFrom;
-  void CopyFrom(const ConfigurationConstantsResponse& from);
-  using ::google::protobuf::Message::MergeFrom;
-  void MergeFrom( const ConfigurationConstantsResponse& from) {
-    ConfigurationConstantsResponse::MergeImpl(*this, from);
-  }
-  private:
-  static void MergeImpl(::google::protobuf::Message& to_msg, const ::google::protobuf::Message& from_msg);
-  public:
-  PROTOBUF_ATTRIBUTE_REINITIALIZES void Clear() final;
-  bool IsInitialized() const final;
-
-  ::size_t ByteSizeLong() const final;
-  const char* _InternalParse(const char* ptr, ::google::protobuf::internal::ParseContext* ctx) final;
-  ::uint8_t* _InternalSerialize(
-      ::uint8_t* target, ::google::protobuf::io::EpsCopyOutputStream* stream) const final;
-  int GetCachedSize() const { return _impl_._cached_size_.Get(); }
-
-  private:
-  ::google::protobuf::internal::CachedSize* AccessCachedSize() const final;
-  void SharedCtor(::google::protobuf::Arena* arena);
-  void SharedDtor();
-  void InternalSwap(ConfigurationConstantsResponse* other);
-
-  private:
-  friend class ::google::protobuf::internal::AnyMetadata;
-  static ::absl::string_view FullMessageName() {
-    return "io.deephaven.proto.backplane.grpc.ConfigurationConstantsResponse";
-  }
-  protected:
-  explicit ConfigurationConstantsResponse(::google::protobuf::Arena* arena);
-  ConfigurationConstantsResponse(::google::protobuf::Arena* arena, const ConfigurationConstantsResponse& from);
-  public:
-
-  static const ClassData _class_data_;
-  const ::google::protobuf::Message::ClassData*GetClassData() const final;
-
-  ::google::protobuf::Metadata GetMetadata() const final;
-
-  // nested types ----------------------------------------------------
-
-
-  // accessors -------------------------------------------------------
-
-  enum : int {
-    kConfigValuesFieldNumber = 1,
-  };
-  // map<string, .io.deephaven.proto.backplane.grpc.ConfigValue> config_values = 1;
-  int config_values_size() const;
-  private:
-  int _internal_config_values_size() const;
-
-  public:
-  void clear_config_values() ;
-  const ::google::protobuf::Map<std::string, ::io::deephaven::proto::backplane::grpc::ConfigValue>& config_values() const;
-  ::google::protobuf::Map<std::string, ::io::deephaven::proto::backplane::grpc::ConfigValue>* mutable_config_values();
-
-  private:
-  const ::google::protobuf::Map<std::string, ::io::deephaven::proto::backplane::grpc::ConfigValue>& _internal_config_values() const;
-  ::google::protobuf::Map<std::string, ::io::deephaven::proto::backplane::grpc::ConfigValue>* _internal_mutable_config_values();
-
-  public:
-  // @@protoc_insertion_point(class_scope:io.deephaven.proto.backplane.grpc.ConfigurationConstantsResponse)
- private:
-  class _Internal;
-
-  friend class ::google::protobuf::internal::TcParser;
-  static const ::google::protobuf::internal::TcParseTable<
-      0, 1, 2,
-      86, 2>
-      _table_;
-  friend class ::google::protobuf::MessageLite;
-  friend class ::google::protobuf::Arena;
-  template <typename T>
-  friend class ::google::protobuf::Arena::InternalHelper;
-  using InternalArenaConstructable_ = void;
-  using DestructorSkippable_ = void;
-  struct Impl_ {
-
-        inline explicit constexpr Impl_(
-            ::google::protobuf::internal::ConstantInitialized) noexcept;
-        inline explicit Impl_(::google::protobuf::internal::InternalVisibility visibility,
-                              ::google::protobuf::Arena* arena);
-        inline explicit Impl_(::google::protobuf::internal::InternalVisibility visibility,
-                              ::google::protobuf::Arena* arena, const Impl_& from);
-    ::google::protobuf::internal::MapField<ConfigurationConstantsResponse_ConfigValuesEntry_DoNotUse, std::string, ::io::deephaven::proto::backplane::grpc::ConfigValue,
-                      ::google::protobuf::internal::WireFormatLite::TYPE_STRING,
-                      ::google::protobuf::internal::WireFormatLite::TYPE_MESSAGE>
-        config_values_;
-    mutable ::google::protobuf::internal::CachedSize _cached_size_;
-    PROTOBUF_TSAN_DECLARE_MEMBER
-  };
-  union { Impl_ _impl_; };
-  friend struct ::TableStruct_deephaven_2fproto_2fconfig_2eproto;
-};// -------------------------------------------------------------------
-
-class AuthenticationConstantsResponse final :
-    public ::google::protobuf::Message /* @@protoc_insertion_point(class_definition:io.deephaven.proto.backplane.grpc.AuthenticationConstantsResponse) */ {
- public:
-  inline AuthenticationConstantsResponse() : AuthenticationConstantsResponse(nullptr) {}
-  ~AuthenticationConstantsResponse() override;
-  template<typename = void>
-  explicit PROTOBUF_CONSTEXPR AuthenticationConstantsResponse(::google::protobuf::internal::ConstantInitialized);
-
-  inline AuthenticationConstantsResponse(const AuthenticationConstantsResponse& from)
-      : AuthenticationConstantsResponse(nullptr, from) {}
-  AuthenticationConstantsResponse(AuthenticationConstantsResponse&& from) noexcept
-    : AuthenticationConstantsResponse() {
-    *this = ::std::move(from);
-  }
-
-  inline AuthenticationConstantsResponse& operator=(const AuthenticationConstantsResponse& from) {
-    CopyFrom(from);
-    return *this;
-  }
-  inline AuthenticationConstantsResponse& operator=(AuthenticationConstantsResponse&& from) noexcept {
-    if (this == &from) return *this;
-    if (GetArena() == from.GetArena()
-  #ifdef PROTOBUF_FORCE_COPY_IN_MOVE
-        && GetArena() != nullptr
-  #endif  // !PROTOBUF_FORCE_COPY_IN_MOVE
-    ) {
-      InternalSwap(&from);
-    } else {
-      CopyFrom(from);
-    }
-    return *this;
-  }
-
-  inline const ::google::protobuf::UnknownFieldSet& unknown_fields() const
-      ABSL_ATTRIBUTE_LIFETIME_BOUND {
-    return _internal_metadata_.unknown_fields<::google::protobuf::UnknownFieldSet>(::google::protobuf::UnknownFieldSet::default_instance);
-  }
-  inline ::google::protobuf::UnknownFieldSet* mutable_unknown_fields()
-      ABSL_ATTRIBUTE_LIFETIME_BOUND {
-    return _internal_metadata_.mutable_unknown_fields<::google::protobuf::UnknownFieldSet>();
-  }
-
-  static const ::google::protobuf::Descriptor* descriptor() {
-    return GetDescriptor();
-  }
-  static const ::google::protobuf::Descriptor* GetDescriptor() {
-    return default_instance().GetMetadata().descriptor;
-  }
-  static const ::google::protobuf::Reflection* GetReflection() {
-    return default_instance().GetMetadata().reflection;
-  }
-  static const AuthenticationConstantsResponse& default_instance() {
-    return *internal_default_instance();
-  }
-  static inline const AuthenticationConstantsResponse* internal_default_instance() {
-    return reinterpret_cast<const AuthenticationConstantsResponse*>(
-               &_AuthenticationConstantsResponse_default_instance_);
-  }
-  static constexpr int kIndexInFileMessages =
-    3;
-
-  friend void swap(AuthenticationConstantsResponse& a, AuthenticationConstantsResponse& b) {
-    a.Swap(&b);
-  }
-  inline void Swap(AuthenticationConstantsResponse* other) {
-    if (other == this) return;
-  #ifdef PROTOBUF_FORCE_COPY_IN_SWAP
-    if (GetArena() != nullptr &&
-        GetArena() == other->GetArena()) {
-   #else  // PROTOBUF_FORCE_COPY_IN_SWAP
-    if (GetArena() == other->GetArena()) {
-  #endif  // !PROTOBUF_FORCE_COPY_IN_SWAP
-      InternalSwap(other);
-    } else {
-      ::google::protobuf::internal::GenericSwap(this, other);
-    }
-  }
-  void UnsafeArenaSwap(AuthenticationConstantsResponse* other) {
-    if (other == this) return;
-    ABSL_DCHECK(GetArena() == other->GetArena());
-    InternalSwap(other);
-  }
-
-  // implements Message ----------------------------------------------
-
-  AuthenticationConstantsResponse* New(::google::protobuf::Arena* arena = nullptr) const final {
-    return CreateMaybeMessage<AuthenticationConstantsResponse>(arena);
-  }
-  using ::google::protobuf::Message::CopyFrom;
-  void CopyFrom(const AuthenticationConstantsResponse& from);
-  using ::google::protobuf::Message::MergeFrom;
-  void MergeFrom( const AuthenticationConstantsResponse& from) {
-    AuthenticationConstantsResponse::MergeImpl(*this, from);
-  }
-  private:
-  static void MergeImpl(::google::protobuf::Message& to_msg, const ::google::protobuf::Message& from_msg);
-  public:
-  PROTOBUF_ATTRIBUTE_REINITIALIZES void Clear() final;
-  bool IsInitialized() const final;
-
-  ::size_t ByteSizeLong() const final;
-  const char* _InternalParse(const char* ptr, ::google::protobuf::internal::ParseContext* ctx) final;
-  ::uint8_t* _InternalSerialize(
-      ::uint8_t* target, ::google::protobuf::io::EpsCopyOutputStream* stream) const final;
-  int GetCachedSize() const { return _impl_._cached_size_.Get(); }
-
-  private:
-  ::google::protobuf::internal::CachedSize* AccessCachedSize() const final;
-  void SharedCtor(::google::protobuf::Arena* arena);
-  void SharedDtor();
-  void InternalSwap(AuthenticationConstantsResponse* other);
-
-  private:
-  friend class ::google::protobuf::internal::AnyMetadata;
-  static ::absl::string_view FullMessageName() {
-    return "io.deephaven.proto.backplane.grpc.AuthenticationConstantsResponse";
-  }
-  protected:
-  explicit AuthenticationConstantsResponse(::google::protobuf::Arena* arena);
-  AuthenticationConstantsResponse(::google::protobuf::Arena* arena, const AuthenticationConstantsResponse& from);
-  public:
-
-  static const ClassData _class_data_;
-  const ::google::protobuf::Message::ClassData*GetClassData() const final;
-
-  ::google::protobuf::Metadata GetMetadata() const final;
-
-  // nested types ----------------------------------------------------
-
-
-  // accessors -------------------------------------------------------
-
-  enum : int {
-    kConfigValuesFieldNumber = 1,
-  };
-  // map<string, .io.deephaven.proto.backplane.grpc.ConfigValue> config_values = 1;
-  int config_values_size() const;
-  private:
-  int _internal_config_values_size() const;
-
-  public:
-  void clear_config_values() ;
-  const ::google::protobuf::Map<std::string, ::io::deephaven::proto::backplane::grpc::ConfigValue>& config_values() const;
-  ::google::protobuf::Map<std::string, ::io::deephaven::proto::backplane::grpc::ConfigValue>* mutable_config_values();
-
-  private:
-  const ::google::protobuf::Map<std::string, ::io::deephaven::proto::backplane::grpc::ConfigValue>& _internal_config_values() const;
-  ::google::protobuf::Map<std::string, ::io::deephaven::proto::backplane::grpc::ConfigValue>* _internal_mutable_config_values();
-
-  public:
-  // @@protoc_insertion_point(class_scope:io.deephaven.proto.backplane.grpc.AuthenticationConstantsResponse)
- private:
-  class _Internal;
-
-  friend class ::google::protobuf::internal::TcParser;
-  static const ::google::protobuf::internal::TcParseTable<
-      0, 1, 2,
-      87, 2>
-      _table_;
-  friend class ::google::protobuf::MessageLite;
-  friend class ::google::protobuf::Arena;
-  template <typename T>
-  friend class ::google::protobuf::Arena::InternalHelper;
-  using InternalArenaConstructable_ = void;
-  using DestructorSkippable_ = void;
-  struct Impl_ {
-
-        inline explicit constexpr Impl_(
-            ::google::protobuf::internal::ConstantInitialized) noexcept;
-        inline explicit Impl_(::google::protobuf::internal::InternalVisibility visibility,
-                              ::google::protobuf::Arena* arena);
-        inline explicit Impl_(::google::protobuf::internal::InternalVisibility visibility,
-                              ::google::protobuf::Arena* arena, const Impl_& from);
-    ::google::protobuf::internal::MapField<AuthenticationConstantsResponse_ConfigValuesEntry_DoNotUse, std::string, ::io::deephaven::proto::backplane::grpc::ConfigValue,
-                      ::google::protobuf::internal::WireFormatLite::TYPE_STRING,
-                      ::google::protobuf::internal::WireFormatLite::TYPE_MESSAGE>
-        config_values_;
-    mutable ::google::protobuf::internal::CachedSize _cached_size_;
-    PROTOBUF_TSAN_DECLARE_MEMBER
-  };
-  union { Impl_ _impl_; };
-  friend struct ::TableStruct_deephaven_2fproto_2fconfig_2eproto;
-};
-
-// ===================================================================
-
-
-
-
-// ===================================================================
-
-
-#ifdef __GNUC__
-#pragma GCC diagnostic push
-#pragma GCC diagnostic ignored "-Wstrict-aliasing"
-#endif  // __GNUC__
-// -------------------------------------------------------------------
-
-// AuthenticationConstantsRequest
-
-// -------------------------------------------------------------------
-
-// ConfigurationConstantsRequest
-
-// -------------------------------------------------------------------
-
-// -------------------------------------------------------------------
-
-// AuthenticationConstantsResponse
-
-// map<string, .io.deephaven.proto.backplane.grpc.ConfigValue> config_values = 1;
-inline int AuthenticationConstantsResponse::_internal_config_values_size() const {
-  return _internal_config_values().size();
-}
-inline int AuthenticationConstantsResponse::config_values_size() const {
-  return _internal_config_values_size();
-}
-inline void AuthenticationConstantsResponse::clear_config_values() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  _impl_.config_values_.Clear();
-}
-inline const ::google::protobuf::Map<std::string, ::io::deephaven::proto::backplane::grpc::ConfigValue>& AuthenticationConstantsResponse::_internal_config_values() const {
-  PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race);
-  return _impl_.config_values_.GetMap();
-}
-inline const ::google::protobuf::Map<std::string, ::io::deephaven::proto::backplane::grpc::ConfigValue>& AuthenticationConstantsResponse::config_values() const ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  // @@protoc_insertion_point(field_map:io.deephaven.proto.backplane.grpc.AuthenticationConstantsResponse.config_values)
-  return _internal_config_values();
-}
-inline ::google::protobuf::Map<std::string, ::io::deephaven::proto::backplane::grpc::ConfigValue>* AuthenticationConstantsResponse::_internal_mutable_config_values() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  return _impl_.config_values_.MutableMap();
-}
-inline ::google::protobuf::Map<std::string, ::io::deephaven::proto::backplane::grpc::ConfigValue>* AuthenticationConstantsResponse::mutable_config_values() ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  // @@protoc_insertion_point(field_mutable_map:io.deephaven.proto.backplane.grpc.AuthenticationConstantsResponse.config_values)
-  return _internal_mutable_config_values();
-}
-
-// -------------------------------------------------------------------
-
-// -------------------------------------------------------------------
-
-// ConfigurationConstantsResponse
-
-// map<string, .io.deephaven.proto.backplane.grpc.ConfigValue> config_values = 1;
-inline int ConfigurationConstantsResponse::_internal_config_values_size() const {
-  return _internal_config_values().size();
-}
-inline int ConfigurationConstantsResponse::config_values_size() const {
-  return _internal_config_values_size();
-}
-inline void ConfigurationConstantsResponse::clear_config_values() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  _impl_.config_values_.Clear();
-}
-inline const ::google::protobuf::Map<std::string, ::io::deephaven::proto::backplane::grpc::ConfigValue>& ConfigurationConstantsResponse::_internal_config_values() const {
-  PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race);
-  return _impl_.config_values_.GetMap();
-}
-inline const ::google::protobuf::Map<std::string, ::io::deephaven::proto::backplane::grpc::ConfigValue>& ConfigurationConstantsResponse::config_values() const ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  // @@protoc_insertion_point(field_map:io.deephaven.proto.backplane.grpc.ConfigurationConstantsResponse.config_values)
-  return _internal_config_values();
-}
-inline ::google::protobuf::Map<std::string, ::io::deephaven::proto::backplane::grpc::ConfigValue>* ConfigurationConstantsResponse::_internal_mutable_config_values() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  return _impl_.config_values_.MutableMap();
-}
-inline ::google::protobuf::Map<std::string, ::io::deephaven::proto::backplane::grpc::ConfigValue>* ConfigurationConstantsResponse::mutable_config_values() ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  // @@protoc_insertion_point(field_mutable_map:io.deephaven.proto.backplane.grpc.ConfigurationConstantsResponse.config_values)
-  return _internal_mutable_config_values();
-}
-
-// -------------------------------------------------------------------
-
-// ConfigValue
-
-// string string_value = 3;
-inline bool ConfigValue::has_string_value() const {
-  return kind_case() == kStringValue;
-}
-inline void ConfigValue::set_has_string_value() {
-  _impl_._oneof_case_[0] = kStringValue;
-}
-inline void ConfigValue::clear_string_value() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  if (kind_case() == kStringValue) {
-    _impl_.kind_.string_value_.Destroy();
-    clear_has_kind();
-  }
-}
-inline const std::string& ConfigValue::string_value() const
-    ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  // @@protoc_insertion_point(field_get:io.deephaven.proto.backplane.grpc.ConfigValue.string_value)
-  return _internal_string_value();
-}
-template <typename Arg_, typename... Args_>
-inline PROTOBUF_ALWAYS_INLINE void ConfigValue::set_string_value(Arg_&& arg,
-                                                     Args_... args) {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  if (kind_case() != kStringValue) {
-    clear_kind();
-
-    set_has_string_value();
-    _impl_.kind_.string_value_.InitDefault();
-  }
-  _impl_.kind_.string_value_.Set(static_cast<Arg_&&>(arg), args..., GetArena());
-  // @@protoc_insertion_point(field_set:io.deephaven.proto.backplane.grpc.ConfigValue.string_value)
-}
-inline std::string* ConfigValue::mutable_string_value() ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  std::string* _s = _internal_mutable_string_value();
-  // @@protoc_insertion_point(field_mutable:io.deephaven.proto.backplane.grpc.ConfigValue.string_value)
-  return _s;
-}
-inline const std::string& ConfigValue::_internal_string_value() const {
-  PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race);
-  if (kind_case() != kStringValue) {
-    return ::google::protobuf::internal::GetEmptyStringAlreadyInited();
-  }
-  return _impl_.kind_.string_value_.Get();
-}
-inline void ConfigValue::_internal_set_string_value(const std::string& value) {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  if (kind_case() != kStringValue) {
-    clear_kind();
-
-    set_has_string_value();
-    _impl_.kind_.string_value_.InitDefault();
-  }
-  _impl_.kind_.string_value_.Set(value, GetArena());
-}
-inline std::string* ConfigValue::_internal_mutable_string_value() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  if (kind_case() != kStringValue) {
-    clear_kind();
-
-    set_has_string_value();
-    _impl_.kind_.string_value_.InitDefault();
-  }
-  return _impl_.kind_.string_value_.Mutable( GetArena());
-}
-inline std::string* ConfigValue::release_string_value() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  // @@protoc_insertion_point(field_release:io.deephaven.proto.backplane.grpc.ConfigValue.string_value)
-  if (kind_case() != kStringValue) {
-    return nullptr;
-  }
-  clear_has_kind();
-  return _impl_.kind_.string_value_.Release();
-}
-inline void ConfigValue::set_allocated_string_value(std::string* value) {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  if (has_kind()) {
-    clear_kind();
-  }
-  if (value != nullptr) {
-    set_has_string_value();
-    _impl_.kind_.string_value_.InitAllocated(value, GetArena());
-  }
-  // @@protoc_insertion_point(field_set_allocated:io.deephaven.proto.backplane.grpc.ConfigValue.string_value)
-}
-
-inline bool ConfigValue::has_kind() const {
-  return kind_case() != KIND_NOT_SET;
-}
-inline void ConfigValue::clear_has_kind() {
-  _impl_._oneof_case_[0] = KIND_NOT_SET;
-}
-inline ConfigValue::KindCase ConfigValue::kind_case() const {
-  return ConfigValue::KindCase(_impl_._oneof_case_[0]);
-}
-#ifdef __GNUC__
-#pragma GCC diagnostic pop
-#endif  // __GNUC__
-
-// @@protoc_insertion_point(namespace_scope)
-}  // namespace grpc
-}  // namespace backplane
-}  // namespace proto
-}  // namespace deephaven
-}  // namespace io
-
-
-// @@protoc_insertion_point(global_scope)
-
-#include "google/protobuf/port_undef.inc"
-
-#endif  // GOOGLE_PROTOBUF_INCLUDED_deephaven_2fproto_2fconfig_2eproto_2epb_2eh
diff --git a/cpp-client/deephaven/dhclient/proto/deephaven/proto/console.grpc.pb.cc b/cpp-client/deephaven/dhclient/proto/deephaven/proto/console.grpc.pb.cc
deleted file mode 100644
index 92345945498..00000000000
--- a/cpp-client/deephaven/dhclient/proto/deephaven/proto/console.grpc.pb.cc
+++ /dev/null
@@ -1,494 +0,0 @@
-// Generated by the gRPC C++ plugin.
-// If you make any local change, they will be lost.
-// source: deephaven/proto/console.proto
-
-#include "deephaven/proto/console.pb.h"
-#include "deephaven/proto/console.grpc.pb.h"
-
-#include <functional>
-#include <grpcpp/support/async_stream.h>
-#include <grpcpp/support/async_unary_call.h>
-#include <grpcpp/impl/channel_interface.h>
-#include <grpcpp/impl/client_unary_call.h>
-#include <grpcpp/support/client_callback.h>
-#include <grpcpp/support/message_allocator.h>
-#include <grpcpp/support/method_handler.h>
-#include <grpcpp/impl/rpc_service_method.h>
-#include <grpcpp/support/server_callback.h>
-#include <grpcpp/impl/server_callback_handlers.h>
-#include <grpcpp/server_context.h>
-#include <grpcpp/impl/service_type.h>
-#include <grpcpp/support/sync_stream.h>
-namespace io {
-namespace deephaven {
-namespace proto {
-namespace backplane {
-namespace script {
-namespace grpc {
-
-static const char* ConsoleService_method_names[] = {
-  "/io.deephaven.proto.backplane.script.grpc.ConsoleService/GetConsoleTypes",
-  "/io.deephaven.proto.backplane.script.grpc.ConsoleService/StartConsole",
-  "/io.deephaven.proto.backplane.script.grpc.ConsoleService/GetHeapInfo",
-  "/io.deephaven.proto.backplane.script.grpc.ConsoleService/SubscribeToLogs",
-  "/io.deephaven.proto.backplane.script.grpc.ConsoleService/ExecuteCommand",
-  "/io.deephaven.proto.backplane.script.grpc.ConsoleService/CancelCommand",
-  "/io.deephaven.proto.backplane.script.grpc.ConsoleService/BindTableToVariable",
-  "/io.deephaven.proto.backplane.script.grpc.ConsoleService/AutoCompleteStream",
-  "/io.deephaven.proto.backplane.script.grpc.ConsoleService/CancelAutoComplete",
-  "/io.deephaven.proto.backplane.script.grpc.ConsoleService/OpenAutoCompleteStream",
-  "/io.deephaven.proto.backplane.script.grpc.ConsoleService/NextAutoCompleteStream",
-};
-
-std::unique_ptr< ConsoleService::Stub> ConsoleService::NewStub(const std::shared_ptr< ::grpc::ChannelInterface>& channel, const ::grpc::StubOptions& options) {
-  (void)options;
-  std::unique_ptr< ConsoleService::Stub> stub(new ConsoleService::Stub(channel, options));
-  return stub;
-}
-
-ConsoleService::Stub::Stub(const std::shared_ptr< ::grpc::ChannelInterface>& channel, const ::grpc::StubOptions& options)
-  : channel_(channel), rpcmethod_GetConsoleTypes_(ConsoleService_method_names[0], options.suffix_for_stats(),::grpc::internal::RpcMethod::NORMAL_RPC, channel)
-  , rpcmethod_StartConsole_(ConsoleService_method_names[1], options.suffix_for_stats(),::grpc::internal::RpcMethod::NORMAL_RPC, channel)
-  , rpcmethod_GetHeapInfo_(ConsoleService_method_names[2], options.suffix_for_stats(),::grpc::internal::RpcMethod::NORMAL_RPC, channel)
-  , rpcmethod_SubscribeToLogs_(ConsoleService_method_names[3], options.suffix_for_stats(),::grpc::internal::RpcMethod::SERVER_STREAMING, channel)
-  , rpcmethod_ExecuteCommand_(ConsoleService_method_names[4], options.suffix_for_stats(),::grpc::internal::RpcMethod::NORMAL_RPC, channel)
-  , rpcmethod_CancelCommand_(ConsoleService_method_names[5], options.suffix_for_stats(),::grpc::internal::RpcMethod::NORMAL_RPC, channel)
-  , rpcmethod_BindTableToVariable_(ConsoleService_method_names[6], options.suffix_for_stats(),::grpc::internal::RpcMethod::NORMAL_RPC, channel)
-  , rpcmethod_AutoCompleteStream_(ConsoleService_method_names[7], options.suffix_for_stats(),::grpc::internal::RpcMethod::BIDI_STREAMING, channel)
-  , rpcmethod_CancelAutoComplete_(ConsoleService_method_names[8], options.suffix_for_stats(),::grpc::internal::RpcMethod::NORMAL_RPC, channel)
-  , rpcmethod_OpenAutoCompleteStream_(ConsoleService_method_names[9], options.suffix_for_stats(),::grpc::internal::RpcMethod::SERVER_STREAMING, channel)
-  , rpcmethod_NextAutoCompleteStream_(ConsoleService_method_names[10], options.suffix_for_stats(),::grpc::internal::RpcMethod::NORMAL_RPC, channel)
-  {}
-
-::grpc::Status ConsoleService::Stub::GetConsoleTypes(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::script::grpc::GetConsoleTypesRequest& request, ::io::deephaven::proto::backplane::script::grpc::GetConsoleTypesResponse* response) {
-  return ::grpc::internal::BlockingUnaryCall< ::io::deephaven::proto::backplane::script::grpc::GetConsoleTypesRequest, ::io::deephaven::proto::backplane::script::grpc::GetConsoleTypesResponse, ::grpc::protobuf::MessageLite, ::grpc::protobuf::MessageLite>(channel_.get(), rpcmethod_GetConsoleTypes_, context, request, response);
-}
-
-void ConsoleService::Stub::async::GetConsoleTypes(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::script::grpc::GetConsoleTypesRequest* request, ::io::deephaven::proto::backplane::script::grpc::GetConsoleTypesResponse* response, std::function<void(::grpc::Status)> f) {
-  ::grpc::internal::CallbackUnaryCall< ::io::deephaven::proto::backplane::script::grpc::GetConsoleTypesRequest, ::io::deephaven::proto::backplane::script::grpc::GetConsoleTypesResponse, ::grpc::protobuf::MessageLite, ::grpc::protobuf::MessageLite>(stub_->channel_.get(), stub_->rpcmethod_GetConsoleTypes_, context, request, response, std::move(f));
-}
-
-void ConsoleService::Stub::async::GetConsoleTypes(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::script::grpc::GetConsoleTypesRequest* request, ::io::deephaven::proto::backplane::script::grpc::GetConsoleTypesResponse* response, ::grpc::ClientUnaryReactor* reactor) {
-  ::grpc::internal::ClientCallbackUnaryFactory::Create< ::grpc::protobuf::MessageLite, ::grpc::protobuf::MessageLite>(stub_->channel_.get(), stub_->rpcmethod_GetConsoleTypes_, context, request, response, reactor);
-}
-
-::grpc::ClientAsyncResponseReader< ::io::deephaven::proto::backplane::script::grpc::GetConsoleTypesResponse>* ConsoleService::Stub::PrepareAsyncGetConsoleTypesRaw(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::script::grpc::GetConsoleTypesRequest& request, ::grpc::CompletionQueue* cq) {
-  return ::grpc::internal::ClientAsyncResponseReaderHelper::Create< ::io::deephaven::proto::backplane::script::grpc::GetConsoleTypesResponse, ::io::deephaven::proto::backplane::script::grpc::GetConsoleTypesRequest, ::grpc::protobuf::MessageLite, ::grpc::protobuf::MessageLite>(channel_.get(), cq, rpcmethod_GetConsoleTypes_, context, request);
-}
-
-::grpc::ClientAsyncResponseReader< ::io::deephaven::proto::backplane::script::grpc::GetConsoleTypesResponse>* ConsoleService::Stub::AsyncGetConsoleTypesRaw(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::script::grpc::GetConsoleTypesRequest& request, ::grpc::CompletionQueue* cq) {
-  auto* result =
-    this->PrepareAsyncGetConsoleTypesRaw(context, request, cq);
-  result->StartCall();
-  return result;
-}
-
-::grpc::Status ConsoleService::Stub::StartConsole(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::script::grpc::StartConsoleRequest& request, ::io::deephaven::proto::backplane::script::grpc::StartConsoleResponse* response) {
-  return ::grpc::internal::BlockingUnaryCall< ::io::deephaven::proto::backplane::script::grpc::StartConsoleRequest, ::io::deephaven::proto::backplane::script::grpc::StartConsoleResponse, ::grpc::protobuf::MessageLite, ::grpc::protobuf::MessageLite>(channel_.get(), rpcmethod_StartConsole_, context, request, response);
-}
-
-void ConsoleService::Stub::async::StartConsole(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::script::grpc::StartConsoleRequest* request, ::io::deephaven::proto::backplane::script::grpc::StartConsoleResponse* response, std::function<void(::grpc::Status)> f) {
-  ::grpc::internal::CallbackUnaryCall< ::io::deephaven::proto::backplane::script::grpc::StartConsoleRequest, ::io::deephaven::proto::backplane::script::grpc::StartConsoleResponse, ::grpc::protobuf::MessageLite, ::grpc::protobuf::MessageLite>(stub_->channel_.get(), stub_->rpcmethod_StartConsole_, context, request, response, std::move(f));
-}
-
-void ConsoleService::Stub::async::StartConsole(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::script::grpc::StartConsoleRequest* request, ::io::deephaven::proto::backplane::script::grpc::StartConsoleResponse* response, ::grpc::ClientUnaryReactor* reactor) {
-  ::grpc::internal::ClientCallbackUnaryFactory::Create< ::grpc::protobuf::MessageLite, ::grpc::protobuf::MessageLite>(stub_->channel_.get(), stub_->rpcmethod_StartConsole_, context, request, response, reactor);
-}
-
-::grpc::ClientAsyncResponseReader< ::io::deephaven::proto::backplane::script::grpc::StartConsoleResponse>* ConsoleService::Stub::PrepareAsyncStartConsoleRaw(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::script::grpc::StartConsoleRequest& request, ::grpc::CompletionQueue* cq) {
-  return ::grpc::internal::ClientAsyncResponseReaderHelper::Create< ::io::deephaven::proto::backplane::script::grpc::StartConsoleResponse, ::io::deephaven::proto::backplane::script::grpc::StartConsoleRequest, ::grpc::protobuf::MessageLite, ::grpc::protobuf::MessageLite>(channel_.get(), cq, rpcmethod_StartConsole_, context, request);
-}
-
-::grpc::ClientAsyncResponseReader< ::io::deephaven::proto::backplane::script::grpc::StartConsoleResponse>* ConsoleService::Stub::AsyncStartConsoleRaw(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::script::grpc::StartConsoleRequest& request, ::grpc::CompletionQueue* cq) {
-  auto* result =
-    this->PrepareAsyncStartConsoleRaw(context, request, cq);
-  result->StartCall();
-  return result;
-}
-
-::grpc::Status ConsoleService::Stub::GetHeapInfo(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::script::grpc::GetHeapInfoRequest& request, ::io::deephaven::proto::backplane::script::grpc::GetHeapInfoResponse* response) {
-  return ::grpc::internal::BlockingUnaryCall< ::io::deephaven::proto::backplane::script::grpc::GetHeapInfoRequest, ::io::deephaven::proto::backplane::script::grpc::GetHeapInfoResponse, ::grpc::protobuf::MessageLite, ::grpc::protobuf::MessageLite>(channel_.get(), rpcmethod_GetHeapInfo_, context, request, response);
-}
-
-void ConsoleService::Stub::async::GetHeapInfo(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::script::grpc::GetHeapInfoRequest* request, ::io::deephaven::proto::backplane::script::grpc::GetHeapInfoResponse* response, std::function<void(::grpc::Status)> f) {
-  ::grpc::internal::CallbackUnaryCall< ::io::deephaven::proto::backplane::script::grpc::GetHeapInfoRequest, ::io::deephaven::proto::backplane::script::grpc::GetHeapInfoResponse, ::grpc::protobuf::MessageLite, ::grpc::protobuf::MessageLite>(stub_->channel_.get(), stub_->rpcmethod_GetHeapInfo_, context, request, response, std::move(f));
-}
-
-void ConsoleService::Stub::async::GetHeapInfo(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::script::grpc::GetHeapInfoRequest* request, ::io::deephaven::proto::backplane::script::grpc::GetHeapInfoResponse* response, ::grpc::ClientUnaryReactor* reactor) {
-  ::grpc::internal::ClientCallbackUnaryFactory::Create< ::grpc::protobuf::MessageLite, ::grpc::protobuf::MessageLite>(stub_->channel_.get(), stub_->rpcmethod_GetHeapInfo_, context, request, response, reactor);
-}
-
-::grpc::ClientAsyncResponseReader< ::io::deephaven::proto::backplane::script::grpc::GetHeapInfoResponse>* ConsoleService::Stub::PrepareAsyncGetHeapInfoRaw(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::script::grpc::GetHeapInfoRequest& request, ::grpc::CompletionQueue* cq) {
-  return ::grpc::internal::ClientAsyncResponseReaderHelper::Create< ::io::deephaven::proto::backplane::script::grpc::GetHeapInfoResponse, ::io::deephaven::proto::backplane::script::grpc::GetHeapInfoRequest, ::grpc::protobuf::MessageLite, ::grpc::protobuf::MessageLite>(channel_.get(), cq, rpcmethod_GetHeapInfo_, context, request);
-}
-
-::grpc::ClientAsyncResponseReader< ::io::deephaven::proto::backplane::script::grpc::GetHeapInfoResponse>* ConsoleService::Stub::AsyncGetHeapInfoRaw(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::script::grpc::GetHeapInfoRequest& request, ::grpc::CompletionQueue* cq) {
-  auto* result =
-    this->PrepareAsyncGetHeapInfoRaw(context, request, cq);
-  result->StartCall();
-  return result;
-}
-
-::grpc::ClientReader< ::io::deephaven::proto::backplane::script::grpc::LogSubscriptionData>* ConsoleService::Stub::SubscribeToLogsRaw(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::script::grpc::LogSubscriptionRequest& request) {
-  return ::grpc::internal::ClientReaderFactory< ::io::deephaven::proto::backplane::script::grpc::LogSubscriptionData>::Create(channel_.get(), rpcmethod_SubscribeToLogs_, context, request);
-}
-
-void ConsoleService::Stub::async::SubscribeToLogs(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::script::grpc::LogSubscriptionRequest* request, ::grpc::ClientReadReactor< ::io::deephaven::proto::backplane::script::grpc::LogSubscriptionData>* reactor) {
-  ::grpc::internal::ClientCallbackReaderFactory< ::io::deephaven::proto::backplane::script::grpc::LogSubscriptionData>::Create(stub_->channel_.get(), stub_->rpcmethod_SubscribeToLogs_, context, request, reactor);
-}
-
-::grpc::ClientAsyncReader< ::io::deephaven::proto::backplane::script::grpc::LogSubscriptionData>* ConsoleService::Stub::AsyncSubscribeToLogsRaw(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::script::grpc::LogSubscriptionRequest& request, ::grpc::CompletionQueue* cq, void* tag) {
-  return ::grpc::internal::ClientAsyncReaderFactory< ::io::deephaven::proto::backplane::script::grpc::LogSubscriptionData>::Create(channel_.get(), cq, rpcmethod_SubscribeToLogs_, context, request, true, tag);
-}
-
-::grpc::ClientAsyncReader< ::io::deephaven::proto::backplane::script::grpc::LogSubscriptionData>* ConsoleService::Stub::PrepareAsyncSubscribeToLogsRaw(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::script::grpc::LogSubscriptionRequest& request, ::grpc::CompletionQueue* cq) {
-  return ::grpc::internal::ClientAsyncReaderFactory< ::io::deephaven::proto::backplane::script::grpc::LogSubscriptionData>::Create(channel_.get(), cq, rpcmethod_SubscribeToLogs_, context, request, false, nullptr);
-}
-
-::grpc::Status ConsoleService::Stub::ExecuteCommand(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::script::grpc::ExecuteCommandRequest& request, ::io::deephaven::proto::backplane::script::grpc::ExecuteCommandResponse* response) {
-  return ::grpc::internal::BlockingUnaryCall< ::io::deephaven::proto::backplane::script::grpc::ExecuteCommandRequest, ::io::deephaven::proto::backplane::script::grpc::ExecuteCommandResponse, ::grpc::protobuf::MessageLite, ::grpc::protobuf::MessageLite>(channel_.get(), rpcmethod_ExecuteCommand_, context, request, response);
-}
-
-void ConsoleService::Stub::async::ExecuteCommand(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::script::grpc::ExecuteCommandRequest* request, ::io::deephaven::proto::backplane::script::grpc::ExecuteCommandResponse* response, std::function<void(::grpc::Status)> f) {
-  ::grpc::internal::CallbackUnaryCall< ::io::deephaven::proto::backplane::script::grpc::ExecuteCommandRequest, ::io::deephaven::proto::backplane::script::grpc::ExecuteCommandResponse, ::grpc::protobuf::MessageLite, ::grpc::protobuf::MessageLite>(stub_->channel_.get(), stub_->rpcmethod_ExecuteCommand_, context, request, response, std::move(f));
-}
-
-void ConsoleService::Stub::async::ExecuteCommand(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::script::grpc::ExecuteCommandRequest* request, ::io::deephaven::proto::backplane::script::grpc::ExecuteCommandResponse* response, ::grpc::ClientUnaryReactor* reactor) {
-  ::grpc::internal::ClientCallbackUnaryFactory::Create< ::grpc::protobuf::MessageLite, ::grpc::protobuf::MessageLite>(stub_->channel_.get(), stub_->rpcmethod_ExecuteCommand_, context, request, response, reactor);
-}
-
-::grpc::ClientAsyncResponseReader< ::io::deephaven::proto::backplane::script::grpc::ExecuteCommandResponse>* ConsoleService::Stub::PrepareAsyncExecuteCommandRaw(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::script::grpc::ExecuteCommandRequest& request, ::grpc::CompletionQueue* cq) {
-  return ::grpc::internal::ClientAsyncResponseReaderHelper::Create< ::io::deephaven::proto::backplane::script::grpc::ExecuteCommandResponse, ::io::deephaven::proto::backplane::script::grpc::ExecuteCommandRequest, ::grpc::protobuf::MessageLite, ::grpc::protobuf::MessageLite>(channel_.get(), cq, rpcmethod_ExecuteCommand_, context, request);
-}
-
-::grpc::ClientAsyncResponseReader< ::io::deephaven::proto::backplane::script::grpc::ExecuteCommandResponse>* ConsoleService::Stub::AsyncExecuteCommandRaw(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::script::grpc::ExecuteCommandRequest& request, ::grpc::CompletionQueue* cq) {
-  auto* result =
-    this->PrepareAsyncExecuteCommandRaw(context, request, cq);
-  result->StartCall();
-  return result;
-}
-
-::grpc::Status ConsoleService::Stub::CancelCommand(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::script::grpc::CancelCommandRequest& request, ::io::deephaven::proto::backplane::script::grpc::CancelCommandResponse* response) {
-  return ::grpc::internal::BlockingUnaryCall< ::io::deephaven::proto::backplane::script::grpc::CancelCommandRequest, ::io::deephaven::proto::backplane::script::grpc::CancelCommandResponse, ::grpc::protobuf::MessageLite, ::grpc::protobuf::MessageLite>(channel_.get(), rpcmethod_CancelCommand_, context, request, response);
-}
-
-void ConsoleService::Stub::async::CancelCommand(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::script::grpc::CancelCommandRequest* request, ::io::deephaven::proto::backplane::script::grpc::CancelCommandResponse* response, std::function<void(::grpc::Status)> f) {
-  ::grpc::internal::CallbackUnaryCall< ::io::deephaven::proto::backplane::script::grpc::CancelCommandRequest, ::io::deephaven::proto::backplane::script::grpc::CancelCommandResponse, ::grpc::protobuf::MessageLite, ::grpc::protobuf::MessageLite>(stub_->channel_.get(), stub_->rpcmethod_CancelCommand_, context, request, response, std::move(f));
-}
-
-void ConsoleService::Stub::async::CancelCommand(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::script::grpc::CancelCommandRequest* request, ::io::deephaven::proto::backplane::script::grpc::CancelCommandResponse* response, ::grpc::ClientUnaryReactor* reactor) {
-  ::grpc::internal::ClientCallbackUnaryFactory::Create< ::grpc::protobuf::MessageLite, ::grpc::protobuf::MessageLite>(stub_->channel_.get(), stub_->rpcmethod_CancelCommand_, context, request, response, reactor);
-}
-
-::grpc::ClientAsyncResponseReader< ::io::deephaven::proto::backplane::script::grpc::CancelCommandResponse>* ConsoleService::Stub::PrepareAsyncCancelCommandRaw(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::script::grpc::CancelCommandRequest& request, ::grpc::CompletionQueue* cq) {
-  return ::grpc::internal::ClientAsyncResponseReaderHelper::Create< ::io::deephaven::proto::backplane::script::grpc::CancelCommandResponse, ::io::deephaven::proto::backplane::script::grpc::CancelCommandRequest, ::grpc::protobuf::MessageLite, ::grpc::protobuf::MessageLite>(channel_.get(), cq, rpcmethod_CancelCommand_, context, request);
-}
-
-::grpc::ClientAsyncResponseReader< ::io::deephaven::proto::backplane::script::grpc::CancelCommandResponse>* ConsoleService::Stub::AsyncCancelCommandRaw(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::script::grpc::CancelCommandRequest& request, ::grpc::CompletionQueue* cq) {
-  auto* result =
-    this->PrepareAsyncCancelCommandRaw(context, request, cq);
-  result->StartCall();
-  return result;
-}
-
-::grpc::Status ConsoleService::Stub::BindTableToVariable(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::script::grpc::BindTableToVariableRequest& request, ::io::deephaven::proto::backplane::script::grpc::BindTableToVariableResponse* response) {
-  return ::grpc::internal::BlockingUnaryCall< ::io::deephaven::proto::backplane::script::grpc::BindTableToVariableRequest, ::io::deephaven::proto::backplane::script::grpc::BindTableToVariableResponse, ::grpc::protobuf::MessageLite, ::grpc::protobuf::MessageLite>(channel_.get(), rpcmethod_BindTableToVariable_, context, request, response);
-}
-
-void ConsoleService::Stub::async::BindTableToVariable(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::script::grpc::BindTableToVariableRequest* request, ::io::deephaven::proto::backplane::script::grpc::BindTableToVariableResponse* response, std::function<void(::grpc::Status)> f) {
-  ::grpc::internal::CallbackUnaryCall< ::io::deephaven::proto::backplane::script::grpc::BindTableToVariableRequest, ::io::deephaven::proto::backplane::script::grpc::BindTableToVariableResponse, ::grpc::protobuf::MessageLite, ::grpc::protobuf::MessageLite>(stub_->channel_.get(), stub_->rpcmethod_BindTableToVariable_, context, request, response, std::move(f));
-}
-
-void ConsoleService::Stub::async::BindTableToVariable(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::script::grpc::BindTableToVariableRequest* request, ::io::deephaven::proto::backplane::script::grpc::BindTableToVariableResponse* response, ::grpc::ClientUnaryReactor* reactor) {
-  ::grpc::internal::ClientCallbackUnaryFactory::Create< ::grpc::protobuf::MessageLite, ::grpc::protobuf::MessageLite>(stub_->channel_.get(), stub_->rpcmethod_BindTableToVariable_, context, request, response, reactor);
-}
-
-::grpc::ClientAsyncResponseReader< ::io::deephaven::proto::backplane::script::grpc::BindTableToVariableResponse>* ConsoleService::Stub::PrepareAsyncBindTableToVariableRaw(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::script::grpc::BindTableToVariableRequest& request, ::grpc::CompletionQueue* cq) {
-  return ::grpc::internal::ClientAsyncResponseReaderHelper::Create< ::io::deephaven::proto::backplane::script::grpc::BindTableToVariableResponse, ::io::deephaven::proto::backplane::script::grpc::BindTableToVariableRequest, ::grpc::protobuf::MessageLite, ::grpc::protobuf::MessageLite>(channel_.get(), cq, rpcmethod_BindTableToVariable_, context, request);
-}
-
-::grpc::ClientAsyncResponseReader< ::io::deephaven::proto::backplane::script::grpc::BindTableToVariableResponse>* ConsoleService::Stub::AsyncBindTableToVariableRaw(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::script::grpc::BindTableToVariableRequest& request, ::grpc::CompletionQueue* cq) {
-  auto* result =
-    this->PrepareAsyncBindTableToVariableRaw(context, request, cq);
-  result->StartCall();
-  return result;
-}
-
-::grpc::ClientReaderWriter< ::io::deephaven::proto::backplane::script::grpc::AutoCompleteRequest, ::io::deephaven::proto::backplane::script::grpc::AutoCompleteResponse>* ConsoleService::Stub::AutoCompleteStreamRaw(::grpc::ClientContext* context) {
-  return ::grpc::internal::ClientReaderWriterFactory< ::io::deephaven::proto::backplane::script::grpc::AutoCompleteRequest, ::io::deephaven::proto::backplane::script::grpc::AutoCompleteResponse>::Create(channel_.get(), rpcmethod_AutoCompleteStream_, context);
-}
-
-void ConsoleService::Stub::async::AutoCompleteStream(::grpc::ClientContext* context, ::grpc::ClientBidiReactor< ::io::deephaven::proto::backplane::script::grpc::AutoCompleteRequest,::io::deephaven::proto::backplane::script::grpc::AutoCompleteResponse>* reactor) {
-  ::grpc::internal::ClientCallbackReaderWriterFactory< ::io::deephaven::proto::backplane::script::grpc::AutoCompleteRequest,::io::deephaven::proto::backplane::script::grpc::AutoCompleteResponse>::Create(stub_->channel_.get(), stub_->rpcmethod_AutoCompleteStream_, context, reactor);
-}
-
-::grpc::ClientAsyncReaderWriter< ::io::deephaven::proto::backplane::script::grpc::AutoCompleteRequest, ::io::deephaven::proto::backplane::script::grpc::AutoCompleteResponse>* ConsoleService::Stub::AsyncAutoCompleteStreamRaw(::grpc::ClientContext* context, ::grpc::CompletionQueue* cq, void* tag) {
-  return ::grpc::internal::ClientAsyncReaderWriterFactory< ::io::deephaven::proto::backplane::script::grpc::AutoCompleteRequest, ::io::deephaven::proto::backplane::script::grpc::AutoCompleteResponse>::Create(channel_.get(), cq, rpcmethod_AutoCompleteStream_, context, true, tag);
-}
-
-::grpc::ClientAsyncReaderWriter< ::io::deephaven::proto::backplane::script::grpc::AutoCompleteRequest, ::io::deephaven::proto::backplane::script::grpc::AutoCompleteResponse>* ConsoleService::Stub::PrepareAsyncAutoCompleteStreamRaw(::grpc::ClientContext* context, ::grpc::CompletionQueue* cq) {
-  return ::grpc::internal::ClientAsyncReaderWriterFactory< ::io::deephaven::proto::backplane::script::grpc::AutoCompleteRequest, ::io::deephaven::proto::backplane::script::grpc::AutoCompleteResponse>::Create(channel_.get(), cq, rpcmethod_AutoCompleteStream_, context, false, nullptr);
-}
-
-::grpc::Status ConsoleService::Stub::CancelAutoComplete(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::script::grpc::CancelAutoCompleteRequest& request, ::io::deephaven::proto::backplane::script::grpc::CancelAutoCompleteResponse* response) {
-  return ::grpc::internal::BlockingUnaryCall< ::io::deephaven::proto::backplane::script::grpc::CancelAutoCompleteRequest, ::io::deephaven::proto::backplane::script::grpc::CancelAutoCompleteResponse, ::grpc::protobuf::MessageLite, ::grpc::protobuf::MessageLite>(channel_.get(), rpcmethod_CancelAutoComplete_, context, request, response);
-}
-
-void ConsoleService::Stub::async::CancelAutoComplete(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::script::grpc::CancelAutoCompleteRequest* request, ::io::deephaven::proto::backplane::script::grpc::CancelAutoCompleteResponse* response, std::function<void(::grpc::Status)> f) {
-  ::grpc::internal::CallbackUnaryCall< ::io::deephaven::proto::backplane::script::grpc::CancelAutoCompleteRequest, ::io::deephaven::proto::backplane::script::grpc::CancelAutoCompleteResponse, ::grpc::protobuf::MessageLite, ::grpc::protobuf::MessageLite>(stub_->channel_.get(), stub_->rpcmethod_CancelAutoComplete_, context, request, response, std::move(f));
-}
-
-void ConsoleService::Stub::async::CancelAutoComplete(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::script::grpc::CancelAutoCompleteRequest* request, ::io::deephaven::proto::backplane::script::grpc::CancelAutoCompleteResponse* response, ::grpc::ClientUnaryReactor* reactor) {
-  ::grpc::internal::ClientCallbackUnaryFactory::Create< ::grpc::protobuf::MessageLite, ::grpc::protobuf::MessageLite>(stub_->channel_.get(), stub_->rpcmethod_CancelAutoComplete_, context, request, response, reactor);
-}
-
-::grpc::ClientAsyncResponseReader< ::io::deephaven::proto::backplane::script::grpc::CancelAutoCompleteResponse>* ConsoleService::Stub::PrepareAsyncCancelAutoCompleteRaw(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::script::grpc::CancelAutoCompleteRequest& request, ::grpc::CompletionQueue* cq) {
-  return ::grpc::internal::ClientAsyncResponseReaderHelper::Create< ::io::deephaven::proto::backplane::script::grpc::CancelAutoCompleteResponse, ::io::deephaven::proto::backplane::script::grpc::CancelAutoCompleteRequest, ::grpc::protobuf::MessageLite, ::grpc::protobuf::MessageLite>(channel_.get(), cq, rpcmethod_CancelAutoComplete_, context, request);
-}
-
-::grpc::ClientAsyncResponseReader< ::io::deephaven::proto::backplane::script::grpc::CancelAutoCompleteResponse>* ConsoleService::Stub::AsyncCancelAutoCompleteRaw(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::script::grpc::CancelAutoCompleteRequest& request, ::grpc::CompletionQueue* cq) {
-  auto* result =
-    this->PrepareAsyncCancelAutoCompleteRaw(context, request, cq);
-  result->StartCall();
-  return result;
-}
-
-::grpc::ClientReader< ::io::deephaven::proto::backplane::script::grpc::AutoCompleteResponse>* ConsoleService::Stub::OpenAutoCompleteStreamRaw(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::script::grpc::AutoCompleteRequest& request) {
-  return ::grpc::internal::ClientReaderFactory< ::io::deephaven::proto::backplane::script::grpc::AutoCompleteResponse>::Create(channel_.get(), rpcmethod_OpenAutoCompleteStream_, context, request);
-}
-
-void ConsoleService::Stub::async::OpenAutoCompleteStream(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::script::grpc::AutoCompleteRequest* request, ::grpc::ClientReadReactor< ::io::deephaven::proto::backplane::script::grpc::AutoCompleteResponse>* reactor) {
-  ::grpc::internal::ClientCallbackReaderFactory< ::io::deephaven::proto::backplane::script::grpc::AutoCompleteResponse>::Create(stub_->channel_.get(), stub_->rpcmethod_OpenAutoCompleteStream_, context, request, reactor);
-}
-
-::grpc::ClientAsyncReader< ::io::deephaven::proto::backplane::script::grpc::AutoCompleteResponse>* ConsoleService::Stub::AsyncOpenAutoCompleteStreamRaw(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::script::grpc::AutoCompleteRequest& request, ::grpc::CompletionQueue* cq, void* tag) {
-  return ::grpc::internal::ClientAsyncReaderFactory< ::io::deephaven::proto::backplane::script::grpc::AutoCompleteResponse>::Create(channel_.get(), cq, rpcmethod_OpenAutoCompleteStream_, context, request, true, tag);
-}
-
-::grpc::ClientAsyncReader< ::io::deephaven::proto::backplane::script::grpc::AutoCompleteResponse>* ConsoleService::Stub::PrepareAsyncOpenAutoCompleteStreamRaw(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::script::grpc::AutoCompleteRequest& request, ::grpc::CompletionQueue* cq) {
-  return ::grpc::internal::ClientAsyncReaderFactory< ::io::deephaven::proto::backplane::script::grpc::AutoCompleteResponse>::Create(channel_.get(), cq, rpcmethod_OpenAutoCompleteStream_, context, request, false, nullptr);
-}
-
-::grpc::Status ConsoleService::Stub::NextAutoCompleteStream(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::script::grpc::AutoCompleteRequest& request, ::io::deephaven::proto::backplane::script::grpc::BrowserNextResponse* response) {
-  return ::grpc::internal::BlockingUnaryCall< ::io::deephaven::proto::backplane::script::grpc::AutoCompleteRequest, ::io::deephaven::proto::backplane::script::grpc::BrowserNextResponse, ::grpc::protobuf::MessageLite, ::grpc::protobuf::MessageLite>(channel_.get(), rpcmethod_NextAutoCompleteStream_, context, request, response);
-}
-
-void ConsoleService::Stub::async::NextAutoCompleteStream(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::script::grpc::AutoCompleteRequest* request, ::io::deephaven::proto::backplane::script::grpc::BrowserNextResponse* response, std::function<void(::grpc::Status)> f) {
-  ::grpc::internal::CallbackUnaryCall< ::io::deephaven::proto::backplane::script::grpc::AutoCompleteRequest, ::io::deephaven::proto::backplane::script::grpc::BrowserNextResponse, ::grpc::protobuf::MessageLite, ::grpc::protobuf::MessageLite>(stub_->channel_.get(), stub_->rpcmethod_NextAutoCompleteStream_, context, request, response, std::move(f));
-}
-
-void ConsoleService::Stub::async::NextAutoCompleteStream(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::script::grpc::AutoCompleteRequest* request, ::io::deephaven::proto::backplane::script::grpc::BrowserNextResponse* response, ::grpc::ClientUnaryReactor* reactor) {
-  ::grpc::internal::ClientCallbackUnaryFactory::Create< ::grpc::protobuf::MessageLite, ::grpc::protobuf::MessageLite>(stub_->channel_.get(), stub_->rpcmethod_NextAutoCompleteStream_, context, request, response, reactor);
-}
-
-::grpc::ClientAsyncResponseReader< ::io::deephaven::proto::backplane::script::grpc::BrowserNextResponse>* ConsoleService::Stub::PrepareAsyncNextAutoCompleteStreamRaw(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::script::grpc::AutoCompleteRequest& request, ::grpc::CompletionQueue* cq) {
-  return ::grpc::internal::ClientAsyncResponseReaderHelper::Create< ::io::deephaven::proto::backplane::script::grpc::BrowserNextResponse, ::io::deephaven::proto::backplane::script::grpc::AutoCompleteRequest, ::grpc::protobuf::MessageLite, ::grpc::protobuf::MessageLite>(channel_.get(), cq, rpcmethod_NextAutoCompleteStream_, context, request);
-}
-
-::grpc::ClientAsyncResponseReader< ::io::deephaven::proto::backplane::script::grpc::BrowserNextResponse>* ConsoleService::Stub::AsyncNextAutoCompleteStreamRaw(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::script::grpc::AutoCompleteRequest& request, ::grpc::CompletionQueue* cq) {
-  auto* result =
-    this->PrepareAsyncNextAutoCompleteStreamRaw(context, request, cq);
-  result->StartCall();
-  return result;
-}
-
-ConsoleService::Service::Service() {
-  AddMethod(new ::grpc::internal::RpcServiceMethod(
-      ConsoleService_method_names[0],
-      ::grpc::internal::RpcMethod::NORMAL_RPC,
-      new ::grpc::internal::RpcMethodHandler< ConsoleService::Service, ::io::deephaven::proto::backplane::script::grpc::GetConsoleTypesRequest, ::io::deephaven::proto::backplane::script::grpc::GetConsoleTypesResponse, ::grpc::protobuf::MessageLite, ::grpc::protobuf::MessageLite>(
-          [](ConsoleService::Service* service,
-             ::grpc::ServerContext* ctx,
-             const ::io::deephaven::proto::backplane::script::grpc::GetConsoleTypesRequest* req,
-             ::io::deephaven::proto::backplane::script::grpc::GetConsoleTypesResponse* resp) {
-               return service->GetConsoleTypes(ctx, req, resp);
-             }, this)));
-  AddMethod(new ::grpc::internal::RpcServiceMethod(
-      ConsoleService_method_names[1],
-      ::grpc::internal::RpcMethod::NORMAL_RPC,
-      new ::grpc::internal::RpcMethodHandler< ConsoleService::Service, ::io::deephaven::proto::backplane::script::grpc::StartConsoleRequest, ::io::deephaven::proto::backplane::script::grpc::StartConsoleResponse, ::grpc::protobuf::MessageLite, ::grpc::protobuf::MessageLite>(
-          [](ConsoleService::Service* service,
-             ::grpc::ServerContext* ctx,
-             const ::io::deephaven::proto::backplane::script::grpc::StartConsoleRequest* req,
-             ::io::deephaven::proto::backplane::script::grpc::StartConsoleResponse* resp) {
-               return service->StartConsole(ctx, req, resp);
-             }, this)));
-  AddMethod(new ::grpc::internal::RpcServiceMethod(
-      ConsoleService_method_names[2],
-      ::grpc::internal::RpcMethod::NORMAL_RPC,
-      new ::grpc::internal::RpcMethodHandler< ConsoleService::Service, ::io::deephaven::proto::backplane::script::grpc::GetHeapInfoRequest, ::io::deephaven::proto::backplane::script::grpc::GetHeapInfoResponse, ::grpc::protobuf::MessageLite, ::grpc::protobuf::MessageLite>(
-          [](ConsoleService::Service* service,
-             ::grpc::ServerContext* ctx,
-             const ::io::deephaven::proto::backplane::script::grpc::GetHeapInfoRequest* req,
-             ::io::deephaven::proto::backplane::script::grpc::GetHeapInfoResponse* resp) {
-               return service->GetHeapInfo(ctx, req, resp);
-             }, this)));
-  AddMethod(new ::grpc::internal::RpcServiceMethod(
-      ConsoleService_method_names[3],
-      ::grpc::internal::RpcMethod::SERVER_STREAMING,
-      new ::grpc::internal::ServerStreamingHandler< ConsoleService::Service, ::io::deephaven::proto::backplane::script::grpc::LogSubscriptionRequest, ::io::deephaven::proto::backplane::script::grpc::LogSubscriptionData>(
-          [](ConsoleService::Service* service,
-             ::grpc::ServerContext* ctx,
-             const ::io::deephaven::proto::backplane::script::grpc::LogSubscriptionRequest* req,
-             ::grpc::ServerWriter<::io::deephaven::proto::backplane::script::grpc::LogSubscriptionData>* writer) {
-               return service->SubscribeToLogs(ctx, req, writer);
-             }, this)));
-  AddMethod(new ::grpc::internal::RpcServiceMethod(
-      ConsoleService_method_names[4],
-      ::grpc::internal::RpcMethod::NORMAL_RPC,
-      new ::grpc::internal::RpcMethodHandler< ConsoleService::Service, ::io::deephaven::proto::backplane::script::grpc::ExecuteCommandRequest, ::io::deephaven::proto::backplane::script::grpc::ExecuteCommandResponse, ::grpc::protobuf::MessageLite, ::grpc::protobuf::MessageLite>(
-          [](ConsoleService::Service* service,
-             ::grpc::ServerContext* ctx,
-             const ::io::deephaven::proto::backplane::script::grpc::ExecuteCommandRequest* req,
-             ::io::deephaven::proto::backplane::script::grpc::ExecuteCommandResponse* resp) {
-               return service->ExecuteCommand(ctx, req, resp);
-             }, this)));
-  AddMethod(new ::grpc::internal::RpcServiceMethod(
-      ConsoleService_method_names[5],
-      ::grpc::internal::RpcMethod::NORMAL_RPC,
-      new ::grpc::internal::RpcMethodHandler< ConsoleService::Service, ::io::deephaven::proto::backplane::script::grpc::CancelCommandRequest, ::io::deephaven::proto::backplane::script::grpc::CancelCommandResponse, ::grpc::protobuf::MessageLite, ::grpc::protobuf::MessageLite>(
-          [](ConsoleService::Service* service,
-             ::grpc::ServerContext* ctx,
-             const ::io::deephaven::proto::backplane::script::grpc::CancelCommandRequest* req,
-             ::io::deephaven::proto::backplane::script::grpc::CancelCommandResponse* resp) {
-               return service->CancelCommand(ctx, req, resp);
-             }, this)));
-  AddMethod(new ::grpc::internal::RpcServiceMethod(
-      ConsoleService_method_names[6],
-      ::grpc::internal::RpcMethod::NORMAL_RPC,
-      new ::grpc::internal::RpcMethodHandler< ConsoleService::Service, ::io::deephaven::proto::backplane::script::grpc::BindTableToVariableRequest, ::io::deephaven::proto::backplane::script::grpc::BindTableToVariableResponse, ::grpc::protobuf::MessageLite, ::grpc::protobuf::MessageLite>(
-          [](ConsoleService::Service* service,
-             ::grpc::ServerContext* ctx,
-             const ::io::deephaven::proto::backplane::script::grpc::BindTableToVariableRequest* req,
-             ::io::deephaven::proto::backplane::script::grpc::BindTableToVariableResponse* resp) {
-               return service->BindTableToVariable(ctx, req, resp);
-             }, this)));
-  AddMethod(new ::grpc::internal::RpcServiceMethod(
-      ConsoleService_method_names[7],
-      ::grpc::internal::RpcMethod::BIDI_STREAMING,
-      new ::grpc::internal::BidiStreamingHandler< ConsoleService::Service, ::io::deephaven::proto::backplane::script::grpc::AutoCompleteRequest, ::io::deephaven::proto::backplane::script::grpc::AutoCompleteResponse>(
-          [](ConsoleService::Service* service,
-             ::grpc::ServerContext* ctx,
-             ::grpc::ServerReaderWriter<::io::deephaven::proto::backplane::script::grpc::AutoCompleteResponse,
-             ::io::deephaven::proto::backplane::script::grpc::AutoCompleteRequest>* stream) {
-               return service->AutoCompleteStream(ctx, stream);
-             }, this)));
-  AddMethod(new ::grpc::internal::RpcServiceMethod(
-      ConsoleService_method_names[8],
-      ::grpc::internal::RpcMethod::NORMAL_RPC,
-      new ::grpc::internal::RpcMethodHandler< ConsoleService::Service, ::io::deephaven::proto::backplane::script::grpc::CancelAutoCompleteRequest, ::io::deephaven::proto::backplane::script::grpc::CancelAutoCompleteResponse, ::grpc::protobuf::MessageLite, ::grpc::protobuf::MessageLite>(
-          [](ConsoleService::Service* service,
-             ::grpc::ServerContext* ctx,
-             const ::io::deephaven::proto::backplane::script::grpc::CancelAutoCompleteRequest* req,
-             ::io::deephaven::proto::backplane::script::grpc::CancelAutoCompleteResponse* resp) {
-               return service->CancelAutoComplete(ctx, req, resp);
-             }, this)));
-  AddMethod(new ::grpc::internal::RpcServiceMethod(
-      ConsoleService_method_names[9],
-      ::grpc::internal::RpcMethod::SERVER_STREAMING,
-      new ::grpc::internal::ServerStreamingHandler< ConsoleService::Service, ::io::deephaven::proto::backplane::script::grpc::AutoCompleteRequest, ::io::deephaven::proto::backplane::script::grpc::AutoCompleteResponse>(
-          [](ConsoleService::Service* service,
-             ::grpc::ServerContext* ctx,
-             const ::io::deephaven::proto::backplane::script::grpc::AutoCompleteRequest* req,
-             ::grpc::ServerWriter<::io::deephaven::proto::backplane::script::grpc::AutoCompleteResponse>* writer) {
-               return service->OpenAutoCompleteStream(ctx, req, writer);
-             }, this)));
-  AddMethod(new ::grpc::internal::RpcServiceMethod(
-      ConsoleService_method_names[10],
-      ::grpc::internal::RpcMethod::NORMAL_RPC,
-      new ::grpc::internal::RpcMethodHandler< ConsoleService::Service, ::io::deephaven::proto::backplane::script::grpc::AutoCompleteRequest, ::io::deephaven::proto::backplane::script::grpc::BrowserNextResponse, ::grpc::protobuf::MessageLite, ::grpc::protobuf::MessageLite>(
-          [](ConsoleService::Service* service,
-             ::grpc::ServerContext* ctx,
-             const ::io::deephaven::proto::backplane::script::grpc::AutoCompleteRequest* req,
-             ::io::deephaven::proto::backplane::script::grpc::BrowserNextResponse* resp) {
-               return service->NextAutoCompleteStream(ctx, req, resp);
-             }, this)));
-}
-
-ConsoleService::Service::~Service() {
-}
-
-::grpc::Status ConsoleService::Service::GetConsoleTypes(::grpc::ServerContext* context, const ::io::deephaven::proto::backplane::script::grpc::GetConsoleTypesRequest* request, ::io::deephaven::proto::backplane::script::grpc::GetConsoleTypesResponse* response) {
-  (void) context;
-  (void) request;
-  (void) response;
-  return ::grpc::Status(::grpc::StatusCode::UNIMPLEMENTED, "");
-}
-
-::grpc::Status ConsoleService::Service::StartConsole(::grpc::ServerContext* context, const ::io::deephaven::proto::backplane::script::grpc::StartConsoleRequest* request, ::io::deephaven::proto::backplane::script::grpc::StartConsoleResponse* response) {
-  (void) context;
-  (void) request;
-  (void) response;
-  return ::grpc::Status(::grpc::StatusCode::UNIMPLEMENTED, "");
-}
-
-::grpc::Status ConsoleService::Service::GetHeapInfo(::grpc::ServerContext* context, const ::io::deephaven::proto::backplane::script::grpc::GetHeapInfoRequest* request, ::io::deephaven::proto::backplane::script::grpc::GetHeapInfoResponse* response) {
-  (void) context;
-  (void) request;
-  (void) response;
-  return ::grpc::Status(::grpc::StatusCode::UNIMPLEMENTED, "");
-}
-
-::grpc::Status ConsoleService::Service::SubscribeToLogs(::grpc::ServerContext* context, const ::io::deephaven::proto::backplane::script::grpc::LogSubscriptionRequest* request, ::grpc::ServerWriter< ::io::deephaven::proto::backplane::script::grpc::LogSubscriptionData>* writer) {
-  (void) context;
-  (void) request;
-  (void) writer;
-  return ::grpc::Status(::grpc::StatusCode::UNIMPLEMENTED, "");
-}
-
-::grpc::Status ConsoleService::Service::ExecuteCommand(::grpc::ServerContext* context, const ::io::deephaven::proto::backplane::script::grpc::ExecuteCommandRequest* request, ::io::deephaven::proto::backplane::script::grpc::ExecuteCommandResponse* response) {
-  (void) context;
-  (void) request;
-  (void) response;
-  return ::grpc::Status(::grpc::StatusCode::UNIMPLEMENTED, "");
-}
-
-::grpc::Status ConsoleService::Service::CancelCommand(::grpc::ServerContext* context, const ::io::deephaven::proto::backplane::script::grpc::CancelCommandRequest* request, ::io::deephaven::proto::backplane::script::grpc::CancelCommandResponse* response) {
-  (void) context;
-  (void) request;
-  (void) response;
-  return ::grpc::Status(::grpc::StatusCode::UNIMPLEMENTED, "");
-}
-
-::grpc::Status ConsoleService::Service::BindTableToVariable(::grpc::ServerContext* context, const ::io::deephaven::proto::backplane::script::grpc::BindTableToVariableRequest* request, ::io::deephaven::proto::backplane::script::grpc::BindTableToVariableResponse* response) {
-  (void) context;
-  (void) request;
-  (void) response;
-  return ::grpc::Status(::grpc::StatusCode::UNIMPLEMENTED, "");
-}
-
-::grpc::Status ConsoleService::Service::AutoCompleteStream(::grpc::ServerContext* context, ::grpc::ServerReaderWriter< ::io::deephaven::proto::backplane::script::grpc::AutoCompleteResponse, ::io::deephaven::proto::backplane::script::grpc::AutoCompleteRequest>* stream) {
-  (void) context;
-  (void) stream;
-  return ::grpc::Status(::grpc::StatusCode::UNIMPLEMENTED, "");
-}
-
-::grpc::Status ConsoleService::Service::CancelAutoComplete(::grpc::ServerContext* context, const ::io::deephaven::proto::backplane::script::grpc::CancelAutoCompleteRequest* request, ::io::deephaven::proto::backplane::script::grpc::CancelAutoCompleteResponse* response) {
-  (void) context;
-  (void) request;
-  (void) response;
-  return ::grpc::Status(::grpc::StatusCode::UNIMPLEMENTED, "");
-}
-
-::grpc::Status ConsoleService::Service::OpenAutoCompleteStream(::grpc::ServerContext* context, const ::io::deephaven::proto::backplane::script::grpc::AutoCompleteRequest* request, ::grpc::ServerWriter< ::io::deephaven::proto::backplane::script::grpc::AutoCompleteResponse>* writer) {
-  (void) context;
-  (void) request;
-  (void) writer;
-  return ::grpc::Status(::grpc::StatusCode::UNIMPLEMENTED, "");
-}
-
-::grpc::Status ConsoleService::Service::NextAutoCompleteStream(::grpc::ServerContext* context, const ::io::deephaven::proto::backplane::script::grpc::AutoCompleteRequest* request, ::io::deephaven::proto::backplane::script::grpc::BrowserNextResponse* response) {
-  (void) context;
-  (void) request;
-  (void) response;
-  return ::grpc::Status(::grpc::StatusCode::UNIMPLEMENTED, "");
-}
-
-
-}  // namespace io
-}  // namespace deephaven
-}  // namespace proto
-}  // namespace backplane
-}  // namespace script
-}  // namespace grpc
-
diff --git a/cpp-client/deephaven/dhclient/proto/deephaven/proto/console.grpc.pb.h b/cpp-client/deephaven/dhclient/proto/deephaven/proto/console.grpc.pb.h
deleted file mode 100644
index 57506fedee5..00000000000
--- a/cpp-client/deephaven/dhclient/proto/deephaven/proto/console.grpc.pb.h
+++ /dev/null
@@ -1,1827 +0,0 @@
-// Generated by the gRPC C++ plugin.
-// If you make any local change, they will be lost.
-// source: deephaven/proto/console.proto
-// Original file comments:
-//
-// Copyright (c) 2016-2022 Deephaven Data Labs and Patent Pending
-#ifndef GRPC_deephaven_2fproto_2fconsole_2eproto__INCLUDED
-#define GRPC_deephaven_2fproto_2fconsole_2eproto__INCLUDED
-
-#include "deephaven/proto/console.pb.h"
-
-#include <functional>
-#include <grpcpp/generic/async_generic_service.h>
-#include <grpcpp/support/async_stream.h>
-#include <grpcpp/support/async_unary_call.h>
-#include <grpcpp/support/client_callback.h>
-#include <grpcpp/client_context.h>
-#include <grpcpp/completion_queue.h>
-#include <grpcpp/support/message_allocator.h>
-#include <grpcpp/support/method_handler.h>
-#include <grpcpp/impl/proto_utils.h>
-#include <grpcpp/impl/rpc_method.h>
-#include <grpcpp/support/server_callback.h>
-#include <grpcpp/impl/server_callback_handlers.h>
-#include <grpcpp/server_context.h>
-#include <grpcpp/impl/service_type.h>
-#include <grpcpp/support/status.h>
-#include <grpcpp/support/stub_options.h>
-#include <grpcpp/support/sync_stream.h>
-
-namespace io {
-namespace deephaven {
-namespace proto {
-namespace backplane {
-namespace script {
-namespace grpc {
-
-//
-// Console interaction service
-class ConsoleService final {
- public:
-  static constexpr char const* service_full_name() {
-    return "io.deephaven.proto.backplane.script.grpc.ConsoleService";
-  }
-  class StubInterface {
-   public:
-    virtual ~StubInterface() {}
-    virtual ::grpc::Status GetConsoleTypes(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::script::grpc::GetConsoleTypesRequest& request, ::io::deephaven::proto::backplane::script::grpc::GetConsoleTypesResponse* response) = 0;
-    std::unique_ptr< ::grpc::ClientAsyncResponseReaderInterface< ::io::deephaven::proto::backplane::script::grpc::GetConsoleTypesResponse>> AsyncGetConsoleTypes(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::script::grpc::GetConsoleTypesRequest& request, ::grpc::CompletionQueue* cq) {
-      return std::unique_ptr< ::grpc::ClientAsyncResponseReaderInterface< ::io::deephaven::proto::backplane::script::grpc::GetConsoleTypesResponse>>(AsyncGetConsoleTypesRaw(context, request, cq));
-    }
-    std::unique_ptr< ::grpc::ClientAsyncResponseReaderInterface< ::io::deephaven::proto::backplane::script::grpc::GetConsoleTypesResponse>> PrepareAsyncGetConsoleTypes(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::script::grpc::GetConsoleTypesRequest& request, ::grpc::CompletionQueue* cq) {
-      return std::unique_ptr< ::grpc::ClientAsyncResponseReaderInterface< ::io::deephaven::proto::backplane::script::grpc::GetConsoleTypesResponse>>(PrepareAsyncGetConsoleTypesRaw(context, request, cq));
-    }
-    virtual ::grpc::Status StartConsole(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::script::grpc::StartConsoleRequest& request, ::io::deephaven::proto::backplane::script::grpc::StartConsoleResponse* response) = 0;
-    std::unique_ptr< ::grpc::ClientAsyncResponseReaderInterface< ::io::deephaven::proto::backplane::script::grpc::StartConsoleResponse>> AsyncStartConsole(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::script::grpc::StartConsoleRequest& request, ::grpc::CompletionQueue* cq) {
-      return std::unique_ptr< ::grpc::ClientAsyncResponseReaderInterface< ::io::deephaven::proto::backplane::script::grpc::StartConsoleResponse>>(AsyncStartConsoleRaw(context, request, cq));
-    }
-    std::unique_ptr< ::grpc::ClientAsyncResponseReaderInterface< ::io::deephaven::proto::backplane::script::grpc::StartConsoleResponse>> PrepareAsyncStartConsole(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::script::grpc::StartConsoleRequest& request, ::grpc::CompletionQueue* cq) {
-      return std::unique_ptr< ::grpc::ClientAsyncResponseReaderInterface< ::io::deephaven::proto::backplane::script::grpc::StartConsoleResponse>>(PrepareAsyncStartConsoleRaw(context, request, cq));
-    }
-    virtual ::grpc::Status GetHeapInfo(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::script::grpc::GetHeapInfoRequest& request, ::io::deephaven::proto::backplane::script::grpc::GetHeapInfoResponse* response) = 0;
-    std::unique_ptr< ::grpc::ClientAsyncResponseReaderInterface< ::io::deephaven::proto::backplane::script::grpc::GetHeapInfoResponse>> AsyncGetHeapInfo(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::script::grpc::GetHeapInfoRequest& request, ::grpc::CompletionQueue* cq) {
-      return std::unique_ptr< ::grpc::ClientAsyncResponseReaderInterface< ::io::deephaven::proto::backplane::script::grpc::GetHeapInfoResponse>>(AsyncGetHeapInfoRaw(context, request, cq));
-    }
-    std::unique_ptr< ::grpc::ClientAsyncResponseReaderInterface< ::io::deephaven::proto::backplane::script::grpc::GetHeapInfoResponse>> PrepareAsyncGetHeapInfo(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::script::grpc::GetHeapInfoRequest& request, ::grpc::CompletionQueue* cq) {
-      return std::unique_ptr< ::grpc::ClientAsyncResponseReaderInterface< ::io::deephaven::proto::backplane::script::grpc::GetHeapInfoResponse>>(PrepareAsyncGetHeapInfoRaw(context, request, cq));
-    }
-    std::unique_ptr< ::grpc::ClientReaderInterface< ::io::deephaven::proto::backplane::script::grpc::LogSubscriptionData>> SubscribeToLogs(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::script::grpc::LogSubscriptionRequest& request) {
-      return std::unique_ptr< ::grpc::ClientReaderInterface< ::io::deephaven::proto::backplane::script::grpc::LogSubscriptionData>>(SubscribeToLogsRaw(context, request));
-    }
-    std::unique_ptr< ::grpc::ClientAsyncReaderInterface< ::io::deephaven::proto::backplane::script::grpc::LogSubscriptionData>> AsyncSubscribeToLogs(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::script::grpc::LogSubscriptionRequest& request, ::grpc::CompletionQueue* cq, void* tag) {
-      return std::unique_ptr< ::grpc::ClientAsyncReaderInterface< ::io::deephaven::proto::backplane::script::grpc::LogSubscriptionData>>(AsyncSubscribeToLogsRaw(context, request, cq, tag));
-    }
-    std::unique_ptr< ::grpc::ClientAsyncReaderInterface< ::io::deephaven::proto::backplane::script::grpc::LogSubscriptionData>> PrepareAsyncSubscribeToLogs(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::script::grpc::LogSubscriptionRequest& request, ::grpc::CompletionQueue* cq) {
-      return std::unique_ptr< ::grpc::ClientAsyncReaderInterface< ::io::deephaven::proto::backplane::script::grpc::LogSubscriptionData>>(PrepareAsyncSubscribeToLogsRaw(context, request, cq));
-    }
-    virtual ::grpc::Status ExecuteCommand(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::script::grpc::ExecuteCommandRequest& request, ::io::deephaven::proto::backplane::script::grpc::ExecuteCommandResponse* response) = 0;
-    std::unique_ptr< ::grpc::ClientAsyncResponseReaderInterface< ::io::deephaven::proto::backplane::script::grpc::ExecuteCommandResponse>> AsyncExecuteCommand(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::script::grpc::ExecuteCommandRequest& request, ::grpc::CompletionQueue* cq) {
-      return std::unique_ptr< ::grpc::ClientAsyncResponseReaderInterface< ::io::deephaven::proto::backplane::script::grpc::ExecuteCommandResponse>>(AsyncExecuteCommandRaw(context, request, cq));
-    }
-    std::unique_ptr< ::grpc::ClientAsyncResponseReaderInterface< ::io::deephaven::proto::backplane::script::grpc::ExecuteCommandResponse>> PrepareAsyncExecuteCommand(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::script::grpc::ExecuteCommandRequest& request, ::grpc::CompletionQueue* cq) {
-      return std::unique_ptr< ::grpc::ClientAsyncResponseReaderInterface< ::io::deephaven::proto::backplane::script::grpc::ExecuteCommandResponse>>(PrepareAsyncExecuteCommandRaw(context, request, cq));
-    }
-    virtual ::grpc::Status CancelCommand(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::script::grpc::CancelCommandRequest& request, ::io::deephaven::proto::backplane::script::grpc::CancelCommandResponse* response) = 0;
-    std::unique_ptr< ::grpc::ClientAsyncResponseReaderInterface< ::io::deephaven::proto::backplane::script::grpc::CancelCommandResponse>> AsyncCancelCommand(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::script::grpc::CancelCommandRequest& request, ::grpc::CompletionQueue* cq) {
-      return std::unique_ptr< ::grpc::ClientAsyncResponseReaderInterface< ::io::deephaven::proto::backplane::script::grpc::CancelCommandResponse>>(AsyncCancelCommandRaw(context, request, cq));
-    }
-    std::unique_ptr< ::grpc::ClientAsyncResponseReaderInterface< ::io::deephaven::proto::backplane::script::grpc::CancelCommandResponse>> PrepareAsyncCancelCommand(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::script::grpc::CancelCommandRequest& request, ::grpc::CompletionQueue* cq) {
-      return std::unique_ptr< ::grpc::ClientAsyncResponseReaderInterface< ::io::deephaven::proto::backplane::script::grpc::CancelCommandResponse>>(PrepareAsyncCancelCommandRaw(context, request, cq));
-    }
-    virtual ::grpc::Status BindTableToVariable(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::script::grpc::BindTableToVariableRequest& request, ::io::deephaven::proto::backplane::script::grpc::BindTableToVariableResponse* response) = 0;
-    std::unique_ptr< ::grpc::ClientAsyncResponseReaderInterface< ::io::deephaven::proto::backplane::script::grpc::BindTableToVariableResponse>> AsyncBindTableToVariable(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::script::grpc::BindTableToVariableRequest& request, ::grpc::CompletionQueue* cq) {
-      return std::unique_ptr< ::grpc::ClientAsyncResponseReaderInterface< ::io::deephaven::proto::backplane::script::grpc::BindTableToVariableResponse>>(AsyncBindTableToVariableRaw(context, request, cq));
-    }
-    std::unique_ptr< ::grpc::ClientAsyncResponseReaderInterface< ::io::deephaven::proto::backplane::script::grpc::BindTableToVariableResponse>> PrepareAsyncBindTableToVariable(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::script::grpc::BindTableToVariableRequest& request, ::grpc::CompletionQueue* cq) {
-      return std::unique_ptr< ::grpc::ClientAsyncResponseReaderInterface< ::io::deephaven::proto::backplane::script::grpc::BindTableToVariableResponse>>(PrepareAsyncBindTableToVariableRaw(context, request, cq));
-    }
-    //
-    // Starts a stream for autocomplete on the current session. More than one console,
-    // more than one document can be edited at a time using this, and they can separately
-    // be closed as well. A given document should only be edited within one stream at a
-    // time.
-    std::unique_ptr< ::grpc::ClientReaderWriterInterface< ::io::deephaven::proto::backplane::script::grpc::AutoCompleteRequest, ::io::deephaven::proto::backplane::script::grpc::AutoCompleteResponse>> AutoCompleteStream(::grpc::ClientContext* context) {
-      return std::unique_ptr< ::grpc::ClientReaderWriterInterface< ::io::deephaven::proto::backplane::script::grpc::AutoCompleteRequest, ::io::deephaven::proto::backplane::script::grpc::AutoCompleteResponse>>(AutoCompleteStreamRaw(context));
-    }
-    std::unique_ptr< ::grpc::ClientAsyncReaderWriterInterface< ::io::deephaven::proto::backplane::script::grpc::AutoCompleteRequest, ::io::deephaven::proto::backplane::script::grpc::AutoCompleteResponse>> AsyncAutoCompleteStream(::grpc::ClientContext* context, ::grpc::CompletionQueue* cq, void* tag) {
-      return std::unique_ptr< ::grpc::ClientAsyncReaderWriterInterface< ::io::deephaven::proto::backplane::script::grpc::AutoCompleteRequest, ::io::deephaven::proto::backplane::script::grpc::AutoCompleteResponse>>(AsyncAutoCompleteStreamRaw(context, cq, tag));
-    }
-    std::unique_ptr< ::grpc::ClientAsyncReaderWriterInterface< ::io::deephaven::proto::backplane::script::grpc::AutoCompleteRequest, ::io::deephaven::proto::backplane::script::grpc::AutoCompleteResponse>> PrepareAsyncAutoCompleteStream(::grpc::ClientContext* context, ::grpc::CompletionQueue* cq) {
-      return std::unique_ptr< ::grpc::ClientAsyncReaderWriterInterface< ::io::deephaven::proto::backplane::script::grpc::AutoCompleteRequest, ::io::deephaven::proto::backplane::script::grpc::AutoCompleteResponse>>(PrepareAsyncAutoCompleteStreamRaw(context, cq));
-    }
-    virtual ::grpc::Status CancelAutoComplete(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::script::grpc::CancelAutoCompleteRequest& request, ::io::deephaven::proto::backplane::script::grpc::CancelAutoCompleteResponse* response) = 0;
-    std::unique_ptr< ::grpc::ClientAsyncResponseReaderInterface< ::io::deephaven::proto::backplane::script::grpc::CancelAutoCompleteResponse>> AsyncCancelAutoComplete(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::script::grpc::CancelAutoCompleteRequest& request, ::grpc::CompletionQueue* cq) {
-      return std::unique_ptr< ::grpc::ClientAsyncResponseReaderInterface< ::io::deephaven::proto::backplane::script::grpc::CancelAutoCompleteResponse>>(AsyncCancelAutoCompleteRaw(context, request, cq));
-    }
-    std::unique_ptr< ::grpc::ClientAsyncResponseReaderInterface< ::io::deephaven::proto::backplane::script::grpc::CancelAutoCompleteResponse>> PrepareAsyncCancelAutoComplete(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::script::grpc::CancelAutoCompleteRequest& request, ::grpc::CompletionQueue* cq) {
-      return std::unique_ptr< ::grpc::ClientAsyncResponseReaderInterface< ::io::deephaven::proto::backplane::script::grpc::CancelAutoCompleteResponse>>(PrepareAsyncCancelAutoCompleteRaw(context, request, cq));
-    }
-    //
-    // Half of the browser-based (browser's can't do bidirectional streams without websockets)
-    // implementation for AutoCompleteStream.
-    std::unique_ptr< ::grpc::ClientReaderInterface< ::io::deephaven::proto::backplane::script::grpc::AutoCompleteResponse>> OpenAutoCompleteStream(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::script::grpc::AutoCompleteRequest& request) {
-      return std::unique_ptr< ::grpc::ClientReaderInterface< ::io::deephaven::proto::backplane::script::grpc::AutoCompleteResponse>>(OpenAutoCompleteStreamRaw(context, request));
-    }
-    std::unique_ptr< ::grpc::ClientAsyncReaderInterface< ::io::deephaven::proto::backplane::script::grpc::AutoCompleteResponse>> AsyncOpenAutoCompleteStream(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::script::grpc::AutoCompleteRequest& request, ::grpc::CompletionQueue* cq, void* tag) {
-      return std::unique_ptr< ::grpc::ClientAsyncReaderInterface< ::io::deephaven::proto::backplane::script::grpc::AutoCompleteResponse>>(AsyncOpenAutoCompleteStreamRaw(context, request, cq, tag));
-    }
-    std::unique_ptr< ::grpc::ClientAsyncReaderInterface< ::io::deephaven::proto::backplane::script::grpc::AutoCompleteResponse>> PrepareAsyncOpenAutoCompleteStream(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::script::grpc::AutoCompleteRequest& request, ::grpc::CompletionQueue* cq) {
-      return std::unique_ptr< ::grpc::ClientAsyncReaderInterface< ::io::deephaven::proto::backplane::script::grpc::AutoCompleteResponse>>(PrepareAsyncOpenAutoCompleteStreamRaw(context, request, cq));
-    }
-    //
-    // Other half of the browser-based implementation for AutoCompleteStream.
-    virtual ::grpc::Status NextAutoCompleteStream(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::script::grpc::AutoCompleteRequest& request, ::io::deephaven::proto::backplane::script::grpc::BrowserNextResponse* response) = 0;
-    std::unique_ptr< ::grpc::ClientAsyncResponseReaderInterface< ::io::deephaven::proto::backplane::script::grpc::BrowserNextResponse>> AsyncNextAutoCompleteStream(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::script::grpc::AutoCompleteRequest& request, ::grpc::CompletionQueue* cq) {
-      return std::unique_ptr< ::grpc::ClientAsyncResponseReaderInterface< ::io::deephaven::proto::backplane::script::grpc::BrowserNextResponse>>(AsyncNextAutoCompleteStreamRaw(context, request, cq));
-    }
-    std::unique_ptr< ::grpc::ClientAsyncResponseReaderInterface< ::io::deephaven::proto::backplane::script::grpc::BrowserNextResponse>> PrepareAsyncNextAutoCompleteStream(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::script::grpc::AutoCompleteRequest& request, ::grpc::CompletionQueue* cq) {
-      return std::unique_ptr< ::grpc::ClientAsyncResponseReaderInterface< ::io::deephaven::proto::backplane::script::grpc::BrowserNextResponse>>(PrepareAsyncNextAutoCompleteStreamRaw(context, request, cq));
-    }
-    class async_interface {
-     public:
-      virtual ~async_interface() {}
-      virtual void GetConsoleTypes(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::script::grpc::GetConsoleTypesRequest* request, ::io::deephaven::proto::backplane::script::grpc::GetConsoleTypesResponse* response, std::function<void(::grpc::Status)>) = 0;
-      virtual void GetConsoleTypes(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::script::grpc::GetConsoleTypesRequest* request, ::io::deephaven::proto::backplane::script::grpc::GetConsoleTypesResponse* response, ::grpc::ClientUnaryReactor* reactor) = 0;
-      virtual void StartConsole(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::script::grpc::StartConsoleRequest* request, ::io::deephaven::proto::backplane::script::grpc::StartConsoleResponse* response, std::function<void(::grpc::Status)>) = 0;
-      virtual void StartConsole(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::script::grpc::StartConsoleRequest* request, ::io::deephaven::proto::backplane::script::grpc::StartConsoleResponse* response, ::grpc::ClientUnaryReactor* reactor) = 0;
-      virtual void GetHeapInfo(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::script::grpc::GetHeapInfoRequest* request, ::io::deephaven::proto::backplane::script::grpc::GetHeapInfoResponse* response, std::function<void(::grpc::Status)>) = 0;
-      virtual void GetHeapInfo(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::script::grpc::GetHeapInfoRequest* request, ::io::deephaven::proto::backplane::script::grpc::GetHeapInfoResponse* response, ::grpc::ClientUnaryReactor* reactor) = 0;
-      virtual void SubscribeToLogs(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::script::grpc::LogSubscriptionRequest* request, ::grpc::ClientReadReactor< ::io::deephaven::proto::backplane::script::grpc::LogSubscriptionData>* reactor) = 0;
-      virtual void ExecuteCommand(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::script::grpc::ExecuteCommandRequest* request, ::io::deephaven::proto::backplane::script::grpc::ExecuteCommandResponse* response, std::function<void(::grpc::Status)>) = 0;
-      virtual void ExecuteCommand(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::script::grpc::ExecuteCommandRequest* request, ::io::deephaven::proto::backplane::script::grpc::ExecuteCommandResponse* response, ::grpc::ClientUnaryReactor* reactor) = 0;
-      virtual void CancelCommand(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::script::grpc::CancelCommandRequest* request, ::io::deephaven::proto::backplane::script::grpc::CancelCommandResponse* response, std::function<void(::grpc::Status)>) = 0;
-      virtual void CancelCommand(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::script::grpc::CancelCommandRequest* request, ::io::deephaven::proto::backplane::script::grpc::CancelCommandResponse* response, ::grpc::ClientUnaryReactor* reactor) = 0;
-      virtual void BindTableToVariable(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::script::grpc::BindTableToVariableRequest* request, ::io::deephaven::proto::backplane::script::grpc::BindTableToVariableResponse* response, std::function<void(::grpc::Status)>) = 0;
-      virtual void BindTableToVariable(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::script::grpc::BindTableToVariableRequest* request, ::io::deephaven::proto::backplane::script::grpc::BindTableToVariableResponse* response, ::grpc::ClientUnaryReactor* reactor) = 0;
-      //
-      // Starts a stream for autocomplete on the current session. More than one console,
-      // more than one document can be edited at a time using this, and they can separately
-      // be closed as well. A given document should only be edited within one stream at a
-      // time.
-      virtual void AutoCompleteStream(::grpc::ClientContext* context, ::grpc::ClientBidiReactor< ::io::deephaven::proto::backplane::script::grpc::AutoCompleteRequest,::io::deephaven::proto::backplane::script::grpc::AutoCompleteResponse>* reactor) = 0;
-      virtual void CancelAutoComplete(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::script::grpc::CancelAutoCompleteRequest* request, ::io::deephaven::proto::backplane::script::grpc::CancelAutoCompleteResponse* response, std::function<void(::grpc::Status)>) = 0;
-      virtual void CancelAutoComplete(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::script::grpc::CancelAutoCompleteRequest* request, ::io::deephaven::proto::backplane::script::grpc::CancelAutoCompleteResponse* response, ::grpc::ClientUnaryReactor* reactor) = 0;
-      //
-      // Half of the browser-based (browser's can't do bidirectional streams without websockets)
-      // implementation for AutoCompleteStream.
-      virtual void OpenAutoCompleteStream(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::script::grpc::AutoCompleteRequest* request, ::grpc::ClientReadReactor< ::io::deephaven::proto::backplane::script::grpc::AutoCompleteResponse>* reactor) = 0;
-      //
-      // Other half of the browser-based implementation for AutoCompleteStream.
-      virtual void NextAutoCompleteStream(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::script::grpc::AutoCompleteRequest* request, ::io::deephaven::proto::backplane::script::grpc::BrowserNextResponse* response, std::function<void(::grpc::Status)>) = 0;
-      virtual void NextAutoCompleteStream(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::script::grpc::AutoCompleteRequest* request, ::io::deephaven::proto::backplane::script::grpc::BrowserNextResponse* response, ::grpc::ClientUnaryReactor* reactor) = 0;
-    };
-    typedef class async_interface experimental_async_interface;
-    virtual class async_interface* async() { return nullptr; }
-    class async_interface* experimental_async() { return async(); }
-   private:
-    virtual ::grpc::ClientAsyncResponseReaderInterface< ::io::deephaven::proto::backplane::script::grpc::GetConsoleTypesResponse>* AsyncGetConsoleTypesRaw(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::script::grpc::GetConsoleTypesRequest& request, ::grpc::CompletionQueue* cq) = 0;
-    virtual ::grpc::ClientAsyncResponseReaderInterface< ::io::deephaven::proto::backplane::script::grpc::GetConsoleTypesResponse>* PrepareAsyncGetConsoleTypesRaw(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::script::grpc::GetConsoleTypesRequest& request, ::grpc::CompletionQueue* cq) = 0;
-    virtual ::grpc::ClientAsyncResponseReaderInterface< ::io::deephaven::proto::backplane::script::grpc::StartConsoleResponse>* AsyncStartConsoleRaw(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::script::grpc::StartConsoleRequest& request, ::grpc::CompletionQueue* cq) = 0;
-    virtual ::grpc::ClientAsyncResponseReaderInterface< ::io::deephaven::proto::backplane::script::grpc::StartConsoleResponse>* PrepareAsyncStartConsoleRaw(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::script::grpc::StartConsoleRequest& request, ::grpc::CompletionQueue* cq) = 0;
-    virtual ::grpc::ClientAsyncResponseReaderInterface< ::io::deephaven::proto::backplane::script::grpc::GetHeapInfoResponse>* AsyncGetHeapInfoRaw(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::script::grpc::GetHeapInfoRequest& request, ::grpc::CompletionQueue* cq) = 0;
-    virtual ::grpc::ClientAsyncResponseReaderInterface< ::io::deephaven::proto::backplane::script::grpc::GetHeapInfoResponse>* PrepareAsyncGetHeapInfoRaw(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::script::grpc::GetHeapInfoRequest& request, ::grpc::CompletionQueue* cq) = 0;
-    virtual ::grpc::ClientReaderInterface< ::io::deephaven::proto::backplane::script::grpc::LogSubscriptionData>* SubscribeToLogsRaw(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::script::grpc::LogSubscriptionRequest& request) = 0;
-    virtual ::grpc::ClientAsyncReaderInterface< ::io::deephaven::proto::backplane::script::grpc::LogSubscriptionData>* AsyncSubscribeToLogsRaw(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::script::grpc::LogSubscriptionRequest& request, ::grpc::CompletionQueue* cq, void* tag) = 0;
-    virtual ::grpc::ClientAsyncReaderInterface< ::io::deephaven::proto::backplane::script::grpc::LogSubscriptionData>* PrepareAsyncSubscribeToLogsRaw(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::script::grpc::LogSubscriptionRequest& request, ::grpc::CompletionQueue* cq) = 0;
-    virtual ::grpc::ClientAsyncResponseReaderInterface< ::io::deephaven::proto::backplane::script::grpc::ExecuteCommandResponse>* AsyncExecuteCommandRaw(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::script::grpc::ExecuteCommandRequest& request, ::grpc::CompletionQueue* cq) = 0;
-    virtual ::grpc::ClientAsyncResponseReaderInterface< ::io::deephaven::proto::backplane::script::grpc::ExecuteCommandResponse>* PrepareAsyncExecuteCommandRaw(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::script::grpc::ExecuteCommandRequest& request, ::grpc::CompletionQueue* cq) = 0;
-    virtual ::grpc::ClientAsyncResponseReaderInterface< ::io::deephaven::proto::backplane::script::grpc::CancelCommandResponse>* AsyncCancelCommandRaw(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::script::grpc::CancelCommandRequest& request, ::grpc::CompletionQueue* cq) = 0;
-    virtual ::grpc::ClientAsyncResponseReaderInterface< ::io::deephaven::proto::backplane::script::grpc::CancelCommandResponse>* PrepareAsyncCancelCommandRaw(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::script::grpc::CancelCommandRequest& request, ::grpc::CompletionQueue* cq) = 0;
-    virtual ::grpc::ClientAsyncResponseReaderInterface< ::io::deephaven::proto::backplane::script::grpc::BindTableToVariableResponse>* AsyncBindTableToVariableRaw(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::script::grpc::BindTableToVariableRequest& request, ::grpc::CompletionQueue* cq) = 0;
-    virtual ::grpc::ClientAsyncResponseReaderInterface< ::io::deephaven::proto::backplane::script::grpc::BindTableToVariableResponse>* PrepareAsyncBindTableToVariableRaw(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::script::grpc::BindTableToVariableRequest& request, ::grpc::CompletionQueue* cq) = 0;
-    virtual ::grpc::ClientReaderWriterInterface< ::io::deephaven::proto::backplane::script::grpc::AutoCompleteRequest, ::io::deephaven::proto::backplane::script::grpc::AutoCompleteResponse>* AutoCompleteStreamRaw(::grpc::ClientContext* context) = 0;
-    virtual ::grpc::ClientAsyncReaderWriterInterface< ::io::deephaven::proto::backplane::script::grpc::AutoCompleteRequest, ::io::deephaven::proto::backplane::script::grpc::AutoCompleteResponse>* AsyncAutoCompleteStreamRaw(::grpc::ClientContext* context, ::grpc::CompletionQueue* cq, void* tag) = 0;
-    virtual ::grpc::ClientAsyncReaderWriterInterface< ::io::deephaven::proto::backplane::script::grpc::AutoCompleteRequest, ::io::deephaven::proto::backplane::script::grpc::AutoCompleteResponse>* PrepareAsyncAutoCompleteStreamRaw(::grpc::ClientContext* context, ::grpc::CompletionQueue* cq) = 0;
-    virtual ::grpc::ClientAsyncResponseReaderInterface< ::io::deephaven::proto::backplane::script::grpc::CancelAutoCompleteResponse>* AsyncCancelAutoCompleteRaw(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::script::grpc::CancelAutoCompleteRequest& request, ::grpc::CompletionQueue* cq) = 0;
-    virtual ::grpc::ClientAsyncResponseReaderInterface< ::io::deephaven::proto::backplane::script::grpc::CancelAutoCompleteResponse>* PrepareAsyncCancelAutoCompleteRaw(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::script::grpc::CancelAutoCompleteRequest& request, ::grpc::CompletionQueue* cq) = 0;
-    virtual ::grpc::ClientReaderInterface< ::io::deephaven::proto::backplane::script::grpc::AutoCompleteResponse>* OpenAutoCompleteStreamRaw(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::script::grpc::AutoCompleteRequest& request) = 0;
-    virtual ::grpc::ClientAsyncReaderInterface< ::io::deephaven::proto::backplane::script::grpc::AutoCompleteResponse>* AsyncOpenAutoCompleteStreamRaw(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::script::grpc::AutoCompleteRequest& request, ::grpc::CompletionQueue* cq, void* tag) = 0;
-    virtual ::grpc::ClientAsyncReaderInterface< ::io::deephaven::proto::backplane::script::grpc::AutoCompleteResponse>* PrepareAsyncOpenAutoCompleteStreamRaw(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::script::grpc::AutoCompleteRequest& request, ::grpc::CompletionQueue* cq) = 0;
-    virtual ::grpc::ClientAsyncResponseReaderInterface< ::io::deephaven::proto::backplane::script::grpc::BrowserNextResponse>* AsyncNextAutoCompleteStreamRaw(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::script::grpc::AutoCompleteRequest& request, ::grpc::CompletionQueue* cq) = 0;
-    virtual ::grpc::ClientAsyncResponseReaderInterface< ::io::deephaven::proto::backplane::script::grpc::BrowserNextResponse>* PrepareAsyncNextAutoCompleteStreamRaw(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::script::grpc::AutoCompleteRequest& request, ::grpc::CompletionQueue* cq) = 0;
-  };
-  class Stub final : public StubInterface {
-   public:
-    Stub(const std::shared_ptr< ::grpc::ChannelInterface>& channel, const ::grpc::StubOptions& options = ::grpc::StubOptions());
-    ::grpc::Status GetConsoleTypes(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::script::grpc::GetConsoleTypesRequest& request, ::io::deephaven::proto::backplane::script::grpc::GetConsoleTypesResponse* response) override;
-    std::unique_ptr< ::grpc::ClientAsyncResponseReader< ::io::deephaven::proto::backplane::script::grpc::GetConsoleTypesResponse>> AsyncGetConsoleTypes(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::script::grpc::GetConsoleTypesRequest& request, ::grpc::CompletionQueue* cq) {
-      return std::unique_ptr< ::grpc::ClientAsyncResponseReader< ::io::deephaven::proto::backplane::script::grpc::GetConsoleTypesResponse>>(AsyncGetConsoleTypesRaw(context, request, cq));
-    }
-    std::unique_ptr< ::grpc::ClientAsyncResponseReader< ::io::deephaven::proto::backplane::script::grpc::GetConsoleTypesResponse>> PrepareAsyncGetConsoleTypes(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::script::grpc::GetConsoleTypesRequest& request, ::grpc::CompletionQueue* cq) {
-      return std::unique_ptr< ::grpc::ClientAsyncResponseReader< ::io::deephaven::proto::backplane::script::grpc::GetConsoleTypesResponse>>(PrepareAsyncGetConsoleTypesRaw(context, request, cq));
-    }
-    ::grpc::Status StartConsole(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::script::grpc::StartConsoleRequest& request, ::io::deephaven::proto::backplane::script::grpc::StartConsoleResponse* response) override;
-    std::unique_ptr< ::grpc::ClientAsyncResponseReader< ::io::deephaven::proto::backplane::script::grpc::StartConsoleResponse>> AsyncStartConsole(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::script::grpc::StartConsoleRequest& request, ::grpc::CompletionQueue* cq) {
-      return std::unique_ptr< ::grpc::ClientAsyncResponseReader< ::io::deephaven::proto::backplane::script::grpc::StartConsoleResponse>>(AsyncStartConsoleRaw(context, request, cq));
-    }
-    std::unique_ptr< ::grpc::ClientAsyncResponseReader< ::io::deephaven::proto::backplane::script::grpc::StartConsoleResponse>> PrepareAsyncStartConsole(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::script::grpc::StartConsoleRequest& request, ::grpc::CompletionQueue* cq) {
-      return std::unique_ptr< ::grpc::ClientAsyncResponseReader< ::io::deephaven::proto::backplane::script::grpc::StartConsoleResponse>>(PrepareAsyncStartConsoleRaw(context, request, cq));
-    }
-    ::grpc::Status GetHeapInfo(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::script::grpc::GetHeapInfoRequest& request, ::io::deephaven::proto::backplane::script::grpc::GetHeapInfoResponse* response) override;
-    std::unique_ptr< ::grpc::ClientAsyncResponseReader< ::io::deephaven::proto::backplane::script::grpc::GetHeapInfoResponse>> AsyncGetHeapInfo(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::script::grpc::GetHeapInfoRequest& request, ::grpc::CompletionQueue* cq) {
-      return std::unique_ptr< ::grpc::ClientAsyncResponseReader< ::io::deephaven::proto::backplane::script::grpc::GetHeapInfoResponse>>(AsyncGetHeapInfoRaw(context, request, cq));
-    }
-    std::unique_ptr< ::grpc::ClientAsyncResponseReader< ::io::deephaven::proto::backplane::script::grpc::GetHeapInfoResponse>> PrepareAsyncGetHeapInfo(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::script::grpc::GetHeapInfoRequest& request, ::grpc::CompletionQueue* cq) {
-      return std::unique_ptr< ::grpc::ClientAsyncResponseReader< ::io::deephaven::proto::backplane::script::grpc::GetHeapInfoResponse>>(PrepareAsyncGetHeapInfoRaw(context, request, cq));
-    }
-    std::unique_ptr< ::grpc::ClientReader< ::io::deephaven::proto::backplane::script::grpc::LogSubscriptionData>> SubscribeToLogs(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::script::grpc::LogSubscriptionRequest& request) {
-      return std::unique_ptr< ::grpc::ClientReader< ::io::deephaven::proto::backplane::script::grpc::LogSubscriptionData>>(SubscribeToLogsRaw(context, request));
-    }
-    std::unique_ptr< ::grpc::ClientAsyncReader< ::io::deephaven::proto::backplane::script::grpc::LogSubscriptionData>> AsyncSubscribeToLogs(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::script::grpc::LogSubscriptionRequest& request, ::grpc::CompletionQueue* cq, void* tag) {
-      return std::unique_ptr< ::grpc::ClientAsyncReader< ::io::deephaven::proto::backplane::script::grpc::LogSubscriptionData>>(AsyncSubscribeToLogsRaw(context, request, cq, tag));
-    }
-    std::unique_ptr< ::grpc::ClientAsyncReader< ::io::deephaven::proto::backplane::script::grpc::LogSubscriptionData>> PrepareAsyncSubscribeToLogs(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::script::grpc::LogSubscriptionRequest& request, ::grpc::CompletionQueue* cq) {
-      return std::unique_ptr< ::grpc::ClientAsyncReader< ::io::deephaven::proto::backplane::script::grpc::LogSubscriptionData>>(PrepareAsyncSubscribeToLogsRaw(context, request, cq));
-    }
-    ::grpc::Status ExecuteCommand(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::script::grpc::ExecuteCommandRequest& request, ::io::deephaven::proto::backplane::script::grpc::ExecuteCommandResponse* response) override;
-    std::unique_ptr< ::grpc::ClientAsyncResponseReader< ::io::deephaven::proto::backplane::script::grpc::ExecuteCommandResponse>> AsyncExecuteCommand(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::script::grpc::ExecuteCommandRequest& request, ::grpc::CompletionQueue* cq) {
-      return std::unique_ptr< ::grpc::ClientAsyncResponseReader< ::io::deephaven::proto::backplane::script::grpc::ExecuteCommandResponse>>(AsyncExecuteCommandRaw(context, request, cq));
-    }
-    std::unique_ptr< ::grpc::ClientAsyncResponseReader< ::io::deephaven::proto::backplane::script::grpc::ExecuteCommandResponse>> PrepareAsyncExecuteCommand(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::script::grpc::ExecuteCommandRequest& request, ::grpc::CompletionQueue* cq) {
-      return std::unique_ptr< ::grpc::ClientAsyncResponseReader< ::io::deephaven::proto::backplane::script::grpc::ExecuteCommandResponse>>(PrepareAsyncExecuteCommandRaw(context, request, cq));
-    }
-    ::grpc::Status CancelCommand(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::script::grpc::CancelCommandRequest& request, ::io::deephaven::proto::backplane::script::grpc::CancelCommandResponse* response) override;
-    std::unique_ptr< ::grpc::ClientAsyncResponseReader< ::io::deephaven::proto::backplane::script::grpc::CancelCommandResponse>> AsyncCancelCommand(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::script::grpc::CancelCommandRequest& request, ::grpc::CompletionQueue* cq) {
-      return std::unique_ptr< ::grpc::ClientAsyncResponseReader< ::io::deephaven::proto::backplane::script::grpc::CancelCommandResponse>>(AsyncCancelCommandRaw(context, request, cq));
-    }
-    std::unique_ptr< ::grpc::ClientAsyncResponseReader< ::io::deephaven::proto::backplane::script::grpc::CancelCommandResponse>> PrepareAsyncCancelCommand(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::script::grpc::CancelCommandRequest& request, ::grpc::CompletionQueue* cq) {
-      return std::unique_ptr< ::grpc::ClientAsyncResponseReader< ::io::deephaven::proto::backplane::script::grpc::CancelCommandResponse>>(PrepareAsyncCancelCommandRaw(context, request, cq));
-    }
-    ::grpc::Status BindTableToVariable(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::script::grpc::BindTableToVariableRequest& request, ::io::deephaven::proto::backplane::script::grpc::BindTableToVariableResponse* response) override;
-    std::unique_ptr< ::grpc::ClientAsyncResponseReader< ::io::deephaven::proto::backplane::script::grpc::BindTableToVariableResponse>> AsyncBindTableToVariable(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::script::grpc::BindTableToVariableRequest& request, ::grpc::CompletionQueue* cq) {
-      return std::unique_ptr< ::grpc::ClientAsyncResponseReader< ::io::deephaven::proto::backplane::script::grpc::BindTableToVariableResponse>>(AsyncBindTableToVariableRaw(context, request, cq));
-    }
-    std::unique_ptr< ::grpc::ClientAsyncResponseReader< ::io::deephaven::proto::backplane::script::grpc::BindTableToVariableResponse>> PrepareAsyncBindTableToVariable(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::script::grpc::BindTableToVariableRequest& request, ::grpc::CompletionQueue* cq) {
-      return std::unique_ptr< ::grpc::ClientAsyncResponseReader< ::io::deephaven::proto::backplane::script::grpc::BindTableToVariableResponse>>(PrepareAsyncBindTableToVariableRaw(context, request, cq));
-    }
-    std::unique_ptr< ::grpc::ClientReaderWriter< ::io::deephaven::proto::backplane::script::grpc::AutoCompleteRequest, ::io::deephaven::proto::backplane::script::grpc::AutoCompleteResponse>> AutoCompleteStream(::grpc::ClientContext* context) {
-      return std::unique_ptr< ::grpc::ClientReaderWriter< ::io::deephaven::proto::backplane::script::grpc::AutoCompleteRequest, ::io::deephaven::proto::backplane::script::grpc::AutoCompleteResponse>>(AutoCompleteStreamRaw(context));
-    }
-    std::unique_ptr<  ::grpc::ClientAsyncReaderWriter< ::io::deephaven::proto::backplane::script::grpc::AutoCompleteRequest, ::io::deephaven::proto::backplane::script::grpc::AutoCompleteResponse>> AsyncAutoCompleteStream(::grpc::ClientContext* context, ::grpc::CompletionQueue* cq, void* tag) {
-      return std::unique_ptr< ::grpc::ClientAsyncReaderWriter< ::io::deephaven::proto::backplane::script::grpc::AutoCompleteRequest, ::io::deephaven::proto::backplane::script::grpc::AutoCompleteResponse>>(AsyncAutoCompleteStreamRaw(context, cq, tag));
-    }
-    std::unique_ptr<  ::grpc::ClientAsyncReaderWriter< ::io::deephaven::proto::backplane::script::grpc::AutoCompleteRequest, ::io::deephaven::proto::backplane::script::grpc::AutoCompleteResponse>> PrepareAsyncAutoCompleteStream(::grpc::ClientContext* context, ::grpc::CompletionQueue* cq) {
-      return std::unique_ptr< ::grpc::ClientAsyncReaderWriter< ::io::deephaven::proto::backplane::script::grpc::AutoCompleteRequest, ::io::deephaven::proto::backplane::script::grpc::AutoCompleteResponse>>(PrepareAsyncAutoCompleteStreamRaw(context, cq));
-    }
-    ::grpc::Status CancelAutoComplete(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::script::grpc::CancelAutoCompleteRequest& request, ::io::deephaven::proto::backplane::script::grpc::CancelAutoCompleteResponse* response) override;
-    std::unique_ptr< ::grpc::ClientAsyncResponseReader< ::io::deephaven::proto::backplane::script::grpc::CancelAutoCompleteResponse>> AsyncCancelAutoComplete(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::script::grpc::CancelAutoCompleteRequest& request, ::grpc::CompletionQueue* cq) {
-      return std::unique_ptr< ::grpc::ClientAsyncResponseReader< ::io::deephaven::proto::backplane::script::grpc::CancelAutoCompleteResponse>>(AsyncCancelAutoCompleteRaw(context, request, cq));
-    }
-    std::unique_ptr< ::grpc::ClientAsyncResponseReader< ::io::deephaven::proto::backplane::script::grpc::CancelAutoCompleteResponse>> PrepareAsyncCancelAutoComplete(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::script::grpc::CancelAutoCompleteRequest& request, ::grpc::CompletionQueue* cq) {
-      return std::unique_ptr< ::grpc::ClientAsyncResponseReader< ::io::deephaven::proto::backplane::script::grpc::CancelAutoCompleteResponse>>(PrepareAsyncCancelAutoCompleteRaw(context, request, cq));
-    }
-    std::unique_ptr< ::grpc::ClientReader< ::io::deephaven::proto::backplane::script::grpc::AutoCompleteResponse>> OpenAutoCompleteStream(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::script::grpc::AutoCompleteRequest& request) {
-      return std::unique_ptr< ::grpc::ClientReader< ::io::deephaven::proto::backplane::script::grpc::AutoCompleteResponse>>(OpenAutoCompleteStreamRaw(context, request));
-    }
-    std::unique_ptr< ::grpc::ClientAsyncReader< ::io::deephaven::proto::backplane::script::grpc::AutoCompleteResponse>> AsyncOpenAutoCompleteStream(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::script::grpc::AutoCompleteRequest& request, ::grpc::CompletionQueue* cq, void* tag) {
-      return std::unique_ptr< ::grpc::ClientAsyncReader< ::io::deephaven::proto::backplane::script::grpc::AutoCompleteResponse>>(AsyncOpenAutoCompleteStreamRaw(context, request, cq, tag));
-    }
-    std::unique_ptr< ::grpc::ClientAsyncReader< ::io::deephaven::proto::backplane::script::grpc::AutoCompleteResponse>> PrepareAsyncOpenAutoCompleteStream(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::script::grpc::AutoCompleteRequest& request, ::grpc::CompletionQueue* cq) {
-      return std::unique_ptr< ::grpc::ClientAsyncReader< ::io::deephaven::proto::backplane::script::grpc::AutoCompleteResponse>>(PrepareAsyncOpenAutoCompleteStreamRaw(context, request, cq));
-    }
-    ::grpc::Status NextAutoCompleteStream(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::script::grpc::AutoCompleteRequest& request, ::io::deephaven::proto::backplane::script::grpc::BrowserNextResponse* response) override;
-    std::unique_ptr< ::grpc::ClientAsyncResponseReader< ::io::deephaven::proto::backplane::script::grpc::BrowserNextResponse>> AsyncNextAutoCompleteStream(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::script::grpc::AutoCompleteRequest& request, ::grpc::CompletionQueue* cq) {
-      return std::unique_ptr< ::grpc::ClientAsyncResponseReader< ::io::deephaven::proto::backplane::script::grpc::BrowserNextResponse>>(AsyncNextAutoCompleteStreamRaw(context, request, cq));
-    }
-    std::unique_ptr< ::grpc::ClientAsyncResponseReader< ::io::deephaven::proto::backplane::script::grpc::BrowserNextResponse>> PrepareAsyncNextAutoCompleteStream(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::script::grpc::AutoCompleteRequest& request, ::grpc::CompletionQueue* cq) {
-      return std::unique_ptr< ::grpc::ClientAsyncResponseReader< ::io::deephaven::proto::backplane::script::grpc::BrowserNextResponse>>(PrepareAsyncNextAutoCompleteStreamRaw(context, request, cq));
-    }
-    class async final :
-      public StubInterface::async_interface {
-     public:
-      void GetConsoleTypes(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::script::grpc::GetConsoleTypesRequest* request, ::io::deephaven::proto::backplane::script::grpc::GetConsoleTypesResponse* response, std::function<void(::grpc::Status)>) override;
-      void GetConsoleTypes(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::script::grpc::GetConsoleTypesRequest* request, ::io::deephaven::proto::backplane::script::grpc::GetConsoleTypesResponse* response, ::grpc::ClientUnaryReactor* reactor) override;
-      void StartConsole(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::script::grpc::StartConsoleRequest* request, ::io::deephaven::proto::backplane::script::grpc::StartConsoleResponse* response, std::function<void(::grpc::Status)>) override;
-      void StartConsole(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::script::grpc::StartConsoleRequest* request, ::io::deephaven::proto::backplane::script::grpc::StartConsoleResponse* response, ::grpc::ClientUnaryReactor* reactor) override;
-      void GetHeapInfo(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::script::grpc::GetHeapInfoRequest* request, ::io::deephaven::proto::backplane::script::grpc::GetHeapInfoResponse* response, std::function<void(::grpc::Status)>) override;
-      void GetHeapInfo(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::script::grpc::GetHeapInfoRequest* request, ::io::deephaven::proto::backplane::script::grpc::GetHeapInfoResponse* response, ::grpc::ClientUnaryReactor* reactor) override;
-      void SubscribeToLogs(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::script::grpc::LogSubscriptionRequest* request, ::grpc::ClientReadReactor< ::io::deephaven::proto::backplane::script::grpc::LogSubscriptionData>* reactor) override;
-      void ExecuteCommand(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::script::grpc::ExecuteCommandRequest* request, ::io::deephaven::proto::backplane::script::grpc::ExecuteCommandResponse* response, std::function<void(::grpc::Status)>) override;
-      void ExecuteCommand(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::script::grpc::ExecuteCommandRequest* request, ::io::deephaven::proto::backplane::script::grpc::ExecuteCommandResponse* response, ::grpc::ClientUnaryReactor* reactor) override;
-      void CancelCommand(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::script::grpc::CancelCommandRequest* request, ::io::deephaven::proto::backplane::script::grpc::CancelCommandResponse* response, std::function<void(::grpc::Status)>) override;
-      void CancelCommand(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::script::grpc::CancelCommandRequest* request, ::io::deephaven::proto::backplane::script::grpc::CancelCommandResponse* response, ::grpc::ClientUnaryReactor* reactor) override;
-      void BindTableToVariable(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::script::grpc::BindTableToVariableRequest* request, ::io::deephaven::proto::backplane::script::grpc::BindTableToVariableResponse* response, std::function<void(::grpc::Status)>) override;
-      void BindTableToVariable(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::script::grpc::BindTableToVariableRequest* request, ::io::deephaven::proto::backplane::script::grpc::BindTableToVariableResponse* response, ::grpc::ClientUnaryReactor* reactor) override;
-      void AutoCompleteStream(::grpc::ClientContext* context, ::grpc::ClientBidiReactor< ::io::deephaven::proto::backplane::script::grpc::AutoCompleteRequest,::io::deephaven::proto::backplane::script::grpc::AutoCompleteResponse>* reactor) override;
-      void CancelAutoComplete(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::script::grpc::CancelAutoCompleteRequest* request, ::io::deephaven::proto::backplane::script::grpc::CancelAutoCompleteResponse* response, std::function<void(::grpc::Status)>) override;
-      void CancelAutoComplete(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::script::grpc::CancelAutoCompleteRequest* request, ::io::deephaven::proto::backplane::script::grpc::CancelAutoCompleteResponse* response, ::grpc::ClientUnaryReactor* reactor) override;
-      void OpenAutoCompleteStream(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::script::grpc::AutoCompleteRequest* request, ::grpc::ClientReadReactor< ::io::deephaven::proto::backplane::script::grpc::AutoCompleteResponse>* reactor) override;
-      void NextAutoCompleteStream(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::script::grpc::AutoCompleteRequest* request, ::io::deephaven::proto::backplane::script::grpc::BrowserNextResponse* response, std::function<void(::grpc::Status)>) override;
-      void NextAutoCompleteStream(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::script::grpc::AutoCompleteRequest* request, ::io::deephaven::proto::backplane::script::grpc::BrowserNextResponse* response, ::grpc::ClientUnaryReactor* reactor) override;
-     private:
-      friend class Stub;
-      explicit async(Stub* stub): stub_(stub) { }
-      Stub* stub() { return stub_; }
-      Stub* stub_;
-    };
-    class async* async() override { return &async_stub_; }
-
-   private:
-    std::shared_ptr< ::grpc::ChannelInterface> channel_;
-    class async async_stub_{this};
-    ::grpc::ClientAsyncResponseReader< ::io::deephaven::proto::backplane::script::grpc::GetConsoleTypesResponse>* AsyncGetConsoleTypesRaw(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::script::grpc::GetConsoleTypesRequest& request, ::grpc::CompletionQueue* cq) override;
-    ::grpc::ClientAsyncResponseReader< ::io::deephaven::proto::backplane::script::grpc::GetConsoleTypesResponse>* PrepareAsyncGetConsoleTypesRaw(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::script::grpc::GetConsoleTypesRequest& request, ::grpc::CompletionQueue* cq) override;
-    ::grpc::ClientAsyncResponseReader< ::io::deephaven::proto::backplane::script::grpc::StartConsoleResponse>* AsyncStartConsoleRaw(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::script::grpc::StartConsoleRequest& request, ::grpc::CompletionQueue* cq) override;
-    ::grpc::ClientAsyncResponseReader< ::io::deephaven::proto::backplane::script::grpc::StartConsoleResponse>* PrepareAsyncStartConsoleRaw(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::script::grpc::StartConsoleRequest& request, ::grpc::CompletionQueue* cq) override;
-    ::grpc::ClientAsyncResponseReader< ::io::deephaven::proto::backplane::script::grpc::GetHeapInfoResponse>* AsyncGetHeapInfoRaw(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::script::grpc::GetHeapInfoRequest& request, ::grpc::CompletionQueue* cq) override;
-    ::grpc::ClientAsyncResponseReader< ::io::deephaven::proto::backplane::script::grpc::GetHeapInfoResponse>* PrepareAsyncGetHeapInfoRaw(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::script::grpc::GetHeapInfoRequest& request, ::grpc::CompletionQueue* cq) override;
-    ::grpc::ClientReader< ::io::deephaven::proto::backplane::script::grpc::LogSubscriptionData>* SubscribeToLogsRaw(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::script::grpc::LogSubscriptionRequest& request) override;
-    ::grpc::ClientAsyncReader< ::io::deephaven::proto::backplane::script::grpc::LogSubscriptionData>* AsyncSubscribeToLogsRaw(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::script::grpc::LogSubscriptionRequest& request, ::grpc::CompletionQueue* cq, void* tag) override;
-    ::grpc::ClientAsyncReader< ::io::deephaven::proto::backplane::script::grpc::LogSubscriptionData>* PrepareAsyncSubscribeToLogsRaw(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::script::grpc::LogSubscriptionRequest& request, ::grpc::CompletionQueue* cq) override;
-    ::grpc::ClientAsyncResponseReader< ::io::deephaven::proto::backplane::script::grpc::ExecuteCommandResponse>* AsyncExecuteCommandRaw(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::script::grpc::ExecuteCommandRequest& request, ::grpc::CompletionQueue* cq) override;
-    ::grpc::ClientAsyncResponseReader< ::io::deephaven::proto::backplane::script::grpc::ExecuteCommandResponse>* PrepareAsyncExecuteCommandRaw(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::script::grpc::ExecuteCommandRequest& request, ::grpc::CompletionQueue* cq) override;
-    ::grpc::ClientAsyncResponseReader< ::io::deephaven::proto::backplane::script::grpc::CancelCommandResponse>* AsyncCancelCommandRaw(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::script::grpc::CancelCommandRequest& request, ::grpc::CompletionQueue* cq) override;
-    ::grpc::ClientAsyncResponseReader< ::io::deephaven::proto::backplane::script::grpc::CancelCommandResponse>* PrepareAsyncCancelCommandRaw(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::script::grpc::CancelCommandRequest& request, ::grpc::CompletionQueue* cq) override;
-    ::grpc::ClientAsyncResponseReader< ::io::deephaven::proto::backplane::script::grpc::BindTableToVariableResponse>* AsyncBindTableToVariableRaw(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::script::grpc::BindTableToVariableRequest& request, ::grpc::CompletionQueue* cq) override;
-    ::grpc::ClientAsyncResponseReader< ::io::deephaven::proto::backplane::script::grpc::BindTableToVariableResponse>* PrepareAsyncBindTableToVariableRaw(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::script::grpc::BindTableToVariableRequest& request, ::grpc::CompletionQueue* cq) override;
-    ::grpc::ClientReaderWriter< ::io::deephaven::proto::backplane::script::grpc::AutoCompleteRequest, ::io::deephaven::proto::backplane::script::grpc::AutoCompleteResponse>* AutoCompleteStreamRaw(::grpc::ClientContext* context) override;
-    ::grpc::ClientAsyncReaderWriter< ::io::deephaven::proto::backplane::script::grpc::AutoCompleteRequest, ::io::deephaven::proto::backplane::script::grpc::AutoCompleteResponse>* AsyncAutoCompleteStreamRaw(::grpc::ClientContext* context, ::grpc::CompletionQueue* cq, void* tag) override;
-    ::grpc::ClientAsyncReaderWriter< ::io::deephaven::proto::backplane::script::grpc::AutoCompleteRequest, ::io::deephaven::proto::backplane::script::grpc::AutoCompleteResponse>* PrepareAsyncAutoCompleteStreamRaw(::grpc::ClientContext* context, ::grpc::CompletionQueue* cq) override;
-    ::grpc::ClientAsyncResponseReader< ::io::deephaven::proto::backplane::script::grpc::CancelAutoCompleteResponse>* AsyncCancelAutoCompleteRaw(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::script::grpc::CancelAutoCompleteRequest& request, ::grpc::CompletionQueue* cq) override;
-    ::grpc::ClientAsyncResponseReader< ::io::deephaven::proto::backplane::script::grpc::CancelAutoCompleteResponse>* PrepareAsyncCancelAutoCompleteRaw(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::script::grpc::CancelAutoCompleteRequest& request, ::grpc::CompletionQueue* cq) override;
-    ::grpc::ClientReader< ::io::deephaven::proto::backplane::script::grpc::AutoCompleteResponse>* OpenAutoCompleteStreamRaw(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::script::grpc::AutoCompleteRequest& request) override;
-    ::grpc::ClientAsyncReader< ::io::deephaven::proto::backplane::script::grpc::AutoCompleteResponse>* AsyncOpenAutoCompleteStreamRaw(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::script::grpc::AutoCompleteRequest& request, ::grpc::CompletionQueue* cq, void* tag) override;
-    ::grpc::ClientAsyncReader< ::io::deephaven::proto::backplane::script::grpc::AutoCompleteResponse>* PrepareAsyncOpenAutoCompleteStreamRaw(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::script::grpc::AutoCompleteRequest& request, ::grpc::CompletionQueue* cq) override;
-    ::grpc::ClientAsyncResponseReader< ::io::deephaven::proto::backplane::script::grpc::BrowserNextResponse>* AsyncNextAutoCompleteStreamRaw(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::script::grpc::AutoCompleteRequest& request, ::grpc::CompletionQueue* cq) override;
-    ::grpc::ClientAsyncResponseReader< ::io::deephaven::proto::backplane::script::grpc::BrowserNextResponse>* PrepareAsyncNextAutoCompleteStreamRaw(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::script::grpc::AutoCompleteRequest& request, ::grpc::CompletionQueue* cq) override;
-    const ::grpc::internal::RpcMethod rpcmethod_GetConsoleTypes_;
-    const ::grpc::internal::RpcMethod rpcmethod_StartConsole_;
-    const ::grpc::internal::RpcMethod rpcmethod_GetHeapInfo_;
-    const ::grpc::internal::RpcMethod rpcmethod_SubscribeToLogs_;
-    const ::grpc::internal::RpcMethod rpcmethod_ExecuteCommand_;
-    const ::grpc::internal::RpcMethod rpcmethod_CancelCommand_;
-    const ::grpc::internal::RpcMethod rpcmethod_BindTableToVariable_;
-    const ::grpc::internal::RpcMethod rpcmethod_AutoCompleteStream_;
-    const ::grpc::internal::RpcMethod rpcmethod_CancelAutoComplete_;
-    const ::grpc::internal::RpcMethod rpcmethod_OpenAutoCompleteStream_;
-    const ::grpc::internal::RpcMethod rpcmethod_NextAutoCompleteStream_;
-  };
-  static std::unique_ptr<Stub> NewStub(const std::shared_ptr< ::grpc::ChannelInterface>& channel, const ::grpc::StubOptions& options = ::grpc::StubOptions());
-
-  class Service : public ::grpc::Service {
-   public:
-    Service();
-    virtual ~Service();
-    virtual ::grpc::Status GetConsoleTypes(::grpc::ServerContext* context, const ::io::deephaven::proto::backplane::script::grpc::GetConsoleTypesRequest* request, ::io::deephaven::proto::backplane::script::grpc::GetConsoleTypesResponse* response);
-    virtual ::grpc::Status StartConsole(::grpc::ServerContext* context, const ::io::deephaven::proto::backplane::script::grpc::StartConsoleRequest* request, ::io::deephaven::proto::backplane::script::grpc::StartConsoleResponse* response);
-    virtual ::grpc::Status GetHeapInfo(::grpc::ServerContext* context, const ::io::deephaven::proto::backplane::script::grpc::GetHeapInfoRequest* request, ::io::deephaven::proto::backplane::script::grpc::GetHeapInfoResponse* response);
-    virtual ::grpc::Status SubscribeToLogs(::grpc::ServerContext* context, const ::io::deephaven::proto::backplane::script::grpc::LogSubscriptionRequest* request, ::grpc::ServerWriter< ::io::deephaven::proto::backplane::script::grpc::LogSubscriptionData>* writer);
-    virtual ::grpc::Status ExecuteCommand(::grpc::ServerContext* context, const ::io::deephaven::proto::backplane::script::grpc::ExecuteCommandRequest* request, ::io::deephaven::proto::backplane::script::grpc::ExecuteCommandResponse* response);
-    virtual ::grpc::Status CancelCommand(::grpc::ServerContext* context, const ::io::deephaven::proto::backplane::script::grpc::CancelCommandRequest* request, ::io::deephaven::proto::backplane::script::grpc::CancelCommandResponse* response);
-    virtual ::grpc::Status BindTableToVariable(::grpc::ServerContext* context, const ::io::deephaven::proto::backplane::script::grpc::BindTableToVariableRequest* request, ::io::deephaven::proto::backplane::script::grpc::BindTableToVariableResponse* response);
-    //
-    // Starts a stream for autocomplete on the current session. More than one console,
-    // more than one document can be edited at a time using this, and they can separately
-    // be closed as well. A given document should only be edited within one stream at a
-    // time.
-    virtual ::grpc::Status AutoCompleteStream(::grpc::ServerContext* context, ::grpc::ServerReaderWriter< ::io::deephaven::proto::backplane::script::grpc::AutoCompleteResponse, ::io::deephaven::proto::backplane::script::grpc::AutoCompleteRequest>* stream);
-    virtual ::grpc::Status CancelAutoComplete(::grpc::ServerContext* context, const ::io::deephaven::proto::backplane::script::grpc::CancelAutoCompleteRequest* request, ::io::deephaven::proto::backplane::script::grpc::CancelAutoCompleteResponse* response);
-    //
-    // Half of the browser-based (browser's can't do bidirectional streams without websockets)
-    // implementation for AutoCompleteStream.
-    virtual ::grpc::Status OpenAutoCompleteStream(::grpc::ServerContext* context, const ::io::deephaven::proto::backplane::script::grpc::AutoCompleteRequest* request, ::grpc::ServerWriter< ::io::deephaven::proto::backplane::script::grpc::AutoCompleteResponse>* writer);
-    //
-    // Other half of the browser-based implementation for AutoCompleteStream.
-    virtual ::grpc::Status NextAutoCompleteStream(::grpc::ServerContext* context, const ::io::deephaven::proto::backplane::script::grpc::AutoCompleteRequest* request, ::io::deephaven::proto::backplane::script::grpc::BrowserNextResponse* response);
-  };
-  template <class BaseClass>
-  class WithAsyncMethod_GetConsoleTypes : public BaseClass {
-   private:
-    void BaseClassMustBeDerivedFromService(const Service* /*service*/) {}
-   public:
-    WithAsyncMethod_GetConsoleTypes() {
-      ::grpc::Service::MarkMethodAsync(0);
-    }
-    ~WithAsyncMethod_GetConsoleTypes() override {
-      BaseClassMustBeDerivedFromService(this);
-    }
-    // disable synchronous version of this method
-    ::grpc::Status GetConsoleTypes(::grpc::ServerContext* /*context*/, const ::io::deephaven::proto::backplane::script::grpc::GetConsoleTypesRequest* /*request*/, ::io::deephaven::proto::backplane::script::grpc::GetConsoleTypesResponse* /*response*/) override {
-      abort();
-      return ::grpc::Status(::grpc::StatusCode::UNIMPLEMENTED, "");
-    }
-    void RequestGetConsoleTypes(::grpc::ServerContext* context, ::io::deephaven::proto::backplane::script::grpc::GetConsoleTypesRequest* request, ::grpc::ServerAsyncResponseWriter< ::io::deephaven::proto::backplane::script::grpc::GetConsoleTypesResponse>* response, ::grpc::CompletionQueue* new_call_cq, ::grpc::ServerCompletionQueue* notification_cq, void *tag) {
-      ::grpc::Service::RequestAsyncUnary(0, context, request, response, new_call_cq, notification_cq, tag);
-    }
-  };
-  template <class BaseClass>
-  class WithAsyncMethod_StartConsole : public BaseClass {
-   private:
-    void BaseClassMustBeDerivedFromService(const Service* /*service*/) {}
-   public:
-    WithAsyncMethod_StartConsole() {
-      ::grpc::Service::MarkMethodAsync(1);
-    }
-    ~WithAsyncMethod_StartConsole() override {
-      BaseClassMustBeDerivedFromService(this);
-    }
-    // disable synchronous version of this method
-    ::grpc::Status StartConsole(::grpc::ServerContext* /*context*/, const ::io::deephaven::proto::backplane::script::grpc::StartConsoleRequest* /*request*/, ::io::deephaven::proto::backplane::script::grpc::StartConsoleResponse* /*response*/) override {
-      abort();
-      return ::grpc::Status(::grpc::StatusCode::UNIMPLEMENTED, "");
-    }
-    void RequestStartConsole(::grpc::ServerContext* context, ::io::deephaven::proto::backplane::script::grpc::StartConsoleRequest* request, ::grpc::ServerAsyncResponseWriter< ::io::deephaven::proto::backplane::script::grpc::StartConsoleResponse>* response, ::grpc::CompletionQueue* new_call_cq, ::grpc::ServerCompletionQueue* notification_cq, void *tag) {
-      ::grpc::Service::RequestAsyncUnary(1, context, request, response, new_call_cq, notification_cq, tag);
-    }
-  };
-  template <class BaseClass>
-  class WithAsyncMethod_GetHeapInfo : public BaseClass {
-   private:
-    void BaseClassMustBeDerivedFromService(const Service* /*service*/) {}
-   public:
-    WithAsyncMethod_GetHeapInfo() {
-      ::grpc::Service::MarkMethodAsync(2);
-    }
-    ~WithAsyncMethod_GetHeapInfo() override {
-      BaseClassMustBeDerivedFromService(this);
-    }
-    // disable synchronous version of this method
-    ::grpc::Status GetHeapInfo(::grpc::ServerContext* /*context*/, const ::io::deephaven::proto::backplane::script::grpc::GetHeapInfoRequest* /*request*/, ::io::deephaven::proto::backplane::script::grpc::GetHeapInfoResponse* /*response*/) override {
-      abort();
-      return ::grpc::Status(::grpc::StatusCode::UNIMPLEMENTED, "");
-    }
-    void RequestGetHeapInfo(::grpc::ServerContext* context, ::io::deephaven::proto::backplane::script::grpc::GetHeapInfoRequest* request, ::grpc::ServerAsyncResponseWriter< ::io::deephaven::proto::backplane::script::grpc::GetHeapInfoResponse>* response, ::grpc::CompletionQueue* new_call_cq, ::grpc::ServerCompletionQueue* notification_cq, void *tag) {
-      ::grpc::Service::RequestAsyncUnary(2, context, request, response, new_call_cq, notification_cq, tag);
-    }
-  };
-  template <class BaseClass>
-  class WithAsyncMethod_SubscribeToLogs : public BaseClass {
-   private:
-    void BaseClassMustBeDerivedFromService(const Service* /*service*/) {}
-   public:
-    WithAsyncMethod_SubscribeToLogs() {
-      ::grpc::Service::MarkMethodAsync(3);
-    }
-    ~WithAsyncMethod_SubscribeToLogs() override {
-      BaseClassMustBeDerivedFromService(this);
-    }
-    // disable synchronous version of this method
-    ::grpc::Status SubscribeToLogs(::grpc::ServerContext* /*context*/, const ::io::deephaven::proto::backplane::script::grpc::LogSubscriptionRequest* /*request*/, ::grpc::ServerWriter< ::io::deephaven::proto::backplane::script::grpc::LogSubscriptionData>* /*writer*/) override {
-      abort();
-      return ::grpc::Status(::grpc::StatusCode::UNIMPLEMENTED, "");
-    }
-    void RequestSubscribeToLogs(::grpc::ServerContext* context, ::io::deephaven::proto::backplane::script::grpc::LogSubscriptionRequest* request, ::grpc::ServerAsyncWriter< ::io::deephaven::proto::backplane::script::grpc::LogSubscriptionData>* writer, ::grpc::CompletionQueue* new_call_cq, ::grpc::ServerCompletionQueue* notification_cq, void *tag) {
-      ::grpc::Service::RequestAsyncServerStreaming(3, context, request, writer, new_call_cq, notification_cq, tag);
-    }
-  };
-  template <class BaseClass>
-  class WithAsyncMethod_ExecuteCommand : public BaseClass {
-   private:
-    void BaseClassMustBeDerivedFromService(const Service* /*service*/) {}
-   public:
-    WithAsyncMethod_ExecuteCommand() {
-      ::grpc::Service::MarkMethodAsync(4);
-    }
-    ~WithAsyncMethod_ExecuteCommand() override {
-      BaseClassMustBeDerivedFromService(this);
-    }
-    // disable synchronous version of this method
-    ::grpc::Status ExecuteCommand(::grpc::ServerContext* /*context*/, const ::io::deephaven::proto::backplane::script::grpc::ExecuteCommandRequest* /*request*/, ::io::deephaven::proto::backplane::script::grpc::ExecuteCommandResponse* /*response*/) override {
-      abort();
-      return ::grpc::Status(::grpc::StatusCode::UNIMPLEMENTED, "");
-    }
-    void RequestExecuteCommand(::grpc::ServerContext* context, ::io::deephaven::proto::backplane::script::grpc::ExecuteCommandRequest* request, ::grpc::ServerAsyncResponseWriter< ::io::deephaven::proto::backplane::script::grpc::ExecuteCommandResponse>* response, ::grpc::CompletionQueue* new_call_cq, ::grpc::ServerCompletionQueue* notification_cq, void *tag) {
-      ::grpc::Service::RequestAsyncUnary(4, context, request, response, new_call_cq, notification_cq, tag);
-    }
-  };
-  template <class BaseClass>
-  class WithAsyncMethod_CancelCommand : public BaseClass {
-   private:
-    void BaseClassMustBeDerivedFromService(const Service* /*service*/) {}
-   public:
-    WithAsyncMethod_CancelCommand() {
-      ::grpc::Service::MarkMethodAsync(5);
-    }
-    ~WithAsyncMethod_CancelCommand() override {
-      BaseClassMustBeDerivedFromService(this);
-    }
-    // disable synchronous version of this method
-    ::grpc::Status CancelCommand(::grpc::ServerContext* /*context*/, const ::io::deephaven::proto::backplane::script::grpc::CancelCommandRequest* /*request*/, ::io::deephaven::proto::backplane::script::grpc::CancelCommandResponse* /*response*/) override {
-      abort();
-      return ::grpc::Status(::grpc::StatusCode::UNIMPLEMENTED, "");
-    }
-    void RequestCancelCommand(::grpc::ServerContext* context, ::io::deephaven::proto::backplane::script::grpc::CancelCommandRequest* request, ::grpc::ServerAsyncResponseWriter< ::io::deephaven::proto::backplane::script::grpc::CancelCommandResponse>* response, ::grpc::CompletionQueue* new_call_cq, ::grpc::ServerCompletionQueue* notification_cq, void *tag) {
-      ::grpc::Service::RequestAsyncUnary(5, context, request, response, new_call_cq, notification_cq, tag);
-    }
-  };
-  template <class BaseClass>
-  class WithAsyncMethod_BindTableToVariable : public BaseClass {
-   private:
-    void BaseClassMustBeDerivedFromService(const Service* /*service*/) {}
-   public:
-    WithAsyncMethod_BindTableToVariable() {
-      ::grpc::Service::MarkMethodAsync(6);
-    }
-    ~WithAsyncMethod_BindTableToVariable() override {
-      BaseClassMustBeDerivedFromService(this);
-    }
-    // disable synchronous version of this method
-    ::grpc::Status BindTableToVariable(::grpc::ServerContext* /*context*/, const ::io::deephaven::proto::backplane::script::grpc::BindTableToVariableRequest* /*request*/, ::io::deephaven::proto::backplane::script::grpc::BindTableToVariableResponse* /*response*/) override {
-      abort();
-      return ::grpc::Status(::grpc::StatusCode::UNIMPLEMENTED, "");
-    }
-    void RequestBindTableToVariable(::grpc::ServerContext* context, ::io::deephaven::proto::backplane::script::grpc::BindTableToVariableRequest* request, ::grpc::ServerAsyncResponseWriter< ::io::deephaven::proto::backplane::script::grpc::BindTableToVariableResponse>* response, ::grpc::CompletionQueue* new_call_cq, ::grpc::ServerCompletionQueue* notification_cq, void *tag) {
-      ::grpc::Service::RequestAsyncUnary(6, context, request, response, new_call_cq, notification_cq, tag);
-    }
-  };
-  template <class BaseClass>
-  class WithAsyncMethod_AutoCompleteStream : public BaseClass {
-   private:
-    void BaseClassMustBeDerivedFromService(const Service* /*service*/) {}
-   public:
-    WithAsyncMethod_AutoCompleteStream() {
-      ::grpc::Service::MarkMethodAsync(7);
-    }
-    ~WithAsyncMethod_AutoCompleteStream() override {
-      BaseClassMustBeDerivedFromService(this);
-    }
-    // disable synchronous version of this method
-    ::grpc::Status AutoCompleteStream(::grpc::ServerContext* /*context*/, ::grpc::ServerReaderWriter< ::io::deephaven::proto::backplane::script::grpc::AutoCompleteResponse, ::io::deephaven::proto::backplane::script::grpc::AutoCompleteRequest>* /*stream*/)  override {
-      abort();
-      return ::grpc::Status(::grpc::StatusCode::UNIMPLEMENTED, "");
-    }
-    void RequestAutoCompleteStream(::grpc::ServerContext* context, ::grpc::ServerAsyncReaderWriter< ::io::deephaven::proto::backplane::script::grpc::AutoCompleteResponse, ::io::deephaven::proto::backplane::script::grpc::AutoCompleteRequest>* stream, ::grpc::CompletionQueue* new_call_cq, ::grpc::ServerCompletionQueue* notification_cq, void *tag) {
-      ::grpc::Service::RequestAsyncBidiStreaming(7, context, stream, new_call_cq, notification_cq, tag);
-    }
-  };
-  template <class BaseClass>
-  class WithAsyncMethod_CancelAutoComplete : public BaseClass {
-   private:
-    void BaseClassMustBeDerivedFromService(const Service* /*service*/) {}
-   public:
-    WithAsyncMethod_CancelAutoComplete() {
-      ::grpc::Service::MarkMethodAsync(8);
-    }
-    ~WithAsyncMethod_CancelAutoComplete() override {
-      BaseClassMustBeDerivedFromService(this);
-    }
-    // disable synchronous version of this method
-    ::grpc::Status CancelAutoComplete(::grpc::ServerContext* /*context*/, const ::io::deephaven::proto::backplane::script::grpc::CancelAutoCompleteRequest* /*request*/, ::io::deephaven::proto::backplane::script::grpc::CancelAutoCompleteResponse* /*response*/) override {
-      abort();
-      return ::grpc::Status(::grpc::StatusCode::UNIMPLEMENTED, "");
-    }
-    void RequestCancelAutoComplete(::grpc::ServerContext* context, ::io::deephaven::proto::backplane::script::grpc::CancelAutoCompleteRequest* request, ::grpc::ServerAsyncResponseWriter< ::io::deephaven::proto::backplane::script::grpc::CancelAutoCompleteResponse>* response, ::grpc::CompletionQueue* new_call_cq, ::grpc::ServerCompletionQueue* notification_cq, void *tag) {
-      ::grpc::Service::RequestAsyncUnary(8, context, request, response, new_call_cq, notification_cq, tag);
-    }
-  };
-  template <class BaseClass>
-  class WithAsyncMethod_OpenAutoCompleteStream : public BaseClass {
-   private:
-    void BaseClassMustBeDerivedFromService(const Service* /*service*/) {}
-   public:
-    WithAsyncMethod_OpenAutoCompleteStream() {
-      ::grpc::Service::MarkMethodAsync(9);
-    }
-    ~WithAsyncMethod_OpenAutoCompleteStream() override {
-      BaseClassMustBeDerivedFromService(this);
-    }
-    // disable synchronous version of this method
-    ::grpc::Status OpenAutoCompleteStream(::grpc::ServerContext* /*context*/, const ::io::deephaven::proto::backplane::script::grpc::AutoCompleteRequest* /*request*/, ::grpc::ServerWriter< ::io::deephaven::proto::backplane::script::grpc::AutoCompleteResponse>* /*writer*/) override {
-      abort();
-      return ::grpc::Status(::grpc::StatusCode::UNIMPLEMENTED, "");
-    }
-    void RequestOpenAutoCompleteStream(::grpc::ServerContext* context, ::io::deephaven::proto::backplane::script::grpc::AutoCompleteRequest* request, ::grpc::ServerAsyncWriter< ::io::deephaven::proto::backplane::script::grpc::AutoCompleteResponse>* writer, ::grpc::CompletionQueue* new_call_cq, ::grpc::ServerCompletionQueue* notification_cq, void *tag) {
-      ::grpc::Service::RequestAsyncServerStreaming(9, context, request, writer, new_call_cq, notification_cq, tag);
-    }
-  };
-  template <class BaseClass>
-  class WithAsyncMethod_NextAutoCompleteStream : public BaseClass {
-   private:
-    void BaseClassMustBeDerivedFromService(const Service* /*service*/) {}
-   public:
-    WithAsyncMethod_NextAutoCompleteStream() {
-      ::grpc::Service::MarkMethodAsync(10);
-    }
-    ~WithAsyncMethod_NextAutoCompleteStream() override {
-      BaseClassMustBeDerivedFromService(this);
-    }
-    // disable synchronous version of this method
-    ::grpc::Status NextAutoCompleteStream(::grpc::ServerContext* /*context*/, const ::io::deephaven::proto::backplane::script::grpc::AutoCompleteRequest* /*request*/, ::io::deephaven::proto::backplane::script::grpc::BrowserNextResponse* /*response*/) override {
-      abort();
-      return ::grpc::Status(::grpc::StatusCode::UNIMPLEMENTED, "");
-    }
-    void RequestNextAutoCompleteStream(::grpc::ServerContext* context, ::io::deephaven::proto::backplane::script::grpc::AutoCompleteRequest* request, ::grpc::ServerAsyncResponseWriter< ::io::deephaven::proto::backplane::script::grpc::BrowserNextResponse>* response, ::grpc::CompletionQueue* new_call_cq, ::grpc::ServerCompletionQueue* notification_cq, void *tag) {
-      ::grpc::Service::RequestAsyncUnary(10, context, request, response, new_call_cq, notification_cq, tag);
-    }
-  };
-  typedef WithAsyncMethod_GetConsoleTypes<WithAsyncMethod_StartConsole<WithAsyncMethod_GetHeapInfo<WithAsyncMethod_SubscribeToLogs<WithAsyncMethod_ExecuteCommand<WithAsyncMethod_CancelCommand<WithAsyncMethod_BindTableToVariable<WithAsyncMethod_AutoCompleteStream<WithAsyncMethod_CancelAutoComplete<WithAsyncMethod_OpenAutoCompleteStream<WithAsyncMethod_NextAutoCompleteStream<Service > > > > > > > > > > > AsyncService;
-  template <class BaseClass>
-  class WithCallbackMethod_GetConsoleTypes : public BaseClass {
-   private:
-    void BaseClassMustBeDerivedFromService(const Service* /*service*/) {}
-   public:
-    WithCallbackMethod_GetConsoleTypes() {
-      ::grpc::Service::MarkMethodCallback(0,
-          new ::grpc::internal::CallbackUnaryHandler< ::io::deephaven::proto::backplane::script::grpc::GetConsoleTypesRequest, ::io::deephaven::proto::backplane::script::grpc::GetConsoleTypesResponse>(
-            [this](
-                   ::grpc::CallbackServerContext* context, const ::io::deephaven::proto::backplane::script::grpc::GetConsoleTypesRequest* request, ::io::deephaven::proto::backplane::script::grpc::GetConsoleTypesResponse* response) { return this->GetConsoleTypes(context, request, response); }));}
-    void SetMessageAllocatorFor_GetConsoleTypes(
-        ::grpc::MessageAllocator< ::io::deephaven::proto::backplane::script::grpc::GetConsoleTypesRequest, ::io::deephaven::proto::backplane::script::grpc::GetConsoleTypesResponse>* allocator) {
-      ::grpc::internal::MethodHandler* const handler = ::grpc::Service::GetHandler(0);
-      static_cast<::grpc::internal::CallbackUnaryHandler< ::io::deephaven::proto::backplane::script::grpc::GetConsoleTypesRequest, ::io::deephaven::proto::backplane::script::grpc::GetConsoleTypesResponse>*>(handler)
-              ->SetMessageAllocator(allocator);
-    }
-    ~WithCallbackMethod_GetConsoleTypes() override {
-      BaseClassMustBeDerivedFromService(this);
-    }
-    // disable synchronous version of this method
-    ::grpc::Status GetConsoleTypes(::grpc::ServerContext* /*context*/, const ::io::deephaven::proto::backplane::script::grpc::GetConsoleTypesRequest* /*request*/, ::io::deephaven::proto::backplane::script::grpc::GetConsoleTypesResponse* /*response*/) override {
-      abort();
-      return ::grpc::Status(::grpc::StatusCode::UNIMPLEMENTED, "");
-    }
-    virtual ::grpc::ServerUnaryReactor* GetConsoleTypes(
-      ::grpc::CallbackServerContext* /*context*/, const ::io::deephaven::proto::backplane::script::grpc::GetConsoleTypesRequest* /*request*/, ::io::deephaven::proto::backplane::script::grpc::GetConsoleTypesResponse* /*response*/)  { return nullptr; }
-  };
-  template <class BaseClass>
-  class WithCallbackMethod_StartConsole : public BaseClass {
-   private:
-    void BaseClassMustBeDerivedFromService(const Service* /*service*/) {}
-   public:
-    WithCallbackMethod_StartConsole() {
-      ::grpc::Service::MarkMethodCallback(1,
-          new ::grpc::internal::CallbackUnaryHandler< ::io::deephaven::proto::backplane::script::grpc::StartConsoleRequest, ::io::deephaven::proto::backplane::script::grpc::StartConsoleResponse>(
-            [this](
-                   ::grpc::CallbackServerContext* context, const ::io::deephaven::proto::backplane::script::grpc::StartConsoleRequest* request, ::io::deephaven::proto::backplane::script::grpc::StartConsoleResponse* response) { return this->StartConsole(context, request, response); }));}
-    void SetMessageAllocatorFor_StartConsole(
-        ::grpc::MessageAllocator< ::io::deephaven::proto::backplane::script::grpc::StartConsoleRequest, ::io::deephaven::proto::backplane::script::grpc::StartConsoleResponse>* allocator) {
-      ::grpc::internal::MethodHandler* const handler = ::grpc::Service::GetHandler(1);
-      static_cast<::grpc::internal::CallbackUnaryHandler< ::io::deephaven::proto::backplane::script::grpc::StartConsoleRequest, ::io::deephaven::proto::backplane::script::grpc::StartConsoleResponse>*>(handler)
-              ->SetMessageAllocator(allocator);
-    }
-    ~WithCallbackMethod_StartConsole() override {
-      BaseClassMustBeDerivedFromService(this);
-    }
-    // disable synchronous version of this method
-    ::grpc::Status StartConsole(::grpc::ServerContext* /*context*/, const ::io::deephaven::proto::backplane::script::grpc::StartConsoleRequest* /*request*/, ::io::deephaven::proto::backplane::script::grpc::StartConsoleResponse* /*response*/) override {
-      abort();
-      return ::grpc::Status(::grpc::StatusCode::UNIMPLEMENTED, "");
-    }
-    virtual ::grpc::ServerUnaryReactor* StartConsole(
-      ::grpc::CallbackServerContext* /*context*/, const ::io::deephaven::proto::backplane::script::grpc::StartConsoleRequest* /*request*/, ::io::deephaven::proto::backplane::script::grpc::StartConsoleResponse* /*response*/)  { return nullptr; }
-  };
-  template <class BaseClass>
-  class WithCallbackMethod_GetHeapInfo : public BaseClass {
-   private:
-    void BaseClassMustBeDerivedFromService(const Service* /*service*/) {}
-   public:
-    WithCallbackMethod_GetHeapInfo() {
-      ::grpc::Service::MarkMethodCallback(2,
-          new ::grpc::internal::CallbackUnaryHandler< ::io::deephaven::proto::backplane::script::grpc::GetHeapInfoRequest, ::io::deephaven::proto::backplane::script::grpc::GetHeapInfoResponse>(
-            [this](
-                   ::grpc::CallbackServerContext* context, const ::io::deephaven::proto::backplane::script::grpc::GetHeapInfoRequest* request, ::io::deephaven::proto::backplane::script::grpc::GetHeapInfoResponse* response) { return this->GetHeapInfo(context, request, response); }));}
-    void SetMessageAllocatorFor_GetHeapInfo(
-        ::grpc::MessageAllocator< ::io::deephaven::proto::backplane::script::grpc::GetHeapInfoRequest, ::io::deephaven::proto::backplane::script::grpc::GetHeapInfoResponse>* allocator) {
-      ::grpc::internal::MethodHandler* const handler = ::grpc::Service::GetHandler(2);
-      static_cast<::grpc::internal::CallbackUnaryHandler< ::io::deephaven::proto::backplane::script::grpc::GetHeapInfoRequest, ::io::deephaven::proto::backplane::script::grpc::GetHeapInfoResponse>*>(handler)
-              ->SetMessageAllocator(allocator);
-    }
-    ~WithCallbackMethod_GetHeapInfo() override {
-      BaseClassMustBeDerivedFromService(this);
-    }
-    // disable synchronous version of this method
-    ::grpc::Status GetHeapInfo(::grpc::ServerContext* /*context*/, const ::io::deephaven::proto::backplane::script::grpc::GetHeapInfoRequest* /*request*/, ::io::deephaven::proto::backplane::script::grpc::GetHeapInfoResponse* /*response*/) override {
-      abort();
-      return ::grpc::Status(::grpc::StatusCode::UNIMPLEMENTED, "");
-    }
-    virtual ::grpc::ServerUnaryReactor* GetHeapInfo(
-      ::grpc::CallbackServerContext* /*context*/, const ::io::deephaven::proto::backplane::script::grpc::GetHeapInfoRequest* /*request*/, ::io::deephaven::proto::backplane::script::grpc::GetHeapInfoResponse* /*response*/)  { return nullptr; }
-  };
-  template <class BaseClass>
-  class WithCallbackMethod_SubscribeToLogs : public BaseClass {
-   private:
-    void BaseClassMustBeDerivedFromService(const Service* /*service*/) {}
-   public:
-    WithCallbackMethod_SubscribeToLogs() {
-      ::grpc::Service::MarkMethodCallback(3,
-          new ::grpc::internal::CallbackServerStreamingHandler< ::io::deephaven::proto::backplane::script::grpc::LogSubscriptionRequest, ::io::deephaven::proto::backplane::script::grpc::LogSubscriptionData>(
-            [this](
-                   ::grpc::CallbackServerContext* context, const ::io::deephaven::proto::backplane::script::grpc::LogSubscriptionRequest* request) { return this->SubscribeToLogs(context, request); }));
-    }
-    ~WithCallbackMethod_SubscribeToLogs() override {
-      BaseClassMustBeDerivedFromService(this);
-    }
-    // disable synchronous version of this method
-    ::grpc::Status SubscribeToLogs(::grpc::ServerContext* /*context*/, const ::io::deephaven::proto::backplane::script::grpc::LogSubscriptionRequest* /*request*/, ::grpc::ServerWriter< ::io::deephaven::proto::backplane::script::grpc::LogSubscriptionData>* /*writer*/) override {
-      abort();
-      return ::grpc::Status(::grpc::StatusCode::UNIMPLEMENTED, "");
-    }
-    virtual ::grpc::ServerWriteReactor< ::io::deephaven::proto::backplane::script::grpc::LogSubscriptionData>* SubscribeToLogs(
-      ::grpc::CallbackServerContext* /*context*/, const ::io::deephaven::proto::backplane::script::grpc::LogSubscriptionRequest* /*request*/)  { return nullptr; }
-  };
-  template <class BaseClass>
-  class WithCallbackMethod_ExecuteCommand : public BaseClass {
-   private:
-    void BaseClassMustBeDerivedFromService(const Service* /*service*/) {}
-   public:
-    WithCallbackMethod_ExecuteCommand() {
-      ::grpc::Service::MarkMethodCallback(4,
-          new ::grpc::internal::CallbackUnaryHandler< ::io::deephaven::proto::backplane::script::grpc::ExecuteCommandRequest, ::io::deephaven::proto::backplane::script::grpc::ExecuteCommandResponse>(
-            [this](
-                   ::grpc::CallbackServerContext* context, const ::io::deephaven::proto::backplane::script::grpc::ExecuteCommandRequest* request, ::io::deephaven::proto::backplane::script::grpc::ExecuteCommandResponse* response) { return this->ExecuteCommand(context, request, response); }));}
-    void SetMessageAllocatorFor_ExecuteCommand(
-        ::grpc::MessageAllocator< ::io::deephaven::proto::backplane::script::grpc::ExecuteCommandRequest, ::io::deephaven::proto::backplane::script::grpc::ExecuteCommandResponse>* allocator) {
-      ::grpc::internal::MethodHandler* const handler = ::grpc::Service::GetHandler(4);
-      static_cast<::grpc::internal::CallbackUnaryHandler< ::io::deephaven::proto::backplane::script::grpc::ExecuteCommandRequest, ::io::deephaven::proto::backplane::script::grpc::ExecuteCommandResponse>*>(handler)
-              ->SetMessageAllocator(allocator);
-    }
-    ~WithCallbackMethod_ExecuteCommand() override {
-      BaseClassMustBeDerivedFromService(this);
-    }
-    // disable synchronous version of this method
-    ::grpc::Status ExecuteCommand(::grpc::ServerContext* /*context*/, const ::io::deephaven::proto::backplane::script::grpc::ExecuteCommandRequest* /*request*/, ::io::deephaven::proto::backplane::script::grpc::ExecuteCommandResponse* /*response*/) override {
-      abort();
-      return ::grpc::Status(::grpc::StatusCode::UNIMPLEMENTED, "");
-    }
-    virtual ::grpc::ServerUnaryReactor* ExecuteCommand(
-      ::grpc::CallbackServerContext* /*context*/, const ::io::deephaven::proto::backplane::script::grpc::ExecuteCommandRequest* /*request*/, ::io::deephaven::proto::backplane::script::grpc::ExecuteCommandResponse* /*response*/)  { return nullptr; }
-  };
-  template <class BaseClass>
-  class WithCallbackMethod_CancelCommand : public BaseClass {
-   private:
-    void BaseClassMustBeDerivedFromService(const Service* /*service*/) {}
-   public:
-    WithCallbackMethod_CancelCommand() {
-      ::grpc::Service::MarkMethodCallback(5,
-          new ::grpc::internal::CallbackUnaryHandler< ::io::deephaven::proto::backplane::script::grpc::CancelCommandRequest, ::io::deephaven::proto::backplane::script::grpc::CancelCommandResponse>(
-            [this](
-                   ::grpc::CallbackServerContext* context, const ::io::deephaven::proto::backplane::script::grpc::CancelCommandRequest* request, ::io::deephaven::proto::backplane::script::grpc::CancelCommandResponse* response) { return this->CancelCommand(context, request, response); }));}
-    void SetMessageAllocatorFor_CancelCommand(
-        ::grpc::MessageAllocator< ::io::deephaven::proto::backplane::script::grpc::CancelCommandRequest, ::io::deephaven::proto::backplane::script::grpc::CancelCommandResponse>* allocator) {
-      ::grpc::internal::MethodHandler* const handler = ::grpc::Service::GetHandler(5);
-      static_cast<::grpc::internal::CallbackUnaryHandler< ::io::deephaven::proto::backplane::script::grpc::CancelCommandRequest, ::io::deephaven::proto::backplane::script::grpc::CancelCommandResponse>*>(handler)
-              ->SetMessageAllocator(allocator);
-    }
-    ~WithCallbackMethod_CancelCommand() override {
-      BaseClassMustBeDerivedFromService(this);
-    }
-    // disable synchronous version of this method
-    ::grpc::Status CancelCommand(::grpc::ServerContext* /*context*/, const ::io::deephaven::proto::backplane::script::grpc::CancelCommandRequest* /*request*/, ::io::deephaven::proto::backplane::script::grpc::CancelCommandResponse* /*response*/) override {
-      abort();
-      return ::grpc::Status(::grpc::StatusCode::UNIMPLEMENTED, "");
-    }
-    virtual ::grpc::ServerUnaryReactor* CancelCommand(
-      ::grpc::CallbackServerContext* /*context*/, const ::io::deephaven::proto::backplane::script::grpc::CancelCommandRequest* /*request*/, ::io::deephaven::proto::backplane::script::grpc::CancelCommandResponse* /*response*/)  { return nullptr; }
-  };
-  template <class BaseClass>
-  class WithCallbackMethod_BindTableToVariable : public BaseClass {
-   private:
-    void BaseClassMustBeDerivedFromService(const Service* /*service*/) {}
-   public:
-    WithCallbackMethod_BindTableToVariable() {
-      ::grpc::Service::MarkMethodCallback(6,
-          new ::grpc::internal::CallbackUnaryHandler< ::io::deephaven::proto::backplane::script::grpc::BindTableToVariableRequest, ::io::deephaven::proto::backplane::script::grpc::BindTableToVariableResponse>(
-            [this](
-                   ::grpc::CallbackServerContext* context, const ::io::deephaven::proto::backplane::script::grpc::BindTableToVariableRequest* request, ::io::deephaven::proto::backplane::script::grpc::BindTableToVariableResponse* response) { return this->BindTableToVariable(context, request, response); }));}
-    void SetMessageAllocatorFor_BindTableToVariable(
-        ::grpc::MessageAllocator< ::io::deephaven::proto::backplane::script::grpc::BindTableToVariableRequest, ::io::deephaven::proto::backplane::script::grpc::BindTableToVariableResponse>* allocator) {
-      ::grpc::internal::MethodHandler* const handler = ::grpc::Service::GetHandler(6);
-      static_cast<::grpc::internal::CallbackUnaryHandler< ::io::deephaven::proto::backplane::script::grpc::BindTableToVariableRequest, ::io::deephaven::proto::backplane::script::grpc::BindTableToVariableResponse>*>(handler)
-              ->SetMessageAllocator(allocator);
-    }
-    ~WithCallbackMethod_BindTableToVariable() override {
-      BaseClassMustBeDerivedFromService(this);
-    }
-    // disable synchronous version of this method
-    ::grpc::Status BindTableToVariable(::grpc::ServerContext* /*context*/, const ::io::deephaven::proto::backplane::script::grpc::BindTableToVariableRequest* /*request*/, ::io::deephaven::proto::backplane::script::grpc::BindTableToVariableResponse* /*response*/) override {
-      abort();
-      return ::grpc::Status(::grpc::StatusCode::UNIMPLEMENTED, "");
-    }
-    virtual ::grpc::ServerUnaryReactor* BindTableToVariable(
-      ::grpc::CallbackServerContext* /*context*/, const ::io::deephaven::proto::backplane::script::grpc::BindTableToVariableRequest* /*request*/, ::io::deephaven::proto::backplane::script::grpc::BindTableToVariableResponse* /*response*/)  { return nullptr; }
-  };
-  template <class BaseClass>
-  class WithCallbackMethod_AutoCompleteStream : public BaseClass {
-   private:
-    void BaseClassMustBeDerivedFromService(const Service* /*service*/) {}
-   public:
-    WithCallbackMethod_AutoCompleteStream() {
-      ::grpc::Service::MarkMethodCallback(7,
-          new ::grpc::internal::CallbackBidiHandler< ::io::deephaven::proto::backplane::script::grpc::AutoCompleteRequest, ::io::deephaven::proto::backplane::script::grpc::AutoCompleteResponse>(
-            [this](
-                   ::grpc::CallbackServerContext* context) { return this->AutoCompleteStream(context); }));
-    }
-    ~WithCallbackMethod_AutoCompleteStream() override {
-      BaseClassMustBeDerivedFromService(this);
-    }
-    // disable synchronous version of this method
-    ::grpc::Status AutoCompleteStream(::grpc::ServerContext* /*context*/, ::grpc::ServerReaderWriter< ::io::deephaven::proto::backplane::script::grpc::AutoCompleteResponse, ::io::deephaven::proto::backplane::script::grpc::AutoCompleteRequest>* /*stream*/)  override {
-      abort();
-      return ::grpc::Status(::grpc::StatusCode::UNIMPLEMENTED, "");
-    }
-    virtual ::grpc::ServerBidiReactor< ::io::deephaven::proto::backplane::script::grpc::AutoCompleteRequest, ::io::deephaven::proto::backplane::script::grpc::AutoCompleteResponse>* AutoCompleteStream(
-      ::grpc::CallbackServerContext* /*context*/)
-      { return nullptr; }
-  };
-  template <class BaseClass>
-  class WithCallbackMethod_CancelAutoComplete : public BaseClass {
-   private:
-    void BaseClassMustBeDerivedFromService(const Service* /*service*/) {}
-   public:
-    WithCallbackMethod_CancelAutoComplete() {
-      ::grpc::Service::MarkMethodCallback(8,
-          new ::grpc::internal::CallbackUnaryHandler< ::io::deephaven::proto::backplane::script::grpc::CancelAutoCompleteRequest, ::io::deephaven::proto::backplane::script::grpc::CancelAutoCompleteResponse>(
-            [this](
-                   ::grpc::CallbackServerContext* context, const ::io::deephaven::proto::backplane::script::grpc::CancelAutoCompleteRequest* request, ::io::deephaven::proto::backplane::script::grpc::CancelAutoCompleteResponse* response) { return this->CancelAutoComplete(context, request, response); }));}
-    void SetMessageAllocatorFor_CancelAutoComplete(
-        ::grpc::MessageAllocator< ::io::deephaven::proto::backplane::script::grpc::CancelAutoCompleteRequest, ::io::deephaven::proto::backplane::script::grpc::CancelAutoCompleteResponse>* allocator) {
-      ::grpc::internal::MethodHandler* const handler = ::grpc::Service::GetHandler(8);
-      static_cast<::grpc::internal::CallbackUnaryHandler< ::io::deephaven::proto::backplane::script::grpc::CancelAutoCompleteRequest, ::io::deephaven::proto::backplane::script::grpc::CancelAutoCompleteResponse>*>(handler)
-              ->SetMessageAllocator(allocator);
-    }
-    ~WithCallbackMethod_CancelAutoComplete() override {
-      BaseClassMustBeDerivedFromService(this);
-    }
-    // disable synchronous version of this method
-    ::grpc::Status CancelAutoComplete(::grpc::ServerContext* /*context*/, const ::io::deephaven::proto::backplane::script::grpc::CancelAutoCompleteRequest* /*request*/, ::io::deephaven::proto::backplane::script::grpc::CancelAutoCompleteResponse* /*response*/) override {
-      abort();
-      return ::grpc::Status(::grpc::StatusCode::UNIMPLEMENTED, "");
-    }
-    virtual ::grpc::ServerUnaryReactor* CancelAutoComplete(
-      ::grpc::CallbackServerContext* /*context*/, const ::io::deephaven::proto::backplane::script::grpc::CancelAutoCompleteRequest* /*request*/, ::io::deephaven::proto::backplane::script::grpc::CancelAutoCompleteResponse* /*response*/)  { return nullptr; }
-  };
-  template <class BaseClass>
-  class WithCallbackMethod_OpenAutoCompleteStream : public BaseClass {
-   private:
-    void BaseClassMustBeDerivedFromService(const Service* /*service*/) {}
-   public:
-    WithCallbackMethod_OpenAutoCompleteStream() {
-      ::grpc::Service::MarkMethodCallback(9,
-          new ::grpc::internal::CallbackServerStreamingHandler< ::io::deephaven::proto::backplane::script::grpc::AutoCompleteRequest, ::io::deephaven::proto::backplane::script::grpc::AutoCompleteResponse>(
-            [this](
-                   ::grpc::CallbackServerContext* context, const ::io::deephaven::proto::backplane::script::grpc::AutoCompleteRequest* request) { return this->OpenAutoCompleteStream(context, request); }));
-    }
-    ~WithCallbackMethod_OpenAutoCompleteStream() override {
-      BaseClassMustBeDerivedFromService(this);
-    }
-    // disable synchronous version of this method
-    ::grpc::Status OpenAutoCompleteStream(::grpc::ServerContext* /*context*/, const ::io::deephaven::proto::backplane::script::grpc::AutoCompleteRequest* /*request*/, ::grpc::ServerWriter< ::io::deephaven::proto::backplane::script::grpc::AutoCompleteResponse>* /*writer*/) override {
-      abort();
-      return ::grpc::Status(::grpc::StatusCode::UNIMPLEMENTED, "");
-    }
-    virtual ::grpc::ServerWriteReactor< ::io::deephaven::proto::backplane::script::grpc::AutoCompleteResponse>* OpenAutoCompleteStream(
-      ::grpc::CallbackServerContext* /*context*/, const ::io::deephaven::proto::backplane::script::grpc::AutoCompleteRequest* /*request*/)  { return nullptr; }
-  };
-  template <class BaseClass>
-  class WithCallbackMethod_NextAutoCompleteStream : public BaseClass {
-   private:
-    void BaseClassMustBeDerivedFromService(const Service* /*service*/) {}
-   public:
-    WithCallbackMethod_NextAutoCompleteStream() {
-      ::grpc::Service::MarkMethodCallback(10,
-          new ::grpc::internal::CallbackUnaryHandler< ::io::deephaven::proto::backplane::script::grpc::AutoCompleteRequest, ::io::deephaven::proto::backplane::script::grpc::BrowserNextResponse>(
-            [this](
-                   ::grpc::CallbackServerContext* context, const ::io::deephaven::proto::backplane::script::grpc::AutoCompleteRequest* request, ::io::deephaven::proto::backplane::script::grpc::BrowserNextResponse* response) { return this->NextAutoCompleteStream(context, request, response); }));}
-    void SetMessageAllocatorFor_NextAutoCompleteStream(
-        ::grpc::MessageAllocator< ::io::deephaven::proto::backplane::script::grpc::AutoCompleteRequest, ::io::deephaven::proto::backplane::script::grpc::BrowserNextResponse>* allocator) {
-      ::grpc::internal::MethodHandler* const handler = ::grpc::Service::GetHandler(10);
-      static_cast<::grpc::internal::CallbackUnaryHandler< ::io::deephaven::proto::backplane::script::grpc::AutoCompleteRequest, ::io::deephaven::proto::backplane::script::grpc::BrowserNextResponse>*>(handler)
-              ->SetMessageAllocator(allocator);
-    }
-    ~WithCallbackMethod_NextAutoCompleteStream() override {
-      BaseClassMustBeDerivedFromService(this);
-    }
-    // disable synchronous version of this method
-    ::grpc::Status NextAutoCompleteStream(::grpc::ServerContext* /*context*/, const ::io::deephaven::proto::backplane::script::grpc::AutoCompleteRequest* /*request*/, ::io::deephaven::proto::backplane::script::grpc::BrowserNextResponse* /*response*/) override {
-      abort();
-      return ::grpc::Status(::grpc::StatusCode::UNIMPLEMENTED, "");
-    }
-    virtual ::grpc::ServerUnaryReactor* NextAutoCompleteStream(
-      ::grpc::CallbackServerContext* /*context*/, const ::io::deephaven::proto::backplane::script::grpc::AutoCompleteRequest* /*request*/, ::io::deephaven::proto::backplane::script::grpc::BrowserNextResponse* /*response*/)  { return nullptr; }
-  };
-  typedef WithCallbackMethod_GetConsoleTypes<WithCallbackMethod_StartConsole<WithCallbackMethod_GetHeapInfo<WithCallbackMethod_SubscribeToLogs<WithCallbackMethod_ExecuteCommand<WithCallbackMethod_CancelCommand<WithCallbackMethod_BindTableToVariable<WithCallbackMethod_AutoCompleteStream<WithCallbackMethod_CancelAutoComplete<WithCallbackMethod_OpenAutoCompleteStream<WithCallbackMethod_NextAutoCompleteStream<Service > > > > > > > > > > > CallbackService;
-  typedef CallbackService ExperimentalCallbackService;
-  template <class BaseClass>
-  class WithGenericMethod_GetConsoleTypes : public BaseClass {
-   private:
-    void BaseClassMustBeDerivedFromService(const Service* /*service*/) {}
-   public:
-    WithGenericMethod_GetConsoleTypes() {
-      ::grpc::Service::MarkMethodGeneric(0);
-    }
-    ~WithGenericMethod_GetConsoleTypes() override {
-      BaseClassMustBeDerivedFromService(this);
-    }
-    // disable synchronous version of this method
-    ::grpc::Status GetConsoleTypes(::grpc::ServerContext* /*context*/, const ::io::deephaven::proto::backplane::script::grpc::GetConsoleTypesRequest* /*request*/, ::io::deephaven::proto::backplane::script::grpc::GetConsoleTypesResponse* /*response*/) override {
-      abort();
-      return ::grpc::Status(::grpc::StatusCode::UNIMPLEMENTED, "");
-    }
-  };
-  template <class BaseClass>
-  class WithGenericMethod_StartConsole : public BaseClass {
-   private:
-    void BaseClassMustBeDerivedFromService(const Service* /*service*/) {}
-   public:
-    WithGenericMethod_StartConsole() {
-      ::grpc::Service::MarkMethodGeneric(1);
-    }
-    ~WithGenericMethod_StartConsole() override {
-      BaseClassMustBeDerivedFromService(this);
-    }
-    // disable synchronous version of this method
-    ::grpc::Status StartConsole(::grpc::ServerContext* /*context*/, const ::io::deephaven::proto::backplane::script::grpc::StartConsoleRequest* /*request*/, ::io::deephaven::proto::backplane::script::grpc::StartConsoleResponse* /*response*/) override {
-      abort();
-      return ::grpc::Status(::grpc::StatusCode::UNIMPLEMENTED, "");
-    }
-  };
-  template <class BaseClass>
-  class WithGenericMethod_GetHeapInfo : public BaseClass {
-   private:
-    void BaseClassMustBeDerivedFromService(const Service* /*service*/) {}
-   public:
-    WithGenericMethod_GetHeapInfo() {
-      ::grpc::Service::MarkMethodGeneric(2);
-    }
-    ~WithGenericMethod_GetHeapInfo() override {
-      BaseClassMustBeDerivedFromService(this);
-    }
-    // disable synchronous version of this method
-    ::grpc::Status GetHeapInfo(::grpc::ServerContext* /*context*/, const ::io::deephaven::proto::backplane::script::grpc::GetHeapInfoRequest* /*request*/, ::io::deephaven::proto::backplane::script::grpc::GetHeapInfoResponse* /*response*/) override {
-      abort();
-      return ::grpc::Status(::grpc::StatusCode::UNIMPLEMENTED, "");
-    }
-  };
-  template <class BaseClass>
-  class WithGenericMethod_SubscribeToLogs : public BaseClass {
-   private:
-    void BaseClassMustBeDerivedFromService(const Service* /*service*/) {}
-   public:
-    WithGenericMethod_SubscribeToLogs() {
-      ::grpc::Service::MarkMethodGeneric(3);
-    }
-    ~WithGenericMethod_SubscribeToLogs() override {
-      BaseClassMustBeDerivedFromService(this);
-    }
-    // disable synchronous version of this method
-    ::grpc::Status SubscribeToLogs(::grpc::ServerContext* /*context*/, const ::io::deephaven::proto::backplane::script::grpc::LogSubscriptionRequest* /*request*/, ::grpc::ServerWriter< ::io::deephaven::proto::backplane::script::grpc::LogSubscriptionData>* /*writer*/) override {
-      abort();
-      return ::grpc::Status(::grpc::StatusCode::UNIMPLEMENTED, "");
-    }
-  };
-  template <class BaseClass>
-  class WithGenericMethod_ExecuteCommand : public BaseClass {
-   private:
-    void BaseClassMustBeDerivedFromService(const Service* /*service*/) {}
-   public:
-    WithGenericMethod_ExecuteCommand() {
-      ::grpc::Service::MarkMethodGeneric(4);
-    }
-    ~WithGenericMethod_ExecuteCommand() override {
-      BaseClassMustBeDerivedFromService(this);
-    }
-    // disable synchronous version of this method
-    ::grpc::Status ExecuteCommand(::grpc::ServerContext* /*context*/, const ::io::deephaven::proto::backplane::script::grpc::ExecuteCommandRequest* /*request*/, ::io::deephaven::proto::backplane::script::grpc::ExecuteCommandResponse* /*response*/) override {
-      abort();
-      return ::grpc::Status(::grpc::StatusCode::UNIMPLEMENTED, "");
-    }
-  };
-  template <class BaseClass>
-  class WithGenericMethod_CancelCommand : public BaseClass {
-   private:
-    void BaseClassMustBeDerivedFromService(const Service* /*service*/) {}
-   public:
-    WithGenericMethod_CancelCommand() {
-      ::grpc::Service::MarkMethodGeneric(5);
-    }
-    ~WithGenericMethod_CancelCommand() override {
-      BaseClassMustBeDerivedFromService(this);
-    }
-    // disable synchronous version of this method
-    ::grpc::Status CancelCommand(::grpc::ServerContext* /*context*/, const ::io::deephaven::proto::backplane::script::grpc::CancelCommandRequest* /*request*/, ::io::deephaven::proto::backplane::script::grpc::CancelCommandResponse* /*response*/) override {
-      abort();
-      return ::grpc::Status(::grpc::StatusCode::UNIMPLEMENTED, "");
-    }
-  };
-  template <class BaseClass>
-  class WithGenericMethod_BindTableToVariable : public BaseClass {
-   private:
-    void BaseClassMustBeDerivedFromService(const Service* /*service*/) {}
-   public:
-    WithGenericMethod_BindTableToVariable() {
-      ::grpc::Service::MarkMethodGeneric(6);
-    }
-    ~WithGenericMethod_BindTableToVariable() override {
-      BaseClassMustBeDerivedFromService(this);
-    }
-    // disable synchronous version of this method
-    ::grpc::Status BindTableToVariable(::grpc::ServerContext* /*context*/, const ::io::deephaven::proto::backplane::script::grpc::BindTableToVariableRequest* /*request*/, ::io::deephaven::proto::backplane::script::grpc::BindTableToVariableResponse* /*response*/) override {
-      abort();
-      return ::grpc::Status(::grpc::StatusCode::UNIMPLEMENTED, "");
-    }
-  };
-  template <class BaseClass>
-  class WithGenericMethod_AutoCompleteStream : public BaseClass {
-   private:
-    void BaseClassMustBeDerivedFromService(const Service* /*service*/) {}
-   public:
-    WithGenericMethod_AutoCompleteStream() {
-      ::grpc::Service::MarkMethodGeneric(7);
-    }
-    ~WithGenericMethod_AutoCompleteStream() override {
-      BaseClassMustBeDerivedFromService(this);
-    }
-    // disable synchronous version of this method
-    ::grpc::Status AutoCompleteStream(::grpc::ServerContext* /*context*/, ::grpc::ServerReaderWriter< ::io::deephaven::proto::backplane::script::grpc::AutoCompleteResponse, ::io::deephaven::proto::backplane::script::grpc::AutoCompleteRequest>* /*stream*/)  override {
-      abort();
-      return ::grpc::Status(::grpc::StatusCode::UNIMPLEMENTED, "");
-    }
-  };
-  template <class BaseClass>
-  class WithGenericMethod_CancelAutoComplete : public BaseClass {
-   private:
-    void BaseClassMustBeDerivedFromService(const Service* /*service*/) {}
-   public:
-    WithGenericMethod_CancelAutoComplete() {
-      ::grpc::Service::MarkMethodGeneric(8);
-    }
-    ~WithGenericMethod_CancelAutoComplete() override {
-      BaseClassMustBeDerivedFromService(this);
-    }
-    // disable synchronous version of this method
-    ::grpc::Status CancelAutoComplete(::grpc::ServerContext* /*context*/, const ::io::deephaven::proto::backplane::script::grpc::CancelAutoCompleteRequest* /*request*/, ::io::deephaven::proto::backplane::script::grpc::CancelAutoCompleteResponse* /*response*/) override {
-      abort();
-      return ::grpc::Status(::grpc::StatusCode::UNIMPLEMENTED, "");
-    }
-  };
-  template <class BaseClass>
-  class WithGenericMethod_OpenAutoCompleteStream : public BaseClass {
-   private:
-    void BaseClassMustBeDerivedFromService(const Service* /*service*/) {}
-   public:
-    WithGenericMethod_OpenAutoCompleteStream() {
-      ::grpc::Service::MarkMethodGeneric(9);
-    }
-    ~WithGenericMethod_OpenAutoCompleteStream() override {
-      BaseClassMustBeDerivedFromService(this);
-    }
-    // disable synchronous version of this method
-    ::grpc::Status OpenAutoCompleteStream(::grpc::ServerContext* /*context*/, const ::io::deephaven::proto::backplane::script::grpc::AutoCompleteRequest* /*request*/, ::grpc::ServerWriter< ::io::deephaven::proto::backplane::script::grpc::AutoCompleteResponse>* /*writer*/) override {
-      abort();
-      return ::grpc::Status(::grpc::StatusCode::UNIMPLEMENTED, "");
-    }
-  };
-  template <class BaseClass>
-  class WithGenericMethod_NextAutoCompleteStream : public BaseClass {
-   private:
-    void BaseClassMustBeDerivedFromService(const Service* /*service*/) {}
-   public:
-    WithGenericMethod_NextAutoCompleteStream() {
-      ::grpc::Service::MarkMethodGeneric(10);
-    }
-    ~WithGenericMethod_NextAutoCompleteStream() override {
-      BaseClassMustBeDerivedFromService(this);
-    }
-    // disable synchronous version of this method
-    ::grpc::Status NextAutoCompleteStream(::grpc::ServerContext* /*context*/, const ::io::deephaven::proto::backplane::script::grpc::AutoCompleteRequest* /*request*/, ::io::deephaven::proto::backplane::script::grpc::BrowserNextResponse* /*response*/) override {
-      abort();
-      return ::grpc::Status(::grpc::StatusCode::UNIMPLEMENTED, "");
-    }
-  };
-  template <class BaseClass>
-  class WithRawMethod_GetConsoleTypes : public BaseClass {
-   private:
-    void BaseClassMustBeDerivedFromService(const Service* /*service*/) {}
-   public:
-    WithRawMethod_GetConsoleTypes() {
-      ::grpc::Service::MarkMethodRaw(0);
-    }
-    ~WithRawMethod_GetConsoleTypes() override {
-      BaseClassMustBeDerivedFromService(this);
-    }
-    // disable synchronous version of this method
-    ::grpc::Status GetConsoleTypes(::grpc::ServerContext* /*context*/, const ::io::deephaven::proto::backplane::script::grpc::GetConsoleTypesRequest* /*request*/, ::io::deephaven::proto::backplane::script::grpc::GetConsoleTypesResponse* /*response*/) override {
-      abort();
-      return ::grpc::Status(::grpc::StatusCode::UNIMPLEMENTED, "");
-    }
-    void RequestGetConsoleTypes(::grpc::ServerContext* context, ::grpc::ByteBuffer* request, ::grpc::ServerAsyncResponseWriter< ::grpc::ByteBuffer>* response, ::grpc::CompletionQueue* new_call_cq, ::grpc::ServerCompletionQueue* notification_cq, void *tag) {
-      ::grpc::Service::RequestAsyncUnary(0, context, request, response, new_call_cq, notification_cq, tag);
-    }
-  };
-  template <class BaseClass>
-  class WithRawMethod_StartConsole : public BaseClass {
-   private:
-    void BaseClassMustBeDerivedFromService(const Service* /*service*/) {}
-   public:
-    WithRawMethod_StartConsole() {
-      ::grpc::Service::MarkMethodRaw(1);
-    }
-    ~WithRawMethod_StartConsole() override {
-      BaseClassMustBeDerivedFromService(this);
-    }
-    // disable synchronous version of this method
-    ::grpc::Status StartConsole(::grpc::ServerContext* /*context*/, const ::io::deephaven::proto::backplane::script::grpc::StartConsoleRequest* /*request*/, ::io::deephaven::proto::backplane::script::grpc::StartConsoleResponse* /*response*/) override {
-      abort();
-      return ::grpc::Status(::grpc::StatusCode::UNIMPLEMENTED, "");
-    }
-    void RequestStartConsole(::grpc::ServerContext* context, ::grpc::ByteBuffer* request, ::grpc::ServerAsyncResponseWriter< ::grpc::ByteBuffer>* response, ::grpc::CompletionQueue* new_call_cq, ::grpc::ServerCompletionQueue* notification_cq, void *tag) {
-      ::grpc::Service::RequestAsyncUnary(1, context, request, response, new_call_cq, notification_cq, tag);
-    }
-  };
-  template <class BaseClass>
-  class WithRawMethod_GetHeapInfo : public BaseClass {
-   private:
-    void BaseClassMustBeDerivedFromService(const Service* /*service*/) {}
-   public:
-    WithRawMethod_GetHeapInfo() {
-      ::grpc::Service::MarkMethodRaw(2);
-    }
-    ~WithRawMethod_GetHeapInfo() override {
-      BaseClassMustBeDerivedFromService(this);
-    }
-    // disable synchronous version of this method
-    ::grpc::Status GetHeapInfo(::grpc::ServerContext* /*context*/, const ::io::deephaven::proto::backplane::script::grpc::GetHeapInfoRequest* /*request*/, ::io::deephaven::proto::backplane::script::grpc::GetHeapInfoResponse* /*response*/) override {
-      abort();
-      return ::grpc::Status(::grpc::StatusCode::UNIMPLEMENTED, "");
-    }
-    void RequestGetHeapInfo(::grpc::ServerContext* context, ::grpc::ByteBuffer* request, ::grpc::ServerAsyncResponseWriter< ::grpc::ByteBuffer>* response, ::grpc::CompletionQueue* new_call_cq, ::grpc::ServerCompletionQueue* notification_cq, void *tag) {
-      ::grpc::Service::RequestAsyncUnary(2, context, request, response, new_call_cq, notification_cq, tag);
-    }
-  };
-  template <class BaseClass>
-  class WithRawMethod_SubscribeToLogs : public BaseClass {
-   private:
-    void BaseClassMustBeDerivedFromService(const Service* /*service*/) {}
-   public:
-    WithRawMethod_SubscribeToLogs() {
-      ::grpc::Service::MarkMethodRaw(3);
-    }
-    ~WithRawMethod_SubscribeToLogs() override {
-      BaseClassMustBeDerivedFromService(this);
-    }
-    // disable synchronous version of this method
-    ::grpc::Status SubscribeToLogs(::grpc::ServerContext* /*context*/, const ::io::deephaven::proto::backplane::script::grpc::LogSubscriptionRequest* /*request*/, ::grpc::ServerWriter< ::io::deephaven::proto::backplane::script::grpc::LogSubscriptionData>* /*writer*/) override {
-      abort();
-      return ::grpc::Status(::grpc::StatusCode::UNIMPLEMENTED, "");
-    }
-    void RequestSubscribeToLogs(::grpc::ServerContext* context, ::grpc::ByteBuffer* request, ::grpc::ServerAsyncWriter< ::grpc::ByteBuffer>* writer, ::grpc::CompletionQueue* new_call_cq, ::grpc::ServerCompletionQueue* notification_cq, void *tag) {
-      ::grpc::Service::RequestAsyncServerStreaming(3, context, request, writer, new_call_cq, notification_cq, tag);
-    }
-  };
-  template <class BaseClass>
-  class WithRawMethod_ExecuteCommand : public BaseClass {
-   private:
-    void BaseClassMustBeDerivedFromService(const Service* /*service*/) {}
-   public:
-    WithRawMethod_ExecuteCommand() {
-      ::grpc::Service::MarkMethodRaw(4);
-    }
-    ~WithRawMethod_ExecuteCommand() override {
-      BaseClassMustBeDerivedFromService(this);
-    }
-    // disable synchronous version of this method
-    ::grpc::Status ExecuteCommand(::grpc::ServerContext* /*context*/, const ::io::deephaven::proto::backplane::script::grpc::ExecuteCommandRequest* /*request*/, ::io::deephaven::proto::backplane::script::grpc::ExecuteCommandResponse* /*response*/) override {
-      abort();
-      return ::grpc::Status(::grpc::StatusCode::UNIMPLEMENTED, "");
-    }
-    void RequestExecuteCommand(::grpc::ServerContext* context, ::grpc::ByteBuffer* request, ::grpc::ServerAsyncResponseWriter< ::grpc::ByteBuffer>* response, ::grpc::CompletionQueue* new_call_cq, ::grpc::ServerCompletionQueue* notification_cq, void *tag) {
-      ::grpc::Service::RequestAsyncUnary(4, context, request, response, new_call_cq, notification_cq, tag);
-    }
-  };
-  template <class BaseClass>
-  class WithRawMethod_CancelCommand : public BaseClass {
-   private:
-    void BaseClassMustBeDerivedFromService(const Service* /*service*/) {}
-   public:
-    WithRawMethod_CancelCommand() {
-      ::grpc::Service::MarkMethodRaw(5);
-    }
-    ~WithRawMethod_CancelCommand() override {
-      BaseClassMustBeDerivedFromService(this);
-    }
-    // disable synchronous version of this method
-    ::grpc::Status CancelCommand(::grpc::ServerContext* /*context*/, const ::io::deephaven::proto::backplane::script::grpc::CancelCommandRequest* /*request*/, ::io::deephaven::proto::backplane::script::grpc::CancelCommandResponse* /*response*/) override {
-      abort();
-      return ::grpc::Status(::grpc::StatusCode::UNIMPLEMENTED, "");
-    }
-    void RequestCancelCommand(::grpc::ServerContext* context, ::grpc::ByteBuffer* request, ::grpc::ServerAsyncResponseWriter< ::grpc::ByteBuffer>* response, ::grpc::CompletionQueue* new_call_cq, ::grpc::ServerCompletionQueue* notification_cq, void *tag) {
-      ::grpc::Service::RequestAsyncUnary(5, context, request, response, new_call_cq, notification_cq, tag);
-    }
-  };
-  template <class BaseClass>
-  class WithRawMethod_BindTableToVariable : public BaseClass {
-   private:
-    void BaseClassMustBeDerivedFromService(const Service* /*service*/) {}
-   public:
-    WithRawMethod_BindTableToVariable() {
-      ::grpc::Service::MarkMethodRaw(6);
-    }
-    ~WithRawMethod_BindTableToVariable() override {
-      BaseClassMustBeDerivedFromService(this);
-    }
-    // disable synchronous version of this method
-    ::grpc::Status BindTableToVariable(::grpc::ServerContext* /*context*/, const ::io::deephaven::proto::backplane::script::grpc::BindTableToVariableRequest* /*request*/, ::io::deephaven::proto::backplane::script::grpc::BindTableToVariableResponse* /*response*/) override {
-      abort();
-      return ::grpc::Status(::grpc::StatusCode::UNIMPLEMENTED, "");
-    }
-    void RequestBindTableToVariable(::grpc::ServerContext* context, ::grpc::ByteBuffer* request, ::grpc::ServerAsyncResponseWriter< ::grpc::ByteBuffer>* response, ::grpc::CompletionQueue* new_call_cq, ::grpc::ServerCompletionQueue* notification_cq, void *tag) {
-      ::grpc::Service::RequestAsyncUnary(6, context, request, response, new_call_cq, notification_cq, tag);
-    }
-  };
-  template <class BaseClass>
-  class WithRawMethod_AutoCompleteStream : public BaseClass {
-   private:
-    void BaseClassMustBeDerivedFromService(const Service* /*service*/) {}
-   public:
-    WithRawMethod_AutoCompleteStream() {
-      ::grpc::Service::MarkMethodRaw(7);
-    }
-    ~WithRawMethod_AutoCompleteStream() override {
-      BaseClassMustBeDerivedFromService(this);
-    }
-    // disable synchronous version of this method
-    ::grpc::Status AutoCompleteStream(::grpc::ServerContext* /*context*/, ::grpc::ServerReaderWriter< ::io::deephaven::proto::backplane::script::grpc::AutoCompleteResponse, ::io::deephaven::proto::backplane::script::grpc::AutoCompleteRequest>* /*stream*/)  override {
-      abort();
-      return ::grpc::Status(::grpc::StatusCode::UNIMPLEMENTED, "");
-    }
-    void RequestAutoCompleteStream(::grpc::ServerContext* context, ::grpc::ServerAsyncReaderWriter< ::grpc::ByteBuffer, ::grpc::ByteBuffer>* stream, ::grpc::CompletionQueue* new_call_cq, ::grpc::ServerCompletionQueue* notification_cq, void *tag) {
-      ::grpc::Service::RequestAsyncBidiStreaming(7, context, stream, new_call_cq, notification_cq, tag);
-    }
-  };
-  template <class BaseClass>
-  class WithRawMethod_CancelAutoComplete : public BaseClass {
-   private:
-    void BaseClassMustBeDerivedFromService(const Service* /*service*/) {}
-   public:
-    WithRawMethod_CancelAutoComplete() {
-      ::grpc::Service::MarkMethodRaw(8);
-    }
-    ~WithRawMethod_CancelAutoComplete() override {
-      BaseClassMustBeDerivedFromService(this);
-    }
-    // disable synchronous version of this method
-    ::grpc::Status CancelAutoComplete(::grpc::ServerContext* /*context*/, const ::io::deephaven::proto::backplane::script::grpc::CancelAutoCompleteRequest* /*request*/, ::io::deephaven::proto::backplane::script::grpc::CancelAutoCompleteResponse* /*response*/) override {
-      abort();
-      return ::grpc::Status(::grpc::StatusCode::UNIMPLEMENTED, "");
-    }
-    void RequestCancelAutoComplete(::grpc::ServerContext* context, ::grpc::ByteBuffer* request, ::grpc::ServerAsyncResponseWriter< ::grpc::ByteBuffer>* response, ::grpc::CompletionQueue* new_call_cq, ::grpc::ServerCompletionQueue* notification_cq, void *tag) {
-      ::grpc::Service::RequestAsyncUnary(8, context, request, response, new_call_cq, notification_cq, tag);
-    }
-  };
-  template <class BaseClass>
-  class WithRawMethod_OpenAutoCompleteStream : public BaseClass {
-   private:
-    void BaseClassMustBeDerivedFromService(const Service* /*service*/) {}
-   public:
-    WithRawMethod_OpenAutoCompleteStream() {
-      ::grpc::Service::MarkMethodRaw(9);
-    }
-    ~WithRawMethod_OpenAutoCompleteStream() override {
-      BaseClassMustBeDerivedFromService(this);
-    }
-    // disable synchronous version of this method
-    ::grpc::Status OpenAutoCompleteStream(::grpc::ServerContext* /*context*/, const ::io::deephaven::proto::backplane::script::grpc::AutoCompleteRequest* /*request*/, ::grpc::ServerWriter< ::io::deephaven::proto::backplane::script::grpc::AutoCompleteResponse>* /*writer*/) override {
-      abort();
-      return ::grpc::Status(::grpc::StatusCode::UNIMPLEMENTED, "");
-    }
-    void RequestOpenAutoCompleteStream(::grpc::ServerContext* context, ::grpc::ByteBuffer* request, ::grpc::ServerAsyncWriter< ::grpc::ByteBuffer>* writer, ::grpc::CompletionQueue* new_call_cq, ::grpc::ServerCompletionQueue* notification_cq, void *tag) {
-      ::grpc::Service::RequestAsyncServerStreaming(9, context, request, writer, new_call_cq, notification_cq, tag);
-    }
-  };
-  template <class BaseClass>
-  class WithRawMethod_NextAutoCompleteStream : public BaseClass {
-   private:
-    void BaseClassMustBeDerivedFromService(const Service* /*service*/) {}
-   public:
-    WithRawMethod_NextAutoCompleteStream() {
-      ::grpc::Service::MarkMethodRaw(10);
-    }
-    ~WithRawMethod_NextAutoCompleteStream() override {
-      BaseClassMustBeDerivedFromService(this);
-    }
-    // disable synchronous version of this method
-    ::grpc::Status NextAutoCompleteStream(::grpc::ServerContext* /*context*/, const ::io::deephaven::proto::backplane::script::grpc::AutoCompleteRequest* /*request*/, ::io::deephaven::proto::backplane::script::grpc::BrowserNextResponse* /*response*/) override {
-      abort();
-      return ::grpc::Status(::grpc::StatusCode::UNIMPLEMENTED, "");
-    }
-    void RequestNextAutoCompleteStream(::grpc::ServerContext* context, ::grpc::ByteBuffer* request, ::grpc::ServerAsyncResponseWriter< ::grpc::ByteBuffer>* response, ::grpc::CompletionQueue* new_call_cq, ::grpc::ServerCompletionQueue* notification_cq, void *tag) {
-      ::grpc::Service::RequestAsyncUnary(10, context, request, response, new_call_cq, notification_cq, tag);
-    }
-  };
-  template <class BaseClass>
-  class WithRawCallbackMethod_GetConsoleTypes : public BaseClass {
-   private:
-    void BaseClassMustBeDerivedFromService(const Service* /*service*/) {}
-   public:
-    WithRawCallbackMethod_GetConsoleTypes() {
-      ::grpc::Service::MarkMethodRawCallback(0,
-          new ::grpc::internal::CallbackUnaryHandler< ::grpc::ByteBuffer, ::grpc::ByteBuffer>(
-            [this](
-                   ::grpc::CallbackServerContext* context, const ::grpc::ByteBuffer* request, ::grpc::ByteBuffer* response) { return this->GetConsoleTypes(context, request, response); }));
-    }
-    ~WithRawCallbackMethod_GetConsoleTypes() override {
-      BaseClassMustBeDerivedFromService(this);
-    }
-    // disable synchronous version of this method
-    ::grpc::Status GetConsoleTypes(::grpc::ServerContext* /*context*/, const ::io::deephaven::proto::backplane::script::grpc::GetConsoleTypesRequest* /*request*/, ::io::deephaven::proto::backplane::script::grpc::GetConsoleTypesResponse* /*response*/) override {
-      abort();
-      return ::grpc::Status(::grpc::StatusCode::UNIMPLEMENTED, "");
-    }
-    virtual ::grpc::ServerUnaryReactor* GetConsoleTypes(
-      ::grpc::CallbackServerContext* /*context*/, const ::grpc::ByteBuffer* /*request*/, ::grpc::ByteBuffer* /*response*/)  { return nullptr; }
-  };
-  template <class BaseClass>
-  class WithRawCallbackMethod_StartConsole : public BaseClass {
-   private:
-    void BaseClassMustBeDerivedFromService(const Service* /*service*/) {}
-   public:
-    WithRawCallbackMethod_StartConsole() {
-      ::grpc::Service::MarkMethodRawCallback(1,
-          new ::grpc::internal::CallbackUnaryHandler< ::grpc::ByteBuffer, ::grpc::ByteBuffer>(
-            [this](
-                   ::grpc::CallbackServerContext* context, const ::grpc::ByteBuffer* request, ::grpc::ByteBuffer* response) { return this->StartConsole(context, request, response); }));
-    }
-    ~WithRawCallbackMethod_StartConsole() override {
-      BaseClassMustBeDerivedFromService(this);
-    }
-    // disable synchronous version of this method
-    ::grpc::Status StartConsole(::grpc::ServerContext* /*context*/, const ::io::deephaven::proto::backplane::script::grpc::StartConsoleRequest* /*request*/, ::io::deephaven::proto::backplane::script::grpc::StartConsoleResponse* /*response*/) override {
-      abort();
-      return ::grpc::Status(::grpc::StatusCode::UNIMPLEMENTED, "");
-    }
-    virtual ::grpc::ServerUnaryReactor* StartConsole(
-      ::grpc::CallbackServerContext* /*context*/, const ::grpc::ByteBuffer* /*request*/, ::grpc::ByteBuffer* /*response*/)  { return nullptr; }
-  };
-  template <class BaseClass>
-  class WithRawCallbackMethod_GetHeapInfo : public BaseClass {
-   private:
-    void BaseClassMustBeDerivedFromService(const Service* /*service*/) {}
-   public:
-    WithRawCallbackMethod_GetHeapInfo() {
-      ::grpc::Service::MarkMethodRawCallback(2,
-          new ::grpc::internal::CallbackUnaryHandler< ::grpc::ByteBuffer, ::grpc::ByteBuffer>(
-            [this](
-                   ::grpc::CallbackServerContext* context, const ::grpc::ByteBuffer* request, ::grpc::ByteBuffer* response) { return this->GetHeapInfo(context, request, response); }));
-    }
-    ~WithRawCallbackMethod_GetHeapInfo() override {
-      BaseClassMustBeDerivedFromService(this);
-    }
-    // disable synchronous version of this method
-    ::grpc::Status GetHeapInfo(::grpc::ServerContext* /*context*/, const ::io::deephaven::proto::backplane::script::grpc::GetHeapInfoRequest* /*request*/, ::io::deephaven::proto::backplane::script::grpc::GetHeapInfoResponse* /*response*/) override {
-      abort();
-      return ::grpc::Status(::grpc::StatusCode::UNIMPLEMENTED, "");
-    }
-    virtual ::grpc::ServerUnaryReactor* GetHeapInfo(
-      ::grpc::CallbackServerContext* /*context*/, const ::grpc::ByteBuffer* /*request*/, ::grpc::ByteBuffer* /*response*/)  { return nullptr; }
-  };
-  template <class BaseClass>
-  class WithRawCallbackMethod_SubscribeToLogs : public BaseClass {
-   private:
-    void BaseClassMustBeDerivedFromService(const Service* /*service*/) {}
-   public:
-    WithRawCallbackMethod_SubscribeToLogs() {
-      ::grpc::Service::MarkMethodRawCallback(3,
-          new ::grpc::internal::CallbackServerStreamingHandler< ::grpc::ByteBuffer, ::grpc::ByteBuffer>(
-            [this](
-                   ::grpc::CallbackServerContext* context, const::grpc::ByteBuffer* request) { return this->SubscribeToLogs(context, request); }));
-    }
-    ~WithRawCallbackMethod_SubscribeToLogs() override {
-      BaseClassMustBeDerivedFromService(this);
-    }
-    // disable synchronous version of this method
-    ::grpc::Status SubscribeToLogs(::grpc::ServerContext* /*context*/, const ::io::deephaven::proto::backplane::script::grpc::LogSubscriptionRequest* /*request*/, ::grpc::ServerWriter< ::io::deephaven::proto::backplane::script::grpc::LogSubscriptionData>* /*writer*/) override {
-      abort();
-      return ::grpc::Status(::grpc::StatusCode::UNIMPLEMENTED, "");
-    }
-    virtual ::grpc::ServerWriteReactor< ::grpc::ByteBuffer>* SubscribeToLogs(
-      ::grpc::CallbackServerContext* /*context*/, const ::grpc::ByteBuffer* /*request*/)  { return nullptr; }
-  };
-  template <class BaseClass>
-  class WithRawCallbackMethod_ExecuteCommand : public BaseClass {
-   private:
-    void BaseClassMustBeDerivedFromService(const Service* /*service*/) {}
-   public:
-    WithRawCallbackMethod_ExecuteCommand() {
-      ::grpc::Service::MarkMethodRawCallback(4,
-          new ::grpc::internal::CallbackUnaryHandler< ::grpc::ByteBuffer, ::grpc::ByteBuffer>(
-            [this](
-                   ::grpc::CallbackServerContext* context, const ::grpc::ByteBuffer* request, ::grpc::ByteBuffer* response) { return this->ExecuteCommand(context, request, response); }));
-    }
-    ~WithRawCallbackMethod_ExecuteCommand() override {
-      BaseClassMustBeDerivedFromService(this);
-    }
-    // disable synchronous version of this method
-    ::grpc::Status ExecuteCommand(::grpc::ServerContext* /*context*/, const ::io::deephaven::proto::backplane::script::grpc::ExecuteCommandRequest* /*request*/, ::io::deephaven::proto::backplane::script::grpc::ExecuteCommandResponse* /*response*/) override {
-      abort();
-      return ::grpc::Status(::grpc::StatusCode::UNIMPLEMENTED, "");
-    }
-    virtual ::grpc::ServerUnaryReactor* ExecuteCommand(
-      ::grpc::CallbackServerContext* /*context*/, const ::grpc::ByteBuffer* /*request*/, ::grpc::ByteBuffer* /*response*/)  { return nullptr; }
-  };
-  template <class BaseClass>
-  class WithRawCallbackMethod_CancelCommand : public BaseClass {
-   private:
-    void BaseClassMustBeDerivedFromService(const Service* /*service*/) {}
-   public:
-    WithRawCallbackMethod_CancelCommand() {
-      ::grpc::Service::MarkMethodRawCallback(5,
-          new ::grpc::internal::CallbackUnaryHandler< ::grpc::ByteBuffer, ::grpc::ByteBuffer>(
-            [this](
-                   ::grpc::CallbackServerContext* context, const ::grpc::ByteBuffer* request, ::grpc::ByteBuffer* response) { return this->CancelCommand(context, request, response); }));
-    }
-    ~WithRawCallbackMethod_CancelCommand() override {
-      BaseClassMustBeDerivedFromService(this);
-    }
-    // disable synchronous version of this method
-    ::grpc::Status CancelCommand(::grpc::ServerContext* /*context*/, const ::io::deephaven::proto::backplane::script::grpc::CancelCommandRequest* /*request*/, ::io::deephaven::proto::backplane::script::grpc::CancelCommandResponse* /*response*/) override {
-      abort();
-      return ::grpc::Status(::grpc::StatusCode::UNIMPLEMENTED, "");
-    }
-    virtual ::grpc::ServerUnaryReactor* CancelCommand(
-      ::grpc::CallbackServerContext* /*context*/, const ::grpc::ByteBuffer* /*request*/, ::grpc::ByteBuffer* /*response*/)  { return nullptr; }
-  };
-  template <class BaseClass>
-  class WithRawCallbackMethod_BindTableToVariable : public BaseClass {
-   private:
-    void BaseClassMustBeDerivedFromService(const Service* /*service*/) {}
-   public:
-    WithRawCallbackMethod_BindTableToVariable() {
-      ::grpc::Service::MarkMethodRawCallback(6,
-          new ::grpc::internal::CallbackUnaryHandler< ::grpc::ByteBuffer, ::grpc::ByteBuffer>(
-            [this](
-                   ::grpc::CallbackServerContext* context, const ::grpc::ByteBuffer* request, ::grpc::ByteBuffer* response) { return this->BindTableToVariable(context, request, response); }));
-    }
-    ~WithRawCallbackMethod_BindTableToVariable() override {
-      BaseClassMustBeDerivedFromService(this);
-    }
-    // disable synchronous version of this method
-    ::grpc::Status BindTableToVariable(::grpc::ServerContext* /*context*/, const ::io::deephaven::proto::backplane::script::grpc::BindTableToVariableRequest* /*request*/, ::io::deephaven::proto::backplane::script::grpc::BindTableToVariableResponse* /*response*/) override {
-      abort();
-      return ::grpc::Status(::grpc::StatusCode::UNIMPLEMENTED, "");
-    }
-    virtual ::grpc::ServerUnaryReactor* BindTableToVariable(
-      ::grpc::CallbackServerContext* /*context*/, const ::grpc::ByteBuffer* /*request*/, ::grpc::ByteBuffer* /*response*/)  { return nullptr; }
-  };
-  template <class BaseClass>
-  class WithRawCallbackMethod_AutoCompleteStream : public BaseClass {
-   private:
-    void BaseClassMustBeDerivedFromService(const Service* /*service*/) {}
-   public:
-    WithRawCallbackMethod_AutoCompleteStream() {
-      ::grpc::Service::MarkMethodRawCallback(7,
-          new ::grpc::internal::CallbackBidiHandler< ::grpc::ByteBuffer, ::grpc::ByteBuffer>(
-            [this](
-                   ::grpc::CallbackServerContext* context) { return this->AutoCompleteStream(context); }));
-    }
-    ~WithRawCallbackMethod_AutoCompleteStream() override {
-      BaseClassMustBeDerivedFromService(this);
-    }
-    // disable synchronous version of this method
-    ::grpc::Status AutoCompleteStream(::grpc::ServerContext* /*context*/, ::grpc::ServerReaderWriter< ::io::deephaven::proto::backplane::script::grpc::AutoCompleteResponse, ::io::deephaven::proto::backplane::script::grpc::AutoCompleteRequest>* /*stream*/)  override {
-      abort();
-      return ::grpc::Status(::grpc::StatusCode::UNIMPLEMENTED, "");
-    }
-    virtual ::grpc::ServerBidiReactor< ::grpc::ByteBuffer, ::grpc::ByteBuffer>* AutoCompleteStream(
-      ::grpc::CallbackServerContext* /*context*/)
-      { return nullptr; }
-  };
-  template <class BaseClass>
-  class WithRawCallbackMethod_CancelAutoComplete : public BaseClass {
-   private:
-    void BaseClassMustBeDerivedFromService(const Service* /*service*/) {}
-   public:
-    WithRawCallbackMethod_CancelAutoComplete() {
-      ::grpc::Service::MarkMethodRawCallback(8,
-          new ::grpc::internal::CallbackUnaryHandler< ::grpc::ByteBuffer, ::grpc::ByteBuffer>(
-            [this](
-                   ::grpc::CallbackServerContext* context, const ::grpc::ByteBuffer* request, ::grpc::ByteBuffer* response) { return this->CancelAutoComplete(context, request, response); }));
-    }
-    ~WithRawCallbackMethod_CancelAutoComplete() override {
-      BaseClassMustBeDerivedFromService(this);
-    }
-    // disable synchronous version of this method
-    ::grpc::Status CancelAutoComplete(::grpc::ServerContext* /*context*/, const ::io::deephaven::proto::backplane::script::grpc::CancelAutoCompleteRequest* /*request*/, ::io::deephaven::proto::backplane::script::grpc::CancelAutoCompleteResponse* /*response*/) override {
-      abort();
-      return ::grpc::Status(::grpc::StatusCode::UNIMPLEMENTED, "");
-    }
-    virtual ::grpc::ServerUnaryReactor* CancelAutoComplete(
-      ::grpc::CallbackServerContext* /*context*/, const ::grpc::ByteBuffer* /*request*/, ::grpc::ByteBuffer* /*response*/)  { return nullptr; }
-  };
-  template <class BaseClass>
-  class WithRawCallbackMethod_OpenAutoCompleteStream : public BaseClass {
-   private:
-    void BaseClassMustBeDerivedFromService(const Service* /*service*/) {}
-   public:
-    WithRawCallbackMethod_OpenAutoCompleteStream() {
-      ::grpc::Service::MarkMethodRawCallback(9,
-          new ::grpc::internal::CallbackServerStreamingHandler< ::grpc::ByteBuffer, ::grpc::ByteBuffer>(
-            [this](
-                   ::grpc::CallbackServerContext* context, const::grpc::ByteBuffer* request) { return this->OpenAutoCompleteStream(context, request); }));
-    }
-    ~WithRawCallbackMethod_OpenAutoCompleteStream() override {
-      BaseClassMustBeDerivedFromService(this);
-    }
-    // disable synchronous version of this method
-    ::grpc::Status OpenAutoCompleteStream(::grpc::ServerContext* /*context*/, const ::io::deephaven::proto::backplane::script::grpc::AutoCompleteRequest* /*request*/, ::grpc::ServerWriter< ::io::deephaven::proto::backplane::script::grpc::AutoCompleteResponse>* /*writer*/) override {
-      abort();
-      return ::grpc::Status(::grpc::StatusCode::UNIMPLEMENTED, "");
-    }
-    virtual ::grpc::ServerWriteReactor< ::grpc::ByteBuffer>* OpenAutoCompleteStream(
-      ::grpc::CallbackServerContext* /*context*/, const ::grpc::ByteBuffer* /*request*/)  { return nullptr; }
-  };
-  template <class BaseClass>
-  class WithRawCallbackMethod_NextAutoCompleteStream : public BaseClass {
-   private:
-    void BaseClassMustBeDerivedFromService(const Service* /*service*/) {}
-   public:
-    WithRawCallbackMethod_NextAutoCompleteStream() {
-      ::grpc::Service::MarkMethodRawCallback(10,
-          new ::grpc::internal::CallbackUnaryHandler< ::grpc::ByteBuffer, ::grpc::ByteBuffer>(
-            [this](
-                   ::grpc::CallbackServerContext* context, const ::grpc::ByteBuffer* request, ::grpc::ByteBuffer* response) { return this->NextAutoCompleteStream(context, request, response); }));
-    }
-    ~WithRawCallbackMethod_NextAutoCompleteStream() override {
-      BaseClassMustBeDerivedFromService(this);
-    }
-    // disable synchronous version of this method
-    ::grpc::Status NextAutoCompleteStream(::grpc::ServerContext* /*context*/, const ::io::deephaven::proto::backplane::script::grpc::AutoCompleteRequest* /*request*/, ::io::deephaven::proto::backplane::script::grpc::BrowserNextResponse* /*response*/) override {
-      abort();
-      return ::grpc::Status(::grpc::StatusCode::UNIMPLEMENTED, "");
-    }
-    virtual ::grpc::ServerUnaryReactor* NextAutoCompleteStream(
-      ::grpc::CallbackServerContext* /*context*/, const ::grpc::ByteBuffer* /*request*/, ::grpc::ByteBuffer* /*response*/)  { return nullptr; }
-  };
-  template <class BaseClass>
-  class WithStreamedUnaryMethod_GetConsoleTypes : public BaseClass {
-   private:
-    void BaseClassMustBeDerivedFromService(const Service* /*service*/) {}
-   public:
-    WithStreamedUnaryMethod_GetConsoleTypes() {
-      ::grpc::Service::MarkMethodStreamed(0,
-        new ::grpc::internal::StreamedUnaryHandler<
-          ::io::deephaven::proto::backplane::script::grpc::GetConsoleTypesRequest, ::io::deephaven::proto::backplane::script::grpc::GetConsoleTypesResponse>(
-            [this](::grpc::ServerContext* context,
-                   ::grpc::ServerUnaryStreamer<
-                     ::io::deephaven::proto::backplane::script::grpc::GetConsoleTypesRequest, ::io::deephaven::proto::backplane::script::grpc::GetConsoleTypesResponse>* streamer) {
-                       return this->StreamedGetConsoleTypes(context,
-                         streamer);
-                  }));
-    }
-    ~WithStreamedUnaryMethod_GetConsoleTypes() override {
-      BaseClassMustBeDerivedFromService(this);
-    }
-    // disable regular version of this method
-    ::grpc::Status GetConsoleTypes(::grpc::ServerContext* /*context*/, const ::io::deephaven::proto::backplane::script::grpc::GetConsoleTypesRequest* /*request*/, ::io::deephaven::proto::backplane::script::grpc::GetConsoleTypesResponse* /*response*/) override {
-      abort();
-      return ::grpc::Status(::grpc::StatusCode::UNIMPLEMENTED, "");
-    }
-    // replace default version of method with streamed unary
-    virtual ::grpc::Status StreamedGetConsoleTypes(::grpc::ServerContext* context, ::grpc::ServerUnaryStreamer< ::io::deephaven::proto::backplane::script::grpc::GetConsoleTypesRequest,::io::deephaven::proto::backplane::script::grpc::GetConsoleTypesResponse>* server_unary_streamer) = 0;
-  };
-  template <class BaseClass>
-  class WithStreamedUnaryMethod_StartConsole : public BaseClass {
-   private:
-    void BaseClassMustBeDerivedFromService(const Service* /*service*/) {}
-   public:
-    WithStreamedUnaryMethod_StartConsole() {
-      ::grpc::Service::MarkMethodStreamed(1,
-        new ::grpc::internal::StreamedUnaryHandler<
-          ::io::deephaven::proto::backplane::script::grpc::StartConsoleRequest, ::io::deephaven::proto::backplane::script::grpc::StartConsoleResponse>(
-            [this](::grpc::ServerContext* context,
-                   ::grpc::ServerUnaryStreamer<
-                     ::io::deephaven::proto::backplane::script::grpc::StartConsoleRequest, ::io::deephaven::proto::backplane::script::grpc::StartConsoleResponse>* streamer) {
-                       return this->StreamedStartConsole(context,
-                         streamer);
-                  }));
-    }
-    ~WithStreamedUnaryMethod_StartConsole() override {
-      BaseClassMustBeDerivedFromService(this);
-    }
-    // disable regular version of this method
-    ::grpc::Status StartConsole(::grpc::ServerContext* /*context*/, const ::io::deephaven::proto::backplane::script::grpc::StartConsoleRequest* /*request*/, ::io::deephaven::proto::backplane::script::grpc::StartConsoleResponse* /*response*/) override {
-      abort();
-      return ::grpc::Status(::grpc::StatusCode::UNIMPLEMENTED, "");
-    }
-    // replace default version of method with streamed unary
-    virtual ::grpc::Status StreamedStartConsole(::grpc::ServerContext* context, ::grpc::ServerUnaryStreamer< ::io::deephaven::proto::backplane::script::grpc::StartConsoleRequest,::io::deephaven::proto::backplane::script::grpc::StartConsoleResponse>* server_unary_streamer) = 0;
-  };
-  template <class BaseClass>
-  class WithStreamedUnaryMethod_GetHeapInfo : public BaseClass {
-   private:
-    void BaseClassMustBeDerivedFromService(const Service* /*service*/) {}
-   public:
-    WithStreamedUnaryMethod_GetHeapInfo() {
-      ::grpc::Service::MarkMethodStreamed(2,
-        new ::grpc::internal::StreamedUnaryHandler<
-          ::io::deephaven::proto::backplane::script::grpc::GetHeapInfoRequest, ::io::deephaven::proto::backplane::script::grpc::GetHeapInfoResponse>(
-            [this](::grpc::ServerContext* context,
-                   ::grpc::ServerUnaryStreamer<
-                     ::io::deephaven::proto::backplane::script::grpc::GetHeapInfoRequest, ::io::deephaven::proto::backplane::script::grpc::GetHeapInfoResponse>* streamer) {
-                       return this->StreamedGetHeapInfo(context,
-                         streamer);
-                  }));
-    }
-    ~WithStreamedUnaryMethod_GetHeapInfo() override {
-      BaseClassMustBeDerivedFromService(this);
-    }
-    // disable regular version of this method
-    ::grpc::Status GetHeapInfo(::grpc::ServerContext* /*context*/, const ::io::deephaven::proto::backplane::script::grpc::GetHeapInfoRequest* /*request*/, ::io::deephaven::proto::backplane::script::grpc::GetHeapInfoResponse* /*response*/) override {
-      abort();
-      return ::grpc::Status(::grpc::StatusCode::UNIMPLEMENTED, "");
-    }
-    // replace default version of method with streamed unary
-    virtual ::grpc::Status StreamedGetHeapInfo(::grpc::ServerContext* context, ::grpc::ServerUnaryStreamer< ::io::deephaven::proto::backplane::script::grpc::GetHeapInfoRequest,::io::deephaven::proto::backplane::script::grpc::GetHeapInfoResponse>* server_unary_streamer) = 0;
-  };
-  template <class BaseClass>
-  class WithStreamedUnaryMethod_ExecuteCommand : public BaseClass {
-   private:
-    void BaseClassMustBeDerivedFromService(const Service* /*service*/) {}
-   public:
-    WithStreamedUnaryMethod_ExecuteCommand() {
-      ::grpc::Service::MarkMethodStreamed(4,
-        new ::grpc::internal::StreamedUnaryHandler<
-          ::io::deephaven::proto::backplane::script::grpc::ExecuteCommandRequest, ::io::deephaven::proto::backplane::script::grpc::ExecuteCommandResponse>(
-            [this](::grpc::ServerContext* context,
-                   ::grpc::ServerUnaryStreamer<
-                     ::io::deephaven::proto::backplane::script::grpc::ExecuteCommandRequest, ::io::deephaven::proto::backplane::script::grpc::ExecuteCommandResponse>* streamer) {
-                       return this->StreamedExecuteCommand(context,
-                         streamer);
-                  }));
-    }
-    ~WithStreamedUnaryMethod_ExecuteCommand() override {
-      BaseClassMustBeDerivedFromService(this);
-    }
-    // disable regular version of this method
-    ::grpc::Status ExecuteCommand(::grpc::ServerContext* /*context*/, const ::io::deephaven::proto::backplane::script::grpc::ExecuteCommandRequest* /*request*/, ::io::deephaven::proto::backplane::script::grpc::ExecuteCommandResponse* /*response*/) override {
-      abort();
-      return ::grpc::Status(::grpc::StatusCode::UNIMPLEMENTED, "");
-    }
-    // replace default version of method with streamed unary
-    virtual ::grpc::Status StreamedExecuteCommand(::grpc::ServerContext* context, ::grpc::ServerUnaryStreamer< ::io::deephaven::proto::backplane::script::grpc::ExecuteCommandRequest,::io::deephaven::proto::backplane::script::grpc::ExecuteCommandResponse>* server_unary_streamer) = 0;
-  };
-  template <class BaseClass>
-  class WithStreamedUnaryMethod_CancelCommand : public BaseClass {
-   private:
-    void BaseClassMustBeDerivedFromService(const Service* /*service*/) {}
-   public:
-    WithStreamedUnaryMethod_CancelCommand() {
-      ::grpc::Service::MarkMethodStreamed(5,
-        new ::grpc::internal::StreamedUnaryHandler<
-          ::io::deephaven::proto::backplane::script::grpc::CancelCommandRequest, ::io::deephaven::proto::backplane::script::grpc::CancelCommandResponse>(
-            [this](::grpc::ServerContext* context,
-                   ::grpc::ServerUnaryStreamer<
-                     ::io::deephaven::proto::backplane::script::grpc::CancelCommandRequest, ::io::deephaven::proto::backplane::script::grpc::CancelCommandResponse>* streamer) {
-                       return this->StreamedCancelCommand(context,
-                         streamer);
-                  }));
-    }
-    ~WithStreamedUnaryMethod_CancelCommand() override {
-      BaseClassMustBeDerivedFromService(this);
-    }
-    // disable regular version of this method
-    ::grpc::Status CancelCommand(::grpc::ServerContext* /*context*/, const ::io::deephaven::proto::backplane::script::grpc::CancelCommandRequest* /*request*/, ::io::deephaven::proto::backplane::script::grpc::CancelCommandResponse* /*response*/) override {
-      abort();
-      return ::grpc::Status(::grpc::StatusCode::UNIMPLEMENTED, "");
-    }
-    // replace default version of method with streamed unary
-    virtual ::grpc::Status StreamedCancelCommand(::grpc::ServerContext* context, ::grpc::ServerUnaryStreamer< ::io::deephaven::proto::backplane::script::grpc::CancelCommandRequest,::io::deephaven::proto::backplane::script::grpc::CancelCommandResponse>* server_unary_streamer) = 0;
-  };
-  template <class BaseClass>
-  class WithStreamedUnaryMethod_BindTableToVariable : public BaseClass {
-   private:
-    void BaseClassMustBeDerivedFromService(const Service* /*service*/) {}
-   public:
-    WithStreamedUnaryMethod_BindTableToVariable() {
-      ::grpc::Service::MarkMethodStreamed(6,
-        new ::grpc::internal::StreamedUnaryHandler<
-          ::io::deephaven::proto::backplane::script::grpc::BindTableToVariableRequest, ::io::deephaven::proto::backplane::script::grpc::BindTableToVariableResponse>(
-            [this](::grpc::ServerContext* context,
-                   ::grpc::ServerUnaryStreamer<
-                     ::io::deephaven::proto::backplane::script::grpc::BindTableToVariableRequest, ::io::deephaven::proto::backplane::script::grpc::BindTableToVariableResponse>* streamer) {
-                       return this->StreamedBindTableToVariable(context,
-                         streamer);
-                  }));
-    }
-    ~WithStreamedUnaryMethod_BindTableToVariable() override {
-      BaseClassMustBeDerivedFromService(this);
-    }
-    // disable regular version of this method
-    ::grpc::Status BindTableToVariable(::grpc::ServerContext* /*context*/, const ::io::deephaven::proto::backplane::script::grpc::BindTableToVariableRequest* /*request*/, ::io::deephaven::proto::backplane::script::grpc::BindTableToVariableResponse* /*response*/) override {
-      abort();
-      return ::grpc::Status(::grpc::StatusCode::UNIMPLEMENTED, "");
-    }
-    // replace default version of method with streamed unary
-    virtual ::grpc::Status StreamedBindTableToVariable(::grpc::ServerContext* context, ::grpc::ServerUnaryStreamer< ::io::deephaven::proto::backplane::script::grpc::BindTableToVariableRequest,::io::deephaven::proto::backplane::script::grpc::BindTableToVariableResponse>* server_unary_streamer) = 0;
-  };
-  template <class BaseClass>
-  class WithStreamedUnaryMethod_CancelAutoComplete : public BaseClass {
-   private:
-    void BaseClassMustBeDerivedFromService(const Service* /*service*/) {}
-   public:
-    WithStreamedUnaryMethod_CancelAutoComplete() {
-      ::grpc::Service::MarkMethodStreamed(8,
-        new ::grpc::internal::StreamedUnaryHandler<
-          ::io::deephaven::proto::backplane::script::grpc::CancelAutoCompleteRequest, ::io::deephaven::proto::backplane::script::grpc::CancelAutoCompleteResponse>(
-            [this](::grpc::ServerContext* context,
-                   ::grpc::ServerUnaryStreamer<
-                     ::io::deephaven::proto::backplane::script::grpc::CancelAutoCompleteRequest, ::io::deephaven::proto::backplane::script::grpc::CancelAutoCompleteResponse>* streamer) {
-                       return this->StreamedCancelAutoComplete(context,
-                         streamer);
-                  }));
-    }
-    ~WithStreamedUnaryMethod_CancelAutoComplete() override {
-      BaseClassMustBeDerivedFromService(this);
-    }
-    // disable regular version of this method
-    ::grpc::Status CancelAutoComplete(::grpc::ServerContext* /*context*/, const ::io::deephaven::proto::backplane::script::grpc::CancelAutoCompleteRequest* /*request*/, ::io::deephaven::proto::backplane::script::grpc::CancelAutoCompleteResponse* /*response*/) override {
-      abort();
-      return ::grpc::Status(::grpc::StatusCode::UNIMPLEMENTED, "");
-    }
-    // replace default version of method with streamed unary
-    virtual ::grpc::Status StreamedCancelAutoComplete(::grpc::ServerContext* context, ::grpc::ServerUnaryStreamer< ::io::deephaven::proto::backplane::script::grpc::CancelAutoCompleteRequest,::io::deephaven::proto::backplane::script::grpc::CancelAutoCompleteResponse>* server_unary_streamer) = 0;
-  };
-  template <class BaseClass>
-  class WithStreamedUnaryMethod_NextAutoCompleteStream : public BaseClass {
-   private:
-    void BaseClassMustBeDerivedFromService(const Service* /*service*/) {}
-   public:
-    WithStreamedUnaryMethod_NextAutoCompleteStream() {
-      ::grpc::Service::MarkMethodStreamed(10,
-        new ::grpc::internal::StreamedUnaryHandler<
-          ::io::deephaven::proto::backplane::script::grpc::AutoCompleteRequest, ::io::deephaven::proto::backplane::script::grpc::BrowserNextResponse>(
-            [this](::grpc::ServerContext* context,
-                   ::grpc::ServerUnaryStreamer<
-                     ::io::deephaven::proto::backplane::script::grpc::AutoCompleteRequest, ::io::deephaven::proto::backplane::script::grpc::BrowserNextResponse>* streamer) {
-                       return this->StreamedNextAutoCompleteStream(context,
-                         streamer);
-                  }));
-    }
-    ~WithStreamedUnaryMethod_NextAutoCompleteStream() override {
-      BaseClassMustBeDerivedFromService(this);
-    }
-    // disable regular version of this method
-    ::grpc::Status NextAutoCompleteStream(::grpc::ServerContext* /*context*/, const ::io::deephaven::proto::backplane::script::grpc::AutoCompleteRequest* /*request*/, ::io::deephaven::proto::backplane::script::grpc::BrowserNextResponse* /*response*/) override {
-      abort();
-      return ::grpc::Status(::grpc::StatusCode::UNIMPLEMENTED, "");
-    }
-    // replace default version of method with streamed unary
-    virtual ::grpc::Status StreamedNextAutoCompleteStream(::grpc::ServerContext* context, ::grpc::ServerUnaryStreamer< ::io::deephaven::proto::backplane::script::grpc::AutoCompleteRequest,::io::deephaven::proto::backplane::script::grpc::BrowserNextResponse>* server_unary_streamer) = 0;
-  };
-  typedef WithStreamedUnaryMethod_GetConsoleTypes<WithStreamedUnaryMethod_StartConsole<WithStreamedUnaryMethod_GetHeapInfo<WithStreamedUnaryMethod_ExecuteCommand<WithStreamedUnaryMethod_CancelCommand<WithStreamedUnaryMethod_BindTableToVariable<WithStreamedUnaryMethod_CancelAutoComplete<WithStreamedUnaryMethod_NextAutoCompleteStream<Service > > > > > > > > StreamedUnaryService;
-  template <class BaseClass>
-  class WithSplitStreamingMethod_SubscribeToLogs : public BaseClass {
-   private:
-    void BaseClassMustBeDerivedFromService(const Service* /*service*/) {}
-   public:
-    WithSplitStreamingMethod_SubscribeToLogs() {
-      ::grpc::Service::MarkMethodStreamed(3,
-        new ::grpc::internal::SplitServerStreamingHandler<
-          ::io::deephaven::proto::backplane::script::grpc::LogSubscriptionRequest, ::io::deephaven::proto::backplane::script::grpc::LogSubscriptionData>(
-            [this](::grpc::ServerContext* context,
-                   ::grpc::ServerSplitStreamer<
-                     ::io::deephaven::proto::backplane::script::grpc::LogSubscriptionRequest, ::io::deephaven::proto::backplane::script::grpc::LogSubscriptionData>* streamer) {
-                       return this->StreamedSubscribeToLogs(context,
-                         streamer);
-                  }));
-    }
-    ~WithSplitStreamingMethod_SubscribeToLogs() override {
-      BaseClassMustBeDerivedFromService(this);
-    }
-    // disable regular version of this method
-    ::grpc::Status SubscribeToLogs(::grpc::ServerContext* /*context*/, const ::io::deephaven::proto::backplane::script::grpc::LogSubscriptionRequest* /*request*/, ::grpc::ServerWriter< ::io::deephaven::proto::backplane::script::grpc::LogSubscriptionData>* /*writer*/) override {
-      abort();
-      return ::grpc::Status(::grpc::StatusCode::UNIMPLEMENTED, "");
-    }
-    // replace default version of method with split streamed
-    virtual ::grpc::Status StreamedSubscribeToLogs(::grpc::ServerContext* context, ::grpc::ServerSplitStreamer< ::io::deephaven::proto::backplane::script::grpc::LogSubscriptionRequest,::io::deephaven::proto::backplane::script::grpc::LogSubscriptionData>* server_split_streamer) = 0;
-  };
-  template <class BaseClass>
-  class WithSplitStreamingMethod_OpenAutoCompleteStream : public BaseClass {
-   private:
-    void BaseClassMustBeDerivedFromService(const Service* /*service*/) {}
-   public:
-    WithSplitStreamingMethod_OpenAutoCompleteStream() {
-      ::grpc::Service::MarkMethodStreamed(9,
-        new ::grpc::internal::SplitServerStreamingHandler<
-          ::io::deephaven::proto::backplane::script::grpc::AutoCompleteRequest, ::io::deephaven::proto::backplane::script::grpc::AutoCompleteResponse>(
-            [this](::grpc::ServerContext* context,
-                   ::grpc::ServerSplitStreamer<
-                     ::io::deephaven::proto::backplane::script::grpc::AutoCompleteRequest, ::io::deephaven::proto::backplane::script::grpc::AutoCompleteResponse>* streamer) {
-                       return this->StreamedOpenAutoCompleteStream(context,
-                         streamer);
-                  }));
-    }
-    ~WithSplitStreamingMethod_OpenAutoCompleteStream() override {
-      BaseClassMustBeDerivedFromService(this);
-    }
-    // disable regular version of this method
-    ::grpc::Status OpenAutoCompleteStream(::grpc::ServerContext* /*context*/, const ::io::deephaven::proto::backplane::script::grpc::AutoCompleteRequest* /*request*/, ::grpc::ServerWriter< ::io::deephaven::proto::backplane::script::grpc::AutoCompleteResponse>* /*writer*/) override {
-      abort();
-      return ::grpc::Status(::grpc::StatusCode::UNIMPLEMENTED, "");
-    }
-    // replace default version of method with split streamed
-    virtual ::grpc::Status StreamedOpenAutoCompleteStream(::grpc::ServerContext* context, ::grpc::ServerSplitStreamer< ::io::deephaven::proto::backplane::script::grpc::AutoCompleteRequest,::io::deephaven::proto::backplane::script::grpc::AutoCompleteResponse>* server_split_streamer) = 0;
-  };
-  typedef WithSplitStreamingMethod_SubscribeToLogs<WithSplitStreamingMethod_OpenAutoCompleteStream<Service > > SplitStreamedService;
-  typedef WithStreamedUnaryMethod_GetConsoleTypes<WithStreamedUnaryMethod_StartConsole<WithStreamedUnaryMethod_GetHeapInfo<WithSplitStreamingMethod_SubscribeToLogs<WithStreamedUnaryMethod_ExecuteCommand<WithStreamedUnaryMethod_CancelCommand<WithStreamedUnaryMethod_BindTableToVariable<WithStreamedUnaryMethod_CancelAutoComplete<WithSplitStreamingMethod_OpenAutoCompleteStream<WithStreamedUnaryMethod_NextAutoCompleteStream<Service > > > > > > > > > > StreamedService;
-};
-
-}  // namespace grpc
-}  // namespace script
-}  // namespace backplane
-}  // namespace proto
-}  // namespace deephaven
-}  // namespace io
-
-
-#endif  // GRPC_deephaven_2fproto_2fconsole_2eproto__INCLUDED
diff --git a/cpp-client/deephaven/dhclient/proto/deephaven/proto/console.pb.cc b/cpp-client/deephaven/dhclient/proto/deephaven/proto/console.pb.cc
deleted file mode 100644
index 25f5b8fd23a..00000000000
--- a/cpp-client/deephaven/dhclient/proto/deephaven/proto/console.pb.cc
+++ /dev/null
@@ -1,20220 +0,0 @@
-// Generated by the protocol buffer compiler.  DO NOT EDIT!
-// source: deephaven/proto/console.proto
-
-#include "deephaven/proto/console.pb.h"
-
-#include <algorithm>
-#include "google/protobuf/io/coded_stream.h"
-#include "google/protobuf/extension_set.h"
-#include "google/protobuf/wire_format_lite.h"
-#include "google/protobuf/descriptor.h"
-#include "google/protobuf/generated_message_reflection.h"
-#include "google/protobuf/reflection_ops.h"
-#include "google/protobuf/wire_format.h"
-#include "google/protobuf/generated_message_tctable_impl.h"
-// @@protoc_insertion_point(includes)
-
-// Must be included last.
-#include "google/protobuf/port_def.inc"
-PROTOBUF_PRAGMA_INIT_SEG
-namespace _pb = ::google::protobuf;
-namespace _pbi = ::google::protobuf::internal;
-namespace _fl = ::google::protobuf::internal::field_layout;
-namespace io {
-namespace deephaven {
-namespace proto {
-namespace backplane {
-namespace script {
-namespace grpc {
-
-inline constexpr VersionedTextDocumentIdentifier::Impl_::Impl_(
-    ::_pbi::ConstantInitialized) noexcept
-      : uri_(
-            &::google::protobuf::internal::fixed_address_empty_string,
-            ::_pbi::ConstantInitialized()),
-        version_{0},
-        _cached_size_{0} {}
-
-template <typename>
-PROTOBUF_CONSTEXPR VersionedTextDocumentIdentifier::VersionedTextDocumentIdentifier(::_pbi::ConstantInitialized)
-    : _impl_(::_pbi::ConstantInitialized()) {}
-struct VersionedTextDocumentIdentifierDefaultTypeInternal {
-  PROTOBUF_CONSTEXPR VersionedTextDocumentIdentifierDefaultTypeInternal() : _instance(::_pbi::ConstantInitialized{}) {}
-  ~VersionedTextDocumentIdentifierDefaultTypeInternal() {}
-  union {
-    VersionedTextDocumentIdentifier _instance;
-  };
-};
-
-PROTOBUF_ATTRIBUTE_NO_DESTROY PROTOBUF_CONSTINIT
-    PROTOBUF_ATTRIBUTE_INIT_PRIORITY1 VersionedTextDocumentIdentifierDefaultTypeInternal _VersionedTextDocumentIdentifier_default_instance_;
-
-inline constexpr TextDocumentItem::Impl_::Impl_(
-    ::_pbi::ConstantInitialized) noexcept
-      : uri_(
-            &::google::protobuf::internal::fixed_address_empty_string,
-            ::_pbi::ConstantInitialized()),
-        language_id_(
-            &::google::protobuf::internal::fixed_address_empty_string,
-            ::_pbi::ConstantInitialized()),
-        text_(
-            &::google::protobuf::internal::fixed_address_empty_string,
-            ::_pbi::ConstantInitialized()),
-        version_{0},
-        _cached_size_{0} {}
-
-template <typename>
-PROTOBUF_CONSTEXPR TextDocumentItem::TextDocumentItem(::_pbi::ConstantInitialized)
-    : _impl_(::_pbi::ConstantInitialized()) {}
-struct TextDocumentItemDefaultTypeInternal {
-  PROTOBUF_CONSTEXPR TextDocumentItemDefaultTypeInternal() : _instance(::_pbi::ConstantInitialized{}) {}
-  ~TextDocumentItemDefaultTypeInternal() {}
-  union {
-    TextDocumentItem _instance;
-  };
-};
-
-PROTOBUF_ATTRIBUTE_NO_DESTROY PROTOBUF_CONSTINIT
-    PROTOBUF_ATTRIBUTE_INIT_PRIORITY1 TextDocumentItemDefaultTypeInternal _TextDocumentItem_default_instance_;
-
-inline constexpr Position::Impl_::Impl_(
-    ::_pbi::ConstantInitialized) noexcept
-      : line_{0},
-        character_{0},
-        _cached_size_{0} {}
-
-template <typename>
-PROTOBUF_CONSTEXPR Position::Position(::_pbi::ConstantInitialized)
-    : _impl_(::_pbi::ConstantInitialized()) {}
-struct PositionDefaultTypeInternal {
-  PROTOBUF_CONSTEXPR PositionDefaultTypeInternal() : _instance(::_pbi::ConstantInitialized{}) {}
-  ~PositionDefaultTypeInternal() {}
-  union {
-    Position _instance;
-  };
-};
-
-PROTOBUF_ATTRIBUTE_NO_DESTROY PROTOBUF_CONSTINIT
-    PROTOBUF_ATTRIBUTE_INIT_PRIORITY1 PositionDefaultTypeInternal _Position_default_instance_;
-
-inline constexpr MarkupContent::Impl_::Impl_(
-    ::_pbi::ConstantInitialized) noexcept
-      : kind_(
-            &::google::protobuf::internal::fixed_address_empty_string,
-            ::_pbi::ConstantInitialized()),
-        value_(
-            &::google::protobuf::internal::fixed_address_empty_string,
-            ::_pbi::ConstantInitialized()),
-        _cached_size_{0} {}
-
-template <typename>
-PROTOBUF_CONSTEXPR MarkupContent::MarkupContent(::_pbi::ConstantInitialized)
-    : _impl_(::_pbi::ConstantInitialized()) {}
-struct MarkupContentDefaultTypeInternal {
-  PROTOBUF_CONSTEXPR MarkupContentDefaultTypeInternal() : _instance(::_pbi::ConstantInitialized{}) {}
-  ~MarkupContentDefaultTypeInternal() {}
-  union {
-    MarkupContent _instance;
-  };
-};
-
-PROTOBUF_ATTRIBUTE_NO_DESTROY PROTOBUF_CONSTINIT
-    PROTOBUF_ATTRIBUTE_INIT_PRIORITY1 MarkupContentDefaultTypeInternal _MarkupContent_default_instance_;
-
-inline constexpr LogSubscriptionRequest::Impl_::Impl_(
-    ::_pbi::ConstantInitialized) noexcept
-      : levels_{},
-        last_seen_log_timestamp_{::int64_t{0}},
-        _cached_size_{0} {}
-
-template <typename>
-PROTOBUF_CONSTEXPR LogSubscriptionRequest::LogSubscriptionRequest(::_pbi::ConstantInitialized)
-    : _impl_(::_pbi::ConstantInitialized()) {}
-struct LogSubscriptionRequestDefaultTypeInternal {
-  PROTOBUF_CONSTEXPR LogSubscriptionRequestDefaultTypeInternal() : _instance(::_pbi::ConstantInitialized{}) {}
-  ~LogSubscriptionRequestDefaultTypeInternal() {}
-  union {
-    LogSubscriptionRequest _instance;
-  };
-};
-
-PROTOBUF_ATTRIBUTE_NO_DESTROY PROTOBUF_CONSTINIT
-    PROTOBUF_ATTRIBUTE_INIT_PRIORITY1 LogSubscriptionRequestDefaultTypeInternal _LogSubscriptionRequest_default_instance_;
-
-inline constexpr LogSubscriptionData::Impl_::Impl_(
-    ::_pbi::ConstantInitialized) noexcept
-      : log_level_(
-            &::google::protobuf::internal::fixed_address_empty_string,
-            ::_pbi::ConstantInitialized()),
-        message_(
-            &::google::protobuf::internal::fixed_address_empty_string,
-            ::_pbi::ConstantInitialized()),
-        micros_{::int64_t{0}},
-        _cached_size_{0} {}
-
-template <typename>
-PROTOBUF_CONSTEXPR LogSubscriptionData::LogSubscriptionData(::_pbi::ConstantInitialized)
-    : _impl_(::_pbi::ConstantInitialized()) {}
-struct LogSubscriptionDataDefaultTypeInternal {
-  PROTOBUF_CONSTEXPR LogSubscriptionDataDefaultTypeInternal() : _instance(::_pbi::ConstantInitialized{}) {}
-  ~LogSubscriptionDataDefaultTypeInternal() {}
-  union {
-    LogSubscriptionData _instance;
-  };
-};
-
-PROTOBUF_ATTRIBUTE_NO_DESTROY PROTOBUF_CONSTINIT
-    PROTOBUF_ATTRIBUTE_INIT_PRIORITY1 LogSubscriptionDataDefaultTypeInternal _LogSubscriptionData_default_instance_;
-
-inline constexpr GetHeapInfoResponse::Impl_::Impl_(
-    ::_pbi::ConstantInitialized) noexcept
-      : max_memory_{::int64_t{0}},
-        total_memory_{::int64_t{0}},
-        free_memory_{::int64_t{0}},
-        _cached_size_{0} {}
-
-template <typename>
-PROTOBUF_CONSTEXPR GetHeapInfoResponse::GetHeapInfoResponse(::_pbi::ConstantInitialized)
-    : _impl_(::_pbi::ConstantInitialized()) {}
-struct GetHeapInfoResponseDefaultTypeInternal {
-  PROTOBUF_CONSTEXPR GetHeapInfoResponseDefaultTypeInternal() : _instance(::_pbi::ConstantInitialized{}) {}
-  ~GetHeapInfoResponseDefaultTypeInternal() {}
-  union {
-    GetHeapInfoResponse _instance;
-  };
-};
-
-PROTOBUF_ATTRIBUTE_NO_DESTROY PROTOBUF_CONSTINIT
-    PROTOBUF_ATTRIBUTE_INIT_PRIORITY1 GetHeapInfoResponseDefaultTypeInternal _GetHeapInfoResponse_default_instance_;
-      template <typename>
-PROTOBUF_CONSTEXPR GetHeapInfoRequest::GetHeapInfoRequest(::_pbi::ConstantInitialized) {}
-struct GetHeapInfoRequestDefaultTypeInternal {
-  PROTOBUF_CONSTEXPR GetHeapInfoRequestDefaultTypeInternal() : _instance(::_pbi::ConstantInitialized{}) {}
-  ~GetHeapInfoRequestDefaultTypeInternal() {}
-  union {
-    GetHeapInfoRequest _instance;
-  };
-};
-
-PROTOBUF_ATTRIBUTE_NO_DESTROY PROTOBUF_CONSTINIT
-    PROTOBUF_ATTRIBUTE_INIT_PRIORITY1 GetHeapInfoRequestDefaultTypeInternal _GetHeapInfoRequest_default_instance_;
-
-inline constexpr GetConsoleTypesResponse::Impl_::Impl_(
-    ::_pbi::ConstantInitialized) noexcept
-      : console_types_{},
-        _cached_size_{0} {}
-
-template <typename>
-PROTOBUF_CONSTEXPR GetConsoleTypesResponse::GetConsoleTypesResponse(::_pbi::ConstantInitialized)
-    : _impl_(::_pbi::ConstantInitialized()) {}
-struct GetConsoleTypesResponseDefaultTypeInternal {
-  PROTOBUF_CONSTEXPR GetConsoleTypesResponseDefaultTypeInternal() : _instance(::_pbi::ConstantInitialized{}) {}
-  ~GetConsoleTypesResponseDefaultTypeInternal() {}
-  union {
-    GetConsoleTypesResponse _instance;
-  };
-};
-
-PROTOBUF_ATTRIBUTE_NO_DESTROY PROTOBUF_CONSTINIT
-    PROTOBUF_ATTRIBUTE_INIT_PRIORITY1 GetConsoleTypesResponseDefaultTypeInternal _GetConsoleTypesResponse_default_instance_;
-      template <typename>
-PROTOBUF_CONSTEXPR GetConsoleTypesRequest::GetConsoleTypesRequest(::_pbi::ConstantInitialized) {}
-struct GetConsoleTypesRequestDefaultTypeInternal {
-  PROTOBUF_CONSTEXPR GetConsoleTypesRequestDefaultTypeInternal() : _instance(::_pbi::ConstantInitialized{}) {}
-  ~GetConsoleTypesRequestDefaultTypeInternal() {}
-  union {
-    GetConsoleTypesRequest _instance;
-  };
-};
-
-PROTOBUF_ATTRIBUTE_NO_DESTROY PROTOBUF_CONSTINIT
-    PROTOBUF_ATTRIBUTE_INIT_PRIORITY1 GetConsoleTypesRequestDefaultTypeInternal _GetConsoleTypesRequest_default_instance_;
-
-inline constexpr FigureDescriptor_StringMapWithDefault::Impl_::Impl_(
-    ::_pbi::ConstantInitialized) noexcept
-      : _cached_size_{0},
-        keys_{},
-        values_{},
-        default_string_(
-            &::google::protobuf::internal::fixed_address_empty_string,
-            ::_pbi::ConstantInitialized()) {}
-
-template <typename>
-PROTOBUF_CONSTEXPR FigureDescriptor_StringMapWithDefault::FigureDescriptor_StringMapWithDefault(::_pbi::ConstantInitialized)
-    : _impl_(::_pbi::ConstantInitialized()) {}
-struct FigureDescriptor_StringMapWithDefaultDefaultTypeInternal {
-  PROTOBUF_CONSTEXPR FigureDescriptor_StringMapWithDefaultDefaultTypeInternal() : _instance(::_pbi::ConstantInitialized{}) {}
-  ~FigureDescriptor_StringMapWithDefaultDefaultTypeInternal() {}
-  union {
-    FigureDescriptor_StringMapWithDefault _instance;
-  };
-};
-
-PROTOBUF_ATTRIBUTE_NO_DESTROY PROTOBUF_CONSTINIT
-    PROTOBUF_ATTRIBUTE_INIT_PRIORITY1 FigureDescriptor_StringMapWithDefaultDefaultTypeInternal _FigureDescriptor_StringMapWithDefault_default_instance_;
-
-inline constexpr FigureDescriptor_OneClickDescriptor::Impl_::Impl_(
-    ::_pbi::ConstantInitialized) noexcept
-      : columns_{},
-        column_types_{},
-        require_all_filters_to_display_{false},
-        _cached_size_{0} {}
-
-template <typename>
-PROTOBUF_CONSTEXPR FigureDescriptor_OneClickDescriptor::FigureDescriptor_OneClickDescriptor(::_pbi::ConstantInitialized)
-    : _impl_(::_pbi::ConstantInitialized()) {}
-struct FigureDescriptor_OneClickDescriptorDefaultTypeInternal {
-  PROTOBUF_CONSTEXPR FigureDescriptor_OneClickDescriptorDefaultTypeInternal() : _instance(::_pbi::ConstantInitialized{}) {}
-  ~FigureDescriptor_OneClickDescriptorDefaultTypeInternal() {}
-  union {
-    FigureDescriptor_OneClickDescriptor _instance;
-  };
-};
-
-PROTOBUF_ATTRIBUTE_NO_DESTROY PROTOBUF_CONSTINIT
-    PROTOBUF_ATTRIBUTE_INIT_PRIORITY1 FigureDescriptor_OneClickDescriptorDefaultTypeInternal _FigureDescriptor_OneClickDescriptor_default_instance_;
-
-inline constexpr FigureDescriptor_MultiSeriesSourceDescriptor::Impl_::Impl_(
-    ::_pbi::ConstantInitialized) noexcept
-      : axis_id_(
-            &::google::protobuf::internal::fixed_address_empty_string,
-            ::_pbi::ConstantInitialized()),
-        column_name_(
-            &::google::protobuf::internal::fixed_address_empty_string,
-            ::_pbi::ConstantInitialized()),
-        type_{static_cast< ::io::deephaven::proto::backplane::script::grpc::FigureDescriptor_SourceType >(0)},
-        partitioned_table_id_{0},
-        _cached_size_{0} {}
-
-template <typename>
-PROTOBUF_CONSTEXPR FigureDescriptor_MultiSeriesSourceDescriptor::FigureDescriptor_MultiSeriesSourceDescriptor(::_pbi::ConstantInitialized)
-    : _impl_(::_pbi::ConstantInitialized()) {}
-struct FigureDescriptor_MultiSeriesSourceDescriptorDefaultTypeInternal {
-  PROTOBUF_CONSTEXPR FigureDescriptor_MultiSeriesSourceDescriptorDefaultTypeInternal() : _instance(::_pbi::ConstantInitialized{}) {}
-  ~FigureDescriptor_MultiSeriesSourceDescriptorDefaultTypeInternal() {}
-  union {
-    FigureDescriptor_MultiSeriesSourceDescriptor _instance;
-  };
-};
-
-PROTOBUF_ATTRIBUTE_NO_DESTROY PROTOBUF_CONSTINIT
-    PROTOBUF_ATTRIBUTE_INIT_PRIORITY1 FigureDescriptor_MultiSeriesSourceDescriptorDefaultTypeInternal _FigureDescriptor_MultiSeriesSourceDescriptor_default_instance_;
-
-inline constexpr FigureDescriptor_DoubleMapWithDefault::Impl_::Impl_(
-    ::_pbi::ConstantInitialized) noexcept
-      : _cached_size_{0},
-        keys_{},
-        values_{},
-        default_double_{0} {}
-
-template <typename>
-PROTOBUF_CONSTEXPR FigureDescriptor_DoubleMapWithDefault::FigureDescriptor_DoubleMapWithDefault(::_pbi::ConstantInitialized)
-    : _impl_(::_pbi::ConstantInitialized()) {}
-struct FigureDescriptor_DoubleMapWithDefaultDefaultTypeInternal {
-  PROTOBUF_CONSTEXPR FigureDescriptor_DoubleMapWithDefaultDefaultTypeInternal() : _instance(::_pbi::ConstantInitialized{}) {}
-  ~FigureDescriptor_DoubleMapWithDefaultDefaultTypeInternal() {}
-  union {
-    FigureDescriptor_DoubleMapWithDefault _instance;
-  };
-};
-
-PROTOBUF_ATTRIBUTE_NO_DESTROY PROTOBUF_CONSTINIT
-    PROTOBUF_ATTRIBUTE_INIT_PRIORITY1 FigureDescriptor_DoubleMapWithDefaultDefaultTypeInternal _FigureDescriptor_DoubleMapWithDefault_default_instance_;
-
-inline constexpr FigureDescriptor_BusinessCalendarDescriptor_LocalDate::Impl_::Impl_(
-    ::_pbi::ConstantInitialized) noexcept
-      : year_{0},
-        month_{0},
-        day_{0},
-        _cached_size_{0} {}
-
-template <typename>
-PROTOBUF_CONSTEXPR FigureDescriptor_BusinessCalendarDescriptor_LocalDate::FigureDescriptor_BusinessCalendarDescriptor_LocalDate(::_pbi::ConstantInitialized)
-    : _impl_(::_pbi::ConstantInitialized()) {}
-struct FigureDescriptor_BusinessCalendarDescriptor_LocalDateDefaultTypeInternal {
-  PROTOBUF_CONSTEXPR FigureDescriptor_BusinessCalendarDescriptor_LocalDateDefaultTypeInternal() : _instance(::_pbi::ConstantInitialized{}) {}
-  ~FigureDescriptor_BusinessCalendarDescriptor_LocalDateDefaultTypeInternal() {}
-  union {
-    FigureDescriptor_BusinessCalendarDescriptor_LocalDate _instance;
-  };
-};
-
-PROTOBUF_ATTRIBUTE_NO_DESTROY PROTOBUF_CONSTINIT
-    PROTOBUF_ATTRIBUTE_INIT_PRIORITY1 FigureDescriptor_BusinessCalendarDescriptor_LocalDateDefaultTypeInternal _FigureDescriptor_BusinessCalendarDescriptor_LocalDate_default_instance_;
-
-inline constexpr FigureDescriptor_BusinessCalendarDescriptor_BusinessPeriod::Impl_::Impl_(
-    ::_pbi::ConstantInitialized) noexcept
-      : open_(
-            &::google::protobuf::internal::fixed_address_empty_string,
-            ::_pbi::ConstantInitialized()),
-        close_(
-            &::google::protobuf::internal::fixed_address_empty_string,
-            ::_pbi::ConstantInitialized()),
-        _cached_size_{0} {}
-
-template <typename>
-PROTOBUF_CONSTEXPR FigureDescriptor_BusinessCalendarDescriptor_BusinessPeriod::FigureDescriptor_BusinessCalendarDescriptor_BusinessPeriod(::_pbi::ConstantInitialized)
-    : _impl_(::_pbi::ConstantInitialized()) {}
-struct FigureDescriptor_BusinessCalendarDescriptor_BusinessPeriodDefaultTypeInternal {
-  PROTOBUF_CONSTEXPR FigureDescriptor_BusinessCalendarDescriptor_BusinessPeriodDefaultTypeInternal() : _instance(::_pbi::ConstantInitialized{}) {}
-  ~FigureDescriptor_BusinessCalendarDescriptor_BusinessPeriodDefaultTypeInternal() {}
-  union {
-    FigureDescriptor_BusinessCalendarDescriptor_BusinessPeriod _instance;
-  };
-};
-
-PROTOBUF_ATTRIBUTE_NO_DESTROY PROTOBUF_CONSTINIT
-    PROTOBUF_ATTRIBUTE_INIT_PRIORITY1 FigureDescriptor_BusinessCalendarDescriptor_BusinessPeriodDefaultTypeInternal _FigureDescriptor_BusinessCalendarDescriptor_BusinessPeriod_default_instance_;
-
-inline constexpr FigureDescriptor_BoolMapWithDefault::Impl_::Impl_(
-    ::_pbi::ConstantInitialized) noexcept
-      : _cached_size_{0},
-        keys_{},
-        values_{},
-        default_bool_{false} {}
-
-template <typename>
-PROTOBUF_CONSTEXPR FigureDescriptor_BoolMapWithDefault::FigureDescriptor_BoolMapWithDefault(::_pbi::ConstantInitialized)
-    : _impl_(::_pbi::ConstantInitialized()) {}
-struct FigureDescriptor_BoolMapWithDefaultDefaultTypeInternal {
-  PROTOBUF_CONSTEXPR FigureDescriptor_BoolMapWithDefaultDefaultTypeInternal() : _instance(::_pbi::ConstantInitialized{}) {}
-  ~FigureDescriptor_BoolMapWithDefaultDefaultTypeInternal() {}
-  union {
-    FigureDescriptor_BoolMapWithDefault _instance;
-  };
-};
-
-PROTOBUF_ATTRIBUTE_NO_DESTROY PROTOBUF_CONSTINIT
-    PROTOBUF_ATTRIBUTE_INIT_PRIORITY1 FigureDescriptor_BoolMapWithDefaultDefaultTypeInternal _FigureDescriptor_BoolMapWithDefault_default_instance_;
-
-inline constexpr Diagnostic_CodeDescription::Impl_::Impl_(
-    ::_pbi::ConstantInitialized) noexcept
-      : href_(
-            &::google::protobuf::internal::fixed_address_empty_string,
-            ::_pbi::ConstantInitialized()),
-        _cached_size_{0} {}
-
-template <typename>
-PROTOBUF_CONSTEXPR Diagnostic_CodeDescription::Diagnostic_CodeDescription(::_pbi::ConstantInitialized)
-    : _impl_(::_pbi::ConstantInitialized()) {}
-struct Diagnostic_CodeDescriptionDefaultTypeInternal {
-  PROTOBUF_CONSTEXPR Diagnostic_CodeDescriptionDefaultTypeInternal() : _instance(::_pbi::ConstantInitialized{}) {}
-  ~Diagnostic_CodeDescriptionDefaultTypeInternal() {}
-  union {
-    Diagnostic_CodeDescription _instance;
-  };
-};
-
-PROTOBUF_ATTRIBUTE_NO_DESTROY PROTOBUF_CONSTINIT
-    PROTOBUF_ATTRIBUTE_INIT_PRIORITY1 Diagnostic_CodeDescriptionDefaultTypeInternal _Diagnostic_CodeDescription_default_instance_;
-
-inline constexpr CompletionContext::Impl_::Impl_(
-    ::_pbi::ConstantInitialized) noexcept
-      : trigger_character_(
-            &::google::protobuf::internal::fixed_address_empty_string,
-            ::_pbi::ConstantInitialized()),
-        trigger_kind_{0},
-        _cached_size_{0} {}
-
-template <typename>
-PROTOBUF_CONSTEXPR CompletionContext::CompletionContext(::_pbi::ConstantInitialized)
-    : _impl_(::_pbi::ConstantInitialized()) {}
-struct CompletionContextDefaultTypeInternal {
-  PROTOBUF_CONSTEXPR CompletionContextDefaultTypeInternal() : _instance(::_pbi::ConstantInitialized{}) {}
-  ~CompletionContextDefaultTypeInternal() {}
-  union {
-    CompletionContext _instance;
-  };
-};
-
-PROTOBUF_ATTRIBUTE_NO_DESTROY PROTOBUF_CONSTINIT
-    PROTOBUF_ATTRIBUTE_INIT_PRIORITY1 CompletionContextDefaultTypeInternal _CompletionContext_default_instance_;
-      template <typename>
-PROTOBUF_CONSTEXPR CancelCommandResponse::CancelCommandResponse(::_pbi::ConstantInitialized) {}
-struct CancelCommandResponseDefaultTypeInternal {
-  PROTOBUF_CONSTEXPR CancelCommandResponseDefaultTypeInternal() : _instance(::_pbi::ConstantInitialized{}) {}
-  ~CancelCommandResponseDefaultTypeInternal() {}
-  union {
-    CancelCommandResponse _instance;
-  };
-};
-
-PROTOBUF_ATTRIBUTE_NO_DESTROY PROTOBUF_CONSTINIT
-    PROTOBUF_ATTRIBUTE_INIT_PRIORITY1 CancelCommandResponseDefaultTypeInternal _CancelCommandResponse_default_instance_;
-      template <typename>
-PROTOBUF_CONSTEXPR CancelAutoCompleteResponse::CancelAutoCompleteResponse(::_pbi::ConstantInitialized) {}
-struct CancelAutoCompleteResponseDefaultTypeInternal {
-  PROTOBUF_CONSTEXPR CancelAutoCompleteResponseDefaultTypeInternal() : _instance(::_pbi::ConstantInitialized{}) {}
-  ~CancelAutoCompleteResponseDefaultTypeInternal() {}
-  union {
-    CancelAutoCompleteResponse _instance;
-  };
-};
-
-PROTOBUF_ATTRIBUTE_NO_DESTROY PROTOBUF_CONSTINIT
-    PROTOBUF_ATTRIBUTE_INIT_PRIORITY1 CancelAutoCompleteResponseDefaultTypeInternal _CancelAutoCompleteResponse_default_instance_;
-      template <typename>
-PROTOBUF_CONSTEXPR BrowserNextResponse::BrowserNextResponse(::_pbi::ConstantInitialized) {}
-struct BrowserNextResponseDefaultTypeInternal {
-  PROTOBUF_CONSTEXPR BrowserNextResponseDefaultTypeInternal() : _instance(::_pbi::ConstantInitialized{}) {}
-  ~BrowserNextResponseDefaultTypeInternal() {}
-  union {
-    BrowserNextResponse _instance;
-  };
-};
-
-PROTOBUF_ATTRIBUTE_NO_DESTROY PROTOBUF_CONSTINIT
-    PROTOBUF_ATTRIBUTE_INIT_PRIORITY1 BrowserNextResponseDefaultTypeInternal _BrowserNextResponse_default_instance_;
-      template <typename>
-PROTOBUF_CONSTEXPR BindTableToVariableResponse::BindTableToVariableResponse(::_pbi::ConstantInitialized) {}
-struct BindTableToVariableResponseDefaultTypeInternal {
-  PROTOBUF_CONSTEXPR BindTableToVariableResponseDefaultTypeInternal() : _instance(::_pbi::ConstantInitialized{}) {}
-  ~BindTableToVariableResponseDefaultTypeInternal() {}
-  union {
-    BindTableToVariableResponse _instance;
-  };
-};
-
-PROTOBUF_ATTRIBUTE_NO_DESTROY PROTOBUF_CONSTINIT
-    PROTOBUF_ATTRIBUTE_INIT_PRIORITY1 BindTableToVariableResponseDefaultTypeInternal _BindTableToVariableResponse_default_instance_;
-
-inline constexpr StartConsoleResponse::Impl_::Impl_(
-    ::_pbi::ConstantInitialized) noexcept
-      : _cached_size_{0},
-        result_id_{nullptr} {}
-
-template <typename>
-PROTOBUF_CONSTEXPR StartConsoleResponse::StartConsoleResponse(::_pbi::ConstantInitialized)
-    : _impl_(::_pbi::ConstantInitialized()) {}
-struct StartConsoleResponseDefaultTypeInternal {
-  PROTOBUF_CONSTEXPR StartConsoleResponseDefaultTypeInternal() : _instance(::_pbi::ConstantInitialized{}) {}
-  ~StartConsoleResponseDefaultTypeInternal() {}
-  union {
-    StartConsoleResponse _instance;
-  };
-};
-
-PROTOBUF_ATTRIBUTE_NO_DESTROY PROTOBUF_CONSTINIT
-    PROTOBUF_ATTRIBUTE_INIT_PRIORITY1 StartConsoleResponseDefaultTypeInternal _StartConsoleResponse_default_instance_;
-
-inline constexpr StartConsoleRequest::Impl_::Impl_(
-    ::_pbi::ConstantInitialized) noexcept
-      : _cached_size_{0},
-        session_type_(
-            &::google::protobuf::internal::fixed_address_empty_string,
-            ::_pbi::ConstantInitialized()),
-        result_id_{nullptr} {}
-
-template <typename>
-PROTOBUF_CONSTEXPR StartConsoleRequest::StartConsoleRequest(::_pbi::ConstantInitialized)
-    : _impl_(::_pbi::ConstantInitialized()) {}
-struct StartConsoleRequestDefaultTypeInternal {
-  PROTOBUF_CONSTEXPR StartConsoleRequestDefaultTypeInternal() : _instance(::_pbi::ConstantInitialized{}) {}
-  ~StartConsoleRequestDefaultTypeInternal() {}
-  union {
-    StartConsoleRequest _instance;
-  };
-};
-
-PROTOBUF_ATTRIBUTE_NO_DESTROY PROTOBUF_CONSTINIT
-    PROTOBUF_ATTRIBUTE_INIT_PRIORITY1 StartConsoleRequestDefaultTypeInternal _StartConsoleRequest_default_instance_;
-
-inline constexpr ParameterInformation::Impl_::Impl_(
-    ::_pbi::ConstantInitialized) noexcept
-      : _cached_size_{0},
-        label_(
-            &::google::protobuf::internal::fixed_address_empty_string,
-            ::_pbi::ConstantInitialized()),
-        documentation_{nullptr} {}
-
-template <typename>
-PROTOBUF_CONSTEXPR ParameterInformation::ParameterInformation(::_pbi::ConstantInitialized)
-    : _impl_(::_pbi::ConstantInitialized()) {}
-struct ParameterInformationDefaultTypeInternal {
-  PROTOBUF_CONSTEXPR ParameterInformationDefaultTypeInternal() : _instance(::_pbi::ConstantInitialized{}) {}
-  ~ParameterInformationDefaultTypeInternal() {}
-  union {
-    ParameterInformation _instance;
-  };
-};
-
-PROTOBUF_ATTRIBUTE_NO_DESTROY PROTOBUF_CONSTINIT
-    PROTOBUF_ATTRIBUTE_INIT_PRIORITY1 ParameterInformationDefaultTypeInternal _ParameterInformation_default_instance_;
-
-inline constexpr OpenDocumentRequest::Impl_::Impl_(
-    ::_pbi::ConstantInitialized) noexcept
-      : _cached_size_{0},
-        console_id_{nullptr},
-        text_document_{nullptr} {}
-
-template <typename>
-PROTOBUF_CONSTEXPR OpenDocumentRequest::OpenDocumentRequest(::_pbi::ConstantInitialized)
-    : _impl_(::_pbi::ConstantInitialized()) {}
-struct OpenDocumentRequestDefaultTypeInternal {
-  PROTOBUF_CONSTEXPR OpenDocumentRequestDefaultTypeInternal() : _instance(::_pbi::ConstantInitialized{}) {}
-  ~OpenDocumentRequestDefaultTypeInternal() {}
-  union {
-    OpenDocumentRequest _instance;
-  };
-};
-
-PROTOBUF_ATTRIBUTE_NO_DESTROY PROTOBUF_CONSTINIT
-    PROTOBUF_ATTRIBUTE_INIT_PRIORITY1 OpenDocumentRequestDefaultTypeInternal _OpenDocumentRequest_default_instance_;
-
-inline constexpr GetHoverRequest::Impl_::Impl_(
-    ::_pbi::ConstantInitialized) noexcept
-      : _cached_size_{0},
-        text_document_{nullptr},
-        position_{nullptr} {}
-
-template <typename>
-PROTOBUF_CONSTEXPR GetHoverRequest::GetHoverRequest(::_pbi::ConstantInitialized)
-    : _impl_(::_pbi::ConstantInitialized()) {}
-struct GetHoverRequestDefaultTypeInternal {
-  PROTOBUF_CONSTEXPR GetHoverRequestDefaultTypeInternal() : _instance(::_pbi::ConstantInitialized{}) {}
-  ~GetHoverRequestDefaultTypeInternal() {}
-  union {
-    GetHoverRequest _instance;
-  };
-};
-
-PROTOBUF_ATTRIBUTE_NO_DESTROY PROTOBUF_CONSTINIT
-    PROTOBUF_ATTRIBUTE_INIT_PRIORITY1 GetHoverRequestDefaultTypeInternal _GetHoverRequest_default_instance_;
-
-inline constexpr GetDiagnosticRequest::Impl_::Impl_(
-    ::_pbi::ConstantInitialized) noexcept
-      : _cached_size_{0},
-        identifier_(
-            &::google::protobuf::internal::fixed_address_empty_string,
-            ::_pbi::ConstantInitialized()),
-        previous_result_id_(
-            &::google::protobuf::internal::fixed_address_empty_string,
-            ::_pbi::ConstantInitialized()),
-        text_document_{nullptr} {}
-
-template <typename>
-PROTOBUF_CONSTEXPR GetDiagnosticRequest::GetDiagnosticRequest(::_pbi::ConstantInitialized)
-    : _impl_(::_pbi::ConstantInitialized()) {}
-struct GetDiagnosticRequestDefaultTypeInternal {
-  PROTOBUF_CONSTEXPR GetDiagnosticRequestDefaultTypeInternal() : _instance(::_pbi::ConstantInitialized{}) {}
-  ~GetDiagnosticRequestDefaultTypeInternal() {}
-  union {
-    GetDiagnosticRequest _instance;
-  };
-};
-
-PROTOBUF_ATTRIBUTE_NO_DESTROY PROTOBUF_CONSTINIT
-    PROTOBUF_ATTRIBUTE_INIT_PRIORITY1 GetDiagnosticRequestDefaultTypeInternal _GetDiagnosticRequest_default_instance_;
-
-inline constexpr GetCompletionItemsRequest::Impl_::Impl_(
-    ::_pbi::ConstantInitialized) noexcept
-      : _cached_size_{0},
-        console_id_{nullptr},
-        context_{nullptr},
-        text_document_{nullptr},
-        position_{nullptr},
-        request_id_{0} {}
-
-template <typename>
-PROTOBUF_CONSTEXPR GetCompletionItemsRequest::GetCompletionItemsRequest(::_pbi::ConstantInitialized)
-    : _impl_(::_pbi::ConstantInitialized()) {}
-struct GetCompletionItemsRequestDefaultTypeInternal {
-  PROTOBUF_CONSTEXPR GetCompletionItemsRequestDefaultTypeInternal() : _instance(::_pbi::ConstantInitialized{}) {}
-  ~GetCompletionItemsRequestDefaultTypeInternal() {}
-  union {
-    GetCompletionItemsRequest _instance;
-  };
-};
-
-PROTOBUF_ATTRIBUTE_NO_DESTROY PROTOBUF_CONSTINIT
-    PROTOBUF_ATTRIBUTE_INIT_PRIORITY1 GetCompletionItemsRequestDefaultTypeInternal _GetCompletionItemsRequest_default_instance_;
-
-inline constexpr FigureDescriptor_SourceDescriptor::Impl_::Impl_(
-    ::_pbi::ConstantInitialized) noexcept
-      : _cached_size_{0},
-        axis_id_(
-            &::google::protobuf::internal::fixed_address_empty_string,
-            ::_pbi::ConstantInitialized()),
-        column_name_(
-            &::google::protobuf::internal::fixed_address_empty_string,
-            ::_pbi::ConstantInitialized()),
-        column_type_(
-            &::google::protobuf::internal::fixed_address_empty_string,
-            ::_pbi::ConstantInitialized()),
-        one_click_{nullptr},
-        type_{static_cast< ::io::deephaven::proto::backplane::script::grpc::FigureDescriptor_SourceType >(0)},
-        table_id_{0},
-        partitioned_table_id_{0} {}
-
-template <typename>
-PROTOBUF_CONSTEXPR FigureDescriptor_SourceDescriptor::FigureDescriptor_SourceDescriptor(::_pbi::ConstantInitialized)
-    : _impl_(::_pbi::ConstantInitialized()) {}
-struct FigureDescriptor_SourceDescriptorDefaultTypeInternal {
-  PROTOBUF_CONSTEXPR FigureDescriptor_SourceDescriptorDefaultTypeInternal() : _instance(::_pbi::ConstantInitialized{}) {}
-  ~FigureDescriptor_SourceDescriptorDefaultTypeInternal() {}
-  union {
-    FigureDescriptor_SourceDescriptor _instance;
-  };
-};
-
-PROTOBUF_ATTRIBUTE_NO_DESTROY PROTOBUF_CONSTINIT
-    PROTOBUF_ATTRIBUTE_INIT_PRIORITY1 FigureDescriptor_SourceDescriptorDefaultTypeInternal _FigureDescriptor_SourceDescriptor_default_instance_;
-
-inline constexpr FigureDescriptor_MultiSeriesDescriptor::Impl_::Impl_(
-    ::_pbi::ConstantInitialized) noexcept
-      : _cached_size_{0},
-        data_sources_{},
-        name_(
-            &::google::protobuf::internal::fixed_address_empty_string,
-            ::_pbi::ConstantInitialized()),
-        line_color_{nullptr},
-        point_color_{nullptr},
-        lines_visible_{nullptr},
-        points_visible_{nullptr},
-        gradient_visible_{nullptr},
-        point_label_format_{nullptr},
-        x_tool_tip_pattern_{nullptr},
-        y_tool_tip_pattern_{nullptr},
-        point_label_{nullptr},
-        point_size_{nullptr},
-        point_shape_{nullptr},
-        plot_style_{static_cast< ::io::deephaven::proto::backplane::script::grpc::FigureDescriptor_SeriesPlotStyle >(0)} {}
-
-template <typename>
-PROTOBUF_CONSTEXPR FigureDescriptor_MultiSeriesDescriptor::FigureDescriptor_MultiSeriesDescriptor(::_pbi::ConstantInitialized)
-    : _impl_(::_pbi::ConstantInitialized()) {}
-struct FigureDescriptor_MultiSeriesDescriptorDefaultTypeInternal {
-  PROTOBUF_CONSTEXPR FigureDescriptor_MultiSeriesDescriptorDefaultTypeInternal() : _instance(::_pbi::ConstantInitialized{}) {}
-  ~FigureDescriptor_MultiSeriesDescriptorDefaultTypeInternal() {}
-  union {
-    FigureDescriptor_MultiSeriesDescriptor _instance;
-  };
-};
-
-PROTOBUF_ATTRIBUTE_NO_DESTROY PROTOBUF_CONSTINIT
-    PROTOBUF_ATTRIBUTE_INIT_PRIORITY1 FigureDescriptor_MultiSeriesDescriptorDefaultTypeInternal _FigureDescriptor_MultiSeriesDescriptor_default_instance_;
-
-inline constexpr FigureDescriptor_BusinessCalendarDescriptor_Holiday::Impl_::Impl_(
-    ::_pbi::ConstantInitialized) noexcept
-      : _cached_size_{0},
-        business_periods_{},
-        date_{nullptr} {}
-
-template <typename>
-PROTOBUF_CONSTEXPR FigureDescriptor_BusinessCalendarDescriptor_Holiday::FigureDescriptor_BusinessCalendarDescriptor_Holiday(::_pbi::ConstantInitialized)
-    : _impl_(::_pbi::ConstantInitialized()) {}
-struct FigureDescriptor_BusinessCalendarDescriptor_HolidayDefaultTypeInternal {
-  PROTOBUF_CONSTEXPR FigureDescriptor_BusinessCalendarDescriptor_HolidayDefaultTypeInternal() : _instance(::_pbi::ConstantInitialized{}) {}
-  ~FigureDescriptor_BusinessCalendarDescriptor_HolidayDefaultTypeInternal() {}
-  union {
-    FigureDescriptor_BusinessCalendarDescriptor_Holiday _instance;
-  };
-};
-
-PROTOBUF_ATTRIBUTE_NO_DESTROY PROTOBUF_CONSTINIT
-    PROTOBUF_ATTRIBUTE_INIT_PRIORITY1 FigureDescriptor_BusinessCalendarDescriptor_HolidayDefaultTypeInternal _FigureDescriptor_BusinessCalendarDescriptor_Holiday_default_instance_;
-
-inline constexpr ExecuteCommandRequest::Impl_::Impl_(
-    ::_pbi::ConstantInitialized) noexcept
-      : _cached_size_{0},
-        code_(
-            &::google::protobuf::internal::fixed_address_empty_string,
-            ::_pbi::ConstantInitialized()),
-        console_id_{nullptr} {}
-
-template <typename>
-PROTOBUF_CONSTEXPR ExecuteCommandRequest::ExecuteCommandRequest(::_pbi::ConstantInitialized)
-    : _impl_(::_pbi::ConstantInitialized()) {}
-struct ExecuteCommandRequestDefaultTypeInternal {
-  PROTOBUF_CONSTEXPR ExecuteCommandRequestDefaultTypeInternal() : _instance(::_pbi::ConstantInitialized{}) {}
-  ~ExecuteCommandRequestDefaultTypeInternal() {}
-  union {
-    ExecuteCommandRequest _instance;
-  };
-};
-
-PROTOBUF_ATTRIBUTE_NO_DESTROY PROTOBUF_CONSTINIT
-    PROTOBUF_ATTRIBUTE_INIT_PRIORITY1 ExecuteCommandRequestDefaultTypeInternal _ExecuteCommandRequest_default_instance_;
-
-inline constexpr DocumentRange::Impl_::Impl_(
-    ::_pbi::ConstantInitialized) noexcept
-      : _cached_size_{0},
-        start_{nullptr},
-        end_{nullptr} {}
-
-template <typename>
-PROTOBUF_CONSTEXPR DocumentRange::DocumentRange(::_pbi::ConstantInitialized)
-    : _impl_(::_pbi::ConstantInitialized()) {}
-struct DocumentRangeDefaultTypeInternal {
-  PROTOBUF_CONSTEXPR DocumentRangeDefaultTypeInternal() : _instance(::_pbi::ConstantInitialized{}) {}
-  ~DocumentRangeDefaultTypeInternal() {}
-  union {
-    DocumentRange _instance;
-  };
-};
-
-PROTOBUF_ATTRIBUTE_NO_DESTROY PROTOBUF_CONSTINIT
-    PROTOBUF_ATTRIBUTE_INIT_PRIORITY1 DocumentRangeDefaultTypeInternal _DocumentRange_default_instance_;
-
-inline constexpr CloseDocumentRequest::Impl_::Impl_(
-    ::_pbi::ConstantInitialized) noexcept
-      : _cached_size_{0},
-        console_id_{nullptr},
-        text_document_{nullptr} {}
-
-template <typename>
-PROTOBUF_CONSTEXPR CloseDocumentRequest::CloseDocumentRequest(::_pbi::ConstantInitialized)
-    : _impl_(::_pbi::ConstantInitialized()) {}
-struct CloseDocumentRequestDefaultTypeInternal {
-  PROTOBUF_CONSTEXPR CloseDocumentRequestDefaultTypeInternal() : _instance(::_pbi::ConstantInitialized{}) {}
-  ~CloseDocumentRequestDefaultTypeInternal() {}
-  union {
-    CloseDocumentRequest _instance;
-  };
-};
-
-PROTOBUF_ATTRIBUTE_NO_DESTROY PROTOBUF_CONSTINIT
-    PROTOBUF_ATTRIBUTE_INIT_PRIORITY1 CloseDocumentRequestDefaultTypeInternal _CloseDocumentRequest_default_instance_;
-
-inline constexpr CancelCommandRequest::Impl_::Impl_(
-    ::_pbi::ConstantInitialized) noexcept
-      : _cached_size_{0},
-        console_id_{nullptr},
-        command_id_{nullptr} {}
-
-template <typename>
-PROTOBUF_CONSTEXPR CancelCommandRequest::CancelCommandRequest(::_pbi::ConstantInitialized)
-    : _impl_(::_pbi::ConstantInitialized()) {}
-struct CancelCommandRequestDefaultTypeInternal {
-  PROTOBUF_CONSTEXPR CancelCommandRequestDefaultTypeInternal() : _instance(::_pbi::ConstantInitialized{}) {}
-  ~CancelCommandRequestDefaultTypeInternal() {}
-  union {
-    CancelCommandRequest _instance;
-  };
-};
-
-PROTOBUF_ATTRIBUTE_NO_DESTROY PROTOBUF_CONSTINIT
-    PROTOBUF_ATTRIBUTE_INIT_PRIORITY1 CancelCommandRequestDefaultTypeInternal _CancelCommandRequest_default_instance_;
-
-inline constexpr CancelAutoCompleteRequest::Impl_::Impl_(
-    ::_pbi::ConstantInitialized) noexcept
-      : _cached_size_{0},
-        console_id_{nullptr},
-        request_id_{0} {}
-
-template <typename>
-PROTOBUF_CONSTEXPR CancelAutoCompleteRequest::CancelAutoCompleteRequest(::_pbi::ConstantInitialized)
-    : _impl_(::_pbi::ConstantInitialized()) {}
-struct CancelAutoCompleteRequestDefaultTypeInternal {
-  PROTOBUF_CONSTEXPR CancelAutoCompleteRequestDefaultTypeInternal() : _instance(::_pbi::ConstantInitialized{}) {}
-  ~CancelAutoCompleteRequestDefaultTypeInternal() {}
-  union {
-    CancelAutoCompleteRequest _instance;
-  };
-};
-
-PROTOBUF_ATTRIBUTE_NO_DESTROY PROTOBUF_CONSTINIT
-    PROTOBUF_ATTRIBUTE_INIT_PRIORITY1 CancelAutoCompleteRequestDefaultTypeInternal _CancelAutoCompleteRequest_default_instance_;
-
-inline constexpr BindTableToVariableRequest::Impl_::Impl_(
-    ::_pbi::ConstantInitialized) noexcept
-      : _cached_size_{0},
-        variable_name_(
-            &::google::protobuf::internal::fixed_address_empty_string,
-            ::_pbi::ConstantInitialized()),
-        console_id_{nullptr},
-        table_id_{nullptr} {}
-
-template <typename>
-PROTOBUF_CONSTEXPR BindTableToVariableRequest::BindTableToVariableRequest(::_pbi::ConstantInitialized)
-    : _impl_(::_pbi::ConstantInitialized()) {}
-struct BindTableToVariableRequestDefaultTypeInternal {
-  PROTOBUF_CONSTEXPR BindTableToVariableRequestDefaultTypeInternal() : _instance(::_pbi::ConstantInitialized{}) {}
-  ~BindTableToVariableRequestDefaultTypeInternal() {}
-  union {
-    BindTableToVariableRequest _instance;
-  };
-};
-
-PROTOBUF_ATTRIBUTE_NO_DESTROY PROTOBUF_CONSTINIT
-    PROTOBUF_ATTRIBUTE_INIT_PRIORITY1 BindTableToVariableRequestDefaultTypeInternal _BindTableToVariableRequest_default_instance_;
-
-inline constexpr TextEdit::Impl_::Impl_(
-    ::_pbi::ConstantInitialized) noexcept
-      : _cached_size_{0},
-        text_(
-            &::google::protobuf::internal::fixed_address_empty_string,
-            ::_pbi::ConstantInitialized()),
-        range_{nullptr} {}
-
-template <typename>
-PROTOBUF_CONSTEXPR TextEdit::TextEdit(::_pbi::ConstantInitialized)
-    : _impl_(::_pbi::ConstantInitialized()) {}
-struct TextEditDefaultTypeInternal {
-  PROTOBUF_CONSTEXPR TextEditDefaultTypeInternal() : _instance(::_pbi::ConstantInitialized{}) {}
-  ~TextEditDefaultTypeInternal() {}
-  union {
-    TextEdit _instance;
-  };
-};
-
-PROTOBUF_ATTRIBUTE_NO_DESTROY PROTOBUF_CONSTINIT
-    PROTOBUF_ATTRIBUTE_INIT_PRIORITY1 TextEditDefaultTypeInternal _TextEdit_default_instance_;
-
-inline constexpr SignatureInformation::Impl_::Impl_(
-    ::_pbi::ConstantInitialized) noexcept
-      : _cached_size_{0},
-        parameters_{},
-        label_(
-            &::google::protobuf::internal::fixed_address_empty_string,
-            ::_pbi::ConstantInitialized()),
-        documentation_{nullptr},
-        active_parameter_{0} {}
-
-template <typename>
-PROTOBUF_CONSTEXPR SignatureInformation::SignatureInformation(::_pbi::ConstantInitialized)
-    : _impl_(::_pbi::ConstantInitialized()) {}
-struct SignatureInformationDefaultTypeInternal {
-  PROTOBUF_CONSTEXPR SignatureInformationDefaultTypeInternal() : _instance(::_pbi::ConstantInitialized{}) {}
-  ~SignatureInformationDefaultTypeInternal() {}
-  union {
-    SignatureInformation _instance;
-  };
-};
-
-PROTOBUF_ATTRIBUTE_NO_DESTROY PROTOBUF_CONSTINIT
-    PROTOBUF_ATTRIBUTE_INIT_PRIORITY1 SignatureInformationDefaultTypeInternal _SignatureInformation_default_instance_;
-
-inline constexpr GetHoverResponse::Impl_::Impl_(
-    ::_pbi::ConstantInitialized) noexcept
-      : _cached_size_{0},
-        contents_{nullptr},
-        range_{nullptr} {}
-
-template <typename>
-PROTOBUF_CONSTEXPR GetHoverResponse::GetHoverResponse(::_pbi::ConstantInitialized)
-    : _impl_(::_pbi::ConstantInitialized()) {}
-struct GetHoverResponseDefaultTypeInternal {
-  PROTOBUF_CONSTEXPR GetHoverResponseDefaultTypeInternal() : _instance(::_pbi::ConstantInitialized{}) {}
-  ~GetHoverResponseDefaultTypeInternal() {}
-  union {
-    GetHoverResponse _instance;
-  };
-};
-
-PROTOBUF_ATTRIBUTE_NO_DESTROY PROTOBUF_CONSTINIT
-    PROTOBUF_ATTRIBUTE_INIT_PRIORITY1 GetHoverResponseDefaultTypeInternal _GetHoverResponse_default_instance_;
-
-inline constexpr FigureDescriptor_SeriesDescriptor::Impl_::Impl_(
-    ::_pbi::ConstantInitialized) noexcept
-      : _cached_size_{0},
-        data_sources_{},
-        name_(
-            &::google::protobuf::internal::fixed_address_empty_string,
-            ::_pbi::ConstantInitialized()),
-        line_color_(
-            &::google::protobuf::internal::fixed_address_empty_string,
-            ::_pbi::ConstantInitialized()),
-        point_label_format_(
-            &::google::protobuf::internal::fixed_address_empty_string,
-            ::_pbi::ConstantInitialized()),
-        x_tool_tip_pattern_(
-            &::google::protobuf::internal::fixed_address_empty_string,
-            ::_pbi::ConstantInitialized()),
-        y_tool_tip_pattern_(
-            &::google::protobuf::internal::fixed_address_empty_string,
-            ::_pbi::ConstantInitialized()),
-        shape_label_(
-            &::google::protobuf::internal::fixed_address_empty_string,
-            ::_pbi::ConstantInitialized()),
-        shape_color_(
-            &::google::protobuf::internal::fixed_address_empty_string,
-            ::_pbi::ConstantInitialized()),
-        shape_(
-            &::google::protobuf::internal::fixed_address_empty_string,
-            ::_pbi::ConstantInitialized()),
-        plot_style_{static_cast< ::io::deephaven::proto::backplane::script::grpc::FigureDescriptor_SeriesPlotStyle >(0)},
-        lines_visible_{false},
-        shapes_visible_{false},
-        gradient_visible_{false},
-        shape_size_{0} {}
-
-template <typename>
-PROTOBUF_CONSTEXPR FigureDescriptor_SeriesDescriptor::FigureDescriptor_SeriesDescriptor(::_pbi::ConstantInitialized)
-    : _impl_(::_pbi::ConstantInitialized()) {}
-struct FigureDescriptor_SeriesDescriptorDefaultTypeInternal {
-  PROTOBUF_CONSTEXPR FigureDescriptor_SeriesDescriptorDefaultTypeInternal() : _instance(::_pbi::ConstantInitialized{}) {}
-  ~FigureDescriptor_SeriesDescriptorDefaultTypeInternal() {}
-  union {
-    FigureDescriptor_SeriesDescriptor _instance;
-  };
-};
-
-PROTOBUF_ATTRIBUTE_NO_DESTROY PROTOBUF_CONSTINIT
-    PROTOBUF_ATTRIBUTE_INIT_PRIORITY1 FigureDescriptor_SeriesDescriptorDefaultTypeInternal _FigureDescriptor_SeriesDescriptor_default_instance_;
-
-inline constexpr FigureDescriptor_BusinessCalendarDescriptor::Impl_::Impl_(
-    ::_pbi::ConstantInitialized) noexcept
-      : business_days_{},
-        _business_days_cached_byte_size_{0},
-        business_periods_{},
-        holidays_{},
-        name_(
-            &::google::protobuf::internal::fixed_address_empty_string,
-            ::_pbi::ConstantInitialized()),
-        time_zone_(
-            &::google::protobuf::internal::fixed_address_empty_string,
-            ::_pbi::ConstantInitialized()),
-        _cached_size_{0} {}
-
-template <typename>
-PROTOBUF_CONSTEXPR FigureDescriptor_BusinessCalendarDescriptor::FigureDescriptor_BusinessCalendarDescriptor(::_pbi::ConstantInitialized)
-    : _impl_(::_pbi::ConstantInitialized()) {}
-struct FigureDescriptor_BusinessCalendarDescriptorDefaultTypeInternal {
-  PROTOBUF_CONSTEXPR FigureDescriptor_BusinessCalendarDescriptorDefaultTypeInternal() : _instance(::_pbi::ConstantInitialized{}) {}
-  ~FigureDescriptor_BusinessCalendarDescriptorDefaultTypeInternal() {}
-  union {
-    FigureDescriptor_BusinessCalendarDescriptor _instance;
-  };
-};
-
-PROTOBUF_ATTRIBUTE_NO_DESTROY PROTOBUF_CONSTINIT
-    PROTOBUF_ATTRIBUTE_INIT_PRIORITY1 FigureDescriptor_BusinessCalendarDescriptorDefaultTypeInternal _FigureDescriptor_BusinessCalendarDescriptor_default_instance_;
-
-inline constexpr Diagnostic::Impl_::Impl_(
-    ::_pbi::ConstantInitialized) noexcept
-      : _cached_size_{0},
-        tags_{},
-        _tags_cached_byte_size_{0},
-        code_(
-            &::google::protobuf::internal::fixed_address_empty_string,
-            ::_pbi::ConstantInitialized()),
-        source_(
-            &::google::protobuf::internal::fixed_address_empty_string,
-            ::_pbi::ConstantInitialized()),
-        message_(
-            &::google::protobuf::internal::fixed_address_empty_string,
-            ::_pbi::ConstantInitialized()),
-        data_(
-            &::google::protobuf::internal::fixed_address_empty_string,
-            ::_pbi::ConstantInitialized()),
-        range_{nullptr},
-        code_description_{nullptr},
-        severity_{static_cast< ::io::deephaven::proto::backplane::script::grpc::Diagnostic_DiagnosticSeverity >(0)} {}
-
-template <typename>
-PROTOBUF_CONSTEXPR Diagnostic::Diagnostic(::_pbi::ConstantInitialized)
-    : _impl_(::_pbi::ConstantInitialized()) {}
-struct DiagnosticDefaultTypeInternal {
-  PROTOBUF_CONSTEXPR DiagnosticDefaultTypeInternal() : _instance(::_pbi::ConstantInitialized{}) {}
-  ~DiagnosticDefaultTypeInternal() {}
-  union {
-    Diagnostic _instance;
-  };
-};
-
-PROTOBUF_ATTRIBUTE_NO_DESTROY PROTOBUF_CONSTINIT
-    PROTOBUF_ATTRIBUTE_INIT_PRIORITY1 DiagnosticDefaultTypeInternal _Diagnostic_default_instance_;
-
-inline constexpr ChangeDocumentRequest_TextDocumentContentChangeEvent::Impl_::Impl_(
-    ::_pbi::ConstantInitialized) noexcept
-      : _cached_size_{0},
-        text_(
-            &::google::protobuf::internal::fixed_address_empty_string,
-            ::_pbi::ConstantInitialized()),
-        range_{nullptr},
-        range_length_{0} {}
-
-template <typename>
-PROTOBUF_CONSTEXPR ChangeDocumentRequest_TextDocumentContentChangeEvent::ChangeDocumentRequest_TextDocumentContentChangeEvent(::_pbi::ConstantInitialized)
-    : _impl_(::_pbi::ConstantInitialized()) {}
-struct ChangeDocumentRequest_TextDocumentContentChangeEventDefaultTypeInternal {
-  PROTOBUF_CONSTEXPR ChangeDocumentRequest_TextDocumentContentChangeEventDefaultTypeInternal() : _instance(::_pbi::ConstantInitialized{}) {}
-  ~ChangeDocumentRequest_TextDocumentContentChangeEventDefaultTypeInternal() {}
-  union {
-    ChangeDocumentRequest_TextDocumentContentChangeEvent _instance;
-  };
-};
-
-PROTOBUF_ATTRIBUTE_NO_DESTROY PROTOBUF_CONSTINIT
-    PROTOBUF_ATTRIBUTE_INIT_PRIORITY1 ChangeDocumentRequest_TextDocumentContentChangeEventDefaultTypeInternal _ChangeDocumentRequest_TextDocumentContentChangeEvent_default_instance_;
-
-inline constexpr GetSignatureHelpResponse::Impl_::Impl_(
-    ::_pbi::ConstantInitialized) noexcept
-      : _cached_size_{0},
-        signatures_{},
-        active_signature_{0},
-        active_parameter_{0} {}
-
-template <typename>
-PROTOBUF_CONSTEXPR GetSignatureHelpResponse::GetSignatureHelpResponse(::_pbi::ConstantInitialized)
-    : _impl_(::_pbi::ConstantInitialized()) {}
-struct GetSignatureHelpResponseDefaultTypeInternal {
-  PROTOBUF_CONSTEXPR GetSignatureHelpResponseDefaultTypeInternal() : _instance(::_pbi::ConstantInitialized{}) {}
-  ~GetSignatureHelpResponseDefaultTypeInternal() {}
-  union {
-    GetSignatureHelpResponse _instance;
-  };
-};
-
-PROTOBUF_ATTRIBUTE_NO_DESTROY PROTOBUF_CONSTINIT
-    PROTOBUF_ATTRIBUTE_INIT_PRIORITY1 GetSignatureHelpResponseDefaultTypeInternal _GetSignatureHelpResponse_default_instance_;
-
-inline constexpr GetPullDiagnosticResponse::Impl_::Impl_(
-    ::_pbi::ConstantInitialized) noexcept
-      : _cached_size_{0},
-        items_{},
-        kind_(
-            &::google::protobuf::internal::fixed_address_empty_string,
-            ::_pbi::ConstantInitialized()),
-        result_id_(
-            &::google::protobuf::internal::fixed_address_empty_string,
-            ::_pbi::ConstantInitialized()) {}
-
-template <typename>
-PROTOBUF_CONSTEXPR GetPullDiagnosticResponse::GetPullDiagnosticResponse(::_pbi::ConstantInitialized)
-    : _impl_(::_pbi::ConstantInitialized()) {}
-struct GetPullDiagnosticResponseDefaultTypeInternal {
-  PROTOBUF_CONSTEXPR GetPullDiagnosticResponseDefaultTypeInternal() : _instance(::_pbi::ConstantInitialized{}) {}
-  ~GetPullDiagnosticResponseDefaultTypeInternal() {}
-  union {
-    GetPullDiagnosticResponse _instance;
-  };
-};
-
-PROTOBUF_ATTRIBUTE_NO_DESTROY PROTOBUF_CONSTINIT
-    PROTOBUF_ATTRIBUTE_INIT_PRIORITY1 GetPullDiagnosticResponseDefaultTypeInternal _GetPullDiagnosticResponse_default_instance_;
-
-inline constexpr GetPublishDiagnosticResponse::Impl_::Impl_(
-    ::_pbi::ConstantInitialized) noexcept
-      : _cached_size_{0},
-        diagnostics_{},
-        uri_(
-            &::google::protobuf::internal::fixed_address_empty_string,
-            ::_pbi::ConstantInitialized()),
-        version_{0} {}
-
-template <typename>
-PROTOBUF_CONSTEXPR GetPublishDiagnosticResponse::GetPublishDiagnosticResponse(::_pbi::ConstantInitialized)
-    : _impl_(::_pbi::ConstantInitialized()) {}
-struct GetPublishDiagnosticResponseDefaultTypeInternal {
-  PROTOBUF_CONSTEXPR GetPublishDiagnosticResponseDefaultTypeInternal() : _instance(::_pbi::ConstantInitialized{}) {}
-  ~GetPublishDiagnosticResponseDefaultTypeInternal() {}
-  union {
-    GetPublishDiagnosticResponse _instance;
-  };
-};
-
-PROTOBUF_ATTRIBUTE_NO_DESTROY PROTOBUF_CONSTINIT
-    PROTOBUF_ATTRIBUTE_INIT_PRIORITY1 GetPublishDiagnosticResponseDefaultTypeInternal _GetPublishDiagnosticResponse_default_instance_;
-
-inline constexpr FigureDescriptor_AxisDescriptor::Impl_::Impl_(
-    ::_pbi::ConstantInitialized) noexcept
-      : _cached_size_{0},
-        major_tick_locations_{},
-        id_(
-            &::google::protobuf::internal::fixed_address_empty_string,
-            ::_pbi::ConstantInitialized()),
-        label_(
-            &::google::protobuf::internal::fixed_address_empty_string,
-            ::_pbi::ConstantInitialized()),
-        label_font_(
-            &::google::protobuf::internal::fixed_address_empty_string,
-            ::_pbi::ConstantInitialized()),
-        ticks_font_(
-            &::google::protobuf::internal::fixed_address_empty_string,
-            ::_pbi::ConstantInitialized()),
-        format_pattern_(
-            &::google::protobuf::internal::fixed_address_empty_string,
-            ::_pbi::ConstantInitialized()),
-        color_(
-            &::google::protobuf::internal::fixed_address_empty_string,
-            ::_pbi::ConstantInitialized()),
-        business_calendar_descriptor_{nullptr},
-        format_type_{static_cast< ::io::deephaven::proto::backplane::script::grpc::FigureDescriptor_AxisDescriptor_AxisFormatType >(0)},
-        type_{static_cast< ::io::deephaven::proto::backplane::script::grpc::FigureDescriptor_AxisDescriptor_AxisType >(0)},
-        min_range_{0},
-        position_{static_cast< ::io::deephaven::proto::backplane::script::grpc::FigureDescriptor_AxisDescriptor_AxisPosition >(0)},
-        log_{false},
-        minor_ticks_visible_{false},
-        major_ticks_visible_{false},
-        invert_{false},
-        max_range_{0},
-        gap_between_major_ticks_{0},
-        minor_tick_count_{0},
-        is_time_axis_{false},
-        tick_label_angle_{0} {}
-
-template <typename>
-PROTOBUF_CONSTEXPR FigureDescriptor_AxisDescriptor::FigureDescriptor_AxisDescriptor(::_pbi::ConstantInitialized)
-    : _impl_(::_pbi::ConstantInitialized()) {}
-struct FigureDescriptor_AxisDescriptorDefaultTypeInternal {
-  PROTOBUF_CONSTEXPR FigureDescriptor_AxisDescriptorDefaultTypeInternal() : _instance(::_pbi::ConstantInitialized{}) {}
-  ~FigureDescriptor_AxisDescriptorDefaultTypeInternal() {}
-  union {
-    FigureDescriptor_AxisDescriptor _instance;
-  };
-};
-
-PROTOBUF_ATTRIBUTE_NO_DESTROY PROTOBUF_CONSTINIT
-    PROTOBUF_ATTRIBUTE_INIT_PRIORITY1 FigureDescriptor_AxisDescriptorDefaultTypeInternal _FigureDescriptor_AxisDescriptor_default_instance_;
-
-inline constexpr CompletionItem::Impl_::Impl_(
-    ::_pbi::ConstantInitialized) noexcept
-      : _cached_size_{0},
-        additional_text_edits_{},
-        commit_characters_{},
-        label_(
-            &::google::protobuf::internal::fixed_address_empty_string,
-            ::_pbi::ConstantInitialized()),
-        detail_(
-            &::google::protobuf::internal::fixed_address_empty_string,
-            ::_pbi::ConstantInitialized()),
-        sort_text_(
-            &::google::protobuf::internal::fixed_address_empty_string,
-            ::_pbi::ConstantInitialized()),
-        filter_text_(
-            &::google::protobuf::internal::fixed_address_empty_string,
-            ::_pbi::ConstantInitialized()),
-        text_edit_{nullptr},
-        documentation_{nullptr},
-        start_{0},
-        length_{0},
-        kind_{0},
-        deprecated_{false},
-        preselect_{false},
-        insert_text_format_{0} {}
-
-template <typename>
-PROTOBUF_CONSTEXPR CompletionItem::CompletionItem(::_pbi::ConstantInitialized)
-    : _impl_(::_pbi::ConstantInitialized()) {}
-struct CompletionItemDefaultTypeInternal {
-  PROTOBUF_CONSTEXPR CompletionItemDefaultTypeInternal() : _instance(::_pbi::ConstantInitialized{}) {}
-  ~CompletionItemDefaultTypeInternal() {}
-  union {
-    CompletionItem _instance;
-  };
-};
-
-PROTOBUF_ATTRIBUTE_NO_DESTROY PROTOBUF_CONSTINIT
-    PROTOBUF_ATTRIBUTE_INIT_PRIORITY1 CompletionItemDefaultTypeInternal _CompletionItem_default_instance_;
-
-inline constexpr ChangeDocumentRequest::Impl_::Impl_(
-    ::_pbi::ConstantInitialized) noexcept
-      : _cached_size_{0},
-        content_changes_{},
-        console_id_{nullptr},
-        text_document_{nullptr} {}
-
-template <typename>
-PROTOBUF_CONSTEXPR ChangeDocumentRequest::ChangeDocumentRequest(::_pbi::ConstantInitialized)
-    : _impl_(::_pbi::ConstantInitialized()) {}
-struct ChangeDocumentRequestDefaultTypeInternal {
-  PROTOBUF_CONSTEXPR ChangeDocumentRequestDefaultTypeInternal() : _instance(::_pbi::ConstantInitialized{}) {}
-  ~ChangeDocumentRequestDefaultTypeInternal() {}
-  union {
-    ChangeDocumentRequest _instance;
-  };
-};
-
-PROTOBUF_ATTRIBUTE_NO_DESTROY PROTOBUF_CONSTINIT
-    PROTOBUF_ATTRIBUTE_INIT_PRIORITY1 ChangeDocumentRequestDefaultTypeInternal _ChangeDocumentRequest_default_instance_;
-
-inline constexpr SignatureHelpContext::Impl_::Impl_(
-    ::_pbi::ConstantInitialized) noexcept
-      : _cached_size_{0},
-        trigger_character_(
-            &::google::protobuf::internal::fixed_address_empty_string,
-            ::_pbi::ConstantInitialized()),
-        active_signature_help_{nullptr},
-        trigger_kind_{0},
-        is_retrigger_{false} {}
-
-template <typename>
-PROTOBUF_CONSTEXPR SignatureHelpContext::SignatureHelpContext(::_pbi::ConstantInitialized)
-    : _impl_(::_pbi::ConstantInitialized()) {}
-struct SignatureHelpContextDefaultTypeInternal {
-  PROTOBUF_CONSTEXPR SignatureHelpContextDefaultTypeInternal() : _instance(::_pbi::ConstantInitialized{}) {}
-  ~SignatureHelpContextDefaultTypeInternal() {}
-  union {
-    SignatureHelpContext _instance;
-  };
-};
-
-PROTOBUF_ATTRIBUTE_NO_DESTROY PROTOBUF_CONSTINIT
-    PROTOBUF_ATTRIBUTE_INIT_PRIORITY1 SignatureHelpContextDefaultTypeInternal _SignatureHelpContext_default_instance_;
-
-inline constexpr GetCompletionItemsResponse::Impl_::Impl_(
-    ::_pbi::ConstantInitialized) noexcept
-      : items_{},
-        request_id_{0},
-        success_{false},
-        _cached_size_{0} {}
-
-template <typename>
-PROTOBUF_CONSTEXPR GetCompletionItemsResponse::GetCompletionItemsResponse(::_pbi::ConstantInitialized)
-    : _impl_(::_pbi::ConstantInitialized()) {}
-struct GetCompletionItemsResponseDefaultTypeInternal {
-  PROTOBUF_CONSTEXPR GetCompletionItemsResponseDefaultTypeInternal() : _instance(::_pbi::ConstantInitialized{}) {}
-  ~GetCompletionItemsResponseDefaultTypeInternal() {}
-  union {
-    GetCompletionItemsResponse _instance;
-  };
-};
-
-PROTOBUF_ATTRIBUTE_NO_DESTROY PROTOBUF_CONSTINIT
-    PROTOBUF_ATTRIBUTE_INIT_PRIORITY1 GetCompletionItemsResponseDefaultTypeInternal _GetCompletionItemsResponse_default_instance_;
-
-inline constexpr FigureDescriptor_ChartDescriptor::Impl_::Impl_(
-    ::_pbi::ConstantInitialized) noexcept
-      : _cached_size_{0},
-        series_{},
-        multi_series_{},
-        axes_{},
-        title_(
-            &::google::protobuf::internal::fixed_address_empty_string,
-            ::_pbi::ConstantInitialized()),
-        title_font_(
-            &::google::protobuf::internal::fixed_address_empty_string,
-            ::_pbi::ConstantInitialized()),
-        title_color_(
-            &::google::protobuf::internal::fixed_address_empty_string,
-            ::_pbi::ConstantInitialized()),
-        legend_font_(
-            &::google::protobuf::internal::fixed_address_empty_string,
-            ::_pbi::ConstantInitialized()),
-        legend_color_(
-            &::google::protobuf::internal::fixed_address_empty_string,
-            ::_pbi::ConstantInitialized()),
-        colspan_{0},
-        rowspan_{0},
-        chart_type_{static_cast< ::io::deephaven::proto::backplane::script::grpc::FigureDescriptor_ChartDescriptor_ChartType >(0)},
-        show_legend_{false},
-        is3d_{false},
-        column_{0},
-        row_{0} {}
-
-template <typename>
-PROTOBUF_CONSTEXPR FigureDescriptor_ChartDescriptor::FigureDescriptor_ChartDescriptor(::_pbi::ConstantInitialized)
-    : _impl_(::_pbi::ConstantInitialized()) {}
-struct FigureDescriptor_ChartDescriptorDefaultTypeInternal {
-  PROTOBUF_CONSTEXPR FigureDescriptor_ChartDescriptorDefaultTypeInternal() : _instance(::_pbi::ConstantInitialized{}) {}
-  ~FigureDescriptor_ChartDescriptorDefaultTypeInternal() {}
-  union {
-    FigureDescriptor_ChartDescriptor _instance;
-  };
-};
-
-PROTOBUF_ATTRIBUTE_NO_DESTROY PROTOBUF_CONSTINIT
-    PROTOBUF_ATTRIBUTE_INIT_PRIORITY1 FigureDescriptor_ChartDescriptorDefaultTypeInternal _FigureDescriptor_ChartDescriptor_default_instance_;
-
-inline constexpr ExecuteCommandResponse::Impl_::Impl_(
-    ::_pbi::ConstantInitialized) noexcept
-      : _cached_size_{0},
-        error_message_(
-            &::google::protobuf::internal::fixed_address_empty_string,
-            ::_pbi::ConstantInitialized()),
-        changes_{nullptr} {}
-
-template <typename>
-PROTOBUF_CONSTEXPR ExecuteCommandResponse::ExecuteCommandResponse(::_pbi::ConstantInitialized)
-    : _impl_(::_pbi::ConstantInitialized()) {}
-struct ExecuteCommandResponseDefaultTypeInternal {
-  PROTOBUF_CONSTEXPR ExecuteCommandResponseDefaultTypeInternal() : _instance(::_pbi::ConstantInitialized{}) {}
-  ~ExecuteCommandResponseDefaultTypeInternal() {}
-  union {
-    ExecuteCommandResponse _instance;
-  };
-};
-
-PROTOBUF_ATTRIBUTE_NO_DESTROY PROTOBUF_CONSTINIT
-    PROTOBUF_ATTRIBUTE_INIT_PRIORITY1 ExecuteCommandResponseDefaultTypeInternal _ExecuteCommandResponse_default_instance_;
-
-inline constexpr GetSignatureHelpRequest::Impl_::Impl_(
-    ::_pbi::ConstantInitialized) noexcept
-      : _cached_size_{0},
-        context_{nullptr},
-        text_document_{nullptr},
-        position_{nullptr} {}
-
-template <typename>
-PROTOBUF_CONSTEXPR GetSignatureHelpRequest::GetSignatureHelpRequest(::_pbi::ConstantInitialized)
-    : _impl_(::_pbi::ConstantInitialized()) {}
-struct GetSignatureHelpRequestDefaultTypeInternal {
-  PROTOBUF_CONSTEXPR GetSignatureHelpRequestDefaultTypeInternal() : _instance(::_pbi::ConstantInitialized{}) {}
-  ~GetSignatureHelpRequestDefaultTypeInternal() {}
-  union {
-    GetSignatureHelpRequest _instance;
-  };
-};
-
-PROTOBUF_ATTRIBUTE_NO_DESTROY PROTOBUF_CONSTINIT
-    PROTOBUF_ATTRIBUTE_INIT_PRIORITY1 GetSignatureHelpRequestDefaultTypeInternal _GetSignatureHelpRequest_default_instance_;
-
-inline constexpr FigureDescriptor::Impl_::Impl_(
-    ::_pbi::ConstantInitialized) noexcept
-      : _cached_size_{0},
-        charts_{},
-        errors_{},
-        title_(
-            &::google::protobuf::internal::fixed_address_empty_string,
-            ::_pbi::ConstantInitialized()),
-        title_font_(
-            &::google::protobuf::internal::fixed_address_empty_string,
-            ::_pbi::ConstantInitialized()),
-        title_color_(
-            &::google::protobuf::internal::fixed_address_empty_string,
-            ::_pbi::ConstantInitialized()),
-        update_interval_{::int64_t{0}},
-        cols_{0},
-        rows_{0} {}
-
-template <typename>
-PROTOBUF_CONSTEXPR FigureDescriptor::FigureDescriptor(::_pbi::ConstantInitialized)
-    : _impl_(::_pbi::ConstantInitialized()) {}
-struct FigureDescriptorDefaultTypeInternal {
-  PROTOBUF_CONSTEXPR FigureDescriptorDefaultTypeInternal() : _instance(::_pbi::ConstantInitialized{}) {}
-  ~FigureDescriptorDefaultTypeInternal() {}
-  union {
-    FigureDescriptor _instance;
-  };
-};
-
-PROTOBUF_ATTRIBUTE_NO_DESTROY PROTOBUF_CONSTINIT
-    PROTOBUF_ATTRIBUTE_INIT_PRIORITY1 FigureDescriptorDefaultTypeInternal _FigureDescriptor_default_instance_;
-
-inline constexpr AutoCompleteResponse::Impl_::Impl_(
-    ::_pbi::ConstantInitialized) noexcept
-      : request_id_{0},
-        success_{false},
-        response_{},
-        _cached_size_{0},
-        _oneof_case_{} {}
-
-template <typename>
-PROTOBUF_CONSTEXPR AutoCompleteResponse::AutoCompleteResponse(::_pbi::ConstantInitialized)
-    : _impl_(::_pbi::ConstantInitialized()) {}
-struct AutoCompleteResponseDefaultTypeInternal {
-  PROTOBUF_CONSTEXPR AutoCompleteResponseDefaultTypeInternal() : _instance(::_pbi::ConstantInitialized{}) {}
-  ~AutoCompleteResponseDefaultTypeInternal() {}
-  union {
-    AutoCompleteResponse _instance;
-  };
-};
-
-PROTOBUF_ATTRIBUTE_NO_DESTROY PROTOBUF_CONSTINIT
-    PROTOBUF_ATTRIBUTE_INIT_PRIORITY1 AutoCompleteResponseDefaultTypeInternal _AutoCompleteResponse_default_instance_;
-
-inline constexpr AutoCompleteRequest::Impl_::Impl_(
-    ::_pbi::ConstantInitialized) noexcept
-      : _cached_size_{0},
-        console_id_{nullptr},
-        request_id_{0},
-        request_{},
-        _oneof_case_{} {}
-
-template <typename>
-PROTOBUF_CONSTEXPR AutoCompleteRequest::AutoCompleteRequest(::_pbi::ConstantInitialized)
-    : _impl_(::_pbi::ConstantInitialized()) {}
-struct AutoCompleteRequestDefaultTypeInternal {
-  PROTOBUF_CONSTEXPR AutoCompleteRequestDefaultTypeInternal() : _instance(::_pbi::ConstantInitialized{}) {}
-  ~AutoCompleteRequestDefaultTypeInternal() {}
-  union {
-    AutoCompleteRequest _instance;
-  };
-};
-
-PROTOBUF_ATTRIBUTE_NO_DESTROY PROTOBUF_CONSTINIT
-    PROTOBUF_ATTRIBUTE_INIT_PRIORITY1 AutoCompleteRequestDefaultTypeInternal _AutoCompleteRequest_default_instance_;
-}  // namespace grpc
-}  // namespace script
-}  // namespace backplane
-}  // namespace proto
-}  // namespace deephaven
-}  // namespace io
-static ::_pb::Metadata file_level_metadata_deephaven_2fproto_2fconsole_2eproto[60];
-static const ::_pb::EnumDescriptor* file_level_enum_descriptors_deephaven_2fproto_2fconsole_2eproto[9];
-static constexpr const ::_pb::ServiceDescriptor**
-    file_level_service_descriptors_deephaven_2fproto_2fconsole_2eproto = nullptr;
-const ::uint32_t TableStruct_deephaven_2fproto_2fconsole_2eproto::offsets[] PROTOBUF_SECTION_VARIABLE(
-    protodesc_cold) = {
-    ~0u,  // no _has_bits_
-    PROTOBUF_FIELD_OFFSET(::io::deephaven::proto::backplane::script::grpc::GetConsoleTypesRequest, _internal_metadata_),
-    ~0u,  // no _extensions_
-    ~0u,  // no _oneof_case_
-    ~0u,  // no _weak_field_map_
-    ~0u,  // no _inlined_string_donated_
-    ~0u,  // no _split_
-    ~0u,  // no sizeof(Split)
-    ~0u,  // no _has_bits_
-    PROTOBUF_FIELD_OFFSET(::io::deephaven::proto::backplane::script::grpc::GetConsoleTypesResponse, _internal_metadata_),
-    ~0u,  // no _extensions_
-    ~0u,  // no _oneof_case_
-    ~0u,  // no _weak_field_map_
-    ~0u,  // no _inlined_string_donated_
-    ~0u,  // no _split_
-    ~0u,  // no sizeof(Split)
-    PROTOBUF_FIELD_OFFSET(::io::deephaven::proto::backplane::script::grpc::GetConsoleTypesResponse, _impl_.console_types_),
-    PROTOBUF_FIELD_OFFSET(::io::deephaven::proto::backplane::script::grpc::StartConsoleRequest, _impl_._has_bits_),
-    PROTOBUF_FIELD_OFFSET(::io::deephaven::proto::backplane::script::grpc::StartConsoleRequest, _internal_metadata_),
-    ~0u,  // no _extensions_
-    ~0u,  // no _oneof_case_
-    ~0u,  // no _weak_field_map_
-    ~0u,  // no _inlined_string_donated_
-    ~0u,  // no _split_
-    ~0u,  // no sizeof(Split)
-    PROTOBUF_FIELD_OFFSET(::io::deephaven::proto::backplane::script::grpc::StartConsoleRequest, _impl_.result_id_),
-    PROTOBUF_FIELD_OFFSET(::io::deephaven::proto::backplane::script::grpc::StartConsoleRequest, _impl_.session_type_),
-    0,
-    ~0u,
-    PROTOBUF_FIELD_OFFSET(::io::deephaven::proto::backplane::script::grpc::StartConsoleResponse, _impl_._has_bits_),
-    PROTOBUF_FIELD_OFFSET(::io::deephaven::proto::backplane::script::grpc::StartConsoleResponse, _internal_metadata_),
-    ~0u,  // no _extensions_
-    ~0u,  // no _oneof_case_
-    ~0u,  // no _weak_field_map_
-    ~0u,  // no _inlined_string_donated_
-    ~0u,  // no _split_
-    ~0u,  // no sizeof(Split)
-    PROTOBUF_FIELD_OFFSET(::io::deephaven::proto::backplane::script::grpc::StartConsoleResponse, _impl_.result_id_),
-    0,
-    ~0u,  // no _has_bits_
-    PROTOBUF_FIELD_OFFSET(::io::deephaven::proto::backplane::script::grpc::GetHeapInfoRequest, _internal_metadata_),
-    ~0u,  // no _extensions_
-    ~0u,  // no _oneof_case_
-    ~0u,  // no _weak_field_map_
-    ~0u,  // no _inlined_string_donated_
-    ~0u,  // no _split_
-    ~0u,  // no sizeof(Split)
-    ~0u,  // no _has_bits_
-    PROTOBUF_FIELD_OFFSET(::io::deephaven::proto::backplane::script::grpc::GetHeapInfoResponse, _internal_metadata_),
-    ~0u,  // no _extensions_
-    ~0u,  // no _oneof_case_
-    ~0u,  // no _weak_field_map_
-    ~0u,  // no _inlined_string_donated_
-    ~0u,  // no _split_
-    ~0u,  // no sizeof(Split)
-    PROTOBUF_FIELD_OFFSET(::io::deephaven::proto::backplane::script::grpc::GetHeapInfoResponse, _impl_.max_memory_),
-    PROTOBUF_FIELD_OFFSET(::io::deephaven::proto::backplane::script::grpc::GetHeapInfoResponse, _impl_.total_memory_),
-    PROTOBUF_FIELD_OFFSET(::io::deephaven::proto::backplane::script::grpc::GetHeapInfoResponse, _impl_.free_memory_),
-    ~0u,  // no _has_bits_
-    PROTOBUF_FIELD_OFFSET(::io::deephaven::proto::backplane::script::grpc::LogSubscriptionRequest, _internal_metadata_),
-    ~0u,  // no _extensions_
-    ~0u,  // no _oneof_case_
-    ~0u,  // no _weak_field_map_
-    ~0u,  // no _inlined_string_donated_
-    ~0u,  // no _split_
-    ~0u,  // no sizeof(Split)
-    PROTOBUF_FIELD_OFFSET(::io::deephaven::proto::backplane::script::grpc::LogSubscriptionRequest, _impl_.last_seen_log_timestamp_),
-    PROTOBUF_FIELD_OFFSET(::io::deephaven::proto::backplane::script::grpc::LogSubscriptionRequest, _impl_.levels_),
-    ~0u,  // no _has_bits_
-    PROTOBUF_FIELD_OFFSET(::io::deephaven::proto::backplane::script::grpc::LogSubscriptionData, _internal_metadata_),
-    ~0u,  // no _extensions_
-    ~0u,  // no _oneof_case_
-    ~0u,  // no _weak_field_map_
-    ~0u,  // no _inlined_string_donated_
-    ~0u,  // no _split_
-    ~0u,  // no sizeof(Split)
-    PROTOBUF_FIELD_OFFSET(::io::deephaven::proto::backplane::script::grpc::LogSubscriptionData, _impl_.micros_),
-    PROTOBUF_FIELD_OFFSET(::io::deephaven::proto::backplane::script::grpc::LogSubscriptionData, _impl_.log_level_),
-    PROTOBUF_FIELD_OFFSET(::io::deephaven::proto::backplane::script::grpc::LogSubscriptionData, _impl_.message_),
-    PROTOBUF_FIELD_OFFSET(::io::deephaven::proto::backplane::script::grpc::ExecuteCommandRequest, _impl_._has_bits_),
-    PROTOBUF_FIELD_OFFSET(::io::deephaven::proto::backplane::script::grpc::ExecuteCommandRequest, _internal_metadata_),
-    ~0u,  // no _extensions_
-    ~0u,  // no _oneof_case_
-    ~0u,  // no _weak_field_map_
-    ~0u,  // no _inlined_string_donated_
-    ~0u,  // no _split_
-    ~0u,  // no sizeof(Split)
-    PROTOBUF_FIELD_OFFSET(::io::deephaven::proto::backplane::script::grpc::ExecuteCommandRequest, _impl_.console_id_),
-    PROTOBUF_FIELD_OFFSET(::io::deephaven::proto::backplane::script::grpc::ExecuteCommandRequest, _impl_.code_),
-    0,
-    ~0u,
-    PROTOBUF_FIELD_OFFSET(::io::deephaven::proto::backplane::script::grpc::ExecuteCommandResponse, _impl_._has_bits_),
-    PROTOBUF_FIELD_OFFSET(::io::deephaven::proto::backplane::script::grpc::ExecuteCommandResponse, _internal_metadata_),
-    ~0u,  // no _extensions_
-    ~0u,  // no _oneof_case_
-    ~0u,  // no _weak_field_map_
-    ~0u,  // no _inlined_string_donated_
-    ~0u,  // no _split_
-    ~0u,  // no sizeof(Split)
-    PROTOBUF_FIELD_OFFSET(::io::deephaven::proto::backplane::script::grpc::ExecuteCommandResponse, _impl_.error_message_),
-    PROTOBUF_FIELD_OFFSET(::io::deephaven::proto::backplane::script::grpc::ExecuteCommandResponse, _impl_.changes_),
-    ~0u,
-    0,
-    PROTOBUF_FIELD_OFFSET(::io::deephaven::proto::backplane::script::grpc::BindTableToVariableRequest, _impl_._has_bits_),
-    PROTOBUF_FIELD_OFFSET(::io::deephaven::proto::backplane::script::grpc::BindTableToVariableRequest, _internal_metadata_),
-    ~0u,  // no _extensions_
-    ~0u,  // no _oneof_case_
-    ~0u,  // no _weak_field_map_
-    ~0u,  // no _inlined_string_donated_
-    ~0u,  // no _split_
-    ~0u,  // no sizeof(Split)
-    PROTOBUF_FIELD_OFFSET(::io::deephaven::proto::backplane::script::grpc::BindTableToVariableRequest, _impl_.console_id_),
-    PROTOBUF_FIELD_OFFSET(::io::deephaven::proto::backplane::script::grpc::BindTableToVariableRequest, _impl_.variable_name_),
-    PROTOBUF_FIELD_OFFSET(::io::deephaven::proto::backplane::script::grpc::BindTableToVariableRequest, _impl_.table_id_),
-    0,
-    ~0u,
-    1,
-    ~0u,  // no _has_bits_
-    PROTOBUF_FIELD_OFFSET(::io::deephaven::proto::backplane::script::grpc::BindTableToVariableResponse, _internal_metadata_),
-    ~0u,  // no _extensions_
-    ~0u,  // no _oneof_case_
-    ~0u,  // no _weak_field_map_
-    ~0u,  // no _inlined_string_donated_
-    ~0u,  // no _split_
-    ~0u,  // no sizeof(Split)
-    PROTOBUF_FIELD_OFFSET(::io::deephaven::proto::backplane::script::grpc::CancelCommandRequest, _impl_._has_bits_),
-    PROTOBUF_FIELD_OFFSET(::io::deephaven::proto::backplane::script::grpc::CancelCommandRequest, _internal_metadata_),
-    ~0u,  // no _extensions_
-    ~0u,  // no _oneof_case_
-    ~0u,  // no _weak_field_map_
-    ~0u,  // no _inlined_string_donated_
-    ~0u,  // no _split_
-    ~0u,  // no sizeof(Split)
-    PROTOBUF_FIELD_OFFSET(::io::deephaven::proto::backplane::script::grpc::CancelCommandRequest, _impl_.console_id_),
-    PROTOBUF_FIELD_OFFSET(::io::deephaven::proto::backplane::script::grpc::CancelCommandRequest, _impl_.command_id_),
-    0,
-    1,
-    ~0u,  // no _has_bits_
-    PROTOBUF_FIELD_OFFSET(::io::deephaven::proto::backplane::script::grpc::CancelCommandResponse, _internal_metadata_),
-    ~0u,  // no _extensions_
-    ~0u,  // no _oneof_case_
-    ~0u,  // no _weak_field_map_
-    ~0u,  // no _inlined_string_donated_
-    ~0u,  // no _split_
-    ~0u,  // no sizeof(Split)
-    PROTOBUF_FIELD_OFFSET(::io::deephaven::proto::backplane::script::grpc::CancelAutoCompleteRequest, _impl_._has_bits_),
-    PROTOBUF_FIELD_OFFSET(::io::deephaven::proto::backplane::script::grpc::CancelAutoCompleteRequest, _internal_metadata_),
-    ~0u,  // no _extensions_
-    ~0u,  // no _oneof_case_
-    ~0u,  // no _weak_field_map_
-    ~0u,  // no _inlined_string_donated_
-    ~0u,  // no _split_
-    ~0u,  // no sizeof(Split)
-    PROTOBUF_FIELD_OFFSET(::io::deephaven::proto::backplane::script::grpc::CancelAutoCompleteRequest, _impl_.console_id_),
-    PROTOBUF_FIELD_OFFSET(::io::deephaven::proto::backplane::script::grpc::CancelAutoCompleteRequest, _impl_.request_id_),
-    0,
-    ~0u,
-    ~0u,  // no _has_bits_
-    PROTOBUF_FIELD_OFFSET(::io::deephaven::proto::backplane::script::grpc::CancelAutoCompleteResponse, _internal_metadata_),
-    ~0u,  // no _extensions_
-    ~0u,  // no _oneof_case_
-    ~0u,  // no _weak_field_map_
-    ~0u,  // no _inlined_string_donated_
-    ~0u,  // no _split_
-    ~0u,  // no sizeof(Split)
-    PROTOBUF_FIELD_OFFSET(::io::deephaven::proto::backplane::script::grpc::AutoCompleteRequest, _impl_._has_bits_),
-    PROTOBUF_FIELD_OFFSET(::io::deephaven::proto::backplane::script::grpc::AutoCompleteRequest, _internal_metadata_),
-    ~0u,  // no _extensions_
-    PROTOBUF_FIELD_OFFSET(::io::deephaven::proto::backplane::script::grpc::AutoCompleteRequest, _impl_._oneof_case_[0]),
-    ~0u,  // no _weak_field_map_
-    ~0u,  // no _inlined_string_donated_
-    ~0u,  // no _split_
-    ~0u,  // no sizeof(Split)
-    PROTOBUF_FIELD_OFFSET(::io::deephaven::proto::backplane::script::grpc::AutoCompleteRequest, _impl_.console_id_),
-    PROTOBUF_FIELD_OFFSET(::io::deephaven::proto::backplane::script::grpc::AutoCompleteRequest, _impl_.request_id_),
-    ::_pbi::kInvalidFieldOffsetTag,
-    ::_pbi::kInvalidFieldOffsetTag,
-    ::_pbi::kInvalidFieldOffsetTag,
-    ::_pbi::kInvalidFieldOffsetTag,
-    ::_pbi::kInvalidFieldOffsetTag,
-    ::_pbi::kInvalidFieldOffsetTag,
-    ::_pbi::kInvalidFieldOffsetTag,
-    PROTOBUF_FIELD_OFFSET(::io::deephaven::proto::backplane::script::grpc::AutoCompleteRequest, _impl_.request_),
-    0,
-    ~0u,
-    ~0u,
-    ~0u,
-    ~0u,
-    ~0u,
-    ~0u,
-    ~0u,
-    ~0u,
-    ~0u,  // no _has_bits_
-    PROTOBUF_FIELD_OFFSET(::io::deephaven::proto::backplane::script::grpc::AutoCompleteResponse, _internal_metadata_),
-    ~0u,  // no _extensions_
-    PROTOBUF_FIELD_OFFSET(::io::deephaven::proto::backplane::script::grpc::AutoCompleteResponse, _impl_._oneof_case_[0]),
-    ~0u,  // no _weak_field_map_
-    ~0u,  // no _inlined_string_donated_
-    ~0u,  // no _split_
-    ~0u,  // no sizeof(Split)
-    PROTOBUF_FIELD_OFFSET(::io::deephaven::proto::backplane::script::grpc::AutoCompleteResponse, _impl_.request_id_),
-    PROTOBUF_FIELD_OFFSET(::io::deephaven::proto::backplane::script::grpc::AutoCompleteResponse, _impl_.success_),
-    ::_pbi::kInvalidFieldOffsetTag,
-    ::_pbi::kInvalidFieldOffsetTag,
-    ::_pbi::kInvalidFieldOffsetTag,
-    ::_pbi::kInvalidFieldOffsetTag,
-    ::_pbi::kInvalidFieldOffsetTag,
-    PROTOBUF_FIELD_OFFSET(::io::deephaven::proto::backplane::script::grpc::AutoCompleteResponse, _impl_.response_),
-    ~0u,  // no _has_bits_
-    PROTOBUF_FIELD_OFFSET(::io::deephaven::proto::backplane::script::grpc::BrowserNextResponse, _internal_metadata_),
-    ~0u,  // no _extensions_
-    ~0u,  // no _oneof_case_
-    ~0u,  // no _weak_field_map_
-    ~0u,  // no _inlined_string_donated_
-    ~0u,  // no _split_
-    ~0u,  // no sizeof(Split)
-    PROTOBUF_FIELD_OFFSET(::io::deephaven::proto::backplane::script::grpc::OpenDocumentRequest, _impl_._has_bits_),
-    PROTOBUF_FIELD_OFFSET(::io::deephaven::proto::backplane::script::grpc::OpenDocumentRequest, _internal_metadata_),
-    ~0u,  // no _extensions_
-    ~0u,  // no _oneof_case_
-    ~0u,  // no _weak_field_map_
-    ~0u,  // no _inlined_string_donated_
-    ~0u,  // no _split_
-    ~0u,  // no sizeof(Split)
-    PROTOBUF_FIELD_OFFSET(::io::deephaven::proto::backplane::script::grpc::OpenDocumentRequest, _impl_.console_id_),
-    PROTOBUF_FIELD_OFFSET(::io::deephaven::proto::backplane::script::grpc::OpenDocumentRequest, _impl_.text_document_),
-    0,
-    1,
-    ~0u,  // no _has_bits_
-    PROTOBUF_FIELD_OFFSET(::io::deephaven::proto::backplane::script::grpc::TextDocumentItem, _internal_metadata_),
-    ~0u,  // no _extensions_
-    ~0u,  // no _oneof_case_
-    ~0u,  // no _weak_field_map_
-    ~0u,  // no _inlined_string_donated_
-    ~0u,  // no _split_
-    ~0u,  // no sizeof(Split)
-    PROTOBUF_FIELD_OFFSET(::io::deephaven::proto::backplane::script::grpc::TextDocumentItem, _impl_.uri_),
-    PROTOBUF_FIELD_OFFSET(::io::deephaven::proto::backplane::script::grpc::TextDocumentItem, _impl_.language_id_),
-    PROTOBUF_FIELD_OFFSET(::io::deephaven::proto::backplane::script::grpc::TextDocumentItem, _impl_.version_),
-    PROTOBUF_FIELD_OFFSET(::io::deephaven::proto::backplane::script::grpc::TextDocumentItem, _impl_.text_),
-    PROTOBUF_FIELD_OFFSET(::io::deephaven::proto::backplane::script::grpc::CloseDocumentRequest, _impl_._has_bits_),
-    PROTOBUF_FIELD_OFFSET(::io::deephaven::proto::backplane::script::grpc::CloseDocumentRequest, _internal_metadata_),
-    ~0u,  // no _extensions_
-    ~0u,  // no _oneof_case_
-    ~0u,  // no _weak_field_map_
-    ~0u,  // no _inlined_string_donated_
-    ~0u,  // no _split_
-    ~0u,  // no sizeof(Split)
-    PROTOBUF_FIELD_OFFSET(::io::deephaven::proto::backplane::script::grpc::CloseDocumentRequest, _impl_.console_id_),
-    PROTOBUF_FIELD_OFFSET(::io::deephaven::proto::backplane::script::grpc::CloseDocumentRequest, _impl_.text_document_),
-    0,
-    1,
-    PROTOBUF_FIELD_OFFSET(::io::deephaven::proto::backplane::script::grpc::ChangeDocumentRequest_TextDocumentContentChangeEvent, _impl_._has_bits_),
-    PROTOBUF_FIELD_OFFSET(::io::deephaven::proto::backplane::script::grpc::ChangeDocumentRequest_TextDocumentContentChangeEvent, _internal_metadata_),
-    ~0u,  // no _extensions_
-    ~0u,  // no _oneof_case_
-    ~0u,  // no _weak_field_map_
-    ~0u,  // no _inlined_string_donated_
-    ~0u,  // no _split_
-    ~0u,  // no sizeof(Split)
-    PROTOBUF_FIELD_OFFSET(::io::deephaven::proto::backplane::script::grpc::ChangeDocumentRequest_TextDocumentContentChangeEvent, _impl_.range_),
-    PROTOBUF_FIELD_OFFSET(::io::deephaven::proto::backplane::script::grpc::ChangeDocumentRequest_TextDocumentContentChangeEvent, _impl_.range_length_),
-    PROTOBUF_FIELD_OFFSET(::io::deephaven::proto::backplane::script::grpc::ChangeDocumentRequest_TextDocumentContentChangeEvent, _impl_.text_),
-    0,
-    ~0u,
-    ~0u,
-    PROTOBUF_FIELD_OFFSET(::io::deephaven::proto::backplane::script::grpc::ChangeDocumentRequest, _impl_._has_bits_),
-    PROTOBUF_FIELD_OFFSET(::io::deephaven::proto::backplane::script::grpc::ChangeDocumentRequest, _internal_metadata_),
-    ~0u,  // no _extensions_
-    ~0u,  // no _oneof_case_
-    ~0u,  // no _weak_field_map_
-    ~0u,  // no _inlined_string_donated_
-    ~0u,  // no _split_
-    ~0u,  // no sizeof(Split)
-    PROTOBUF_FIELD_OFFSET(::io::deephaven::proto::backplane::script::grpc::ChangeDocumentRequest, _impl_.console_id_),
-    PROTOBUF_FIELD_OFFSET(::io::deephaven::proto::backplane::script::grpc::ChangeDocumentRequest, _impl_.text_document_),
-    PROTOBUF_FIELD_OFFSET(::io::deephaven::proto::backplane::script::grpc::ChangeDocumentRequest, _impl_.content_changes_),
-    0,
-    1,
-    ~0u,
-    PROTOBUF_FIELD_OFFSET(::io::deephaven::proto::backplane::script::grpc::DocumentRange, _impl_._has_bits_),
-    PROTOBUF_FIELD_OFFSET(::io::deephaven::proto::backplane::script::grpc::DocumentRange, _internal_metadata_),
-    ~0u,  // no _extensions_
-    ~0u,  // no _oneof_case_
-    ~0u,  // no _weak_field_map_
-    ~0u,  // no _inlined_string_donated_
-    ~0u,  // no _split_
-    ~0u,  // no sizeof(Split)
-    PROTOBUF_FIELD_OFFSET(::io::deephaven::proto::backplane::script::grpc::DocumentRange, _impl_.start_),
-    PROTOBUF_FIELD_OFFSET(::io::deephaven::proto::backplane::script::grpc::DocumentRange, _impl_.end_),
-    0,
-    1,
-    ~0u,  // no _has_bits_
-    PROTOBUF_FIELD_OFFSET(::io::deephaven::proto::backplane::script::grpc::VersionedTextDocumentIdentifier, _internal_metadata_),
-    ~0u,  // no _extensions_
-    ~0u,  // no _oneof_case_
-    ~0u,  // no _weak_field_map_
-    ~0u,  // no _inlined_string_donated_
-    ~0u,  // no _split_
-    ~0u,  // no sizeof(Split)
-    PROTOBUF_FIELD_OFFSET(::io::deephaven::proto::backplane::script::grpc::VersionedTextDocumentIdentifier, _impl_.uri_),
-    PROTOBUF_FIELD_OFFSET(::io::deephaven::proto::backplane::script::grpc::VersionedTextDocumentIdentifier, _impl_.version_),
-    ~0u,  // no _has_bits_
-    PROTOBUF_FIELD_OFFSET(::io::deephaven::proto::backplane::script::grpc::Position, _internal_metadata_),
-    ~0u,  // no _extensions_
-    ~0u,  // no _oneof_case_
-    ~0u,  // no _weak_field_map_
-    ~0u,  // no _inlined_string_donated_
-    ~0u,  // no _split_
-    ~0u,  // no sizeof(Split)
-    PROTOBUF_FIELD_OFFSET(::io::deephaven::proto::backplane::script::grpc::Position, _impl_.line_),
-    PROTOBUF_FIELD_OFFSET(::io::deephaven::proto::backplane::script::grpc::Position, _impl_.character_),
-    ~0u,  // no _has_bits_
-    PROTOBUF_FIELD_OFFSET(::io::deephaven::proto::backplane::script::grpc::MarkupContent, _internal_metadata_),
-    ~0u,  // no _extensions_
-    ~0u,  // no _oneof_case_
-    ~0u,  // no _weak_field_map_
-    ~0u,  // no _inlined_string_donated_
-    ~0u,  // no _split_
-    ~0u,  // no sizeof(Split)
-    PROTOBUF_FIELD_OFFSET(::io::deephaven::proto::backplane::script::grpc::MarkupContent, _impl_.kind_),
-    PROTOBUF_FIELD_OFFSET(::io::deephaven::proto::backplane::script::grpc::MarkupContent, _impl_.value_),
-    PROTOBUF_FIELD_OFFSET(::io::deephaven::proto::backplane::script::grpc::GetCompletionItemsRequest, _impl_._has_bits_),
-    PROTOBUF_FIELD_OFFSET(::io::deephaven::proto::backplane::script::grpc::GetCompletionItemsRequest, _internal_metadata_),
-    ~0u,  // no _extensions_
-    ~0u,  // no _oneof_case_
-    ~0u,  // no _weak_field_map_
-    ~0u,  // no _inlined_string_donated_
-    ~0u,  // no _split_
-    ~0u,  // no sizeof(Split)
-    PROTOBUF_FIELD_OFFSET(::io::deephaven::proto::backplane::script::grpc::GetCompletionItemsRequest, _impl_.console_id_),
-    PROTOBUF_FIELD_OFFSET(::io::deephaven::proto::backplane::script::grpc::GetCompletionItemsRequest, _impl_.context_),
-    PROTOBUF_FIELD_OFFSET(::io::deephaven::proto::backplane::script::grpc::GetCompletionItemsRequest, _impl_.text_document_),
-    PROTOBUF_FIELD_OFFSET(::io::deephaven::proto::backplane::script::grpc::GetCompletionItemsRequest, _impl_.position_),
-    PROTOBUF_FIELD_OFFSET(::io::deephaven::proto::backplane::script::grpc::GetCompletionItemsRequest, _impl_.request_id_),
-    0,
-    1,
-    2,
-    3,
-    ~0u,
-    ~0u,  // no _has_bits_
-    PROTOBUF_FIELD_OFFSET(::io::deephaven::proto::backplane::script::grpc::CompletionContext, _internal_metadata_),
-    ~0u,  // no _extensions_
-    ~0u,  // no _oneof_case_
-    ~0u,  // no _weak_field_map_
-    ~0u,  // no _inlined_string_donated_
-    ~0u,  // no _split_
-    ~0u,  // no sizeof(Split)
-    PROTOBUF_FIELD_OFFSET(::io::deephaven::proto::backplane::script::grpc::CompletionContext, _impl_.trigger_kind_),
-    PROTOBUF_FIELD_OFFSET(::io::deephaven::proto::backplane::script::grpc::CompletionContext, _impl_.trigger_character_),
-    ~0u,  // no _has_bits_
-    PROTOBUF_FIELD_OFFSET(::io::deephaven::proto::backplane::script::grpc::GetCompletionItemsResponse, _internal_metadata_),
-    ~0u,  // no _extensions_
-    ~0u,  // no _oneof_case_
-    ~0u,  // no _weak_field_map_
-    ~0u,  // no _inlined_string_donated_
-    ~0u,  // no _split_
-    ~0u,  // no sizeof(Split)
-    PROTOBUF_FIELD_OFFSET(::io::deephaven::proto::backplane::script::grpc::GetCompletionItemsResponse, _impl_.items_),
-    PROTOBUF_FIELD_OFFSET(::io::deephaven::proto::backplane::script::grpc::GetCompletionItemsResponse, _impl_.request_id_),
-    PROTOBUF_FIELD_OFFSET(::io::deephaven::proto::backplane::script::grpc::GetCompletionItemsResponse, _impl_.success_),
-    PROTOBUF_FIELD_OFFSET(::io::deephaven::proto::backplane::script::grpc::CompletionItem, _impl_._has_bits_),
-    PROTOBUF_FIELD_OFFSET(::io::deephaven::proto::backplane::script::grpc::CompletionItem, _internal_metadata_),
-    ~0u,  // no _extensions_
-    ~0u,  // no _oneof_case_
-    ~0u,  // no _weak_field_map_
-    ~0u,  // no _inlined_string_donated_
-    ~0u,  // no _split_
-    ~0u,  // no sizeof(Split)
-    PROTOBUF_FIELD_OFFSET(::io::deephaven::proto::backplane::script::grpc::CompletionItem, _impl_.start_),
-    PROTOBUF_FIELD_OFFSET(::io::deephaven::proto::backplane::script::grpc::CompletionItem, _impl_.length_),
-    PROTOBUF_FIELD_OFFSET(::io::deephaven::proto::backplane::script::grpc::CompletionItem, _impl_.label_),
-    PROTOBUF_FIELD_OFFSET(::io::deephaven::proto::backplane::script::grpc::CompletionItem, _impl_.kind_),
-    PROTOBUF_FIELD_OFFSET(::io::deephaven::proto::backplane::script::grpc::CompletionItem, _impl_.detail_),
-    PROTOBUF_FIELD_OFFSET(::io::deephaven::proto::backplane::script::grpc::CompletionItem, _impl_.deprecated_),
-    PROTOBUF_FIELD_OFFSET(::io::deephaven::proto::backplane::script::grpc::CompletionItem, _impl_.preselect_),
-    PROTOBUF_FIELD_OFFSET(::io::deephaven::proto::backplane::script::grpc::CompletionItem, _impl_.text_edit_),
-    PROTOBUF_FIELD_OFFSET(::io::deephaven::proto::backplane::script::grpc::CompletionItem, _impl_.sort_text_),
-    PROTOBUF_FIELD_OFFSET(::io::deephaven::proto::backplane::script::grpc::CompletionItem, _impl_.filter_text_),
-    PROTOBUF_FIELD_OFFSET(::io::deephaven::proto::backplane::script::grpc::CompletionItem, _impl_.insert_text_format_),
-    PROTOBUF_FIELD_OFFSET(::io::deephaven::proto::backplane::script::grpc::CompletionItem, _impl_.additional_text_edits_),
-    PROTOBUF_FIELD_OFFSET(::io::deephaven::proto::backplane::script::grpc::CompletionItem, _impl_.commit_characters_),
-    PROTOBUF_FIELD_OFFSET(::io::deephaven::proto::backplane::script::grpc::CompletionItem, _impl_.documentation_),
-    ~0u,
-    ~0u,
-    ~0u,
-    ~0u,
-    ~0u,
-    ~0u,
-    ~0u,
-    0,
-    ~0u,
-    ~0u,
-    ~0u,
-    ~0u,
-    ~0u,
-    1,
-    PROTOBUF_FIELD_OFFSET(::io::deephaven::proto::backplane::script::grpc::TextEdit, _impl_._has_bits_),
-    PROTOBUF_FIELD_OFFSET(::io::deephaven::proto::backplane::script::grpc::TextEdit, _internal_metadata_),
-    ~0u,  // no _extensions_
-    ~0u,  // no _oneof_case_
-    ~0u,  // no _weak_field_map_
-    ~0u,  // no _inlined_string_donated_
-    ~0u,  // no _split_
-    ~0u,  // no sizeof(Split)
-    PROTOBUF_FIELD_OFFSET(::io::deephaven::proto::backplane::script::grpc::TextEdit, _impl_.range_),
-    PROTOBUF_FIELD_OFFSET(::io::deephaven::proto::backplane::script::grpc::TextEdit, _impl_.text_),
-    0,
-    ~0u,
-    PROTOBUF_FIELD_OFFSET(::io::deephaven::proto::backplane::script::grpc::GetSignatureHelpRequest, _impl_._has_bits_),
-    PROTOBUF_FIELD_OFFSET(::io::deephaven::proto::backplane::script::grpc::GetSignatureHelpRequest, _internal_metadata_),
-    ~0u,  // no _extensions_
-    ~0u,  // no _oneof_case_
-    ~0u,  // no _weak_field_map_
-    ~0u,  // no _inlined_string_donated_
-    ~0u,  // no _split_
-    ~0u,  // no sizeof(Split)
-    PROTOBUF_FIELD_OFFSET(::io::deephaven::proto::backplane::script::grpc::GetSignatureHelpRequest, _impl_.context_),
-    PROTOBUF_FIELD_OFFSET(::io::deephaven::proto::backplane::script::grpc::GetSignatureHelpRequest, _impl_.text_document_),
-    PROTOBUF_FIELD_OFFSET(::io::deephaven::proto::backplane::script::grpc::GetSignatureHelpRequest, _impl_.position_),
-    0,
-    1,
-    2,
-    PROTOBUF_FIELD_OFFSET(::io::deephaven::proto::backplane::script::grpc::SignatureHelpContext, _impl_._has_bits_),
-    PROTOBUF_FIELD_OFFSET(::io::deephaven::proto::backplane::script::grpc::SignatureHelpContext, _internal_metadata_),
-    ~0u,  // no _extensions_
-    ~0u,  // no _oneof_case_
-    ~0u,  // no _weak_field_map_
-    ~0u,  // no _inlined_string_donated_
-    ~0u,  // no _split_
-    ~0u,  // no sizeof(Split)
-    PROTOBUF_FIELD_OFFSET(::io::deephaven::proto::backplane::script::grpc::SignatureHelpContext, _impl_.trigger_kind_),
-    PROTOBUF_FIELD_OFFSET(::io::deephaven::proto::backplane::script::grpc::SignatureHelpContext, _impl_.trigger_character_),
-    PROTOBUF_FIELD_OFFSET(::io::deephaven::proto::backplane::script::grpc::SignatureHelpContext, _impl_.is_retrigger_),
-    PROTOBUF_FIELD_OFFSET(::io::deephaven::proto::backplane::script::grpc::SignatureHelpContext, _impl_.active_signature_help_),
-    ~0u,
-    0,
-    ~0u,
-    1,
-    PROTOBUF_FIELD_OFFSET(::io::deephaven::proto::backplane::script::grpc::GetSignatureHelpResponse, _impl_._has_bits_),
-    PROTOBUF_FIELD_OFFSET(::io::deephaven::proto::backplane::script::grpc::GetSignatureHelpResponse, _internal_metadata_),
-    ~0u,  // no _extensions_
-    ~0u,  // no _oneof_case_
-    ~0u,  // no _weak_field_map_
-    ~0u,  // no _inlined_string_donated_
-    ~0u,  // no _split_
-    ~0u,  // no sizeof(Split)
-    PROTOBUF_FIELD_OFFSET(::io::deephaven::proto::backplane::script::grpc::GetSignatureHelpResponse, _impl_.signatures_),
-    PROTOBUF_FIELD_OFFSET(::io::deephaven::proto::backplane::script::grpc::GetSignatureHelpResponse, _impl_.active_signature_),
-    PROTOBUF_FIELD_OFFSET(::io::deephaven::proto::backplane::script::grpc::GetSignatureHelpResponse, _impl_.active_parameter_),
-    ~0u,
-    0,
-    1,
-    PROTOBUF_FIELD_OFFSET(::io::deephaven::proto::backplane::script::grpc::SignatureInformation, _impl_._has_bits_),
-    PROTOBUF_FIELD_OFFSET(::io::deephaven::proto::backplane::script::grpc::SignatureInformation, _internal_metadata_),
-    ~0u,  // no _extensions_
-    ~0u,  // no _oneof_case_
-    ~0u,  // no _weak_field_map_
-    ~0u,  // no _inlined_string_donated_
-    ~0u,  // no _split_
-    ~0u,  // no sizeof(Split)
-    PROTOBUF_FIELD_OFFSET(::io::deephaven::proto::backplane::script::grpc::SignatureInformation, _impl_.label_),
-    PROTOBUF_FIELD_OFFSET(::io::deephaven::proto::backplane::script::grpc::SignatureInformation, _impl_.documentation_),
-    PROTOBUF_FIELD_OFFSET(::io::deephaven::proto::backplane::script::grpc::SignatureInformation, _impl_.parameters_),
-    PROTOBUF_FIELD_OFFSET(::io::deephaven::proto::backplane::script::grpc::SignatureInformation, _impl_.active_parameter_),
-    ~0u,
-    0,
-    ~0u,
-    1,
-    PROTOBUF_FIELD_OFFSET(::io::deephaven::proto::backplane::script::grpc::ParameterInformation, _impl_._has_bits_),
-    PROTOBUF_FIELD_OFFSET(::io::deephaven::proto::backplane::script::grpc::ParameterInformation, _internal_metadata_),
-    ~0u,  // no _extensions_
-    ~0u,  // no _oneof_case_
-    ~0u,  // no _weak_field_map_
-    ~0u,  // no _inlined_string_donated_
-    ~0u,  // no _split_
-    ~0u,  // no sizeof(Split)
-    PROTOBUF_FIELD_OFFSET(::io::deephaven::proto::backplane::script::grpc::ParameterInformation, _impl_.label_),
-    PROTOBUF_FIELD_OFFSET(::io::deephaven::proto::backplane::script::grpc::ParameterInformation, _impl_.documentation_),
-    ~0u,
-    0,
-    PROTOBUF_FIELD_OFFSET(::io::deephaven::proto::backplane::script::grpc::GetHoverRequest, _impl_._has_bits_),
-    PROTOBUF_FIELD_OFFSET(::io::deephaven::proto::backplane::script::grpc::GetHoverRequest, _internal_metadata_),
-    ~0u,  // no _extensions_
-    ~0u,  // no _oneof_case_
-    ~0u,  // no _weak_field_map_
-    ~0u,  // no _inlined_string_donated_
-    ~0u,  // no _split_
-    ~0u,  // no sizeof(Split)
-    PROTOBUF_FIELD_OFFSET(::io::deephaven::proto::backplane::script::grpc::GetHoverRequest, _impl_.text_document_),
-    PROTOBUF_FIELD_OFFSET(::io::deephaven::proto::backplane::script::grpc::GetHoverRequest, _impl_.position_),
-    0,
-    1,
-    PROTOBUF_FIELD_OFFSET(::io::deephaven::proto::backplane::script::grpc::GetHoverResponse, _impl_._has_bits_),
-    PROTOBUF_FIELD_OFFSET(::io::deephaven::proto::backplane::script::grpc::GetHoverResponse, _internal_metadata_),
-    ~0u,  // no _extensions_
-    ~0u,  // no _oneof_case_
-    ~0u,  // no _weak_field_map_
-    ~0u,  // no _inlined_string_donated_
-    ~0u,  // no _split_
-    ~0u,  // no sizeof(Split)
-    PROTOBUF_FIELD_OFFSET(::io::deephaven::proto::backplane::script::grpc::GetHoverResponse, _impl_.contents_),
-    PROTOBUF_FIELD_OFFSET(::io::deephaven::proto::backplane::script::grpc::GetHoverResponse, _impl_.range_),
-    0,
-    1,
-    PROTOBUF_FIELD_OFFSET(::io::deephaven::proto::backplane::script::grpc::GetDiagnosticRequest, _impl_._has_bits_),
-    PROTOBUF_FIELD_OFFSET(::io::deephaven::proto::backplane::script::grpc::GetDiagnosticRequest, _internal_metadata_),
-    ~0u,  // no _extensions_
-    ~0u,  // no _oneof_case_
-    ~0u,  // no _weak_field_map_
-    ~0u,  // no _inlined_string_donated_
-    ~0u,  // no _split_
-    ~0u,  // no sizeof(Split)
-    PROTOBUF_FIELD_OFFSET(::io::deephaven::proto::backplane::script::grpc::GetDiagnosticRequest, _impl_.text_document_),
-    PROTOBUF_FIELD_OFFSET(::io::deephaven::proto::backplane::script::grpc::GetDiagnosticRequest, _impl_.identifier_),
-    PROTOBUF_FIELD_OFFSET(::io::deephaven::proto::backplane::script::grpc::GetDiagnosticRequest, _impl_.previous_result_id_),
-    2,
-    0,
-    1,
-    PROTOBUF_FIELD_OFFSET(::io::deephaven::proto::backplane::script::grpc::GetPullDiagnosticResponse, _impl_._has_bits_),
-    PROTOBUF_FIELD_OFFSET(::io::deephaven::proto::backplane::script::grpc::GetPullDiagnosticResponse, _internal_metadata_),
-    ~0u,  // no _extensions_
-    ~0u,  // no _oneof_case_
-    ~0u,  // no _weak_field_map_
-    ~0u,  // no _inlined_string_donated_
-    ~0u,  // no _split_
-    ~0u,  // no sizeof(Split)
-    PROTOBUF_FIELD_OFFSET(::io::deephaven::proto::backplane::script::grpc::GetPullDiagnosticResponse, _impl_.kind_),
-    PROTOBUF_FIELD_OFFSET(::io::deephaven::proto::backplane::script::grpc::GetPullDiagnosticResponse, _impl_.result_id_),
-    PROTOBUF_FIELD_OFFSET(::io::deephaven::proto::backplane::script::grpc::GetPullDiagnosticResponse, _impl_.items_),
-    ~0u,
-    0,
-    ~0u,
-    PROTOBUF_FIELD_OFFSET(::io::deephaven::proto::backplane::script::grpc::GetPublishDiagnosticResponse, _impl_._has_bits_),
-    PROTOBUF_FIELD_OFFSET(::io::deephaven::proto::backplane::script::grpc::GetPublishDiagnosticResponse, _internal_metadata_),
-    ~0u,  // no _extensions_
-    ~0u,  // no _oneof_case_
-    ~0u,  // no _weak_field_map_
-    ~0u,  // no _inlined_string_donated_
-    ~0u,  // no _split_
-    ~0u,  // no sizeof(Split)
-    PROTOBUF_FIELD_OFFSET(::io::deephaven::proto::backplane::script::grpc::GetPublishDiagnosticResponse, _impl_.uri_),
-    PROTOBUF_FIELD_OFFSET(::io::deephaven::proto::backplane::script::grpc::GetPublishDiagnosticResponse, _impl_.version_),
-    PROTOBUF_FIELD_OFFSET(::io::deephaven::proto::backplane::script::grpc::GetPublishDiagnosticResponse, _impl_.diagnostics_),
-    ~0u,
-    0,
-    ~0u,
-    ~0u,  // no _has_bits_
-    PROTOBUF_FIELD_OFFSET(::io::deephaven::proto::backplane::script::grpc::Diagnostic_CodeDescription, _internal_metadata_),
-    ~0u,  // no _extensions_
-    ~0u,  // no _oneof_case_
-    ~0u,  // no _weak_field_map_
-    ~0u,  // no _inlined_string_donated_
-    ~0u,  // no _split_
-    ~0u,  // no sizeof(Split)
-    PROTOBUF_FIELD_OFFSET(::io::deephaven::proto::backplane::script::grpc::Diagnostic_CodeDescription, _impl_.href_),
-    PROTOBUF_FIELD_OFFSET(::io::deephaven::proto::backplane::script::grpc::Diagnostic, _impl_._has_bits_),
-    PROTOBUF_FIELD_OFFSET(::io::deephaven::proto::backplane::script::grpc::Diagnostic, _internal_metadata_),
-    ~0u,  // no _extensions_
-    ~0u,  // no _oneof_case_
-    ~0u,  // no _weak_field_map_
-    ~0u,  // no _inlined_string_donated_
-    ~0u,  // no _split_
-    ~0u,  // no sizeof(Split)
-    PROTOBUF_FIELD_OFFSET(::io::deephaven::proto::backplane::script::grpc::Diagnostic, _impl_.range_),
-    PROTOBUF_FIELD_OFFSET(::io::deephaven::proto::backplane::script::grpc::Diagnostic, _impl_.severity_),
-    PROTOBUF_FIELD_OFFSET(::io::deephaven::proto::backplane::script::grpc::Diagnostic, _impl_.code_),
-    PROTOBUF_FIELD_OFFSET(::io::deephaven::proto::backplane::script::grpc::Diagnostic, _impl_.code_description_),
-    PROTOBUF_FIELD_OFFSET(::io::deephaven::proto::backplane::script::grpc::Diagnostic, _impl_.source_),
-    PROTOBUF_FIELD_OFFSET(::io::deephaven::proto::backplane::script::grpc::Diagnostic, _impl_.message_),
-    PROTOBUF_FIELD_OFFSET(::io::deephaven::proto::backplane::script::grpc::Diagnostic, _impl_.tags_),
-    PROTOBUF_FIELD_OFFSET(::io::deephaven::proto::backplane::script::grpc::Diagnostic, _impl_.data_),
-    3,
-    ~0u,
-    0,
-    4,
-    1,
-    ~0u,
-    ~0u,
-    2,
-    PROTOBUF_FIELD_OFFSET(::io::deephaven::proto::backplane::script::grpc::FigureDescriptor_ChartDescriptor, _impl_._has_bits_),
-    PROTOBUF_FIELD_OFFSET(::io::deephaven::proto::backplane::script::grpc::FigureDescriptor_ChartDescriptor, _internal_metadata_),
-    ~0u,  // no _extensions_
-    ~0u,  // no _oneof_case_
-    ~0u,  // no _weak_field_map_
-    ~0u,  // no _inlined_string_donated_
-    ~0u,  // no _split_
-    ~0u,  // no sizeof(Split)
-    PROTOBUF_FIELD_OFFSET(::io::deephaven::proto::backplane::script::grpc::FigureDescriptor_ChartDescriptor, _impl_.colspan_),
-    PROTOBUF_FIELD_OFFSET(::io::deephaven::proto::backplane::script::grpc::FigureDescriptor_ChartDescriptor, _impl_.rowspan_),
-    PROTOBUF_FIELD_OFFSET(::io::deephaven::proto::backplane::script::grpc::FigureDescriptor_ChartDescriptor, _impl_.series_),
-    PROTOBUF_FIELD_OFFSET(::io::deephaven::proto::backplane::script::grpc::FigureDescriptor_ChartDescriptor, _impl_.multi_series_),
-    PROTOBUF_FIELD_OFFSET(::io::deephaven::proto::backplane::script::grpc::FigureDescriptor_ChartDescriptor, _impl_.axes_),
-    PROTOBUF_FIELD_OFFSET(::io::deephaven::proto::backplane::script::grpc::FigureDescriptor_ChartDescriptor, _impl_.chart_type_),
-    PROTOBUF_FIELD_OFFSET(::io::deephaven::proto::backplane::script::grpc::FigureDescriptor_ChartDescriptor, _impl_.title_),
-    PROTOBUF_FIELD_OFFSET(::io::deephaven::proto::backplane::script::grpc::FigureDescriptor_ChartDescriptor, _impl_.title_font_),
-    PROTOBUF_FIELD_OFFSET(::io::deephaven::proto::backplane::script::grpc::FigureDescriptor_ChartDescriptor, _impl_.title_color_),
-    PROTOBUF_FIELD_OFFSET(::io::deephaven::proto::backplane::script::grpc::FigureDescriptor_ChartDescriptor, _impl_.show_legend_),
-    PROTOBUF_FIELD_OFFSET(::io::deephaven::proto::backplane::script::grpc::FigureDescriptor_ChartDescriptor, _impl_.legend_font_),
-    PROTOBUF_FIELD_OFFSET(::io::deephaven::proto::backplane::script::grpc::FigureDescriptor_ChartDescriptor, _impl_.legend_color_),
-    PROTOBUF_FIELD_OFFSET(::io::deephaven::proto::backplane::script::grpc::FigureDescriptor_ChartDescriptor, _impl_.is3d_),
-    PROTOBUF_FIELD_OFFSET(::io::deephaven::proto::backplane::script::grpc::FigureDescriptor_ChartDescriptor, _impl_.column_),
-    PROTOBUF_FIELD_OFFSET(::io::deephaven::proto::backplane::script::grpc::FigureDescriptor_ChartDescriptor, _impl_.row_),
-    ~0u,
-    ~0u,
-    ~0u,
-    ~0u,
-    ~0u,
-    ~0u,
-    0,
-    ~0u,
-    ~0u,
-    ~0u,
-    ~0u,
-    ~0u,
-    ~0u,
-    ~0u,
-    ~0u,
-    PROTOBUF_FIELD_OFFSET(::io::deephaven::proto::backplane::script::grpc::FigureDescriptor_SeriesDescriptor, _impl_._has_bits_),
-    PROTOBUF_FIELD_OFFSET(::io::deephaven::proto::backplane::script::grpc::FigureDescriptor_SeriesDescriptor, _internal_metadata_),
-    ~0u,  // no _extensions_
-    ~0u,  // no _oneof_case_
-    ~0u,  // no _weak_field_map_
-    ~0u,  // no _inlined_string_donated_
-    ~0u,  // no _split_
-    ~0u,  // no sizeof(Split)
-    PROTOBUF_FIELD_OFFSET(::io::deephaven::proto::backplane::script::grpc::FigureDescriptor_SeriesDescriptor, _impl_.plot_style_),
-    PROTOBUF_FIELD_OFFSET(::io::deephaven::proto::backplane::script::grpc::FigureDescriptor_SeriesDescriptor, _impl_.name_),
-    PROTOBUF_FIELD_OFFSET(::io::deephaven::proto::backplane::script::grpc::FigureDescriptor_SeriesDescriptor, _impl_.lines_visible_),
-    PROTOBUF_FIELD_OFFSET(::io::deephaven::proto::backplane::script::grpc::FigureDescriptor_SeriesDescriptor, _impl_.shapes_visible_),
-    PROTOBUF_FIELD_OFFSET(::io::deephaven::proto::backplane::script::grpc::FigureDescriptor_SeriesDescriptor, _impl_.gradient_visible_),
-    PROTOBUF_FIELD_OFFSET(::io::deephaven::proto::backplane::script::grpc::FigureDescriptor_SeriesDescriptor, _impl_.line_color_),
-    PROTOBUF_FIELD_OFFSET(::io::deephaven::proto::backplane::script::grpc::FigureDescriptor_SeriesDescriptor, _impl_.point_label_format_),
-    PROTOBUF_FIELD_OFFSET(::io::deephaven::proto::backplane::script::grpc::FigureDescriptor_SeriesDescriptor, _impl_.x_tool_tip_pattern_),
-    PROTOBUF_FIELD_OFFSET(::io::deephaven::proto::backplane::script::grpc::FigureDescriptor_SeriesDescriptor, _impl_.y_tool_tip_pattern_),
-    PROTOBUF_FIELD_OFFSET(::io::deephaven::proto::backplane::script::grpc::FigureDescriptor_SeriesDescriptor, _impl_.shape_label_),
-    PROTOBUF_FIELD_OFFSET(::io::deephaven::proto::backplane::script::grpc::FigureDescriptor_SeriesDescriptor, _impl_.shape_size_),
-    PROTOBUF_FIELD_OFFSET(::io::deephaven::proto::backplane::script::grpc::FigureDescriptor_SeriesDescriptor, _impl_.shape_color_),
-    PROTOBUF_FIELD_OFFSET(::io::deephaven::proto::backplane::script::grpc::FigureDescriptor_SeriesDescriptor, _impl_.shape_),
-    PROTOBUF_FIELD_OFFSET(::io::deephaven::proto::backplane::script::grpc::FigureDescriptor_SeriesDescriptor, _impl_.data_sources_),
-    ~0u,
-    ~0u,
-    3,
-    4,
-    ~0u,
-    ~0u,
-    0,
-    1,
-    2,
-    ~0u,
-    5,
-    ~0u,
-    ~0u,
-    ~0u,
-    PROTOBUF_FIELD_OFFSET(::io::deephaven::proto::backplane::script::grpc::FigureDescriptor_MultiSeriesDescriptor, _impl_._has_bits_),
-    PROTOBUF_FIELD_OFFSET(::io::deephaven::proto::backplane::script::grpc::FigureDescriptor_MultiSeriesDescriptor, _internal_metadata_),
-    ~0u,  // no _extensions_
-    ~0u,  // no _oneof_case_
-    ~0u,  // no _weak_field_map_
-    ~0u,  // no _inlined_string_donated_
-    ~0u,  // no _split_
-    ~0u,  // no sizeof(Split)
-    PROTOBUF_FIELD_OFFSET(::io::deephaven::proto::backplane::script::grpc::FigureDescriptor_MultiSeriesDescriptor, _impl_.plot_style_),
-    PROTOBUF_FIELD_OFFSET(::io::deephaven::proto::backplane::script::grpc::FigureDescriptor_MultiSeriesDescriptor, _impl_.name_),
-    PROTOBUF_FIELD_OFFSET(::io::deephaven::proto::backplane::script::grpc::FigureDescriptor_MultiSeriesDescriptor, _impl_.line_color_),
-    PROTOBUF_FIELD_OFFSET(::io::deephaven::proto::backplane::script::grpc::FigureDescriptor_MultiSeriesDescriptor, _impl_.point_color_),
-    PROTOBUF_FIELD_OFFSET(::io::deephaven::proto::backplane::script::grpc::FigureDescriptor_MultiSeriesDescriptor, _impl_.lines_visible_),
-    PROTOBUF_FIELD_OFFSET(::io::deephaven::proto::backplane::script::grpc::FigureDescriptor_MultiSeriesDescriptor, _impl_.points_visible_),
-    PROTOBUF_FIELD_OFFSET(::io::deephaven::proto::backplane::script::grpc::FigureDescriptor_MultiSeriesDescriptor, _impl_.gradient_visible_),
-    PROTOBUF_FIELD_OFFSET(::io::deephaven::proto::backplane::script::grpc::FigureDescriptor_MultiSeriesDescriptor, _impl_.point_label_format_),
-    PROTOBUF_FIELD_OFFSET(::io::deephaven::proto::backplane::script::grpc::FigureDescriptor_MultiSeriesDescriptor, _impl_.x_tool_tip_pattern_),
-    PROTOBUF_FIELD_OFFSET(::io::deephaven::proto::backplane::script::grpc::FigureDescriptor_MultiSeriesDescriptor, _impl_.y_tool_tip_pattern_),
-    PROTOBUF_FIELD_OFFSET(::io::deephaven::proto::backplane::script::grpc::FigureDescriptor_MultiSeriesDescriptor, _impl_.point_label_),
-    PROTOBUF_FIELD_OFFSET(::io::deephaven::proto::backplane::script::grpc::FigureDescriptor_MultiSeriesDescriptor, _impl_.point_size_),
-    PROTOBUF_FIELD_OFFSET(::io::deephaven::proto::backplane::script::grpc::FigureDescriptor_MultiSeriesDescriptor, _impl_.point_shape_),
-    PROTOBUF_FIELD_OFFSET(::io::deephaven::proto::backplane::script::grpc::FigureDescriptor_MultiSeriesDescriptor, _impl_.data_sources_),
-    ~0u,
-    ~0u,
-    0,
-    1,
-    2,
-    3,
-    4,
-    5,
-    6,
-    7,
-    8,
-    9,
-    10,
-    ~0u,
-    PROTOBUF_FIELD_OFFSET(::io::deephaven::proto::backplane::script::grpc::FigureDescriptor_StringMapWithDefault, _impl_._has_bits_),
-    PROTOBUF_FIELD_OFFSET(::io::deephaven::proto::backplane::script::grpc::FigureDescriptor_StringMapWithDefault, _internal_metadata_),
-    ~0u,  // no _extensions_
-    ~0u,  // no _oneof_case_
-    ~0u,  // no _weak_field_map_
-    ~0u,  // no _inlined_string_donated_
-    ~0u,  // no _split_
-    ~0u,  // no sizeof(Split)
-    PROTOBUF_FIELD_OFFSET(::io::deephaven::proto::backplane::script::grpc::FigureDescriptor_StringMapWithDefault, _impl_.default_string_),
-    PROTOBUF_FIELD_OFFSET(::io::deephaven::proto::backplane::script::grpc::FigureDescriptor_StringMapWithDefault, _impl_.keys_),
-    PROTOBUF_FIELD_OFFSET(::io::deephaven::proto::backplane::script::grpc::FigureDescriptor_StringMapWithDefault, _impl_.values_),
-    0,
-    ~0u,
-    ~0u,
-    PROTOBUF_FIELD_OFFSET(::io::deephaven::proto::backplane::script::grpc::FigureDescriptor_DoubleMapWithDefault, _impl_._has_bits_),
-    PROTOBUF_FIELD_OFFSET(::io::deephaven::proto::backplane::script::grpc::FigureDescriptor_DoubleMapWithDefault, _internal_metadata_),
-    ~0u,  // no _extensions_
-    ~0u,  // no _oneof_case_
-    ~0u,  // no _weak_field_map_
-    ~0u,  // no _inlined_string_donated_
-    ~0u,  // no _split_
-    ~0u,  // no sizeof(Split)
-    PROTOBUF_FIELD_OFFSET(::io::deephaven::proto::backplane::script::grpc::FigureDescriptor_DoubleMapWithDefault, _impl_.default_double_),
-    PROTOBUF_FIELD_OFFSET(::io::deephaven::proto::backplane::script::grpc::FigureDescriptor_DoubleMapWithDefault, _impl_.keys_),
-    PROTOBUF_FIELD_OFFSET(::io::deephaven::proto::backplane::script::grpc::FigureDescriptor_DoubleMapWithDefault, _impl_.values_),
-    0,
-    ~0u,
-    ~0u,
-    PROTOBUF_FIELD_OFFSET(::io::deephaven::proto::backplane::script::grpc::FigureDescriptor_BoolMapWithDefault, _impl_._has_bits_),
-    PROTOBUF_FIELD_OFFSET(::io::deephaven::proto::backplane::script::grpc::FigureDescriptor_BoolMapWithDefault, _internal_metadata_),
-    ~0u,  // no _extensions_
-    ~0u,  // no _oneof_case_
-    ~0u,  // no _weak_field_map_
-    ~0u,  // no _inlined_string_donated_
-    ~0u,  // no _split_
-    ~0u,  // no sizeof(Split)
-    PROTOBUF_FIELD_OFFSET(::io::deephaven::proto::backplane::script::grpc::FigureDescriptor_BoolMapWithDefault, _impl_.default_bool_),
-    PROTOBUF_FIELD_OFFSET(::io::deephaven::proto::backplane::script::grpc::FigureDescriptor_BoolMapWithDefault, _impl_.keys_),
-    PROTOBUF_FIELD_OFFSET(::io::deephaven::proto::backplane::script::grpc::FigureDescriptor_BoolMapWithDefault, _impl_.values_),
-    0,
-    ~0u,
-    ~0u,
-    PROTOBUF_FIELD_OFFSET(::io::deephaven::proto::backplane::script::grpc::FigureDescriptor_AxisDescriptor, _impl_._has_bits_),
-    PROTOBUF_FIELD_OFFSET(::io::deephaven::proto::backplane::script::grpc::FigureDescriptor_AxisDescriptor, _internal_metadata_),
-    ~0u,  // no _extensions_
-    ~0u,  // no _oneof_case_
-    ~0u,  // no _weak_field_map_
-    ~0u,  // no _inlined_string_donated_
-    ~0u,  // no _split_
-    ~0u,  // no sizeof(Split)
-    PROTOBUF_FIELD_OFFSET(::io::deephaven::proto::backplane::script::grpc::FigureDescriptor_AxisDescriptor, _impl_.id_),
-    PROTOBUF_FIELD_OFFSET(::io::deephaven::proto::backplane::script::grpc::FigureDescriptor_AxisDescriptor, _impl_.format_type_),
-    PROTOBUF_FIELD_OFFSET(::io::deephaven::proto::backplane::script::grpc::FigureDescriptor_AxisDescriptor, _impl_.type_),
-    PROTOBUF_FIELD_OFFSET(::io::deephaven::proto::backplane::script::grpc::FigureDescriptor_AxisDescriptor, _impl_.position_),
-    PROTOBUF_FIELD_OFFSET(::io::deephaven::proto::backplane::script::grpc::FigureDescriptor_AxisDescriptor, _impl_.log_),
-    PROTOBUF_FIELD_OFFSET(::io::deephaven::proto::backplane::script::grpc::FigureDescriptor_AxisDescriptor, _impl_.label_),
-    PROTOBUF_FIELD_OFFSET(::io::deephaven::proto::backplane::script::grpc::FigureDescriptor_AxisDescriptor, _impl_.label_font_),
-    PROTOBUF_FIELD_OFFSET(::io::deephaven::proto::backplane::script::grpc::FigureDescriptor_AxisDescriptor, _impl_.ticks_font_),
-    PROTOBUF_FIELD_OFFSET(::io::deephaven::proto::backplane::script::grpc::FigureDescriptor_AxisDescriptor, _impl_.format_pattern_),
-    PROTOBUF_FIELD_OFFSET(::io::deephaven::proto::backplane::script::grpc::FigureDescriptor_AxisDescriptor, _impl_.color_),
-    PROTOBUF_FIELD_OFFSET(::io::deephaven::proto::backplane::script::grpc::FigureDescriptor_AxisDescriptor, _impl_.min_range_),
-    PROTOBUF_FIELD_OFFSET(::io::deephaven::proto::backplane::script::grpc::FigureDescriptor_AxisDescriptor, _impl_.max_range_),
-    PROTOBUF_FIELD_OFFSET(::io::deephaven::proto::backplane::script::grpc::FigureDescriptor_AxisDescriptor, _impl_.minor_ticks_visible_),
-    PROTOBUF_FIELD_OFFSET(::io::deephaven::proto::backplane::script::grpc::FigureDescriptor_AxisDescriptor, _impl_.major_ticks_visible_),
-    PROTOBUF_FIELD_OFFSET(::io::deephaven::proto::backplane::script::grpc::FigureDescriptor_AxisDescriptor, _impl_.minor_tick_count_),
-    PROTOBUF_FIELD_OFFSET(::io::deephaven::proto::backplane::script::grpc::FigureDescriptor_AxisDescriptor, _impl_.gap_between_major_ticks_),
-    PROTOBUF_FIELD_OFFSET(::io::deephaven::proto::backplane::script::grpc::FigureDescriptor_AxisDescriptor, _impl_.major_tick_locations_),
-    PROTOBUF_FIELD_OFFSET(::io::deephaven::proto::backplane::script::grpc::FigureDescriptor_AxisDescriptor, _impl_.tick_label_angle_),
-    PROTOBUF_FIELD_OFFSET(::io::deephaven::proto::backplane::script::grpc::FigureDescriptor_AxisDescriptor, _impl_.invert_),
-    PROTOBUF_FIELD_OFFSET(::io::deephaven::proto::backplane::script::grpc::FigureDescriptor_AxisDescriptor, _impl_.is_time_axis_),
-    PROTOBUF_FIELD_OFFSET(::io::deephaven::proto::backplane::script::grpc::FigureDescriptor_AxisDescriptor, _impl_.business_calendar_descriptor_),
-    ~0u,
-    ~0u,
-    ~0u,
-    ~0u,
-    ~0u,
-    ~0u,
-    ~0u,
-    ~0u,
-    0,
-    ~0u,
-    ~0u,
-    ~0u,
-    ~0u,
-    ~0u,
-    ~0u,
-    2,
-    ~0u,
-    ~0u,
-    ~0u,
-    ~0u,
-    1,
-    ~0u,  // no _has_bits_
-    PROTOBUF_FIELD_OFFSET(::io::deephaven::proto::backplane::script::grpc::FigureDescriptor_BusinessCalendarDescriptor_BusinessPeriod, _internal_metadata_),
-    ~0u,  // no _extensions_
-    ~0u,  // no _oneof_case_
-    ~0u,  // no _weak_field_map_
-    ~0u,  // no _inlined_string_donated_
-    ~0u,  // no _split_
-    ~0u,  // no sizeof(Split)
-    PROTOBUF_FIELD_OFFSET(::io::deephaven::proto::backplane::script::grpc::FigureDescriptor_BusinessCalendarDescriptor_BusinessPeriod, _impl_.open_),
-    PROTOBUF_FIELD_OFFSET(::io::deephaven::proto::backplane::script::grpc::FigureDescriptor_BusinessCalendarDescriptor_BusinessPeriod, _impl_.close_),
-    PROTOBUF_FIELD_OFFSET(::io::deephaven::proto::backplane::script::grpc::FigureDescriptor_BusinessCalendarDescriptor_Holiday, _impl_._has_bits_),
-    PROTOBUF_FIELD_OFFSET(::io::deephaven::proto::backplane::script::grpc::FigureDescriptor_BusinessCalendarDescriptor_Holiday, _internal_metadata_),
-    ~0u,  // no _extensions_
-    ~0u,  // no _oneof_case_
-    ~0u,  // no _weak_field_map_
-    ~0u,  // no _inlined_string_donated_
-    ~0u,  // no _split_
-    ~0u,  // no sizeof(Split)
-    PROTOBUF_FIELD_OFFSET(::io::deephaven::proto::backplane::script::grpc::FigureDescriptor_BusinessCalendarDescriptor_Holiday, _impl_.date_),
-    PROTOBUF_FIELD_OFFSET(::io::deephaven::proto::backplane::script::grpc::FigureDescriptor_BusinessCalendarDescriptor_Holiday, _impl_.business_periods_),
-    0,
-    ~0u,
-    ~0u,  // no _has_bits_
-    PROTOBUF_FIELD_OFFSET(::io::deephaven::proto::backplane::script::grpc::FigureDescriptor_BusinessCalendarDescriptor_LocalDate, _internal_metadata_),
-    ~0u,  // no _extensions_
-    ~0u,  // no _oneof_case_
-    ~0u,  // no _weak_field_map_
-    ~0u,  // no _inlined_string_donated_
-    ~0u,  // no _split_
-    ~0u,  // no sizeof(Split)
-    PROTOBUF_FIELD_OFFSET(::io::deephaven::proto::backplane::script::grpc::FigureDescriptor_BusinessCalendarDescriptor_LocalDate, _impl_.year_),
-    PROTOBUF_FIELD_OFFSET(::io::deephaven::proto::backplane::script::grpc::FigureDescriptor_BusinessCalendarDescriptor_LocalDate, _impl_.month_),
-    PROTOBUF_FIELD_OFFSET(::io::deephaven::proto::backplane::script::grpc::FigureDescriptor_BusinessCalendarDescriptor_LocalDate, _impl_.day_),
-    ~0u,  // no _has_bits_
-    PROTOBUF_FIELD_OFFSET(::io::deephaven::proto::backplane::script::grpc::FigureDescriptor_BusinessCalendarDescriptor, _internal_metadata_),
-    ~0u,  // no _extensions_
-    ~0u,  // no _oneof_case_
-    ~0u,  // no _weak_field_map_
-    ~0u,  // no _inlined_string_donated_
-    ~0u,  // no _split_
-    ~0u,  // no sizeof(Split)
-    PROTOBUF_FIELD_OFFSET(::io::deephaven::proto::backplane::script::grpc::FigureDescriptor_BusinessCalendarDescriptor, _impl_.name_),
-    PROTOBUF_FIELD_OFFSET(::io::deephaven::proto::backplane::script::grpc::FigureDescriptor_BusinessCalendarDescriptor, _impl_.time_zone_),
-    PROTOBUF_FIELD_OFFSET(::io::deephaven::proto::backplane::script::grpc::FigureDescriptor_BusinessCalendarDescriptor, _impl_.business_days_),
-    PROTOBUF_FIELD_OFFSET(::io::deephaven::proto::backplane::script::grpc::FigureDescriptor_BusinessCalendarDescriptor, _impl_.business_periods_),
-    PROTOBUF_FIELD_OFFSET(::io::deephaven::proto::backplane::script::grpc::FigureDescriptor_BusinessCalendarDescriptor, _impl_.holidays_),
-    ~0u,  // no _has_bits_
-    PROTOBUF_FIELD_OFFSET(::io::deephaven::proto::backplane::script::grpc::FigureDescriptor_MultiSeriesSourceDescriptor, _internal_metadata_),
-    ~0u,  // no _extensions_
-    ~0u,  // no _oneof_case_
-    ~0u,  // no _weak_field_map_
-    ~0u,  // no _inlined_string_donated_
-    ~0u,  // no _split_
-    ~0u,  // no sizeof(Split)
-    PROTOBUF_FIELD_OFFSET(::io::deephaven::proto::backplane::script::grpc::FigureDescriptor_MultiSeriesSourceDescriptor, _impl_.axis_id_),
-    PROTOBUF_FIELD_OFFSET(::io::deephaven::proto::backplane::script::grpc::FigureDescriptor_MultiSeriesSourceDescriptor, _impl_.type_),
-    PROTOBUF_FIELD_OFFSET(::io::deephaven::proto::backplane::script::grpc::FigureDescriptor_MultiSeriesSourceDescriptor, _impl_.partitioned_table_id_),
-    PROTOBUF_FIELD_OFFSET(::io::deephaven::proto::backplane::script::grpc::FigureDescriptor_MultiSeriesSourceDescriptor, _impl_.column_name_),
-    PROTOBUF_FIELD_OFFSET(::io::deephaven::proto::backplane::script::grpc::FigureDescriptor_SourceDescriptor, _impl_._has_bits_),
-    PROTOBUF_FIELD_OFFSET(::io::deephaven::proto::backplane::script::grpc::FigureDescriptor_SourceDescriptor, _internal_metadata_),
-    ~0u,  // no _extensions_
-    ~0u,  // no _oneof_case_
-    ~0u,  // no _weak_field_map_
-    ~0u,  // no _inlined_string_donated_
-    ~0u,  // no _split_
-    ~0u,  // no sizeof(Split)
-    PROTOBUF_FIELD_OFFSET(::io::deephaven::proto::backplane::script::grpc::FigureDescriptor_SourceDescriptor, _impl_.axis_id_),
-    PROTOBUF_FIELD_OFFSET(::io::deephaven::proto::backplane::script::grpc::FigureDescriptor_SourceDescriptor, _impl_.type_),
-    PROTOBUF_FIELD_OFFSET(::io::deephaven::proto::backplane::script::grpc::FigureDescriptor_SourceDescriptor, _impl_.table_id_),
-    PROTOBUF_FIELD_OFFSET(::io::deephaven::proto::backplane::script::grpc::FigureDescriptor_SourceDescriptor, _impl_.partitioned_table_id_),
-    PROTOBUF_FIELD_OFFSET(::io::deephaven::proto::backplane::script::grpc::FigureDescriptor_SourceDescriptor, _impl_.column_name_),
-    PROTOBUF_FIELD_OFFSET(::io::deephaven::proto::backplane::script::grpc::FigureDescriptor_SourceDescriptor, _impl_.column_type_),
-    PROTOBUF_FIELD_OFFSET(::io::deephaven::proto::backplane::script::grpc::FigureDescriptor_SourceDescriptor, _impl_.one_click_),
-    ~0u,
-    ~0u,
-    ~0u,
-    ~0u,
-    ~0u,
-    ~0u,
-    0,
-    ~0u,  // no _has_bits_
-    PROTOBUF_FIELD_OFFSET(::io::deephaven::proto::backplane::script::grpc::FigureDescriptor_OneClickDescriptor, _internal_metadata_),
-    ~0u,  // no _extensions_
-    ~0u,  // no _oneof_case_
-    ~0u,  // no _weak_field_map_
-    ~0u,  // no _inlined_string_donated_
-    ~0u,  // no _split_
-    ~0u,  // no sizeof(Split)
-    PROTOBUF_FIELD_OFFSET(::io::deephaven::proto::backplane::script::grpc::FigureDescriptor_OneClickDescriptor, _impl_.columns_),
-    PROTOBUF_FIELD_OFFSET(::io::deephaven::proto::backplane::script::grpc::FigureDescriptor_OneClickDescriptor, _impl_.column_types_),
-    PROTOBUF_FIELD_OFFSET(::io::deephaven::proto::backplane::script::grpc::FigureDescriptor_OneClickDescriptor, _impl_.require_all_filters_to_display_),
-    PROTOBUF_FIELD_OFFSET(::io::deephaven::proto::backplane::script::grpc::FigureDescriptor, _impl_._has_bits_),
-    PROTOBUF_FIELD_OFFSET(::io::deephaven::proto::backplane::script::grpc::FigureDescriptor, _internal_metadata_),
-    ~0u,  // no _extensions_
-    ~0u,  // no _oneof_case_
-    ~0u,  // no _weak_field_map_
-    ~0u,  // no _inlined_string_donated_
-    ~0u,  // no _split_
-    ~0u,  // no sizeof(Split)
-    PROTOBUF_FIELD_OFFSET(::io::deephaven::proto::backplane::script::grpc::FigureDescriptor, _impl_.title_),
-    PROTOBUF_FIELD_OFFSET(::io::deephaven::proto::backplane::script::grpc::FigureDescriptor, _impl_.title_font_),
-    PROTOBUF_FIELD_OFFSET(::io::deephaven::proto::backplane::script::grpc::FigureDescriptor, _impl_.title_color_),
-    PROTOBUF_FIELD_OFFSET(::io::deephaven::proto::backplane::script::grpc::FigureDescriptor, _impl_.update_interval_),
-    PROTOBUF_FIELD_OFFSET(::io::deephaven::proto::backplane::script::grpc::FigureDescriptor, _impl_.cols_),
-    PROTOBUF_FIELD_OFFSET(::io::deephaven::proto::backplane::script::grpc::FigureDescriptor, _impl_.rows_),
-    PROTOBUF_FIELD_OFFSET(::io::deephaven::proto::backplane::script::grpc::FigureDescriptor, _impl_.charts_),
-    PROTOBUF_FIELD_OFFSET(::io::deephaven::proto::backplane::script::grpc::FigureDescriptor, _impl_.errors_),
-    0,
-    ~0u,
-    ~0u,
-    ~0u,
-    ~0u,
-    ~0u,
-    ~0u,
-    ~0u,
-};
-
-static const ::_pbi::MigrationSchema
-    schemas[] PROTOBUF_SECTION_VARIABLE(protodesc_cold) = {
-        {0, -1, -1, sizeof(::io::deephaven::proto::backplane::script::grpc::GetConsoleTypesRequest)},
-        {8, -1, -1, sizeof(::io::deephaven::proto::backplane::script::grpc::GetConsoleTypesResponse)},
-        {17, 27, -1, sizeof(::io::deephaven::proto::backplane::script::grpc::StartConsoleRequest)},
-        {29, 38, -1, sizeof(::io::deephaven::proto::backplane::script::grpc::StartConsoleResponse)},
-        {39, -1, -1, sizeof(::io::deephaven::proto::backplane::script::grpc::GetHeapInfoRequest)},
-        {47, -1, -1, sizeof(::io::deephaven::proto::backplane::script::grpc::GetHeapInfoResponse)},
-        {58, -1, -1, sizeof(::io::deephaven::proto::backplane::script::grpc::LogSubscriptionRequest)},
-        {68, -1, -1, sizeof(::io::deephaven::proto::backplane::script::grpc::LogSubscriptionData)},
-        {79, 89, -1, sizeof(::io::deephaven::proto::backplane::script::grpc::ExecuteCommandRequest)},
-        {91, 101, -1, sizeof(::io::deephaven::proto::backplane::script::grpc::ExecuteCommandResponse)},
-        {103, 114, -1, sizeof(::io::deephaven::proto::backplane::script::grpc::BindTableToVariableRequest)},
-        {117, -1, -1, sizeof(::io::deephaven::proto::backplane::script::grpc::BindTableToVariableResponse)},
-        {125, 135, -1, sizeof(::io::deephaven::proto::backplane::script::grpc::CancelCommandRequest)},
-        {137, -1, -1, sizeof(::io::deephaven::proto::backplane::script::grpc::CancelCommandResponse)},
-        {145, 155, -1, sizeof(::io::deephaven::proto::backplane::script::grpc::CancelAutoCompleteRequest)},
-        {157, -1, -1, sizeof(::io::deephaven::proto::backplane::script::grpc::CancelAutoCompleteResponse)},
-        {165, 183, -1, sizeof(::io::deephaven::proto::backplane::script::grpc::AutoCompleteRequest)},
-        {192, -1, -1, sizeof(::io::deephaven::proto::backplane::script::grpc::AutoCompleteResponse)},
-        {208, -1, -1, sizeof(::io::deephaven::proto::backplane::script::grpc::BrowserNextResponse)},
-        {216, 226, -1, sizeof(::io::deephaven::proto::backplane::script::grpc::OpenDocumentRequest)},
-        {228, -1, -1, sizeof(::io::deephaven::proto::backplane::script::grpc::TextDocumentItem)},
-        {240, 250, -1, sizeof(::io::deephaven::proto::backplane::script::grpc::CloseDocumentRequest)},
-        {252, 263, -1, sizeof(::io::deephaven::proto::backplane::script::grpc::ChangeDocumentRequest_TextDocumentContentChangeEvent)},
-        {266, 277, -1, sizeof(::io::deephaven::proto::backplane::script::grpc::ChangeDocumentRequest)},
-        {280, 290, -1, sizeof(::io::deephaven::proto::backplane::script::grpc::DocumentRange)},
-        {292, -1, -1, sizeof(::io::deephaven::proto::backplane::script::grpc::VersionedTextDocumentIdentifier)},
-        {302, -1, -1, sizeof(::io::deephaven::proto::backplane::script::grpc::Position)},
-        {312, -1, -1, sizeof(::io::deephaven::proto::backplane::script::grpc::MarkupContent)},
-        {322, 335, -1, sizeof(::io::deephaven::proto::backplane::script::grpc::GetCompletionItemsRequest)},
-        {340, -1, -1, sizeof(::io::deephaven::proto::backplane::script::grpc::CompletionContext)},
-        {350, -1, -1, sizeof(::io::deephaven::proto::backplane::script::grpc::GetCompletionItemsResponse)},
-        {361, 383, -1, sizeof(::io::deephaven::proto::backplane::script::grpc::CompletionItem)},
-        {397, 407, -1, sizeof(::io::deephaven::proto::backplane::script::grpc::TextEdit)},
-        {409, 420, -1, sizeof(::io::deephaven::proto::backplane::script::grpc::GetSignatureHelpRequest)},
-        {423, 435, -1, sizeof(::io::deephaven::proto::backplane::script::grpc::SignatureHelpContext)},
-        {439, 450, -1, sizeof(::io::deephaven::proto::backplane::script::grpc::GetSignatureHelpResponse)},
-        {453, 465, -1, sizeof(::io::deephaven::proto::backplane::script::grpc::SignatureInformation)},
-        {469, 479, -1, sizeof(::io::deephaven::proto::backplane::script::grpc::ParameterInformation)},
-        {481, 491, -1, sizeof(::io::deephaven::proto::backplane::script::grpc::GetHoverRequest)},
-        {493, 503, -1, sizeof(::io::deephaven::proto::backplane::script::grpc::GetHoverResponse)},
-        {505, 516, -1, sizeof(::io::deephaven::proto::backplane::script::grpc::GetDiagnosticRequest)},
-        {519, 530, -1, sizeof(::io::deephaven::proto::backplane::script::grpc::GetPullDiagnosticResponse)},
-        {533, 544, -1, sizeof(::io::deephaven::proto::backplane::script::grpc::GetPublishDiagnosticResponse)},
-        {547, -1, -1, sizeof(::io::deephaven::proto::backplane::script::grpc::Diagnostic_CodeDescription)},
-        {556, 572, -1, sizeof(::io::deephaven::proto::backplane::script::grpc::Diagnostic)},
-        {580, 603, -1, sizeof(::io::deephaven::proto::backplane::script::grpc::FigureDescriptor_ChartDescriptor)},
-        {618, 640, -1, sizeof(::io::deephaven::proto::backplane::script::grpc::FigureDescriptor_SeriesDescriptor)},
-        {654, 676, -1, sizeof(::io::deephaven::proto::backplane::script::grpc::FigureDescriptor_MultiSeriesDescriptor)},
-        {690, 701, -1, sizeof(::io::deephaven::proto::backplane::script::grpc::FigureDescriptor_StringMapWithDefault)},
-        {704, 715, -1, sizeof(::io::deephaven::proto::backplane::script::grpc::FigureDescriptor_DoubleMapWithDefault)},
-        {718, 729, -1, sizeof(::io::deephaven::proto::backplane::script::grpc::FigureDescriptor_BoolMapWithDefault)},
-        {732, 761, -1, sizeof(::io::deephaven::proto::backplane::script::grpc::FigureDescriptor_AxisDescriptor)},
-        {782, -1, -1, sizeof(::io::deephaven::proto::backplane::script::grpc::FigureDescriptor_BusinessCalendarDescriptor_BusinessPeriod)},
-        {792, 802, -1, sizeof(::io::deephaven::proto::backplane::script::grpc::FigureDescriptor_BusinessCalendarDescriptor_Holiday)},
-        {804, -1, -1, sizeof(::io::deephaven::proto::backplane::script::grpc::FigureDescriptor_BusinessCalendarDescriptor_LocalDate)},
-        {815, -1, -1, sizeof(::io::deephaven::proto::backplane::script::grpc::FigureDescriptor_BusinessCalendarDescriptor)},
-        {828, -1, -1, sizeof(::io::deephaven::proto::backplane::script::grpc::FigureDescriptor_MultiSeriesSourceDescriptor)},
-        {840, 855, -1, sizeof(::io::deephaven::proto::backplane::script::grpc::FigureDescriptor_SourceDescriptor)},
-        {862, -1, -1, sizeof(::io::deephaven::proto::backplane::script::grpc::FigureDescriptor_OneClickDescriptor)},
-        {873, 889, -1, sizeof(::io::deephaven::proto::backplane::script::grpc::FigureDescriptor)},
-};
-
-static const ::_pb::Message* const file_default_instances[] = {
-    &::io::deephaven::proto::backplane::script::grpc::_GetConsoleTypesRequest_default_instance_._instance,
-    &::io::deephaven::proto::backplane::script::grpc::_GetConsoleTypesResponse_default_instance_._instance,
-    &::io::deephaven::proto::backplane::script::grpc::_StartConsoleRequest_default_instance_._instance,
-    &::io::deephaven::proto::backplane::script::grpc::_StartConsoleResponse_default_instance_._instance,
-    &::io::deephaven::proto::backplane::script::grpc::_GetHeapInfoRequest_default_instance_._instance,
-    &::io::deephaven::proto::backplane::script::grpc::_GetHeapInfoResponse_default_instance_._instance,
-    &::io::deephaven::proto::backplane::script::grpc::_LogSubscriptionRequest_default_instance_._instance,
-    &::io::deephaven::proto::backplane::script::grpc::_LogSubscriptionData_default_instance_._instance,
-    &::io::deephaven::proto::backplane::script::grpc::_ExecuteCommandRequest_default_instance_._instance,
-    &::io::deephaven::proto::backplane::script::grpc::_ExecuteCommandResponse_default_instance_._instance,
-    &::io::deephaven::proto::backplane::script::grpc::_BindTableToVariableRequest_default_instance_._instance,
-    &::io::deephaven::proto::backplane::script::grpc::_BindTableToVariableResponse_default_instance_._instance,
-    &::io::deephaven::proto::backplane::script::grpc::_CancelCommandRequest_default_instance_._instance,
-    &::io::deephaven::proto::backplane::script::grpc::_CancelCommandResponse_default_instance_._instance,
-    &::io::deephaven::proto::backplane::script::grpc::_CancelAutoCompleteRequest_default_instance_._instance,
-    &::io::deephaven::proto::backplane::script::grpc::_CancelAutoCompleteResponse_default_instance_._instance,
-    &::io::deephaven::proto::backplane::script::grpc::_AutoCompleteRequest_default_instance_._instance,
-    &::io::deephaven::proto::backplane::script::grpc::_AutoCompleteResponse_default_instance_._instance,
-    &::io::deephaven::proto::backplane::script::grpc::_BrowserNextResponse_default_instance_._instance,
-    &::io::deephaven::proto::backplane::script::grpc::_OpenDocumentRequest_default_instance_._instance,
-    &::io::deephaven::proto::backplane::script::grpc::_TextDocumentItem_default_instance_._instance,
-    &::io::deephaven::proto::backplane::script::grpc::_CloseDocumentRequest_default_instance_._instance,
-    &::io::deephaven::proto::backplane::script::grpc::_ChangeDocumentRequest_TextDocumentContentChangeEvent_default_instance_._instance,
-    &::io::deephaven::proto::backplane::script::grpc::_ChangeDocumentRequest_default_instance_._instance,
-    &::io::deephaven::proto::backplane::script::grpc::_DocumentRange_default_instance_._instance,
-    &::io::deephaven::proto::backplane::script::grpc::_VersionedTextDocumentIdentifier_default_instance_._instance,
-    &::io::deephaven::proto::backplane::script::grpc::_Position_default_instance_._instance,
-    &::io::deephaven::proto::backplane::script::grpc::_MarkupContent_default_instance_._instance,
-    &::io::deephaven::proto::backplane::script::grpc::_GetCompletionItemsRequest_default_instance_._instance,
-    &::io::deephaven::proto::backplane::script::grpc::_CompletionContext_default_instance_._instance,
-    &::io::deephaven::proto::backplane::script::grpc::_GetCompletionItemsResponse_default_instance_._instance,
-    &::io::deephaven::proto::backplane::script::grpc::_CompletionItem_default_instance_._instance,
-    &::io::deephaven::proto::backplane::script::grpc::_TextEdit_default_instance_._instance,
-    &::io::deephaven::proto::backplane::script::grpc::_GetSignatureHelpRequest_default_instance_._instance,
-    &::io::deephaven::proto::backplane::script::grpc::_SignatureHelpContext_default_instance_._instance,
-    &::io::deephaven::proto::backplane::script::grpc::_GetSignatureHelpResponse_default_instance_._instance,
-    &::io::deephaven::proto::backplane::script::grpc::_SignatureInformation_default_instance_._instance,
-    &::io::deephaven::proto::backplane::script::grpc::_ParameterInformation_default_instance_._instance,
-    &::io::deephaven::proto::backplane::script::grpc::_GetHoverRequest_default_instance_._instance,
-    &::io::deephaven::proto::backplane::script::grpc::_GetHoverResponse_default_instance_._instance,
-    &::io::deephaven::proto::backplane::script::grpc::_GetDiagnosticRequest_default_instance_._instance,
-    &::io::deephaven::proto::backplane::script::grpc::_GetPullDiagnosticResponse_default_instance_._instance,
-    &::io::deephaven::proto::backplane::script::grpc::_GetPublishDiagnosticResponse_default_instance_._instance,
-    &::io::deephaven::proto::backplane::script::grpc::_Diagnostic_CodeDescription_default_instance_._instance,
-    &::io::deephaven::proto::backplane::script::grpc::_Diagnostic_default_instance_._instance,
-    &::io::deephaven::proto::backplane::script::grpc::_FigureDescriptor_ChartDescriptor_default_instance_._instance,
-    &::io::deephaven::proto::backplane::script::grpc::_FigureDescriptor_SeriesDescriptor_default_instance_._instance,
-    &::io::deephaven::proto::backplane::script::grpc::_FigureDescriptor_MultiSeriesDescriptor_default_instance_._instance,
-    &::io::deephaven::proto::backplane::script::grpc::_FigureDescriptor_StringMapWithDefault_default_instance_._instance,
-    &::io::deephaven::proto::backplane::script::grpc::_FigureDescriptor_DoubleMapWithDefault_default_instance_._instance,
-    &::io::deephaven::proto::backplane::script::grpc::_FigureDescriptor_BoolMapWithDefault_default_instance_._instance,
-    &::io::deephaven::proto::backplane::script::grpc::_FigureDescriptor_AxisDescriptor_default_instance_._instance,
-    &::io::deephaven::proto::backplane::script::grpc::_FigureDescriptor_BusinessCalendarDescriptor_BusinessPeriod_default_instance_._instance,
-    &::io::deephaven::proto::backplane::script::grpc::_FigureDescriptor_BusinessCalendarDescriptor_Holiday_default_instance_._instance,
-    &::io::deephaven::proto::backplane::script::grpc::_FigureDescriptor_BusinessCalendarDescriptor_LocalDate_default_instance_._instance,
-    &::io::deephaven::proto::backplane::script::grpc::_FigureDescriptor_BusinessCalendarDescriptor_default_instance_._instance,
-    &::io::deephaven::proto::backplane::script::grpc::_FigureDescriptor_MultiSeriesSourceDescriptor_default_instance_._instance,
-    &::io::deephaven::proto::backplane::script::grpc::_FigureDescriptor_SourceDescriptor_default_instance_._instance,
-    &::io::deephaven::proto::backplane::script::grpc::_FigureDescriptor_OneClickDescriptor_default_instance_._instance,
-    &::io::deephaven::proto::backplane::script::grpc::_FigureDescriptor_default_instance_._instance,
-};
-const char descriptor_table_protodef_deephaven_2fproto_2fconsole_2eproto[] PROTOBUF_SECTION_VARIABLE(protodesc_cold) = {
-    "\n\035deephaven/proto/console.proto\022(io.deep"
-    "haven.proto.backplane.script.grpc\032\034deeph"
-    "aven/proto/ticket.proto\032!deephaven/proto"
-    "/application.proto\"\030\n\026GetConsoleTypesReq"
-    "uest\"0\n\027GetConsoleTypesResponse\022\025\n\rconso"
-    "le_types\030\001 \003(\t\"i\n\023StartConsoleRequest\022<\n"
-    "\tresult_id\030\001 \001(\0132).io.deephaven.proto.ba"
-    "ckplane.grpc.Ticket\022\024\n\014session_type\030\002 \001("
-    "\t\"T\n\024StartConsoleResponse\022<\n\tresult_id\030\001"
-    " \001(\0132).io.deephaven.proto.backplane.grpc"
-    ".Ticket\"\024\n\022GetHeapInfoRequest\"`\n\023GetHeap"
-    "InfoResponse\022\026\n\nmax_memory\030\001 \001(\003B\0020\001\022\030\n\014"
-    "total_memory\030\002 \001(\003B\0020\001\022\027\n\013free_memory\030\003 "
-    "\001(\003B\0020\001\"M\n\026LogSubscriptionRequest\022#\n\027las"
-    "t_seen_log_timestamp\030\001 \001(\003B\0020\001\022\016\n\006levels"
-    "\030\002 \003(\t\"S\n\023LogSubscriptionData\022\022\n\006micros\030"
-    "\001 \001(\003B\0020\001\022\021\n\tlog_level\030\002 \001(\t\022\017\n\007message\030"
-    "\003 \001(\tJ\004\010\004\020\005\"j\n\025ExecuteCommandRequest\022=\n\n"
-    "console_id\030\001 \001(\0132).io.deephaven.proto.ba"
-    "ckplane.grpc.Ticket\022\014\n\004code\030\003 \001(\tJ\004\010\002\020\003\""
-    "w\n\026ExecuteCommandResponse\022\025\n\rerror_messa"
-    "ge\030\001 \001(\t\022F\n\007changes\030\002 \001(\01325.io.deephaven"
-    ".proto.backplane.grpc.FieldsChangeUpdate"
-    "\"\265\001\n\032BindTableToVariableRequest\022=\n\nconso"
-    "le_id\030\001 \001(\0132).io.deephaven.proto.backpla"
-    "ne.grpc.Ticket\022\025\n\rvariable_name\030\003 \001(\t\022;\n"
-    "\010table_id\030\004 \001(\0132).io.deephaven.proto.bac"
-    "kplane.grpc.TicketJ\004\010\002\020\003\"\035\n\033BindTableToV"
-    "ariableResponse\"\224\001\n\024CancelCommandRequest"
-    "\022=\n\nconsole_id\030\001 \001(\0132).io.deephaven.prot"
-    "o.backplane.grpc.Ticket\022=\n\ncommand_id\030\002 "
-    "\001(\0132).io.deephaven.proto.backplane.grpc."
-    "Ticket\"\027\n\025CancelCommandResponse\"n\n\031Cance"
-    "lAutoCompleteRequest\022=\n\nconsole_id\030\001 \001(\013"
-    "2).io.deephaven.proto.backplane.grpc.Tic"
-    "ket\022\022\n\nrequest_id\030\002 \001(\005\"\034\n\032CancelAutoCom"
-    "pleteResponse\"\361\005\n\023AutoCompleteRequest\022=\n"
-    "\nconsole_id\030\005 \001(\0132).io.deephaven.proto.b"
-    "ackplane.grpc.Ticket\022\022\n\nrequest_id\030\006 \001(\005"
-    "\022V\n\ropen_document\030\001 \001(\0132=.io.deephaven.p"
-    "roto.backplane.script.grpc.OpenDocumentR"
-    "equestH\000\022Z\n\017change_document\030\002 \001(\0132\?.io.d"
-    "eephaven.proto.backplane.script.grpc.Cha"
-    "ngeDocumentRequestH\000\022c\n\024get_completion_i"
-    "tems\030\003 \001(\0132C.io.deephaven.proto.backplan"
-    "e.script.grpc.GetCompletionItemsRequestH"
-    "\000\022_\n\022get_signature_help\030\007 \001(\0132A.io.deeph"
-    "aven.proto.backplane.script.grpc.GetSign"
-    "atureHelpRequestH\000\022N\n\tget_hover\030\010 \001(\01329."
-    "io.deephaven.proto.backplane.script.grpc"
-    ".GetHoverRequestH\000\022X\n\016get_diagnostic\030\t \001"
-    "(\0132>.io.deephaven.proto.backplane.script"
-    ".grpc.GetDiagnosticRequestH\000\022X\n\016close_do"
-    "cument\030\004 \001(\0132>.io.deephaven.proto.backpl"
-    "ane.script.grpc.CloseDocumentRequestH\000B\t"
-    "\n\007request\"\221\004\n\024AutoCompleteResponse\022\022\n\nre"
-    "quest_id\030\002 \001(\005\022\017\n\007success\030\003 \001(\010\022`\n\020compl"
-    "etion_items\030\001 \001(\0132D.io.deephaven.proto.b"
-    "ackplane.script.grpc.GetCompletionItemsR"
-    "esponseH\000\022X\n\nsignatures\030\004 \001(\0132B.io.deeph"
-    "aven.proto.backplane.script.grpc.GetSign"
-    "atureHelpResponseH\000\022K\n\005hover\030\005 \001(\0132:.io."
-    "deephaven.proto.backplane.script.grpc.Ge"
-    "tHoverResponseH\000\022Y\n\ndiagnostic\030\006 \001(\0132C.i"
-    "o.deephaven.proto.backplane.script.grpc."
-    "GetPullDiagnosticResponseH\000\022d\n\022diagnosti"
-    "c_publish\030\007 \001(\0132F.io.deephaven.proto.bac"
-    "kplane.script.grpc.GetPublishDiagnosticR"
-    "esponseH\000B\n\n\010response\"\025\n\023BrowserNextResp"
-    "onse\"\253\001\n\023OpenDocumentRequest\022A\n\nconsole_"
-    "id\030\001 \001(\0132).io.deephaven.proto.backplane."
-    "grpc.TicketB\002\030\001\022Q\n\rtext_document\030\002 \001(\0132:"
-    ".io.deephaven.proto.backplane.script.grp"
-    "c.TextDocumentItem\"S\n\020TextDocumentItem\022\013"
-    "\n\003uri\030\001 \001(\t\022\023\n\013language_id\030\002 \001(\t\022\017\n\007vers"
-    "ion\030\003 \001(\005\022\014\n\004text\030\004 \001(\t\"\273\001\n\024CloseDocumen"
-    "tRequest\022A\n\nconsole_id\030\001 \001(\0132).io.deepha"
-    "ven.proto.backplane.grpc.TicketB\002\030\001\022`\n\rt"
-    "ext_document\030\002 \001(\0132I.io.deephaven.proto."
-    "backplane.script.grpc.VersionedTextDocum"
-    "entIdentifier\"\304\003\n\025ChangeDocumentRequest\022"
-    "A\n\nconsole_id\030\001 \001(\0132).io.deephaven.proto"
-    ".backplane.grpc.TicketB\002\030\001\022`\n\rtext_docum"
-    "ent\030\002 \001(\0132I.io.deephaven.proto.backplane"
-    ".script.grpc.VersionedTextDocumentIdenti"
-    "fier\022w\n\017content_changes\030\003 \003(\0132^.io.deeph"
-    "aven.proto.backplane.script.grpc.ChangeD"
-    "ocumentRequest.TextDocumentContentChange"
-    "Event\032\214\001\n\036TextDocumentContentChangeEvent"
-    "\022F\n\005range\030\001 \001(\01327.io.deephaven.proto.bac"
-    "kplane.script.grpc.DocumentRange\022\024\n\014rang"
-    "e_length\030\002 \001(\005\022\014\n\004text\030\003 \001(\t\"\223\001\n\rDocumen"
-    "tRange\022A\n\005start\030\001 \001(\01322.io.deephaven.pro"
-    "to.backplane.script.grpc.Position\022\?\n\003end"
-    "\030\002 \001(\01322.io.deephaven.proto.backplane.sc"
-    "ript.grpc.Position\"\?\n\037VersionedTextDocum"
-    "entIdentifier\022\013\n\003uri\030\001 \001(\t\022\017\n\007version\030\002 "
-    "\001(\005\"+\n\010Position\022\014\n\004line\030\001 \001(\005\022\021\n\tcharact"
-    "er\030\002 \001(\005\",\n\rMarkupContent\022\014\n\004kind\030\001 \001(\t\022"
-    "\r\n\005value\030\002 \001(\t\"\354\002\n\031GetCompletionItemsReq"
-    "uest\022A\n\nconsole_id\030\001 \001(\0132).io.deephaven."
-    "proto.backplane.grpc.TicketB\002\030\001\022L\n\007conte"
-    "xt\030\002 \001(\0132;.io.deephaven.proto.backplane."
-    "script.grpc.CompletionContext\022`\n\rtext_do"
-    "cument\030\003 \001(\0132I.io.deephaven.proto.backpl"
-    "ane.script.grpc.VersionedTextDocumentIde"
-    "ntifier\022D\n\010position\030\004 \001(\01322.io.deephaven"
-    ".proto.backplane.script.grpc.Position\022\026\n"
-    "\nrequest_id\030\005 \001(\005B\002\030\001\"D\n\021CompletionConte"
-    "xt\022\024\n\014trigger_kind\030\001 \001(\005\022\031\n\021trigger_char"
-    "acter\030\002 \001(\t\"\222\001\n\032GetCompletionItemsRespon"
-    "se\022G\n\005items\030\001 \003(\01328.io.deephaven.proto.b"
-    "ackplane.script.grpc.CompletionItem\022\026\n\nr"
-    "equest_id\030\002 \001(\005B\002\030\001\022\023\n\007success\030\003 \001(\010B\002\030\001"
-    "\"\322\003\n\016CompletionItem\022\r\n\005start\030\001 \001(\005\022\016\n\006le"
-    "ngth\030\002 \001(\005\022\r\n\005label\030\003 \001(\t\022\014\n\004kind\030\004 \001(\005\022"
-    "\016\n\006detail\030\005 \001(\t\022\022\n\ndeprecated\030\007 \001(\010\022\021\n\tp"
-    "reselect\030\010 \001(\010\022E\n\ttext_edit\030\t \001(\01322.io.d"
-    "eephaven.proto.backplane.script.grpc.Tex"
-    "tEdit\022\021\n\tsort_text\030\n \001(\t\022\023\n\013filter_text\030"
-    "\013 \001(\t\022\032\n\022insert_text_format\030\014 \001(\005\022Q\n\025add"
-    "itional_text_edits\030\r \003(\01322.io.deephaven."
-    "proto.backplane.script.grpc.TextEdit\022\031\n\021"
-    "commit_characters\030\016 \003(\t\022N\n\rdocumentation"
-    "\030\017 \001(\01327.io.deephaven.proto.backplane.sc"
-    "ript.grpc.MarkupContentJ\004\010\006\020\007\"`\n\010TextEdi"
-    "t\022F\n\005range\030\001 \001(\01327.io.deephaven.proto.ba"
-    "ckplane.script.grpc.DocumentRange\022\014\n\004tex"
-    "t\030\002 \001(\t\"\222\002\n\027GetSignatureHelpRequest\022O\n\007c"
-    "ontext\030\001 \001(\0132>.io.deephaven.proto.backpl"
-    "ane.script.grpc.SignatureHelpContext\022`\n\r"
-    "text_document\030\002 \001(\0132I.io.deephaven.proto"
-    ".backplane.script.grpc.VersionedTextDocu"
-    "mentIdentifier\022D\n\010position\030\003 \001(\01322.io.de"
-    "ephaven.proto.backplane.script.grpc.Posi"
-    "tion\"\333\001\n\024SignatureHelpContext\022\024\n\014trigger"
-    "_kind\030\001 \001(\005\022\036\n\021trigger_character\030\002 \001(\tH\000"
-    "\210\001\001\022\024\n\014is_retrigger\030\003 \001(\010\022a\n\025active_sign"
-    "ature_help\030\004 \001(\0132B.io.deephaven.proto.ba"
-    "ckplane.script.grpc.GetSignatureHelpResp"
-    "onseB\024\n\022_trigger_character\"\326\001\n\030GetSignat"
-    "ureHelpResponse\022R\n\nsignatures\030\001 \003(\0132>.io"
-    ".deephaven.proto.backplane.script.grpc.S"
-    "ignatureInformation\022\035\n\020active_signature\030"
-    "\002 \001(\005H\000\210\001\001\022\035\n\020active_parameter\030\003 \001(\005H\001\210\001"
-    "\001B\023\n\021_active_signatureB\023\n\021_active_parame"
-    "ter\"\375\001\n\024SignatureInformation\022\r\n\005label\030\001 "
-    "\001(\t\022N\n\rdocumentation\030\002 \001(\01327.io.deephave"
-    "n.proto.backplane.script.grpc.MarkupCont"
-    "ent\022R\n\nparameters\030\003 \003(\0132>.io.deephaven.p"
-    "roto.backplane.script.grpc.ParameterInfo"
-    "rmation\022\035\n\020active_parameter\030\004 \001(\005H\000\210\001\001B\023"
-    "\n\021_active_parameter\"u\n\024ParameterInformat"
-    "ion\022\r\n\005label\030\001 \001(\t\022N\n\rdocumentation\030\002 \001("
-    "\01327.io.deephaven.proto.backplane.script."
-    "grpc.MarkupContent\"\271\001\n\017GetHoverRequest\022`"
-    "\n\rtext_document\030\001 \001(\0132I.io.deephaven.pro"
-    "to.backplane.script.grpc.VersionedTextDo"
-    "cumentIdentifier\022D\n\010position\030\002 \001(\01322.io."
-    "deephaven.proto.backplane.script.grpc.Po"
-    "sition\"\245\001\n\020GetHoverResponse\022I\n\010contents\030"
-    "\001 \001(\01327.io.deephaven.proto.backplane.scr"
-    "ipt.grpc.MarkupContent\022F\n\005range\030\002 \001(\01327."
-    "io.deephaven.proto.backplane.script.grpc"
-    ".DocumentRange\"\330\001\n\024GetDiagnosticRequest\022"
-    "`\n\rtext_document\030\001 \001(\0132I.io.deephaven.pr"
-    "oto.backplane.script.grpc.VersionedTextD"
-    "ocumentIdentifier\022\027\n\nidentifier\030\002 \001(\tH\000\210"
-    "\001\001\022\037\n\022previous_result_id\030\003 \001(\tH\001\210\001\001B\r\n\013_"
-    "identifierB\025\n\023_previous_result_id\"\224\001\n\031Ge"
-    "tPullDiagnosticResponse\022\014\n\004kind\030\001 \001(\t\022\026\n"
-    "\tresult_id\030\002 \001(\tH\000\210\001\001\022C\n\005items\030\003 \003(\01324.i"
-    "o.deephaven.proto.backplane.script.grpc."
-    "DiagnosticB\014\n\n_result_id\"\230\001\n\034GetPublishD"
-    "iagnosticResponse\022\013\n\003uri\030\001 \001(\t\022\024\n\007versio"
-    "n\030\002 \001(\005H\000\210\001\001\022I\n\013diagnostics\030\003 \003(\01324.io.d"
-    "eephaven.proto.backplane.script.grpc.Dia"
-    "gnosticB\n\n\010_version\"\247\005\n\nDiagnostic\022F\n\005ra"
-    "nge\030\001 \001(\01327.io.deephaven.proto.backplane"
-    ".script.grpc.DocumentRange\022Y\n\010severity\030\002"
-    " \001(\0162G.io.deephaven.proto.backplane.scri"
-    "pt.grpc.Diagnostic.DiagnosticSeverity\022\021\n"
-    "\004code\030\003 \001(\tH\000\210\001\001\022c\n\020code_description\030\004 \001"
-    "(\0132D.io.deephaven.proto.backplane.script"
-    ".grpc.Diagnostic.CodeDescriptionH\001\210\001\001\022\023\n"
-    "\006source\030\005 \001(\tH\002\210\001\001\022\017\n\007message\030\006 \001(\t\022P\n\004t"
-    "ags\030\007 \003(\0162B.io.deephaven.proto.backplane"
-    ".script.grpc.Diagnostic.DiagnosticTag\022\021\n"
-    "\004data\030\t \001(\014H\003\210\001\001\032\037\n\017CodeDescription\022\014\n\004h"
-    "ref\030\001 \001(\t\"]\n\022DiagnosticSeverity\022\024\n\020NOT_S"
-    "ET_SEVERITY\020\000\022\t\n\005ERROR\020\001\022\013\n\007WARNING\020\002\022\017\n"
-    "\013INFORMATION\020\003\022\010\n\004HINT\020\004\"A\n\rDiagnosticTa"
-    "g\022\017\n\013NOT_SET_TAG\020\000\022\017\n\013UNNECESSARY\020\001\022\016\n\nD"
-    "EPRECATED\020\002B\007\n\005_codeB\023\n\021_code_descriptio"
-    "nB\t\n\007_sourceB\007\n\005_data\"\3460\n\020FigureDescript"
-    "or\022\022\n\005title\030\001 \001(\tH\000\210\001\001\022\022\n\ntitle_font\030\002 \001"
-    "(\t\022\023\n\013title_color\030\003 \001(\t\022\033\n\017update_interv"
-    "al\030\007 \001(\003B\0020\001\022\014\n\004cols\030\010 \001(\005\022\014\n\004rows\030\t \001(\005"
-    "\022Z\n\006charts\030\n \003(\0132J.io.deephaven.proto.ba"
-    "ckplane.script.grpc.FigureDescriptor.Cha"
-    "rtDescriptor\022\016\n\006errors\030\r \003(\t\032\316\005\n\017ChartDe"
-    "scriptor\022\017\n\007colspan\030\001 \001(\005\022\017\n\007rowspan\030\002 \001"
-    "(\005\022[\n\006series\030\003 \003(\0132K.io.deephaven.proto."
-    "backplane.script.grpc.FigureDescriptor.S"
-    "eriesDescriptor\022f\n\014multi_series\030\004 \003(\0132P."
-    "io.deephaven.proto.backplane.script.grpc"
-    ".FigureDescriptor.MultiSeriesDescriptor\022"
-    "W\n\004axes\030\005 \003(\0132I.io.deephaven.proto.backp"
-    "lane.script.grpc.FigureDescriptor.AxisDe"
-    "scriptor\022h\n\nchart_type\030\006 \001(\0162T.io.deepha"
-    "ven.proto.backplane.script.grpc.FigureDe"
-    "scriptor.ChartDescriptor.ChartType\022\022\n\005ti"
-    "tle\030\007 \001(\tH\000\210\001\001\022\022\n\ntitle_font\030\010 \001(\t\022\023\n\013ti"
-    "tle_color\030\t \001(\t\022\023\n\013show_legend\030\n \001(\010\022\023\n\013"
-    "legend_font\030\013 \001(\t\022\024\n\014legend_color\030\014 \001(\t\022"
-    "\014\n\004is3d\030\r \001(\010\022\016\n\006column\030\016 \001(\005\022\013\n\003row\030\017 \001"
-    "(\005\"_\n\tChartType\022\006\n\002XY\020\000\022\007\n\003PIE\020\001\022\014\n\004OHLC"
-    "\020\002\032\002\010\001\022\014\n\010CATEGORY\020\003\022\007\n\003XYZ\020\004\022\017\n\013CATEGOR"
-    "Y_3D\020\005\022\013\n\007TREEMAP\020\006B\010\n\006_title\032\376\004\n\020Series"
-    "Descriptor\022^\n\nplot_style\030\001 \001(\0162J.io.deep"
-    "haven.proto.backplane.script.grpc.Figure"
-    "Descriptor.SeriesPlotStyle\022\014\n\004name\030\002 \001(\t"
-    "\022\032\n\rlines_visible\030\003 \001(\010H\000\210\001\001\022\033\n\016shapes_v"
-    "isible\030\004 \001(\010H\001\210\001\001\022\030\n\020gradient_visible\030\005 "
-    "\001(\010\022\022\n\nline_color\030\006 \001(\t\022\037\n\022point_label_f"
-    "ormat\030\010 \001(\tH\002\210\001\001\022\037\n\022x_tool_tip_pattern\030\t"
-    " \001(\tH\003\210\001\001\022\037\n\022y_tool_tip_pattern\030\n \001(\tH\004\210"
-    "\001\001\022\023\n\013shape_label\030\013 \001(\t\022\027\n\nshape_size\030\014 "
-    "\001(\001H\005\210\001\001\022\023\n\013shape_color\030\r \001(\t\022\r\n\005shape\030\016"
-    " \001(\t\022a\n\014data_sources\030\017 \003(\0132K.io.deephave"
-    "n.proto.backplane.script.grpc.FigureDesc"
-    "riptor.SourceDescriptorB\020\n\016_lines_visibl"
-    "eB\021\n\017_shapes_visibleB\025\n\023_point_label_for"
-    "matB\025\n\023_x_tool_tip_patternB\025\n\023_y_tool_ti"
-    "p_patternB\r\n\013_shape_sizeJ\004\010\007\020\010\032\354\n\n\025Multi"
-    "SeriesDescriptor\022^\n\nplot_style\030\001 \001(\0162J.i"
-    "o.deephaven.proto.backplane.script.grpc."
-    "FigureDescriptor.SeriesPlotStyle\022\014\n\004name"
-    "\030\002 \001(\t\022c\n\nline_color\030\003 \001(\0132O.io.deephave"
-    "n.proto.backplane.script.grpc.FigureDesc"
-    "riptor.StringMapWithDefault\022d\n\013point_col"
-    "or\030\004 \001(\0132O.io.deephaven.proto.backplane."
-    "script.grpc.FigureDescriptor.StringMapWi"
-    "thDefault\022d\n\rlines_visible\030\005 \001(\0132M.io.de"
-    "ephaven.proto.backplane.script.grpc.Figu"
-    "reDescriptor.BoolMapWithDefault\022e\n\016point"
-    "s_visible\030\006 \001(\0132M.io.deephaven.proto.bac"
-    "kplane.script.grpc.FigureDescriptor.Bool"
-    "MapWithDefault\022g\n\020gradient_visible\030\007 \001(\013"
-    "2M.io.deephaven.proto.backplane.script.g"
-    "rpc.FigureDescriptor.BoolMapWithDefault\022"
-    "k\n\022point_label_format\030\010 \001(\0132O.io.deephav"
-    "en.proto.backplane.script.grpc.FigureDes"
-    "criptor.StringMapWithDefault\022k\n\022x_tool_t"
-    "ip_pattern\030\t \001(\0132O.io.deephaven.proto.ba"
-    "ckplane.script.grpc.FigureDescriptor.Str"
-    "ingMapWithDefault\022k\n\022y_tool_tip_pattern\030"
-    "\n \001(\0132O.io.deephaven.proto.backplane.scr"
-    "ipt.grpc.FigureDescriptor.StringMapWithD"
-    "efault\022d\n\013point_label\030\013 \001(\0132O.io.deephav"
-    "en.proto.backplane.script.grpc.FigureDes"
-    "criptor.StringMapWithDefault\022c\n\npoint_si"
-    "ze\030\014 \001(\0132O.io.deephaven.proto.backplane."
-    "script.grpc.FigureDescriptor.DoubleMapWi"
-    "thDefault\022d\n\013point_shape\030\r \001(\0132O.io.deep"
-    "haven.proto.backplane.script.grpc.Figure"
-    "Descriptor.StringMapWithDefault\022l\n\014data_"
-    "sources\030\016 \003(\0132V.io.deephaven.proto.backp"
-    "lane.script.grpc.FigureDescriptor.MultiS"
-    "eriesSourceDescriptor\032d\n\024StringMapWithDe"
-    "fault\022\033\n\016default_string\030\001 \001(\tH\000\210\001\001\022\014\n\004ke"
-    "ys\030\002 \003(\t\022\016\n\006values\030\003 \003(\tB\021\n\017_default_str"
-    "ing\032d\n\024DoubleMapWithDefault\022\033\n\016default_d"
-    "ouble\030\001 \001(\001H\000\210\001\001\022\014\n\004keys\030\002 \003(\t\022\016\n\006values"
-    "\030\003 \003(\001B\021\n\017_default_double\032^\n\022BoolMapWith"
-    "Default\022\031\n\014default_bool\030\001 \001(\010H\000\210\001\001\022\014\n\004ke"
-    "ys\030\002 \003(\t\022\016\n\006values\030\003 \003(\010B\017\n\r_default_boo"
-    "l\032\246\010\n\016AxisDescriptor\022\n\n\002id\030\001 \001(\t\022m\n\013form"
-    "at_type\030\002 \001(\0162X.io.deephaven.proto.backp"
-    "lane.script.grpc.FigureDescriptor.AxisDe"
-    "scriptor.AxisFormatType\022`\n\004type\030\003 \001(\0162R."
-    "io.deephaven.proto.backplane.script.grpc"
-    ".FigureDescriptor.AxisDescriptor.AxisTyp"
-    "e\022h\n\010position\030\004 \001(\0162V.io.deephaven.proto"
-    ".backplane.script.grpc.FigureDescriptor."
-    "AxisDescriptor.AxisPosition\022\013\n\003log\030\005 \001(\010"
-    "\022\r\n\005label\030\006 \001(\t\022\022\n\nlabel_font\030\007 \001(\t\022\022\n\nt"
-    "icks_font\030\010 \001(\t\022\033\n\016format_pattern\030\t \001(\tH"
-    "\000\210\001\001\022\r\n\005color\030\n \001(\t\022\021\n\tmin_range\030\013 \001(\001\022\021"
-    "\n\tmax_range\030\014 \001(\001\022\033\n\023minor_ticks_visible"
-    "\030\r \001(\010\022\033\n\023major_ticks_visible\030\016 \001(\010\022\030\n\020m"
-    "inor_tick_count\030\017 \001(\005\022$\n\027gap_between_maj"
-    "or_ticks\030\020 \001(\001H\001\210\001\001\022\034\n\024major_tick_locati"
-    "ons\030\021 \003(\001\022\030\n\020tick_label_angle\030\022 \001(\001\022\016\n\006i"
-    "nvert\030\023 \001(\010\022\024\n\014is_time_axis\030\024 \001(\010\022{\n\034bus"
-    "iness_calendar_descriptor\030\025 \001(\0132U.io.dee"
-    "phaven.proto.backplane.script.grpc.Figur"
-    "eDescriptor.BusinessCalendarDescriptor\"*"
-    "\n\016AxisFormatType\022\014\n\010CATEGORY\020\000\022\n\n\006NUMBER"
-    "\020\001\"C\n\010AxisType\022\005\n\001X\020\000\022\005\n\001Y\020\001\022\t\n\005SHAPE\020\002\022"
-    "\010\n\004SIZE\020\003\022\t\n\005LABEL\020\004\022\t\n\005COLOR\020\005\"B\n\014AxisP"
-    "osition\022\007\n\003TOP\020\000\022\n\n\006BOTTOM\020\001\022\010\n\004LEFT\020\002\022\t"
-    "\n\005RIGHT\020\003\022\010\n\004NONE\020\004B\021\n\017_format_patternB\032"
-    "\n\030_gap_between_major_ticks\032\360\006\n\032BusinessC"
-    "alendarDescriptor\022\014\n\004name\030\001 \001(\t\022\021\n\ttime_"
-    "zone\030\002 \001(\t\022v\n\rbusiness_days\030\003 \003(\0162_.io.d"
-    "eephaven.proto.backplane.script.grpc.Fig"
-    "ureDescriptor.BusinessCalendarDescriptor"
-    ".DayOfWeek\022~\n\020business_periods\030\004 \003(\0132d.i"
-    "o.deephaven.proto.backplane.script.grpc."
-    "FigureDescriptor.BusinessCalendarDescrip"
-    "tor.BusinessPeriod\022o\n\010holidays\030\005 \003(\0132].i"
-    "o.deephaven.proto.backplane.script.grpc."
-    "FigureDescriptor.BusinessCalendarDescrip"
-    "tor.Holiday\032-\n\016BusinessPeriod\022\014\n\004open\030\001 "
-    "\001(\t\022\r\n\005close\030\002 \001(\t\032\370\001\n\007Holiday\022m\n\004date\030\001"
-    " \001(\0132_.io.deephaven.proto.backplane.scri"
-    "pt.grpc.FigureDescriptor.BusinessCalenda"
-    "rDescriptor.LocalDate\022~\n\020business_period"
-    "s\030\002 \003(\0132d.io.deephaven.proto.backplane.s"
-    "cript.grpc.FigureDescriptor.BusinessCale"
-    "ndarDescriptor.BusinessPeriod\0325\n\tLocalDa"
-    "te\022\014\n\004year\030\001 \001(\005\022\r\n\005month\030\002 \001(\005\022\013\n\003day\030\003"
-    " \001(\005\"g\n\tDayOfWeek\022\n\n\006SUNDAY\020\000\022\n\n\006MONDAY\020"
-    "\001\022\013\n\007TUESDAY\020\002\022\r\n\tWEDNESDAY\020\003\022\014\n\010THURSDA"
-    "Y\020\004\022\n\n\006FRIDAY\020\005\022\014\n\010SATURDAY\020\006\032\266\001\n\033MultiS"
-    "eriesSourceDescriptor\022\017\n\007axis_id\030\001 \001(\t\022S"
-    "\n\004type\030\002 \001(\0162E.io.deephaven.proto.backpl"
-    "ane.script.grpc.FigureDescriptor.SourceT"
-    "ype\022\034\n\024partitioned_table_id\030\003 \001(\005\022\023\n\013col"
-    "umn_name\030\004 \001(\t\032\264\002\n\020SourceDescriptor\022\017\n\007a"
-    "xis_id\030\001 \001(\t\022S\n\004type\030\002 \001(\0162E.io.deephave"
-    "n.proto.backplane.script.grpc.FigureDesc"
-    "riptor.SourceType\022\020\n\010table_id\030\003 \001(\005\022\034\n\024p"
-    "artitioned_table_id\030\004 \001(\005\022\023\n\013column_name"
-    "\030\005 \001(\t\022\023\n\013column_type\030\006 \001(\t\022`\n\tone_click"
-    "\030\007 \001(\0132M.io.deephaven.proto.backplane.sc"
-    "ript.grpc.FigureDescriptor.OneClickDescr"
-    "iptor\032c\n\022OneClickDescriptor\022\017\n\007columns\030\001"
-    " \003(\t\022\024\n\014column_types\030\002 \003(\t\022&\n\036require_al"
-    "l_filters_to_display\030\003 \001(\010\"\246\001\n\017SeriesPlo"
-    "tStyle\022\007\n\003BAR\020\000\022\017\n\013STACKED_BAR\020\001\022\010\n\004LINE"
-    "\020\002\022\010\n\004AREA\020\003\022\020\n\014STACKED_AREA\020\004\022\007\n\003PIE\020\005\022"
-    "\r\n\tHISTOGRAM\020\006\022\010\n\004OHLC\020\007\022\013\n\007SCATTER\020\010\022\010\n"
-    "\004STEP\020\t\022\r\n\tERROR_BAR\020\n\022\013\n\007TREEMAP\020\013\"\322\001\n\n"
-    "SourceType\022\005\n\001X\020\000\022\005\n\001Y\020\001\022\005\n\001Z\020\002\022\t\n\005X_LOW"
-    "\020\003\022\n\n\006X_HIGH\020\004\022\t\n\005Y_LOW\020\005\022\n\n\006Y_HIGH\020\006\022\010\n"
-    "\004TIME\020\007\022\010\n\004OPEN\020\010\022\010\n\004HIGH\020\t\022\007\n\003LOW\020\n\022\t\n\005"
-    "CLOSE\020\013\022\t\n\005SHAPE\020\014\022\010\n\004SIZE\020\r\022\t\n\005LABEL\020\016\022"
-    "\t\n\005COLOR\020\017\022\n\n\006PARENT\020\020\022\016\n\nHOVER_TEXT\020\021\022\010"
-    "\n\004TEXT\020\022B\010\n\006_titleJ\004\010\013\020\014J\004\010\014\020\r2\262\r\n\016Conso"
-    "leService\022\230\001\n\017GetConsoleTypes\022@.io.deeph"
-    "aven.proto.backplane.script.grpc.GetCons"
-    "oleTypesRequest\032A.io.deephaven.proto.bac"
-    "kplane.script.grpc.GetConsoleTypesRespon"
-    "se\"\000\022\217\001\n\014StartConsole\022=.io.deephaven.pro"
-    "to.backplane.script.grpc.StartConsoleReq"
-    "uest\032>.io.deephaven.proto.backplane.scri"
-    "pt.grpc.StartConsoleResponse\"\000\022\214\001\n\013GetHe"
-    "apInfo\022<.io.deephaven.proto.backplane.sc"
-    "ript.grpc.GetHeapInfoRequest\032=.io.deepha"
-    "ven.proto.backplane.script.grpc.GetHeapI"
-    "nfoResponse\"\000\022\226\001\n\017SubscribeToLogs\022@.io.d"
-    "eephaven.proto.backplane.script.grpc.Log"
-    "SubscriptionRequest\032=.io.deephaven.proto"
-    ".backplane.script.grpc.LogSubscriptionDa"
-    "ta\"\0000\001\022\225\001\n\016ExecuteCommand\022\?.io.deephaven"
-    ".proto.backplane.script.grpc.ExecuteComm"
-    "andRequest\032@.io.deephaven.proto.backplan"
-    "e.script.grpc.ExecuteCommandResponse\"\000\022\222"
-    "\001\n\rCancelCommand\022>.io.deephaven.proto.ba"
-    "ckplane.script.grpc.CancelCommandRequest"
-    "\032\?.io.deephaven.proto.backplane.script.g"
-    "rpc.CancelCommandResponse\"\000\022\244\001\n\023BindTabl"
-    "eToVariable\022D.io.deephaven.proto.backpla"
-    "ne.script.grpc.BindTableToVariableReques"
-    "t\032E.io.deephaven.proto.backplane.script."
-    "grpc.BindTableToVariableResponse\"\000\022\231\001\n\022A"
-    "utoCompleteStream\022=.io.deephaven.proto.b"
-    "ackplane.script.grpc.AutoCompleteRequest"
-    "\032>.io.deephaven.proto.backplane.script.g"
-    "rpc.AutoCompleteResponse\"\000(\0010\001\022\241\001\n\022Cance"
-    "lAutoComplete\022C.io.deephaven.proto.backp"
-    "lane.script.grpc.CancelAutoCompleteReque"
-    "st\032D.io.deephaven.proto.backplane.script"
-    ".grpc.CancelAutoCompleteResponse\"\000\022\233\001\n\026O"
-    "penAutoCompleteStream\022=.io.deephaven.pro"
-    "to.backplane.script.grpc.AutoCompleteReq"
-    "uest\032>.io.deephaven.proto.backplane.scri"
-    "pt.grpc.AutoCompleteResponse\"\0000\001\022\230\001\n\026Nex"
-    "tAutoCompleteStream\022=.io.deephaven.proto"
-    ".backplane.script.grpc.AutoCompleteReque"
-    "st\032=.io.deephaven.proto.backplane.script"
-    ".grpc.BrowserNextResponse\"\000BCH\001P\001Z=githu"
-    "b.com/deephaven/deephaven-core/go/intern"
-    "al/proto/consoleb\006proto3"
-};
-static const ::_pbi::DescriptorTable* const descriptor_table_deephaven_2fproto_2fconsole_2eproto_deps[2] =
-    {
-        &::descriptor_table_deephaven_2fproto_2fapplication_2eproto,
-        &::descriptor_table_deephaven_2fproto_2fticket_2eproto,
-};
-static ::absl::once_flag descriptor_table_deephaven_2fproto_2fconsole_2eproto_once;
-const ::_pbi::DescriptorTable descriptor_table_deephaven_2fproto_2fconsole_2eproto = {
-    false,
-    false,
-    15824,
-    descriptor_table_protodef_deephaven_2fproto_2fconsole_2eproto,
-    "deephaven/proto/console.proto",
-    &descriptor_table_deephaven_2fproto_2fconsole_2eproto_once,
-    descriptor_table_deephaven_2fproto_2fconsole_2eproto_deps,
-    2,
-    60,
-    schemas,
-    file_default_instances,
-    TableStruct_deephaven_2fproto_2fconsole_2eproto::offsets,
-    file_level_metadata_deephaven_2fproto_2fconsole_2eproto,
-    file_level_enum_descriptors_deephaven_2fproto_2fconsole_2eproto,
-    file_level_service_descriptors_deephaven_2fproto_2fconsole_2eproto,
-};
-
-// This function exists to be marked as weak.
-// It can significantly speed up compilation by breaking up LLVM's SCC
-// in the .pb.cc translation units. Large translation units see a
-// reduction of more than 35% of walltime for optimized builds. Without
-// the weak attribute all the messages in the file, including all the
-// vtables and everything they use become part of the same SCC through
-// a cycle like:
-// GetMetadata -> descriptor table -> default instances ->
-//   vtables -> GetMetadata
-// By adding a weak function here we break the connection from the
-// individual vtables back into the descriptor table.
-PROTOBUF_ATTRIBUTE_WEAK const ::_pbi::DescriptorTable* descriptor_table_deephaven_2fproto_2fconsole_2eproto_getter() {
-  return &descriptor_table_deephaven_2fproto_2fconsole_2eproto;
-}
-// Force running AddDescriptors() at dynamic initialization time.
-PROTOBUF_ATTRIBUTE_INIT_PRIORITY2
-static ::_pbi::AddDescriptorsRunner dynamic_init_dummy_deephaven_2fproto_2fconsole_2eproto(&descriptor_table_deephaven_2fproto_2fconsole_2eproto);
-namespace io {
-namespace deephaven {
-namespace proto {
-namespace backplane {
-namespace script {
-namespace grpc {
-const ::google::protobuf::EnumDescriptor* Diagnostic_DiagnosticSeverity_descriptor() {
-  ::google::protobuf::internal::AssignDescriptors(&descriptor_table_deephaven_2fproto_2fconsole_2eproto);
-  return file_level_enum_descriptors_deephaven_2fproto_2fconsole_2eproto[0];
-}
-PROTOBUF_CONSTINIT const uint32_t Diagnostic_DiagnosticSeverity_internal_data_[] = {
-    327680u, 0u, };
-bool Diagnostic_DiagnosticSeverity_IsValid(int value) {
-  return 0 <= value && value <= 4;
-}
-#if (__cplusplus < 201703) && \
-  (!defined(_MSC_VER) || (_MSC_VER >= 1900 && _MSC_VER < 1912))
-
-constexpr Diagnostic_DiagnosticSeverity Diagnostic::NOT_SET_SEVERITY;
-constexpr Diagnostic_DiagnosticSeverity Diagnostic::ERROR;
-constexpr Diagnostic_DiagnosticSeverity Diagnostic::WARNING;
-constexpr Diagnostic_DiagnosticSeverity Diagnostic::INFORMATION;
-constexpr Diagnostic_DiagnosticSeverity Diagnostic::HINT;
-constexpr Diagnostic_DiagnosticSeverity Diagnostic::DiagnosticSeverity_MIN;
-constexpr Diagnostic_DiagnosticSeverity Diagnostic::DiagnosticSeverity_MAX;
-constexpr int Diagnostic::DiagnosticSeverity_ARRAYSIZE;
-
-#endif  // (__cplusplus < 201703) &&
-        // (!defined(_MSC_VER) || (_MSC_VER >= 1900 && _MSC_VER < 1912))
-const ::google::protobuf::EnumDescriptor* Diagnostic_DiagnosticTag_descriptor() {
-  ::google::protobuf::internal::AssignDescriptors(&descriptor_table_deephaven_2fproto_2fconsole_2eproto);
-  return file_level_enum_descriptors_deephaven_2fproto_2fconsole_2eproto[1];
-}
-PROTOBUF_CONSTINIT const uint32_t Diagnostic_DiagnosticTag_internal_data_[] = {
-    196608u, 0u, };
-bool Diagnostic_DiagnosticTag_IsValid(int value) {
-  return 0 <= value && value <= 2;
-}
-#if (__cplusplus < 201703) && \
-  (!defined(_MSC_VER) || (_MSC_VER >= 1900 && _MSC_VER < 1912))
-
-constexpr Diagnostic_DiagnosticTag Diagnostic::NOT_SET_TAG;
-constexpr Diagnostic_DiagnosticTag Diagnostic::UNNECESSARY;
-constexpr Diagnostic_DiagnosticTag Diagnostic::DEPRECATED;
-constexpr Diagnostic_DiagnosticTag Diagnostic::DiagnosticTag_MIN;
-constexpr Diagnostic_DiagnosticTag Diagnostic::DiagnosticTag_MAX;
-constexpr int Diagnostic::DiagnosticTag_ARRAYSIZE;
-
-#endif  // (__cplusplus < 201703) &&
-        // (!defined(_MSC_VER) || (_MSC_VER >= 1900 && _MSC_VER < 1912))
-const ::google::protobuf::EnumDescriptor* FigureDescriptor_ChartDescriptor_ChartType_descriptor() {
-  ::google::protobuf::internal::AssignDescriptors(&descriptor_table_deephaven_2fproto_2fconsole_2eproto);
-  return file_level_enum_descriptors_deephaven_2fproto_2fconsole_2eproto[2];
-}
-PROTOBUF_CONSTINIT const uint32_t FigureDescriptor_ChartDescriptor_ChartType_internal_data_[] = {
-    458752u, 0u, };
-bool FigureDescriptor_ChartDescriptor_ChartType_IsValid(int value) {
-  return 0 <= value && value <= 6;
-}
-#if (__cplusplus < 201703) && \
-  (!defined(_MSC_VER) || (_MSC_VER >= 1900 && _MSC_VER < 1912))
-
-constexpr FigureDescriptor_ChartDescriptor_ChartType FigureDescriptor_ChartDescriptor::XY;
-constexpr FigureDescriptor_ChartDescriptor_ChartType FigureDescriptor_ChartDescriptor::PIE;
-constexpr FigureDescriptor_ChartDescriptor_ChartType FigureDescriptor_ChartDescriptor::OHLC;
-constexpr FigureDescriptor_ChartDescriptor_ChartType FigureDescriptor_ChartDescriptor::CATEGORY;
-constexpr FigureDescriptor_ChartDescriptor_ChartType FigureDescriptor_ChartDescriptor::XYZ;
-constexpr FigureDescriptor_ChartDescriptor_ChartType FigureDescriptor_ChartDescriptor::CATEGORY_3D;
-constexpr FigureDescriptor_ChartDescriptor_ChartType FigureDescriptor_ChartDescriptor::TREEMAP;
-constexpr FigureDescriptor_ChartDescriptor_ChartType FigureDescriptor_ChartDescriptor::ChartType_MIN;
-constexpr FigureDescriptor_ChartDescriptor_ChartType FigureDescriptor_ChartDescriptor::ChartType_MAX;
-constexpr int FigureDescriptor_ChartDescriptor::ChartType_ARRAYSIZE;
-
-#endif  // (__cplusplus < 201703) &&
-        // (!defined(_MSC_VER) || (_MSC_VER >= 1900 && _MSC_VER < 1912))
-const ::google::protobuf::EnumDescriptor* FigureDescriptor_AxisDescriptor_AxisFormatType_descriptor() {
-  ::google::protobuf::internal::AssignDescriptors(&descriptor_table_deephaven_2fproto_2fconsole_2eproto);
-  return file_level_enum_descriptors_deephaven_2fproto_2fconsole_2eproto[3];
-}
-PROTOBUF_CONSTINIT const uint32_t FigureDescriptor_AxisDescriptor_AxisFormatType_internal_data_[] = {
-    131072u, 0u, };
-bool FigureDescriptor_AxisDescriptor_AxisFormatType_IsValid(int value) {
-  return 0 <= value && value <= 1;
-}
-#if (__cplusplus < 201703) && \
-  (!defined(_MSC_VER) || (_MSC_VER >= 1900 && _MSC_VER < 1912))
-
-constexpr FigureDescriptor_AxisDescriptor_AxisFormatType FigureDescriptor_AxisDescriptor::CATEGORY;
-constexpr FigureDescriptor_AxisDescriptor_AxisFormatType FigureDescriptor_AxisDescriptor::NUMBER;
-constexpr FigureDescriptor_AxisDescriptor_AxisFormatType FigureDescriptor_AxisDescriptor::AxisFormatType_MIN;
-constexpr FigureDescriptor_AxisDescriptor_AxisFormatType FigureDescriptor_AxisDescriptor::AxisFormatType_MAX;
-constexpr int FigureDescriptor_AxisDescriptor::AxisFormatType_ARRAYSIZE;
-
-#endif  // (__cplusplus < 201703) &&
-        // (!defined(_MSC_VER) || (_MSC_VER >= 1900 && _MSC_VER < 1912))
-const ::google::protobuf::EnumDescriptor* FigureDescriptor_AxisDescriptor_AxisType_descriptor() {
-  ::google::protobuf::internal::AssignDescriptors(&descriptor_table_deephaven_2fproto_2fconsole_2eproto);
-  return file_level_enum_descriptors_deephaven_2fproto_2fconsole_2eproto[4];
-}
-PROTOBUF_CONSTINIT const uint32_t FigureDescriptor_AxisDescriptor_AxisType_internal_data_[] = {
-    393216u, 0u, };
-bool FigureDescriptor_AxisDescriptor_AxisType_IsValid(int value) {
-  return 0 <= value && value <= 5;
-}
-#if (__cplusplus < 201703) && \
-  (!defined(_MSC_VER) || (_MSC_VER >= 1900 && _MSC_VER < 1912))
-
-constexpr FigureDescriptor_AxisDescriptor_AxisType FigureDescriptor_AxisDescriptor::X;
-constexpr FigureDescriptor_AxisDescriptor_AxisType FigureDescriptor_AxisDescriptor::Y;
-constexpr FigureDescriptor_AxisDescriptor_AxisType FigureDescriptor_AxisDescriptor::SHAPE;
-constexpr FigureDescriptor_AxisDescriptor_AxisType FigureDescriptor_AxisDescriptor::SIZE;
-constexpr FigureDescriptor_AxisDescriptor_AxisType FigureDescriptor_AxisDescriptor::LABEL;
-constexpr FigureDescriptor_AxisDescriptor_AxisType FigureDescriptor_AxisDescriptor::COLOR;
-constexpr FigureDescriptor_AxisDescriptor_AxisType FigureDescriptor_AxisDescriptor::AxisType_MIN;
-constexpr FigureDescriptor_AxisDescriptor_AxisType FigureDescriptor_AxisDescriptor::AxisType_MAX;
-constexpr int FigureDescriptor_AxisDescriptor::AxisType_ARRAYSIZE;
-
-#endif  // (__cplusplus < 201703) &&
-        // (!defined(_MSC_VER) || (_MSC_VER >= 1900 && _MSC_VER < 1912))
-const ::google::protobuf::EnumDescriptor* FigureDescriptor_AxisDescriptor_AxisPosition_descriptor() {
-  ::google::protobuf::internal::AssignDescriptors(&descriptor_table_deephaven_2fproto_2fconsole_2eproto);
-  return file_level_enum_descriptors_deephaven_2fproto_2fconsole_2eproto[5];
-}
-PROTOBUF_CONSTINIT const uint32_t FigureDescriptor_AxisDescriptor_AxisPosition_internal_data_[] = {
-    327680u, 0u, };
-bool FigureDescriptor_AxisDescriptor_AxisPosition_IsValid(int value) {
-  return 0 <= value && value <= 4;
-}
-#if (__cplusplus < 201703) && \
-  (!defined(_MSC_VER) || (_MSC_VER >= 1900 && _MSC_VER < 1912))
-
-constexpr FigureDescriptor_AxisDescriptor_AxisPosition FigureDescriptor_AxisDescriptor::TOP;
-constexpr FigureDescriptor_AxisDescriptor_AxisPosition FigureDescriptor_AxisDescriptor::BOTTOM;
-constexpr FigureDescriptor_AxisDescriptor_AxisPosition FigureDescriptor_AxisDescriptor::LEFT;
-constexpr FigureDescriptor_AxisDescriptor_AxisPosition FigureDescriptor_AxisDescriptor::RIGHT;
-constexpr FigureDescriptor_AxisDescriptor_AxisPosition FigureDescriptor_AxisDescriptor::NONE;
-constexpr FigureDescriptor_AxisDescriptor_AxisPosition FigureDescriptor_AxisDescriptor::AxisPosition_MIN;
-constexpr FigureDescriptor_AxisDescriptor_AxisPosition FigureDescriptor_AxisDescriptor::AxisPosition_MAX;
-constexpr int FigureDescriptor_AxisDescriptor::AxisPosition_ARRAYSIZE;
-
-#endif  // (__cplusplus < 201703) &&
-        // (!defined(_MSC_VER) || (_MSC_VER >= 1900 && _MSC_VER < 1912))
-const ::google::protobuf::EnumDescriptor* FigureDescriptor_BusinessCalendarDescriptor_DayOfWeek_descriptor() {
-  ::google::protobuf::internal::AssignDescriptors(&descriptor_table_deephaven_2fproto_2fconsole_2eproto);
-  return file_level_enum_descriptors_deephaven_2fproto_2fconsole_2eproto[6];
-}
-PROTOBUF_CONSTINIT const uint32_t FigureDescriptor_BusinessCalendarDescriptor_DayOfWeek_internal_data_[] = {
-    458752u, 0u, };
-bool FigureDescriptor_BusinessCalendarDescriptor_DayOfWeek_IsValid(int value) {
-  return 0 <= value && value <= 6;
-}
-#if (__cplusplus < 201703) && \
-  (!defined(_MSC_VER) || (_MSC_VER >= 1900 && _MSC_VER < 1912))
-
-constexpr FigureDescriptor_BusinessCalendarDescriptor_DayOfWeek FigureDescriptor_BusinessCalendarDescriptor::SUNDAY;
-constexpr FigureDescriptor_BusinessCalendarDescriptor_DayOfWeek FigureDescriptor_BusinessCalendarDescriptor::MONDAY;
-constexpr FigureDescriptor_BusinessCalendarDescriptor_DayOfWeek FigureDescriptor_BusinessCalendarDescriptor::TUESDAY;
-constexpr FigureDescriptor_BusinessCalendarDescriptor_DayOfWeek FigureDescriptor_BusinessCalendarDescriptor::WEDNESDAY;
-constexpr FigureDescriptor_BusinessCalendarDescriptor_DayOfWeek FigureDescriptor_BusinessCalendarDescriptor::THURSDAY;
-constexpr FigureDescriptor_BusinessCalendarDescriptor_DayOfWeek FigureDescriptor_BusinessCalendarDescriptor::FRIDAY;
-constexpr FigureDescriptor_BusinessCalendarDescriptor_DayOfWeek FigureDescriptor_BusinessCalendarDescriptor::SATURDAY;
-constexpr FigureDescriptor_BusinessCalendarDescriptor_DayOfWeek FigureDescriptor_BusinessCalendarDescriptor::DayOfWeek_MIN;
-constexpr FigureDescriptor_BusinessCalendarDescriptor_DayOfWeek FigureDescriptor_BusinessCalendarDescriptor::DayOfWeek_MAX;
-constexpr int FigureDescriptor_BusinessCalendarDescriptor::DayOfWeek_ARRAYSIZE;
-
-#endif  // (__cplusplus < 201703) &&
-        // (!defined(_MSC_VER) || (_MSC_VER >= 1900 && _MSC_VER < 1912))
-const ::google::protobuf::EnumDescriptor* FigureDescriptor_SeriesPlotStyle_descriptor() {
-  ::google::protobuf::internal::AssignDescriptors(&descriptor_table_deephaven_2fproto_2fconsole_2eproto);
-  return file_level_enum_descriptors_deephaven_2fproto_2fconsole_2eproto[7];
-}
-PROTOBUF_CONSTINIT const uint32_t FigureDescriptor_SeriesPlotStyle_internal_data_[] = {
-    786432u, 0u, };
-bool FigureDescriptor_SeriesPlotStyle_IsValid(int value) {
-  return 0 <= value && value <= 11;
-}
-#if (__cplusplus < 201703) && \
-  (!defined(_MSC_VER) || (_MSC_VER >= 1900 && _MSC_VER < 1912))
-
-constexpr FigureDescriptor_SeriesPlotStyle FigureDescriptor::BAR;
-constexpr FigureDescriptor_SeriesPlotStyle FigureDescriptor::STACKED_BAR;
-constexpr FigureDescriptor_SeriesPlotStyle FigureDescriptor::LINE;
-constexpr FigureDescriptor_SeriesPlotStyle FigureDescriptor::AREA;
-constexpr FigureDescriptor_SeriesPlotStyle FigureDescriptor::STACKED_AREA;
-constexpr FigureDescriptor_SeriesPlotStyle FigureDescriptor::PIE;
-constexpr FigureDescriptor_SeriesPlotStyle FigureDescriptor::HISTOGRAM;
-constexpr FigureDescriptor_SeriesPlotStyle FigureDescriptor::OHLC;
-constexpr FigureDescriptor_SeriesPlotStyle FigureDescriptor::SCATTER;
-constexpr FigureDescriptor_SeriesPlotStyle FigureDescriptor::STEP;
-constexpr FigureDescriptor_SeriesPlotStyle FigureDescriptor::ERROR_BAR;
-constexpr FigureDescriptor_SeriesPlotStyle FigureDescriptor::TREEMAP;
-constexpr FigureDescriptor_SeriesPlotStyle FigureDescriptor::SeriesPlotStyle_MIN;
-constexpr FigureDescriptor_SeriesPlotStyle FigureDescriptor::SeriesPlotStyle_MAX;
-constexpr int FigureDescriptor::SeriesPlotStyle_ARRAYSIZE;
-
-#endif  // (__cplusplus < 201703) &&
-        // (!defined(_MSC_VER) || (_MSC_VER >= 1900 && _MSC_VER < 1912))
-const ::google::protobuf::EnumDescriptor* FigureDescriptor_SourceType_descriptor() {
-  ::google::protobuf::internal::AssignDescriptors(&descriptor_table_deephaven_2fproto_2fconsole_2eproto);
-  return file_level_enum_descriptors_deephaven_2fproto_2fconsole_2eproto[8];
-}
-PROTOBUF_CONSTINIT const uint32_t FigureDescriptor_SourceType_internal_data_[] = {
-    1245184u, 0u, };
-bool FigureDescriptor_SourceType_IsValid(int value) {
-  return 0 <= value && value <= 18;
-}
-#if (__cplusplus < 201703) && \
-  (!defined(_MSC_VER) || (_MSC_VER >= 1900 && _MSC_VER < 1912))
-
-constexpr FigureDescriptor_SourceType FigureDescriptor::X;
-constexpr FigureDescriptor_SourceType FigureDescriptor::Y;
-constexpr FigureDescriptor_SourceType FigureDescriptor::Z;
-constexpr FigureDescriptor_SourceType FigureDescriptor::X_LOW;
-constexpr FigureDescriptor_SourceType FigureDescriptor::X_HIGH;
-constexpr FigureDescriptor_SourceType FigureDescriptor::Y_LOW;
-constexpr FigureDescriptor_SourceType FigureDescriptor::Y_HIGH;
-constexpr FigureDescriptor_SourceType FigureDescriptor::TIME;
-constexpr FigureDescriptor_SourceType FigureDescriptor::OPEN;
-constexpr FigureDescriptor_SourceType FigureDescriptor::HIGH;
-constexpr FigureDescriptor_SourceType FigureDescriptor::LOW;
-constexpr FigureDescriptor_SourceType FigureDescriptor::CLOSE;
-constexpr FigureDescriptor_SourceType FigureDescriptor::SHAPE;
-constexpr FigureDescriptor_SourceType FigureDescriptor::SIZE;
-constexpr FigureDescriptor_SourceType FigureDescriptor::LABEL;
-constexpr FigureDescriptor_SourceType FigureDescriptor::COLOR;
-constexpr FigureDescriptor_SourceType FigureDescriptor::PARENT;
-constexpr FigureDescriptor_SourceType FigureDescriptor::HOVER_TEXT;
-constexpr FigureDescriptor_SourceType FigureDescriptor::TEXT;
-constexpr FigureDescriptor_SourceType FigureDescriptor::SourceType_MIN;
-constexpr FigureDescriptor_SourceType FigureDescriptor::SourceType_MAX;
-constexpr int FigureDescriptor::SourceType_ARRAYSIZE;
-
-#endif  // (__cplusplus < 201703) &&
-        // (!defined(_MSC_VER) || (_MSC_VER >= 1900 && _MSC_VER < 1912))
-// ===================================================================
-
-class GetConsoleTypesRequest::_Internal {
- public:
-};
-
-GetConsoleTypesRequest::GetConsoleTypesRequest(::google::protobuf::Arena* arena)
-    : ::google::protobuf::internal::ZeroFieldsBase(arena) {
-  // @@protoc_insertion_point(arena_constructor:io.deephaven.proto.backplane.script.grpc.GetConsoleTypesRequest)
-}
-GetConsoleTypesRequest::GetConsoleTypesRequest(
-    ::google::protobuf::Arena* arena,
-    const GetConsoleTypesRequest& from)
-    : ::google::protobuf::internal::ZeroFieldsBase(arena) {
-  GetConsoleTypesRequest* const _this = this;
-  (void)_this;
-  _internal_metadata_.MergeFrom<::google::protobuf::UnknownFieldSet>(
-      from._internal_metadata_);
-
-  // @@protoc_insertion_point(copy_constructor:io.deephaven.proto.backplane.script.grpc.GetConsoleTypesRequest)
-}
-
-
-
-
-
-
-
-
-
-::google::protobuf::Metadata GetConsoleTypesRequest::GetMetadata() const {
-  return ::_pbi::AssignDescriptors(
-      &descriptor_table_deephaven_2fproto_2fconsole_2eproto_getter, &descriptor_table_deephaven_2fproto_2fconsole_2eproto_once,
-      file_level_metadata_deephaven_2fproto_2fconsole_2eproto[0]);
-}
-// ===================================================================
-
-class GetConsoleTypesResponse::_Internal {
- public:
-};
-
-GetConsoleTypesResponse::GetConsoleTypesResponse(::google::protobuf::Arena* arena)
-    : ::google::protobuf::Message(arena) {
-  SharedCtor(arena);
-  // @@protoc_insertion_point(arena_constructor:io.deephaven.proto.backplane.script.grpc.GetConsoleTypesResponse)
-}
-inline PROTOBUF_NDEBUG_INLINE GetConsoleTypesResponse::Impl_::Impl_(
-    ::google::protobuf::internal::InternalVisibility visibility, ::google::protobuf::Arena* arena,
-    const Impl_& from)
-      : console_types_{visibility, arena, from.console_types_},
-        _cached_size_{0} {}
-
-GetConsoleTypesResponse::GetConsoleTypesResponse(
-    ::google::protobuf::Arena* arena,
-    const GetConsoleTypesResponse& from)
-    : ::google::protobuf::Message(arena) {
-  GetConsoleTypesResponse* const _this = this;
-  (void)_this;
-  _internal_metadata_.MergeFrom<::google::protobuf::UnknownFieldSet>(
-      from._internal_metadata_);
-  new (&_impl_) Impl_(internal_visibility(), arena, from._impl_);
-
-  // @@protoc_insertion_point(copy_constructor:io.deephaven.proto.backplane.script.grpc.GetConsoleTypesResponse)
-}
-inline PROTOBUF_NDEBUG_INLINE GetConsoleTypesResponse::Impl_::Impl_(
-    ::google::protobuf::internal::InternalVisibility visibility,
-    ::google::protobuf::Arena* arena)
-      : console_types_{visibility, arena},
-        _cached_size_{0} {}
-
-inline void GetConsoleTypesResponse::SharedCtor(::_pb::Arena* arena) {
-  new (&_impl_) Impl_(internal_visibility(), arena);
-}
-GetConsoleTypesResponse::~GetConsoleTypesResponse() {
-  // @@protoc_insertion_point(destructor:io.deephaven.proto.backplane.script.grpc.GetConsoleTypesResponse)
-  _internal_metadata_.Delete<::google::protobuf::UnknownFieldSet>();
-  SharedDtor();
-}
-inline void GetConsoleTypesResponse::SharedDtor() {
-  ABSL_DCHECK(GetArena() == nullptr);
-  _impl_.~Impl_();
-}
-
-PROTOBUF_NOINLINE void GetConsoleTypesResponse::Clear() {
-// @@protoc_insertion_point(message_clear_start:io.deephaven.proto.backplane.script.grpc.GetConsoleTypesResponse)
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  ::uint32_t cached_has_bits = 0;
-  // Prevent compiler warnings about cached_has_bits being unused
-  (void) cached_has_bits;
-
-  _impl_.console_types_.Clear();
-  _internal_metadata_.Clear<::google::protobuf::UnknownFieldSet>();
-}
-
-const char* GetConsoleTypesResponse::_InternalParse(
-    const char* ptr, ::_pbi::ParseContext* ctx) {
-  ptr = ::_pbi::TcParser::ParseLoop(this, ptr, ctx, &_table_.header);
-  return ptr;
-}
-
-
-PROTOBUF_CONSTINIT PROTOBUF_ATTRIBUTE_INIT_PRIORITY1
-const ::_pbi::TcParseTable<0, 1, 0, 86, 2> GetConsoleTypesResponse::_table_ = {
-  {
-    0,  // no _has_bits_
-    0, // no _extensions_
-    1, 0,  // max_field_number, fast_idx_mask
-    offsetof(decltype(_table_), field_lookup_table),
-    4294967294,  // skipmap
-    offsetof(decltype(_table_), field_entries),
-    1,  // num_field_entries
-    0,  // num_aux_entries
-    offsetof(decltype(_table_), field_names),  // no aux_entries
-    &_GetConsoleTypesResponse_default_instance_._instance,
-    ::_pbi::TcParser::GenericFallback,  // fallback
-  }, {{
-    // repeated string console_types = 1;
-    {::_pbi::TcParser::FastUR1,
-     {10, 63, 0, PROTOBUF_FIELD_OFFSET(GetConsoleTypesResponse, _impl_.console_types_)}},
-  }}, {{
-    65535, 65535
-  }}, {{
-    // repeated string console_types = 1;
-    {PROTOBUF_FIELD_OFFSET(GetConsoleTypesResponse, _impl_.console_types_), 0, 0,
-    (0 | ::_fl::kFcRepeated | ::_fl::kUtf8String | ::_fl::kRepSString)},
-  }},
-  // no aux_entries
-  {{
-    "\100\15\0\0\0\0\0\0"
-    "io.deephaven.proto.backplane.script.grpc.GetConsoleTypesResponse"
-    "console_types"
-  }},
-};
-
-::uint8_t* GetConsoleTypesResponse::_InternalSerialize(
-    ::uint8_t* target,
-    ::google::protobuf::io::EpsCopyOutputStream* stream) const {
-  // @@protoc_insertion_point(serialize_to_array_start:io.deephaven.proto.backplane.script.grpc.GetConsoleTypesResponse)
-  ::uint32_t cached_has_bits = 0;
-  (void)cached_has_bits;
-
-  // repeated string console_types = 1;
-  for (int i = 0, n = this->_internal_console_types_size(); i < n; ++i) {
-    const auto& s = this->_internal_console_types().Get(i);
-    ::google::protobuf::internal::WireFormatLite::VerifyUtf8String(
-        s.data(), static_cast<int>(s.length()), ::google::protobuf::internal::WireFormatLite::SERIALIZE, "io.deephaven.proto.backplane.script.grpc.GetConsoleTypesResponse.console_types");
-    target = stream->WriteString(1, s, target);
-  }
-
-  if (PROTOBUF_PREDICT_FALSE(_internal_metadata_.have_unknown_fields())) {
-    target =
-        ::_pbi::WireFormat::InternalSerializeUnknownFieldsToArray(
-            _internal_metadata_.unknown_fields<::google::protobuf::UnknownFieldSet>(::google::protobuf::UnknownFieldSet::default_instance), target, stream);
-  }
-  // @@protoc_insertion_point(serialize_to_array_end:io.deephaven.proto.backplane.script.grpc.GetConsoleTypesResponse)
-  return target;
-}
-
-::size_t GetConsoleTypesResponse::ByteSizeLong() const {
-// @@protoc_insertion_point(message_byte_size_start:io.deephaven.proto.backplane.script.grpc.GetConsoleTypesResponse)
-  ::size_t total_size = 0;
-
-  ::uint32_t cached_has_bits = 0;
-  // Prevent compiler warnings about cached_has_bits being unused
-  (void) cached_has_bits;
-
-  // repeated string console_types = 1;
-  total_size += 1 * ::google::protobuf::internal::FromIntSize(_internal_console_types().size());
-  for (int i = 0, n = _internal_console_types().size(); i < n; ++i) {
-    total_size += ::google::protobuf::internal::WireFormatLite::StringSize(
-        _internal_console_types().Get(i));
-  }
-  return MaybeComputeUnknownFieldsSize(total_size, &_impl_._cached_size_);
-}
-
-const ::google::protobuf::Message::ClassData GetConsoleTypesResponse::_class_data_ = {
-    GetConsoleTypesResponse::MergeImpl,
-    nullptr,  // OnDemandRegisterArenaDtor
-};
-const ::google::protobuf::Message::ClassData* GetConsoleTypesResponse::GetClassData() const {
-  return &_class_data_;
-}
-
-void GetConsoleTypesResponse::MergeImpl(::google::protobuf::Message& to_msg, const ::google::protobuf::Message& from_msg) {
-  auto* const _this = static_cast<GetConsoleTypesResponse*>(&to_msg);
-  auto& from = static_cast<const GetConsoleTypesResponse&>(from_msg);
-  // @@protoc_insertion_point(class_specific_merge_from_start:io.deephaven.proto.backplane.script.grpc.GetConsoleTypesResponse)
-  ABSL_DCHECK_NE(&from, _this);
-  ::uint32_t cached_has_bits = 0;
-  (void) cached_has_bits;
-
-  _this->_internal_mutable_console_types()->MergeFrom(from._internal_console_types());
-  _this->_internal_metadata_.MergeFrom<::google::protobuf::UnknownFieldSet>(from._internal_metadata_);
-}
-
-void GetConsoleTypesResponse::CopyFrom(const GetConsoleTypesResponse& from) {
-// @@protoc_insertion_point(class_specific_copy_from_start:io.deephaven.proto.backplane.script.grpc.GetConsoleTypesResponse)
-  if (&from == this) return;
-  Clear();
-  MergeFrom(from);
-}
-
-PROTOBUF_NOINLINE bool GetConsoleTypesResponse::IsInitialized() const {
-  return true;
-}
-
-::_pbi::CachedSize* GetConsoleTypesResponse::AccessCachedSize() const {
-  return &_impl_._cached_size_;
-}
-void GetConsoleTypesResponse::InternalSwap(GetConsoleTypesResponse* PROTOBUF_RESTRICT other) {
-  using std::swap;
-  _internal_metadata_.InternalSwap(&other->_internal_metadata_);
-  _impl_.console_types_.InternalSwap(&other->_impl_.console_types_);
-}
-
-::google::protobuf::Metadata GetConsoleTypesResponse::GetMetadata() const {
-  return ::_pbi::AssignDescriptors(
-      &descriptor_table_deephaven_2fproto_2fconsole_2eproto_getter, &descriptor_table_deephaven_2fproto_2fconsole_2eproto_once,
-      file_level_metadata_deephaven_2fproto_2fconsole_2eproto[1]);
-}
-// ===================================================================
-
-class StartConsoleRequest::_Internal {
- public:
-  using HasBits = decltype(std::declval<StartConsoleRequest>()._impl_._has_bits_);
-  static constexpr ::int32_t kHasBitsOffset =
-    8 * PROTOBUF_FIELD_OFFSET(StartConsoleRequest, _impl_._has_bits_);
-  static const ::io::deephaven::proto::backplane::grpc::Ticket& result_id(const StartConsoleRequest* msg);
-  static void set_has_result_id(HasBits* has_bits) {
-    (*has_bits)[0] |= 1u;
-  }
-};
-
-const ::io::deephaven::proto::backplane::grpc::Ticket& StartConsoleRequest::_Internal::result_id(const StartConsoleRequest* msg) {
-  return *msg->_impl_.result_id_;
-}
-void StartConsoleRequest::clear_result_id() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  if (_impl_.result_id_ != nullptr) _impl_.result_id_->Clear();
-  _impl_._has_bits_[0] &= ~0x00000001u;
-}
-StartConsoleRequest::StartConsoleRequest(::google::protobuf::Arena* arena)
-    : ::google::protobuf::Message(arena) {
-  SharedCtor(arena);
-  // @@protoc_insertion_point(arena_constructor:io.deephaven.proto.backplane.script.grpc.StartConsoleRequest)
-}
-inline PROTOBUF_NDEBUG_INLINE StartConsoleRequest::Impl_::Impl_(
-    ::google::protobuf::internal::InternalVisibility visibility, ::google::protobuf::Arena* arena,
-    const Impl_& from)
-      : _has_bits_{from._has_bits_},
-        _cached_size_{0},
-        session_type_(arena, from.session_type_) {}
-
-StartConsoleRequest::StartConsoleRequest(
-    ::google::protobuf::Arena* arena,
-    const StartConsoleRequest& from)
-    : ::google::protobuf::Message(arena) {
-  StartConsoleRequest* const _this = this;
-  (void)_this;
-  _internal_metadata_.MergeFrom<::google::protobuf::UnknownFieldSet>(
-      from._internal_metadata_);
-  new (&_impl_) Impl_(internal_visibility(), arena, from._impl_);
-  ::uint32_t cached_has_bits = _impl_._has_bits_[0];
-  _impl_.result_id_ = (cached_has_bits & 0x00000001u)
-                ? CreateMaybeMessage<::io::deephaven::proto::backplane::grpc::Ticket>(arena, *from._impl_.result_id_)
-                : nullptr;
-
-  // @@protoc_insertion_point(copy_constructor:io.deephaven.proto.backplane.script.grpc.StartConsoleRequest)
-}
-inline PROTOBUF_NDEBUG_INLINE StartConsoleRequest::Impl_::Impl_(
-    ::google::protobuf::internal::InternalVisibility visibility,
-    ::google::protobuf::Arena* arena)
-      : _cached_size_{0},
-        session_type_(arena) {}
-
-inline void StartConsoleRequest::SharedCtor(::_pb::Arena* arena) {
-  new (&_impl_) Impl_(internal_visibility(), arena);
-  _impl_.result_id_ = {};
-}
-StartConsoleRequest::~StartConsoleRequest() {
-  // @@protoc_insertion_point(destructor:io.deephaven.proto.backplane.script.grpc.StartConsoleRequest)
-  _internal_metadata_.Delete<::google::protobuf::UnknownFieldSet>();
-  SharedDtor();
-}
-inline void StartConsoleRequest::SharedDtor() {
-  ABSL_DCHECK(GetArena() == nullptr);
-  _impl_.session_type_.Destroy();
-  delete _impl_.result_id_;
-  _impl_.~Impl_();
-}
-
-PROTOBUF_NOINLINE void StartConsoleRequest::Clear() {
-// @@protoc_insertion_point(message_clear_start:io.deephaven.proto.backplane.script.grpc.StartConsoleRequest)
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  ::uint32_t cached_has_bits = 0;
-  // Prevent compiler warnings about cached_has_bits being unused
-  (void) cached_has_bits;
-
-  _impl_.session_type_.ClearToEmpty();
-  cached_has_bits = _impl_._has_bits_[0];
-  if (cached_has_bits & 0x00000001u) {
-    ABSL_DCHECK(_impl_.result_id_ != nullptr);
-    _impl_.result_id_->Clear();
-  }
-  _impl_._has_bits_.Clear();
-  _internal_metadata_.Clear<::google::protobuf::UnknownFieldSet>();
-}
-
-const char* StartConsoleRequest::_InternalParse(
-    const char* ptr, ::_pbi::ParseContext* ctx) {
-  ptr = ::_pbi::TcParser::ParseLoop(this, ptr, ctx, &_table_.header);
-  return ptr;
-}
-
-
-PROTOBUF_CONSTINIT PROTOBUF_ATTRIBUTE_INIT_PRIORITY1
-const ::_pbi::TcParseTable<1, 2, 1, 81, 2> StartConsoleRequest::_table_ = {
-  {
-    PROTOBUF_FIELD_OFFSET(StartConsoleRequest, _impl_._has_bits_),
-    0, // no _extensions_
-    2, 8,  // max_field_number, fast_idx_mask
-    offsetof(decltype(_table_), field_lookup_table),
-    4294967292,  // skipmap
-    offsetof(decltype(_table_), field_entries),
-    2,  // num_field_entries
-    1,  // num_aux_entries
-    offsetof(decltype(_table_), aux_entries),
-    &_StartConsoleRequest_default_instance_._instance,
-    ::_pbi::TcParser::GenericFallback,  // fallback
-  }, {{
-    // string session_type = 2;
-    {::_pbi::TcParser::FastUS1,
-     {18, 63, 0, PROTOBUF_FIELD_OFFSET(StartConsoleRequest, _impl_.session_type_)}},
-    // .io.deephaven.proto.backplane.grpc.Ticket result_id = 1;
-    {::_pbi::TcParser::FastMtS1,
-     {10, 0, 0, PROTOBUF_FIELD_OFFSET(StartConsoleRequest, _impl_.result_id_)}},
-  }}, {{
-    65535, 65535
-  }}, {{
-    // .io.deephaven.proto.backplane.grpc.Ticket result_id = 1;
-    {PROTOBUF_FIELD_OFFSET(StartConsoleRequest, _impl_.result_id_), _Internal::kHasBitsOffset + 0, 0,
-    (0 | ::_fl::kFcOptional | ::_fl::kMessage | ::_fl::kTvTable)},
-    // string session_type = 2;
-    {PROTOBUF_FIELD_OFFSET(StartConsoleRequest, _impl_.session_type_), -1, 0,
-    (0 | ::_fl::kFcSingular | ::_fl::kUtf8String | ::_fl::kRepAString)},
-  }}, {{
-    {::_pbi::TcParser::GetTable<::io::deephaven::proto::backplane::grpc::Ticket>()},
-  }}, {{
-    "\74\0\14\0\0\0\0\0"
-    "io.deephaven.proto.backplane.script.grpc.StartConsoleRequest"
-    "session_type"
-  }},
-};
-
-::uint8_t* StartConsoleRequest::_InternalSerialize(
-    ::uint8_t* target,
-    ::google::protobuf::io::EpsCopyOutputStream* stream) const {
-  // @@protoc_insertion_point(serialize_to_array_start:io.deephaven.proto.backplane.script.grpc.StartConsoleRequest)
-  ::uint32_t cached_has_bits = 0;
-  (void)cached_has_bits;
-
-  cached_has_bits = _impl_._has_bits_[0];
-  // .io.deephaven.proto.backplane.grpc.Ticket result_id = 1;
-  if (cached_has_bits & 0x00000001u) {
-    target = ::google::protobuf::internal::WireFormatLite::InternalWriteMessage(
-        1, _Internal::result_id(this),
-        _Internal::result_id(this).GetCachedSize(), target, stream);
-  }
-
-  // string session_type = 2;
-  if (!this->_internal_session_type().empty()) {
-    const std::string& _s = this->_internal_session_type();
-    ::google::protobuf::internal::WireFormatLite::VerifyUtf8String(
-        _s.data(), static_cast<int>(_s.length()), ::google::protobuf::internal::WireFormatLite::SERIALIZE, "io.deephaven.proto.backplane.script.grpc.StartConsoleRequest.session_type");
-    target = stream->WriteStringMaybeAliased(2, _s, target);
-  }
-
-  if (PROTOBUF_PREDICT_FALSE(_internal_metadata_.have_unknown_fields())) {
-    target =
-        ::_pbi::WireFormat::InternalSerializeUnknownFieldsToArray(
-            _internal_metadata_.unknown_fields<::google::protobuf::UnknownFieldSet>(::google::protobuf::UnknownFieldSet::default_instance), target, stream);
-  }
-  // @@protoc_insertion_point(serialize_to_array_end:io.deephaven.proto.backplane.script.grpc.StartConsoleRequest)
-  return target;
-}
-
-::size_t StartConsoleRequest::ByteSizeLong() const {
-// @@protoc_insertion_point(message_byte_size_start:io.deephaven.proto.backplane.script.grpc.StartConsoleRequest)
-  ::size_t total_size = 0;
-
-  ::uint32_t cached_has_bits = 0;
-  // Prevent compiler warnings about cached_has_bits being unused
-  (void) cached_has_bits;
-
-  // string session_type = 2;
-  if (!this->_internal_session_type().empty()) {
-    total_size += 1 + ::google::protobuf::internal::WireFormatLite::StringSize(
-                                    this->_internal_session_type());
-  }
-
-  // .io.deephaven.proto.backplane.grpc.Ticket result_id = 1;
-  cached_has_bits = _impl_._has_bits_[0];
-  if (cached_has_bits & 0x00000001u) {
-    total_size +=
-        1 + ::google::protobuf::internal::WireFormatLite::MessageSize(*_impl_.result_id_);
-  }
-
-  return MaybeComputeUnknownFieldsSize(total_size, &_impl_._cached_size_);
-}
-
-const ::google::protobuf::Message::ClassData StartConsoleRequest::_class_data_ = {
-    StartConsoleRequest::MergeImpl,
-    nullptr,  // OnDemandRegisterArenaDtor
-};
-const ::google::protobuf::Message::ClassData* StartConsoleRequest::GetClassData() const {
-  return &_class_data_;
-}
-
-void StartConsoleRequest::MergeImpl(::google::protobuf::Message& to_msg, const ::google::protobuf::Message& from_msg) {
-  auto* const _this = static_cast<StartConsoleRequest*>(&to_msg);
-  auto& from = static_cast<const StartConsoleRequest&>(from_msg);
-  // @@protoc_insertion_point(class_specific_merge_from_start:io.deephaven.proto.backplane.script.grpc.StartConsoleRequest)
-  ABSL_DCHECK_NE(&from, _this);
-  ::uint32_t cached_has_bits = 0;
-  (void) cached_has_bits;
-
-  if (!from._internal_session_type().empty()) {
-    _this->_internal_set_session_type(from._internal_session_type());
-  }
-  if ((from._impl_._has_bits_[0] & 0x00000001u) != 0) {
-    _this->_internal_mutable_result_id()->::io::deephaven::proto::backplane::grpc::Ticket::MergeFrom(
-        from._internal_result_id());
-  }
-  _this->_internal_metadata_.MergeFrom<::google::protobuf::UnknownFieldSet>(from._internal_metadata_);
-}
-
-void StartConsoleRequest::CopyFrom(const StartConsoleRequest& from) {
-// @@protoc_insertion_point(class_specific_copy_from_start:io.deephaven.proto.backplane.script.grpc.StartConsoleRequest)
-  if (&from == this) return;
-  Clear();
-  MergeFrom(from);
-}
-
-PROTOBUF_NOINLINE bool StartConsoleRequest::IsInitialized() const {
-  return true;
-}
-
-::_pbi::CachedSize* StartConsoleRequest::AccessCachedSize() const {
-  return &_impl_._cached_size_;
-}
-void StartConsoleRequest::InternalSwap(StartConsoleRequest* PROTOBUF_RESTRICT other) {
-  using std::swap;
-  auto* arena = GetArena();
-  ABSL_DCHECK_EQ(arena, other->GetArena());
-  _internal_metadata_.InternalSwap(&other->_internal_metadata_);
-  swap(_impl_._has_bits_[0], other->_impl_._has_bits_[0]);
-  ::_pbi::ArenaStringPtr::InternalSwap(&_impl_.session_type_, &other->_impl_.session_type_, arena);
-  swap(_impl_.result_id_, other->_impl_.result_id_);
-}
-
-::google::protobuf::Metadata StartConsoleRequest::GetMetadata() const {
-  return ::_pbi::AssignDescriptors(
-      &descriptor_table_deephaven_2fproto_2fconsole_2eproto_getter, &descriptor_table_deephaven_2fproto_2fconsole_2eproto_once,
-      file_level_metadata_deephaven_2fproto_2fconsole_2eproto[2]);
-}
-// ===================================================================
-
-class StartConsoleResponse::_Internal {
- public:
-  using HasBits = decltype(std::declval<StartConsoleResponse>()._impl_._has_bits_);
-  static constexpr ::int32_t kHasBitsOffset =
-    8 * PROTOBUF_FIELD_OFFSET(StartConsoleResponse, _impl_._has_bits_);
-  static const ::io::deephaven::proto::backplane::grpc::Ticket& result_id(const StartConsoleResponse* msg);
-  static void set_has_result_id(HasBits* has_bits) {
-    (*has_bits)[0] |= 1u;
-  }
-};
-
-const ::io::deephaven::proto::backplane::grpc::Ticket& StartConsoleResponse::_Internal::result_id(const StartConsoleResponse* msg) {
-  return *msg->_impl_.result_id_;
-}
-void StartConsoleResponse::clear_result_id() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  if (_impl_.result_id_ != nullptr) _impl_.result_id_->Clear();
-  _impl_._has_bits_[0] &= ~0x00000001u;
-}
-StartConsoleResponse::StartConsoleResponse(::google::protobuf::Arena* arena)
-    : ::google::protobuf::Message(arena) {
-  SharedCtor(arena);
-  // @@protoc_insertion_point(arena_constructor:io.deephaven.proto.backplane.script.grpc.StartConsoleResponse)
-}
-inline PROTOBUF_NDEBUG_INLINE StartConsoleResponse::Impl_::Impl_(
-    ::google::protobuf::internal::InternalVisibility visibility, ::google::protobuf::Arena* arena,
-    const Impl_& from)
-      : _has_bits_{from._has_bits_},
-        _cached_size_{0} {}
-
-StartConsoleResponse::StartConsoleResponse(
-    ::google::protobuf::Arena* arena,
-    const StartConsoleResponse& from)
-    : ::google::protobuf::Message(arena) {
-  StartConsoleResponse* const _this = this;
-  (void)_this;
-  _internal_metadata_.MergeFrom<::google::protobuf::UnknownFieldSet>(
-      from._internal_metadata_);
-  new (&_impl_) Impl_(internal_visibility(), arena, from._impl_);
-  ::uint32_t cached_has_bits = _impl_._has_bits_[0];
-  _impl_.result_id_ = (cached_has_bits & 0x00000001u)
-                ? CreateMaybeMessage<::io::deephaven::proto::backplane::grpc::Ticket>(arena, *from._impl_.result_id_)
-                : nullptr;
-
-  // @@protoc_insertion_point(copy_constructor:io.deephaven.proto.backplane.script.grpc.StartConsoleResponse)
-}
-inline PROTOBUF_NDEBUG_INLINE StartConsoleResponse::Impl_::Impl_(
-    ::google::protobuf::internal::InternalVisibility visibility,
-    ::google::protobuf::Arena* arena)
-      : _cached_size_{0} {}
-
-inline void StartConsoleResponse::SharedCtor(::_pb::Arena* arena) {
-  new (&_impl_) Impl_(internal_visibility(), arena);
-  _impl_.result_id_ = {};
-}
-StartConsoleResponse::~StartConsoleResponse() {
-  // @@protoc_insertion_point(destructor:io.deephaven.proto.backplane.script.grpc.StartConsoleResponse)
-  _internal_metadata_.Delete<::google::protobuf::UnknownFieldSet>();
-  SharedDtor();
-}
-inline void StartConsoleResponse::SharedDtor() {
-  ABSL_DCHECK(GetArena() == nullptr);
-  delete _impl_.result_id_;
-  _impl_.~Impl_();
-}
-
-PROTOBUF_NOINLINE void StartConsoleResponse::Clear() {
-// @@protoc_insertion_point(message_clear_start:io.deephaven.proto.backplane.script.grpc.StartConsoleResponse)
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  ::uint32_t cached_has_bits = 0;
-  // Prevent compiler warnings about cached_has_bits being unused
-  (void) cached_has_bits;
-
-  cached_has_bits = _impl_._has_bits_[0];
-  if (cached_has_bits & 0x00000001u) {
-    ABSL_DCHECK(_impl_.result_id_ != nullptr);
-    _impl_.result_id_->Clear();
-  }
-  _impl_._has_bits_.Clear();
-  _internal_metadata_.Clear<::google::protobuf::UnknownFieldSet>();
-}
-
-const char* StartConsoleResponse::_InternalParse(
-    const char* ptr, ::_pbi::ParseContext* ctx) {
-  ptr = ::_pbi::TcParser::ParseLoop(this, ptr, ctx, &_table_.header);
-  return ptr;
-}
-
-
-PROTOBUF_CONSTINIT PROTOBUF_ATTRIBUTE_INIT_PRIORITY1
-const ::_pbi::TcParseTable<0, 1, 1, 0, 2> StartConsoleResponse::_table_ = {
-  {
-    PROTOBUF_FIELD_OFFSET(StartConsoleResponse, _impl_._has_bits_),
-    0, // no _extensions_
-    1, 0,  // max_field_number, fast_idx_mask
-    offsetof(decltype(_table_), field_lookup_table),
-    4294967294,  // skipmap
-    offsetof(decltype(_table_), field_entries),
-    1,  // num_field_entries
-    1,  // num_aux_entries
-    offsetof(decltype(_table_), aux_entries),
-    &_StartConsoleResponse_default_instance_._instance,
-    ::_pbi::TcParser::GenericFallback,  // fallback
-  }, {{
-    // .io.deephaven.proto.backplane.grpc.Ticket result_id = 1;
-    {::_pbi::TcParser::FastMtS1,
-     {10, 0, 0, PROTOBUF_FIELD_OFFSET(StartConsoleResponse, _impl_.result_id_)}},
-  }}, {{
-    65535, 65535
-  }}, {{
-    // .io.deephaven.proto.backplane.grpc.Ticket result_id = 1;
-    {PROTOBUF_FIELD_OFFSET(StartConsoleResponse, _impl_.result_id_), _Internal::kHasBitsOffset + 0, 0,
-    (0 | ::_fl::kFcOptional | ::_fl::kMessage | ::_fl::kTvTable)},
-  }}, {{
-    {::_pbi::TcParser::GetTable<::io::deephaven::proto::backplane::grpc::Ticket>()},
-  }}, {{
-  }},
-};
-
-::uint8_t* StartConsoleResponse::_InternalSerialize(
-    ::uint8_t* target,
-    ::google::protobuf::io::EpsCopyOutputStream* stream) const {
-  // @@protoc_insertion_point(serialize_to_array_start:io.deephaven.proto.backplane.script.grpc.StartConsoleResponse)
-  ::uint32_t cached_has_bits = 0;
-  (void)cached_has_bits;
-
-  cached_has_bits = _impl_._has_bits_[0];
-  // .io.deephaven.proto.backplane.grpc.Ticket result_id = 1;
-  if (cached_has_bits & 0x00000001u) {
-    target = ::google::protobuf::internal::WireFormatLite::InternalWriteMessage(
-        1, _Internal::result_id(this),
-        _Internal::result_id(this).GetCachedSize(), target, stream);
-  }
-
-  if (PROTOBUF_PREDICT_FALSE(_internal_metadata_.have_unknown_fields())) {
-    target =
-        ::_pbi::WireFormat::InternalSerializeUnknownFieldsToArray(
-            _internal_metadata_.unknown_fields<::google::protobuf::UnknownFieldSet>(::google::protobuf::UnknownFieldSet::default_instance), target, stream);
-  }
-  // @@protoc_insertion_point(serialize_to_array_end:io.deephaven.proto.backplane.script.grpc.StartConsoleResponse)
-  return target;
-}
-
-::size_t StartConsoleResponse::ByteSizeLong() const {
-// @@protoc_insertion_point(message_byte_size_start:io.deephaven.proto.backplane.script.grpc.StartConsoleResponse)
-  ::size_t total_size = 0;
-
-  ::uint32_t cached_has_bits = 0;
-  // Prevent compiler warnings about cached_has_bits being unused
-  (void) cached_has_bits;
-
-  // .io.deephaven.proto.backplane.grpc.Ticket result_id = 1;
-  cached_has_bits = _impl_._has_bits_[0];
-  if (cached_has_bits & 0x00000001u) {
-    total_size +=
-        1 + ::google::protobuf::internal::WireFormatLite::MessageSize(*_impl_.result_id_);
-  }
-
-  return MaybeComputeUnknownFieldsSize(total_size, &_impl_._cached_size_);
-}
-
-const ::google::protobuf::Message::ClassData StartConsoleResponse::_class_data_ = {
-    StartConsoleResponse::MergeImpl,
-    nullptr,  // OnDemandRegisterArenaDtor
-};
-const ::google::protobuf::Message::ClassData* StartConsoleResponse::GetClassData() const {
-  return &_class_data_;
-}
-
-void StartConsoleResponse::MergeImpl(::google::protobuf::Message& to_msg, const ::google::protobuf::Message& from_msg) {
-  auto* const _this = static_cast<StartConsoleResponse*>(&to_msg);
-  auto& from = static_cast<const StartConsoleResponse&>(from_msg);
-  // @@protoc_insertion_point(class_specific_merge_from_start:io.deephaven.proto.backplane.script.grpc.StartConsoleResponse)
-  ABSL_DCHECK_NE(&from, _this);
-  ::uint32_t cached_has_bits = 0;
-  (void) cached_has_bits;
-
-  if ((from._impl_._has_bits_[0] & 0x00000001u) != 0) {
-    _this->_internal_mutable_result_id()->::io::deephaven::proto::backplane::grpc::Ticket::MergeFrom(
-        from._internal_result_id());
-  }
-  _this->_internal_metadata_.MergeFrom<::google::protobuf::UnknownFieldSet>(from._internal_metadata_);
-}
-
-void StartConsoleResponse::CopyFrom(const StartConsoleResponse& from) {
-// @@protoc_insertion_point(class_specific_copy_from_start:io.deephaven.proto.backplane.script.grpc.StartConsoleResponse)
-  if (&from == this) return;
-  Clear();
-  MergeFrom(from);
-}
-
-PROTOBUF_NOINLINE bool StartConsoleResponse::IsInitialized() const {
-  return true;
-}
-
-::_pbi::CachedSize* StartConsoleResponse::AccessCachedSize() const {
-  return &_impl_._cached_size_;
-}
-void StartConsoleResponse::InternalSwap(StartConsoleResponse* PROTOBUF_RESTRICT other) {
-  using std::swap;
-  _internal_metadata_.InternalSwap(&other->_internal_metadata_);
-  swap(_impl_._has_bits_[0], other->_impl_._has_bits_[0]);
-  swap(_impl_.result_id_, other->_impl_.result_id_);
-}
-
-::google::protobuf::Metadata StartConsoleResponse::GetMetadata() const {
-  return ::_pbi::AssignDescriptors(
-      &descriptor_table_deephaven_2fproto_2fconsole_2eproto_getter, &descriptor_table_deephaven_2fproto_2fconsole_2eproto_once,
-      file_level_metadata_deephaven_2fproto_2fconsole_2eproto[3]);
-}
-// ===================================================================
-
-class GetHeapInfoRequest::_Internal {
- public:
-};
-
-GetHeapInfoRequest::GetHeapInfoRequest(::google::protobuf::Arena* arena)
-    : ::google::protobuf::internal::ZeroFieldsBase(arena) {
-  // @@protoc_insertion_point(arena_constructor:io.deephaven.proto.backplane.script.grpc.GetHeapInfoRequest)
-}
-GetHeapInfoRequest::GetHeapInfoRequest(
-    ::google::protobuf::Arena* arena,
-    const GetHeapInfoRequest& from)
-    : ::google::protobuf::internal::ZeroFieldsBase(arena) {
-  GetHeapInfoRequest* const _this = this;
-  (void)_this;
-  _internal_metadata_.MergeFrom<::google::protobuf::UnknownFieldSet>(
-      from._internal_metadata_);
-
-  // @@protoc_insertion_point(copy_constructor:io.deephaven.proto.backplane.script.grpc.GetHeapInfoRequest)
-}
-
-
-
-
-
-
-
-
-
-::google::protobuf::Metadata GetHeapInfoRequest::GetMetadata() const {
-  return ::_pbi::AssignDescriptors(
-      &descriptor_table_deephaven_2fproto_2fconsole_2eproto_getter, &descriptor_table_deephaven_2fproto_2fconsole_2eproto_once,
-      file_level_metadata_deephaven_2fproto_2fconsole_2eproto[4]);
-}
-// ===================================================================
-
-class GetHeapInfoResponse::_Internal {
- public:
-};
-
-GetHeapInfoResponse::GetHeapInfoResponse(::google::protobuf::Arena* arena)
-    : ::google::protobuf::Message(arena) {
-  SharedCtor(arena);
-  // @@protoc_insertion_point(arena_constructor:io.deephaven.proto.backplane.script.grpc.GetHeapInfoResponse)
-}
-GetHeapInfoResponse::GetHeapInfoResponse(
-    ::google::protobuf::Arena* arena, const GetHeapInfoResponse& from)
-    : GetHeapInfoResponse(arena) {
-  MergeFrom(from);
-}
-inline PROTOBUF_NDEBUG_INLINE GetHeapInfoResponse::Impl_::Impl_(
-    ::google::protobuf::internal::InternalVisibility visibility,
-    ::google::protobuf::Arena* arena)
-      : _cached_size_{0} {}
-
-inline void GetHeapInfoResponse::SharedCtor(::_pb::Arena* arena) {
-  new (&_impl_) Impl_(internal_visibility(), arena);
-  ::memset(reinterpret_cast<char *>(&_impl_) +
-               offsetof(Impl_, max_memory_),
-           0,
-           offsetof(Impl_, free_memory_) -
-               offsetof(Impl_, max_memory_) +
-               sizeof(Impl_::free_memory_));
-}
-GetHeapInfoResponse::~GetHeapInfoResponse() {
-  // @@protoc_insertion_point(destructor:io.deephaven.proto.backplane.script.grpc.GetHeapInfoResponse)
-  _internal_metadata_.Delete<::google::protobuf::UnknownFieldSet>();
-  SharedDtor();
-}
-inline void GetHeapInfoResponse::SharedDtor() {
-  ABSL_DCHECK(GetArena() == nullptr);
-  _impl_.~Impl_();
-}
-
-PROTOBUF_NOINLINE void GetHeapInfoResponse::Clear() {
-// @@protoc_insertion_point(message_clear_start:io.deephaven.proto.backplane.script.grpc.GetHeapInfoResponse)
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  ::uint32_t cached_has_bits = 0;
-  // Prevent compiler warnings about cached_has_bits being unused
-  (void) cached_has_bits;
-
-  ::memset(&_impl_.max_memory_, 0, static_cast<::size_t>(
-      reinterpret_cast<char*>(&_impl_.free_memory_) -
-      reinterpret_cast<char*>(&_impl_.max_memory_)) + sizeof(_impl_.free_memory_));
-  _internal_metadata_.Clear<::google::protobuf::UnknownFieldSet>();
-}
-
-const char* GetHeapInfoResponse::_InternalParse(
-    const char* ptr, ::_pbi::ParseContext* ctx) {
-  ptr = ::_pbi::TcParser::ParseLoop(this, ptr, ctx, &_table_.header);
-  return ptr;
-}
-
-
-PROTOBUF_CONSTINIT PROTOBUF_ATTRIBUTE_INIT_PRIORITY1
-const ::_pbi::TcParseTable<2, 3, 0, 0, 2> GetHeapInfoResponse::_table_ = {
-  {
-    0,  // no _has_bits_
-    0, // no _extensions_
-    3, 24,  // max_field_number, fast_idx_mask
-    offsetof(decltype(_table_), field_lookup_table),
-    4294967288,  // skipmap
-    offsetof(decltype(_table_), field_entries),
-    3,  // num_field_entries
-    0,  // num_aux_entries
-    offsetof(decltype(_table_), field_names),  // no aux_entries
-    &_GetHeapInfoResponse_default_instance_._instance,
-    ::_pbi::TcParser::GenericFallback,  // fallback
-  }, {{
-    {::_pbi::TcParser::MiniParse, {}},
-    // int64 max_memory = 1 [jstype = JS_STRING];
-    {::_pbi::TcParser::SingularVarintNoZag1<::uint64_t, offsetof(GetHeapInfoResponse, _impl_.max_memory_), 63>(),
-     {8, 63, 0, PROTOBUF_FIELD_OFFSET(GetHeapInfoResponse, _impl_.max_memory_)}},
-    // int64 total_memory = 2 [jstype = JS_STRING];
-    {::_pbi::TcParser::SingularVarintNoZag1<::uint64_t, offsetof(GetHeapInfoResponse, _impl_.total_memory_), 63>(),
-     {16, 63, 0, PROTOBUF_FIELD_OFFSET(GetHeapInfoResponse, _impl_.total_memory_)}},
-    // int64 free_memory = 3 [jstype = JS_STRING];
-    {::_pbi::TcParser::SingularVarintNoZag1<::uint64_t, offsetof(GetHeapInfoResponse, _impl_.free_memory_), 63>(),
-     {24, 63, 0, PROTOBUF_FIELD_OFFSET(GetHeapInfoResponse, _impl_.free_memory_)}},
-  }}, {{
-    65535, 65535
-  }}, {{
-    // int64 max_memory = 1 [jstype = JS_STRING];
-    {PROTOBUF_FIELD_OFFSET(GetHeapInfoResponse, _impl_.max_memory_), 0, 0,
-    (0 | ::_fl::kFcSingular | ::_fl::kInt64)},
-    // int64 total_memory = 2 [jstype = JS_STRING];
-    {PROTOBUF_FIELD_OFFSET(GetHeapInfoResponse, _impl_.total_memory_), 0, 0,
-    (0 | ::_fl::kFcSingular | ::_fl::kInt64)},
-    // int64 free_memory = 3 [jstype = JS_STRING];
-    {PROTOBUF_FIELD_OFFSET(GetHeapInfoResponse, _impl_.free_memory_), 0, 0,
-    (0 | ::_fl::kFcSingular | ::_fl::kInt64)},
-  }},
-  // no aux_entries
-  {{
-  }},
-};
-
-::uint8_t* GetHeapInfoResponse::_InternalSerialize(
-    ::uint8_t* target,
-    ::google::protobuf::io::EpsCopyOutputStream* stream) const {
-  // @@protoc_insertion_point(serialize_to_array_start:io.deephaven.proto.backplane.script.grpc.GetHeapInfoResponse)
-  ::uint32_t cached_has_bits = 0;
-  (void)cached_has_bits;
-
-  // int64 max_memory = 1 [jstype = JS_STRING];
-  if (this->_internal_max_memory() != 0) {
-    target = ::google::protobuf::internal::WireFormatLite::
-        WriteInt64ToArrayWithField<1>(
-            stream, this->_internal_max_memory(), target);
-  }
-
-  // int64 total_memory = 2 [jstype = JS_STRING];
-  if (this->_internal_total_memory() != 0) {
-    target = ::google::protobuf::internal::WireFormatLite::
-        WriteInt64ToArrayWithField<2>(
-            stream, this->_internal_total_memory(), target);
-  }
-
-  // int64 free_memory = 3 [jstype = JS_STRING];
-  if (this->_internal_free_memory() != 0) {
-    target = ::google::protobuf::internal::WireFormatLite::
-        WriteInt64ToArrayWithField<3>(
-            stream, this->_internal_free_memory(), target);
-  }
-
-  if (PROTOBUF_PREDICT_FALSE(_internal_metadata_.have_unknown_fields())) {
-    target =
-        ::_pbi::WireFormat::InternalSerializeUnknownFieldsToArray(
-            _internal_metadata_.unknown_fields<::google::protobuf::UnknownFieldSet>(::google::protobuf::UnknownFieldSet::default_instance), target, stream);
-  }
-  // @@protoc_insertion_point(serialize_to_array_end:io.deephaven.proto.backplane.script.grpc.GetHeapInfoResponse)
-  return target;
-}
-
-::size_t GetHeapInfoResponse::ByteSizeLong() const {
-// @@protoc_insertion_point(message_byte_size_start:io.deephaven.proto.backplane.script.grpc.GetHeapInfoResponse)
-  ::size_t total_size = 0;
-
-  ::uint32_t cached_has_bits = 0;
-  // Prevent compiler warnings about cached_has_bits being unused
-  (void) cached_has_bits;
-
-  // int64 max_memory = 1 [jstype = JS_STRING];
-  if (this->_internal_max_memory() != 0) {
-    total_size += ::_pbi::WireFormatLite::Int64SizePlusOne(
-        this->_internal_max_memory());
-  }
-
-  // int64 total_memory = 2 [jstype = JS_STRING];
-  if (this->_internal_total_memory() != 0) {
-    total_size += ::_pbi::WireFormatLite::Int64SizePlusOne(
-        this->_internal_total_memory());
-  }
-
-  // int64 free_memory = 3 [jstype = JS_STRING];
-  if (this->_internal_free_memory() != 0) {
-    total_size += ::_pbi::WireFormatLite::Int64SizePlusOne(
-        this->_internal_free_memory());
-  }
-
-  return MaybeComputeUnknownFieldsSize(total_size, &_impl_._cached_size_);
-}
-
-const ::google::protobuf::Message::ClassData GetHeapInfoResponse::_class_data_ = {
-    GetHeapInfoResponse::MergeImpl,
-    nullptr,  // OnDemandRegisterArenaDtor
-};
-const ::google::protobuf::Message::ClassData* GetHeapInfoResponse::GetClassData() const {
-  return &_class_data_;
-}
-
-void GetHeapInfoResponse::MergeImpl(::google::protobuf::Message& to_msg, const ::google::protobuf::Message& from_msg) {
-  auto* const _this = static_cast<GetHeapInfoResponse*>(&to_msg);
-  auto& from = static_cast<const GetHeapInfoResponse&>(from_msg);
-  // @@protoc_insertion_point(class_specific_merge_from_start:io.deephaven.proto.backplane.script.grpc.GetHeapInfoResponse)
-  ABSL_DCHECK_NE(&from, _this);
-  ::uint32_t cached_has_bits = 0;
-  (void) cached_has_bits;
-
-  if (from._internal_max_memory() != 0) {
-    _this->_internal_set_max_memory(from._internal_max_memory());
-  }
-  if (from._internal_total_memory() != 0) {
-    _this->_internal_set_total_memory(from._internal_total_memory());
-  }
-  if (from._internal_free_memory() != 0) {
-    _this->_internal_set_free_memory(from._internal_free_memory());
-  }
-  _this->_internal_metadata_.MergeFrom<::google::protobuf::UnknownFieldSet>(from._internal_metadata_);
-}
-
-void GetHeapInfoResponse::CopyFrom(const GetHeapInfoResponse& from) {
-// @@protoc_insertion_point(class_specific_copy_from_start:io.deephaven.proto.backplane.script.grpc.GetHeapInfoResponse)
-  if (&from == this) return;
-  Clear();
-  MergeFrom(from);
-}
-
-PROTOBUF_NOINLINE bool GetHeapInfoResponse::IsInitialized() const {
-  return true;
-}
-
-::_pbi::CachedSize* GetHeapInfoResponse::AccessCachedSize() const {
-  return &_impl_._cached_size_;
-}
-void GetHeapInfoResponse::InternalSwap(GetHeapInfoResponse* PROTOBUF_RESTRICT other) {
-  using std::swap;
-  _internal_metadata_.InternalSwap(&other->_internal_metadata_);
-  ::google::protobuf::internal::memswap<
-      PROTOBUF_FIELD_OFFSET(GetHeapInfoResponse, _impl_.free_memory_)
-      + sizeof(GetHeapInfoResponse::_impl_.free_memory_)
-      - PROTOBUF_FIELD_OFFSET(GetHeapInfoResponse, _impl_.max_memory_)>(
-          reinterpret_cast<char*>(&_impl_.max_memory_),
-          reinterpret_cast<char*>(&other->_impl_.max_memory_));
-}
-
-::google::protobuf::Metadata GetHeapInfoResponse::GetMetadata() const {
-  return ::_pbi::AssignDescriptors(
-      &descriptor_table_deephaven_2fproto_2fconsole_2eproto_getter, &descriptor_table_deephaven_2fproto_2fconsole_2eproto_once,
-      file_level_metadata_deephaven_2fproto_2fconsole_2eproto[5]);
-}
-// ===================================================================
-
-class LogSubscriptionRequest::_Internal {
- public:
-};
-
-LogSubscriptionRequest::LogSubscriptionRequest(::google::protobuf::Arena* arena)
-    : ::google::protobuf::Message(arena) {
-  SharedCtor(arena);
-  // @@protoc_insertion_point(arena_constructor:io.deephaven.proto.backplane.script.grpc.LogSubscriptionRequest)
-}
-inline PROTOBUF_NDEBUG_INLINE LogSubscriptionRequest::Impl_::Impl_(
-    ::google::protobuf::internal::InternalVisibility visibility, ::google::protobuf::Arena* arena,
-    const Impl_& from)
-      : levels_{visibility, arena, from.levels_},
-        _cached_size_{0} {}
-
-LogSubscriptionRequest::LogSubscriptionRequest(
-    ::google::protobuf::Arena* arena,
-    const LogSubscriptionRequest& from)
-    : ::google::protobuf::Message(arena) {
-  LogSubscriptionRequest* const _this = this;
-  (void)_this;
-  _internal_metadata_.MergeFrom<::google::protobuf::UnknownFieldSet>(
-      from._internal_metadata_);
-  new (&_impl_) Impl_(internal_visibility(), arena, from._impl_);
-  _impl_.last_seen_log_timestamp_ = from._impl_.last_seen_log_timestamp_;
-
-  // @@protoc_insertion_point(copy_constructor:io.deephaven.proto.backplane.script.grpc.LogSubscriptionRequest)
-}
-inline PROTOBUF_NDEBUG_INLINE LogSubscriptionRequest::Impl_::Impl_(
-    ::google::protobuf::internal::InternalVisibility visibility,
-    ::google::protobuf::Arena* arena)
-      : levels_{visibility, arena},
-        _cached_size_{0} {}
-
-inline void LogSubscriptionRequest::SharedCtor(::_pb::Arena* arena) {
-  new (&_impl_) Impl_(internal_visibility(), arena);
-  _impl_.last_seen_log_timestamp_ = {};
-}
-LogSubscriptionRequest::~LogSubscriptionRequest() {
-  // @@protoc_insertion_point(destructor:io.deephaven.proto.backplane.script.grpc.LogSubscriptionRequest)
-  _internal_metadata_.Delete<::google::protobuf::UnknownFieldSet>();
-  SharedDtor();
-}
-inline void LogSubscriptionRequest::SharedDtor() {
-  ABSL_DCHECK(GetArena() == nullptr);
-  _impl_.~Impl_();
-}
-
-PROTOBUF_NOINLINE void LogSubscriptionRequest::Clear() {
-// @@protoc_insertion_point(message_clear_start:io.deephaven.proto.backplane.script.grpc.LogSubscriptionRequest)
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  ::uint32_t cached_has_bits = 0;
-  // Prevent compiler warnings about cached_has_bits being unused
-  (void) cached_has_bits;
-
-  _impl_.levels_.Clear();
-  _impl_.last_seen_log_timestamp_ = ::int64_t{0};
-  _internal_metadata_.Clear<::google::protobuf::UnknownFieldSet>();
-}
-
-const char* LogSubscriptionRequest::_InternalParse(
-    const char* ptr, ::_pbi::ParseContext* ctx) {
-  ptr = ::_pbi::TcParser::ParseLoop(this, ptr, ctx, &_table_.header);
-  return ptr;
-}
-
-
-PROTOBUF_CONSTINIT PROTOBUF_ATTRIBUTE_INIT_PRIORITY1
-const ::_pbi::TcParseTable<1, 2, 0, 78, 2> LogSubscriptionRequest::_table_ = {
-  {
-    0,  // no _has_bits_
-    0, // no _extensions_
-    2, 8,  // max_field_number, fast_idx_mask
-    offsetof(decltype(_table_), field_lookup_table),
-    4294967292,  // skipmap
-    offsetof(decltype(_table_), field_entries),
-    2,  // num_field_entries
-    0,  // num_aux_entries
-    offsetof(decltype(_table_), field_names),  // no aux_entries
-    &_LogSubscriptionRequest_default_instance_._instance,
-    ::_pbi::TcParser::GenericFallback,  // fallback
-  }, {{
-    // repeated string levels = 2;
-    {::_pbi::TcParser::FastUR1,
-     {18, 63, 0, PROTOBUF_FIELD_OFFSET(LogSubscriptionRequest, _impl_.levels_)}},
-    // int64 last_seen_log_timestamp = 1 [jstype = JS_STRING];
-    {::_pbi::TcParser::SingularVarintNoZag1<::uint64_t, offsetof(LogSubscriptionRequest, _impl_.last_seen_log_timestamp_), 63>(),
-     {8, 63, 0, PROTOBUF_FIELD_OFFSET(LogSubscriptionRequest, _impl_.last_seen_log_timestamp_)}},
-  }}, {{
-    65535, 65535
-  }}, {{
-    // int64 last_seen_log_timestamp = 1 [jstype = JS_STRING];
-    {PROTOBUF_FIELD_OFFSET(LogSubscriptionRequest, _impl_.last_seen_log_timestamp_), 0, 0,
-    (0 | ::_fl::kFcSingular | ::_fl::kInt64)},
-    // repeated string levels = 2;
-    {PROTOBUF_FIELD_OFFSET(LogSubscriptionRequest, _impl_.levels_), 0, 0,
-    (0 | ::_fl::kFcRepeated | ::_fl::kUtf8String | ::_fl::kRepSString)},
-  }},
-  // no aux_entries
-  {{
-    "\77\0\6\0\0\0\0\0"
-    "io.deephaven.proto.backplane.script.grpc.LogSubscriptionRequest"
-    "levels"
-  }},
-};
-
-::uint8_t* LogSubscriptionRequest::_InternalSerialize(
-    ::uint8_t* target,
-    ::google::protobuf::io::EpsCopyOutputStream* stream) const {
-  // @@protoc_insertion_point(serialize_to_array_start:io.deephaven.proto.backplane.script.grpc.LogSubscriptionRequest)
-  ::uint32_t cached_has_bits = 0;
-  (void)cached_has_bits;
-
-  // int64 last_seen_log_timestamp = 1 [jstype = JS_STRING];
-  if (this->_internal_last_seen_log_timestamp() != 0) {
-    target = ::google::protobuf::internal::WireFormatLite::
-        WriteInt64ToArrayWithField<1>(
-            stream, this->_internal_last_seen_log_timestamp(), target);
-  }
-
-  // repeated string levels = 2;
-  for (int i = 0, n = this->_internal_levels_size(); i < n; ++i) {
-    const auto& s = this->_internal_levels().Get(i);
-    ::google::protobuf::internal::WireFormatLite::VerifyUtf8String(
-        s.data(), static_cast<int>(s.length()), ::google::protobuf::internal::WireFormatLite::SERIALIZE, "io.deephaven.proto.backplane.script.grpc.LogSubscriptionRequest.levels");
-    target = stream->WriteString(2, s, target);
-  }
-
-  if (PROTOBUF_PREDICT_FALSE(_internal_metadata_.have_unknown_fields())) {
-    target =
-        ::_pbi::WireFormat::InternalSerializeUnknownFieldsToArray(
-            _internal_metadata_.unknown_fields<::google::protobuf::UnknownFieldSet>(::google::protobuf::UnknownFieldSet::default_instance), target, stream);
-  }
-  // @@protoc_insertion_point(serialize_to_array_end:io.deephaven.proto.backplane.script.grpc.LogSubscriptionRequest)
-  return target;
-}
-
-::size_t LogSubscriptionRequest::ByteSizeLong() const {
-// @@protoc_insertion_point(message_byte_size_start:io.deephaven.proto.backplane.script.grpc.LogSubscriptionRequest)
-  ::size_t total_size = 0;
-
-  ::uint32_t cached_has_bits = 0;
-  // Prevent compiler warnings about cached_has_bits being unused
-  (void) cached_has_bits;
-
-  // repeated string levels = 2;
-  total_size += 1 * ::google::protobuf::internal::FromIntSize(_internal_levels().size());
-  for (int i = 0, n = _internal_levels().size(); i < n; ++i) {
-    total_size += ::google::protobuf::internal::WireFormatLite::StringSize(
-        _internal_levels().Get(i));
-  }
-  // int64 last_seen_log_timestamp = 1 [jstype = JS_STRING];
-  if (this->_internal_last_seen_log_timestamp() != 0) {
-    total_size += ::_pbi::WireFormatLite::Int64SizePlusOne(
-        this->_internal_last_seen_log_timestamp());
-  }
-
-  return MaybeComputeUnknownFieldsSize(total_size, &_impl_._cached_size_);
-}
-
-const ::google::protobuf::Message::ClassData LogSubscriptionRequest::_class_data_ = {
-    LogSubscriptionRequest::MergeImpl,
-    nullptr,  // OnDemandRegisterArenaDtor
-};
-const ::google::protobuf::Message::ClassData* LogSubscriptionRequest::GetClassData() const {
-  return &_class_data_;
-}
-
-void LogSubscriptionRequest::MergeImpl(::google::protobuf::Message& to_msg, const ::google::protobuf::Message& from_msg) {
-  auto* const _this = static_cast<LogSubscriptionRequest*>(&to_msg);
-  auto& from = static_cast<const LogSubscriptionRequest&>(from_msg);
-  // @@protoc_insertion_point(class_specific_merge_from_start:io.deephaven.proto.backplane.script.grpc.LogSubscriptionRequest)
-  ABSL_DCHECK_NE(&from, _this);
-  ::uint32_t cached_has_bits = 0;
-  (void) cached_has_bits;
-
-  _this->_internal_mutable_levels()->MergeFrom(from._internal_levels());
-  if (from._internal_last_seen_log_timestamp() != 0) {
-    _this->_internal_set_last_seen_log_timestamp(from._internal_last_seen_log_timestamp());
-  }
-  _this->_internal_metadata_.MergeFrom<::google::protobuf::UnknownFieldSet>(from._internal_metadata_);
-}
-
-void LogSubscriptionRequest::CopyFrom(const LogSubscriptionRequest& from) {
-// @@protoc_insertion_point(class_specific_copy_from_start:io.deephaven.proto.backplane.script.grpc.LogSubscriptionRequest)
-  if (&from == this) return;
-  Clear();
-  MergeFrom(from);
-}
-
-PROTOBUF_NOINLINE bool LogSubscriptionRequest::IsInitialized() const {
-  return true;
-}
-
-::_pbi::CachedSize* LogSubscriptionRequest::AccessCachedSize() const {
-  return &_impl_._cached_size_;
-}
-void LogSubscriptionRequest::InternalSwap(LogSubscriptionRequest* PROTOBUF_RESTRICT other) {
-  using std::swap;
-  _internal_metadata_.InternalSwap(&other->_internal_metadata_);
-  _impl_.levels_.InternalSwap(&other->_impl_.levels_);
-        swap(_impl_.last_seen_log_timestamp_, other->_impl_.last_seen_log_timestamp_);
-}
-
-::google::protobuf::Metadata LogSubscriptionRequest::GetMetadata() const {
-  return ::_pbi::AssignDescriptors(
-      &descriptor_table_deephaven_2fproto_2fconsole_2eproto_getter, &descriptor_table_deephaven_2fproto_2fconsole_2eproto_once,
-      file_level_metadata_deephaven_2fproto_2fconsole_2eproto[6]);
-}
-// ===================================================================
-
-class LogSubscriptionData::_Internal {
- public:
-};
-
-LogSubscriptionData::LogSubscriptionData(::google::protobuf::Arena* arena)
-    : ::google::protobuf::Message(arena) {
-  SharedCtor(arena);
-  // @@protoc_insertion_point(arena_constructor:io.deephaven.proto.backplane.script.grpc.LogSubscriptionData)
-}
-inline PROTOBUF_NDEBUG_INLINE LogSubscriptionData::Impl_::Impl_(
-    ::google::protobuf::internal::InternalVisibility visibility, ::google::protobuf::Arena* arena,
-    const Impl_& from)
-      : log_level_(arena, from.log_level_),
-        message_(arena, from.message_),
-        _cached_size_{0} {}
-
-LogSubscriptionData::LogSubscriptionData(
-    ::google::protobuf::Arena* arena,
-    const LogSubscriptionData& from)
-    : ::google::protobuf::Message(arena) {
-  LogSubscriptionData* const _this = this;
-  (void)_this;
-  _internal_metadata_.MergeFrom<::google::protobuf::UnknownFieldSet>(
-      from._internal_metadata_);
-  new (&_impl_) Impl_(internal_visibility(), arena, from._impl_);
-  _impl_.micros_ = from._impl_.micros_;
-
-  // @@protoc_insertion_point(copy_constructor:io.deephaven.proto.backplane.script.grpc.LogSubscriptionData)
-}
-inline PROTOBUF_NDEBUG_INLINE LogSubscriptionData::Impl_::Impl_(
-    ::google::protobuf::internal::InternalVisibility visibility,
-    ::google::protobuf::Arena* arena)
-      : log_level_(arena),
-        message_(arena),
-        _cached_size_{0} {}
-
-inline void LogSubscriptionData::SharedCtor(::_pb::Arena* arena) {
-  new (&_impl_) Impl_(internal_visibility(), arena);
-  _impl_.micros_ = {};
-}
-LogSubscriptionData::~LogSubscriptionData() {
-  // @@protoc_insertion_point(destructor:io.deephaven.proto.backplane.script.grpc.LogSubscriptionData)
-  _internal_metadata_.Delete<::google::protobuf::UnknownFieldSet>();
-  SharedDtor();
-}
-inline void LogSubscriptionData::SharedDtor() {
-  ABSL_DCHECK(GetArena() == nullptr);
-  _impl_.log_level_.Destroy();
-  _impl_.message_.Destroy();
-  _impl_.~Impl_();
-}
-
-PROTOBUF_NOINLINE void LogSubscriptionData::Clear() {
-// @@protoc_insertion_point(message_clear_start:io.deephaven.proto.backplane.script.grpc.LogSubscriptionData)
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  ::uint32_t cached_has_bits = 0;
-  // Prevent compiler warnings about cached_has_bits being unused
-  (void) cached_has_bits;
-
-  _impl_.log_level_.ClearToEmpty();
-  _impl_.message_.ClearToEmpty();
-  _impl_.micros_ = ::int64_t{0};
-  _internal_metadata_.Clear<::google::protobuf::UnknownFieldSet>();
-}
-
-const char* LogSubscriptionData::_InternalParse(
-    const char* ptr, ::_pbi::ParseContext* ctx) {
-  ptr = ::_pbi::TcParser::ParseLoop(this, ptr, ctx, &_table_.header);
-  return ptr;
-}
-
-
-PROTOBUF_CONSTINIT PROTOBUF_ATTRIBUTE_INIT_PRIORITY1
-const ::_pbi::TcParseTable<2, 3, 0, 85, 2> LogSubscriptionData::_table_ = {
-  {
-    0,  // no _has_bits_
-    0, // no _extensions_
-    3, 24,  // max_field_number, fast_idx_mask
-    offsetof(decltype(_table_), field_lookup_table),
-    4294967288,  // skipmap
-    offsetof(decltype(_table_), field_entries),
-    3,  // num_field_entries
-    0,  // num_aux_entries
-    offsetof(decltype(_table_), field_names),  // no aux_entries
-    &_LogSubscriptionData_default_instance_._instance,
-    ::_pbi::TcParser::GenericFallback,  // fallback
-  }, {{
-    {::_pbi::TcParser::MiniParse, {}},
-    // int64 micros = 1 [jstype = JS_STRING];
-    {::_pbi::TcParser::SingularVarintNoZag1<::uint64_t, offsetof(LogSubscriptionData, _impl_.micros_), 63>(),
-     {8, 63, 0, PROTOBUF_FIELD_OFFSET(LogSubscriptionData, _impl_.micros_)}},
-    // string log_level = 2;
-    {::_pbi::TcParser::FastUS1,
-     {18, 63, 0, PROTOBUF_FIELD_OFFSET(LogSubscriptionData, _impl_.log_level_)}},
-    // string message = 3;
-    {::_pbi::TcParser::FastUS1,
-     {26, 63, 0, PROTOBUF_FIELD_OFFSET(LogSubscriptionData, _impl_.message_)}},
-  }}, {{
-    65535, 65535
-  }}, {{
-    // int64 micros = 1 [jstype = JS_STRING];
-    {PROTOBUF_FIELD_OFFSET(LogSubscriptionData, _impl_.micros_), 0, 0,
-    (0 | ::_fl::kFcSingular | ::_fl::kInt64)},
-    // string log_level = 2;
-    {PROTOBUF_FIELD_OFFSET(LogSubscriptionData, _impl_.log_level_), 0, 0,
-    (0 | ::_fl::kFcSingular | ::_fl::kUtf8String | ::_fl::kRepAString)},
-    // string message = 3;
-    {PROTOBUF_FIELD_OFFSET(LogSubscriptionData, _impl_.message_), 0, 0,
-    (0 | ::_fl::kFcSingular | ::_fl::kUtf8String | ::_fl::kRepAString)},
-  }},
-  // no aux_entries
-  {{
-    "\74\0\11\7\0\0\0\0"
-    "io.deephaven.proto.backplane.script.grpc.LogSubscriptionData"
-    "log_level"
-    "message"
-  }},
-};
-
-::uint8_t* LogSubscriptionData::_InternalSerialize(
-    ::uint8_t* target,
-    ::google::protobuf::io::EpsCopyOutputStream* stream) const {
-  // @@protoc_insertion_point(serialize_to_array_start:io.deephaven.proto.backplane.script.grpc.LogSubscriptionData)
-  ::uint32_t cached_has_bits = 0;
-  (void)cached_has_bits;
-
-  // int64 micros = 1 [jstype = JS_STRING];
-  if (this->_internal_micros() != 0) {
-    target = ::google::protobuf::internal::WireFormatLite::
-        WriteInt64ToArrayWithField<1>(
-            stream, this->_internal_micros(), target);
-  }
-
-  // string log_level = 2;
-  if (!this->_internal_log_level().empty()) {
-    const std::string& _s = this->_internal_log_level();
-    ::google::protobuf::internal::WireFormatLite::VerifyUtf8String(
-        _s.data(), static_cast<int>(_s.length()), ::google::protobuf::internal::WireFormatLite::SERIALIZE, "io.deephaven.proto.backplane.script.grpc.LogSubscriptionData.log_level");
-    target = stream->WriteStringMaybeAliased(2, _s, target);
-  }
-
-  // string message = 3;
-  if (!this->_internal_message().empty()) {
-    const std::string& _s = this->_internal_message();
-    ::google::protobuf::internal::WireFormatLite::VerifyUtf8String(
-        _s.data(), static_cast<int>(_s.length()), ::google::protobuf::internal::WireFormatLite::SERIALIZE, "io.deephaven.proto.backplane.script.grpc.LogSubscriptionData.message");
-    target = stream->WriteStringMaybeAliased(3, _s, target);
-  }
-
-  if (PROTOBUF_PREDICT_FALSE(_internal_metadata_.have_unknown_fields())) {
-    target =
-        ::_pbi::WireFormat::InternalSerializeUnknownFieldsToArray(
-            _internal_metadata_.unknown_fields<::google::protobuf::UnknownFieldSet>(::google::protobuf::UnknownFieldSet::default_instance), target, stream);
-  }
-  // @@protoc_insertion_point(serialize_to_array_end:io.deephaven.proto.backplane.script.grpc.LogSubscriptionData)
-  return target;
-}
-
-::size_t LogSubscriptionData::ByteSizeLong() const {
-// @@protoc_insertion_point(message_byte_size_start:io.deephaven.proto.backplane.script.grpc.LogSubscriptionData)
-  ::size_t total_size = 0;
-
-  ::uint32_t cached_has_bits = 0;
-  // Prevent compiler warnings about cached_has_bits being unused
-  (void) cached_has_bits;
-
-  // string log_level = 2;
-  if (!this->_internal_log_level().empty()) {
-    total_size += 1 + ::google::protobuf::internal::WireFormatLite::StringSize(
-                                    this->_internal_log_level());
-  }
-
-  // string message = 3;
-  if (!this->_internal_message().empty()) {
-    total_size += 1 + ::google::protobuf::internal::WireFormatLite::StringSize(
-                                    this->_internal_message());
-  }
-
-  // int64 micros = 1 [jstype = JS_STRING];
-  if (this->_internal_micros() != 0) {
-    total_size += ::_pbi::WireFormatLite::Int64SizePlusOne(
-        this->_internal_micros());
-  }
-
-  return MaybeComputeUnknownFieldsSize(total_size, &_impl_._cached_size_);
-}
-
-const ::google::protobuf::Message::ClassData LogSubscriptionData::_class_data_ = {
-    LogSubscriptionData::MergeImpl,
-    nullptr,  // OnDemandRegisterArenaDtor
-};
-const ::google::protobuf::Message::ClassData* LogSubscriptionData::GetClassData() const {
-  return &_class_data_;
-}
-
-void LogSubscriptionData::MergeImpl(::google::protobuf::Message& to_msg, const ::google::protobuf::Message& from_msg) {
-  auto* const _this = static_cast<LogSubscriptionData*>(&to_msg);
-  auto& from = static_cast<const LogSubscriptionData&>(from_msg);
-  // @@protoc_insertion_point(class_specific_merge_from_start:io.deephaven.proto.backplane.script.grpc.LogSubscriptionData)
-  ABSL_DCHECK_NE(&from, _this);
-  ::uint32_t cached_has_bits = 0;
-  (void) cached_has_bits;
-
-  if (!from._internal_log_level().empty()) {
-    _this->_internal_set_log_level(from._internal_log_level());
-  }
-  if (!from._internal_message().empty()) {
-    _this->_internal_set_message(from._internal_message());
-  }
-  if (from._internal_micros() != 0) {
-    _this->_internal_set_micros(from._internal_micros());
-  }
-  _this->_internal_metadata_.MergeFrom<::google::protobuf::UnknownFieldSet>(from._internal_metadata_);
-}
-
-void LogSubscriptionData::CopyFrom(const LogSubscriptionData& from) {
-// @@protoc_insertion_point(class_specific_copy_from_start:io.deephaven.proto.backplane.script.grpc.LogSubscriptionData)
-  if (&from == this) return;
-  Clear();
-  MergeFrom(from);
-}
-
-PROTOBUF_NOINLINE bool LogSubscriptionData::IsInitialized() const {
-  return true;
-}
-
-::_pbi::CachedSize* LogSubscriptionData::AccessCachedSize() const {
-  return &_impl_._cached_size_;
-}
-void LogSubscriptionData::InternalSwap(LogSubscriptionData* PROTOBUF_RESTRICT other) {
-  using std::swap;
-  auto* arena = GetArena();
-  ABSL_DCHECK_EQ(arena, other->GetArena());
-  _internal_metadata_.InternalSwap(&other->_internal_metadata_);
-  ::_pbi::ArenaStringPtr::InternalSwap(&_impl_.log_level_, &other->_impl_.log_level_, arena);
-  ::_pbi::ArenaStringPtr::InternalSwap(&_impl_.message_, &other->_impl_.message_, arena);
-        swap(_impl_.micros_, other->_impl_.micros_);
-}
-
-::google::protobuf::Metadata LogSubscriptionData::GetMetadata() const {
-  return ::_pbi::AssignDescriptors(
-      &descriptor_table_deephaven_2fproto_2fconsole_2eproto_getter, &descriptor_table_deephaven_2fproto_2fconsole_2eproto_once,
-      file_level_metadata_deephaven_2fproto_2fconsole_2eproto[7]);
-}
-// ===================================================================
-
-class ExecuteCommandRequest::_Internal {
- public:
-  using HasBits = decltype(std::declval<ExecuteCommandRequest>()._impl_._has_bits_);
-  static constexpr ::int32_t kHasBitsOffset =
-    8 * PROTOBUF_FIELD_OFFSET(ExecuteCommandRequest, _impl_._has_bits_);
-  static const ::io::deephaven::proto::backplane::grpc::Ticket& console_id(const ExecuteCommandRequest* msg);
-  static void set_has_console_id(HasBits* has_bits) {
-    (*has_bits)[0] |= 1u;
-  }
-};
-
-const ::io::deephaven::proto::backplane::grpc::Ticket& ExecuteCommandRequest::_Internal::console_id(const ExecuteCommandRequest* msg) {
-  return *msg->_impl_.console_id_;
-}
-void ExecuteCommandRequest::clear_console_id() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  if (_impl_.console_id_ != nullptr) _impl_.console_id_->Clear();
-  _impl_._has_bits_[0] &= ~0x00000001u;
-}
-ExecuteCommandRequest::ExecuteCommandRequest(::google::protobuf::Arena* arena)
-    : ::google::protobuf::Message(arena) {
-  SharedCtor(arena);
-  // @@protoc_insertion_point(arena_constructor:io.deephaven.proto.backplane.script.grpc.ExecuteCommandRequest)
-}
-inline PROTOBUF_NDEBUG_INLINE ExecuteCommandRequest::Impl_::Impl_(
-    ::google::protobuf::internal::InternalVisibility visibility, ::google::protobuf::Arena* arena,
-    const Impl_& from)
-      : _has_bits_{from._has_bits_},
-        _cached_size_{0},
-        code_(arena, from.code_) {}
-
-ExecuteCommandRequest::ExecuteCommandRequest(
-    ::google::protobuf::Arena* arena,
-    const ExecuteCommandRequest& from)
-    : ::google::protobuf::Message(arena) {
-  ExecuteCommandRequest* const _this = this;
-  (void)_this;
-  _internal_metadata_.MergeFrom<::google::protobuf::UnknownFieldSet>(
-      from._internal_metadata_);
-  new (&_impl_) Impl_(internal_visibility(), arena, from._impl_);
-  ::uint32_t cached_has_bits = _impl_._has_bits_[0];
-  _impl_.console_id_ = (cached_has_bits & 0x00000001u)
-                ? CreateMaybeMessage<::io::deephaven::proto::backplane::grpc::Ticket>(arena, *from._impl_.console_id_)
-                : nullptr;
-
-  // @@protoc_insertion_point(copy_constructor:io.deephaven.proto.backplane.script.grpc.ExecuteCommandRequest)
-}
-inline PROTOBUF_NDEBUG_INLINE ExecuteCommandRequest::Impl_::Impl_(
-    ::google::protobuf::internal::InternalVisibility visibility,
-    ::google::protobuf::Arena* arena)
-      : _cached_size_{0},
-        code_(arena) {}
-
-inline void ExecuteCommandRequest::SharedCtor(::_pb::Arena* arena) {
-  new (&_impl_) Impl_(internal_visibility(), arena);
-  _impl_.console_id_ = {};
-}
-ExecuteCommandRequest::~ExecuteCommandRequest() {
-  // @@protoc_insertion_point(destructor:io.deephaven.proto.backplane.script.grpc.ExecuteCommandRequest)
-  _internal_metadata_.Delete<::google::protobuf::UnknownFieldSet>();
-  SharedDtor();
-}
-inline void ExecuteCommandRequest::SharedDtor() {
-  ABSL_DCHECK(GetArena() == nullptr);
-  _impl_.code_.Destroy();
-  delete _impl_.console_id_;
-  _impl_.~Impl_();
-}
-
-PROTOBUF_NOINLINE void ExecuteCommandRequest::Clear() {
-// @@protoc_insertion_point(message_clear_start:io.deephaven.proto.backplane.script.grpc.ExecuteCommandRequest)
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  ::uint32_t cached_has_bits = 0;
-  // Prevent compiler warnings about cached_has_bits being unused
-  (void) cached_has_bits;
-
-  _impl_.code_.ClearToEmpty();
-  cached_has_bits = _impl_._has_bits_[0];
-  if (cached_has_bits & 0x00000001u) {
-    ABSL_DCHECK(_impl_.console_id_ != nullptr);
-    _impl_.console_id_->Clear();
-  }
-  _impl_._has_bits_.Clear();
-  _internal_metadata_.Clear<::google::protobuf::UnknownFieldSet>();
-}
-
-const char* ExecuteCommandRequest::_InternalParse(
-    const char* ptr, ::_pbi::ParseContext* ctx) {
-  ptr = ::_pbi::TcParser::ParseLoop(this, ptr, ctx, &_table_.header);
-  return ptr;
-}
-
-
-PROTOBUF_CONSTINIT PROTOBUF_ATTRIBUTE_INIT_PRIORITY1
-const ::_pbi::TcParseTable<2, 2, 1, 75, 2> ExecuteCommandRequest::_table_ = {
-  {
-    PROTOBUF_FIELD_OFFSET(ExecuteCommandRequest, _impl_._has_bits_),
-    0, // no _extensions_
-    3, 24,  // max_field_number, fast_idx_mask
-    offsetof(decltype(_table_), field_lookup_table),
-    4294967290,  // skipmap
-    offsetof(decltype(_table_), field_entries),
-    2,  // num_field_entries
-    1,  // num_aux_entries
-    offsetof(decltype(_table_), aux_entries),
-    &_ExecuteCommandRequest_default_instance_._instance,
-    ::_pbi::TcParser::GenericFallback,  // fallback
-  }, {{
-    {::_pbi::TcParser::MiniParse, {}},
-    // .io.deephaven.proto.backplane.grpc.Ticket console_id = 1;
-    {::_pbi::TcParser::FastMtS1,
-     {10, 0, 0, PROTOBUF_FIELD_OFFSET(ExecuteCommandRequest, _impl_.console_id_)}},
-    {::_pbi::TcParser::MiniParse, {}},
-    // string code = 3;
-    {::_pbi::TcParser::FastUS1,
-     {26, 63, 0, PROTOBUF_FIELD_OFFSET(ExecuteCommandRequest, _impl_.code_)}},
-  }}, {{
-    65535, 65535
-  }}, {{
-    // .io.deephaven.proto.backplane.grpc.Ticket console_id = 1;
-    {PROTOBUF_FIELD_OFFSET(ExecuteCommandRequest, _impl_.console_id_), _Internal::kHasBitsOffset + 0, 0,
-    (0 | ::_fl::kFcOptional | ::_fl::kMessage | ::_fl::kTvTable)},
-    // string code = 3;
-    {PROTOBUF_FIELD_OFFSET(ExecuteCommandRequest, _impl_.code_), -1, 0,
-    (0 | ::_fl::kFcSingular | ::_fl::kUtf8String | ::_fl::kRepAString)},
-  }}, {{
-    {::_pbi::TcParser::GetTable<::io::deephaven::proto::backplane::grpc::Ticket>()},
-  }}, {{
-    "\76\0\4\0\0\0\0\0"
-    "io.deephaven.proto.backplane.script.grpc.ExecuteCommandRequest"
-    "code"
-  }},
-};
-
-::uint8_t* ExecuteCommandRequest::_InternalSerialize(
-    ::uint8_t* target,
-    ::google::protobuf::io::EpsCopyOutputStream* stream) const {
-  // @@protoc_insertion_point(serialize_to_array_start:io.deephaven.proto.backplane.script.grpc.ExecuteCommandRequest)
-  ::uint32_t cached_has_bits = 0;
-  (void)cached_has_bits;
-
-  cached_has_bits = _impl_._has_bits_[0];
-  // .io.deephaven.proto.backplane.grpc.Ticket console_id = 1;
-  if (cached_has_bits & 0x00000001u) {
-    target = ::google::protobuf::internal::WireFormatLite::InternalWriteMessage(
-        1, _Internal::console_id(this),
-        _Internal::console_id(this).GetCachedSize(), target, stream);
-  }
-
-  // string code = 3;
-  if (!this->_internal_code().empty()) {
-    const std::string& _s = this->_internal_code();
-    ::google::protobuf::internal::WireFormatLite::VerifyUtf8String(
-        _s.data(), static_cast<int>(_s.length()), ::google::protobuf::internal::WireFormatLite::SERIALIZE, "io.deephaven.proto.backplane.script.grpc.ExecuteCommandRequest.code");
-    target = stream->WriteStringMaybeAliased(3, _s, target);
-  }
-
-  if (PROTOBUF_PREDICT_FALSE(_internal_metadata_.have_unknown_fields())) {
-    target =
-        ::_pbi::WireFormat::InternalSerializeUnknownFieldsToArray(
-            _internal_metadata_.unknown_fields<::google::protobuf::UnknownFieldSet>(::google::protobuf::UnknownFieldSet::default_instance), target, stream);
-  }
-  // @@protoc_insertion_point(serialize_to_array_end:io.deephaven.proto.backplane.script.grpc.ExecuteCommandRequest)
-  return target;
-}
-
-::size_t ExecuteCommandRequest::ByteSizeLong() const {
-// @@protoc_insertion_point(message_byte_size_start:io.deephaven.proto.backplane.script.grpc.ExecuteCommandRequest)
-  ::size_t total_size = 0;
-
-  ::uint32_t cached_has_bits = 0;
-  // Prevent compiler warnings about cached_has_bits being unused
-  (void) cached_has_bits;
-
-  // string code = 3;
-  if (!this->_internal_code().empty()) {
-    total_size += 1 + ::google::protobuf::internal::WireFormatLite::StringSize(
-                                    this->_internal_code());
-  }
-
-  // .io.deephaven.proto.backplane.grpc.Ticket console_id = 1;
-  cached_has_bits = _impl_._has_bits_[0];
-  if (cached_has_bits & 0x00000001u) {
-    total_size +=
-        1 + ::google::protobuf::internal::WireFormatLite::MessageSize(*_impl_.console_id_);
-  }
-
-  return MaybeComputeUnknownFieldsSize(total_size, &_impl_._cached_size_);
-}
-
-const ::google::protobuf::Message::ClassData ExecuteCommandRequest::_class_data_ = {
-    ExecuteCommandRequest::MergeImpl,
-    nullptr,  // OnDemandRegisterArenaDtor
-};
-const ::google::protobuf::Message::ClassData* ExecuteCommandRequest::GetClassData() const {
-  return &_class_data_;
-}
-
-void ExecuteCommandRequest::MergeImpl(::google::protobuf::Message& to_msg, const ::google::protobuf::Message& from_msg) {
-  auto* const _this = static_cast<ExecuteCommandRequest*>(&to_msg);
-  auto& from = static_cast<const ExecuteCommandRequest&>(from_msg);
-  // @@protoc_insertion_point(class_specific_merge_from_start:io.deephaven.proto.backplane.script.grpc.ExecuteCommandRequest)
-  ABSL_DCHECK_NE(&from, _this);
-  ::uint32_t cached_has_bits = 0;
-  (void) cached_has_bits;
-
-  if (!from._internal_code().empty()) {
-    _this->_internal_set_code(from._internal_code());
-  }
-  if ((from._impl_._has_bits_[0] & 0x00000001u) != 0) {
-    _this->_internal_mutable_console_id()->::io::deephaven::proto::backplane::grpc::Ticket::MergeFrom(
-        from._internal_console_id());
-  }
-  _this->_internal_metadata_.MergeFrom<::google::protobuf::UnknownFieldSet>(from._internal_metadata_);
-}
-
-void ExecuteCommandRequest::CopyFrom(const ExecuteCommandRequest& from) {
-// @@protoc_insertion_point(class_specific_copy_from_start:io.deephaven.proto.backplane.script.grpc.ExecuteCommandRequest)
-  if (&from == this) return;
-  Clear();
-  MergeFrom(from);
-}
-
-PROTOBUF_NOINLINE bool ExecuteCommandRequest::IsInitialized() const {
-  return true;
-}
-
-::_pbi::CachedSize* ExecuteCommandRequest::AccessCachedSize() const {
-  return &_impl_._cached_size_;
-}
-void ExecuteCommandRequest::InternalSwap(ExecuteCommandRequest* PROTOBUF_RESTRICT other) {
-  using std::swap;
-  auto* arena = GetArena();
-  ABSL_DCHECK_EQ(arena, other->GetArena());
-  _internal_metadata_.InternalSwap(&other->_internal_metadata_);
-  swap(_impl_._has_bits_[0], other->_impl_._has_bits_[0]);
-  ::_pbi::ArenaStringPtr::InternalSwap(&_impl_.code_, &other->_impl_.code_, arena);
-  swap(_impl_.console_id_, other->_impl_.console_id_);
-}
-
-::google::protobuf::Metadata ExecuteCommandRequest::GetMetadata() const {
-  return ::_pbi::AssignDescriptors(
-      &descriptor_table_deephaven_2fproto_2fconsole_2eproto_getter, &descriptor_table_deephaven_2fproto_2fconsole_2eproto_once,
-      file_level_metadata_deephaven_2fproto_2fconsole_2eproto[8]);
-}
-// ===================================================================
-
-class ExecuteCommandResponse::_Internal {
- public:
-  using HasBits = decltype(std::declval<ExecuteCommandResponse>()._impl_._has_bits_);
-  static constexpr ::int32_t kHasBitsOffset =
-    8 * PROTOBUF_FIELD_OFFSET(ExecuteCommandResponse, _impl_._has_bits_);
-  static const ::io::deephaven::proto::backplane::grpc::FieldsChangeUpdate& changes(const ExecuteCommandResponse* msg);
-  static void set_has_changes(HasBits* has_bits) {
-    (*has_bits)[0] |= 1u;
-  }
-};
-
-const ::io::deephaven::proto::backplane::grpc::FieldsChangeUpdate& ExecuteCommandResponse::_Internal::changes(const ExecuteCommandResponse* msg) {
-  return *msg->_impl_.changes_;
-}
-void ExecuteCommandResponse::clear_changes() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  if (_impl_.changes_ != nullptr) _impl_.changes_->Clear();
-  _impl_._has_bits_[0] &= ~0x00000001u;
-}
-ExecuteCommandResponse::ExecuteCommandResponse(::google::protobuf::Arena* arena)
-    : ::google::protobuf::Message(arena) {
-  SharedCtor(arena);
-  // @@protoc_insertion_point(arena_constructor:io.deephaven.proto.backplane.script.grpc.ExecuteCommandResponse)
-}
-inline PROTOBUF_NDEBUG_INLINE ExecuteCommandResponse::Impl_::Impl_(
-    ::google::protobuf::internal::InternalVisibility visibility, ::google::protobuf::Arena* arena,
-    const Impl_& from)
-      : _has_bits_{from._has_bits_},
-        _cached_size_{0},
-        error_message_(arena, from.error_message_) {}
-
-ExecuteCommandResponse::ExecuteCommandResponse(
-    ::google::protobuf::Arena* arena,
-    const ExecuteCommandResponse& from)
-    : ::google::protobuf::Message(arena) {
-  ExecuteCommandResponse* const _this = this;
-  (void)_this;
-  _internal_metadata_.MergeFrom<::google::protobuf::UnknownFieldSet>(
-      from._internal_metadata_);
-  new (&_impl_) Impl_(internal_visibility(), arena, from._impl_);
-  ::uint32_t cached_has_bits = _impl_._has_bits_[0];
-  _impl_.changes_ = (cached_has_bits & 0x00000001u)
-                ? CreateMaybeMessage<::io::deephaven::proto::backplane::grpc::FieldsChangeUpdate>(arena, *from._impl_.changes_)
-                : nullptr;
-
-  // @@protoc_insertion_point(copy_constructor:io.deephaven.proto.backplane.script.grpc.ExecuteCommandResponse)
-}
-inline PROTOBUF_NDEBUG_INLINE ExecuteCommandResponse::Impl_::Impl_(
-    ::google::protobuf::internal::InternalVisibility visibility,
-    ::google::protobuf::Arena* arena)
-      : _cached_size_{0},
-        error_message_(arena) {}
-
-inline void ExecuteCommandResponse::SharedCtor(::_pb::Arena* arena) {
-  new (&_impl_) Impl_(internal_visibility(), arena);
-  _impl_.changes_ = {};
-}
-ExecuteCommandResponse::~ExecuteCommandResponse() {
-  // @@protoc_insertion_point(destructor:io.deephaven.proto.backplane.script.grpc.ExecuteCommandResponse)
-  _internal_metadata_.Delete<::google::protobuf::UnknownFieldSet>();
-  SharedDtor();
-}
-inline void ExecuteCommandResponse::SharedDtor() {
-  ABSL_DCHECK(GetArena() == nullptr);
-  _impl_.error_message_.Destroy();
-  delete _impl_.changes_;
-  _impl_.~Impl_();
-}
-
-PROTOBUF_NOINLINE void ExecuteCommandResponse::Clear() {
-// @@protoc_insertion_point(message_clear_start:io.deephaven.proto.backplane.script.grpc.ExecuteCommandResponse)
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  ::uint32_t cached_has_bits = 0;
-  // Prevent compiler warnings about cached_has_bits being unused
-  (void) cached_has_bits;
-
-  _impl_.error_message_.ClearToEmpty();
-  cached_has_bits = _impl_._has_bits_[0];
-  if (cached_has_bits & 0x00000001u) {
-    ABSL_DCHECK(_impl_.changes_ != nullptr);
-    _impl_.changes_->Clear();
-  }
-  _impl_._has_bits_.Clear();
-  _internal_metadata_.Clear<::google::protobuf::UnknownFieldSet>();
-}
-
-const char* ExecuteCommandResponse::_InternalParse(
-    const char* ptr, ::_pbi::ParseContext* ctx) {
-  ptr = ::_pbi::TcParser::ParseLoop(this, ptr, ctx, &_table_.header);
-  return ptr;
-}
-
-
-PROTOBUF_CONSTINIT PROTOBUF_ATTRIBUTE_INIT_PRIORITY1
-const ::_pbi::TcParseTable<1, 2, 1, 85, 2> ExecuteCommandResponse::_table_ = {
-  {
-    PROTOBUF_FIELD_OFFSET(ExecuteCommandResponse, _impl_._has_bits_),
-    0, // no _extensions_
-    2, 8,  // max_field_number, fast_idx_mask
-    offsetof(decltype(_table_), field_lookup_table),
-    4294967292,  // skipmap
-    offsetof(decltype(_table_), field_entries),
-    2,  // num_field_entries
-    1,  // num_aux_entries
-    offsetof(decltype(_table_), aux_entries),
-    &_ExecuteCommandResponse_default_instance_._instance,
-    ::_pbi::TcParser::GenericFallback,  // fallback
-  }, {{
-    // .io.deephaven.proto.backplane.grpc.FieldsChangeUpdate changes = 2;
-    {::_pbi::TcParser::FastMtS1,
-     {18, 0, 0, PROTOBUF_FIELD_OFFSET(ExecuteCommandResponse, _impl_.changes_)}},
-    // string error_message = 1;
-    {::_pbi::TcParser::FastUS1,
-     {10, 63, 0, PROTOBUF_FIELD_OFFSET(ExecuteCommandResponse, _impl_.error_message_)}},
-  }}, {{
-    65535, 65535
-  }}, {{
-    // string error_message = 1;
-    {PROTOBUF_FIELD_OFFSET(ExecuteCommandResponse, _impl_.error_message_), -1, 0,
-    (0 | ::_fl::kFcSingular | ::_fl::kUtf8String | ::_fl::kRepAString)},
-    // .io.deephaven.proto.backplane.grpc.FieldsChangeUpdate changes = 2;
-    {PROTOBUF_FIELD_OFFSET(ExecuteCommandResponse, _impl_.changes_), _Internal::kHasBitsOffset + 0, 0,
-    (0 | ::_fl::kFcOptional | ::_fl::kMessage | ::_fl::kTvTable)},
-  }}, {{
-    {::_pbi::TcParser::GetTable<::io::deephaven::proto::backplane::grpc::FieldsChangeUpdate>()},
-  }}, {{
-    "\77\15\0\0\0\0\0\0"
-    "io.deephaven.proto.backplane.script.grpc.ExecuteCommandResponse"
-    "error_message"
-  }},
-};
-
-::uint8_t* ExecuteCommandResponse::_InternalSerialize(
-    ::uint8_t* target,
-    ::google::protobuf::io::EpsCopyOutputStream* stream) const {
-  // @@protoc_insertion_point(serialize_to_array_start:io.deephaven.proto.backplane.script.grpc.ExecuteCommandResponse)
-  ::uint32_t cached_has_bits = 0;
-  (void)cached_has_bits;
-
-  // string error_message = 1;
-  if (!this->_internal_error_message().empty()) {
-    const std::string& _s = this->_internal_error_message();
-    ::google::protobuf::internal::WireFormatLite::VerifyUtf8String(
-        _s.data(), static_cast<int>(_s.length()), ::google::protobuf::internal::WireFormatLite::SERIALIZE, "io.deephaven.proto.backplane.script.grpc.ExecuteCommandResponse.error_message");
-    target = stream->WriteStringMaybeAliased(1, _s, target);
-  }
-
-  cached_has_bits = _impl_._has_bits_[0];
-  // .io.deephaven.proto.backplane.grpc.FieldsChangeUpdate changes = 2;
-  if (cached_has_bits & 0x00000001u) {
-    target = ::google::protobuf::internal::WireFormatLite::InternalWriteMessage(
-        2, _Internal::changes(this),
-        _Internal::changes(this).GetCachedSize(), target, stream);
-  }
-
-  if (PROTOBUF_PREDICT_FALSE(_internal_metadata_.have_unknown_fields())) {
-    target =
-        ::_pbi::WireFormat::InternalSerializeUnknownFieldsToArray(
-            _internal_metadata_.unknown_fields<::google::protobuf::UnknownFieldSet>(::google::protobuf::UnknownFieldSet::default_instance), target, stream);
-  }
-  // @@protoc_insertion_point(serialize_to_array_end:io.deephaven.proto.backplane.script.grpc.ExecuteCommandResponse)
-  return target;
-}
-
-::size_t ExecuteCommandResponse::ByteSizeLong() const {
-// @@protoc_insertion_point(message_byte_size_start:io.deephaven.proto.backplane.script.grpc.ExecuteCommandResponse)
-  ::size_t total_size = 0;
-
-  ::uint32_t cached_has_bits = 0;
-  // Prevent compiler warnings about cached_has_bits being unused
-  (void) cached_has_bits;
-
-  // string error_message = 1;
-  if (!this->_internal_error_message().empty()) {
-    total_size += 1 + ::google::protobuf::internal::WireFormatLite::StringSize(
-                                    this->_internal_error_message());
-  }
-
-  // .io.deephaven.proto.backplane.grpc.FieldsChangeUpdate changes = 2;
-  cached_has_bits = _impl_._has_bits_[0];
-  if (cached_has_bits & 0x00000001u) {
-    total_size +=
-        1 + ::google::protobuf::internal::WireFormatLite::MessageSize(*_impl_.changes_);
-  }
-
-  return MaybeComputeUnknownFieldsSize(total_size, &_impl_._cached_size_);
-}
-
-const ::google::protobuf::Message::ClassData ExecuteCommandResponse::_class_data_ = {
-    ExecuteCommandResponse::MergeImpl,
-    nullptr,  // OnDemandRegisterArenaDtor
-};
-const ::google::protobuf::Message::ClassData* ExecuteCommandResponse::GetClassData() const {
-  return &_class_data_;
-}
-
-void ExecuteCommandResponse::MergeImpl(::google::protobuf::Message& to_msg, const ::google::protobuf::Message& from_msg) {
-  auto* const _this = static_cast<ExecuteCommandResponse*>(&to_msg);
-  auto& from = static_cast<const ExecuteCommandResponse&>(from_msg);
-  // @@protoc_insertion_point(class_specific_merge_from_start:io.deephaven.proto.backplane.script.grpc.ExecuteCommandResponse)
-  ABSL_DCHECK_NE(&from, _this);
-  ::uint32_t cached_has_bits = 0;
-  (void) cached_has_bits;
-
-  if (!from._internal_error_message().empty()) {
-    _this->_internal_set_error_message(from._internal_error_message());
-  }
-  if ((from._impl_._has_bits_[0] & 0x00000001u) != 0) {
-    _this->_internal_mutable_changes()->::io::deephaven::proto::backplane::grpc::FieldsChangeUpdate::MergeFrom(
-        from._internal_changes());
-  }
-  _this->_internal_metadata_.MergeFrom<::google::protobuf::UnknownFieldSet>(from._internal_metadata_);
-}
-
-void ExecuteCommandResponse::CopyFrom(const ExecuteCommandResponse& from) {
-// @@protoc_insertion_point(class_specific_copy_from_start:io.deephaven.proto.backplane.script.grpc.ExecuteCommandResponse)
-  if (&from == this) return;
-  Clear();
-  MergeFrom(from);
-}
-
-PROTOBUF_NOINLINE bool ExecuteCommandResponse::IsInitialized() const {
-  return true;
-}
-
-::_pbi::CachedSize* ExecuteCommandResponse::AccessCachedSize() const {
-  return &_impl_._cached_size_;
-}
-void ExecuteCommandResponse::InternalSwap(ExecuteCommandResponse* PROTOBUF_RESTRICT other) {
-  using std::swap;
-  auto* arena = GetArena();
-  ABSL_DCHECK_EQ(arena, other->GetArena());
-  _internal_metadata_.InternalSwap(&other->_internal_metadata_);
-  swap(_impl_._has_bits_[0], other->_impl_._has_bits_[0]);
-  ::_pbi::ArenaStringPtr::InternalSwap(&_impl_.error_message_, &other->_impl_.error_message_, arena);
-  swap(_impl_.changes_, other->_impl_.changes_);
-}
-
-::google::protobuf::Metadata ExecuteCommandResponse::GetMetadata() const {
-  return ::_pbi::AssignDescriptors(
-      &descriptor_table_deephaven_2fproto_2fconsole_2eproto_getter, &descriptor_table_deephaven_2fproto_2fconsole_2eproto_once,
-      file_level_metadata_deephaven_2fproto_2fconsole_2eproto[9]);
-}
-// ===================================================================
-
-class BindTableToVariableRequest::_Internal {
- public:
-  using HasBits = decltype(std::declval<BindTableToVariableRequest>()._impl_._has_bits_);
-  static constexpr ::int32_t kHasBitsOffset =
-    8 * PROTOBUF_FIELD_OFFSET(BindTableToVariableRequest, _impl_._has_bits_);
-  static const ::io::deephaven::proto::backplane::grpc::Ticket& console_id(const BindTableToVariableRequest* msg);
-  static void set_has_console_id(HasBits* has_bits) {
-    (*has_bits)[0] |= 1u;
-  }
-  static const ::io::deephaven::proto::backplane::grpc::Ticket& table_id(const BindTableToVariableRequest* msg);
-  static void set_has_table_id(HasBits* has_bits) {
-    (*has_bits)[0] |= 2u;
-  }
-};
-
-const ::io::deephaven::proto::backplane::grpc::Ticket& BindTableToVariableRequest::_Internal::console_id(const BindTableToVariableRequest* msg) {
-  return *msg->_impl_.console_id_;
-}
-const ::io::deephaven::proto::backplane::grpc::Ticket& BindTableToVariableRequest::_Internal::table_id(const BindTableToVariableRequest* msg) {
-  return *msg->_impl_.table_id_;
-}
-void BindTableToVariableRequest::clear_console_id() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  if (_impl_.console_id_ != nullptr) _impl_.console_id_->Clear();
-  _impl_._has_bits_[0] &= ~0x00000001u;
-}
-void BindTableToVariableRequest::clear_table_id() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  if (_impl_.table_id_ != nullptr) _impl_.table_id_->Clear();
-  _impl_._has_bits_[0] &= ~0x00000002u;
-}
-BindTableToVariableRequest::BindTableToVariableRequest(::google::protobuf::Arena* arena)
-    : ::google::protobuf::Message(arena) {
-  SharedCtor(arena);
-  // @@protoc_insertion_point(arena_constructor:io.deephaven.proto.backplane.script.grpc.BindTableToVariableRequest)
-}
-inline PROTOBUF_NDEBUG_INLINE BindTableToVariableRequest::Impl_::Impl_(
-    ::google::protobuf::internal::InternalVisibility visibility, ::google::protobuf::Arena* arena,
-    const Impl_& from)
-      : _has_bits_{from._has_bits_},
-        _cached_size_{0},
-        variable_name_(arena, from.variable_name_) {}
-
-BindTableToVariableRequest::BindTableToVariableRequest(
-    ::google::protobuf::Arena* arena,
-    const BindTableToVariableRequest& from)
-    : ::google::protobuf::Message(arena) {
-  BindTableToVariableRequest* const _this = this;
-  (void)_this;
-  _internal_metadata_.MergeFrom<::google::protobuf::UnknownFieldSet>(
-      from._internal_metadata_);
-  new (&_impl_) Impl_(internal_visibility(), arena, from._impl_);
-  ::uint32_t cached_has_bits = _impl_._has_bits_[0];
-  _impl_.console_id_ = (cached_has_bits & 0x00000001u)
-                ? CreateMaybeMessage<::io::deephaven::proto::backplane::grpc::Ticket>(arena, *from._impl_.console_id_)
-                : nullptr;
-  _impl_.table_id_ = (cached_has_bits & 0x00000002u)
-                ? CreateMaybeMessage<::io::deephaven::proto::backplane::grpc::Ticket>(arena, *from._impl_.table_id_)
-                : nullptr;
-
-  // @@protoc_insertion_point(copy_constructor:io.deephaven.proto.backplane.script.grpc.BindTableToVariableRequest)
-}
-inline PROTOBUF_NDEBUG_INLINE BindTableToVariableRequest::Impl_::Impl_(
-    ::google::protobuf::internal::InternalVisibility visibility,
-    ::google::protobuf::Arena* arena)
-      : _cached_size_{0},
-        variable_name_(arena) {}
-
-inline void BindTableToVariableRequest::SharedCtor(::_pb::Arena* arena) {
-  new (&_impl_) Impl_(internal_visibility(), arena);
-  ::memset(reinterpret_cast<char *>(&_impl_) +
-               offsetof(Impl_, console_id_),
-           0,
-           offsetof(Impl_, table_id_) -
-               offsetof(Impl_, console_id_) +
-               sizeof(Impl_::table_id_));
-}
-BindTableToVariableRequest::~BindTableToVariableRequest() {
-  // @@protoc_insertion_point(destructor:io.deephaven.proto.backplane.script.grpc.BindTableToVariableRequest)
-  _internal_metadata_.Delete<::google::protobuf::UnknownFieldSet>();
-  SharedDtor();
-}
-inline void BindTableToVariableRequest::SharedDtor() {
-  ABSL_DCHECK(GetArena() == nullptr);
-  _impl_.variable_name_.Destroy();
-  delete _impl_.console_id_;
-  delete _impl_.table_id_;
-  _impl_.~Impl_();
-}
-
-PROTOBUF_NOINLINE void BindTableToVariableRequest::Clear() {
-// @@protoc_insertion_point(message_clear_start:io.deephaven.proto.backplane.script.grpc.BindTableToVariableRequest)
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  ::uint32_t cached_has_bits = 0;
-  // Prevent compiler warnings about cached_has_bits being unused
-  (void) cached_has_bits;
-
-  _impl_.variable_name_.ClearToEmpty();
-  cached_has_bits = _impl_._has_bits_[0];
-  if (cached_has_bits & 0x00000003u) {
-    if (cached_has_bits & 0x00000001u) {
-      ABSL_DCHECK(_impl_.console_id_ != nullptr);
-      _impl_.console_id_->Clear();
-    }
-    if (cached_has_bits & 0x00000002u) {
-      ABSL_DCHECK(_impl_.table_id_ != nullptr);
-      _impl_.table_id_->Clear();
-    }
-  }
-  _impl_._has_bits_.Clear();
-  _internal_metadata_.Clear<::google::protobuf::UnknownFieldSet>();
-}
-
-const char* BindTableToVariableRequest::_InternalParse(
-    const char* ptr, ::_pbi::ParseContext* ctx) {
-  ptr = ::_pbi::TcParser::ParseLoop(this, ptr, ctx, &_table_.header);
-  return ptr;
-}
-
-
-PROTOBUF_CONSTINIT PROTOBUF_ATTRIBUTE_INIT_PRIORITY1
-const ::_pbi::TcParseTable<2, 3, 2, 89, 2> BindTableToVariableRequest::_table_ = {
-  {
-    PROTOBUF_FIELD_OFFSET(BindTableToVariableRequest, _impl_._has_bits_),
-    0, // no _extensions_
-    4, 24,  // max_field_number, fast_idx_mask
-    offsetof(decltype(_table_), field_lookup_table),
-    4294967282,  // skipmap
-    offsetof(decltype(_table_), field_entries),
-    3,  // num_field_entries
-    2,  // num_aux_entries
-    offsetof(decltype(_table_), aux_entries),
-    &_BindTableToVariableRequest_default_instance_._instance,
-    ::_pbi::TcParser::GenericFallback,  // fallback
-  }, {{
-    // .io.deephaven.proto.backplane.grpc.Ticket table_id = 4;
-    {::_pbi::TcParser::FastMtS1,
-     {34, 1, 1, PROTOBUF_FIELD_OFFSET(BindTableToVariableRequest, _impl_.table_id_)}},
-    // .io.deephaven.proto.backplane.grpc.Ticket console_id = 1;
-    {::_pbi::TcParser::FastMtS1,
-     {10, 0, 0, PROTOBUF_FIELD_OFFSET(BindTableToVariableRequest, _impl_.console_id_)}},
-    {::_pbi::TcParser::MiniParse, {}},
-    // string variable_name = 3;
-    {::_pbi::TcParser::FastUS1,
-     {26, 63, 0, PROTOBUF_FIELD_OFFSET(BindTableToVariableRequest, _impl_.variable_name_)}},
-  }}, {{
-    65535, 65535
-  }}, {{
-    // .io.deephaven.proto.backplane.grpc.Ticket console_id = 1;
-    {PROTOBUF_FIELD_OFFSET(BindTableToVariableRequest, _impl_.console_id_), _Internal::kHasBitsOffset + 0, 0,
-    (0 | ::_fl::kFcOptional | ::_fl::kMessage | ::_fl::kTvTable)},
-    // string variable_name = 3;
-    {PROTOBUF_FIELD_OFFSET(BindTableToVariableRequest, _impl_.variable_name_), -1, 0,
-    (0 | ::_fl::kFcSingular | ::_fl::kUtf8String | ::_fl::kRepAString)},
-    // .io.deephaven.proto.backplane.grpc.Ticket table_id = 4;
-    {PROTOBUF_FIELD_OFFSET(BindTableToVariableRequest, _impl_.table_id_), _Internal::kHasBitsOffset + 1, 1,
-    (0 | ::_fl::kFcOptional | ::_fl::kMessage | ::_fl::kTvTable)},
-  }}, {{
-    {::_pbi::TcParser::GetTable<::io::deephaven::proto::backplane::grpc::Ticket>()},
-    {::_pbi::TcParser::GetTable<::io::deephaven::proto::backplane::grpc::Ticket>()},
-  }}, {{
-    "\103\0\15\0\0\0\0\0"
-    "io.deephaven.proto.backplane.script.grpc.BindTableToVariableRequest"
-    "variable_name"
-  }},
-};
-
-::uint8_t* BindTableToVariableRequest::_InternalSerialize(
-    ::uint8_t* target,
-    ::google::protobuf::io::EpsCopyOutputStream* stream) const {
-  // @@protoc_insertion_point(serialize_to_array_start:io.deephaven.proto.backplane.script.grpc.BindTableToVariableRequest)
-  ::uint32_t cached_has_bits = 0;
-  (void)cached_has_bits;
-
-  cached_has_bits = _impl_._has_bits_[0];
-  // .io.deephaven.proto.backplane.grpc.Ticket console_id = 1;
-  if (cached_has_bits & 0x00000001u) {
-    target = ::google::protobuf::internal::WireFormatLite::InternalWriteMessage(
-        1, _Internal::console_id(this),
-        _Internal::console_id(this).GetCachedSize(), target, stream);
-  }
-
-  // string variable_name = 3;
-  if (!this->_internal_variable_name().empty()) {
-    const std::string& _s = this->_internal_variable_name();
-    ::google::protobuf::internal::WireFormatLite::VerifyUtf8String(
-        _s.data(), static_cast<int>(_s.length()), ::google::protobuf::internal::WireFormatLite::SERIALIZE, "io.deephaven.proto.backplane.script.grpc.BindTableToVariableRequest.variable_name");
-    target = stream->WriteStringMaybeAliased(3, _s, target);
-  }
-
-  // .io.deephaven.proto.backplane.grpc.Ticket table_id = 4;
-  if (cached_has_bits & 0x00000002u) {
-    target = ::google::protobuf::internal::WireFormatLite::InternalWriteMessage(
-        4, _Internal::table_id(this),
-        _Internal::table_id(this).GetCachedSize(), target, stream);
-  }
-
-  if (PROTOBUF_PREDICT_FALSE(_internal_metadata_.have_unknown_fields())) {
-    target =
-        ::_pbi::WireFormat::InternalSerializeUnknownFieldsToArray(
-            _internal_metadata_.unknown_fields<::google::protobuf::UnknownFieldSet>(::google::protobuf::UnknownFieldSet::default_instance), target, stream);
-  }
-  // @@protoc_insertion_point(serialize_to_array_end:io.deephaven.proto.backplane.script.grpc.BindTableToVariableRequest)
-  return target;
-}
-
-::size_t BindTableToVariableRequest::ByteSizeLong() const {
-// @@protoc_insertion_point(message_byte_size_start:io.deephaven.proto.backplane.script.grpc.BindTableToVariableRequest)
-  ::size_t total_size = 0;
-
-  ::uint32_t cached_has_bits = 0;
-  // Prevent compiler warnings about cached_has_bits being unused
-  (void) cached_has_bits;
-
-  // string variable_name = 3;
-  if (!this->_internal_variable_name().empty()) {
-    total_size += 1 + ::google::protobuf::internal::WireFormatLite::StringSize(
-                                    this->_internal_variable_name());
-  }
-
-  cached_has_bits = _impl_._has_bits_[0];
-  if (cached_has_bits & 0x00000003u) {
-    // .io.deephaven.proto.backplane.grpc.Ticket console_id = 1;
-    if (cached_has_bits & 0x00000001u) {
-      total_size +=
-          1 + ::google::protobuf::internal::WireFormatLite::MessageSize(*_impl_.console_id_);
-    }
-
-    // .io.deephaven.proto.backplane.grpc.Ticket table_id = 4;
-    if (cached_has_bits & 0x00000002u) {
-      total_size +=
-          1 + ::google::protobuf::internal::WireFormatLite::MessageSize(*_impl_.table_id_);
-    }
-
-  }
-  return MaybeComputeUnknownFieldsSize(total_size, &_impl_._cached_size_);
-}
-
-const ::google::protobuf::Message::ClassData BindTableToVariableRequest::_class_data_ = {
-    BindTableToVariableRequest::MergeImpl,
-    nullptr,  // OnDemandRegisterArenaDtor
-};
-const ::google::protobuf::Message::ClassData* BindTableToVariableRequest::GetClassData() const {
-  return &_class_data_;
-}
-
-void BindTableToVariableRequest::MergeImpl(::google::protobuf::Message& to_msg, const ::google::protobuf::Message& from_msg) {
-  auto* const _this = static_cast<BindTableToVariableRequest*>(&to_msg);
-  auto& from = static_cast<const BindTableToVariableRequest&>(from_msg);
-  // @@protoc_insertion_point(class_specific_merge_from_start:io.deephaven.proto.backplane.script.grpc.BindTableToVariableRequest)
-  ABSL_DCHECK_NE(&from, _this);
-  ::uint32_t cached_has_bits = 0;
-  (void) cached_has_bits;
-
-  if (!from._internal_variable_name().empty()) {
-    _this->_internal_set_variable_name(from._internal_variable_name());
-  }
-  cached_has_bits = from._impl_._has_bits_[0];
-  if (cached_has_bits & 0x00000003u) {
-    if (cached_has_bits & 0x00000001u) {
-      _this->_internal_mutable_console_id()->::io::deephaven::proto::backplane::grpc::Ticket::MergeFrom(
-          from._internal_console_id());
-    }
-    if (cached_has_bits & 0x00000002u) {
-      _this->_internal_mutable_table_id()->::io::deephaven::proto::backplane::grpc::Ticket::MergeFrom(
-          from._internal_table_id());
-    }
-  }
-  _this->_internal_metadata_.MergeFrom<::google::protobuf::UnknownFieldSet>(from._internal_metadata_);
-}
-
-void BindTableToVariableRequest::CopyFrom(const BindTableToVariableRequest& from) {
-// @@protoc_insertion_point(class_specific_copy_from_start:io.deephaven.proto.backplane.script.grpc.BindTableToVariableRequest)
-  if (&from == this) return;
-  Clear();
-  MergeFrom(from);
-}
-
-PROTOBUF_NOINLINE bool BindTableToVariableRequest::IsInitialized() const {
-  return true;
-}
-
-::_pbi::CachedSize* BindTableToVariableRequest::AccessCachedSize() const {
-  return &_impl_._cached_size_;
-}
-void BindTableToVariableRequest::InternalSwap(BindTableToVariableRequest* PROTOBUF_RESTRICT other) {
-  using std::swap;
-  auto* arena = GetArena();
-  ABSL_DCHECK_EQ(arena, other->GetArena());
-  _internal_metadata_.InternalSwap(&other->_internal_metadata_);
-  swap(_impl_._has_bits_[0], other->_impl_._has_bits_[0]);
-  ::_pbi::ArenaStringPtr::InternalSwap(&_impl_.variable_name_, &other->_impl_.variable_name_, arena);
-  ::google::protobuf::internal::memswap<
-      PROTOBUF_FIELD_OFFSET(BindTableToVariableRequest, _impl_.table_id_)
-      + sizeof(BindTableToVariableRequest::_impl_.table_id_)
-      - PROTOBUF_FIELD_OFFSET(BindTableToVariableRequest, _impl_.console_id_)>(
-          reinterpret_cast<char*>(&_impl_.console_id_),
-          reinterpret_cast<char*>(&other->_impl_.console_id_));
-}
-
-::google::protobuf::Metadata BindTableToVariableRequest::GetMetadata() const {
-  return ::_pbi::AssignDescriptors(
-      &descriptor_table_deephaven_2fproto_2fconsole_2eproto_getter, &descriptor_table_deephaven_2fproto_2fconsole_2eproto_once,
-      file_level_metadata_deephaven_2fproto_2fconsole_2eproto[10]);
-}
-// ===================================================================
-
-class BindTableToVariableResponse::_Internal {
- public:
-};
-
-BindTableToVariableResponse::BindTableToVariableResponse(::google::protobuf::Arena* arena)
-    : ::google::protobuf::internal::ZeroFieldsBase(arena) {
-  // @@protoc_insertion_point(arena_constructor:io.deephaven.proto.backplane.script.grpc.BindTableToVariableResponse)
-}
-BindTableToVariableResponse::BindTableToVariableResponse(
-    ::google::protobuf::Arena* arena,
-    const BindTableToVariableResponse& from)
-    : ::google::protobuf::internal::ZeroFieldsBase(arena) {
-  BindTableToVariableResponse* const _this = this;
-  (void)_this;
-  _internal_metadata_.MergeFrom<::google::protobuf::UnknownFieldSet>(
-      from._internal_metadata_);
-
-  // @@protoc_insertion_point(copy_constructor:io.deephaven.proto.backplane.script.grpc.BindTableToVariableResponse)
-}
-
-
-
-
-
-
-
-
-
-::google::protobuf::Metadata BindTableToVariableResponse::GetMetadata() const {
-  return ::_pbi::AssignDescriptors(
-      &descriptor_table_deephaven_2fproto_2fconsole_2eproto_getter, &descriptor_table_deephaven_2fproto_2fconsole_2eproto_once,
-      file_level_metadata_deephaven_2fproto_2fconsole_2eproto[11]);
-}
-// ===================================================================
-
-class CancelCommandRequest::_Internal {
- public:
-  using HasBits = decltype(std::declval<CancelCommandRequest>()._impl_._has_bits_);
-  static constexpr ::int32_t kHasBitsOffset =
-    8 * PROTOBUF_FIELD_OFFSET(CancelCommandRequest, _impl_._has_bits_);
-  static const ::io::deephaven::proto::backplane::grpc::Ticket& console_id(const CancelCommandRequest* msg);
-  static void set_has_console_id(HasBits* has_bits) {
-    (*has_bits)[0] |= 1u;
-  }
-  static const ::io::deephaven::proto::backplane::grpc::Ticket& command_id(const CancelCommandRequest* msg);
-  static void set_has_command_id(HasBits* has_bits) {
-    (*has_bits)[0] |= 2u;
-  }
-};
-
-const ::io::deephaven::proto::backplane::grpc::Ticket& CancelCommandRequest::_Internal::console_id(const CancelCommandRequest* msg) {
-  return *msg->_impl_.console_id_;
-}
-const ::io::deephaven::proto::backplane::grpc::Ticket& CancelCommandRequest::_Internal::command_id(const CancelCommandRequest* msg) {
-  return *msg->_impl_.command_id_;
-}
-void CancelCommandRequest::clear_console_id() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  if (_impl_.console_id_ != nullptr) _impl_.console_id_->Clear();
-  _impl_._has_bits_[0] &= ~0x00000001u;
-}
-void CancelCommandRequest::clear_command_id() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  if (_impl_.command_id_ != nullptr) _impl_.command_id_->Clear();
-  _impl_._has_bits_[0] &= ~0x00000002u;
-}
-CancelCommandRequest::CancelCommandRequest(::google::protobuf::Arena* arena)
-    : ::google::protobuf::Message(arena) {
-  SharedCtor(arena);
-  // @@protoc_insertion_point(arena_constructor:io.deephaven.proto.backplane.script.grpc.CancelCommandRequest)
-}
-inline PROTOBUF_NDEBUG_INLINE CancelCommandRequest::Impl_::Impl_(
-    ::google::protobuf::internal::InternalVisibility visibility, ::google::protobuf::Arena* arena,
-    const Impl_& from)
-      : _has_bits_{from._has_bits_},
-        _cached_size_{0} {}
-
-CancelCommandRequest::CancelCommandRequest(
-    ::google::protobuf::Arena* arena,
-    const CancelCommandRequest& from)
-    : ::google::protobuf::Message(arena) {
-  CancelCommandRequest* const _this = this;
-  (void)_this;
-  _internal_metadata_.MergeFrom<::google::protobuf::UnknownFieldSet>(
-      from._internal_metadata_);
-  new (&_impl_) Impl_(internal_visibility(), arena, from._impl_);
-  ::uint32_t cached_has_bits = _impl_._has_bits_[0];
-  _impl_.console_id_ = (cached_has_bits & 0x00000001u)
-                ? CreateMaybeMessage<::io::deephaven::proto::backplane::grpc::Ticket>(arena, *from._impl_.console_id_)
-                : nullptr;
-  _impl_.command_id_ = (cached_has_bits & 0x00000002u)
-                ? CreateMaybeMessage<::io::deephaven::proto::backplane::grpc::Ticket>(arena, *from._impl_.command_id_)
-                : nullptr;
-
-  // @@protoc_insertion_point(copy_constructor:io.deephaven.proto.backplane.script.grpc.CancelCommandRequest)
-}
-inline PROTOBUF_NDEBUG_INLINE CancelCommandRequest::Impl_::Impl_(
-    ::google::protobuf::internal::InternalVisibility visibility,
-    ::google::protobuf::Arena* arena)
-      : _cached_size_{0} {}
-
-inline void CancelCommandRequest::SharedCtor(::_pb::Arena* arena) {
-  new (&_impl_) Impl_(internal_visibility(), arena);
-  ::memset(reinterpret_cast<char *>(&_impl_) +
-               offsetof(Impl_, console_id_),
-           0,
-           offsetof(Impl_, command_id_) -
-               offsetof(Impl_, console_id_) +
-               sizeof(Impl_::command_id_));
-}
-CancelCommandRequest::~CancelCommandRequest() {
-  // @@protoc_insertion_point(destructor:io.deephaven.proto.backplane.script.grpc.CancelCommandRequest)
-  _internal_metadata_.Delete<::google::protobuf::UnknownFieldSet>();
-  SharedDtor();
-}
-inline void CancelCommandRequest::SharedDtor() {
-  ABSL_DCHECK(GetArena() == nullptr);
-  delete _impl_.console_id_;
-  delete _impl_.command_id_;
-  _impl_.~Impl_();
-}
-
-PROTOBUF_NOINLINE void CancelCommandRequest::Clear() {
-// @@protoc_insertion_point(message_clear_start:io.deephaven.proto.backplane.script.grpc.CancelCommandRequest)
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  ::uint32_t cached_has_bits = 0;
-  // Prevent compiler warnings about cached_has_bits being unused
-  (void) cached_has_bits;
-
-  cached_has_bits = _impl_._has_bits_[0];
-  if (cached_has_bits & 0x00000003u) {
-    if (cached_has_bits & 0x00000001u) {
-      ABSL_DCHECK(_impl_.console_id_ != nullptr);
-      _impl_.console_id_->Clear();
-    }
-    if (cached_has_bits & 0x00000002u) {
-      ABSL_DCHECK(_impl_.command_id_ != nullptr);
-      _impl_.command_id_->Clear();
-    }
-  }
-  _impl_._has_bits_.Clear();
-  _internal_metadata_.Clear<::google::protobuf::UnknownFieldSet>();
-}
-
-const char* CancelCommandRequest::_InternalParse(
-    const char* ptr, ::_pbi::ParseContext* ctx) {
-  ptr = ::_pbi::TcParser::ParseLoop(this, ptr, ctx, &_table_.header);
-  return ptr;
-}
-
-
-PROTOBUF_CONSTINIT PROTOBUF_ATTRIBUTE_INIT_PRIORITY1
-const ::_pbi::TcParseTable<1, 2, 2, 0, 2> CancelCommandRequest::_table_ = {
-  {
-    PROTOBUF_FIELD_OFFSET(CancelCommandRequest, _impl_._has_bits_),
-    0, // no _extensions_
-    2, 8,  // max_field_number, fast_idx_mask
-    offsetof(decltype(_table_), field_lookup_table),
-    4294967292,  // skipmap
-    offsetof(decltype(_table_), field_entries),
-    2,  // num_field_entries
-    2,  // num_aux_entries
-    offsetof(decltype(_table_), aux_entries),
-    &_CancelCommandRequest_default_instance_._instance,
-    ::_pbi::TcParser::GenericFallback,  // fallback
-  }, {{
-    // .io.deephaven.proto.backplane.grpc.Ticket command_id = 2;
-    {::_pbi::TcParser::FastMtS1,
-     {18, 1, 1, PROTOBUF_FIELD_OFFSET(CancelCommandRequest, _impl_.command_id_)}},
-    // .io.deephaven.proto.backplane.grpc.Ticket console_id = 1;
-    {::_pbi::TcParser::FastMtS1,
-     {10, 0, 0, PROTOBUF_FIELD_OFFSET(CancelCommandRequest, _impl_.console_id_)}},
-  }}, {{
-    65535, 65535
-  }}, {{
-    // .io.deephaven.proto.backplane.grpc.Ticket console_id = 1;
-    {PROTOBUF_FIELD_OFFSET(CancelCommandRequest, _impl_.console_id_), _Internal::kHasBitsOffset + 0, 0,
-    (0 | ::_fl::kFcOptional | ::_fl::kMessage | ::_fl::kTvTable)},
-    // .io.deephaven.proto.backplane.grpc.Ticket command_id = 2;
-    {PROTOBUF_FIELD_OFFSET(CancelCommandRequest, _impl_.command_id_), _Internal::kHasBitsOffset + 1, 1,
-    (0 | ::_fl::kFcOptional | ::_fl::kMessage | ::_fl::kTvTable)},
-  }}, {{
-    {::_pbi::TcParser::GetTable<::io::deephaven::proto::backplane::grpc::Ticket>()},
-    {::_pbi::TcParser::GetTable<::io::deephaven::proto::backplane::grpc::Ticket>()},
-  }}, {{
-  }},
-};
-
-::uint8_t* CancelCommandRequest::_InternalSerialize(
-    ::uint8_t* target,
-    ::google::protobuf::io::EpsCopyOutputStream* stream) const {
-  // @@protoc_insertion_point(serialize_to_array_start:io.deephaven.proto.backplane.script.grpc.CancelCommandRequest)
-  ::uint32_t cached_has_bits = 0;
-  (void)cached_has_bits;
-
-  cached_has_bits = _impl_._has_bits_[0];
-  // .io.deephaven.proto.backplane.grpc.Ticket console_id = 1;
-  if (cached_has_bits & 0x00000001u) {
-    target = ::google::protobuf::internal::WireFormatLite::InternalWriteMessage(
-        1, _Internal::console_id(this),
-        _Internal::console_id(this).GetCachedSize(), target, stream);
-  }
-
-  // .io.deephaven.proto.backplane.grpc.Ticket command_id = 2;
-  if (cached_has_bits & 0x00000002u) {
-    target = ::google::protobuf::internal::WireFormatLite::InternalWriteMessage(
-        2, _Internal::command_id(this),
-        _Internal::command_id(this).GetCachedSize(), target, stream);
-  }
-
-  if (PROTOBUF_PREDICT_FALSE(_internal_metadata_.have_unknown_fields())) {
-    target =
-        ::_pbi::WireFormat::InternalSerializeUnknownFieldsToArray(
-            _internal_metadata_.unknown_fields<::google::protobuf::UnknownFieldSet>(::google::protobuf::UnknownFieldSet::default_instance), target, stream);
-  }
-  // @@protoc_insertion_point(serialize_to_array_end:io.deephaven.proto.backplane.script.grpc.CancelCommandRequest)
-  return target;
-}
-
-::size_t CancelCommandRequest::ByteSizeLong() const {
-// @@protoc_insertion_point(message_byte_size_start:io.deephaven.proto.backplane.script.grpc.CancelCommandRequest)
-  ::size_t total_size = 0;
-
-  ::uint32_t cached_has_bits = 0;
-  // Prevent compiler warnings about cached_has_bits being unused
-  (void) cached_has_bits;
-
-  cached_has_bits = _impl_._has_bits_[0];
-  if (cached_has_bits & 0x00000003u) {
-    // .io.deephaven.proto.backplane.grpc.Ticket console_id = 1;
-    if (cached_has_bits & 0x00000001u) {
-      total_size +=
-          1 + ::google::protobuf::internal::WireFormatLite::MessageSize(*_impl_.console_id_);
-    }
-
-    // .io.deephaven.proto.backplane.grpc.Ticket command_id = 2;
-    if (cached_has_bits & 0x00000002u) {
-      total_size +=
-          1 + ::google::protobuf::internal::WireFormatLite::MessageSize(*_impl_.command_id_);
-    }
-
-  }
-  return MaybeComputeUnknownFieldsSize(total_size, &_impl_._cached_size_);
-}
-
-const ::google::protobuf::Message::ClassData CancelCommandRequest::_class_data_ = {
-    CancelCommandRequest::MergeImpl,
-    nullptr,  // OnDemandRegisterArenaDtor
-};
-const ::google::protobuf::Message::ClassData* CancelCommandRequest::GetClassData() const {
-  return &_class_data_;
-}
-
-void CancelCommandRequest::MergeImpl(::google::protobuf::Message& to_msg, const ::google::protobuf::Message& from_msg) {
-  auto* const _this = static_cast<CancelCommandRequest*>(&to_msg);
-  auto& from = static_cast<const CancelCommandRequest&>(from_msg);
-  // @@protoc_insertion_point(class_specific_merge_from_start:io.deephaven.proto.backplane.script.grpc.CancelCommandRequest)
-  ABSL_DCHECK_NE(&from, _this);
-  ::uint32_t cached_has_bits = 0;
-  (void) cached_has_bits;
-
-  cached_has_bits = from._impl_._has_bits_[0];
-  if (cached_has_bits & 0x00000003u) {
-    if (cached_has_bits & 0x00000001u) {
-      _this->_internal_mutable_console_id()->::io::deephaven::proto::backplane::grpc::Ticket::MergeFrom(
-          from._internal_console_id());
-    }
-    if (cached_has_bits & 0x00000002u) {
-      _this->_internal_mutable_command_id()->::io::deephaven::proto::backplane::grpc::Ticket::MergeFrom(
-          from._internal_command_id());
-    }
-  }
-  _this->_internal_metadata_.MergeFrom<::google::protobuf::UnknownFieldSet>(from._internal_metadata_);
-}
-
-void CancelCommandRequest::CopyFrom(const CancelCommandRequest& from) {
-// @@protoc_insertion_point(class_specific_copy_from_start:io.deephaven.proto.backplane.script.grpc.CancelCommandRequest)
-  if (&from == this) return;
-  Clear();
-  MergeFrom(from);
-}
-
-PROTOBUF_NOINLINE bool CancelCommandRequest::IsInitialized() const {
-  return true;
-}
-
-::_pbi::CachedSize* CancelCommandRequest::AccessCachedSize() const {
-  return &_impl_._cached_size_;
-}
-void CancelCommandRequest::InternalSwap(CancelCommandRequest* PROTOBUF_RESTRICT other) {
-  using std::swap;
-  _internal_metadata_.InternalSwap(&other->_internal_metadata_);
-  swap(_impl_._has_bits_[0], other->_impl_._has_bits_[0]);
-  ::google::protobuf::internal::memswap<
-      PROTOBUF_FIELD_OFFSET(CancelCommandRequest, _impl_.command_id_)
-      + sizeof(CancelCommandRequest::_impl_.command_id_)
-      - PROTOBUF_FIELD_OFFSET(CancelCommandRequest, _impl_.console_id_)>(
-          reinterpret_cast<char*>(&_impl_.console_id_),
-          reinterpret_cast<char*>(&other->_impl_.console_id_));
-}
-
-::google::protobuf::Metadata CancelCommandRequest::GetMetadata() const {
-  return ::_pbi::AssignDescriptors(
-      &descriptor_table_deephaven_2fproto_2fconsole_2eproto_getter, &descriptor_table_deephaven_2fproto_2fconsole_2eproto_once,
-      file_level_metadata_deephaven_2fproto_2fconsole_2eproto[12]);
-}
-// ===================================================================
-
-class CancelCommandResponse::_Internal {
- public:
-};
-
-CancelCommandResponse::CancelCommandResponse(::google::protobuf::Arena* arena)
-    : ::google::protobuf::internal::ZeroFieldsBase(arena) {
-  // @@protoc_insertion_point(arena_constructor:io.deephaven.proto.backplane.script.grpc.CancelCommandResponse)
-}
-CancelCommandResponse::CancelCommandResponse(
-    ::google::protobuf::Arena* arena,
-    const CancelCommandResponse& from)
-    : ::google::protobuf::internal::ZeroFieldsBase(arena) {
-  CancelCommandResponse* const _this = this;
-  (void)_this;
-  _internal_metadata_.MergeFrom<::google::protobuf::UnknownFieldSet>(
-      from._internal_metadata_);
-
-  // @@protoc_insertion_point(copy_constructor:io.deephaven.proto.backplane.script.grpc.CancelCommandResponse)
-}
-
-
-
-
-
-
-
-
-
-::google::protobuf::Metadata CancelCommandResponse::GetMetadata() const {
-  return ::_pbi::AssignDescriptors(
-      &descriptor_table_deephaven_2fproto_2fconsole_2eproto_getter, &descriptor_table_deephaven_2fproto_2fconsole_2eproto_once,
-      file_level_metadata_deephaven_2fproto_2fconsole_2eproto[13]);
-}
-// ===================================================================
-
-class CancelAutoCompleteRequest::_Internal {
- public:
-  using HasBits = decltype(std::declval<CancelAutoCompleteRequest>()._impl_._has_bits_);
-  static constexpr ::int32_t kHasBitsOffset =
-    8 * PROTOBUF_FIELD_OFFSET(CancelAutoCompleteRequest, _impl_._has_bits_);
-  static const ::io::deephaven::proto::backplane::grpc::Ticket& console_id(const CancelAutoCompleteRequest* msg);
-  static void set_has_console_id(HasBits* has_bits) {
-    (*has_bits)[0] |= 1u;
-  }
-};
-
-const ::io::deephaven::proto::backplane::grpc::Ticket& CancelAutoCompleteRequest::_Internal::console_id(const CancelAutoCompleteRequest* msg) {
-  return *msg->_impl_.console_id_;
-}
-void CancelAutoCompleteRequest::clear_console_id() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  if (_impl_.console_id_ != nullptr) _impl_.console_id_->Clear();
-  _impl_._has_bits_[0] &= ~0x00000001u;
-}
-CancelAutoCompleteRequest::CancelAutoCompleteRequest(::google::protobuf::Arena* arena)
-    : ::google::protobuf::Message(arena) {
-  SharedCtor(arena);
-  // @@protoc_insertion_point(arena_constructor:io.deephaven.proto.backplane.script.grpc.CancelAutoCompleteRequest)
-}
-inline PROTOBUF_NDEBUG_INLINE CancelAutoCompleteRequest::Impl_::Impl_(
-    ::google::protobuf::internal::InternalVisibility visibility, ::google::protobuf::Arena* arena,
-    const Impl_& from)
-      : _has_bits_{from._has_bits_},
-        _cached_size_{0} {}
-
-CancelAutoCompleteRequest::CancelAutoCompleteRequest(
-    ::google::protobuf::Arena* arena,
-    const CancelAutoCompleteRequest& from)
-    : ::google::protobuf::Message(arena) {
-  CancelAutoCompleteRequest* const _this = this;
-  (void)_this;
-  _internal_metadata_.MergeFrom<::google::protobuf::UnknownFieldSet>(
-      from._internal_metadata_);
-  new (&_impl_) Impl_(internal_visibility(), arena, from._impl_);
-  ::uint32_t cached_has_bits = _impl_._has_bits_[0];
-  _impl_.console_id_ = (cached_has_bits & 0x00000001u)
-                ? CreateMaybeMessage<::io::deephaven::proto::backplane::grpc::Ticket>(arena, *from._impl_.console_id_)
-                : nullptr;
-  _impl_.request_id_ = from._impl_.request_id_;
-
-  // @@protoc_insertion_point(copy_constructor:io.deephaven.proto.backplane.script.grpc.CancelAutoCompleteRequest)
-}
-inline PROTOBUF_NDEBUG_INLINE CancelAutoCompleteRequest::Impl_::Impl_(
-    ::google::protobuf::internal::InternalVisibility visibility,
-    ::google::protobuf::Arena* arena)
-      : _cached_size_{0} {}
-
-inline void CancelAutoCompleteRequest::SharedCtor(::_pb::Arena* arena) {
-  new (&_impl_) Impl_(internal_visibility(), arena);
-  ::memset(reinterpret_cast<char *>(&_impl_) +
-               offsetof(Impl_, console_id_),
-           0,
-           offsetof(Impl_, request_id_) -
-               offsetof(Impl_, console_id_) +
-               sizeof(Impl_::request_id_));
-}
-CancelAutoCompleteRequest::~CancelAutoCompleteRequest() {
-  // @@protoc_insertion_point(destructor:io.deephaven.proto.backplane.script.grpc.CancelAutoCompleteRequest)
-  _internal_metadata_.Delete<::google::protobuf::UnknownFieldSet>();
-  SharedDtor();
-}
-inline void CancelAutoCompleteRequest::SharedDtor() {
-  ABSL_DCHECK(GetArena() == nullptr);
-  delete _impl_.console_id_;
-  _impl_.~Impl_();
-}
-
-PROTOBUF_NOINLINE void CancelAutoCompleteRequest::Clear() {
-// @@protoc_insertion_point(message_clear_start:io.deephaven.proto.backplane.script.grpc.CancelAutoCompleteRequest)
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  ::uint32_t cached_has_bits = 0;
-  // Prevent compiler warnings about cached_has_bits being unused
-  (void) cached_has_bits;
-
-  cached_has_bits = _impl_._has_bits_[0];
-  if (cached_has_bits & 0x00000001u) {
-    ABSL_DCHECK(_impl_.console_id_ != nullptr);
-    _impl_.console_id_->Clear();
-  }
-  _impl_.request_id_ = 0;
-  _impl_._has_bits_.Clear();
-  _internal_metadata_.Clear<::google::protobuf::UnknownFieldSet>();
-}
-
-const char* CancelAutoCompleteRequest::_InternalParse(
-    const char* ptr, ::_pbi::ParseContext* ctx) {
-  ptr = ::_pbi::TcParser::ParseLoop(this, ptr, ctx, &_table_.header);
-  return ptr;
-}
-
-
-PROTOBUF_CONSTINIT PROTOBUF_ATTRIBUTE_INIT_PRIORITY1
-const ::_pbi::TcParseTable<1, 2, 1, 0, 2> CancelAutoCompleteRequest::_table_ = {
-  {
-    PROTOBUF_FIELD_OFFSET(CancelAutoCompleteRequest, _impl_._has_bits_),
-    0, // no _extensions_
-    2, 8,  // max_field_number, fast_idx_mask
-    offsetof(decltype(_table_), field_lookup_table),
-    4294967292,  // skipmap
-    offsetof(decltype(_table_), field_entries),
-    2,  // num_field_entries
-    1,  // num_aux_entries
-    offsetof(decltype(_table_), aux_entries),
-    &_CancelAutoCompleteRequest_default_instance_._instance,
-    ::_pbi::TcParser::GenericFallback,  // fallback
-  }, {{
-    // int32 request_id = 2;
-    {::_pbi::TcParser::SingularVarintNoZag1<::uint32_t, offsetof(CancelAutoCompleteRequest, _impl_.request_id_), 63>(),
-     {16, 63, 0, PROTOBUF_FIELD_OFFSET(CancelAutoCompleteRequest, _impl_.request_id_)}},
-    // .io.deephaven.proto.backplane.grpc.Ticket console_id = 1;
-    {::_pbi::TcParser::FastMtS1,
-     {10, 0, 0, PROTOBUF_FIELD_OFFSET(CancelAutoCompleteRequest, _impl_.console_id_)}},
-  }}, {{
-    65535, 65535
-  }}, {{
-    // .io.deephaven.proto.backplane.grpc.Ticket console_id = 1;
-    {PROTOBUF_FIELD_OFFSET(CancelAutoCompleteRequest, _impl_.console_id_), _Internal::kHasBitsOffset + 0, 0,
-    (0 | ::_fl::kFcOptional | ::_fl::kMessage | ::_fl::kTvTable)},
-    // int32 request_id = 2;
-    {PROTOBUF_FIELD_OFFSET(CancelAutoCompleteRequest, _impl_.request_id_), -1, 0,
-    (0 | ::_fl::kFcSingular | ::_fl::kInt32)},
-  }}, {{
-    {::_pbi::TcParser::GetTable<::io::deephaven::proto::backplane::grpc::Ticket>()},
-  }}, {{
-  }},
-};
-
-::uint8_t* CancelAutoCompleteRequest::_InternalSerialize(
-    ::uint8_t* target,
-    ::google::protobuf::io::EpsCopyOutputStream* stream) const {
-  // @@protoc_insertion_point(serialize_to_array_start:io.deephaven.proto.backplane.script.grpc.CancelAutoCompleteRequest)
-  ::uint32_t cached_has_bits = 0;
-  (void)cached_has_bits;
-
-  cached_has_bits = _impl_._has_bits_[0];
-  // .io.deephaven.proto.backplane.grpc.Ticket console_id = 1;
-  if (cached_has_bits & 0x00000001u) {
-    target = ::google::protobuf::internal::WireFormatLite::InternalWriteMessage(
-        1, _Internal::console_id(this),
-        _Internal::console_id(this).GetCachedSize(), target, stream);
-  }
-
-  // int32 request_id = 2;
-  if (this->_internal_request_id() != 0) {
-    target = ::google::protobuf::internal::WireFormatLite::
-        WriteInt32ToArrayWithField<2>(
-            stream, this->_internal_request_id(), target);
-  }
-
-  if (PROTOBUF_PREDICT_FALSE(_internal_metadata_.have_unknown_fields())) {
-    target =
-        ::_pbi::WireFormat::InternalSerializeUnknownFieldsToArray(
-            _internal_metadata_.unknown_fields<::google::protobuf::UnknownFieldSet>(::google::protobuf::UnknownFieldSet::default_instance), target, stream);
-  }
-  // @@protoc_insertion_point(serialize_to_array_end:io.deephaven.proto.backplane.script.grpc.CancelAutoCompleteRequest)
-  return target;
-}
-
-::size_t CancelAutoCompleteRequest::ByteSizeLong() const {
-// @@protoc_insertion_point(message_byte_size_start:io.deephaven.proto.backplane.script.grpc.CancelAutoCompleteRequest)
-  ::size_t total_size = 0;
-
-  ::uint32_t cached_has_bits = 0;
-  // Prevent compiler warnings about cached_has_bits being unused
-  (void) cached_has_bits;
-
-  // .io.deephaven.proto.backplane.grpc.Ticket console_id = 1;
-  cached_has_bits = _impl_._has_bits_[0];
-  if (cached_has_bits & 0x00000001u) {
-    total_size +=
-        1 + ::google::protobuf::internal::WireFormatLite::MessageSize(*_impl_.console_id_);
-  }
-
-  // int32 request_id = 2;
-  if (this->_internal_request_id() != 0) {
-    total_size += ::_pbi::WireFormatLite::Int32SizePlusOne(
-        this->_internal_request_id());
-  }
-
-  return MaybeComputeUnknownFieldsSize(total_size, &_impl_._cached_size_);
-}
-
-const ::google::protobuf::Message::ClassData CancelAutoCompleteRequest::_class_data_ = {
-    CancelAutoCompleteRequest::MergeImpl,
-    nullptr,  // OnDemandRegisterArenaDtor
-};
-const ::google::protobuf::Message::ClassData* CancelAutoCompleteRequest::GetClassData() const {
-  return &_class_data_;
-}
-
-void CancelAutoCompleteRequest::MergeImpl(::google::protobuf::Message& to_msg, const ::google::protobuf::Message& from_msg) {
-  auto* const _this = static_cast<CancelAutoCompleteRequest*>(&to_msg);
-  auto& from = static_cast<const CancelAutoCompleteRequest&>(from_msg);
-  // @@protoc_insertion_point(class_specific_merge_from_start:io.deephaven.proto.backplane.script.grpc.CancelAutoCompleteRequest)
-  ABSL_DCHECK_NE(&from, _this);
-  ::uint32_t cached_has_bits = 0;
-  (void) cached_has_bits;
-
-  if ((from._impl_._has_bits_[0] & 0x00000001u) != 0) {
-    _this->_internal_mutable_console_id()->::io::deephaven::proto::backplane::grpc::Ticket::MergeFrom(
-        from._internal_console_id());
-  }
-  if (from._internal_request_id() != 0) {
-    _this->_internal_set_request_id(from._internal_request_id());
-  }
-  _this->_internal_metadata_.MergeFrom<::google::protobuf::UnknownFieldSet>(from._internal_metadata_);
-}
-
-void CancelAutoCompleteRequest::CopyFrom(const CancelAutoCompleteRequest& from) {
-// @@protoc_insertion_point(class_specific_copy_from_start:io.deephaven.proto.backplane.script.grpc.CancelAutoCompleteRequest)
-  if (&from == this) return;
-  Clear();
-  MergeFrom(from);
-}
-
-PROTOBUF_NOINLINE bool CancelAutoCompleteRequest::IsInitialized() const {
-  return true;
-}
-
-::_pbi::CachedSize* CancelAutoCompleteRequest::AccessCachedSize() const {
-  return &_impl_._cached_size_;
-}
-void CancelAutoCompleteRequest::InternalSwap(CancelAutoCompleteRequest* PROTOBUF_RESTRICT other) {
-  using std::swap;
-  _internal_metadata_.InternalSwap(&other->_internal_metadata_);
-  swap(_impl_._has_bits_[0], other->_impl_._has_bits_[0]);
-  ::google::protobuf::internal::memswap<
-      PROTOBUF_FIELD_OFFSET(CancelAutoCompleteRequest, _impl_.request_id_)
-      + sizeof(CancelAutoCompleteRequest::_impl_.request_id_)
-      - PROTOBUF_FIELD_OFFSET(CancelAutoCompleteRequest, _impl_.console_id_)>(
-          reinterpret_cast<char*>(&_impl_.console_id_),
-          reinterpret_cast<char*>(&other->_impl_.console_id_));
-}
-
-::google::protobuf::Metadata CancelAutoCompleteRequest::GetMetadata() const {
-  return ::_pbi::AssignDescriptors(
-      &descriptor_table_deephaven_2fproto_2fconsole_2eproto_getter, &descriptor_table_deephaven_2fproto_2fconsole_2eproto_once,
-      file_level_metadata_deephaven_2fproto_2fconsole_2eproto[14]);
-}
-// ===================================================================
-
-class CancelAutoCompleteResponse::_Internal {
- public:
-};
-
-CancelAutoCompleteResponse::CancelAutoCompleteResponse(::google::protobuf::Arena* arena)
-    : ::google::protobuf::internal::ZeroFieldsBase(arena) {
-  // @@protoc_insertion_point(arena_constructor:io.deephaven.proto.backplane.script.grpc.CancelAutoCompleteResponse)
-}
-CancelAutoCompleteResponse::CancelAutoCompleteResponse(
-    ::google::protobuf::Arena* arena,
-    const CancelAutoCompleteResponse& from)
-    : ::google::protobuf::internal::ZeroFieldsBase(arena) {
-  CancelAutoCompleteResponse* const _this = this;
-  (void)_this;
-  _internal_metadata_.MergeFrom<::google::protobuf::UnknownFieldSet>(
-      from._internal_metadata_);
-
-  // @@protoc_insertion_point(copy_constructor:io.deephaven.proto.backplane.script.grpc.CancelAutoCompleteResponse)
-}
-
-
-
-
-
-
-
-
-
-::google::protobuf::Metadata CancelAutoCompleteResponse::GetMetadata() const {
-  return ::_pbi::AssignDescriptors(
-      &descriptor_table_deephaven_2fproto_2fconsole_2eproto_getter, &descriptor_table_deephaven_2fproto_2fconsole_2eproto_once,
-      file_level_metadata_deephaven_2fproto_2fconsole_2eproto[15]);
-}
-// ===================================================================
-
-class AutoCompleteRequest::_Internal {
- public:
-  using HasBits = decltype(std::declval<AutoCompleteRequest>()._impl_._has_bits_);
-  static constexpr ::int32_t kHasBitsOffset =
-    8 * PROTOBUF_FIELD_OFFSET(AutoCompleteRequest, _impl_._has_bits_);
-  static constexpr ::int32_t kOneofCaseOffset =
-    PROTOBUF_FIELD_OFFSET(::io::deephaven::proto::backplane::script::grpc::AutoCompleteRequest, _impl_._oneof_case_);
-  static const ::io::deephaven::proto::backplane::grpc::Ticket& console_id(const AutoCompleteRequest* msg);
-  static void set_has_console_id(HasBits* has_bits) {
-    (*has_bits)[0] |= 1u;
-  }
-  static const ::io::deephaven::proto::backplane::script::grpc::OpenDocumentRequest& open_document(const AutoCompleteRequest* msg);
-  static const ::io::deephaven::proto::backplane::script::grpc::ChangeDocumentRequest& change_document(const AutoCompleteRequest* msg);
-  static const ::io::deephaven::proto::backplane::script::grpc::GetCompletionItemsRequest& get_completion_items(const AutoCompleteRequest* msg);
-  static const ::io::deephaven::proto::backplane::script::grpc::GetSignatureHelpRequest& get_signature_help(const AutoCompleteRequest* msg);
-  static const ::io::deephaven::proto::backplane::script::grpc::GetHoverRequest& get_hover(const AutoCompleteRequest* msg);
-  static const ::io::deephaven::proto::backplane::script::grpc::GetDiagnosticRequest& get_diagnostic(const AutoCompleteRequest* msg);
-  static const ::io::deephaven::proto::backplane::script::grpc::CloseDocumentRequest& close_document(const AutoCompleteRequest* msg);
-};
-
-const ::io::deephaven::proto::backplane::grpc::Ticket& AutoCompleteRequest::_Internal::console_id(const AutoCompleteRequest* msg) {
-  return *msg->_impl_.console_id_;
-}
-const ::io::deephaven::proto::backplane::script::grpc::OpenDocumentRequest& AutoCompleteRequest::_Internal::open_document(const AutoCompleteRequest* msg) {
-  return *msg->_impl_.request_.open_document_;
-}
-const ::io::deephaven::proto::backplane::script::grpc::ChangeDocumentRequest& AutoCompleteRequest::_Internal::change_document(const AutoCompleteRequest* msg) {
-  return *msg->_impl_.request_.change_document_;
-}
-const ::io::deephaven::proto::backplane::script::grpc::GetCompletionItemsRequest& AutoCompleteRequest::_Internal::get_completion_items(const AutoCompleteRequest* msg) {
-  return *msg->_impl_.request_.get_completion_items_;
-}
-const ::io::deephaven::proto::backplane::script::grpc::GetSignatureHelpRequest& AutoCompleteRequest::_Internal::get_signature_help(const AutoCompleteRequest* msg) {
-  return *msg->_impl_.request_.get_signature_help_;
-}
-const ::io::deephaven::proto::backplane::script::grpc::GetHoverRequest& AutoCompleteRequest::_Internal::get_hover(const AutoCompleteRequest* msg) {
-  return *msg->_impl_.request_.get_hover_;
-}
-const ::io::deephaven::proto::backplane::script::grpc::GetDiagnosticRequest& AutoCompleteRequest::_Internal::get_diagnostic(const AutoCompleteRequest* msg) {
-  return *msg->_impl_.request_.get_diagnostic_;
-}
-const ::io::deephaven::proto::backplane::script::grpc::CloseDocumentRequest& AutoCompleteRequest::_Internal::close_document(const AutoCompleteRequest* msg) {
-  return *msg->_impl_.request_.close_document_;
-}
-void AutoCompleteRequest::clear_console_id() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  if (_impl_.console_id_ != nullptr) _impl_.console_id_->Clear();
-  _impl_._has_bits_[0] &= ~0x00000001u;
-}
-void AutoCompleteRequest::set_allocated_open_document(::io::deephaven::proto::backplane::script::grpc::OpenDocumentRequest* open_document) {
-  ::google::protobuf::Arena* message_arena = GetArena();
-  clear_request();
-  if (open_document) {
-    ::google::protobuf::Arena* submessage_arena = open_document->GetArena();
-    if (message_arena != submessage_arena) {
-      open_document = ::google::protobuf::internal::GetOwnedMessage(message_arena, open_document, submessage_arena);
-    }
-    set_has_open_document();
-    _impl_.request_.open_document_ = open_document;
-  }
-  // @@protoc_insertion_point(field_set_allocated:io.deephaven.proto.backplane.script.grpc.AutoCompleteRequest.open_document)
-}
-void AutoCompleteRequest::set_allocated_change_document(::io::deephaven::proto::backplane::script::grpc::ChangeDocumentRequest* change_document) {
-  ::google::protobuf::Arena* message_arena = GetArena();
-  clear_request();
-  if (change_document) {
-    ::google::protobuf::Arena* submessage_arena = change_document->GetArena();
-    if (message_arena != submessage_arena) {
-      change_document = ::google::protobuf::internal::GetOwnedMessage(message_arena, change_document, submessage_arena);
-    }
-    set_has_change_document();
-    _impl_.request_.change_document_ = change_document;
-  }
-  // @@protoc_insertion_point(field_set_allocated:io.deephaven.proto.backplane.script.grpc.AutoCompleteRequest.change_document)
-}
-void AutoCompleteRequest::set_allocated_get_completion_items(::io::deephaven::proto::backplane::script::grpc::GetCompletionItemsRequest* get_completion_items) {
-  ::google::protobuf::Arena* message_arena = GetArena();
-  clear_request();
-  if (get_completion_items) {
-    ::google::protobuf::Arena* submessage_arena = get_completion_items->GetArena();
-    if (message_arena != submessage_arena) {
-      get_completion_items = ::google::protobuf::internal::GetOwnedMessage(message_arena, get_completion_items, submessage_arena);
-    }
-    set_has_get_completion_items();
-    _impl_.request_.get_completion_items_ = get_completion_items;
-  }
-  // @@protoc_insertion_point(field_set_allocated:io.deephaven.proto.backplane.script.grpc.AutoCompleteRequest.get_completion_items)
-}
-void AutoCompleteRequest::set_allocated_get_signature_help(::io::deephaven::proto::backplane::script::grpc::GetSignatureHelpRequest* get_signature_help) {
-  ::google::protobuf::Arena* message_arena = GetArena();
-  clear_request();
-  if (get_signature_help) {
-    ::google::protobuf::Arena* submessage_arena = get_signature_help->GetArena();
-    if (message_arena != submessage_arena) {
-      get_signature_help = ::google::protobuf::internal::GetOwnedMessage(message_arena, get_signature_help, submessage_arena);
-    }
-    set_has_get_signature_help();
-    _impl_.request_.get_signature_help_ = get_signature_help;
-  }
-  // @@protoc_insertion_point(field_set_allocated:io.deephaven.proto.backplane.script.grpc.AutoCompleteRequest.get_signature_help)
-}
-void AutoCompleteRequest::set_allocated_get_hover(::io::deephaven::proto::backplane::script::grpc::GetHoverRequest* get_hover) {
-  ::google::protobuf::Arena* message_arena = GetArena();
-  clear_request();
-  if (get_hover) {
-    ::google::protobuf::Arena* submessage_arena = get_hover->GetArena();
-    if (message_arena != submessage_arena) {
-      get_hover = ::google::protobuf::internal::GetOwnedMessage(message_arena, get_hover, submessage_arena);
-    }
-    set_has_get_hover();
-    _impl_.request_.get_hover_ = get_hover;
-  }
-  // @@protoc_insertion_point(field_set_allocated:io.deephaven.proto.backplane.script.grpc.AutoCompleteRequest.get_hover)
-}
-void AutoCompleteRequest::set_allocated_get_diagnostic(::io::deephaven::proto::backplane::script::grpc::GetDiagnosticRequest* get_diagnostic) {
-  ::google::protobuf::Arena* message_arena = GetArena();
-  clear_request();
-  if (get_diagnostic) {
-    ::google::protobuf::Arena* submessage_arena = get_diagnostic->GetArena();
-    if (message_arena != submessage_arena) {
-      get_diagnostic = ::google::protobuf::internal::GetOwnedMessage(message_arena, get_diagnostic, submessage_arena);
-    }
-    set_has_get_diagnostic();
-    _impl_.request_.get_diagnostic_ = get_diagnostic;
-  }
-  // @@protoc_insertion_point(field_set_allocated:io.deephaven.proto.backplane.script.grpc.AutoCompleteRequest.get_diagnostic)
-}
-void AutoCompleteRequest::set_allocated_close_document(::io::deephaven::proto::backplane::script::grpc::CloseDocumentRequest* close_document) {
-  ::google::protobuf::Arena* message_arena = GetArena();
-  clear_request();
-  if (close_document) {
-    ::google::protobuf::Arena* submessage_arena = close_document->GetArena();
-    if (message_arena != submessage_arena) {
-      close_document = ::google::protobuf::internal::GetOwnedMessage(message_arena, close_document, submessage_arena);
-    }
-    set_has_close_document();
-    _impl_.request_.close_document_ = close_document;
-  }
-  // @@protoc_insertion_point(field_set_allocated:io.deephaven.proto.backplane.script.grpc.AutoCompleteRequest.close_document)
-}
-AutoCompleteRequest::AutoCompleteRequest(::google::protobuf::Arena* arena)
-    : ::google::protobuf::Message(arena) {
-  SharedCtor(arena);
-  // @@protoc_insertion_point(arena_constructor:io.deephaven.proto.backplane.script.grpc.AutoCompleteRequest)
-}
-inline PROTOBUF_NDEBUG_INLINE AutoCompleteRequest::Impl_::Impl_(
-    ::google::protobuf::internal::InternalVisibility visibility, ::google::protobuf::Arena* arena,
-    const Impl_& from)
-      : _has_bits_{from._has_bits_},
-        _cached_size_{0},
-        request_{},
-        _oneof_case_{from._oneof_case_[0]} {}
-
-AutoCompleteRequest::AutoCompleteRequest(
-    ::google::protobuf::Arena* arena,
-    const AutoCompleteRequest& from)
-    : ::google::protobuf::Message(arena) {
-  AutoCompleteRequest* const _this = this;
-  (void)_this;
-  _internal_metadata_.MergeFrom<::google::protobuf::UnknownFieldSet>(
-      from._internal_metadata_);
-  new (&_impl_) Impl_(internal_visibility(), arena, from._impl_);
-  ::uint32_t cached_has_bits = _impl_._has_bits_[0];
-  _impl_.console_id_ = (cached_has_bits & 0x00000001u)
-                ? CreateMaybeMessage<::io::deephaven::proto::backplane::grpc::Ticket>(arena, *from._impl_.console_id_)
-                : nullptr;
-  _impl_.request_id_ = from._impl_.request_id_;
-  switch (request_case()) {
-    case REQUEST_NOT_SET:
-      break;
-      case kOpenDocument:
-        _impl_.request_.open_document_ = CreateMaybeMessage<::io::deephaven::proto::backplane::script::grpc::OpenDocumentRequest>(arena, *from._impl_.request_.open_document_);
-        break;
-      case kChangeDocument:
-        _impl_.request_.change_document_ = CreateMaybeMessage<::io::deephaven::proto::backplane::script::grpc::ChangeDocumentRequest>(arena, *from._impl_.request_.change_document_);
-        break;
-      case kGetCompletionItems:
-        _impl_.request_.get_completion_items_ = CreateMaybeMessage<::io::deephaven::proto::backplane::script::grpc::GetCompletionItemsRequest>(arena, *from._impl_.request_.get_completion_items_);
-        break;
-      case kGetSignatureHelp:
-        _impl_.request_.get_signature_help_ = CreateMaybeMessage<::io::deephaven::proto::backplane::script::grpc::GetSignatureHelpRequest>(arena, *from._impl_.request_.get_signature_help_);
-        break;
-      case kGetHover:
-        _impl_.request_.get_hover_ = CreateMaybeMessage<::io::deephaven::proto::backplane::script::grpc::GetHoverRequest>(arena, *from._impl_.request_.get_hover_);
-        break;
-      case kGetDiagnostic:
-        _impl_.request_.get_diagnostic_ = CreateMaybeMessage<::io::deephaven::proto::backplane::script::grpc::GetDiagnosticRequest>(arena, *from._impl_.request_.get_diagnostic_);
-        break;
-      case kCloseDocument:
-        _impl_.request_.close_document_ = CreateMaybeMessage<::io::deephaven::proto::backplane::script::grpc::CloseDocumentRequest>(arena, *from._impl_.request_.close_document_);
-        break;
-  }
-
-  // @@protoc_insertion_point(copy_constructor:io.deephaven.proto.backplane.script.grpc.AutoCompleteRequest)
-}
-inline PROTOBUF_NDEBUG_INLINE AutoCompleteRequest::Impl_::Impl_(
-    ::google::protobuf::internal::InternalVisibility visibility,
-    ::google::protobuf::Arena* arena)
-      : _cached_size_{0},
-        request_{},
-        _oneof_case_{} {}
-
-inline void AutoCompleteRequest::SharedCtor(::_pb::Arena* arena) {
-  new (&_impl_) Impl_(internal_visibility(), arena);
-  ::memset(reinterpret_cast<char *>(&_impl_) +
-               offsetof(Impl_, console_id_),
-           0,
-           offsetof(Impl_, request_id_) -
-               offsetof(Impl_, console_id_) +
-               sizeof(Impl_::request_id_));
-}
-AutoCompleteRequest::~AutoCompleteRequest() {
-  // @@protoc_insertion_point(destructor:io.deephaven.proto.backplane.script.grpc.AutoCompleteRequest)
-  _internal_metadata_.Delete<::google::protobuf::UnknownFieldSet>();
-  SharedDtor();
-}
-inline void AutoCompleteRequest::SharedDtor() {
-  ABSL_DCHECK(GetArena() == nullptr);
-  delete _impl_.console_id_;
-  if (has_request()) {
-    clear_request();
-  }
-  _impl_.~Impl_();
-}
-
-void AutoCompleteRequest::clear_request() {
-// @@protoc_insertion_point(one_of_clear_start:io.deephaven.proto.backplane.script.grpc.AutoCompleteRequest)
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  switch (request_case()) {
-    case kOpenDocument: {
-      if (GetArena() == nullptr) {
-        delete _impl_.request_.open_document_;
-      }
-      break;
-    }
-    case kChangeDocument: {
-      if (GetArena() == nullptr) {
-        delete _impl_.request_.change_document_;
-      }
-      break;
-    }
-    case kGetCompletionItems: {
-      if (GetArena() == nullptr) {
-        delete _impl_.request_.get_completion_items_;
-      }
-      break;
-    }
-    case kGetSignatureHelp: {
-      if (GetArena() == nullptr) {
-        delete _impl_.request_.get_signature_help_;
-      }
-      break;
-    }
-    case kGetHover: {
-      if (GetArena() == nullptr) {
-        delete _impl_.request_.get_hover_;
-      }
-      break;
-    }
-    case kGetDiagnostic: {
-      if (GetArena() == nullptr) {
-        delete _impl_.request_.get_diagnostic_;
-      }
-      break;
-    }
-    case kCloseDocument: {
-      if (GetArena() == nullptr) {
-        delete _impl_.request_.close_document_;
-      }
-      break;
-    }
-    case REQUEST_NOT_SET: {
-      break;
-    }
-  }
-  _impl_._oneof_case_[0] = REQUEST_NOT_SET;
-}
-
-
-PROTOBUF_NOINLINE void AutoCompleteRequest::Clear() {
-// @@protoc_insertion_point(message_clear_start:io.deephaven.proto.backplane.script.grpc.AutoCompleteRequest)
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  ::uint32_t cached_has_bits = 0;
-  // Prevent compiler warnings about cached_has_bits being unused
-  (void) cached_has_bits;
-
-  cached_has_bits = _impl_._has_bits_[0];
-  if (cached_has_bits & 0x00000001u) {
-    ABSL_DCHECK(_impl_.console_id_ != nullptr);
-    _impl_.console_id_->Clear();
-  }
-  _impl_.request_id_ = 0;
-  clear_request();
-  _impl_._has_bits_.Clear();
-  _internal_metadata_.Clear<::google::protobuf::UnknownFieldSet>();
-}
-
-const char* AutoCompleteRequest::_InternalParse(
-    const char* ptr, ::_pbi::ParseContext* ctx) {
-  ptr = ::_pbi::TcParser::ParseLoop(this, ptr, ctx, &_table_.header);
-  return ptr;
-}
-
-
-PROTOBUF_CONSTINIT PROTOBUF_ATTRIBUTE_INIT_PRIORITY1
-const ::_pbi::TcParseTable<1, 9, 8, 0, 2> AutoCompleteRequest::_table_ = {
-  {
-    PROTOBUF_FIELD_OFFSET(AutoCompleteRequest, _impl_._has_bits_),
-    0, // no _extensions_
-    9, 8,  // max_field_number, fast_idx_mask
-    offsetof(decltype(_table_), field_lookup_table),
-    4294966784,  // skipmap
-    offsetof(decltype(_table_), field_entries),
-    9,  // num_field_entries
-    8,  // num_aux_entries
-    offsetof(decltype(_table_), aux_entries),
-    &_AutoCompleteRequest_default_instance_._instance,
-    ::_pbi::TcParser::GenericFallback,  // fallback
-  }, {{
-    // int32 request_id = 6;
-    {::_pbi::TcParser::SingularVarintNoZag1<::uint32_t, offsetof(AutoCompleteRequest, _impl_.request_id_), 63>(),
-     {48, 63, 0, PROTOBUF_FIELD_OFFSET(AutoCompleteRequest, _impl_.request_id_)}},
-    // .io.deephaven.proto.backplane.grpc.Ticket console_id = 5;
-    {::_pbi::TcParser::FastMtS1,
-     {42, 0, 4, PROTOBUF_FIELD_OFFSET(AutoCompleteRequest, _impl_.console_id_)}},
-  }}, {{
-    65535, 65535
-  }}, {{
-    // .io.deephaven.proto.backplane.script.grpc.OpenDocumentRequest open_document = 1;
-    {PROTOBUF_FIELD_OFFSET(AutoCompleteRequest, _impl_.request_.open_document_), _Internal::kOneofCaseOffset + 0, 0,
-    (0 | ::_fl::kFcOneof | ::_fl::kMessage | ::_fl::kTvTable)},
-    // .io.deephaven.proto.backplane.script.grpc.ChangeDocumentRequest change_document = 2;
-    {PROTOBUF_FIELD_OFFSET(AutoCompleteRequest, _impl_.request_.change_document_), _Internal::kOneofCaseOffset + 0, 1,
-    (0 | ::_fl::kFcOneof | ::_fl::kMessage | ::_fl::kTvTable)},
-    // .io.deephaven.proto.backplane.script.grpc.GetCompletionItemsRequest get_completion_items = 3;
-    {PROTOBUF_FIELD_OFFSET(AutoCompleteRequest, _impl_.request_.get_completion_items_), _Internal::kOneofCaseOffset + 0, 2,
-    (0 | ::_fl::kFcOneof | ::_fl::kMessage | ::_fl::kTvTable)},
-    // .io.deephaven.proto.backplane.script.grpc.CloseDocumentRequest close_document = 4;
-    {PROTOBUF_FIELD_OFFSET(AutoCompleteRequest, _impl_.request_.close_document_), _Internal::kOneofCaseOffset + 0, 3,
-    (0 | ::_fl::kFcOneof | ::_fl::kMessage | ::_fl::kTvTable)},
-    // .io.deephaven.proto.backplane.grpc.Ticket console_id = 5;
-    {PROTOBUF_FIELD_OFFSET(AutoCompleteRequest, _impl_.console_id_), _Internal::kHasBitsOffset + 0, 4,
-    (0 | ::_fl::kFcOptional | ::_fl::kMessage | ::_fl::kTvTable)},
-    // int32 request_id = 6;
-    {PROTOBUF_FIELD_OFFSET(AutoCompleteRequest, _impl_.request_id_), -1, 0,
-    (0 | ::_fl::kFcSingular | ::_fl::kInt32)},
-    // .io.deephaven.proto.backplane.script.grpc.GetSignatureHelpRequest get_signature_help = 7;
-    {PROTOBUF_FIELD_OFFSET(AutoCompleteRequest, _impl_.request_.get_signature_help_), _Internal::kOneofCaseOffset + 0, 5,
-    (0 | ::_fl::kFcOneof | ::_fl::kMessage | ::_fl::kTvTable)},
-    // .io.deephaven.proto.backplane.script.grpc.GetHoverRequest get_hover = 8;
-    {PROTOBUF_FIELD_OFFSET(AutoCompleteRequest, _impl_.request_.get_hover_), _Internal::kOneofCaseOffset + 0, 6,
-    (0 | ::_fl::kFcOneof | ::_fl::kMessage | ::_fl::kTvTable)},
-    // .io.deephaven.proto.backplane.script.grpc.GetDiagnosticRequest get_diagnostic = 9;
-    {PROTOBUF_FIELD_OFFSET(AutoCompleteRequest, _impl_.request_.get_diagnostic_), _Internal::kOneofCaseOffset + 0, 7,
-    (0 | ::_fl::kFcOneof | ::_fl::kMessage | ::_fl::kTvTable)},
-  }}, {{
-    {::_pbi::TcParser::GetTable<::io::deephaven::proto::backplane::script::grpc::OpenDocumentRequest>()},
-    {::_pbi::TcParser::GetTable<::io::deephaven::proto::backplane::script::grpc::ChangeDocumentRequest>()},
-    {::_pbi::TcParser::GetTable<::io::deephaven::proto::backplane::script::grpc::GetCompletionItemsRequest>()},
-    {::_pbi::TcParser::GetTable<::io::deephaven::proto::backplane::script::grpc::CloseDocumentRequest>()},
-    {::_pbi::TcParser::GetTable<::io::deephaven::proto::backplane::grpc::Ticket>()},
-    {::_pbi::TcParser::GetTable<::io::deephaven::proto::backplane::script::grpc::GetSignatureHelpRequest>()},
-    {::_pbi::TcParser::GetTable<::io::deephaven::proto::backplane::script::grpc::GetHoverRequest>()},
-    {::_pbi::TcParser::GetTable<::io::deephaven::proto::backplane::script::grpc::GetDiagnosticRequest>()},
-  }}, {{
-  }},
-};
-
-::uint8_t* AutoCompleteRequest::_InternalSerialize(
-    ::uint8_t* target,
-    ::google::protobuf::io::EpsCopyOutputStream* stream) const {
-  // @@protoc_insertion_point(serialize_to_array_start:io.deephaven.proto.backplane.script.grpc.AutoCompleteRequest)
-  ::uint32_t cached_has_bits = 0;
-  (void)cached_has_bits;
-
-  switch (request_case()) {
-    case kOpenDocument: {
-      target = ::google::protobuf::internal::WireFormatLite::InternalWriteMessage(
-          1, _Internal::open_document(this),
-          _Internal::open_document(this).GetCachedSize(), target, stream);
-      break;
-    }
-    case kChangeDocument: {
-      target = ::google::protobuf::internal::WireFormatLite::InternalWriteMessage(
-          2, _Internal::change_document(this),
-          _Internal::change_document(this).GetCachedSize(), target, stream);
-      break;
-    }
-    case kGetCompletionItems: {
-      target = ::google::protobuf::internal::WireFormatLite::InternalWriteMessage(
-          3, _Internal::get_completion_items(this),
-          _Internal::get_completion_items(this).GetCachedSize(), target, stream);
-      break;
-    }
-    case kCloseDocument: {
-      target = ::google::protobuf::internal::WireFormatLite::InternalWriteMessage(
-          4, _Internal::close_document(this),
-          _Internal::close_document(this).GetCachedSize(), target, stream);
-      break;
-    }
-    default:
-      break;
-  }
-  cached_has_bits = _impl_._has_bits_[0];
-  // .io.deephaven.proto.backplane.grpc.Ticket console_id = 5;
-  if (cached_has_bits & 0x00000001u) {
-    target = ::google::protobuf::internal::WireFormatLite::InternalWriteMessage(
-        5, _Internal::console_id(this),
-        _Internal::console_id(this).GetCachedSize(), target, stream);
-  }
-
-  // int32 request_id = 6;
-  if (this->_internal_request_id() != 0) {
-    target = ::google::protobuf::internal::WireFormatLite::
-        WriteInt32ToArrayWithField<6>(
-            stream, this->_internal_request_id(), target);
-  }
-
-  switch (request_case()) {
-    case kGetSignatureHelp: {
-      target = ::google::protobuf::internal::WireFormatLite::InternalWriteMessage(
-          7, _Internal::get_signature_help(this),
-          _Internal::get_signature_help(this).GetCachedSize(), target, stream);
-      break;
-    }
-    case kGetHover: {
-      target = ::google::protobuf::internal::WireFormatLite::InternalWriteMessage(
-          8, _Internal::get_hover(this),
-          _Internal::get_hover(this).GetCachedSize(), target, stream);
-      break;
-    }
-    case kGetDiagnostic: {
-      target = ::google::protobuf::internal::WireFormatLite::InternalWriteMessage(
-          9, _Internal::get_diagnostic(this),
-          _Internal::get_diagnostic(this).GetCachedSize(), target, stream);
-      break;
-    }
-    default:
-      break;
-  }
-  if (PROTOBUF_PREDICT_FALSE(_internal_metadata_.have_unknown_fields())) {
-    target =
-        ::_pbi::WireFormat::InternalSerializeUnknownFieldsToArray(
-            _internal_metadata_.unknown_fields<::google::protobuf::UnknownFieldSet>(::google::protobuf::UnknownFieldSet::default_instance), target, stream);
-  }
-  // @@protoc_insertion_point(serialize_to_array_end:io.deephaven.proto.backplane.script.grpc.AutoCompleteRequest)
-  return target;
-}
-
-::size_t AutoCompleteRequest::ByteSizeLong() const {
-// @@protoc_insertion_point(message_byte_size_start:io.deephaven.proto.backplane.script.grpc.AutoCompleteRequest)
-  ::size_t total_size = 0;
-
-  ::uint32_t cached_has_bits = 0;
-  // Prevent compiler warnings about cached_has_bits being unused
-  (void) cached_has_bits;
-
-  // .io.deephaven.proto.backplane.grpc.Ticket console_id = 5;
-  cached_has_bits = _impl_._has_bits_[0];
-  if (cached_has_bits & 0x00000001u) {
-    total_size +=
-        1 + ::google::protobuf::internal::WireFormatLite::MessageSize(*_impl_.console_id_);
-  }
-
-  // int32 request_id = 6;
-  if (this->_internal_request_id() != 0) {
-    total_size += ::_pbi::WireFormatLite::Int32SizePlusOne(
-        this->_internal_request_id());
-  }
-
-  switch (request_case()) {
-    // .io.deephaven.proto.backplane.script.grpc.OpenDocumentRequest open_document = 1;
-    case kOpenDocument: {
-      total_size +=
-          1 + ::google::protobuf::internal::WireFormatLite::MessageSize(*_impl_.request_.open_document_);
-      break;
-    }
-    // .io.deephaven.proto.backplane.script.grpc.ChangeDocumentRequest change_document = 2;
-    case kChangeDocument: {
-      total_size +=
-          1 + ::google::protobuf::internal::WireFormatLite::MessageSize(*_impl_.request_.change_document_);
-      break;
-    }
-    // .io.deephaven.proto.backplane.script.grpc.GetCompletionItemsRequest get_completion_items = 3;
-    case kGetCompletionItems: {
-      total_size +=
-          1 + ::google::protobuf::internal::WireFormatLite::MessageSize(*_impl_.request_.get_completion_items_);
-      break;
-    }
-    // .io.deephaven.proto.backplane.script.grpc.GetSignatureHelpRequest get_signature_help = 7;
-    case kGetSignatureHelp: {
-      total_size +=
-          1 + ::google::protobuf::internal::WireFormatLite::MessageSize(*_impl_.request_.get_signature_help_);
-      break;
-    }
-    // .io.deephaven.proto.backplane.script.grpc.GetHoverRequest get_hover = 8;
-    case kGetHover: {
-      total_size +=
-          1 + ::google::protobuf::internal::WireFormatLite::MessageSize(*_impl_.request_.get_hover_);
-      break;
-    }
-    // .io.deephaven.proto.backplane.script.grpc.GetDiagnosticRequest get_diagnostic = 9;
-    case kGetDiagnostic: {
-      total_size +=
-          1 + ::google::protobuf::internal::WireFormatLite::MessageSize(*_impl_.request_.get_diagnostic_);
-      break;
-    }
-    // .io.deephaven.proto.backplane.script.grpc.CloseDocumentRequest close_document = 4;
-    case kCloseDocument: {
-      total_size +=
-          1 + ::google::protobuf::internal::WireFormatLite::MessageSize(*_impl_.request_.close_document_);
-      break;
-    }
-    case REQUEST_NOT_SET: {
-      break;
-    }
-  }
-  return MaybeComputeUnknownFieldsSize(total_size, &_impl_._cached_size_);
-}
-
-const ::google::protobuf::Message::ClassData AutoCompleteRequest::_class_data_ = {
-    AutoCompleteRequest::MergeImpl,
-    nullptr,  // OnDemandRegisterArenaDtor
-};
-const ::google::protobuf::Message::ClassData* AutoCompleteRequest::GetClassData() const {
-  return &_class_data_;
-}
-
-void AutoCompleteRequest::MergeImpl(::google::protobuf::Message& to_msg, const ::google::protobuf::Message& from_msg) {
-  auto* const _this = static_cast<AutoCompleteRequest*>(&to_msg);
-  auto& from = static_cast<const AutoCompleteRequest&>(from_msg);
-  // @@protoc_insertion_point(class_specific_merge_from_start:io.deephaven.proto.backplane.script.grpc.AutoCompleteRequest)
-  ABSL_DCHECK_NE(&from, _this);
-  ::uint32_t cached_has_bits = 0;
-  (void) cached_has_bits;
-
-  if ((from._impl_._has_bits_[0] & 0x00000001u) != 0) {
-    _this->_internal_mutable_console_id()->::io::deephaven::proto::backplane::grpc::Ticket::MergeFrom(
-        from._internal_console_id());
-  }
-  if (from._internal_request_id() != 0) {
-    _this->_internal_set_request_id(from._internal_request_id());
-  }
-  switch (from.request_case()) {
-    case kOpenDocument: {
-      _this->_internal_mutable_open_document()->::io::deephaven::proto::backplane::script::grpc::OpenDocumentRequest::MergeFrom(
-          from._internal_open_document());
-      break;
-    }
-    case kChangeDocument: {
-      _this->_internal_mutable_change_document()->::io::deephaven::proto::backplane::script::grpc::ChangeDocumentRequest::MergeFrom(
-          from._internal_change_document());
-      break;
-    }
-    case kGetCompletionItems: {
-      _this->_internal_mutable_get_completion_items()->::io::deephaven::proto::backplane::script::grpc::GetCompletionItemsRequest::MergeFrom(
-          from._internal_get_completion_items());
-      break;
-    }
-    case kGetSignatureHelp: {
-      _this->_internal_mutable_get_signature_help()->::io::deephaven::proto::backplane::script::grpc::GetSignatureHelpRequest::MergeFrom(
-          from._internal_get_signature_help());
-      break;
-    }
-    case kGetHover: {
-      _this->_internal_mutable_get_hover()->::io::deephaven::proto::backplane::script::grpc::GetHoverRequest::MergeFrom(
-          from._internal_get_hover());
-      break;
-    }
-    case kGetDiagnostic: {
-      _this->_internal_mutable_get_diagnostic()->::io::deephaven::proto::backplane::script::grpc::GetDiagnosticRequest::MergeFrom(
-          from._internal_get_diagnostic());
-      break;
-    }
-    case kCloseDocument: {
-      _this->_internal_mutable_close_document()->::io::deephaven::proto::backplane::script::grpc::CloseDocumentRequest::MergeFrom(
-          from._internal_close_document());
-      break;
-    }
-    case REQUEST_NOT_SET: {
-      break;
-    }
-  }
-  _this->_internal_metadata_.MergeFrom<::google::protobuf::UnknownFieldSet>(from._internal_metadata_);
-}
-
-void AutoCompleteRequest::CopyFrom(const AutoCompleteRequest& from) {
-// @@protoc_insertion_point(class_specific_copy_from_start:io.deephaven.proto.backplane.script.grpc.AutoCompleteRequest)
-  if (&from == this) return;
-  Clear();
-  MergeFrom(from);
-}
-
-PROTOBUF_NOINLINE bool AutoCompleteRequest::IsInitialized() const {
-  return true;
-}
-
-::_pbi::CachedSize* AutoCompleteRequest::AccessCachedSize() const {
-  return &_impl_._cached_size_;
-}
-void AutoCompleteRequest::InternalSwap(AutoCompleteRequest* PROTOBUF_RESTRICT other) {
-  using std::swap;
-  _internal_metadata_.InternalSwap(&other->_internal_metadata_);
-  swap(_impl_._has_bits_[0], other->_impl_._has_bits_[0]);
-  ::google::protobuf::internal::memswap<
-      PROTOBUF_FIELD_OFFSET(AutoCompleteRequest, _impl_.request_id_)
-      + sizeof(AutoCompleteRequest::_impl_.request_id_)
-      - PROTOBUF_FIELD_OFFSET(AutoCompleteRequest, _impl_.console_id_)>(
-          reinterpret_cast<char*>(&_impl_.console_id_),
-          reinterpret_cast<char*>(&other->_impl_.console_id_));
-  swap(_impl_.request_, other->_impl_.request_);
-  swap(_impl_._oneof_case_[0], other->_impl_._oneof_case_[0]);
-}
-
-::google::protobuf::Metadata AutoCompleteRequest::GetMetadata() const {
-  return ::_pbi::AssignDescriptors(
-      &descriptor_table_deephaven_2fproto_2fconsole_2eproto_getter, &descriptor_table_deephaven_2fproto_2fconsole_2eproto_once,
-      file_level_metadata_deephaven_2fproto_2fconsole_2eproto[16]);
-}
-// ===================================================================
-
-class AutoCompleteResponse::_Internal {
- public:
-  static constexpr ::int32_t kOneofCaseOffset =
-    PROTOBUF_FIELD_OFFSET(::io::deephaven::proto::backplane::script::grpc::AutoCompleteResponse, _impl_._oneof_case_);
-  static const ::io::deephaven::proto::backplane::script::grpc::GetCompletionItemsResponse& completion_items(const AutoCompleteResponse* msg);
-  static const ::io::deephaven::proto::backplane::script::grpc::GetSignatureHelpResponse& signatures(const AutoCompleteResponse* msg);
-  static const ::io::deephaven::proto::backplane::script::grpc::GetHoverResponse& hover(const AutoCompleteResponse* msg);
-  static const ::io::deephaven::proto::backplane::script::grpc::GetPullDiagnosticResponse& diagnostic(const AutoCompleteResponse* msg);
-  static const ::io::deephaven::proto::backplane::script::grpc::GetPublishDiagnosticResponse& diagnostic_publish(const AutoCompleteResponse* msg);
-};
-
-const ::io::deephaven::proto::backplane::script::grpc::GetCompletionItemsResponse& AutoCompleteResponse::_Internal::completion_items(const AutoCompleteResponse* msg) {
-  return *msg->_impl_.response_.completion_items_;
-}
-const ::io::deephaven::proto::backplane::script::grpc::GetSignatureHelpResponse& AutoCompleteResponse::_Internal::signatures(const AutoCompleteResponse* msg) {
-  return *msg->_impl_.response_.signatures_;
-}
-const ::io::deephaven::proto::backplane::script::grpc::GetHoverResponse& AutoCompleteResponse::_Internal::hover(const AutoCompleteResponse* msg) {
-  return *msg->_impl_.response_.hover_;
-}
-const ::io::deephaven::proto::backplane::script::grpc::GetPullDiagnosticResponse& AutoCompleteResponse::_Internal::diagnostic(const AutoCompleteResponse* msg) {
-  return *msg->_impl_.response_.diagnostic_;
-}
-const ::io::deephaven::proto::backplane::script::grpc::GetPublishDiagnosticResponse& AutoCompleteResponse::_Internal::diagnostic_publish(const AutoCompleteResponse* msg) {
-  return *msg->_impl_.response_.diagnostic_publish_;
-}
-void AutoCompleteResponse::set_allocated_completion_items(::io::deephaven::proto::backplane::script::grpc::GetCompletionItemsResponse* completion_items) {
-  ::google::protobuf::Arena* message_arena = GetArena();
-  clear_response();
-  if (completion_items) {
-    ::google::protobuf::Arena* submessage_arena = completion_items->GetArena();
-    if (message_arena != submessage_arena) {
-      completion_items = ::google::protobuf::internal::GetOwnedMessage(message_arena, completion_items, submessage_arena);
-    }
-    set_has_completion_items();
-    _impl_.response_.completion_items_ = completion_items;
-  }
-  // @@protoc_insertion_point(field_set_allocated:io.deephaven.proto.backplane.script.grpc.AutoCompleteResponse.completion_items)
-}
-void AutoCompleteResponse::set_allocated_signatures(::io::deephaven::proto::backplane::script::grpc::GetSignatureHelpResponse* signatures) {
-  ::google::protobuf::Arena* message_arena = GetArena();
-  clear_response();
-  if (signatures) {
-    ::google::protobuf::Arena* submessage_arena = signatures->GetArena();
-    if (message_arena != submessage_arena) {
-      signatures = ::google::protobuf::internal::GetOwnedMessage(message_arena, signatures, submessage_arena);
-    }
-    set_has_signatures();
-    _impl_.response_.signatures_ = signatures;
-  }
-  // @@protoc_insertion_point(field_set_allocated:io.deephaven.proto.backplane.script.grpc.AutoCompleteResponse.signatures)
-}
-void AutoCompleteResponse::set_allocated_hover(::io::deephaven::proto::backplane::script::grpc::GetHoverResponse* hover) {
-  ::google::protobuf::Arena* message_arena = GetArena();
-  clear_response();
-  if (hover) {
-    ::google::protobuf::Arena* submessage_arena = hover->GetArena();
-    if (message_arena != submessage_arena) {
-      hover = ::google::protobuf::internal::GetOwnedMessage(message_arena, hover, submessage_arena);
-    }
-    set_has_hover();
-    _impl_.response_.hover_ = hover;
-  }
-  // @@protoc_insertion_point(field_set_allocated:io.deephaven.proto.backplane.script.grpc.AutoCompleteResponse.hover)
-}
-void AutoCompleteResponse::set_allocated_diagnostic(::io::deephaven::proto::backplane::script::grpc::GetPullDiagnosticResponse* diagnostic) {
-  ::google::protobuf::Arena* message_arena = GetArena();
-  clear_response();
-  if (diagnostic) {
-    ::google::protobuf::Arena* submessage_arena = diagnostic->GetArena();
-    if (message_arena != submessage_arena) {
-      diagnostic = ::google::protobuf::internal::GetOwnedMessage(message_arena, diagnostic, submessage_arena);
-    }
-    set_has_diagnostic();
-    _impl_.response_.diagnostic_ = diagnostic;
-  }
-  // @@protoc_insertion_point(field_set_allocated:io.deephaven.proto.backplane.script.grpc.AutoCompleteResponse.diagnostic)
-}
-void AutoCompleteResponse::set_allocated_diagnostic_publish(::io::deephaven::proto::backplane::script::grpc::GetPublishDiagnosticResponse* diagnostic_publish) {
-  ::google::protobuf::Arena* message_arena = GetArena();
-  clear_response();
-  if (diagnostic_publish) {
-    ::google::protobuf::Arena* submessage_arena = diagnostic_publish->GetArena();
-    if (message_arena != submessage_arena) {
-      diagnostic_publish = ::google::protobuf::internal::GetOwnedMessage(message_arena, diagnostic_publish, submessage_arena);
-    }
-    set_has_diagnostic_publish();
-    _impl_.response_.diagnostic_publish_ = diagnostic_publish;
-  }
-  // @@protoc_insertion_point(field_set_allocated:io.deephaven.proto.backplane.script.grpc.AutoCompleteResponse.diagnostic_publish)
-}
-AutoCompleteResponse::AutoCompleteResponse(::google::protobuf::Arena* arena)
-    : ::google::protobuf::Message(arena) {
-  SharedCtor(arena);
-  // @@protoc_insertion_point(arena_constructor:io.deephaven.proto.backplane.script.grpc.AutoCompleteResponse)
-}
-inline PROTOBUF_NDEBUG_INLINE AutoCompleteResponse::Impl_::Impl_(
-    ::google::protobuf::internal::InternalVisibility visibility, ::google::protobuf::Arena* arena,
-    const Impl_& from)
-      : response_{},
-        _cached_size_{0},
-        _oneof_case_{from._oneof_case_[0]} {}
-
-AutoCompleteResponse::AutoCompleteResponse(
-    ::google::protobuf::Arena* arena,
-    const AutoCompleteResponse& from)
-    : ::google::protobuf::Message(arena) {
-  AutoCompleteResponse* const _this = this;
-  (void)_this;
-  _internal_metadata_.MergeFrom<::google::protobuf::UnknownFieldSet>(
-      from._internal_metadata_);
-  new (&_impl_) Impl_(internal_visibility(), arena, from._impl_);
-  ::memcpy(reinterpret_cast<char *>(&_impl_) +
-               offsetof(Impl_, request_id_),
-           reinterpret_cast<const char *>(&from._impl_) +
-               offsetof(Impl_, request_id_),
-           offsetof(Impl_, success_) -
-               offsetof(Impl_, request_id_) +
-               sizeof(Impl_::success_));
-  switch (response_case()) {
-    case RESPONSE_NOT_SET:
-      break;
-      case kCompletionItems:
-        _impl_.response_.completion_items_ = CreateMaybeMessage<::io::deephaven::proto::backplane::script::grpc::GetCompletionItemsResponse>(arena, *from._impl_.response_.completion_items_);
-        break;
-      case kSignatures:
-        _impl_.response_.signatures_ = CreateMaybeMessage<::io::deephaven::proto::backplane::script::grpc::GetSignatureHelpResponse>(arena, *from._impl_.response_.signatures_);
-        break;
-      case kHover:
-        _impl_.response_.hover_ = CreateMaybeMessage<::io::deephaven::proto::backplane::script::grpc::GetHoverResponse>(arena, *from._impl_.response_.hover_);
-        break;
-      case kDiagnostic:
-        _impl_.response_.diagnostic_ = CreateMaybeMessage<::io::deephaven::proto::backplane::script::grpc::GetPullDiagnosticResponse>(arena, *from._impl_.response_.diagnostic_);
-        break;
-      case kDiagnosticPublish:
-        _impl_.response_.diagnostic_publish_ = CreateMaybeMessage<::io::deephaven::proto::backplane::script::grpc::GetPublishDiagnosticResponse>(arena, *from._impl_.response_.diagnostic_publish_);
-        break;
-  }
-
-  // @@protoc_insertion_point(copy_constructor:io.deephaven.proto.backplane.script.grpc.AutoCompleteResponse)
-}
-inline PROTOBUF_NDEBUG_INLINE AutoCompleteResponse::Impl_::Impl_(
-    ::google::protobuf::internal::InternalVisibility visibility,
-    ::google::protobuf::Arena* arena)
-      : response_{},
-        _cached_size_{0},
-        _oneof_case_{} {}
-
-inline void AutoCompleteResponse::SharedCtor(::_pb::Arena* arena) {
-  new (&_impl_) Impl_(internal_visibility(), arena);
-  ::memset(reinterpret_cast<char *>(&_impl_) +
-               offsetof(Impl_, request_id_),
-           0,
-           offsetof(Impl_, success_) -
-               offsetof(Impl_, request_id_) +
-               sizeof(Impl_::success_));
-}
-AutoCompleteResponse::~AutoCompleteResponse() {
-  // @@protoc_insertion_point(destructor:io.deephaven.proto.backplane.script.grpc.AutoCompleteResponse)
-  _internal_metadata_.Delete<::google::protobuf::UnknownFieldSet>();
-  SharedDtor();
-}
-inline void AutoCompleteResponse::SharedDtor() {
-  ABSL_DCHECK(GetArena() == nullptr);
-  if (has_response()) {
-    clear_response();
-  }
-  _impl_.~Impl_();
-}
-
-void AutoCompleteResponse::clear_response() {
-// @@protoc_insertion_point(one_of_clear_start:io.deephaven.proto.backplane.script.grpc.AutoCompleteResponse)
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  switch (response_case()) {
-    case kCompletionItems: {
-      if (GetArena() == nullptr) {
-        delete _impl_.response_.completion_items_;
-      }
-      break;
-    }
-    case kSignatures: {
-      if (GetArena() == nullptr) {
-        delete _impl_.response_.signatures_;
-      }
-      break;
-    }
-    case kHover: {
-      if (GetArena() == nullptr) {
-        delete _impl_.response_.hover_;
-      }
-      break;
-    }
-    case kDiagnostic: {
-      if (GetArena() == nullptr) {
-        delete _impl_.response_.diagnostic_;
-      }
-      break;
-    }
-    case kDiagnosticPublish: {
-      if (GetArena() == nullptr) {
-        delete _impl_.response_.diagnostic_publish_;
-      }
-      break;
-    }
-    case RESPONSE_NOT_SET: {
-      break;
-    }
-  }
-  _impl_._oneof_case_[0] = RESPONSE_NOT_SET;
-}
-
-
-PROTOBUF_NOINLINE void AutoCompleteResponse::Clear() {
-// @@protoc_insertion_point(message_clear_start:io.deephaven.proto.backplane.script.grpc.AutoCompleteResponse)
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  ::uint32_t cached_has_bits = 0;
-  // Prevent compiler warnings about cached_has_bits being unused
-  (void) cached_has_bits;
-
-  ::memset(&_impl_.request_id_, 0, static_cast<::size_t>(
-      reinterpret_cast<char*>(&_impl_.success_) -
-      reinterpret_cast<char*>(&_impl_.request_id_)) + sizeof(_impl_.success_));
-  clear_response();
-  _internal_metadata_.Clear<::google::protobuf::UnknownFieldSet>();
-}
-
-const char* AutoCompleteResponse::_InternalParse(
-    const char* ptr, ::_pbi::ParseContext* ctx) {
-  ptr = ::_pbi::TcParser::ParseLoop(this, ptr, ctx, &_table_.header);
-  return ptr;
-}
-
-
-PROTOBUF_CONSTINIT PROTOBUF_ATTRIBUTE_INIT_PRIORITY1
-const ::_pbi::TcParseTable<1, 7, 5, 0, 2> AutoCompleteResponse::_table_ = {
-  {
-    0,  // no _has_bits_
-    0, // no _extensions_
-    7, 8,  // max_field_number, fast_idx_mask
-    offsetof(decltype(_table_), field_lookup_table),
-    4294967168,  // skipmap
-    offsetof(decltype(_table_), field_entries),
-    7,  // num_field_entries
-    5,  // num_aux_entries
-    offsetof(decltype(_table_), aux_entries),
-    &_AutoCompleteResponse_default_instance_._instance,
-    ::_pbi::TcParser::GenericFallback,  // fallback
-  }, {{
-    // int32 request_id = 2;
-    {::_pbi::TcParser::SingularVarintNoZag1<::uint32_t, offsetof(AutoCompleteResponse, _impl_.request_id_), 63>(),
-     {16, 63, 0, PROTOBUF_FIELD_OFFSET(AutoCompleteResponse, _impl_.request_id_)}},
-    // bool success = 3;
-    {::_pbi::TcParser::SingularVarintNoZag1<bool, offsetof(AutoCompleteResponse, _impl_.success_), 63>(),
-     {24, 63, 0, PROTOBUF_FIELD_OFFSET(AutoCompleteResponse, _impl_.success_)}},
-  }}, {{
-    65535, 65535
-  }}, {{
-    // .io.deephaven.proto.backplane.script.grpc.GetCompletionItemsResponse completion_items = 1;
-    {PROTOBUF_FIELD_OFFSET(AutoCompleteResponse, _impl_.response_.completion_items_), _Internal::kOneofCaseOffset + 0, 0,
-    (0 | ::_fl::kFcOneof | ::_fl::kMessage | ::_fl::kTvTable)},
-    // int32 request_id = 2;
-    {PROTOBUF_FIELD_OFFSET(AutoCompleteResponse, _impl_.request_id_), 0, 0,
-    (0 | ::_fl::kFcSingular | ::_fl::kInt32)},
-    // bool success = 3;
-    {PROTOBUF_FIELD_OFFSET(AutoCompleteResponse, _impl_.success_), 0, 0,
-    (0 | ::_fl::kFcSingular | ::_fl::kBool)},
-    // .io.deephaven.proto.backplane.script.grpc.GetSignatureHelpResponse signatures = 4;
-    {PROTOBUF_FIELD_OFFSET(AutoCompleteResponse, _impl_.response_.signatures_), _Internal::kOneofCaseOffset + 0, 1,
-    (0 | ::_fl::kFcOneof | ::_fl::kMessage | ::_fl::kTvTable)},
-    // .io.deephaven.proto.backplane.script.grpc.GetHoverResponse hover = 5;
-    {PROTOBUF_FIELD_OFFSET(AutoCompleteResponse, _impl_.response_.hover_), _Internal::kOneofCaseOffset + 0, 2,
-    (0 | ::_fl::kFcOneof | ::_fl::kMessage | ::_fl::kTvTable)},
-    // .io.deephaven.proto.backplane.script.grpc.GetPullDiagnosticResponse diagnostic = 6;
-    {PROTOBUF_FIELD_OFFSET(AutoCompleteResponse, _impl_.response_.diagnostic_), _Internal::kOneofCaseOffset + 0, 3,
-    (0 | ::_fl::kFcOneof | ::_fl::kMessage | ::_fl::kTvTable)},
-    // .io.deephaven.proto.backplane.script.grpc.GetPublishDiagnosticResponse diagnostic_publish = 7;
-    {PROTOBUF_FIELD_OFFSET(AutoCompleteResponse, _impl_.response_.diagnostic_publish_), _Internal::kOneofCaseOffset + 0, 4,
-    (0 | ::_fl::kFcOneof | ::_fl::kMessage | ::_fl::kTvTable)},
-  }}, {{
-    {::_pbi::TcParser::GetTable<::io::deephaven::proto::backplane::script::grpc::GetCompletionItemsResponse>()},
-    {::_pbi::TcParser::GetTable<::io::deephaven::proto::backplane::script::grpc::GetSignatureHelpResponse>()},
-    {::_pbi::TcParser::GetTable<::io::deephaven::proto::backplane::script::grpc::GetHoverResponse>()},
-    {::_pbi::TcParser::GetTable<::io::deephaven::proto::backplane::script::grpc::GetPullDiagnosticResponse>()},
-    {::_pbi::TcParser::GetTable<::io::deephaven::proto::backplane::script::grpc::GetPublishDiagnosticResponse>()},
-  }}, {{
-  }},
-};
-
-::uint8_t* AutoCompleteResponse::_InternalSerialize(
-    ::uint8_t* target,
-    ::google::protobuf::io::EpsCopyOutputStream* stream) const {
-  // @@protoc_insertion_point(serialize_to_array_start:io.deephaven.proto.backplane.script.grpc.AutoCompleteResponse)
-  ::uint32_t cached_has_bits = 0;
-  (void)cached_has_bits;
-
-  // .io.deephaven.proto.backplane.script.grpc.GetCompletionItemsResponse completion_items = 1;
-  if (response_case() == kCompletionItems) {
-    target = ::google::protobuf::internal::WireFormatLite::InternalWriteMessage(
-        1, _Internal::completion_items(this),
-        _Internal::completion_items(this).GetCachedSize(), target, stream);
-  }
-
-  // int32 request_id = 2;
-  if (this->_internal_request_id() != 0) {
-    target = ::google::protobuf::internal::WireFormatLite::
-        WriteInt32ToArrayWithField<2>(
-            stream, this->_internal_request_id(), target);
-  }
-
-  // bool success = 3;
-  if (this->_internal_success() != 0) {
-    target = stream->EnsureSpace(target);
-    target = ::_pbi::WireFormatLite::WriteBoolToArray(
-        3, this->_internal_success(), target);
-  }
-
-  switch (response_case()) {
-    case kSignatures: {
-      target = ::google::protobuf::internal::WireFormatLite::InternalWriteMessage(
-          4, _Internal::signatures(this),
-          _Internal::signatures(this).GetCachedSize(), target, stream);
-      break;
-    }
-    case kHover: {
-      target = ::google::protobuf::internal::WireFormatLite::InternalWriteMessage(
-          5, _Internal::hover(this),
-          _Internal::hover(this).GetCachedSize(), target, stream);
-      break;
-    }
-    case kDiagnostic: {
-      target = ::google::protobuf::internal::WireFormatLite::InternalWriteMessage(
-          6, _Internal::diagnostic(this),
-          _Internal::diagnostic(this).GetCachedSize(), target, stream);
-      break;
-    }
-    case kDiagnosticPublish: {
-      target = ::google::protobuf::internal::WireFormatLite::InternalWriteMessage(
-          7, _Internal::diagnostic_publish(this),
-          _Internal::diagnostic_publish(this).GetCachedSize(), target, stream);
-      break;
-    }
-    default:
-      break;
-  }
-  if (PROTOBUF_PREDICT_FALSE(_internal_metadata_.have_unknown_fields())) {
-    target =
-        ::_pbi::WireFormat::InternalSerializeUnknownFieldsToArray(
-            _internal_metadata_.unknown_fields<::google::protobuf::UnknownFieldSet>(::google::protobuf::UnknownFieldSet::default_instance), target, stream);
-  }
-  // @@protoc_insertion_point(serialize_to_array_end:io.deephaven.proto.backplane.script.grpc.AutoCompleteResponse)
-  return target;
-}
-
-::size_t AutoCompleteResponse::ByteSizeLong() const {
-// @@protoc_insertion_point(message_byte_size_start:io.deephaven.proto.backplane.script.grpc.AutoCompleteResponse)
-  ::size_t total_size = 0;
-
-  ::uint32_t cached_has_bits = 0;
-  // Prevent compiler warnings about cached_has_bits being unused
-  (void) cached_has_bits;
-
-  // int32 request_id = 2;
-  if (this->_internal_request_id() != 0) {
-    total_size += ::_pbi::WireFormatLite::Int32SizePlusOne(
-        this->_internal_request_id());
-  }
-
-  // bool success = 3;
-  if (this->_internal_success() != 0) {
-    total_size += 2;
-  }
-
-  switch (response_case()) {
-    // .io.deephaven.proto.backplane.script.grpc.GetCompletionItemsResponse completion_items = 1;
-    case kCompletionItems: {
-      total_size +=
-          1 + ::google::protobuf::internal::WireFormatLite::MessageSize(*_impl_.response_.completion_items_);
-      break;
-    }
-    // .io.deephaven.proto.backplane.script.grpc.GetSignatureHelpResponse signatures = 4;
-    case kSignatures: {
-      total_size +=
-          1 + ::google::protobuf::internal::WireFormatLite::MessageSize(*_impl_.response_.signatures_);
-      break;
-    }
-    // .io.deephaven.proto.backplane.script.grpc.GetHoverResponse hover = 5;
-    case kHover: {
-      total_size +=
-          1 + ::google::protobuf::internal::WireFormatLite::MessageSize(*_impl_.response_.hover_);
-      break;
-    }
-    // .io.deephaven.proto.backplane.script.grpc.GetPullDiagnosticResponse diagnostic = 6;
-    case kDiagnostic: {
-      total_size +=
-          1 + ::google::protobuf::internal::WireFormatLite::MessageSize(*_impl_.response_.diagnostic_);
-      break;
-    }
-    // .io.deephaven.proto.backplane.script.grpc.GetPublishDiagnosticResponse diagnostic_publish = 7;
-    case kDiagnosticPublish: {
-      total_size +=
-          1 + ::google::protobuf::internal::WireFormatLite::MessageSize(*_impl_.response_.diagnostic_publish_);
-      break;
-    }
-    case RESPONSE_NOT_SET: {
-      break;
-    }
-  }
-  return MaybeComputeUnknownFieldsSize(total_size, &_impl_._cached_size_);
-}
-
-const ::google::protobuf::Message::ClassData AutoCompleteResponse::_class_data_ = {
-    AutoCompleteResponse::MergeImpl,
-    nullptr,  // OnDemandRegisterArenaDtor
-};
-const ::google::protobuf::Message::ClassData* AutoCompleteResponse::GetClassData() const {
-  return &_class_data_;
-}
-
-void AutoCompleteResponse::MergeImpl(::google::protobuf::Message& to_msg, const ::google::protobuf::Message& from_msg) {
-  auto* const _this = static_cast<AutoCompleteResponse*>(&to_msg);
-  auto& from = static_cast<const AutoCompleteResponse&>(from_msg);
-  // @@protoc_insertion_point(class_specific_merge_from_start:io.deephaven.proto.backplane.script.grpc.AutoCompleteResponse)
-  ABSL_DCHECK_NE(&from, _this);
-  ::uint32_t cached_has_bits = 0;
-  (void) cached_has_bits;
-
-  if (from._internal_request_id() != 0) {
-    _this->_internal_set_request_id(from._internal_request_id());
-  }
-  if (from._internal_success() != 0) {
-    _this->_internal_set_success(from._internal_success());
-  }
-  switch (from.response_case()) {
-    case kCompletionItems: {
-      _this->_internal_mutable_completion_items()->::io::deephaven::proto::backplane::script::grpc::GetCompletionItemsResponse::MergeFrom(
-          from._internal_completion_items());
-      break;
-    }
-    case kSignatures: {
-      _this->_internal_mutable_signatures()->::io::deephaven::proto::backplane::script::grpc::GetSignatureHelpResponse::MergeFrom(
-          from._internal_signatures());
-      break;
-    }
-    case kHover: {
-      _this->_internal_mutable_hover()->::io::deephaven::proto::backplane::script::grpc::GetHoverResponse::MergeFrom(
-          from._internal_hover());
-      break;
-    }
-    case kDiagnostic: {
-      _this->_internal_mutable_diagnostic()->::io::deephaven::proto::backplane::script::grpc::GetPullDiagnosticResponse::MergeFrom(
-          from._internal_diagnostic());
-      break;
-    }
-    case kDiagnosticPublish: {
-      _this->_internal_mutable_diagnostic_publish()->::io::deephaven::proto::backplane::script::grpc::GetPublishDiagnosticResponse::MergeFrom(
-          from._internal_diagnostic_publish());
-      break;
-    }
-    case RESPONSE_NOT_SET: {
-      break;
-    }
-  }
-  _this->_internal_metadata_.MergeFrom<::google::protobuf::UnknownFieldSet>(from._internal_metadata_);
-}
-
-void AutoCompleteResponse::CopyFrom(const AutoCompleteResponse& from) {
-// @@protoc_insertion_point(class_specific_copy_from_start:io.deephaven.proto.backplane.script.grpc.AutoCompleteResponse)
-  if (&from == this) return;
-  Clear();
-  MergeFrom(from);
-}
-
-PROTOBUF_NOINLINE bool AutoCompleteResponse::IsInitialized() const {
-  return true;
-}
-
-::_pbi::CachedSize* AutoCompleteResponse::AccessCachedSize() const {
-  return &_impl_._cached_size_;
-}
-void AutoCompleteResponse::InternalSwap(AutoCompleteResponse* PROTOBUF_RESTRICT other) {
-  using std::swap;
-  _internal_metadata_.InternalSwap(&other->_internal_metadata_);
-  ::google::protobuf::internal::memswap<
-      PROTOBUF_FIELD_OFFSET(AutoCompleteResponse, _impl_.success_)
-      + sizeof(AutoCompleteResponse::_impl_.success_)
-      - PROTOBUF_FIELD_OFFSET(AutoCompleteResponse, _impl_.request_id_)>(
-          reinterpret_cast<char*>(&_impl_.request_id_),
-          reinterpret_cast<char*>(&other->_impl_.request_id_));
-  swap(_impl_.response_, other->_impl_.response_);
-  swap(_impl_._oneof_case_[0], other->_impl_._oneof_case_[0]);
-}
-
-::google::protobuf::Metadata AutoCompleteResponse::GetMetadata() const {
-  return ::_pbi::AssignDescriptors(
-      &descriptor_table_deephaven_2fproto_2fconsole_2eproto_getter, &descriptor_table_deephaven_2fproto_2fconsole_2eproto_once,
-      file_level_metadata_deephaven_2fproto_2fconsole_2eproto[17]);
-}
-// ===================================================================
-
-class BrowserNextResponse::_Internal {
- public:
-};
-
-BrowserNextResponse::BrowserNextResponse(::google::protobuf::Arena* arena)
-    : ::google::protobuf::internal::ZeroFieldsBase(arena) {
-  // @@protoc_insertion_point(arena_constructor:io.deephaven.proto.backplane.script.grpc.BrowserNextResponse)
-}
-BrowserNextResponse::BrowserNextResponse(
-    ::google::protobuf::Arena* arena,
-    const BrowserNextResponse& from)
-    : ::google::protobuf::internal::ZeroFieldsBase(arena) {
-  BrowserNextResponse* const _this = this;
-  (void)_this;
-  _internal_metadata_.MergeFrom<::google::protobuf::UnknownFieldSet>(
-      from._internal_metadata_);
-
-  // @@protoc_insertion_point(copy_constructor:io.deephaven.proto.backplane.script.grpc.BrowserNextResponse)
-}
-
-
-
-
-
-
-
-
-
-::google::protobuf::Metadata BrowserNextResponse::GetMetadata() const {
-  return ::_pbi::AssignDescriptors(
-      &descriptor_table_deephaven_2fproto_2fconsole_2eproto_getter, &descriptor_table_deephaven_2fproto_2fconsole_2eproto_once,
-      file_level_metadata_deephaven_2fproto_2fconsole_2eproto[18]);
-}
-// ===================================================================
-
-class OpenDocumentRequest::_Internal {
- public:
-  using HasBits = decltype(std::declval<OpenDocumentRequest>()._impl_._has_bits_);
-  static constexpr ::int32_t kHasBitsOffset =
-    8 * PROTOBUF_FIELD_OFFSET(OpenDocumentRequest, _impl_._has_bits_);
-  static const ::io::deephaven::proto::backplane::grpc::Ticket& console_id(const OpenDocumentRequest* msg);
-  static void set_has_console_id(HasBits* has_bits) {
-    (*has_bits)[0] |= 1u;
-  }
-  static const ::io::deephaven::proto::backplane::script::grpc::TextDocumentItem& text_document(const OpenDocumentRequest* msg);
-  static void set_has_text_document(HasBits* has_bits) {
-    (*has_bits)[0] |= 2u;
-  }
-};
-
-const ::io::deephaven::proto::backplane::grpc::Ticket& OpenDocumentRequest::_Internal::console_id(const OpenDocumentRequest* msg) {
-  return *msg->_impl_.console_id_;
-}
-const ::io::deephaven::proto::backplane::script::grpc::TextDocumentItem& OpenDocumentRequest::_Internal::text_document(const OpenDocumentRequest* msg) {
-  return *msg->_impl_.text_document_;
-}
-void OpenDocumentRequest::clear_console_id() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  if (_impl_.console_id_ != nullptr) _impl_.console_id_->Clear();
-  _impl_._has_bits_[0] &= ~0x00000001u;
-}
-OpenDocumentRequest::OpenDocumentRequest(::google::protobuf::Arena* arena)
-    : ::google::protobuf::Message(arena) {
-  SharedCtor(arena);
-  // @@protoc_insertion_point(arena_constructor:io.deephaven.proto.backplane.script.grpc.OpenDocumentRequest)
-}
-inline PROTOBUF_NDEBUG_INLINE OpenDocumentRequest::Impl_::Impl_(
-    ::google::protobuf::internal::InternalVisibility visibility, ::google::protobuf::Arena* arena,
-    const Impl_& from)
-      : _has_bits_{from._has_bits_},
-        _cached_size_{0} {}
-
-OpenDocumentRequest::OpenDocumentRequest(
-    ::google::protobuf::Arena* arena,
-    const OpenDocumentRequest& from)
-    : ::google::protobuf::Message(arena) {
-  OpenDocumentRequest* const _this = this;
-  (void)_this;
-  _internal_metadata_.MergeFrom<::google::protobuf::UnknownFieldSet>(
-      from._internal_metadata_);
-  new (&_impl_) Impl_(internal_visibility(), arena, from._impl_);
-  ::uint32_t cached_has_bits = _impl_._has_bits_[0];
-  _impl_.console_id_ = (cached_has_bits & 0x00000001u)
-                ? CreateMaybeMessage<::io::deephaven::proto::backplane::grpc::Ticket>(arena, *from._impl_.console_id_)
-                : nullptr;
-  _impl_.text_document_ = (cached_has_bits & 0x00000002u)
-                ? CreateMaybeMessage<::io::deephaven::proto::backplane::script::grpc::TextDocumentItem>(arena, *from._impl_.text_document_)
-                : nullptr;
-
-  // @@protoc_insertion_point(copy_constructor:io.deephaven.proto.backplane.script.grpc.OpenDocumentRequest)
-}
-inline PROTOBUF_NDEBUG_INLINE OpenDocumentRequest::Impl_::Impl_(
-    ::google::protobuf::internal::InternalVisibility visibility,
-    ::google::protobuf::Arena* arena)
-      : _cached_size_{0} {}
-
-inline void OpenDocumentRequest::SharedCtor(::_pb::Arena* arena) {
-  new (&_impl_) Impl_(internal_visibility(), arena);
-  ::memset(reinterpret_cast<char *>(&_impl_) +
-               offsetof(Impl_, console_id_),
-           0,
-           offsetof(Impl_, text_document_) -
-               offsetof(Impl_, console_id_) +
-               sizeof(Impl_::text_document_));
-}
-OpenDocumentRequest::~OpenDocumentRequest() {
-  // @@protoc_insertion_point(destructor:io.deephaven.proto.backplane.script.grpc.OpenDocumentRequest)
-  _internal_metadata_.Delete<::google::protobuf::UnknownFieldSet>();
-  SharedDtor();
-}
-inline void OpenDocumentRequest::SharedDtor() {
-  ABSL_DCHECK(GetArena() == nullptr);
-  delete _impl_.console_id_;
-  delete _impl_.text_document_;
-  _impl_.~Impl_();
-}
-
-PROTOBUF_NOINLINE void OpenDocumentRequest::Clear() {
-// @@protoc_insertion_point(message_clear_start:io.deephaven.proto.backplane.script.grpc.OpenDocumentRequest)
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  ::uint32_t cached_has_bits = 0;
-  // Prevent compiler warnings about cached_has_bits being unused
-  (void) cached_has_bits;
-
-  cached_has_bits = _impl_._has_bits_[0];
-  if (cached_has_bits & 0x00000003u) {
-    if (cached_has_bits & 0x00000001u) {
-      ABSL_DCHECK(_impl_.console_id_ != nullptr);
-      _impl_.console_id_->Clear();
-    }
-    if (cached_has_bits & 0x00000002u) {
-      ABSL_DCHECK(_impl_.text_document_ != nullptr);
-      _impl_.text_document_->Clear();
-    }
-  }
-  _impl_._has_bits_.Clear();
-  _internal_metadata_.Clear<::google::protobuf::UnknownFieldSet>();
-}
-
-const char* OpenDocumentRequest::_InternalParse(
-    const char* ptr, ::_pbi::ParseContext* ctx) {
-  ptr = ::_pbi::TcParser::ParseLoop(this, ptr, ctx, &_table_.header);
-  return ptr;
-}
-
-
-PROTOBUF_CONSTINIT PROTOBUF_ATTRIBUTE_INIT_PRIORITY1
-const ::_pbi::TcParseTable<1, 2, 2, 0, 2> OpenDocumentRequest::_table_ = {
-  {
-    PROTOBUF_FIELD_OFFSET(OpenDocumentRequest, _impl_._has_bits_),
-    0, // no _extensions_
-    2, 8,  // max_field_number, fast_idx_mask
-    offsetof(decltype(_table_), field_lookup_table),
-    4294967292,  // skipmap
-    offsetof(decltype(_table_), field_entries),
-    2,  // num_field_entries
-    2,  // num_aux_entries
-    offsetof(decltype(_table_), aux_entries),
-    &_OpenDocumentRequest_default_instance_._instance,
-    ::_pbi::TcParser::GenericFallback,  // fallback
-  }, {{
-    // .io.deephaven.proto.backplane.script.grpc.TextDocumentItem text_document = 2;
-    {::_pbi::TcParser::FastMtS1,
-     {18, 1, 1, PROTOBUF_FIELD_OFFSET(OpenDocumentRequest, _impl_.text_document_)}},
-    // .io.deephaven.proto.backplane.grpc.Ticket console_id = 1 [deprecated = true];
-    {::_pbi::TcParser::FastMtS1,
-     {10, 0, 0, PROTOBUF_FIELD_OFFSET(OpenDocumentRequest, _impl_.console_id_)}},
-  }}, {{
-    65535, 65535
-  }}, {{
-    // .io.deephaven.proto.backplane.grpc.Ticket console_id = 1 [deprecated = true];
-    {PROTOBUF_FIELD_OFFSET(OpenDocumentRequest, _impl_.console_id_), _Internal::kHasBitsOffset + 0, 0,
-    (0 | ::_fl::kFcOptional | ::_fl::kMessage | ::_fl::kTvTable)},
-    // .io.deephaven.proto.backplane.script.grpc.TextDocumentItem text_document = 2;
-    {PROTOBUF_FIELD_OFFSET(OpenDocumentRequest, _impl_.text_document_), _Internal::kHasBitsOffset + 1, 1,
-    (0 | ::_fl::kFcOptional | ::_fl::kMessage | ::_fl::kTvTable)},
-  }}, {{
-    {::_pbi::TcParser::GetTable<::io::deephaven::proto::backplane::grpc::Ticket>()},
-    {::_pbi::TcParser::GetTable<::io::deephaven::proto::backplane::script::grpc::TextDocumentItem>()},
-  }}, {{
-  }},
-};
-
-::uint8_t* OpenDocumentRequest::_InternalSerialize(
-    ::uint8_t* target,
-    ::google::protobuf::io::EpsCopyOutputStream* stream) const {
-  // @@protoc_insertion_point(serialize_to_array_start:io.deephaven.proto.backplane.script.grpc.OpenDocumentRequest)
-  ::uint32_t cached_has_bits = 0;
-  (void)cached_has_bits;
-
-  cached_has_bits = _impl_._has_bits_[0];
-  // .io.deephaven.proto.backplane.grpc.Ticket console_id = 1 [deprecated = true];
-  if (cached_has_bits & 0x00000001u) {
-    target = ::google::protobuf::internal::WireFormatLite::InternalWriteMessage(
-        1, _Internal::console_id(this),
-        _Internal::console_id(this).GetCachedSize(), target, stream);
-  }
-
-  // .io.deephaven.proto.backplane.script.grpc.TextDocumentItem text_document = 2;
-  if (cached_has_bits & 0x00000002u) {
-    target = ::google::protobuf::internal::WireFormatLite::InternalWriteMessage(
-        2, _Internal::text_document(this),
-        _Internal::text_document(this).GetCachedSize(), target, stream);
-  }
-
-  if (PROTOBUF_PREDICT_FALSE(_internal_metadata_.have_unknown_fields())) {
-    target =
-        ::_pbi::WireFormat::InternalSerializeUnknownFieldsToArray(
-            _internal_metadata_.unknown_fields<::google::protobuf::UnknownFieldSet>(::google::protobuf::UnknownFieldSet::default_instance), target, stream);
-  }
-  // @@protoc_insertion_point(serialize_to_array_end:io.deephaven.proto.backplane.script.grpc.OpenDocumentRequest)
-  return target;
-}
-
-::size_t OpenDocumentRequest::ByteSizeLong() const {
-// @@protoc_insertion_point(message_byte_size_start:io.deephaven.proto.backplane.script.grpc.OpenDocumentRequest)
-  ::size_t total_size = 0;
-
-  ::uint32_t cached_has_bits = 0;
-  // Prevent compiler warnings about cached_has_bits being unused
-  (void) cached_has_bits;
-
-  cached_has_bits = _impl_._has_bits_[0];
-  if (cached_has_bits & 0x00000003u) {
-    // .io.deephaven.proto.backplane.grpc.Ticket console_id = 1 [deprecated = true];
-    if (cached_has_bits & 0x00000001u) {
-      total_size +=
-          1 + ::google::protobuf::internal::WireFormatLite::MessageSize(*_impl_.console_id_);
-    }
-
-    // .io.deephaven.proto.backplane.script.grpc.TextDocumentItem text_document = 2;
-    if (cached_has_bits & 0x00000002u) {
-      total_size +=
-          1 + ::google::protobuf::internal::WireFormatLite::MessageSize(*_impl_.text_document_);
-    }
-
-  }
-  return MaybeComputeUnknownFieldsSize(total_size, &_impl_._cached_size_);
-}
-
-const ::google::protobuf::Message::ClassData OpenDocumentRequest::_class_data_ = {
-    OpenDocumentRequest::MergeImpl,
-    nullptr,  // OnDemandRegisterArenaDtor
-};
-const ::google::protobuf::Message::ClassData* OpenDocumentRequest::GetClassData() const {
-  return &_class_data_;
-}
-
-void OpenDocumentRequest::MergeImpl(::google::protobuf::Message& to_msg, const ::google::protobuf::Message& from_msg) {
-  auto* const _this = static_cast<OpenDocumentRequest*>(&to_msg);
-  auto& from = static_cast<const OpenDocumentRequest&>(from_msg);
-  // @@protoc_insertion_point(class_specific_merge_from_start:io.deephaven.proto.backplane.script.grpc.OpenDocumentRequest)
-  ABSL_DCHECK_NE(&from, _this);
-  ::uint32_t cached_has_bits = 0;
-  (void) cached_has_bits;
-
-  cached_has_bits = from._impl_._has_bits_[0];
-  if (cached_has_bits & 0x00000003u) {
-    if (cached_has_bits & 0x00000001u) {
-      _this->_internal_mutable_console_id()->::io::deephaven::proto::backplane::grpc::Ticket::MergeFrom(
-          from._internal_console_id());
-    }
-    if (cached_has_bits & 0x00000002u) {
-      _this->_internal_mutable_text_document()->::io::deephaven::proto::backplane::script::grpc::TextDocumentItem::MergeFrom(
-          from._internal_text_document());
-    }
-  }
-  _this->_internal_metadata_.MergeFrom<::google::protobuf::UnknownFieldSet>(from._internal_metadata_);
-}
-
-void OpenDocumentRequest::CopyFrom(const OpenDocumentRequest& from) {
-// @@protoc_insertion_point(class_specific_copy_from_start:io.deephaven.proto.backplane.script.grpc.OpenDocumentRequest)
-  if (&from == this) return;
-  Clear();
-  MergeFrom(from);
-}
-
-PROTOBUF_NOINLINE bool OpenDocumentRequest::IsInitialized() const {
-  return true;
-}
-
-::_pbi::CachedSize* OpenDocumentRequest::AccessCachedSize() const {
-  return &_impl_._cached_size_;
-}
-void OpenDocumentRequest::InternalSwap(OpenDocumentRequest* PROTOBUF_RESTRICT other) {
-  using std::swap;
-  _internal_metadata_.InternalSwap(&other->_internal_metadata_);
-  swap(_impl_._has_bits_[0], other->_impl_._has_bits_[0]);
-  ::google::protobuf::internal::memswap<
-      PROTOBUF_FIELD_OFFSET(OpenDocumentRequest, _impl_.text_document_)
-      + sizeof(OpenDocumentRequest::_impl_.text_document_)
-      - PROTOBUF_FIELD_OFFSET(OpenDocumentRequest, _impl_.console_id_)>(
-          reinterpret_cast<char*>(&_impl_.console_id_),
-          reinterpret_cast<char*>(&other->_impl_.console_id_));
-}
-
-::google::protobuf::Metadata OpenDocumentRequest::GetMetadata() const {
-  return ::_pbi::AssignDescriptors(
-      &descriptor_table_deephaven_2fproto_2fconsole_2eproto_getter, &descriptor_table_deephaven_2fproto_2fconsole_2eproto_once,
-      file_level_metadata_deephaven_2fproto_2fconsole_2eproto[19]);
-}
-// ===================================================================
-
-class TextDocumentItem::_Internal {
- public:
-};
-
-TextDocumentItem::TextDocumentItem(::google::protobuf::Arena* arena)
-    : ::google::protobuf::Message(arena) {
-  SharedCtor(arena);
-  // @@protoc_insertion_point(arena_constructor:io.deephaven.proto.backplane.script.grpc.TextDocumentItem)
-}
-inline PROTOBUF_NDEBUG_INLINE TextDocumentItem::Impl_::Impl_(
-    ::google::protobuf::internal::InternalVisibility visibility, ::google::protobuf::Arena* arena,
-    const Impl_& from)
-      : uri_(arena, from.uri_),
-        language_id_(arena, from.language_id_),
-        text_(arena, from.text_),
-        _cached_size_{0} {}
-
-TextDocumentItem::TextDocumentItem(
-    ::google::protobuf::Arena* arena,
-    const TextDocumentItem& from)
-    : ::google::protobuf::Message(arena) {
-  TextDocumentItem* const _this = this;
-  (void)_this;
-  _internal_metadata_.MergeFrom<::google::protobuf::UnknownFieldSet>(
-      from._internal_metadata_);
-  new (&_impl_) Impl_(internal_visibility(), arena, from._impl_);
-  _impl_.version_ = from._impl_.version_;
-
-  // @@protoc_insertion_point(copy_constructor:io.deephaven.proto.backplane.script.grpc.TextDocumentItem)
-}
-inline PROTOBUF_NDEBUG_INLINE TextDocumentItem::Impl_::Impl_(
-    ::google::protobuf::internal::InternalVisibility visibility,
-    ::google::protobuf::Arena* arena)
-      : uri_(arena),
-        language_id_(arena),
-        text_(arena),
-        _cached_size_{0} {}
-
-inline void TextDocumentItem::SharedCtor(::_pb::Arena* arena) {
-  new (&_impl_) Impl_(internal_visibility(), arena);
-  _impl_.version_ = {};
-}
-TextDocumentItem::~TextDocumentItem() {
-  // @@protoc_insertion_point(destructor:io.deephaven.proto.backplane.script.grpc.TextDocumentItem)
-  _internal_metadata_.Delete<::google::protobuf::UnknownFieldSet>();
-  SharedDtor();
-}
-inline void TextDocumentItem::SharedDtor() {
-  ABSL_DCHECK(GetArena() == nullptr);
-  _impl_.uri_.Destroy();
-  _impl_.language_id_.Destroy();
-  _impl_.text_.Destroy();
-  _impl_.~Impl_();
-}
-
-PROTOBUF_NOINLINE void TextDocumentItem::Clear() {
-// @@protoc_insertion_point(message_clear_start:io.deephaven.proto.backplane.script.grpc.TextDocumentItem)
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  ::uint32_t cached_has_bits = 0;
-  // Prevent compiler warnings about cached_has_bits being unused
-  (void) cached_has_bits;
-
-  _impl_.uri_.ClearToEmpty();
-  _impl_.language_id_.ClearToEmpty();
-  _impl_.text_.ClearToEmpty();
-  _impl_.version_ = 0;
-  _internal_metadata_.Clear<::google::protobuf::UnknownFieldSet>();
-}
-
-const char* TextDocumentItem::_InternalParse(
-    const char* ptr, ::_pbi::ParseContext* ctx) {
-  ptr = ::_pbi::TcParser::ParseLoop(this, ptr, ctx, &_table_.header);
-  return ptr;
-}
-
-
-PROTOBUF_CONSTINIT PROTOBUF_ATTRIBUTE_INIT_PRIORITY1
-const ::_pbi::TcParseTable<2, 4, 0, 84, 2> TextDocumentItem::_table_ = {
-  {
-    0,  // no _has_bits_
-    0, // no _extensions_
-    4, 24,  // max_field_number, fast_idx_mask
-    offsetof(decltype(_table_), field_lookup_table),
-    4294967280,  // skipmap
-    offsetof(decltype(_table_), field_entries),
-    4,  // num_field_entries
-    0,  // num_aux_entries
-    offsetof(decltype(_table_), field_names),  // no aux_entries
-    &_TextDocumentItem_default_instance_._instance,
-    ::_pbi::TcParser::GenericFallback,  // fallback
-  }, {{
-    // string text = 4;
-    {::_pbi::TcParser::FastUS1,
-     {34, 63, 0, PROTOBUF_FIELD_OFFSET(TextDocumentItem, _impl_.text_)}},
-    // string uri = 1;
-    {::_pbi::TcParser::FastUS1,
-     {10, 63, 0, PROTOBUF_FIELD_OFFSET(TextDocumentItem, _impl_.uri_)}},
-    // string language_id = 2;
-    {::_pbi::TcParser::FastUS1,
-     {18, 63, 0, PROTOBUF_FIELD_OFFSET(TextDocumentItem, _impl_.language_id_)}},
-    // int32 version = 3;
-    {::_pbi::TcParser::SingularVarintNoZag1<::uint32_t, offsetof(TextDocumentItem, _impl_.version_), 63>(),
-     {24, 63, 0, PROTOBUF_FIELD_OFFSET(TextDocumentItem, _impl_.version_)}},
-  }}, {{
-    65535, 65535
-  }}, {{
-    // string uri = 1;
-    {PROTOBUF_FIELD_OFFSET(TextDocumentItem, _impl_.uri_), 0, 0,
-    (0 | ::_fl::kFcSingular | ::_fl::kUtf8String | ::_fl::kRepAString)},
-    // string language_id = 2;
-    {PROTOBUF_FIELD_OFFSET(TextDocumentItem, _impl_.language_id_), 0, 0,
-    (0 | ::_fl::kFcSingular | ::_fl::kUtf8String | ::_fl::kRepAString)},
-    // int32 version = 3;
-    {PROTOBUF_FIELD_OFFSET(TextDocumentItem, _impl_.version_), 0, 0,
-    (0 | ::_fl::kFcSingular | ::_fl::kInt32)},
-    // string text = 4;
-    {PROTOBUF_FIELD_OFFSET(TextDocumentItem, _impl_.text_), 0, 0,
-    (0 | ::_fl::kFcSingular | ::_fl::kUtf8String | ::_fl::kRepAString)},
-  }},
-  // no aux_entries
-  {{
-    "\71\3\13\0\4\0\0\0"
-    "io.deephaven.proto.backplane.script.grpc.TextDocumentItem"
-    "uri"
-    "language_id"
-    "text"
-  }},
-};
-
-::uint8_t* TextDocumentItem::_InternalSerialize(
-    ::uint8_t* target,
-    ::google::protobuf::io::EpsCopyOutputStream* stream) const {
-  // @@protoc_insertion_point(serialize_to_array_start:io.deephaven.proto.backplane.script.grpc.TextDocumentItem)
-  ::uint32_t cached_has_bits = 0;
-  (void)cached_has_bits;
-
-  // string uri = 1;
-  if (!this->_internal_uri().empty()) {
-    const std::string& _s = this->_internal_uri();
-    ::google::protobuf::internal::WireFormatLite::VerifyUtf8String(
-        _s.data(), static_cast<int>(_s.length()), ::google::protobuf::internal::WireFormatLite::SERIALIZE, "io.deephaven.proto.backplane.script.grpc.TextDocumentItem.uri");
-    target = stream->WriteStringMaybeAliased(1, _s, target);
-  }
-
-  // string language_id = 2;
-  if (!this->_internal_language_id().empty()) {
-    const std::string& _s = this->_internal_language_id();
-    ::google::protobuf::internal::WireFormatLite::VerifyUtf8String(
-        _s.data(), static_cast<int>(_s.length()), ::google::protobuf::internal::WireFormatLite::SERIALIZE, "io.deephaven.proto.backplane.script.grpc.TextDocumentItem.language_id");
-    target = stream->WriteStringMaybeAliased(2, _s, target);
-  }
-
-  // int32 version = 3;
-  if (this->_internal_version() != 0) {
-    target = ::google::protobuf::internal::WireFormatLite::
-        WriteInt32ToArrayWithField<3>(
-            stream, this->_internal_version(), target);
-  }
-
-  // string text = 4;
-  if (!this->_internal_text().empty()) {
-    const std::string& _s = this->_internal_text();
-    ::google::protobuf::internal::WireFormatLite::VerifyUtf8String(
-        _s.data(), static_cast<int>(_s.length()), ::google::protobuf::internal::WireFormatLite::SERIALIZE, "io.deephaven.proto.backplane.script.grpc.TextDocumentItem.text");
-    target = stream->WriteStringMaybeAliased(4, _s, target);
-  }
-
-  if (PROTOBUF_PREDICT_FALSE(_internal_metadata_.have_unknown_fields())) {
-    target =
-        ::_pbi::WireFormat::InternalSerializeUnknownFieldsToArray(
-            _internal_metadata_.unknown_fields<::google::protobuf::UnknownFieldSet>(::google::protobuf::UnknownFieldSet::default_instance), target, stream);
-  }
-  // @@protoc_insertion_point(serialize_to_array_end:io.deephaven.proto.backplane.script.grpc.TextDocumentItem)
-  return target;
-}
-
-::size_t TextDocumentItem::ByteSizeLong() const {
-// @@protoc_insertion_point(message_byte_size_start:io.deephaven.proto.backplane.script.grpc.TextDocumentItem)
-  ::size_t total_size = 0;
-
-  ::uint32_t cached_has_bits = 0;
-  // Prevent compiler warnings about cached_has_bits being unused
-  (void) cached_has_bits;
-
-  // string uri = 1;
-  if (!this->_internal_uri().empty()) {
-    total_size += 1 + ::google::protobuf::internal::WireFormatLite::StringSize(
-                                    this->_internal_uri());
-  }
-
-  // string language_id = 2;
-  if (!this->_internal_language_id().empty()) {
-    total_size += 1 + ::google::protobuf::internal::WireFormatLite::StringSize(
-                                    this->_internal_language_id());
-  }
-
-  // string text = 4;
-  if (!this->_internal_text().empty()) {
-    total_size += 1 + ::google::protobuf::internal::WireFormatLite::StringSize(
-                                    this->_internal_text());
-  }
-
-  // int32 version = 3;
-  if (this->_internal_version() != 0) {
-    total_size += ::_pbi::WireFormatLite::Int32SizePlusOne(
-        this->_internal_version());
-  }
-
-  return MaybeComputeUnknownFieldsSize(total_size, &_impl_._cached_size_);
-}
-
-const ::google::protobuf::Message::ClassData TextDocumentItem::_class_data_ = {
-    TextDocumentItem::MergeImpl,
-    nullptr,  // OnDemandRegisterArenaDtor
-};
-const ::google::protobuf::Message::ClassData* TextDocumentItem::GetClassData() const {
-  return &_class_data_;
-}
-
-void TextDocumentItem::MergeImpl(::google::protobuf::Message& to_msg, const ::google::protobuf::Message& from_msg) {
-  auto* const _this = static_cast<TextDocumentItem*>(&to_msg);
-  auto& from = static_cast<const TextDocumentItem&>(from_msg);
-  // @@protoc_insertion_point(class_specific_merge_from_start:io.deephaven.proto.backplane.script.grpc.TextDocumentItem)
-  ABSL_DCHECK_NE(&from, _this);
-  ::uint32_t cached_has_bits = 0;
-  (void) cached_has_bits;
-
-  if (!from._internal_uri().empty()) {
-    _this->_internal_set_uri(from._internal_uri());
-  }
-  if (!from._internal_language_id().empty()) {
-    _this->_internal_set_language_id(from._internal_language_id());
-  }
-  if (!from._internal_text().empty()) {
-    _this->_internal_set_text(from._internal_text());
-  }
-  if (from._internal_version() != 0) {
-    _this->_internal_set_version(from._internal_version());
-  }
-  _this->_internal_metadata_.MergeFrom<::google::protobuf::UnknownFieldSet>(from._internal_metadata_);
-}
-
-void TextDocumentItem::CopyFrom(const TextDocumentItem& from) {
-// @@protoc_insertion_point(class_specific_copy_from_start:io.deephaven.proto.backplane.script.grpc.TextDocumentItem)
-  if (&from == this) return;
-  Clear();
-  MergeFrom(from);
-}
-
-PROTOBUF_NOINLINE bool TextDocumentItem::IsInitialized() const {
-  return true;
-}
-
-::_pbi::CachedSize* TextDocumentItem::AccessCachedSize() const {
-  return &_impl_._cached_size_;
-}
-void TextDocumentItem::InternalSwap(TextDocumentItem* PROTOBUF_RESTRICT other) {
-  using std::swap;
-  auto* arena = GetArena();
-  ABSL_DCHECK_EQ(arena, other->GetArena());
-  _internal_metadata_.InternalSwap(&other->_internal_metadata_);
-  ::_pbi::ArenaStringPtr::InternalSwap(&_impl_.uri_, &other->_impl_.uri_, arena);
-  ::_pbi::ArenaStringPtr::InternalSwap(&_impl_.language_id_, &other->_impl_.language_id_, arena);
-  ::_pbi::ArenaStringPtr::InternalSwap(&_impl_.text_, &other->_impl_.text_, arena);
-        swap(_impl_.version_, other->_impl_.version_);
-}
-
-::google::protobuf::Metadata TextDocumentItem::GetMetadata() const {
-  return ::_pbi::AssignDescriptors(
-      &descriptor_table_deephaven_2fproto_2fconsole_2eproto_getter, &descriptor_table_deephaven_2fproto_2fconsole_2eproto_once,
-      file_level_metadata_deephaven_2fproto_2fconsole_2eproto[20]);
-}
-// ===================================================================
-
-class CloseDocumentRequest::_Internal {
- public:
-  using HasBits = decltype(std::declval<CloseDocumentRequest>()._impl_._has_bits_);
-  static constexpr ::int32_t kHasBitsOffset =
-    8 * PROTOBUF_FIELD_OFFSET(CloseDocumentRequest, _impl_._has_bits_);
-  static const ::io::deephaven::proto::backplane::grpc::Ticket& console_id(const CloseDocumentRequest* msg);
-  static void set_has_console_id(HasBits* has_bits) {
-    (*has_bits)[0] |= 1u;
-  }
-  static const ::io::deephaven::proto::backplane::script::grpc::VersionedTextDocumentIdentifier& text_document(const CloseDocumentRequest* msg);
-  static void set_has_text_document(HasBits* has_bits) {
-    (*has_bits)[0] |= 2u;
-  }
-};
-
-const ::io::deephaven::proto::backplane::grpc::Ticket& CloseDocumentRequest::_Internal::console_id(const CloseDocumentRequest* msg) {
-  return *msg->_impl_.console_id_;
-}
-const ::io::deephaven::proto::backplane::script::grpc::VersionedTextDocumentIdentifier& CloseDocumentRequest::_Internal::text_document(const CloseDocumentRequest* msg) {
-  return *msg->_impl_.text_document_;
-}
-void CloseDocumentRequest::clear_console_id() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  if (_impl_.console_id_ != nullptr) _impl_.console_id_->Clear();
-  _impl_._has_bits_[0] &= ~0x00000001u;
-}
-CloseDocumentRequest::CloseDocumentRequest(::google::protobuf::Arena* arena)
-    : ::google::protobuf::Message(arena) {
-  SharedCtor(arena);
-  // @@protoc_insertion_point(arena_constructor:io.deephaven.proto.backplane.script.grpc.CloseDocumentRequest)
-}
-inline PROTOBUF_NDEBUG_INLINE CloseDocumentRequest::Impl_::Impl_(
-    ::google::protobuf::internal::InternalVisibility visibility, ::google::protobuf::Arena* arena,
-    const Impl_& from)
-      : _has_bits_{from._has_bits_},
-        _cached_size_{0} {}
-
-CloseDocumentRequest::CloseDocumentRequest(
-    ::google::protobuf::Arena* arena,
-    const CloseDocumentRequest& from)
-    : ::google::protobuf::Message(arena) {
-  CloseDocumentRequest* const _this = this;
-  (void)_this;
-  _internal_metadata_.MergeFrom<::google::protobuf::UnknownFieldSet>(
-      from._internal_metadata_);
-  new (&_impl_) Impl_(internal_visibility(), arena, from._impl_);
-  ::uint32_t cached_has_bits = _impl_._has_bits_[0];
-  _impl_.console_id_ = (cached_has_bits & 0x00000001u)
-                ? CreateMaybeMessage<::io::deephaven::proto::backplane::grpc::Ticket>(arena, *from._impl_.console_id_)
-                : nullptr;
-  _impl_.text_document_ = (cached_has_bits & 0x00000002u)
-                ? CreateMaybeMessage<::io::deephaven::proto::backplane::script::grpc::VersionedTextDocumentIdentifier>(arena, *from._impl_.text_document_)
-                : nullptr;
-
-  // @@protoc_insertion_point(copy_constructor:io.deephaven.proto.backplane.script.grpc.CloseDocumentRequest)
-}
-inline PROTOBUF_NDEBUG_INLINE CloseDocumentRequest::Impl_::Impl_(
-    ::google::protobuf::internal::InternalVisibility visibility,
-    ::google::protobuf::Arena* arena)
-      : _cached_size_{0} {}
-
-inline void CloseDocumentRequest::SharedCtor(::_pb::Arena* arena) {
-  new (&_impl_) Impl_(internal_visibility(), arena);
-  ::memset(reinterpret_cast<char *>(&_impl_) +
-               offsetof(Impl_, console_id_),
-           0,
-           offsetof(Impl_, text_document_) -
-               offsetof(Impl_, console_id_) +
-               sizeof(Impl_::text_document_));
-}
-CloseDocumentRequest::~CloseDocumentRequest() {
-  // @@protoc_insertion_point(destructor:io.deephaven.proto.backplane.script.grpc.CloseDocumentRequest)
-  _internal_metadata_.Delete<::google::protobuf::UnknownFieldSet>();
-  SharedDtor();
-}
-inline void CloseDocumentRequest::SharedDtor() {
-  ABSL_DCHECK(GetArena() == nullptr);
-  delete _impl_.console_id_;
-  delete _impl_.text_document_;
-  _impl_.~Impl_();
-}
-
-PROTOBUF_NOINLINE void CloseDocumentRequest::Clear() {
-// @@protoc_insertion_point(message_clear_start:io.deephaven.proto.backplane.script.grpc.CloseDocumentRequest)
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  ::uint32_t cached_has_bits = 0;
-  // Prevent compiler warnings about cached_has_bits being unused
-  (void) cached_has_bits;
-
-  cached_has_bits = _impl_._has_bits_[0];
-  if (cached_has_bits & 0x00000003u) {
-    if (cached_has_bits & 0x00000001u) {
-      ABSL_DCHECK(_impl_.console_id_ != nullptr);
-      _impl_.console_id_->Clear();
-    }
-    if (cached_has_bits & 0x00000002u) {
-      ABSL_DCHECK(_impl_.text_document_ != nullptr);
-      _impl_.text_document_->Clear();
-    }
-  }
-  _impl_._has_bits_.Clear();
-  _internal_metadata_.Clear<::google::protobuf::UnknownFieldSet>();
-}
-
-const char* CloseDocumentRequest::_InternalParse(
-    const char* ptr, ::_pbi::ParseContext* ctx) {
-  ptr = ::_pbi::TcParser::ParseLoop(this, ptr, ctx, &_table_.header);
-  return ptr;
-}
-
-
-PROTOBUF_CONSTINIT PROTOBUF_ATTRIBUTE_INIT_PRIORITY1
-const ::_pbi::TcParseTable<1, 2, 2, 0, 2> CloseDocumentRequest::_table_ = {
-  {
-    PROTOBUF_FIELD_OFFSET(CloseDocumentRequest, _impl_._has_bits_),
-    0, // no _extensions_
-    2, 8,  // max_field_number, fast_idx_mask
-    offsetof(decltype(_table_), field_lookup_table),
-    4294967292,  // skipmap
-    offsetof(decltype(_table_), field_entries),
-    2,  // num_field_entries
-    2,  // num_aux_entries
-    offsetof(decltype(_table_), aux_entries),
-    &_CloseDocumentRequest_default_instance_._instance,
-    ::_pbi::TcParser::GenericFallback,  // fallback
-  }, {{
-    // .io.deephaven.proto.backplane.script.grpc.VersionedTextDocumentIdentifier text_document = 2;
-    {::_pbi::TcParser::FastMtS1,
-     {18, 1, 1, PROTOBUF_FIELD_OFFSET(CloseDocumentRequest, _impl_.text_document_)}},
-    // .io.deephaven.proto.backplane.grpc.Ticket console_id = 1 [deprecated = true];
-    {::_pbi::TcParser::FastMtS1,
-     {10, 0, 0, PROTOBUF_FIELD_OFFSET(CloseDocumentRequest, _impl_.console_id_)}},
-  }}, {{
-    65535, 65535
-  }}, {{
-    // .io.deephaven.proto.backplane.grpc.Ticket console_id = 1 [deprecated = true];
-    {PROTOBUF_FIELD_OFFSET(CloseDocumentRequest, _impl_.console_id_), _Internal::kHasBitsOffset + 0, 0,
-    (0 | ::_fl::kFcOptional | ::_fl::kMessage | ::_fl::kTvTable)},
-    // .io.deephaven.proto.backplane.script.grpc.VersionedTextDocumentIdentifier text_document = 2;
-    {PROTOBUF_FIELD_OFFSET(CloseDocumentRequest, _impl_.text_document_), _Internal::kHasBitsOffset + 1, 1,
-    (0 | ::_fl::kFcOptional | ::_fl::kMessage | ::_fl::kTvTable)},
-  }}, {{
-    {::_pbi::TcParser::GetTable<::io::deephaven::proto::backplane::grpc::Ticket>()},
-    {::_pbi::TcParser::GetTable<::io::deephaven::proto::backplane::script::grpc::VersionedTextDocumentIdentifier>()},
-  }}, {{
-  }},
-};
-
-::uint8_t* CloseDocumentRequest::_InternalSerialize(
-    ::uint8_t* target,
-    ::google::protobuf::io::EpsCopyOutputStream* stream) const {
-  // @@protoc_insertion_point(serialize_to_array_start:io.deephaven.proto.backplane.script.grpc.CloseDocumentRequest)
-  ::uint32_t cached_has_bits = 0;
-  (void)cached_has_bits;
-
-  cached_has_bits = _impl_._has_bits_[0];
-  // .io.deephaven.proto.backplane.grpc.Ticket console_id = 1 [deprecated = true];
-  if (cached_has_bits & 0x00000001u) {
-    target = ::google::protobuf::internal::WireFormatLite::InternalWriteMessage(
-        1, _Internal::console_id(this),
-        _Internal::console_id(this).GetCachedSize(), target, stream);
-  }
-
-  // .io.deephaven.proto.backplane.script.grpc.VersionedTextDocumentIdentifier text_document = 2;
-  if (cached_has_bits & 0x00000002u) {
-    target = ::google::protobuf::internal::WireFormatLite::InternalWriteMessage(
-        2, _Internal::text_document(this),
-        _Internal::text_document(this).GetCachedSize(), target, stream);
-  }
-
-  if (PROTOBUF_PREDICT_FALSE(_internal_metadata_.have_unknown_fields())) {
-    target =
-        ::_pbi::WireFormat::InternalSerializeUnknownFieldsToArray(
-            _internal_metadata_.unknown_fields<::google::protobuf::UnknownFieldSet>(::google::protobuf::UnknownFieldSet::default_instance), target, stream);
-  }
-  // @@protoc_insertion_point(serialize_to_array_end:io.deephaven.proto.backplane.script.grpc.CloseDocumentRequest)
-  return target;
-}
-
-::size_t CloseDocumentRequest::ByteSizeLong() const {
-// @@protoc_insertion_point(message_byte_size_start:io.deephaven.proto.backplane.script.grpc.CloseDocumentRequest)
-  ::size_t total_size = 0;
-
-  ::uint32_t cached_has_bits = 0;
-  // Prevent compiler warnings about cached_has_bits being unused
-  (void) cached_has_bits;
-
-  cached_has_bits = _impl_._has_bits_[0];
-  if (cached_has_bits & 0x00000003u) {
-    // .io.deephaven.proto.backplane.grpc.Ticket console_id = 1 [deprecated = true];
-    if (cached_has_bits & 0x00000001u) {
-      total_size +=
-          1 + ::google::protobuf::internal::WireFormatLite::MessageSize(*_impl_.console_id_);
-    }
-
-    // .io.deephaven.proto.backplane.script.grpc.VersionedTextDocumentIdentifier text_document = 2;
-    if (cached_has_bits & 0x00000002u) {
-      total_size +=
-          1 + ::google::protobuf::internal::WireFormatLite::MessageSize(*_impl_.text_document_);
-    }
-
-  }
-  return MaybeComputeUnknownFieldsSize(total_size, &_impl_._cached_size_);
-}
-
-const ::google::protobuf::Message::ClassData CloseDocumentRequest::_class_data_ = {
-    CloseDocumentRequest::MergeImpl,
-    nullptr,  // OnDemandRegisterArenaDtor
-};
-const ::google::protobuf::Message::ClassData* CloseDocumentRequest::GetClassData() const {
-  return &_class_data_;
-}
-
-void CloseDocumentRequest::MergeImpl(::google::protobuf::Message& to_msg, const ::google::protobuf::Message& from_msg) {
-  auto* const _this = static_cast<CloseDocumentRequest*>(&to_msg);
-  auto& from = static_cast<const CloseDocumentRequest&>(from_msg);
-  // @@protoc_insertion_point(class_specific_merge_from_start:io.deephaven.proto.backplane.script.grpc.CloseDocumentRequest)
-  ABSL_DCHECK_NE(&from, _this);
-  ::uint32_t cached_has_bits = 0;
-  (void) cached_has_bits;
-
-  cached_has_bits = from._impl_._has_bits_[0];
-  if (cached_has_bits & 0x00000003u) {
-    if (cached_has_bits & 0x00000001u) {
-      _this->_internal_mutable_console_id()->::io::deephaven::proto::backplane::grpc::Ticket::MergeFrom(
-          from._internal_console_id());
-    }
-    if (cached_has_bits & 0x00000002u) {
-      _this->_internal_mutable_text_document()->::io::deephaven::proto::backplane::script::grpc::VersionedTextDocumentIdentifier::MergeFrom(
-          from._internal_text_document());
-    }
-  }
-  _this->_internal_metadata_.MergeFrom<::google::protobuf::UnknownFieldSet>(from._internal_metadata_);
-}
-
-void CloseDocumentRequest::CopyFrom(const CloseDocumentRequest& from) {
-// @@protoc_insertion_point(class_specific_copy_from_start:io.deephaven.proto.backplane.script.grpc.CloseDocumentRequest)
-  if (&from == this) return;
-  Clear();
-  MergeFrom(from);
-}
-
-PROTOBUF_NOINLINE bool CloseDocumentRequest::IsInitialized() const {
-  return true;
-}
-
-::_pbi::CachedSize* CloseDocumentRequest::AccessCachedSize() const {
-  return &_impl_._cached_size_;
-}
-void CloseDocumentRequest::InternalSwap(CloseDocumentRequest* PROTOBUF_RESTRICT other) {
-  using std::swap;
-  _internal_metadata_.InternalSwap(&other->_internal_metadata_);
-  swap(_impl_._has_bits_[0], other->_impl_._has_bits_[0]);
-  ::google::protobuf::internal::memswap<
-      PROTOBUF_FIELD_OFFSET(CloseDocumentRequest, _impl_.text_document_)
-      + sizeof(CloseDocumentRequest::_impl_.text_document_)
-      - PROTOBUF_FIELD_OFFSET(CloseDocumentRequest, _impl_.console_id_)>(
-          reinterpret_cast<char*>(&_impl_.console_id_),
-          reinterpret_cast<char*>(&other->_impl_.console_id_));
-}
-
-::google::protobuf::Metadata CloseDocumentRequest::GetMetadata() const {
-  return ::_pbi::AssignDescriptors(
-      &descriptor_table_deephaven_2fproto_2fconsole_2eproto_getter, &descriptor_table_deephaven_2fproto_2fconsole_2eproto_once,
-      file_level_metadata_deephaven_2fproto_2fconsole_2eproto[21]);
-}
-// ===================================================================
-
-class ChangeDocumentRequest_TextDocumentContentChangeEvent::_Internal {
- public:
-  using HasBits = decltype(std::declval<ChangeDocumentRequest_TextDocumentContentChangeEvent>()._impl_._has_bits_);
-  static constexpr ::int32_t kHasBitsOffset =
-    8 * PROTOBUF_FIELD_OFFSET(ChangeDocumentRequest_TextDocumentContentChangeEvent, _impl_._has_bits_);
-  static const ::io::deephaven::proto::backplane::script::grpc::DocumentRange& range(const ChangeDocumentRequest_TextDocumentContentChangeEvent* msg);
-  static void set_has_range(HasBits* has_bits) {
-    (*has_bits)[0] |= 1u;
-  }
-};
-
-const ::io::deephaven::proto::backplane::script::grpc::DocumentRange& ChangeDocumentRequest_TextDocumentContentChangeEvent::_Internal::range(const ChangeDocumentRequest_TextDocumentContentChangeEvent* msg) {
-  return *msg->_impl_.range_;
-}
-ChangeDocumentRequest_TextDocumentContentChangeEvent::ChangeDocumentRequest_TextDocumentContentChangeEvent(::google::protobuf::Arena* arena)
-    : ::google::protobuf::Message(arena) {
-  SharedCtor(arena);
-  // @@protoc_insertion_point(arena_constructor:io.deephaven.proto.backplane.script.grpc.ChangeDocumentRequest.TextDocumentContentChangeEvent)
-}
-inline PROTOBUF_NDEBUG_INLINE ChangeDocumentRequest_TextDocumentContentChangeEvent::Impl_::Impl_(
-    ::google::protobuf::internal::InternalVisibility visibility, ::google::protobuf::Arena* arena,
-    const Impl_& from)
-      : _has_bits_{from._has_bits_},
-        _cached_size_{0},
-        text_(arena, from.text_) {}
-
-ChangeDocumentRequest_TextDocumentContentChangeEvent::ChangeDocumentRequest_TextDocumentContentChangeEvent(
-    ::google::protobuf::Arena* arena,
-    const ChangeDocumentRequest_TextDocumentContentChangeEvent& from)
-    : ::google::protobuf::Message(arena) {
-  ChangeDocumentRequest_TextDocumentContentChangeEvent* const _this = this;
-  (void)_this;
-  _internal_metadata_.MergeFrom<::google::protobuf::UnknownFieldSet>(
-      from._internal_metadata_);
-  new (&_impl_) Impl_(internal_visibility(), arena, from._impl_);
-  ::uint32_t cached_has_bits = _impl_._has_bits_[0];
-  _impl_.range_ = (cached_has_bits & 0x00000001u)
-                ? CreateMaybeMessage<::io::deephaven::proto::backplane::script::grpc::DocumentRange>(arena, *from._impl_.range_)
-                : nullptr;
-  _impl_.range_length_ = from._impl_.range_length_;
-
-  // @@protoc_insertion_point(copy_constructor:io.deephaven.proto.backplane.script.grpc.ChangeDocumentRequest.TextDocumentContentChangeEvent)
-}
-inline PROTOBUF_NDEBUG_INLINE ChangeDocumentRequest_TextDocumentContentChangeEvent::Impl_::Impl_(
-    ::google::protobuf::internal::InternalVisibility visibility,
-    ::google::protobuf::Arena* arena)
-      : _cached_size_{0},
-        text_(arena) {}
-
-inline void ChangeDocumentRequest_TextDocumentContentChangeEvent::SharedCtor(::_pb::Arena* arena) {
-  new (&_impl_) Impl_(internal_visibility(), arena);
-  ::memset(reinterpret_cast<char *>(&_impl_) +
-               offsetof(Impl_, range_),
-           0,
-           offsetof(Impl_, range_length_) -
-               offsetof(Impl_, range_) +
-               sizeof(Impl_::range_length_));
-}
-ChangeDocumentRequest_TextDocumentContentChangeEvent::~ChangeDocumentRequest_TextDocumentContentChangeEvent() {
-  // @@protoc_insertion_point(destructor:io.deephaven.proto.backplane.script.grpc.ChangeDocumentRequest.TextDocumentContentChangeEvent)
-  _internal_metadata_.Delete<::google::protobuf::UnknownFieldSet>();
-  SharedDtor();
-}
-inline void ChangeDocumentRequest_TextDocumentContentChangeEvent::SharedDtor() {
-  ABSL_DCHECK(GetArena() == nullptr);
-  _impl_.text_.Destroy();
-  delete _impl_.range_;
-  _impl_.~Impl_();
-}
-
-PROTOBUF_NOINLINE void ChangeDocumentRequest_TextDocumentContentChangeEvent::Clear() {
-// @@protoc_insertion_point(message_clear_start:io.deephaven.proto.backplane.script.grpc.ChangeDocumentRequest.TextDocumentContentChangeEvent)
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  ::uint32_t cached_has_bits = 0;
-  // Prevent compiler warnings about cached_has_bits being unused
-  (void) cached_has_bits;
-
-  _impl_.text_.ClearToEmpty();
-  cached_has_bits = _impl_._has_bits_[0];
-  if (cached_has_bits & 0x00000001u) {
-    ABSL_DCHECK(_impl_.range_ != nullptr);
-    _impl_.range_->Clear();
-  }
-  _impl_.range_length_ = 0;
-  _impl_._has_bits_.Clear();
-  _internal_metadata_.Clear<::google::protobuf::UnknownFieldSet>();
-}
-
-const char* ChangeDocumentRequest_TextDocumentContentChangeEvent::_InternalParse(
-    const char* ptr, ::_pbi::ParseContext* ctx) {
-  ptr = ::_pbi::TcParser::ParseLoop(this, ptr, ctx, &_table_.header);
-  return ptr;
-}
-
-
-PROTOBUF_CONSTINIT PROTOBUF_ATTRIBUTE_INIT_PRIORITY1
-const ::_pbi::TcParseTable<2, 3, 1, 106, 2> ChangeDocumentRequest_TextDocumentContentChangeEvent::_table_ = {
-  {
-    PROTOBUF_FIELD_OFFSET(ChangeDocumentRequest_TextDocumentContentChangeEvent, _impl_._has_bits_),
-    0, // no _extensions_
-    3, 24,  // max_field_number, fast_idx_mask
-    offsetof(decltype(_table_), field_lookup_table),
-    4294967288,  // skipmap
-    offsetof(decltype(_table_), field_entries),
-    3,  // num_field_entries
-    1,  // num_aux_entries
-    offsetof(decltype(_table_), aux_entries),
-    &_ChangeDocumentRequest_TextDocumentContentChangeEvent_default_instance_._instance,
-    ::_pbi::TcParser::GenericFallback,  // fallback
-  }, {{
-    {::_pbi::TcParser::MiniParse, {}},
-    // .io.deephaven.proto.backplane.script.grpc.DocumentRange range = 1;
-    {::_pbi::TcParser::FastMtS1,
-     {10, 0, 0, PROTOBUF_FIELD_OFFSET(ChangeDocumentRequest_TextDocumentContentChangeEvent, _impl_.range_)}},
-    // int32 range_length = 2;
-    {::_pbi::TcParser::SingularVarintNoZag1<::uint32_t, offsetof(ChangeDocumentRequest_TextDocumentContentChangeEvent, _impl_.range_length_), 63>(),
-     {16, 63, 0, PROTOBUF_FIELD_OFFSET(ChangeDocumentRequest_TextDocumentContentChangeEvent, _impl_.range_length_)}},
-    // string text = 3;
-    {::_pbi::TcParser::FastUS1,
-     {26, 63, 0, PROTOBUF_FIELD_OFFSET(ChangeDocumentRequest_TextDocumentContentChangeEvent, _impl_.text_)}},
-  }}, {{
-    65535, 65535
-  }}, {{
-    // .io.deephaven.proto.backplane.script.grpc.DocumentRange range = 1;
-    {PROTOBUF_FIELD_OFFSET(ChangeDocumentRequest_TextDocumentContentChangeEvent, _impl_.range_), _Internal::kHasBitsOffset + 0, 0,
-    (0 | ::_fl::kFcOptional | ::_fl::kMessage | ::_fl::kTvTable)},
-    // int32 range_length = 2;
-    {PROTOBUF_FIELD_OFFSET(ChangeDocumentRequest_TextDocumentContentChangeEvent, _impl_.range_length_), -1, 0,
-    (0 | ::_fl::kFcSingular | ::_fl::kInt32)},
-    // string text = 3;
-    {PROTOBUF_FIELD_OFFSET(ChangeDocumentRequest_TextDocumentContentChangeEvent, _impl_.text_), -1, 0,
-    (0 | ::_fl::kFcSingular | ::_fl::kUtf8String | ::_fl::kRepAString)},
-  }}, {{
-    {::_pbi::TcParser::GetTable<::io::deephaven::proto::backplane::script::grpc::DocumentRange>()},
-  }}, {{
-    "\135\0\0\4\0\0\0\0"
-    "io.deephaven.proto.backplane.script.grpc.ChangeDocumentRequest.TextDocumentContentChangeEvent"
-    "text"
-  }},
-};
-
-::uint8_t* ChangeDocumentRequest_TextDocumentContentChangeEvent::_InternalSerialize(
-    ::uint8_t* target,
-    ::google::protobuf::io::EpsCopyOutputStream* stream) const {
-  // @@protoc_insertion_point(serialize_to_array_start:io.deephaven.proto.backplane.script.grpc.ChangeDocumentRequest.TextDocumentContentChangeEvent)
-  ::uint32_t cached_has_bits = 0;
-  (void)cached_has_bits;
-
-  cached_has_bits = _impl_._has_bits_[0];
-  // .io.deephaven.proto.backplane.script.grpc.DocumentRange range = 1;
-  if (cached_has_bits & 0x00000001u) {
-    target = ::google::protobuf::internal::WireFormatLite::InternalWriteMessage(
-        1, _Internal::range(this),
-        _Internal::range(this).GetCachedSize(), target, stream);
-  }
-
-  // int32 range_length = 2;
-  if (this->_internal_range_length() != 0) {
-    target = ::google::protobuf::internal::WireFormatLite::
-        WriteInt32ToArrayWithField<2>(
-            stream, this->_internal_range_length(), target);
-  }
-
-  // string text = 3;
-  if (!this->_internal_text().empty()) {
-    const std::string& _s = this->_internal_text();
-    ::google::protobuf::internal::WireFormatLite::VerifyUtf8String(
-        _s.data(), static_cast<int>(_s.length()), ::google::protobuf::internal::WireFormatLite::SERIALIZE, "io.deephaven.proto.backplane.script.grpc.ChangeDocumentRequest.TextDocumentContentChangeEvent.text");
-    target = stream->WriteStringMaybeAliased(3, _s, target);
-  }
-
-  if (PROTOBUF_PREDICT_FALSE(_internal_metadata_.have_unknown_fields())) {
-    target =
-        ::_pbi::WireFormat::InternalSerializeUnknownFieldsToArray(
-            _internal_metadata_.unknown_fields<::google::protobuf::UnknownFieldSet>(::google::protobuf::UnknownFieldSet::default_instance), target, stream);
-  }
-  // @@protoc_insertion_point(serialize_to_array_end:io.deephaven.proto.backplane.script.grpc.ChangeDocumentRequest.TextDocumentContentChangeEvent)
-  return target;
-}
-
-::size_t ChangeDocumentRequest_TextDocumentContentChangeEvent::ByteSizeLong() const {
-// @@protoc_insertion_point(message_byte_size_start:io.deephaven.proto.backplane.script.grpc.ChangeDocumentRequest.TextDocumentContentChangeEvent)
-  ::size_t total_size = 0;
-
-  ::uint32_t cached_has_bits = 0;
-  // Prevent compiler warnings about cached_has_bits being unused
-  (void) cached_has_bits;
-
-  // string text = 3;
-  if (!this->_internal_text().empty()) {
-    total_size += 1 + ::google::protobuf::internal::WireFormatLite::StringSize(
-                                    this->_internal_text());
-  }
-
-  // .io.deephaven.proto.backplane.script.grpc.DocumentRange range = 1;
-  cached_has_bits = _impl_._has_bits_[0];
-  if (cached_has_bits & 0x00000001u) {
-    total_size +=
-        1 + ::google::protobuf::internal::WireFormatLite::MessageSize(*_impl_.range_);
-  }
-
-  // int32 range_length = 2;
-  if (this->_internal_range_length() != 0) {
-    total_size += ::_pbi::WireFormatLite::Int32SizePlusOne(
-        this->_internal_range_length());
-  }
-
-  return MaybeComputeUnknownFieldsSize(total_size, &_impl_._cached_size_);
-}
-
-const ::google::protobuf::Message::ClassData ChangeDocumentRequest_TextDocumentContentChangeEvent::_class_data_ = {
-    ChangeDocumentRequest_TextDocumentContentChangeEvent::MergeImpl,
-    nullptr,  // OnDemandRegisterArenaDtor
-};
-const ::google::protobuf::Message::ClassData* ChangeDocumentRequest_TextDocumentContentChangeEvent::GetClassData() const {
-  return &_class_data_;
-}
-
-void ChangeDocumentRequest_TextDocumentContentChangeEvent::MergeImpl(::google::protobuf::Message& to_msg, const ::google::protobuf::Message& from_msg) {
-  auto* const _this = static_cast<ChangeDocumentRequest_TextDocumentContentChangeEvent*>(&to_msg);
-  auto& from = static_cast<const ChangeDocumentRequest_TextDocumentContentChangeEvent&>(from_msg);
-  // @@protoc_insertion_point(class_specific_merge_from_start:io.deephaven.proto.backplane.script.grpc.ChangeDocumentRequest.TextDocumentContentChangeEvent)
-  ABSL_DCHECK_NE(&from, _this);
-  ::uint32_t cached_has_bits = 0;
-  (void) cached_has_bits;
-
-  if (!from._internal_text().empty()) {
-    _this->_internal_set_text(from._internal_text());
-  }
-  if ((from._impl_._has_bits_[0] & 0x00000001u) != 0) {
-    _this->_internal_mutable_range()->::io::deephaven::proto::backplane::script::grpc::DocumentRange::MergeFrom(
-        from._internal_range());
-  }
-  if (from._internal_range_length() != 0) {
-    _this->_internal_set_range_length(from._internal_range_length());
-  }
-  _this->_internal_metadata_.MergeFrom<::google::protobuf::UnknownFieldSet>(from._internal_metadata_);
-}
-
-void ChangeDocumentRequest_TextDocumentContentChangeEvent::CopyFrom(const ChangeDocumentRequest_TextDocumentContentChangeEvent& from) {
-// @@protoc_insertion_point(class_specific_copy_from_start:io.deephaven.proto.backplane.script.grpc.ChangeDocumentRequest.TextDocumentContentChangeEvent)
-  if (&from == this) return;
-  Clear();
-  MergeFrom(from);
-}
-
-PROTOBUF_NOINLINE bool ChangeDocumentRequest_TextDocumentContentChangeEvent::IsInitialized() const {
-  return true;
-}
-
-::_pbi::CachedSize* ChangeDocumentRequest_TextDocumentContentChangeEvent::AccessCachedSize() const {
-  return &_impl_._cached_size_;
-}
-void ChangeDocumentRequest_TextDocumentContentChangeEvent::InternalSwap(ChangeDocumentRequest_TextDocumentContentChangeEvent* PROTOBUF_RESTRICT other) {
-  using std::swap;
-  auto* arena = GetArena();
-  ABSL_DCHECK_EQ(arena, other->GetArena());
-  _internal_metadata_.InternalSwap(&other->_internal_metadata_);
-  swap(_impl_._has_bits_[0], other->_impl_._has_bits_[0]);
-  ::_pbi::ArenaStringPtr::InternalSwap(&_impl_.text_, &other->_impl_.text_, arena);
-  ::google::protobuf::internal::memswap<
-      PROTOBUF_FIELD_OFFSET(ChangeDocumentRequest_TextDocumentContentChangeEvent, _impl_.range_length_)
-      + sizeof(ChangeDocumentRequest_TextDocumentContentChangeEvent::_impl_.range_length_)
-      - PROTOBUF_FIELD_OFFSET(ChangeDocumentRequest_TextDocumentContentChangeEvent, _impl_.range_)>(
-          reinterpret_cast<char*>(&_impl_.range_),
-          reinterpret_cast<char*>(&other->_impl_.range_));
-}
-
-::google::protobuf::Metadata ChangeDocumentRequest_TextDocumentContentChangeEvent::GetMetadata() const {
-  return ::_pbi::AssignDescriptors(
-      &descriptor_table_deephaven_2fproto_2fconsole_2eproto_getter, &descriptor_table_deephaven_2fproto_2fconsole_2eproto_once,
-      file_level_metadata_deephaven_2fproto_2fconsole_2eproto[22]);
-}
-// ===================================================================
-
-class ChangeDocumentRequest::_Internal {
- public:
-  using HasBits = decltype(std::declval<ChangeDocumentRequest>()._impl_._has_bits_);
-  static constexpr ::int32_t kHasBitsOffset =
-    8 * PROTOBUF_FIELD_OFFSET(ChangeDocumentRequest, _impl_._has_bits_);
-  static const ::io::deephaven::proto::backplane::grpc::Ticket& console_id(const ChangeDocumentRequest* msg);
-  static void set_has_console_id(HasBits* has_bits) {
-    (*has_bits)[0] |= 1u;
-  }
-  static const ::io::deephaven::proto::backplane::script::grpc::VersionedTextDocumentIdentifier& text_document(const ChangeDocumentRequest* msg);
-  static void set_has_text_document(HasBits* has_bits) {
-    (*has_bits)[0] |= 2u;
-  }
-};
-
-const ::io::deephaven::proto::backplane::grpc::Ticket& ChangeDocumentRequest::_Internal::console_id(const ChangeDocumentRequest* msg) {
-  return *msg->_impl_.console_id_;
-}
-const ::io::deephaven::proto::backplane::script::grpc::VersionedTextDocumentIdentifier& ChangeDocumentRequest::_Internal::text_document(const ChangeDocumentRequest* msg) {
-  return *msg->_impl_.text_document_;
-}
-void ChangeDocumentRequest::clear_console_id() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  if (_impl_.console_id_ != nullptr) _impl_.console_id_->Clear();
-  _impl_._has_bits_[0] &= ~0x00000001u;
-}
-ChangeDocumentRequest::ChangeDocumentRequest(::google::protobuf::Arena* arena)
-    : ::google::protobuf::Message(arena) {
-  SharedCtor(arena);
-  // @@protoc_insertion_point(arena_constructor:io.deephaven.proto.backplane.script.grpc.ChangeDocumentRequest)
-}
-inline PROTOBUF_NDEBUG_INLINE ChangeDocumentRequest::Impl_::Impl_(
-    ::google::protobuf::internal::InternalVisibility visibility, ::google::protobuf::Arena* arena,
-    const Impl_& from)
-      : _has_bits_{from._has_bits_},
-        _cached_size_{0},
-        content_changes_{visibility, arena, from.content_changes_} {}
-
-ChangeDocumentRequest::ChangeDocumentRequest(
-    ::google::protobuf::Arena* arena,
-    const ChangeDocumentRequest& from)
-    : ::google::protobuf::Message(arena) {
-  ChangeDocumentRequest* const _this = this;
-  (void)_this;
-  _internal_metadata_.MergeFrom<::google::protobuf::UnknownFieldSet>(
-      from._internal_metadata_);
-  new (&_impl_) Impl_(internal_visibility(), arena, from._impl_);
-  ::uint32_t cached_has_bits = _impl_._has_bits_[0];
-  _impl_.console_id_ = (cached_has_bits & 0x00000001u)
-                ? CreateMaybeMessage<::io::deephaven::proto::backplane::grpc::Ticket>(arena, *from._impl_.console_id_)
-                : nullptr;
-  _impl_.text_document_ = (cached_has_bits & 0x00000002u)
-                ? CreateMaybeMessage<::io::deephaven::proto::backplane::script::grpc::VersionedTextDocumentIdentifier>(arena, *from._impl_.text_document_)
-                : nullptr;
-
-  // @@protoc_insertion_point(copy_constructor:io.deephaven.proto.backplane.script.grpc.ChangeDocumentRequest)
-}
-inline PROTOBUF_NDEBUG_INLINE ChangeDocumentRequest::Impl_::Impl_(
-    ::google::protobuf::internal::InternalVisibility visibility,
-    ::google::protobuf::Arena* arena)
-      : _cached_size_{0},
-        content_changes_{visibility, arena} {}
-
-inline void ChangeDocumentRequest::SharedCtor(::_pb::Arena* arena) {
-  new (&_impl_) Impl_(internal_visibility(), arena);
-  ::memset(reinterpret_cast<char *>(&_impl_) +
-               offsetof(Impl_, console_id_),
-           0,
-           offsetof(Impl_, text_document_) -
-               offsetof(Impl_, console_id_) +
-               sizeof(Impl_::text_document_));
-}
-ChangeDocumentRequest::~ChangeDocumentRequest() {
-  // @@protoc_insertion_point(destructor:io.deephaven.proto.backplane.script.grpc.ChangeDocumentRequest)
-  _internal_metadata_.Delete<::google::protobuf::UnknownFieldSet>();
-  SharedDtor();
-}
-inline void ChangeDocumentRequest::SharedDtor() {
-  ABSL_DCHECK(GetArena() == nullptr);
-  delete _impl_.console_id_;
-  delete _impl_.text_document_;
-  _impl_.~Impl_();
-}
-
-PROTOBUF_NOINLINE void ChangeDocumentRequest::Clear() {
-// @@protoc_insertion_point(message_clear_start:io.deephaven.proto.backplane.script.grpc.ChangeDocumentRequest)
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  ::uint32_t cached_has_bits = 0;
-  // Prevent compiler warnings about cached_has_bits being unused
-  (void) cached_has_bits;
-
-  _impl_.content_changes_.Clear();
-  cached_has_bits = _impl_._has_bits_[0];
-  if (cached_has_bits & 0x00000003u) {
-    if (cached_has_bits & 0x00000001u) {
-      ABSL_DCHECK(_impl_.console_id_ != nullptr);
-      _impl_.console_id_->Clear();
-    }
-    if (cached_has_bits & 0x00000002u) {
-      ABSL_DCHECK(_impl_.text_document_ != nullptr);
-      _impl_.text_document_->Clear();
-    }
-  }
-  _impl_._has_bits_.Clear();
-  _internal_metadata_.Clear<::google::protobuf::UnknownFieldSet>();
-}
-
-const char* ChangeDocumentRequest::_InternalParse(
-    const char* ptr, ::_pbi::ParseContext* ctx) {
-  ptr = ::_pbi::TcParser::ParseLoop(this, ptr, ctx, &_table_.header);
-  return ptr;
-}
-
-
-PROTOBUF_CONSTINIT PROTOBUF_ATTRIBUTE_INIT_PRIORITY1
-const ::_pbi::TcParseTable<2, 3, 3, 0, 2> ChangeDocumentRequest::_table_ = {
-  {
-    PROTOBUF_FIELD_OFFSET(ChangeDocumentRequest, _impl_._has_bits_),
-    0, // no _extensions_
-    3, 24,  // max_field_number, fast_idx_mask
-    offsetof(decltype(_table_), field_lookup_table),
-    4294967288,  // skipmap
-    offsetof(decltype(_table_), field_entries),
-    3,  // num_field_entries
-    3,  // num_aux_entries
-    offsetof(decltype(_table_), aux_entries),
-    &_ChangeDocumentRequest_default_instance_._instance,
-    ::_pbi::TcParser::GenericFallback,  // fallback
-  }, {{
-    {::_pbi::TcParser::MiniParse, {}},
-    // .io.deephaven.proto.backplane.grpc.Ticket console_id = 1 [deprecated = true];
-    {::_pbi::TcParser::FastMtS1,
-     {10, 0, 0, PROTOBUF_FIELD_OFFSET(ChangeDocumentRequest, _impl_.console_id_)}},
-    // .io.deephaven.proto.backplane.script.grpc.VersionedTextDocumentIdentifier text_document = 2;
-    {::_pbi::TcParser::FastMtS1,
-     {18, 1, 1, PROTOBUF_FIELD_OFFSET(ChangeDocumentRequest, _impl_.text_document_)}},
-    // repeated .io.deephaven.proto.backplane.script.grpc.ChangeDocumentRequest.TextDocumentContentChangeEvent content_changes = 3;
-    {::_pbi::TcParser::FastMtR1,
-     {26, 63, 2, PROTOBUF_FIELD_OFFSET(ChangeDocumentRequest, _impl_.content_changes_)}},
-  }}, {{
-    65535, 65535
-  }}, {{
-    // .io.deephaven.proto.backplane.grpc.Ticket console_id = 1 [deprecated = true];
-    {PROTOBUF_FIELD_OFFSET(ChangeDocumentRequest, _impl_.console_id_), _Internal::kHasBitsOffset + 0, 0,
-    (0 | ::_fl::kFcOptional | ::_fl::kMessage | ::_fl::kTvTable)},
-    // .io.deephaven.proto.backplane.script.grpc.VersionedTextDocumentIdentifier text_document = 2;
-    {PROTOBUF_FIELD_OFFSET(ChangeDocumentRequest, _impl_.text_document_), _Internal::kHasBitsOffset + 1, 1,
-    (0 | ::_fl::kFcOptional | ::_fl::kMessage | ::_fl::kTvTable)},
-    // repeated .io.deephaven.proto.backplane.script.grpc.ChangeDocumentRequest.TextDocumentContentChangeEvent content_changes = 3;
-    {PROTOBUF_FIELD_OFFSET(ChangeDocumentRequest, _impl_.content_changes_), -1, 2,
-    (0 | ::_fl::kFcRepeated | ::_fl::kMessage | ::_fl::kTvTable)},
-  }}, {{
-    {::_pbi::TcParser::GetTable<::io::deephaven::proto::backplane::grpc::Ticket>()},
-    {::_pbi::TcParser::GetTable<::io::deephaven::proto::backplane::script::grpc::VersionedTextDocumentIdentifier>()},
-    {::_pbi::TcParser::GetTable<::io::deephaven::proto::backplane::script::grpc::ChangeDocumentRequest_TextDocumentContentChangeEvent>()},
-  }}, {{
-  }},
-};
-
-::uint8_t* ChangeDocumentRequest::_InternalSerialize(
-    ::uint8_t* target,
-    ::google::protobuf::io::EpsCopyOutputStream* stream) const {
-  // @@protoc_insertion_point(serialize_to_array_start:io.deephaven.proto.backplane.script.grpc.ChangeDocumentRequest)
-  ::uint32_t cached_has_bits = 0;
-  (void)cached_has_bits;
-
-  cached_has_bits = _impl_._has_bits_[0];
-  // .io.deephaven.proto.backplane.grpc.Ticket console_id = 1 [deprecated = true];
-  if (cached_has_bits & 0x00000001u) {
-    target = ::google::protobuf::internal::WireFormatLite::InternalWriteMessage(
-        1, _Internal::console_id(this),
-        _Internal::console_id(this).GetCachedSize(), target, stream);
-  }
-
-  // .io.deephaven.proto.backplane.script.grpc.VersionedTextDocumentIdentifier text_document = 2;
-  if (cached_has_bits & 0x00000002u) {
-    target = ::google::protobuf::internal::WireFormatLite::InternalWriteMessage(
-        2, _Internal::text_document(this),
-        _Internal::text_document(this).GetCachedSize(), target, stream);
-  }
-
-  // repeated .io.deephaven.proto.backplane.script.grpc.ChangeDocumentRequest.TextDocumentContentChangeEvent content_changes = 3;
-  for (unsigned i = 0,
-      n = static_cast<unsigned>(this->_internal_content_changes_size()); i < n; i++) {
-    const auto& repfield = this->_internal_content_changes().Get(i);
-    target = ::google::protobuf::internal::WireFormatLite::
-        InternalWriteMessage(3, repfield, repfield.GetCachedSize(), target, stream);
-  }
-
-  if (PROTOBUF_PREDICT_FALSE(_internal_metadata_.have_unknown_fields())) {
-    target =
-        ::_pbi::WireFormat::InternalSerializeUnknownFieldsToArray(
-            _internal_metadata_.unknown_fields<::google::protobuf::UnknownFieldSet>(::google::protobuf::UnknownFieldSet::default_instance), target, stream);
-  }
-  // @@protoc_insertion_point(serialize_to_array_end:io.deephaven.proto.backplane.script.grpc.ChangeDocumentRequest)
-  return target;
-}
-
-::size_t ChangeDocumentRequest::ByteSizeLong() const {
-// @@protoc_insertion_point(message_byte_size_start:io.deephaven.proto.backplane.script.grpc.ChangeDocumentRequest)
-  ::size_t total_size = 0;
-
-  ::uint32_t cached_has_bits = 0;
-  // Prevent compiler warnings about cached_has_bits being unused
-  (void) cached_has_bits;
-
-  // repeated .io.deephaven.proto.backplane.script.grpc.ChangeDocumentRequest.TextDocumentContentChangeEvent content_changes = 3;
-  total_size += 1UL * this->_internal_content_changes_size();
-  for (const auto& msg : this->_internal_content_changes()) {
-    total_size +=
-      ::google::protobuf::internal::WireFormatLite::MessageSize(msg);
-  }
-  cached_has_bits = _impl_._has_bits_[0];
-  if (cached_has_bits & 0x00000003u) {
-    // .io.deephaven.proto.backplane.grpc.Ticket console_id = 1 [deprecated = true];
-    if (cached_has_bits & 0x00000001u) {
-      total_size +=
-          1 + ::google::protobuf::internal::WireFormatLite::MessageSize(*_impl_.console_id_);
-    }
-
-    // .io.deephaven.proto.backplane.script.grpc.VersionedTextDocumentIdentifier text_document = 2;
-    if (cached_has_bits & 0x00000002u) {
-      total_size +=
-          1 + ::google::protobuf::internal::WireFormatLite::MessageSize(*_impl_.text_document_);
-    }
-
-  }
-  return MaybeComputeUnknownFieldsSize(total_size, &_impl_._cached_size_);
-}
-
-const ::google::protobuf::Message::ClassData ChangeDocumentRequest::_class_data_ = {
-    ChangeDocumentRequest::MergeImpl,
-    nullptr,  // OnDemandRegisterArenaDtor
-};
-const ::google::protobuf::Message::ClassData* ChangeDocumentRequest::GetClassData() const {
-  return &_class_data_;
-}
-
-void ChangeDocumentRequest::MergeImpl(::google::protobuf::Message& to_msg, const ::google::protobuf::Message& from_msg) {
-  auto* const _this = static_cast<ChangeDocumentRequest*>(&to_msg);
-  auto& from = static_cast<const ChangeDocumentRequest&>(from_msg);
-  // @@protoc_insertion_point(class_specific_merge_from_start:io.deephaven.proto.backplane.script.grpc.ChangeDocumentRequest)
-  ABSL_DCHECK_NE(&from, _this);
-  ::uint32_t cached_has_bits = 0;
-  (void) cached_has_bits;
-
-  _this->_internal_mutable_content_changes()->MergeFrom(
-      from._internal_content_changes());
-  cached_has_bits = from._impl_._has_bits_[0];
-  if (cached_has_bits & 0x00000003u) {
-    if (cached_has_bits & 0x00000001u) {
-      _this->_internal_mutable_console_id()->::io::deephaven::proto::backplane::grpc::Ticket::MergeFrom(
-          from._internal_console_id());
-    }
-    if (cached_has_bits & 0x00000002u) {
-      _this->_internal_mutable_text_document()->::io::deephaven::proto::backplane::script::grpc::VersionedTextDocumentIdentifier::MergeFrom(
-          from._internal_text_document());
-    }
-  }
-  _this->_internal_metadata_.MergeFrom<::google::protobuf::UnknownFieldSet>(from._internal_metadata_);
-}
-
-void ChangeDocumentRequest::CopyFrom(const ChangeDocumentRequest& from) {
-// @@protoc_insertion_point(class_specific_copy_from_start:io.deephaven.proto.backplane.script.grpc.ChangeDocumentRequest)
-  if (&from == this) return;
-  Clear();
-  MergeFrom(from);
-}
-
-PROTOBUF_NOINLINE bool ChangeDocumentRequest::IsInitialized() const {
-  return true;
-}
-
-::_pbi::CachedSize* ChangeDocumentRequest::AccessCachedSize() const {
-  return &_impl_._cached_size_;
-}
-void ChangeDocumentRequest::InternalSwap(ChangeDocumentRequest* PROTOBUF_RESTRICT other) {
-  using std::swap;
-  _internal_metadata_.InternalSwap(&other->_internal_metadata_);
-  swap(_impl_._has_bits_[0], other->_impl_._has_bits_[0]);
-  _impl_.content_changes_.InternalSwap(&other->_impl_.content_changes_);
-  ::google::protobuf::internal::memswap<
-      PROTOBUF_FIELD_OFFSET(ChangeDocumentRequest, _impl_.text_document_)
-      + sizeof(ChangeDocumentRequest::_impl_.text_document_)
-      - PROTOBUF_FIELD_OFFSET(ChangeDocumentRequest, _impl_.console_id_)>(
-          reinterpret_cast<char*>(&_impl_.console_id_),
-          reinterpret_cast<char*>(&other->_impl_.console_id_));
-}
-
-::google::protobuf::Metadata ChangeDocumentRequest::GetMetadata() const {
-  return ::_pbi::AssignDescriptors(
-      &descriptor_table_deephaven_2fproto_2fconsole_2eproto_getter, &descriptor_table_deephaven_2fproto_2fconsole_2eproto_once,
-      file_level_metadata_deephaven_2fproto_2fconsole_2eproto[23]);
-}
-// ===================================================================
-
-class DocumentRange::_Internal {
- public:
-  using HasBits = decltype(std::declval<DocumentRange>()._impl_._has_bits_);
-  static constexpr ::int32_t kHasBitsOffset =
-    8 * PROTOBUF_FIELD_OFFSET(DocumentRange, _impl_._has_bits_);
-  static const ::io::deephaven::proto::backplane::script::grpc::Position& start(const DocumentRange* msg);
-  static void set_has_start(HasBits* has_bits) {
-    (*has_bits)[0] |= 1u;
-  }
-  static const ::io::deephaven::proto::backplane::script::grpc::Position& end(const DocumentRange* msg);
-  static void set_has_end(HasBits* has_bits) {
-    (*has_bits)[0] |= 2u;
-  }
-};
-
-const ::io::deephaven::proto::backplane::script::grpc::Position& DocumentRange::_Internal::start(const DocumentRange* msg) {
-  return *msg->_impl_.start_;
-}
-const ::io::deephaven::proto::backplane::script::grpc::Position& DocumentRange::_Internal::end(const DocumentRange* msg) {
-  return *msg->_impl_.end_;
-}
-DocumentRange::DocumentRange(::google::protobuf::Arena* arena)
-    : ::google::protobuf::Message(arena) {
-  SharedCtor(arena);
-  // @@protoc_insertion_point(arena_constructor:io.deephaven.proto.backplane.script.grpc.DocumentRange)
-}
-inline PROTOBUF_NDEBUG_INLINE DocumentRange::Impl_::Impl_(
-    ::google::protobuf::internal::InternalVisibility visibility, ::google::protobuf::Arena* arena,
-    const Impl_& from)
-      : _has_bits_{from._has_bits_},
-        _cached_size_{0} {}
-
-DocumentRange::DocumentRange(
-    ::google::protobuf::Arena* arena,
-    const DocumentRange& from)
-    : ::google::protobuf::Message(arena) {
-  DocumentRange* const _this = this;
-  (void)_this;
-  _internal_metadata_.MergeFrom<::google::protobuf::UnknownFieldSet>(
-      from._internal_metadata_);
-  new (&_impl_) Impl_(internal_visibility(), arena, from._impl_);
-  ::uint32_t cached_has_bits = _impl_._has_bits_[0];
-  _impl_.start_ = (cached_has_bits & 0x00000001u)
-                ? CreateMaybeMessage<::io::deephaven::proto::backplane::script::grpc::Position>(arena, *from._impl_.start_)
-                : nullptr;
-  _impl_.end_ = (cached_has_bits & 0x00000002u)
-                ? CreateMaybeMessage<::io::deephaven::proto::backplane::script::grpc::Position>(arena, *from._impl_.end_)
-                : nullptr;
-
-  // @@protoc_insertion_point(copy_constructor:io.deephaven.proto.backplane.script.grpc.DocumentRange)
-}
-inline PROTOBUF_NDEBUG_INLINE DocumentRange::Impl_::Impl_(
-    ::google::protobuf::internal::InternalVisibility visibility,
-    ::google::protobuf::Arena* arena)
-      : _cached_size_{0} {}
-
-inline void DocumentRange::SharedCtor(::_pb::Arena* arena) {
-  new (&_impl_) Impl_(internal_visibility(), arena);
-  ::memset(reinterpret_cast<char *>(&_impl_) +
-               offsetof(Impl_, start_),
-           0,
-           offsetof(Impl_, end_) -
-               offsetof(Impl_, start_) +
-               sizeof(Impl_::end_));
-}
-DocumentRange::~DocumentRange() {
-  // @@protoc_insertion_point(destructor:io.deephaven.proto.backplane.script.grpc.DocumentRange)
-  _internal_metadata_.Delete<::google::protobuf::UnknownFieldSet>();
-  SharedDtor();
-}
-inline void DocumentRange::SharedDtor() {
-  ABSL_DCHECK(GetArena() == nullptr);
-  delete _impl_.start_;
-  delete _impl_.end_;
-  _impl_.~Impl_();
-}
-
-PROTOBUF_NOINLINE void DocumentRange::Clear() {
-// @@protoc_insertion_point(message_clear_start:io.deephaven.proto.backplane.script.grpc.DocumentRange)
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  ::uint32_t cached_has_bits = 0;
-  // Prevent compiler warnings about cached_has_bits being unused
-  (void) cached_has_bits;
-
-  cached_has_bits = _impl_._has_bits_[0];
-  if (cached_has_bits & 0x00000003u) {
-    if (cached_has_bits & 0x00000001u) {
-      ABSL_DCHECK(_impl_.start_ != nullptr);
-      _impl_.start_->Clear();
-    }
-    if (cached_has_bits & 0x00000002u) {
-      ABSL_DCHECK(_impl_.end_ != nullptr);
-      _impl_.end_->Clear();
-    }
-  }
-  _impl_._has_bits_.Clear();
-  _internal_metadata_.Clear<::google::protobuf::UnknownFieldSet>();
-}
-
-const char* DocumentRange::_InternalParse(
-    const char* ptr, ::_pbi::ParseContext* ctx) {
-  ptr = ::_pbi::TcParser::ParseLoop(this, ptr, ctx, &_table_.header);
-  return ptr;
-}
-
-
-PROTOBUF_CONSTINIT PROTOBUF_ATTRIBUTE_INIT_PRIORITY1
-const ::_pbi::TcParseTable<1, 2, 2, 0, 2> DocumentRange::_table_ = {
-  {
-    PROTOBUF_FIELD_OFFSET(DocumentRange, _impl_._has_bits_),
-    0, // no _extensions_
-    2, 8,  // max_field_number, fast_idx_mask
-    offsetof(decltype(_table_), field_lookup_table),
-    4294967292,  // skipmap
-    offsetof(decltype(_table_), field_entries),
-    2,  // num_field_entries
-    2,  // num_aux_entries
-    offsetof(decltype(_table_), aux_entries),
-    &_DocumentRange_default_instance_._instance,
-    ::_pbi::TcParser::GenericFallback,  // fallback
-  }, {{
-    // .io.deephaven.proto.backplane.script.grpc.Position end = 2;
-    {::_pbi::TcParser::FastMtS1,
-     {18, 1, 1, PROTOBUF_FIELD_OFFSET(DocumentRange, _impl_.end_)}},
-    // .io.deephaven.proto.backplane.script.grpc.Position start = 1;
-    {::_pbi::TcParser::FastMtS1,
-     {10, 0, 0, PROTOBUF_FIELD_OFFSET(DocumentRange, _impl_.start_)}},
-  }}, {{
-    65535, 65535
-  }}, {{
-    // .io.deephaven.proto.backplane.script.grpc.Position start = 1;
-    {PROTOBUF_FIELD_OFFSET(DocumentRange, _impl_.start_), _Internal::kHasBitsOffset + 0, 0,
-    (0 | ::_fl::kFcOptional | ::_fl::kMessage | ::_fl::kTvTable)},
-    // .io.deephaven.proto.backplane.script.grpc.Position end = 2;
-    {PROTOBUF_FIELD_OFFSET(DocumentRange, _impl_.end_), _Internal::kHasBitsOffset + 1, 1,
-    (0 | ::_fl::kFcOptional | ::_fl::kMessage | ::_fl::kTvTable)},
-  }}, {{
-    {::_pbi::TcParser::GetTable<::io::deephaven::proto::backplane::script::grpc::Position>()},
-    {::_pbi::TcParser::GetTable<::io::deephaven::proto::backplane::script::grpc::Position>()},
-  }}, {{
-  }},
-};
-
-::uint8_t* DocumentRange::_InternalSerialize(
-    ::uint8_t* target,
-    ::google::protobuf::io::EpsCopyOutputStream* stream) const {
-  // @@protoc_insertion_point(serialize_to_array_start:io.deephaven.proto.backplane.script.grpc.DocumentRange)
-  ::uint32_t cached_has_bits = 0;
-  (void)cached_has_bits;
-
-  cached_has_bits = _impl_._has_bits_[0];
-  // .io.deephaven.proto.backplane.script.grpc.Position start = 1;
-  if (cached_has_bits & 0x00000001u) {
-    target = ::google::protobuf::internal::WireFormatLite::InternalWriteMessage(
-        1, _Internal::start(this),
-        _Internal::start(this).GetCachedSize(), target, stream);
-  }
-
-  // .io.deephaven.proto.backplane.script.grpc.Position end = 2;
-  if (cached_has_bits & 0x00000002u) {
-    target = ::google::protobuf::internal::WireFormatLite::InternalWriteMessage(
-        2, _Internal::end(this),
-        _Internal::end(this).GetCachedSize(), target, stream);
-  }
-
-  if (PROTOBUF_PREDICT_FALSE(_internal_metadata_.have_unknown_fields())) {
-    target =
-        ::_pbi::WireFormat::InternalSerializeUnknownFieldsToArray(
-            _internal_metadata_.unknown_fields<::google::protobuf::UnknownFieldSet>(::google::protobuf::UnknownFieldSet::default_instance), target, stream);
-  }
-  // @@protoc_insertion_point(serialize_to_array_end:io.deephaven.proto.backplane.script.grpc.DocumentRange)
-  return target;
-}
-
-::size_t DocumentRange::ByteSizeLong() const {
-// @@protoc_insertion_point(message_byte_size_start:io.deephaven.proto.backplane.script.grpc.DocumentRange)
-  ::size_t total_size = 0;
-
-  ::uint32_t cached_has_bits = 0;
-  // Prevent compiler warnings about cached_has_bits being unused
-  (void) cached_has_bits;
-
-  cached_has_bits = _impl_._has_bits_[0];
-  if (cached_has_bits & 0x00000003u) {
-    // .io.deephaven.proto.backplane.script.grpc.Position start = 1;
-    if (cached_has_bits & 0x00000001u) {
-      total_size +=
-          1 + ::google::protobuf::internal::WireFormatLite::MessageSize(*_impl_.start_);
-    }
-
-    // .io.deephaven.proto.backplane.script.grpc.Position end = 2;
-    if (cached_has_bits & 0x00000002u) {
-      total_size +=
-          1 + ::google::protobuf::internal::WireFormatLite::MessageSize(*_impl_.end_);
-    }
-
-  }
-  return MaybeComputeUnknownFieldsSize(total_size, &_impl_._cached_size_);
-}
-
-const ::google::protobuf::Message::ClassData DocumentRange::_class_data_ = {
-    DocumentRange::MergeImpl,
-    nullptr,  // OnDemandRegisterArenaDtor
-};
-const ::google::protobuf::Message::ClassData* DocumentRange::GetClassData() const {
-  return &_class_data_;
-}
-
-void DocumentRange::MergeImpl(::google::protobuf::Message& to_msg, const ::google::protobuf::Message& from_msg) {
-  auto* const _this = static_cast<DocumentRange*>(&to_msg);
-  auto& from = static_cast<const DocumentRange&>(from_msg);
-  // @@protoc_insertion_point(class_specific_merge_from_start:io.deephaven.proto.backplane.script.grpc.DocumentRange)
-  ABSL_DCHECK_NE(&from, _this);
-  ::uint32_t cached_has_bits = 0;
-  (void) cached_has_bits;
-
-  cached_has_bits = from._impl_._has_bits_[0];
-  if (cached_has_bits & 0x00000003u) {
-    if (cached_has_bits & 0x00000001u) {
-      _this->_internal_mutable_start()->::io::deephaven::proto::backplane::script::grpc::Position::MergeFrom(
-          from._internal_start());
-    }
-    if (cached_has_bits & 0x00000002u) {
-      _this->_internal_mutable_end()->::io::deephaven::proto::backplane::script::grpc::Position::MergeFrom(
-          from._internal_end());
-    }
-  }
-  _this->_internal_metadata_.MergeFrom<::google::protobuf::UnknownFieldSet>(from._internal_metadata_);
-}
-
-void DocumentRange::CopyFrom(const DocumentRange& from) {
-// @@protoc_insertion_point(class_specific_copy_from_start:io.deephaven.proto.backplane.script.grpc.DocumentRange)
-  if (&from == this) return;
-  Clear();
-  MergeFrom(from);
-}
-
-PROTOBUF_NOINLINE bool DocumentRange::IsInitialized() const {
-  return true;
-}
-
-::_pbi::CachedSize* DocumentRange::AccessCachedSize() const {
-  return &_impl_._cached_size_;
-}
-void DocumentRange::InternalSwap(DocumentRange* PROTOBUF_RESTRICT other) {
-  using std::swap;
-  _internal_metadata_.InternalSwap(&other->_internal_metadata_);
-  swap(_impl_._has_bits_[0], other->_impl_._has_bits_[0]);
-  ::google::protobuf::internal::memswap<
-      PROTOBUF_FIELD_OFFSET(DocumentRange, _impl_.end_)
-      + sizeof(DocumentRange::_impl_.end_)
-      - PROTOBUF_FIELD_OFFSET(DocumentRange, _impl_.start_)>(
-          reinterpret_cast<char*>(&_impl_.start_),
-          reinterpret_cast<char*>(&other->_impl_.start_));
-}
-
-::google::protobuf::Metadata DocumentRange::GetMetadata() const {
-  return ::_pbi::AssignDescriptors(
-      &descriptor_table_deephaven_2fproto_2fconsole_2eproto_getter, &descriptor_table_deephaven_2fproto_2fconsole_2eproto_once,
-      file_level_metadata_deephaven_2fproto_2fconsole_2eproto[24]);
-}
-// ===================================================================
-
-class VersionedTextDocumentIdentifier::_Internal {
- public:
-};
-
-VersionedTextDocumentIdentifier::VersionedTextDocumentIdentifier(::google::protobuf::Arena* arena)
-    : ::google::protobuf::Message(arena) {
-  SharedCtor(arena);
-  // @@protoc_insertion_point(arena_constructor:io.deephaven.proto.backplane.script.grpc.VersionedTextDocumentIdentifier)
-}
-inline PROTOBUF_NDEBUG_INLINE VersionedTextDocumentIdentifier::Impl_::Impl_(
-    ::google::protobuf::internal::InternalVisibility visibility, ::google::protobuf::Arena* arena,
-    const Impl_& from)
-      : uri_(arena, from.uri_),
-        _cached_size_{0} {}
-
-VersionedTextDocumentIdentifier::VersionedTextDocumentIdentifier(
-    ::google::protobuf::Arena* arena,
-    const VersionedTextDocumentIdentifier& from)
-    : ::google::protobuf::Message(arena) {
-  VersionedTextDocumentIdentifier* const _this = this;
-  (void)_this;
-  _internal_metadata_.MergeFrom<::google::protobuf::UnknownFieldSet>(
-      from._internal_metadata_);
-  new (&_impl_) Impl_(internal_visibility(), arena, from._impl_);
-  _impl_.version_ = from._impl_.version_;
-
-  // @@protoc_insertion_point(copy_constructor:io.deephaven.proto.backplane.script.grpc.VersionedTextDocumentIdentifier)
-}
-inline PROTOBUF_NDEBUG_INLINE VersionedTextDocumentIdentifier::Impl_::Impl_(
-    ::google::protobuf::internal::InternalVisibility visibility,
-    ::google::protobuf::Arena* arena)
-      : uri_(arena),
-        _cached_size_{0} {}
-
-inline void VersionedTextDocumentIdentifier::SharedCtor(::_pb::Arena* arena) {
-  new (&_impl_) Impl_(internal_visibility(), arena);
-  _impl_.version_ = {};
-}
-VersionedTextDocumentIdentifier::~VersionedTextDocumentIdentifier() {
-  // @@protoc_insertion_point(destructor:io.deephaven.proto.backplane.script.grpc.VersionedTextDocumentIdentifier)
-  _internal_metadata_.Delete<::google::protobuf::UnknownFieldSet>();
-  SharedDtor();
-}
-inline void VersionedTextDocumentIdentifier::SharedDtor() {
-  ABSL_DCHECK(GetArena() == nullptr);
-  _impl_.uri_.Destroy();
-  _impl_.~Impl_();
-}
-
-PROTOBUF_NOINLINE void VersionedTextDocumentIdentifier::Clear() {
-// @@protoc_insertion_point(message_clear_start:io.deephaven.proto.backplane.script.grpc.VersionedTextDocumentIdentifier)
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  ::uint32_t cached_has_bits = 0;
-  // Prevent compiler warnings about cached_has_bits being unused
-  (void) cached_has_bits;
-
-  _impl_.uri_.ClearToEmpty();
-  _impl_.version_ = 0;
-  _internal_metadata_.Clear<::google::protobuf::UnknownFieldSet>();
-}
-
-const char* VersionedTextDocumentIdentifier::_InternalParse(
-    const char* ptr, ::_pbi::ParseContext* ctx) {
-  ptr = ::_pbi::TcParser::ParseLoop(this, ptr, ctx, &_table_.header);
-  return ptr;
-}
-
-
-PROTOBUF_CONSTINIT PROTOBUF_ATTRIBUTE_INIT_PRIORITY1
-const ::_pbi::TcParseTable<1, 2, 0, 84, 2> VersionedTextDocumentIdentifier::_table_ = {
-  {
-    0,  // no _has_bits_
-    0, // no _extensions_
-    2, 8,  // max_field_number, fast_idx_mask
-    offsetof(decltype(_table_), field_lookup_table),
-    4294967292,  // skipmap
-    offsetof(decltype(_table_), field_entries),
-    2,  // num_field_entries
-    0,  // num_aux_entries
-    offsetof(decltype(_table_), field_names),  // no aux_entries
-    &_VersionedTextDocumentIdentifier_default_instance_._instance,
-    ::_pbi::TcParser::GenericFallback,  // fallback
-  }, {{
-    // int32 version = 2;
-    {::_pbi::TcParser::SingularVarintNoZag1<::uint32_t, offsetof(VersionedTextDocumentIdentifier, _impl_.version_), 63>(),
-     {16, 63, 0, PROTOBUF_FIELD_OFFSET(VersionedTextDocumentIdentifier, _impl_.version_)}},
-    // string uri = 1;
-    {::_pbi::TcParser::FastUS1,
-     {10, 63, 0, PROTOBUF_FIELD_OFFSET(VersionedTextDocumentIdentifier, _impl_.uri_)}},
-  }}, {{
-    65535, 65535
-  }}, {{
-    // string uri = 1;
-    {PROTOBUF_FIELD_OFFSET(VersionedTextDocumentIdentifier, _impl_.uri_), 0, 0,
-    (0 | ::_fl::kFcSingular | ::_fl::kUtf8String | ::_fl::kRepAString)},
-    // int32 version = 2;
-    {PROTOBUF_FIELD_OFFSET(VersionedTextDocumentIdentifier, _impl_.version_), 0, 0,
-    (0 | ::_fl::kFcSingular | ::_fl::kInt32)},
-  }},
-  // no aux_entries
-  {{
-    "\110\3\0\0\0\0\0\0"
-    "io.deephaven.proto.backplane.script.grpc.VersionedTextDocumentIdentifier"
-    "uri"
-  }},
-};
-
-::uint8_t* VersionedTextDocumentIdentifier::_InternalSerialize(
-    ::uint8_t* target,
-    ::google::protobuf::io::EpsCopyOutputStream* stream) const {
-  // @@protoc_insertion_point(serialize_to_array_start:io.deephaven.proto.backplane.script.grpc.VersionedTextDocumentIdentifier)
-  ::uint32_t cached_has_bits = 0;
-  (void)cached_has_bits;
-
-  // string uri = 1;
-  if (!this->_internal_uri().empty()) {
-    const std::string& _s = this->_internal_uri();
-    ::google::protobuf::internal::WireFormatLite::VerifyUtf8String(
-        _s.data(), static_cast<int>(_s.length()), ::google::protobuf::internal::WireFormatLite::SERIALIZE, "io.deephaven.proto.backplane.script.grpc.VersionedTextDocumentIdentifier.uri");
-    target = stream->WriteStringMaybeAliased(1, _s, target);
-  }
-
-  // int32 version = 2;
-  if (this->_internal_version() != 0) {
-    target = ::google::protobuf::internal::WireFormatLite::
-        WriteInt32ToArrayWithField<2>(
-            stream, this->_internal_version(), target);
-  }
-
-  if (PROTOBUF_PREDICT_FALSE(_internal_metadata_.have_unknown_fields())) {
-    target =
-        ::_pbi::WireFormat::InternalSerializeUnknownFieldsToArray(
-            _internal_metadata_.unknown_fields<::google::protobuf::UnknownFieldSet>(::google::protobuf::UnknownFieldSet::default_instance), target, stream);
-  }
-  // @@protoc_insertion_point(serialize_to_array_end:io.deephaven.proto.backplane.script.grpc.VersionedTextDocumentIdentifier)
-  return target;
-}
-
-::size_t VersionedTextDocumentIdentifier::ByteSizeLong() const {
-// @@protoc_insertion_point(message_byte_size_start:io.deephaven.proto.backplane.script.grpc.VersionedTextDocumentIdentifier)
-  ::size_t total_size = 0;
-
-  ::uint32_t cached_has_bits = 0;
-  // Prevent compiler warnings about cached_has_bits being unused
-  (void) cached_has_bits;
-
-  // string uri = 1;
-  if (!this->_internal_uri().empty()) {
-    total_size += 1 + ::google::protobuf::internal::WireFormatLite::StringSize(
-                                    this->_internal_uri());
-  }
-
-  // int32 version = 2;
-  if (this->_internal_version() != 0) {
-    total_size += ::_pbi::WireFormatLite::Int32SizePlusOne(
-        this->_internal_version());
-  }
-
-  return MaybeComputeUnknownFieldsSize(total_size, &_impl_._cached_size_);
-}
-
-const ::google::protobuf::Message::ClassData VersionedTextDocumentIdentifier::_class_data_ = {
-    VersionedTextDocumentIdentifier::MergeImpl,
-    nullptr,  // OnDemandRegisterArenaDtor
-};
-const ::google::protobuf::Message::ClassData* VersionedTextDocumentIdentifier::GetClassData() const {
-  return &_class_data_;
-}
-
-void VersionedTextDocumentIdentifier::MergeImpl(::google::protobuf::Message& to_msg, const ::google::protobuf::Message& from_msg) {
-  auto* const _this = static_cast<VersionedTextDocumentIdentifier*>(&to_msg);
-  auto& from = static_cast<const VersionedTextDocumentIdentifier&>(from_msg);
-  // @@protoc_insertion_point(class_specific_merge_from_start:io.deephaven.proto.backplane.script.grpc.VersionedTextDocumentIdentifier)
-  ABSL_DCHECK_NE(&from, _this);
-  ::uint32_t cached_has_bits = 0;
-  (void) cached_has_bits;
-
-  if (!from._internal_uri().empty()) {
-    _this->_internal_set_uri(from._internal_uri());
-  }
-  if (from._internal_version() != 0) {
-    _this->_internal_set_version(from._internal_version());
-  }
-  _this->_internal_metadata_.MergeFrom<::google::protobuf::UnknownFieldSet>(from._internal_metadata_);
-}
-
-void VersionedTextDocumentIdentifier::CopyFrom(const VersionedTextDocumentIdentifier& from) {
-// @@protoc_insertion_point(class_specific_copy_from_start:io.deephaven.proto.backplane.script.grpc.VersionedTextDocumentIdentifier)
-  if (&from == this) return;
-  Clear();
-  MergeFrom(from);
-}
-
-PROTOBUF_NOINLINE bool VersionedTextDocumentIdentifier::IsInitialized() const {
-  return true;
-}
-
-::_pbi::CachedSize* VersionedTextDocumentIdentifier::AccessCachedSize() const {
-  return &_impl_._cached_size_;
-}
-void VersionedTextDocumentIdentifier::InternalSwap(VersionedTextDocumentIdentifier* PROTOBUF_RESTRICT other) {
-  using std::swap;
-  auto* arena = GetArena();
-  ABSL_DCHECK_EQ(arena, other->GetArena());
-  _internal_metadata_.InternalSwap(&other->_internal_metadata_);
-  ::_pbi::ArenaStringPtr::InternalSwap(&_impl_.uri_, &other->_impl_.uri_, arena);
-        swap(_impl_.version_, other->_impl_.version_);
-}
-
-::google::protobuf::Metadata VersionedTextDocumentIdentifier::GetMetadata() const {
-  return ::_pbi::AssignDescriptors(
-      &descriptor_table_deephaven_2fproto_2fconsole_2eproto_getter, &descriptor_table_deephaven_2fproto_2fconsole_2eproto_once,
-      file_level_metadata_deephaven_2fproto_2fconsole_2eproto[25]);
-}
-// ===================================================================
-
-class Position::_Internal {
- public:
-};
-
-Position::Position(::google::protobuf::Arena* arena)
-    : ::google::protobuf::Message(arena) {
-  SharedCtor(arena);
-  // @@protoc_insertion_point(arena_constructor:io.deephaven.proto.backplane.script.grpc.Position)
-}
-Position::Position(
-    ::google::protobuf::Arena* arena, const Position& from)
-    : Position(arena) {
-  MergeFrom(from);
-}
-inline PROTOBUF_NDEBUG_INLINE Position::Impl_::Impl_(
-    ::google::protobuf::internal::InternalVisibility visibility,
-    ::google::protobuf::Arena* arena)
-      : _cached_size_{0} {}
-
-inline void Position::SharedCtor(::_pb::Arena* arena) {
-  new (&_impl_) Impl_(internal_visibility(), arena);
-  ::memset(reinterpret_cast<char *>(&_impl_) +
-               offsetof(Impl_, line_),
-           0,
-           offsetof(Impl_, character_) -
-               offsetof(Impl_, line_) +
-               sizeof(Impl_::character_));
-}
-Position::~Position() {
-  // @@protoc_insertion_point(destructor:io.deephaven.proto.backplane.script.grpc.Position)
-  _internal_metadata_.Delete<::google::protobuf::UnknownFieldSet>();
-  SharedDtor();
-}
-inline void Position::SharedDtor() {
-  ABSL_DCHECK(GetArena() == nullptr);
-  _impl_.~Impl_();
-}
-
-PROTOBUF_NOINLINE void Position::Clear() {
-// @@protoc_insertion_point(message_clear_start:io.deephaven.proto.backplane.script.grpc.Position)
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  ::uint32_t cached_has_bits = 0;
-  // Prevent compiler warnings about cached_has_bits being unused
-  (void) cached_has_bits;
-
-  ::memset(&_impl_.line_, 0, static_cast<::size_t>(
-      reinterpret_cast<char*>(&_impl_.character_) -
-      reinterpret_cast<char*>(&_impl_.line_)) + sizeof(_impl_.character_));
-  _internal_metadata_.Clear<::google::protobuf::UnknownFieldSet>();
-}
-
-const char* Position::_InternalParse(
-    const char* ptr, ::_pbi::ParseContext* ctx) {
-  ptr = ::_pbi::TcParser::ParseLoop(this, ptr, ctx, &_table_.header);
-  return ptr;
-}
-
-
-PROTOBUF_CONSTINIT PROTOBUF_ATTRIBUTE_INIT_PRIORITY1
-const ::_pbi::TcParseTable<1, 2, 0, 0, 2> Position::_table_ = {
-  {
-    0,  // no _has_bits_
-    0, // no _extensions_
-    2, 8,  // max_field_number, fast_idx_mask
-    offsetof(decltype(_table_), field_lookup_table),
-    4294967292,  // skipmap
-    offsetof(decltype(_table_), field_entries),
-    2,  // num_field_entries
-    0,  // num_aux_entries
-    offsetof(decltype(_table_), field_names),  // no aux_entries
-    &_Position_default_instance_._instance,
-    ::_pbi::TcParser::GenericFallback,  // fallback
-  }, {{
-    // int32 character = 2;
-    {::_pbi::TcParser::SingularVarintNoZag1<::uint32_t, offsetof(Position, _impl_.character_), 63>(),
-     {16, 63, 0, PROTOBUF_FIELD_OFFSET(Position, _impl_.character_)}},
-    // int32 line = 1;
-    {::_pbi::TcParser::SingularVarintNoZag1<::uint32_t, offsetof(Position, _impl_.line_), 63>(),
-     {8, 63, 0, PROTOBUF_FIELD_OFFSET(Position, _impl_.line_)}},
-  }}, {{
-    65535, 65535
-  }}, {{
-    // int32 line = 1;
-    {PROTOBUF_FIELD_OFFSET(Position, _impl_.line_), 0, 0,
-    (0 | ::_fl::kFcSingular | ::_fl::kInt32)},
-    // int32 character = 2;
-    {PROTOBUF_FIELD_OFFSET(Position, _impl_.character_), 0, 0,
-    (0 | ::_fl::kFcSingular | ::_fl::kInt32)},
-  }},
-  // no aux_entries
-  {{
-  }},
-};
-
-::uint8_t* Position::_InternalSerialize(
-    ::uint8_t* target,
-    ::google::protobuf::io::EpsCopyOutputStream* stream) const {
-  // @@protoc_insertion_point(serialize_to_array_start:io.deephaven.proto.backplane.script.grpc.Position)
-  ::uint32_t cached_has_bits = 0;
-  (void)cached_has_bits;
-
-  // int32 line = 1;
-  if (this->_internal_line() != 0) {
-    target = ::google::protobuf::internal::WireFormatLite::
-        WriteInt32ToArrayWithField<1>(
-            stream, this->_internal_line(), target);
-  }
-
-  // int32 character = 2;
-  if (this->_internal_character() != 0) {
-    target = ::google::protobuf::internal::WireFormatLite::
-        WriteInt32ToArrayWithField<2>(
-            stream, this->_internal_character(), target);
-  }
-
-  if (PROTOBUF_PREDICT_FALSE(_internal_metadata_.have_unknown_fields())) {
-    target =
-        ::_pbi::WireFormat::InternalSerializeUnknownFieldsToArray(
-            _internal_metadata_.unknown_fields<::google::protobuf::UnknownFieldSet>(::google::protobuf::UnknownFieldSet::default_instance), target, stream);
-  }
-  // @@protoc_insertion_point(serialize_to_array_end:io.deephaven.proto.backplane.script.grpc.Position)
-  return target;
-}
-
-::size_t Position::ByteSizeLong() const {
-// @@protoc_insertion_point(message_byte_size_start:io.deephaven.proto.backplane.script.grpc.Position)
-  ::size_t total_size = 0;
-
-  ::uint32_t cached_has_bits = 0;
-  // Prevent compiler warnings about cached_has_bits being unused
-  (void) cached_has_bits;
-
-  // int32 line = 1;
-  if (this->_internal_line() != 0) {
-    total_size += ::_pbi::WireFormatLite::Int32SizePlusOne(
-        this->_internal_line());
-  }
-
-  // int32 character = 2;
-  if (this->_internal_character() != 0) {
-    total_size += ::_pbi::WireFormatLite::Int32SizePlusOne(
-        this->_internal_character());
-  }
-
-  return MaybeComputeUnknownFieldsSize(total_size, &_impl_._cached_size_);
-}
-
-const ::google::protobuf::Message::ClassData Position::_class_data_ = {
-    Position::MergeImpl,
-    nullptr,  // OnDemandRegisterArenaDtor
-};
-const ::google::protobuf::Message::ClassData* Position::GetClassData() const {
-  return &_class_data_;
-}
-
-void Position::MergeImpl(::google::protobuf::Message& to_msg, const ::google::protobuf::Message& from_msg) {
-  auto* const _this = static_cast<Position*>(&to_msg);
-  auto& from = static_cast<const Position&>(from_msg);
-  // @@protoc_insertion_point(class_specific_merge_from_start:io.deephaven.proto.backplane.script.grpc.Position)
-  ABSL_DCHECK_NE(&from, _this);
-  ::uint32_t cached_has_bits = 0;
-  (void) cached_has_bits;
-
-  if (from._internal_line() != 0) {
-    _this->_internal_set_line(from._internal_line());
-  }
-  if (from._internal_character() != 0) {
-    _this->_internal_set_character(from._internal_character());
-  }
-  _this->_internal_metadata_.MergeFrom<::google::protobuf::UnknownFieldSet>(from._internal_metadata_);
-}
-
-void Position::CopyFrom(const Position& from) {
-// @@protoc_insertion_point(class_specific_copy_from_start:io.deephaven.proto.backplane.script.grpc.Position)
-  if (&from == this) return;
-  Clear();
-  MergeFrom(from);
-}
-
-PROTOBUF_NOINLINE bool Position::IsInitialized() const {
-  return true;
-}
-
-::_pbi::CachedSize* Position::AccessCachedSize() const {
-  return &_impl_._cached_size_;
-}
-void Position::InternalSwap(Position* PROTOBUF_RESTRICT other) {
-  using std::swap;
-  _internal_metadata_.InternalSwap(&other->_internal_metadata_);
-  ::google::protobuf::internal::memswap<
-      PROTOBUF_FIELD_OFFSET(Position, _impl_.character_)
-      + sizeof(Position::_impl_.character_)
-      - PROTOBUF_FIELD_OFFSET(Position, _impl_.line_)>(
-          reinterpret_cast<char*>(&_impl_.line_),
-          reinterpret_cast<char*>(&other->_impl_.line_));
-}
-
-::google::protobuf::Metadata Position::GetMetadata() const {
-  return ::_pbi::AssignDescriptors(
-      &descriptor_table_deephaven_2fproto_2fconsole_2eproto_getter, &descriptor_table_deephaven_2fproto_2fconsole_2eproto_once,
-      file_level_metadata_deephaven_2fproto_2fconsole_2eproto[26]);
-}
-// ===================================================================
-
-class MarkupContent::_Internal {
- public:
-};
-
-MarkupContent::MarkupContent(::google::protobuf::Arena* arena)
-    : ::google::protobuf::Message(arena) {
-  SharedCtor(arena);
-  // @@protoc_insertion_point(arena_constructor:io.deephaven.proto.backplane.script.grpc.MarkupContent)
-}
-inline PROTOBUF_NDEBUG_INLINE MarkupContent::Impl_::Impl_(
-    ::google::protobuf::internal::InternalVisibility visibility, ::google::protobuf::Arena* arena,
-    const Impl_& from)
-      : kind_(arena, from.kind_),
-        value_(arena, from.value_),
-        _cached_size_{0} {}
-
-MarkupContent::MarkupContent(
-    ::google::protobuf::Arena* arena,
-    const MarkupContent& from)
-    : ::google::protobuf::Message(arena) {
-  MarkupContent* const _this = this;
-  (void)_this;
-  _internal_metadata_.MergeFrom<::google::protobuf::UnknownFieldSet>(
-      from._internal_metadata_);
-  new (&_impl_) Impl_(internal_visibility(), arena, from._impl_);
-
-  // @@protoc_insertion_point(copy_constructor:io.deephaven.proto.backplane.script.grpc.MarkupContent)
-}
-inline PROTOBUF_NDEBUG_INLINE MarkupContent::Impl_::Impl_(
-    ::google::protobuf::internal::InternalVisibility visibility,
-    ::google::protobuf::Arena* arena)
-      : kind_(arena),
-        value_(arena),
-        _cached_size_{0} {}
-
-inline void MarkupContent::SharedCtor(::_pb::Arena* arena) {
-  new (&_impl_) Impl_(internal_visibility(), arena);
-}
-MarkupContent::~MarkupContent() {
-  // @@protoc_insertion_point(destructor:io.deephaven.proto.backplane.script.grpc.MarkupContent)
-  _internal_metadata_.Delete<::google::protobuf::UnknownFieldSet>();
-  SharedDtor();
-}
-inline void MarkupContent::SharedDtor() {
-  ABSL_DCHECK(GetArena() == nullptr);
-  _impl_.kind_.Destroy();
-  _impl_.value_.Destroy();
-  _impl_.~Impl_();
-}
-
-PROTOBUF_NOINLINE void MarkupContent::Clear() {
-// @@protoc_insertion_point(message_clear_start:io.deephaven.proto.backplane.script.grpc.MarkupContent)
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  ::uint32_t cached_has_bits = 0;
-  // Prevent compiler warnings about cached_has_bits being unused
-  (void) cached_has_bits;
-
-  _impl_.kind_.ClearToEmpty();
-  _impl_.value_.ClearToEmpty();
-  _internal_metadata_.Clear<::google::protobuf::UnknownFieldSet>();
-}
-
-const char* MarkupContent::_InternalParse(
-    const char* ptr, ::_pbi::ParseContext* ctx) {
-  ptr = ::_pbi::TcParser::ParseLoop(this, ptr, ctx, &_table_.header);
-  return ptr;
-}
-
-
-PROTOBUF_CONSTINIT PROTOBUF_ATTRIBUTE_INIT_PRIORITY1
-const ::_pbi::TcParseTable<1, 2, 0, 72, 2> MarkupContent::_table_ = {
-  {
-    0,  // no _has_bits_
-    0, // no _extensions_
-    2, 8,  // max_field_number, fast_idx_mask
-    offsetof(decltype(_table_), field_lookup_table),
-    4294967292,  // skipmap
-    offsetof(decltype(_table_), field_entries),
-    2,  // num_field_entries
-    0,  // num_aux_entries
-    offsetof(decltype(_table_), field_names),  // no aux_entries
-    &_MarkupContent_default_instance_._instance,
-    ::_pbi::TcParser::GenericFallback,  // fallback
-  }, {{
-    // string value = 2;
-    {::_pbi::TcParser::FastUS1,
-     {18, 63, 0, PROTOBUF_FIELD_OFFSET(MarkupContent, _impl_.value_)}},
-    // string kind = 1;
-    {::_pbi::TcParser::FastUS1,
-     {10, 63, 0, PROTOBUF_FIELD_OFFSET(MarkupContent, _impl_.kind_)}},
-  }}, {{
-    65535, 65535
-  }}, {{
-    // string kind = 1;
-    {PROTOBUF_FIELD_OFFSET(MarkupContent, _impl_.kind_), 0, 0,
-    (0 | ::_fl::kFcSingular | ::_fl::kUtf8String | ::_fl::kRepAString)},
-    // string value = 2;
-    {PROTOBUF_FIELD_OFFSET(MarkupContent, _impl_.value_), 0, 0,
-    (0 | ::_fl::kFcSingular | ::_fl::kUtf8String | ::_fl::kRepAString)},
-  }},
-  // no aux_entries
-  {{
-    "\66\4\5\0\0\0\0\0"
-    "io.deephaven.proto.backplane.script.grpc.MarkupContent"
-    "kind"
-    "value"
-  }},
-};
-
-::uint8_t* MarkupContent::_InternalSerialize(
-    ::uint8_t* target,
-    ::google::protobuf::io::EpsCopyOutputStream* stream) const {
-  // @@protoc_insertion_point(serialize_to_array_start:io.deephaven.proto.backplane.script.grpc.MarkupContent)
-  ::uint32_t cached_has_bits = 0;
-  (void)cached_has_bits;
-
-  // string kind = 1;
-  if (!this->_internal_kind().empty()) {
-    const std::string& _s = this->_internal_kind();
-    ::google::protobuf::internal::WireFormatLite::VerifyUtf8String(
-        _s.data(), static_cast<int>(_s.length()), ::google::protobuf::internal::WireFormatLite::SERIALIZE, "io.deephaven.proto.backplane.script.grpc.MarkupContent.kind");
-    target = stream->WriteStringMaybeAliased(1, _s, target);
-  }
-
-  // string value = 2;
-  if (!this->_internal_value().empty()) {
-    const std::string& _s = this->_internal_value();
-    ::google::protobuf::internal::WireFormatLite::VerifyUtf8String(
-        _s.data(), static_cast<int>(_s.length()), ::google::protobuf::internal::WireFormatLite::SERIALIZE, "io.deephaven.proto.backplane.script.grpc.MarkupContent.value");
-    target = stream->WriteStringMaybeAliased(2, _s, target);
-  }
-
-  if (PROTOBUF_PREDICT_FALSE(_internal_metadata_.have_unknown_fields())) {
-    target =
-        ::_pbi::WireFormat::InternalSerializeUnknownFieldsToArray(
-            _internal_metadata_.unknown_fields<::google::protobuf::UnknownFieldSet>(::google::protobuf::UnknownFieldSet::default_instance), target, stream);
-  }
-  // @@protoc_insertion_point(serialize_to_array_end:io.deephaven.proto.backplane.script.grpc.MarkupContent)
-  return target;
-}
-
-::size_t MarkupContent::ByteSizeLong() const {
-// @@protoc_insertion_point(message_byte_size_start:io.deephaven.proto.backplane.script.grpc.MarkupContent)
-  ::size_t total_size = 0;
-
-  ::uint32_t cached_has_bits = 0;
-  // Prevent compiler warnings about cached_has_bits being unused
-  (void) cached_has_bits;
-
-  // string kind = 1;
-  if (!this->_internal_kind().empty()) {
-    total_size += 1 + ::google::protobuf::internal::WireFormatLite::StringSize(
-                                    this->_internal_kind());
-  }
-
-  // string value = 2;
-  if (!this->_internal_value().empty()) {
-    total_size += 1 + ::google::protobuf::internal::WireFormatLite::StringSize(
-                                    this->_internal_value());
-  }
-
-  return MaybeComputeUnknownFieldsSize(total_size, &_impl_._cached_size_);
-}
-
-const ::google::protobuf::Message::ClassData MarkupContent::_class_data_ = {
-    MarkupContent::MergeImpl,
-    nullptr,  // OnDemandRegisterArenaDtor
-};
-const ::google::protobuf::Message::ClassData* MarkupContent::GetClassData() const {
-  return &_class_data_;
-}
-
-void MarkupContent::MergeImpl(::google::protobuf::Message& to_msg, const ::google::protobuf::Message& from_msg) {
-  auto* const _this = static_cast<MarkupContent*>(&to_msg);
-  auto& from = static_cast<const MarkupContent&>(from_msg);
-  // @@protoc_insertion_point(class_specific_merge_from_start:io.deephaven.proto.backplane.script.grpc.MarkupContent)
-  ABSL_DCHECK_NE(&from, _this);
-  ::uint32_t cached_has_bits = 0;
-  (void) cached_has_bits;
-
-  if (!from._internal_kind().empty()) {
-    _this->_internal_set_kind(from._internal_kind());
-  }
-  if (!from._internal_value().empty()) {
-    _this->_internal_set_value(from._internal_value());
-  }
-  _this->_internal_metadata_.MergeFrom<::google::protobuf::UnknownFieldSet>(from._internal_metadata_);
-}
-
-void MarkupContent::CopyFrom(const MarkupContent& from) {
-// @@protoc_insertion_point(class_specific_copy_from_start:io.deephaven.proto.backplane.script.grpc.MarkupContent)
-  if (&from == this) return;
-  Clear();
-  MergeFrom(from);
-}
-
-PROTOBUF_NOINLINE bool MarkupContent::IsInitialized() const {
-  return true;
-}
-
-::_pbi::CachedSize* MarkupContent::AccessCachedSize() const {
-  return &_impl_._cached_size_;
-}
-void MarkupContent::InternalSwap(MarkupContent* PROTOBUF_RESTRICT other) {
-  using std::swap;
-  auto* arena = GetArena();
-  ABSL_DCHECK_EQ(arena, other->GetArena());
-  _internal_metadata_.InternalSwap(&other->_internal_metadata_);
-  ::_pbi::ArenaStringPtr::InternalSwap(&_impl_.kind_, &other->_impl_.kind_, arena);
-  ::_pbi::ArenaStringPtr::InternalSwap(&_impl_.value_, &other->_impl_.value_, arena);
-}
-
-::google::protobuf::Metadata MarkupContent::GetMetadata() const {
-  return ::_pbi::AssignDescriptors(
-      &descriptor_table_deephaven_2fproto_2fconsole_2eproto_getter, &descriptor_table_deephaven_2fproto_2fconsole_2eproto_once,
-      file_level_metadata_deephaven_2fproto_2fconsole_2eproto[27]);
-}
-// ===================================================================
-
-class GetCompletionItemsRequest::_Internal {
- public:
-  using HasBits = decltype(std::declval<GetCompletionItemsRequest>()._impl_._has_bits_);
-  static constexpr ::int32_t kHasBitsOffset =
-    8 * PROTOBUF_FIELD_OFFSET(GetCompletionItemsRequest, _impl_._has_bits_);
-  static const ::io::deephaven::proto::backplane::grpc::Ticket& console_id(const GetCompletionItemsRequest* msg);
-  static void set_has_console_id(HasBits* has_bits) {
-    (*has_bits)[0] |= 1u;
-  }
-  static const ::io::deephaven::proto::backplane::script::grpc::CompletionContext& context(const GetCompletionItemsRequest* msg);
-  static void set_has_context(HasBits* has_bits) {
-    (*has_bits)[0] |= 2u;
-  }
-  static const ::io::deephaven::proto::backplane::script::grpc::VersionedTextDocumentIdentifier& text_document(const GetCompletionItemsRequest* msg);
-  static void set_has_text_document(HasBits* has_bits) {
-    (*has_bits)[0] |= 4u;
-  }
-  static const ::io::deephaven::proto::backplane::script::grpc::Position& position(const GetCompletionItemsRequest* msg);
-  static void set_has_position(HasBits* has_bits) {
-    (*has_bits)[0] |= 8u;
-  }
-};
-
-const ::io::deephaven::proto::backplane::grpc::Ticket& GetCompletionItemsRequest::_Internal::console_id(const GetCompletionItemsRequest* msg) {
-  return *msg->_impl_.console_id_;
-}
-const ::io::deephaven::proto::backplane::script::grpc::CompletionContext& GetCompletionItemsRequest::_Internal::context(const GetCompletionItemsRequest* msg) {
-  return *msg->_impl_.context_;
-}
-const ::io::deephaven::proto::backplane::script::grpc::VersionedTextDocumentIdentifier& GetCompletionItemsRequest::_Internal::text_document(const GetCompletionItemsRequest* msg) {
-  return *msg->_impl_.text_document_;
-}
-const ::io::deephaven::proto::backplane::script::grpc::Position& GetCompletionItemsRequest::_Internal::position(const GetCompletionItemsRequest* msg) {
-  return *msg->_impl_.position_;
-}
-void GetCompletionItemsRequest::clear_console_id() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  if (_impl_.console_id_ != nullptr) _impl_.console_id_->Clear();
-  _impl_._has_bits_[0] &= ~0x00000001u;
-}
-GetCompletionItemsRequest::GetCompletionItemsRequest(::google::protobuf::Arena* arena)
-    : ::google::protobuf::Message(arena) {
-  SharedCtor(arena);
-  // @@protoc_insertion_point(arena_constructor:io.deephaven.proto.backplane.script.grpc.GetCompletionItemsRequest)
-}
-inline PROTOBUF_NDEBUG_INLINE GetCompletionItemsRequest::Impl_::Impl_(
-    ::google::protobuf::internal::InternalVisibility visibility, ::google::protobuf::Arena* arena,
-    const Impl_& from)
-      : _has_bits_{from._has_bits_},
-        _cached_size_{0} {}
-
-GetCompletionItemsRequest::GetCompletionItemsRequest(
-    ::google::protobuf::Arena* arena,
-    const GetCompletionItemsRequest& from)
-    : ::google::protobuf::Message(arena) {
-  GetCompletionItemsRequest* const _this = this;
-  (void)_this;
-  _internal_metadata_.MergeFrom<::google::protobuf::UnknownFieldSet>(
-      from._internal_metadata_);
-  new (&_impl_) Impl_(internal_visibility(), arena, from._impl_);
-  ::uint32_t cached_has_bits = _impl_._has_bits_[0];
-  _impl_.console_id_ = (cached_has_bits & 0x00000001u)
-                ? CreateMaybeMessage<::io::deephaven::proto::backplane::grpc::Ticket>(arena, *from._impl_.console_id_)
-                : nullptr;
-  _impl_.context_ = (cached_has_bits & 0x00000002u)
-                ? CreateMaybeMessage<::io::deephaven::proto::backplane::script::grpc::CompletionContext>(arena, *from._impl_.context_)
-                : nullptr;
-  _impl_.text_document_ = (cached_has_bits & 0x00000004u)
-                ? CreateMaybeMessage<::io::deephaven::proto::backplane::script::grpc::VersionedTextDocumentIdentifier>(arena, *from._impl_.text_document_)
-                : nullptr;
-  _impl_.position_ = (cached_has_bits & 0x00000008u)
-                ? CreateMaybeMessage<::io::deephaven::proto::backplane::script::grpc::Position>(arena, *from._impl_.position_)
-                : nullptr;
-  _impl_.request_id_ = from._impl_.request_id_;
-
-  // @@protoc_insertion_point(copy_constructor:io.deephaven.proto.backplane.script.grpc.GetCompletionItemsRequest)
-}
-inline PROTOBUF_NDEBUG_INLINE GetCompletionItemsRequest::Impl_::Impl_(
-    ::google::protobuf::internal::InternalVisibility visibility,
-    ::google::protobuf::Arena* arena)
-      : _cached_size_{0} {}
-
-inline void GetCompletionItemsRequest::SharedCtor(::_pb::Arena* arena) {
-  new (&_impl_) Impl_(internal_visibility(), arena);
-  ::memset(reinterpret_cast<char *>(&_impl_) +
-               offsetof(Impl_, console_id_),
-           0,
-           offsetof(Impl_, request_id_) -
-               offsetof(Impl_, console_id_) +
-               sizeof(Impl_::request_id_));
-}
-GetCompletionItemsRequest::~GetCompletionItemsRequest() {
-  // @@protoc_insertion_point(destructor:io.deephaven.proto.backplane.script.grpc.GetCompletionItemsRequest)
-  _internal_metadata_.Delete<::google::protobuf::UnknownFieldSet>();
-  SharedDtor();
-}
-inline void GetCompletionItemsRequest::SharedDtor() {
-  ABSL_DCHECK(GetArena() == nullptr);
-  delete _impl_.console_id_;
-  delete _impl_.context_;
-  delete _impl_.text_document_;
-  delete _impl_.position_;
-  _impl_.~Impl_();
-}
-
-PROTOBUF_NOINLINE void GetCompletionItemsRequest::Clear() {
-// @@protoc_insertion_point(message_clear_start:io.deephaven.proto.backplane.script.grpc.GetCompletionItemsRequest)
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  ::uint32_t cached_has_bits = 0;
-  // Prevent compiler warnings about cached_has_bits being unused
-  (void) cached_has_bits;
-
-  cached_has_bits = _impl_._has_bits_[0];
-  if (cached_has_bits & 0x0000000fu) {
-    if (cached_has_bits & 0x00000001u) {
-      ABSL_DCHECK(_impl_.console_id_ != nullptr);
-      _impl_.console_id_->Clear();
-    }
-    if (cached_has_bits & 0x00000002u) {
-      ABSL_DCHECK(_impl_.context_ != nullptr);
-      _impl_.context_->Clear();
-    }
-    if (cached_has_bits & 0x00000004u) {
-      ABSL_DCHECK(_impl_.text_document_ != nullptr);
-      _impl_.text_document_->Clear();
-    }
-    if (cached_has_bits & 0x00000008u) {
-      ABSL_DCHECK(_impl_.position_ != nullptr);
-      _impl_.position_->Clear();
-    }
-  }
-  _impl_.request_id_ = 0;
-  _impl_._has_bits_.Clear();
-  _internal_metadata_.Clear<::google::protobuf::UnknownFieldSet>();
-}
-
-const char* GetCompletionItemsRequest::_InternalParse(
-    const char* ptr, ::_pbi::ParseContext* ctx) {
-  ptr = ::_pbi::TcParser::ParseLoop(this, ptr, ctx, &_table_.header);
-  return ptr;
-}
-
-
-PROTOBUF_CONSTINIT PROTOBUF_ATTRIBUTE_INIT_PRIORITY1
-const ::_pbi::TcParseTable<3, 5, 4, 0, 2> GetCompletionItemsRequest::_table_ = {
-  {
-    PROTOBUF_FIELD_OFFSET(GetCompletionItemsRequest, _impl_._has_bits_),
-    0, // no _extensions_
-    5, 56,  // max_field_number, fast_idx_mask
-    offsetof(decltype(_table_), field_lookup_table),
-    4294967264,  // skipmap
-    offsetof(decltype(_table_), field_entries),
-    5,  // num_field_entries
-    4,  // num_aux_entries
-    offsetof(decltype(_table_), aux_entries),
-    &_GetCompletionItemsRequest_default_instance_._instance,
-    ::_pbi::TcParser::GenericFallback,  // fallback
-  }, {{
-    {::_pbi::TcParser::MiniParse, {}},
-    // .io.deephaven.proto.backplane.grpc.Ticket console_id = 1 [deprecated = true];
-    {::_pbi::TcParser::FastMtS1,
-     {10, 0, 0, PROTOBUF_FIELD_OFFSET(GetCompletionItemsRequest, _impl_.console_id_)}},
-    // .io.deephaven.proto.backplane.script.grpc.CompletionContext context = 2;
-    {::_pbi::TcParser::FastMtS1,
-     {18, 1, 1, PROTOBUF_FIELD_OFFSET(GetCompletionItemsRequest, _impl_.context_)}},
-    // .io.deephaven.proto.backplane.script.grpc.VersionedTextDocumentIdentifier text_document = 3;
-    {::_pbi::TcParser::FastMtS1,
-     {26, 2, 2, PROTOBUF_FIELD_OFFSET(GetCompletionItemsRequest, _impl_.text_document_)}},
-    // .io.deephaven.proto.backplane.script.grpc.Position position = 4;
-    {::_pbi::TcParser::FastMtS1,
-     {34, 3, 3, PROTOBUF_FIELD_OFFSET(GetCompletionItemsRequest, _impl_.position_)}},
-    // int32 request_id = 5 [deprecated = true];
-    {::_pbi::TcParser::SingularVarintNoZag1<::uint32_t, offsetof(GetCompletionItemsRequest, _impl_.request_id_), 63>(),
-     {40, 63, 0, PROTOBUF_FIELD_OFFSET(GetCompletionItemsRequest, _impl_.request_id_)}},
-    {::_pbi::TcParser::MiniParse, {}},
-    {::_pbi::TcParser::MiniParse, {}},
-  }}, {{
-    65535, 65535
-  }}, {{
-    // .io.deephaven.proto.backplane.grpc.Ticket console_id = 1 [deprecated = true];
-    {PROTOBUF_FIELD_OFFSET(GetCompletionItemsRequest, _impl_.console_id_), _Internal::kHasBitsOffset + 0, 0,
-    (0 | ::_fl::kFcOptional | ::_fl::kMessage | ::_fl::kTvTable)},
-    // .io.deephaven.proto.backplane.script.grpc.CompletionContext context = 2;
-    {PROTOBUF_FIELD_OFFSET(GetCompletionItemsRequest, _impl_.context_), _Internal::kHasBitsOffset + 1, 1,
-    (0 | ::_fl::kFcOptional | ::_fl::kMessage | ::_fl::kTvTable)},
-    // .io.deephaven.proto.backplane.script.grpc.VersionedTextDocumentIdentifier text_document = 3;
-    {PROTOBUF_FIELD_OFFSET(GetCompletionItemsRequest, _impl_.text_document_), _Internal::kHasBitsOffset + 2, 2,
-    (0 | ::_fl::kFcOptional | ::_fl::kMessage | ::_fl::kTvTable)},
-    // .io.deephaven.proto.backplane.script.grpc.Position position = 4;
-    {PROTOBUF_FIELD_OFFSET(GetCompletionItemsRequest, _impl_.position_), _Internal::kHasBitsOffset + 3, 3,
-    (0 | ::_fl::kFcOptional | ::_fl::kMessage | ::_fl::kTvTable)},
-    // int32 request_id = 5 [deprecated = true];
-    {PROTOBUF_FIELD_OFFSET(GetCompletionItemsRequest, _impl_.request_id_), -1, 0,
-    (0 | ::_fl::kFcSingular | ::_fl::kInt32)},
-  }}, {{
-    {::_pbi::TcParser::GetTable<::io::deephaven::proto::backplane::grpc::Ticket>()},
-    {::_pbi::TcParser::GetTable<::io::deephaven::proto::backplane::script::grpc::CompletionContext>()},
-    {::_pbi::TcParser::GetTable<::io::deephaven::proto::backplane::script::grpc::VersionedTextDocumentIdentifier>()},
-    {::_pbi::TcParser::GetTable<::io::deephaven::proto::backplane::script::grpc::Position>()},
-  }}, {{
-  }},
-};
-
-::uint8_t* GetCompletionItemsRequest::_InternalSerialize(
-    ::uint8_t* target,
-    ::google::protobuf::io::EpsCopyOutputStream* stream) const {
-  // @@protoc_insertion_point(serialize_to_array_start:io.deephaven.proto.backplane.script.grpc.GetCompletionItemsRequest)
-  ::uint32_t cached_has_bits = 0;
-  (void)cached_has_bits;
-
-  cached_has_bits = _impl_._has_bits_[0];
-  // .io.deephaven.proto.backplane.grpc.Ticket console_id = 1 [deprecated = true];
-  if (cached_has_bits & 0x00000001u) {
-    target = ::google::protobuf::internal::WireFormatLite::InternalWriteMessage(
-        1, _Internal::console_id(this),
-        _Internal::console_id(this).GetCachedSize(), target, stream);
-  }
-
-  // .io.deephaven.proto.backplane.script.grpc.CompletionContext context = 2;
-  if (cached_has_bits & 0x00000002u) {
-    target = ::google::protobuf::internal::WireFormatLite::InternalWriteMessage(
-        2, _Internal::context(this),
-        _Internal::context(this).GetCachedSize(), target, stream);
-  }
-
-  // .io.deephaven.proto.backplane.script.grpc.VersionedTextDocumentIdentifier text_document = 3;
-  if (cached_has_bits & 0x00000004u) {
-    target = ::google::protobuf::internal::WireFormatLite::InternalWriteMessage(
-        3, _Internal::text_document(this),
-        _Internal::text_document(this).GetCachedSize(), target, stream);
-  }
-
-  // .io.deephaven.proto.backplane.script.grpc.Position position = 4;
-  if (cached_has_bits & 0x00000008u) {
-    target = ::google::protobuf::internal::WireFormatLite::InternalWriteMessage(
-        4, _Internal::position(this),
-        _Internal::position(this).GetCachedSize(), target, stream);
-  }
-
-  // int32 request_id = 5 [deprecated = true];
-  if (this->_internal_request_id() != 0) {
-    target = ::google::protobuf::internal::WireFormatLite::
-        WriteInt32ToArrayWithField<5>(
-            stream, this->_internal_request_id(), target);
-  }
-
-  if (PROTOBUF_PREDICT_FALSE(_internal_metadata_.have_unknown_fields())) {
-    target =
-        ::_pbi::WireFormat::InternalSerializeUnknownFieldsToArray(
-            _internal_metadata_.unknown_fields<::google::protobuf::UnknownFieldSet>(::google::protobuf::UnknownFieldSet::default_instance), target, stream);
-  }
-  // @@protoc_insertion_point(serialize_to_array_end:io.deephaven.proto.backplane.script.grpc.GetCompletionItemsRequest)
-  return target;
-}
-
-::size_t GetCompletionItemsRequest::ByteSizeLong() const {
-// @@protoc_insertion_point(message_byte_size_start:io.deephaven.proto.backplane.script.grpc.GetCompletionItemsRequest)
-  ::size_t total_size = 0;
-
-  ::uint32_t cached_has_bits = 0;
-  // Prevent compiler warnings about cached_has_bits being unused
-  (void) cached_has_bits;
-
-  cached_has_bits = _impl_._has_bits_[0];
-  if (cached_has_bits & 0x0000000fu) {
-    // .io.deephaven.proto.backplane.grpc.Ticket console_id = 1 [deprecated = true];
-    if (cached_has_bits & 0x00000001u) {
-      total_size +=
-          1 + ::google::protobuf::internal::WireFormatLite::MessageSize(*_impl_.console_id_);
-    }
-
-    // .io.deephaven.proto.backplane.script.grpc.CompletionContext context = 2;
-    if (cached_has_bits & 0x00000002u) {
-      total_size +=
-          1 + ::google::protobuf::internal::WireFormatLite::MessageSize(*_impl_.context_);
-    }
-
-    // .io.deephaven.proto.backplane.script.grpc.VersionedTextDocumentIdentifier text_document = 3;
-    if (cached_has_bits & 0x00000004u) {
-      total_size +=
-          1 + ::google::protobuf::internal::WireFormatLite::MessageSize(*_impl_.text_document_);
-    }
-
-    // .io.deephaven.proto.backplane.script.grpc.Position position = 4;
-    if (cached_has_bits & 0x00000008u) {
-      total_size +=
-          1 + ::google::protobuf::internal::WireFormatLite::MessageSize(*_impl_.position_);
-    }
-
-  }
-  // int32 request_id = 5 [deprecated = true];
-  if (this->_internal_request_id() != 0) {
-    total_size += ::_pbi::WireFormatLite::Int32SizePlusOne(
-        this->_internal_request_id());
-  }
-
-  return MaybeComputeUnknownFieldsSize(total_size, &_impl_._cached_size_);
-}
-
-const ::google::protobuf::Message::ClassData GetCompletionItemsRequest::_class_data_ = {
-    GetCompletionItemsRequest::MergeImpl,
-    nullptr,  // OnDemandRegisterArenaDtor
-};
-const ::google::protobuf::Message::ClassData* GetCompletionItemsRequest::GetClassData() const {
-  return &_class_data_;
-}
-
-void GetCompletionItemsRequest::MergeImpl(::google::protobuf::Message& to_msg, const ::google::protobuf::Message& from_msg) {
-  auto* const _this = static_cast<GetCompletionItemsRequest*>(&to_msg);
-  auto& from = static_cast<const GetCompletionItemsRequest&>(from_msg);
-  // @@protoc_insertion_point(class_specific_merge_from_start:io.deephaven.proto.backplane.script.grpc.GetCompletionItemsRequest)
-  ABSL_DCHECK_NE(&from, _this);
-  ::uint32_t cached_has_bits = 0;
-  (void) cached_has_bits;
-
-  cached_has_bits = from._impl_._has_bits_[0];
-  if (cached_has_bits & 0x0000000fu) {
-    if (cached_has_bits & 0x00000001u) {
-      _this->_internal_mutable_console_id()->::io::deephaven::proto::backplane::grpc::Ticket::MergeFrom(
-          from._internal_console_id());
-    }
-    if (cached_has_bits & 0x00000002u) {
-      _this->_internal_mutable_context()->::io::deephaven::proto::backplane::script::grpc::CompletionContext::MergeFrom(
-          from._internal_context());
-    }
-    if (cached_has_bits & 0x00000004u) {
-      _this->_internal_mutable_text_document()->::io::deephaven::proto::backplane::script::grpc::VersionedTextDocumentIdentifier::MergeFrom(
-          from._internal_text_document());
-    }
-    if (cached_has_bits & 0x00000008u) {
-      _this->_internal_mutable_position()->::io::deephaven::proto::backplane::script::grpc::Position::MergeFrom(
-          from._internal_position());
-    }
-  }
-  if (from._internal_request_id() != 0) {
-    _this->_internal_set_request_id(from._internal_request_id());
-  }
-  _this->_internal_metadata_.MergeFrom<::google::protobuf::UnknownFieldSet>(from._internal_metadata_);
-}
-
-void GetCompletionItemsRequest::CopyFrom(const GetCompletionItemsRequest& from) {
-// @@protoc_insertion_point(class_specific_copy_from_start:io.deephaven.proto.backplane.script.grpc.GetCompletionItemsRequest)
-  if (&from == this) return;
-  Clear();
-  MergeFrom(from);
-}
-
-PROTOBUF_NOINLINE bool GetCompletionItemsRequest::IsInitialized() const {
-  return true;
-}
-
-::_pbi::CachedSize* GetCompletionItemsRequest::AccessCachedSize() const {
-  return &_impl_._cached_size_;
-}
-void GetCompletionItemsRequest::InternalSwap(GetCompletionItemsRequest* PROTOBUF_RESTRICT other) {
-  using std::swap;
-  _internal_metadata_.InternalSwap(&other->_internal_metadata_);
-  swap(_impl_._has_bits_[0], other->_impl_._has_bits_[0]);
-  ::google::protobuf::internal::memswap<
-      PROTOBUF_FIELD_OFFSET(GetCompletionItemsRequest, _impl_.request_id_)
-      + sizeof(GetCompletionItemsRequest::_impl_.request_id_)
-      - PROTOBUF_FIELD_OFFSET(GetCompletionItemsRequest, _impl_.console_id_)>(
-          reinterpret_cast<char*>(&_impl_.console_id_),
-          reinterpret_cast<char*>(&other->_impl_.console_id_));
-}
-
-::google::protobuf::Metadata GetCompletionItemsRequest::GetMetadata() const {
-  return ::_pbi::AssignDescriptors(
-      &descriptor_table_deephaven_2fproto_2fconsole_2eproto_getter, &descriptor_table_deephaven_2fproto_2fconsole_2eproto_once,
-      file_level_metadata_deephaven_2fproto_2fconsole_2eproto[28]);
-}
-// ===================================================================
-
-class CompletionContext::_Internal {
- public:
-};
-
-CompletionContext::CompletionContext(::google::protobuf::Arena* arena)
-    : ::google::protobuf::Message(arena) {
-  SharedCtor(arena);
-  // @@protoc_insertion_point(arena_constructor:io.deephaven.proto.backplane.script.grpc.CompletionContext)
-}
-inline PROTOBUF_NDEBUG_INLINE CompletionContext::Impl_::Impl_(
-    ::google::protobuf::internal::InternalVisibility visibility, ::google::protobuf::Arena* arena,
-    const Impl_& from)
-      : trigger_character_(arena, from.trigger_character_),
-        _cached_size_{0} {}
-
-CompletionContext::CompletionContext(
-    ::google::protobuf::Arena* arena,
-    const CompletionContext& from)
-    : ::google::protobuf::Message(arena) {
-  CompletionContext* const _this = this;
-  (void)_this;
-  _internal_metadata_.MergeFrom<::google::protobuf::UnknownFieldSet>(
-      from._internal_metadata_);
-  new (&_impl_) Impl_(internal_visibility(), arena, from._impl_);
-  _impl_.trigger_kind_ = from._impl_.trigger_kind_;
-
-  // @@protoc_insertion_point(copy_constructor:io.deephaven.proto.backplane.script.grpc.CompletionContext)
-}
-inline PROTOBUF_NDEBUG_INLINE CompletionContext::Impl_::Impl_(
-    ::google::protobuf::internal::InternalVisibility visibility,
-    ::google::protobuf::Arena* arena)
-      : trigger_character_(arena),
-        _cached_size_{0} {}
-
-inline void CompletionContext::SharedCtor(::_pb::Arena* arena) {
-  new (&_impl_) Impl_(internal_visibility(), arena);
-  _impl_.trigger_kind_ = {};
-}
-CompletionContext::~CompletionContext() {
-  // @@protoc_insertion_point(destructor:io.deephaven.proto.backplane.script.grpc.CompletionContext)
-  _internal_metadata_.Delete<::google::protobuf::UnknownFieldSet>();
-  SharedDtor();
-}
-inline void CompletionContext::SharedDtor() {
-  ABSL_DCHECK(GetArena() == nullptr);
-  _impl_.trigger_character_.Destroy();
-  _impl_.~Impl_();
-}
-
-PROTOBUF_NOINLINE void CompletionContext::Clear() {
-// @@protoc_insertion_point(message_clear_start:io.deephaven.proto.backplane.script.grpc.CompletionContext)
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  ::uint32_t cached_has_bits = 0;
-  // Prevent compiler warnings about cached_has_bits being unused
-  (void) cached_has_bits;
-
-  _impl_.trigger_character_.ClearToEmpty();
-  _impl_.trigger_kind_ = 0;
-  _internal_metadata_.Clear<::google::protobuf::UnknownFieldSet>();
-}
-
-const char* CompletionContext::_InternalParse(
-    const char* ptr, ::_pbi::ParseContext* ctx) {
-  ptr = ::_pbi::TcParser::ParseLoop(this, ptr, ctx, &_table_.header);
-  return ptr;
-}
-
-
-PROTOBUF_CONSTINIT PROTOBUF_ATTRIBUTE_INIT_PRIORITY1
-const ::_pbi::TcParseTable<1, 2, 0, 84, 2> CompletionContext::_table_ = {
-  {
-    0,  // no _has_bits_
-    0, // no _extensions_
-    2, 8,  // max_field_number, fast_idx_mask
-    offsetof(decltype(_table_), field_lookup_table),
-    4294967292,  // skipmap
-    offsetof(decltype(_table_), field_entries),
-    2,  // num_field_entries
-    0,  // num_aux_entries
-    offsetof(decltype(_table_), field_names),  // no aux_entries
-    &_CompletionContext_default_instance_._instance,
-    ::_pbi::TcParser::GenericFallback,  // fallback
-  }, {{
-    // string trigger_character = 2;
-    {::_pbi::TcParser::FastUS1,
-     {18, 63, 0, PROTOBUF_FIELD_OFFSET(CompletionContext, _impl_.trigger_character_)}},
-    // int32 trigger_kind = 1;
-    {::_pbi::TcParser::SingularVarintNoZag1<::uint32_t, offsetof(CompletionContext, _impl_.trigger_kind_), 63>(),
-     {8, 63, 0, PROTOBUF_FIELD_OFFSET(CompletionContext, _impl_.trigger_kind_)}},
-  }}, {{
-    65535, 65535
-  }}, {{
-    // int32 trigger_kind = 1;
-    {PROTOBUF_FIELD_OFFSET(CompletionContext, _impl_.trigger_kind_), 0, 0,
-    (0 | ::_fl::kFcSingular | ::_fl::kInt32)},
-    // string trigger_character = 2;
-    {PROTOBUF_FIELD_OFFSET(CompletionContext, _impl_.trigger_character_), 0, 0,
-    (0 | ::_fl::kFcSingular | ::_fl::kUtf8String | ::_fl::kRepAString)},
-  }},
-  // no aux_entries
-  {{
-    "\72\0\21\0\0\0\0\0"
-    "io.deephaven.proto.backplane.script.grpc.CompletionContext"
-    "trigger_character"
-  }},
-};
-
-::uint8_t* CompletionContext::_InternalSerialize(
-    ::uint8_t* target,
-    ::google::protobuf::io::EpsCopyOutputStream* stream) const {
-  // @@protoc_insertion_point(serialize_to_array_start:io.deephaven.proto.backplane.script.grpc.CompletionContext)
-  ::uint32_t cached_has_bits = 0;
-  (void)cached_has_bits;
-
-  // int32 trigger_kind = 1;
-  if (this->_internal_trigger_kind() != 0) {
-    target = ::google::protobuf::internal::WireFormatLite::
-        WriteInt32ToArrayWithField<1>(
-            stream, this->_internal_trigger_kind(), target);
-  }
-
-  // string trigger_character = 2;
-  if (!this->_internal_trigger_character().empty()) {
-    const std::string& _s = this->_internal_trigger_character();
-    ::google::protobuf::internal::WireFormatLite::VerifyUtf8String(
-        _s.data(), static_cast<int>(_s.length()), ::google::protobuf::internal::WireFormatLite::SERIALIZE, "io.deephaven.proto.backplane.script.grpc.CompletionContext.trigger_character");
-    target = stream->WriteStringMaybeAliased(2, _s, target);
-  }
-
-  if (PROTOBUF_PREDICT_FALSE(_internal_metadata_.have_unknown_fields())) {
-    target =
-        ::_pbi::WireFormat::InternalSerializeUnknownFieldsToArray(
-            _internal_metadata_.unknown_fields<::google::protobuf::UnknownFieldSet>(::google::protobuf::UnknownFieldSet::default_instance), target, stream);
-  }
-  // @@protoc_insertion_point(serialize_to_array_end:io.deephaven.proto.backplane.script.grpc.CompletionContext)
-  return target;
-}
-
-::size_t CompletionContext::ByteSizeLong() const {
-// @@protoc_insertion_point(message_byte_size_start:io.deephaven.proto.backplane.script.grpc.CompletionContext)
-  ::size_t total_size = 0;
-
-  ::uint32_t cached_has_bits = 0;
-  // Prevent compiler warnings about cached_has_bits being unused
-  (void) cached_has_bits;
-
-  // string trigger_character = 2;
-  if (!this->_internal_trigger_character().empty()) {
-    total_size += 1 + ::google::protobuf::internal::WireFormatLite::StringSize(
-                                    this->_internal_trigger_character());
-  }
-
-  // int32 trigger_kind = 1;
-  if (this->_internal_trigger_kind() != 0) {
-    total_size += ::_pbi::WireFormatLite::Int32SizePlusOne(
-        this->_internal_trigger_kind());
-  }
-
-  return MaybeComputeUnknownFieldsSize(total_size, &_impl_._cached_size_);
-}
-
-const ::google::protobuf::Message::ClassData CompletionContext::_class_data_ = {
-    CompletionContext::MergeImpl,
-    nullptr,  // OnDemandRegisterArenaDtor
-};
-const ::google::protobuf::Message::ClassData* CompletionContext::GetClassData() const {
-  return &_class_data_;
-}
-
-void CompletionContext::MergeImpl(::google::protobuf::Message& to_msg, const ::google::protobuf::Message& from_msg) {
-  auto* const _this = static_cast<CompletionContext*>(&to_msg);
-  auto& from = static_cast<const CompletionContext&>(from_msg);
-  // @@protoc_insertion_point(class_specific_merge_from_start:io.deephaven.proto.backplane.script.grpc.CompletionContext)
-  ABSL_DCHECK_NE(&from, _this);
-  ::uint32_t cached_has_bits = 0;
-  (void) cached_has_bits;
-
-  if (!from._internal_trigger_character().empty()) {
-    _this->_internal_set_trigger_character(from._internal_trigger_character());
-  }
-  if (from._internal_trigger_kind() != 0) {
-    _this->_internal_set_trigger_kind(from._internal_trigger_kind());
-  }
-  _this->_internal_metadata_.MergeFrom<::google::protobuf::UnknownFieldSet>(from._internal_metadata_);
-}
-
-void CompletionContext::CopyFrom(const CompletionContext& from) {
-// @@protoc_insertion_point(class_specific_copy_from_start:io.deephaven.proto.backplane.script.grpc.CompletionContext)
-  if (&from == this) return;
-  Clear();
-  MergeFrom(from);
-}
-
-PROTOBUF_NOINLINE bool CompletionContext::IsInitialized() const {
-  return true;
-}
-
-::_pbi::CachedSize* CompletionContext::AccessCachedSize() const {
-  return &_impl_._cached_size_;
-}
-void CompletionContext::InternalSwap(CompletionContext* PROTOBUF_RESTRICT other) {
-  using std::swap;
-  auto* arena = GetArena();
-  ABSL_DCHECK_EQ(arena, other->GetArena());
-  _internal_metadata_.InternalSwap(&other->_internal_metadata_);
-  ::_pbi::ArenaStringPtr::InternalSwap(&_impl_.trigger_character_, &other->_impl_.trigger_character_, arena);
-        swap(_impl_.trigger_kind_, other->_impl_.trigger_kind_);
-}
-
-::google::protobuf::Metadata CompletionContext::GetMetadata() const {
-  return ::_pbi::AssignDescriptors(
-      &descriptor_table_deephaven_2fproto_2fconsole_2eproto_getter, &descriptor_table_deephaven_2fproto_2fconsole_2eproto_once,
-      file_level_metadata_deephaven_2fproto_2fconsole_2eproto[29]);
-}
-// ===================================================================
-
-class GetCompletionItemsResponse::_Internal {
- public:
-};
-
-GetCompletionItemsResponse::GetCompletionItemsResponse(::google::protobuf::Arena* arena)
-    : ::google::protobuf::Message(arena) {
-  SharedCtor(arena);
-  // @@protoc_insertion_point(arena_constructor:io.deephaven.proto.backplane.script.grpc.GetCompletionItemsResponse)
-}
-inline PROTOBUF_NDEBUG_INLINE GetCompletionItemsResponse::Impl_::Impl_(
-    ::google::protobuf::internal::InternalVisibility visibility, ::google::protobuf::Arena* arena,
-    const Impl_& from)
-      : items_{visibility, arena, from.items_},
-        _cached_size_{0} {}
-
-GetCompletionItemsResponse::GetCompletionItemsResponse(
-    ::google::protobuf::Arena* arena,
-    const GetCompletionItemsResponse& from)
-    : ::google::protobuf::Message(arena) {
-  GetCompletionItemsResponse* const _this = this;
-  (void)_this;
-  _internal_metadata_.MergeFrom<::google::protobuf::UnknownFieldSet>(
-      from._internal_metadata_);
-  new (&_impl_) Impl_(internal_visibility(), arena, from._impl_);
-  ::memcpy(reinterpret_cast<char *>(&_impl_) +
-               offsetof(Impl_, request_id_),
-           reinterpret_cast<const char *>(&from._impl_) +
-               offsetof(Impl_, request_id_),
-           offsetof(Impl_, success_) -
-               offsetof(Impl_, request_id_) +
-               sizeof(Impl_::success_));
-
-  // @@protoc_insertion_point(copy_constructor:io.deephaven.proto.backplane.script.grpc.GetCompletionItemsResponse)
-}
-inline PROTOBUF_NDEBUG_INLINE GetCompletionItemsResponse::Impl_::Impl_(
-    ::google::protobuf::internal::InternalVisibility visibility,
-    ::google::protobuf::Arena* arena)
-      : items_{visibility, arena},
-        _cached_size_{0} {}
-
-inline void GetCompletionItemsResponse::SharedCtor(::_pb::Arena* arena) {
-  new (&_impl_) Impl_(internal_visibility(), arena);
-  ::memset(reinterpret_cast<char *>(&_impl_) +
-               offsetof(Impl_, request_id_),
-           0,
-           offsetof(Impl_, success_) -
-               offsetof(Impl_, request_id_) +
-               sizeof(Impl_::success_));
-}
-GetCompletionItemsResponse::~GetCompletionItemsResponse() {
-  // @@protoc_insertion_point(destructor:io.deephaven.proto.backplane.script.grpc.GetCompletionItemsResponse)
-  _internal_metadata_.Delete<::google::protobuf::UnknownFieldSet>();
-  SharedDtor();
-}
-inline void GetCompletionItemsResponse::SharedDtor() {
-  ABSL_DCHECK(GetArena() == nullptr);
-  _impl_.~Impl_();
-}
-
-PROTOBUF_NOINLINE void GetCompletionItemsResponse::Clear() {
-// @@protoc_insertion_point(message_clear_start:io.deephaven.proto.backplane.script.grpc.GetCompletionItemsResponse)
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  ::uint32_t cached_has_bits = 0;
-  // Prevent compiler warnings about cached_has_bits being unused
-  (void) cached_has_bits;
-
-  _impl_.items_.Clear();
-  ::memset(&_impl_.request_id_, 0, static_cast<::size_t>(
-      reinterpret_cast<char*>(&_impl_.success_) -
-      reinterpret_cast<char*>(&_impl_.request_id_)) + sizeof(_impl_.success_));
-  _internal_metadata_.Clear<::google::protobuf::UnknownFieldSet>();
-}
-
-const char* GetCompletionItemsResponse::_InternalParse(
-    const char* ptr, ::_pbi::ParseContext* ctx) {
-  ptr = ::_pbi::TcParser::ParseLoop(this, ptr, ctx, &_table_.header);
-  return ptr;
-}
-
-
-PROTOBUF_CONSTINIT PROTOBUF_ATTRIBUTE_INIT_PRIORITY1
-const ::_pbi::TcParseTable<2, 3, 1, 0, 2> GetCompletionItemsResponse::_table_ = {
-  {
-    0,  // no _has_bits_
-    0, // no _extensions_
-    3, 24,  // max_field_number, fast_idx_mask
-    offsetof(decltype(_table_), field_lookup_table),
-    4294967288,  // skipmap
-    offsetof(decltype(_table_), field_entries),
-    3,  // num_field_entries
-    1,  // num_aux_entries
-    offsetof(decltype(_table_), aux_entries),
-    &_GetCompletionItemsResponse_default_instance_._instance,
-    ::_pbi::TcParser::GenericFallback,  // fallback
-  }, {{
-    {::_pbi::TcParser::MiniParse, {}},
-    // repeated .io.deephaven.proto.backplane.script.grpc.CompletionItem items = 1;
-    {::_pbi::TcParser::FastMtR1,
-     {10, 63, 0, PROTOBUF_FIELD_OFFSET(GetCompletionItemsResponse, _impl_.items_)}},
-    // int32 request_id = 2 [deprecated = true];
-    {::_pbi::TcParser::SingularVarintNoZag1<::uint32_t, offsetof(GetCompletionItemsResponse, _impl_.request_id_), 63>(),
-     {16, 63, 0, PROTOBUF_FIELD_OFFSET(GetCompletionItemsResponse, _impl_.request_id_)}},
-    // bool success = 3 [deprecated = true];
-    {::_pbi::TcParser::SingularVarintNoZag1<bool, offsetof(GetCompletionItemsResponse, _impl_.success_), 63>(),
-     {24, 63, 0, PROTOBUF_FIELD_OFFSET(GetCompletionItemsResponse, _impl_.success_)}},
-  }}, {{
-    65535, 65535
-  }}, {{
-    // repeated .io.deephaven.proto.backplane.script.grpc.CompletionItem items = 1;
-    {PROTOBUF_FIELD_OFFSET(GetCompletionItemsResponse, _impl_.items_), 0, 0,
-    (0 | ::_fl::kFcRepeated | ::_fl::kMessage | ::_fl::kTvTable)},
-    // int32 request_id = 2 [deprecated = true];
-    {PROTOBUF_FIELD_OFFSET(GetCompletionItemsResponse, _impl_.request_id_), 0, 0,
-    (0 | ::_fl::kFcSingular | ::_fl::kInt32)},
-    // bool success = 3 [deprecated = true];
-    {PROTOBUF_FIELD_OFFSET(GetCompletionItemsResponse, _impl_.success_), 0, 0,
-    (0 | ::_fl::kFcSingular | ::_fl::kBool)},
-  }}, {{
-    {::_pbi::TcParser::GetTable<::io::deephaven::proto::backplane::script::grpc::CompletionItem>()},
-  }}, {{
-  }},
-};
-
-::uint8_t* GetCompletionItemsResponse::_InternalSerialize(
-    ::uint8_t* target,
-    ::google::protobuf::io::EpsCopyOutputStream* stream) const {
-  // @@protoc_insertion_point(serialize_to_array_start:io.deephaven.proto.backplane.script.grpc.GetCompletionItemsResponse)
-  ::uint32_t cached_has_bits = 0;
-  (void)cached_has_bits;
-
-  // repeated .io.deephaven.proto.backplane.script.grpc.CompletionItem items = 1;
-  for (unsigned i = 0,
-      n = static_cast<unsigned>(this->_internal_items_size()); i < n; i++) {
-    const auto& repfield = this->_internal_items().Get(i);
-    target = ::google::protobuf::internal::WireFormatLite::
-        InternalWriteMessage(1, repfield, repfield.GetCachedSize(), target, stream);
-  }
-
-  // int32 request_id = 2 [deprecated = true];
-  if (this->_internal_request_id() != 0) {
-    target = ::google::protobuf::internal::WireFormatLite::
-        WriteInt32ToArrayWithField<2>(
-            stream, this->_internal_request_id(), target);
-  }
-
-  // bool success = 3 [deprecated = true];
-  if (this->_internal_success() != 0) {
-    target = stream->EnsureSpace(target);
-    target = ::_pbi::WireFormatLite::WriteBoolToArray(
-        3, this->_internal_success(), target);
-  }
-
-  if (PROTOBUF_PREDICT_FALSE(_internal_metadata_.have_unknown_fields())) {
-    target =
-        ::_pbi::WireFormat::InternalSerializeUnknownFieldsToArray(
-            _internal_metadata_.unknown_fields<::google::protobuf::UnknownFieldSet>(::google::protobuf::UnknownFieldSet::default_instance), target, stream);
-  }
-  // @@protoc_insertion_point(serialize_to_array_end:io.deephaven.proto.backplane.script.grpc.GetCompletionItemsResponse)
-  return target;
-}
-
-::size_t GetCompletionItemsResponse::ByteSizeLong() const {
-// @@protoc_insertion_point(message_byte_size_start:io.deephaven.proto.backplane.script.grpc.GetCompletionItemsResponse)
-  ::size_t total_size = 0;
-
-  ::uint32_t cached_has_bits = 0;
-  // Prevent compiler warnings about cached_has_bits being unused
-  (void) cached_has_bits;
-
-  // repeated .io.deephaven.proto.backplane.script.grpc.CompletionItem items = 1;
-  total_size += 1UL * this->_internal_items_size();
-  for (const auto& msg : this->_internal_items()) {
-    total_size +=
-      ::google::protobuf::internal::WireFormatLite::MessageSize(msg);
-  }
-  // int32 request_id = 2 [deprecated = true];
-  if (this->_internal_request_id() != 0) {
-    total_size += ::_pbi::WireFormatLite::Int32SizePlusOne(
-        this->_internal_request_id());
-  }
-
-  // bool success = 3 [deprecated = true];
-  if (this->_internal_success() != 0) {
-    total_size += 2;
-  }
-
-  return MaybeComputeUnknownFieldsSize(total_size, &_impl_._cached_size_);
-}
-
-const ::google::protobuf::Message::ClassData GetCompletionItemsResponse::_class_data_ = {
-    GetCompletionItemsResponse::MergeImpl,
-    nullptr,  // OnDemandRegisterArenaDtor
-};
-const ::google::protobuf::Message::ClassData* GetCompletionItemsResponse::GetClassData() const {
-  return &_class_data_;
-}
-
-void GetCompletionItemsResponse::MergeImpl(::google::protobuf::Message& to_msg, const ::google::protobuf::Message& from_msg) {
-  auto* const _this = static_cast<GetCompletionItemsResponse*>(&to_msg);
-  auto& from = static_cast<const GetCompletionItemsResponse&>(from_msg);
-  // @@protoc_insertion_point(class_specific_merge_from_start:io.deephaven.proto.backplane.script.grpc.GetCompletionItemsResponse)
-  ABSL_DCHECK_NE(&from, _this);
-  ::uint32_t cached_has_bits = 0;
-  (void) cached_has_bits;
-
-  _this->_internal_mutable_items()->MergeFrom(
-      from._internal_items());
-  if (from._internal_request_id() != 0) {
-    _this->_internal_set_request_id(from._internal_request_id());
-  }
-  if (from._internal_success() != 0) {
-    _this->_internal_set_success(from._internal_success());
-  }
-  _this->_internal_metadata_.MergeFrom<::google::protobuf::UnknownFieldSet>(from._internal_metadata_);
-}
-
-void GetCompletionItemsResponse::CopyFrom(const GetCompletionItemsResponse& from) {
-// @@protoc_insertion_point(class_specific_copy_from_start:io.deephaven.proto.backplane.script.grpc.GetCompletionItemsResponse)
-  if (&from == this) return;
-  Clear();
-  MergeFrom(from);
-}
-
-PROTOBUF_NOINLINE bool GetCompletionItemsResponse::IsInitialized() const {
-  return true;
-}
-
-::_pbi::CachedSize* GetCompletionItemsResponse::AccessCachedSize() const {
-  return &_impl_._cached_size_;
-}
-void GetCompletionItemsResponse::InternalSwap(GetCompletionItemsResponse* PROTOBUF_RESTRICT other) {
-  using std::swap;
-  _internal_metadata_.InternalSwap(&other->_internal_metadata_);
-  _impl_.items_.InternalSwap(&other->_impl_.items_);
-  ::google::protobuf::internal::memswap<
-      PROTOBUF_FIELD_OFFSET(GetCompletionItemsResponse, _impl_.success_)
-      + sizeof(GetCompletionItemsResponse::_impl_.success_)
-      - PROTOBUF_FIELD_OFFSET(GetCompletionItemsResponse, _impl_.request_id_)>(
-          reinterpret_cast<char*>(&_impl_.request_id_),
-          reinterpret_cast<char*>(&other->_impl_.request_id_));
-}
-
-::google::protobuf::Metadata GetCompletionItemsResponse::GetMetadata() const {
-  return ::_pbi::AssignDescriptors(
-      &descriptor_table_deephaven_2fproto_2fconsole_2eproto_getter, &descriptor_table_deephaven_2fproto_2fconsole_2eproto_once,
-      file_level_metadata_deephaven_2fproto_2fconsole_2eproto[30]);
-}
-// ===================================================================
-
-class CompletionItem::_Internal {
- public:
-  using HasBits = decltype(std::declval<CompletionItem>()._impl_._has_bits_);
-  static constexpr ::int32_t kHasBitsOffset =
-    8 * PROTOBUF_FIELD_OFFSET(CompletionItem, _impl_._has_bits_);
-  static const ::io::deephaven::proto::backplane::script::grpc::TextEdit& text_edit(const CompletionItem* msg);
-  static void set_has_text_edit(HasBits* has_bits) {
-    (*has_bits)[0] |= 1u;
-  }
-  static const ::io::deephaven::proto::backplane::script::grpc::MarkupContent& documentation(const CompletionItem* msg);
-  static void set_has_documentation(HasBits* has_bits) {
-    (*has_bits)[0] |= 2u;
-  }
-};
-
-const ::io::deephaven::proto::backplane::script::grpc::TextEdit& CompletionItem::_Internal::text_edit(const CompletionItem* msg) {
-  return *msg->_impl_.text_edit_;
-}
-const ::io::deephaven::proto::backplane::script::grpc::MarkupContent& CompletionItem::_Internal::documentation(const CompletionItem* msg) {
-  return *msg->_impl_.documentation_;
-}
-CompletionItem::CompletionItem(::google::protobuf::Arena* arena)
-    : ::google::protobuf::Message(arena) {
-  SharedCtor(arena);
-  // @@protoc_insertion_point(arena_constructor:io.deephaven.proto.backplane.script.grpc.CompletionItem)
-}
-inline PROTOBUF_NDEBUG_INLINE CompletionItem::Impl_::Impl_(
-    ::google::protobuf::internal::InternalVisibility visibility, ::google::protobuf::Arena* arena,
-    const Impl_& from)
-      : _has_bits_{from._has_bits_},
-        _cached_size_{0},
-        additional_text_edits_{visibility, arena, from.additional_text_edits_},
-        commit_characters_{visibility, arena, from.commit_characters_},
-        label_(arena, from.label_),
-        detail_(arena, from.detail_),
-        sort_text_(arena, from.sort_text_),
-        filter_text_(arena, from.filter_text_) {}
-
-CompletionItem::CompletionItem(
-    ::google::protobuf::Arena* arena,
-    const CompletionItem& from)
-    : ::google::protobuf::Message(arena) {
-  CompletionItem* const _this = this;
-  (void)_this;
-  _internal_metadata_.MergeFrom<::google::protobuf::UnknownFieldSet>(
-      from._internal_metadata_);
-  new (&_impl_) Impl_(internal_visibility(), arena, from._impl_);
-  ::uint32_t cached_has_bits = _impl_._has_bits_[0];
-  _impl_.text_edit_ = (cached_has_bits & 0x00000001u)
-                ? CreateMaybeMessage<::io::deephaven::proto::backplane::script::grpc::TextEdit>(arena, *from._impl_.text_edit_)
-                : nullptr;
-  _impl_.documentation_ = (cached_has_bits & 0x00000002u)
-                ? CreateMaybeMessage<::io::deephaven::proto::backplane::script::grpc::MarkupContent>(arena, *from._impl_.documentation_)
-                : nullptr;
-  ::memcpy(reinterpret_cast<char *>(&_impl_) +
-               offsetof(Impl_, start_),
-           reinterpret_cast<const char *>(&from._impl_) +
-               offsetof(Impl_, start_),
-           offsetof(Impl_, insert_text_format_) -
-               offsetof(Impl_, start_) +
-               sizeof(Impl_::insert_text_format_));
-
-  // @@protoc_insertion_point(copy_constructor:io.deephaven.proto.backplane.script.grpc.CompletionItem)
-}
-inline PROTOBUF_NDEBUG_INLINE CompletionItem::Impl_::Impl_(
-    ::google::protobuf::internal::InternalVisibility visibility,
-    ::google::protobuf::Arena* arena)
-      : _cached_size_{0},
-        additional_text_edits_{visibility, arena},
-        commit_characters_{visibility, arena},
-        label_(arena),
-        detail_(arena),
-        sort_text_(arena),
-        filter_text_(arena) {}
-
-inline void CompletionItem::SharedCtor(::_pb::Arena* arena) {
-  new (&_impl_) Impl_(internal_visibility(), arena);
-  ::memset(reinterpret_cast<char *>(&_impl_) +
-               offsetof(Impl_, text_edit_),
-           0,
-           offsetof(Impl_, insert_text_format_) -
-               offsetof(Impl_, text_edit_) +
-               sizeof(Impl_::insert_text_format_));
-}
-CompletionItem::~CompletionItem() {
-  // @@protoc_insertion_point(destructor:io.deephaven.proto.backplane.script.grpc.CompletionItem)
-  _internal_metadata_.Delete<::google::protobuf::UnknownFieldSet>();
-  SharedDtor();
-}
-inline void CompletionItem::SharedDtor() {
-  ABSL_DCHECK(GetArena() == nullptr);
-  _impl_.label_.Destroy();
-  _impl_.detail_.Destroy();
-  _impl_.sort_text_.Destroy();
-  _impl_.filter_text_.Destroy();
-  delete _impl_.text_edit_;
-  delete _impl_.documentation_;
-  _impl_.~Impl_();
-}
-
-PROTOBUF_NOINLINE void CompletionItem::Clear() {
-// @@protoc_insertion_point(message_clear_start:io.deephaven.proto.backplane.script.grpc.CompletionItem)
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  ::uint32_t cached_has_bits = 0;
-  // Prevent compiler warnings about cached_has_bits being unused
-  (void) cached_has_bits;
-
-  _impl_.additional_text_edits_.Clear();
-  _impl_.commit_characters_.Clear();
-  _impl_.label_.ClearToEmpty();
-  _impl_.detail_.ClearToEmpty();
-  _impl_.sort_text_.ClearToEmpty();
-  _impl_.filter_text_.ClearToEmpty();
-  cached_has_bits = _impl_._has_bits_[0];
-  if (cached_has_bits & 0x00000003u) {
-    if (cached_has_bits & 0x00000001u) {
-      ABSL_DCHECK(_impl_.text_edit_ != nullptr);
-      _impl_.text_edit_->Clear();
-    }
-    if (cached_has_bits & 0x00000002u) {
-      ABSL_DCHECK(_impl_.documentation_ != nullptr);
-      _impl_.documentation_->Clear();
-    }
-  }
-  ::memset(&_impl_.start_, 0, static_cast<::size_t>(
-      reinterpret_cast<char*>(&_impl_.insert_text_format_) -
-      reinterpret_cast<char*>(&_impl_.start_)) + sizeof(_impl_.insert_text_format_));
-  _impl_._has_bits_.Clear();
-  _internal_metadata_.Clear<::google::protobuf::UnknownFieldSet>();
-}
-
-const char* CompletionItem::_InternalParse(
-    const char* ptr, ::_pbi::ParseContext* ctx) {
-  ptr = ::_pbi::TcParser::ParseLoop(this, ptr, ctx, &_table_.header);
-  return ptr;
-}
-
-
-PROTOBUF_CONSTINIT PROTOBUF_ATTRIBUTE_INIT_PRIORITY1
-const ::_pbi::TcParseTable<4, 14, 3, 120, 2> CompletionItem::_table_ = {
-  {
-    PROTOBUF_FIELD_OFFSET(CompletionItem, _impl_._has_bits_),
-    0, // no _extensions_
-    15, 120,  // max_field_number, fast_idx_mask
-    offsetof(decltype(_table_), field_lookup_table),
-    4294934560,  // skipmap
-    offsetof(decltype(_table_), field_entries),
-    14,  // num_field_entries
-    3,  // num_aux_entries
-    offsetof(decltype(_table_), aux_entries),
-    &_CompletionItem_default_instance_._instance,
-    ::_pbi::TcParser::GenericFallback,  // fallback
-  }, {{
-    {::_pbi::TcParser::MiniParse, {}},
-    // int32 start = 1;
-    {::_pbi::TcParser::SingularVarintNoZag1<::uint32_t, offsetof(CompletionItem, _impl_.start_), 63>(),
-     {8, 63, 0, PROTOBUF_FIELD_OFFSET(CompletionItem, _impl_.start_)}},
-    // int32 length = 2;
-    {::_pbi::TcParser::SingularVarintNoZag1<::uint32_t, offsetof(CompletionItem, _impl_.length_), 63>(),
-     {16, 63, 0, PROTOBUF_FIELD_OFFSET(CompletionItem, _impl_.length_)}},
-    // string label = 3;
-    {::_pbi::TcParser::FastUS1,
-     {26, 63, 0, PROTOBUF_FIELD_OFFSET(CompletionItem, _impl_.label_)}},
-    // int32 kind = 4;
-    {::_pbi::TcParser::SingularVarintNoZag1<::uint32_t, offsetof(CompletionItem, _impl_.kind_), 63>(),
-     {32, 63, 0, PROTOBUF_FIELD_OFFSET(CompletionItem, _impl_.kind_)}},
-    // string detail = 5;
-    {::_pbi::TcParser::FastUS1,
-     {42, 63, 0, PROTOBUF_FIELD_OFFSET(CompletionItem, _impl_.detail_)}},
-    {::_pbi::TcParser::MiniParse, {}},
-    // bool deprecated = 7;
-    {::_pbi::TcParser::SingularVarintNoZag1<bool, offsetof(CompletionItem, _impl_.deprecated_), 63>(),
-     {56, 63, 0, PROTOBUF_FIELD_OFFSET(CompletionItem, _impl_.deprecated_)}},
-    // bool preselect = 8;
-    {::_pbi::TcParser::SingularVarintNoZag1<bool, offsetof(CompletionItem, _impl_.preselect_), 63>(),
-     {64, 63, 0, PROTOBUF_FIELD_OFFSET(CompletionItem, _impl_.preselect_)}},
-    // .io.deephaven.proto.backplane.script.grpc.TextEdit text_edit = 9;
-    {::_pbi::TcParser::FastMtS1,
-     {74, 0, 0, PROTOBUF_FIELD_OFFSET(CompletionItem, _impl_.text_edit_)}},
-    // string sort_text = 10;
-    {::_pbi::TcParser::FastUS1,
-     {82, 63, 0, PROTOBUF_FIELD_OFFSET(CompletionItem, _impl_.sort_text_)}},
-    // string filter_text = 11;
-    {::_pbi::TcParser::FastUS1,
-     {90, 63, 0, PROTOBUF_FIELD_OFFSET(CompletionItem, _impl_.filter_text_)}},
-    // int32 insert_text_format = 12;
-    {::_pbi::TcParser::SingularVarintNoZag1<::uint32_t, offsetof(CompletionItem, _impl_.insert_text_format_), 63>(),
-     {96, 63, 0, PROTOBUF_FIELD_OFFSET(CompletionItem, _impl_.insert_text_format_)}},
-    // repeated .io.deephaven.proto.backplane.script.grpc.TextEdit additional_text_edits = 13;
-    {::_pbi::TcParser::FastMtR1,
-     {106, 63, 1, PROTOBUF_FIELD_OFFSET(CompletionItem, _impl_.additional_text_edits_)}},
-    // repeated string commit_characters = 14;
-    {::_pbi::TcParser::FastUR1,
-     {114, 63, 0, PROTOBUF_FIELD_OFFSET(CompletionItem, _impl_.commit_characters_)}},
-    // .io.deephaven.proto.backplane.script.grpc.MarkupContent documentation = 15;
-    {::_pbi::TcParser::FastMtS1,
-     {122, 1, 2, PROTOBUF_FIELD_OFFSET(CompletionItem, _impl_.documentation_)}},
-  }}, {{
-    65535, 65535
-  }}, {{
-    // int32 start = 1;
-    {PROTOBUF_FIELD_OFFSET(CompletionItem, _impl_.start_), -1, 0,
-    (0 | ::_fl::kFcSingular | ::_fl::kInt32)},
-    // int32 length = 2;
-    {PROTOBUF_FIELD_OFFSET(CompletionItem, _impl_.length_), -1, 0,
-    (0 | ::_fl::kFcSingular | ::_fl::kInt32)},
-    // string label = 3;
-    {PROTOBUF_FIELD_OFFSET(CompletionItem, _impl_.label_), -1, 0,
-    (0 | ::_fl::kFcSingular | ::_fl::kUtf8String | ::_fl::kRepAString)},
-    // int32 kind = 4;
-    {PROTOBUF_FIELD_OFFSET(CompletionItem, _impl_.kind_), -1, 0,
-    (0 | ::_fl::kFcSingular | ::_fl::kInt32)},
-    // string detail = 5;
-    {PROTOBUF_FIELD_OFFSET(CompletionItem, _impl_.detail_), -1, 0,
-    (0 | ::_fl::kFcSingular | ::_fl::kUtf8String | ::_fl::kRepAString)},
-    // bool deprecated = 7;
-    {PROTOBUF_FIELD_OFFSET(CompletionItem, _impl_.deprecated_), -1, 0,
-    (0 | ::_fl::kFcSingular | ::_fl::kBool)},
-    // bool preselect = 8;
-    {PROTOBUF_FIELD_OFFSET(CompletionItem, _impl_.preselect_), -1, 0,
-    (0 | ::_fl::kFcSingular | ::_fl::kBool)},
-    // .io.deephaven.proto.backplane.script.grpc.TextEdit text_edit = 9;
-    {PROTOBUF_FIELD_OFFSET(CompletionItem, _impl_.text_edit_), _Internal::kHasBitsOffset + 0, 0,
-    (0 | ::_fl::kFcOptional | ::_fl::kMessage | ::_fl::kTvTable)},
-    // string sort_text = 10;
-    {PROTOBUF_FIELD_OFFSET(CompletionItem, _impl_.sort_text_), -1, 0,
-    (0 | ::_fl::kFcSingular | ::_fl::kUtf8String | ::_fl::kRepAString)},
-    // string filter_text = 11;
-    {PROTOBUF_FIELD_OFFSET(CompletionItem, _impl_.filter_text_), -1, 0,
-    (0 | ::_fl::kFcSingular | ::_fl::kUtf8String | ::_fl::kRepAString)},
-    // int32 insert_text_format = 12;
-    {PROTOBUF_FIELD_OFFSET(CompletionItem, _impl_.insert_text_format_), -1, 0,
-    (0 | ::_fl::kFcSingular | ::_fl::kInt32)},
-    // repeated .io.deephaven.proto.backplane.script.grpc.TextEdit additional_text_edits = 13;
-    {PROTOBUF_FIELD_OFFSET(CompletionItem, _impl_.additional_text_edits_), -1, 1,
-    (0 | ::_fl::kFcRepeated | ::_fl::kMessage | ::_fl::kTvTable)},
-    // repeated string commit_characters = 14;
-    {PROTOBUF_FIELD_OFFSET(CompletionItem, _impl_.commit_characters_), -1, 0,
-    (0 | ::_fl::kFcRepeated | ::_fl::kUtf8String | ::_fl::kRepSString)},
-    // .io.deephaven.proto.backplane.script.grpc.MarkupContent documentation = 15;
-    {PROTOBUF_FIELD_OFFSET(CompletionItem, _impl_.documentation_), _Internal::kHasBitsOffset + 1, 2,
-    (0 | ::_fl::kFcOptional | ::_fl::kMessage | ::_fl::kTvTable)},
-  }}, {{
-    {::_pbi::TcParser::GetTable<::io::deephaven::proto::backplane::script::grpc::TextEdit>()},
-    {::_pbi::TcParser::GetTable<::io::deephaven::proto::backplane::script::grpc::TextEdit>()},
-    {::_pbi::TcParser::GetTable<::io::deephaven::proto::backplane::script::grpc::MarkupContent>()},
-  }}, {{
-    "\67\0\0\5\0\6\0\0\0\11\13\0\0\21\0\0"
-    "io.deephaven.proto.backplane.script.grpc.CompletionItem"
-    "label"
-    "detail"
-    "sort_text"
-    "filter_text"
-    "commit_characters"
-  }},
-};
-
-::uint8_t* CompletionItem::_InternalSerialize(
-    ::uint8_t* target,
-    ::google::protobuf::io::EpsCopyOutputStream* stream) const {
-  // @@protoc_insertion_point(serialize_to_array_start:io.deephaven.proto.backplane.script.grpc.CompletionItem)
-  ::uint32_t cached_has_bits = 0;
-  (void)cached_has_bits;
-
-  // int32 start = 1;
-  if (this->_internal_start() != 0) {
-    target = ::google::protobuf::internal::WireFormatLite::
-        WriteInt32ToArrayWithField<1>(
-            stream, this->_internal_start(), target);
-  }
-
-  // int32 length = 2;
-  if (this->_internal_length() != 0) {
-    target = ::google::protobuf::internal::WireFormatLite::
-        WriteInt32ToArrayWithField<2>(
-            stream, this->_internal_length(), target);
-  }
-
-  // string label = 3;
-  if (!this->_internal_label().empty()) {
-    const std::string& _s = this->_internal_label();
-    ::google::protobuf::internal::WireFormatLite::VerifyUtf8String(
-        _s.data(), static_cast<int>(_s.length()), ::google::protobuf::internal::WireFormatLite::SERIALIZE, "io.deephaven.proto.backplane.script.grpc.CompletionItem.label");
-    target = stream->WriteStringMaybeAliased(3, _s, target);
-  }
-
-  // int32 kind = 4;
-  if (this->_internal_kind() != 0) {
-    target = ::google::protobuf::internal::WireFormatLite::
-        WriteInt32ToArrayWithField<4>(
-            stream, this->_internal_kind(), target);
-  }
-
-  // string detail = 5;
-  if (!this->_internal_detail().empty()) {
-    const std::string& _s = this->_internal_detail();
-    ::google::protobuf::internal::WireFormatLite::VerifyUtf8String(
-        _s.data(), static_cast<int>(_s.length()), ::google::protobuf::internal::WireFormatLite::SERIALIZE, "io.deephaven.proto.backplane.script.grpc.CompletionItem.detail");
-    target = stream->WriteStringMaybeAliased(5, _s, target);
-  }
-
-  // bool deprecated = 7;
-  if (this->_internal_deprecated() != 0) {
-    target = stream->EnsureSpace(target);
-    target = ::_pbi::WireFormatLite::WriteBoolToArray(
-        7, this->_internal_deprecated(), target);
-  }
-
-  // bool preselect = 8;
-  if (this->_internal_preselect() != 0) {
-    target = stream->EnsureSpace(target);
-    target = ::_pbi::WireFormatLite::WriteBoolToArray(
-        8, this->_internal_preselect(), target);
-  }
-
-  cached_has_bits = _impl_._has_bits_[0];
-  // .io.deephaven.proto.backplane.script.grpc.TextEdit text_edit = 9;
-  if (cached_has_bits & 0x00000001u) {
-    target = ::google::protobuf::internal::WireFormatLite::InternalWriteMessage(
-        9, _Internal::text_edit(this),
-        _Internal::text_edit(this).GetCachedSize(), target, stream);
-  }
-
-  // string sort_text = 10;
-  if (!this->_internal_sort_text().empty()) {
-    const std::string& _s = this->_internal_sort_text();
-    ::google::protobuf::internal::WireFormatLite::VerifyUtf8String(
-        _s.data(), static_cast<int>(_s.length()), ::google::protobuf::internal::WireFormatLite::SERIALIZE, "io.deephaven.proto.backplane.script.grpc.CompletionItem.sort_text");
-    target = stream->WriteStringMaybeAliased(10, _s, target);
-  }
-
-  // string filter_text = 11;
-  if (!this->_internal_filter_text().empty()) {
-    const std::string& _s = this->_internal_filter_text();
-    ::google::protobuf::internal::WireFormatLite::VerifyUtf8String(
-        _s.data(), static_cast<int>(_s.length()), ::google::protobuf::internal::WireFormatLite::SERIALIZE, "io.deephaven.proto.backplane.script.grpc.CompletionItem.filter_text");
-    target = stream->WriteStringMaybeAliased(11, _s, target);
-  }
-
-  // int32 insert_text_format = 12;
-  if (this->_internal_insert_text_format() != 0) {
-    target = ::google::protobuf::internal::WireFormatLite::
-        WriteInt32ToArrayWithField<12>(
-            stream, this->_internal_insert_text_format(), target);
-  }
-
-  // repeated .io.deephaven.proto.backplane.script.grpc.TextEdit additional_text_edits = 13;
-  for (unsigned i = 0,
-      n = static_cast<unsigned>(this->_internal_additional_text_edits_size()); i < n; i++) {
-    const auto& repfield = this->_internal_additional_text_edits().Get(i);
-    target = ::google::protobuf::internal::WireFormatLite::
-        InternalWriteMessage(13, repfield, repfield.GetCachedSize(), target, stream);
-  }
-
-  // repeated string commit_characters = 14;
-  for (int i = 0, n = this->_internal_commit_characters_size(); i < n; ++i) {
-    const auto& s = this->_internal_commit_characters().Get(i);
-    ::google::protobuf::internal::WireFormatLite::VerifyUtf8String(
-        s.data(), static_cast<int>(s.length()), ::google::protobuf::internal::WireFormatLite::SERIALIZE, "io.deephaven.proto.backplane.script.grpc.CompletionItem.commit_characters");
-    target = stream->WriteString(14, s, target);
-  }
-
-  // .io.deephaven.proto.backplane.script.grpc.MarkupContent documentation = 15;
-  if (cached_has_bits & 0x00000002u) {
-    target = ::google::protobuf::internal::WireFormatLite::InternalWriteMessage(
-        15, _Internal::documentation(this),
-        _Internal::documentation(this).GetCachedSize(), target, stream);
-  }
-
-  if (PROTOBUF_PREDICT_FALSE(_internal_metadata_.have_unknown_fields())) {
-    target =
-        ::_pbi::WireFormat::InternalSerializeUnknownFieldsToArray(
-            _internal_metadata_.unknown_fields<::google::protobuf::UnknownFieldSet>(::google::protobuf::UnknownFieldSet::default_instance), target, stream);
-  }
-  // @@protoc_insertion_point(serialize_to_array_end:io.deephaven.proto.backplane.script.grpc.CompletionItem)
-  return target;
-}
-
-::size_t CompletionItem::ByteSizeLong() const {
-// @@protoc_insertion_point(message_byte_size_start:io.deephaven.proto.backplane.script.grpc.CompletionItem)
-  ::size_t total_size = 0;
-
-  ::uint32_t cached_has_bits = 0;
-  // Prevent compiler warnings about cached_has_bits being unused
-  (void) cached_has_bits;
-
-  // repeated .io.deephaven.proto.backplane.script.grpc.TextEdit additional_text_edits = 13;
-  total_size += 1UL * this->_internal_additional_text_edits_size();
-  for (const auto& msg : this->_internal_additional_text_edits()) {
-    total_size +=
-      ::google::protobuf::internal::WireFormatLite::MessageSize(msg);
-  }
-  // repeated string commit_characters = 14;
-  total_size += 1 * ::google::protobuf::internal::FromIntSize(_internal_commit_characters().size());
-  for (int i = 0, n = _internal_commit_characters().size(); i < n; ++i) {
-    total_size += ::google::protobuf::internal::WireFormatLite::StringSize(
-        _internal_commit_characters().Get(i));
-  }
-  // string label = 3;
-  if (!this->_internal_label().empty()) {
-    total_size += 1 + ::google::protobuf::internal::WireFormatLite::StringSize(
-                                    this->_internal_label());
-  }
-
-  // string detail = 5;
-  if (!this->_internal_detail().empty()) {
-    total_size += 1 + ::google::protobuf::internal::WireFormatLite::StringSize(
-                                    this->_internal_detail());
-  }
-
-  // string sort_text = 10;
-  if (!this->_internal_sort_text().empty()) {
-    total_size += 1 + ::google::protobuf::internal::WireFormatLite::StringSize(
-                                    this->_internal_sort_text());
-  }
-
-  // string filter_text = 11;
-  if (!this->_internal_filter_text().empty()) {
-    total_size += 1 + ::google::protobuf::internal::WireFormatLite::StringSize(
-                                    this->_internal_filter_text());
-  }
-
-  cached_has_bits = _impl_._has_bits_[0];
-  if (cached_has_bits & 0x00000003u) {
-    // .io.deephaven.proto.backplane.script.grpc.TextEdit text_edit = 9;
-    if (cached_has_bits & 0x00000001u) {
-      total_size +=
-          1 + ::google::protobuf::internal::WireFormatLite::MessageSize(*_impl_.text_edit_);
-    }
-
-    // .io.deephaven.proto.backplane.script.grpc.MarkupContent documentation = 15;
-    if (cached_has_bits & 0x00000002u) {
-      total_size +=
-          1 + ::google::protobuf::internal::WireFormatLite::MessageSize(*_impl_.documentation_);
-    }
-
-  }
-  // int32 start = 1;
-  if (this->_internal_start() != 0) {
-    total_size += ::_pbi::WireFormatLite::Int32SizePlusOne(
-        this->_internal_start());
-  }
-
-  // int32 length = 2;
-  if (this->_internal_length() != 0) {
-    total_size += ::_pbi::WireFormatLite::Int32SizePlusOne(
-        this->_internal_length());
-  }
-
-  // int32 kind = 4;
-  if (this->_internal_kind() != 0) {
-    total_size += ::_pbi::WireFormatLite::Int32SizePlusOne(
-        this->_internal_kind());
-  }
-
-  // bool deprecated = 7;
-  if (this->_internal_deprecated() != 0) {
-    total_size += 2;
-  }
-
-  // bool preselect = 8;
-  if (this->_internal_preselect() != 0) {
-    total_size += 2;
-  }
-
-  // int32 insert_text_format = 12;
-  if (this->_internal_insert_text_format() != 0) {
-    total_size += ::_pbi::WireFormatLite::Int32SizePlusOne(
-        this->_internal_insert_text_format());
-  }
-
-  return MaybeComputeUnknownFieldsSize(total_size, &_impl_._cached_size_);
-}
-
-const ::google::protobuf::Message::ClassData CompletionItem::_class_data_ = {
-    CompletionItem::MergeImpl,
-    nullptr,  // OnDemandRegisterArenaDtor
-};
-const ::google::protobuf::Message::ClassData* CompletionItem::GetClassData() const {
-  return &_class_data_;
-}
-
-void CompletionItem::MergeImpl(::google::protobuf::Message& to_msg, const ::google::protobuf::Message& from_msg) {
-  auto* const _this = static_cast<CompletionItem*>(&to_msg);
-  auto& from = static_cast<const CompletionItem&>(from_msg);
-  // @@protoc_insertion_point(class_specific_merge_from_start:io.deephaven.proto.backplane.script.grpc.CompletionItem)
-  ABSL_DCHECK_NE(&from, _this);
-  ::uint32_t cached_has_bits = 0;
-  (void) cached_has_bits;
-
-  _this->_internal_mutable_additional_text_edits()->MergeFrom(
-      from._internal_additional_text_edits());
-  _this->_internal_mutable_commit_characters()->MergeFrom(from._internal_commit_characters());
-  if (!from._internal_label().empty()) {
-    _this->_internal_set_label(from._internal_label());
-  }
-  if (!from._internal_detail().empty()) {
-    _this->_internal_set_detail(from._internal_detail());
-  }
-  if (!from._internal_sort_text().empty()) {
-    _this->_internal_set_sort_text(from._internal_sort_text());
-  }
-  if (!from._internal_filter_text().empty()) {
-    _this->_internal_set_filter_text(from._internal_filter_text());
-  }
-  cached_has_bits = from._impl_._has_bits_[0];
-  if (cached_has_bits & 0x00000003u) {
-    if (cached_has_bits & 0x00000001u) {
-      _this->_internal_mutable_text_edit()->::io::deephaven::proto::backplane::script::grpc::TextEdit::MergeFrom(
-          from._internal_text_edit());
-    }
-    if (cached_has_bits & 0x00000002u) {
-      _this->_internal_mutable_documentation()->::io::deephaven::proto::backplane::script::grpc::MarkupContent::MergeFrom(
-          from._internal_documentation());
-    }
-  }
-  if (from._internal_start() != 0) {
-    _this->_internal_set_start(from._internal_start());
-  }
-  if (from._internal_length() != 0) {
-    _this->_internal_set_length(from._internal_length());
-  }
-  if (from._internal_kind() != 0) {
-    _this->_internal_set_kind(from._internal_kind());
-  }
-  if (from._internal_deprecated() != 0) {
-    _this->_internal_set_deprecated(from._internal_deprecated());
-  }
-  if (from._internal_preselect() != 0) {
-    _this->_internal_set_preselect(from._internal_preselect());
-  }
-  if (from._internal_insert_text_format() != 0) {
-    _this->_internal_set_insert_text_format(from._internal_insert_text_format());
-  }
-  _this->_internal_metadata_.MergeFrom<::google::protobuf::UnknownFieldSet>(from._internal_metadata_);
-}
-
-void CompletionItem::CopyFrom(const CompletionItem& from) {
-// @@protoc_insertion_point(class_specific_copy_from_start:io.deephaven.proto.backplane.script.grpc.CompletionItem)
-  if (&from == this) return;
-  Clear();
-  MergeFrom(from);
-}
-
-PROTOBUF_NOINLINE bool CompletionItem::IsInitialized() const {
-  return true;
-}
-
-::_pbi::CachedSize* CompletionItem::AccessCachedSize() const {
-  return &_impl_._cached_size_;
-}
-void CompletionItem::InternalSwap(CompletionItem* PROTOBUF_RESTRICT other) {
-  using std::swap;
-  auto* arena = GetArena();
-  ABSL_DCHECK_EQ(arena, other->GetArena());
-  _internal_metadata_.InternalSwap(&other->_internal_metadata_);
-  swap(_impl_._has_bits_[0], other->_impl_._has_bits_[0]);
-  _impl_.additional_text_edits_.InternalSwap(&other->_impl_.additional_text_edits_);
-  _impl_.commit_characters_.InternalSwap(&other->_impl_.commit_characters_);
-  ::_pbi::ArenaStringPtr::InternalSwap(&_impl_.label_, &other->_impl_.label_, arena);
-  ::_pbi::ArenaStringPtr::InternalSwap(&_impl_.detail_, &other->_impl_.detail_, arena);
-  ::_pbi::ArenaStringPtr::InternalSwap(&_impl_.sort_text_, &other->_impl_.sort_text_, arena);
-  ::_pbi::ArenaStringPtr::InternalSwap(&_impl_.filter_text_, &other->_impl_.filter_text_, arena);
-  ::google::protobuf::internal::memswap<
-      PROTOBUF_FIELD_OFFSET(CompletionItem, _impl_.insert_text_format_)
-      + sizeof(CompletionItem::_impl_.insert_text_format_)
-      - PROTOBUF_FIELD_OFFSET(CompletionItem, _impl_.text_edit_)>(
-          reinterpret_cast<char*>(&_impl_.text_edit_),
-          reinterpret_cast<char*>(&other->_impl_.text_edit_));
-}
-
-::google::protobuf::Metadata CompletionItem::GetMetadata() const {
-  return ::_pbi::AssignDescriptors(
-      &descriptor_table_deephaven_2fproto_2fconsole_2eproto_getter, &descriptor_table_deephaven_2fproto_2fconsole_2eproto_once,
-      file_level_metadata_deephaven_2fproto_2fconsole_2eproto[31]);
-}
-// ===================================================================
-
-class TextEdit::_Internal {
- public:
-  using HasBits = decltype(std::declval<TextEdit>()._impl_._has_bits_);
-  static constexpr ::int32_t kHasBitsOffset =
-    8 * PROTOBUF_FIELD_OFFSET(TextEdit, _impl_._has_bits_);
-  static const ::io::deephaven::proto::backplane::script::grpc::DocumentRange& range(const TextEdit* msg);
-  static void set_has_range(HasBits* has_bits) {
-    (*has_bits)[0] |= 1u;
-  }
-};
-
-const ::io::deephaven::proto::backplane::script::grpc::DocumentRange& TextEdit::_Internal::range(const TextEdit* msg) {
-  return *msg->_impl_.range_;
-}
-TextEdit::TextEdit(::google::protobuf::Arena* arena)
-    : ::google::protobuf::Message(arena) {
-  SharedCtor(arena);
-  // @@protoc_insertion_point(arena_constructor:io.deephaven.proto.backplane.script.grpc.TextEdit)
-}
-inline PROTOBUF_NDEBUG_INLINE TextEdit::Impl_::Impl_(
-    ::google::protobuf::internal::InternalVisibility visibility, ::google::protobuf::Arena* arena,
-    const Impl_& from)
-      : _has_bits_{from._has_bits_},
-        _cached_size_{0},
-        text_(arena, from.text_) {}
-
-TextEdit::TextEdit(
-    ::google::protobuf::Arena* arena,
-    const TextEdit& from)
-    : ::google::protobuf::Message(arena) {
-  TextEdit* const _this = this;
-  (void)_this;
-  _internal_metadata_.MergeFrom<::google::protobuf::UnknownFieldSet>(
-      from._internal_metadata_);
-  new (&_impl_) Impl_(internal_visibility(), arena, from._impl_);
-  ::uint32_t cached_has_bits = _impl_._has_bits_[0];
-  _impl_.range_ = (cached_has_bits & 0x00000001u)
-                ? CreateMaybeMessage<::io::deephaven::proto::backplane::script::grpc::DocumentRange>(arena, *from._impl_.range_)
-                : nullptr;
-
-  // @@protoc_insertion_point(copy_constructor:io.deephaven.proto.backplane.script.grpc.TextEdit)
-}
-inline PROTOBUF_NDEBUG_INLINE TextEdit::Impl_::Impl_(
-    ::google::protobuf::internal::InternalVisibility visibility,
-    ::google::protobuf::Arena* arena)
-      : _cached_size_{0},
-        text_(arena) {}
-
-inline void TextEdit::SharedCtor(::_pb::Arena* arena) {
-  new (&_impl_) Impl_(internal_visibility(), arena);
-  _impl_.range_ = {};
-}
-TextEdit::~TextEdit() {
-  // @@protoc_insertion_point(destructor:io.deephaven.proto.backplane.script.grpc.TextEdit)
-  _internal_metadata_.Delete<::google::protobuf::UnknownFieldSet>();
-  SharedDtor();
-}
-inline void TextEdit::SharedDtor() {
-  ABSL_DCHECK(GetArena() == nullptr);
-  _impl_.text_.Destroy();
-  delete _impl_.range_;
-  _impl_.~Impl_();
-}
-
-PROTOBUF_NOINLINE void TextEdit::Clear() {
-// @@protoc_insertion_point(message_clear_start:io.deephaven.proto.backplane.script.grpc.TextEdit)
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  ::uint32_t cached_has_bits = 0;
-  // Prevent compiler warnings about cached_has_bits being unused
-  (void) cached_has_bits;
-
-  _impl_.text_.ClearToEmpty();
-  cached_has_bits = _impl_._has_bits_[0];
-  if (cached_has_bits & 0x00000001u) {
-    ABSL_DCHECK(_impl_.range_ != nullptr);
-    _impl_.range_->Clear();
-  }
-  _impl_._has_bits_.Clear();
-  _internal_metadata_.Clear<::google::protobuf::UnknownFieldSet>();
-}
-
-const char* TextEdit::_InternalParse(
-    const char* ptr, ::_pbi::ParseContext* ctx) {
-  ptr = ::_pbi::TcParser::ParseLoop(this, ptr, ctx, &_table_.header);
-  return ptr;
-}
-
-
-PROTOBUF_CONSTINIT PROTOBUF_ATTRIBUTE_INIT_PRIORITY1
-const ::_pbi::TcParseTable<1, 2, 1, 62, 2> TextEdit::_table_ = {
-  {
-    PROTOBUF_FIELD_OFFSET(TextEdit, _impl_._has_bits_),
-    0, // no _extensions_
-    2, 8,  // max_field_number, fast_idx_mask
-    offsetof(decltype(_table_), field_lookup_table),
-    4294967292,  // skipmap
-    offsetof(decltype(_table_), field_entries),
-    2,  // num_field_entries
-    1,  // num_aux_entries
-    offsetof(decltype(_table_), aux_entries),
-    &_TextEdit_default_instance_._instance,
-    ::_pbi::TcParser::GenericFallback,  // fallback
-  }, {{
-    // string text = 2;
-    {::_pbi::TcParser::FastUS1,
-     {18, 63, 0, PROTOBUF_FIELD_OFFSET(TextEdit, _impl_.text_)}},
-    // .io.deephaven.proto.backplane.script.grpc.DocumentRange range = 1;
-    {::_pbi::TcParser::FastMtS1,
-     {10, 0, 0, PROTOBUF_FIELD_OFFSET(TextEdit, _impl_.range_)}},
-  }}, {{
-    65535, 65535
-  }}, {{
-    // .io.deephaven.proto.backplane.script.grpc.DocumentRange range = 1;
-    {PROTOBUF_FIELD_OFFSET(TextEdit, _impl_.range_), _Internal::kHasBitsOffset + 0, 0,
-    (0 | ::_fl::kFcOptional | ::_fl::kMessage | ::_fl::kTvTable)},
-    // string text = 2;
-    {PROTOBUF_FIELD_OFFSET(TextEdit, _impl_.text_), -1, 0,
-    (0 | ::_fl::kFcSingular | ::_fl::kUtf8String | ::_fl::kRepAString)},
-  }}, {{
-    {::_pbi::TcParser::GetTable<::io::deephaven::proto::backplane::script::grpc::DocumentRange>()},
-  }}, {{
-    "\61\0\4\0\0\0\0\0"
-    "io.deephaven.proto.backplane.script.grpc.TextEdit"
-    "text"
-  }},
-};
-
-::uint8_t* TextEdit::_InternalSerialize(
-    ::uint8_t* target,
-    ::google::protobuf::io::EpsCopyOutputStream* stream) const {
-  // @@protoc_insertion_point(serialize_to_array_start:io.deephaven.proto.backplane.script.grpc.TextEdit)
-  ::uint32_t cached_has_bits = 0;
-  (void)cached_has_bits;
-
-  cached_has_bits = _impl_._has_bits_[0];
-  // .io.deephaven.proto.backplane.script.grpc.DocumentRange range = 1;
-  if (cached_has_bits & 0x00000001u) {
-    target = ::google::protobuf::internal::WireFormatLite::InternalWriteMessage(
-        1, _Internal::range(this),
-        _Internal::range(this).GetCachedSize(), target, stream);
-  }
-
-  // string text = 2;
-  if (!this->_internal_text().empty()) {
-    const std::string& _s = this->_internal_text();
-    ::google::protobuf::internal::WireFormatLite::VerifyUtf8String(
-        _s.data(), static_cast<int>(_s.length()), ::google::protobuf::internal::WireFormatLite::SERIALIZE, "io.deephaven.proto.backplane.script.grpc.TextEdit.text");
-    target = stream->WriteStringMaybeAliased(2, _s, target);
-  }
-
-  if (PROTOBUF_PREDICT_FALSE(_internal_metadata_.have_unknown_fields())) {
-    target =
-        ::_pbi::WireFormat::InternalSerializeUnknownFieldsToArray(
-            _internal_metadata_.unknown_fields<::google::protobuf::UnknownFieldSet>(::google::protobuf::UnknownFieldSet::default_instance), target, stream);
-  }
-  // @@protoc_insertion_point(serialize_to_array_end:io.deephaven.proto.backplane.script.grpc.TextEdit)
-  return target;
-}
-
-::size_t TextEdit::ByteSizeLong() const {
-// @@protoc_insertion_point(message_byte_size_start:io.deephaven.proto.backplane.script.grpc.TextEdit)
-  ::size_t total_size = 0;
-
-  ::uint32_t cached_has_bits = 0;
-  // Prevent compiler warnings about cached_has_bits being unused
-  (void) cached_has_bits;
-
-  // string text = 2;
-  if (!this->_internal_text().empty()) {
-    total_size += 1 + ::google::protobuf::internal::WireFormatLite::StringSize(
-                                    this->_internal_text());
-  }
-
-  // .io.deephaven.proto.backplane.script.grpc.DocumentRange range = 1;
-  cached_has_bits = _impl_._has_bits_[0];
-  if (cached_has_bits & 0x00000001u) {
-    total_size +=
-        1 + ::google::protobuf::internal::WireFormatLite::MessageSize(*_impl_.range_);
-  }
-
-  return MaybeComputeUnknownFieldsSize(total_size, &_impl_._cached_size_);
-}
-
-const ::google::protobuf::Message::ClassData TextEdit::_class_data_ = {
-    TextEdit::MergeImpl,
-    nullptr,  // OnDemandRegisterArenaDtor
-};
-const ::google::protobuf::Message::ClassData* TextEdit::GetClassData() const {
-  return &_class_data_;
-}
-
-void TextEdit::MergeImpl(::google::protobuf::Message& to_msg, const ::google::protobuf::Message& from_msg) {
-  auto* const _this = static_cast<TextEdit*>(&to_msg);
-  auto& from = static_cast<const TextEdit&>(from_msg);
-  // @@protoc_insertion_point(class_specific_merge_from_start:io.deephaven.proto.backplane.script.grpc.TextEdit)
-  ABSL_DCHECK_NE(&from, _this);
-  ::uint32_t cached_has_bits = 0;
-  (void) cached_has_bits;
-
-  if (!from._internal_text().empty()) {
-    _this->_internal_set_text(from._internal_text());
-  }
-  if ((from._impl_._has_bits_[0] & 0x00000001u) != 0) {
-    _this->_internal_mutable_range()->::io::deephaven::proto::backplane::script::grpc::DocumentRange::MergeFrom(
-        from._internal_range());
-  }
-  _this->_internal_metadata_.MergeFrom<::google::protobuf::UnknownFieldSet>(from._internal_metadata_);
-}
-
-void TextEdit::CopyFrom(const TextEdit& from) {
-// @@protoc_insertion_point(class_specific_copy_from_start:io.deephaven.proto.backplane.script.grpc.TextEdit)
-  if (&from == this) return;
-  Clear();
-  MergeFrom(from);
-}
-
-PROTOBUF_NOINLINE bool TextEdit::IsInitialized() const {
-  return true;
-}
-
-::_pbi::CachedSize* TextEdit::AccessCachedSize() const {
-  return &_impl_._cached_size_;
-}
-void TextEdit::InternalSwap(TextEdit* PROTOBUF_RESTRICT other) {
-  using std::swap;
-  auto* arena = GetArena();
-  ABSL_DCHECK_EQ(arena, other->GetArena());
-  _internal_metadata_.InternalSwap(&other->_internal_metadata_);
-  swap(_impl_._has_bits_[0], other->_impl_._has_bits_[0]);
-  ::_pbi::ArenaStringPtr::InternalSwap(&_impl_.text_, &other->_impl_.text_, arena);
-  swap(_impl_.range_, other->_impl_.range_);
-}
-
-::google::protobuf::Metadata TextEdit::GetMetadata() const {
-  return ::_pbi::AssignDescriptors(
-      &descriptor_table_deephaven_2fproto_2fconsole_2eproto_getter, &descriptor_table_deephaven_2fproto_2fconsole_2eproto_once,
-      file_level_metadata_deephaven_2fproto_2fconsole_2eproto[32]);
-}
-// ===================================================================
-
-class GetSignatureHelpRequest::_Internal {
- public:
-  using HasBits = decltype(std::declval<GetSignatureHelpRequest>()._impl_._has_bits_);
-  static constexpr ::int32_t kHasBitsOffset =
-    8 * PROTOBUF_FIELD_OFFSET(GetSignatureHelpRequest, _impl_._has_bits_);
-  static const ::io::deephaven::proto::backplane::script::grpc::SignatureHelpContext& context(const GetSignatureHelpRequest* msg);
-  static void set_has_context(HasBits* has_bits) {
-    (*has_bits)[0] |= 1u;
-  }
-  static const ::io::deephaven::proto::backplane::script::grpc::VersionedTextDocumentIdentifier& text_document(const GetSignatureHelpRequest* msg);
-  static void set_has_text_document(HasBits* has_bits) {
-    (*has_bits)[0] |= 2u;
-  }
-  static const ::io::deephaven::proto::backplane::script::grpc::Position& position(const GetSignatureHelpRequest* msg);
-  static void set_has_position(HasBits* has_bits) {
-    (*has_bits)[0] |= 4u;
-  }
-};
-
-const ::io::deephaven::proto::backplane::script::grpc::SignatureHelpContext& GetSignatureHelpRequest::_Internal::context(const GetSignatureHelpRequest* msg) {
-  return *msg->_impl_.context_;
-}
-const ::io::deephaven::proto::backplane::script::grpc::VersionedTextDocumentIdentifier& GetSignatureHelpRequest::_Internal::text_document(const GetSignatureHelpRequest* msg) {
-  return *msg->_impl_.text_document_;
-}
-const ::io::deephaven::proto::backplane::script::grpc::Position& GetSignatureHelpRequest::_Internal::position(const GetSignatureHelpRequest* msg) {
-  return *msg->_impl_.position_;
-}
-GetSignatureHelpRequest::GetSignatureHelpRequest(::google::protobuf::Arena* arena)
-    : ::google::protobuf::Message(arena) {
-  SharedCtor(arena);
-  // @@protoc_insertion_point(arena_constructor:io.deephaven.proto.backplane.script.grpc.GetSignatureHelpRequest)
-}
-inline PROTOBUF_NDEBUG_INLINE GetSignatureHelpRequest::Impl_::Impl_(
-    ::google::protobuf::internal::InternalVisibility visibility, ::google::protobuf::Arena* arena,
-    const Impl_& from)
-      : _has_bits_{from._has_bits_},
-        _cached_size_{0} {}
-
-GetSignatureHelpRequest::GetSignatureHelpRequest(
-    ::google::protobuf::Arena* arena,
-    const GetSignatureHelpRequest& from)
-    : ::google::protobuf::Message(arena) {
-  GetSignatureHelpRequest* const _this = this;
-  (void)_this;
-  _internal_metadata_.MergeFrom<::google::protobuf::UnknownFieldSet>(
-      from._internal_metadata_);
-  new (&_impl_) Impl_(internal_visibility(), arena, from._impl_);
-  ::uint32_t cached_has_bits = _impl_._has_bits_[0];
-  _impl_.context_ = (cached_has_bits & 0x00000001u)
-                ? CreateMaybeMessage<::io::deephaven::proto::backplane::script::grpc::SignatureHelpContext>(arena, *from._impl_.context_)
-                : nullptr;
-  _impl_.text_document_ = (cached_has_bits & 0x00000002u)
-                ? CreateMaybeMessage<::io::deephaven::proto::backplane::script::grpc::VersionedTextDocumentIdentifier>(arena, *from._impl_.text_document_)
-                : nullptr;
-  _impl_.position_ = (cached_has_bits & 0x00000004u)
-                ? CreateMaybeMessage<::io::deephaven::proto::backplane::script::grpc::Position>(arena, *from._impl_.position_)
-                : nullptr;
-
-  // @@protoc_insertion_point(copy_constructor:io.deephaven.proto.backplane.script.grpc.GetSignatureHelpRequest)
-}
-inline PROTOBUF_NDEBUG_INLINE GetSignatureHelpRequest::Impl_::Impl_(
-    ::google::protobuf::internal::InternalVisibility visibility,
-    ::google::protobuf::Arena* arena)
-      : _cached_size_{0} {}
-
-inline void GetSignatureHelpRequest::SharedCtor(::_pb::Arena* arena) {
-  new (&_impl_) Impl_(internal_visibility(), arena);
-  ::memset(reinterpret_cast<char *>(&_impl_) +
-               offsetof(Impl_, context_),
-           0,
-           offsetof(Impl_, position_) -
-               offsetof(Impl_, context_) +
-               sizeof(Impl_::position_));
-}
-GetSignatureHelpRequest::~GetSignatureHelpRequest() {
-  // @@protoc_insertion_point(destructor:io.deephaven.proto.backplane.script.grpc.GetSignatureHelpRequest)
-  _internal_metadata_.Delete<::google::protobuf::UnknownFieldSet>();
-  SharedDtor();
-}
-inline void GetSignatureHelpRequest::SharedDtor() {
-  ABSL_DCHECK(GetArena() == nullptr);
-  delete _impl_.context_;
-  delete _impl_.text_document_;
-  delete _impl_.position_;
-  _impl_.~Impl_();
-}
-
-PROTOBUF_NOINLINE void GetSignatureHelpRequest::Clear() {
-// @@protoc_insertion_point(message_clear_start:io.deephaven.proto.backplane.script.grpc.GetSignatureHelpRequest)
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  ::uint32_t cached_has_bits = 0;
-  // Prevent compiler warnings about cached_has_bits being unused
-  (void) cached_has_bits;
-
-  cached_has_bits = _impl_._has_bits_[0];
-  if (cached_has_bits & 0x00000007u) {
-    if (cached_has_bits & 0x00000001u) {
-      ABSL_DCHECK(_impl_.context_ != nullptr);
-      _impl_.context_->Clear();
-    }
-    if (cached_has_bits & 0x00000002u) {
-      ABSL_DCHECK(_impl_.text_document_ != nullptr);
-      _impl_.text_document_->Clear();
-    }
-    if (cached_has_bits & 0x00000004u) {
-      ABSL_DCHECK(_impl_.position_ != nullptr);
-      _impl_.position_->Clear();
-    }
-  }
-  _impl_._has_bits_.Clear();
-  _internal_metadata_.Clear<::google::protobuf::UnknownFieldSet>();
-}
-
-const char* GetSignatureHelpRequest::_InternalParse(
-    const char* ptr, ::_pbi::ParseContext* ctx) {
-  ptr = ::_pbi::TcParser::ParseLoop(this, ptr, ctx, &_table_.header);
-  return ptr;
-}
-
-
-PROTOBUF_CONSTINIT PROTOBUF_ATTRIBUTE_INIT_PRIORITY1
-const ::_pbi::TcParseTable<2, 3, 3, 0, 2> GetSignatureHelpRequest::_table_ = {
-  {
-    PROTOBUF_FIELD_OFFSET(GetSignatureHelpRequest, _impl_._has_bits_),
-    0, // no _extensions_
-    3, 24,  // max_field_number, fast_idx_mask
-    offsetof(decltype(_table_), field_lookup_table),
-    4294967288,  // skipmap
-    offsetof(decltype(_table_), field_entries),
-    3,  // num_field_entries
-    3,  // num_aux_entries
-    offsetof(decltype(_table_), aux_entries),
-    &_GetSignatureHelpRequest_default_instance_._instance,
-    ::_pbi::TcParser::GenericFallback,  // fallback
-  }, {{
-    {::_pbi::TcParser::MiniParse, {}},
-    // .io.deephaven.proto.backplane.script.grpc.SignatureHelpContext context = 1;
-    {::_pbi::TcParser::FastMtS1,
-     {10, 0, 0, PROTOBUF_FIELD_OFFSET(GetSignatureHelpRequest, _impl_.context_)}},
-    // .io.deephaven.proto.backplane.script.grpc.VersionedTextDocumentIdentifier text_document = 2;
-    {::_pbi::TcParser::FastMtS1,
-     {18, 1, 1, PROTOBUF_FIELD_OFFSET(GetSignatureHelpRequest, _impl_.text_document_)}},
-    // .io.deephaven.proto.backplane.script.grpc.Position position = 3;
-    {::_pbi::TcParser::FastMtS1,
-     {26, 2, 2, PROTOBUF_FIELD_OFFSET(GetSignatureHelpRequest, _impl_.position_)}},
-  }}, {{
-    65535, 65535
-  }}, {{
-    // .io.deephaven.proto.backplane.script.grpc.SignatureHelpContext context = 1;
-    {PROTOBUF_FIELD_OFFSET(GetSignatureHelpRequest, _impl_.context_), _Internal::kHasBitsOffset + 0, 0,
-    (0 | ::_fl::kFcOptional | ::_fl::kMessage | ::_fl::kTvTable)},
-    // .io.deephaven.proto.backplane.script.grpc.VersionedTextDocumentIdentifier text_document = 2;
-    {PROTOBUF_FIELD_OFFSET(GetSignatureHelpRequest, _impl_.text_document_), _Internal::kHasBitsOffset + 1, 1,
-    (0 | ::_fl::kFcOptional | ::_fl::kMessage | ::_fl::kTvTable)},
-    // .io.deephaven.proto.backplane.script.grpc.Position position = 3;
-    {PROTOBUF_FIELD_OFFSET(GetSignatureHelpRequest, _impl_.position_), _Internal::kHasBitsOffset + 2, 2,
-    (0 | ::_fl::kFcOptional | ::_fl::kMessage | ::_fl::kTvTable)},
-  }}, {{
-    {::_pbi::TcParser::GetTable<::io::deephaven::proto::backplane::script::grpc::SignatureHelpContext>()},
-    {::_pbi::TcParser::GetTable<::io::deephaven::proto::backplane::script::grpc::VersionedTextDocumentIdentifier>()},
-    {::_pbi::TcParser::GetTable<::io::deephaven::proto::backplane::script::grpc::Position>()},
-  }}, {{
-  }},
-};
-
-::uint8_t* GetSignatureHelpRequest::_InternalSerialize(
-    ::uint8_t* target,
-    ::google::protobuf::io::EpsCopyOutputStream* stream) const {
-  // @@protoc_insertion_point(serialize_to_array_start:io.deephaven.proto.backplane.script.grpc.GetSignatureHelpRequest)
-  ::uint32_t cached_has_bits = 0;
-  (void)cached_has_bits;
-
-  cached_has_bits = _impl_._has_bits_[0];
-  // .io.deephaven.proto.backplane.script.grpc.SignatureHelpContext context = 1;
-  if (cached_has_bits & 0x00000001u) {
-    target = ::google::protobuf::internal::WireFormatLite::InternalWriteMessage(
-        1, _Internal::context(this),
-        _Internal::context(this).GetCachedSize(), target, stream);
-  }
-
-  // .io.deephaven.proto.backplane.script.grpc.VersionedTextDocumentIdentifier text_document = 2;
-  if (cached_has_bits & 0x00000002u) {
-    target = ::google::protobuf::internal::WireFormatLite::InternalWriteMessage(
-        2, _Internal::text_document(this),
-        _Internal::text_document(this).GetCachedSize(), target, stream);
-  }
-
-  // .io.deephaven.proto.backplane.script.grpc.Position position = 3;
-  if (cached_has_bits & 0x00000004u) {
-    target = ::google::protobuf::internal::WireFormatLite::InternalWriteMessage(
-        3, _Internal::position(this),
-        _Internal::position(this).GetCachedSize(), target, stream);
-  }
-
-  if (PROTOBUF_PREDICT_FALSE(_internal_metadata_.have_unknown_fields())) {
-    target =
-        ::_pbi::WireFormat::InternalSerializeUnknownFieldsToArray(
-            _internal_metadata_.unknown_fields<::google::protobuf::UnknownFieldSet>(::google::protobuf::UnknownFieldSet::default_instance), target, stream);
-  }
-  // @@protoc_insertion_point(serialize_to_array_end:io.deephaven.proto.backplane.script.grpc.GetSignatureHelpRequest)
-  return target;
-}
-
-::size_t GetSignatureHelpRequest::ByteSizeLong() const {
-// @@protoc_insertion_point(message_byte_size_start:io.deephaven.proto.backplane.script.grpc.GetSignatureHelpRequest)
-  ::size_t total_size = 0;
-
-  ::uint32_t cached_has_bits = 0;
-  // Prevent compiler warnings about cached_has_bits being unused
-  (void) cached_has_bits;
-
-  cached_has_bits = _impl_._has_bits_[0];
-  if (cached_has_bits & 0x00000007u) {
-    // .io.deephaven.proto.backplane.script.grpc.SignatureHelpContext context = 1;
-    if (cached_has_bits & 0x00000001u) {
-      total_size +=
-          1 + ::google::protobuf::internal::WireFormatLite::MessageSize(*_impl_.context_);
-    }
-
-    // .io.deephaven.proto.backplane.script.grpc.VersionedTextDocumentIdentifier text_document = 2;
-    if (cached_has_bits & 0x00000002u) {
-      total_size +=
-          1 + ::google::protobuf::internal::WireFormatLite::MessageSize(*_impl_.text_document_);
-    }
-
-    // .io.deephaven.proto.backplane.script.grpc.Position position = 3;
-    if (cached_has_bits & 0x00000004u) {
-      total_size +=
-          1 + ::google::protobuf::internal::WireFormatLite::MessageSize(*_impl_.position_);
-    }
-
-  }
-  return MaybeComputeUnknownFieldsSize(total_size, &_impl_._cached_size_);
-}
-
-const ::google::protobuf::Message::ClassData GetSignatureHelpRequest::_class_data_ = {
-    GetSignatureHelpRequest::MergeImpl,
-    nullptr,  // OnDemandRegisterArenaDtor
-};
-const ::google::protobuf::Message::ClassData* GetSignatureHelpRequest::GetClassData() const {
-  return &_class_data_;
-}
-
-void GetSignatureHelpRequest::MergeImpl(::google::protobuf::Message& to_msg, const ::google::protobuf::Message& from_msg) {
-  auto* const _this = static_cast<GetSignatureHelpRequest*>(&to_msg);
-  auto& from = static_cast<const GetSignatureHelpRequest&>(from_msg);
-  // @@protoc_insertion_point(class_specific_merge_from_start:io.deephaven.proto.backplane.script.grpc.GetSignatureHelpRequest)
-  ABSL_DCHECK_NE(&from, _this);
-  ::uint32_t cached_has_bits = 0;
-  (void) cached_has_bits;
-
-  cached_has_bits = from._impl_._has_bits_[0];
-  if (cached_has_bits & 0x00000007u) {
-    if (cached_has_bits & 0x00000001u) {
-      _this->_internal_mutable_context()->::io::deephaven::proto::backplane::script::grpc::SignatureHelpContext::MergeFrom(
-          from._internal_context());
-    }
-    if (cached_has_bits & 0x00000002u) {
-      _this->_internal_mutable_text_document()->::io::deephaven::proto::backplane::script::grpc::VersionedTextDocumentIdentifier::MergeFrom(
-          from._internal_text_document());
-    }
-    if (cached_has_bits & 0x00000004u) {
-      _this->_internal_mutable_position()->::io::deephaven::proto::backplane::script::grpc::Position::MergeFrom(
-          from._internal_position());
-    }
-  }
-  _this->_internal_metadata_.MergeFrom<::google::protobuf::UnknownFieldSet>(from._internal_metadata_);
-}
-
-void GetSignatureHelpRequest::CopyFrom(const GetSignatureHelpRequest& from) {
-// @@protoc_insertion_point(class_specific_copy_from_start:io.deephaven.proto.backplane.script.grpc.GetSignatureHelpRequest)
-  if (&from == this) return;
-  Clear();
-  MergeFrom(from);
-}
-
-PROTOBUF_NOINLINE bool GetSignatureHelpRequest::IsInitialized() const {
-  return true;
-}
-
-::_pbi::CachedSize* GetSignatureHelpRequest::AccessCachedSize() const {
-  return &_impl_._cached_size_;
-}
-void GetSignatureHelpRequest::InternalSwap(GetSignatureHelpRequest* PROTOBUF_RESTRICT other) {
-  using std::swap;
-  _internal_metadata_.InternalSwap(&other->_internal_metadata_);
-  swap(_impl_._has_bits_[0], other->_impl_._has_bits_[0]);
-  ::google::protobuf::internal::memswap<
-      PROTOBUF_FIELD_OFFSET(GetSignatureHelpRequest, _impl_.position_)
-      + sizeof(GetSignatureHelpRequest::_impl_.position_)
-      - PROTOBUF_FIELD_OFFSET(GetSignatureHelpRequest, _impl_.context_)>(
-          reinterpret_cast<char*>(&_impl_.context_),
-          reinterpret_cast<char*>(&other->_impl_.context_));
-}
-
-::google::protobuf::Metadata GetSignatureHelpRequest::GetMetadata() const {
-  return ::_pbi::AssignDescriptors(
-      &descriptor_table_deephaven_2fproto_2fconsole_2eproto_getter, &descriptor_table_deephaven_2fproto_2fconsole_2eproto_once,
-      file_level_metadata_deephaven_2fproto_2fconsole_2eproto[33]);
-}
-// ===================================================================
-
-class SignatureHelpContext::_Internal {
- public:
-  using HasBits = decltype(std::declval<SignatureHelpContext>()._impl_._has_bits_);
-  static constexpr ::int32_t kHasBitsOffset =
-    8 * PROTOBUF_FIELD_OFFSET(SignatureHelpContext, _impl_._has_bits_);
-  static void set_has_trigger_character(HasBits* has_bits) {
-    (*has_bits)[0] |= 1u;
-  }
-  static const ::io::deephaven::proto::backplane::script::grpc::GetSignatureHelpResponse& active_signature_help(const SignatureHelpContext* msg);
-  static void set_has_active_signature_help(HasBits* has_bits) {
-    (*has_bits)[0] |= 2u;
-  }
-};
-
-const ::io::deephaven::proto::backplane::script::grpc::GetSignatureHelpResponse& SignatureHelpContext::_Internal::active_signature_help(const SignatureHelpContext* msg) {
-  return *msg->_impl_.active_signature_help_;
-}
-SignatureHelpContext::SignatureHelpContext(::google::protobuf::Arena* arena)
-    : ::google::protobuf::Message(arena) {
-  SharedCtor(arena);
-  // @@protoc_insertion_point(arena_constructor:io.deephaven.proto.backplane.script.grpc.SignatureHelpContext)
-}
-inline PROTOBUF_NDEBUG_INLINE SignatureHelpContext::Impl_::Impl_(
-    ::google::protobuf::internal::InternalVisibility visibility, ::google::protobuf::Arena* arena,
-    const Impl_& from)
-      : _has_bits_{from._has_bits_},
-        _cached_size_{0},
-        trigger_character_(arena, from.trigger_character_) {}
-
-SignatureHelpContext::SignatureHelpContext(
-    ::google::protobuf::Arena* arena,
-    const SignatureHelpContext& from)
-    : ::google::protobuf::Message(arena) {
-  SignatureHelpContext* const _this = this;
-  (void)_this;
-  _internal_metadata_.MergeFrom<::google::protobuf::UnknownFieldSet>(
-      from._internal_metadata_);
-  new (&_impl_) Impl_(internal_visibility(), arena, from._impl_);
-  ::uint32_t cached_has_bits = _impl_._has_bits_[0];
-  _impl_.active_signature_help_ = (cached_has_bits & 0x00000002u)
-                ? CreateMaybeMessage<::io::deephaven::proto::backplane::script::grpc::GetSignatureHelpResponse>(arena, *from._impl_.active_signature_help_)
-                : nullptr;
-  ::memcpy(reinterpret_cast<char *>(&_impl_) +
-               offsetof(Impl_, trigger_kind_),
-           reinterpret_cast<const char *>(&from._impl_) +
-               offsetof(Impl_, trigger_kind_),
-           offsetof(Impl_, is_retrigger_) -
-               offsetof(Impl_, trigger_kind_) +
-               sizeof(Impl_::is_retrigger_));
-
-  // @@protoc_insertion_point(copy_constructor:io.deephaven.proto.backplane.script.grpc.SignatureHelpContext)
-}
-inline PROTOBUF_NDEBUG_INLINE SignatureHelpContext::Impl_::Impl_(
-    ::google::protobuf::internal::InternalVisibility visibility,
-    ::google::protobuf::Arena* arena)
-      : _cached_size_{0},
-        trigger_character_(arena) {}
-
-inline void SignatureHelpContext::SharedCtor(::_pb::Arena* arena) {
-  new (&_impl_) Impl_(internal_visibility(), arena);
-  ::memset(reinterpret_cast<char *>(&_impl_) +
-               offsetof(Impl_, active_signature_help_),
-           0,
-           offsetof(Impl_, is_retrigger_) -
-               offsetof(Impl_, active_signature_help_) +
-               sizeof(Impl_::is_retrigger_));
-}
-SignatureHelpContext::~SignatureHelpContext() {
-  // @@protoc_insertion_point(destructor:io.deephaven.proto.backplane.script.grpc.SignatureHelpContext)
-  _internal_metadata_.Delete<::google::protobuf::UnknownFieldSet>();
-  SharedDtor();
-}
-inline void SignatureHelpContext::SharedDtor() {
-  ABSL_DCHECK(GetArena() == nullptr);
-  _impl_.trigger_character_.Destroy();
-  delete _impl_.active_signature_help_;
-  _impl_.~Impl_();
-}
-
-PROTOBUF_NOINLINE void SignatureHelpContext::Clear() {
-// @@protoc_insertion_point(message_clear_start:io.deephaven.proto.backplane.script.grpc.SignatureHelpContext)
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  ::uint32_t cached_has_bits = 0;
-  // Prevent compiler warnings about cached_has_bits being unused
-  (void) cached_has_bits;
-
-  cached_has_bits = _impl_._has_bits_[0];
-  if (cached_has_bits & 0x00000003u) {
-    if (cached_has_bits & 0x00000001u) {
-      _impl_.trigger_character_.ClearNonDefaultToEmpty();
-    }
-    if (cached_has_bits & 0x00000002u) {
-      ABSL_DCHECK(_impl_.active_signature_help_ != nullptr);
-      _impl_.active_signature_help_->Clear();
-    }
-  }
-  ::memset(&_impl_.trigger_kind_, 0, static_cast<::size_t>(
-      reinterpret_cast<char*>(&_impl_.is_retrigger_) -
-      reinterpret_cast<char*>(&_impl_.trigger_kind_)) + sizeof(_impl_.is_retrigger_));
-  _impl_._has_bits_.Clear();
-  _internal_metadata_.Clear<::google::protobuf::UnknownFieldSet>();
-}
-
-const char* SignatureHelpContext::_InternalParse(
-    const char* ptr, ::_pbi::ParseContext* ctx) {
-  ptr = ::_pbi::TcParser::ParseLoop(this, ptr, ctx, &_table_.header);
-  return ptr;
-}
-
-
-PROTOBUF_CONSTINIT PROTOBUF_ATTRIBUTE_INIT_PRIORITY1
-const ::_pbi::TcParseTable<2, 4, 1, 87, 2> SignatureHelpContext::_table_ = {
-  {
-    PROTOBUF_FIELD_OFFSET(SignatureHelpContext, _impl_._has_bits_),
-    0, // no _extensions_
-    4, 24,  // max_field_number, fast_idx_mask
-    offsetof(decltype(_table_), field_lookup_table),
-    4294967280,  // skipmap
-    offsetof(decltype(_table_), field_entries),
-    4,  // num_field_entries
-    1,  // num_aux_entries
-    offsetof(decltype(_table_), aux_entries),
-    &_SignatureHelpContext_default_instance_._instance,
-    ::_pbi::TcParser::GenericFallback,  // fallback
-  }, {{
-    // .io.deephaven.proto.backplane.script.grpc.GetSignatureHelpResponse active_signature_help = 4;
-    {::_pbi::TcParser::FastMtS1,
-     {34, 1, 0, PROTOBUF_FIELD_OFFSET(SignatureHelpContext, _impl_.active_signature_help_)}},
-    // int32 trigger_kind = 1;
-    {::_pbi::TcParser::SingularVarintNoZag1<::uint32_t, offsetof(SignatureHelpContext, _impl_.trigger_kind_), 63>(),
-     {8, 63, 0, PROTOBUF_FIELD_OFFSET(SignatureHelpContext, _impl_.trigger_kind_)}},
-    // optional string trigger_character = 2;
-    {::_pbi::TcParser::FastUS1,
-     {18, 0, 0, PROTOBUF_FIELD_OFFSET(SignatureHelpContext, _impl_.trigger_character_)}},
-    // bool is_retrigger = 3;
-    {::_pbi::TcParser::SingularVarintNoZag1<bool, offsetof(SignatureHelpContext, _impl_.is_retrigger_), 63>(),
-     {24, 63, 0, PROTOBUF_FIELD_OFFSET(SignatureHelpContext, _impl_.is_retrigger_)}},
-  }}, {{
-    65535, 65535
-  }}, {{
-    // int32 trigger_kind = 1;
-    {PROTOBUF_FIELD_OFFSET(SignatureHelpContext, _impl_.trigger_kind_), -1, 0,
-    (0 | ::_fl::kFcSingular | ::_fl::kInt32)},
-    // optional string trigger_character = 2;
-    {PROTOBUF_FIELD_OFFSET(SignatureHelpContext, _impl_.trigger_character_), _Internal::kHasBitsOffset + 0, 0,
-    (0 | ::_fl::kFcOptional | ::_fl::kUtf8String | ::_fl::kRepAString)},
-    // bool is_retrigger = 3;
-    {PROTOBUF_FIELD_OFFSET(SignatureHelpContext, _impl_.is_retrigger_), -1, 0,
-    (0 | ::_fl::kFcSingular | ::_fl::kBool)},
-    // .io.deephaven.proto.backplane.script.grpc.GetSignatureHelpResponse active_signature_help = 4;
-    {PROTOBUF_FIELD_OFFSET(SignatureHelpContext, _impl_.active_signature_help_), _Internal::kHasBitsOffset + 1, 0,
-    (0 | ::_fl::kFcOptional | ::_fl::kMessage | ::_fl::kTvTable)},
-  }}, {{
-    {::_pbi::TcParser::GetTable<::io::deephaven::proto::backplane::script::grpc::GetSignatureHelpResponse>()},
-  }}, {{
-    "\75\0\21\0\0\0\0\0"
-    "io.deephaven.proto.backplane.script.grpc.SignatureHelpContext"
-    "trigger_character"
-  }},
-};
-
-::uint8_t* SignatureHelpContext::_InternalSerialize(
-    ::uint8_t* target,
-    ::google::protobuf::io::EpsCopyOutputStream* stream) const {
-  // @@protoc_insertion_point(serialize_to_array_start:io.deephaven.proto.backplane.script.grpc.SignatureHelpContext)
-  ::uint32_t cached_has_bits = 0;
-  (void)cached_has_bits;
-
-  // int32 trigger_kind = 1;
-  if (this->_internal_trigger_kind() != 0) {
-    target = ::google::protobuf::internal::WireFormatLite::
-        WriteInt32ToArrayWithField<1>(
-            stream, this->_internal_trigger_kind(), target);
-  }
-
-  cached_has_bits = _impl_._has_bits_[0];
-  // optional string trigger_character = 2;
-  if (cached_has_bits & 0x00000001u) {
-    const std::string& _s = this->_internal_trigger_character();
-    ::google::protobuf::internal::WireFormatLite::VerifyUtf8String(
-        _s.data(), static_cast<int>(_s.length()), ::google::protobuf::internal::WireFormatLite::SERIALIZE, "io.deephaven.proto.backplane.script.grpc.SignatureHelpContext.trigger_character");
-    target = stream->WriteStringMaybeAliased(2, _s, target);
-  }
-
-  // bool is_retrigger = 3;
-  if (this->_internal_is_retrigger() != 0) {
-    target = stream->EnsureSpace(target);
-    target = ::_pbi::WireFormatLite::WriteBoolToArray(
-        3, this->_internal_is_retrigger(), target);
-  }
-
-  // .io.deephaven.proto.backplane.script.grpc.GetSignatureHelpResponse active_signature_help = 4;
-  if (cached_has_bits & 0x00000002u) {
-    target = ::google::protobuf::internal::WireFormatLite::InternalWriteMessage(
-        4, _Internal::active_signature_help(this),
-        _Internal::active_signature_help(this).GetCachedSize(), target, stream);
-  }
-
-  if (PROTOBUF_PREDICT_FALSE(_internal_metadata_.have_unknown_fields())) {
-    target =
-        ::_pbi::WireFormat::InternalSerializeUnknownFieldsToArray(
-            _internal_metadata_.unknown_fields<::google::protobuf::UnknownFieldSet>(::google::protobuf::UnknownFieldSet::default_instance), target, stream);
-  }
-  // @@protoc_insertion_point(serialize_to_array_end:io.deephaven.proto.backplane.script.grpc.SignatureHelpContext)
-  return target;
-}
-
-::size_t SignatureHelpContext::ByteSizeLong() const {
-// @@protoc_insertion_point(message_byte_size_start:io.deephaven.proto.backplane.script.grpc.SignatureHelpContext)
-  ::size_t total_size = 0;
-
-  ::uint32_t cached_has_bits = 0;
-  // Prevent compiler warnings about cached_has_bits being unused
-  (void) cached_has_bits;
-
-  cached_has_bits = _impl_._has_bits_[0];
-  if (cached_has_bits & 0x00000003u) {
-    // optional string trigger_character = 2;
-    if (cached_has_bits & 0x00000001u) {
-      total_size += 1 + ::google::protobuf::internal::WireFormatLite::StringSize(
-                                      this->_internal_trigger_character());
-    }
-
-    // .io.deephaven.proto.backplane.script.grpc.GetSignatureHelpResponse active_signature_help = 4;
-    if (cached_has_bits & 0x00000002u) {
-      total_size +=
-          1 + ::google::protobuf::internal::WireFormatLite::MessageSize(*_impl_.active_signature_help_);
-    }
-
-  }
-  // int32 trigger_kind = 1;
-  if (this->_internal_trigger_kind() != 0) {
-    total_size += ::_pbi::WireFormatLite::Int32SizePlusOne(
-        this->_internal_trigger_kind());
-  }
-
-  // bool is_retrigger = 3;
-  if (this->_internal_is_retrigger() != 0) {
-    total_size += 2;
-  }
-
-  return MaybeComputeUnknownFieldsSize(total_size, &_impl_._cached_size_);
-}
-
-const ::google::protobuf::Message::ClassData SignatureHelpContext::_class_data_ = {
-    SignatureHelpContext::MergeImpl,
-    nullptr,  // OnDemandRegisterArenaDtor
-};
-const ::google::protobuf::Message::ClassData* SignatureHelpContext::GetClassData() const {
-  return &_class_data_;
-}
-
-void SignatureHelpContext::MergeImpl(::google::protobuf::Message& to_msg, const ::google::protobuf::Message& from_msg) {
-  auto* const _this = static_cast<SignatureHelpContext*>(&to_msg);
-  auto& from = static_cast<const SignatureHelpContext&>(from_msg);
-  // @@protoc_insertion_point(class_specific_merge_from_start:io.deephaven.proto.backplane.script.grpc.SignatureHelpContext)
-  ABSL_DCHECK_NE(&from, _this);
-  ::uint32_t cached_has_bits = 0;
-  (void) cached_has_bits;
-
-  cached_has_bits = from._impl_._has_bits_[0];
-  if (cached_has_bits & 0x00000003u) {
-    if (cached_has_bits & 0x00000001u) {
-      _this->_internal_set_trigger_character(from._internal_trigger_character());
-    }
-    if (cached_has_bits & 0x00000002u) {
-      _this->_internal_mutable_active_signature_help()->::io::deephaven::proto::backplane::script::grpc::GetSignatureHelpResponse::MergeFrom(
-          from._internal_active_signature_help());
-    }
-  }
-  if (from._internal_trigger_kind() != 0) {
-    _this->_internal_set_trigger_kind(from._internal_trigger_kind());
-  }
-  if (from._internal_is_retrigger() != 0) {
-    _this->_internal_set_is_retrigger(from._internal_is_retrigger());
-  }
-  _this->_internal_metadata_.MergeFrom<::google::protobuf::UnknownFieldSet>(from._internal_metadata_);
-}
-
-void SignatureHelpContext::CopyFrom(const SignatureHelpContext& from) {
-// @@protoc_insertion_point(class_specific_copy_from_start:io.deephaven.proto.backplane.script.grpc.SignatureHelpContext)
-  if (&from == this) return;
-  Clear();
-  MergeFrom(from);
-}
-
-PROTOBUF_NOINLINE bool SignatureHelpContext::IsInitialized() const {
-  return true;
-}
-
-::_pbi::CachedSize* SignatureHelpContext::AccessCachedSize() const {
-  return &_impl_._cached_size_;
-}
-void SignatureHelpContext::InternalSwap(SignatureHelpContext* PROTOBUF_RESTRICT other) {
-  using std::swap;
-  auto* arena = GetArena();
-  ABSL_DCHECK_EQ(arena, other->GetArena());
-  _internal_metadata_.InternalSwap(&other->_internal_metadata_);
-  swap(_impl_._has_bits_[0], other->_impl_._has_bits_[0]);
-  ::_pbi::ArenaStringPtr::InternalSwap(&_impl_.trigger_character_, &other->_impl_.trigger_character_, arena);
-  ::google::protobuf::internal::memswap<
-      PROTOBUF_FIELD_OFFSET(SignatureHelpContext, _impl_.is_retrigger_)
-      + sizeof(SignatureHelpContext::_impl_.is_retrigger_)
-      - PROTOBUF_FIELD_OFFSET(SignatureHelpContext, _impl_.active_signature_help_)>(
-          reinterpret_cast<char*>(&_impl_.active_signature_help_),
-          reinterpret_cast<char*>(&other->_impl_.active_signature_help_));
-}
-
-::google::protobuf::Metadata SignatureHelpContext::GetMetadata() const {
-  return ::_pbi::AssignDescriptors(
-      &descriptor_table_deephaven_2fproto_2fconsole_2eproto_getter, &descriptor_table_deephaven_2fproto_2fconsole_2eproto_once,
-      file_level_metadata_deephaven_2fproto_2fconsole_2eproto[34]);
-}
-// ===================================================================
-
-class GetSignatureHelpResponse::_Internal {
- public:
-  using HasBits = decltype(std::declval<GetSignatureHelpResponse>()._impl_._has_bits_);
-  static constexpr ::int32_t kHasBitsOffset =
-    8 * PROTOBUF_FIELD_OFFSET(GetSignatureHelpResponse, _impl_._has_bits_);
-  static void set_has_active_signature(HasBits* has_bits) {
-    (*has_bits)[0] |= 1u;
-  }
-  static void set_has_active_parameter(HasBits* has_bits) {
-    (*has_bits)[0] |= 2u;
-  }
-};
-
-GetSignatureHelpResponse::GetSignatureHelpResponse(::google::protobuf::Arena* arena)
-    : ::google::protobuf::Message(arena) {
-  SharedCtor(arena);
-  // @@protoc_insertion_point(arena_constructor:io.deephaven.proto.backplane.script.grpc.GetSignatureHelpResponse)
-}
-inline PROTOBUF_NDEBUG_INLINE GetSignatureHelpResponse::Impl_::Impl_(
-    ::google::protobuf::internal::InternalVisibility visibility, ::google::protobuf::Arena* arena,
-    const Impl_& from)
-      : _has_bits_{from._has_bits_},
-        _cached_size_{0},
-        signatures_{visibility, arena, from.signatures_} {}
-
-GetSignatureHelpResponse::GetSignatureHelpResponse(
-    ::google::protobuf::Arena* arena,
-    const GetSignatureHelpResponse& from)
-    : ::google::protobuf::Message(arena) {
-  GetSignatureHelpResponse* const _this = this;
-  (void)_this;
-  _internal_metadata_.MergeFrom<::google::protobuf::UnknownFieldSet>(
-      from._internal_metadata_);
-  new (&_impl_) Impl_(internal_visibility(), arena, from._impl_);
-  ::memcpy(reinterpret_cast<char *>(&_impl_) +
-               offsetof(Impl_, active_signature_),
-           reinterpret_cast<const char *>(&from._impl_) +
-               offsetof(Impl_, active_signature_),
-           offsetof(Impl_, active_parameter_) -
-               offsetof(Impl_, active_signature_) +
-               sizeof(Impl_::active_parameter_));
-
-  // @@protoc_insertion_point(copy_constructor:io.deephaven.proto.backplane.script.grpc.GetSignatureHelpResponse)
-}
-inline PROTOBUF_NDEBUG_INLINE GetSignatureHelpResponse::Impl_::Impl_(
-    ::google::protobuf::internal::InternalVisibility visibility,
-    ::google::protobuf::Arena* arena)
-      : _cached_size_{0},
-        signatures_{visibility, arena} {}
-
-inline void GetSignatureHelpResponse::SharedCtor(::_pb::Arena* arena) {
-  new (&_impl_) Impl_(internal_visibility(), arena);
-  ::memset(reinterpret_cast<char *>(&_impl_) +
-               offsetof(Impl_, active_signature_),
-           0,
-           offsetof(Impl_, active_parameter_) -
-               offsetof(Impl_, active_signature_) +
-               sizeof(Impl_::active_parameter_));
-}
-GetSignatureHelpResponse::~GetSignatureHelpResponse() {
-  // @@protoc_insertion_point(destructor:io.deephaven.proto.backplane.script.grpc.GetSignatureHelpResponse)
-  _internal_metadata_.Delete<::google::protobuf::UnknownFieldSet>();
-  SharedDtor();
-}
-inline void GetSignatureHelpResponse::SharedDtor() {
-  ABSL_DCHECK(GetArena() == nullptr);
-  _impl_.~Impl_();
-}
-
-PROTOBUF_NOINLINE void GetSignatureHelpResponse::Clear() {
-// @@protoc_insertion_point(message_clear_start:io.deephaven.proto.backplane.script.grpc.GetSignatureHelpResponse)
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  ::uint32_t cached_has_bits = 0;
-  // Prevent compiler warnings about cached_has_bits being unused
-  (void) cached_has_bits;
-
-  _impl_.signatures_.Clear();
-  cached_has_bits = _impl_._has_bits_[0];
-  if (cached_has_bits & 0x00000003u) {
-    ::memset(&_impl_.active_signature_, 0, static_cast<::size_t>(
-        reinterpret_cast<char*>(&_impl_.active_parameter_) -
-        reinterpret_cast<char*>(&_impl_.active_signature_)) + sizeof(_impl_.active_parameter_));
-  }
-  _impl_._has_bits_.Clear();
-  _internal_metadata_.Clear<::google::protobuf::UnknownFieldSet>();
-}
-
-const char* GetSignatureHelpResponse::_InternalParse(
-    const char* ptr, ::_pbi::ParseContext* ctx) {
-  ptr = ::_pbi::TcParser::ParseLoop(this, ptr, ctx, &_table_.header);
-  return ptr;
-}
-
-
-PROTOBUF_CONSTINIT PROTOBUF_ATTRIBUTE_INIT_PRIORITY1
-const ::_pbi::TcParseTable<2, 3, 1, 0, 2> GetSignatureHelpResponse::_table_ = {
-  {
-    PROTOBUF_FIELD_OFFSET(GetSignatureHelpResponse, _impl_._has_bits_),
-    0, // no _extensions_
-    3, 24,  // max_field_number, fast_idx_mask
-    offsetof(decltype(_table_), field_lookup_table),
-    4294967288,  // skipmap
-    offsetof(decltype(_table_), field_entries),
-    3,  // num_field_entries
-    1,  // num_aux_entries
-    offsetof(decltype(_table_), aux_entries),
-    &_GetSignatureHelpResponse_default_instance_._instance,
-    ::_pbi::TcParser::GenericFallback,  // fallback
-  }, {{
-    {::_pbi::TcParser::MiniParse, {}},
-    // repeated .io.deephaven.proto.backplane.script.grpc.SignatureInformation signatures = 1;
-    {::_pbi::TcParser::FastMtR1,
-     {10, 63, 0, PROTOBUF_FIELD_OFFSET(GetSignatureHelpResponse, _impl_.signatures_)}},
-    // optional int32 active_signature = 2;
-    {::_pbi::TcParser::SingularVarintNoZag1<::uint32_t, offsetof(GetSignatureHelpResponse, _impl_.active_signature_), 0>(),
-     {16, 0, 0, PROTOBUF_FIELD_OFFSET(GetSignatureHelpResponse, _impl_.active_signature_)}},
-    // optional int32 active_parameter = 3;
-    {::_pbi::TcParser::SingularVarintNoZag1<::uint32_t, offsetof(GetSignatureHelpResponse, _impl_.active_parameter_), 1>(),
-     {24, 1, 0, PROTOBUF_FIELD_OFFSET(GetSignatureHelpResponse, _impl_.active_parameter_)}},
-  }}, {{
-    65535, 65535
-  }}, {{
-    // repeated .io.deephaven.proto.backplane.script.grpc.SignatureInformation signatures = 1;
-    {PROTOBUF_FIELD_OFFSET(GetSignatureHelpResponse, _impl_.signatures_), -1, 0,
-    (0 | ::_fl::kFcRepeated | ::_fl::kMessage | ::_fl::kTvTable)},
-    // optional int32 active_signature = 2;
-    {PROTOBUF_FIELD_OFFSET(GetSignatureHelpResponse, _impl_.active_signature_), _Internal::kHasBitsOffset + 0, 0,
-    (0 | ::_fl::kFcOptional | ::_fl::kInt32)},
-    // optional int32 active_parameter = 3;
-    {PROTOBUF_FIELD_OFFSET(GetSignatureHelpResponse, _impl_.active_parameter_), _Internal::kHasBitsOffset + 1, 0,
-    (0 | ::_fl::kFcOptional | ::_fl::kInt32)},
-  }}, {{
-    {::_pbi::TcParser::GetTable<::io::deephaven::proto::backplane::script::grpc::SignatureInformation>()},
-  }}, {{
-  }},
-};
-
-::uint8_t* GetSignatureHelpResponse::_InternalSerialize(
-    ::uint8_t* target,
-    ::google::protobuf::io::EpsCopyOutputStream* stream) const {
-  // @@protoc_insertion_point(serialize_to_array_start:io.deephaven.proto.backplane.script.grpc.GetSignatureHelpResponse)
-  ::uint32_t cached_has_bits = 0;
-  (void)cached_has_bits;
-
-  // repeated .io.deephaven.proto.backplane.script.grpc.SignatureInformation signatures = 1;
-  for (unsigned i = 0,
-      n = static_cast<unsigned>(this->_internal_signatures_size()); i < n; i++) {
-    const auto& repfield = this->_internal_signatures().Get(i);
-    target = ::google::protobuf::internal::WireFormatLite::
-        InternalWriteMessage(1, repfield, repfield.GetCachedSize(), target, stream);
-  }
-
-  cached_has_bits = _impl_._has_bits_[0];
-  // optional int32 active_signature = 2;
-  if (cached_has_bits & 0x00000001u) {
-    target = ::google::protobuf::internal::WireFormatLite::
-        WriteInt32ToArrayWithField<2>(
-            stream, this->_internal_active_signature(), target);
-  }
-
-  // optional int32 active_parameter = 3;
-  if (cached_has_bits & 0x00000002u) {
-    target = ::google::protobuf::internal::WireFormatLite::
-        WriteInt32ToArrayWithField<3>(
-            stream, this->_internal_active_parameter(), target);
-  }
-
-  if (PROTOBUF_PREDICT_FALSE(_internal_metadata_.have_unknown_fields())) {
-    target =
-        ::_pbi::WireFormat::InternalSerializeUnknownFieldsToArray(
-            _internal_metadata_.unknown_fields<::google::protobuf::UnknownFieldSet>(::google::protobuf::UnknownFieldSet::default_instance), target, stream);
-  }
-  // @@protoc_insertion_point(serialize_to_array_end:io.deephaven.proto.backplane.script.grpc.GetSignatureHelpResponse)
-  return target;
-}
-
-::size_t GetSignatureHelpResponse::ByteSizeLong() const {
-// @@protoc_insertion_point(message_byte_size_start:io.deephaven.proto.backplane.script.grpc.GetSignatureHelpResponse)
-  ::size_t total_size = 0;
-
-  ::uint32_t cached_has_bits = 0;
-  // Prevent compiler warnings about cached_has_bits being unused
-  (void) cached_has_bits;
-
-  // repeated .io.deephaven.proto.backplane.script.grpc.SignatureInformation signatures = 1;
-  total_size += 1UL * this->_internal_signatures_size();
-  for (const auto& msg : this->_internal_signatures()) {
-    total_size +=
-      ::google::protobuf::internal::WireFormatLite::MessageSize(msg);
-  }
-  cached_has_bits = _impl_._has_bits_[0];
-  if (cached_has_bits & 0x00000003u) {
-    // optional int32 active_signature = 2;
-    if (cached_has_bits & 0x00000001u) {
-      total_size += ::_pbi::WireFormatLite::Int32SizePlusOne(
-          this->_internal_active_signature());
-    }
-
-    // optional int32 active_parameter = 3;
-    if (cached_has_bits & 0x00000002u) {
-      total_size += ::_pbi::WireFormatLite::Int32SizePlusOne(
-          this->_internal_active_parameter());
-    }
-
-  }
-  return MaybeComputeUnknownFieldsSize(total_size, &_impl_._cached_size_);
-}
-
-const ::google::protobuf::Message::ClassData GetSignatureHelpResponse::_class_data_ = {
-    GetSignatureHelpResponse::MergeImpl,
-    nullptr,  // OnDemandRegisterArenaDtor
-};
-const ::google::protobuf::Message::ClassData* GetSignatureHelpResponse::GetClassData() const {
-  return &_class_data_;
-}
-
-void GetSignatureHelpResponse::MergeImpl(::google::protobuf::Message& to_msg, const ::google::protobuf::Message& from_msg) {
-  auto* const _this = static_cast<GetSignatureHelpResponse*>(&to_msg);
-  auto& from = static_cast<const GetSignatureHelpResponse&>(from_msg);
-  // @@protoc_insertion_point(class_specific_merge_from_start:io.deephaven.proto.backplane.script.grpc.GetSignatureHelpResponse)
-  ABSL_DCHECK_NE(&from, _this);
-  ::uint32_t cached_has_bits = 0;
-  (void) cached_has_bits;
-
-  _this->_internal_mutable_signatures()->MergeFrom(
-      from._internal_signatures());
-  cached_has_bits = from._impl_._has_bits_[0];
-  if (cached_has_bits & 0x00000003u) {
-    if (cached_has_bits & 0x00000001u) {
-      _this->_impl_.active_signature_ = from._impl_.active_signature_;
-    }
-    if (cached_has_bits & 0x00000002u) {
-      _this->_impl_.active_parameter_ = from._impl_.active_parameter_;
-    }
-    _this->_impl_._has_bits_[0] |= cached_has_bits;
-  }
-  _this->_internal_metadata_.MergeFrom<::google::protobuf::UnknownFieldSet>(from._internal_metadata_);
-}
-
-void GetSignatureHelpResponse::CopyFrom(const GetSignatureHelpResponse& from) {
-// @@protoc_insertion_point(class_specific_copy_from_start:io.deephaven.proto.backplane.script.grpc.GetSignatureHelpResponse)
-  if (&from == this) return;
-  Clear();
-  MergeFrom(from);
-}
-
-PROTOBUF_NOINLINE bool GetSignatureHelpResponse::IsInitialized() const {
-  return true;
-}
-
-::_pbi::CachedSize* GetSignatureHelpResponse::AccessCachedSize() const {
-  return &_impl_._cached_size_;
-}
-void GetSignatureHelpResponse::InternalSwap(GetSignatureHelpResponse* PROTOBUF_RESTRICT other) {
-  using std::swap;
-  _internal_metadata_.InternalSwap(&other->_internal_metadata_);
-  swap(_impl_._has_bits_[0], other->_impl_._has_bits_[0]);
-  _impl_.signatures_.InternalSwap(&other->_impl_.signatures_);
-  ::google::protobuf::internal::memswap<
-      PROTOBUF_FIELD_OFFSET(GetSignatureHelpResponse, _impl_.active_parameter_)
-      + sizeof(GetSignatureHelpResponse::_impl_.active_parameter_)
-      - PROTOBUF_FIELD_OFFSET(GetSignatureHelpResponse, _impl_.active_signature_)>(
-          reinterpret_cast<char*>(&_impl_.active_signature_),
-          reinterpret_cast<char*>(&other->_impl_.active_signature_));
-}
-
-::google::protobuf::Metadata GetSignatureHelpResponse::GetMetadata() const {
-  return ::_pbi::AssignDescriptors(
-      &descriptor_table_deephaven_2fproto_2fconsole_2eproto_getter, &descriptor_table_deephaven_2fproto_2fconsole_2eproto_once,
-      file_level_metadata_deephaven_2fproto_2fconsole_2eproto[35]);
-}
-// ===================================================================
-
-class SignatureInformation::_Internal {
- public:
-  using HasBits = decltype(std::declval<SignatureInformation>()._impl_._has_bits_);
-  static constexpr ::int32_t kHasBitsOffset =
-    8 * PROTOBUF_FIELD_OFFSET(SignatureInformation, _impl_._has_bits_);
-  static const ::io::deephaven::proto::backplane::script::grpc::MarkupContent& documentation(const SignatureInformation* msg);
-  static void set_has_documentation(HasBits* has_bits) {
-    (*has_bits)[0] |= 1u;
-  }
-  static void set_has_active_parameter(HasBits* has_bits) {
-    (*has_bits)[0] |= 2u;
-  }
-};
-
-const ::io::deephaven::proto::backplane::script::grpc::MarkupContent& SignatureInformation::_Internal::documentation(const SignatureInformation* msg) {
-  return *msg->_impl_.documentation_;
-}
-SignatureInformation::SignatureInformation(::google::protobuf::Arena* arena)
-    : ::google::protobuf::Message(arena) {
-  SharedCtor(arena);
-  // @@protoc_insertion_point(arena_constructor:io.deephaven.proto.backplane.script.grpc.SignatureInformation)
-}
-inline PROTOBUF_NDEBUG_INLINE SignatureInformation::Impl_::Impl_(
-    ::google::protobuf::internal::InternalVisibility visibility, ::google::protobuf::Arena* arena,
-    const Impl_& from)
-      : _has_bits_{from._has_bits_},
-        _cached_size_{0},
-        parameters_{visibility, arena, from.parameters_},
-        label_(arena, from.label_) {}
-
-SignatureInformation::SignatureInformation(
-    ::google::protobuf::Arena* arena,
-    const SignatureInformation& from)
-    : ::google::protobuf::Message(arena) {
-  SignatureInformation* const _this = this;
-  (void)_this;
-  _internal_metadata_.MergeFrom<::google::protobuf::UnknownFieldSet>(
-      from._internal_metadata_);
-  new (&_impl_) Impl_(internal_visibility(), arena, from._impl_);
-  ::uint32_t cached_has_bits = _impl_._has_bits_[0];
-  _impl_.documentation_ = (cached_has_bits & 0x00000001u)
-                ? CreateMaybeMessage<::io::deephaven::proto::backplane::script::grpc::MarkupContent>(arena, *from._impl_.documentation_)
-                : nullptr;
-  _impl_.active_parameter_ = from._impl_.active_parameter_;
-
-  // @@protoc_insertion_point(copy_constructor:io.deephaven.proto.backplane.script.grpc.SignatureInformation)
-}
-inline PROTOBUF_NDEBUG_INLINE SignatureInformation::Impl_::Impl_(
-    ::google::protobuf::internal::InternalVisibility visibility,
-    ::google::protobuf::Arena* arena)
-      : _cached_size_{0},
-        parameters_{visibility, arena},
-        label_(arena) {}
-
-inline void SignatureInformation::SharedCtor(::_pb::Arena* arena) {
-  new (&_impl_) Impl_(internal_visibility(), arena);
-  ::memset(reinterpret_cast<char *>(&_impl_) +
-               offsetof(Impl_, documentation_),
-           0,
-           offsetof(Impl_, active_parameter_) -
-               offsetof(Impl_, documentation_) +
-               sizeof(Impl_::active_parameter_));
-}
-SignatureInformation::~SignatureInformation() {
-  // @@protoc_insertion_point(destructor:io.deephaven.proto.backplane.script.grpc.SignatureInformation)
-  _internal_metadata_.Delete<::google::protobuf::UnknownFieldSet>();
-  SharedDtor();
-}
-inline void SignatureInformation::SharedDtor() {
-  ABSL_DCHECK(GetArena() == nullptr);
-  _impl_.label_.Destroy();
-  delete _impl_.documentation_;
-  _impl_.~Impl_();
-}
-
-PROTOBUF_NOINLINE void SignatureInformation::Clear() {
-// @@protoc_insertion_point(message_clear_start:io.deephaven.proto.backplane.script.grpc.SignatureInformation)
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  ::uint32_t cached_has_bits = 0;
-  // Prevent compiler warnings about cached_has_bits being unused
-  (void) cached_has_bits;
-
-  _impl_.parameters_.Clear();
-  _impl_.label_.ClearToEmpty();
-  cached_has_bits = _impl_._has_bits_[0];
-  if (cached_has_bits & 0x00000001u) {
-    ABSL_DCHECK(_impl_.documentation_ != nullptr);
-    _impl_.documentation_->Clear();
-  }
-  _impl_.active_parameter_ = 0;
-  _impl_._has_bits_.Clear();
-  _internal_metadata_.Clear<::google::protobuf::UnknownFieldSet>();
-}
-
-const char* SignatureInformation::_InternalParse(
-    const char* ptr, ::_pbi::ParseContext* ctx) {
-  ptr = ::_pbi::TcParser::ParseLoop(this, ptr, ctx, &_table_.header);
-  return ptr;
-}
-
-
-PROTOBUF_CONSTINIT PROTOBUF_ATTRIBUTE_INIT_PRIORITY1
-const ::_pbi::TcParseTable<2, 4, 2, 75, 2> SignatureInformation::_table_ = {
-  {
-    PROTOBUF_FIELD_OFFSET(SignatureInformation, _impl_._has_bits_),
-    0, // no _extensions_
-    4, 24,  // max_field_number, fast_idx_mask
-    offsetof(decltype(_table_), field_lookup_table),
-    4294967280,  // skipmap
-    offsetof(decltype(_table_), field_entries),
-    4,  // num_field_entries
-    2,  // num_aux_entries
-    offsetof(decltype(_table_), aux_entries),
-    &_SignatureInformation_default_instance_._instance,
-    ::_pbi::TcParser::GenericFallback,  // fallback
-  }, {{
-    // optional int32 active_parameter = 4;
-    {::_pbi::TcParser::SingularVarintNoZag1<::uint32_t, offsetof(SignatureInformation, _impl_.active_parameter_), 1>(),
-     {32, 1, 0, PROTOBUF_FIELD_OFFSET(SignatureInformation, _impl_.active_parameter_)}},
-    // string label = 1;
-    {::_pbi::TcParser::FastUS1,
-     {10, 63, 0, PROTOBUF_FIELD_OFFSET(SignatureInformation, _impl_.label_)}},
-    // .io.deephaven.proto.backplane.script.grpc.MarkupContent documentation = 2;
-    {::_pbi::TcParser::FastMtS1,
-     {18, 0, 0, PROTOBUF_FIELD_OFFSET(SignatureInformation, _impl_.documentation_)}},
-    // repeated .io.deephaven.proto.backplane.script.grpc.ParameterInformation parameters = 3;
-    {::_pbi::TcParser::FastMtR1,
-     {26, 63, 1, PROTOBUF_FIELD_OFFSET(SignatureInformation, _impl_.parameters_)}},
-  }}, {{
-    65535, 65535
-  }}, {{
-    // string label = 1;
-    {PROTOBUF_FIELD_OFFSET(SignatureInformation, _impl_.label_), -1, 0,
-    (0 | ::_fl::kFcSingular | ::_fl::kUtf8String | ::_fl::kRepAString)},
-    // .io.deephaven.proto.backplane.script.grpc.MarkupContent documentation = 2;
-    {PROTOBUF_FIELD_OFFSET(SignatureInformation, _impl_.documentation_), _Internal::kHasBitsOffset + 0, 0,
-    (0 | ::_fl::kFcOptional | ::_fl::kMessage | ::_fl::kTvTable)},
-    // repeated .io.deephaven.proto.backplane.script.grpc.ParameterInformation parameters = 3;
-    {PROTOBUF_FIELD_OFFSET(SignatureInformation, _impl_.parameters_), -1, 1,
-    (0 | ::_fl::kFcRepeated | ::_fl::kMessage | ::_fl::kTvTable)},
-    // optional int32 active_parameter = 4;
-    {PROTOBUF_FIELD_OFFSET(SignatureInformation, _impl_.active_parameter_), _Internal::kHasBitsOffset + 1, 0,
-    (0 | ::_fl::kFcOptional | ::_fl::kInt32)},
-  }}, {{
-    {::_pbi::TcParser::GetTable<::io::deephaven::proto::backplane::script::grpc::MarkupContent>()},
-    {::_pbi::TcParser::GetTable<::io::deephaven::proto::backplane::script::grpc::ParameterInformation>()},
-  }}, {{
-    "\75\5\0\0\0\0\0\0"
-    "io.deephaven.proto.backplane.script.grpc.SignatureInformation"
-    "label"
-  }},
-};
-
-::uint8_t* SignatureInformation::_InternalSerialize(
-    ::uint8_t* target,
-    ::google::protobuf::io::EpsCopyOutputStream* stream) const {
-  // @@protoc_insertion_point(serialize_to_array_start:io.deephaven.proto.backplane.script.grpc.SignatureInformation)
-  ::uint32_t cached_has_bits = 0;
-  (void)cached_has_bits;
-
-  // string label = 1;
-  if (!this->_internal_label().empty()) {
-    const std::string& _s = this->_internal_label();
-    ::google::protobuf::internal::WireFormatLite::VerifyUtf8String(
-        _s.data(), static_cast<int>(_s.length()), ::google::protobuf::internal::WireFormatLite::SERIALIZE, "io.deephaven.proto.backplane.script.grpc.SignatureInformation.label");
-    target = stream->WriteStringMaybeAliased(1, _s, target);
-  }
-
-  cached_has_bits = _impl_._has_bits_[0];
-  // .io.deephaven.proto.backplane.script.grpc.MarkupContent documentation = 2;
-  if (cached_has_bits & 0x00000001u) {
-    target = ::google::protobuf::internal::WireFormatLite::InternalWriteMessage(
-        2, _Internal::documentation(this),
-        _Internal::documentation(this).GetCachedSize(), target, stream);
-  }
-
-  // repeated .io.deephaven.proto.backplane.script.grpc.ParameterInformation parameters = 3;
-  for (unsigned i = 0,
-      n = static_cast<unsigned>(this->_internal_parameters_size()); i < n; i++) {
-    const auto& repfield = this->_internal_parameters().Get(i);
-    target = ::google::protobuf::internal::WireFormatLite::
-        InternalWriteMessage(3, repfield, repfield.GetCachedSize(), target, stream);
-  }
-
-  // optional int32 active_parameter = 4;
-  if (cached_has_bits & 0x00000002u) {
-    target = ::google::protobuf::internal::WireFormatLite::
-        WriteInt32ToArrayWithField<4>(
-            stream, this->_internal_active_parameter(), target);
-  }
-
-  if (PROTOBUF_PREDICT_FALSE(_internal_metadata_.have_unknown_fields())) {
-    target =
-        ::_pbi::WireFormat::InternalSerializeUnknownFieldsToArray(
-            _internal_metadata_.unknown_fields<::google::protobuf::UnknownFieldSet>(::google::protobuf::UnknownFieldSet::default_instance), target, stream);
-  }
-  // @@protoc_insertion_point(serialize_to_array_end:io.deephaven.proto.backplane.script.grpc.SignatureInformation)
-  return target;
-}
-
-::size_t SignatureInformation::ByteSizeLong() const {
-// @@protoc_insertion_point(message_byte_size_start:io.deephaven.proto.backplane.script.grpc.SignatureInformation)
-  ::size_t total_size = 0;
-
-  ::uint32_t cached_has_bits = 0;
-  // Prevent compiler warnings about cached_has_bits being unused
-  (void) cached_has_bits;
-
-  // repeated .io.deephaven.proto.backplane.script.grpc.ParameterInformation parameters = 3;
-  total_size += 1UL * this->_internal_parameters_size();
-  for (const auto& msg : this->_internal_parameters()) {
-    total_size +=
-      ::google::protobuf::internal::WireFormatLite::MessageSize(msg);
-  }
-  // string label = 1;
-  if (!this->_internal_label().empty()) {
-    total_size += 1 + ::google::protobuf::internal::WireFormatLite::StringSize(
-                                    this->_internal_label());
-  }
-
-  cached_has_bits = _impl_._has_bits_[0];
-  if (cached_has_bits & 0x00000003u) {
-    // .io.deephaven.proto.backplane.script.grpc.MarkupContent documentation = 2;
-    if (cached_has_bits & 0x00000001u) {
-      total_size +=
-          1 + ::google::protobuf::internal::WireFormatLite::MessageSize(*_impl_.documentation_);
-    }
-
-    // optional int32 active_parameter = 4;
-    if (cached_has_bits & 0x00000002u) {
-      total_size += ::_pbi::WireFormatLite::Int32SizePlusOne(
-          this->_internal_active_parameter());
-    }
-
-  }
-  return MaybeComputeUnknownFieldsSize(total_size, &_impl_._cached_size_);
-}
-
-const ::google::protobuf::Message::ClassData SignatureInformation::_class_data_ = {
-    SignatureInformation::MergeImpl,
-    nullptr,  // OnDemandRegisterArenaDtor
-};
-const ::google::protobuf::Message::ClassData* SignatureInformation::GetClassData() const {
-  return &_class_data_;
-}
-
-void SignatureInformation::MergeImpl(::google::protobuf::Message& to_msg, const ::google::protobuf::Message& from_msg) {
-  auto* const _this = static_cast<SignatureInformation*>(&to_msg);
-  auto& from = static_cast<const SignatureInformation&>(from_msg);
-  // @@protoc_insertion_point(class_specific_merge_from_start:io.deephaven.proto.backplane.script.grpc.SignatureInformation)
-  ABSL_DCHECK_NE(&from, _this);
-  ::uint32_t cached_has_bits = 0;
-  (void) cached_has_bits;
-
-  _this->_internal_mutable_parameters()->MergeFrom(
-      from._internal_parameters());
-  if (!from._internal_label().empty()) {
-    _this->_internal_set_label(from._internal_label());
-  }
-  cached_has_bits = from._impl_._has_bits_[0];
-  if (cached_has_bits & 0x00000003u) {
-    if (cached_has_bits & 0x00000001u) {
-      _this->_internal_mutable_documentation()->::io::deephaven::proto::backplane::script::grpc::MarkupContent::MergeFrom(
-          from._internal_documentation());
-    }
-    if (cached_has_bits & 0x00000002u) {
-      _this->_impl_.active_parameter_ = from._impl_.active_parameter_;
-    }
-    _this->_impl_._has_bits_[0] |= cached_has_bits;
-  }
-  _this->_internal_metadata_.MergeFrom<::google::protobuf::UnknownFieldSet>(from._internal_metadata_);
-}
-
-void SignatureInformation::CopyFrom(const SignatureInformation& from) {
-// @@protoc_insertion_point(class_specific_copy_from_start:io.deephaven.proto.backplane.script.grpc.SignatureInformation)
-  if (&from == this) return;
-  Clear();
-  MergeFrom(from);
-}
-
-PROTOBUF_NOINLINE bool SignatureInformation::IsInitialized() const {
-  return true;
-}
-
-::_pbi::CachedSize* SignatureInformation::AccessCachedSize() const {
-  return &_impl_._cached_size_;
-}
-void SignatureInformation::InternalSwap(SignatureInformation* PROTOBUF_RESTRICT other) {
-  using std::swap;
-  auto* arena = GetArena();
-  ABSL_DCHECK_EQ(arena, other->GetArena());
-  _internal_metadata_.InternalSwap(&other->_internal_metadata_);
-  swap(_impl_._has_bits_[0], other->_impl_._has_bits_[0]);
-  _impl_.parameters_.InternalSwap(&other->_impl_.parameters_);
-  ::_pbi::ArenaStringPtr::InternalSwap(&_impl_.label_, &other->_impl_.label_, arena);
-  ::google::protobuf::internal::memswap<
-      PROTOBUF_FIELD_OFFSET(SignatureInformation, _impl_.active_parameter_)
-      + sizeof(SignatureInformation::_impl_.active_parameter_)
-      - PROTOBUF_FIELD_OFFSET(SignatureInformation, _impl_.documentation_)>(
-          reinterpret_cast<char*>(&_impl_.documentation_),
-          reinterpret_cast<char*>(&other->_impl_.documentation_));
-}
-
-::google::protobuf::Metadata SignatureInformation::GetMetadata() const {
-  return ::_pbi::AssignDescriptors(
-      &descriptor_table_deephaven_2fproto_2fconsole_2eproto_getter, &descriptor_table_deephaven_2fproto_2fconsole_2eproto_once,
-      file_level_metadata_deephaven_2fproto_2fconsole_2eproto[36]);
-}
-// ===================================================================
-
-class ParameterInformation::_Internal {
- public:
-  using HasBits = decltype(std::declval<ParameterInformation>()._impl_._has_bits_);
-  static constexpr ::int32_t kHasBitsOffset =
-    8 * PROTOBUF_FIELD_OFFSET(ParameterInformation, _impl_._has_bits_);
-  static const ::io::deephaven::proto::backplane::script::grpc::MarkupContent& documentation(const ParameterInformation* msg);
-  static void set_has_documentation(HasBits* has_bits) {
-    (*has_bits)[0] |= 1u;
-  }
-};
-
-const ::io::deephaven::proto::backplane::script::grpc::MarkupContent& ParameterInformation::_Internal::documentation(const ParameterInformation* msg) {
-  return *msg->_impl_.documentation_;
-}
-ParameterInformation::ParameterInformation(::google::protobuf::Arena* arena)
-    : ::google::protobuf::Message(arena) {
-  SharedCtor(arena);
-  // @@protoc_insertion_point(arena_constructor:io.deephaven.proto.backplane.script.grpc.ParameterInformation)
-}
-inline PROTOBUF_NDEBUG_INLINE ParameterInformation::Impl_::Impl_(
-    ::google::protobuf::internal::InternalVisibility visibility, ::google::protobuf::Arena* arena,
-    const Impl_& from)
-      : _has_bits_{from._has_bits_},
-        _cached_size_{0},
-        label_(arena, from.label_) {}
-
-ParameterInformation::ParameterInformation(
-    ::google::protobuf::Arena* arena,
-    const ParameterInformation& from)
-    : ::google::protobuf::Message(arena) {
-  ParameterInformation* const _this = this;
-  (void)_this;
-  _internal_metadata_.MergeFrom<::google::protobuf::UnknownFieldSet>(
-      from._internal_metadata_);
-  new (&_impl_) Impl_(internal_visibility(), arena, from._impl_);
-  ::uint32_t cached_has_bits = _impl_._has_bits_[0];
-  _impl_.documentation_ = (cached_has_bits & 0x00000001u)
-                ? CreateMaybeMessage<::io::deephaven::proto::backplane::script::grpc::MarkupContent>(arena, *from._impl_.documentation_)
-                : nullptr;
-
-  // @@protoc_insertion_point(copy_constructor:io.deephaven.proto.backplane.script.grpc.ParameterInformation)
-}
-inline PROTOBUF_NDEBUG_INLINE ParameterInformation::Impl_::Impl_(
-    ::google::protobuf::internal::InternalVisibility visibility,
-    ::google::protobuf::Arena* arena)
-      : _cached_size_{0},
-        label_(arena) {}
-
-inline void ParameterInformation::SharedCtor(::_pb::Arena* arena) {
-  new (&_impl_) Impl_(internal_visibility(), arena);
-  _impl_.documentation_ = {};
-}
-ParameterInformation::~ParameterInformation() {
-  // @@protoc_insertion_point(destructor:io.deephaven.proto.backplane.script.grpc.ParameterInformation)
-  _internal_metadata_.Delete<::google::protobuf::UnknownFieldSet>();
-  SharedDtor();
-}
-inline void ParameterInformation::SharedDtor() {
-  ABSL_DCHECK(GetArena() == nullptr);
-  _impl_.label_.Destroy();
-  delete _impl_.documentation_;
-  _impl_.~Impl_();
-}
-
-PROTOBUF_NOINLINE void ParameterInformation::Clear() {
-// @@protoc_insertion_point(message_clear_start:io.deephaven.proto.backplane.script.grpc.ParameterInformation)
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  ::uint32_t cached_has_bits = 0;
-  // Prevent compiler warnings about cached_has_bits being unused
-  (void) cached_has_bits;
-
-  _impl_.label_.ClearToEmpty();
-  cached_has_bits = _impl_._has_bits_[0];
-  if (cached_has_bits & 0x00000001u) {
-    ABSL_DCHECK(_impl_.documentation_ != nullptr);
-    _impl_.documentation_->Clear();
-  }
-  _impl_._has_bits_.Clear();
-  _internal_metadata_.Clear<::google::protobuf::UnknownFieldSet>();
-}
-
-const char* ParameterInformation::_InternalParse(
-    const char* ptr, ::_pbi::ParseContext* ctx) {
-  ptr = ::_pbi::TcParser::ParseLoop(this, ptr, ctx, &_table_.header);
-  return ptr;
-}
-
-
-PROTOBUF_CONSTINIT PROTOBUF_ATTRIBUTE_INIT_PRIORITY1
-const ::_pbi::TcParseTable<1, 2, 1, 75, 2> ParameterInformation::_table_ = {
-  {
-    PROTOBUF_FIELD_OFFSET(ParameterInformation, _impl_._has_bits_),
-    0, // no _extensions_
-    2, 8,  // max_field_number, fast_idx_mask
-    offsetof(decltype(_table_), field_lookup_table),
-    4294967292,  // skipmap
-    offsetof(decltype(_table_), field_entries),
-    2,  // num_field_entries
-    1,  // num_aux_entries
-    offsetof(decltype(_table_), aux_entries),
-    &_ParameterInformation_default_instance_._instance,
-    ::_pbi::TcParser::GenericFallback,  // fallback
-  }, {{
-    // .io.deephaven.proto.backplane.script.grpc.MarkupContent documentation = 2;
-    {::_pbi::TcParser::FastMtS1,
-     {18, 0, 0, PROTOBUF_FIELD_OFFSET(ParameterInformation, _impl_.documentation_)}},
-    // string label = 1;
-    {::_pbi::TcParser::FastUS1,
-     {10, 63, 0, PROTOBUF_FIELD_OFFSET(ParameterInformation, _impl_.label_)}},
-  }}, {{
-    65535, 65535
-  }}, {{
-    // string label = 1;
-    {PROTOBUF_FIELD_OFFSET(ParameterInformation, _impl_.label_), -1, 0,
-    (0 | ::_fl::kFcSingular | ::_fl::kUtf8String | ::_fl::kRepAString)},
-    // .io.deephaven.proto.backplane.script.grpc.MarkupContent documentation = 2;
-    {PROTOBUF_FIELD_OFFSET(ParameterInformation, _impl_.documentation_), _Internal::kHasBitsOffset + 0, 0,
-    (0 | ::_fl::kFcOptional | ::_fl::kMessage | ::_fl::kTvTable)},
-  }}, {{
-    {::_pbi::TcParser::GetTable<::io::deephaven::proto::backplane::script::grpc::MarkupContent>()},
-  }}, {{
-    "\75\5\0\0\0\0\0\0"
-    "io.deephaven.proto.backplane.script.grpc.ParameterInformation"
-    "label"
-  }},
-};
-
-::uint8_t* ParameterInformation::_InternalSerialize(
-    ::uint8_t* target,
-    ::google::protobuf::io::EpsCopyOutputStream* stream) const {
-  // @@protoc_insertion_point(serialize_to_array_start:io.deephaven.proto.backplane.script.grpc.ParameterInformation)
-  ::uint32_t cached_has_bits = 0;
-  (void)cached_has_bits;
-
-  // string label = 1;
-  if (!this->_internal_label().empty()) {
-    const std::string& _s = this->_internal_label();
-    ::google::protobuf::internal::WireFormatLite::VerifyUtf8String(
-        _s.data(), static_cast<int>(_s.length()), ::google::protobuf::internal::WireFormatLite::SERIALIZE, "io.deephaven.proto.backplane.script.grpc.ParameterInformation.label");
-    target = stream->WriteStringMaybeAliased(1, _s, target);
-  }
-
-  cached_has_bits = _impl_._has_bits_[0];
-  // .io.deephaven.proto.backplane.script.grpc.MarkupContent documentation = 2;
-  if (cached_has_bits & 0x00000001u) {
-    target = ::google::protobuf::internal::WireFormatLite::InternalWriteMessage(
-        2, _Internal::documentation(this),
-        _Internal::documentation(this).GetCachedSize(), target, stream);
-  }
-
-  if (PROTOBUF_PREDICT_FALSE(_internal_metadata_.have_unknown_fields())) {
-    target =
-        ::_pbi::WireFormat::InternalSerializeUnknownFieldsToArray(
-            _internal_metadata_.unknown_fields<::google::protobuf::UnknownFieldSet>(::google::protobuf::UnknownFieldSet::default_instance), target, stream);
-  }
-  // @@protoc_insertion_point(serialize_to_array_end:io.deephaven.proto.backplane.script.grpc.ParameterInformation)
-  return target;
-}
-
-::size_t ParameterInformation::ByteSizeLong() const {
-// @@protoc_insertion_point(message_byte_size_start:io.deephaven.proto.backplane.script.grpc.ParameterInformation)
-  ::size_t total_size = 0;
-
-  ::uint32_t cached_has_bits = 0;
-  // Prevent compiler warnings about cached_has_bits being unused
-  (void) cached_has_bits;
-
-  // string label = 1;
-  if (!this->_internal_label().empty()) {
-    total_size += 1 + ::google::protobuf::internal::WireFormatLite::StringSize(
-                                    this->_internal_label());
-  }
-
-  // .io.deephaven.proto.backplane.script.grpc.MarkupContent documentation = 2;
-  cached_has_bits = _impl_._has_bits_[0];
-  if (cached_has_bits & 0x00000001u) {
-    total_size +=
-        1 + ::google::protobuf::internal::WireFormatLite::MessageSize(*_impl_.documentation_);
-  }
-
-  return MaybeComputeUnknownFieldsSize(total_size, &_impl_._cached_size_);
-}
-
-const ::google::protobuf::Message::ClassData ParameterInformation::_class_data_ = {
-    ParameterInformation::MergeImpl,
-    nullptr,  // OnDemandRegisterArenaDtor
-};
-const ::google::protobuf::Message::ClassData* ParameterInformation::GetClassData() const {
-  return &_class_data_;
-}
-
-void ParameterInformation::MergeImpl(::google::protobuf::Message& to_msg, const ::google::protobuf::Message& from_msg) {
-  auto* const _this = static_cast<ParameterInformation*>(&to_msg);
-  auto& from = static_cast<const ParameterInformation&>(from_msg);
-  // @@protoc_insertion_point(class_specific_merge_from_start:io.deephaven.proto.backplane.script.grpc.ParameterInformation)
-  ABSL_DCHECK_NE(&from, _this);
-  ::uint32_t cached_has_bits = 0;
-  (void) cached_has_bits;
-
-  if (!from._internal_label().empty()) {
-    _this->_internal_set_label(from._internal_label());
-  }
-  if ((from._impl_._has_bits_[0] & 0x00000001u) != 0) {
-    _this->_internal_mutable_documentation()->::io::deephaven::proto::backplane::script::grpc::MarkupContent::MergeFrom(
-        from._internal_documentation());
-  }
-  _this->_internal_metadata_.MergeFrom<::google::protobuf::UnknownFieldSet>(from._internal_metadata_);
-}
-
-void ParameterInformation::CopyFrom(const ParameterInformation& from) {
-// @@protoc_insertion_point(class_specific_copy_from_start:io.deephaven.proto.backplane.script.grpc.ParameterInformation)
-  if (&from == this) return;
-  Clear();
-  MergeFrom(from);
-}
-
-PROTOBUF_NOINLINE bool ParameterInformation::IsInitialized() const {
-  return true;
-}
-
-::_pbi::CachedSize* ParameterInformation::AccessCachedSize() const {
-  return &_impl_._cached_size_;
-}
-void ParameterInformation::InternalSwap(ParameterInformation* PROTOBUF_RESTRICT other) {
-  using std::swap;
-  auto* arena = GetArena();
-  ABSL_DCHECK_EQ(arena, other->GetArena());
-  _internal_metadata_.InternalSwap(&other->_internal_metadata_);
-  swap(_impl_._has_bits_[0], other->_impl_._has_bits_[0]);
-  ::_pbi::ArenaStringPtr::InternalSwap(&_impl_.label_, &other->_impl_.label_, arena);
-  swap(_impl_.documentation_, other->_impl_.documentation_);
-}
-
-::google::protobuf::Metadata ParameterInformation::GetMetadata() const {
-  return ::_pbi::AssignDescriptors(
-      &descriptor_table_deephaven_2fproto_2fconsole_2eproto_getter, &descriptor_table_deephaven_2fproto_2fconsole_2eproto_once,
-      file_level_metadata_deephaven_2fproto_2fconsole_2eproto[37]);
-}
-// ===================================================================
-
-class GetHoverRequest::_Internal {
- public:
-  using HasBits = decltype(std::declval<GetHoverRequest>()._impl_._has_bits_);
-  static constexpr ::int32_t kHasBitsOffset =
-    8 * PROTOBUF_FIELD_OFFSET(GetHoverRequest, _impl_._has_bits_);
-  static const ::io::deephaven::proto::backplane::script::grpc::VersionedTextDocumentIdentifier& text_document(const GetHoverRequest* msg);
-  static void set_has_text_document(HasBits* has_bits) {
-    (*has_bits)[0] |= 1u;
-  }
-  static const ::io::deephaven::proto::backplane::script::grpc::Position& position(const GetHoverRequest* msg);
-  static void set_has_position(HasBits* has_bits) {
-    (*has_bits)[0] |= 2u;
-  }
-};
-
-const ::io::deephaven::proto::backplane::script::grpc::VersionedTextDocumentIdentifier& GetHoverRequest::_Internal::text_document(const GetHoverRequest* msg) {
-  return *msg->_impl_.text_document_;
-}
-const ::io::deephaven::proto::backplane::script::grpc::Position& GetHoverRequest::_Internal::position(const GetHoverRequest* msg) {
-  return *msg->_impl_.position_;
-}
-GetHoverRequest::GetHoverRequest(::google::protobuf::Arena* arena)
-    : ::google::protobuf::Message(arena) {
-  SharedCtor(arena);
-  // @@protoc_insertion_point(arena_constructor:io.deephaven.proto.backplane.script.grpc.GetHoverRequest)
-}
-inline PROTOBUF_NDEBUG_INLINE GetHoverRequest::Impl_::Impl_(
-    ::google::protobuf::internal::InternalVisibility visibility, ::google::protobuf::Arena* arena,
-    const Impl_& from)
-      : _has_bits_{from._has_bits_},
-        _cached_size_{0} {}
-
-GetHoverRequest::GetHoverRequest(
-    ::google::protobuf::Arena* arena,
-    const GetHoverRequest& from)
-    : ::google::protobuf::Message(arena) {
-  GetHoverRequest* const _this = this;
-  (void)_this;
-  _internal_metadata_.MergeFrom<::google::protobuf::UnknownFieldSet>(
-      from._internal_metadata_);
-  new (&_impl_) Impl_(internal_visibility(), arena, from._impl_);
-  ::uint32_t cached_has_bits = _impl_._has_bits_[0];
-  _impl_.text_document_ = (cached_has_bits & 0x00000001u)
-                ? CreateMaybeMessage<::io::deephaven::proto::backplane::script::grpc::VersionedTextDocumentIdentifier>(arena, *from._impl_.text_document_)
-                : nullptr;
-  _impl_.position_ = (cached_has_bits & 0x00000002u)
-                ? CreateMaybeMessage<::io::deephaven::proto::backplane::script::grpc::Position>(arena, *from._impl_.position_)
-                : nullptr;
-
-  // @@protoc_insertion_point(copy_constructor:io.deephaven.proto.backplane.script.grpc.GetHoverRequest)
-}
-inline PROTOBUF_NDEBUG_INLINE GetHoverRequest::Impl_::Impl_(
-    ::google::protobuf::internal::InternalVisibility visibility,
-    ::google::protobuf::Arena* arena)
-      : _cached_size_{0} {}
-
-inline void GetHoverRequest::SharedCtor(::_pb::Arena* arena) {
-  new (&_impl_) Impl_(internal_visibility(), arena);
-  ::memset(reinterpret_cast<char *>(&_impl_) +
-               offsetof(Impl_, text_document_),
-           0,
-           offsetof(Impl_, position_) -
-               offsetof(Impl_, text_document_) +
-               sizeof(Impl_::position_));
-}
-GetHoverRequest::~GetHoverRequest() {
-  // @@protoc_insertion_point(destructor:io.deephaven.proto.backplane.script.grpc.GetHoverRequest)
-  _internal_metadata_.Delete<::google::protobuf::UnknownFieldSet>();
-  SharedDtor();
-}
-inline void GetHoverRequest::SharedDtor() {
-  ABSL_DCHECK(GetArena() == nullptr);
-  delete _impl_.text_document_;
-  delete _impl_.position_;
-  _impl_.~Impl_();
-}
-
-PROTOBUF_NOINLINE void GetHoverRequest::Clear() {
-// @@protoc_insertion_point(message_clear_start:io.deephaven.proto.backplane.script.grpc.GetHoverRequest)
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  ::uint32_t cached_has_bits = 0;
-  // Prevent compiler warnings about cached_has_bits being unused
-  (void) cached_has_bits;
-
-  cached_has_bits = _impl_._has_bits_[0];
-  if (cached_has_bits & 0x00000003u) {
-    if (cached_has_bits & 0x00000001u) {
-      ABSL_DCHECK(_impl_.text_document_ != nullptr);
-      _impl_.text_document_->Clear();
-    }
-    if (cached_has_bits & 0x00000002u) {
-      ABSL_DCHECK(_impl_.position_ != nullptr);
-      _impl_.position_->Clear();
-    }
-  }
-  _impl_._has_bits_.Clear();
-  _internal_metadata_.Clear<::google::protobuf::UnknownFieldSet>();
-}
-
-const char* GetHoverRequest::_InternalParse(
-    const char* ptr, ::_pbi::ParseContext* ctx) {
-  ptr = ::_pbi::TcParser::ParseLoop(this, ptr, ctx, &_table_.header);
-  return ptr;
-}
-
-
-PROTOBUF_CONSTINIT PROTOBUF_ATTRIBUTE_INIT_PRIORITY1
-const ::_pbi::TcParseTable<1, 2, 2, 0, 2> GetHoverRequest::_table_ = {
-  {
-    PROTOBUF_FIELD_OFFSET(GetHoverRequest, _impl_._has_bits_),
-    0, // no _extensions_
-    2, 8,  // max_field_number, fast_idx_mask
-    offsetof(decltype(_table_), field_lookup_table),
-    4294967292,  // skipmap
-    offsetof(decltype(_table_), field_entries),
-    2,  // num_field_entries
-    2,  // num_aux_entries
-    offsetof(decltype(_table_), aux_entries),
-    &_GetHoverRequest_default_instance_._instance,
-    ::_pbi::TcParser::GenericFallback,  // fallback
-  }, {{
-    // .io.deephaven.proto.backplane.script.grpc.Position position = 2;
-    {::_pbi::TcParser::FastMtS1,
-     {18, 1, 1, PROTOBUF_FIELD_OFFSET(GetHoverRequest, _impl_.position_)}},
-    // .io.deephaven.proto.backplane.script.grpc.VersionedTextDocumentIdentifier text_document = 1;
-    {::_pbi::TcParser::FastMtS1,
-     {10, 0, 0, PROTOBUF_FIELD_OFFSET(GetHoverRequest, _impl_.text_document_)}},
-  }}, {{
-    65535, 65535
-  }}, {{
-    // .io.deephaven.proto.backplane.script.grpc.VersionedTextDocumentIdentifier text_document = 1;
-    {PROTOBUF_FIELD_OFFSET(GetHoverRequest, _impl_.text_document_), _Internal::kHasBitsOffset + 0, 0,
-    (0 | ::_fl::kFcOptional | ::_fl::kMessage | ::_fl::kTvTable)},
-    // .io.deephaven.proto.backplane.script.grpc.Position position = 2;
-    {PROTOBUF_FIELD_OFFSET(GetHoverRequest, _impl_.position_), _Internal::kHasBitsOffset + 1, 1,
-    (0 | ::_fl::kFcOptional | ::_fl::kMessage | ::_fl::kTvTable)},
-  }}, {{
-    {::_pbi::TcParser::GetTable<::io::deephaven::proto::backplane::script::grpc::VersionedTextDocumentIdentifier>()},
-    {::_pbi::TcParser::GetTable<::io::deephaven::proto::backplane::script::grpc::Position>()},
-  }}, {{
-  }},
-};
-
-::uint8_t* GetHoverRequest::_InternalSerialize(
-    ::uint8_t* target,
-    ::google::protobuf::io::EpsCopyOutputStream* stream) const {
-  // @@protoc_insertion_point(serialize_to_array_start:io.deephaven.proto.backplane.script.grpc.GetHoverRequest)
-  ::uint32_t cached_has_bits = 0;
-  (void)cached_has_bits;
-
-  cached_has_bits = _impl_._has_bits_[0];
-  // .io.deephaven.proto.backplane.script.grpc.VersionedTextDocumentIdentifier text_document = 1;
-  if (cached_has_bits & 0x00000001u) {
-    target = ::google::protobuf::internal::WireFormatLite::InternalWriteMessage(
-        1, _Internal::text_document(this),
-        _Internal::text_document(this).GetCachedSize(), target, stream);
-  }
-
-  // .io.deephaven.proto.backplane.script.grpc.Position position = 2;
-  if (cached_has_bits & 0x00000002u) {
-    target = ::google::protobuf::internal::WireFormatLite::InternalWriteMessage(
-        2, _Internal::position(this),
-        _Internal::position(this).GetCachedSize(), target, stream);
-  }
-
-  if (PROTOBUF_PREDICT_FALSE(_internal_metadata_.have_unknown_fields())) {
-    target =
-        ::_pbi::WireFormat::InternalSerializeUnknownFieldsToArray(
-            _internal_metadata_.unknown_fields<::google::protobuf::UnknownFieldSet>(::google::protobuf::UnknownFieldSet::default_instance), target, stream);
-  }
-  // @@protoc_insertion_point(serialize_to_array_end:io.deephaven.proto.backplane.script.grpc.GetHoverRequest)
-  return target;
-}
-
-::size_t GetHoverRequest::ByteSizeLong() const {
-// @@protoc_insertion_point(message_byte_size_start:io.deephaven.proto.backplane.script.grpc.GetHoverRequest)
-  ::size_t total_size = 0;
-
-  ::uint32_t cached_has_bits = 0;
-  // Prevent compiler warnings about cached_has_bits being unused
-  (void) cached_has_bits;
-
-  cached_has_bits = _impl_._has_bits_[0];
-  if (cached_has_bits & 0x00000003u) {
-    // .io.deephaven.proto.backplane.script.grpc.VersionedTextDocumentIdentifier text_document = 1;
-    if (cached_has_bits & 0x00000001u) {
-      total_size +=
-          1 + ::google::protobuf::internal::WireFormatLite::MessageSize(*_impl_.text_document_);
-    }
-
-    // .io.deephaven.proto.backplane.script.grpc.Position position = 2;
-    if (cached_has_bits & 0x00000002u) {
-      total_size +=
-          1 + ::google::protobuf::internal::WireFormatLite::MessageSize(*_impl_.position_);
-    }
-
-  }
-  return MaybeComputeUnknownFieldsSize(total_size, &_impl_._cached_size_);
-}
-
-const ::google::protobuf::Message::ClassData GetHoverRequest::_class_data_ = {
-    GetHoverRequest::MergeImpl,
-    nullptr,  // OnDemandRegisterArenaDtor
-};
-const ::google::protobuf::Message::ClassData* GetHoverRequest::GetClassData() const {
-  return &_class_data_;
-}
-
-void GetHoverRequest::MergeImpl(::google::protobuf::Message& to_msg, const ::google::protobuf::Message& from_msg) {
-  auto* const _this = static_cast<GetHoverRequest*>(&to_msg);
-  auto& from = static_cast<const GetHoverRequest&>(from_msg);
-  // @@protoc_insertion_point(class_specific_merge_from_start:io.deephaven.proto.backplane.script.grpc.GetHoverRequest)
-  ABSL_DCHECK_NE(&from, _this);
-  ::uint32_t cached_has_bits = 0;
-  (void) cached_has_bits;
-
-  cached_has_bits = from._impl_._has_bits_[0];
-  if (cached_has_bits & 0x00000003u) {
-    if (cached_has_bits & 0x00000001u) {
-      _this->_internal_mutable_text_document()->::io::deephaven::proto::backplane::script::grpc::VersionedTextDocumentIdentifier::MergeFrom(
-          from._internal_text_document());
-    }
-    if (cached_has_bits & 0x00000002u) {
-      _this->_internal_mutable_position()->::io::deephaven::proto::backplane::script::grpc::Position::MergeFrom(
-          from._internal_position());
-    }
-  }
-  _this->_internal_metadata_.MergeFrom<::google::protobuf::UnknownFieldSet>(from._internal_metadata_);
-}
-
-void GetHoverRequest::CopyFrom(const GetHoverRequest& from) {
-// @@protoc_insertion_point(class_specific_copy_from_start:io.deephaven.proto.backplane.script.grpc.GetHoverRequest)
-  if (&from == this) return;
-  Clear();
-  MergeFrom(from);
-}
-
-PROTOBUF_NOINLINE bool GetHoverRequest::IsInitialized() const {
-  return true;
-}
-
-::_pbi::CachedSize* GetHoverRequest::AccessCachedSize() const {
-  return &_impl_._cached_size_;
-}
-void GetHoverRequest::InternalSwap(GetHoverRequest* PROTOBUF_RESTRICT other) {
-  using std::swap;
-  _internal_metadata_.InternalSwap(&other->_internal_metadata_);
-  swap(_impl_._has_bits_[0], other->_impl_._has_bits_[0]);
-  ::google::protobuf::internal::memswap<
-      PROTOBUF_FIELD_OFFSET(GetHoverRequest, _impl_.position_)
-      + sizeof(GetHoverRequest::_impl_.position_)
-      - PROTOBUF_FIELD_OFFSET(GetHoverRequest, _impl_.text_document_)>(
-          reinterpret_cast<char*>(&_impl_.text_document_),
-          reinterpret_cast<char*>(&other->_impl_.text_document_));
-}
-
-::google::protobuf::Metadata GetHoverRequest::GetMetadata() const {
-  return ::_pbi::AssignDescriptors(
-      &descriptor_table_deephaven_2fproto_2fconsole_2eproto_getter, &descriptor_table_deephaven_2fproto_2fconsole_2eproto_once,
-      file_level_metadata_deephaven_2fproto_2fconsole_2eproto[38]);
-}
-// ===================================================================
-
-class GetHoverResponse::_Internal {
- public:
-  using HasBits = decltype(std::declval<GetHoverResponse>()._impl_._has_bits_);
-  static constexpr ::int32_t kHasBitsOffset =
-    8 * PROTOBUF_FIELD_OFFSET(GetHoverResponse, _impl_._has_bits_);
-  static const ::io::deephaven::proto::backplane::script::grpc::MarkupContent& contents(const GetHoverResponse* msg);
-  static void set_has_contents(HasBits* has_bits) {
-    (*has_bits)[0] |= 1u;
-  }
-  static const ::io::deephaven::proto::backplane::script::grpc::DocumentRange& range(const GetHoverResponse* msg);
-  static void set_has_range(HasBits* has_bits) {
-    (*has_bits)[0] |= 2u;
-  }
-};
-
-const ::io::deephaven::proto::backplane::script::grpc::MarkupContent& GetHoverResponse::_Internal::contents(const GetHoverResponse* msg) {
-  return *msg->_impl_.contents_;
-}
-const ::io::deephaven::proto::backplane::script::grpc::DocumentRange& GetHoverResponse::_Internal::range(const GetHoverResponse* msg) {
-  return *msg->_impl_.range_;
-}
-GetHoverResponse::GetHoverResponse(::google::protobuf::Arena* arena)
-    : ::google::protobuf::Message(arena) {
-  SharedCtor(arena);
-  // @@protoc_insertion_point(arena_constructor:io.deephaven.proto.backplane.script.grpc.GetHoverResponse)
-}
-inline PROTOBUF_NDEBUG_INLINE GetHoverResponse::Impl_::Impl_(
-    ::google::protobuf::internal::InternalVisibility visibility, ::google::protobuf::Arena* arena,
-    const Impl_& from)
-      : _has_bits_{from._has_bits_},
-        _cached_size_{0} {}
-
-GetHoverResponse::GetHoverResponse(
-    ::google::protobuf::Arena* arena,
-    const GetHoverResponse& from)
-    : ::google::protobuf::Message(arena) {
-  GetHoverResponse* const _this = this;
-  (void)_this;
-  _internal_metadata_.MergeFrom<::google::protobuf::UnknownFieldSet>(
-      from._internal_metadata_);
-  new (&_impl_) Impl_(internal_visibility(), arena, from._impl_);
-  ::uint32_t cached_has_bits = _impl_._has_bits_[0];
-  _impl_.contents_ = (cached_has_bits & 0x00000001u)
-                ? CreateMaybeMessage<::io::deephaven::proto::backplane::script::grpc::MarkupContent>(arena, *from._impl_.contents_)
-                : nullptr;
-  _impl_.range_ = (cached_has_bits & 0x00000002u)
-                ? CreateMaybeMessage<::io::deephaven::proto::backplane::script::grpc::DocumentRange>(arena, *from._impl_.range_)
-                : nullptr;
-
-  // @@protoc_insertion_point(copy_constructor:io.deephaven.proto.backplane.script.grpc.GetHoverResponse)
-}
-inline PROTOBUF_NDEBUG_INLINE GetHoverResponse::Impl_::Impl_(
-    ::google::protobuf::internal::InternalVisibility visibility,
-    ::google::protobuf::Arena* arena)
-      : _cached_size_{0} {}
-
-inline void GetHoverResponse::SharedCtor(::_pb::Arena* arena) {
-  new (&_impl_) Impl_(internal_visibility(), arena);
-  ::memset(reinterpret_cast<char *>(&_impl_) +
-               offsetof(Impl_, contents_),
-           0,
-           offsetof(Impl_, range_) -
-               offsetof(Impl_, contents_) +
-               sizeof(Impl_::range_));
-}
-GetHoverResponse::~GetHoverResponse() {
-  // @@protoc_insertion_point(destructor:io.deephaven.proto.backplane.script.grpc.GetHoverResponse)
-  _internal_metadata_.Delete<::google::protobuf::UnknownFieldSet>();
-  SharedDtor();
-}
-inline void GetHoverResponse::SharedDtor() {
-  ABSL_DCHECK(GetArena() == nullptr);
-  delete _impl_.contents_;
-  delete _impl_.range_;
-  _impl_.~Impl_();
-}
-
-PROTOBUF_NOINLINE void GetHoverResponse::Clear() {
-// @@protoc_insertion_point(message_clear_start:io.deephaven.proto.backplane.script.grpc.GetHoverResponse)
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  ::uint32_t cached_has_bits = 0;
-  // Prevent compiler warnings about cached_has_bits being unused
-  (void) cached_has_bits;
-
-  cached_has_bits = _impl_._has_bits_[0];
-  if (cached_has_bits & 0x00000003u) {
-    if (cached_has_bits & 0x00000001u) {
-      ABSL_DCHECK(_impl_.contents_ != nullptr);
-      _impl_.contents_->Clear();
-    }
-    if (cached_has_bits & 0x00000002u) {
-      ABSL_DCHECK(_impl_.range_ != nullptr);
-      _impl_.range_->Clear();
-    }
-  }
-  _impl_._has_bits_.Clear();
-  _internal_metadata_.Clear<::google::protobuf::UnknownFieldSet>();
-}
-
-const char* GetHoverResponse::_InternalParse(
-    const char* ptr, ::_pbi::ParseContext* ctx) {
-  ptr = ::_pbi::TcParser::ParseLoop(this, ptr, ctx, &_table_.header);
-  return ptr;
-}
-
-
-PROTOBUF_CONSTINIT PROTOBUF_ATTRIBUTE_INIT_PRIORITY1
-const ::_pbi::TcParseTable<1, 2, 2, 0, 2> GetHoverResponse::_table_ = {
-  {
-    PROTOBUF_FIELD_OFFSET(GetHoverResponse, _impl_._has_bits_),
-    0, // no _extensions_
-    2, 8,  // max_field_number, fast_idx_mask
-    offsetof(decltype(_table_), field_lookup_table),
-    4294967292,  // skipmap
-    offsetof(decltype(_table_), field_entries),
-    2,  // num_field_entries
-    2,  // num_aux_entries
-    offsetof(decltype(_table_), aux_entries),
-    &_GetHoverResponse_default_instance_._instance,
-    ::_pbi::TcParser::GenericFallback,  // fallback
-  }, {{
-    // .io.deephaven.proto.backplane.script.grpc.DocumentRange range = 2;
-    {::_pbi::TcParser::FastMtS1,
-     {18, 1, 1, PROTOBUF_FIELD_OFFSET(GetHoverResponse, _impl_.range_)}},
-    // .io.deephaven.proto.backplane.script.grpc.MarkupContent contents = 1;
-    {::_pbi::TcParser::FastMtS1,
-     {10, 0, 0, PROTOBUF_FIELD_OFFSET(GetHoverResponse, _impl_.contents_)}},
-  }}, {{
-    65535, 65535
-  }}, {{
-    // .io.deephaven.proto.backplane.script.grpc.MarkupContent contents = 1;
-    {PROTOBUF_FIELD_OFFSET(GetHoverResponse, _impl_.contents_), _Internal::kHasBitsOffset + 0, 0,
-    (0 | ::_fl::kFcOptional | ::_fl::kMessage | ::_fl::kTvTable)},
-    // .io.deephaven.proto.backplane.script.grpc.DocumentRange range = 2;
-    {PROTOBUF_FIELD_OFFSET(GetHoverResponse, _impl_.range_), _Internal::kHasBitsOffset + 1, 1,
-    (0 | ::_fl::kFcOptional | ::_fl::kMessage | ::_fl::kTvTable)},
-  }}, {{
-    {::_pbi::TcParser::GetTable<::io::deephaven::proto::backplane::script::grpc::MarkupContent>()},
-    {::_pbi::TcParser::GetTable<::io::deephaven::proto::backplane::script::grpc::DocumentRange>()},
-  }}, {{
-  }},
-};
-
-::uint8_t* GetHoverResponse::_InternalSerialize(
-    ::uint8_t* target,
-    ::google::protobuf::io::EpsCopyOutputStream* stream) const {
-  // @@protoc_insertion_point(serialize_to_array_start:io.deephaven.proto.backplane.script.grpc.GetHoverResponse)
-  ::uint32_t cached_has_bits = 0;
-  (void)cached_has_bits;
-
-  cached_has_bits = _impl_._has_bits_[0];
-  // .io.deephaven.proto.backplane.script.grpc.MarkupContent contents = 1;
-  if (cached_has_bits & 0x00000001u) {
-    target = ::google::protobuf::internal::WireFormatLite::InternalWriteMessage(
-        1, _Internal::contents(this),
-        _Internal::contents(this).GetCachedSize(), target, stream);
-  }
-
-  // .io.deephaven.proto.backplane.script.grpc.DocumentRange range = 2;
-  if (cached_has_bits & 0x00000002u) {
-    target = ::google::protobuf::internal::WireFormatLite::InternalWriteMessage(
-        2, _Internal::range(this),
-        _Internal::range(this).GetCachedSize(), target, stream);
-  }
-
-  if (PROTOBUF_PREDICT_FALSE(_internal_metadata_.have_unknown_fields())) {
-    target =
-        ::_pbi::WireFormat::InternalSerializeUnknownFieldsToArray(
-            _internal_metadata_.unknown_fields<::google::protobuf::UnknownFieldSet>(::google::protobuf::UnknownFieldSet::default_instance), target, stream);
-  }
-  // @@protoc_insertion_point(serialize_to_array_end:io.deephaven.proto.backplane.script.grpc.GetHoverResponse)
-  return target;
-}
-
-::size_t GetHoverResponse::ByteSizeLong() const {
-// @@protoc_insertion_point(message_byte_size_start:io.deephaven.proto.backplane.script.grpc.GetHoverResponse)
-  ::size_t total_size = 0;
-
-  ::uint32_t cached_has_bits = 0;
-  // Prevent compiler warnings about cached_has_bits being unused
-  (void) cached_has_bits;
-
-  cached_has_bits = _impl_._has_bits_[0];
-  if (cached_has_bits & 0x00000003u) {
-    // .io.deephaven.proto.backplane.script.grpc.MarkupContent contents = 1;
-    if (cached_has_bits & 0x00000001u) {
-      total_size +=
-          1 + ::google::protobuf::internal::WireFormatLite::MessageSize(*_impl_.contents_);
-    }
-
-    // .io.deephaven.proto.backplane.script.grpc.DocumentRange range = 2;
-    if (cached_has_bits & 0x00000002u) {
-      total_size +=
-          1 + ::google::protobuf::internal::WireFormatLite::MessageSize(*_impl_.range_);
-    }
-
-  }
-  return MaybeComputeUnknownFieldsSize(total_size, &_impl_._cached_size_);
-}
-
-const ::google::protobuf::Message::ClassData GetHoverResponse::_class_data_ = {
-    GetHoverResponse::MergeImpl,
-    nullptr,  // OnDemandRegisterArenaDtor
-};
-const ::google::protobuf::Message::ClassData* GetHoverResponse::GetClassData() const {
-  return &_class_data_;
-}
-
-void GetHoverResponse::MergeImpl(::google::protobuf::Message& to_msg, const ::google::protobuf::Message& from_msg) {
-  auto* const _this = static_cast<GetHoverResponse*>(&to_msg);
-  auto& from = static_cast<const GetHoverResponse&>(from_msg);
-  // @@protoc_insertion_point(class_specific_merge_from_start:io.deephaven.proto.backplane.script.grpc.GetHoverResponse)
-  ABSL_DCHECK_NE(&from, _this);
-  ::uint32_t cached_has_bits = 0;
-  (void) cached_has_bits;
-
-  cached_has_bits = from._impl_._has_bits_[0];
-  if (cached_has_bits & 0x00000003u) {
-    if (cached_has_bits & 0x00000001u) {
-      _this->_internal_mutable_contents()->::io::deephaven::proto::backplane::script::grpc::MarkupContent::MergeFrom(
-          from._internal_contents());
-    }
-    if (cached_has_bits & 0x00000002u) {
-      _this->_internal_mutable_range()->::io::deephaven::proto::backplane::script::grpc::DocumentRange::MergeFrom(
-          from._internal_range());
-    }
-  }
-  _this->_internal_metadata_.MergeFrom<::google::protobuf::UnknownFieldSet>(from._internal_metadata_);
-}
-
-void GetHoverResponse::CopyFrom(const GetHoverResponse& from) {
-// @@protoc_insertion_point(class_specific_copy_from_start:io.deephaven.proto.backplane.script.grpc.GetHoverResponse)
-  if (&from == this) return;
-  Clear();
-  MergeFrom(from);
-}
-
-PROTOBUF_NOINLINE bool GetHoverResponse::IsInitialized() const {
-  return true;
-}
-
-::_pbi::CachedSize* GetHoverResponse::AccessCachedSize() const {
-  return &_impl_._cached_size_;
-}
-void GetHoverResponse::InternalSwap(GetHoverResponse* PROTOBUF_RESTRICT other) {
-  using std::swap;
-  _internal_metadata_.InternalSwap(&other->_internal_metadata_);
-  swap(_impl_._has_bits_[0], other->_impl_._has_bits_[0]);
-  ::google::protobuf::internal::memswap<
-      PROTOBUF_FIELD_OFFSET(GetHoverResponse, _impl_.range_)
-      + sizeof(GetHoverResponse::_impl_.range_)
-      - PROTOBUF_FIELD_OFFSET(GetHoverResponse, _impl_.contents_)>(
-          reinterpret_cast<char*>(&_impl_.contents_),
-          reinterpret_cast<char*>(&other->_impl_.contents_));
-}
-
-::google::protobuf::Metadata GetHoverResponse::GetMetadata() const {
-  return ::_pbi::AssignDescriptors(
-      &descriptor_table_deephaven_2fproto_2fconsole_2eproto_getter, &descriptor_table_deephaven_2fproto_2fconsole_2eproto_once,
-      file_level_metadata_deephaven_2fproto_2fconsole_2eproto[39]);
-}
-// ===================================================================
-
-class GetDiagnosticRequest::_Internal {
- public:
-  using HasBits = decltype(std::declval<GetDiagnosticRequest>()._impl_._has_bits_);
-  static constexpr ::int32_t kHasBitsOffset =
-    8 * PROTOBUF_FIELD_OFFSET(GetDiagnosticRequest, _impl_._has_bits_);
-  static const ::io::deephaven::proto::backplane::script::grpc::VersionedTextDocumentIdentifier& text_document(const GetDiagnosticRequest* msg);
-  static void set_has_text_document(HasBits* has_bits) {
-    (*has_bits)[0] |= 4u;
-  }
-  static void set_has_identifier(HasBits* has_bits) {
-    (*has_bits)[0] |= 1u;
-  }
-  static void set_has_previous_result_id(HasBits* has_bits) {
-    (*has_bits)[0] |= 2u;
-  }
-};
-
-const ::io::deephaven::proto::backplane::script::grpc::VersionedTextDocumentIdentifier& GetDiagnosticRequest::_Internal::text_document(const GetDiagnosticRequest* msg) {
-  return *msg->_impl_.text_document_;
-}
-GetDiagnosticRequest::GetDiagnosticRequest(::google::protobuf::Arena* arena)
-    : ::google::protobuf::Message(arena) {
-  SharedCtor(arena);
-  // @@protoc_insertion_point(arena_constructor:io.deephaven.proto.backplane.script.grpc.GetDiagnosticRequest)
-}
-inline PROTOBUF_NDEBUG_INLINE GetDiagnosticRequest::Impl_::Impl_(
-    ::google::protobuf::internal::InternalVisibility visibility, ::google::protobuf::Arena* arena,
-    const Impl_& from)
-      : _has_bits_{from._has_bits_},
-        _cached_size_{0},
-        identifier_(arena, from.identifier_),
-        previous_result_id_(arena, from.previous_result_id_) {}
-
-GetDiagnosticRequest::GetDiagnosticRequest(
-    ::google::protobuf::Arena* arena,
-    const GetDiagnosticRequest& from)
-    : ::google::protobuf::Message(arena) {
-  GetDiagnosticRequest* const _this = this;
-  (void)_this;
-  _internal_metadata_.MergeFrom<::google::protobuf::UnknownFieldSet>(
-      from._internal_metadata_);
-  new (&_impl_) Impl_(internal_visibility(), arena, from._impl_);
-  ::uint32_t cached_has_bits = _impl_._has_bits_[0];
-  _impl_.text_document_ = (cached_has_bits & 0x00000004u)
-                ? CreateMaybeMessage<::io::deephaven::proto::backplane::script::grpc::VersionedTextDocumentIdentifier>(arena, *from._impl_.text_document_)
-                : nullptr;
-
-  // @@protoc_insertion_point(copy_constructor:io.deephaven.proto.backplane.script.grpc.GetDiagnosticRequest)
-}
-inline PROTOBUF_NDEBUG_INLINE GetDiagnosticRequest::Impl_::Impl_(
-    ::google::protobuf::internal::InternalVisibility visibility,
-    ::google::protobuf::Arena* arena)
-      : _cached_size_{0},
-        identifier_(arena),
-        previous_result_id_(arena) {}
-
-inline void GetDiagnosticRequest::SharedCtor(::_pb::Arena* arena) {
-  new (&_impl_) Impl_(internal_visibility(), arena);
-  _impl_.text_document_ = {};
-}
-GetDiagnosticRequest::~GetDiagnosticRequest() {
-  // @@protoc_insertion_point(destructor:io.deephaven.proto.backplane.script.grpc.GetDiagnosticRequest)
-  _internal_metadata_.Delete<::google::protobuf::UnknownFieldSet>();
-  SharedDtor();
-}
-inline void GetDiagnosticRequest::SharedDtor() {
-  ABSL_DCHECK(GetArena() == nullptr);
-  _impl_.identifier_.Destroy();
-  _impl_.previous_result_id_.Destroy();
-  delete _impl_.text_document_;
-  _impl_.~Impl_();
-}
-
-PROTOBUF_NOINLINE void GetDiagnosticRequest::Clear() {
-// @@protoc_insertion_point(message_clear_start:io.deephaven.proto.backplane.script.grpc.GetDiagnosticRequest)
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  ::uint32_t cached_has_bits = 0;
-  // Prevent compiler warnings about cached_has_bits being unused
-  (void) cached_has_bits;
-
-  cached_has_bits = _impl_._has_bits_[0];
-  if (cached_has_bits & 0x00000007u) {
-    if (cached_has_bits & 0x00000001u) {
-      _impl_.identifier_.ClearNonDefaultToEmpty();
-    }
-    if (cached_has_bits & 0x00000002u) {
-      _impl_.previous_result_id_.ClearNonDefaultToEmpty();
-    }
-    if (cached_has_bits & 0x00000004u) {
-      ABSL_DCHECK(_impl_.text_document_ != nullptr);
-      _impl_.text_document_->Clear();
-    }
-  }
-  _impl_._has_bits_.Clear();
-  _internal_metadata_.Clear<::google::protobuf::UnknownFieldSet>();
-}
-
-const char* GetDiagnosticRequest::_InternalParse(
-    const char* ptr, ::_pbi::ParseContext* ctx) {
-  ptr = ::_pbi::TcParser::ParseLoop(this, ptr, ctx, &_table_.header);
-  return ptr;
-}
-
-
-PROTOBUF_CONSTINIT PROTOBUF_ATTRIBUTE_INIT_PRIORITY1
-const ::_pbi::TcParseTable<2, 3, 1, 98, 2> GetDiagnosticRequest::_table_ = {
-  {
-    PROTOBUF_FIELD_OFFSET(GetDiagnosticRequest, _impl_._has_bits_),
-    0, // no _extensions_
-    3, 24,  // max_field_number, fast_idx_mask
-    offsetof(decltype(_table_), field_lookup_table),
-    4294967288,  // skipmap
-    offsetof(decltype(_table_), field_entries),
-    3,  // num_field_entries
-    1,  // num_aux_entries
-    offsetof(decltype(_table_), aux_entries),
-    &_GetDiagnosticRequest_default_instance_._instance,
-    ::_pbi::TcParser::GenericFallback,  // fallback
-  }, {{
-    {::_pbi::TcParser::MiniParse, {}},
-    // .io.deephaven.proto.backplane.script.grpc.VersionedTextDocumentIdentifier text_document = 1;
-    {::_pbi::TcParser::FastMtS1,
-     {10, 2, 0, PROTOBUF_FIELD_OFFSET(GetDiagnosticRequest, _impl_.text_document_)}},
-    // optional string identifier = 2;
-    {::_pbi::TcParser::FastUS1,
-     {18, 0, 0, PROTOBUF_FIELD_OFFSET(GetDiagnosticRequest, _impl_.identifier_)}},
-    // optional string previous_result_id = 3;
-    {::_pbi::TcParser::FastUS1,
-     {26, 1, 0, PROTOBUF_FIELD_OFFSET(GetDiagnosticRequest, _impl_.previous_result_id_)}},
-  }}, {{
-    65535, 65535
-  }}, {{
-    // .io.deephaven.proto.backplane.script.grpc.VersionedTextDocumentIdentifier text_document = 1;
-    {PROTOBUF_FIELD_OFFSET(GetDiagnosticRequest, _impl_.text_document_), _Internal::kHasBitsOffset + 2, 0,
-    (0 | ::_fl::kFcOptional | ::_fl::kMessage | ::_fl::kTvTable)},
-    // optional string identifier = 2;
-    {PROTOBUF_FIELD_OFFSET(GetDiagnosticRequest, _impl_.identifier_), _Internal::kHasBitsOffset + 0, 0,
-    (0 | ::_fl::kFcOptional | ::_fl::kUtf8String | ::_fl::kRepAString)},
-    // optional string previous_result_id = 3;
-    {PROTOBUF_FIELD_OFFSET(GetDiagnosticRequest, _impl_.previous_result_id_), _Internal::kHasBitsOffset + 1, 0,
-    (0 | ::_fl::kFcOptional | ::_fl::kUtf8String | ::_fl::kRepAString)},
-  }}, {{
-    {::_pbi::TcParser::GetTable<::io::deephaven::proto::backplane::script::grpc::VersionedTextDocumentIdentifier>()},
-  }}, {{
-    "\75\0\12\22\0\0\0\0"
-    "io.deephaven.proto.backplane.script.grpc.GetDiagnosticRequest"
-    "identifier"
-    "previous_result_id"
-  }},
-};
-
-::uint8_t* GetDiagnosticRequest::_InternalSerialize(
-    ::uint8_t* target,
-    ::google::protobuf::io::EpsCopyOutputStream* stream) const {
-  // @@protoc_insertion_point(serialize_to_array_start:io.deephaven.proto.backplane.script.grpc.GetDiagnosticRequest)
-  ::uint32_t cached_has_bits = 0;
-  (void)cached_has_bits;
-
-  cached_has_bits = _impl_._has_bits_[0];
-  // .io.deephaven.proto.backplane.script.grpc.VersionedTextDocumentIdentifier text_document = 1;
-  if (cached_has_bits & 0x00000004u) {
-    target = ::google::protobuf::internal::WireFormatLite::InternalWriteMessage(
-        1, _Internal::text_document(this),
-        _Internal::text_document(this).GetCachedSize(), target, stream);
-  }
-
-  // optional string identifier = 2;
-  if (cached_has_bits & 0x00000001u) {
-    const std::string& _s = this->_internal_identifier();
-    ::google::protobuf::internal::WireFormatLite::VerifyUtf8String(
-        _s.data(), static_cast<int>(_s.length()), ::google::protobuf::internal::WireFormatLite::SERIALIZE, "io.deephaven.proto.backplane.script.grpc.GetDiagnosticRequest.identifier");
-    target = stream->WriteStringMaybeAliased(2, _s, target);
-  }
-
-  // optional string previous_result_id = 3;
-  if (cached_has_bits & 0x00000002u) {
-    const std::string& _s = this->_internal_previous_result_id();
-    ::google::protobuf::internal::WireFormatLite::VerifyUtf8String(
-        _s.data(), static_cast<int>(_s.length()), ::google::protobuf::internal::WireFormatLite::SERIALIZE, "io.deephaven.proto.backplane.script.grpc.GetDiagnosticRequest.previous_result_id");
-    target = stream->WriteStringMaybeAliased(3, _s, target);
-  }
-
-  if (PROTOBUF_PREDICT_FALSE(_internal_metadata_.have_unknown_fields())) {
-    target =
-        ::_pbi::WireFormat::InternalSerializeUnknownFieldsToArray(
-            _internal_metadata_.unknown_fields<::google::protobuf::UnknownFieldSet>(::google::protobuf::UnknownFieldSet::default_instance), target, stream);
-  }
-  // @@protoc_insertion_point(serialize_to_array_end:io.deephaven.proto.backplane.script.grpc.GetDiagnosticRequest)
-  return target;
-}
-
-::size_t GetDiagnosticRequest::ByteSizeLong() const {
-// @@protoc_insertion_point(message_byte_size_start:io.deephaven.proto.backplane.script.grpc.GetDiagnosticRequest)
-  ::size_t total_size = 0;
-
-  ::uint32_t cached_has_bits = 0;
-  // Prevent compiler warnings about cached_has_bits being unused
-  (void) cached_has_bits;
-
-  cached_has_bits = _impl_._has_bits_[0];
-  if (cached_has_bits & 0x00000007u) {
-    // optional string identifier = 2;
-    if (cached_has_bits & 0x00000001u) {
-      total_size += 1 + ::google::protobuf::internal::WireFormatLite::StringSize(
-                                      this->_internal_identifier());
-    }
-
-    // optional string previous_result_id = 3;
-    if (cached_has_bits & 0x00000002u) {
-      total_size += 1 + ::google::protobuf::internal::WireFormatLite::StringSize(
-                                      this->_internal_previous_result_id());
-    }
-
-    // .io.deephaven.proto.backplane.script.grpc.VersionedTextDocumentIdentifier text_document = 1;
-    if (cached_has_bits & 0x00000004u) {
-      total_size +=
-          1 + ::google::protobuf::internal::WireFormatLite::MessageSize(*_impl_.text_document_);
-    }
-
-  }
-  return MaybeComputeUnknownFieldsSize(total_size, &_impl_._cached_size_);
-}
-
-const ::google::protobuf::Message::ClassData GetDiagnosticRequest::_class_data_ = {
-    GetDiagnosticRequest::MergeImpl,
-    nullptr,  // OnDemandRegisterArenaDtor
-};
-const ::google::protobuf::Message::ClassData* GetDiagnosticRequest::GetClassData() const {
-  return &_class_data_;
-}
-
-void GetDiagnosticRequest::MergeImpl(::google::protobuf::Message& to_msg, const ::google::protobuf::Message& from_msg) {
-  auto* const _this = static_cast<GetDiagnosticRequest*>(&to_msg);
-  auto& from = static_cast<const GetDiagnosticRequest&>(from_msg);
-  // @@protoc_insertion_point(class_specific_merge_from_start:io.deephaven.proto.backplane.script.grpc.GetDiagnosticRequest)
-  ABSL_DCHECK_NE(&from, _this);
-  ::uint32_t cached_has_bits = 0;
-  (void) cached_has_bits;
-
-  cached_has_bits = from._impl_._has_bits_[0];
-  if (cached_has_bits & 0x00000007u) {
-    if (cached_has_bits & 0x00000001u) {
-      _this->_internal_set_identifier(from._internal_identifier());
-    }
-    if (cached_has_bits & 0x00000002u) {
-      _this->_internal_set_previous_result_id(from._internal_previous_result_id());
-    }
-    if (cached_has_bits & 0x00000004u) {
-      _this->_internal_mutable_text_document()->::io::deephaven::proto::backplane::script::grpc::VersionedTextDocumentIdentifier::MergeFrom(
-          from._internal_text_document());
-    }
-  }
-  _this->_internal_metadata_.MergeFrom<::google::protobuf::UnknownFieldSet>(from._internal_metadata_);
-}
-
-void GetDiagnosticRequest::CopyFrom(const GetDiagnosticRequest& from) {
-// @@protoc_insertion_point(class_specific_copy_from_start:io.deephaven.proto.backplane.script.grpc.GetDiagnosticRequest)
-  if (&from == this) return;
-  Clear();
-  MergeFrom(from);
-}
-
-PROTOBUF_NOINLINE bool GetDiagnosticRequest::IsInitialized() const {
-  return true;
-}
-
-::_pbi::CachedSize* GetDiagnosticRequest::AccessCachedSize() const {
-  return &_impl_._cached_size_;
-}
-void GetDiagnosticRequest::InternalSwap(GetDiagnosticRequest* PROTOBUF_RESTRICT other) {
-  using std::swap;
-  auto* arena = GetArena();
-  ABSL_DCHECK_EQ(arena, other->GetArena());
-  _internal_metadata_.InternalSwap(&other->_internal_metadata_);
-  swap(_impl_._has_bits_[0], other->_impl_._has_bits_[0]);
-  ::_pbi::ArenaStringPtr::InternalSwap(&_impl_.identifier_, &other->_impl_.identifier_, arena);
-  ::_pbi::ArenaStringPtr::InternalSwap(&_impl_.previous_result_id_, &other->_impl_.previous_result_id_, arena);
-  swap(_impl_.text_document_, other->_impl_.text_document_);
-}
-
-::google::protobuf::Metadata GetDiagnosticRequest::GetMetadata() const {
-  return ::_pbi::AssignDescriptors(
-      &descriptor_table_deephaven_2fproto_2fconsole_2eproto_getter, &descriptor_table_deephaven_2fproto_2fconsole_2eproto_once,
-      file_level_metadata_deephaven_2fproto_2fconsole_2eproto[40]);
-}
-// ===================================================================
-
-class GetPullDiagnosticResponse::_Internal {
- public:
-  using HasBits = decltype(std::declval<GetPullDiagnosticResponse>()._impl_._has_bits_);
-  static constexpr ::int32_t kHasBitsOffset =
-    8 * PROTOBUF_FIELD_OFFSET(GetPullDiagnosticResponse, _impl_._has_bits_);
-  static void set_has_result_id(HasBits* has_bits) {
-    (*has_bits)[0] |= 1u;
-  }
-};
-
-GetPullDiagnosticResponse::GetPullDiagnosticResponse(::google::protobuf::Arena* arena)
-    : ::google::protobuf::Message(arena) {
-  SharedCtor(arena);
-  // @@protoc_insertion_point(arena_constructor:io.deephaven.proto.backplane.script.grpc.GetPullDiagnosticResponse)
-}
-inline PROTOBUF_NDEBUG_INLINE GetPullDiagnosticResponse::Impl_::Impl_(
-    ::google::protobuf::internal::InternalVisibility visibility, ::google::protobuf::Arena* arena,
-    const Impl_& from)
-      : _has_bits_{from._has_bits_},
-        _cached_size_{0},
-        items_{visibility, arena, from.items_},
-        kind_(arena, from.kind_),
-        result_id_(arena, from.result_id_) {}
-
-GetPullDiagnosticResponse::GetPullDiagnosticResponse(
-    ::google::protobuf::Arena* arena,
-    const GetPullDiagnosticResponse& from)
-    : ::google::protobuf::Message(arena) {
-  GetPullDiagnosticResponse* const _this = this;
-  (void)_this;
-  _internal_metadata_.MergeFrom<::google::protobuf::UnknownFieldSet>(
-      from._internal_metadata_);
-  new (&_impl_) Impl_(internal_visibility(), arena, from._impl_);
-
-  // @@protoc_insertion_point(copy_constructor:io.deephaven.proto.backplane.script.grpc.GetPullDiagnosticResponse)
-}
-inline PROTOBUF_NDEBUG_INLINE GetPullDiagnosticResponse::Impl_::Impl_(
-    ::google::protobuf::internal::InternalVisibility visibility,
-    ::google::protobuf::Arena* arena)
-      : _cached_size_{0},
-        items_{visibility, arena},
-        kind_(arena),
-        result_id_(arena) {}
-
-inline void GetPullDiagnosticResponse::SharedCtor(::_pb::Arena* arena) {
-  new (&_impl_) Impl_(internal_visibility(), arena);
-}
-GetPullDiagnosticResponse::~GetPullDiagnosticResponse() {
-  // @@protoc_insertion_point(destructor:io.deephaven.proto.backplane.script.grpc.GetPullDiagnosticResponse)
-  _internal_metadata_.Delete<::google::protobuf::UnknownFieldSet>();
-  SharedDtor();
-}
-inline void GetPullDiagnosticResponse::SharedDtor() {
-  ABSL_DCHECK(GetArena() == nullptr);
-  _impl_.kind_.Destroy();
-  _impl_.result_id_.Destroy();
-  _impl_.~Impl_();
-}
-
-PROTOBUF_NOINLINE void GetPullDiagnosticResponse::Clear() {
-// @@protoc_insertion_point(message_clear_start:io.deephaven.proto.backplane.script.grpc.GetPullDiagnosticResponse)
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  ::uint32_t cached_has_bits = 0;
-  // Prevent compiler warnings about cached_has_bits being unused
-  (void) cached_has_bits;
-
-  _impl_.items_.Clear();
-  _impl_.kind_.ClearToEmpty();
-  cached_has_bits = _impl_._has_bits_[0];
-  if (cached_has_bits & 0x00000001u) {
-    _impl_.result_id_.ClearNonDefaultToEmpty();
-  }
-  _impl_._has_bits_.Clear();
-  _internal_metadata_.Clear<::google::protobuf::UnknownFieldSet>();
-}
-
-const char* GetPullDiagnosticResponse::_InternalParse(
-    const char* ptr, ::_pbi::ParseContext* ctx) {
-  ptr = ::_pbi::TcParser::ParseLoop(this, ptr, ctx, &_table_.header);
-  return ptr;
-}
-
-
-PROTOBUF_CONSTINIT PROTOBUF_ATTRIBUTE_INIT_PRIORITY1
-const ::_pbi::TcParseTable<2, 3, 1, 88, 2> GetPullDiagnosticResponse::_table_ = {
-  {
-    PROTOBUF_FIELD_OFFSET(GetPullDiagnosticResponse, _impl_._has_bits_),
-    0, // no _extensions_
-    3, 24,  // max_field_number, fast_idx_mask
-    offsetof(decltype(_table_), field_lookup_table),
-    4294967288,  // skipmap
-    offsetof(decltype(_table_), field_entries),
-    3,  // num_field_entries
-    1,  // num_aux_entries
-    offsetof(decltype(_table_), aux_entries),
-    &_GetPullDiagnosticResponse_default_instance_._instance,
-    ::_pbi::TcParser::GenericFallback,  // fallback
-  }, {{
-    {::_pbi::TcParser::MiniParse, {}},
-    // string kind = 1;
-    {::_pbi::TcParser::FastUS1,
-     {10, 63, 0, PROTOBUF_FIELD_OFFSET(GetPullDiagnosticResponse, _impl_.kind_)}},
-    // optional string result_id = 2;
-    {::_pbi::TcParser::FastUS1,
-     {18, 0, 0, PROTOBUF_FIELD_OFFSET(GetPullDiagnosticResponse, _impl_.result_id_)}},
-    // repeated .io.deephaven.proto.backplane.script.grpc.Diagnostic items = 3;
-    {::_pbi::TcParser::FastMtR1,
-     {26, 63, 0, PROTOBUF_FIELD_OFFSET(GetPullDiagnosticResponse, _impl_.items_)}},
-  }}, {{
-    65535, 65535
-  }}, {{
-    // string kind = 1;
-    {PROTOBUF_FIELD_OFFSET(GetPullDiagnosticResponse, _impl_.kind_), -1, 0,
-    (0 | ::_fl::kFcSingular | ::_fl::kUtf8String | ::_fl::kRepAString)},
-    // optional string result_id = 2;
-    {PROTOBUF_FIELD_OFFSET(GetPullDiagnosticResponse, _impl_.result_id_), _Internal::kHasBitsOffset + 0, 0,
-    (0 | ::_fl::kFcOptional | ::_fl::kUtf8String | ::_fl::kRepAString)},
-    // repeated .io.deephaven.proto.backplane.script.grpc.Diagnostic items = 3;
-    {PROTOBUF_FIELD_OFFSET(GetPullDiagnosticResponse, _impl_.items_), -1, 0,
-    (0 | ::_fl::kFcRepeated | ::_fl::kMessage | ::_fl::kTvTable)},
-  }}, {{
-    {::_pbi::TcParser::GetTable<::io::deephaven::proto::backplane::script::grpc::Diagnostic>()},
-  }}, {{
-    "\102\4\11\0\0\0\0\0"
-    "io.deephaven.proto.backplane.script.grpc.GetPullDiagnosticResponse"
-    "kind"
-    "result_id"
-  }},
-};
-
-::uint8_t* GetPullDiagnosticResponse::_InternalSerialize(
-    ::uint8_t* target,
-    ::google::protobuf::io::EpsCopyOutputStream* stream) const {
-  // @@protoc_insertion_point(serialize_to_array_start:io.deephaven.proto.backplane.script.grpc.GetPullDiagnosticResponse)
-  ::uint32_t cached_has_bits = 0;
-  (void)cached_has_bits;
-
-  // string kind = 1;
-  if (!this->_internal_kind().empty()) {
-    const std::string& _s = this->_internal_kind();
-    ::google::protobuf::internal::WireFormatLite::VerifyUtf8String(
-        _s.data(), static_cast<int>(_s.length()), ::google::protobuf::internal::WireFormatLite::SERIALIZE, "io.deephaven.proto.backplane.script.grpc.GetPullDiagnosticResponse.kind");
-    target = stream->WriteStringMaybeAliased(1, _s, target);
-  }
-
-  cached_has_bits = _impl_._has_bits_[0];
-  // optional string result_id = 2;
-  if (cached_has_bits & 0x00000001u) {
-    const std::string& _s = this->_internal_result_id();
-    ::google::protobuf::internal::WireFormatLite::VerifyUtf8String(
-        _s.data(), static_cast<int>(_s.length()), ::google::protobuf::internal::WireFormatLite::SERIALIZE, "io.deephaven.proto.backplane.script.grpc.GetPullDiagnosticResponse.result_id");
-    target = stream->WriteStringMaybeAliased(2, _s, target);
-  }
-
-  // repeated .io.deephaven.proto.backplane.script.grpc.Diagnostic items = 3;
-  for (unsigned i = 0,
-      n = static_cast<unsigned>(this->_internal_items_size()); i < n; i++) {
-    const auto& repfield = this->_internal_items().Get(i);
-    target = ::google::protobuf::internal::WireFormatLite::
-        InternalWriteMessage(3, repfield, repfield.GetCachedSize(), target, stream);
-  }
-
-  if (PROTOBUF_PREDICT_FALSE(_internal_metadata_.have_unknown_fields())) {
-    target =
-        ::_pbi::WireFormat::InternalSerializeUnknownFieldsToArray(
-            _internal_metadata_.unknown_fields<::google::protobuf::UnknownFieldSet>(::google::protobuf::UnknownFieldSet::default_instance), target, stream);
-  }
-  // @@protoc_insertion_point(serialize_to_array_end:io.deephaven.proto.backplane.script.grpc.GetPullDiagnosticResponse)
-  return target;
-}
-
-::size_t GetPullDiagnosticResponse::ByteSizeLong() const {
-// @@protoc_insertion_point(message_byte_size_start:io.deephaven.proto.backplane.script.grpc.GetPullDiagnosticResponse)
-  ::size_t total_size = 0;
-
-  ::uint32_t cached_has_bits = 0;
-  // Prevent compiler warnings about cached_has_bits being unused
-  (void) cached_has_bits;
-
-  // repeated .io.deephaven.proto.backplane.script.grpc.Diagnostic items = 3;
-  total_size += 1UL * this->_internal_items_size();
-  for (const auto& msg : this->_internal_items()) {
-    total_size +=
-      ::google::protobuf::internal::WireFormatLite::MessageSize(msg);
-  }
-  // string kind = 1;
-  if (!this->_internal_kind().empty()) {
-    total_size += 1 + ::google::protobuf::internal::WireFormatLite::StringSize(
-                                    this->_internal_kind());
-  }
-
-  // optional string result_id = 2;
-  cached_has_bits = _impl_._has_bits_[0];
-  if (cached_has_bits & 0x00000001u) {
-    total_size += 1 + ::google::protobuf::internal::WireFormatLite::StringSize(
-                                    this->_internal_result_id());
-  }
-
-  return MaybeComputeUnknownFieldsSize(total_size, &_impl_._cached_size_);
-}
-
-const ::google::protobuf::Message::ClassData GetPullDiagnosticResponse::_class_data_ = {
-    GetPullDiagnosticResponse::MergeImpl,
-    nullptr,  // OnDemandRegisterArenaDtor
-};
-const ::google::protobuf::Message::ClassData* GetPullDiagnosticResponse::GetClassData() const {
-  return &_class_data_;
-}
-
-void GetPullDiagnosticResponse::MergeImpl(::google::protobuf::Message& to_msg, const ::google::protobuf::Message& from_msg) {
-  auto* const _this = static_cast<GetPullDiagnosticResponse*>(&to_msg);
-  auto& from = static_cast<const GetPullDiagnosticResponse&>(from_msg);
-  // @@protoc_insertion_point(class_specific_merge_from_start:io.deephaven.proto.backplane.script.grpc.GetPullDiagnosticResponse)
-  ABSL_DCHECK_NE(&from, _this);
-  ::uint32_t cached_has_bits = 0;
-  (void) cached_has_bits;
-
-  _this->_internal_mutable_items()->MergeFrom(
-      from._internal_items());
-  if (!from._internal_kind().empty()) {
-    _this->_internal_set_kind(from._internal_kind());
-  }
-  if ((from._impl_._has_bits_[0] & 0x00000001u) != 0) {
-    _this->_internal_set_result_id(from._internal_result_id());
-  }
-  _this->_internal_metadata_.MergeFrom<::google::protobuf::UnknownFieldSet>(from._internal_metadata_);
-}
-
-void GetPullDiagnosticResponse::CopyFrom(const GetPullDiagnosticResponse& from) {
-// @@protoc_insertion_point(class_specific_copy_from_start:io.deephaven.proto.backplane.script.grpc.GetPullDiagnosticResponse)
-  if (&from == this) return;
-  Clear();
-  MergeFrom(from);
-}
-
-PROTOBUF_NOINLINE bool GetPullDiagnosticResponse::IsInitialized() const {
-  return true;
-}
-
-::_pbi::CachedSize* GetPullDiagnosticResponse::AccessCachedSize() const {
-  return &_impl_._cached_size_;
-}
-void GetPullDiagnosticResponse::InternalSwap(GetPullDiagnosticResponse* PROTOBUF_RESTRICT other) {
-  using std::swap;
-  auto* arena = GetArena();
-  ABSL_DCHECK_EQ(arena, other->GetArena());
-  _internal_metadata_.InternalSwap(&other->_internal_metadata_);
-  swap(_impl_._has_bits_[0], other->_impl_._has_bits_[0]);
-  _impl_.items_.InternalSwap(&other->_impl_.items_);
-  ::_pbi::ArenaStringPtr::InternalSwap(&_impl_.kind_, &other->_impl_.kind_, arena);
-  ::_pbi::ArenaStringPtr::InternalSwap(&_impl_.result_id_, &other->_impl_.result_id_, arena);
-}
-
-::google::protobuf::Metadata GetPullDiagnosticResponse::GetMetadata() const {
-  return ::_pbi::AssignDescriptors(
-      &descriptor_table_deephaven_2fproto_2fconsole_2eproto_getter, &descriptor_table_deephaven_2fproto_2fconsole_2eproto_once,
-      file_level_metadata_deephaven_2fproto_2fconsole_2eproto[41]);
-}
-// ===================================================================
-
-class GetPublishDiagnosticResponse::_Internal {
- public:
-  using HasBits = decltype(std::declval<GetPublishDiagnosticResponse>()._impl_._has_bits_);
-  static constexpr ::int32_t kHasBitsOffset =
-    8 * PROTOBUF_FIELD_OFFSET(GetPublishDiagnosticResponse, _impl_._has_bits_);
-  static void set_has_version(HasBits* has_bits) {
-    (*has_bits)[0] |= 1u;
-  }
-};
-
-GetPublishDiagnosticResponse::GetPublishDiagnosticResponse(::google::protobuf::Arena* arena)
-    : ::google::protobuf::Message(arena) {
-  SharedCtor(arena);
-  // @@protoc_insertion_point(arena_constructor:io.deephaven.proto.backplane.script.grpc.GetPublishDiagnosticResponse)
-}
-inline PROTOBUF_NDEBUG_INLINE GetPublishDiagnosticResponse::Impl_::Impl_(
-    ::google::protobuf::internal::InternalVisibility visibility, ::google::protobuf::Arena* arena,
-    const Impl_& from)
-      : _has_bits_{from._has_bits_},
-        _cached_size_{0},
-        diagnostics_{visibility, arena, from.diagnostics_},
-        uri_(arena, from.uri_) {}
-
-GetPublishDiagnosticResponse::GetPublishDiagnosticResponse(
-    ::google::protobuf::Arena* arena,
-    const GetPublishDiagnosticResponse& from)
-    : ::google::protobuf::Message(arena) {
-  GetPublishDiagnosticResponse* const _this = this;
-  (void)_this;
-  _internal_metadata_.MergeFrom<::google::protobuf::UnknownFieldSet>(
-      from._internal_metadata_);
-  new (&_impl_) Impl_(internal_visibility(), arena, from._impl_);
-  _impl_.version_ = from._impl_.version_;
-
-  // @@protoc_insertion_point(copy_constructor:io.deephaven.proto.backplane.script.grpc.GetPublishDiagnosticResponse)
-}
-inline PROTOBUF_NDEBUG_INLINE GetPublishDiagnosticResponse::Impl_::Impl_(
-    ::google::protobuf::internal::InternalVisibility visibility,
-    ::google::protobuf::Arena* arena)
-      : _cached_size_{0},
-        diagnostics_{visibility, arena},
-        uri_(arena) {}
-
-inline void GetPublishDiagnosticResponse::SharedCtor(::_pb::Arena* arena) {
-  new (&_impl_) Impl_(internal_visibility(), arena);
-  _impl_.version_ = {};
-}
-GetPublishDiagnosticResponse::~GetPublishDiagnosticResponse() {
-  // @@protoc_insertion_point(destructor:io.deephaven.proto.backplane.script.grpc.GetPublishDiagnosticResponse)
-  _internal_metadata_.Delete<::google::protobuf::UnknownFieldSet>();
-  SharedDtor();
-}
-inline void GetPublishDiagnosticResponse::SharedDtor() {
-  ABSL_DCHECK(GetArena() == nullptr);
-  _impl_.uri_.Destroy();
-  _impl_.~Impl_();
-}
-
-PROTOBUF_NOINLINE void GetPublishDiagnosticResponse::Clear() {
-// @@protoc_insertion_point(message_clear_start:io.deephaven.proto.backplane.script.grpc.GetPublishDiagnosticResponse)
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  ::uint32_t cached_has_bits = 0;
-  // Prevent compiler warnings about cached_has_bits being unused
-  (void) cached_has_bits;
-
-  _impl_.diagnostics_.Clear();
-  _impl_.uri_.ClearToEmpty();
-  _impl_.version_ = 0;
-  _impl_._has_bits_.Clear();
-  _internal_metadata_.Clear<::google::protobuf::UnknownFieldSet>();
-}
-
-const char* GetPublishDiagnosticResponse::_InternalParse(
-    const char* ptr, ::_pbi::ParseContext* ctx) {
-  ptr = ::_pbi::TcParser::ParseLoop(this, ptr, ctx, &_table_.header);
-  return ptr;
-}
-
-
-PROTOBUF_CONSTINIT PROTOBUF_ATTRIBUTE_INIT_PRIORITY1
-const ::_pbi::TcParseTable<2, 3, 1, 81, 2> GetPublishDiagnosticResponse::_table_ = {
-  {
-    PROTOBUF_FIELD_OFFSET(GetPublishDiagnosticResponse, _impl_._has_bits_),
-    0, // no _extensions_
-    3, 24,  // max_field_number, fast_idx_mask
-    offsetof(decltype(_table_), field_lookup_table),
-    4294967288,  // skipmap
-    offsetof(decltype(_table_), field_entries),
-    3,  // num_field_entries
-    1,  // num_aux_entries
-    offsetof(decltype(_table_), aux_entries),
-    &_GetPublishDiagnosticResponse_default_instance_._instance,
-    ::_pbi::TcParser::GenericFallback,  // fallback
-  }, {{
-    {::_pbi::TcParser::MiniParse, {}},
-    // string uri = 1;
-    {::_pbi::TcParser::FastUS1,
-     {10, 63, 0, PROTOBUF_FIELD_OFFSET(GetPublishDiagnosticResponse, _impl_.uri_)}},
-    // optional int32 version = 2;
-    {::_pbi::TcParser::SingularVarintNoZag1<::uint32_t, offsetof(GetPublishDiagnosticResponse, _impl_.version_), 0>(),
-     {16, 0, 0, PROTOBUF_FIELD_OFFSET(GetPublishDiagnosticResponse, _impl_.version_)}},
-    // repeated .io.deephaven.proto.backplane.script.grpc.Diagnostic diagnostics = 3;
-    {::_pbi::TcParser::FastMtR1,
-     {26, 63, 0, PROTOBUF_FIELD_OFFSET(GetPublishDiagnosticResponse, _impl_.diagnostics_)}},
-  }}, {{
-    65535, 65535
-  }}, {{
-    // string uri = 1;
-    {PROTOBUF_FIELD_OFFSET(GetPublishDiagnosticResponse, _impl_.uri_), -1, 0,
-    (0 | ::_fl::kFcSingular | ::_fl::kUtf8String | ::_fl::kRepAString)},
-    // optional int32 version = 2;
-    {PROTOBUF_FIELD_OFFSET(GetPublishDiagnosticResponse, _impl_.version_), _Internal::kHasBitsOffset + 0, 0,
-    (0 | ::_fl::kFcOptional | ::_fl::kInt32)},
-    // repeated .io.deephaven.proto.backplane.script.grpc.Diagnostic diagnostics = 3;
-    {PROTOBUF_FIELD_OFFSET(GetPublishDiagnosticResponse, _impl_.diagnostics_), -1, 0,
-    (0 | ::_fl::kFcRepeated | ::_fl::kMessage | ::_fl::kTvTable)},
-  }}, {{
-    {::_pbi::TcParser::GetTable<::io::deephaven::proto::backplane::script::grpc::Diagnostic>()},
-  }}, {{
-    "\105\3\0\0\0\0\0\0"
-    "io.deephaven.proto.backplane.script.grpc.GetPublishDiagnosticResponse"
-    "uri"
-  }},
-};
-
-::uint8_t* GetPublishDiagnosticResponse::_InternalSerialize(
-    ::uint8_t* target,
-    ::google::protobuf::io::EpsCopyOutputStream* stream) const {
-  // @@protoc_insertion_point(serialize_to_array_start:io.deephaven.proto.backplane.script.grpc.GetPublishDiagnosticResponse)
-  ::uint32_t cached_has_bits = 0;
-  (void)cached_has_bits;
-
-  // string uri = 1;
-  if (!this->_internal_uri().empty()) {
-    const std::string& _s = this->_internal_uri();
-    ::google::protobuf::internal::WireFormatLite::VerifyUtf8String(
-        _s.data(), static_cast<int>(_s.length()), ::google::protobuf::internal::WireFormatLite::SERIALIZE, "io.deephaven.proto.backplane.script.grpc.GetPublishDiagnosticResponse.uri");
-    target = stream->WriteStringMaybeAliased(1, _s, target);
-  }
-
-  cached_has_bits = _impl_._has_bits_[0];
-  // optional int32 version = 2;
-  if (cached_has_bits & 0x00000001u) {
-    target = ::google::protobuf::internal::WireFormatLite::
-        WriteInt32ToArrayWithField<2>(
-            stream, this->_internal_version(), target);
-  }
-
-  // repeated .io.deephaven.proto.backplane.script.grpc.Diagnostic diagnostics = 3;
-  for (unsigned i = 0,
-      n = static_cast<unsigned>(this->_internal_diagnostics_size()); i < n; i++) {
-    const auto& repfield = this->_internal_diagnostics().Get(i);
-    target = ::google::protobuf::internal::WireFormatLite::
-        InternalWriteMessage(3, repfield, repfield.GetCachedSize(), target, stream);
-  }
-
-  if (PROTOBUF_PREDICT_FALSE(_internal_metadata_.have_unknown_fields())) {
-    target =
-        ::_pbi::WireFormat::InternalSerializeUnknownFieldsToArray(
-            _internal_metadata_.unknown_fields<::google::protobuf::UnknownFieldSet>(::google::protobuf::UnknownFieldSet::default_instance), target, stream);
-  }
-  // @@protoc_insertion_point(serialize_to_array_end:io.deephaven.proto.backplane.script.grpc.GetPublishDiagnosticResponse)
-  return target;
-}
-
-::size_t GetPublishDiagnosticResponse::ByteSizeLong() const {
-// @@protoc_insertion_point(message_byte_size_start:io.deephaven.proto.backplane.script.grpc.GetPublishDiagnosticResponse)
-  ::size_t total_size = 0;
-
-  ::uint32_t cached_has_bits = 0;
-  // Prevent compiler warnings about cached_has_bits being unused
-  (void) cached_has_bits;
-
-  // repeated .io.deephaven.proto.backplane.script.grpc.Diagnostic diagnostics = 3;
-  total_size += 1UL * this->_internal_diagnostics_size();
-  for (const auto& msg : this->_internal_diagnostics()) {
-    total_size +=
-      ::google::protobuf::internal::WireFormatLite::MessageSize(msg);
-  }
-  // string uri = 1;
-  if (!this->_internal_uri().empty()) {
-    total_size += 1 + ::google::protobuf::internal::WireFormatLite::StringSize(
-                                    this->_internal_uri());
-  }
-
-  // optional int32 version = 2;
-  cached_has_bits = _impl_._has_bits_[0];
-  if (cached_has_bits & 0x00000001u) {
-    total_size += ::_pbi::WireFormatLite::Int32SizePlusOne(
-        this->_internal_version());
-  }
-
-  return MaybeComputeUnknownFieldsSize(total_size, &_impl_._cached_size_);
-}
-
-const ::google::protobuf::Message::ClassData GetPublishDiagnosticResponse::_class_data_ = {
-    GetPublishDiagnosticResponse::MergeImpl,
-    nullptr,  // OnDemandRegisterArenaDtor
-};
-const ::google::protobuf::Message::ClassData* GetPublishDiagnosticResponse::GetClassData() const {
-  return &_class_data_;
-}
-
-void GetPublishDiagnosticResponse::MergeImpl(::google::protobuf::Message& to_msg, const ::google::protobuf::Message& from_msg) {
-  auto* const _this = static_cast<GetPublishDiagnosticResponse*>(&to_msg);
-  auto& from = static_cast<const GetPublishDiagnosticResponse&>(from_msg);
-  // @@protoc_insertion_point(class_specific_merge_from_start:io.deephaven.proto.backplane.script.grpc.GetPublishDiagnosticResponse)
-  ABSL_DCHECK_NE(&from, _this);
-  ::uint32_t cached_has_bits = 0;
-  (void) cached_has_bits;
-
-  _this->_internal_mutable_diagnostics()->MergeFrom(
-      from._internal_diagnostics());
-  if (!from._internal_uri().empty()) {
-    _this->_internal_set_uri(from._internal_uri());
-  }
-  if ((from._impl_._has_bits_[0] & 0x00000001u) != 0) {
-    _this->_internal_set_version(from._internal_version());
-  }
-  _this->_internal_metadata_.MergeFrom<::google::protobuf::UnknownFieldSet>(from._internal_metadata_);
-}
-
-void GetPublishDiagnosticResponse::CopyFrom(const GetPublishDiagnosticResponse& from) {
-// @@protoc_insertion_point(class_specific_copy_from_start:io.deephaven.proto.backplane.script.grpc.GetPublishDiagnosticResponse)
-  if (&from == this) return;
-  Clear();
-  MergeFrom(from);
-}
-
-PROTOBUF_NOINLINE bool GetPublishDiagnosticResponse::IsInitialized() const {
-  return true;
-}
-
-::_pbi::CachedSize* GetPublishDiagnosticResponse::AccessCachedSize() const {
-  return &_impl_._cached_size_;
-}
-void GetPublishDiagnosticResponse::InternalSwap(GetPublishDiagnosticResponse* PROTOBUF_RESTRICT other) {
-  using std::swap;
-  auto* arena = GetArena();
-  ABSL_DCHECK_EQ(arena, other->GetArena());
-  _internal_metadata_.InternalSwap(&other->_internal_metadata_);
-  swap(_impl_._has_bits_[0], other->_impl_._has_bits_[0]);
-  _impl_.diagnostics_.InternalSwap(&other->_impl_.diagnostics_);
-  ::_pbi::ArenaStringPtr::InternalSwap(&_impl_.uri_, &other->_impl_.uri_, arena);
-        swap(_impl_.version_, other->_impl_.version_);
-}
-
-::google::protobuf::Metadata GetPublishDiagnosticResponse::GetMetadata() const {
-  return ::_pbi::AssignDescriptors(
-      &descriptor_table_deephaven_2fproto_2fconsole_2eproto_getter, &descriptor_table_deephaven_2fproto_2fconsole_2eproto_once,
-      file_level_metadata_deephaven_2fproto_2fconsole_2eproto[42]);
-}
-// ===================================================================
-
-class Diagnostic_CodeDescription::_Internal {
- public:
-};
-
-Diagnostic_CodeDescription::Diagnostic_CodeDescription(::google::protobuf::Arena* arena)
-    : ::google::protobuf::Message(arena) {
-  SharedCtor(arena);
-  // @@protoc_insertion_point(arena_constructor:io.deephaven.proto.backplane.script.grpc.Diagnostic.CodeDescription)
-}
-inline PROTOBUF_NDEBUG_INLINE Diagnostic_CodeDescription::Impl_::Impl_(
-    ::google::protobuf::internal::InternalVisibility visibility, ::google::protobuf::Arena* arena,
-    const Impl_& from)
-      : href_(arena, from.href_),
-        _cached_size_{0} {}
-
-Diagnostic_CodeDescription::Diagnostic_CodeDescription(
-    ::google::protobuf::Arena* arena,
-    const Diagnostic_CodeDescription& from)
-    : ::google::protobuf::Message(arena) {
-  Diagnostic_CodeDescription* const _this = this;
-  (void)_this;
-  _internal_metadata_.MergeFrom<::google::protobuf::UnknownFieldSet>(
-      from._internal_metadata_);
-  new (&_impl_) Impl_(internal_visibility(), arena, from._impl_);
-
-  // @@protoc_insertion_point(copy_constructor:io.deephaven.proto.backplane.script.grpc.Diagnostic.CodeDescription)
-}
-inline PROTOBUF_NDEBUG_INLINE Diagnostic_CodeDescription::Impl_::Impl_(
-    ::google::protobuf::internal::InternalVisibility visibility,
-    ::google::protobuf::Arena* arena)
-      : href_(arena),
-        _cached_size_{0} {}
-
-inline void Diagnostic_CodeDescription::SharedCtor(::_pb::Arena* arena) {
-  new (&_impl_) Impl_(internal_visibility(), arena);
-}
-Diagnostic_CodeDescription::~Diagnostic_CodeDescription() {
-  // @@protoc_insertion_point(destructor:io.deephaven.proto.backplane.script.grpc.Diagnostic.CodeDescription)
-  _internal_metadata_.Delete<::google::protobuf::UnknownFieldSet>();
-  SharedDtor();
-}
-inline void Diagnostic_CodeDescription::SharedDtor() {
-  ABSL_DCHECK(GetArena() == nullptr);
-  _impl_.href_.Destroy();
-  _impl_.~Impl_();
-}
-
-PROTOBUF_NOINLINE void Diagnostic_CodeDescription::Clear() {
-// @@protoc_insertion_point(message_clear_start:io.deephaven.proto.backplane.script.grpc.Diagnostic.CodeDescription)
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  ::uint32_t cached_has_bits = 0;
-  // Prevent compiler warnings about cached_has_bits being unused
-  (void) cached_has_bits;
-
-  _impl_.href_.ClearToEmpty();
-  _internal_metadata_.Clear<::google::protobuf::UnknownFieldSet>();
-}
-
-const char* Diagnostic_CodeDescription::_InternalParse(
-    const char* ptr, ::_pbi::ParseContext* ctx) {
-  ptr = ::_pbi::TcParser::ParseLoop(this, ptr, ctx, &_table_.header);
-  return ptr;
-}
-
-
-PROTOBUF_CONSTINIT PROTOBUF_ATTRIBUTE_INIT_PRIORITY1
-const ::_pbi::TcParseTable<0, 1, 0, 80, 2> Diagnostic_CodeDescription::_table_ = {
-  {
-    0,  // no _has_bits_
-    0, // no _extensions_
-    1, 0,  // max_field_number, fast_idx_mask
-    offsetof(decltype(_table_), field_lookup_table),
-    4294967294,  // skipmap
-    offsetof(decltype(_table_), field_entries),
-    1,  // num_field_entries
-    0,  // num_aux_entries
-    offsetof(decltype(_table_), field_names),  // no aux_entries
-    &_Diagnostic_CodeDescription_default_instance_._instance,
-    ::_pbi::TcParser::GenericFallback,  // fallback
-  }, {{
-    // string href = 1;
-    {::_pbi::TcParser::FastUS1,
-     {10, 63, 0, PROTOBUF_FIELD_OFFSET(Diagnostic_CodeDescription, _impl_.href_)}},
-  }}, {{
-    65535, 65535
-  }}, {{
-    // string href = 1;
-    {PROTOBUF_FIELD_OFFSET(Diagnostic_CodeDescription, _impl_.href_), 0, 0,
-    (0 | ::_fl::kFcSingular | ::_fl::kUtf8String | ::_fl::kRepAString)},
-  }},
-  // no aux_entries
-  {{
-    "\103\4\0\0\0\0\0\0"
-    "io.deephaven.proto.backplane.script.grpc.Diagnostic.CodeDescription"
-    "href"
-  }},
-};
-
-::uint8_t* Diagnostic_CodeDescription::_InternalSerialize(
-    ::uint8_t* target,
-    ::google::protobuf::io::EpsCopyOutputStream* stream) const {
-  // @@protoc_insertion_point(serialize_to_array_start:io.deephaven.proto.backplane.script.grpc.Diagnostic.CodeDescription)
-  ::uint32_t cached_has_bits = 0;
-  (void)cached_has_bits;
-
-  // string href = 1;
-  if (!this->_internal_href().empty()) {
-    const std::string& _s = this->_internal_href();
-    ::google::protobuf::internal::WireFormatLite::VerifyUtf8String(
-        _s.data(), static_cast<int>(_s.length()), ::google::protobuf::internal::WireFormatLite::SERIALIZE, "io.deephaven.proto.backplane.script.grpc.Diagnostic.CodeDescription.href");
-    target = stream->WriteStringMaybeAliased(1, _s, target);
-  }
-
-  if (PROTOBUF_PREDICT_FALSE(_internal_metadata_.have_unknown_fields())) {
-    target =
-        ::_pbi::WireFormat::InternalSerializeUnknownFieldsToArray(
-            _internal_metadata_.unknown_fields<::google::protobuf::UnknownFieldSet>(::google::protobuf::UnknownFieldSet::default_instance), target, stream);
-  }
-  // @@protoc_insertion_point(serialize_to_array_end:io.deephaven.proto.backplane.script.grpc.Diagnostic.CodeDescription)
-  return target;
-}
-
-::size_t Diagnostic_CodeDescription::ByteSizeLong() const {
-// @@protoc_insertion_point(message_byte_size_start:io.deephaven.proto.backplane.script.grpc.Diagnostic.CodeDescription)
-  ::size_t total_size = 0;
-
-  ::uint32_t cached_has_bits = 0;
-  // Prevent compiler warnings about cached_has_bits being unused
-  (void) cached_has_bits;
-
-  // string href = 1;
-  if (!this->_internal_href().empty()) {
-    total_size += 1 + ::google::protobuf::internal::WireFormatLite::StringSize(
-                                    this->_internal_href());
-  }
-
-  return MaybeComputeUnknownFieldsSize(total_size, &_impl_._cached_size_);
-}
-
-const ::google::protobuf::Message::ClassData Diagnostic_CodeDescription::_class_data_ = {
-    Diagnostic_CodeDescription::MergeImpl,
-    nullptr,  // OnDemandRegisterArenaDtor
-};
-const ::google::protobuf::Message::ClassData* Diagnostic_CodeDescription::GetClassData() const {
-  return &_class_data_;
-}
-
-void Diagnostic_CodeDescription::MergeImpl(::google::protobuf::Message& to_msg, const ::google::protobuf::Message& from_msg) {
-  auto* const _this = static_cast<Diagnostic_CodeDescription*>(&to_msg);
-  auto& from = static_cast<const Diagnostic_CodeDescription&>(from_msg);
-  // @@protoc_insertion_point(class_specific_merge_from_start:io.deephaven.proto.backplane.script.grpc.Diagnostic.CodeDescription)
-  ABSL_DCHECK_NE(&from, _this);
-  ::uint32_t cached_has_bits = 0;
-  (void) cached_has_bits;
-
-  if (!from._internal_href().empty()) {
-    _this->_internal_set_href(from._internal_href());
-  }
-  _this->_internal_metadata_.MergeFrom<::google::protobuf::UnknownFieldSet>(from._internal_metadata_);
-}
-
-void Diagnostic_CodeDescription::CopyFrom(const Diagnostic_CodeDescription& from) {
-// @@protoc_insertion_point(class_specific_copy_from_start:io.deephaven.proto.backplane.script.grpc.Diagnostic.CodeDescription)
-  if (&from == this) return;
-  Clear();
-  MergeFrom(from);
-}
-
-PROTOBUF_NOINLINE bool Diagnostic_CodeDescription::IsInitialized() const {
-  return true;
-}
-
-::_pbi::CachedSize* Diagnostic_CodeDescription::AccessCachedSize() const {
-  return &_impl_._cached_size_;
-}
-void Diagnostic_CodeDescription::InternalSwap(Diagnostic_CodeDescription* PROTOBUF_RESTRICT other) {
-  using std::swap;
-  auto* arena = GetArena();
-  ABSL_DCHECK_EQ(arena, other->GetArena());
-  _internal_metadata_.InternalSwap(&other->_internal_metadata_);
-  ::_pbi::ArenaStringPtr::InternalSwap(&_impl_.href_, &other->_impl_.href_, arena);
-}
-
-::google::protobuf::Metadata Diagnostic_CodeDescription::GetMetadata() const {
-  return ::_pbi::AssignDescriptors(
-      &descriptor_table_deephaven_2fproto_2fconsole_2eproto_getter, &descriptor_table_deephaven_2fproto_2fconsole_2eproto_once,
-      file_level_metadata_deephaven_2fproto_2fconsole_2eproto[43]);
-}
-// ===================================================================
-
-class Diagnostic::_Internal {
- public:
-  using HasBits = decltype(std::declval<Diagnostic>()._impl_._has_bits_);
-  static constexpr ::int32_t kHasBitsOffset =
-    8 * PROTOBUF_FIELD_OFFSET(Diagnostic, _impl_._has_bits_);
-  static const ::io::deephaven::proto::backplane::script::grpc::DocumentRange& range(const Diagnostic* msg);
-  static void set_has_range(HasBits* has_bits) {
-    (*has_bits)[0] |= 8u;
-  }
-  static void set_has_code(HasBits* has_bits) {
-    (*has_bits)[0] |= 1u;
-  }
-  static const ::io::deephaven::proto::backplane::script::grpc::Diagnostic_CodeDescription& code_description(const Diagnostic* msg);
-  static void set_has_code_description(HasBits* has_bits) {
-    (*has_bits)[0] |= 16u;
-  }
-  static void set_has_source(HasBits* has_bits) {
-    (*has_bits)[0] |= 2u;
-  }
-  static void set_has_data(HasBits* has_bits) {
-    (*has_bits)[0] |= 4u;
-  }
-};
-
-const ::io::deephaven::proto::backplane::script::grpc::DocumentRange& Diagnostic::_Internal::range(const Diagnostic* msg) {
-  return *msg->_impl_.range_;
-}
-const ::io::deephaven::proto::backplane::script::grpc::Diagnostic_CodeDescription& Diagnostic::_Internal::code_description(const Diagnostic* msg) {
-  return *msg->_impl_.code_description_;
-}
-Diagnostic::Diagnostic(::google::protobuf::Arena* arena)
-    : ::google::protobuf::Message(arena) {
-  SharedCtor(arena);
-  // @@protoc_insertion_point(arena_constructor:io.deephaven.proto.backplane.script.grpc.Diagnostic)
-}
-inline PROTOBUF_NDEBUG_INLINE Diagnostic::Impl_::Impl_(
-    ::google::protobuf::internal::InternalVisibility visibility, ::google::protobuf::Arena* arena,
-    const Impl_& from)
-      : _has_bits_{from._has_bits_},
-        _cached_size_{0},
-        tags_{visibility, arena, from.tags_},
-        _tags_cached_byte_size_{0},
-        code_(arena, from.code_),
-        source_(arena, from.source_),
-        message_(arena, from.message_),
-        data_(arena, from.data_) {}
-
-Diagnostic::Diagnostic(
-    ::google::protobuf::Arena* arena,
-    const Diagnostic& from)
-    : ::google::protobuf::Message(arena) {
-  Diagnostic* const _this = this;
-  (void)_this;
-  _internal_metadata_.MergeFrom<::google::protobuf::UnknownFieldSet>(
-      from._internal_metadata_);
-  new (&_impl_) Impl_(internal_visibility(), arena, from._impl_);
-  ::uint32_t cached_has_bits = _impl_._has_bits_[0];
-  _impl_.range_ = (cached_has_bits & 0x00000008u)
-                ? CreateMaybeMessage<::io::deephaven::proto::backplane::script::grpc::DocumentRange>(arena, *from._impl_.range_)
-                : nullptr;
-  _impl_.code_description_ = (cached_has_bits & 0x00000010u)
-                ? CreateMaybeMessage<::io::deephaven::proto::backplane::script::grpc::Diagnostic_CodeDescription>(arena, *from._impl_.code_description_)
-                : nullptr;
-  _impl_.severity_ = from._impl_.severity_;
-
-  // @@protoc_insertion_point(copy_constructor:io.deephaven.proto.backplane.script.grpc.Diagnostic)
-}
-inline PROTOBUF_NDEBUG_INLINE Diagnostic::Impl_::Impl_(
-    ::google::protobuf::internal::InternalVisibility visibility,
-    ::google::protobuf::Arena* arena)
-      : _cached_size_{0},
-        tags_{visibility, arena},
-        _tags_cached_byte_size_{0},
-        code_(arena),
-        source_(arena),
-        message_(arena),
-        data_(arena) {}
-
-inline void Diagnostic::SharedCtor(::_pb::Arena* arena) {
-  new (&_impl_) Impl_(internal_visibility(), arena);
-  ::memset(reinterpret_cast<char *>(&_impl_) +
-               offsetof(Impl_, range_),
-           0,
-           offsetof(Impl_, severity_) -
-               offsetof(Impl_, range_) +
-               sizeof(Impl_::severity_));
-}
-Diagnostic::~Diagnostic() {
-  // @@protoc_insertion_point(destructor:io.deephaven.proto.backplane.script.grpc.Diagnostic)
-  _internal_metadata_.Delete<::google::protobuf::UnknownFieldSet>();
-  SharedDtor();
-}
-inline void Diagnostic::SharedDtor() {
-  ABSL_DCHECK(GetArena() == nullptr);
-  _impl_.code_.Destroy();
-  _impl_.source_.Destroy();
-  _impl_.message_.Destroy();
-  _impl_.data_.Destroy();
-  delete _impl_.range_;
-  delete _impl_.code_description_;
-  _impl_.~Impl_();
-}
-
-PROTOBUF_NOINLINE void Diagnostic::Clear() {
-// @@protoc_insertion_point(message_clear_start:io.deephaven.proto.backplane.script.grpc.Diagnostic)
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  ::uint32_t cached_has_bits = 0;
-  // Prevent compiler warnings about cached_has_bits being unused
-  (void) cached_has_bits;
-
-  _impl_.tags_.Clear();
-  cached_has_bits = _impl_._has_bits_[0];
-  if (cached_has_bits & 0x00000003u) {
-    if (cached_has_bits & 0x00000001u) {
-      _impl_.code_.ClearNonDefaultToEmpty();
-    }
-    if (cached_has_bits & 0x00000002u) {
-      _impl_.source_.ClearNonDefaultToEmpty();
-    }
-  }
-  _impl_.message_.ClearToEmpty();
-  if (cached_has_bits & 0x0000001cu) {
-    if (cached_has_bits & 0x00000004u) {
-      _impl_.data_.ClearNonDefaultToEmpty();
-    }
-    if (cached_has_bits & 0x00000008u) {
-      ABSL_DCHECK(_impl_.range_ != nullptr);
-      _impl_.range_->Clear();
-    }
-    if (cached_has_bits & 0x00000010u) {
-      ABSL_DCHECK(_impl_.code_description_ != nullptr);
-      _impl_.code_description_->Clear();
-    }
-  }
-  _impl_.severity_ = 0;
-  _impl_._has_bits_.Clear();
-  _internal_metadata_.Clear<::google::protobuf::UnknownFieldSet>();
-}
-
-const char* Diagnostic::_InternalParse(
-    const char* ptr, ::_pbi::ParseContext* ctx) {
-  ptr = ::_pbi::TcParser::ParseLoop(this, ptr, ctx, &_table_.header);
-  return ptr;
-}
-
-
-PROTOBUF_CONSTINIT PROTOBUF_ATTRIBUTE_INIT_PRIORITY1
-const ::_pbi::TcParseTable<4, 8, 2, 85, 2> Diagnostic::_table_ = {
-  {
-    PROTOBUF_FIELD_OFFSET(Diagnostic, _impl_._has_bits_),
-    0, // no _extensions_
-    9, 120,  // max_field_number, fast_idx_mask
-    offsetof(decltype(_table_), field_lookup_table),
-    4294966912,  // skipmap
-    offsetof(decltype(_table_), field_entries),
-    8,  // num_field_entries
-    2,  // num_aux_entries
-    offsetof(decltype(_table_), aux_entries),
-    &_Diagnostic_default_instance_._instance,
-    ::_pbi::TcParser::GenericFallback,  // fallback
-  }, {{
-    {::_pbi::TcParser::MiniParse, {}},
-    // .io.deephaven.proto.backplane.script.grpc.DocumentRange range = 1;
-    {::_pbi::TcParser::FastMtS1,
-     {10, 3, 0, PROTOBUF_FIELD_OFFSET(Diagnostic, _impl_.range_)}},
-    // .io.deephaven.proto.backplane.script.grpc.Diagnostic.DiagnosticSeverity severity = 2;
-    {::_pbi::TcParser::SingularVarintNoZag1<::uint32_t, offsetof(Diagnostic, _impl_.severity_), 63>(),
-     {16, 63, 0, PROTOBUF_FIELD_OFFSET(Diagnostic, _impl_.severity_)}},
-    // optional string code = 3;
-    {::_pbi::TcParser::FastUS1,
-     {26, 0, 0, PROTOBUF_FIELD_OFFSET(Diagnostic, _impl_.code_)}},
-    // optional .io.deephaven.proto.backplane.script.grpc.Diagnostic.CodeDescription code_description = 4;
-    {::_pbi::TcParser::FastMtS1,
-     {34, 4, 1, PROTOBUF_FIELD_OFFSET(Diagnostic, _impl_.code_description_)}},
-    // optional string source = 5;
-    {::_pbi::TcParser::FastUS1,
-     {42, 1, 0, PROTOBUF_FIELD_OFFSET(Diagnostic, _impl_.source_)}},
-    // string message = 6;
-    {::_pbi::TcParser::FastUS1,
-     {50, 63, 0, PROTOBUF_FIELD_OFFSET(Diagnostic, _impl_.message_)}},
-    // repeated .io.deephaven.proto.backplane.script.grpc.Diagnostic.DiagnosticTag tags = 7;
-    {::_pbi::TcParser::FastV32P1,
-     {58, 63, 0, PROTOBUF_FIELD_OFFSET(Diagnostic, _impl_.tags_)}},
-    {::_pbi::TcParser::MiniParse, {}},
-    // optional bytes data = 9;
-    {::_pbi::TcParser::FastBS1,
-     {74, 2, 0, PROTOBUF_FIELD_OFFSET(Diagnostic, _impl_.data_)}},
-    {::_pbi::TcParser::MiniParse, {}},
-    {::_pbi::TcParser::MiniParse, {}},
-    {::_pbi::TcParser::MiniParse, {}},
-    {::_pbi::TcParser::MiniParse, {}},
-    {::_pbi::TcParser::MiniParse, {}},
-    {::_pbi::TcParser::MiniParse, {}},
-  }}, {{
-    65535, 65535
-  }}, {{
-    // .io.deephaven.proto.backplane.script.grpc.DocumentRange range = 1;
-    {PROTOBUF_FIELD_OFFSET(Diagnostic, _impl_.range_), _Internal::kHasBitsOffset + 3, 0,
-    (0 | ::_fl::kFcOptional | ::_fl::kMessage | ::_fl::kTvTable)},
-    // .io.deephaven.proto.backplane.script.grpc.Diagnostic.DiagnosticSeverity severity = 2;
-    {PROTOBUF_FIELD_OFFSET(Diagnostic, _impl_.severity_), -1, 0,
-    (0 | ::_fl::kFcSingular | ::_fl::kOpenEnum)},
-    // optional string code = 3;
-    {PROTOBUF_FIELD_OFFSET(Diagnostic, _impl_.code_), _Internal::kHasBitsOffset + 0, 0,
-    (0 | ::_fl::kFcOptional | ::_fl::kUtf8String | ::_fl::kRepAString)},
-    // optional .io.deephaven.proto.backplane.script.grpc.Diagnostic.CodeDescription code_description = 4;
-    {PROTOBUF_FIELD_OFFSET(Diagnostic, _impl_.code_description_), _Internal::kHasBitsOffset + 4, 1,
-    (0 | ::_fl::kFcOptional | ::_fl::kMessage | ::_fl::kTvTable)},
-    // optional string source = 5;
-    {PROTOBUF_FIELD_OFFSET(Diagnostic, _impl_.source_), _Internal::kHasBitsOffset + 1, 0,
-    (0 | ::_fl::kFcOptional | ::_fl::kUtf8String | ::_fl::kRepAString)},
-    // string message = 6;
-    {PROTOBUF_FIELD_OFFSET(Diagnostic, _impl_.message_), -1, 0,
-    (0 | ::_fl::kFcSingular | ::_fl::kUtf8String | ::_fl::kRepAString)},
-    // repeated .io.deephaven.proto.backplane.script.grpc.Diagnostic.DiagnosticTag tags = 7;
-    {PROTOBUF_FIELD_OFFSET(Diagnostic, _impl_.tags_), -1, 0,
-    (0 | ::_fl::kFcRepeated | ::_fl::kPackedOpenEnum)},
-    // optional bytes data = 9;
-    {PROTOBUF_FIELD_OFFSET(Diagnostic, _impl_.data_), _Internal::kHasBitsOffset + 2, 0,
-    (0 | ::_fl::kFcOptional | ::_fl::kBytes | ::_fl::kRepAString)},
-  }}, {{
-    {::_pbi::TcParser::GetTable<::io::deephaven::proto::backplane::script::grpc::DocumentRange>()},
-    {::_pbi::TcParser::GetTable<::io::deephaven::proto::backplane::script::grpc::Diagnostic_CodeDescription>()},
-  }}, {{
-    "\63\0\0\4\0\6\7\0\0\0\0\0\0\0\0\0"
-    "io.deephaven.proto.backplane.script.grpc.Diagnostic"
-    "code"
-    "source"
-    "message"
-  }},
-};
-
-::uint8_t* Diagnostic::_InternalSerialize(
-    ::uint8_t* target,
-    ::google::protobuf::io::EpsCopyOutputStream* stream) const {
-  // @@protoc_insertion_point(serialize_to_array_start:io.deephaven.proto.backplane.script.grpc.Diagnostic)
-  ::uint32_t cached_has_bits = 0;
-  (void)cached_has_bits;
-
-  cached_has_bits = _impl_._has_bits_[0];
-  // .io.deephaven.proto.backplane.script.grpc.DocumentRange range = 1;
-  if (cached_has_bits & 0x00000008u) {
-    target = ::google::protobuf::internal::WireFormatLite::InternalWriteMessage(
-        1, _Internal::range(this),
-        _Internal::range(this).GetCachedSize(), target, stream);
-  }
-
-  // .io.deephaven.proto.backplane.script.grpc.Diagnostic.DiagnosticSeverity severity = 2;
-  if (this->_internal_severity() != 0) {
-    target = stream->EnsureSpace(target);
-    target = ::_pbi::WireFormatLite::WriteEnumToArray(
-        2, this->_internal_severity(), target);
-  }
-
-  // optional string code = 3;
-  if (cached_has_bits & 0x00000001u) {
-    const std::string& _s = this->_internal_code();
-    ::google::protobuf::internal::WireFormatLite::VerifyUtf8String(
-        _s.data(), static_cast<int>(_s.length()), ::google::protobuf::internal::WireFormatLite::SERIALIZE, "io.deephaven.proto.backplane.script.grpc.Diagnostic.code");
-    target = stream->WriteStringMaybeAliased(3, _s, target);
-  }
-
-  // optional .io.deephaven.proto.backplane.script.grpc.Diagnostic.CodeDescription code_description = 4;
-  if (cached_has_bits & 0x00000010u) {
-    target = ::google::protobuf::internal::WireFormatLite::InternalWriteMessage(
-        4, _Internal::code_description(this),
-        _Internal::code_description(this).GetCachedSize(), target, stream);
-  }
-
-  // optional string source = 5;
-  if (cached_has_bits & 0x00000002u) {
-    const std::string& _s = this->_internal_source();
-    ::google::protobuf::internal::WireFormatLite::VerifyUtf8String(
-        _s.data(), static_cast<int>(_s.length()), ::google::protobuf::internal::WireFormatLite::SERIALIZE, "io.deephaven.proto.backplane.script.grpc.Diagnostic.source");
-    target = stream->WriteStringMaybeAliased(5, _s, target);
-  }
-
-  // string message = 6;
-  if (!this->_internal_message().empty()) {
-    const std::string& _s = this->_internal_message();
-    ::google::protobuf::internal::WireFormatLite::VerifyUtf8String(
-        _s.data(), static_cast<int>(_s.length()), ::google::protobuf::internal::WireFormatLite::SERIALIZE, "io.deephaven.proto.backplane.script.grpc.Diagnostic.message");
-    target = stream->WriteStringMaybeAliased(6, _s, target);
-  }
-
-  // repeated .io.deephaven.proto.backplane.script.grpc.Diagnostic.DiagnosticTag tags = 7;
-  {
-    std::size_t byte_size = _impl_._tags_cached_byte_size_.Get();
-    if (byte_size > 0) {
-      target = stream->WriteEnumPacked(7, _internal_tags(),
-                                       byte_size, target);
-    }
-  }
-
-  // optional bytes data = 9;
-  if (cached_has_bits & 0x00000004u) {
-    const std::string& _s = this->_internal_data();
-    target = stream->WriteBytesMaybeAliased(9, _s, target);
-  }
-
-  if (PROTOBUF_PREDICT_FALSE(_internal_metadata_.have_unknown_fields())) {
-    target =
-        ::_pbi::WireFormat::InternalSerializeUnknownFieldsToArray(
-            _internal_metadata_.unknown_fields<::google::protobuf::UnknownFieldSet>(::google::protobuf::UnknownFieldSet::default_instance), target, stream);
-  }
-  // @@protoc_insertion_point(serialize_to_array_end:io.deephaven.proto.backplane.script.grpc.Diagnostic)
-  return target;
-}
-
-::size_t Diagnostic::ByteSizeLong() const {
-// @@protoc_insertion_point(message_byte_size_start:io.deephaven.proto.backplane.script.grpc.Diagnostic)
-  ::size_t total_size = 0;
-
-  ::uint32_t cached_has_bits = 0;
-  // Prevent compiler warnings about cached_has_bits being unused
-  (void) cached_has_bits;
-
-  // repeated .io.deephaven.proto.backplane.script.grpc.Diagnostic.DiagnosticTag tags = 7;
-  {
-    std::size_t data_size = 0;
-    auto count = static_cast<std::size_t>(this->_internal_tags_size());
-
-    for (std::size_t i = 0; i < count; ++i) {
-      data_size += ::_pbi::WireFormatLite::EnumSize(
-          this->_internal_tags().Get(static_cast<int>(i)));
-    }
-    total_size += data_size;
-    if (data_size > 0) {
-      total_size += 1;
-      total_size += ::_pbi::WireFormatLite::Int32Size(
-          static_cast<int32_t>(data_size));
-    }
-    _impl_._tags_cached_byte_size_.Set(::_pbi::ToCachedSize(data_size));
-  }
-  cached_has_bits = _impl_._has_bits_[0];
-  if (cached_has_bits & 0x00000003u) {
-    // optional string code = 3;
-    if (cached_has_bits & 0x00000001u) {
-      total_size += 1 + ::google::protobuf::internal::WireFormatLite::StringSize(
-                                      this->_internal_code());
-    }
-
-    // optional string source = 5;
-    if (cached_has_bits & 0x00000002u) {
-      total_size += 1 + ::google::protobuf::internal::WireFormatLite::StringSize(
-                                      this->_internal_source());
-    }
-
-  }
-  // string message = 6;
-  if (!this->_internal_message().empty()) {
-    total_size += 1 + ::google::protobuf::internal::WireFormatLite::StringSize(
-                                    this->_internal_message());
-  }
-
-  if (cached_has_bits & 0x0000001cu) {
-    // optional bytes data = 9;
-    if (cached_has_bits & 0x00000004u) {
-      total_size += 1 + ::google::protobuf::internal::WireFormatLite::BytesSize(
-                                      this->_internal_data());
-    }
-
-    // .io.deephaven.proto.backplane.script.grpc.DocumentRange range = 1;
-    if (cached_has_bits & 0x00000008u) {
-      total_size +=
-          1 + ::google::protobuf::internal::WireFormatLite::MessageSize(*_impl_.range_);
-    }
-
-    // optional .io.deephaven.proto.backplane.script.grpc.Diagnostic.CodeDescription code_description = 4;
-    if (cached_has_bits & 0x00000010u) {
-      total_size +=
-          1 + ::google::protobuf::internal::WireFormatLite::MessageSize(*_impl_.code_description_);
-    }
-
-  }
-  // .io.deephaven.proto.backplane.script.grpc.Diagnostic.DiagnosticSeverity severity = 2;
-  if (this->_internal_severity() != 0) {
-    total_size += 1 +
-                  ::_pbi::WireFormatLite::EnumSize(this->_internal_severity());
-  }
-
-  return MaybeComputeUnknownFieldsSize(total_size, &_impl_._cached_size_);
-}
-
-const ::google::protobuf::Message::ClassData Diagnostic::_class_data_ = {
-    Diagnostic::MergeImpl,
-    nullptr,  // OnDemandRegisterArenaDtor
-};
-const ::google::protobuf::Message::ClassData* Diagnostic::GetClassData() const {
-  return &_class_data_;
-}
-
-void Diagnostic::MergeImpl(::google::protobuf::Message& to_msg, const ::google::protobuf::Message& from_msg) {
-  auto* const _this = static_cast<Diagnostic*>(&to_msg);
-  auto& from = static_cast<const Diagnostic&>(from_msg);
-  // @@protoc_insertion_point(class_specific_merge_from_start:io.deephaven.proto.backplane.script.grpc.Diagnostic)
-  ABSL_DCHECK_NE(&from, _this);
-  ::uint32_t cached_has_bits = 0;
-  (void) cached_has_bits;
-
-  _this->_internal_mutable_tags()->MergeFrom(from._internal_tags());
-  cached_has_bits = from._impl_._has_bits_[0];
-  if (cached_has_bits & 0x00000003u) {
-    if (cached_has_bits & 0x00000001u) {
-      _this->_internal_set_code(from._internal_code());
-    }
-    if (cached_has_bits & 0x00000002u) {
-      _this->_internal_set_source(from._internal_source());
-    }
-  }
-  if (!from._internal_message().empty()) {
-    _this->_internal_set_message(from._internal_message());
-  }
-  if (cached_has_bits & 0x0000001cu) {
-    if (cached_has_bits & 0x00000004u) {
-      _this->_internal_set_data(from._internal_data());
-    }
-    if (cached_has_bits & 0x00000008u) {
-      _this->_internal_mutable_range()->::io::deephaven::proto::backplane::script::grpc::DocumentRange::MergeFrom(
-          from._internal_range());
-    }
-    if (cached_has_bits & 0x00000010u) {
-      _this->_internal_mutable_code_description()->::io::deephaven::proto::backplane::script::grpc::Diagnostic_CodeDescription::MergeFrom(
-          from._internal_code_description());
-    }
-  }
-  if (from._internal_severity() != 0) {
-    _this->_internal_set_severity(from._internal_severity());
-  }
-  _this->_internal_metadata_.MergeFrom<::google::protobuf::UnknownFieldSet>(from._internal_metadata_);
-}
-
-void Diagnostic::CopyFrom(const Diagnostic& from) {
-// @@protoc_insertion_point(class_specific_copy_from_start:io.deephaven.proto.backplane.script.grpc.Diagnostic)
-  if (&from == this) return;
-  Clear();
-  MergeFrom(from);
-}
-
-PROTOBUF_NOINLINE bool Diagnostic::IsInitialized() const {
-  return true;
-}
-
-::_pbi::CachedSize* Diagnostic::AccessCachedSize() const {
-  return &_impl_._cached_size_;
-}
-void Diagnostic::InternalSwap(Diagnostic* PROTOBUF_RESTRICT other) {
-  using std::swap;
-  auto* arena = GetArena();
-  ABSL_DCHECK_EQ(arena, other->GetArena());
-  _internal_metadata_.InternalSwap(&other->_internal_metadata_);
-  swap(_impl_._has_bits_[0], other->_impl_._has_bits_[0]);
-  _impl_.tags_.InternalSwap(&other->_impl_.tags_);
-  ::_pbi::ArenaStringPtr::InternalSwap(&_impl_.code_, &other->_impl_.code_, arena);
-  ::_pbi::ArenaStringPtr::InternalSwap(&_impl_.source_, &other->_impl_.source_, arena);
-  ::_pbi::ArenaStringPtr::InternalSwap(&_impl_.message_, &other->_impl_.message_, arena);
-  ::_pbi::ArenaStringPtr::InternalSwap(&_impl_.data_, &other->_impl_.data_, arena);
-  ::google::protobuf::internal::memswap<
-      PROTOBUF_FIELD_OFFSET(Diagnostic, _impl_.severity_)
-      + sizeof(Diagnostic::_impl_.severity_)
-      - PROTOBUF_FIELD_OFFSET(Diagnostic, _impl_.range_)>(
-          reinterpret_cast<char*>(&_impl_.range_),
-          reinterpret_cast<char*>(&other->_impl_.range_));
-}
-
-::google::protobuf::Metadata Diagnostic::GetMetadata() const {
-  return ::_pbi::AssignDescriptors(
-      &descriptor_table_deephaven_2fproto_2fconsole_2eproto_getter, &descriptor_table_deephaven_2fproto_2fconsole_2eproto_once,
-      file_level_metadata_deephaven_2fproto_2fconsole_2eproto[44]);
-}
-// ===================================================================
-
-class FigureDescriptor_ChartDescriptor::_Internal {
- public:
-  using HasBits = decltype(std::declval<FigureDescriptor_ChartDescriptor>()._impl_._has_bits_);
-  static constexpr ::int32_t kHasBitsOffset =
-    8 * PROTOBUF_FIELD_OFFSET(FigureDescriptor_ChartDescriptor, _impl_._has_bits_);
-  static void set_has_title(HasBits* has_bits) {
-    (*has_bits)[0] |= 1u;
-  }
-};
-
-FigureDescriptor_ChartDescriptor::FigureDescriptor_ChartDescriptor(::google::protobuf::Arena* arena)
-    : ::google::protobuf::Message(arena) {
-  SharedCtor(arena);
-  // @@protoc_insertion_point(arena_constructor:io.deephaven.proto.backplane.script.grpc.FigureDescriptor.ChartDescriptor)
-}
-inline PROTOBUF_NDEBUG_INLINE FigureDescriptor_ChartDescriptor::Impl_::Impl_(
-    ::google::protobuf::internal::InternalVisibility visibility, ::google::protobuf::Arena* arena,
-    const Impl_& from)
-      : _has_bits_{from._has_bits_},
-        _cached_size_{0},
-        series_{visibility, arena, from.series_},
-        multi_series_{visibility, arena, from.multi_series_},
-        axes_{visibility, arena, from.axes_},
-        title_(arena, from.title_),
-        title_font_(arena, from.title_font_),
-        title_color_(arena, from.title_color_),
-        legend_font_(arena, from.legend_font_),
-        legend_color_(arena, from.legend_color_) {}
-
-FigureDescriptor_ChartDescriptor::FigureDescriptor_ChartDescriptor(
-    ::google::protobuf::Arena* arena,
-    const FigureDescriptor_ChartDescriptor& from)
-    : ::google::protobuf::Message(arena) {
-  FigureDescriptor_ChartDescriptor* const _this = this;
-  (void)_this;
-  _internal_metadata_.MergeFrom<::google::protobuf::UnknownFieldSet>(
-      from._internal_metadata_);
-  new (&_impl_) Impl_(internal_visibility(), arena, from._impl_);
-  ::memcpy(reinterpret_cast<char *>(&_impl_) +
-               offsetof(Impl_, colspan_),
-           reinterpret_cast<const char *>(&from._impl_) +
-               offsetof(Impl_, colspan_),
-           offsetof(Impl_, row_) -
-               offsetof(Impl_, colspan_) +
-               sizeof(Impl_::row_));
-
-  // @@protoc_insertion_point(copy_constructor:io.deephaven.proto.backplane.script.grpc.FigureDescriptor.ChartDescriptor)
-}
-inline PROTOBUF_NDEBUG_INLINE FigureDescriptor_ChartDescriptor::Impl_::Impl_(
-    ::google::protobuf::internal::InternalVisibility visibility,
-    ::google::protobuf::Arena* arena)
-      : _cached_size_{0},
-        series_{visibility, arena},
-        multi_series_{visibility, arena},
-        axes_{visibility, arena},
-        title_(arena),
-        title_font_(arena),
-        title_color_(arena),
-        legend_font_(arena),
-        legend_color_(arena) {}
-
-inline void FigureDescriptor_ChartDescriptor::SharedCtor(::_pb::Arena* arena) {
-  new (&_impl_) Impl_(internal_visibility(), arena);
-  ::memset(reinterpret_cast<char *>(&_impl_) +
-               offsetof(Impl_, colspan_),
-           0,
-           offsetof(Impl_, row_) -
-               offsetof(Impl_, colspan_) +
-               sizeof(Impl_::row_));
-}
-FigureDescriptor_ChartDescriptor::~FigureDescriptor_ChartDescriptor() {
-  // @@protoc_insertion_point(destructor:io.deephaven.proto.backplane.script.grpc.FigureDescriptor.ChartDescriptor)
-  _internal_metadata_.Delete<::google::protobuf::UnknownFieldSet>();
-  SharedDtor();
-}
-inline void FigureDescriptor_ChartDescriptor::SharedDtor() {
-  ABSL_DCHECK(GetArena() == nullptr);
-  _impl_.title_.Destroy();
-  _impl_.title_font_.Destroy();
-  _impl_.title_color_.Destroy();
-  _impl_.legend_font_.Destroy();
-  _impl_.legend_color_.Destroy();
-  _impl_.~Impl_();
-}
-
-PROTOBUF_NOINLINE void FigureDescriptor_ChartDescriptor::Clear() {
-// @@protoc_insertion_point(message_clear_start:io.deephaven.proto.backplane.script.grpc.FigureDescriptor.ChartDescriptor)
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  ::uint32_t cached_has_bits = 0;
-  // Prevent compiler warnings about cached_has_bits being unused
-  (void) cached_has_bits;
-
-  _impl_.series_.Clear();
-  _impl_.multi_series_.Clear();
-  _impl_.axes_.Clear();
-  cached_has_bits = _impl_._has_bits_[0];
-  if (cached_has_bits & 0x00000001u) {
-    _impl_.title_.ClearNonDefaultToEmpty();
-  }
-  _impl_.title_font_.ClearToEmpty();
-  _impl_.title_color_.ClearToEmpty();
-  _impl_.legend_font_.ClearToEmpty();
-  _impl_.legend_color_.ClearToEmpty();
-  ::memset(&_impl_.colspan_, 0, static_cast<::size_t>(
-      reinterpret_cast<char*>(&_impl_.row_) -
-      reinterpret_cast<char*>(&_impl_.colspan_)) + sizeof(_impl_.row_));
-  _impl_._has_bits_.Clear();
-  _internal_metadata_.Clear<::google::protobuf::UnknownFieldSet>();
-}
-
-const char* FigureDescriptor_ChartDescriptor::_InternalParse(
-    const char* ptr, ::_pbi::ParseContext* ctx) {
-  ptr = ::_pbi::TcParser::ParseLoop(this, ptr, ctx, &_table_.header);
-  return ptr;
-}
-
-
-PROTOBUF_CONSTINIT PROTOBUF_ATTRIBUTE_INIT_PRIORITY1
-const ::_pbi::TcParseTable<4, 15, 3, 139, 2> FigureDescriptor_ChartDescriptor::_table_ = {
-  {
-    PROTOBUF_FIELD_OFFSET(FigureDescriptor_ChartDescriptor, _impl_._has_bits_),
-    0, // no _extensions_
-    15, 120,  // max_field_number, fast_idx_mask
-    offsetof(decltype(_table_), field_lookup_table),
-    4294934528,  // skipmap
-    offsetof(decltype(_table_), field_entries),
-    15,  // num_field_entries
-    3,  // num_aux_entries
-    offsetof(decltype(_table_), aux_entries),
-    &_FigureDescriptor_ChartDescriptor_default_instance_._instance,
-    ::_pbi::TcParser::GenericFallback,  // fallback
-  }, {{
-    {::_pbi::TcParser::MiniParse, {}},
-    // int32 colspan = 1;
-    {::_pbi::TcParser::SingularVarintNoZag1<::uint32_t, offsetof(FigureDescriptor_ChartDescriptor, _impl_.colspan_), 63>(),
-     {8, 63, 0, PROTOBUF_FIELD_OFFSET(FigureDescriptor_ChartDescriptor, _impl_.colspan_)}},
-    // int32 rowspan = 2;
-    {::_pbi::TcParser::SingularVarintNoZag1<::uint32_t, offsetof(FigureDescriptor_ChartDescriptor, _impl_.rowspan_), 63>(),
-     {16, 63, 0, PROTOBUF_FIELD_OFFSET(FigureDescriptor_ChartDescriptor, _impl_.rowspan_)}},
-    // repeated .io.deephaven.proto.backplane.script.grpc.FigureDescriptor.SeriesDescriptor series = 3;
-    {::_pbi::TcParser::FastMtR1,
-     {26, 63, 0, PROTOBUF_FIELD_OFFSET(FigureDescriptor_ChartDescriptor, _impl_.series_)}},
-    // repeated .io.deephaven.proto.backplane.script.grpc.FigureDescriptor.MultiSeriesDescriptor multi_series = 4;
-    {::_pbi::TcParser::FastMtR1,
-     {34, 63, 1, PROTOBUF_FIELD_OFFSET(FigureDescriptor_ChartDescriptor, _impl_.multi_series_)}},
-    // repeated .io.deephaven.proto.backplane.script.grpc.FigureDescriptor.AxisDescriptor axes = 5;
-    {::_pbi::TcParser::FastMtR1,
-     {42, 63, 2, PROTOBUF_FIELD_OFFSET(FigureDescriptor_ChartDescriptor, _impl_.axes_)}},
-    // .io.deephaven.proto.backplane.script.grpc.FigureDescriptor.ChartDescriptor.ChartType chart_type = 6;
-    {::_pbi::TcParser::SingularVarintNoZag1<::uint32_t, offsetof(FigureDescriptor_ChartDescriptor, _impl_.chart_type_), 63>(),
-     {48, 63, 0, PROTOBUF_FIELD_OFFSET(FigureDescriptor_ChartDescriptor, _impl_.chart_type_)}},
-    // optional string title = 7;
-    {::_pbi::TcParser::FastUS1,
-     {58, 0, 0, PROTOBUF_FIELD_OFFSET(FigureDescriptor_ChartDescriptor, _impl_.title_)}},
-    // string title_font = 8;
-    {::_pbi::TcParser::FastUS1,
-     {66, 63, 0, PROTOBUF_FIELD_OFFSET(FigureDescriptor_ChartDescriptor, _impl_.title_font_)}},
-    // string title_color = 9;
-    {::_pbi::TcParser::FastUS1,
-     {74, 63, 0, PROTOBUF_FIELD_OFFSET(FigureDescriptor_ChartDescriptor, _impl_.title_color_)}},
-    // bool show_legend = 10;
-    {::_pbi::TcParser::SingularVarintNoZag1<bool, offsetof(FigureDescriptor_ChartDescriptor, _impl_.show_legend_), 63>(),
-     {80, 63, 0, PROTOBUF_FIELD_OFFSET(FigureDescriptor_ChartDescriptor, _impl_.show_legend_)}},
-    // string legend_font = 11;
-    {::_pbi::TcParser::FastUS1,
-     {90, 63, 0, PROTOBUF_FIELD_OFFSET(FigureDescriptor_ChartDescriptor, _impl_.legend_font_)}},
-    // string legend_color = 12;
-    {::_pbi::TcParser::FastUS1,
-     {98, 63, 0, PROTOBUF_FIELD_OFFSET(FigureDescriptor_ChartDescriptor, _impl_.legend_color_)}},
-    // bool is3d = 13;
-    {::_pbi::TcParser::SingularVarintNoZag1<bool, offsetof(FigureDescriptor_ChartDescriptor, _impl_.is3d_), 63>(),
-     {104, 63, 0, PROTOBUF_FIELD_OFFSET(FigureDescriptor_ChartDescriptor, _impl_.is3d_)}},
-    // int32 column = 14;
-    {::_pbi::TcParser::SingularVarintNoZag1<::uint32_t, offsetof(FigureDescriptor_ChartDescriptor, _impl_.column_), 63>(),
-     {112, 63, 0, PROTOBUF_FIELD_OFFSET(FigureDescriptor_ChartDescriptor, _impl_.column_)}},
-    // int32 row = 15;
-    {::_pbi::TcParser::SingularVarintNoZag1<::uint32_t, offsetof(FigureDescriptor_ChartDescriptor, _impl_.row_), 63>(),
-     {120, 63, 0, PROTOBUF_FIELD_OFFSET(FigureDescriptor_ChartDescriptor, _impl_.row_)}},
-  }}, {{
-    65535, 65535
-  }}, {{
-    // int32 colspan = 1;
-    {PROTOBUF_FIELD_OFFSET(FigureDescriptor_ChartDescriptor, _impl_.colspan_), -1, 0,
-    (0 | ::_fl::kFcSingular | ::_fl::kInt32)},
-    // int32 rowspan = 2;
-    {PROTOBUF_FIELD_OFFSET(FigureDescriptor_ChartDescriptor, _impl_.rowspan_), -1, 0,
-    (0 | ::_fl::kFcSingular | ::_fl::kInt32)},
-    // repeated .io.deephaven.proto.backplane.script.grpc.FigureDescriptor.SeriesDescriptor series = 3;
-    {PROTOBUF_FIELD_OFFSET(FigureDescriptor_ChartDescriptor, _impl_.series_), -1, 0,
-    (0 | ::_fl::kFcRepeated | ::_fl::kMessage | ::_fl::kTvTable)},
-    // repeated .io.deephaven.proto.backplane.script.grpc.FigureDescriptor.MultiSeriesDescriptor multi_series = 4;
-    {PROTOBUF_FIELD_OFFSET(FigureDescriptor_ChartDescriptor, _impl_.multi_series_), -1, 1,
-    (0 | ::_fl::kFcRepeated | ::_fl::kMessage | ::_fl::kTvTable)},
-    // repeated .io.deephaven.proto.backplane.script.grpc.FigureDescriptor.AxisDescriptor axes = 5;
-    {PROTOBUF_FIELD_OFFSET(FigureDescriptor_ChartDescriptor, _impl_.axes_), -1, 2,
-    (0 | ::_fl::kFcRepeated | ::_fl::kMessage | ::_fl::kTvTable)},
-    // .io.deephaven.proto.backplane.script.grpc.FigureDescriptor.ChartDescriptor.ChartType chart_type = 6;
-    {PROTOBUF_FIELD_OFFSET(FigureDescriptor_ChartDescriptor, _impl_.chart_type_), -1, 0,
-    (0 | ::_fl::kFcSingular | ::_fl::kOpenEnum)},
-    // optional string title = 7;
-    {PROTOBUF_FIELD_OFFSET(FigureDescriptor_ChartDescriptor, _impl_.title_), _Internal::kHasBitsOffset + 0, 0,
-    (0 | ::_fl::kFcOptional | ::_fl::kUtf8String | ::_fl::kRepAString)},
-    // string title_font = 8;
-    {PROTOBUF_FIELD_OFFSET(FigureDescriptor_ChartDescriptor, _impl_.title_font_), -1, 0,
-    (0 | ::_fl::kFcSingular | ::_fl::kUtf8String | ::_fl::kRepAString)},
-    // string title_color = 9;
-    {PROTOBUF_FIELD_OFFSET(FigureDescriptor_ChartDescriptor, _impl_.title_color_), -1, 0,
-    (0 | ::_fl::kFcSingular | ::_fl::kUtf8String | ::_fl::kRepAString)},
-    // bool show_legend = 10;
-    {PROTOBUF_FIELD_OFFSET(FigureDescriptor_ChartDescriptor, _impl_.show_legend_), -1, 0,
-    (0 | ::_fl::kFcSingular | ::_fl::kBool)},
-    // string legend_font = 11;
-    {PROTOBUF_FIELD_OFFSET(FigureDescriptor_ChartDescriptor, _impl_.legend_font_), -1, 0,
-    (0 | ::_fl::kFcSingular | ::_fl::kUtf8String | ::_fl::kRepAString)},
-    // string legend_color = 12;
-    {PROTOBUF_FIELD_OFFSET(FigureDescriptor_ChartDescriptor, _impl_.legend_color_), -1, 0,
-    (0 | ::_fl::kFcSingular | ::_fl::kUtf8String | ::_fl::kRepAString)},
-    // bool is3d = 13;
-    {PROTOBUF_FIELD_OFFSET(FigureDescriptor_ChartDescriptor, _impl_.is3d_), -1, 0,
-    (0 | ::_fl::kFcSingular | ::_fl::kBool)},
-    // int32 column = 14;
-    {PROTOBUF_FIELD_OFFSET(FigureDescriptor_ChartDescriptor, _impl_.column_), -1, 0,
-    (0 | ::_fl::kFcSingular | ::_fl::kInt32)},
-    // int32 row = 15;
-    {PROTOBUF_FIELD_OFFSET(FigureDescriptor_ChartDescriptor, _impl_.row_), -1, 0,
-    (0 | ::_fl::kFcSingular | ::_fl::kInt32)},
-  }}, {{
-    {::_pbi::TcParser::GetTable<::io::deephaven::proto::backplane::script::grpc::FigureDescriptor_SeriesDescriptor>()},
-    {::_pbi::TcParser::GetTable<::io::deephaven::proto::backplane::script::grpc::FigureDescriptor_MultiSeriesDescriptor>()},
-    {::_pbi::TcParser::GetTable<::io::deephaven::proto::backplane::script::grpc::FigureDescriptor_AxisDescriptor>()},
-  }}, {{
-    "\111\0\0\0\0\0\0\5\12\13\0\13\14\0\0\0"
-    "io.deephaven.proto.backplane.script.grpc.FigureDescriptor.ChartDescriptor"
-    "title"
-    "title_font"
-    "title_color"
-    "legend_font"
-    "legend_color"
-  }},
-};
-
-::uint8_t* FigureDescriptor_ChartDescriptor::_InternalSerialize(
-    ::uint8_t* target,
-    ::google::protobuf::io::EpsCopyOutputStream* stream) const {
-  // @@protoc_insertion_point(serialize_to_array_start:io.deephaven.proto.backplane.script.grpc.FigureDescriptor.ChartDescriptor)
-  ::uint32_t cached_has_bits = 0;
-  (void)cached_has_bits;
-
-  // int32 colspan = 1;
-  if (this->_internal_colspan() != 0) {
-    target = ::google::protobuf::internal::WireFormatLite::
-        WriteInt32ToArrayWithField<1>(
-            stream, this->_internal_colspan(), target);
-  }
-
-  // int32 rowspan = 2;
-  if (this->_internal_rowspan() != 0) {
-    target = ::google::protobuf::internal::WireFormatLite::
-        WriteInt32ToArrayWithField<2>(
-            stream, this->_internal_rowspan(), target);
-  }
-
-  // repeated .io.deephaven.proto.backplane.script.grpc.FigureDescriptor.SeriesDescriptor series = 3;
-  for (unsigned i = 0,
-      n = static_cast<unsigned>(this->_internal_series_size()); i < n; i++) {
-    const auto& repfield = this->_internal_series().Get(i);
-    target = ::google::protobuf::internal::WireFormatLite::
-        InternalWriteMessage(3, repfield, repfield.GetCachedSize(), target, stream);
-  }
-
-  // repeated .io.deephaven.proto.backplane.script.grpc.FigureDescriptor.MultiSeriesDescriptor multi_series = 4;
-  for (unsigned i = 0,
-      n = static_cast<unsigned>(this->_internal_multi_series_size()); i < n; i++) {
-    const auto& repfield = this->_internal_multi_series().Get(i);
-    target = ::google::protobuf::internal::WireFormatLite::
-        InternalWriteMessage(4, repfield, repfield.GetCachedSize(), target, stream);
-  }
-
-  // repeated .io.deephaven.proto.backplane.script.grpc.FigureDescriptor.AxisDescriptor axes = 5;
-  for (unsigned i = 0,
-      n = static_cast<unsigned>(this->_internal_axes_size()); i < n; i++) {
-    const auto& repfield = this->_internal_axes().Get(i);
-    target = ::google::protobuf::internal::WireFormatLite::
-        InternalWriteMessage(5, repfield, repfield.GetCachedSize(), target, stream);
-  }
-
-  // .io.deephaven.proto.backplane.script.grpc.FigureDescriptor.ChartDescriptor.ChartType chart_type = 6;
-  if (this->_internal_chart_type() != 0) {
-    target = stream->EnsureSpace(target);
-    target = ::_pbi::WireFormatLite::WriteEnumToArray(
-        6, this->_internal_chart_type(), target);
-  }
-
-  cached_has_bits = _impl_._has_bits_[0];
-  // optional string title = 7;
-  if (cached_has_bits & 0x00000001u) {
-    const std::string& _s = this->_internal_title();
-    ::google::protobuf::internal::WireFormatLite::VerifyUtf8String(
-        _s.data(), static_cast<int>(_s.length()), ::google::protobuf::internal::WireFormatLite::SERIALIZE, "io.deephaven.proto.backplane.script.grpc.FigureDescriptor.ChartDescriptor.title");
-    target = stream->WriteStringMaybeAliased(7, _s, target);
-  }
-
-  // string title_font = 8;
-  if (!this->_internal_title_font().empty()) {
-    const std::string& _s = this->_internal_title_font();
-    ::google::protobuf::internal::WireFormatLite::VerifyUtf8String(
-        _s.data(), static_cast<int>(_s.length()), ::google::protobuf::internal::WireFormatLite::SERIALIZE, "io.deephaven.proto.backplane.script.grpc.FigureDescriptor.ChartDescriptor.title_font");
-    target = stream->WriteStringMaybeAliased(8, _s, target);
-  }
-
-  // string title_color = 9;
-  if (!this->_internal_title_color().empty()) {
-    const std::string& _s = this->_internal_title_color();
-    ::google::protobuf::internal::WireFormatLite::VerifyUtf8String(
-        _s.data(), static_cast<int>(_s.length()), ::google::protobuf::internal::WireFormatLite::SERIALIZE, "io.deephaven.proto.backplane.script.grpc.FigureDescriptor.ChartDescriptor.title_color");
-    target = stream->WriteStringMaybeAliased(9, _s, target);
-  }
-
-  // bool show_legend = 10;
-  if (this->_internal_show_legend() != 0) {
-    target = stream->EnsureSpace(target);
-    target = ::_pbi::WireFormatLite::WriteBoolToArray(
-        10, this->_internal_show_legend(), target);
-  }
-
-  // string legend_font = 11;
-  if (!this->_internal_legend_font().empty()) {
-    const std::string& _s = this->_internal_legend_font();
-    ::google::protobuf::internal::WireFormatLite::VerifyUtf8String(
-        _s.data(), static_cast<int>(_s.length()), ::google::protobuf::internal::WireFormatLite::SERIALIZE, "io.deephaven.proto.backplane.script.grpc.FigureDescriptor.ChartDescriptor.legend_font");
-    target = stream->WriteStringMaybeAliased(11, _s, target);
-  }
-
-  // string legend_color = 12;
-  if (!this->_internal_legend_color().empty()) {
-    const std::string& _s = this->_internal_legend_color();
-    ::google::protobuf::internal::WireFormatLite::VerifyUtf8String(
-        _s.data(), static_cast<int>(_s.length()), ::google::protobuf::internal::WireFormatLite::SERIALIZE, "io.deephaven.proto.backplane.script.grpc.FigureDescriptor.ChartDescriptor.legend_color");
-    target = stream->WriteStringMaybeAliased(12, _s, target);
-  }
-
-  // bool is3d = 13;
-  if (this->_internal_is3d() != 0) {
-    target = stream->EnsureSpace(target);
-    target = ::_pbi::WireFormatLite::WriteBoolToArray(
-        13, this->_internal_is3d(), target);
-  }
-
-  // int32 column = 14;
-  if (this->_internal_column() != 0) {
-    target = ::google::protobuf::internal::WireFormatLite::
-        WriteInt32ToArrayWithField<14>(
-            stream, this->_internal_column(), target);
-  }
-
-  // int32 row = 15;
-  if (this->_internal_row() != 0) {
-    target = ::google::protobuf::internal::WireFormatLite::
-        WriteInt32ToArrayWithField<15>(
-            stream, this->_internal_row(), target);
-  }
-
-  if (PROTOBUF_PREDICT_FALSE(_internal_metadata_.have_unknown_fields())) {
-    target =
-        ::_pbi::WireFormat::InternalSerializeUnknownFieldsToArray(
-            _internal_metadata_.unknown_fields<::google::protobuf::UnknownFieldSet>(::google::protobuf::UnknownFieldSet::default_instance), target, stream);
-  }
-  // @@protoc_insertion_point(serialize_to_array_end:io.deephaven.proto.backplane.script.grpc.FigureDescriptor.ChartDescriptor)
-  return target;
-}
-
-::size_t FigureDescriptor_ChartDescriptor::ByteSizeLong() const {
-// @@protoc_insertion_point(message_byte_size_start:io.deephaven.proto.backplane.script.grpc.FigureDescriptor.ChartDescriptor)
-  ::size_t total_size = 0;
-
-  ::uint32_t cached_has_bits = 0;
-  // Prevent compiler warnings about cached_has_bits being unused
-  (void) cached_has_bits;
-
-  // repeated .io.deephaven.proto.backplane.script.grpc.FigureDescriptor.SeriesDescriptor series = 3;
-  total_size += 1UL * this->_internal_series_size();
-  for (const auto& msg : this->_internal_series()) {
-    total_size +=
-      ::google::protobuf::internal::WireFormatLite::MessageSize(msg);
-  }
-  // repeated .io.deephaven.proto.backplane.script.grpc.FigureDescriptor.MultiSeriesDescriptor multi_series = 4;
-  total_size += 1UL * this->_internal_multi_series_size();
-  for (const auto& msg : this->_internal_multi_series()) {
-    total_size +=
-      ::google::protobuf::internal::WireFormatLite::MessageSize(msg);
-  }
-  // repeated .io.deephaven.proto.backplane.script.grpc.FigureDescriptor.AxisDescriptor axes = 5;
-  total_size += 1UL * this->_internal_axes_size();
-  for (const auto& msg : this->_internal_axes()) {
-    total_size +=
-      ::google::protobuf::internal::WireFormatLite::MessageSize(msg);
-  }
-  // optional string title = 7;
-  cached_has_bits = _impl_._has_bits_[0];
-  if (cached_has_bits & 0x00000001u) {
-    total_size += 1 + ::google::protobuf::internal::WireFormatLite::StringSize(
-                                    this->_internal_title());
-  }
-
-  // string title_font = 8;
-  if (!this->_internal_title_font().empty()) {
-    total_size += 1 + ::google::protobuf::internal::WireFormatLite::StringSize(
-                                    this->_internal_title_font());
-  }
-
-  // string title_color = 9;
-  if (!this->_internal_title_color().empty()) {
-    total_size += 1 + ::google::protobuf::internal::WireFormatLite::StringSize(
-                                    this->_internal_title_color());
-  }
-
-  // string legend_font = 11;
-  if (!this->_internal_legend_font().empty()) {
-    total_size += 1 + ::google::protobuf::internal::WireFormatLite::StringSize(
-                                    this->_internal_legend_font());
-  }
-
-  // string legend_color = 12;
-  if (!this->_internal_legend_color().empty()) {
-    total_size += 1 + ::google::protobuf::internal::WireFormatLite::StringSize(
-                                    this->_internal_legend_color());
-  }
-
-  // int32 colspan = 1;
-  if (this->_internal_colspan() != 0) {
-    total_size += ::_pbi::WireFormatLite::Int32SizePlusOne(
-        this->_internal_colspan());
-  }
-
-  // int32 rowspan = 2;
-  if (this->_internal_rowspan() != 0) {
-    total_size += ::_pbi::WireFormatLite::Int32SizePlusOne(
-        this->_internal_rowspan());
-  }
-
-  // .io.deephaven.proto.backplane.script.grpc.FigureDescriptor.ChartDescriptor.ChartType chart_type = 6;
-  if (this->_internal_chart_type() != 0) {
-    total_size += 1 +
-                  ::_pbi::WireFormatLite::EnumSize(this->_internal_chart_type());
-  }
-
-  // bool show_legend = 10;
-  if (this->_internal_show_legend() != 0) {
-    total_size += 2;
-  }
-
-  // bool is3d = 13;
-  if (this->_internal_is3d() != 0) {
-    total_size += 2;
-  }
-
-  // int32 column = 14;
-  if (this->_internal_column() != 0) {
-    total_size += ::_pbi::WireFormatLite::Int32SizePlusOne(
-        this->_internal_column());
-  }
-
-  // int32 row = 15;
-  if (this->_internal_row() != 0) {
-    total_size += ::_pbi::WireFormatLite::Int32SizePlusOne(
-        this->_internal_row());
-  }
-
-  return MaybeComputeUnknownFieldsSize(total_size, &_impl_._cached_size_);
-}
-
-const ::google::protobuf::Message::ClassData FigureDescriptor_ChartDescriptor::_class_data_ = {
-    FigureDescriptor_ChartDescriptor::MergeImpl,
-    nullptr,  // OnDemandRegisterArenaDtor
-};
-const ::google::protobuf::Message::ClassData* FigureDescriptor_ChartDescriptor::GetClassData() const {
-  return &_class_data_;
-}
-
-void FigureDescriptor_ChartDescriptor::MergeImpl(::google::protobuf::Message& to_msg, const ::google::protobuf::Message& from_msg) {
-  auto* const _this = static_cast<FigureDescriptor_ChartDescriptor*>(&to_msg);
-  auto& from = static_cast<const FigureDescriptor_ChartDescriptor&>(from_msg);
-  // @@protoc_insertion_point(class_specific_merge_from_start:io.deephaven.proto.backplane.script.grpc.FigureDescriptor.ChartDescriptor)
-  ABSL_DCHECK_NE(&from, _this);
-  ::uint32_t cached_has_bits = 0;
-  (void) cached_has_bits;
-
-  _this->_internal_mutable_series()->MergeFrom(
-      from._internal_series());
-  _this->_internal_mutable_multi_series()->MergeFrom(
-      from._internal_multi_series());
-  _this->_internal_mutable_axes()->MergeFrom(
-      from._internal_axes());
-  if ((from._impl_._has_bits_[0] & 0x00000001u) != 0) {
-    _this->_internal_set_title(from._internal_title());
-  }
-  if (!from._internal_title_font().empty()) {
-    _this->_internal_set_title_font(from._internal_title_font());
-  }
-  if (!from._internal_title_color().empty()) {
-    _this->_internal_set_title_color(from._internal_title_color());
-  }
-  if (!from._internal_legend_font().empty()) {
-    _this->_internal_set_legend_font(from._internal_legend_font());
-  }
-  if (!from._internal_legend_color().empty()) {
-    _this->_internal_set_legend_color(from._internal_legend_color());
-  }
-  if (from._internal_colspan() != 0) {
-    _this->_internal_set_colspan(from._internal_colspan());
-  }
-  if (from._internal_rowspan() != 0) {
-    _this->_internal_set_rowspan(from._internal_rowspan());
-  }
-  if (from._internal_chart_type() != 0) {
-    _this->_internal_set_chart_type(from._internal_chart_type());
-  }
-  if (from._internal_show_legend() != 0) {
-    _this->_internal_set_show_legend(from._internal_show_legend());
-  }
-  if (from._internal_is3d() != 0) {
-    _this->_internal_set_is3d(from._internal_is3d());
-  }
-  if (from._internal_column() != 0) {
-    _this->_internal_set_column(from._internal_column());
-  }
-  if (from._internal_row() != 0) {
-    _this->_internal_set_row(from._internal_row());
-  }
-  _this->_internal_metadata_.MergeFrom<::google::protobuf::UnknownFieldSet>(from._internal_metadata_);
-}
-
-void FigureDescriptor_ChartDescriptor::CopyFrom(const FigureDescriptor_ChartDescriptor& from) {
-// @@protoc_insertion_point(class_specific_copy_from_start:io.deephaven.proto.backplane.script.grpc.FigureDescriptor.ChartDescriptor)
-  if (&from == this) return;
-  Clear();
-  MergeFrom(from);
-}
-
-PROTOBUF_NOINLINE bool FigureDescriptor_ChartDescriptor::IsInitialized() const {
-  return true;
-}
-
-::_pbi::CachedSize* FigureDescriptor_ChartDescriptor::AccessCachedSize() const {
-  return &_impl_._cached_size_;
-}
-void FigureDescriptor_ChartDescriptor::InternalSwap(FigureDescriptor_ChartDescriptor* PROTOBUF_RESTRICT other) {
-  using std::swap;
-  auto* arena = GetArena();
-  ABSL_DCHECK_EQ(arena, other->GetArena());
-  _internal_metadata_.InternalSwap(&other->_internal_metadata_);
-  swap(_impl_._has_bits_[0], other->_impl_._has_bits_[0]);
-  _impl_.series_.InternalSwap(&other->_impl_.series_);
-  _impl_.multi_series_.InternalSwap(&other->_impl_.multi_series_);
-  _impl_.axes_.InternalSwap(&other->_impl_.axes_);
-  ::_pbi::ArenaStringPtr::InternalSwap(&_impl_.title_, &other->_impl_.title_, arena);
-  ::_pbi::ArenaStringPtr::InternalSwap(&_impl_.title_font_, &other->_impl_.title_font_, arena);
-  ::_pbi::ArenaStringPtr::InternalSwap(&_impl_.title_color_, &other->_impl_.title_color_, arena);
-  ::_pbi::ArenaStringPtr::InternalSwap(&_impl_.legend_font_, &other->_impl_.legend_font_, arena);
-  ::_pbi::ArenaStringPtr::InternalSwap(&_impl_.legend_color_, &other->_impl_.legend_color_, arena);
-  ::google::protobuf::internal::memswap<
-      PROTOBUF_FIELD_OFFSET(FigureDescriptor_ChartDescriptor, _impl_.row_)
-      + sizeof(FigureDescriptor_ChartDescriptor::_impl_.row_)
-      - PROTOBUF_FIELD_OFFSET(FigureDescriptor_ChartDescriptor, _impl_.colspan_)>(
-          reinterpret_cast<char*>(&_impl_.colspan_),
-          reinterpret_cast<char*>(&other->_impl_.colspan_));
-}
-
-::google::protobuf::Metadata FigureDescriptor_ChartDescriptor::GetMetadata() const {
-  return ::_pbi::AssignDescriptors(
-      &descriptor_table_deephaven_2fproto_2fconsole_2eproto_getter, &descriptor_table_deephaven_2fproto_2fconsole_2eproto_once,
-      file_level_metadata_deephaven_2fproto_2fconsole_2eproto[45]);
-}
-// ===================================================================
-
-class FigureDescriptor_SeriesDescriptor::_Internal {
- public:
-  using HasBits = decltype(std::declval<FigureDescriptor_SeriesDescriptor>()._impl_._has_bits_);
-  static constexpr ::int32_t kHasBitsOffset =
-    8 * PROTOBUF_FIELD_OFFSET(FigureDescriptor_SeriesDescriptor, _impl_._has_bits_);
-  static void set_has_lines_visible(HasBits* has_bits) {
-    (*has_bits)[0] |= 8u;
-  }
-  static void set_has_shapes_visible(HasBits* has_bits) {
-    (*has_bits)[0] |= 16u;
-  }
-  static void set_has_point_label_format(HasBits* has_bits) {
-    (*has_bits)[0] |= 1u;
-  }
-  static void set_has_x_tool_tip_pattern(HasBits* has_bits) {
-    (*has_bits)[0] |= 2u;
-  }
-  static void set_has_y_tool_tip_pattern(HasBits* has_bits) {
-    (*has_bits)[0] |= 4u;
-  }
-  static void set_has_shape_size(HasBits* has_bits) {
-    (*has_bits)[0] |= 32u;
-  }
-};
-
-FigureDescriptor_SeriesDescriptor::FigureDescriptor_SeriesDescriptor(::google::protobuf::Arena* arena)
-    : ::google::protobuf::Message(arena) {
-  SharedCtor(arena);
-  // @@protoc_insertion_point(arena_constructor:io.deephaven.proto.backplane.script.grpc.FigureDescriptor.SeriesDescriptor)
-}
-inline PROTOBUF_NDEBUG_INLINE FigureDescriptor_SeriesDescriptor::Impl_::Impl_(
-    ::google::protobuf::internal::InternalVisibility visibility, ::google::protobuf::Arena* arena,
-    const Impl_& from)
-      : _has_bits_{from._has_bits_},
-        _cached_size_{0},
-        data_sources_{visibility, arena, from.data_sources_},
-        name_(arena, from.name_),
-        line_color_(arena, from.line_color_),
-        point_label_format_(arena, from.point_label_format_),
-        x_tool_tip_pattern_(arena, from.x_tool_tip_pattern_),
-        y_tool_tip_pattern_(arena, from.y_tool_tip_pattern_),
-        shape_label_(arena, from.shape_label_),
-        shape_color_(arena, from.shape_color_),
-        shape_(arena, from.shape_) {}
-
-FigureDescriptor_SeriesDescriptor::FigureDescriptor_SeriesDescriptor(
-    ::google::protobuf::Arena* arena,
-    const FigureDescriptor_SeriesDescriptor& from)
-    : ::google::protobuf::Message(arena) {
-  FigureDescriptor_SeriesDescriptor* const _this = this;
-  (void)_this;
-  _internal_metadata_.MergeFrom<::google::protobuf::UnknownFieldSet>(
-      from._internal_metadata_);
-  new (&_impl_) Impl_(internal_visibility(), arena, from._impl_);
-  ::memcpy(reinterpret_cast<char *>(&_impl_) +
-               offsetof(Impl_, plot_style_),
-           reinterpret_cast<const char *>(&from._impl_) +
-               offsetof(Impl_, plot_style_),
-           offsetof(Impl_, shape_size_) -
-               offsetof(Impl_, plot_style_) +
-               sizeof(Impl_::shape_size_));
-
-  // @@protoc_insertion_point(copy_constructor:io.deephaven.proto.backplane.script.grpc.FigureDescriptor.SeriesDescriptor)
-}
-inline PROTOBUF_NDEBUG_INLINE FigureDescriptor_SeriesDescriptor::Impl_::Impl_(
-    ::google::protobuf::internal::InternalVisibility visibility,
-    ::google::protobuf::Arena* arena)
-      : _cached_size_{0},
-        data_sources_{visibility, arena},
-        name_(arena),
-        line_color_(arena),
-        point_label_format_(arena),
-        x_tool_tip_pattern_(arena),
-        y_tool_tip_pattern_(arena),
-        shape_label_(arena),
-        shape_color_(arena),
-        shape_(arena) {}
-
-inline void FigureDescriptor_SeriesDescriptor::SharedCtor(::_pb::Arena* arena) {
-  new (&_impl_) Impl_(internal_visibility(), arena);
-  ::memset(reinterpret_cast<char *>(&_impl_) +
-               offsetof(Impl_, plot_style_),
-           0,
-           offsetof(Impl_, shape_size_) -
-               offsetof(Impl_, plot_style_) +
-               sizeof(Impl_::shape_size_));
-}
-FigureDescriptor_SeriesDescriptor::~FigureDescriptor_SeriesDescriptor() {
-  // @@protoc_insertion_point(destructor:io.deephaven.proto.backplane.script.grpc.FigureDescriptor.SeriesDescriptor)
-  _internal_metadata_.Delete<::google::protobuf::UnknownFieldSet>();
-  SharedDtor();
-}
-inline void FigureDescriptor_SeriesDescriptor::SharedDtor() {
-  ABSL_DCHECK(GetArena() == nullptr);
-  _impl_.name_.Destroy();
-  _impl_.line_color_.Destroy();
-  _impl_.point_label_format_.Destroy();
-  _impl_.x_tool_tip_pattern_.Destroy();
-  _impl_.y_tool_tip_pattern_.Destroy();
-  _impl_.shape_label_.Destroy();
-  _impl_.shape_color_.Destroy();
-  _impl_.shape_.Destroy();
-  _impl_.~Impl_();
-}
-
-PROTOBUF_NOINLINE void FigureDescriptor_SeriesDescriptor::Clear() {
-// @@protoc_insertion_point(message_clear_start:io.deephaven.proto.backplane.script.grpc.FigureDescriptor.SeriesDescriptor)
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  ::uint32_t cached_has_bits = 0;
-  // Prevent compiler warnings about cached_has_bits being unused
-  (void) cached_has_bits;
-
-  _impl_.data_sources_.Clear();
-  _impl_.name_.ClearToEmpty();
-  _impl_.line_color_.ClearToEmpty();
-  cached_has_bits = _impl_._has_bits_[0];
-  if (cached_has_bits & 0x00000007u) {
-    if (cached_has_bits & 0x00000001u) {
-      _impl_.point_label_format_.ClearNonDefaultToEmpty();
-    }
-    if (cached_has_bits & 0x00000002u) {
-      _impl_.x_tool_tip_pattern_.ClearNonDefaultToEmpty();
-    }
-    if (cached_has_bits & 0x00000004u) {
-      _impl_.y_tool_tip_pattern_.ClearNonDefaultToEmpty();
-    }
-  }
-  _impl_.shape_label_.ClearToEmpty();
-  _impl_.shape_color_.ClearToEmpty();
-  _impl_.shape_.ClearToEmpty();
-  _impl_.plot_style_ = 0;
-  if (cached_has_bits & 0x00000018u) {
-    ::memset(&_impl_.lines_visible_, 0, static_cast<::size_t>(
-        reinterpret_cast<char*>(&_impl_.shapes_visible_) -
-        reinterpret_cast<char*>(&_impl_.lines_visible_)) + sizeof(_impl_.shapes_visible_));
-  }
-  _impl_.gradient_visible_ = false;
-  _impl_.shape_size_ = 0;
-  _impl_._has_bits_.Clear();
-  _internal_metadata_.Clear<::google::protobuf::UnknownFieldSet>();
-}
-
-const char* FigureDescriptor_SeriesDescriptor::_InternalParse(
-    const char* ptr, ::_pbi::ParseContext* ctx) {
-  ptr = ::_pbi::TcParser::ParseLoop(this, ptr, ctx, &_table_.header);
-  return ptr;
-}
-
-
-PROTOBUF_CONSTINIT PROTOBUF_ATTRIBUTE_INIT_PRIORITY1
-const ::_pbi::TcParseTable<4, 14, 1, 186, 2> FigureDescriptor_SeriesDescriptor::_table_ = {
-  {
-    PROTOBUF_FIELD_OFFSET(FigureDescriptor_SeriesDescriptor, _impl_._has_bits_),
-    0, // no _extensions_
-    15, 120,  // max_field_number, fast_idx_mask
-    offsetof(decltype(_table_), field_lookup_table),
-    4294934592,  // skipmap
-    offsetof(decltype(_table_), field_entries),
-    14,  // num_field_entries
-    1,  // num_aux_entries
-    offsetof(decltype(_table_), aux_entries),
-    &_FigureDescriptor_SeriesDescriptor_default_instance_._instance,
-    ::_pbi::TcParser::GenericFallback,  // fallback
-  }, {{
-    {::_pbi::TcParser::MiniParse, {}},
-    // .io.deephaven.proto.backplane.script.grpc.FigureDescriptor.SeriesPlotStyle plot_style = 1;
-    {::_pbi::TcParser::SingularVarintNoZag1<::uint32_t, offsetof(FigureDescriptor_SeriesDescriptor, _impl_.plot_style_), 63>(),
-     {8, 63, 0, PROTOBUF_FIELD_OFFSET(FigureDescriptor_SeriesDescriptor, _impl_.plot_style_)}},
-    // string name = 2;
-    {::_pbi::TcParser::FastUS1,
-     {18, 63, 0, PROTOBUF_FIELD_OFFSET(FigureDescriptor_SeriesDescriptor, _impl_.name_)}},
-    // optional bool lines_visible = 3;
-    {::_pbi::TcParser::SingularVarintNoZag1<bool, offsetof(FigureDescriptor_SeriesDescriptor, _impl_.lines_visible_), 3>(),
-     {24, 3, 0, PROTOBUF_FIELD_OFFSET(FigureDescriptor_SeriesDescriptor, _impl_.lines_visible_)}},
-    // optional bool shapes_visible = 4;
-    {::_pbi::TcParser::SingularVarintNoZag1<bool, offsetof(FigureDescriptor_SeriesDescriptor, _impl_.shapes_visible_), 4>(),
-     {32, 4, 0, PROTOBUF_FIELD_OFFSET(FigureDescriptor_SeriesDescriptor, _impl_.shapes_visible_)}},
-    // bool gradient_visible = 5;
-    {::_pbi::TcParser::SingularVarintNoZag1<bool, offsetof(FigureDescriptor_SeriesDescriptor, _impl_.gradient_visible_), 63>(),
-     {40, 63, 0, PROTOBUF_FIELD_OFFSET(FigureDescriptor_SeriesDescriptor, _impl_.gradient_visible_)}},
-    // string line_color = 6;
-    {::_pbi::TcParser::FastUS1,
-     {50, 63, 0, PROTOBUF_FIELD_OFFSET(FigureDescriptor_SeriesDescriptor, _impl_.line_color_)}},
-    {::_pbi::TcParser::MiniParse, {}},
-    // optional string point_label_format = 8;
-    {::_pbi::TcParser::FastUS1,
-     {66, 0, 0, PROTOBUF_FIELD_OFFSET(FigureDescriptor_SeriesDescriptor, _impl_.point_label_format_)}},
-    // optional string x_tool_tip_pattern = 9;
-    {::_pbi::TcParser::FastUS1,
-     {74, 1, 0, PROTOBUF_FIELD_OFFSET(FigureDescriptor_SeriesDescriptor, _impl_.x_tool_tip_pattern_)}},
-    // optional string y_tool_tip_pattern = 10;
-    {::_pbi::TcParser::FastUS1,
-     {82, 2, 0, PROTOBUF_FIELD_OFFSET(FigureDescriptor_SeriesDescriptor, _impl_.y_tool_tip_pattern_)}},
-    // string shape_label = 11;
-    {::_pbi::TcParser::FastUS1,
-     {90, 63, 0, PROTOBUF_FIELD_OFFSET(FigureDescriptor_SeriesDescriptor, _impl_.shape_label_)}},
-    // optional double shape_size = 12;
-    {::_pbi::TcParser::FastF64S1,
-     {97, 5, 0, PROTOBUF_FIELD_OFFSET(FigureDescriptor_SeriesDescriptor, _impl_.shape_size_)}},
-    // string shape_color = 13;
-    {::_pbi::TcParser::FastUS1,
-     {106, 63, 0, PROTOBUF_FIELD_OFFSET(FigureDescriptor_SeriesDescriptor, _impl_.shape_color_)}},
-    // string shape = 14;
-    {::_pbi::TcParser::FastUS1,
-     {114, 63, 0, PROTOBUF_FIELD_OFFSET(FigureDescriptor_SeriesDescriptor, _impl_.shape_)}},
-    // repeated .io.deephaven.proto.backplane.script.grpc.FigureDescriptor.SourceDescriptor data_sources = 15;
-    {::_pbi::TcParser::FastMtR1,
-     {122, 63, 0, PROTOBUF_FIELD_OFFSET(FigureDescriptor_SeriesDescriptor, _impl_.data_sources_)}},
-  }}, {{
-    65535, 65535
-  }}, {{
-    // .io.deephaven.proto.backplane.script.grpc.FigureDescriptor.SeriesPlotStyle plot_style = 1;
-    {PROTOBUF_FIELD_OFFSET(FigureDescriptor_SeriesDescriptor, _impl_.plot_style_), -1, 0,
-    (0 | ::_fl::kFcSingular | ::_fl::kOpenEnum)},
-    // string name = 2;
-    {PROTOBUF_FIELD_OFFSET(FigureDescriptor_SeriesDescriptor, _impl_.name_), -1, 0,
-    (0 | ::_fl::kFcSingular | ::_fl::kUtf8String | ::_fl::kRepAString)},
-    // optional bool lines_visible = 3;
-    {PROTOBUF_FIELD_OFFSET(FigureDescriptor_SeriesDescriptor, _impl_.lines_visible_), _Internal::kHasBitsOffset + 3, 0,
-    (0 | ::_fl::kFcOptional | ::_fl::kBool)},
-    // optional bool shapes_visible = 4;
-    {PROTOBUF_FIELD_OFFSET(FigureDescriptor_SeriesDescriptor, _impl_.shapes_visible_), _Internal::kHasBitsOffset + 4, 0,
-    (0 | ::_fl::kFcOptional | ::_fl::kBool)},
-    // bool gradient_visible = 5;
-    {PROTOBUF_FIELD_OFFSET(FigureDescriptor_SeriesDescriptor, _impl_.gradient_visible_), -1, 0,
-    (0 | ::_fl::kFcSingular | ::_fl::kBool)},
-    // string line_color = 6;
-    {PROTOBUF_FIELD_OFFSET(FigureDescriptor_SeriesDescriptor, _impl_.line_color_), -1, 0,
-    (0 | ::_fl::kFcSingular | ::_fl::kUtf8String | ::_fl::kRepAString)},
-    // optional string point_label_format = 8;
-    {PROTOBUF_FIELD_OFFSET(FigureDescriptor_SeriesDescriptor, _impl_.point_label_format_), _Internal::kHasBitsOffset + 0, 0,
-    (0 | ::_fl::kFcOptional | ::_fl::kUtf8String | ::_fl::kRepAString)},
-    // optional string x_tool_tip_pattern = 9;
-    {PROTOBUF_FIELD_OFFSET(FigureDescriptor_SeriesDescriptor, _impl_.x_tool_tip_pattern_), _Internal::kHasBitsOffset + 1, 0,
-    (0 | ::_fl::kFcOptional | ::_fl::kUtf8String | ::_fl::kRepAString)},
-    // optional string y_tool_tip_pattern = 10;
-    {PROTOBUF_FIELD_OFFSET(FigureDescriptor_SeriesDescriptor, _impl_.y_tool_tip_pattern_), _Internal::kHasBitsOffset + 2, 0,
-    (0 | ::_fl::kFcOptional | ::_fl::kUtf8String | ::_fl::kRepAString)},
-    // string shape_label = 11;
-    {PROTOBUF_FIELD_OFFSET(FigureDescriptor_SeriesDescriptor, _impl_.shape_label_), -1, 0,
-    (0 | ::_fl::kFcSingular | ::_fl::kUtf8String | ::_fl::kRepAString)},
-    // optional double shape_size = 12;
-    {PROTOBUF_FIELD_OFFSET(FigureDescriptor_SeriesDescriptor, _impl_.shape_size_), _Internal::kHasBitsOffset + 5, 0,
-    (0 | ::_fl::kFcOptional | ::_fl::kDouble)},
-    // string shape_color = 13;
-    {PROTOBUF_FIELD_OFFSET(FigureDescriptor_SeriesDescriptor, _impl_.shape_color_), -1, 0,
-    (0 | ::_fl::kFcSingular | ::_fl::kUtf8String | ::_fl::kRepAString)},
-    // string shape = 14;
-    {PROTOBUF_FIELD_OFFSET(FigureDescriptor_SeriesDescriptor, _impl_.shape_), -1, 0,
-    (0 | ::_fl::kFcSingular | ::_fl::kUtf8String | ::_fl::kRepAString)},
-    // repeated .io.deephaven.proto.backplane.script.grpc.FigureDescriptor.SourceDescriptor data_sources = 15;
-    {PROTOBUF_FIELD_OFFSET(FigureDescriptor_SeriesDescriptor, _impl_.data_sources_), -1, 0,
-    (0 | ::_fl::kFcRepeated | ::_fl::kMessage | ::_fl::kTvTable)},
-  }}, {{
-    {::_pbi::TcParser::GetTable<::io::deephaven::proto::backplane::script::grpc::FigureDescriptor_SourceDescriptor>()},
-  }}, {{
-    "\112\0\4\0\0\0\12\22\22\22\13\0\13\5\0\0"
-    "io.deephaven.proto.backplane.script.grpc.FigureDescriptor.SeriesDescriptor"
-    "name"
-    "line_color"
-    "point_label_format"
-    "x_tool_tip_pattern"
-    "y_tool_tip_pattern"
-    "shape_label"
-    "shape_color"
-    "shape"
-  }},
-};
-
-::uint8_t* FigureDescriptor_SeriesDescriptor::_InternalSerialize(
-    ::uint8_t* target,
-    ::google::protobuf::io::EpsCopyOutputStream* stream) const {
-  // @@protoc_insertion_point(serialize_to_array_start:io.deephaven.proto.backplane.script.grpc.FigureDescriptor.SeriesDescriptor)
-  ::uint32_t cached_has_bits = 0;
-  (void)cached_has_bits;
-
-  // .io.deephaven.proto.backplane.script.grpc.FigureDescriptor.SeriesPlotStyle plot_style = 1;
-  if (this->_internal_plot_style() != 0) {
-    target = stream->EnsureSpace(target);
-    target = ::_pbi::WireFormatLite::WriteEnumToArray(
-        1, this->_internal_plot_style(), target);
-  }
-
-  // string name = 2;
-  if (!this->_internal_name().empty()) {
-    const std::string& _s = this->_internal_name();
-    ::google::protobuf::internal::WireFormatLite::VerifyUtf8String(
-        _s.data(), static_cast<int>(_s.length()), ::google::protobuf::internal::WireFormatLite::SERIALIZE, "io.deephaven.proto.backplane.script.grpc.FigureDescriptor.SeriesDescriptor.name");
-    target = stream->WriteStringMaybeAliased(2, _s, target);
-  }
-
-  cached_has_bits = _impl_._has_bits_[0];
-  // optional bool lines_visible = 3;
-  if (cached_has_bits & 0x00000008u) {
-    target = stream->EnsureSpace(target);
-    target = ::_pbi::WireFormatLite::WriteBoolToArray(
-        3, this->_internal_lines_visible(), target);
-  }
-
-  // optional bool shapes_visible = 4;
-  if (cached_has_bits & 0x00000010u) {
-    target = stream->EnsureSpace(target);
-    target = ::_pbi::WireFormatLite::WriteBoolToArray(
-        4, this->_internal_shapes_visible(), target);
-  }
-
-  // bool gradient_visible = 5;
-  if (this->_internal_gradient_visible() != 0) {
-    target = stream->EnsureSpace(target);
-    target = ::_pbi::WireFormatLite::WriteBoolToArray(
-        5, this->_internal_gradient_visible(), target);
-  }
-
-  // string line_color = 6;
-  if (!this->_internal_line_color().empty()) {
-    const std::string& _s = this->_internal_line_color();
-    ::google::protobuf::internal::WireFormatLite::VerifyUtf8String(
-        _s.data(), static_cast<int>(_s.length()), ::google::protobuf::internal::WireFormatLite::SERIALIZE, "io.deephaven.proto.backplane.script.grpc.FigureDescriptor.SeriesDescriptor.line_color");
-    target = stream->WriteStringMaybeAliased(6, _s, target);
-  }
-
-  // optional string point_label_format = 8;
-  if (cached_has_bits & 0x00000001u) {
-    const std::string& _s = this->_internal_point_label_format();
-    ::google::protobuf::internal::WireFormatLite::VerifyUtf8String(
-        _s.data(), static_cast<int>(_s.length()), ::google::protobuf::internal::WireFormatLite::SERIALIZE, "io.deephaven.proto.backplane.script.grpc.FigureDescriptor.SeriesDescriptor.point_label_format");
-    target = stream->WriteStringMaybeAliased(8, _s, target);
-  }
-
-  // optional string x_tool_tip_pattern = 9;
-  if (cached_has_bits & 0x00000002u) {
-    const std::string& _s = this->_internal_x_tool_tip_pattern();
-    ::google::protobuf::internal::WireFormatLite::VerifyUtf8String(
-        _s.data(), static_cast<int>(_s.length()), ::google::protobuf::internal::WireFormatLite::SERIALIZE, "io.deephaven.proto.backplane.script.grpc.FigureDescriptor.SeriesDescriptor.x_tool_tip_pattern");
-    target = stream->WriteStringMaybeAliased(9, _s, target);
-  }
-
-  // optional string y_tool_tip_pattern = 10;
-  if (cached_has_bits & 0x00000004u) {
-    const std::string& _s = this->_internal_y_tool_tip_pattern();
-    ::google::protobuf::internal::WireFormatLite::VerifyUtf8String(
-        _s.data(), static_cast<int>(_s.length()), ::google::protobuf::internal::WireFormatLite::SERIALIZE, "io.deephaven.proto.backplane.script.grpc.FigureDescriptor.SeriesDescriptor.y_tool_tip_pattern");
-    target = stream->WriteStringMaybeAliased(10, _s, target);
-  }
-
-  // string shape_label = 11;
-  if (!this->_internal_shape_label().empty()) {
-    const std::string& _s = this->_internal_shape_label();
-    ::google::protobuf::internal::WireFormatLite::VerifyUtf8String(
-        _s.data(), static_cast<int>(_s.length()), ::google::protobuf::internal::WireFormatLite::SERIALIZE, "io.deephaven.proto.backplane.script.grpc.FigureDescriptor.SeriesDescriptor.shape_label");
-    target = stream->WriteStringMaybeAliased(11, _s, target);
-  }
-
-  // optional double shape_size = 12;
-  if (cached_has_bits & 0x00000020u) {
-    target = stream->EnsureSpace(target);
-    target = ::_pbi::WireFormatLite::WriteDoubleToArray(
-        12, this->_internal_shape_size(), target);
-  }
-
-  // string shape_color = 13;
-  if (!this->_internal_shape_color().empty()) {
-    const std::string& _s = this->_internal_shape_color();
-    ::google::protobuf::internal::WireFormatLite::VerifyUtf8String(
-        _s.data(), static_cast<int>(_s.length()), ::google::protobuf::internal::WireFormatLite::SERIALIZE, "io.deephaven.proto.backplane.script.grpc.FigureDescriptor.SeriesDescriptor.shape_color");
-    target = stream->WriteStringMaybeAliased(13, _s, target);
-  }
-
-  // string shape = 14;
-  if (!this->_internal_shape().empty()) {
-    const std::string& _s = this->_internal_shape();
-    ::google::protobuf::internal::WireFormatLite::VerifyUtf8String(
-        _s.data(), static_cast<int>(_s.length()), ::google::protobuf::internal::WireFormatLite::SERIALIZE, "io.deephaven.proto.backplane.script.grpc.FigureDescriptor.SeriesDescriptor.shape");
-    target = stream->WriteStringMaybeAliased(14, _s, target);
-  }
-
-  // repeated .io.deephaven.proto.backplane.script.grpc.FigureDescriptor.SourceDescriptor data_sources = 15;
-  for (unsigned i = 0,
-      n = static_cast<unsigned>(this->_internal_data_sources_size()); i < n; i++) {
-    const auto& repfield = this->_internal_data_sources().Get(i);
-    target = ::google::protobuf::internal::WireFormatLite::
-        InternalWriteMessage(15, repfield, repfield.GetCachedSize(), target, stream);
-  }
-
-  if (PROTOBUF_PREDICT_FALSE(_internal_metadata_.have_unknown_fields())) {
-    target =
-        ::_pbi::WireFormat::InternalSerializeUnknownFieldsToArray(
-            _internal_metadata_.unknown_fields<::google::protobuf::UnknownFieldSet>(::google::protobuf::UnknownFieldSet::default_instance), target, stream);
-  }
-  // @@protoc_insertion_point(serialize_to_array_end:io.deephaven.proto.backplane.script.grpc.FigureDescriptor.SeriesDescriptor)
-  return target;
-}
-
-::size_t FigureDescriptor_SeriesDescriptor::ByteSizeLong() const {
-// @@protoc_insertion_point(message_byte_size_start:io.deephaven.proto.backplane.script.grpc.FigureDescriptor.SeriesDescriptor)
-  ::size_t total_size = 0;
-
-  ::uint32_t cached_has_bits = 0;
-  // Prevent compiler warnings about cached_has_bits being unused
-  (void) cached_has_bits;
-
-  // repeated .io.deephaven.proto.backplane.script.grpc.FigureDescriptor.SourceDescriptor data_sources = 15;
-  total_size += 1UL * this->_internal_data_sources_size();
-  for (const auto& msg : this->_internal_data_sources()) {
-    total_size +=
-      ::google::protobuf::internal::WireFormatLite::MessageSize(msg);
-  }
-  // string name = 2;
-  if (!this->_internal_name().empty()) {
-    total_size += 1 + ::google::protobuf::internal::WireFormatLite::StringSize(
-                                    this->_internal_name());
-  }
-
-  // string line_color = 6;
-  if (!this->_internal_line_color().empty()) {
-    total_size += 1 + ::google::protobuf::internal::WireFormatLite::StringSize(
-                                    this->_internal_line_color());
-  }
-
-  cached_has_bits = _impl_._has_bits_[0];
-  if (cached_has_bits & 0x00000007u) {
-    // optional string point_label_format = 8;
-    if (cached_has_bits & 0x00000001u) {
-      total_size += 1 + ::google::protobuf::internal::WireFormatLite::StringSize(
-                                      this->_internal_point_label_format());
-    }
-
-    // optional string x_tool_tip_pattern = 9;
-    if (cached_has_bits & 0x00000002u) {
-      total_size += 1 + ::google::protobuf::internal::WireFormatLite::StringSize(
-                                      this->_internal_x_tool_tip_pattern());
-    }
-
-    // optional string y_tool_tip_pattern = 10;
-    if (cached_has_bits & 0x00000004u) {
-      total_size += 1 + ::google::protobuf::internal::WireFormatLite::StringSize(
-                                      this->_internal_y_tool_tip_pattern());
-    }
-
-  }
-  // string shape_label = 11;
-  if (!this->_internal_shape_label().empty()) {
-    total_size += 1 + ::google::protobuf::internal::WireFormatLite::StringSize(
-                                    this->_internal_shape_label());
-  }
-
-  // string shape_color = 13;
-  if (!this->_internal_shape_color().empty()) {
-    total_size += 1 + ::google::protobuf::internal::WireFormatLite::StringSize(
-                                    this->_internal_shape_color());
-  }
-
-  // string shape = 14;
-  if (!this->_internal_shape().empty()) {
-    total_size += 1 + ::google::protobuf::internal::WireFormatLite::StringSize(
-                                    this->_internal_shape());
-  }
-
-  // .io.deephaven.proto.backplane.script.grpc.FigureDescriptor.SeriesPlotStyle plot_style = 1;
-  if (this->_internal_plot_style() != 0) {
-    total_size += 1 +
-                  ::_pbi::WireFormatLite::EnumSize(this->_internal_plot_style());
-  }
-
-  if (cached_has_bits & 0x00000018u) {
-    // optional bool lines_visible = 3;
-    if (cached_has_bits & 0x00000008u) {
-      total_size += 2;
-    }
-
-    // optional bool shapes_visible = 4;
-    if (cached_has_bits & 0x00000010u) {
-      total_size += 2;
-    }
-
-  }
-  // bool gradient_visible = 5;
-  if (this->_internal_gradient_visible() != 0) {
-    total_size += 2;
-  }
-
-  // optional double shape_size = 12;
-  if (cached_has_bits & 0x00000020u) {
-    total_size += 9;
-  }
-
-  return MaybeComputeUnknownFieldsSize(total_size, &_impl_._cached_size_);
-}
-
-const ::google::protobuf::Message::ClassData FigureDescriptor_SeriesDescriptor::_class_data_ = {
-    FigureDescriptor_SeriesDescriptor::MergeImpl,
-    nullptr,  // OnDemandRegisterArenaDtor
-};
-const ::google::protobuf::Message::ClassData* FigureDescriptor_SeriesDescriptor::GetClassData() const {
-  return &_class_data_;
-}
-
-void FigureDescriptor_SeriesDescriptor::MergeImpl(::google::protobuf::Message& to_msg, const ::google::protobuf::Message& from_msg) {
-  auto* const _this = static_cast<FigureDescriptor_SeriesDescriptor*>(&to_msg);
-  auto& from = static_cast<const FigureDescriptor_SeriesDescriptor&>(from_msg);
-  // @@protoc_insertion_point(class_specific_merge_from_start:io.deephaven.proto.backplane.script.grpc.FigureDescriptor.SeriesDescriptor)
-  ABSL_DCHECK_NE(&from, _this);
-  ::uint32_t cached_has_bits = 0;
-  (void) cached_has_bits;
-
-  _this->_internal_mutable_data_sources()->MergeFrom(
-      from._internal_data_sources());
-  if (!from._internal_name().empty()) {
-    _this->_internal_set_name(from._internal_name());
-  }
-  if (!from._internal_line_color().empty()) {
-    _this->_internal_set_line_color(from._internal_line_color());
-  }
-  cached_has_bits = from._impl_._has_bits_[0];
-  if (cached_has_bits & 0x00000007u) {
-    if (cached_has_bits & 0x00000001u) {
-      _this->_internal_set_point_label_format(from._internal_point_label_format());
-    }
-    if (cached_has_bits & 0x00000002u) {
-      _this->_internal_set_x_tool_tip_pattern(from._internal_x_tool_tip_pattern());
-    }
-    if (cached_has_bits & 0x00000004u) {
-      _this->_internal_set_y_tool_tip_pattern(from._internal_y_tool_tip_pattern());
-    }
-  }
-  if (!from._internal_shape_label().empty()) {
-    _this->_internal_set_shape_label(from._internal_shape_label());
-  }
-  if (!from._internal_shape_color().empty()) {
-    _this->_internal_set_shape_color(from._internal_shape_color());
-  }
-  if (!from._internal_shape().empty()) {
-    _this->_internal_set_shape(from._internal_shape());
-  }
-  if (from._internal_plot_style() != 0) {
-    _this->_internal_set_plot_style(from._internal_plot_style());
-  }
-  if (cached_has_bits & 0x00000018u) {
-    if (cached_has_bits & 0x00000008u) {
-      _this->_impl_.lines_visible_ = from._impl_.lines_visible_;
-    }
-    if (cached_has_bits & 0x00000010u) {
-      _this->_impl_.shapes_visible_ = from._impl_.shapes_visible_;
-    }
-    _this->_impl_._has_bits_[0] |= cached_has_bits;
-  }
-  if (from._internal_gradient_visible() != 0) {
-    _this->_internal_set_gradient_visible(from._internal_gradient_visible());
-  }
-  if (cached_has_bits & 0x00000020u) {
-    _this->_internal_set_shape_size(from._internal_shape_size());
-  }
-  _this->_internal_metadata_.MergeFrom<::google::protobuf::UnknownFieldSet>(from._internal_metadata_);
-}
-
-void FigureDescriptor_SeriesDescriptor::CopyFrom(const FigureDescriptor_SeriesDescriptor& from) {
-// @@protoc_insertion_point(class_specific_copy_from_start:io.deephaven.proto.backplane.script.grpc.FigureDescriptor.SeriesDescriptor)
-  if (&from == this) return;
-  Clear();
-  MergeFrom(from);
-}
-
-PROTOBUF_NOINLINE bool FigureDescriptor_SeriesDescriptor::IsInitialized() const {
-  return true;
-}
-
-::_pbi::CachedSize* FigureDescriptor_SeriesDescriptor::AccessCachedSize() const {
-  return &_impl_._cached_size_;
-}
-void FigureDescriptor_SeriesDescriptor::InternalSwap(FigureDescriptor_SeriesDescriptor* PROTOBUF_RESTRICT other) {
-  using std::swap;
-  auto* arena = GetArena();
-  ABSL_DCHECK_EQ(arena, other->GetArena());
-  _internal_metadata_.InternalSwap(&other->_internal_metadata_);
-  swap(_impl_._has_bits_[0], other->_impl_._has_bits_[0]);
-  _impl_.data_sources_.InternalSwap(&other->_impl_.data_sources_);
-  ::_pbi::ArenaStringPtr::InternalSwap(&_impl_.name_, &other->_impl_.name_, arena);
-  ::_pbi::ArenaStringPtr::InternalSwap(&_impl_.line_color_, &other->_impl_.line_color_, arena);
-  ::_pbi::ArenaStringPtr::InternalSwap(&_impl_.point_label_format_, &other->_impl_.point_label_format_, arena);
-  ::_pbi::ArenaStringPtr::InternalSwap(&_impl_.x_tool_tip_pattern_, &other->_impl_.x_tool_tip_pattern_, arena);
-  ::_pbi::ArenaStringPtr::InternalSwap(&_impl_.y_tool_tip_pattern_, &other->_impl_.y_tool_tip_pattern_, arena);
-  ::_pbi::ArenaStringPtr::InternalSwap(&_impl_.shape_label_, &other->_impl_.shape_label_, arena);
-  ::_pbi::ArenaStringPtr::InternalSwap(&_impl_.shape_color_, &other->_impl_.shape_color_, arena);
-  ::_pbi::ArenaStringPtr::InternalSwap(&_impl_.shape_, &other->_impl_.shape_, arena);
-  ::google::protobuf::internal::memswap<
-      PROTOBUF_FIELD_OFFSET(FigureDescriptor_SeriesDescriptor, _impl_.shape_size_)
-      + sizeof(FigureDescriptor_SeriesDescriptor::_impl_.shape_size_)
-      - PROTOBUF_FIELD_OFFSET(FigureDescriptor_SeriesDescriptor, _impl_.plot_style_)>(
-          reinterpret_cast<char*>(&_impl_.plot_style_),
-          reinterpret_cast<char*>(&other->_impl_.plot_style_));
-}
-
-::google::protobuf::Metadata FigureDescriptor_SeriesDescriptor::GetMetadata() const {
-  return ::_pbi::AssignDescriptors(
-      &descriptor_table_deephaven_2fproto_2fconsole_2eproto_getter, &descriptor_table_deephaven_2fproto_2fconsole_2eproto_once,
-      file_level_metadata_deephaven_2fproto_2fconsole_2eproto[46]);
-}
-// ===================================================================
-
-class FigureDescriptor_MultiSeriesDescriptor::_Internal {
- public:
-  using HasBits = decltype(std::declval<FigureDescriptor_MultiSeriesDescriptor>()._impl_._has_bits_);
-  static constexpr ::int32_t kHasBitsOffset =
-    8 * PROTOBUF_FIELD_OFFSET(FigureDescriptor_MultiSeriesDescriptor, _impl_._has_bits_);
-  static const ::io::deephaven::proto::backplane::script::grpc::FigureDescriptor_StringMapWithDefault& line_color(const FigureDescriptor_MultiSeriesDescriptor* msg);
-  static void set_has_line_color(HasBits* has_bits) {
-    (*has_bits)[0] |= 1u;
-  }
-  static const ::io::deephaven::proto::backplane::script::grpc::FigureDescriptor_StringMapWithDefault& point_color(const FigureDescriptor_MultiSeriesDescriptor* msg);
-  static void set_has_point_color(HasBits* has_bits) {
-    (*has_bits)[0] |= 2u;
-  }
-  static const ::io::deephaven::proto::backplane::script::grpc::FigureDescriptor_BoolMapWithDefault& lines_visible(const FigureDescriptor_MultiSeriesDescriptor* msg);
-  static void set_has_lines_visible(HasBits* has_bits) {
-    (*has_bits)[0] |= 4u;
-  }
-  static const ::io::deephaven::proto::backplane::script::grpc::FigureDescriptor_BoolMapWithDefault& points_visible(const FigureDescriptor_MultiSeriesDescriptor* msg);
-  static void set_has_points_visible(HasBits* has_bits) {
-    (*has_bits)[0] |= 8u;
-  }
-  static const ::io::deephaven::proto::backplane::script::grpc::FigureDescriptor_BoolMapWithDefault& gradient_visible(const FigureDescriptor_MultiSeriesDescriptor* msg);
-  static void set_has_gradient_visible(HasBits* has_bits) {
-    (*has_bits)[0] |= 16u;
-  }
-  static const ::io::deephaven::proto::backplane::script::grpc::FigureDescriptor_StringMapWithDefault& point_label_format(const FigureDescriptor_MultiSeriesDescriptor* msg);
-  static void set_has_point_label_format(HasBits* has_bits) {
-    (*has_bits)[0] |= 32u;
-  }
-  static const ::io::deephaven::proto::backplane::script::grpc::FigureDescriptor_StringMapWithDefault& x_tool_tip_pattern(const FigureDescriptor_MultiSeriesDescriptor* msg);
-  static void set_has_x_tool_tip_pattern(HasBits* has_bits) {
-    (*has_bits)[0] |= 64u;
-  }
-  static const ::io::deephaven::proto::backplane::script::grpc::FigureDescriptor_StringMapWithDefault& y_tool_tip_pattern(const FigureDescriptor_MultiSeriesDescriptor* msg);
-  static void set_has_y_tool_tip_pattern(HasBits* has_bits) {
-    (*has_bits)[0] |= 128u;
-  }
-  static const ::io::deephaven::proto::backplane::script::grpc::FigureDescriptor_StringMapWithDefault& point_label(const FigureDescriptor_MultiSeriesDescriptor* msg);
-  static void set_has_point_label(HasBits* has_bits) {
-    (*has_bits)[0] |= 256u;
-  }
-  static const ::io::deephaven::proto::backplane::script::grpc::FigureDescriptor_DoubleMapWithDefault& point_size(const FigureDescriptor_MultiSeriesDescriptor* msg);
-  static void set_has_point_size(HasBits* has_bits) {
-    (*has_bits)[0] |= 512u;
-  }
-  static const ::io::deephaven::proto::backplane::script::grpc::FigureDescriptor_StringMapWithDefault& point_shape(const FigureDescriptor_MultiSeriesDescriptor* msg);
-  static void set_has_point_shape(HasBits* has_bits) {
-    (*has_bits)[0] |= 1024u;
-  }
-};
-
-const ::io::deephaven::proto::backplane::script::grpc::FigureDescriptor_StringMapWithDefault& FigureDescriptor_MultiSeriesDescriptor::_Internal::line_color(const FigureDescriptor_MultiSeriesDescriptor* msg) {
-  return *msg->_impl_.line_color_;
-}
-const ::io::deephaven::proto::backplane::script::grpc::FigureDescriptor_StringMapWithDefault& FigureDescriptor_MultiSeriesDescriptor::_Internal::point_color(const FigureDescriptor_MultiSeriesDescriptor* msg) {
-  return *msg->_impl_.point_color_;
-}
-const ::io::deephaven::proto::backplane::script::grpc::FigureDescriptor_BoolMapWithDefault& FigureDescriptor_MultiSeriesDescriptor::_Internal::lines_visible(const FigureDescriptor_MultiSeriesDescriptor* msg) {
-  return *msg->_impl_.lines_visible_;
-}
-const ::io::deephaven::proto::backplane::script::grpc::FigureDescriptor_BoolMapWithDefault& FigureDescriptor_MultiSeriesDescriptor::_Internal::points_visible(const FigureDescriptor_MultiSeriesDescriptor* msg) {
-  return *msg->_impl_.points_visible_;
-}
-const ::io::deephaven::proto::backplane::script::grpc::FigureDescriptor_BoolMapWithDefault& FigureDescriptor_MultiSeriesDescriptor::_Internal::gradient_visible(const FigureDescriptor_MultiSeriesDescriptor* msg) {
-  return *msg->_impl_.gradient_visible_;
-}
-const ::io::deephaven::proto::backplane::script::grpc::FigureDescriptor_StringMapWithDefault& FigureDescriptor_MultiSeriesDescriptor::_Internal::point_label_format(const FigureDescriptor_MultiSeriesDescriptor* msg) {
-  return *msg->_impl_.point_label_format_;
-}
-const ::io::deephaven::proto::backplane::script::grpc::FigureDescriptor_StringMapWithDefault& FigureDescriptor_MultiSeriesDescriptor::_Internal::x_tool_tip_pattern(const FigureDescriptor_MultiSeriesDescriptor* msg) {
-  return *msg->_impl_.x_tool_tip_pattern_;
-}
-const ::io::deephaven::proto::backplane::script::grpc::FigureDescriptor_StringMapWithDefault& FigureDescriptor_MultiSeriesDescriptor::_Internal::y_tool_tip_pattern(const FigureDescriptor_MultiSeriesDescriptor* msg) {
-  return *msg->_impl_.y_tool_tip_pattern_;
-}
-const ::io::deephaven::proto::backplane::script::grpc::FigureDescriptor_StringMapWithDefault& FigureDescriptor_MultiSeriesDescriptor::_Internal::point_label(const FigureDescriptor_MultiSeriesDescriptor* msg) {
-  return *msg->_impl_.point_label_;
-}
-const ::io::deephaven::proto::backplane::script::grpc::FigureDescriptor_DoubleMapWithDefault& FigureDescriptor_MultiSeriesDescriptor::_Internal::point_size(const FigureDescriptor_MultiSeriesDescriptor* msg) {
-  return *msg->_impl_.point_size_;
-}
-const ::io::deephaven::proto::backplane::script::grpc::FigureDescriptor_StringMapWithDefault& FigureDescriptor_MultiSeriesDescriptor::_Internal::point_shape(const FigureDescriptor_MultiSeriesDescriptor* msg) {
-  return *msg->_impl_.point_shape_;
-}
-FigureDescriptor_MultiSeriesDescriptor::FigureDescriptor_MultiSeriesDescriptor(::google::protobuf::Arena* arena)
-    : ::google::protobuf::Message(arena) {
-  SharedCtor(arena);
-  // @@protoc_insertion_point(arena_constructor:io.deephaven.proto.backplane.script.grpc.FigureDescriptor.MultiSeriesDescriptor)
-}
-inline PROTOBUF_NDEBUG_INLINE FigureDescriptor_MultiSeriesDescriptor::Impl_::Impl_(
-    ::google::protobuf::internal::InternalVisibility visibility, ::google::protobuf::Arena* arena,
-    const Impl_& from)
-      : _has_bits_{from._has_bits_},
-        _cached_size_{0},
-        data_sources_{visibility, arena, from.data_sources_},
-        name_(arena, from.name_) {}
-
-FigureDescriptor_MultiSeriesDescriptor::FigureDescriptor_MultiSeriesDescriptor(
-    ::google::protobuf::Arena* arena,
-    const FigureDescriptor_MultiSeriesDescriptor& from)
-    : ::google::protobuf::Message(arena) {
-  FigureDescriptor_MultiSeriesDescriptor* const _this = this;
-  (void)_this;
-  _internal_metadata_.MergeFrom<::google::protobuf::UnknownFieldSet>(
-      from._internal_metadata_);
-  new (&_impl_) Impl_(internal_visibility(), arena, from._impl_);
-  ::uint32_t cached_has_bits = _impl_._has_bits_[0];
-  _impl_.line_color_ = (cached_has_bits & 0x00000001u)
-                ? CreateMaybeMessage<::io::deephaven::proto::backplane::script::grpc::FigureDescriptor_StringMapWithDefault>(arena, *from._impl_.line_color_)
-                : nullptr;
-  _impl_.point_color_ = (cached_has_bits & 0x00000002u)
-                ? CreateMaybeMessage<::io::deephaven::proto::backplane::script::grpc::FigureDescriptor_StringMapWithDefault>(arena, *from._impl_.point_color_)
-                : nullptr;
-  _impl_.lines_visible_ = (cached_has_bits & 0x00000004u)
-                ? CreateMaybeMessage<::io::deephaven::proto::backplane::script::grpc::FigureDescriptor_BoolMapWithDefault>(arena, *from._impl_.lines_visible_)
-                : nullptr;
-  _impl_.points_visible_ = (cached_has_bits & 0x00000008u)
-                ? CreateMaybeMessage<::io::deephaven::proto::backplane::script::grpc::FigureDescriptor_BoolMapWithDefault>(arena, *from._impl_.points_visible_)
-                : nullptr;
-  _impl_.gradient_visible_ = (cached_has_bits & 0x00000010u)
-                ? CreateMaybeMessage<::io::deephaven::proto::backplane::script::grpc::FigureDescriptor_BoolMapWithDefault>(arena, *from._impl_.gradient_visible_)
-                : nullptr;
-  _impl_.point_label_format_ = (cached_has_bits & 0x00000020u)
-                ? CreateMaybeMessage<::io::deephaven::proto::backplane::script::grpc::FigureDescriptor_StringMapWithDefault>(arena, *from._impl_.point_label_format_)
-                : nullptr;
-  _impl_.x_tool_tip_pattern_ = (cached_has_bits & 0x00000040u)
-                ? CreateMaybeMessage<::io::deephaven::proto::backplane::script::grpc::FigureDescriptor_StringMapWithDefault>(arena, *from._impl_.x_tool_tip_pattern_)
-                : nullptr;
-  _impl_.y_tool_tip_pattern_ = (cached_has_bits & 0x00000080u)
-                ? CreateMaybeMessage<::io::deephaven::proto::backplane::script::grpc::FigureDescriptor_StringMapWithDefault>(arena, *from._impl_.y_tool_tip_pattern_)
-                : nullptr;
-  _impl_.point_label_ = (cached_has_bits & 0x00000100u)
-                ? CreateMaybeMessage<::io::deephaven::proto::backplane::script::grpc::FigureDescriptor_StringMapWithDefault>(arena, *from._impl_.point_label_)
-                : nullptr;
-  _impl_.point_size_ = (cached_has_bits & 0x00000200u)
-                ? CreateMaybeMessage<::io::deephaven::proto::backplane::script::grpc::FigureDescriptor_DoubleMapWithDefault>(arena, *from._impl_.point_size_)
-                : nullptr;
-  _impl_.point_shape_ = (cached_has_bits & 0x00000400u)
-                ? CreateMaybeMessage<::io::deephaven::proto::backplane::script::grpc::FigureDescriptor_StringMapWithDefault>(arena, *from._impl_.point_shape_)
-                : nullptr;
-  _impl_.plot_style_ = from._impl_.plot_style_;
-
-  // @@protoc_insertion_point(copy_constructor:io.deephaven.proto.backplane.script.grpc.FigureDescriptor.MultiSeriesDescriptor)
-}
-inline PROTOBUF_NDEBUG_INLINE FigureDescriptor_MultiSeriesDescriptor::Impl_::Impl_(
-    ::google::protobuf::internal::InternalVisibility visibility,
-    ::google::protobuf::Arena* arena)
-      : _cached_size_{0},
-        data_sources_{visibility, arena},
-        name_(arena) {}
-
-inline void FigureDescriptor_MultiSeriesDescriptor::SharedCtor(::_pb::Arena* arena) {
-  new (&_impl_) Impl_(internal_visibility(), arena);
-  ::memset(reinterpret_cast<char *>(&_impl_) +
-               offsetof(Impl_, line_color_),
-           0,
-           offsetof(Impl_, plot_style_) -
-               offsetof(Impl_, line_color_) +
-               sizeof(Impl_::plot_style_));
-}
-FigureDescriptor_MultiSeriesDescriptor::~FigureDescriptor_MultiSeriesDescriptor() {
-  // @@protoc_insertion_point(destructor:io.deephaven.proto.backplane.script.grpc.FigureDescriptor.MultiSeriesDescriptor)
-  _internal_metadata_.Delete<::google::protobuf::UnknownFieldSet>();
-  SharedDtor();
-}
-inline void FigureDescriptor_MultiSeriesDescriptor::SharedDtor() {
-  ABSL_DCHECK(GetArena() == nullptr);
-  _impl_.name_.Destroy();
-  delete _impl_.line_color_;
-  delete _impl_.point_color_;
-  delete _impl_.lines_visible_;
-  delete _impl_.points_visible_;
-  delete _impl_.gradient_visible_;
-  delete _impl_.point_label_format_;
-  delete _impl_.x_tool_tip_pattern_;
-  delete _impl_.y_tool_tip_pattern_;
-  delete _impl_.point_label_;
-  delete _impl_.point_size_;
-  delete _impl_.point_shape_;
-  _impl_.~Impl_();
-}
-
-PROTOBUF_NOINLINE void FigureDescriptor_MultiSeriesDescriptor::Clear() {
-// @@protoc_insertion_point(message_clear_start:io.deephaven.proto.backplane.script.grpc.FigureDescriptor.MultiSeriesDescriptor)
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  ::uint32_t cached_has_bits = 0;
-  // Prevent compiler warnings about cached_has_bits being unused
-  (void) cached_has_bits;
-
-  _impl_.data_sources_.Clear();
-  _impl_.name_.ClearToEmpty();
-  cached_has_bits = _impl_._has_bits_[0];
-  if (cached_has_bits & 0x000000ffu) {
-    if (cached_has_bits & 0x00000001u) {
-      ABSL_DCHECK(_impl_.line_color_ != nullptr);
-      _impl_.line_color_->Clear();
-    }
-    if (cached_has_bits & 0x00000002u) {
-      ABSL_DCHECK(_impl_.point_color_ != nullptr);
-      _impl_.point_color_->Clear();
-    }
-    if (cached_has_bits & 0x00000004u) {
-      ABSL_DCHECK(_impl_.lines_visible_ != nullptr);
-      _impl_.lines_visible_->Clear();
-    }
-    if (cached_has_bits & 0x00000008u) {
-      ABSL_DCHECK(_impl_.points_visible_ != nullptr);
-      _impl_.points_visible_->Clear();
-    }
-    if (cached_has_bits & 0x00000010u) {
-      ABSL_DCHECK(_impl_.gradient_visible_ != nullptr);
-      _impl_.gradient_visible_->Clear();
-    }
-    if (cached_has_bits & 0x00000020u) {
-      ABSL_DCHECK(_impl_.point_label_format_ != nullptr);
-      _impl_.point_label_format_->Clear();
-    }
-    if (cached_has_bits & 0x00000040u) {
-      ABSL_DCHECK(_impl_.x_tool_tip_pattern_ != nullptr);
-      _impl_.x_tool_tip_pattern_->Clear();
-    }
-    if (cached_has_bits & 0x00000080u) {
-      ABSL_DCHECK(_impl_.y_tool_tip_pattern_ != nullptr);
-      _impl_.y_tool_tip_pattern_->Clear();
-    }
-  }
-  if (cached_has_bits & 0x00000700u) {
-    if (cached_has_bits & 0x00000100u) {
-      ABSL_DCHECK(_impl_.point_label_ != nullptr);
-      _impl_.point_label_->Clear();
-    }
-    if (cached_has_bits & 0x00000200u) {
-      ABSL_DCHECK(_impl_.point_size_ != nullptr);
-      _impl_.point_size_->Clear();
-    }
-    if (cached_has_bits & 0x00000400u) {
-      ABSL_DCHECK(_impl_.point_shape_ != nullptr);
-      _impl_.point_shape_->Clear();
-    }
-  }
-  _impl_.plot_style_ = 0;
-  _impl_._has_bits_.Clear();
-  _internal_metadata_.Clear<::google::protobuf::UnknownFieldSet>();
-}
-
-const char* FigureDescriptor_MultiSeriesDescriptor::_InternalParse(
-    const char* ptr, ::_pbi::ParseContext* ctx) {
-  ptr = ::_pbi::TcParser::ParseLoop(this, ptr, ctx, &_table_.header);
-  return ptr;
-}
-
-
-PROTOBUF_CONSTINIT PROTOBUF_ATTRIBUTE_INIT_PRIORITY1
-const ::_pbi::TcParseTable<4, 14, 12, 100, 2> FigureDescriptor_MultiSeriesDescriptor::_table_ = {
-  {
-    PROTOBUF_FIELD_OFFSET(FigureDescriptor_MultiSeriesDescriptor, _impl_._has_bits_),
-    0, // no _extensions_
-    14, 120,  // max_field_number, fast_idx_mask
-    offsetof(decltype(_table_), field_lookup_table),
-    4294950912,  // skipmap
-    offsetof(decltype(_table_), field_entries),
-    14,  // num_field_entries
-    12,  // num_aux_entries
-    offsetof(decltype(_table_), aux_entries),
-    &_FigureDescriptor_MultiSeriesDescriptor_default_instance_._instance,
-    ::_pbi::TcParser::GenericFallback,  // fallback
-  }, {{
-    {::_pbi::TcParser::MiniParse, {}},
-    // .io.deephaven.proto.backplane.script.grpc.FigureDescriptor.SeriesPlotStyle plot_style = 1;
-    {::_pbi::TcParser::SingularVarintNoZag1<::uint32_t, offsetof(FigureDescriptor_MultiSeriesDescriptor, _impl_.plot_style_), 63>(),
-     {8, 63, 0, PROTOBUF_FIELD_OFFSET(FigureDescriptor_MultiSeriesDescriptor, _impl_.plot_style_)}},
-    // string name = 2;
-    {::_pbi::TcParser::FastUS1,
-     {18, 63, 0, PROTOBUF_FIELD_OFFSET(FigureDescriptor_MultiSeriesDescriptor, _impl_.name_)}},
-    // .io.deephaven.proto.backplane.script.grpc.FigureDescriptor.StringMapWithDefault line_color = 3;
-    {::_pbi::TcParser::FastMtS1,
-     {26, 0, 0, PROTOBUF_FIELD_OFFSET(FigureDescriptor_MultiSeriesDescriptor, _impl_.line_color_)}},
-    // .io.deephaven.proto.backplane.script.grpc.FigureDescriptor.StringMapWithDefault point_color = 4;
-    {::_pbi::TcParser::FastMtS1,
-     {34, 1, 1, PROTOBUF_FIELD_OFFSET(FigureDescriptor_MultiSeriesDescriptor, _impl_.point_color_)}},
-    // .io.deephaven.proto.backplane.script.grpc.FigureDescriptor.BoolMapWithDefault lines_visible = 5;
-    {::_pbi::TcParser::FastMtS1,
-     {42, 2, 2, PROTOBUF_FIELD_OFFSET(FigureDescriptor_MultiSeriesDescriptor, _impl_.lines_visible_)}},
-    // .io.deephaven.proto.backplane.script.grpc.FigureDescriptor.BoolMapWithDefault points_visible = 6;
-    {::_pbi::TcParser::FastMtS1,
-     {50, 3, 3, PROTOBUF_FIELD_OFFSET(FigureDescriptor_MultiSeriesDescriptor, _impl_.points_visible_)}},
-    // .io.deephaven.proto.backplane.script.grpc.FigureDescriptor.BoolMapWithDefault gradient_visible = 7;
-    {::_pbi::TcParser::FastMtS1,
-     {58, 4, 4, PROTOBUF_FIELD_OFFSET(FigureDescriptor_MultiSeriesDescriptor, _impl_.gradient_visible_)}},
-    // .io.deephaven.proto.backplane.script.grpc.FigureDescriptor.StringMapWithDefault point_label_format = 8;
-    {::_pbi::TcParser::FastMtS1,
-     {66, 5, 5, PROTOBUF_FIELD_OFFSET(FigureDescriptor_MultiSeriesDescriptor, _impl_.point_label_format_)}},
-    // .io.deephaven.proto.backplane.script.grpc.FigureDescriptor.StringMapWithDefault x_tool_tip_pattern = 9;
-    {::_pbi::TcParser::FastMtS1,
-     {74, 6, 6, PROTOBUF_FIELD_OFFSET(FigureDescriptor_MultiSeriesDescriptor, _impl_.x_tool_tip_pattern_)}},
-    // .io.deephaven.proto.backplane.script.grpc.FigureDescriptor.StringMapWithDefault y_tool_tip_pattern = 10;
-    {::_pbi::TcParser::FastMtS1,
-     {82, 7, 7, PROTOBUF_FIELD_OFFSET(FigureDescriptor_MultiSeriesDescriptor, _impl_.y_tool_tip_pattern_)}},
-    // .io.deephaven.proto.backplane.script.grpc.FigureDescriptor.StringMapWithDefault point_label = 11;
-    {::_pbi::TcParser::FastMtS1,
-     {90, 8, 8, PROTOBUF_FIELD_OFFSET(FigureDescriptor_MultiSeriesDescriptor, _impl_.point_label_)}},
-    // .io.deephaven.proto.backplane.script.grpc.FigureDescriptor.DoubleMapWithDefault point_size = 12;
-    {::_pbi::TcParser::FastMtS1,
-     {98, 9, 9, PROTOBUF_FIELD_OFFSET(FigureDescriptor_MultiSeriesDescriptor, _impl_.point_size_)}},
-    // .io.deephaven.proto.backplane.script.grpc.FigureDescriptor.StringMapWithDefault point_shape = 13;
-    {::_pbi::TcParser::FastMtS1,
-     {106, 10, 10, PROTOBUF_FIELD_OFFSET(FigureDescriptor_MultiSeriesDescriptor, _impl_.point_shape_)}},
-    // repeated .io.deephaven.proto.backplane.script.grpc.FigureDescriptor.MultiSeriesSourceDescriptor data_sources = 14;
-    {::_pbi::TcParser::FastMtR1,
-     {114, 63, 11, PROTOBUF_FIELD_OFFSET(FigureDescriptor_MultiSeriesDescriptor, _impl_.data_sources_)}},
-    {::_pbi::TcParser::MiniParse, {}},
-  }}, {{
-    65535, 65535
-  }}, {{
-    // .io.deephaven.proto.backplane.script.grpc.FigureDescriptor.SeriesPlotStyle plot_style = 1;
-    {PROTOBUF_FIELD_OFFSET(FigureDescriptor_MultiSeriesDescriptor, _impl_.plot_style_), -1, 0,
-    (0 | ::_fl::kFcSingular | ::_fl::kOpenEnum)},
-    // string name = 2;
-    {PROTOBUF_FIELD_OFFSET(FigureDescriptor_MultiSeriesDescriptor, _impl_.name_), -1, 0,
-    (0 | ::_fl::kFcSingular | ::_fl::kUtf8String | ::_fl::kRepAString)},
-    // .io.deephaven.proto.backplane.script.grpc.FigureDescriptor.StringMapWithDefault line_color = 3;
-    {PROTOBUF_FIELD_OFFSET(FigureDescriptor_MultiSeriesDescriptor, _impl_.line_color_), _Internal::kHasBitsOffset + 0, 0,
-    (0 | ::_fl::kFcOptional | ::_fl::kMessage | ::_fl::kTvTable)},
-    // .io.deephaven.proto.backplane.script.grpc.FigureDescriptor.StringMapWithDefault point_color = 4;
-    {PROTOBUF_FIELD_OFFSET(FigureDescriptor_MultiSeriesDescriptor, _impl_.point_color_), _Internal::kHasBitsOffset + 1, 1,
-    (0 | ::_fl::kFcOptional | ::_fl::kMessage | ::_fl::kTvTable)},
-    // .io.deephaven.proto.backplane.script.grpc.FigureDescriptor.BoolMapWithDefault lines_visible = 5;
-    {PROTOBUF_FIELD_OFFSET(FigureDescriptor_MultiSeriesDescriptor, _impl_.lines_visible_), _Internal::kHasBitsOffset + 2, 2,
-    (0 | ::_fl::kFcOptional | ::_fl::kMessage | ::_fl::kTvTable)},
-    // .io.deephaven.proto.backplane.script.grpc.FigureDescriptor.BoolMapWithDefault points_visible = 6;
-    {PROTOBUF_FIELD_OFFSET(FigureDescriptor_MultiSeriesDescriptor, _impl_.points_visible_), _Internal::kHasBitsOffset + 3, 3,
-    (0 | ::_fl::kFcOptional | ::_fl::kMessage | ::_fl::kTvTable)},
-    // .io.deephaven.proto.backplane.script.grpc.FigureDescriptor.BoolMapWithDefault gradient_visible = 7;
-    {PROTOBUF_FIELD_OFFSET(FigureDescriptor_MultiSeriesDescriptor, _impl_.gradient_visible_), _Internal::kHasBitsOffset + 4, 4,
-    (0 | ::_fl::kFcOptional | ::_fl::kMessage | ::_fl::kTvTable)},
-    // .io.deephaven.proto.backplane.script.grpc.FigureDescriptor.StringMapWithDefault point_label_format = 8;
-    {PROTOBUF_FIELD_OFFSET(FigureDescriptor_MultiSeriesDescriptor, _impl_.point_label_format_), _Internal::kHasBitsOffset + 5, 5,
-    (0 | ::_fl::kFcOptional | ::_fl::kMessage | ::_fl::kTvTable)},
-    // .io.deephaven.proto.backplane.script.grpc.FigureDescriptor.StringMapWithDefault x_tool_tip_pattern = 9;
-    {PROTOBUF_FIELD_OFFSET(FigureDescriptor_MultiSeriesDescriptor, _impl_.x_tool_tip_pattern_), _Internal::kHasBitsOffset + 6, 6,
-    (0 | ::_fl::kFcOptional | ::_fl::kMessage | ::_fl::kTvTable)},
-    // .io.deephaven.proto.backplane.script.grpc.FigureDescriptor.StringMapWithDefault y_tool_tip_pattern = 10;
-    {PROTOBUF_FIELD_OFFSET(FigureDescriptor_MultiSeriesDescriptor, _impl_.y_tool_tip_pattern_), _Internal::kHasBitsOffset + 7, 7,
-    (0 | ::_fl::kFcOptional | ::_fl::kMessage | ::_fl::kTvTable)},
-    // .io.deephaven.proto.backplane.script.grpc.FigureDescriptor.StringMapWithDefault point_label = 11;
-    {PROTOBUF_FIELD_OFFSET(FigureDescriptor_MultiSeriesDescriptor, _impl_.point_label_), _Internal::kHasBitsOffset + 8, 8,
-    (0 | ::_fl::kFcOptional | ::_fl::kMessage | ::_fl::kTvTable)},
-    // .io.deephaven.proto.backplane.script.grpc.FigureDescriptor.DoubleMapWithDefault point_size = 12;
-    {PROTOBUF_FIELD_OFFSET(FigureDescriptor_MultiSeriesDescriptor, _impl_.point_size_), _Internal::kHasBitsOffset + 9, 9,
-    (0 | ::_fl::kFcOptional | ::_fl::kMessage | ::_fl::kTvTable)},
-    // .io.deephaven.proto.backplane.script.grpc.FigureDescriptor.StringMapWithDefault point_shape = 13;
-    {PROTOBUF_FIELD_OFFSET(FigureDescriptor_MultiSeriesDescriptor, _impl_.point_shape_), _Internal::kHasBitsOffset + 10, 10,
-    (0 | ::_fl::kFcOptional | ::_fl::kMessage | ::_fl::kTvTable)},
-    // repeated .io.deephaven.proto.backplane.script.grpc.FigureDescriptor.MultiSeriesSourceDescriptor data_sources = 14;
-    {PROTOBUF_FIELD_OFFSET(FigureDescriptor_MultiSeriesDescriptor, _impl_.data_sources_), -1, 11,
-    (0 | ::_fl::kFcRepeated | ::_fl::kMessage | ::_fl::kTvTable)},
-  }}, {{
-    {::_pbi::TcParser::GetTable<::io::deephaven::proto::backplane::script::grpc::FigureDescriptor_StringMapWithDefault>()},
-    {::_pbi::TcParser::GetTable<::io::deephaven::proto::backplane::script::grpc::FigureDescriptor_StringMapWithDefault>()},
-    {::_pbi::TcParser::GetTable<::io::deephaven::proto::backplane::script::grpc::FigureDescriptor_BoolMapWithDefault>()},
-    {::_pbi::TcParser::GetTable<::io::deephaven::proto::backplane::script::grpc::FigureDescriptor_BoolMapWithDefault>()},
-    {::_pbi::TcParser::GetTable<::io::deephaven::proto::backplane::script::grpc::FigureDescriptor_BoolMapWithDefault>()},
-    {::_pbi::TcParser::GetTable<::io::deephaven::proto::backplane::script::grpc::FigureDescriptor_StringMapWithDefault>()},
-    {::_pbi::TcParser::GetTable<::io::deephaven::proto::backplane::script::grpc::FigureDescriptor_StringMapWithDefault>()},
-    {::_pbi::TcParser::GetTable<::io::deephaven::proto::backplane::script::grpc::FigureDescriptor_StringMapWithDefault>()},
-    {::_pbi::TcParser::GetTable<::io::deephaven::proto::backplane::script::grpc::FigureDescriptor_StringMapWithDefault>()},
-    {::_pbi::TcParser::GetTable<::io::deephaven::proto::backplane::script::grpc::FigureDescriptor_DoubleMapWithDefault>()},
-    {::_pbi::TcParser::GetTable<::io::deephaven::proto::backplane::script::grpc::FigureDescriptor_StringMapWithDefault>()},
-    {::_pbi::TcParser::GetTable<::io::deephaven::proto::backplane::script::grpc::FigureDescriptor_MultiSeriesSourceDescriptor>()},
-  }}, {{
-    "\117\0\4\0\0\0\0\0\0\0\0\0\0\0\0\0"
-    "io.deephaven.proto.backplane.script.grpc.FigureDescriptor.MultiSeriesDescriptor"
-    "name"
-  }},
-};
-
-::uint8_t* FigureDescriptor_MultiSeriesDescriptor::_InternalSerialize(
-    ::uint8_t* target,
-    ::google::protobuf::io::EpsCopyOutputStream* stream) const {
-  // @@protoc_insertion_point(serialize_to_array_start:io.deephaven.proto.backplane.script.grpc.FigureDescriptor.MultiSeriesDescriptor)
-  ::uint32_t cached_has_bits = 0;
-  (void)cached_has_bits;
-
-  // .io.deephaven.proto.backplane.script.grpc.FigureDescriptor.SeriesPlotStyle plot_style = 1;
-  if (this->_internal_plot_style() != 0) {
-    target = stream->EnsureSpace(target);
-    target = ::_pbi::WireFormatLite::WriteEnumToArray(
-        1, this->_internal_plot_style(), target);
-  }
-
-  // string name = 2;
-  if (!this->_internal_name().empty()) {
-    const std::string& _s = this->_internal_name();
-    ::google::protobuf::internal::WireFormatLite::VerifyUtf8String(
-        _s.data(), static_cast<int>(_s.length()), ::google::protobuf::internal::WireFormatLite::SERIALIZE, "io.deephaven.proto.backplane.script.grpc.FigureDescriptor.MultiSeriesDescriptor.name");
-    target = stream->WriteStringMaybeAliased(2, _s, target);
-  }
-
-  cached_has_bits = _impl_._has_bits_[0];
-  // .io.deephaven.proto.backplane.script.grpc.FigureDescriptor.StringMapWithDefault line_color = 3;
-  if (cached_has_bits & 0x00000001u) {
-    target = ::google::protobuf::internal::WireFormatLite::InternalWriteMessage(
-        3, _Internal::line_color(this),
-        _Internal::line_color(this).GetCachedSize(), target, stream);
-  }
-
-  // .io.deephaven.proto.backplane.script.grpc.FigureDescriptor.StringMapWithDefault point_color = 4;
-  if (cached_has_bits & 0x00000002u) {
-    target = ::google::protobuf::internal::WireFormatLite::InternalWriteMessage(
-        4, _Internal::point_color(this),
-        _Internal::point_color(this).GetCachedSize(), target, stream);
-  }
-
-  // .io.deephaven.proto.backplane.script.grpc.FigureDescriptor.BoolMapWithDefault lines_visible = 5;
-  if (cached_has_bits & 0x00000004u) {
-    target = ::google::protobuf::internal::WireFormatLite::InternalWriteMessage(
-        5, _Internal::lines_visible(this),
-        _Internal::lines_visible(this).GetCachedSize(), target, stream);
-  }
-
-  // .io.deephaven.proto.backplane.script.grpc.FigureDescriptor.BoolMapWithDefault points_visible = 6;
-  if (cached_has_bits & 0x00000008u) {
-    target = ::google::protobuf::internal::WireFormatLite::InternalWriteMessage(
-        6, _Internal::points_visible(this),
-        _Internal::points_visible(this).GetCachedSize(), target, stream);
-  }
-
-  // .io.deephaven.proto.backplane.script.grpc.FigureDescriptor.BoolMapWithDefault gradient_visible = 7;
-  if (cached_has_bits & 0x00000010u) {
-    target = ::google::protobuf::internal::WireFormatLite::InternalWriteMessage(
-        7, _Internal::gradient_visible(this),
-        _Internal::gradient_visible(this).GetCachedSize(), target, stream);
-  }
-
-  // .io.deephaven.proto.backplane.script.grpc.FigureDescriptor.StringMapWithDefault point_label_format = 8;
-  if (cached_has_bits & 0x00000020u) {
-    target = ::google::protobuf::internal::WireFormatLite::InternalWriteMessage(
-        8, _Internal::point_label_format(this),
-        _Internal::point_label_format(this).GetCachedSize(), target, stream);
-  }
-
-  // .io.deephaven.proto.backplane.script.grpc.FigureDescriptor.StringMapWithDefault x_tool_tip_pattern = 9;
-  if (cached_has_bits & 0x00000040u) {
-    target = ::google::protobuf::internal::WireFormatLite::InternalWriteMessage(
-        9, _Internal::x_tool_tip_pattern(this),
-        _Internal::x_tool_tip_pattern(this).GetCachedSize(), target, stream);
-  }
-
-  // .io.deephaven.proto.backplane.script.grpc.FigureDescriptor.StringMapWithDefault y_tool_tip_pattern = 10;
-  if (cached_has_bits & 0x00000080u) {
-    target = ::google::protobuf::internal::WireFormatLite::InternalWriteMessage(
-        10, _Internal::y_tool_tip_pattern(this),
-        _Internal::y_tool_tip_pattern(this).GetCachedSize(), target, stream);
-  }
-
-  // .io.deephaven.proto.backplane.script.grpc.FigureDescriptor.StringMapWithDefault point_label = 11;
-  if (cached_has_bits & 0x00000100u) {
-    target = ::google::protobuf::internal::WireFormatLite::InternalWriteMessage(
-        11, _Internal::point_label(this),
-        _Internal::point_label(this).GetCachedSize(), target, stream);
-  }
-
-  // .io.deephaven.proto.backplane.script.grpc.FigureDescriptor.DoubleMapWithDefault point_size = 12;
-  if (cached_has_bits & 0x00000200u) {
-    target = ::google::protobuf::internal::WireFormatLite::InternalWriteMessage(
-        12, _Internal::point_size(this),
-        _Internal::point_size(this).GetCachedSize(), target, stream);
-  }
-
-  // .io.deephaven.proto.backplane.script.grpc.FigureDescriptor.StringMapWithDefault point_shape = 13;
-  if (cached_has_bits & 0x00000400u) {
-    target = ::google::protobuf::internal::WireFormatLite::InternalWriteMessage(
-        13, _Internal::point_shape(this),
-        _Internal::point_shape(this).GetCachedSize(), target, stream);
-  }
-
-  // repeated .io.deephaven.proto.backplane.script.grpc.FigureDescriptor.MultiSeriesSourceDescriptor data_sources = 14;
-  for (unsigned i = 0,
-      n = static_cast<unsigned>(this->_internal_data_sources_size()); i < n; i++) {
-    const auto& repfield = this->_internal_data_sources().Get(i);
-    target = ::google::protobuf::internal::WireFormatLite::
-        InternalWriteMessage(14, repfield, repfield.GetCachedSize(), target, stream);
-  }
-
-  if (PROTOBUF_PREDICT_FALSE(_internal_metadata_.have_unknown_fields())) {
-    target =
-        ::_pbi::WireFormat::InternalSerializeUnknownFieldsToArray(
-            _internal_metadata_.unknown_fields<::google::protobuf::UnknownFieldSet>(::google::protobuf::UnknownFieldSet::default_instance), target, stream);
-  }
-  // @@protoc_insertion_point(serialize_to_array_end:io.deephaven.proto.backplane.script.grpc.FigureDescriptor.MultiSeriesDescriptor)
-  return target;
-}
-
-::size_t FigureDescriptor_MultiSeriesDescriptor::ByteSizeLong() const {
-// @@protoc_insertion_point(message_byte_size_start:io.deephaven.proto.backplane.script.grpc.FigureDescriptor.MultiSeriesDescriptor)
-  ::size_t total_size = 0;
-
-  ::uint32_t cached_has_bits = 0;
-  // Prevent compiler warnings about cached_has_bits being unused
-  (void) cached_has_bits;
-
-  // repeated .io.deephaven.proto.backplane.script.grpc.FigureDescriptor.MultiSeriesSourceDescriptor data_sources = 14;
-  total_size += 1UL * this->_internal_data_sources_size();
-  for (const auto& msg : this->_internal_data_sources()) {
-    total_size +=
-      ::google::protobuf::internal::WireFormatLite::MessageSize(msg);
-  }
-  // string name = 2;
-  if (!this->_internal_name().empty()) {
-    total_size += 1 + ::google::protobuf::internal::WireFormatLite::StringSize(
-                                    this->_internal_name());
-  }
-
-  cached_has_bits = _impl_._has_bits_[0];
-  if (cached_has_bits & 0x000000ffu) {
-    // .io.deephaven.proto.backplane.script.grpc.FigureDescriptor.StringMapWithDefault line_color = 3;
-    if (cached_has_bits & 0x00000001u) {
-      total_size +=
-          1 + ::google::protobuf::internal::WireFormatLite::MessageSize(*_impl_.line_color_);
-    }
-
-    // .io.deephaven.proto.backplane.script.grpc.FigureDescriptor.StringMapWithDefault point_color = 4;
-    if (cached_has_bits & 0x00000002u) {
-      total_size +=
-          1 + ::google::protobuf::internal::WireFormatLite::MessageSize(*_impl_.point_color_);
-    }
-
-    // .io.deephaven.proto.backplane.script.grpc.FigureDescriptor.BoolMapWithDefault lines_visible = 5;
-    if (cached_has_bits & 0x00000004u) {
-      total_size +=
-          1 + ::google::protobuf::internal::WireFormatLite::MessageSize(*_impl_.lines_visible_);
-    }
-
-    // .io.deephaven.proto.backplane.script.grpc.FigureDescriptor.BoolMapWithDefault points_visible = 6;
-    if (cached_has_bits & 0x00000008u) {
-      total_size +=
-          1 + ::google::protobuf::internal::WireFormatLite::MessageSize(*_impl_.points_visible_);
-    }
-
-    // .io.deephaven.proto.backplane.script.grpc.FigureDescriptor.BoolMapWithDefault gradient_visible = 7;
-    if (cached_has_bits & 0x00000010u) {
-      total_size +=
-          1 + ::google::protobuf::internal::WireFormatLite::MessageSize(*_impl_.gradient_visible_);
-    }
-
-    // .io.deephaven.proto.backplane.script.grpc.FigureDescriptor.StringMapWithDefault point_label_format = 8;
-    if (cached_has_bits & 0x00000020u) {
-      total_size +=
-          1 + ::google::protobuf::internal::WireFormatLite::MessageSize(*_impl_.point_label_format_);
-    }
-
-    // .io.deephaven.proto.backplane.script.grpc.FigureDescriptor.StringMapWithDefault x_tool_tip_pattern = 9;
-    if (cached_has_bits & 0x00000040u) {
-      total_size +=
-          1 + ::google::protobuf::internal::WireFormatLite::MessageSize(*_impl_.x_tool_tip_pattern_);
-    }
-
-    // .io.deephaven.proto.backplane.script.grpc.FigureDescriptor.StringMapWithDefault y_tool_tip_pattern = 10;
-    if (cached_has_bits & 0x00000080u) {
-      total_size +=
-          1 + ::google::protobuf::internal::WireFormatLite::MessageSize(*_impl_.y_tool_tip_pattern_);
-    }
-
-  }
-  if (cached_has_bits & 0x00000700u) {
-    // .io.deephaven.proto.backplane.script.grpc.FigureDescriptor.StringMapWithDefault point_label = 11;
-    if (cached_has_bits & 0x00000100u) {
-      total_size +=
-          1 + ::google::protobuf::internal::WireFormatLite::MessageSize(*_impl_.point_label_);
-    }
-
-    // .io.deephaven.proto.backplane.script.grpc.FigureDescriptor.DoubleMapWithDefault point_size = 12;
-    if (cached_has_bits & 0x00000200u) {
-      total_size +=
-          1 + ::google::protobuf::internal::WireFormatLite::MessageSize(*_impl_.point_size_);
-    }
-
-    // .io.deephaven.proto.backplane.script.grpc.FigureDescriptor.StringMapWithDefault point_shape = 13;
-    if (cached_has_bits & 0x00000400u) {
-      total_size +=
-          1 + ::google::protobuf::internal::WireFormatLite::MessageSize(*_impl_.point_shape_);
-    }
-
-  }
-  // .io.deephaven.proto.backplane.script.grpc.FigureDescriptor.SeriesPlotStyle plot_style = 1;
-  if (this->_internal_plot_style() != 0) {
-    total_size += 1 +
-                  ::_pbi::WireFormatLite::EnumSize(this->_internal_plot_style());
-  }
-
-  return MaybeComputeUnknownFieldsSize(total_size, &_impl_._cached_size_);
-}
-
-const ::google::protobuf::Message::ClassData FigureDescriptor_MultiSeriesDescriptor::_class_data_ = {
-    FigureDescriptor_MultiSeriesDescriptor::MergeImpl,
-    nullptr,  // OnDemandRegisterArenaDtor
-};
-const ::google::protobuf::Message::ClassData* FigureDescriptor_MultiSeriesDescriptor::GetClassData() const {
-  return &_class_data_;
-}
-
-void FigureDescriptor_MultiSeriesDescriptor::MergeImpl(::google::protobuf::Message& to_msg, const ::google::protobuf::Message& from_msg) {
-  auto* const _this = static_cast<FigureDescriptor_MultiSeriesDescriptor*>(&to_msg);
-  auto& from = static_cast<const FigureDescriptor_MultiSeriesDescriptor&>(from_msg);
-  // @@protoc_insertion_point(class_specific_merge_from_start:io.deephaven.proto.backplane.script.grpc.FigureDescriptor.MultiSeriesDescriptor)
-  ABSL_DCHECK_NE(&from, _this);
-  ::uint32_t cached_has_bits = 0;
-  (void) cached_has_bits;
-
-  _this->_internal_mutable_data_sources()->MergeFrom(
-      from._internal_data_sources());
-  if (!from._internal_name().empty()) {
-    _this->_internal_set_name(from._internal_name());
-  }
-  cached_has_bits = from._impl_._has_bits_[0];
-  if (cached_has_bits & 0x000000ffu) {
-    if (cached_has_bits & 0x00000001u) {
-      _this->_internal_mutable_line_color()->::io::deephaven::proto::backplane::script::grpc::FigureDescriptor_StringMapWithDefault::MergeFrom(
-          from._internal_line_color());
-    }
-    if (cached_has_bits & 0x00000002u) {
-      _this->_internal_mutable_point_color()->::io::deephaven::proto::backplane::script::grpc::FigureDescriptor_StringMapWithDefault::MergeFrom(
-          from._internal_point_color());
-    }
-    if (cached_has_bits & 0x00000004u) {
-      _this->_internal_mutable_lines_visible()->::io::deephaven::proto::backplane::script::grpc::FigureDescriptor_BoolMapWithDefault::MergeFrom(
-          from._internal_lines_visible());
-    }
-    if (cached_has_bits & 0x00000008u) {
-      _this->_internal_mutable_points_visible()->::io::deephaven::proto::backplane::script::grpc::FigureDescriptor_BoolMapWithDefault::MergeFrom(
-          from._internal_points_visible());
-    }
-    if (cached_has_bits & 0x00000010u) {
-      _this->_internal_mutable_gradient_visible()->::io::deephaven::proto::backplane::script::grpc::FigureDescriptor_BoolMapWithDefault::MergeFrom(
-          from._internal_gradient_visible());
-    }
-    if (cached_has_bits & 0x00000020u) {
-      _this->_internal_mutable_point_label_format()->::io::deephaven::proto::backplane::script::grpc::FigureDescriptor_StringMapWithDefault::MergeFrom(
-          from._internal_point_label_format());
-    }
-    if (cached_has_bits & 0x00000040u) {
-      _this->_internal_mutable_x_tool_tip_pattern()->::io::deephaven::proto::backplane::script::grpc::FigureDescriptor_StringMapWithDefault::MergeFrom(
-          from._internal_x_tool_tip_pattern());
-    }
-    if (cached_has_bits & 0x00000080u) {
-      _this->_internal_mutable_y_tool_tip_pattern()->::io::deephaven::proto::backplane::script::grpc::FigureDescriptor_StringMapWithDefault::MergeFrom(
-          from._internal_y_tool_tip_pattern());
-    }
-  }
-  if (cached_has_bits & 0x00000700u) {
-    if (cached_has_bits & 0x00000100u) {
-      _this->_internal_mutable_point_label()->::io::deephaven::proto::backplane::script::grpc::FigureDescriptor_StringMapWithDefault::MergeFrom(
-          from._internal_point_label());
-    }
-    if (cached_has_bits & 0x00000200u) {
-      _this->_internal_mutable_point_size()->::io::deephaven::proto::backplane::script::grpc::FigureDescriptor_DoubleMapWithDefault::MergeFrom(
-          from._internal_point_size());
-    }
-    if (cached_has_bits & 0x00000400u) {
-      _this->_internal_mutable_point_shape()->::io::deephaven::proto::backplane::script::grpc::FigureDescriptor_StringMapWithDefault::MergeFrom(
-          from._internal_point_shape());
-    }
-  }
-  if (from._internal_plot_style() != 0) {
-    _this->_internal_set_plot_style(from._internal_plot_style());
-  }
-  _this->_internal_metadata_.MergeFrom<::google::protobuf::UnknownFieldSet>(from._internal_metadata_);
-}
-
-void FigureDescriptor_MultiSeriesDescriptor::CopyFrom(const FigureDescriptor_MultiSeriesDescriptor& from) {
-// @@protoc_insertion_point(class_specific_copy_from_start:io.deephaven.proto.backplane.script.grpc.FigureDescriptor.MultiSeriesDescriptor)
-  if (&from == this) return;
-  Clear();
-  MergeFrom(from);
-}
-
-PROTOBUF_NOINLINE bool FigureDescriptor_MultiSeriesDescriptor::IsInitialized() const {
-  return true;
-}
-
-::_pbi::CachedSize* FigureDescriptor_MultiSeriesDescriptor::AccessCachedSize() const {
-  return &_impl_._cached_size_;
-}
-void FigureDescriptor_MultiSeriesDescriptor::InternalSwap(FigureDescriptor_MultiSeriesDescriptor* PROTOBUF_RESTRICT other) {
-  using std::swap;
-  auto* arena = GetArena();
-  ABSL_DCHECK_EQ(arena, other->GetArena());
-  _internal_metadata_.InternalSwap(&other->_internal_metadata_);
-  swap(_impl_._has_bits_[0], other->_impl_._has_bits_[0]);
-  _impl_.data_sources_.InternalSwap(&other->_impl_.data_sources_);
-  ::_pbi::ArenaStringPtr::InternalSwap(&_impl_.name_, &other->_impl_.name_, arena);
-  ::google::protobuf::internal::memswap<
-      PROTOBUF_FIELD_OFFSET(FigureDescriptor_MultiSeriesDescriptor, _impl_.plot_style_)
-      + sizeof(FigureDescriptor_MultiSeriesDescriptor::_impl_.plot_style_)
-      - PROTOBUF_FIELD_OFFSET(FigureDescriptor_MultiSeriesDescriptor, _impl_.line_color_)>(
-          reinterpret_cast<char*>(&_impl_.line_color_),
-          reinterpret_cast<char*>(&other->_impl_.line_color_));
-}
-
-::google::protobuf::Metadata FigureDescriptor_MultiSeriesDescriptor::GetMetadata() const {
-  return ::_pbi::AssignDescriptors(
-      &descriptor_table_deephaven_2fproto_2fconsole_2eproto_getter, &descriptor_table_deephaven_2fproto_2fconsole_2eproto_once,
-      file_level_metadata_deephaven_2fproto_2fconsole_2eproto[47]);
-}
-// ===================================================================
-
-class FigureDescriptor_StringMapWithDefault::_Internal {
- public:
-  using HasBits = decltype(std::declval<FigureDescriptor_StringMapWithDefault>()._impl_._has_bits_);
-  static constexpr ::int32_t kHasBitsOffset =
-    8 * PROTOBUF_FIELD_OFFSET(FigureDescriptor_StringMapWithDefault, _impl_._has_bits_);
-  static void set_has_default_string(HasBits* has_bits) {
-    (*has_bits)[0] |= 1u;
-  }
-};
-
-FigureDescriptor_StringMapWithDefault::FigureDescriptor_StringMapWithDefault(::google::protobuf::Arena* arena)
-    : ::google::protobuf::Message(arena) {
-  SharedCtor(arena);
-  // @@protoc_insertion_point(arena_constructor:io.deephaven.proto.backplane.script.grpc.FigureDescriptor.StringMapWithDefault)
-}
-inline PROTOBUF_NDEBUG_INLINE FigureDescriptor_StringMapWithDefault::Impl_::Impl_(
-    ::google::protobuf::internal::InternalVisibility visibility, ::google::protobuf::Arena* arena,
-    const Impl_& from)
-      : _has_bits_{from._has_bits_},
-        _cached_size_{0},
-        keys_{visibility, arena, from.keys_},
-        values_{visibility, arena, from.values_},
-        default_string_(arena, from.default_string_) {}
-
-FigureDescriptor_StringMapWithDefault::FigureDescriptor_StringMapWithDefault(
-    ::google::protobuf::Arena* arena,
-    const FigureDescriptor_StringMapWithDefault& from)
-    : ::google::protobuf::Message(arena) {
-  FigureDescriptor_StringMapWithDefault* const _this = this;
-  (void)_this;
-  _internal_metadata_.MergeFrom<::google::protobuf::UnknownFieldSet>(
-      from._internal_metadata_);
-  new (&_impl_) Impl_(internal_visibility(), arena, from._impl_);
-
-  // @@protoc_insertion_point(copy_constructor:io.deephaven.proto.backplane.script.grpc.FigureDescriptor.StringMapWithDefault)
-}
-inline PROTOBUF_NDEBUG_INLINE FigureDescriptor_StringMapWithDefault::Impl_::Impl_(
-    ::google::protobuf::internal::InternalVisibility visibility,
-    ::google::protobuf::Arena* arena)
-      : _cached_size_{0},
-        keys_{visibility, arena},
-        values_{visibility, arena},
-        default_string_(arena) {}
-
-inline void FigureDescriptor_StringMapWithDefault::SharedCtor(::_pb::Arena* arena) {
-  new (&_impl_) Impl_(internal_visibility(), arena);
-}
-FigureDescriptor_StringMapWithDefault::~FigureDescriptor_StringMapWithDefault() {
-  // @@protoc_insertion_point(destructor:io.deephaven.proto.backplane.script.grpc.FigureDescriptor.StringMapWithDefault)
-  _internal_metadata_.Delete<::google::protobuf::UnknownFieldSet>();
-  SharedDtor();
-}
-inline void FigureDescriptor_StringMapWithDefault::SharedDtor() {
-  ABSL_DCHECK(GetArena() == nullptr);
-  _impl_.default_string_.Destroy();
-  _impl_.~Impl_();
-}
-
-PROTOBUF_NOINLINE void FigureDescriptor_StringMapWithDefault::Clear() {
-// @@protoc_insertion_point(message_clear_start:io.deephaven.proto.backplane.script.grpc.FigureDescriptor.StringMapWithDefault)
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  ::uint32_t cached_has_bits = 0;
-  // Prevent compiler warnings about cached_has_bits being unused
-  (void) cached_has_bits;
-
-  _impl_.keys_.Clear();
-  _impl_.values_.Clear();
-  cached_has_bits = _impl_._has_bits_[0];
-  if (cached_has_bits & 0x00000001u) {
-    _impl_.default_string_.ClearNonDefaultToEmpty();
-  }
-  _impl_._has_bits_.Clear();
-  _internal_metadata_.Clear<::google::protobuf::UnknownFieldSet>();
-}
-
-const char* FigureDescriptor_StringMapWithDefault::_InternalParse(
-    const char* ptr, ::_pbi::ParseContext* ctx) {
-  ptr = ::_pbi::TcParser::ParseLoop(this, ptr, ctx, &_table_.header);
-  return ptr;
-}
-
-
-PROTOBUF_CONSTINIT PROTOBUF_ATTRIBUTE_INIT_PRIORITY1
-const ::_pbi::TcParseTable<2, 3, 0, 111, 2> FigureDescriptor_StringMapWithDefault::_table_ = {
-  {
-    PROTOBUF_FIELD_OFFSET(FigureDescriptor_StringMapWithDefault, _impl_._has_bits_),
-    0, // no _extensions_
-    3, 24,  // max_field_number, fast_idx_mask
-    offsetof(decltype(_table_), field_lookup_table),
-    4294967288,  // skipmap
-    offsetof(decltype(_table_), field_entries),
-    3,  // num_field_entries
-    0,  // num_aux_entries
-    offsetof(decltype(_table_), field_names),  // no aux_entries
-    &_FigureDescriptor_StringMapWithDefault_default_instance_._instance,
-    ::_pbi::TcParser::GenericFallback,  // fallback
-  }, {{
-    {::_pbi::TcParser::MiniParse, {}},
-    // optional string default_string = 1;
-    {::_pbi::TcParser::FastUS1,
-     {10, 0, 0, PROTOBUF_FIELD_OFFSET(FigureDescriptor_StringMapWithDefault, _impl_.default_string_)}},
-    // repeated string keys = 2;
-    {::_pbi::TcParser::FastUR1,
-     {18, 63, 0, PROTOBUF_FIELD_OFFSET(FigureDescriptor_StringMapWithDefault, _impl_.keys_)}},
-    // repeated string values = 3;
-    {::_pbi::TcParser::FastUR1,
-     {26, 63, 0, PROTOBUF_FIELD_OFFSET(FigureDescriptor_StringMapWithDefault, _impl_.values_)}},
-  }}, {{
-    65535, 65535
-  }}, {{
-    // optional string default_string = 1;
-    {PROTOBUF_FIELD_OFFSET(FigureDescriptor_StringMapWithDefault, _impl_.default_string_), _Internal::kHasBitsOffset + 0, 0,
-    (0 | ::_fl::kFcOptional | ::_fl::kUtf8String | ::_fl::kRepAString)},
-    // repeated string keys = 2;
-    {PROTOBUF_FIELD_OFFSET(FigureDescriptor_StringMapWithDefault, _impl_.keys_), -1, 0,
-    (0 | ::_fl::kFcRepeated | ::_fl::kUtf8String | ::_fl::kRepSString)},
-    // repeated string values = 3;
-    {PROTOBUF_FIELD_OFFSET(FigureDescriptor_StringMapWithDefault, _impl_.values_), -1, 0,
-    (0 | ::_fl::kFcRepeated | ::_fl::kUtf8String | ::_fl::kRepSString)},
-  }},
-  // no aux_entries
-  {{
-    "\116\16\4\6\0\0\0\0"
-    "io.deephaven.proto.backplane.script.grpc.FigureDescriptor.StringMapWithDefault"
-    "default_string"
-    "keys"
-    "values"
-  }},
-};
-
-::uint8_t* FigureDescriptor_StringMapWithDefault::_InternalSerialize(
-    ::uint8_t* target,
-    ::google::protobuf::io::EpsCopyOutputStream* stream) const {
-  // @@protoc_insertion_point(serialize_to_array_start:io.deephaven.proto.backplane.script.grpc.FigureDescriptor.StringMapWithDefault)
-  ::uint32_t cached_has_bits = 0;
-  (void)cached_has_bits;
-
-  cached_has_bits = _impl_._has_bits_[0];
-  // optional string default_string = 1;
-  if (cached_has_bits & 0x00000001u) {
-    const std::string& _s = this->_internal_default_string();
-    ::google::protobuf::internal::WireFormatLite::VerifyUtf8String(
-        _s.data(), static_cast<int>(_s.length()), ::google::protobuf::internal::WireFormatLite::SERIALIZE, "io.deephaven.proto.backplane.script.grpc.FigureDescriptor.StringMapWithDefault.default_string");
-    target = stream->WriteStringMaybeAliased(1, _s, target);
-  }
-
-  // repeated string keys = 2;
-  for (int i = 0, n = this->_internal_keys_size(); i < n; ++i) {
-    const auto& s = this->_internal_keys().Get(i);
-    ::google::protobuf::internal::WireFormatLite::VerifyUtf8String(
-        s.data(), static_cast<int>(s.length()), ::google::protobuf::internal::WireFormatLite::SERIALIZE, "io.deephaven.proto.backplane.script.grpc.FigureDescriptor.StringMapWithDefault.keys");
-    target = stream->WriteString(2, s, target);
-  }
-
-  // repeated string values = 3;
-  for (int i = 0, n = this->_internal_values_size(); i < n; ++i) {
-    const auto& s = this->_internal_values().Get(i);
-    ::google::protobuf::internal::WireFormatLite::VerifyUtf8String(
-        s.data(), static_cast<int>(s.length()), ::google::protobuf::internal::WireFormatLite::SERIALIZE, "io.deephaven.proto.backplane.script.grpc.FigureDescriptor.StringMapWithDefault.values");
-    target = stream->WriteString(3, s, target);
-  }
-
-  if (PROTOBUF_PREDICT_FALSE(_internal_metadata_.have_unknown_fields())) {
-    target =
-        ::_pbi::WireFormat::InternalSerializeUnknownFieldsToArray(
-            _internal_metadata_.unknown_fields<::google::protobuf::UnknownFieldSet>(::google::protobuf::UnknownFieldSet::default_instance), target, stream);
-  }
-  // @@protoc_insertion_point(serialize_to_array_end:io.deephaven.proto.backplane.script.grpc.FigureDescriptor.StringMapWithDefault)
-  return target;
-}
-
-::size_t FigureDescriptor_StringMapWithDefault::ByteSizeLong() const {
-// @@protoc_insertion_point(message_byte_size_start:io.deephaven.proto.backplane.script.grpc.FigureDescriptor.StringMapWithDefault)
-  ::size_t total_size = 0;
-
-  ::uint32_t cached_has_bits = 0;
-  // Prevent compiler warnings about cached_has_bits being unused
-  (void) cached_has_bits;
-
-  // repeated string keys = 2;
-  total_size += 1 * ::google::protobuf::internal::FromIntSize(_internal_keys().size());
-  for (int i = 0, n = _internal_keys().size(); i < n; ++i) {
-    total_size += ::google::protobuf::internal::WireFormatLite::StringSize(
-        _internal_keys().Get(i));
-  }
-  // repeated string values = 3;
-  total_size += 1 * ::google::protobuf::internal::FromIntSize(_internal_values().size());
-  for (int i = 0, n = _internal_values().size(); i < n; ++i) {
-    total_size += ::google::protobuf::internal::WireFormatLite::StringSize(
-        _internal_values().Get(i));
-  }
-  // optional string default_string = 1;
-  cached_has_bits = _impl_._has_bits_[0];
-  if (cached_has_bits & 0x00000001u) {
-    total_size += 1 + ::google::protobuf::internal::WireFormatLite::StringSize(
-                                    this->_internal_default_string());
-  }
-
-  return MaybeComputeUnknownFieldsSize(total_size, &_impl_._cached_size_);
-}
-
-const ::google::protobuf::Message::ClassData FigureDescriptor_StringMapWithDefault::_class_data_ = {
-    FigureDescriptor_StringMapWithDefault::MergeImpl,
-    nullptr,  // OnDemandRegisterArenaDtor
-};
-const ::google::protobuf::Message::ClassData* FigureDescriptor_StringMapWithDefault::GetClassData() const {
-  return &_class_data_;
-}
-
-void FigureDescriptor_StringMapWithDefault::MergeImpl(::google::protobuf::Message& to_msg, const ::google::protobuf::Message& from_msg) {
-  auto* const _this = static_cast<FigureDescriptor_StringMapWithDefault*>(&to_msg);
-  auto& from = static_cast<const FigureDescriptor_StringMapWithDefault&>(from_msg);
-  // @@protoc_insertion_point(class_specific_merge_from_start:io.deephaven.proto.backplane.script.grpc.FigureDescriptor.StringMapWithDefault)
-  ABSL_DCHECK_NE(&from, _this);
-  ::uint32_t cached_has_bits = 0;
-  (void) cached_has_bits;
-
-  _this->_internal_mutable_keys()->MergeFrom(from._internal_keys());
-  _this->_internal_mutable_values()->MergeFrom(from._internal_values());
-  if ((from._impl_._has_bits_[0] & 0x00000001u) != 0) {
-    _this->_internal_set_default_string(from._internal_default_string());
-  }
-  _this->_internal_metadata_.MergeFrom<::google::protobuf::UnknownFieldSet>(from._internal_metadata_);
-}
-
-void FigureDescriptor_StringMapWithDefault::CopyFrom(const FigureDescriptor_StringMapWithDefault& from) {
-// @@protoc_insertion_point(class_specific_copy_from_start:io.deephaven.proto.backplane.script.grpc.FigureDescriptor.StringMapWithDefault)
-  if (&from == this) return;
-  Clear();
-  MergeFrom(from);
-}
-
-PROTOBUF_NOINLINE bool FigureDescriptor_StringMapWithDefault::IsInitialized() const {
-  return true;
-}
-
-::_pbi::CachedSize* FigureDescriptor_StringMapWithDefault::AccessCachedSize() const {
-  return &_impl_._cached_size_;
-}
-void FigureDescriptor_StringMapWithDefault::InternalSwap(FigureDescriptor_StringMapWithDefault* PROTOBUF_RESTRICT other) {
-  using std::swap;
-  auto* arena = GetArena();
-  ABSL_DCHECK_EQ(arena, other->GetArena());
-  _internal_metadata_.InternalSwap(&other->_internal_metadata_);
-  swap(_impl_._has_bits_[0], other->_impl_._has_bits_[0]);
-  _impl_.keys_.InternalSwap(&other->_impl_.keys_);
-  _impl_.values_.InternalSwap(&other->_impl_.values_);
-  ::_pbi::ArenaStringPtr::InternalSwap(&_impl_.default_string_, &other->_impl_.default_string_, arena);
-}
-
-::google::protobuf::Metadata FigureDescriptor_StringMapWithDefault::GetMetadata() const {
-  return ::_pbi::AssignDescriptors(
-      &descriptor_table_deephaven_2fproto_2fconsole_2eproto_getter, &descriptor_table_deephaven_2fproto_2fconsole_2eproto_once,
-      file_level_metadata_deephaven_2fproto_2fconsole_2eproto[48]);
-}
-// ===================================================================
-
-class FigureDescriptor_DoubleMapWithDefault::_Internal {
- public:
-  using HasBits = decltype(std::declval<FigureDescriptor_DoubleMapWithDefault>()._impl_._has_bits_);
-  static constexpr ::int32_t kHasBitsOffset =
-    8 * PROTOBUF_FIELD_OFFSET(FigureDescriptor_DoubleMapWithDefault, _impl_._has_bits_);
-  static void set_has_default_double(HasBits* has_bits) {
-    (*has_bits)[0] |= 1u;
-  }
-};
-
-FigureDescriptor_DoubleMapWithDefault::FigureDescriptor_DoubleMapWithDefault(::google::protobuf::Arena* arena)
-    : ::google::protobuf::Message(arena) {
-  SharedCtor(arena);
-  // @@protoc_insertion_point(arena_constructor:io.deephaven.proto.backplane.script.grpc.FigureDescriptor.DoubleMapWithDefault)
-}
-inline PROTOBUF_NDEBUG_INLINE FigureDescriptor_DoubleMapWithDefault::Impl_::Impl_(
-    ::google::protobuf::internal::InternalVisibility visibility, ::google::protobuf::Arena* arena,
-    const Impl_& from)
-      : _has_bits_{from._has_bits_},
-        _cached_size_{0},
-        keys_{visibility, arena, from.keys_},
-        values_{visibility, arena, from.values_} {}
-
-FigureDescriptor_DoubleMapWithDefault::FigureDescriptor_DoubleMapWithDefault(
-    ::google::protobuf::Arena* arena,
-    const FigureDescriptor_DoubleMapWithDefault& from)
-    : ::google::protobuf::Message(arena) {
-  FigureDescriptor_DoubleMapWithDefault* const _this = this;
-  (void)_this;
-  _internal_metadata_.MergeFrom<::google::protobuf::UnknownFieldSet>(
-      from._internal_metadata_);
-  new (&_impl_) Impl_(internal_visibility(), arena, from._impl_);
-  _impl_.default_double_ = from._impl_.default_double_;
-
-  // @@protoc_insertion_point(copy_constructor:io.deephaven.proto.backplane.script.grpc.FigureDescriptor.DoubleMapWithDefault)
-}
-inline PROTOBUF_NDEBUG_INLINE FigureDescriptor_DoubleMapWithDefault::Impl_::Impl_(
-    ::google::protobuf::internal::InternalVisibility visibility,
-    ::google::protobuf::Arena* arena)
-      : _cached_size_{0},
-        keys_{visibility, arena},
-        values_{visibility, arena} {}
-
-inline void FigureDescriptor_DoubleMapWithDefault::SharedCtor(::_pb::Arena* arena) {
-  new (&_impl_) Impl_(internal_visibility(), arena);
-  _impl_.default_double_ = {};
-}
-FigureDescriptor_DoubleMapWithDefault::~FigureDescriptor_DoubleMapWithDefault() {
-  // @@protoc_insertion_point(destructor:io.deephaven.proto.backplane.script.grpc.FigureDescriptor.DoubleMapWithDefault)
-  _internal_metadata_.Delete<::google::protobuf::UnknownFieldSet>();
-  SharedDtor();
-}
-inline void FigureDescriptor_DoubleMapWithDefault::SharedDtor() {
-  ABSL_DCHECK(GetArena() == nullptr);
-  _impl_.~Impl_();
-}
-
-PROTOBUF_NOINLINE void FigureDescriptor_DoubleMapWithDefault::Clear() {
-// @@protoc_insertion_point(message_clear_start:io.deephaven.proto.backplane.script.grpc.FigureDescriptor.DoubleMapWithDefault)
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  ::uint32_t cached_has_bits = 0;
-  // Prevent compiler warnings about cached_has_bits being unused
-  (void) cached_has_bits;
-
-  _impl_.keys_.Clear();
-  _impl_.values_.Clear();
-  _impl_.default_double_ = 0;
-  _impl_._has_bits_.Clear();
-  _internal_metadata_.Clear<::google::protobuf::UnknownFieldSet>();
-}
-
-const char* FigureDescriptor_DoubleMapWithDefault::_InternalParse(
-    const char* ptr, ::_pbi::ParseContext* ctx) {
-  ptr = ::_pbi::TcParser::ParseLoop(this, ptr, ctx, &_table_.header);
-  return ptr;
-}
-
-
-PROTOBUF_CONSTINIT PROTOBUF_ATTRIBUTE_INIT_PRIORITY1
-const ::_pbi::TcParseTable<2, 3, 0, 91, 2> FigureDescriptor_DoubleMapWithDefault::_table_ = {
-  {
-    PROTOBUF_FIELD_OFFSET(FigureDescriptor_DoubleMapWithDefault, _impl_._has_bits_),
-    0, // no _extensions_
-    3, 24,  // max_field_number, fast_idx_mask
-    offsetof(decltype(_table_), field_lookup_table),
-    4294967288,  // skipmap
-    offsetof(decltype(_table_), field_entries),
-    3,  // num_field_entries
-    0,  // num_aux_entries
-    offsetof(decltype(_table_), field_names),  // no aux_entries
-    &_FigureDescriptor_DoubleMapWithDefault_default_instance_._instance,
-    ::_pbi::TcParser::GenericFallback,  // fallback
-  }, {{
-    {::_pbi::TcParser::MiniParse, {}},
-    // optional double default_double = 1;
-    {::_pbi::TcParser::FastF64S1,
-     {9, 0, 0, PROTOBUF_FIELD_OFFSET(FigureDescriptor_DoubleMapWithDefault, _impl_.default_double_)}},
-    // repeated string keys = 2;
-    {::_pbi::TcParser::FastUR1,
-     {18, 63, 0, PROTOBUF_FIELD_OFFSET(FigureDescriptor_DoubleMapWithDefault, _impl_.keys_)}},
-    // repeated double values = 3;
-    {::_pbi::TcParser::FastF64P1,
-     {26, 63, 0, PROTOBUF_FIELD_OFFSET(FigureDescriptor_DoubleMapWithDefault, _impl_.values_)}},
-  }}, {{
-    65535, 65535
-  }}, {{
-    // optional double default_double = 1;
-    {PROTOBUF_FIELD_OFFSET(FigureDescriptor_DoubleMapWithDefault, _impl_.default_double_), _Internal::kHasBitsOffset + 0, 0,
-    (0 | ::_fl::kFcOptional | ::_fl::kDouble)},
-    // repeated string keys = 2;
-    {PROTOBUF_FIELD_OFFSET(FigureDescriptor_DoubleMapWithDefault, _impl_.keys_), -1, 0,
-    (0 | ::_fl::kFcRepeated | ::_fl::kUtf8String | ::_fl::kRepSString)},
-    // repeated double values = 3;
-    {PROTOBUF_FIELD_OFFSET(FigureDescriptor_DoubleMapWithDefault, _impl_.values_), -1, 0,
-    (0 | ::_fl::kFcRepeated | ::_fl::kPackedDouble)},
-  }},
-  // no aux_entries
-  {{
-    "\116\0\4\0\0\0\0\0"
-    "io.deephaven.proto.backplane.script.grpc.FigureDescriptor.DoubleMapWithDefault"
-    "keys"
-  }},
-};
-
-::uint8_t* FigureDescriptor_DoubleMapWithDefault::_InternalSerialize(
-    ::uint8_t* target,
-    ::google::protobuf::io::EpsCopyOutputStream* stream) const {
-  // @@protoc_insertion_point(serialize_to_array_start:io.deephaven.proto.backplane.script.grpc.FigureDescriptor.DoubleMapWithDefault)
-  ::uint32_t cached_has_bits = 0;
-  (void)cached_has_bits;
-
-  cached_has_bits = _impl_._has_bits_[0];
-  // optional double default_double = 1;
-  if (cached_has_bits & 0x00000001u) {
-    target = stream->EnsureSpace(target);
-    target = ::_pbi::WireFormatLite::WriteDoubleToArray(
-        1, this->_internal_default_double(), target);
-  }
-
-  // repeated string keys = 2;
-  for (int i = 0, n = this->_internal_keys_size(); i < n; ++i) {
-    const auto& s = this->_internal_keys().Get(i);
-    ::google::protobuf::internal::WireFormatLite::VerifyUtf8String(
-        s.data(), static_cast<int>(s.length()), ::google::protobuf::internal::WireFormatLite::SERIALIZE, "io.deephaven.proto.backplane.script.grpc.FigureDescriptor.DoubleMapWithDefault.keys");
-    target = stream->WriteString(2, s, target);
-  }
-
-  // repeated double values = 3;
-  if (this->_internal_values_size() > 0) {
-    target = stream->WriteFixedPacked(3, _internal_values(), target);
-  }
-
-  if (PROTOBUF_PREDICT_FALSE(_internal_metadata_.have_unknown_fields())) {
-    target =
-        ::_pbi::WireFormat::InternalSerializeUnknownFieldsToArray(
-            _internal_metadata_.unknown_fields<::google::protobuf::UnknownFieldSet>(::google::protobuf::UnknownFieldSet::default_instance), target, stream);
-  }
-  // @@protoc_insertion_point(serialize_to_array_end:io.deephaven.proto.backplane.script.grpc.FigureDescriptor.DoubleMapWithDefault)
-  return target;
-}
-
-::size_t FigureDescriptor_DoubleMapWithDefault::ByteSizeLong() const {
-// @@protoc_insertion_point(message_byte_size_start:io.deephaven.proto.backplane.script.grpc.FigureDescriptor.DoubleMapWithDefault)
-  ::size_t total_size = 0;
-
-  ::uint32_t cached_has_bits = 0;
-  // Prevent compiler warnings about cached_has_bits being unused
-  (void) cached_has_bits;
-
-  // repeated string keys = 2;
-  total_size += 1 * ::google::protobuf::internal::FromIntSize(_internal_keys().size());
-  for (int i = 0, n = _internal_keys().size(); i < n; ++i) {
-    total_size += ::google::protobuf::internal::WireFormatLite::StringSize(
-        _internal_keys().Get(i));
-  }
-  // repeated double values = 3;
-  {
-    std::size_t data_size = std::size_t{8} *
-        ::_pbi::FromIntSize(this->_internal_values_size())
-    ;
-    std::size_t tag_size = data_size == 0
-        ? 0
-        : 1 + ::_pbi::WireFormatLite::Int32Size(
-                            static_cast<int32_t>(data_size))
-    ;
-    total_size += tag_size + data_size;
-  }
-  // optional double default_double = 1;
-  cached_has_bits = _impl_._has_bits_[0];
-  if (cached_has_bits & 0x00000001u) {
-    total_size += 9;
-  }
-
-  return MaybeComputeUnknownFieldsSize(total_size, &_impl_._cached_size_);
-}
-
-const ::google::protobuf::Message::ClassData FigureDescriptor_DoubleMapWithDefault::_class_data_ = {
-    FigureDescriptor_DoubleMapWithDefault::MergeImpl,
-    nullptr,  // OnDemandRegisterArenaDtor
-};
-const ::google::protobuf::Message::ClassData* FigureDescriptor_DoubleMapWithDefault::GetClassData() const {
-  return &_class_data_;
-}
-
-void FigureDescriptor_DoubleMapWithDefault::MergeImpl(::google::protobuf::Message& to_msg, const ::google::protobuf::Message& from_msg) {
-  auto* const _this = static_cast<FigureDescriptor_DoubleMapWithDefault*>(&to_msg);
-  auto& from = static_cast<const FigureDescriptor_DoubleMapWithDefault&>(from_msg);
-  // @@protoc_insertion_point(class_specific_merge_from_start:io.deephaven.proto.backplane.script.grpc.FigureDescriptor.DoubleMapWithDefault)
-  ABSL_DCHECK_NE(&from, _this);
-  ::uint32_t cached_has_bits = 0;
-  (void) cached_has_bits;
-
-  _this->_internal_mutable_keys()->MergeFrom(from._internal_keys());
-  _this->_internal_mutable_values()->MergeFrom(from._internal_values());
-  if ((from._impl_._has_bits_[0] & 0x00000001u) != 0) {
-    _this->_internal_set_default_double(from._internal_default_double());
-  }
-  _this->_internal_metadata_.MergeFrom<::google::protobuf::UnknownFieldSet>(from._internal_metadata_);
-}
-
-void FigureDescriptor_DoubleMapWithDefault::CopyFrom(const FigureDescriptor_DoubleMapWithDefault& from) {
-// @@protoc_insertion_point(class_specific_copy_from_start:io.deephaven.proto.backplane.script.grpc.FigureDescriptor.DoubleMapWithDefault)
-  if (&from == this) return;
-  Clear();
-  MergeFrom(from);
-}
-
-PROTOBUF_NOINLINE bool FigureDescriptor_DoubleMapWithDefault::IsInitialized() const {
-  return true;
-}
-
-::_pbi::CachedSize* FigureDescriptor_DoubleMapWithDefault::AccessCachedSize() const {
-  return &_impl_._cached_size_;
-}
-void FigureDescriptor_DoubleMapWithDefault::InternalSwap(FigureDescriptor_DoubleMapWithDefault* PROTOBUF_RESTRICT other) {
-  using std::swap;
-  _internal_metadata_.InternalSwap(&other->_internal_metadata_);
-  swap(_impl_._has_bits_[0], other->_impl_._has_bits_[0]);
-  _impl_.keys_.InternalSwap(&other->_impl_.keys_);
-  _impl_.values_.InternalSwap(&other->_impl_.values_);
-        swap(_impl_.default_double_, other->_impl_.default_double_);
-}
-
-::google::protobuf::Metadata FigureDescriptor_DoubleMapWithDefault::GetMetadata() const {
-  return ::_pbi::AssignDescriptors(
-      &descriptor_table_deephaven_2fproto_2fconsole_2eproto_getter, &descriptor_table_deephaven_2fproto_2fconsole_2eproto_once,
-      file_level_metadata_deephaven_2fproto_2fconsole_2eproto[49]);
-}
-// ===================================================================
-
-class FigureDescriptor_BoolMapWithDefault::_Internal {
- public:
-  using HasBits = decltype(std::declval<FigureDescriptor_BoolMapWithDefault>()._impl_._has_bits_);
-  static constexpr ::int32_t kHasBitsOffset =
-    8 * PROTOBUF_FIELD_OFFSET(FigureDescriptor_BoolMapWithDefault, _impl_._has_bits_);
-  static void set_has_default_bool(HasBits* has_bits) {
-    (*has_bits)[0] |= 1u;
-  }
-};
-
-FigureDescriptor_BoolMapWithDefault::FigureDescriptor_BoolMapWithDefault(::google::protobuf::Arena* arena)
-    : ::google::protobuf::Message(arena) {
-  SharedCtor(arena);
-  // @@protoc_insertion_point(arena_constructor:io.deephaven.proto.backplane.script.grpc.FigureDescriptor.BoolMapWithDefault)
-}
-inline PROTOBUF_NDEBUG_INLINE FigureDescriptor_BoolMapWithDefault::Impl_::Impl_(
-    ::google::protobuf::internal::InternalVisibility visibility, ::google::protobuf::Arena* arena,
-    const Impl_& from)
-      : _has_bits_{from._has_bits_},
-        _cached_size_{0},
-        keys_{visibility, arena, from.keys_},
-        values_{visibility, arena, from.values_} {}
-
-FigureDescriptor_BoolMapWithDefault::FigureDescriptor_BoolMapWithDefault(
-    ::google::protobuf::Arena* arena,
-    const FigureDescriptor_BoolMapWithDefault& from)
-    : ::google::protobuf::Message(arena) {
-  FigureDescriptor_BoolMapWithDefault* const _this = this;
-  (void)_this;
-  _internal_metadata_.MergeFrom<::google::protobuf::UnknownFieldSet>(
-      from._internal_metadata_);
-  new (&_impl_) Impl_(internal_visibility(), arena, from._impl_);
-  _impl_.default_bool_ = from._impl_.default_bool_;
-
-  // @@protoc_insertion_point(copy_constructor:io.deephaven.proto.backplane.script.grpc.FigureDescriptor.BoolMapWithDefault)
-}
-inline PROTOBUF_NDEBUG_INLINE FigureDescriptor_BoolMapWithDefault::Impl_::Impl_(
-    ::google::protobuf::internal::InternalVisibility visibility,
-    ::google::protobuf::Arena* arena)
-      : _cached_size_{0},
-        keys_{visibility, arena},
-        values_{visibility, arena} {}
-
-inline void FigureDescriptor_BoolMapWithDefault::SharedCtor(::_pb::Arena* arena) {
-  new (&_impl_) Impl_(internal_visibility(), arena);
-  _impl_.default_bool_ = {};
-}
-FigureDescriptor_BoolMapWithDefault::~FigureDescriptor_BoolMapWithDefault() {
-  // @@protoc_insertion_point(destructor:io.deephaven.proto.backplane.script.grpc.FigureDescriptor.BoolMapWithDefault)
-  _internal_metadata_.Delete<::google::protobuf::UnknownFieldSet>();
-  SharedDtor();
-}
-inline void FigureDescriptor_BoolMapWithDefault::SharedDtor() {
-  ABSL_DCHECK(GetArena() == nullptr);
-  _impl_.~Impl_();
-}
-
-PROTOBUF_NOINLINE void FigureDescriptor_BoolMapWithDefault::Clear() {
-// @@protoc_insertion_point(message_clear_start:io.deephaven.proto.backplane.script.grpc.FigureDescriptor.BoolMapWithDefault)
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  ::uint32_t cached_has_bits = 0;
-  // Prevent compiler warnings about cached_has_bits being unused
-  (void) cached_has_bits;
-
-  _impl_.keys_.Clear();
-  _impl_.values_.Clear();
-  _impl_.default_bool_ = false;
-  _impl_._has_bits_.Clear();
-  _internal_metadata_.Clear<::google::protobuf::UnknownFieldSet>();
-}
-
-const char* FigureDescriptor_BoolMapWithDefault::_InternalParse(
-    const char* ptr, ::_pbi::ParseContext* ctx) {
-  ptr = ::_pbi::TcParser::ParseLoop(this, ptr, ctx, &_table_.header);
-  return ptr;
-}
-
-
-PROTOBUF_CONSTINIT PROTOBUF_ATTRIBUTE_INIT_PRIORITY1
-const ::_pbi::TcParseTable<2, 3, 0, 89, 2> FigureDescriptor_BoolMapWithDefault::_table_ = {
-  {
-    PROTOBUF_FIELD_OFFSET(FigureDescriptor_BoolMapWithDefault, _impl_._has_bits_),
-    0, // no _extensions_
-    3, 24,  // max_field_number, fast_idx_mask
-    offsetof(decltype(_table_), field_lookup_table),
-    4294967288,  // skipmap
-    offsetof(decltype(_table_), field_entries),
-    3,  // num_field_entries
-    0,  // num_aux_entries
-    offsetof(decltype(_table_), field_names),  // no aux_entries
-    &_FigureDescriptor_BoolMapWithDefault_default_instance_._instance,
-    ::_pbi::TcParser::GenericFallback,  // fallback
-  }, {{
-    {::_pbi::TcParser::MiniParse, {}},
-    // optional bool default_bool = 1;
-    {::_pbi::TcParser::SingularVarintNoZag1<bool, offsetof(FigureDescriptor_BoolMapWithDefault, _impl_.default_bool_), 0>(),
-     {8, 0, 0, PROTOBUF_FIELD_OFFSET(FigureDescriptor_BoolMapWithDefault, _impl_.default_bool_)}},
-    // repeated string keys = 2;
-    {::_pbi::TcParser::FastUR1,
-     {18, 63, 0, PROTOBUF_FIELD_OFFSET(FigureDescriptor_BoolMapWithDefault, _impl_.keys_)}},
-    // repeated bool values = 3;
-    {::_pbi::TcParser::FastV8P1,
-     {26, 63, 0, PROTOBUF_FIELD_OFFSET(FigureDescriptor_BoolMapWithDefault, _impl_.values_)}},
-  }}, {{
-    65535, 65535
-  }}, {{
-    // optional bool default_bool = 1;
-    {PROTOBUF_FIELD_OFFSET(FigureDescriptor_BoolMapWithDefault, _impl_.default_bool_), _Internal::kHasBitsOffset + 0, 0,
-    (0 | ::_fl::kFcOptional | ::_fl::kBool)},
-    // repeated string keys = 2;
-    {PROTOBUF_FIELD_OFFSET(FigureDescriptor_BoolMapWithDefault, _impl_.keys_), -1, 0,
-    (0 | ::_fl::kFcRepeated | ::_fl::kUtf8String | ::_fl::kRepSString)},
-    // repeated bool values = 3;
-    {PROTOBUF_FIELD_OFFSET(FigureDescriptor_BoolMapWithDefault, _impl_.values_), -1, 0,
-    (0 | ::_fl::kFcRepeated | ::_fl::kPackedBool)},
-  }},
-  // no aux_entries
-  {{
-    "\114\0\4\0\0\0\0\0"
-    "io.deephaven.proto.backplane.script.grpc.FigureDescriptor.BoolMapWithDefault"
-    "keys"
-  }},
-};
-
-::uint8_t* FigureDescriptor_BoolMapWithDefault::_InternalSerialize(
-    ::uint8_t* target,
-    ::google::protobuf::io::EpsCopyOutputStream* stream) const {
-  // @@protoc_insertion_point(serialize_to_array_start:io.deephaven.proto.backplane.script.grpc.FigureDescriptor.BoolMapWithDefault)
-  ::uint32_t cached_has_bits = 0;
-  (void)cached_has_bits;
-
-  cached_has_bits = _impl_._has_bits_[0];
-  // optional bool default_bool = 1;
-  if (cached_has_bits & 0x00000001u) {
-    target = stream->EnsureSpace(target);
-    target = ::_pbi::WireFormatLite::WriteBoolToArray(
-        1, this->_internal_default_bool(), target);
-  }
-
-  // repeated string keys = 2;
-  for (int i = 0, n = this->_internal_keys_size(); i < n; ++i) {
-    const auto& s = this->_internal_keys().Get(i);
-    ::google::protobuf::internal::WireFormatLite::VerifyUtf8String(
-        s.data(), static_cast<int>(s.length()), ::google::protobuf::internal::WireFormatLite::SERIALIZE, "io.deephaven.proto.backplane.script.grpc.FigureDescriptor.BoolMapWithDefault.keys");
-    target = stream->WriteString(2, s, target);
-  }
-
-  // repeated bool values = 3;
-  if (this->_internal_values_size() > 0) {
-    target = stream->WriteFixedPacked(3, _internal_values(), target);
-  }
-
-  if (PROTOBUF_PREDICT_FALSE(_internal_metadata_.have_unknown_fields())) {
-    target =
-        ::_pbi::WireFormat::InternalSerializeUnknownFieldsToArray(
-            _internal_metadata_.unknown_fields<::google::protobuf::UnknownFieldSet>(::google::protobuf::UnknownFieldSet::default_instance), target, stream);
-  }
-  // @@protoc_insertion_point(serialize_to_array_end:io.deephaven.proto.backplane.script.grpc.FigureDescriptor.BoolMapWithDefault)
-  return target;
-}
-
-::size_t FigureDescriptor_BoolMapWithDefault::ByteSizeLong() const {
-// @@protoc_insertion_point(message_byte_size_start:io.deephaven.proto.backplane.script.grpc.FigureDescriptor.BoolMapWithDefault)
-  ::size_t total_size = 0;
-
-  ::uint32_t cached_has_bits = 0;
-  // Prevent compiler warnings about cached_has_bits being unused
-  (void) cached_has_bits;
-
-  // repeated string keys = 2;
-  total_size += 1 * ::google::protobuf::internal::FromIntSize(_internal_keys().size());
-  for (int i = 0, n = _internal_keys().size(); i < n; ++i) {
-    total_size += ::google::protobuf::internal::WireFormatLite::StringSize(
-        _internal_keys().Get(i));
-  }
-  // repeated bool values = 3;
-  {
-    std::size_t data_size = std::size_t{1} *
-        ::_pbi::FromIntSize(this->_internal_values_size())
-    ;
-    std::size_t tag_size = data_size == 0
-        ? 0
-        : 1 + ::_pbi::WireFormatLite::Int32Size(
-                            static_cast<int32_t>(data_size))
-    ;
-    total_size += tag_size + data_size;
-  }
-  // optional bool default_bool = 1;
-  cached_has_bits = _impl_._has_bits_[0];
-  if (cached_has_bits & 0x00000001u) {
-    total_size += 2;
-  }
-
-  return MaybeComputeUnknownFieldsSize(total_size, &_impl_._cached_size_);
-}
-
-const ::google::protobuf::Message::ClassData FigureDescriptor_BoolMapWithDefault::_class_data_ = {
-    FigureDescriptor_BoolMapWithDefault::MergeImpl,
-    nullptr,  // OnDemandRegisterArenaDtor
-};
-const ::google::protobuf::Message::ClassData* FigureDescriptor_BoolMapWithDefault::GetClassData() const {
-  return &_class_data_;
-}
-
-void FigureDescriptor_BoolMapWithDefault::MergeImpl(::google::protobuf::Message& to_msg, const ::google::protobuf::Message& from_msg) {
-  auto* const _this = static_cast<FigureDescriptor_BoolMapWithDefault*>(&to_msg);
-  auto& from = static_cast<const FigureDescriptor_BoolMapWithDefault&>(from_msg);
-  // @@protoc_insertion_point(class_specific_merge_from_start:io.deephaven.proto.backplane.script.grpc.FigureDescriptor.BoolMapWithDefault)
-  ABSL_DCHECK_NE(&from, _this);
-  ::uint32_t cached_has_bits = 0;
-  (void) cached_has_bits;
-
-  _this->_internal_mutable_keys()->MergeFrom(from._internal_keys());
-  _this->_internal_mutable_values()->MergeFrom(from._internal_values());
-  if ((from._impl_._has_bits_[0] & 0x00000001u) != 0) {
-    _this->_internal_set_default_bool(from._internal_default_bool());
-  }
-  _this->_internal_metadata_.MergeFrom<::google::protobuf::UnknownFieldSet>(from._internal_metadata_);
-}
-
-void FigureDescriptor_BoolMapWithDefault::CopyFrom(const FigureDescriptor_BoolMapWithDefault& from) {
-// @@protoc_insertion_point(class_specific_copy_from_start:io.deephaven.proto.backplane.script.grpc.FigureDescriptor.BoolMapWithDefault)
-  if (&from == this) return;
-  Clear();
-  MergeFrom(from);
-}
-
-PROTOBUF_NOINLINE bool FigureDescriptor_BoolMapWithDefault::IsInitialized() const {
-  return true;
-}
-
-::_pbi::CachedSize* FigureDescriptor_BoolMapWithDefault::AccessCachedSize() const {
-  return &_impl_._cached_size_;
-}
-void FigureDescriptor_BoolMapWithDefault::InternalSwap(FigureDescriptor_BoolMapWithDefault* PROTOBUF_RESTRICT other) {
-  using std::swap;
-  _internal_metadata_.InternalSwap(&other->_internal_metadata_);
-  swap(_impl_._has_bits_[0], other->_impl_._has_bits_[0]);
-  _impl_.keys_.InternalSwap(&other->_impl_.keys_);
-  _impl_.values_.InternalSwap(&other->_impl_.values_);
-        swap(_impl_.default_bool_, other->_impl_.default_bool_);
-}
-
-::google::protobuf::Metadata FigureDescriptor_BoolMapWithDefault::GetMetadata() const {
-  return ::_pbi::AssignDescriptors(
-      &descriptor_table_deephaven_2fproto_2fconsole_2eproto_getter, &descriptor_table_deephaven_2fproto_2fconsole_2eproto_once,
-      file_level_metadata_deephaven_2fproto_2fconsole_2eproto[50]);
-}
-// ===================================================================
-
-class FigureDescriptor_AxisDescriptor::_Internal {
- public:
-  using HasBits = decltype(std::declval<FigureDescriptor_AxisDescriptor>()._impl_._has_bits_);
-  static constexpr ::int32_t kHasBitsOffset =
-    8 * PROTOBUF_FIELD_OFFSET(FigureDescriptor_AxisDescriptor, _impl_._has_bits_);
-  static void set_has_format_pattern(HasBits* has_bits) {
-    (*has_bits)[0] |= 1u;
-  }
-  static void set_has_gap_between_major_ticks(HasBits* has_bits) {
-    (*has_bits)[0] |= 4u;
-  }
-  static const ::io::deephaven::proto::backplane::script::grpc::FigureDescriptor_BusinessCalendarDescriptor& business_calendar_descriptor(const FigureDescriptor_AxisDescriptor* msg);
-  static void set_has_business_calendar_descriptor(HasBits* has_bits) {
-    (*has_bits)[0] |= 2u;
-  }
-};
-
-const ::io::deephaven::proto::backplane::script::grpc::FigureDescriptor_BusinessCalendarDescriptor& FigureDescriptor_AxisDescriptor::_Internal::business_calendar_descriptor(const FigureDescriptor_AxisDescriptor* msg) {
-  return *msg->_impl_.business_calendar_descriptor_;
-}
-FigureDescriptor_AxisDescriptor::FigureDescriptor_AxisDescriptor(::google::protobuf::Arena* arena)
-    : ::google::protobuf::Message(arena) {
-  SharedCtor(arena);
-  // @@protoc_insertion_point(arena_constructor:io.deephaven.proto.backplane.script.grpc.FigureDescriptor.AxisDescriptor)
-}
-inline PROTOBUF_NDEBUG_INLINE FigureDescriptor_AxisDescriptor::Impl_::Impl_(
-    ::google::protobuf::internal::InternalVisibility visibility, ::google::protobuf::Arena* arena,
-    const Impl_& from)
-      : _has_bits_{from._has_bits_},
-        _cached_size_{0},
-        major_tick_locations_{visibility, arena, from.major_tick_locations_},
-        id_(arena, from.id_),
-        label_(arena, from.label_),
-        label_font_(arena, from.label_font_),
-        ticks_font_(arena, from.ticks_font_),
-        format_pattern_(arena, from.format_pattern_),
-        color_(arena, from.color_) {}
-
-FigureDescriptor_AxisDescriptor::FigureDescriptor_AxisDescriptor(
-    ::google::protobuf::Arena* arena,
-    const FigureDescriptor_AxisDescriptor& from)
-    : ::google::protobuf::Message(arena) {
-  FigureDescriptor_AxisDescriptor* const _this = this;
-  (void)_this;
-  _internal_metadata_.MergeFrom<::google::protobuf::UnknownFieldSet>(
-      from._internal_metadata_);
-  new (&_impl_) Impl_(internal_visibility(), arena, from._impl_);
-  ::uint32_t cached_has_bits = _impl_._has_bits_[0];
-  _impl_.business_calendar_descriptor_ = (cached_has_bits & 0x00000002u)
-                ? CreateMaybeMessage<::io::deephaven::proto::backplane::script::grpc::FigureDescriptor_BusinessCalendarDescriptor>(arena, *from._impl_.business_calendar_descriptor_)
-                : nullptr;
-  ::memcpy(reinterpret_cast<char *>(&_impl_) +
-               offsetof(Impl_, format_type_),
-           reinterpret_cast<const char *>(&from._impl_) +
-               offsetof(Impl_, format_type_),
-           offsetof(Impl_, tick_label_angle_) -
-               offsetof(Impl_, format_type_) +
-               sizeof(Impl_::tick_label_angle_));
-
-  // @@protoc_insertion_point(copy_constructor:io.deephaven.proto.backplane.script.grpc.FigureDescriptor.AxisDescriptor)
-}
-inline PROTOBUF_NDEBUG_INLINE FigureDescriptor_AxisDescriptor::Impl_::Impl_(
-    ::google::protobuf::internal::InternalVisibility visibility,
-    ::google::protobuf::Arena* arena)
-      : _cached_size_{0},
-        major_tick_locations_{visibility, arena},
-        id_(arena),
-        label_(arena),
-        label_font_(arena),
-        ticks_font_(arena),
-        format_pattern_(arena),
-        color_(arena) {}
-
-inline void FigureDescriptor_AxisDescriptor::SharedCtor(::_pb::Arena* arena) {
-  new (&_impl_) Impl_(internal_visibility(), arena);
-  ::memset(reinterpret_cast<char *>(&_impl_) +
-               offsetof(Impl_, business_calendar_descriptor_),
-           0,
-           offsetof(Impl_, tick_label_angle_) -
-               offsetof(Impl_, business_calendar_descriptor_) +
-               sizeof(Impl_::tick_label_angle_));
-}
-FigureDescriptor_AxisDescriptor::~FigureDescriptor_AxisDescriptor() {
-  // @@protoc_insertion_point(destructor:io.deephaven.proto.backplane.script.grpc.FigureDescriptor.AxisDescriptor)
-  _internal_metadata_.Delete<::google::protobuf::UnknownFieldSet>();
-  SharedDtor();
-}
-inline void FigureDescriptor_AxisDescriptor::SharedDtor() {
-  ABSL_DCHECK(GetArena() == nullptr);
-  _impl_.id_.Destroy();
-  _impl_.label_.Destroy();
-  _impl_.label_font_.Destroy();
-  _impl_.ticks_font_.Destroy();
-  _impl_.format_pattern_.Destroy();
-  _impl_.color_.Destroy();
-  delete _impl_.business_calendar_descriptor_;
-  _impl_.~Impl_();
-}
-
-PROTOBUF_NOINLINE void FigureDescriptor_AxisDescriptor::Clear() {
-// @@protoc_insertion_point(message_clear_start:io.deephaven.proto.backplane.script.grpc.FigureDescriptor.AxisDescriptor)
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  ::uint32_t cached_has_bits = 0;
-  // Prevent compiler warnings about cached_has_bits being unused
-  (void) cached_has_bits;
-
-  _impl_.major_tick_locations_.Clear();
-  _impl_.id_.ClearToEmpty();
-  _impl_.label_.ClearToEmpty();
-  _impl_.label_font_.ClearToEmpty();
-  _impl_.ticks_font_.ClearToEmpty();
-  cached_has_bits = _impl_._has_bits_[0];
-  if (cached_has_bits & 0x00000001u) {
-    _impl_.format_pattern_.ClearNonDefaultToEmpty();
-  }
-  _impl_.color_.ClearToEmpty();
-  if (cached_has_bits & 0x00000002u) {
-    ABSL_DCHECK(_impl_.business_calendar_descriptor_ != nullptr);
-    _impl_.business_calendar_descriptor_->Clear();
-  }
-  ::memset(&_impl_.format_type_, 0, static_cast<::size_t>(
-      reinterpret_cast<char*>(&_impl_.max_range_) -
-      reinterpret_cast<char*>(&_impl_.format_type_)) + sizeof(_impl_.max_range_));
-  _impl_.gap_between_major_ticks_ = 0;
-  ::memset(&_impl_.minor_tick_count_, 0, static_cast<::size_t>(
-      reinterpret_cast<char*>(&_impl_.tick_label_angle_) -
-      reinterpret_cast<char*>(&_impl_.minor_tick_count_)) + sizeof(_impl_.tick_label_angle_));
-  _impl_._has_bits_.Clear();
-  _internal_metadata_.Clear<::google::protobuf::UnknownFieldSet>();
-}
-
-const char* FigureDescriptor_AxisDescriptor::_InternalParse(
-    const char* ptr, ::_pbi::ParseContext* ctx) {
-  ptr = ::_pbi::TcParser::ParseLoop(this, ptr, ctx, &_table_.header);
-  return ptr;
-}
-
-
-PROTOBUF_CONSTINIT PROTOBUF_ATTRIBUTE_INIT_PRIORITY1
-const ::_pbi::TcParseTable<5, 21, 1, 143, 2> FigureDescriptor_AxisDescriptor::_table_ = {
-  {
-    PROTOBUF_FIELD_OFFSET(FigureDescriptor_AxisDescriptor, _impl_._has_bits_),
-    0, // no _extensions_
-    21, 248,  // max_field_number, fast_idx_mask
-    offsetof(decltype(_table_), field_lookup_table),
-    4292870144,  // skipmap
-    offsetof(decltype(_table_), field_entries),
-    21,  // num_field_entries
-    1,  // num_aux_entries
-    offsetof(decltype(_table_), aux_entries),
-    &_FigureDescriptor_AxisDescriptor_default_instance_._instance,
-    ::_pbi::TcParser::GenericFallback,  // fallback
-  }, {{
-    {::_pbi::TcParser::MiniParse, {}},
-    // string id = 1;
-    {::_pbi::TcParser::FastUS1,
-     {10, 63, 0, PROTOBUF_FIELD_OFFSET(FigureDescriptor_AxisDescriptor, _impl_.id_)}},
-    // .io.deephaven.proto.backplane.script.grpc.FigureDescriptor.AxisDescriptor.AxisFormatType format_type = 2;
-    {::_pbi::TcParser::SingularVarintNoZag1<::uint32_t, offsetof(FigureDescriptor_AxisDescriptor, _impl_.format_type_), 63>(),
-     {16, 63, 0, PROTOBUF_FIELD_OFFSET(FigureDescriptor_AxisDescriptor, _impl_.format_type_)}},
-    // .io.deephaven.proto.backplane.script.grpc.FigureDescriptor.AxisDescriptor.AxisType type = 3;
-    {::_pbi::TcParser::SingularVarintNoZag1<::uint32_t, offsetof(FigureDescriptor_AxisDescriptor, _impl_.type_), 63>(),
-     {24, 63, 0, PROTOBUF_FIELD_OFFSET(FigureDescriptor_AxisDescriptor, _impl_.type_)}},
-    // .io.deephaven.proto.backplane.script.grpc.FigureDescriptor.AxisDescriptor.AxisPosition position = 4;
-    {::_pbi::TcParser::SingularVarintNoZag1<::uint32_t, offsetof(FigureDescriptor_AxisDescriptor, _impl_.position_), 63>(),
-     {32, 63, 0, PROTOBUF_FIELD_OFFSET(FigureDescriptor_AxisDescriptor, _impl_.position_)}},
-    // bool log = 5;
-    {::_pbi::TcParser::SingularVarintNoZag1<bool, offsetof(FigureDescriptor_AxisDescriptor, _impl_.log_), 63>(),
-     {40, 63, 0, PROTOBUF_FIELD_OFFSET(FigureDescriptor_AxisDescriptor, _impl_.log_)}},
-    // string label = 6;
-    {::_pbi::TcParser::FastUS1,
-     {50, 63, 0, PROTOBUF_FIELD_OFFSET(FigureDescriptor_AxisDescriptor, _impl_.label_)}},
-    // string label_font = 7;
-    {::_pbi::TcParser::FastUS1,
-     {58, 63, 0, PROTOBUF_FIELD_OFFSET(FigureDescriptor_AxisDescriptor, _impl_.label_font_)}},
-    // string ticks_font = 8;
-    {::_pbi::TcParser::FastUS1,
-     {66, 63, 0, PROTOBUF_FIELD_OFFSET(FigureDescriptor_AxisDescriptor, _impl_.ticks_font_)}},
-    // optional string format_pattern = 9;
-    {::_pbi::TcParser::FastUS1,
-     {74, 0, 0, PROTOBUF_FIELD_OFFSET(FigureDescriptor_AxisDescriptor, _impl_.format_pattern_)}},
-    // string color = 10;
-    {::_pbi::TcParser::FastUS1,
-     {82, 63, 0, PROTOBUF_FIELD_OFFSET(FigureDescriptor_AxisDescriptor, _impl_.color_)}},
-    // double min_range = 11;
-    {::_pbi::TcParser::FastF64S1,
-     {89, 63, 0, PROTOBUF_FIELD_OFFSET(FigureDescriptor_AxisDescriptor, _impl_.min_range_)}},
-    // double max_range = 12;
-    {::_pbi::TcParser::FastF64S1,
-     {97, 63, 0, PROTOBUF_FIELD_OFFSET(FigureDescriptor_AxisDescriptor, _impl_.max_range_)}},
-    // bool minor_ticks_visible = 13;
-    {::_pbi::TcParser::SingularVarintNoZag1<bool, offsetof(FigureDescriptor_AxisDescriptor, _impl_.minor_ticks_visible_), 63>(),
-     {104, 63, 0, PROTOBUF_FIELD_OFFSET(FigureDescriptor_AxisDescriptor, _impl_.minor_ticks_visible_)}},
-    // bool major_ticks_visible = 14;
-    {::_pbi::TcParser::SingularVarintNoZag1<bool, offsetof(FigureDescriptor_AxisDescriptor, _impl_.major_ticks_visible_), 63>(),
-     {112, 63, 0, PROTOBUF_FIELD_OFFSET(FigureDescriptor_AxisDescriptor, _impl_.major_ticks_visible_)}},
-    // int32 minor_tick_count = 15;
-    {::_pbi::TcParser::SingularVarintNoZag1<::uint32_t, offsetof(FigureDescriptor_AxisDescriptor, _impl_.minor_tick_count_), 63>(),
-     {120, 63, 0, PROTOBUF_FIELD_OFFSET(FigureDescriptor_AxisDescriptor, _impl_.minor_tick_count_)}},
-    // optional double gap_between_major_ticks = 16;
-    {::_pbi::TcParser::FastF64S2,
-     {385, 2, 0, PROTOBUF_FIELD_OFFSET(FigureDescriptor_AxisDescriptor, _impl_.gap_between_major_ticks_)}},
-    // repeated double major_tick_locations = 17;
-    {::_pbi::TcParser::FastF64P2,
-     {394, 63, 0, PROTOBUF_FIELD_OFFSET(FigureDescriptor_AxisDescriptor, _impl_.major_tick_locations_)}},
-    // double tick_label_angle = 18;
-    {::_pbi::TcParser::FastF64S2,
-     {401, 63, 0, PROTOBUF_FIELD_OFFSET(FigureDescriptor_AxisDescriptor, _impl_.tick_label_angle_)}},
-    // bool invert = 19;
-    {::_pbi::TcParser::FastV8S2,
-     {408, 63, 0, PROTOBUF_FIELD_OFFSET(FigureDescriptor_AxisDescriptor, _impl_.invert_)}},
-    // bool is_time_axis = 20;
-    {::_pbi::TcParser::FastV8S2,
-     {416, 63, 0, PROTOBUF_FIELD_OFFSET(FigureDescriptor_AxisDescriptor, _impl_.is_time_axis_)}},
-    // .io.deephaven.proto.backplane.script.grpc.FigureDescriptor.BusinessCalendarDescriptor business_calendar_descriptor = 21;
-    {::_pbi::TcParser::FastMtS2,
-     {426, 1, 0, PROTOBUF_FIELD_OFFSET(FigureDescriptor_AxisDescriptor, _impl_.business_calendar_descriptor_)}},
-    {::_pbi::TcParser::MiniParse, {}},
-    {::_pbi::TcParser::MiniParse, {}},
-    {::_pbi::TcParser::MiniParse, {}},
-    {::_pbi::TcParser::MiniParse, {}},
-    {::_pbi::TcParser::MiniParse, {}},
-    {::_pbi::TcParser::MiniParse, {}},
-    {::_pbi::TcParser::MiniParse, {}},
-    {::_pbi::TcParser::MiniParse, {}},
-    {::_pbi::TcParser::MiniParse, {}},
-    {::_pbi::TcParser::MiniParse, {}},
-  }}, {{
-    65535, 65535
-  }}, {{
-    // string id = 1;
-    {PROTOBUF_FIELD_OFFSET(FigureDescriptor_AxisDescriptor, _impl_.id_), -1, 0,
-    (0 | ::_fl::kFcSingular | ::_fl::kUtf8String | ::_fl::kRepAString)},
-    // .io.deephaven.proto.backplane.script.grpc.FigureDescriptor.AxisDescriptor.AxisFormatType format_type = 2;
-    {PROTOBUF_FIELD_OFFSET(FigureDescriptor_AxisDescriptor, _impl_.format_type_), -1, 0,
-    (0 | ::_fl::kFcSingular | ::_fl::kOpenEnum)},
-    // .io.deephaven.proto.backplane.script.grpc.FigureDescriptor.AxisDescriptor.AxisType type = 3;
-    {PROTOBUF_FIELD_OFFSET(FigureDescriptor_AxisDescriptor, _impl_.type_), -1, 0,
-    (0 | ::_fl::kFcSingular | ::_fl::kOpenEnum)},
-    // .io.deephaven.proto.backplane.script.grpc.FigureDescriptor.AxisDescriptor.AxisPosition position = 4;
-    {PROTOBUF_FIELD_OFFSET(FigureDescriptor_AxisDescriptor, _impl_.position_), -1, 0,
-    (0 | ::_fl::kFcSingular | ::_fl::kOpenEnum)},
-    // bool log = 5;
-    {PROTOBUF_FIELD_OFFSET(FigureDescriptor_AxisDescriptor, _impl_.log_), -1, 0,
-    (0 | ::_fl::kFcSingular | ::_fl::kBool)},
-    // string label = 6;
-    {PROTOBUF_FIELD_OFFSET(FigureDescriptor_AxisDescriptor, _impl_.label_), -1, 0,
-    (0 | ::_fl::kFcSingular | ::_fl::kUtf8String | ::_fl::kRepAString)},
-    // string label_font = 7;
-    {PROTOBUF_FIELD_OFFSET(FigureDescriptor_AxisDescriptor, _impl_.label_font_), -1, 0,
-    (0 | ::_fl::kFcSingular | ::_fl::kUtf8String | ::_fl::kRepAString)},
-    // string ticks_font = 8;
-    {PROTOBUF_FIELD_OFFSET(FigureDescriptor_AxisDescriptor, _impl_.ticks_font_), -1, 0,
-    (0 | ::_fl::kFcSingular | ::_fl::kUtf8String | ::_fl::kRepAString)},
-    // optional string format_pattern = 9;
-    {PROTOBUF_FIELD_OFFSET(FigureDescriptor_AxisDescriptor, _impl_.format_pattern_), _Internal::kHasBitsOffset + 0, 0,
-    (0 | ::_fl::kFcOptional | ::_fl::kUtf8String | ::_fl::kRepAString)},
-    // string color = 10;
-    {PROTOBUF_FIELD_OFFSET(FigureDescriptor_AxisDescriptor, _impl_.color_), -1, 0,
-    (0 | ::_fl::kFcSingular | ::_fl::kUtf8String | ::_fl::kRepAString)},
-    // double min_range = 11;
-    {PROTOBUF_FIELD_OFFSET(FigureDescriptor_AxisDescriptor, _impl_.min_range_), -1, 0,
-    (0 | ::_fl::kFcSingular | ::_fl::kDouble)},
-    // double max_range = 12;
-    {PROTOBUF_FIELD_OFFSET(FigureDescriptor_AxisDescriptor, _impl_.max_range_), -1, 0,
-    (0 | ::_fl::kFcSingular | ::_fl::kDouble)},
-    // bool minor_ticks_visible = 13;
-    {PROTOBUF_FIELD_OFFSET(FigureDescriptor_AxisDescriptor, _impl_.minor_ticks_visible_), -1, 0,
-    (0 | ::_fl::kFcSingular | ::_fl::kBool)},
-    // bool major_ticks_visible = 14;
-    {PROTOBUF_FIELD_OFFSET(FigureDescriptor_AxisDescriptor, _impl_.major_ticks_visible_), -1, 0,
-    (0 | ::_fl::kFcSingular | ::_fl::kBool)},
-    // int32 minor_tick_count = 15;
-    {PROTOBUF_FIELD_OFFSET(FigureDescriptor_AxisDescriptor, _impl_.minor_tick_count_), -1, 0,
-    (0 | ::_fl::kFcSingular | ::_fl::kInt32)},
-    // optional double gap_between_major_ticks = 16;
-    {PROTOBUF_FIELD_OFFSET(FigureDescriptor_AxisDescriptor, _impl_.gap_between_major_ticks_), _Internal::kHasBitsOffset + 2, 0,
-    (0 | ::_fl::kFcOptional | ::_fl::kDouble)},
-    // repeated double major_tick_locations = 17;
-    {PROTOBUF_FIELD_OFFSET(FigureDescriptor_AxisDescriptor, _impl_.major_tick_locations_), -1, 0,
-    (0 | ::_fl::kFcRepeated | ::_fl::kPackedDouble)},
-    // double tick_label_angle = 18;
-    {PROTOBUF_FIELD_OFFSET(FigureDescriptor_AxisDescriptor, _impl_.tick_label_angle_), -1, 0,
-    (0 | ::_fl::kFcSingular | ::_fl::kDouble)},
-    // bool invert = 19;
-    {PROTOBUF_FIELD_OFFSET(FigureDescriptor_AxisDescriptor, _impl_.invert_), -1, 0,
-    (0 | ::_fl::kFcSingular | ::_fl::kBool)},
-    // bool is_time_axis = 20;
-    {PROTOBUF_FIELD_OFFSET(FigureDescriptor_AxisDescriptor, _impl_.is_time_axis_), -1, 0,
-    (0 | ::_fl::kFcSingular | ::_fl::kBool)},
-    // .io.deephaven.proto.backplane.script.grpc.FigureDescriptor.BusinessCalendarDescriptor business_calendar_descriptor = 21;
-    {PROTOBUF_FIELD_OFFSET(FigureDescriptor_AxisDescriptor, _impl_.business_calendar_descriptor_), _Internal::kHasBitsOffset + 1, 0,
-    (0 | ::_fl::kFcOptional | ::_fl::kMessage | ::_fl::kTvTable)},
-  }}, {{
-    {::_pbi::TcParser::GetTable<::io::deephaven::proto::backplane::script::grpc::FigureDescriptor_BusinessCalendarDescriptor>()},
-  }}, {{
-    "\110\2\0\0\0\0\5\12\12\16\5\0\0\0\0\0\0\0\0\0\0\0\0\0"
-    "io.deephaven.proto.backplane.script.grpc.FigureDescriptor.AxisDescriptor"
-    "id"
-    "label"
-    "label_font"
-    "ticks_font"
-    "format_pattern"
-    "color"
-  }},
-};
-
-::uint8_t* FigureDescriptor_AxisDescriptor::_InternalSerialize(
-    ::uint8_t* target,
-    ::google::protobuf::io::EpsCopyOutputStream* stream) const {
-  // @@protoc_insertion_point(serialize_to_array_start:io.deephaven.proto.backplane.script.grpc.FigureDescriptor.AxisDescriptor)
-  ::uint32_t cached_has_bits = 0;
-  (void)cached_has_bits;
-
-  // string id = 1;
-  if (!this->_internal_id().empty()) {
-    const std::string& _s = this->_internal_id();
-    ::google::protobuf::internal::WireFormatLite::VerifyUtf8String(
-        _s.data(), static_cast<int>(_s.length()), ::google::protobuf::internal::WireFormatLite::SERIALIZE, "io.deephaven.proto.backplane.script.grpc.FigureDescriptor.AxisDescriptor.id");
-    target = stream->WriteStringMaybeAliased(1, _s, target);
-  }
-
-  // .io.deephaven.proto.backplane.script.grpc.FigureDescriptor.AxisDescriptor.AxisFormatType format_type = 2;
-  if (this->_internal_format_type() != 0) {
-    target = stream->EnsureSpace(target);
-    target = ::_pbi::WireFormatLite::WriteEnumToArray(
-        2, this->_internal_format_type(), target);
-  }
-
-  // .io.deephaven.proto.backplane.script.grpc.FigureDescriptor.AxisDescriptor.AxisType type = 3;
-  if (this->_internal_type() != 0) {
-    target = stream->EnsureSpace(target);
-    target = ::_pbi::WireFormatLite::WriteEnumToArray(
-        3, this->_internal_type(), target);
-  }
-
-  // .io.deephaven.proto.backplane.script.grpc.FigureDescriptor.AxisDescriptor.AxisPosition position = 4;
-  if (this->_internal_position() != 0) {
-    target = stream->EnsureSpace(target);
-    target = ::_pbi::WireFormatLite::WriteEnumToArray(
-        4, this->_internal_position(), target);
-  }
-
-  // bool log = 5;
-  if (this->_internal_log() != 0) {
-    target = stream->EnsureSpace(target);
-    target = ::_pbi::WireFormatLite::WriteBoolToArray(
-        5, this->_internal_log(), target);
-  }
-
-  // string label = 6;
-  if (!this->_internal_label().empty()) {
-    const std::string& _s = this->_internal_label();
-    ::google::protobuf::internal::WireFormatLite::VerifyUtf8String(
-        _s.data(), static_cast<int>(_s.length()), ::google::protobuf::internal::WireFormatLite::SERIALIZE, "io.deephaven.proto.backplane.script.grpc.FigureDescriptor.AxisDescriptor.label");
-    target = stream->WriteStringMaybeAliased(6, _s, target);
-  }
-
-  // string label_font = 7;
-  if (!this->_internal_label_font().empty()) {
-    const std::string& _s = this->_internal_label_font();
-    ::google::protobuf::internal::WireFormatLite::VerifyUtf8String(
-        _s.data(), static_cast<int>(_s.length()), ::google::protobuf::internal::WireFormatLite::SERIALIZE, "io.deephaven.proto.backplane.script.grpc.FigureDescriptor.AxisDescriptor.label_font");
-    target = stream->WriteStringMaybeAliased(7, _s, target);
-  }
-
-  // string ticks_font = 8;
-  if (!this->_internal_ticks_font().empty()) {
-    const std::string& _s = this->_internal_ticks_font();
-    ::google::protobuf::internal::WireFormatLite::VerifyUtf8String(
-        _s.data(), static_cast<int>(_s.length()), ::google::protobuf::internal::WireFormatLite::SERIALIZE, "io.deephaven.proto.backplane.script.grpc.FigureDescriptor.AxisDescriptor.ticks_font");
-    target = stream->WriteStringMaybeAliased(8, _s, target);
-  }
-
-  cached_has_bits = _impl_._has_bits_[0];
-  // optional string format_pattern = 9;
-  if (cached_has_bits & 0x00000001u) {
-    const std::string& _s = this->_internal_format_pattern();
-    ::google::protobuf::internal::WireFormatLite::VerifyUtf8String(
-        _s.data(), static_cast<int>(_s.length()), ::google::protobuf::internal::WireFormatLite::SERIALIZE, "io.deephaven.proto.backplane.script.grpc.FigureDescriptor.AxisDescriptor.format_pattern");
-    target = stream->WriteStringMaybeAliased(9, _s, target);
-  }
-
-  // string color = 10;
-  if (!this->_internal_color().empty()) {
-    const std::string& _s = this->_internal_color();
-    ::google::protobuf::internal::WireFormatLite::VerifyUtf8String(
-        _s.data(), static_cast<int>(_s.length()), ::google::protobuf::internal::WireFormatLite::SERIALIZE, "io.deephaven.proto.backplane.script.grpc.FigureDescriptor.AxisDescriptor.color");
-    target = stream->WriteStringMaybeAliased(10, _s, target);
-  }
-
-  // double min_range = 11;
-  static_assert(sizeof(::uint64_t) == sizeof(double),
-                "Code assumes ::uint64_t and double are the same size.");
-  double tmp_min_range = this->_internal_min_range();
-  ::uint64_t raw_min_range;
-  memcpy(&raw_min_range, &tmp_min_range, sizeof(tmp_min_range));
-  if (raw_min_range != 0) {
-    target = stream->EnsureSpace(target);
-    target = ::_pbi::WireFormatLite::WriteDoubleToArray(
-        11, this->_internal_min_range(), target);
-  }
-
-  // double max_range = 12;
-  static_assert(sizeof(::uint64_t) == sizeof(double),
-                "Code assumes ::uint64_t and double are the same size.");
-  double tmp_max_range = this->_internal_max_range();
-  ::uint64_t raw_max_range;
-  memcpy(&raw_max_range, &tmp_max_range, sizeof(tmp_max_range));
-  if (raw_max_range != 0) {
-    target = stream->EnsureSpace(target);
-    target = ::_pbi::WireFormatLite::WriteDoubleToArray(
-        12, this->_internal_max_range(), target);
-  }
-
-  // bool minor_ticks_visible = 13;
-  if (this->_internal_minor_ticks_visible() != 0) {
-    target = stream->EnsureSpace(target);
-    target = ::_pbi::WireFormatLite::WriteBoolToArray(
-        13, this->_internal_minor_ticks_visible(), target);
-  }
-
-  // bool major_ticks_visible = 14;
-  if (this->_internal_major_ticks_visible() != 0) {
-    target = stream->EnsureSpace(target);
-    target = ::_pbi::WireFormatLite::WriteBoolToArray(
-        14, this->_internal_major_ticks_visible(), target);
-  }
-
-  // int32 minor_tick_count = 15;
-  if (this->_internal_minor_tick_count() != 0) {
-    target = ::google::protobuf::internal::WireFormatLite::
-        WriteInt32ToArrayWithField<15>(
-            stream, this->_internal_minor_tick_count(), target);
-  }
-
-  // optional double gap_between_major_ticks = 16;
-  if (cached_has_bits & 0x00000004u) {
-    target = stream->EnsureSpace(target);
-    target = ::_pbi::WireFormatLite::WriteDoubleToArray(
-        16, this->_internal_gap_between_major_ticks(), target);
-  }
-
-  // repeated double major_tick_locations = 17;
-  if (this->_internal_major_tick_locations_size() > 0) {
-    target = stream->WriteFixedPacked(17, _internal_major_tick_locations(), target);
-  }
-
-  // double tick_label_angle = 18;
-  static_assert(sizeof(::uint64_t) == sizeof(double),
-                "Code assumes ::uint64_t and double are the same size.");
-  double tmp_tick_label_angle = this->_internal_tick_label_angle();
-  ::uint64_t raw_tick_label_angle;
-  memcpy(&raw_tick_label_angle, &tmp_tick_label_angle, sizeof(tmp_tick_label_angle));
-  if (raw_tick_label_angle != 0) {
-    target = stream->EnsureSpace(target);
-    target = ::_pbi::WireFormatLite::WriteDoubleToArray(
-        18, this->_internal_tick_label_angle(), target);
-  }
-
-  // bool invert = 19;
-  if (this->_internal_invert() != 0) {
-    target = stream->EnsureSpace(target);
-    target = ::_pbi::WireFormatLite::WriteBoolToArray(
-        19, this->_internal_invert(), target);
-  }
-
-  // bool is_time_axis = 20;
-  if (this->_internal_is_time_axis() != 0) {
-    target = stream->EnsureSpace(target);
-    target = ::_pbi::WireFormatLite::WriteBoolToArray(
-        20, this->_internal_is_time_axis(), target);
-  }
-
-  // .io.deephaven.proto.backplane.script.grpc.FigureDescriptor.BusinessCalendarDescriptor business_calendar_descriptor = 21;
-  if (cached_has_bits & 0x00000002u) {
-    target = ::google::protobuf::internal::WireFormatLite::InternalWriteMessage(
-        21, _Internal::business_calendar_descriptor(this),
-        _Internal::business_calendar_descriptor(this).GetCachedSize(), target, stream);
-  }
-
-  if (PROTOBUF_PREDICT_FALSE(_internal_metadata_.have_unknown_fields())) {
-    target =
-        ::_pbi::WireFormat::InternalSerializeUnknownFieldsToArray(
-            _internal_metadata_.unknown_fields<::google::protobuf::UnknownFieldSet>(::google::protobuf::UnknownFieldSet::default_instance), target, stream);
-  }
-  // @@protoc_insertion_point(serialize_to_array_end:io.deephaven.proto.backplane.script.grpc.FigureDescriptor.AxisDescriptor)
-  return target;
-}
-
-::size_t FigureDescriptor_AxisDescriptor::ByteSizeLong() const {
-// @@protoc_insertion_point(message_byte_size_start:io.deephaven.proto.backplane.script.grpc.FigureDescriptor.AxisDescriptor)
-  ::size_t total_size = 0;
-
-  ::uint32_t cached_has_bits = 0;
-  // Prevent compiler warnings about cached_has_bits being unused
-  (void) cached_has_bits;
-
-  // repeated double major_tick_locations = 17;
-  {
-    std::size_t data_size = std::size_t{8} *
-        ::_pbi::FromIntSize(this->_internal_major_tick_locations_size())
-    ;
-    std::size_t tag_size = data_size == 0
-        ? 0
-        : 2 + ::_pbi::WireFormatLite::Int32Size(
-                            static_cast<int32_t>(data_size))
-    ;
-    total_size += tag_size + data_size;
-  }
-  // string id = 1;
-  if (!this->_internal_id().empty()) {
-    total_size += 1 + ::google::protobuf::internal::WireFormatLite::StringSize(
-                                    this->_internal_id());
-  }
-
-  // string label = 6;
-  if (!this->_internal_label().empty()) {
-    total_size += 1 + ::google::protobuf::internal::WireFormatLite::StringSize(
-                                    this->_internal_label());
-  }
-
-  // string label_font = 7;
-  if (!this->_internal_label_font().empty()) {
-    total_size += 1 + ::google::protobuf::internal::WireFormatLite::StringSize(
-                                    this->_internal_label_font());
-  }
-
-  // string ticks_font = 8;
-  if (!this->_internal_ticks_font().empty()) {
-    total_size += 1 + ::google::protobuf::internal::WireFormatLite::StringSize(
-                                    this->_internal_ticks_font());
-  }
-
-  // optional string format_pattern = 9;
-  cached_has_bits = _impl_._has_bits_[0];
-  if (cached_has_bits & 0x00000001u) {
-    total_size += 1 + ::google::protobuf::internal::WireFormatLite::StringSize(
-                                    this->_internal_format_pattern());
-  }
-
-  // string color = 10;
-  if (!this->_internal_color().empty()) {
-    total_size += 1 + ::google::protobuf::internal::WireFormatLite::StringSize(
-                                    this->_internal_color());
-  }
-
-  // .io.deephaven.proto.backplane.script.grpc.FigureDescriptor.BusinessCalendarDescriptor business_calendar_descriptor = 21;
-  if (cached_has_bits & 0x00000002u) {
-    total_size +=
-        2 + ::google::protobuf::internal::WireFormatLite::MessageSize(*_impl_.business_calendar_descriptor_);
-  }
-
-  // .io.deephaven.proto.backplane.script.grpc.FigureDescriptor.AxisDescriptor.AxisFormatType format_type = 2;
-  if (this->_internal_format_type() != 0) {
-    total_size += 1 +
-                  ::_pbi::WireFormatLite::EnumSize(this->_internal_format_type());
-  }
-
-  // .io.deephaven.proto.backplane.script.grpc.FigureDescriptor.AxisDescriptor.AxisType type = 3;
-  if (this->_internal_type() != 0) {
-    total_size += 1 +
-                  ::_pbi::WireFormatLite::EnumSize(this->_internal_type());
-  }
-
-  // double min_range = 11;
-  static_assert(sizeof(::uint64_t) == sizeof(double),
-                "Code assumes ::uint64_t and double are the same size.");
-  double tmp_min_range = this->_internal_min_range();
-  ::uint64_t raw_min_range;
-  memcpy(&raw_min_range, &tmp_min_range, sizeof(tmp_min_range));
-  if (raw_min_range != 0) {
-    total_size += 9;
-  }
-
-  // .io.deephaven.proto.backplane.script.grpc.FigureDescriptor.AxisDescriptor.AxisPosition position = 4;
-  if (this->_internal_position() != 0) {
-    total_size += 1 +
-                  ::_pbi::WireFormatLite::EnumSize(this->_internal_position());
-  }
-
-  // bool log = 5;
-  if (this->_internal_log() != 0) {
-    total_size += 2;
-  }
-
-  // bool minor_ticks_visible = 13;
-  if (this->_internal_minor_ticks_visible() != 0) {
-    total_size += 2;
-  }
-
-  // bool major_ticks_visible = 14;
-  if (this->_internal_major_ticks_visible() != 0) {
-    total_size += 2;
-  }
-
-  // bool invert = 19;
-  if (this->_internal_invert() != 0) {
-    total_size += 3;
-  }
-
-  // double max_range = 12;
-  static_assert(sizeof(::uint64_t) == sizeof(double),
-                "Code assumes ::uint64_t and double are the same size.");
-  double tmp_max_range = this->_internal_max_range();
-  ::uint64_t raw_max_range;
-  memcpy(&raw_max_range, &tmp_max_range, sizeof(tmp_max_range));
-  if (raw_max_range != 0) {
-    total_size += 9;
-  }
-
-  // optional double gap_between_major_ticks = 16;
-  if (cached_has_bits & 0x00000004u) {
-    total_size += 10;
-  }
-
-  // int32 minor_tick_count = 15;
-  if (this->_internal_minor_tick_count() != 0) {
-    total_size += ::_pbi::WireFormatLite::Int32SizePlusOne(
-        this->_internal_minor_tick_count());
-  }
-
-  // bool is_time_axis = 20;
-  if (this->_internal_is_time_axis() != 0) {
-    total_size += 3;
-  }
-
-  // double tick_label_angle = 18;
-  static_assert(sizeof(::uint64_t) == sizeof(double),
-                "Code assumes ::uint64_t and double are the same size.");
-  double tmp_tick_label_angle = this->_internal_tick_label_angle();
-  ::uint64_t raw_tick_label_angle;
-  memcpy(&raw_tick_label_angle, &tmp_tick_label_angle, sizeof(tmp_tick_label_angle));
-  if (raw_tick_label_angle != 0) {
-    total_size += 10;
-  }
-
-  return MaybeComputeUnknownFieldsSize(total_size, &_impl_._cached_size_);
-}
-
-const ::google::protobuf::Message::ClassData FigureDescriptor_AxisDescriptor::_class_data_ = {
-    FigureDescriptor_AxisDescriptor::MergeImpl,
-    nullptr,  // OnDemandRegisterArenaDtor
-};
-const ::google::protobuf::Message::ClassData* FigureDescriptor_AxisDescriptor::GetClassData() const {
-  return &_class_data_;
-}
-
-void FigureDescriptor_AxisDescriptor::MergeImpl(::google::protobuf::Message& to_msg, const ::google::protobuf::Message& from_msg) {
-  auto* const _this = static_cast<FigureDescriptor_AxisDescriptor*>(&to_msg);
-  auto& from = static_cast<const FigureDescriptor_AxisDescriptor&>(from_msg);
-  // @@protoc_insertion_point(class_specific_merge_from_start:io.deephaven.proto.backplane.script.grpc.FigureDescriptor.AxisDescriptor)
-  ABSL_DCHECK_NE(&from, _this);
-  ::uint32_t cached_has_bits = 0;
-  (void) cached_has_bits;
-
-  _this->_internal_mutable_major_tick_locations()->MergeFrom(from._internal_major_tick_locations());
-  if (!from._internal_id().empty()) {
-    _this->_internal_set_id(from._internal_id());
-  }
-  if (!from._internal_label().empty()) {
-    _this->_internal_set_label(from._internal_label());
-  }
-  if (!from._internal_label_font().empty()) {
-    _this->_internal_set_label_font(from._internal_label_font());
-  }
-  if (!from._internal_ticks_font().empty()) {
-    _this->_internal_set_ticks_font(from._internal_ticks_font());
-  }
-  if ((from._impl_._has_bits_[0] & 0x00000001u) != 0) {
-    _this->_internal_set_format_pattern(from._internal_format_pattern());
-  }
-  if (!from._internal_color().empty()) {
-    _this->_internal_set_color(from._internal_color());
-  }
-  if ((from._impl_._has_bits_[0] & 0x00000002u) != 0) {
-    _this->_internal_mutable_business_calendar_descriptor()->::io::deephaven::proto::backplane::script::grpc::FigureDescriptor_BusinessCalendarDescriptor::MergeFrom(
-        from._internal_business_calendar_descriptor());
-  }
-  if (from._internal_format_type() != 0) {
-    _this->_internal_set_format_type(from._internal_format_type());
-  }
-  if (from._internal_type() != 0) {
-    _this->_internal_set_type(from._internal_type());
-  }
-  static_assert(sizeof(::uint64_t) == sizeof(double),
-                "Code assumes ::uint64_t and double are the same size.");
-  double tmp_min_range = from._internal_min_range();
-  ::uint64_t raw_min_range;
-  memcpy(&raw_min_range, &tmp_min_range, sizeof(tmp_min_range));
-  if (raw_min_range != 0) {
-    _this->_internal_set_min_range(from._internal_min_range());
-  }
-  if (from._internal_position() != 0) {
-    _this->_internal_set_position(from._internal_position());
-  }
-  if (from._internal_log() != 0) {
-    _this->_internal_set_log(from._internal_log());
-  }
-  if (from._internal_minor_ticks_visible() != 0) {
-    _this->_internal_set_minor_ticks_visible(from._internal_minor_ticks_visible());
-  }
-  if (from._internal_major_ticks_visible() != 0) {
-    _this->_internal_set_major_ticks_visible(from._internal_major_ticks_visible());
-  }
-  if (from._internal_invert() != 0) {
-    _this->_internal_set_invert(from._internal_invert());
-  }
-  static_assert(sizeof(::uint64_t) == sizeof(double),
-                "Code assumes ::uint64_t and double are the same size.");
-  double tmp_max_range = from._internal_max_range();
-  ::uint64_t raw_max_range;
-  memcpy(&raw_max_range, &tmp_max_range, sizeof(tmp_max_range));
-  if (raw_max_range != 0) {
-    _this->_internal_set_max_range(from._internal_max_range());
-  }
-  if ((from._impl_._has_bits_[0] & 0x00000004u) != 0) {
-    _this->_internal_set_gap_between_major_ticks(from._internal_gap_between_major_ticks());
-  }
-  if (from._internal_minor_tick_count() != 0) {
-    _this->_internal_set_minor_tick_count(from._internal_minor_tick_count());
-  }
-  if (from._internal_is_time_axis() != 0) {
-    _this->_internal_set_is_time_axis(from._internal_is_time_axis());
-  }
-  static_assert(sizeof(::uint64_t) == sizeof(double),
-                "Code assumes ::uint64_t and double are the same size.");
-  double tmp_tick_label_angle = from._internal_tick_label_angle();
-  ::uint64_t raw_tick_label_angle;
-  memcpy(&raw_tick_label_angle, &tmp_tick_label_angle, sizeof(tmp_tick_label_angle));
-  if (raw_tick_label_angle != 0) {
-    _this->_internal_set_tick_label_angle(from._internal_tick_label_angle());
-  }
-  _this->_internal_metadata_.MergeFrom<::google::protobuf::UnknownFieldSet>(from._internal_metadata_);
-}
-
-void FigureDescriptor_AxisDescriptor::CopyFrom(const FigureDescriptor_AxisDescriptor& from) {
-// @@protoc_insertion_point(class_specific_copy_from_start:io.deephaven.proto.backplane.script.grpc.FigureDescriptor.AxisDescriptor)
-  if (&from == this) return;
-  Clear();
-  MergeFrom(from);
-}
-
-PROTOBUF_NOINLINE bool FigureDescriptor_AxisDescriptor::IsInitialized() const {
-  return true;
-}
-
-::_pbi::CachedSize* FigureDescriptor_AxisDescriptor::AccessCachedSize() const {
-  return &_impl_._cached_size_;
-}
-void FigureDescriptor_AxisDescriptor::InternalSwap(FigureDescriptor_AxisDescriptor* PROTOBUF_RESTRICT other) {
-  using std::swap;
-  auto* arena = GetArena();
-  ABSL_DCHECK_EQ(arena, other->GetArena());
-  _internal_metadata_.InternalSwap(&other->_internal_metadata_);
-  swap(_impl_._has_bits_[0], other->_impl_._has_bits_[0]);
-  _impl_.major_tick_locations_.InternalSwap(&other->_impl_.major_tick_locations_);
-  ::_pbi::ArenaStringPtr::InternalSwap(&_impl_.id_, &other->_impl_.id_, arena);
-  ::_pbi::ArenaStringPtr::InternalSwap(&_impl_.label_, &other->_impl_.label_, arena);
-  ::_pbi::ArenaStringPtr::InternalSwap(&_impl_.label_font_, &other->_impl_.label_font_, arena);
-  ::_pbi::ArenaStringPtr::InternalSwap(&_impl_.ticks_font_, &other->_impl_.ticks_font_, arena);
-  ::_pbi::ArenaStringPtr::InternalSwap(&_impl_.format_pattern_, &other->_impl_.format_pattern_, arena);
-  ::_pbi::ArenaStringPtr::InternalSwap(&_impl_.color_, &other->_impl_.color_, arena);
-  ::google::protobuf::internal::memswap<
-      PROTOBUF_FIELD_OFFSET(FigureDescriptor_AxisDescriptor, _impl_.tick_label_angle_)
-      + sizeof(FigureDescriptor_AxisDescriptor::_impl_.tick_label_angle_)
-      - PROTOBUF_FIELD_OFFSET(FigureDescriptor_AxisDescriptor, _impl_.business_calendar_descriptor_)>(
-          reinterpret_cast<char*>(&_impl_.business_calendar_descriptor_),
-          reinterpret_cast<char*>(&other->_impl_.business_calendar_descriptor_));
-}
-
-::google::protobuf::Metadata FigureDescriptor_AxisDescriptor::GetMetadata() const {
-  return ::_pbi::AssignDescriptors(
-      &descriptor_table_deephaven_2fproto_2fconsole_2eproto_getter, &descriptor_table_deephaven_2fproto_2fconsole_2eproto_once,
-      file_level_metadata_deephaven_2fproto_2fconsole_2eproto[51]);
-}
-// ===================================================================
-
-class FigureDescriptor_BusinessCalendarDescriptor_BusinessPeriod::_Internal {
- public:
-};
-
-FigureDescriptor_BusinessCalendarDescriptor_BusinessPeriod::FigureDescriptor_BusinessCalendarDescriptor_BusinessPeriod(::google::protobuf::Arena* arena)
-    : ::google::protobuf::Message(arena) {
-  SharedCtor(arena);
-  // @@protoc_insertion_point(arena_constructor:io.deephaven.proto.backplane.script.grpc.FigureDescriptor.BusinessCalendarDescriptor.BusinessPeriod)
-}
-inline PROTOBUF_NDEBUG_INLINE FigureDescriptor_BusinessCalendarDescriptor_BusinessPeriod::Impl_::Impl_(
-    ::google::protobuf::internal::InternalVisibility visibility, ::google::protobuf::Arena* arena,
-    const Impl_& from)
-      : open_(arena, from.open_),
-        close_(arena, from.close_),
-        _cached_size_{0} {}
-
-FigureDescriptor_BusinessCalendarDescriptor_BusinessPeriod::FigureDescriptor_BusinessCalendarDescriptor_BusinessPeriod(
-    ::google::protobuf::Arena* arena,
-    const FigureDescriptor_BusinessCalendarDescriptor_BusinessPeriod& from)
-    : ::google::protobuf::Message(arena) {
-  FigureDescriptor_BusinessCalendarDescriptor_BusinessPeriod* const _this = this;
-  (void)_this;
-  _internal_metadata_.MergeFrom<::google::protobuf::UnknownFieldSet>(
-      from._internal_metadata_);
-  new (&_impl_) Impl_(internal_visibility(), arena, from._impl_);
-
-  // @@protoc_insertion_point(copy_constructor:io.deephaven.proto.backplane.script.grpc.FigureDescriptor.BusinessCalendarDescriptor.BusinessPeriod)
-}
-inline PROTOBUF_NDEBUG_INLINE FigureDescriptor_BusinessCalendarDescriptor_BusinessPeriod::Impl_::Impl_(
-    ::google::protobuf::internal::InternalVisibility visibility,
-    ::google::protobuf::Arena* arena)
-      : open_(arena),
-        close_(arena),
-        _cached_size_{0} {}
-
-inline void FigureDescriptor_BusinessCalendarDescriptor_BusinessPeriod::SharedCtor(::_pb::Arena* arena) {
-  new (&_impl_) Impl_(internal_visibility(), arena);
-}
-FigureDescriptor_BusinessCalendarDescriptor_BusinessPeriod::~FigureDescriptor_BusinessCalendarDescriptor_BusinessPeriod() {
-  // @@protoc_insertion_point(destructor:io.deephaven.proto.backplane.script.grpc.FigureDescriptor.BusinessCalendarDescriptor.BusinessPeriod)
-  _internal_metadata_.Delete<::google::protobuf::UnknownFieldSet>();
-  SharedDtor();
-}
-inline void FigureDescriptor_BusinessCalendarDescriptor_BusinessPeriod::SharedDtor() {
-  ABSL_DCHECK(GetArena() == nullptr);
-  _impl_.open_.Destroy();
-  _impl_.close_.Destroy();
-  _impl_.~Impl_();
-}
-
-PROTOBUF_NOINLINE void FigureDescriptor_BusinessCalendarDescriptor_BusinessPeriod::Clear() {
-// @@protoc_insertion_point(message_clear_start:io.deephaven.proto.backplane.script.grpc.FigureDescriptor.BusinessCalendarDescriptor.BusinessPeriod)
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  ::uint32_t cached_has_bits = 0;
-  // Prevent compiler warnings about cached_has_bits being unused
-  (void) cached_has_bits;
-
-  _impl_.open_.ClearToEmpty();
-  _impl_.close_.ClearToEmpty();
-  _internal_metadata_.Clear<::google::protobuf::UnknownFieldSet>();
-}
-
-const char* FigureDescriptor_BusinessCalendarDescriptor_BusinessPeriod::_InternalParse(
-    const char* ptr, ::_pbi::ParseContext* ctx) {
-  ptr = ::_pbi::TcParser::ParseLoop(this, ptr, ctx, &_table_.header);
-  return ptr;
-}
-
-
-PROTOBUF_CONSTINIT PROTOBUF_ATTRIBUTE_INIT_PRIORITY1
-const ::_pbi::TcParseTable<1, 2, 0, 117, 2> FigureDescriptor_BusinessCalendarDescriptor_BusinessPeriod::_table_ = {
-  {
-    0,  // no _has_bits_
-    0, // no _extensions_
-    2, 8,  // max_field_number, fast_idx_mask
-    offsetof(decltype(_table_), field_lookup_table),
-    4294967292,  // skipmap
-    offsetof(decltype(_table_), field_entries),
-    2,  // num_field_entries
-    0,  // num_aux_entries
-    offsetof(decltype(_table_), field_names),  // no aux_entries
-    &_FigureDescriptor_BusinessCalendarDescriptor_BusinessPeriod_default_instance_._instance,
-    ::_pbi::TcParser::GenericFallback,  // fallback
-  }, {{
-    // string close = 2;
-    {::_pbi::TcParser::FastUS1,
-     {18, 63, 0, PROTOBUF_FIELD_OFFSET(FigureDescriptor_BusinessCalendarDescriptor_BusinessPeriod, _impl_.close_)}},
-    // string open = 1;
-    {::_pbi::TcParser::FastUS1,
-     {10, 63, 0, PROTOBUF_FIELD_OFFSET(FigureDescriptor_BusinessCalendarDescriptor_BusinessPeriod, _impl_.open_)}},
-  }}, {{
-    65535, 65535
-  }}, {{
-    // string open = 1;
-    {PROTOBUF_FIELD_OFFSET(FigureDescriptor_BusinessCalendarDescriptor_BusinessPeriod, _impl_.open_), 0, 0,
-    (0 | ::_fl::kFcSingular | ::_fl::kUtf8String | ::_fl::kRepAString)},
-    // string close = 2;
-    {PROTOBUF_FIELD_OFFSET(FigureDescriptor_BusinessCalendarDescriptor_BusinessPeriod, _impl_.close_), 0, 0,
-    (0 | ::_fl::kFcSingular | ::_fl::kUtf8String | ::_fl::kRepAString)},
-  }},
-  // no aux_entries
-  {{
-    "\143\4\5\0\0\0\0\0"
-    "io.deephaven.proto.backplane.script.grpc.FigureDescriptor.BusinessCalendarDescriptor.BusinessPeriod"
-    "open"
-    "close"
-  }},
-};
-
-::uint8_t* FigureDescriptor_BusinessCalendarDescriptor_BusinessPeriod::_InternalSerialize(
-    ::uint8_t* target,
-    ::google::protobuf::io::EpsCopyOutputStream* stream) const {
-  // @@protoc_insertion_point(serialize_to_array_start:io.deephaven.proto.backplane.script.grpc.FigureDescriptor.BusinessCalendarDescriptor.BusinessPeriod)
-  ::uint32_t cached_has_bits = 0;
-  (void)cached_has_bits;
-
-  // string open = 1;
-  if (!this->_internal_open().empty()) {
-    const std::string& _s = this->_internal_open();
-    ::google::protobuf::internal::WireFormatLite::VerifyUtf8String(
-        _s.data(), static_cast<int>(_s.length()), ::google::protobuf::internal::WireFormatLite::SERIALIZE, "io.deephaven.proto.backplane.script.grpc.FigureDescriptor.BusinessCalendarDescriptor.BusinessPeriod.open");
-    target = stream->WriteStringMaybeAliased(1, _s, target);
-  }
-
-  // string close = 2;
-  if (!this->_internal_close().empty()) {
-    const std::string& _s = this->_internal_close();
-    ::google::protobuf::internal::WireFormatLite::VerifyUtf8String(
-        _s.data(), static_cast<int>(_s.length()), ::google::protobuf::internal::WireFormatLite::SERIALIZE, "io.deephaven.proto.backplane.script.grpc.FigureDescriptor.BusinessCalendarDescriptor.BusinessPeriod.close");
-    target = stream->WriteStringMaybeAliased(2, _s, target);
-  }
-
-  if (PROTOBUF_PREDICT_FALSE(_internal_metadata_.have_unknown_fields())) {
-    target =
-        ::_pbi::WireFormat::InternalSerializeUnknownFieldsToArray(
-            _internal_metadata_.unknown_fields<::google::protobuf::UnknownFieldSet>(::google::protobuf::UnknownFieldSet::default_instance), target, stream);
-  }
-  // @@protoc_insertion_point(serialize_to_array_end:io.deephaven.proto.backplane.script.grpc.FigureDescriptor.BusinessCalendarDescriptor.BusinessPeriod)
-  return target;
-}
-
-::size_t FigureDescriptor_BusinessCalendarDescriptor_BusinessPeriod::ByteSizeLong() const {
-// @@protoc_insertion_point(message_byte_size_start:io.deephaven.proto.backplane.script.grpc.FigureDescriptor.BusinessCalendarDescriptor.BusinessPeriod)
-  ::size_t total_size = 0;
-
-  ::uint32_t cached_has_bits = 0;
-  // Prevent compiler warnings about cached_has_bits being unused
-  (void) cached_has_bits;
-
-  // string open = 1;
-  if (!this->_internal_open().empty()) {
-    total_size += 1 + ::google::protobuf::internal::WireFormatLite::StringSize(
-                                    this->_internal_open());
-  }
-
-  // string close = 2;
-  if (!this->_internal_close().empty()) {
-    total_size += 1 + ::google::protobuf::internal::WireFormatLite::StringSize(
-                                    this->_internal_close());
-  }
-
-  return MaybeComputeUnknownFieldsSize(total_size, &_impl_._cached_size_);
-}
-
-const ::google::protobuf::Message::ClassData FigureDescriptor_BusinessCalendarDescriptor_BusinessPeriod::_class_data_ = {
-    FigureDescriptor_BusinessCalendarDescriptor_BusinessPeriod::MergeImpl,
-    nullptr,  // OnDemandRegisterArenaDtor
-};
-const ::google::protobuf::Message::ClassData* FigureDescriptor_BusinessCalendarDescriptor_BusinessPeriod::GetClassData() const {
-  return &_class_data_;
-}
-
-void FigureDescriptor_BusinessCalendarDescriptor_BusinessPeriod::MergeImpl(::google::protobuf::Message& to_msg, const ::google::protobuf::Message& from_msg) {
-  auto* const _this = static_cast<FigureDescriptor_BusinessCalendarDescriptor_BusinessPeriod*>(&to_msg);
-  auto& from = static_cast<const FigureDescriptor_BusinessCalendarDescriptor_BusinessPeriod&>(from_msg);
-  // @@protoc_insertion_point(class_specific_merge_from_start:io.deephaven.proto.backplane.script.grpc.FigureDescriptor.BusinessCalendarDescriptor.BusinessPeriod)
-  ABSL_DCHECK_NE(&from, _this);
-  ::uint32_t cached_has_bits = 0;
-  (void) cached_has_bits;
-
-  if (!from._internal_open().empty()) {
-    _this->_internal_set_open(from._internal_open());
-  }
-  if (!from._internal_close().empty()) {
-    _this->_internal_set_close(from._internal_close());
-  }
-  _this->_internal_metadata_.MergeFrom<::google::protobuf::UnknownFieldSet>(from._internal_metadata_);
-}
-
-void FigureDescriptor_BusinessCalendarDescriptor_BusinessPeriod::CopyFrom(const FigureDescriptor_BusinessCalendarDescriptor_BusinessPeriod& from) {
-// @@protoc_insertion_point(class_specific_copy_from_start:io.deephaven.proto.backplane.script.grpc.FigureDescriptor.BusinessCalendarDescriptor.BusinessPeriod)
-  if (&from == this) return;
-  Clear();
-  MergeFrom(from);
-}
-
-PROTOBUF_NOINLINE bool FigureDescriptor_BusinessCalendarDescriptor_BusinessPeriod::IsInitialized() const {
-  return true;
-}
-
-::_pbi::CachedSize* FigureDescriptor_BusinessCalendarDescriptor_BusinessPeriod::AccessCachedSize() const {
-  return &_impl_._cached_size_;
-}
-void FigureDescriptor_BusinessCalendarDescriptor_BusinessPeriod::InternalSwap(FigureDescriptor_BusinessCalendarDescriptor_BusinessPeriod* PROTOBUF_RESTRICT other) {
-  using std::swap;
-  auto* arena = GetArena();
-  ABSL_DCHECK_EQ(arena, other->GetArena());
-  _internal_metadata_.InternalSwap(&other->_internal_metadata_);
-  ::_pbi::ArenaStringPtr::InternalSwap(&_impl_.open_, &other->_impl_.open_, arena);
-  ::_pbi::ArenaStringPtr::InternalSwap(&_impl_.close_, &other->_impl_.close_, arena);
-}
-
-::google::protobuf::Metadata FigureDescriptor_BusinessCalendarDescriptor_BusinessPeriod::GetMetadata() const {
-  return ::_pbi::AssignDescriptors(
-      &descriptor_table_deephaven_2fproto_2fconsole_2eproto_getter, &descriptor_table_deephaven_2fproto_2fconsole_2eproto_once,
-      file_level_metadata_deephaven_2fproto_2fconsole_2eproto[52]);
-}
-// ===================================================================
-
-class FigureDescriptor_BusinessCalendarDescriptor_Holiday::_Internal {
- public:
-  using HasBits = decltype(std::declval<FigureDescriptor_BusinessCalendarDescriptor_Holiday>()._impl_._has_bits_);
-  static constexpr ::int32_t kHasBitsOffset =
-    8 * PROTOBUF_FIELD_OFFSET(FigureDescriptor_BusinessCalendarDescriptor_Holiday, _impl_._has_bits_);
-  static const ::io::deephaven::proto::backplane::script::grpc::FigureDescriptor_BusinessCalendarDescriptor_LocalDate& date(const FigureDescriptor_BusinessCalendarDescriptor_Holiday* msg);
-  static void set_has_date(HasBits* has_bits) {
-    (*has_bits)[0] |= 1u;
-  }
-};
-
-const ::io::deephaven::proto::backplane::script::grpc::FigureDescriptor_BusinessCalendarDescriptor_LocalDate& FigureDescriptor_BusinessCalendarDescriptor_Holiday::_Internal::date(const FigureDescriptor_BusinessCalendarDescriptor_Holiday* msg) {
-  return *msg->_impl_.date_;
-}
-FigureDescriptor_BusinessCalendarDescriptor_Holiday::FigureDescriptor_BusinessCalendarDescriptor_Holiday(::google::protobuf::Arena* arena)
-    : ::google::protobuf::Message(arena) {
-  SharedCtor(arena);
-  // @@protoc_insertion_point(arena_constructor:io.deephaven.proto.backplane.script.grpc.FigureDescriptor.BusinessCalendarDescriptor.Holiday)
-}
-inline PROTOBUF_NDEBUG_INLINE FigureDescriptor_BusinessCalendarDescriptor_Holiday::Impl_::Impl_(
-    ::google::protobuf::internal::InternalVisibility visibility, ::google::protobuf::Arena* arena,
-    const Impl_& from)
-      : _has_bits_{from._has_bits_},
-        _cached_size_{0},
-        business_periods_{visibility, arena, from.business_periods_} {}
-
-FigureDescriptor_BusinessCalendarDescriptor_Holiday::FigureDescriptor_BusinessCalendarDescriptor_Holiday(
-    ::google::protobuf::Arena* arena,
-    const FigureDescriptor_BusinessCalendarDescriptor_Holiday& from)
-    : ::google::protobuf::Message(arena) {
-  FigureDescriptor_BusinessCalendarDescriptor_Holiday* const _this = this;
-  (void)_this;
-  _internal_metadata_.MergeFrom<::google::protobuf::UnknownFieldSet>(
-      from._internal_metadata_);
-  new (&_impl_) Impl_(internal_visibility(), arena, from._impl_);
-  ::uint32_t cached_has_bits = _impl_._has_bits_[0];
-  _impl_.date_ = (cached_has_bits & 0x00000001u)
-                ? CreateMaybeMessage<::io::deephaven::proto::backplane::script::grpc::FigureDescriptor_BusinessCalendarDescriptor_LocalDate>(arena, *from._impl_.date_)
-                : nullptr;
-
-  // @@protoc_insertion_point(copy_constructor:io.deephaven.proto.backplane.script.grpc.FigureDescriptor.BusinessCalendarDescriptor.Holiday)
-}
-inline PROTOBUF_NDEBUG_INLINE FigureDescriptor_BusinessCalendarDescriptor_Holiday::Impl_::Impl_(
-    ::google::protobuf::internal::InternalVisibility visibility,
-    ::google::protobuf::Arena* arena)
-      : _cached_size_{0},
-        business_periods_{visibility, arena} {}
-
-inline void FigureDescriptor_BusinessCalendarDescriptor_Holiday::SharedCtor(::_pb::Arena* arena) {
-  new (&_impl_) Impl_(internal_visibility(), arena);
-  _impl_.date_ = {};
-}
-FigureDescriptor_BusinessCalendarDescriptor_Holiday::~FigureDescriptor_BusinessCalendarDescriptor_Holiday() {
-  // @@protoc_insertion_point(destructor:io.deephaven.proto.backplane.script.grpc.FigureDescriptor.BusinessCalendarDescriptor.Holiday)
-  _internal_metadata_.Delete<::google::protobuf::UnknownFieldSet>();
-  SharedDtor();
-}
-inline void FigureDescriptor_BusinessCalendarDescriptor_Holiday::SharedDtor() {
-  ABSL_DCHECK(GetArena() == nullptr);
-  delete _impl_.date_;
-  _impl_.~Impl_();
-}
-
-PROTOBUF_NOINLINE void FigureDescriptor_BusinessCalendarDescriptor_Holiday::Clear() {
-// @@protoc_insertion_point(message_clear_start:io.deephaven.proto.backplane.script.grpc.FigureDescriptor.BusinessCalendarDescriptor.Holiday)
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  ::uint32_t cached_has_bits = 0;
-  // Prevent compiler warnings about cached_has_bits being unused
-  (void) cached_has_bits;
-
-  _impl_.business_periods_.Clear();
-  cached_has_bits = _impl_._has_bits_[0];
-  if (cached_has_bits & 0x00000001u) {
-    ABSL_DCHECK(_impl_.date_ != nullptr);
-    _impl_.date_->Clear();
-  }
-  _impl_._has_bits_.Clear();
-  _internal_metadata_.Clear<::google::protobuf::UnknownFieldSet>();
-}
-
-const char* FigureDescriptor_BusinessCalendarDescriptor_Holiday::_InternalParse(
-    const char* ptr, ::_pbi::ParseContext* ctx) {
-  ptr = ::_pbi::TcParser::ParseLoop(this, ptr, ctx, &_table_.header);
-  return ptr;
-}
-
-
-PROTOBUF_CONSTINIT PROTOBUF_ATTRIBUTE_INIT_PRIORITY1
-const ::_pbi::TcParseTable<1, 2, 2, 0, 2> FigureDescriptor_BusinessCalendarDescriptor_Holiday::_table_ = {
-  {
-    PROTOBUF_FIELD_OFFSET(FigureDescriptor_BusinessCalendarDescriptor_Holiday, _impl_._has_bits_),
-    0, // no _extensions_
-    2, 8,  // max_field_number, fast_idx_mask
-    offsetof(decltype(_table_), field_lookup_table),
-    4294967292,  // skipmap
-    offsetof(decltype(_table_), field_entries),
-    2,  // num_field_entries
-    2,  // num_aux_entries
-    offsetof(decltype(_table_), aux_entries),
-    &_FigureDescriptor_BusinessCalendarDescriptor_Holiday_default_instance_._instance,
-    ::_pbi::TcParser::GenericFallback,  // fallback
-  }, {{
-    // repeated .io.deephaven.proto.backplane.script.grpc.FigureDescriptor.BusinessCalendarDescriptor.BusinessPeriod business_periods = 2;
-    {::_pbi::TcParser::FastMtR1,
-     {18, 63, 1, PROTOBUF_FIELD_OFFSET(FigureDescriptor_BusinessCalendarDescriptor_Holiday, _impl_.business_periods_)}},
-    // .io.deephaven.proto.backplane.script.grpc.FigureDescriptor.BusinessCalendarDescriptor.LocalDate date = 1;
-    {::_pbi::TcParser::FastMtS1,
-     {10, 0, 0, PROTOBUF_FIELD_OFFSET(FigureDescriptor_BusinessCalendarDescriptor_Holiday, _impl_.date_)}},
-  }}, {{
-    65535, 65535
-  }}, {{
-    // .io.deephaven.proto.backplane.script.grpc.FigureDescriptor.BusinessCalendarDescriptor.LocalDate date = 1;
-    {PROTOBUF_FIELD_OFFSET(FigureDescriptor_BusinessCalendarDescriptor_Holiday, _impl_.date_), _Internal::kHasBitsOffset + 0, 0,
-    (0 | ::_fl::kFcOptional | ::_fl::kMessage | ::_fl::kTvTable)},
-    // repeated .io.deephaven.proto.backplane.script.grpc.FigureDescriptor.BusinessCalendarDescriptor.BusinessPeriod business_periods = 2;
-    {PROTOBUF_FIELD_OFFSET(FigureDescriptor_BusinessCalendarDescriptor_Holiday, _impl_.business_periods_), -1, 1,
-    (0 | ::_fl::kFcRepeated | ::_fl::kMessage | ::_fl::kTvTable)},
-  }}, {{
-    {::_pbi::TcParser::GetTable<::io::deephaven::proto::backplane::script::grpc::FigureDescriptor_BusinessCalendarDescriptor_LocalDate>()},
-    {::_pbi::TcParser::GetTable<::io::deephaven::proto::backplane::script::grpc::FigureDescriptor_BusinessCalendarDescriptor_BusinessPeriod>()},
-  }}, {{
-  }},
-};
-
-::uint8_t* FigureDescriptor_BusinessCalendarDescriptor_Holiday::_InternalSerialize(
-    ::uint8_t* target,
-    ::google::protobuf::io::EpsCopyOutputStream* stream) const {
-  // @@protoc_insertion_point(serialize_to_array_start:io.deephaven.proto.backplane.script.grpc.FigureDescriptor.BusinessCalendarDescriptor.Holiday)
-  ::uint32_t cached_has_bits = 0;
-  (void)cached_has_bits;
-
-  cached_has_bits = _impl_._has_bits_[0];
-  // .io.deephaven.proto.backplane.script.grpc.FigureDescriptor.BusinessCalendarDescriptor.LocalDate date = 1;
-  if (cached_has_bits & 0x00000001u) {
-    target = ::google::protobuf::internal::WireFormatLite::InternalWriteMessage(
-        1, _Internal::date(this),
-        _Internal::date(this).GetCachedSize(), target, stream);
-  }
-
-  // repeated .io.deephaven.proto.backplane.script.grpc.FigureDescriptor.BusinessCalendarDescriptor.BusinessPeriod business_periods = 2;
-  for (unsigned i = 0,
-      n = static_cast<unsigned>(this->_internal_business_periods_size()); i < n; i++) {
-    const auto& repfield = this->_internal_business_periods().Get(i);
-    target = ::google::protobuf::internal::WireFormatLite::
-        InternalWriteMessage(2, repfield, repfield.GetCachedSize(), target, stream);
-  }
-
-  if (PROTOBUF_PREDICT_FALSE(_internal_metadata_.have_unknown_fields())) {
-    target =
-        ::_pbi::WireFormat::InternalSerializeUnknownFieldsToArray(
-            _internal_metadata_.unknown_fields<::google::protobuf::UnknownFieldSet>(::google::protobuf::UnknownFieldSet::default_instance), target, stream);
-  }
-  // @@protoc_insertion_point(serialize_to_array_end:io.deephaven.proto.backplane.script.grpc.FigureDescriptor.BusinessCalendarDescriptor.Holiday)
-  return target;
-}
-
-::size_t FigureDescriptor_BusinessCalendarDescriptor_Holiday::ByteSizeLong() const {
-// @@protoc_insertion_point(message_byte_size_start:io.deephaven.proto.backplane.script.grpc.FigureDescriptor.BusinessCalendarDescriptor.Holiday)
-  ::size_t total_size = 0;
-
-  ::uint32_t cached_has_bits = 0;
-  // Prevent compiler warnings about cached_has_bits being unused
-  (void) cached_has_bits;
-
-  // repeated .io.deephaven.proto.backplane.script.grpc.FigureDescriptor.BusinessCalendarDescriptor.BusinessPeriod business_periods = 2;
-  total_size += 1UL * this->_internal_business_periods_size();
-  for (const auto& msg : this->_internal_business_periods()) {
-    total_size +=
-      ::google::protobuf::internal::WireFormatLite::MessageSize(msg);
-  }
-  // .io.deephaven.proto.backplane.script.grpc.FigureDescriptor.BusinessCalendarDescriptor.LocalDate date = 1;
-  cached_has_bits = _impl_._has_bits_[0];
-  if (cached_has_bits & 0x00000001u) {
-    total_size +=
-        1 + ::google::protobuf::internal::WireFormatLite::MessageSize(*_impl_.date_);
-  }
-
-  return MaybeComputeUnknownFieldsSize(total_size, &_impl_._cached_size_);
-}
-
-const ::google::protobuf::Message::ClassData FigureDescriptor_BusinessCalendarDescriptor_Holiday::_class_data_ = {
-    FigureDescriptor_BusinessCalendarDescriptor_Holiday::MergeImpl,
-    nullptr,  // OnDemandRegisterArenaDtor
-};
-const ::google::protobuf::Message::ClassData* FigureDescriptor_BusinessCalendarDescriptor_Holiday::GetClassData() const {
-  return &_class_data_;
-}
-
-void FigureDescriptor_BusinessCalendarDescriptor_Holiday::MergeImpl(::google::protobuf::Message& to_msg, const ::google::protobuf::Message& from_msg) {
-  auto* const _this = static_cast<FigureDescriptor_BusinessCalendarDescriptor_Holiday*>(&to_msg);
-  auto& from = static_cast<const FigureDescriptor_BusinessCalendarDescriptor_Holiday&>(from_msg);
-  // @@protoc_insertion_point(class_specific_merge_from_start:io.deephaven.proto.backplane.script.grpc.FigureDescriptor.BusinessCalendarDescriptor.Holiday)
-  ABSL_DCHECK_NE(&from, _this);
-  ::uint32_t cached_has_bits = 0;
-  (void) cached_has_bits;
-
-  _this->_internal_mutable_business_periods()->MergeFrom(
-      from._internal_business_periods());
-  if ((from._impl_._has_bits_[0] & 0x00000001u) != 0) {
-    _this->_internal_mutable_date()->::io::deephaven::proto::backplane::script::grpc::FigureDescriptor_BusinessCalendarDescriptor_LocalDate::MergeFrom(
-        from._internal_date());
-  }
-  _this->_internal_metadata_.MergeFrom<::google::protobuf::UnknownFieldSet>(from._internal_metadata_);
-}
-
-void FigureDescriptor_BusinessCalendarDescriptor_Holiday::CopyFrom(const FigureDescriptor_BusinessCalendarDescriptor_Holiday& from) {
-// @@protoc_insertion_point(class_specific_copy_from_start:io.deephaven.proto.backplane.script.grpc.FigureDescriptor.BusinessCalendarDescriptor.Holiday)
-  if (&from == this) return;
-  Clear();
-  MergeFrom(from);
-}
-
-PROTOBUF_NOINLINE bool FigureDescriptor_BusinessCalendarDescriptor_Holiday::IsInitialized() const {
-  return true;
-}
-
-::_pbi::CachedSize* FigureDescriptor_BusinessCalendarDescriptor_Holiday::AccessCachedSize() const {
-  return &_impl_._cached_size_;
-}
-void FigureDescriptor_BusinessCalendarDescriptor_Holiday::InternalSwap(FigureDescriptor_BusinessCalendarDescriptor_Holiday* PROTOBUF_RESTRICT other) {
-  using std::swap;
-  _internal_metadata_.InternalSwap(&other->_internal_metadata_);
-  swap(_impl_._has_bits_[0], other->_impl_._has_bits_[0]);
-  _impl_.business_periods_.InternalSwap(&other->_impl_.business_periods_);
-  swap(_impl_.date_, other->_impl_.date_);
-}
-
-::google::protobuf::Metadata FigureDescriptor_BusinessCalendarDescriptor_Holiday::GetMetadata() const {
-  return ::_pbi::AssignDescriptors(
-      &descriptor_table_deephaven_2fproto_2fconsole_2eproto_getter, &descriptor_table_deephaven_2fproto_2fconsole_2eproto_once,
-      file_level_metadata_deephaven_2fproto_2fconsole_2eproto[53]);
-}
-// ===================================================================
-
-class FigureDescriptor_BusinessCalendarDescriptor_LocalDate::_Internal {
- public:
-};
-
-FigureDescriptor_BusinessCalendarDescriptor_LocalDate::FigureDescriptor_BusinessCalendarDescriptor_LocalDate(::google::protobuf::Arena* arena)
-    : ::google::protobuf::Message(arena) {
-  SharedCtor(arena);
-  // @@protoc_insertion_point(arena_constructor:io.deephaven.proto.backplane.script.grpc.FigureDescriptor.BusinessCalendarDescriptor.LocalDate)
-}
-FigureDescriptor_BusinessCalendarDescriptor_LocalDate::FigureDescriptor_BusinessCalendarDescriptor_LocalDate(
-    ::google::protobuf::Arena* arena, const FigureDescriptor_BusinessCalendarDescriptor_LocalDate& from)
-    : FigureDescriptor_BusinessCalendarDescriptor_LocalDate(arena) {
-  MergeFrom(from);
-}
-inline PROTOBUF_NDEBUG_INLINE FigureDescriptor_BusinessCalendarDescriptor_LocalDate::Impl_::Impl_(
-    ::google::protobuf::internal::InternalVisibility visibility,
-    ::google::protobuf::Arena* arena)
-      : _cached_size_{0} {}
-
-inline void FigureDescriptor_BusinessCalendarDescriptor_LocalDate::SharedCtor(::_pb::Arena* arena) {
-  new (&_impl_) Impl_(internal_visibility(), arena);
-  ::memset(reinterpret_cast<char *>(&_impl_) +
-               offsetof(Impl_, year_),
-           0,
-           offsetof(Impl_, day_) -
-               offsetof(Impl_, year_) +
-               sizeof(Impl_::day_));
-}
-FigureDescriptor_BusinessCalendarDescriptor_LocalDate::~FigureDescriptor_BusinessCalendarDescriptor_LocalDate() {
-  // @@protoc_insertion_point(destructor:io.deephaven.proto.backplane.script.grpc.FigureDescriptor.BusinessCalendarDescriptor.LocalDate)
-  _internal_metadata_.Delete<::google::protobuf::UnknownFieldSet>();
-  SharedDtor();
-}
-inline void FigureDescriptor_BusinessCalendarDescriptor_LocalDate::SharedDtor() {
-  ABSL_DCHECK(GetArena() == nullptr);
-  _impl_.~Impl_();
-}
-
-PROTOBUF_NOINLINE void FigureDescriptor_BusinessCalendarDescriptor_LocalDate::Clear() {
-// @@protoc_insertion_point(message_clear_start:io.deephaven.proto.backplane.script.grpc.FigureDescriptor.BusinessCalendarDescriptor.LocalDate)
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  ::uint32_t cached_has_bits = 0;
-  // Prevent compiler warnings about cached_has_bits being unused
-  (void) cached_has_bits;
-
-  ::memset(&_impl_.year_, 0, static_cast<::size_t>(
-      reinterpret_cast<char*>(&_impl_.day_) -
-      reinterpret_cast<char*>(&_impl_.year_)) + sizeof(_impl_.day_));
-  _internal_metadata_.Clear<::google::protobuf::UnknownFieldSet>();
-}
-
-const char* FigureDescriptor_BusinessCalendarDescriptor_LocalDate::_InternalParse(
-    const char* ptr, ::_pbi::ParseContext* ctx) {
-  ptr = ::_pbi::TcParser::ParseLoop(this, ptr, ctx, &_table_.header);
-  return ptr;
-}
-
-
-PROTOBUF_CONSTINIT PROTOBUF_ATTRIBUTE_INIT_PRIORITY1
-const ::_pbi::TcParseTable<2, 3, 0, 0, 2> FigureDescriptor_BusinessCalendarDescriptor_LocalDate::_table_ = {
-  {
-    0,  // no _has_bits_
-    0, // no _extensions_
-    3, 24,  // max_field_number, fast_idx_mask
-    offsetof(decltype(_table_), field_lookup_table),
-    4294967288,  // skipmap
-    offsetof(decltype(_table_), field_entries),
-    3,  // num_field_entries
-    0,  // num_aux_entries
-    offsetof(decltype(_table_), field_names),  // no aux_entries
-    &_FigureDescriptor_BusinessCalendarDescriptor_LocalDate_default_instance_._instance,
-    ::_pbi::TcParser::GenericFallback,  // fallback
-  }, {{
-    {::_pbi::TcParser::MiniParse, {}},
-    // int32 year = 1;
-    {::_pbi::TcParser::SingularVarintNoZag1<::uint32_t, offsetof(FigureDescriptor_BusinessCalendarDescriptor_LocalDate, _impl_.year_), 63>(),
-     {8, 63, 0, PROTOBUF_FIELD_OFFSET(FigureDescriptor_BusinessCalendarDescriptor_LocalDate, _impl_.year_)}},
-    // int32 month = 2;
-    {::_pbi::TcParser::SingularVarintNoZag1<::uint32_t, offsetof(FigureDescriptor_BusinessCalendarDescriptor_LocalDate, _impl_.month_), 63>(),
-     {16, 63, 0, PROTOBUF_FIELD_OFFSET(FigureDescriptor_BusinessCalendarDescriptor_LocalDate, _impl_.month_)}},
-    // int32 day = 3;
-    {::_pbi::TcParser::SingularVarintNoZag1<::uint32_t, offsetof(FigureDescriptor_BusinessCalendarDescriptor_LocalDate, _impl_.day_), 63>(),
-     {24, 63, 0, PROTOBUF_FIELD_OFFSET(FigureDescriptor_BusinessCalendarDescriptor_LocalDate, _impl_.day_)}},
-  }}, {{
-    65535, 65535
-  }}, {{
-    // int32 year = 1;
-    {PROTOBUF_FIELD_OFFSET(FigureDescriptor_BusinessCalendarDescriptor_LocalDate, _impl_.year_), 0, 0,
-    (0 | ::_fl::kFcSingular | ::_fl::kInt32)},
-    // int32 month = 2;
-    {PROTOBUF_FIELD_OFFSET(FigureDescriptor_BusinessCalendarDescriptor_LocalDate, _impl_.month_), 0, 0,
-    (0 | ::_fl::kFcSingular | ::_fl::kInt32)},
-    // int32 day = 3;
-    {PROTOBUF_FIELD_OFFSET(FigureDescriptor_BusinessCalendarDescriptor_LocalDate, _impl_.day_), 0, 0,
-    (0 | ::_fl::kFcSingular | ::_fl::kInt32)},
-  }},
-  // no aux_entries
-  {{
-  }},
-};
-
-::uint8_t* FigureDescriptor_BusinessCalendarDescriptor_LocalDate::_InternalSerialize(
-    ::uint8_t* target,
-    ::google::protobuf::io::EpsCopyOutputStream* stream) const {
-  // @@protoc_insertion_point(serialize_to_array_start:io.deephaven.proto.backplane.script.grpc.FigureDescriptor.BusinessCalendarDescriptor.LocalDate)
-  ::uint32_t cached_has_bits = 0;
-  (void)cached_has_bits;
-
-  // int32 year = 1;
-  if (this->_internal_year() != 0) {
-    target = ::google::protobuf::internal::WireFormatLite::
-        WriteInt32ToArrayWithField<1>(
-            stream, this->_internal_year(), target);
-  }
-
-  // int32 month = 2;
-  if (this->_internal_month() != 0) {
-    target = ::google::protobuf::internal::WireFormatLite::
-        WriteInt32ToArrayWithField<2>(
-            stream, this->_internal_month(), target);
-  }
-
-  // int32 day = 3;
-  if (this->_internal_day() != 0) {
-    target = ::google::protobuf::internal::WireFormatLite::
-        WriteInt32ToArrayWithField<3>(
-            stream, this->_internal_day(), target);
-  }
-
-  if (PROTOBUF_PREDICT_FALSE(_internal_metadata_.have_unknown_fields())) {
-    target =
-        ::_pbi::WireFormat::InternalSerializeUnknownFieldsToArray(
-            _internal_metadata_.unknown_fields<::google::protobuf::UnknownFieldSet>(::google::protobuf::UnknownFieldSet::default_instance), target, stream);
-  }
-  // @@protoc_insertion_point(serialize_to_array_end:io.deephaven.proto.backplane.script.grpc.FigureDescriptor.BusinessCalendarDescriptor.LocalDate)
-  return target;
-}
-
-::size_t FigureDescriptor_BusinessCalendarDescriptor_LocalDate::ByteSizeLong() const {
-// @@protoc_insertion_point(message_byte_size_start:io.deephaven.proto.backplane.script.grpc.FigureDescriptor.BusinessCalendarDescriptor.LocalDate)
-  ::size_t total_size = 0;
-
-  ::uint32_t cached_has_bits = 0;
-  // Prevent compiler warnings about cached_has_bits being unused
-  (void) cached_has_bits;
-
-  // int32 year = 1;
-  if (this->_internal_year() != 0) {
-    total_size += ::_pbi::WireFormatLite::Int32SizePlusOne(
-        this->_internal_year());
-  }
-
-  // int32 month = 2;
-  if (this->_internal_month() != 0) {
-    total_size += ::_pbi::WireFormatLite::Int32SizePlusOne(
-        this->_internal_month());
-  }
-
-  // int32 day = 3;
-  if (this->_internal_day() != 0) {
-    total_size += ::_pbi::WireFormatLite::Int32SizePlusOne(
-        this->_internal_day());
-  }
-
-  return MaybeComputeUnknownFieldsSize(total_size, &_impl_._cached_size_);
-}
-
-const ::google::protobuf::Message::ClassData FigureDescriptor_BusinessCalendarDescriptor_LocalDate::_class_data_ = {
-    FigureDescriptor_BusinessCalendarDescriptor_LocalDate::MergeImpl,
-    nullptr,  // OnDemandRegisterArenaDtor
-};
-const ::google::protobuf::Message::ClassData* FigureDescriptor_BusinessCalendarDescriptor_LocalDate::GetClassData() const {
-  return &_class_data_;
-}
-
-void FigureDescriptor_BusinessCalendarDescriptor_LocalDate::MergeImpl(::google::protobuf::Message& to_msg, const ::google::protobuf::Message& from_msg) {
-  auto* const _this = static_cast<FigureDescriptor_BusinessCalendarDescriptor_LocalDate*>(&to_msg);
-  auto& from = static_cast<const FigureDescriptor_BusinessCalendarDescriptor_LocalDate&>(from_msg);
-  // @@protoc_insertion_point(class_specific_merge_from_start:io.deephaven.proto.backplane.script.grpc.FigureDescriptor.BusinessCalendarDescriptor.LocalDate)
-  ABSL_DCHECK_NE(&from, _this);
-  ::uint32_t cached_has_bits = 0;
-  (void) cached_has_bits;
-
-  if (from._internal_year() != 0) {
-    _this->_internal_set_year(from._internal_year());
-  }
-  if (from._internal_month() != 0) {
-    _this->_internal_set_month(from._internal_month());
-  }
-  if (from._internal_day() != 0) {
-    _this->_internal_set_day(from._internal_day());
-  }
-  _this->_internal_metadata_.MergeFrom<::google::protobuf::UnknownFieldSet>(from._internal_metadata_);
-}
-
-void FigureDescriptor_BusinessCalendarDescriptor_LocalDate::CopyFrom(const FigureDescriptor_BusinessCalendarDescriptor_LocalDate& from) {
-// @@protoc_insertion_point(class_specific_copy_from_start:io.deephaven.proto.backplane.script.grpc.FigureDescriptor.BusinessCalendarDescriptor.LocalDate)
-  if (&from == this) return;
-  Clear();
-  MergeFrom(from);
-}
-
-PROTOBUF_NOINLINE bool FigureDescriptor_BusinessCalendarDescriptor_LocalDate::IsInitialized() const {
-  return true;
-}
-
-::_pbi::CachedSize* FigureDescriptor_BusinessCalendarDescriptor_LocalDate::AccessCachedSize() const {
-  return &_impl_._cached_size_;
-}
-void FigureDescriptor_BusinessCalendarDescriptor_LocalDate::InternalSwap(FigureDescriptor_BusinessCalendarDescriptor_LocalDate* PROTOBUF_RESTRICT other) {
-  using std::swap;
-  _internal_metadata_.InternalSwap(&other->_internal_metadata_);
-  ::google::protobuf::internal::memswap<
-      PROTOBUF_FIELD_OFFSET(FigureDescriptor_BusinessCalendarDescriptor_LocalDate, _impl_.day_)
-      + sizeof(FigureDescriptor_BusinessCalendarDescriptor_LocalDate::_impl_.day_)
-      - PROTOBUF_FIELD_OFFSET(FigureDescriptor_BusinessCalendarDescriptor_LocalDate, _impl_.year_)>(
-          reinterpret_cast<char*>(&_impl_.year_),
-          reinterpret_cast<char*>(&other->_impl_.year_));
-}
-
-::google::protobuf::Metadata FigureDescriptor_BusinessCalendarDescriptor_LocalDate::GetMetadata() const {
-  return ::_pbi::AssignDescriptors(
-      &descriptor_table_deephaven_2fproto_2fconsole_2eproto_getter, &descriptor_table_deephaven_2fproto_2fconsole_2eproto_once,
-      file_level_metadata_deephaven_2fproto_2fconsole_2eproto[54]);
-}
-// ===================================================================
-
-class FigureDescriptor_BusinessCalendarDescriptor::_Internal {
- public:
-};
-
-FigureDescriptor_BusinessCalendarDescriptor::FigureDescriptor_BusinessCalendarDescriptor(::google::protobuf::Arena* arena)
-    : ::google::protobuf::Message(arena) {
-  SharedCtor(arena);
-  // @@protoc_insertion_point(arena_constructor:io.deephaven.proto.backplane.script.grpc.FigureDescriptor.BusinessCalendarDescriptor)
-}
-inline PROTOBUF_NDEBUG_INLINE FigureDescriptor_BusinessCalendarDescriptor::Impl_::Impl_(
-    ::google::protobuf::internal::InternalVisibility visibility, ::google::protobuf::Arena* arena,
-    const Impl_& from)
-      : business_days_{visibility, arena, from.business_days_},
-        _business_days_cached_byte_size_{0},
-        business_periods_{visibility, arena, from.business_periods_},
-        holidays_{visibility, arena, from.holidays_},
-        name_(arena, from.name_),
-        time_zone_(arena, from.time_zone_),
-        _cached_size_{0} {}
-
-FigureDescriptor_BusinessCalendarDescriptor::FigureDescriptor_BusinessCalendarDescriptor(
-    ::google::protobuf::Arena* arena,
-    const FigureDescriptor_BusinessCalendarDescriptor& from)
-    : ::google::protobuf::Message(arena) {
-  FigureDescriptor_BusinessCalendarDescriptor* const _this = this;
-  (void)_this;
-  _internal_metadata_.MergeFrom<::google::protobuf::UnknownFieldSet>(
-      from._internal_metadata_);
-  new (&_impl_) Impl_(internal_visibility(), arena, from._impl_);
-
-  // @@protoc_insertion_point(copy_constructor:io.deephaven.proto.backplane.script.grpc.FigureDescriptor.BusinessCalendarDescriptor)
-}
-inline PROTOBUF_NDEBUG_INLINE FigureDescriptor_BusinessCalendarDescriptor::Impl_::Impl_(
-    ::google::protobuf::internal::InternalVisibility visibility,
-    ::google::protobuf::Arena* arena)
-      : business_days_{visibility, arena},
-        _business_days_cached_byte_size_{0},
-        business_periods_{visibility, arena},
-        holidays_{visibility, arena},
-        name_(arena),
-        time_zone_(arena),
-        _cached_size_{0} {}
-
-inline void FigureDescriptor_BusinessCalendarDescriptor::SharedCtor(::_pb::Arena* arena) {
-  new (&_impl_) Impl_(internal_visibility(), arena);
-}
-FigureDescriptor_BusinessCalendarDescriptor::~FigureDescriptor_BusinessCalendarDescriptor() {
-  // @@protoc_insertion_point(destructor:io.deephaven.proto.backplane.script.grpc.FigureDescriptor.BusinessCalendarDescriptor)
-  _internal_metadata_.Delete<::google::protobuf::UnknownFieldSet>();
-  SharedDtor();
-}
-inline void FigureDescriptor_BusinessCalendarDescriptor::SharedDtor() {
-  ABSL_DCHECK(GetArena() == nullptr);
-  _impl_.name_.Destroy();
-  _impl_.time_zone_.Destroy();
-  _impl_.~Impl_();
-}
-
-PROTOBUF_NOINLINE void FigureDescriptor_BusinessCalendarDescriptor::Clear() {
-// @@protoc_insertion_point(message_clear_start:io.deephaven.proto.backplane.script.grpc.FigureDescriptor.BusinessCalendarDescriptor)
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  ::uint32_t cached_has_bits = 0;
-  // Prevent compiler warnings about cached_has_bits being unused
-  (void) cached_has_bits;
-
-  _impl_.business_days_.Clear();
-  _impl_.business_periods_.Clear();
-  _impl_.holidays_.Clear();
-  _impl_.name_.ClearToEmpty();
-  _impl_.time_zone_.ClearToEmpty();
-  _internal_metadata_.Clear<::google::protobuf::UnknownFieldSet>();
-}
-
-const char* FigureDescriptor_BusinessCalendarDescriptor::_InternalParse(
-    const char* ptr, ::_pbi::ParseContext* ctx) {
-  ptr = ::_pbi::TcParser::ParseLoop(this, ptr, ctx, &_table_.header);
-  return ptr;
-}
-
-
-PROTOBUF_CONSTINIT PROTOBUF_ATTRIBUTE_INIT_PRIORITY1
-const ::_pbi::TcParseTable<3, 5, 2, 106, 2> FigureDescriptor_BusinessCalendarDescriptor::_table_ = {
-  {
-    0,  // no _has_bits_
-    0, // no _extensions_
-    5, 56,  // max_field_number, fast_idx_mask
-    offsetof(decltype(_table_), field_lookup_table),
-    4294967264,  // skipmap
-    offsetof(decltype(_table_), field_entries),
-    5,  // num_field_entries
-    2,  // num_aux_entries
-    offsetof(decltype(_table_), aux_entries),
-    &_FigureDescriptor_BusinessCalendarDescriptor_default_instance_._instance,
-    ::_pbi::TcParser::GenericFallback,  // fallback
-  }, {{
-    {::_pbi::TcParser::MiniParse, {}},
-    // string name = 1;
-    {::_pbi::TcParser::FastUS1,
-     {10, 63, 0, PROTOBUF_FIELD_OFFSET(FigureDescriptor_BusinessCalendarDescriptor, _impl_.name_)}},
-    // string time_zone = 2;
-    {::_pbi::TcParser::FastUS1,
-     {18, 63, 0, PROTOBUF_FIELD_OFFSET(FigureDescriptor_BusinessCalendarDescriptor, _impl_.time_zone_)}},
-    // repeated .io.deephaven.proto.backplane.script.grpc.FigureDescriptor.BusinessCalendarDescriptor.DayOfWeek business_days = 3;
-    {::_pbi::TcParser::FastV32P1,
-     {26, 63, 0, PROTOBUF_FIELD_OFFSET(FigureDescriptor_BusinessCalendarDescriptor, _impl_.business_days_)}},
-    // repeated .io.deephaven.proto.backplane.script.grpc.FigureDescriptor.BusinessCalendarDescriptor.BusinessPeriod business_periods = 4;
-    {::_pbi::TcParser::FastMtR1,
-     {34, 63, 0, PROTOBUF_FIELD_OFFSET(FigureDescriptor_BusinessCalendarDescriptor, _impl_.business_periods_)}},
-    // repeated .io.deephaven.proto.backplane.script.grpc.FigureDescriptor.BusinessCalendarDescriptor.Holiday holidays = 5;
-    {::_pbi::TcParser::FastMtR1,
-     {42, 63, 1, PROTOBUF_FIELD_OFFSET(FigureDescriptor_BusinessCalendarDescriptor, _impl_.holidays_)}},
-    {::_pbi::TcParser::MiniParse, {}},
-    {::_pbi::TcParser::MiniParse, {}},
-  }}, {{
-    65535, 65535
-  }}, {{
-    // string name = 1;
-    {PROTOBUF_FIELD_OFFSET(FigureDescriptor_BusinessCalendarDescriptor, _impl_.name_), 0, 0,
-    (0 | ::_fl::kFcSingular | ::_fl::kUtf8String | ::_fl::kRepAString)},
-    // string time_zone = 2;
-    {PROTOBUF_FIELD_OFFSET(FigureDescriptor_BusinessCalendarDescriptor, _impl_.time_zone_), 0, 0,
-    (0 | ::_fl::kFcSingular | ::_fl::kUtf8String | ::_fl::kRepAString)},
-    // repeated .io.deephaven.proto.backplane.script.grpc.FigureDescriptor.BusinessCalendarDescriptor.DayOfWeek business_days = 3;
-    {PROTOBUF_FIELD_OFFSET(FigureDescriptor_BusinessCalendarDescriptor, _impl_.business_days_), 0, 0,
-    (0 | ::_fl::kFcRepeated | ::_fl::kPackedOpenEnum)},
-    // repeated .io.deephaven.proto.backplane.script.grpc.FigureDescriptor.BusinessCalendarDescriptor.BusinessPeriod business_periods = 4;
-    {PROTOBUF_FIELD_OFFSET(FigureDescriptor_BusinessCalendarDescriptor, _impl_.business_periods_), 0, 0,
-    (0 | ::_fl::kFcRepeated | ::_fl::kMessage | ::_fl::kTvTable)},
-    // repeated .io.deephaven.proto.backplane.script.grpc.FigureDescriptor.BusinessCalendarDescriptor.Holiday holidays = 5;
-    {PROTOBUF_FIELD_OFFSET(FigureDescriptor_BusinessCalendarDescriptor, _impl_.holidays_), 0, 1,
-    (0 | ::_fl::kFcRepeated | ::_fl::kMessage | ::_fl::kTvTable)},
-  }}, {{
-    {::_pbi::TcParser::GetTable<::io::deephaven::proto::backplane::script::grpc::FigureDescriptor_BusinessCalendarDescriptor_BusinessPeriod>()},
-    {::_pbi::TcParser::GetTable<::io::deephaven::proto::backplane::script::grpc::FigureDescriptor_BusinessCalendarDescriptor_Holiday>()},
-  }}, {{
-    "\124\4\11\0\0\0\0\0"
-    "io.deephaven.proto.backplane.script.grpc.FigureDescriptor.BusinessCalendarDescriptor"
-    "name"
-    "time_zone"
-  }},
-};
-
-::uint8_t* FigureDescriptor_BusinessCalendarDescriptor::_InternalSerialize(
-    ::uint8_t* target,
-    ::google::protobuf::io::EpsCopyOutputStream* stream) const {
-  // @@protoc_insertion_point(serialize_to_array_start:io.deephaven.proto.backplane.script.grpc.FigureDescriptor.BusinessCalendarDescriptor)
-  ::uint32_t cached_has_bits = 0;
-  (void)cached_has_bits;
-
-  // string name = 1;
-  if (!this->_internal_name().empty()) {
-    const std::string& _s = this->_internal_name();
-    ::google::protobuf::internal::WireFormatLite::VerifyUtf8String(
-        _s.data(), static_cast<int>(_s.length()), ::google::protobuf::internal::WireFormatLite::SERIALIZE, "io.deephaven.proto.backplane.script.grpc.FigureDescriptor.BusinessCalendarDescriptor.name");
-    target = stream->WriteStringMaybeAliased(1, _s, target);
-  }
-
-  // string time_zone = 2;
-  if (!this->_internal_time_zone().empty()) {
-    const std::string& _s = this->_internal_time_zone();
-    ::google::protobuf::internal::WireFormatLite::VerifyUtf8String(
-        _s.data(), static_cast<int>(_s.length()), ::google::protobuf::internal::WireFormatLite::SERIALIZE, "io.deephaven.proto.backplane.script.grpc.FigureDescriptor.BusinessCalendarDescriptor.time_zone");
-    target = stream->WriteStringMaybeAliased(2, _s, target);
-  }
-
-  // repeated .io.deephaven.proto.backplane.script.grpc.FigureDescriptor.BusinessCalendarDescriptor.DayOfWeek business_days = 3;
-  {
-    std::size_t byte_size = _impl_._business_days_cached_byte_size_.Get();
-    if (byte_size > 0) {
-      target = stream->WriteEnumPacked(3, _internal_business_days(),
-                                       byte_size, target);
-    }
-  }
-
-  // repeated .io.deephaven.proto.backplane.script.grpc.FigureDescriptor.BusinessCalendarDescriptor.BusinessPeriod business_periods = 4;
-  for (unsigned i = 0,
-      n = static_cast<unsigned>(this->_internal_business_periods_size()); i < n; i++) {
-    const auto& repfield = this->_internal_business_periods().Get(i);
-    target = ::google::protobuf::internal::WireFormatLite::
-        InternalWriteMessage(4, repfield, repfield.GetCachedSize(), target, stream);
-  }
-
-  // repeated .io.deephaven.proto.backplane.script.grpc.FigureDescriptor.BusinessCalendarDescriptor.Holiday holidays = 5;
-  for (unsigned i = 0,
-      n = static_cast<unsigned>(this->_internal_holidays_size()); i < n; i++) {
-    const auto& repfield = this->_internal_holidays().Get(i);
-    target = ::google::protobuf::internal::WireFormatLite::
-        InternalWriteMessage(5, repfield, repfield.GetCachedSize(), target, stream);
-  }
-
-  if (PROTOBUF_PREDICT_FALSE(_internal_metadata_.have_unknown_fields())) {
-    target =
-        ::_pbi::WireFormat::InternalSerializeUnknownFieldsToArray(
-            _internal_metadata_.unknown_fields<::google::protobuf::UnknownFieldSet>(::google::protobuf::UnknownFieldSet::default_instance), target, stream);
-  }
-  // @@protoc_insertion_point(serialize_to_array_end:io.deephaven.proto.backplane.script.grpc.FigureDescriptor.BusinessCalendarDescriptor)
-  return target;
-}
-
-::size_t FigureDescriptor_BusinessCalendarDescriptor::ByteSizeLong() const {
-// @@protoc_insertion_point(message_byte_size_start:io.deephaven.proto.backplane.script.grpc.FigureDescriptor.BusinessCalendarDescriptor)
-  ::size_t total_size = 0;
-
-  ::uint32_t cached_has_bits = 0;
-  // Prevent compiler warnings about cached_has_bits being unused
-  (void) cached_has_bits;
-
-  // repeated .io.deephaven.proto.backplane.script.grpc.FigureDescriptor.BusinessCalendarDescriptor.DayOfWeek business_days = 3;
-  {
-    std::size_t data_size = 0;
-    auto count = static_cast<std::size_t>(this->_internal_business_days_size());
-
-    for (std::size_t i = 0; i < count; ++i) {
-      data_size += ::_pbi::WireFormatLite::EnumSize(
-          this->_internal_business_days().Get(static_cast<int>(i)));
-    }
-    total_size += data_size;
-    if (data_size > 0) {
-      total_size += 1;
-      total_size += ::_pbi::WireFormatLite::Int32Size(
-          static_cast<int32_t>(data_size));
-    }
-    _impl_._business_days_cached_byte_size_.Set(::_pbi::ToCachedSize(data_size));
-  }
-  // repeated .io.deephaven.proto.backplane.script.grpc.FigureDescriptor.BusinessCalendarDescriptor.BusinessPeriod business_periods = 4;
-  total_size += 1UL * this->_internal_business_periods_size();
-  for (const auto& msg : this->_internal_business_periods()) {
-    total_size +=
-      ::google::protobuf::internal::WireFormatLite::MessageSize(msg);
-  }
-  // repeated .io.deephaven.proto.backplane.script.grpc.FigureDescriptor.BusinessCalendarDescriptor.Holiday holidays = 5;
-  total_size += 1UL * this->_internal_holidays_size();
-  for (const auto& msg : this->_internal_holidays()) {
-    total_size +=
-      ::google::protobuf::internal::WireFormatLite::MessageSize(msg);
-  }
-  // string name = 1;
-  if (!this->_internal_name().empty()) {
-    total_size += 1 + ::google::protobuf::internal::WireFormatLite::StringSize(
-                                    this->_internal_name());
-  }
-
-  // string time_zone = 2;
-  if (!this->_internal_time_zone().empty()) {
-    total_size += 1 + ::google::protobuf::internal::WireFormatLite::StringSize(
-                                    this->_internal_time_zone());
-  }
-
-  return MaybeComputeUnknownFieldsSize(total_size, &_impl_._cached_size_);
-}
-
-const ::google::protobuf::Message::ClassData FigureDescriptor_BusinessCalendarDescriptor::_class_data_ = {
-    FigureDescriptor_BusinessCalendarDescriptor::MergeImpl,
-    nullptr,  // OnDemandRegisterArenaDtor
-};
-const ::google::protobuf::Message::ClassData* FigureDescriptor_BusinessCalendarDescriptor::GetClassData() const {
-  return &_class_data_;
-}
-
-void FigureDescriptor_BusinessCalendarDescriptor::MergeImpl(::google::protobuf::Message& to_msg, const ::google::protobuf::Message& from_msg) {
-  auto* const _this = static_cast<FigureDescriptor_BusinessCalendarDescriptor*>(&to_msg);
-  auto& from = static_cast<const FigureDescriptor_BusinessCalendarDescriptor&>(from_msg);
-  // @@protoc_insertion_point(class_specific_merge_from_start:io.deephaven.proto.backplane.script.grpc.FigureDescriptor.BusinessCalendarDescriptor)
-  ABSL_DCHECK_NE(&from, _this);
-  ::uint32_t cached_has_bits = 0;
-  (void) cached_has_bits;
-
-  _this->_internal_mutable_business_days()->MergeFrom(from._internal_business_days());
-  _this->_internal_mutable_business_periods()->MergeFrom(
-      from._internal_business_periods());
-  _this->_internal_mutable_holidays()->MergeFrom(
-      from._internal_holidays());
-  if (!from._internal_name().empty()) {
-    _this->_internal_set_name(from._internal_name());
-  }
-  if (!from._internal_time_zone().empty()) {
-    _this->_internal_set_time_zone(from._internal_time_zone());
-  }
-  _this->_internal_metadata_.MergeFrom<::google::protobuf::UnknownFieldSet>(from._internal_metadata_);
-}
-
-void FigureDescriptor_BusinessCalendarDescriptor::CopyFrom(const FigureDescriptor_BusinessCalendarDescriptor& from) {
-// @@protoc_insertion_point(class_specific_copy_from_start:io.deephaven.proto.backplane.script.grpc.FigureDescriptor.BusinessCalendarDescriptor)
-  if (&from == this) return;
-  Clear();
-  MergeFrom(from);
-}
-
-PROTOBUF_NOINLINE bool FigureDescriptor_BusinessCalendarDescriptor::IsInitialized() const {
-  return true;
-}
-
-::_pbi::CachedSize* FigureDescriptor_BusinessCalendarDescriptor::AccessCachedSize() const {
-  return &_impl_._cached_size_;
-}
-void FigureDescriptor_BusinessCalendarDescriptor::InternalSwap(FigureDescriptor_BusinessCalendarDescriptor* PROTOBUF_RESTRICT other) {
-  using std::swap;
-  auto* arena = GetArena();
-  ABSL_DCHECK_EQ(arena, other->GetArena());
-  _internal_metadata_.InternalSwap(&other->_internal_metadata_);
-  _impl_.business_days_.InternalSwap(&other->_impl_.business_days_);
-  _impl_.business_periods_.InternalSwap(&other->_impl_.business_periods_);
-  _impl_.holidays_.InternalSwap(&other->_impl_.holidays_);
-  ::_pbi::ArenaStringPtr::InternalSwap(&_impl_.name_, &other->_impl_.name_, arena);
-  ::_pbi::ArenaStringPtr::InternalSwap(&_impl_.time_zone_, &other->_impl_.time_zone_, arena);
-}
-
-::google::protobuf::Metadata FigureDescriptor_BusinessCalendarDescriptor::GetMetadata() const {
-  return ::_pbi::AssignDescriptors(
-      &descriptor_table_deephaven_2fproto_2fconsole_2eproto_getter, &descriptor_table_deephaven_2fproto_2fconsole_2eproto_once,
-      file_level_metadata_deephaven_2fproto_2fconsole_2eproto[55]);
-}
-// ===================================================================
-
-class FigureDescriptor_MultiSeriesSourceDescriptor::_Internal {
- public:
-};
-
-FigureDescriptor_MultiSeriesSourceDescriptor::FigureDescriptor_MultiSeriesSourceDescriptor(::google::protobuf::Arena* arena)
-    : ::google::protobuf::Message(arena) {
-  SharedCtor(arena);
-  // @@protoc_insertion_point(arena_constructor:io.deephaven.proto.backplane.script.grpc.FigureDescriptor.MultiSeriesSourceDescriptor)
-}
-inline PROTOBUF_NDEBUG_INLINE FigureDescriptor_MultiSeriesSourceDescriptor::Impl_::Impl_(
-    ::google::protobuf::internal::InternalVisibility visibility, ::google::protobuf::Arena* arena,
-    const Impl_& from)
-      : axis_id_(arena, from.axis_id_),
-        column_name_(arena, from.column_name_),
-        _cached_size_{0} {}
-
-FigureDescriptor_MultiSeriesSourceDescriptor::FigureDescriptor_MultiSeriesSourceDescriptor(
-    ::google::protobuf::Arena* arena,
-    const FigureDescriptor_MultiSeriesSourceDescriptor& from)
-    : ::google::protobuf::Message(arena) {
-  FigureDescriptor_MultiSeriesSourceDescriptor* const _this = this;
-  (void)_this;
-  _internal_metadata_.MergeFrom<::google::protobuf::UnknownFieldSet>(
-      from._internal_metadata_);
-  new (&_impl_) Impl_(internal_visibility(), arena, from._impl_);
-  ::memcpy(reinterpret_cast<char *>(&_impl_) +
-               offsetof(Impl_, type_),
-           reinterpret_cast<const char *>(&from._impl_) +
-               offsetof(Impl_, type_),
-           offsetof(Impl_, partitioned_table_id_) -
-               offsetof(Impl_, type_) +
-               sizeof(Impl_::partitioned_table_id_));
-
-  // @@protoc_insertion_point(copy_constructor:io.deephaven.proto.backplane.script.grpc.FigureDescriptor.MultiSeriesSourceDescriptor)
-}
-inline PROTOBUF_NDEBUG_INLINE FigureDescriptor_MultiSeriesSourceDescriptor::Impl_::Impl_(
-    ::google::protobuf::internal::InternalVisibility visibility,
-    ::google::protobuf::Arena* arena)
-      : axis_id_(arena),
-        column_name_(arena),
-        _cached_size_{0} {}
-
-inline void FigureDescriptor_MultiSeriesSourceDescriptor::SharedCtor(::_pb::Arena* arena) {
-  new (&_impl_) Impl_(internal_visibility(), arena);
-  ::memset(reinterpret_cast<char *>(&_impl_) +
-               offsetof(Impl_, type_),
-           0,
-           offsetof(Impl_, partitioned_table_id_) -
-               offsetof(Impl_, type_) +
-               sizeof(Impl_::partitioned_table_id_));
-}
-FigureDescriptor_MultiSeriesSourceDescriptor::~FigureDescriptor_MultiSeriesSourceDescriptor() {
-  // @@protoc_insertion_point(destructor:io.deephaven.proto.backplane.script.grpc.FigureDescriptor.MultiSeriesSourceDescriptor)
-  _internal_metadata_.Delete<::google::protobuf::UnknownFieldSet>();
-  SharedDtor();
-}
-inline void FigureDescriptor_MultiSeriesSourceDescriptor::SharedDtor() {
-  ABSL_DCHECK(GetArena() == nullptr);
-  _impl_.axis_id_.Destroy();
-  _impl_.column_name_.Destroy();
-  _impl_.~Impl_();
-}
-
-PROTOBUF_NOINLINE void FigureDescriptor_MultiSeriesSourceDescriptor::Clear() {
-// @@protoc_insertion_point(message_clear_start:io.deephaven.proto.backplane.script.grpc.FigureDescriptor.MultiSeriesSourceDescriptor)
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  ::uint32_t cached_has_bits = 0;
-  // Prevent compiler warnings about cached_has_bits being unused
-  (void) cached_has_bits;
-
-  _impl_.axis_id_.ClearToEmpty();
-  _impl_.column_name_.ClearToEmpty();
-  ::memset(&_impl_.type_, 0, static_cast<::size_t>(
-      reinterpret_cast<char*>(&_impl_.partitioned_table_id_) -
-      reinterpret_cast<char*>(&_impl_.type_)) + sizeof(_impl_.partitioned_table_id_));
-  _internal_metadata_.Clear<::google::protobuf::UnknownFieldSet>();
-}
-
-const char* FigureDescriptor_MultiSeriesSourceDescriptor::_InternalParse(
-    const char* ptr, ::_pbi::ParseContext* ctx) {
-  ptr = ::_pbi::TcParser::ParseLoop(this, ptr, ctx, &_table_.header);
-  return ptr;
-}
-
-
-PROTOBUF_CONSTINIT PROTOBUF_ATTRIBUTE_INIT_PRIORITY1
-const ::_pbi::TcParseTable<2, 4, 0, 112, 2> FigureDescriptor_MultiSeriesSourceDescriptor::_table_ = {
-  {
-    0,  // no _has_bits_
-    0, // no _extensions_
-    4, 24,  // max_field_number, fast_idx_mask
-    offsetof(decltype(_table_), field_lookup_table),
-    4294967280,  // skipmap
-    offsetof(decltype(_table_), field_entries),
-    4,  // num_field_entries
-    0,  // num_aux_entries
-    offsetof(decltype(_table_), field_names),  // no aux_entries
-    &_FigureDescriptor_MultiSeriesSourceDescriptor_default_instance_._instance,
-    ::_pbi::TcParser::GenericFallback,  // fallback
-  }, {{
-    // string column_name = 4;
-    {::_pbi::TcParser::FastUS1,
-     {34, 63, 0, PROTOBUF_FIELD_OFFSET(FigureDescriptor_MultiSeriesSourceDescriptor, _impl_.column_name_)}},
-    // string axis_id = 1;
-    {::_pbi::TcParser::FastUS1,
-     {10, 63, 0, PROTOBUF_FIELD_OFFSET(FigureDescriptor_MultiSeriesSourceDescriptor, _impl_.axis_id_)}},
-    // .io.deephaven.proto.backplane.script.grpc.FigureDescriptor.SourceType type = 2;
-    {::_pbi::TcParser::SingularVarintNoZag1<::uint32_t, offsetof(FigureDescriptor_MultiSeriesSourceDescriptor, _impl_.type_), 63>(),
-     {16, 63, 0, PROTOBUF_FIELD_OFFSET(FigureDescriptor_MultiSeriesSourceDescriptor, _impl_.type_)}},
-    // int32 partitioned_table_id = 3;
-    {::_pbi::TcParser::SingularVarintNoZag1<::uint32_t, offsetof(FigureDescriptor_MultiSeriesSourceDescriptor, _impl_.partitioned_table_id_), 63>(),
-     {24, 63, 0, PROTOBUF_FIELD_OFFSET(FigureDescriptor_MultiSeriesSourceDescriptor, _impl_.partitioned_table_id_)}},
-  }}, {{
-    65535, 65535
-  }}, {{
-    // string axis_id = 1;
-    {PROTOBUF_FIELD_OFFSET(FigureDescriptor_MultiSeriesSourceDescriptor, _impl_.axis_id_), 0, 0,
-    (0 | ::_fl::kFcSingular | ::_fl::kUtf8String | ::_fl::kRepAString)},
-    // .io.deephaven.proto.backplane.script.grpc.FigureDescriptor.SourceType type = 2;
-    {PROTOBUF_FIELD_OFFSET(FigureDescriptor_MultiSeriesSourceDescriptor, _impl_.type_), 0, 0,
-    (0 | ::_fl::kFcSingular | ::_fl::kOpenEnum)},
-    // int32 partitioned_table_id = 3;
-    {PROTOBUF_FIELD_OFFSET(FigureDescriptor_MultiSeriesSourceDescriptor, _impl_.partitioned_table_id_), 0, 0,
-    (0 | ::_fl::kFcSingular | ::_fl::kInt32)},
-    // string column_name = 4;
-    {PROTOBUF_FIELD_OFFSET(FigureDescriptor_MultiSeriesSourceDescriptor, _impl_.column_name_), 0, 0,
-    (0 | ::_fl::kFcSingular | ::_fl::kUtf8String | ::_fl::kRepAString)},
-  }},
-  // no aux_entries
-  {{
-    "\125\7\0\0\13\0\0\0"
-    "io.deephaven.proto.backplane.script.grpc.FigureDescriptor.MultiSeriesSourceDescriptor"
-    "axis_id"
-    "column_name"
-  }},
-};
-
-::uint8_t* FigureDescriptor_MultiSeriesSourceDescriptor::_InternalSerialize(
-    ::uint8_t* target,
-    ::google::protobuf::io::EpsCopyOutputStream* stream) const {
-  // @@protoc_insertion_point(serialize_to_array_start:io.deephaven.proto.backplane.script.grpc.FigureDescriptor.MultiSeriesSourceDescriptor)
-  ::uint32_t cached_has_bits = 0;
-  (void)cached_has_bits;
-
-  // string axis_id = 1;
-  if (!this->_internal_axis_id().empty()) {
-    const std::string& _s = this->_internal_axis_id();
-    ::google::protobuf::internal::WireFormatLite::VerifyUtf8String(
-        _s.data(), static_cast<int>(_s.length()), ::google::protobuf::internal::WireFormatLite::SERIALIZE, "io.deephaven.proto.backplane.script.grpc.FigureDescriptor.MultiSeriesSourceDescriptor.axis_id");
-    target = stream->WriteStringMaybeAliased(1, _s, target);
-  }
-
-  // .io.deephaven.proto.backplane.script.grpc.FigureDescriptor.SourceType type = 2;
-  if (this->_internal_type() != 0) {
-    target = stream->EnsureSpace(target);
-    target = ::_pbi::WireFormatLite::WriteEnumToArray(
-        2, this->_internal_type(), target);
-  }
-
-  // int32 partitioned_table_id = 3;
-  if (this->_internal_partitioned_table_id() != 0) {
-    target = ::google::protobuf::internal::WireFormatLite::
-        WriteInt32ToArrayWithField<3>(
-            stream, this->_internal_partitioned_table_id(), target);
-  }
-
-  // string column_name = 4;
-  if (!this->_internal_column_name().empty()) {
-    const std::string& _s = this->_internal_column_name();
-    ::google::protobuf::internal::WireFormatLite::VerifyUtf8String(
-        _s.data(), static_cast<int>(_s.length()), ::google::protobuf::internal::WireFormatLite::SERIALIZE, "io.deephaven.proto.backplane.script.grpc.FigureDescriptor.MultiSeriesSourceDescriptor.column_name");
-    target = stream->WriteStringMaybeAliased(4, _s, target);
-  }
-
-  if (PROTOBUF_PREDICT_FALSE(_internal_metadata_.have_unknown_fields())) {
-    target =
-        ::_pbi::WireFormat::InternalSerializeUnknownFieldsToArray(
-            _internal_metadata_.unknown_fields<::google::protobuf::UnknownFieldSet>(::google::protobuf::UnknownFieldSet::default_instance), target, stream);
-  }
-  // @@protoc_insertion_point(serialize_to_array_end:io.deephaven.proto.backplane.script.grpc.FigureDescriptor.MultiSeriesSourceDescriptor)
-  return target;
-}
-
-::size_t FigureDescriptor_MultiSeriesSourceDescriptor::ByteSizeLong() const {
-// @@protoc_insertion_point(message_byte_size_start:io.deephaven.proto.backplane.script.grpc.FigureDescriptor.MultiSeriesSourceDescriptor)
-  ::size_t total_size = 0;
-
-  ::uint32_t cached_has_bits = 0;
-  // Prevent compiler warnings about cached_has_bits being unused
-  (void) cached_has_bits;
-
-  // string axis_id = 1;
-  if (!this->_internal_axis_id().empty()) {
-    total_size += 1 + ::google::protobuf::internal::WireFormatLite::StringSize(
-                                    this->_internal_axis_id());
-  }
-
-  // string column_name = 4;
-  if (!this->_internal_column_name().empty()) {
-    total_size += 1 + ::google::protobuf::internal::WireFormatLite::StringSize(
-                                    this->_internal_column_name());
-  }
-
-  // .io.deephaven.proto.backplane.script.grpc.FigureDescriptor.SourceType type = 2;
-  if (this->_internal_type() != 0) {
-    total_size += 1 +
-                  ::_pbi::WireFormatLite::EnumSize(this->_internal_type());
-  }
-
-  // int32 partitioned_table_id = 3;
-  if (this->_internal_partitioned_table_id() != 0) {
-    total_size += ::_pbi::WireFormatLite::Int32SizePlusOne(
-        this->_internal_partitioned_table_id());
-  }
-
-  return MaybeComputeUnknownFieldsSize(total_size, &_impl_._cached_size_);
-}
-
-const ::google::protobuf::Message::ClassData FigureDescriptor_MultiSeriesSourceDescriptor::_class_data_ = {
-    FigureDescriptor_MultiSeriesSourceDescriptor::MergeImpl,
-    nullptr,  // OnDemandRegisterArenaDtor
-};
-const ::google::protobuf::Message::ClassData* FigureDescriptor_MultiSeriesSourceDescriptor::GetClassData() const {
-  return &_class_data_;
-}
-
-void FigureDescriptor_MultiSeriesSourceDescriptor::MergeImpl(::google::protobuf::Message& to_msg, const ::google::protobuf::Message& from_msg) {
-  auto* const _this = static_cast<FigureDescriptor_MultiSeriesSourceDescriptor*>(&to_msg);
-  auto& from = static_cast<const FigureDescriptor_MultiSeriesSourceDescriptor&>(from_msg);
-  // @@protoc_insertion_point(class_specific_merge_from_start:io.deephaven.proto.backplane.script.grpc.FigureDescriptor.MultiSeriesSourceDescriptor)
-  ABSL_DCHECK_NE(&from, _this);
-  ::uint32_t cached_has_bits = 0;
-  (void) cached_has_bits;
-
-  if (!from._internal_axis_id().empty()) {
-    _this->_internal_set_axis_id(from._internal_axis_id());
-  }
-  if (!from._internal_column_name().empty()) {
-    _this->_internal_set_column_name(from._internal_column_name());
-  }
-  if (from._internal_type() != 0) {
-    _this->_internal_set_type(from._internal_type());
-  }
-  if (from._internal_partitioned_table_id() != 0) {
-    _this->_internal_set_partitioned_table_id(from._internal_partitioned_table_id());
-  }
-  _this->_internal_metadata_.MergeFrom<::google::protobuf::UnknownFieldSet>(from._internal_metadata_);
-}
-
-void FigureDescriptor_MultiSeriesSourceDescriptor::CopyFrom(const FigureDescriptor_MultiSeriesSourceDescriptor& from) {
-// @@protoc_insertion_point(class_specific_copy_from_start:io.deephaven.proto.backplane.script.grpc.FigureDescriptor.MultiSeriesSourceDescriptor)
-  if (&from == this) return;
-  Clear();
-  MergeFrom(from);
-}
-
-PROTOBUF_NOINLINE bool FigureDescriptor_MultiSeriesSourceDescriptor::IsInitialized() const {
-  return true;
-}
-
-::_pbi::CachedSize* FigureDescriptor_MultiSeriesSourceDescriptor::AccessCachedSize() const {
-  return &_impl_._cached_size_;
-}
-void FigureDescriptor_MultiSeriesSourceDescriptor::InternalSwap(FigureDescriptor_MultiSeriesSourceDescriptor* PROTOBUF_RESTRICT other) {
-  using std::swap;
-  auto* arena = GetArena();
-  ABSL_DCHECK_EQ(arena, other->GetArena());
-  _internal_metadata_.InternalSwap(&other->_internal_metadata_);
-  ::_pbi::ArenaStringPtr::InternalSwap(&_impl_.axis_id_, &other->_impl_.axis_id_, arena);
-  ::_pbi::ArenaStringPtr::InternalSwap(&_impl_.column_name_, &other->_impl_.column_name_, arena);
-  ::google::protobuf::internal::memswap<
-      PROTOBUF_FIELD_OFFSET(FigureDescriptor_MultiSeriesSourceDescriptor, _impl_.partitioned_table_id_)
-      + sizeof(FigureDescriptor_MultiSeriesSourceDescriptor::_impl_.partitioned_table_id_)
-      - PROTOBUF_FIELD_OFFSET(FigureDescriptor_MultiSeriesSourceDescriptor, _impl_.type_)>(
-          reinterpret_cast<char*>(&_impl_.type_),
-          reinterpret_cast<char*>(&other->_impl_.type_));
-}
-
-::google::protobuf::Metadata FigureDescriptor_MultiSeriesSourceDescriptor::GetMetadata() const {
-  return ::_pbi::AssignDescriptors(
-      &descriptor_table_deephaven_2fproto_2fconsole_2eproto_getter, &descriptor_table_deephaven_2fproto_2fconsole_2eproto_once,
-      file_level_metadata_deephaven_2fproto_2fconsole_2eproto[56]);
-}
-// ===================================================================
-
-class FigureDescriptor_SourceDescriptor::_Internal {
- public:
-  using HasBits = decltype(std::declval<FigureDescriptor_SourceDescriptor>()._impl_._has_bits_);
-  static constexpr ::int32_t kHasBitsOffset =
-    8 * PROTOBUF_FIELD_OFFSET(FigureDescriptor_SourceDescriptor, _impl_._has_bits_);
-  static const ::io::deephaven::proto::backplane::script::grpc::FigureDescriptor_OneClickDescriptor& one_click(const FigureDescriptor_SourceDescriptor* msg);
-  static void set_has_one_click(HasBits* has_bits) {
-    (*has_bits)[0] |= 1u;
-  }
-};
-
-const ::io::deephaven::proto::backplane::script::grpc::FigureDescriptor_OneClickDescriptor& FigureDescriptor_SourceDescriptor::_Internal::one_click(const FigureDescriptor_SourceDescriptor* msg) {
-  return *msg->_impl_.one_click_;
-}
-FigureDescriptor_SourceDescriptor::FigureDescriptor_SourceDescriptor(::google::protobuf::Arena* arena)
-    : ::google::protobuf::Message(arena) {
-  SharedCtor(arena);
-  // @@protoc_insertion_point(arena_constructor:io.deephaven.proto.backplane.script.grpc.FigureDescriptor.SourceDescriptor)
-}
-inline PROTOBUF_NDEBUG_INLINE FigureDescriptor_SourceDescriptor::Impl_::Impl_(
-    ::google::protobuf::internal::InternalVisibility visibility, ::google::protobuf::Arena* arena,
-    const Impl_& from)
-      : _has_bits_{from._has_bits_},
-        _cached_size_{0},
-        axis_id_(arena, from.axis_id_),
-        column_name_(arena, from.column_name_),
-        column_type_(arena, from.column_type_) {}
-
-FigureDescriptor_SourceDescriptor::FigureDescriptor_SourceDescriptor(
-    ::google::protobuf::Arena* arena,
-    const FigureDescriptor_SourceDescriptor& from)
-    : ::google::protobuf::Message(arena) {
-  FigureDescriptor_SourceDescriptor* const _this = this;
-  (void)_this;
-  _internal_metadata_.MergeFrom<::google::protobuf::UnknownFieldSet>(
-      from._internal_metadata_);
-  new (&_impl_) Impl_(internal_visibility(), arena, from._impl_);
-  ::uint32_t cached_has_bits = _impl_._has_bits_[0];
-  _impl_.one_click_ = (cached_has_bits & 0x00000001u)
-                ? CreateMaybeMessage<::io::deephaven::proto::backplane::script::grpc::FigureDescriptor_OneClickDescriptor>(arena, *from._impl_.one_click_)
-                : nullptr;
-  ::memcpy(reinterpret_cast<char *>(&_impl_) +
-               offsetof(Impl_, type_),
-           reinterpret_cast<const char *>(&from._impl_) +
-               offsetof(Impl_, type_),
-           offsetof(Impl_, partitioned_table_id_) -
-               offsetof(Impl_, type_) +
-               sizeof(Impl_::partitioned_table_id_));
-
-  // @@protoc_insertion_point(copy_constructor:io.deephaven.proto.backplane.script.grpc.FigureDescriptor.SourceDescriptor)
-}
-inline PROTOBUF_NDEBUG_INLINE FigureDescriptor_SourceDescriptor::Impl_::Impl_(
-    ::google::protobuf::internal::InternalVisibility visibility,
-    ::google::protobuf::Arena* arena)
-      : _cached_size_{0},
-        axis_id_(arena),
-        column_name_(arena),
-        column_type_(arena) {}
-
-inline void FigureDescriptor_SourceDescriptor::SharedCtor(::_pb::Arena* arena) {
-  new (&_impl_) Impl_(internal_visibility(), arena);
-  ::memset(reinterpret_cast<char *>(&_impl_) +
-               offsetof(Impl_, one_click_),
-           0,
-           offsetof(Impl_, partitioned_table_id_) -
-               offsetof(Impl_, one_click_) +
-               sizeof(Impl_::partitioned_table_id_));
-}
-FigureDescriptor_SourceDescriptor::~FigureDescriptor_SourceDescriptor() {
-  // @@protoc_insertion_point(destructor:io.deephaven.proto.backplane.script.grpc.FigureDescriptor.SourceDescriptor)
-  _internal_metadata_.Delete<::google::protobuf::UnknownFieldSet>();
-  SharedDtor();
-}
-inline void FigureDescriptor_SourceDescriptor::SharedDtor() {
-  ABSL_DCHECK(GetArena() == nullptr);
-  _impl_.axis_id_.Destroy();
-  _impl_.column_name_.Destroy();
-  _impl_.column_type_.Destroy();
-  delete _impl_.one_click_;
-  _impl_.~Impl_();
-}
-
-PROTOBUF_NOINLINE void FigureDescriptor_SourceDescriptor::Clear() {
-// @@protoc_insertion_point(message_clear_start:io.deephaven.proto.backplane.script.grpc.FigureDescriptor.SourceDescriptor)
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  ::uint32_t cached_has_bits = 0;
-  // Prevent compiler warnings about cached_has_bits being unused
-  (void) cached_has_bits;
-
-  _impl_.axis_id_.ClearToEmpty();
-  _impl_.column_name_.ClearToEmpty();
-  _impl_.column_type_.ClearToEmpty();
-  cached_has_bits = _impl_._has_bits_[0];
-  if (cached_has_bits & 0x00000001u) {
-    ABSL_DCHECK(_impl_.one_click_ != nullptr);
-    _impl_.one_click_->Clear();
-  }
-  ::memset(&_impl_.type_, 0, static_cast<::size_t>(
-      reinterpret_cast<char*>(&_impl_.partitioned_table_id_) -
-      reinterpret_cast<char*>(&_impl_.type_)) + sizeof(_impl_.partitioned_table_id_));
-  _impl_._has_bits_.Clear();
-  _internal_metadata_.Clear<::google::protobuf::UnknownFieldSet>();
-}
-
-const char* FigureDescriptor_SourceDescriptor::_InternalParse(
-    const char* ptr, ::_pbi::ParseContext* ctx) {
-  ptr = ::_pbi::TcParser::ParseLoop(this, ptr, ctx, &_table_.header);
-  return ptr;
-}
-
-
-PROTOBUF_CONSTINIT PROTOBUF_ATTRIBUTE_INIT_PRIORITY1
-const ::_pbi::TcParseTable<3, 7, 1, 112, 2> FigureDescriptor_SourceDescriptor::_table_ = {
-  {
-    PROTOBUF_FIELD_OFFSET(FigureDescriptor_SourceDescriptor, _impl_._has_bits_),
-    0, // no _extensions_
-    7, 56,  // max_field_number, fast_idx_mask
-    offsetof(decltype(_table_), field_lookup_table),
-    4294967168,  // skipmap
-    offsetof(decltype(_table_), field_entries),
-    7,  // num_field_entries
-    1,  // num_aux_entries
-    offsetof(decltype(_table_), aux_entries),
-    &_FigureDescriptor_SourceDescriptor_default_instance_._instance,
-    ::_pbi::TcParser::GenericFallback,  // fallback
-  }, {{
-    {::_pbi::TcParser::MiniParse, {}},
-    // string axis_id = 1;
-    {::_pbi::TcParser::FastUS1,
-     {10, 63, 0, PROTOBUF_FIELD_OFFSET(FigureDescriptor_SourceDescriptor, _impl_.axis_id_)}},
-    // .io.deephaven.proto.backplane.script.grpc.FigureDescriptor.SourceType type = 2;
-    {::_pbi::TcParser::SingularVarintNoZag1<::uint32_t, offsetof(FigureDescriptor_SourceDescriptor, _impl_.type_), 63>(),
-     {16, 63, 0, PROTOBUF_FIELD_OFFSET(FigureDescriptor_SourceDescriptor, _impl_.type_)}},
-    // int32 table_id = 3;
-    {::_pbi::TcParser::SingularVarintNoZag1<::uint32_t, offsetof(FigureDescriptor_SourceDescriptor, _impl_.table_id_), 63>(),
-     {24, 63, 0, PROTOBUF_FIELD_OFFSET(FigureDescriptor_SourceDescriptor, _impl_.table_id_)}},
-    // int32 partitioned_table_id = 4;
-    {::_pbi::TcParser::SingularVarintNoZag1<::uint32_t, offsetof(FigureDescriptor_SourceDescriptor, _impl_.partitioned_table_id_), 63>(),
-     {32, 63, 0, PROTOBUF_FIELD_OFFSET(FigureDescriptor_SourceDescriptor, _impl_.partitioned_table_id_)}},
-    // string column_name = 5;
-    {::_pbi::TcParser::FastUS1,
-     {42, 63, 0, PROTOBUF_FIELD_OFFSET(FigureDescriptor_SourceDescriptor, _impl_.column_name_)}},
-    // string column_type = 6;
-    {::_pbi::TcParser::FastUS1,
-     {50, 63, 0, PROTOBUF_FIELD_OFFSET(FigureDescriptor_SourceDescriptor, _impl_.column_type_)}},
-    // .io.deephaven.proto.backplane.script.grpc.FigureDescriptor.OneClickDescriptor one_click = 7;
-    {::_pbi::TcParser::FastMtS1,
-     {58, 0, 0, PROTOBUF_FIELD_OFFSET(FigureDescriptor_SourceDescriptor, _impl_.one_click_)}},
-  }}, {{
-    65535, 65535
-  }}, {{
-    // string axis_id = 1;
-    {PROTOBUF_FIELD_OFFSET(FigureDescriptor_SourceDescriptor, _impl_.axis_id_), -1, 0,
-    (0 | ::_fl::kFcSingular | ::_fl::kUtf8String | ::_fl::kRepAString)},
-    // .io.deephaven.proto.backplane.script.grpc.FigureDescriptor.SourceType type = 2;
-    {PROTOBUF_FIELD_OFFSET(FigureDescriptor_SourceDescriptor, _impl_.type_), -1, 0,
-    (0 | ::_fl::kFcSingular | ::_fl::kOpenEnum)},
-    // int32 table_id = 3;
-    {PROTOBUF_FIELD_OFFSET(FigureDescriptor_SourceDescriptor, _impl_.table_id_), -1, 0,
-    (0 | ::_fl::kFcSingular | ::_fl::kInt32)},
-    // int32 partitioned_table_id = 4;
-    {PROTOBUF_FIELD_OFFSET(FigureDescriptor_SourceDescriptor, _impl_.partitioned_table_id_), -1, 0,
-    (0 | ::_fl::kFcSingular | ::_fl::kInt32)},
-    // string column_name = 5;
-    {PROTOBUF_FIELD_OFFSET(FigureDescriptor_SourceDescriptor, _impl_.column_name_), -1, 0,
-    (0 | ::_fl::kFcSingular | ::_fl::kUtf8String | ::_fl::kRepAString)},
-    // string column_type = 6;
-    {PROTOBUF_FIELD_OFFSET(FigureDescriptor_SourceDescriptor, _impl_.column_type_), -1, 0,
-    (0 | ::_fl::kFcSingular | ::_fl::kUtf8String | ::_fl::kRepAString)},
-    // .io.deephaven.proto.backplane.script.grpc.FigureDescriptor.OneClickDescriptor one_click = 7;
-    {PROTOBUF_FIELD_OFFSET(FigureDescriptor_SourceDescriptor, _impl_.one_click_), _Internal::kHasBitsOffset + 0, 0,
-    (0 | ::_fl::kFcOptional | ::_fl::kMessage | ::_fl::kTvTable)},
-  }}, {{
-    {::_pbi::TcParser::GetTable<::io::deephaven::proto::backplane::script::grpc::FigureDescriptor_OneClickDescriptor>()},
-  }}, {{
-    "\112\7\0\0\0\13\13\0"
-    "io.deephaven.proto.backplane.script.grpc.FigureDescriptor.SourceDescriptor"
-    "axis_id"
-    "column_name"
-    "column_type"
-  }},
-};
-
-::uint8_t* FigureDescriptor_SourceDescriptor::_InternalSerialize(
-    ::uint8_t* target,
-    ::google::protobuf::io::EpsCopyOutputStream* stream) const {
-  // @@protoc_insertion_point(serialize_to_array_start:io.deephaven.proto.backplane.script.grpc.FigureDescriptor.SourceDescriptor)
-  ::uint32_t cached_has_bits = 0;
-  (void)cached_has_bits;
-
-  // string axis_id = 1;
-  if (!this->_internal_axis_id().empty()) {
-    const std::string& _s = this->_internal_axis_id();
-    ::google::protobuf::internal::WireFormatLite::VerifyUtf8String(
-        _s.data(), static_cast<int>(_s.length()), ::google::protobuf::internal::WireFormatLite::SERIALIZE, "io.deephaven.proto.backplane.script.grpc.FigureDescriptor.SourceDescriptor.axis_id");
-    target = stream->WriteStringMaybeAliased(1, _s, target);
-  }
-
-  // .io.deephaven.proto.backplane.script.grpc.FigureDescriptor.SourceType type = 2;
-  if (this->_internal_type() != 0) {
-    target = stream->EnsureSpace(target);
-    target = ::_pbi::WireFormatLite::WriteEnumToArray(
-        2, this->_internal_type(), target);
-  }
-
-  // int32 table_id = 3;
-  if (this->_internal_table_id() != 0) {
-    target = ::google::protobuf::internal::WireFormatLite::
-        WriteInt32ToArrayWithField<3>(
-            stream, this->_internal_table_id(), target);
-  }
-
-  // int32 partitioned_table_id = 4;
-  if (this->_internal_partitioned_table_id() != 0) {
-    target = ::google::protobuf::internal::WireFormatLite::
-        WriteInt32ToArrayWithField<4>(
-            stream, this->_internal_partitioned_table_id(), target);
-  }
-
-  // string column_name = 5;
-  if (!this->_internal_column_name().empty()) {
-    const std::string& _s = this->_internal_column_name();
-    ::google::protobuf::internal::WireFormatLite::VerifyUtf8String(
-        _s.data(), static_cast<int>(_s.length()), ::google::protobuf::internal::WireFormatLite::SERIALIZE, "io.deephaven.proto.backplane.script.grpc.FigureDescriptor.SourceDescriptor.column_name");
-    target = stream->WriteStringMaybeAliased(5, _s, target);
-  }
-
-  // string column_type = 6;
-  if (!this->_internal_column_type().empty()) {
-    const std::string& _s = this->_internal_column_type();
-    ::google::protobuf::internal::WireFormatLite::VerifyUtf8String(
-        _s.data(), static_cast<int>(_s.length()), ::google::protobuf::internal::WireFormatLite::SERIALIZE, "io.deephaven.proto.backplane.script.grpc.FigureDescriptor.SourceDescriptor.column_type");
-    target = stream->WriteStringMaybeAliased(6, _s, target);
-  }
-
-  cached_has_bits = _impl_._has_bits_[0];
-  // .io.deephaven.proto.backplane.script.grpc.FigureDescriptor.OneClickDescriptor one_click = 7;
-  if (cached_has_bits & 0x00000001u) {
-    target = ::google::protobuf::internal::WireFormatLite::InternalWriteMessage(
-        7, _Internal::one_click(this),
-        _Internal::one_click(this).GetCachedSize(), target, stream);
-  }
-
-  if (PROTOBUF_PREDICT_FALSE(_internal_metadata_.have_unknown_fields())) {
-    target =
-        ::_pbi::WireFormat::InternalSerializeUnknownFieldsToArray(
-            _internal_metadata_.unknown_fields<::google::protobuf::UnknownFieldSet>(::google::protobuf::UnknownFieldSet::default_instance), target, stream);
-  }
-  // @@protoc_insertion_point(serialize_to_array_end:io.deephaven.proto.backplane.script.grpc.FigureDescriptor.SourceDescriptor)
-  return target;
-}
-
-::size_t FigureDescriptor_SourceDescriptor::ByteSizeLong() const {
-// @@protoc_insertion_point(message_byte_size_start:io.deephaven.proto.backplane.script.grpc.FigureDescriptor.SourceDescriptor)
-  ::size_t total_size = 0;
-
-  ::uint32_t cached_has_bits = 0;
-  // Prevent compiler warnings about cached_has_bits being unused
-  (void) cached_has_bits;
-
-  // string axis_id = 1;
-  if (!this->_internal_axis_id().empty()) {
-    total_size += 1 + ::google::protobuf::internal::WireFormatLite::StringSize(
-                                    this->_internal_axis_id());
-  }
-
-  // string column_name = 5;
-  if (!this->_internal_column_name().empty()) {
-    total_size += 1 + ::google::protobuf::internal::WireFormatLite::StringSize(
-                                    this->_internal_column_name());
-  }
-
-  // string column_type = 6;
-  if (!this->_internal_column_type().empty()) {
-    total_size += 1 + ::google::protobuf::internal::WireFormatLite::StringSize(
-                                    this->_internal_column_type());
-  }
-
-  // .io.deephaven.proto.backplane.script.grpc.FigureDescriptor.OneClickDescriptor one_click = 7;
-  cached_has_bits = _impl_._has_bits_[0];
-  if (cached_has_bits & 0x00000001u) {
-    total_size +=
-        1 + ::google::protobuf::internal::WireFormatLite::MessageSize(*_impl_.one_click_);
-  }
-
-  // .io.deephaven.proto.backplane.script.grpc.FigureDescriptor.SourceType type = 2;
-  if (this->_internal_type() != 0) {
-    total_size += 1 +
-                  ::_pbi::WireFormatLite::EnumSize(this->_internal_type());
-  }
-
-  // int32 table_id = 3;
-  if (this->_internal_table_id() != 0) {
-    total_size += ::_pbi::WireFormatLite::Int32SizePlusOne(
-        this->_internal_table_id());
-  }
-
-  // int32 partitioned_table_id = 4;
-  if (this->_internal_partitioned_table_id() != 0) {
-    total_size += ::_pbi::WireFormatLite::Int32SizePlusOne(
-        this->_internal_partitioned_table_id());
-  }
-
-  return MaybeComputeUnknownFieldsSize(total_size, &_impl_._cached_size_);
-}
-
-const ::google::protobuf::Message::ClassData FigureDescriptor_SourceDescriptor::_class_data_ = {
-    FigureDescriptor_SourceDescriptor::MergeImpl,
-    nullptr,  // OnDemandRegisterArenaDtor
-};
-const ::google::protobuf::Message::ClassData* FigureDescriptor_SourceDescriptor::GetClassData() const {
-  return &_class_data_;
-}
-
-void FigureDescriptor_SourceDescriptor::MergeImpl(::google::protobuf::Message& to_msg, const ::google::protobuf::Message& from_msg) {
-  auto* const _this = static_cast<FigureDescriptor_SourceDescriptor*>(&to_msg);
-  auto& from = static_cast<const FigureDescriptor_SourceDescriptor&>(from_msg);
-  // @@protoc_insertion_point(class_specific_merge_from_start:io.deephaven.proto.backplane.script.grpc.FigureDescriptor.SourceDescriptor)
-  ABSL_DCHECK_NE(&from, _this);
-  ::uint32_t cached_has_bits = 0;
-  (void) cached_has_bits;
-
-  if (!from._internal_axis_id().empty()) {
-    _this->_internal_set_axis_id(from._internal_axis_id());
-  }
-  if (!from._internal_column_name().empty()) {
-    _this->_internal_set_column_name(from._internal_column_name());
-  }
-  if (!from._internal_column_type().empty()) {
-    _this->_internal_set_column_type(from._internal_column_type());
-  }
-  if ((from._impl_._has_bits_[0] & 0x00000001u) != 0) {
-    _this->_internal_mutable_one_click()->::io::deephaven::proto::backplane::script::grpc::FigureDescriptor_OneClickDescriptor::MergeFrom(
-        from._internal_one_click());
-  }
-  if (from._internal_type() != 0) {
-    _this->_internal_set_type(from._internal_type());
-  }
-  if (from._internal_table_id() != 0) {
-    _this->_internal_set_table_id(from._internal_table_id());
-  }
-  if (from._internal_partitioned_table_id() != 0) {
-    _this->_internal_set_partitioned_table_id(from._internal_partitioned_table_id());
-  }
-  _this->_internal_metadata_.MergeFrom<::google::protobuf::UnknownFieldSet>(from._internal_metadata_);
-}
-
-void FigureDescriptor_SourceDescriptor::CopyFrom(const FigureDescriptor_SourceDescriptor& from) {
-// @@protoc_insertion_point(class_specific_copy_from_start:io.deephaven.proto.backplane.script.grpc.FigureDescriptor.SourceDescriptor)
-  if (&from == this) return;
-  Clear();
-  MergeFrom(from);
-}
-
-PROTOBUF_NOINLINE bool FigureDescriptor_SourceDescriptor::IsInitialized() const {
-  return true;
-}
-
-::_pbi::CachedSize* FigureDescriptor_SourceDescriptor::AccessCachedSize() const {
-  return &_impl_._cached_size_;
-}
-void FigureDescriptor_SourceDescriptor::InternalSwap(FigureDescriptor_SourceDescriptor* PROTOBUF_RESTRICT other) {
-  using std::swap;
-  auto* arena = GetArena();
-  ABSL_DCHECK_EQ(arena, other->GetArena());
-  _internal_metadata_.InternalSwap(&other->_internal_metadata_);
-  swap(_impl_._has_bits_[0], other->_impl_._has_bits_[0]);
-  ::_pbi::ArenaStringPtr::InternalSwap(&_impl_.axis_id_, &other->_impl_.axis_id_, arena);
-  ::_pbi::ArenaStringPtr::InternalSwap(&_impl_.column_name_, &other->_impl_.column_name_, arena);
-  ::_pbi::ArenaStringPtr::InternalSwap(&_impl_.column_type_, &other->_impl_.column_type_, arena);
-  ::google::protobuf::internal::memswap<
-      PROTOBUF_FIELD_OFFSET(FigureDescriptor_SourceDescriptor, _impl_.partitioned_table_id_)
-      + sizeof(FigureDescriptor_SourceDescriptor::_impl_.partitioned_table_id_)
-      - PROTOBUF_FIELD_OFFSET(FigureDescriptor_SourceDescriptor, _impl_.one_click_)>(
-          reinterpret_cast<char*>(&_impl_.one_click_),
-          reinterpret_cast<char*>(&other->_impl_.one_click_));
-}
-
-::google::protobuf::Metadata FigureDescriptor_SourceDescriptor::GetMetadata() const {
-  return ::_pbi::AssignDescriptors(
-      &descriptor_table_deephaven_2fproto_2fconsole_2eproto_getter, &descriptor_table_deephaven_2fproto_2fconsole_2eproto_once,
-      file_level_metadata_deephaven_2fproto_2fconsole_2eproto[57]);
-}
-// ===================================================================
-
-class FigureDescriptor_OneClickDescriptor::_Internal {
- public:
-};
-
-FigureDescriptor_OneClickDescriptor::FigureDescriptor_OneClickDescriptor(::google::protobuf::Arena* arena)
-    : ::google::protobuf::Message(arena) {
-  SharedCtor(arena);
-  // @@protoc_insertion_point(arena_constructor:io.deephaven.proto.backplane.script.grpc.FigureDescriptor.OneClickDescriptor)
-}
-inline PROTOBUF_NDEBUG_INLINE FigureDescriptor_OneClickDescriptor::Impl_::Impl_(
-    ::google::protobuf::internal::InternalVisibility visibility, ::google::protobuf::Arena* arena,
-    const Impl_& from)
-      : columns_{visibility, arena, from.columns_},
-        column_types_{visibility, arena, from.column_types_},
-        _cached_size_{0} {}
-
-FigureDescriptor_OneClickDescriptor::FigureDescriptor_OneClickDescriptor(
-    ::google::protobuf::Arena* arena,
-    const FigureDescriptor_OneClickDescriptor& from)
-    : ::google::protobuf::Message(arena) {
-  FigureDescriptor_OneClickDescriptor* const _this = this;
-  (void)_this;
-  _internal_metadata_.MergeFrom<::google::protobuf::UnknownFieldSet>(
-      from._internal_metadata_);
-  new (&_impl_) Impl_(internal_visibility(), arena, from._impl_);
-  _impl_.require_all_filters_to_display_ = from._impl_.require_all_filters_to_display_;
-
-  // @@protoc_insertion_point(copy_constructor:io.deephaven.proto.backplane.script.grpc.FigureDescriptor.OneClickDescriptor)
-}
-inline PROTOBUF_NDEBUG_INLINE FigureDescriptor_OneClickDescriptor::Impl_::Impl_(
-    ::google::protobuf::internal::InternalVisibility visibility,
-    ::google::protobuf::Arena* arena)
-      : columns_{visibility, arena},
-        column_types_{visibility, arena},
-        _cached_size_{0} {}
-
-inline void FigureDescriptor_OneClickDescriptor::SharedCtor(::_pb::Arena* arena) {
-  new (&_impl_) Impl_(internal_visibility(), arena);
-  _impl_.require_all_filters_to_display_ = {};
-}
-FigureDescriptor_OneClickDescriptor::~FigureDescriptor_OneClickDescriptor() {
-  // @@protoc_insertion_point(destructor:io.deephaven.proto.backplane.script.grpc.FigureDescriptor.OneClickDescriptor)
-  _internal_metadata_.Delete<::google::protobuf::UnknownFieldSet>();
-  SharedDtor();
-}
-inline void FigureDescriptor_OneClickDescriptor::SharedDtor() {
-  ABSL_DCHECK(GetArena() == nullptr);
-  _impl_.~Impl_();
-}
-
-PROTOBUF_NOINLINE void FigureDescriptor_OneClickDescriptor::Clear() {
-// @@protoc_insertion_point(message_clear_start:io.deephaven.proto.backplane.script.grpc.FigureDescriptor.OneClickDescriptor)
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  ::uint32_t cached_has_bits = 0;
-  // Prevent compiler warnings about cached_has_bits being unused
-  (void) cached_has_bits;
-
-  _impl_.columns_.Clear();
-  _impl_.column_types_.Clear();
-  _impl_.require_all_filters_to_display_ = false;
-  _internal_metadata_.Clear<::google::protobuf::UnknownFieldSet>();
-}
-
-const char* FigureDescriptor_OneClickDescriptor::_InternalParse(
-    const char* ptr, ::_pbi::ParseContext* ctx) {
-  ptr = ::_pbi::TcParser::ParseLoop(this, ptr, ctx, &_table_.header);
-  return ptr;
-}
-
-
-PROTOBUF_CONSTINIT PROTOBUF_ATTRIBUTE_INIT_PRIORITY1
-const ::_pbi::TcParseTable<2, 3, 0, 104, 2> FigureDescriptor_OneClickDescriptor::_table_ = {
-  {
-    0,  // no _has_bits_
-    0, // no _extensions_
-    3, 24,  // max_field_number, fast_idx_mask
-    offsetof(decltype(_table_), field_lookup_table),
-    4294967288,  // skipmap
-    offsetof(decltype(_table_), field_entries),
-    3,  // num_field_entries
-    0,  // num_aux_entries
-    offsetof(decltype(_table_), field_names),  // no aux_entries
-    &_FigureDescriptor_OneClickDescriptor_default_instance_._instance,
-    ::_pbi::TcParser::GenericFallback,  // fallback
-  }, {{
-    {::_pbi::TcParser::MiniParse, {}},
-    // repeated string columns = 1;
-    {::_pbi::TcParser::FastUR1,
-     {10, 63, 0, PROTOBUF_FIELD_OFFSET(FigureDescriptor_OneClickDescriptor, _impl_.columns_)}},
-    // repeated string column_types = 2;
-    {::_pbi::TcParser::FastUR1,
-     {18, 63, 0, PROTOBUF_FIELD_OFFSET(FigureDescriptor_OneClickDescriptor, _impl_.column_types_)}},
-    // bool require_all_filters_to_display = 3;
-    {::_pbi::TcParser::SingularVarintNoZag1<bool, offsetof(FigureDescriptor_OneClickDescriptor, _impl_.require_all_filters_to_display_), 63>(),
-     {24, 63, 0, PROTOBUF_FIELD_OFFSET(FigureDescriptor_OneClickDescriptor, _impl_.require_all_filters_to_display_)}},
-  }}, {{
-    65535, 65535
-  }}, {{
-    // repeated string columns = 1;
-    {PROTOBUF_FIELD_OFFSET(FigureDescriptor_OneClickDescriptor, _impl_.columns_), 0, 0,
-    (0 | ::_fl::kFcRepeated | ::_fl::kUtf8String | ::_fl::kRepSString)},
-    // repeated string column_types = 2;
-    {PROTOBUF_FIELD_OFFSET(FigureDescriptor_OneClickDescriptor, _impl_.column_types_), 0, 0,
-    (0 | ::_fl::kFcRepeated | ::_fl::kUtf8String | ::_fl::kRepSString)},
-    // bool require_all_filters_to_display = 3;
-    {PROTOBUF_FIELD_OFFSET(FigureDescriptor_OneClickDescriptor, _impl_.require_all_filters_to_display_), 0, 0,
-    (0 | ::_fl::kFcSingular | ::_fl::kBool)},
-  }},
-  // no aux_entries
-  {{
-    "\114\7\14\0\0\0\0\0"
-    "io.deephaven.proto.backplane.script.grpc.FigureDescriptor.OneClickDescriptor"
-    "columns"
-    "column_types"
-  }},
-};
-
-::uint8_t* FigureDescriptor_OneClickDescriptor::_InternalSerialize(
-    ::uint8_t* target,
-    ::google::protobuf::io::EpsCopyOutputStream* stream) const {
-  // @@protoc_insertion_point(serialize_to_array_start:io.deephaven.proto.backplane.script.grpc.FigureDescriptor.OneClickDescriptor)
-  ::uint32_t cached_has_bits = 0;
-  (void)cached_has_bits;
-
-  // repeated string columns = 1;
-  for (int i = 0, n = this->_internal_columns_size(); i < n; ++i) {
-    const auto& s = this->_internal_columns().Get(i);
-    ::google::protobuf::internal::WireFormatLite::VerifyUtf8String(
-        s.data(), static_cast<int>(s.length()), ::google::protobuf::internal::WireFormatLite::SERIALIZE, "io.deephaven.proto.backplane.script.grpc.FigureDescriptor.OneClickDescriptor.columns");
-    target = stream->WriteString(1, s, target);
-  }
-
-  // repeated string column_types = 2;
-  for (int i = 0, n = this->_internal_column_types_size(); i < n; ++i) {
-    const auto& s = this->_internal_column_types().Get(i);
-    ::google::protobuf::internal::WireFormatLite::VerifyUtf8String(
-        s.data(), static_cast<int>(s.length()), ::google::protobuf::internal::WireFormatLite::SERIALIZE, "io.deephaven.proto.backplane.script.grpc.FigureDescriptor.OneClickDescriptor.column_types");
-    target = stream->WriteString(2, s, target);
-  }
-
-  // bool require_all_filters_to_display = 3;
-  if (this->_internal_require_all_filters_to_display() != 0) {
-    target = stream->EnsureSpace(target);
-    target = ::_pbi::WireFormatLite::WriteBoolToArray(
-        3, this->_internal_require_all_filters_to_display(), target);
-  }
-
-  if (PROTOBUF_PREDICT_FALSE(_internal_metadata_.have_unknown_fields())) {
-    target =
-        ::_pbi::WireFormat::InternalSerializeUnknownFieldsToArray(
-            _internal_metadata_.unknown_fields<::google::protobuf::UnknownFieldSet>(::google::protobuf::UnknownFieldSet::default_instance), target, stream);
-  }
-  // @@protoc_insertion_point(serialize_to_array_end:io.deephaven.proto.backplane.script.grpc.FigureDescriptor.OneClickDescriptor)
-  return target;
-}
-
-::size_t FigureDescriptor_OneClickDescriptor::ByteSizeLong() const {
-// @@protoc_insertion_point(message_byte_size_start:io.deephaven.proto.backplane.script.grpc.FigureDescriptor.OneClickDescriptor)
-  ::size_t total_size = 0;
-
-  ::uint32_t cached_has_bits = 0;
-  // Prevent compiler warnings about cached_has_bits being unused
-  (void) cached_has_bits;
-
-  // repeated string columns = 1;
-  total_size += 1 * ::google::protobuf::internal::FromIntSize(_internal_columns().size());
-  for (int i = 0, n = _internal_columns().size(); i < n; ++i) {
-    total_size += ::google::protobuf::internal::WireFormatLite::StringSize(
-        _internal_columns().Get(i));
-  }
-  // repeated string column_types = 2;
-  total_size += 1 * ::google::protobuf::internal::FromIntSize(_internal_column_types().size());
-  for (int i = 0, n = _internal_column_types().size(); i < n; ++i) {
-    total_size += ::google::protobuf::internal::WireFormatLite::StringSize(
-        _internal_column_types().Get(i));
-  }
-  // bool require_all_filters_to_display = 3;
-  if (this->_internal_require_all_filters_to_display() != 0) {
-    total_size += 2;
-  }
-
-  return MaybeComputeUnknownFieldsSize(total_size, &_impl_._cached_size_);
-}
-
-const ::google::protobuf::Message::ClassData FigureDescriptor_OneClickDescriptor::_class_data_ = {
-    FigureDescriptor_OneClickDescriptor::MergeImpl,
-    nullptr,  // OnDemandRegisterArenaDtor
-};
-const ::google::protobuf::Message::ClassData* FigureDescriptor_OneClickDescriptor::GetClassData() const {
-  return &_class_data_;
-}
-
-void FigureDescriptor_OneClickDescriptor::MergeImpl(::google::protobuf::Message& to_msg, const ::google::protobuf::Message& from_msg) {
-  auto* const _this = static_cast<FigureDescriptor_OneClickDescriptor*>(&to_msg);
-  auto& from = static_cast<const FigureDescriptor_OneClickDescriptor&>(from_msg);
-  // @@protoc_insertion_point(class_specific_merge_from_start:io.deephaven.proto.backplane.script.grpc.FigureDescriptor.OneClickDescriptor)
-  ABSL_DCHECK_NE(&from, _this);
-  ::uint32_t cached_has_bits = 0;
-  (void) cached_has_bits;
-
-  _this->_internal_mutable_columns()->MergeFrom(from._internal_columns());
-  _this->_internal_mutable_column_types()->MergeFrom(from._internal_column_types());
-  if (from._internal_require_all_filters_to_display() != 0) {
-    _this->_internal_set_require_all_filters_to_display(from._internal_require_all_filters_to_display());
-  }
-  _this->_internal_metadata_.MergeFrom<::google::protobuf::UnknownFieldSet>(from._internal_metadata_);
-}
-
-void FigureDescriptor_OneClickDescriptor::CopyFrom(const FigureDescriptor_OneClickDescriptor& from) {
-// @@protoc_insertion_point(class_specific_copy_from_start:io.deephaven.proto.backplane.script.grpc.FigureDescriptor.OneClickDescriptor)
-  if (&from == this) return;
-  Clear();
-  MergeFrom(from);
-}
-
-PROTOBUF_NOINLINE bool FigureDescriptor_OneClickDescriptor::IsInitialized() const {
-  return true;
-}
-
-::_pbi::CachedSize* FigureDescriptor_OneClickDescriptor::AccessCachedSize() const {
-  return &_impl_._cached_size_;
-}
-void FigureDescriptor_OneClickDescriptor::InternalSwap(FigureDescriptor_OneClickDescriptor* PROTOBUF_RESTRICT other) {
-  using std::swap;
-  _internal_metadata_.InternalSwap(&other->_internal_metadata_);
-  _impl_.columns_.InternalSwap(&other->_impl_.columns_);
-  _impl_.column_types_.InternalSwap(&other->_impl_.column_types_);
-        swap(_impl_.require_all_filters_to_display_, other->_impl_.require_all_filters_to_display_);
-}
-
-::google::protobuf::Metadata FigureDescriptor_OneClickDescriptor::GetMetadata() const {
-  return ::_pbi::AssignDescriptors(
-      &descriptor_table_deephaven_2fproto_2fconsole_2eproto_getter, &descriptor_table_deephaven_2fproto_2fconsole_2eproto_once,
-      file_level_metadata_deephaven_2fproto_2fconsole_2eproto[58]);
-}
-// ===================================================================
-
-class FigureDescriptor::_Internal {
- public:
-  using HasBits = decltype(std::declval<FigureDescriptor>()._impl_._has_bits_);
-  static constexpr ::int32_t kHasBitsOffset =
-    8 * PROTOBUF_FIELD_OFFSET(FigureDescriptor, _impl_._has_bits_);
-  static void set_has_title(HasBits* has_bits) {
-    (*has_bits)[0] |= 1u;
-  }
-};
-
-FigureDescriptor::FigureDescriptor(::google::protobuf::Arena* arena)
-    : ::google::protobuf::Message(arena) {
-  SharedCtor(arena);
-  // @@protoc_insertion_point(arena_constructor:io.deephaven.proto.backplane.script.grpc.FigureDescriptor)
-}
-inline PROTOBUF_NDEBUG_INLINE FigureDescriptor::Impl_::Impl_(
-    ::google::protobuf::internal::InternalVisibility visibility, ::google::protobuf::Arena* arena,
-    const Impl_& from)
-      : _has_bits_{from._has_bits_},
-        _cached_size_{0},
-        charts_{visibility, arena, from.charts_},
-        errors_{visibility, arena, from.errors_},
-        title_(arena, from.title_),
-        title_font_(arena, from.title_font_),
-        title_color_(arena, from.title_color_) {}
-
-FigureDescriptor::FigureDescriptor(
-    ::google::protobuf::Arena* arena,
-    const FigureDescriptor& from)
-    : ::google::protobuf::Message(arena) {
-  FigureDescriptor* const _this = this;
-  (void)_this;
-  _internal_metadata_.MergeFrom<::google::protobuf::UnknownFieldSet>(
-      from._internal_metadata_);
-  new (&_impl_) Impl_(internal_visibility(), arena, from._impl_);
-  ::memcpy(reinterpret_cast<char *>(&_impl_) +
-               offsetof(Impl_, update_interval_),
-           reinterpret_cast<const char *>(&from._impl_) +
-               offsetof(Impl_, update_interval_),
-           offsetof(Impl_, rows_) -
-               offsetof(Impl_, update_interval_) +
-               sizeof(Impl_::rows_));
-
-  // @@protoc_insertion_point(copy_constructor:io.deephaven.proto.backplane.script.grpc.FigureDescriptor)
-}
-inline PROTOBUF_NDEBUG_INLINE FigureDescriptor::Impl_::Impl_(
-    ::google::protobuf::internal::InternalVisibility visibility,
-    ::google::protobuf::Arena* arena)
-      : _cached_size_{0},
-        charts_{visibility, arena},
-        errors_{visibility, arena},
-        title_(arena),
-        title_font_(arena),
-        title_color_(arena) {}
-
-inline void FigureDescriptor::SharedCtor(::_pb::Arena* arena) {
-  new (&_impl_) Impl_(internal_visibility(), arena);
-  ::memset(reinterpret_cast<char *>(&_impl_) +
-               offsetof(Impl_, update_interval_),
-           0,
-           offsetof(Impl_, rows_) -
-               offsetof(Impl_, update_interval_) +
-               sizeof(Impl_::rows_));
-}
-FigureDescriptor::~FigureDescriptor() {
-  // @@protoc_insertion_point(destructor:io.deephaven.proto.backplane.script.grpc.FigureDescriptor)
-  _internal_metadata_.Delete<::google::protobuf::UnknownFieldSet>();
-  SharedDtor();
-}
-inline void FigureDescriptor::SharedDtor() {
-  ABSL_DCHECK(GetArena() == nullptr);
-  _impl_.title_.Destroy();
-  _impl_.title_font_.Destroy();
-  _impl_.title_color_.Destroy();
-  _impl_.~Impl_();
-}
-
-PROTOBUF_NOINLINE void FigureDescriptor::Clear() {
-// @@protoc_insertion_point(message_clear_start:io.deephaven.proto.backplane.script.grpc.FigureDescriptor)
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  ::uint32_t cached_has_bits = 0;
-  // Prevent compiler warnings about cached_has_bits being unused
-  (void) cached_has_bits;
-
-  _impl_.charts_.Clear();
-  _impl_.errors_.Clear();
-  cached_has_bits = _impl_._has_bits_[0];
-  if (cached_has_bits & 0x00000001u) {
-    _impl_.title_.ClearNonDefaultToEmpty();
-  }
-  _impl_.title_font_.ClearToEmpty();
-  _impl_.title_color_.ClearToEmpty();
-  ::memset(&_impl_.update_interval_, 0, static_cast<::size_t>(
-      reinterpret_cast<char*>(&_impl_.rows_) -
-      reinterpret_cast<char*>(&_impl_.update_interval_)) + sizeof(_impl_.rows_));
-  _impl_._has_bits_.Clear();
-  _internal_metadata_.Clear<::google::protobuf::UnknownFieldSet>();
-}
-
-const char* FigureDescriptor::_InternalParse(
-    const char* ptr, ::_pbi::ParseContext* ctx) {
-  ptr = ::_pbi::TcParser::ParseLoop(this, ptr, ctx, &_table_.header);
-  return ptr;
-}
-
-
-PROTOBUF_CONSTINIT PROTOBUF_ATTRIBUTE_INIT_PRIORITY1
-const ::_pbi::TcParseTable<4, 8, 1, 106, 2> FigureDescriptor::_table_ = {
-  {
-    PROTOBUF_FIELD_OFFSET(FigureDescriptor, _impl_._has_bits_),
-    0, // no _extensions_
-    13, 120,  // max_field_number, fast_idx_mask
-    offsetof(decltype(_table_), field_lookup_table),
-    4294962232,  // skipmap
-    offsetof(decltype(_table_), field_entries),
-    8,  // num_field_entries
-    1,  // num_aux_entries
-    offsetof(decltype(_table_), aux_entries),
-    &_FigureDescriptor_default_instance_._instance,
-    ::_pbi::TcParser::GenericFallback,  // fallback
-  }, {{
-    {::_pbi::TcParser::MiniParse, {}},
-    // optional string title = 1;
-    {::_pbi::TcParser::FastUS1,
-     {10, 0, 0, PROTOBUF_FIELD_OFFSET(FigureDescriptor, _impl_.title_)}},
-    // string title_font = 2;
-    {::_pbi::TcParser::FastUS1,
-     {18, 63, 0, PROTOBUF_FIELD_OFFSET(FigureDescriptor, _impl_.title_font_)}},
-    // string title_color = 3;
-    {::_pbi::TcParser::FastUS1,
-     {26, 63, 0, PROTOBUF_FIELD_OFFSET(FigureDescriptor, _impl_.title_color_)}},
-    {::_pbi::TcParser::MiniParse, {}},
-    {::_pbi::TcParser::MiniParse, {}},
-    {::_pbi::TcParser::MiniParse, {}},
-    // int64 update_interval = 7 [jstype = JS_STRING];
-    {::_pbi::TcParser::SingularVarintNoZag1<::uint64_t, offsetof(FigureDescriptor, _impl_.update_interval_), 63>(),
-     {56, 63, 0, PROTOBUF_FIELD_OFFSET(FigureDescriptor, _impl_.update_interval_)}},
-    // int32 cols = 8;
-    {::_pbi::TcParser::SingularVarintNoZag1<::uint32_t, offsetof(FigureDescriptor, _impl_.cols_), 63>(),
-     {64, 63, 0, PROTOBUF_FIELD_OFFSET(FigureDescriptor, _impl_.cols_)}},
-    // int32 rows = 9;
-    {::_pbi::TcParser::SingularVarintNoZag1<::uint32_t, offsetof(FigureDescriptor, _impl_.rows_), 63>(),
-     {72, 63, 0, PROTOBUF_FIELD_OFFSET(FigureDescriptor, _impl_.rows_)}},
-    // repeated .io.deephaven.proto.backplane.script.grpc.FigureDescriptor.ChartDescriptor charts = 10;
-    {::_pbi::TcParser::FastMtR1,
-     {82, 63, 0, PROTOBUF_FIELD_OFFSET(FigureDescriptor, _impl_.charts_)}},
-    {::_pbi::TcParser::MiniParse, {}},
-    {::_pbi::TcParser::MiniParse, {}},
-    // repeated string errors = 13;
-    {::_pbi::TcParser::FastUR1,
-     {106, 63, 0, PROTOBUF_FIELD_OFFSET(FigureDescriptor, _impl_.errors_)}},
-    {::_pbi::TcParser::MiniParse, {}},
-    {::_pbi::TcParser::MiniParse, {}},
-  }}, {{
-    65535, 65535
-  }}, {{
-    // optional string title = 1;
-    {PROTOBUF_FIELD_OFFSET(FigureDescriptor, _impl_.title_), _Internal::kHasBitsOffset + 0, 0,
-    (0 | ::_fl::kFcOptional | ::_fl::kUtf8String | ::_fl::kRepAString)},
-    // string title_font = 2;
-    {PROTOBUF_FIELD_OFFSET(FigureDescriptor, _impl_.title_font_), -1, 0,
-    (0 | ::_fl::kFcSingular | ::_fl::kUtf8String | ::_fl::kRepAString)},
-    // string title_color = 3;
-    {PROTOBUF_FIELD_OFFSET(FigureDescriptor, _impl_.title_color_), -1, 0,
-    (0 | ::_fl::kFcSingular | ::_fl::kUtf8String | ::_fl::kRepAString)},
-    // int64 update_interval = 7 [jstype = JS_STRING];
-    {PROTOBUF_FIELD_OFFSET(FigureDescriptor, _impl_.update_interval_), -1, 0,
-    (0 | ::_fl::kFcSingular | ::_fl::kInt64)},
-    // int32 cols = 8;
-    {PROTOBUF_FIELD_OFFSET(FigureDescriptor, _impl_.cols_), -1, 0,
-    (0 | ::_fl::kFcSingular | ::_fl::kInt32)},
-    // int32 rows = 9;
-    {PROTOBUF_FIELD_OFFSET(FigureDescriptor, _impl_.rows_), -1, 0,
-    (0 | ::_fl::kFcSingular | ::_fl::kInt32)},
-    // repeated .io.deephaven.proto.backplane.script.grpc.FigureDescriptor.ChartDescriptor charts = 10;
-    {PROTOBUF_FIELD_OFFSET(FigureDescriptor, _impl_.charts_), -1, 0,
-    (0 | ::_fl::kFcRepeated | ::_fl::kMessage | ::_fl::kTvTable)},
-    // repeated string errors = 13;
-    {PROTOBUF_FIELD_OFFSET(FigureDescriptor, _impl_.errors_), -1, 0,
-    (0 | ::_fl::kFcRepeated | ::_fl::kUtf8String | ::_fl::kRepSString)},
-  }}, {{
-    {::_pbi::TcParser::GetTable<::io::deephaven::proto::backplane::script::grpc::FigureDescriptor_ChartDescriptor>()},
-  }}, {{
-    "\71\5\12\13\0\0\0\0\6\0\0\0\0\0\0\0"
-    "io.deephaven.proto.backplane.script.grpc.FigureDescriptor"
-    "title"
-    "title_font"
-    "title_color"
-    "errors"
-  }},
-};
-
-::uint8_t* FigureDescriptor::_InternalSerialize(
-    ::uint8_t* target,
-    ::google::protobuf::io::EpsCopyOutputStream* stream) const {
-  // @@protoc_insertion_point(serialize_to_array_start:io.deephaven.proto.backplane.script.grpc.FigureDescriptor)
-  ::uint32_t cached_has_bits = 0;
-  (void)cached_has_bits;
-
-  cached_has_bits = _impl_._has_bits_[0];
-  // optional string title = 1;
-  if (cached_has_bits & 0x00000001u) {
-    const std::string& _s = this->_internal_title();
-    ::google::protobuf::internal::WireFormatLite::VerifyUtf8String(
-        _s.data(), static_cast<int>(_s.length()), ::google::protobuf::internal::WireFormatLite::SERIALIZE, "io.deephaven.proto.backplane.script.grpc.FigureDescriptor.title");
-    target = stream->WriteStringMaybeAliased(1, _s, target);
-  }
-
-  // string title_font = 2;
-  if (!this->_internal_title_font().empty()) {
-    const std::string& _s = this->_internal_title_font();
-    ::google::protobuf::internal::WireFormatLite::VerifyUtf8String(
-        _s.data(), static_cast<int>(_s.length()), ::google::protobuf::internal::WireFormatLite::SERIALIZE, "io.deephaven.proto.backplane.script.grpc.FigureDescriptor.title_font");
-    target = stream->WriteStringMaybeAliased(2, _s, target);
-  }
-
-  // string title_color = 3;
-  if (!this->_internal_title_color().empty()) {
-    const std::string& _s = this->_internal_title_color();
-    ::google::protobuf::internal::WireFormatLite::VerifyUtf8String(
-        _s.data(), static_cast<int>(_s.length()), ::google::protobuf::internal::WireFormatLite::SERIALIZE, "io.deephaven.proto.backplane.script.grpc.FigureDescriptor.title_color");
-    target = stream->WriteStringMaybeAliased(3, _s, target);
-  }
-
-  // int64 update_interval = 7 [jstype = JS_STRING];
-  if (this->_internal_update_interval() != 0) {
-    target = ::google::protobuf::internal::WireFormatLite::
-        WriteInt64ToArrayWithField<7>(
-            stream, this->_internal_update_interval(), target);
-  }
-
-  // int32 cols = 8;
-  if (this->_internal_cols() != 0) {
-    target = ::google::protobuf::internal::WireFormatLite::
-        WriteInt32ToArrayWithField<8>(
-            stream, this->_internal_cols(), target);
-  }
-
-  // int32 rows = 9;
-  if (this->_internal_rows() != 0) {
-    target = ::google::protobuf::internal::WireFormatLite::
-        WriteInt32ToArrayWithField<9>(
-            stream, this->_internal_rows(), target);
-  }
-
-  // repeated .io.deephaven.proto.backplane.script.grpc.FigureDescriptor.ChartDescriptor charts = 10;
-  for (unsigned i = 0,
-      n = static_cast<unsigned>(this->_internal_charts_size()); i < n; i++) {
-    const auto& repfield = this->_internal_charts().Get(i);
-    target = ::google::protobuf::internal::WireFormatLite::
-        InternalWriteMessage(10, repfield, repfield.GetCachedSize(), target, stream);
-  }
-
-  // repeated string errors = 13;
-  for (int i = 0, n = this->_internal_errors_size(); i < n; ++i) {
-    const auto& s = this->_internal_errors().Get(i);
-    ::google::protobuf::internal::WireFormatLite::VerifyUtf8String(
-        s.data(), static_cast<int>(s.length()), ::google::protobuf::internal::WireFormatLite::SERIALIZE, "io.deephaven.proto.backplane.script.grpc.FigureDescriptor.errors");
-    target = stream->WriteString(13, s, target);
-  }
-
-  if (PROTOBUF_PREDICT_FALSE(_internal_metadata_.have_unknown_fields())) {
-    target =
-        ::_pbi::WireFormat::InternalSerializeUnknownFieldsToArray(
-            _internal_metadata_.unknown_fields<::google::protobuf::UnknownFieldSet>(::google::protobuf::UnknownFieldSet::default_instance), target, stream);
-  }
-  // @@protoc_insertion_point(serialize_to_array_end:io.deephaven.proto.backplane.script.grpc.FigureDescriptor)
-  return target;
-}
-
-::size_t FigureDescriptor::ByteSizeLong() const {
-// @@protoc_insertion_point(message_byte_size_start:io.deephaven.proto.backplane.script.grpc.FigureDescriptor)
-  ::size_t total_size = 0;
-
-  ::uint32_t cached_has_bits = 0;
-  // Prevent compiler warnings about cached_has_bits being unused
-  (void) cached_has_bits;
-
-  // repeated .io.deephaven.proto.backplane.script.grpc.FigureDescriptor.ChartDescriptor charts = 10;
-  total_size += 1UL * this->_internal_charts_size();
-  for (const auto& msg : this->_internal_charts()) {
-    total_size +=
-      ::google::protobuf::internal::WireFormatLite::MessageSize(msg);
-  }
-  // repeated string errors = 13;
-  total_size += 1 * ::google::protobuf::internal::FromIntSize(_internal_errors().size());
-  for (int i = 0, n = _internal_errors().size(); i < n; ++i) {
-    total_size += ::google::protobuf::internal::WireFormatLite::StringSize(
-        _internal_errors().Get(i));
-  }
-  // optional string title = 1;
-  cached_has_bits = _impl_._has_bits_[0];
-  if (cached_has_bits & 0x00000001u) {
-    total_size += 1 + ::google::protobuf::internal::WireFormatLite::StringSize(
-                                    this->_internal_title());
-  }
-
-  // string title_font = 2;
-  if (!this->_internal_title_font().empty()) {
-    total_size += 1 + ::google::protobuf::internal::WireFormatLite::StringSize(
-                                    this->_internal_title_font());
-  }
-
-  // string title_color = 3;
-  if (!this->_internal_title_color().empty()) {
-    total_size += 1 + ::google::protobuf::internal::WireFormatLite::StringSize(
-                                    this->_internal_title_color());
-  }
-
-  // int64 update_interval = 7 [jstype = JS_STRING];
-  if (this->_internal_update_interval() != 0) {
-    total_size += ::_pbi::WireFormatLite::Int64SizePlusOne(
-        this->_internal_update_interval());
-  }
-
-  // int32 cols = 8;
-  if (this->_internal_cols() != 0) {
-    total_size += ::_pbi::WireFormatLite::Int32SizePlusOne(
-        this->_internal_cols());
-  }
-
-  // int32 rows = 9;
-  if (this->_internal_rows() != 0) {
-    total_size += ::_pbi::WireFormatLite::Int32SizePlusOne(
-        this->_internal_rows());
-  }
-
-  return MaybeComputeUnknownFieldsSize(total_size, &_impl_._cached_size_);
-}
-
-const ::google::protobuf::Message::ClassData FigureDescriptor::_class_data_ = {
-    FigureDescriptor::MergeImpl,
-    nullptr,  // OnDemandRegisterArenaDtor
-};
-const ::google::protobuf::Message::ClassData* FigureDescriptor::GetClassData() const {
-  return &_class_data_;
-}
-
-void FigureDescriptor::MergeImpl(::google::protobuf::Message& to_msg, const ::google::protobuf::Message& from_msg) {
-  auto* const _this = static_cast<FigureDescriptor*>(&to_msg);
-  auto& from = static_cast<const FigureDescriptor&>(from_msg);
-  // @@protoc_insertion_point(class_specific_merge_from_start:io.deephaven.proto.backplane.script.grpc.FigureDescriptor)
-  ABSL_DCHECK_NE(&from, _this);
-  ::uint32_t cached_has_bits = 0;
-  (void) cached_has_bits;
-
-  _this->_internal_mutable_charts()->MergeFrom(
-      from._internal_charts());
-  _this->_internal_mutable_errors()->MergeFrom(from._internal_errors());
-  if ((from._impl_._has_bits_[0] & 0x00000001u) != 0) {
-    _this->_internal_set_title(from._internal_title());
-  }
-  if (!from._internal_title_font().empty()) {
-    _this->_internal_set_title_font(from._internal_title_font());
-  }
-  if (!from._internal_title_color().empty()) {
-    _this->_internal_set_title_color(from._internal_title_color());
-  }
-  if (from._internal_update_interval() != 0) {
-    _this->_internal_set_update_interval(from._internal_update_interval());
-  }
-  if (from._internal_cols() != 0) {
-    _this->_internal_set_cols(from._internal_cols());
-  }
-  if (from._internal_rows() != 0) {
-    _this->_internal_set_rows(from._internal_rows());
-  }
-  _this->_internal_metadata_.MergeFrom<::google::protobuf::UnknownFieldSet>(from._internal_metadata_);
-}
-
-void FigureDescriptor::CopyFrom(const FigureDescriptor& from) {
-// @@protoc_insertion_point(class_specific_copy_from_start:io.deephaven.proto.backplane.script.grpc.FigureDescriptor)
-  if (&from == this) return;
-  Clear();
-  MergeFrom(from);
-}
-
-PROTOBUF_NOINLINE bool FigureDescriptor::IsInitialized() const {
-  return true;
-}
-
-::_pbi::CachedSize* FigureDescriptor::AccessCachedSize() const {
-  return &_impl_._cached_size_;
-}
-void FigureDescriptor::InternalSwap(FigureDescriptor* PROTOBUF_RESTRICT other) {
-  using std::swap;
-  auto* arena = GetArena();
-  ABSL_DCHECK_EQ(arena, other->GetArena());
-  _internal_metadata_.InternalSwap(&other->_internal_metadata_);
-  swap(_impl_._has_bits_[0], other->_impl_._has_bits_[0]);
-  _impl_.charts_.InternalSwap(&other->_impl_.charts_);
-  _impl_.errors_.InternalSwap(&other->_impl_.errors_);
-  ::_pbi::ArenaStringPtr::InternalSwap(&_impl_.title_, &other->_impl_.title_, arena);
-  ::_pbi::ArenaStringPtr::InternalSwap(&_impl_.title_font_, &other->_impl_.title_font_, arena);
-  ::_pbi::ArenaStringPtr::InternalSwap(&_impl_.title_color_, &other->_impl_.title_color_, arena);
-  ::google::protobuf::internal::memswap<
-      PROTOBUF_FIELD_OFFSET(FigureDescriptor, _impl_.rows_)
-      + sizeof(FigureDescriptor::_impl_.rows_)
-      - PROTOBUF_FIELD_OFFSET(FigureDescriptor, _impl_.update_interval_)>(
-          reinterpret_cast<char*>(&_impl_.update_interval_),
-          reinterpret_cast<char*>(&other->_impl_.update_interval_));
-}
-
-::google::protobuf::Metadata FigureDescriptor::GetMetadata() const {
-  return ::_pbi::AssignDescriptors(
-      &descriptor_table_deephaven_2fproto_2fconsole_2eproto_getter, &descriptor_table_deephaven_2fproto_2fconsole_2eproto_once,
-      file_level_metadata_deephaven_2fproto_2fconsole_2eproto[59]);
-}
-// @@protoc_insertion_point(namespace_scope)
-}  // namespace grpc
-}  // namespace script
-}  // namespace backplane
-}  // namespace proto
-}  // namespace deephaven
-}  // namespace io
-namespace google {
-namespace protobuf {
-}  // namespace protobuf
-}  // namespace google
-// @@protoc_insertion_point(global_scope)
-#include "google/protobuf/port_undef.inc"
diff --git a/cpp-client/deephaven/dhclient/proto/deephaven/proto/console.pb.h b/cpp-client/deephaven/dhclient/proto/deephaven/proto/console.pb.h
deleted file mode 100644
index 1a8ae0328a1..00000000000
--- a/cpp-client/deephaven/dhclient/proto/deephaven/proto/console.pb.h
+++ /dev/null
@@ -1,28171 +0,0 @@
-// Generated by the protocol buffer compiler.  DO NOT EDIT!
-// source: deephaven/proto/console.proto
-// Protobuf C++ Version: 4.25.3
-
-#ifndef GOOGLE_PROTOBUF_INCLUDED_deephaven_2fproto_2fconsole_2eproto_2epb_2eh
-#define GOOGLE_PROTOBUF_INCLUDED_deephaven_2fproto_2fconsole_2eproto_2epb_2eh
-
-#include <limits>
-#include <string>
-#include <type_traits>
-#include <utility>
-
-#include "google/protobuf/port_def.inc"
-#if PROTOBUF_VERSION < 4025000
-#error "This file was generated by a newer version of protoc which is"
-#error "incompatible with your Protocol Buffer headers. Please update"
-#error "your headers."
-#endif  // PROTOBUF_VERSION
-
-#if 4025003 < PROTOBUF_MIN_PROTOC_VERSION
-#error "This file was generated by an older version of protoc which is"
-#error "incompatible with your Protocol Buffer headers. Please"
-#error "regenerate this file with a newer version of protoc."
-#endif  // PROTOBUF_MIN_PROTOC_VERSION
-#include "google/protobuf/port_undef.inc"
-#include "google/protobuf/io/coded_stream.h"
-#include "google/protobuf/arena.h"
-#include "google/protobuf/arenastring.h"
-#include "google/protobuf/generated_message_bases.h"
-#include "google/protobuf/generated_message_tctable_decl.h"
-#include "google/protobuf/generated_message_util.h"
-#include "google/protobuf/metadata_lite.h"
-#include "google/protobuf/generated_message_reflection.h"
-#include "google/protobuf/message.h"
-#include "google/protobuf/repeated_field.h"  // IWYU pragma: export
-#include "google/protobuf/extension_set.h"  // IWYU pragma: export
-#include "google/protobuf/generated_enum_reflection.h"
-#include "google/protobuf/unknown_field_set.h"
-#include "deephaven/proto/ticket.pb.h"
-#include "deephaven/proto/application.pb.h"
-// @@protoc_insertion_point(includes)
-
-// Must be included last.
-#include "google/protobuf/port_def.inc"
-
-#define PROTOBUF_INTERNAL_EXPORT_deephaven_2fproto_2fconsole_2eproto
-
-namespace google {
-namespace protobuf {
-namespace internal {
-class AnyMetadata;
-}  // namespace internal
-}  // namespace protobuf
-}  // namespace google
-
-// Internal implementation detail -- do not use these members.
-struct TableStruct_deephaven_2fproto_2fconsole_2eproto {
-  static const ::uint32_t offsets[];
-};
-extern const ::google::protobuf::internal::DescriptorTable
-    descriptor_table_deephaven_2fproto_2fconsole_2eproto;
-namespace io {
-namespace deephaven {
-namespace proto {
-namespace backplane {
-namespace script {
-namespace grpc {
-class AutoCompleteRequest;
-struct AutoCompleteRequestDefaultTypeInternal;
-extern AutoCompleteRequestDefaultTypeInternal _AutoCompleteRequest_default_instance_;
-class AutoCompleteResponse;
-struct AutoCompleteResponseDefaultTypeInternal;
-extern AutoCompleteResponseDefaultTypeInternal _AutoCompleteResponse_default_instance_;
-class BindTableToVariableRequest;
-struct BindTableToVariableRequestDefaultTypeInternal;
-extern BindTableToVariableRequestDefaultTypeInternal _BindTableToVariableRequest_default_instance_;
-class BindTableToVariableResponse;
-struct BindTableToVariableResponseDefaultTypeInternal;
-extern BindTableToVariableResponseDefaultTypeInternal _BindTableToVariableResponse_default_instance_;
-class BrowserNextResponse;
-struct BrowserNextResponseDefaultTypeInternal;
-extern BrowserNextResponseDefaultTypeInternal _BrowserNextResponse_default_instance_;
-class CancelAutoCompleteRequest;
-struct CancelAutoCompleteRequestDefaultTypeInternal;
-extern CancelAutoCompleteRequestDefaultTypeInternal _CancelAutoCompleteRequest_default_instance_;
-class CancelAutoCompleteResponse;
-struct CancelAutoCompleteResponseDefaultTypeInternal;
-extern CancelAutoCompleteResponseDefaultTypeInternal _CancelAutoCompleteResponse_default_instance_;
-class CancelCommandRequest;
-struct CancelCommandRequestDefaultTypeInternal;
-extern CancelCommandRequestDefaultTypeInternal _CancelCommandRequest_default_instance_;
-class CancelCommandResponse;
-struct CancelCommandResponseDefaultTypeInternal;
-extern CancelCommandResponseDefaultTypeInternal _CancelCommandResponse_default_instance_;
-class ChangeDocumentRequest;
-struct ChangeDocumentRequestDefaultTypeInternal;
-extern ChangeDocumentRequestDefaultTypeInternal _ChangeDocumentRequest_default_instance_;
-class ChangeDocumentRequest_TextDocumentContentChangeEvent;
-struct ChangeDocumentRequest_TextDocumentContentChangeEventDefaultTypeInternal;
-extern ChangeDocumentRequest_TextDocumentContentChangeEventDefaultTypeInternal _ChangeDocumentRequest_TextDocumentContentChangeEvent_default_instance_;
-class CloseDocumentRequest;
-struct CloseDocumentRequestDefaultTypeInternal;
-extern CloseDocumentRequestDefaultTypeInternal _CloseDocumentRequest_default_instance_;
-class CompletionContext;
-struct CompletionContextDefaultTypeInternal;
-extern CompletionContextDefaultTypeInternal _CompletionContext_default_instance_;
-class CompletionItem;
-struct CompletionItemDefaultTypeInternal;
-extern CompletionItemDefaultTypeInternal _CompletionItem_default_instance_;
-class Diagnostic;
-struct DiagnosticDefaultTypeInternal;
-extern DiagnosticDefaultTypeInternal _Diagnostic_default_instance_;
-class Diagnostic_CodeDescription;
-struct Diagnostic_CodeDescriptionDefaultTypeInternal;
-extern Diagnostic_CodeDescriptionDefaultTypeInternal _Diagnostic_CodeDescription_default_instance_;
-class DocumentRange;
-struct DocumentRangeDefaultTypeInternal;
-extern DocumentRangeDefaultTypeInternal _DocumentRange_default_instance_;
-class ExecuteCommandRequest;
-struct ExecuteCommandRequestDefaultTypeInternal;
-extern ExecuteCommandRequestDefaultTypeInternal _ExecuteCommandRequest_default_instance_;
-class ExecuteCommandResponse;
-struct ExecuteCommandResponseDefaultTypeInternal;
-extern ExecuteCommandResponseDefaultTypeInternal _ExecuteCommandResponse_default_instance_;
-class FigureDescriptor;
-struct FigureDescriptorDefaultTypeInternal;
-extern FigureDescriptorDefaultTypeInternal _FigureDescriptor_default_instance_;
-class FigureDescriptor_AxisDescriptor;
-struct FigureDescriptor_AxisDescriptorDefaultTypeInternal;
-extern FigureDescriptor_AxisDescriptorDefaultTypeInternal _FigureDescriptor_AxisDescriptor_default_instance_;
-class FigureDescriptor_BoolMapWithDefault;
-struct FigureDescriptor_BoolMapWithDefaultDefaultTypeInternal;
-extern FigureDescriptor_BoolMapWithDefaultDefaultTypeInternal _FigureDescriptor_BoolMapWithDefault_default_instance_;
-class FigureDescriptor_BusinessCalendarDescriptor;
-struct FigureDescriptor_BusinessCalendarDescriptorDefaultTypeInternal;
-extern FigureDescriptor_BusinessCalendarDescriptorDefaultTypeInternal _FigureDescriptor_BusinessCalendarDescriptor_default_instance_;
-class FigureDescriptor_BusinessCalendarDescriptor_BusinessPeriod;
-struct FigureDescriptor_BusinessCalendarDescriptor_BusinessPeriodDefaultTypeInternal;
-extern FigureDescriptor_BusinessCalendarDescriptor_BusinessPeriodDefaultTypeInternal _FigureDescriptor_BusinessCalendarDescriptor_BusinessPeriod_default_instance_;
-class FigureDescriptor_BusinessCalendarDescriptor_Holiday;
-struct FigureDescriptor_BusinessCalendarDescriptor_HolidayDefaultTypeInternal;
-extern FigureDescriptor_BusinessCalendarDescriptor_HolidayDefaultTypeInternal _FigureDescriptor_BusinessCalendarDescriptor_Holiday_default_instance_;
-class FigureDescriptor_BusinessCalendarDescriptor_LocalDate;
-struct FigureDescriptor_BusinessCalendarDescriptor_LocalDateDefaultTypeInternal;
-extern FigureDescriptor_BusinessCalendarDescriptor_LocalDateDefaultTypeInternal _FigureDescriptor_BusinessCalendarDescriptor_LocalDate_default_instance_;
-class FigureDescriptor_ChartDescriptor;
-struct FigureDescriptor_ChartDescriptorDefaultTypeInternal;
-extern FigureDescriptor_ChartDescriptorDefaultTypeInternal _FigureDescriptor_ChartDescriptor_default_instance_;
-class FigureDescriptor_DoubleMapWithDefault;
-struct FigureDescriptor_DoubleMapWithDefaultDefaultTypeInternal;
-extern FigureDescriptor_DoubleMapWithDefaultDefaultTypeInternal _FigureDescriptor_DoubleMapWithDefault_default_instance_;
-class FigureDescriptor_MultiSeriesDescriptor;
-struct FigureDescriptor_MultiSeriesDescriptorDefaultTypeInternal;
-extern FigureDescriptor_MultiSeriesDescriptorDefaultTypeInternal _FigureDescriptor_MultiSeriesDescriptor_default_instance_;
-class FigureDescriptor_MultiSeriesSourceDescriptor;
-struct FigureDescriptor_MultiSeriesSourceDescriptorDefaultTypeInternal;
-extern FigureDescriptor_MultiSeriesSourceDescriptorDefaultTypeInternal _FigureDescriptor_MultiSeriesSourceDescriptor_default_instance_;
-class FigureDescriptor_OneClickDescriptor;
-struct FigureDescriptor_OneClickDescriptorDefaultTypeInternal;
-extern FigureDescriptor_OneClickDescriptorDefaultTypeInternal _FigureDescriptor_OneClickDescriptor_default_instance_;
-class FigureDescriptor_SeriesDescriptor;
-struct FigureDescriptor_SeriesDescriptorDefaultTypeInternal;
-extern FigureDescriptor_SeriesDescriptorDefaultTypeInternal _FigureDescriptor_SeriesDescriptor_default_instance_;
-class FigureDescriptor_SourceDescriptor;
-struct FigureDescriptor_SourceDescriptorDefaultTypeInternal;
-extern FigureDescriptor_SourceDescriptorDefaultTypeInternal _FigureDescriptor_SourceDescriptor_default_instance_;
-class FigureDescriptor_StringMapWithDefault;
-struct FigureDescriptor_StringMapWithDefaultDefaultTypeInternal;
-extern FigureDescriptor_StringMapWithDefaultDefaultTypeInternal _FigureDescriptor_StringMapWithDefault_default_instance_;
-class GetCompletionItemsRequest;
-struct GetCompletionItemsRequestDefaultTypeInternal;
-extern GetCompletionItemsRequestDefaultTypeInternal _GetCompletionItemsRequest_default_instance_;
-class GetCompletionItemsResponse;
-struct GetCompletionItemsResponseDefaultTypeInternal;
-extern GetCompletionItemsResponseDefaultTypeInternal _GetCompletionItemsResponse_default_instance_;
-class GetConsoleTypesRequest;
-struct GetConsoleTypesRequestDefaultTypeInternal;
-extern GetConsoleTypesRequestDefaultTypeInternal _GetConsoleTypesRequest_default_instance_;
-class GetConsoleTypesResponse;
-struct GetConsoleTypesResponseDefaultTypeInternal;
-extern GetConsoleTypesResponseDefaultTypeInternal _GetConsoleTypesResponse_default_instance_;
-class GetDiagnosticRequest;
-struct GetDiagnosticRequestDefaultTypeInternal;
-extern GetDiagnosticRequestDefaultTypeInternal _GetDiagnosticRequest_default_instance_;
-class GetHeapInfoRequest;
-struct GetHeapInfoRequestDefaultTypeInternal;
-extern GetHeapInfoRequestDefaultTypeInternal _GetHeapInfoRequest_default_instance_;
-class GetHeapInfoResponse;
-struct GetHeapInfoResponseDefaultTypeInternal;
-extern GetHeapInfoResponseDefaultTypeInternal _GetHeapInfoResponse_default_instance_;
-class GetHoverRequest;
-struct GetHoverRequestDefaultTypeInternal;
-extern GetHoverRequestDefaultTypeInternal _GetHoverRequest_default_instance_;
-class GetHoverResponse;
-struct GetHoverResponseDefaultTypeInternal;
-extern GetHoverResponseDefaultTypeInternal _GetHoverResponse_default_instance_;
-class GetPublishDiagnosticResponse;
-struct GetPublishDiagnosticResponseDefaultTypeInternal;
-extern GetPublishDiagnosticResponseDefaultTypeInternal _GetPublishDiagnosticResponse_default_instance_;
-class GetPullDiagnosticResponse;
-struct GetPullDiagnosticResponseDefaultTypeInternal;
-extern GetPullDiagnosticResponseDefaultTypeInternal _GetPullDiagnosticResponse_default_instance_;
-class GetSignatureHelpRequest;
-struct GetSignatureHelpRequestDefaultTypeInternal;
-extern GetSignatureHelpRequestDefaultTypeInternal _GetSignatureHelpRequest_default_instance_;
-class GetSignatureHelpResponse;
-struct GetSignatureHelpResponseDefaultTypeInternal;
-extern GetSignatureHelpResponseDefaultTypeInternal _GetSignatureHelpResponse_default_instance_;
-class LogSubscriptionData;
-struct LogSubscriptionDataDefaultTypeInternal;
-extern LogSubscriptionDataDefaultTypeInternal _LogSubscriptionData_default_instance_;
-class LogSubscriptionRequest;
-struct LogSubscriptionRequestDefaultTypeInternal;
-extern LogSubscriptionRequestDefaultTypeInternal _LogSubscriptionRequest_default_instance_;
-class MarkupContent;
-struct MarkupContentDefaultTypeInternal;
-extern MarkupContentDefaultTypeInternal _MarkupContent_default_instance_;
-class OpenDocumentRequest;
-struct OpenDocumentRequestDefaultTypeInternal;
-extern OpenDocumentRequestDefaultTypeInternal _OpenDocumentRequest_default_instance_;
-class ParameterInformation;
-struct ParameterInformationDefaultTypeInternal;
-extern ParameterInformationDefaultTypeInternal _ParameterInformation_default_instance_;
-class Position;
-struct PositionDefaultTypeInternal;
-extern PositionDefaultTypeInternal _Position_default_instance_;
-class SignatureHelpContext;
-struct SignatureHelpContextDefaultTypeInternal;
-extern SignatureHelpContextDefaultTypeInternal _SignatureHelpContext_default_instance_;
-class SignatureInformation;
-struct SignatureInformationDefaultTypeInternal;
-extern SignatureInformationDefaultTypeInternal _SignatureInformation_default_instance_;
-class StartConsoleRequest;
-struct StartConsoleRequestDefaultTypeInternal;
-extern StartConsoleRequestDefaultTypeInternal _StartConsoleRequest_default_instance_;
-class StartConsoleResponse;
-struct StartConsoleResponseDefaultTypeInternal;
-extern StartConsoleResponseDefaultTypeInternal _StartConsoleResponse_default_instance_;
-class TextDocumentItem;
-struct TextDocumentItemDefaultTypeInternal;
-extern TextDocumentItemDefaultTypeInternal _TextDocumentItem_default_instance_;
-class TextEdit;
-struct TextEditDefaultTypeInternal;
-extern TextEditDefaultTypeInternal _TextEdit_default_instance_;
-class VersionedTextDocumentIdentifier;
-struct VersionedTextDocumentIdentifierDefaultTypeInternal;
-extern VersionedTextDocumentIdentifierDefaultTypeInternal _VersionedTextDocumentIdentifier_default_instance_;
-}  // namespace grpc
-}  // namespace script
-}  // namespace backplane
-}  // namespace proto
-}  // namespace deephaven
-}  // namespace io
-namespace google {
-namespace protobuf {
-}  // namespace protobuf
-}  // namespace google
-
-namespace io {
-namespace deephaven {
-namespace proto {
-namespace backplane {
-namespace script {
-namespace grpc {
-enum Diagnostic_DiagnosticSeverity : int {
-  Diagnostic_DiagnosticSeverity_NOT_SET_SEVERITY = 0,
-  Diagnostic_DiagnosticSeverity_ERROR = 1,
-  Diagnostic_DiagnosticSeverity_WARNING = 2,
-  Diagnostic_DiagnosticSeverity_INFORMATION = 3,
-  Diagnostic_DiagnosticSeverity_HINT = 4,
-  Diagnostic_DiagnosticSeverity_Diagnostic_DiagnosticSeverity_INT_MIN_SENTINEL_DO_NOT_USE_ =
-      std::numeric_limits<::int32_t>::min(),
-  Diagnostic_DiagnosticSeverity_Diagnostic_DiagnosticSeverity_INT_MAX_SENTINEL_DO_NOT_USE_ =
-      std::numeric_limits<::int32_t>::max(),
-};
-
-bool Diagnostic_DiagnosticSeverity_IsValid(int value);
-extern const uint32_t Diagnostic_DiagnosticSeverity_internal_data_[];
-constexpr Diagnostic_DiagnosticSeverity Diagnostic_DiagnosticSeverity_DiagnosticSeverity_MIN = static_cast<Diagnostic_DiagnosticSeverity>(0);
-constexpr Diagnostic_DiagnosticSeverity Diagnostic_DiagnosticSeverity_DiagnosticSeverity_MAX = static_cast<Diagnostic_DiagnosticSeverity>(4);
-constexpr int Diagnostic_DiagnosticSeverity_DiagnosticSeverity_ARRAYSIZE = 4 + 1;
-const ::google::protobuf::EnumDescriptor*
-Diagnostic_DiagnosticSeverity_descriptor();
-template <typename T>
-const std::string& Diagnostic_DiagnosticSeverity_Name(T value) {
-  static_assert(std::is_same<T, Diagnostic_DiagnosticSeverity>::value ||
-                    std::is_integral<T>::value,
-                "Incorrect type passed to DiagnosticSeverity_Name().");
-  return Diagnostic_DiagnosticSeverity_Name(static_cast<Diagnostic_DiagnosticSeverity>(value));
-}
-template <>
-inline const std::string& Diagnostic_DiagnosticSeverity_Name(Diagnostic_DiagnosticSeverity value) {
-  return ::google::protobuf::internal::NameOfDenseEnum<Diagnostic_DiagnosticSeverity_descriptor,
-                                                 0, 4>(
-      static_cast<int>(value));
-}
-inline bool Diagnostic_DiagnosticSeverity_Parse(absl::string_view name, Diagnostic_DiagnosticSeverity* value) {
-  return ::google::protobuf::internal::ParseNamedEnum<Diagnostic_DiagnosticSeverity>(
-      Diagnostic_DiagnosticSeverity_descriptor(), name, value);
-}
-enum Diagnostic_DiagnosticTag : int {
-  Diagnostic_DiagnosticTag_NOT_SET_TAG = 0,
-  Diagnostic_DiagnosticTag_UNNECESSARY = 1,
-  Diagnostic_DiagnosticTag_DEPRECATED = 2,
-  Diagnostic_DiagnosticTag_Diagnostic_DiagnosticTag_INT_MIN_SENTINEL_DO_NOT_USE_ =
-      std::numeric_limits<::int32_t>::min(),
-  Diagnostic_DiagnosticTag_Diagnostic_DiagnosticTag_INT_MAX_SENTINEL_DO_NOT_USE_ =
-      std::numeric_limits<::int32_t>::max(),
-};
-
-bool Diagnostic_DiagnosticTag_IsValid(int value);
-extern const uint32_t Diagnostic_DiagnosticTag_internal_data_[];
-constexpr Diagnostic_DiagnosticTag Diagnostic_DiagnosticTag_DiagnosticTag_MIN = static_cast<Diagnostic_DiagnosticTag>(0);
-constexpr Diagnostic_DiagnosticTag Diagnostic_DiagnosticTag_DiagnosticTag_MAX = static_cast<Diagnostic_DiagnosticTag>(2);
-constexpr int Diagnostic_DiagnosticTag_DiagnosticTag_ARRAYSIZE = 2 + 1;
-const ::google::protobuf::EnumDescriptor*
-Diagnostic_DiagnosticTag_descriptor();
-template <typename T>
-const std::string& Diagnostic_DiagnosticTag_Name(T value) {
-  static_assert(std::is_same<T, Diagnostic_DiagnosticTag>::value ||
-                    std::is_integral<T>::value,
-                "Incorrect type passed to DiagnosticTag_Name().");
-  return Diagnostic_DiagnosticTag_Name(static_cast<Diagnostic_DiagnosticTag>(value));
-}
-template <>
-inline const std::string& Diagnostic_DiagnosticTag_Name(Diagnostic_DiagnosticTag value) {
-  return ::google::protobuf::internal::NameOfDenseEnum<Diagnostic_DiagnosticTag_descriptor,
-                                                 0, 2>(
-      static_cast<int>(value));
-}
-inline bool Diagnostic_DiagnosticTag_Parse(absl::string_view name, Diagnostic_DiagnosticTag* value) {
-  return ::google::protobuf::internal::ParseNamedEnum<Diagnostic_DiagnosticTag>(
-      Diagnostic_DiagnosticTag_descriptor(), name, value);
-}
-enum FigureDescriptor_ChartDescriptor_ChartType : int {
-  FigureDescriptor_ChartDescriptor_ChartType_XY = 0,
-  FigureDescriptor_ChartDescriptor_ChartType_PIE = 1,
-  FigureDescriptor_ChartDescriptor_ChartType_OHLC [[deprecated]] = 2,
-  FigureDescriptor_ChartDescriptor_ChartType_CATEGORY = 3,
-  FigureDescriptor_ChartDescriptor_ChartType_XYZ = 4,
-  FigureDescriptor_ChartDescriptor_ChartType_CATEGORY_3D = 5,
-  FigureDescriptor_ChartDescriptor_ChartType_TREEMAP = 6,
-  FigureDescriptor_ChartDescriptor_ChartType_FigureDescriptor_ChartDescriptor_ChartType_INT_MIN_SENTINEL_DO_NOT_USE_ =
-      std::numeric_limits<::int32_t>::min(),
-  FigureDescriptor_ChartDescriptor_ChartType_FigureDescriptor_ChartDescriptor_ChartType_INT_MAX_SENTINEL_DO_NOT_USE_ =
-      std::numeric_limits<::int32_t>::max(),
-};
-
-bool FigureDescriptor_ChartDescriptor_ChartType_IsValid(int value);
-extern const uint32_t FigureDescriptor_ChartDescriptor_ChartType_internal_data_[];
-constexpr FigureDescriptor_ChartDescriptor_ChartType FigureDescriptor_ChartDescriptor_ChartType_ChartType_MIN = static_cast<FigureDescriptor_ChartDescriptor_ChartType>(0);
-constexpr FigureDescriptor_ChartDescriptor_ChartType FigureDescriptor_ChartDescriptor_ChartType_ChartType_MAX = static_cast<FigureDescriptor_ChartDescriptor_ChartType>(6);
-constexpr int FigureDescriptor_ChartDescriptor_ChartType_ChartType_ARRAYSIZE = 6 + 1;
-const ::google::protobuf::EnumDescriptor*
-FigureDescriptor_ChartDescriptor_ChartType_descriptor();
-template <typename T>
-const std::string& FigureDescriptor_ChartDescriptor_ChartType_Name(T value) {
-  static_assert(std::is_same<T, FigureDescriptor_ChartDescriptor_ChartType>::value ||
-                    std::is_integral<T>::value,
-                "Incorrect type passed to ChartType_Name().");
-  return FigureDescriptor_ChartDescriptor_ChartType_Name(static_cast<FigureDescriptor_ChartDescriptor_ChartType>(value));
-}
-template <>
-inline const std::string& FigureDescriptor_ChartDescriptor_ChartType_Name(FigureDescriptor_ChartDescriptor_ChartType value) {
-  return ::google::protobuf::internal::NameOfDenseEnum<FigureDescriptor_ChartDescriptor_ChartType_descriptor,
-                                                 0, 6>(
-      static_cast<int>(value));
-}
-inline bool FigureDescriptor_ChartDescriptor_ChartType_Parse(absl::string_view name, FigureDescriptor_ChartDescriptor_ChartType* value) {
-  return ::google::protobuf::internal::ParseNamedEnum<FigureDescriptor_ChartDescriptor_ChartType>(
-      FigureDescriptor_ChartDescriptor_ChartType_descriptor(), name, value);
-}
-enum FigureDescriptor_AxisDescriptor_AxisFormatType : int {
-  FigureDescriptor_AxisDescriptor_AxisFormatType_CATEGORY = 0,
-  FigureDescriptor_AxisDescriptor_AxisFormatType_NUMBER = 1,
-  FigureDescriptor_AxisDescriptor_AxisFormatType_FigureDescriptor_AxisDescriptor_AxisFormatType_INT_MIN_SENTINEL_DO_NOT_USE_ =
-      std::numeric_limits<::int32_t>::min(),
-  FigureDescriptor_AxisDescriptor_AxisFormatType_FigureDescriptor_AxisDescriptor_AxisFormatType_INT_MAX_SENTINEL_DO_NOT_USE_ =
-      std::numeric_limits<::int32_t>::max(),
-};
-
-bool FigureDescriptor_AxisDescriptor_AxisFormatType_IsValid(int value);
-extern const uint32_t FigureDescriptor_AxisDescriptor_AxisFormatType_internal_data_[];
-constexpr FigureDescriptor_AxisDescriptor_AxisFormatType FigureDescriptor_AxisDescriptor_AxisFormatType_AxisFormatType_MIN = static_cast<FigureDescriptor_AxisDescriptor_AxisFormatType>(0);
-constexpr FigureDescriptor_AxisDescriptor_AxisFormatType FigureDescriptor_AxisDescriptor_AxisFormatType_AxisFormatType_MAX = static_cast<FigureDescriptor_AxisDescriptor_AxisFormatType>(1);
-constexpr int FigureDescriptor_AxisDescriptor_AxisFormatType_AxisFormatType_ARRAYSIZE = 1 + 1;
-const ::google::protobuf::EnumDescriptor*
-FigureDescriptor_AxisDescriptor_AxisFormatType_descriptor();
-template <typename T>
-const std::string& FigureDescriptor_AxisDescriptor_AxisFormatType_Name(T value) {
-  static_assert(std::is_same<T, FigureDescriptor_AxisDescriptor_AxisFormatType>::value ||
-                    std::is_integral<T>::value,
-                "Incorrect type passed to AxisFormatType_Name().");
-  return FigureDescriptor_AxisDescriptor_AxisFormatType_Name(static_cast<FigureDescriptor_AxisDescriptor_AxisFormatType>(value));
-}
-template <>
-inline const std::string& FigureDescriptor_AxisDescriptor_AxisFormatType_Name(FigureDescriptor_AxisDescriptor_AxisFormatType value) {
-  return ::google::protobuf::internal::NameOfDenseEnum<FigureDescriptor_AxisDescriptor_AxisFormatType_descriptor,
-                                                 0, 1>(
-      static_cast<int>(value));
-}
-inline bool FigureDescriptor_AxisDescriptor_AxisFormatType_Parse(absl::string_view name, FigureDescriptor_AxisDescriptor_AxisFormatType* value) {
-  return ::google::protobuf::internal::ParseNamedEnum<FigureDescriptor_AxisDescriptor_AxisFormatType>(
-      FigureDescriptor_AxisDescriptor_AxisFormatType_descriptor(), name, value);
-}
-enum FigureDescriptor_AxisDescriptor_AxisType : int {
-  FigureDescriptor_AxisDescriptor_AxisType_X = 0,
-  FigureDescriptor_AxisDescriptor_AxisType_Y = 1,
-  FigureDescriptor_AxisDescriptor_AxisType_SHAPE = 2,
-  FigureDescriptor_AxisDescriptor_AxisType_SIZE = 3,
-  FigureDescriptor_AxisDescriptor_AxisType_LABEL = 4,
-  FigureDescriptor_AxisDescriptor_AxisType_COLOR = 5,
-  FigureDescriptor_AxisDescriptor_AxisType_FigureDescriptor_AxisDescriptor_AxisType_INT_MIN_SENTINEL_DO_NOT_USE_ =
-      std::numeric_limits<::int32_t>::min(),
-  FigureDescriptor_AxisDescriptor_AxisType_FigureDescriptor_AxisDescriptor_AxisType_INT_MAX_SENTINEL_DO_NOT_USE_ =
-      std::numeric_limits<::int32_t>::max(),
-};
-
-bool FigureDescriptor_AxisDescriptor_AxisType_IsValid(int value);
-extern const uint32_t FigureDescriptor_AxisDescriptor_AxisType_internal_data_[];
-constexpr FigureDescriptor_AxisDescriptor_AxisType FigureDescriptor_AxisDescriptor_AxisType_AxisType_MIN = static_cast<FigureDescriptor_AxisDescriptor_AxisType>(0);
-constexpr FigureDescriptor_AxisDescriptor_AxisType FigureDescriptor_AxisDescriptor_AxisType_AxisType_MAX = static_cast<FigureDescriptor_AxisDescriptor_AxisType>(5);
-constexpr int FigureDescriptor_AxisDescriptor_AxisType_AxisType_ARRAYSIZE = 5 + 1;
-const ::google::protobuf::EnumDescriptor*
-FigureDescriptor_AxisDescriptor_AxisType_descriptor();
-template <typename T>
-const std::string& FigureDescriptor_AxisDescriptor_AxisType_Name(T value) {
-  static_assert(std::is_same<T, FigureDescriptor_AxisDescriptor_AxisType>::value ||
-                    std::is_integral<T>::value,
-                "Incorrect type passed to AxisType_Name().");
-  return FigureDescriptor_AxisDescriptor_AxisType_Name(static_cast<FigureDescriptor_AxisDescriptor_AxisType>(value));
-}
-template <>
-inline const std::string& FigureDescriptor_AxisDescriptor_AxisType_Name(FigureDescriptor_AxisDescriptor_AxisType value) {
-  return ::google::protobuf::internal::NameOfDenseEnum<FigureDescriptor_AxisDescriptor_AxisType_descriptor,
-                                                 0, 5>(
-      static_cast<int>(value));
-}
-inline bool FigureDescriptor_AxisDescriptor_AxisType_Parse(absl::string_view name, FigureDescriptor_AxisDescriptor_AxisType* value) {
-  return ::google::protobuf::internal::ParseNamedEnum<FigureDescriptor_AxisDescriptor_AxisType>(
-      FigureDescriptor_AxisDescriptor_AxisType_descriptor(), name, value);
-}
-enum FigureDescriptor_AxisDescriptor_AxisPosition : int {
-  FigureDescriptor_AxisDescriptor_AxisPosition_TOP = 0,
-  FigureDescriptor_AxisDescriptor_AxisPosition_BOTTOM = 1,
-  FigureDescriptor_AxisDescriptor_AxisPosition_LEFT = 2,
-  FigureDescriptor_AxisDescriptor_AxisPosition_RIGHT = 3,
-  FigureDescriptor_AxisDescriptor_AxisPosition_NONE = 4,
-  FigureDescriptor_AxisDescriptor_AxisPosition_FigureDescriptor_AxisDescriptor_AxisPosition_INT_MIN_SENTINEL_DO_NOT_USE_ =
-      std::numeric_limits<::int32_t>::min(),
-  FigureDescriptor_AxisDescriptor_AxisPosition_FigureDescriptor_AxisDescriptor_AxisPosition_INT_MAX_SENTINEL_DO_NOT_USE_ =
-      std::numeric_limits<::int32_t>::max(),
-};
-
-bool FigureDescriptor_AxisDescriptor_AxisPosition_IsValid(int value);
-extern const uint32_t FigureDescriptor_AxisDescriptor_AxisPosition_internal_data_[];
-constexpr FigureDescriptor_AxisDescriptor_AxisPosition FigureDescriptor_AxisDescriptor_AxisPosition_AxisPosition_MIN = static_cast<FigureDescriptor_AxisDescriptor_AxisPosition>(0);
-constexpr FigureDescriptor_AxisDescriptor_AxisPosition FigureDescriptor_AxisDescriptor_AxisPosition_AxisPosition_MAX = static_cast<FigureDescriptor_AxisDescriptor_AxisPosition>(4);
-constexpr int FigureDescriptor_AxisDescriptor_AxisPosition_AxisPosition_ARRAYSIZE = 4 + 1;
-const ::google::protobuf::EnumDescriptor*
-FigureDescriptor_AxisDescriptor_AxisPosition_descriptor();
-template <typename T>
-const std::string& FigureDescriptor_AxisDescriptor_AxisPosition_Name(T value) {
-  static_assert(std::is_same<T, FigureDescriptor_AxisDescriptor_AxisPosition>::value ||
-                    std::is_integral<T>::value,
-                "Incorrect type passed to AxisPosition_Name().");
-  return FigureDescriptor_AxisDescriptor_AxisPosition_Name(static_cast<FigureDescriptor_AxisDescriptor_AxisPosition>(value));
-}
-template <>
-inline const std::string& FigureDescriptor_AxisDescriptor_AxisPosition_Name(FigureDescriptor_AxisDescriptor_AxisPosition value) {
-  return ::google::protobuf::internal::NameOfDenseEnum<FigureDescriptor_AxisDescriptor_AxisPosition_descriptor,
-                                                 0, 4>(
-      static_cast<int>(value));
-}
-inline bool FigureDescriptor_AxisDescriptor_AxisPosition_Parse(absl::string_view name, FigureDescriptor_AxisDescriptor_AxisPosition* value) {
-  return ::google::protobuf::internal::ParseNamedEnum<FigureDescriptor_AxisDescriptor_AxisPosition>(
-      FigureDescriptor_AxisDescriptor_AxisPosition_descriptor(), name, value);
-}
-enum FigureDescriptor_BusinessCalendarDescriptor_DayOfWeek : int {
-  FigureDescriptor_BusinessCalendarDescriptor_DayOfWeek_SUNDAY = 0,
-  FigureDescriptor_BusinessCalendarDescriptor_DayOfWeek_MONDAY = 1,
-  FigureDescriptor_BusinessCalendarDescriptor_DayOfWeek_TUESDAY = 2,
-  FigureDescriptor_BusinessCalendarDescriptor_DayOfWeek_WEDNESDAY = 3,
-  FigureDescriptor_BusinessCalendarDescriptor_DayOfWeek_THURSDAY = 4,
-  FigureDescriptor_BusinessCalendarDescriptor_DayOfWeek_FRIDAY = 5,
-  FigureDescriptor_BusinessCalendarDescriptor_DayOfWeek_SATURDAY = 6,
-  FigureDescriptor_BusinessCalendarDescriptor_DayOfWeek_FigureDescriptor_BusinessCalendarDescriptor_DayOfWeek_INT_MIN_SENTINEL_DO_NOT_USE_ =
-      std::numeric_limits<::int32_t>::min(),
-  FigureDescriptor_BusinessCalendarDescriptor_DayOfWeek_FigureDescriptor_BusinessCalendarDescriptor_DayOfWeek_INT_MAX_SENTINEL_DO_NOT_USE_ =
-      std::numeric_limits<::int32_t>::max(),
-};
-
-bool FigureDescriptor_BusinessCalendarDescriptor_DayOfWeek_IsValid(int value);
-extern const uint32_t FigureDescriptor_BusinessCalendarDescriptor_DayOfWeek_internal_data_[];
-constexpr FigureDescriptor_BusinessCalendarDescriptor_DayOfWeek FigureDescriptor_BusinessCalendarDescriptor_DayOfWeek_DayOfWeek_MIN = static_cast<FigureDescriptor_BusinessCalendarDescriptor_DayOfWeek>(0);
-constexpr FigureDescriptor_BusinessCalendarDescriptor_DayOfWeek FigureDescriptor_BusinessCalendarDescriptor_DayOfWeek_DayOfWeek_MAX = static_cast<FigureDescriptor_BusinessCalendarDescriptor_DayOfWeek>(6);
-constexpr int FigureDescriptor_BusinessCalendarDescriptor_DayOfWeek_DayOfWeek_ARRAYSIZE = 6 + 1;
-const ::google::protobuf::EnumDescriptor*
-FigureDescriptor_BusinessCalendarDescriptor_DayOfWeek_descriptor();
-template <typename T>
-const std::string& FigureDescriptor_BusinessCalendarDescriptor_DayOfWeek_Name(T value) {
-  static_assert(std::is_same<T, FigureDescriptor_BusinessCalendarDescriptor_DayOfWeek>::value ||
-                    std::is_integral<T>::value,
-                "Incorrect type passed to DayOfWeek_Name().");
-  return FigureDescriptor_BusinessCalendarDescriptor_DayOfWeek_Name(static_cast<FigureDescriptor_BusinessCalendarDescriptor_DayOfWeek>(value));
-}
-template <>
-inline const std::string& FigureDescriptor_BusinessCalendarDescriptor_DayOfWeek_Name(FigureDescriptor_BusinessCalendarDescriptor_DayOfWeek value) {
-  return ::google::protobuf::internal::NameOfDenseEnum<FigureDescriptor_BusinessCalendarDescriptor_DayOfWeek_descriptor,
-                                                 0, 6>(
-      static_cast<int>(value));
-}
-inline bool FigureDescriptor_BusinessCalendarDescriptor_DayOfWeek_Parse(absl::string_view name, FigureDescriptor_BusinessCalendarDescriptor_DayOfWeek* value) {
-  return ::google::protobuf::internal::ParseNamedEnum<FigureDescriptor_BusinessCalendarDescriptor_DayOfWeek>(
-      FigureDescriptor_BusinessCalendarDescriptor_DayOfWeek_descriptor(), name, value);
-}
-enum FigureDescriptor_SeriesPlotStyle : int {
-  FigureDescriptor_SeriesPlotStyle_BAR = 0,
-  FigureDescriptor_SeriesPlotStyle_STACKED_BAR = 1,
-  FigureDescriptor_SeriesPlotStyle_LINE = 2,
-  FigureDescriptor_SeriesPlotStyle_AREA = 3,
-  FigureDescriptor_SeriesPlotStyle_STACKED_AREA = 4,
-  FigureDescriptor_SeriesPlotStyle_PIE = 5,
-  FigureDescriptor_SeriesPlotStyle_HISTOGRAM = 6,
-  FigureDescriptor_SeriesPlotStyle_OHLC = 7,
-  FigureDescriptor_SeriesPlotStyle_SCATTER = 8,
-  FigureDescriptor_SeriesPlotStyle_STEP = 9,
-  FigureDescriptor_SeriesPlotStyle_ERROR_BAR = 10,
-  FigureDescriptor_SeriesPlotStyle_TREEMAP = 11,
-  FigureDescriptor_SeriesPlotStyle_FigureDescriptor_SeriesPlotStyle_INT_MIN_SENTINEL_DO_NOT_USE_ =
-      std::numeric_limits<::int32_t>::min(),
-  FigureDescriptor_SeriesPlotStyle_FigureDescriptor_SeriesPlotStyle_INT_MAX_SENTINEL_DO_NOT_USE_ =
-      std::numeric_limits<::int32_t>::max(),
-};
-
-bool FigureDescriptor_SeriesPlotStyle_IsValid(int value);
-extern const uint32_t FigureDescriptor_SeriesPlotStyle_internal_data_[];
-constexpr FigureDescriptor_SeriesPlotStyle FigureDescriptor_SeriesPlotStyle_SeriesPlotStyle_MIN = static_cast<FigureDescriptor_SeriesPlotStyle>(0);
-constexpr FigureDescriptor_SeriesPlotStyle FigureDescriptor_SeriesPlotStyle_SeriesPlotStyle_MAX = static_cast<FigureDescriptor_SeriesPlotStyle>(11);
-constexpr int FigureDescriptor_SeriesPlotStyle_SeriesPlotStyle_ARRAYSIZE = 11 + 1;
-const ::google::protobuf::EnumDescriptor*
-FigureDescriptor_SeriesPlotStyle_descriptor();
-template <typename T>
-const std::string& FigureDescriptor_SeriesPlotStyle_Name(T value) {
-  static_assert(std::is_same<T, FigureDescriptor_SeriesPlotStyle>::value ||
-                    std::is_integral<T>::value,
-                "Incorrect type passed to SeriesPlotStyle_Name().");
-  return FigureDescriptor_SeriesPlotStyle_Name(static_cast<FigureDescriptor_SeriesPlotStyle>(value));
-}
-template <>
-inline const std::string& FigureDescriptor_SeriesPlotStyle_Name(FigureDescriptor_SeriesPlotStyle value) {
-  return ::google::protobuf::internal::NameOfDenseEnum<FigureDescriptor_SeriesPlotStyle_descriptor,
-                                                 0, 11>(
-      static_cast<int>(value));
-}
-inline bool FigureDescriptor_SeriesPlotStyle_Parse(absl::string_view name, FigureDescriptor_SeriesPlotStyle* value) {
-  return ::google::protobuf::internal::ParseNamedEnum<FigureDescriptor_SeriesPlotStyle>(
-      FigureDescriptor_SeriesPlotStyle_descriptor(), name, value);
-}
-enum FigureDescriptor_SourceType : int {
-  FigureDescriptor_SourceType_X = 0,
-  FigureDescriptor_SourceType_Y = 1,
-  FigureDescriptor_SourceType_Z = 2,
-  FigureDescriptor_SourceType_X_LOW = 3,
-  FigureDescriptor_SourceType_X_HIGH = 4,
-  FigureDescriptor_SourceType_Y_LOW = 5,
-  FigureDescriptor_SourceType_Y_HIGH = 6,
-  FigureDescriptor_SourceType_TIME = 7,
-  FigureDescriptor_SourceType_OPEN = 8,
-  FigureDescriptor_SourceType_HIGH = 9,
-  FigureDescriptor_SourceType_LOW = 10,
-  FigureDescriptor_SourceType_CLOSE = 11,
-  FigureDescriptor_SourceType_SHAPE = 12,
-  FigureDescriptor_SourceType_SIZE = 13,
-  FigureDescriptor_SourceType_LABEL = 14,
-  FigureDescriptor_SourceType_COLOR = 15,
-  FigureDescriptor_SourceType_PARENT = 16,
-  FigureDescriptor_SourceType_HOVER_TEXT = 17,
-  FigureDescriptor_SourceType_TEXT = 18,
-  FigureDescriptor_SourceType_FigureDescriptor_SourceType_INT_MIN_SENTINEL_DO_NOT_USE_ =
-      std::numeric_limits<::int32_t>::min(),
-  FigureDescriptor_SourceType_FigureDescriptor_SourceType_INT_MAX_SENTINEL_DO_NOT_USE_ =
-      std::numeric_limits<::int32_t>::max(),
-};
-
-bool FigureDescriptor_SourceType_IsValid(int value);
-extern const uint32_t FigureDescriptor_SourceType_internal_data_[];
-constexpr FigureDescriptor_SourceType FigureDescriptor_SourceType_SourceType_MIN = static_cast<FigureDescriptor_SourceType>(0);
-constexpr FigureDescriptor_SourceType FigureDescriptor_SourceType_SourceType_MAX = static_cast<FigureDescriptor_SourceType>(18);
-constexpr int FigureDescriptor_SourceType_SourceType_ARRAYSIZE = 18 + 1;
-const ::google::protobuf::EnumDescriptor*
-FigureDescriptor_SourceType_descriptor();
-template <typename T>
-const std::string& FigureDescriptor_SourceType_Name(T value) {
-  static_assert(std::is_same<T, FigureDescriptor_SourceType>::value ||
-                    std::is_integral<T>::value,
-                "Incorrect type passed to SourceType_Name().");
-  return FigureDescriptor_SourceType_Name(static_cast<FigureDescriptor_SourceType>(value));
-}
-template <>
-inline const std::string& FigureDescriptor_SourceType_Name(FigureDescriptor_SourceType value) {
-  return ::google::protobuf::internal::NameOfDenseEnum<FigureDescriptor_SourceType_descriptor,
-                                                 0, 18>(
-      static_cast<int>(value));
-}
-inline bool FigureDescriptor_SourceType_Parse(absl::string_view name, FigureDescriptor_SourceType* value) {
-  return ::google::protobuf::internal::ParseNamedEnum<FigureDescriptor_SourceType>(
-      FigureDescriptor_SourceType_descriptor(), name, value);
-}
-
-// ===================================================================
-
-
-// -------------------------------------------------------------------
-
-class VersionedTextDocumentIdentifier final :
-    public ::google::protobuf::Message /* @@protoc_insertion_point(class_definition:io.deephaven.proto.backplane.script.grpc.VersionedTextDocumentIdentifier) */ {
- public:
-  inline VersionedTextDocumentIdentifier() : VersionedTextDocumentIdentifier(nullptr) {}
-  ~VersionedTextDocumentIdentifier() override;
-  template<typename = void>
-  explicit PROTOBUF_CONSTEXPR VersionedTextDocumentIdentifier(::google::protobuf::internal::ConstantInitialized);
-
-  inline VersionedTextDocumentIdentifier(const VersionedTextDocumentIdentifier& from)
-      : VersionedTextDocumentIdentifier(nullptr, from) {}
-  VersionedTextDocumentIdentifier(VersionedTextDocumentIdentifier&& from) noexcept
-    : VersionedTextDocumentIdentifier() {
-    *this = ::std::move(from);
-  }
-
-  inline VersionedTextDocumentIdentifier& operator=(const VersionedTextDocumentIdentifier& from) {
-    CopyFrom(from);
-    return *this;
-  }
-  inline VersionedTextDocumentIdentifier& operator=(VersionedTextDocumentIdentifier&& from) noexcept {
-    if (this == &from) return *this;
-    if (GetArena() == from.GetArena()
-  #ifdef PROTOBUF_FORCE_COPY_IN_MOVE
-        && GetArena() != nullptr
-  #endif  // !PROTOBUF_FORCE_COPY_IN_MOVE
-    ) {
-      InternalSwap(&from);
-    } else {
-      CopyFrom(from);
-    }
-    return *this;
-  }
-
-  inline const ::google::protobuf::UnknownFieldSet& unknown_fields() const
-      ABSL_ATTRIBUTE_LIFETIME_BOUND {
-    return _internal_metadata_.unknown_fields<::google::protobuf::UnknownFieldSet>(::google::protobuf::UnknownFieldSet::default_instance);
-  }
-  inline ::google::protobuf::UnknownFieldSet* mutable_unknown_fields()
-      ABSL_ATTRIBUTE_LIFETIME_BOUND {
-    return _internal_metadata_.mutable_unknown_fields<::google::protobuf::UnknownFieldSet>();
-  }
-
-  static const ::google::protobuf::Descriptor* descriptor() {
-    return GetDescriptor();
-  }
-  static const ::google::protobuf::Descriptor* GetDescriptor() {
-    return default_instance().GetMetadata().descriptor;
-  }
-  static const ::google::protobuf::Reflection* GetReflection() {
-    return default_instance().GetMetadata().reflection;
-  }
-  static const VersionedTextDocumentIdentifier& default_instance() {
-    return *internal_default_instance();
-  }
-  static inline const VersionedTextDocumentIdentifier* internal_default_instance() {
-    return reinterpret_cast<const VersionedTextDocumentIdentifier*>(
-               &_VersionedTextDocumentIdentifier_default_instance_);
-  }
-  static constexpr int kIndexInFileMessages =
-    25;
-
-  friend void swap(VersionedTextDocumentIdentifier& a, VersionedTextDocumentIdentifier& b) {
-    a.Swap(&b);
-  }
-  inline void Swap(VersionedTextDocumentIdentifier* other) {
-    if (other == this) return;
-  #ifdef PROTOBUF_FORCE_COPY_IN_SWAP
-    if (GetArena() != nullptr &&
-        GetArena() == other->GetArena()) {
-   #else  // PROTOBUF_FORCE_COPY_IN_SWAP
-    if (GetArena() == other->GetArena()) {
-  #endif  // !PROTOBUF_FORCE_COPY_IN_SWAP
-      InternalSwap(other);
-    } else {
-      ::google::protobuf::internal::GenericSwap(this, other);
-    }
-  }
-  void UnsafeArenaSwap(VersionedTextDocumentIdentifier* other) {
-    if (other == this) return;
-    ABSL_DCHECK(GetArena() == other->GetArena());
-    InternalSwap(other);
-  }
-
-  // implements Message ----------------------------------------------
-
-  VersionedTextDocumentIdentifier* New(::google::protobuf::Arena* arena = nullptr) const final {
-    return CreateMaybeMessage<VersionedTextDocumentIdentifier>(arena);
-  }
-  using ::google::protobuf::Message::CopyFrom;
-  void CopyFrom(const VersionedTextDocumentIdentifier& from);
-  using ::google::protobuf::Message::MergeFrom;
-  void MergeFrom( const VersionedTextDocumentIdentifier& from) {
-    VersionedTextDocumentIdentifier::MergeImpl(*this, from);
-  }
-  private:
-  static void MergeImpl(::google::protobuf::Message& to_msg, const ::google::protobuf::Message& from_msg);
-  public:
-  PROTOBUF_ATTRIBUTE_REINITIALIZES void Clear() final;
-  bool IsInitialized() const final;
-
-  ::size_t ByteSizeLong() const final;
-  const char* _InternalParse(const char* ptr, ::google::protobuf::internal::ParseContext* ctx) final;
-  ::uint8_t* _InternalSerialize(
-      ::uint8_t* target, ::google::protobuf::io::EpsCopyOutputStream* stream) const final;
-  int GetCachedSize() const { return _impl_._cached_size_.Get(); }
-
-  private:
-  ::google::protobuf::internal::CachedSize* AccessCachedSize() const final;
-  void SharedCtor(::google::protobuf::Arena* arena);
-  void SharedDtor();
-  void InternalSwap(VersionedTextDocumentIdentifier* other);
-
-  private:
-  friend class ::google::protobuf::internal::AnyMetadata;
-  static ::absl::string_view FullMessageName() {
-    return "io.deephaven.proto.backplane.script.grpc.VersionedTextDocumentIdentifier";
-  }
-  protected:
-  explicit VersionedTextDocumentIdentifier(::google::protobuf::Arena* arena);
-  VersionedTextDocumentIdentifier(::google::protobuf::Arena* arena, const VersionedTextDocumentIdentifier& from);
-  public:
-
-  static const ClassData _class_data_;
-  const ::google::protobuf::Message::ClassData*GetClassData() const final;
-
-  ::google::protobuf::Metadata GetMetadata() const final;
-
-  // nested types ----------------------------------------------------
-
-  // accessors -------------------------------------------------------
-
-  enum : int {
-    kUriFieldNumber = 1,
-    kVersionFieldNumber = 2,
-  };
-  // string uri = 1;
-  void clear_uri() ;
-  const std::string& uri() const;
-  template <typename Arg_ = const std::string&, typename... Args_>
-  void set_uri(Arg_&& arg, Args_... args);
-  std::string* mutable_uri();
-  PROTOBUF_NODISCARD std::string* release_uri();
-  void set_allocated_uri(std::string* value);
-
-  private:
-  const std::string& _internal_uri() const;
-  inline PROTOBUF_ALWAYS_INLINE void _internal_set_uri(
-      const std::string& value);
-  std::string* _internal_mutable_uri();
-
-  public:
-  // int32 version = 2;
-  void clear_version() ;
-  ::int32_t version() const;
-  void set_version(::int32_t value);
-
-  private:
-  ::int32_t _internal_version() const;
-  void _internal_set_version(::int32_t value);
-
-  public:
-  // @@protoc_insertion_point(class_scope:io.deephaven.proto.backplane.script.grpc.VersionedTextDocumentIdentifier)
- private:
-  class _Internal;
-
-  friend class ::google::protobuf::internal::TcParser;
-  static const ::google::protobuf::internal::TcParseTable<
-      1, 2, 0,
-      84, 2>
-      _table_;
-  friend class ::google::protobuf::MessageLite;
-  friend class ::google::protobuf::Arena;
-  template <typename T>
-  friend class ::google::protobuf::Arena::InternalHelper;
-  using InternalArenaConstructable_ = void;
-  using DestructorSkippable_ = void;
-  struct Impl_ {
-
-        inline explicit constexpr Impl_(
-            ::google::protobuf::internal::ConstantInitialized) noexcept;
-        inline explicit Impl_(::google::protobuf::internal::InternalVisibility visibility,
-                              ::google::protobuf::Arena* arena);
-        inline explicit Impl_(::google::protobuf::internal::InternalVisibility visibility,
-                              ::google::protobuf::Arena* arena, const Impl_& from);
-    ::google::protobuf::internal::ArenaStringPtr uri_;
-    ::int32_t version_;
-    mutable ::google::protobuf::internal::CachedSize _cached_size_;
-    PROTOBUF_TSAN_DECLARE_MEMBER
-  };
-  union { Impl_ _impl_; };
-  friend struct ::TableStruct_deephaven_2fproto_2fconsole_2eproto;
-};// -------------------------------------------------------------------
-
-class TextDocumentItem final :
-    public ::google::protobuf::Message /* @@protoc_insertion_point(class_definition:io.deephaven.proto.backplane.script.grpc.TextDocumentItem) */ {
- public:
-  inline TextDocumentItem() : TextDocumentItem(nullptr) {}
-  ~TextDocumentItem() override;
-  template<typename = void>
-  explicit PROTOBUF_CONSTEXPR TextDocumentItem(::google::protobuf::internal::ConstantInitialized);
-
-  inline TextDocumentItem(const TextDocumentItem& from)
-      : TextDocumentItem(nullptr, from) {}
-  TextDocumentItem(TextDocumentItem&& from) noexcept
-    : TextDocumentItem() {
-    *this = ::std::move(from);
-  }
-
-  inline TextDocumentItem& operator=(const TextDocumentItem& from) {
-    CopyFrom(from);
-    return *this;
-  }
-  inline TextDocumentItem& operator=(TextDocumentItem&& from) noexcept {
-    if (this == &from) return *this;
-    if (GetArena() == from.GetArena()
-  #ifdef PROTOBUF_FORCE_COPY_IN_MOVE
-        && GetArena() != nullptr
-  #endif  // !PROTOBUF_FORCE_COPY_IN_MOVE
-    ) {
-      InternalSwap(&from);
-    } else {
-      CopyFrom(from);
-    }
-    return *this;
-  }
-
-  inline const ::google::protobuf::UnknownFieldSet& unknown_fields() const
-      ABSL_ATTRIBUTE_LIFETIME_BOUND {
-    return _internal_metadata_.unknown_fields<::google::protobuf::UnknownFieldSet>(::google::protobuf::UnknownFieldSet::default_instance);
-  }
-  inline ::google::protobuf::UnknownFieldSet* mutable_unknown_fields()
-      ABSL_ATTRIBUTE_LIFETIME_BOUND {
-    return _internal_metadata_.mutable_unknown_fields<::google::protobuf::UnknownFieldSet>();
-  }
-
-  static const ::google::protobuf::Descriptor* descriptor() {
-    return GetDescriptor();
-  }
-  static const ::google::protobuf::Descriptor* GetDescriptor() {
-    return default_instance().GetMetadata().descriptor;
-  }
-  static const ::google::protobuf::Reflection* GetReflection() {
-    return default_instance().GetMetadata().reflection;
-  }
-  static const TextDocumentItem& default_instance() {
-    return *internal_default_instance();
-  }
-  static inline const TextDocumentItem* internal_default_instance() {
-    return reinterpret_cast<const TextDocumentItem*>(
-               &_TextDocumentItem_default_instance_);
-  }
-  static constexpr int kIndexInFileMessages =
-    20;
-
-  friend void swap(TextDocumentItem& a, TextDocumentItem& b) {
-    a.Swap(&b);
-  }
-  inline void Swap(TextDocumentItem* other) {
-    if (other == this) return;
-  #ifdef PROTOBUF_FORCE_COPY_IN_SWAP
-    if (GetArena() != nullptr &&
-        GetArena() == other->GetArena()) {
-   #else  // PROTOBUF_FORCE_COPY_IN_SWAP
-    if (GetArena() == other->GetArena()) {
-  #endif  // !PROTOBUF_FORCE_COPY_IN_SWAP
-      InternalSwap(other);
-    } else {
-      ::google::protobuf::internal::GenericSwap(this, other);
-    }
-  }
-  void UnsafeArenaSwap(TextDocumentItem* other) {
-    if (other == this) return;
-    ABSL_DCHECK(GetArena() == other->GetArena());
-    InternalSwap(other);
-  }
-
-  // implements Message ----------------------------------------------
-
-  TextDocumentItem* New(::google::protobuf::Arena* arena = nullptr) const final {
-    return CreateMaybeMessage<TextDocumentItem>(arena);
-  }
-  using ::google::protobuf::Message::CopyFrom;
-  void CopyFrom(const TextDocumentItem& from);
-  using ::google::protobuf::Message::MergeFrom;
-  void MergeFrom( const TextDocumentItem& from) {
-    TextDocumentItem::MergeImpl(*this, from);
-  }
-  private:
-  static void MergeImpl(::google::protobuf::Message& to_msg, const ::google::protobuf::Message& from_msg);
-  public:
-  PROTOBUF_ATTRIBUTE_REINITIALIZES void Clear() final;
-  bool IsInitialized() const final;
-
-  ::size_t ByteSizeLong() const final;
-  const char* _InternalParse(const char* ptr, ::google::protobuf::internal::ParseContext* ctx) final;
-  ::uint8_t* _InternalSerialize(
-      ::uint8_t* target, ::google::protobuf::io::EpsCopyOutputStream* stream) const final;
-  int GetCachedSize() const { return _impl_._cached_size_.Get(); }
-
-  private:
-  ::google::protobuf::internal::CachedSize* AccessCachedSize() const final;
-  void SharedCtor(::google::protobuf::Arena* arena);
-  void SharedDtor();
-  void InternalSwap(TextDocumentItem* other);
-
-  private:
-  friend class ::google::protobuf::internal::AnyMetadata;
-  static ::absl::string_view FullMessageName() {
-    return "io.deephaven.proto.backplane.script.grpc.TextDocumentItem";
-  }
-  protected:
-  explicit TextDocumentItem(::google::protobuf::Arena* arena);
-  TextDocumentItem(::google::protobuf::Arena* arena, const TextDocumentItem& from);
-  public:
-
-  static const ClassData _class_data_;
-  const ::google::protobuf::Message::ClassData*GetClassData() const final;
-
-  ::google::protobuf::Metadata GetMetadata() const final;
-
-  // nested types ----------------------------------------------------
-
-  // accessors -------------------------------------------------------
-
-  enum : int {
-    kUriFieldNumber = 1,
-    kLanguageIdFieldNumber = 2,
-    kTextFieldNumber = 4,
-    kVersionFieldNumber = 3,
-  };
-  // string uri = 1;
-  void clear_uri() ;
-  const std::string& uri() const;
-  template <typename Arg_ = const std::string&, typename... Args_>
-  void set_uri(Arg_&& arg, Args_... args);
-  std::string* mutable_uri();
-  PROTOBUF_NODISCARD std::string* release_uri();
-  void set_allocated_uri(std::string* value);
-
-  private:
-  const std::string& _internal_uri() const;
-  inline PROTOBUF_ALWAYS_INLINE void _internal_set_uri(
-      const std::string& value);
-  std::string* _internal_mutable_uri();
-
-  public:
-  // string language_id = 2;
-  void clear_language_id() ;
-  const std::string& language_id() const;
-  template <typename Arg_ = const std::string&, typename... Args_>
-  void set_language_id(Arg_&& arg, Args_... args);
-  std::string* mutable_language_id();
-  PROTOBUF_NODISCARD std::string* release_language_id();
-  void set_allocated_language_id(std::string* value);
-
-  private:
-  const std::string& _internal_language_id() const;
-  inline PROTOBUF_ALWAYS_INLINE void _internal_set_language_id(
-      const std::string& value);
-  std::string* _internal_mutable_language_id();
-
-  public:
-  // string text = 4;
-  void clear_text() ;
-  const std::string& text() const;
-  template <typename Arg_ = const std::string&, typename... Args_>
-  void set_text(Arg_&& arg, Args_... args);
-  std::string* mutable_text();
-  PROTOBUF_NODISCARD std::string* release_text();
-  void set_allocated_text(std::string* value);
-
-  private:
-  const std::string& _internal_text() const;
-  inline PROTOBUF_ALWAYS_INLINE void _internal_set_text(
-      const std::string& value);
-  std::string* _internal_mutable_text();
-
-  public:
-  // int32 version = 3;
-  void clear_version() ;
-  ::int32_t version() const;
-  void set_version(::int32_t value);
-
-  private:
-  ::int32_t _internal_version() const;
-  void _internal_set_version(::int32_t value);
-
-  public:
-  // @@protoc_insertion_point(class_scope:io.deephaven.proto.backplane.script.grpc.TextDocumentItem)
- private:
-  class _Internal;
-
-  friend class ::google::protobuf::internal::TcParser;
-  static const ::google::protobuf::internal::TcParseTable<
-      2, 4, 0,
-      84, 2>
-      _table_;
-  friend class ::google::protobuf::MessageLite;
-  friend class ::google::protobuf::Arena;
-  template <typename T>
-  friend class ::google::protobuf::Arena::InternalHelper;
-  using InternalArenaConstructable_ = void;
-  using DestructorSkippable_ = void;
-  struct Impl_ {
-
-        inline explicit constexpr Impl_(
-            ::google::protobuf::internal::ConstantInitialized) noexcept;
-        inline explicit Impl_(::google::protobuf::internal::InternalVisibility visibility,
-                              ::google::protobuf::Arena* arena);
-        inline explicit Impl_(::google::protobuf::internal::InternalVisibility visibility,
-                              ::google::protobuf::Arena* arena, const Impl_& from);
-    ::google::protobuf::internal::ArenaStringPtr uri_;
-    ::google::protobuf::internal::ArenaStringPtr language_id_;
-    ::google::protobuf::internal::ArenaStringPtr text_;
-    ::int32_t version_;
-    mutable ::google::protobuf::internal::CachedSize _cached_size_;
-    PROTOBUF_TSAN_DECLARE_MEMBER
-  };
-  union { Impl_ _impl_; };
-  friend struct ::TableStruct_deephaven_2fproto_2fconsole_2eproto;
-};// -------------------------------------------------------------------
-
-class Position final :
-    public ::google::protobuf::Message /* @@protoc_insertion_point(class_definition:io.deephaven.proto.backplane.script.grpc.Position) */ {
- public:
-  inline Position() : Position(nullptr) {}
-  ~Position() override;
-  template<typename = void>
-  explicit PROTOBUF_CONSTEXPR Position(::google::protobuf::internal::ConstantInitialized);
-
-  inline Position(const Position& from)
-      : Position(nullptr, from) {}
-  Position(Position&& from) noexcept
-    : Position() {
-    *this = ::std::move(from);
-  }
-
-  inline Position& operator=(const Position& from) {
-    CopyFrom(from);
-    return *this;
-  }
-  inline Position& operator=(Position&& from) noexcept {
-    if (this == &from) return *this;
-    if (GetArena() == from.GetArena()
-  #ifdef PROTOBUF_FORCE_COPY_IN_MOVE
-        && GetArena() != nullptr
-  #endif  // !PROTOBUF_FORCE_COPY_IN_MOVE
-    ) {
-      InternalSwap(&from);
-    } else {
-      CopyFrom(from);
-    }
-    return *this;
-  }
-
-  inline const ::google::protobuf::UnknownFieldSet& unknown_fields() const
-      ABSL_ATTRIBUTE_LIFETIME_BOUND {
-    return _internal_metadata_.unknown_fields<::google::protobuf::UnknownFieldSet>(::google::protobuf::UnknownFieldSet::default_instance);
-  }
-  inline ::google::protobuf::UnknownFieldSet* mutable_unknown_fields()
-      ABSL_ATTRIBUTE_LIFETIME_BOUND {
-    return _internal_metadata_.mutable_unknown_fields<::google::protobuf::UnknownFieldSet>();
-  }
-
-  static const ::google::protobuf::Descriptor* descriptor() {
-    return GetDescriptor();
-  }
-  static const ::google::protobuf::Descriptor* GetDescriptor() {
-    return default_instance().GetMetadata().descriptor;
-  }
-  static const ::google::protobuf::Reflection* GetReflection() {
-    return default_instance().GetMetadata().reflection;
-  }
-  static const Position& default_instance() {
-    return *internal_default_instance();
-  }
-  static inline const Position* internal_default_instance() {
-    return reinterpret_cast<const Position*>(
-               &_Position_default_instance_);
-  }
-  static constexpr int kIndexInFileMessages =
-    26;
-
-  friend void swap(Position& a, Position& b) {
-    a.Swap(&b);
-  }
-  inline void Swap(Position* other) {
-    if (other == this) return;
-  #ifdef PROTOBUF_FORCE_COPY_IN_SWAP
-    if (GetArena() != nullptr &&
-        GetArena() == other->GetArena()) {
-   #else  // PROTOBUF_FORCE_COPY_IN_SWAP
-    if (GetArena() == other->GetArena()) {
-  #endif  // !PROTOBUF_FORCE_COPY_IN_SWAP
-      InternalSwap(other);
-    } else {
-      ::google::protobuf::internal::GenericSwap(this, other);
-    }
-  }
-  void UnsafeArenaSwap(Position* other) {
-    if (other == this) return;
-    ABSL_DCHECK(GetArena() == other->GetArena());
-    InternalSwap(other);
-  }
-
-  // implements Message ----------------------------------------------
-
-  Position* New(::google::protobuf::Arena* arena = nullptr) const final {
-    return CreateMaybeMessage<Position>(arena);
-  }
-  using ::google::protobuf::Message::CopyFrom;
-  void CopyFrom(const Position& from);
-  using ::google::protobuf::Message::MergeFrom;
-  void MergeFrom( const Position& from) {
-    Position::MergeImpl(*this, from);
-  }
-  private:
-  static void MergeImpl(::google::protobuf::Message& to_msg, const ::google::protobuf::Message& from_msg);
-  public:
-  PROTOBUF_ATTRIBUTE_REINITIALIZES void Clear() final;
-  bool IsInitialized() const final;
-
-  ::size_t ByteSizeLong() const final;
-  const char* _InternalParse(const char* ptr, ::google::protobuf::internal::ParseContext* ctx) final;
-  ::uint8_t* _InternalSerialize(
-      ::uint8_t* target, ::google::protobuf::io::EpsCopyOutputStream* stream) const final;
-  int GetCachedSize() const { return _impl_._cached_size_.Get(); }
-
-  private:
-  ::google::protobuf::internal::CachedSize* AccessCachedSize() const final;
-  void SharedCtor(::google::protobuf::Arena* arena);
-  void SharedDtor();
-  void InternalSwap(Position* other);
-
-  private:
-  friend class ::google::protobuf::internal::AnyMetadata;
-  static ::absl::string_view FullMessageName() {
-    return "io.deephaven.proto.backplane.script.grpc.Position";
-  }
-  protected:
-  explicit Position(::google::protobuf::Arena* arena);
-  Position(::google::protobuf::Arena* arena, const Position& from);
-  public:
-
-  static const ClassData _class_data_;
-  const ::google::protobuf::Message::ClassData*GetClassData() const final;
-
-  ::google::protobuf::Metadata GetMetadata() const final;
-
-  // nested types ----------------------------------------------------
-
-  // accessors -------------------------------------------------------
-
-  enum : int {
-    kLineFieldNumber = 1,
-    kCharacterFieldNumber = 2,
-  };
-  // int32 line = 1;
-  void clear_line() ;
-  ::int32_t line() const;
-  void set_line(::int32_t value);
-
-  private:
-  ::int32_t _internal_line() const;
-  void _internal_set_line(::int32_t value);
-
-  public:
-  // int32 character = 2;
-  void clear_character() ;
-  ::int32_t character() const;
-  void set_character(::int32_t value);
-
-  private:
-  ::int32_t _internal_character() const;
-  void _internal_set_character(::int32_t value);
-
-  public:
-  // @@protoc_insertion_point(class_scope:io.deephaven.proto.backplane.script.grpc.Position)
- private:
-  class _Internal;
-
-  friend class ::google::protobuf::internal::TcParser;
-  static const ::google::protobuf::internal::TcParseTable<
-      1, 2, 0,
-      0, 2>
-      _table_;
-  friend class ::google::protobuf::MessageLite;
-  friend class ::google::protobuf::Arena;
-  template <typename T>
-  friend class ::google::protobuf::Arena::InternalHelper;
-  using InternalArenaConstructable_ = void;
-  using DestructorSkippable_ = void;
-  struct Impl_ {
-
-        inline explicit constexpr Impl_(
-            ::google::protobuf::internal::ConstantInitialized) noexcept;
-        inline explicit Impl_(::google::protobuf::internal::InternalVisibility visibility,
-                              ::google::protobuf::Arena* arena);
-        inline explicit Impl_(::google::protobuf::internal::InternalVisibility visibility,
-                              ::google::protobuf::Arena* arena, const Impl_& from);
-    ::int32_t line_;
-    ::int32_t character_;
-    mutable ::google::protobuf::internal::CachedSize _cached_size_;
-    PROTOBUF_TSAN_DECLARE_MEMBER
-  };
-  union { Impl_ _impl_; };
-  friend struct ::TableStruct_deephaven_2fproto_2fconsole_2eproto;
-};// -------------------------------------------------------------------
-
-class MarkupContent final :
-    public ::google::protobuf::Message /* @@protoc_insertion_point(class_definition:io.deephaven.proto.backplane.script.grpc.MarkupContent) */ {
- public:
-  inline MarkupContent() : MarkupContent(nullptr) {}
-  ~MarkupContent() override;
-  template<typename = void>
-  explicit PROTOBUF_CONSTEXPR MarkupContent(::google::protobuf::internal::ConstantInitialized);
-
-  inline MarkupContent(const MarkupContent& from)
-      : MarkupContent(nullptr, from) {}
-  MarkupContent(MarkupContent&& from) noexcept
-    : MarkupContent() {
-    *this = ::std::move(from);
-  }
-
-  inline MarkupContent& operator=(const MarkupContent& from) {
-    CopyFrom(from);
-    return *this;
-  }
-  inline MarkupContent& operator=(MarkupContent&& from) noexcept {
-    if (this == &from) return *this;
-    if (GetArena() == from.GetArena()
-  #ifdef PROTOBUF_FORCE_COPY_IN_MOVE
-        && GetArena() != nullptr
-  #endif  // !PROTOBUF_FORCE_COPY_IN_MOVE
-    ) {
-      InternalSwap(&from);
-    } else {
-      CopyFrom(from);
-    }
-    return *this;
-  }
-
-  inline const ::google::protobuf::UnknownFieldSet& unknown_fields() const
-      ABSL_ATTRIBUTE_LIFETIME_BOUND {
-    return _internal_metadata_.unknown_fields<::google::protobuf::UnknownFieldSet>(::google::protobuf::UnknownFieldSet::default_instance);
-  }
-  inline ::google::protobuf::UnknownFieldSet* mutable_unknown_fields()
-      ABSL_ATTRIBUTE_LIFETIME_BOUND {
-    return _internal_metadata_.mutable_unknown_fields<::google::protobuf::UnknownFieldSet>();
-  }
-
-  static const ::google::protobuf::Descriptor* descriptor() {
-    return GetDescriptor();
-  }
-  static const ::google::protobuf::Descriptor* GetDescriptor() {
-    return default_instance().GetMetadata().descriptor;
-  }
-  static const ::google::protobuf::Reflection* GetReflection() {
-    return default_instance().GetMetadata().reflection;
-  }
-  static const MarkupContent& default_instance() {
-    return *internal_default_instance();
-  }
-  static inline const MarkupContent* internal_default_instance() {
-    return reinterpret_cast<const MarkupContent*>(
-               &_MarkupContent_default_instance_);
-  }
-  static constexpr int kIndexInFileMessages =
-    27;
-
-  friend void swap(MarkupContent& a, MarkupContent& b) {
-    a.Swap(&b);
-  }
-  inline void Swap(MarkupContent* other) {
-    if (other == this) return;
-  #ifdef PROTOBUF_FORCE_COPY_IN_SWAP
-    if (GetArena() != nullptr &&
-        GetArena() == other->GetArena()) {
-   #else  // PROTOBUF_FORCE_COPY_IN_SWAP
-    if (GetArena() == other->GetArena()) {
-  #endif  // !PROTOBUF_FORCE_COPY_IN_SWAP
-      InternalSwap(other);
-    } else {
-      ::google::protobuf::internal::GenericSwap(this, other);
-    }
-  }
-  void UnsafeArenaSwap(MarkupContent* other) {
-    if (other == this) return;
-    ABSL_DCHECK(GetArena() == other->GetArena());
-    InternalSwap(other);
-  }
-
-  // implements Message ----------------------------------------------
-
-  MarkupContent* New(::google::protobuf::Arena* arena = nullptr) const final {
-    return CreateMaybeMessage<MarkupContent>(arena);
-  }
-  using ::google::protobuf::Message::CopyFrom;
-  void CopyFrom(const MarkupContent& from);
-  using ::google::protobuf::Message::MergeFrom;
-  void MergeFrom( const MarkupContent& from) {
-    MarkupContent::MergeImpl(*this, from);
-  }
-  private:
-  static void MergeImpl(::google::protobuf::Message& to_msg, const ::google::protobuf::Message& from_msg);
-  public:
-  PROTOBUF_ATTRIBUTE_REINITIALIZES void Clear() final;
-  bool IsInitialized() const final;
-
-  ::size_t ByteSizeLong() const final;
-  const char* _InternalParse(const char* ptr, ::google::protobuf::internal::ParseContext* ctx) final;
-  ::uint8_t* _InternalSerialize(
-      ::uint8_t* target, ::google::protobuf::io::EpsCopyOutputStream* stream) const final;
-  int GetCachedSize() const { return _impl_._cached_size_.Get(); }
-
-  private:
-  ::google::protobuf::internal::CachedSize* AccessCachedSize() const final;
-  void SharedCtor(::google::protobuf::Arena* arena);
-  void SharedDtor();
-  void InternalSwap(MarkupContent* other);
-
-  private:
-  friend class ::google::protobuf::internal::AnyMetadata;
-  static ::absl::string_view FullMessageName() {
-    return "io.deephaven.proto.backplane.script.grpc.MarkupContent";
-  }
-  protected:
-  explicit MarkupContent(::google::protobuf::Arena* arena);
-  MarkupContent(::google::protobuf::Arena* arena, const MarkupContent& from);
-  public:
-
-  static const ClassData _class_data_;
-  const ::google::protobuf::Message::ClassData*GetClassData() const final;
-
-  ::google::protobuf::Metadata GetMetadata() const final;
-
-  // nested types ----------------------------------------------------
-
-  // accessors -------------------------------------------------------
-
-  enum : int {
-    kKindFieldNumber = 1,
-    kValueFieldNumber = 2,
-  };
-  // string kind = 1;
-  void clear_kind() ;
-  const std::string& kind() const;
-  template <typename Arg_ = const std::string&, typename... Args_>
-  void set_kind(Arg_&& arg, Args_... args);
-  std::string* mutable_kind();
-  PROTOBUF_NODISCARD std::string* release_kind();
-  void set_allocated_kind(std::string* value);
-
-  private:
-  const std::string& _internal_kind() const;
-  inline PROTOBUF_ALWAYS_INLINE void _internal_set_kind(
-      const std::string& value);
-  std::string* _internal_mutable_kind();
-
-  public:
-  // string value = 2;
-  void clear_value() ;
-  const std::string& value() const;
-  template <typename Arg_ = const std::string&, typename... Args_>
-  void set_value(Arg_&& arg, Args_... args);
-  std::string* mutable_value();
-  PROTOBUF_NODISCARD std::string* release_value();
-  void set_allocated_value(std::string* value);
-
-  private:
-  const std::string& _internal_value() const;
-  inline PROTOBUF_ALWAYS_INLINE void _internal_set_value(
-      const std::string& value);
-  std::string* _internal_mutable_value();
-
-  public:
-  // @@protoc_insertion_point(class_scope:io.deephaven.proto.backplane.script.grpc.MarkupContent)
- private:
-  class _Internal;
-
-  friend class ::google::protobuf::internal::TcParser;
-  static const ::google::protobuf::internal::TcParseTable<
-      1, 2, 0,
-      72, 2>
-      _table_;
-  friend class ::google::protobuf::MessageLite;
-  friend class ::google::protobuf::Arena;
-  template <typename T>
-  friend class ::google::protobuf::Arena::InternalHelper;
-  using InternalArenaConstructable_ = void;
-  using DestructorSkippable_ = void;
-  struct Impl_ {
-
-        inline explicit constexpr Impl_(
-            ::google::protobuf::internal::ConstantInitialized) noexcept;
-        inline explicit Impl_(::google::protobuf::internal::InternalVisibility visibility,
-                              ::google::protobuf::Arena* arena);
-        inline explicit Impl_(::google::protobuf::internal::InternalVisibility visibility,
-                              ::google::protobuf::Arena* arena, const Impl_& from);
-    ::google::protobuf::internal::ArenaStringPtr kind_;
-    ::google::protobuf::internal::ArenaStringPtr value_;
-    mutable ::google::protobuf::internal::CachedSize _cached_size_;
-    PROTOBUF_TSAN_DECLARE_MEMBER
-  };
-  union { Impl_ _impl_; };
-  friend struct ::TableStruct_deephaven_2fproto_2fconsole_2eproto;
-};// -------------------------------------------------------------------
-
-class LogSubscriptionRequest final :
-    public ::google::protobuf::Message /* @@protoc_insertion_point(class_definition:io.deephaven.proto.backplane.script.grpc.LogSubscriptionRequest) */ {
- public:
-  inline LogSubscriptionRequest() : LogSubscriptionRequest(nullptr) {}
-  ~LogSubscriptionRequest() override;
-  template<typename = void>
-  explicit PROTOBUF_CONSTEXPR LogSubscriptionRequest(::google::protobuf::internal::ConstantInitialized);
-
-  inline LogSubscriptionRequest(const LogSubscriptionRequest& from)
-      : LogSubscriptionRequest(nullptr, from) {}
-  LogSubscriptionRequest(LogSubscriptionRequest&& from) noexcept
-    : LogSubscriptionRequest() {
-    *this = ::std::move(from);
-  }
-
-  inline LogSubscriptionRequest& operator=(const LogSubscriptionRequest& from) {
-    CopyFrom(from);
-    return *this;
-  }
-  inline LogSubscriptionRequest& operator=(LogSubscriptionRequest&& from) noexcept {
-    if (this == &from) return *this;
-    if (GetArena() == from.GetArena()
-  #ifdef PROTOBUF_FORCE_COPY_IN_MOVE
-        && GetArena() != nullptr
-  #endif  // !PROTOBUF_FORCE_COPY_IN_MOVE
-    ) {
-      InternalSwap(&from);
-    } else {
-      CopyFrom(from);
-    }
-    return *this;
-  }
-
-  inline const ::google::protobuf::UnknownFieldSet& unknown_fields() const
-      ABSL_ATTRIBUTE_LIFETIME_BOUND {
-    return _internal_metadata_.unknown_fields<::google::protobuf::UnknownFieldSet>(::google::protobuf::UnknownFieldSet::default_instance);
-  }
-  inline ::google::protobuf::UnknownFieldSet* mutable_unknown_fields()
-      ABSL_ATTRIBUTE_LIFETIME_BOUND {
-    return _internal_metadata_.mutable_unknown_fields<::google::protobuf::UnknownFieldSet>();
-  }
-
-  static const ::google::protobuf::Descriptor* descriptor() {
-    return GetDescriptor();
-  }
-  static const ::google::protobuf::Descriptor* GetDescriptor() {
-    return default_instance().GetMetadata().descriptor;
-  }
-  static const ::google::protobuf::Reflection* GetReflection() {
-    return default_instance().GetMetadata().reflection;
-  }
-  static const LogSubscriptionRequest& default_instance() {
-    return *internal_default_instance();
-  }
-  static inline const LogSubscriptionRequest* internal_default_instance() {
-    return reinterpret_cast<const LogSubscriptionRequest*>(
-               &_LogSubscriptionRequest_default_instance_);
-  }
-  static constexpr int kIndexInFileMessages =
-    6;
-
-  friend void swap(LogSubscriptionRequest& a, LogSubscriptionRequest& b) {
-    a.Swap(&b);
-  }
-  inline void Swap(LogSubscriptionRequest* other) {
-    if (other == this) return;
-  #ifdef PROTOBUF_FORCE_COPY_IN_SWAP
-    if (GetArena() != nullptr &&
-        GetArena() == other->GetArena()) {
-   #else  // PROTOBUF_FORCE_COPY_IN_SWAP
-    if (GetArena() == other->GetArena()) {
-  #endif  // !PROTOBUF_FORCE_COPY_IN_SWAP
-      InternalSwap(other);
-    } else {
-      ::google::protobuf::internal::GenericSwap(this, other);
-    }
-  }
-  void UnsafeArenaSwap(LogSubscriptionRequest* other) {
-    if (other == this) return;
-    ABSL_DCHECK(GetArena() == other->GetArena());
-    InternalSwap(other);
-  }
-
-  // implements Message ----------------------------------------------
-
-  LogSubscriptionRequest* New(::google::protobuf::Arena* arena = nullptr) const final {
-    return CreateMaybeMessage<LogSubscriptionRequest>(arena);
-  }
-  using ::google::protobuf::Message::CopyFrom;
-  void CopyFrom(const LogSubscriptionRequest& from);
-  using ::google::protobuf::Message::MergeFrom;
-  void MergeFrom( const LogSubscriptionRequest& from) {
-    LogSubscriptionRequest::MergeImpl(*this, from);
-  }
-  private:
-  static void MergeImpl(::google::protobuf::Message& to_msg, const ::google::protobuf::Message& from_msg);
-  public:
-  PROTOBUF_ATTRIBUTE_REINITIALIZES void Clear() final;
-  bool IsInitialized() const final;
-
-  ::size_t ByteSizeLong() const final;
-  const char* _InternalParse(const char* ptr, ::google::protobuf::internal::ParseContext* ctx) final;
-  ::uint8_t* _InternalSerialize(
-      ::uint8_t* target, ::google::protobuf::io::EpsCopyOutputStream* stream) const final;
-  int GetCachedSize() const { return _impl_._cached_size_.Get(); }
-
-  private:
-  ::google::protobuf::internal::CachedSize* AccessCachedSize() const final;
-  void SharedCtor(::google::protobuf::Arena* arena);
-  void SharedDtor();
-  void InternalSwap(LogSubscriptionRequest* other);
-
-  private:
-  friend class ::google::protobuf::internal::AnyMetadata;
-  static ::absl::string_view FullMessageName() {
-    return "io.deephaven.proto.backplane.script.grpc.LogSubscriptionRequest";
-  }
-  protected:
-  explicit LogSubscriptionRequest(::google::protobuf::Arena* arena);
-  LogSubscriptionRequest(::google::protobuf::Arena* arena, const LogSubscriptionRequest& from);
-  public:
-
-  static const ClassData _class_data_;
-  const ::google::protobuf::Message::ClassData*GetClassData() const final;
-
-  ::google::protobuf::Metadata GetMetadata() const final;
-
-  // nested types ----------------------------------------------------
-
-  // accessors -------------------------------------------------------
-
-  enum : int {
-    kLevelsFieldNumber = 2,
-    kLastSeenLogTimestampFieldNumber = 1,
-  };
-  // repeated string levels = 2;
-  int levels_size() const;
-  private:
-  int _internal_levels_size() const;
-
-  public:
-  void clear_levels() ;
-  const std::string& levels(int index) const;
-  std::string* mutable_levels(int index);
-  void set_levels(int index, const std::string& value);
-  void set_levels(int index, std::string&& value);
-  void set_levels(int index, const char* value);
-  void set_levels(int index, const char* value, std::size_t size);
-  void set_levels(int index, absl::string_view value);
-  std::string* add_levels();
-  void add_levels(const std::string& value);
-  void add_levels(std::string&& value);
-  void add_levels(const char* value);
-  void add_levels(const char* value, std::size_t size);
-  void add_levels(absl::string_view value);
-  const ::google::protobuf::RepeatedPtrField<std::string>& levels() const;
-  ::google::protobuf::RepeatedPtrField<std::string>* mutable_levels();
-
-  private:
-  const ::google::protobuf::RepeatedPtrField<std::string>& _internal_levels() const;
-  ::google::protobuf::RepeatedPtrField<std::string>* _internal_mutable_levels();
-
-  public:
-  // int64 last_seen_log_timestamp = 1 [jstype = JS_STRING];
-  void clear_last_seen_log_timestamp() ;
-  ::int64_t last_seen_log_timestamp() const;
-  void set_last_seen_log_timestamp(::int64_t value);
-
-  private:
-  ::int64_t _internal_last_seen_log_timestamp() const;
-  void _internal_set_last_seen_log_timestamp(::int64_t value);
-
-  public:
-  // @@protoc_insertion_point(class_scope:io.deephaven.proto.backplane.script.grpc.LogSubscriptionRequest)
- private:
-  class _Internal;
-
-  friend class ::google::protobuf::internal::TcParser;
-  static const ::google::protobuf::internal::TcParseTable<
-      1, 2, 0,
-      78, 2>
-      _table_;
-  friend class ::google::protobuf::MessageLite;
-  friend class ::google::protobuf::Arena;
-  template <typename T>
-  friend class ::google::protobuf::Arena::InternalHelper;
-  using InternalArenaConstructable_ = void;
-  using DestructorSkippable_ = void;
-  struct Impl_ {
-
-        inline explicit constexpr Impl_(
-            ::google::protobuf::internal::ConstantInitialized) noexcept;
-        inline explicit Impl_(::google::protobuf::internal::InternalVisibility visibility,
-                              ::google::protobuf::Arena* arena);
-        inline explicit Impl_(::google::protobuf::internal::InternalVisibility visibility,
-                              ::google::protobuf::Arena* arena, const Impl_& from);
-    ::google::protobuf::RepeatedPtrField<std::string> levels_;
-    ::int64_t last_seen_log_timestamp_;
-    mutable ::google::protobuf::internal::CachedSize _cached_size_;
-    PROTOBUF_TSAN_DECLARE_MEMBER
-  };
-  union { Impl_ _impl_; };
-  friend struct ::TableStruct_deephaven_2fproto_2fconsole_2eproto;
-};// -------------------------------------------------------------------
-
-class LogSubscriptionData final :
-    public ::google::protobuf::Message /* @@protoc_insertion_point(class_definition:io.deephaven.proto.backplane.script.grpc.LogSubscriptionData) */ {
- public:
-  inline LogSubscriptionData() : LogSubscriptionData(nullptr) {}
-  ~LogSubscriptionData() override;
-  template<typename = void>
-  explicit PROTOBUF_CONSTEXPR LogSubscriptionData(::google::protobuf::internal::ConstantInitialized);
-
-  inline LogSubscriptionData(const LogSubscriptionData& from)
-      : LogSubscriptionData(nullptr, from) {}
-  LogSubscriptionData(LogSubscriptionData&& from) noexcept
-    : LogSubscriptionData() {
-    *this = ::std::move(from);
-  }
-
-  inline LogSubscriptionData& operator=(const LogSubscriptionData& from) {
-    CopyFrom(from);
-    return *this;
-  }
-  inline LogSubscriptionData& operator=(LogSubscriptionData&& from) noexcept {
-    if (this == &from) return *this;
-    if (GetArena() == from.GetArena()
-  #ifdef PROTOBUF_FORCE_COPY_IN_MOVE
-        && GetArena() != nullptr
-  #endif  // !PROTOBUF_FORCE_COPY_IN_MOVE
-    ) {
-      InternalSwap(&from);
-    } else {
-      CopyFrom(from);
-    }
-    return *this;
-  }
-
-  inline const ::google::protobuf::UnknownFieldSet& unknown_fields() const
-      ABSL_ATTRIBUTE_LIFETIME_BOUND {
-    return _internal_metadata_.unknown_fields<::google::protobuf::UnknownFieldSet>(::google::protobuf::UnknownFieldSet::default_instance);
-  }
-  inline ::google::protobuf::UnknownFieldSet* mutable_unknown_fields()
-      ABSL_ATTRIBUTE_LIFETIME_BOUND {
-    return _internal_metadata_.mutable_unknown_fields<::google::protobuf::UnknownFieldSet>();
-  }
-
-  static const ::google::protobuf::Descriptor* descriptor() {
-    return GetDescriptor();
-  }
-  static const ::google::protobuf::Descriptor* GetDescriptor() {
-    return default_instance().GetMetadata().descriptor;
-  }
-  static const ::google::protobuf::Reflection* GetReflection() {
-    return default_instance().GetMetadata().reflection;
-  }
-  static const LogSubscriptionData& default_instance() {
-    return *internal_default_instance();
-  }
-  static inline const LogSubscriptionData* internal_default_instance() {
-    return reinterpret_cast<const LogSubscriptionData*>(
-               &_LogSubscriptionData_default_instance_);
-  }
-  static constexpr int kIndexInFileMessages =
-    7;
-
-  friend void swap(LogSubscriptionData& a, LogSubscriptionData& b) {
-    a.Swap(&b);
-  }
-  inline void Swap(LogSubscriptionData* other) {
-    if (other == this) return;
-  #ifdef PROTOBUF_FORCE_COPY_IN_SWAP
-    if (GetArena() != nullptr &&
-        GetArena() == other->GetArena()) {
-   #else  // PROTOBUF_FORCE_COPY_IN_SWAP
-    if (GetArena() == other->GetArena()) {
-  #endif  // !PROTOBUF_FORCE_COPY_IN_SWAP
-      InternalSwap(other);
-    } else {
-      ::google::protobuf::internal::GenericSwap(this, other);
-    }
-  }
-  void UnsafeArenaSwap(LogSubscriptionData* other) {
-    if (other == this) return;
-    ABSL_DCHECK(GetArena() == other->GetArena());
-    InternalSwap(other);
-  }
-
-  // implements Message ----------------------------------------------
-
-  LogSubscriptionData* New(::google::protobuf::Arena* arena = nullptr) const final {
-    return CreateMaybeMessage<LogSubscriptionData>(arena);
-  }
-  using ::google::protobuf::Message::CopyFrom;
-  void CopyFrom(const LogSubscriptionData& from);
-  using ::google::protobuf::Message::MergeFrom;
-  void MergeFrom( const LogSubscriptionData& from) {
-    LogSubscriptionData::MergeImpl(*this, from);
-  }
-  private:
-  static void MergeImpl(::google::protobuf::Message& to_msg, const ::google::protobuf::Message& from_msg);
-  public:
-  PROTOBUF_ATTRIBUTE_REINITIALIZES void Clear() final;
-  bool IsInitialized() const final;
-
-  ::size_t ByteSizeLong() const final;
-  const char* _InternalParse(const char* ptr, ::google::protobuf::internal::ParseContext* ctx) final;
-  ::uint8_t* _InternalSerialize(
-      ::uint8_t* target, ::google::protobuf::io::EpsCopyOutputStream* stream) const final;
-  int GetCachedSize() const { return _impl_._cached_size_.Get(); }
-
-  private:
-  ::google::protobuf::internal::CachedSize* AccessCachedSize() const final;
-  void SharedCtor(::google::protobuf::Arena* arena);
-  void SharedDtor();
-  void InternalSwap(LogSubscriptionData* other);
-
-  private:
-  friend class ::google::protobuf::internal::AnyMetadata;
-  static ::absl::string_view FullMessageName() {
-    return "io.deephaven.proto.backplane.script.grpc.LogSubscriptionData";
-  }
-  protected:
-  explicit LogSubscriptionData(::google::protobuf::Arena* arena);
-  LogSubscriptionData(::google::protobuf::Arena* arena, const LogSubscriptionData& from);
-  public:
-
-  static const ClassData _class_data_;
-  const ::google::protobuf::Message::ClassData*GetClassData() const final;
-
-  ::google::protobuf::Metadata GetMetadata() const final;
-
-  // nested types ----------------------------------------------------
-
-  // accessors -------------------------------------------------------
-
-  enum : int {
-    kLogLevelFieldNumber = 2,
-    kMessageFieldNumber = 3,
-    kMicrosFieldNumber = 1,
-  };
-  // string log_level = 2;
-  void clear_log_level() ;
-  const std::string& log_level() const;
-  template <typename Arg_ = const std::string&, typename... Args_>
-  void set_log_level(Arg_&& arg, Args_... args);
-  std::string* mutable_log_level();
-  PROTOBUF_NODISCARD std::string* release_log_level();
-  void set_allocated_log_level(std::string* value);
-
-  private:
-  const std::string& _internal_log_level() const;
-  inline PROTOBUF_ALWAYS_INLINE void _internal_set_log_level(
-      const std::string& value);
-  std::string* _internal_mutable_log_level();
-
-  public:
-  // string message = 3;
-  void clear_message() ;
-  const std::string& message() const;
-  template <typename Arg_ = const std::string&, typename... Args_>
-  void set_message(Arg_&& arg, Args_... args);
-  std::string* mutable_message();
-  PROTOBUF_NODISCARD std::string* release_message();
-  void set_allocated_message(std::string* value);
-
-  private:
-  const std::string& _internal_message() const;
-  inline PROTOBUF_ALWAYS_INLINE void _internal_set_message(
-      const std::string& value);
-  std::string* _internal_mutable_message();
-
-  public:
-  // int64 micros = 1 [jstype = JS_STRING];
-  void clear_micros() ;
-  ::int64_t micros() const;
-  void set_micros(::int64_t value);
-
-  private:
-  ::int64_t _internal_micros() const;
-  void _internal_set_micros(::int64_t value);
-
-  public:
-  // @@protoc_insertion_point(class_scope:io.deephaven.proto.backplane.script.grpc.LogSubscriptionData)
- private:
-  class _Internal;
-
-  friend class ::google::protobuf::internal::TcParser;
-  static const ::google::protobuf::internal::TcParseTable<
-      2, 3, 0,
-      85, 2>
-      _table_;
-  friend class ::google::protobuf::MessageLite;
-  friend class ::google::protobuf::Arena;
-  template <typename T>
-  friend class ::google::protobuf::Arena::InternalHelper;
-  using InternalArenaConstructable_ = void;
-  using DestructorSkippable_ = void;
-  struct Impl_ {
-
-        inline explicit constexpr Impl_(
-            ::google::protobuf::internal::ConstantInitialized) noexcept;
-        inline explicit Impl_(::google::protobuf::internal::InternalVisibility visibility,
-                              ::google::protobuf::Arena* arena);
-        inline explicit Impl_(::google::protobuf::internal::InternalVisibility visibility,
-                              ::google::protobuf::Arena* arena, const Impl_& from);
-    ::google::protobuf::internal::ArenaStringPtr log_level_;
-    ::google::protobuf::internal::ArenaStringPtr message_;
-    ::int64_t micros_;
-    mutable ::google::protobuf::internal::CachedSize _cached_size_;
-    PROTOBUF_TSAN_DECLARE_MEMBER
-  };
-  union { Impl_ _impl_; };
-  friend struct ::TableStruct_deephaven_2fproto_2fconsole_2eproto;
-};// -------------------------------------------------------------------
-
-class GetHeapInfoResponse final :
-    public ::google::protobuf::Message /* @@protoc_insertion_point(class_definition:io.deephaven.proto.backplane.script.grpc.GetHeapInfoResponse) */ {
- public:
-  inline GetHeapInfoResponse() : GetHeapInfoResponse(nullptr) {}
-  ~GetHeapInfoResponse() override;
-  template<typename = void>
-  explicit PROTOBUF_CONSTEXPR GetHeapInfoResponse(::google::protobuf::internal::ConstantInitialized);
-
-  inline GetHeapInfoResponse(const GetHeapInfoResponse& from)
-      : GetHeapInfoResponse(nullptr, from) {}
-  GetHeapInfoResponse(GetHeapInfoResponse&& from) noexcept
-    : GetHeapInfoResponse() {
-    *this = ::std::move(from);
-  }
-
-  inline GetHeapInfoResponse& operator=(const GetHeapInfoResponse& from) {
-    CopyFrom(from);
-    return *this;
-  }
-  inline GetHeapInfoResponse& operator=(GetHeapInfoResponse&& from) noexcept {
-    if (this == &from) return *this;
-    if (GetArena() == from.GetArena()
-  #ifdef PROTOBUF_FORCE_COPY_IN_MOVE
-        && GetArena() != nullptr
-  #endif  // !PROTOBUF_FORCE_COPY_IN_MOVE
-    ) {
-      InternalSwap(&from);
-    } else {
-      CopyFrom(from);
-    }
-    return *this;
-  }
-
-  inline const ::google::protobuf::UnknownFieldSet& unknown_fields() const
-      ABSL_ATTRIBUTE_LIFETIME_BOUND {
-    return _internal_metadata_.unknown_fields<::google::protobuf::UnknownFieldSet>(::google::protobuf::UnknownFieldSet::default_instance);
-  }
-  inline ::google::protobuf::UnknownFieldSet* mutable_unknown_fields()
-      ABSL_ATTRIBUTE_LIFETIME_BOUND {
-    return _internal_metadata_.mutable_unknown_fields<::google::protobuf::UnknownFieldSet>();
-  }
-
-  static const ::google::protobuf::Descriptor* descriptor() {
-    return GetDescriptor();
-  }
-  static const ::google::protobuf::Descriptor* GetDescriptor() {
-    return default_instance().GetMetadata().descriptor;
-  }
-  static const ::google::protobuf::Reflection* GetReflection() {
-    return default_instance().GetMetadata().reflection;
-  }
-  static const GetHeapInfoResponse& default_instance() {
-    return *internal_default_instance();
-  }
-  static inline const GetHeapInfoResponse* internal_default_instance() {
-    return reinterpret_cast<const GetHeapInfoResponse*>(
-               &_GetHeapInfoResponse_default_instance_);
-  }
-  static constexpr int kIndexInFileMessages =
-    5;
-
-  friend void swap(GetHeapInfoResponse& a, GetHeapInfoResponse& b) {
-    a.Swap(&b);
-  }
-  inline void Swap(GetHeapInfoResponse* other) {
-    if (other == this) return;
-  #ifdef PROTOBUF_FORCE_COPY_IN_SWAP
-    if (GetArena() != nullptr &&
-        GetArena() == other->GetArena()) {
-   #else  // PROTOBUF_FORCE_COPY_IN_SWAP
-    if (GetArena() == other->GetArena()) {
-  #endif  // !PROTOBUF_FORCE_COPY_IN_SWAP
-      InternalSwap(other);
-    } else {
-      ::google::protobuf::internal::GenericSwap(this, other);
-    }
-  }
-  void UnsafeArenaSwap(GetHeapInfoResponse* other) {
-    if (other == this) return;
-    ABSL_DCHECK(GetArena() == other->GetArena());
-    InternalSwap(other);
-  }
-
-  // implements Message ----------------------------------------------
-
-  GetHeapInfoResponse* New(::google::protobuf::Arena* arena = nullptr) const final {
-    return CreateMaybeMessage<GetHeapInfoResponse>(arena);
-  }
-  using ::google::protobuf::Message::CopyFrom;
-  void CopyFrom(const GetHeapInfoResponse& from);
-  using ::google::protobuf::Message::MergeFrom;
-  void MergeFrom( const GetHeapInfoResponse& from) {
-    GetHeapInfoResponse::MergeImpl(*this, from);
-  }
-  private:
-  static void MergeImpl(::google::protobuf::Message& to_msg, const ::google::protobuf::Message& from_msg);
-  public:
-  PROTOBUF_ATTRIBUTE_REINITIALIZES void Clear() final;
-  bool IsInitialized() const final;
-
-  ::size_t ByteSizeLong() const final;
-  const char* _InternalParse(const char* ptr, ::google::protobuf::internal::ParseContext* ctx) final;
-  ::uint8_t* _InternalSerialize(
-      ::uint8_t* target, ::google::protobuf::io::EpsCopyOutputStream* stream) const final;
-  int GetCachedSize() const { return _impl_._cached_size_.Get(); }
-
-  private:
-  ::google::protobuf::internal::CachedSize* AccessCachedSize() const final;
-  void SharedCtor(::google::protobuf::Arena* arena);
-  void SharedDtor();
-  void InternalSwap(GetHeapInfoResponse* other);
-
-  private:
-  friend class ::google::protobuf::internal::AnyMetadata;
-  static ::absl::string_view FullMessageName() {
-    return "io.deephaven.proto.backplane.script.grpc.GetHeapInfoResponse";
-  }
-  protected:
-  explicit GetHeapInfoResponse(::google::protobuf::Arena* arena);
-  GetHeapInfoResponse(::google::protobuf::Arena* arena, const GetHeapInfoResponse& from);
-  public:
-
-  static const ClassData _class_data_;
-  const ::google::protobuf::Message::ClassData*GetClassData() const final;
-
-  ::google::protobuf::Metadata GetMetadata() const final;
-
-  // nested types ----------------------------------------------------
-
-  // accessors -------------------------------------------------------
-
-  enum : int {
-    kMaxMemoryFieldNumber = 1,
-    kTotalMemoryFieldNumber = 2,
-    kFreeMemoryFieldNumber = 3,
-  };
-  // int64 max_memory = 1 [jstype = JS_STRING];
-  void clear_max_memory() ;
-  ::int64_t max_memory() const;
-  void set_max_memory(::int64_t value);
-
-  private:
-  ::int64_t _internal_max_memory() const;
-  void _internal_set_max_memory(::int64_t value);
-
-  public:
-  // int64 total_memory = 2 [jstype = JS_STRING];
-  void clear_total_memory() ;
-  ::int64_t total_memory() const;
-  void set_total_memory(::int64_t value);
-
-  private:
-  ::int64_t _internal_total_memory() const;
-  void _internal_set_total_memory(::int64_t value);
-
-  public:
-  // int64 free_memory = 3 [jstype = JS_STRING];
-  void clear_free_memory() ;
-  ::int64_t free_memory() const;
-  void set_free_memory(::int64_t value);
-
-  private:
-  ::int64_t _internal_free_memory() const;
-  void _internal_set_free_memory(::int64_t value);
-
-  public:
-  // @@protoc_insertion_point(class_scope:io.deephaven.proto.backplane.script.grpc.GetHeapInfoResponse)
- private:
-  class _Internal;
-
-  friend class ::google::protobuf::internal::TcParser;
-  static const ::google::protobuf::internal::TcParseTable<
-      2, 3, 0,
-      0, 2>
-      _table_;
-  friend class ::google::protobuf::MessageLite;
-  friend class ::google::protobuf::Arena;
-  template <typename T>
-  friend class ::google::protobuf::Arena::InternalHelper;
-  using InternalArenaConstructable_ = void;
-  using DestructorSkippable_ = void;
-  struct Impl_ {
-
-        inline explicit constexpr Impl_(
-            ::google::protobuf::internal::ConstantInitialized) noexcept;
-        inline explicit Impl_(::google::protobuf::internal::InternalVisibility visibility,
-                              ::google::protobuf::Arena* arena);
-        inline explicit Impl_(::google::protobuf::internal::InternalVisibility visibility,
-                              ::google::protobuf::Arena* arena, const Impl_& from);
-    ::int64_t max_memory_;
-    ::int64_t total_memory_;
-    ::int64_t free_memory_;
-    mutable ::google::protobuf::internal::CachedSize _cached_size_;
-    PROTOBUF_TSAN_DECLARE_MEMBER
-  };
-  union { Impl_ _impl_; };
-  friend struct ::TableStruct_deephaven_2fproto_2fconsole_2eproto;
-};// -------------------------------------------------------------------
-
-class GetHeapInfoRequest final :
-    public ::google::protobuf::internal::ZeroFieldsBase /* @@protoc_insertion_point(class_definition:io.deephaven.proto.backplane.script.grpc.GetHeapInfoRequest) */ {
- public:
-  inline GetHeapInfoRequest() : GetHeapInfoRequest(nullptr) {}
-  template<typename = void>
-  explicit PROTOBUF_CONSTEXPR GetHeapInfoRequest(::google::protobuf::internal::ConstantInitialized);
-
-  inline GetHeapInfoRequest(const GetHeapInfoRequest& from)
-      : GetHeapInfoRequest(nullptr, from) {}
-  GetHeapInfoRequest(GetHeapInfoRequest&& from) noexcept
-    : GetHeapInfoRequest() {
-    *this = ::std::move(from);
-  }
-
-  inline GetHeapInfoRequest& operator=(const GetHeapInfoRequest& from) {
-    CopyFrom(from);
-    return *this;
-  }
-  inline GetHeapInfoRequest& operator=(GetHeapInfoRequest&& from) noexcept {
-    if (this == &from) return *this;
-    if (GetArena() == from.GetArena()
-  #ifdef PROTOBUF_FORCE_COPY_IN_MOVE
-        && GetArena() != nullptr
-  #endif  // !PROTOBUF_FORCE_COPY_IN_MOVE
-    ) {
-      InternalSwap(&from);
-    } else {
-      CopyFrom(from);
-    }
-    return *this;
-  }
-
-  inline const ::google::protobuf::UnknownFieldSet& unknown_fields() const
-      ABSL_ATTRIBUTE_LIFETIME_BOUND {
-    return _internal_metadata_.unknown_fields<::google::protobuf::UnknownFieldSet>(::google::protobuf::UnknownFieldSet::default_instance);
-  }
-  inline ::google::protobuf::UnknownFieldSet* mutable_unknown_fields()
-      ABSL_ATTRIBUTE_LIFETIME_BOUND {
-    return _internal_metadata_.mutable_unknown_fields<::google::protobuf::UnknownFieldSet>();
-  }
-
-  static const ::google::protobuf::Descriptor* descriptor() {
-    return GetDescriptor();
-  }
-  static const ::google::protobuf::Descriptor* GetDescriptor() {
-    return default_instance().GetMetadata().descriptor;
-  }
-  static const ::google::protobuf::Reflection* GetReflection() {
-    return default_instance().GetMetadata().reflection;
-  }
-  static const GetHeapInfoRequest& default_instance() {
-    return *internal_default_instance();
-  }
-  static inline const GetHeapInfoRequest* internal_default_instance() {
-    return reinterpret_cast<const GetHeapInfoRequest*>(
-               &_GetHeapInfoRequest_default_instance_);
-  }
-  static constexpr int kIndexInFileMessages =
-    4;
-
-  friend void swap(GetHeapInfoRequest& a, GetHeapInfoRequest& b) {
-    a.Swap(&b);
-  }
-  inline void Swap(GetHeapInfoRequest* other) {
-    if (other == this) return;
-  #ifdef PROTOBUF_FORCE_COPY_IN_SWAP
-    if (GetArena() != nullptr &&
-        GetArena() == other->GetArena()) {
-   #else  // PROTOBUF_FORCE_COPY_IN_SWAP
-    if (GetArena() == other->GetArena()) {
-  #endif  // !PROTOBUF_FORCE_COPY_IN_SWAP
-      InternalSwap(other);
-    } else {
-      ::google::protobuf::internal::GenericSwap(this, other);
-    }
-  }
-  void UnsafeArenaSwap(GetHeapInfoRequest* other) {
-    if (other == this) return;
-    ABSL_DCHECK(GetArena() == other->GetArena());
-    InternalSwap(other);
-  }
-
-  // implements Message ----------------------------------------------
-
-  GetHeapInfoRequest* New(::google::protobuf::Arena* arena = nullptr) const final {
-    return CreateMaybeMessage<GetHeapInfoRequest>(arena);
-  }
-  using ::google::protobuf::internal::ZeroFieldsBase::CopyFrom;
-  inline void CopyFrom(const GetHeapInfoRequest& from) {
-    ::google::protobuf::internal::ZeroFieldsBase::CopyImpl(*this, from);
-  }
-  using ::google::protobuf::internal::ZeroFieldsBase::MergeFrom;
-  void MergeFrom(const GetHeapInfoRequest& from) {
-    ::google::protobuf::internal::ZeroFieldsBase::MergeImpl(*this, from);
-  }
-  public:
-
-  private:
-  friend class ::google::protobuf::internal::AnyMetadata;
-  static ::absl::string_view FullMessageName() {
-    return "io.deephaven.proto.backplane.script.grpc.GetHeapInfoRequest";
-  }
-  protected:
-  explicit GetHeapInfoRequest(::google::protobuf::Arena* arena);
-  GetHeapInfoRequest(::google::protobuf::Arena* arena, const GetHeapInfoRequest& from);
-  public:
-
-  ::google::protobuf::Metadata GetMetadata() const final;
-
-  // nested types ----------------------------------------------------
-
-  // accessors -------------------------------------------------------
-
-  // @@protoc_insertion_point(class_scope:io.deephaven.proto.backplane.script.grpc.GetHeapInfoRequest)
- private:
-  class _Internal;
-
-  friend class ::google::protobuf::MessageLite;
-  friend class ::google::protobuf::Arena;
-  template <typename T>
-  friend class ::google::protobuf::Arena::InternalHelper;
-  using InternalArenaConstructable_ = void;
-  using DestructorSkippable_ = void;
-  struct Impl_ {
-
-        inline explicit constexpr Impl_(
-            ::google::protobuf::internal::ConstantInitialized) noexcept;
-        inline explicit Impl_(::google::protobuf::internal::InternalVisibility visibility,
-                              ::google::protobuf::Arena* arena);
-        inline explicit Impl_(::google::protobuf::internal::InternalVisibility visibility,
-                              ::google::protobuf::Arena* arena, const Impl_& from);
-    PROTOBUF_TSAN_DECLARE_MEMBER
-  };
-  friend struct ::TableStruct_deephaven_2fproto_2fconsole_2eproto;
-};// -------------------------------------------------------------------
-
-class GetConsoleTypesResponse final :
-    public ::google::protobuf::Message /* @@protoc_insertion_point(class_definition:io.deephaven.proto.backplane.script.grpc.GetConsoleTypesResponse) */ {
- public:
-  inline GetConsoleTypesResponse() : GetConsoleTypesResponse(nullptr) {}
-  ~GetConsoleTypesResponse() override;
-  template<typename = void>
-  explicit PROTOBUF_CONSTEXPR GetConsoleTypesResponse(::google::protobuf::internal::ConstantInitialized);
-
-  inline GetConsoleTypesResponse(const GetConsoleTypesResponse& from)
-      : GetConsoleTypesResponse(nullptr, from) {}
-  GetConsoleTypesResponse(GetConsoleTypesResponse&& from) noexcept
-    : GetConsoleTypesResponse() {
-    *this = ::std::move(from);
-  }
-
-  inline GetConsoleTypesResponse& operator=(const GetConsoleTypesResponse& from) {
-    CopyFrom(from);
-    return *this;
-  }
-  inline GetConsoleTypesResponse& operator=(GetConsoleTypesResponse&& from) noexcept {
-    if (this == &from) return *this;
-    if (GetArena() == from.GetArena()
-  #ifdef PROTOBUF_FORCE_COPY_IN_MOVE
-        && GetArena() != nullptr
-  #endif  // !PROTOBUF_FORCE_COPY_IN_MOVE
-    ) {
-      InternalSwap(&from);
-    } else {
-      CopyFrom(from);
-    }
-    return *this;
-  }
-
-  inline const ::google::protobuf::UnknownFieldSet& unknown_fields() const
-      ABSL_ATTRIBUTE_LIFETIME_BOUND {
-    return _internal_metadata_.unknown_fields<::google::protobuf::UnknownFieldSet>(::google::protobuf::UnknownFieldSet::default_instance);
-  }
-  inline ::google::protobuf::UnknownFieldSet* mutable_unknown_fields()
-      ABSL_ATTRIBUTE_LIFETIME_BOUND {
-    return _internal_metadata_.mutable_unknown_fields<::google::protobuf::UnknownFieldSet>();
-  }
-
-  static const ::google::protobuf::Descriptor* descriptor() {
-    return GetDescriptor();
-  }
-  static const ::google::protobuf::Descriptor* GetDescriptor() {
-    return default_instance().GetMetadata().descriptor;
-  }
-  static const ::google::protobuf::Reflection* GetReflection() {
-    return default_instance().GetMetadata().reflection;
-  }
-  static const GetConsoleTypesResponse& default_instance() {
-    return *internal_default_instance();
-  }
-  static inline const GetConsoleTypesResponse* internal_default_instance() {
-    return reinterpret_cast<const GetConsoleTypesResponse*>(
-               &_GetConsoleTypesResponse_default_instance_);
-  }
-  static constexpr int kIndexInFileMessages =
-    1;
-
-  friend void swap(GetConsoleTypesResponse& a, GetConsoleTypesResponse& b) {
-    a.Swap(&b);
-  }
-  inline void Swap(GetConsoleTypesResponse* other) {
-    if (other == this) return;
-  #ifdef PROTOBUF_FORCE_COPY_IN_SWAP
-    if (GetArena() != nullptr &&
-        GetArena() == other->GetArena()) {
-   #else  // PROTOBUF_FORCE_COPY_IN_SWAP
-    if (GetArena() == other->GetArena()) {
-  #endif  // !PROTOBUF_FORCE_COPY_IN_SWAP
-      InternalSwap(other);
-    } else {
-      ::google::protobuf::internal::GenericSwap(this, other);
-    }
-  }
-  void UnsafeArenaSwap(GetConsoleTypesResponse* other) {
-    if (other == this) return;
-    ABSL_DCHECK(GetArena() == other->GetArena());
-    InternalSwap(other);
-  }
-
-  // implements Message ----------------------------------------------
-
-  GetConsoleTypesResponse* New(::google::protobuf::Arena* arena = nullptr) const final {
-    return CreateMaybeMessage<GetConsoleTypesResponse>(arena);
-  }
-  using ::google::protobuf::Message::CopyFrom;
-  void CopyFrom(const GetConsoleTypesResponse& from);
-  using ::google::protobuf::Message::MergeFrom;
-  void MergeFrom( const GetConsoleTypesResponse& from) {
-    GetConsoleTypesResponse::MergeImpl(*this, from);
-  }
-  private:
-  static void MergeImpl(::google::protobuf::Message& to_msg, const ::google::protobuf::Message& from_msg);
-  public:
-  PROTOBUF_ATTRIBUTE_REINITIALIZES void Clear() final;
-  bool IsInitialized() const final;
-
-  ::size_t ByteSizeLong() const final;
-  const char* _InternalParse(const char* ptr, ::google::protobuf::internal::ParseContext* ctx) final;
-  ::uint8_t* _InternalSerialize(
-      ::uint8_t* target, ::google::protobuf::io::EpsCopyOutputStream* stream) const final;
-  int GetCachedSize() const { return _impl_._cached_size_.Get(); }
-
-  private:
-  ::google::protobuf::internal::CachedSize* AccessCachedSize() const final;
-  void SharedCtor(::google::protobuf::Arena* arena);
-  void SharedDtor();
-  void InternalSwap(GetConsoleTypesResponse* other);
-
-  private:
-  friend class ::google::protobuf::internal::AnyMetadata;
-  static ::absl::string_view FullMessageName() {
-    return "io.deephaven.proto.backplane.script.grpc.GetConsoleTypesResponse";
-  }
-  protected:
-  explicit GetConsoleTypesResponse(::google::protobuf::Arena* arena);
-  GetConsoleTypesResponse(::google::protobuf::Arena* arena, const GetConsoleTypesResponse& from);
-  public:
-
-  static const ClassData _class_data_;
-  const ::google::protobuf::Message::ClassData*GetClassData() const final;
-
-  ::google::protobuf::Metadata GetMetadata() const final;
-
-  // nested types ----------------------------------------------------
-
-  // accessors -------------------------------------------------------
-
-  enum : int {
-    kConsoleTypesFieldNumber = 1,
-  };
-  // repeated string console_types = 1;
-  int console_types_size() const;
-  private:
-  int _internal_console_types_size() const;
-
-  public:
-  void clear_console_types() ;
-  const std::string& console_types(int index) const;
-  std::string* mutable_console_types(int index);
-  void set_console_types(int index, const std::string& value);
-  void set_console_types(int index, std::string&& value);
-  void set_console_types(int index, const char* value);
-  void set_console_types(int index, const char* value, std::size_t size);
-  void set_console_types(int index, absl::string_view value);
-  std::string* add_console_types();
-  void add_console_types(const std::string& value);
-  void add_console_types(std::string&& value);
-  void add_console_types(const char* value);
-  void add_console_types(const char* value, std::size_t size);
-  void add_console_types(absl::string_view value);
-  const ::google::protobuf::RepeatedPtrField<std::string>& console_types() const;
-  ::google::protobuf::RepeatedPtrField<std::string>* mutable_console_types();
-
-  private:
-  const ::google::protobuf::RepeatedPtrField<std::string>& _internal_console_types() const;
-  ::google::protobuf::RepeatedPtrField<std::string>* _internal_mutable_console_types();
-
-  public:
-  // @@protoc_insertion_point(class_scope:io.deephaven.proto.backplane.script.grpc.GetConsoleTypesResponse)
- private:
-  class _Internal;
-
-  friend class ::google::protobuf::internal::TcParser;
-  static const ::google::protobuf::internal::TcParseTable<
-      0, 1, 0,
-      86, 2>
-      _table_;
-  friend class ::google::protobuf::MessageLite;
-  friend class ::google::protobuf::Arena;
-  template <typename T>
-  friend class ::google::protobuf::Arena::InternalHelper;
-  using InternalArenaConstructable_ = void;
-  using DestructorSkippable_ = void;
-  struct Impl_ {
-
-        inline explicit constexpr Impl_(
-            ::google::protobuf::internal::ConstantInitialized) noexcept;
-        inline explicit Impl_(::google::protobuf::internal::InternalVisibility visibility,
-                              ::google::protobuf::Arena* arena);
-        inline explicit Impl_(::google::protobuf::internal::InternalVisibility visibility,
-                              ::google::protobuf::Arena* arena, const Impl_& from);
-    ::google::protobuf::RepeatedPtrField<std::string> console_types_;
-    mutable ::google::protobuf::internal::CachedSize _cached_size_;
-    PROTOBUF_TSAN_DECLARE_MEMBER
-  };
-  union { Impl_ _impl_; };
-  friend struct ::TableStruct_deephaven_2fproto_2fconsole_2eproto;
-};// -------------------------------------------------------------------
-
-class GetConsoleTypesRequest final :
-    public ::google::protobuf::internal::ZeroFieldsBase /* @@protoc_insertion_point(class_definition:io.deephaven.proto.backplane.script.grpc.GetConsoleTypesRequest) */ {
- public:
-  inline GetConsoleTypesRequest() : GetConsoleTypesRequest(nullptr) {}
-  template<typename = void>
-  explicit PROTOBUF_CONSTEXPR GetConsoleTypesRequest(::google::protobuf::internal::ConstantInitialized);
-
-  inline GetConsoleTypesRequest(const GetConsoleTypesRequest& from)
-      : GetConsoleTypesRequest(nullptr, from) {}
-  GetConsoleTypesRequest(GetConsoleTypesRequest&& from) noexcept
-    : GetConsoleTypesRequest() {
-    *this = ::std::move(from);
-  }
-
-  inline GetConsoleTypesRequest& operator=(const GetConsoleTypesRequest& from) {
-    CopyFrom(from);
-    return *this;
-  }
-  inline GetConsoleTypesRequest& operator=(GetConsoleTypesRequest&& from) noexcept {
-    if (this == &from) return *this;
-    if (GetArena() == from.GetArena()
-  #ifdef PROTOBUF_FORCE_COPY_IN_MOVE
-        && GetArena() != nullptr
-  #endif  // !PROTOBUF_FORCE_COPY_IN_MOVE
-    ) {
-      InternalSwap(&from);
-    } else {
-      CopyFrom(from);
-    }
-    return *this;
-  }
-
-  inline const ::google::protobuf::UnknownFieldSet& unknown_fields() const
-      ABSL_ATTRIBUTE_LIFETIME_BOUND {
-    return _internal_metadata_.unknown_fields<::google::protobuf::UnknownFieldSet>(::google::protobuf::UnknownFieldSet::default_instance);
-  }
-  inline ::google::protobuf::UnknownFieldSet* mutable_unknown_fields()
-      ABSL_ATTRIBUTE_LIFETIME_BOUND {
-    return _internal_metadata_.mutable_unknown_fields<::google::protobuf::UnknownFieldSet>();
-  }
-
-  static const ::google::protobuf::Descriptor* descriptor() {
-    return GetDescriptor();
-  }
-  static const ::google::protobuf::Descriptor* GetDescriptor() {
-    return default_instance().GetMetadata().descriptor;
-  }
-  static const ::google::protobuf::Reflection* GetReflection() {
-    return default_instance().GetMetadata().reflection;
-  }
-  static const GetConsoleTypesRequest& default_instance() {
-    return *internal_default_instance();
-  }
-  static inline const GetConsoleTypesRequest* internal_default_instance() {
-    return reinterpret_cast<const GetConsoleTypesRequest*>(
-               &_GetConsoleTypesRequest_default_instance_);
-  }
-  static constexpr int kIndexInFileMessages =
-    0;
-
-  friend void swap(GetConsoleTypesRequest& a, GetConsoleTypesRequest& b) {
-    a.Swap(&b);
-  }
-  inline void Swap(GetConsoleTypesRequest* other) {
-    if (other == this) return;
-  #ifdef PROTOBUF_FORCE_COPY_IN_SWAP
-    if (GetArena() != nullptr &&
-        GetArena() == other->GetArena()) {
-   #else  // PROTOBUF_FORCE_COPY_IN_SWAP
-    if (GetArena() == other->GetArena()) {
-  #endif  // !PROTOBUF_FORCE_COPY_IN_SWAP
-      InternalSwap(other);
-    } else {
-      ::google::protobuf::internal::GenericSwap(this, other);
-    }
-  }
-  void UnsafeArenaSwap(GetConsoleTypesRequest* other) {
-    if (other == this) return;
-    ABSL_DCHECK(GetArena() == other->GetArena());
-    InternalSwap(other);
-  }
-
-  // implements Message ----------------------------------------------
-
-  GetConsoleTypesRequest* New(::google::protobuf::Arena* arena = nullptr) const final {
-    return CreateMaybeMessage<GetConsoleTypesRequest>(arena);
-  }
-  using ::google::protobuf::internal::ZeroFieldsBase::CopyFrom;
-  inline void CopyFrom(const GetConsoleTypesRequest& from) {
-    ::google::protobuf::internal::ZeroFieldsBase::CopyImpl(*this, from);
-  }
-  using ::google::protobuf::internal::ZeroFieldsBase::MergeFrom;
-  void MergeFrom(const GetConsoleTypesRequest& from) {
-    ::google::protobuf::internal::ZeroFieldsBase::MergeImpl(*this, from);
-  }
-  public:
-
-  private:
-  friend class ::google::protobuf::internal::AnyMetadata;
-  static ::absl::string_view FullMessageName() {
-    return "io.deephaven.proto.backplane.script.grpc.GetConsoleTypesRequest";
-  }
-  protected:
-  explicit GetConsoleTypesRequest(::google::protobuf::Arena* arena);
-  GetConsoleTypesRequest(::google::protobuf::Arena* arena, const GetConsoleTypesRequest& from);
-  public:
-
-  ::google::protobuf::Metadata GetMetadata() const final;
-
-  // nested types ----------------------------------------------------
-
-  // accessors -------------------------------------------------------
-
-  // @@protoc_insertion_point(class_scope:io.deephaven.proto.backplane.script.grpc.GetConsoleTypesRequest)
- private:
-  class _Internal;
-
-  friend class ::google::protobuf::MessageLite;
-  friend class ::google::protobuf::Arena;
-  template <typename T>
-  friend class ::google::protobuf::Arena::InternalHelper;
-  using InternalArenaConstructable_ = void;
-  using DestructorSkippable_ = void;
-  struct Impl_ {
-
-        inline explicit constexpr Impl_(
-            ::google::protobuf::internal::ConstantInitialized) noexcept;
-        inline explicit Impl_(::google::protobuf::internal::InternalVisibility visibility,
-                              ::google::protobuf::Arena* arena);
-        inline explicit Impl_(::google::protobuf::internal::InternalVisibility visibility,
-                              ::google::protobuf::Arena* arena, const Impl_& from);
-    PROTOBUF_TSAN_DECLARE_MEMBER
-  };
-  friend struct ::TableStruct_deephaven_2fproto_2fconsole_2eproto;
-};// -------------------------------------------------------------------
-
-class FigureDescriptor_StringMapWithDefault final :
-    public ::google::protobuf::Message /* @@protoc_insertion_point(class_definition:io.deephaven.proto.backplane.script.grpc.FigureDescriptor.StringMapWithDefault) */ {
- public:
-  inline FigureDescriptor_StringMapWithDefault() : FigureDescriptor_StringMapWithDefault(nullptr) {}
-  ~FigureDescriptor_StringMapWithDefault() override;
-  template<typename = void>
-  explicit PROTOBUF_CONSTEXPR FigureDescriptor_StringMapWithDefault(::google::protobuf::internal::ConstantInitialized);
-
-  inline FigureDescriptor_StringMapWithDefault(const FigureDescriptor_StringMapWithDefault& from)
-      : FigureDescriptor_StringMapWithDefault(nullptr, from) {}
-  FigureDescriptor_StringMapWithDefault(FigureDescriptor_StringMapWithDefault&& from) noexcept
-    : FigureDescriptor_StringMapWithDefault() {
-    *this = ::std::move(from);
-  }
-
-  inline FigureDescriptor_StringMapWithDefault& operator=(const FigureDescriptor_StringMapWithDefault& from) {
-    CopyFrom(from);
-    return *this;
-  }
-  inline FigureDescriptor_StringMapWithDefault& operator=(FigureDescriptor_StringMapWithDefault&& from) noexcept {
-    if (this == &from) return *this;
-    if (GetArena() == from.GetArena()
-  #ifdef PROTOBUF_FORCE_COPY_IN_MOVE
-        && GetArena() != nullptr
-  #endif  // !PROTOBUF_FORCE_COPY_IN_MOVE
-    ) {
-      InternalSwap(&from);
-    } else {
-      CopyFrom(from);
-    }
-    return *this;
-  }
-
-  inline const ::google::protobuf::UnknownFieldSet& unknown_fields() const
-      ABSL_ATTRIBUTE_LIFETIME_BOUND {
-    return _internal_metadata_.unknown_fields<::google::protobuf::UnknownFieldSet>(::google::protobuf::UnknownFieldSet::default_instance);
-  }
-  inline ::google::protobuf::UnknownFieldSet* mutable_unknown_fields()
-      ABSL_ATTRIBUTE_LIFETIME_BOUND {
-    return _internal_metadata_.mutable_unknown_fields<::google::protobuf::UnknownFieldSet>();
-  }
-
-  static const ::google::protobuf::Descriptor* descriptor() {
-    return GetDescriptor();
-  }
-  static const ::google::protobuf::Descriptor* GetDescriptor() {
-    return default_instance().GetMetadata().descriptor;
-  }
-  static const ::google::protobuf::Reflection* GetReflection() {
-    return default_instance().GetMetadata().reflection;
-  }
-  static const FigureDescriptor_StringMapWithDefault& default_instance() {
-    return *internal_default_instance();
-  }
-  static inline const FigureDescriptor_StringMapWithDefault* internal_default_instance() {
-    return reinterpret_cast<const FigureDescriptor_StringMapWithDefault*>(
-               &_FigureDescriptor_StringMapWithDefault_default_instance_);
-  }
-  static constexpr int kIndexInFileMessages =
-    48;
-
-  friend void swap(FigureDescriptor_StringMapWithDefault& a, FigureDescriptor_StringMapWithDefault& b) {
-    a.Swap(&b);
-  }
-  inline void Swap(FigureDescriptor_StringMapWithDefault* other) {
-    if (other == this) return;
-  #ifdef PROTOBUF_FORCE_COPY_IN_SWAP
-    if (GetArena() != nullptr &&
-        GetArena() == other->GetArena()) {
-   #else  // PROTOBUF_FORCE_COPY_IN_SWAP
-    if (GetArena() == other->GetArena()) {
-  #endif  // !PROTOBUF_FORCE_COPY_IN_SWAP
-      InternalSwap(other);
-    } else {
-      ::google::protobuf::internal::GenericSwap(this, other);
-    }
-  }
-  void UnsafeArenaSwap(FigureDescriptor_StringMapWithDefault* other) {
-    if (other == this) return;
-    ABSL_DCHECK(GetArena() == other->GetArena());
-    InternalSwap(other);
-  }
-
-  // implements Message ----------------------------------------------
-
-  FigureDescriptor_StringMapWithDefault* New(::google::protobuf::Arena* arena = nullptr) const final {
-    return CreateMaybeMessage<FigureDescriptor_StringMapWithDefault>(arena);
-  }
-  using ::google::protobuf::Message::CopyFrom;
-  void CopyFrom(const FigureDescriptor_StringMapWithDefault& from);
-  using ::google::protobuf::Message::MergeFrom;
-  void MergeFrom( const FigureDescriptor_StringMapWithDefault& from) {
-    FigureDescriptor_StringMapWithDefault::MergeImpl(*this, from);
-  }
-  private:
-  static void MergeImpl(::google::protobuf::Message& to_msg, const ::google::protobuf::Message& from_msg);
-  public:
-  PROTOBUF_ATTRIBUTE_REINITIALIZES void Clear() final;
-  bool IsInitialized() const final;
-
-  ::size_t ByteSizeLong() const final;
-  const char* _InternalParse(const char* ptr, ::google::protobuf::internal::ParseContext* ctx) final;
-  ::uint8_t* _InternalSerialize(
-      ::uint8_t* target, ::google::protobuf::io::EpsCopyOutputStream* stream) const final;
-  int GetCachedSize() const { return _impl_._cached_size_.Get(); }
-
-  private:
-  ::google::protobuf::internal::CachedSize* AccessCachedSize() const final;
-  void SharedCtor(::google::protobuf::Arena* arena);
-  void SharedDtor();
-  void InternalSwap(FigureDescriptor_StringMapWithDefault* other);
-
-  private:
-  friend class ::google::protobuf::internal::AnyMetadata;
-  static ::absl::string_view FullMessageName() {
-    return "io.deephaven.proto.backplane.script.grpc.FigureDescriptor.StringMapWithDefault";
-  }
-  protected:
-  explicit FigureDescriptor_StringMapWithDefault(::google::protobuf::Arena* arena);
-  FigureDescriptor_StringMapWithDefault(::google::protobuf::Arena* arena, const FigureDescriptor_StringMapWithDefault& from);
-  public:
-
-  static const ClassData _class_data_;
-  const ::google::protobuf::Message::ClassData*GetClassData() const final;
-
-  ::google::protobuf::Metadata GetMetadata() const final;
-
-  // nested types ----------------------------------------------------
-
-  // accessors -------------------------------------------------------
-
-  enum : int {
-    kKeysFieldNumber = 2,
-    kValuesFieldNumber = 3,
-    kDefaultStringFieldNumber = 1,
-  };
-  // repeated string keys = 2;
-  int keys_size() const;
-  private:
-  int _internal_keys_size() const;
-
-  public:
-  void clear_keys() ;
-  const std::string& keys(int index) const;
-  std::string* mutable_keys(int index);
-  void set_keys(int index, const std::string& value);
-  void set_keys(int index, std::string&& value);
-  void set_keys(int index, const char* value);
-  void set_keys(int index, const char* value, std::size_t size);
-  void set_keys(int index, absl::string_view value);
-  std::string* add_keys();
-  void add_keys(const std::string& value);
-  void add_keys(std::string&& value);
-  void add_keys(const char* value);
-  void add_keys(const char* value, std::size_t size);
-  void add_keys(absl::string_view value);
-  const ::google::protobuf::RepeatedPtrField<std::string>& keys() const;
-  ::google::protobuf::RepeatedPtrField<std::string>* mutable_keys();
-
-  private:
-  const ::google::protobuf::RepeatedPtrField<std::string>& _internal_keys() const;
-  ::google::protobuf::RepeatedPtrField<std::string>* _internal_mutable_keys();
-
-  public:
-  // repeated string values = 3;
-  int values_size() const;
-  private:
-  int _internal_values_size() const;
-
-  public:
-  void clear_values() ;
-  const std::string& values(int index) const;
-  std::string* mutable_values(int index);
-  void set_values(int index, const std::string& value);
-  void set_values(int index, std::string&& value);
-  void set_values(int index, const char* value);
-  void set_values(int index, const char* value, std::size_t size);
-  void set_values(int index, absl::string_view value);
-  std::string* add_values();
-  void add_values(const std::string& value);
-  void add_values(std::string&& value);
-  void add_values(const char* value);
-  void add_values(const char* value, std::size_t size);
-  void add_values(absl::string_view value);
-  const ::google::protobuf::RepeatedPtrField<std::string>& values() const;
-  ::google::protobuf::RepeatedPtrField<std::string>* mutable_values();
-
-  private:
-  const ::google::protobuf::RepeatedPtrField<std::string>& _internal_values() const;
-  ::google::protobuf::RepeatedPtrField<std::string>* _internal_mutable_values();
-
-  public:
-  // optional string default_string = 1;
-  bool has_default_string() const;
-  void clear_default_string() ;
-  const std::string& default_string() const;
-  template <typename Arg_ = const std::string&, typename... Args_>
-  void set_default_string(Arg_&& arg, Args_... args);
-  std::string* mutable_default_string();
-  PROTOBUF_NODISCARD std::string* release_default_string();
-  void set_allocated_default_string(std::string* value);
-
-  private:
-  const std::string& _internal_default_string() const;
-  inline PROTOBUF_ALWAYS_INLINE void _internal_set_default_string(
-      const std::string& value);
-  std::string* _internal_mutable_default_string();
-
-  public:
-  // @@protoc_insertion_point(class_scope:io.deephaven.proto.backplane.script.grpc.FigureDescriptor.StringMapWithDefault)
- private:
-  class _Internal;
-
-  friend class ::google::protobuf::internal::TcParser;
-  static const ::google::protobuf::internal::TcParseTable<
-      2, 3, 0,
-      111, 2>
-      _table_;
-  friend class ::google::protobuf::MessageLite;
-  friend class ::google::protobuf::Arena;
-  template <typename T>
-  friend class ::google::protobuf::Arena::InternalHelper;
-  using InternalArenaConstructable_ = void;
-  using DestructorSkippable_ = void;
-  struct Impl_ {
-
-        inline explicit constexpr Impl_(
-            ::google::protobuf::internal::ConstantInitialized) noexcept;
-        inline explicit Impl_(::google::protobuf::internal::InternalVisibility visibility,
-                              ::google::protobuf::Arena* arena);
-        inline explicit Impl_(::google::protobuf::internal::InternalVisibility visibility,
-                              ::google::protobuf::Arena* arena, const Impl_& from);
-    ::google::protobuf::internal::HasBits<1> _has_bits_;
-    mutable ::google::protobuf::internal::CachedSize _cached_size_;
-    ::google::protobuf::RepeatedPtrField<std::string> keys_;
-    ::google::protobuf::RepeatedPtrField<std::string> values_;
-    ::google::protobuf::internal::ArenaStringPtr default_string_;
-    PROTOBUF_TSAN_DECLARE_MEMBER
-  };
-  union { Impl_ _impl_; };
-  friend struct ::TableStruct_deephaven_2fproto_2fconsole_2eproto;
-};// -------------------------------------------------------------------
-
-class FigureDescriptor_OneClickDescriptor final :
-    public ::google::protobuf::Message /* @@protoc_insertion_point(class_definition:io.deephaven.proto.backplane.script.grpc.FigureDescriptor.OneClickDescriptor) */ {
- public:
-  inline FigureDescriptor_OneClickDescriptor() : FigureDescriptor_OneClickDescriptor(nullptr) {}
-  ~FigureDescriptor_OneClickDescriptor() override;
-  template<typename = void>
-  explicit PROTOBUF_CONSTEXPR FigureDescriptor_OneClickDescriptor(::google::protobuf::internal::ConstantInitialized);
-
-  inline FigureDescriptor_OneClickDescriptor(const FigureDescriptor_OneClickDescriptor& from)
-      : FigureDescriptor_OneClickDescriptor(nullptr, from) {}
-  FigureDescriptor_OneClickDescriptor(FigureDescriptor_OneClickDescriptor&& from) noexcept
-    : FigureDescriptor_OneClickDescriptor() {
-    *this = ::std::move(from);
-  }
-
-  inline FigureDescriptor_OneClickDescriptor& operator=(const FigureDescriptor_OneClickDescriptor& from) {
-    CopyFrom(from);
-    return *this;
-  }
-  inline FigureDescriptor_OneClickDescriptor& operator=(FigureDescriptor_OneClickDescriptor&& from) noexcept {
-    if (this == &from) return *this;
-    if (GetArena() == from.GetArena()
-  #ifdef PROTOBUF_FORCE_COPY_IN_MOVE
-        && GetArena() != nullptr
-  #endif  // !PROTOBUF_FORCE_COPY_IN_MOVE
-    ) {
-      InternalSwap(&from);
-    } else {
-      CopyFrom(from);
-    }
-    return *this;
-  }
-
-  inline const ::google::protobuf::UnknownFieldSet& unknown_fields() const
-      ABSL_ATTRIBUTE_LIFETIME_BOUND {
-    return _internal_metadata_.unknown_fields<::google::protobuf::UnknownFieldSet>(::google::protobuf::UnknownFieldSet::default_instance);
-  }
-  inline ::google::protobuf::UnknownFieldSet* mutable_unknown_fields()
-      ABSL_ATTRIBUTE_LIFETIME_BOUND {
-    return _internal_metadata_.mutable_unknown_fields<::google::protobuf::UnknownFieldSet>();
-  }
-
-  static const ::google::protobuf::Descriptor* descriptor() {
-    return GetDescriptor();
-  }
-  static const ::google::protobuf::Descriptor* GetDescriptor() {
-    return default_instance().GetMetadata().descriptor;
-  }
-  static const ::google::protobuf::Reflection* GetReflection() {
-    return default_instance().GetMetadata().reflection;
-  }
-  static const FigureDescriptor_OneClickDescriptor& default_instance() {
-    return *internal_default_instance();
-  }
-  static inline const FigureDescriptor_OneClickDescriptor* internal_default_instance() {
-    return reinterpret_cast<const FigureDescriptor_OneClickDescriptor*>(
-               &_FigureDescriptor_OneClickDescriptor_default_instance_);
-  }
-  static constexpr int kIndexInFileMessages =
-    58;
-
-  friend void swap(FigureDescriptor_OneClickDescriptor& a, FigureDescriptor_OneClickDescriptor& b) {
-    a.Swap(&b);
-  }
-  inline void Swap(FigureDescriptor_OneClickDescriptor* other) {
-    if (other == this) return;
-  #ifdef PROTOBUF_FORCE_COPY_IN_SWAP
-    if (GetArena() != nullptr &&
-        GetArena() == other->GetArena()) {
-   #else  // PROTOBUF_FORCE_COPY_IN_SWAP
-    if (GetArena() == other->GetArena()) {
-  #endif  // !PROTOBUF_FORCE_COPY_IN_SWAP
-      InternalSwap(other);
-    } else {
-      ::google::protobuf::internal::GenericSwap(this, other);
-    }
-  }
-  void UnsafeArenaSwap(FigureDescriptor_OneClickDescriptor* other) {
-    if (other == this) return;
-    ABSL_DCHECK(GetArena() == other->GetArena());
-    InternalSwap(other);
-  }
-
-  // implements Message ----------------------------------------------
-
-  FigureDescriptor_OneClickDescriptor* New(::google::protobuf::Arena* arena = nullptr) const final {
-    return CreateMaybeMessage<FigureDescriptor_OneClickDescriptor>(arena);
-  }
-  using ::google::protobuf::Message::CopyFrom;
-  void CopyFrom(const FigureDescriptor_OneClickDescriptor& from);
-  using ::google::protobuf::Message::MergeFrom;
-  void MergeFrom( const FigureDescriptor_OneClickDescriptor& from) {
-    FigureDescriptor_OneClickDescriptor::MergeImpl(*this, from);
-  }
-  private:
-  static void MergeImpl(::google::protobuf::Message& to_msg, const ::google::protobuf::Message& from_msg);
-  public:
-  PROTOBUF_ATTRIBUTE_REINITIALIZES void Clear() final;
-  bool IsInitialized() const final;
-
-  ::size_t ByteSizeLong() const final;
-  const char* _InternalParse(const char* ptr, ::google::protobuf::internal::ParseContext* ctx) final;
-  ::uint8_t* _InternalSerialize(
-      ::uint8_t* target, ::google::protobuf::io::EpsCopyOutputStream* stream) const final;
-  int GetCachedSize() const { return _impl_._cached_size_.Get(); }
-
-  private:
-  ::google::protobuf::internal::CachedSize* AccessCachedSize() const final;
-  void SharedCtor(::google::protobuf::Arena* arena);
-  void SharedDtor();
-  void InternalSwap(FigureDescriptor_OneClickDescriptor* other);
-
-  private:
-  friend class ::google::protobuf::internal::AnyMetadata;
-  static ::absl::string_view FullMessageName() {
-    return "io.deephaven.proto.backplane.script.grpc.FigureDescriptor.OneClickDescriptor";
-  }
-  protected:
-  explicit FigureDescriptor_OneClickDescriptor(::google::protobuf::Arena* arena);
-  FigureDescriptor_OneClickDescriptor(::google::protobuf::Arena* arena, const FigureDescriptor_OneClickDescriptor& from);
-  public:
-
-  static const ClassData _class_data_;
-  const ::google::protobuf::Message::ClassData*GetClassData() const final;
-
-  ::google::protobuf::Metadata GetMetadata() const final;
-
-  // nested types ----------------------------------------------------
-
-  // accessors -------------------------------------------------------
-
-  enum : int {
-    kColumnsFieldNumber = 1,
-    kColumnTypesFieldNumber = 2,
-    kRequireAllFiltersToDisplayFieldNumber = 3,
-  };
-  // repeated string columns = 1;
-  int columns_size() const;
-  private:
-  int _internal_columns_size() const;
-
-  public:
-  void clear_columns() ;
-  const std::string& columns(int index) const;
-  std::string* mutable_columns(int index);
-  void set_columns(int index, const std::string& value);
-  void set_columns(int index, std::string&& value);
-  void set_columns(int index, const char* value);
-  void set_columns(int index, const char* value, std::size_t size);
-  void set_columns(int index, absl::string_view value);
-  std::string* add_columns();
-  void add_columns(const std::string& value);
-  void add_columns(std::string&& value);
-  void add_columns(const char* value);
-  void add_columns(const char* value, std::size_t size);
-  void add_columns(absl::string_view value);
-  const ::google::protobuf::RepeatedPtrField<std::string>& columns() const;
-  ::google::protobuf::RepeatedPtrField<std::string>* mutable_columns();
-
-  private:
-  const ::google::protobuf::RepeatedPtrField<std::string>& _internal_columns() const;
-  ::google::protobuf::RepeatedPtrField<std::string>* _internal_mutable_columns();
-
-  public:
-  // repeated string column_types = 2;
-  int column_types_size() const;
-  private:
-  int _internal_column_types_size() const;
-
-  public:
-  void clear_column_types() ;
-  const std::string& column_types(int index) const;
-  std::string* mutable_column_types(int index);
-  void set_column_types(int index, const std::string& value);
-  void set_column_types(int index, std::string&& value);
-  void set_column_types(int index, const char* value);
-  void set_column_types(int index, const char* value, std::size_t size);
-  void set_column_types(int index, absl::string_view value);
-  std::string* add_column_types();
-  void add_column_types(const std::string& value);
-  void add_column_types(std::string&& value);
-  void add_column_types(const char* value);
-  void add_column_types(const char* value, std::size_t size);
-  void add_column_types(absl::string_view value);
-  const ::google::protobuf::RepeatedPtrField<std::string>& column_types() const;
-  ::google::protobuf::RepeatedPtrField<std::string>* mutable_column_types();
-
-  private:
-  const ::google::protobuf::RepeatedPtrField<std::string>& _internal_column_types() const;
-  ::google::protobuf::RepeatedPtrField<std::string>* _internal_mutable_column_types();
-
-  public:
-  // bool require_all_filters_to_display = 3;
-  void clear_require_all_filters_to_display() ;
-  bool require_all_filters_to_display() const;
-  void set_require_all_filters_to_display(bool value);
-
-  private:
-  bool _internal_require_all_filters_to_display() const;
-  void _internal_set_require_all_filters_to_display(bool value);
-
-  public:
-  // @@protoc_insertion_point(class_scope:io.deephaven.proto.backplane.script.grpc.FigureDescriptor.OneClickDescriptor)
- private:
-  class _Internal;
-
-  friend class ::google::protobuf::internal::TcParser;
-  static const ::google::protobuf::internal::TcParseTable<
-      2, 3, 0,
-      104, 2>
-      _table_;
-  friend class ::google::protobuf::MessageLite;
-  friend class ::google::protobuf::Arena;
-  template <typename T>
-  friend class ::google::protobuf::Arena::InternalHelper;
-  using InternalArenaConstructable_ = void;
-  using DestructorSkippable_ = void;
-  struct Impl_ {
-
-        inline explicit constexpr Impl_(
-            ::google::protobuf::internal::ConstantInitialized) noexcept;
-        inline explicit Impl_(::google::protobuf::internal::InternalVisibility visibility,
-                              ::google::protobuf::Arena* arena);
-        inline explicit Impl_(::google::protobuf::internal::InternalVisibility visibility,
-                              ::google::protobuf::Arena* arena, const Impl_& from);
-    ::google::protobuf::RepeatedPtrField<std::string> columns_;
-    ::google::protobuf::RepeatedPtrField<std::string> column_types_;
-    bool require_all_filters_to_display_;
-    mutable ::google::protobuf::internal::CachedSize _cached_size_;
-    PROTOBUF_TSAN_DECLARE_MEMBER
-  };
-  union { Impl_ _impl_; };
-  friend struct ::TableStruct_deephaven_2fproto_2fconsole_2eproto;
-};// -------------------------------------------------------------------
-
-class FigureDescriptor_MultiSeriesSourceDescriptor final :
-    public ::google::protobuf::Message /* @@protoc_insertion_point(class_definition:io.deephaven.proto.backplane.script.grpc.FigureDescriptor.MultiSeriesSourceDescriptor) */ {
- public:
-  inline FigureDescriptor_MultiSeriesSourceDescriptor() : FigureDescriptor_MultiSeriesSourceDescriptor(nullptr) {}
-  ~FigureDescriptor_MultiSeriesSourceDescriptor() override;
-  template<typename = void>
-  explicit PROTOBUF_CONSTEXPR FigureDescriptor_MultiSeriesSourceDescriptor(::google::protobuf::internal::ConstantInitialized);
-
-  inline FigureDescriptor_MultiSeriesSourceDescriptor(const FigureDescriptor_MultiSeriesSourceDescriptor& from)
-      : FigureDescriptor_MultiSeriesSourceDescriptor(nullptr, from) {}
-  FigureDescriptor_MultiSeriesSourceDescriptor(FigureDescriptor_MultiSeriesSourceDescriptor&& from) noexcept
-    : FigureDescriptor_MultiSeriesSourceDescriptor() {
-    *this = ::std::move(from);
-  }
-
-  inline FigureDescriptor_MultiSeriesSourceDescriptor& operator=(const FigureDescriptor_MultiSeriesSourceDescriptor& from) {
-    CopyFrom(from);
-    return *this;
-  }
-  inline FigureDescriptor_MultiSeriesSourceDescriptor& operator=(FigureDescriptor_MultiSeriesSourceDescriptor&& from) noexcept {
-    if (this == &from) return *this;
-    if (GetArena() == from.GetArena()
-  #ifdef PROTOBUF_FORCE_COPY_IN_MOVE
-        && GetArena() != nullptr
-  #endif  // !PROTOBUF_FORCE_COPY_IN_MOVE
-    ) {
-      InternalSwap(&from);
-    } else {
-      CopyFrom(from);
-    }
-    return *this;
-  }
-
-  inline const ::google::protobuf::UnknownFieldSet& unknown_fields() const
-      ABSL_ATTRIBUTE_LIFETIME_BOUND {
-    return _internal_metadata_.unknown_fields<::google::protobuf::UnknownFieldSet>(::google::protobuf::UnknownFieldSet::default_instance);
-  }
-  inline ::google::protobuf::UnknownFieldSet* mutable_unknown_fields()
-      ABSL_ATTRIBUTE_LIFETIME_BOUND {
-    return _internal_metadata_.mutable_unknown_fields<::google::protobuf::UnknownFieldSet>();
-  }
-
-  static const ::google::protobuf::Descriptor* descriptor() {
-    return GetDescriptor();
-  }
-  static const ::google::protobuf::Descriptor* GetDescriptor() {
-    return default_instance().GetMetadata().descriptor;
-  }
-  static const ::google::protobuf::Reflection* GetReflection() {
-    return default_instance().GetMetadata().reflection;
-  }
-  static const FigureDescriptor_MultiSeriesSourceDescriptor& default_instance() {
-    return *internal_default_instance();
-  }
-  static inline const FigureDescriptor_MultiSeriesSourceDescriptor* internal_default_instance() {
-    return reinterpret_cast<const FigureDescriptor_MultiSeriesSourceDescriptor*>(
-               &_FigureDescriptor_MultiSeriesSourceDescriptor_default_instance_);
-  }
-  static constexpr int kIndexInFileMessages =
-    56;
-
-  friend void swap(FigureDescriptor_MultiSeriesSourceDescriptor& a, FigureDescriptor_MultiSeriesSourceDescriptor& b) {
-    a.Swap(&b);
-  }
-  inline void Swap(FigureDescriptor_MultiSeriesSourceDescriptor* other) {
-    if (other == this) return;
-  #ifdef PROTOBUF_FORCE_COPY_IN_SWAP
-    if (GetArena() != nullptr &&
-        GetArena() == other->GetArena()) {
-   #else  // PROTOBUF_FORCE_COPY_IN_SWAP
-    if (GetArena() == other->GetArena()) {
-  #endif  // !PROTOBUF_FORCE_COPY_IN_SWAP
-      InternalSwap(other);
-    } else {
-      ::google::protobuf::internal::GenericSwap(this, other);
-    }
-  }
-  void UnsafeArenaSwap(FigureDescriptor_MultiSeriesSourceDescriptor* other) {
-    if (other == this) return;
-    ABSL_DCHECK(GetArena() == other->GetArena());
-    InternalSwap(other);
-  }
-
-  // implements Message ----------------------------------------------
-
-  FigureDescriptor_MultiSeriesSourceDescriptor* New(::google::protobuf::Arena* arena = nullptr) const final {
-    return CreateMaybeMessage<FigureDescriptor_MultiSeriesSourceDescriptor>(arena);
-  }
-  using ::google::protobuf::Message::CopyFrom;
-  void CopyFrom(const FigureDescriptor_MultiSeriesSourceDescriptor& from);
-  using ::google::protobuf::Message::MergeFrom;
-  void MergeFrom( const FigureDescriptor_MultiSeriesSourceDescriptor& from) {
-    FigureDescriptor_MultiSeriesSourceDescriptor::MergeImpl(*this, from);
-  }
-  private:
-  static void MergeImpl(::google::protobuf::Message& to_msg, const ::google::protobuf::Message& from_msg);
-  public:
-  PROTOBUF_ATTRIBUTE_REINITIALIZES void Clear() final;
-  bool IsInitialized() const final;
-
-  ::size_t ByteSizeLong() const final;
-  const char* _InternalParse(const char* ptr, ::google::protobuf::internal::ParseContext* ctx) final;
-  ::uint8_t* _InternalSerialize(
-      ::uint8_t* target, ::google::protobuf::io::EpsCopyOutputStream* stream) const final;
-  int GetCachedSize() const { return _impl_._cached_size_.Get(); }
-
-  private:
-  ::google::protobuf::internal::CachedSize* AccessCachedSize() const final;
-  void SharedCtor(::google::protobuf::Arena* arena);
-  void SharedDtor();
-  void InternalSwap(FigureDescriptor_MultiSeriesSourceDescriptor* other);
-
-  private:
-  friend class ::google::protobuf::internal::AnyMetadata;
-  static ::absl::string_view FullMessageName() {
-    return "io.deephaven.proto.backplane.script.grpc.FigureDescriptor.MultiSeriesSourceDescriptor";
-  }
-  protected:
-  explicit FigureDescriptor_MultiSeriesSourceDescriptor(::google::protobuf::Arena* arena);
-  FigureDescriptor_MultiSeriesSourceDescriptor(::google::protobuf::Arena* arena, const FigureDescriptor_MultiSeriesSourceDescriptor& from);
-  public:
-
-  static const ClassData _class_data_;
-  const ::google::protobuf::Message::ClassData*GetClassData() const final;
-
-  ::google::protobuf::Metadata GetMetadata() const final;
-
-  // nested types ----------------------------------------------------
-
-  // accessors -------------------------------------------------------
-
-  enum : int {
-    kAxisIdFieldNumber = 1,
-    kColumnNameFieldNumber = 4,
-    kTypeFieldNumber = 2,
-    kPartitionedTableIdFieldNumber = 3,
-  };
-  // string axis_id = 1;
-  void clear_axis_id() ;
-  const std::string& axis_id() const;
-  template <typename Arg_ = const std::string&, typename... Args_>
-  void set_axis_id(Arg_&& arg, Args_... args);
-  std::string* mutable_axis_id();
-  PROTOBUF_NODISCARD std::string* release_axis_id();
-  void set_allocated_axis_id(std::string* value);
-
-  private:
-  const std::string& _internal_axis_id() const;
-  inline PROTOBUF_ALWAYS_INLINE void _internal_set_axis_id(
-      const std::string& value);
-  std::string* _internal_mutable_axis_id();
-
-  public:
-  // string column_name = 4;
-  void clear_column_name() ;
-  const std::string& column_name() const;
-  template <typename Arg_ = const std::string&, typename... Args_>
-  void set_column_name(Arg_&& arg, Args_... args);
-  std::string* mutable_column_name();
-  PROTOBUF_NODISCARD std::string* release_column_name();
-  void set_allocated_column_name(std::string* value);
-
-  private:
-  const std::string& _internal_column_name() const;
-  inline PROTOBUF_ALWAYS_INLINE void _internal_set_column_name(
-      const std::string& value);
-  std::string* _internal_mutable_column_name();
-
-  public:
-  // .io.deephaven.proto.backplane.script.grpc.FigureDescriptor.SourceType type = 2;
-  void clear_type() ;
-  ::io::deephaven::proto::backplane::script::grpc::FigureDescriptor_SourceType type() const;
-  void set_type(::io::deephaven::proto::backplane::script::grpc::FigureDescriptor_SourceType value);
-
-  private:
-  ::io::deephaven::proto::backplane::script::grpc::FigureDescriptor_SourceType _internal_type() const;
-  void _internal_set_type(::io::deephaven::proto::backplane::script::grpc::FigureDescriptor_SourceType value);
-
-  public:
-  // int32 partitioned_table_id = 3;
-  void clear_partitioned_table_id() ;
-  ::int32_t partitioned_table_id() const;
-  void set_partitioned_table_id(::int32_t value);
-
-  private:
-  ::int32_t _internal_partitioned_table_id() const;
-  void _internal_set_partitioned_table_id(::int32_t value);
-
-  public:
-  // @@protoc_insertion_point(class_scope:io.deephaven.proto.backplane.script.grpc.FigureDescriptor.MultiSeriesSourceDescriptor)
- private:
-  class _Internal;
-
-  friend class ::google::protobuf::internal::TcParser;
-  static const ::google::protobuf::internal::TcParseTable<
-      2, 4, 0,
-      112, 2>
-      _table_;
-  friend class ::google::protobuf::MessageLite;
-  friend class ::google::protobuf::Arena;
-  template <typename T>
-  friend class ::google::protobuf::Arena::InternalHelper;
-  using InternalArenaConstructable_ = void;
-  using DestructorSkippable_ = void;
-  struct Impl_ {
-
-        inline explicit constexpr Impl_(
-            ::google::protobuf::internal::ConstantInitialized) noexcept;
-        inline explicit Impl_(::google::protobuf::internal::InternalVisibility visibility,
-                              ::google::protobuf::Arena* arena);
-        inline explicit Impl_(::google::protobuf::internal::InternalVisibility visibility,
-                              ::google::protobuf::Arena* arena, const Impl_& from);
-    ::google::protobuf::internal::ArenaStringPtr axis_id_;
-    ::google::protobuf::internal::ArenaStringPtr column_name_;
-    int type_;
-    ::int32_t partitioned_table_id_;
-    mutable ::google::protobuf::internal::CachedSize _cached_size_;
-    PROTOBUF_TSAN_DECLARE_MEMBER
-  };
-  union { Impl_ _impl_; };
-  friend struct ::TableStruct_deephaven_2fproto_2fconsole_2eproto;
-};// -------------------------------------------------------------------
-
-class FigureDescriptor_DoubleMapWithDefault final :
-    public ::google::protobuf::Message /* @@protoc_insertion_point(class_definition:io.deephaven.proto.backplane.script.grpc.FigureDescriptor.DoubleMapWithDefault) */ {
- public:
-  inline FigureDescriptor_DoubleMapWithDefault() : FigureDescriptor_DoubleMapWithDefault(nullptr) {}
-  ~FigureDescriptor_DoubleMapWithDefault() override;
-  template<typename = void>
-  explicit PROTOBUF_CONSTEXPR FigureDescriptor_DoubleMapWithDefault(::google::protobuf::internal::ConstantInitialized);
-
-  inline FigureDescriptor_DoubleMapWithDefault(const FigureDescriptor_DoubleMapWithDefault& from)
-      : FigureDescriptor_DoubleMapWithDefault(nullptr, from) {}
-  FigureDescriptor_DoubleMapWithDefault(FigureDescriptor_DoubleMapWithDefault&& from) noexcept
-    : FigureDescriptor_DoubleMapWithDefault() {
-    *this = ::std::move(from);
-  }
-
-  inline FigureDescriptor_DoubleMapWithDefault& operator=(const FigureDescriptor_DoubleMapWithDefault& from) {
-    CopyFrom(from);
-    return *this;
-  }
-  inline FigureDescriptor_DoubleMapWithDefault& operator=(FigureDescriptor_DoubleMapWithDefault&& from) noexcept {
-    if (this == &from) return *this;
-    if (GetArena() == from.GetArena()
-  #ifdef PROTOBUF_FORCE_COPY_IN_MOVE
-        && GetArena() != nullptr
-  #endif  // !PROTOBUF_FORCE_COPY_IN_MOVE
-    ) {
-      InternalSwap(&from);
-    } else {
-      CopyFrom(from);
-    }
-    return *this;
-  }
-
-  inline const ::google::protobuf::UnknownFieldSet& unknown_fields() const
-      ABSL_ATTRIBUTE_LIFETIME_BOUND {
-    return _internal_metadata_.unknown_fields<::google::protobuf::UnknownFieldSet>(::google::protobuf::UnknownFieldSet::default_instance);
-  }
-  inline ::google::protobuf::UnknownFieldSet* mutable_unknown_fields()
-      ABSL_ATTRIBUTE_LIFETIME_BOUND {
-    return _internal_metadata_.mutable_unknown_fields<::google::protobuf::UnknownFieldSet>();
-  }
-
-  static const ::google::protobuf::Descriptor* descriptor() {
-    return GetDescriptor();
-  }
-  static const ::google::protobuf::Descriptor* GetDescriptor() {
-    return default_instance().GetMetadata().descriptor;
-  }
-  static const ::google::protobuf::Reflection* GetReflection() {
-    return default_instance().GetMetadata().reflection;
-  }
-  static const FigureDescriptor_DoubleMapWithDefault& default_instance() {
-    return *internal_default_instance();
-  }
-  static inline const FigureDescriptor_DoubleMapWithDefault* internal_default_instance() {
-    return reinterpret_cast<const FigureDescriptor_DoubleMapWithDefault*>(
-               &_FigureDescriptor_DoubleMapWithDefault_default_instance_);
-  }
-  static constexpr int kIndexInFileMessages =
-    49;
-
-  friend void swap(FigureDescriptor_DoubleMapWithDefault& a, FigureDescriptor_DoubleMapWithDefault& b) {
-    a.Swap(&b);
-  }
-  inline void Swap(FigureDescriptor_DoubleMapWithDefault* other) {
-    if (other == this) return;
-  #ifdef PROTOBUF_FORCE_COPY_IN_SWAP
-    if (GetArena() != nullptr &&
-        GetArena() == other->GetArena()) {
-   #else  // PROTOBUF_FORCE_COPY_IN_SWAP
-    if (GetArena() == other->GetArena()) {
-  #endif  // !PROTOBUF_FORCE_COPY_IN_SWAP
-      InternalSwap(other);
-    } else {
-      ::google::protobuf::internal::GenericSwap(this, other);
-    }
-  }
-  void UnsafeArenaSwap(FigureDescriptor_DoubleMapWithDefault* other) {
-    if (other == this) return;
-    ABSL_DCHECK(GetArena() == other->GetArena());
-    InternalSwap(other);
-  }
-
-  // implements Message ----------------------------------------------
-
-  FigureDescriptor_DoubleMapWithDefault* New(::google::protobuf::Arena* arena = nullptr) const final {
-    return CreateMaybeMessage<FigureDescriptor_DoubleMapWithDefault>(arena);
-  }
-  using ::google::protobuf::Message::CopyFrom;
-  void CopyFrom(const FigureDescriptor_DoubleMapWithDefault& from);
-  using ::google::protobuf::Message::MergeFrom;
-  void MergeFrom( const FigureDescriptor_DoubleMapWithDefault& from) {
-    FigureDescriptor_DoubleMapWithDefault::MergeImpl(*this, from);
-  }
-  private:
-  static void MergeImpl(::google::protobuf::Message& to_msg, const ::google::protobuf::Message& from_msg);
-  public:
-  PROTOBUF_ATTRIBUTE_REINITIALIZES void Clear() final;
-  bool IsInitialized() const final;
-
-  ::size_t ByteSizeLong() const final;
-  const char* _InternalParse(const char* ptr, ::google::protobuf::internal::ParseContext* ctx) final;
-  ::uint8_t* _InternalSerialize(
-      ::uint8_t* target, ::google::protobuf::io::EpsCopyOutputStream* stream) const final;
-  int GetCachedSize() const { return _impl_._cached_size_.Get(); }
-
-  private:
-  ::google::protobuf::internal::CachedSize* AccessCachedSize() const final;
-  void SharedCtor(::google::protobuf::Arena* arena);
-  void SharedDtor();
-  void InternalSwap(FigureDescriptor_DoubleMapWithDefault* other);
-
-  private:
-  friend class ::google::protobuf::internal::AnyMetadata;
-  static ::absl::string_view FullMessageName() {
-    return "io.deephaven.proto.backplane.script.grpc.FigureDescriptor.DoubleMapWithDefault";
-  }
-  protected:
-  explicit FigureDescriptor_DoubleMapWithDefault(::google::protobuf::Arena* arena);
-  FigureDescriptor_DoubleMapWithDefault(::google::protobuf::Arena* arena, const FigureDescriptor_DoubleMapWithDefault& from);
-  public:
-
-  static const ClassData _class_data_;
-  const ::google::protobuf::Message::ClassData*GetClassData() const final;
-
-  ::google::protobuf::Metadata GetMetadata() const final;
-
-  // nested types ----------------------------------------------------
-
-  // accessors -------------------------------------------------------
-
-  enum : int {
-    kKeysFieldNumber = 2,
-    kValuesFieldNumber = 3,
-    kDefaultDoubleFieldNumber = 1,
-  };
-  // repeated string keys = 2;
-  int keys_size() const;
-  private:
-  int _internal_keys_size() const;
-
-  public:
-  void clear_keys() ;
-  const std::string& keys(int index) const;
-  std::string* mutable_keys(int index);
-  void set_keys(int index, const std::string& value);
-  void set_keys(int index, std::string&& value);
-  void set_keys(int index, const char* value);
-  void set_keys(int index, const char* value, std::size_t size);
-  void set_keys(int index, absl::string_view value);
-  std::string* add_keys();
-  void add_keys(const std::string& value);
-  void add_keys(std::string&& value);
-  void add_keys(const char* value);
-  void add_keys(const char* value, std::size_t size);
-  void add_keys(absl::string_view value);
-  const ::google::protobuf::RepeatedPtrField<std::string>& keys() const;
-  ::google::protobuf::RepeatedPtrField<std::string>* mutable_keys();
-
-  private:
-  const ::google::protobuf::RepeatedPtrField<std::string>& _internal_keys() const;
-  ::google::protobuf::RepeatedPtrField<std::string>* _internal_mutable_keys();
-
-  public:
-  // repeated double values = 3;
-  int values_size() const;
-  private:
-  int _internal_values_size() const;
-
-  public:
-  void clear_values() ;
-  double values(int index) const;
-  void set_values(int index, double value);
-  void add_values(double value);
-  const ::google::protobuf::RepeatedField<double>& values() const;
-  ::google::protobuf::RepeatedField<double>* mutable_values();
-
-  private:
-  const ::google::protobuf::RepeatedField<double>& _internal_values() const;
-  ::google::protobuf::RepeatedField<double>* _internal_mutable_values();
-
-  public:
-  // optional double default_double = 1;
-  bool has_default_double() const;
-  void clear_default_double() ;
-  double default_double() const;
-  void set_default_double(double value);
-
-  private:
-  double _internal_default_double() const;
-  void _internal_set_default_double(double value);
-
-  public:
-  // @@protoc_insertion_point(class_scope:io.deephaven.proto.backplane.script.grpc.FigureDescriptor.DoubleMapWithDefault)
- private:
-  class _Internal;
-
-  friend class ::google::protobuf::internal::TcParser;
-  static const ::google::protobuf::internal::TcParseTable<
-      2, 3, 0,
-      91, 2>
-      _table_;
-  friend class ::google::protobuf::MessageLite;
-  friend class ::google::protobuf::Arena;
-  template <typename T>
-  friend class ::google::protobuf::Arena::InternalHelper;
-  using InternalArenaConstructable_ = void;
-  using DestructorSkippable_ = void;
-  struct Impl_ {
-
-        inline explicit constexpr Impl_(
-            ::google::protobuf::internal::ConstantInitialized) noexcept;
-        inline explicit Impl_(::google::protobuf::internal::InternalVisibility visibility,
-                              ::google::protobuf::Arena* arena);
-        inline explicit Impl_(::google::protobuf::internal::InternalVisibility visibility,
-                              ::google::protobuf::Arena* arena, const Impl_& from);
-    ::google::protobuf::internal::HasBits<1> _has_bits_;
-    mutable ::google::protobuf::internal::CachedSize _cached_size_;
-    ::google::protobuf::RepeatedPtrField<std::string> keys_;
-    ::google::protobuf::RepeatedField<double> values_;
-    double default_double_;
-    PROTOBUF_TSAN_DECLARE_MEMBER
-  };
-  union { Impl_ _impl_; };
-  friend struct ::TableStruct_deephaven_2fproto_2fconsole_2eproto;
-};// -------------------------------------------------------------------
-
-class FigureDescriptor_BusinessCalendarDescriptor_LocalDate final :
-    public ::google::protobuf::Message /* @@protoc_insertion_point(class_definition:io.deephaven.proto.backplane.script.grpc.FigureDescriptor.BusinessCalendarDescriptor.LocalDate) */ {
- public:
-  inline FigureDescriptor_BusinessCalendarDescriptor_LocalDate() : FigureDescriptor_BusinessCalendarDescriptor_LocalDate(nullptr) {}
-  ~FigureDescriptor_BusinessCalendarDescriptor_LocalDate() override;
-  template<typename = void>
-  explicit PROTOBUF_CONSTEXPR FigureDescriptor_BusinessCalendarDescriptor_LocalDate(::google::protobuf::internal::ConstantInitialized);
-
-  inline FigureDescriptor_BusinessCalendarDescriptor_LocalDate(const FigureDescriptor_BusinessCalendarDescriptor_LocalDate& from)
-      : FigureDescriptor_BusinessCalendarDescriptor_LocalDate(nullptr, from) {}
-  FigureDescriptor_BusinessCalendarDescriptor_LocalDate(FigureDescriptor_BusinessCalendarDescriptor_LocalDate&& from) noexcept
-    : FigureDescriptor_BusinessCalendarDescriptor_LocalDate() {
-    *this = ::std::move(from);
-  }
-
-  inline FigureDescriptor_BusinessCalendarDescriptor_LocalDate& operator=(const FigureDescriptor_BusinessCalendarDescriptor_LocalDate& from) {
-    CopyFrom(from);
-    return *this;
-  }
-  inline FigureDescriptor_BusinessCalendarDescriptor_LocalDate& operator=(FigureDescriptor_BusinessCalendarDescriptor_LocalDate&& from) noexcept {
-    if (this == &from) return *this;
-    if (GetArena() == from.GetArena()
-  #ifdef PROTOBUF_FORCE_COPY_IN_MOVE
-        && GetArena() != nullptr
-  #endif  // !PROTOBUF_FORCE_COPY_IN_MOVE
-    ) {
-      InternalSwap(&from);
-    } else {
-      CopyFrom(from);
-    }
-    return *this;
-  }
-
-  inline const ::google::protobuf::UnknownFieldSet& unknown_fields() const
-      ABSL_ATTRIBUTE_LIFETIME_BOUND {
-    return _internal_metadata_.unknown_fields<::google::protobuf::UnknownFieldSet>(::google::protobuf::UnknownFieldSet::default_instance);
-  }
-  inline ::google::protobuf::UnknownFieldSet* mutable_unknown_fields()
-      ABSL_ATTRIBUTE_LIFETIME_BOUND {
-    return _internal_metadata_.mutable_unknown_fields<::google::protobuf::UnknownFieldSet>();
-  }
-
-  static const ::google::protobuf::Descriptor* descriptor() {
-    return GetDescriptor();
-  }
-  static const ::google::protobuf::Descriptor* GetDescriptor() {
-    return default_instance().GetMetadata().descriptor;
-  }
-  static const ::google::protobuf::Reflection* GetReflection() {
-    return default_instance().GetMetadata().reflection;
-  }
-  static const FigureDescriptor_BusinessCalendarDescriptor_LocalDate& default_instance() {
-    return *internal_default_instance();
-  }
-  static inline const FigureDescriptor_BusinessCalendarDescriptor_LocalDate* internal_default_instance() {
-    return reinterpret_cast<const FigureDescriptor_BusinessCalendarDescriptor_LocalDate*>(
-               &_FigureDescriptor_BusinessCalendarDescriptor_LocalDate_default_instance_);
-  }
-  static constexpr int kIndexInFileMessages =
-    54;
-
-  friend void swap(FigureDescriptor_BusinessCalendarDescriptor_LocalDate& a, FigureDescriptor_BusinessCalendarDescriptor_LocalDate& b) {
-    a.Swap(&b);
-  }
-  inline void Swap(FigureDescriptor_BusinessCalendarDescriptor_LocalDate* other) {
-    if (other == this) return;
-  #ifdef PROTOBUF_FORCE_COPY_IN_SWAP
-    if (GetArena() != nullptr &&
-        GetArena() == other->GetArena()) {
-   #else  // PROTOBUF_FORCE_COPY_IN_SWAP
-    if (GetArena() == other->GetArena()) {
-  #endif  // !PROTOBUF_FORCE_COPY_IN_SWAP
-      InternalSwap(other);
-    } else {
-      ::google::protobuf::internal::GenericSwap(this, other);
-    }
-  }
-  void UnsafeArenaSwap(FigureDescriptor_BusinessCalendarDescriptor_LocalDate* other) {
-    if (other == this) return;
-    ABSL_DCHECK(GetArena() == other->GetArena());
-    InternalSwap(other);
-  }
-
-  // implements Message ----------------------------------------------
-
-  FigureDescriptor_BusinessCalendarDescriptor_LocalDate* New(::google::protobuf::Arena* arena = nullptr) const final {
-    return CreateMaybeMessage<FigureDescriptor_BusinessCalendarDescriptor_LocalDate>(arena);
-  }
-  using ::google::protobuf::Message::CopyFrom;
-  void CopyFrom(const FigureDescriptor_BusinessCalendarDescriptor_LocalDate& from);
-  using ::google::protobuf::Message::MergeFrom;
-  void MergeFrom( const FigureDescriptor_BusinessCalendarDescriptor_LocalDate& from) {
-    FigureDescriptor_BusinessCalendarDescriptor_LocalDate::MergeImpl(*this, from);
-  }
-  private:
-  static void MergeImpl(::google::protobuf::Message& to_msg, const ::google::protobuf::Message& from_msg);
-  public:
-  PROTOBUF_ATTRIBUTE_REINITIALIZES void Clear() final;
-  bool IsInitialized() const final;
-
-  ::size_t ByteSizeLong() const final;
-  const char* _InternalParse(const char* ptr, ::google::protobuf::internal::ParseContext* ctx) final;
-  ::uint8_t* _InternalSerialize(
-      ::uint8_t* target, ::google::protobuf::io::EpsCopyOutputStream* stream) const final;
-  int GetCachedSize() const { return _impl_._cached_size_.Get(); }
-
-  private:
-  ::google::protobuf::internal::CachedSize* AccessCachedSize() const final;
-  void SharedCtor(::google::protobuf::Arena* arena);
-  void SharedDtor();
-  void InternalSwap(FigureDescriptor_BusinessCalendarDescriptor_LocalDate* other);
-
-  private:
-  friend class ::google::protobuf::internal::AnyMetadata;
-  static ::absl::string_view FullMessageName() {
-    return "io.deephaven.proto.backplane.script.grpc.FigureDescriptor.BusinessCalendarDescriptor.LocalDate";
-  }
-  protected:
-  explicit FigureDescriptor_BusinessCalendarDescriptor_LocalDate(::google::protobuf::Arena* arena);
-  FigureDescriptor_BusinessCalendarDescriptor_LocalDate(::google::protobuf::Arena* arena, const FigureDescriptor_BusinessCalendarDescriptor_LocalDate& from);
-  public:
-
-  static const ClassData _class_data_;
-  const ::google::protobuf::Message::ClassData*GetClassData() const final;
-
-  ::google::protobuf::Metadata GetMetadata() const final;
-
-  // nested types ----------------------------------------------------
-
-  // accessors -------------------------------------------------------
-
-  enum : int {
-    kYearFieldNumber = 1,
-    kMonthFieldNumber = 2,
-    kDayFieldNumber = 3,
-  };
-  // int32 year = 1;
-  void clear_year() ;
-  ::int32_t year() const;
-  void set_year(::int32_t value);
-
-  private:
-  ::int32_t _internal_year() const;
-  void _internal_set_year(::int32_t value);
-
-  public:
-  // int32 month = 2;
-  void clear_month() ;
-  ::int32_t month() const;
-  void set_month(::int32_t value);
-
-  private:
-  ::int32_t _internal_month() const;
-  void _internal_set_month(::int32_t value);
-
-  public:
-  // int32 day = 3;
-  void clear_day() ;
-  ::int32_t day() const;
-  void set_day(::int32_t value);
-
-  private:
-  ::int32_t _internal_day() const;
-  void _internal_set_day(::int32_t value);
-
-  public:
-  // @@protoc_insertion_point(class_scope:io.deephaven.proto.backplane.script.grpc.FigureDescriptor.BusinessCalendarDescriptor.LocalDate)
- private:
-  class _Internal;
-
-  friend class ::google::protobuf::internal::TcParser;
-  static const ::google::protobuf::internal::TcParseTable<
-      2, 3, 0,
-      0, 2>
-      _table_;
-  friend class ::google::protobuf::MessageLite;
-  friend class ::google::protobuf::Arena;
-  template <typename T>
-  friend class ::google::protobuf::Arena::InternalHelper;
-  using InternalArenaConstructable_ = void;
-  using DestructorSkippable_ = void;
-  struct Impl_ {
-
-        inline explicit constexpr Impl_(
-            ::google::protobuf::internal::ConstantInitialized) noexcept;
-        inline explicit Impl_(::google::protobuf::internal::InternalVisibility visibility,
-                              ::google::protobuf::Arena* arena);
-        inline explicit Impl_(::google::protobuf::internal::InternalVisibility visibility,
-                              ::google::protobuf::Arena* arena, const Impl_& from);
-    ::int32_t year_;
-    ::int32_t month_;
-    ::int32_t day_;
-    mutable ::google::protobuf::internal::CachedSize _cached_size_;
-    PROTOBUF_TSAN_DECLARE_MEMBER
-  };
-  union { Impl_ _impl_; };
-  friend struct ::TableStruct_deephaven_2fproto_2fconsole_2eproto;
-};// -------------------------------------------------------------------
-
-class FigureDescriptor_BusinessCalendarDescriptor_BusinessPeriod final :
-    public ::google::protobuf::Message /* @@protoc_insertion_point(class_definition:io.deephaven.proto.backplane.script.grpc.FigureDescriptor.BusinessCalendarDescriptor.BusinessPeriod) */ {
- public:
-  inline FigureDescriptor_BusinessCalendarDescriptor_BusinessPeriod() : FigureDescriptor_BusinessCalendarDescriptor_BusinessPeriod(nullptr) {}
-  ~FigureDescriptor_BusinessCalendarDescriptor_BusinessPeriod() override;
-  template<typename = void>
-  explicit PROTOBUF_CONSTEXPR FigureDescriptor_BusinessCalendarDescriptor_BusinessPeriod(::google::protobuf::internal::ConstantInitialized);
-
-  inline FigureDescriptor_BusinessCalendarDescriptor_BusinessPeriod(const FigureDescriptor_BusinessCalendarDescriptor_BusinessPeriod& from)
-      : FigureDescriptor_BusinessCalendarDescriptor_BusinessPeriod(nullptr, from) {}
-  FigureDescriptor_BusinessCalendarDescriptor_BusinessPeriod(FigureDescriptor_BusinessCalendarDescriptor_BusinessPeriod&& from) noexcept
-    : FigureDescriptor_BusinessCalendarDescriptor_BusinessPeriod() {
-    *this = ::std::move(from);
-  }
-
-  inline FigureDescriptor_BusinessCalendarDescriptor_BusinessPeriod& operator=(const FigureDescriptor_BusinessCalendarDescriptor_BusinessPeriod& from) {
-    CopyFrom(from);
-    return *this;
-  }
-  inline FigureDescriptor_BusinessCalendarDescriptor_BusinessPeriod& operator=(FigureDescriptor_BusinessCalendarDescriptor_BusinessPeriod&& from) noexcept {
-    if (this == &from) return *this;
-    if (GetArena() == from.GetArena()
-  #ifdef PROTOBUF_FORCE_COPY_IN_MOVE
-        && GetArena() != nullptr
-  #endif  // !PROTOBUF_FORCE_COPY_IN_MOVE
-    ) {
-      InternalSwap(&from);
-    } else {
-      CopyFrom(from);
-    }
-    return *this;
-  }
-
-  inline const ::google::protobuf::UnknownFieldSet& unknown_fields() const
-      ABSL_ATTRIBUTE_LIFETIME_BOUND {
-    return _internal_metadata_.unknown_fields<::google::protobuf::UnknownFieldSet>(::google::protobuf::UnknownFieldSet::default_instance);
-  }
-  inline ::google::protobuf::UnknownFieldSet* mutable_unknown_fields()
-      ABSL_ATTRIBUTE_LIFETIME_BOUND {
-    return _internal_metadata_.mutable_unknown_fields<::google::protobuf::UnknownFieldSet>();
-  }
-
-  static const ::google::protobuf::Descriptor* descriptor() {
-    return GetDescriptor();
-  }
-  static const ::google::protobuf::Descriptor* GetDescriptor() {
-    return default_instance().GetMetadata().descriptor;
-  }
-  static const ::google::protobuf::Reflection* GetReflection() {
-    return default_instance().GetMetadata().reflection;
-  }
-  static const FigureDescriptor_BusinessCalendarDescriptor_BusinessPeriod& default_instance() {
-    return *internal_default_instance();
-  }
-  static inline const FigureDescriptor_BusinessCalendarDescriptor_BusinessPeriod* internal_default_instance() {
-    return reinterpret_cast<const FigureDescriptor_BusinessCalendarDescriptor_BusinessPeriod*>(
-               &_FigureDescriptor_BusinessCalendarDescriptor_BusinessPeriod_default_instance_);
-  }
-  static constexpr int kIndexInFileMessages =
-    52;
-
-  friend void swap(FigureDescriptor_BusinessCalendarDescriptor_BusinessPeriod& a, FigureDescriptor_BusinessCalendarDescriptor_BusinessPeriod& b) {
-    a.Swap(&b);
-  }
-  inline void Swap(FigureDescriptor_BusinessCalendarDescriptor_BusinessPeriod* other) {
-    if (other == this) return;
-  #ifdef PROTOBUF_FORCE_COPY_IN_SWAP
-    if (GetArena() != nullptr &&
-        GetArena() == other->GetArena()) {
-   #else  // PROTOBUF_FORCE_COPY_IN_SWAP
-    if (GetArena() == other->GetArena()) {
-  #endif  // !PROTOBUF_FORCE_COPY_IN_SWAP
-      InternalSwap(other);
-    } else {
-      ::google::protobuf::internal::GenericSwap(this, other);
-    }
-  }
-  void UnsafeArenaSwap(FigureDescriptor_BusinessCalendarDescriptor_BusinessPeriod* other) {
-    if (other == this) return;
-    ABSL_DCHECK(GetArena() == other->GetArena());
-    InternalSwap(other);
-  }
-
-  // implements Message ----------------------------------------------
-
-  FigureDescriptor_BusinessCalendarDescriptor_BusinessPeriod* New(::google::protobuf::Arena* arena = nullptr) const final {
-    return CreateMaybeMessage<FigureDescriptor_BusinessCalendarDescriptor_BusinessPeriod>(arena);
-  }
-  using ::google::protobuf::Message::CopyFrom;
-  void CopyFrom(const FigureDescriptor_BusinessCalendarDescriptor_BusinessPeriod& from);
-  using ::google::protobuf::Message::MergeFrom;
-  void MergeFrom( const FigureDescriptor_BusinessCalendarDescriptor_BusinessPeriod& from) {
-    FigureDescriptor_BusinessCalendarDescriptor_BusinessPeriod::MergeImpl(*this, from);
-  }
-  private:
-  static void MergeImpl(::google::protobuf::Message& to_msg, const ::google::protobuf::Message& from_msg);
-  public:
-  PROTOBUF_ATTRIBUTE_REINITIALIZES void Clear() final;
-  bool IsInitialized() const final;
-
-  ::size_t ByteSizeLong() const final;
-  const char* _InternalParse(const char* ptr, ::google::protobuf::internal::ParseContext* ctx) final;
-  ::uint8_t* _InternalSerialize(
-      ::uint8_t* target, ::google::protobuf::io::EpsCopyOutputStream* stream) const final;
-  int GetCachedSize() const { return _impl_._cached_size_.Get(); }
-
-  private:
-  ::google::protobuf::internal::CachedSize* AccessCachedSize() const final;
-  void SharedCtor(::google::protobuf::Arena* arena);
-  void SharedDtor();
-  void InternalSwap(FigureDescriptor_BusinessCalendarDescriptor_BusinessPeriod* other);
-
-  private:
-  friend class ::google::protobuf::internal::AnyMetadata;
-  static ::absl::string_view FullMessageName() {
-    return "io.deephaven.proto.backplane.script.grpc.FigureDescriptor.BusinessCalendarDescriptor.BusinessPeriod";
-  }
-  protected:
-  explicit FigureDescriptor_BusinessCalendarDescriptor_BusinessPeriod(::google::protobuf::Arena* arena);
-  FigureDescriptor_BusinessCalendarDescriptor_BusinessPeriod(::google::protobuf::Arena* arena, const FigureDescriptor_BusinessCalendarDescriptor_BusinessPeriod& from);
-  public:
-
-  static const ClassData _class_data_;
-  const ::google::protobuf::Message::ClassData*GetClassData() const final;
-
-  ::google::protobuf::Metadata GetMetadata() const final;
-
-  // nested types ----------------------------------------------------
-
-  // accessors -------------------------------------------------------
-
-  enum : int {
-    kOpenFieldNumber = 1,
-    kCloseFieldNumber = 2,
-  };
-  // string open = 1;
-  void clear_open() ;
-  const std::string& open() const;
-  template <typename Arg_ = const std::string&, typename... Args_>
-  void set_open(Arg_&& arg, Args_... args);
-  std::string* mutable_open();
-  PROTOBUF_NODISCARD std::string* release_open();
-  void set_allocated_open(std::string* value);
-
-  private:
-  const std::string& _internal_open() const;
-  inline PROTOBUF_ALWAYS_INLINE void _internal_set_open(
-      const std::string& value);
-  std::string* _internal_mutable_open();
-
-  public:
-  // string close = 2;
-  void clear_close() ;
-  const std::string& close() const;
-  template <typename Arg_ = const std::string&, typename... Args_>
-  void set_close(Arg_&& arg, Args_... args);
-  std::string* mutable_close();
-  PROTOBUF_NODISCARD std::string* release_close();
-  void set_allocated_close(std::string* value);
-
-  private:
-  const std::string& _internal_close() const;
-  inline PROTOBUF_ALWAYS_INLINE void _internal_set_close(
-      const std::string& value);
-  std::string* _internal_mutable_close();
-
-  public:
-  // @@protoc_insertion_point(class_scope:io.deephaven.proto.backplane.script.grpc.FigureDescriptor.BusinessCalendarDescriptor.BusinessPeriod)
- private:
-  class _Internal;
-
-  friend class ::google::protobuf::internal::TcParser;
-  static const ::google::protobuf::internal::TcParseTable<
-      1, 2, 0,
-      117, 2>
-      _table_;
-  friend class ::google::protobuf::MessageLite;
-  friend class ::google::protobuf::Arena;
-  template <typename T>
-  friend class ::google::protobuf::Arena::InternalHelper;
-  using InternalArenaConstructable_ = void;
-  using DestructorSkippable_ = void;
-  struct Impl_ {
-
-        inline explicit constexpr Impl_(
-            ::google::protobuf::internal::ConstantInitialized) noexcept;
-        inline explicit Impl_(::google::protobuf::internal::InternalVisibility visibility,
-                              ::google::protobuf::Arena* arena);
-        inline explicit Impl_(::google::protobuf::internal::InternalVisibility visibility,
-                              ::google::protobuf::Arena* arena, const Impl_& from);
-    ::google::protobuf::internal::ArenaStringPtr open_;
-    ::google::protobuf::internal::ArenaStringPtr close_;
-    mutable ::google::protobuf::internal::CachedSize _cached_size_;
-    PROTOBUF_TSAN_DECLARE_MEMBER
-  };
-  union { Impl_ _impl_; };
-  friend struct ::TableStruct_deephaven_2fproto_2fconsole_2eproto;
-};// -------------------------------------------------------------------
-
-class FigureDescriptor_BoolMapWithDefault final :
-    public ::google::protobuf::Message /* @@protoc_insertion_point(class_definition:io.deephaven.proto.backplane.script.grpc.FigureDescriptor.BoolMapWithDefault) */ {
- public:
-  inline FigureDescriptor_BoolMapWithDefault() : FigureDescriptor_BoolMapWithDefault(nullptr) {}
-  ~FigureDescriptor_BoolMapWithDefault() override;
-  template<typename = void>
-  explicit PROTOBUF_CONSTEXPR FigureDescriptor_BoolMapWithDefault(::google::protobuf::internal::ConstantInitialized);
-
-  inline FigureDescriptor_BoolMapWithDefault(const FigureDescriptor_BoolMapWithDefault& from)
-      : FigureDescriptor_BoolMapWithDefault(nullptr, from) {}
-  FigureDescriptor_BoolMapWithDefault(FigureDescriptor_BoolMapWithDefault&& from) noexcept
-    : FigureDescriptor_BoolMapWithDefault() {
-    *this = ::std::move(from);
-  }
-
-  inline FigureDescriptor_BoolMapWithDefault& operator=(const FigureDescriptor_BoolMapWithDefault& from) {
-    CopyFrom(from);
-    return *this;
-  }
-  inline FigureDescriptor_BoolMapWithDefault& operator=(FigureDescriptor_BoolMapWithDefault&& from) noexcept {
-    if (this == &from) return *this;
-    if (GetArena() == from.GetArena()
-  #ifdef PROTOBUF_FORCE_COPY_IN_MOVE
-        && GetArena() != nullptr
-  #endif  // !PROTOBUF_FORCE_COPY_IN_MOVE
-    ) {
-      InternalSwap(&from);
-    } else {
-      CopyFrom(from);
-    }
-    return *this;
-  }
-
-  inline const ::google::protobuf::UnknownFieldSet& unknown_fields() const
-      ABSL_ATTRIBUTE_LIFETIME_BOUND {
-    return _internal_metadata_.unknown_fields<::google::protobuf::UnknownFieldSet>(::google::protobuf::UnknownFieldSet::default_instance);
-  }
-  inline ::google::protobuf::UnknownFieldSet* mutable_unknown_fields()
-      ABSL_ATTRIBUTE_LIFETIME_BOUND {
-    return _internal_metadata_.mutable_unknown_fields<::google::protobuf::UnknownFieldSet>();
-  }
-
-  static const ::google::protobuf::Descriptor* descriptor() {
-    return GetDescriptor();
-  }
-  static const ::google::protobuf::Descriptor* GetDescriptor() {
-    return default_instance().GetMetadata().descriptor;
-  }
-  static const ::google::protobuf::Reflection* GetReflection() {
-    return default_instance().GetMetadata().reflection;
-  }
-  static const FigureDescriptor_BoolMapWithDefault& default_instance() {
-    return *internal_default_instance();
-  }
-  static inline const FigureDescriptor_BoolMapWithDefault* internal_default_instance() {
-    return reinterpret_cast<const FigureDescriptor_BoolMapWithDefault*>(
-               &_FigureDescriptor_BoolMapWithDefault_default_instance_);
-  }
-  static constexpr int kIndexInFileMessages =
-    50;
-
-  friend void swap(FigureDescriptor_BoolMapWithDefault& a, FigureDescriptor_BoolMapWithDefault& b) {
-    a.Swap(&b);
-  }
-  inline void Swap(FigureDescriptor_BoolMapWithDefault* other) {
-    if (other == this) return;
-  #ifdef PROTOBUF_FORCE_COPY_IN_SWAP
-    if (GetArena() != nullptr &&
-        GetArena() == other->GetArena()) {
-   #else  // PROTOBUF_FORCE_COPY_IN_SWAP
-    if (GetArena() == other->GetArena()) {
-  #endif  // !PROTOBUF_FORCE_COPY_IN_SWAP
-      InternalSwap(other);
-    } else {
-      ::google::protobuf::internal::GenericSwap(this, other);
-    }
-  }
-  void UnsafeArenaSwap(FigureDescriptor_BoolMapWithDefault* other) {
-    if (other == this) return;
-    ABSL_DCHECK(GetArena() == other->GetArena());
-    InternalSwap(other);
-  }
-
-  // implements Message ----------------------------------------------
-
-  FigureDescriptor_BoolMapWithDefault* New(::google::protobuf::Arena* arena = nullptr) const final {
-    return CreateMaybeMessage<FigureDescriptor_BoolMapWithDefault>(arena);
-  }
-  using ::google::protobuf::Message::CopyFrom;
-  void CopyFrom(const FigureDescriptor_BoolMapWithDefault& from);
-  using ::google::protobuf::Message::MergeFrom;
-  void MergeFrom( const FigureDescriptor_BoolMapWithDefault& from) {
-    FigureDescriptor_BoolMapWithDefault::MergeImpl(*this, from);
-  }
-  private:
-  static void MergeImpl(::google::protobuf::Message& to_msg, const ::google::protobuf::Message& from_msg);
-  public:
-  PROTOBUF_ATTRIBUTE_REINITIALIZES void Clear() final;
-  bool IsInitialized() const final;
-
-  ::size_t ByteSizeLong() const final;
-  const char* _InternalParse(const char* ptr, ::google::protobuf::internal::ParseContext* ctx) final;
-  ::uint8_t* _InternalSerialize(
-      ::uint8_t* target, ::google::protobuf::io::EpsCopyOutputStream* stream) const final;
-  int GetCachedSize() const { return _impl_._cached_size_.Get(); }
-
-  private:
-  ::google::protobuf::internal::CachedSize* AccessCachedSize() const final;
-  void SharedCtor(::google::protobuf::Arena* arena);
-  void SharedDtor();
-  void InternalSwap(FigureDescriptor_BoolMapWithDefault* other);
-
-  private:
-  friend class ::google::protobuf::internal::AnyMetadata;
-  static ::absl::string_view FullMessageName() {
-    return "io.deephaven.proto.backplane.script.grpc.FigureDescriptor.BoolMapWithDefault";
-  }
-  protected:
-  explicit FigureDescriptor_BoolMapWithDefault(::google::protobuf::Arena* arena);
-  FigureDescriptor_BoolMapWithDefault(::google::protobuf::Arena* arena, const FigureDescriptor_BoolMapWithDefault& from);
-  public:
-
-  static const ClassData _class_data_;
-  const ::google::protobuf::Message::ClassData*GetClassData() const final;
-
-  ::google::protobuf::Metadata GetMetadata() const final;
-
-  // nested types ----------------------------------------------------
-
-  // accessors -------------------------------------------------------
-
-  enum : int {
-    kKeysFieldNumber = 2,
-    kValuesFieldNumber = 3,
-    kDefaultBoolFieldNumber = 1,
-  };
-  // repeated string keys = 2;
-  int keys_size() const;
-  private:
-  int _internal_keys_size() const;
-
-  public:
-  void clear_keys() ;
-  const std::string& keys(int index) const;
-  std::string* mutable_keys(int index);
-  void set_keys(int index, const std::string& value);
-  void set_keys(int index, std::string&& value);
-  void set_keys(int index, const char* value);
-  void set_keys(int index, const char* value, std::size_t size);
-  void set_keys(int index, absl::string_view value);
-  std::string* add_keys();
-  void add_keys(const std::string& value);
-  void add_keys(std::string&& value);
-  void add_keys(const char* value);
-  void add_keys(const char* value, std::size_t size);
-  void add_keys(absl::string_view value);
-  const ::google::protobuf::RepeatedPtrField<std::string>& keys() const;
-  ::google::protobuf::RepeatedPtrField<std::string>* mutable_keys();
-
-  private:
-  const ::google::protobuf::RepeatedPtrField<std::string>& _internal_keys() const;
-  ::google::protobuf::RepeatedPtrField<std::string>* _internal_mutable_keys();
-
-  public:
-  // repeated bool values = 3;
-  int values_size() const;
-  private:
-  int _internal_values_size() const;
-
-  public:
-  void clear_values() ;
-  bool values(int index) const;
-  void set_values(int index, bool value);
-  void add_values(bool value);
-  const ::google::protobuf::RepeatedField<bool>& values() const;
-  ::google::protobuf::RepeatedField<bool>* mutable_values();
-
-  private:
-  const ::google::protobuf::RepeatedField<bool>& _internal_values() const;
-  ::google::protobuf::RepeatedField<bool>* _internal_mutable_values();
-
-  public:
-  // optional bool default_bool = 1;
-  bool has_default_bool() const;
-  void clear_default_bool() ;
-  bool default_bool() const;
-  void set_default_bool(bool value);
-
-  private:
-  bool _internal_default_bool() const;
-  void _internal_set_default_bool(bool value);
-
-  public:
-  // @@protoc_insertion_point(class_scope:io.deephaven.proto.backplane.script.grpc.FigureDescriptor.BoolMapWithDefault)
- private:
-  class _Internal;
-
-  friend class ::google::protobuf::internal::TcParser;
-  static const ::google::protobuf::internal::TcParseTable<
-      2, 3, 0,
-      89, 2>
-      _table_;
-  friend class ::google::protobuf::MessageLite;
-  friend class ::google::protobuf::Arena;
-  template <typename T>
-  friend class ::google::protobuf::Arena::InternalHelper;
-  using InternalArenaConstructable_ = void;
-  using DestructorSkippable_ = void;
-  struct Impl_ {
-
-        inline explicit constexpr Impl_(
-            ::google::protobuf::internal::ConstantInitialized) noexcept;
-        inline explicit Impl_(::google::protobuf::internal::InternalVisibility visibility,
-                              ::google::protobuf::Arena* arena);
-        inline explicit Impl_(::google::protobuf::internal::InternalVisibility visibility,
-                              ::google::protobuf::Arena* arena, const Impl_& from);
-    ::google::protobuf::internal::HasBits<1> _has_bits_;
-    mutable ::google::protobuf::internal::CachedSize _cached_size_;
-    ::google::protobuf::RepeatedPtrField<std::string> keys_;
-    ::google::protobuf::RepeatedField<bool> values_;
-    bool default_bool_;
-    PROTOBUF_TSAN_DECLARE_MEMBER
-  };
-  union { Impl_ _impl_; };
-  friend struct ::TableStruct_deephaven_2fproto_2fconsole_2eproto;
-};// -------------------------------------------------------------------
-
-class Diagnostic_CodeDescription final :
-    public ::google::protobuf::Message /* @@protoc_insertion_point(class_definition:io.deephaven.proto.backplane.script.grpc.Diagnostic.CodeDescription) */ {
- public:
-  inline Diagnostic_CodeDescription() : Diagnostic_CodeDescription(nullptr) {}
-  ~Diagnostic_CodeDescription() override;
-  template<typename = void>
-  explicit PROTOBUF_CONSTEXPR Diagnostic_CodeDescription(::google::protobuf::internal::ConstantInitialized);
-
-  inline Diagnostic_CodeDescription(const Diagnostic_CodeDescription& from)
-      : Diagnostic_CodeDescription(nullptr, from) {}
-  Diagnostic_CodeDescription(Diagnostic_CodeDescription&& from) noexcept
-    : Diagnostic_CodeDescription() {
-    *this = ::std::move(from);
-  }
-
-  inline Diagnostic_CodeDescription& operator=(const Diagnostic_CodeDescription& from) {
-    CopyFrom(from);
-    return *this;
-  }
-  inline Diagnostic_CodeDescription& operator=(Diagnostic_CodeDescription&& from) noexcept {
-    if (this == &from) return *this;
-    if (GetArena() == from.GetArena()
-  #ifdef PROTOBUF_FORCE_COPY_IN_MOVE
-        && GetArena() != nullptr
-  #endif  // !PROTOBUF_FORCE_COPY_IN_MOVE
-    ) {
-      InternalSwap(&from);
-    } else {
-      CopyFrom(from);
-    }
-    return *this;
-  }
-
-  inline const ::google::protobuf::UnknownFieldSet& unknown_fields() const
-      ABSL_ATTRIBUTE_LIFETIME_BOUND {
-    return _internal_metadata_.unknown_fields<::google::protobuf::UnknownFieldSet>(::google::protobuf::UnknownFieldSet::default_instance);
-  }
-  inline ::google::protobuf::UnknownFieldSet* mutable_unknown_fields()
-      ABSL_ATTRIBUTE_LIFETIME_BOUND {
-    return _internal_metadata_.mutable_unknown_fields<::google::protobuf::UnknownFieldSet>();
-  }
-
-  static const ::google::protobuf::Descriptor* descriptor() {
-    return GetDescriptor();
-  }
-  static const ::google::protobuf::Descriptor* GetDescriptor() {
-    return default_instance().GetMetadata().descriptor;
-  }
-  static const ::google::protobuf::Reflection* GetReflection() {
-    return default_instance().GetMetadata().reflection;
-  }
-  static const Diagnostic_CodeDescription& default_instance() {
-    return *internal_default_instance();
-  }
-  static inline const Diagnostic_CodeDescription* internal_default_instance() {
-    return reinterpret_cast<const Diagnostic_CodeDescription*>(
-               &_Diagnostic_CodeDescription_default_instance_);
-  }
-  static constexpr int kIndexInFileMessages =
-    43;
-
-  friend void swap(Diagnostic_CodeDescription& a, Diagnostic_CodeDescription& b) {
-    a.Swap(&b);
-  }
-  inline void Swap(Diagnostic_CodeDescription* other) {
-    if (other == this) return;
-  #ifdef PROTOBUF_FORCE_COPY_IN_SWAP
-    if (GetArena() != nullptr &&
-        GetArena() == other->GetArena()) {
-   #else  // PROTOBUF_FORCE_COPY_IN_SWAP
-    if (GetArena() == other->GetArena()) {
-  #endif  // !PROTOBUF_FORCE_COPY_IN_SWAP
-      InternalSwap(other);
-    } else {
-      ::google::protobuf::internal::GenericSwap(this, other);
-    }
-  }
-  void UnsafeArenaSwap(Diagnostic_CodeDescription* other) {
-    if (other == this) return;
-    ABSL_DCHECK(GetArena() == other->GetArena());
-    InternalSwap(other);
-  }
-
-  // implements Message ----------------------------------------------
-
-  Diagnostic_CodeDescription* New(::google::protobuf::Arena* arena = nullptr) const final {
-    return CreateMaybeMessage<Diagnostic_CodeDescription>(arena);
-  }
-  using ::google::protobuf::Message::CopyFrom;
-  void CopyFrom(const Diagnostic_CodeDescription& from);
-  using ::google::protobuf::Message::MergeFrom;
-  void MergeFrom( const Diagnostic_CodeDescription& from) {
-    Diagnostic_CodeDescription::MergeImpl(*this, from);
-  }
-  private:
-  static void MergeImpl(::google::protobuf::Message& to_msg, const ::google::protobuf::Message& from_msg);
-  public:
-  PROTOBUF_ATTRIBUTE_REINITIALIZES void Clear() final;
-  bool IsInitialized() const final;
-
-  ::size_t ByteSizeLong() const final;
-  const char* _InternalParse(const char* ptr, ::google::protobuf::internal::ParseContext* ctx) final;
-  ::uint8_t* _InternalSerialize(
-      ::uint8_t* target, ::google::protobuf::io::EpsCopyOutputStream* stream) const final;
-  int GetCachedSize() const { return _impl_._cached_size_.Get(); }
-
-  private:
-  ::google::protobuf::internal::CachedSize* AccessCachedSize() const final;
-  void SharedCtor(::google::protobuf::Arena* arena);
-  void SharedDtor();
-  void InternalSwap(Diagnostic_CodeDescription* other);
-
-  private:
-  friend class ::google::protobuf::internal::AnyMetadata;
-  static ::absl::string_view FullMessageName() {
-    return "io.deephaven.proto.backplane.script.grpc.Diagnostic.CodeDescription";
-  }
-  protected:
-  explicit Diagnostic_CodeDescription(::google::protobuf::Arena* arena);
-  Diagnostic_CodeDescription(::google::protobuf::Arena* arena, const Diagnostic_CodeDescription& from);
-  public:
-
-  static const ClassData _class_data_;
-  const ::google::protobuf::Message::ClassData*GetClassData() const final;
-
-  ::google::protobuf::Metadata GetMetadata() const final;
-
-  // nested types ----------------------------------------------------
-
-  // accessors -------------------------------------------------------
-
-  enum : int {
-    kHrefFieldNumber = 1,
-  };
-  // string href = 1;
-  void clear_href() ;
-  const std::string& href() const;
-  template <typename Arg_ = const std::string&, typename... Args_>
-  void set_href(Arg_&& arg, Args_... args);
-  std::string* mutable_href();
-  PROTOBUF_NODISCARD std::string* release_href();
-  void set_allocated_href(std::string* value);
-
-  private:
-  const std::string& _internal_href() const;
-  inline PROTOBUF_ALWAYS_INLINE void _internal_set_href(
-      const std::string& value);
-  std::string* _internal_mutable_href();
-
-  public:
-  // @@protoc_insertion_point(class_scope:io.deephaven.proto.backplane.script.grpc.Diagnostic.CodeDescription)
- private:
-  class _Internal;
-
-  friend class ::google::protobuf::internal::TcParser;
-  static const ::google::protobuf::internal::TcParseTable<
-      0, 1, 0,
-      80, 2>
-      _table_;
-  friend class ::google::protobuf::MessageLite;
-  friend class ::google::protobuf::Arena;
-  template <typename T>
-  friend class ::google::protobuf::Arena::InternalHelper;
-  using InternalArenaConstructable_ = void;
-  using DestructorSkippable_ = void;
-  struct Impl_ {
-
-        inline explicit constexpr Impl_(
-            ::google::protobuf::internal::ConstantInitialized) noexcept;
-        inline explicit Impl_(::google::protobuf::internal::InternalVisibility visibility,
-                              ::google::protobuf::Arena* arena);
-        inline explicit Impl_(::google::protobuf::internal::InternalVisibility visibility,
-                              ::google::protobuf::Arena* arena, const Impl_& from);
-    ::google::protobuf::internal::ArenaStringPtr href_;
-    mutable ::google::protobuf::internal::CachedSize _cached_size_;
-    PROTOBUF_TSAN_DECLARE_MEMBER
-  };
-  union { Impl_ _impl_; };
-  friend struct ::TableStruct_deephaven_2fproto_2fconsole_2eproto;
-};// -------------------------------------------------------------------
-
-class CompletionContext final :
-    public ::google::protobuf::Message /* @@protoc_insertion_point(class_definition:io.deephaven.proto.backplane.script.grpc.CompletionContext) */ {
- public:
-  inline CompletionContext() : CompletionContext(nullptr) {}
-  ~CompletionContext() override;
-  template<typename = void>
-  explicit PROTOBUF_CONSTEXPR CompletionContext(::google::protobuf::internal::ConstantInitialized);
-
-  inline CompletionContext(const CompletionContext& from)
-      : CompletionContext(nullptr, from) {}
-  CompletionContext(CompletionContext&& from) noexcept
-    : CompletionContext() {
-    *this = ::std::move(from);
-  }
-
-  inline CompletionContext& operator=(const CompletionContext& from) {
-    CopyFrom(from);
-    return *this;
-  }
-  inline CompletionContext& operator=(CompletionContext&& from) noexcept {
-    if (this == &from) return *this;
-    if (GetArena() == from.GetArena()
-  #ifdef PROTOBUF_FORCE_COPY_IN_MOVE
-        && GetArena() != nullptr
-  #endif  // !PROTOBUF_FORCE_COPY_IN_MOVE
-    ) {
-      InternalSwap(&from);
-    } else {
-      CopyFrom(from);
-    }
-    return *this;
-  }
-
-  inline const ::google::protobuf::UnknownFieldSet& unknown_fields() const
-      ABSL_ATTRIBUTE_LIFETIME_BOUND {
-    return _internal_metadata_.unknown_fields<::google::protobuf::UnknownFieldSet>(::google::protobuf::UnknownFieldSet::default_instance);
-  }
-  inline ::google::protobuf::UnknownFieldSet* mutable_unknown_fields()
-      ABSL_ATTRIBUTE_LIFETIME_BOUND {
-    return _internal_metadata_.mutable_unknown_fields<::google::protobuf::UnknownFieldSet>();
-  }
-
-  static const ::google::protobuf::Descriptor* descriptor() {
-    return GetDescriptor();
-  }
-  static const ::google::protobuf::Descriptor* GetDescriptor() {
-    return default_instance().GetMetadata().descriptor;
-  }
-  static const ::google::protobuf::Reflection* GetReflection() {
-    return default_instance().GetMetadata().reflection;
-  }
-  static const CompletionContext& default_instance() {
-    return *internal_default_instance();
-  }
-  static inline const CompletionContext* internal_default_instance() {
-    return reinterpret_cast<const CompletionContext*>(
-               &_CompletionContext_default_instance_);
-  }
-  static constexpr int kIndexInFileMessages =
-    29;
-
-  friend void swap(CompletionContext& a, CompletionContext& b) {
-    a.Swap(&b);
-  }
-  inline void Swap(CompletionContext* other) {
-    if (other == this) return;
-  #ifdef PROTOBUF_FORCE_COPY_IN_SWAP
-    if (GetArena() != nullptr &&
-        GetArena() == other->GetArena()) {
-   #else  // PROTOBUF_FORCE_COPY_IN_SWAP
-    if (GetArena() == other->GetArena()) {
-  #endif  // !PROTOBUF_FORCE_COPY_IN_SWAP
-      InternalSwap(other);
-    } else {
-      ::google::protobuf::internal::GenericSwap(this, other);
-    }
-  }
-  void UnsafeArenaSwap(CompletionContext* other) {
-    if (other == this) return;
-    ABSL_DCHECK(GetArena() == other->GetArena());
-    InternalSwap(other);
-  }
-
-  // implements Message ----------------------------------------------
-
-  CompletionContext* New(::google::protobuf::Arena* arena = nullptr) const final {
-    return CreateMaybeMessage<CompletionContext>(arena);
-  }
-  using ::google::protobuf::Message::CopyFrom;
-  void CopyFrom(const CompletionContext& from);
-  using ::google::protobuf::Message::MergeFrom;
-  void MergeFrom( const CompletionContext& from) {
-    CompletionContext::MergeImpl(*this, from);
-  }
-  private:
-  static void MergeImpl(::google::protobuf::Message& to_msg, const ::google::protobuf::Message& from_msg);
-  public:
-  PROTOBUF_ATTRIBUTE_REINITIALIZES void Clear() final;
-  bool IsInitialized() const final;
-
-  ::size_t ByteSizeLong() const final;
-  const char* _InternalParse(const char* ptr, ::google::protobuf::internal::ParseContext* ctx) final;
-  ::uint8_t* _InternalSerialize(
-      ::uint8_t* target, ::google::protobuf::io::EpsCopyOutputStream* stream) const final;
-  int GetCachedSize() const { return _impl_._cached_size_.Get(); }
-
-  private:
-  ::google::protobuf::internal::CachedSize* AccessCachedSize() const final;
-  void SharedCtor(::google::protobuf::Arena* arena);
-  void SharedDtor();
-  void InternalSwap(CompletionContext* other);
-
-  private:
-  friend class ::google::protobuf::internal::AnyMetadata;
-  static ::absl::string_view FullMessageName() {
-    return "io.deephaven.proto.backplane.script.grpc.CompletionContext";
-  }
-  protected:
-  explicit CompletionContext(::google::protobuf::Arena* arena);
-  CompletionContext(::google::protobuf::Arena* arena, const CompletionContext& from);
-  public:
-
-  static const ClassData _class_data_;
-  const ::google::protobuf::Message::ClassData*GetClassData() const final;
-
-  ::google::protobuf::Metadata GetMetadata() const final;
-
-  // nested types ----------------------------------------------------
-
-  // accessors -------------------------------------------------------
-
-  enum : int {
-    kTriggerCharacterFieldNumber = 2,
-    kTriggerKindFieldNumber = 1,
-  };
-  // string trigger_character = 2;
-  void clear_trigger_character() ;
-  const std::string& trigger_character() const;
-  template <typename Arg_ = const std::string&, typename... Args_>
-  void set_trigger_character(Arg_&& arg, Args_... args);
-  std::string* mutable_trigger_character();
-  PROTOBUF_NODISCARD std::string* release_trigger_character();
-  void set_allocated_trigger_character(std::string* value);
-
-  private:
-  const std::string& _internal_trigger_character() const;
-  inline PROTOBUF_ALWAYS_INLINE void _internal_set_trigger_character(
-      const std::string& value);
-  std::string* _internal_mutable_trigger_character();
-
-  public:
-  // int32 trigger_kind = 1;
-  void clear_trigger_kind() ;
-  ::int32_t trigger_kind() const;
-  void set_trigger_kind(::int32_t value);
-
-  private:
-  ::int32_t _internal_trigger_kind() const;
-  void _internal_set_trigger_kind(::int32_t value);
-
-  public:
-  // @@protoc_insertion_point(class_scope:io.deephaven.proto.backplane.script.grpc.CompletionContext)
- private:
-  class _Internal;
-
-  friend class ::google::protobuf::internal::TcParser;
-  static const ::google::protobuf::internal::TcParseTable<
-      1, 2, 0,
-      84, 2>
-      _table_;
-  friend class ::google::protobuf::MessageLite;
-  friend class ::google::protobuf::Arena;
-  template <typename T>
-  friend class ::google::protobuf::Arena::InternalHelper;
-  using InternalArenaConstructable_ = void;
-  using DestructorSkippable_ = void;
-  struct Impl_ {
-
-        inline explicit constexpr Impl_(
-            ::google::protobuf::internal::ConstantInitialized) noexcept;
-        inline explicit Impl_(::google::protobuf::internal::InternalVisibility visibility,
-                              ::google::protobuf::Arena* arena);
-        inline explicit Impl_(::google::protobuf::internal::InternalVisibility visibility,
-                              ::google::protobuf::Arena* arena, const Impl_& from);
-    ::google::protobuf::internal::ArenaStringPtr trigger_character_;
-    ::int32_t trigger_kind_;
-    mutable ::google::protobuf::internal::CachedSize _cached_size_;
-    PROTOBUF_TSAN_DECLARE_MEMBER
-  };
-  union { Impl_ _impl_; };
-  friend struct ::TableStruct_deephaven_2fproto_2fconsole_2eproto;
-};// -------------------------------------------------------------------
-
-class CancelCommandResponse final :
-    public ::google::protobuf::internal::ZeroFieldsBase /* @@protoc_insertion_point(class_definition:io.deephaven.proto.backplane.script.grpc.CancelCommandResponse) */ {
- public:
-  inline CancelCommandResponse() : CancelCommandResponse(nullptr) {}
-  template<typename = void>
-  explicit PROTOBUF_CONSTEXPR CancelCommandResponse(::google::protobuf::internal::ConstantInitialized);
-
-  inline CancelCommandResponse(const CancelCommandResponse& from)
-      : CancelCommandResponse(nullptr, from) {}
-  CancelCommandResponse(CancelCommandResponse&& from) noexcept
-    : CancelCommandResponse() {
-    *this = ::std::move(from);
-  }
-
-  inline CancelCommandResponse& operator=(const CancelCommandResponse& from) {
-    CopyFrom(from);
-    return *this;
-  }
-  inline CancelCommandResponse& operator=(CancelCommandResponse&& from) noexcept {
-    if (this == &from) return *this;
-    if (GetArena() == from.GetArena()
-  #ifdef PROTOBUF_FORCE_COPY_IN_MOVE
-        && GetArena() != nullptr
-  #endif  // !PROTOBUF_FORCE_COPY_IN_MOVE
-    ) {
-      InternalSwap(&from);
-    } else {
-      CopyFrom(from);
-    }
-    return *this;
-  }
-
-  inline const ::google::protobuf::UnknownFieldSet& unknown_fields() const
-      ABSL_ATTRIBUTE_LIFETIME_BOUND {
-    return _internal_metadata_.unknown_fields<::google::protobuf::UnknownFieldSet>(::google::protobuf::UnknownFieldSet::default_instance);
-  }
-  inline ::google::protobuf::UnknownFieldSet* mutable_unknown_fields()
-      ABSL_ATTRIBUTE_LIFETIME_BOUND {
-    return _internal_metadata_.mutable_unknown_fields<::google::protobuf::UnknownFieldSet>();
-  }
-
-  static const ::google::protobuf::Descriptor* descriptor() {
-    return GetDescriptor();
-  }
-  static const ::google::protobuf::Descriptor* GetDescriptor() {
-    return default_instance().GetMetadata().descriptor;
-  }
-  static const ::google::protobuf::Reflection* GetReflection() {
-    return default_instance().GetMetadata().reflection;
-  }
-  static const CancelCommandResponse& default_instance() {
-    return *internal_default_instance();
-  }
-  static inline const CancelCommandResponse* internal_default_instance() {
-    return reinterpret_cast<const CancelCommandResponse*>(
-               &_CancelCommandResponse_default_instance_);
-  }
-  static constexpr int kIndexInFileMessages =
-    13;
-
-  friend void swap(CancelCommandResponse& a, CancelCommandResponse& b) {
-    a.Swap(&b);
-  }
-  inline void Swap(CancelCommandResponse* other) {
-    if (other == this) return;
-  #ifdef PROTOBUF_FORCE_COPY_IN_SWAP
-    if (GetArena() != nullptr &&
-        GetArena() == other->GetArena()) {
-   #else  // PROTOBUF_FORCE_COPY_IN_SWAP
-    if (GetArena() == other->GetArena()) {
-  #endif  // !PROTOBUF_FORCE_COPY_IN_SWAP
-      InternalSwap(other);
-    } else {
-      ::google::protobuf::internal::GenericSwap(this, other);
-    }
-  }
-  void UnsafeArenaSwap(CancelCommandResponse* other) {
-    if (other == this) return;
-    ABSL_DCHECK(GetArena() == other->GetArena());
-    InternalSwap(other);
-  }
-
-  // implements Message ----------------------------------------------
-
-  CancelCommandResponse* New(::google::protobuf::Arena* arena = nullptr) const final {
-    return CreateMaybeMessage<CancelCommandResponse>(arena);
-  }
-  using ::google::protobuf::internal::ZeroFieldsBase::CopyFrom;
-  inline void CopyFrom(const CancelCommandResponse& from) {
-    ::google::protobuf::internal::ZeroFieldsBase::CopyImpl(*this, from);
-  }
-  using ::google::protobuf::internal::ZeroFieldsBase::MergeFrom;
-  void MergeFrom(const CancelCommandResponse& from) {
-    ::google::protobuf::internal::ZeroFieldsBase::MergeImpl(*this, from);
-  }
-  public:
-
-  private:
-  friend class ::google::protobuf::internal::AnyMetadata;
-  static ::absl::string_view FullMessageName() {
-    return "io.deephaven.proto.backplane.script.grpc.CancelCommandResponse";
-  }
-  protected:
-  explicit CancelCommandResponse(::google::protobuf::Arena* arena);
-  CancelCommandResponse(::google::protobuf::Arena* arena, const CancelCommandResponse& from);
-  public:
-
-  ::google::protobuf::Metadata GetMetadata() const final;
-
-  // nested types ----------------------------------------------------
-
-  // accessors -------------------------------------------------------
-
-  // @@protoc_insertion_point(class_scope:io.deephaven.proto.backplane.script.grpc.CancelCommandResponse)
- private:
-  class _Internal;
-
-  friend class ::google::protobuf::MessageLite;
-  friend class ::google::protobuf::Arena;
-  template <typename T>
-  friend class ::google::protobuf::Arena::InternalHelper;
-  using InternalArenaConstructable_ = void;
-  using DestructorSkippable_ = void;
-  struct Impl_ {
-
-        inline explicit constexpr Impl_(
-            ::google::protobuf::internal::ConstantInitialized) noexcept;
-        inline explicit Impl_(::google::protobuf::internal::InternalVisibility visibility,
-                              ::google::protobuf::Arena* arena);
-        inline explicit Impl_(::google::protobuf::internal::InternalVisibility visibility,
-                              ::google::protobuf::Arena* arena, const Impl_& from);
-    PROTOBUF_TSAN_DECLARE_MEMBER
-  };
-  friend struct ::TableStruct_deephaven_2fproto_2fconsole_2eproto;
-};// -------------------------------------------------------------------
-
-class CancelAutoCompleteResponse final :
-    public ::google::protobuf::internal::ZeroFieldsBase /* @@protoc_insertion_point(class_definition:io.deephaven.proto.backplane.script.grpc.CancelAutoCompleteResponse) */ {
- public:
-  inline CancelAutoCompleteResponse() : CancelAutoCompleteResponse(nullptr) {}
-  template<typename = void>
-  explicit PROTOBUF_CONSTEXPR CancelAutoCompleteResponse(::google::protobuf::internal::ConstantInitialized);
-
-  inline CancelAutoCompleteResponse(const CancelAutoCompleteResponse& from)
-      : CancelAutoCompleteResponse(nullptr, from) {}
-  CancelAutoCompleteResponse(CancelAutoCompleteResponse&& from) noexcept
-    : CancelAutoCompleteResponse() {
-    *this = ::std::move(from);
-  }
-
-  inline CancelAutoCompleteResponse& operator=(const CancelAutoCompleteResponse& from) {
-    CopyFrom(from);
-    return *this;
-  }
-  inline CancelAutoCompleteResponse& operator=(CancelAutoCompleteResponse&& from) noexcept {
-    if (this == &from) return *this;
-    if (GetArena() == from.GetArena()
-  #ifdef PROTOBUF_FORCE_COPY_IN_MOVE
-        && GetArena() != nullptr
-  #endif  // !PROTOBUF_FORCE_COPY_IN_MOVE
-    ) {
-      InternalSwap(&from);
-    } else {
-      CopyFrom(from);
-    }
-    return *this;
-  }
-
-  inline const ::google::protobuf::UnknownFieldSet& unknown_fields() const
-      ABSL_ATTRIBUTE_LIFETIME_BOUND {
-    return _internal_metadata_.unknown_fields<::google::protobuf::UnknownFieldSet>(::google::protobuf::UnknownFieldSet::default_instance);
-  }
-  inline ::google::protobuf::UnknownFieldSet* mutable_unknown_fields()
-      ABSL_ATTRIBUTE_LIFETIME_BOUND {
-    return _internal_metadata_.mutable_unknown_fields<::google::protobuf::UnknownFieldSet>();
-  }
-
-  static const ::google::protobuf::Descriptor* descriptor() {
-    return GetDescriptor();
-  }
-  static const ::google::protobuf::Descriptor* GetDescriptor() {
-    return default_instance().GetMetadata().descriptor;
-  }
-  static const ::google::protobuf::Reflection* GetReflection() {
-    return default_instance().GetMetadata().reflection;
-  }
-  static const CancelAutoCompleteResponse& default_instance() {
-    return *internal_default_instance();
-  }
-  static inline const CancelAutoCompleteResponse* internal_default_instance() {
-    return reinterpret_cast<const CancelAutoCompleteResponse*>(
-               &_CancelAutoCompleteResponse_default_instance_);
-  }
-  static constexpr int kIndexInFileMessages =
-    15;
-
-  friend void swap(CancelAutoCompleteResponse& a, CancelAutoCompleteResponse& b) {
-    a.Swap(&b);
-  }
-  inline void Swap(CancelAutoCompleteResponse* other) {
-    if (other == this) return;
-  #ifdef PROTOBUF_FORCE_COPY_IN_SWAP
-    if (GetArena() != nullptr &&
-        GetArena() == other->GetArena()) {
-   #else  // PROTOBUF_FORCE_COPY_IN_SWAP
-    if (GetArena() == other->GetArena()) {
-  #endif  // !PROTOBUF_FORCE_COPY_IN_SWAP
-      InternalSwap(other);
-    } else {
-      ::google::protobuf::internal::GenericSwap(this, other);
-    }
-  }
-  void UnsafeArenaSwap(CancelAutoCompleteResponse* other) {
-    if (other == this) return;
-    ABSL_DCHECK(GetArena() == other->GetArena());
-    InternalSwap(other);
-  }
-
-  // implements Message ----------------------------------------------
-
-  CancelAutoCompleteResponse* New(::google::protobuf::Arena* arena = nullptr) const final {
-    return CreateMaybeMessage<CancelAutoCompleteResponse>(arena);
-  }
-  using ::google::protobuf::internal::ZeroFieldsBase::CopyFrom;
-  inline void CopyFrom(const CancelAutoCompleteResponse& from) {
-    ::google::protobuf::internal::ZeroFieldsBase::CopyImpl(*this, from);
-  }
-  using ::google::protobuf::internal::ZeroFieldsBase::MergeFrom;
-  void MergeFrom(const CancelAutoCompleteResponse& from) {
-    ::google::protobuf::internal::ZeroFieldsBase::MergeImpl(*this, from);
-  }
-  public:
-
-  private:
-  friend class ::google::protobuf::internal::AnyMetadata;
-  static ::absl::string_view FullMessageName() {
-    return "io.deephaven.proto.backplane.script.grpc.CancelAutoCompleteResponse";
-  }
-  protected:
-  explicit CancelAutoCompleteResponse(::google::protobuf::Arena* arena);
-  CancelAutoCompleteResponse(::google::protobuf::Arena* arena, const CancelAutoCompleteResponse& from);
-  public:
-
-  ::google::protobuf::Metadata GetMetadata() const final;
-
-  // nested types ----------------------------------------------------
-
-  // accessors -------------------------------------------------------
-
-  // @@protoc_insertion_point(class_scope:io.deephaven.proto.backplane.script.grpc.CancelAutoCompleteResponse)
- private:
-  class _Internal;
-
-  friend class ::google::protobuf::MessageLite;
-  friend class ::google::protobuf::Arena;
-  template <typename T>
-  friend class ::google::protobuf::Arena::InternalHelper;
-  using InternalArenaConstructable_ = void;
-  using DestructorSkippable_ = void;
-  struct Impl_ {
-
-        inline explicit constexpr Impl_(
-            ::google::protobuf::internal::ConstantInitialized) noexcept;
-        inline explicit Impl_(::google::protobuf::internal::InternalVisibility visibility,
-                              ::google::protobuf::Arena* arena);
-        inline explicit Impl_(::google::protobuf::internal::InternalVisibility visibility,
-                              ::google::protobuf::Arena* arena, const Impl_& from);
-    PROTOBUF_TSAN_DECLARE_MEMBER
-  };
-  friend struct ::TableStruct_deephaven_2fproto_2fconsole_2eproto;
-};// -------------------------------------------------------------------
-
-class BrowserNextResponse final :
-    public ::google::protobuf::internal::ZeroFieldsBase /* @@protoc_insertion_point(class_definition:io.deephaven.proto.backplane.script.grpc.BrowserNextResponse) */ {
- public:
-  inline BrowserNextResponse() : BrowserNextResponse(nullptr) {}
-  template<typename = void>
-  explicit PROTOBUF_CONSTEXPR BrowserNextResponse(::google::protobuf::internal::ConstantInitialized);
-
-  inline BrowserNextResponse(const BrowserNextResponse& from)
-      : BrowserNextResponse(nullptr, from) {}
-  BrowserNextResponse(BrowserNextResponse&& from) noexcept
-    : BrowserNextResponse() {
-    *this = ::std::move(from);
-  }
-
-  inline BrowserNextResponse& operator=(const BrowserNextResponse& from) {
-    CopyFrom(from);
-    return *this;
-  }
-  inline BrowserNextResponse& operator=(BrowserNextResponse&& from) noexcept {
-    if (this == &from) return *this;
-    if (GetArena() == from.GetArena()
-  #ifdef PROTOBUF_FORCE_COPY_IN_MOVE
-        && GetArena() != nullptr
-  #endif  // !PROTOBUF_FORCE_COPY_IN_MOVE
-    ) {
-      InternalSwap(&from);
-    } else {
-      CopyFrom(from);
-    }
-    return *this;
-  }
-
-  inline const ::google::protobuf::UnknownFieldSet& unknown_fields() const
-      ABSL_ATTRIBUTE_LIFETIME_BOUND {
-    return _internal_metadata_.unknown_fields<::google::protobuf::UnknownFieldSet>(::google::protobuf::UnknownFieldSet::default_instance);
-  }
-  inline ::google::protobuf::UnknownFieldSet* mutable_unknown_fields()
-      ABSL_ATTRIBUTE_LIFETIME_BOUND {
-    return _internal_metadata_.mutable_unknown_fields<::google::protobuf::UnknownFieldSet>();
-  }
-
-  static const ::google::protobuf::Descriptor* descriptor() {
-    return GetDescriptor();
-  }
-  static const ::google::protobuf::Descriptor* GetDescriptor() {
-    return default_instance().GetMetadata().descriptor;
-  }
-  static const ::google::protobuf::Reflection* GetReflection() {
-    return default_instance().GetMetadata().reflection;
-  }
-  static const BrowserNextResponse& default_instance() {
-    return *internal_default_instance();
-  }
-  static inline const BrowserNextResponse* internal_default_instance() {
-    return reinterpret_cast<const BrowserNextResponse*>(
-               &_BrowserNextResponse_default_instance_);
-  }
-  static constexpr int kIndexInFileMessages =
-    18;
-
-  friend void swap(BrowserNextResponse& a, BrowserNextResponse& b) {
-    a.Swap(&b);
-  }
-  inline void Swap(BrowserNextResponse* other) {
-    if (other == this) return;
-  #ifdef PROTOBUF_FORCE_COPY_IN_SWAP
-    if (GetArena() != nullptr &&
-        GetArena() == other->GetArena()) {
-   #else  // PROTOBUF_FORCE_COPY_IN_SWAP
-    if (GetArena() == other->GetArena()) {
-  #endif  // !PROTOBUF_FORCE_COPY_IN_SWAP
-      InternalSwap(other);
-    } else {
-      ::google::protobuf::internal::GenericSwap(this, other);
-    }
-  }
-  void UnsafeArenaSwap(BrowserNextResponse* other) {
-    if (other == this) return;
-    ABSL_DCHECK(GetArena() == other->GetArena());
-    InternalSwap(other);
-  }
-
-  // implements Message ----------------------------------------------
-
-  BrowserNextResponse* New(::google::protobuf::Arena* arena = nullptr) const final {
-    return CreateMaybeMessage<BrowserNextResponse>(arena);
-  }
-  using ::google::protobuf::internal::ZeroFieldsBase::CopyFrom;
-  inline void CopyFrom(const BrowserNextResponse& from) {
-    ::google::protobuf::internal::ZeroFieldsBase::CopyImpl(*this, from);
-  }
-  using ::google::protobuf::internal::ZeroFieldsBase::MergeFrom;
-  void MergeFrom(const BrowserNextResponse& from) {
-    ::google::protobuf::internal::ZeroFieldsBase::MergeImpl(*this, from);
-  }
-  public:
-
-  private:
-  friend class ::google::protobuf::internal::AnyMetadata;
-  static ::absl::string_view FullMessageName() {
-    return "io.deephaven.proto.backplane.script.grpc.BrowserNextResponse";
-  }
-  protected:
-  explicit BrowserNextResponse(::google::protobuf::Arena* arena);
-  BrowserNextResponse(::google::protobuf::Arena* arena, const BrowserNextResponse& from);
-  public:
-
-  ::google::protobuf::Metadata GetMetadata() const final;
-
-  // nested types ----------------------------------------------------
-
-  // accessors -------------------------------------------------------
-
-  // @@protoc_insertion_point(class_scope:io.deephaven.proto.backplane.script.grpc.BrowserNextResponse)
- private:
-  class _Internal;
-
-  friend class ::google::protobuf::MessageLite;
-  friend class ::google::protobuf::Arena;
-  template <typename T>
-  friend class ::google::protobuf::Arena::InternalHelper;
-  using InternalArenaConstructable_ = void;
-  using DestructorSkippable_ = void;
-  struct Impl_ {
-
-        inline explicit constexpr Impl_(
-            ::google::protobuf::internal::ConstantInitialized) noexcept;
-        inline explicit Impl_(::google::protobuf::internal::InternalVisibility visibility,
-                              ::google::protobuf::Arena* arena);
-        inline explicit Impl_(::google::protobuf::internal::InternalVisibility visibility,
-                              ::google::protobuf::Arena* arena, const Impl_& from);
-    PROTOBUF_TSAN_DECLARE_MEMBER
-  };
-  friend struct ::TableStruct_deephaven_2fproto_2fconsole_2eproto;
-};// -------------------------------------------------------------------
-
-class BindTableToVariableResponse final :
-    public ::google::protobuf::internal::ZeroFieldsBase /* @@protoc_insertion_point(class_definition:io.deephaven.proto.backplane.script.grpc.BindTableToVariableResponse) */ {
- public:
-  inline BindTableToVariableResponse() : BindTableToVariableResponse(nullptr) {}
-  template<typename = void>
-  explicit PROTOBUF_CONSTEXPR BindTableToVariableResponse(::google::protobuf::internal::ConstantInitialized);
-
-  inline BindTableToVariableResponse(const BindTableToVariableResponse& from)
-      : BindTableToVariableResponse(nullptr, from) {}
-  BindTableToVariableResponse(BindTableToVariableResponse&& from) noexcept
-    : BindTableToVariableResponse() {
-    *this = ::std::move(from);
-  }
-
-  inline BindTableToVariableResponse& operator=(const BindTableToVariableResponse& from) {
-    CopyFrom(from);
-    return *this;
-  }
-  inline BindTableToVariableResponse& operator=(BindTableToVariableResponse&& from) noexcept {
-    if (this == &from) return *this;
-    if (GetArena() == from.GetArena()
-  #ifdef PROTOBUF_FORCE_COPY_IN_MOVE
-        && GetArena() != nullptr
-  #endif  // !PROTOBUF_FORCE_COPY_IN_MOVE
-    ) {
-      InternalSwap(&from);
-    } else {
-      CopyFrom(from);
-    }
-    return *this;
-  }
-
-  inline const ::google::protobuf::UnknownFieldSet& unknown_fields() const
-      ABSL_ATTRIBUTE_LIFETIME_BOUND {
-    return _internal_metadata_.unknown_fields<::google::protobuf::UnknownFieldSet>(::google::protobuf::UnknownFieldSet::default_instance);
-  }
-  inline ::google::protobuf::UnknownFieldSet* mutable_unknown_fields()
-      ABSL_ATTRIBUTE_LIFETIME_BOUND {
-    return _internal_metadata_.mutable_unknown_fields<::google::protobuf::UnknownFieldSet>();
-  }
-
-  static const ::google::protobuf::Descriptor* descriptor() {
-    return GetDescriptor();
-  }
-  static const ::google::protobuf::Descriptor* GetDescriptor() {
-    return default_instance().GetMetadata().descriptor;
-  }
-  static const ::google::protobuf::Reflection* GetReflection() {
-    return default_instance().GetMetadata().reflection;
-  }
-  static const BindTableToVariableResponse& default_instance() {
-    return *internal_default_instance();
-  }
-  static inline const BindTableToVariableResponse* internal_default_instance() {
-    return reinterpret_cast<const BindTableToVariableResponse*>(
-               &_BindTableToVariableResponse_default_instance_);
-  }
-  static constexpr int kIndexInFileMessages =
-    11;
-
-  friend void swap(BindTableToVariableResponse& a, BindTableToVariableResponse& b) {
-    a.Swap(&b);
-  }
-  inline void Swap(BindTableToVariableResponse* other) {
-    if (other == this) return;
-  #ifdef PROTOBUF_FORCE_COPY_IN_SWAP
-    if (GetArena() != nullptr &&
-        GetArena() == other->GetArena()) {
-   #else  // PROTOBUF_FORCE_COPY_IN_SWAP
-    if (GetArena() == other->GetArena()) {
-  #endif  // !PROTOBUF_FORCE_COPY_IN_SWAP
-      InternalSwap(other);
-    } else {
-      ::google::protobuf::internal::GenericSwap(this, other);
-    }
-  }
-  void UnsafeArenaSwap(BindTableToVariableResponse* other) {
-    if (other == this) return;
-    ABSL_DCHECK(GetArena() == other->GetArena());
-    InternalSwap(other);
-  }
-
-  // implements Message ----------------------------------------------
-
-  BindTableToVariableResponse* New(::google::protobuf::Arena* arena = nullptr) const final {
-    return CreateMaybeMessage<BindTableToVariableResponse>(arena);
-  }
-  using ::google::protobuf::internal::ZeroFieldsBase::CopyFrom;
-  inline void CopyFrom(const BindTableToVariableResponse& from) {
-    ::google::protobuf::internal::ZeroFieldsBase::CopyImpl(*this, from);
-  }
-  using ::google::protobuf::internal::ZeroFieldsBase::MergeFrom;
-  void MergeFrom(const BindTableToVariableResponse& from) {
-    ::google::protobuf::internal::ZeroFieldsBase::MergeImpl(*this, from);
-  }
-  public:
-
-  private:
-  friend class ::google::protobuf::internal::AnyMetadata;
-  static ::absl::string_view FullMessageName() {
-    return "io.deephaven.proto.backplane.script.grpc.BindTableToVariableResponse";
-  }
-  protected:
-  explicit BindTableToVariableResponse(::google::protobuf::Arena* arena);
-  BindTableToVariableResponse(::google::protobuf::Arena* arena, const BindTableToVariableResponse& from);
-  public:
-
-  ::google::protobuf::Metadata GetMetadata() const final;
-
-  // nested types ----------------------------------------------------
-
-  // accessors -------------------------------------------------------
-
-  // @@protoc_insertion_point(class_scope:io.deephaven.proto.backplane.script.grpc.BindTableToVariableResponse)
- private:
-  class _Internal;
-
-  friend class ::google::protobuf::MessageLite;
-  friend class ::google::protobuf::Arena;
-  template <typename T>
-  friend class ::google::protobuf::Arena::InternalHelper;
-  using InternalArenaConstructable_ = void;
-  using DestructorSkippable_ = void;
-  struct Impl_ {
-
-        inline explicit constexpr Impl_(
-            ::google::protobuf::internal::ConstantInitialized) noexcept;
-        inline explicit Impl_(::google::protobuf::internal::InternalVisibility visibility,
-                              ::google::protobuf::Arena* arena);
-        inline explicit Impl_(::google::protobuf::internal::InternalVisibility visibility,
-                              ::google::protobuf::Arena* arena, const Impl_& from);
-    PROTOBUF_TSAN_DECLARE_MEMBER
-  };
-  friend struct ::TableStruct_deephaven_2fproto_2fconsole_2eproto;
-};// -------------------------------------------------------------------
-
-class StartConsoleResponse final :
-    public ::google::protobuf::Message /* @@protoc_insertion_point(class_definition:io.deephaven.proto.backplane.script.grpc.StartConsoleResponse) */ {
- public:
-  inline StartConsoleResponse() : StartConsoleResponse(nullptr) {}
-  ~StartConsoleResponse() override;
-  template<typename = void>
-  explicit PROTOBUF_CONSTEXPR StartConsoleResponse(::google::protobuf::internal::ConstantInitialized);
-
-  inline StartConsoleResponse(const StartConsoleResponse& from)
-      : StartConsoleResponse(nullptr, from) {}
-  StartConsoleResponse(StartConsoleResponse&& from) noexcept
-    : StartConsoleResponse() {
-    *this = ::std::move(from);
-  }
-
-  inline StartConsoleResponse& operator=(const StartConsoleResponse& from) {
-    CopyFrom(from);
-    return *this;
-  }
-  inline StartConsoleResponse& operator=(StartConsoleResponse&& from) noexcept {
-    if (this == &from) return *this;
-    if (GetArena() == from.GetArena()
-  #ifdef PROTOBUF_FORCE_COPY_IN_MOVE
-        && GetArena() != nullptr
-  #endif  // !PROTOBUF_FORCE_COPY_IN_MOVE
-    ) {
-      InternalSwap(&from);
-    } else {
-      CopyFrom(from);
-    }
-    return *this;
-  }
-
-  inline const ::google::protobuf::UnknownFieldSet& unknown_fields() const
-      ABSL_ATTRIBUTE_LIFETIME_BOUND {
-    return _internal_metadata_.unknown_fields<::google::protobuf::UnknownFieldSet>(::google::protobuf::UnknownFieldSet::default_instance);
-  }
-  inline ::google::protobuf::UnknownFieldSet* mutable_unknown_fields()
-      ABSL_ATTRIBUTE_LIFETIME_BOUND {
-    return _internal_metadata_.mutable_unknown_fields<::google::protobuf::UnknownFieldSet>();
-  }
-
-  static const ::google::protobuf::Descriptor* descriptor() {
-    return GetDescriptor();
-  }
-  static const ::google::protobuf::Descriptor* GetDescriptor() {
-    return default_instance().GetMetadata().descriptor;
-  }
-  static const ::google::protobuf::Reflection* GetReflection() {
-    return default_instance().GetMetadata().reflection;
-  }
-  static const StartConsoleResponse& default_instance() {
-    return *internal_default_instance();
-  }
-  static inline const StartConsoleResponse* internal_default_instance() {
-    return reinterpret_cast<const StartConsoleResponse*>(
-               &_StartConsoleResponse_default_instance_);
-  }
-  static constexpr int kIndexInFileMessages =
-    3;
-
-  friend void swap(StartConsoleResponse& a, StartConsoleResponse& b) {
-    a.Swap(&b);
-  }
-  inline void Swap(StartConsoleResponse* other) {
-    if (other == this) return;
-  #ifdef PROTOBUF_FORCE_COPY_IN_SWAP
-    if (GetArena() != nullptr &&
-        GetArena() == other->GetArena()) {
-   #else  // PROTOBUF_FORCE_COPY_IN_SWAP
-    if (GetArena() == other->GetArena()) {
-  #endif  // !PROTOBUF_FORCE_COPY_IN_SWAP
-      InternalSwap(other);
-    } else {
-      ::google::protobuf::internal::GenericSwap(this, other);
-    }
-  }
-  void UnsafeArenaSwap(StartConsoleResponse* other) {
-    if (other == this) return;
-    ABSL_DCHECK(GetArena() == other->GetArena());
-    InternalSwap(other);
-  }
-
-  // implements Message ----------------------------------------------
-
-  StartConsoleResponse* New(::google::protobuf::Arena* arena = nullptr) const final {
-    return CreateMaybeMessage<StartConsoleResponse>(arena);
-  }
-  using ::google::protobuf::Message::CopyFrom;
-  void CopyFrom(const StartConsoleResponse& from);
-  using ::google::protobuf::Message::MergeFrom;
-  void MergeFrom( const StartConsoleResponse& from) {
-    StartConsoleResponse::MergeImpl(*this, from);
-  }
-  private:
-  static void MergeImpl(::google::protobuf::Message& to_msg, const ::google::protobuf::Message& from_msg);
-  public:
-  PROTOBUF_ATTRIBUTE_REINITIALIZES void Clear() final;
-  bool IsInitialized() const final;
-
-  ::size_t ByteSizeLong() const final;
-  const char* _InternalParse(const char* ptr, ::google::protobuf::internal::ParseContext* ctx) final;
-  ::uint8_t* _InternalSerialize(
-      ::uint8_t* target, ::google::protobuf::io::EpsCopyOutputStream* stream) const final;
-  int GetCachedSize() const { return _impl_._cached_size_.Get(); }
-
-  private:
-  ::google::protobuf::internal::CachedSize* AccessCachedSize() const final;
-  void SharedCtor(::google::protobuf::Arena* arena);
-  void SharedDtor();
-  void InternalSwap(StartConsoleResponse* other);
-
-  private:
-  friend class ::google::protobuf::internal::AnyMetadata;
-  static ::absl::string_view FullMessageName() {
-    return "io.deephaven.proto.backplane.script.grpc.StartConsoleResponse";
-  }
-  protected:
-  explicit StartConsoleResponse(::google::protobuf::Arena* arena);
-  StartConsoleResponse(::google::protobuf::Arena* arena, const StartConsoleResponse& from);
-  public:
-
-  static const ClassData _class_data_;
-  const ::google::protobuf::Message::ClassData*GetClassData() const final;
-
-  ::google::protobuf::Metadata GetMetadata() const final;
-
-  // nested types ----------------------------------------------------
-
-  // accessors -------------------------------------------------------
-
-  enum : int {
-    kResultIdFieldNumber = 1,
-  };
-  // .io.deephaven.proto.backplane.grpc.Ticket result_id = 1;
-  bool has_result_id() const;
-  void clear_result_id() ;
-  const ::io::deephaven::proto::backplane::grpc::Ticket& result_id() const;
-  PROTOBUF_NODISCARD ::io::deephaven::proto::backplane::grpc::Ticket* release_result_id();
-  ::io::deephaven::proto::backplane::grpc::Ticket* mutable_result_id();
-  void set_allocated_result_id(::io::deephaven::proto::backplane::grpc::Ticket* value);
-  void unsafe_arena_set_allocated_result_id(::io::deephaven::proto::backplane::grpc::Ticket* value);
-  ::io::deephaven::proto::backplane::grpc::Ticket* unsafe_arena_release_result_id();
-
-  private:
-  const ::io::deephaven::proto::backplane::grpc::Ticket& _internal_result_id() const;
-  ::io::deephaven::proto::backplane::grpc::Ticket* _internal_mutable_result_id();
-
-  public:
-  // @@protoc_insertion_point(class_scope:io.deephaven.proto.backplane.script.grpc.StartConsoleResponse)
- private:
-  class _Internal;
-
-  friend class ::google::protobuf::internal::TcParser;
-  static const ::google::protobuf::internal::TcParseTable<
-      0, 1, 1,
-      0, 2>
-      _table_;
-  friend class ::google::protobuf::MessageLite;
-  friend class ::google::protobuf::Arena;
-  template <typename T>
-  friend class ::google::protobuf::Arena::InternalHelper;
-  using InternalArenaConstructable_ = void;
-  using DestructorSkippable_ = void;
-  struct Impl_ {
-
-        inline explicit constexpr Impl_(
-            ::google::protobuf::internal::ConstantInitialized) noexcept;
-        inline explicit Impl_(::google::protobuf::internal::InternalVisibility visibility,
-                              ::google::protobuf::Arena* arena);
-        inline explicit Impl_(::google::protobuf::internal::InternalVisibility visibility,
-                              ::google::protobuf::Arena* arena, const Impl_& from);
-    ::google::protobuf::internal::HasBits<1> _has_bits_;
-    mutable ::google::protobuf::internal::CachedSize _cached_size_;
-    ::io::deephaven::proto::backplane::grpc::Ticket* result_id_;
-    PROTOBUF_TSAN_DECLARE_MEMBER
-  };
-  union { Impl_ _impl_; };
-  friend struct ::TableStruct_deephaven_2fproto_2fconsole_2eproto;
-};// -------------------------------------------------------------------
-
-class StartConsoleRequest final :
-    public ::google::protobuf::Message /* @@protoc_insertion_point(class_definition:io.deephaven.proto.backplane.script.grpc.StartConsoleRequest) */ {
- public:
-  inline StartConsoleRequest() : StartConsoleRequest(nullptr) {}
-  ~StartConsoleRequest() override;
-  template<typename = void>
-  explicit PROTOBUF_CONSTEXPR StartConsoleRequest(::google::protobuf::internal::ConstantInitialized);
-
-  inline StartConsoleRequest(const StartConsoleRequest& from)
-      : StartConsoleRequest(nullptr, from) {}
-  StartConsoleRequest(StartConsoleRequest&& from) noexcept
-    : StartConsoleRequest() {
-    *this = ::std::move(from);
-  }
-
-  inline StartConsoleRequest& operator=(const StartConsoleRequest& from) {
-    CopyFrom(from);
-    return *this;
-  }
-  inline StartConsoleRequest& operator=(StartConsoleRequest&& from) noexcept {
-    if (this == &from) return *this;
-    if (GetArena() == from.GetArena()
-  #ifdef PROTOBUF_FORCE_COPY_IN_MOVE
-        && GetArena() != nullptr
-  #endif  // !PROTOBUF_FORCE_COPY_IN_MOVE
-    ) {
-      InternalSwap(&from);
-    } else {
-      CopyFrom(from);
-    }
-    return *this;
-  }
-
-  inline const ::google::protobuf::UnknownFieldSet& unknown_fields() const
-      ABSL_ATTRIBUTE_LIFETIME_BOUND {
-    return _internal_metadata_.unknown_fields<::google::protobuf::UnknownFieldSet>(::google::protobuf::UnknownFieldSet::default_instance);
-  }
-  inline ::google::protobuf::UnknownFieldSet* mutable_unknown_fields()
-      ABSL_ATTRIBUTE_LIFETIME_BOUND {
-    return _internal_metadata_.mutable_unknown_fields<::google::protobuf::UnknownFieldSet>();
-  }
-
-  static const ::google::protobuf::Descriptor* descriptor() {
-    return GetDescriptor();
-  }
-  static const ::google::protobuf::Descriptor* GetDescriptor() {
-    return default_instance().GetMetadata().descriptor;
-  }
-  static const ::google::protobuf::Reflection* GetReflection() {
-    return default_instance().GetMetadata().reflection;
-  }
-  static const StartConsoleRequest& default_instance() {
-    return *internal_default_instance();
-  }
-  static inline const StartConsoleRequest* internal_default_instance() {
-    return reinterpret_cast<const StartConsoleRequest*>(
-               &_StartConsoleRequest_default_instance_);
-  }
-  static constexpr int kIndexInFileMessages =
-    2;
-
-  friend void swap(StartConsoleRequest& a, StartConsoleRequest& b) {
-    a.Swap(&b);
-  }
-  inline void Swap(StartConsoleRequest* other) {
-    if (other == this) return;
-  #ifdef PROTOBUF_FORCE_COPY_IN_SWAP
-    if (GetArena() != nullptr &&
-        GetArena() == other->GetArena()) {
-   #else  // PROTOBUF_FORCE_COPY_IN_SWAP
-    if (GetArena() == other->GetArena()) {
-  #endif  // !PROTOBUF_FORCE_COPY_IN_SWAP
-      InternalSwap(other);
-    } else {
-      ::google::protobuf::internal::GenericSwap(this, other);
-    }
-  }
-  void UnsafeArenaSwap(StartConsoleRequest* other) {
-    if (other == this) return;
-    ABSL_DCHECK(GetArena() == other->GetArena());
-    InternalSwap(other);
-  }
-
-  // implements Message ----------------------------------------------
-
-  StartConsoleRequest* New(::google::protobuf::Arena* arena = nullptr) const final {
-    return CreateMaybeMessage<StartConsoleRequest>(arena);
-  }
-  using ::google::protobuf::Message::CopyFrom;
-  void CopyFrom(const StartConsoleRequest& from);
-  using ::google::protobuf::Message::MergeFrom;
-  void MergeFrom( const StartConsoleRequest& from) {
-    StartConsoleRequest::MergeImpl(*this, from);
-  }
-  private:
-  static void MergeImpl(::google::protobuf::Message& to_msg, const ::google::protobuf::Message& from_msg);
-  public:
-  PROTOBUF_ATTRIBUTE_REINITIALIZES void Clear() final;
-  bool IsInitialized() const final;
-
-  ::size_t ByteSizeLong() const final;
-  const char* _InternalParse(const char* ptr, ::google::protobuf::internal::ParseContext* ctx) final;
-  ::uint8_t* _InternalSerialize(
-      ::uint8_t* target, ::google::protobuf::io::EpsCopyOutputStream* stream) const final;
-  int GetCachedSize() const { return _impl_._cached_size_.Get(); }
-
-  private:
-  ::google::protobuf::internal::CachedSize* AccessCachedSize() const final;
-  void SharedCtor(::google::protobuf::Arena* arena);
-  void SharedDtor();
-  void InternalSwap(StartConsoleRequest* other);
-
-  private:
-  friend class ::google::protobuf::internal::AnyMetadata;
-  static ::absl::string_view FullMessageName() {
-    return "io.deephaven.proto.backplane.script.grpc.StartConsoleRequest";
-  }
-  protected:
-  explicit StartConsoleRequest(::google::protobuf::Arena* arena);
-  StartConsoleRequest(::google::protobuf::Arena* arena, const StartConsoleRequest& from);
-  public:
-
-  static const ClassData _class_data_;
-  const ::google::protobuf::Message::ClassData*GetClassData() const final;
-
-  ::google::protobuf::Metadata GetMetadata() const final;
-
-  // nested types ----------------------------------------------------
-
-  // accessors -------------------------------------------------------
-
-  enum : int {
-    kSessionTypeFieldNumber = 2,
-    kResultIdFieldNumber = 1,
-  };
-  // string session_type = 2;
-  void clear_session_type() ;
-  const std::string& session_type() const;
-  template <typename Arg_ = const std::string&, typename... Args_>
-  void set_session_type(Arg_&& arg, Args_... args);
-  std::string* mutable_session_type();
-  PROTOBUF_NODISCARD std::string* release_session_type();
-  void set_allocated_session_type(std::string* value);
-
-  private:
-  const std::string& _internal_session_type() const;
-  inline PROTOBUF_ALWAYS_INLINE void _internal_set_session_type(
-      const std::string& value);
-  std::string* _internal_mutable_session_type();
-
-  public:
-  // .io.deephaven.proto.backplane.grpc.Ticket result_id = 1;
-  bool has_result_id() const;
-  void clear_result_id() ;
-  const ::io::deephaven::proto::backplane::grpc::Ticket& result_id() const;
-  PROTOBUF_NODISCARD ::io::deephaven::proto::backplane::grpc::Ticket* release_result_id();
-  ::io::deephaven::proto::backplane::grpc::Ticket* mutable_result_id();
-  void set_allocated_result_id(::io::deephaven::proto::backplane::grpc::Ticket* value);
-  void unsafe_arena_set_allocated_result_id(::io::deephaven::proto::backplane::grpc::Ticket* value);
-  ::io::deephaven::proto::backplane::grpc::Ticket* unsafe_arena_release_result_id();
-
-  private:
-  const ::io::deephaven::proto::backplane::grpc::Ticket& _internal_result_id() const;
-  ::io::deephaven::proto::backplane::grpc::Ticket* _internal_mutable_result_id();
-
-  public:
-  // @@protoc_insertion_point(class_scope:io.deephaven.proto.backplane.script.grpc.StartConsoleRequest)
- private:
-  class _Internal;
-
-  friend class ::google::protobuf::internal::TcParser;
-  static const ::google::protobuf::internal::TcParseTable<
-      1, 2, 1,
-      81, 2>
-      _table_;
-  friend class ::google::protobuf::MessageLite;
-  friend class ::google::protobuf::Arena;
-  template <typename T>
-  friend class ::google::protobuf::Arena::InternalHelper;
-  using InternalArenaConstructable_ = void;
-  using DestructorSkippable_ = void;
-  struct Impl_ {
-
-        inline explicit constexpr Impl_(
-            ::google::protobuf::internal::ConstantInitialized) noexcept;
-        inline explicit Impl_(::google::protobuf::internal::InternalVisibility visibility,
-                              ::google::protobuf::Arena* arena);
-        inline explicit Impl_(::google::protobuf::internal::InternalVisibility visibility,
-                              ::google::protobuf::Arena* arena, const Impl_& from);
-    ::google::protobuf::internal::HasBits<1> _has_bits_;
-    mutable ::google::protobuf::internal::CachedSize _cached_size_;
-    ::google::protobuf::internal::ArenaStringPtr session_type_;
-    ::io::deephaven::proto::backplane::grpc::Ticket* result_id_;
-    PROTOBUF_TSAN_DECLARE_MEMBER
-  };
-  union { Impl_ _impl_; };
-  friend struct ::TableStruct_deephaven_2fproto_2fconsole_2eproto;
-};// -------------------------------------------------------------------
-
-class ParameterInformation final :
-    public ::google::protobuf::Message /* @@protoc_insertion_point(class_definition:io.deephaven.proto.backplane.script.grpc.ParameterInformation) */ {
- public:
-  inline ParameterInformation() : ParameterInformation(nullptr) {}
-  ~ParameterInformation() override;
-  template<typename = void>
-  explicit PROTOBUF_CONSTEXPR ParameterInformation(::google::protobuf::internal::ConstantInitialized);
-
-  inline ParameterInformation(const ParameterInformation& from)
-      : ParameterInformation(nullptr, from) {}
-  ParameterInformation(ParameterInformation&& from) noexcept
-    : ParameterInformation() {
-    *this = ::std::move(from);
-  }
-
-  inline ParameterInformation& operator=(const ParameterInformation& from) {
-    CopyFrom(from);
-    return *this;
-  }
-  inline ParameterInformation& operator=(ParameterInformation&& from) noexcept {
-    if (this == &from) return *this;
-    if (GetArena() == from.GetArena()
-  #ifdef PROTOBUF_FORCE_COPY_IN_MOVE
-        && GetArena() != nullptr
-  #endif  // !PROTOBUF_FORCE_COPY_IN_MOVE
-    ) {
-      InternalSwap(&from);
-    } else {
-      CopyFrom(from);
-    }
-    return *this;
-  }
-
-  inline const ::google::protobuf::UnknownFieldSet& unknown_fields() const
-      ABSL_ATTRIBUTE_LIFETIME_BOUND {
-    return _internal_metadata_.unknown_fields<::google::protobuf::UnknownFieldSet>(::google::protobuf::UnknownFieldSet::default_instance);
-  }
-  inline ::google::protobuf::UnknownFieldSet* mutable_unknown_fields()
-      ABSL_ATTRIBUTE_LIFETIME_BOUND {
-    return _internal_metadata_.mutable_unknown_fields<::google::protobuf::UnknownFieldSet>();
-  }
-
-  static const ::google::protobuf::Descriptor* descriptor() {
-    return GetDescriptor();
-  }
-  static const ::google::protobuf::Descriptor* GetDescriptor() {
-    return default_instance().GetMetadata().descriptor;
-  }
-  static const ::google::protobuf::Reflection* GetReflection() {
-    return default_instance().GetMetadata().reflection;
-  }
-  static const ParameterInformation& default_instance() {
-    return *internal_default_instance();
-  }
-  static inline const ParameterInformation* internal_default_instance() {
-    return reinterpret_cast<const ParameterInformation*>(
-               &_ParameterInformation_default_instance_);
-  }
-  static constexpr int kIndexInFileMessages =
-    37;
-
-  friend void swap(ParameterInformation& a, ParameterInformation& b) {
-    a.Swap(&b);
-  }
-  inline void Swap(ParameterInformation* other) {
-    if (other == this) return;
-  #ifdef PROTOBUF_FORCE_COPY_IN_SWAP
-    if (GetArena() != nullptr &&
-        GetArena() == other->GetArena()) {
-   #else  // PROTOBUF_FORCE_COPY_IN_SWAP
-    if (GetArena() == other->GetArena()) {
-  #endif  // !PROTOBUF_FORCE_COPY_IN_SWAP
-      InternalSwap(other);
-    } else {
-      ::google::protobuf::internal::GenericSwap(this, other);
-    }
-  }
-  void UnsafeArenaSwap(ParameterInformation* other) {
-    if (other == this) return;
-    ABSL_DCHECK(GetArena() == other->GetArena());
-    InternalSwap(other);
-  }
-
-  // implements Message ----------------------------------------------
-
-  ParameterInformation* New(::google::protobuf::Arena* arena = nullptr) const final {
-    return CreateMaybeMessage<ParameterInformation>(arena);
-  }
-  using ::google::protobuf::Message::CopyFrom;
-  void CopyFrom(const ParameterInformation& from);
-  using ::google::protobuf::Message::MergeFrom;
-  void MergeFrom( const ParameterInformation& from) {
-    ParameterInformation::MergeImpl(*this, from);
-  }
-  private:
-  static void MergeImpl(::google::protobuf::Message& to_msg, const ::google::protobuf::Message& from_msg);
-  public:
-  PROTOBUF_ATTRIBUTE_REINITIALIZES void Clear() final;
-  bool IsInitialized() const final;
-
-  ::size_t ByteSizeLong() const final;
-  const char* _InternalParse(const char* ptr, ::google::protobuf::internal::ParseContext* ctx) final;
-  ::uint8_t* _InternalSerialize(
-      ::uint8_t* target, ::google::protobuf::io::EpsCopyOutputStream* stream) const final;
-  int GetCachedSize() const { return _impl_._cached_size_.Get(); }
-
-  private:
-  ::google::protobuf::internal::CachedSize* AccessCachedSize() const final;
-  void SharedCtor(::google::protobuf::Arena* arena);
-  void SharedDtor();
-  void InternalSwap(ParameterInformation* other);
-
-  private:
-  friend class ::google::protobuf::internal::AnyMetadata;
-  static ::absl::string_view FullMessageName() {
-    return "io.deephaven.proto.backplane.script.grpc.ParameterInformation";
-  }
-  protected:
-  explicit ParameterInformation(::google::protobuf::Arena* arena);
-  ParameterInformation(::google::protobuf::Arena* arena, const ParameterInformation& from);
-  public:
-
-  static const ClassData _class_data_;
-  const ::google::protobuf::Message::ClassData*GetClassData() const final;
-
-  ::google::protobuf::Metadata GetMetadata() const final;
-
-  // nested types ----------------------------------------------------
-
-  // accessors -------------------------------------------------------
-
-  enum : int {
-    kLabelFieldNumber = 1,
-    kDocumentationFieldNumber = 2,
-  };
-  // string label = 1;
-  void clear_label() ;
-  const std::string& label() const;
-  template <typename Arg_ = const std::string&, typename... Args_>
-  void set_label(Arg_&& arg, Args_... args);
-  std::string* mutable_label();
-  PROTOBUF_NODISCARD std::string* release_label();
-  void set_allocated_label(std::string* value);
-
-  private:
-  const std::string& _internal_label() const;
-  inline PROTOBUF_ALWAYS_INLINE void _internal_set_label(
-      const std::string& value);
-  std::string* _internal_mutable_label();
-
-  public:
-  // .io.deephaven.proto.backplane.script.grpc.MarkupContent documentation = 2;
-  bool has_documentation() const;
-  void clear_documentation() ;
-  const ::io::deephaven::proto::backplane::script::grpc::MarkupContent& documentation() const;
-  PROTOBUF_NODISCARD ::io::deephaven::proto::backplane::script::grpc::MarkupContent* release_documentation();
-  ::io::deephaven::proto::backplane::script::grpc::MarkupContent* mutable_documentation();
-  void set_allocated_documentation(::io::deephaven::proto::backplane::script::grpc::MarkupContent* value);
-  void unsafe_arena_set_allocated_documentation(::io::deephaven::proto::backplane::script::grpc::MarkupContent* value);
-  ::io::deephaven::proto::backplane::script::grpc::MarkupContent* unsafe_arena_release_documentation();
-
-  private:
-  const ::io::deephaven::proto::backplane::script::grpc::MarkupContent& _internal_documentation() const;
-  ::io::deephaven::proto::backplane::script::grpc::MarkupContent* _internal_mutable_documentation();
-
-  public:
-  // @@protoc_insertion_point(class_scope:io.deephaven.proto.backplane.script.grpc.ParameterInformation)
- private:
-  class _Internal;
-
-  friend class ::google::protobuf::internal::TcParser;
-  static const ::google::protobuf::internal::TcParseTable<
-      1, 2, 1,
-      75, 2>
-      _table_;
-  friend class ::google::protobuf::MessageLite;
-  friend class ::google::protobuf::Arena;
-  template <typename T>
-  friend class ::google::protobuf::Arena::InternalHelper;
-  using InternalArenaConstructable_ = void;
-  using DestructorSkippable_ = void;
-  struct Impl_ {
-
-        inline explicit constexpr Impl_(
-            ::google::protobuf::internal::ConstantInitialized) noexcept;
-        inline explicit Impl_(::google::protobuf::internal::InternalVisibility visibility,
-                              ::google::protobuf::Arena* arena);
-        inline explicit Impl_(::google::protobuf::internal::InternalVisibility visibility,
-                              ::google::protobuf::Arena* arena, const Impl_& from);
-    ::google::protobuf::internal::HasBits<1> _has_bits_;
-    mutable ::google::protobuf::internal::CachedSize _cached_size_;
-    ::google::protobuf::internal::ArenaStringPtr label_;
-    ::io::deephaven::proto::backplane::script::grpc::MarkupContent* documentation_;
-    PROTOBUF_TSAN_DECLARE_MEMBER
-  };
-  union { Impl_ _impl_; };
-  friend struct ::TableStruct_deephaven_2fproto_2fconsole_2eproto;
-};// -------------------------------------------------------------------
-
-class OpenDocumentRequest final :
-    public ::google::protobuf::Message /* @@protoc_insertion_point(class_definition:io.deephaven.proto.backplane.script.grpc.OpenDocumentRequest) */ {
- public:
-  inline OpenDocumentRequest() : OpenDocumentRequest(nullptr) {}
-  ~OpenDocumentRequest() override;
-  template<typename = void>
-  explicit PROTOBUF_CONSTEXPR OpenDocumentRequest(::google::protobuf::internal::ConstantInitialized);
-
-  inline OpenDocumentRequest(const OpenDocumentRequest& from)
-      : OpenDocumentRequest(nullptr, from) {}
-  OpenDocumentRequest(OpenDocumentRequest&& from) noexcept
-    : OpenDocumentRequest() {
-    *this = ::std::move(from);
-  }
-
-  inline OpenDocumentRequest& operator=(const OpenDocumentRequest& from) {
-    CopyFrom(from);
-    return *this;
-  }
-  inline OpenDocumentRequest& operator=(OpenDocumentRequest&& from) noexcept {
-    if (this == &from) return *this;
-    if (GetArena() == from.GetArena()
-  #ifdef PROTOBUF_FORCE_COPY_IN_MOVE
-        && GetArena() != nullptr
-  #endif  // !PROTOBUF_FORCE_COPY_IN_MOVE
-    ) {
-      InternalSwap(&from);
-    } else {
-      CopyFrom(from);
-    }
-    return *this;
-  }
-
-  inline const ::google::protobuf::UnknownFieldSet& unknown_fields() const
-      ABSL_ATTRIBUTE_LIFETIME_BOUND {
-    return _internal_metadata_.unknown_fields<::google::protobuf::UnknownFieldSet>(::google::protobuf::UnknownFieldSet::default_instance);
-  }
-  inline ::google::protobuf::UnknownFieldSet* mutable_unknown_fields()
-      ABSL_ATTRIBUTE_LIFETIME_BOUND {
-    return _internal_metadata_.mutable_unknown_fields<::google::protobuf::UnknownFieldSet>();
-  }
-
-  static const ::google::protobuf::Descriptor* descriptor() {
-    return GetDescriptor();
-  }
-  static const ::google::protobuf::Descriptor* GetDescriptor() {
-    return default_instance().GetMetadata().descriptor;
-  }
-  static const ::google::protobuf::Reflection* GetReflection() {
-    return default_instance().GetMetadata().reflection;
-  }
-  static const OpenDocumentRequest& default_instance() {
-    return *internal_default_instance();
-  }
-  static inline const OpenDocumentRequest* internal_default_instance() {
-    return reinterpret_cast<const OpenDocumentRequest*>(
-               &_OpenDocumentRequest_default_instance_);
-  }
-  static constexpr int kIndexInFileMessages =
-    19;
-
-  friend void swap(OpenDocumentRequest& a, OpenDocumentRequest& b) {
-    a.Swap(&b);
-  }
-  inline void Swap(OpenDocumentRequest* other) {
-    if (other == this) return;
-  #ifdef PROTOBUF_FORCE_COPY_IN_SWAP
-    if (GetArena() != nullptr &&
-        GetArena() == other->GetArena()) {
-   #else  // PROTOBUF_FORCE_COPY_IN_SWAP
-    if (GetArena() == other->GetArena()) {
-  #endif  // !PROTOBUF_FORCE_COPY_IN_SWAP
-      InternalSwap(other);
-    } else {
-      ::google::protobuf::internal::GenericSwap(this, other);
-    }
-  }
-  void UnsafeArenaSwap(OpenDocumentRequest* other) {
-    if (other == this) return;
-    ABSL_DCHECK(GetArena() == other->GetArena());
-    InternalSwap(other);
-  }
-
-  // implements Message ----------------------------------------------
-
-  OpenDocumentRequest* New(::google::protobuf::Arena* arena = nullptr) const final {
-    return CreateMaybeMessage<OpenDocumentRequest>(arena);
-  }
-  using ::google::protobuf::Message::CopyFrom;
-  void CopyFrom(const OpenDocumentRequest& from);
-  using ::google::protobuf::Message::MergeFrom;
-  void MergeFrom( const OpenDocumentRequest& from) {
-    OpenDocumentRequest::MergeImpl(*this, from);
-  }
-  private:
-  static void MergeImpl(::google::protobuf::Message& to_msg, const ::google::protobuf::Message& from_msg);
-  public:
-  PROTOBUF_ATTRIBUTE_REINITIALIZES void Clear() final;
-  bool IsInitialized() const final;
-
-  ::size_t ByteSizeLong() const final;
-  const char* _InternalParse(const char* ptr, ::google::protobuf::internal::ParseContext* ctx) final;
-  ::uint8_t* _InternalSerialize(
-      ::uint8_t* target, ::google::protobuf::io::EpsCopyOutputStream* stream) const final;
-  int GetCachedSize() const { return _impl_._cached_size_.Get(); }
-
-  private:
-  ::google::protobuf::internal::CachedSize* AccessCachedSize() const final;
-  void SharedCtor(::google::protobuf::Arena* arena);
-  void SharedDtor();
-  void InternalSwap(OpenDocumentRequest* other);
-
-  private:
-  friend class ::google::protobuf::internal::AnyMetadata;
-  static ::absl::string_view FullMessageName() {
-    return "io.deephaven.proto.backplane.script.grpc.OpenDocumentRequest";
-  }
-  protected:
-  explicit OpenDocumentRequest(::google::protobuf::Arena* arena);
-  OpenDocumentRequest(::google::protobuf::Arena* arena, const OpenDocumentRequest& from);
-  public:
-
-  static const ClassData _class_data_;
-  const ::google::protobuf::Message::ClassData*GetClassData() const final;
-
-  ::google::protobuf::Metadata GetMetadata() const final;
-
-  // nested types ----------------------------------------------------
-
-  // accessors -------------------------------------------------------
-
-  enum : int {
-    kConsoleIdFieldNumber = 1,
-    kTextDocumentFieldNumber = 2,
-  };
-  // .io.deephaven.proto.backplane.grpc.Ticket console_id = 1 [deprecated = true];
-  [[deprecated]]  bool has_console_id() const;
-  [[deprecated]]  void clear_console_id() ;
-  [[deprecated]] const ::io::deephaven::proto::backplane::grpc::Ticket& console_id() const;
-  [[deprecated]] PROTOBUF_NODISCARD ::io::deephaven::proto::backplane::grpc::Ticket* release_console_id();
-  [[deprecated]] ::io::deephaven::proto::backplane::grpc::Ticket* mutable_console_id();
-  [[deprecated]] void set_allocated_console_id(::io::deephaven::proto::backplane::grpc::Ticket* value);
-  [[deprecated]] void unsafe_arena_set_allocated_console_id(::io::deephaven::proto::backplane::grpc::Ticket* value);
-  [[deprecated]] ::io::deephaven::proto::backplane::grpc::Ticket* unsafe_arena_release_console_id();
-
-  private:
-  const ::io::deephaven::proto::backplane::grpc::Ticket& _internal_console_id() const;
-  ::io::deephaven::proto::backplane::grpc::Ticket* _internal_mutable_console_id();
-
-  public:
-  // .io.deephaven.proto.backplane.script.grpc.TextDocumentItem text_document = 2;
-  bool has_text_document() const;
-  void clear_text_document() ;
-  const ::io::deephaven::proto::backplane::script::grpc::TextDocumentItem& text_document() const;
-  PROTOBUF_NODISCARD ::io::deephaven::proto::backplane::script::grpc::TextDocumentItem* release_text_document();
-  ::io::deephaven::proto::backplane::script::grpc::TextDocumentItem* mutable_text_document();
-  void set_allocated_text_document(::io::deephaven::proto::backplane::script::grpc::TextDocumentItem* value);
-  void unsafe_arena_set_allocated_text_document(::io::deephaven::proto::backplane::script::grpc::TextDocumentItem* value);
-  ::io::deephaven::proto::backplane::script::grpc::TextDocumentItem* unsafe_arena_release_text_document();
-
-  private:
-  const ::io::deephaven::proto::backplane::script::grpc::TextDocumentItem& _internal_text_document() const;
-  ::io::deephaven::proto::backplane::script::grpc::TextDocumentItem* _internal_mutable_text_document();
-
-  public:
-  // @@protoc_insertion_point(class_scope:io.deephaven.proto.backplane.script.grpc.OpenDocumentRequest)
- private:
-  class _Internal;
-
-  friend class ::google::protobuf::internal::TcParser;
-  static const ::google::protobuf::internal::TcParseTable<
-      1, 2, 2,
-      0, 2>
-      _table_;
-  friend class ::google::protobuf::MessageLite;
-  friend class ::google::protobuf::Arena;
-  template <typename T>
-  friend class ::google::protobuf::Arena::InternalHelper;
-  using InternalArenaConstructable_ = void;
-  using DestructorSkippable_ = void;
-  struct Impl_ {
-
-        inline explicit constexpr Impl_(
-            ::google::protobuf::internal::ConstantInitialized) noexcept;
-        inline explicit Impl_(::google::protobuf::internal::InternalVisibility visibility,
-                              ::google::protobuf::Arena* arena);
-        inline explicit Impl_(::google::protobuf::internal::InternalVisibility visibility,
-                              ::google::protobuf::Arena* arena, const Impl_& from);
-    ::google::protobuf::internal::HasBits<1> _has_bits_;
-    mutable ::google::protobuf::internal::CachedSize _cached_size_;
-    ::io::deephaven::proto::backplane::grpc::Ticket* console_id_;
-    ::io::deephaven::proto::backplane::script::grpc::TextDocumentItem* text_document_;
-    PROTOBUF_TSAN_DECLARE_MEMBER
-  };
-  union { Impl_ _impl_; };
-  friend struct ::TableStruct_deephaven_2fproto_2fconsole_2eproto;
-};// -------------------------------------------------------------------
-
-class GetHoverRequest final :
-    public ::google::protobuf::Message /* @@protoc_insertion_point(class_definition:io.deephaven.proto.backplane.script.grpc.GetHoverRequest) */ {
- public:
-  inline GetHoverRequest() : GetHoverRequest(nullptr) {}
-  ~GetHoverRequest() override;
-  template<typename = void>
-  explicit PROTOBUF_CONSTEXPR GetHoverRequest(::google::protobuf::internal::ConstantInitialized);
-
-  inline GetHoverRequest(const GetHoverRequest& from)
-      : GetHoverRequest(nullptr, from) {}
-  GetHoverRequest(GetHoverRequest&& from) noexcept
-    : GetHoverRequest() {
-    *this = ::std::move(from);
-  }
-
-  inline GetHoverRequest& operator=(const GetHoverRequest& from) {
-    CopyFrom(from);
-    return *this;
-  }
-  inline GetHoverRequest& operator=(GetHoverRequest&& from) noexcept {
-    if (this == &from) return *this;
-    if (GetArena() == from.GetArena()
-  #ifdef PROTOBUF_FORCE_COPY_IN_MOVE
-        && GetArena() != nullptr
-  #endif  // !PROTOBUF_FORCE_COPY_IN_MOVE
-    ) {
-      InternalSwap(&from);
-    } else {
-      CopyFrom(from);
-    }
-    return *this;
-  }
-
-  inline const ::google::protobuf::UnknownFieldSet& unknown_fields() const
-      ABSL_ATTRIBUTE_LIFETIME_BOUND {
-    return _internal_metadata_.unknown_fields<::google::protobuf::UnknownFieldSet>(::google::protobuf::UnknownFieldSet::default_instance);
-  }
-  inline ::google::protobuf::UnknownFieldSet* mutable_unknown_fields()
-      ABSL_ATTRIBUTE_LIFETIME_BOUND {
-    return _internal_metadata_.mutable_unknown_fields<::google::protobuf::UnknownFieldSet>();
-  }
-
-  static const ::google::protobuf::Descriptor* descriptor() {
-    return GetDescriptor();
-  }
-  static const ::google::protobuf::Descriptor* GetDescriptor() {
-    return default_instance().GetMetadata().descriptor;
-  }
-  static const ::google::protobuf::Reflection* GetReflection() {
-    return default_instance().GetMetadata().reflection;
-  }
-  static const GetHoverRequest& default_instance() {
-    return *internal_default_instance();
-  }
-  static inline const GetHoverRequest* internal_default_instance() {
-    return reinterpret_cast<const GetHoverRequest*>(
-               &_GetHoverRequest_default_instance_);
-  }
-  static constexpr int kIndexInFileMessages =
-    38;
-
-  friend void swap(GetHoverRequest& a, GetHoverRequest& b) {
-    a.Swap(&b);
-  }
-  inline void Swap(GetHoverRequest* other) {
-    if (other == this) return;
-  #ifdef PROTOBUF_FORCE_COPY_IN_SWAP
-    if (GetArena() != nullptr &&
-        GetArena() == other->GetArena()) {
-   #else  // PROTOBUF_FORCE_COPY_IN_SWAP
-    if (GetArena() == other->GetArena()) {
-  #endif  // !PROTOBUF_FORCE_COPY_IN_SWAP
-      InternalSwap(other);
-    } else {
-      ::google::protobuf::internal::GenericSwap(this, other);
-    }
-  }
-  void UnsafeArenaSwap(GetHoverRequest* other) {
-    if (other == this) return;
-    ABSL_DCHECK(GetArena() == other->GetArena());
-    InternalSwap(other);
-  }
-
-  // implements Message ----------------------------------------------
-
-  GetHoverRequest* New(::google::protobuf::Arena* arena = nullptr) const final {
-    return CreateMaybeMessage<GetHoverRequest>(arena);
-  }
-  using ::google::protobuf::Message::CopyFrom;
-  void CopyFrom(const GetHoverRequest& from);
-  using ::google::protobuf::Message::MergeFrom;
-  void MergeFrom( const GetHoverRequest& from) {
-    GetHoverRequest::MergeImpl(*this, from);
-  }
-  private:
-  static void MergeImpl(::google::protobuf::Message& to_msg, const ::google::protobuf::Message& from_msg);
-  public:
-  PROTOBUF_ATTRIBUTE_REINITIALIZES void Clear() final;
-  bool IsInitialized() const final;
-
-  ::size_t ByteSizeLong() const final;
-  const char* _InternalParse(const char* ptr, ::google::protobuf::internal::ParseContext* ctx) final;
-  ::uint8_t* _InternalSerialize(
-      ::uint8_t* target, ::google::protobuf::io::EpsCopyOutputStream* stream) const final;
-  int GetCachedSize() const { return _impl_._cached_size_.Get(); }
-
-  private:
-  ::google::protobuf::internal::CachedSize* AccessCachedSize() const final;
-  void SharedCtor(::google::protobuf::Arena* arena);
-  void SharedDtor();
-  void InternalSwap(GetHoverRequest* other);
-
-  private:
-  friend class ::google::protobuf::internal::AnyMetadata;
-  static ::absl::string_view FullMessageName() {
-    return "io.deephaven.proto.backplane.script.grpc.GetHoverRequest";
-  }
-  protected:
-  explicit GetHoverRequest(::google::protobuf::Arena* arena);
-  GetHoverRequest(::google::protobuf::Arena* arena, const GetHoverRequest& from);
-  public:
-
-  static const ClassData _class_data_;
-  const ::google::protobuf::Message::ClassData*GetClassData() const final;
-
-  ::google::protobuf::Metadata GetMetadata() const final;
-
-  // nested types ----------------------------------------------------
-
-  // accessors -------------------------------------------------------
-
-  enum : int {
-    kTextDocumentFieldNumber = 1,
-    kPositionFieldNumber = 2,
-  };
-  // .io.deephaven.proto.backplane.script.grpc.VersionedTextDocumentIdentifier text_document = 1;
-  bool has_text_document() const;
-  void clear_text_document() ;
-  const ::io::deephaven::proto::backplane::script::grpc::VersionedTextDocumentIdentifier& text_document() const;
-  PROTOBUF_NODISCARD ::io::deephaven::proto::backplane::script::grpc::VersionedTextDocumentIdentifier* release_text_document();
-  ::io::deephaven::proto::backplane::script::grpc::VersionedTextDocumentIdentifier* mutable_text_document();
-  void set_allocated_text_document(::io::deephaven::proto::backplane::script::grpc::VersionedTextDocumentIdentifier* value);
-  void unsafe_arena_set_allocated_text_document(::io::deephaven::proto::backplane::script::grpc::VersionedTextDocumentIdentifier* value);
-  ::io::deephaven::proto::backplane::script::grpc::VersionedTextDocumentIdentifier* unsafe_arena_release_text_document();
-
-  private:
-  const ::io::deephaven::proto::backplane::script::grpc::VersionedTextDocumentIdentifier& _internal_text_document() const;
-  ::io::deephaven::proto::backplane::script::grpc::VersionedTextDocumentIdentifier* _internal_mutable_text_document();
-
-  public:
-  // .io.deephaven.proto.backplane.script.grpc.Position position = 2;
-  bool has_position() const;
-  void clear_position() ;
-  const ::io::deephaven::proto::backplane::script::grpc::Position& position() const;
-  PROTOBUF_NODISCARD ::io::deephaven::proto::backplane::script::grpc::Position* release_position();
-  ::io::deephaven::proto::backplane::script::grpc::Position* mutable_position();
-  void set_allocated_position(::io::deephaven::proto::backplane::script::grpc::Position* value);
-  void unsafe_arena_set_allocated_position(::io::deephaven::proto::backplane::script::grpc::Position* value);
-  ::io::deephaven::proto::backplane::script::grpc::Position* unsafe_arena_release_position();
-
-  private:
-  const ::io::deephaven::proto::backplane::script::grpc::Position& _internal_position() const;
-  ::io::deephaven::proto::backplane::script::grpc::Position* _internal_mutable_position();
-
-  public:
-  // @@protoc_insertion_point(class_scope:io.deephaven.proto.backplane.script.grpc.GetHoverRequest)
- private:
-  class _Internal;
-
-  friend class ::google::protobuf::internal::TcParser;
-  static const ::google::protobuf::internal::TcParseTable<
-      1, 2, 2,
-      0, 2>
-      _table_;
-  friend class ::google::protobuf::MessageLite;
-  friend class ::google::protobuf::Arena;
-  template <typename T>
-  friend class ::google::protobuf::Arena::InternalHelper;
-  using InternalArenaConstructable_ = void;
-  using DestructorSkippable_ = void;
-  struct Impl_ {
-
-        inline explicit constexpr Impl_(
-            ::google::protobuf::internal::ConstantInitialized) noexcept;
-        inline explicit Impl_(::google::protobuf::internal::InternalVisibility visibility,
-                              ::google::protobuf::Arena* arena);
-        inline explicit Impl_(::google::protobuf::internal::InternalVisibility visibility,
-                              ::google::protobuf::Arena* arena, const Impl_& from);
-    ::google::protobuf::internal::HasBits<1> _has_bits_;
-    mutable ::google::protobuf::internal::CachedSize _cached_size_;
-    ::io::deephaven::proto::backplane::script::grpc::VersionedTextDocumentIdentifier* text_document_;
-    ::io::deephaven::proto::backplane::script::grpc::Position* position_;
-    PROTOBUF_TSAN_DECLARE_MEMBER
-  };
-  union { Impl_ _impl_; };
-  friend struct ::TableStruct_deephaven_2fproto_2fconsole_2eproto;
-};// -------------------------------------------------------------------
-
-class GetDiagnosticRequest final :
-    public ::google::protobuf::Message /* @@protoc_insertion_point(class_definition:io.deephaven.proto.backplane.script.grpc.GetDiagnosticRequest) */ {
- public:
-  inline GetDiagnosticRequest() : GetDiagnosticRequest(nullptr) {}
-  ~GetDiagnosticRequest() override;
-  template<typename = void>
-  explicit PROTOBUF_CONSTEXPR GetDiagnosticRequest(::google::protobuf::internal::ConstantInitialized);
-
-  inline GetDiagnosticRequest(const GetDiagnosticRequest& from)
-      : GetDiagnosticRequest(nullptr, from) {}
-  GetDiagnosticRequest(GetDiagnosticRequest&& from) noexcept
-    : GetDiagnosticRequest() {
-    *this = ::std::move(from);
-  }
-
-  inline GetDiagnosticRequest& operator=(const GetDiagnosticRequest& from) {
-    CopyFrom(from);
-    return *this;
-  }
-  inline GetDiagnosticRequest& operator=(GetDiagnosticRequest&& from) noexcept {
-    if (this == &from) return *this;
-    if (GetArena() == from.GetArena()
-  #ifdef PROTOBUF_FORCE_COPY_IN_MOVE
-        && GetArena() != nullptr
-  #endif  // !PROTOBUF_FORCE_COPY_IN_MOVE
-    ) {
-      InternalSwap(&from);
-    } else {
-      CopyFrom(from);
-    }
-    return *this;
-  }
-
-  inline const ::google::protobuf::UnknownFieldSet& unknown_fields() const
-      ABSL_ATTRIBUTE_LIFETIME_BOUND {
-    return _internal_metadata_.unknown_fields<::google::protobuf::UnknownFieldSet>(::google::protobuf::UnknownFieldSet::default_instance);
-  }
-  inline ::google::protobuf::UnknownFieldSet* mutable_unknown_fields()
-      ABSL_ATTRIBUTE_LIFETIME_BOUND {
-    return _internal_metadata_.mutable_unknown_fields<::google::protobuf::UnknownFieldSet>();
-  }
-
-  static const ::google::protobuf::Descriptor* descriptor() {
-    return GetDescriptor();
-  }
-  static const ::google::protobuf::Descriptor* GetDescriptor() {
-    return default_instance().GetMetadata().descriptor;
-  }
-  static const ::google::protobuf::Reflection* GetReflection() {
-    return default_instance().GetMetadata().reflection;
-  }
-  static const GetDiagnosticRequest& default_instance() {
-    return *internal_default_instance();
-  }
-  static inline const GetDiagnosticRequest* internal_default_instance() {
-    return reinterpret_cast<const GetDiagnosticRequest*>(
-               &_GetDiagnosticRequest_default_instance_);
-  }
-  static constexpr int kIndexInFileMessages =
-    40;
-
-  friend void swap(GetDiagnosticRequest& a, GetDiagnosticRequest& b) {
-    a.Swap(&b);
-  }
-  inline void Swap(GetDiagnosticRequest* other) {
-    if (other == this) return;
-  #ifdef PROTOBUF_FORCE_COPY_IN_SWAP
-    if (GetArena() != nullptr &&
-        GetArena() == other->GetArena()) {
-   #else  // PROTOBUF_FORCE_COPY_IN_SWAP
-    if (GetArena() == other->GetArena()) {
-  #endif  // !PROTOBUF_FORCE_COPY_IN_SWAP
-      InternalSwap(other);
-    } else {
-      ::google::protobuf::internal::GenericSwap(this, other);
-    }
-  }
-  void UnsafeArenaSwap(GetDiagnosticRequest* other) {
-    if (other == this) return;
-    ABSL_DCHECK(GetArena() == other->GetArena());
-    InternalSwap(other);
-  }
-
-  // implements Message ----------------------------------------------
-
-  GetDiagnosticRequest* New(::google::protobuf::Arena* arena = nullptr) const final {
-    return CreateMaybeMessage<GetDiagnosticRequest>(arena);
-  }
-  using ::google::protobuf::Message::CopyFrom;
-  void CopyFrom(const GetDiagnosticRequest& from);
-  using ::google::protobuf::Message::MergeFrom;
-  void MergeFrom( const GetDiagnosticRequest& from) {
-    GetDiagnosticRequest::MergeImpl(*this, from);
-  }
-  private:
-  static void MergeImpl(::google::protobuf::Message& to_msg, const ::google::protobuf::Message& from_msg);
-  public:
-  PROTOBUF_ATTRIBUTE_REINITIALIZES void Clear() final;
-  bool IsInitialized() const final;
-
-  ::size_t ByteSizeLong() const final;
-  const char* _InternalParse(const char* ptr, ::google::protobuf::internal::ParseContext* ctx) final;
-  ::uint8_t* _InternalSerialize(
-      ::uint8_t* target, ::google::protobuf::io::EpsCopyOutputStream* stream) const final;
-  int GetCachedSize() const { return _impl_._cached_size_.Get(); }
-
-  private:
-  ::google::protobuf::internal::CachedSize* AccessCachedSize() const final;
-  void SharedCtor(::google::protobuf::Arena* arena);
-  void SharedDtor();
-  void InternalSwap(GetDiagnosticRequest* other);
-
-  private:
-  friend class ::google::protobuf::internal::AnyMetadata;
-  static ::absl::string_view FullMessageName() {
-    return "io.deephaven.proto.backplane.script.grpc.GetDiagnosticRequest";
-  }
-  protected:
-  explicit GetDiagnosticRequest(::google::protobuf::Arena* arena);
-  GetDiagnosticRequest(::google::protobuf::Arena* arena, const GetDiagnosticRequest& from);
-  public:
-
-  static const ClassData _class_data_;
-  const ::google::protobuf::Message::ClassData*GetClassData() const final;
-
-  ::google::protobuf::Metadata GetMetadata() const final;
-
-  // nested types ----------------------------------------------------
-
-  // accessors -------------------------------------------------------
-
-  enum : int {
-    kIdentifierFieldNumber = 2,
-    kPreviousResultIdFieldNumber = 3,
-    kTextDocumentFieldNumber = 1,
-  };
-  // optional string identifier = 2;
-  bool has_identifier() const;
-  void clear_identifier() ;
-  const std::string& identifier() const;
-  template <typename Arg_ = const std::string&, typename... Args_>
-  void set_identifier(Arg_&& arg, Args_... args);
-  std::string* mutable_identifier();
-  PROTOBUF_NODISCARD std::string* release_identifier();
-  void set_allocated_identifier(std::string* value);
-
-  private:
-  const std::string& _internal_identifier() const;
-  inline PROTOBUF_ALWAYS_INLINE void _internal_set_identifier(
-      const std::string& value);
-  std::string* _internal_mutable_identifier();
-
-  public:
-  // optional string previous_result_id = 3;
-  bool has_previous_result_id() const;
-  void clear_previous_result_id() ;
-  const std::string& previous_result_id() const;
-  template <typename Arg_ = const std::string&, typename... Args_>
-  void set_previous_result_id(Arg_&& arg, Args_... args);
-  std::string* mutable_previous_result_id();
-  PROTOBUF_NODISCARD std::string* release_previous_result_id();
-  void set_allocated_previous_result_id(std::string* value);
-
-  private:
-  const std::string& _internal_previous_result_id() const;
-  inline PROTOBUF_ALWAYS_INLINE void _internal_set_previous_result_id(
-      const std::string& value);
-  std::string* _internal_mutable_previous_result_id();
-
-  public:
-  // .io.deephaven.proto.backplane.script.grpc.VersionedTextDocumentIdentifier text_document = 1;
-  bool has_text_document() const;
-  void clear_text_document() ;
-  const ::io::deephaven::proto::backplane::script::grpc::VersionedTextDocumentIdentifier& text_document() const;
-  PROTOBUF_NODISCARD ::io::deephaven::proto::backplane::script::grpc::VersionedTextDocumentIdentifier* release_text_document();
-  ::io::deephaven::proto::backplane::script::grpc::VersionedTextDocumentIdentifier* mutable_text_document();
-  void set_allocated_text_document(::io::deephaven::proto::backplane::script::grpc::VersionedTextDocumentIdentifier* value);
-  void unsafe_arena_set_allocated_text_document(::io::deephaven::proto::backplane::script::grpc::VersionedTextDocumentIdentifier* value);
-  ::io::deephaven::proto::backplane::script::grpc::VersionedTextDocumentIdentifier* unsafe_arena_release_text_document();
-
-  private:
-  const ::io::deephaven::proto::backplane::script::grpc::VersionedTextDocumentIdentifier& _internal_text_document() const;
-  ::io::deephaven::proto::backplane::script::grpc::VersionedTextDocumentIdentifier* _internal_mutable_text_document();
-
-  public:
-  // @@protoc_insertion_point(class_scope:io.deephaven.proto.backplane.script.grpc.GetDiagnosticRequest)
- private:
-  class _Internal;
-
-  friend class ::google::protobuf::internal::TcParser;
-  static const ::google::protobuf::internal::TcParseTable<
-      2, 3, 1,
-      98, 2>
-      _table_;
-  friend class ::google::protobuf::MessageLite;
-  friend class ::google::protobuf::Arena;
-  template <typename T>
-  friend class ::google::protobuf::Arena::InternalHelper;
-  using InternalArenaConstructable_ = void;
-  using DestructorSkippable_ = void;
-  struct Impl_ {
-
-        inline explicit constexpr Impl_(
-            ::google::protobuf::internal::ConstantInitialized) noexcept;
-        inline explicit Impl_(::google::protobuf::internal::InternalVisibility visibility,
-                              ::google::protobuf::Arena* arena);
-        inline explicit Impl_(::google::protobuf::internal::InternalVisibility visibility,
-                              ::google::protobuf::Arena* arena, const Impl_& from);
-    ::google::protobuf::internal::HasBits<1> _has_bits_;
-    mutable ::google::protobuf::internal::CachedSize _cached_size_;
-    ::google::protobuf::internal::ArenaStringPtr identifier_;
-    ::google::protobuf::internal::ArenaStringPtr previous_result_id_;
-    ::io::deephaven::proto::backplane::script::grpc::VersionedTextDocumentIdentifier* text_document_;
-    PROTOBUF_TSAN_DECLARE_MEMBER
-  };
-  union { Impl_ _impl_; };
-  friend struct ::TableStruct_deephaven_2fproto_2fconsole_2eproto;
-};// -------------------------------------------------------------------
-
-class GetCompletionItemsRequest final :
-    public ::google::protobuf::Message /* @@protoc_insertion_point(class_definition:io.deephaven.proto.backplane.script.grpc.GetCompletionItemsRequest) */ {
- public:
-  inline GetCompletionItemsRequest() : GetCompletionItemsRequest(nullptr) {}
-  ~GetCompletionItemsRequest() override;
-  template<typename = void>
-  explicit PROTOBUF_CONSTEXPR GetCompletionItemsRequest(::google::protobuf::internal::ConstantInitialized);
-
-  inline GetCompletionItemsRequest(const GetCompletionItemsRequest& from)
-      : GetCompletionItemsRequest(nullptr, from) {}
-  GetCompletionItemsRequest(GetCompletionItemsRequest&& from) noexcept
-    : GetCompletionItemsRequest() {
-    *this = ::std::move(from);
-  }
-
-  inline GetCompletionItemsRequest& operator=(const GetCompletionItemsRequest& from) {
-    CopyFrom(from);
-    return *this;
-  }
-  inline GetCompletionItemsRequest& operator=(GetCompletionItemsRequest&& from) noexcept {
-    if (this == &from) return *this;
-    if (GetArena() == from.GetArena()
-  #ifdef PROTOBUF_FORCE_COPY_IN_MOVE
-        && GetArena() != nullptr
-  #endif  // !PROTOBUF_FORCE_COPY_IN_MOVE
-    ) {
-      InternalSwap(&from);
-    } else {
-      CopyFrom(from);
-    }
-    return *this;
-  }
-
-  inline const ::google::protobuf::UnknownFieldSet& unknown_fields() const
-      ABSL_ATTRIBUTE_LIFETIME_BOUND {
-    return _internal_metadata_.unknown_fields<::google::protobuf::UnknownFieldSet>(::google::protobuf::UnknownFieldSet::default_instance);
-  }
-  inline ::google::protobuf::UnknownFieldSet* mutable_unknown_fields()
-      ABSL_ATTRIBUTE_LIFETIME_BOUND {
-    return _internal_metadata_.mutable_unknown_fields<::google::protobuf::UnknownFieldSet>();
-  }
-
-  static const ::google::protobuf::Descriptor* descriptor() {
-    return GetDescriptor();
-  }
-  static const ::google::protobuf::Descriptor* GetDescriptor() {
-    return default_instance().GetMetadata().descriptor;
-  }
-  static const ::google::protobuf::Reflection* GetReflection() {
-    return default_instance().GetMetadata().reflection;
-  }
-  static const GetCompletionItemsRequest& default_instance() {
-    return *internal_default_instance();
-  }
-  static inline const GetCompletionItemsRequest* internal_default_instance() {
-    return reinterpret_cast<const GetCompletionItemsRequest*>(
-               &_GetCompletionItemsRequest_default_instance_);
-  }
-  static constexpr int kIndexInFileMessages =
-    28;
-
-  friend void swap(GetCompletionItemsRequest& a, GetCompletionItemsRequest& b) {
-    a.Swap(&b);
-  }
-  inline void Swap(GetCompletionItemsRequest* other) {
-    if (other == this) return;
-  #ifdef PROTOBUF_FORCE_COPY_IN_SWAP
-    if (GetArena() != nullptr &&
-        GetArena() == other->GetArena()) {
-   #else  // PROTOBUF_FORCE_COPY_IN_SWAP
-    if (GetArena() == other->GetArena()) {
-  #endif  // !PROTOBUF_FORCE_COPY_IN_SWAP
-      InternalSwap(other);
-    } else {
-      ::google::protobuf::internal::GenericSwap(this, other);
-    }
-  }
-  void UnsafeArenaSwap(GetCompletionItemsRequest* other) {
-    if (other == this) return;
-    ABSL_DCHECK(GetArena() == other->GetArena());
-    InternalSwap(other);
-  }
-
-  // implements Message ----------------------------------------------
-
-  GetCompletionItemsRequest* New(::google::protobuf::Arena* arena = nullptr) const final {
-    return CreateMaybeMessage<GetCompletionItemsRequest>(arena);
-  }
-  using ::google::protobuf::Message::CopyFrom;
-  void CopyFrom(const GetCompletionItemsRequest& from);
-  using ::google::protobuf::Message::MergeFrom;
-  void MergeFrom( const GetCompletionItemsRequest& from) {
-    GetCompletionItemsRequest::MergeImpl(*this, from);
-  }
-  private:
-  static void MergeImpl(::google::protobuf::Message& to_msg, const ::google::protobuf::Message& from_msg);
-  public:
-  PROTOBUF_ATTRIBUTE_REINITIALIZES void Clear() final;
-  bool IsInitialized() const final;
-
-  ::size_t ByteSizeLong() const final;
-  const char* _InternalParse(const char* ptr, ::google::protobuf::internal::ParseContext* ctx) final;
-  ::uint8_t* _InternalSerialize(
-      ::uint8_t* target, ::google::protobuf::io::EpsCopyOutputStream* stream) const final;
-  int GetCachedSize() const { return _impl_._cached_size_.Get(); }
-
-  private:
-  ::google::protobuf::internal::CachedSize* AccessCachedSize() const final;
-  void SharedCtor(::google::protobuf::Arena* arena);
-  void SharedDtor();
-  void InternalSwap(GetCompletionItemsRequest* other);
-
-  private:
-  friend class ::google::protobuf::internal::AnyMetadata;
-  static ::absl::string_view FullMessageName() {
-    return "io.deephaven.proto.backplane.script.grpc.GetCompletionItemsRequest";
-  }
-  protected:
-  explicit GetCompletionItemsRequest(::google::protobuf::Arena* arena);
-  GetCompletionItemsRequest(::google::protobuf::Arena* arena, const GetCompletionItemsRequest& from);
-  public:
-
-  static const ClassData _class_data_;
-  const ::google::protobuf::Message::ClassData*GetClassData() const final;
-
-  ::google::protobuf::Metadata GetMetadata() const final;
-
-  // nested types ----------------------------------------------------
-
-  // accessors -------------------------------------------------------
-
-  enum : int {
-    kConsoleIdFieldNumber = 1,
-    kContextFieldNumber = 2,
-    kTextDocumentFieldNumber = 3,
-    kPositionFieldNumber = 4,
-    kRequestIdFieldNumber = 5,
-  };
-  // .io.deephaven.proto.backplane.grpc.Ticket console_id = 1 [deprecated = true];
-  [[deprecated]]  bool has_console_id() const;
-  [[deprecated]]  void clear_console_id() ;
-  [[deprecated]] const ::io::deephaven::proto::backplane::grpc::Ticket& console_id() const;
-  [[deprecated]] PROTOBUF_NODISCARD ::io::deephaven::proto::backplane::grpc::Ticket* release_console_id();
-  [[deprecated]] ::io::deephaven::proto::backplane::grpc::Ticket* mutable_console_id();
-  [[deprecated]] void set_allocated_console_id(::io::deephaven::proto::backplane::grpc::Ticket* value);
-  [[deprecated]] void unsafe_arena_set_allocated_console_id(::io::deephaven::proto::backplane::grpc::Ticket* value);
-  [[deprecated]] ::io::deephaven::proto::backplane::grpc::Ticket* unsafe_arena_release_console_id();
-
-  private:
-  const ::io::deephaven::proto::backplane::grpc::Ticket& _internal_console_id() const;
-  ::io::deephaven::proto::backplane::grpc::Ticket* _internal_mutable_console_id();
-
-  public:
-  // .io.deephaven.proto.backplane.script.grpc.CompletionContext context = 2;
-  bool has_context() const;
-  void clear_context() ;
-  const ::io::deephaven::proto::backplane::script::grpc::CompletionContext& context() const;
-  PROTOBUF_NODISCARD ::io::deephaven::proto::backplane::script::grpc::CompletionContext* release_context();
-  ::io::deephaven::proto::backplane::script::grpc::CompletionContext* mutable_context();
-  void set_allocated_context(::io::deephaven::proto::backplane::script::grpc::CompletionContext* value);
-  void unsafe_arena_set_allocated_context(::io::deephaven::proto::backplane::script::grpc::CompletionContext* value);
-  ::io::deephaven::proto::backplane::script::grpc::CompletionContext* unsafe_arena_release_context();
-
-  private:
-  const ::io::deephaven::proto::backplane::script::grpc::CompletionContext& _internal_context() const;
-  ::io::deephaven::proto::backplane::script::grpc::CompletionContext* _internal_mutable_context();
-
-  public:
-  // .io.deephaven.proto.backplane.script.grpc.VersionedTextDocumentIdentifier text_document = 3;
-  bool has_text_document() const;
-  void clear_text_document() ;
-  const ::io::deephaven::proto::backplane::script::grpc::VersionedTextDocumentIdentifier& text_document() const;
-  PROTOBUF_NODISCARD ::io::deephaven::proto::backplane::script::grpc::VersionedTextDocumentIdentifier* release_text_document();
-  ::io::deephaven::proto::backplane::script::grpc::VersionedTextDocumentIdentifier* mutable_text_document();
-  void set_allocated_text_document(::io::deephaven::proto::backplane::script::grpc::VersionedTextDocumentIdentifier* value);
-  void unsafe_arena_set_allocated_text_document(::io::deephaven::proto::backplane::script::grpc::VersionedTextDocumentIdentifier* value);
-  ::io::deephaven::proto::backplane::script::grpc::VersionedTextDocumentIdentifier* unsafe_arena_release_text_document();
-
-  private:
-  const ::io::deephaven::proto::backplane::script::grpc::VersionedTextDocumentIdentifier& _internal_text_document() const;
-  ::io::deephaven::proto::backplane::script::grpc::VersionedTextDocumentIdentifier* _internal_mutable_text_document();
-
-  public:
-  // .io.deephaven.proto.backplane.script.grpc.Position position = 4;
-  bool has_position() const;
-  void clear_position() ;
-  const ::io::deephaven::proto::backplane::script::grpc::Position& position() const;
-  PROTOBUF_NODISCARD ::io::deephaven::proto::backplane::script::grpc::Position* release_position();
-  ::io::deephaven::proto::backplane::script::grpc::Position* mutable_position();
-  void set_allocated_position(::io::deephaven::proto::backplane::script::grpc::Position* value);
-  void unsafe_arena_set_allocated_position(::io::deephaven::proto::backplane::script::grpc::Position* value);
-  ::io::deephaven::proto::backplane::script::grpc::Position* unsafe_arena_release_position();
-
-  private:
-  const ::io::deephaven::proto::backplane::script::grpc::Position& _internal_position() const;
-  ::io::deephaven::proto::backplane::script::grpc::Position* _internal_mutable_position();
-
-  public:
-  // int32 request_id = 5 [deprecated = true];
-  [[deprecated]]  void clear_request_id() ;
-  [[deprecated]] ::int32_t request_id() const;
-  [[deprecated]] void set_request_id(::int32_t value);
-
-  private:
-  ::int32_t _internal_request_id() const;
-  void _internal_set_request_id(::int32_t value);
-
-  public:
-  // @@protoc_insertion_point(class_scope:io.deephaven.proto.backplane.script.grpc.GetCompletionItemsRequest)
- private:
-  class _Internal;
-
-  friend class ::google::protobuf::internal::TcParser;
-  static const ::google::protobuf::internal::TcParseTable<
-      3, 5, 4,
-      0, 2>
-      _table_;
-  friend class ::google::protobuf::MessageLite;
-  friend class ::google::protobuf::Arena;
-  template <typename T>
-  friend class ::google::protobuf::Arena::InternalHelper;
-  using InternalArenaConstructable_ = void;
-  using DestructorSkippable_ = void;
-  struct Impl_ {
-
-        inline explicit constexpr Impl_(
-            ::google::protobuf::internal::ConstantInitialized) noexcept;
-        inline explicit Impl_(::google::protobuf::internal::InternalVisibility visibility,
-                              ::google::protobuf::Arena* arena);
-        inline explicit Impl_(::google::protobuf::internal::InternalVisibility visibility,
-                              ::google::protobuf::Arena* arena, const Impl_& from);
-    ::google::protobuf::internal::HasBits<1> _has_bits_;
-    mutable ::google::protobuf::internal::CachedSize _cached_size_;
-    ::io::deephaven::proto::backplane::grpc::Ticket* console_id_;
-    ::io::deephaven::proto::backplane::script::grpc::CompletionContext* context_;
-    ::io::deephaven::proto::backplane::script::grpc::VersionedTextDocumentIdentifier* text_document_;
-    ::io::deephaven::proto::backplane::script::grpc::Position* position_;
-    ::int32_t request_id_;
-    PROTOBUF_TSAN_DECLARE_MEMBER
-  };
-  union { Impl_ _impl_; };
-  friend struct ::TableStruct_deephaven_2fproto_2fconsole_2eproto;
-};// -------------------------------------------------------------------
-
-class FigureDescriptor_SourceDescriptor final :
-    public ::google::protobuf::Message /* @@protoc_insertion_point(class_definition:io.deephaven.proto.backplane.script.grpc.FigureDescriptor.SourceDescriptor) */ {
- public:
-  inline FigureDescriptor_SourceDescriptor() : FigureDescriptor_SourceDescriptor(nullptr) {}
-  ~FigureDescriptor_SourceDescriptor() override;
-  template<typename = void>
-  explicit PROTOBUF_CONSTEXPR FigureDescriptor_SourceDescriptor(::google::protobuf::internal::ConstantInitialized);
-
-  inline FigureDescriptor_SourceDescriptor(const FigureDescriptor_SourceDescriptor& from)
-      : FigureDescriptor_SourceDescriptor(nullptr, from) {}
-  FigureDescriptor_SourceDescriptor(FigureDescriptor_SourceDescriptor&& from) noexcept
-    : FigureDescriptor_SourceDescriptor() {
-    *this = ::std::move(from);
-  }
-
-  inline FigureDescriptor_SourceDescriptor& operator=(const FigureDescriptor_SourceDescriptor& from) {
-    CopyFrom(from);
-    return *this;
-  }
-  inline FigureDescriptor_SourceDescriptor& operator=(FigureDescriptor_SourceDescriptor&& from) noexcept {
-    if (this == &from) return *this;
-    if (GetArena() == from.GetArena()
-  #ifdef PROTOBUF_FORCE_COPY_IN_MOVE
-        && GetArena() != nullptr
-  #endif  // !PROTOBUF_FORCE_COPY_IN_MOVE
-    ) {
-      InternalSwap(&from);
-    } else {
-      CopyFrom(from);
-    }
-    return *this;
-  }
-
-  inline const ::google::protobuf::UnknownFieldSet& unknown_fields() const
-      ABSL_ATTRIBUTE_LIFETIME_BOUND {
-    return _internal_metadata_.unknown_fields<::google::protobuf::UnknownFieldSet>(::google::protobuf::UnknownFieldSet::default_instance);
-  }
-  inline ::google::protobuf::UnknownFieldSet* mutable_unknown_fields()
-      ABSL_ATTRIBUTE_LIFETIME_BOUND {
-    return _internal_metadata_.mutable_unknown_fields<::google::protobuf::UnknownFieldSet>();
-  }
-
-  static const ::google::protobuf::Descriptor* descriptor() {
-    return GetDescriptor();
-  }
-  static const ::google::protobuf::Descriptor* GetDescriptor() {
-    return default_instance().GetMetadata().descriptor;
-  }
-  static const ::google::protobuf::Reflection* GetReflection() {
-    return default_instance().GetMetadata().reflection;
-  }
-  static const FigureDescriptor_SourceDescriptor& default_instance() {
-    return *internal_default_instance();
-  }
-  static inline const FigureDescriptor_SourceDescriptor* internal_default_instance() {
-    return reinterpret_cast<const FigureDescriptor_SourceDescriptor*>(
-               &_FigureDescriptor_SourceDescriptor_default_instance_);
-  }
-  static constexpr int kIndexInFileMessages =
-    57;
-
-  friend void swap(FigureDescriptor_SourceDescriptor& a, FigureDescriptor_SourceDescriptor& b) {
-    a.Swap(&b);
-  }
-  inline void Swap(FigureDescriptor_SourceDescriptor* other) {
-    if (other == this) return;
-  #ifdef PROTOBUF_FORCE_COPY_IN_SWAP
-    if (GetArena() != nullptr &&
-        GetArena() == other->GetArena()) {
-   #else  // PROTOBUF_FORCE_COPY_IN_SWAP
-    if (GetArena() == other->GetArena()) {
-  #endif  // !PROTOBUF_FORCE_COPY_IN_SWAP
-      InternalSwap(other);
-    } else {
-      ::google::protobuf::internal::GenericSwap(this, other);
-    }
-  }
-  void UnsafeArenaSwap(FigureDescriptor_SourceDescriptor* other) {
-    if (other == this) return;
-    ABSL_DCHECK(GetArena() == other->GetArena());
-    InternalSwap(other);
-  }
-
-  // implements Message ----------------------------------------------
-
-  FigureDescriptor_SourceDescriptor* New(::google::protobuf::Arena* arena = nullptr) const final {
-    return CreateMaybeMessage<FigureDescriptor_SourceDescriptor>(arena);
-  }
-  using ::google::protobuf::Message::CopyFrom;
-  void CopyFrom(const FigureDescriptor_SourceDescriptor& from);
-  using ::google::protobuf::Message::MergeFrom;
-  void MergeFrom( const FigureDescriptor_SourceDescriptor& from) {
-    FigureDescriptor_SourceDescriptor::MergeImpl(*this, from);
-  }
-  private:
-  static void MergeImpl(::google::protobuf::Message& to_msg, const ::google::protobuf::Message& from_msg);
-  public:
-  PROTOBUF_ATTRIBUTE_REINITIALIZES void Clear() final;
-  bool IsInitialized() const final;
-
-  ::size_t ByteSizeLong() const final;
-  const char* _InternalParse(const char* ptr, ::google::protobuf::internal::ParseContext* ctx) final;
-  ::uint8_t* _InternalSerialize(
-      ::uint8_t* target, ::google::protobuf::io::EpsCopyOutputStream* stream) const final;
-  int GetCachedSize() const { return _impl_._cached_size_.Get(); }
-
-  private:
-  ::google::protobuf::internal::CachedSize* AccessCachedSize() const final;
-  void SharedCtor(::google::protobuf::Arena* arena);
-  void SharedDtor();
-  void InternalSwap(FigureDescriptor_SourceDescriptor* other);
-
-  private:
-  friend class ::google::protobuf::internal::AnyMetadata;
-  static ::absl::string_view FullMessageName() {
-    return "io.deephaven.proto.backplane.script.grpc.FigureDescriptor.SourceDescriptor";
-  }
-  protected:
-  explicit FigureDescriptor_SourceDescriptor(::google::protobuf::Arena* arena);
-  FigureDescriptor_SourceDescriptor(::google::protobuf::Arena* arena, const FigureDescriptor_SourceDescriptor& from);
-  public:
-
-  static const ClassData _class_data_;
-  const ::google::protobuf::Message::ClassData*GetClassData() const final;
-
-  ::google::protobuf::Metadata GetMetadata() const final;
-
-  // nested types ----------------------------------------------------
-
-  // accessors -------------------------------------------------------
-
-  enum : int {
-    kAxisIdFieldNumber = 1,
-    kColumnNameFieldNumber = 5,
-    kColumnTypeFieldNumber = 6,
-    kOneClickFieldNumber = 7,
-    kTypeFieldNumber = 2,
-    kTableIdFieldNumber = 3,
-    kPartitionedTableIdFieldNumber = 4,
-  };
-  // string axis_id = 1;
-  void clear_axis_id() ;
-  const std::string& axis_id() const;
-  template <typename Arg_ = const std::string&, typename... Args_>
-  void set_axis_id(Arg_&& arg, Args_... args);
-  std::string* mutable_axis_id();
-  PROTOBUF_NODISCARD std::string* release_axis_id();
-  void set_allocated_axis_id(std::string* value);
-
-  private:
-  const std::string& _internal_axis_id() const;
-  inline PROTOBUF_ALWAYS_INLINE void _internal_set_axis_id(
-      const std::string& value);
-  std::string* _internal_mutable_axis_id();
-
-  public:
-  // string column_name = 5;
-  void clear_column_name() ;
-  const std::string& column_name() const;
-  template <typename Arg_ = const std::string&, typename... Args_>
-  void set_column_name(Arg_&& arg, Args_... args);
-  std::string* mutable_column_name();
-  PROTOBUF_NODISCARD std::string* release_column_name();
-  void set_allocated_column_name(std::string* value);
-
-  private:
-  const std::string& _internal_column_name() const;
-  inline PROTOBUF_ALWAYS_INLINE void _internal_set_column_name(
-      const std::string& value);
-  std::string* _internal_mutable_column_name();
-
-  public:
-  // string column_type = 6;
-  void clear_column_type() ;
-  const std::string& column_type() const;
-  template <typename Arg_ = const std::string&, typename... Args_>
-  void set_column_type(Arg_&& arg, Args_... args);
-  std::string* mutable_column_type();
-  PROTOBUF_NODISCARD std::string* release_column_type();
-  void set_allocated_column_type(std::string* value);
-
-  private:
-  const std::string& _internal_column_type() const;
-  inline PROTOBUF_ALWAYS_INLINE void _internal_set_column_type(
-      const std::string& value);
-  std::string* _internal_mutable_column_type();
-
-  public:
-  // .io.deephaven.proto.backplane.script.grpc.FigureDescriptor.OneClickDescriptor one_click = 7;
-  bool has_one_click() const;
-  void clear_one_click() ;
-  const ::io::deephaven::proto::backplane::script::grpc::FigureDescriptor_OneClickDescriptor& one_click() const;
-  PROTOBUF_NODISCARD ::io::deephaven::proto::backplane::script::grpc::FigureDescriptor_OneClickDescriptor* release_one_click();
-  ::io::deephaven::proto::backplane::script::grpc::FigureDescriptor_OneClickDescriptor* mutable_one_click();
-  void set_allocated_one_click(::io::deephaven::proto::backplane::script::grpc::FigureDescriptor_OneClickDescriptor* value);
-  void unsafe_arena_set_allocated_one_click(::io::deephaven::proto::backplane::script::grpc::FigureDescriptor_OneClickDescriptor* value);
-  ::io::deephaven::proto::backplane::script::grpc::FigureDescriptor_OneClickDescriptor* unsafe_arena_release_one_click();
-
-  private:
-  const ::io::deephaven::proto::backplane::script::grpc::FigureDescriptor_OneClickDescriptor& _internal_one_click() const;
-  ::io::deephaven::proto::backplane::script::grpc::FigureDescriptor_OneClickDescriptor* _internal_mutable_one_click();
-
-  public:
-  // .io.deephaven.proto.backplane.script.grpc.FigureDescriptor.SourceType type = 2;
-  void clear_type() ;
-  ::io::deephaven::proto::backplane::script::grpc::FigureDescriptor_SourceType type() const;
-  void set_type(::io::deephaven::proto::backplane::script::grpc::FigureDescriptor_SourceType value);
-
-  private:
-  ::io::deephaven::proto::backplane::script::grpc::FigureDescriptor_SourceType _internal_type() const;
-  void _internal_set_type(::io::deephaven::proto::backplane::script::grpc::FigureDescriptor_SourceType value);
-
-  public:
-  // int32 table_id = 3;
-  void clear_table_id() ;
-  ::int32_t table_id() const;
-  void set_table_id(::int32_t value);
-
-  private:
-  ::int32_t _internal_table_id() const;
-  void _internal_set_table_id(::int32_t value);
-
-  public:
-  // int32 partitioned_table_id = 4;
-  void clear_partitioned_table_id() ;
-  ::int32_t partitioned_table_id() const;
-  void set_partitioned_table_id(::int32_t value);
-
-  private:
-  ::int32_t _internal_partitioned_table_id() const;
-  void _internal_set_partitioned_table_id(::int32_t value);
-
-  public:
-  // @@protoc_insertion_point(class_scope:io.deephaven.proto.backplane.script.grpc.FigureDescriptor.SourceDescriptor)
- private:
-  class _Internal;
-
-  friend class ::google::protobuf::internal::TcParser;
-  static const ::google::protobuf::internal::TcParseTable<
-      3, 7, 1,
-      112, 2>
-      _table_;
-  friend class ::google::protobuf::MessageLite;
-  friend class ::google::protobuf::Arena;
-  template <typename T>
-  friend class ::google::protobuf::Arena::InternalHelper;
-  using InternalArenaConstructable_ = void;
-  using DestructorSkippable_ = void;
-  struct Impl_ {
-
-        inline explicit constexpr Impl_(
-            ::google::protobuf::internal::ConstantInitialized) noexcept;
-        inline explicit Impl_(::google::protobuf::internal::InternalVisibility visibility,
-                              ::google::protobuf::Arena* arena);
-        inline explicit Impl_(::google::protobuf::internal::InternalVisibility visibility,
-                              ::google::protobuf::Arena* arena, const Impl_& from);
-    ::google::protobuf::internal::HasBits<1> _has_bits_;
-    mutable ::google::protobuf::internal::CachedSize _cached_size_;
-    ::google::protobuf::internal::ArenaStringPtr axis_id_;
-    ::google::protobuf::internal::ArenaStringPtr column_name_;
-    ::google::protobuf::internal::ArenaStringPtr column_type_;
-    ::io::deephaven::proto::backplane::script::grpc::FigureDescriptor_OneClickDescriptor* one_click_;
-    int type_;
-    ::int32_t table_id_;
-    ::int32_t partitioned_table_id_;
-    PROTOBUF_TSAN_DECLARE_MEMBER
-  };
-  union { Impl_ _impl_; };
-  friend struct ::TableStruct_deephaven_2fproto_2fconsole_2eproto;
-};// -------------------------------------------------------------------
-
-class FigureDescriptor_MultiSeriesDescriptor final :
-    public ::google::protobuf::Message /* @@protoc_insertion_point(class_definition:io.deephaven.proto.backplane.script.grpc.FigureDescriptor.MultiSeriesDescriptor) */ {
- public:
-  inline FigureDescriptor_MultiSeriesDescriptor() : FigureDescriptor_MultiSeriesDescriptor(nullptr) {}
-  ~FigureDescriptor_MultiSeriesDescriptor() override;
-  template<typename = void>
-  explicit PROTOBUF_CONSTEXPR FigureDescriptor_MultiSeriesDescriptor(::google::protobuf::internal::ConstantInitialized);
-
-  inline FigureDescriptor_MultiSeriesDescriptor(const FigureDescriptor_MultiSeriesDescriptor& from)
-      : FigureDescriptor_MultiSeriesDescriptor(nullptr, from) {}
-  FigureDescriptor_MultiSeriesDescriptor(FigureDescriptor_MultiSeriesDescriptor&& from) noexcept
-    : FigureDescriptor_MultiSeriesDescriptor() {
-    *this = ::std::move(from);
-  }
-
-  inline FigureDescriptor_MultiSeriesDescriptor& operator=(const FigureDescriptor_MultiSeriesDescriptor& from) {
-    CopyFrom(from);
-    return *this;
-  }
-  inline FigureDescriptor_MultiSeriesDescriptor& operator=(FigureDescriptor_MultiSeriesDescriptor&& from) noexcept {
-    if (this == &from) return *this;
-    if (GetArena() == from.GetArena()
-  #ifdef PROTOBUF_FORCE_COPY_IN_MOVE
-        && GetArena() != nullptr
-  #endif  // !PROTOBUF_FORCE_COPY_IN_MOVE
-    ) {
-      InternalSwap(&from);
-    } else {
-      CopyFrom(from);
-    }
-    return *this;
-  }
-
-  inline const ::google::protobuf::UnknownFieldSet& unknown_fields() const
-      ABSL_ATTRIBUTE_LIFETIME_BOUND {
-    return _internal_metadata_.unknown_fields<::google::protobuf::UnknownFieldSet>(::google::protobuf::UnknownFieldSet::default_instance);
-  }
-  inline ::google::protobuf::UnknownFieldSet* mutable_unknown_fields()
-      ABSL_ATTRIBUTE_LIFETIME_BOUND {
-    return _internal_metadata_.mutable_unknown_fields<::google::protobuf::UnknownFieldSet>();
-  }
-
-  static const ::google::protobuf::Descriptor* descriptor() {
-    return GetDescriptor();
-  }
-  static const ::google::protobuf::Descriptor* GetDescriptor() {
-    return default_instance().GetMetadata().descriptor;
-  }
-  static const ::google::protobuf::Reflection* GetReflection() {
-    return default_instance().GetMetadata().reflection;
-  }
-  static const FigureDescriptor_MultiSeriesDescriptor& default_instance() {
-    return *internal_default_instance();
-  }
-  static inline const FigureDescriptor_MultiSeriesDescriptor* internal_default_instance() {
-    return reinterpret_cast<const FigureDescriptor_MultiSeriesDescriptor*>(
-               &_FigureDescriptor_MultiSeriesDescriptor_default_instance_);
-  }
-  static constexpr int kIndexInFileMessages =
-    47;
-
-  friend void swap(FigureDescriptor_MultiSeriesDescriptor& a, FigureDescriptor_MultiSeriesDescriptor& b) {
-    a.Swap(&b);
-  }
-  inline void Swap(FigureDescriptor_MultiSeriesDescriptor* other) {
-    if (other == this) return;
-  #ifdef PROTOBUF_FORCE_COPY_IN_SWAP
-    if (GetArena() != nullptr &&
-        GetArena() == other->GetArena()) {
-   #else  // PROTOBUF_FORCE_COPY_IN_SWAP
-    if (GetArena() == other->GetArena()) {
-  #endif  // !PROTOBUF_FORCE_COPY_IN_SWAP
-      InternalSwap(other);
-    } else {
-      ::google::protobuf::internal::GenericSwap(this, other);
-    }
-  }
-  void UnsafeArenaSwap(FigureDescriptor_MultiSeriesDescriptor* other) {
-    if (other == this) return;
-    ABSL_DCHECK(GetArena() == other->GetArena());
-    InternalSwap(other);
-  }
-
-  // implements Message ----------------------------------------------
-
-  FigureDescriptor_MultiSeriesDescriptor* New(::google::protobuf::Arena* arena = nullptr) const final {
-    return CreateMaybeMessage<FigureDescriptor_MultiSeriesDescriptor>(arena);
-  }
-  using ::google::protobuf::Message::CopyFrom;
-  void CopyFrom(const FigureDescriptor_MultiSeriesDescriptor& from);
-  using ::google::protobuf::Message::MergeFrom;
-  void MergeFrom( const FigureDescriptor_MultiSeriesDescriptor& from) {
-    FigureDescriptor_MultiSeriesDescriptor::MergeImpl(*this, from);
-  }
-  private:
-  static void MergeImpl(::google::protobuf::Message& to_msg, const ::google::protobuf::Message& from_msg);
-  public:
-  PROTOBUF_ATTRIBUTE_REINITIALIZES void Clear() final;
-  bool IsInitialized() const final;
-
-  ::size_t ByteSizeLong() const final;
-  const char* _InternalParse(const char* ptr, ::google::protobuf::internal::ParseContext* ctx) final;
-  ::uint8_t* _InternalSerialize(
-      ::uint8_t* target, ::google::protobuf::io::EpsCopyOutputStream* stream) const final;
-  int GetCachedSize() const { return _impl_._cached_size_.Get(); }
-
-  private:
-  ::google::protobuf::internal::CachedSize* AccessCachedSize() const final;
-  void SharedCtor(::google::protobuf::Arena* arena);
-  void SharedDtor();
-  void InternalSwap(FigureDescriptor_MultiSeriesDescriptor* other);
-
-  private:
-  friend class ::google::protobuf::internal::AnyMetadata;
-  static ::absl::string_view FullMessageName() {
-    return "io.deephaven.proto.backplane.script.grpc.FigureDescriptor.MultiSeriesDescriptor";
-  }
-  protected:
-  explicit FigureDescriptor_MultiSeriesDescriptor(::google::protobuf::Arena* arena);
-  FigureDescriptor_MultiSeriesDescriptor(::google::protobuf::Arena* arena, const FigureDescriptor_MultiSeriesDescriptor& from);
-  public:
-
-  static const ClassData _class_data_;
-  const ::google::protobuf::Message::ClassData*GetClassData() const final;
-
-  ::google::protobuf::Metadata GetMetadata() const final;
-
-  // nested types ----------------------------------------------------
-
-  // accessors -------------------------------------------------------
-
-  enum : int {
-    kDataSourcesFieldNumber = 14,
-    kNameFieldNumber = 2,
-    kLineColorFieldNumber = 3,
-    kPointColorFieldNumber = 4,
-    kLinesVisibleFieldNumber = 5,
-    kPointsVisibleFieldNumber = 6,
-    kGradientVisibleFieldNumber = 7,
-    kPointLabelFormatFieldNumber = 8,
-    kXToolTipPatternFieldNumber = 9,
-    kYToolTipPatternFieldNumber = 10,
-    kPointLabelFieldNumber = 11,
-    kPointSizeFieldNumber = 12,
-    kPointShapeFieldNumber = 13,
-    kPlotStyleFieldNumber = 1,
-  };
-  // repeated .io.deephaven.proto.backplane.script.grpc.FigureDescriptor.MultiSeriesSourceDescriptor data_sources = 14;
-  int data_sources_size() const;
-  private:
-  int _internal_data_sources_size() const;
-
-  public:
-  void clear_data_sources() ;
-  ::io::deephaven::proto::backplane::script::grpc::FigureDescriptor_MultiSeriesSourceDescriptor* mutable_data_sources(int index);
-  ::google::protobuf::RepeatedPtrField< ::io::deephaven::proto::backplane::script::grpc::FigureDescriptor_MultiSeriesSourceDescriptor >*
-      mutable_data_sources();
-  private:
-  const ::google::protobuf::RepeatedPtrField<::io::deephaven::proto::backplane::script::grpc::FigureDescriptor_MultiSeriesSourceDescriptor>& _internal_data_sources() const;
-  ::google::protobuf::RepeatedPtrField<::io::deephaven::proto::backplane::script::grpc::FigureDescriptor_MultiSeriesSourceDescriptor>* _internal_mutable_data_sources();
-  public:
-  const ::io::deephaven::proto::backplane::script::grpc::FigureDescriptor_MultiSeriesSourceDescriptor& data_sources(int index) const;
-  ::io::deephaven::proto::backplane::script::grpc::FigureDescriptor_MultiSeriesSourceDescriptor* add_data_sources();
-  const ::google::protobuf::RepeatedPtrField< ::io::deephaven::proto::backplane::script::grpc::FigureDescriptor_MultiSeriesSourceDescriptor >&
-      data_sources() const;
-  // string name = 2;
-  void clear_name() ;
-  const std::string& name() const;
-  template <typename Arg_ = const std::string&, typename... Args_>
-  void set_name(Arg_&& arg, Args_... args);
-  std::string* mutable_name();
-  PROTOBUF_NODISCARD std::string* release_name();
-  void set_allocated_name(std::string* value);
-
-  private:
-  const std::string& _internal_name() const;
-  inline PROTOBUF_ALWAYS_INLINE void _internal_set_name(
-      const std::string& value);
-  std::string* _internal_mutable_name();
-
-  public:
-  // .io.deephaven.proto.backplane.script.grpc.FigureDescriptor.StringMapWithDefault line_color = 3;
-  bool has_line_color() const;
-  void clear_line_color() ;
-  const ::io::deephaven::proto::backplane::script::grpc::FigureDescriptor_StringMapWithDefault& line_color() const;
-  PROTOBUF_NODISCARD ::io::deephaven::proto::backplane::script::grpc::FigureDescriptor_StringMapWithDefault* release_line_color();
-  ::io::deephaven::proto::backplane::script::grpc::FigureDescriptor_StringMapWithDefault* mutable_line_color();
-  void set_allocated_line_color(::io::deephaven::proto::backplane::script::grpc::FigureDescriptor_StringMapWithDefault* value);
-  void unsafe_arena_set_allocated_line_color(::io::deephaven::proto::backplane::script::grpc::FigureDescriptor_StringMapWithDefault* value);
-  ::io::deephaven::proto::backplane::script::grpc::FigureDescriptor_StringMapWithDefault* unsafe_arena_release_line_color();
-
-  private:
-  const ::io::deephaven::proto::backplane::script::grpc::FigureDescriptor_StringMapWithDefault& _internal_line_color() const;
-  ::io::deephaven::proto::backplane::script::grpc::FigureDescriptor_StringMapWithDefault* _internal_mutable_line_color();
-
-  public:
-  // .io.deephaven.proto.backplane.script.grpc.FigureDescriptor.StringMapWithDefault point_color = 4;
-  bool has_point_color() const;
-  void clear_point_color() ;
-  const ::io::deephaven::proto::backplane::script::grpc::FigureDescriptor_StringMapWithDefault& point_color() const;
-  PROTOBUF_NODISCARD ::io::deephaven::proto::backplane::script::grpc::FigureDescriptor_StringMapWithDefault* release_point_color();
-  ::io::deephaven::proto::backplane::script::grpc::FigureDescriptor_StringMapWithDefault* mutable_point_color();
-  void set_allocated_point_color(::io::deephaven::proto::backplane::script::grpc::FigureDescriptor_StringMapWithDefault* value);
-  void unsafe_arena_set_allocated_point_color(::io::deephaven::proto::backplane::script::grpc::FigureDescriptor_StringMapWithDefault* value);
-  ::io::deephaven::proto::backplane::script::grpc::FigureDescriptor_StringMapWithDefault* unsafe_arena_release_point_color();
-
-  private:
-  const ::io::deephaven::proto::backplane::script::grpc::FigureDescriptor_StringMapWithDefault& _internal_point_color() const;
-  ::io::deephaven::proto::backplane::script::grpc::FigureDescriptor_StringMapWithDefault* _internal_mutable_point_color();
-
-  public:
-  // .io.deephaven.proto.backplane.script.grpc.FigureDescriptor.BoolMapWithDefault lines_visible = 5;
-  bool has_lines_visible() const;
-  void clear_lines_visible() ;
-  const ::io::deephaven::proto::backplane::script::grpc::FigureDescriptor_BoolMapWithDefault& lines_visible() const;
-  PROTOBUF_NODISCARD ::io::deephaven::proto::backplane::script::grpc::FigureDescriptor_BoolMapWithDefault* release_lines_visible();
-  ::io::deephaven::proto::backplane::script::grpc::FigureDescriptor_BoolMapWithDefault* mutable_lines_visible();
-  void set_allocated_lines_visible(::io::deephaven::proto::backplane::script::grpc::FigureDescriptor_BoolMapWithDefault* value);
-  void unsafe_arena_set_allocated_lines_visible(::io::deephaven::proto::backplane::script::grpc::FigureDescriptor_BoolMapWithDefault* value);
-  ::io::deephaven::proto::backplane::script::grpc::FigureDescriptor_BoolMapWithDefault* unsafe_arena_release_lines_visible();
-
-  private:
-  const ::io::deephaven::proto::backplane::script::grpc::FigureDescriptor_BoolMapWithDefault& _internal_lines_visible() const;
-  ::io::deephaven::proto::backplane::script::grpc::FigureDescriptor_BoolMapWithDefault* _internal_mutable_lines_visible();
-
-  public:
-  // .io.deephaven.proto.backplane.script.grpc.FigureDescriptor.BoolMapWithDefault points_visible = 6;
-  bool has_points_visible() const;
-  void clear_points_visible() ;
-  const ::io::deephaven::proto::backplane::script::grpc::FigureDescriptor_BoolMapWithDefault& points_visible() const;
-  PROTOBUF_NODISCARD ::io::deephaven::proto::backplane::script::grpc::FigureDescriptor_BoolMapWithDefault* release_points_visible();
-  ::io::deephaven::proto::backplane::script::grpc::FigureDescriptor_BoolMapWithDefault* mutable_points_visible();
-  void set_allocated_points_visible(::io::deephaven::proto::backplane::script::grpc::FigureDescriptor_BoolMapWithDefault* value);
-  void unsafe_arena_set_allocated_points_visible(::io::deephaven::proto::backplane::script::grpc::FigureDescriptor_BoolMapWithDefault* value);
-  ::io::deephaven::proto::backplane::script::grpc::FigureDescriptor_BoolMapWithDefault* unsafe_arena_release_points_visible();
-
-  private:
-  const ::io::deephaven::proto::backplane::script::grpc::FigureDescriptor_BoolMapWithDefault& _internal_points_visible() const;
-  ::io::deephaven::proto::backplane::script::grpc::FigureDescriptor_BoolMapWithDefault* _internal_mutable_points_visible();
-
-  public:
-  // .io.deephaven.proto.backplane.script.grpc.FigureDescriptor.BoolMapWithDefault gradient_visible = 7;
-  bool has_gradient_visible() const;
-  void clear_gradient_visible() ;
-  const ::io::deephaven::proto::backplane::script::grpc::FigureDescriptor_BoolMapWithDefault& gradient_visible() const;
-  PROTOBUF_NODISCARD ::io::deephaven::proto::backplane::script::grpc::FigureDescriptor_BoolMapWithDefault* release_gradient_visible();
-  ::io::deephaven::proto::backplane::script::grpc::FigureDescriptor_BoolMapWithDefault* mutable_gradient_visible();
-  void set_allocated_gradient_visible(::io::deephaven::proto::backplane::script::grpc::FigureDescriptor_BoolMapWithDefault* value);
-  void unsafe_arena_set_allocated_gradient_visible(::io::deephaven::proto::backplane::script::grpc::FigureDescriptor_BoolMapWithDefault* value);
-  ::io::deephaven::proto::backplane::script::grpc::FigureDescriptor_BoolMapWithDefault* unsafe_arena_release_gradient_visible();
-
-  private:
-  const ::io::deephaven::proto::backplane::script::grpc::FigureDescriptor_BoolMapWithDefault& _internal_gradient_visible() const;
-  ::io::deephaven::proto::backplane::script::grpc::FigureDescriptor_BoolMapWithDefault* _internal_mutable_gradient_visible();
-
-  public:
-  // .io.deephaven.proto.backplane.script.grpc.FigureDescriptor.StringMapWithDefault point_label_format = 8;
-  bool has_point_label_format() const;
-  void clear_point_label_format() ;
-  const ::io::deephaven::proto::backplane::script::grpc::FigureDescriptor_StringMapWithDefault& point_label_format() const;
-  PROTOBUF_NODISCARD ::io::deephaven::proto::backplane::script::grpc::FigureDescriptor_StringMapWithDefault* release_point_label_format();
-  ::io::deephaven::proto::backplane::script::grpc::FigureDescriptor_StringMapWithDefault* mutable_point_label_format();
-  void set_allocated_point_label_format(::io::deephaven::proto::backplane::script::grpc::FigureDescriptor_StringMapWithDefault* value);
-  void unsafe_arena_set_allocated_point_label_format(::io::deephaven::proto::backplane::script::grpc::FigureDescriptor_StringMapWithDefault* value);
-  ::io::deephaven::proto::backplane::script::grpc::FigureDescriptor_StringMapWithDefault* unsafe_arena_release_point_label_format();
-
-  private:
-  const ::io::deephaven::proto::backplane::script::grpc::FigureDescriptor_StringMapWithDefault& _internal_point_label_format() const;
-  ::io::deephaven::proto::backplane::script::grpc::FigureDescriptor_StringMapWithDefault* _internal_mutable_point_label_format();
-
-  public:
-  // .io.deephaven.proto.backplane.script.grpc.FigureDescriptor.StringMapWithDefault x_tool_tip_pattern = 9;
-  bool has_x_tool_tip_pattern() const;
-  void clear_x_tool_tip_pattern() ;
-  const ::io::deephaven::proto::backplane::script::grpc::FigureDescriptor_StringMapWithDefault& x_tool_tip_pattern() const;
-  PROTOBUF_NODISCARD ::io::deephaven::proto::backplane::script::grpc::FigureDescriptor_StringMapWithDefault* release_x_tool_tip_pattern();
-  ::io::deephaven::proto::backplane::script::grpc::FigureDescriptor_StringMapWithDefault* mutable_x_tool_tip_pattern();
-  void set_allocated_x_tool_tip_pattern(::io::deephaven::proto::backplane::script::grpc::FigureDescriptor_StringMapWithDefault* value);
-  void unsafe_arena_set_allocated_x_tool_tip_pattern(::io::deephaven::proto::backplane::script::grpc::FigureDescriptor_StringMapWithDefault* value);
-  ::io::deephaven::proto::backplane::script::grpc::FigureDescriptor_StringMapWithDefault* unsafe_arena_release_x_tool_tip_pattern();
-
-  private:
-  const ::io::deephaven::proto::backplane::script::grpc::FigureDescriptor_StringMapWithDefault& _internal_x_tool_tip_pattern() const;
-  ::io::deephaven::proto::backplane::script::grpc::FigureDescriptor_StringMapWithDefault* _internal_mutable_x_tool_tip_pattern();
-
-  public:
-  // .io.deephaven.proto.backplane.script.grpc.FigureDescriptor.StringMapWithDefault y_tool_tip_pattern = 10;
-  bool has_y_tool_tip_pattern() const;
-  void clear_y_tool_tip_pattern() ;
-  const ::io::deephaven::proto::backplane::script::grpc::FigureDescriptor_StringMapWithDefault& y_tool_tip_pattern() const;
-  PROTOBUF_NODISCARD ::io::deephaven::proto::backplane::script::grpc::FigureDescriptor_StringMapWithDefault* release_y_tool_tip_pattern();
-  ::io::deephaven::proto::backplane::script::grpc::FigureDescriptor_StringMapWithDefault* mutable_y_tool_tip_pattern();
-  void set_allocated_y_tool_tip_pattern(::io::deephaven::proto::backplane::script::grpc::FigureDescriptor_StringMapWithDefault* value);
-  void unsafe_arena_set_allocated_y_tool_tip_pattern(::io::deephaven::proto::backplane::script::grpc::FigureDescriptor_StringMapWithDefault* value);
-  ::io::deephaven::proto::backplane::script::grpc::FigureDescriptor_StringMapWithDefault* unsafe_arena_release_y_tool_tip_pattern();
-
-  private:
-  const ::io::deephaven::proto::backplane::script::grpc::FigureDescriptor_StringMapWithDefault& _internal_y_tool_tip_pattern() const;
-  ::io::deephaven::proto::backplane::script::grpc::FigureDescriptor_StringMapWithDefault* _internal_mutable_y_tool_tip_pattern();
-
-  public:
-  // .io.deephaven.proto.backplane.script.grpc.FigureDescriptor.StringMapWithDefault point_label = 11;
-  bool has_point_label() const;
-  void clear_point_label() ;
-  const ::io::deephaven::proto::backplane::script::grpc::FigureDescriptor_StringMapWithDefault& point_label() const;
-  PROTOBUF_NODISCARD ::io::deephaven::proto::backplane::script::grpc::FigureDescriptor_StringMapWithDefault* release_point_label();
-  ::io::deephaven::proto::backplane::script::grpc::FigureDescriptor_StringMapWithDefault* mutable_point_label();
-  void set_allocated_point_label(::io::deephaven::proto::backplane::script::grpc::FigureDescriptor_StringMapWithDefault* value);
-  void unsafe_arena_set_allocated_point_label(::io::deephaven::proto::backplane::script::grpc::FigureDescriptor_StringMapWithDefault* value);
-  ::io::deephaven::proto::backplane::script::grpc::FigureDescriptor_StringMapWithDefault* unsafe_arena_release_point_label();
-
-  private:
-  const ::io::deephaven::proto::backplane::script::grpc::FigureDescriptor_StringMapWithDefault& _internal_point_label() const;
-  ::io::deephaven::proto::backplane::script::grpc::FigureDescriptor_StringMapWithDefault* _internal_mutable_point_label();
-
-  public:
-  // .io.deephaven.proto.backplane.script.grpc.FigureDescriptor.DoubleMapWithDefault point_size = 12;
-  bool has_point_size() const;
-  void clear_point_size() ;
-  const ::io::deephaven::proto::backplane::script::grpc::FigureDescriptor_DoubleMapWithDefault& point_size() const;
-  PROTOBUF_NODISCARD ::io::deephaven::proto::backplane::script::grpc::FigureDescriptor_DoubleMapWithDefault* release_point_size();
-  ::io::deephaven::proto::backplane::script::grpc::FigureDescriptor_DoubleMapWithDefault* mutable_point_size();
-  void set_allocated_point_size(::io::deephaven::proto::backplane::script::grpc::FigureDescriptor_DoubleMapWithDefault* value);
-  void unsafe_arena_set_allocated_point_size(::io::deephaven::proto::backplane::script::grpc::FigureDescriptor_DoubleMapWithDefault* value);
-  ::io::deephaven::proto::backplane::script::grpc::FigureDescriptor_DoubleMapWithDefault* unsafe_arena_release_point_size();
-
-  private:
-  const ::io::deephaven::proto::backplane::script::grpc::FigureDescriptor_DoubleMapWithDefault& _internal_point_size() const;
-  ::io::deephaven::proto::backplane::script::grpc::FigureDescriptor_DoubleMapWithDefault* _internal_mutable_point_size();
-
-  public:
-  // .io.deephaven.proto.backplane.script.grpc.FigureDescriptor.StringMapWithDefault point_shape = 13;
-  bool has_point_shape() const;
-  void clear_point_shape() ;
-  const ::io::deephaven::proto::backplane::script::grpc::FigureDescriptor_StringMapWithDefault& point_shape() const;
-  PROTOBUF_NODISCARD ::io::deephaven::proto::backplane::script::grpc::FigureDescriptor_StringMapWithDefault* release_point_shape();
-  ::io::deephaven::proto::backplane::script::grpc::FigureDescriptor_StringMapWithDefault* mutable_point_shape();
-  void set_allocated_point_shape(::io::deephaven::proto::backplane::script::grpc::FigureDescriptor_StringMapWithDefault* value);
-  void unsafe_arena_set_allocated_point_shape(::io::deephaven::proto::backplane::script::grpc::FigureDescriptor_StringMapWithDefault* value);
-  ::io::deephaven::proto::backplane::script::grpc::FigureDescriptor_StringMapWithDefault* unsafe_arena_release_point_shape();
-
-  private:
-  const ::io::deephaven::proto::backplane::script::grpc::FigureDescriptor_StringMapWithDefault& _internal_point_shape() const;
-  ::io::deephaven::proto::backplane::script::grpc::FigureDescriptor_StringMapWithDefault* _internal_mutable_point_shape();
-
-  public:
-  // .io.deephaven.proto.backplane.script.grpc.FigureDescriptor.SeriesPlotStyle plot_style = 1;
-  void clear_plot_style() ;
-  ::io::deephaven::proto::backplane::script::grpc::FigureDescriptor_SeriesPlotStyle plot_style() const;
-  void set_plot_style(::io::deephaven::proto::backplane::script::grpc::FigureDescriptor_SeriesPlotStyle value);
-
-  private:
-  ::io::deephaven::proto::backplane::script::grpc::FigureDescriptor_SeriesPlotStyle _internal_plot_style() const;
-  void _internal_set_plot_style(::io::deephaven::proto::backplane::script::grpc::FigureDescriptor_SeriesPlotStyle value);
-
-  public:
-  // @@protoc_insertion_point(class_scope:io.deephaven.proto.backplane.script.grpc.FigureDescriptor.MultiSeriesDescriptor)
- private:
-  class _Internal;
-
-  friend class ::google::protobuf::internal::TcParser;
-  static const ::google::protobuf::internal::TcParseTable<
-      4, 14, 12,
-      100, 2>
-      _table_;
-  friend class ::google::protobuf::MessageLite;
-  friend class ::google::protobuf::Arena;
-  template <typename T>
-  friend class ::google::protobuf::Arena::InternalHelper;
-  using InternalArenaConstructable_ = void;
-  using DestructorSkippable_ = void;
-  struct Impl_ {
-
-        inline explicit constexpr Impl_(
-            ::google::protobuf::internal::ConstantInitialized) noexcept;
-        inline explicit Impl_(::google::protobuf::internal::InternalVisibility visibility,
-                              ::google::protobuf::Arena* arena);
-        inline explicit Impl_(::google::protobuf::internal::InternalVisibility visibility,
-                              ::google::protobuf::Arena* arena, const Impl_& from);
-    ::google::protobuf::internal::HasBits<1> _has_bits_;
-    mutable ::google::protobuf::internal::CachedSize _cached_size_;
-    ::google::protobuf::RepeatedPtrField< ::io::deephaven::proto::backplane::script::grpc::FigureDescriptor_MultiSeriesSourceDescriptor > data_sources_;
-    ::google::protobuf::internal::ArenaStringPtr name_;
-    ::io::deephaven::proto::backplane::script::grpc::FigureDescriptor_StringMapWithDefault* line_color_;
-    ::io::deephaven::proto::backplane::script::grpc::FigureDescriptor_StringMapWithDefault* point_color_;
-    ::io::deephaven::proto::backplane::script::grpc::FigureDescriptor_BoolMapWithDefault* lines_visible_;
-    ::io::deephaven::proto::backplane::script::grpc::FigureDescriptor_BoolMapWithDefault* points_visible_;
-    ::io::deephaven::proto::backplane::script::grpc::FigureDescriptor_BoolMapWithDefault* gradient_visible_;
-    ::io::deephaven::proto::backplane::script::grpc::FigureDescriptor_StringMapWithDefault* point_label_format_;
-    ::io::deephaven::proto::backplane::script::grpc::FigureDescriptor_StringMapWithDefault* x_tool_tip_pattern_;
-    ::io::deephaven::proto::backplane::script::grpc::FigureDescriptor_StringMapWithDefault* y_tool_tip_pattern_;
-    ::io::deephaven::proto::backplane::script::grpc::FigureDescriptor_StringMapWithDefault* point_label_;
-    ::io::deephaven::proto::backplane::script::grpc::FigureDescriptor_DoubleMapWithDefault* point_size_;
-    ::io::deephaven::proto::backplane::script::grpc::FigureDescriptor_StringMapWithDefault* point_shape_;
-    int plot_style_;
-    PROTOBUF_TSAN_DECLARE_MEMBER
-  };
-  union { Impl_ _impl_; };
-  friend struct ::TableStruct_deephaven_2fproto_2fconsole_2eproto;
-};// -------------------------------------------------------------------
-
-class FigureDescriptor_BusinessCalendarDescriptor_Holiday final :
-    public ::google::protobuf::Message /* @@protoc_insertion_point(class_definition:io.deephaven.proto.backplane.script.grpc.FigureDescriptor.BusinessCalendarDescriptor.Holiday) */ {
- public:
-  inline FigureDescriptor_BusinessCalendarDescriptor_Holiday() : FigureDescriptor_BusinessCalendarDescriptor_Holiday(nullptr) {}
-  ~FigureDescriptor_BusinessCalendarDescriptor_Holiday() override;
-  template<typename = void>
-  explicit PROTOBUF_CONSTEXPR FigureDescriptor_BusinessCalendarDescriptor_Holiday(::google::protobuf::internal::ConstantInitialized);
-
-  inline FigureDescriptor_BusinessCalendarDescriptor_Holiday(const FigureDescriptor_BusinessCalendarDescriptor_Holiday& from)
-      : FigureDescriptor_BusinessCalendarDescriptor_Holiday(nullptr, from) {}
-  FigureDescriptor_BusinessCalendarDescriptor_Holiday(FigureDescriptor_BusinessCalendarDescriptor_Holiday&& from) noexcept
-    : FigureDescriptor_BusinessCalendarDescriptor_Holiday() {
-    *this = ::std::move(from);
-  }
-
-  inline FigureDescriptor_BusinessCalendarDescriptor_Holiday& operator=(const FigureDescriptor_BusinessCalendarDescriptor_Holiday& from) {
-    CopyFrom(from);
-    return *this;
-  }
-  inline FigureDescriptor_BusinessCalendarDescriptor_Holiday& operator=(FigureDescriptor_BusinessCalendarDescriptor_Holiday&& from) noexcept {
-    if (this == &from) return *this;
-    if (GetArena() == from.GetArena()
-  #ifdef PROTOBUF_FORCE_COPY_IN_MOVE
-        && GetArena() != nullptr
-  #endif  // !PROTOBUF_FORCE_COPY_IN_MOVE
-    ) {
-      InternalSwap(&from);
-    } else {
-      CopyFrom(from);
-    }
-    return *this;
-  }
-
-  inline const ::google::protobuf::UnknownFieldSet& unknown_fields() const
-      ABSL_ATTRIBUTE_LIFETIME_BOUND {
-    return _internal_metadata_.unknown_fields<::google::protobuf::UnknownFieldSet>(::google::protobuf::UnknownFieldSet::default_instance);
-  }
-  inline ::google::protobuf::UnknownFieldSet* mutable_unknown_fields()
-      ABSL_ATTRIBUTE_LIFETIME_BOUND {
-    return _internal_metadata_.mutable_unknown_fields<::google::protobuf::UnknownFieldSet>();
-  }
-
-  static const ::google::protobuf::Descriptor* descriptor() {
-    return GetDescriptor();
-  }
-  static const ::google::protobuf::Descriptor* GetDescriptor() {
-    return default_instance().GetMetadata().descriptor;
-  }
-  static const ::google::protobuf::Reflection* GetReflection() {
-    return default_instance().GetMetadata().reflection;
-  }
-  static const FigureDescriptor_BusinessCalendarDescriptor_Holiday& default_instance() {
-    return *internal_default_instance();
-  }
-  static inline const FigureDescriptor_BusinessCalendarDescriptor_Holiday* internal_default_instance() {
-    return reinterpret_cast<const FigureDescriptor_BusinessCalendarDescriptor_Holiday*>(
-               &_FigureDescriptor_BusinessCalendarDescriptor_Holiday_default_instance_);
-  }
-  static constexpr int kIndexInFileMessages =
-    53;
-
-  friend void swap(FigureDescriptor_BusinessCalendarDescriptor_Holiday& a, FigureDescriptor_BusinessCalendarDescriptor_Holiday& b) {
-    a.Swap(&b);
-  }
-  inline void Swap(FigureDescriptor_BusinessCalendarDescriptor_Holiday* other) {
-    if (other == this) return;
-  #ifdef PROTOBUF_FORCE_COPY_IN_SWAP
-    if (GetArena() != nullptr &&
-        GetArena() == other->GetArena()) {
-   #else  // PROTOBUF_FORCE_COPY_IN_SWAP
-    if (GetArena() == other->GetArena()) {
-  #endif  // !PROTOBUF_FORCE_COPY_IN_SWAP
-      InternalSwap(other);
-    } else {
-      ::google::protobuf::internal::GenericSwap(this, other);
-    }
-  }
-  void UnsafeArenaSwap(FigureDescriptor_BusinessCalendarDescriptor_Holiday* other) {
-    if (other == this) return;
-    ABSL_DCHECK(GetArena() == other->GetArena());
-    InternalSwap(other);
-  }
-
-  // implements Message ----------------------------------------------
-
-  FigureDescriptor_BusinessCalendarDescriptor_Holiday* New(::google::protobuf::Arena* arena = nullptr) const final {
-    return CreateMaybeMessage<FigureDescriptor_BusinessCalendarDescriptor_Holiday>(arena);
-  }
-  using ::google::protobuf::Message::CopyFrom;
-  void CopyFrom(const FigureDescriptor_BusinessCalendarDescriptor_Holiday& from);
-  using ::google::protobuf::Message::MergeFrom;
-  void MergeFrom( const FigureDescriptor_BusinessCalendarDescriptor_Holiday& from) {
-    FigureDescriptor_BusinessCalendarDescriptor_Holiday::MergeImpl(*this, from);
-  }
-  private:
-  static void MergeImpl(::google::protobuf::Message& to_msg, const ::google::protobuf::Message& from_msg);
-  public:
-  PROTOBUF_ATTRIBUTE_REINITIALIZES void Clear() final;
-  bool IsInitialized() const final;
-
-  ::size_t ByteSizeLong() const final;
-  const char* _InternalParse(const char* ptr, ::google::protobuf::internal::ParseContext* ctx) final;
-  ::uint8_t* _InternalSerialize(
-      ::uint8_t* target, ::google::protobuf::io::EpsCopyOutputStream* stream) const final;
-  int GetCachedSize() const { return _impl_._cached_size_.Get(); }
-
-  private:
-  ::google::protobuf::internal::CachedSize* AccessCachedSize() const final;
-  void SharedCtor(::google::protobuf::Arena* arena);
-  void SharedDtor();
-  void InternalSwap(FigureDescriptor_BusinessCalendarDescriptor_Holiday* other);
-
-  private:
-  friend class ::google::protobuf::internal::AnyMetadata;
-  static ::absl::string_view FullMessageName() {
-    return "io.deephaven.proto.backplane.script.grpc.FigureDescriptor.BusinessCalendarDescriptor.Holiday";
-  }
-  protected:
-  explicit FigureDescriptor_BusinessCalendarDescriptor_Holiday(::google::protobuf::Arena* arena);
-  FigureDescriptor_BusinessCalendarDescriptor_Holiday(::google::protobuf::Arena* arena, const FigureDescriptor_BusinessCalendarDescriptor_Holiday& from);
-  public:
-
-  static const ClassData _class_data_;
-  const ::google::protobuf::Message::ClassData*GetClassData() const final;
-
-  ::google::protobuf::Metadata GetMetadata() const final;
-
-  // nested types ----------------------------------------------------
-
-  // accessors -------------------------------------------------------
-
-  enum : int {
-    kBusinessPeriodsFieldNumber = 2,
-    kDateFieldNumber = 1,
-  };
-  // repeated .io.deephaven.proto.backplane.script.grpc.FigureDescriptor.BusinessCalendarDescriptor.BusinessPeriod business_periods = 2;
-  int business_periods_size() const;
-  private:
-  int _internal_business_periods_size() const;
-
-  public:
-  void clear_business_periods() ;
-  ::io::deephaven::proto::backplane::script::grpc::FigureDescriptor_BusinessCalendarDescriptor_BusinessPeriod* mutable_business_periods(int index);
-  ::google::protobuf::RepeatedPtrField< ::io::deephaven::proto::backplane::script::grpc::FigureDescriptor_BusinessCalendarDescriptor_BusinessPeriod >*
-      mutable_business_periods();
-  private:
-  const ::google::protobuf::RepeatedPtrField<::io::deephaven::proto::backplane::script::grpc::FigureDescriptor_BusinessCalendarDescriptor_BusinessPeriod>& _internal_business_periods() const;
-  ::google::protobuf::RepeatedPtrField<::io::deephaven::proto::backplane::script::grpc::FigureDescriptor_BusinessCalendarDescriptor_BusinessPeriod>* _internal_mutable_business_periods();
-  public:
-  const ::io::deephaven::proto::backplane::script::grpc::FigureDescriptor_BusinessCalendarDescriptor_BusinessPeriod& business_periods(int index) const;
-  ::io::deephaven::proto::backplane::script::grpc::FigureDescriptor_BusinessCalendarDescriptor_BusinessPeriod* add_business_periods();
-  const ::google::protobuf::RepeatedPtrField< ::io::deephaven::proto::backplane::script::grpc::FigureDescriptor_BusinessCalendarDescriptor_BusinessPeriod >&
-      business_periods() const;
-  // .io.deephaven.proto.backplane.script.grpc.FigureDescriptor.BusinessCalendarDescriptor.LocalDate date = 1;
-  bool has_date() const;
-  void clear_date() ;
-  const ::io::deephaven::proto::backplane::script::grpc::FigureDescriptor_BusinessCalendarDescriptor_LocalDate& date() const;
-  PROTOBUF_NODISCARD ::io::deephaven::proto::backplane::script::grpc::FigureDescriptor_BusinessCalendarDescriptor_LocalDate* release_date();
-  ::io::deephaven::proto::backplane::script::grpc::FigureDescriptor_BusinessCalendarDescriptor_LocalDate* mutable_date();
-  void set_allocated_date(::io::deephaven::proto::backplane::script::grpc::FigureDescriptor_BusinessCalendarDescriptor_LocalDate* value);
-  void unsafe_arena_set_allocated_date(::io::deephaven::proto::backplane::script::grpc::FigureDescriptor_BusinessCalendarDescriptor_LocalDate* value);
-  ::io::deephaven::proto::backplane::script::grpc::FigureDescriptor_BusinessCalendarDescriptor_LocalDate* unsafe_arena_release_date();
-
-  private:
-  const ::io::deephaven::proto::backplane::script::grpc::FigureDescriptor_BusinessCalendarDescriptor_LocalDate& _internal_date() const;
-  ::io::deephaven::proto::backplane::script::grpc::FigureDescriptor_BusinessCalendarDescriptor_LocalDate* _internal_mutable_date();
-
-  public:
-  // @@protoc_insertion_point(class_scope:io.deephaven.proto.backplane.script.grpc.FigureDescriptor.BusinessCalendarDescriptor.Holiday)
- private:
-  class _Internal;
-
-  friend class ::google::protobuf::internal::TcParser;
-  static const ::google::protobuf::internal::TcParseTable<
-      1, 2, 2,
-      0, 2>
-      _table_;
-  friend class ::google::protobuf::MessageLite;
-  friend class ::google::protobuf::Arena;
-  template <typename T>
-  friend class ::google::protobuf::Arena::InternalHelper;
-  using InternalArenaConstructable_ = void;
-  using DestructorSkippable_ = void;
-  struct Impl_ {
-
-        inline explicit constexpr Impl_(
-            ::google::protobuf::internal::ConstantInitialized) noexcept;
-        inline explicit Impl_(::google::protobuf::internal::InternalVisibility visibility,
-                              ::google::protobuf::Arena* arena);
-        inline explicit Impl_(::google::protobuf::internal::InternalVisibility visibility,
-                              ::google::protobuf::Arena* arena, const Impl_& from);
-    ::google::protobuf::internal::HasBits<1> _has_bits_;
-    mutable ::google::protobuf::internal::CachedSize _cached_size_;
-    ::google::protobuf::RepeatedPtrField< ::io::deephaven::proto::backplane::script::grpc::FigureDescriptor_BusinessCalendarDescriptor_BusinessPeriod > business_periods_;
-    ::io::deephaven::proto::backplane::script::grpc::FigureDescriptor_BusinessCalendarDescriptor_LocalDate* date_;
-    PROTOBUF_TSAN_DECLARE_MEMBER
-  };
-  union { Impl_ _impl_; };
-  friend struct ::TableStruct_deephaven_2fproto_2fconsole_2eproto;
-};// -------------------------------------------------------------------
-
-class ExecuteCommandRequest final :
-    public ::google::protobuf::Message /* @@protoc_insertion_point(class_definition:io.deephaven.proto.backplane.script.grpc.ExecuteCommandRequest) */ {
- public:
-  inline ExecuteCommandRequest() : ExecuteCommandRequest(nullptr) {}
-  ~ExecuteCommandRequest() override;
-  template<typename = void>
-  explicit PROTOBUF_CONSTEXPR ExecuteCommandRequest(::google::protobuf::internal::ConstantInitialized);
-
-  inline ExecuteCommandRequest(const ExecuteCommandRequest& from)
-      : ExecuteCommandRequest(nullptr, from) {}
-  ExecuteCommandRequest(ExecuteCommandRequest&& from) noexcept
-    : ExecuteCommandRequest() {
-    *this = ::std::move(from);
-  }
-
-  inline ExecuteCommandRequest& operator=(const ExecuteCommandRequest& from) {
-    CopyFrom(from);
-    return *this;
-  }
-  inline ExecuteCommandRequest& operator=(ExecuteCommandRequest&& from) noexcept {
-    if (this == &from) return *this;
-    if (GetArena() == from.GetArena()
-  #ifdef PROTOBUF_FORCE_COPY_IN_MOVE
-        && GetArena() != nullptr
-  #endif  // !PROTOBUF_FORCE_COPY_IN_MOVE
-    ) {
-      InternalSwap(&from);
-    } else {
-      CopyFrom(from);
-    }
-    return *this;
-  }
-
-  inline const ::google::protobuf::UnknownFieldSet& unknown_fields() const
-      ABSL_ATTRIBUTE_LIFETIME_BOUND {
-    return _internal_metadata_.unknown_fields<::google::protobuf::UnknownFieldSet>(::google::protobuf::UnknownFieldSet::default_instance);
-  }
-  inline ::google::protobuf::UnknownFieldSet* mutable_unknown_fields()
-      ABSL_ATTRIBUTE_LIFETIME_BOUND {
-    return _internal_metadata_.mutable_unknown_fields<::google::protobuf::UnknownFieldSet>();
-  }
-
-  static const ::google::protobuf::Descriptor* descriptor() {
-    return GetDescriptor();
-  }
-  static const ::google::protobuf::Descriptor* GetDescriptor() {
-    return default_instance().GetMetadata().descriptor;
-  }
-  static const ::google::protobuf::Reflection* GetReflection() {
-    return default_instance().GetMetadata().reflection;
-  }
-  static const ExecuteCommandRequest& default_instance() {
-    return *internal_default_instance();
-  }
-  static inline const ExecuteCommandRequest* internal_default_instance() {
-    return reinterpret_cast<const ExecuteCommandRequest*>(
-               &_ExecuteCommandRequest_default_instance_);
-  }
-  static constexpr int kIndexInFileMessages =
-    8;
-
-  friend void swap(ExecuteCommandRequest& a, ExecuteCommandRequest& b) {
-    a.Swap(&b);
-  }
-  inline void Swap(ExecuteCommandRequest* other) {
-    if (other == this) return;
-  #ifdef PROTOBUF_FORCE_COPY_IN_SWAP
-    if (GetArena() != nullptr &&
-        GetArena() == other->GetArena()) {
-   #else  // PROTOBUF_FORCE_COPY_IN_SWAP
-    if (GetArena() == other->GetArena()) {
-  #endif  // !PROTOBUF_FORCE_COPY_IN_SWAP
-      InternalSwap(other);
-    } else {
-      ::google::protobuf::internal::GenericSwap(this, other);
-    }
-  }
-  void UnsafeArenaSwap(ExecuteCommandRequest* other) {
-    if (other == this) return;
-    ABSL_DCHECK(GetArena() == other->GetArena());
-    InternalSwap(other);
-  }
-
-  // implements Message ----------------------------------------------
-
-  ExecuteCommandRequest* New(::google::protobuf::Arena* arena = nullptr) const final {
-    return CreateMaybeMessage<ExecuteCommandRequest>(arena);
-  }
-  using ::google::protobuf::Message::CopyFrom;
-  void CopyFrom(const ExecuteCommandRequest& from);
-  using ::google::protobuf::Message::MergeFrom;
-  void MergeFrom( const ExecuteCommandRequest& from) {
-    ExecuteCommandRequest::MergeImpl(*this, from);
-  }
-  private:
-  static void MergeImpl(::google::protobuf::Message& to_msg, const ::google::protobuf::Message& from_msg);
-  public:
-  PROTOBUF_ATTRIBUTE_REINITIALIZES void Clear() final;
-  bool IsInitialized() const final;
-
-  ::size_t ByteSizeLong() const final;
-  const char* _InternalParse(const char* ptr, ::google::protobuf::internal::ParseContext* ctx) final;
-  ::uint8_t* _InternalSerialize(
-      ::uint8_t* target, ::google::protobuf::io::EpsCopyOutputStream* stream) const final;
-  int GetCachedSize() const { return _impl_._cached_size_.Get(); }
-
-  private:
-  ::google::protobuf::internal::CachedSize* AccessCachedSize() const final;
-  void SharedCtor(::google::protobuf::Arena* arena);
-  void SharedDtor();
-  void InternalSwap(ExecuteCommandRequest* other);
-
-  private:
-  friend class ::google::protobuf::internal::AnyMetadata;
-  static ::absl::string_view FullMessageName() {
-    return "io.deephaven.proto.backplane.script.grpc.ExecuteCommandRequest";
-  }
-  protected:
-  explicit ExecuteCommandRequest(::google::protobuf::Arena* arena);
-  ExecuteCommandRequest(::google::protobuf::Arena* arena, const ExecuteCommandRequest& from);
-  public:
-
-  static const ClassData _class_data_;
-  const ::google::protobuf::Message::ClassData*GetClassData() const final;
-
-  ::google::protobuf::Metadata GetMetadata() const final;
-
-  // nested types ----------------------------------------------------
-
-  // accessors -------------------------------------------------------
-
-  enum : int {
-    kCodeFieldNumber = 3,
-    kConsoleIdFieldNumber = 1,
-  };
-  // string code = 3;
-  void clear_code() ;
-  const std::string& code() const;
-  template <typename Arg_ = const std::string&, typename... Args_>
-  void set_code(Arg_&& arg, Args_... args);
-  std::string* mutable_code();
-  PROTOBUF_NODISCARD std::string* release_code();
-  void set_allocated_code(std::string* value);
-
-  private:
-  const std::string& _internal_code() const;
-  inline PROTOBUF_ALWAYS_INLINE void _internal_set_code(
-      const std::string& value);
-  std::string* _internal_mutable_code();
-
-  public:
-  // .io.deephaven.proto.backplane.grpc.Ticket console_id = 1;
-  bool has_console_id() const;
-  void clear_console_id() ;
-  const ::io::deephaven::proto::backplane::grpc::Ticket& console_id() const;
-  PROTOBUF_NODISCARD ::io::deephaven::proto::backplane::grpc::Ticket* release_console_id();
-  ::io::deephaven::proto::backplane::grpc::Ticket* mutable_console_id();
-  void set_allocated_console_id(::io::deephaven::proto::backplane::grpc::Ticket* value);
-  void unsafe_arena_set_allocated_console_id(::io::deephaven::proto::backplane::grpc::Ticket* value);
-  ::io::deephaven::proto::backplane::grpc::Ticket* unsafe_arena_release_console_id();
-
-  private:
-  const ::io::deephaven::proto::backplane::grpc::Ticket& _internal_console_id() const;
-  ::io::deephaven::proto::backplane::grpc::Ticket* _internal_mutable_console_id();
-
-  public:
-  // @@protoc_insertion_point(class_scope:io.deephaven.proto.backplane.script.grpc.ExecuteCommandRequest)
- private:
-  class _Internal;
-
-  friend class ::google::protobuf::internal::TcParser;
-  static const ::google::protobuf::internal::TcParseTable<
-      2, 2, 1,
-      75, 2>
-      _table_;
-  friend class ::google::protobuf::MessageLite;
-  friend class ::google::protobuf::Arena;
-  template <typename T>
-  friend class ::google::protobuf::Arena::InternalHelper;
-  using InternalArenaConstructable_ = void;
-  using DestructorSkippable_ = void;
-  struct Impl_ {
-
-        inline explicit constexpr Impl_(
-            ::google::protobuf::internal::ConstantInitialized) noexcept;
-        inline explicit Impl_(::google::protobuf::internal::InternalVisibility visibility,
-                              ::google::protobuf::Arena* arena);
-        inline explicit Impl_(::google::protobuf::internal::InternalVisibility visibility,
-                              ::google::protobuf::Arena* arena, const Impl_& from);
-    ::google::protobuf::internal::HasBits<1> _has_bits_;
-    mutable ::google::protobuf::internal::CachedSize _cached_size_;
-    ::google::protobuf::internal::ArenaStringPtr code_;
-    ::io::deephaven::proto::backplane::grpc::Ticket* console_id_;
-    PROTOBUF_TSAN_DECLARE_MEMBER
-  };
-  union { Impl_ _impl_; };
-  friend struct ::TableStruct_deephaven_2fproto_2fconsole_2eproto;
-};// -------------------------------------------------------------------
-
-class DocumentRange final :
-    public ::google::protobuf::Message /* @@protoc_insertion_point(class_definition:io.deephaven.proto.backplane.script.grpc.DocumentRange) */ {
- public:
-  inline DocumentRange() : DocumentRange(nullptr) {}
-  ~DocumentRange() override;
-  template<typename = void>
-  explicit PROTOBUF_CONSTEXPR DocumentRange(::google::protobuf::internal::ConstantInitialized);
-
-  inline DocumentRange(const DocumentRange& from)
-      : DocumentRange(nullptr, from) {}
-  DocumentRange(DocumentRange&& from) noexcept
-    : DocumentRange() {
-    *this = ::std::move(from);
-  }
-
-  inline DocumentRange& operator=(const DocumentRange& from) {
-    CopyFrom(from);
-    return *this;
-  }
-  inline DocumentRange& operator=(DocumentRange&& from) noexcept {
-    if (this == &from) return *this;
-    if (GetArena() == from.GetArena()
-  #ifdef PROTOBUF_FORCE_COPY_IN_MOVE
-        && GetArena() != nullptr
-  #endif  // !PROTOBUF_FORCE_COPY_IN_MOVE
-    ) {
-      InternalSwap(&from);
-    } else {
-      CopyFrom(from);
-    }
-    return *this;
-  }
-
-  inline const ::google::protobuf::UnknownFieldSet& unknown_fields() const
-      ABSL_ATTRIBUTE_LIFETIME_BOUND {
-    return _internal_metadata_.unknown_fields<::google::protobuf::UnknownFieldSet>(::google::protobuf::UnknownFieldSet::default_instance);
-  }
-  inline ::google::protobuf::UnknownFieldSet* mutable_unknown_fields()
-      ABSL_ATTRIBUTE_LIFETIME_BOUND {
-    return _internal_metadata_.mutable_unknown_fields<::google::protobuf::UnknownFieldSet>();
-  }
-
-  static const ::google::protobuf::Descriptor* descriptor() {
-    return GetDescriptor();
-  }
-  static const ::google::protobuf::Descriptor* GetDescriptor() {
-    return default_instance().GetMetadata().descriptor;
-  }
-  static const ::google::protobuf::Reflection* GetReflection() {
-    return default_instance().GetMetadata().reflection;
-  }
-  static const DocumentRange& default_instance() {
-    return *internal_default_instance();
-  }
-  static inline const DocumentRange* internal_default_instance() {
-    return reinterpret_cast<const DocumentRange*>(
-               &_DocumentRange_default_instance_);
-  }
-  static constexpr int kIndexInFileMessages =
-    24;
-
-  friend void swap(DocumentRange& a, DocumentRange& b) {
-    a.Swap(&b);
-  }
-  inline void Swap(DocumentRange* other) {
-    if (other == this) return;
-  #ifdef PROTOBUF_FORCE_COPY_IN_SWAP
-    if (GetArena() != nullptr &&
-        GetArena() == other->GetArena()) {
-   #else  // PROTOBUF_FORCE_COPY_IN_SWAP
-    if (GetArena() == other->GetArena()) {
-  #endif  // !PROTOBUF_FORCE_COPY_IN_SWAP
-      InternalSwap(other);
-    } else {
-      ::google::protobuf::internal::GenericSwap(this, other);
-    }
-  }
-  void UnsafeArenaSwap(DocumentRange* other) {
-    if (other == this) return;
-    ABSL_DCHECK(GetArena() == other->GetArena());
-    InternalSwap(other);
-  }
-
-  // implements Message ----------------------------------------------
-
-  DocumentRange* New(::google::protobuf::Arena* arena = nullptr) const final {
-    return CreateMaybeMessage<DocumentRange>(arena);
-  }
-  using ::google::protobuf::Message::CopyFrom;
-  void CopyFrom(const DocumentRange& from);
-  using ::google::protobuf::Message::MergeFrom;
-  void MergeFrom( const DocumentRange& from) {
-    DocumentRange::MergeImpl(*this, from);
-  }
-  private:
-  static void MergeImpl(::google::protobuf::Message& to_msg, const ::google::protobuf::Message& from_msg);
-  public:
-  PROTOBUF_ATTRIBUTE_REINITIALIZES void Clear() final;
-  bool IsInitialized() const final;
-
-  ::size_t ByteSizeLong() const final;
-  const char* _InternalParse(const char* ptr, ::google::protobuf::internal::ParseContext* ctx) final;
-  ::uint8_t* _InternalSerialize(
-      ::uint8_t* target, ::google::protobuf::io::EpsCopyOutputStream* stream) const final;
-  int GetCachedSize() const { return _impl_._cached_size_.Get(); }
-
-  private:
-  ::google::protobuf::internal::CachedSize* AccessCachedSize() const final;
-  void SharedCtor(::google::protobuf::Arena* arena);
-  void SharedDtor();
-  void InternalSwap(DocumentRange* other);
-
-  private:
-  friend class ::google::protobuf::internal::AnyMetadata;
-  static ::absl::string_view FullMessageName() {
-    return "io.deephaven.proto.backplane.script.grpc.DocumentRange";
-  }
-  protected:
-  explicit DocumentRange(::google::protobuf::Arena* arena);
-  DocumentRange(::google::protobuf::Arena* arena, const DocumentRange& from);
-  public:
-
-  static const ClassData _class_data_;
-  const ::google::protobuf::Message::ClassData*GetClassData() const final;
-
-  ::google::protobuf::Metadata GetMetadata() const final;
-
-  // nested types ----------------------------------------------------
-
-  // accessors -------------------------------------------------------
-
-  enum : int {
-    kStartFieldNumber = 1,
-    kEndFieldNumber = 2,
-  };
-  // .io.deephaven.proto.backplane.script.grpc.Position start = 1;
-  bool has_start() const;
-  void clear_start() ;
-  const ::io::deephaven::proto::backplane::script::grpc::Position& start() const;
-  PROTOBUF_NODISCARD ::io::deephaven::proto::backplane::script::grpc::Position* release_start();
-  ::io::deephaven::proto::backplane::script::grpc::Position* mutable_start();
-  void set_allocated_start(::io::deephaven::proto::backplane::script::grpc::Position* value);
-  void unsafe_arena_set_allocated_start(::io::deephaven::proto::backplane::script::grpc::Position* value);
-  ::io::deephaven::proto::backplane::script::grpc::Position* unsafe_arena_release_start();
-
-  private:
-  const ::io::deephaven::proto::backplane::script::grpc::Position& _internal_start() const;
-  ::io::deephaven::proto::backplane::script::grpc::Position* _internal_mutable_start();
-
-  public:
-  // .io.deephaven.proto.backplane.script.grpc.Position end = 2;
-  bool has_end() const;
-  void clear_end() ;
-  const ::io::deephaven::proto::backplane::script::grpc::Position& end() const;
-  PROTOBUF_NODISCARD ::io::deephaven::proto::backplane::script::grpc::Position* release_end();
-  ::io::deephaven::proto::backplane::script::grpc::Position* mutable_end();
-  void set_allocated_end(::io::deephaven::proto::backplane::script::grpc::Position* value);
-  void unsafe_arena_set_allocated_end(::io::deephaven::proto::backplane::script::grpc::Position* value);
-  ::io::deephaven::proto::backplane::script::grpc::Position* unsafe_arena_release_end();
-
-  private:
-  const ::io::deephaven::proto::backplane::script::grpc::Position& _internal_end() const;
-  ::io::deephaven::proto::backplane::script::grpc::Position* _internal_mutable_end();
-
-  public:
-  // @@protoc_insertion_point(class_scope:io.deephaven.proto.backplane.script.grpc.DocumentRange)
- private:
-  class _Internal;
-
-  friend class ::google::protobuf::internal::TcParser;
-  static const ::google::protobuf::internal::TcParseTable<
-      1, 2, 2,
-      0, 2>
-      _table_;
-  friend class ::google::protobuf::MessageLite;
-  friend class ::google::protobuf::Arena;
-  template <typename T>
-  friend class ::google::protobuf::Arena::InternalHelper;
-  using InternalArenaConstructable_ = void;
-  using DestructorSkippable_ = void;
-  struct Impl_ {
-
-        inline explicit constexpr Impl_(
-            ::google::protobuf::internal::ConstantInitialized) noexcept;
-        inline explicit Impl_(::google::protobuf::internal::InternalVisibility visibility,
-                              ::google::protobuf::Arena* arena);
-        inline explicit Impl_(::google::protobuf::internal::InternalVisibility visibility,
-                              ::google::protobuf::Arena* arena, const Impl_& from);
-    ::google::protobuf::internal::HasBits<1> _has_bits_;
-    mutable ::google::protobuf::internal::CachedSize _cached_size_;
-    ::io::deephaven::proto::backplane::script::grpc::Position* start_;
-    ::io::deephaven::proto::backplane::script::grpc::Position* end_;
-    PROTOBUF_TSAN_DECLARE_MEMBER
-  };
-  union { Impl_ _impl_; };
-  friend struct ::TableStruct_deephaven_2fproto_2fconsole_2eproto;
-};// -------------------------------------------------------------------
-
-class CloseDocumentRequest final :
-    public ::google::protobuf::Message /* @@protoc_insertion_point(class_definition:io.deephaven.proto.backplane.script.grpc.CloseDocumentRequest) */ {
- public:
-  inline CloseDocumentRequest() : CloseDocumentRequest(nullptr) {}
-  ~CloseDocumentRequest() override;
-  template<typename = void>
-  explicit PROTOBUF_CONSTEXPR CloseDocumentRequest(::google::protobuf::internal::ConstantInitialized);
-
-  inline CloseDocumentRequest(const CloseDocumentRequest& from)
-      : CloseDocumentRequest(nullptr, from) {}
-  CloseDocumentRequest(CloseDocumentRequest&& from) noexcept
-    : CloseDocumentRequest() {
-    *this = ::std::move(from);
-  }
-
-  inline CloseDocumentRequest& operator=(const CloseDocumentRequest& from) {
-    CopyFrom(from);
-    return *this;
-  }
-  inline CloseDocumentRequest& operator=(CloseDocumentRequest&& from) noexcept {
-    if (this == &from) return *this;
-    if (GetArena() == from.GetArena()
-  #ifdef PROTOBUF_FORCE_COPY_IN_MOVE
-        && GetArena() != nullptr
-  #endif  // !PROTOBUF_FORCE_COPY_IN_MOVE
-    ) {
-      InternalSwap(&from);
-    } else {
-      CopyFrom(from);
-    }
-    return *this;
-  }
-
-  inline const ::google::protobuf::UnknownFieldSet& unknown_fields() const
-      ABSL_ATTRIBUTE_LIFETIME_BOUND {
-    return _internal_metadata_.unknown_fields<::google::protobuf::UnknownFieldSet>(::google::protobuf::UnknownFieldSet::default_instance);
-  }
-  inline ::google::protobuf::UnknownFieldSet* mutable_unknown_fields()
-      ABSL_ATTRIBUTE_LIFETIME_BOUND {
-    return _internal_metadata_.mutable_unknown_fields<::google::protobuf::UnknownFieldSet>();
-  }
-
-  static const ::google::protobuf::Descriptor* descriptor() {
-    return GetDescriptor();
-  }
-  static const ::google::protobuf::Descriptor* GetDescriptor() {
-    return default_instance().GetMetadata().descriptor;
-  }
-  static const ::google::protobuf::Reflection* GetReflection() {
-    return default_instance().GetMetadata().reflection;
-  }
-  static const CloseDocumentRequest& default_instance() {
-    return *internal_default_instance();
-  }
-  static inline const CloseDocumentRequest* internal_default_instance() {
-    return reinterpret_cast<const CloseDocumentRequest*>(
-               &_CloseDocumentRequest_default_instance_);
-  }
-  static constexpr int kIndexInFileMessages =
-    21;
-
-  friend void swap(CloseDocumentRequest& a, CloseDocumentRequest& b) {
-    a.Swap(&b);
-  }
-  inline void Swap(CloseDocumentRequest* other) {
-    if (other == this) return;
-  #ifdef PROTOBUF_FORCE_COPY_IN_SWAP
-    if (GetArena() != nullptr &&
-        GetArena() == other->GetArena()) {
-   #else  // PROTOBUF_FORCE_COPY_IN_SWAP
-    if (GetArena() == other->GetArena()) {
-  #endif  // !PROTOBUF_FORCE_COPY_IN_SWAP
-      InternalSwap(other);
-    } else {
-      ::google::protobuf::internal::GenericSwap(this, other);
-    }
-  }
-  void UnsafeArenaSwap(CloseDocumentRequest* other) {
-    if (other == this) return;
-    ABSL_DCHECK(GetArena() == other->GetArena());
-    InternalSwap(other);
-  }
-
-  // implements Message ----------------------------------------------
-
-  CloseDocumentRequest* New(::google::protobuf::Arena* arena = nullptr) const final {
-    return CreateMaybeMessage<CloseDocumentRequest>(arena);
-  }
-  using ::google::protobuf::Message::CopyFrom;
-  void CopyFrom(const CloseDocumentRequest& from);
-  using ::google::protobuf::Message::MergeFrom;
-  void MergeFrom( const CloseDocumentRequest& from) {
-    CloseDocumentRequest::MergeImpl(*this, from);
-  }
-  private:
-  static void MergeImpl(::google::protobuf::Message& to_msg, const ::google::protobuf::Message& from_msg);
-  public:
-  PROTOBUF_ATTRIBUTE_REINITIALIZES void Clear() final;
-  bool IsInitialized() const final;
-
-  ::size_t ByteSizeLong() const final;
-  const char* _InternalParse(const char* ptr, ::google::protobuf::internal::ParseContext* ctx) final;
-  ::uint8_t* _InternalSerialize(
-      ::uint8_t* target, ::google::protobuf::io::EpsCopyOutputStream* stream) const final;
-  int GetCachedSize() const { return _impl_._cached_size_.Get(); }
-
-  private:
-  ::google::protobuf::internal::CachedSize* AccessCachedSize() const final;
-  void SharedCtor(::google::protobuf::Arena* arena);
-  void SharedDtor();
-  void InternalSwap(CloseDocumentRequest* other);
-
-  private:
-  friend class ::google::protobuf::internal::AnyMetadata;
-  static ::absl::string_view FullMessageName() {
-    return "io.deephaven.proto.backplane.script.grpc.CloseDocumentRequest";
-  }
-  protected:
-  explicit CloseDocumentRequest(::google::protobuf::Arena* arena);
-  CloseDocumentRequest(::google::protobuf::Arena* arena, const CloseDocumentRequest& from);
-  public:
-
-  static const ClassData _class_data_;
-  const ::google::protobuf::Message::ClassData*GetClassData() const final;
-
-  ::google::protobuf::Metadata GetMetadata() const final;
-
-  // nested types ----------------------------------------------------
-
-  // accessors -------------------------------------------------------
-
-  enum : int {
-    kConsoleIdFieldNumber = 1,
-    kTextDocumentFieldNumber = 2,
-  };
-  // .io.deephaven.proto.backplane.grpc.Ticket console_id = 1 [deprecated = true];
-  [[deprecated]]  bool has_console_id() const;
-  [[deprecated]]  void clear_console_id() ;
-  [[deprecated]] const ::io::deephaven::proto::backplane::grpc::Ticket& console_id() const;
-  [[deprecated]] PROTOBUF_NODISCARD ::io::deephaven::proto::backplane::grpc::Ticket* release_console_id();
-  [[deprecated]] ::io::deephaven::proto::backplane::grpc::Ticket* mutable_console_id();
-  [[deprecated]] void set_allocated_console_id(::io::deephaven::proto::backplane::grpc::Ticket* value);
-  [[deprecated]] void unsafe_arena_set_allocated_console_id(::io::deephaven::proto::backplane::grpc::Ticket* value);
-  [[deprecated]] ::io::deephaven::proto::backplane::grpc::Ticket* unsafe_arena_release_console_id();
-
-  private:
-  const ::io::deephaven::proto::backplane::grpc::Ticket& _internal_console_id() const;
-  ::io::deephaven::proto::backplane::grpc::Ticket* _internal_mutable_console_id();
-
-  public:
-  // .io.deephaven.proto.backplane.script.grpc.VersionedTextDocumentIdentifier text_document = 2;
-  bool has_text_document() const;
-  void clear_text_document() ;
-  const ::io::deephaven::proto::backplane::script::grpc::VersionedTextDocumentIdentifier& text_document() const;
-  PROTOBUF_NODISCARD ::io::deephaven::proto::backplane::script::grpc::VersionedTextDocumentIdentifier* release_text_document();
-  ::io::deephaven::proto::backplane::script::grpc::VersionedTextDocumentIdentifier* mutable_text_document();
-  void set_allocated_text_document(::io::deephaven::proto::backplane::script::grpc::VersionedTextDocumentIdentifier* value);
-  void unsafe_arena_set_allocated_text_document(::io::deephaven::proto::backplane::script::grpc::VersionedTextDocumentIdentifier* value);
-  ::io::deephaven::proto::backplane::script::grpc::VersionedTextDocumentIdentifier* unsafe_arena_release_text_document();
-
-  private:
-  const ::io::deephaven::proto::backplane::script::grpc::VersionedTextDocumentIdentifier& _internal_text_document() const;
-  ::io::deephaven::proto::backplane::script::grpc::VersionedTextDocumentIdentifier* _internal_mutable_text_document();
-
-  public:
-  // @@protoc_insertion_point(class_scope:io.deephaven.proto.backplane.script.grpc.CloseDocumentRequest)
- private:
-  class _Internal;
-
-  friend class ::google::protobuf::internal::TcParser;
-  static const ::google::protobuf::internal::TcParseTable<
-      1, 2, 2,
-      0, 2>
-      _table_;
-  friend class ::google::protobuf::MessageLite;
-  friend class ::google::protobuf::Arena;
-  template <typename T>
-  friend class ::google::protobuf::Arena::InternalHelper;
-  using InternalArenaConstructable_ = void;
-  using DestructorSkippable_ = void;
-  struct Impl_ {
-
-        inline explicit constexpr Impl_(
-            ::google::protobuf::internal::ConstantInitialized) noexcept;
-        inline explicit Impl_(::google::protobuf::internal::InternalVisibility visibility,
-                              ::google::protobuf::Arena* arena);
-        inline explicit Impl_(::google::protobuf::internal::InternalVisibility visibility,
-                              ::google::protobuf::Arena* arena, const Impl_& from);
-    ::google::protobuf::internal::HasBits<1> _has_bits_;
-    mutable ::google::protobuf::internal::CachedSize _cached_size_;
-    ::io::deephaven::proto::backplane::grpc::Ticket* console_id_;
-    ::io::deephaven::proto::backplane::script::grpc::VersionedTextDocumentIdentifier* text_document_;
-    PROTOBUF_TSAN_DECLARE_MEMBER
-  };
-  union { Impl_ _impl_; };
-  friend struct ::TableStruct_deephaven_2fproto_2fconsole_2eproto;
-};// -------------------------------------------------------------------
-
-class CancelCommandRequest final :
-    public ::google::protobuf::Message /* @@protoc_insertion_point(class_definition:io.deephaven.proto.backplane.script.grpc.CancelCommandRequest) */ {
- public:
-  inline CancelCommandRequest() : CancelCommandRequest(nullptr) {}
-  ~CancelCommandRequest() override;
-  template<typename = void>
-  explicit PROTOBUF_CONSTEXPR CancelCommandRequest(::google::protobuf::internal::ConstantInitialized);
-
-  inline CancelCommandRequest(const CancelCommandRequest& from)
-      : CancelCommandRequest(nullptr, from) {}
-  CancelCommandRequest(CancelCommandRequest&& from) noexcept
-    : CancelCommandRequest() {
-    *this = ::std::move(from);
-  }
-
-  inline CancelCommandRequest& operator=(const CancelCommandRequest& from) {
-    CopyFrom(from);
-    return *this;
-  }
-  inline CancelCommandRequest& operator=(CancelCommandRequest&& from) noexcept {
-    if (this == &from) return *this;
-    if (GetArena() == from.GetArena()
-  #ifdef PROTOBUF_FORCE_COPY_IN_MOVE
-        && GetArena() != nullptr
-  #endif  // !PROTOBUF_FORCE_COPY_IN_MOVE
-    ) {
-      InternalSwap(&from);
-    } else {
-      CopyFrom(from);
-    }
-    return *this;
-  }
-
-  inline const ::google::protobuf::UnknownFieldSet& unknown_fields() const
-      ABSL_ATTRIBUTE_LIFETIME_BOUND {
-    return _internal_metadata_.unknown_fields<::google::protobuf::UnknownFieldSet>(::google::protobuf::UnknownFieldSet::default_instance);
-  }
-  inline ::google::protobuf::UnknownFieldSet* mutable_unknown_fields()
-      ABSL_ATTRIBUTE_LIFETIME_BOUND {
-    return _internal_metadata_.mutable_unknown_fields<::google::protobuf::UnknownFieldSet>();
-  }
-
-  static const ::google::protobuf::Descriptor* descriptor() {
-    return GetDescriptor();
-  }
-  static const ::google::protobuf::Descriptor* GetDescriptor() {
-    return default_instance().GetMetadata().descriptor;
-  }
-  static const ::google::protobuf::Reflection* GetReflection() {
-    return default_instance().GetMetadata().reflection;
-  }
-  static const CancelCommandRequest& default_instance() {
-    return *internal_default_instance();
-  }
-  static inline const CancelCommandRequest* internal_default_instance() {
-    return reinterpret_cast<const CancelCommandRequest*>(
-               &_CancelCommandRequest_default_instance_);
-  }
-  static constexpr int kIndexInFileMessages =
-    12;
-
-  friend void swap(CancelCommandRequest& a, CancelCommandRequest& b) {
-    a.Swap(&b);
-  }
-  inline void Swap(CancelCommandRequest* other) {
-    if (other == this) return;
-  #ifdef PROTOBUF_FORCE_COPY_IN_SWAP
-    if (GetArena() != nullptr &&
-        GetArena() == other->GetArena()) {
-   #else  // PROTOBUF_FORCE_COPY_IN_SWAP
-    if (GetArena() == other->GetArena()) {
-  #endif  // !PROTOBUF_FORCE_COPY_IN_SWAP
-      InternalSwap(other);
-    } else {
-      ::google::protobuf::internal::GenericSwap(this, other);
-    }
-  }
-  void UnsafeArenaSwap(CancelCommandRequest* other) {
-    if (other == this) return;
-    ABSL_DCHECK(GetArena() == other->GetArena());
-    InternalSwap(other);
-  }
-
-  // implements Message ----------------------------------------------
-
-  CancelCommandRequest* New(::google::protobuf::Arena* arena = nullptr) const final {
-    return CreateMaybeMessage<CancelCommandRequest>(arena);
-  }
-  using ::google::protobuf::Message::CopyFrom;
-  void CopyFrom(const CancelCommandRequest& from);
-  using ::google::protobuf::Message::MergeFrom;
-  void MergeFrom( const CancelCommandRequest& from) {
-    CancelCommandRequest::MergeImpl(*this, from);
-  }
-  private:
-  static void MergeImpl(::google::protobuf::Message& to_msg, const ::google::protobuf::Message& from_msg);
-  public:
-  PROTOBUF_ATTRIBUTE_REINITIALIZES void Clear() final;
-  bool IsInitialized() const final;
-
-  ::size_t ByteSizeLong() const final;
-  const char* _InternalParse(const char* ptr, ::google::protobuf::internal::ParseContext* ctx) final;
-  ::uint8_t* _InternalSerialize(
-      ::uint8_t* target, ::google::protobuf::io::EpsCopyOutputStream* stream) const final;
-  int GetCachedSize() const { return _impl_._cached_size_.Get(); }
-
-  private:
-  ::google::protobuf::internal::CachedSize* AccessCachedSize() const final;
-  void SharedCtor(::google::protobuf::Arena* arena);
-  void SharedDtor();
-  void InternalSwap(CancelCommandRequest* other);
-
-  private:
-  friend class ::google::protobuf::internal::AnyMetadata;
-  static ::absl::string_view FullMessageName() {
-    return "io.deephaven.proto.backplane.script.grpc.CancelCommandRequest";
-  }
-  protected:
-  explicit CancelCommandRequest(::google::protobuf::Arena* arena);
-  CancelCommandRequest(::google::protobuf::Arena* arena, const CancelCommandRequest& from);
-  public:
-
-  static const ClassData _class_data_;
-  const ::google::protobuf::Message::ClassData*GetClassData() const final;
-
-  ::google::protobuf::Metadata GetMetadata() const final;
-
-  // nested types ----------------------------------------------------
-
-  // accessors -------------------------------------------------------
-
-  enum : int {
-    kConsoleIdFieldNumber = 1,
-    kCommandIdFieldNumber = 2,
-  };
-  // .io.deephaven.proto.backplane.grpc.Ticket console_id = 1;
-  bool has_console_id() const;
-  void clear_console_id() ;
-  const ::io::deephaven::proto::backplane::grpc::Ticket& console_id() const;
-  PROTOBUF_NODISCARD ::io::deephaven::proto::backplane::grpc::Ticket* release_console_id();
-  ::io::deephaven::proto::backplane::grpc::Ticket* mutable_console_id();
-  void set_allocated_console_id(::io::deephaven::proto::backplane::grpc::Ticket* value);
-  void unsafe_arena_set_allocated_console_id(::io::deephaven::proto::backplane::grpc::Ticket* value);
-  ::io::deephaven::proto::backplane::grpc::Ticket* unsafe_arena_release_console_id();
-
-  private:
-  const ::io::deephaven::proto::backplane::grpc::Ticket& _internal_console_id() const;
-  ::io::deephaven::proto::backplane::grpc::Ticket* _internal_mutable_console_id();
-
-  public:
-  // .io.deephaven.proto.backplane.grpc.Ticket command_id = 2;
-  bool has_command_id() const;
-  void clear_command_id() ;
-  const ::io::deephaven::proto::backplane::grpc::Ticket& command_id() const;
-  PROTOBUF_NODISCARD ::io::deephaven::proto::backplane::grpc::Ticket* release_command_id();
-  ::io::deephaven::proto::backplane::grpc::Ticket* mutable_command_id();
-  void set_allocated_command_id(::io::deephaven::proto::backplane::grpc::Ticket* value);
-  void unsafe_arena_set_allocated_command_id(::io::deephaven::proto::backplane::grpc::Ticket* value);
-  ::io::deephaven::proto::backplane::grpc::Ticket* unsafe_arena_release_command_id();
-
-  private:
-  const ::io::deephaven::proto::backplane::grpc::Ticket& _internal_command_id() const;
-  ::io::deephaven::proto::backplane::grpc::Ticket* _internal_mutable_command_id();
-
-  public:
-  // @@protoc_insertion_point(class_scope:io.deephaven.proto.backplane.script.grpc.CancelCommandRequest)
- private:
-  class _Internal;
-
-  friend class ::google::protobuf::internal::TcParser;
-  static const ::google::protobuf::internal::TcParseTable<
-      1, 2, 2,
-      0, 2>
-      _table_;
-  friend class ::google::protobuf::MessageLite;
-  friend class ::google::protobuf::Arena;
-  template <typename T>
-  friend class ::google::protobuf::Arena::InternalHelper;
-  using InternalArenaConstructable_ = void;
-  using DestructorSkippable_ = void;
-  struct Impl_ {
-
-        inline explicit constexpr Impl_(
-            ::google::protobuf::internal::ConstantInitialized) noexcept;
-        inline explicit Impl_(::google::protobuf::internal::InternalVisibility visibility,
-                              ::google::protobuf::Arena* arena);
-        inline explicit Impl_(::google::protobuf::internal::InternalVisibility visibility,
-                              ::google::protobuf::Arena* arena, const Impl_& from);
-    ::google::protobuf::internal::HasBits<1> _has_bits_;
-    mutable ::google::protobuf::internal::CachedSize _cached_size_;
-    ::io::deephaven::proto::backplane::grpc::Ticket* console_id_;
-    ::io::deephaven::proto::backplane::grpc::Ticket* command_id_;
-    PROTOBUF_TSAN_DECLARE_MEMBER
-  };
-  union { Impl_ _impl_; };
-  friend struct ::TableStruct_deephaven_2fproto_2fconsole_2eproto;
-};// -------------------------------------------------------------------
-
-class CancelAutoCompleteRequest final :
-    public ::google::protobuf::Message /* @@protoc_insertion_point(class_definition:io.deephaven.proto.backplane.script.grpc.CancelAutoCompleteRequest) */ {
- public:
-  inline CancelAutoCompleteRequest() : CancelAutoCompleteRequest(nullptr) {}
-  ~CancelAutoCompleteRequest() override;
-  template<typename = void>
-  explicit PROTOBUF_CONSTEXPR CancelAutoCompleteRequest(::google::protobuf::internal::ConstantInitialized);
-
-  inline CancelAutoCompleteRequest(const CancelAutoCompleteRequest& from)
-      : CancelAutoCompleteRequest(nullptr, from) {}
-  CancelAutoCompleteRequest(CancelAutoCompleteRequest&& from) noexcept
-    : CancelAutoCompleteRequest() {
-    *this = ::std::move(from);
-  }
-
-  inline CancelAutoCompleteRequest& operator=(const CancelAutoCompleteRequest& from) {
-    CopyFrom(from);
-    return *this;
-  }
-  inline CancelAutoCompleteRequest& operator=(CancelAutoCompleteRequest&& from) noexcept {
-    if (this == &from) return *this;
-    if (GetArena() == from.GetArena()
-  #ifdef PROTOBUF_FORCE_COPY_IN_MOVE
-        && GetArena() != nullptr
-  #endif  // !PROTOBUF_FORCE_COPY_IN_MOVE
-    ) {
-      InternalSwap(&from);
-    } else {
-      CopyFrom(from);
-    }
-    return *this;
-  }
-
-  inline const ::google::protobuf::UnknownFieldSet& unknown_fields() const
-      ABSL_ATTRIBUTE_LIFETIME_BOUND {
-    return _internal_metadata_.unknown_fields<::google::protobuf::UnknownFieldSet>(::google::protobuf::UnknownFieldSet::default_instance);
-  }
-  inline ::google::protobuf::UnknownFieldSet* mutable_unknown_fields()
-      ABSL_ATTRIBUTE_LIFETIME_BOUND {
-    return _internal_metadata_.mutable_unknown_fields<::google::protobuf::UnknownFieldSet>();
-  }
-
-  static const ::google::protobuf::Descriptor* descriptor() {
-    return GetDescriptor();
-  }
-  static const ::google::protobuf::Descriptor* GetDescriptor() {
-    return default_instance().GetMetadata().descriptor;
-  }
-  static const ::google::protobuf::Reflection* GetReflection() {
-    return default_instance().GetMetadata().reflection;
-  }
-  static const CancelAutoCompleteRequest& default_instance() {
-    return *internal_default_instance();
-  }
-  static inline const CancelAutoCompleteRequest* internal_default_instance() {
-    return reinterpret_cast<const CancelAutoCompleteRequest*>(
-               &_CancelAutoCompleteRequest_default_instance_);
-  }
-  static constexpr int kIndexInFileMessages =
-    14;
-
-  friend void swap(CancelAutoCompleteRequest& a, CancelAutoCompleteRequest& b) {
-    a.Swap(&b);
-  }
-  inline void Swap(CancelAutoCompleteRequest* other) {
-    if (other == this) return;
-  #ifdef PROTOBUF_FORCE_COPY_IN_SWAP
-    if (GetArena() != nullptr &&
-        GetArena() == other->GetArena()) {
-   #else  // PROTOBUF_FORCE_COPY_IN_SWAP
-    if (GetArena() == other->GetArena()) {
-  #endif  // !PROTOBUF_FORCE_COPY_IN_SWAP
-      InternalSwap(other);
-    } else {
-      ::google::protobuf::internal::GenericSwap(this, other);
-    }
-  }
-  void UnsafeArenaSwap(CancelAutoCompleteRequest* other) {
-    if (other == this) return;
-    ABSL_DCHECK(GetArena() == other->GetArena());
-    InternalSwap(other);
-  }
-
-  // implements Message ----------------------------------------------
-
-  CancelAutoCompleteRequest* New(::google::protobuf::Arena* arena = nullptr) const final {
-    return CreateMaybeMessage<CancelAutoCompleteRequest>(arena);
-  }
-  using ::google::protobuf::Message::CopyFrom;
-  void CopyFrom(const CancelAutoCompleteRequest& from);
-  using ::google::protobuf::Message::MergeFrom;
-  void MergeFrom( const CancelAutoCompleteRequest& from) {
-    CancelAutoCompleteRequest::MergeImpl(*this, from);
-  }
-  private:
-  static void MergeImpl(::google::protobuf::Message& to_msg, const ::google::protobuf::Message& from_msg);
-  public:
-  PROTOBUF_ATTRIBUTE_REINITIALIZES void Clear() final;
-  bool IsInitialized() const final;
-
-  ::size_t ByteSizeLong() const final;
-  const char* _InternalParse(const char* ptr, ::google::protobuf::internal::ParseContext* ctx) final;
-  ::uint8_t* _InternalSerialize(
-      ::uint8_t* target, ::google::protobuf::io::EpsCopyOutputStream* stream) const final;
-  int GetCachedSize() const { return _impl_._cached_size_.Get(); }
-
-  private:
-  ::google::protobuf::internal::CachedSize* AccessCachedSize() const final;
-  void SharedCtor(::google::protobuf::Arena* arena);
-  void SharedDtor();
-  void InternalSwap(CancelAutoCompleteRequest* other);
-
-  private:
-  friend class ::google::protobuf::internal::AnyMetadata;
-  static ::absl::string_view FullMessageName() {
-    return "io.deephaven.proto.backplane.script.grpc.CancelAutoCompleteRequest";
-  }
-  protected:
-  explicit CancelAutoCompleteRequest(::google::protobuf::Arena* arena);
-  CancelAutoCompleteRequest(::google::protobuf::Arena* arena, const CancelAutoCompleteRequest& from);
-  public:
-
-  static const ClassData _class_data_;
-  const ::google::protobuf::Message::ClassData*GetClassData() const final;
-
-  ::google::protobuf::Metadata GetMetadata() const final;
-
-  // nested types ----------------------------------------------------
-
-  // accessors -------------------------------------------------------
-
-  enum : int {
-    kConsoleIdFieldNumber = 1,
-    kRequestIdFieldNumber = 2,
-  };
-  // .io.deephaven.proto.backplane.grpc.Ticket console_id = 1;
-  bool has_console_id() const;
-  void clear_console_id() ;
-  const ::io::deephaven::proto::backplane::grpc::Ticket& console_id() const;
-  PROTOBUF_NODISCARD ::io::deephaven::proto::backplane::grpc::Ticket* release_console_id();
-  ::io::deephaven::proto::backplane::grpc::Ticket* mutable_console_id();
-  void set_allocated_console_id(::io::deephaven::proto::backplane::grpc::Ticket* value);
-  void unsafe_arena_set_allocated_console_id(::io::deephaven::proto::backplane::grpc::Ticket* value);
-  ::io::deephaven::proto::backplane::grpc::Ticket* unsafe_arena_release_console_id();
-
-  private:
-  const ::io::deephaven::proto::backplane::grpc::Ticket& _internal_console_id() const;
-  ::io::deephaven::proto::backplane::grpc::Ticket* _internal_mutable_console_id();
-
-  public:
-  // int32 request_id = 2;
-  void clear_request_id() ;
-  ::int32_t request_id() const;
-  void set_request_id(::int32_t value);
-
-  private:
-  ::int32_t _internal_request_id() const;
-  void _internal_set_request_id(::int32_t value);
-
-  public:
-  // @@protoc_insertion_point(class_scope:io.deephaven.proto.backplane.script.grpc.CancelAutoCompleteRequest)
- private:
-  class _Internal;
-
-  friend class ::google::protobuf::internal::TcParser;
-  static const ::google::protobuf::internal::TcParseTable<
-      1, 2, 1,
-      0, 2>
-      _table_;
-  friend class ::google::protobuf::MessageLite;
-  friend class ::google::protobuf::Arena;
-  template <typename T>
-  friend class ::google::protobuf::Arena::InternalHelper;
-  using InternalArenaConstructable_ = void;
-  using DestructorSkippable_ = void;
-  struct Impl_ {
-
-        inline explicit constexpr Impl_(
-            ::google::protobuf::internal::ConstantInitialized) noexcept;
-        inline explicit Impl_(::google::protobuf::internal::InternalVisibility visibility,
-                              ::google::protobuf::Arena* arena);
-        inline explicit Impl_(::google::protobuf::internal::InternalVisibility visibility,
-                              ::google::protobuf::Arena* arena, const Impl_& from);
-    ::google::protobuf::internal::HasBits<1> _has_bits_;
-    mutable ::google::protobuf::internal::CachedSize _cached_size_;
-    ::io::deephaven::proto::backplane::grpc::Ticket* console_id_;
-    ::int32_t request_id_;
-    PROTOBUF_TSAN_DECLARE_MEMBER
-  };
-  union { Impl_ _impl_; };
-  friend struct ::TableStruct_deephaven_2fproto_2fconsole_2eproto;
-};// -------------------------------------------------------------------
-
-class BindTableToVariableRequest final :
-    public ::google::protobuf::Message /* @@protoc_insertion_point(class_definition:io.deephaven.proto.backplane.script.grpc.BindTableToVariableRequest) */ {
- public:
-  inline BindTableToVariableRequest() : BindTableToVariableRequest(nullptr) {}
-  ~BindTableToVariableRequest() override;
-  template<typename = void>
-  explicit PROTOBUF_CONSTEXPR BindTableToVariableRequest(::google::protobuf::internal::ConstantInitialized);
-
-  inline BindTableToVariableRequest(const BindTableToVariableRequest& from)
-      : BindTableToVariableRequest(nullptr, from) {}
-  BindTableToVariableRequest(BindTableToVariableRequest&& from) noexcept
-    : BindTableToVariableRequest() {
-    *this = ::std::move(from);
-  }
-
-  inline BindTableToVariableRequest& operator=(const BindTableToVariableRequest& from) {
-    CopyFrom(from);
-    return *this;
-  }
-  inline BindTableToVariableRequest& operator=(BindTableToVariableRequest&& from) noexcept {
-    if (this == &from) return *this;
-    if (GetArena() == from.GetArena()
-  #ifdef PROTOBUF_FORCE_COPY_IN_MOVE
-        && GetArena() != nullptr
-  #endif  // !PROTOBUF_FORCE_COPY_IN_MOVE
-    ) {
-      InternalSwap(&from);
-    } else {
-      CopyFrom(from);
-    }
-    return *this;
-  }
-
-  inline const ::google::protobuf::UnknownFieldSet& unknown_fields() const
-      ABSL_ATTRIBUTE_LIFETIME_BOUND {
-    return _internal_metadata_.unknown_fields<::google::protobuf::UnknownFieldSet>(::google::protobuf::UnknownFieldSet::default_instance);
-  }
-  inline ::google::protobuf::UnknownFieldSet* mutable_unknown_fields()
-      ABSL_ATTRIBUTE_LIFETIME_BOUND {
-    return _internal_metadata_.mutable_unknown_fields<::google::protobuf::UnknownFieldSet>();
-  }
-
-  static const ::google::protobuf::Descriptor* descriptor() {
-    return GetDescriptor();
-  }
-  static const ::google::protobuf::Descriptor* GetDescriptor() {
-    return default_instance().GetMetadata().descriptor;
-  }
-  static const ::google::protobuf::Reflection* GetReflection() {
-    return default_instance().GetMetadata().reflection;
-  }
-  static const BindTableToVariableRequest& default_instance() {
-    return *internal_default_instance();
-  }
-  static inline const BindTableToVariableRequest* internal_default_instance() {
-    return reinterpret_cast<const BindTableToVariableRequest*>(
-               &_BindTableToVariableRequest_default_instance_);
-  }
-  static constexpr int kIndexInFileMessages =
-    10;
-
-  friend void swap(BindTableToVariableRequest& a, BindTableToVariableRequest& b) {
-    a.Swap(&b);
-  }
-  inline void Swap(BindTableToVariableRequest* other) {
-    if (other == this) return;
-  #ifdef PROTOBUF_FORCE_COPY_IN_SWAP
-    if (GetArena() != nullptr &&
-        GetArena() == other->GetArena()) {
-   #else  // PROTOBUF_FORCE_COPY_IN_SWAP
-    if (GetArena() == other->GetArena()) {
-  #endif  // !PROTOBUF_FORCE_COPY_IN_SWAP
-      InternalSwap(other);
-    } else {
-      ::google::protobuf::internal::GenericSwap(this, other);
-    }
-  }
-  void UnsafeArenaSwap(BindTableToVariableRequest* other) {
-    if (other == this) return;
-    ABSL_DCHECK(GetArena() == other->GetArena());
-    InternalSwap(other);
-  }
-
-  // implements Message ----------------------------------------------
-
-  BindTableToVariableRequest* New(::google::protobuf::Arena* arena = nullptr) const final {
-    return CreateMaybeMessage<BindTableToVariableRequest>(arena);
-  }
-  using ::google::protobuf::Message::CopyFrom;
-  void CopyFrom(const BindTableToVariableRequest& from);
-  using ::google::protobuf::Message::MergeFrom;
-  void MergeFrom( const BindTableToVariableRequest& from) {
-    BindTableToVariableRequest::MergeImpl(*this, from);
-  }
-  private:
-  static void MergeImpl(::google::protobuf::Message& to_msg, const ::google::protobuf::Message& from_msg);
-  public:
-  PROTOBUF_ATTRIBUTE_REINITIALIZES void Clear() final;
-  bool IsInitialized() const final;
-
-  ::size_t ByteSizeLong() const final;
-  const char* _InternalParse(const char* ptr, ::google::protobuf::internal::ParseContext* ctx) final;
-  ::uint8_t* _InternalSerialize(
-      ::uint8_t* target, ::google::protobuf::io::EpsCopyOutputStream* stream) const final;
-  int GetCachedSize() const { return _impl_._cached_size_.Get(); }
-
-  private:
-  ::google::protobuf::internal::CachedSize* AccessCachedSize() const final;
-  void SharedCtor(::google::protobuf::Arena* arena);
-  void SharedDtor();
-  void InternalSwap(BindTableToVariableRequest* other);
-
-  private:
-  friend class ::google::protobuf::internal::AnyMetadata;
-  static ::absl::string_view FullMessageName() {
-    return "io.deephaven.proto.backplane.script.grpc.BindTableToVariableRequest";
-  }
-  protected:
-  explicit BindTableToVariableRequest(::google::protobuf::Arena* arena);
-  BindTableToVariableRequest(::google::protobuf::Arena* arena, const BindTableToVariableRequest& from);
-  public:
-
-  static const ClassData _class_data_;
-  const ::google::protobuf::Message::ClassData*GetClassData() const final;
-
-  ::google::protobuf::Metadata GetMetadata() const final;
-
-  // nested types ----------------------------------------------------
-
-  // accessors -------------------------------------------------------
-
-  enum : int {
-    kVariableNameFieldNumber = 3,
-    kConsoleIdFieldNumber = 1,
-    kTableIdFieldNumber = 4,
-  };
-  // string variable_name = 3;
-  void clear_variable_name() ;
-  const std::string& variable_name() const;
-  template <typename Arg_ = const std::string&, typename... Args_>
-  void set_variable_name(Arg_&& arg, Args_... args);
-  std::string* mutable_variable_name();
-  PROTOBUF_NODISCARD std::string* release_variable_name();
-  void set_allocated_variable_name(std::string* value);
-
-  private:
-  const std::string& _internal_variable_name() const;
-  inline PROTOBUF_ALWAYS_INLINE void _internal_set_variable_name(
-      const std::string& value);
-  std::string* _internal_mutable_variable_name();
-
-  public:
-  // .io.deephaven.proto.backplane.grpc.Ticket console_id = 1;
-  bool has_console_id() const;
-  void clear_console_id() ;
-  const ::io::deephaven::proto::backplane::grpc::Ticket& console_id() const;
-  PROTOBUF_NODISCARD ::io::deephaven::proto::backplane::grpc::Ticket* release_console_id();
-  ::io::deephaven::proto::backplane::grpc::Ticket* mutable_console_id();
-  void set_allocated_console_id(::io::deephaven::proto::backplane::grpc::Ticket* value);
-  void unsafe_arena_set_allocated_console_id(::io::deephaven::proto::backplane::grpc::Ticket* value);
-  ::io::deephaven::proto::backplane::grpc::Ticket* unsafe_arena_release_console_id();
-
-  private:
-  const ::io::deephaven::proto::backplane::grpc::Ticket& _internal_console_id() const;
-  ::io::deephaven::proto::backplane::grpc::Ticket* _internal_mutable_console_id();
-
-  public:
-  // .io.deephaven.proto.backplane.grpc.Ticket table_id = 4;
-  bool has_table_id() const;
-  void clear_table_id() ;
-  const ::io::deephaven::proto::backplane::grpc::Ticket& table_id() const;
-  PROTOBUF_NODISCARD ::io::deephaven::proto::backplane::grpc::Ticket* release_table_id();
-  ::io::deephaven::proto::backplane::grpc::Ticket* mutable_table_id();
-  void set_allocated_table_id(::io::deephaven::proto::backplane::grpc::Ticket* value);
-  void unsafe_arena_set_allocated_table_id(::io::deephaven::proto::backplane::grpc::Ticket* value);
-  ::io::deephaven::proto::backplane::grpc::Ticket* unsafe_arena_release_table_id();
-
-  private:
-  const ::io::deephaven::proto::backplane::grpc::Ticket& _internal_table_id() const;
-  ::io::deephaven::proto::backplane::grpc::Ticket* _internal_mutable_table_id();
-
-  public:
-  // @@protoc_insertion_point(class_scope:io.deephaven.proto.backplane.script.grpc.BindTableToVariableRequest)
- private:
-  class _Internal;
-
-  friend class ::google::protobuf::internal::TcParser;
-  static const ::google::protobuf::internal::TcParseTable<
-      2, 3, 2,
-      89, 2>
-      _table_;
-  friend class ::google::protobuf::MessageLite;
-  friend class ::google::protobuf::Arena;
-  template <typename T>
-  friend class ::google::protobuf::Arena::InternalHelper;
-  using InternalArenaConstructable_ = void;
-  using DestructorSkippable_ = void;
-  struct Impl_ {
-
-        inline explicit constexpr Impl_(
-            ::google::protobuf::internal::ConstantInitialized) noexcept;
-        inline explicit Impl_(::google::protobuf::internal::InternalVisibility visibility,
-                              ::google::protobuf::Arena* arena);
-        inline explicit Impl_(::google::protobuf::internal::InternalVisibility visibility,
-                              ::google::protobuf::Arena* arena, const Impl_& from);
-    ::google::protobuf::internal::HasBits<1> _has_bits_;
-    mutable ::google::protobuf::internal::CachedSize _cached_size_;
-    ::google::protobuf::internal::ArenaStringPtr variable_name_;
-    ::io::deephaven::proto::backplane::grpc::Ticket* console_id_;
-    ::io::deephaven::proto::backplane::grpc::Ticket* table_id_;
-    PROTOBUF_TSAN_DECLARE_MEMBER
-  };
-  union { Impl_ _impl_; };
-  friend struct ::TableStruct_deephaven_2fproto_2fconsole_2eproto;
-};// -------------------------------------------------------------------
-
-class TextEdit final :
-    public ::google::protobuf::Message /* @@protoc_insertion_point(class_definition:io.deephaven.proto.backplane.script.grpc.TextEdit) */ {
- public:
-  inline TextEdit() : TextEdit(nullptr) {}
-  ~TextEdit() override;
-  template<typename = void>
-  explicit PROTOBUF_CONSTEXPR TextEdit(::google::protobuf::internal::ConstantInitialized);
-
-  inline TextEdit(const TextEdit& from)
-      : TextEdit(nullptr, from) {}
-  TextEdit(TextEdit&& from) noexcept
-    : TextEdit() {
-    *this = ::std::move(from);
-  }
-
-  inline TextEdit& operator=(const TextEdit& from) {
-    CopyFrom(from);
-    return *this;
-  }
-  inline TextEdit& operator=(TextEdit&& from) noexcept {
-    if (this == &from) return *this;
-    if (GetArena() == from.GetArena()
-  #ifdef PROTOBUF_FORCE_COPY_IN_MOVE
-        && GetArena() != nullptr
-  #endif  // !PROTOBUF_FORCE_COPY_IN_MOVE
-    ) {
-      InternalSwap(&from);
-    } else {
-      CopyFrom(from);
-    }
-    return *this;
-  }
-
-  inline const ::google::protobuf::UnknownFieldSet& unknown_fields() const
-      ABSL_ATTRIBUTE_LIFETIME_BOUND {
-    return _internal_metadata_.unknown_fields<::google::protobuf::UnknownFieldSet>(::google::protobuf::UnknownFieldSet::default_instance);
-  }
-  inline ::google::protobuf::UnknownFieldSet* mutable_unknown_fields()
-      ABSL_ATTRIBUTE_LIFETIME_BOUND {
-    return _internal_metadata_.mutable_unknown_fields<::google::protobuf::UnknownFieldSet>();
-  }
-
-  static const ::google::protobuf::Descriptor* descriptor() {
-    return GetDescriptor();
-  }
-  static const ::google::protobuf::Descriptor* GetDescriptor() {
-    return default_instance().GetMetadata().descriptor;
-  }
-  static const ::google::protobuf::Reflection* GetReflection() {
-    return default_instance().GetMetadata().reflection;
-  }
-  static const TextEdit& default_instance() {
-    return *internal_default_instance();
-  }
-  static inline const TextEdit* internal_default_instance() {
-    return reinterpret_cast<const TextEdit*>(
-               &_TextEdit_default_instance_);
-  }
-  static constexpr int kIndexInFileMessages =
-    32;
-
-  friend void swap(TextEdit& a, TextEdit& b) {
-    a.Swap(&b);
-  }
-  inline void Swap(TextEdit* other) {
-    if (other == this) return;
-  #ifdef PROTOBUF_FORCE_COPY_IN_SWAP
-    if (GetArena() != nullptr &&
-        GetArena() == other->GetArena()) {
-   #else  // PROTOBUF_FORCE_COPY_IN_SWAP
-    if (GetArena() == other->GetArena()) {
-  #endif  // !PROTOBUF_FORCE_COPY_IN_SWAP
-      InternalSwap(other);
-    } else {
-      ::google::protobuf::internal::GenericSwap(this, other);
-    }
-  }
-  void UnsafeArenaSwap(TextEdit* other) {
-    if (other == this) return;
-    ABSL_DCHECK(GetArena() == other->GetArena());
-    InternalSwap(other);
-  }
-
-  // implements Message ----------------------------------------------
-
-  TextEdit* New(::google::protobuf::Arena* arena = nullptr) const final {
-    return CreateMaybeMessage<TextEdit>(arena);
-  }
-  using ::google::protobuf::Message::CopyFrom;
-  void CopyFrom(const TextEdit& from);
-  using ::google::protobuf::Message::MergeFrom;
-  void MergeFrom( const TextEdit& from) {
-    TextEdit::MergeImpl(*this, from);
-  }
-  private:
-  static void MergeImpl(::google::protobuf::Message& to_msg, const ::google::protobuf::Message& from_msg);
-  public:
-  PROTOBUF_ATTRIBUTE_REINITIALIZES void Clear() final;
-  bool IsInitialized() const final;
-
-  ::size_t ByteSizeLong() const final;
-  const char* _InternalParse(const char* ptr, ::google::protobuf::internal::ParseContext* ctx) final;
-  ::uint8_t* _InternalSerialize(
-      ::uint8_t* target, ::google::protobuf::io::EpsCopyOutputStream* stream) const final;
-  int GetCachedSize() const { return _impl_._cached_size_.Get(); }
-
-  private:
-  ::google::protobuf::internal::CachedSize* AccessCachedSize() const final;
-  void SharedCtor(::google::protobuf::Arena* arena);
-  void SharedDtor();
-  void InternalSwap(TextEdit* other);
-
-  private:
-  friend class ::google::protobuf::internal::AnyMetadata;
-  static ::absl::string_view FullMessageName() {
-    return "io.deephaven.proto.backplane.script.grpc.TextEdit";
-  }
-  protected:
-  explicit TextEdit(::google::protobuf::Arena* arena);
-  TextEdit(::google::protobuf::Arena* arena, const TextEdit& from);
-  public:
-
-  static const ClassData _class_data_;
-  const ::google::protobuf::Message::ClassData*GetClassData() const final;
-
-  ::google::protobuf::Metadata GetMetadata() const final;
-
-  // nested types ----------------------------------------------------
-
-  // accessors -------------------------------------------------------
-
-  enum : int {
-    kTextFieldNumber = 2,
-    kRangeFieldNumber = 1,
-  };
-  // string text = 2;
-  void clear_text() ;
-  const std::string& text() const;
-  template <typename Arg_ = const std::string&, typename... Args_>
-  void set_text(Arg_&& arg, Args_... args);
-  std::string* mutable_text();
-  PROTOBUF_NODISCARD std::string* release_text();
-  void set_allocated_text(std::string* value);
-
-  private:
-  const std::string& _internal_text() const;
-  inline PROTOBUF_ALWAYS_INLINE void _internal_set_text(
-      const std::string& value);
-  std::string* _internal_mutable_text();
-
-  public:
-  // .io.deephaven.proto.backplane.script.grpc.DocumentRange range = 1;
-  bool has_range() const;
-  void clear_range() ;
-  const ::io::deephaven::proto::backplane::script::grpc::DocumentRange& range() const;
-  PROTOBUF_NODISCARD ::io::deephaven::proto::backplane::script::grpc::DocumentRange* release_range();
-  ::io::deephaven::proto::backplane::script::grpc::DocumentRange* mutable_range();
-  void set_allocated_range(::io::deephaven::proto::backplane::script::grpc::DocumentRange* value);
-  void unsafe_arena_set_allocated_range(::io::deephaven::proto::backplane::script::grpc::DocumentRange* value);
-  ::io::deephaven::proto::backplane::script::grpc::DocumentRange* unsafe_arena_release_range();
-
-  private:
-  const ::io::deephaven::proto::backplane::script::grpc::DocumentRange& _internal_range() const;
-  ::io::deephaven::proto::backplane::script::grpc::DocumentRange* _internal_mutable_range();
-
-  public:
-  // @@protoc_insertion_point(class_scope:io.deephaven.proto.backplane.script.grpc.TextEdit)
- private:
-  class _Internal;
-
-  friend class ::google::protobuf::internal::TcParser;
-  static const ::google::protobuf::internal::TcParseTable<
-      1, 2, 1,
-      62, 2>
-      _table_;
-  friend class ::google::protobuf::MessageLite;
-  friend class ::google::protobuf::Arena;
-  template <typename T>
-  friend class ::google::protobuf::Arena::InternalHelper;
-  using InternalArenaConstructable_ = void;
-  using DestructorSkippable_ = void;
-  struct Impl_ {
-
-        inline explicit constexpr Impl_(
-            ::google::protobuf::internal::ConstantInitialized) noexcept;
-        inline explicit Impl_(::google::protobuf::internal::InternalVisibility visibility,
-                              ::google::protobuf::Arena* arena);
-        inline explicit Impl_(::google::protobuf::internal::InternalVisibility visibility,
-                              ::google::protobuf::Arena* arena, const Impl_& from);
-    ::google::protobuf::internal::HasBits<1> _has_bits_;
-    mutable ::google::protobuf::internal::CachedSize _cached_size_;
-    ::google::protobuf::internal::ArenaStringPtr text_;
-    ::io::deephaven::proto::backplane::script::grpc::DocumentRange* range_;
-    PROTOBUF_TSAN_DECLARE_MEMBER
-  };
-  union { Impl_ _impl_; };
-  friend struct ::TableStruct_deephaven_2fproto_2fconsole_2eproto;
-};// -------------------------------------------------------------------
-
-class SignatureInformation final :
-    public ::google::protobuf::Message /* @@protoc_insertion_point(class_definition:io.deephaven.proto.backplane.script.grpc.SignatureInformation) */ {
- public:
-  inline SignatureInformation() : SignatureInformation(nullptr) {}
-  ~SignatureInformation() override;
-  template<typename = void>
-  explicit PROTOBUF_CONSTEXPR SignatureInformation(::google::protobuf::internal::ConstantInitialized);
-
-  inline SignatureInformation(const SignatureInformation& from)
-      : SignatureInformation(nullptr, from) {}
-  SignatureInformation(SignatureInformation&& from) noexcept
-    : SignatureInformation() {
-    *this = ::std::move(from);
-  }
-
-  inline SignatureInformation& operator=(const SignatureInformation& from) {
-    CopyFrom(from);
-    return *this;
-  }
-  inline SignatureInformation& operator=(SignatureInformation&& from) noexcept {
-    if (this == &from) return *this;
-    if (GetArena() == from.GetArena()
-  #ifdef PROTOBUF_FORCE_COPY_IN_MOVE
-        && GetArena() != nullptr
-  #endif  // !PROTOBUF_FORCE_COPY_IN_MOVE
-    ) {
-      InternalSwap(&from);
-    } else {
-      CopyFrom(from);
-    }
-    return *this;
-  }
-
-  inline const ::google::protobuf::UnknownFieldSet& unknown_fields() const
-      ABSL_ATTRIBUTE_LIFETIME_BOUND {
-    return _internal_metadata_.unknown_fields<::google::protobuf::UnknownFieldSet>(::google::protobuf::UnknownFieldSet::default_instance);
-  }
-  inline ::google::protobuf::UnknownFieldSet* mutable_unknown_fields()
-      ABSL_ATTRIBUTE_LIFETIME_BOUND {
-    return _internal_metadata_.mutable_unknown_fields<::google::protobuf::UnknownFieldSet>();
-  }
-
-  static const ::google::protobuf::Descriptor* descriptor() {
-    return GetDescriptor();
-  }
-  static const ::google::protobuf::Descriptor* GetDescriptor() {
-    return default_instance().GetMetadata().descriptor;
-  }
-  static const ::google::protobuf::Reflection* GetReflection() {
-    return default_instance().GetMetadata().reflection;
-  }
-  static const SignatureInformation& default_instance() {
-    return *internal_default_instance();
-  }
-  static inline const SignatureInformation* internal_default_instance() {
-    return reinterpret_cast<const SignatureInformation*>(
-               &_SignatureInformation_default_instance_);
-  }
-  static constexpr int kIndexInFileMessages =
-    36;
-
-  friend void swap(SignatureInformation& a, SignatureInformation& b) {
-    a.Swap(&b);
-  }
-  inline void Swap(SignatureInformation* other) {
-    if (other == this) return;
-  #ifdef PROTOBUF_FORCE_COPY_IN_SWAP
-    if (GetArena() != nullptr &&
-        GetArena() == other->GetArena()) {
-   #else  // PROTOBUF_FORCE_COPY_IN_SWAP
-    if (GetArena() == other->GetArena()) {
-  #endif  // !PROTOBUF_FORCE_COPY_IN_SWAP
-      InternalSwap(other);
-    } else {
-      ::google::protobuf::internal::GenericSwap(this, other);
-    }
-  }
-  void UnsafeArenaSwap(SignatureInformation* other) {
-    if (other == this) return;
-    ABSL_DCHECK(GetArena() == other->GetArena());
-    InternalSwap(other);
-  }
-
-  // implements Message ----------------------------------------------
-
-  SignatureInformation* New(::google::protobuf::Arena* arena = nullptr) const final {
-    return CreateMaybeMessage<SignatureInformation>(arena);
-  }
-  using ::google::protobuf::Message::CopyFrom;
-  void CopyFrom(const SignatureInformation& from);
-  using ::google::protobuf::Message::MergeFrom;
-  void MergeFrom( const SignatureInformation& from) {
-    SignatureInformation::MergeImpl(*this, from);
-  }
-  private:
-  static void MergeImpl(::google::protobuf::Message& to_msg, const ::google::protobuf::Message& from_msg);
-  public:
-  PROTOBUF_ATTRIBUTE_REINITIALIZES void Clear() final;
-  bool IsInitialized() const final;
-
-  ::size_t ByteSizeLong() const final;
-  const char* _InternalParse(const char* ptr, ::google::protobuf::internal::ParseContext* ctx) final;
-  ::uint8_t* _InternalSerialize(
-      ::uint8_t* target, ::google::protobuf::io::EpsCopyOutputStream* stream) const final;
-  int GetCachedSize() const { return _impl_._cached_size_.Get(); }
-
-  private:
-  ::google::protobuf::internal::CachedSize* AccessCachedSize() const final;
-  void SharedCtor(::google::protobuf::Arena* arena);
-  void SharedDtor();
-  void InternalSwap(SignatureInformation* other);
-
-  private:
-  friend class ::google::protobuf::internal::AnyMetadata;
-  static ::absl::string_view FullMessageName() {
-    return "io.deephaven.proto.backplane.script.grpc.SignatureInformation";
-  }
-  protected:
-  explicit SignatureInformation(::google::protobuf::Arena* arena);
-  SignatureInformation(::google::protobuf::Arena* arena, const SignatureInformation& from);
-  public:
-
-  static const ClassData _class_data_;
-  const ::google::protobuf::Message::ClassData*GetClassData() const final;
-
-  ::google::protobuf::Metadata GetMetadata() const final;
-
-  // nested types ----------------------------------------------------
-
-  // accessors -------------------------------------------------------
-
-  enum : int {
-    kParametersFieldNumber = 3,
-    kLabelFieldNumber = 1,
-    kDocumentationFieldNumber = 2,
-    kActiveParameterFieldNumber = 4,
-  };
-  // repeated .io.deephaven.proto.backplane.script.grpc.ParameterInformation parameters = 3;
-  int parameters_size() const;
-  private:
-  int _internal_parameters_size() const;
-
-  public:
-  void clear_parameters() ;
-  ::io::deephaven::proto::backplane::script::grpc::ParameterInformation* mutable_parameters(int index);
-  ::google::protobuf::RepeatedPtrField< ::io::deephaven::proto::backplane::script::grpc::ParameterInformation >*
-      mutable_parameters();
-  private:
-  const ::google::protobuf::RepeatedPtrField<::io::deephaven::proto::backplane::script::grpc::ParameterInformation>& _internal_parameters() const;
-  ::google::protobuf::RepeatedPtrField<::io::deephaven::proto::backplane::script::grpc::ParameterInformation>* _internal_mutable_parameters();
-  public:
-  const ::io::deephaven::proto::backplane::script::grpc::ParameterInformation& parameters(int index) const;
-  ::io::deephaven::proto::backplane::script::grpc::ParameterInformation* add_parameters();
-  const ::google::protobuf::RepeatedPtrField< ::io::deephaven::proto::backplane::script::grpc::ParameterInformation >&
-      parameters() const;
-  // string label = 1;
-  void clear_label() ;
-  const std::string& label() const;
-  template <typename Arg_ = const std::string&, typename... Args_>
-  void set_label(Arg_&& arg, Args_... args);
-  std::string* mutable_label();
-  PROTOBUF_NODISCARD std::string* release_label();
-  void set_allocated_label(std::string* value);
-
-  private:
-  const std::string& _internal_label() const;
-  inline PROTOBUF_ALWAYS_INLINE void _internal_set_label(
-      const std::string& value);
-  std::string* _internal_mutable_label();
-
-  public:
-  // .io.deephaven.proto.backplane.script.grpc.MarkupContent documentation = 2;
-  bool has_documentation() const;
-  void clear_documentation() ;
-  const ::io::deephaven::proto::backplane::script::grpc::MarkupContent& documentation() const;
-  PROTOBUF_NODISCARD ::io::deephaven::proto::backplane::script::grpc::MarkupContent* release_documentation();
-  ::io::deephaven::proto::backplane::script::grpc::MarkupContent* mutable_documentation();
-  void set_allocated_documentation(::io::deephaven::proto::backplane::script::grpc::MarkupContent* value);
-  void unsafe_arena_set_allocated_documentation(::io::deephaven::proto::backplane::script::grpc::MarkupContent* value);
-  ::io::deephaven::proto::backplane::script::grpc::MarkupContent* unsafe_arena_release_documentation();
-
-  private:
-  const ::io::deephaven::proto::backplane::script::grpc::MarkupContent& _internal_documentation() const;
-  ::io::deephaven::proto::backplane::script::grpc::MarkupContent* _internal_mutable_documentation();
-
-  public:
-  // optional int32 active_parameter = 4;
-  bool has_active_parameter() const;
-  void clear_active_parameter() ;
-  ::int32_t active_parameter() const;
-  void set_active_parameter(::int32_t value);
-
-  private:
-  ::int32_t _internal_active_parameter() const;
-  void _internal_set_active_parameter(::int32_t value);
-
-  public:
-  // @@protoc_insertion_point(class_scope:io.deephaven.proto.backplane.script.grpc.SignatureInformation)
- private:
-  class _Internal;
-
-  friend class ::google::protobuf::internal::TcParser;
-  static const ::google::protobuf::internal::TcParseTable<
-      2, 4, 2,
-      75, 2>
-      _table_;
-  friend class ::google::protobuf::MessageLite;
-  friend class ::google::protobuf::Arena;
-  template <typename T>
-  friend class ::google::protobuf::Arena::InternalHelper;
-  using InternalArenaConstructable_ = void;
-  using DestructorSkippable_ = void;
-  struct Impl_ {
-
-        inline explicit constexpr Impl_(
-            ::google::protobuf::internal::ConstantInitialized) noexcept;
-        inline explicit Impl_(::google::protobuf::internal::InternalVisibility visibility,
-                              ::google::protobuf::Arena* arena);
-        inline explicit Impl_(::google::protobuf::internal::InternalVisibility visibility,
-                              ::google::protobuf::Arena* arena, const Impl_& from);
-    ::google::protobuf::internal::HasBits<1> _has_bits_;
-    mutable ::google::protobuf::internal::CachedSize _cached_size_;
-    ::google::protobuf::RepeatedPtrField< ::io::deephaven::proto::backplane::script::grpc::ParameterInformation > parameters_;
-    ::google::protobuf::internal::ArenaStringPtr label_;
-    ::io::deephaven::proto::backplane::script::grpc::MarkupContent* documentation_;
-    ::int32_t active_parameter_;
-    PROTOBUF_TSAN_DECLARE_MEMBER
-  };
-  union { Impl_ _impl_; };
-  friend struct ::TableStruct_deephaven_2fproto_2fconsole_2eproto;
-};// -------------------------------------------------------------------
-
-class GetHoverResponse final :
-    public ::google::protobuf::Message /* @@protoc_insertion_point(class_definition:io.deephaven.proto.backplane.script.grpc.GetHoverResponse) */ {
- public:
-  inline GetHoverResponse() : GetHoverResponse(nullptr) {}
-  ~GetHoverResponse() override;
-  template<typename = void>
-  explicit PROTOBUF_CONSTEXPR GetHoverResponse(::google::protobuf::internal::ConstantInitialized);
-
-  inline GetHoverResponse(const GetHoverResponse& from)
-      : GetHoverResponse(nullptr, from) {}
-  GetHoverResponse(GetHoverResponse&& from) noexcept
-    : GetHoverResponse() {
-    *this = ::std::move(from);
-  }
-
-  inline GetHoverResponse& operator=(const GetHoverResponse& from) {
-    CopyFrom(from);
-    return *this;
-  }
-  inline GetHoverResponse& operator=(GetHoverResponse&& from) noexcept {
-    if (this == &from) return *this;
-    if (GetArena() == from.GetArena()
-  #ifdef PROTOBUF_FORCE_COPY_IN_MOVE
-        && GetArena() != nullptr
-  #endif  // !PROTOBUF_FORCE_COPY_IN_MOVE
-    ) {
-      InternalSwap(&from);
-    } else {
-      CopyFrom(from);
-    }
-    return *this;
-  }
-
-  inline const ::google::protobuf::UnknownFieldSet& unknown_fields() const
-      ABSL_ATTRIBUTE_LIFETIME_BOUND {
-    return _internal_metadata_.unknown_fields<::google::protobuf::UnknownFieldSet>(::google::protobuf::UnknownFieldSet::default_instance);
-  }
-  inline ::google::protobuf::UnknownFieldSet* mutable_unknown_fields()
-      ABSL_ATTRIBUTE_LIFETIME_BOUND {
-    return _internal_metadata_.mutable_unknown_fields<::google::protobuf::UnknownFieldSet>();
-  }
-
-  static const ::google::protobuf::Descriptor* descriptor() {
-    return GetDescriptor();
-  }
-  static const ::google::protobuf::Descriptor* GetDescriptor() {
-    return default_instance().GetMetadata().descriptor;
-  }
-  static const ::google::protobuf::Reflection* GetReflection() {
-    return default_instance().GetMetadata().reflection;
-  }
-  static const GetHoverResponse& default_instance() {
-    return *internal_default_instance();
-  }
-  static inline const GetHoverResponse* internal_default_instance() {
-    return reinterpret_cast<const GetHoverResponse*>(
-               &_GetHoverResponse_default_instance_);
-  }
-  static constexpr int kIndexInFileMessages =
-    39;
-
-  friend void swap(GetHoverResponse& a, GetHoverResponse& b) {
-    a.Swap(&b);
-  }
-  inline void Swap(GetHoverResponse* other) {
-    if (other == this) return;
-  #ifdef PROTOBUF_FORCE_COPY_IN_SWAP
-    if (GetArena() != nullptr &&
-        GetArena() == other->GetArena()) {
-   #else  // PROTOBUF_FORCE_COPY_IN_SWAP
-    if (GetArena() == other->GetArena()) {
-  #endif  // !PROTOBUF_FORCE_COPY_IN_SWAP
-      InternalSwap(other);
-    } else {
-      ::google::protobuf::internal::GenericSwap(this, other);
-    }
-  }
-  void UnsafeArenaSwap(GetHoverResponse* other) {
-    if (other == this) return;
-    ABSL_DCHECK(GetArena() == other->GetArena());
-    InternalSwap(other);
-  }
-
-  // implements Message ----------------------------------------------
-
-  GetHoverResponse* New(::google::protobuf::Arena* arena = nullptr) const final {
-    return CreateMaybeMessage<GetHoverResponse>(arena);
-  }
-  using ::google::protobuf::Message::CopyFrom;
-  void CopyFrom(const GetHoverResponse& from);
-  using ::google::protobuf::Message::MergeFrom;
-  void MergeFrom( const GetHoverResponse& from) {
-    GetHoverResponse::MergeImpl(*this, from);
-  }
-  private:
-  static void MergeImpl(::google::protobuf::Message& to_msg, const ::google::protobuf::Message& from_msg);
-  public:
-  PROTOBUF_ATTRIBUTE_REINITIALIZES void Clear() final;
-  bool IsInitialized() const final;
-
-  ::size_t ByteSizeLong() const final;
-  const char* _InternalParse(const char* ptr, ::google::protobuf::internal::ParseContext* ctx) final;
-  ::uint8_t* _InternalSerialize(
-      ::uint8_t* target, ::google::protobuf::io::EpsCopyOutputStream* stream) const final;
-  int GetCachedSize() const { return _impl_._cached_size_.Get(); }
-
-  private:
-  ::google::protobuf::internal::CachedSize* AccessCachedSize() const final;
-  void SharedCtor(::google::protobuf::Arena* arena);
-  void SharedDtor();
-  void InternalSwap(GetHoverResponse* other);
-
-  private:
-  friend class ::google::protobuf::internal::AnyMetadata;
-  static ::absl::string_view FullMessageName() {
-    return "io.deephaven.proto.backplane.script.grpc.GetHoverResponse";
-  }
-  protected:
-  explicit GetHoverResponse(::google::protobuf::Arena* arena);
-  GetHoverResponse(::google::protobuf::Arena* arena, const GetHoverResponse& from);
-  public:
-
-  static const ClassData _class_data_;
-  const ::google::protobuf::Message::ClassData*GetClassData() const final;
-
-  ::google::protobuf::Metadata GetMetadata() const final;
-
-  // nested types ----------------------------------------------------
-
-  // accessors -------------------------------------------------------
-
-  enum : int {
-    kContentsFieldNumber = 1,
-    kRangeFieldNumber = 2,
-  };
-  // .io.deephaven.proto.backplane.script.grpc.MarkupContent contents = 1;
-  bool has_contents() const;
-  void clear_contents() ;
-  const ::io::deephaven::proto::backplane::script::grpc::MarkupContent& contents() const;
-  PROTOBUF_NODISCARD ::io::deephaven::proto::backplane::script::grpc::MarkupContent* release_contents();
-  ::io::deephaven::proto::backplane::script::grpc::MarkupContent* mutable_contents();
-  void set_allocated_contents(::io::deephaven::proto::backplane::script::grpc::MarkupContent* value);
-  void unsafe_arena_set_allocated_contents(::io::deephaven::proto::backplane::script::grpc::MarkupContent* value);
-  ::io::deephaven::proto::backplane::script::grpc::MarkupContent* unsafe_arena_release_contents();
-
-  private:
-  const ::io::deephaven::proto::backplane::script::grpc::MarkupContent& _internal_contents() const;
-  ::io::deephaven::proto::backplane::script::grpc::MarkupContent* _internal_mutable_contents();
-
-  public:
-  // .io.deephaven.proto.backplane.script.grpc.DocumentRange range = 2;
-  bool has_range() const;
-  void clear_range() ;
-  const ::io::deephaven::proto::backplane::script::grpc::DocumentRange& range() const;
-  PROTOBUF_NODISCARD ::io::deephaven::proto::backplane::script::grpc::DocumentRange* release_range();
-  ::io::deephaven::proto::backplane::script::grpc::DocumentRange* mutable_range();
-  void set_allocated_range(::io::deephaven::proto::backplane::script::grpc::DocumentRange* value);
-  void unsafe_arena_set_allocated_range(::io::deephaven::proto::backplane::script::grpc::DocumentRange* value);
-  ::io::deephaven::proto::backplane::script::grpc::DocumentRange* unsafe_arena_release_range();
-
-  private:
-  const ::io::deephaven::proto::backplane::script::grpc::DocumentRange& _internal_range() const;
-  ::io::deephaven::proto::backplane::script::grpc::DocumentRange* _internal_mutable_range();
-
-  public:
-  // @@protoc_insertion_point(class_scope:io.deephaven.proto.backplane.script.grpc.GetHoverResponse)
- private:
-  class _Internal;
-
-  friend class ::google::protobuf::internal::TcParser;
-  static const ::google::protobuf::internal::TcParseTable<
-      1, 2, 2,
-      0, 2>
-      _table_;
-  friend class ::google::protobuf::MessageLite;
-  friend class ::google::protobuf::Arena;
-  template <typename T>
-  friend class ::google::protobuf::Arena::InternalHelper;
-  using InternalArenaConstructable_ = void;
-  using DestructorSkippable_ = void;
-  struct Impl_ {
-
-        inline explicit constexpr Impl_(
-            ::google::protobuf::internal::ConstantInitialized) noexcept;
-        inline explicit Impl_(::google::protobuf::internal::InternalVisibility visibility,
-                              ::google::protobuf::Arena* arena);
-        inline explicit Impl_(::google::protobuf::internal::InternalVisibility visibility,
-                              ::google::protobuf::Arena* arena, const Impl_& from);
-    ::google::protobuf::internal::HasBits<1> _has_bits_;
-    mutable ::google::protobuf::internal::CachedSize _cached_size_;
-    ::io::deephaven::proto::backplane::script::grpc::MarkupContent* contents_;
-    ::io::deephaven::proto::backplane::script::grpc::DocumentRange* range_;
-    PROTOBUF_TSAN_DECLARE_MEMBER
-  };
-  union { Impl_ _impl_; };
-  friend struct ::TableStruct_deephaven_2fproto_2fconsole_2eproto;
-};// -------------------------------------------------------------------
-
-class FigureDescriptor_SeriesDescriptor final :
-    public ::google::protobuf::Message /* @@protoc_insertion_point(class_definition:io.deephaven.proto.backplane.script.grpc.FigureDescriptor.SeriesDescriptor) */ {
- public:
-  inline FigureDescriptor_SeriesDescriptor() : FigureDescriptor_SeriesDescriptor(nullptr) {}
-  ~FigureDescriptor_SeriesDescriptor() override;
-  template<typename = void>
-  explicit PROTOBUF_CONSTEXPR FigureDescriptor_SeriesDescriptor(::google::protobuf::internal::ConstantInitialized);
-
-  inline FigureDescriptor_SeriesDescriptor(const FigureDescriptor_SeriesDescriptor& from)
-      : FigureDescriptor_SeriesDescriptor(nullptr, from) {}
-  FigureDescriptor_SeriesDescriptor(FigureDescriptor_SeriesDescriptor&& from) noexcept
-    : FigureDescriptor_SeriesDescriptor() {
-    *this = ::std::move(from);
-  }
-
-  inline FigureDescriptor_SeriesDescriptor& operator=(const FigureDescriptor_SeriesDescriptor& from) {
-    CopyFrom(from);
-    return *this;
-  }
-  inline FigureDescriptor_SeriesDescriptor& operator=(FigureDescriptor_SeriesDescriptor&& from) noexcept {
-    if (this == &from) return *this;
-    if (GetArena() == from.GetArena()
-  #ifdef PROTOBUF_FORCE_COPY_IN_MOVE
-        && GetArena() != nullptr
-  #endif  // !PROTOBUF_FORCE_COPY_IN_MOVE
-    ) {
-      InternalSwap(&from);
-    } else {
-      CopyFrom(from);
-    }
-    return *this;
-  }
-
-  inline const ::google::protobuf::UnknownFieldSet& unknown_fields() const
-      ABSL_ATTRIBUTE_LIFETIME_BOUND {
-    return _internal_metadata_.unknown_fields<::google::protobuf::UnknownFieldSet>(::google::protobuf::UnknownFieldSet::default_instance);
-  }
-  inline ::google::protobuf::UnknownFieldSet* mutable_unknown_fields()
-      ABSL_ATTRIBUTE_LIFETIME_BOUND {
-    return _internal_metadata_.mutable_unknown_fields<::google::protobuf::UnknownFieldSet>();
-  }
-
-  static const ::google::protobuf::Descriptor* descriptor() {
-    return GetDescriptor();
-  }
-  static const ::google::protobuf::Descriptor* GetDescriptor() {
-    return default_instance().GetMetadata().descriptor;
-  }
-  static const ::google::protobuf::Reflection* GetReflection() {
-    return default_instance().GetMetadata().reflection;
-  }
-  static const FigureDescriptor_SeriesDescriptor& default_instance() {
-    return *internal_default_instance();
-  }
-  static inline const FigureDescriptor_SeriesDescriptor* internal_default_instance() {
-    return reinterpret_cast<const FigureDescriptor_SeriesDescriptor*>(
-               &_FigureDescriptor_SeriesDescriptor_default_instance_);
-  }
-  static constexpr int kIndexInFileMessages =
-    46;
-
-  friend void swap(FigureDescriptor_SeriesDescriptor& a, FigureDescriptor_SeriesDescriptor& b) {
-    a.Swap(&b);
-  }
-  inline void Swap(FigureDescriptor_SeriesDescriptor* other) {
-    if (other == this) return;
-  #ifdef PROTOBUF_FORCE_COPY_IN_SWAP
-    if (GetArena() != nullptr &&
-        GetArena() == other->GetArena()) {
-   #else  // PROTOBUF_FORCE_COPY_IN_SWAP
-    if (GetArena() == other->GetArena()) {
-  #endif  // !PROTOBUF_FORCE_COPY_IN_SWAP
-      InternalSwap(other);
-    } else {
-      ::google::protobuf::internal::GenericSwap(this, other);
-    }
-  }
-  void UnsafeArenaSwap(FigureDescriptor_SeriesDescriptor* other) {
-    if (other == this) return;
-    ABSL_DCHECK(GetArena() == other->GetArena());
-    InternalSwap(other);
-  }
-
-  // implements Message ----------------------------------------------
-
-  FigureDescriptor_SeriesDescriptor* New(::google::protobuf::Arena* arena = nullptr) const final {
-    return CreateMaybeMessage<FigureDescriptor_SeriesDescriptor>(arena);
-  }
-  using ::google::protobuf::Message::CopyFrom;
-  void CopyFrom(const FigureDescriptor_SeriesDescriptor& from);
-  using ::google::protobuf::Message::MergeFrom;
-  void MergeFrom( const FigureDescriptor_SeriesDescriptor& from) {
-    FigureDescriptor_SeriesDescriptor::MergeImpl(*this, from);
-  }
-  private:
-  static void MergeImpl(::google::protobuf::Message& to_msg, const ::google::protobuf::Message& from_msg);
-  public:
-  PROTOBUF_ATTRIBUTE_REINITIALIZES void Clear() final;
-  bool IsInitialized() const final;
-
-  ::size_t ByteSizeLong() const final;
-  const char* _InternalParse(const char* ptr, ::google::protobuf::internal::ParseContext* ctx) final;
-  ::uint8_t* _InternalSerialize(
-      ::uint8_t* target, ::google::protobuf::io::EpsCopyOutputStream* stream) const final;
-  int GetCachedSize() const { return _impl_._cached_size_.Get(); }
-
-  private:
-  ::google::protobuf::internal::CachedSize* AccessCachedSize() const final;
-  void SharedCtor(::google::protobuf::Arena* arena);
-  void SharedDtor();
-  void InternalSwap(FigureDescriptor_SeriesDescriptor* other);
-
-  private:
-  friend class ::google::protobuf::internal::AnyMetadata;
-  static ::absl::string_view FullMessageName() {
-    return "io.deephaven.proto.backplane.script.grpc.FigureDescriptor.SeriesDescriptor";
-  }
-  protected:
-  explicit FigureDescriptor_SeriesDescriptor(::google::protobuf::Arena* arena);
-  FigureDescriptor_SeriesDescriptor(::google::protobuf::Arena* arena, const FigureDescriptor_SeriesDescriptor& from);
-  public:
-
-  static const ClassData _class_data_;
-  const ::google::protobuf::Message::ClassData*GetClassData() const final;
-
-  ::google::protobuf::Metadata GetMetadata() const final;
-
-  // nested types ----------------------------------------------------
-
-  // accessors -------------------------------------------------------
-
-  enum : int {
-    kDataSourcesFieldNumber = 15,
-    kNameFieldNumber = 2,
-    kLineColorFieldNumber = 6,
-    kPointLabelFormatFieldNumber = 8,
-    kXToolTipPatternFieldNumber = 9,
-    kYToolTipPatternFieldNumber = 10,
-    kShapeLabelFieldNumber = 11,
-    kShapeColorFieldNumber = 13,
-    kShapeFieldNumber = 14,
-    kPlotStyleFieldNumber = 1,
-    kLinesVisibleFieldNumber = 3,
-    kShapesVisibleFieldNumber = 4,
-    kGradientVisibleFieldNumber = 5,
-    kShapeSizeFieldNumber = 12,
-  };
-  // repeated .io.deephaven.proto.backplane.script.grpc.FigureDescriptor.SourceDescriptor data_sources = 15;
-  int data_sources_size() const;
-  private:
-  int _internal_data_sources_size() const;
-
-  public:
-  void clear_data_sources() ;
-  ::io::deephaven::proto::backplane::script::grpc::FigureDescriptor_SourceDescriptor* mutable_data_sources(int index);
-  ::google::protobuf::RepeatedPtrField< ::io::deephaven::proto::backplane::script::grpc::FigureDescriptor_SourceDescriptor >*
-      mutable_data_sources();
-  private:
-  const ::google::protobuf::RepeatedPtrField<::io::deephaven::proto::backplane::script::grpc::FigureDescriptor_SourceDescriptor>& _internal_data_sources() const;
-  ::google::protobuf::RepeatedPtrField<::io::deephaven::proto::backplane::script::grpc::FigureDescriptor_SourceDescriptor>* _internal_mutable_data_sources();
-  public:
-  const ::io::deephaven::proto::backplane::script::grpc::FigureDescriptor_SourceDescriptor& data_sources(int index) const;
-  ::io::deephaven::proto::backplane::script::grpc::FigureDescriptor_SourceDescriptor* add_data_sources();
-  const ::google::protobuf::RepeatedPtrField< ::io::deephaven::proto::backplane::script::grpc::FigureDescriptor_SourceDescriptor >&
-      data_sources() const;
-  // string name = 2;
-  void clear_name() ;
-  const std::string& name() const;
-  template <typename Arg_ = const std::string&, typename... Args_>
-  void set_name(Arg_&& arg, Args_... args);
-  std::string* mutable_name();
-  PROTOBUF_NODISCARD std::string* release_name();
-  void set_allocated_name(std::string* value);
-
-  private:
-  const std::string& _internal_name() const;
-  inline PROTOBUF_ALWAYS_INLINE void _internal_set_name(
-      const std::string& value);
-  std::string* _internal_mutable_name();
-
-  public:
-  // string line_color = 6;
-  void clear_line_color() ;
-  const std::string& line_color() const;
-  template <typename Arg_ = const std::string&, typename... Args_>
-  void set_line_color(Arg_&& arg, Args_... args);
-  std::string* mutable_line_color();
-  PROTOBUF_NODISCARD std::string* release_line_color();
-  void set_allocated_line_color(std::string* value);
-
-  private:
-  const std::string& _internal_line_color() const;
-  inline PROTOBUF_ALWAYS_INLINE void _internal_set_line_color(
-      const std::string& value);
-  std::string* _internal_mutable_line_color();
-
-  public:
-  // optional string point_label_format = 8;
-  bool has_point_label_format() const;
-  void clear_point_label_format() ;
-  const std::string& point_label_format() const;
-  template <typename Arg_ = const std::string&, typename... Args_>
-  void set_point_label_format(Arg_&& arg, Args_... args);
-  std::string* mutable_point_label_format();
-  PROTOBUF_NODISCARD std::string* release_point_label_format();
-  void set_allocated_point_label_format(std::string* value);
-
-  private:
-  const std::string& _internal_point_label_format() const;
-  inline PROTOBUF_ALWAYS_INLINE void _internal_set_point_label_format(
-      const std::string& value);
-  std::string* _internal_mutable_point_label_format();
-
-  public:
-  // optional string x_tool_tip_pattern = 9;
-  bool has_x_tool_tip_pattern() const;
-  void clear_x_tool_tip_pattern() ;
-  const std::string& x_tool_tip_pattern() const;
-  template <typename Arg_ = const std::string&, typename... Args_>
-  void set_x_tool_tip_pattern(Arg_&& arg, Args_... args);
-  std::string* mutable_x_tool_tip_pattern();
-  PROTOBUF_NODISCARD std::string* release_x_tool_tip_pattern();
-  void set_allocated_x_tool_tip_pattern(std::string* value);
-
-  private:
-  const std::string& _internal_x_tool_tip_pattern() const;
-  inline PROTOBUF_ALWAYS_INLINE void _internal_set_x_tool_tip_pattern(
-      const std::string& value);
-  std::string* _internal_mutable_x_tool_tip_pattern();
-
-  public:
-  // optional string y_tool_tip_pattern = 10;
-  bool has_y_tool_tip_pattern() const;
-  void clear_y_tool_tip_pattern() ;
-  const std::string& y_tool_tip_pattern() const;
-  template <typename Arg_ = const std::string&, typename... Args_>
-  void set_y_tool_tip_pattern(Arg_&& arg, Args_... args);
-  std::string* mutable_y_tool_tip_pattern();
-  PROTOBUF_NODISCARD std::string* release_y_tool_tip_pattern();
-  void set_allocated_y_tool_tip_pattern(std::string* value);
-
-  private:
-  const std::string& _internal_y_tool_tip_pattern() const;
-  inline PROTOBUF_ALWAYS_INLINE void _internal_set_y_tool_tip_pattern(
-      const std::string& value);
-  std::string* _internal_mutable_y_tool_tip_pattern();
-
-  public:
-  // string shape_label = 11;
-  void clear_shape_label() ;
-  const std::string& shape_label() const;
-  template <typename Arg_ = const std::string&, typename... Args_>
-  void set_shape_label(Arg_&& arg, Args_... args);
-  std::string* mutable_shape_label();
-  PROTOBUF_NODISCARD std::string* release_shape_label();
-  void set_allocated_shape_label(std::string* value);
-
-  private:
-  const std::string& _internal_shape_label() const;
-  inline PROTOBUF_ALWAYS_INLINE void _internal_set_shape_label(
-      const std::string& value);
-  std::string* _internal_mutable_shape_label();
-
-  public:
-  // string shape_color = 13;
-  void clear_shape_color() ;
-  const std::string& shape_color() const;
-  template <typename Arg_ = const std::string&, typename... Args_>
-  void set_shape_color(Arg_&& arg, Args_... args);
-  std::string* mutable_shape_color();
-  PROTOBUF_NODISCARD std::string* release_shape_color();
-  void set_allocated_shape_color(std::string* value);
-
-  private:
-  const std::string& _internal_shape_color() const;
-  inline PROTOBUF_ALWAYS_INLINE void _internal_set_shape_color(
-      const std::string& value);
-  std::string* _internal_mutable_shape_color();
-
-  public:
-  // string shape = 14;
-  void clear_shape() ;
-  const std::string& shape() const;
-  template <typename Arg_ = const std::string&, typename... Args_>
-  void set_shape(Arg_&& arg, Args_... args);
-  std::string* mutable_shape();
-  PROTOBUF_NODISCARD std::string* release_shape();
-  void set_allocated_shape(std::string* value);
-
-  private:
-  const std::string& _internal_shape() const;
-  inline PROTOBUF_ALWAYS_INLINE void _internal_set_shape(
-      const std::string& value);
-  std::string* _internal_mutable_shape();
-
-  public:
-  // .io.deephaven.proto.backplane.script.grpc.FigureDescriptor.SeriesPlotStyle plot_style = 1;
-  void clear_plot_style() ;
-  ::io::deephaven::proto::backplane::script::grpc::FigureDescriptor_SeriesPlotStyle plot_style() const;
-  void set_plot_style(::io::deephaven::proto::backplane::script::grpc::FigureDescriptor_SeriesPlotStyle value);
-
-  private:
-  ::io::deephaven::proto::backplane::script::grpc::FigureDescriptor_SeriesPlotStyle _internal_plot_style() const;
-  void _internal_set_plot_style(::io::deephaven::proto::backplane::script::grpc::FigureDescriptor_SeriesPlotStyle value);
-
-  public:
-  // optional bool lines_visible = 3;
-  bool has_lines_visible() const;
-  void clear_lines_visible() ;
-  bool lines_visible() const;
-  void set_lines_visible(bool value);
-
-  private:
-  bool _internal_lines_visible() const;
-  void _internal_set_lines_visible(bool value);
-
-  public:
-  // optional bool shapes_visible = 4;
-  bool has_shapes_visible() const;
-  void clear_shapes_visible() ;
-  bool shapes_visible() const;
-  void set_shapes_visible(bool value);
-
-  private:
-  bool _internal_shapes_visible() const;
-  void _internal_set_shapes_visible(bool value);
-
-  public:
-  // bool gradient_visible = 5;
-  void clear_gradient_visible() ;
-  bool gradient_visible() const;
-  void set_gradient_visible(bool value);
-
-  private:
-  bool _internal_gradient_visible() const;
-  void _internal_set_gradient_visible(bool value);
-
-  public:
-  // optional double shape_size = 12;
-  bool has_shape_size() const;
-  void clear_shape_size() ;
-  double shape_size() const;
-  void set_shape_size(double value);
-
-  private:
-  double _internal_shape_size() const;
-  void _internal_set_shape_size(double value);
-
-  public:
-  // @@protoc_insertion_point(class_scope:io.deephaven.proto.backplane.script.grpc.FigureDescriptor.SeriesDescriptor)
- private:
-  class _Internal;
-
-  friend class ::google::protobuf::internal::TcParser;
-  static const ::google::protobuf::internal::TcParseTable<
-      4, 14, 1,
-      186, 2>
-      _table_;
-  friend class ::google::protobuf::MessageLite;
-  friend class ::google::protobuf::Arena;
-  template <typename T>
-  friend class ::google::protobuf::Arena::InternalHelper;
-  using InternalArenaConstructable_ = void;
-  using DestructorSkippable_ = void;
-  struct Impl_ {
-
-        inline explicit constexpr Impl_(
-            ::google::protobuf::internal::ConstantInitialized) noexcept;
-        inline explicit Impl_(::google::protobuf::internal::InternalVisibility visibility,
-                              ::google::protobuf::Arena* arena);
-        inline explicit Impl_(::google::protobuf::internal::InternalVisibility visibility,
-                              ::google::protobuf::Arena* arena, const Impl_& from);
-    ::google::protobuf::internal::HasBits<1> _has_bits_;
-    mutable ::google::protobuf::internal::CachedSize _cached_size_;
-    ::google::protobuf::RepeatedPtrField< ::io::deephaven::proto::backplane::script::grpc::FigureDescriptor_SourceDescriptor > data_sources_;
-    ::google::protobuf::internal::ArenaStringPtr name_;
-    ::google::protobuf::internal::ArenaStringPtr line_color_;
-    ::google::protobuf::internal::ArenaStringPtr point_label_format_;
-    ::google::protobuf::internal::ArenaStringPtr x_tool_tip_pattern_;
-    ::google::protobuf::internal::ArenaStringPtr y_tool_tip_pattern_;
-    ::google::protobuf::internal::ArenaStringPtr shape_label_;
-    ::google::protobuf::internal::ArenaStringPtr shape_color_;
-    ::google::protobuf::internal::ArenaStringPtr shape_;
-    int plot_style_;
-    bool lines_visible_;
-    bool shapes_visible_;
-    bool gradient_visible_;
-    double shape_size_;
-    PROTOBUF_TSAN_DECLARE_MEMBER
-  };
-  union { Impl_ _impl_; };
-  friend struct ::TableStruct_deephaven_2fproto_2fconsole_2eproto;
-};// -------------------------------------------------------------------
-
-class FigureDescriptor_BusinessCalendarDescriptor final :
-    public ::google::protobuf::Message /* @@protoc_insertion_point(class_definition:io.deephaven.proto.backplane.script.grpc.FigureDescriptor.BusinessCalendarDescriptor) */ {
- public:
-  inline FigureDescriptor_BusinessCalendarDescriptor() : FigureDescriptor_BusinessCalendarDescriptor(nullptr) {}
-  ~FigureDescriptor_BusinessCalendarDescriptor() override;
-  template<typename = void>
-  explicit PROTOBUF_CONSTEXPR FigureDescriptor_BusinessCalendarDescriptor(::google::protobuf::internal::ConstantInitialized);
-
-  inline FigureDescriptor_BusinessCalendarDescriptor(const FigureDescriptor_BusinessCalendarDescriptor& from)
-      : FigureDescriptor_BusinessCalendarDescriptor(nullptr, from) {}
-  FigureDescriptor_BusinessCalendarDescriptor(FigureDescriptor_BusinessCalendarDescriptor&& from) noexcept
-    : FigureDescriptor_BusinessCalendarDescriptor() {
-    *this = ::std::move(from);
-  }
-
-  inline FigureDescriptor_BusinessCalendarDescriptor& operator=(const FigureDescriptor_BusinessCalendarDescriptor& from) {
-    CopyFrom(from);
-    return *this;
-  }
-  inline FigureDescriptor_BusinessCalendarDescriptor& operator=(FigureDescriptor_BusinessCalendarDescriptor&& from) noexcept {
-    if (this == &from) return *this;
-    if (GetArena() == from.GetArena()
-  #ifdef PROTOBUF_FORCE_COPY_IN_MOVE
-        && GetArena() != nullptr
-  #endif  // !PROTOBUF_FORCE_COPY_IN_MOVE
-    ) {
-      InternalSwap(&from);
-    } else {
-      CopyFrom(from);
-    }
-    return *this;
-  }
-
-  inline const ::google::protobuf::UnknownFieldSet& unknown_fields() const
-      ABSL_ATTRIBUTE_LIFETIME_BOUND {
-    return _internal_metadata_.unknown_fields<::google::protobuf::UnknownFieldSet>(::google::protobuf::UnknownFieldSet::default_instance);
-  }
-  inline ::google::protobuf::UnknownFieldSet* mutable_unknown_fields()
-      ABSL_ATTRIBUTE_LIFETIME_BOUND {
-    return _internal_metadata_.mutable_unknown_fields<::google::protobuf::UnknownFieldSet>();
-  }
-
-  static const ::google::protobuf::Descriptor* descriptor() {
-    return GetDescriptor();
-  }
-  static const ::google::protobuf::Descriptor* GetDescriptor() {
-    return default_instance().GetMetadata().descriptor;
-  }
-  static const ::google::protobuf::Reflection* GetReflection() {
-    return default_instance().GetMetadata().reflection;
-  }
-  static const FigureDescriptor_BusinessCalendarDescriptor& default_instance() {
-    return *internal_default_instance();
-  }
-  static inline const FigureDescriptor_BusinessCalendarDescriptor* internal_default_instance() {
-    return reinterpret_cast<const FigureDescriptor_BusinessCalendarDescriptor*>(
-               &_FigureDescriptor_BusinessCalendarDescriptor_default_instance_);
-  }
-  static constexpr int kIndexInFileMessages =
-    55;
-
-  friend void swap(FigureDescriptor_BusinessCalendarDescriptor& a, FigureDescriptor_BusinessCalendarDescriptor& b) {
-    a.Swap(&b);
-  }
-  inline void Swap(FigureDescriptor_BusinessCalendarDescriptor* other) {
-    if (other == this) return;
-  #ifdef PROTOBUF_FORCE_COPY_IN_SWAP
-    if (GetArena() != nullptr &&
-        GetArena() == other->GetArena()) {
-   #else  // PROTOBUF_FORCE_COPY_IN_SWAP
-    if (GetArena() == other->GetArena()) {
-  #endif  // !PROTOBUF_FORCE_COPY_IN_SWAP
-      InternalSwap(other);
-    } else {
-      ::google::protobuf::internal::GenericSwap(this, other);
-    }
-  }
-  void UnsafeArenaSwap(FigureDescriptor_BusinessCalendarDescriptor* other) {
-    if (other == this) return;
-    ABSL_DCHECK(GetArena() == other->GetArena());
-    InternalSwap(other);
-  }
-
-  // implements Message ----------------------------------------------
-
-  FigureDescriptor_BusinessCalendarDescriptor* New(::google::protobuf::Arena* arena = nullptr) const final {
-    return CreateMaybeMessage<FigureDescriptor_BusinessCalendarDescriptor>(arena);
-  }
-  using ::google::protobuf::Message::CopyFrom;
-  void CopyFrom(const FigureDescriptor_BusinessCalendarDescriptor& from);
-  using ::google::protobuf::Message::MergeFrom;
-  void MergeFrom( const FigureDescriptor_BusinessCalendarDescriptor& from) {
-    FigureDescriptor_BusinessCalendarDescriptor::MergeImpl(*this, from);
-  }
-  private:
-  static void MergeImpl(::google::protobuf::Message& to_msg, const ::google::protobuf::Message& from_msg);
-  public:
-  PROTOBUF_ATTRIBUTE_REINITIALIZES void Clear() final;
-  bool IsInitialized() const final;
-
-  ::size_t ByteSizeLong() const final;
-  const char* _InternalParse(const char* ptr, ::google::protobuf::internal::ParseContext* ctx) final;
-  ::uint8_t* _InternalSerialize(
-      ::uint8_t* target, ::google::protobuf::io::EpsCopyOutputStream* stream) const final;
-  int GetCachedSize() const { return _impl_._cached_size_.Get(); }
-
-  private:
-  ::google::protobuf::internal::CachedSize* AccessCachedSize() const final;
-  void SharedCtor(::google::protobuf::Arena* arena);
-  void SharedDtor();
-  void InternalSwap(FigureDescriptor_BusinessCalendarDescriptor* other);
-
-  private:
-  friend class ::google::protobuf::internal::AnyMetadata;
-  static ::absl::string_view FullMessageName() {
-    return "io.deephaven.proto.backplane.script.grpc.FigureDescriptor.BusinessCalendarDescriptor";
-  }
-  protected:
-  explicit FigureDescriptor_BusinessCalendarDescriptor(::google::protobuf::Arena* arena);
-  FigureDescriptor_BusinessCalendarDescriptor(::google::protobuf::Arena* arena, const FigureDescriptor_BusinessCalendarDescriptor& from);
-  public:
-
-  static const ClassData _class_data_;
-  const ::google::protobuf::Message::ClassData*GetClassData() const final;
-
-  ::google::protobuf::Metadata GetMetadata() const final;
-
-  // nested types ----------------------------------------------------
-
-  using BusinessPeriod = FigureDescriptor_BusinessCalendarDescriptor_BusinessPeriod;
-  using Holiday = FigureDescriptor_BusinessCalendarDescriptor_Holiday;
-  using LocalDate = FigureDescriptor_BusinessCalendarDescriptor_LocalDate;
-
-  using DayOfWeek = FigureDescriptor_BusinessCalendarDescriptor_DayOfWeek;
-  static constexpr DayOfWeek SUNDAY = FigureDescriptor_BusinessCalendarDescriptor_DayOfWeek_SUNDAY;
-  static constexpr DayOfWeek MONDAY = FigureDescriptor_BusinessCalendarDescriptor_DayOfWeek_MONDAY;
-  static constexpr DayOfWeek TUESDAY = FigureDescriptor_BusinessCalendarDescriptor_DayOfWeek_TUESDAY;
-  static constexpr DayOfWeek WEDNESDAY = FigureDescriptor_BusinessCalendarDescriptor_DayOfWeek_WEDNESDAY;
-  static constexpr DayOfWeek THURSDAY = FigureDescriptor_BusinessCalendarDescriptor_DayOfWeek_THURSDAY;
-  static constexpr DayOfWeek FRIDAY = FigureDescriptor_BusinessCalendarDescriptor_DayOfWeek_FRIDAY;
-  static constexpr DayOfWeek SATURDAY = FigureDescriptor_BusinessCalendarDescriptor_DayOfWeek_SATURDAY;
-  static inline bool DayOfWeek_IsValid(int value) {
-    return FigureDescriptor_BusinessCalendarDescriptor_DayOfWeek_IsValid(value);
-  }
-  static constexpr DayOfWeek DayOfWeek_MIN = FigureDescriptor_BusinessCalendarDescriptor_DayOfWeek_DayOfWeek_MIN;
-  static constexpr DayOfWeek DayOfWeek_MAX = FigureDescriptor_BusinessCalendarDescriptor_DayOfWeek_DayOfWeek_MAX;
-  static constexpr int DayOfWeek_ARRAYSIZE = FigureDescriptor_BusinessCalendarDescriptor_DayOfWeek_DayOfWeek_ARRAYSIZE;
-  static inline const ::google::protobuf::EnumDescriptor* DayOfWeek_descriptor() {
-    return FigureDescriptor_BusinessCalendarDescriptor_DayOfWeek_descriptor();
-  }
-  template <typename T>
-  static inline const std::string& DayOfWeek_Name(T value) {
-    return FigureDescriptor_BusinessCalendarDescriptor_DayOfWeek_Name(value);
-  }
-  static inline bool DayOfWeek_Parse(absl::string_view name, DayOfWeek* value) {
-    return FigureDescriptor_BusinessCalendarDescriptor_DayOfWeek_Parse(name, value);
-  }
-
-  // accessors -------------------------------------------------------
-
-  enum : int {
-    kBusinessDaysFieldNumber = 3,
-    kBusinessPeriodsFieldNumber = 4,
-    kHolidaysFieldNumber = 5,
-    kNameFieldNumber = 1,
-    kTimeZoneFieldNumber = 2,
-  };
-  // repeated .io.deephaven.proto.backplane.script.grpc.FigureDescriptor.BusinessCalendarDescriptor.DayOfWeek business_days = 3;
-  int business_days_size() const;
-  private:
-  int _internal_business_days_size() const;
-
-  public:
-  void clear_business_days() ;
-  public:
-  ::io::deephaven::proto::backplane::script::grpc::FigureDescriptor_BusinessCalendarDescriptor_DayOfWeek business_days(int index) const;
-  void set_business_days(int index, ::io::deephaven::proto::backplane::script::grpc::FigureDescriptor_BusinessCalendarDescriptor_DayOfWeek value);
-  void add_business_days(::io::deephaven::proto::backplane::script::grpc::FigureDescriptor_BusinessCalendarDescriptor_DayOfWeek value);
-  const ::google::protobuf::RepeatedField<int>& business_days() const;
-  ::google::protobuf::RepeatedField<int>* mutable_business_days();
-
-  private:
-  const ::google::protobuf::RepeatedField<int>& _internal_business_days() const;
-  ::google::protobuf::RepeatedField<int>* _internal_mutable_business_days();
-
-  public:
-  // repeated .io.deephaven.proto.backplane.script.grpc.FigureDescriptor.BusinessCalendarDescriptor.BusinessPeriod business_periods = 4;
-  int business_periods_size() const;
-  private:
-  int _internal_business_periods_size() const;
-
-  public:
-  void clear_business_periods() ;
-  ::io::deephaven::proto::backplane::script::grpc::FigureDescriptor_BusinessCalendarDescriptor_BusinessPeriod* mutable_business_periods(int index);
-  ::google::protobuf::RepeatedPtrField< ::io::deephaven::proto::backplane::script::grpc::FigureDescriptor_BusinessCalendarDescriptor_BusinessPeriod >*
-      mutable_business_periods();
-  private:
-  const ::google::protobuf::RepeatedPtrField<::io::deephaven::proto::backplane::script::grpc::FigureDescriptor_BusinessCalendarDescriptor_BusinessPeriod>& _internal_business_periods() const;
-  ::google::protobuf::RepeatedPtrField<::io::deephaven::proto::backplane::script::grpc::FigureDescriptor_BusinessCalendarDescriptor_BusinessPeriod>* _internal_mutable_business_periods();
-  public:
-  const ::io::deephaven::proto::backplane::script::grpc::FigureDescriptor_BusinessCalendarDescriptor_BusinessPeriod& business_periods(int index) const;
-  ::io::deephaven::proto::backplane::script::grpc::FigureDescriptor_BusinessCalendarDescriptor_BusinessPeriod* add_business_periods();
-  const ::google::protobuf::RepeatedPtrField< ::io::deephaven::proto::backplane::script::grpc::FigureDescriptor_BusinessCalendarDescriptor_BusinessPeriod >&
-      business_periods() const;
-  // repeated .io.deephaven.proto.backplane.script.grpc.FigureDescriptor.BusinessCalendarDescriptor.Holiday holidays = 5;
-  int holidays_size() const;
-  private:
-  int _internal_holidays_size() const;
-
-  public:
-  void clear_holidays() ;
-  ::io::deephaven::proto::backplane::script::grpc::FigureDescriptor_BusinessCalendarDescriptor_Holiday* mutable_holidays(int index);
-  ::google::protobuf::RepeatedPtrField< ::io::deephaven::proto::backplane::script::grpc::FigureDescriptor_BusinessCalendarDescriptor_Holiday >*
-      mutable_holidays();
-  private:
-  const ::google::protobuf::RepeatedPtrField<::io::deephaven::proto::backplane::script::grpc::FigureDescriptor_BusinessCalendarDescriptor_Holiday>& _internal_holidays() const;
-  ::google::protobuf::RepeatedPtrField<::io::deephaven::proto::backplane::script::grpc::FigureDescriptor_BusinessCalendarDescriptor_Holiday>* _internal_mutable_holidays();
-  public:
-  const ::io::deephaven::proto::backplane::script::grpc::FigureDescriptor_BusinessCalendarDescriptor_Holiday& holidays(int index) const;
-  ::io::deephaven::proto::backplane::script::grpc::FigureDescriptor_BusinessCalendarDescriptor_Holiday* add_holidays();
-  const ::google::protobuf::RepeatedPtrField< ::io::deephaven::proto::backplane::script::grpc::FigureDescriptor_BusinessCalendarDescriptor_Holiday >&
-      holidays() const;
-  // string name = 1;
-  void clear_name() ;
-  const std::string& name() const;
-  template <typename Arg_ = const std::string&, typename... Args_>
-  void set_name(Arg_&& arg, Args_... args);
-  std::string* mutable_name();
-  PROTOBUF_NODISCARD std::string* release_name();
-  void set_allocated_name(std::string* value);
-
-  private:
-  const std::string& _internal_name() const;
-  inline PROTOBUF_ALWAYS_INLINE void _internal_set_name(
-      const std::string& value);
-  std::string* _internal_mutable_name();
-
-  public:
-  // string time_zone = 2;
-  void clear_time_zone() ;
-  const std::string& time_zone() const;
-  template <typename Arg_ = const std::string&, typename... Args_>
-  void set_time_zone(Arg_&& arg, Args_... args);
-  std::string* mutable_time_zone();
-  PROTOBUF_NODISCARD std::string* release_time_zone();
-  void set_allocated_time_zone(std::string* value);
-
-  private:
-  const std::string& _internal_time_zone() const;
-  inline PROTOBUF_ALWAYS_INLINE void _internal_set_time_zone(
-      const std::string& value);
-  std::string* _internal_mutable_time_zone();
-
-  public:
-  // @@protoc_insertion_point(class_scope:io.deephaven.proto.backplane.script.grpc.FigureDescriptor.BusinessCalendarDescriptor)
- private:
-  class _Internal;
-
-  friend class ::google::protobuf::internal::TcParser;
-  static const ::google::protobuf::internal::TcParseTable<
-      3, 5, 2,
-      106, 2>
-      _table_;
-  friend class ::google::protobuf::MessageLite;
-  friend class ::google::protobuf::Arena;
-  template <typename T>
-  friend class ::google::protobuf::Arena::InternalHelper;
-  using InternalArenaConstructable_ = void;
-  using DestructorSkippable_ = void;
-  struct Impl_ {
-
-        inline explicit constexpr Impl_(
-            ::google::protobuf::internal::ConstantInitialized) noexcept;
-        inline explicit Impl_(::google::protobuf::internal::InternalVisibility visibility,
-                              ::google::protobuf::Arena* arena);
-        inline explicit Impl_(::google::protobuf::internal::InternalVisibility visibility,
-                              ::google::protobuf::Arena* arena, const Impl_& from);
-    ::google::protobuf::RepeatedField<int> business_days_;
-    mutable ::google::protobuf::internal::CachedSize _business_days_cached_byte_size_;
-    ::google::protobuf::RepeatedPtrField< ::io::deephaven::proto::backplane::script::grpc::FigureDescriptor_BusinessCalendarDescriptor_BusinessPeriod > business_periods_;
-    ::google::protobuf::RepeatedPtrField< ::io::deephaven::proto::backplane::script::grpc::FigureDescriptor_BusinessCalendarDescriptor_Holiday > holidays_;
-    ::google::protobuf::internal::ArenaStringPtr name_;
-    ::google::protobuf::internal::ArenaStringPtr time_zone_;
-    mutable ::google::protobuf::internal::CachedSize _cached_size_;
-    PROTOBUF_TSAN_DECLARE_MEMBER
-  };
-  union { Impl_ _impl_; };
-  friend struct ::TableStruct_deephaven_2fproto_2fconsole_2eproto;
-};// -------------------------------------------------------------------
-
-class Diagnostic final :
-    public ::google::protobuf::Message /* @@protoc_insertion_point(class_definition:io.deephaven.proto.backplane.script.grpc.Diagnostic) */ {
- public:
-  inline Diagnostic() : Diagnostic(nullptr) {}
-  ~Diagnostic() override;
-  template<typename = void>
-  explicit PROTOBUF_CONSTEXPR Diagnostic(::google::protobuf::internal::ConstantInitialized);
-
-  inline Diagnostic(const Diagnostic& from)
-      : Diagnostic(nullptr, from) {}
-  Diagnostic(Diagnostic&& from) noexcept
-    : Diagnostic() {
-    *this = ::std::move(from);
-  }
-
-  inline Diagnostic& operator=(const Diagnostic& from) {
-    CopyFrom(from);
-    return *this;
-  }
-  inline Diagnostic& operator=(Diagnostic&& from) noexcept {
-    if (this == &from) return *this;
-    if (GetArena() == from.GetArena()
-  #ifdef PROTOBUF_FORCE_COPY_IN_MOVE
-        && GetArena() != nullptr
-  #endif  // !PROTOBUF_FORCE_COPY_IN_MOVE
-    ) {
-      InternalSwap(&from);
-    } else {
-      CopyFrom(from);
-    }
-    return *this;
-  }
-
-  inline const ::google::protobuf::UnknownFieldSet& unknown_fields() const
-      ABSL_ATTRIBUTE_LIFETIME_BOUND {
-    return _internal_metadata_.unknown_fields<::google::protobuf::UnknownFieldSet>(::google::protobuf::UnknownFieldSet::default_instance);
-  }
-  inline ::google::protobuf::UnknownFieldSet* mutable_unknown_fields()
-      ABSL_ATTRIBUTE_LIFETIME_BOUND {
-    return _internal_metadata_.mutable_unknown_fields<::google::protobuf::UnknownFieldSet>();
-  }
-
-  static const ::google::protobuf::Descriptor* descriptor() {
-    return GetDescriptor();
-  }
-  static const ::google::protobuf::Descriptor* GetDescriptor() {
-    return default_instance().GetMetadata().descriptor;
-  }
-  static const ::google::protobuf::Reflection* GetReflection() {
-    return default_instance().GetMetadata().reflection;
-  }
-  static const Diagnostic& default_instance() {
-    return *internal_default_instance();
-  }
-  static inline const Diagnostic* internal_default_instance() {
-    return reinterpret_cast<const Diagnostic*>(
-               &_Diagnostic_default_instance_);
-  }
-  static constexpr int kIndexInFileMessages =
-    44;
-
-  friend void swap(Diagnostic& a, Diagnostic& b) {
-    a.Swap(&b);
-  }
-  inline void Swap(Diagnostic* other) {
-    if (other == this) return;
-  #ifdef PROTOBUF_FORCE_COPY_IN_SWAP
-    if (GetArena() != nullptr &&
-        GetArena() == other->GetArena()) {
-   #else  // PROTOBUF_FORCE_COPY_IN_SWAP
-    if (GetArena() == other->GetArena()) {
-  #endif  // !PROTOBUF_FORCE_COPY_IN_SWAP
-      InternalSwap(other);
-    } else {
-      ::google::protobuf::internal::GenericSwap(this, other);
-    }
-  }
-  void UnsafeArenaSwap(Diagnostic* other) {
-    if (other == this) return;
-    ABSL_DCHECK(GetArena() == other->GetArena());
-    InternalSwap(other);
-  }
-
-  // implements Message ----------------------------------------------
-
-  Diagnostic* New(::google::protobuf::Arena* arena = nullptr) const final {
-    return CreateMaybeMessage<Diagnostic>(arena);
-  }
-  using ::google::protobuf::Message::CopyFrom;
-  void CopyFrom(const Diagnostic& from);
-  using ::google::protobuf::Message::MergeFrom;
-  void MergeFrom( const Diagnostic& from) {
-    Diagnostic::MergeImpl(*this, from);
-  }
-  private:
-  static void MergeImpl(::google::protobuf::Message& to_msg, const ::google::protobuf::Message& from_msg);
-  public:
-  PROTOBUF_ATTRIBUTE_REINITIALIZES void Clear() final;
-  bool IsInitialized() const final;
-
-  ::size_t ByteSizeLong() const final;
-  const char* _InternalParse(const char* ptr, ::google::protobuf::internal::ParseContext* ctx) final;
-  ::uint8_t* _InternalSerialize(
-      ::uint8_t* target, ::google::protobuf::io::EpsCopyOutputStream* stream) const final;
-  int GetCachedSize() const { return _impl_._cached_size_.Get(); }
-
-  private:
-  ::google::protobuf::internal::CachedSize* AccessCachedSize() const final;
-  void SharedCtor(::google::protobuf::Arena* arena);
-  void SharedDtor();
-  void InternalSwap(Diagnostic* other);
-
-  private:
-  friend class ::google::protobuf::internal::AnyMetadata;
-  static ::absl::string_view FullMessageName() {
-    return "io.deephaven.proto.backplane.script.grpc.Diagnostic";
-  }
-  protected:
-  explicit Diagnostic(::google::protobuf::Arena* arena);
-  Diagnostic(::google::protobuf::Arena* arena, const Diagnostic& from);
-  public:
-
-  static const ClassData _class_data_;
-  const ::google::protobuf::Message::ClassData*GetClassData() const final;
-
-  ::google::protobuf::Metadata GetMetadata() const final;
-
-  // nested types ----------------------------------------------------
-
-  using CodeDescription = Diagnostic_CodeDescription;
-
-  using DiagnosticSeverity = Diagnostic_DiagnosticSeverity;
-  static constexpr DiagnosticSeverity NOT_SET_SEVERITY = Diagnostic_DiagnosticSeverity_NOT_SET_SEVERITY;
-  static constexpr DiagnosticSeverity ERROR = Diagnostic_DiagnosticSeverity_ERROR;
-  static constexpr DiagnosticSeverity WARNING = Diagnostic_DiagnosticSeverity_WARNING;
-  static constexpr DiagnosticSeverity INFORMATION = Diagnostic_DiagnosticSeverity_INFORMATION;
-  static constexpr DiagnosticSeverity HINT = Diagnostic_DiagnosticSeverity_HINT;
-  static inline bool DiagnosticSeverity_IsValid(int value) {
-    return Diagnostic_DiagnosticSeverity_IsValid(value);
-  }
-  static constexpr DiagnosticSeverity DiagnosticSeverity_MIN = Diagnostic_DiagnosticSeverity_DiagnosticSeverity_MIN;
-  static constexpr DiagnosticSeverity DiagnosticSeverity_MAX = Diagnostic_DiagnosticSeverity_DiagnosticSeverity_MAX;
-  static constexpr int DiagnosticSeverity_ARRAYSIZE = Diagnostic_DiagnosticSeverity_DiagnosticSeverity_ARRAYSIZE;
-  static inline const ::google::protobuf::EnumDescriptor* DiagnosticSeverity_descriptor() {
-    return Diagnostic_DiagnosticSeverity_descriptor();
-  }
-  template <typename T>
-  static inline const std::string& DiagnosticSeverity_Name(T value) {
-    return Diagnostic_DiagnosticSeverity_Name(value);
-  }
-  static inline bool DiagnosticSeverity_Parse(absl::string_view name, DiagnosticSeverity* value) {
-    return Diagnostic_DiagnosticSeverity_Parse(name, value);
-  }
-
-  using DiagnosticTag = Diagnostic_DiagnosticTag;
-  static constexpr DiagnosticTag NOT_SET_TAG = Diagnostic_DiagnosticTag_NOT_SET_TAG;
-  static constexpr DiagnosticTag UNNECESSARY = Diagnostic_DiagnosticTag_UNNECESSARY;
-  static constexpr DiagnosticTag DEPRECATED = Diagnostic_DiagnosticTag_DEPRECATED;
-  static inline bool DiagnosticTag_IsValid(int value) {
-    return Diagnostic_DiagnosticTag_IsValid(value);
-  }
-  static constexpr DiagnosticTag DiagnosticTag_MIN = Diagnostic_DiagnosticTag_DiagnosticTag_MIN;
-  static constexpr DiagnosticTag DiagnosticTag_MAX = Diagnostic_DiagnosticTag_DiagnosticTag_MAX;
-  static constexpr int DiagnosticTag_ARRAYSIZE = Diagnostic_DiagnosticTag_DiagnosticTag_ARRAYSIZE;
-  static inline const ::google::protobuf::EnumDescriptor* DiagnosticTag_descriptor() {
-    return Diagnostic_DiagnosticTag_descriptor();
-  }
-  template <typename T>
-  static inline const std::string& DiagnosticTag_Name(T value) {
-    return Diagnostic_DiagnosticTag_Name(value);
-  }
-  static inline bool DiagnosticTag_Parse(absl::string_view name, DiagnosticTag* value) {
-    return Diagnostic_DiagnosticTag_Parse(name, value);
-  }
-
-  // accessors -------------------------------------------------------
-
-  enum : int {
-    kTagsFieldNumber = 7,
-    kCodeFieldNumber = 3,
-    kSourceFieldNumber = 5,
-    kMessageFieldNumber = 6,
-    kDataFieldNumber = 9,
-    kRangeFieldNumber = 1,
-    kCodeDescriptionFieldNumber = 4,
-    kSeverityFieldNumber = 2,
-  };
-  // repeated .io.deephaven.proto.backplane.script.grpc.Diagnostic.DiagnosticTag tags = 7;
-  int tags_size() const;
-  private:
-  int _internal_tags_size() const;
-
-  public:
-  void clear_tags() ;
-  public:
-  ::io::deephaven::proto::backplane::script::grpc::Diagnostic_DiagnosticTag tags(int index) const;
-  void set_tags(int index, ::io::deephaven::proto::backplane::script::grpc::Diagnostic_DiagnosticTag value);
-  void add_tags(::io::deephaven::proto::backplane::script::grpc::Diagnostic_DiagnosticTag value);
-  const ::google::protobuf::RepeatedField<int>& tags() const;
-  ::google::protobuf::RepeatedField<int>* mutable_tags();
-
-  private:
-  const ::google::protobuf::RepeatedField<int>& _internal_tags() const;
-  ::google::protobuf::RepeatedField<int>* _internal_mutable_tags();
-
-  public:
-  // optional string code = 3;
-  bool has_code() const;
-  void clear_code() ;
-  const std::string& code() const;
-  template <typename Arg_ = const std::string&, typename... Args_>
-  void set_code(Arg_&& arg, Args_... args);
-  std::string* mutable_code();
-  PROTOBUF_NODISCARD std::string* release_code();
-  void set_allocated_code(std::string* value);
-
-  private:
-  const std::string& _internal_code() const;
-  inline PROTOBUF_ALWAYS_INLINE void _internal_set_code(
-      const std::string& value);
-  std::string* _internal_mutable_code();
-
-  public:
-  // optional string source = 5;
-  bool has_source() const;
-  void clear_source() ;
-  const std::string& source() const;
-  template <typename Arg_ = const std::string&, typename... Args_>
-  void set_source(Arg_&& arg, Args_... args);
-  std::string* mutable_source();
-  PROTOBUF_NODISCARD std::string* release_source();
-  void set_allocated_source(std::string* value);
-
-  private:
-  const std::string& _internal_source() const;
-  inline PROTOBUF_ALWAYS_INLINE void _internal_set_source(
-      const std::string& value);
-  std::string* _internal_mutable_source();
-
-  public:
-  // string message = 6;
-  void clear_message() ;
-  const std::string& message() const;
-  template <typename Arg_ = const std::string&, typename... Args_>
-  void set_message(Arg_&& arg, Args_... args);
-  std::string* mutable_message();
-  PROTOBUF_NODISCARD std::string* release_message();
-  void set_allocated_message(std::string* value);
-
-  private:
-  const std::string& _internal_message() const;
-  inline PROTOBUF_ALWAYS_INLINE void _internal_set_message(
-      const std::string& value);
-  std::string* _internal_mutable_message();
-
-  public:
-  // optional bytes data = 9;
-  bool has_data() const;
-  void clear_data() ;
-  const std::string& data() const;
-  template <typename Arg_ = const std::string&, typename... Args_>
-  void set_data(Arg_&& arg, Args_... args);
-  std::string* mutable_data();
-  PROTOBUF_NODISCARD std::string* release_data();
-  void set_allocated_data(std::string* value);
-
-  private:
-  const std::string& _internal_data() const;
-  inline PROTOBUF_ALWAYS_INLINE void _internal_set_data(
-      const std::string& value);
-  std::string* _internal_mutable_data();
-
-  public:
-  // .io.deephaven.proto.backplane.script.grpc.DocumentRange range = 1;
-  bool has_range() const;
-  void clear_range() ;
-  const ::io::deephaven::proto::backplane::script::grpc::DocumentRange& range() const;
-  PROTOBUF_NODISCARD ::io::deephaven::proto::backplane::script::grpc::DocumentRange* release_range();
-  ::io::deephaven::proto::backplane::script::grpc::DocumentRange* mutable_range();
-  void set_allocated_range(::io::deephaven::proto::backplane::script::grpc::DocumentRange* value);
-  void unsafe_arena_set_allocated_range(::io::deephaven::proto::backplane::script::grpc::DocumentRange* value);
-  ::io::deephaven::proto::backplane::script::grpc::DocumentRange* unsafe_arena_release_range();
-
-  private:
-  const ::io::deephaven::proto::backplane::script::grpc::DocumentRange& _internal_range() const;
-  ::io::deephaven::proto::backplane::script::grpc::DocumentRange* _internal_mutable_range();
-
-  public:
-  // optional .io.deephaven.proto.backplane.script.grpc.Diagnostic.CodeDescription code_description = 4;
-  bool has_code_description() const;
-  void clear_code_description() ;
-  const ::io::deephaven::proto::backplane::script::grpc::Diagnostic_CodeDescription& code_description() const;
-  PROTOBUF_NODISCARD ::io::deephaven::proto::backplane::script::grpc::Diagnostic_CodeDescription* release_code_description();
-  ::io::deephaven::proto::backplane::script::grpc::Diagnostic_CodeDescription* mutable_code_description();
-  void set_allocated_code_description(::io::deephaven::proto::backplane::script::grpc::Diagnostic_CodeDescription* value);
-  void unsafe_arena_set_allocated_code_description(::io::deephaven::proto::backplane::script::grpc::Diagnostic_CodeDescription* value);
-  ::io::deephaven::proto::backplane::script::grpc::Diagnostic_CodeDescription* unsafe_arena_release_code_description();
-
-  private:
-  const ::io::deephaven::proto::backplane::script::grpc::Diagnostic_CodeDescription& _internal_code_description() const;
-  ::io::deephaven::proto::backplane::script::grpc::Diagnostic_CodeDescription* _internal_mutable_code_description();
-
-  public:
-  // .io.deephaven.proto.backplane.script.grpc.Diagnostic.DiagnosticSeverity severity = 2;
-  void clear_severity() ;
-  ::io::deephaven::proto::backplane::script::grpc::Diagnostic_DiagnosticSeverity severity() const;
-  void set_severity(::io::deephaven::proto::backplane::script::grpc::Diagnostic_DiagnosticSeverity value);
-
-  private:
-  ::io::deephaven::proto::backplane::script::grpc::Diagnostic_DiagnosticSeverity _internal_severity() const;
-  void _internal_set_severity(::io::deephaven::proto::backplane::script::grpc::Diagnostic_DiagnosticSeverity value);
-
-  public:
-  // @@protoc_insertion_point(class_scope:io.deephaven.proto.backplane.script.grpc.Diagnostic)
- private:
-  class _Internal;
-
-  friend class ::google::protobuf::internal::TcParser;
-  static const ::google::protobuf::internal::TcParseTable<
-      4, 8, 2,
-      85, 2>
-      _table_;
-  friend class ::google::protobuf::MessageLite;
-  friend class ::google::protobuf::Arena;
-  template <typename T>
-  friend class ::google::protobuf::Arena::InternalHelper;
-  using InternalArenaConstructable_ = void;
-  using DestructorSkippable_ = void;
-  struct Impl_ {
-
-        inline explicit constexpr Impl_(
-            ::google::protobuf::internal::ConstantInitialized) noexcept;
-        inline explicit Impl_(::google::protobuf::internal::InternalVisibility visibility,
-                              ::google::protobuf::Arena* arena);
-        inline explicit Impl_(::google::protobuf::internal::InternalVisibility visibility,
-                              ::google::protobuf::Arena* arena, const Impl_& from);
-    ::google::protobuf::internal::HasBits<1> _has_bits_;
-    mutable ::google::protobuf::internal::CachedSize _cached_size_;
-    ::google::protobuf::RepeatedField<int> tags_;
-    mutable ::google::protobuf::internal::CachedSize _tags_cached_byte_size_;
-    ::google::protobuf::internal::ArenaStringPtr code_;
-    ::google::protobuf::internal::ArenaStringPtr source_;
-    ::google::protobuf::internal::ArenaStringPtr message_;
-    ::google::protobuf::internal::ArenaStringPtr data_;
-    ::io::deephaven::proto::backplane::script::grpc::DocumentRange* range_;
-    ::io::deephaven::proto::backplane::script::grpc::Diagnostic_CodeDescription* code_description_;
-    int severity_;
-    PROTOBUF_TSAN_DECLARE_MEMBER
-  };
-  union { Impl_ _impl_; };
-  friend struct ::TableStruct_deephaven_2fproto_2fconsole_2eproto;
-};// -------------------------------------------------------------------
-
-class ChangeDocumentRequest_TextDocumentContentChangeEvent final :
-    public ::google::protobuf::Message /* @@protoc_insertion_point(class_definition:io.deephaven.proto.backplane.script.grpc.ChangeDocumentRequest.TextDocumentContentChangeEvent) */ {
- public:
-  inline ChangeDocumentRequest_TextDocumentContentChangeEvent() : ChangeDocumentRequest_TextDocumentContentChangeEvent(nullptr) {}
-  ~ChangeDocumentRequest_TextDocumentContentChangeEvent() override;
-  template<typename = void>
-  explicit PROTOBUF_CONSTEXPR ChangeDocumentRequest_TextDocumentContentChangeEvent(::google::protobuf::internal::ConstantInitialized);
-
-  inline ChangeDocumentRequest_TextDocumentContentChangeEvent(const ChangeDocumentRequest_TextDocumentContentChangeEvent& from)
-      : ChangeDocumentRequest_TextDocumentContentChangeEvent(nullptr, from) {}
-  ChangeDocumentRequest_TextDocumentContentChangeEvent(ChangeDocumentRequest_TextDocumentContentChangeEvent&& from) noexcept
-    : ChangeDocumentRequest_TextDocumentContentChangeEvent() {
-    *this = ::std::move(from);
-  }
-
-  inline ChangeDocumentRequest_TextDocumentContentChangeEvent& operator=(const ChangeDocumentRequest_TextDocumentContentChangeEvent& from) {
-    CopyFrom(from);
-    return *this;
-  }
-  inline ChangeDocumentRequest_TextDocumentContentChangeEvent& operator=(ChangeDocumentRequest_TextDocumentContentChangeEvent&& from) noexcept {
-    if (this == &from) return *this;
-    if (GetArena() == from.GetArena()
-  #ifdef PROTOBUF_FORCE_COPY_IN_MOVE
-        && GetArena() != nullptr
-  #endif  // !PROTOBUF_FORCE_COPY_IN_MOVE
-    ) {
-      InternalSwap(&from);
-    } else {
-      CopyFrom(from);
-    }
-    return *this;
-  }
-
-  inline const ::google::protobuf::UnknownFieldSet& unknown_fields() const
-      ABSL_ATTRIBUTE_LIFETIME_BOUND {
-    return _internal_metadata_.unknown_fields<::google::protobuf::UnknownFieldSet>(::google::protobuf::UnknownFieldSet::default_instance);
-  }
-  inline ::google::protobuf::UnknownFieldSet* mutable_unknown_fields()
-      ABSL_ATTRIBUTE_LIFETIME_BOUND {
-    return _internal_metadata_.mutable_unknown_fields<::google::protobuf::UnknownFieldSet>();
-  }
-
-  static const ::google::protobuf::Descriptor* descriptor() {
-    return GetDescriptor();
-  }
-  static const ::google::protobuf::Descriptor* GetDescriptor() {
-    return default_instance().GetMetadata().descriptor;
-  }
-  static const ::google::protobuf::Reflection* GetReflection() {
-    return default_instance().GetMetadata().reflection;
-  }
-  static const ChangeDocumentRequest_TextDocumentContentChangeEvent& default_instance() {
-    return *internal_default_instance();
-  }
-  static inline const ChangeDocumentRequest_TextDocumentContentChangeEvent* internal_default_instance() {
-    return reinterpret_cast<const ChangeDocumentRequest_TextDocumentContentChangeEvent*>(
-               &_ChangeDocumentRequest_TextDocumentContentChangeEvent_default_instance_);
-  }
-  static constexpr int kIndexInFileMessages =
-    22;
-
-  friend void swap(ChangeDocumentRequest_TextDocumentContentChangeEvent& a, ChangeDocumentRequest_TextDocumentContentChangeEvent& b) {
-    a.Swap(&b);
-  }
-  inline void Swap(ChangeDocumentRequest_TextDocumentContentChangeEvent* other) {
-    if (other == this) return;
-  #ifdef PROTOBUF_FORCE_COPY_IN_SWAP
-    if (GetArena() != nullptr &&
-        GetArena() == other->GetArena()) {
-   #else  // PROTOBUF_FORCE_COPY_IN_SWAP
-    if (GetArena() == other->GetArena()) {
-  #endif  // !PROTOBUF_FORCE_COPY_IN_SWAP
-      InternalSwap(other);
-    } else {
-      ::google::protobuf::internal::GenericSwap(this, other);
-    }
-  }
-  void UnsafeArenaSwap(ChangeDocumentRequest_TextDocumentContentChangeEvent* other) {
-    if (other == this) return;
-    ABSL_DCHECK(GetArena() == other->GetArena());
-    InternalSwap(other);
-  }
-
-  // implements Message ----------------------------------------------
-
-  ChangeDocumentRequest_TextDocumentContentChangeEvent* New(::google::protobuf::Arena* arena = nullptr) const final {
-    return CreateMaybeMessage<ChangeDocumentRequest_TextDocumentContentChangeEvent>(arena);
-  }
-  using ::google::protobuf::Message::CopyFrom;
-  void CopyFrom(const ChangeDocumentRequest_TextDocumentContentChangeEvent& from);
-  using ::google::protobuf::Message::MergeFrom;
-  void MergeFrom( const ChangeDocumentRequest_TextDocumentContentChangeEvent& from) {
-    ChangeDocumentRequest_TextDocumentContentChangeEvent::MergeImpl(*this, from);
-  }
-  private:
-  static void MergeImpl(::google::protobuf::Message& to_msg, const ::google::protobuf::Message& from_msg);
-  public:
-  PROTOBUF_ATTRIBUTE_REINITIALIZES void Clear() final;
-  bool IsInitialized() const final;
-
-  ::size_t ByteSizeLong() const final;
-  const char* _InternalParse(const char* ptr, ::google::protobuf::internal::ParseContext* ctx) final;
-  ::uint8_t* _InternalSerialize(
-      ::uint8_t* target, ::google::protobuf::io::EpsCopyOutputStream* stream) const final;
-  int GetCachedSize() const { return _impl_._cached_size_.Get(); }
-
-  private:
-  ::google::protobuf::internal::CachedSize* AccessCachedSize() const final;
-  void SharedCtor(::google::protobuf::Arena* arena);
-  void SharedDtor();
-  void InternalSwap(ChangeDocumentRequest_TextDocumentContentChangeEvent* other);
-
-  private:
-  friend class ::google::protobuf::internal::AnyMetadata;
-  static ::absl::string_view FullMessageName() {
-    return "io.deephaven.proto.backplane.script.grpc.ChangeDocumentRequest.TextDocumentContentChangeEvent";
-  }
-  protected:
-  explicit ChangeDocumentRequest_TextDocumentContentChangeEvent(::google::protobuf::Arena* arena);
-  ChangeDocumentRequest_TextDocumentContentChangeEvent(::google::protobuf::Arena* arena, const ChangeDocumentRequest_TextDocumentContentChangeEvent& from);
-  public:
-
-  static const ClassData _class_data_;
-  const ::google::protobuf::Message::ClassData*GetClassData() const final;
-
-  ::google::protobuf::Metadata GetMetadata() const final;
-
-  // nested types ----------------------------------------------------
-
-  // accessors -------------------------------------------------------
-
-  enum : int {
-    kTextFieldNumber = 3,
-    kRangeFieldNumber = 1,
-    kRangeLengthFieldNumber = 2,
-  };
-  // string text = 3;
-  void clear_text() ;
-  const std::string& text() const;
-  template <typename Arg_ = const std::string&, typename... Args_>
-  void set_text(Arg_&& arg, Args_... args);
-  std::string* mutable_text();
-  PROTOBUF_NODISCARD std::string* release_text();
-  void set_allocated_text(std::string* value);
-
-  private:
-  const std::string& _internal_text() const;
-  inline PROTOBUF_ALWAYS_INLINE void _internal_set_text(
-      const std::string& value);
-  std::string* _internal_mutable_text();
-
-  public:
-  // .io.deephaven.proto.backplane.script.grpc.DocumentRange range = 1;
-  bool has_range() const;
-  void clear_range() ;
-  const ::io::deephaven::proto::backplane::script::grpc::DocumentRange& range() const;
-  PROTOBUF_NODISCARD ::io::deephaven::proto::backplane::script::grpc::DocumentRange* release_range();
-  ::io::deephaven::proto::backplane::script::grpc::DocumentRange* mutable_range();
-  void set_allocated_range(::io::deephaven::proto::backplane::script::grpc::DocumentRange* value);
-  void unsafe_arena_set_allocated_range(::io::deephaven::proto::backplane::script::grpc::DocumentRange* value);
-  ::io::deephaven::proto::backplane::script::grpc::DocumentRange* unsafe_arena_release_range();
-
-  private:
-  const ::io::deephaven::proto::backplane::script::grpc::DocumentRange& _internal_range() const;
-  ::io::deephaven::proto::backplane::script::grpc::DocumentRange* _internal_mutable_range();
-
-  public:
-  // int32 range_length = 2;
-  void clear_range_length() ;
-  ::int32_t range_length() const;
-  void set_range_length(::int32_t value);
-
-  private:
-  ::int32_t _internal_range_length() const;
-  void _internal_set_range_length(::int32_t value);
-
-  public:
-  // @@protoc_insertion_point(class_scope:io.deephaven.proto.backplane.script.grpc.ChangeDocumentRequest.TextDocumentContentChangeEvent)
- private:
-  class _Internal;
-
-  friend class ::google::protobuf::internal::TcParser;
-  static const ::google::protobuf::internal::TcParseTable<
-      2, 3, 1,
-      106, 2>
-      _table_;
-  friend class ::google::protobuf::MessageLite;
-  friend class ::google::protobuf::Arena;
-  template <typename T>
-  friend class ::google::protobuf::Arena::InternalHelper;
-  using InternalArenaConstructable_ = void;
-  using DestructorSkippable_ = void;
-  struct Impl_ {
-
-        inline explicit constexpr Impl_(
-            ::google::protobuf::internal::ConstantInitialized) noexcept;
-        inline explicit Impl_(::google::protobuf::internal::InternalVisibility visibility,
-                              ::google::protobuf::Arena* arena);
-        inline explicit Impl_(::google::protobuf::internal::InternalVisibility visibility,
-                              ::google::protobuf::Arena* arena, const Impl_& from);
-    ::google::protobuf::internal::HasBits<1> _has_bits_;
-    mutable ::google::protobuf::internal::CachedSize _cached_size_;
-    ::google::protobuf::internal::ArenaStringPtr text_;
-    ::io::deephaven::proto::backplane::script::grpc::DocumentRange* range_;
-    ::int32_t range_length_;
-    PROTOBUF_TSAN_DECLARE_MEMBER
-  };
-  union { Impl_ _impl_; };
-  friend struct ::TableStruct_deephaven_2fproto_2fconsole_2eproto;
-};// -------------------------------------------------------------------
-
-class GetSignatureHelpResponse final :
-    public ::google::protobuf::Message /* @@protoc_insertion_point(class_definition:io.deephaven.proto.backplane.script.grpc.GetSignatureHelpResponse) */ {
- public:
-  inline GetSignatureHelpResponse() : GetSignatureHelpResponse(nullptr) {}
-  ~GetSignatureHelpResponse() override;
-  template<typename = void>
-  explicit PROTOBUF_CONSTEXPR GetSignatureHelpResponse(::google::protobuf::internal::ConstantInitialized);
-
-  inline GetSignatureHelpResponse(const GetSignatureHelpResponse& from)
-      : GetSignatureHelpResponse(nullptr, from) {}
-  GetSignatureHelpResponse(GetSignatureHelpResponse&& from) noexcept
-    : GetSignatureHelpResponse() {
-    *this = ::std::move(from);
-  }
-
-  inline GetSignatureHelpResponse& operator=(const GetSignatureHelpResponse& from) {
-    CopyFrom(from);
-    return *this;
-  }
-  inline GetSignatureHelpResponse& operator=(GetSignatureHelpResponse&& from) noexcept {
-    if (this == &from) return *this;
-    if (GetArena() == from.GetArena()
-  #ifdef PROTOBUF_FORCE_COPY_IN_MOVE
-        && GetArena() != nullptr
-  #endif  // !PROTOBUF_FORCE_COPY_IN_MOVE
-    ) {
-      InternalSwap(&from);
-    } else {
-      CopyFrom(from);
-    }
-    return *this;
-  }
-
-  inline const ::google::protobuf::UnknownFieldSet& unknown_fields() const
-      ABSL_ATTRIBUTE_LIFETIME_BOUND {
-    return _internal_metadata_.unknown_fields<::google::protobuf::UnknownFieldSet>(::google::protobuf::UnknownFieldSet::default_instance);
-  }
-  inline ::google::protobuf::UnknownFieldSet* mutable_unknown_fields()
-      ABSL_ATTRIBUTE_LIFETIME_BOUND {
-    return _internal_metadata_.mutable_unknown_fields<::google::protobuf::UnknownFieldSet>();
-  }
-
-  static const ::google::protobuf::Descriptor* descriptor() {
-    return GetDescriptor();
-  }
-  static const ::google::protobuf::Descriptor* GetDescriptor() {
-    return default_instance().GetMetadata().descriptor;
-  }
-  static const ::google::protobuf::Reflection* GetReflection() {
-    return default_instance().GetMetadata().reflection;
-  }
-  static const GetSignatureHelpResponse& default_instance() {
-    return *internal_default_instance();
-  }
-  static inline const GetSignatureHelpResponse* internal_default_instance() {
-    return reinterpret_cast<const GetSignatureHelpResponse*>(
-               &_GetSignatureHelpResponse_default_instance_);
-  }
-  static constexpr int kIndexInFileMessages =
-    35;
-
-  friend void swap(GetSignatureHelpResponse& a, GetSignatureHelpResponse& b) {
-    a.Swap(&b);
-  }
-  inline void Swap(GetSignatureHelpResponse* other) {
-    if (other == this) return;
-  #ifdef PROTOBUF_FORCE_COPY_IN_SWAP
-    if (GetArena() != nullptr &&
-        GetArena() == other->GetArena()) {
-   #else  // PROTOBUF_FORCE_COPY_IN_SWAP
-    if (GetArena() == other->GetArena()) {
-  #endif  // !PROTOBUF_FORCE_COPY_IN_SWAP
-      InternalSwap(other);
-    } else {
-      ::google::protobuf::internal::GenericSwap(this, other);
-    }
-  }
-  void UnsafeArenaSwap(GetSignatureHelpResponse* other) {
-    if (other == this) return;
-    ABSL_DCHECK(GetArena() == other->GetArena());
-    InternalSwap(other);
-  }
-
-  // implements Message ----------------------------------------------
-
-  GetSignatureHelpResponse* New(::google::protobuf::Arena* arena = nullptr) const final {
-    return CreateMaybeMessage<GetSignatureHelpResponse>(arena);
-  }
-  using ::google::protobuf::Message::CopyFrom;
-  void CopyFrom(const GetSignatureHelpResponse& from);
-  using ::google::protobuf::Message::MergeFrom;
-  void MergeFrom( const GetSignatureHelpResponse& from) {
-    GetSignatureHelpResponse::MergeImpl(*this, from);
-  }
-  private:
-  static void MergeImpl(::google::protobuf::Message& to_msg, const ::google::protobuf::Message& from_msg);
-  public:
-  PROTOBUF_ATTRIBUTE_REINITIALIZES void Clear() final;
-  bool IsInitialized() const final;
-
-  ::size_t ByteSizeLong() const final;
-  const char* _InternalParse(const char* ptr, ::google::protobuf::internal::ParseContext* ctx) final;
-  ::uint8_t* _InternalSerialize(
-      ::uint8_t* target, ::google::protobuf::io::EpsCopyOutputStream* stream) const final;
-  int GetCachedSize() const { return _impl_._cached_size_.Get(); }
-
-  private:
-  ::google::protobuf::internal::CachedSize* AccessCachedSize() const final;
-  void SharedCtor(::google::protobuf::Arena* arena);
-  void SharedDtor();
-  void InternalSwap(GetSignatureHelpResponse* other);
-
-  private:
-  friend class ::google::protobuf::internal::AnyMetadata;
-  static ::absl::string_view FullMessageName() {
-    return "io.deephaven.proto.backplane.script.grpc.GetSignatureHelpResponse";
-  }
-  protected:
-  explicit GetSignatureHelpResponse(::google::protobuf::Arena* arena);
-  GetSignatureHelpResponse(::google::protobuf::Arena* arena, const GetSignatureHelpResponse& from);
-  public:
-
-  static const ClassData _class_data_;
-  const ::google::protobuf::Message::ClassData*GetClassData() const final;
-
-  ::google::protobuf::Metadata GetMetadata() const final;
-
-  // nested types ----------------------------------------------------
-
-  // accessors -------------------------------------------------------
-
-  enum : int {
-    kSignaturesFieldNumber = 1,
-    kActiveSignatureFieldNumber = 2,
-    kActiveParameterFieldNumber = 3,
-  };
-  // repeated .io.deephaven.proto.backplane.script.grpc.SignatureInformation signatures = 1;
-  int signatures_size() const;
-  private:
-  int _internal_signatures_size() const;
-
-  public:
-  void clear_signatures() ;
-  ::io::deephaven::proto::backplane::script::grpc::SignatureInformation* mutable_signatures(int index);
-  ::google::protobuf::RepeatedPtrField< ::io::deephaven::proto::backplane::script::grpc::SignatureInformation >*
-      mutable_signatures();
-  private:
-  const ::google::protobuf::RepeatedPtrField<::io::deephaven::proto::backplane::script::grpc::SignatureInformation>& _internal_signatures() const;
-  ::google::protobuf::RepeatedPtrField<::io::deephaven::proto::backplane::script::grpc::SignatureInformation>* _internal_mutable_signatures();
-  public:
-  const ::io::deephaven::proto::backplane::script::grpc::SignatureInformation& signatures(int index) const;
-  ::io::deephaven::proto::backplane::script::grpc::SignatureInformation* add_signatures();
-  const ::google::protobuf::RepeatedPtrField< ::io::deephaven::proto::backplane::script::grpc::SignatureInformation >&
-      signatures() const;
-  // optional int32 active_signature = 2;
-  bool has_active_signature() const;
-  void clear_active_signature() ;
-  ::int32_t active_signature() const;
-  void set_active_signature(::int32_t value);
-
-  private:
-  ::int32_t _internal_active_signature() const;
-  void _internal_set_active_signature(::int32_t value);
-
-  public:
-  // optional int32 active_parameter = 3;
-  bool has_active_parameter() const;
-  void clear_active_parameter() ;
-  ::int32_t active_parameter() const;
-  void set_active_parameter(::int32_t value);
-
-  private:
-  ::int32_t _internal_active_parameter() const;
-  void _internal_set_active_parameter(::int32_t value);
-
-  public:
-  // @@protoc_insertion_point(class_scope:io.deephaven.proto.backplane.script.grpc.GetSignatureHelpResponse)
- private:
-  class _Internal;
-
-  friend class ::google::protobuf::internal::TcParser;
-  static const ::google::protobuf::internal::TcParseTable<
-      2, 3, 1,
-      0, 2>
-      _table_;
-  friend class ::google::protobuf::MessageLite;
-  friend class ::google::protobuf::Arena;
-  template <typename T>
-  friend class ::google::protobuf::Arena::InternalHelper;
-  using InternalArenaConstructable_ = void;
-  using DestructorSkippable_ = void;
-  struct Impl_ {
-
-        inline explicit constexpr Impl_(
-            ::google::protobuf::internal::ConstantInitialized) noexcept;
-        inline explicit Impl_(::google::protobuf::internal::InternalVisibility visibility,
-                              ::google::protobuf::Arena* arena);
-        inline explicit Impl_(::google::protobuf::internal::InternalVisibility visibility,
-                              ::google::protobuf::Arena* arena, const Impl_& from);
-    ::google::protobuf::internal::HasBits<1> _has_bits_;
-    mutable ::google::protobuf::internal::CachedSize _cached_size_;
-    ::google::protobuf::RepeatedPtrField< ::io::deephaven::proto::backplane::script::grpc::SignatureInformation > signatures_;
-    ::int32_t active_signature_;
-    ::int32_t active_parameter_;
-    PROTOBUF_TSAN_DECLARE_MEMBER
-  };
-  union { Impl_ _impl_; };
-  friend struct ::TableStruct_deephaven_2fproto_2fconsole_2eproto;
-};// -------------------------------------------------------------------
-
-class GetPullDiagnosticResponse final :
-    public ::google::protobuf::Message /* @@protoc_insertion_point(class_definition:io.deephaven.proto.backplane.script.grpc.GetPullDiagnosticResponse) */ {
- public:
-  inline GetPullDiagnosticResponse() : GetPullDiagnosticResponse(nullptr) {}
-  ~GetPullDiagnosticResponse() override;
-  template<typename = void>
-  explicit PROTOBUF_CONSTEXPR GetPullDiagnosticResponse(::google::protobuf::internal::ConstantInitialized);
-
-  inline GetPullDiagnosticResponse(const GetPullDiagnosticResponse& from)
-      : GetPullDiagnosticResponse(nullptr, from) {}
-  GetPullDiagnosticResponse(GetPullDiagnosticResponse&& from) noexcept
-    : GetPullDiagnosticResponse() {
-    *this = ::std::move(from);
-  }
-
-  inline GetPullDiagnosticResponse& operator=(const GetPullDiagnosticResponse& from) {
-    CopyFrom(from);
-    return *this;
-  }
-  inline GetPullDiagnosticResponse& operator=(GetPullDiagnosticResponse&& from) noexcept {
-    if (this == &from) return *this;
-    if (GetArena() == from.GetArena()
-  #ifdef PROTOBUF_FORCE_COPY_IN_MOVE
-        && GetArena() != nullptr
-  #endif  // !PROTOBUF_FORCE_COPY_IN_MOVE
-    ) {
-      InternalSwap(&from);
-    } else {
-      CopyFrom(from);
-    }
-    return *this;
-  }
-
-  inline const ::google::protobuf::UnknownFieldSet& unknown_fields() const
-      ABSL_ATTRIBUTE_LIFETIME_BOUND {
-    return _internal_metadata_.unknown_fields<::google::protobuf::UnknownFieldSet>(::google::protobuf::UnknownFieldSet::default_instance);
-  }
-  inline ::google::protobuf::UnknownFieldSet* mutable_unknown_fields()
-      ABSL_ATTRIBUTE_LIFETIME_BOUND {
-    return _internal_metadata_.mutable_unknown_fields<::google::protobuf::UnknownFieldSet>();
-  }
-
-  static const ::google::protobuf::Descriptor* descriptor() {
-    return GetDescriptor();
-  }
-  static const ::google::protobuf::Descriptor* GetDescriptor() {
-    return default_instance().GetMetadata().descriptor;
-  }
-  static const ::google::protobuf::Reflection* GetReflection() {
-    return default_instance().GetMetadata().reflection;
-  }
-  static const GetPullDiagnosticResponse& default_instance() {
-    return *internal_default_instance();
-  }
-  static inline const GetPullDiagnosticResponse* internal_default_instance() {
-    return reinterpret_cast<const GetPullDiagnosticResponse*>(
-               &_GetPullDiagnosticResponse_default_instance_);
-  }
-  static constexpr int kIndexInFileMessages =
-    41;
-
-  friend void swap(GetPullDiagnosticResponse& a, GetPullDiagnosticResponse& b) {
-    a.Swap(&b);
-  }
-  inline void Swap(GetPullDiagnosticResponse* other) {
-    if (other == this) return;
-  #ifdef PROTOBUF_FORCE_COPY_IN_SWAP
-    if (GetArena() != nullptr &&
-        GetArena() == other->GetArena()) {
-   #else  // PROTOBUF_FORCE_COPY_IN_SWAP
-    if (GetArena() == other->GetArena()) {
-  #endif  // !PROTOBUF_FORCE_COPY_IN_SWAP
-      InternalSwap(other);
-    } else {
-      ::google::protobuf::internal::GenericSwap(this, other);
-    }
-  }
-  void UnsafeArenaSwap(GetPullDiagnosticResponse* other) {
-    if (other == this) return;
-    ABSL_DCHECK(GetArena() == other->GetArena());
-    InternalSwap(other);
-  }
-
-  // implements Message ----------------------------------------------
-
-  GetPullDiagnosticResponse* New(::google::protobuf::Arena* arena = nullptr) const final {
-    return CreateMaybeMessage<GetPullDiagnosticResponse>(arena);
-  }
-  using ::google::protobuf::Message::CopyFrom;
-  void CopyFrom(const GetPullDiagnosticResponse& from);
-  using ::google::protobuf::Message::MergeFrom;
-  void MergeFrom( const GetPullDiagnosticResponse& from) {
-    GetPullDiagnosticResponse::MergeImpl(*this, from);
-  }
-  private:
-  static void MergeImpl(::google::protobuf::Message& to_msg, const ::google::protobuf::Message& from_msg);
-  public:
-  PROTOBUF_ATTRIBUTE_REINITIALIZES void Clear() final;
-  bool IsInitialized() const final;
-
-  ::size_t ByteSizeLong() const final;
-  const char* _InternalParse(const char* ptr, ::google::protobuf::internal::ParseContext* ctx) final;
-  ::uint8_t* _InternalSerialize(
-      ::uint8_t* target, ::google::protobuf::io::EpsCopyOutputStream* stream) const final;
-  int GetCachedSize() const { return _impl_._cached_size_.Get(); }
-
-  private:
-  ::google::protobuf::internal::CachedSize* AccessCachedSize() const final;
-  void SharedCtor(::google::protobuf::Arena* arena);
-  void SharedDtor();
-  void InternalSwap(GetPullDiagnosticResponse* other);
-
-  private:
-  friend class ::google::protobuf::internal::AnyMetadata;
-  static ::absl::string_view FullMessageName() {
-    return "io.deephaven.proto.backplane.script.grpc.GetPullDiagnosticResponse";
-  }
-  protected:
-  explicit GetPullDiagnosticResponse(::google::protobuf::Arena* arena);
-  GetPullDiagnosticResponse(::google::protobuf::Arena* arena, const GetPullDiagnosticResponse& from);
-  public:
-
-  static const ClassData _class_data_;
-  const ::google::protobuf::Message::ClassData*GetClassData() const final;
-
-  ::google::protobuf::Metadata GetMetadata() const final;
-
-  // nested types ----------------------------------------------------
-
-  // accessors -------------------------------------------------------
-
-  enum : int {
-    kItemsFieldNumber = 3,
-    kKindFieldNumber = 1,
-    kResultIdFieldNumber = 2,
-  };
-  // repeated .io.deephaven.proto.backplane.script.grpc.Diagnostic items = 3;
-  int items_size() const;
-  private:
-  int _internal_items_size() const;
-
-  public:
-  void clear_items() ;
-  ::io::deephaven::proto::backplane::script::grpc::Diagnostic* mutable_items(int index);
-  ::google::protobuf::RepeatedPtrField< ::io::deephaven::proto::backplane::script::grpc::Diagnostic >*
-      mutable_items();
-  private:
-  const ::google::protobuf::RepeatedPtrField<::io::deephaven::proto::backplane::script::grpc::Diagnostic>& _internal_items() const;
-  ::google::protobuf::RepeatedPtrField<::io::deephaven::proto::backplane::script::grpc::Diagnostic>* _internal_mutable_items();
-  public:
-  const ::io::deephaven::proto::backplane::script::grpc::Diagnostic& items(int index) const;
-  ::io::deephaven::proto::backplane::script::grpc::Diagnostic* add_items();
-  const ::google::protobuf::RepeatedPtrField< ::io::deephaven::proto::backplane::script::grpc::Diagnostic >&
-      items() const;
-  // string kind = 1;
-  void clear_kind() ;
-  const std::string& kind() const;
-  template <typename Arg_ = const std::string&, typename... Args_>
-  void set_kind(Arg_&& arg, Args_... args);
-  std::string* mutable_kind();
-  PROTOBUF_NODISCARD std::string* release_kind();
-  void set_allocated_kind(std::string* value);
-
-  private:
-  const std::string& _internal_kind() const;
-  inline PROTOBUF_ALWAYS_INLINE void _internal_set_kind(
-      const std::string& value);
-  std::string* _internal_mutable_kind();
-
-  public:
-  // optional string result_id = 2;
-  bool has_result_id() const;
-  void clear_result_id() ;
-  const std::string& result_id() const;
-  template <typename Arg_ = const std::string&, typename... Args_>
-  void set_result_id(Arg_&& arg, Args_... args);
-  std::string* mutable_result_id();
-  PROTOBUF_NODISCARD std::string* release_result_id();
-  void set_allocated_result_id(std::string* value);
-
-  private:
-  const std::string& _internal_result_id() const;
-  inline PROTOBUF_ALWAYS_INLINE void _internal_set_result_id(
-      const std::string& value);
-  std::string* _internal_mutable_result_id();
-
-  public:
-  // @@protoc_insertion_point(class_scope:io.deephaven.proto.backplane.script.grpc.GetPullDiagnosticResponse)
- private:
-  class _Internal;
-
-  friend class ::google::protobuf::internal::TcParser;
-  static const ::google::protobuf::internal::TcParseTable<
-      2, 3, 1,
-      88, 2>
-      _table_;
-  friend class ::google::protobuf::MessageLite;
-  friend class ::google::protobuf::Arena;
-  template <typename T>
-  friend class ::google::protobuf::Arena::InternalHelper;
-  using InternalArenaConstructable_ = void;
-  using DestructorSkippable_ = void;
-  struct Impl_ {
-
-        inline explicit constexpr Impl_(
-            ::google::protobuf::internal::ConstantInitialized) noexcept;
-        inline explicit Impl_(::google::protobuf::internal::InternalVisibility visibility,
-                              ::google::protobuf::Arena* arena);
-        inline explicit Impl_(::google::protobuf::internal::InternalVisibility visibility,
-                              ::google::protobuf::Arena* arena, const Impl_& from);
-    ::google::protobuf::internal::HasBits<1> _has_bits_;
-    mutable ::google::protobuf::internal::CachedSize _cached_size_;
-    ::google::protobuf::RepeatedPtrField< ::io::deephaven::proto::backplane::script::grpc::Diagnostic > items_;
-    ::google::protobuf::internal::ArenaStringPtr kind_;
-    ::google::protobuf::internal::ArenaStringPtr result_id_;
-    PROTOBUF_TSAN_DECLARE_MEMBER
-  };
-  union { Impl_ _impl_; };
-  friend struct ::TableStruct_deephaven_2fproto_2fconsole_2eproto;
-};// -------------------------------------------------------------------
-
-class GetPublishDiagnosticResponse final :
-    public ::google::protobuf::Message /* @@protoc_insertion_point(class_definition:io.deephaven.proto.backplane.script.grpc.GetPublishDiagnosticResponse) */ {
- public:
-  inline GetPublishDiagnosticResponse() : GetPublishDiagnosticResponse(nullptr) {}
-  ~GetPublishDiagnosticResponse() override;
-  template<typename = void>
-  explicit PROTOBUF_CONSTEXPR GetPublishDiagnosticResponse(::google::protobuf::internal::ConstantInitialized);
-
-  inline GetPublishDiagnosticResponse(const GetPublishDiagnosticResponse& from)
-      : GetPublishDiagnosticResponse(nullptr, from) {}
-  GetPublishDiagnosticResponse(GetPublishDiagnosticResponse&& from) noexcept
-    : GetPublishDiagnosticResponse() {
-    *this = ::std::move(from);
-  }
-
-  inline GetPublishDiagnosticResponse& operator=(const GetPublishDiagnosticResponse& from) {
-    CopyFrom(from);
-    return *this;
-  }
-  inline GetPublishDiagnosticResponse& operator=(GetPublishDiagnosticResponse&& from) noexcept {
-    if (this == &from) return *this;
-    if (GetArena() == from.GetArena()
-  #ifdef PROTOBUF_FORCE_COPY_IN_MOVE
-        && GetArena() != nullptr
-  #endif  // !PROTOBUF_FORCE_COPY_IN_MOVE
-    ) {
-      InternalSwap(&from);
-    } else {
-      CopyFrom(from);
-    }
-    return *this;
-  }
-
-  inline const ::google::protobuf::UnknownFieldSet& unknown_fields() const
-      ABSL_ATTRIBUTE_LIFETIME_BOUND {
-    return _internal_metadata_.unknown_fields<::google::protobuf::UnknownFieldSet>(::google::protobuf::UnknownFieldSet::default_instance);
-  }
-  inline ::google::protobuf::UnknownFieldSet* mutable_unknown_fields()
-      ABSL_ATTRIBUTE_LIFETIME_BOUND {
-    return _internal_metadata_.mutable_unknown_fields<::google::protobuf::UnknownFieldSet>();
-  }
-
-  static const ::google::protobuf::Descriptor* descriptor() {
-    return GetDescriptor();
-  }
-  static const ::google::protobuf::Descriptor* GetDescriptor() {
-    return default_instance().GetMetadata().descriptor;
-  }
-  static const ::google::protobuf::Reflection* GetReflection() {
-    return default_instance().GetMetadata().reflection;
-  }
-  static const GetPublishDiagnosticResponse& default_instance() {
-    return *internal_default_instance();
-  }
-  static inline const GetPublishDiagnosticResponse* internal_default_instance() {
-    return reinterpret_cast<const GetPublishDiagnosticResponse*>(
-               &_GetPublishDiagnosticResponse_default_instance_);
-  }
-  static constexpr int kIndexInFileMessages =
-    42;
-
-  friend void swap(GetPublishDiagnosticResponse& a, GetPublishDiagnosticResponse& b) {
-    a.Swap(&b);
-  }
-  inline void Swap(GetPublishDiagnosticResponse* other) {
-    if (other == this) return;
-  #ifdef PROTOBUF_FORCE_COPY_IN_SWAP
-    if (GetArena() != nullptr &&
-        GetArena() == other->GetArena()) {
-   #else  // PROTOBUF_FORCE_COPY_IN_SWAP
-    if (GetArena() == other->GetArena()) {
-  #endif  // !PROTOBUF_FORCE_COPY_IN_SWAP
-      InternalSwap(other);
-    } else {
-      ::google::protobuf::internal::GenericSwap(this, other);
-    }
-  }
-  void UnsafeArenaSwap(GetPublishDiagnosticResponse* other) {
-    if (other == this) return;
-    ABSL_DCHECK(GetArena() == other->GetArena());
-    InternalSwap(other);
-  }
-
-  // implements Message ----------------------------------------------
-
-  GetPublishDiagnosticResponse* New(::google::protobuf::Arena* arena = nullptr) const final {
-    return CreateMaybeMessage<GetPublishDiagnosticResponse>(arena);
-  }
-  using ::google::protobuf::Message::CopyFrom;
-  void CopyFrom(const GetPublishDiagnosticResponse& from);
-  using ::google::protobuf::Message::MergeFrom;
-  void MergeFrom( const GetPublishDiagnosticResponse& from) {
-    GetPublishDiagnosticResponse::MergeImpl(*this, from);
-  }
-  private:
-  static void MergeImpl(::google::protobuf::Message& to_msg, const ::google::protobuf::Message& from_msg);
-  public:
-  PROTOBUF_ATTRIBUTE_REINITIALIZES void Clear() final;
-  bool IsInitialized() const final;
-
-  ::size_t ByteSizeLong() const final;
-  const char* _InternalParse(const char* ptr, ::google::protobuf::internal::ParseContext* ctx) final;
-  ::uint8_t* _InternalSerialize(
-      ::uint8_t* target, ::google::protobuf::io::EpsCopyOutputStream* stream) const final;
-  int GetCachedSize() const { return _impl_._cached_size_.Get(); }
-
-  private:
-  ::google::protobuf::internal::CachedSize* AccessCachedSize() const final;
-  void SharedCtor(::google::protobuf::Arena* arena);
-  void SharedDtor();
-  void InternalSwap(GetPublishDiagnosticResponse* other);
-
-  private:
-  friend class ::google::protobuf::internal::AnyMetadata;
-  static ::absl::string_view FullMessageName() {
-    return "io.deephaven.proto.backplane.script.grpc.GetPublishDiagnosticResponse";
-  }
-  protected:
-  explicit GetPublishDiagnosticResponse(::google::protobuf::Arena* arena);
-  GetPublishDiagnosticResponse(::google::protobuf::Arena* arena, const GetPublishDiagnosticResponse& from);
-  public:
-
-  static const ClassData _class_data_;
-  const ::google::protobuf::Message::ClassData*GetClassData() const final;
-
-  ::google::protobuf::Metadata GetMetadata() const final;
-
-  // nested types ----------------------------------------------------
-
-  // accessors -------------------------------------------------------
-
-  enum : int {
-    kDiagnosticsFieldNumber = 3,
-    kUriFieldNumber = 1,
-    kVersionFieldNumber = 2,
-  };
-  // repeated .io.deephaven.proto.backplane.script.grpc.Diagnostic diagnostics = 3;
-  int diagnostics_size() const;
-  private:
-  int _internal_diagnostics_size() const;
-
-  public:
-  void clear_diagnostics() ;
-  ::io::deephaven::proto::backplane::script::grpc::Diagnostic* mutable_diagnostics(int index);
-  ::google::protobuf::RepeatedPtrField< ::io::deephaven::proto::backplane::script::grpc::Diagnostic >*
-      mutable_diagnostics();
-  private:
-  const ::google::protobuf::RepeatedPtrField<::io::deephaven::proto::backplane::script::grpc::Diagnostic>& _internal_diagnostics() const;
-  ::google::protobuf::RepeatedPtrField<::io::deephaven::proto::backplane::script::grpc::Diagnostic>* _internal_mutable_diagnostics();
-  public:
-  const ::io::deephaven::proto::backplane::script::grpc::Diagnostic& diagnostics(int index) const;
-  ::io::deephaven::proto::backplane::script::grpc::Diagnostic* add_diagnostics();
-  const ::google::protobuf::RepeatedPtrField< ::io::deephaven::proto::backplane::script::grpc::Diagnostic >&
-      diagnostics() const;
-  // string uri = 1;
-  void clear_uri() ;
-  const std::string& uri() const;
-  template <typename Arg_ = const std::string&, typename... Args_>
-  void set_uri(Arg_&& arg, Args_... args);
-  std::string* mutable_uri();
-  PROTOBUF_NODISCARD std::string* release_uri();
-  void set_allocated_uri(std::string* value);
-
-  private:
-  const std::string& _internal_uri() const;
-  inline PROTOBUF_ALWAYS_INLINE void _internal_set_uri(
-      const std::string& value);
-  std::string* _internal_mutable_uri();
-
-  public:
-  // optional int32 version = 2;
-  bool has_version() const;
-  void clear_version() ;
-  ::int32_t version() const;
-  void set_version(::int32_t value);
-
-  private:
-  ::int32_t _internal_version() const;
-  void _internal_set_version(::int32_t value);
-
-  public:
-  // @@protoc_insertion_point(class_scope:io.deephaven.proto.backplane.script.grpc.GetPublishDiagnosticResponse)
- private:
-  class _Internal;
-
-  friend class ::google::protobuf::internal::TcParser;
-  static const ::google::protobuf::internal::TcParseTable<
-      2, 3, 1,
-      81, 2>
-      _table_;
-  friend class ::google::protobuf::MessageLite;
-  friend class ::google::protobuf::Arena;
-  template <typename T>
-  friend class ::google::protobuf::Arena::InternalHelper;
-  using InternalArenaConstructable_ = void;
-  using DestructorSkippable_ = void;
-  struct Impl_ {
-
-        inline explicit constexpr Impl_(
-            ::google::protobuf::internal::ConstantInitialized) noexcept;
-        inline explicit Impl_(::google::protobuf::internal::InternalVisibility visibility,
-                              ::google::protobuf::Arena* arena);
-        inline explicit Impl_(::google::protobuf::internal::InternalVisibility visibility,
-                              ::google::protobuf::Arena* arena, const Impl_& from);
-    ::google::protobuf::internal::HasBits<1> _has_bits_;
-    mutable ::google::protobuf::internal::CachedSize _cached_size_;
-    ::google::protobuf::RepeatedPtrField< ::io::deephaven::proto::backplane::script::grpc::Diagnostic > diagnostics_;
-    ::google::protobuf::internal::ArenaStringPtr uri_;
-    ::int32_t version_;
-    PROTOBUF_TSAN_DECLARE_MEMBER
-  };
-  union { Impl_ _impl_; };
-  friend struct ::TableStruct_deephaven_2fproto_2fconsole_2eproto;
-};// -------------------------------------------------------------------
-
-class FigureDescriptor_AxisDescriptor final :
-    public ::google::protobuf::Message /* @@protoc_insertion_point(class_definition:io.deephaven.proto.backplane.script.grpc.FigureDescriptor.AxisDescriptor) */ {
- public:
-  inline FigureDescriptor_AxisDescriptor() : FigureDescriptor_AxisDescriptor(nullptr) {}
-  ~FigureDescriptor_AxisDescriptor() override;
-  template<typename = void>
-  explicit PROTOBUF_CONSTEXPR FigureDescriptor_AxisDescriptor(::google::protobuf::internal::ConstantInitialized);
-
-  inline FigureDescriptor_AxisDescriptor(const FigureDescriptor_AxisDescriptor& from)
-      : FigureDescriptor_AxisDescriptor(nullptr, from) {}
-  FigureDescriptor_AxisDescriptor(FigureDescriptor_AxisDescriptor&& from) noexcept
-    : FigureDescriptor_AxisDescriptor() {
-    *this = ::std::move(from);
-  }
-
-  inline FigureDescriptor_AxisDescriptor& operator=(const FigureDescriptor_AxisDescriptor& from) {
-    CopyFrom(from);
-    return *this;
-  }
-  inline FigureDescriptor_AxisDescriptor& operator=(FigureDescriptor_AxisDescriptor&& from) noexcept {
-    if (this == &from) return *this;
-    if (GetArena() == from.GetArena()
-  #ifdef PROTOBUF_FORCE_COPY_IN_MOVE
-        && GetArena() != nullptr
-  #endif  // !PROTOBUF_FORCE_COPY_IN_MOVE
-    ) {
-      InternalSwap(&from);
-    } else {
-      CopyFrom(from);
-    }
-    return *this;
-  }
-
-  inline const ::google::protobuf::UnknownFieldSet& unknown_fields() const
-      ABSL_ATTRIBUTE_LIFETIME_BOUND {
-    return _internal_metadata_.unknown_fields<::google::protobuf::UnknownFieldSet>(::google::protobuf::UnknownFieldSet::default_instance);
-  }
-  inline ::google::protobuf::UnknownFieldSet* mutable_unknown_fields()
-      ABSL_ATTRIBUTE_LIFETIME_BOUND {
-    return _internal_metadata_.mutable_unknown_fields<::google::protobuf::UnknownFieldSet>();
-  }
-
-  static const ::google::protobuf::Descriptor* descriptor() {
-    return GetDescriptor();
-  }
-  static const ::google::protobuf::Descriptor* GetDescriptor() {
-    return default_instance().GetMetadata().descriptor;
-  }
-  static const ::google::protobuf::Reflection* GetReflection() {
-    return default_instance().GetMetadata().reflection;
-  }
-  static const FigureDescriptor_AxisDescriptor& default_instance() {
-    return *internal_default_instance();
-  }
-  static inline const FigureDescriptor_AxisDescriptor* internal_default_instance() {
-    return reinterpret_cast<const FigureDescriptor_AxisDescriptor*>(
-               &_FigureDescriptor_AxisDescriptor_default_instance_);
-  }
-  static constexpr int kIndexInFileMessages =
-    51;
-
-  friend void swap(FigureDescriptor_AxisDescriptor& a, FigureDescriptor_AxisDescriptor& b) {
-    a.Swap(&b);
-  }
-  inline void Swap(FigureDescriptor_AxisDescriptor* other) {
-    if (other == this) return;
-  #ifdef PROTOBUF_FORCE_COPY_IN_SWAP
-    if (GetArena() != nullptr &&
-        GetArena() == other->GetArena()) {
-   #else  // PROTOBUF_FORCE_COPY_IN_SWAP
-    if (GetArena() == other->GetArena()) {
-  #endif  // !PROTOBUF_FORCE_COPY_IN_SWAP
-      InternalSwap(other);
-    } else {
-      ::google::protobuf::internal::GenericSwap(this, other);
-    }
-  }
-  void UnsafeArenaSwap(FigureDescriptor_AxisDescriptor* other) {
-    if (other == this) return;
-    ABSL_DCHECK(GetArena() == other->GetArena());
-    InternalSwap(other);
-  }
-
-  // implements Message ----------------------------------------------
-
-  FigureDescriptor_AxisDescriptor* New(::google::protobuf::Arena* arena = nullptr) const final {
-    return CreateMaybeMessage<FigureDescriptor_AxisDescriptor>(arena);
-  }
-  using ::google::protobuf::Message::CopyFrom;
-  void CopyFrom(const FigureDescriptor_AxisDescriptor& from);
-  using ::google::protobuf::Message::MergeFrom;
-  void MergeFrom( const FigureDescriptor_AxisDescriptor& from) {
-    FigureDescriptor_AxisDescriptor::MergeImpl(*this, from);
-  }
-  private:
-  static void MergeImpl(::google::protobuf::Message& to_msg, const ::google::protobuf::Message& from_msg);
-  public:
-  PROTOBUF_ATTRIBUTE_REINITIALIZES void Clear() final;
-  bool IsInitialized() const final;
-
-  ::size_t ByteSizeLong() const final;
-  const char* _InternalParse(const char* ptr, ::google::protobuf::internal::ParseContext* ctx) final;
-  ::uint8_t* _InternalSerialize(
-      ::uint8_t* target, ::google::protobuf::io::EpsCopyOutputStream* stream) const final;
-  int GetCachedSize() const { return _impl_._cached_size_.Get(); }
-
-  private:
-  ::google::protobuf::internal::CachedSize* AccessCachedSize() const final;
-  void SharedCtor(::google::protobuf::Arena* arena);
-  void SharedDtor();
-  void InternalSwap(FigureDescriptor_AxisDescriptor* other);
-
-  private:
-  friend class ::google::protobuf::internal::AnyMetadata;
-  static ::absl::string_view FullMessageName() {
-    return "io.deephaven.proto.backplane.script.grpc.FigureDescriptor.AxisDescriptor";
-  }
-  protected:
-  explicit FigureDescriptor_AxisDescriptor(::google::protobuf::Arena* arena);
-  FigureDescriptor_AxisDescriptor(::google::protobuf::Arena* arena, const FigureDescriptor_AxisDescriptor& from);
-  public:
-
-  static const ClassData _class_data_;
-  const ::google::protobuf::Message::ClassData*GetClassData() const final;
-
-  ::google::protobuf::Metadata GetMetadata() const final;
-
-  // nested types ----------------------------------------------------
-
-  using AxisFormatType = FigureDescriptor_AxisDescriptor_AxisFormatType;
-  static constexpr AxisFormatType CATEGORY = FigureDescriptor_AxisDescriptor_AxisFormatType_CATEGORY;
-  static constexpr AxisFormatType NUMBER = FigureDescriptor_AxisDescriptor_AxisFormatType_NUMBER;
-  static inline bool AxisFormatType_IsValid(int value) {
-    return FigureDescriptor_AxisDescriptor_AxisFormatType_IsValid(value);
-  }
-  static constexpr AxisFormatType AxisFormatType_MIN = FigureDescriptor_AxisDescriptor_AxisFormatType_AxisFormatType_MIN;
-  static constexpr AxisFormatType AxisFormatType_MAX = FigureDescriptor_AxisDescriptor_AxisFormatType_AxisFormatType_MAX;
-  static constexpr int AxisFormatType_ARRAYSIZE = FigureDescriptor_AxisDescriptor_AxisFormatType_AxisFormatType_ARRAYSIZE;
-  static inline const ::google::protobuf::EnumDescriptor* AxisFormatType_descriptor() {
-    return FigureDescriptor_AxisDescriptor_AxisFormatType_descriptor();
-  }
-  template <typename T>
-  static inline const std::string& AxisFormatType_Name(T value) {
-    return FigureDescriptor_AxisDescriptor_AxisFormatType_Name(value);
-  }
-  static inline bool AxisFormatType_Parse(absl::string_view name, AxisFormatType* value) {
-    return FigureDescriptor_AxisDescriptor_AxisFormatType_Parse(name, value);
-  }
-
-  using AxisType = FigureDescriptor_AxisDescriptor_AxisType;
-  static constexpr AxisType X = FigureDescriptor_AxisDescriptor_AxisType_X;
-  static constexpr AxisType Y = FigureDescriptor_AxisDescriptor_AxisType_Y;
-  static constexpr AxisType SHAPE = FigureDescriptor_AxisDescriptor_AxisType_SHAPE;
-  static constexpr AxisType SIZE = FigureDescriptor_AxisDescriptor_AxisType_SIZE;
-  static constexpr AxisType LABEL = FigureDescriptor_AxisDescriptor_AxisType_LABEL;
-  static constexpr AxisType COLOR = FigureDescriptor_AxisDescriptor_AxisType_COLOR;
-  static inline bool AxisType_IsValid(int value) {
-    return FigureDescriptor_AxisDescriptor_AxisType_IsValid(value);
-  }
-  static constexpr AxisType AxisType_MIN = FigureDescriptor_AxisDescriptor_AxisType_AxisType_MIN;
-  static constexpr AxisType AxisType_MAX = FigureDescriptor_AxisDescriptor_AxisType_AxisType_MAX;
-  static constexpr int AxisType_ARRAYSIZE = FigureDescriptor_AxisDescriptor_AxisType_AxisType_ARRAYSIZE;
-  static inline const ::google::protobuf::EnumDescriptor* AxisType_descriptor() {
-    return FigureDescriptor_AxisDescriptor_AxisType_descriptor();
-  }
-  template <typename T>
-  static inline const std::string& AxisType_Name(T value) {
-    return FigureDescriptor_AxisDescriptor_AxisType_Name(value);
-  }
-  static inline bool AxisType_Parse(absl::string_view name, AxisType* value) {
-    return FigureDescriptor_AxisDescriptor_AxisType_Parse(name, value);
-  }
-
-  using AxisPosition = FigureDescriptor_AxisDescriptor_AxisPosition;
-  static constexpr AxisPosition TOP = FigureDescriptor_AxisDescriptor_AxisPosition_TOP;
-  static constexpr AxisPosition BOTTOM = FigureDescriptor_AxisDescriptor_AxisPosition_BOTTOM;
-  static constexpr AxisPosition LEFT = FigureDescriptor_AxisDescriptor_AxisPosition_LEFT;
-  static constexpr AxisPosition RIGHT = FigureDescriptor_AxisDescriptor_AxisPosition_RIGHT;
-  static constexpr AxisPosition NONE = FigureDescriptor_AxisDescriptor_AxisPosition_NONE;
-  static inline bool AxisPosition_IsValid(int value) {
-    return FigureDescriptor_AxisDescriptor_AxisPosition_IsValid(value);
-  }
-  static constexpr AxisPosition AxisPosition_MIN = FigureDescriptor_AxisDescriptor_AxisPosition_AxisPosition_MIN;
-  static constexpr AxisPosition AxisPosition_MAX = FigureDescriptor_AxisDescriptor_AxisPosition_AxisPosition_MAX;
-  static constexpr int AxisPosition_ARRAYSIZE = FigureDescriptor_AxisDescriptor_AxisPosition_AxisPosition_ARRAYSIZE;
-  static inline const ::google::protobuf::EnumDescriptor* AxisPosition_descriptor() {
-    return FigureDescriptor_AxisDescriptor_AxisPosition_descriptor();
-  }
-  template <typename T>
-  static inline const std::string& AxisPosition_Name(T value) {
-    return FigureDescriptor_AxisDescriptor_AxisPosition_Name(value);
-  }
-  static inline bool AxisPosition_Parse(absl::string_view name, AxisPosition* value) {
-    return FigureDescriptor_AxisDescriptor_AxisPosition_Parse(name, value);
-  }
-
-  // accessors -------------------------------------------------------
-
-  enum : int {
-    kMajorTickLocationsFieldNumber = 17,
-    kIdFieldNumber = 1,
-    kLabelFieldNumber = 6,
-    kLabelFontFieldNumber = 7,
-    kTicksFontFieldNumber = 8,
-    kFormatPatternFieldNumber = 9,
-    kColorFieldNumber = 10,
-    kBusinessCalendarDescriptorFieldNumber = 21,
-    kFormatTypeFieldNumber = 2,
-    kTypeFieldNumber = 3,
-    kMinRangeFieldNumber = 11,
-    kPositionFieldNumber = 4,
-    kLogFieldNumber = 5,
-    kMinorTicksVisibleFieldNumber = 13,
-    kMajorTicksVisibleFieldNumber = 14,
-    kInvertFieldNumber = 19,
-    kMaxRangeFieldNumber = 12,
-    kGapBetweenMajorTicksFieldNumber = 16,
-    kMinorTickCountFieldNumber = 15,
-    kIsTimeAxisFieldNumber = 20,
-    kTickLabelAngleFieldNumber = 18,
-  };
-  // repeated double major_tick_locations = 17;
-  int major_tick_locations_size() const;
-  private:
-  int _internal_major_tick_locations_size() const;
-
-  public:
-  void clear_major_tick_locations() ;
-  double major_tick_locations(int index) const;
-  void set_major_tick_locations(int index, double value);
-  void add_major_tick_locations(double value);
-  const ::google::protobuf::RepeatedField<double>& major_tick_locations() const;
-  ::google::protobuf::RepeatedField<double>* mutable_major_tick_locations();
-
-  private:
-  const ::google::protobuf::RepeatedField<double>& _internal_major_tick_locations() const;
-  ::google::protobuf::RepeatedField<double>* _internal_mutable_major_tick_locations();
-
-  public:
-  // string id = 1;
-  void clear_id() ;
-  const std::string& id() const;
-  template <typename Arg_ = const std::string&, typename... Args_>
-  void set_id(Arg_&& arg, Args_... args);
-  std::string* mutable_id();
-  PROTOBUF_NODISCARD std::string* release_id();
-  void set_allocated_id(std::string* value);
-
-  private:
-  const std::string& _internal_id() const;
-  inline PROTOBUF_ALWAYS_INLINE void _internal_set_id(
-      const std::string& value);
-  std::string* _internal_mutable_id();
-
-  public:
-  // string label = 6;
-  void clear_label() ;
-  const std::string& label() const;
-  template <typename Arg_ = const std::string&, typename... Args_>
-  void set_label(Arg_&& arg, Args_... args);
-  std::string* mutable_label();
-  PROTOBUF_NODISCARD std::string* release_label();
-  void set_allocated_label(std::string* value);
-
-  private:
-  const std::string& _internal_label() const;
-  inline PROTOBUF_ALWAYS_INLINE void _internal_set_label(
-      const std::string& value);
-  std::string* _internal_mutable_label();
-
-  public:
-  // string label_font = 7;
-  void clear_label_font() ;
-  const std::string& label_font() const;
-  template <typename Arg_ = const std::string&, typename... Args_>
-  void set_label_font(Arg_&& arg, Args_... args);
-  std::string* mutable_label_font();
-  PROTOBUF_NODISCARD std::string* release_label_font();
-  void set_allocated_label_font(std::string* value);
-
-  private:
-  const std::string& _internal_label_font() const;
-  inline PROTOBUF_ALWAYS_INLINE void _internal_set_label_font(
-      const std::string& value);
-  std::string* _internal_mutable_label_font();
-
-  public:
-  // string ticks_font = 8;
-  void clear_ticks_font() ;
-  const std::string& ticks_font() const;
-  template <typename Arg_ = const std::string&, typename... Args_>
-  void set_ticks_font(Arg_&& arg, Args_... args);
-  std::string* mutable_ticks_font();
-  PROTOBUF_NODISCARD std::string* release_ticks_font();
-  void set_allocated_ticks_font(std::string* value);
-
-  private:
-  const std::string& _internal_ticks_font() const;
-  inline PROTOBUF_ALWAYS_INLINE void _internal_set_ticks_font(
-      const std::string& value);
-  std::string* _internal_mutable_ticks_font();
-
-  public:
-  // optional string format_pattern = 9;
-  bool has_format_pattern() const;
-  void clear_format_pattern() ;
-  const std::string& format_pattern() const;
-  template <typename Arg_ = const std::string&, typename... Args_>
-  void set_format_pattern(Arg_&& arg, Args_... args);
-  std::string* mutable_format_pattern();
-  PROTOBUF_NODISCARD std::string* release_format_pattern();
-  void set_allocated_format_pattern(std::string* value);
-
-  private:
-  const std::string& _internal_format_pattern() const;
-  inline PROTOBUF_ALWAYS_INLINE void _internal_set_format_pattern(
-      const std::string& value);
-  std::string* _internal_mutable_format_pattern();
-
-  public:
-  // string color = 10;
-  void clear_color() ;
-  const std::string& color() const;
-  template <typename Arg_ = const std::string&, typename... Args_>
-  void set_color(Arg_&& arg, Args_... args);
-  std::string* mutable_color();
-  PROTOBUF_NODISCARD std::string* release_color();
-  void set_allocated_color(std::string* value);
-
-  private:
-  const std::string& _internal_color() const;
-  inline PROTOBUF_ALWAYS_INLINE void _internal_set_color(
-      const std::string& value);
-  std::string* _internal_mutable_color();
-
-  public:
-  // .io.deephaven.proto.backplane.script.grpc.FigureDescriptor.BusinessCalendarDescriptor business_calendar_descriptor = 21;
-  bool has_business_calendar_descriptor() const;
-  void clear_business_calendar_descriptor() ;
-  const ::io::deephaven::proto::backplane::script::grpc::FigureDescriptor_BusinessCalendarDescriptor& business_calendar_descriptor() const;
-  PROTOBUF_NODISCARD ::io::deephaven::proto::backplane::script::grpc::FigureDescriptor_BusinessCalendarDescriptor* release_business_calendar_descriptor();
-  ::io::deephaven::proto::backplane::script::grpc::FigureDescriptor_BusinessCalendarDescriptor* mutable_business_calendar_descriptor();
-  void set_allocated_business_calendar_descriptor(::io::deephaven::proto::backplane::script::grpc::FigureDescriptor_BusinessCalendarDescriptor* value);
-  void unsafe_arena_set_allocated_business_calendar_descriptor(::io::deephaven::proto::backplane::script::grpc::FigureDescriptor_BusinessCalendarDescriptor* value);
-  ::io::deephaven::proto::backplane::script::grpc::FigureDescriptor_BusinessCalendarDescriptor* unsafe_arena_release_business_calendar_descriptor();
-
-  private:
-  const ::io::deephaven::proto::backplane::script::grpc::FigureDescriptor_BusinessCalendarDescriptor& _internal_business_calendar_descriptor() const;
-  ::io::deephaven::proto::backplane::script::grpc::FigureDescriptor_BusinessCalendarDescriptor* _internal_mutable_business_calendar_descriptor();
-
-  public:
-  // .io.deephaven.proto.backplane.script.grpc.FigureDescriptor.AxisDescriptor.AxisFormatType format_type = 2;
-  void clear_format_type() ;
-  ::io::deephaven::proto::backplane::script::grpc::FigureDescriptor_AxisDescriptor_AxisFormatType format_type() const;
-  void set_format_type(::io::deephaven::proto::backplane::script::grpc::FigureDescriptor_AxisDescriptor_AxisFormatType value);
-
-  private:
-  ::io::deephaven::proto::backplane::script::grpc::FigureDescriptor_AxisDescriptor_AxisFormatType _internal_format_type() const;
-  void _internal_set_format_type(::io::deephaven::proto::backplane::script::grpc::FigureDescriptor_AxisDescriptor_AxisFormatType value);
-
-  public:
-  // .io.deephaven.proto.backplane.script.grpc.FigureDescriptor.AxisDescriptor.AxisType type = 3;
-  void clear_type() ;
-  ::io::deephaven::proto::backplane::script::grpc::FigureDescriptor_AxisDescriptor_AxisType type() const;
-  void set_type(::io::deephaven::proto::backplane::script::grpc::FigureDescriptor_AxisDescriptor_AxisType value);
-
-  private:
-  ::io::deephaven::proto::backplane::script::grpc::FigureDescriptor_AxisDescriptor_AxisType _internal_type() const;
-  void _internal_set_type(::io::deephaven::proto::backplane::script::grpc::FigureDescriptor_AxisDescriptor_AxisType value);
-
-  public:
-  // double min_range = 11;
-  void clear_min_range() ;
-  double min_range() const;
-  void set_min_range(double value);
-
-  private:
-  double _internal_min_range() const;
-  void _internal_set_min_range(double value);
-
-  public:
-  // .io.deephaven.proto.backplane.script.grpc.FigureDescriptor.AxisDescriptor.AxisPosition position = 4;
-  void clear_position() ;
-  ::io::deephaven::proto::backplane::script::grpc::FigureDescriptor_AxisDescriptor_AxisPosition position() const;
-  void set_position(::io::deephaven::proto::backplane::script::grpc::FigureDescriptor_AxisDescriptor_AxisPosition value);
-
-  private:
-  ::io::deephaven::proto::backplane::script::grpc::FigureDescriptor_AxisDescriptor_AxisPosition _internal_position() const;
-  void _internal_set_position(::io::deephaven::proto::backplane::script::grpc::FigureDescriptor_AxisDescriptor_AxisPosition value);
-
-  public:
-  // bool log = 5;
-  void clear_log() ;
-  bool log() const;
-  void set_log(bool value);
-
-  private:
-  bool _internal_log() const;
-  void _internal_set_log(bool value);
-
-  public:
-  // bool minor_ticks_visible = 13;
-  void clear_minor_ticks_visible() ;
-  bool minor_ticks_visible() const;
-  void set_minor_ticks_visible(bool value);
-
-  private:
-  bool _internal_minor_ticks_visible() const;
-  void _internal_set_minor_ticks_visible(bool value);
-
-  public:
-  // bool major_ticks_visible = 14;
-  void clear_major_ticks_visible() ;
-  bool major_ticks_visible() const;
-  void set_major_ticks_visible(bool value);
-
-  private:
-  bool _internal_major_ticks_visible() const;
-  void _internal_set_major_ticks_visible(bool value);
-
-  public:
-  // bool invert = 19;
-  void clear_invert() ;
-  bool invert() const;
-  void set_invert(bool value);
-
-  private:
-  bool _internal_invert() const;
-  void _internal_set_invert(bool value);
-
-  public:
-  // double max_range = 12;
-  void clear_max_range() ;
-  double max_range() const;
-  void set_max_range(double value);
-
-  private:
-  double _internal_max_range() const;
-  void _internal_set_max_range(double value);
-
-  public:
-  // optional double gap_between_major_ticks = 16;
-  bool has_gap_between_major_ticks() const;
-  void clear_gap_between_major_ticks() ;
-  double gap_between_major_ticks() const;
-  void set_gap_between_major_ticks(double value);
-
-  private:
-  double _internal_gap_between_major_ticks() const;
-  void _internal_set_gap_between_major_ticks(double value);
-
-  public:
-  // int32 minor_tick_count = 15;
-  void clear_minor_tick_count() ;
-  ::int32_t minor_tick_count() const;
-  void set_minor_tick_count(::int32_t value);
-
-  private:
-  ::int32_t _internal_minor_tick_count() const;
-  void _internal_set_minor_tick_count(::int32_t value);
-
-  public:
-  // bool is_time_axis = 20;
-  void clear_is_time_axis() ;
-  bool is_time_axis() const;
-  void set_is_time_axis(bool value);
-
-  private:
-  bool _internal_is_time_axis() const;
-  void _internal_set_is_time_axis(bool value);
-
-  public:
-  // double tick_label_angle = 18;
-  void clear_tick_label_angle() ;
-  double tick_label_angle() const;
-  void set_tick_label_angle(double value);
-
-  private:
-  double _internal_tick_label_angle() const;
-  void _internal_set_tick_label_angle(double value);
-
-  public:
-  // @@protoc_insertion_point(class_scope:io.deephaven.proto.backplane.script.grpc.FigureDescriptor.AxisDescriptor)
- private:
-  class _Internal;
-
-  friend class ::google::protobuf::internal::TcParser;
-  static const ::google::protobuf::internal::TcParseTable<
-      5, 21, 1,
-      143, 2>
-      _table_;
-  friend class ::google::protobuf::MessageLite;
-  friend class ::google::protobuf::Arena;
-  template <typename T>
-  friend class ::google::protobuf::Arena::InternalHelper;
-  using InternalArenaConstructable_ = void;
-  using DestructorSkippable_ = void;
-  struct Impl_ {
-
-        inline explicit constexpr Impl_(
-            ::google::protobuf::internal::ConstantInitialized) noexcept;
-        inline explicit Impl_(::google::protobuf::internal::InternalVisibility visibility,
-                              ::google::protobuf::Arena* arena);
-        inline explicit Impl_(::google::protobuf::internal::InternalVisibility visibility,
-                              ::google::protobuf::Arena* arena, const Impl_& from);
-    ::google::protobuf::internal::HasBits<1> _has_bits_;
-    mutable ::google::protobuf::internal::CachedSize _cached_size_;
-    ::google::protobuf::RepeatedField<double> major_tick_locations_;
-    ::google::protobuf::internal::ArenaStringPtr id_;
-    ::google::protobuf::internal::ArenaStringPtr label_;
-    ::google::protobuf::internal::ArenaStringPtr label_font_;
-    ::google::protobuf::internal::ArenaStringPtr ticks_font_;
-    ::google::protobuf::internal::ArenaStringPtr format_pattern_;
-    ::google::protobuf::internal::ArenaStringPtr color_;
-    ::io::deephaven::proto::backplane::script::grpc::FigureDescriptor_BusinessCalendarDescriptor* business_calendar_descriptor_;
-    int format_type_;
-    int type_;
-    double min_range_;
-    int position_;
-    bool log_;
-    bool minor_ticks_visible_;
-    bool major_ticks_visible_;
-    bool invert_;
-    double max_range_;
-    double gap_between_major_ticks_;
-    ::int32_t minor_tick_count_;
-    bool is_time_axis_;
-    double tick_label_angle_;
-    PROTOBUF_TSAN_DECLARE_MEMBER
-  };
-  union { Impl_ _impl_; };
-  friend struct ::TableStruct_deephaven_2fproto_2fconsole_2eproto;
-};// -------------------------------------------------------------------
-
-class CompletionItem final :
-    public ::google::protobuf::Message /* @@protoc_insertion_point(class_definition:io.deephaven.proto.backplane.script.grpc.CompletionItem) */ {
- public:
-  inline CompletionItem() : CompletionItem(nullptr) {}
-  ~CompletionItem() override;
-  template<typename = void>
-  explicit PROTOBUF_CONSTEXPR CompletionItem(::google::protobuf::internal::ConstantInitialized);
-
-  inline CompletionItem(const CompletionItem& from)
-      : CompletionItem(nullptr, from) {}
-  CompletionItem(CompletionItem&& from) noexcept
-    : CompletionItem() {
-    *this = ::std::move(from);
-  }
-
-  inline CompletionItem& operator=(const CompletionItem& from) {
-    CopyFrom(from);
-    return *this;
-  }
-  inline CompletionItem& operator=(CompletionItem&& from) noexcept {
-    if (this == &from) return *this;
-    if (GetArena() == from.GetArena()
-  #ifdef PROTOBUF_FORCE_COPY_IN_MOVE
-        && GetArena() != nullptr
-  #endif  // !PROTOBUF_FORCE_COPY_IN_MOVE
-    ) {
-      InternalSwap(&from);
-    } else {
-      CopyFrom(from);
-    }
-    return *this;
-  }
-
-  inline const ::google::protobuf::UnknownFieldSet& unknown_fields() const
-      ABSL_ATTRIBUTE_LIFETIME_BOUND {
-    return _internal_metadata_.unknown_fields<::google::protobuf::UnknownFieldSet>(::google::protobuf::UnknownFieldSet::default_instance);
-  }
-  inline ::google::protobuf::UnknownFieldSet* mutable_unknown_fields()
-      ABSL_ATTRIBUTE_LIFETIME_BOUND {
-    return _internal_metadata_.mutable_unknown_fields<::google::protobuf::UnknownFieldSet>();
-  }
-
-  static const ::google::protobuf::Descriptor* descriptor() {
-    return GetDescriptor();
-  }
-  static const ::google::protobuf::Descriptor* GetDescriptor() {
-    return default_instance().GetMetadata().descriptor;
-  }
-  static const ::google::protobuf::Reflection* GetReflection() {
-    return default_instance().GetMetadata().reflection;
-  }
-  static const CompletionItem& default_instance() {
-    return *internal_default_instance();
-  }
-  static inline const CompletionItem* internal_default_instance() {
-    return reinterpret_cast<const CompletionItem*>(
-               &_CompletionItem_default_instance_);
-  }
-  static constexpr int kIndexInFileMessages =
-    31;
-
-  friend void swap(CompletionItem& a, CompletionItem& b) {
-    a.Swap(&b);
-  }
-  inline void Swap(CompletionItem* other) {
-    if (other == this) return;
-  #ifdef PROTOBUF_FORCE_COPY_IN_SWAP
-    if (GetArena() != nullptr &&
-        GetArena() == other->GetArena()) {
-   #else  // PROTOBUF_FORCE_COPY_IN_SWAP
-    if (GetArena() == other->GetArena()) {
-  #endif  // !PROTOBUF_FORCE_COPY_IN_SWAP
-      InternalSwap(other);
-    } else {
-      ::google::protobuf::internal::GenericSwap(this, other);
-    }
-  }
-  void UnsafeArenaSwap(CompletionItem* other) {
-    if (other == this) return;
-    ABSL_DCHECK(GetArena() == other->GetArena());
-    InternalSwap(other);
-  }
-
-  // implements Message ----------------------------------------------
-
-  CompletionItem* New(::google::protobuf::Arena* arena = nullptr) const final {
-    return CreateMaybeMessage<CompletionItem>(arena);
-  }
-  using ::google::protobuf::Message::CopyFrom;
-  void CopyFrom(const CompletionItem& from);
-  using ::google::protobuf::Message::MergeFrom;
-  void MergeFrom( const CompletionItem& from) {
-    CompletionItem::MergeImpl(*this, from);
-  }
-  private:
-  static void MergeImpl(::google::protobuf::Message& to_msg, const ::google::protobuf::Message& from_msg);
-  public:
-  PROTOBUF_ATTRIBUTE_REINITIALIZES void Clear() final;
-  bool IsInitialized() const final;
-
-  ::size_t ByteSizeLong() const final;
-  const char* _InternalParse(const char* ptr, ::google::protobuf::internal::ParseContext* ctx) final;
-  ::uint8_t* _InternalSerialize(
-      ::uint8_t* target, ::google::protobuf::io::EpsCopyOutputStream* stream) const final;
-  int GetCachedSize() const { return _impl_._cached_size_.Get(); }
-
-  private:
-  ::google::protobuf::internal::CachedSize* AccessCachedSize() const final;
-  void SharedCtor(::google::protobuf::Arena* arena);
-  void SharedDtor();
-  void InternalSwap(CompletionItem* other);
-
-  private:
-  friend class ::google::protobuf::internal::AnyMetadata;
-  static ::absl::string_view FullMessageName() {
-    return "io.deephaven.proto.backplane.script.grpc.CompletionItem";
-  }
-  protected:
-  explicit CompletionItem(::google::protobuf::Arena* arena);
-  CompletionItem(::google::protobuf::Arena* arena, const CompletionItem& from);
-  public:
-
-  static const ClassData _class_data_;
-  const ::google::protobuf::Message::ClassData*GetClassData() const final;
-
-  ::google::protobuf::Metadata GetMetadata() const final;
-
-  // nested types ----------------------------------------------------
-
-  // accessors -------------------------------------------------------
-
-  enum : int {
-    kAdditionalTextEditsFieldNumber = 13,
-    kCommitCharactersFieldNumber = 14,
-    kLabelFieldNumber = 3,
-    kDetailFieldNumber = 5,
-    kSortTextFieldNumber = 10,
-    kFilterTextFieldNumber = 11,
-    kTextEditFieldNumber = 9,
-    kDocumentationFieldNumber = 15,
-    kStartFieldNumber = 1,
-    kLengthFieldNumber = 2,
-    kKindFieldNumber = 4,
-    kDeprecatedFieldNumber = 7,
-    kPreselectFieldNumber = 8,
-    kInsertTextFormatFieldNumber = 12,
-  };
-  // repeated .io.deephaven.proto.backplane.script.grpc.TextEdit additional_text_edits = 13;
-  int additional_text_edits_size() const;
-  private:
-  int _internal_additional_text_edits_size() const;
-
-  public:
-  void clear_additional_text_edits() ;
-  ::io::deephaven::proto::backplane::script::grpc::TextEdit* mutable_additional_text_edits(int index);
-  ::google::protobuf::RepeatedPtrField< ::io::deephaven::proto::backplane::script::grpc::TextEdit >*
-      mutable_additional_text_edits();
-  private:
-  const ::google::protobuf::RepeatedPtrField<::io::deephaven::proto::backplane::script::grpc::TextEdit>& _internal_additional_text_edits() const;
-  ::google::protobuf::RepeatedPtrField<::io::deephaven::proto::backplane::script::grpc::TextEdit>* _internal_mutable_additional_text_edits();
-  public:
-  const ::io::deephaven::proto::backplane::script::grpc::TextEdit& additional_text_edits(int index) const;
-  ::io::deephaven::proto::backplane::script::grpc::TextEdit* add_additional_text_edits();
-  const ::google::protobuf::RepeatedPtrField< ::io::deephaven::proto::backplane::script::grpc::TextEdit >&
-      additional_text_edits() const;
-  // repeated string commit_characters = 14;
-  int commit_characters_size() const;
-  private:
-  int _internal_commit_characters_size() const;
-
-  public:
-  void clear_commit_characters() ;
-  const std::string& commit_characters(int index) const;
-  std::string* mutable_commit_characters(int index);
-  void set_commit_characters(int index, const std::string& value);
-  void set_commit_characters(int index, std::string&& value);
-  void set_commit_characters(int index, const char* value);
-  void set_commit_characters(int index, const char* value, std::size_t size);
-  void set_commit_characters(int index, absl::string_view value);
-  std::string* add_commit_characters();
-  void add_commit_characters(const std::string& value);
-  void add_commit_characters(std::string&& value);
-  void add_commit_characters(const char* value);
-  void add_commit_characters(const char* value, std::size_t size);
-  void add_commit_characters(absl::string_view value);
-  const ::google::protobuf::RepeatedPtrField<std::string>& commit_characters() const;
-  ::google::protobuf::RepeatedPtrField<std::string>* mutable_commit_characters();
-
-  private:
-  const ::google::protobuf::RepeatedPtrField<std::string>& _internal_commit_characters() const;
-  ::google::protobuf::RepeatedPtrField<std::string>* _internal_mutable_commit_characters();
-
-  public:
-  // string label = 3;
-  void clear_label() ;
-  const std::string& label() const;
-  template <typename Arg_ = const std::string&, typename... Args_>
-  void set_label(Arg_&& arg, Args_... args);
-  std::string* mutable_label();
-  PROTOBUF_NODISCARD std::string* release_label();
-  void set_allocated_label(std::string* value);
-
-  private:
-  const std::string& _internal_label() const;
-  inline PROTOBUF_ALWAYS_INLINE void _internal_set_label(
-      const std::string& value);
-  std::string* _internal_mutable_label();
-
-  public:
-  // string detail = 5;
-  void clear_detail() ;
-  const std::string& detail() const;
-  template <typename Arg_ = const std::string&, typename... Args_>
-  void set_detail(Arg_&& arg, Args_... args);
-  std::string* mutable_detail();
-  PROTOBUF_NODISCARD std::string* release_detail();
-  void set_allocated_detail(std::string* value);
-
-  private:
-  const std::string& _internal_detail() const;
-  inline PROTOBUF_ALWAYS_INLINE void _internal_set_detail(
-      const std::string& value);
-  std::string* _internal_mutable_detail();
-
-  public:
-  // string sort_text = 10;
-  void clear_sort_text() ;
-  const std::string& sort_text() const;
-  template <typename Arg_ = const std::string&, typename... Args_>
-  void set_sort_text(Arg_&& arg, Args_... args);
-  std::string* mutable_sort_text();
-  PROTOBUF_NODISCARD std::string* release_sort_text();
-  void set_allocated_sort_text(std::string* value);
-
-  private:
-  const std::string& _internal_sort_text() const;
-  inline PROTOBUF_ALWAYS_INLINE void _internal_set_sort_text(
-      const std::string& value);
-  std::string* _internal_mutable_sort_text();
-
-  public:
-  // string filter_text = 11;
-  void clear_filter_text() ;
-  const std::string& filter_text() const;
-  template <typename Arg_ = const std::string&, typename... Args_>
-  void set_filter_text(Arg_&& arg, Args_... args);
-  std::string* mutable_filter_text();
-  PROTOBUF_NODISCARD std::string* release_filter_text();
-  void set_allocated_filter_text(std::string* value);
-
-  private:
-  const std::string& _internal_filter_text() const;
-  inline PROTOBUF_ALWAYS_INLINE void _internal_set_filter_text(
-      const std::string& value);
-  std::string* _internal_mutable_filter_text();
-
-  public:
-  // .io.deephaven.proto.backplane.script.grpc.TextEdit text_edit = 9;
-  bool has_text_edit() const;
-  void clear_text_edit() ;
-  const ::io::deephaven::proto::backplane::script::grpc::TextEdit& text_edit() const;
-  PROTOBUF_NODISCARD ::io::deephaven::proto::backplane::script::grpc::TextEdit* release_text_edit();
-  ::io::deephaven::proto::backplane::script::grpc::TextEdit* mutable_text_edit();
-  void set_allocated_text_edit(::io::deephaven::proto::backplane::script::grpc::TextEdit* value);
-  void unsafe_arena_set_allocated_text_edit(::io::deephaven::proto::backplane::script::grpc::TextEdit* value);
-  ::io::deephaven::proto::backplane::script::grpc::TextEdit* unsafe_arena_release_text_edit();
-
-  private:
-  const ::io::deephaven::proto::backplane::script::grpc::TextEdit& _internal_text_edit() const;
-  ::io::deephaven::proto::backplane::script::grpc::TextEdit* _internal_mutable_text_edit();
-
-  public:
-  // .io.deephaven.proto.backplane.script.grpc.MarkupContent documentation = 15;
-  bool has_documentation() const;
-  void clear_documentation() ;
-  const ::io::deephaven::proto::backplane::script::grpc::MarkupContent& documentation() const;
-  PROTOBUF_NODISCARD ::io::deephaven::proto::backplane::script::grpc::MarkupContent* release_documentation();
-  ::io::deephaven::proto::backplane::script::grpc::MarkupContent* mutable_documentation();
-  void set_allocated_documentation(::io::deephaven::proto::backplane::script::grpc::MarkupContent* value);
-  void unsafe_arena_set_allocated_documentation(::io::deephaven::proto::backplane::script::grpc::MarkupContent* value);
-  ::io::deephaven::proto::backplane::script::grpc::MarkupContent* unsafe_arena_release_documentation();
-
-  private:
-  const ::io::deephaven::proto::backplane::script::grpc::MarkupContent& _internal_documentation() const;
-  ::io::deephaven::proto::backplane::script::grpc::MarkupContent* _internal_mutable_documentation();
-
-  public:
-  // int32 start = 1;
-  void clear_start() ;
-  ::int32_t start() const;
-  void set_start(::int32_t value);
-
-  private:
-  ::int32_t _internal_start() const;
-  void _internal_set_start(::int32_t value);
-
-  public:
-  // int32 length = 2;
-  void clear_length() ;
-  ::int32_t length() const;
-  void set_length(::int32_t value);
-
-  private:
-  ::int32_t _internal_length() const;
-  void _internal_set_length(::int32_t value);
-
-  public:
-  // int32 kind = 4;
-  void clear_kind() ;
-  ::int32_t kind() const;
-  void set_kind(::int32_t value);
-
-  private:
-  ::int32_t _internal_kind() const;
-  void _internal_set_kind(::int32_t value);
-
-  public:
-  // bool deprecated = 7;
-  void clear_deprecated() ;
-  bool deprecated() const;
-  void set_deprecated(bool value);
-
-  private:
-  bool _internal_deprecated() const;
-  void _internal_set_deprecated(bool value);
-
-  public:
-  // bool preselect = 8;
-  void clear_preselect() ;
-  bool preselect() const;
-  void set_preselect(bool value);
-
-  private:
-  bool _internal_preselect() const;
-  void _internal_set_preselect(bool value);
-
-  public:
-  // int32 insert_text_format = 12;
-  void clear_insert_text_format() ;
-  ::int32_t insert_text_format() const;
-  void set_insert_text_format(::int32_t value);
-
-  private:
-  ::int32_t _internal_insert_text_format() const;
-  void _internal_set_insert_text_format(::int32_t value);
-
-  public:
-  // @@protoc_insertion_point(class_scope:io.deephaven.proto.backplane.script.grpc.CompletionItem)
- private:
-  class _Internal;
-
-  friend class ::google::protobuf::internal::TcParser;
-  static const ::google::protobuf::internal::TcParseTable<
-      4, 14, 3,
-      120, 2>
-      _table_;
-  friend class ::google::protobuf::MessageLite;
-  friend class ::google::protobuf::Arena;
-  template <typename T>
-  friend class ::google::protobuf::Arena::InternalHelper;
-  using InternalArenaConstructable_ = void;
-  using DestructorSkippable_ = void;
-  struct Impl_ {
-
-        inline explicit constexpr Impl_(
-            ::google::protobuf::internal::ConstantInitialized) noexcept;
-        inline explicit Impl_(::google::protobuf::internal::InternalVisibility visibility,
-                              ::google::protobuf::Arena* arena);
-        inline explicit Impl_(::google::protobuf::internal::InternalVisibility visibility,
-                              ::google::protobuf::Arena* arena, const Impl_& from);
-    ::google::protobuf::internal::HasBits<1> _has_bits_;
-    mutable ::google::protobuf::internal::CachedSize _cached_size_;
-    ::google::protobuf::RepeatedPtrField< ::io::deephaven::proto::backplane::script::grpc::TextEdit > additional_text_edits_;
-    ::google::protobuf::RepeatedPtrField<std::string> commit_characters_;
-    ::google::protobuf::internal::ArenaStringPtr label_;
-    ::google::protobuf::internal::ArenaStringPtr detail_;
-    ::google::protobuf::internal::ArenaStringPtr sort_text_;
-    ::google::protobuf::internal::ArenaStringPtr filter_text_;
-    ::io::deephaven::proto::backplane::script::grpc::TextEdit* text_edit_;
-    ::io::deephaven::proto::backplane::script::grpc::MarkupContent* documentation_;
-    ::int32_t start_;
-    ::int32_t length_;
-    ::int32_t kind_;
-    bool deprecated_;
-    bool preselect_;
-    ::int32_t insert_text_format_;
-    PROTOBUF_TSAN_DECLARE_MEMBER
-  };
-  union { Impl_ _impl_; };
-  friend struct ::TableStruct_deephaven_2fproto_2fconsole_2eproto;
-};// -------------------------------------------------------------------
-
-class ChangeDocumentRequest final :
-    public ::google::protobuf::Message /* @@protoc_insertion_point(class_definition:io.deephaven.proto.backplane.script.grpc.ChangeDocumentRequest) */ {
- public:
-  inline ChangeDocumentRequest() : ChangeDocumentRequest(nullptr) {}
-  ~ChangeDocumentRequest() override;
-  template<typename = void>
-  explicit PROTOBUF_CONSTEXPR ChangeDocumentRequest(::google::protobuf::internal::ConstantInitialized);
-
-  inline ChangeDocumentRequest(const ChangeDocumentRequest& from)
-      : ChangeDocumentRequest(nullptr, from) {}
-  ChangeDocumentRequest(ChangeDocumentRequest&& from) noexcept
-    : ChangeDocumentRequest() {
-    *this = ::std::move(from);
-  }
-
-  inline ChangeDocumentRequest& operator=(const ChangeDocumentRequest& from) {
-    CopyFrom(from);
-    return *this;
-  }
-  inline ChangeDocumentRequest& operator=(ChangeDocumentRequest&& from) noexcept {
-    if (this == &from) return *this;
-    if (GetArena() == from.GetArena()
-  #ifdef PROTOBUF_FORCE_COPY_IN_MOVE
-        && GetArena() != nullptr
-  #endif  // !PROTOBUF_FORCE_COPY_IN_MOVE
-    ) {
-      InternalSwap(&from);
-    } else {
-      CopyFrom(from);
-    }
-    return *this;
-  }
-
-  inline const ::google::protobuf::UnknownFieldSet& unknown_fields() const
-      ABSL_ATTRIBUTE_LIFETIME_BOUND {
-    return _internal_metadata_.unknown_fields<::google::protobuf::UnknownFieldSet>(::google::protobuf::UnknownFieldSet::default_instance);
-  }
-  inline ::google::protobuf::UnknownFieldSet* mutable_unknown_fields()
-      ABSL_ATTRIBUTE_LIFETIME_BOUND {
-    return _internal_metadata_.mutable_unknown_fields<::google::protobuf::UnknownFieldSet>();
-  }
-
-  static const ::google::protobuf::Descriptor* descriptor() {
-    return GetDescriptor();
-  }
-  static const ::google::protobuf::Descriptor* GetDescriptor() {
-    return default_instance().GetMetadata().descriptor;
-  }
-  static const ::google::protobuf::Reflection* GetReflection() {
-    return default_instance().GetMetadata().reflection;
-  }
-  static const ChangeDocumentRequest& default_instance() {
-    return *internal_default_instance();
-  }
-  static inline const ChangeDocumentRequest* internal_default_instance() {
-    return reinterpret_cast<const ChangeDocumentRequest*>(
-               &_ChangeDocumentRequest_default_instance_);
-  }
-  static constexpr int kIndexInFileMessages =
-    23;
-
-  friend void swap(ChangeDocumentRequest& a, ChangeDocumentRequest& b) {
-    a.Swap(&b);
-  }
-  inline void Swap(ChangeDocumentRequest* other) {
-    if (other == this) return;
-  #ifdef PROTOBUF_FORCE_COPY_IN_SWAP
-    if (GetArena() != nullptr &&
-        GetArena() == other->GetArena()) {
-   #else  // PROTOBUF_FORCE_COPY_IN_SWAP
-    if (GetArena() == other->GetArena()) {
-  #endif  // !PROTOBUF_FORCE_COPY_IN_SWAP
-      InternalSwap(other);
-    } else {
-      ::google::protobuf::internal::GenericSwap(this, other);
-    }
-  }
-  void UnsafeArenaSwap(ChangeDocumentRequest* other) {
-    if (other == this) return;
-    ABSL_DCHECK(GetArena() == other->GetArena());
-    InternalSwap(other);
-  }
-
-  // implements Message ----------------------------------------------
-
-  ChangeDocumentRequest* New(::google::protobuf::Arena* arena = nullptr) const final {
-    return CreateMaybeMessage<ChangeDocumentRequest>(arena);
-  }
-  using ::google::protobuf::Message::CopyFrom;
-  void CopyFrom(const ChangeDocumentRequest& from);
-  using ::google::protobuf::Message::MergeFrom;
-  void MergeFrom( const ChangeDocumentRequest& from) {
-    ChangeDocumentRequest::MergeImpl(*this, from);
-  }
-  private:
-  static void MergeImpl(::google::protobuf::Message& to_msg, const ::google::protobuf::Message& from_msg);
-  public:
-  PROTOBUF_ATTRIBUTE_REINITIALIZES void Clear() final;
-  bool IsInitialized() const final;
-
-  ::size_t ByteSizeLong() const final;
-  const char* _InternalParse(const char* ptr, ::google::protobuf::internal::ParseContext* ctx) final;
-  ::uint8_t* _InternalSerialize(
-      ::uint8_t* target, ::google::protobuf::io::EpsCopyOutputStream* stream) const final;
-  int GetCachedSize() const { return _impl_._cached_size_.Get(); }
-
-  private:
-  ::google::protobuf::internal::CachedSize* AccessCachedSize() const final;
-  void SharedCtor(::google::protobuf::Arena* arena);
-  void SharedDtor();
-  void InternalSwap(ChangeDocumentRequest* other);
-
-  private:
-  friend class ::google::protobuf::internal::AnyMetadata;
-  static ::absl::string_view FullMessageName() {
-    return "io.deephaven.proto.backplane.script.grpc.ChangeDocumentRequest";
-  }
-  protected:
-  explicit ChangeDocumentRequest(::google::protobuf::Arena* arena);
-  ChangeDocumentRequest(::google::protobuf::Arena* arena, const ChangeDocumentRequest& from);
-  public:
-
-  static const ClassData _class_data_;
-  const ::google::protobuf::Message::ClassData*GetClassData() const final;
-
-  ::google::protobuf::Metadata GetMetadata() const final;
-
-  // nested types ----------------------------------------------------
-
-  using TextDocumentContentChangeEvent = ChangeDocumentRequest_TextDocumentContentChangeEvent;
-
-  // accessors -------------------------------------------------------
-
-  enum : int {
-    kContentChangesFieldNumber = 3,
-    kConsoleIdFieldNumber = 1,
-    kTextDocumentFieldNumber = 2,
-  };
-  // repeated .io.deephaven.proto.backplane.script.grpc.ChangeDocumentRequest.TextDocumentContentChangeEvent content_changes = 3;
-  int content_changes_size() const;
-  private:
-  int _internal_content_changes_size() const;
-
-  public:
-  void clear_content_changes() ;
-  ::io::deephaven::proto::backplane::script::grpc::ChangeDocumentRequest_TextDocumentContentChangeEvent* mutable_content_changes(int index);
-  ::google::protobuf::RepeatedPtrField< ::io::deephaven::proto::backplane::script::grpc::ChangeDocumentRequest_TextDocumentContentChangeEvent >*
-      mutable_content_changes();
-  private:
-  const ::google::protobuf::RepeatedPtrField<::io::deephaven::proto::backplane::script::grpc::ChangeDocumentRequest_TextDocumentContentChangeEvent>& _internal_content_changes() const;
-  ::google::protobuf::RepeatedPtrField<::io::deephaven::proto::backplane::script::grpc::ChangeDocumentRequest_TextDocumentContentChangeEvent>* _internal_mutable_content_changes();
-  public:
-  const ::io::deephaven::proto::backplane::script::grpc::ChangeDocumentRequest_TextDocumentContentChangeEvent& content_changes(int index) const;
-  ::io::deephaven::proto::backplane::script::grpc::ChangeDocumentRequest_TextDocumentContentChangeEvent* add_content_changes();
-  const ::google::protobuf::RepeatedPtrField< ::io::deephaven::proto::backplane::script::grpc::ChangeDocumentRequest_TextDocumentContentChangeEvent >&
-      content_changes() const;
-  // .io.deephaven.proto.backplane.grpc.Ticket console_id = 1 [deprecated = true];
-  [[deprecated]]  bool has_console_id() const;
-  [[deprecated]]  void clear_console_id() ;
-  [[deprecated]] const ::io::deephaven::proto::backplane::grpc::Ticket& console_id() const;
-  [[deprecated]] PROTOBUF_NODISCARD ::io::deephaven::proto::backplane::grpc::Ticket* release_console_id();
-  [[deprecated]] ::io::deephaven::proto::backplane::grpc::Ticket* mutable_console_id();
-  [[deprecated]] void set_allocated_console_id(::io::deephaven::proto::backplane::grpc::Ticket* value);
-  [[deprecated]] void unsafe_arena_set_allocated_console_id(::io::deephaven::proto::backplane::grpc::Ticket* value);
-  [[deprecated]] ::io::deephaven::proto::backplane::grpc::Ticket* unsafe_arena_release_console_id();
-
-  private:
-  const ::io::deephaven::proto::backplane::grpc::Ticket& _internal_console_id() const;
-  ::io::deephaven::proto::backplane::grpc::Ticket* _internal_mutable_console_id();
-
-  public:
-  // .io.deephaven.proto.backplane.script.grpc.VersionedTextDocumentIdentifier text_document = 2;
-  bool has_text_document() const;
-  void clear_text_document() ;
-  const ::io::deephaven::proto::backplane::script::grpc::VersionedTextDocumentIdentifier& text_document() const;
-  PROTOBUF_NODISCARD ::io::deephaven::proto::backplane::script::grpc::VersionedTextDocumentIdentifier* release_text_document();
-  ::io::deephaven::proto::backplane::script::grpc::VersionedTextDocumentIdentifier* mutable_text_document();
-  void set_allocated_text_document(::io::deephaven::proto::backplane::script::grpc::VersionedTextDocumentIdentifier* value);
-  void unsafe_arena_set_allocated_text_document(::io::deephaven::proto::backplane::script::grpc::VersionedTextDocumentIdentifier* value);
-  ::io::deephaven::proto::backplane::script::grpc::VersionedTextDocumentIdentifier* unsafe_arena_release_text_document();
-
-  private:
-  const ::io::deephaven::proto::backplane::script::grpc::VersionedTextDocumentIdentifier& _internal_text_document() const;
-  ::io::deephaven::proto::backplane::script::grpc::VersionedTextDocumentIdentifier* _internal_mutable_text_document();
-
-  public:
-  // @@protoc_insertion_point(class_scope:io.deephaven.proto.backplane.script.grpc.ChangeDocumentRequest)
- private:
-  class _Internal;
-
-  friend class ::google::protobuf::internal::TcParser;
-  static const ::google::protobuf::internal::TcParseTable<
-      2, 3, 3,
-      0, 2>
-      _table_;
-  friend class ::google::protobuf::MessageLite;
-  friend class ::google::protobuf::Arena;
-  template <typename T>
-  friend class ::google::protobuf::Arena::InternalHelper;
-  using InternalArenaConstructable_ = void;
-  using DestructorSkippable_ = void;
-  struct Impl_ {
-
-        inline explicit constexpr Impl_(
-            ::google::protobuf::internal::ConstantInitialized) noexcept;
-        inline explicit Impl_(::google::protobuf::internal::InternalVisibility visibility,
-                              ::google::protobuf::Arena* arena);
-        inline explicit Impl_(::google::protobuf::internal::InternalVisibility visibility,
-                              ::google::protobuf::Arena* arena, const Impl_& from);
-    ::google::protobuf::internal::HasBits<1> _has_bits_;
-    mutable ::google::protobuf::internal::CachedSize _cached_size_;
-    ::google::protobuf::RepeatedPtrField< ::io::deephaven::proto::backplane::script::grpc::ChangeDocumentRequest_TextDocumentContentChangeEvent > content_changes_;
-    ::io::deephaven::proto::backplane::grpc::Ticket* console_id_;
-    ::io::deephaven::proto::backplane::script::grpc::VersionedTextDocumentIdentifier* text_document_;
-    PROTOBUF_TSAN_DECLARE_MEMBER
-  };
-  union { Impl_ _impl_; };
-  friend struct ::TableStruct_deephaven_2fproto_2fconsole_2eproto;
-};// -------------------------------------------------------------------
-
-class SignatureHelpContext final :
-    public ::google::protobuf::Message /* @@protoc_insertion_point(class_definition:io.deephaven.proto.backplane.script.grpc.SignatureHelpContext) */ {
- public:
-  inline SignatureHelpContext() : SignatureHelpContext(nullptr) {}
-  ~SignatureHelpContext() override;
-  template<typename = void>
-  explicit PROTOBUF_CONSTEXPR SignatureHelpContext(::google::protobuf::internal::ConstantInitialized);
-
-  inline SignatureHelpContext(const SignatureHelpContext& from)
-      : SignatureHelpContext(nullptr, from) {}
-  SignatureHelpContext(SignatureHelpContext&& from) noexcept
-    : SignatureHelpContext() {
-    *this = ::std::move(from);
-  }
-
-  inline SignatureHelpContext& operator=(const SignatureHelpContext& from) {
-    CopyFrom(from);
-    return *this;
-  }
-  inline SignatureHelpContext& operator=(SignatureHelpContext&& from) noexcept {
-    if (this == &from) return *this;
-    if (GetArena() == from.GetArena()
-  #ifdef PROTOBUF_FORCE_COPY_IN_MOVE
-        && GetArena() != nullptr
-  #endif  // !PROTOBUF_FORCE_COPY_IN_MOVE
-    ) {
-      InternalSwap(&from);
-    } else {
-      CopyFrom(from);
-    }
-    return *this;
-  }
-
-  inline const ::google::protobuf::UnknownFieldSet& unknown_fields() const
-      ABSL_ATTRIBUTE_LIFETIME_BOUND {
-    return _internal_metadata_.unknown_fields<::google::protobuf::UnknownFieldSet>(::google::protobuf::UnknownFieldSet::default_instance);
-  }
-  inline ::google::protobuf::UnknownFieldSet* mutable_unknown_fields()
-      ABSL_ATTRIBUTE_LIFETIME_BOUND {
-    return _internal_metadata_.mutable_unknown_fields<::google::protobuf::UnknownFieldSet>();
-  }
-
-  static const ::google::protobuf::Descriptor* descriptor() {
-    return GetDescriptor();
-  }
-  static const ::google::protobuf::Descriptor* GetDescriptor() {
-    return default_instance().GetMetadata().descriptor;
-  }
-  static const ::google::protobuf::Reflection* GetReflection() {
-    return default_instance().GetMetadata().reflection;
-  }
-  static const SignatureHelpContext& default_instance() {
-    return *internal_default_instance();
-  }
-  static inline const SignatureHelpContext* internal_default_instance() {
-    return reinterpret_cast<const SignatureHelpContext*>(
-               &_SignatureHelpContext_default_instance_);
-  }
-  static constexpr int kIndexInFileMessages =
-    34;
-
-  friend void swap(SignatureHelpContext& a, SignatureHelpContext& b) {
-    a.Swap(&b);
-  }
-  inline void Swap(SignatureHelpContext* other) {
-    if (other == this) return;
-  #ifdef PROTOBUF_FORCE_COPY_IN_SWAP
-    if (GetArena() != nullptr &&
-        GetArena() == other->GetArena()) {
-   #else  // PROTOBUF_FORCE_COPY_IN_SWAP
-    if (GetArena() == other->GetArena()) {
-  #endif  // !PROTOBUF_FORCE_COPY_IN_SWAP
-      InternalSwap(other);
-    } else {
-      ::google::protobuf::internal::GenericSwap(this, other);
-    }
-  }
-  void UnsafeArenaSwap(SignatureHelpContext* other) {
-    if (other == this) return;
-    ABSL_DCHECK(GetArena() == other->GetArena());
-    InternalSwap(other);
-  }
-
-  // implements Message ----------------------------------------------
-
-  SignatureHelpContext* New(::google::protobuf::Arena* arena = nullptr) const final {
-    return CreateMaybeMessage<SignatureHelpContext>(arena);
-  }
-  using ::google::protobuf::Message::CopyFrom;
-  void CopyFrom(const SignatureHelpContext& from);
-  using ::google::protobuf::Message::MergeFrom;
-  void MergeFrom( const SignatureHelpContext& from) {
-    SignatureHelpContext::MergeImpl(*this, from);
-  }
-  private:
-  static void MergeImpl(::google::protobuf::Message& to_msg, const ::google::protobuf::Message& from_msg);
-  public:
-  PROTOBUF_ATTRIBUTE_REINITIALIZES void Clear() final;
-  bool IsInitialized() const final;
-
-  ::size_t ByteSizeLong() const final;
-  const char* _InternalParse(const char* ptr, ::google::protobuf::internal::ParseContext* ctx) final;
-  ::uint8_t* _InternalSerialize(
-      ::uint8_t* target, ::google::protobuf::io::EpsCopyOutputStream* stream) const final;
-  int GetCachedSize() const { return _impl_._cached_size_.Get(); }
-
-  private:
-  ::google::protobuf::internal::CachedSize* AccessCachedSize() const final;
-  void SharedCtor(::google::protobuf::Arena* arena);
-  void SharedDtor();
-  void InternalSwap(SignatureHelpContext* other);
-
-  private:
-  friend class ::google::protobuf::internal::AnyMetadata;
-  static ::absl::string_view FullMessageName() {
-    return "io.deephaven.proto.backplane.script.grpc.SignatureHelpContext";
-  }
-  protected:
-  explicit SignatureHelpContext(::google::protobuf::Arena* arena);
-  SignatureHelpContext(::google::protobuf::Arena* arena, const SignatureHelpContext& from);
-  public:
-
-  static const ClassData _class_data_;
-  const ::google::protobuf::Message::ClassData*GetClassData() const final;
-
-  ::google::protobuf::Metadata GetMetadata() const final;
-
-  // nested types ----------------------------------------------------
-
-  // accessors -------------------------------------------------------
-
-  enum : int {
-    kTriggerCharacterFieldNumber = 2,
-    kActiveSignatureHelpFieldNumber = 4,
-    kTriggerKindFieldNumber = 1,
-    kIsRetriggerFieldNumber = 3,
-  };
-  // optional string trigger_character = 2;
-  bool has_trigger_character() const;
-  void clear_trigger_character() ;
-  const std::string& trigger_character() const;
-  template <typename Arg_ = const std::string&, typename... Args_>
-  void set_trigger_character(Arg_&& arg, Args_... args);
-  std::string* mutable_trigger_character();
-  PROTOBUF_NODISCARD std::string* release_trigger_character();
-  void set_allocated_trigger_character(std::string* value);
-
-  private:
-  const std::string& _internal_trigger_character() const;
-  inline PROTOBUF_ALWAYS_INLINE void _internal_set_trigger_character(
-      const std::string& value);
-  std::string* _internal_mutable_trigger_character();
-
-  public:
-  // .io.deephaven.proto.backplane.script.grpc.GetSignatureHelpResponse active_signature_help = 4;
-  bool has_active_signature_help() const;
-  void clear_active_signature_help() ;
-  const ::io::deephaven::proto::backplane::script::grpc::GetSignatureHelpResponse& active_signature_help() const;
-  PROTOBUF_NODISCARD ::io::deephaven::proto::backplane::script::grpc::GetSignatureHelpResponse* release_active_signature_help();
-  ::io::deephaven::proto::backplane::script::grpc::GetSignatureHelpResponse* mutable_active_signature_help();
-  void set_allocated_active_signature_help(::io::deephaven::proto::backplane::script::grpc::GetSignatureHelpResponse* value);
-  void unsafe_arena_set_allocated_active_signature_help(::io::deephaven::proto::backplane::script::grpc::GetSignatureHelpResponse* value);
-  ::io::deephaven::proto::backplane::script::grpc::GetSignatureHelpResponse* unsafe_arena_release_active_signature_help();
-
-  private:
-  const ::io::deephaven::proto::backplane::script::grpc::GetSignatureHelpResponse& _internal_active_signature_help() const;
-  ::io::deephaven::proto::backplane::script::grpc::GetSignatureHelpResponse* _internal_mutable_active_signature_help();
-
-  public:
-  // int32 trigger_kind = 1;
-  void clear_trigger_kind() ;
-  ::int32_t trigger_kind() const;
-  void set_trigger_kind(::int32_t value);
-
-  private:
-  ::int32_t _internal_trigger_kind() const;
-  void _internal_set_trigger_kind(::int32_t value);
-
-  public:
-  // bool is_retrigger = 3;
-  void clear_is_retrigger() ;
-  bool is_retrigger() const;
-  void set_is_retrigger(bool value);
-
-  private:
-  bool _internal_is_retrigger() const;
-  void _internal_set_is_retrigger(bool value);
-
-  public:
-  // @@protoc_insertion_point(class_scope:io.deephaven.proto.backplane.script.grpc.SignatureHelpContext)
- private:
-  class _Internal;
-
-  friend class ::google::protobuf::internal::TcParser;
-  static const ::google::protobuf::internal::TcParseTable<
-      2, 4, 1,
-      87, 2>
-      _table_;
-  friend class ::google::protobuf::MessageLite;
-  friend class ::google::protobuf::Arena;
-  template <typename T>
-  friend class ::google::protobuf::Arena::InternalHelper;
-  using InternalArenaConstructable_ = void;
-  using DestructorSkippable_ = void;
-  struct Impl_ {
-
-        inline explicit constexpr Impl_(
-            ::google::protobuf::internal::ConstantInitialized) noexcept;
-        inline explicit Impl_(::google::protobuf::internal::InternalVisibility visibility,
-                              ::google::protobuf::Arena* arena);
-        inline explicit Impl_(::google::protobuf::internal::InternalVisibility visibility,
-                              ::google::protobuf::Arena* arena, const Impl_& from);
-    ::google::protobuf::internal::HasBits<1> _has_bits_;
-    mutable ::google::protobuf::internal::CachedSize _cached_size_;
-    ::google::protobuf::internal::ArenaStringPtr trigger_character_;
-    ::io::deephaven::proto::backplane::script::grpc::GetSignatureHelpResponse* active_signature_help_;
-    ::int32_t trigger_kind_;
-    bool is_retrigger_;
-    PROTOBUF_TSAN_DECLARE_MEMBER
-  };
-  union { Impl_ _impl_; };
-  friend struct ::TableStruct_deephaven_2fproto_2fconsole_2eproto;
-};// -------------------------------------------------------------------
-
-class GetCompletionItemsResponse final :
-    public ::google::protobuf::Message /* @@protoc_insertion_point(class_definition:io.deephaven.proto.backplane.script.grpc.GetCompletionItemsResponse) */ {
- public:
-  inline GetCompletionItemsResponse() : GetCompletionItemsResponse(nullptr) {}
-  ~GetCompletionItemsResponse() override;
-  template<typename = void>
-  explicit PROTOBUF_CONSTEXPR GetCompletionItemsResponse(::google::protobuf::internal::ConstantInitialized);
-
-  inline GetCompletionItemsResponse(const GetCompletionItemsResponse& from)
-      : GetCompletionItemsResponse(nullptr, from) {}
-  GetCompletionItemsResponse(GetCompletionItemsResponse&& from) noexcept
-    : GetCompletionItemsResponse() {
-    *this = ::std::move(from);
-  }
-
-  inline GetCompletionItemsResponse& operator=(const GetCompletionItemsResponse& from) {
-    CopyFrom(from);
-    return *this;
-  }
-  inline GetCompletionItemsResponse& operator=(GetCompletionItemsResponse&& from) noexcept {
-    if (this == &from) return *this;
-    if (GetArena() == from.GetArena()
-  #ifdef PROTOBUF_FORCE_COPY_IN_MOVE
-        && GetArena() != nullptr
-  #endif  // !PROTOBUF_FORCE_COPY_IN_MOVE
-    ) {
-      InternalSwap(&from);
-    } else {
-      CopyFrom(from);
-    }
-    return *this;
-  }
-
-  inline const ::google::protobuf::UnknownFieldSet& unknown_fields() const
-      ABSL_ATTRIBUTE_LIFETIME_BOUND {
-    return _internal_metadata_.unknown_fields<::google::protobuf::UnknownFieldSet>(::google::protobuf::UnknownFieldSet::default_instance);
-  }
-  inline ::google::protobuf::UnknownFieldSet* mutable_unknown_fields()
-      ABSL_ATTRIBUTE_LIFETIME_BOUND {
-    return _internal_metadata_.mutable_unknown_fields<::google::protobuf::UnknownFieldSet>();
-  }
-
-  static const ::google::protobuf::Descriptor* descriptor() {
-    return GetDescriptor();
-  }
-  static const ::google::protobuf::Descriptor* GetDescriptor() {
-    return default_instance().GetMetadata().descriptor;
-  }
-  static const ::google::protobuf::Reflection* GetReflection() {
-    return default_instance().GetMetadata().reflection;
-  }
-  static const GetCompletionItemsResponse& default_instance() {
-    return *internal_default_instance();
-  }
-  static inline const GetCompletionItemsResponse* internal_default_instance() {
-    return reinterpret_cast<const GetCompletionItemsResponse*>(
-               &_GetCompletionItemsResponse_default_instance_);
-  }
-  static constexpr int kIndexInFileMessages =
-    30;
-
-  friend void swap(GetCompletionItemsResponse& a, GetCompletionItemsResponse& b) {
-    a.Swap(&b);
-  }
-  inline void Swap(GetCompletionItemsResponse* other) {
-    if (other == this) return;
-  #ifdef PROTOBUF_FORCE_COPY_IN_SWAP
-    if (GetArena() != nullptr &&
-        GetArena() == other->GetArena()) {
-   #else  // PROTOBUF_FORCE_COPY_IN_SWAP
-    if (GetArena() == other->GetArena()) {
-  #endif  // !PROTOBUF_FORCE_COPY_IN_SWAP
-      InternalSwap(other);
-    } else {
-      ::google::protobuf::internal::GenericSwap(this, other);
-    }
-  }
-  void UnsafeArenaSwap(GetCompletionItemsResponse* other) {
-    if (other == this) return;
-    ABSL_DCHECK(GetArena() == other->GetArena());
-    InternalSwap(other);
-  }
-
-  // implements Message ----------------------------------------------
-
-  GetCompletionItemsResponse* New(::google::protobuf::Arena* arena = nullptr) const final {
-    return CreateMaybeMessage<GetCompletionItemsResponse>(arena);
-  }
-  using ::google::protobuf::Message::CopyFrom;
-  void CopyFrom(const GetCompletionItemsResponse& from);
-  using ::google::protobuf::Message::MergeFrom;
-  void MergeFrom( const GetCompletionItemsResponse& from) {
-    GetCompletionItemsResponse::MergeImpl(*this, from);
-  }
-  private:
-  static void MergeImpl(::google::protobuf::Message& to_msg, const ::google::protobuf::Message& from_msg);
-  public:
-  PROTOBUF_ATTRIBUTE_REINITIALIZES void Clear() final;
-  bool IsInitialized() const final;
-
-  ::size_t ByteSizeLong() const final;
-  const char* _InternalParse(const char* ptr, ::google::protobuf::internal::ParseContext* ctx) final;
-  ::uint8_t* _InternalSerialize(
-      ::uint8_t* target, ::google::protobuf::io::EpsCopyOutputStream* stream) const final;
-  int GetCachedSize() const { return _impl_._cached_size_.Get(); }
-
-  private:
-  ::google::protobuf::internal::CachedSize* AccessCachedSize() const final;
-  void SharedCtor(::google::protobuf::Arena* arena);
-  void SharedDtor();
-  void InternalSwap(GetCompletionItemsResponse* other);
-
-  private:
-  friend class ::google::protobuf::internal::AnyMetadata;
-  static ::absl::string_view FullMessageName() {
-    return "io.deephaven.proto.backplane.script.grpc.GetCompletionItemsResponse";
-  }
-  protected:
-  explicit GetCompletionItemsResponse(::google::protobuf::Arena* arena);
-  GetCompletionItemsResponse(::google::protobuf::Arena* arena, const GetCompletionItemsResponse& from);
-  public:
-
-  static const ClassData _class_data_;
-  const ::google::protobuf::Message::ClassData*GetClassData() const final;
-
-  ::google::protobuf::Metadata GetMetadata() const final;
-
-  // nested types ----------------------------------------------------
-
-  // accessors -------------------------------------------------------
-
-  enum : int {
-    kItemsFieldNumber = 1,
-    kRequestIdFieldNumber = 2,
-    kSuccessFieldNumber = 3,
-  };
-  // repeated .io.deephaven.proto.backplane.script.grpc.CompletionItem items = 1;
-  int items_size() const;
-  private:
-  int _internal_items_size() const;
-
-  public:
-  void clear_items() ;
-  ::io::deephaven::proto::backplane::script::grpc::CompletionItem* mutable_items(int index);
-  ::google::protobuf::RepeatedPtrField< ::io::deephaven::proto::backplane::script::grpc::CompletionItem >*
-      mutable_items();
-  private:
-  const ::google::protobuf::RepeatedPtrField<::io::deephaven::proto::backplane::script::grpc::CompletionItem>& _internal_items() const;
-  ::google::protobuf::RepeatedPtrField<::io::deephaven::proto::backplane::script::grpc::CompletionItem>* _internal_mutable_items();
-  public:
-  const ::io::deephaven::proto::backplane::script::grpc::CompletionItem& items(int index) const;
-  ::io::deephaven::proto::backplane::script::grpc::CompletionItem* add_items();
-  const ::google::protobuf::RepeatedPtrField< ::io::deephaven::proto::backplane::script::grpc::CompletionItem >&
-      items() const;
-  // int32 request_id = 2 [deprecated = true];
-  [[deprecated]]  void clear_request_id() ;
-  [[deprecated]] ::int32_t request_id() const;
-  [[deprecated]] void set_request_id(::int32_t value);
-
-  private:
-  ::int32_t _internal_request_id() const;
-  void _internal_set_request_id(::int32_t value);
-
-  public:
-  // bool success = 3 [deprecated = true];
-  [[deprecated]]  void clear_success() ;
-  [[deprecated]] bool success() const;
-  [[deprecated]] void set_success(bool value);
-
-  private:
-  bool _internal_success() const;
-  void _internal_set_success(bool value);
-
-  public:
-  // @@protoc_insertion_point(class_scope:io.deephaven.proto.backplane.script.grpc.GetCompletionItemsResponse)
- private:
-  class _Internal;
-
-  friend class ::google::protobuf::internal::TcParser;
-  static const ::google::protobuf::internal::TcParseTable<
-      2, 3, 1,
-      0, 2>
-      _table_;
-  friend class ::google::protobuf::MessageLite;
-  friend class ::google::protobuf::Arena;
-  template <typename T>
-  friend class ::google::protobuf::Arena::InternalHelper;
-  using InternalArenaConstructable_ = void;
-  using DestructorSkippable_ = void;
-  struct Impl_ {
-
-        inline explicit constexpr Impl_(
-            ::google::protobuf::internal::ConstantInitialized) noexcept;
-        inline explicit Impl_(::google::protobuf::internal::InternalVisibility visibility,
-                              ::google::protobuf::Arena* arena);
-        inline explicit Impl_(::google::protobuf::internal::InternalVisibility visibility,
-                              ::google::protobuf::Arena* arena, const Impl_& from);
-    ::google::protobuf::RepeatedPtrField< ::io::deephaven::proto::backplane::script::grpc::CompletionItem > items_;
-    ::int32_t request_id_;
-    bool success_;
-    mutable ::google::protobuf::internal::CachedSize _cached_size_;
-    PROTOBUF_TSAN_DECLARE_MEMBER
-  };
-  union { Impl_ _impl_; };
-  friend struct ::TableStruct_deephaven_2fproto_2fconsole_2eproto;
-};// -------------------------------------------------------------------
-
-class FigureDescriptor_ChartDescriptor final :
-    public ::google::protobuf::Message /* @@protoc_insertion_point(class_definition:io.deephaven.proto.backplane.script.grpc.FigureDescriptor.ChartDescriptor) */ {
- public:
-  inline FigureDescriptor_ChartDescriptor() : FigureDescriptor_ChartDescriptor(nullptr) {}
-  ~FigureDescriptor_ChartDescriptor() override;
-  template<typename = void>
-  explicit PROTOBUF_CONSTEXPR FigureDescriptor_ChartDescriptor(::google::protobuf::internal::ConstantInitialized);
-
-  inline FigureDescriptor_ChartDescriptor(const FigureDescriptor_ChartDescriptor& from)
-      : FigureDescriptor_ChartDescriptor(nullptr, from) {}
-  FigureDescriptor_ChartDescriptor(FigureDescriptor_ChartDescriptor&& from) noexcept
-    : FigureDescriptor_ChartDescriptor() {
-    *this = ::std::move(from);
-  }
-
-  inline FigureDescriptor_ChartDescriptor& operator=(const FigureDescriptor_ChartDescriptor& from) {
-    CopyFrom(from);
-    return *this;
-  }
-  inline FigureDescriptor_ChartDescriptor& operator=(FigureDescriptor_ChartDescriptor&& from) noexcept {
-    if (this == &from) return *this;
-    if (GetArena() == from.GetArena()
-  #ifdef PROTOBUF_FORCE_COPY_IN_MOVE
-        && GetArena() != nullptr
-  #endif  // !PROTOBUF_FORCE_COPY_IN_MOVE
-    ) {
-      InternalSwap(&from);
-    } else {
-      CopyFrom(from);
-    }
-    return *this;
-  }
-
-  inline const ::google::protobuf::UnknownFieldSet& unknown_fields() const
-      ABSL_ATTRIBUTE_LIFETIME_BOUND {
-    return _internal_metadata_.unknown_fields<::google::protobuf::UnknownFieldSet>(::google::protobuf::UnknownFieldSet::default_instance);
-  }
-  inline ::google::protobuf::UnknownFieldSet* mutable_unknown_fields()
-      ABSL_ATTRIBUTE_LIFETIME_BOUND {
-    return _internal_metadata_.mutable_unknown_fields<::google::protobuf::UnknownFieldSet>();
-  }
-
-  static const ::google::protobuf::Descriptor* descriptor() {
-    return GetDescriptor();
-  }
-  static const ::google::protobuf::Descriptor* GetDescriptor() {
-    return default_instance().GetMetadata().descriptor;
-  }
-  static const ::google::protobuf::Reflection* GetReflection() {
-    return default_instance().GetMetadata().reflection;
-  }
-  static const FigureDescriptor_ChartDescriptor& default_instance() {
-    return *internal_default_instance();
-  }
-  static inline const FigureDescriptor_ChartDescriptor* internal_default_instance() {
-    return reinterpret_cast<const FigureDescriptor_ChartDescriptor*>(
-               &_FigureDescriptor_ChartDescriptor_default_instance_);
-  }
-  static constexpr int kIndexInFileMessages =
-    45;
-
-  friend void swap(FigureDescriptor_ChartDescriptor& a, FigureDescriptor_ChartDescriptor& b) {
-    a.Swap(&b);
-  }
-  inline void Swap(FigureDescriptor_ChartDescriptor* other) {
-    if (other == this) return;
-  #ifdef PROTOBUF_FORCE_COPY_IN_SWAP
-    if (GetArena() != nullptr &&
-        GetArena() == other->GetArena()) {
-   #else  // PROTOBUF_FORCE_COPY_IN_SWAP
-    if (GetArena() == other->GetArena()) {
-  #endif  // !PROTOBUF_FORCE_COPY_IN_SWAP
-      InternalSwap(other);
-    } else {
-      ::google::protobuf::internal::GenericSwap(this, other);
-    }
-  }
-  void UnsafeArenaSwap(FigureDescriptor_ChartDescriptor* other) {
-    if (other == this) return;
-    ABSL_DCHECK(GetArena() == other->GetArena());
-    InternalSwap(other);
-  }
-
-  // implements Message ----------------------------------------------
-
-  FigureDescriptor_ChartDescriptor* New(::google::protobuf::Arena* arena = nullptr) const final {
-    return CreateMaybeMessage<FigureDescriptor_ChartDescriptor>(arena);
-  }
-  using ::google::protobuf::Message::CopyFrom;
-  void CopyFrom(const FigureDescriptor_ChartDescriptor& from);
-  using ::google::protobuf::Message::MergeFrom;
-  void MergeFrom( const FigureDescriptor_ChartDescriptor& from) {
-    FigureDescriptor_ChartDescriptor::MergeImpl(*this, from);
-  }
-  private:
-  static void MergeImpl(::google::protobuf::Message& to_msg, const ::google::protobuf::Message& from_msg);
-  public:
-  PROTOBUF_ATTRIBUTE_REINITIALIZES void Clear() final;
-  bool IsInitialized() const final;
-
-  ::size_t ByteSizeLong() const final;
-  const char* _InternalParse(const char* ptr, ::google::protobuf::internal::ParseContext* ctx) final;
-  ::uint8_t* _InternalSerialize(
-      ::uint8_t* target, ::google::protobuf::io::EpsCopyOutputStream* stream) const final;
-  int GetCachedSize() const { return _impl_._cached_size_.Get(); }
-
-  private:
-  ::google::protobuf::internal::CachedSize* AccessCachedSize() const final;
-  void SharedCtor(::google::protobuf::Arena* arena);
-  void SharedDtor();
-  void InternalSwap(FigureDescriptor_ChartDescriptor* other);
-
-  private:
-  friend class ::google::protobuf::internal::AnyMetadata;
-  static ::absl::string_view FullMessageName() {
-    return "io.deephaven.proto.backplane.script.grpc.FigureDescriptor.ChartDescriptor";
-  }
-  protected:
-  explicit FigureDescriptor_ChartDescriptor(::google::protobuf::Arena* arena);
-  FigureDescriptor_ChartDescriptor(::google::protobuf::Arena* arena, const FigureDescriptor_ChartDescriptor& from);
-  public:
-
-  static const ClassData _class_data_;
-  const ::google::protobuf::Message::ClassData*GetClassData() const final;
-
-  ::google::protobuf::Metadata GetMetadata() const final;
-
-  // nested types ----------------------------------------------------
-
-  using ChartType = FigureDescriptor_ChartDescriptor_ChartType;
-  static constexpr ChartType XY = FigureDescriptor_ChartDescriptor_ChartType_XY;
-  static constexpr ChartType PIE = FigureDescriptor_ChartDescriptor_ChartType_PIE;
-  [[deprecated]] static constexpr ChartType OHLC = FigureDescriptor_ChartDescriptor_ChartType_OHLC;
-  static constexpr ChartType CATEGORY = FigureDescriptor_ChartDescriptor_ChartType_CATEGORY;
-  static constexpr ChartType XYZ = FigureDescriptor_ChartDescriptor_ChartType_XYZ;
-  static constexpr ChartType CATEGORY_3D = FigureDescriptor_ChartDescriptor_ChartType_CATEGORY_3D;
-  static constexpr ChartType TREEMAP = FigureDescriptor_ChartDescriptor_ChartType_TREEMAP;
-  static inline bool ChartType_IsValid(int value) {
-    return FigureDescriptor_ChartDescriptor_ChartType_IsValid(value);
-  }
-  static constexpr ChartType ChartType_MIN = FigureDescriptor_ChartDescriptor_ChartType_ChartType_MIN;
-  static constexpr ChartType ChartType_MAX = FigureDescriptor_ChartDescriptor_ChartType_ChartType_MAX;
-  static constexpr int ChartType_ARRAYSIZE = FigureDescriptor_ChartDescriptor_ChartType_ChartType_ARRAYSIZE;
-  static inline const ::google::protobuf::EnumDescriptor* ChartType_descriptor() {
-    return FigureDescriptor_ChartDescriptor_ChartType_descriptor();
-  }
-  template <typename T>
-  static inline const std::string& ChartType_Name(T value) {
-    return FigureDescriptor_ChartDescriptor_ChartType_Name(value);
-  }
-  static inline bool ChartType_Parse(absl::string_view name, ChartType* value) {
-    return FigureDescriptor_ChartDescriptor_ChartType_Parse(name, value);
-  }
-
-  // accessors -------------------------------------------------------
-
-  enum : int {
-    kSeriesFieldNumber = 3,
-    kMultiSeriesFieldNumber = 4,
-    kAxesFieldNumber = 5,
-    kTitleFieldNumber = 7,
-    kTitleFontFieldNumber = 8,
-    kTitleColorFieldNumber = 9,
-    kLegendFontFieldNumber = 11,
-    kLegendColorFieldNumber = 12,
-    kColspanFieldNumber = 1,
-    kRowspanFieldNumber = 2,
-    kChartTypeFieldNumber = 6,
-    kShowLegendFieldNumber = 10,
-    kIs3DFieldNumber = 13,
-    kColumnFieldNumber = 14,
-    kRowFieldNumber = 15,
-  };
-  // repeated .io.deephaven.proto.backplane.script.grpc.FigureDescriptor.SeriesDescriptor series = 3;
-  int series_size() const;
-  private:
-  int _internal_series_size() const;
-
-  public:
-  void clear_series() ;
-  ::io::deephaven::proto::backplane::script::grpc::FigureDescriptor_SeriesDescriptor* mutable_series(int index);
-  ::google::protobuf::RepeatedPtrField< ::io::deephaven::proto::backplane::script::grpc::FigureDescriptor_SeriesDescriptor >*
-      mutable_series();
-  private:
-  const ::google::protobuf::RepeatedPtrField<::io::deephaven::proto::backplane::script::grpc::FigureDescriptor_SeriesDescriptor>& _internal_series() const;
-  ::google::protobuf::RepeatedPtrField<::io::deephaven::proto::backplane::script::grpc::FigureDescriptor_SeriesDescriptor>* _internal_mutable_series();
-  public:
-  const ::io::deephaven::proto::backplane::script::grpc::FigureDescriptor_SeriesDescriptor& series(int index) const;
-  ::io::deephaven::proto::backplane::script::grpc::FigureDescriptor_SeriesDescriptor* add_series();
-  const ::google::protobuf::RepeatedPtrField< ::io::deephaven::proto::backplane::script::grpc::FigureDescriptor_SeriesDescriptor >&
-      series() const;
-  // repeated .io.deephaven.proto.backplane.script.grpc.FigureDescriptor.MultiSeriesDescriptor multi_series = 4;
-  int multi_series_size() const;
-  private:
-  int _internal_multi_series_size() const;
-
-  public:
-  void clear_multi_series() ;
-  ::io::deephaven::proto::backplane::script::grpc::FigureDescriptor_MultiSeriesDescriptor* mutable_multi_series(int index);
-  ::google::protobuf::RepeatedPtrField< ::io::deephaven::proto::backplane::script::grpc::FigureDescriptor_MultiSeriesDescriptor >*
-      mutable_multi_series();
-  private:
-  const ::google::protobuf::RepeatedPtrField<::io::deephaven::proto::backplane::script::grpc::FigureDescriptor_MultiSeriesDescriptor>& _internal_multi_series() const;
-  ::google::protobuf::RepeatedPtrField<::io::deephaven::proto::backplane::script::grpc::FigureDescriptor_MultiSeriesDescriptor>* _internal_mutable_multi_series();
-  public:
-  const ::io::deephaven::proto::backplane::script::grpc::FigureDescriptor_MultiSeriesDescriptor& multi_series(int index) const;
-  ::io::deephaven::proto::backplane::script::grpc::FigureDescriptor_MultiSeriesDescriptor* add_multi_series();
-  const ::google::protobuf::RepeatedPtrField< ::io::deephaven::proto::backplane::script::grpc::FigureDescriptor_MultiSeriesDescriptor >&
-      multi_series() const;
-  // repeated .io.deephaven.proto.backplane.script.grpc.FigureDescriptor.AxisDescriptor axes = 5;
-  int axes_size() const;
-  private:
-  int _internal_axes_size() const;
-
-  public:
-  void clear_axes() ;
-  ::io::deephaven::proto::backplane::script::grpc::FigureDescriptor_AxisDescriptor* mutable_axes(int index);
-  ::google::protobuf::RepeatedPtrField< ::io::deephaven::proto::backplane::script::grpc::FigureDescriptor_AxisDescriptor >*
-      mutable_axes();
-  private:
-  const ::google::protobuf::RepeatedPtrField<::io::deephaven::proto::backplane::script::grpc::FigureDescriptor_AxisDescriptor>& _internal_axes() const;
-  ::google::protobuf::RepeatedPtrField<::io::deephaven::proto::backplane::script::grpc::FigureDescriptor_AxisDescriptor>* _internal_mutable_axes();
-  public:
-  const ::io::deephaven::proto::backplane::script::grpc::FigureDescriptor_AxisDescriptor& axes(int index) const;
-  ::io::deephaven::proto::backplane::script::grpc::FigureDescriptor_AxisDescriptor* add_axes();
-  const ::google::protobuf::RepeatedPtrField< ::io::deephaven::proto::backplane::script::grpc::FigureDescriptor_AxisDescriptor >&
-      axes() const;
-  // optional string title = 7;
-  bool has_title() const;
-  void clear_title() ;
-  const std::string& title() const;
-  template <typename Arg_ = const std::string&, typename... Args_>
-  void set_title(Arg_&& arg, Args_... args);
-  std::string* mutable_title();
-  PROTOBUF_NODISCARD std::string* release_title();
-  void set_allocated_title(std::string* value);
-
-  private:
-  const std::string& _internal_title() const;
-  inline PROTOBUF_ALWAYS_INLINE void _internal_set_title(
-      const std::string& value);
-  std::string* _internal_mutable_title();
-
-  public:
-  // string title_font = 8;
-  void clear_title_font() ;
-  const std::string& title_font() const;
-  template <typename Arg_ = const std::string&, typename... Args_>
-  void set_title_font(Arg_&& arg, Args_... args);
-  std::string* mutable_title_font();
-  PROTOBUF_NODISCARD std::string* release_title_font();
-  void set_allocated_title_font(std::string* value);
-
-  private:
-  const std::string& _internal_title_font() const;
-  inline PROTOBUF_ALWAYS_INLINE void _internal_set_title_font(
-      const std::string& value);
-  std::string* _internal_mutable_title_font();
-
-  public:
-  // string title_color = 9;
-  void clear_title_color() ;
-  const std::string& title_color() const;
-  template <typename Arg_ = const std::string&, typename... Args_>
-  void set_title_color(Arg_&& arg, Args_... args);
-  std::string* mutable_title_color();
-  PROTOBUF_NODISCARD std::string* release_title_color();
-  void set_allocated_title_color(std::string* value);
-
-  private:
-  const std::string& _internal_title_color() const;
-  inline PROTOBUF_ALWAYS_INLINE void _internal_set_title_color(
-      const std::string& value);
-  std::string* _internal_mutable_title_color();
-
-  public:
-  // string legend_font = 11;
-  void clear_legend_font() ;
-  const std::string& legend_font() const;
-  template <typename Arg_ = const std::string&, typename... Args_>
-  void set_legend_font(Arg_&& arg, Args_... args);
-  std::string* mutable_legend_font();
-  PROTOBUF_NODISCARD std::string* release_legend_font();
-  void set_allocated_legend_font(std::string* value);
-
-  private:
-  const std::string& _internal_legend_font() const;
-  inline PROTOBUF_ALWAYS_INLINE void _internal_set_legend_font(
-      const std::string& value);
-  std::string* _internal_mutable_legend_font();
-
-  public:
-  // string legend_color = 12;
-  void clear_legend_color() ;
-  const std::string& legend_color() const;
-  template <typename Arg_ = const std::string&, typename... Args_>
-  void set_legend_color(Arg_&& arg, Args_... args);
-  std::string* mutable_legend_color();
-  PROTOBUF_NODISCARD std::string* release_legend_color();
-  void set_allocated_legend_color(std::string* value);
-
-  private:
-  const std::string& _internal_legend_color() const;
-  inline PROTOBUF_ALWAYS_INLINE void _internal_set_legend_color(
-      const std::string& value);
-  std::string* _internal_mutable_legend_color();
-
-  public:
-  // int32 colspan = 1;
-  void clear_colspan() ;
-  ::int32_t colspan() const;
-  void set_colspan(::int32_t value);
-
-  private:
-  ::int32_t _internal_colspan() const;
-  void _internal_set_colspan(::int32_t value);
-
-  public:
-  // int32 rowspan = 2;
-  void clear_rowspan() ;
-  ::int32_t rowspan() const;
-  void set_rowspan(::int32_t value);
-
-  private:
-  ::int32_t _internal_rowspan() const;
-  void _internal_set_rowspan(::int32_t value);
-
-  public:
-  // .io.deephaven.proto.backplane.script.grpc.FigureDescriptor.ChartDescriptor.ChartType chart_type = 6;
-  void clear_chart_type() ;
-  ::io::deephaven::proto::backplane::script::grpc::FigureDescriptor_ChartDescriptor_ChartType chart_type() const;
-  void set_chart_type(::io::deephaven::proto::backplane::script::grpc::FigureDescriptor_ChartDescriptor_ChartType value);
-
-  private:
-  ::io::deephaven::proto::backplane::script::grpc::FigureDescriptor_ChartDescriptor_ChartType _internal_chart_type() const;
-  void _internal_set_chart_type(::io::deephaven::proto::backplane::script::grpc::FigureDescriptor_ChartDescriptor_ChartType value);
-
-  public:
-  // bool show_legend = 10;
-  void clear_show_legend() ;
-  bool show_legend() const;
-  void set_show_legend(bool value);
-
-  private:
-  bool _internal_show_legend() const;
-  void _internal_set_show_legend(bool value);
-
-  public:
-  // bool is3d = 13;
-  void clear_is3d() ;
-  bool is3d() const;
-  void set_is3d(bool value);
-
-  private:
-  bool _internal_is3d() const;
-  void _internal_set_is3d(bool value);
-
-  public:
-  // int32 column = 14;
-  void clear_column() ;
-  ::int32_t column() const;
-  void set_column(::int32_t value);
-
-  private:
-  ::int32_t _internal_column() const;
-  void _internal_set_column(::int32_t value);
-
-  public:
-  // int32 row = 15;
-  void clear_row() ;
-  ::int32_t row() const;
-  void set_row(::int32_t value);
-
-  private:
-  ::int32_t _internal_row() const;
-  void _internal_set_row(::int32_t value);
-
-  public:
-  // @@protoc_insertion_point(class_scope:io.deephaven.proto.backplane.script.grpc.FigureDescriptor.ChartDescriptor)
- private:
-  class _Internal;
-
-  friend class ::google::protobuf::internal::TcParser;
-  static const ::google::protobuf::internal::TcParseTable<
-      4, 15, 3,
-      139, 2>
-      _table_;
-  friend class ::google::protobuf::MessageLite;
-  friend class ::google::protobuf::Arena;
-  template <typename T>
-  friend class ::google::protobuf::Arena::InternalHelper;
-  using InternalArenaConstructable_ = void;
-  using DestructorSkippable_ = void;
-  struct Impl_ {
-
-        inline explicit constexpr Impl_(
-            ::google::protobuf::internal::ConstantInitialized) noexcept;
-        inline explicit Impl_(::google::protobuf::internal::InternalVisibility visibility,
-                              ::google::protobuf::Arena* arena);
-        inline explicit Impl_(::google::protobuf::internal::InternalVisibility visibility,
-                              ::google::protobuf::Arena* arena, const Impl_& from);
-    ::google::protobuf::internal::HasBits<1> _has_bits_;
-    mutable ::google::protobuf::internal::CachedSize _cached_size_;
-    ::google::protobuf::RepeatedPtrField< ::io::deephaven::proto::backplane::script::grpc::FigureDescriptor_SeriesDescriptor > series_;
-    ::google::protobuf::RepeatedPtrField< ::io::deephaven::proto::backplane::script::grpc::FigureDescriptor_MultiSeriesDescriptor > multi_series_;
-    ::google::protobuf::RepeatedPtrField< ::io::deephaven::proto::backplane::script::grpc::FigureDescriptor_AxisDescriptor > axes_;
-    ::google::protobuf::internal::ArenaStringPtr title_;
-    ::google::protobuf::internal::ArenaStringPtr title_font_;
-    ::google::protobuf::internal::ArenaStringPtr title_color_;
-    ::google::protobuf::internal::ArenaStringPtr legend_font_;
-    ::google::protobuf::internal::ArenaStringPtr legend_color_;
-    ::int32_t colspan_;
-    ::int32_t rowspan_;
-    int chart_type_;
-    bool show_legend_;
-    bool is3d_;
-    ::int32_t column_;
-    ::int32_t row_;
-    PROTOBUF_TSAN_DECLARE_MEMBER
-  };
-  union { Impl_ _impl_; };
-  friend struct ::TableStruct_deephaven_2fproto_2fconsole_2eproto;
-};// -------------------------------------------------------------------
-
-class ExecuteCommandResponse final :
-    public ::google::protobuf::Message /* @@protoc_insertion_point(class_definition:io.deephaven.proto.backplane.script.grpc.ExecuteCommandResponse) */ {
- public:
-  inline ExecuteCommandResponse() : ExecuteCommandResponse(nullptr) {}
-  ~ExecuteCommandResponse() override;
-  template<typename = void>
-  explicit PROTOBUF_CONSTEXPR ExecuteCommandResponse(::google::protobuf::internal::ConstantInitialized);
-
-  inline ExecuteCommandResponse(const ExecuteCommandResponse& from)
-      : ExecuteCommandResponse(nullptr, from) {}
-  ExecuteCommandResponse(ExecuteCommandResponse&& from) noexcept
-    : ExecuteCommandResponse() {
-    *this = ::std::move(from);
-  }
-
-  inline ExecuteCommandResponse& operator=(const ExecuteCommandResponse& from) {
-    CopyFrom(from);
-    return *this;
-  }
-  inline ExecuteCommandResponse& operator=(ExecuteCommandResponse&& from) noexcept {
-    if (this == &from) return *this;
-    if (GetArena() == from.GetArena()
-  #ifdef PROTOBUF_FORCE_COPY_IN_MOVE
-        && GetArena() != nullptr
-  #endif  // !PROTOBUF_FORCE_COPY_IN_MOVE
-    ) {
-      InternalSwap(&from);
-    } else {
-      CopyFrom(from);
-    }
-    return *this;
-  }
-
-  inline const ::google::protobuf::UnknownFieldSet& unknown_fields() const
-      ABSL_ATTRIBUTE_LIFETIME_BOUND {
-    return _internal_metadata_.unknown_fields<::google::protobuf::UnknownFieldSet>(::google::protobuf::UnknownFieldSet::default_instance);
-  }
-  inline ::google::protobuf::UnknownFieldSet* mutable_unknown_fields()
-      ABSL_ATTRIBUTE_LIFETIME_BOUND {
-    return _internal_metadata_.mutable_unknown_fields<::google::protobuf::UnknownFieldSet>();
-  }
-
-  static const ::google::protobuf::Descriptor* descriptor() {
-    return GetDescriptor();
-  }
-  static const ::google::protobuf::Descriptor* GetDescriptor() {
-    return default_instance().GetMetadata().descriptor;
-  }
-  static const ::google::protobuf::Reflection* GetReflection() {
-    return default_instance().GetMetadata().reflection;
-  }
-  static const ExecuteCommandResponse& default_instance() {
-    return *internal_default_instance();
-  }
-  static inline const ExecuteCommandResponse* internal_default_instance() {
-    return reinterpret_cast<const ExecuteCommandResponse*>(
-               &_ExecuteCommandResponse_default_instance_);
-  }
-  static constexpr int kIndexInFileMessages =
-    9;
-
-  friend void swap(ExecuteCommandResponse& a, ExecuteCommandResponse& b) {
-    a.Swap(&b);
-  }
-  inline void Swap(ExecuteCommandResponse* other) {
-    if (other == this) return;
-  #ifdef PROTOBUF_FORCE_COPY_IN_SWAP
-    if (GetArena() != nullptr &&
-        GetArena() == other->GetArena()) {
-   #else  // PROTOBUF_FORCE_COPY_IN_SWAP
-    if (GetArena() == other->GetArena()) {
-  #endif  // !PROTOBUF_FORCE_COPY_IN_SWAP
-      InternalSwap(other);
-    } else {
-      ::google::protobuf::internal::GenericSwap(this, other);
-    }
-  }
-  void UnsafeArenaSwap(ExecuteCommandResponse* other) {
-    if (other == this) return;
-    ABSL_DCHECK(GetArena() == other->GetArena());
-    InternalSwap(other);
-  }
-
-  // implements Message ----------------------------------------------
-
-  ExecuteCommandResponse* New(::google::protobuf::Arena* arena = nullptr) const final {
-    return CreateMaybeMessage<ExecuteCommandResponse>(arena);
-  }
-  using ::google::protobuf::Message::CopyFrom;
-  void CopyFrom(const ExecuteCommandResponse& from);
-  using ::google::protobuf::Message::MergeFrom;
-  void MergeFrom( const ExecuteCommandResponse& from) {
-    ExecuteCommandResponse::MergeImpl(*this, from);
-  }
-  private:
-  static void MergeImpl(::google::protobuf::Message& to_msg, const ::google::protobuf::Message& from_msg);
-  public:
-  PROTOBUF_ATTRIBUTE_REINITIALIZES void Clear() final;
-  bool IsInitialized() const final;
-
-  ::size_t ByteSizeLong() const final;
-  const char* _InternalParse(const char* ptr, ::google::protobuf::internal::ParseContext* ctx) final;
-  ::uint8_t* _InternalSerialize(
-      ::uint8_t* target, ::google::protobuf::io::EpsCopyOutputStream* stream) const final;
-  int GetCachedSize() const { return _impl_._cached_size_.Get(); }
-
-  private:
-  ::google::protobuf::internal::CachedSize* AccessCachedSize() const final;
-  void SharedCtor(::google::protobuf::Arena* arena);
-  void SharedDtor();
-  void InternalSwap(ExecuteCommandResponse* other);
-
-  private:
-  friend class ::google::protobuf::internal::AnyMetadata;
-  static ::absl::string_view FullMessageName() {
-    return "io.deephaven.proto.backplane.script.grpc.ExecuteCommandResponse";
-  }
-  protected:
-  explicit ExecuteCommandResponse(::google::protobuf::Arena* arena);
-  ExecuteCommandResponse(::google::protobuf::Arena* arena, const ExecuteCommandResponse& from);
-  public:
-
-  static const ClassData _class_data_;
-  const ::google::protobuf::Message::ClassData*GetClassData() const final;
-
-  ::google::protobuf::Metadata GetMetadata() const final;
-
-  // nested types ----------------------------------------------------
-
-  // accessors -------------------------------------------------------
-
-  enum : int {
-    kErrorMessageFieldNumber = 1,
-    kChangesFieldNumber = 2,
-  };
-  // string error_message = 1;
-  void clear_error_message() ;
-  const std::string& error_message() const;
-  template <typename Arg_ = const std::string&, typename... Args_>
-  void set_error_message(Arg_&& arg, Args_... args);
-  std::string* mutable_error_message();
-  PROTOBUF_NODISCARD std::string* release_error_message();
-  void set_allocated_error_message(std::string* value);
-
-  private:
-  const std::string& _internal_error_message() const;
-  inline PROTOBUF_ALWAYS_INLINE void _internal_set_error_message(
-      const std::string& value);
-  std::string* _internal_mutable_error_message();
-
-  public:
-  // .io.deephaven.proto.backplane.grpc.FieldsChangeUpdate changes = 2;
-  bool has_changes() const;
-  void clear_changes() ;
-  const ::io::deephaven::proto::backplane::grpc::FieldsChangeUpdate& changes() const;
-  PROTOBUF_NODISCARD ::io::deephaven::proto::backplane::grpc::FieldsChangeUpdate* release_changes();
-  ::io::deephaven::proto::backplane::grpc::FieldsChangeUpdate* mutable_changes();
-  void set_allocated_changes(::io::deephaven::proto::backplane::grpc::FieldsChangeUpdate* value);
-  void unsafe_arena_set_allocated_changes(::io::deephaven::proto::backplane::grpc::FieldsChangeUpdate* value);
-  ::io::deephaven::proto::backplane::grpc::FieldsChangeUpdate* unsafe_arena_release_changes();
-
-  private:
-  const ::io::deephaven::proto::backplane::grpc::FieldsChangeUpdate& _internal_changes() const;
-  ::io::deephaven::proto::backplane::grpc::FieldsChangeUpdate* _internal_mutable_changes();
-
-  public:
-  // @@protoc_insertion_point(class_scope:io.deephaven.proto.backplane.script.grpc.ExecuteCommandResponse)
- private:
-  class _Internal;
-
-  friend class ::google::protobuf::internal::TcParser;
-  static const ::google::protobuf::internal::TcParseTable<
-      1, 2, 1,
-      85, 2>
-      _table_;
-  friend class ::google::protobuf::MessageLite;
-  friend class ::google::protobuf::Arena;
-  template <typename T>
-  friend class ::google::protobuf::Arena::InternalHelper;
-  using InternalArenaConstructable_ = void;
-  using DestructorSkippable_ = void;
-  struct Impl_ {
-
-        inline explicit constexpr Impl_(
-            ::google::protobuf::internal::ConstantInitialized) noexcept;
-        inline explicit Impl_(::google::protobuf::internal::InternalVisibility visibility,
-                              ::google::protobuf::Arena* arena);
-        inline explicit Impl_(::google::protobuf::internal::InternalVisibility visibility,
-                              ::google::protobuf::Arena* arena, const Impl_& from);
-    ::google::protobuf::internal::HasBits<1> _has_bits_;
-    mutable ::google::protobuf::internal::CachedSize _cached_size_;
-    ::google::protobuf::internal::ArenaStringPtr error_message_;
-    ::io::deephaven::proto::backplane::grpc::FieldsChangeUpdate* changes_;
-    PROTOBUF_TSAN_DECLARE_MEMBER
-  };
-  union { Impl_ _impl_; };
-  friend struct ::TableStruct_deephaven_2fproto_2fconsole_2eproto;
-};// -------------------------------------------------------------------
-
-class GetSignatureHelpRequest final :
-    public ::google::protobuf::Message /* @@protoc_insertion_point(class_definition:io.deephaven.proto.backplane.script.grpc.GetSignatureHelpRequest) */ {
- public:
-  inline GetSignatureHelpRequest() : GetSignatureHelpRequest(nullptr) {}
-  ~GetSignatureHelpRequest() override;
-  template<typename = void>
-  explicit PROTOBUF_CONSTEXPR GetSignatureHelpRequest(::google::protobuf::internal::ConstantInitialized);
-
-  inline GetSignatureHelpRequest(const GetSignatureHelpRequest& from)
-      : GetSignatureHelpRequest(nullptr, from) {}
-  GetSignatureHelpRequest(GetSignatureHelpRequest&& from) noexcept
-    : GetSignatureHelpRequest() {
-    *this = ::std::move(from);
-  }
-
-  inline GetSignatureHelpRequest& operator=(const GetSignatureHelpRequest& from) {
-    CopyFrom(from);
-    return *this;
-  }
-  inline GetSignatureHelpRequest& operator=(GetSignatureHelpRequest&& from) noexcept {
-    if (this == &from) return *this;
-    if (GetArena() == from.GetArena()
-  #ifdef PROTOBUF_FORCE_COPY_IN_MOVE
-        && GetArena() != nullptr
-  #endif  // !PROTOBUF_FORCE_COPY_IN_MOVE
-    ) {
-      InternalSwap(&from);
-    } else {
-      CopyFrom(from);
-    }
-    return *this;
-  }
-
-  inline const ::google::protobuf::UnknownFieldSet& unknown_fields() const
-      ABSL_ATTRIBUTE_LIFETIME_BOUND {
-    return _internal_metadata_.unknown_fields<::google::protobuf::UnknownFieldSet>(::google::protobuf::UnknownFieldSet::default_instance);
-  }
-  inline ::google::protobuf::UnknownFieldSet* mutable_unknown_fields()
-      ABSL_ATTRIBUTE_LIFETIME_BOUND {
-    return _internal_metadata_.mutable_unknown_fields<::google::protobuf::UnknownFieldSet>();
-  }
-
-  static const ::google::protobuf::Descriptor* descriptor() {
-    return GetDescriptor();
-  }
-  static const ::google::protobuf::Descriptor* GetDescriptor() {
-    return default_instance().GetMetadata().descriptor;
-  }
-  static const ::google::protobuf::Reflection* GetReflection() {
-    return default_instance().GetMetadata().reflection;
-  }
-  static const GetSignatureHelpRequest& default_instance() {
-    return *internal_default_instance();
-  }
-  static inline const GetSignatureHelpRequest* internal_default_instance() {
-    return reinterpret_cast<const GetSignatureHelpRequest*>(
-               &_GetSignatureHelpRequest_default_instance_);
-  }
-  static constexpr int kIndexInFileMessages =
-    33;
-
-  friend void swap(GetSignatureHelpRequest& a, GetSignatureHelpRequest& b) {
-    a.Swap(&b);
-  }
-  inline void Swap(GetSignatureHelpRequest* other) {
-    if (other == this) return;
-  #ifdef PROTOBUF_FORCE_COPY_IN_SWAP
-    if (GetArena() != nullptr &&
-        GetArena() == other->GetArena()) {
-   #else  // PROTOBUF_FORCE_COPY_IN_SWAP
-    if (GetArena() == other->GetArena()) {
-  #endif  // !PROTOBUF_FORCE_COPY_IN_SWAP
-      InternalSwap(other);
-    } else {
-      ::google::protobuf::internal::GenericSwap(this, other);
-    }
-  }
-  void UnsafeArenaSwap(GetSignatureHelpRequest* other) {
-    if (other == this) return;
-    ABSL_DCHECK(GetArena() == other->GetArena());
-    InternalSwap(other);
-  }
-
-  // implements Message ----------------------------------------------
-
-  GetSignatureHelpRequest* New(::google::protobuf::Arena* arena = nullptr) const final {
-    return CreateMaybeMessage<GetSignatureHelpRequest>(arena);
-  }
-  using ::google::protobuf::Message::CopyFrom;
-  void CopyFrom(const GetSignatureHelpRequest& from);
-  using ::google::protobuf::Message::MergeFrom;
-  void MergeFrom( const GetSignatureHelpRequest& from) {
-    GetSignatureHelpRequest::MergeImpl(*this, from);
-  }
-  private:
-  static void MergeImpl(::google::protobuf::Message& to_msg, const ::google::protobuf::Message& from_msg);
-  public:
-  PROTOBUF_ATTRIBUTE_REINITIALIZES void Clear() final;
-  bool IsInitialized() const final;
-
-  ::size_t ByteSizeLong() const final;
-  const char* _InternalParse(const char* ptr, ::google::protobuf::internal::ParseContext* ctx) final;
-  ::uint8_t* _InternalSerialize(
-      ::uint8_t* target, ::google::protobuf::io::EpsCopyOutputStream* stream) const final;
-  int GetCachedSize() const { return _impl_._cached_size_.Get(); }
-
-  private:
-  ::google::protobuf::internal::CachedSize* AccessCachedSize() const final;
-  void SharedCtor(::google::protobuf::Arena* arena);
-  void SharedDtor();
-  void InternalSwap(GetSignatureHelpRequest* other);
-
-  private:
-  friend class ::google::protobuf::internal::AnyMetadata;
-  static ::absl::string_view FullMessageName() {
-    return "io.deephaven.proto.backplane.script.grpc.GetSignatureHelpRequest";
-  }
-  protected:
-  explicit GetSignatureHelpRequest(::google::protobuf::Arena* arena);
-  GetSignatureHelpRequest(::google::protobuf::Arena* arena, const GetSignatureHelpRequest& from);
-  public:
-
-  static const ClassData _class_data_;
-  const ::google::protobuf::Message::ClassData*GetClassData() const final;
-
-  ::google::protobuf::Metadata GetMetadata() const final;
-
-  // nested types ----------------------------------------------------
-
-  // accessors -------------------------------------------------------
-
-  enum : int {
-    kContextFieldNumber = 1,
-    kTextDocumentFieldNumber = 2,
-    kPositionFieldNumber = 3,
-  };
-  // .io.deephaven.proto.backplane.script.grpc.SignatureHelpContext context = 1;
-  bool has_context() const;
-  void clear_context() ;
-  const ::io::deephaven::proto::backplane::script::grpc::SignatureHelpContext& context() const;
-  PROTOBUF_NODISCARD ::io::deephaven::proto::backplane::script::grpc::SignatureHelpContext* release_context();
-  ::io::deephaven::proto::backplane::script::grpc::SignatureHelpContext* mutable_context();
-  void set_allocated_context(::io::deephaven::proto::backplane::script::grpc::SignatureHelpContext* value);
-  void unsafe_arena_set_allocated_context(::io::deephaven::proto::backplane::script::grpc::SignatureHelpContext* value);
-  ::io::deephaven::proto::backplane::script::grpc::SignatureHelpContext* unsafe_arena_release_context();
-
-  private:
-  const ::io::deephaven::proto::backplane::script::grpc::SignatureHelpContext& _internal_context() const;
-  ::io::deephaven::proto::backplane::script::grpc::SignatureHelpContext* _internal_mutable_context();
-
-  public:
-  // .io.deephaven.proto.backplane.script.grpc.VersionedTextDocumentIdentifier text_document = 2;
-  bool has_text_document() const;
-  void clear_text_document() ;
-  const ::io::deephaven::proto::backplane::script::grpc::VersionedTextDocumentIdentifier& text_document() const;
-  PROTOBUF_NODISCARD ::io::deephaven::proto::backplane::script::grpc::VersionedTextDocumentIdentifier* release_text_document();
-  ::io::deephaven::proto::backplane::script::grpc::VersionedTextDocumentIdentifier* mutable_text_document();
-  void set_allocated_text_document(::io::deephaven::proto::backplane::script::grpc::VersionedTextDocumentIdentifier* value);
-  void unsafe_arena_set_allocated_text_document(::io::deephaven::proto::backplane::script::grpc::VersionedTextDocumentIdentifier* value);
-  ::io::deephaven::proto::backplane::script::grpc::VersionedTextDocumentIdentifier* unsafe_arena_release_text_document();
-
-  private:
-  const ::io::deephaven::proto::backplane::script::grpc::VersionedTextDocumentIdentifier& _internal_text_document() const;
-  ::io::deephaven::proto::backplane::script::grpc::VersionedTextDocumentIdentifier* _internal_mutable_text_document();
-
-  public:
-  // .io.deephaven.proto.backplane.script.grpc.Position position = 3;
-  bool has_position() const;
-  void clear_position() ;
-  const ::io::deephaven::proto::backplane::script::grpc::Position& position() const;
-  PROTOBUF_NODISCARD ::io::deephaven::proto::backplane::script::grpc::Position* release_position();
-  ::io::deephaven::proto::backplane::script::grpc::Position* mutable_position();
-  void set_allocated_position(::io::deephaven::proto::backplane::script::grpc::Position* value);
-  void unsafe_arena_set_allocated_position(::io::deephaven::proto::backplane::script::grpc::Position* value);
-  ::io::deephaven::proto::backplane::script::grpc::Position* unsafe_arena_release_position();
-
-  private:
-  const ::io::deephaven::proto::backplane::script::grpc::Position& _internal_position() const;
-  ::io::deephaven::proto::backplane::script::grpc::Position* _internal_mutable_position();
-
-  public:
-  // @@protoc_insertion_point(class_scope:io.deephaven.proto.backplane.script.grpc.GetSignatureHelpRequest)
- private:
-  class _Internal;
-
-  friend class ::google::protobuf::internal::TcParser;
-  static const ::google::protobuf::internal::TcParseTable<
-      2, 3, 3,
-      0, 2>
-      _table_;
-  friend class ::google::protobuf::MessageLite;
-  friend class ::google::protobuf::Arena;
-  template <typename T>
-  friend class ::google::protobuf::Arena::InternalHelper;
-  using InternalArenaConstructable_ = void;
-  using DestructorSkippable_ = void;
-  struct Impl_ {
-
-        inline explicit constexpr Impl_(
-            ::google::protobuf::internal::ConstantInitialized) noexcept;
-        inline explicit Impl_(::google::protobuf::internal::InternalVisibility visibility,
-                              ::google::protobuf::Arena* arena);
-        inline explicit Impl_(::google::protobuf::internal::InternalVisibility visibility,
-                              ::google::protobuf::Arena* arena, const Impl_& from);
-    ::google::protobuf::internal::HasBits<1> _has_bits_;
-    mutable ::google::protobuf::internal::CachedSize _cached_size_;
-    ::io::deephaven::proto::backplane::script::grpc::SignatureHelpContext* context_;
-    ::io::deephaven::proto::backplane::script::grpc::VersionedTextDocumentIdentifier* text_document_;
-    ::io::deephaven::proto::backplane::script::grpc::Position* position_;
-    PROTOBUF_TSAN_DECLARE_MEMBER
-  };
-  union { Impl_ _impl_; };
-  friend struct ::TableStruct_deephaven_2fproto_2fconsole_2eproto;
-};// -------------------------------------------------------------------
-
-class FigureDescriptor final :
-    public ::google::protobuf::Message /* @@protoc_insertion_point(class_definition:io.deephaven.proto.backplane.script.grpc.FigureDescriptor) */ {
- public:
-  inline FigureDescriptor() : FigureDescriptor(nullptr) {}
-  ~FigureDescriptor() override;
-  template<typename = void>
-  explicit PROTOBUF_CONSTEXPR FigureDescriptor(::google::protobuf::internal::ConstantInitialized);
-
-  inline FigureDescriptor(const FigureDescriptor& from)
-      : FigureDescriptor(nullptr, from) {}
-  FigureDescriptor(FigureDescriptor&& from) noexcept
-    : FigureDescriptor() {
-    *this = ::std::move(from);
-  }
-
-  inline FigureDescriptor& operator=(const FigureDescriptor& from) {
-    CopyFrom(from);
-    return *this;
-  }
-  inline FigureDescriptor& operator=(FigureDescriptor&& from) noexcept {
-    if (this == &from) return *this;
-    if (GetArena() == from.GetArena()
-  #ifdef PROTOBUF_FORCE_COPY_IN_MOVE
-        && GetArena() != nullptr
-  #endif  // !PROTOBUF_FORCE_COPY_IN_MOVE
-    ) {
-      InternalSwap(&from);
-    } else {
-      CopyFrom(from);
-    }
-    return *this;
-  }
-
-  inline const ::google::protobuf::UnknownFieldSet& unknown_fields() const
-      ABSL_ATTRIBUTE_LIFETIME_BOUND {
-    return _internal_metadata_.unknown_fields<::google::protobuf::UnknownFieldSet>(::google::protobuf::UnknownFieldSet::default_instance);
-  }
-  inline ::google::protobuf::UnknownFieldSet* mutable_unknown_fields()
-      ABSL_ATTRIBUTE_LIFETIME_BOUND {
-    return _internal_metadata_.mutable_unknown_fields<::google::protobuf::UnknownFieldSet>();
-  }
-
-  static const ::google::protobuf::Descriptor* descriptor() {
-    return GetDescriptor();
-  }
-  static const ::google::protobuf::Descriptor* GetDescriptor() {
-    return default_instance().GetMetadata().descriptor;
-  }
-  static const ::google::protobuf::Reflection* GetReflection() {
-    return default_instance().GetMetadata().reflection;
-  }
-  static const FigureDescriptor& default_instance() {
-    return *internal_default_instance();
-  }
-  static inline const FigureDescriptor* internal_default_instance() {
-    return reinterpret_cast<const FigureDescriptor*>(
-               &_FigureDescriptor_default_instance_);
-  }
-  static constexpr int kIndexInFileMessages =
-    59;
-
-  friend void swap(FigureDescriptor& a, FigureDescriptor& b) {
-    a.Swap(&b);
-  }
-  inline void Swap(FigureDescriptor* other) {
-    if (other == this) return;
-  #ifdef PROTOBUF_FORCE_COPY_IN_SWAP
-    if (GetArena() != nullptr &&
-        GetArena() == other->GetArena()) {
-   #else  // PROTOBUF_FORCE_COPY_IN_SWAP
-    if (GetArena() == other->GetArena()) {
-  #endif  // !PROTOBUF_FORCE_COPY_IN_SWAP
-      InternalSwap(other);
-    } else {
-      ::google::protobuf::internal::GenericSwap(this, other);
-    }
-  }
-  void UnsafeArenaSwap(FigureDescriptor* other) {
-    if (other == this) return;
-    ABSL_DCHECK(GetArena() == other->GetArena());
-    InternalSwap(other);
-  }
-
-  // implements Message ----------------------------------------------
-
-  FigureDescriptor* New(::google::protobuf::Arena* arena = nullptr) const final {
-    return CreateMaybeMessage<FigureDescriptor>(arena);
-  }
-  using ::google::protobuf::Message::CopyFrom;
-  void CopyFrom(const FigureDescriptor& from);
-  using ::google::protobuf::Message::MergeFrom;
-  void MergeFrom( const FigureDescriptor& from) {
-    FigureDescriptor::MergeImpl(*this, from);
-  }
-  private:
-  static void MergeImpl(::google::protobuf::Message& to_msg, const ::google::protobuf::Message& from_msg);
-  public:
-  PROTOBUF_ATTRIBUTE_REINITIALIZES void Clear() final;
-  bool IsInitialized() const final;
-
-  ::size_t ByteSizeLong() const final;
-  const char* _InternalParse(const char* ptr, ::google::protobuf::internal::ParseContext* ctx) final;
-  ::uint8_t* _InternalSerialize(
-      ::uint8_t* target, ::google::protobuf::io::EpsCopyOutputStream* stream) const final;
-  int GetCachedSize() const { return _impl_._cached_size_.Get(); }
-
-  private:
-  ::google::protobuf::internal::CachedSize* AccessCachedSize() const final;
-  void SharedCtor(::google::protobuf::Arena* arena);
-  void SharedDtor();
-  void InternalSwap(FigureDescriptor* other);
-
-  private:
-  friend class ::google::protobuf::internal::AnyMetadata;
-  static ::absl::string_view FullMessageName() {
-    return "io.deephaven.proto.backplane.script.grpc.FigureDescriptor";
-  }
-  protected:
-  explicit FigureDescriptor(::google::protobuf::Arena* arena);
-  FigureDescriptor(::google::protobuf::Arena* arena, const FigureDescriptor& from);
-  public:
-
-  static const ClassData _class_data_;
-  const ::google::protobuf::Message::ClassData*GetClassData() const final;
-
-  ::google::protobuf::Metadata GetMetadata() const final;
-
-  // nested types ----------------------------------------------------
-
-  using ChartDescriptor = FigureDescriptor_ChartDescriptor;
-  using SeriesDescriptor = FigureDescriptor_SeriesDescriptor;
-  using MultiSeriesDescriptor = FigureDescriptor_MultiSeriesDescriptor;
-  using StringMapWithDefault = FigureDescriptor_StringMapWithDefault;
-  using DoubleMapWithDefault = FigureDescriptor_DoubleMapWithDefault;
-  using BoolMapWithDefault = FigureDescriptor_BoolMapWithDefault;
-  using AxisDescriptor = FigureDescriptor_AxisDescriptor;
-  using BusinessCalendarDescriptor = FigureDescriptor_BusinessCalendarDescriptor;
-  using MultiSeriesSourceDescriptor = FigureDescriptor_MultiSeriesSourceDescriptor;
-  using SourceDescriptor = FigureDescriptor_SourceDescriptor;
-  using OneClickDescriptor = FigureDescriptor_OneClickDescriptor;
-
-  using SeriesPlotStyle = FigureDescriptor_SeriesPlotStyle;
-  static constexpr SeriesPlotStyle BAR = FigureDescriptor_SeriesPlotStyle_BAR;
-  static constexpr SeriesPlotStyle STACKED_BAR = FigureDescriptor_SeriesPlotStyle_STACKED_BAR;
-  static constexpr SeriesPlotStyle LINE = FigureDescriptor_SeriesPlotStyle_LINE;
-  static constexpr SeriesPlotStyle AREA = FigureDescriptor_SeriesPlotStyle_AREA;
-  static constexpr SeriesPlotStyle STACKED_AREA = FigureDescriptor_SeriesPlotStyle_STACKED_AREA;
-  static constexpr SeriesPlotStyle PIE = FigureDescriptor_SeriesPlotStyle_PIE;
-  static constexpr SeriesPlotStyle HISTOGRAM = FigureDescriptor_SeriesPlotStyle_HISTOGRAM;
-  static constexpr SeriesPlotStyle OHLC = FigureDescriptor_SeriesPlotStyle_OHLC;
-  static constexpr SeriesPlotStyle SCATTER = FigureDescriptor_SeriesPlotStyle_SCATTER;
-  static constexpr SeriesPlotStyle STEP = FigureDescriptor_SeriesPlotStyle_STEP;
-  static constexpr SeriesPlotStyle ERROR_BAR = FigureDescriptor_SeriesPlotStyle_ERROR_BAR;
-  static constexpr SeriesPlotStyle TREEMAP = FigureDescriptor_SeriesPlotStyle_TREEMAP;
-  static inline bool SeriesPlotStyle_IsValid(int value) {
-    return FigureDescriptor_SeriesPlotStyle_IsValid(value);
-  }
-  static constexpr SeriesPlotStyle SeriesPlotStyle_MIN = FigureDescriptor_SeriesPlotStyle_SeriesPlotStyle_MIN;
-  static constexpr SeriesPlotStyle SeriesPlotStyle_MAX = FigureDescriptor_SeriesPlotStyle_SeriesPlotStyle_MAX;
-  static constexpr int SeriesPlotStyle_ARRAYSIZE = FigureDescriptor_SeriesPlotStyle_SeriesPlotStyle_ARRAYSIZE;
-  static inline const ::google::protobuf::EnumDescriptor* SeriesPlotStyle_descriptor() {
-    return FigureDescriptor_SeriesPlotStyle_descriptor();
-  }
-  template <typename T>
-  static inline const std::string& SeriesPlotStyle_Name(T value) {
-    return FigureDescriptor_SeriesPlotStyle_Name(value);
-  }
-  static inline bool SeriesPlotStyle_Parse(absl::string_view name, SeriesPlotStyle* value) {
-    return FigureDescriptor_SeriesPlotStyle_Parse(name, value);
-  }
-
-  using SourceType = FigureDescriptor_SourceType;
-  static constexpr SourceType X = FigureDescriptor_SourceType_X;
-  static constexpr SourceType Y = FigureDescriptor_SourceType_Y;
-  static constexpr SourceType Z = FigureDescriptor_SourceType_Z;
-  static constexpr SourceType X_LOW = FigureDescriptor_SourceType_X_LOW;
-  static constexpr SourceType X_HIGH = FigureDescriptor_SourceType_X_HIGH;
-  static constexpr SourceType Y_LOW = FigureDescriptor_SourceType_Y_LOW;
-  static constexpr SourceType Y_HIGH = FigureDescriptor_SourceType_Y_HIGH;
-  static constexpr SourceType TIME = FigureDescriptor_SourceType_TIME;
-  static constexpr SourceType OPEN = FigureDescriptor_SourceType_OPEN;
-  static constexpr SourceType HIGH = FigureDescriptor_SourceType_HIGH;
-  static constexpr SourceType LOW = FigureDescriptor_SourceType_LOW;
-  static constexpr SourceType CLOSE = FigureDescriptor_SourceType_CLOSE;
-  static constexpr SourceType SHAPE = FigureDescriptor_SourceType_SHAPE;
-  static constexpr SourceType SIZE = FigureDescriptor_SourceType_SIZE;
-  static constexpr SourceType LABEL = FigureDescriptor_SourceType_LABEL;
-  static constexpr SourceType COLOR = FigureDescriptor_SourceType_COLOR;
-  static constexpr SourceType PARENT = FigureDescriptor_SourceType_PARENT;
-  static constexpr SourceType HOVER_TEXT = FigureDescriptor_SourceType_HOVER_TEXT;
-  static constexpr SourceType TEXT = FigureDescriptor_SourceType_TEXT;
-  static inline bool SourceType_IsValid(int value) {
-    return FigureDescriptor_SourceType_IsValid(value);
-  }
-  static constexpr SourceType SourceType_MIN = FigureDescriptor_SourceType_SourceType_MIN;
-  static constexpr SourceType SourceType_MAX = FigureDescriptor_SourceType_SourceType_MAX;
-  static constexpr int SourceType_ARRAYSIZE = FigureDescriptor_SourceType_SourceType_ARRAYSIZE;
-  static inline const ::google::protobuf::EnumDescriptor* SourceType_descriptor() {
-    return FigureDescriptor_SourceType_descriptor();
-  }
-  template <typename T>
-  static inline const std::string& SourceType_Name(T value) {
-    return FigureDescriptor_SourceType_Name(value);
-  }
-  static inline bool SourceType_Parse(absl::string_view name, SourceType* value) {
-    return FigureDescriptor_SourceType_Parse(name, value);
-  }
-
-  // accessors -------------------------------------------------------
-
-  enum : int {
-    kChartsFieldNumber = 10,
-    kErrorsFieldNumber = 13,
-    kTitleFieldNumber = 1,
-    kTitleFontFieldNumber = 2,
-    kTitleColorFieldNumber = 3,
-    kUpdateIntervalFieldNumber = 7,
-    kColsFieldNumber = 8,
-    kRowsFieldNumber = 9,
-  };
-  // repeated .io.deephaven.proto.backplane.script.grpc.FigureDescriptor.ChartDescriptor charts = 10;
-  int charts_size() const;
-  private:
-  int _internal_charts_size() const;
-
-  public:
-  void clear_charts() ;
-  ::io::deephaven::proto::backplane::script::grpc::FigureDescriptor_ChartDescriptor* mutable_charts(int index);
-  ::google::protobuf::RepeatedPtrField< ::io::deephaven::proto::backplane::script::grpc::FigureDescriptor_ChartDescriptor >*
-      mutable_charts();
-  private:
-  const ::google::protobuf::RepeatedPtrField<::io::deephaven::proto::backplane::script::grpc::FigureDescriptor_ChartDescriptor>& _internal_charts() const;
-  ::google::protobuf::RepeatedPtrField<::io::deephaven::proto::backplane::script::grpc::FigureDescriptor_ChartDescriptor>* _internal_mutable_charts();
-  public:
-  const ::io::deephaven::proto::backplane::script::grpc::FigureDescriptor_ChartDescriptor& charts(int index) const;
-  ::io::deephaven::proto::backplane::script::grpc::FigureDescriptor_ChartDescriptor* add_charts();
-  const ::google::protobuf::RepeatedPtrField< ::io::deephaven::proto::backplane::script::grpc::FigureDescriptor_ChartDescriptor >&
-      charts() const;
-  // repeated string errors = 13;
-  int errors_size() const;
-  private:
-  int _internal_errors_size() const;
-
-  public:
-  void clear_errors() ;
-  const std::string& errors(int index) const;
-  std::string* mutable_errors(int index);
-  void set_errors(int index, const std::string& value);
-  void set_errors(int index, std::string&& value);
-  void set_errors(int index, const char* value);
-  void set_errors(int index, const char* value, std::size_t size);
-  void set_errors(int index, absl::string_view value);
-  std::string* add_errors();
-  void add_errors(const std::string& value);
-  void add_errors(std::string&& value);
-  void add_errors(const char* value);
-  void add_errors(const char* value, std::size_t size);
-  void add_errors(absl::string_view value);
-  const ::google::protobuf::RepeatedPtrField<std::string>& errors() const;
-  ::google::protobuf::RepeatedPtrField<std::string>* mutable_errors();
-
-  private:
-  const ::google::protobuf::RepeatedPtrField<std::string>& _internal_errors() const;
-  ::google::protobuf::RepeatedPtrField<std::string>* _internal_mutable_errors();
-
-  public:
-  // optional string title = 1;
-  bool has_title() const;
-  void clear_title() ;
-  const std::string& title() const;
-  template <typename Arg_ = const std::string&, typename... Args_>
-  void set_title(Arg_&& arg, Args_... args);
-  std::string* mutable_title();
-  PROTOBUF_NODISCARD std::string* release_title();
-  void set_allocated_title(std::string* value);
-
-  private:
-  const std::string& _internal_title() const;
-  inline PROTOBUF_ALWAYS_INLINE void _internal_set_title(
-      const std::string& value);
-  std::string* _internal_mutable_title();
-
-  public:
-  // string title_font = 2;
-  void clear_title_font() ;
-  const std::string& title_font() const;
-  template <typename Arg_ = const std::string&, typename... Args_>
-  void set_title_font(Arg_&& arg, Args_... args);
-  std::string* mutable_title_font();
-  PROTOBUF_NODISCARD std::string* release_title_font();
-  void set_allocated_title_font(std::string* value);
-
-  private:
-  const std::string& _internal_title_font() const;
-  inline PROTOBUF_ALWAYS_INLINE void _internal_set_title_font(
-      const std::string& value);
-  std::string* _internal_mutable_title_font();
-
-  public:
-  // string title_color = 3;
-  void clear_title_color() ;
-  const std::string& title_color() const;
-  template <typename Arg_ = const std::string&, typename... Args_>
-  void set_title_color(Arg_&& arg, Args_... args);
-  std::string* mutable_title_color();
-  PROTOBUF_NODISCARD std::string* release_title_color();
-  void set_allocated_title_color(std::string* value);
-
-  private:
-  const std::string& _internal_title_color() const;
-  inline PROTOBUF_ALWAYS_INLINE void _internal_set_title_color(
-      const std::string& value);
-  std::string* _internal_mutable_title_color();
-
-  public:
-  // int64 update_interval = 7 [jstype = JS_STRING];
-  void clear_update_interval() ;
-  ::int64_t update_interval() const;
-  void set_update_interval(::int64_t value);
-
-  private:
-  ::int64_t _internal_update_interval() const;
-  void _internal_set_update_interval(::int64_t value);
-
-  public:
-  // int32 cols = 8;
-  void clear_cols() ;
-  ::int32_t cols() const;
-  void set_cols(::int32_t value);
-
-  private:
-  ::int32_t _internal_cols() const;
-  void _internal_set_cols(::int32_t value);
-
-  public:
-  // int32 rows = 9;
-  void clear_rows() ;
-  ::int32_t rows() const;
-  void set_rows(::int32_t value);
-
-  private:
-  ::int32_t _internal_rows() const;
-  void _internal_set_rows(::int32_t value);
-
-  public:
-  // @@protoc_insertion_point(class_scope:io.deephaven.proto.backplane.script.grpc.FigureDescriptor)
- private:
-  class _Internal;
-
-  friend class ::google::protobuf::internal::TcParser;
-  static const ::google::protobuf::internal::TcParseTable<
-      4, 8, 1,
-      106, 2>
-      _table_;
-  friend class ::google::protobuf::MessageLite;
-  friend class ::google::protobuf::Arena;
-  template <typename T>
-  friend class ::google::protobuf::Arena::InternalHelper;
-  using InternalArenaConstructable_ = void;
-  using DestructorSkippable_ = void;
-  struct Impl_ {
-
-        inline explicit constexpr Impl_(
-            ::google::protobuf::internal::ConstantInitialized) noexcept;
-        inline explicit Impl_(::google::protobuf::internal::InternalVisibility visibility,
-                              ::google::protobuf::Arena* arena);
-        inline explicit Impl_(::google::protobuf::internal::InternalVisibility visibility,
-                              ::google::protobuf::Arena* arena, const Impl_& from);
-    ::google::protobuf::internal::HasBits<1> _has_bits_;
-    mutable ::google::protobuf::internal::CachedSize _cached_size_;
-    ::google::protobuf::RepeatedPtrField< ::io::deephaven::proto::backplane::script::grpc::FigureDescriptor_ChartDescriptor > charts_;
-    ::google::protobuf::RepeatedPtrField<std::string> errors_;
-    ::google::protobuf::internal::ArenaStringPtr title_;
-    ::google::protobuf::internal::ArenaStringPtr title_font_;
-    ::google::protobuf::internal::ArenaStringPtr title_color_;
-    ::int64_t update_interval_;
-    ::int32_t cols_;
-    ::int32_t rows_;
-    PROTOBUF_TSAN_DECLARE_MEMBER
-  };
-  union { Impl_ _impl_; };
-  friend struct ::TableStruct_deephaven_2fproto_2fconsole_2eproto;
-};// -------------------------------------------------------------------
-
-class AutoCompleteResponse final :
-    public ::google::protobuf::Message /* @@protoc_insertion_point(class_definition:io.deephaven.proto.backplane.script.grpc.AutoCompleteResponse) */ {
- public:
-  inline AutoCompleteResponse() : AutoCompleteResponse(nullptr) {}
-  ~AutoCompleteResponse() override;
-  template<typename = void>
-  explicit PROTOBUF_CONSTEXPR AutoCompleteResponse(::google::protobuf::internal::ConstantInitialized);
-
-  inline AutoCompleteResponse(const AutoCompleteResponse& from)
-      : AutoCompleteResponse(nullptr, from) {}
-  AutoCompleteResponse(AutoCompleteResponse&& from) noexcept
-    : AutoCompleteResponse() {
-    *this = ::std::move(from);
-  }
-
-  inline AutoCompleteResponse& operator=(const AutoCompleteResponse& from) {
-    CopyFrom(from);
-    return *this;
-  }
-  inline AutoCompleteResponse& operator=(AutoCompleteResponse&& from) noexcept {
-    if (this == &from) return *this;
-    if (GetArena() == from.GetArena()
-  #ifdef PROTOBUF_FORCE_COPY_IN_MOVE
-        && GetArena() != nullptr
-  #endif  // !PROTOBUF_FORCE_COPY_IN_MOVE
-    ) {
-      InternalSwap(&from);
-    } else {
-      CopyFrom(from);
-    }
-    return *this;
-  }
-
-  inline const ::google::protobuf::UnknownFieldSet& unknown_fields() const
-      ABSL_ATTRIBUTE_LIFETIME_BOUND {
-    return _internal_metadata_.unknown_fields<::google::protobuf::UnknownFieldSet>(::google::protobuf::UnknownFieldSet::default_instance);
-  }
-  inline ::google::protobuf::UnknownFieldSet* mutable_unknown_fields()
-      ABSL_ATTRIBUTE_LIFETIME_BOUND {
-    return _internal_metadata_.mutable_unknown_fields<::google::protobuf::UnknownFieldSet>();
-  }
-
-  static const ::google::protobuf::Descriptor* descriptor() {
-    return GetDescriptor();
-  }
-  static const ::google::protobuf::Descriptor* GetDescriptor() {
-    return default_instance().GetMetadata().descriptor;
-  }
-  static const ::google::protobuf::Reflection* GetReflection() {
-    return default_instance().GetMetadata().reflection;
-  }
-  static const AutoCompleteResponse& default_instance() {
-    return *internal_default_instance();
-  }
-  enum ResponseCase {
-    kCompletionItems = 1,
-    kSignatures = 4,
-    kHover = 5,
-    kDiagnostic = 6,
-    kDiagnosticPublish = 7,
-    RESPONSE_NOT_SET = 0,
-  };
-
-  static inline const AutoCompleteResponse* internal_default_instance() {
-    return reinterpret_cast<const AutoCompleteResponse*>(
-               &_AutoCompleteResponse_default_instance_);
-  }
-  static constexpr int kIndexInFileMessages =
-    17;
-
-  friend void swap(AutoCompleteResponse& a, AutoCompleteResponse& b) {
-    a.Swap(&b);
-  }
-  inline void Swap(AutoCompleteResponse* other) {
-    if (other == this) return;
-  #ifdef PROTOBUF_FORCE_COPY_IN_SWAP
-    if (GetArena() != nullptr &&
-        GetArena() == other->GetArena()) {
-   #else  // PROTOBUF_FORCE_COPY_IN_SWAP
-    if (GetArena() == other->GetArena()) {
-  #endif  // !PROTOBUF_FORCE_COPY_IN_SWAP
-      InternalSwap(other);
-    } else {
-      ::google::protobuf::internal::GenericSwap(this, other);
-    }
-  }
-  void UnsafeArenaSwap(AutoCompleteResponse* other) {
-    if (other == this) return;
-    ABSL_DCHECK(GetArena() == other->GetArena());
-    InternalSwap(other);
-  }
-
-  // implements Message ----------------------------------------------
-
-  AutoCompleteResponse* New(::google::protobuf::Arena* arena = nullptr) const final {
-    return CreateMaybeMessage<AutoCompleteResponse>(arena);
-  }
-  using ::google::protobuf::Message::CopyFrom;
-  void CopyFrom(const AutoCompleteResponse& from);
-  using ::google::protobuf::Message::MergeFrom;
-  void MergeFrom( const AutoCompleteResponse& from) {
-    AutoCompleteResponse::MergeImpl(*this, from);
-  }
-  private:
-  static void MergeImpl(::google::protobuf::Message& to_msg, const ::google::protobuf::Message& from_msg);
-  public:
-  PROTOBUF_ATTRIBUTE_REINITIALIZES void Clear() final;
-  bool IsInitialized() const final;
-
-  ::size_t ByteSizeLong() const final;
-  const char* _InternalParse(const char* ptr, ::google::protobuf::internal::ParseContext* ctx) final;
-  ::uint8_t* _InternalSerialize(
-      ::uint8_t* target, ::google::protobuf::io::EpsCopyOutputStream* stream) const final;
-  int GetCachedSize() const { return _impl_._cached_size_.Get(); }
-
-  private:
-  ::google::protobuf::internal::CachedSize* AccessCachedSize() const final;
-  void SharedCtor(::google::protobuf::Arena* arena);
-  void SharedDtor();
-  void InternalSwap(AutoCompleteResponse* other);
-
-  private:
-  friend class ::google::protobuf::internal::AnyMetadata;
-  static ::absl::string_view FullMessageName() {
-    return "io.deephaven.proto.backplane.script.grpc.AutoCompleteResponse";
-  }
-  protected:
-  explicit AutoCompleteResponse(::google::protobuf::Arena* arena);
-  AutoCompleteResponse(::google::protobuf::Arena* arena, const AutoCompleteResponse& from);
-  public:
-
-  static const ClassData _class_data_;
-  const ::google::protobuf::Message::ClassData*GetClassData() const final;
-
-  ::google::protobuf::Metadata GetMetadata() const final;
-
-  // nested types ----------------------------------------------------
-
-  // accessors -------------------------------------------------------
-
-  enum : int {
-    kRequestIdFieldNumber = 2,
-    kSuccessFieldNumber = 3,
-    kCompletionItemsFieldNumber = 1,
-    kSignaturesFieldNumber = 4,
-    kHoverFieldNumber = 5,
-    kDiagnosticFieldNumber = 6,
-    kDiagnosticPublishFieldNumber = 7,
-  };
-  // int32 request_id = 2;
-  void clear_request_id() ;
-  ::int32_t request_id() const;
-  void set_request_id(::int32_t value);
-
-  private:
-  ::int32_t _internal_request_id() const;
-  void _internal_set_request_id(::int32_t value);
-
-  public:
-  // bool success = 3;
-  void clear_success() ;
-  bool success() const;
-  void set_success(bool value);
-
-  private:
-  bool _internal_success() const;
-  void _internal_set_success(bool value);
-
-  public:
-  // .io.deephaven.proto.backplane.script.grpc.GetCompletionItemsResponse completion_items = 1;
-  bool has_completion_items() const;
-  private:
-  bool _internal_has_completion_items() const;
-
-  public:
-  void clear_completion_items() ;
-  const ::io::deephaven::proto::backplane::script::grpc::GetCompletionItemsResponse& completion_items() const;
-  PROTOBUF_NODISCARD ::io::deephaven::proto::backplane::script::grpc::GetCompletionItemsResponse* release_completion_items();
-  ::io::deephaven::proto::backplane::script::grpc::GetCompletionItemsResponse* mutable_completion_items();
-  void set_allocated_completion_items(::io::deephaven::proto::backplane::script::grpc::GetCompletionItemsResponse* value);
-  void unsafe_arena_set_allocated_completion_items(::io::deephaven::proto::backplane::script::grpc::GetCompletionItemsResponse* value);
-  ::io::deephaven::proto::backplane::script::grpc::GetCompletionItemsResponse* unsafe_arena_release_completion_items();
-
-  private:
-  const ::io::deephaven::proto::backplane::script::grpc::GetCompletionItemsResponse& _internal_completion_items() const;
-  ::io::deephaven::proto::backplane::script::grpc::GetCompletionItemsResponse* _internal_mutable_completion_items();
-
-  public:
-  // .io.deephaven.proto.backplane.script.grpc.GetSignatureHelpResponse signatures = 4;
-  bool has_signatures() const;
-  private:
-  bool _internal_has_signatures() const;
-
-  public:
-  void clear_signatures() ;
-  const ::io::deephaven::proto::backplane::script::grpc::GetSignatureHelpResponse& signatures() const;
-  PROTOBUF_NODISCARD ::io::deephaven::proto::backplane::script::grpc::GetSignatureHelpResponse* release_signatures();
-  ::io::deephaven::proto::backplane::script::grpc::GetSignatureHelpResponse* mutable_signatures();
-  void set_allocated_signatures(::io::deephaven::proto::backplane::script::grpc::GetSignatureHelpResponse* value);
-  void unsafe_arena_set_allocated_signatures(::io::deephaven::proto::backplane::script::grpc::GetSignatureHelpResponse* value);
-  ::io::deephaven::proto::backplane::script::grpc::GetSignatureHelpResponse* unsafe_arena_release_signatures();
-
-  private:
-  const ::io::deephaven::proto::backplane::script::grpc::GetSignatureHelpResponse& _internal_signatures() const;
-  ::io::deephaven::proto::backplane::script::grpc::GetSignatureHelpResponse* _internal_mutable_signatures();
-
-  public:
-  // .io.deephaven.proto.backplane.script.grpc.GetHoverResponse hover = 5;
-  bool has_hover() const;
-  private:
-  bool _internal_has_hover() const;
-
-  public:
-  void clear_hover() ;
-  const ::io::deephaven::proto::backplane::script::grpc::GetHoverResponse& hover() const;
-  PROTOBUF_NODISCARD ::io::deephaven::proto::backplane::script::grpc::GetHoverResponse* release_hover();
-  ::io::deephaven::proto::backplane::script::grpc::GetHoverResponse* mutable_hover();
-  void set_allocated_hover(::io::deephaven::proto::backplane::script::grpc::GetHoverResponse* value);
-  void unsafe_arena_set_allocated_hover(::io::deephaven::proto::backplane::script::grpc::GetHoverResponse* value);
-  ::io::deephaven::proto::backplane::script::grpc::GetHoverResponse* unsafe_arena_release_hover();
-
-  private:
-  const ::io::deephaven::proto::backplane::script::grpc::GetHoverResponse& _internal_hover() const;
-  ::io::deephaven::proto::backplane::script::grpc::GetHoverResponse* _internal_mutable_hover();
-
-  public:
-  // .io.deephaven.proto.backplane.script.grpc.GetPullDiagnosticResponse diagnostic = 6;
-  bool has_diagnostic() const;
-  private:
-  bool _internal_has_diagnostic() const;
-
-  public:
-  void clear_diagnostic() ;
-  const ::io::deephaven::proto::backplane::script::grpc::GetPullDiagnosticResponse& diagnostic() const;
-  PROTOBUF_NODISCARD ::io::deephaven::proto::backplane::script::grpc::GetPullDiagnosticResponse* release_diagnostic();
-  ::io::deephaven::proto::backplane::script::grpc::GetPullDiagnosticResponse* mutable_diagnostic();
-  void set_allocated_diagnostic(::io::deephaven::proto::backplane::script::grpc::GetPullDiagnosticResponse* value);
-  void unsafe_arena_set_allocated_diagnostic(::io::deephaven::proto::backplane::script::grpc::GetPullDiagnosticResponse* value);
-  ::io::deephaven::proto::backplane::script::grpc::GetPullDiagnosticResponse* unsafe_arena_release_diagnostic();
-
-  private:
-  const ::io::deephaven::proto::backplane::script::grpc::GetPullDiagnosticResponse& _internal_diagnostic() const;
-  ::io::deephaven::proto::backplane::script::grpc::GetPullDiagnosticResponse* _internal_mutable_diagnostic();
-
-  public:
-  // .io.deephaven.proto.backplane.script.grpc.GetPublishDiagnosticResponse diagnostic_publish = 7;
-  bool has_diagnostic_publish() const;
-  private:
-  bool _internal_has_diagnostic_publish() const;
-
-  public:
-  void clear_diagnostic_publish() ;
-  const ::io::deephaven::proto::backplane::script::grpc::GetPublishDiagnosticResponse& diagnostic_publish() const;
-  PROTOBUF_NODISCARD ::io::deephaven::proto::backplane::script::grpc::GetPublishDiagnosticResponse* release_diagnostic_publish();
-  ::io::deephaven::proto::backplane::script::grpc::GetPublishDiagnosticResponse* mutable_diagnostic_publish();
-  void set_allocated_diagnostic_publish(::io::deephaven::proto::backplane::script::grpc::GetPublishDiagnosticResponse* value);
-  void unsafe_arena_set_allocated_diagnostic_publish(::io::deephaven::proto::backplane::script::grpc::GetPublishDiagnosticResponse* value);
-  ::io::deephaven::proto::backplane::script::grpc::GetPublishDiagnosticResponse* unsafe_arena_release_diagnostic_publish();
-
-  private:
-  const ::io::deephaven::proto::backplane::script::grpc::GetPublishDiagnosticResponse& _internal_diagnostic_publish() const;
-  ::io::deephaven::proto::backplane::script::grpc::GetPublishDiagnosticResponse* _internal_mutable_diagnostic_publish();
-
-  public:
-  void clear_response();
-  ResponseCase response_case() const;
-  // @@protoc_insertion_point(class_scope:io.deephaven.proto.backplane.script.grpc.AutoCompleteResponse)
- private:
-  class _Internal;
-  void set_has_completion_items();
-  void set_has_signatures();
-  void set_has_hover();
-  void set_has_diagnostic();
-  void set_has_diagnostic_publish();
-
-  inline bool has_response() const;
-  inline void clear_has_response();
-
-  friend class ::google::protobuf::internal::TcParser;
-  static const ::google::protobuf::internal::TcParseTable<
-      1, 7, 5,
-      0, 2>
-      _table_;
-  friend class ::google::protobuf::MessageLite;
-  friend class ::google::protobuf::Arena;
-  template <typename T>
-  friend class ::google::protobuf::Arena::InternalHelper;
-  using InternalArenaConstructable_ = void;
-  using DestructorSkippable_ = void;
-  struct Impl_ {
-
-        inline explicit constexpr Impl_(
-            ::google::protobuf::internal::ConstantInitialized) noexcept;
-        inline explicit Impl_(::google::protobuf::internal::InternalVisibility visibility,
-                              ::google::protobuf::Arena* arena);
-        inline explicit Impl_(::google::protobuf::internal::InternalVisibility visibility,
-                              ::google::protobuf::Arena* arena, const Impl_& from);
-    ::int32_t request_id_;
-    bool success_;
-    union ResponseUnion {
-      constexpr ResponseUnion() : _constinit_{} {}
-        ::google::protobuf::internal::ConstantInitialized _constinit_;
-      ::io::deephaven::proto::backplane::script::grpc::GetCompletionItemsResponse* completion_items_;
-      ::io::deephaven::proto::backplane::script::grpc::GetSignatureHelpResponse* signatures_;
-      ::io::deephaven::proto::backplane::script::grpc::GetHoverResponse* hover_;
-      ::io::deephaven::proto::backplane::script::grpc::GetPullDiagnosticResponse* diagnostic_;
-      ::io::deephaven::proto::backplane::script::grpc::GetPublishDiagnosticResponse* diagnostic_publish_;
-    } response_;
-    mutable ::google::protobuf::internal::CachedSize _cached_size_;
-    ::uint32_t _oneof_case_[1];
-
-    PROTOBUF_TSAN_DECLARE_MEMBER
-  };
-  union { Impl_ _impl_; };
-  friend struct ::TableStruct_deephaven_2fproto_2fconsole_2eproto;
-};// -------------------------------------------------------------------
-
-class AutoCompleteRequest final :
-    public ::google::protobuf::Message /* @@protoc_insertion_point(class_definition:io.deephaven.proto.backplane.script.grpc.AutoCompleteRequest) */ {
- public:
-  inline AutoCompleteRequest() : AutoCompleteRequest(nullptr) {}
-  ~AutoCompleteRequest() override;
-  template<typename = void>
-  explicit PROTOBUF_CONSTEXPR AutoCompleteRequest(::google::protobuf::internal::ConstantInitialized);
-
-  inline AutoCompleteRequest(const AutoCompleteRequest& from)
-      : AutoCompleteRequest(nullptr, from) {}
-  AutoCompleteRequest(AutoCompleteRequest&& from) noexcept
-    : AutoCompleteRequest() {
-    *this = ::std::move(from);
-  }
-
-  inline AutoCompleteRequest& operator=(const AutoCompleteRequest& from) {
-    CopyFrom(from);
-    return *this;
-  }
-  inline AutoCompleteRequest& operator=(AutoCompleteRequest&& from) noexcept {
-    if (this == &from) return *this;
-    if (GetArena() == from.GetArena()
-  #ifdef PROTOBUF_FORCE_COPY_IN_MOVE
-        && GetArena() != nullptr
-  #endif  // !PROTOBUF_FORCE_COPY_IN_MOVE
-    ) {
-      InternalSwap(&from);
-    } else {
-      CopyFrom(from);
-    }
-    return *this;
-  }
-
-  inline const ::google::protobuf::UnknownFieldSet& unknown_fields() const
-      ABSL_ATTRIBUTE_LIFETIME_BOUND {
-    return _internal_metadata_.unknown_fields<::google::protobuf::UnknownFieldSet>(::google::protobuf::UnknownFieldSet::default_instance);
-  }
-  inline ::google::protobuf::UnknownFieldSet* mutable_unknown_fields()
-      ABSL_ATTRIBUTE_LIFETIME_BOUND {
-    return _internal_metadata_.mutable_unknown_fields<::google::protobuf::UnknownFieldSet>();
-  }
-
-  static const ::google::protobuf::Descriptor* descriptor() {
-    return GetDescriptor();
-  }
-  static const ::google::protobuf::Descriptor* GetDescriptor() {
-    return default_instance().GetMetadata().descriptor;
-  }
-  static const ::google::protobuf::Reflection* GetReflection() {
-    return default_instance().GetMetadata().reflection;
-  }
-  static const AutoCompleteRequest& default_instance() {
-    return *internal_default_instance();
-  }
-  enum RequestCase {
-    kOpenDocument = 1,
-    kChangeDocument = 2,
-    kGetCompletionItems = 3,
-    kGetSignatureHelp = 7,
-    kGetHover = 8,
-    kGetDiagnostic = 9,
-    kCloseDocument = 4,
-    REQUEST_NOT_SET = 0,
-  };
-
-  static inline const AutoCompleteRequest* internal_default_instance() {
-    return reinterpret_cast<const AutoCompleteRequest*>(
-               &_AutoCompleteRequest_default_instance_);
-  }
-  static constexpr int kIndexInFileMessages =
-    16;
-
-  friend void swap(AutoCompleteRequest& a, AutoCompleteRequest& b) {
-    a.Swap(&b);
-  }
-  inline void Swap(AutoCompleteRequest* other) {
-    if (other == this) return;
-  #ifdef PROTOBUF_FORCE_COPY_IN_SWAP
-    if (GetArena() != nullptr &&
-        GetArena() == other->GetArena()) {
-   #else  // PROTOBUF_FORCE_COPY_IN_SWAP
-    if (GetArena() == other->GetArena()) {
-  #endif  // !PROTOBUF_FORCE_COPY_IN_SWAP
-      InternalSwap(other);
-    } else {
-      ::google::protobuf::internal::GenericSwap(this, other);
-    }
-  }
-  void UnsafeArenaSwap(AutoCompleteRequest* other) {
-    if (other == this) return;
-    ABSL_DCHECK(GetArena() == other->GetArena());
-    InternalSwap(other);
-  }
-
-  // implements Message ----------------------------------------------
-
-  AutoCompleteRequest* New(::google::protobuf::Arena* arena = nullptr) const final {
-    return CreateMaybeMessage<AutoCompleteRequest>(arena);
-  }
-  using ::google::protobuf::Message::CopyFrom;
-  void CopyFrom(const AutoCompleteRequest& from);
-  using ::google::protobuf::Message::MergeFrom;
-  void MergeFrom( const AutoCompleteRequest& from) {
-    AutoCompleteRequest::MergeImpl(*this, from);
-  }
-  private:
-  static void MergeImpl(::google::protobuf::Message& to_msg, const ::google::protobuf::Message& from_msg);
-  public:
-  PROTOBUF_ATTRIBUTE_REINITIALIZES void Clear() final;
-  bool IsInitialized() const final;
-
-  ::size_t ByteSizeLong() const final;
-  const char* _InternalParse(const char* ptr, ::google::protobuf::internal::ParseContext* ctx) final;
-  ::uint8_t* _InternalSerialize(
-      ::uint8_t* target, ::google::protobuf::io::EpsCopyOutputStream* stream) const final;
-  int GetCachedSize() const { return _impl_._cached_size_.Get(); }
-
-  private:
-  ::google::protobuf::internal::CachedSize* AccessCachedSize() const final;
-  void SharedCtor(::google::protobuf::Arena* arena);
-  void SharedDtor();
-  void InternalSwap(AutoCompleteRequest* other);
-
-  private:
-  friend class ::google::protobuf::internal::AnyMetadata;
-  static ::absl::string_view FullMessageName() {
-    return "io.deephaven.proto.backplane.script.grpc.AutoCompleteRequest";
-  }
-  protected:
-  explicit AutoCompleteRequest(::google::protobuf::Arena* arena);
-  AutoCompleteRequest(::google::protobuf::Arena* arena, const AutoCompleteRequest& from);
-  public:
-
-  static const ClassData _class_data_;
-  const ::google::protobuf::Message::ClassData*GetClassData() const final;
-
-  ::google::protobuf::Metadata GetMetadata() const final;
-
-  // nested types ----------------------------------------------------
-
-  // accessors -------------------------------------------------------
-
-  enum : int {
-    kConsoleIdFieldNumber = 5,
-    kRequestIdFieldNumber = 6,
-    kOpenDocumentFieldNumber = 1,
-    kChangeDocumentFieldNumber = 2,
-    kGetCompletionItemsFieldNumber = 3,
-    kGetSignatureHelpFieldNumber = 7,
-    kGetHoverFieldNumber = 8,
-    kGetDiagnosticFieldNumber = 9,
-    kCloseDocumentFieldNumber = 4,
-  };
-  // .io.deephaven.proto.backplane.grpc.Ticket console_id = 5;
-  bool has_console_id() const;
-  void clear_console_id() ;
-  const ::io::deephaven::proto::backplane::grpc::Ticket& console_id() const;
-  PROTOBUF_NODISCARD ::io::deephaven::proto::backplane::grpc::Ticket* release_console_id();
-  ::io::deephaven::proto::backplane::grpc::Ticket* mutable_console_id();
-  void set_allocated_console_id(::io::deephaven::proto::backplane::grpc::Ticket* value);
-  void unsafe_arena_set_allocated_console_id(::io::deephaven::proto::backplane::grpc::Ticket* value);
-  ::io::deephaven::proto::backplane::grpc::Ticket* unsafe_arena_release_console_id();
-
-  private:
-  const ::io::deephaven::proto::backplane::grpc::Ticket& _internal_console_id() const;
-  ::io::deephaven::proto::backplane::grpc::Ticket* _internal_mutable_console_id();
-
-  public:
-  // int32 request_id = 6;
-  void clear_request_id() ;
-  ::int32_t request_id() const;
-  void set_request_id(::int32_t value);
-
-  private:
-  ::int32_t _internal_request_id() const;
-  void _internal_set_request_id(::int32_t value);
-
-  public:
-  // .io.deephaven.proto.backplane.script.grpc.OpenDocumentRequest open_document = 1;
-  bool has_open_document() const;
-  private:
-  bool _internal_has_open_document() const;
-
-  public:
-  void clear_open_document() ;
-  const ::io::deephaven::proto::backplane::script::grpc::OpenDocumentRequest& open_document() const;
-  PROTOBUF_NODISCARD ::io::deephaven::proto::backplane::script::grpc::OpenDocumentRequest* release_open_document();
-  ::io::deephaven::proto::backplane::script::grpc::OpenDocumentRequest* mutable_open_document();
-  void set_allocated_open_document(::io::deephaven::proto::backplane::script::grpc::OpenDocumentRequest* value);
-  void unsafe_arena_set_allocated_open_document(::io::deephaven::proto::backplane::script::grpc::OpenDocumentRequest* value);
-  ::io::deephaven::proto::backplane::script::grpc::OpenDocumentRequest* unsafe_arena_release_open_document();
-
-  private:
-  const ::io::deephaven::proto::backplane::script::grpc::OpenDocumentRequest& _internal_open_document() const;
-  ::io::deephaven::proto::backplane::script::grpc::OpenDocumentRequest* _internal_mutable_open_document();
-
-  public:
-  // .io.deephaven.proto.backplane.script.grpc.ChangeDocumentRequest change_document = 2;
-  bool has_change_document() const;
-  private:
-  bool _internal_has_change_document() const;
-
-  public:
-  void clear_change_document() ;
-  const ::io::deephaven::proto::backplane::script::grpc::ChangeDocumentRequest& change_document() const;
-  PROTOBUF_NODISCARD ::io::deephaven::proto::backplane::script::grpc::ChangeDocumentRequest* release_change_document();
-  ::io::deephaven::proto::backplane::script::grpc::ChangeDocumentRequest* mutable_change_document();
-  void set_allocated_change_document(::io::deephaven::proto::backplane::script::grpc::ChangeDocumentRequest* value);
-  void unsafe_arena_set_allocated_change_document(::io::deephaven::proto::backplane::script::grpc::ChangeDocumentRequest* value);
-  ::io::deephaven::proto::backplane::script::grpc::ChangeDocumentRequest* unsafe_arena_release_change_document();
-
-  private:
-  const ::io::deephaven::proto::backplane::script::grpc::ChangeDocumentRequest& _internal_change_document() const;
-  ::io::deephaven::proto::backplane::script::grpc::ChangeDocumentRequest* _internal_mutable_change_document();
-
-  public:
-  // .io.deephaven.proto.backplane.script.grpc.GetCompletionItemsRequest get_completion_items = 3;
-  bool has_get_completion_items() const;
-  private:
-  bool _internal_has_get_completion_items() const;
-
-  public:
-  void clear_get_completion_items() ;
-  const ::io::deephaven::proto::backplane::script::grpc::GetCompletionItemsRequest& get_completion_items() const;
-  PROTOBUF_NODISCARD ::io::deephaven::proto::backplane::script::grpc::GetCompletionItemsRequest* release_get_completion_items();
-  ::io::deephaven::proto::backplane::script::grpc::GetCompletionItemsRequest* mutable_get_completion_items();
-  void set_allocated_get_completion_items(::io::deephaven::proto::backplane::script::grpc::GetCompletionItemsRequest* value);
-  void unsafe_arena_set_allocated_get_completion_items(::io::deephaven::proto::backplane::script::grpc::GetCompletionItemsRequest* value);
-  ::io::deephaven::proto::backplane::script::grpc::GetCompletionItemsRequest* unsafe_arena_release_get_completion_items();
-
-  private:
-  const ::io::deephaven::proto::backplane::script::grpc::GetCompletionItemsRequest& _internal_get_completion_items() const;
-  ::io::deephaven::proto::backplane::script::grpc::GetCompletionItemsRequest* _internal_mutable_get_completion_items();
-
-  public:
-  // .io.deephaven.proto.backplane.script.grpc.GetSignatureHelpRequest get_signature_help = 7;
-  bool has_get_signature_help() const;
-  private:
-  bool _internal_has_get_signature_help() const;
-
-  public:
-  void clear_get_signature_help() ;
-  const ::io::deephaven::proto::backplane::script::grpc::GetSignatureHelpRequest& get_signature_help() const;
-  PROTOBUF_NODISCARD ::io::deephaven::proto::backplane::script::grpc::GetSignatureHelpRequest* release_get_signature_help();
-  ::io::deephaven::proto::backplane::script::grpc::GetSignatureHelpRequest* mutable_get_signature_help();
-  void set_allocated_get_signature_help(::io::deephaven::proto::backplane::script::grpc::GetSignatureHelpRequest* value);
-  void unsafe_arena_set_allocated_get_signature_help(::io::deephaven::proto::backplane::script::grpc::GetSignatureHelpRequest* value);
-  ::io::deephaven::proto::backplane::script::grpc::GetSignatureHelpRequest* unsafe_arena_release_get_signature_help();
-
-  private:
-  const ::io::deephaven::proto::backplane::script::grpc::GetSignatureHelpRequest& _internal_get_signature_help() const;
-  ::io::deephaven::proto::backplane::script::grpc::GetSignatureHelpRequest* _internal_mutable_get_signature_help();
-
-  public:
-  // .io.deephaven.proto.backplane.script.grpc.GetHoverRequest get_hover = 8;
-  bool has_get_hover() const;
-  private:
-  bool _internal_has_get_hover() const;
-
-  public:
-  void clear_get_hover() ;
-  const ::io::deephaven::proto::backplane::script::grpc::GetHoverRequest& get_hover() const;
-  PROTOBUF_NODISCARD ::io::deephaven::proto::backplane::script::grpc::GetHoverRequest* release_get_hover();
-  ::io::deephaven::proto::backplane::script::grpc::GetHoverRequest* mutable_get_hover();
-  void set_allocated_get_hover(::io::deephaven::proto::backplane::script::grpc::GetHoverRequest* value);
-  void unsafe_arena_set_allocated_get_hover(::io::deephaven::proto::backplane::script::grpc::GetHoverRequest* value);
-  ::io::deephaven::proto::backplane::script::grpc::GetHoverRequest* unsafe_arena_release_get_hover();
-
-  private:
-  const ::io::deephaven::proto::backplane::script::grpc::GetHoverRequest& _internal_get_hover() const;
-  ::io::deephaven::proto::backplane::script::grpc::GetHoverRequest* _internal_mutable_get_hover();
-
-  public:
-  // .io.deephaven.proto.backplane.script.grpc.GetDiagnosticRequest get_diagnostic = 9;
-  bool has_get_diagnostic() const;
-  private:
-  bool _internal_has_get_diagnostic() const;
-
-  public:
-  void clear_get_diagnostic() ;
-  const ::io::deephaven::proto::backplane::script::grpc::GetDiagnosticRequest& get_diagnostic() const;
-  PROTOBUF_NODISCARD ::io::deephaven::proto::backplane::script::grpc::GetDiagnosticRequest* release_get_diagnostic();
-  ::io::deephaven::proto::backplane::script::grpc::GetDiagnosticRequest* mutable_get_diagnostic();
-  void set_allocated_get_diagnostic(::io::deephaven::proto::backplane::script::grpc::GetDiagnosticRequest* value);
-  void unsafe_arena_set_allocated_get_diagnostic(::io::deephaven::proto::backplane::script::grpc::GetDiagnosticRequest* value);
-  ::io::deephaven::proto::backplane::script::grpc::GetDiagnosticRequest* unsafe_arena_release_get_diagnostic();
-
-  private:
-  const ::io::deephaven::proto::backplane::script::grpc::GetDiagnosticRequest& _internal_get_diagnostic() const;
-  ::io::deephaven::proto::backplane::script::grpc::GetDiagnosticRequest* _internal_mutable_get_diagnostic();
-
-  public:
-  // .io.deephaven.proto.backplane.script.grpc.CloseDocumentRequest close_document = 4;
-  bool has_close_document() const;
-  private:
-  bool _internal_has_close_document() const;
-
-  public:
-  void clear_close_document() ;
-  const ::io::deephaven::proto::backplane::script::grpc::CloseDocumentRequest& close_document() const;
-  PROTOBUF_NODISCARD ::io::deephaven::proto::backplane::script::grpc::CloseDocumentRequest* release_close_document();
-  ::io::deephaven::proto::backplane::script::grpc::CloseDocumentRequest* mutable_close_document();
-  void set_allocated_close_document(::io::deephaven::proto::backplane::script::grpc::CloseDocumentRequest* value);
-  void unsafe_arena_set_allocated_close_document(::io::deephaven::proto::backplane::script::grpc::CloseDocumentRequest* value);
-  ::io::deephaven::proto::backplane::script::grpc::CloseDocumentRequest* unsafe_arena_release_close_document();
-
-  private:
-  const ::io::deephaven::proto::backplane::script::grpc::CloseDocumentRequest& _internal_close_document() const;
-  ::io::deephaven::proto::backplane::script::grpc::CloseDocumentRequest* _internal_mutable_close_document();
-
-  public:
-  void clear_request();
-  RequestCase request_case() const;
-  // @@protoc_insertion_point(class_scope:io.deephaven.proto.backplane.script.grpc.AutoCompleteRequest)
- private:
-  class _Internal;
-  void set_has_open_document();
-  void set_has_change_document();
-  void set_has_get_completion_items();
-  void set_has_get_signature_help();
-  void set_has_get_hover();
-  void set_has_get_diagnostic();
-  void set_has_close_document();
-
-  inline bool has_request() const;
-  inline void clear_has_request();
-
-  friend class ::google::protobuf::internal::TcParser;
-  static const ::google::protobuf::internal::TcParseTable<
-      1, 9, 8,
-      0, 2>
-      _table_;
-  friend class ::google::protobuf::MessageLite;
-  friend class ::google::protobuf::Arena;
-  template <typename T>
-  friend class ::google::protobuf::Arena::InternalHelper;
-  using InternalArenaConstructable_ = void;
-  using DestructorSkippable_ = void;
-  struct Impl_ {
-
-        inline explicit constexpr Impl_(
-            ::google::protobuf::internal::ConstantInitialized) noexcept;
-        inline explicit Impl_(::google::protobuf::internal::InternalVisibility visibility,
-                              ::google::protobuf::Arena* arena);
-        inline explicit Impl_(::google::protobuf::internal::InternalVisibility visibility,
-                              ::google::protobuf::Arena* arena, const Impl_& from);
-    ::google::protobuf::internal::HasBits<1> _has_bits_;
-    mutable ::google::protobuf::internal::CachedSize _cached_size_;
-    ::io::deephaven::proto::backplane::grpc::Ticket* console_id_;
-    ::int32_t request_id_;
-    union RequestUnion {
-      constexpr RequestUnion() : _constinit_{} {}
-        ::google::protobuf::internal::ConstantInitialized _constinit_;
-      ::io::deephaven::proto::backplane::script::grpc::OpenDocumentRequest* open_document_;
-      ::io::deephaven::proto::backplane::script::grpc::ChangeDocumentRequest* change_document_;
-      ::io::deephaven::proto::backplane::script::grpc::GetCompletionItemsRequest* get_completion_items_;
-      ::io::deephaven::proto::backplane::script::grpc::GetSignatureHelpRequest* get_signature_help_;
-      ::io::deephaven::proto::backplane::script::grpc::GetHoverRequest* get_hover_;
-      ::io::deephaven::proto::backplane::script::grpc::GetDiagnosticRequest* get_diagnostic_;
-      ::io::deephaven::proto::backplane::script::grpc::CloseDocumentRequest* close_document_;
-    } request_;
-    ::uint32_t _oneof_case_[1];
-
-    PROTOBUF_TSAN_DECLARE_MEMBER
-  };
-  union { Impl_ _impl_; };
-  friend struct ::TableStruct_deephaven_2fproto_2fconsole_2eproto;
-};
-
-// ===================================================================
-
-
-
-
-// ===================================================================
-
-
-#ifdef __GNUC__
-#pragma GCC diagnostic push
-#pragma GCC diagnostic ignored "-Wstrict-aliasing"
-#endif  // __GNUC__
-// -------------------------------------------------------------------
-
-// GetConsoleTypesRequest
-
-// -------------------------------------------------------------------
-
-// GetConsoleTypesResponse
-
-// repeated string console_types = 1;
-inline int GetConsoleTypesResponse::_internal_console_types_size() const {
-  return _internal_console_types().size();
-}
-inline int GetConsoleTypesResponse::console_types_size() const {
-  return _internal_console_types_size();
-}
-inline void GetConsoleTypesResponse::clear_console_types() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  _impl_.console_types_.Clear();
-}
-inline std::string* GetConsoleTypesResponse::add_console_types()
-    ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  std::string* _s = _internal_mutable_console_types()->Add();
-  // @@protoc_insertion_point(field_add_mutable:io.deephaven.proto.backplane.script.grpc.GetConsoleTypesResponse.console_types)
-  return _s;
-}
-inline const std::string& GetConsoleTypesResponse::console_types(int index) const
-    ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  // @@protoc_insertion_point(field_get:io.deephaven.proto.backplane.script.grpc.GetConsoleTypesResponse.console_types)
-  return _internal_console_types().Get(index);
-}
-inline std::string* GetConsoleTypesResponse::mutable_console_types(int index)
-    ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  // @@protoc_insertion_point(field_mutable:io.deephaven.proto.backplane.script.grpc.GetConsoleTypesResponse.console_types)
-  return _internal_mutable_console_types()->Mutable(index);
-}
-inline void GetConsoleTypesResponse::set_console_types(int index, const std::string& value) {
-  _internal_mutable_console_types()->Mutable(index)->assign(value);
-  // @@protoc_insertion_point(field_set:io.deephaven.proto.backplane.script.grpc.GetConsoleTypesResponse.console_types)
-}
-inline void GetConsoleTypesResponse::set_console_types(int index, std::string&& value) {
-  _internal_mutable_console_types()->Mutable(index)->assign(std::move(value));
-  // @@protoc_insertion_point(field_set:io.deephaven.proto.backplane.script.grpc.GetConsoleTypesResponse.console_types)
-}
-inline void GetConsoleTypesResponse::set_console_types(int index, const char* value) {
-  ABSL_DCHECK(value != nullptr);
-  _internal_mutable_console_types()->Mutable(index)->assign(value);
-  // @@protoc_insertion_point(field_set_char:io.deephaven.proto.backplane.script.grpc.GetConsoleTypesResponse.console_types)
-}
-inline void GetConsoleTypesResponse::set_console_types(int index, const char* value,
-                              std::size_t size) {
-  _internal_mutable_console_types()->Mutable(index)->assign(
-      reinterpret_cast<const char*>(value), size);
-  // @@protoc_insertion_point(field_set_pointer:io.deephaven.proto.backplane.script.grpc.GetConsoleTypesResponse.console_types)
-}
-inline void GetConsoleTypesResponse::set_console_types(int index, absl::string_view value) {
-  _internal_mutable_console_types()->Mutable(index)->assign(value.data(),
-                                                     value.size());
-  // @@protoc_insertion_point(field_set_string_piece:io.deephaven.proto.backplane.script.grpc.GetConsoleTypesResponse.console_types)
-}
-inline void GetConsoleTypesResponse::add_console_types(const std::string& value) {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  _internal_mutable_console_types()->Add()->assign(value);
-  // @@protoc_insertion_point(field_add:io.deephaven.proto.backplane.script.grpc.GetConsoleTypesResponse.console_types)
-}
-inline void GetConsoleTypesResponse::add_console_types(std::string&& value) {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  _internal_mutable_console_types()->Add(std::move(value));
-  // @@protoc_insertion_point(field_add:io.deephaven.proto.backplane.script.grpc.GetConsoleTypesResponse.console_types)
-}
-inline void GetConsoleTypesResponse::add_console_types(const char* value) {
-  ABSL_DCHECK(value != nullptr);
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  _internal_mutable_console_types()->Add()->assign(value);
-  // @@protoc_insertion_point(field_add_char:io.deephaven.proto.backplane.script.grpc.GetConsoleTypesResponse.console_types)
-}
-inline void GetConsoleTypesResponse::add_console_types(const char* value, std::size_t size) {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  _internal_mutable_console_types()->Add()->assign(
-      reinterpret_cast<const char*>(value), size);
-  // @@protoc_insertion_point(field_add_pointer:io.deephaven.proto.backplane.script.grpc.GetConsoleTypesResponse.console_types)
-}
-inline void GetConsoleTypesResponse::add_console_types(absl::string_view value) {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  _internal_mutable_console_types()->Add()->assign(value.data(), value.size());
-  // @@protoc_insertion_point(field_add_string_piece:io.deephaven.proto.backplane.script.grpc.GetConsoleTypesResponse.console_types)
-}
-inline const ::google::protobuf::RepeatedPtrField<std::string>&
-GetConsoleTypesResponse::console_types() const ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  // @@protoc_insertion_point(field_list:io.deephaven.proto.backplane.script.grpc.GetConsoleTypesResponse.console_types)
-  return _internal_console_types();
-}
-inline ::google::protobuf::RepeatedPtrField<std::string>*
-GetConsoleTypesResponse::mutable_console_types() ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  // @@protoc_insertion_point(field_mutable_list:io.deephaven.proto.backplane.script.grpc.GetConsoleTypesResponse.console_types)
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  return _internal_mutable_console_types();
-}
-inline const ::google::protobuf::RepeatedPtrField<std::string>&
-GetConsoleTypesResponse::_internal_console_types() const {
-  PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race);
-  return _impl_.console_types_;
-}
-inline ::google::protobuf::RepeatedPtrField<std::string>*
-GetConsoleTypesResponse::_internal_mutable_console_types() {
-  PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race);
-  return &_impl_.console_types_;
-}
-
-// -------------------------------------------------------------------
-
-// StartConsoleRequest
-
-// .io.deephaven.proto.backplane.grpc.Ticket result_id = 1;
-inline bool StartConsoleRequest::has_result_id() const {
-  bool value = (_impl_._has_bits_[0] & 0x00000001u) != 0;
-  PROTOBUF_ASSUME(!value || _impl_.result_id_ != nullptr);
-  return value;
-}
-inline const ::io::deephaven::proto::backplane::grpc::Ticket& StartConsoleRequest::_internal_result_id() const {
-  PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race);
-  const ::io::deephaven::proto::backplane::grpc::Ticket* p = _impl_.result_id_;
-  return p != nullptr ? *p : reinterpret_cast<const ::io::deephaven::proto::backplane::grpc::Ticket&>(::io::deephaven::proto::backplane::grpc::_Ticket_default_instance_);
-}
-inline const ::io::deephaven::proto::backplane::grpc::Ticket& StartConsoleRequest::result_id() const ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  // @@protoc_insertion_point(field_get:io.deephaven.proto.backplane.script.grpc.StartConsoleRequest.result_id)
-  return _internal_result_id();
-}
-inline void StartConsoleRequest::unsafe_arena_set_allocated_result_id(::io::deephaven::proto::backplane::grpc::Ticket* value) {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  if (GetArena() == nullptr) {
-    delete reinterpret_cast<::google::protobuf::MessageLite*>(_impl_.result_id_);
-  }
-  _impl_.result_id_ = reinterpret_cast<::io::deephaven::proto::backplane::grpc::Ticket*>(value);
-  if (value != nullptr) {
-    _impl_._has_bits_[0] |= 0x00000001u;
-  } else {
-    _impl_._has_bits_[0] &= ~0x00000001u;
-  }
-  // @@protoc_insertion_point(field_unsafe_arena_set_allocated:io.deephaven.proto.backplane.script.grpc.StartConsoleRequest.result_id)
-}
-inline ::io::deephaven::proto::backplane::grpc::Ticket* StartConsoleRequest::release_result_id() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-
-  _impl_._has_bits_[0] &= ~0x00000001u;
-  ::io::deephaven::proto::backplane::grpc::Ticket* released = _impl_.result_id_;
-  _impl_.result_id_ = nullptr;
-#ifdef PROTOBUF_FORCE_COPY_IN_RELEASE
-  auto* old = reinterpret_cast<::google::protobuf::MessageLite*>(released);
-  released = ::google::protobuf::internal::DuplicateIfNonNull(released);
-  if (GetArena() == nullptr) {
-    delete old;
-  }
-#else   // PROTOBUF_FORCE_COPY_IN_RELEASE
-  if (GetArena() != nullptr) {
-    released = ::google::protobuf::internal::DuplicateIfNonNull(released);
-  }
-#endif  // !PROTOBUF_FORCE_COPY_IN_RELEASE
-  return released;
-}
-inline ::io::deephaven::proto::backplane::grpc::Ticket* StartConsoleRequest::unsafe_arena_release_result_id() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  // @@protoc_insertion_point(field_release:io.deephaven.proto.backplane.script.grpc.StartConsoleRequest.result_id)
-
-  _impl_._has_bits_[0] &= ~0x00000001u;
-  ::io::deephaven::proto::backplane::grpc::Ticket* temp = _impl_.result_id_;
-  _impl_.result_id_ = nullptr;
-  return temp;
-}
-inline ::io::deephaven::proto::backplane::grpc::Ticket* StartConsoleRequest::_internal_mutable_result_id() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  _impl_._has_bits_[0] |= 0x00000001u;
-  if (_impl_.result_id_ == nullptr) {
-    auto* p = CreateMaybeMessage<::io::deephaven::proto::backplane::grpc::Ticket>(GetArena());
-    _impl_.result_id_ = reinterpret_cast<::io::deephaven::proto::backplane::grpc::Ticket*>(p);
-  }
-  return _impl_.result_id_;
-}
-inline ::io::deephaven::proto::backplane::grpc::Ticket* StartConsoleRequest::mutable_result_id() ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  ::io::deephaven::proto::backplane::grpc::Ticket* _msg = _internal_mutable_result_id();
-  // @@protoc_insertion_point(field_mutable:io.deephaven.proto.backplane.script.grpc.StartConsoleRequest.result_id)
-  return _msg;
-}
-inline void StartConsoleRequest::set_allocated_result_id(::io::deephaven::proto::backplane::grpc::Ticket* value) {
-  ::google::protobuf::Arena* message_arena = GetArena();
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  if (message_arena == nullptr) {
-    delete reinterpret_cast<::google::protobuf::MessageLite*>(_impl_.result_id_);
-  }
-
-  if (value != nullptr) {
-    ::google::protobuf::Arena* submessage_arena = reinterpret_cast<::google::protobuf::MessageLite*>(value)->GetArena();
-    if (message_arena != submessage_arena) {
-      value = ::google::protobuf::internal::GetOwnedMessage(message_arena, value, submessage_arena);
-    }
-    _impl_._has_bits_[0] |= 0x00000001u;
-  } else {
-    _impl_._has_bits_[0] &= ~0x00000001u;
-  }
-
-  _impl_.result_id_ = reinterpret_cast<::io::deephaven::proto::backplane::grpc::Ticket*>(value);
-  // @@protoc_insertion_point(field_set_allocated:io.deephaven.proto.backplane.script.grpc.StartConsoleRequest.result_id)
-}
-
-// string session_type = 2;
-inline void StartConsoleRequest::clear_session_type() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  _impl_.session_type_.ClearToEmpty();
-}
-inline const std::string& StartConsoleRequest::session_type() const
-    ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  // @@protoc_insertion_point(field_get:io.deephaven.proto.backplane.script.grpc.StartConsoleRequest.session_type)
-  return _internal_session_type();
-}
-template <typename Arg_, typename... Args_>
-inline PROTOBUF_ALWAYS_INLINE void StartConsoleRequest::set_session_type(Arg_&& arg,
-                                                     Args_... args) {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  ;
-  _impl_.session_type_.Set(static_cast<Arg_&&>(arg), args..., GetArena());
-  // @@protoc_insertion_point(field_set:io.deephaven.proto.backplane.script.grpc.StartConsoleRequest.session_type)
-}
-inline std::string* StartConsoleRequest::mutable_session_type() ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  std::string* _s = _internal_mutable_session_type();
-  // @@protoc_insertion_point(field_mutable:io.deephaven.proto.backplane.script.grpc.StartConsoleRequest.session_type)
-  return _s;
-}
-inline const std::string& StartConsoleRequest::_internal_session_type() const {
-  PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race);
-  return _impl_.session_type_.Get();
-}
-inline void StartConsoleRequest::_internal_set_session_type(const std::string& value) {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  ;
-  _impl_.session_type_.Set(value, GetArena());
-}
-inline std::string* StartConsoleRequest::_internal_mutable_session_type() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  ;
-  return _impl_.session_type_.Mutable( GetArena());
-}
-inline std::string* StartConsoleRequest::release_session_type() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  // @@protoc_insertion_point(field_release:io.deephaven.proto.backplane.script.grpc.StartConsoleRequest.session_type)
-  return _impl_.session_type_.Release();
-}
-inline void StartConsoleRequest::set_allocated_session_type(std::string* value) {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  _impl_.session_type_.SetAllocated(value, GetArena());
-  #ifdef PROTOBUF_FORCE_COPY_DEFAULT_STRING
-        if (_impl_.session_type_.IsDefault()) {
-          _impl_.session_type_.Set("", GetArena());
-        }
-  #endif  // PROTOBUF_FORCE_COPY_DEFAULT_STRING
-  // @@protoc_insertion_point(field_set_allocated:io.deephaven.proto.backplane.script.grpc.StartConsoleRequest.session_type)
-}
-
-// -------------------------------------------------------------------
-
-// StartConsoleResponse
-
-// .io.deephaven.proto.backplane.grpc.Ticket result_id = 1;
-inline bool StartConsoleResponse::has_result_id() const {
-  bool value = (_impl_._has_bits_[0] & 0x00000001u) != 0;
-  PROTOBUF_ASSUME(!value || _impl_.result_id_ != nullptr);
-  return value;
-}
-inline const ::io::deephaven::proto::backplane::grpc::Ticket& StartConsoleResponse::_internal_result_id() const {
-  PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race);
-  const ::io::deephaven::proto::backplane::grpc::Ticket* p = _impl_.result_id_;
-  return p != nullptr ? *p : reinterpret_cast<const ::io::deephaven::proto::backplane::grpc::Ticket&>(::io::deephaven::proto::backplane::grpc::_Ticket_default_instance_);
-}
-inline const ::io::deephaven::proto::backplane::grpc::Ticket& StartConsoleResponse::result_id() const ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  // @@protoc_insertion_point(field_get:io.deephaven.proto.backplane.script.grpc.StartConsoleResponse.result_id)
-  return _internal_result_id();
-}
-inline void StartConsoleResponse::unsafe_arena_set_allocated_result_id(::io::deephaven::proto::backplane::grpc::Ticket* value) {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  if (GetArena() == nullptr) {
-    delete reinterpret_cast<::google::protobuf::MessageLite*>(_impl_.result_id_);
-  }
-  _impl_.result_id_ = reinterpret_cast<::io::deephaven::proto::backplane::grpc::Ticket*>(value);
-  if (value != nullptr) {
-    _impl_._has_bits_[0] |= 0x00000001u;
-  } else {
-    _impl_._has_bits_[0] &= ~0x00000001u;
-  }
-  // @@protoc_insertion_point(field_unsafe_arena_set_allocated:io.deephaven.proto.backplane.script.grpc.StartConsoleResponse.result_id)
-}
-inline ::io::deephaven::proto::backplane::grpc::Ticket* StartConsoleResponse::release_result_id() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-
-  _impl_._has_bits_[0] &= ~0x00000001u;
-  ::io::deephaven::proto::backplane::grpc::Ticket* released = _impl_.result_id_;
-  _impl_.result_id_ = nullptr;
-#ifdef PROTOBUF_FORCE_COPY_IN_RELEASE
-  auto* old = reinterpret_cast<::google::protobuf::MessageLite*>(released);
-  released = ::google::protobuf::internal::DuplicateIfNonNull(released);
-  if (GetArena() == nullptr) {
-    delete old;
-  }
-#else   // PROTOBUF_FORCE_COPY_IN_RELEASE
-  if (GetArena() != nullptr) {
-    released = ::google::protobuf::internal::DuplicateIfNonNull(released);
-  }
-#endif  // !PROTOBUF_FORCE_COPY_IN_RELEASE
-  return released;
-}
-inline ::io::deephaven::proto::backplane::grpc::Ticket* StartConsoleResponse::unsafe_arena_release_result_id() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  // @@protoc_insertion_point(field_release:io.deephaven.proto.backplane.script.grpc.StartConsoleResponse.result_id)
-
-  _impl_._has_bits_[0] &= ~0x00000001u;
-  ::io::deephaven::proto::backplane::grpc::Ticket* temp = _impl_.result_id_;
-  _impl_.result_id_ = nullptr;
-  return temp;
-}
-inline ::io::deephaven::proto::backplane::grpc::Ticket* StartConsoleResponse::_internal_mutable_result_id() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  _impl_._has_bits_[0] |= 0x00000001u;
-  if (_impl_.result_id_ == nullptr) {
-    auto* p = CreateMaybeMessage<::io::deephaven::proto::backplane::grpc::Ticket>(GetArena());
-    _impl_.result_id_ = reinterpret_cast<::io::deephaven::proto::backplane::grpc::Ticket*>(p);
-  }
-  return _impl_.result_id_;
-}
-inline ::io::deephaven::proto::backplane::grpc::Ticket* StartConsoleResponse::mutable_result_id() ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  ::io::deephaven::proto::backplane::grpc::Ticket* _msg = _internal_mutable_result_id();
-  // @@protoc_insertion_point(field_mutable:io.deephaven.proto.backplane.script.grpc.StartConsoleResponse.result_id)
-  return _msg;
-}
-inline void StartConsoleResponse::set_allocated_result_id(::io::deephaven::proto::backplane::grpc::Ticket* value) {
-  ::google::protobuf::Arena* message_arena = GetArena();
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  if (message_arena == nullptr) {
-    delete reinterpret_cast<::google::protobuf::MessageLite*>(_impl_.result_id_);
-  }
-
-  if (value != nullptr) {
-    ::google::protobuf::Arena* submessage_arena = reinterpret_cast<::google::protobuf::MessageLite*>(value)->GetArena();
-    if (message_arena != submessage_arena) {
-      value = ::google::protobuf::internal::GetOwnedMessage(message_arena, value, submessage_arena);
-    }
-    _impl_._has_bits_[0] |= 0x00000001u;
-  } else {
-    _impl_._has_bits_[0] &= ~0x00000001u;
-  }
-
-  _impl_.result_id_ = reinterpret_cast<::io::deephaven::proto::backplane::grpc::Ticket*>(value);
-  // @@protoc_insertion_point(field_set_allocated:io.deephaven.proto.backplane.script.grpc.StartConsoleResponse.result_id)
-}
-
-// -------------------------------------------------------------------
-
-// GetHeapInfoRequest
-
-// -------------------------------------------------------------------
-
-// GetHeapInfoResponse
-
-// int64 max_memory = 1 [jstype = JS_STRING];
-inline void GetHeapInfoResponse::clear_max_memory() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  _impl_.max_memory_ = ::int64_t{0};
-}
-inline ::int64_t GetHeapInfoResponse::max_memory() const {
-  // @@protoc_insertion_point(field_get:io.deephaven.proto.backplane.script.grpc.GetHeapInfoResponse.max_memory)
-  return _internal_max_memory();
-}
-inline void GetHeapInfoResponse::set_max_memory(::int64_t value) {
-  _internal_set_max_memory(value);
-  // @@protoc_insertion_point(field_set:io.deephaven.proto.backplane.script.grpc.GetHeapInfoResponse.max_memory)
-}
-inline ::int64_t GetHeapInfoResponse::_internal_max_memory() const {
-  PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race);
-  return _impl_.max_memory_;
-}
-inline void GetHeapInfoResponse::_internal_set_max_memory(::int64_t value) {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  ;
-  _impl_.max_memory_ = value;
-}
-
-// int64 total_memory = 2 [jstype = JS_STRING];
-inline void GetHeapInfoResponse::clear_total_memory() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  _impl_.total_memory_ = ::int64_t{0};
-}
-inline ::int64_t GetHeapInfoResponse::total_memory() const {
-  // @@protoc_insertion_point(field_get:io.deephaven.proto.backplane.script.grpc.GetHeapInfoResponse.total_memory)
-  return _internal_total_memory();
-}
-inline void GetHeapInfoResponse::set_total_memory(::int64_t value) {
-  _internal_set_total_memory(value);
-  // @@protoc_insertion_point(field_set:io.deephaven.proto.backplane.script.grpc.GetHeapInfoResponse.total_memory)
-}
-inline ::int64_t GetHeapInfoResponse::_internal_total_memory() const {
-  PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race);
-  return _impl_.total_memory_;
-}
-inline void GetHeapInfoResponse::_internal_set_total_memory(::int64_t value) {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  ;
-  _impl_.total_memory_ = value;
-}
-
-// int64 free_memory = 3 [jstype = JS_STRING];
-inline void GetHeapInfoResponse::clear_free_memory() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  _impl_.free_memory_ = ::int64_t{0};
-}
-inline ::int64_t GetHeapInfoResponse::free_memory() const {
-  // @@protoc_insertion_point(field_get:io.deephaven.proto.backplane.script.grpc.GetHeapInfoResponse.free_memory)
-  return _internal_free_memory();
-}
-inline void GetHeapInfoResponse::set_free_memory(::int64_t value) {
-  _internal_set_free_memory(value);
-  // @@protoc_insertion_point(field_set:io.deephaven.proto.backplane.script.grpc.GetHeapInfoResponse.free_memory)
-}
-inline ::int64_t GetHeapInfoResponse::_internal_free_memory() const {
-  PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race);
-  return _impl_.free_memory_;
-}
-inline void GetHeapInfoResponse::_internal_set_free_memory(::int64_t value) {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  ;
-  _impl_.free_memory_ = value;
-}
-
-// -------------------------------------------------------------------
-
-// LogSubscriptionRequest
-
-// int64 last_seen_log_timestamp = 1 [jstype = JS_STRING];
-inline void LogSubscriptionRequest::clear_last_seen_log_timestamp() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  _impl_.last_seen_log_timestamp_ = ::int64_t{0};
-}
-inline ::int64_t LogSubscriptionRequest::last_seen_log_timestamp() const {
-  // @@protoc_insertion_point(field_get:io.deephaven.proto.backplane.script.grpc.LogSubscriptionRequest.last_seen_log_timestamp)
-  return _internal_last_seen_log_timestamp();
-}
-inline void LogSubscriptionRequest::set_last_seen_log_timestamp(::int64_t value) {
-  _internal_set_last_seen_log_timestamp(value);
-  // @@protoc_insertion_point(field_set:io.deephaven.proto.backplane.script.grpc.LogSubscriptionRequest.last_seen_log_timestamp)
-}
-inline ::int64_t LogSubscriptionRequest::_internal_last_seen_log_timestamp() const {
-  PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race);
-  return _impl_.last_seen_log_timestamp_;
-}
-inline void LogSubscriptionRequest::_internal_set_last_seen_log_timestamp(::int64_t value) {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  ;
-  _impl_.last_seen_log_timestamp_ = value;
-}
-
-// repeated string levels = 2;
-inline int LogSubscriptionRequest::_internal_levels_size() const {
-  return _internal_levels().size();
-}
-inline int LogSubscriptionRequest::levels_size() const {
-  return _internal_levels_size();
-}
-inline void LogSubscriptionRequest::clear_levels() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  _impl_.levels_.Clear();
-}
-inline std::string* LogSubscriptionRequest::add_levels()
-    ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  std::string* _s = _internal_mutable_levels()->Add();
-  // @@protoc_insertion_point(field_add_mutable:io.deephaven.proto.backplane.script.grpc.LogSubscriptionRequest.levels)
-  return _s;
-}
-inline const std::string& LogSubscriptionRequest::levels(int index) const
-    ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  // @@protoc_insertion_point(field_get:io.deephaven.proto.backplane.script.grpc.LogSubscriptionRequest.levels)
-  return _internal_levels().Get(index);
-}
-inline std::string* LogSubscriptionRequest::mutable_levels(int index)
-    ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  // @@protoc_insertion_point(field_mutable:io.deephaven.proto.backplane.script.grpc.LogSubscriptionRequest.levels)
-  return _internal_mutable_levels()->Mutable(index);
-}
-inline void LogSubscriptionRequest::set_levels(int index, const std::string& value) {
-  _internal_mutable_levels()->Mutable(index)->assign(value);
-  // @@protoc_insertion_point(field_set:io.deephaven.proto.backplane.script.grpc.LogSubscriptionRequest.levels)
-}
-inline void LogSubscriptionRequest::set_levels(int index, std::string&& value) {
-  _internal_mutable_levels()->Mutable(index)->assign(std::move(value));
-  // @@protoc_insertion_point(field_set:io.deephaven.proto.backplane.script.grpc.LogSubscriptionRequest.levels)
-}
-inline void LogSubscriptionRequest::set_levels(int index, const char* value) {
-  ABSL_DCHECK(value != nullptr);
-  _internal_mutable_levels()->Mutable(index)->assign(value);
-  // @@protoc_insertion_point(field_set_char:io.deephaven.proto.backplane.script.grpc.LogSubscriptionRequest.levels)
-}
-inline void LogSubscriptionRequest::set_levels(int index, const char* value,
-                              std::size_t size) {
-  _internal_mutable_levels()->Mutable(index)->assign(
-      reinterpret_cast<const char*>(value), size);
-  // @@protoc_insertion_point(field_set_pointer:io.deephaven.proto.backplane.script.grpc.LogSubscriptionRequest.levels)
-}
-inline void LogSubscriptionRequest::set_levels(int index, absl::string_view value) {
-  _internal_mutable_levels()->Mutable(index)->assign(value.data(),
-                                                     value.size());
-  // @@protoc_insertion_point(field_set_string_piece:io.deephaven.proto.backplane.script.grpc.LogSubscriptionRequest.levels)
-}
-inline void LogSubscriptionRequest::add_levels(const std::string& value) {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  _internal_mutable_levels()->Add()->assign(value);
-  // @@protoc_insertion_point(field_add:io.deephaven.proto.backplane.script.grpc.LogSubscriptionRequest.levels)
-}
-inline void LogSubscriptionRequest::add_levels(std::string&& value) {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  _internal_mutable_levels()->Add(std::move(value));
-  // @@protoc_insertion_point(field_add:io.deephaven.proto.backplane.script.grpc.LogSubscriptionRequest.levels)
-}
-inline void LogSubscriptionRequest::add_levels(const char* value) {
-  ABSL_DCHECK(value != nullptr);
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  _internal_mutable_levels()->Add()->assign(value);
-  // @@protoc_insertion_point(field_add_char:io.deephaven.proto.backplane.script.grpc.LogSubscriptionRequest.levels)
-}
-inline void LogSubscriptionRequest::add_levels(const char* value, std::size_t size) {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  _internal_mutable_levels()->Add()->assign(
-      reinterpret_cast<const char*>(value), size);
-  // @@protoc_insertion_point(field_add_pointer:io.deephaven.proto.backplane.script.grpc.LogSubscriptionRequest.levels)
-}
-inline void LogSubscriptionRequest::add_levels(absl::string_view value) {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  _internal_mutable_levels()->Add()->assign(value.data(), value.size());
-  // @@protoc_insertion_point(field_add_string_piece:io.deephaven.proto.backplane.script.grpc.LogSubscriptionRequest.levels)
-}
-inline const ::google::protobuf::RepeatedPtrField<std::string>&
-LogSubscriptionRequest::levels() const ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  // @@protoc_insertion_point(field_list:io.deephaven.proto.backplane.script.grpc.LogSubscriptionRequest.levels)
-  return _internal_levels();
-}
-inline ::google::protobuf::RepeatedPtrField<std::string>*
-LogSubscriptionRequest::mutable_levels() ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  // @@protoc_insertion_point(field_mutable_list:io.deephaven.proto.backplane.script.grpc.LogSubscriptionRequest.levels)
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  return _internal_mutable_levels();
-}
-inline const ::google::protobuf::RepeatedPtrField<std::string>&
-LogSubscriptionRequest::_internal_levels() const {
-  PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race);
-  return _impl_.levels_;
-}
-inline ::google::protobuf::RepeatedPtrField<std::string>*
-LogSubscriptionRequest::_internal_mutable_levels() {
-  PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race);
-  return &_impl_.levels_;
-}
-
-// -------------------------------------------------------------------
-
-// LogSubscriptionData
-
-// int64 micros = 1 [jstype = JS_STRING];
-inline void LogSubscriptionData::clear_micros() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  _impl_.micros_ = ::int64_t{0};
-}
-inline ::int64_t LogSubscriptionData::micros() const {
-  // @@protoc_insertion_point(field_get:io.deephaven.proto.backplane.script.grpc.LogSubscriptionData.micros)
-  return _internal_micros();
-}
-inline void LogSubscriptionData::set_micros(::int64_t value) {
-  _internal_set_micros(value);
-  // @@protoc_insertion_point(field_set:io.deephaven.proto.backplane.script.grpc.LogSubscriptionData.micros)
-}
-inline ::int64_t LogSubscriptionData::_internal_micros() const {
-  PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race);
-  return _impl_.micros_;
-}
-inline void LogSubscriptionData::_internal_set_micros(::int64_t value) {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  ;
-  _impl_.micros_ = value;
-}
-
-// string log_level = 2;
-inline void LogSubscriptionData::clear_log_level() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  _impl_.log_level_.ClearToEmpty();
-}
-inline const std::string& LogSubscriptionData::log_level() const
-    ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  // @@protoc_insertion_point(field_get:io.deephaven.proto.backplane.script.grpc.LogSubscriptionData.log_level)
-  return _internal_log_level();
-}
-template <typename Arg_, typename... Args_>
-inline PROTOBUF_ALWAYS_INLINE void LogSubscriptionData::set_log_level(Arg_&& arg,
-                                                     Args_... args) {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  ;
-  _impl_.log_level_.Set(static_cast<Arg_&&>(arg), args..., GetArena());
-  // @@protoc_insertion_point(field_set:io.deephaven.proto.backplane.script.grpc.LogSubscriptionData.log_level)
-}
-inline std::string* LogSubscriptionData::mutable_log_level() ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  std::string* _s = _internal_mutable_log_level();
-  // @@protoc_insertion_point(field_mutable:io.deephaven.proto.backplane.script.grpc.LogSubscriptionData.log_level)
-  return _s;
-}
-inline const std::string& LogSubscriptionData::_internal_log_level() const {
-  PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race);
-  return _impl_.log_level_.Get();
-}
-inline void LogSubscriptionData::_internal_set_log_level(const std::string& value) {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  ;
-  _impl_.log_level_.Set(value, GetArena());
-}
-inline std::string* LogSubscriptionData::_internal_mutable_log_level() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  ;
-  return _impl_.log_level_.Mutable( GetArena());
-}
-inline std::string* LogSubscriptionData::release_log_level() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  // @@protoc_insertion_point(field_release:io.deephaven.proto.backplane.script.grpc.LogSubscriptionData.log_level)
-  return _impl_.log_level_.Release();
-}
-inline void LogSubscriptionData::set_allocated_log_level(std::string* value) {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  _impl_.log_level_.SetAllocated(value, GetArena());
-  #ifdef PROTOBUF_FORCE_COPY_DEFAULT_STRING
-        if (_impl_.log_level_.IsDefault()) {
-          _impl_.log_level_.Set("", GetArena());
-        }
-  #endif  // PROTOBUF_FORCE_COPY_DEFAULT_STRING
-  // @@protoc_insertion_point(field_set_allocated:io.deephaven.proto.backplane.script.grpc.LogSubscriptionData.log_level)
-}
-
-// string message = 3;
-inline void LogSubscriptionData::clear_message() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  _impl_.message_.ClearToEmpty();
-}
-inline const std::string& LogSubscriptionData::message() const
-    ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  // @@protoc_insertion_point(field_get:io.deephaven.proto.backplane.script.grpc.LogSubscriptionData.message)
-  return _internal_message();
-}
-template <typename Arg_, typename... Args_>
-inline PROTOBUF_ALWAYS_INLINE void LogSubscriptionData::set_message(Arg_&& arg,
-                                                     Args_... args) {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  ;
-  _impl_.message_.Set(static_cast<Arg_&&>(arg), args..., GetArena());
-  // @@protoc_insertion_point(field_set:io.deephaven.proto.backplane.script.grpc.LogSubscriptionData.message)
-}
-inline std::string* LogSubscriptionData::mutable_message() ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  std::string* _s = _internal_mutable_message();
-  // @@protoc_insertion_point(field_mutable:io.deephaven.proto.backplane.script.grpc.LogSubscriptionData.message)
-  return _s;
-}
-inline const std::string& LogSubscriptionData::_internal_message() const {
-  PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race);
-  return _impl_.message_.Get();
-}
-inline void LogSubscriptionData::_internal_set_message(const std::string& value) {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  ;
-  _impl_.message_.Set(value, GetArena());
-}
-inline std::string* LogSubscriptionData::_internal_mutable_message() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  ;
-  return _impl_.message_.Mutable( GetArena());
-}
-inline std::string* LogSubscriptionData::release_message() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  // @@protoc_insertion_point(field_release:io.deephaven.proto.backplane.script.grpc.LogSubscriptionData.message)
-  return _impl_.message_.Release();
-}
-inline void LogSubscriptionData::set_allocated_message(std::string* value) {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  _impl_.message_.SetAllocated(value, GetArena());
-  #ifdef PROTOBUF_FORCE_COPY_DEFAULT_STRING
-        if (_impl_.message_.IsDefault()) {
-          _impl_.message_.Set("", GetArena());
-        }
-  #endif  // PROTOBUF_FORCE_COPY_DEFAULT_STRING
-  // @@protoc_insertion_point(field_set_allocated:io.deephaven.proto.backplane.script.grpc.LogSubscriptionData.message)
-}
-
-// -------------------------------------------------------------------
-
-// ExecuteCommandRequest
-
-// .io.deephaven.proto.backplane.grpc.Ticket console_id = 1;
-inline bool ExecuteCommandRequest::has_console_id() const {
-  bool value = (_impl_._has_bits_[0] & 0x00000001u) != 0;
-  PROTOBUF_ASSUME(!value || _impl_.console_id_ != nullptr);
-  return value;
-}
-inline const ::io::deephaven::proto::backplane::grpc::Ticket& ExecuteCommandRequest::_internal_console_id() const {
-  PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race);
-  const ::io::deephaven::proto::backplane::grpc::Ticket* p = _impl_.console_id_;
-  return p != nullptr ? *p : reinterpret_cast<const ::io::deephaven::proto::backplane::grpc::Ticket&>(::io::deephaven::proto::backplane::grpc::_Ticket_default_instance_);
-}
-inline const ::io::deephaven::proto::backplane::grpc::Ticket& ExecuteCommandRequest::console_id() const ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  // @@protoc_insertion_point(field_get:io.deephaven.proto.backplane.script.grpc.ExecuteCommandRequest.console_id)
-  return _internal_console_id();
-}
-inline void ExecuteCommandRequest::unsafe_arena_set_allocated_console_id(::io::deephaven::proto::backplane::grpc::Ticket* value) {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  if (GetArena() == nullptr) {
-    delete reinterpret_cast<::google::protobuf::MessageLite*>(_impl_.console_id_);
-  }
-  _impl_.console_id_ = reinterpret_cast<::io::deephaven::proto::backplane::grpc::Ticket*>(value);
-  if (value != nullptr) {
-    _impl_._has_bits_[0] |= 0x00000001u;
-  } else {
-    _impl_._has_bits_[0] &= ~0x00000001u;
-  }
-  // @@protoc_insertion_point(field_unsafe_arena_set_allocated:io.deephaven.proto.backplane.script.grpc.ExecuteCommandRequest.console_id)
-}
-inline ::io::deephaven::proto::backplane::grpc::Ticket* ExecuteCommandRequest::release_console_id() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-
-  _impl_._has_bits_[0] &= ~0x00000001u;
-  ::io::deephaven::proto::backplane::grpc::Ticket* released = _impl_.console_id_;
-  _impl_.console_id_ = nullptr;
-#ifdef PROTOBUF_FORCE_COPY_IN_RELEASE
-  auto* old = reinterpret_cast<::google::protobuf::MessageLite*>(released);
-  released = ::google::protobuf::internal::DuplicateIfNonNull(released);
-  if (GetArena() == nullptr) {
-    delete old;
-  }
-#else   // PROTOBUF_FORCE_COPY_IN_RELEASE
-  if (GetArena() != nullptr) {
-    released = ::google::protobuf::internal::DuplicateIfNonNull(released);
-  }
-#endif  // !PROTOBUF_FORCE_COPY_IN_RELEASE
-  return released;
-}
-inline ::io::deephaven::proto::backplane::grpc::Ticket* ExecuteCommandRequest::unsafe_arena_release_console_id() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  // @@protoc_insertion_point(field_release:io.deephaven.proto.backplane.script.grpc.ExecuteCommandRequest.console_id)
-
-  _impl_._has_bits_[0] &= ~0x00000001u;
-  ::io::deephaven::proto::backplane::grpc::Ticket* temp = _impl_.console_id_;
-  _impl_.console_id_ = nullptr;
-  return temp;
-}
-inline ::io::deephaven::proto::backplane::grpc::Ticket* ExecuteCommandRequest::_internal_mutable_console_id() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  _impl_._has_bits_[0] |= 0x00000001u;
-  if (_impl_.console_id_ == nullptr) {
-    auto* p = CreateMaybeMessage<::io::deephaven::proto::backplane::grpc::Ticket>(GetArena());
-    _impl_.console_id_ = reinterpret_cast<::io::deephaven::proto::backplane::grpc::Ticket*>(p);
-  }
-  return _impl_.console_id_;
-}
-inline ::io::deephaven::proto::backplane::grpc::Ticket* ExecuteCommandRequest::mutable_console_id() ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  ::io::deephaven::proto::backplane::grpc::Ticket* _msg = _internal_mutable_console_id();
-  // @@protoc_insertion_point(field_mutable:io.deephaven.proto.backplane.script.grpc.ExecuteCommandRequest.console_id)
-  return _msg;
-}
-inline void ExecuteCommandRequest::set_allocated_console_id(::io::deephaven::proto::backplane::grpc::Ticket* value) {
-  ::google::protobuf::Arena* message_arena = GetArena();
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  if (message_arena == nullptr) {
-    delete reinterpret_cast<::google::protobuf::MessageLite*>(_impl_.console_id_);
-  }
-
-  if (value != nullptr) {
-    ::google::protobuf::Arena* submessage_arena = reinterpret_cast<::google::protobuf::MessageLite*>(value)->GetArena();
-    if (message_arena != submessage_arena) {
-      value = ::google::protobuf::internal::GetOwnedMessage(message_arena, value, submessage_arena);
-    }
-    _impl_._has_bits_[0] |= 0x00000001u;
-  } else {
-    _impl_._has_bits_[0] &= ~0x00000001u;
-  }
-
-  _impl_.console_id_ = reinterpret_cast<::io::deephaven::proto::backplane::grpc::Ticket*>(value);
-  // @@protoc_insertion_point(field_set_allocated:io.deephaven.proto.backplane.script.grpc.ExecuteCommandRequest.console_id)
-}
-
-// string code = 3;
-inline void ExecuteCommandRequest::clear_code() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  _impl_.code_.ClearToEmpty();
-}
-inline const std::string& ExecuteCommandRequest::code() const
-    ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  // @@protoc_insertion_point(field_get:io.deephaven.proto.backplane.script.grpc.ExecuteCommandRequest.code)
-  return _internal_code();
-}
-template <typename Arg_, typename... Args_>
-inline PROTOBUF_ALWAYS_INLINE void ExecuteCommandRequest::set_code(Arg_&& arg,
-                                                     Args_... args) {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  ;
-  _impl_.code_.Set(static_cast<Arg_&&>(arg), args..., GetArena());
-  // @@protoc_insertion_point(field_set:io.deephaven.proto.backplane.script.grpc.ExecuteCommandRequest.code)
-}
-inline std::string* ExecuteCommandRequest::mutable_code() ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  std::string* _s = _internal_mutable_code();
-  // @@protoc_insertion_point(field_mutable:io.deephaven.proto.backplane.script.grpc.ExecuteCommandRequest.code)
-  return _s;
-}
-inline const std::string& ExecuteCommandRequest::_internal_code() const {
-  PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race);
-  return _impl_.code_.Get();
-}
-inline void ExecuteCommandRequest::_internal_set_code(const std::string& value) {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  ;
-  _impl_.code_.Set(value, GetArena());
-}
-inline std::string* ExecuteCommandRequest::_internal_mutable_code() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  ;
-  return _impl_.code_.Mutable( GetArena());
-}
-inline std::string* ExecuteCommandRequest::release_code() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  // @@protoc_insertion_point(field_release:io.deephaven.proto.backplane.script.grpc.ExecuteCommandRequest.code)
-  return _impl_.code_.Release();
-}
-inline void ExecuteCommandRequest::set_allocated_code(std::string* value) {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  _impl_.code_.SetAllocated(value, GetArena());
-  #ifdef PROTOBUF_FORCE_COPY_DEFAULT_STRING
-        if (_impl_.code_.IsDefault()) {
-          _impl_.code_.Set("", GetArena());
-        }
-  #endif  // PROTOBUF_FORCE_COPY_DEFAULT_STRING
-  // @@protoc_insertion_point(field_set_allocated:io.deephaven.proto.backplane.script.grpc.ExecuteCommandRequest.code)
-}
-
-// -------------------------------------------------------------------
-
-// ExecuteCommandResponse
-
-// string error_message = 1;
-inline void ExecuteCommandResponse::clear_error_message() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  _impl_.error_message_.ClearToEmpty();
-}
-inline const std::string& ExecuteCommandResponse::error_message() const
-    ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  // @@protoc_insertion_point(field_get:io.deephaven.proto.backplane.script.grpc.ExecuteCommandResponse.error_message)
-  return _internal_error_message();
-}
-template <typename Arg_, typename... Args_>
-inline PROTOBUF_ALWAYS_INLINE void ExecuteCommandResponse::set_error_message(Arg_&& arg,
-                                                     Args_... args) {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  ;
-  _impl_.error_message_.Set(static_cast<Arg_&&>(arg), args..., GetArena());
-  // @@protoc_insertion_point(field_set:io.deephaven.proto.backplane.script.grpc.ExecuteCommandResponse.error_message)
-}
-inline std::string* ExecuteCommandResponse::mutable_error_message() ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  std::string* _s = _internal_mutable_error_message();
-  // @@protoc_insertion_point(field_mutable:io.deephaven.proto.backplane.script.grpc.ExecuteCommandResponse.error_message)
-  return _s;
-}
-inline const std::string& ExecuteCommandResponse::_internal_error_message() const {
-  PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race);
-  return _impl_.error_message_.Get();
-}
-inline void ExecuteCommandResponse::_internal_set_error_message(const std::string& value) {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  ;
-  _impl_.error_message_.Set(value, GetArena());
-}
-inline std::string* ExecuteCommandResponse::_internal_mutable_error_message() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  ;
-  return _impl_.error_message_.Mutable( GetArena());
-}
-inline std::string* ExecuteCommandResponse::release_error_message() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  // @@protoc_insertion_point(field_release:io.deephaven.proto.backplane.script.grpc.ExecuteCommandResponse.error_message)
-  return _impl_.error_message_.Release();
-}
-inline void ExecuteCommandResponse::set_allocated_error_message(std::string* value) {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  _impl_.error_message_.SetAllocated(value, GetArena());
-  #ifdef PROTOBUF_FORCE_COPY_DEFAULT_STRING
-        if (_impl_.error_message_.IsDefault()) {
-          _impl_.error_message_.Set("", GetArena());
-        }
-  #endif  // PROTOBUF_FORCE_COPY_DEFAULT_STRING
-  // @@protoc_insertion_point(field_set_allocated:io.deephaven.proto.backplane.script.grpc.ExecuteCommandResponse.error_message)
-}
-
-// .io.deephaven.proto.backplane.grpc.FieldsChangeUpdate changes = 2;
-inline bool ExecuteCommandResponse::has_changes() const {
-  bool value = (_impl_._has_bits_[0] & 0x00000001u) != 0;
-  PROTOBUF_ASSUME(!value || _impl_.changes_ != nullptr);
-  return value;
-}
-inline const ::io::deephaven::proto::backplane::grpc::FieldsChangeUpdate& ExecuteCommandResponse::_internal_changes() const {
-  PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race);
-  const ::io::deephaven::proto::backplane::grpc::FieldsChangeUpdate* p = _impl_.changes_;
-  return p != nullptr ? *p : reinterpret_cast<const ::io::deephaven::proto::backplane::grpc::FieldsChangeUpdate&>(::io::deephaven::proto::backplane::grpc::_FieldsChangeUpdate_default_instance_);
-}
-inline const ::io::deephaven::proto::backplane::grpc::FieldsChangeUpdate& ExecuteCommandResponse::changes() const ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  // @@protoc_insertion_point(field_get:io.deephaven.proto.backplane.script.grpc.ExecuteCommandResponse.changes)
-  return _internal_changes();
-}
-inline void ExecuteCommandResponse::unsafe_arena_set_allocated_changes(::io::deephaven::proto::backplane::grpc::FieldsChangeUpdate* value) {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  if (GetArena() == nullptr) {
-    delete reinterpret_cast<::google::protobuf::MessageLite*>(_impl_.changes_);
-  }
-  _impl_.changes_ = reinterpret_cast<::io::deephaven::proto::backplane::grpc::FieldsChangeUpdate*>(value);
-  if (value != nullptr) {
-    _impl_._has_bits_[0] |= 0x00000001u;
-  } else {
-    _impl_._has_bits_[0] &= ~0x00000001u;
-  }
-  // @@protoc_insertion_point(field_unsafe_arena_set_allocated:io.deephaven.proto.backplane.script.grpc.ExecuteCommandResponse.changes)
-}
-inline ::io::deephaven::proto::backplane::grpc::FieldsChangeUpdate* ExecuteCommandResponse::release_changes() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-
-  _impl_._has_bits_[0] &= ~0x00000001u;
-  ::io::deephaven::proto::backplane::grpc::FieldsChangeUpdate* released = _impl_.changes_;
-  _impl_.changes_ = nullptr;
-#ifdef PROTOBUF_FORCE_COPY_IN_RELEASE
-  auto* old = reinterpret_cast<::google::protobuf::MessageLite*>(released);
-  released = ::google::protobuf::internal::DuplicateIfNonNull(released);
-  if (GetArena() == nullptr) {
-    delete old;
-  }
-#else   // PROTOBUF_FORCE_COPY_IN_RELEASE
-  if (GetArena() != nullptr) {
-    released = ::google::protobuf::internal::DuplicateIfNonNull(released);
-  }
-#endif  // !PROTOBUF_FORCE_COPY_IN_RELEASE
-  return released;
-}
-inline ::io::deephaven::proto::backplane::grpc::FieldsChangeUpdate* ExecuteCommandResponse::unsafe_arena_release_changes() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  // @@protoc_insertion_point(field_release:io.deephaven.proto.backplane.script.grpc.ExecuteCommandResponse.changes)
-
-  _impl_._has_bits_[0] &= ~0x00000001u;
-  ::io::deephaven::proto::backplane::grpc::FieldsChangeUpdate* temp = _impl_.changes_;
-  _impl_.changes_ = nullptr;
-  return temp;
-}
-inline ::io::deephaven::proto::backplane::grpc::FieldsChangeUpdate* ExecuteCommandResponse::_internal_mutable_changes() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  _impl_._has_bits_[0] |= 0x00000001u;
-  if (_impl_.changes_ == nullptr) {
-    auto* p = CreateMaybeMessage<::io::deephaven::proto::backplane::grpc::FieldsChangeUpdate>(GetArena());
-    _impl_.changes_ = reinterpret_cast<::io::deephaven::proto::backplane::grpc::FieldsChangeUpdate*>(p);
-  }
-  return _impl_.changes_;
-}
-inline ::io::deephaven::proto::backplane::grpc::FieldsChangeUpdate* ExecuteCommandResponse::mutable_changes() ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  ::io::deephaven::proto::backplane::grpc::FieldsChangeUpdate* _msg = _internal_mutable_changes();
-  // @@protoc_insertion_point(field_mutable:io.deephaven.proto.backplane.script.grpc.ExecuteCommandResponse.changes)
-  return _msg;
-}
-inline void ExecuteCommandResponse::set_allocated_changes(::io::deephaven::proto::backplane::grpc::FieldsChangeUpdate* value) {
-  ::google::protobuf::Arena* message_arena = GetArena();
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  if (message_arena == nullptr) {
-    delete reinterpret_cast<::google::protobuf::MessageLite*>(_impl_.changes_);
-  }
-
-  if (value != nullptr) {
-    ::google::protobuf::Arena* submessage_arena = reinterpret_cast<::google::protobuf::MessageLite*>(value)->GetArena();
-    if (message_arena != submessage_arena) {
-      value = ::google::protobuf::internal::GetOwnedMessage(message_arena, value, submessage_arena);
-    }
-    _impl_._has_bits_[0] |= 0x00000001u;
-  } else {
-    _impl_._has_bits_[0] &= ~0x00000001u;
-  }
-
-  _impl_.changes_ = reinterpret_cast<::io::deephaven::proto::backplane::grpc::FieldsChangeUpdate*>(value);
-  // @@protoc_insertion_point(field_set_allocated:io.deephaven.proto.backplane.script.grpc.ExecuteCommandResponse.changes)
-}
-
-// -------------------------------------------------------------------
-
-// BindTableToVariableRequest
-
-// .io.deephaven.proto.backplane.grpc.Ticket console_id = 1;
-inline bool BindTableToVariableRequest::has_console_id() const {
-  bool value = (_impl_._has_bits_[0] & 0x00000001u) != 0;
-  PROTOBUF_ASSUME(!value || _impl_.console_id_ != nullptr);
-  return value;
-}
-inline const ::io::deephaven::proto::backplane::grpc::Ticket& BindTableToVariableRequest::_internal_console_id() const {
-  PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race);
-  const ::io::deephaven::proto::backplane::grpc::Ticket* p = _impl_.console_id_;
-  return p != nullptr ? *p : reinterpret_cast<const ::io::deephaven::proto::backplane::grpc::Ticket&>(::io::deephaven::proto::backplane::grpc::_Ticket_default_instance_);
-}
-inline const ::io::deephaven::proto::backplane::grpc::Ticket& BindTableToVariableRequest::console_id() const ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  // @@protoc_insertion_point(field_get:io.deephaven.proto.backplane.script.grpc.BindTableToVariableRequest.console_id)
-  return _internal_console_id();
-}
-inline void BindTableToVariableRequest::unsafe_arena_set_allocated_console_id(::io::deephaven::proto::backplane::grpc::Ticket* value) {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  if (GetArena() == nullptr) {
-    delete reinterpret_cast<::google::protobuf::MessageLite*>(_impl_.console_id_);
-  }
-  _impl_.console_id_ = reinterpret_cast<::io::deephaven::proto::backplane::grpc::Ticket*>(value);
-  if (value != nullptr) {
-    _impl_._has_bits_[0] |= 0x00000001u;
-  } else {
-    _impl_._has_bits_[0] &= ~0x00000001u;
-  }
-  // @@protoc_insertion_point(field_unsafe_arena_set_allocated:io.deephaven.proto.backplane.script.grpc.BindTableToVariableRequest.console_id)
-}
-inline ::io::deephaven::proto::backplane::grpc::Ticket* BindTableToVariableRequest::release_console_id() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-
-  _impl_._has_bits_[0] &= ~0x00000001u;
-  ::io::deephaven::proto::backplane::grpc::Ticket* released = _impl_.console_id_;
-  _impl_.console_id_ = nullptr;
-#ifdef PROTOBUF_FORCE_COPY_IN_RELEASE
-  auto* old = reinterpret_cast<::google::protobuf::MessageLite*>(released);
-  released = ::google::protobuf::internal::DuplicateIfNonNull(released);
-  if (GetArena() == nullptr) {
-    delete old;
-  }
-#else   // PROTOBUF_FORCE_COPY_IN_RELEASE
-  if (GetArena() != nullptr) {
-    released = ::google::protobuf::internal::DuplicateIfNonNull(released);
-  }
-#endif  // !PROTOBUF_FORCE_COPY_IN_RELEASE
-  return released;
-}
-inline ::io::deephaven::proto::backplane::grpc::Ticket* BindTableToVariableRequest::unsafe_arena_release_console_id() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  // @@protoc_insertion_point(field_release:io.deephaven.proto.backplane.script.grpc.BindTableToVariableRequest.console_id)
-
-  _impl_._has_bits_[0] &= ~0x00000001u;
-  ::io::deephaven::proto::backplane::grpc::Ticket* temp = _impl_.console_id_;
-  _impl_.console_id_ = nullptr;
-  return temp;
-}
-inline ::io::deephaven::proto::backplane::grpc::Ticket* BindTableToVariableRequest::_internal_mutable_console_id() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  _impl_._has_bits_[0] |= 0x00000001u;
-  if (_impl_.console_id_ == nullptr) {
-    auto* p = CreateMaybeMessage<::io::deephaven::proto::backplane::grpc::Ticket>(GetArena());
-    _impl_.console_id_ = reinterpret_cast<::io::deephaven::proto::backplane::grpc::Ticket*>(p);
-  }
-  return _impl_.console_id_;
-}
-inline ::io::deephaven::proto::backplane::grpc::Ticket* BindTableToVariableRequest::mutable_console_id() ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  ::io::deephaven::proto::backplane::grpc::Ticket* _msg = _internal_mutable_console_id();
-  // @@protoc_insertion_point(field_mutable:io.deephaven.proto.backplane.script.grpc.BindTableToVariableRequest.console_id)
-  return _msg;
-}
-inline void BindTableToVariableRequest::set_allocated_console_id(::io::deephaven::proto::backplane::grpc::Ticket* value) {
-  ::google::protobuf::Arena* message_arena = GetArena();
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  if (message_arena == nullptr) {
-    delete reinterpret_cast<::google::protobuf::MessageLite*>(_impl_.console_id_);
-  }
-
-  if (value != nullptr) {
-    ::google::protobuf::Arena* submessage_arena = reinterpret_cast<::google::protobuf::MessageLite*>(value)->GetArena();
-    if (message_arena != submessage_arena) {
-      value = ::google::protobuf::internal::GetOwnedMessage(message_arena, value, submessage_arena);
-    }
-    _impl_._has_bits_[0] |= 0x00000001u;
-  } else {
-    _impl_._has_bits_[0] &= ~0x00000001u;
-  }
-
-  _impl_.console_id_ = reinterpret_cast<::io::deephaven::proto::backplane::grpc::Ticket*>(value);
-  // @@protoc_insertion_point(field_set_allocated:io.deephaven.proto.backplane.script.grpc.BindTableToVariableRequest.console_id)
-}
-
-// string variable_name = 3;
-inline void BindTableToVariableRequest::clear_variable_name() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  _impl_.variable_name_.ClearToEmpty();
-}
-inline const std::string& BindTableToVariableRequest::variable_name() const
-    ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  // @@protoc_insertion_point(field_get:io.deephaven.proto.backplane.script.grpc.BindTableToVariableRequest.variable_name)
-  return _internal_variable_name();
-}
-template <typename Arg_, typename... Args_>
-inline PROTOBUF_ALWAYS_INLINE void BindTableToVariableRequest::set_variable_name(Arg_&& arg,
-                                                     Args_... args) {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  ;
-  _impl_.variable_name_.Set(static_cast<Arg_&&>(arg), args..., GetArena());
-  // @@protoc_insertion_point(field_set:io.deephaven.proto.backplane.script.grpc.BindTableToVariableRequest.variable_name)
-}
-inline std::string* BindTableToVariableRequest::mutable_variable_name() ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  std::string* _s = _internal_mutable_variable_name();
-  // @@protoc_insertion_point(field_mutable:io.deephaven.proto.backplane.script.grpc.BindTableToVariableRequest.variable_name)
-  return _s;
-}
-inline const std::string& BindTableToVariableRequest::_internal_variable_name() const {
-  PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race);
-  return _impl_.variable_name_.Get();
-}
-inline void BindTableToVariableRequest::_internal_set_variable_name(const std::string& value) {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  ;
-  _impl_.variable_name_.Set(value, GetArena());
-}
-inline std::string* BindTableToVariableRequest::_internal_mutable_variable_name() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  ;
-  return _impl_.variable_name_.Mutable( GetArena());
-}
-inline std::string* BindTableToVariableRequest::release_variable_name() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  // @@protoc_insertion_point(field_release:io.deephaven.proto.backplane.script.grpc.BindTableToVariableRequest.variable_name)
-  return _impl_.variable_name_.Release();
-}
-inline void BindTableToVariableRequest::set_allocated_variable_name(std::string* value) {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  _impl_.variable_name_.SetAllocated(value, GetArena());
-  #ifdef PROTOBUF_FORCE_COPY_DEFAULT_STRING
-        if (_impl_.variable_name_.IsDefault()) {
-          _impl_.variable_name_.Set("", GetArena());
-        }
-  #endif  // PROTOBUF_FORCE_COPY_DEFAULT_STRING
-  // @@protoc_insertion_point(field_set_allocated:io.deephaven.proto.backplane.script.grpc.BindTableToVariableRequest.variable_name)
-}
-
-// .io.deephaven.proto.backplane.grpc.Ticket table_id = 4;
-inline bool BindTableToVariableRequest::has_table_id() const {
-  bool value = (_impl_._has_bits_[0] & 0x00000002u) != 0;
-  PROTOBUF_ASSUME(!value || _impl_.table_id_ != nullptr);
-  return value;
-}
-inline const ::io::deephaven::proto::backplane::grpc::Ticket& BindTableToVariableRequest::_internal_table_id() const {
-  PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race);
-  const ::io::deephaven::proto::backplane::grpc::Ticket* p = _impl_.table_id_;
-  return p != nullptr ? *p : reinterpret_cast<const ::io::deephaven::proto::backplane::grpc::Ticket&>(::io::deephaven::proto::backplane::grpc::_Ticket_default_instance_);
-}
-inline const ::io::deephaven::proto::backplane::grpc::Ticket& BindTableToVariableRequest::table_id() const ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  // @@protoc_insertion_point(field_get:io.deephaven.proto.backplane.script.grpc.BindTableToVariableRequest.table_id)
-  return _internal_table_id();
-}
-inline void BindTableToVariableRequest::unsafe_arena_set_allocated_table_id(::io::deephaven::proto::backplane::grpc::Ticket* value) {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  if (GetArena() == nullptr) {
-    delete reinterpret_cast<::google::protobuf::MessageLite*>(_impl_.table_id_);
-  }
-  _impl_.table_id_ = reinterpret_cast<::io::deephaven::proto::backplane::grpc::Ticket*>(value);
-  if (value != nullptr) {
-    _impl_._has_bits_[0] |= 0x00000002u;
-  } else {
-    _impl_._has_bits_[0] &= ~0x00000002u;
-  }
-  // @@protoc_insertion_point(field_unsafe_arena_set_allocated:io.deephaven.proto.backplane.script.grpc.BindTableToVariableRequest.table_id)
-}
-inline ::io::deephaven::proto::backplane::grpc::Ticket* BindTableToVariableRequest::release_table_id() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-
-  _impl_._has_bits_[0] &= ~0x00000002u;
-  ::io::deephaven::proto::backplane::grpc::Ticket* released = _impl_.table_id_;
-  _impl_.table_id_ = nullptr;
-#ifdef PROTOBUF_FORCE_COPY_IN_RELEASE
-  auto* old = reinterpret_cast<::google::protobuf::MessageLite*>(released);
-  released = ::google::protobuf::internal::DuplicateIfNonNull(released);
-  if (GetArena() == nullptr) {
-    delete old;
-  }
-#else   // PROTOBUF_FORCE_COPY_IN_RELEASE
-  if (GetArena() != nullptr) {
-    released = ::google::protobuf::internal::DuplicateIfNonNull(released);
-  }
-#endif  // !PROTOBUF_FORCE_COPY_IN_RELEASE
-  return released;
-}
-inline ::io::deephaven::proto::backplane::grpc::Ticket* BindTableToVariableRequest::unsafe_arena_release_table_id() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  // @@protoc_insertion_point(field_release:io.deephaven.proto.backplane.script.grpc.BindTableToVariableRequest.table_id)
-
-  _impl_._has_bits_[0] &= ~0x00000002u;
-  ::io::deephaven::proto::backplane::grpc::Ticket* temp = _impl_.table_id_;
-  _impl_.table_id_ = nullptr;
-  return temp;
-}
-inline ::io::deephaven::proto::backplane::grpc::Ticket* BindTableToVariableRequest::_internal_mutable_table_id() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  _impl_._has_bits_[0] |= 0x00000002u;
-  if (_impl_.table_id_ == nullptr) {
-    auto* p = CreateMaybeMessage<::io::deephaven::proto::backplane::grpc::Ticket>(GetArena());
-    _impl_.table_id_ = reinterpret_cast<::io::deephaven::proto::backplane::grpc::Ticket*>(p);
-  }
-  return _impl_.table_id_;
-}
-inline ::io::deephaven::proto::backplane::grpc::Ticket* BindTableToVariableRequest::mutable_table_id() ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  ::io::deephaven::proto::backplane::grpc::Ticket* _msg = _internal_mutable_table_id();
-  // @@protoc_insertion_point(field_mutable:io.deephaven.proto.backplane.script.grpc.BindTableToVariableRequest.table_id)
-  return _msg;
-}
-inline void BindTableToVariableRequest::set_allocated_table_id(::io::deephaven::proto::backplane::grpc::Ticket* value) {
-  ::google::protobuf::Arena* message_arena = GetArena();
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  if (message_arena == nullptr) {
-    delete reinterpret_cast<::google::protobuf::MessageLite*>(_impl_.table_id_);
-  }
-
-  if (value != nullptr) {
-    ::google::protobuf::Arena* submessage_arena = reinterpret_cast<::google::protobuf::MessageLite*>(value)->GetArena();
-    if (message_arena != submessage_arena) {
-      value = ::google::protobuf::internal::GetOwnedMessage(message_arena, value, submessage_arena);
-    }
-    _impl_._has_bits_[0] |= 0x00000002u;
-  } else {
-    _impl_._has_bits_[0] &= ~0x00000002u;
-  }
-
-  _impl_.table_id_ = reinterpret_cast<::io::deephaven::proto::backplane::grpc::Ticket*>(value);
-  // @@protoc_insertion_point(field_set_allocated:io.deephaven.proto.backplane.script.grpc.BindTableToVariableRequest.table_id)
-}
-
-// -------------------------------------------------------------------
-
-// BindTableToVariableResponse
-
-// -------------------------------------------------------------------
-
-// CancelCommandRequest
-
-// .io.deephaven.proto.backplane.grpc.Ticket console_id = 1;
-inline bool CancelCommandRequest::has_console_id() const {
-  bool value = (_impl_._has_bits_[0] & 0x00000001u) != 0;
-  PROTOBUF_ASSUME(!value || _impl_.console_id_ != nullptr);
-  return value;
-}
-inline const ::io::deephaven::proto::backplane::grpc::Ticket& CancelCommandRequest::_internal_console_id() const {
-  PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race);
-  const ::io::deephaven::proto::backplane::grpc::Ticket* p = _impl_.console_id_;
-  return p != nullptr ? *p : reinterpret_cast<const ::io::deephaven::proto::backplane::grpc::Ticket&>(::io::deephaven::proto::backplane::grpc::_Ticket_default_instance_);
-}
-inline const ::io::deephaven::proto::backplane::grpc::Ticket& CancelCommandRequest::console_id() const ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  // @@protoc_insertion_point(field_get:io.deephaven.proto.backplane.script.grpc.CancelCommandRequest.console_id)
-  return _internal_console_id();
-}
-inline void CancelCommandRequest::unsafe_arena_set_allocated_console_id(::io::deephaven::proto::backplane::grpc::Ticket* value) {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  if (GetArena() == nullptr) {
-    delete reinterpret_cast<::google::protobuf::MessageLite*>(_impl_.console_id_);
-  }
-  _impl_.console_id_ = reinterpret_cast<::io::deephaven::proto::backplane::grpc::Ticket*>(value);
-  if (value != nullptr) {
-    _impl_._has_bits_[0] |= 0x00000001u;
-  } else {
-    _impl_._has_bits_[0] &= ~0x00000001u;
-  }
-  // @@protoc_insertion_point(field_unsafe_arena_set_allocated:io.deephaven.proto.backplane.script.grpc.CancelCommandRequest.console_id)
-}
-inline ::io::deephaven::proto::backplane::grpc::Ticket* CancelCommandRequest::release_console_id() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-
-  _impl_._has_bits_[0] &= ~0x00000001u;
-  ::io::deephaven::proto::backplane::grpc::Ticket* released = _impl_.console_id_;
-  _impl_.console_id_ = nullptr;
-#ifdef PROTOBUF_FORCE_COPY_IN_RELEASE
-  auto* old = reinterpret_cast<::google::protobuf::MessageLite*>(released);
-  released = ::google::protobuf::internal::DuplicateIfNonNull(released);
-  if (GetArena() == nullptr) {
-    delete old;
-  }
-#else   // PROTOBUF_FORCE_COPY_IN_RELEASE
-  if (GetArena() != nullptr) {
-    released = ::google::protobuf::internal::DuplicateIfNonNull(released);
-  }
-#endif  // !PROTOBUF_FORCE_COPY_IN_RELEASE
-  return released;
-}
-inline ::io::deephaven::proto::backplane::grpc::Ticket* CancelCommandRequest::unsafe_arena_release_console_id() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  // @@protoc_insertion_point(field_release:io.deephaven.proto.backplane.script.grpc.CancelCommandRequest.console_id)
-
-  _impl_._has_bits_[0] &= ~0x00000001u;
-  ::io::deephaven::proto::backplane::grpc::Ticket* temp = _impl_.console_id_;
-  _impl_.console_id_ = nullptr;
-  return temp;
-}
-inline ::io::deephaven::proto::backplane::grpc::Ticket* CancelCommandRequest::_internal_mutable_console_id() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  _impl_._has_bits_[0] |= 0x00000001u;
-  if (_impl_.console_id_ == nullptr) {
-    auto* p = CreateMaybeMessage<::io::deephaven::proto::backplane::grpc::Ticket>(GetArena());
-    _impl_.console_id_ = reinterpret_cast<::io::deephaven::proto::backplane::grpc::Ticket*>(p);
-  }
-  return _impl_.console_id_;
-}
-inline ::io::deephaven::proto::backplane::grpc::Ticket* CancelCommandRequest::mutable_console_id() ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  ::io::deephaven::proto::backplane::grpc::Ticket* _msg = _internal_mutable_console_id();
-  // @@protoc_insertion_point(field_mutable:io.deephaven.proto.backplane.script.grpc.CancelCommandRequest.console_id)
-  return _msg;
-}
-inline void CancelCommandRequest::set_allocated_console_id(::io::deephaven::proto::backplane::grpc::Ticket* value) {
-  ::google::protobuf::Arena* message_arena = GetArena();
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  if (message_arena == nullptr) {
-    delete reinterpret_cast<::google::protobuf::MessageLite*>(_impl_.console_id_);
-  }
-
-  if (value != nullptr) {
-    ::google::protobuf::Arena* submessage_arena = reinterpret_cast<::google::protobuf::MessageLite*>(value)->GetArena();
-    if (message_arena != submessage_arena) {
-      value = ::google::protobuf::internal::GetOwnedMessage(message_arena, value, submessage_arena);
-    }
-    _impl_._has_bits_[0] |= 0x00000001u;
-  } else {
-    _impl_._has_bits_[0] &= ~0x00000001u;
-  }
-
-  _impl_.console_id_ = reinterpret_cast<::io::deephaven::proto::backplane::grpc::Ticket*>(value);
-  // @@protoc_insertion_point(field_set_allocated:io.deephaven.proto.backplane.script.grpc.CancelCommandRequest.console_id)
-}
-
-// .io.deephaven.proto.backplane.grpc.Ticket command_id = 2;
-inline bool CancelCommandRequest::has_command_id() const {
-  bool value = (_impl_._has_bits_[0] & 0x00000002u) != 0;
-  PROTOBUF_ASSUME(!value || _impl_.command_id_ != nullptr);
-  return value;
-}
-inline const ::io::deephaven::proto::backplane::grpc::Ticket& CancelCommandRequest::_internal_command_id() const {
-  PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race);
-  const ::io::deephaven::proto::backplane::grpc::Ticket* p = _impl_.command_id_;
-  return p != nullptr ? *p : reinterpret_cast<const ::io::deephaven::proto::backplane::grpc::Ticket&>(::io::deephaven::proto::backplane::grpc::_Ticket_default_instance_);
-}
-inline const ::io::deephaven::proto::backplane::grpc::Ticket& CancelCommandRequest::command_id() const ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  // @@protoc_insertion_point(field_get:io.deephaven.proto.backplane.script.grpc.CancelCommandRequest.command_id)
-  return _internal_command_id();
-}
-inline void CancelCommandRequest::unsafe_arena_set_allocated_command_id(::io::deephaven::proto::backplane::grpc::Ticket* value) {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  if (GetArena() == nullptr) {
-    delete reinterpret_cast<::google::protobuf::MessageLite*>(_impl_.command_id_);
-  }
-  _impl_.command_id_ = reinterpret_cast<::io::deephaven::proto::backplane::grpc::Ticket*>(value);
-  if (value != nullptr) {
-    _impl_._has_bits_[0] |= 0x00000002u;
-  } else {
-    _impl_._has_bits_[0] &= ~0x00000002u;
-  }
-  // @@protoc_insertion_point(field_unsafe_arena_set_allocated:io.deephaven.proto.backplane.script.grpc.CancelCommandRequest.command_id)
-}
-inline ::io::deephaven::proto::backplane::grpc::Ticket* CancelCommandRequest::release_command_id() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-
-  _impl_._has_bits_[0] &= ~0x00000002u;
-  ::io::deephaven::proto::backplane::grpc::Ticket* released = _impl_.command_id_;
-  _impl_.command_id_ = nullptr;
-#ifdef PROTOBUF_FORCE_COPY_IN_RELEASE
-  auto* old = reinterpret_cast<::google::protobuf::MessageLite*>(released);
-  released = ::google::protobuf::internal::DuplicateIfNonNull(released);
-  if (GetArena() == nullptr) {
-    delete old;
-  }
-#else   // PROTOBUF_FORCE_COPY_IN_RELEASE
-  if (GetArena() != nullptr) {
-    released = ::google::protobuf::internal::DuplicateIfNonNull(released);
-  }
-#endif  // !PROTOBUF_FORCE_COPY_IN_RELEASE
-  return released;
-}
-inline ::io::deephaven::proto::backplane::grpc::Ticket* CancelCommandRequest::unsafe_arena_release_command_id() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  // @@protoc_insertion_point(field_release:io.deephaven.proto.backplane.script.grpc.CancelCommandRequest.command_id)
-
-  _impl_._has_bits_[0] &= ~0x00000002u;
-  ::io::deephaven::proto::backplane::grpc::Ticket* temp = _impl_.command_id_;
-  _impl_.command_id_ = nullptr;
-  return temp;
-}
-inline ::io::deephaven::proto::backplane::grpc::Ticket* CancelCommandRequest::_internal_mutable_command_id() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  _impl_._has_bits_[0] |= 0x00000002u;
-  if (_impl_.command_id_ == nullptr) {
-    auto* p = CreateMaybeMessage<::io::deephaven::proto::backplane::grpc::Ticket>(GetArena());
-    _impl_.command_id_ = reinterpret_cast<::io::deephaven::proto::backplane::grpc::Ticket*>(p);
-  }
-  return _impl_.command_id_;
-}
-inline ::io::deephaven::proto::backplane::grpc::Ticket* CancelCommandRequest::mutable_command_id() ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  ::io::deephaven::proto::backplane::grpc::Ticket* _msg = _internal_mutable_command_id();
-  // @@protoc_insertion_point(field_mutable:io.deephaven.proto.backplane.script.grpc.CancelCommandRequest.command_id)
-  return _msg;
-}
-inline void CancelCommandRequest::set_allocated_command_id(::io::deephaven::proto::backplane::grpc::Ticket* value) {
-  ::google::protobuf::Arena* message_arena = GetArena();
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  if (message_arena == nullptr) {
-    delete reinterpret_cast<::google::protobuf::MessageLite*>(_impl_.command_id_);
-  }
-
-  if (value != nullptr) {
-    ::google::protobuf::Arena* submessage_arena = reinterpret_cast<::google::protobuf::MessageLite*>(value)->GetArena();
-    if (message_arena != submessage_arena) {
-      value = ::google::protobuf::internal::GetOwnedMessage(message_arena, value, submessage_arena);
-    }
-    _impl_._has_bits_[0] |= 0x00000002u;
-  } else {
-    _impl_._has_bits_[0] &= ~0x00000002u;
-  }
-
-  _impl_.command_id_ = reinterpret_cast<::io::deephaven::proto::backplane::grpc::Ticket*>(value);
-  // @@protoc_insertion_point(field_set_allocated:io.deephaven.proto.backplane.script.grpc.CancelCommandRequest.command_id)
-}
-
-// -------------------------------------------------------------------
-
-// CancelCommandResponse
-
-// -------------------------------------------------------------------
-
-// CancelAutoCompleteRequest
-
-// .io.deephaven.proto.backplane.grpc.Ticket console_id = 1;
-inline bool CancelAutoCompleteRequest::has_console_id() const {
-  bool value = (_impl_._has_bits_[0] & 0x00000001u) != 0;
-  PROTOBUF_ASSUME(!value || _impl_.console_id_ != nullptr);
-  return value;
-}
-inline const ::io::deephaven::proto::backplane::grpc::Ticket& CancelAutoCompleteRequest::_internal_console_id() const {
-  PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race);
-  const ::io::deephaven::proto::backplane::grpc::Ticket* p = _impl_.console_id_;
-  return p != nullptr ? *p : reinterpret_cast<const ::io::deephaven::proto::backplane::grpc::Ticket&>(::io::deephaven::proto::backplane::grpc::_Ticket_default_instance_);
-}
-inline const ::io::deephaven::proto::backplane::grpc::Ticket& CancelAutoCompleteRequest::console_id() const ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  // @@protoc_insertion_point(field_get:io.deephaven.proto.backplane.script.grpc.CancelAutoCompleteRequest.console_id)
-  return _internal_console_id();
-}
-inline void CancelAutoCompleteRequest::unsafe_arena_set_allocated_console_id(::io::deephaven::proto::backplane::grpc::Ticket* value) {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  if (GetArena() == nullptr) {
-    delete reinterpret_cast<::google::protobuf::MessageLite*>(_impl_.console_id_);
-  }
-  _impl_.console_id_ = reinterpret_cast<::io::deephaven::proto::backplane::grpc::Ticket*>(value);
-  if (value != nullptr) {
-    _impl_._has_bits_[0] |= 0x00000001u;
-  } else {
-    _impl_._has_bits_[0] &= ~0x00000001u;
-  }
-  // @@protoc_insertion_point(field_unsafe_arena_set_allocated:io.deephaven.proto.backplane.script.grpc.CancelAutoCompleteRequest.console_id)
-}
-inline ::io::deephaven::proto::backplane::grpc::Ticket* CancelAutoCompleteRequest::release_console_id() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-
-  _impl_._has_bits_[0] &= ~0x00000001u;
-  ::io::deephaven::proto::backplane::grpc::Ticket* released = _impl_.console_id_;
-  _impl_.console_id_ = nullptr;
-#ifdef PROTOBUF_FORCE_COPY_IN_RELEASE
-  auto* old = reinterpret_cast<::google::protobuf::MessageLite*>(released);
-  released = ::google::protobuf::internal::DuplicateIfNonNull(released);
-  if (GetArena() == nullptr) {
-    delete old;
-  }
-#else   // PROTOBUF_FORCE_COPY_IN_RELEASE
-  if (GetArena() != nullptr) {
-    released = ::google::protobuf::internal::DuplicateIfNonNull(released);
-  }
-#endif  // !PROTOBUF_FORCE_COPY_IN_RELEASE
-  return released;
-}
-inline ::io::deephaven::proto::backplane::grpc::Ticket* CancelAutoCompleteRequest::unsafe_arena_release_console_id() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  // @@protoc_insertion_point(field_release:io.deephaven.proto.backplane.script.grpc.CancelAutoCompleteRequest.console_id)
-
-  _impl_._has_bits_[0] &= ~0x00000001u;
-  ::io::deephaven::proto::backplane::grpc::Ticket* temp = _impl_.console_id_;
-  _impl_.console_id_ = nullptr;
-  return temp;
-}
-inline ::io::deephaven::proto::backplane::grpc::Ticket* CancelAutoCompleteRequest::_internal_mutable_console_id() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  _impl_._has_bits_[0] |= 0x00000001u;
-  if (_impl_.console_id_ == nullptr) {
-    auto* p = CreateMaybeMessage<::io::deephaven::proto::backplane::grpc::Ticket>(GetArena());
-    _impl_.console_id_ = reinterpret_cast<::io::deephaven::proto::backplane::grpc::Ticket*>(p);
-  }
-  return _impl_.console_id_;
-}
-inline ::io::deephaven::proto::backplane::grpc::Ticket* CancelAutoCompleteRequest::mutable_console_id() ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  ::io::deephaven::proto::backplane::grpc::Ticket* _msg = _internal_mutable_console_id();
-  // @@protoc_insertion_point(field_mutable:io.deephaven.proto.backplane.script.grpc.CancelAutoCompleteRequest.console_id)
-  return _msg;
-}
-inline void CancelAutoCompleteRequest::set_allocated_console_id(::io::deephaven::proto::backplane::grpc::Ticket* value) {
-  ::google::protobuf::Arena* message_arena = GetArena();
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  if (message_arena == nullptr) {
-    delete reinterpret_cast<::google::protobuf::MessageLite*>(_impl_.console_id_);
-  }
-
-  if (value != nullptr) {
-    ::google::protobuf::Arena* submessage_arena = reinterpret_cast<::google::protobuf::MessageLite*>(value)->GetArena();
-    if (message_arena != submessage_arena) {
-      value = ::google::protobuf::internal::GetOwnedMessage(message_arena, value, submessage_arena);
-    }
-    _impl_._has_bits_[0] |= 0x00000001u;
-  } else {
-    _impl_._has_bits_[0] &= ~0x00000001u;
-  }
-
-  _impl_.console_id_ = reinterpret_cast<::io::deephaven::proto::backplane::grpc::Ticket*>(value);
-  // @@protoc_insertion_point(field_set_allocated:io.deephaven.proto.backplane.script.grpc.CancelAutoCompleteRequest.console_id)
-}
-
-// int32 request_id = 2;
-inline void CancelAutoCompleteRequest::clear_request_id() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  _impl_.request_id_ = 0;
-}
-inline ::int32_t CancelAutoCompleteRequest::request_id() const {
-  // @@protoc_insertion_point(field_get:io.deephaven.proto.backplane.script.grpc.CancelAutoCompleteRequest.request_id)
-  return _internal_request_id();
-}
-inline void CancelAutoCompleteRequest::set_request_id(::int32_t value) {
-  _internal_set_request_id(value);
-  // @@protoc_insertion_point(field_set:io.deephaven.proto.backplane.script.grpc.CancelAutoCompleteRequest.request_id)
-}
-inline ::int32_t CancelAutoCompleteRequest::_internal_request_id() const {
-  PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race);
-  return _impl_.request_id_;
-}
-inline void CancelAutoCompleteRequest::_internal_set_request_id(::int32_t value) {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  ;
-  _impl_.request_id_ = value;
-}
-
-// -------------------------------------------------------------------
-
-// CancelAutoCompleteResponse
-
-// -------------------------------------------------------------------
-
-// AutoCompleteRequest
-
-// .io.deephaven.proto.backplane.grpc.Ticket console_id = 5;
-inline bool AutoCompleteRequest::has_console_id() const {
-  bool value = (_impl_._has_bits_[0] & 0x00000001u) != 0;
-  PROTOBUF_ASSUME(!value || _impl_.console_id_ != nullptr);
-  return value;
-}
-inline const ::io::deephaven::proto::backplane::grpc::Ticket& AutoCompleteRequest::_internal_console_id() const {
-  PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race);
-  const ::io::deephaven::proto::backplane::grpc::Ticket* p = _impl_.console_id_;
-  return p != nullptr ? *p : reinterpret_cast<const ::io::deephaven::proto::backplane::grpc::Ticket&>(::io::deephaven::proto::backplane::grpc::_Ticket_default_instance_);
-}
-inline const ::io::deephaven::proto::backplane::grpc::Ticket& AutoCompleteRequest::console_id() const ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  // @@protoc_insertion_point(field_get:io.deephaven.proto.backplane.script.grpc.AutoCompleteRequest.console_id)
-  return _internal_console_id();
-}
-inline void AutoCompleteRequest::unsafe_arena_set_allocated_console_id(::io::deephaven::proto::backplane::grpc::Ticket* value) {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  if (GetArena() == nullptr) {
-    delete reinterpret_cast<::google::protobuf::MessageLite*>(_impl_.console_id_);
-  }
-  _impl_.console_id_ = reinterpret_cast<::io::deephaven::proto::backplane::grpc::Ticket*>(value);
-  if (value != nullptr) {
-    _impl_._has_bits_[0] |= 0x00000001u;
-  } else {
-    _impl_._has_bits_[0] &= ~0x00000001u;
-  }
-  // @@protoc_insertion_point(field_unsafe_arena_set_allocated:io.deephaven.proto.backplane.script.grpc.AutoCompleteRequest.console_id)
-}
-inline ::io::deephaven::proto::backplane::grpc::Ticket* AutoCompleteRequest::release_console_id() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-
-  _impl_._has_bits_[0] &= ~0x00000001u;
-  ::io::deephaven::proto::backplane::grpc::Ticket* released = _impl_.console_id_;
-  _impl_.console_id_ = nullptr;
-#ifdef PROTOBUF_FORCE_COPY_IN_RELEASE
-  auto* old = reinterpret_cast<::google::protobuf::MessageLite*>(released);
-  released = ::google::protobuf::internal::DuplicateIfNonNull(released);
-  if (GetArena() == nullptr) {
-    delete old;
-  }
-#else   // PROTOBUF_FORCE_COPY_IN_RELEASE
-  if (GetArena() != nullptr) {
-    released = ::google::protobuf::internal::DuplicateIfNonNull(released);
-  }
-#endif  // !PROTOBUF_FORCE_COPY_IN_RELEASE
-  return released;
-}
-inline ::io::deephaven::proto::backplane::grpc::Ticket* AutoCompleteRequest::unsafe_arena_release_console_id() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  // @@protoc_insertion_point(field_release:io.deephaven.proto.backplane.script.grpc.AutoCompleteRequest.console_id)
-
-  _impl_._has_bits_[0] &= ~0x00000001u;
-  ::io::deephaven::proto::backplane::grpc::Ticket* temp = _impl_.console_id_;
-  _impl_.console_id_ = nullptr;
-  return temp;
-}
-inline ::io::deephaven::proto::backplane::grpc::Ticket* AutoCompleteRequest::_internal_mutable_console_id() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  _impl_._has_bits_[0] |= 0x00000001u;
-  if (_impl_.console_id_ == nullptr) {
-    auto* p = CreateMaybeMessage<::io::deephaven::proto::backplane::grpc::Ticket>(GetArena());
-    _impl_.console_id_ = reinterpret_cast<::io::deephaven::proto::backplane::grpc::Ticket*>(p);
-  }
-  return _impl_.console_id_;
-}
-inline ::io::deephaven::proto::backplane::grpc::Ticket* AutoCompleteRequest::mutable_console_id() ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  ::io::deephaven::proto::backplane::grpc::Ticket* _msg = _internal_mutable_console_id();
-  // @@protoc_insertion_point(field_mutable:io.deephaven.proto.backplane.script.grpc.AutoCompleteRequest.console_id)
-  return _msg;
-}
-inline void AutoCompleteRequest::set_allocated_console_id(::io::deephaven::proto::backplane::grpc::Ticket* value) {
-  ::google::protobuf::Arena* message_arena = GetArena();
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  if (message_arena == nullptr) {
-    delete reinterpret_cast<::google::protobuf::MessageLite*>(_impl_.console_id_);
-  }
-
-  if (value != nullptr) {
-    ::google::protobuf::Arena* submessage_arena = reinterpret_cast<::google::protobuf::MessageLite*>(value)->GetArena();
-    if (message_arena != submessage_arena) {
-      value = ::google::protobuf::internal::GetOwnedMessage(message_arena, value, submessage_arena);
-    }
-    _impl_._has_bits_[0] |= 0x00000001u;
-  } else {
-    _impl_._has_bits_[0] &= ~0x00000001u;
-  }
-
-  _impl_.console_id_ = reinterpret_cast<::io::deephaven::proto::backplane::grpc::Ticket*>(value);
-  // @@protoc_insertion_point(field_set_allocated:io.deephaven.proto.backplane.script.grpc.AutoCompleteRequest.console_id)
-}
-
-// int32 request_id = 6;
-inline void AutoCompleteRequest::clear_request_id() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  _impl_.request_id_ = 0;
-}
-inline ::int32_t AutoCompleteRequest::request_id() const {
-  // @@protoc_insertion_point(field_get:io.deephaven.proto.backplane.script.grpc.AutoCompleteRequest.request_id)
-  return _internal_request_id();
-}
-inline void AutoCompleteRequest::set_request_id(::int32_t value) {
-  _internal_set_request_id(value);
-  // @@protoc_insertion_point(field_set:io.deephaven.proto.backplane.script.grpc.AutoCompleteRequest.request_id)
-}
-inline ::int32_t AutoCompleteRequest::_internal_request_id() const {
-  PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race);
-  return _impl_.request_id_;
-}
-inline void AutoCompleteRequest::_internal_set_request_id(::int32_t value) {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  ;
-  _impl_.request_id_ = value;
-}
-
-// .io.deephaven.proto.backplane.script.grpc.OpenDocumentRequest open_document = 1;
-inline bool AutoCompleteRequest::has_open_document() const {
-  return request_case() == kOpenDocument;
-}
-inline bool AutoCompleteRequest::_internal_has_open_document() const {
-  return request_case() == kOpenDocument;
-}
-inline void AutoCompleteRequest::set_has_open_document() {
-  _impl_._oneof_case_[0] = kOpenDocument;
-}
-inline void AutoCompleteRequest::clear_open_document() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  if (request_case() == kOpenDocument) {
-    if (GetArena() == nullptr) {
-      delete _impl_.request_.open_document_;
-    }
-    clear_has_request();
-  }
-}
-inline ::io::deephaven::proto::backplane::script::grpc::OpenDocumentRequest* AutoCompleteRequest::release_open_document() {
-  // @@protoc_insertion_point(field_release:io.deephaven.proto.backplane.script.grpc.AutoCompleteRequest.open_document)
-  if (request_case() == kOpenDocument) {
-    clear_has_request();
-    auto* temp = _impl_.request_.open_document_;
-    if (GetArena() != nullptr) {
-      temp = ::google::protobuf::internal::DuplicateIfNonNull(temp);
-    }
-    _impl_.request_.open_document_ = nullptr;
-    return temp;
-  } else {
-    return nullptr;
-  }
-}
-inline const ::io::deephaven::proto::backplane::script::grpc::OpenDocumentRequest& AutoCompleteRequest::_internal_open_document() const {
-  return request_case() == kOpenDocument ? *_impl_.request_.open_document_ : reinterpret_cast<::io::deephaven::proto::backplane::script::grpc::OpenDocumentRequest&>(::io::deephaven::proto::backplane::script::grpc::_OpenDocumentRequest_default_instance_);
-}
-inline const ::io::deephaven::proto::backplane::script::grpc::OpenDocumentRequest& AutoCompleteRequest::open_document() const ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  // @@protoc_insertion_point(field_get:io.deephaven.proto.backplane.script.grpc.AutoCompleteRequest.open_document)
-  return _internal_open_document();
-}
-inline ::io::deephaven::proto::backplane::script::grpc::OpenDocumentRequest* AutoCompleteRequest::unsafe_arena_release_open_document() {
-  // @@protoc_insertion_point(field_unsafe_arena_release:io.deephaven.proto.backplane.script.grpc.AutoCompleteRequest.open_document)
-  if (request_case() == kOpenDocument) {
-    clear_has_request();
-    auto* temp = _impl_.request_.open_document_;
-    _impl_.request_.open_document_ = nullptr;
-    return temp;
-  } else {
-    return nullptr;
-  }
-}
-inline void AutoCompleteRequest::unsafe_arena_set_allocated_open_document(::io::deephaven::proto::backplane::script::grpc::OpenDocumentRequest* value) {
-  // We rely on the oneof clear method to free the earlier contents
-  // of this oneof. We can directly use the pointer we're given to
-  // set the new value.
-  clear_request();
-  if (value) {
-    set_has_open_document();
-    _impl_.request_.open_document_ = value;
-  }
-  // @@protoc_insertion_point(field_unsafe_arena_set_allocated:io.deephaven.proto.backplane.script.grpc.AutoCompleteRequest.open_document)
-}
-inline ::io::deephaven::proto::backplane::script::grpc::OpenDocumentRequest* AutoCompleteRequest::_internal_mutable_open_document() {
-  if (request_case() != kOpenDocument) {
-    clear_request();
-    set_has_open_document();
-    _impl_.request_.open_document_ = CreateMaybeMessage<::io::deephaven::proto::backplane::script::grpc::OpenDocumentRequest>(GetArena());
-  }
-  return _impl_.request_.open_document_;
-}
-inline ::io::deephaven::proto::backplane::script::grpc::OpenDocumentRequest* AutoCompleteRequest::mutable_open_document() ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  ::io::deephaven::proto::backplane::script::grpc::OpenDocumentRequest* _msg = _internal_mutable_open_document();
-  // @@protoc_insertion_point(field_mutable:io.deephaven.proto.backplane.script.grpc.AutoCompleteRequest.open_document)
-  return _msg;
-}
-
-// .io.deephaven.proto.backplane.script.grpc.ChangeDocumentRequest change_document = 2;
-inline bool AutoCompleteRequest::has_change_document() const {
-  return request_case() == kChangeDocument;
-}
-inline bool AutoCompleteRequest::_internal_has_change_document() const {
-  return request_case() == kChangeDocument;
-}
-inline void AutoCompleteRequest::set_has_change_document() {
-  _impl_._oneof_case_[0] = kChangeDocument;
-}
-inline void AutoCompleteRequest::clear_change_document() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  if (request_case() == kChangeDocument) {
-    if (GetArena() == nullptr) {
-      delete _impl_.request_.change_document_;
-    }
-    clear_has_request();
-  }
-}
-inline ::io::deephaven::proto::backplane::script::grpc::ChangeDocumentRequest* AutoCompleteRequest::release_change_document() {
-  // @@protoc_insertion_point(field_release:io.deephaven.proto.backplane.script.grpc.AutoCompleteRequest.change_document)
-  if (request_case() == kChangeDocument) {
-    clear_has_request();
-    auto* temp = _impl_.request_.change_document_;
-    if (GetArena() != nullptr) {
-      temp = ::google::protobuf::internal::DuplicateIfNonNull(temp);
-    }
-    _impl_.request_.change_document_ = nullptr;
-    return temp;
-  } else {
-    return nullptr;
-  }
-}
-inline const ::io::deephaven::proto::backplane::script::grpc::ChangeDocumentRequest& AutoCompleteRequest::_internal_change_document() const {
-  return request_case() == kChangeDocument ? *_impl_.request_.change_document_ : reinterpret_cast<::io::deephaven::proto::backplane::script::grpc::ChangeDocumentRequest&>(::io::deephaven::proto::backplane::script::grpc::_ChangeDocumentRequest_default_instance_);
-}
-inline const ::io::deephaven::proto::backplane::script::grpc::ChangeDocumentRequest& AutoCompleteRequest::change_document() const ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  // @@protoc_insertion_point(field_get:io.deephaven.proto.backplane.script.grpc.AutoCompleteRequest.change_document)
-  return _internal_change_document();
-}
-inline ::io::deephaven::proto::backplane::script::grpc::ChangeDocumentRequest* AutoCompleteRequest::unsafe_arena_release_change_document() {
-  // @@protoc_insertion_point(field_unsafe_arena_release:io.deephaven.proto.backplane.script.grpc.AutoCompleteRequest.change_document)
-  if (request_case() == kChangeDocument) {
-    clear_has_request();
-    auto* temp = _impl_.request_.change_document_;
-    _impl_.request_.change_document_ = nullptr;
-    return temp;
-  } else {
-    return nullptr;
-  }
-}
-inline void AutoCompleteRequest::unsafe_arena_set_allocated_change_document(::io::deephaven::proto::backplane::script::grpc::ChangeDocumentRequest* value) {
-  // We rely on the oneof clear method to free the earlier contents
-  // of this oneof. We can directly use the pointer we're given to
-  // set the new value.
-  clear_request();
-  if (value) {
-    set_has_change_document();
-    _impl_.request_.change_document_ = value;
-  }
-  // @@protoc_insertion_point(field_unsafe_arena_set_allocated:io.deephaven.proto.backplane.script.grpc.AutoCompleteRequest.change_document)
-}
-inline ::io::deephaven::proto::backplane::script::grpc::ChangeDocumentRequest* AutoCompleteRequest::_internal_mutable_change_document() {
-  if (request_case() != kChangeDocument) {
-    clear_request();
-    set_has_change_document();
-    _impl_.request_.change_document_ = CreateMaybeMessage<::io::deephaven::proto::backplane::script::grpc::ChangeDocumentRequest>(GetArena());
-  }
-  return _impl_.request_.change_document_;
-}
-inline ::io::deephaven::proto::backplane::script::grpc::ChangeDocumentRequest* AutoCompleteRequest::mutable_change_document() ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  ::io::deephaven::proto::backplane::script::grpc::ChangeDocumentRequest* _msg = _internal_mutable_change_document();
-  // @@protoc_insertion_point(field_mutable:io.deephaven.proto.backplane.script.grpc.AutoCompleteRequest.change_document)
-  return _msg;
-}
-
-// .io.deephaven.proto.backplane.script.grpc.GetCompletionItemsRequest get_completion_items = 3;
-inline bool AutoCompleteRequest::has_get_completion_items() const {
-  return request_case() == kGetCompletionItems;
-}
-inline bool AutoCompleteRequest::_internal_has_get_completion_items() const {
-  return request_case() == kGetCompletionItems;
-}
-inline void AutoCompleteRequest::set_has_get_completion_items() {
-  _impl_._oneof_case_[0] = kGetCompletionItems;
-}
-inline void AutoCompleteRequest::clear_get_completion_items() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  if (request_case() == kGetCompletionItems) {
-    if (GetArena() == nullptr) {
-      delete _impl_.request_.get_completion_items_;
-    }
-    clear_has_request();
-  }
-}
-inline ::io::deephaven::proto::backplane::script::grpc::GetCompletionItemsRequest* AutoCompleteRequest::release_get_completion_items() {
-  // @@protoc_insertion_point(field_release:io.deephaven.proto.backplane.script.grpc.AutoCompleteRequest.get_completion_items)
-  if (request_case() == kGetCompletionItems) {
-    clear_has_request();
-    auto* temp = _impl_.request_.get_completion_items_;
-    if (GetArena() != nullptr) {
-      temp = ::google::protobuf::internal::DuplicateIfNonNull(temp);
-    }
-    _impl_.request_.get_completion_items_ = nullptr;
-    return temp;
-  } else {
-    return nullptr;
-  }
-}
-inline const ::io::deephaven::proto::backplane::script::grpc::GetCompletionItemsRequest& AutoCompleteRequest::_internal_get_completion_items() const {
-  return request_case() == kGetCompletionItems ? *_impl_.request_.get_completion_items_ : reinterpret_cast<::io::deephaven::proto::backplane::script::grpc::GetCompletionItemsRequest&>(::io::deephaven::proto::backplane::script::grpc::_GetCompletionItemsRequest_default_instance_);
-}
-inline const ::io::deephaven::proto::backplane::script::grpc::GetCompletionItemsRequest& AutoCompleteRequest::get_completion_items() const ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  // @@protoc_insertion_point(field_get:io.deephaven.proto.backplane.script.grpc.AutoCompleteRequest.get_completion_items)
-  return _internal_get_completion_items();
-}
-inline ::io::deephaven::proto::backplane::script::grpc::GetCompletionItemsRequest* AutoCompleteRequest::unsafe_arena_release_get_completion_items() {
-  // @@protoc_insertion_point(field_unsafe_arena_release:io.deephaven.proto.backplane.script.grpc.AutoCompleteRequest.get_completion_items)
-  if (request_case() == kGetCompletionItems) {
-    clear_has_request();
-    auto* temp = _impl_.request_.get_completion_items_;
-    _impl_.request_.get_completion_items_ = nullptr;
-    return temp;
-  } else {
-    return nullptr;
-  }
-}
-inline void AutoCompleteRequest::unsafe_arena_set_allocated_get_completion_items(::io::deephaven::proto::backplane::script::grpc::GetCompletionItemsRequest* value) {
-  // We rely on the oneof clear method to free the earlier contents
-  // of this oneof. We can directly use the pointer we're given to
-  // set the new value.
-  clear_request();
-  if (value) {
-    set_has_get_completion_items();
-    _impl_.request_.get_completion_items_ = value;
-  }
-  // @@protoc_insertion_point(field_unsafe_arena_set_allocated:io.deephaven.proto.backplane.script.grpc.AutoCompleteRequest.get_completion_items)
-}
-inline ::io::deephaven::proto::backplane::script::grpc::GetCompletionItemsRequest* AutoCompleteRequest::_internal_mutable_get_completion_items() {
-  if (request_case() != kGetCompletionItems) {
-    clear_request();
-    set_has_get_completion_items();
-    _impl_.request_.get_completion_items_ = CreateMaybeMessage<::io::deephaven::proto::backplane::script::grpc::GetCompletionItemsRequest>(GetArena());
-  }
-  return _impl_.request_.get_completion_items_;
-}
-inline ::io::deephaven::proto::backplane::script::grpc::GetCompletionItemsRequest* AutoCompleteRequest::mutable_get_completion_items() ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  ::io::deephaven::proto::backplane::script::grpc::GetCompletionItemsRequest* _msg = _internal_mutable_get_completion_items();
-  // @@protoc_insertion_point(field_mutable:io.deephaven.proto.backplane.script.grpc.AutoCompleteRequest.get_completion_items)
-  return _msg;
-}
-
-// .io.deephaven.proto.backplane.script.grpc.GetSignatureHelpRequest get_signature_help = 7;
-inline bool AutoCompleteRequest::has_get_signature_help() const {
-  return request_case() == kGetSignatureHelp;
-}
-inline bool AutoCompleteRequest::_internal_has_get_signature_help() const {
-  return request_case() == kGetSignatureHelp;
-}
-inline void AutoCompleteRequest::set_has_get_signature_help() {
-  _impl_._oneof_case_[0] = kGetSignatureHelp;
-}
-inline void AutoCompleteRequest::clear_get_signature_help() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  if (request_case() == kGetSignatureHelp) {
-    if (GetArena() == nullptr) {
-      delete _impl_.request_.get_signature_help_;
-    }
-    clear_has_request();
-  }
-}
-inline ::io::deephaven::proto::backplane::script::grpc::GetSignatureHelpRequest* AutoCompleteRequest::release_get_signature_help() {
-  // @@protoc_insertion_point(field_release:io.deephaven.proto.backplane.script.grpc.AutoCompleteRequest.get_signature_help)
-  if (request_case() == kGetSignatureHelp) {
-    clear_has_request();
-    auto* temp = _impl_.request_.get_signature_help_;
-    if (GetArena() != nullptr) {
-      temp = ::google::protobuf::internal::DuplicateIfNonNull(temp);
-    }
-    _impl_.request_.get_signature_help_ = nullptr;
-    return temp;
-  } else {
-    return nullptr;
-  }
-}
-inline const ::io::deephaven::proto::backplane::script::grpc::GetSignatureHelpRequest& AutoCompleteRequest::_internal_get_signature_help() const {
-  return request_case() == kGetSignatureHelp ? *_impl_.request_.get_signature_help_ : reinterpret_cast<::io::deephaven::proto::backplane::script::grpc::GetSignatureHelpRequest&>(::io::deephaven::proto::backplane::script::grpc::_GetSignatureHelpRequest_default_instance_);
-}
-inline const ::io::deephaven::proto::backplane::script::grpc::GetSignatureHelpRequest& AutoCompleteRequest::get_signature_help() const ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  // @@protoc_insertion_point(field_get:io.deephaven.proto.backplane.script.grpc.AutoCompleteRequest.get_signature_help)
-  return _internal_get_signature_help();
-}
-inline ::io::deephaven::proto::backplane::script::grpc::GetSignatureHelpRequest* AutoCompleteRequest::unsafe_arena_release_get_signature_help() {
-  // @@protoc_insertion_point(field_unsafe_arena_release:io.deephaven.proto.backplane.script.grpc.AutoCompleteRequest.get_signature_help)
-  if (request_case() == kGetSignatureHelp) {
-    clear_has_request();
-    auto* temp = _impl_.request_.get_signature_help_;
-    _impl_.request_.get_signature_help_ = nullptr;
-    return temp;
-  } else {
-    return nullptr;
-  }
-}
-inline void AutoCompleteRequest::unsafe_arena_set_allocated_get_signature_help(::io::deephaven::proto::backplane::script::grpc::GetSignatureHelpRequest* value) {
-  // We rely on the oneof clear method to free the earlier contents
-  // of this oneof. We can directly use the pointer we're given to
-  // set the new value.
-  clear_request();
-  if (value) {
-    set_has_get_signature_help();
-    _impl_.request_.get_signature_help_ = value;
-  }
-  // @@protoc_insertion_point(field_unsafe_arena_set_allocated:io.deephaven.proto.backplane.script.grpc.AutoCompleteRequest.get_signature_help)
-}
-inline ::io::deephaven::proto::backplane::script::grpc::GetSignatureHelpRequest* AutoCompleteRequest::_internal_mutable_get_signature_help() {
-  if (request_case() != kGetSignatureHelp) {
-    clear_request();
-    set_has_get_signature_help();
-    _impl_.request_.get_signature_help_ = CreateMaybeMessage<::io::deephaven::proto::backplane::script::grpc::GetSignatureHelpRequest>(GetArena());
-  }
-  return _impl_.request_.get_signature_help_;
-}
-inline ::io::deephaven::proto::backplane::script::grpc::GetSignatureHelpRequest* AutoCompleteRequest::mutable_get_signature_help() ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  ::io::deephaven::proto::backplane::script::grpc::GetSignatureHelpRequest* _msg = _internal_mutable_get_signature_help();
-  // @@protoc_insertion_point(field_mutable:io.deephaven.proto.backplane.script.grpc.AutoCompleteRequest.get_signature_help)
-  return _msg;
-}
-
-// .io.deephaven.proto.backplane.script.grpc.GetHoverRequest get_hover = 8;
-inline bool AutoCompleteRequest::has_get_hover() const {
-  return request_case() == kGetHover;
-}
-inline bool AutoCompleteRequest::_internal_has_get_hover() const {
-  return request_case() == kGetHover;
-}
-inline void AutoCompleteRequest::set_has_get_hover() {
-  _impl_._oneof_case_[0] = kGetHover;
-}
-inline void AutoCompleteRequest::clear_get_hover() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  if (request_case() == kGetHover) {
-    if (GetArena() == nullptr) {
-      delete _impl_.request_.get_hover_;
-    }
-    clear_has_request();
-  }
-}
-inline ::io::deephaven::proto::backplane::script::grpc::GetHoverRequest* AutoCompleteRequest::release_get_hover() {
-  // @@protoc_insertion_point(field_release:io.deephaven.proto.backplane.script.grpc.AutoCompleteRequest.get_hover)
-  if (request_case() == kGetHover) {
-    clear_has_request();
-    auto* temp = _impl_.request_.get_hover_;
-    if (GetArena() != nullptr) {
-      temp = ::google::protobuf::internal::DuplicateIfNonNull(temp);
-    }
-    _impl_.request_.get_hover_ = nullptr;
-    return temp;
-  } else {
-    return nullptr;
-  }
-}
-inline const ::io::deephaven::proto::backplane::script::grpc::GetHoverRequest& AutoCompleteRequest::_internal_get_hover() const {
-  return request_case() == kGetHover ? *_impl_.request_.get_hover_ : reinterpret_cast<::io::deephaven::proto::backplane::script::grpc::GetHoverRequest&>(::io::deephaven::proto::backplane::script::grpc::_GetHoverRequest_default_instance_);
-}
-inline const ::io::deephaven::proto::backplane::script::grpc::GetHoverRequest& AutoCompleteRequest::get_hover() const ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  // @@protoc_insertion_point(field_get:io.deephaven.proto.backplane.script.grpc.AutoCompleteRequest.get_hover)
-  return _internal_get_hover();
-}
-inline ::io::deephaven::proto::backplane::script::grpc::GetHoverRequest* AutoCompleteRequest::unsafe_arena_release_get_hover() {
-  // @@protoc_insertion_point(field_unsafe_arena_release:io.deephaven.proto.backplane.script.grpc.AutoCompleteRequest.get_hover)
-  if (request_case() == kGetHover) {
-    clear_has_request();
-    auto* temp = _impl_.request_.get_hover_;
-    _impl_.request_.get_hover_ = nullptr;
-    return temp;
-  } else {
-    return nullptr;
-  }
-}
-inline void AutoCompleteRequest::unsafe_arena_set_allocated_get_hover(::io::deephaven::proto::backplane::script::grpc::GetHoverRequest* value) {
-  // We rely on the oneof clear method to free the earlier contents
-  // of this oneof. We can directly use the pointer we're given to
-  // set the new value.
-  clear_request();
-  if (value) {
-    set_has_get_hover();
-    _impl_.request_.get_hover_ = value;
-  }
-  // @@protoc_insertion_point(field_unsafe_arena_set_allocated:io.deephaven.proto.backplane.script.grpc.AutoCompleteRequest.get_hover)
-}
-inline ::io::deephaven::proto::backplane::script::grpc::GetHoverRequest* AutoCompleteRequest::_internal_mutable_get_hover() {
-  if (request_case() != kGetHover) {
-    clear_request();
-    set_has_get_hover();
-    _impl_.request_.get_hover_ = CreateMaybeMessage<::io::deephaven::proto::backplane::script::grpc::GetHoverRequest>(GetArena());
-  }
-  return _impl_.request_.get_hover_;
-}
-inline ::io::deephaven::proto::backplane::script::grpc::GetHoverRequest* AutoCompleteRequest::mutable_get_hover() ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  ::io::deephaven::proto::backplane::script::grpc::GetHoverRequest* _msg = _internal_mutable_get_hover();
-  // @@protoc_insertion_point(field_mutable:io.deephaven.proto.backplane.script.grpc.AutoCompleteRequest.get_hover)
-  return _msg;
-}
-
-// .io.deephaven.proto.backplane.script.grpc.GetDiagnosticRequest get_diagnostic = 9;
-inline bool AutoCompleteRequest::has_get_diagnostic() const {
-  return request_case() == kGetDiagnostic;
-}
-inline bool AutoCompleteRequest::_internal_has_get_diagnostic() const {
-  return request_case() == kGetDiagnostic;
-}
-inline void AutoCompleteRequest::set_has_get_diagnostic() {
-  _impl_._oneof_case_[0] = kGetDiagnostic;
-}
-inline void AutoCompleteRequest::clear_get_diagnostic() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  if (request_case() == kGetDiagnostic) {
-    if (GetArena() == nullptr) {
-      delete _impl_.request_.get_diagnostic_;
-    }
-    clear_has_request();
-  }
-}
-inline ::io::deephaven::proto::backplane::script::grpc::GetDiagnosticRequest* AutoCompleteRequest::release_get_diagnostic() {
-  // @@protoc_insertion_point(field_release:io.deephaven.proto.backplane.script.grpc.AutoCompleteRequest.get_diagnostic)
-  if (request_case() == kGetDiagnostic) {
-    clear_has_request();
-    auto* temp = _impl_.request_.get_diagnostic_;
-    if (GetArena() != nullptr) {
-      temp = ::google::protobuf::internal::DuplicateIfNonNull(temp);
-    }
-    _impl_.request_.get_diagnostic_ = nullptr;
-    return temp;
-  } else {
-    return nullptr;
-  }
-}
-inline const ::io::deephaven::proto::backplane::script::grpc::GetDiagnosticRequest& AutoCompleteRequest::_internal_get_diagnostic() const {
-  return request_case() == kGetDiagnostic ? *_impl_.request_.get_diagnostic_ : reinterpret_cast<::io::deephaven::proto::backplane::script::grpc::GetDiagnosticRequest&>(::io::deephaven::proto::backplane::script::grpc::_GetDiagnosticRequest_default_instance_);
-}
-inline const ::io::deephaven::proto::backplane::script::grpc::GetDiagnosticRequest& AutoCompleteRequest::get_diagnostic() const ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  // @@protoc_insertion_point(field_get:io.deephaven.proto.backplane.script.grpc.AutoCompleteRequest.get_diagnostic)
-  return _internal_get_diagnostic();
-}
-inline ::io::deephaven::proto::backplane::script::grpc::GetDiagnosticRequest* AutoCompleteRequest::unsafe_arena_release_get_diagnostic() {
-  // @@protoc_insertion_point(field_unsafe_arena_release:io.deephaven.proto.backplane.script.grpc.AutoCompleteRequest.get_diagnostic)
-  if (request_case() == kGetDiagnostic) {
-    clear_has_request();
-    auto* temp = _impl_.request_.get_diagnostic_;
-    _impl_.request_.get_diagnostic_ = nullptr;
-    return temp;
-  } else {
-    return nullptr;
-  }
-}
-inline void AutoCompleteRequest::unsafe_arena_set_allocated_get_diagnostic(::io::deephaven::proto::backplane::script::grpc::GetDiagnosticRequest* value) {
-  // We rely on the oneof clear method to free the earlier contents
-  // of this oneof. We can directly use the pointer we're given to
-  // set the new value.
-  clear_request();
-  if (value) {
-    set_has_get_diagnostic();
-    _impl_.request_.get_diagnostic_ = value;
-  }
-  // @@protoc_insertion_point(field_unsafe_arena_set_allocated:io.deephaven.proto.backplane.script.grpc.AutoCompleteRequest.get_diagnostic)
-}
-inline ::io::deephaven::proto::backplane::script::grpc::GetDiagnosticRequest* AutoCompleteRequest::_internal_mutable_get_diagnostic() {
-  if (request_case() != kGetDiagnostic) {
-    clear_request();
-    set_has_get_diagnostic();
-    _impl_.request_.get_diagnostic_ = CreateMaybeMessage<::io::deephaven::proto::backplane::script::grpc::GetDiagnosticRequest>(GetArena());
-  }
-  return _impl_.request_.get_diagnostic_;
-}
-inline ::io::deephaven::proto::backplane::script::grpc::GetDiagnosticRequest* AutoCompleteRequest::mutable_get_diagnostic() ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  ::io::deephaven::proto::backplane::script::grpc::GetDiagnosticRequest* _msg = _internal_mutable_get_diagnostic();
-  // @@protoc_insertion_point(field_mutable:io.deephaven.proto.backplane.script.grpc.AutoCompleteRequest.get_diagnostic)
-  return _msg;
-}
-
-// .io.deephaven.proto.backplane.script.grpc.CloseDocumentRequest close_document = 4;
-inline bool AutoCompleteRequest::has_close_document() const {
-  return request_case() == kCloseDocument;
-}
-inline bool AutoCompleteRequest::_internal_has_close_document() const {
-  return request_case() == kCloseDocument;
-}
-inline void AutoCompleteRequest::set_has_close_document() {
-  _impl_._oneof_case_[0] = kCloseDocument;
-}
-inline void AutoCompleteRequest::clear_close_document() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  if (request_case() == kCloseDocument) {
-    if (GetArena() == nullptr) {
-      delete _impl_.request_.close_document_;
-    }
-    clear_has_request();
-  }
-}
-inline ::io::deephaven::proto::backplane::script::grpc::CloseDocumentRequest* AutoCompleteRequest::release_close_document() {
-  // @@protoc_insertion_point(field_release:io.deephaven.proto.backplane.script.grpc.AutoCompleteRequest.close_document)
-  if (request_case() == kCloseDocument) {
-    clear_has_request();
-    auto* temp = _impl_.request_.close_document_;
-    if (GetArena() != nullptr) {
-      temp = ::google::protobuf::internal::DuplicateIfNonNull(temp);
-    }
-    _impl_.request_.close_document_ = nullptr;
-    return temp;
-  } else {
-    return nullptr;
-  }
-}
-inline const ::io::deephaven::proto::backplane::script::grpc::CloseDocumentRequest& AutoCompleteRequest::_internal_close_document() const {
-  return request_case() == kCloseDocument ? *_impl_.request_.close_document_ : reinterpret_cast<::io::deephaven::proto::backplane::script::grpc::CloseDocumentRequest&>(::io::deephaven::proto::backplane::script::grpc::_CloseDocumentRequest_default_instance_);
-}
-inline const ::io::deephaven::proto::backplane::script::grpc::CloseDocumentRequest& AutoCompleteRequest::close_document() const ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  // @@protoc_insertion_point(field_get:io.deephaven.proto.backplane.script.grpc.AutoCompleteRequest.close_document)
-  return _internal_close_document();
-}
-inline ::io::deephaven::proto::backplane::script::grpc::CloseDocumentRequest* AutoCompleteRequest::unsafe_arena_release_close_document() {
-  // @@protoc_insertion_point(field_unsafe_arena_release:io.deephaven.proto.backplane.script.grpc.AutoCompleteRequest.close_document)
-  if (request_case() == kCloseDocument) {
-    clear_has_request();
-    auto* temp = _impl_.request_.close_document_;
-    _impl_.request_.close_document_ = nullptr;
-    return temp;
-  } else {
-    return nullptr;
-  }
-}
-inline void AutoCompleteRequest::unsafe_arena_set_allocated_close_document(::io::deephaven::proto::backplane::script::grpc::CloseDocumentRequest* value) {
-  // We rely on the oneof clear method to free the earlier contents
-  // of this oneof. We can directly use the pointer we're given to
-  // set the new value.
-  clear_request();
-  if (value) {
-    set_has_close_document();
-    _impl_.request_.close_document_ = value;
-  }
-  // @@protoc_insertion_point(field_unsafe_arena_set_allocated:io.deephaven.proto.backplane.script.grpc.AutoCompleteRequest.close_document)
-}
-inline ::io::deephaven::proto::backplane::script::grpc::CloseDocumentRequest* AutoCompleteRequest::_internal_mutable_close_document() {
-  if (request_case() != kCloseDocument) {
-    clear_request();
-    set_has_close_document();
-    _impl_.request_.close_document_ = CreateMaybeMessage<::io::deephaven::proto::backplane::script::grpc::CloseDocumentRequest>(GetArena());
-  }
-  return _impl_.request_.close_document_;
-}
-inline ::io::deephaven::proto::backplane::script::grpc::CloseDocumentRequest* AutoCompleteRequest::mutable_close_document() ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  ::io::deephaven::proto::backplane::script::grpc::CloseDocumentRequest* _msg = _internal_mutable_close_document();
-  // @@protoc_insertion_point(field_mutable:io.deephaven.proto.backplane.script.grpc.AutoCompleteRequest.close_document)
-  return _msg;
-}
-
-inline bool AutoCompleteRequest::has_request() const {
-  return request_case() != REQUEST_NOT_SET;
-}
-inline void AutoCompleteRequest::clear_has_request() {
-  _impl_._oneof_case_[0] = REQUEST_NOT_SET;
-}
-inline AutoCompleteRequest::RequestCase AutoCompleteRequest::request_case() const {
-  return AutoCompleteRequest::RequestCase(_impl_._oneof_case_[0]);
-}
-// -------------------------------------------------------------------
-
-// AutoCompleteResponse
-
-// int32 request_id = 2;
-inline void AutoCompleteResponse::clear_request_id() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  _impl_.request_id_ = 0;
-}
-inline ::int32_t AutoCompleteResponse::request_id() const {
-  // @@protoc_insertion_point(field_get:io.deephaven.proto.backplane.script.grpc.AutoCompleteResponse.request_id)
-  return _internal_request_id();
-}
-inline void AutoCompleteResponse::set_request_id(::int32_t value) {
-  _internal_set_request_id(value);
-  // @@protoc_insertion_point(field_set:io.deephaven.proto.backplane.script.grpc.AutoCompleteResponse.request_id)
-}
-inline ::int32_t AutoCompleteResponse::_internal_request_id() const {
-  PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race);
-  return _impl_.request_id_;
-}
-inline void AutoCompleteResponse::_internal_set_request_id(::int32_t value) {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  ;
-  _impl_.request_id_ = value;
-}
-
-// bool success = 3;
-inline void AutoCompleteResponse::clear_success() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  _impl_.success_ = false;
-}
-inline bool AutoCompleteResponse::success() const {
-  // @@protoc_insertion_point(field_get:io.deephaven.proto.backplane.script.grpc.AutoCompleteResponse.success)
-  return _internal_success();
-}
-inline void AutoCompleteResponse::set_success(bool value) {
-  _internal_set_success(value);
-  // @@protoc_insertion_point(field_set:io.deephaven.proto.backplane.script.grpc.AutoCompleteResponse.success)
-}
-inline bool AutoCompleteResponse::_internal_success() const {
-  PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race);
-  return _impl_.success_;
-}
-inline void AutoCompleteResponse::_internal_set_success(bool value) {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  ;
-  _impl_.success_ = value;
-}
-
-// .io.deephaven.proto.backplane.script.grpc.GetCompletionItemsResponse completion_items = 1;
-inline bool AutoCompleteResponse::has_completion_items() const {
-  return response_case() == kCompletionItems;
-}
-inline bool AutoCompleteResponse::_internal_has_completion_items() const {
-  return response_case() == kCompletionItems;
-}
-inline void AutoCompleteResponse::set_has_completion_items() {
-  _impl_._oneof_case_[0] = kCompletionItems;
-}
-inline void AutoCompleteResponse::clear_completion_items() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  if (response_case() == kCompletionItems) {
-    if (GetArena() == nullptr) {
-      delete _impl_.response_.completion_items_;
-    }
-    clear_has_response();
-  }
-}
-inline ::io::deephaven::proto::backplane::script::grpc::GetCompletionItemsResponse* AutoCompleteResponse::release_completion_items() {
-  // @@protoc_insertion_point(field_release:io.deephaven.proto.backplane.script.grpc.AutoCompleteResponse.completion_items)
-  if (response_case() == kCompletionItems) {
-    clear_has_response();
-    auto* temp = _impl_.response_.completion_items_;
-    if (GetArena() != nullptr) {
-      temp = ::google::protobuf::internal::DuplicateIfNonNull(temp);
-    }
-    _impl_.response_.completion_items_ = nullptr;
-    return temp;
-  } else {
-    return nullptr;
-  }
-}
-inline const ::io::deephaven::proto::backplane::script::grpc::GetCompletionItemsResponse& AutoCompleteResponse::_internal_completion_items() const {
-  return response_case() == kCompletionItems ? *_impl_.response_.completion_items_ : reinterpret_cast<::io::deephaven::proto::backplane::script::grpc::GetCompletionItemsResponse&>(::io::deephaven::proto::backplane::script::grpc::_GetCompletionItemsResponse_default_instance_);
-}
-inline const ::io::deephaven::proto::backplane::script::grpc::GetCompletionItemsResponse& AutoCompleteResponse::completion_items() const ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  // @@protoc_insertion_point(field_get:io.deephaven.proto.backplane.script.grpc.AutoCompleteResponse.completion_items)
-  return _internal_completion_items();
-}
-inline ::io::deephaven::proto::backplane::script::grpc::GetCompletionItemsResponse* AutoCompleteResponse::unsafe_arena_release_completion_items() {
-  // @@protoc_insertion_point(field_unsafe_arena_release:io.deephaven.proto.backplane.script.grpc.AutoCompleteResponse.completion_items)
-  if (response_case() == kCompletionItems) {
-    clear_has_response();
-    auto* temp = _impl_.response_.completion_items_;
-    _impl_.response_.completion_items_ = nullptr;
-    return temp;
-  } else {
-    return nullptr;
-  }
-}
-inline void AutoCompleteResponse::unsafe_arena_set_allocated_completion_items(::io::deephaven::proto::backplane::script::grpc::GetCompletionItemsResponse* value) {
-  // We rely on the oneof clear method to free the earlier contents
-  // of this oneof. We can directly use the pointer we're given to
-  // set the new value.
-  clear_response();
-  if (value) {
-    set_has_completion_items();
-    _impl_.response_.completion_items_ = value;
-  }
-  // @@protoc_insertion_point(field_unsafe_arena_set_allocated:io.deephaven.proto.backplane.script.grpc.AutoCompleteResponse.completion_items)
-}
-inline ::io::deephaven::proto::backplane::script::grpc::GetCompletionItemsResponse* AutoCompleteResponse::_internal_mutable_completion_items() {
-  if (response_case() != kCompletionItems) {
-    clear_response();
-    set_has_completion_items();
-    _impl_.response_.completion_items_ = CreateMaybeMessage<::io::deephaven::proto::backplane::script::grpc::GetCompletionItemsResponse>(GetArena());
-  }
-  return _impl_.response_.completion_items_;
-}
-inline ::io::deephaven::proto::backplane::script::grpc::GetCompletionItemsResponse* AutoCompleteResponse::mutable_completion_items() ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  ::io::deephaven::proto::backplane::script::grpc::GetCompletionItemsResponse* _msg = _internal_mutable_completion_items();
-  // @@protoc_insertion_point(field_mutable:io.deephaven.proto.backplane.script.grpc.AutoCompleteResponse.completion_items)
-  return _msg;
-}
-
-// .io.deephaven.proto.backplane.script.grpc.GetSignatureHelpResponse signatures = 4;
-inline bool AutoCompleteResponse::has_signatures() const {
-  return response_case() == kSignatures;
-}
-inline bool AutoCompleteResponse::_internal_has_signatures() const {
-  return response_case() == kSignatures;
-}
-inline void AutoCompleteResponse::set_has_signatures() {
-  _impl_._oneof_case_[0] = kSignatures;
-}
-inline void AutoCompleteResponse::clear_signatures() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  if (response_case() == kSignatures) {
-    if (GetArena() == nullptr) {
-      delete _impl_.response_.signatures_;
-    }
-    clear_has_response();
-  }
-}
-inline ::io::deephaven::proto::backplane::script::grpc::GetSignatureHelpResponse* AutoCompleteResponse::release_signatures() {
-  // @@protoc_insertion_point(field_release:io.deephaven.proto.backplane.script.grpc.AutoCompleteResponse.signatures)
-  if (response_case() == kSignatures) {
-    clear_has_response();
-    auto* temp = _impl_.response_.signatures_;
-    if (GetArena() != nullptr) {
-      temp = ::google::protobuf::internal::DuplicateIfNonNull(temp);
-    }
-    _impl_.response_.signatures_ = nullptr;
-    return temp;
-  } else {
-    return nullptr;
-  }
-}
-inline const ::io::deephaven::proto::backplane::script::grpc::GetSignatureHelpResponse& AutoCompleteResponse::_internal_signatures() const {
-  return response_case() == kSignatures ? *_impl_.response_.signatures_ : reinterpret_cast<::io::deephaven::proto::backplane::script::grpc::GetSignatureHelpResponse&>(::io::deephaven::proto::backplane::script::grpc::_GetSignatureHelpResponse_default_instance_);
-}
-inline const ::io::deephaven::proto::backplane::script::grpc::GetSignatureHelpResponse& AutoCompleteResponse::signatures() const ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  // @@protoc_insertion_point(field_get:io.deephaven.proto.backplane.script.grpc.AutoCompleteResponse.signatures)
-  return _internal_signatures();
-}
-inline ::io::deephaven::proto::backplane::script::grpc::GetSignatureHelpResponse* AutoCompleteResponse::unsafe_arena_release_signatures() {
-  // @@protoc_insertion_point(field_unsafe_arena_release:io.deephaven.proto.backplane.script.grpc.AutoCompleteResponse.signatures)
-  if (response_case() == kSignatures) {
-    clear_has_response();
-    auto* temp = _impl_.response_.signatures_;
-    _impl_.response_.signatures_ = nullptr;
-    return temp;
-  } else {
-    return nullptr;
-  }
-}
-inline void AutoCompleteResponse::unsafe_arena_set_allocated_signatures(::io::deephaven::proto::backplane::script::grpc::GetSignatureHelpResponse* value) {
-  // We rely on the oneof clear method to free the earlier contents
-  // of this oneof. We can directly use the pointer we're given to
-  // set the new value.
-  clear_response();
-  if (value) {
-    set_has_signatures();
-    _impl_.response_.signatures_ = value;
-  }
-  // @@protoc_insertion_point(field_unsafe_arena_set_allocated:io.deephaven.proto.backplane.script.grpc.AutoCompleteResponse.signatures)
-}
-inline ::io::deephaven::proto::backplane::script::grpc::GetSignatureHelpResponse* AutoCompleteResponse::_internal_mutable_signatures() {
-  if (response_case() != kSignatures) {
-    clear_response();
-    set_has_signatures();
-    _impl_.response_.signatures_ = CreateMaybeMessage<::io::deephaven::proto::backplane::script::grpc::GetSignatureHelpResponse>(GetArena());
-  }
-  return _impl_.response_.signatures_;
-}
-inline ::io::deephaven::proto::backplane::script::grpc::GetSignatureHelpResponse* AutoCompleteResponse::mutable_signatures() ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  ::io::deephaven::proto::backplane::script::grpc::GetSignatureHelpResponse* _msg = _internal_mutable_signatures();
-  // @@protoc_insertion_point(field_mutable:io.deephaven.proto.backplane.script.grpc.AutoCompleteResponse.signatures)
-  return _msg;
-}
-
-// .io.deephaven.proto.backplane.script.grpc.GetHoverResponse hover = 5;
-inline bool AutoCompleteResponse::has_hover() const {
-  return response_case() == kHover;
-}
-inline bool AutoCompleteResponse::_internal_has_hover() const {
-  return response_case() == kHover;
-}
-inline void AutoCompleteResponse::set_has_hover() {
-  _impl_._oneof_case_[0] = kHover;
-}
-inline void AutoCompleteResponse::clear_hover() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  if (response_case() == kHover) {
-    if (GetArena() == nullptr) {
-      delete _impl_.response_.hover_;
-    }
-    clear_has_response();
-  }
-}
-inline ::io::deephaven::proto::backplane::script::grpc::GetHoverResponse* AutoCompleteResponse::release_hover() {
-  // @@protoc_insertion_point(field_release:io.deephaven.proto.backplane.script.grpc.AutoCompleteResponse.hover)
-  if (response_case() == kHover) {
-    clear_has_response();
-    auto* temp = _impl_.response_.hover_;
-    if (GetArena() != nullptr) {
-      temp = ::google::protobuf::internal::DuplicateIfNonNull(temp);
-    }
-    _impl_.response_.hover_ = nullptr;
-    return temp;
-  } else {
-    return nullptr;
-  }
-}
-inline const ::io::deephaven::proto::backplane::script::grpc::GetHoverResponse& AutoCompleteResponse::_internal_hover() const {
-  return response_case() == kHover ? *_impl_.response_.hover_ : reinterpret_cast<::io::deephaven::proto::backplane::script::grpc::GetHoverResponse&>(::io::deephaven::proto::backplane::script::grpc::_GetHoverResponse_default_instance_);
-}
-inline const ::io::deephaven::proto::backplane::script::grpc::GetHoverResponse& AutoCompleteResponse::hover() const ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  // @@protoc_insertion_point(field_get:io.deephaven.proto.backplane.script.grpc.AutoCompleteResponse.hover)
-  return _internal_hover();
-}
-inline ::io::deephaven::proto::backplane::script::grpc::GetHoverResponse* AutoCompleteResponse::unsafe_arena_release_hover() {
-  // @@protoc_insertion_point(field_unsafe_arena_release:io.deephaven.proto.backplane.script.grpc.AutoCompleteResponse.hover)
-  if (response_case() == kHover) {
-    clear_has_response();
-    auto* temp = _impl_.response_.hover_;
-    _impl_.response_.hover_ = nullptr;
-    return temp;
-  } else {
-    return nullptr;
-  }
-}
-inline void AutoCompleteResponse::unsafe_arena_set_allocated_hover(::io::deephaven::proto::backplane::script::grpc::GetHoverResponse* value) {
-  // We rely on the oneof clear method to free the earlier contents
-  // of this oneof. We can directly use the pointer we're given to
-  // set the new value.
-  clear_response();
-  if (value) {
-    set_has_hover();
-    _impl_.response_.hover_ = value;
-  }
-  // @@protoc_insertion_point(field_unsafe_arena_set_allocated:io.deephaven.proto.backplane.script.grpc.AutoCompleteResponse.hover)
-}
-inline ::io::deephaven::proto::backplane::script::grpc::GetHoverResponse* AutoCompleteResponse::_internal_mutable_hover() {
-  if (response_case() != kHover) {
-    clear_response();
-    set_has_hover();
-    _impl_.response_.hover_ = CreateMaybeMessage<::io::deephaven::proto::backplane::script::grpc::GetHoverResponse>(GetArena());
-  }
-  return _impl_.response_.hover_;
-}
-inline ::io::deephaven::proto::backplane::script::grpc::GetHoverResponse* AutoCompleteResponse::mutable_hover() ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  ::io::deephaven::proto::backplane::script::grpc::GetHoverResponse* _msg = _internal_mutable_hover();
-  // @@protoc_insertion_point(field_mutable:io.deephaven.proto.backplane.script.grpc.AutoCompleteResponse.hover)
-  return _msg;
-}
-
-// .io.deephaven.proto.backplane.script.grpc.GetPullDiagnosticResponse diagnostic = 6;
-inline bool AutoCompleteResponse::has_diagnostic() const {
-  return response_case() == kDiagnostic;
-}
-inline bool AutoCompleteResponse::_internal_has_diagnostic() const {
-  return response_case() == kDiagnostic;
-}
-inline void AutoCompleteResponse::set_has_diagnostic() {
-  _impl_._oneof_case_[0] = kDiagnostic;
-}
-inline void AutoCompleteResponse::clear_diagnostic() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  if (response_case() == kDiagnostic) {
-    if (GetArena() == nullptr) {
-      delete _impl_.response_.diagnostic_;
-    }
-    clear_has_response();
-  }
-}
-inline ::io::deephaven::proto::backplane::script::grpc::GetPullDiagnosticResponse* AutoCompleteResponse::release_diagnostic() {
-  // @@protoc_insertion_point(field_release:io.deephaven.proto.backplane.script.grpc.AutoCompleteResponse.diagnostic)
-  if (response_case() == kDiagnostic) {
-    clear_has_response();
-    auto* temp = _impl_.response_.diagnostic_;
-    if (GetArena() != nullptr) {
-      temp = ::google::protobuf::internal::DuplicateIfNonNull(temp);
-    }
-    _impl_.response_.diagnostic_ = nullptr;
-    return temp;
-  } else {
-    return nullptr;
-  }
-}
-inline const ::io::deephaven::proto::backplane::script::grpc::GetPullDiagnosticResponse& AutoCompleteResponse::_internal_diagnostic() const {
-  return response_case() == kDiagnostic ? *_impl_.response_.diagnostic_ : reinterpret_cast<::io::deephaven::proto::backplane::script::grpc::GetPullDiagnosticResponse&>(::io::deephaven::proto::backplane::script::grpc::_GetPullDiagnosticResponse_default_instance_);
-}
-inline const ::io::deephaven::proto::backplane::script::grpc::GetPullDiagnosticResponse& AutoCompleteResponse::diagnostic() const ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  // @@protoc_insertion_point(field_get:io.deephaven.proto.backplane.script.grpc.AutoCompleteResponse.diagnostic)
-  return _internal_diagnostic();
-}
-inline ::io::deephaven::proto::backplane::script::grpc::GetPullDiagnosticResponse* AutoCompleteResponse::unsafe_arena_release_diagnostic() {
-  // @@protoc_insertion_point(field_unsafe_arena_release:io.deephaven.proto.backplane.script.grpc.AutoCompleteResponse.diagnostic)
-  if (response_case() == kDiagnostic) {
-    clear_has_response();
-    auto* temp = _impl_.response_.diagnostic_;
-    _impl_.response_.diagnostic_ = nullptr;
-    return temp;
-  } else {
-    return nullptr;
-  }
-}
-inline void AutoCompleteResponse::unsafe_arena_set_allocated_diagnostic(::io::deephaven::proto::backplane::script::grpc::GetPullDiagnosticResponse* value) {
-  // We rely on the oneof clear method to free the earlier contents
-  // of this oneof. We can directly use the pointer we're given to
-  // set the new value.
-  clear_response();
-  if (value) {
-    set_has_diagnostic();
-    _impl_.response_.diagnostic_ = value;
-  }
-  // @@protoc_insertion_point(field_unsafe_arena_set_allocated:io.deephaven.proto.backplane.script.grpc.AutoCompleteResponse.diagnostic)
-}
-inline ::io::deephaven::proto::backplane::script::grpc::GetPullDiagnosticResponse* AutoCompleteResponse::_internal_mutable_diagnostic() {
-  if (response_case() != kDiagnostic) {
-    clear_response();
-    set_has_diagnostic();
-    _impl_.response_.diagnostic_ = CreateMaybeMessage<::io::deephaven::proto::backplane::script::grpc::GetPullDiagnosticResponse>(GetArena());
-  }
-  return _impl_.response_.diagnostic_;
-}
-inline ::io::deephaven::proto::backplane::script::grpc::GetPullDiagnosticResponse* AutoCompleteResponse::mutable_diagnostic() ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  ::io::deephaven::proto::backplane::script::grpc::GetPullDiagnosticResponse* _msg = _internal_mutable_diagnostic();
-  // @@protoc_insertion_point(field_mutable:io.deephaven.proto.backplane.script.grpc.AutoCompleteResponse.diagnostic)
-  return _msg;
-}
-
-// .io.deephaven.proto.backplane.script.grpc.GetPublishDiagnosticResponse diagnostic_publish = 7;
-inline bool AutoCompleteResponse::has_diagnostic_publish() const {
-  return response_case() == kDiagnosticPublish;
-}
-inline bool AutoCompleteResponse::_internal_has_diagnostic_publish() const {
-  return response_case() == kDiagnosticPublish;
-}
-inline void AutoCompleteResponse::set_has_diagnostic_publish() {
-  _impl_._oneof_case_[0] = kDiagnosticPublish;
-}
-inline void AutoCompleteResponse::clear_diagnostic_publish() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  if (response_case() == kDiagnosticPublish) {
-    if (GetArena() == nullptr) {
-      delete _impl_.response_.diagnostic_publish_;
-    }
-    clear_has_response();
-  }
-}
-inline ::io::deephaven::proto::backplane::script::grpc::GetPublishDiagnosticResponse* AutoCompleteResponse::release_diagnostic_publish() {
-  // @@protoc_insertion_point(field_release:io.deephaven.proto.backplane.script.grpc.AutoCompleteResponse.diagnostic_publish)
-  if (response_case() == kDiagnosticPublish) {
-    clear_has_response();
-    auto* temp = _impl_.response_.diagnostic_publish_;
-    if (GetArena() != nullptr) {
-      temp = ::google::protobuf::internal::DuplicateIfNonNull(temp);
-    }
-    _impl_.response_.diagnostic_publish_ = nullptr;
-    return temp;
-  } else {
-    return nullptr;
-  }
-}
-inline const ::io::deephaven::proto::backplane::script::grpc::GetPublishDiagnosticResponse& AutoCompleteResponse::_internal_diagnostic_publish() const {
-  return response_case() == kDiagnosticPublish ? *_impl_.response_.diagnostic_publish_ : reinterpret_cast<::io::deephaven::proto::backplane::script::grpc::GetPublishDiagnosticResponse&>(::io::deephaven::proto::backplane::script::grpc::_GetPublishDiagnosticResponse_default_instance_);
-}
-inline const ::io::deephaven::proto::backplane::script::grpc::GetPublishDiagnosticResponse& AutoCompleteResponse::diagnostic_publish() const ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  // @@protoc_insertion_point(field_get:io.deephaven.proto.backplane.script.grpc.AutoCompleteResponse.diagnostic_publish)
-  return _internal_diagnostic_publish();
-}
-inline ::io::deephaven::proto::backplane::script::grpc::GetPublishDiagnosticResponse* AutoCompleteResponse::unsafe_arena_release_diagnostic_publish() {
-  // @@protoc_insertion_point(field_unsafe_arena_release:io.deephaven.proto.backplane.script.grpc.AutoCompleteResponse.diagnostic_publish)
-  if (response_case() == kDiagnosticPublish) {
-    clear_has_response();
-    auto* temp = _impl_.response_.diagnostic_publish_;
-    _impl_.response_.diagnostic_publish_ = nullptr;
-    return temp;
-  } else {
-    return nullptr;
-  }
-}
-inline void AutoCompleteResponse::unsafe_arena_set_allocated_diagnostic_publish(::io::deephaven::proto::backplane::script::grpc::GetPublishDiagnosticResponse* value) {
-  // We rely on the oneof clear method to free the earlier contents
-  // of this oneof. We can directly use the pointer we're given to
-  // set the new value.
-  clear_response();
-  if (value) {
-    set_has_diagnostic_publish();
-    _impl_.response_.diagnostic_publish_ = value;
-  }
-  // @@protoc_insertion_point(field_unsafe_arena_set_allocated:io.deephaven.proto.backplane.script.grpc.AutoCompleteResponse.diagnostic_publish)
-}
-inline ::io::deephaven::proto::backplane::script::grpc::GetPublishDiagnosticResponse* AutoCompleteResponse::_internal_mutable_diagnostic_publish() {
-  if (response_case() != kDiagnosticPublish) {
-    clear_response();
-    set_has_diagnostic_publish();
-    _impl_.response_.diagnostic_publish_ = CreateMaybeMessage<::io::deephaven::proto::backplane::script::grpc::GetPublishDiagnosticResponse>(GetArena());
-  }
-  return _impl_.response_.diagnostic_publish_;
-}
-inline ::io::deephaven::proto::backplane::script::grpc::GetPublishDiagnosticResponse* AutoCompleteResponse::mutable_diagnostic_publish() ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  ::io::deephaven::proto::backplane::script::grpc::GetPublishDiagnosticResponse* _msg = _internal_mutable_diagnostic_publish();
-  // @@protoc_insertion_point(field_mutable:io.deephaven.proto.backplane.script.grpc.AutoCompleteResponse.diagnostic_publish)
-  return _msg;
-}
-
-inline bool AutoCompleteResponse::has_response() const {
-  return response_case() != RESPONSE_NOT_SET;
-}
-inline void AutoCompleteResponse::clear_has_response() {
-  _impl_._oneof_case_[0] = RESPONSE_NOT_SET;
-}
-inline AutoCompleteResponse::ResponseCase AutoCompleteResponse::response_case() const {
-  return AutoCompleteResponse::ResponseCase(_impl_._oneof_case_[0]);
-}
-// -------------------------------------------------------------------
-
-// BrowserNextResponse
-
-// -------------------------------------------------------------------
-
-// OpenDocumentRequest
-
-// .io.deephaven.proto.backplane.grpc.Ticket console_id = 1 [deprecated = true];
-inline bool OpenDocumentRequest::has_console_id() const {
-  bool value = (_impl_._has_bits_[0] & 0x00000001u) != 0;
-  PROTOBUF_ASSUME(!value || _impl_.console_id_ != nullptr);
-  return value;
-}
-inline const ::io::deephaven::proto::backplane::grpc::Ticket& OpenDocumentRequest::_internal_console_id() const {
-  PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race);
-  const ::io::deephaven::proto::backplane::grpc::Ticket* p = _impl_.console_id_;
-  return p != nullptr ? *p : reinterpret_cast<const ::io::deephaven::proto::backplane::grpc::Ticket&>(::io::deephaven::proto::backplane::grpc::_Ticket_default_instance_);
-}
-inline const ::io::deephaven::proto::backplane::grpc::Ticket& OpenDocumentRequest::console_id() const ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  // @@protoc_insertion_point(field_get:io.deephaven.proto.backplane.script.grpc.OpenDocumentRequest.console_id)
-  return _internal_console_id();
-}
-inline void OpenDocumentRequest::unsafe_arena_set_allocated_console_id(::io::deephaven::proto::backplane::grpc::Ticket* value) {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  if (GetArena() == nullptr) {
-    delete reinterpret_cast<::google::protobuf::MessageLite*>(_impl_.console_id_);
-  }
-  _impl_.console_id_ = reinterpret_cast<::io::deephaven::proto::backplane::grpc::Ticket*>(value);
-  if (value != nullptr) {
-    _impl_._has_bits_[0] |= 0x00000001u;
-  } else {
-    _impl_._has_bits_[0] &= ~0x00000001u;
-  }
-  // @@protoc_insertion_point(field_unsafe_arena_set_allocated:io.deephaven.proto.backplane.script.grpc.OpenDocumentRequest.console_id)
-}
-inline ::io::deephaven::proto::backplane::grpc::Ticket* OpenDocumentRequest::release_console_id() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-
-  _impl_._has_bits_[0] &= ~0x00000001u;
-  ::io::deephaven::proto::backplane::grpc::Ticket* released = _impl_.console_id_;
-  _impl_.console_id_ = nullptr;
-#ifdef PROTOBUF_FORCE_COPY_IN_RELEASE
-  auto* old = reinterpret_cast<::google::protobuf::MessageLite*>(released);
-  released = ::google::protobuf::internal::DuplicateIfNonNull(released);
-  if (GetArena() == nullptr) {
-    delete old;
-  }
-#else   // PROTOBUF_FORCE_COPY_IN_RELEASE
-  if (GetArena() != nullptr) {
-    released = ::google::protobuf::internal::DuplicateIfNonNull(released);
-  }
-#endif  // !PROTOBUF_FORCE_COPY_IN_RELEASE
-  return released;
-}
-inline ::io::deephaven::proto::backplane::grpc::Ticket* OpenDocumentRequest::unsafe_arena_release_console_id() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  // @@protoc_insertion_point(field_release:io.deephaven.proto.backplane.script.grpc.OpenDocumentRequest.console_id)
-
-  _impl_._has_bits_[0] &= ~0x00000001u;
-  ::io::deephaven::proto::backplane::grpc::Ticket* temp = _impl_.console_id_;
-  _impl_.console_id_ = nullptr;
-  return temp;
-}
-inline ::io::deephaven::proto::backplane::grpc::Ticket* OpenDocumentRequest::_internal_mutable_console_id() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  _impl_._has_bits_[0] |= 0x00000001u;
-  if (_impl_.console_id_ == nullptr) {
-    auto* p = CreateMaybeMessage<::io::deephaven::proto::backplane::grpc::Ticket>(GetArena());
-    _impl_.console_id_ = reinterpret_cast<::io::deephaven::proto::backplane::grpc::Ticket*>(p);
-  }
-  return _impl_.console_id_;
-}
-inline ::io::deephaven::proto::backplane::grpc::Ticket* OpenDocumentRequest::mutable_console_id() ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  ::io::deephaven::proto::backplane::grpc::Ticket* _msg = _internal_mutable_console_id();
-  // @@protoc_insertion_point(field_mutable:io.deephaven.proto.backplane.script.grpc.OpenDocumentRequest.console_id)
-  return _msg;
-}
-inline void OpenDocumentRequest::set_allocated_console_id(::io::deephaven::proto::backplane::grpc::Ticket* value) {
-  ::google::protobuf::Arena* message_arena = GetArena();
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  if (message_arena == nullptr) {
-    delete reinterpret_cast<::google::protobuf::MessageLite*>(_impl_.console_id_);
-  }
-
-  if (value != nullptr) {
-    ::google::protobuf::Arena* submessage_arena = reinterpret_cast<::google::protobuf::MessageLite*>(value)->GetArena();
-    if (message_arena != submessage_arena) {
-      value = ::google::protobuf::internal::GetOwnedMessage(message_arena, value, submessage_arena);
-    }
-    _impl_._has_bits_[0] |= 0x00000001u;
-  } else {
-    _impl_._has_bits_[0] &= ~0x00000001u;
-  }
-
-  _impl_.console_id_ = reinterpret_cast<::io::deephaven::proto::backplane::grpc::Ticket*>(value);
-  // @@protoc_insertion_point(field_set_allocated:io.deephaven.proto.backplane.script.grpc.OpenDocumentRequest.console_id)
-}
-
-// .io.deephaven.proto.backplane.script.grpc.TextDocumentItem text_document = 2;
-inline bool OpenDocumentRequest::has_text_document() const {
-  bool value = (_impl_._has_bits_[0] & 0x00000002u) != 0;
-  PROTOBUF_ASSUME(!value || _impl_.text_document_ != nullptr);
-  return value;
-}
-inline void OpenDocumentRequest::clear_text_document() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  if (_impl_.text_document_ != nullptr) _impl_.text_document_->Clear();
-  _impl_._has_bits_[0] &= ~0x00000002u;
-}
-inline const ::io::deephaven::proto::backplane::script::grpc::TextDocumentItem& OpenDocumentRequest::_internal_text_document() const {
-  PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race);
-  const ::io::deephaven::proto::backplane::script::grpc::TextDocumentItem* p = _impl_.text_document_;
-  return p != nullptr ? *p : reinterpret_cast<const ::io::deephaven::proto::backplane::script::grpc::TextDocumentItem&>(::io::deephaven::proto::backplane::script::grpc::_TextDocumentItem_default_instance_);
-}
-inline const ::io::deephaven::proto::backplane::script::grpc::TextDocumentItem& OpenDocumentRequest::text_document() const ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  // @@protoc_insertion_point(field_get:io.deephaven.proto.backplane.script.grpc.OpenDocumentRequest.text_document)
-  return _internal_text_document();
-}
-inline void OpenDocumentRequest::unsafe_arena_set_allocated_text_document(::io::deephaven::proto::backplane::script::grpc::TextDocumentItem* value) {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  if (GetArena() == nullptr) {
-    delete reinterpret_cast<::google::protobuf::MessageLite*>(_impl_.text_document_);
-  }
-  _impl_.text_document_ = reinterpret_cast<::io::deephaven::proto::backplane::script::grpc::TextDocumentItem*>(value);
-  if (value != nullptr) {
-    _impl_._has_bits_[0] |= 0x00000002u;
-  } else {
-    _impl_._has_bits_[0] &= ~0x00000002u;
-  }
-  // @@protoc_insertion_point(field_unsafe_arena_set_allocated:io.deephaven.proto.backplane.script.grpc.OpenDocumentRequest.text_document)
-}
-inline ::io::deephaven::proto::backplane::script::grpc::TextDocumentItem* OpenDocumentRequest::release_text_document() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-
-  _impl_._has_bits_[0] &= ~0x00000002u;
-  ::io::deephaven::proto::backplane::script::grpc::TextDocumentItem* released = _impl_.text_document_;
-  _impl_.text_document_ = nullptr;
-#ifdef PROTOBUF_FORCE_COPY_IN_RELEASE
-  auto* old = reinterpret_cast<::google::protobuf::MessageLite*>(released);
-  released = ::google::protobuf::internal::DuplicateIfNonNull(released);
-  if (GetArena() == nullptr) {
-    delete old;
-  }
-#else   // PROTOBUF_FORCE_COPY_IN_RELEASE
-  if (GetArena() != nullptr) {
-    released = ::google::protobuf::internal::DuplicateIfNonNull(released);
-  }
-#endif  // !PROTOBUF_FORCE_COPY_IN_RELEASE
-  return released;
-}
-inline ::io::deephaven::proto::backplane::script::grpc::TextDocumentItem* OpenDocumentRequest::unsafe_arena_release_text_document() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  // @@protoc_insertion_point(field_release:io.deephaven.proto.backplane.script.grpc.OpenDocumentRequest.text_document)
-
-  _impl_._has_bits_[0] &= ~0x00000002u;
-  ::io::deephaven::proto::backplane::script::grpc::TextDocumentItem* temp = _impl_.text_document_;
-  _impl_.text_document_ = nullptr;
-  return temp;
-}
-inline ::io::deephaven::proto::backplane::script::grpc::TextDocumentItem* OpenDocumentRequest::_internal_mutable_text_document() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  _impl_._has_bits_[0] |= 0x00000002u;
-  if (_impl_.text_document_ == nullptr) {
-    auto* p = CreateMaybeMessage<::io::deephaven::proto::backplane::script::grpc::TextDocumentItem>(GetArena());
-    _impl_.text_document_ = reinterpret_cast<::io::deephaven::proto::backplane::script::grpc::TextDocumentItem*>(p);
-  }
-  return _impl_.text_document_;
-}
-inline ::io::deephaven::proto::backplane::script::grpc::TextDocumentItem* OpenDocumentRequest::mutable_text_document() ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  ::io::deephaven::proto::backplane::script::grpc::TextDocumentItem* _msg = _internal_mutable_text_document();
-  // @@protoc_insertion_point(field_mutable:io.deephaven.proto.backplane.script.grpc.OpenDocumentRequest.text_document)
-  return _msg;
-}
-inline void OpenDocumentRequest::set_allocated_text_document(::io::deephaven::proto::backplane::script::grpc::TextDocumentItem* value) {
-  ::google::protobuf::Arena* message_arena = GetArena();
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  if (message_arena == nullptr) {
-    delete reinterpret_cast<::io::deephaven::proto::backplane::script::grpc::TextDocumentItem*>(_impl_.text_document_);
-  }
-
-  if (value != nullptr) {
-    ::google::protobuf::Arena* submessage_arena = reinterpret_cast<::io::deephaven::proto::backplane::script::grpc::TextDocumentItem*>(value)->GetArena();
-    if (message_arena != submessage_arena) {
-      value = ::google::protobuf::internal::GetOwnedMessage(message_arena, value, submessage_arena);
-    }
-    _impl_._has_bits_[0] |= 0x00000002u;
-  } else {
-    _impl_._has_bits_[0] &= ~0x00000002u;
-  }
-
-  _impl_.text_document_ = reinterpret_cast<::io::deephaven::proto::backplane::script::grpc::TextDocumentItem*>(value);
-  // @@protoc_insertion_point(field_set_allocated:io.deephaven.proto.backplane.script.grpc.OpenDocumentRequest.text_document)
-}
-
-// -------------------------------------------------------------------
-
-// TextDocumentItem
-
-// string uri = 1;
-inline void TextDocumentItem::clear_uri() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  _impl_.uri_.ClearToEmpty();
-}
-inline const std::string& TextDocumentItem::uri() const
-    ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  // @@protoc_insertion_point(field_get:io.deephaven.proto.backplane.script.grpc.TextDocumentItem.uri)
-  return _internal_uri();
-}
-template <typename Arg_, typename... Args_>
-inline PROTOBUF_ALWAYS_INLINE void TextDocumentItem::set_uri(Arg_&& arg,
-                                                     Args_... args) {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  ;
-  _impl_.uri_.Set(static_cast<Arg_&&>(arg), args..., GetArena());
-  // @@protoc_insertion_point(field_set:io.deephaven.proto.backplane.script.grpc.TextDocumentItem.uri)
-}
-inline std::string* TextDocumentItem::mutable_uri() ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  std::string* _s = _internal_mutable_uri();
-  // @@protoc_insertion_point(field_mutable:io.deephaven.proto.backplane.script.grpc.TextDocumentItem.uri)
-  return _s;
-}
-inline const std::string& TextDocumentItem::_internal_uri() const {
-  PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race);
-  return _impl_.uri_.Get();
-}
-inline void TextDocumentItem::_internal_set_uri(const std::string& value) {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  ;
-  _impl_.uri_.Set(value, GetArena());
-}
-inline std::string* TextDocumentItem::_internal_mutable_uri() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  ;
-  return _impl_.uri_.Mutable( GetArena());
-}
-inline std::string* TextDocumentItem::release_uri() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  // @@protoc_insertion_point(field_release:io.deephaven.proto.backplane.script.grpc.TextDocumentItem.uri)
-  return _impl_.uri_.Release();
-}
-inline void TextDocumentItem::set_allocated_uri(std::string* value) {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  _impl_.uri_.SetAllocated(value, GetArena());
-  #ifdef PROTOBUF_FORCE_COPY_DEFAULT_STRING
-        if (_impl_.uri_.IsDefault()) {
-          _impl_.uri_.Set("", GetArena());
-        }
-  #endif  // PROTOBUF_FORCE_COPY_DEFAULT_STRING
-  // @@protoc_insertion_point(field_set_allocated:io.deephaven.proto.backplane.script.grpc.TextDocumentItem.uri)
-}
-
-// string language_id = 2;
-inline void TextDocumentItem::clear_language_id() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  _impl_.language_id_.ClearToEmpty();
-}
-inline const std::string& TextDocumentItem::language_id() const
-    ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  // @@protoc_insertion_point(field_get:io.deephaven.proto.backplane.script.grpc.TextDocumentItem.language_id)
-  return _internal_language_id();
-}
-template <typename Arg_, typename... Args_>
-inline PROTOBUF_ALWAYS_INLINE void TextDocumentItem::set_language_id(Arg_&& arg,
-                                                     Args_... args) {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  ;
-  _impl_.language_id_.Set(static_cast<Arg_&&>(arg), args..., GetArena());
-  // @@protoc_insertion_point(field_set:io.deephaven.proto.backplane.script.grpc.TextDocumentItem.language_id)
-}
-inline std::string* TextDocumentItem::mutable_language_id() ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  std::string* _s = _internal_mutable_language_id();
-  // @@protoc_insertion_point(field_mutable:io.deephaven.proto.backplane.script.grpc.TextDocumentItem.language_id)
-  return _s;
-}
-inline const std::string& TextDocumentItem::_internal_language_id() const {
-  PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race);
-  return _impl_.language_id_.Get();
-}
-inline void TextDocumentItem::_internal_set_language_id(const std::string& value) {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  ;
-  _impl_.language_id_.Set(value, GetArena());
-}
-inline std::string* TextDocumentItem::_internal_mutable_language_id() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  ;
-  return _impl_.language_id_.Mutable( GetArena());
-}
-inline std::string* TextDocumentItem::release_language_id() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  // @@protoc_insertion_point(field_release:io.deephaven.proto.backplane.script.grpc.TextDocumentItem.language_id)
-  return _impl_.language_id_.Release();
-}
-inline void TextDocumentItem::set_allocated_language_id(std::string* value) {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  _impl_.language_id_.SetAllocated(value, GetArena());
-  #ifdef PROTOBUF_FORCE_COPY_DEFAULT_STRING
-        if (_impl_.language_id_.IsDefault()) {
-          _impl_.language_id_.Set("", GetArena());
-        }
-  #endif  // PROTOBUF_FORCE_COPY_DEFAULT_STRING
-  // @@protoc_insertion_point(field_set_allocated:io.deephaven.proto.backplane.script.grpc.TextDocumentItem.language_id)
-}
-
-// int32 version = 3;
-inline void TextDocumentItem::clear_version() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  _impl_.version_ = 0;
-}
-inline ::int32_t TextDocumentItem::version() const {
-  // @@protoc_insertion_point(field_get:io.deephaven.proto.backplane.script.grpc.TextDocumentItem.version)
-  return _internal_version();
-}
-inline void TextDocumentItem::set_version(::int32_t value) {
-  _internal_set_version(value);
-  // @@protoc_insertion_point(field_set:io.deephaven.proto.backplane.script.grpc.TextDocumentItem.version)
-}
-inline ::int32_t TextDocumentItem::_internal_version() const {
-  PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race);
-  return _impl_.version_;
-}
-inline void TextDocumentItem::_internal_set_version(::int32_t value) {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  ;
-  _impl_.version_ = value;
-}
-
-// string text = 4;
-inline void TextDocumentItem::clear_text() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  _impl_.text_.ClearToEmpty();
-}
-inline const std::string& TextDocumentItem::text() const
-    ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  // @@protoc_insertion_point(field_get:io.deephaven.proto.backplane.script.grpc.TextDocumentItem.text)
-  return _internal_text();
-}
-template <typename Arg_, typename... Args_>
-inline PROTOBUF_ALWAYS_INLINE void TextDocumentItem::set_text(Arg_&& arg,
-                                                     Args_... args) {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  ;
-  _impl_.text_.Set(static_cast<Arg_&&>(arg), args..., GetArena());
-  // @@protoc_insertion_point(field_set:io.deephaven.proto.backplane.script.grpc.TextDocumentItem.text)
-}
-inline std::string* TextDocumentItem::mutable_text() ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  std::string* _s = _internal_mutable_text();
-  // @@protoc_insertion_point(field_mutable:io.deephaven.proto.backplane.script.grpc.TextDocumentItem.text)
-  return _s;
-}
-inline const std::string& TextDocumentItem::_internal_text() const {
-  PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race);
-  return _impl_.text_.Get();
-}
-inline void TextDocumentItem::_internal_set_text(const std::string& value) {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  ;
-  _impl_.text_.Set(value, GetArena());
-}
-inline std::string* TextDocumentItem::_internal_mutable_text() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  ;
-  return _impl_.text_.Mutable( GetArena());
-}
-inline std::string* TextDocumentItem::release_text() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  // @@protoc_insertion_point(field_release:io.deephaven.proto.backplane.script.grpc.TextDocumentItem.text)
-  return _impl_.text_.Release();
-}
-inline void TextDocumentItem::set_allocated_text(std::string* value) {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  _impl_.text_.SetAllocated(value, GetArena());
-  #ifdef PROTOBUF_FORCE_COPY_DEFAULT_STRING
-        if (_impl_.text_.IsDefault()) {
-          _impl_.text_.Set("", GetArena());
-        }
-  #endif  // PROTOBUF_FORCE_COPY_DEFAULT_STRING
-  // @@protoc_insertion_point(field_set_allocated:io.deephaven.proto.backplane.script.grpc.TextDocumentItem.text)
-}
-
-// -------------------------------------------------------------------
-
-// CloseDocumentRequest
-
-// .io.deephaven.proto.backplane.grpc.Ticket console_id = 1 [deprecated = true];
-inline bool CloseDocumentRequest::has_console_id() const {
-  bool value = (_impl_._has_bits_[0] & 0x00000001u) != 0;
-  PROTOBUF_ASSUME(!value || _impl_.console_id_ != nullptr);
-  return value;
-}
-inline const ::io::deephaven::proto::backplane::grpc::Ticket& CloseDocumentRequest::_internal_console_id() const {
-  PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race);
-  const ::io::deephaven::proto::backplane::grpc::Ticket* p = _impl_.console_id_;
-  return p != nullptr ? *p : reinterpret_cast<const ::io::deephaven::proto::backplane::grpc::Ticket&>(::io::deephaven::proto::backplane::grpc::_Ticket_default_instance_);
-}
-inline const ::io::deephaven::proto::backplane::grpc::Ticket& CloseDocumentRequest::console_id() const ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  // @@protoc_insertion_point(field_get:io.deephaven.proto.backplane.script.grpc.CloseDocumentRequest.console_id)
-  return _internal_console_id();
-}
-inline void CloseDocumentRequest::unsafe_arena_set_allocated_console_id(::io::deephaven::proto::backplane::grpc::Ticket* value) {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  if (GetArena() == nullptr) {
-    delete reinterpret_cast<::google::protobuf::MessageLite*>(_impl_.console_id_);
-  }
-  _impl_.console_id_ = reinterpret_cast<::io::deephaven::proto::backplane::grpc::Ticket*>(value);
-  if (value != nullptr) {
-    _impl_._has_bits_[0] |= 0x00000001u;
-  } else {
-    _impl_._has_bits_[0] &= ~0x00000001u;
-  }
-  // @@protoc_insertion_point(field_unsafe_arena_set_allocated:io.deephaven.proto.backplane.script.grpc.CloseDocumentRequest.console_id)
-}
-inline ::io::deephaven::proto::backplane::grpc::Ticket* CloseDocumentRequest::release_console_id() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-
-  _impl_._has_bits_[0] &= ~0x00000001u;
-  ::io::deephaven::proto::backplane::grpc::Ticket* released = _impl_.console_id_;
-  _impl_.console_id_ = nullptr;
-#ifdef PROTOBUF_FORCE_COPY_IN_RELEASE
-  auto* old = reinterpret_cast<::google::protobuf::MessageLite*>(released);
-  released = ::google::protobuf::internal::DuplicateIfNonNull(released);
-  if (GetArena() == nullptr) {
-    delete old;
-  }
-#else   // PROTOBUF_FORCE_COPY_IN_RELEASE
-  if (GetArena() != nullptr) {
-    released = ::google::protobuf::internal::DuplicateIfNonNull(released);
-  }
-#endif  // !PROTOBUF_FORCE_COPY_IN_RELEASE
-  return released;
-}
-inline ::io::deephaven::proto::backplane::grpc::Ticket* CloseDocumentRequest::unsafe_arena_release_console_id() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  // @@protoc_insertion_point(field_release:io.deephaven.proto.backplane.script.grpc.CloseDocumentRequest.console_id)
-
-  _impl_._has_bits_[0] &= ~0x00000001u;
-  ::io::deephaven::proto::backplane::grpc::Ticket* temp = _impl_.console_id_;
-  _impl_.console_id_ = nullptr;
-  return temp;
-}
-inline ::io::deephaven::proto::backplane::grpc::Ticket* CloseDocumentRequest::_internal_mutable_console_id() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  _impl_._has_bits_[0] |= 0x00000001u;
-  if (_impl_.console_id_ == nullptr) {
-    auto* p = CreateMaybeMessage<::io::deephaven::proto::backplane::grpc::Ticket>(GetArena());
-    _impl_.console_id_ = reinterpret_cast<::io::deephaven::proto::backplane::grpc::Ticket*>(p);
-  }
-  return _impl_.console_id_;
-}
-inline ::io::deephaven::proto::backplane::grpc::Ticket* CloseDocumentRequest::mutable_console_id() ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  ::io::deephaven::proto::backplane::grpc::Ticket* _msg = _internal_mutable_console_id();
-  // @@protoc_insertion_point(field_mutable:io.deephaven.proto.backplane.script.grpc.CloseDocumentRequest.console_id)
-  return _msg;
-}
-inline void CloseDocumentRequest::set_allocated_console_id(::io::deephaven::proto::backplane::grpc::Ticket* value) {
-  ::google::protobuf::Arena* message_arena = GetArena();
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  if (message_arena == nullptr) {
-    delete reinterpret_cast<::google::protobuf::MessageLite*>(_impl_.console_id_);
-  }
-
-  if (value != nullptr) {
-    ::google::protobuf::Arena* submessage_arena = reinterpret_cast<::google::protobuf::MessageLite*>(value)->GetArena();
-    if (message_arena != submessage_arena) {
-      value = ::google::protobuf::internal::GetOwnedMessage(message_arena, value, submessage_arena);
-    }
-    _impl_._has_bits_[0] |= 0x00000001u;
-  } else {
-    _impl_._has_bits_[0] &= ~0x00000001u;
-  }
-
-  _impl_.console_id_ = reinterpret_cast<::io::deephaven::proto::backplane::grpc::Ticket*>(value);
-  // @@protoc_insertion_point(field_set_allocated:io.deephaven.proto.backplane.script.grpc.CloseDocumentRequest.console_id)
-}
-
-// .io.deephaven.proto.backplane.script.grpc.VersionedTextDocumentIdentifier text_document = 2;
-inline bool CloseDocumentRequest::has_text_document() const {
-  bool value = (_impl_._has_bits_[0] & 0x00000002u) != 0;
-  PROTOBUF_ASSUME(!value || _impl_.text_document_ != nullptr);
-  return value;
-}
-inline void CloseDocumentRequest::clear_text_document() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  if (_impl_.text_document_ != nullptr) _impl_.text_document_->Clear();
-  _impl_._has_bits_[0] &= ~0x00000002u;
-}
-inline const ::io::deephaven::proto::backplane::script::grpc::VersionedTextDocumentIdentifier& CloseDocumentRequest::_internal_text_document() const {
-  PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race);
-  const ::io::deephaven::proto::backplane::script::grpc::VersionedTextDocumentIdentifier* p = _impl_.text_document_;
-  return p != nullptr ? *p : reinterpret_cast<const ::io::deephaven::proto::backplane::script::grpc::VersionedTextDocumentIdentifier&>(::io::deephaven::proto::backplane::script::grpc::_VersionedTextDocumentIdentifier_default_instance_);
-}
-inline const ::io::deephaven::proto::backplane::script::grpc::VersionedTextDocumentIdentifier& CloseDocumentRequest::text_document() const ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  // @@protoc_insertion_point(field_get:io.deephaven.proto.backplane.script.grpc.CloseDocumentRequest.text_document)
-  return _internal_text_document();
-}
-inline void CloseDocumentRequest::unsafe_arena_set_allocated_text_document(::io::deephaven::proto::backplane::script::grpc::VersionedTextDocumentIdentifier* value) {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  if (GetArena() == nullptr) {
-    delete reinterpret_cast<::google::protobuf::MessageLite*>(_impl_.text_document_);
-  }
-  _impl_.text_document_ = reinterpret_cast<::io::deephaven::proto::backplane::script::grpc::VersionedTextDocumentIdentifier*>(value);
-  if (value != nullptr) {
-    _impl_._has_bits_[0] |= 0x00000002u;
-  } else {
-    _impl_._has_bits_[0] &= ~0x00000002u;
-  }
-  // @@protoc_insertion_point(field_unsafe_arena_set_allocated:io.deephaven.proto.backplane.script.grpc.CloseDocumentRequest.text_document)
-}
-inline ::io::deephaven::proto::backplane::script::grpc::VersionedTextDocumentIdentifier* CloseDocumentRequest::release_text_document() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-
-  _impl_._has_bits_[0] &= ~0x00000002u;
-  ::io::deephaven::proto::backplane::script::grpc::VersionedTextDocumentIdentifier* released = _impl_.text_document_;
-  _impl_.text_document_ = nullptr;
-#ifdef PROTOBUF_FORCE_COPY_IN_RELEASE
-  auto* old = reinterpret_cast<::google::protobuf::MessageLite*>(released);
-  released = ::google::protobuf::internal::DuplicateIfNonNull(released);
-  if (GetArena() == nullptr) {
-    delete old;
-  }
-#else   // PROTOBUF_FORCE_COPY_IN_RELEASE
-  if (GetArena() != nullptr) {
-    released = ::google::protobuf::internal::DuplicateIfNonNull(released);
-  }
-#endif  // !PROTOBUF_FORCE_COPY_IN_RELEASE
-  return released;
-}
-inline ::io::deephaven::proto::backplane::script::grpc::VersionedTextDocumentIdentifier* CloseDocumentRequest::unsafe_arena_release_text_document() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  // @@protoc_insertion_point(field_release:io.deephaven.proto.backplane.script.grpc.CloseDocumentRequest.text_document)
-
-  _impl_._has_bits_[0] &= ~0x00000002u;
-  ::io::deephaven::proto::backplane::script::grpc::VersionedTextDocumentIdentifier* temp = _impl_.text_document_;
-  _impl_.text_document_ = nullptr;
-  return temp;
-}
-inline ::io::deephaven::proto::backplane::script::grpc::VersionedTextDocumentIdentifier* CloseDocumentRequest::_internal_mutable_text_document() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  _impl_._has_bits_[0] |= 0x00000002u;
-  if (_impl_.text_document_ == nullptr) {
-    auto* p = CreateMaybeMessage<::io::deephaven::proto::backplane::script::grpc::VersionedTextDocumentIdentifier>(GetArena());
-    _impl_.text_document_ = reinterpret_cast<::io::deephaven::proto::backplane::script::grpc::VersionedTextDocumentIdentifier*>(p);
-  }
-  return _impl_.text_document_;
-}
-inline ::io::deephaven::proto::backplane::script::grpc::VersionedTextDocumentIdentifier* CloseDocumentRequest::mutable_text_document() ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  ::io::deephaven::proto::backplane::script::grpc::VersionedTextDocumentIdentifier* _msg = _internal_mutable_text_document();
-  // @@protoc_insertion_point(field_mutable:io.deephaven.proto.backplane.script.grpc.CloseDocumentRequest.text_document)
-  return _msg;
-}
-inline void CloseDocumentRequest::set_allocated_text_document(::io::deephaven::proto::backplane::script::grpc::VersionedTextDocumentIdentifier* value) {
-  ::google::protobuf::Arena* message_arena = GetArena();
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  if (message_arena == nullptr) {
-    delete reinterpret_cast<::io::deephaven::proto::backplane::script::grpc::VersionedTextDocumentIdentifier*>(_impl_.text_document_);
-  }
-
-  if (value != nullptr) {
-    ::google::protobuf::Arena* submessage_arena = reinterpret_cast<::io::deephaven::proto::backplane::script::grpc::VersionedTextDocumentIdentifier*>(value)->GetArena();
-    if (message_arena != submessage_arena) {
-      value = ::google::protobuf::internal::GetOwnedMessage(message_arena, value, submessage_arena);
-    }
-    _impl_._has_bits_[0] |= 0x00000002u;
-  } else {
-    _impl_._has_bits_[0] &= ~0x00000002u;
-  }
-
-  _impl_.text_document_ = reinterpret_cast<::io::deephaven::proto::backplane::script::grpc::VersionedTextDocumentIdentifier*>(value);
-  // @@protoc_insertion_point(field_set_allocated:io.deephaven.proto.backplane.script.grpc.CloseDocumentRequest.text_document)
-}
-
-// -------------------------------------------------------------------
-
-// ChangeDocumentRequest_TextDocumentContentChangeEvent
-
-// .io.deephaven.proto.backplane.script.grpc.DocumentRange range = 1;
-inline bool ChangeDocumentRequest_TextDocumentContentChangeEvent::has_range() const {
-  bool value = (_impl_._has_bits_[0] & 0x00000001u) != 0;
-  PROTOBUF_ASSUME(!value || _impl_.range_ != nullptr);
-  return value;
-}
-inline void ChangeDocumentRequest_TextDocumentContentChangeEvent::clear_range() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  if (_impl_.range_ != nullptr) _impl_.range_->Clear();
-  _impl_._has_bits_[0] &= ~0x00000001u;
-}
-inline const ::io::deephaven::proto::backplane::script::grpc::DocumentRange& ChangeDocumentRequest_TextDocumentContentChangeEvent::_internal_range() const {
-  PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race);
-  const ::io::deephaven::proto::backplane::script::grpc::DocumentRange* p = _impl_.range_;
-  return p != nullptr ? *p : reinterpret_cast<const ::io::deephaven::proto::backplane::script::grpc::DocumentRange&>(::io::deephaven::proto::backplane::script::grpc::_DocumentRange_default_instance_);
-}
-inline const ::io::deephaven::proto::backplane::script::grpc::DocumentRange& ChangeDocumentRequest_TextDocumentContentChangeEvent::range() const ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  // @@protoc_insertion_point(field_get:io.deephaven.proto.backplane.script.grpc.ChangeDocumentRequest.TextDocumentContentChangeEvent.range)
-  return _internal_range();
-}
-inline void ChangeDocumentRequest_TextDocumentContentChangeEvent::unsafe_arena_set_allocated_range(::io::deephaven::proto::backplane::script::grpc::DocumentRange* value) {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  if (GetArena() == nullptr) {
-    delete reinterpret_cast<::google::protobuf::MessageLite*>(_impl_.range_);
-  }
-  _impl_.range_ = reinterpret_cast<::io::deephaven::proto::backplane::script::grpc::DocumentRange*>(value);
-  if (value != nullptr) {
-    _impl_._has_bits_[0] |= 0x00000001u;
-  } else {
-    _impl_._has_bits_[0] &= ~0x00000001u;
-  }
-  // @@protoc_insertion_point(field_unsafe_arena_set_allocated:io.deephaven.proto.backplane.script.grpc.ChangeDocumentRequest.TextDocumentContentChangeEvent.range)
-}
-inline ::io::deephaven::proto::backplane::script::grpc::DocumentRange* ChangeDocumentRequest_TextDocumentContentChangeEvent::release_range() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-
-  _impl_._has_bits_[0] &= ~0x00000001u;
-  ::io::deephaven::proto::backplane::script::grpc::DocumentRange* released = _impl_.range_;
-  _impl_.range_ = nullptr;
-#ifdef PROTOBUF_FORCE_COPY_IN_RELEASE
-  auto* old = reinterpret_cast<::google::protobuf::MessageLite*>(released);
-  released = ::google::protobuf::internal::DuplicateIfNonNull(released);
-  if (GetArena() == nullptr) {
-    delete old;
-  }
-#else   // PROTOBUF_FORCE_COPY_IN_RELEASE
-  if (GetArena() != nullptr) {
-    released = ::google::protobuf::internal::DuplicateIfNonNull(released);
-  }
-#endif  // !PROTOBUF_FORCE_COPY_IN_RELEASE
-  return released;
-}
-inline ::io::deephaven::proto::backplane::script::grpc::DocumentRange* ChangeDocumentRequest_TextDocumentContentChangeEvent::unsafe_arena_release_range() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  // @@protoc_insertion_point(field_release:io.deephaven.proto.backplane.script.grpc.ChangeDocumentRequest.TextDocumentContentChangeEvent.range)
-
-  _impl_._has_bits_[0] &= ~0x00000001u;
-  ::io::deephaven::proto::backplane::script::grpc::DocumentRange* temp = _impl_.range_;
-  _impl_.range_ = nullptr;
-  return temp;
-}
-inline ::io::deephaven::proto::backplane::script::grpc::DocumentRange* ChangeDocumentRequest_TextDocumentContentChangeEvent::_internal_mutable_range() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  _impl_._has_bits_[0] |= 0x00000001u;
-  if (_impl_.range_ == nullptr) {
-    auto* p = CreateMaybeMessage<::io::deephaven::proto::backplane::script::grpc::DocumentRange>(GetArena());
-    _impl_.range_ = reinterpret_cast<::io::deephaven::proto::backplane::script::grpc::DocumentRange*>(p);
-  }
-  return _impl_.range_;
-}
-inline ::io::deephaven::proto::backplane::script::grpc::DocumentRange* ChangeDocumentRequest_TextDocumentContentChangeEvent::mutable_range() ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  ::io::deephaven::proto::backplane::script::grpc::DocumentRange* _msg = _internal_mutable_range();
-  // @@protoc_insertion_point(field_mutable:io.deephaven.proto.backplane.script.grpc.ChangeDocumentRequest.TextDocumentContentChangeEvent.range)
-  return _msg;
-}
-inline void ChangeDocumentRequest_TextDocumentContentChangeEvent::set_allocated_range(::io::deephaven::proto::backplane::script::grpc::DocumentRange* value) {
-  ::google::protobuf::Arena* message_arena = GetArena();
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  if (message_arena == nullptr) {
-    delete reinterpret_cast<::io::deephaven::proto::backplane::script::grpc::DocumentRange*>(_impl_.range_);
-  }
-
-  if (value != nullptr) {
-    ::google::protobuf::Arena* submessage_arena = reinterpret_cast<::io::deephaven::proto::backplane::script::grpc::DocumentRange*>(value)->GetArena();
-    if (message_arena != submessage_arena) {
-      value = ::google::protobuf::internal::GetOwnedMessage(message_arena, value, submessage_arena);
-    }
-    _impl_._has_bits_[0] |= 0x00000001u;
-  } else {
-    _impl_._has_bits_[0] &= ~0x00000001u;
-  }
-
-  _impl_.range_ = reinterpret_cast<::io::deephaven::proto::backplane::script::grpc::DocumentRange*>(value);
-  // @@protoc_insertion_point(field_set_allocated:io.deephaven.proto.backplane.script.grpc.ChangeDocumentRequest.TextDocumentContentChangeEvent.range)
-}
-
-// int32 range_length = 2;
-inline void ChangeDocumentRequest_TextDocumentContentChangeEvent::clear_range_length() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  _impl_.range_length_ = 0;
-}
-inline ::int32_t ChangeDocumentRequest_TextDocumentContentChangeEvent::range_length() const {
-  // @@protoc_insertion_point(field_get:io.deephaven.proto.backplane.script.grpc.ChangeDocumentRequest.TextDocumentContentChangeEvent.range_length)
-  return _internal_range_length();
-}
-inline void ChangeDocumentRequest_TextDocumentContentChangeEvent::set_range_length(::int32_t value) {
-  _internal_set_range_length(value);
-  // @@protoc_insertion_point(field_set:io.deephaven.proto.backplane.script.grpc.ChangeDocumentRequest.TextDocumentContentChangeEvent.range_length)
-}
-inline ::int32_t ChangeDocumentRequest_TextDocumentContentChangeEvent::_internal_range_length() const {
-  PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race);
-  return _impl_.range_length_;
-}
-inline void ChangeDocumentRequest_TextDocumentContentChangeEvent::_internal_set_range_length(::int32_t value) {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  ;
-  _impl_.range_length_ = value;
-}
-
-// string text = 3;
-inline void ChangeDocumentRequest_TextDocumentContentChangeEvent::clear_text() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  _impl_.text_.ClearToEmpty();
-}
-inline const std::string& ChangeDocumentRequest_TextDocumentContentChangeEvent::text() const
-    ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  // @@protoc_insertion_point(field_get:io.deephaven.proto.backplane.script.grpc.ChangeDocumentRequest.TextDocumentContentChangeEvent.text)
-  return _internal_text();
-}
-template <typename Arg_, typename... Args_>
-inline PROTOBUF_ALWAYS_INLINE void ChangeDocumentRequest_TextDocumentContentChangeEvent::set_text(Arg_&& arg,
-                                                     Args_... args) {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  ;
-  _impl_.text_.Set(static_cast<Arg_&&>(arg), args..., GetArena());
-  // @@protoc_insertion_point(field_set:io.deephaven.proto.backplane.script.grpc.ChangeDocumentRequest.TextDocumentContentChangeEvent.text)
-}
-inline std::string* ChangeDocumentRequest_TextDocumentContentChangeEvent::mutable_text() ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  std::string* _s = _internal_mutable_text();
-  // @@protoc_insertion_point(field_mutable:io.deephaven.proto.backplane.script.grpc.ChangeDocumentRequest.TextDocumentContentChangeEvent.text)
-  return _s;
-}
-inline const std::string& ChangeDocumentRequest_TextDocumentContentChangeEvent::_internal_text() const {
-  PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race);
-  return _impl_.text_.Get();
-}
-inline void ChangeDocumentRequest_TextDocumentContentChangeEvent::_internal_set_text(const std::string& value) {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  ;
-  _impl_.text_.Set(value, GetArena());
-}
-inline std::string* ChangeDocumentRequest_TextDocumentContentChangeEvent::_internal_mutable_text() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  ;
-  return _impl_.text_.Mutable( GetArena());
-}
-inline std::string* ChangeDocumentRequest_TextDocumentContentChangeEvent::release_text() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  // @@protoc_insertion_point(field_release:io.deephaven.proto.backplane.script.grpc.ChangeDocumentRequest.TextDocumentContentChangeEvent.text)
-  return _impl_.text_.Release();
-}
-inline void ChangeDocumentRequest_TextDocumentContentChangeEvent::set_allocated_text(std::string* value) {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  _impl_.text_.SetAllocated(value, GetArena());
-  #ifdef PROTOBUF_FORCE_COPY_DEFAULT_STRING
-        if (_impl_.text_.IsDefault()) {
-          _impl_.text_.Set("", GetArena());
-        }
-  #endif  // PROTOBUF_FORCE_COPY_DEFAULT_STRING
-  // @@protoc_insertion_point(field_set_allocated:io.deephaven.proto.backplane.script.grpc.ChangeDocumentRequest.TextDocumentContentChangeEvent.text)
-}
-
-// -------------------------------------------------------------------
-
-// ChangeDocumentRequest
-
-// .io.deephaven.proto.backplane.grpc.Ticket console_id = 1 [deprecated = true];
-inline bool ChangeDocumentRequest::has_console_id() const {
-  bool value = (_impl_._has_bits_[0] & 0x00000001u) != 0;
-  PROTOBUF_ASSUME(!value || _impl_.console_id_ != nullptr);
-  return value;
-}
-inline const ::io::deephaven::proto::backplane::grpc::Ticket& ChangeDocumentRequest::_internal_console_id() const {
-  PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race);
-  const ::io::deephaven::proto::backplane::grpc::Ticket* p = _impl_.console_id_;
-  return p != nullptr ? *p : reinterpret_cast<const ::io::deephaven::proto::backplane::grpc::Ticket&>(::io::deephaven::proto::backplane::grpc::_Ticket_default_instance_);
-}
-inline const ::io::deephaven::proto::backplane::grpc::Ticket& ChangeDocumentRequest::console_id() const ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  // @@protoc_insertion_point(field_get:io.deephaven.proto.backplane.script.grpc.ChangeDocumentRequest.console_id)
-  return _internal_console_id();
-}
-inline void ChangeDocumentRequest::unsafe_arena_set_allocated_console_id(::io::deephaven::proto::backplane::grpc::Ticket* value) {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  if (GetArena() == nullptr) {
-    delete reinterpret_cast<::google::protobuf::MessageLite*>(_impl_.console_id_);
-  }
-  _impl_.console_id_ = reinterpret_cast<::io::deephaven::proto::backplane::grpc::Ticket*>(value);
-  if (value != nullptr) {
-    _impl_._has_bits_[0] |= 0x00000001u;
-  } else {
-    _impl_._has_bits_[0] &= ~0x00000001u;
-  }
-  // @@protoc_insertion_point(field_unsafe_arena_set_allocated:io.deephaven.proto.backplane.script.grpc.ChangeDocumentRequest.console_id)
-}
-inline ::io::deephaven::proto::backplane::grpc::Ticket* ChangeDocumentRequest::release_console_id() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-
-  _impl_._has_bits_[0] &= ~0x00000001u;
-  ::io::deephaven::proto::backplane::grpc::Ticket* released = _impl_.console_id_;
-  _impl_.console_id_ = nullptr;
-#ifdef PROTOBUF_FORCE_COPY_IN_RELEASE
-  auto* old = reinterpret_cast<::google::protobuf::MessageLite*>(released);
-  released = ::google::protobuf::internal::DuplicateIfNonNull(released);
-  if (GetArena() == nullptr) {
-    delete old;
-  }
-#else   // PROTOBUF_FORCE_COPY_IN_RELEASE
-  if (GetArena() != nullptr) {
-    released = ::google::protobuf::internal::DuplicateIfNonNull(released);
-  }
-#endif  // !PROTOBUF_FORCE_COPY_IN_RELEASE
-  return released;
-}
-inline ::io::deephaven::proto::backplane::grpc::Ticket* ChangeDocumentRequest::unsafe_arena_release_console_id() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  // @@protoc_insertion_point(field_release:io.deephaven.proto.backplane.script.grpc.ChangeDocumentRequest.console_id)
-
-  _impl_._has_bits_[0] &= ~0x00000001u;
-  ::io::deephaven::proto::backplane::grpc::Ticket* temp = _impl_.console_id_;
-  _impl_.console_id_ = nullptr;
-  return temp;
-}
-inline ::io::deephaven::proto::backplane::grpc::Ticket* ChangeDocumentRequest::_internal_mutable_console_id() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  _impl_._has_bits_[0] |= 0x00000001u;
-  if (_impl_.console_id_ == nullptr) {
-    auto* p = CreateMaybeMessage<::io::deephaven::proto::backplane::grpc::Ticket>(GetArena());
-    _impl_.console_id_ = reinterpret_cast<::io::deephaven::proto::backplane::grpc::Ticket*>(p);
-  }
-  return _impl_.console_id_;
-}
-inline ::io::deephaven::proto::backplane::grpc::Ticket* ChangeDocumentRequest::mutable_console_id() ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  ::io::deephaven::proto::backplane::grpc::Ticket* _msg = _internal_mutable_console_id();
-  // @@protoc_insertion_point(field_mutable:io.deephaven.proto.backplane.script.grpc.ChangeDocumentRequest.console_id)
-  return _msg;
-}
-inline void ChangeDocumentRequest::set_allocated_console_id(::io::deephaven::proto::backplane::grpc::Ticket* value) {
-  ::google::protobuf::Arena* message_arena = GetArena();
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  if (message_arena == nullptr) {
-    delete reinterpret_cast<::google::protobuf::MessageLite*>(_impl_.console_id_);
-  }
-
-  if (value != nullptr) {
-    ::google::protobuf::Arena* submessage_arena = reinterpret_cast<::google::protobuf::MessageLite*>(value)->GetArena();
-    if (message_arena != submessage_arena) {
-      value = ::google::protobuf::internal::GetOwnedMessage(message_arena, value, submessage_arena);
-    }
-    _impl_._has_bits_[0] |= 0x00000001u;
-  } else {
-    _impl_._has_bits_[0] &= ~0x00000001u;
-  }
-
-  _impl_.console_id_ = reinterpret_cast<::io::deephaven::proto::backplane::grpc::Ticket*>(value);
-  // @@protoc_insertion_point(field_set_allocated:io.deephaven.proto.backplane.script.grpc.ChangeDocumentRequest.console_id)
-}
-
-// .io.deephaven.proto.backplane.script.grpc.VersionedTextDocumentIdentifier text_document = 2;
-inline bool ChangeDocumentRequest::has_text_document() const {
-  bool value = (_impl_._has_bits_[0] & 0x00000002u) != 0;
-  PROTOBUF_ASSUME(!value || _impl_.text_document_ != nullptr);
-  return value;
-}
-inline void ChangeDocumentRequest::clear_text_document() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  if (_impl_.text_document_ != nullptr) _impl_.text_document_->Clear();
-  _impl_._has_bits_[0] &= ~0x00000002u;
-}
-inline const ::io::deephaven::proto::backplane::script::grpc::VersionedTextDocumentIdentifier& ChangeDocumentRequest::_internal_text_document() const {
-  PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race);
-  const ::io::deephaven::proto::backplane::script::grpc::VersionedTextDocumentIdentifier* p = _impl_.text_document_;
-  return p != nullptr ? *p : reinterpret_cast<const ::io::deephaven::proto::backplane::script::grpc::VersionedTextDocumentIdentifier&>(::io::deephaven::proto::backplane::script::grpc::_VersionedTextDocumentIdentifier_default_instance_);
-}
-inline const ::io::deephaven::proto::backplane::script::grpc::VersionedTextDocumentIdentifier& ChangeDocumentRequest::text_document() const ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  // @@protoc_insertion_point(field_get:io.deephaven.proto.backplane.script.grpc.ChangeDocumentRequest.text_document)
-  return _internal_text_document();
-}
-inline void ChangeDocumentRequest::unsafe_arena_set_allocated_text_document(::io::deephaven::proto::backplane::script::grpc::VersionedTextDocumentIdentifier* value) {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  if (GetArena() == nullptr) {
-    delete reinterpret_cast<::google::protobuf::MessageLite*>(_impl_.text_document_);
-  }
-  _impl_.text_document_ = reinterpret_cast<::io::deephaven::proto::backplane::script::grpc::VersionedTextDocumentIdentifier*>(value);
-  if (value != nullptr) {
-    _impl_._has_bits_[0] |= 0x00000002u;
-  } else {
-    _impl_._has_bits_[0] &= ~0x00000002u;
-  }
-  // @@protoc_insertion_point(field_unsafe_arena_set_allocated:io.deephaven.proto.backplane.script.grpc.ChangeDocumentRequest.text_document)
-}
-inline ::io::deephaven::proto::backplane::script::grpc::VersionedTextDocumentIdentifier* ChangeDocumentRequest::release_text_document() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-
-  _impl_._has_bits_[0] &= ~0x00000002u;
-  ::io::deephaven::proto::backplane::script::grpc::VersionedTextDocumentIdentifier* released = _impl_.text_document_;
-  _impl_.text_document_ = nullptr;
-#ifdef PROTOBUF_FORCE_COPY_IN_RELEASE
-  auto* old = reinterpret_cast<::google::protobuf::MessageLite*>(released);
-  released = ::google::protobuf::internal::DuplicateIfNonNull(released);
-  if (GetArena() == nullptr) {
-    delete old;
-  }
-#else   // PROTOBUF_FORCE_COPY_IN_RELEASE
-  if (GetArena() != nullptr) {
-    released = ::google::protobuf::internal::DuplicateIfNonNull(released);
-  }
-#endif  // !PROTOBUF_FORCE_COPY_IN_RELEASE
-  return released;
-}
-inline ::io::deephaven::proto::backplane::script::grpc::VersionedTextDocumentIdentifier* ChangeDocumentRequest::unsafe_arena_release_text_document() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  // @@protoc_insertion_point(field_release:io.deephaven.proto.backplane.script.grpc.ChangeDocumentRequest.text_document)
-
-  _impl_._has_bits_[0] &= ~0x00000002u;
-  ::io::deephaven::proto::backplane::script::grpc::VersionedTextDocumentIdentifier* temp = _impl_.text_document_;
-  _impl_.text_document_ = nullptr;
-  return temp;
-}
-inline ::io::deephaven::proto::backplane::script::grpc::VersionedTextDocumentIdentifier* ChangeDocumentRequest::_internal_mutable_text_document() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  _impl_._has_bits_[0] |= 0x00000002u;
-  if (_impl_.text_document_ == nullptr) {
-    auto* p = CreateMaybeMessage<::io::deephaven::proto::backplane::script::grpc::VersionedTextDocumentIdentifier>(GetArena());
-    _impl_.text_document_ = reinterpret_cast<::io::deephaven::proto::backplane::script::grpc::VersionedTextDocumentIdentifier*>(p);
-  }
-  return _impl_.text_document_;
-}
-inline ::io::deephaven::proto::backplane::script::grpc::VersionedTextDocumentIdentifier* ChangeDocumentRequest::mutable_text_document() ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  ::io::deephaven::proto::backplane::script::grpc::VersionedTextDocumentIdentifier* _msg = _internal_mutable_text_document();
-  // @@protoc_insertion_point(field_mutable:io.deephaven.proto.backplane.script.grpc.ChangeDocumentRequest.text_document)
-  return _msg;
-}
-inline void ChangeDocumentRequest::set_allocated_text_document(::io::deephaven::proto::backplane::script::grpc::VersionedTextDocumentIdentifier* value) {
-  ::google::protobuf::Arena* message_arena = GetArena();
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  if (message_arena == nullptr) {
-    delete reinterpret_cast<::io::deephaven::proto::backplane::script::grpc::VersionedTextDocumentIdentifier*>(_impl_.text_document_);
-  }
-
-  if (value != nullptr) {
-    ::google::protobuf::Arena* submessage_arena = reinterpret_cast<::io::deephaven::proto::backplane::script::grpc::VersionedTextDocumentIdentifier*>(value)->GetArena();
-    if (message_arena != submessage_arena) {
-      value = ::google::protobuf::internal::GetOwnedMessage(message_arena, value, submessage_arena);
-    }
-    _impl_._has_bits_[0] |= 0x00000002u;
-  } else {
-    _impl_._has_bits_[0] &= ~0x00000002u;
-  }
-
-  _impl_.text_document_ = reinterpret_cast<::io::deephaven::proto::backplane::script::grpc::VersionedTextDocumentIdentifier*>(value);
-  // @@protoc_insertion_point(field_set_allocated:io.deephaven.proto.backplane.script.grpc.ChangeDocumentRequest.text_document)
-}
-
-// repeated .io.deephaven.proto.backplane.script.grpc.ChangeDocumentRequest.TextDocumentContentChangeEvent content_changes = 3;
-inline int ChangeDocumentRequest::_internal_content_changes_size() const {
-  return _internal_content_changes().size();
-}
-inline int ChangeDocumentRequest::content_changes_size() const {
-  return _internal_content_changes_size();
-}
-inline void ChangeDocumentRequest::clear_content_changes() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  _impl_.content_changes_.Clear();
-}
-inline ::io::deephaven::proto::backplane::script::grpc::ChangeDocumentRequest_TextDocumentContentChangeEvent* ChangeDocumentRequest::mutable_content_changes(int index)
-    ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  // @@protoc_insertion_point(field_mutable:io.deephaven.proto.backplane.script.grpc.ChangeDocumentRequest.content_changes)
-  return _internal_mutable_content_changes()->Mutable(index);
-}
-inline ::google::protobuf::RepeatedPtrField<::io::deephaven::proto::backplane::script::grpc::ChangeDocumentRequest_TextDocumentContentChangeEvent>* ChangeDocumentRequest::mutable_content_changes()
-    ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  // @@protoc_insertion_point(field_mutable_list:io.deephaven.proto.backplane.script.grpc.ChangeDocumentRequest.content_changes)
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  return _internal_mutable_content_changes();
-}
-inline const ::io::deephaven::proto::backplane::script::grpc::ChangeDocumentRequest_TextDocumentContentChangeEvent& ChangeDocumentRequest::content_changes(int index) const
-    ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  // @@protoc_insertion_point(field_get:io.deephaven.proto.backplane.script.grpc.ChangeDocumentRequest.content_changes)
-  return _internal_content_changes().Get(index);
-}
-inline ::io::deephaven::proto::backplane::script::grpc::ChangeDocumentRequest_TextDocumentContentChangeEvent* ChangeDocumentRequest::add_content_changes() ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  ::io::deephaven::proto::backplane::script::grpc::ChangeDocumentRequest_TextDocumentContentChangeEvent* _add = _internal_mutable_content_changes()->Add();
-  // @@protoc_insertion_point(field_add:io.deephaven.proto.backplane.script.grpc.ChangeDocumentRequest.content_changes)
-  return _add;
-}
-inline const ::google::protobuf::RepeatedPtrField<::io::deephaven::proto::backplane::script::grpc::ChangeDocumentRequest_TextDocumentContentChangeEvent>& ChangeDocumentRequest::content_changes() const
-    ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  // @@protoc_insertion_point(field_list:io.deephaven.proto.backplane.script.grpc.ChangeDocumentRequest.content_changes)
-  return _internal_content_changes();
-}
-inline const ::google::protobuf::RepeatedPtrField<::io::deephaven::proto::backplane::script::grpc::ChangeDocumentRequest_TextDocumentContentChangeEvent>&
-ChangeDocumentRequest::_internal_content_changes() const {
-  PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race);
-  return _impl_.content_changes_;
-}
-inline ::google::protobuf::RepeatedPtrField<::io::deephaven::proto::backplane::script::grpc::ChangeDocumentRequest_TextDocumentContentChangeEvent>*
-ChangeDocumentRequest::_internal_mutable_content_changes() {
-  PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race);
-  return &_impl_.content_changes_;
-}
-
-// -------------------------------------------------------------------
-
-// DocumentRange
-
-// .io.deephaven.proto.backplane.script.grpc.Position start = 1;
-inline bool DocumentRange::has_start() const {
-  bool value = (_impl_._has_bits_[0] & 0x00000001u) != 0;
-  PROTOBUF_ASSUME(!value || _impl_.start_ != nullptr);
-  return value;
-}
-inline void DocumentRange::clear_start() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  if (_impl_.start_ != nullptr) _impl_.start_->Clear();
-  _impl_._has_bits_[0] &= ~0x00000001u;
-}
-inline const ::io::deephaven::proto::backplane::script::grpc::Position& DocumentRange::_internal_start() const {
-  PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race);
-  const ::io::deephaven::proto::backplane::script::grpc::Position* p = _impl_.start_;
-  return p != nullptr ? *p : reinterpret_cast<const ::io::deephaven::proto::backplane::script::grpc::Position&>(::io::deephaven::proto::backplane::script::grpc::_Position_default_instance_);
-}
-inline const ::io::deephaven::proto::backplane::script::grpc::Position& DocumentRange::start() const ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  // @@protoc_insertion_point(field_get:io.deephaven.proto.backplane.script.grpc.DocumentRange.start)
-  return _internal_start();
-}
-inline void DocumentRange::unsafe_arena_set_allocated_start(::io::deephaven::proto::backplane::script::grpc::Position* value) {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  if (GetArena() == nullptr) {
-    delete reinterpret_cast<::google::protobuf::MessageLite*>(_impl_.start_);
-  }
-  _impl_.start_ = reinterpret_cast<::io::deephaven::proto::backplane::script::grpc::Position*>(value);
-  if (value != nullptr) {
-    _impl_._has_bits_[0] |= 0x00000001u;
-  } else {
-    _impl_._has_bits_[0] &= ~0x00000001u;
-  }
-  // @@protoc_insertion_point(field_unsafe_arena_set_allocated:io.deephaven.proto.backplane.script.grpc.DocumentRange.start)
-}
-inline ::io::deephaven::proto::backplane::script::grpc::Position* DocumentRange::release_start() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-
-  _impl_._has_bits_[0] &= ~0x00000001u;
-  ::io::deephaven::proto::backplane::script::grpc::Position* released = _impl_.start_;
-  _impl_.start_ = nullptr;
-#ifdef PROTOBUF_FORCE_COPY_IN_RELEASE
-  auto* old = reinterpret_cast<::google::protobuf::MessageLite*>(released);
-  released = ::google::protobuf::internal::DuplicateIfNonNull(released);
-  if (GetArena() == nullptr) {
-    delete old;
-  }
-#else   // PROTOBUF_FORCE_COPY_IN_RELEASE
-  if (GetArena() != nullptr) {
-    released = ::google::protobuf::internal::DuplicateIfNonNull(released);
-  }
-#endif  // !PROTOBUF_FORCE_COPY_IN_RELEASE
-  return released;
-}
-inline ::io::deephaven::proto::backplane::script::grpc::Position* DocumentRange::unsafe_arena_release_start() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  // @@protoc_insertion_point(field_release:io.deephaven.proto.backplane.script.grpc.DocumentRange.start)
-
-  _impl_._has_bits_[0] &= ~0x00000001u;
-  ::io::deephaven::proto::backplane::script::grpc::Position* temp = _impl_.start_;
-  _impl_.start_ = nullptr;
-  return temp;
-}
-inline ::io::deephaven::proto::backplane::script::grpc::Position* DocumentRange::_internal_mutable_start() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  _impl_._has_bits_[0] |= 0x00000001u;
-  if (_impl_.start_ == nullptr) {
-    auto* p = CreateMaybeMessage<::io::deephaven::proto::backplane::script::grpc::Position>(GetArena());
-    _impl_.start_ = reinterpret_cast<::io::deephaven::proto::backplane::script::grpc::Position*>(p);
-  }
-  return _impl_.start_;
-}
-inline ::io::deephaven::proto::backplane::script::grpc::Position* DocumentRange::mutable_start() ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  ::io::deephaven::proto::backplane::script::grpc::Position* _msg = _internal_mutable_start();
-  // @@protoc_insertion_point(field_mutable:io.deephaven.proto.backplane.script.grpc.DocumentRange.start)
-  return _msg;
-}
-inline void DocumentRange::set_allocated_start(::io::deephaven::proto::backplane::script::grpc::Position* value) {
-  ::google::protobuf::Arena* message_arena = GetArena();
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  if (message_arena == nullptr) {
-    delete reinterpret_cast<::io::deephaven::proto::backplane::script::grpc::Position*>(_impl_.start_);
-  }
-
-  if (value != nullptr) {
-    ::google::protobuf::Arena* submessage_arena = reinterpret_cast<::io::deephaven::proto::backplane::script::grpc::Position*>(value)->GetArena();
-    if (message_arena != submessage_arena) {
-      value = ::google::protobuf::internal::GetOwnedMessage(message_arena, value, submessage_arena);
-    }
-    _impl_._has_bits_[0] |= 0x00000001u;
-  } else {
-    _impl_._has_bits_[0] &= ~0x00000001u;
-  }
-
-  _impl_.start_ = reinterpret_cast<::io::deephaven::proto::backplane::script::grpc::Position*>(value);
-  // @@protoc_insertion_point(field_set_allocated:io.deephaven.proto.backplane.script.grpc.DocumentRange.start)
-}
-
-// .io.deephaven.proto.backplane.script.grpc.Position end = 2;
-inline bool DocumentRange::has_end() const {
-  bool value = (_impl_._has_bits_[0] & 0x00000002u) != 0;
-  PROTOBUF_ASSUME(!value || _impl_.end_ != nullptr);
-  return value;
-}
-inline void DocumentRange::clear_end() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  if (_impl_.end_ != nullptr) _impl_.end_->Clear();
-  _impl_._has_bits_[0] &= ~0x00000002u;
-}
-inline const ::io::deephaven::proto::backplane::script::grpc::Position& DocumentRange::_internal_end() const {
-  PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race);
-  const ::io::deephaven::proto::backplane::script::grpc::Position* p = _impl_.end_;
-  return p != nullptr ? *p : reinterpret_cast<const ::io::deephaven::proto::backplane::script::grpc::Position&>(::io::deephaven::proto::backplane::script::grpc::_Position_default_instance_);
-}
-inline const ::io::deephaven::proto::backplane::script::grpc::Position& DocumentRange::end() const ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  // @@protoc_insertion_point(field_get:io.deephaven.proto.backplane.script.grpc.DocumentRange.end)
-  return _internal_end();
-}
-inline void DocumentRange::unsafe_arena_set_allocated_end(::io::deephaven::proto::backplane::script::grpc::Position* value) {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  if (GetArena() == nullptr) {
-    delete reinterpret_cast<::google::protobuf::MessageLite*>(_impl_.end_);
-  }
-  _impl_.end_ = reinterpret_cast<::io::deephaven::proto::backplane::script::grpc::Position*>(value);
-  if (value != nullptr) {
-    _impl_._has_bits_[0] |= 0x00000002u;
-  } else {
-    _impl_._has_bits_[0] &= ~0x00000002u;
-  }
-  // @@protoc_insertion_point(field_unsafe_arena_set_allocated:io.deephaven.proto.backplane.script.grpc.DocumentRange.end)
-}
-inline ::io::deephaven::proto::backplane::script::grpc::Position* DocumentRange::release_end() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-
-  _impl_._has_bits_[0] &= ~0x00000002u;
-  ::io::deephaven::proto::backplane::script::grpc::Position* released = _impl_.end_;
-  _impl_.end_ = nullptr;
-#ifdef PROTOBUF_FORCE_COPY_IN_RELEASE
-  auto* old = reinterpret_cast<::google::protobuf::MessageLite*>(released);
-  released = ::google::protobuf::internal::DuplicateIfNonNull(released);
-  if (GetArena() == nullptr) {
-    delete old;
-  }
-#else   // PROTOBUF_FORCE_COPY_IN_RELEASE
-  if (GetArena() != nullptr) {
-    released = ::google::protobuf::internal::DuplicateIfNonNull(released);
-  }
-#endif  // !PROTOBUF_FORCE_COPY_IN_RELEASE
-  return released;
-}
-inline ::io::deephaven::proto::backplane::script::grpc::Position* DocumentRange::unsafe_arena_release_end() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  // @@protoc_insertion_point(field_release:io.deephaven.proto.backplane.script.grpc.DocumentRange.end)
-
-  _impl_._has_bits_[0] &= ~0x00000002u;
-  ::io::deephaven::proto::backplane::script::grpc::Position* temp = _impl_.end_;
-  _impl_.end_ = nullptr;
-  return temp;
-}
-inline ::io::deephaven::proto::backplane::script::grpc::Position* DocumentRange::_internal_mutable_end() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  _impl_._has_bits_[0] |= 0x00000002u;
-  if (_impl_.end_ == nullptr) {
-    auto* p = CreateMaybeMessage<::io::deephaven::proto::backplane::script::grpc::Position>(GetArena());
-    _impl_.end_ = reinterpret_cast<::io::deephaven::proto::backplane::script::grpc::Position*>(p);
-  }
-  return _impl_.end_;
-}
-inline ::io::deephaven::proto::backplane::script::grpc::Position* DocumentRange::mutable_end() ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  ::io::deephaven::proto::backplane::script::grpc::Position* _msg = _internal_mutable_end();
-  // @@protoc_insertion_point(field_mutable:io.deephaven.proto.backplane.script.grpc.DocumentRange.end)
-  return _msg;
-}
-inline void DocumentRange::set_allocated_end(::io::deephaven::proto::backplane::script::grpc::Position* value) {
-  ::google::protobuf::Arena* message_arena = GetArena();
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  if (message_arena == nullptr) {
-    delete reinterpret_cast<::io::deephaven::proto::backplane::script::grpc::Position*>(_impl_.end_);
-  }
-
-  if (value != nullptr) {
-    ::google::protobuf::Arena* submessage_arena = reinterpret_cast<::io::deephaven::proto::backplane::script::grpc::Position*>(value)->GetArena();
-    if (message_arena != submessage_arena) {
-      value = ::google::protobuf::internal::GetOwnedMessage(message_arena, value, submessage_arena);
-    }
-    _impl_._has_bits_[0] |= 0x00000002u;
-  } else {
-    _impl_._has_bits_[0] &= ~0x00000002u;
-  }
-
-  _impl_.end_ = reinterpret_cast<::io::deephaven::proto::backplane::script::grpc::Position*>(value);
-  // @@protoc_insertion_point(field_set_allocated:io.deephaven.proto.backplane.script.grpc.DocumentRange.end)
-}
-
-// -------------------------------------------------------------------
-
-// VersionedTextDocumentIdentifier
-
-// string uri = 1;
-inline void VersionedTextDocumentIdentifier::clear_uri() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  _impl_.uri_.ClearToEmpty();
-}
-inline const std::string& VersionedTextDocumentIdentifier::uri() const
-    ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  // @@protoc_insertion_point(field_get:io.deephaven.proto.backplane.script.grpc.VersionedTextDocumentIdentifier.uri)
-  return _internal_uri();
-}
-template <typename Arg_, typename... Args_>
-inline PROTOBUF_ALWAYS_INLINE void VersionedTextDocumentIdentifier::set_uri(Arg_&& arg,
-                                                     Args_... args) {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  ;
-  _impl_.uri_.Set(static_cast<Arg_&&>(arg), args..., GetArena());
-  // @@protoc_insertion_point(field_set:io.deephaven.proto.backplane.script.grpc.VersionedTextDocumentIdentifier.uri)
-}
-inline std::string* VersionedTextDocumentIdentifier::mutable_uri() ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  std::string* _s = _internal_mutable_uri();
-  // @@protoc_insertion_point(field_mutable:io.deephaven.proto.backplane.script.grpc.VersionedTextDocumentIdentifier.uri)
-  return _s;
-}
-inline const std::string& VersionedTextDocumentIdentifier::_internal_uri() const {
-  PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race);
-  return _impl_.uri_.Get();
-}
-inline void VersionedTextDocumentIdentifier::_internal_set_uri(const std::string& value) {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  ;
-  _impl_.uri_.Set(value, GetArena());
-}
-inline std::string* VersionedTextDocumentIdentifier::_internal_mutable_uri() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  ;
-  return _impl_.uri_.Mutable( GetArena());
-}
-inline std::string* VersionedTextDocumentIdentifier::release_uri() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  // @@protoc_insertion_point(field_release:io.deephaven.proto.backplane.script.grpc.VersionedTextDocumentIdentifier.uri)
-  return _impl_.uri_.Release();
-}
-inline void VersionedTextDocumentIdentifier::set_allocated_uri(std::string* value) {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  _impl_.uri_.SetAllocated(value, GetArena());
-  #ifdef PROTOBUF_FORCE_COPY_DEFAULT_STRING
-        if (_impl_.uri_.IsDefault()) {
-          _impl_.uri_.Set("", GetArena());
-        }
-  #endif  // PROTOBUF_FORCE_COPY_DEFAULT_STRING
-  // @@protoc_insertion_point(field_set_allocated:io.deephaven.proto.backplane.script.grpc.VersionedTextDocumentIdentifier.uri)
-}
-
-// int32 version = 2;
-inline void VersionedTextDocumentIdentifier::clear_version() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  _impl_.version_ = 0;
-}
-inline ::int32_t VersionedTextDocumentIdentifier::version() const {
-  // @@protoc_insertion_point(field_get:io.deephaven.proto.backplane.script.grpc.VersionedTextDocumentIdentifier.version)
-  return _internal_version();
-}
-inline void VersionedTextDocumentIdentifier::set_version(::int32_t value) {
-  _internal_set_version(value);
-  // @@protoc_insertion_point(field_set:io.deephaven.proto.backplane.script.grpc.VersionedTextDocumentIdentifier.version)
-}
-inline ::int32_t VersionedTextDocumentIdentifier::_internal_version() const {
-  PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race);
-  return _impl_.version_;
-}
-inline void VersionedTextDocumentIdentifier::_internal_set_version(::int32_t value) {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  ;
-  _impl_.version_ = value;
-}
-
-// -------------------------------------------------------------------
-
-// Position
-
-// int32 line = 1;
-inline void Position::clear_line() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  _impl_.line_ = 0;
-}
-inline ::int32_t Position::line() const {
-  // @@protoc_insertion_point(field_get:io.deephaven.proto.backplane.script.grpc.Position.line)
-  return _internal_line();
-}
-inline void Position::set_line(::int32_t value) {
-  _internal_set_line(value);
-  // @@protoc_insertion_point(field_set:io.deephaven.proto.backplane.script.grpc.Position.line)
-}
-inline ::int32_t Position::_internal_line() const {
-  PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race);
-  return _impl_.line_;
-}
-inline void Position::_internal_set_line(::int32_t value) {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  ;
-  _impl_.line_ = value;
-}
-
-// int32 character = 2;
-inline void Position::clear_character() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  _impl_.character_ = 0;
-}
-inline ::int32_t Position::character() const {
-  // @@protoc_insertion_point(field_get:io.deephaven.proto.backplane.script.grpc.Position.character)
-  return _internal_character();
-}
-inline void Position::set_character(::int32_t value) {
-  _internal_set_character(value);
-  // @@protoc_insertion_point(field_set:io.deephaven.proto.backplane.script.grpc.Position.character)
-}
-inline ::int32_t Position::_internal_character() const {
-  PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race);
-  return _impl_.character_;
-}
-inline void Position::_internal_set_character(::int32_t value) {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  ;
-  _impl_.character_ = value;
-}
-
-// -------------------------------------------------------------------
-
-// MarkupContent
-
-// string kind = 1;
-inline void MarkupContent::clear_kind() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  _impl_.kind_.ClearToEmpty();
-}
-inline const std::string& MarkupContent::kind() const
-    ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  // @@protoc_insertion_point(field_get:io.deephaven.proto.backplane.script.grpc.MarkupContent.kind)
-  return _internal_kind();
-}
-template <typename Arg_, typename... Args_>
-inline PROTOBUF_ALWAYS_INLINE void MarkupContent::set_kind(Arg_&& arg,
-                                                     Args_... args) {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  ;
-  _impl_.kind_.Set(static_cast<Arg_&&>(arg), args..., GetArena());
-  // @@protoc_insertion_point(field_set:io.deephaven.proto.backplane.script.grpc.MarkupContent.kind)
-}
-inline std::string* MarkupContent::mutable_kind() ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  std::string* _s = _internal_mutable_kind();
-  // @@protoc_insertion_point(field_mutable:io.deephaven.proto.backplane.script.grpc.MarkupContent.kind)
-  return _s;
-}
-inline const std::string& MarkupContent::_internal_kind() const {
-  PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race);
-  return _impl_.kind_.Get();
-}
-inline void MarkupContent::_internal_set_kind(const std::string& value) {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  ;
-  _impl_.kind_.Set(value, GetArena());
-}
-inline std::string* MarkupContent::_internal_mutable_kind() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  ;
-  return _impl_.kind_.Mutable( GetArena());
-}
-inline std::string* MarkupContent::release_kind() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  // @@protoc_insertion_point(field_release:io.deephaven.proto.backplane.script.grpc.MarkupContent.kind)
-  return _impl_.kind_.Release();
-}
-inline void MarkupContent::set_allocated_kind(std::string* value) {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  _impl_.kind_.SetAllocated(value, GetArena());
-  #ifdef PROTOBUF_FORCE_COPY_DEFAULT_STRING
-        if (_impl_.kind_.IsDefault()) {
-          _impl_.kind_.Set("", GetArena());
-        }
-  #endif  // PROTOBUF_FORCE_COPY_DEFAULT_STRING
-  // @@protoc_insertion_point(field_set_allocated:io.deephaven.proto.backplane.script.grpc.MarkupContent.kind)
-}
-
-// string value = 2;
-inline void MarkupContent::clear_value() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  _impl_.value_.ClearToEmpty();
-}
-inline const std::string& MarkupContent::value() const
-    ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  // @@protoc_insertion_point(field_get:io.deephaven.proto.backplane.script.grpc.MarkupContent.value)
-  return _internal_value();
-}
-template <typename Arg_, typename... Args_>
-inline PROTOBUF_ALWAYS_INLINE void MarkupContent::set_value(Arg_&& arg,
-                                                     Args_... args) {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  ;
-  _impl_.value_.Set(static_cast<Arg_&&>(arg), args..., GetArena());
-  // @@protoc_insertion_point(field_set:io.deephaven.proto.backplane.script.grpc.MarkupContent.value)
-}
-inline std::string* MarkupContent::mutable_value() ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  std::string* _s = _internal_mutable_value();
-  // @@protoc_insertion_point(field_mutable:io.deephaven.proto.backplane.script.grpc.MarkupContent.value)
-  return _s;
-}
-inline const std::string& MarkupContent::_internal_value() const {
-  PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race);
-  return _impl_.value_.Get();
-}
-inline void MarkupContent::_internal_set_value(const std::string& value) {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  ;
-  _impl_.value_.Set(value, GetArena());
-}
-inline std::string* MarkupContent::_internal_mutable_value() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  ;
-  return _impl_.value_.Mutable( GetArena());
-}
-inline std::string* MarkupContent::release_value() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  // @@protoc_insertion_point(field_release:io.deephaven.proto.backplane.script.grpc.MarkupContent.value)
-  return _impl_.value_.Release();
-}
-inline void MarkupContent::set_allocated_value(std::string* value) {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  _impl_.value_.SetAllocated(value, GetArena());
-  #ifdef PROTOBUF_FORCE_COPY_DEFAULT_STRING
-        if (_impl_.value_.IsDefault()) {
-          _impl_.value_.Set("", GetArena());
-        }
-  #endif  // PROTOBUF_FORCE_COPY_DEFAULT_STRING
-  // @@protoc_insertion_point(field_set_allocated:io.deephaven.proto.backplane.script.grpc.MarkupContent.value)
-}
-
-// -------------------------------------------------------------------
-
-// GetCompletionItemsRequest
-
-// .io.deephaven.proto.backplane.grpc.Ticket console_id = 1 [deprecated = true];
-inline bool GetCompletionItemsRequest::has_console_id() const {
-  bool value = (_impl_._has_bits_[0] & 0x00000001u) != 0;
-  PROTOBUF_ASSUME(!value || _impl_.console_id_ != nullptr);
-  return value;
-}
-inline const ::io::deephaven::proto::backplane::grpc::Ticket& GetCompletionItemsRequest::_internal_console_id() const {
-  PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race);
-  const ::io::deephaven::proto::backplane::grpc::Ticket* p = _impl_.console_id_;
-  return p != nullptr ? *p : reinterpret_cast<const ::io::deephaven::proto::backplane::grpc::Ticket&>(::io::deephaven::proto::backplane::grpc::_Ticket_default_instance_);
-}
-inline const ::io::deephaven::proto::backplane::grpc::Ticket& GetCompletionItemsRequest::console_id() const ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  // @@protoc_insertion_point(field_get:io.deephaven.proto.backplane.script.grpc.GetCompletionItemsRequest.console_id)
-  return _internal_console_id();
-}
-inline void GetCompletionItemsRequest::unsafe_arena_set_allocated_console_id(::io::deephaven::proto::backplane::grpc::Ticket* value) {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  if (GetArena() == nullptr) {
-    delete reinterpret_cast<::google::protobuf::MessageLite*>(_impl_.console_id_);
-  }
-  _impl_.console_id_ = reinterpret_cast<::io::deephaven::proto::backplane::grpc::Ticket*>(value);
-  if (value != nullptr) {
-    _impl_._has_bits_[0] |= 0x00000001u;
-  } else {
-    _impl_._has_bits_[0] &= ~0x00000001u;
-  }
-  // @@protoc_insertion_point(field_unsafe_arena_set_allocated:io.deephaven.proto.backplane.script.grpc.GetCompletionItemsRequest.console_id)
-}
-inline ::io::deephaven::proto::backplane::grpc::Ticket* GetCompletionItemsRequest::release_console_id() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-
-  _impl_._has_bits_[0] &= ~0x00000001u;
-  ::io::deephaven::proto::backplane::grpc::Ticket* released = _impl_.console_id_;
-  _impl_.console_id_ = nullptr;
-#ifdef PROTOBUF_FORCE_COPY_IN_RELEASE
-  auto* old = reinterpret_cast<::google::protobuf::MessageLite*>(released);
-  released = ::google::protobuf::internal::DuplicateIfNonNull(released);
-  if (GetArena() == nullptr) {
-    delete old;
-  }
-#else   // PROTOBUF_FORCE_COPY_IN_RELEASE
-  if (GetArena() != nullptr) {
-    released = ::google::protobuf::internal::DuplicateIfNonNull(released);
-  }
-#endif  // !PROTOBUF_FORCE_COPY_IN_RELEASE
-  return released;
-}
-inline ::io::deephaven::proto::backplane::grpc::Ticket* GetCompletionItemsRequest::unsafe_arena_release_console_id() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  // @@protoc_insertion_point(field_release:io.deephaven.proto.backplane.script.grpc.GetCompletionItemsRequest.console_id)
-
-  _impl_._has_bits_[0] &= ~0x00000001u;
-  ::io::deephaven::proto::backplane::grpc::Ticket* temp = _impl_.console_id_;
-  _impl_.console_id_ = nullptr;
-  return temp;
-}
-inline ::io::deephaven::proto::backplane::grpc::Ticket* GetCompletionItemsRequest::_internal_mutable_console_id() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  _impl_._has_bits_[0] |= 0x00000001u;
-  if (_impl_.console_id_ == nullptr) {
-    auto* p = CreateMaybeMessage<::io::deephaven::proto::backplane::grpc::Ticket>(GetArena());
-    _impl_.console_id_ = reinterpret_cast<::io::deephaven::proto::backplane::grpc::Ticket*>(p);
-  }
-  return _impl_.console_id_;
-}
-inline ::io::deephaven::proto::backplane::grpc::Ticket* GetCompletionItemsRequest::mutable_console_id() ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  ::io::deephaven::proto::backplane::grpc::Ticket* _msg = _internal_mutable_console_id();
-  // @@protoc_insertion_point(field_mutable:io.deephaven.proto.backplane.script.grpc.GetCompletionItemsRequest.console_id)
-  return _msg;
-}
-inline void GetCompletionItemsRequest::set_allocated_console_id(::io::deephaven::proto::backplane::grpc::Ticket* value) {
-  ::google::protobuf::Arena* message_arena = GetArena();
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  if (message_arena == nullptr) {
-    delete reinterpret_cast<::google::protobuf::MessageLite*>(_impl_.console_id_);
-  }
-
-  if (value != nullptr) {
-    ::google::protobuf::Arena* submessage_arena = reinterpret_cast<::google::protobuf::MessageLite*>(value)->GetArena();
-    if (message_arena != submessage_arena) {
-      value = ::google::protobuf::internal::GetOwnedMessage(message_arena, value, submessage_arena);
-    }
-    _impl_._has_bits_[0] |= 0x00000001u;
-  } else {
-    _impl_._has_bits_[0] &= ~0x00000001u;
-  }
-
-  _impl_.console_id_ = reinterpret_cast<::io::deephaven::proto::backplane::grpc::Ticket*>(value);
-  // @@protoc_insertion_point(field_set_allocated:io.deephaven.proto.backplane.script.grpc.GetCompletionItemsRequest.console_id)
-}
-
-// .io.deephaven.proto.backplane.script.grpc.CompletionContext context = 2;
-inline bool GetCompletionItemsRequest::has_context() const {
-  bool value = (_impl_._has_bits_[0] & 0x00000002u) != 0;
-  PROTOBUF_ASSUME(!value || _impl_.context_ != nullptr);
-  return value;
-}
-inline void GetCompletionItemsRequest::clear_context() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  if (_impl_.context_ != nullptr) _impl_.context_->Clear();
-  _impl_._has_bits_[0] &= ~0x00000002u;
-}
-inline const ::io::deephaven::proto::backplane::script::grpc::CompletionContext& GetCompletionItemsRequest::_internal_context() const {
-  PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race);
-  const ::io::deephaven::proto::backplane::script::grpc::CompletionContext* p = _impl_.context_;
-  return p != nullptr ? *p : reinterpret_cast<const ::io::deephaven::proto::backplane::script::grpc::CompletionContext&>(::io::deephaven::proto::backplane::script::grpc::_CompletionContext_default_instance_);
-}
-inline const ::io::deephaven::proto::backplane::script::grpc::CompletionContext& GetCompletionItemsRequest::context() const ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  // @@protoc_insertion_point(field_get:io.deephaven.proto.backplane.script.grpc.GetCompletionItemsRequest.context)
-  return _internal_context();
-}
-inline void GetCompletionItemsRequest::unsafe_arena_set_allocated_context(::io::deephaven::proto::backplane::script::grpc::CompletionContext* value) {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  if (GetArena() == nullptr) {
-    delete reinterpret_cast<::google::protobuf::MessageLite*>(_impl_.context_);
-  }
-  _impl_.context_ = reinterpret_cast<::io::deephaven::proto::backplane::script::grpc::CompletionContext*>(value);
-  if (value != nullptr) {
-    _impl_._has_bits_[0] |= 0x00000002u;
-  } else {
-    _impl_._has_bits_[0] &= ~0x00000002u;
-  }
-  // @@protoc_insertion_point(field_unsafe_arena_set_allocated:io.deephaven.proto.backplane.script.grpc.GetCompletionItemsRequest.context)
-}
-inline ::io::deephaven::proto::backplane::script::grpc::CompletionContext* GetCompletionItemsRequest::release_context() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-
-  _impl_._has_bits_[0] &= ~0x00000002u;
-  ::io::deephaven::proto::backplane::script::grpc::CompletionContext* released = _impl_.context_;
-  _impl_.context_ = nullptr;
-#ifdef PROTOBUF_FORCE_COPY_IN_RELEASE
-  auto* old = reinterpret_cast<::google::protobuf::MessageLite*>(released);
-  released = ::google::protobuf::internal::DuplicateIfNonNull(released);
-  if (GetArena() == nullptr) {
-    delete old;
-  }
-#else   // PROTOBUF_FORCE_COPY_IN_RELEASE
-  if (GetArena() != nullptr) {
-    released = ::google::protobuf::internal::DuplicateIfNonNull(released);
-  }
-#endif  // !PROTOBUF_FORCE_COPY_IN_RELEASE
-  return released;
-}
-inline ::io::deephaven::proto::backplane::script::grpc::CompletionContext* GetCompletionItemsRequest::unsafe_arena_release_context() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  // @@protoc_insertion_point(field_release:io.deephaven.proto.backplane.script.grpc.GetCompletionItemsRequest.context)
-
-  _impl_._has_bits_[0] &= ~0x00000002u;
-  ::io::deephaven::proto::backplane::script::grpc::CompletionContext* temp = _impl_.context_;
-  _impl_.context_ = nullptr;
-  return temp;
-}
-inline ::io::deephaven::proto::backplane::script::grpc::CompletionContext* GetCompletionItemsRequest::_internal_mutable_context() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  _impl_._has_bits_[0] |= 0x00000002u;
-  if (_impl_.context_ == nullptr) {
-    auto* p = CreateMaybeMessage<::io::deephaven::proto::backplane::script::grpc::CompletionContext>(GetArena());
-    _impl_.context_ = reinterpret_cast<::io::deephaven::proto::backplane::script::grpc::CompletionContext*>(p);
-  }
-  return _impl_.context_;
-}
-inline ::io::deephaven::proto::backplane::script::grpc::CompletionContext* GetCompletionItemsRequest::mutable_context() ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  ::io::deephaven::proto::backplane::script::grpc::CompletionContext* _msg = _internal_mutable_context();
-  // @@protoc_insertion_point(field_mutable:io.deephaven.proto.backplane.script.grpc.GetCompletionItemsRequest.context)
-  return _msg;
-}
-inline void GetCompletionItemsRequest::set_allocated_context(::io::deephaven::proto::backplane::script::grpc::CompletionContext* value) {
-  ::google::protobuf::Arena* message_arena = GetArena();
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  if (message_arena == nullptr) {
-    delete reinterpret_cast<::io::deephaven::proto::backplane::script::grpc::CompletionContext*>(_impl_.context_);
-  }
-
-  if (value != nullptr) {
-    ::google::protobuf::Arena* submessage_arena = reinterpret_cast<::io::deephaven::proto::backplane::script::grpc::CompletionContext*>(value)->GetArena();
-    if (message_arena != submessage_arena) {
-      value = ::google::protobuf::internal::GetOwnedMessage(message_arena, value, submessage_arena);
-    }
-    _impl_._has_bits_[0] |= 0x00000002u;
-  } else {
-    _impl_._has_bits_[0] &= ~0x00000002u;
-  }
-
-  _impl_.context_ = reinterpret_cast<::io::deephaven::proto::backplane::script::grpc::CompletionContext*>(value);
-  // @@protoc_insertion_point(field_set_allocated:io.deephaven.proto.backplane.script.grpc.GetCompletionItemsRequest.context)
-}
-
-// .io.deephaven.proto.backplane.script.grpc.VersionedTextDocumentIdentifier text_document = 3;
-inline bool GetCompletionItemsRequest::has_text_document() const {
-  bool value = (_impl_._has_bits_[0] & 0x00000004u) != 0;
-  PROTOBUF_ASSUME(!value || _impl_.text_document_ != nullptr);
-  return value;
-}
-inline void GetCompletionItemsRequest::clear_text_document() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  if (_impl_.text_document_ != nullptr) _impl_.text_document_->Clear();
-  _impl_._has_bits_[0] &= ~0x00000004u;
-}
-inline const ::io::deephaven::proto::backplane::script::grpc::VersionedTextDocumentIdentifier& GetCompletionItemsRequest::_internal_text_document() const {
-  PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race);
-  const ::io::deephaven::proto::backplane::script::grpc::VersionedTextDocumentIdentifier* p = _impl_.text_document_;
-  return p != nullptr ? *p : reinterpret_cast<const ::io::deephaven::proto::backplane::script::grpc::VersionedTextDocumentIdentifier&>(::io::deephaven::proto::backplane::script::grpc::_VersionedTextDocumentIdentifier_default_instance_);
-}
-inline const ::io::deephaven::proto::backplane::script::grpc::VersionedTextDocumentIdentifier& GetCompletionItemsRequest::text_document() const ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  // @@protoc_insertion_point(field_get:io.deephaven.proto.backplane.script.grpc.GetCompletionItemsRequest.text_document)
-  return _internal_text_document();
-}
-inline void GetCompletionItemsRequest::unsafe_arena_set_allocated_text_document(::io::deephaven::proto::backplane::script::grpc::VersionedTextDocumentIdentifier* value) {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  if (GetArena() == nullptr) {
-    delete reinterpret_cast<::google::protobuf::MessageLite*>(_impl_.text_document_);
-  }
-  _impl_.text_document_ = reinterpret_cast<::io::deephaven::proto::backplane::script::grpc::VersionedTextDocumentIdentifier*>(value);
-  if (value != nullptr) {
-    _impl_._has_bits_[0] |= 0x00000004u;
-  } else {
-    _impl_._has_bits_[0] &= ~0x00000004u;
-  }
-  // @@protoc_insertion_point(field_unsafe_arena_set_allocated:io.deephaven.proto.backplane.script.grpc.GetCompletionItemsRequest.text_document)
-}
-inline ::io::deephaven::proto::backplane::script::grpc::VersionedTextDocumentIdentifier* GetCompletionItemsRequest::release_text_document() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-
-  _impl_._has_bits_[0] &= ~0x00000004u;
-  ::io::deephaven::proto::backplane::script::grpc::VersionedTextDocumentIdentifier* released = _impl_.text_document_;
-  _impl_.text_document_ = nullptr;
-#ifdef PROTOBUF_FORCE_COPY_IN_RELEASE
-  auto* old = reinterpret_cast<::google::protobuf::MessageLite*>(released);
-  released = ::google::protobuf::internal::DuplicateIfNonNull(released);
-  if (GetArena() == nullptr) {
-    delete old;
-  }
-#else   // PROTOBUF_FORCE_COPY_IN_RELEASE
-  if (GetArena() != nullptr) {
-    released = ::google::protobuf::internal::DuplicateIfNonNull(released);
-  }
-#endif  // !PROTOBUF_FORCE_COPY_IN_RELEASE
-  return released;
-}
-inline ::io::deephaven::proto::backplane::script::grpc::VersionedTextDocumentIdentifier* GetCompletionItemsRequest::unsafe_arena_release_text_document() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  // @@protoc_insertion_point(field_release:io.deephaven.proto.backplane.script.grpc.GetCompletionItemsRequest.text_document)
-
-  _impl_._has_bits_[0] &= ~0x00000004u;
-  ::io::deephaven::proto::backplane::script::grpc::VersionedTextDocumentIdentifier* temp = _impl_.text_document_;
-  _impl_.text_document_ = nullptr;
-  return temp;
-}
-inline ::io::deephaven::proto::backplane::script::grpc::VersionedTextDocumentIdentifier* GetCompletionItemsRequest::_internal_mutable_text_document() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  _impl_._has_bits_[0] |= 0x00000004u;
-  if (_impl_.text_document_ == nullptr) {
-    auto* p = CreateMaybeMessage<::io::deephaven::proto::backplane::script::grpc::VersionedTextDocumentIdentifier>(GetArena());
-    _impl_.text_document_ = reinterpret_cast<::io::deephaven::proto::backplane::script::grpc::VersionedTextDocumentIdentifier*>(p);
-  }
-  return _impl_.text_document_;
-}
-inline ::io::deephaven::proto::backplane::script::grpc::VersionedTextDocumentIdentifier* GetCompletionItemsRequest::mutable_text_document() ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  ::io::deephaven::proto::backplane::script::grpc::VersionedTextDocumentIdentifier* _msg = _internal_mutable_text_document();
-  // @@protoc_insertion_point(field_mutable:io.deephaven.proto.backplane.script.grpc.GetCompletionItemsRequest.text_document)
-  return _msg;
-}
-inline void GetCompletionItemsRequest::set_allocated_text_document(::io::deephaven::proto::backplane::script::grpc::VersionedTextDocumentIdentifier* value) {
-  ::google::protobuf::Arena* message_arena = GetArena();
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  if (message_arena == nullptr) {
-    delete reinterpret_cast<::io::deephaven::proto::backplane::script::grpc::VersionedTextDocumentIdentifier*>(_impl_.text_document_);
-  }
-
-  if (value != nullptr) {
-    ::google::protobuf::Arena* submessage_arena = reinterpret_cast<::io::deephaven::proto::backplane::script::grpc::VersionedTextDocumentIdentifier*>(value)->GetArena();
-    if (message_arena != submessage_arena) {
-      value = ::google::protobuf::internal::GetOwnedMessage(message_arena, value, submessage_arena);
-    }
-    _impl_._has_bits_[0] |= 0x00000004u;
-  } else {
-    _impl_._has_bits_[0] &= ~0x00000004u;
-  }
-
-  _impl_.text_document_ = reinterpret_cast<::io::deephaven::proto::backplane::script::grpc::VersionedTextDocumentIdentifier*>(value);
-  // @@protoc_insertion_point(field_set_allocated:io.deephaven.proto.backplane.script.grpc.GetCompletionItemsRequest.text_document)
-}
-
-// .io.deephaven.proto.backplane.script.grpc.Position position = 4;
-inline bool GetCompletionItemsRequest::has_position() const {
-  bool value = (_impl_._has_bits_[0] & 0x00000008u) != 0;
-  PROTOBUF_ASSUME(!value || _impl_.position_ != nullptr);
-  return value;
-}
-inline void GetCompletionItemsRequest::clear_position() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  if (_impl_.position_ != nullptr) _impl_.position_->Clear();
-  _impl_._has_bits_[0] &= ~0x00000008u;
-}
-inline const ::io::deephaven::proto::backplane::script::grpc::Position& GetCompletionItemsRequest::_internal_position() const {
-  PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race);
-  const ::io::deephaven::proto::backplane::script::grpc::Position* p = _impl_.position_;
-  return p != nullptr ? *p : reinterpret_cast<const ::io::deephaven::proto::backplane::script::grpc::Position&>(::io::deephaven::proto::backplane::script::grpc::_Position_default_instance_);
-}
-inline const ::io::deephaven::proto::backplane::script::grpc::Position& GetCompletionItemsRequest::position() const ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  // @@protoc_insertion_point(field_get:io.deephaven.proto.backplane.script.grpc.GetCompletionItemsRequest.position)
-  return _internal_position();
-}
-inline void GetCompletionItemsRequest::unsafe_arena_set_allocated_position(::io::deephaven::proto::backplane::script::grpc::Position* value) {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  if (GetArena() == nullptr) {
-    delete reinterpret_cast<::google::protobuf::MessageLite*>(_impl_.position_);
-  }
-  _impl_.position_ = reinterpret_cast<::io::deephaven::proto::backplane::script::grpc::Position*>(value);
-  if (value != nullptr) {
-    _impl_._has_bits_[0] |= 0x00000008u;
-  } else {
-    _impl_._has_bits_[0] &= ~0x00000008u;
-  }
-  // @@protoc_insertion_point(field_unsafe_arena_set_allocated:io.deephaven.proto.backplane.script.grpc.GetCompletionItemsRequest.position)
-}
-inline ::io::deephaven::proto::backplane::script::grpc::Position* GetCompletionItemsRequest::release_position() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-
-  _impl_._has_bits_[0] &= ~0x00000008u;
-  ::io::deephaven::proto::backplane::script::grpc::Position* released = _impl_.position_;
-  _impl_.position_ = nullptr;
-#ifdef PROTOBUF_FORCE_COPY_IN_RELEASE
-  auto* old = reinterpret_cast<::google::protobuf::MessageLite*>(released);
-  released = ::google::protobuf::internal::DuplicateIfNonNull(released);
-  if (GetArena() == nullptr) {
-    delete old;
-  }
-#else   // PROTOBUF_FORCE_COPY_IN_RELEASE
-  if (GetArena() != nullptr) {
-    released = ::google::protobuf::internal::DuplicateIfNonNull(released);
-  }
-#endif  // !PROTOBUF_FORCE_COPY_IN_RELEASE
-  return released;
-}
-inline ::io::deephaven::proto::backplane::script::grpc::Position* GetCompletionItemsRequest::unsafe_arena_release_position() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  // @@protoc_insertion_point(field_release:io.deephaven.proto.backplane.script.grpc.GetCompletionItemsRequest.position)
-
-  _impl_._has_bits_[0] &= ~0x00000008u;
-  ::io::deephaven::proto::backplane::script::grpc::Position* temp = _impl_.position_;
-  _impl_.position_ = nullptr;
-  return temp;
-}
-inline ::io::deephaven::proto::backplane::script::grpc::Position* GetCompletionItemsRequest::_internal_mutable_position() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  _impl_._has_bits_[0] |= 0x00000008u;
-  if (_impl_.position_ == nullptr) {
-    auto* p = CreateMaybeMessage<::io::deephaven::proto::backplane::script::grpc::Position>(GetArena());
-    _impl_.position_ = reinterpret_cast<::io::deephaven::proto::backplane::script::grpc::Position*>(p);
-  }
-  return _impl_.position_;
-}
-inline ::io::deephaven::proto::backplane::script::grpc::Position* GetCompletionItemsRequest::mutable_position() ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  ::io::deephaven::proto::backplane::script::grpc::Position* _msg = _internal_mutable_position();
-  // @@protoc_insertion_point(field_mutable:io.deephaven.proto.backplane.script.grpc.GetCompletionItemsRequest.position)
-  return _msg;
-}
-inline void GetCompletionItemsRequest::set_allocated_position(::io::deephaven::proto::backplane::script::grpc::Position* value) {
-  ::google::protobuf::Arena* message_arena = GetArena();
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  if (message_arena == nullptr) {
-    delete reinterpret_cast<::io::deephaven::proto::backplane::script::grpc::Position*>(_impl_.position_);
-  }
-
-  if (value != nullptr) {
-    ::google::protobuf::Arena* submessage_arena = reinterpret_cast<::io::deephaven::proto::backplane::script::grpc::Position*>(value)->GetArena();
-    if (message_arena != submessage_arena) {
-      value = ::google::protobuf::internal::GetOwnedMessage(message_arena, value, submessage_arena);
-    }
-    _impl_._has_bits_[0] |= 0x00000008u;
-  } else {
-    _impl_._has_bits_[0] &= ~0x00000008u;
-  }
-
-  _impl_.position_ = reinterpret_cast<::io::deephaven::proto::backplane::script::grpc::Position*>(value);
-  // @@protoc_insertion_point(field_set_allocated:io.deephaven.proto.backplane.script.grpc.GetCompletionItemsRequest.position)
-}
-
-// int32 request_id = 5 [deprecated = true];
-inline void GetCompletionItemsRequest::clear_request_id() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  _impl_.request_id_ = 0;
-}
-inline ::int32_t GetCompletionItemsRequest::request_id() const {
-  // @@protoc_insertion_point(field_get:io.deephaven.proto.backplane.script.grpc.GetCompletionItemsRequest.request_id)
-  return _internal_request_id();
-}
-inline void GetCompletionItemsRequest::set_request_id(::int32_t value) {
-  _internal_set_request_id(value);
-  // @@protoc_insertion_point(field_set:io.deephaven.proto.backplane.script.grpc.GetCompletionItemsRequest.request_id)
-}
-inline ::int32_t GetCompletionItemsRequest::_internal_request_id() const {
-  PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race);
-  return _impl_.request_id_;
-}
-inline void GetCompletionItemsRequest::_internal_set_request_id(::int32_t value) {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  ;
-  _impl_.request_id_ = value;
-}
-
-// -------------------------------------------------------------------
-
-// CompletionContext
-
-// int32 trigger_kind = 1;
-inline void CompletionContext::clear_trigger_kind() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  _impl_.trigger_kind_ = 0;
-}
-inline ::int32_t CompletionContext::trigger_kind() const {
-  // @@protoc_insertion_point(field_get:io.deephaven.proto.backplane.script.grpc.CompletionContext.trigger_kind)
-  return _internal_trigger_kind();
-}
-inline void CompletionContext::set_trigger_kind(::int32_t value) {
-  _internal_set_trigger_kind(value);
-  // @@protoc_insertion_point(field_set:io.deephaven.proto.backplane.script.grpc.CompletionContext.trigger_kind)
-}
-inline ::int32_t CompletionContext::_internal_trigger_kind() const {
-  PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race);
-  return _impl_.trigger_kind_;
-}
-inline void CompletionContext::_internal_set_trigger_kind(::int32_t value) {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  ;
-  _impl_.trigger_kind_ = value;
-}
-
-// string trigger_character = 2;
-inline void CompletionContext::clear_trigger_character() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  _impl_.trigger_character_.ClearToEmpty();
-}
-inline const std::string& CompletionContext::trigger_character() const
-    ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  // @@protoc_insertion_point(field_get:io.deephaven.proto.backplane.script.grpc.CompletionContext.trigger_character)
-  return _internal_trigger_character();
-}
-template <typename Arg_, typename... Args_>
-inline PROTOBUF_ALWAYS_INLINE void CompletionContext::set_trigger_character(Arg_&& arg,
-                                                     Args_... args) {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  ;
-  _impl_.trigger_character_.Set(static_cast<Arg_&&>(arg), args..., GetArena());
-  // @@protoc_insertion_point(field_set:io.deephaven.proto.backplane.script.grpc.CompletionContext.trigger_character)
-}
-inline std::string* CompletionContext::mutable_trigger_character() ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  std::string* _s = _internal_mutable_trigger_character();
-  // @@protoc_insertion_point(field_mutable:io.deephaven.proto.backplane.script.grpc.CompletionContext.trigger_character)
-  return _s;
-}
-inline const std::string& CompletionContext::_internal_trigger_character() const {
-  PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race);
-  return _impl_.trigger_character_.Get();
-}
-inline void CompletionContext::_internal_set_trigger_character(const std::string& value) {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  ;
-  _impl_.trigger_character_.Set(value, GetArena());
-}
-inline std::string* CompletionContext::_internal_mutable_trigger_character() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  ;
-  return _impl_.trigger_character_.Mutable( GetArena());
-}
-inline std::string* CompletionContext::release_trigger_character() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  // @@protoc_insertion_point(field_release:io.deephaven.proto.backplane.script.grpc.CompletionContext.trigger_character)
-  return _impl_.trigger_character_.Release();
-}
-inline void CompletionContext::set_allocated_trigger_character(std::string* value) {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  _impl_.trigger_character_.SetAllocated(value, GetArena());
-  #ifdef PROTOBUF_FORCE_COPY_DEFAULT_STRING
-        if (_impl_.trigger_character_.IsDefault()) {
-          _impl_.trigger_character_.Set("", GetArena());
-        }
-  #endif  // PROTOBUF_FORCE_COPY_DEFAULT_STRING
-  // @@protoc_insertion_point(field_set_allocated:io.deephaven.proto.backplane.script.grpc.CompletionContext.trigger_character)
-}
-
-// -------------------------------------------------------------------
-
-// GetCompletionItemsResponse
-
-// repeated .io.deephaven.proto.backplane.script.grpc.CompletionItem items = 1;
-inline int GetCompletionItemsResponse::_internal_items_size() const {
-  return _internal_items().size();
-}
-inline int GetCompletionItemsResponse::items_size() const {
-  return _internal_items_size();
-}
-inline void GetCompletionItemsResponse::clear_items() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  _impl_.items_.Clear();
-}
-inline ::io::deephaven::proto::backplane::script::grpc::CompletionItem* GetCompletionItemsResponse::mutable_items(int index)
-    ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  // @@protoc_insertion_point(field_mutable:io.deephaven.proto.backplane.script.grpc.GetCompletionItemsResponse.items)
-  return _internal_mutable_items()->Mutable(index);
-}
-inline ::google::protobuf::RepeatedPtrField<::io::deephaven::proto::backplane::script::grpc::CompletionItem>* GetCompletionItemsResponse::mutable_items()
-    ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  // @@protoc_insertion_point(field_mutable_list:io.deephaven.proto.backplane.script.grpc.GetCompletionItemsResponse.items)
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  return _internal_mutable_items();
-}
-inline const ::io::deephaven::proto::backplane::script::grpc::CompletionItem& GetCompletionItemsResponse::items(int index) const
-    ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  // @@protoc_insertion_point(field_get:io.deephaven.proto.backplane.script.grpc.GetCompletionItemsResponse.items)
-  return _internal_items().Get(index);
-}
-inline ::io::deephaven::proto::backplane::script::grpc::CompletionItem* GetCompletionItemsResponse::add_items() ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  ::io::deephaven::proto::backplane::script::grpc::CompletionItem* _add = _internal_mutable_items()->Add();
-  // @@protoc_insertion_point(field_add:io.deephaven.proto.backplane.script.grpc.GetCompletionItemsResponse.items)
-  return _add;
-}
-inline const ::google::protobuf::RepeatedPtrField<::io::deephaven::proto::backplane::script::grpc::CompletionItem>& GetCompletionItemsResponse::items() const
-    ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  // @@protoc_insertion_point(field_list:io.deephaven.proto.backplane.script.grpc.GetCompletionItemsResponse.items)
-  return _internal_items();
-}
-inline const ::google::protobuf::RepeatedPtrField<::io::deephaven::proto::backplane::script::grpc::CompletionItem>&
-GetCompletionItemsResponse::_internal_items() const {
-  PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race);
-  return _impl_.items_;
-}
-inline ::google::protobuf::RepeatedPtrField<::io::deephaven::proto::backplane::script::grpc::CompletionItem>*
-GetCompletionItemsResponse::_internal_mutable_items() {
-  PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race);
-  return &_impl_.items_;
-}
-
-// int32 request_id = 2 [deprecated = true];
-inline void GetCompletionItemsResponse::clear_request_id() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  _impl_.request_id_ = 0;
-}
-inline ::int32_t GetCompletionItemsResponse::request_id() const {
-  // @@protoc_insertion_point(field_get:io.deephaven.proto.backplane.script.grpc.GetCompletionItemsResponse.request_id)
-  return _internal_request_id();
-}
-inline void GetCompletionItemsResponse::set_request_id(::int32_t value) {
-  _internal_set_request_id(value);
-  // @@protoc_insertion_point(field_set:io.deephaven.proto.backplane.script.grpc.GetCompletionItemsResponse.request_id)
-}
-inline ::int32_t GetCompletionItemsResponse::_internal_request_id() const {
-  PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race);
-  return _impl_.request_id_;
-}
-inline void GetCompletionItemsResponse::_internal_set_request_id(::int32_t value) {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  ;
-  _impl_.request_id_ = value;
-}
-
-// bool success = 3 [deprecated = true];
-inline void GetCompletionItemsResponse::clear_success() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  _impl_.success_ = false;
-}
-inline bool GetCompletionItemsResponse::success() const {
-  // @@protoc_insertion_point(field_get:io.deephaven.proto.backplane.script.grpc.GetCompletionItemsResponse.success)
-  return _internal_success();
-}
-inline void GetCompletionItemsResponse::set_success(bool value) {
-  _internal_set_success(value);
-  // @@protoc_insertion_point(field_set:io.deephaven.proto.backplane.script.grpc.GetCompletionItemsResponse.success)
-}
-inline bool GetCompletionItemsResponse::_internal_success() const {
-  PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race);
-  return _impl_.success_;
-}
-inline void GetCompletionItemsResponse::_internal_set_success(bool value) {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  ;
-  _impl_.success_ = value;
-}
-
-// -------------------------------------------------------------------
-
-// CompletionItem
-
-// int32 start = 1;
-inline void CompletionItem::clear_start() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  _impl_.start_ = 0;
-}
-inline ::int32_t CompletionItem::start() const {
-  // @@protoc_insertion_point(field_get:io.deephaven.proto.backplane.script.grpc.CompletionItem.start)
-  return _internal_start();
-}
-inline void CompletionItem::set_start(::int32_t value) {
-  _internal_set_start(value);
-  // @@protoc_insertion_point(field_set:io.deephaven.proto.backplane.script.grpc.CompletionItem.start)
-}
-inline ::int32_t CompletionItem::_internal_start() const {
-  PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race);
-  return _impl_.start_;
-}
-inline void CompletionItem::_internal_set_start(::int32_t value) {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  ;
-  _impl_.start_ = value;
-}
-
-// int32 length = 2;
-inline void CompletionItem::clear_length() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  _impl_.length_ = 0;
-}
-inline ::int32_t CompletionItem::length() const {
-  // @@protoc_insertion_point(field_get:io.deephaven.proto.backplane.script.grpc.CompletionItem.length)
-  return _internal_length();
-}
-inline void CompletionItem::set_length(::int32_t value) {
-  _internal_set_length(value);
-  // @@protoc_insertion_point(field_set:io.deephaven.proto.backplane.script.grpc.CompletionItem.length)
-}
-inline ::int32_t CompletionItem::_internal_length() const {
-  PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race);
-  return _impl_.length_;
-}
-inline void CompletionItem::_internal_set_length(::int32_t value) {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  ;
-  _impl_.length_ = value;
-}
-
-// string label = 3;
-inline void CompletionItem::clear_label() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  _impl_.label_.ClearToEmpty();
-}
-inline const std::string& CompletionItem::label() const
-    ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  // @@protoc_insertion_point(field_get:io.deephaven.proto.backplane.script.grpc.CompletionItem.label)
-  return _internal_label();
-}
-template <typename Arg_, typename... Args_>
-inline PROTOBUF_ALWAYS_INLINE void CompletionItem::set_label(Arg_&& arg,
-                                                     Args_... args) {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  ;
-  _impl_.label_.Set(static_cast<Arg_&&>(arg), args..., GetArena());
-  // @@protoc_insertion_point(field_set:io.deephaven.proto.backplane.script.grpc.CompletionItem.label)
-}
-inline std::string* CompletionItem::mutable_label() ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  std::string* _s = _internal_mutable_label();
-  // @@protoc_insertion_point(field_mutable:io.deephaven.proto.backplane.script.grpc.CompletionItem.label)
-  return _s;
-}
-inline const std::string& CompletionItem::_internal_label() const {
-  PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race);
-  return _impl_.label_.Get();
-}
-inline void CompletionItem::_internal_set_label(const std::string& value) {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  ;
-  _impl_.label_.Set(value, GetArena());
-}
-inline std::string* CompletionItem::_internal_mutable_label() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  ;
-  return _impl_.label_.Mutable( GetArena());
-}
-inline std::string* CompletionItem::release_label() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  // @@protoc_insertion_point(field_release:io.deephaven.proto.backplane.script.grpc.CompletionItem.label)
-  return _impl_.label_.Release();
-}
-inline void CompletionItem::set_allocated_label(std::string* value) {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  _impl_.label_.SetAllocated(value, GetArena());
-  #ifdef PROTOBUF_FORCE_COPY_DEFAULT_STRING
-        if (_impl_.label_.IsDefault()) {
-          _impl_.label_.Set("", GetArena());
-        }
-  #endif  // PROTOBUF_FORCE_COPY_DEFAULT_STRING
-  // @@protoc_insertion_point(field_set_allocated:io.deephaven.proto.backplane.script.grpc.CompletionItem.label)
-}
-
-// int32 kind = 4;
-inline void CompletionItem::clear_kind() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  _impl_.kind_ = 0;
-}
-inline ::int32_t CompletionItem::kind() const {
-  // @@protoc_insertion_point(field_get:io.deephaven.proto.backplane.script.grpc.CompletionItem.kind)
-  return _internal_kind();
-}
-inline void CompletionItem::set_kind(::int32_t value) {
-  _internal_set_kind(value);
-  // @@protoc_insertion_point(field_set:io.deephaven.proto.backplane.script.grpc.CompletionItem.kind)
-}
-inline ::int32_t CompletionItem::_internal_kind() const {
-  PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race);
-  return _impl_.kind_;
-}
-inline void CompletionItem::_internal_set_kind(::int32_t value) {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  ;
-  _impl_.kind_ = value;
-}
-
-// string detail = 5;
-inline void CompletionItem::clear_detail() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  _impl_.detail_.ClearToEmpty();
-}
-inline const std::string& CompletionItem::detail() const
-    ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  // @@protoc_insertion_point(field_get:io.deephaven.proto.backplane.script.grpc.CompletionItem.detail)
-  return _internal_detail();
-}
-template <typename Arg_, typename... Args_>
-inline PROTOBUF_ALWAYS_INLINE void CompletionItem::set_detail(Arg_&& arg,
-                                                     Args_... args) {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  ;
-  _impl_.detail_.Set(static_cast<Arg_&&>(arg), args..., GetArena());
-  // @@protoc_insertion_point(field_set:io.deephaven.proto.backplane.script.grpc.CompletionItem.detail)
-}
-inline std::string* CompletionItem::mutable_detail() ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  std::string* _s = _internal_mutable_detail();
-  // @@protoc_insertion_point(field_mutable:io.deephaven.proto.backplane.script.grpc.CompletionItem.detail)
-  return _s;
-}
-inline const std::string& CompletionItem::_internal_detail() const {
-  PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race);
-  return _impl_.detail_.Get();
-}
-inline void CompletionItem::_internal_set_detail(const std::string& value) {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  ;
-  _impl_.detail_.Set(value, GetArena());
-}
-inline std::string* CompletionItem::_internal_mutable_detail() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  ;
-  return _impl_.detail_.Mutable( GetArena());
-}
-inline std::string* CompletionItem::release_detail() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  // @@protoc_insertion_point(field_release:io.deephaven.proto.backplane.script.grpc.CompletionItem.detail)
-  return _impl_.detail_.Release();
-}
-inline void CompletionItem::set_allocated_detail(std::string* value) {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  _impl_.detail_.SetAllocated(value, GetArena());
-  #ifdef PROTOBUF_FORCE_COPY_DEFAULT_STRING
-        if (_impl_.detail_.IsDefault()) {
-          _impl_.detail_.Set("", GetArena());
-        }
-  #endif  // PROTOBUF_FORCE_COPY_DEFAULT_STRING
-  // @@protoc_insertion_point(field_set_allocated:io.deephaven.proto.backplane.script.grpc.CompletionItem.detail)
-}
-
-// bool deprecated = 7;
-inline void CompletionItem::clear_deprecated() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  _impl_.deprecated_ = false;
-}
-inline bool CompletionItem::deprecated() const {
-  // @@protoc_insertion_point(field_get:io.deephaven.proto.backplane.script.grpc.CompletionItem.deprecated)
-  return _internal_deprecated();
-}
-inline void CompletionItem::set_deprecated(bool value) {
-  _internal_set_deprecated(value);
-  // @@protoc_insertion_point(field_set:io.deephaven.proto.backplane.script.grpc.CompletionItem.deprecated)
-}
-inline bool CompletionItem::_internal_deprecated() const {
-  PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race);
-  return _impl_.deprecated_;
-}
-inline void CompletionItem::_internal_set_deprecated(bool value) {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  ;
-  _impl_.deprecated_ = value;
-}
-
-// bool preselect = 8;
-inline void CompletionItem::clear_preselect() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  _impl_.preselect_ = false;
-}
-inline bool CompletionItem::preselect() const {
-  // @@protoc_insertion_point(field_get:io.deephaven.proto.backplane.script.grpc.CompletionItem.preselect)
-  return _internal_preselect();
-}
-inline void CompletionItem::set_preselect(bool value) {
-  _internal_set_preselect(value);
-  // @@protoc_insertion_point(field_set:io.deephaven.proto.backplane.script.grpc.CompletionItem.preselect)
-}
-inline bool CompletionItem::_internal_preselect() const {
-  PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race);
-  return _impl_.preselect_;
-}
-inline void CompletionItem::_internal_set_preselect(bool value) {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  ;
-  _impl_.preselect_ = value;
-}
-
-// .io.deephaven.proto.backplane.script.grpc.TextEdit text_edit = 9;
-inline bool CompletionItem::has_text_edit() const {
-  bool value = (_impl_._has_bits_[0] & 0x00000001u) != 0;
-  PROTOBUF_ASSUME(!value || _impl_.text_edit_ != nullptr);
-  return value;
-}
-inline void CompletionItem::clear_text_edit() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  if (_impl_.text_edit_ != nullptr) _impl_.text_edit_->Clear();
-  _impl_._has_bits_[0] &= ~0x00000001u;
-}
-inline const ::io::deephaven::proto::backplane::script::grpc::TextEdit& CompletionItem::_internal_text_edit() const {
-  PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race);
-  const ::io::deephaven::proto::backplane::script::grpc::TextEdit* p = _impl_.text_edit_;
-  return p != nullptr ? *p : reinterpret_cast<const ::io::deephaven::proto::backplane::script::grpc::TextEdit&>(::io::deephaven::proto::backplane::script::grpc::_TextEdit_default_instance_);
-}
-inline const ::io::deephaven::proto::backplane::script::grpc::TextEdit& CompletionItem::text_edit() const ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  // @@protoc_insertion_point(field_get:io.deephaven.proto.backplane.script.grpc.CompletionItem.text_edit)
-  return _internal_text_edit();
-}
-inline void CompletionItem::unsafe_arena_set_allocated_text_edit(::io::deephaven::proto::backplane::script::grpc::TextEdit* value) {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  if (GetArena() == nullptr) {
-    delete reinterpret_cast<::google::protobuf::MessageLite*>(_impl_.text_edit_);
-  }
-  _impl_.text_edit_ = reinterpret_cast<::io::deephaven::proto::backplane::script::grpc::TextEdit*>(value);
-  if (value != nullptr) {
-    _impl_._has_bits_[0] |= 0x00000001u;
-  } else {
-    _impl_._has_bits_[0] &= ~0x00000001u;
-  }
-  // @@protoc_insertion_point(field_unsafe_arena_set_allocated:io.deephaven.proto.backplane.script.grpc.CompletionItem.text_edit)
-}
-inline ::io::deephaven::proto::backplane::script::grpc::TextEdit* CompletionItem::release_text_edit() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-
-  _impl_._has_bits_[0] &= ~0x00000001u;
-  ::io::deephaven::proto::backplane::script::grpc::TextEdit* released = _impl_.text_edit_;
-  _impl_.text_edit_ = nullptr;
-#ifdef PROTOBUF_FORCE_COPY_IN_RELEASE
-  auto* old = reinterpret_cast<::google::protobuf::MessageLite*>(released);
-  released = ::google::protobuf::internal::DuplicateIfNonNull(released);
-  if (GetArena() == nullptr) {
-    delete old;
-  }
-#else   // PROTOBUF_FORCE_COPY_IN_RELEASE
-  if (GetArena() != nullptr) {
-    released = ::google::protobuf::internal::DuplicateIfNonNull(released);
-  }
-#endif  // !PROTOBUF_FORCE_COPY_IN_RELEASE
-  return released;
-}
-inline ::io::deephaven::proto::backplane::script::grpc::TextEdit* CompletionItem::unsafe_arena_release_text_edit() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  // @@protoc_insertion_point(field_release:io.deephaven.proto.backplane.script.grpc.CompletionItem.text_edit)
-
-  _impl_._has_bits_[0] &= ~0x00000001u;
-  ::io::deephaven::proto::backplane::script::grpc::TextEdit* temp = _impl_.text_edit_;
-  _impl_.text_edit_ = nullptr;
-  return temp;
-}
-inline ::io::deephaven::proto::backplane::script::grpc::TextEdit* CompletionItem::_internal_mutable_text_edit() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  _impl_._has_bits_[0] |= 0x00000001u;
-  if (_impl_.text_edit_ == nullptr) {
-    auto* p = CreateMaybeMessage<::io::deephaven::proto::backplane::script::grpc::TextEdit>(GetArena());
-    _impl_.text_edit_ = reinterpret_cast<::io::deephaven::proto::backplane::script::grpc::TextEdit*>(p);
-  }
-  return _impl_.text_edit_;
-}
-inline ::io::deephaven::proto::backplane::script::grpc::TextEdit* CompletionItem::mutable_text_edit() ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  ::io::deephaven::proto::backplane::script::grpc::TextEdit* _msg = _internal_mutable_text_edit();
-  // @@protoc_insertion_point(field_mutable:io.deephaven.proto.backplane.script.grpc.CompletionItem.text_edit)
-  return _msg;
-}
-inline void CompletionItem::set_allocated_text_edit(::io::deephaven::proto::backplane::script::grpc::TextEdit* value) {
-  ::google::protobuf::Arena* message_arena = GetArena();
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  if (message_arena == nullptr) {
-    delete reinterpret_cast<::io::deephaven::proto::backplane::script::grpc::TextEdit*>(_impl_.text_edit_);
-  }
-
-  if (value != nullptr) {
-    ::google::protobuf::Arena* submessage_arena = reinterpret_cast<::io::deephaven::proto::backplane::script::grpc::TextEdit*>(value)->GetArena();
-    if (message_arena != submessage_arena) {
-      value = ::google::protobuf::internal::GetOwnedMessage(message_arena, value, submessage_arena);
-    }
-    _impl_._has_bits_[0] |= 0x00000001u;
-  } else {
-    _impl_._has_bits_[0] &= ~0x00000001u;
-  }
-
-  _impl_.text_edit_ = reinterpret_cast<::io::deephaven::proto::backplane::script::grpc::TextEdit*>(value);
-  // @@protoc_insertion_point(field_set_allocated:io.deephaven.proto.backplane.script.grpc.CompletionItem.text_edit)
-}
-
-// string sort_text = 10;
-inline void CompletionItem::clear_sort_text() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  _impl_.sort_text_.ClearToEmpty();
-}
-inline const std::string& CompletionItem::sort_text() const
-    ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  // @@protoc_insertion_point(field_get:io.deephaven.proto.backplane.script.grpc.CompletionItem.sort_text)
-  return _internal_sort_text();
-}
-template <typename Arg_, typename... Args_>
-inline PROTOBUF_ALWAYS_INLINE void CompletionItem::set_sort_text(Arg_&& arg,
-                                                     Args_... args) {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  ;
-  _impl_.sort_text_.Set(static_cast<Arg_&&>(arg), args..., GetArena());
-  // @@protoc_insertion_point(field_set:io.deephaven.proto.backplane.script.grpc.CompletionItem.sort_text)
-}
-inline std::string* CompletionItem::mutable_sort_text() ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  std::string* _s = _internal_mutable_sort_text();
-  // @@protoc_insertion_point(field_mutable:io.deephaven.proto.backplane.script.grpc.CompletionItem.sort_text)
-  return _s;
-}
-inline const std::string& CompletionItem::_internal_sort_text() const {
-  PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race);
-  return _impl_.sort_text_.Get();
-}
-inline void CompletionItem::_internal_set_sort_text(const std::string& value) {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  ;
-  _impl_.sort_text_.Set(value, GetArena());
-}
-inline std::string* CompletionItem::_internal_mutable_sort_text() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  ;
-  return _impl_.sort_text_.Mutable( GetArena());
-}
-inline std::string* CompletionItem::release_sort_text() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  // @@protoc_insertion_point(field_release:io.deephaven.proto.backplane.script.grpc.CompletionItem.sort_text)
-  return _impl_.sort_text_.Release();
-}
-inline void CompletionItem::set_allocated_sort_text(std::string* value) {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  _impl_.sort_text_.SetAllocated(value, GetArena());
-  #ifdef PROTOBUF_FORCE_COPY_DEFAULT_STRING
-        if (_impl_.sort_text_.IsDefault()) {
-          _impl_.sort_text_.Set("", GetArena());
-        }
-  #endif  // PROTOBUF_FORCE_COPY_DEFAULT_STRING
-  // @@protoc_insertion_point(field_set_allocated:io.deephaven.proto.backplane.script.grpc.CompletionItem.sort_text)
-}
-
-// string filter_text = 11;
-inline void CompletionItem::clear_filter_text() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  _impl_.filter_text_.ClearToEmpty();
-}
-inline const std::string& CompletionItem::filter_text() const
-    ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  // @@protoc_insertion_point(field_get:io.deephaven.proto.backplane.script.grpc.CompletionItem.filter_text)
-  return _internal_filter_text();
-}
-template <typename Arg_, typename... Args_>
-inline PROTOBUF_ALWAYS_INLINE void CompletionItem::set_filter_text(Arg_&& arg,
-                                                     Args_... args) {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  ;
-  _impl_.filter_text_.Set(static_cast<Arg_&&>(arg), args..., GetArena());
-  // @@protoc_insertion_point(field_set:io.deephaven.proto.backplane.script.grpc.CompletionItem.filter_text)
-}
-inline std::string* CompletionItem::mutable_filter_text() ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  std::string* _s = _internal_mutable_filter_text();
-  // @@protoc_insertion_point(field_mutable:io.deephaven.proto.backplane.script.grpc.CompletionItem.filter_text)
-  return _s;
-}
-inline const std::string& CompletionItem::_internal_filter_text() const {
-  PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race);
-  return _impl_.filter_text_.Get();
-}
-inline void CompletionItem::_internal_set_filter_text(const std::string& value) {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  ;
-  _impl_.filter_text_.Set(value, GetArena());
-}
-inline std::string* CompletionItem::_internal_mutable_filter_text() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  ;
-  return _impl_.filter_text_.Mutable( GetArena());
-}
-inline std::string* CompletionItem::release_filter_text() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  // @@protoc_insertion_point(field_release:io.deephaven.proto.backplane.script.grpc.CompletionItem.filter_text)
-  return _impl_.filter_text_.Release();
-}
-inline void CompletionItem::set_allocated_filter_text(std::string* value) {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  _impl_.filter_text_.SetAllocated(value, GetArena());
-  #ifdef PROTOBUF_FORCE_COPY_DEFAULT_STRING
-        if (_impl_.filter_text_.IsDefault()) {
-          _impl_.filter_text_.Set("", GetArena());
-        }
-  #endif  // PROTOBUF_FORCE_COPY_DEFAULT_STRING
-  // @@protoc_insertion_point(field_set_allocated:io.deephaven.proto.backplane.script.grpc.CompletionItem.filter_text)
-}
-
-// int32 insert_text_format = 12;
-inline void CompletionItem::clear_insert_text_format() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  _impl_.insert_text_format_ = 0;
-}
-inline ::int32_t CompletionItem::insert_text_format() const {
-  // @@protoc_insertion_point(field_get:io.deephaven.proto.backplane.script.grpc.CompletionItem.insert_text_format)
-  return _internal_insert_text_format();
-}
-inline void CompletionItem::set_insert_text_format(::int32_t value) {
-  _internal_set_insert_text_format(value);
-  // @@protoc_insertion_point(field_set:io.deephaven.proto.backplane.script.grpc.CompletionItem.insert_text_format)
-}
-inline ::int32_t CompletionItem::_internal_insert_text_format() const {
-  PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race);
-  return _impl_.insert_text_format_;
-}
-inline void CompletionItem::_internal_set_insert_text_format(::int32_t value) {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  ;
-  _impl_.insert_text_format_ = value;
-}
-
-// repeated .io.deephaven.proto.backplane.script.grpc.TextEdit additional_text_edits = 13;
-inline int CompletionItem::_internal_additional_text_edits_size() const {
-  return _internal_additional_text_edits().size();
-}
-inline int CompletionItem::additional_text_edits_size() const {
-  return _internal_additional_text_edits_size();
-}
-inline void CompletionItem::clear_additional_text_edits() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  _impl_.additional_text_edits_.Clear();
-}
-inline ::io::deephaven::proto::backplane::script::grpc::TextEdit* CompletionItem::mutable_additional_text_edits(int index)
-    ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  // @@protoc_insertion_point(field_mutable:io.deephaven.proto.backplane.script.grpc.CompletionItem.additional_text_edits)
-  return _internal_mutable_additional_text_edits()->Mutable(index);
-}
-inline ::google::protobuf::RepeatedPtrField<::io::deephaven::proto::backplane::script::grpc::TextEdit>* CompletionItem::mutable_additional_text_edits()
-    ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  // @@protoc_insertion_point(field_mutable_list:io.deephaven.proto.backplane.script.grpc.CompletionItem.additional_text_edits)
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  return _internal_mutable_additional_text_edits();
-}
-inline const ::io::deephaven::proto::backplane::script::grpc::TextEdit& CompletionItem::additional_text_edits(int index) const
-    ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  // @@protoc_insertion_point(field_get:io.deephaven.proto.backplane.script.grpc.CompletionItem.additional_text_edits)
-  return _internal_additional_text_edits().Get(index);
-}
-inline ::io::deephaven::proto::backplane::script::grpc::TextEdit* CompletionItem::add_additional_text_edits() ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  ::io::deephaven::proto::backplane::script::grpc::TextEdit* _add = _internal_mutable_additional_text_edits()->Add();
-  // @@protoc_insertion_point(field_add:io.deephaven.proto.backplane.script.grpc.CompletionItem.additional_text_edits)
-  return _add;
-}
-inline const ::google::protobuf::RepeatedPtrField<::io::deephaven::proto::backplane::script::grpc::TextEdit>& CompletionItem::additional_text_edits() const
-    ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  // @@protoc_insertion_point(field_list:io.deephaven.proto.backplane.script.grpc.CompletionItem.additional_text_edits)
-  return _internal_additional_text_edits();
-}
-inline const ::google::protobuf::RepeatedPtrField<::io::deephaven::proto::backplane::script::grpc::TextEdit>&
-CompletionItem::_internal_additional_text_edits() const {
-  PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race);
-  return _impl_.additional_text_edits_;
-}
-inline ::google::protobuf::RepeatedPtrField<::io::deephaven::proto::backplane::script::grpc::TextEdit>*
-CompletionItem::_internal_mutable_additional_text_edits() {
-  PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race);
-  return &_impl_.additional_text_edits_;
-}
-
-// repeated string commit_characters = 14;
-inline int CompletionItem::_internal_commit_characters_size() const {
-  return _internal_commit_characters().size();
-}
-inline int CompletionItem::commit_characters_size() const {
-  return _internal_commit_characters_size();
-}
-inline void CompletionItem::clear_commit_characters() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  _impl_.commit_characters_.Clear();
-}
-inline std::string* CompletionItem::add_commit_characters()
-    ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  std::string* _s = _internal_mutable_commit_characters()->Add();
-  // @@protoc_insertion_point(field_add_mutable:io.deephaven.proto.backplane.script.grpc.CompletionItem.commit_characters)
-  return _s;
-}
-inline const std::string& CompletionItem::commit_characters(int index) const
-    ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  // @@protoc_insertion_point(field_get:io.deephaven.proto.backplane.script.grpc.CompletionItem.commit_characters)
-  return _internal_commit_characters().Get(index);
-}
-inline std::string* CompletionItem::mutable_commit_characters(int index)
-    ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  // @@protoc_insertion_point(field_mutable:io.deephaven.proto.backplane.script.grpc.CompletionItem.commit_characters)
-  return _internal_mutable_commit_characters()->Mutable(index);
-}
-inline void CompletionItem::set_commit_characters(int index, const std::string& value) {
-  _internal_mutable_commit_characters()->Mutable(index)->assign(value);
-  // @@protoc_insertion_point(field_set:io.deephaven.proto.backplane.script.grpc.CompletionItem.commit_characters)
-}
-inline void CompletionItem::set_commit_characters(int index, std::string&& value) {
-  _internal_mutable_commit_characters()->Mutable(index)->assign(std::move(value));
-  // @@protoc_insertion_point(field_set:io.deephaven.proto.backplane.script.grpc.CompletionItem.commit_characters)
-}
-inline void CompletionItem::set_commit_characters(int index, const char* value) {
-  ABSL_DCHECK(value != nullptr);
-  _internal_mutable_commit_characters()->Mutable(index)->assign(value);
-  // @@protoc_insertion_point(field_set_char:io.deephaven.proto.backplane.script.grpc.CompletionItem.commit_characters)
-}
-inline void CompletionItem::set_commit_characters(int index, const char* value,
-                              std::size_t size) {
-  _internal_mutable_commit_characters()->Mutable(index)->assign(
-      reinterpret_cast<const char*>(value), size);
-  // @@protoc_insertion_point(field_set_pointer:io.deephaven.proto.backplane.script.grpc.CompletionItem.commit_characters)
-}
-inline void CompletionItem::set_commit_characters(int index, absl::string_view value) {
-  _internal_mutable_commit_characters()->Mutable(index)->assign(value.data(),
-                                                     value.size());
-  // @@protoc_insertion_point(field_set_string_piece:io.deephaven.proto.backplane.script.grpc.CompletionItem.commit_characters)
-}
-inline void CompletionItem::add_commit_characters(const std::string& value) {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  _internal_mutable_commit_characters()->Add()->assign(value);
-  // @@protoc_insertion_point(field_add:io.deephaven.proto.backplane.script.grpc.CompletionItem.commit_characters)
-}
-inline void CompletionItem::add_commit_characters(std::string&& value) {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  _internal_mutable_commit_characters()->Add(std::move(value));
-  // @@protoc_insertion_point(field_add:io.deephaven.proto.backplane.script.grpc.CompletionItem.commit_characters)
-}
-inline void CompletionItem::add_commit_characters(const char* value) {
-  ABSL_DCHECK(value != nullptr);
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  _internal_mutable_commit_characters()->Add()->assign(value);
-  // @@protoc_insertion_point(field_add_char:io.deephaven.proto.backplane.script.grpc.CompletionItem.commit_characters)
-}
-inline void CompletionItem::add_commit_characters(const char* value, std::size_t size) {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  _internal_mutable_commit_characters()->Add()->assign(
-      reinterpret_cast<const char*>(value), size);
-  // @@protoc_insertion_point(field_add_pointer:io.deephaven.proto.backplane.script.grpc.CompletionItem.commit_characters)
-}
-inline void CompletionItem::add_commit_characters(absl::string_view value) {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  _internal_mutable_commit_characters()->Add()->assign(value.data(), value.size());
-  // @@protoc_insertion_point(field_add_string_piece:io.deephaven.proto.backplane.script.grpc.CompletionItem.commit_characters)
-}
-inline const ::google::protobuf::RepeatedPtrField<std::string>&
-CompletionItem::commit_characters() const ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  // @@protoc_insertion_point(field_list:io.deephaven.proto.backplane.script.grpc.CompletionItem.commit_characters)
-  return _internal_commit_characters();
-}
-inline ::google::protobuf::RepeatedPtrField<std::string>*
-CompletionItem::mutable_commit_characters() ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  // @@protoc_insertion_point(field_mutable_list:io.deephaven.proto.backplane.script.grpc.CompletionItem.commit_characters)
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  return _internal_mutable_commit_characters();
-}
-inline const ::google::protobuf::RepeatedPtrField<std::string>&
-CompletionItem::_internal_commit_characters() const {
-  PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race);
-  return _impl_.commit_characters_;
-}
-inline ::google::protobuf::RepeatedPtrField<std::string>*
-CompletionItem::_internal_mutable_commit_characters() {
-  PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race);
-  return &_impl_.commit_characters_;
-}
-
-// .io.deephaven.proto.backplane.script.grpc.MarkupContent documentation = 15;
-inline bool CompletionItem::has_documentation() const {
-  bool value = (_impl_._has_bits_[0] & 0x00000002u) != 0;
-  PROTOBUF_ASSUME(!value || _impl_.documentation_ != nullptr);
-  return value;
-}
-inline void CompletionItem::clear_documentation() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  if (_impl_.documentation_ != nullptr) _impl_.documentation_->Clear();
-  _impl_._has_bits_[0] &= ~0x00000002u;
-}
-inline const ::io::deephaven::proto::backplane::script::grpc::MarkupContent& CompletionItem::_internal_documentation() const {
-  PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race);
-  const ::io::deephaven::proto::backplane::script::grpc::MarkupContent* p = _impl_.documentation_;
-  return p != nullptr ? *p : reinterpret_cast<const ::io::deephaven::proto::backplane::script::grpc::MarkupContent&>(::io::deephaven::proto::backplane::script::grpc::_MarkupContent_default_instance_);
-}
-inline const ::io::deephaven::proto::backplane::script::grpc::MarkupContent& CompletionItem::documentation() const ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  // @@protoc_insertion_point(field_get:io.deephaven.proto.backplane.script.grpc.CompletionItem.documentation)
-  return _internal_documentation();
-}
-inline void CompletionItem::unsafe_arena_set_allocated_documentation(::io::deephaven::proto::backplane::script::grpc::MarkupContent* value) {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  if (GetArena() == nullptr) {
-    delete reinterpret_cast<::google::protobuf::MessageLite*>(_impl_.documentation_);
-  }
-  _impl_.documentation_ = reinterpret_cast<::io::deephaven::proto::backplane::script::grpc::MarkupContent*>(value);
-  if (value != nullptr) {
-    _impl_._has_bits_[0] |= 0x00000002u;
-  } else {
-    _impl_._has_bits_[0] &= ~0x00000002u;
-  }
-  // @@protoc_insertion_point(field_unsafe_arena_set_allocated:io.deephaven.proto.backplane.script.grpc.CompletionItem.documentation)
-}
-inline ::io::deephaven::proto::backplane::script::grpc::MarkupContent* CompletionItem::release_documentation() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-
-  _impl_._has_bits_[0] &= ~0x00000002u;
-  ::io::deephaven::proto::backplane::script::grpc::MarkupContent* released = _impl_.documentation_;
-  _impl_.documentation_ = nullptr;
-#ifdef PROTOBUF_FORCE_COPY_IN_RELEASE
-  auto* old = reinterpret_cast<::google::protobuf::MessageLite*>(released);
-  released = ::google::protobuf::internal::DuplicateIfNonNull(released);
-  if (GetArena() == nullptr) {
-    delete old;
-  }
-#else   // PROTOBUF_FORCE_COPY_IN_RELEASE
-  if (GetArena() != nullptr) {
-    released = ::google::protobuf::internal::DuplicateIfNonNull(released);
-  }
-#endif  // !PROTOBUF_FORCE_COPY_IN_RELEASE
-  return released;
-}
-inline ::io::deephaven::proto::backplane::script::grpc::MarkupContent* CompletionItem::unsafe_arena_release_documentation() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  // @@protoc_insertion_point(field_release:io.deephaven.proto.backplane.script.grpc.CompletionItem.documentation)
-
-  _impl_._has_bits_[0] &= ~0x00000002u;
-  ::io::deephaven::proto::backplane::script::grpc::MarkupContent* temp = _impl_.documentation_;
-  _impl_.documentation_ = nullptr;
-  return temp;
-}
-inline ::io::deephaven::proto::backplane::script::grpc::MarkupContent* CompletionItem::_internal_mutable_documentation() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  _impl_._has_bits_[0] |= 0x00000002u;
-  if (_impl_.documentation_ == nullptr) {
-    auto* p = CreateMaybeMessage<::io::deephaven::proto::backplane::script::grpc::MarkupContent>(GetArena());
-    _impl_.documentation_ = reinterpret_cast<::io::deephaven::proto::backplane::script::grpc::MarkupContent*>(p);
-  }
-  return _impl_.documentation_;
-}
-inline ::io::deephaven::proto::backplane::script::grpc::MarkupContent* CompletionItem::mutable_documentation() ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  ::io::deephaven::proto::backplane::script::grpc::MarkupContent* _msg = _internal_mutable_documentation();
-  // @@protoc_insertion_point(field_mutable:io.deephaven.proto.backplane.script.grpc.CompletionItem.documentation)
-  return _msg;
-}
-inline void CompletionItem::set_allocated_documentation(::io::deephaven::proto::backplane::script::grpc::MarkupContent* value) {
-  ::google::protobuf::Arena* message_arena = GetArena();
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  if (message_arena == nullptr) {
-    delete reinterpret_cast<::io::deephaven::proto::backplane::script::grpc::MarkupContent*>(_impl_.documentation_);
-  }
-
-  if (value != nullptr) {
-    ::google::protobuf::Arena* submessage_arena = reinterpret_cast<::io::deephaven::proto::backplane::script::grpc::MarkupContent*>(value)->GetArena();
-    if (message_arena != submessage_arena) {
-      value = ::google::protobuf::internal::GetOwnedMessage(message_arena, value, submessage_arena);
-    }
-    _impl_._has_bits_[0] |= 0x00000002u;
-  } else {
-    _impl_._has_bits_[0] &= ~0x00000002u;
-  }
-
-  _impl_.documentation_ = reinterpret_cast<::io::deephaven::proto::backplane::script::grpc::MarkupContent*>(value);
-  // @@protoc_insertion_point(field_set_allocated:io.deephaven.proto.backplane.script.grpc.CompletionItem.documentation)
-}
-
-// -------------------------------------------------------------------
-
-// TextEdit
-
-// .io.deephaven.proto.backplane.script.grpc.DocumentRange range = 1;
-inline bool TextEdit::has_range() const {
-  bool value = (_impl_._has_bits_[0] & 0x00000001u) != 0;
-  PROTOBUF_ASSUME(!value || _impl_.range_ != nullptr);
-  return value;
-}
-inline void TextEdit::clear_range() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  if (_impl_.range_ != nullptr) _impl_.range_->Clear();
-  _impl_._has_bits_[0] &= ~0x00000001u;
-}
-inline const ::io::deephaven::proto::backplane::script::grpc::DocumentRange& TextEdit::_internal_range() const {
-  PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race);
-  const ::io::deephaven::proto::backplane::script::grpc::DocumentRange* p = _impl_.range_;
-  return p != nullptr ? *p : reinterpret_cast<const ::io::deephaven::proto::backplane::script::grpc::DocumentRange&>(::io::deephaven::proto::backplane::script::grpc::_DocumentRange_default_instance_);
-}
-inline const ::io::deephaven::proto::backplane::script::grpc::DocumentRange& TextEdit::range() const ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  // @@protoc_insertion_point(field_get:io.deephaven.proto.backplane.script.grpc.TextEdit.range)
-  return _internal_range();
-}
-inline void TextEdit::unsafe_arena_set_allocated_range(::io::deephaven::proto::backplane::script::grpc::DocumentRange* value) {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  if (GetArena() == nullptr) {
-    delete reinterpret_cast<::google::protobuf::MessageLite*>(_impl_.range_);
-  }
-  _impl_.range_ = reinterpret_cast<::io::deephaven::proto::backplane::script::grpc::DocumentRange*>(value);
-  if (value != nullptr) {
-    _impl_._has_bits_[0] |= 0x00000001u;
-  } else {
-    _impl_._has_bits_[0] &= ~0x00000001u;
-  }
-  // @@protoc_insertion_point(field_unsafe_arena_set_allocated:io.deephaven.proto.backplane.script.grpc.TextEdit.range)
-}
-inline ::io::deephaven::proto::backplane::script::grpc::DocumentRange* TextEdit::release_range() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-
-  _impl_._has_bits_[0] &= ~0x00000001u;
-  ::io::deephaven::proto::backplane::script::grpc::DocumentRange* released = _impl_.range_;
-  _impl_.range_ = nullptr;
-#ifdef PROTOBUF_FORCE_COPY_IN_RELEASE
-  auto* old = reinterpret_cast<::google::protobuf::MessageLite*>(released);
-  released = ::google::protobuf::internal::DuplicateIfNonNull(released);
-  if (GetArena() == nullptr) {
-    delete old;
-  }
-#else   // PROTOBUF_FORCE_COPY_IN_RELEASE
-  if (GetArena() != nullptr) {
-    released = ::google::protobuf::internal::DuplicateIfNonNull(released);
-  }
-#endif  // !PROTOBUF_FORCE_COPY_IN_RELEASE
-  return released;
-}
-inline ::io::deephaven::proto::backplane::script::grpc::DocumentRange* TextEdit::unsafe_arena_release_range() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  // @@protoc_insertion_point(field_release:io.deephaven.proto.backplane.script.grpc.TextEdit.range)
-
-  _impl_._has_bits_[0] &= ~0x00000001u;
-  ::io::deephaven::proto::backplane::script::grpc::DocumentRange* temp = _impl_.range_;
-  _impl_.range_ = nullptr;
-  return temp;
-}
-inline ::io::deephaven::proto::backplane::script::grpc::DocumentRange* TextEdit::_internal_mutable_range() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  _impl_._has_bits_[0] |= 0x00000001u;
-  if (_impl_.range_ == nullptr) {
-    auto* p = CreateMaybeMessage<::io::deephaven::proto::backplane::script::grpc::DocumentRange>(GetArena());
-    _impl_.range_ = reinterpret_cast<::io::deephaven::proto::backplane::script::grpc::DocumentRange*>(p);
-  }
-  return _impl_.range_;
-}
-inline ::io::deephaven::proto::backplane::script::grpc::DocumentRange* TextEdit::mutable_range() ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  ::io::deephaven::proto::backplane::script::grpc::DocumentRange* _msg = _internal_mutable_range();
-  // @@protoc_insertion_point(field_mutable:io.deephaven.proto.backplane.script.grpc.TextEdit.range)
-  return _msg;
-}
-inline void TextEdit::set_allocated_range(::io::deephaven::proto::backplane::script::grpc::DocumentRange* value) {
-  ::google::protobuf::Arena* message_arena = GetArena();
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  if (message_arena == nullptr) {
-    delete reinterpret_cast<::io::deephaven::proto::backplane::script::grpc::DocumentRange*>(_impl_.range_);
-  }
-
-  if (value != nullptr) {
-    ::google::protobuf::Arena* submessage_arena = reinterpret_cast<::io::deephaven::proto::backplane::script::grpc::DocumentRange*>(value)->GetArena();
-    if (message_arena != submessage_arena) {
-      value = ::google::protobuf::internal::GetOwnedMessage(message_arena, value, submessage_arena);
-    }
-    _impl_._has_bits_[0] |= 0x00000001u;
-  } else {
-    _impl_._has_bits_[0] &= ~0x00000001u;
-  }
-
-  _impl_.range_ = reinterpret_cast<::io::deephaven::proto::backplane::script::grpc::DocumentRange*>(value);
-  // @@protoc_insertion_point(field_set_allocated:io.deephaven.proto.backplane.script.grpc.TextEdit.range)
-}
-
-// string text = 2;
-inline void TextEdit::clear_text() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  _impl_.text_.ClearToEmpty();
-}
-inline const std::string& TextEdit::text() const
-    ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  // @@protoc_insertion_point(field_get:io.deephaven.proto.backplane.script.grpc.TextEdit.text)
-  return _internal_text();
-}
-template <typename Arg_, typename... Args_>
-inline PROTOBUF_ALWAYS_INLINE void TextEdit::set_text(Arg_&& arg,
-                                                     Args_... args) {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  ;
-  _impl_.text_.Set(static_cast<Arg_&&>(arg), args..., GetArena());
-  // @@protoc_insertion_point(field_set:io.deephaven.proto.backplane.script.grpc.TextEdit.text)
-}
-inline std::string* TextEdit::mutable_text() ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  std::string* _s = _internal_mutable_text();
-  // @@protoc_insertion_point(field_mutable:io.deephaven.proto.backplane.script.grpc.TextEdit.text)
-  return _s;
-}
-inline const std::string& TextEdit::_internal_text() const {
-  PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race);
-  return _impl_.text_.Get();
-}
-inline void TextEdit::_internal_set_text(const std::string& value) {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  ;
-  _impl_.text_.Set(value, GetArena());
-}
-inline std::string* TextEdit::_internal_mutable_text() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  ;
-  return _impl_.text_.Mutable( GetArena());
-}
-inline std::string* TextEdit::release_text() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  // @@protoc_insertion_point(field_release:io.deephaven.proto.backplane.script.grpc.TextEdit.text)
-  return _impl_.text_.Release();
-}
-inline void TextEdit::set_allocated_text(std::string* value) {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  _impl_.text_.SetAllocated(value, GetArena());
-  #ifdef PROTOBUF_FORCE_COPY_DEFAULT_STRING
-        if (_impl_.text_.IsDefault()) {
-          _impl_.text_.Set("", GetArena());
-        }
-  #endif  // PROTOBUF_FORCE_COPY_DEFAULT_STRING
-  // @@protoc_insertion_point(field_set_allocated:io.deephaven.proto.backplane.script.grpc.TextEdit.text)
-}
-
-// -------------------------------------------------------------------
-
-// GetSignatureHelpRequest
-
-// .io.deephaven.proto.backplane.script.grpc.SignatureHelpContext context = 1;
-inline bool GetSignatureHelpRequest::has_context() const {
-  bool value = (_impl_._has_bits_[0] & 0x00000001u) != 0;
-  PROTOBUF_ASSUME(!value || _impl_.context_ != nullptr);
-  return value;
-}
-inline void GetSignatureHelpRequest::clear_context() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  if (_impl_.context_ != nullptr) _impl_.context_->Clear();
-  _impl_._has_bits_[0] &= ~0x00000001u;
-}
-inline const ::io::deephaven::proto::backplane::script::grpc::SignatureHelpContext& GetSignatureHelpRequest::_internal_context() const {
-  PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race);
-  const ::io::deephaven::proto::backplane::script::grpc::SignatureHelpContext* p = _impl_.context_;
-  return p != nullptr ? *p : reinterpret_cast<const ::io::deephaven::proto::backplane::script::grpc::SignatureHelpContext&>(::io::deephaven::proto::backplane::script::grpc::_SignatureHelpContext_default_instance_);
-}
-inline const ::io::deephaven::proto::backplane::script::grpc::SignatureHelpContext& GetSignatureHelpRequest::context() const ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  // @@protoc_insertion_point(field_get:io.deephaven.proto.backplane.script.grpc.GetSignatureHelpRequest.context)
-  return _internal_context();
-}
-inline void GetSignatureHelpRequest::unsafe_arena_set_allocated_context(::io::deephaven::proto::backplane::script::grpc::SignatureHelpContext* value) {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  if (GetArena() == nullptr) {
-    delete reinterpret_cast<::google::protobuf::MessageLite*>(_impl_.context_);
-  }
-  _impl_.context_ = reinterpret_cast<::io::deephaven::proto::backplane::script::grpc::SignatureHelpContext*>(value);
-  if (value != nullptr) {
-    _impl_._has_bits_[0] |= 0x00000001u;
-  } else {
-    _impl_._has_bits_[0] &= ~0x00000001u;
-  }
-  // @@protoc_insertion_point(field_unsafe_arena_set_allocated:io.deephaven.proto.backplane.script.grpc.GetSignatureHelpRequest.context)
-}
-inline ::io::deephaven::proto::backplane::script::grpc::SignatureHelpContext* GetSignatureHelpRequest::release_context() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-
-  _impl_._has_bits_[0] &= ~0x00000001u;
-  ::io::deephaven::proto::backplane::script::grpc::SignatureHelpContext* released = _impl_.context_;
-  _impl_.context_ = nullptr;
-#ifdef PROTOBUF_FORCE_COPY_IN_RELEASE
-  auto* old = reinterpret_cast<::google::protobuf::MessageLite*>(released);
-  released = ::google::protobuf::internal::DuplicateIfNonNull(released);
-  if (GetArena() == nullptr) {
-    delete old;
-  }
-#else   // PROTOBUF_FORCE_COPY_IN_RELEASE
-  if (GetArena() != nullptr) {
-    released = ::google::protobuf::internal::DuplicateIfNonNull(released);
-  }
-#endif  // !PROTOBUF_FORCE_COPY_IN_RELEASE
-  return released;
-}
-inline ::io::deephaven::proto::backplane::script::grpc::SignatureHelpContext* GetSignatureHelpRequest::unsafe_arena_release_context() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  // @@protoc_insertion_point(field_release:io.deephaven.proto.backplane.script.grpc.GetSignatureHelpRequest.context)
-
-  _impl_._has_bits_[0] &= ~0x00000001u;
-  ::io::deephaven::proto::backplane::script::grpc::SignatureHelpContext* temp = _impl_.context_;
-  _impl_.context_ = nullptr;
-  return temp;
-}
-inline ::io::deephaven::proto::backplane::script::grpc::SignatureHelpContext* GetSignatureHelpRequest::_internal_mutable_context() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  _impl_._has_bits_[0] |= 0x00000001u;
-  if (_impl_.context_ == nullptr) {
-    auto* p = CreateMaybeMessage<::io::deephaven::proto::backplane::script::grpc::SignatureHelpContext>(GetArena());
-    _impl_.context_ = reinterpret_cast<::io::deephaven::proto::backplane::script::grpc::SignatureHelpContext*>(p);
-  }
-  return _impl_.context_;
-}
-inline ::io::deephaven::proto::backplane::script::grpc::SignatureHelpContext* GetSignatureHelpRequest::mutable_context() ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  ::io::deephaven::proto::backplane::script::grpc::SignatureHelpContext* _msg = _internal_mutable_context();
-  // @@protoc_insertion_point(field_mutable:io.deephaven.proto.backplane.script.grpc.GetSignatureHelpRequest.context)
-  return _msg;
-}
-inline void GetSignatureHelpRequest::set_allocated_context(::io::deephaven::proto::backplane::script::grpc::SignatureHelpContext* value) {
-  ::google::protobuf::Arena* message_arena = GetArena();
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  if (message_arena == nullptr) {
-    delete reinterpret_cast<::io::deephaven::proto::backplane::script::grpc::SignatureHelpContext*>(_impl_.context_);
-  }
-
-  if (value != nullptr) {
-    ::google::protobuf::Arena* submessage_arena = reinterpret_cast<::io::deephaven::proto::backplane::script::grpc::SignatureHelpContext*>(value)->GetArena();
-    if (message_arena != submessage_arena) {
-      value = ::google::protobuf::internal::GetOwnedMessage(message_arena, value, submessage_arena);
-    }
-    _impl_._has_bits_[0] |= 0x00000001u;
-  } else {
-    _impl_._has_bits_[0] &= ~0x00000001u;
-  }
-
-  _impl_.context_ = reinterpret_cast<::io::deephaven::proto::backplane::script::grpc::SignatureHelpContext*>(value);
-  // @@protoc_insertion_point(field_set_allocated:io.deephaven.proto.backplane.script.grpc.GetSignatureHelpRequest.context)
-}
-
-// .io.deephaven.proto.backplane.script.grpc.VersionedTextDocumentIdentifier text_document = 2;
-inline bool GetSignatureHelpRequest::has_text_document() const {
-  bool value = (_impl_._has_bits_[0] & 0x00000002u) != 0;
-  PROTOBUF_ASSUME(!value || _impl_.text_document_ != nullptr);
-  return value;
-}
-inline void GetSignatureHelpRequest::clear_text_document() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  if (_impl_.text_document_ != nullptr) _impl_.text_document_->Clear();
-  _impl_._has_bits_[0] &= ~0x00000002u;
-}
-inline const ::io::deephaven::proto::backplane::script::grpc::VersionedTextDocumentIdentifier& GetSignatureHelpRequest::_internal_text_document() const {
-  PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race);
-  const ::io::deephaven::proto::backplane::script::grpc::VersionedTextDocumentIdentifier* p = _impl_.text_document_;
-  return p != nullptr ? *p : reinterpret_cast<const ::io::deephaven::proto::backplane::script::grpc::VersionedTextDocumentIdentifier&>(::io::deephaven::proto::backplane::script::grpc::_VersionedTextDocumentIdentifier_default_instance_);
-}
-inline const ::io::deephaven::proto::backplane::script::grpc::VersionedTextDocumentIdentifier& GetSignatureHelpRequest::text_document() const ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  // @@protoc_insertion_point(field_get:io.deephaven.proto.backplane.script.grpc.GetSignatureHelpRequest.text_document)
-  return _internal_text_document();
-}
-inline void GetSignatureHelpRequest::unsafe_arena_set_allocated_text_document(::io::deephaven::proto::backplane::script::grpc::VersionedTextDocumentIdentifier* value) {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  if (GetArena() == nullptr) {
-    delete reinterpret_cast<::google::protobuf::MessageLite*>(_impl_.text_document_);
-  }
-  _impl_.text_document_ = reinterpret_cast<::io::deephaven::proto::backplane::script::grpc::VersionedTextDocumentIdentifier*>(value);
-  if (value != nullptr) {
-    _impl_._has_bits_[0] |= 0x00000002u;
-  } else {
-    _impl_._has_bits_[0] &= ~0x00000002u;
-  }
-  // @@protoc_insertion_point(field_unsafe_arena_set_allocated:io.deephaven.proto.backplane.script.grpc.GetSignatureHelpRequest.text_document)
-}
-inline ::io::deephaven::proto::backplane::script::grpc::VersionedTextDocumentIdentifier* GetSignatureHelpRequest::release_text_document() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-
-  _impl_._has_bits_[0] &= ~0x00000002u;
-  ::io::deephaven::proto::backplane::script::grpc::VersionedTextDocumentIdentifier* released = _impl_.text_document_;
-  _impl_.text_document_ = nullptr;
-#ifdef PROTOBUF_FORCE_COPY_IN_RELEASE
-  auto* old = reinterpret_cast<::google::protobuf::MessageLite*>(released);
-  released = ::google::protobuf::internal::DuplicateIfNonNull(released);
-  if (GetArena() == nullptr) {
-    delete old;
-  }
-#else   // PROTOBUF_FORCE_COPY_IN_RELEASE
-  if (GetArena() != nullptr) {
-    released = ::google::protobuf::internal::DuplicateIfNonNull(released);
-  }
-#endif  // !PROTOBUF_FORCE_COPY_IN_RELEASE
-  return released;
-}
-inline ::io::deephaven::proto::backplane::script::grpc::VersionedTextDocumentIdentifier* GetSignatureHelpRequest::unsafe_arena_release_text_document() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  // @@protoc_insertion_point(field_release:io.deephaven.proto.backplane.script.grpc.GetSignatureHelpRequest.text_document)
-
-  _impl_._has_bits_[0] &= ~0x00000002u;
-  ::io::deephaven::proto::backplane::script::grpc::VersionedTextDocumentIdentifier* temp = _impl_.text_document_;
-  _impl_.text_document_ = nullptr;
-  return temp;
-}
-inline ::io::deephaven::proto::backplane::script::grpc::VersionedTextDocumentIdentifier* GetSignatureHelpRequest::_internal_mutable_text_document() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  _impl_._has_bits_[0] |= 0x00000002u;
-  if (_impl_.text_document_ == nullptr) {
-    auto* p = CreateMaybeMessage<::io::deephaven::proto::backplane::script::grpc::VersionedTextDocumentIdentifier>(GetArena());
-    _impl_.text_document_ = reinterpret_cast<::io::deephaven::proto::backplane::script::grpc::VersionedTextDocumentIdentifier*>(p);
-  }
-  return _impl_.text_document_;
-}
-inline ::io::deephaven::proto::backplane::script::grpc::VersionedTextDocumentIdentifier* GetSignatureHelpRequest::mutable_text_document() ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  ::io::deephaven::proto::backplane::script::grpc::VersionedTextDocumentIdentifier* _msg = _internal_mutable_text_document();
-  // @@protoc_insertion_point(field_mutable:io.deephaven.proto.backplane.script.grpc.GetSignatureHelpRequest.text_document)
-  return _msg;
-}
-inline void GetSignatureHelpRequest::set_allocated_text_document(::io::deephaven::proto::backplane::script::grpc::VersionedTextDocumentIdentifier* value) {
-  ::google::protobuf::Arena* message_arena = GetArena();
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  if (message_arena == nullptr) {
-    delete reinterpret_cast<::io::deephaven::proto::backplane::script::grpc::VersionedTextDocumentIdentifier*>(_impl_.text_document_);
-  }
-
-  if (value != nullptr) {
-    ::google::protobuf::Arena* submessage_arena = reinterpret_cast<::io::deephaven::proto::backplane::script::grpc::VersionedTextDocumentIdentifier*>(value)->GetArena();
-    if (message_arena != submessage_arena) {
-      value = ::google::protobuf::internal::GetOwnedMessage(message_arena, value, submessage_arena);
-    }
-    _impl_._has_bits_[0] |= 0x00000002u;
-  } else {
-    _impl_._has_bits_[0] &= ~0x00000002u;
-  }
-
-  _impl_.text_document_ = reinterpret_cast<::io::deephaven::proto::backplane::script::grpc::VersionedTextDocumentIdentifier*>(value);
-  // @@protoc_insertion_point(field_set_allocated:io.deephaven.proto.backplane.script.grpc.GetSignatureHelpRequest.text_document)
-}
-
-// .io.deephaven.proto.backplane.script.grpc.Position position = 3;
-inline bool GetSignatureHelpRequest::has_position() const {
-  bool value = (_impl_._has_bits_[0] & 0x00000004u) != 0;
-  PROTOBUF_ASSUME(!value || _impl_.position_ != nullptr);
-  return value;
-}
-inline void GetSignatureHelpRequest::clear_position() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  if (_impl_.position_ != nullptr) _impl_.position_->Clear();
-  _impl_._has_bits_[0] &= ~0x00000004u;
-}
-inline const ::io::deephaven::proto::backplane::script::grpc::Position& GetSignatureHelpRequest::_internal_position() const {
-  PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race);
-  const ::io::deephaven::proto::backplane::script::grpc::Position* p = _impl_.position_;
-  return p != nullptr ? *p : reinterpret_cast<const ::io::deephaven::proto::backplane::script::grpc::Position&>(::io::deephaven::proto::backplane::script::grpc::_Position_default_instance_);
-}
-inline const ::io::deephaven::proto::backplane::script::grpc::Position& GetSignatureHelpRequest::position() const ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  // @@protoc_insertion_point(field_get:io.deephaven.proto.backplane.script.grpc.GetSignatureHelpRequest.position)
-  return _internal_position();
-}
-inline void GetSignatureHelpRequest::unsafe_arena_set_allocated_position(::io::deephaven::proto::backplane::script::grpc::Position* value) {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  if (GetArena() == nullptr) {
-    delete reinterpret_cast<::google::protobuf::MessageLite*>(_impl_.position_);
-  }
-  _impl_.position_ = reinterpret_cast<::io::deephaven::proto::backplane::script::grpc::Position*>(value);
-  if (value != nullptr) {
-    _impl_._has_bits_[0] |= 0x00000004u;
-  } else {
-    _impl_._has_bits_[0] &= ~0x00000004u;
-  }
-  // @@protoc_insertion_point(field_unsafe_arena_set_allocated:io.deephaven.proto.backplane.script.grpc.GetSignatureHelpRequest.position)
-}
-inline ::io::deephaven::proto::backplane::script::grpc::Position* GetSignatureHelpRequest::release_position() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-
-  _impl_._has_bits_[0] &= ~0x00000004u;
-  ::io::deephaven::proto::backplane::script::grpc::Position* released = _impl_.position_;
-  _impl_.position_ = nullptr;
-#ifdef PROTOBUF_FORCE_COPY_IN_RELEASE
-  auto* old = reinterpret_cast<::google::protobuf::MessageLite*>(released);
-  released = ::google::protobuf::internal::DuplicateIfNonNull(released);
-  if (GetArena() == nullptr) {
-    delete old;
-  }
-#else   // PROTOBUF_FORCE_COPY_IN_RELEASE
-  if (GetArena() != nullptr) {
-    released = ::google::protobuf::internal::DuplicateIfNonNull(released);
-  }
-#endif  // !PROTOBUF_FORCE_COPY_IN_RELEASE
-  return released;
-}
-inline ::io::deephaven::proto::backplane::script::grpc::Position* GetSignatureHelpRequest::unsafe_arena_release_position() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  // @@protoc_insertion_point(field_release:io.deephaven.proto.backplane.script.grpc.GetSignatureHelpRequest.position)
-
-  _impl_._has_bits_[0] &= ~0x00000004u;
-  ::io::deephaven::proto::backplane::script::grpc::Position* temp = _impl_.position_;
-  _impl_.position_ = nullptr;
-  return temp;
-}
-inline ::io::deephaven::proto::backplane::script::grpc::Position* GetSignatureHelpRequest::_internal_mutable_position() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  _impl_._has_bits_[0] |= 0x00000004u;
-  if (_impl_.position_ == nullptr) {
-    auto* p = CreateMaybeMessage<::io::deephaven::proto::backplane::script::grpc::Position>(GetArena());
-    _impl_.position_ = reinterpret_cast<::io::deephaven::proto::backplane::script::grpc::Position*>(p);
-  }
-  return _impl_.position_;
-}
-inline ::io::deephaven::proto::backplane::script::grpc::Position* GetSignatureHelpRequest::mutable_position() ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  ::io::deephaven::proto::backplane::script::grpc::Position* _msg = _internal_mutable_position();
-  // @@protoc_insertion_point(field_mutable:io.deephaven.proto.backplane.script.grpc.GetSignatureHelpRequest.position)
-  return _msg;
-}
-inline void GetSignatureHelpRequest::set_allocated_position(::io::deephaven::proto::backplane::script::grpc::Position* value) {
-  ::google::protobuf::Arena* message_arena = GetArena();
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  if (message_arena == nullptr) {
-    delete reinterpret_cast<::io::deephaven::proto::backplane::script::grpc::Position*>(_impl_.position_);
-  }
-
-  if (value != nullptr) {
-    ::google::protobuf::Arena* submessage_arena = reinterpret_cast<::io::deephaven::proto::backplane::script::grpc::Position*>(value)->GetArena();
-    if (message_arena != submessage_arena) {
-      value = ::google::protobuf::internal::GetOwnedMessage(message_arena, value, submessage_arena);
-    }
-    _impl_._has_bits_[0] |= 0x00000004u;
-  } else {
-    _impl_._has_bits_[0] &= ~0x00000004u;
-  }
-
-  _impl_.position_ = reinterpret_cast<::io::deephaven::proto::backplane::script::grpc::Position*>(value);
-  // @@protoc_insertion_point(field_set_allocated:io.deephaven.proto.backplane.script.grpc.GetSignatureHelpRequest.position)
-}
-
-// -------------------------------------------------------------------
-
-// SignatureHelpContext
-
-// int32 trigger_kind = 1;
-inline void SignatureHelpContext::clear_trigger_kind() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  _impl_.trigger_kind_ = 0;
-}
-inline ::int32_t SignatureHelpContext::trigger_kind() const {
-  // @@protoc_insertion_point(field_get:io.deephaven.proto.backplane.script.grpc.SignatureHelpContext.trigger_kind)
-  return _internal_trigger_kind();
-}
-inline void SignatureHelpContext::set_trigger_kind(::int32_t value) {
-  _internal_set_trigger_kind(value);
-  // @@protoc_insertion_point(field_set:io.deephaven.proto.backplane.script.grpc.SignatureHelpContext.trigger_kind)
-}
-inline ::int32_t SignatureHelpContext::_internal_trigger_kind() const {
-  PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race);
-  return _impl_.trigger_kind_;
-}
-inline void SignatureHelpContext::_internal_set_trigger_kind(::int32_t value) {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  ;
-  _impl_.trigger_kind_ = value;
-}
-
-// optional string trigger_character = 2;
-inline bool SignatureHelpContext::has_trigger_character() const {
-  bool value = (_impl_._has_bits_[0] & 0x00000001u) != 0;
-  return value;
-}
-inline void SignatureHelpContext::clear_trigger_character() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  _impl_.trigger_character_.ClearToEmpty();
-  _impl_._has_bits_[0] &= ~0x00000001u;
-}
-inline const std::string& SignatureHelpContext::trigger_character() const
-    ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  // @@protoc_insertion_point(field_get:io.deephaven.proto.backplane.script.grpc.SignatureHelpContext.trigger_character)
-  return _internal_trigger_character();
-}
-template <typename Arg_, typename... Args_>
-inline PROTOBUF_ALWAYS_INLINE void SignatureHelpContext::set_trigger_character(Arg_&& arg,
-                                                     Args_... args) {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  _impl_._has_bits_[0] |= 0x00000001u;
-  _impl_.trigger_character_.Set(static_cast<Arg_&&>(arg), args..., GetArena());
-  // @@protoc_insertion_point(field_set:io.deephaven.proto.backplane.script.grpc.SignatureHelpContext.trigger_character)
-}
-inline std::string* SignatureHelpContext::mutable_trigger_character() ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  std::string* _s = _internal_mutable_trigger_character();
-  // @@protoc_insertion_point(field_mutable:io.deephaven.proto.backplane.script.grpc.SignatureHelpContext.trigger_character)
-  return _s;
-}
-inline const std::string& SignatureHelpContext::_internal_trigger_character() const {
-  PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race);
-  return _impl_.trigger_character_.Get();
-}
-inline void SignatureHelpContext::_internal_set_trigger_character(const std::string& value) {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  _impl_._has_bits_[0] |= 0x00000001u;
-  _impl_.trigger_character_.Set(value, GetArena());
-}
-inline std::string* SignatureHelpContext::_internal_mutable_trigger_character() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  _impl_._has_bits_[0] |= 0x00000001u;
-  return _impl_.trigger_character_.Mutable( GetArena());
-}
-inline std::string* SignatureHelpContext::release_trigger_character() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  // @@protoc_insertion_point(field_release:io.deephaven.proto.backplane.script.grpc.SignatureHelpContext.trigger_character)
-  if ((_impl_._has_bits_[0] & 0x00000001u) == 0) {
-    return nullptr;
-  }
-  _impl_._has_bits_[0] &= ~0x00000001u;
-  auto* released = _impl_.trigger_character_.Release();
-  #ifdef PROTOBUF_FORCE_COPY_DEFAULT_STRING
-  _impl_.trigger_character_.Set("", GetArena());
-  #endif  // PROTOBUF_FORCE_COPY_DEFAULT_STRING
-  return released;
-}
-inline void SignatureHelpContext::set_allocated_trigger_character(std::string* value) {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  if (value != nullptr) {
-    _impl_._has_bits_[0] |= 0x00000001u;
-  } else {
-    _impl_._has_bits_[0] &= ~0x00000001u;
-  }
-  _impl_.trigger_character_.SetAllocated(value, GetArena());
-  #ifdef PROTOBUF_FORCE_COPY_DEFAULT_STRING
-        if (_impl_.trigger_character_.IsDefault()) {
-          _impl_.trigger_character_.Set("", GetArena());
-        }
-  #endif  // PROTOBUF_FORCE_COPY_DEFAULT_STRING
-  // @@protoc_insertion_point(field_set_allocated:io.deephaven.proto.backplane.script.grpc.SignatureHelpContext.trigger_character)
-}
-
-// bool is_retrigger = 3;
-inline void SignatureHelpContext::clear_is_retrigger() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  _impl_.is_retrigger_ = false;
-}
-inline bool SignatureHelpContext::is_retrigger() const {
-  // @@protoc_insertion_point(field_get:io.deephaven.proto.backplane.script.grpc.SignatureHelpContext.is_retrigger)
-  return _internal_is_retrigger();
-}
-inline void SignatureHelpContext::set_is_retrigger(bool value) {
-  _internal_set_is_retrigger(value);
-  // @@protoc_insertion_point(field_set:io.deephaven.proto.backplane.script.grpc.SignatureHelpContext.is_retrigger)
-}
-inline bool SignatureHelpContext::_internal_is_retrigger() const {
-  PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race);
-  return _impl_.is_retrigger_;
-}
-inline void SignatureHelpContext::_internal_set_is_retrigger(bool value) {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  ;
-  _impl_.is_retrigger_ = value;
-}
-
-// .io.deephaven.proto.backplane.script.grpc.GetSignatureHelpResponse active_signature_help = 4;
-inline bool SignatureHelpContext::has_active_signature_help() const {
-  bool value = (_impl_._has_bits_[0] & 0x00000002u) != 0;
-  PROTOBUF_ASSUME(!value || _impl_.active_signature_help_ != nullptr);
-  return value;
-}
-inline void SignatureHelpContext::clear_active_signature_help() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  if (_impl_.active_signature_help_ != nullptr) _impl_.active_signature_help_->Clear();
-  _impl_._has_bits_[0] &= ~0x00000002u;
-}
-inline const ::io::deephaven::proto::backplane::script::grpc::GetSignatureHelpResponse& SignatureHelpContext::_internal_active_signature_help() const {
-  PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race);
-  const ::io::deephaven::proto::backplane::script::grpc::GetSignatureHelpResponse* p = _impl_.active_signature_help_;
-  return p != nullptr ? *p : reinterpret_cast<const ::io::deephaven::proto::backplane::script::grpc::GetSignatureHelpResponse&>(::io::deephaven::proto::backplane::script::grpc::_GetSignatureHelpResponse_default_instance_);
-}
-inline const ::io::deephaven::proto::backplane::script::grpc::GetSignatureHelpResponse& SignatureHelpContext::active_signature_help() const ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  // @@protoc_insertion_point(field_get:io.deephaven.proto.backplane.script.grpc.SignatureHelpContext.active_signature_help)
-  return _internal_active_signature_help();
-}
-inline void SignatureHelpContext::unsafe_arena_set_allocated_active_signature_help(::io::deephaven::proto::backplane::script::grpc::GetSignatureHelpResponse* value) {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  if (GetArena() == nullptr) {
-    delete reinterpret_cast<::google::protobuf::MessageLite*>(_impl_.active_signature_help_);
-  }
-  _impl_.active_signature_help_ = reinterpret_cast<::io::deephaven::proto::backplane::script::grpc::GetSignatureHelpResponse*>(value);
-  if (value != nullptr) {
-    _impl_._has_bits_[0] |= 0x00000002u;
-  } else {
-    _impl_._has_bits_[0] &= ~0x00000002u;
-  }
-  // @@protoc_insertion_point(field_unsafe_arena_set_allocated:io.deephaven.proto.backplane.script.grpc.SignatureHelpContext.active_signature_help)
-}
-inline ::io::deephaven::proto::backplane::script::grpc::GetSignatureHelpResponse* SignatureHelpContext::release_active_signature_help() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-
-  _impl_._has_bits_[0] &= ~0x00000002u;
-  ::io::deephaven::proto::backplane::script::grpc::GetSignatureHelpResponse* released = _impl_.active_signature_help_;
-  _impl_.active_signature_help_ = nullptr;
-#ifdef PROTOBUF_FORCE_COPY_IN_RELEASE
-  auto* old = reinterpret_cast<::google::protobuf::MessageLite*>(released);
-  released = ::google::protobuf::internal::DuplicateIfNonNull(released);
-  if (GetArena() == nullptr) {
-    delete old;
-  }
-#else   // PROTOBUF_FORCE_COPY_IN_RELEASE
-  if (GetArena() != nullptr) {
-    released = ::google::protobuf::internal::DuplicateIfNonNull(released);
-  }
-#endif  // !PROTOBUF_FORCE_COPY_IN_RELEASE
-  return released;
-}
-inline ::io::deephaven::proto::backplane::script::grpc::GetSignatureHelpResponse* SignatureHelpContext::unsafe_arena_release_active_signature_help() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  // @@protoc_insertion_point(field_release:io.deephaven.proto.backplane.script.grpc.SignatureHelpContext.active_signature_help)
-
-  _impl_._has_bits_[0] &= ~0x00000002u;
-  ::io::deephaven::proto::backplane::script::grpc::GetSignatureHelpResponse* temp = _impl_.active_signature_help_;
-  _impl_.active_signature_help_ = nullptr;
-  return temp;
-}
-inline ::io::deephaven::proto::backplane::script::grpc::GetSignatureHelpResponse* SignatureHelpContext::_internal_mutable_active_signature_help() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  _impl_._has_bits_[0] |= 0x00000002u;
-  if (_impl_.active_signature_help_ == nullptr) {
-    auto* p = CreateMaybeMessage<::io::deephaven::proto::backplane::script::grpc::GetSignatureHelpResponse>(GetArena());
-    _impl_.active_signature_help_ = reinterpret_cast<::io::deephaven::proto::backplane::script::grpc::GetSignatureHelpResponse*>(p);
-  }
-  return _impl_.active_signature_help_;
-}
-inline ::io::deephaven::proto::backplane::script::grpc::GetSignatureHelpResponse* SignatureHelpContext::mutable_active_signature_help() ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  ::io::deephaven::proto::backplane::script::grpc::GetSignatureHelpResponse* _msg = _internal_mutable_active_signature_help();
-  // @@protoc_insertion_point(field_mutable:io.deephaven.proto.backplane.script.grpc.SignatureHelpContext.active_signature_help)
-  return _msg;
-}
-inline void SignatureHelpContext::set_allocated_active_signature_help(::io::deephaven::proto::backplane::script::grpc::GetSignatureHelpResponse* value) {
-  ::google::protobuf::Arena* message_arena = GetArena();
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  if (message_arena == nullptr) {
-    delete reinterpret_cast<::io::deephaven::proto::backplane::script::grpc::GetSignatureHelpResponse*>(_impl_.active_signature_help_);
-  }
-
-  if (value != nullptr) {
-    ::google::protobuf::Arena* submessage_arena = reinterpret_cast<::io::deephaven::proto::backplane::script::grpc::GetSignatureHelpResponse*>(value)->GetArena();
-    if (message_arena != submessage_arena) {
-      value = ::google::protobuf::internal::GetOwnedMessage(message_arena, value, submessage_arena);
-    }
-    _impl_._has_bits_[0] |= 0x00000002u;
-  } else {
-    _impl_._has_bits_[0] &= ~0x00000002u;
-  }
-
-  _impl_.active_signature_help_ = reinterpret_cast<::io::deephaven::proto::backplane::script::grpc::GetSignatureHelpResponse*>(value);
-  // @@protoc_insertion_point(field_set_allocated:io.deephaven.proto.backplane.script.grpc.SignatureHelpContext.active_signature_help)
-}
-
-// -------------------------------------------------------------------
-
-// GetSignatureHelpResponse
-
-// repeated .io.deephaven.proto.backplane.script.grpc.SignatureInformation signatures = 1;
-inline int GetSignatureHelpResponse::_internal_signatures_size() const {
-  return _internal_signatures().size();
-}
-inline int GetSignatureHelpResponse::signatures_size() const {
-  return _internal_signatures_size();
-}
-inline void GetSignatureHelpResponse::clear_signatures() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  _impl_.signatures_.Clear();
-}
-inline ::io::deephaven::proto::backplane::script::grpc::SignatureInformation* GetSignatureHelpResponse::mutable_signatures(int index)
-    ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  // @@protoc_insertion_point(field_mutable:io.deephaven.proto.backplane.script.grpc.GetSignatureHelpResponse.signatures)
-  return _internal_mutable_signatures()->Mutable(index);
-}
-inline ::google::protobuf::RepeatedPtrField<::io::deephaven::proto::backplane::script::grpc::SignatureInformation>* GetSignatureHelpResponse::mutable_signatures()
-    ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  // @@protoc_insertion_point(field_mutable_list:io.deephaven.proto.backplane.script.grpc.GetSignatureHelpResponse.signatures)
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  return _internal_mutable_signatures();
-}
-inline const ::io::deephaven::proto::backplane::script::grpc::SignatureInformation& GetSignatureHelpResponse::signatures(int index) const
-    ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  // @@protoc_insertion_point(field_get:io.deephaven.proto.backplane.script.grpc.GetSignatureHelpResponse.signatures)
-  return _internal_signatures().Get(index);
-}
-inline ::io::deephaven::proto::backplane::script::grpc::SignatureInformation* GetSignatureHelpResponse::add_signatures() ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  ::io::deephaven::proto::backplane::script::grpc::SignatureInformation* _add = _internal_mutable_signatures()->Add();
-  // @@protoc_insertion_point(field_add:io.deephaven.proto.backplane.script.grpc.GetSignatureHelpResponse.signatures)
-  return _add;
-}
-inline const ::google::protobuf::RepeatedPtrField<::io::deephaven::proto::backplane::script::grpc::SignatureInformation>& GetSignatureHelpResponse::signatures() const
-    ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  // @@protoc_insertion_point(field_list:io.deephaven.proto.backplane.script.grpc.GetSignatureHelpResponse.signatures)
-  return _internal_signatures();
-}
-inline const ::google::protobuf::RepeatedPtrField<::io::deephaven::proto::backplane::script::grpc::SignatureInformation>&
-GetSignatureHelpResponse::_internal_signatures() const {
-  PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race);
-  return _impl_.signatures_;
-}
-inline ::google::protobuf::RepeatedPtrField<::io::deephaven::proto::backplane::script::grpc::SignatureInformation>*
-GetSignatureHelpResponse::_internal_mutable_signatures() {
-  PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race);
-  return &_impl_.signatures_;
-}
-
-// optional int32 active_signature = 2;
-inline bool GetSignatureHelpResponse::has_active_signature() const {
-  bool value = (_impl_._has_bits_[0] & 0x00000001u) != 0;
-  return value;
-}
-inline void GetSignatureHelpResponse::clear_active_signature() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  _impl_.active_signature_ = 0;
-  _impl_._has_bits_[0] &= ~0x00000001u;
-}
-inline ::int32_t GetSignatureHelpResponse::active_signature() const {
-  // @@protoc_insertion_point(field_get:io.deephaven.proto.backplane.script.grpc.GetSignatureHelpResponse.active_signature)
-  return _internal_active_signature();
-}
-inline void GetSignatureHelpResponse::set_active_signature(::int32_t value) {
-  _internal_set_active_signature(value);
-  // @@protoc_insertion_point(field_set:io.deephaven.proto.backplane.script.grpc.GetSignatureHelpResponse.active_signature)
-}
-inline ::int32_t GetSignatureHelpResponse::_internal_active_signature() const {
-  PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race);
-  return _impl_.active_signature_;
-}
-inline void GetSignatureHelpResponse::_internal_set_active_signature(::int32_t value) {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  _impl_._has_bits_[0] |= 0x00000001u;
-  _impl_.active_signature_ = value;
-}
-
-// optional int32 active_parameter = 3;
-inline bool GetSignatureHelpResponse::has_active_parameter() const {
-  bool value = (_impl_._has_bits_[0] & 0x00000002u) != 0;
-  return value;
-}
-inline void GetSignatureHelpResponse::clear_active_parameter() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  _impl_.active_parameter_ = 0;
-  _impl_._has_bits_[0] &= ~0x00000002u;
-}
-inline ::int32_t GetSignatureHelpResponse::active_parameter() const {
-  // @@protoc_insertion_point(field_get:io.deephaven.proto.backplane.script.grpc.GetSignatureHelpResponse.active_parameter)
-  return _internal_active_parameter();
-}
-inline void GetSignatureHelpResponse::set_active_parameter(::int32_t value) {
-  _internal_set_active_parameter(value);
-  // @@protoc_insertion_point(field_set:io.deephaven.proto.backplane.script.grpc.GetSignatureHelpResponse.active_parameter)
-}
-inline ::int32_t GetSignatureHelpResponse::_internal_active_parameter() const {
-  PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race);
-  return _impl_.active_parameter_;
-}
-inline void GetSignatureHelpResponse::_internal_set_active_parameter(::int32_t value) {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  _impl_._has_bits_[0] |= 0x00000002u;
-  _impl_.active_parameter_ = value;
-}
-
-// -------------------------------------------------------------------
-
-// SignatureInformation
-
-// string label = 1;
-inline void SignatureInformation::clear_label() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  _impl_.label_.ClearToEmpty();
-}
-inline const std::string& SignatureInformation::label() const
-    ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  // @@protoc_insertion_point(field_get:io.deephaven.proto.backplane.script.grpc.SignatureInformation.label)
-  return _internal_label();
-}
-template <typename Arg_, typename... Args_>
-inline PROTOBUF_ALWAYS_INLINE void SignatureInformation::set_label(Arg_&& arg,
-                                                     Args_... args) {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  ;
-  _impl_.label_.Set(static_cast<Arg_&&>(arg), args..., GetArena());
-  // @@protoc_insertion_point(field_set:io.deephaven.proto.backplane.script.grpc.SignatureInformation.label)
-}
-inline std::string* SignatureInformation::mutable_label() ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  std::string* _s = _internal_mutable_label();
-  // @@protoc_insertion_point(field_mutable:io.deephaven.proto.backplane.script.grpc.SignatureInformation.label)
-  return _s;
-}
-inline const std::string& SignatureInformation::_internal_label() const {
-  PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race);
-  return _impl_.label_.Get();
-}
-inline void SignatureInformation::_internal_set_label(const std::string& value) {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  ;
-  _impl_.label_.Set(value, GetArena());
-}
-inline std::string* SignatureInformation::_internal_mutable_label() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  ;
-  return _impl_.label_.Mutable( GetArena());
-}
-inline std::string* SignatureInformation::release_label() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  // @@protoc_insertion_point(field_release:io.deephaven.proto.backplane.script.grpc.SignatureInformation.label)
-  return _impl_.label_.Release();
-}
-inline void SignatureInformation::set_allocated_label(std::string* value) {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  _impl_.label_.SetAllocated(value, GetArena());
-  #ifdef PROTOBUF_FORCE_COPY_DEFAULT_STRING
-        if (_impl_.label_.IsDefault()) {
-          _impl_.label_.Set("", GetArena());
-        }
-  #endif  // PROTOBUF_FORCE_COPY_DEFAULT_STRING
-  // @@protoc_insertion_point(field_set_allocated:io.deephaven.proto.backplane.script.grpc.SignatureInformation.label)
-}
-
-// .io.deephaven.proto.backplane.script.grpc.MarkupContent documentation = 2;
-inline bool SignatureInformation::has_documentation() const {
-  bool value = (_impl_._has_bits_[0] & 0x00000001u) != 0;
-  PROTOBUF_ASSUME(!value || _impl_.documentation_ != nullptr);
-  return value;
-}
-inline void SignatureInformation::clear_documentation() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  if (_impl_.documentation_ != nullptr) _impl_.documentation_->Clear();
-  _impl_._has_bits_[0] &= ~0x00000001u;
-}
-inline const ::io::deephaven::proto::backplane::script::grpc::MarkupContent& SignatureInformation::_internal_documentation() const {
-  PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race);
-  const ::io::deephaven::proto::backplane::script::grpc::MarkupContent* p = _impl_.documentation_;
-  return p != nullptr ? *p : reinterpret_cast<const ::io::deephaven::proto::backplane::script::grpc::MarkupContent&>(::io::deephaven::proto::backplane::script::grpc::_MarkupContent_default_instance_);
-}
-inline const ::io::deephaven::proto::backplane::script::grpc::MarkupContent& SignatureInformation::documentation() const ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  // @@protoc_insertion_point(field_get:io.deephaven.proto.backplane.script.grpc.SignatureInformation.documentation)
-  return _internal_documentation();
-}
-inline void SignatureInformation::unsafe_arena_set_allocated_documentation(::io::deephaven::proto::backplane::script::grpc::MarkupContent* value) {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  if (GetArena() == nullptr) {
-    delete reinterpret_cast<::google::protobuf::MessageLite*>(_impl_.documentation_);
-  }
-  _impl_.documentation_ = reinterpret_cast<::io::deephaven::proto::backplane::script::grpc::MarkupContent*>(value);
-  if (value != nullptr) {
-    _impl_._has_bits_[0] |= 0x00000001u;
-  } else {
-    _impl_._has_bits_[0] &= ~0x00000001u;
-  }
-  // @@protoc_insertion_point(field_unsafe_arena_set_allocated:io.deephaven.proto.backplane.script.grpc.SignatureInformation.documentation)
-}
-inline ::io::deephaven::proto::backplane::script::grpc::MarkupContent* SignatureInformation::release_documentation() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-
-  _impl_._has_bits_[0] &= ~0x00000001u;
-  ::io::deephaven::proto::backplane::script::grpc::MarkupContent* released = _impl_.documentation_;
-  _impl_.documentation_ = nullptr;
-#ifdef PROTOBUF_FORCE_COPY_IN_RELEASE
-  auto* old = reinterpret_cast<::google::protobuf::MessageLite*>(released);
-  released = ::google::protobuf::internal::DuplicateIfNonNull(released);
-  if (GetArena() == nullptr) {
-    delete old;
-  }
-#else   // PROTOBUF_FORCE_COPY_IN_RELEASE
-  if (GetArena() != nullptr) {
-    released = ::google::protobuf::internal::DuplicateIfNonNull(released);
-  }
-#endif  // !PROTOBUF_FORCE_COPY_IN_RELEASE
-  return released;
-}
-inline ::io::deephaven::proto::backplane::script::grpc::MarkupContent* SignatureInformation::unsafe_arena_release_documentation() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  // @@protoc_insertion_point(field_release:io.deephaven.proto.backplane.script.grpc.SignatureInformation.documentation)
-
-  _impl_._has_bits_[0] &= ~0x00000001u;
-  ::io::deephaven::proto::backplane::script::grpc::MarkupContent* temp = _impl_.documentation_;
-  _impl_.documentation_ = nullptr;
-  return temp;
-}
-inline ::io::deephaven::proto::backplane::script::grpc::MarkupContent* SignatureInformation::_internal_mutable_documentation() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  _impl_._has_bits_[0] |= 0x00000001u;
-  if (_impl_.documentation_ == nullptr) {
-    auto* p = CreateMaybeMessage<::io::deephaven::proto::backplane::script::grpc::MarkupContent>(GetArena());
-    _impl_.documentation_ = reinterpret_cast<::io::deephaven::proto::backplane::script::grpc::MarkupContent*>(p);
-  }
-  return _impl_.documentation_;
-}
-inline ::io::deephaven::proto::backplane::script::grpc::MarkupContent* SignatureInformation::mutable_documentation() ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  ::io::deephaven::proto::backplane::script::grpc::MarkupContent* _msg = _internal_mutable_documentation();
-  // @@protoc_insertion_point(field_mutable:io.deephaven.proto.backplane.script.grpc.SignatureInformation.documentation)
-  return _msg;
-}
-inline void SignatureInformation::set_allocated_documentation(::io::deephaven::proto::backplane::script::grpc::MarkupContent* value) {
-  ::google::protobuf::Arena* message_arena = GetArena();
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  if (message_arena == nullptr) {
-    delete reinterpret_cast<::io::deephaven::proto::backplane::script::grpc::MarkupContent*>(_impl_.documentation_);
-  }
-
-  if (value != nullptr) {
-    ::google::protobuf::Arena* submessage_arena = reinterpret_cast<::io::deephaven::proto::backplane::script::grpc::MarkupContent*>(value)->GetArena();
-    if (message_arena != submessage_arena) {
-      value = ::google::protobuf::internal::GetOwnedMessage(message_arena, value, submessage_arena);
-    }
-    _impl_._has_bits_[0] |= 0x00000001u;
-  } else {
-    _impl_._has_bits_[0] &= ~0x00000001u;
-  }
-
-  _impl_.documentation_ = reinterpret_cast<::io::deephaven::proto::backplane::script::grpc::MarkupContent*>(value);
-  // @@protoc_insertion_point(field_set_allocated:io.deephaven.proto.backplane.script.grpc.SignatureInformation.documentation)
-}
-
-// repeated .io.deephaven.proto.backplane.script.grpc.ParameterInformation parameters = 3;
-inline int SignatureInformation::_internal_parameters_size() const {
-  return _internal_parameters().size();
-}
-inline int SignatureInformation::parameters_size() const {
-  return _internal_parameters_size();
-}
-inline void SignatureInformation::clear_parameters() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  _impl_.parameters_.Clear();
-}
-inline ::io::deephaven::proto::backplane::script::grpc::ParameterInformation* SignatureInformation::mutable_parameters(int index)
-    ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  // @@protoc_insertion_point(field_mutable:io.deephaven.proto.backplane.script.grpc.SignatureInformation.parameters)
-  return _internal_mutable_parameters()->Mutable(index);
-}
-inline ::google::protobuf::RepeatedPtrField<::io::deephaven::proto::backplane::script::grpc::ParameterInformation>* SignatureInformation::mutable_parameters()
-    ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  // @@protoc_insertion_point(field_mutable_list:io.deephaven.proto.backplane.script.grpc.SignatureInformation.parameters)
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  return _internal_mutable_parameters();
-}
-inline const ::io::deephaven::proto::backplane::script::grpc::ParameterInformation& SignatureInformation::parameters(int index) const
-    ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  // @@protoc_insertion_point(field_get:io.deephaven.proto.backplane.script.grpc.SignatureInformation.parameters)
-  return _internal_parameters().Get(index);
-}
-inline ::io::deephaven::proto::backplane::script::grpc::ParameterInformation* SignatureInformation::add_parameters() ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  ::io::deephaven::proto::backplane::script::grpc::ParameterInformation* _add = _internal_mutable_parameters()->Add();
-  // @@protoc_insertion_point(field_add:io.deephaven.proto.backplane.script.grpc.SignatureInformation.parameters)
-  return _add;
-}
-inline const ::google::protobuf::RepeatedPtrField<::io::deephaven::proto::backplane::script::grpc::ParameterInformation>& SignatureInformation::parameters() const
-    ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  // @@protoc_insertion_point(field_list:io.deephaven.proto.backplane.script.grpc.SignatureInformation.parameters)
-  return _internal_parameters();
-}
-inline const ::google::protobuf::RepeatedPtrField<::io::deephaven::proto::backplane::script::grpc::ParameterInformation>&
-SignatureInformation::_internal_parameters() const {
-  PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race);
-  return _impl_.parameters_;
-}
-inline ::google::protobuf::RepeatedPtrField<::io::deephaven::proto::backplane::script::grpc::ParameterInformation>*
-SignatureInformation::_internal_mutable_parameters() {
-  PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race);
-  return &_impl_.parameters_;
-}
-
-// optional int32 active_parameter = 4;
-inline bool SignatureInformation::has_active_parameter() const {
-  bool value = (_impl_._has_bits_[0] & 0x00000002u) != 0;
-  return value;
-}
-inline void SignatureInformation::clear_active_parameter() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  _impl_.active_parameter_ = 0;
-  _impl_._has_bits_[0] &= ~0x00000002u;
-}
-inline ::int32_t SignatureInformation::active_parameter() const {
-  // @@protoc_insertion_point(field_get:io.deephaven.proto.backplane.script.grpc.SignatureInformation.active_parameter)
-  return _internal_active_parameter();
-}
-inline void SignatureInformation::set_active_parameter(::int32_t value) {
-  _internal_set_active_parameter(value);
-  // @@protoc_insertion_point(field_set:io.deephaven.proto.backplane.script.grpc.SignatureInformation.active_parameter)
-}
-inline ::int32_t SignatureInformation::_internal_active_parameter() const {
-  PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race);
-  return _impl_.active_parameter_;
-}
-inline void SignatureInformation::_internal_set_active_parameter(::int32_t value) {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  _impl_._has_bits_[0] |= 0x00000002u;
-  _impl_.active_parameter_ = value;
-}
-
-// -------------------------------------------------------------------
-
-// ParameterInformation
-
-// string label = 1;
-inline void ParameterInformation::clear_label() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  _impl_.label_.ClearToEmpty();
-}
-inline const std::string& ParameterInformation::label() const
-    ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  // @@protoc_insertion_point(field_get:io.deephaven.proto.backplane.script.grpc.ParameterInformation.label)
-  return _internal_label();
-}
-template <typename Arg_, typename... Args_>
-inline PROTOBUF_ALWAYS_INLINE void ParameterInformation::set_label(Arg_&& arg,
-                                                     Args_... args) {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  ;
-  _impl_.label_.Set(static_cast<Arg_&&>(arg), args..., GetArena());
-  // @@protoc_insertion_point(field_set:io.deephaven.proto.backplane.script.grpc.ParameterInformation.label)
-}
-inline std::string* ParameterInformation::mutable_label() ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  std::string* _s = _internal_mutable_label();
-  // @@protoc_insertion_point(field_mutable:io.deephaven.proto.backplane.script.grpc.ParameterInformation.label)
-  return _s;
-}
-inline const std::string& ParameterInformation::_internal_label() const {
-  PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race);
-  return _impl_.label_.Get();
-}
-inline void ParameterInformation::_internal_set_label(const std::string& value) {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  ;
-  _impl_.label_.Set(value, GetArena());
-}
-inline std::string* ParameterInformation::_internal_mutable_label() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  ;
-  return _impl_.label_.Mutable( GetArena());
-}
-inline std::string* ParameterInformation::release_label() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  // @@protoc_insertion_point(field_release:io.deephaven.proto.backplane.script.grpc.ParameterInformation.label)
-  return _impl_.label_.Release();
-}
-inline void ParameterInformation::set_allocated_label(std::string* value) {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  _impl_.label_.SetAllocated(value, GetArena());
-  #ifdef PROTOBUF_FORCE_COPY_DEFAULT_STRING
-        if (_impl_.label_.IsDefault()) {
-          _impl_.label_.Set("", GetArena());
-        }
-  #endif  // PROTOBUF_FORCE_COPY_DEFAULT_STRING
-  // @@protoc_insertion_point(field_set_allocated:io.deephaven.proto.backplane.script.grpc.ParameterInformation.label)
-}
-
-// .io.deephaven.proto.backplane.script.grpc.MarkupContent documentation = 2;
-inline bool ParameterInformation::has_documentation() const {
-  bool value = (_impl_._has_bits_[0] & 0x00000001u) != 0;
-  PROTOBUF_ASSUME(!value || _impl_.documentation_ != nullptr);
-  return value;
-}
-inline void ParameterInformation::clear_documentation() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  if (_impl_.documentation_ != nullptr) _impl_.documentation_->Clear();
-  _impl_._has_bits_[0] &= ~0x00000001u;
-}
-inline const ::io::deephaven::proto::backplane::script::grpc::MarkupContent& ParameterInformation::_internal_documentation() const {
-  PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race);
-  const ::io::deephaven::proto::backplane::script::grpc::MarkupContent* p = _impl_.documentation_;
-  return p != nullptr ? *p : reinterpret_cast<const ::io::deephaven::proto::backplane::script::grpc::MarkupContent&>(::io::deephaven::proto::backplane::script::grpc::_MarkupContent_default_instance_);
-}
-inline const ::io::deephaven::proto::backplane::script::grpc::MarkupContent& ParameterInformation::documentation() const ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  // @@protoc_insertion_point(field_get:io.deephaven.proto.backplane.script.grpc.ParameterInformation.documentation)
-  return _internal_documentation();
-}
-inline void ParameterInformation::unsafe_arena_set_allocated_documentation(::io::deephaven::proto::backplane::script::grpc::MarkupContent* value) {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  if (GetArena() == nullptr) {
-    delete reinterpret_cast<::google::protobuf::MessageLite*>(_impl_.documentation_);
-  }
-  _impl_.documentation_ = reinterpret_cast<::io::deephaven::proto::backplane::script::grpc::MarkupContent*>(value);
-  if (value != nullptr) {
-    _impl_._has_bits_[0] |= 0x00000001u;
-  } else {
-    _impl_._has_bits_[0] &= ~0x00000001u;
-  }
-  // @@protoc_insertion_point(field_unsafe_arena_set_allocated:io.deephaven.proto.backplane.script.grpc.ParameterInformation.documentation)
-}
-inline ::io::deephaven::proto::backplane::script::grpc::MarkupContent* ParameterInformation::release_documentation() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-
-  _impl_._has_bits_[0] &= ~0x00000001u;
-  ::io::deephaven::proto::backplane::script::grpc::MarkupContent* released = _impl_.documentation_;
-  _impl_.documentation_ = nullptr;
-#ifdef PROTOBUF_FORCE_COPY_IN_RELEASE
-  auto* old = reinterpret_cast<::google::protobuf::MessageLite*>(released);
-  released = ::google::protobuf::internal::DuplicateIfNonNull(released);
-  if (GetArena() == nullptr) {
-    delete old;
-  }
-#else   // PROTOBUF_FORCE_COPY_IN_RELEASE
-  if (GetArena() != nullptr) {
-    released = ::google::protobuf::internal::DuplicateIfNonNull(released);
-  }
-#endif  // !PROTOBUF_FORCE_COPY_IN_RELEASE
-  return released;
-}
-inline ::io::deephaven::proto::backplane::script::grpc::MarkupContent* ParameterInformation::unsafe_arena_release_documentation() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  // @@protoc_insertion_point(field_release:io.deephaven.proto.backplane.script.grpc.ParameterInformation.documentation)
-
-  _impl_._has_bits_[0] &= ~0x00000001u;
-  ::io::deephaven::proto::backplane::script::grpc::MarkupContent* temp = _impl_.documentation_;
-  _impl_.documentation_ = nullptr;
-  return temp;
-}
-inline ::io::deephaven::proto::backplane::script::grpc::MarkupContent* ParameterInformation::_internal_mutable_documentation() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  _impl_._has_bits_[0] |= 0x00000001u;
-  if (_impl_.documentation_ == nullptr) {
-    auto* p = CreateMaybeMessage<::io::deephaven::proto::backplane::script::grpc::MarkupContent>(GetArena());
-    _impl_.documentation_ = reinterpret_cast<::io::deephaven::proto::backplane::script::grpc::MarkupContent*>(p);
-  }
-  return _impl_.documentation_;
-}
-inline ::io::deephaven::proto::backplane::script::grpc::MarkupContent* ParameterInformation::mutable_documentation() ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  ::io::deephaven::proto::backplane::script::grpc::MarkupContent* _msg = _internal_mutable_documentation();
-  // @@protoc_insertion_point(field_mutable:io.deephaven.proto.backplane.script.grpc.ParameterInformation.documentation)
-  return _msg;
-}
-inline void ParameterInformation::set_allocated_documentation(::io::deephaven::proto::backplane::script::grpc::MarkupContent* value) {
-  ::google::protobuf::Arena* message_arena = GetArena();
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  if (message_arena == nullptr) {
-    delete reinterpret_cast<::io::deephaven::proto::backplane::script::grpc::MarkupContent*>(_impl_.documentation_);
-  }
-
-  if (value != nullptr) {
-    ::google::protobuf::Arena* submessage_arena = reinterpret_cast<::io::deephaven::proto::backplane::script::grpc::MarkupContent*>(value)->GetArena();
-    if (message_arena != submessage_arena) {
-      value = ::google::protobuf::internal::GetOwnedMessage(message_arena, value, submessage_arena);
-    }
-    _impl_._has_bits_[0] |= 0x00000001u;
-  } else {
-    _impl_._has_bits_[0] &= ~0x00000001u;
-  }
-
-  _impl_.documentation_ = reinterpret_cast<::io::deephaven::proto::backplane::script::grpc::MarkupContent*>(value);
-  // @@protoc_insertion_point(field_set_allocated:io.deephaven.proto.backplane.script.grpc.ParameterInformation.documentation)
-}
-
-// -------------------------------------------------------------------
-
-// GetHoverRequest
-
-// .io.deephaven.proto.backplane.script.grpc.VersionedTextDocumentIdentifier text_document = 1;
-inline bool GetHoverRequest::has_text_document() const {
-  bool value = (_impl_._has_bits_[0] & 0x00000001u) != 0;
-  PROTOBUF_ASSUME(!value || _impl_.text_document_ != nullptr);
-  return value;
-}
-inline void GetHoverRequest::clear_text_document() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  if (_impl_.text_document_ != nullptr) _impl_.text_document_->Clear();
-  _impl_._has_bits_[0] &= ~0x00000001u;
-}
-inline const ::io::deephaven::proto::backplane::script::grpc::VersionedTextDocumentIdentifier& GetHoverRequest::_internal_text_document() const {
-  PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race);
-  const ::io::deephaven::proto::backplane::script::grpc::VersionedTextDocumentIdentifier* p = _impl_.text_document_;
-  return p != nullptr ? *p : reinterpret_cast<const ::io::deephaven::proto::backplane::script::grpc::VersionedTextDocumentIdentifier&>(::io::deephaven::proto::backplane::script::grpc::_VersionedTextDocumentIdentifier_default_instance_);
-}
-inline const ::io::deephaven::proto::backplane::script::grpc::VersionedTextDocumentIdentifier& GetHoverRequest::text_document() const ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  // @@protoc_insertion_point(field_get:io.deephaven.proto.backplane.script.grpc.GetHoverRequest.text_document)
-  return _internal_text_document();
-}
-inline void GetHoverRequest::unsafe_arena_set_allocated_text_document(::io::deephaven::proto::backplane::script::grpc::VersionedTextDocumentIdentifier* value) {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  if (GetArena() == nullptr) {
-    delete reinterpret_cast<::google::protobuf::MessageLite*>(_impl_.text_document_);
-  }
-  _impl_.text_document_ = reinterpret_cast<::io::deephaven::proto::backplane::script::grpc::VersionedTextDocumentIdentifier*>(value);
-  if (value != nullptr) {
-    _impl_._has_bits_[0] |= 0x00000001u;
-  } else {
-    _impl_._has_bits_[0] &= ~0x00000001u;
-  }
-  // @@protoc_insertion_point(field_unsafe_arena_set_allocated:io.deephaven.proto.backplane.script.grpc.GetHoverRequest.text_document)
-}
-inline ::io::deephaven::proto::backplane::script::grpc::VersionedTextDocumentIdentifier* GetHoverRequest::release_text_document() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-
-  _impl_._has_bits_[0] &= ~0x00000001u;
-  ::io::deephaven::proto::backplane::script::grpc::VersionedTextDocumentIdentifier* released = _impl_.text_document_;
-  _impl_.text_document_ = nullptr;
-#ifdef PROTOBUF_FORCE_COPY_IN_RELEASE
-  auto* old = reinterpret_cast<::google::protobuf::MessageLite*>(released);
-  released = ::google::protobuf::internal::DuplicateIfNonNull(released);
-  if (GetArena() == nullptr) {
-    delete old;
-  }
-#else   // PROTOBUF_FORCE_COPY_IN_RELEASE
-  if (GetArena() != nullptr) {
-    released = ::google::protobuf::internal::DuplicateIfNonNull(released);
-  }
-#endif  // !PROTOBUF_FORCE_COPY_IN_RELEASE
-  return released;
-}
-inline ::io::deephaven::proto::backplane::script::grpc::VersionedTextDocumentIdentifier* GetHoverRequest::unsafe_arena_release_text_document() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  // @@protoc_insertion_point(field_release:io.deephaven.proto.backplane.script.grpc.GetHoverRequest.text_document)
-
-  _impl_._has_bits_[0] &= ~0x00000001u;
-  ::io::deephaven::proto::backplane::script::grpc::VersionedTextDocumentIdentifier* temp = _impl_.text_document_;
-  _impl_.text_document_ = nullptr;
-  return temp;
-}
-inline ::io::deephaven::proto::backplane::script::grpc::VersionedTextDocumentIdentifier* GetHoverRequest::_internal_mutable_text_document() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  _impl_._has_bits_[0] |= 0x00000001u;
-  if (_impl_.text_document_ == nullptr) {
-    auto* p = CreateMaybeMessage<::io::deephaven::proto::backplane::script::grpc::VersionedTextDocumentIdentifier>(GetArena());
-    _impl_.text_document_ = reinterpret_cast<::io::deephaven::proto::backplane::script::grpc::VersionedTextDocumentIdentifier*>(p);
-  }
-  return _impl_.text_document_;
-}
-inline ::io::deephaven::proto::backplane::script::grpc::VersionedTextDocumentIdentifier* GetHoverRequest::mutable_text_document() ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  ::io::deephaven::proto::backplane::script::grpc::VersionedTextDocumentIdentifier* _msg = _internal_mutable_text_document();
-  // @@protoc_insertion_point(field_mutable:io.deephaven.proto.backplane.script.grpc.GetHoverRequest.text_document)
-  return _msg;
-}
-inline void GetHoverRequest::set_allocated_text_document(::io::deephaven::proto::backplane::script::grpc::VersionedTextDocumentIdentifier* value) {
-  ::google::protobuf::Arena* message_arena = GetArena();
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  if (message_arena == nullptr) {
-    delete reinterpret_cast<::io::deephaven::proto::backplane::script::grpc::VersionedTextDocumentIdentifier*>(_impl_.text_document_);
-  }
-
-  if (value != nullptr) {
-    ::google::protobuf::Arena* submessage_arena = reinterpret_cast<::io::deephaven::proto::backplane::script::grpc::VersionedTextDocumentIdentifier*>(value)->GetArena();
-    if (message_arena != submessage_arena) {
-      value = ::google::protobuf::internal::GetOwnedMessage(message_arena, value, submessage_arena);
-    }
-    _impl_._has_bits_[0] |= 0x00000001u;
-  } else {
-    _impl_._has_bits_[0] &= ~0x00000001u;
-  }
-
-  _impl_.text_document_ = reinterpret_cast<::io::deephaven::proto::backplane::script::grpc::VersionedTextDocumentIdentifier*>(value);
-  // @@protoc_insertion_point(field_set_allocated:io.deephaven.proto.backplane.script.grpc.GetHoverRequest.text_document)
-}
-
-// .io.deephaven.proto.backplane.script.grpc.Position position = 2;
-inline bool GetHoverRequest::has_position() const {
-  bool value = (_impl_._has_bits_[0] & 0x00000002u) != 0;
-  PROTOBUF_ASSUME(!value || _impl_.position_ != nullptr);
-  return value;
-}
-inline void GetHoverRequest::clear_position() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  if (_impl_.position_ != nullptr) _impl_.position_->Clear();
-  _impl_._has_bits_[0] &= ~0x00000002u;
-}
-inline const ::io::deephaven::proto::backplane::script::grpc::Position& GetHoverRequest::_internal_position() const {
-  PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race);
-  const ::io::deephaven::proto::backplane::script::grpc::Position* p = _impl_.position_;
-  return p != nullptr ? *p : reinterpret_cast<const ::io::deephaven::proto::backplane::script::grpc::Position&>(::io::deephaven::proto::backplane::script::grpc::_Position_default_instance_);
-}
-inline const ::io::deephaven::proto::backplane::script::grpc::Position& GetHoverRequest::position() const ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  // @@protoc_insertion_point(field_get:io.deephaven.proto.backplane.script.grpc.GetHoverRequest.position)
-  return _internal_position();
-}
-inline void GetHoverRequest::unsafe_arena_set_allocated_position(::io::deephaven::proto::backplane::script::grpc::Position* value) {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  if (GetArena() == nullptr) {
-    delete reinterpret_cast<::google::protobuf::MessageLite*>(_impl_.position_);
-  }
-  _impl_.position_ = reinterpret_cast<::io::deephaven::proto::backplane::script::grpc::Position*>(value);
-  if (value != nullptr) {
-    _impl_._has_bits_[0] |= 0x00000002u;
-  } else {
-    _impl_._has_bits_[0] &= ~0x00000002u;
-  }
-  // @@protoc_insertion_point(field_unsafe_arena_set_allocated:io.deephaven.proto.backplane.script.grpc.GetHoverRequest.position)
-}
-inline ::io::deephaven::proto::backplane::script::grpc::Position* GetHoverRequest::release_position() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-
-  _impl_._has_bits_[0] &= ~0x00000002u;
-  ::io::deephaven::proto::backplane::script::grpc::Position* released = _impl_.position_;
-  _impl_.position_ = nullptr;
-#ifdef PROTOBUF_FORCE_COPY_IN_RELEASE
-  auto* old = reinterpret_cast<::google::protobuf::MessageLite*>(released);
-  released = ::google::protobuf::internal::DuplicateIfNonNull(released);
-  if (GetArena() == nullptr) {
-    delete old;
-  }
-#else   // PROTOBUF_FORCE_COPY_IN_RELEASE
-  if (GetArena() != nullptr) {
-    released = ::google::protobuf::internal::DuplicateIfNonNull(released);
-  }
-#endif  // !PROTOBUF_FORCE_COPY_IN_RELEASE
-  return released;
-}
-inline ::io::deephaven::proto::backplane::script::grpc::Position* GetHoverRequest::unsafe_arena_release_position() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  // @@protoc_insertion_point(field_release:io.deephaven.proto.backplane.script.grpc.GetHoverRequest.position)
-
-  _impl_._has_bits_[0] &= ~0x00000002u;
-  ::io::deephaven::proto::backplane::script::grpc::Position* temp = _impl_.position_;
-  _impl_.position_ = nullptr;
-  return temp;
-}
-inline ::io::deephaven::proto::backplane::script::grpc::Position* GetHoverRequest::_internal_mutable_position() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  _impl_._has_bits_[0] |= 0x00000002u;
-  if (_impl_.position_ == nullptr) {
-    auto* p = CreateMaybeMessage<::io::deephaven::proto::backplane::script::grpc::Position>(GetArena());
-    _impl_.position_ = reinterpret_cast<::io::deephaven::proto::backplane::script::grpc::Position*>(p);
-  }
-  return _impl_.position_;
-}
-inline ::io::deephaven::proto::backplane::script::grpc::Position* GetHoverRequest::mutable_position() ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  ::io::deephaven::proto::backplane::script::grpc::Position* _msg = _internal_mutable_position();
-  // @@protoc_insertion_point(field_mutable:io.deephaven.proto.backplane.script.grpc.GetHoverRequest.position)
-  return _msg;
-}
-inline void GetHoverRequest::set_allocated_position(::io::deephaven::proto::backplane::script::grpc::Position* value) {
-  ::google::protobuf::Arena* message_arena = GetArena();
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  if (message_arena == nullptr) {
-    delete reinterpret_cast<::io::deephaven::proto::backplane::script::grpc::Position*>(_impl_.position_);
-  }
-
-  if (value != nullptr) {
-    ::google::protobuf::Arena* submessage_arena = reinterpret_cast<::io::deephaven::proto::backplane::script::grpc::Position*>(value)->GetArena();
-    if (message_arena != submessage_arena) {
-      value = ::google::protobuf::internal::GetOwnedMessage(message_arena, value, submessage_arena);
-    }
-    _impl_._has_bits_[0] |= 0x00000002u;
-  } else {
-    _impl_._has_bits_[0] &= ~0x00000002u;
-  }
-
-  _impl_.position_ = reinterpret_cast<::io::deephaven::proto::backplane::script::grpc::Position*>(value);
-  // @@protoc_insertion_point(field_set_allocated:io.deephaven.proto.backplane.script.grpc.GetHoverRequest.position)
-}
-
-// -------------------------------------------------------------------
-
-// GetHoverResponse
-
-// .io.deephaven.proto.backplane.script.grpc.MarkupContent contents = 1;
-inline bool GetHoverResponse::has_contents() const {
-  bool value = (_impl_._has_bits_[0] & 0x00000001u) != 0;
-  PROTOBUF_ASSUME(!value || _impl_.contents_ != nullptr);
-  return value;
-}
-inline void GetHoverResponse::clear_contents() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  if (_impl_.contents_ != nullptr) _impl_.contents_->Clear();
-  _impl_._has_bits_[0] &= ~0x00000001u;
-}
-inline const ::io::deephaven::proto::backplane::script::grpc::MarkupContent& GetHoverResponse::_internal_contents() const {
-  PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race);
-  const ::io::deephaven::proto::backplane::script::grpc::MarkupContent* p = _impl_.contents_;
-  return p != nullptr ? *p : reinterpret_cast<const ::io::deephaven::proto::backplane::script::grpc::MarkupContent&>(::io::deephaven::proto::backplane::script::grpc::_MarkupContent_default_instance_);
-}
-inline const ::io::deephaven::proto::backplane::script::grpc::MarkupContent& GetHoverResponse::contents() const ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  // @@protoc_insertion_point(field_get:io.deephaven.proto.backplane.script.grpc.GetHoverResponse.contents)
-  return _internal_contents();
-}
-inline void GetHoverResponse::unsafe_arena_set_allocated_contents(::io::deephaven::proto::backplane::script::grpc::MarkupContent* value) {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  if (GetArena() == nullptr) {
-    delete reinterpret_cast<::google::protobuf::MessageLite*>(_impl_.contents_);
-  }
-  _impl_.contents_ = reinterpret_cast<::io::deephaven::proto::backplane::script::grpc::MarkupContent*>(value);
-  if (value != nullptr) {
-    _impl_._has_bits_[0] |= 0x00000001u;
-  } else {
-    _impl_._has_bits_[0] &= ~0x00000001u;
-  }
-  // @@protoc_insertion_point(field_unsafe_arena_set_allocated:io.deephaven.proto.backplane.script.grpc.GetHoverResponse.contents)
-}
-inline ::io::deephaven::proto::backplane::script::grpc::MarkupContent* GetHoverResponse::release_contents() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-
-  _impl_._has_bits_[0] &= ~0x00000001u;
-  ::io::deephaven::proto::backplane::script::grpc::MarkupContent* released = _impl_.contents_;
-  _impl_.contents_ = nullptr;
-#ifdef PROTOBUF_FORCE_COPY_IN_RELEASE
-  auto* old = reinterpret_cast<::google::protobuf::MessageLite*>(released);
-  released = ::google::protobuf::internal::DuplicateIfNonNull(released);
-  if (GetArena() == nullptr) {
-    delete old;
-  }
-#else   // PROTOBUF_FORCE_COPY_IN_RELEASE
-  if (GetArena() != nullptr) {
-    released = ::google::protobuf::internal::DuplicateIfNonNull(released);
-  }
-#endif  // !PROTOBUF_FORCE_COPY_IN_RELEASE
-  return released;
-}
-inline ::io::deephaven::proto::backplane::script::grpc::MarkupContent* GetHoverResponse::unsafe_arena_release_contents() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  // @@protoc_insertion_point(field_release:io.deephaven.proto.backplane.script.grpc.GetHoverResponse.contents)
-
-  _impl_._has_bits_[0] &= ~0x00000001u;
-  ::io::deephaven::proto::backplane::script::grpc::MarkupContent* temp = _impl_.contents_;
-  _impl_.contents_ = nullptr;
-  return temp;
-}
-inline ::io::deephaven::proto::backplane::script::grpc::MarkupContent* GetHoverResponse::_internal_mutable_contents() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  _impl_._has_bits_[0] |= 0x00000001u;
-  if (_impl_.contents_ == nullptr) {
-    auto* p = CreateMaybeMessage<::io::deephaven::proto::backplane::script::grpc::MarkupContent>(GetArena());
-    _impl_.contents_ = reinterpret_cast<::io::deephaven::proto::backplane::script::grpc::MarkupContent*>(p);
-  }
-  return _impl_.contents_;
-}
-inline ::io::deephaven::proto::backplane::script::grpc::MarkupContent* GetHoverResponse::mutable_contents() ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  ::io::deephaven::proto::backplane::script::grpc::MarkupContent* _msg = _internal_mutable_contents();
-  // @@protoc_insertion_point(field_mutable:io.deephaven.proto.backplane.script.grpc.GetHoverResponse.contents)
-  return _msg;
-}
-inline void GetHoverResponse::set_allocated_contents(::io::deephaven::proto::backplane::script::grpc::MarkupContent* value) {
-  ::google::protobuf::Arena* message_arena = GetArena();
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  if (message_arena == nullptr) {
-    delete reinterpret_cast<::io::deephaven::proto::backplane::script::grpc::MarkupContent*>(_impl_.contents_);
-  }
-
-  if (value != nullptr) {
-    ::google::protobuf::Arena* submessage_arena = reinterpret_cast<::io::deephaven::proto::backplane::script::grpc::MarkupContent*>(value)->GetArena();
-    if (message_arena != submessage_arena) {
-      value = ::google::protobuf::internal::GetOwnedMessage(message_arena, value, submessage_arena);
-    }
-    _impl_._has_bits_[0] |= 0x00000001u;
-  } else {
-    _impl_._has_bits_[0] &= ~0x00000001u;
-  }
-
-  _impl_.contents_ = reinterpret_cast<::io::deephaven::proto::backplane::script::grpc::MarkupContent*>(value);
-  // @@protoc_insertion_point(field_set_allocated:io.deephaven.proto.backplane.script.grpc.GetHoverResponse.contents)
-}
-
-// .io.deephaven.proto.backplane.script.grpc.DocumentRange range = 2;
-inline bool GetHoverResponse::has_range() const {
-  bool value = (_impl_._has_bits_[0] & 0x00000002u) != 0;
-  PROTOBUF_ASSUME(!value || _impl_.range_ != nullptr);
-  return value;
-}
-inline void GetHoverResponse::clear_range() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  if (_impl_.range_ != nullptr) _impl_.range_->Clear();
-  _impl_._has_bits_[0] &= ~0x00000002u;
-}
-inline const ::io::deephaven::proto::backplane::script::grpc::DocumentRange& GetHoverResponse::_internal_range() const {
-  PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race);
-  const ::io::deephaven::proto::backplane::script::grpc::DocumentRange* p = _impl_.range_;
-  return p != nullptr ? *p : reinterpret_cast<const ::io::deephaven::proto::backplane::script::grpc::DocumentRange&>(::io::deephaven::proto::backplane::script::grpc::_DocumentRange_default_instance_);
-}
-inline const ::io::deephaven::proto::backplane::script::grpc::DocumentRange& GetHoverResponse::range() const ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  // @@protoc_insertion_point(field_get:io.deephaven.proto.backplane.script.grpc.GetHoverResponse.range)
-  return _internal_range();
-}
-inline void GetHoverResponse::unsafe_arena_set_allocated_range(::io::deephaven::proto::backplane::script::grpc::DocumentRange* value) {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  if (GetArena() == nullptr) {
-    delete reinterpret_cast<::google::protobuf::MessageLite*>(_impl_.range_);
-  }
-  _impl_.range_ = reinterpret_cast<::io::deephaven::proto::backplane::script::grpc::DocumentRange*>(value);
-  if (value != nullptr) {
-    _impl_._has_bits_[0] |= 0x00000002u;
-  } else {
-    _impl_._has_bits_[0] &= ~0x00000002u;
-  }
-  // @@protoc_insertion_point(field_unsafe_arena_set_allocated:io.deephaven.proto.backplane.script.grpc.GetHoverResponse.range)
-}
-inline ::io::deephaven::proto::backplane::script::grpc::DocumentRange* GetHoverResponse::release_range() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-
-  _impl_._has_bits_[0] &= ~0x00000002u;
-  ::io::deephaven::proto::backplane::script::grpc::DocumentRange* released = _impl_.range_;
-  _impl_.range_ = nullptr;
-#ifdef PROTOBUF_FORCE_COPY_IN_RELEASE
-  auto* old = reinterpret_cast<::google::protobuf::MessageLite*>(released);
-  released = ::google::protobuf::internal::DuplicateIfNonNull(released);
-  if (GetArena() == nullptr) {
-    delete old;
-  }
-#else   // PROTOBUF_FORCE_COPY_IN_RELEASE
-  if (GetArena() != nullptr) {
-    released = ::google::protobuf::internal::DuplicateIfNonNull(released);
-  }
-#endif  // !PROTOBUF_FORCE_COPY_IN_RELEASE
-  return released;
-}
-inline ::io::deephaven::proto::backplane::script::grpc::DocumentRange* GetHoverResponse::unsafe_arena_release_range() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  // @@protoc_insertion_point(field_release:io.deephaven.proto.backplane.script.grpc.GetHoverResponse.range)
-
-  _impl_._has_bits_[0] &= ~0x00000002u;
-  ::io::deephaven::proto::backplane::script::grpc::DocumentRange* temp = _impl_.range_;
-  _impl_.range_ = nullptr;
-  return temp;
-}
-inline ::io::deephaven::proto::backplane::script::grpc::DocumentRange* GetHoverResponse::_internal_mutable_range() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  _impl_._has_bits_[0] |= 0x00000002u;
-  if (_impl_.range_ == nullptr) {
-    auto* p = CreateMaybeMessage<::io::deephaven::proto::backplane::script::grpc::DocumentRange>(GetArena());
-    _impl_.range_ = reinterpret_cast<::io::deephaven::proto::backplane::script::grpc::DocumentRange*>(p);
-  }
-  return _impl_.range_;
-}
-inline ::io::deephaven::proto::backplane::script::grpc::DocumentRange* GetHoverResponse::mutable_range() ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  ::io::deephaven::proto::backplane::script::grpc::DocumentRange* _msg = _internal_mutable_range();
-  // @@protoc_insertion_point(field_mutable:io.deephaven.proto.backplane.script.grpc.GetHoverResponse.range)
-  return _msg;
-}
-inline void GetHoverResponse::set_allocated_range(::io::deephaven::proto::backplane::script::grpc::DocumentRange* value) {
-  ::google::protobuf::Arena* message_arena = GetArena();
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  if (message_arena == nullptr) {
-    delete reinterpret_cast<::io::deephaven::proto::backplane::script::grpc::DocumentRange*>(_impl_.range_);
-  }
-
-  if (value != nullptr) {
-    ::google::protobuf::Arena* submessage_arena = reinterpret_cast<::io::deephaven::proto::backplane::script::grpc::DocumentRange*>(value)->GetArena();
-    if (message_arena != submessage_arena) {
-      value = ::google::protobuf::internal::GetOwnedMessage(message_arena, value, submessage_arena);
-    }
-    _impl_._has_bits_[0] |= 0x00000002u;
-  } else {
-    _impl_._has_bits_[0] &= ~0x00000002u;
-  }
-
-  _impl_.range_ = reinterpret_cast<::io::deephaven::proto::backplane::script::grpc::DocumentRange*>(value);
-  // @@protoc_insertion_point(field_set_allocated:io.deephaven.proto.backplane.script.grpc.GetHoverResponse.range)
-}
-
-// -------------------------------------------------------------------
-
-// GetDiagnosticRequest
-
-// .io.deephaven.proto.backplane.script.grpc.VersionedTextDocumentIdentifier text_document = 1;
-inline bool GetDiagnosticRequest::has_text_document() const {
-  bool value = (_impl_._has_bits_[0] & 0x00000004u) != 0;
-  PROTOBUF_ASSUME(!value || _impl_.text_document_ != nullptr);
-  return value;
-}
-inline void GetDiagnosticRequest::clear_text_document() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  if (_impl_.text_document_ != nullptr) _impl_.text_document_->Clear();
-  _impl_._has_bits_[0] &= ~0x00000004u;
-}
-inline const ::io::deephaven::proto::backplane::script::grpc::VersionedTextDocumentIdentifier& GetDiagnosticRequest::_internal_text_document() const {
-  PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race);
-  const ::io::deephaven::proto::backplane::script::grpc::VersionedTextDocumentIdentifier* p = _impl_.text_document_;
-  return p != nullptr ? *p : reinterpret_cast<const ::io::deephaven::proto::backplane::script::grpc::VersionedTextDocumentIdentifier&>(::io::deephaven::proto::backplane::script::grpc::_VersionedTextDocumentIdentifier_default_instance_);
-}
-inline const ::io::deephaven::proto::backplane::script::grpc::VersionedTextDocumentIdentifier& GetDiagnosticRequest::text_document() const ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  // @@protoc_insertion_point(field_get:io.deephaven.proto.backplane.script.grpc.GetDiagnosticRequest.text_document)
-  return _internal_text_document();
-}
-inline void GetDiagnosticRequest::unsafe_arena_set_allocated_text_document(::io::deephaven::proto::backplane::script::grpc::VersionedTextDocumentIdentifier* value) {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  if (GetArena() == nullptr) {
-    delete reinterpret_cast<::google::protobuf::MessageLite*>(_impl_.text_document_);
-  }
-  _impl_.text_document_ = reinterpret_cast<::io::deephaven::proto::backplane::script::grpc::VersionedTextDocumentIdentifier*>(value);
-  if (value != nullptr) {
-    _impl_._has_bits_[0] |= 0x00000004u;
-  } else {
-    _impl_._has_bits_[0] &= ~0x00000004u;
-  }
-  // @@protoc_insertion_point(field_unsafe_arena_set_allocated:io.deephaven.proto.backplane.script.grpc.GetDiagnosticRequest.text_document)
-}
-inline ::io::deephaven::proto::backplane::script::grpc::VersionedTextDocumentIdentifier* GetDiagnosticRequest::release_text_document() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-
-  _impl_._has_bits_[0] &= ~0x00000004u;
-  ::io::deephaven::proto::backplane::script::grpc::VersionedTextDocumentIdentifier* released = _impl_.text_document_;
-  _impl_.text_document_ = nullptr;
-#ifdef PROTOBUF_FORCE_COPY_IN_RELEASE
-  auto* old = reinterpret_cast<::google::protobuf::MessageLite*>(released);
-  released = ::google::protobuf::internal::DuplicateIfNonNull(released);
-  if (GetArena() == nullptr) {
-    delete old;
-  }
-#else   // PROTOBUF_FORCE_COPY_IN_RELEASE
-  if (GetArena() != nullptr) {
-    released = ::google::protobuf::internal::DuplicateIfNonNull(released);
-  }
-#endif  // !PROTOBUF_FORCE_COPY_IN_RELEASE
-  return released;
-}
-inline ::io::deephaven::proto::backplane::script::grpc::VersionedTextDocumentIdentifier* GetDiagnosticRequest::unsafe_arena_release_text_document() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  // @@protoc_insertion_point(field_release:io.deephaven.proto.backplane.script.grpc.GetDiagnosticRequest.text_document)
-
-  _impl_._has_bits_[0] &= ~0x00000004u;
-  ::io::deephaven::proto::backplane::script::grpc::VersionedTextDocumentIdentifier* temp = _impl_.text_document_;
-  _impl_.text_document_ = nullptr;
-  return temp;
-}
-inline ::io::deephaven::proto::backplane::script::grpc::VersionedTextDocumentIdentifier* GetDiagnosticRequest::_internal_mutable_text_document() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  _impl_._has_bits_[0] |= 0x00000004u;
-  if (_impl_.text_document_ == nullptr) {
-    auto* p = CreateMaybeMessage<::io::deephaven::proto::backplane::script::grpc::VersionedTextDocumentIdentifier>(GetArena());
-    _impl_.text_document_ = reinterpret_cast<::io::deephaven::proto::backplane::script::grpc::VersionedTextDocumentIdentifier*>(p);
-  }
-  return _impl_.text_document_;
-}
-inline ::io::deephaven::proto::backplane::script::grpc::VersionedTextDocumentIdentifier* GetDiagnosticRequest::mutable_text_document() ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  ::io::deephaven::proto::backplane::script::grpc::VersionedTextDocumentIdentifier* _msg = _internal_mutable_text_document();
-  // @@protoc_insertion_point(field_mutable:io.deephaven.proto.backplane.script.grpc.GetDiagnosticRequest.text_document)
-  return _msg;
-}
-inline void GetDiagnosticRequest::set_allocated_text_document(::io::deephaven::proto::backplane::script::grpc::VersionedTextDocumentIdentifier* value) {
-  ::google::protobuf::Arena* message_arena = GetArena();
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  if (message_arena == nullptr) {
-    delete reinterpret_cast<::io::deephaven::proto::backplane::script::grpc::VersionedTextDocumentIdentifier*>(_impl_.text_document_);
-  }
-
-  if (value != nullptr) {
-    ::google::protobuf::Arena* submessage_arena = reinterpret_cast<::io::deephaven::proto::backplane::script::grpc::VersionedTextDocumentIdentifier*>(value)->GetArena();
-    if (message_arena != submessage_arena) {
-      value = ::google::protobuf::internal::GetOwnedMessage(message_arena, value, submessage_arena);
-    }
-    _impl_._has_bits_[0] |= 0x00000004u;
-  } else {
-    _impl_._has_bits_[0] &= ~0x00000004u;
-  }
-
-  _impl_.text_document_ = reinterpret_cast<::io::deephaven::proto::backplane::script::grpc::VersionedTextDocumentIdentifier*>(value);
-  // @@protoc_insertion_point(field_set_allocated:io.deephaven.proto.backplane.script.grpc.GetDiagnosticRequest.text_document)
-}
-
-// optional string identifier = 2;
-inline bool GetDiagnosticRequest::has_identifier() const {
-  bool value = (_impl_._has_bits_[0] & 0x00000001u) != 0;
-  return value;
-}
-inline void GetDiagnosticRequest::clear_identifier() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  _impl_.identifier_.ClearToEmpty();
-  _impl_._has_bits_[0] &= ~0x00000001u;
-}
-inline const std::string& GetDiagnosticRequest::identifier() const
-    ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  // @@protoc_insertion_point(field_get:io.deephaven.proto.backplane.script.grpc.GetDiagnosticRequest.identifier)
-  return _internal_identifier();
-}
-template <typename Arg_, typename... Args_>
-inline PROTOBUF_ALWAYS_INLINE void GetDiagnosticRequest::set_identifier(Arg_&& arg,
-                                                     Args_... args) {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  _impl_._has_bits_[0] |= 0x00000001u;
-  _impl_.identifier_.Set(static_cast<Arg_&&>(arg), args..., GetArena());
-  // @@protoc_insertion_point(field_set:io.deephaven.proto.backplane.script.grpc.GetDiagnosticRequest.identifier)
-}
-inline std::string* GetDiagnosticRequest::mutable_identifier() ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  std::string* _s = _internal_mutable_identifier();
-  // @@protoc_insertion_point(field_mutable:io.deephaven.proto.backplane.script.grpc.GetDiagnosticRequest.identifier)
-  return _s;
-}
-inline const std::string& GetDiagnosticRequest::_internal_identifier() const {
-  PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race);
-  return _impl_.identifier_.Get();
-}
-inline void GetDiagnosticRequest::_internal_set_identifier(const std::string& value) {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  _impl_._has_bits_[0] |= 0x00000001u;
-  _impl_.identifier_.Set(value, GetArena());
-}
-inline std::string* GetDiagnosticRequest::_internal_mutable_identifier() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  _impl_._has_bits_[0] |= 0x00000001u;
-  return _impl_.identifier_.Mutable( GetArena());
-}
-inline std::string* GetDiagnosticRequest::release_identifier() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  // @@protoc_insertion_point(field_release:io.deephaven.proto.backplane.script.grpc.GetDiagnosticRequest.identifier)
-  if ((_impl_._has_bits_[0] & 0x00000001u) == 0) {
-    return nullptr;
-  }
-  _impl_._has_bits_[0] &= ~0x00000001u;
-  auto* released = _impl_.identifier_.Release();
-  #ifdef PROTOBUF_FORCE_COPY_DEFAULT_STRING
-  _impl_.identifier_.Set("", GetArena());
-  #endif  // PROTOBUF_FORCE_COPY_DEFAULT_STRING
-  return released;
-}
-inline void GetDiagnosticRequest::set_allocated_identifier(std::string* value) {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  if (value != nullptr) {
-    _impl_._has_bits_[0] |= 0x00000001u;
-  } else {
-    _impl_._has_bits_[0] &= ~0x00000001u;
-  }
-  _impl_.identifier_.SetAllocated(value, GetArena());
-  #ifdef PROTOBUF_FORCE_COPY_DEFAULT_STRING
-        if (_impl_.identifier_.IsDefault()) {
-          _impl_.identifier_.Set("", GetArena());
-        }
-  #endif  // PROTOBUF_FORCE_COPY_DEFAULT_STRING
-  // @@protoc_insertion_point(field_set_allocated:io.deephaven.proto.backplane.script.grpc.GetDiagnosticRequest.identifier)
-}
-
-// optional string previous_result_id = 3;
-inline bool GetDiagnosticRequest::has_previous_result_id() const {
-  bool value = (_impl_._has_bits_[0] & 0x00000002u) != 0;
-  return value;
-}
-inline void GetDiagnosticRequest::clear_previous_result_id() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  _impl_.previous_result_id_.ClearToEmpty();
-  _impl_._has_bits_[0] &= ~0x00000002u;
-}
-inline const std::string& GetDiagnosticRequest::previous_result_id() const
-    ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  // @@protoc_insertion_point(field_get:io.deephaven.proto.backplane.script.grpc.GetDiagnosticRequest.previous_result_id)
-  return _internal_previous_result_id();
-}
-template <typename Arg_, typename... Args_>
-inline PROTOBUF_ALWAYS_INLINE void GetDiagnosticRequest::set_previous_result_id(Arg_&& arg,
-                                                     Args_... args) {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  _impl_._has_bits_[0] |= 0x00000002u;
-  _impl_.previous_result_id_.Set(static_cast<Arg_&&>(arg), args..., GetArena());
-  // @@protoc_insertion_point(field_set:io.deephaven.proto.backplane.script.grpc.GetDiagnosticRequest.previous_result_id)
-}
-inline std::string* GetDiagnosticRequest::mutable_previous_result_id() ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  std::string* _s = _internal_mutable_previous_result_id();
-  // @@protoc_insertion_point(field_mutable:io.deephaven.proto.backplane.script.grpc.GetDiagnosticRequest.previous_result_id)
-  return _s;
-}
-inline const std::string& GetDiagnosticRequest::_internal_previous_result_id() const {
-  PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race);
-  return _impl_.previous_result_id_.Get();
-}
-inline void GetDiagnosticRequest::_internal_set_previous_result_id(const std::string& value) {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  _impl_._has_bits_[0] |= 0x00000002u;
-  _impl_.previous_result_id_.Set(value, GetArena());
-}
-inline std::string* GetDiagnosticRequest::_internal_mutable_previous_result_id() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  _impl_._has_bits_[0] |= 0x00000002u;
-  return _impl_.previous_result_id_.Mutable( GetArena());
-}
-inline std::string* GetDiagnosticRequest::release_previous_result_id() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  // @@protoc_insertion_point(field_release:io.deephaven.proto.backplane.script.grpc.GetDiagnosticRequest.previous_result_id)
-  if ((_impl_._has_bits_[0] & 0x00000002u) == 0) {
-    return nullptr;
-  }
-  _impl_._has_bits_[0] &= ~0x00000002u;
-  auto* released = _impl_.previous_result_id_.Release();
-  #ifdef PROTOBUF_FORCE_COPY_DEFAULT_STRING
-  _impl_.previous_result_id_.Set("", GetArena());
-  #endif  // PROTOBUF_FORCE_COPY_DEFAULT_STRING
-  return released;
-}
-inline void GetDiagnosticRequest::set_allocated_previous_result_id(std::string* value) {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  if (value != nullptr) {
-    _impl_._has_bits_[0] |= 0x00000002u;
-  } else {
-    _impl_._has_bits_[0] &= ~0x00000002u;
-  }
-  _impl_.previous_result_id_.SetAllocated(value, GetArena());
-  #ifdef PROTOBUF_FORCE_COPY_DEFAULT_STRING
-        if (_impl_.previous_result_id_.IsDefault()) {
-          _impl_.previous_result_id_.Set("", GetArena());
-        }
-  #endif  // PROTOBUF_FORCE_COPY_DEFAULT_STRING
-  // @@protoc_insertion_point(field_set_allocated:io.deephaven.proto.backplane.script.grpc.GetDiagnosticRequest.previous_result_id)
-}
-
-// -------------------------------------------------------------------
-
-// GetPullDiagnosticResponse
-
-// string kind = 1;
-inline void GetPullDiagnosticResponse::clear_kind() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  _impl_.kind_.ClearToEmpty();
-}
-inline const std::string& GetPullDiagnosticResponse::kind() const
-    ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  // @@protoc_insertion_point(field_get:io.deephaven.proto.backplane.script.grpc.GetPullDiagnosticResponse.kind)
-  return _internal_kind();
-}
-template <typename Arg_, typename... Args_>
-inline PROTOBUF_ALWAYS_INLINE void GetPullDiagnosticResponse::set_kind(Arg_&& arg,
-                                                     Args_... args) {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  ;
-  _impl_.kind_.Set(static_cast<Arg_&&>(arg), args..., GetArena());
-  // @@protoc_insertion_point(field_set:io.deephaven.proto.backplane.script.grpc.GetPullDiagnosticResponse.kind)
-}
-inline std::string* GetPullDiagnosticResponse::mutable_kind() ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  std::string* _s = _internal_mutable_kind();
-  // @@protoc_insertion_point(field_mutable:io.deephaven.proto.backplane.script.grpc.GetPullDiagnosticResponse.kind)
-  return _s;
-}
-inline const std::string& GetPullDiagnosticResponse::_internal_kind() const {
-  PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race);
-  return _impl_.kind_.Get();
-}
-inline void GetPullDiagnosticResponse::_internal_set_kind(const std::string& value) {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  ;
-  _impl_.kind_.Set(value, GetArena());
-}
-inline std::string* GetPullDiagnosticResponse::_internal_mutable_kind() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  ;
-  return _impl_.kind_.Mutable( GetArena());
-}
-inline std::string* GetPullDiagnosticResponse::release_kind() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  // @@protoc_insertion_point(field_release:io.deephaven.proto.backplane.script.grpc.GetPullDiagnosticResponse.kind)
-  return _impl_.kind_.Release();
-}
-inline void GetPullDiagnosticResponse::set_allocated_kind(std::string* value) {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  _impl_.kind_.SetAllocated(value, GetArena());
-  #ifdef PROTOBUF_FORCE_COPY_DEFAULT_STRING
-        if (_impl_.kind_.IsDefault()) {
-          _impl_.kind_.Set("", GetArena());
-        }
-  #endif  // PROTOBUF_FORCE_COPY_DEFAULT_STRING
-  // @@protoc_insertion_point(field_set_allocated:io.deephaven.proto.backplane.script.grpc.GetPullDiagnosticResponse.kind)
-}
-
-// optional string result_id = 2;
-inline bool GetPullDiagnosticResponse::has_result_id() const {
-  bool value = (_impl_._has_bits_[0] & 0x00000001u) != 0;
-  return value;
-}
-inline void GetPullDiagnosticResponse::clear_result_id() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  _impl_.result_id_.ClearToEmpty();
-  _impl_._has_bits_[0] &= ~0x00000001u;
-}
-inline const std::string& GetPullDiagnosticResponse::result_id() const
-    ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  // @@protoc_insertion_point(field_get:io.deephaven.proto.backplane.script.grpc.GetPullDiagnosticResponse.result_id)
-  return _internal_result_id();
-}
-template <typename Arg_, typename... Args_>
-inline PROTOBUF_ALWAYS_INLINE void GetPullDiagnosticResponse::set_result_id(Arg_&& arg,
-                                                     Args_... args) {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  _impl_._has_bits_[0] |= 0x00000001u;
-  _impl_.result_id_.Set(static_cast<Arg_&&>(arg), args..., GetArena());
-  // @@protoc_insertion_point(field_set:io.deephaven.proto.backplane.script.grpc.GetPullDiagnosticResponse.result_id)
-}
-inline std::string* GetPullDiagnosticResponse::mutable_result_id() ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  std::string* _s = _internal_mutable_result_id();
-  // @@protoc_insertion_point(field_mutable:io.deephaven.proto.backplane.script.grpc.GetPullDiagnosticResponse.result_id)
-  return _s;
-}
-inline const std::string& GetPullDiagnosticResponse::_internal_result_id() const {
-  PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race);
-  return _impl_.result_id_.Get();
-}
-inline void GetPullDiagnosticResponse::_internal_set_result_id(const std::string& value) {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  _impl_._has_bits_[0] |= 0x00000001u;
-  _impl_.result_id_.Set(value, GetArena());
-}
-inline std::string* GetPullDiagnosticResponse::_internal_mutable_result_id() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  _impl_._has_bits_[0] |= 0x00000001u;
-  return _impl_.result_id_.Mutable( GetArena());
-}
-inline std::string* GetPullDiagnosticResponse::release_result_id() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  // @@protoc_insertion_point(field_release:io.deephaven.proto.backplane.script.grpc.GetPullDiagnosticResponse.result_id)
-  if ((_impl_._has_bits_[0] & 0x00000001u) == 0) {
-    return nullptr;
-  }
-  _impl_._has_bits_[0] &= ~0x00000001u;
-  auto* released = _impl_.result_id_.Release();
-  #ifdef PROTOBUF_FORCE_COPY_DEFAULT_STRING
-  _impl_.result_id_.Set("", GetArena());
-  #endif  // PROTOBUF_FORCE_COPY_DEFAULT_STRING
-  return released;
-}
-inline void GetPullDiagnosticResponse::set_allocated_result_id(std::string* value) {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  if (value != nullptr) {
-    _impl_._has_bits_[0] |= 0x00000001u;
-  } else {
-    _impl_._has_bits_[0] &= ~0x00000001u;
-  }
-  _impl_.result_id_.SetAllocated(value, GetArena());
-  #ifdef PROTOBUF_FORCE_COPY_DEFAULT_STRING
-        if (_impl_.result_id_.IsDefault()) {
-          _impl_.result_id_.Set("", GetArena());
-        }
-  #endif  // PROTOBUF_FORCE_COPY_DEFAULT_STRING
-  // @@protoc_insertion_point(field_set_allocated:io.deephaven.proto.backplane.script.grpc.GetPullDiagnosticResponse.result_id)
-}
-
-// repeated .io.deephaven.proto.backplane.script.grpc.Diagnostic items = 3;
-inline int GetPullDiagnosticResponse::_internal_items_size() const {
-  return _internal_items().size();
-}
-inline int GetPullDiagnosticResponse::items_size() const {
-  return _internal_items_size();
-}
-inline void GetPullDiagnosticResponse::clear_items() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  _impl_.items_.Clear();
-}
-inline ::io::deephaven::proto::backplane::script::grpc::Diagnostic* GetPullDiagnosticResponse::mutable_items(int index)
-    ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  // @@protoc_insertion_point(field_mutable:io.deephaven.proto.backplane.script.grpc.GetPullDiagnosticResponse.items)
-  return _internal_mutable_items()->Mutable(index);
-}
-inline ::google::protobuf::RepeatedPtrField<::io::deephaven::proto::backplane::script::grpc::Diagnostic>* GetPullDiagnosticResponse::mutable_items()
-    ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  // @@protoc_insertion_point(field_mutable_list:io.deephaven.proto.backplane.script.grpc.GetPullDiagnosticResponse.items)
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  return _internal_mutable_items();
-}
-inline const ::io::deephaven::proto::backplane::script::grpc::Diagnostic& GetPullDiagnosticResponse::items(int index) const
-    ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  // @@protoc_insertion_point(field_get:io.deephaven.proto.backplane.script.grpc.GetPullDiagnosticResponse.items)
-  return _internal_items().Get(index);
-}
-inline ::io::deephaven::proto::backplane::script::grpc::Diagnostic* GetPullDiagnosticResponse::add_items() ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  ::io::deephaven::proto::backplane::script::grpc::Diagnostic* _add = _internal_mutable_items()->Add();
-  // @@protoc_insertion_point(field_add:io.deephaven.proto.backplane.script.grpc.GetPullDiagnosticResponse.items)
-  return _add;
-}
-inline const ::google::protobuf::RepeatedPtrField<::io::deephaven::proto::backplane::script::grpc::Diagnostic>& GetPullDiagnosticResponse::items() const
-    ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  // @@protoc_insertion_point(field_list:io.deephaven.proto.backplane.script.grpc.GetPullDiagnosticResponse.items)
-  return _internal_items();
-}
-inline const ::google::protobuf::RepeatedPtrField<::io::deephaven::proto::backplane::script::grpc::Diagnostic>&
-GetPullDiagnosticResponse::_internal_items() const {
-  PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race);
-  return _impl_.items_;
-}
-inline ::google::protobuf::RepeatedPtrField<::io::deephaven::proto::backplane::script::grpc::Diagnostic>*
-GetPullDiagnosticResponse::_internal_mutable_items() {
-  PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race);
-  return &_impl_.items_;
-}
-
-// -------------------------------------------------------------------
-
-// GetPublishDiagnosticResponse
-
-// string uri = 1;
-inline void GetPublishDiagnosticResponse::clear_uri() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  _impl_.uri_.ClearToEmpty();
-}
-inline const std::string& GetPublishDiagnosticResponse::uri() const
-    ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  // @@protoc_insertion_point(field_get:io.deephaven.proto.backplane.script.grpc.GetPublishDiagnosticResponse.uri)
-  return _internal_uri();
-}
-template <typename Arg_, typename... Args_>
-inline PROTOBUF_ALWAYS_INLINE void GetPublishDiagnosticResponse::set_uri(Arg_&& arg,
-                                                     Args_... args) {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  ;
-  _impl_.uri_.Set(static_cast<Arg_&&>(arg), args..., GetArena());
-  // @@protoc_insertion_point(field_set:io.deephaven.proto.backplane.script.grpc.GetPublishDiagnosticResponse.uri)
-}
-inline std::string* GetPublishDiagnosticResponse::mutable_uri() ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  std::string* _s = _internal_mutable_uri();
-  // @@protoc_insertion_point(field_mutable:io.deephaven.proto.backplane.script.grpc.GetPublishDiagnosticResponse.uri)
-  return _s;
-}
-inline const std::string& GetPublishDiagnosticResponse::_internal_uri() const {
-  PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race);
-  return _impl_.uri_.Get();
-}
-inline void GetPublishDiagnosticResponse::_internal_set_uri(const std::string& value) {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  ;
-  _impl_.uri_.Set(value, GetArena());
-}
-inline std::string* GetPublishDiagnosticResponse::_internal_mutable_uri() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  ;
-  return _impl_.uri_.Mutable( GetArena());
-}
-inline std::string* GetPublishDiagnosticResponse::release_uri() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  // @@protoc_insertion_point(field_release:io.deephaven.proto.backplane.script.grpc.GetPublishDiagnosticResponse.uri)
-  return _impl_.uri_.Release();
-}
-inline void GetPublishDiagnosticResponse::set_allocated_uri(std::string* value) {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  _impl_.uri_.SetAllocated(value, GetArena());
-  #ifdef PROTOBUF_FORCE_COPY_DEFAULT_STRING
-        if (_impl_.uri_.IsDefault()) {
-          _impl_.uri_.Set("", GetArena());
-        }
-  #endif  // PROTOBUF_FORCE_COPY_DEFAULT_STRING
-  // @@protoc_insertion_point(field_set_allocated:io.deephaven.proto.backplane.script.grpc.GetPublishDiagnosticResponse.uri)
-}
-
-// optional int32 version = 2;
-inline bool GetPublishDiagnosticResponse::has_version() const {
-  bool value = (_impl_._has_bits_[0] & 0x00000001u) != 0;
-  return value;
-}
-inline void GetPublishDiagnosticResponse::clear_version() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  _impl_.version_ = 0;
-  _impl_._has_bits_[0] &= ~0x00000001u;
-}
-inline ::int32_t GetPublishDiagnosticResponse::version() const {
-  // @@protoc_insertion_point(field_get:io.deephaven.proto.backplane.script.grpc.GetPublishDiagnosticResponse.version)
-  return _internal_version();
-}
-inline void GetPublishDiagnosticResponse::set_version(::int32_t value) {
-  _internal_set_version(value);
-  // @@protoc_insertion_point(field_set:io.deephaven.proto.backplane.script.grpc.GetPublishDiagnosticResponse.version)
-}
-inline ::int32_t GetPublishDiagnosticResponse::_internal_version() const {
-  PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race);
-  return _impl_.version_;
-}
-inline void GetPublishDiagnosticResponse::_internal_set_version(::int32_t value) {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  _impl_._has_bits_[0] |= 0x00000001u;
-  _impl_.version_ = value;
-}
-
-// repeated .io.deephaven.proto.backplane.script.grpc.Diagnostic diagnostics = 3;
-inline int GetPublishDiagnosticResponse::_internal_diagnostics_size() const {
-  return _internal_diagnostics().size();
-}
-inline int GetPublishDiagnosticResponse::diagnostics_size() const {
-  return _internal_diagnostics_size();
-}
-inline void GetPublishDiagnosticResponse::clear_diagnostics() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  _impl_.diagnostics_.Clear();
-}
-inline ::io::deephaven::proto::backplane::script::grpc::Diagnostic* GetPublishDiagnosticResponse::mutable_diagnostics(int index)
-    ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  // @@protoc_insertion_point(field_mutable:io.deephaven.proto.backplane.script.grpc.GetPublishDiagnosticResponse.diagnostics)
-  return _internal_mutable_diagnostics()->Mutable(index);
-}
-inline ::google::protobuf::RepeatedPtrField<::io::deephaven::proto::backplane::script::grpc::Diagnostic>* GetPublishDiagnosticResponse::mutable_diagnostics()
-    ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  // @@protoc_insertion_point(field_mutable_list:io.deephaven.proto.backplane.script.grpc.GetPublishDiagnosticResponse.diagnostics)
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  return _internal_mutable_diagnostics();
-}
-inline const ::io::deephaven::proto::backplane::script::grpc::Diagnostic& GetPublishDiagnosticResponse::diagnostics(int index) const
-    ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  // @@protoc_insertion_point(field_get:io.deephaven.proto.backplane.script.grpc.GetPublishDiagnosticResponse.diagnostics)
-  return _internal_diagnostics().Get(index);
-}
-inline ::io::deephaven::proto::backplane::script::grpc::Diagnostic* GetPublishDiagnosticResponse::add_diagnostics() ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  ::io::deephaven::proto::backplane::script::grpc::Diagnostic* _add = _internal_mutable_diagnostics()->Add();
-  // @@protoc_insertion_point(field_add:io.deephaven.proto.backplane.script.grpc.GetPublishDiagnosticResponse.diagnostics)
-  return _add;
-}
-inline const ::google::protobuf::RepeatedPtrField<::io::deephaven::proto::backplane::script::grpc::Diagnostic>& GetPublishDiagnosticResponse::diagnostics() const
-    ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  // @@protoc_insertion_point(field_list:io.deephaven.proto.backplane.script.grpc.GetPublishDiagnosticResponse.diagnostics)
-  return _internal_diagnostics();
-}
-inline const ::google::protobuf::RepeatedPtrField<::io::deephaven::proto::backplane::script::grpc::Diagnostic>&
-GetPublishDiagnosticResponse::_internal_diagnostics() const {
-  PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race);
-  return _impl_.diagnostics_;
-}
-inline ::google::protobuf::RepeatedPtrField<::io::deephaven::proto::backplane::script::grpc::Diagnostic>*
-GetPublishDiagnosticResponse::_internal_mutable_diagnostics() {
-  PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race);
-  return &_impl_.diagnostics_;
-}
-
-// -------------------------------------------------------------------
-
-// Diagnostic_CodeDescription
-
-// string href = 1;
-inline void Diagnostic_CodeDescription::clear_href() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  _impl_.href_.ClearToEmpty();
-}
-inline const std::string& Diagnostic_CodeDescription::href() const
-    ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  // @@protoc_insertion_point(field_get:io.deephaven.proto.backplane.script.grpc.Diagnostic.CodeDescription.href)
-  return _internal_href();
-}
-template <typename Arg_, typename... Args_>
-inline PROTOBUF_ALWAYS_INLINE void Diagnostic_CodeDescription::set_href(Arg_&& arg,
-                                                     Args_... args) {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  ;
-  _impl_.href_.Set(static_cast<Arg_&&>(arg), args..., GetArena());
-  // @@protoc_insertion_point(field_set:io.deephaven.proto.backplane.script.grpc.Diagnostic.CodeDescription.href)
-}
-inline std::string* Diagnostic_CodeDescription::mutable_href() ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  std::string* _s = _internal_mutable_href();
-  // @@protoc_insertion_point(field_mutable:io.deephaven.proto.backplane.script.grpc.Diagnostic.CodeDescription.href)
-  return _s;
-}
-inline const std::string& Diagnostic_CodeDescription::_internal_href() const {
-  PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race);
-  return _impl_.href_.Get();
-}
-inline void Diagnostic_CodeDescription::_internal_set_href(const std::string& value) {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  ;
-  _impl_.href_.Set(value, GetArena());
-}
-inline std::string* Diagnostic_CodeDescription::_internal_mutable_href() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  ;
-  return _impl_.href_.Mutable( GetArena());
-}
-inline std::string* Diagnostic_CodeDescription::release_href() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  // @@protoc_insertion_point(field_release:io.deephaven.proto.backplane.script.grpc.Diagnostic.CodeDescription.href)
-  return _impl_.href_.Release();
-}
-inline void Diagnostic_CodeDescription::set_allocated_href(std::string* value) {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  _impl_.href_.SetAllocated(value, GetArena());
-  #ifdef PROTOBUF_FORCE_COPY_DEFAULT_STRING
-        if (_impl_.href_.IsDefault()) {
-          _impl_.href_.Set("", GetArena());
-        }
-  #endif  // PROTOBUF_FORCE_COPY_DEFAULT_STRING
-  // @@protoc_insertion_point(field_set_allocated:io.deephaven.proto.backplane.script.grpc.Diagnostic.CodeDescription.href)
-}
-
-// -------------------------------------------------------------------
-
-// Diagnostic
-
-// .io.deephaven.proto.backplane.script.grpc.DocumentRange range = 1;
-inline bool Diagnostic::has_range() const {
-  bool value = (_impl_._has_bits_[0] & 0x00000008u) != 0;
-  PROTOBUF_ASSUME(!value || _impl_.range_ != nullptr);
-  return value;
-}
-inline void Diagnostic::clear_range() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  if (_impl_.range_ != nullptr) _impl_.range_->Clear();
-  _impl_._has_bits_[0] &= ~0x00000008u;
-}
-inline const ::io::deephaven::proto::backplane::script::grpc::DocumentRange& Diagnostic::_internal_range() const {
-  PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race);
-  const ::io::deephaven::proto::backplane::script::grpc::DocumentRange* p = _impl_.range_;
-  return p != nullptr ? *p : reinterpret_cast<const ::io::deephaven::proto::backplane::script::grpc::DocumentRange&>(::io::deephaven::proto::backplane::script::grpc::_DocumentRange_default_instance_);
-}
-inline const ::io::deephaven::proto::backplane::script::grpc::DocumentRange& Diagnostic::range() const ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  // @@protoc_insertion_point(field_get:io.deephaven.proto.backplane.script.grpc.Diagnostic.range)
-  return _internal_range();
-}
-inline void Diagnostic::unsafe_arena_set_allocated_range(::io::deephaven::proto::backplane::script::grpc::DocumentRange* value) {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  if (GetArena() == nullptr) {
-    delete reinterpret_cast<::google::protobuf::MessageLite*>(_impl_.range_);
-  }
-  _impl_.range_ = reinterpret_cast<::io::deephaven::proto::backplane::script::grpc::DocumentRange*>(value);
-  if (value != nullptr) {
-    _impl_._has_bits_[0] |= 0x00000008u;
-  } else {
-    _impl_._has_bits_[0] &= ~0x00000008u;
-  }
-  // @@protoc_insertion_point(field_unsafe_arena_set_allocated:io.deephaven.proto.backplane.script.grpc.Diagnostic.range)
-}
-inline ::io::deephaven::proto::backplane::script::grpc::DocumentRange* Diagnostic::release_range() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-
-  _impl_._has_bits_[0] &= ~0x00000008u;
-  ::io::deephaven::proto::backplane::script::grpc::DocumentRange* released = _impl_.range_;
-  _impl_.range_ = nullptr;
-#ifdef PROTOBUF_FORCE_COPY_IN_RELEASE
-  auto* old = reinterpret_cast<::google::protobuf::MessageLite*>(released);
-  released = ::google::protobuf::internal::DuplicateIfNonNull(released);
-  if (GetArena() == nullptr) {
-    delete old;
-  }
-#else   // PROTOBUF_FORCE_COPY_IN_RELEASE
-  if (GetArena() != nullptr) {
-    released = ::google::protobuf::internal::DuplicateIfNonNull(released);
-  }
-#endif  // !PROTOBUF_FORCE_COPY_IN_RELEASE
-  return released;
-}
-inline ::io::deephaven::proto::backplane::script::grpc::DocumentRange* Diagnostic::unsafe_arena_release_range() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  // @@protoc_insertion_point(field_release:io.deephaven.proto.backplane.script.grpc.Diagnostic.range)
-
-  _impl_._has_bits_[0] &= ~0x00000008u;
-  ::io::deephaven::proto::backplane::script::grpc::DocumentRange* temp = _impl_.range_;
-  _impl_.range_ = nullptr;
-  return temp;
-}
-inline ::io::deephaven::proto::backplane::script::grpc::DocumentRange* Diagnostic::_internal_mutable_range() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  _impl_._has_bits_[0] |= 0x00000008u;
-  if (_impl_.range_ == nullptr) {
-    auto* p = CreateMaybeMessage<::io::deephaven::proto::backplane::script::grpc::DocumentRange>(GetArena());
-    _impl_.range_ = reinterpret_cast<::io::deephaven::proto::backplane::script::grpc::DocumentRange*>(p);
-  }
-  return _impl_.range_;
-}
-inline ::io::deephaven::proto::backplane::script::grpc::DocumentRange* Diagnostic::mutable_range() ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  ::io::deephaven::proto::backplane::script::grpc::DocumentRange* _msg = _internal_mutable_range();
-  // @@protoc_insertion_point(field_mutable:io.deephaven.proto.backplane.script.grpc.Diagnostic.range)
-  return _msg;
-}
-inline void Diagnostic::set_allocated_range(::io::deephaven::proto::backplane::script::grpc::DocumentRange* value) {
-  ::google::protobuf::Arena* message_arena = GetArena();
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  if (message_arena == nullptr) {
-    delete reinterpret_cast<::io::deephaven::proto::backplane::script::grpc::DocumentRange*>(_impl_.range_);
-  }
-
-  if (value != nullptr) {
-    ::google::protobuf::Arena* submessage_arena = reinterpret_cast<::io::deephaven::proto::backplane::script::grpc::DocumentRange*>(value)->GetArena();
-    if (message_arena != submessage_arena) {
-      value = ::google::protobuf::internal::GetOwnedMessage(message_arena, value, submessage_arena);
-    }
-    _impl_._has_bits_[0] |= 0x00000008u;
-  } else {
-    _impl_._has_bits_[0] &= ~0x00000008u;
-  }
-
-  _impl_.range_ = reinterpret_cast<::io::deephaven::proto::backplane::script::grpc::DocumentRange*>(value);
-  // @@protoc_insertion_point(field_set_allocated:io.deephaven.proto.backplane.script.grpc.Diagnostic.range)
-}
-
-// .io.deephaven.proto.backplane.script.grpc.Diagnostic.DiagnosticSeverity severity = 2;
-inline void Diagnostic::clear_severity() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  _impl_.severity_ = 0;
-}
-inline ::io::deephaven::proto::backplane::script::grpc::Diagnostic_DiagnosticSeverity Diagnostic::severity() const {
-  // @@protoc_insertion_point(field_get:io.deephaven.proto.backplane.script.grpc.Diagnostic.severity)
-  return _internal_severity();
-}
-inline void Diagnostic::set_severity(::io::deephaven::proto::backplane::script::grpc::Diagnostic_DiagnosticSeverity value) {
-  _internal_set_severity(value);
-  // @@protoc_insertion_point(field_set:io.deephaven.proto.backplane.script.grpc.Diagnostic.severity)
-}
-inline ::io::deephaven::proto::backplane::script::grpc::Diagnostic_DiagnosticSeverity Diagnostic::_internal_severity() const {
-  PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race);
-  return static_cast<::io::deephaven::proto::backplane::script::grpc::Diagnostic_DiagnosticSeverity>(_impl_.severity_);
-}
-inline void Diagnostic::_internal_set_severity(::io::deephaven::proto::backplane::script::grpc::Diagnostic_DiagnosticSeverity value) {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  ;
-  _impl_.severity_ = value;
-}
-
-// optional string code = 3;
-inline bool Diagnostic::has_code() const {
-  bool value = (_impl_._has_bits_[0] & 0x00000001u) != 0;
-  return value;
-}
-inline void Diagnostic::clear_code() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  _impl_.code_.ClearToEmpty();
-  _impl_._has_bits_[0] &= ~0x00000001u;
-}
-inline const std::string& Diagnostic::code() const
-    ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  // @@protoc_insertion_point(field_get:io.deephaven.proto.backplane.script.grpc.Diagnostic.code)
-  return _internal_code();
-}
-template <typename Arg_, typename... Args_>
-inline PROTOBUF_ALWAYS_INLINE void Diagnostic::set_code(Arg_&& arg,
-                                                     Args_... args) {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  _impl_._has_bits_[0] |= 0x00000001u;
-  _impl_.code_.Set(static_cast<Arg_&&>(arg), args..., GetArena());
-  // @@protoc_insertion_point(field_set:io.deephaven.proto.backplane.script.grpc.Diagnostic.code)
-}
-inline std::string* Diagnostic::mutable_code() ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  std::string* _s = _internal_mutable_code();
-  // @@protoc_insertion_point(field_mutable:io.deephaven.proto.backplane.script.grpc.Diagnostic.code)
-  return _s;
-}
-inline const std::string& Diagnostic::_internal_code() const {
-  PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race);
-  return _impl_.code_.Get();
-}
-inline void Diagnostic::_internal_set_code(const std::string& value) {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  _impl_._has_bits_[0] |= 0x00000001u;
-  _impl_.code_.Set(value, GetArena());
-}
-inline std::string* Diagnostic::_internal_mutable_code() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  _impl_._has_bits_[0] |= 0x00000001u;
-  return _impl_.code_.Mutable( GetArena());
-}
-inline std::string* Diagnostic::release_code() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  // @@protoc_insertion_point(field_release:io.deephaven.proto.backplane.script.grpc.Diagnostic.code)
-  if ((_impl_._has_bits_[0] & 0x00000001u) == 0) {
-    return nullptr;
-  }
-  _impl_._has_bits_[0] &= ~0x00000001u;
-  auto* released = _impl_.code_.Release();
-  #ifdef PROTOBUF_FORCE_COPY_DEFAULT_STRING
-  _impl_.code_.Set("", GetArena());
-  #endif  // PROTOBUF_FORCE_COPY_DEFAULT_STRING
-  return released;
-}
-inline void Diagnostic::set_allocated_code(std::string* value) {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  if (value != nullptr) {
-    _impl_._has_bits_[0] |= 0x00000001u;
-  } else {
-    _impl_._has_bits_[0] &= ~0x00000001u;
-  }
-  _impl_.code_.SetAllocated(value, GetArena());
-  #ifdef PROTOBUF_FORCE_COPY_DEFAULT_STRING
-        if (_impl_.code_.IsDefault()) {
-          _impl_.code_.Set("", GetArena());
-        }
-  #endif  // PROTOBUF_FORCE_COPY_DEFAULT_STRING
-  // @@protoc_insertion_point(field_set_allocated:io.deephaven.proto.backplane.script.grpc.Diagnostic.code)
-}
-
-// optional .io.deephaven.proto.backplane.script.grpc.Diagnostic.CodeDescription code_description = 4;
-inline bool Diagnostic::has_code_description() const {
-  bool value = (_impl_._has_bits_[0] & 0x00000010u) != 0;
-  PROTOBUF_ASSUME(!value || _impl_.code_description_ != nullptr);
-  return value;
-}
-inline void Diagnostic::clear_code_description() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  if (_impl_.code_description_ != nullptr) _impl_.code_description_->Clear();
-  _impl_._has_bits_[0] &= ~0x00000010u;
-}
-inline const ::io::deephaven::proto::backplane::script::grpc::Diagnostic_CodeDescription& Diagnostic::_internal_code_description() const {
-  PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race);
-  const ::io::deephaven::proto::backplane::script::grpc::Diagnostic_CodeDescription* p = _impl_.code_description_;
-  return p != nullptr ? *p : reinterpret_cast<const ::io::deephaven::proto::backplane::script::grpc::Diagnostic_CodeDescription&>(::io::deephaven::proto::backplane::script::grpc::_Diagnostic_CodeDescription_default_instance_);
-}
-inline const ::io::deephaven::proto::backplane::script::grpc::Diagnostic_CodeDescription& Diagnostic::code_description() const ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  // @@protoc_insertion_point(field_get:io.deephaven.proto.backplane.script.grpc.Diagnostic.code_description)
-  return _internal_code_description();
-}
-inline void Diagnostic::unsafe_arena_set_allocated_code_description(::io::deephaven::proto::backplane::script::grpc::Diagnostic_CodeDescription* value) {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  if (GetArena() == nullptr) {
-    delete reinterpret_cast<::google::protobuf::MessageLite*>(_impl_.code_description_);
-  }
-  _impl_.code_description_ = reinterpret_cast<::io::deephaven::proto::backplane::script::grpc::Diagnostic_CodeDescription*>(value);
-  if (value != nullptr) {
-    _impl_._has_bits_[0] |= 0x00000010u;
-  } else {
-    _impl_._has_bits_[0] &= ~0x00000010u;
-  }
-  // @@protoc_insertion_point(field_unsafe_arena_set_allocated:io.deephaven.proto.backplane.script.grpc.Diagnostic.code_description)
-}
-inline ::io::deephaven::proto::backplane::script::grpc::Diagnostic_CodeDescription* Diagnostic::release_code_description() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-
-  _impl_._has_bits_[0] &= ~0x00000010u;
-  ::io::deephaven::proto::backplane::script::grpc::Diagnostic_CodeDescription* released = _impl_.code_description_;
-  _impl_.code_description_ = nullptr;
-#ifdef PROTOBUF_FORCE_COPY_IN_RELEASE
-  auto* old = reinterpret_cast<::google::protobuf::MessageLite*>(released);
-  released = ::google::protobuf::internal::DuplicateIfNonNull(released);
-  if (GetArena() == nullptr) {
-    delete old;
-  }
-#else   // PROTOBUF_FORCE_COPY_IN_RELEASE
-  if (GetArena() != nullptr) {
-    released = ::google::protobuf::internal::DuplicateIfNonNull(released);
-  }
-#endif  // !PROTOBUF_FORCE_COPY_IN_RELEASE
-  return released;
-}
-inline ::io::deephaven::proto::backplane::script::grpc::Diagnostic_CodeDescription* Diagnostic::unsafe_arena_release_code_description() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  // @@protoc_insertion_point(field_release:io.deephaven.proto.backplane.script.grpc.Diagnostic.code_description)
-
-  _impl_._has_bits_[0] &= ~0x00000010u;
-  ::io::deephaven::proto::backplane::script::grpc::Diagnostic_CodeDescription* temp = _impl_.code_description_;
-  _impl_.code_description_ = nullptr;
-  return temp;
-}
-inline ::io::deephaven::proto::backplane::script::grpc::Diagnostic_CodeDescription* Diagnostic::_internal_mutable_code_description() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  _impl_._has_bits_[0] |= 0x00000010u;
-  if (_impl_.code_description_ == nullptr) {
-    auto* p = CreateMaybeMessage<::io::deephaven::proto::backplane::script::grpc::Diagnostic_CodeDescription>(GetArena());
-    _impl_.code_description_ = reinterpret_cast<::io::deephaven::proto::backplane::script::grpc::Diagnostic_CodeDescription*>(p);
-  }
-  return _impl_.code_description_;
-}
-inline ::io::deephaven::proto::backplane::script::grpc::Diagnostic_CodeDescription* Diagnostic::mutable_code_description() ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  ::io::deephaven::proto::backplane::script::grpc::Diagnostic_CodeDescription* _msg = _internal_mutable_code_description();
-  // @@protoc_insertion_point(field_mutable:io.deephaven.proto.backplane.script.grpc.Diagnostic.code_description)
-  return _msg;
-}
-inline void Diagnostic::set_allocated_code_description(::io::deephaven::proto::backplane::script::grpc::Diagnostic_CodeDescription* value) {
-  ::google::protobuf::Arena* message_arena = GetArena();
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  if (message_arena == nullptr) {
-    delete reinterpret_cast<::io::deephaven::proto::backplane::script::grpc::Diagnostic_CodeDescription*>(_impl_.code_description_);
-  }
-
-  if (value != nullptr) {
-    ::google::protobuf::Arena* submessage_arena = reinterpret_cast<::io::deephaven::proto::backplane::script::grpc::Diagnostic_CodeDescription*>(value)->GetArena();
-    if (message_arena != submessage_arena) {
-      value = ::google::protobuf::internal::GetOwnedMessage(message_arena, value, submessage_arena);
-    }
-    _impl_._has_bits_[0] |= 0x00000010u;
-  } else {
-    _impl_._has_bits_[0] &= ~0x00000010u;
-  }
-
-  _impl_.code_description_ = reinterpret_cast<::io::deephaven::proto::backplane::script::grpc::Diagnostic_CodeDescription*>(value);
-  // @@protoc_insertion_point(field_set_allocated:io.deephaven.proto.backplane.script.grpc.Diagnostic.code_description)
-}
-
-// optional string source = 5;
-inline bool Diagnostic::has_source() const {
-  bool value = (_impl_._has_bits_[0] & 0x00000002u) != 0;
-  return value;
-}
-inline void Diagnostic::clear_source() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  _impl_.source_.ClearToEmpty();
-  _impl_._has_bits_[0] &= ~0x00000002u;
-}
-inline const std::string& Diagnostic::source() const
-    ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  // @@protoc_insertion_point(field_get:io.deephaven.proto.backplane.script.grpc.Diagnostic.source)
-  return _internal_source();
-}
-template <typename Arg_, typename... Args_>
-inline PROTOBUF_ALWAYS_INLINE void Diagnostic::set_source(Arg_&& arg,
-                                                     Args_... args) {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  _impl_._has_bits_[0] |= 0x00000002u;
-  _impl_.source_.Set(static_cast<Arg_&&>(arg), args..., GetArena());
-  // @@protoc_insertion_point(field_set:io.deephaven.proto.backplane.script.grpc.Diagnostic.source)
-}
-inline std::string* Diagnostic::mutable_source() ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  std::string* _s = _internal_mutable_source();
-  // @@protoc_insertion_point(field_mutable:io.deephaven.proto.backplane.script.grpc.Diagnostic.source)
-  return _s;
-}
-inline const std::string& Diagnostic::_internal_source() const {
-  PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race);
-  return _impl_.source_.Get();
-}
-inline void Diagnostic::_internal_set_source(const std::string& value) {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  _impl_._has_bits_[0] |= 0x00000002u;
-  _impl_.source_.Set(value, GetArena());
-}
-inline std::string* Diagnostic::_internal_mutable_source() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  _impl_._has_bits_[0] |= 0x00000002u;
-  return _impl_.source_.Mutable( GetArena());
-}
-inline std::string* Diagnostic::release_source() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  // @@protoc_insertion_point(field_release:io.deephaven.proto.backplane.script.grpc.Diagnostic.source)
-  if ((_impl_._has_bits_[0] & 0x00000002u) == 0) {
-    return nullptr;
-  }
-  _impl_._has_bits_[0] &= ~0x00000002u;
-  auto* released = _impl_.source_.Release();
-  #ifdef PROTOBUF_FORCE_COPY_DEFAULT_STRING
-  _impl_.source_.Set("", GetArena());
-  #endif  // PROTOBUF_FORCE_COPY_DEFAULT_STRING
-  return released;
-}
-inline void Diagnostic::set_allocated_source(std::string* value) {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  if (value != nullptr) {
-    _impl_._has_bits_[0] |= 0x00000002u;
-  } else {
-    _impl_._has_bits_[0] &= ~0x00000002u;
-  }
-  _impl_.source_.SetAllocated(value, GetArena());
-  #ifdef PROTOBUF_FORCE_COPY_DEFAULT_STRING
-        if (_impl_.source_.IsDefault()) {
-          _impl_.source_.Set("", GetArena());
-        }
-  #endif  // PROTOBUF_FORCE_COPY_DEFAULT_STRING
-  // @@protoc_insertion_point(field_set_allocated:io.deephaven.proto.backplane.script.grpc.Diagnostic.source)
-}
-
-// string message = 6;
-inline void Diagnostic::clear_message() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  _impl_.message_.ClearToEmpty();
-}
-inline const std::string& Diagnostic::message() const
-    ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  // @@protoc_insertion_point(field_get:io.deephaven.proto.backplane.script.grpc.Diagnostic.message)
-  return _internal_message();
-}
-template <typename Arg_, typename... Args_>
-inline PROTOBUF_ALWAYS_INLINE void Diagnostic::set_message(Arg_&& arg,
-                                                     Args_... args) {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  ;
-  _impl_.message_.Set(static_cast<Arg_&&>(arg), args..., GetArena());
-  // @@protoc_insertion_point(field_set:io.deephaven.proto.backplane.script.grpc.Diagnostic.message)
-}
-inline std::string* Diagnostic::mutable_message() ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  std::string* _s = _internal_mutable_message();
-  // @@protoc_insertion_point(field_mutable:io.deephaven.proto.backplane.script.grpc.Diagnostic.message)
-  return _s;
-}
-inline const std::string& Diagnostic::_internal_message() const {
-  PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race);
-  return _impl_.message_.Get();
-}
-inline void Diagnostic::_internal_set_message(const std::string& value) {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  ;
-  _impl_.message_.Set(value, GetArena());
-}
-inline std::string* Diagnostic::_internal_mutable_message() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  ;
-  return _impl_.message_.Mutable( GetArena());
-}
-inline std::string* Diagnostic::release_message() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  // @@protoc_insertion_point(field_release:io.deephaven.proto.backplane.script.grpc.Diagnostic.message)
-  return _impl_.message_.Release();
-}
-inline void Diagnostic::set_allocated_message(std::string* value) {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  _impl_.message_.SetAllocated(value, GetArena());
-  #ifdef PROTOBUF_FORCE_COPY_DEFAULT_STRING
-        if (_impl_.message_.IsDefault()) {
-          _impl_.message_.Set("", GetArena());
-        }
-  #endif  // PROTOBUF_FORCE_COPY_DEFAULT_STRING
-  // @@protoc_insertion_point(field_set_allocated:io.deephaven.proto.backplane.script.grpc.Diagnostic.message)
-}
-
-// repeated .io.deephaven.proto.backplane.script.grpc.Diagnostic.DiagnosticTag tags = 7;
-inline int Diagnostic::_internal_tags_size() const {
-  return _internal_tags().size();
-}
-inline int Diagnostic::tags_size() const {
-  return _internal_tags_size();
-}
-inline void Diagnostic::clear_tags() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  _impl_.tags_.Clear();
-}
-inline ::io::deephaven::proto::backplane::script::grpc::Diagnostic_DiagnosticTag Diagnostic::tags(int index) const {
-  // @@protoc_insertion_point(field_get:io.deephaven.proto.backplane.script.grpc.Diagnostic.tags)
-  return static_cast<::io::deephaven::proto::backplane::script::grpc::Diagnostic_DiagnosticTag>(_internal_tags().Get(index));
-}
-inline void Diagnostic::set_tags(int index, ::io::deephaven::proto::backplane::script::grpc::Diagnostic_DiagnosticTag value) {
-  _internal_mutable_tags()->Set(index, value);
-  // @@protoc_insertion_point(field_set:io.deephaven.proto.backplane.script.grpc.Diagnostic.tags)
-}
-inline void Diagnostic::add_tags(::io::deephaven::proto::backplane::script::grpc::Diagnostic_DiagnosticTag value) {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  _internal_mutable_tags()->Add(value);
-  // @@protoc_insertion_point(field_add:io.deephaven.proto.backplane.script.grpc.Diagnostic.tags)
-}
-inline const ::google::protobuf::RepeatedField<int>& Diagnostic::tags() const
-    ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  // @@protoc_insertion_point(field_list:io.deephaven.proto.backplane.script.grpc.Diagnostic.tags)
-  return _internal_tags();
-}
-inline ::google::protobuf::RepeatedField<int>* Diagnostic::mutable_tags()
-    ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  // @@protoc_insertion_point(field_mutable_list:io.deephaven.proto.backplane.script.grpc.Diagnostic.tags)
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  return _internal_mutable_tags();
-}
-inline const ::google::protobuf::RepeatedField<int>& Diagnostic::_internal_tags() const {
-  PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race);
-  return _impl_.tags_;
-}
-inline ::google::protobuf::RepeatedField<int>* Diagnostic::_internal_mutable_tags() {
-  PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race);
-  return &_impl_.tags_;
-}
-
-// optional bytes data = 9;
-inline bool Diagnostic::has_data() const {
-  bool value = (_impl_._has_bits_[0] & 0x00000004u) != 0;
-  return value;
-}
-inline void Diagnostic::clear_data() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  _impl_.data_.ClearToEmpty();
-  _impl_._has_bits_[0] &= ~0x00000004u;
-}
-inline const std::string& Diagnostic::data() const
-    ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  // @@protoc_insertion_point(field_get:io.deephaven.proto.backplane.script.grpc.Diagnostic.data)
-  return _internal_data();
-}
-template <typename Arg_, typename... Args_>
-inline PROTOBUF_ALWAYS_INLINE void Diagnostic::set_data(Arg_&& arg,
-                                                     Args_... args) {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  _impl_._has_bits_[0] |= 0x00000004u;
-  _impl_.data_.SetBytes(static_cast<Arg_&&>(arg), args..., GetArena());
-  // @@protoc_insertion_point(field_set:io.deephaven.proto.backplane.script.grpc.Diagnostic.data)
-}
-inline std::string* Diagnostic::mutable_data() ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  std::string* _s = _internal_mutable_data();
-  // @@protoc_insertion_point(field_mutable:io.deephaven.proto.backplane.script.grpc.Diagnostic.data)
-  return _s;
-}
-inline const std::string& Diagnostic::_internal_data() const {
-  PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race);
-  return _impl_.data_.Get();
-}
-inline void Diagnostic::_internal_set_data(const std::string& value) {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  _impl_._has_bits_[0] |= 0x00000004u;
-  _impl_.data_.Set(value, GetArena());
-}
-inline std::string* Diagnostic::_internal_mutable_data() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  _impl_._has_bits_[0] |= 0x00000004u;
-  return _impl_.data_.Mutable( GetArena());
-}
-inline std::string* Diagnostic::release_data() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  // @@protoc_insertion_point(field_release:io.deephaven.proto.backplane.script.grpc.Diagnostic.data)
-  if ((_impl_._has_bits_[0] & 0x00000004u) == 0) {
-    return nullptr;
-  }
-  _impl_._has_bits_[0] &= ~0x00000004u;
-  auto* released = _impl_.data_.Release();
-  #ifdef PROTOBUF_FORCE_COPY_DEFAULT_STRING
-  _impl_.data_.Set("", GetArena());
-  #endif  // PROTOBUF_FORCE_COPY_DEFAULT_STRING
-  return released;
-}
-inline void Diagnostic::set_allocated_data(std::string* value) {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  if (value != nullptr) {
-    _impl_._has_bits_[0] |= 0x00000004u;
-  } else {
-    _impl_._has_bits_[0] &= ~0x00000004u;
-  }
-  _impl_.data_.SetAllocated(value, GetArena());
-  #ifdef PROTOBUF_FORCE_COPY_DEFAULT_STRING
-        if (_impl_.data_.IsDefault()) {
-          _impl_.data_.Set("", GetArena());
-        }
-  #endif  // PROTOBUF_FORCE_COPY_DEFAULT_STRING
-  // @@protoc_insertion_point(field_set_allocated:io.deephaven.proto.backplane.script.grpc.Diagnostic.data)
-}
-
-// -------------------------------------------------------------------
-
-// FigureDescriptor_ChartDescriptor
-
-// int32 colspan = 1;
-inline void FigureDescriptor_ChartDescriptor::clear_colspan() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  _impl_.colspan_ = 0;
-}
-inline ::int32_t FigureDescriptor_ChartDescriptor::colspan() const {
-  // @@protoc_insertion_point(field_get:io.deephaven.proto.backplane.script.grpc.FigureDescriptor.ChartDescriptor.colspan)
-  return _internal_colspan();
-}
-inline void FigureDescriptor_ChartDescriptor::set_colspan(::int32_t value) {
-  _internal_set_colspan(value);
-  // @@protoc_insertion_point(field_set:io.deephaven.proto.backplane.script.grpc.FigureDescriptor.ChartDescriptor.colspan)
-}
-inline ::int32_t FigureDescriptor_ChartDescriptor::_internal_colspan() const {
-  PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race);
-  return _impl_.colspan_;
-}
-inline void FigureDescriptor_ChartDescriptor::_internal_set_colspan(::int32_t value) {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  ;
-  _impl_.colspan_ = value;
-}
-
-// int32 rowspan = 2;
-inline void FigureDescriptor_ChartDescriptor::clear_rowspan() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  _impl_.rowspan_ = 0;
-}
-inline ::int32_t FigureDescriptor_ChartDescriptor::rowspan() const {
-  // @@protoc_insertion_point(field_get:io.deephaven.proto.backplane.script.grpc.FigureDescriptor.ChartDescriptor.rowspan)
-  return _internal_rowspan();
-}
-inline void FigureDescriptor_ChartDescriptor::set_rowspan(::int32_t value) {
-  _internal_set_rowspan(value);
-  // @@protoc_insertion_point(field_set:io.deephaven.proto.backplane.script.grpc.FigureDescriptor.ChartDescriptor.rowspan)
-}
-inline ::int32_t FigureDescriptor_ChartDescriptor::_internal_rowspan() const {
-  PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race);
-  return _impl_.rowspan_;
-}
-inline void FigureDescriptor_ChartDescriptor::_internal_set_rowspan(::int32_t value) {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  ;
-  _impl_.rowspan_ = value;
-}
-
-// repeated .io.deephaven.proto.backplane.script.grpc.FigureDescriptor.SeriesDescriptor series = 3;
-inline int FigureDescriptor_ChartDescriptor::_internal_series_size() const {
-  return _internal_series().size();
-}
-inline int FigureDescriptor_ChartDescriptor::series_size() const {
-  return _internal_series_size();
-}
-inline void FigureDescriptor_ChartDescriptor::clear_series() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  _impl_.series_.Clear();
-}
-inline ::io::deephaven::proto::backplane::script::grpc::FigureDescriptor_SeriesDescriptor* FigureDescriptor_ChartDescriptor::mutable_series(int index)
-    ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  // @@protoc_insertion_point(field_mutable:io.deephaven.proto.backplane.script.grpc.FigureDescriptor.ChartDescriptor.series)
-  return _internal_mutable_series()->Mutable(index);
-}
-inline ::google::protobuf::RepeatedPtrField<::io::deephaven::proto::backplane::script::grpc::FigureDescriptor_SeriesDescriptor>* FigureDescriptor_ChartDescriptor::mutable_series()
-    ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  // @@protoc_insertion_point(field_mutable_list:io.deephaven.proto.backplane.script.grpc.FigureDescriptor.ChartDescriptor.series)
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  return _internal_mutable_series();
-}
-inline const ::io::deephaven::proto::backplane::script::grpc::FigureDescriptor_SeriesDescriptor& FigureDescriptor_ChartDescriptor::series(int index) const
-    ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  // @@protoc_insertion_point(field_get:io.deephaven.proto.backplane.script.grpc.FigureDescriptor.ChartDescriptor.series)
-  return _internal_series().Get(index);
-}
-inline ::io::deephaven::proto::backplane::script::grpc::FigureDescriptor_SeriesDescriptor* FigureDescriptor_ChartDescriptor::add_series() ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  ::io::deephaven::proto::backplane::script::grpc::FigureDescriptor_SeriesDescriptor* _add = _internal_mutable_series()->Add();
-  // @@protoc_insertion_point(field_add:io.deephaven.proto.backplane.script.grpc.FigureDescriptor.ChartDescriptor.series)
-  return _add;
-}
-inline const ::google::protobuf::RepeatedPtrField<::io::deephaven::proto::backplane::script::grpc::FigureDescriptor_SeriesDescriptor>& FigureDescriptor_ChartDescriptor::series() const
-    ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  // @@protoc_insertion_point(field_list:io.deephaven.proto.backplane.script.grpc.FigureDescriptor.ChartDescriptor.series)
-  return _internal_series();
-}
-inline const ::google::protobuf::RepeatedPtrField<::io::deephaven::proto::backplane::script::grpc::FigureDescriptor_SeriesDescriptor>&
-FigureDescriptor_ChartDescriptor::_internal_series() const {
-  PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race);
-  return _impl_.series_;
-}
-inline ::google::protobuf::RepeatedPtrField<::io::deephaven::proto::backplane::script::grpc::FigureDescriptor_SeriesDescriptor>*
-FigureDescriptor_ChartDescriptor::_internal_mutable_series() {
-  PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race);
-  return &_impl_.series_;
-}
-
-// repeated .io.deephaven.proto.backplane.script.grpc.FigureDescriptor.MultiSeriesDescriptor multi_series = 4;
-inline int FigureDescriptor_ChartDescriptor::_internal_multi_series_size() const {
-  return _internal_multi_series().size();
-}
-inline int FigureDescriptor_ChartDescriptor::multi_series_size() const {
-  return _internal_multi_series_size();
-}
-inline void FigureDescriptor_ChartDescriptor::clear_multi_series() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  _impl_.multi_series_.Clear();
-}
-inline ::io::deephaven::proto::backplane::script::grpc::FigureDescriptor_MultiSeriesDescriptor* FigureDescriptor_ChartDescriptor::mutable_multi_series(int index)
-    ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  // @@protoc_insertion_point(field_mutable:io.deephaven.proto.backplane.script.grpc.FigureDescriptor.ChartDescriptor.multi_series)
-  return _internal_mutable_multi_series()->Mutable(index);
-}
-inline ::google::protobuf::RepeatedPtrField<::io::deephaven::proto::backplane::script::grpc::FigureDescriptor_MultiSeriesDescriptor>* FigureDescriptor_ChartDescriptor::mutable_multi_series()
-    ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  // @@protoc_insertion_point(field_mutable_list:io.deephaven.proto.backplane.script.grpc.FigureDescriptor.ChartDescriptor.multi_series)
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  return _internal_mutable_multi_series();
-}
-inline const ::io::deephaven::proto::backplane::script::grpc::FigureDescriptor_MultiSeriesDescriptor& FigureDescriptor_ChartDescriptor::multi_series(int index) const
-    ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  // @@protoc_insertion_point(field_get:io.deephaven.proto.backplane.script.grpc.FigureDescriptor.ChartDescriptor.multi_series)
-  return _internal_multi_series().Get(index);
-}
-inline ::io::deephaven::proto::backplane::script::grpc::FigureDescriptor_MultiSeriesDescriptor* FigureDescriptor_ChartDescriptor::add_multi_series() ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  ::io::deephaven::proto::backplane::script::grpc::FigureDescriptor_MultiSeriesDescriptor* _add = _internal_mutable_multi_series()->Add();
-  // @@protoc_insertion_point(field_add:io.deephaven.proto.backplane.script.grpc.FigureDescriptor.ChartDescriptor.multi_series)
-  return _add;
-}
-inline const ::google::protobuf::RepeatedPtrField<::io::deephaven::proto::backplane::script::grpc::FigureDescriptor_MultiSeriesDescriptor>& FigureDescriptor_ChartDescriptor::multi_series() const
-    ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  // @@protoc_insertion_point(field_list:io.deephaven.proto.backplane.script.grpc.FigureDescriptor.ChartDescriptor.multi_series)
-  return _internal_multi_series();
-}
-inline const ::google::protobuf::RepeatedPtrField<::io::deephaven::proto::backplane::script::grpc::FigureDescriptor_MultiSeriesDescriptor>&
-FigureDescriptor_ChartDescriptor::_internal_multi_series() const {
-  PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race);
-  return _impl_.multi_series_;
-}
-inline ::google::protobuf::RepeatedPtrField<::io::deephaven::proto::backplane::script::grpc::FigureDescriptor_MultiSeriesDescriptor>*
-FigureDescriptor_ChartDescriptor::_internal_mutable_multi_series() {
-  PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race);
-  return &_impl_.multi_series_;
-}
-
-// repeated .io.deephaven.proto.backplane.script.grpc.FigureDescriptor.AxisDescriptor axes = 5;
-inline int FigureDescriptor_ChartDescriptor::_internal_axes_size() const {
-  return _internal_axes().size();
-}
-inline int FigureDescriptor_ChartDescriptor::axes_size() const {
-  return _internal_axes_size();
-}
-inline void FigureDescriptor_ChartDescriptor::clear_axes() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  _impl_.axes_.Clear();
-}
-inline ::io::deephaven::proto::backplane::script::grpc::FigureDescriptor_AxisDescriptor* FigureDescriptor_ChartDescriptor::mutable_axes(int index)
-    ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  // @@protoc_insertion_point(field_mutable:io.deephaven.proto.backplane.script.grpc.FigureDescriptor.ChartDescriptor.axes)
-  return _internal_mutable_axes()->Mutable(index);
-}
-inline ::google::protobuf::RepeatedPtrField<::io::deephaven::proto::backplane::script::grpc::FigureDescriptor_AxisDescriptor>* FigureDescriptor_ChartDescriptor::mutable_axes()
-    ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  // @@protoc_insertion_point(field_mutable_list:io.deephaven.proto.backplane.script.grpc.FigureDescriptor.ChartDescriptor.axes)
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  return _internal_mutable_axes();
-}
-inline const ::io::deephaven::proto::backplane::script::grpc::FigureDescriptor_AxisDescriptor& FigureDescriptor_ChartDescriptor::axes(int index) const
-    ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  // @@protoc_insertion_point(field_get:io.deephaven.proto.backplane.script.grpc.FigureDescriptor.ChartDescriptor.axes)
-  return _internal_axes().Get(index);
-}
-inline ::io::deephaven::proto::backplane::script::grpc::FigureDescriptor_AxisDescriptor* FigureDescriptor_ChartDescriptor::add_axes() ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  ::io::deephaven::proto::backplane::script::grpc::FigureDescriptor_AxisDescriptor* _add = _internal_mutable_axes()->Add();
-  // @@protoc_insertion_point(field_add:io.deephaven.proto.backplane.script.grpc.FigureDescriptor.ChartDescriptor.axes)
-  return _add;
-}
-inline const ::google::protobuf::RepeatedPtrField<::io::deephaven::proto::backplane::script::grpc::FigureDescriptor_AxisDescriptor>& FigureDescriptor_ChartDescriptor::axes() const
-    ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  // @@protoc_insertion_point(field_list:io.deephaven.proto.backplane.script.grpc.FigureDescriptor.ChartDescriptor.axes)
-  return _internal_axes();
-}
-inline const ::google::protobuf::RepeatedPtrField<::io::deephaven::proto::backplane::script::grpc::FigureDescriptor_AxisDescriptor>&
-FigureDescriptor_ChartDescriptor::_internal_axes() const {
-  PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race);
-  return _impl_.axes_;
-}
-inline ::google::protobuf::RepeatedPtrField<::io::deephaven::proto::backplane::script::grpc::FigureDescriptor_AxisDescriptor>*
-FigureDescriptor_ChartDescriptor::_internal_mutable_axes() {
-  PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race);
-  return &_impl_.axes_;
-}
-
-// .io.deephaven.proto.backplane.script.grpc.FigureDescriptor.ChartDescriptor.ChartType chart_type = 6;
-inline void FigureDescriptor_ChartDescriptor::clear_chart_type() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  _impl_.chart_type_ = 0;
-}
-inline ::io::deephaven::proto::backplane::script::grpc::FigureDescriptor_ChartDescriptor_ChartType FigureDescriptor_ChartDescriptor::chart_type() const {
-  // @@protoc_insertion_point(field_get:io.deephaven.proto.backplane.script.grpc.FigureDescriptor.ChartDescriptor.chart_type)
-  return _internal_chart_type();
-}
-inline void FigureDescriptor_ChartDescriptor::set_chart_type(::io::deephaven::proto::backplane::script::grpc::FigureDescriptor_ChartDescriptor_ChartType value) {
-  _internal_set_chart_type(value);
-  // @@protoc_insertion_point(field_set:io.deephaven.proto.backplane.script.grpc.FigureDescriptor.ChartDescriptor.chart_type)
-}
-inline ::io::deephaven::proto::backplane::script::grpc::FigureDescriptor_ChartDescriptor_ChartType FigureDescriptor_ChartDescriptor::_internal_chart_type() const {
-  PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race);
-  return static_cast<::io::deephaven::proto::backplane::script::grpc::FigureDescriptor_ChartDescriptor_ChartType>(_impl_.chart_type_);
-}
-inline void FigureDescriptor_ChartDescriptor::_internal_set_chart_type(::io::deephaven::proto::backplane::script::grpc::FigureDescriptor_ChartDescriptor_ChartType value) {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  ;
-  _impl_.chart_type_ = value;
-}
-
-// optional string title = 7;
-inline bool FigureDescriptor_ChartDescriptor::has_title() const {
-  bool value = (_impl_._has_bits_[0] & 0x00000001u) != 0;
-  return value;
-}
-inline void FigureDescriptor_ChartDescriptor::clear_title() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  _impl_.title_.ClearToEmpty();
-  _impl_._has_bits_[0] &= ~0x00000001u;
-}
-inline const std::string& FigureDescriptor_ChartDescriptor::title() const
-    ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  // @@protoc_insertion_point(field_get:io.deephaven.proto.backplane.script.grpc.FigureDescriptor.ChartDescriptor.title)
-  return _internal_title();
-}
-template <typename Arg_, typename... Args_>
-inline PROTOBUF_ALWAYS_INLINE void FigureDescriptor_ChartDescriptor::set_title(Arg_&& arg,
-                                                     Args_... args) {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  _impl_._has_bits_[0] |= 0x00000001u;
-  _impl_.title_.Set(static_cast<Arg_&&>(arg), args..., GetArena());
-  // @@protoc_insertion_point(field_set:io.deephaven.proto.backplane.script.grpc.FigureDescriptor.ChartDescriptor.title)
-}
-inline std::string* FigureDescriptor_ChartDescriptor::mutable_title() ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  std::string* _s = _internal_mutable_title();
-  // @@protoc_insertion_point(field_mutable:io.deephaven.proto.backplane.script.grpc.FigureDescriptor.ChartDescriptor.title)
-  return _s;
-}
-inline const std::string& FigureDescriptor_ChartDescriptor::_internal_title() const {
-  PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race);
-  return _impl_.title_.Get();
-}
-inline void FigureDescriptor_ChartDescriptor::_internal_set_title(const std::string& value) {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  _impl_._has_bits_[0] |= 0x00000001u;
-  _impl_.title_.Set(value, GetArena());
-}
-inline std::string* FigureDescriptor_ChartDescriptor::_internal_mutable_title() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  _impl_._has_bits_[0] |= 0x00000001u;
-  return _impl_.title_.Mutable( GetArena());
-}
-inline std::string* FigureDescriptor_ChartDescriptor::release_title() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  // @@protoc_insertion_point(field_release:io.deephaven.proto.backplane.script.grpc.FigureDescriptor.ChartDescriptor.title)
-  if ((_impl_._has_bits_[0] & 0x00000001u) == 0) {
-    return nullptr;
-  }
-  _impl_._has_bits_[0] &= ~0x00000001u;
-  auto* released = _impl_.title_.Release();
-  #ifdef PROTOBUF_FORCE_COPY_DEFAULT_STRING
-  _impl_.title_.Set("", GetArena());
-  #endif  // PROTOBUF_FORCE_COPY_DEFAULT_STRING
-  return released;
-}
-inline void FigureDescriptor_ChartDescriptor::set_allocated_title(std::string* value) {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  if (value != nullptr) {
-    _impl_._has_bits_[0] |= 0x00000001u;
-  } else {
-    _impl_._has_bits_[0] &= ~0x00000001u;
-  }
-  _impl_.title_.SetAllocated(value, GetArena());
-  #ifdef PROTOBUF_FORCE_COPY_DEFAULT_STRING
-        if (_impl_.title_.IsDefault()) {
-          _impl_.title_.Set("", GetArena());
-        }
-  #endif  // PROTOBUF_FORCE_COPY_DEFAULT_STRING
-  // @@protoc_insertion_point(field_set_allocated:io.deephaven.proto.backplane.script.grpc.FigureDescriptor.ChartDescriptor.title)
-}
-
-// string title_font = 8;
-inline void FigureDescriptor_ChartDescriptor::clear_title_font() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  _impl_.title_font_.ClearToEmpty();
-}
-inline const std::string& FigureDescriptor_ChartDescriptor::title_font() const
-    ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  // @@protoc_insertion_point(field_get:io.deephaven.proto.backplane.script.grpc.FigureDescriptor.ChartDescriptor.title_font)
-  return _internal_title_font();
-}
-template <typename Arg_, typename... Args_>
-inline PROTOBUF_ALWAYS_INLINE void FigureDescriptor_ChartDescriptor::set_title_font(Arg_&& arg,
-                                                     Args_... args) {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  ;
-  _impl_.title_font_.Set(static_cast<Arg_&&>(arg), args..., GetArena());
-  // @@protoc_insertion_point(field_set:io.deephaven.proto.backplane.script.grpc.FigureDescriptor.ChartDescriptor.title_font)
-}
-inline std::string* FigureDescriptor_ChartDescriptor::mutable_title_font() ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  std::string* _s = _internal_mutable_title_font();
-  // @@protoc_insertion_point(field_mutable:io.deephaven.proto.backplane.script.grpc.FigureDescriptor.ChartDescriptor.title_font)
-  return _s;
-}
-inline const std::string& FigureDescriptor_ChartDescriptor::_internal_title_font() const {
-  PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race);
-  return _impl_.title_font_.Get();
-}
-inline void FigureDescriptor_ChartDescriptor::_internal_set_title_font(const std::string& value) {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  ;
-  _impl_.title_font_.Set(value, GetArena());
-}
-inline std::string* FigureDescriptor_ChartDescriptor::_internal_mutable_title_font() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  ;
-  return _impl_.title_font_.Mutable( GetArena());
-}
-inline std::string* FigureDescriptor_ChartDescriptor::release_title_font() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  // @@protoc_insertion_point(field_release:io.deephaven.proto.backplane.script.grpc.FigureDescriptor.ChartDescriptor.title_font)
-  return _impl_.title_font_.Release();
-}
-inline void FigureDescriptor_ChartDescriptor::set_allocated_title_font(std::string* value) {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  _impl_.title_font_.SetAllocated(value, GetArena());
-  #ifdef PROTOBUF_FORCE_COPY_DEFAULT_STRING
-        if (_impl_.title_font_.IsDefault()) {
-          _impl_.title_font_.Set("", GetArena());
-        }
-  #endif  // PROTOBUF_FORCE_COPY_DEFAULT_STRING
-  // @@protoc_insertion_point(field_set_allocated:io.deephaven.proto.backplane.script.grpc.FigureDescriptor.ChartDescriptor.title_font)
-}
-
-// string title_color = 9;
-inline void FigureDescriptor_ChartDescriptor::clear_title_color() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  _impl_.title_color_.ClearToEmpty();
-}
-inline const std::string& FigureDescriptor_ChartDescriptor::title_color() const
-    ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  // @@protoc_insertion_point(field_get:io.deephaven.proto.backplane.script.grpc.FigureDescriptor.ChartDescriptor.title_color)
-  return _internal_title_color();
-}
-template <typename Arg_, typename... Args_>
-inline PROTOBUF_ALWAYS_INLINE void FigureDescriptor_ChartDescriptor::set_title_color(Arg_&& arg,
-                                                     Args_... args) {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  ;
-  _impl_.title_color_.Set(static_cast<Arg_&&>(arg), args..., GetArena());
-  // @@protoc_insertion_point(field_set:io.deephaven.proto.backplane.script.grpc.FigureDescriptor.ChartDescriptor.title_color)
-}
-inline std::string* FigureDescriptor_ChartDescriptor::mutable_title_color() ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  std::string* _s = _internal_mutable_title_color();
-  // @@protoc_insertion_point(field_mutable:io.deephaven.proto.backplane.script.grpc.FigureDescriptor.ChartDescriptor.title_color)
-  return _s;
-}
-inline const std::string& FigureDescriptor_ChartDescriptor::_internal_title_color() const {
-  PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race);
-  return _impl_.title_color_.Get();
-}
-inline void FigureDescriptor_ChartDescriptor::_internal_set_title_color(const std::string& value) {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  ;
-  _impl_.title_color_.Set(value, GetArena());
-}
-inline std::string* FigureDescriptor_ChartDescriptor::_internal_mutable_title_color() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  ;
-  return _impl_.title_color_.Mutable( GetArena());
-}
-inline std::string* FigureDescriptor_ChartDescriptor::release_title_color() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  // @@protoc_insertion_point(field_release:io.deephaven.proto.backplane.script.grpc.FigureDescriptor.ChartDescriptor.title_color)
-  return _impl_.title_color_.Release();
-}
-inline void FigureDescriptor_ChartDescriptor::set_allocated_title_color(std::string* value) {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  _impl_.title_color_.SetAllocated(value, GetArena());
-  #ifdef PROTOBUF_FORCE_COPY_DEFAULT_STRING
-        if (_impl_.title_color_.IsDefault()) {
-          _impl_.title_color_.Set("", GetArena());
-        }
-  #endif  // PROTOBUF_FORCE_COPY_DEFAULT_STRING
-  // @@protoc_insertion_point(field_set_allocated:io.deephaven.proto.backplane.script.grpc.FigureDescriptor.ChartDescriptor.title_color)
-}
-
-// bool show_legend = 10;
-inline void FigureDescriptor_ChartDescriptor::clear_show_legend() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  _impl_.show_legend_ = false;
-}
-inline bool FigureDescriptor_ChartDescriptor::show_legend() const {
-  // @@protoc_insertion_point(field_get:io.deephaven.proto.backplane.script.grpc.FigureDescriptor.ChartDescriptor.show_legend)
-  return _internal_show_legend();
-}
-inline void FigureDescriptor_ChartDescriptor::set_show_legend(bool value) {
-  _internal_set_show_legend(value);
-  // @@protoc_insertion_point(field_set:io.deephaven.proto.backplane.script.grpc.FigureDescriptor.ChartDescriptor.show_legend)
-}
-inline bool FigureDescriptor_ChartDescriptor::_internal_show_legend() const {
-  PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race);
-  return _impl_.show_legend_;
-}
-inline void FigureDescriptor_ChartDescriptor::_internal_set_show_legend(bool value) {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  ;
-  _impl_.show_legend_ = value;
-}
-
-// string legend_font = 11;
-inline void FigureDescriptor_ChartDescriptor::clear_legend_font() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  _impl_.legend_font_.ClearToEmpty();
-}
-inline const std::string& FigureDescriptor_ChartDescriptor::legend_font() const
-    ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  // @@protoc_insertion_point(field_get:io.deephaven.proto.backplane.script.grpc.FigureDescriptor.ChartDescriptor.legend_font)
-  return _internal_legend_font();
-}
-template <typename Arg_, typename... Args_>
-inline PROTOBUF_ALWAYS_INLINE void FigureDescriptor_ChartDescriptor::set_legend_font(Arg_&& arg,
-                                                     Args_... args) {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  ;
-  _impl_.legend_font_.Set(static_cast<Arg_&&>(arg), args..., GetArena());
-  // @@protoc_insertion_point(field_set:io.deephaven.proto.backplane.script.grpc.FigureDescriptor.ChartDescriptor.legend_font)
-}
-inline std::string* FigureDescriptor_ChartDescriptor::mutable_legend_font() ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  std::string* _s = _internal_mutable_legend_font();
-  // @@protoc_insertion_point(field_mutable:io.deephaven.proto.backplane.script.grpc.FigureDescriptor.ChartDescriptor.legend_font)
-  return _s;
-}
-inline const std::string& FigureDescriptor_ChartDescriptor::_internal_legend_font() const {
-  PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race);
-  return _impl_.legend_font_.Get();
-}
-inline void FigureDescriptor_ChartDescriptor::_internal_set_legend_font(const std::string& value) {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  ;
-  _impl_.legend_font_.Set(value, GetArena());
-}
-inline std::string* FigureDescriptor_ChartDescriptor::_internal_mutable_legend_font() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  ;
-  return _impl_.legend_font_.Mutable( GetArena());
-}
-inline std::string* FigureDescriptor_ChartDescriptor::release_legend_font() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  // @@protoc_insertion_point(field_release:io.deephaven.proto.backplane.script.grpc.FigureDescriptor.ChartDescriptor.legend_font)
-  return _impl_.legend_font_.Release();
-}
-inline void FigureDescriptor_ChartDescriptor::set_allocated_legend_font(std::string* value) {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  _impl_.legend_font_.SetAllocated(value, GetArena());
-  #ifdef PROTOBUF_FORCE_COPY_DEFAULT_STRING
-        if (_impl_.legend_font_.IsDefault()) {
-          _impl_.legend_font_.Set("", GetArena());
-        }
-  #endif  // PROTOBUF_FORCE_COPY_DEFAULT_STRING
-  // @@protoc_insertion_point(field_set_allocated:io.deephaven.proto.backplane.script.grpc.FigureDescriptor.ChartDescriptor.legend_font)
-}
-
-// string legend_color = 12;
-inline void FigureDescriptor_ChartDescriptor::clear_legend_color() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  _impl_.legend_color_.ClearToEmpty();
-}
-inline const std::string& FigureDescriptor_ChartDescriptor::legend_color() const
-    ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  // @@protoc_insertion_point(field_get:io.deephaven.proto.backplane.script.grpc.FigureDescriptor.ChartDescriptor.legend_color)
-  return _internal_legend_color();
-}
-template <typename Arg_, typename... Args_>
-inline PROTOBUF_ALWAYS_INLINE void FigureDescriptor_ChartDescriptor::set_legend_color(Arg_&& arg,
-                                                     Args_... args) {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  ;
-  _impl_.legend_color_.Set(static_cast<Arg_&&>(arg), args..., GetArena());
-  // @@protoc_insertion_point(field_set:io.deephaven.proto.backplane.script.grpc.FigureDescriptor.ChartDescriptor.legend_color)
-}
-inline std::string* FigureDescriptor_ChartDescriptor::mutable_legend_color() ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  std::string* _s = _internal_mutable_legend_color();
-  // @@protoc_insertion_point(field_mutable:io.deephaven.proto.backplane.script.grpc.FigureDescriptor.ChartDescriptor.legend_color)
-  return _s;
-}
-inline const std::string& FigureDescriptor_ChartDescriptor::_internal_legend_color() const {
-  PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race);
-  return _impl_.legend_color_.Get();
-}
-inline void FigureDescriptor_ChartDescriptor::_internal_set_legend_color(const std::string& value) {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  ;
-  _impl_.legend_color_.Set(value, GetArena());
-}
-inline std::string* FigureDescriptor_ChartDescriptor::_internal_mutable_legend_color() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  ;
-  return _impl_.legend_color_.Mutable( GetArena());
-}
-inline std::string* FigureDescriptor_ChartDescriptor::release_legend_color() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  // @@protoc_insertion_point(field_release:io.deephaven.proto.backplane.script.grpc.FigureDescriptor.ChartDescriptor.legend_color)
-  return _impl_.legend_color_.Release();
-}
-inline void FigureDescriptor_ChartDescriptor::set_allocated_legend_color(std::string* value) {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  _impl_.legend_color_.SetAllocated(value, GetArena());
-  #ifdef PROTOBUF_FORCE_COPY_DEFAULT_STRING
-        if (_impl_.legend_color_.IsDefault()) {
-          _impl_.legend_color_.Set("", GetArena());
-        }
-  #endif  // PROTOBUF_FORCE_COPY_DEFAULT_STRING
-  // @@protoc_insertion_point(field_set_allocated:io.deephaven.proto.backplane.script.grpc.FigureDescriptor.ChartDescriptor.legend_color)
-}
-
-// bool is3d = 13;
-inline void FigureDescriptor_ChartDescriptor::clear_is3d() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  _impl_.is3d_ = false;
-}
-inline bool FigureDescriptor_ChartDescriptor::is3d() const {
-  // @@protoc_insertion_point(field_get:io.deephaven.proto.backplane.script.grpc.FigureDescriptor.ChartDescriptor.is3d)
-  return _internal_is3d();
-}
-inline void FigureDescriptor_ChartDescriptor::set_is3d(bool value) {
-  _internal_set_is3d(value);
-  // @@protoc_insertion_point(field_set:io.deephaven.proto.backplane.script.grpc.FigureDescriptor.ChartDescriptor.is3d)
-}
-inline bool FigureDescriptor_ChartDescriptor::_internal_is3d() const {
-  PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race);
-  return _impl_.is3d_;
-}
-inline void FigureDescriptor_ChartDescriptor::_internal_set_is3d(bool value) {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  ;
-  _impl_.is3d_ = value;
-}
-
-// int32 column = 14;
-inline void FigureDescriptor_ChartDescriptor::clear_column() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  _impl_.column_ = 0;
-}
-inline ::int32_t FigureDescriptor_ChartDescriptor::column() const {
-  // @@protoc_insertion_point(field_get:io.deephaven.proto.backplane.script.grpc.FigureDescriptor.ChartDescriptor.column)
-  return _internal_column();
-}
-inline void FigureDescriptor_ChartDescriptor::set_column(::int32_t value) {
-  _internal_set_column(value);
-  // @@protoc_insertion_point(field_set:io.deephaven.proto.backplane.script.grpc.FigureDescriptor.ChartDescriptor.column)
-}
-inline ::int32_t FigureDescriptor_ChartDescriptor::_internal_column() const {
-  PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race);
-  return _impl_.column_;
-}
-inline void FigureDescriptor_ChartDescriptor::_internal_set_column(::int32_t value) {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  ;
-  _impl_.column_ = value;
-}
-
-// int32 row = 15;
-inline void FigureDescriptor_ChartDescriptor::clear_row() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  _impl_.row_ = 0;
-}
-inline ::int32_t FigureDescriptor_ChartDescriptor::row() const {
-  // @@protoc_insertion_point(field_get:io.deephaven.proto.backplane.script.grpc.FigureDescriptor.ChartDescriptor.row)
-  return _internal_row();
-}
-inline void FigureDescriptor_ChartDescriptor::set_row(::int32_t value) {
-  _internal_set_row(value);
-  // @@protoc_insertion_point(field_set:io.deephaven.proto.backplane.script.grpc.FigureDescriptor.ChartDescriptor.row)
-}
-inline ::int32_t FigureDescriptor_ChartDescriptor::_internal_row() const {
-  PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race);
-  return _impl_.row_;
-}
-inline void FigureDescriptor_ChartDescriptor::_internal_set_row(::int32_t value) {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  ;
-  _impl_.row_ = value;
-}
-
-// -------------------------------------------------------------------
-
-// FigureDescriptor_SeriesDescriptor
-
-// .io.deephaven.proto.backplane.script.grpc.FigureDescriptor.SeriesPlotStyle plot_style = 1;
-inline void FigureDescriptor_SeriesDescriptor::clear_plot_style() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  _impl_.plot_style_ = 0;
-}
-inline ::io::deephaven::proto::backplane::script::grpc::FigureDescriptor_SeriesPlotStyle FigureDescriptor_SeriesDescriptor::plot_style() const {
-  // @@protoc_insertion_point(field_get:io.deephaven.proto.backplane.script.grpc.FigureDescriptor.SeriesDescriptor.plot_style)
-  return _internal_plot_style();
-}
-inline void FigureDescriptor_SeriesDescriptor::set_plot_style(::io::deephaven::proto::backplane::script::grpc::FigureDescriptor_SeriesPlotStyle value) {
-  _internal_set_plot_style(value);
-  // @@protoc_insertion_point(field_set:io.deephaven.proto.backplane.script.grpc.FigureDescriptor.SeriesDescriptor.plot_style)
-}
-inline ::io::deephaven::proto::backplane::script::grpc::FigureDescriptor_SeriesPlotStyle FigureDescriptor_SeriesDescriptor::_internal_plot_style() const {
-  PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race);
-  return static_cast<::io::deephaven::proto::backplane::script::grpc::FigureDescriptor_SeriesPlotStyle>(_impl_.plot_style_);
-}
-inline void FigureDescriptor_SeriesDescriptor::_internal_set_plot_style(::io::deephaven::proto::backplane::script::grpc::FigureDescriptor_SeriesPlotStyle value) {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  ;
-  _impl_.plot_style_ = value;
-}
-
-// string name = 2;
-inline void FigureDescriptor_SeriesDescriptor::clear_name() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  _impl_.name_.ClearToEmpty();
-}
-inline const std::string& FigureDescriptor_SeriesDescriptor::name() const
-    ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  // @@protoc_insertion_point(field_get:io.deephaven.proto.backplane.script.grpc.FigureDescriptor.SeriesDescriptor.name)
-  return _internal_name();
-}
-template <typename Arg_, typename... Args_>
-inline PROTOBUF_ALWAYS_INLINE void FigureDescriptor_SeriesDescriptor::set_name(Arg_&& arg,
-                                                     Args_... args) {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  ;
-  _impl_.name_.Set(static_cast<Arg_&&>(arg), args..., GetArena());
-  // @@protoc_insertion_point(field_set:io.deephaven.proto.backplane.script.grpc.FigureDescriptor.SeriesDescriptor.name)
-}
-inline std::string* FigureDescriptor_SeriesDescriptor::mutable_name() ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  std::string* _s = _internal_mutable_name();
-  // @@protoc_insertion_point(field_mutable:io.deephaven.proto.backplane.script.grpc.FigureDescriptor.SeriesDescriptor.name)
-  return _s;
-}
-inline const std::string& FigureDescriptor_SeriesDescriptor::_internal_name() const {
-  PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race);
-  return _impl_.name_.Get();
-}
-inline void FigureDescriptor_SeriesDescriptor::_internal_set_name(const std::string& value) {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  ;
-  _impl_.name_.Set(value, GetArena());
-}
-inline std::string* FigureDescriptor_SeriesDescriptor::_internal_mutable_name() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  ;
-  return _impl_.name_.Mutable( GetArena());
-}
-inline std::string* FigureDescriptor_SeriesDescriptor::release_name() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  // @@protoc_insertion_point(field_release:io.deephaven.proto.backplane.script.grpc.FigureDescriptor.SeriesDescriptor.name)
-  return _impl_.name_.Release();
-}
-inline void FigureDescriptor_SeriesDescriptor::set_allocated_name(std::string* value) {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  _impl_.name_.SetAllocated(value, GetArena());
-  #ifdef PROTOBUF_FORCE_COPY_DEFAULT_STRING
-        if (_impl_.name_.IsDefault()) {
-          _impl_.name_.Set("", GetArena());
-        }
-  #endif  // PROTOBUF_FORCE_COPY_DEFAULT_STRING
-  // @@protoc_insertion_point(field_set_allocated:io.deephaven.proto.backplane.script.grpc.FigureDescriptor.SeriesDescriptor.name)
-}
-
-// optional bool lines_visible = 3;
-inline bool FigureDescriptor_SeriesDescriptor::has_lines_visible() const {
-  bool value = (_impl_._has_bits_[0] & 0x00000008u) != 0;
-  return value;
-}
-inline void FigureDescriptor_SeriesDescriptor::clear_lines_visible() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  _impl_.lines_visible_ = false;
-  _impl_._has_bits_[0] &= ~0x00000008u;
-}
-inline bool FigureDescriptor_SeriesDescriptor::lines_visible() const {
-  // @@protoc_insertion_point(field_get:io.deephaven.proto.backplane.script.grpc.FigureDescriptor.SeriesDescriptor.lines_visible)
-  return _internal_lines_visible();
-}
-inline void FigureDescriptor_SeriesDescriptor::set_lines_visible(bool value) {
-  _internal_set_lines_visible(value);
-  // @@protoc_insertion_point(field_set:io.deephaven.proto.backplane.script.grpc.FigureDescriptor.SeriesDescriptor.lines_visible)
-}
-inline bool FigureDescriptor_SeriesDescriptor::_internal_lines_visible() const {
-  PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race);
-  return _impl_.lines_visible_;
-}
-inline void FigureDescriptor_SeriesDescriptor::_internal_set_lines_visible(bool value) {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  _impl_._has_bits_[0] |= 0x00000008u;
-  _impl_.lines_visible_ = value;
-}
-
-// optional bool shapes_visible = 4;
-inline bool FigureDescriptor_SeriesDescriptor::has_shapes_visible() const {
-  bool value = (_impl_._has_bits_[0] & 0x00000010u) != 0;
-  return value;
-}
-inline void FigureDescriptor_SeriesDescriptor::clear_shapes_visible() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  _impl_.shapes_visible_ = false;
-  _impl_._has_bits_[0] &= ~0x00000010u;
-}
-inline bool FigureDescriptor_SeriesDescriptor::shapes_visible() const {
-  // @@protoc_insertion_point(field_get:io.deephaven.proto.backplane.script.grpc.FigureDescriptor.SeriesDescriptor.shapes_visible)
-  return _internal_shapes_visible();
-}
-inline void FigureDescriptor_SeriesDescriptor::set_shapes_visible(bool value) {
-  _internal_set_shapes_visible(value);
-  // @@protoc_insertion_point(field_set:io.deephaven.proto.backplane.script.grpc.FigureDescriptor.SeriesDescriptor.shapes_visible)
-}
-inline bool FigureDescriptor_SeriesDescriptor::_internal_shapes_visible() const {
-  PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race);
-  return _impl_.shapes_visible_;
-}
-inline void FigureDescriptor_SeriesDescriptor::_internal_set_shapes_visible(bool value) {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  _impl_._has_bits_[0] |= 0x00000010u;
-  _impl_.shapes_visible_ = value;
-}
-
-// bool gradient_visible = 5;
-inline void FigureDescriptor_SeriesDescriptor::clear_gradient_visible() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  _impl_.gradient_visible_ = false;
-}
-inline bool FigureDescriptor_SeriesDescriptor::gradient_visible() const {
-  // @@protoc_insertion_point(field_get:io.deephaven.proto.backplane.script.grpc.FigureDescriptor.SeriesDescriptor.gradient_visible)
-  return _internal_gradient_visible();
-}
-inline void FigureDescriptor_SeriesDescriptor::set_gradient_visible(bool value) {
-  _internal_set_gradient_visible(value);
-  // @@protoc_insertion_point(field_set:io.deephaven.proto.backplane.script.grpc.FigureDescriptor.SeriesDescriptor.gradient_visible)
-}
-inline bool FigureDescriptor_SeriesDescriptor::_internal_gradient_visible() const {
-  PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race);
-  return _impl_.gradient_visible_;
-}
-inline void FigureDescriptor_SeriesDescriptor::_internal_set_gradient_visible(bool value) {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  ;
-  _impl_.gradient_visible_ = value;
-}
-
-// string line_color = 6;
-inline void FigureDescriptor_SeriesDescriptor::clear_line_color() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  _impl_.line_color_.ClearToEmpty();
-}
-inline const std::string& FigureDescriptor_SeriesDescriptor::line_color() const
-    ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  // @@protoc_insertion_point(field_get:io.deephaven.proto.backplane.script.grpc.FigureDescriptor.SeriesDescriptor.line_color)
-  return _internal_line_color();
-}
-template <typename Arg_, typename... Args_>
-inline PROTOBUF_ALWAYS_INLINE void FigureDescriptor_SeriesDescriptor::set_line_color(Arg_&& arg,
-                                                     Args_... args) {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  ;
-  _impl_.line_color_.Set(static_cast<Arg_&&>(arg), args..., GetArena());
-  // @@protoc_insertion_point(field_set:io.deephaven.proto.backplane.script.grpc.FigureDescriptor.SeriesDescriptor.line_color)
-}
-inline std::string* FigureDescriptor_SeriesDescriptor::mutable_line_color() ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  std::string* _s = _internal_mutable_line_color();
-  // @@protoc_insertion_point(field_mutable:io.deephaven.proto.backplane.script.grpc.FigureDescriptor.SeriesDescriptor.line_color)
-  return _s;
-}
-inline const std::string& FigureDescriptor_SeriesDescriptor::_internal_line_color() const {
-  PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race);
-  return _impl_.line_color_.Get();
-}
-inline void FigureDescriptor_SeriesDescriptor::_internal_set_line_color(const std::string& value) {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  ;
-  _impl_.line_color_.Set(value, GetArena());
-}
-inline std::string* FigureDescriptor_SeriesDescriptor::_internal_mutable_line_color() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  ;
-  return _impl_.line_color_.Mutable( GetArena());
-}
-inline std::string* FigureDescriptor_SeriesDescriptor::release_line_color() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  // @@protoc_insertion_point(field_release:io.deephaven.proto.backplane.script.grpc.FigureDescriptor.SeriesDescriptor.line_color)
-  return _impl_.line_color_.Release();
-}
-inline void FigureDescriptor_SeriesDescriptor::set_allocated_line_color(std::string* value) {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  _impl_.line_color_.SetAllocated(value, GetArena());
-  #ifdef PROTOBUF_FORCE_COPY_DEFAULT_STRING
-        if (_impl_.line_color_.IsDefault()) {
-          _impl_.line_color_.Set("", GetArena());
-        }
-  #endif  // PROTOBUF_FORCE_COPY_DEFAULT_STRING
-  // @@protoc_insertion_point(field_set_allocated:io.deephaven.proto.backplane.script.grpc.FigureDescriptor.SeriesDescriptor.line_color)
-}
-
-// optional string point_label_format = 8;
-inline bool FigureDescriptor_SeriesDescriptor::has_point_label_format() const {
-  bool value = (_impl_._has_bits_[0] & 0x00000001u) != 0;
-  return value;
-}
-inline void FigureDescriptor_SeriesDescriptor::clear_point_label_format() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  _impl_.point_label_format_.ClearToEmpty();
-  _impl_._has_bits_[0] &= ~0x00000001u;
-}
-inline const std::string& FigureDescriptor_SeriesDescriptor::point_label_format() const
-    ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  // @@protoc_insertion_point(field_get:io.deephaven.proto.backplane.script.grpc.FigureDescriptor.SeriesDescriptor.point_label_format)
-  return _internal_point_label_format();
-}
-template <typename Arg_, typename... Args_>
-inline PROTOBUF_ALWAYS_INLINE void FigureDescriptor_SeriesDescriptor::set_point_label_format(Arg_&& arg,
-                                                     Args_... args) {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  _impl_._has_bits_[0] |= 0x00000001u;
-  _impl_.point_label_format_.Set(static_cast<Arg_&&>(arg), args..., GetArena());
-  // @@protoc_insertion_point(field_set:io.deephaven.proto.backplane.script.grpc.FigureDescriptor.SeriesDescriptor.point_label_format)
-}
-inline std::string* FigureDescriptor_SeriesDescriptor::mutable_point_label_format() ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  std::string* _s = _internal_mutable_point_label_format();
-  // @@protoc_insertion_point(field_mutable:io.deephaven.proto.backplane.script.grpc.FigureDescriptor.SeriesDescriptor.point_label_format)
-  return _s;
-}
-inline const std::string& FigureDescriptor_SeriesDescriptor::_internal_point_label_format() const {
-  PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race);
-  return _impl_.point_label_format_.Get();
-}
-inline void FigureDescriptor_SeriesDescriptor::_internal_set_point_label_format(const std::string& value) {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  _impl_._has_bits_[0] |= 0x00000001u;
-  _impl_.point_label_format_.Set(value, GetArena());
-}
-inline std::string* FigureDescriptor_SeriesDescriptor::_internal_mutable_point_label_format() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  _impl_._has_bits_[0] |= 0x00000001u;
-  return _impl_.point_label_format_.Mutable( GetArena());
-}
-inline std::string* FigureDescriptor_SeriesDescriptor::release_point_label_format() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  // @@protoc_insertion_point(field_release:io.deephaven.proto.backplane.script.grpc.FigureDescriptor.SeriesDescriptor.point_label_format)
-  if ((_impl_._has_bits_[0] & 0x00000001u) == 0) {
-    return nullptr;
-  }
-  _impl_._has_bits_[0] &= ~0x00000001u;
-  auto* released = _impl_.point_label_format_.Release();
-  #ifdef PROTOBUF_FORCE_COPY_DEFAULT_STRING
-  _impl_.point_label_format_.Set("", GetArena());
-  #endif  // PROTOBUF_FORCE_COPY_DEFAULT_STRING
-  return released;
-}
-inline void FigureDescriptor_SeriesDescriptor::set_allocated_point_label_format(std::string* value) {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  if (value != nullptr) {
-    _impl_._has_bits_[0] |= 0x00000001u;
-  } else {
-    _impl_._has_bits_[0] &= ~0x00000001u;
-  }
-  _impl_.point_label_format_.SetAllocated(value, GetArena());
-  #ifdef PROTOBUF_FORCE_COPY_DEFAULT_STRING
-        if (_impl_.point_label_format_.IsDefault()) {
-          _impl_.point_label_format_.Set("", GetArena());
-        }
-  #endif  // PROTOBUF_FORCE_COPY_DEFAULT_STRING
-  // @@protoc_insertion_point(field_set_allocated:io.deephaven.proto.backplane.script.grpc.FigureDescriptor.SeriesDescriptor.point_label_format)
-}
-
-// optional string x_tool_tip_pattern = 9;
-inline bool FigureDescriptor_SeriesDescriptor::has_x_tool_tip_pattern() const {
-  bool value = (_impl_._has_bits_[0] & 0x00000002u) != 0;
-  return value;
-}
-inline void FigureDescriptor_SeriesDescriptor::clear_x_tool_tip_pattern() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  _impl_.x_tool_tip_pattern_.ClearToEmpty();
-  _impl_._has_bits_[0] &= ~0x00000002u;
-}
-inline const std::string& FigureDescriptor_SeriesDescriptor::x_tool_tip_pattern() const
-    ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  // @@protoc_insertion_point(field_get:io.deephaven.proto.backplane.script.grpc.FigureDescriptor.SeriesDescriptor.x_tool_tip_pattern)
-  return _internal_x_tool_tip_pattern();
-}
-template <typename Arg_, typename... Args_>
-inline PROTOBUF_ALWAYS_INLINE void FigureDescriptor_SeriesDescriptor::set_x_tool_tip_pattern(Arg_&& arg,
-                                                     Args_... args) {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  _impl_._has_bits_[0] |= 0x00000002u;
-  _impl_.x_tool_tip_pattern_.Set(static_cast<Arg_&&>(arg), args..., GetArena());
-  // @@protoc_insertion_point(field_set:io.deephaven.proto.backplane.script.grpc.FigureDescriptor.SeriesDescriptor.x_tool_tip_pattern)
-}
-inline std::string* FigureDescriptor_SeriesDescriptor::mutable_x_tool_tip_pattern() ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  std::string* _s = _internal_mutable_x_tool_tip_pattern();
-  // @@protoc_insertion_point(field_mutable:io.deephaven.proto.backplane.script.grpc.FigureDescriptor.SeriesDescriptor.x_tool_tip_pattern)
-  return _s;
-}
-inline const std::string& FigureDescriptor_SeriesDescriptor::_internal_x_tool_tip_pattern() const {
-  PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race);
-  return _impl_.x_tool_tip_pattern_.Get();
-}
-inline void FigureDescriptor_SeriesDescriptor::_internal_set_x_tool_tip_pattern(const std::string& value) {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  _impl_._has_bits_[0] |= 0x00000002u;
-  _impl_.x_tool_tip_pattern_.Set(value, GetArena());
-}
-inline std::string* FigureDescriptor_SeriesDescriptor::_internal_mutable_x_tool_tip_pattern() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  _impl_._has_bits_[0] |= 0x00000002u;
-  return _impl_.x_tool_tip_pattern_.Mutable( GetArena());
-}
-inline std::string* FigureDescriptor_SeriesDescriptor::release_x_tool_tip_pattern() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  // @@protoc_insertion_point(field_release:io.deephaven.proto.backplane.script.grpc.FigureDescriptor.SeriesDescriptor.x_tool_tip_pattern)
-  if ((_impl_._has_bits_[0] & 0x00000002u) == 0) {
-    return nullptr;
-  }
-  _impl_._has_bits_[0] &= ~0x00000002u;
-  auto* released = _impl_.x_tool_tip_pattern_.Release();
-  #ifdef PROTOBUF_FORCE_COPY_DEFAULT_STRING
-  _impl_.x_tool_tip_pattern_.Set("", GetArena());
-  #endif  // PROTOBUF_FORCE_COPY_DEFAULT_STRING
-  return released;
-}
-inline void FigureDescriptor_SeriesDescriptor::set_allocated_x_tool_tip_pattern(std::string* value) {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  if (value != nullptr) {
-    _impl_._has_bits_[0] |= 0x00000002u;
-  } else {
-    _impl_._has_bits_[0] &= ~0x00000002u;
-  }
-  _impl_.x_tool_tip_pattern_.SetAllocated(value, GetArena());
-  #ifdef PROTOBUF_FORCE_COPY_DEFAULT_STRING
-        if (_impl_.x_tool_tip_pattern_.IsDefault()) {
-          _impl_.x_tool_tip_pattern_.Set("", GetArena());
-        }
-  #endif  // PROTOBUF_FORCE_COPY_DEFAULT_STRING
-  // @@protoc_insertion_point(field_set_allocated:io.deephaven.proto.backplane.script.grpc.FigureDescriptor.SeriesDescriptor.x_tool_tip_pattern)
-}
-
-// optional string y_tool_tip_pattern = 10;
-inline bool FigureDescriptor_SeriesDescriptor::has_y_tool_tip_pattern() const {
-  bool value = (_impl_._has_bits_[0] & 0x00000004u) != 0;
-  return value;
-}
-inline void FigureDescriptor_SeriesDescriptor::clear_y_tool_tip_pattern() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  _impl_.y_tool_tip_pattern_.ClearToEmpty();
-  _impl_._has_bits_[0] &= ~0x00000004u;
-}
-inline const std::string& FigureDescriptor_SeriesDescriptor::y_tool_tip_pattern() const
-    ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  // @@protoc_insertion_point(field_get:io.deephaven.proto.backplane.script.grpc.FigureDescriptor.SeriesDescriptor.y_tool_tip_pattern)
-  return _internal_y_tool_tip_pattern();
-}
-template <typename Arg_, typename... Args_>
-inline PROTOBUF_ALWAYS_INLINE void FigureDescriptor_SeriesDescriptor::set_y_tool_tip_pattern(Arg_&& arg,
-                                                     Args_... args) {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  _impl_._has_bits_[0] |= 0x00000004u;
-  _impl_.y_tool_tip_pattern_.Set(static_cast<Arg_&&>(arg), args..., GetArena());
-  // @@protoc_insertion_point(field_set:io.deephaven.proto.backplane.script.grpc.FigureDescriptor.SeriesDescriptor.y_tool_tip_pattern)
-}
-inline std::string* FigureDescriptor_SeriesDescriptor::mutable_y_tool_tip_pattern() ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  std::string* _s = _internal_mutable_y_tool_tip_pattern();
-  // @@protoc_insertion_point(field_mutable:io.deephaven.proto.backplane.script.grpc.FigureDescriptor.SeriesDescriptor.y_tool_tip_pattern)
-  return _s;
-}
-inline const std::string& FigureDescriptor_SeriesDescriptor::_internal_y_tool_tip_pattern() const {
-  PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race);
-  return _impl_.y_tool_tip_pattern_.Get();
-}
-inline void FigureDescriptor_SeriesDescriptor::_internal_set_y_tool_tip_pattern(const std::string& value) {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  _impl_._has_bits_[0] |= 0x00000004u;
-  _impl_.y_tool_tip_pattern_.Set(value, GetArena());
-}
-inline std::string* FigureDescriptor_SeriesDescriptor::_internal_mutable_y_tool_tip_pattern() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  _impl_._has_bits_[0] |= 0x00000004u;
-  return _impl_.y_tool_tip_pattern_.Mutable( GetArena());
-}
-inline std::string* FigureDescriptor_SeriesDescriptor::release_y_tool_tip_pattern() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  // @@protoc_insertion_point(field_release:io.deephaven.proto.backplane.script.grpc.FigureDescriptor.SeriesDescriptor.y_tool_tip_pattern)
-  if ((_impl_._has_bits_[0] & 0x00000004u) == 0) {
-    return nullptr;
-  }
-  _impl_._has_bits_[0] &= ~0x00000004u;
-  auto* released = _impl_.y_tool_tip_pattern_.Release();
-  #ifdef PROTOBUF_FORCE_COPY_DEFAULT_STRING
-  _impl_.y_tool_tip_pattern_.Set("", GetArena());
-  #endif  // PROTOBUF_FORCE_COPY_DEFAULT_STRING
-  return released;
-}
-inline void FigureDescriptor_SeriesDescriptor::set_allocated_y_tool_tip_pattern(std::string* value) {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  if (value != nullptr) {
-    _impl_._has_bits_[0] |= 0x00000004u;
-  } else {
-    _impl_._has_bits_[0] &= ~0x00000004u;
-  }
-  _impl_.y_tool_tip_pattern_.SetAllocated(value, GetArena());
-  #ifdef PROTOBUF_FORCE_COPY_DEFAULT_STRING
-        if (_impl_.y_tool_tip_pattern_.IsDefault()) {
-          _impl_.y_tool_tip_pattern_.Set("", GetArena());
-        }
-  #endif  // PROTOBUF_FORCE_COPY_DEFAULT_STRING
-  // @@protoc_insertion_point(field_set_allocated:io.deephaven.proto.backplane.script.grpc.FigureDescriptor.SeriesDescriptor.y_tool_tip_pattern)
-}
-
-// string shape_label = 11;
-inline void FigureDescriptor_SeriesDescriptor::clear_shape_label() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  _impl_.shape_label_.ClearToEmpty();
-}
-inline const std::string& FigureDescriptor_SeriesDescriptor::shape_label() const
-    ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  // @@protoc_insertion_point(field_get:io.deephaven.proto.backplane.script.grpc.FigureDescriptor.SeriesDescriptor.shape_label)
-  return _internal_shape_label();
-}
-template <typename Arg_, typename... Args_>
-inline PROTOBUF_ALWAYS_INLINE void FigureDescriptor_SeriesDescriptor::set_shape_label(Arg_&& arg,
-                                                     Args_... args) {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  ;
-  _impl_.shape_label_.Set(static_cast<Arg_&&>(arg), args..., GetArena());
-  // @@protoc_insertion_point(field_set:io.deephaven.proto.backplane.script.grpc.FigureDescriptor.SeriesDescriptor.shape_label)
-}
-inline std::string* FigureDescriptor_SeriesDescriptor::mutable_shape_label() ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  std::string* _s = _internal_mutable_shape_label();
-  // @@protoc_insertion_point(field_mutable:io.deephaven.proto.backplane.script.grpc.FigureDescriptor.SeriesDescriptor.shape_label)
-  return _s;
-}
-inline const std::string& FigureDescriptor_SeriesDescriptor::_internal_shape_label() const {
-  PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race);
-  return _impl_.shape_label_.Get();
-}
-inline void FigureDescriptor_SeriesDescriptor::_internal_set_shape_label(const std::string& value) {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  ;
-  _impl_.shape_label_.Set(value, GetArena());
-}
-inline std::string* FigureDescriptor_SeriesDescriptor::_internal_mutable_shape_label() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  ;
-  return _impl_.shape_label_.Mutable( GetArena());
-}
-inline std::string* FigureDescriptor_SeriesDescriptor::release_shape_label() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  // @@protoc_insertion_point(field_release:io.deephaven.proto.backplane.script.grpc.FigureDescriptor.SeriesDescriptor.shape_label)
-  return _impl_.shape_label_.Release();
-}
-inline void FigureDescriptor_SeriesDescriptor::set_allocated_shape_label(std::string* value) {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  _impl_.shape_label_.SetAllocated(value, GetArena());
-  #ifdef PROTOBUF_FORCE_COPY_DEFAULT_STRING
-        if (_impl_.shape_label_.IsDefault()) {
-          _impl_.shape_label_.Set("", GetArena());
-        }
-  #endif  // PROTOBUF_FORCE_COPY_DEFAULT_STRING
-  // @@protoc_insertion_point(field_set_allocated:io.deephaven.proto.backplane.script.grpc.FigureDescriptor.SeriesDescriptor.shape_label)
-}
-
-// optional double shape_size = 12;
-inline bool FigureDescriptor_SeriesDescriptor::has_shape_size() const {
-  bool value = (_impl_._has_bits_[0] & 0x00000020u) != 0;
-  return value;
-}
-inline void FigureDescriptor_SeriesDescriptor::clear_shape_size() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  _impl_.shape_size_ = 0;
-  _impl_._has_bits_[0] &= ~0x00000020u;
-}
-inline double FigureDescriptor_SeriesDescriptor::shape_size() const {
-  // @@protoc_insertion_point(field_get:io.deephaven.proto.backplane.script.grpc.FigureDescriptor.SeriesDescriptor.shape_size)
-  return _internal_shape_size();
-}
-inline void FigureDescriptor_SeriesDescriptor::set_shape_size(double value) {
-  _internal_set_shape_size(value);
-  // @@protoc_insertion_point(field_set:io.deephaven.proto.backplane.script.grpc.FigureDescriptor.SeriesDescriptor.shape_size)
-}
-inline double FigureDescriptor_SeriesDescriptor::_internal_shape_size() const {
-  PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race);
-  return _impl_.shape_size_;
-}
-inline void FigureDescriptor_SeriesDescriptor::_internal_set_shape_size(double value) {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  _impl_._has_bits_[0] |= 0x00000020u;
-  _impl_.shape_size_ = value;
-}
-
-// string shape_color = 13;
-inline void FigureDescriptor_SeriesDescriptor::clear_shape_color() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  _impl_.shape_color_.ClearToEmpty();
-}
-inline const std::string& FigureDescriptor_SeriesDescriptor::shape_color() const
-    ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  // @@protoc_insertion_point(field_get:io.deephaven.proto.backplane.script.grpc.FigureDescriptor.SeriesDescriptor.shape_color)
-  return _internal_shape_color();
-}
-template <typename Arg_, typename... Args_>
-inline PROTOBUF_ALWAYS_INLINE void FigureDescriptor_SeriesDescriptor::set_shape_color(Arg_&& arg,
-                                                     Args_... args) {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  ;
-  _impl_.shape_color_.Set(static_cast<Arg_&&>(arg), args..., GetArena());
-  // @@protoc_insertion_point(field_set:io.deephaven.proto.backplane.script.grpc.FigureDescriptor.SeriesDescriptor.shape_color)
-}
-inline std::string* FigureDescriptor_SeriesDescriptor::mutable_shape_color() ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  std::string* _s = _internal_mutable_shape_color();
-  // @@protoc_insertion_point(field_mutable:io.deephaven.proto.backplane.script.grpc.FigureDescriptor.SeriesDescriptor.shape_color)
-  return _s;
-}
-inline const std::string& FigureDescriptor_SeriesDescriptor::_internal_shape_color() const {
-  PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race);
-  return _impl_.shape_color_.Get();
-}
-inline void FigureDescriptor_SeriesDescriptor::_internal_set_shape_color(const std::string& value) {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  ;
-  _impl_.shape_color_.Set(value, GetArena());
-}
-inline std::string* FigureDescriptor_SeriesDescriptor::_internal_mutable_shape_color() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  ;
-  return _impl_.shape_color_.Mutable( GetArena());
-}
-inline std::string* FigureDescriptor_SeriesDescriptor::release_shape_color() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  // @@protoc_insertion_point(field_release:io.deephaven.proto.backplane.script.grpc.FigureDescriptor.SeriesDescriptor.shape_color)
-  return _impl_.shape_color_.Release();
-}
-inline void FigureDescriptor_SeriesDescriptor::set_allocated_shape_color(std::string* value) {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  _impl_.shape_color_.SetAllocated(value, GetArena());
-  #ifdef PROTOBUF_FORCE_COPY_DEFAULT_STRING
-        if (_impl_.shape_color_.IsDefault()) {
-          _impl_.shape_color_.Set("", GetArena());
-        }
-  #endif  // PROTOBUF_FORCE_COPY_DEFAULT_STRING
-  // @@protoc_insertion_point(field_set_allocated:io.deephaven.proto.backplane.script.grpc.FigureDescriptor.SeriesDescriptor.shape_color)
-}
-
-// string shape = 14;
-inline void FigureDescriptor_SeriesDescriptor::clear_shape() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  _impl_.shape_.ClearToEmpty();
-}
-inline const std::string& FigureDescriptor_SeriesDescriptor::shape() const
-    ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  // @@protoc_insertion_point(field_get:io.deephaven.proto.backplane.script.grpc.FigureDescriptor.SeriesDescriptor.shape)
-  return _internal_shape();
-}
-template <typename Arg_, typename... Args_>
-inline PROTOBUF_ALWAYS_INLINE void FigureDescriptor_SeriesDescriptor::set_shape(Arg_&& arg,
-                                                     Args_... args) {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  ;
-  _impl_.shape_.Set(static_cast<Arg_&&>(arg), args..., GetArena());
-  // @@protoc_insertion_point(field_set:io.deephaven.proto.backplane.script.grpc.FigureDescriptor.SeriesDescriptor.shape)
-}
-inline std::string* FigureDescriptor_SeriesDescriptor::mutable_shape() ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  std::string* _s = _internal_mutable_shape();
-  // @@protoc_insertion_point(field_mutable:io.deephaven.proto.backplane.script.grpc.FigureDescriptor.SeriesDescriptor.shape)
-  return _s;
-}
-inline const std::string& FigureDescriptor_SeriesDescriptor::_internal_shape() const {
-  PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race);
-  return _impl_.shape_.Get();
-}
-inline void FigureDescriptor_SeriesDescriptor::_internal_set_shape(const std::string& value) {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  ;
-  _impl_.shape_.Set(value, GetArena());
-}
-inline std::string* FigureDescriptor_SeriesDescriptor::_internal_mutable_shape() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  ;
-  return _impl_.shape_.Mutable( GetArena());
-}
-inline std::string* FigureDescriptor_SeriesDescriptor::release_shape() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  // @@protoc_insertion_point(field_release:io.deephaven.proto.backplane.script.grpc.FigureDescriptor.SeriesDescriptor.shape)
-  return _impl_.shape_.Release();
-}
-inline void FigureDescriptor_SeriesDescriptor::set_allocated_shape(std::string* value) {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  _impl_.shape_.SetAllocated(value, GetArena());
-  #ifdef PROTOBUF_FORCE_COPY_DEFAULT_STRING
-        if (_impl_.shape_.IsDefault()) {
-          _impl_.shape_.Set("", GetArena());
-        }
-  #endif  // PROTOBUF_FORCE_COPY_DEFAULT_STRING
-  // @@protoc_insertion_point(field_set_allocated:io.deephaven.proto.backplane.script.grpc.FigureDescriptor.SeriesDescriptor.shape)
-}
-
-// repeated .io.deephaven.proto.backplane.script.grpc.FigureDescriptor.SourceDescriptor data_sources = 15;
-inline int FigureDescriptor_SeriesDescriptor::_internal_data_sources_size() const {
-  return _internal_data_sources().size();
-}
-inline int FigureDescriptor_SeriesDescriptor::data_sources_size() const {
-  return _internal_data_sources_size();
-}
-inline void FigureDescriptor_SeriesDescriptor::clear_data_sources() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  _impl_.data_sources_.Clear();
-}
-inline ::io::deephaven::proto::backplane::script::grpc::FigureDescriptor_SourceDescriptor* FigureDescriptor_SeriesDescriptor::mutable_data_sources(int index)
-    ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  // @@protoc_insertion_point(field_mutable:io.deephaven.proto.backplane.script.grpc.FigureDescriptor.SeriesDescriptor.data_sources)
-  return _internal_mutable_data_sources()->Mutable(index);
-}
-inline ::google::protobuf::RepeatedPtrField<::io::deephaven::proto::backplane::script::grpc::FigureDescriptor_SourceDescriptor>* FigureDescriptor_SeriesDescriptor::mutable_data_sources()
-    ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  // @@protoc_insertion_point(field_mutable_list:io.deephaven.proto.backplane.script.grpc.FigureDescriptor.SeriesDescriptor.data_sources)
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  return _internal_mutable_data_sources();
-}
-inline const ::io::deephaven::proto::backplane::script::grpc::FigureDescriptor_SourceDescriptor& FigureDescriptor_SeriesDescriptor::data_sources(int index) const
-    ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  // @@protoc_insertion_point(field_get:io.deephaven.proto.backplane.script.grpc.FigureDescriptor.SeriesDescriptor.data_sources)
-  return _internal_data_sources().Get(index);
-}
-inline ::io::deephaven::proto::backplane::script::grpc::FigureDescriptor_SourceDescriptor* FigureDescriptor_SeriesDescriptor::add_data_sources() ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  ::io::deephaven::proto::backplane::script::grpc::FigureDescriptor_SourceDescriptor* _add = _internal_mutable_data_sources()->Add();
-  // @@protoc_insertion_point(field_add:io.deephaven.proto.backplane.script.grpc.FigureDescriptor.SeriesDescriptor.data_sources)
-  return _add;
-}
-inline const ::google::protobuf::RepeatedPtrField<::io::deephaven::proto::backplane::script::grpc::FigureDescriptor_SourceDescriptor>& FigureDescriptor_SeriesDescriptor::data_sources() const
-    ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  // @@protoc_insertion_point(field_list:io.deephaven.proto.backplane.script.grpc.FigureDescriptor.SeriesDescriptor.data_sources)
-  return _internal_data_sources();
-}
-inline const ::google::protobuf::RepeatedPtrField<::io::deephaven::proto::backplane::script::grpc::FigureDescriptor_SourceDescriptor>&
-FigureDescriptor_SeriesDescriptor::_internal_data_sources() const {
-  PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race);
-  return _impl_.data_sources_;
-}
-inline ::google::protobuf::RepeatedPtrField<::io::deephaven::proto::backplane::script::grpc::FigureDescriptor_SourceDescriptor>*
-FigureDescriptor_SeriesDescriptor::_internal_mutable_data_sources() {
-  PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race);
-  return &_impl_.data_sources_;
-}
-
-// -------------------------------------------------------------------
-
-// FigureDescriptor_MultiSeriesDescriptor
-
-// .io.deephaven.proto.backplane.script.grpc.FigureDescriptor.SeriesPlotStyle plot_style = 1;
-inline void FigureDescriptor_MultiSeriesDescriptor::clear_plot_style() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  _impl_.plot_style_ = 0;
-}
-inline ::io::deephaven::proto::backplane::script::grpc::FigureDescriptor_SeriesPlotStyle FigureDescriptor_MultiSeriesDescriptor::plot_style() const {
-  // @@protoc_insertion_point(field_get:io.deephaven.proto.backplane.script.grpc.FigureDescriptor.MultiSeriesDescriptor.plot_style)
-  return _internal_plot_style();
-}
-inline void FigureDescriptor_MultiSeriesDescriptor::set_plot_style(::io::deephaven::proto::backplane::script::grpc::FigureDescriptor_SeriesPlotStyle value) {
-  _internal_set_plot_style(value);
-  // @@protoc_insertion_point(field_set:io.deephaven.proto.backplane.script.grpc.FigureDescriptor.MultiSeriesDescriptor.plot_style)
-}
-inline ::io::deephaven::proto::backplane::script::grpc::FigureDescriptor_SeriesPlotStyle FigureDescriptor_MultiSeriesDescriptor::_internal_plot_style() const {
-  PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race);
-  return static_cast<::io::deephaven::proto::backplane::script::grpc::FigureDescriptor_SeriesPlotStyle>(_impl_.plot_style_);
-}
-inline void FigureDescriptor_MultiSeriesDescriptor::_internal_set_plot_style(::io::deephaven::proto::backplane::script::grpc::FigureDescriptor_SeriesPlotStyle value) {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  ;
-  _impl_.plot_style_ = value;
-}
-
-// string name = 2;
-inline void FigureDescriptor_MultiSeriesDescriptor::clear_name() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  _impl_.name_.ClearToEmpty();
-}
-inline const std::string& FigureDescriptor_MultiSeriesDescriptor::name() const
-    ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  // @@protoc_insertion_point(field_get:io.deephaven.proto.backplane.script.grpc.FigureDescriptor.MultiSeriesDescriptor.name)
-  return _internal_name();
-}
-template <typename Arg_, typename... Args_>
-inline PROTOBUF_ALWAYS_INLINE void FigureDescriptor_MultiSeriesDescriptor::set_name(Arg_&& arg,
-                                                     Args_... args) {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  ;
-  _impl_.name_.Set(static_cast<Arg_&&>(arg), args..., GetArena());
-  // @@protoc_insertion_point(field_set:io.deephaven.proto.backplane.script.grpc.FigureDescriptor.MultiSeriesDescriptor.name)
-}
-inline std::string* FigureDescriptor_MultiSeriesDescriptor::mutable_name() ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  std::string* _s = _internal_mutable_name();
-  // @@protoc_insertion_point(field_mutable:io.deephaven.proto.backplane.script.grpc.FigureDescriptor.MultiSeriesDescriptor.name)
-  return _s;
-}
-inline const std::string& FigureDescriptor_MultiSeriesDescriptor::_internal_name() const {
-  PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race);
-  return _impl_.name_.Get();
-}
-inline void FigureDescriptor_MultiSeriesDescriptor::_internal_set_name(const std::string& value) {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  ;
-  _impl_.name_.Set(value, GetArena());
-}
-inline std::string* FigureDescriptor_MultiSeriesDescriptor::_internal_mutable_name() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  ;
-  return _impl_.name_.Mutable( GetArena());
-}
-inline std::string* FigureDescriptor_MultiSeriesDescriptor::release_name() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  // @@protoc_insertion_point(field_release:io.deephaven.proto.backplane.script.grpc.FigureDescriptor.MultiSeriesDescriptor.name)
-  return _impl_.name_.Release();
-}
-inline void FigureDescriptor_MultiSeriesDescriptor::set_allocated_name(std::string* value) {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  _impl_.name_.SetAllocated(value, GetArena());
-  #ifdef PROTOBUF_FORCE_COPY_DEFAULT_STRING
-        if (_impl_.name_.IsDefault()) {
-          _impl_.name_.Set("", GetArena());
-        }
-  #endif  // PROTOBUF_FORCE_COPY_DEFAULT_STRING
-  // @@protoc_insertion_point(field_set_allocated:io.deephaven.proto.backplane.script.grpc.FigureDescriptor.MultiSeriesDescriptor.name)
-}
-
-// .io.deephaven.proto.backplane.script.grpc.FigureDescriptor.StringMapWithDefault line_color = 3;
-inline bool FigureDescriptor_MultiSeriesDescriptor::has_line_color() const {
-  bool value = (_impl_._has_bits_[0] & 0x00000001u) != 0;
-  PROTOBUF_ASSUME(!value || _impl_.line_color_ != nullptr);
-  return value;
-}
-inline void FigureDescriptor_MultiSeriesDescriptor::clear_line_color() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  if (_impl_.line_color_ != nullptr) _impl_.line_color_->Clear();
-  _impl_._has_bits_[0] &= ~0x00000001u;
-}
-inline const ::io::deephaven::proto::backplane::script::grpc::FigureDescriptor_StringMapWithDefault& FigureDescriptor_MultiSeriesDescriptor::_internal_line_color() const {
-  PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race);
-  const ::io::deephaven::proto::backplane::script::grpc::FigureDescriptor_StringMapWithDefault* p = _impl_.line_color_;
-  return p != nullptr ? *p : reinterpret_cast<const ::io::deephaven::proto::backplane::script::grpc::FigureDescriptor_StringMapWithDefault&>(::io::deephaven::proto::backplane::script::grpc::_FigureDescriptor_StringMapWithDefault_default_instance_);
-}
-inline const ::io::deephaven::proto::backplane::script::grpc::FigureDescriptor_StringMapWithDefault& FigureDescriptor_MultiSeriesDescriptor::line_color() const ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  // @@protoc_insertion_point(field_get:io.deephaven.proto.backplane.script.grpc.FigureDescriptor.MultiSeriesDescriptor.line_color)
-  return _internal_line_color();
-}
-inline void FigureDescriptor_MultiSeriesDescriptor::unsafe_arena_set_allocated_line_color(::io::deephaven::proto::backplane::script::grpc::FigureDescriptor_StringMapWithDefault* value) {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  if (GetArena() == nullptr) {
-    delete reinterpret_cast<::google::protobuf::MessageLite*>(_impl_.line_color_);
-  }
-  _impl_.line_color_ = reinterpret_cast<::io::deephaven::proto::backplane::script::grpc::FigureDescriptor_StringMapWithDefault*>(value);
-  if (value != nullptr) {
-    _impl_._has_bits_[0] |= 0x00000001u;
-  } else {
-    _impl_._has_bits_[0] &= ~0x00000001u;
-  }
-  // @@protoc_insertion_point(field_unsafe_arena_set_allocated:io.deephaven.proto.backplane.script.grpc.FigureDescriptor.MultiSeriesDescriptor.line_color)
-}
-inline ::io::deephaven::proto::backplane::script::grpc::FigureDescriptor_StringMapWithDefault* FigureDescriptor_MultiSeriesDescriptor::release_line_color() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-
-  _impl_._has_bits_[0] &= ~0x00000001u;
-  ::io::deephaven::proto::backplane::script::grpc::FigureDescriptor_StringMapWithDefault* released = _impl_.line_color_;
-  _impl_.line_color_ = nullptr;
-#ifdef PROTOBUF_FORCE_COPY_IN_RELEASE
-  auto* old = reinterpret_cast<::google::protobuf::MessageLite*>(released);
-  released = ::google::protobuf::internal::DuplicateIfNonNull(released);
-  if (GetArena() == nullptr) {
-    delete old;
-  }
-#else   // PROTOBUF_FORCE_COPY_IN_RELEASE
-  if (GetArena() != nullptr) {
-    released = ::google::protobuf::internal::DuplicateIfNonNull(released);
-  }
-#endif  // !PROTOBUF_FORCE_COPY_IN_RELEASE
-  return released;
-}
-inline ::io::deephaven::proto::backplane::script::grpc::FigureDescriptor_StringMapWithDefault* FigureDescriptor_MultiSeriesDescriptor::unsafe_arena_release_line_color() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  // @@protoc_insertion_point(field_release:io.deephaven.proto.backplane.script.grpc.FigureDescriptor.MultiSeriesDescriptor.line_color)
-
-  _impl_._has_bits_[0] &= ~0x00000001u;
-  ::io::deephaven::proto::backplane::script::grpc::FigureDescriptor_StringMapWithDefault* temp = _impl_.line_color_;
-  _impl_.line_color_ = nullptr;
-  return temp;
-}
-inline ::io::deephaven::proto::backplane::script::grpc::FigureDescriptor_StringMapWithDefault* FigureDescriptor_MultiSeriesDescriptor::_internal_mutable_line_color() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  _impl_._has_bits_[0] |= 0x00000001u;
-  if (_impl_.line_color_ == nullptr) {
-    auto* p = CreateMaybeMessage<::io::deephaven::proto::backplane::script::grpc::FigureDescriptor_StringMapWithDefault>(GetArena());
-    _impl_.line_color_ = reinterpret_cast<::io::deephaven::proto::backplane::script::grpc::FigureDescriptor_StringMapWithDefault*>(p);
-  }
-  return _impl_.line_color_;
-}
-inline ::io::deephaven::proto::backplane::script::grpc::FigureDescriptor_StringMapWithDefault* FigureDescriptor_MultiSeriesDescriptor::mutable_line_color() ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  ::io::deephaven::proto::backplane::script::grpc::FigureDescriptor_StringMapWithDefault* _msg = _internal_mutable_line_color();
-  // @@protoc_insertion_point(field_mutable:io.deephaven.proto.backplane.script.grpc.FigureDescriptor.MultiSeriesDescriptor.line_color)
-  return _msg;
-}
-inline void FigureDescriptor_MultiSeriesDescriptor::set_allocated_line_color(::io::deephaven::proto::backplane::script::grpc::FigureDescriptor_StringMapWithDefault* value) {
-  ::google::protobuf::Arena* message_arena = GetArena();
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  if (message_arena == nullptr) {
-    delete reinterpret_cast<::io::deephaven::proto::backplane::script::grpc::FigureDescriptor_StringMapWithDefault*>(_impl_.line_color_);
-  }
-
-  if (value != nullptr) {
-    ::google::protobuf::Arena* submessage_arena = reinterpret_cast<::io::deephaven::proto::backplane::script::grpc::FigureDescriptor_StringMapWithDefault*>(value)->GetArena();
-    if (message_arena != submessage_arena) {
-      value = ::google::protobuf::internal::GetOwnedMessage(message_arena, value, submessage_arena);
-    }
-    _impl_._has_bits_[0] |= 0x00000001u;
-  } else {
-    _impl_._has_bits_[0] &= ~0x00000001u;
-  }
-
-  _impl_.line_color_ = reinterpret_cast<::io::deephaven::proto::backplane::script::grpc::FigureDescriptor_StringMapWithDefault*>(value);
-  // @@protoc_insertion_point(field_set_allocated:io.deephaven.proto.backplane.script.grpc.FigureDescriptor.MultiSeriesDescriptor.line_color)
-}
-
-// .io.deephaven.proto.backplane.script.grpc.FigureDescriptor.StringMapWithDefault point_color = 4;
-inline bool FigureDescriptor_MultiSeriesDescriptor::has_point_color() const {
-  bool value = (_impl_._has_bits_[0] & 0x00000002u) != 0;
-  PROTOBUF_ASSUME(!value || _impl_.point_color_ != nullptr);
-  return value;
-}
-inline void FigureDescriptor_MultiSeriesDescriptor::clear_point_color() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  if (_impl_.point_color_ != nullptr) _impl_.point_color_->Clear();
-  _impl_._has_bits_[0] &= ~0x00000002u;
-}
-inline const ::io::deephaven::proto::backplane::script::grpc::FigureDescriptor_StringMapWithDefault& FigureDescriptor_MultiSeriesDescriptor::_internal_point_color() const {
-  PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race);
-  const ::io::deephaven::proto::backplane::script::grpc::FigureDescriptor_StringMapWithDefault* p = _impl_.point_color_;
-  return p != nullptr ? *p : reinterpret_cast<const ::io::deephaven::proto::backplane::script::grpc::FigureDescriptor_StringMapWithDefault&>(::io::deephaven::proto::backplane::script::grpc::_FigureDescriptor_StringMapWithDefault_default_instance_);
-}
-inline const ::io::deephaven::proto::backplane::script::grpc::FigureDescriptor_StringMapWithDefault& FigureDescriptor_MultiSeriesDescriptor::point_color() const ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  // @@protoc_insertion_point(field_get:io.deephaven.proto.backplane.script.grpc.FigureDescriptor.MultiSeriesDescriptor.point_color)
-  return _internal_point_color();
-}
-inline void FigureDescriptor_MultiSeriesDescriptor::unsafe_arena_set_allocated_point_color(::io::deephaven::proto::backplane::script::grpc::FigureDescriptor_StringMapWithDefault* value) {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  if (GetArena() == nullptr) {
-    delete reinterpret_cast<::google::protobuf::MessageLite*>(_impl_.point_color_);
-  }
-  _impl_.point_color_ = reinterpret_cast<::io::deephaven::proto::backplane::script::grpc::FigureDescriptor_StringMapWithDefault*>(value);
-  if (value != nullptr) {
-    _impl_._has_bits_[0] |= 0x00000002u;
-  } else {
-    _impl_._has_bits_[0] &= ~0x00000002u;
-  }
-  // @@protoc_insertion_point(field_unsafe_arena_set_allocated:io.deephaven.proto.backplane.script.grpc.FigureDescriptor.MultiSeriesDescriptor.point_color)
-}
-inline ::io::deephaven::proto::backplane::script::grpc::FigureDescriptor_StringMapWithDefault* FigureDescriptor_MultiSeriesDescriptor::release_point_color() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-
-  _impl_._has_bits_[0] &= ~0x00000002u;
-  ::io::deephaven::proto::backplane::script::grpc::FigureDescriptor_StringMapWithDefault* released = _impl_.point_color_;
-  _impl_.point_color_ = nullptr;
-#ifdef PROTOBUF_FORCE_COPY_IN_RELEASE
-  auto* old = reinterpret_cast<::google::protobuf::MessageLite*>(released);
-  released = ::google::protobuf::internal::DuplicateIfNonNull(released);
-  if (GetArena() == nullptr) {
-    delete old;
-  }
-#else   // PROTOBUF_FORCE_COPY_IN_RELEASE
-  if (GetArena() != nullptr) {
-    released = ::google::protobuf::internal::DuplicateIfNonNull(released);
-  }
-#endif  // !PROTOBUF_FORCE_COPY_IN_RELEASE
-  return released;
-}
-inline ::io::deephaven::proto::backplane::script::grpc::FigureDescriptor_StringMapWithDefault* FigureDescriptor_MultiSeriesDescriptor::unsafe_arena_release_point_color() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  // @@protoc_insertion_point(field_release:io.deephaven.proto.backplane.script.grpc.FigureDescriptor.MultiSeriesDescriptor.point_color)
-
-  _impl_._has_bits_[0] &= ~0x00000002u;
-  ::io::deephaven::proto::backplane::script::grpc::FigureDescriptor_StringMapWithDefault* temp = _impl_.point_color_;
-  _impl_.point_color_ = nullptr;
-  return temp;
-}
-inline ::io::deephaven::proto::backplane::script::grpc::FigureDescriptor_StringMapWithDefault* FigureDescriptor_MultiSeriesDescriptor::_internal_mutable_point_color() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  _impl_._has_bits_[0] |= 0x00000002u;
-  if (_impl_.point_color_ == nullptr) {
-    auto* p = CreateMaybeMessage<::io::deephaven::proto::backplane::script::grpc::FigureDescriptor_StringMapWithDefault>(GetArena());
-    _impl_.point_color_ = reinterpret_cast<::io::deephaven::proto::backplane::script::grpc::FigureDescriptor_StringMapWithDefault*>(p);
-  }
-  return _impl_.point_color_;
-}
-inline ::io::deephaven::proto::backplane::script::grpc::FigureDescriptor_StringMapWithDefault* FigureDescriptor_MultiSeriesDescriptor::mutable_point_color() ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  ::io::deephaven::proto::backplane::script::grpc::FigureDescriptor_StringMapWithDefault* _msg = _internal_mutable_point_color();
-  // @@protoc_insertion_point(field_mutable:io.deephaven.proto.backplane.script.grpc.FigureDescriptor.MultiSeriesDescriptor.point_color)
-  return _msg;
-}
-inline void FigureDescriptor_MultiSeriesDescriptor::set_allocated_point_color(::io::deephaven::proto::backplane::script::grpc::FigureDescriptor_StringMapWithDefault* value) {
-  ::google::protobuf::Arena* message_arena = GetArena();
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  if (message_arena == nullptr) {
-    delete reinterpret_cast<::io::deephaven::proto::backplane::script::grpc::FigureDescriptor_StringMapWithDefault*>(_impl_.point_color_);
-  }
-
-  if (value != nullptr) {
-    ::google::protobuf::Arena* submessage_arena = reinterpret_cast<::io::deephaven::proto::backplane::script::grpc::FigureDescriptor_StringMapWithDefault*>(value)->GetArena();
-    if (message_arena != submessage_arena) {
-      value = ::google::protobuf::internal::GetOwnedMessage(message_arena, value, submessage_arena);
-    }
-    _impl_._has_bits_[0] |= 0x00000002u;
-  } else {
-    _impl_._has_bits_[0] &= ~0x00000002u;
-  }
-
-  _impl_.point_color_ = reinterpret_cast<::io::deephaven::proto::backplane::script::grpc::FigureDescriptor_StringMapWithDefault*>(value);
-  // @@protoc_insertion_point(field_set_allocated:io.deephaven.proto.backplane.script.grpc.FigureDescriptor.MultiSeriesDescriptor.point_color)
-}
-
-// .io.deephaven.proto.backplane.script.grpc.FigureDescriptor.BoolMapWithDefault lines_visible = 5;
-inline bool FigureDescriptor_MultiSeriesDescriptor::has_lines_visible() const {
-  bool value = (_impl_._has_bits_[0] & 0x00000004u) != 0;
-  PROTOBUF_ASSUME(!value || _impl_.lines_visible_ != nullptr);
-  return value;
-}
-inline void FigureDescriptor_MultiSeriesDescriptor::clear_lines_visible() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  if (_impl_.lines_visible_ != nullptr) _impl_.lines_visible_->Clear();
-  _impl_._has_bits_[0] &= ~0x00000004u;
-}
-inline const ::io::deephaven::proto::backplane::script::grpc::FigureDescriptor_BoolMapWithDefault& FigureDescriptor_MultiSeriesDescriptor::_internal_lines_visible() const {
-  PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race);
-  const ::io::deephaven::proto::backplane::script::grpc::FigureDescriptor_BoolMapWithDefault* p = _impl_.lines_visible_;
-  return p != nullptr ? *p : reinterpret_cast<const ::io::deephaven::proto::backplane::script::grpc::FigureDescriptor_BoolMapWithDefault&>(::io::deephaven::proto::backplane::script::grpc::_FigureDescriptor_BoolMapWithDefault_default_instance_);
-}
-inline const ::io::deephaven::proto::backplane::script::grpc::FigureDescriptor_BoolMapWithDefault& FigureDescriptor_MultiSeriesDescriptor::lines_visible() const ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  // @@protoc_insertion_point(field_get:io.deephaven.proto.backplane.script.grpc.FigureDescriptor.MultiSeriesDescriptor.lines_visible)
-  return _internal_lines_visible();
-}
-inline void FigureDescriptor_MultiSeriesDescriptor::unsafe_arena_set_allocated_lines_visible(::io::deephaven::proto::backplane::script::grpc::FigureDescriptor_BoolMapWithDefault* value) {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  if (GetArena() == nullptr) {
-    delete reinterpret_cast<::google::protobuf::MessageLite*>(_impl_.lines_visible_);
-  }
-  _impl_.lines_visible_ = reinterpret_cast<::io::deephaven::proto::backplane::script::grpc::FigureDescriptor_BoolMapWithDefault*>(value);
-  if (value != nullptr) {
-    _impl_._has_bits_[0] |= 0x00000004u;
-  } else {
-    _impl_._has_bits_[0] &= ~0x00000004u;
-  }
-  // @@protoc_insertion_point(field_unsafe_arena_set_allocated:io.deephaven.proto.backplane.script.grpc.FigureDescriptor.MultiSeriesDescriptor.lines_visible)
-}
-inline ::io::deephaven::proto::backplane::script::grpc::FigureDescriptor_BoolMapWithDefault* FigureDescriptor_MultiSeriesDescriptor::release_lines_visible() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-
-  _impl_._has_bits_[0] &= ~0x00000004u;
-  ::io::deephaven::proto::backplane::script::grpc::FigureDescriptor_BoolMapWithDefault* released = _impl_.lines_visible_;
-  _impl_.lines_visible_ = nullptr;
-#ifdef PROTOBUF_FORCE_COPY_IN_RELEASE
-  auto* old = reinterpret_cast<::google::protobuf::MessageLite*>(released);
-  released = ::google::protobuf::internal::DuplicateIfNonNull(released);
-  if (GetArena() == nullptr) {
-    delete old;
-  }
-#else   // PROTOBUF_FORCE_COPY_IN_RELEASE
-  if (GetArena() != nullptr) {
-    released = ::google::protobuf::internal::DuplicateIfNonNull(released);
-  }
-#endif  // !PROTOBUF_FORCE_COPY_IN_RELEASE
-  return released;
-}
-inline ::io::deephaven::proto::backplane::script::grpc::FigureDescriptor_BoolMapWithDefault* FigureDescriptor_MultiSeriesDescriptor::unsafe_arena_release_lines_visible() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  // @@protoc_insertion_point(field_release:io.deephaven.proto.backplane.script.grpc.FigureDescriptor.MultiSeriesDescriptor.lines_visible)
-
-  _impl_._has_bits_[0] &= ~0x00000004u;
-  ::io::deephaven::proto::backplane::script::grpc::FigureDescriptor_BoolMapWithDefault* temp = _impl_.lines_visible_;
-  _impl_.lines_visible_ = nullptr;
-  return temp;
-}
-inline ::io::deephaven::proto::backplane::script::grpc::FigureDescriptor_BoolMapWithDefault* FigureDescriptor_MultiSeriesDescriptor::_internal_mutable_lines_visible() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  _impl_._has_bits_[0] |= 0x00000004u;
-  if (_impl_.lines_visible_ == nullptr) {
-    auto* p = CreateMaybeMessage<::io::deephaven::proto::backplane::script::grpc::FigureDescriptor_BoolMapWithDefault>(GetArena());
-    _impl_.lines_visible_ = reinterpret_cast<::io::deephaven::proto::backplane::script::grpc::FigureDescriptor_BoolMapWithDefault*>(p);
-  }
-  return _impl_.lines_visible_;
-}
-inline ::io::deephaven::proto::backplane::script::grpc::FigureDescriptor_BoolMapWithDefault* FigureDescriptor_MultiSeriesDescriptor::mutable_lines_visible() ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  ::io::deephaven::proto::backplane::script::grpc::FigureDescriptor_BoolMapWithDefault* _msg = _internal_mutable_lines_visible();
-  // @@protoc_insertion_point(field_mutable:io.deephaven.proto.backplane.script.grpc.FigureDescriptor.MultiSeriesDescriptor.lines_visible)
-  return _msg;
-}
-inline void FigureDescriptor_MultiSeriesDescriptor::set_allocated_lines_visible(::io::deephaven::proto::backplane::script::grpc::FigureDescriptor_BoolMapWithDefault* value) {
-  ::google::protobuf::Arena* message_arena = GetArena();
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  if (message_arena == nullptr) {
-    delete reinterpret_cast<::io::deephaven::proto::backplane::script::grpc::FigureDescriptor_BoolMapWithDefault*>(_impl_.lines_visible_);
-  }
-
-  if (value != nullptr) {
-    ::google::protobuf::Arena* submessage_arena = reinterpret_cast<::io::deephaven::proto::backplane::script::grpc::FigureDescriptor_BoolMapWithDefault*>(value)->GetArena();
-    if (message_arena != submessage_arena) {
-      value = ::google::protobuf::internal::GetOwnedMessage(message_arena, value, submessage_arena);
-    }
-    _impl_._has_bits_[0] |= 0x00000004u;
-  } else {
-    _impl_._has_bits_[0] &= ~0x00000004u;
-  }
-
-  _impl_.lines_visible_ = reinterpret_cast<::io::deephaven::proto::backplane::script::grpc::FigureDescriptor_BoolMapWithDefault*>(value);
-  // @@protoc_insertion_point(field_set_allocated:io.deephaven.proto.backplane.script.grpc.FigureDescriptor.MultiSeriesDescriptor.lines_visible)
-}
-
-// .io.deephaven.proto.backplane.script.grpc.FigureDescriptor.BoolMapWithDefault points_visible = 6;
-inline bool FigureDescriptor_MultiSeriesDescriptor::has_points_visible() const {
-  bool value = (_impl_._has_bits_[0] & 0x00000008u) != 0;
-  PROTOBUF_ASSUME(!value || _impl_.points_visible_ != nullptr);
-  return value;
-}
-inline void FigureDescriptor_MultiSeriesDescriptor::clear_points_visible() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  if (_impl_.points_visible_ != nullptr) _impl_.points_visible_->Clear();
-  _impl_._has_bits_[0] &= ~0x00000008u;
-}
-inline const ::io::deephaven::proto::backplane::script::grpc::FigureDescriptor_BoolMapWithDefault& FigureDescriptor_MultiSeriesDescriptor::_internal_points_visible() const {
-  PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race);
-  const ::io::deephaven::proto::backplane::script::grpc::FigureDescriptor_BoolMapWithDefault* p = _impl_.points_visible_;
-  return p != nullptr ? *p : reinterpret_cast<const ::io::deephaven::proto::backplane::script::grpc::FigureDescriptor_BoolMapWithDefault&>(::io::deephaven::proto::backplane::script::grpc::_FigureDescriptor_BoolMapWithDefault_default_instance_);
-}
-inline const ::io::deephaven::proto::backplane::script::grpc::FigureDescriptor_BoolMapWithDefault& FigureDescriptor_MultiSeriesDescriptor::points_visible() const ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  // @@protoc_insertion_point(field_get:io.deephaven.proto.backplane.script.grpc.FigureDescriptor.MultiSeriesDescriptor.points_visible)
-  return _internal_points_visible();
-}
-inline void FigureDescriptor_MultiSeriesDescriptor::unsafe_arena_set_allocated_points_visible(::io::deephaven::proto::backplane::script::grpc::FigureDescriptor_BoolMapWithDefault* value) {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  if (GetArena() == nullptr) {
-    delete reinterpret_cast<::google::protobuf::MessageLite*>(_impl_.points_visible_);
-  }
-  _impl_.points_visible_ = reinterpret_cast<::io::deephaven::proto::backplane::script::grpc::FigureDescriptor_BoolMapWithDefault*>(value);
-  if (value != nullptr) {
-    _impl_._has_bits_[0] |= 0x00000008u;
-  } else {
-    _impl_._has_bits_[0] &= ~0x00000008u;
-  }
-  // @@protoc_insertion_point(field_unsafe_arena_set_allocated:io.deephaven.proto.backplane.script.grpc.FigureDescriptor.MultiSeriesDescriptor.points_visible)
-}
-inline ::io::deephaven::proto::backplane::script::grpc::FigureDescriptor_BoolMapWithDefault* FigureDescriptor_MultiSeriesDescriptor::release_points_visible() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-
-  _impl_._has_bits_[0] &= ~0x00000008u;
-  ::io::deephaven::proto::backplane::script::grpc::FigureDescriptor_BoolMapWithDefault* released = _impl_.points_visible_;
-  _impl_.points_visible_ = nullptr;
-#ifdef PROTOBUF_FORCE_COPY_IN_RELEASE
-  auto* old = reinterpret_cast<::google::protobuf::MessageLite*>(released);
-  released = ::google::protobuf::internal::DuplicateIfNonNull(released);
-  if (GetArena() == nullptr) {
-    delete old;
-  }
-#else   // PROTOBUF_FORCE_COPY_IN_RELEASE
-  if (GetArena() != nullptr) {
-    released = ::google::protobuf::internal::DuplicateIfNonNull(released);
-  }
-#endif  // !PROTOBUF_FORCE_COPY_IN_RELEASE
-  return released;
-}
-inline ::io::deephaven::proto::backplane::script::grpc::FigureDescriptor_BoolMapWithDefault* FigureDescriptor_MultiSeriesDescriptor::unsafe_arena_release_points_visible() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  // @@protoc_insertion_point(field_release:io.deephaven.proto.backplane.script.grpc.FigureDescriptor.MultiSeriesDescriptor.points_visible)
-
-  _impl_._has_bits_[0] &= ~0x00000008u;
-  ::io::deephaven::proto::backplane::script::grpc::FigureDescriptor_BoolMapWithDefault* temp = _impl_.points_visible_;
-  _impl_.points_visible_ = nullptr;
-  return temp;
-}
-inline ::io::deephaven::proto::backplane::script::grpc::FigureDescriptor_BoolMapWithDefault* FigureDescriptor_MultiSeriesDescriptor::_internal_mutable_points_visible() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  _impl_._has_bits_[0] |= 0x00000008u;
-  if (_impl_.points_visible_ == nullptr) {
-    auto* p = CreateMaybeMessage<::io::deephaven::proto::backplane::script::grpc::FigureDescriptor_BoolMapWithDefault>(GetArena());
-    _impl_.points_visible_ = reinterpret_cast<::io::deephaven::proto::backplane::script::grpc::FigureDescriptor_BoolMapWithDefault*>(p);
-  }
-  return _impl_.points_visible_;
-}
-inline ::io::deephaven::proto::backplane::script::grpc::FigureDescriptor_BoolMapWithDefault* FigureDescriptor_MultiSeriesDescriptor::mutable_points_visible() ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  ::io::deephaven::proto::backplane::script::grpc::FigureDescriptor_BoolMapWithDefault* _msg = _internal_mutable_points_visible();
-  // @@protoc_insertion_point(field_mutable:io.deephaven.proto.backplane.script.grpc.FigureDescriptor.MultiSeriesDescriptor.points_visible)
-  return _msg;
-}
-inline void FigureDescriptor_MultiSeriesDescriptor::set_allocated_points_visible(::io::deephaven::proto::backplane::script::grpc::FigureDescriptor_BoolMapWithDefault* value) {
-  ::google::protobuf::Arena* message_arena = GetArena();
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  if (message_arena == nullptr) {
-    delete reinterpret_cast<::io::deephaven::proto::backplane::script::grpc::FigureDescriptor_BoolMapWithDefault*>(_impl_.points_visible_);
-  }
-
-  if (value != nullptr) {
-    ::google::protobuf::Arena* submessage_arena = reinterpret_cast<::io::deephaven::proto::backplane::script::grpc::FigureDescriptor_BoolMapWithDefault*>(value)->GetArena();
-    if (message_arena != submessage_arena) {
-      value = ::google::protobuf::internal::GetOwnedMessage(message_arena, value, submessage_arena);
-    }
-    _impl_._has_bits_[0] |= 0x00000008u;
-  } else {
-    _impl_._has_bits_[0] &= ~0x00000008u;
-  }
-
-  _impl_.points_visible_ = reinterpret_cast<::io::deephaven::proto::backplane::script::grpc::FigureDescriptor_BoolMapWithDefault*>(value);
-  // @@protoc_insertion_point(field_set_allocated:io.deephaven.proto.backplane.script.grpc.FigureDescriptor.MultiSeriesDescriptor.points_visible)
-}
-
-// .io.deephaven.proto.backplane.script.grpc.FigureDescriptor.BoolMapWithDefault gradient_visible = 7;
-inline bool FigureDescriptor_MultiSeriesDescriptor::has_gradient_visible() const {
-  bool value = (_impl_._has_bits_[0] & 0x00000010u) != 0;
-  PROTOBUF_ASSUME(!value || _impl_.gradient_visible_ != nullptr);
-  return value;
-}
-inline void FigureDescriptor_MultiSeriesDescriptor::clear_gradient_visible() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  if (_impl_.gradient_visible_ != nullptr) _impl_.gradient_visible_->Clear();
-  _impl_._has_bits_[0] &= ~0x00000010u;
-}
-inline const ::io::deephaven::proto::backplane::script::grpc::FigureDescriptor_BoolMapWithDefault& FigureDescriptor_MultiSeriesDescriptor::_internal_gradient_visible() const {
-  PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race);
-  const ::io::deephaven::proto::backplane::script::grpc::FigureDescriptor_BoolMapWithDefault* p = _impl_.gradient_visible_;
-  return p != nullptr ? *p : reinterpret_cast<const ::io::deephaven::proto::backplane::script::grpc::FigureDescriptor_BoolMapWithDefault&>(::io::deephaven::proto::backplane::script::grpc::_FigureDescriptor_BoolMapWithDefault_default_instance_);
-}
-inline const ::io::deephaven::proto::backplane::script::grpc::FigureDescriptor_BoolMapWithDefault& FigureDescriptor_MultiSeriesDescriptor::gradient_visible() const ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  // @@protoc_insertion_point(field_get:io.deephaven.proto.backplane.script.grpc.FigureDescriptor.MultiSeriesDescriptor.gradient_visible)
-  return _internal_gradient_visible();
-}
-inline void FigureDescriptor_MultiSeriesDescriptor::unsafe_arena_set_allocated_gradient_visible(::io::deephaven::proto::backplane::script::grpc::FigureDescriptor_BoolMapWithDefault* value) {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  if (GetArena() == nullptr) {
-    delete reinterpret_cast<::google::protobuf::MessageLite*>(_impl_.gradient_visible_);
-  }
-  _impl_.gradient_visible_ = reinterpret_cast<::io::deephaven::proto::backplane::script::grpc::FigureDescriptor_BoolMapWithDefault*>(value);
-  if (value != nullptr) {
-    _impl_._has_bits_[0] |= 0x00000010u;
-  } else {
-    _impl_._has_bits_[0] &= ~0x00000010u;
-  }
-  // @@protoc_insertion_point(field_unsafe_arena_set_allocated:io.deephaven.proto.backplane.script.grpc.FigureDescriptor.MultiSeriesDescriptor.gradient_visible)
-}
-inline ::io::deephaven::proto::backplane::script::grpc::FigureDescriptor_BoolMapWithDefault* FigureDescriptor_MultiSeriesDescriptor::release_gradient_visible() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-
-  _impl_._has_bits_[0] &= ~0x00000010u;
-  ::io::deephaven::proto::backplane::script::grpc::FigureDescriptor_BoolMapWithDefault* released = _impl_.gradient_visible_;
-  _impl_.gradient_visible_ = nullptr;
-#ifdef PROTOBUF_FORCE_COPY_IN_RELEASE
-  auto* old = reinterpret_cast<::google::protobuf::MessageLite*>(released);
-  released = ::google::protobuf::internal::DuplicateIfNonNull(released);
-  if (GetArena() == nullptr) {
-    delete old;
-  }
-#else   // PROTOBUF_FORCE_COPY_IN_RELEASE
-  if (GetArena() != nullptr) {
-    released = ::google::protobuf::internal::DuplicateIfNonNull(released);
-  }
-#endif  // !PROTOBUF_FORCE_COPY_IN_RELEASE
-  return released;
-}
-inline ::io::deephaven::proto::backplane::script::grpc::FigureDescriptor_BoolMapWithDefault* FigureDescriptor_MultiSeriesDescriptor::unsafe_arena_release_gradient_visible() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  // @@protoc_insertion_point(field_release:io.deephaven.proto.backplane.script.grpc.FigureDescriptor.MultiSeriesDescriptor.gradient_visible)
-
-  _impl_._has_bits_[0] &= ~0x00000010u;
-  ::io::deephaven::proto::backplane::script::grpc::FigureDescriptor_BoolMapWithDefault* temp = _impl_.gradient_visible_;
-  _impl_.gradient_visible_ = nullptr;
-  return temp;
-}
-inline ::io::deephaven::proto::backplane::script::grpc::FigureDescriptor_BoolMapWithDefault* FigureDescriptor_MultiSeriesDescriptor::_internal_mutable_gradient_visible() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  _impl_._has_bits_[0] |= 0x00000010u;
-  if (_impl_.gradient_visible_ == nullptr) {
-    auto* p = CreateMaybeMessage<::io::deephaven::proto::backplane::script::grpc::FigureDescriptor_BoolMapWithDefault>(GetArena());
-    _impl_.gradient_visible_ = reinterpret_cast<::io::deephaven::proto::backplane::script::grpc::FigureDescriptor_BoolMapWithDefault*>(p);
-  }
-  return _impl_.gradient_visible_;
-}
-inline ::io::deephaven::proto::backplane::script::grpc::FigureDescriptor_BoolMapWithDefault* FigureDescriptor_MultiSeriesDescriptor::mutable_gradient_visible() ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  ::io::deephaven::proto::backplane::script::grpc::FigureDescriptor_BoolMapWithDefault* _msg = _internal_mutable_gradient_visible();
-  // @@protoc_insertion_point(field_mutable:io.deephaven.proto.backplane.script.grpc.FigureDescriptor.MultiSeriesDescriptor.gradient_visible)
-  return _msg;
-}
-inline void FigureDescriptor_MultiSeriesDescriptor::set_allocated_gradient_visible(::io::deephaven::proto::backplane::script::grpc::FigureDescriptor_BoolMapWithDefault* value) {
-  ::google::protobuf::Arena* message_arena = GetArena();
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  if (message_arena == nullptr) {
-    delete reinterpret_cast<::io::deephaven::proto::backplane::script::grpc::FigureDescriptor_BoolMapWithDefault*>(_impl_.gradient_visible_);
-  }
-
-  if (value != nullptr) {
-    ::google::protobuf::Arena* submessage_arena = reinterpret_cast<::io::deephaven::proto::backplane::script::grpc::FigureDescriptor_BoolMapWithDefault*>(value)->GetArena();
-    if (message_arena != submessage_arena) {
-      value = ::google::protobuf::internal::GetOwnedMessage(message_arena, value, submessage_arena);
-    }
-    _impl_._has_bits_[0] |= 0x00000010u;
-  } else {
-    _impl_._has_bits_[0] &= ~0x00000010u;
-  }
-
-  _impl_.gradient_visible_ = reinterpret_cast<::io::deephaven::proto::backplane::script::grpc::FigureDescriptor_BoolMapWithDefault*>(value);
-  // @@protoc_insertion_point(field_set_allocated:io.deephaven.proto.backplane.script.grpc.FigureDescriptor.MultiSeriesDescriptor.gradient_visible)
-}
-
-// .io.deephaven.proto.backplane.script.grpc.FigureDescriptor.StringMapWithDefault point_label_format = 8;
-inline bool FigureDescriptor_MultiSeriesDescriptor::has_point_label_format() const {
-  bool value = (_impl_._has_bits_[0] & 0x00000020u) != 0;
-  PROTOBUF_ASSUME(!value || _impl_.point_label_format_ != nullptr);
-  return value;
-}
-inline void FigureDescriptor_MultiSeriesDescriptor::clear_point_label_format() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  if (_impl_.point_label_format_ != nullptr) _impl_.point_label_format_->Clear();
-  _impl_._has_bits_[0] &= ~0x00000020u;
-}
-inline const ::io::deephaven::proto::backplane::script::grpc::FigureDescriptor_StringMapWithDefault& FigureDescriptor_MultiSeriesDescriptor::_internal_point_label_format() const {
-  PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race);
-  const ::io::deephaven::proto::backplane::script::grpc::FigureDescriptor_StringMapWithDefault* p = _impl_.point_label_format_;
-  return p != nullptr ? *p : reinterpret_cast<const ::io::deephaven::proto::backplane::script::grpc::FigureDescriptor_StringMapWithDefault&>(::io::deephaven::proto::backplane::script::grpc::_FigureDescriptor_StringMapWithDefault_default_instance_);
-}
-inline const ::io::deephaven::proto::backplane::script::grpc::FigureDescriptor_StringMapWithDefault& FigureDescriptor_MultiSeriesDescriptor::point_label_format() const ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  // @@protoc_insertion_point(field_get:io.deephaven.proto.backplane.script.grpc.FigureDescriptor.MultiSeriesDescriptor.point_label_format)
-  return _internal_point_label_format();
-}
-inline void FigureDescriptor_MultiSeriesDescriptor::unsafe_arena_set_allocated_point_label_format(::io::deephaven::proto::backplane::script::grpc::FigureDescriptor_StringMapWithDefault* value) {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  if (GetArena() == nullptr) {
-    delete reinterpret_cast<::google::protobuf::MessageLite*>(_impl_.point_label_format_);
-  }
-  _impl_.point_label_format_ = reinterpret_cast<::io::deephaven::proto::backplane::script::grpc::FigureDescriptor_StringMapWithDefault*>(value);
-  if (value != nullptr) {
-    _impl_._has_bits_[0] |= 0x00000020u;
-  } else {
-    _impl_._has_bits_[0] &= ~0x00000020u;
-  }
-  // @@protoc_insertion_point(field_unsafe_arena_set_allocated:io.deephaven.proto.backplane.script.grpc.FigureDescriptor.MultiSeriesDescriptor.point_label_format)
-}
-inline ::io::deephaven::proto::backplane::script::grpc::FigureDescriptor_StringMapWithDefault* FigureDescriptor_MultiSeriesDescriptor::release_point_label_format() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-
-  _impl_._has_bits_[0] &= ~0x00000020u;
-  ::io::deephaven::proto::backplane::script::grpc::FigureDescriptor_StringMapWithDefault* released = _impl_.point_label_format_;
-  _impl_.point_label_format_ = nullptr;
-#ifdef PROTOBUF_FORCE_COPY_IN_RELEASE
-  auto* old = reinterpret_cast<::google::protobuf::MessageLite*>(released);
-  released = ::google::protobuf::internal::DuplicateIfNonNull(released);
-  if (GetArena() == nullptr) {
-    delete old;
-  }
-#else   // PROTOBUF_FORCE_COPY_IN_RELEASE
-  if (GetArena() != nullptr) {
-    released = ::google::protobuf::internal::DuplicateIfNonNull(released);
-  }
-#endif  // !PROTOBUF_FORCE_COPY_IN_RELEASE
-  return released;
-}
-inline ::io::deephaven::proto::backplane::script::grpc::FigureDescriptor_StringMapWithDefault* FigureDescriptor_MultiSeriesDescriptor::unsafe_arena_release_point_label_format() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  // @@protoc_insertion_point(field_release:io.deephaven.proto.backplane.script.grpc.FigureDescriptor.MultiSeriesDescriptor.point_label_format)
-
-  _impl_._has_bits_[0] &= ~0x00000020u;
-  ::io::deephaven::proto::backplane::script::grpc::FigureDescriptor_StringMapWithDefault* temp = _impl_.point_label_format_;
-  _impl_.point_label_format_ = nullptr;
-  return temp;
-}
-inline ::io::deephaven::proto::backplane::script::grpc::FigureDescriptor_StringMapWithDefault* FigureDescriptor_MultiSeriesDescriptor::_internal_mutable_point_label_format() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  _impl_._has_bits_[0] |= 0x00000020u;
-  if (_impl_.point_label_format_ == nullptr) {
-    auto* p = CreateMaybeMessage<::io::deephaven::proto::backplane::script::grpc::FigureDescriptor_StringMapWithDefault>(GetArena());
-    _impl_.point_label_format_ = reinterpret_cast<::io::deephaven::proto::backplane::script::grpc::FigureDescriptor_StringMapWithDefault*>(p);
-  }
-  return _impl_.point_label_format_;
-}
-inline ::io::deephaven::proto::backplane::script::grpc::FigureDescriptor_StringMapWithDefault* FigureDescriptor_MultiSeriesDescriptor::mutable_point_label_format() ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  ::io::deephaven::proto::backplane::script::grpc::FigureDescriptor_StringMapWithDefault* _msg = _internal_mutable_point_label_format();
-  // @@protoc_insertion_point(field_mutable:io.deephaven.proto.backplane.script.grpc.FigureDescriptor.MultiSeriesDescriptor.point_label_format)
-  return _msg;
-}
-inline void FigureDescriptor_MultiSeriesDescriptor::set_allocated_point_label_format(::io::deephaven::proto::backplane::script::grpc::FigureDescriptor_StringMapWithDefault* value) {
-  ::google::protobuf::Arena* message_arena = GetArena();
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  if (message_arena == nullptr) {
-    delete reinterpret_cast<::io::deephaven::proto::backplane::script::grpc::FigureDescriptor_StringMapWithDefault*>(_impl_.point_label_format_);
-  }
-
-  if (value != nullptr) {
-    ::google::protobuf::Arena* submessage_arena = reinterpret_cast<::io::deephaven::proto::backplane::script::grpc::FigureDescriptor_StringMapWithDefault*>(value)->GetArena();
-    if (message_arena != submessage_arena) {
-      value = ::google::protobuf::internal::GetOwnedMessage(message_arena, value, submessage_arena);
-    }
-    _impl_._has_bits_[0] |= 0x00000020u;
-  } else {
-    _impl_._has_bits_[0] &= ~0x00000020u;
-  }
-
-  _impl_.point_label_format_ = reinterpret_cast<::io::deephaven::proto::backplane::script::grpc::FigureDescriptor_StringMapWithDefault*>(value);
-  // @@protoc_insertion_point(field_set_allocated:io.deephaven.proto.backplane.script.grpc.FigureDescriptor.MultiSeriesDescriptor.point_label_format)
-}
-
-// .io.deephaven.proto.backplane.script.grpc.FigureDescriptor.StringMapWithDefault x_tool_tip_pattern = 9;
-inline bool FigureDescriptor_MultiSeriesDescriptor::has_x_tool_tip_pattern() const {
-  bool value = (_impl_._has_bits_[0] & 0x00000040u) != 0;
-  PROTOBUF_ASSUME(!value || _impl_.x_tool_tip_pattern_ != nullptr);
-  return value;
-}
-inline void FigureDescriptor_MultiSeriesDescriptor::clear_x_tool_tip_pattern() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  if (_impl_.x_tool_tip_pattern_ != nullptr) _impl_.x_tool_tip_pattern_->Clear();
-  _impl_._has_bits_[0] &= ~0x00000040u;
-}
-inline const ::io::deephaven::proto::backplane::script::grpc::FigureDescriptor_StringMapWithDefault& FigureDescriptor_MultiSeriesDescriptor::_internal_x_tool_tip_pattern() const {
-  PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race);
-  const ::io::deephaven::proto::backplane::script::grpc::FigureDescriptor_StringMapWithDefault* p = _impl_.x_tool_tip_pattern_;
-  return p != nullptr ? *p : reinterpret_cast<const ::io::deephaven::proto::backplane::script::grpc::FigureDescriptor_StringMapWithDefault&>(::io::deephaven::proto::backplane::script::grpc::_FigureDescriptor_StringMapWithDefault_default_instance_);
-}
-inline const ::io::deephaven::proto::backplane::script::grpc::FigureDescriptor_StringMapWithDefault& FigureDescriptor_MultiSeriesDescriptor::x_tool_tip_pattern() const ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  // @@protoc_insertion_point(field_get:io.deephaven.proto.backplane.script.grpc.FigureDescriptor.MultiSeriesDescriptor.x_tool_tip_pattern)
-  return _internal_x_tool_tip_pattern();
-}
-inline void FigureDescriptor_MultiSeriesDescriptor::unsafe_arena_set_allocated_x_tool_tip_pattern(::io::deephaven::proto::backplane::script::grpc::FigureDescriptor_StringMapWithDefault* value) {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  if (GetArena() == nullptr) {
-    delete reinterpret_cast<::google::protobuf::MessageLite*>(_impl_.x_tool_tip_pattern_);
-  }
-  _impl_.x_tool_tip_pattern_ = reinterpret_cast<::io::deephaven::proto::backplane::script::grpc::FigureDescriptor_StringMapWithDefault*>(value);
-  if (value != nullptr) {
-    _impl_._has_bits_[0] |= 0x00000040u;
-  } else {
-    _impl_._has_bits_[0] &= ~0x00000040u;
-  }
-  // @@protoc_insertion_point(field_unsafe_arena_set_allocated:io.deephaven.proto.backplane.script.grpc.FigureDescriptor.MultiSeriesDescriptor.x_tool_tip_pattern)
-}
-inline ::io::deephaven::proto::backplane::script::grpc::FigureDescriptor_StringMapWithDefault* FigureDescriptor_MultiSeriesDescriptor::release_x_tool_tip_pattern() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-
-  _impl_._has_bits_[0] &= ~0x00000040u;
-  ::io::deephaven::proto::backplane::script::grpc::FigureDescriptor_StringMapWithDefault* released = _impl_.x_tool_tip_pattern_;
-  _impl_.x_tool_tip_pattern_ = nullptr;
-#ifdef PROTOBUF_FORCE_COPY_IN_RELEASE
-  auto* old = reinterpret_cast<::google::protobuf::MessageLite*>(released);
-  released = ::google::protobuf::internal::DuplicateIfNonNull(released);
-  if (GetArena() == nullptr) {
-    delete old;
-  }
-#else   // PROTOBUF_FORCE_COPY_IN_RELEASE
-  if (GetArena() != nullptr) {
-    released = ::google::protobuf::internal::DuplicateIfNonNull(released);
-  }
-#endif  // !PROTOBUF_FORCE_COPY_IN_RELEASE
-  return released;
-}
-inline ::io::deephaven::proto::backplane::script::grpc::FigureDescriptor_StringMapWithDefault* FigureDescriptor_MultiSeriesDescriptor::unsafe_arena_release_x_tool_tip_pattern() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  // @@protoc_insertion_point(field_release:io.deephaven.proto.backplane.script.grpc.FigureDescriptor.MultiSeriesDescriptor.x_tool_tip_pattern)
-
-  _impl_._has_bits_[0] &= ~0x00000040u;
-  ::io::deephaven::proto::backplane::script::grpc::FigureDescriptor_StringMapWithDefault* temp = _impl_.x_tool_tip_pattern_;
-  _impl_.x_tool_tip_pattern_ = nullptr;
-  return temp;
-}
-inline ::io::deephaven::proto::backplane::script::grpc::FigureDescriptor_StringMapWithDefault* FigureDescriptor_MultiSeriesDescriptor::_internal_mutable_x_tool_tip_pattern() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  _impl_._has_bits_[0] |= 0x00000040u;
-  if (_impl_.x_tool_tip_pattern_ == nullptr) {
-    auto* p = CreateMaybeMessage<::io::deephaven::proto::backplane::script::grpc::FigureDescriptor_StringMapWithDefault>(GetArena());
-    _impl_.x_tool_tip_pattern_ = reinterpret_cast<::io::deephaven::proto::backplane::script::grpc::FigureDescriptor_StringMapWithDefault*>(p);
-  }
-  return _impl_.x_tool_tip_pattern_;
-}
-inline ::io::deephaven::proto::backplane::script::grpc::FigureDescriptor_StringMapWithDefault* FigureDescriptor_MultiSeriesDescriptor::mutable_x_tool_tip_pattern() ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  ::io::deephaven::proto::backplane::script::grpc::FigureDescriptor_StringMapWithDefault* _msg = _internal_mutable_x_tool_tip_pattern();
-  // @@protoc_insertion_point(field_mutable:io.deephaven.proto.backplane.script.grpc.FigureDescriptor.MultiSeriesDescriptor.x_tool_tip_pattern)
-  return _msg;
-}
-inline void FigureDescriptor_MultiSeriesDescriptor::set_allocated_x_tool_tip_pattern(::io::deephaven::proto::backplane::script::grpc::FigureDescriptor_StringMapWithDefault* value) {
-  ::google::protobuf::Arena* message_arena = GetArena();
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  if (message_arena == nullptr) {
-    delete reinterpret_cast<::io::deephaven::proto::backplane::script::grpc::FigureDescriptor_StringMapWithDefault*>(_impl_.x_tool_tip_pattern_);
-  }
-
-  if (value != nullptr) {
-    ::google::protobuf::Arena* submessage_arena = reinterpret_cast<::io::deephaven::proto::backplane::script::grpc::FigureDescriptor_StringMapWithDefault*>(value)->GetArena();
-    if (message_arena != submessage_arena) {
-      value = ::google::protobuf::internal::GetOwnedMessage(message_arena, value, submessage_arena);
-    }
-    _impl_._has_bits_[0] |= 0x00000040u;
-  } else {
-    _impl_._has_bits_[0] &= ~0x00000040u;
-  }
-
-  _impl_.x_tool_tip_pattern_ = reinterpret_cast<::io::deephaven::proto::backplane::script::grpc::FigureDescriptor_StringMapWithDefault*>(value);
-  // @@protoc_insertion_point(field_set_allocated:io.deephaven.proto.backplane.script.grpc.FigureDescriptor.MultiSeriesDescriptor.x_tool_tip_pattern)
-}
-
-// .io.deephaven.proto.backplane.script.grpc.FigureDescriptor.StringMapWithDefault y_tool_tip_pattern = 10;
-inline bool FigureDescriptor_MultiSeriesDescriptor::has_y_tool_tip_pattern() const {
-  bool value = (_impl_._has_bits_[0] & 0x00000080u) != 0;
-  PROTOBUF_ASSUME(!value || _impl_.y_tool_tip_pattern_ != nullptr);
-  return value;
-}
-inline void FigureDescriptor_MultiSeriesDescriptor::clear_y_tool_tip_pattern() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  if (_impl_.y_tool_tip_pattern_ != nullptr) _impl_.y_tool_tip_pattern_->Clear();
-  _impl_._has_bits_[0] &= ~0x00000080u;
-}
-inline const ::io::deephaven::proto::backplane::script::grpc::FigureDescriptor_StringMapWithDefault& FigureDescriptor_MultiSeriesDescriptor::_internal_y_tool_tip_pattern() const {
-  PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race);
-  const ::io::deephaven::proto::backplane::script::grpc::FigureDescriptor_StringMapWithDefault* p = _impl_.y_tool_tip_pattern_;
-  return p != nullptr ? *p : reinterpret_cast<const ::io::deephaven::proto::backplane::script::grpc::FigureDescriptor_StringMapWithDefault&>(::io::deephaven::proto::backplane::script::grpc::_FigureDescriptor_StringMapWithDefault_default_instance_);
-}
-inline const ::io::deephaven::proto::backplane::script::grpc::FigureDescriptor_StringMapWithDefault& FigureDescriptor_MultiSeriesDescriptor::y_tool_tip_pattern() const ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  // @@protoc_insertion_point(field_get:io.deephaven.proto.backplane.script.grpc.FigureDescriptor.MultiSeriesDescriptor.y_tool_tip_pattern)
-  return _internal_y_tool_tip_pattern();
-}
-inline void FigureDescriptor_MultiSeriesDescriptor::unsafe_arena_set_allocated_y_tool_tip_pattern(::io::deephaven::proto::backplane::script::grpc::FigureDescriptor_StringMapWithDefault* value) {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  if (GetArena() == nullptr) {
-    delete reinterpret_cast<::google::protobuf::MessageLite*>(_impl_.y_tool_tip_pattern_);
-  }
-  _impl_.y_tool_tip_pattern_ = reinterpret_cast<::io::deephaven::proto::backplane::script::grpc::FigureDescriptor_StringMapWithDefault*>(value);
-  if (value != nullptr) {
-    _impl_._has_bits_[0] |= 0x00000080u;
-  } else {
-    _impl_._has_bits_[0] &= ~0x00000080u;
-  }
-  // @@protoc_insertion_point(field_unsafe_arena_set_allocated:io.deephaven.proto.backplane.script.grpc.FigureDescriptor.MultiSeriesDescriptor.y_tool_tip_pattern)
-}
-inline ::io::deephaven::proto::backplane::script::grpc::FigureDescriptor_StringMapWithDefault* FigureDescriptor_MultiSeriesDescriptor::release_y_tool_tip_pattern() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-
-  _impl_._has_bits_[0] &= ~0x00000080u;
-  ::io::deephaven::proto::backplane::script::grpc::FigureDescriptor_StringMapWithDefault* released = _impl_.y_tool_tip_pattern_;
-  _impl_.y_tool_tip_pattern_ = nullptr;
-#ifdef PROTOBUF_FORCE_COPY_IN_RELEASE
-  auto* old = reinterpret_cast<::google::protobuf::MessageLite*>(released);
-  released = ::google::protobuf::internal::DuplicateIfNonNull(released);
-  if (GetArena() == nullptr) {
-    delete old;
-  }
-#else   // PROTOBUF_FORCE_COPY_IN_RELEASE
-  if (GetArena() != nullptr) {
-    released = ::google::protobuf::internal::DuplicateIfNonNull(released);
-  }
-#endif  // !PROTOBUF_FORCE_COPY_IN_RELEASE
-  return released;
-}
-inline ::io::deephaven::proto::backplane::script::grpc::FigureDescriptor_StringMapWithDefault* FigureDescriptor_MultiSeriesDescriptor::unsafe_arena_release_y_tool_tip_pattern() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  // @@protoc_insertion_point(field_release:io.deephaven.proto.backplane.script.grpc.FigureDescriptor.MultiSeriesDescriptor.y_tool_tip_pattern)
-
-  _impl_._has_bits_[0] &= ~0x00000080u;
-  ::io::deephaven::proto::backplane::script::grpc::FigureDescriptor_StringMapWithDefault* temp = _impl_.y_tool_tip_pattern_;
-  _impl_.y_tool_tip_pattern_ = nullptr;
-  return temp;
-}
-inline ::io::deephaven::proto::backplane::script::grpc::FigureDescriptor_StringMapWithDefault* FigureDescriptor_MultiSeriesDescriptor::_internal_mutable_y_tool_tip_pattern() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  _impl_._has_bits_[0] |= 0x00000080u;
-  if (_impl_.y_tool_tip_pattern_ == nullptr) {
-    auto* p = CreateMaybeMessage<::io::deephaven::proto::backplane::script::grpc::FigureDescriptor_StringMapWithDefault>(GetArena());
-    _impl_.y_tool_tip_pattern_ = reinterpret_cast<::io::deephaven::proto::backplane::script::grpc::FigureDescriptor_StringMapWithDefault*>(p);
-  }
-  return _impl_.y_tool_tip_pattern_;
-}
-inline ::io::deephaven::proto::backplane::script::grpc::FigureDescriptor_StringMapWithDefault* FigureDescriptor_MultiSeriesDescriptor::mutable_y_tool_tip_pattern() ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  ::io::deephaven::proto::backplane::script::grpc::FigureDescriptor_StringMapWithDefault* _msg = _internal_mutable_y_tool_tip_pattern();
-  // @@protoc_insertion_point(field_mutable:io.deephaven.proto.backplane.script.grpc.FigureDescriptor.MultiSeriesDescriptor.y_tool_tip_pattern)
-  return _msg;
-}
-inline void FigureDescriptor_MultiSeriesDescriptor::set_allocated_y_tool_tip_pattern(::io::deephaven::proto::backplane::script::grpc::FigureDescriptor_StringMapWithDefault* value) {
-  ::google::protobuf::Arena* message_arena = GetArena();
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  if (message_arena == nullptr) {
-    delete reinterpret_cast<::io::deephaven::proto::backplane::script::grpc::FigureDescriptor_StringMapWithDefault*>(_impl_.y_tool_tip_pattern_);
-  }
-
-  if (value != nullptr) {
-    ::google::protobuf::Arena* submessage_arena = reinterpret_cast<::io::deephaven::proto::backplane::script::grpc::FigureDescriptor_StringMapWithDefault*>(value)->GetArena();
-    if (message_arena != submessage_arena) {
-      value = ::google::protobuf::internal::GetOwnedMessage(message_arena, value, submessage_arena);
-    }
-    _impl_._has_bits_[0] |= 0x00000080u;
-  } else {
-    _impl_._has_bits_[0] &= ~0x00000080u;
-  }
-
-  _impl_.y_tool_tip_pattern_ = reinterpret_cast<::io::deephaven::proto::backplane::script::grpc::FigureDescriptor_StringMapWithDefault*>(value);
-  // @@protoc_insertion_point(field_set_allocated:io.deephaven.proto.backplane.script.grpc.FigureDescriptor.MultiSeriesDescriptor.y_tool_tip_pattern)
-}
-
-// .io.deephaven.proto.backplane.script.grpc.FigureDescriptor.StringMapWithDefault point_label = 11;
-inline bool FigureDescriptor_MultiSeriesDescriptor::has_point_label() const {
-  bool value = (_impl_._has_bits_[0] & 0x00000100u) != 0;
-  PROTOBUF_ASSUME(!value || _impl_.point_label_ != nullptr);
-  return value;
-}
-inline void FigureDescriptor_MultiSeriesDescriptor::clear_point_label() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  if (_impl_.point_label_ != nullptr) _impl_.point_label_->Clear();
-  _impl_._has_bits_[0] &= ~0x00000100u;
-}
-inline const ::io::deephaven::proto::backplane::script::grpc::FigureDescriptor_StringMapWithDefault& FigureDescriptor_MultiSeriesDescriptor::_internal_point_label() const {
-  PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race);
-  const ::io::deephaven::proto::backplane::script::grpc::FigureDescriptor_StringMapWithDefault* p = _impl_.point_label_;
-  return p != nullptr ? *p : reinterpret_cast<const ::io::deephaven::proto::backplane::script::grpc::FigureDescriptor_StringMapWithDefault&>(::io::deephaven::proto::backplane::script::grpc::_FigureDescriptor_StringMapWithDefault_default_instance_);
-}
-inline const ::io::deephaven::proto::backplane::script::grpc::FigureDescriptor_StringMapWithDefault& FigureDescriptor_MultiSeriesDescriptor::point_label() const ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  // @@protoc_insertion_point(field_get:io.deephaven.proto.backplane.script.grpc.FigureDescriptor.MultiSeriesDescriptor.point_label)
-  return _internal_point_label();
-}
-inline void FigureDescriptor_MultiSeriesDescriptor::unsafe_arena_set_allocated_point_label(::io::deephaven::proto::backplane::script::grpc::FigureDescriptor_StringMapWithDefault* value) {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  if (GetArena() == nullptr) {
-    delete reinterpret_cast<::google::protobuf::MessageLite*>(_impl_.point_label_);
-  }
-  _impl_.point_label_ = reinterpret_cast<::io::deephaven::proto::backplane::script::grpc::FigureDescriptor_StringMapWithDefault*>(value);
-  if (value != nullptr) {
-    _impl_._has_bits_[0] |= 0x00000100u;
-  } else {
-    _impl_._has_bits_[0] &= ~0x00000100u;
-  }
-  // @@protoc_insertion_point(field_unsafe_arena_set_allocated:io.deephaven.proto.backplane.script.grpc.FigureDescriptor.MultiSeriesDescriptor.point_label)
-}
-inline ::io::deephaven::proto::backplane::script::grpc::FigureDescriptor_StringMapWithDefault* FigureDescriptor_MultiSeriesDescriptor::release_point_label() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-
-  _impl_._has_bits_[0] &= ~0x00000100u;
-  ::io::deephaven::proto::backplane::script::grpc::FigureDescriptor_StringMapWithDefault* released = _impl_.point_label_;
-  _impl_.point_label_ = nullptr;
-#ifdef PROTOBUF_FORCE_COPY_IN_RELEASE
-  auto* old = reinterpret_cast<::google::protobuf::MessageLite*>(released);
-  released = ::google::protobuf::internal::DuplicateIfNonNull(released);
-  if (GetArena() == nullptr) {
-    delete old;
-  }
-#else   // PROTOBUF_FORCE_COPY_IN_RELEASE
-  if (GetArena() != nullptr) {
-    released = ::google::protobuf::internal::DuplicateIfNonNull(released);
-  }
-#endif  // !PROTOBUF_FORCE_COPY_IN_RELEASE
-  return released;
-}
-inline ::io::deephaven::proto::backplane::script::grpc::FigureDescriptor_StringMapWithDefault* FigureDescriptor_MultiSeriesDescriptor::unsafe_arena_release_point_label() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  // @@protoc_insertion_point(field_release:io.deephaven.proto.backplane.script.grpc.FigureDescriptor.MultiSeriesDescriptor.point_label)
-
-  _impl_._has_bits_[0] &= ~0x00000100u;
-  ::io::deephaven::proto::backplane::script::grpc::FigureDescriptor_StringMapWithDefault* temp = _impl_.point_label_;
-  _impl_.point_label_ = nullptr;
-  return temp;
-}
-inline ::io::deephaven::proto::backplane::script::grpc::FigureDescriptor_StringMapWithDefault* FigureDescriptor_MultiSeriesDescriptor::_internal_mutable_point_label() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  _impl_._has_bits_[0] |= 0x00000100u;
-  if (_impl_.point_label_ == nullptr) {
-    auto* p = CreateMaybeMessage<::io::deephaven::proto::backplane::script::grpc::FigureDescriptor_StringMapWithDefault>(GetArena());
-    _impl_.point_label_ = reinterpret_cast<::io::deephaven::proto::backplane::script::grpc::FigureDescriptor_StringMapWithDefault*>(p);
-  }
-  return _impl_.point_label_;
-}
-inline ::io::deephaven::proto::backplane::script::grpc::FigureDescriptor_StringMapWithDefault* FigureDescriptor_MultiSeriesDescriptor::mutable_point_label() ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  ::io::deephaven::proto::backplane::script::grpc::FigureDescriptor_StringMapWithDefault* _msg = _internal_mutable_point_label();
-  // @@protoc_insertion_point(field_mutable:io.deephaven.proto.backplane.script.grpc.FigureDescriptor.MultiSeriesDescriptor.point_label)
-  return _msg;
-}
-inline void FigureDescriptor_MultiSeriesDescriptor::set_allocated_point_label(::io::deephaven::proto::backplane::script::grpc::FigureDescriptor_StringMapWithDefault* value) {
-  ::google::protobuf::Arena* message_arena = GetArena();
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  if (message_arena == nullptr) {
-    delete reinterpret_cast<::io::deephaven::proto::backplane::script::grpc::FigureDescriptor_StringMapWithDefault*>(_impl_.point_label_);
-  }
-
-  if (value != nullptr) {
-    ::google::protobuf::Arena* submessage_arena = reinterpret_cast<::io::deephaven::proto::backplane::script::grpc::FigureDescriptor_StringMapWithDefault*>(value)->GetArena();
-    if (message_arena != submessage_arena) {
-      value = ::google::protobuf::internal::GetOwnedMessage(message_arena, value, submessage_arena);
-    }
-    _impl_._has_bits_[0] |= 0x00000100u;
-  } else {
-    _impl_._has_bits_[0] &= ~0x00000100u;
-  }
-
-  _impl_.point_label_ = reinterpret_cast<::io::deephaven::proto::backplane::script::grpc::FigureDescriptor_StringMapWithDefault*>(value);
-  // @@protoc_insertion_point(field_set_allocated:io.deephaven.proto.backplane.script.grpc.FigureDescriptor.MultiSeriesDescriptor.point_label)
-}
-
-// .io.deephaven.proto.backplane.script.grpc.FigureDescriptor.DoubleMapWithDefault point_size = 12;
-inline bool FigureDescriptor_MultiSeriesDescriptor::has_point_size() const {
-  bool value = (_impl_._has_bits_[0] & 0x00000200u) != 0;
-  PROTOBUF_ASSUME(!value || _impl_.point_size_ != nullptr);
-  return value;
-}
-inline void FigureDescriptor_MultiSeriesDescriptor::clear_point_size() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  if (_impl_.point_size_ != nullptr) _impl_.point_size_->Clear();
-  _impl_._has_bits_[0] &= ~0x00000200u;
-}
-inline const ::io::deephaven::proto::backplane::script::grpc::FigureDescriptor_DoubleMapWithDefault& FigureDescriptor_MultiSeriesDescriptor::_internal_point_size() const {
-  PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race);
-  const ::io::deephaven::proto::backplane::script::grpc::FigureDescriptor_DoubleMapWithDefault* p = _impl_.point_size_;
-  return p != nullptr ? *p : reinterpret_cast<const ::io::deephaven::proto::backplane::script::grpc::FigureDescriptor_DoubleMapWithDefault&>(::io::deephaven::proto::backplane::script::grpc::_FigureDescriptor_DoubleMapWithDefault_default_instance_);
-}
-inline const ::io::deephaven::proto::backplane::script::grpc::FigureDescriptor_DoubleMapWithDefault& FigureDescriptor_MultiSeriesDescriptor::point_size() const ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  // @@protoc_insertion_point(field_get:io.deephaven.proto.backplane.script.grpc.FigureDescriptor.MultiSeriesDescriptor.point_size)
-  return _internal_point_size();
-}
-inline void FigureDescriptor_MultiSeriesDescriptor::unsafe_arena_set_allocated_point_size(::io::deephaven::proto::backplane::script::grpc::FigureDescriptor_DoubleMapWithDefault* value) {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  if (GetArena() == nullptr) {
-    delete reinterpret_cast<::google::protobuf::MessageLite*>(_impl_.point_size_);
-  }
-  _impl_.point_size_ = reinterpret_cast<::io::deephaven::proto::backplane::script::grpc::FigureDescriptor_DoubleMapWithDefault*>(value);
-  if (value != nullptr) {
-    _impl_._has_bits_[0] |= 0x00000200u;
-  } else {
-    _impl_._has_bits_[0] &= ~0x00000200u;
-  }
-  // @@protoc_insertion_point(field_unsafe_arena_set_allocated:io.deephaven.proto.backplane.script.grpc.FigureDescriptor.MultiSeriesDescriptor.point_size)
-}
-inline ::io::deephaven::proto::backplane::script::grpc::FigureDescriptor_DoubleMapWithDefault* FigureDescriptor_MultiSeriesDescriptor::release_point_size() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-
-  _impl_._has_bits_[0] &= ~0x00000200u;
-  ::io::deephaven::proto::backplane::script::grpc::FigureDescriptor_DoubleMapWithDefault* released = _impl_.point_size_;
-  _impl_.point_size_ = nullptr;
-#ifdef PROTOBUF_FORCE_COPY_IN_RELEASE
-  auto* old = reinterpret_cast<::google::protobuf::MessageLite*>(released);
-  released = ::google::protobuf::internal::DuplicateIfNonNull(released);
-  if (GetArena() == nullptr) {
-    delete old;
-  }
-#else   // PROTOBUF_FORCE_COPY_IN_RELEASE
-  if (GetArena() != nullptr) {
-    released = ::google::protobuf::internal::DuplicateIfNonNull(released);
-  }
-#endif  // !PROTOBUF_FORCE_COPY_IN_RELEASE
-  return released;
-}
-inline ::io::deephaven::proto::backplane::script::grpc::FigureDescriptor_DoubleMapWithDefault* FigureDescriptor_MultiSeriesDescriptor::unsafe_arena_release_point_size() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  // @@protoc_insertion_point(field_release:io.deephaven.proto.backplane.script.grpc.FigureDescriptor.MultiSeriesDescriptor.point_size)
-
-  _impl_._has_bits_[0] &= ~0x00000200u;
-  ::io::deephaven::proto::backplane::script::grpc::FigureDescriptor_DoubleMapWithDefault* temp = _impl_.point_size_;
-  _impl_.point_size_ = nullptr;
-  return temp;
-}
-inline ::io::deephaven::proto::backplane::script::grpc::FigureDescriptor_DoubleMapWithDefault* FigureDescriptor_MultiSeriesDescriptor::_internal_mutable_point_size() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  _impl_._has_bits_[0] |= 0x00000200u;
-  if (_impl_.point_size_ == nullptr) {
-    auto* p = CreateMaybeMessage<::io::deephaven::proto::backplane::script::grpc::FigureDescriptor_DoubleMapWithDefault>(GetArena());
-    _impl_.point_size_ = reinterpret_cast<::io::deephaven::proto::backplane::script::grpc::FigureDescriptor_DoubleMapWithDefault*>(p);
-  }
-  return _impl_.point_size_;
-}
-inline ::io::deephaven::proto::backplane::script::grpc::FigureDescriptor_DoubleMapWithDefault* FigureDescriptor_MultiSeriesDescriptor::mutable_point_size() ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  ::io::deephaven::proto::backplane::script::grpc::FigureDescriptor_DoubleMapWithDefault* _msg = _internal_mutable_point_size();
-  // @@protoc_insertion_point(field_mutable:io.deephaven.proto.backplane.script.grpc.FigureDescriptor.MultiSeriesDescriptor.point_size)
-  return _msg;
-}
-inline void FigureDescriptor_MultiSeriesDescriptor::set_allocated_point_size(::io::deephaven::proto::backplane::script::grpc::FigureDescriptor_DoubleMapWithDefault* value) {
-  ::google::protobuf::Arena* message_arena = GetArena();
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  if (message_arena == nullptr) {
-    delete reinterpret_cast<::io::deephaven::proto::backplane::script::grpc::FigureDescriptor_DoubleMapWithDefault*>(_impl_.point_size_);
-  }
-
-  if (value != nullptr) {
-    ::google::protobuf::Arena* submessage_arena = reinterpret_cast<::io::deephaven::proto::backplane::script::grpc::FigureDescriptor_DoubleMapWithDefault*>(value)->GetArena();
-    if (message_arena != submessage_arena) {
-      value = ::google::protobuf::internal::GetOwnedMessage(message_arena, value, submessage_arena);
-    }
-    _impl_._has_bits_[0] |= 0x00000200u;
-  } else {
-    _impl_._has_bits_[0] &= ~0x00000200u;
-  }
-
-  _impl_.point_size_ = reinterpret_cast<::io::deephaven::proto::backplane::script::grpc::FigureDescriptor_DoubleMapWithDefault*>(value);
-  // @@protoc_insertion_point(field_set_allocated:io.deephaven.proto.backplane.script.grpc.FigureDescriptor.MultiSeriesDescriptor.point_size)
-}
-
-// .io.deephaven.proto.backplane.script.grpc.FigureDescriptor.StringMapWithDefault point_shape = 13;
-inline bool FigureDescriptor_MultiSeriesDescriptor::has_point_shape() const {
-  bool value = (_impl_._has_bits_[0] & 0x00000400u) != 0;
-  PROTOBUF_ASSUME(!value || _impl_.point_shape_ != nullptr);
-  return value;
-}
-inline void FigureDescriptor_MultiSeriesDescriptor::clear_point_shape() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  if (_impl_.point_shape_ != nullptr) _impl_.point_shape_->Clear();
-  _impl_._has_bits_[0] &= ~0x00000400u;
-}
-inline const ::io::deephaven::proto::backplane::script::grpc::FigureDescriptor_StringMapWithDefault& FigureDescriptor_MultiSeriesDescriptor::_internal_point_shape() const {
-  PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race);
-  const ::io::deephaven::proto::backplane::script::grpc::FigureDescriptor_StringMapWithDefault* p = _impl_.point_shape_;
-  return p != nullptr ? *p : reinterpret_cast<const ::io::deephaven::proto::backplane::script::grpc::FigureDescriptor_StringMapWithDefault&>(::io::deephaven::proto::backplane::script::grpc::_FigureDescriptor_StringMapWithDefault_default_instance_);
-}
-inline const ::io::deephaven::proto::backplane::script::grpc::FigureDescriptor_StringMapWithDefault& FigureDescriptor_MultiSeriesDescriptor::point_shape() const ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  // @@protoc_insertion_point(field_get:io.deephaven.proto.backplane.script.grpc.FigureDescriptor.MultiSeriesDescriptor.point_shape)
-  return _internal_point_shape();
-}
-inline void FigureDescriptor_MultiSeriesDescriptor::unsafe_arena_set_allocated_point_shape(::io::deephaven::proto::backplane::script::grpc::FigureDescriptor_StringMapWithDefault* value) {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  if (GetArena() == nullptr) {
-    delete reinterpret_cast<::google::protobuf::MessageLite*>(_impl_.point_shape_);
-  }
-  _impl_.point_shape_ = reinterpret_cast<::io::deephaven::proto::backplane::script::grpc::FigureDescriptor_StringMapWithDefault*>(value);
-  if (value != nullptr) {
-    _impl_._has_bits_[0] |= 0x00000400u;
-  } else {
-    _impl_._has_bits_[0] &= ~0x00000400u;
-  }
-  // @@protoc_insertion_point(field_unsafe_arena_set_allocated:io.deephaven.proto.backplane.script.grpc.FigureDescriptor.MultiSeriesDescriptor.point_shape)
-}
-inline ::io::deephaven::proto::backplane::script::grpc::FigureDescriptor_StringMapWithDefault* FigureDescriptor_MultiSeriesDescriptor::release_point_shape() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-
-  _impl_._has_bits_[0] &= ~0x00000400u;
-  ::io::deephaven::proto::backplane::script::grpc::FigureDescriptor_StringMapWithDefault* released = _impl_.point_shape_;
-  _impl_.point_shape_ = nullptr;
-#ifdef PROTOBUF_FORCE_COPY_IN_RELEASE
-  auto* old = reinterpret_cast<::google::protobuf::MessageLite*>(released);
-  released = ::google::protobuf::internal::DuplicateIfNonNull(released);
-  if (GetArena() == nullptr) {
-    delete old;
-  }
-#else   // PROTOBUF_FORCE_COPY_IN_RELEASE
-  if (GetArena() != nullptr) {
-    released = ::google::protobuf::internal::DuplicateIfNonNull(released);
-  }
-#endif  // !PROTOBUF_FORCE_COPY_IN_RELEASE
-  return released;
-}
-inline ::io::deephaven::proto::backplane::script::grpc::FigureDescriptor_StringMapWithDefault* FigureDescriptor_MultiSeriesDescriptor::unsafe_arena_release_point_shape() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  // @@protoc_insertion_point(field_release:io.deephaven.proto.backplane.script.grpc.FigureDescriptor.MultiSeriesDescriptor.point_shape)
-
-  _impl_._has_bits_[0] &= ~0x00000400u;
-  ::io::deephaven::proto::backplane::script::grpc::FigureDescriptor_StringMapWithDefault* temp = _impl_.point_shape_;
-  _impl_.point_shape_ = nullptr;
-  return temp;
-}
-inline ::io::deephaven::proto::backplane::script::grpc::FigureDescriptor_StringMapWithDefault* FigureDescriptor_MultiSeriesDescriptor::_internal_mutable_point_shape() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  _impl_._has_bits_[0] |= 0x00000400u;
-  if (_impl_.point_shape_ == nullptr) {
-    auto* p = CreateMaybeMessage<::io::deephaven::proto::backplane::script::grpc::FigureDescriptor_StringMapWithDefault>(GetArena());
-    _impl_.point_shape_ = reinterpret_cast<::io::deephaven::proto::backplane::script::grpc::FigureDescriptor_StringMapWithDefault*>(p);
-  }
-  return _impl_.point_shape_;
-}
-inline ::io::deephaven::proto::backplane::script::grpc::FigureDescriptor_StringMapWithDefault* FigureDescriptor_MultiSeriesDescriptor::mutable_point_shape() ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  ::io::deephaven::proto::backplane::script::grpc::FigureDescriptor_StringMapWithDefault* _msg = _internal_mutable_point_shape();
-  // @@protoc_insertion_point(field_mutable:io.deephaven.proto.backplane.script.grpc.FigureDescriptor.MultiSeriesDescriptor.point_shape)
-  return _msg;
-}
-inline void FigureDescriptor_MultiSeriesDescriptor::set_allocated_point_shape(::io::deephaven::proto::backplane::script::grpc::FigureDescriptor_StringMapWithDefault* value) {
-  ::google::protobuf::Arena* message_arena = GetArena();
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  if (message_arena == nullptr) {
-    delete reinterpret_cast<::io::deephaven::proto::backplane::script::grpc::FigureDescriptor_StringMapWithDefault*>(_impl_.point_shape_);
-  }
-
-  if (value != nullptr) {
-    ::google::protobuf::Arena* submessage_arena = reinterpret_cast<::io::deephaven::proto::backplane::script::grpc::FigureDescriptor_StringMapWithDefault*>(value)->GetArena();
-    if (message_arena != submessage_arena) {
-      value = ::google::protobuf::internal::GetOwnedMessage(message_arena, value, submessage_arena);
-    }
-    _impl_._has_bits_[0] |= 0x00000400u;
-  } else {
-    _impl_._has_bits_[0] &= ~0x00000400u;
-  }
-
-  _impl_.point_shape_ = reinterpret_cast<::io::deephaven::proto::backplane::script::grpc::FigureDescriptor_StringMapWithDefault*>(value);
-  // @@protoc_insertion_point(field_set_allocated:io.deephaven.proto.backplane.script.grpc.FigureDescriptor.MultiSeriesDescriptor.point_shape)
-}
-
-// repeated .io.deephaven.proto.backplane.script.grpc.FigureDescriptor.MultiSeriesSourceDescriptor data_sources = 14;
-inline int FigureDescriptor_MultiSeriesDescriptor::_internal_data_sources_size() const {
-  return _internal_data_sources().size();
-}
-inline int FigureDescriptor_MultiSeriesDescriptor::data_sources_size() const {
-  return _internal_data_sources_size();
-}
-inline void FigureDescriptor_MultiSeriesDescriptor::clear_data_sources() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  _impl_.data_sources_.Clear();
-}
-inline ::io::deephaven::proto::backplane::script::grpc::FigureDescriptor_MultiSeriesSourceDescriptor* FigureDescriptor_MultiSeriesDescriptor::mutable_data_sources(int index)
-    ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  // @@protoc_insertion_point(field_mutable:io.deephaven.proto.backplane.script.grpc.FigureDescriptor.MultiSeriesDescriptor.data_sources)
-  return _internal_mutable_data_sources()->Mutable(index);
-}
-inline ::google::protobuf::RepeatedPtrField<::io::deephaven::proto::backplane::script::grpc::FigureDescriptor_MultiSeriesSourceDescriptor>* FigureDescriptor_MultiSeriesDescriptor::mutable_data_sources()
-    ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  // @@protoc_insertion_point(field_mutable_list:io.deephaven.proto.backplane.script.grpc.FigureDescriptor.MultiSeriesDescriptor.data_sources)
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  return _internal_mutable_data_sources();
-}
-inline const ::io::deephaven::proto::backplane::script::grpc::FigureDescriptor_MultiSeriesSourceDescriptor& FigureDescriptor_MultiSeriesDescriptor::data_sources(int index) const
-    ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  // @@protoc_insertion_point(field_get:io.deephaven.proto.backplane.script.grpc.FigureDescriptor.MultiSeriesDescriptor.data_sources)
-  return _internal_data_sources().Get(index);
-}
-inline ::io::deephaven::proto::backplane::script::grpc::FigureDescriptor_MultiSeriesSourceDescriptor* FigureDescriptor_MultiSeriesDescriptor::add_data_sources() ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  ::io::deephaven::proto::backplane::script::grpc::FigureDescriptor_MultiSeriesSourceDescriptor* _add = _internal_mutable_data_sources()->Add();
-  // @@protoc_insertion_point(field_add:io.deephaven.proto.backplane.script.grpc.FigureDescriptor.MultiSeriesDescriptor.data_sources)
-  return _add;
-}
-inline const ::google::protobuf::RepeatedPtrField<::io::deephaven::proto::backplane::script::grpc::FigureDescriptor_MultiSeriesSourceDescriptor>& FigureDescriptor_MultiSeriesDescriptor::data_sources() const
-    ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  // @@protoc_insertion_point(field_list:io.deephaven.proto.backplane.script.grpc.FigureDescriptor.MultiSeriesDescriptor.data_sources)
-  return _internal_data_sources();
-}
-inline const ::google::protobuf::RepeatedPtrField<::io::deephaven::proto::backplane::script::grpc::FigureDescriptor_MultiSeriesSourceDescriptor>&
-FigureDescriptor_MultiSeriesDescriptor::_internal_data_sources() const {
-  PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race);
-  return _impl_.data_sources_;
-}
-inline ::google::protobuf::RepeatedPtrField<::io::deephaven::proto::backplane::script::grpc::FigureDescriptor_MultiSeriesSourceDescriptor>*
-FigureDescriptor_MultiSeriesDescriptor::_internal_mutable_data_sources() {
-  PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race);
-  return &_impl_.data_sources_;
-}
-
-// -------------------------------------------------------------------
-
-// FigureDescriptor_StringMapWithDefault
-
-// optional string default_string = 1;
-inline bool FigureDescriptor_StringMapWithDefault::has_default_string() const {
-  bool value = (_impl_._has_bits_[0] & 0x00000001u) != 0;
-  return value;
-}
-inline void FigureDescriptor_StringMapWithDefault::clear_default_string() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  _impl_.default_string_.ClearToEmpty();
-  _impl_._has_bits_[0] &= ~0x00000001u;
-}
-inline const std::string& FigureDescriptor_StringMapWithDefault::default_string() const
-    ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  // @@protoc_insertion_point(field_get:io.deephaven.proto.backplane.script.grpc.FigureDescriptor.StringMapWithDefault.default_string)
-  return _internal_default_string();
-}
-template <typename Arg_, typename... Args_>
-inline PROTOBUF_ALWAYS_INLINE void FigureDescriptor_StringMapWithDefault::set_default_string(Arg_&& arg,
-                                                     Args_... args) {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  _impl_._has_bits_[0] |= 0x00000001u;
-  _impl_.default_string_.Set(static_cast<Arg_&&>(arg), args..., GetArena());
-  // @@protoc_insertion_point(field_set:io.deephaven.proto.backplane.script.grpc.FigureDescriptor.StringMapWithDefault.default_string)
-}
-inline std::string* FigureDescriptor_StringMapWithDefault::mutable_default_string() ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  std::string* _s = _internal_mutable_default_string();
-  // @@protoc_insertion_point(field_mutable:io.deephaven.proto.backplane.script.grpc.FigureDescriptor.StringMapWithDefault.default_string)
-  return _s;
-}
-inline const std::string& FigureDescriptor_StringMapWithDefault::_internal_default_string() const {
-  PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race);
-  return _impl_.default_string_.Get();
-}
-inline void FigureDescriptor_StringMapWithDefault::_internal_set_default_string(const std::string& value) {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  _impl_._has_bits_[0] |= 0x00000001u;
-  _impl_.default_string_.Set(value, GetArena());
-}
-inline std::string* FigureDescriptor_StringMapWithDefault::_internal_mutable_default_string() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  _impl_._has_bits_[0] |= 0x00000001u;
-  return _impl_.default_string_.Mutable( GetArena());
-}
-inline std::string* FigureDescriptor_StringMapWithDefault::release_default_string() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  // @@protoc_insertion_point(field_release:io.deephaven.proto.backplane.script.grpc.FigureDescriptor.StringMapWithDefault.default_string)
-  if ((_impl_._has_bits_[0] & 0x00000001u) == 0) {
-    return nullptr;
-  }
-  _impl_._has_bits_[0] &= ~0x00000001u;
-  auto* released = _impl_.default_string_.Release();
-  #ifdef PROTOBUF_FORCE_COPY_DEFAULT_STRING
-  _impl_.default_string_.Set("", GetArena());
-  #endif  // PROTOBUF_FORCE_COPY_DEFAULT_STRING
-  return released;
-}
-inline void FigureDescriptor_StringMapWithDefault::set_allocated_default_string(std::string* value) {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  if (value != nullptr) {
-    _impl_._has_bits_[0] |= 0x00000001u;
-  } else {
-    _impl_._has_bits_[0] &= ~0x00000001u;
-  }
-  _impl_.default_string_.SetAllocated(value, GetArena());
-  #ifdef PROTOBUF_FORCE_COPY_DEFAULT_STRING
-        if (_impl_.default_string_.IsDefault()) {
-          _impl_.default_string_.Set("", GetArena());
-        }
-  #endif  // PROTOBUF_FORCE_COPY_DEFAULT_STRING
-  // @@protoc_insertion_point(field_set_allocated:io.deephaven.proto.backplane.script.grpc.FigureDescriptor.StringMapWithDefault.default_string)
-}
-
-// repeated string keys = 2;
-inline int FigureDescriptor_StringMapWithDefault::_internal_keys_size() const {
-  return _internal_keys().size();
-}
-inline int FigureDescriptor_StringMapWithDefault::keys_size() const {
-  return _internal_keys_size();
-}
-inline void FigureDescriptor_StringMapWithDefault::clear_keys() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  _impl_.keys_.Clear();
-}
-inline std::string* FigureDescriptor_StringMapWithDefault::add_keys()
-    ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  std::string* _s = _internal_mutable_keys()->Add();
-  // @@protoc_insertion_point(field_add_mutable:io.deephaven.proto.backplane.script.grpc.FigureDescriptor.StringMapWithDefault.keys)
-  return _s;
-}
-inline const std::string& FigureDescriptor_StringMapWithDefault::keys(int index) const
-    ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  // @@protoc_insertion_point(field_get:io.deephaven.proto.backplane.script.grpc.FigureDescriptor.StringMapWithDefault.keys)
-  return _internal_keys().Get(index);
-}
-inline std::string* FigureDescriptor_StringMapWithDefault::mutable_keys(int index)
-    ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  // @@protoc_insertion_point(field_mutable:io.deephaven.proto.backplane.script.grpc.FigureDescriptor.StringMapWithDefault.keys)
-  return _internal_mutable_keys()->Mutable(index);
-}
-inline void FigureDescriptor_StringMapWithDefault::set_keys(int index, const std::string& value) {
-  _internal_mutable_keys()->Mutable(index)->assign(value);
-  // @@protoc_insertion_point(field_set:io.deephaven.proto.backplane.script.grpc.FigureDescriptor.StringMapWithDefault.keys)
-}
-inline void FigureDescriptor_StringMapWithDefault::set_keys(int index, std::string&& value) {
-  _internal_mutable_keys()->Mutable(index)->assign(std::move(value));
-  // @@protoc_insertion_point(field_set:io.deephaven.proto.backplane.script.grpc.FigureDescriptor.StringMapWithDefault.keys)
-}
-inline void FigureDescriptor_StringMapWithDefault::set_keys(int index, const char* value) {
-  ABSL_DCHECK(value != nullptr);
-  _internal_mutable_keys()->Mutable(index)->assign(value);
-  // @@protoc_insertion_point(field_set_char:io.deephaven.proto.backplane.script.grpc.FigureDescriptor.StringMapWithDefault.keys)
-}
-inline void FigureDescriptor_StringMapWithDefault::set_keys(int index, const char* value,
-                              std::size_t size) {
-  _internal_mutable_keys()->Mutable(index)->assign(
-      reinterpret_cast<const char*>(value), size);
-  // @@protoc_insertion_point(field_set_pointer:io.deephaven.proto.backplane.script.grpc.FigureDescriptor.StringMapWithDefault.keys)
-}
-inline void FigureDescriptor_StringMapWithDefault::set_keys(int index, absl::string_view value) {
-  _internal_mutable_keys()->Mutable(index)->assign(value.data(),
-                                                     value.size());
-  // @@protoc_insertion_point(field_set_string_piece:io.deephaven.proto.backplane.script.grpc.FigureDescriptor.StringMapWithDefault.keys)
-}
-inline void FigureDescriptor_StringMapWithDefault::add_keys(const std::string& value) {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  _internal_mutable_keys()->Add()->assign(value);
-  // @@protoc_insertion_point(field_add:io.deephaven.proto.backplane.script.grpc.FigureDescriptor.StringMapWithDefault.keys)
-}
-inline void FigureDescriptor_StringMapWithDefault::add_keys(std::string&& value) {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  _internal_mutable_keys()->Add(std::move(value));
-  // @@protoc_insertion_point(field_add:io.deephaven.proto.backplane.script.grpc.FigureDescriptor.StringMapWithDefault.keys)
-}
-inline void FigureDescriptor_StringMapWithDefault::add_keys(const char* value) {
-  ABSL_DCHECK(value != nullptr);
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  _internal_mutable_keys()->Add()->assign(value);
-  // @@protoc_insertion_point(field_add_char:io.deephaven.proto.backplane.script.grpc.FigureDescriptor.StringMapWithDefault.keys)
-}
-inline void FigureDescriptor_StringMapWithDefault::add_keys(const char* value, std::size_t size) {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  _internal_mutable_keys()->Add()->assign(
-      reinterpret_cast<const char*>(value), size);
-  // @@protoc_insertion_point(field_add_pointer:io.deephaven.proto.backplane.script.grpc.FigureDescriptor.StringMapWithDefault.keys)
-}
-inline void FigureDescriptor_StringMapWithDefault::add_keys(absl::string_view value) {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  _internal_mutable_keys()->Add()->assign(value.data(), value.size());
-  // @@protoc_insertion_point(field_add_string_piece:io.deephaven.proto.backplane.script.grpc.FigureDescriptor.StringMapWithDefault.keys)
-}
-inline const ::google::protobuf::RepeatedPtrField<std::string>&
-FigureDescriptor_StringMapWithDefault::keys() const ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  // @@protoc_insertion_point(field_list:io.deephaven.proto.backplane.script.grpc.FigureDescriptor.StringMapWithDefault.keys)
-  return _internal_keys();
-}
-inline ::google::protobuf::RepeatedPtrField<std::string>*
-FigureDescriptor_StringMapWithDefault::mutable_keys() ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  // @@protoc_insertion_point(field_mutable_list:io.deephaven.proto.backplane.script.grpc.FigureDescriptor.StringMapWithDefault.keys)
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  return _internal_mutable_keys();
-}
-inline const ::google::protobuf::RepeatedPtrField<std::string>&
-FigureDescriptor_StringMapWithDefault::_internal_keys() const {
-  PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race);
-  return _impl_.keys_;
-}
-inline ::google::protobuf::RepeatedPtrField<std::string>*
-FigureDescriptor_StringMapWithDefault::_internal_mutable_keys() {
-  PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race);
-  return &_impl_.keys_;
-}
-
-// repeated string values = 3;
-inline int FigureDescriptor_StringMapWithDefault::_internal_values_size() const {
-  return _internal_values().size();
-}
-inline int FigureDescriptor_StringMapWithDefault::values_size() const {
-  return _internal_values_size();
-}
-inline void FigureDescriptor_StringMapWithDefault::clear_values() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  _impl_.values_.Clear();
-}
-inline std::string* FigureDescriptor_StringMapWithDefault::add_values()
-    ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  std::string* _s = _internal_mutable_values()->Add();
-  // @@protoc_insertion_point(field_add_mutable:io.deephaven.proto.backplane.script.grpc.FigureDescriptor.StringMapWithDefault.values)
-  return _s;
-}
-inline const std::string& FigureDescriptor_StringMapWithDefault::values(int index) const
-    ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  // @@protoc_insertion_point(field_get:io.deephaven.proto.backplane.script.grpc.FigureDescriptor.StringMapWithDefault.values)
-  return _internal_values().Get(index);
-}
-inline std::string* FigureDescriptor_StringMapWithDefault::mutable_values(int index)
-    ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  // @@protoc_insertion_point(field_mutable:io.deephaven.proto.backplane.script.grpc.FigureDescriptor.StringMapWithDefault.values)
-  return _internal_mutable_values()->Mutable(index);
-}
-inline void FigureDescriptor_StringMapWithDefault::set_values(int index, const std::string& value) {
-  _internal_mutable_values()->Mutable(index)->assign(value);
-  // @@protoc_insertion_point(field_set:io.deephaven.proto.backplane.script.grpc.FigureDescriptor.StringMapWithDefault.values)
-}
-inline void FigureDescriptor_StringMapWithDefault::set_values(int index, std::string&& value) {
-  _internal_mutable_values()->Mutable(index)->assign(std::move(value));
-  // @@protoc_insertion_point(field_set:io.deephaven.proto.backplane.script.grpc.FigureDescriptor.StringMapWithDefault.values)
-}
-inline void FigureDescriptor_StringMapWithDefault::set_values(int index, const char* value) {
-  ABSL_DCHECK(value != nullptr);
-  _internal_mutable_values()->Mutable(index)->assign(value);
-  // @@protoc_insertion_point(field_set_char:io.deephaven.proto.backplane.script.grpc.FigureDescriptor.StringMapWithDefault.values)
-}
-inline void FigureDescriptor_StringMapWithDefault::set_values(int index, const char* value,
-                              std::size_t size) {
-  _internal_mutable_values()->Mutable(index)->assign(
-      reinterpret_cast<const char*>(value), size);
-  // @@protoc_insertion_point(field_set_pointer:io.deephaven.proto.backplane.script.grpc.FigureDescriptor.StringMapWithDefault.values)
-}
-inline void FigureDescriptor_StringMapWithDefault::set_values(int index, absl::string_view value) {
-  _internal_mutable_values()->Mutable(index)->assign(value.data(),
-                                                     value.size());
-  // @@protoc_insertion_point(field_set_string_piece:io.deephaven.proto.backplane.script.grpc.FigureDescriptor.StringMapWithDefault.values)
-}
-inline void FigureDescriptor_StringMapWithDefault::add_values(const std::string& value) {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  _internal_mutable_values()->Add()->assign(value);
-  // @@protoc_insertion_point(field_add:io.deephaven.proto.backplane.script.grpc.FigureDescriptor.StringMapWithDefault.values)
-}
-inline void FigureDescriptor_StringMapWithDefault::add_values(std::string&& value) {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  _internal_mutable_values()->Add(std::move(value));
-  // @@protoc_insertion_point(field_add:io.deephaven.proto.backplane.script.grpc.FigureDescriptor.StringMapWithDefault.values)
-}
-inline void FigureDescriptor_StringMapWithDefault::add_values(const char* value) {
-  ABSL_DCHECK(value != nullptr);
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  _internal_mutable_values()->Add()->assign(value);
-  // @@protoc_insertion_point(field_add_char:io.deephaven.proto.backplane.script.grpc.FigureDescriptor.StringMapWithDefault.values)
-}
-inline void FigureDescriptor_StringMapWithDefault::add_values(const char* value, std::size_t size) {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  _internal_mutable_values()->Add()->assign(
-      reinterpret_cast<const char*>(value), size);
-  // @@protoc_insertion_point(field_add_pointer:io.deephaven.proto.backplane.script.grpc.FigureDescriptor.StringMapWithDefault.values)
-}
-inline void FigureDescriptor_StringMapWithDefault::add_values(absl::string_view value) {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  _internal_mutable_values()->Add()->assign(value.data(), value.size());
-  // @@protoc_insertion_point(field_add_string_piece:io.deephaven.proto.backplane.script.grpc.FigureDescriptor.StringMapWithDefault.values)
-}
-inline const ::google::protobuf::RepeatedPtrField<std::string>&
-FigureDescriptor_StringMapWithDefault::values() const ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  // @@protoc_insertion_point(field_list:io.deephaven.proto.backplane.script.grpc.FigureDescriptor.StringMapWithDefault.values)
-  return _internal_values();
-}
-inline ::google::protobuf::RepeatedPtrField<std::string>*
-FigureDescriptor_StringMapWithDefault::mutable_values() ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  // @@protoc_insertion_point(field_mutable_list:io.deephaven.proto.backplane.script.grpc.FigureDescriptor.StringMapWithDefault.values)
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  return _internal_mutable_values();
-}
-inline const ::google::protobuf::RepeatedPtrField<std::string>&
-FigureDescriptor_StringMapWithDefault::_internal_values() const {
-  PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race);
-  return _impl_.values_;
-}
-inline ::google::protobuf::RepeatedPtrField<std::string>*
-FigureDescriptor_StringMapWithDefault::_internal_mutable_values() {
-  PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race);
-  return &_impl_.values_;
-}
-
-// -------------------------------------------------------------------
-
-// FigureDescriptor_DoubleMapWithDefault
-
-// optional double default_double = 1;
-inline bool FigureDescriptor_DoubleMapWithDefault::has_default_double() const {
-  bool value = (_impl_._has_bits_[0] & 0x00000001u) != 0;
-  return value;
-}
-inline void FigureDescriptor_DoubleMapWithDefault::clear_default_double() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  _impl_.default_double_ = 0;
-  _impl_._has_bits_[0] &= ~0x00000001u;
-}
-inline double FigureDescriptor_DoubleMapWithDefault::default_double() const {
-  // @@protoc_insertion_point(field_get:io.deephaven.proto.backplane.script.grpc.FigureDescriptor.DoubleMapWithDefault.default_double)
-  return _internal_default_double();
-}
-inline void FigureDescriptor_DoubleMapWithDefault::set_default_double(double value) {
-  _internal_set_default_double(value);
-  // @@protoc_insertion_point(field_set:io.deephaven.proto.backplane.script.grpc.FigureDescriptor.DoubleMapWithDefault.default_double)
-}
-inline double FigureDescriptor_DoubleMapWithDefault::_internal_default_double() const {
-  PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race);
-  return _impl_.default_double_;
-}
-inline void FigureDescriptor_DoubleMapWithDefault::_internal_set_default_double(double value) {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  _impl_._has_bits_[0] |= 0x00000001u;
-  _impl_.default_double_ = value;
-}
-
-// repeated string keys = 2;
-inline int FigureDescriptor_DoubleMapWithDefault::_internal_keys_size() const {
-  return _internal_keys().size();
-}
-inline int FigureDescriptor_DoubleMapWithDefault::keys_size() const {
-  return _internal_keys_size();
-}
-inline void FigureDescriptor_DoubleMapWithDefault::clear_keys() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  _impl_.keys_.Clear();
-}
-inline std::string* FigureDescriptor_DoubleMapWithDefault::add_keys()
-    ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  std::string* _s = _internal_mutable_keys()->Add();
-  // @@protoc_insertion_point(field_add_mutable:io.deephaven.proto.backplane.script.grpc.FigureDescriptor.DoubleMapWithDefault.keys)
-  return _s;
-}
-inline const std::string& FigureDescriptor_DoubleMapWithDefault::keys(int index) const
-    ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  // @@protoc_insertion_point(field_get:io.deephaven.proto.backplane.script.grpc.FigureDescriptor.DoubleMapWithDefault.keys)
-  return _internal_keys().Get(index);
-}
-inline std::string* FigureDescriptor_DoubleMapWithDefault::mutable_keys(int index)
-    ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  // @@protoc_insertion_point(field_mutable:io.deephaven.proto.backplane.script.grpc.FigureDescriptor.DoubleMapWithDefault.keys)
-  return _internal_mutable_keys()->Mutable(index);
-}
-inline void FigureDescriptor_DoubleMapWithDefault::set_keys(int index, const std::string& value) {
-  _internal_mutable_keys()->Mutable(index)->assign(value);
-  // @@protoc_insertion_point(field_set:io.deephaven.proto.backplane.script.grpc.FigureDescriptor.DoubleMapWithDefault.keys)
-}
-inline void FigureDescriptor_DoubleMapWithDefault::set_keys(int index, std::string&& value) {
-  _internal_mutable_keys()->Mutable(index)->assign(std::move(value));
-  // @@protoc_insertion_point(field_set:io.deephaven.proto.backplane.script.grpc.FigureDescriptor.DoubleMapWithDefault.keys)
-}
-inline void FigureDescriptor_DoubleMapWithDefault::set_keys(int index, const char* value) {
-  ABSL_DCHECK(value != nullptr);
-  _internal_mutable_keys()->Mutable(index)->assign(value);
-  // @@protoc_insertion_point(field_set_char:io.deephaven.proto.backplane.script.grpc.FigureDescriptor.DoubleMapWithDefault.keys)
-}
-inline void FigureDescriptor_DoubleMapWithDefault::set_keys(int index, const char* value,
-                              std::size_t size) {
-  _internal_mutable_keys()->Mutable(index)->assign(
-      reinterpret_cast<const char*>(value), size);
-  // @@protoc_insertion_point(field_set_pointer:io.deephaven.proto.backplane.script.grpc.FigureDescriptor.DoubleMapWithDefault.keys)
-}
-inline void FigureDescriptor_DoubleMapWithDefault::set_keys(int index, absl::string_view value) {
-  _internal_mutable_keys()->Mutable(index)->assign(value.data(),
-                                                     value.size());
-  // @@protoc_insertion_point(field_set_string_piece:io.deephaven.proto.backplane.script.grpc.FigureDescriptor.DoubleMapWithDefault.keys)
-}
-inline void FigureDescriptor_DoubleMapWithDefault::add_keys(const std::string& value) {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  _internal_mutable_keys()->Add()->assign(value);
-  // @@protoc_insertion_point(field_add:io.deephaven.proto.backplane.script.grpc.FigureDescriptor.DoubleMapWithDefault.keys)
-}
-inline void FigureDescriptor_DoubleMapWithDefault::add_keys(std::string&& value) {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  _internal_mutable_keys()->Add(std::move(value));
-  // @@protoc_insertion_point(field_add:io.deephaven.proto.backplane.script.grpc.FigureDescriptor.DoubleMapWithDefault.keys)
-}
-inline void FigureDescriptor_DoubleMapWithDefault::add_keys(const char* value) {
-  ABSL_DCHECK(value != nullptr);
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  _internal_mutable_keys()->Add()->assign(value);
-  // @@protoc_insertion_point(field_add_char:io.deephaven.proto.backplane.script.grpc.FigureDescriptor.DoubleMapWithDefault.keys)
-}
-inline void FigureDescriptor_DoubleMapWithDefault::add_keys(const char* value, std::size_t size) {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  _internal_mutable_keys()->Add()->assign(
-      reinterpret_cast<const char*>(value), size);
-  // @@protoc_insertion_point(field_add_pointer:io.deephaven.proto.backplane.script.grpc.FigureDescriptor.DoubleMapWithDefault.keys)
-}
-inline void FigureDescriptor_DoubleMapWithDefault::add_keys(absl::string_view value) {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  _internal_mutable_keys()->Add()->assign(value.data(), value.size());
-  // @@protoc_insertion_point(field_add_string_piece:io.deephaven.proto.backplane.script.grpc.FigureDescriptor.DoubleMapWithDefault.keys)
-}
-inline const ::google::protobuf::RepeatedPtrField<std::string>&
-FigureDescriptor_DoubleMapWithDefault::keys() const ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  // @@protoc_insertion_point(field_list:io.deephaven.proto.backplane.script.grpc.FigureDescriptor.DoubleMapWithDefault.keys)
-  return _internal_keys();
-}
-inline ::google::protobuf::RepeatedPtrField<std::string>*
-FigureDescriptor_DoubleMapWithDefault::mutable_keys() ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  // @@protoc_insertion_point(field_mutable_list:io.deephaven.proto.backplane.script.grpc.FigureDescriptor.DoubleMapWithDefault.keys)
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  return _internal_mutable_keys();
-}
-inline const ::google::protobuf::RepeatedPtrField<std::string>&
-FigureDescriptor_DoubleMapWithDefault::_internal_keys() const {
-  PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race);
-  return _impl_.keys_;
-}
-inline ::google::protobuf::RepeatedPtrField<std::string>*
-FigureDescriptor_DoubleMapWithDefault::_internal_mutable_keys() {
-  PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race);
-  return &_impl_.keys_;
-}
-
-// repeated double values = 3;
-inline int FigureDescriptor_DoubleMapWithDefault::_internal_values_size() const {
-  return _internal_values().size();
-}
-inline int FigureDescriptor_DoubleMapWithDefault::values_size() const {
-  return _internal_values_size();
-}
-inline void FigureDescriptor_DoubleMapWithDefault::clear_values() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  _impl_.values_.Clear();
-}
-inline double FigureDescriptor_DoubleMapWithDefault::values(int index) const {
-  // @@protoc_insertion_point(field_get:io.deephaven.proto.backplane.script.grpc.FigureDescriptor.DoubleMapWithDefault.values)
-  return _internal_values().Get(index);
-}
-inline void FigureDescriptor_DoubleMapWithDefault::set_values(int index, double value) {
-  _internal_mutable_values()->Set(index, value);
-  // @@protoc_insertion_point(field_set:io.deephaven.proto.backplane.script.grpc.FigureDescriptor.DoubleMapWithDefault.values)
-}
-inline void FigureDescriptor_DoubleMapWithDefault::add_values(double value) {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  _internal_mutable_values()->Add(value);
-  // @@protoc_insertion_point(field_add:io.deephaven.proto.backplane.script.grpc.FigureDescriptor.DoubleMapWithDefault.values)
-}
-inline const ::google::protobuf::RepeatedField<double>& FigureDescriptor_DoubleMapWithDefault::values() const
-    ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  // @@protoc_insertion_point(field_list:io.deephaven.proto.backplane.script.grpc.FigureDescriptor.DoubleMapWithDefault.values)
-  return _internal_values();
-}
-inline ::google::protobuf::RepeatedField<double>* FigureDescriptor_DoubleMapWithDefault::mutable_values()
-    ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  // @@protoc_insertion_point(field_mutable_list:io.deephaven.proto.backplane.script.grpc.FigureDescriptor.DoubleMapWithDefault.values)
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  return _internal_mutable_values();
-}
-inline const ::google::protobuf::RepeatedField<double>& FigureDescriptor_DoubleMapWithDefault::_internal_values()
-    const {
-  PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race);
-  return _impl_.values_;
-}
-inline ::google::protobuf::RepeatedField<double>* FigureDescriptor_DoubleMapWithDefault::_internal_mutable_values() {
-  PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race);
-  return &_impl_.values_;
-}
-
-// -------------------------------------------------------------------
-
-// FigureDescriptor_BoolMapWithDefault
-
-// optional bool default_bool = 1;
-inline bool FigureDescriptor_BoolMapWithDefault::has_default_bool() const {
-  bool value = (_impl_._has_bits_[0] & 0x00000001u) != 0;
-  return value;
-}
-inline void FigureDescriptor_BoolMapWithDefault::clear_default_bool() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  _impl_.default_bool_ = false;
-  _impl_._has_bits_[0] &= ~0x00000001u;
-}
-inline bool FigureDescriptor_BoolMapWithDefault::default_bool() const {
-  // @@protoc_insertion_point(field_get:io.deephaven.proto.backplane.script.grpc.FigureDescriptor.BoolMapWithDefault.default_bool)
-  return _internal_default_bool();
-}
-inline void FigureDescriptor_BoolMapWithDefault::set_default_bool(bool value) {
-  _internal_set_default_bool(value);
-  // @@protoc_insertion_point(field_set:io.deephaven.proto.backplane.script.grpc.FigureDescriptor.BoolMapWithDefault.default_bool)
-}
-inline bool FigureDescriptor_BoolMapWithDefault::_internal_default_bool() const {
-  PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race);
-  return _impl_.default_bool_;
-}
-inline void FigureDescriptor_BoolMapWithDefault::_internal_set_default_bool(bool value) {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  _impl_._has_bits_[0] |= 0x00000001u;
-  _impl_.default_bool_ = value;
-}
-
-// repeated string keys = 2;
-inline int FigureDescriptor_BoolMapWithDefault::_internal_keys_size() const {
-  return _internal_keys().size();
-}
-inline int FigureDescriptor_BoolMapWithDefault::keys_size() const {
-  return _internal_keys_size();
-}
-inline void FigureDescriptor_BoolMapWithDefault::clear_keys() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  _impl_.keys_.Clear();
-}
-inline std::string* FigureDescriptor_BoolMapWithDefault::add_keys()
-    ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  std::string* _s = _internal_mutable_keys()->Add();
-  // @@protoc_insertion_point(field_add_mutable:io.deephaven.proto.backplane.script.grpc.FigureDescriptor.BoolMapWithDefault.keys)
-  return _s;
-}
-inline const std::string& FigureDescriptor_BoolMapWithDefault::keys(int index) const
-    ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  // @@protoc_insertion_point(field_get:io.deephaven.proto.backplane.script.grpc.FigureDescriptor.BoolMapWithDefault.keys)
-  return _internal_keys().Get(index);
-}
-inline std::string* FigureDescriptor_BoolMapWithDefault::mutable_keys(int index)
-    ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  // @@protoc_insertion_point(field_mutable:io.deephaven.proto.backplane.script.grpc.FigureDescriptor.BoolMapWithDefault.keys)
-  return _internal_mutable_keys()->Mutable(index);
-}
-inline void FigureDescriptor_BoolMapWithDefault::set_keys(int index, const std::string& value) {
-  _internal_mutable_keys()->Mutable(index)->assign(value);
-  // @@protoc_insertion_point(field_set:io.deephaven.proto.backplane.script.grpc.FigureDescriptor.BoolMapWithDefault.keys)
-}
-inline void FigureDescriptor_BoolMapWithDefault::set_keys(int index, std::string&& value) {
-  _internal_mutable_keys()->Mutable(index)->assign(std::move(value));
-  // @@protoc_insertion_point(field_set:io.deephaven.proto.backplane.script.grpc.FigureDescriptor.BoolMapWithDefault.keys)
-}
-inline void FigureDescriptor_BoolMapWithDefault::set_keys(int index, const char* value) {
-  ABSL_DCHECK(value != nullptr);
-  _internal_mutable_keys()->Mutable(index)->assign(value);
-  // @@protoc_insertion_point(field_set_char:io.deephaven.proto.backplane.script.grpc.FigureDescriptor.BoolMapWithDefault.keys)
-}
-inline void FigureDescriptor_BoolMapWithDefault::set_keys(int index, const char* value,
-                              std::size_t size) {
-  _internal_mutable_keys()->Mutable(index)->assign(
-      reinterpret_cast<const char*>(value), size);
-  // @@protoc_insertion_point(field_set_pointer:io.deephaven.proto.backplane.script.grpc.FigureDescriptor.BoolMapWithDefault.keys)
-}
-inline void FigureDescriptor_BoolMapWithDefault::set_keys(int index, absl::string_view value) {
-  _internal_mutable_keys()->Mutable(index)->assign(value.data(),
-                                                     value.size());
-  // @@protoc_insertion_point(field_set_string_piece:io.deephaven.proto.backplane.script.grpc.FigureDescriptor.BoolMapWithDefault.keys)
-}
-inline void FigureDescriptor_BoolMapWithDefault::add_keys(const std::string& value) {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  _internal_mutable_keys()->Add()->assign(value);
-  // @@protoc_insertion_point(field_add:io.deephaven.proto.backplane.script.grpc.FigureDescriptor.BoolMapWithDefault.keys)
-}
-inline void FigureDescriptor_BoolMapWithDefault::add_keys(std::string&& value) {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  _internal_mutable_keys()->Add(std::move(value));
-  // @@protoc_insertion_point(field_add:io.deephaven.proto.backplane.script.grpc.FigureDescriptor.BoolMapWithDefault.keys)
-}
-inline void FigureDescriptor_BoolMapWithDefault::add_keys(const char* value) {
-  ABSL_DCHECK(value != nullptr);
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  _internal_mutable_keys()->Add()->assign(value);
-  // @@protoc_insertion_point(field_add_char:io.deephaven.proto.backplane.script.grpc.FigureDescriptor.BoolMapWithDefault.keys)
-}
-inline void FigureDescriptor_BoolMapWithDefault::add_keys(const char* value, std::size_t size) {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  _internal_mutable_keys()->Add()->assign(
-      reinterpret_cast<const char*>(value), size);
-  // @@protoc_insertion_point(field_add_pointer:io.deephaven.proto.backplane.script.grpc.FigureDescriptor.BoolMapWithDefault.keys)
-}
-inline void FigureDescriptor_BoolMapWithDefault::add_keys(absl::string_view value) {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  _internal_mutable_keys()->Add()->assign(value.data(), value.size());
-  // @@protoc_insertion_point(field_add_string_piece:io.deephaven.proto.backplane.script.grpc.FigureDescriptor.BoolMapWithDefault.keys)
-}
-inline const ::google::protobuf::RepeatedPtrField<std::string>&
-FigureDescriptor_BoolMapWithDefault::keys() const ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  // @@protoc_insertion_point(field_list:io.deephaven.proto.backplane.script.grpc.FigureDescriptor.BoolMapWithDefault.keys)
-  return _internal_keys();
-}
-inline ::google::protobuf::RepeatedPtrField<std::string>*
-FigureDescriptor_BoolMapWithDefault::mutable_keys() ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  // @@protoc_insertion_point(field_mutable_list:io.deephaven.proto.backplane.script.grpc.FigureDescriptor.BoolMapWithDefault.keys)
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  return _internal_mutable_keys();
-}
-inline const ::google::protobuf::RepeatedPtrField<std::string>&
-FigureDescriptor_BoolMapWithDefault::_internal_keys() const {
-  PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race);
-  return _impl_.keys_;
-}
-inline ::google::protobuf::RepeatedPtrField<std::string>*
-FigureDescriptor_BoolMapWithDefault::_internal_mutable_keys() {
-  PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race);
-  return &_impl_.keys_;
-}
-
-// repeated bool values = 3;
-inline int FigureDescriptor_BoolMapWithDefault::_internal_values_size() const {
-  return _internal_values().size();
-}
-inline int FigureDescriptor_BoolMapWithDefault::values_size() const {
-  return _internal_values_size();
-}
-inline void FigureDescriptor_BoolMapWithDefault::clear_values() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  _impl_.values_.Clear();
-}
-inline bool FigureDescriptor_BoolMapWithDefault::values(int index) const {
-  // @@protoc_insertion_point(field_get:io.deephaven.proto.backplane.script.grpc.FigureDescriptor.BoolMapWithDefault.values)
-  return _internal_values().Get(index);
-}
-inline void FigureDescriptor_BoolMapWithDefault::set_values(int index, bool value) {
-  _internal_mutable_values()->Set(index, value);
-  // @@protoc_insertion_point(field_set:io.deephaven.proto.backplane.script.grpc.FigureDescriptor.BoolMapWithDefault.values)
-}
-inline void FigureDescriptor_BoolMapWithDefault::add_values(bool value) {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  _internal_mutable_values()->Add(value);
-  // @@protoc_insertion_point(field_add:io.deephaven.proto.backplane.script.grpc.FigureDescriptor.BoolMapWithDefault.values)
-}
-inline const ::google::protobuf::RepeatedField<bool>& FigureDescriptor_BoolMapWithDefault::values() const
-    ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  // @@protoc_insertion_point(field_list:io.deephaven.proto.backplane.script.grpc.FigureDescriptor.BoolMapWithDefault.values)
-  return _internal_values();
-}
-inline ::google::protobuf::RepeatedField<bool>* FigureDescriptor_BoolMapWithDefault::mutable_values()
-    ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  // @@protoc_insertion_point(field_mutable_list:io.deephaven.proto.backplane.script.grpc.FigureDescriptor.BoolMapWithDefault.values)
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  return _internal_mutable_values();
-}
-inline const ::google::protobuf::RepeatedField<bool>& FigureDescriptor_BoolMapWithDefault::_internal_values()
-    const {
-  PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race);
-  return _impl_.values_;
-}
-inline ::google::protobuf::RepeatedField<bool>* FigureDescriptor_BoolMapWithDefault::_internal_mutable_values() {
-  PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race);
-  return &_impl_.values_;
-}
-
-// -------------------------------------------------------------------
-
-// FigureDescriptor_AxisDescriptor
-
-// string id = 1;
-inline void FigureDescriptor_AxisDescriptor::clear_id() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  _impl_.id_.ClearToEmpty();
-}
-inline const std::string& FigureDescriptor_AxisDescriptor::id() const
-    ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  // @@protoc_insertion_point(field_get:io.deephaven.proto.backplane.script.grpc.FigureDescriptor.AxisDescriptor.id)
-  return _internal_id();
-}
-template <typename Arg_, typename... Args_>
-inline PROTOBUF_ALWAYS_INLINE void FigureDescriptor_AxisDescriptor::set_id(Arg_&& arg,
-                                                     Args_... args) {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  ;
-  _impl_.id_.Set(static_cast<Arg_&&>(arg), args..., GetArena());
-  // @@protoc_insertion_point(field_set:io.deephaven.proto.backplane.script.grpc.FigureDescriptor.AxisDescriptor.id)
-}
-inline std::string* FigureDescriptor_AxisDescriptor::mutable_id() ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  std::string* _s = _internal_mutable_id();
-  // @@protoc_insertion_point(field_mutable:io.deephaven.proto.backplane.script.grpc.FigureDescriptor.AxisDescriptor.id)
-  return _s;
-}
-inline const std::string& FigureDescriptor_AxisDescriptor::_internal_id() const {
-  PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race);
-  return _impl_.id_.Get();
-}
-inline void FigureDescriptor_AxisDescriptor::_internal_set_id(const std::string& value) {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  ;
-  _impl_.id_.Set(value, GetArena());
-}
-inline std::string* FigureDescriptor_AxisDescriptor::_internal_mutable_id() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  ;
-  return _impl_.id_.Mutable( GetArena());
-}
-inline std::string* FigureDescriptor_AxisDescriptor::release_id() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  // @@protoc_insertion_point(field_release:io.deephaven.proto.backplane.script.grpc.FigureDescriptor.AxisDescriptor.id)
-  return _impl_.id_.Release();
-}
-inline void FigureDescriptor_AxisDescriptor::set_allocated_id(std::string* value) {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  _impl_.id_.SetAllocated(value, GetArena());
-  #ifdef PROTOBUF_FORCE_COPY_DEFAULT_STRING
-        if (_impl_.id_.IsDefault()) {
-          _impl_.id_.Set("", GetArena());
-        }
-  #endif  // PROTOBUF_FORCE_COPY_DEFAULT_STRING
-  // @@protoc_insertion_point(field_set_allocated:io.deephaven.proto.backplane.script.grpc.FigureDescriptor.AxisDescriptor.id)
-}
-
-// .io.deephaven.proto.backplane.script.grpc.FigureDescriptor.AxisDescriptor.AxisFormatType format_type = 2;
-inline void FigureDescriptor_AxisDescriptor::clear_format_type() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  _impl_.format_type_ = 0;
-}
-inline ::io::deephaven::proto::backplane::script::grpc::FigureDescriptor_AxisDescriptor_AxisFormatType FigureDescriptor_AxisDescriptor::format_type() const {
-  // @@protoc_insertion_point(field_get:io.deephaven.proto.backplane.script.grpc.FigureDescriptor.AxisDescriptor.format_type)
-  return _internal_format_type();
-}
-inline void FigureDescriptor_AxisDescriptor::set_format_type(::io::deephaven::proto::backplane::script::grpc::FigureDescriptor_AxisDescriptor_AxisFormatType value) {
-  _internal_set_format_type(value);
-  // @@protoc_insertion_point(field_set:io.deephaven.proto.backplane.script.grpc.FigureDescriptor.AxisDescriptor.format_type)
-}
-inline ::io::deephaven::proto::backplane::script::grpc::FigureDescriptor_AxisDescriptor_AxisFormatType FigureDescriptor_AxisDescriptor::_internal_format_type() const {
-  PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race);
-  return static_cast<::io::deephaven::proto::backplane::script::grpc::FigureDescriptor_AxisDescriptor_AxisFormatType>(_impl_.format_type_);
-}
-inline void FigureDescriptor_AxisDescriptor::_internal_set_format_type(::io::deephaven::proto::backplane::script::grpc::FigureDescriptor_AxisDescriptor_AxisFormatType value) {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  ;
-  _impl_.format_type_ = value;
-}
-
-// .io.deephaven.proto.backplane.script.grpc.FigureDescriptor.AxisDescriptor.AxisType type = 3;
-inline void FigureDescriptor_AxisDescriptor::clear_type() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  _impl_.type_ = 0;
-}
-inline ::io::deephaven::proto::backplane::script::grpc::FigureDescriptor_AxisDescriptor_AxisType FigureDescriptor_AxisDescriptor::type() const {
-  // @@protoc_insertion_point(field_get:io.deephaven.proto.backplane.script.grpc.FigureDescriptor.AxisDescriptor.type)
-  return _internal_type();
-}
-inline void FigureDescriptor_AxisDescriptor::set_type(::io::deephaven::proto::backplane::script::grpc::FigureDescriptor_AxisDescriptor_AxisType value) {
-  _internal_set_type(value);
-  // @@protoc_insertion_point(field_set:io.deephaven.proto.backplane.script.grpc.FigureDescriptor.AxisDescriptor.type)
-}
-inline ::io::deephaven::proto::backplane::script::grpc::FigureDescriptor_AxisDescriptor_AxisType FigureDescriptor_AxisDescriptor::_internal_type() const {
-  PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race);
-  return static_cast<::io::deephaven::proto::backplane::script::grpc::FigureDescriptor_AxisDescriptor_AxisType>(_impl_.type_);
-}
-inline void FigureDescriptor_AxisDescriptor::_internal_set_type(::io::deephaven::proto::backplane::script::grpc::FigureDescriptor_AxisDescriptor_AxisType value) {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  ;
-  _impl_.type_ = value;
-}
-
-// .io.deephaven.proto.backplane.script.grpc.FigureDescriptor.AxisDescriptor.AxisPosition position = 4;
-inline void FigureDescriptor_AxisDescriptor::clear_position() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  _impl_.position_ = 0;
-}
-inline ::io::deephaven::proto::backplane::script::grpc::FigureDescriptor_AxisDescriptor_AxisPosition FigureDescriptor_AxisDescriptor::position() const {
-  // @@protoc_insertion_point(field_get:io.deephaven.proto.backplane.script.grpc.FigureDescriptor.AxisDescriptor.position)
-  return _internal_position();
-}
-inline void FigureDescriptor_AxisDescriptor::set_position(::io::deephaven::proto::backplane::script::grpc::FigureDescriptor_AxisDescriptor_AxisPosition value) {
-  _internal_set_position(value);
-  // @@protoc_insertion_point(field_set:io.deephaven.proto.backplane.script.grpc.FigureDescriptor.AxisDescriptor.position)
-}
-inline ::io::deephaven::proto::backplane::script::grpc::FigureDescriptor_AxisDescriptor_AxisPosition FigureDescriptor_AxisDescriptor::_internal_position() const {
-  PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race);
-  return static_cast<::io::deephaven::proto::backplane::script::grpc::FigureDescriptor_AxisDescriptor_AxisPosition>(_impl_.position_);
-}
-inline void FigureDescriptor_AxisDescriptor::_internal_set_position(::io::deephaven::proto::backplane::script::grpc::FigureDescriptor_AxisDescriptor_AxisPosition value) {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  ;
-  _impl_.position_ = value;
-}
-
-// bool log = 5;
-inline void FigureDescriptor_AxisDescriptor::clear_log() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  _impl_.log_ = false;
-}
-inline bool FigureDescriptor_AxisDescriptor::log() const {
-  // @@protoc_insertion_point(field_get:io.deephaven.proto.backplane.script.grpc.FigureDescriptor.AxisDescriptor.log)
-  return _internal_log();
-}
-inline void FigureDescriptor_AxisDescriptor::set_log(bool value) {
-  _internal_set_log(value);
-  // @@protoc_insertion_point(field_set:io.deephaven.proto.backplane.script.grpc.FigureDescriptor.AxisDescriptor.log)
-}
-inline bool FigureDescriptor_AxisDescriptor::_internal_log() const {
-  PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race);
-  return _impl_.log_;
-}
-inline void FigureDescriptor_AxisDescriptor::_internal_set_log(bool value) {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  ;
-  _impl_.log_ = value;
-}
-
-// string label = 6;
-inline void FigureDescriptor_AxisDescriptor::clear_label() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  _impl_.label_.ClearToEmpty();
-}
-inline const std::string& FigureDescriptor_AxisDescriptor::label() const
-    ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  // @@protoc_insertion_point(field_get:io.deephaven.proto.backplane.script.grpc.FigureDescriptor.AxisDescriptor.label)
-  return _internal_label();
-}
-template <typename Arg_, typename... Args_>
-inline PROTOBUF_ALWAYS_INLINE void FigureDescriptor_AxisDescriptor::set_label(Arg_&& arg,
-                                                     Args_... args) {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  ;
-  _impl_.label_.Set(static_cast<Arg_&&>(arg), args..., GetArena());
-  // @@protoc_insertion_point(field_set:io.deephaven.proto.backplane.script.grpc.FigureDescriptor.AxisDescriptor.label)
-}
-inline std::string* FigureDescriptor_AxisDescriptor::mutable_label() ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  std::string* _s = _internal_mutable_label();
-  // @@protoc_insertion_point(field_mutable:io.deephaven.proto.backplane.script.grpc.FigureDescriptor.AxisDescriptor.label)
-  return _s;
-}
-inline const std::string& FigureDescriptor_AxisDescriptor::_internal_label() const {
-  PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race);
-  return _impl_.label_.Get();
-}
-inline void FigureDescriptor_AxisDescriptor::_internal_set_label(const std::string& value) {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  ;
-  _impl_.label_.Set(value, GetArena());
-}
-inline std::string* FigureDescriptor_AxisDescriptor::_internal_mutable_label() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  ;
-  return _impl_.label_.Mutable( GetArena());
-}
-inline std::string* FigureDescriptor_AxisDescriptor::release_label() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  // @@protoc_insertion_point(field_release:io.deephaven.proto.backplane.script.grpc.FigureDescriptor.AxisDescriptor.label)
-  return _impl_.label_.Release();
-}
-inline void FigureDescriptor_AxisDescriptor::set_allocated_label(std::string* value) {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  _impl_.label_.SetAllocated(value, GetArena());
-  #ifdef PROTOBUF_FORCE_COPY_DEFAULT_STRING
-        if (_impl_.label_.IsDefault()) {
-          _impl_.label_.Set("", GetArena());
-        }
-  #endif  // PROTOBUF_FORCE_COPY_DEFAULT_STRING
-  // @@protoc_insertion_point(field_set_allocated:io.deephaven.proto.backplane.script.grpc.FigureDescriptor.AxisDescriptor.label)
-}
-
-// string label_font = 7;
-inline void FigureDescriptor_AxisDescriptor::clear_label_font() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  _impl_.label_font_.ClearToEmpty();
-}
-inline const std::string& FigureDescriptor_AxisDescriptor::label_font() const
-    ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  // @@protoc_insertion_point(field_get:io.deephaven.proto.backplane.script.grpc.FigureDescriptor.AxisDescriptor.label_font)
-  return _internal_label_font();
-}
-template <typename Arg_, typename... Args_>
-inline PROTOBUF_ALWAYS_INLINE void FigureDescriptor_AxisDescriptor::set_label_font(Arg_&& arg,
-                                                     Args_... args) {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  ;
-  _impl_.label_font_.Set(static_cast<Arg_&&>(arg), args..., GetArena());
-  // @@protoc_insertion_point(field_set:io.deephaven.proto.backplane.script.grpc.FigureDescriptor.AxisDescriptor.label_font)
-}
-inline std::string* FigureDescriptor_AxisDescriptor::mutable_label_font() ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  std::string* _s = _internal_mutable_label_font();
-  // @@protoc_insertion_point(field_mutable:io.deephaven.proto.backplane.script.grpc.FigureDescriptor.AxisDescriptor.label_font)
-  return _s;
-}
-inline const std::string& FigureDescriptor_AxisDescriptor::_internal_label_font() const {
-  PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race);
-  return _impl_.label_font_.Get();
-}
-inline void FigureDescriptor_AxisDescriptor::_internal_set_label_font(const std::string& value) {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  ;
-  _impl_.label_font_.Set(value, GetArena());
-}
-inline std::string* FigureDescriptor_AxisDescriptor::_internal_mutable_label_font() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  ;
-  return _impl_.label_font_.Mutable( GetArena());
-}
-inline std::string* FigureDescriptor_AxisDescriptor::release_label_font() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  // @@protoc_insertion_point(field_release:io.deephaven.proto.backplane.script.grpc.FigureDescriptor.AxisDescriptor.label_font)
-  return _impl_.label_font_.Release();
-}
-inline void FigureDescriptor_AxisDescriptor::set_allocated_label_font(std::string* value) {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  _impl_.label_font_.SetAllocated(value, GetArena());
-  #ifdef PROTOBUF_FORCE_COPY_DEFAULT_STRING
-        if (_impl_.label_font_.IsDefault()) {
-          _impl_.label_font_.Set("", GetArena());
-        }
-  #endif  // PROTOBUF_FORCE_COPY_DEFAULT_STRING
-  // @@protoc_insertion_point(field_set_allocated:io.deephaven.proto.backplane.script.grpc.FigureDescriptor.AxisDescriptor.label_font)
-}
-
-// string ticks_font = 8;
-inline void FigureDescriptor_AxisDescriptor::clear_ticks_font() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  _impl_.ticks_font_.ClearToEmpty();
-}
-inline const std::string& FigureDescriptor_AxisDescriptor::ticks_font() const
-    ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  // @@protoc_insertion_point(field_get:io.deephaven.proto.backplane.script.grpc.FigureDescriptor.AxisDescriptor.ticks_font)
-  return _internal_ticks_font();
-}
-template <typename Arg_, typename... Args_>
-inline PROTOBUF_ALWAYS_INLINE void FigureDescriptor_AxisDescriptor::set_ticks_font(Arg_&& arg,
-                                                     Args_... args) {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  ;
-  _impl_.ticks_font_.Set(static_cast<Arg_&&>(arg), args..., GetArena());
-  // @@protoc_insertion_point(field_set:io.deephaven.proto.backplane.script.grpc.FigureDescriptor.AxisDescriptor.ticks_font)
-}
-inline std::string* FigureDescriptor_AxisDescriptor::mutable_ticks_font() ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  std::string* _s = _internal_mutable_ticks_font();
-  // @@protoc_insertion_point(field_mutable:io.deephaven.proto.backplane.script.grpc.FigureDescriptor.AxisDescriptor.ticks_font)
-  return _s;
-}
-inline const std::string& FigureDescriptor_AxisDescriptor::_internal_ticks_font() const {
-  PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race);
-  return _impl_.ticks_font_.Get();
-}
-inline void FigureDescriptor_AxisDescriptor::_internal_set_ticks_font(const std::string& value) {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  ;
-  _impl_.ticks_font_.Set(value, GetArena());
-}
-inline std::string* FigureDescriptor_AxisDescriptor::_internal_mutable_ticks_font() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  ;
-  return _impl_.ticks_font_.Mutable( GetArena());
-}
-inline std::string* FigureDescriptor_AxisDescriptor::release_ticks_font() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  // @@protoc_insertion_point(field_release:io.deephaven.proto.backplane.script.grpc.FigureDescriptor.AxisDescriptor.ticks_font)
-  return _impl_.ticks_font_.Release();
-}
-inline void FigureDescriptor_AxisDescriptor::set_allocated_ticks_font(std::string* value) {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  _impl_.ticks_font_.SetAllocated(value, GetArena());
-  #ifdef PROTOBUF_FORCE_COPY_DEFAULT_STRING
-        if (_impl_.ticks_font_.IsDefault()) {
-          _impl_.ticks_font_.Set("", GetArena());
-        }
-  #endif  // PROTOBUF_FORCE_COPY_DEFAULT_STRING
-  // @@protoc_insertion_point(field_set_allocated:io.deephaven.proto.backplane.script.grpc.FigureDescriptor.AxisDescriptor.ticks_font)
-}
-
-// optional string format_pattern = 9;
-inline bool FigureDescriptor_AxisDescriptor::has_format_pattern() const {
-  bool value = (_impl_._has_bits_[0] & 0x00000001u) != 0;
-  return value;
-}
-inline void FigureDescriptor_AxisDescriptor::clear_format_pattern() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  _impl_.format_pattern_.ClearToEmpty();
-  _impl_._has_bits_[0] &= ~0x00000001u;
-}
-inline const std::string& FigureDescriptor_AxisDescriptor::format_pattern() const
-    ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  // @@protoc_insertion_point(field_get:io.deephaven.proto.backplane.script.grpc.FigureDescriptor.AxisDescriptor.format_pattern)
-  return _internal_format_pattern();
-}
-template <typename Arg_, typename... Args_>
-inline PROTOBUF_ALWAYS_INLINE void FigureDescriptor_AxisDescriptor::set_format_pattern(Arg_&& arg,
-                                                     Args_... args) {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  _impl_._has_bits_[0] |= 0x00000001u;
-  _impl_.format_pattern_.Set(static_cast<Arg_&&>(arg), args..., GetArena());
-  // @@protoc_insertion_point(field_set:io.deephaven.proto.backplane.script.grpc.FigureDescriptor.AxisDescriptor.format_pattern)
-}
-inline std::string* FigureDescriptor_AxisDescriptor::mutable_format_pattern() ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  std::string* _s = _internal_mutable_format_pattern();
-  // @@protoc_insertion_point(field_mutable:io.deephaven.proto.backplane.script.grpc.FigureDescriptor.AxisDescriptor.format_pattern)
-  return _s;
-}
-inline const std::string& FigureDescriptor_AxisDescriptor::_internal_format_pattern() const {
-  PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race);
-  return _impl_.format_pattern_.Get();
-}
-inline void FigureDescriptor_AxisDescriptor::_internal_set_format_pattern(const std::string& value) {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  _impl_._has_bits_[0] |= 0x00000001u;
-  _impl_.format_pattern_.Set(value, GetArena());
-}
-inline std::string* FigureDescriptor_AxisDescriptor::_internal_mutable_format_pattern() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  _impl_._has_bits_[0] |= 0x00000001u;
-  return _impl_.format_pattern_.Mutable( GetArena());
-}
-inline std::string* FigureDescriptor_AxisDescriptor::release_format_pattern() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  // @@protoc_insertion_point(field_release:io.deephaven.proto.backplane.script.grpc.FigureDescriptor.AxisDescriptor.format_pattern)
-  if ((_impl_._has_bits_[0] & 0x00000001u) == 0) {
-    return nullptr;
-  }
-  _impl_._has_bits_[0] &= ~0x00000001u;
-  auto* released = _impl_.format_pattern_.Release();
-  #ifdef PROTOBUF_FORCE_COPY_DEFAULT_STRING
-  _impl_.format_pattern_.Set("", GetArena());
-  #endif  // PROTOBUF_FORCE_COPY_DEFAULT_STRING
-  return released;
-}
-inline void FigureDescriptor_AxisDescriptor::set_allocated_format_pattern(std::string* value) {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  if (value != nullptr) {
-    _impl_._has_bits_[0] |= 0x00000001u;
-  } else {
-    _impl_._has_bits_[0] &= ~0x00000001u;
-  }
-  _impl_.format_pattern_.SetAllocated(value, GetArena());
-  #ifdef PROTOBUF_FORCE_COPY_DEFAULT_STRING
-        if (_impl_.format_pattern_.IsDefault()) {
-          _impl_.format_pattern_.Set("", GetArena());
-        }
-  #endif  // PROTOBUF_FORCE_COPY_DEFAULT_STRING
-  // @@protoc_insertion_point(field_set_allocated:io.deephaven.proto.backplane.script.grpc.FigureDescriptor.AxisDescriptor.format_pattern)
-}
-
-// string color = 10;
-inline void FigureDescriptor_AxisDescriptor::clear_color() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  _impl_.color_.ClearToEmpty();
-}
-inline const std::string& FigureDescriptor_AxisDescriptor::color() const
-    ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  // @@protoc_insertion_point(field_get:io.deephaven.proto.backplane.script.grpc.FigureDescriptor.AxisDescriptor.color)
-  return _internal_color();
-}
-template <typename Arg_, typename... Args_>
-inline PROTOBUF_ALWAYS_INLINE void FigureDescriptor_AxisDescriptor::set_color(Arg_&& arg,
-                                                     Args_... args) {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  ;
-  _impl_.color_.Set(static_cast<Arg_&&>(arg), args..., GetArena());
-  // @@protoc_insertion_point(field_set:io.deephaven.proto.backplane.script.grpc.FigureDescriptor.AxisDescriptor.color)
-}
-inline std::string* FigureDescriptor_AxisDescriptor::mutable_color() ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  std::string* _s = _internal_mutable_color();
-  // @@protoc_insertion_point(field_mutable:io.deephaven.proto.backplane.script.grpc.FigureDescriptor.AxisDescriptor.color)
-  return _s;
-}
-inline const std::string& FigureDescriptor_AxisDescriptor::_internal_color() const {
-  PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race);
-  return _impl_.color_.Get();
-}
-inline void FigureDescriptor_AxisDescriptor::_internal_set_color(const std::string& value) {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  ;
-  _impl_.color_.Set(value, GetArena());
-}
-inline std::string* FigureDescriptor_AxisDescriptor::_internal_mutable_color() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  ;
-  return _impl_.color_.Mutable( GetArena());
-}
-inline std::string* FigureDescriptor_AxisDescriptor::release_color() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  // @@protoc_insertion_point(field_release:io.deephaven.proto.backplane.script.grpc.FigureDescriptor.AxisDescriptor.color)
-  return _impl_.color_.Release();
-}
-inline void FigureDescriptor_AxisDescriptor::set_allocated_color(std::string* value) {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  _impl_.color_.SetAllocated(value, GetArena());
-  #ifdef PROTOBUF_FORCE_COPY_DEFAULT_STRING
-        if (_impl_.color_.IsDefault()) {
-          _impl_.color_.Set("", GetArena());
-        }
-  #endif  // PROTOBUF_FORCE_COPY_DEFAULT_STRING
-  // @@protoc_insertion_point(field_set_allocated:io.deephaven.proto.backplane.script.grpc.FigureDescriptor.AxisDescriptor.color)
-}
-
-// double min_range = 11;
-inline void FigureDescriptor_AxisDescriptor::clear_min_range() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  _impl_.min_range_ = 0;
-}
-inline double FigureDescriptor_AxisDescriptor::min_range() const {
-  // @@protoc_insertion_point(field_get:io.deephaven.proto.backplane.script.grpc.FigureDescriptor.AxisDescriptor.min_range)
-  return _internal_min_range();
-}
-inline void FigureDescriptor_AxisDescriptor::set_min_range(double value) {
-  _internal_set_min_range(value);
-  // @@protoc_insertion_point(field_set:io.deephaven.proto.backplane.script.grpc.FigureDescriptor.AxisDescriptor.min_range)
-}
-inline double FigureDescriptor_AxisDescriptor::_internal_min_range() const {
-  PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race);
-  return _impl_.min_range_;
-}
-inline void FigureDescriptor_AxisDescriptor::_internal_set_min_range(double value) {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  ;
-  _impl_.min_range_ = value;
-}
-
-// double max_range = 12;
-inline void FigureDescriptor_AxisDescriptor::clear_max_range() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  _impl_.max_range_ = 0;
-}
-inline double FigureDescriptor_AxisDescriptor::max_range() const {
-  // @@protoc_insertion_point(field_get:io.deephaven.proto.backplane.script.grpc.FigureDescriptor.AxisDescriptor.max_range)
-  return _internal_max_range();
-}
-inline void FigureDescriptor_AxisDescriptor::set_max_range(double value) {
-  _internal_set_max_range(value);
-  // @@protoc_insertion_point(field_set:io.deephaven.proto.backplane.script.grpc.FigureDescriptor.AxisDescriptor.max_range)
-}
-inline double FigureDescriptor_AxisDescriptor::_internal_max_range() const {
-  PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race);
-  return _impl_.max_range_;
-}
-inline void FigureDescriptor_AxisDescriptor::_internal_set_max_range(double value) {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  ;
-  _impl_.max_range_ = value;
-}
-
-// bool minor_ticks_visible = 13;
-inline void FigureDescriptor_AxisDescriptor::clear_minor_ticks_visible() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  _impl_.minor_ticks_visible_ = false;
-}
-inline bool FigureDescriptor_AxisDescriptor::minor_ticks_visible() const {
-  // @@protoc_insertion_point(field_get:io.deephaven.proto.backplane.script.grpc.FigureDescriptor.AxisDescriptor.minor_ticks_visible)
-  return _internal_minor_ticks_visible();
-}
-inline void FigureDescriptor_AxisDescriptor::set_minor_ticks_visible(bool value) {
-  _internal_set_minor_ticks_visible(value);
-  // @@protoc_insertion_point(field_set:io.deephaven.proto.backplane.script.grpc.FigureDescriptor.AxisDescriptor.minor_ticks_visible)
-}
-inline bool FigureDescriptor_AxisDescriptor::_internal_minor_ticks_visible() const {
-  PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race);
-  return _impl_.minor_ticks_visible_;
-}
-inline void FigureDescriptor_AxisDescriptor::_internal_set_minor_ticks_visible(bool value) {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  ;
-  _impl_.minor_ticks_visible_ = value;
-}
-
-// bool major_ticks_visible = 14;
-inline void FigureDescriptor_AxisDescriptor::clear_major_ticks_visible() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  _impl_.major_ticks_visible_ = false;
-}
-inline bool FigureDescriptor_AxisDescriptor::major_ticks_visible() const {
-  // @@protoc_insertion_point(field_get:io.deephaven.proto.backplane.script.grpc.FigureDescriptor.AxisDescriptor.major_ticks_visible)
-  return _internal_major_ticks_visible();
-}
-inline void FigureDescriptor_AxisDescriptor::set_major_ticks_visible(bool value) {
-  _internal_set_major_ticks_visible(value);
-  // @@protoc_insertion_point(field_set:io.deephaven.proto.backplane.script.grpc.FigureDescriptor.AxisDescriptor.major_ticks_visible)
-}
-inline bool FigureDescriptor_AxisDescriptor::_internal_major_ticks_visible() const {
-  PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race);
-  return _impl_.major_ticks_visible_;
-}
-inline void FigureDescriptor_AxisDescriptor::_internal_set_major_ticks_visible(bool value) {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  ;
-  _impl_.major_ticks_visible_ = value;
-}
-
-// int32 minor_tick_count = 15;
-inline void FigureDescriptor_AxisDescriptor::clear_minor_tick_count() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  _impl_.minor_tick_count_ = 0;
-}
-inline ::int32_t FigureDescriptor_AxisDescriptor::minor_tick_count() const {
-  // @@protoc_insertion_point(field_get:io.deephaven.proto.backplane.script.grpc.FigureDescriptor.AxisDescriptor.minor_tick_count)
-  return _internal_minor_tick_count();
-}
-inline void FigureDescriptor_AxisDescriptor::set_minor_tick_count(::int32_t value) {
-  _internal_set_minor_tick_count(value);
-  // @@protoc_insertion_point(field_set:io.deephaven.proto.backplane.script.grpc.FigureDescriptor.AxisDescriptor.minor_tick_count)
-}
-inline ::int32_t FigureDescriptor_AxisDescriptor::_internal_minor_tick_count() const {
-  PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race);
-  return _impl_.minor_tick_count_;
-}
-inline void FigureDescriptor_AxisDescriptor::_internal_set_minor_tick_count(::int32_t value) {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  ;
-  _impl_.minor_tick_count_ = value;
-}
-
-// optional double gap_between_major_ticks = 16;
-inline bool FigureDescriptor_AxisDescriptor::has_gap_between_major_ticks() const {
-  bool value = (_impl_._has_bits_[0] & 0x00000004u) != 0;
-  return value;
-}
-inline void FigureDescriptor_AxisDescriptor::clear_gap_between_major_ticks() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  _impl_.gap_between_major_ticks_ = 0;
-  _impl_._has_bits_[0] &= ~0x00000004u;
-}
-inline double FigureDescriptor_AxisDescriptor::gap_between_major_ticks() const {
-  // @@protoc_insertion_point(field_get:io.deephaven.proto.backplane.script.grpc.FigureDescriptor.AxisDescriptor.gap_between_major_ticks)
-  return _internal_gap_between_major_ticks();
-}
-inline void FigureDescriptor_AxisDescriptor::set_gap_between_major_ticks(double value) {
-  _internal_set_gap_between_major_ticks(value);
-  // @@protoc_insertion_point(field_set:io.deephaven.proto.backplane.script.grpc.FigureDescriptor.AxisDescriptor.gap_between_major_ticks)
-}
-inline double FigureDescriptor_AxisDescriptor::_internal_gap_between_major_ticks() const {
-  PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race);
-  return _impl_.gap_between_major_ticks_;
-}
-inline void FigureDescriptor_AxisDescriptor::_internal_set_gap_between_major_ticks(double value) {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  _impl_._has_bits_[0] |= 0x00000004u;
-  _impl_.gap_between_major_ticks_ = value;
-}
-
-// repeated double major_tick_locations = 17;
-inline int FigureDescriptor_AxisDescriptor::_internal_major_tick_locations_size() const {
-  return _internal_major_tick_locations().size();
-}
-inline int FigureDescriptor_AxisDescriptor::major_tick_locations_size() const {
-  return _internal_major_tick_locations_size();
-}
-inline void FigureDescriptor_AxisDescriptor::clear_major_tick_locations() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  _impl_.major_tick_locations_.Clear();
-}
-inline double FigureDescriptor_AxisDescriptor::major_tick_locations(int index) const {
-  // @@protoc_insertion_point(field_get:io.deephaven.proto.backplane.script.grpc.FigureDescriptor.AxisDescriptor.major_tick_locations)
-  return _internal_major_tick_locations().Get(index);
-}
-inline void FigureDescriptor_AxisDescriptor::set_major_tick_locations(int index, double value) {
-  _internal_mutable_major_tick_locations()->Set(index, value);
-  // @@protoc_insertion_point(field_set:io.deephaven.proto.backplane.script.grpc.FigureDescriptor.AxisDescriptor.major_tick_locations)
-}
-inline void FigureDescriptor_AxisDescriptor::add_major_tick_locations(double value) {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  _internal_mutable_major_tick_locations()->Add(value);
-  // @@protoc_insertion_point(field_add:io.deephaven.proto.backplane.script.grpc.FigureDescriptor.AxisDescriptor.major_tick_locations)
-}
-inline const ::google::protobuf::RepeatedField<double>& FigureDescriptor_AxisDescriptor::major_tick_locations() const
-    ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  // @@protoc_insertion_point(field_list:io.deephaven.proto.backplane.script.grpc.FigureDescriptor.AxisDescriptor.major_tick_locations)
-  return _internal_major_tick_locations();
-}
-inline ::google::protobuf::RepeatedField<double>* FigureDescriptor_AxisDescriptor::mutable_major_tick_locations()
-    ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  // @@protoc_insertion_point(field_mutable_list:io.deephaven.proto.backplane.script.grpc.FigureDescriptor.AxisDescriptor.major_tick_locations)
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  return _internal_mutable_major_tick_locations();
-}
-inline const ::google::protobuf::RepeatedField<double>& FigureDescriptor_AxisDescriptor::_internal_major_tick_locations()
-    const {
-  PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race);
-  return _impl_.major_tick_locations_;
-}
-inline ::google::protobuf::RepeatedField<double>* FigureDescriptor_AxisDescriptor::_internal_mutable_major_tick_locations() {
-  PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race);
-  return &_impl_.major_tick_locations_;
-}
-
-// double tick_label_angle = 18;
-inline void FigureDescriptor_AxisDescriptor::clear_tick_label_angle() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  _impl_.tick_label_angle_ = 0;
-}
-inline double FigureDescriptor_AxisDescriptor::tick_label_angle() const {
-  // @@protoc_insertion_point(field_get:io.deephaven.proto.backplane.script.grpc.FigureDescriptor.AxisDescriptor.tick_label_angle)
-  return _internal_tick_label_angle();
-}
-inline void FigureDescriptor_AxisDescriptor::set_tick_label_angle(double value) {
-  _internal_set_tick_label_angle(value);
-  // @@protoc_insertion_point(field_set:io.deephaven.proto.backplane.script.grpc.FigureDescriptor.AxisDescriptor.tick_label_angle)
-}
-inline double FigureDescriptor_AxisDescriptor::_internal_tick_label_angle() const {
-  PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race);
-  return _impl_.tick_label_angle_;
-}
-inline void FigureDescriptor_AxisDescriptor::_internal_set_tick_label_angle(double value) {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  ;
-  _impl_.tick_label_angle_ = value;
-}
-
-// bool invert = 19;
-inline void FigureDescriptor_AxisDescriptor::clear_invert() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  _impl_.invert_ = false;
-}
-inline bool FigureDescriptor_AxisDescriptor::invert() const {
-  // @@protoc_insertion_point(field_get:io.deephaven.proto.backplane.script.grpc.FigureDescriptor.AxisDescriptor.invert)
-  return _internal_invert();
-}
-inline void FigureDescriptor_AxisDescriptor::set_invert(bool value) {
-  _internal_set_invert(value);
-  // @@protoc_insertion_point(field_set:io.deephaven.proto.backplane.script.grpc.FigureDescriptor.AxisDescriptor.invert)
-}
-inline bool FigureDescriptor_AxisDescriptor::_internal_invert() const {
-  PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race);
-  return _impl_.invert_;
-}
-inline void FigureDescriptor_AxisDescriptor::_internal_set_invert(bool value) {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  ;
-  _impl_.invert_ = value;
-}
-
-// bool is_time_axis = 20;
-inline void FigureDescriptor_AxisDescriptor::clear_is_time_axis() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  _impl_.is_time_axis_ = false;
-}
-inline bool FigureDescriptor_AxisDescriptor::is_time_axis() const {
-  // @@protoc_insertion_point(field_get:io.deephaven.proto.backplane.script.grpc.FigureDescriptor.AxisDescriptor.is_time_axis)
-  return _internal_is_time_axis();
-}
-inline void FigureDescriptor_AxisDescriptor::set_is_time_axis(bool value) {
-  _internal_set_is_time_axis(value);
-  // @@protoc_insertion_point(field_set:io.deephaven.proto.backplane.script.grpc.FigureDescriptor.AxisDescriptor.is_time_axis)
-}
-inline bool FigureDescriptor_AxisDescriptor::_internal_is_time_axis() const {
-  PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race);
-  return _impl_.is_time_axis_;
-}
-inline void FigureDescriptor_AxisDescriptor::_internal_set_is_time_axis(bool value) {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  ;
-  _impl_.is_time_axis_ = value;
-}
-
-// .io.deephaven.proto.backplane.script.grpc.FigureDescriptor.BusinessCalendarDescriptor business_calendar_descriptor = 21;
-inline bool FigureDescriptor_AxisDescriptor::has_business_calendar_descriptor() const {
-  bool value = (_impl_._has_bits_[0] & 0x00000002u) != 0;
-  PROTOBUF_ASSUME(!value || _impl_.business_calendar_descriptor_ != nullptr);
-  return value;
-}
-inline void FigureDescriptor_AxisDescriptor::clear_business_calendar_descriptor() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  if (_impl_.business_calendar_descriptor_ != nullptr) _impl_.business_calendar_descriptor_->Clear();
-  _impl_._has_bits_[0] &= ~0x00000002u;
-}
-inline const ::io::deephaven::proto::backplane::script::grpc::FigureDescriptor_BusinessCalendarDescriptor& FigureDescriptor_AxisDescriptor::_internal_business_calendar_descriptor() const {
-  PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race);
-  const ::io::deephaven::proto::backplane::script::grpc::FigureDescriptor_BusinessCalendarDescriptor* p = _impl_.business_calendar_descriptor_;
-  return p != nullptr ? *p : reinterpret_cast<const ::io::deephaven::proto::backplane::script::grpc::FigureDescriptor_BusinessCalendarDescriptor&>(::io::deephaven::proto::backplane::script::grpc::_FigureDescriptor_BusinessCalendarDescriptor_default_instance_);
-}
-inline const ::io::deephaven::proto::backplane::script::grpc::FigureDescriptor_BusinessCalendarDescriptor& FigureDescriptor_AxisDescriptor::business_calendar_descriptor() const ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  // @@protoc_insertion_point(field_get:io.deephaven.proto.backplane.script.grpc.FigureDescriptor.AxisDescriptor.business_calendar_descriptor)
-  return _internal_business_calendar_descriptor();
-}
-inline void FigureDescriptor_AxisDescriptor::unsafe_arena_set_allocated_business_calendar_descriptor(::io::deephaven::proto::backplane::script::grpc::FigureDescriptor_BusinessCalendarDescriptor* value) {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  if (GetArena() == nullptr) {
-    delete reinterpret_cast<::google::protobuf::MessageLite*>(_impl_.business_calendar_descriptor_);
-  }
-  _impl_.business_calendar_descriptor_ = reinterpret_cast<::io::deephaven::proto::backplane::script::grpc::FigureDescriptor_BusinessCalendarDescriptor*>(value);
-  if (value != nullptr) {
-    _impl_._has_bits_[0] |= 0x00000002u;
-  } else {
-    _impl_._has_bits_[0] &= ~0x00000002u;
-  }
-  // @@protoc_insertion_point(field_unsafe_arena_set_allocated:io.deephaven.proto.backplane.script.grpc.FigureDescriptor.AxisDescriptor.business_calendar_descriptor)
-}
-inline ::io::deephaven::proto::backplane::script::grpc::FigureDescriptor_BusinessCalendarDescriptor* FigureDescriptor_AxisDescriptor::release_business_calendar_descriptor() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-
-  _impl_._has_bits_[0] &= ~0x00000002u;
-  ::io::deephaven::proto::backplane::script::grpc::FigureDescriptor_BusinessCalendarDescriptor* released = _impl_.business_calendar_descriptor_;
-  _impl_.business_calendar_descriptor_ = nullptr;
-#ifdef PROTOBUF_FORCE_COPY_IN_RELEASE
-  auto* old = reinterpret_cast<::google::protobuf::MessageLite*>(released);
-  released = ::google::protobuf::internal::DuplicateIfNonNull(released);
-  if (GetArena() == nullptr) {
-    delete old;
-  }
-#else   // PROTOBUF_FORCE_COPY_IN_RELEASE
-  if (GetArena() != nullptr) {
-    released = ::google::protobuf::internal::DuplicateIfNonNull(released);
-  }
-#endif  // !PROTOBUF_FORCE_COPY_IN_RELEASE
-  return released;
-}
-inline ::io::deephaven::proto::backplane::script::grpc::FigureDescriptor_BusinessCalendarDescriptor* FigureDescriptor_AxisDescriptor::unsafe_arena_release_business_calendar_descriptor() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  // @@protoc_insertion_point(field_release:io.deephaven.proto.backplane.script.grpc.FigureDescriptor.AxisDescriptor.business_calendar_descriptor)
-
-  _impl_._has_bits_[0] &= ~0x00000002u;
-  ::io::deephaven::proto::backplane::script::grpc::FigureDescriptor_BusinessCalendarDescriptor* temp = _impl_.business_calendar_descriptor_;
-  _impl_.business_calendar_descriptor_ = nullptr;
-  return temp;
-}
-inline ::io::deephaven::proto::backplane::script::grpc::FigureDescriptor_BusinessCalendarDescriptor* FigureDescriptor_AxisDescriptor::_internal_mutable_business_calendar_descriptor() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  _impl_._has_bits_[0] |= 0x00000002u;
-  if (_impl_.business_calendar_descriptor_ == nullptr) {
-    auto* p = CreateMaybeMessage<::io::deephaven::proto::backplane::script::grpc::FigureDescriptor_BusinessCalendarDescriptor>(GetArena());
-    _impl_.business_calendar_descriptor_ = reinterpret_cast<::io::deephaven::proto::backplane::script::grpc::FigureDescriptor_BusinessCalendarDescriptor*>(p);
-  }
-  return _impl_.business_calendar_descriptor_;
-}
-inline ::io::deephaven::proto::backplane::script::grpc::FigureDescriptor_BusinessCalendarDescriptor* FigureDescriptor_AxisDescriptor::mutable_business_calendar_descriptor() ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  ::io::deephaven::proto::backplane::script::grpc::FigureDescriptor_BusinessCalendarDescriptor* _msg = _internal_mutable_business_calendar_descriptor();
-  // @@protoc_insertion_point(field_mutable:io.deephaven.proto.backplane.script.grpc.FigureDescriptor.AxisDescriptor.business_calendar_descriptor)
-  return _msg;
-}
-inline void FigureDescriptor_AxisDescriptor::set_allocated_business_calendar_descriptor(::io::deephaven::proto::backplane::script::grpc::FigureDescriptor_BusinessCalendarDescriptor* value) {
-  ::google::protobuf::Arena* message_arena = GetArena();
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  if (message_arena == nullptr) {
-    delete reinterpret_cast<::io::deephaven::proto::backplane::script::grpc::FigureDescriptor_BusinessCalendarDescriptor*>(_impl_.business_calendar_descriptor_);
-  }
-
-  if (value != nullptr) {
-    ::google::protobuf::Arena* submessage_arena = reinterpret_cast<::io::deephaven::proto::backplane::script::grpc::FigureDescriptor_BusinessCalendarDescriptor*>(value)->GetArena();
-    if (message_arena != submessage_arena) {
-      value = ::google::protobuf::internal::GetOwnedMessage(message_arena, value, submessage_arena);
-    }
-    _impl_._has_bits_[0] |= 0x00000002u;
-  } else {
-    _impl_._has_bits_[0] &= ~0x00000002u;
-  }
-
-  _impl_.business_calendar_descriptor_ = reinterpret_cast<::io::deephaven::proto::backplane::script::grpc::FigureDescriptor_BusinessCalendarDescriptor*>(value);
-  // @@protoc_insertion_point(field_set_allocated:io.deephaven.proto.backplane.script.grpc.FigureDescriptor.AxisDescriptor.business_calendar_descriptor)
-}
-
-// -------------------------------------------------------------------
-
-// FigureDescriptor_BusinessCalendarDescriptor_BusinessPeriod
-
-// string open = 1;
-inline void FigureDescriptor_BusinessCalendarDescriptor_BusinessPeriod::clear_open() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  _impl_.open_.ClearToEmpty();
-}
-inline const std::string& FigureDescriptor_BusinessCalendarDescriptor_BusinessPeriod::open() const
-    ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  // @@protoc_insertion_point(field_get:io.deephaven.proto.backplane.script.grpc.FigureDescriptor.BusinessCalendarDescriptor.BusinessPeriod.open)
-  return _internal_open();
-}
-template <typename Arg_, typename... Args_>
-inline PROTOBUF_ALWAYS_INLINE void FigureDescriptor_BusinessCalendarDescriptor_BusinessPeriod::set_open(Arg_&& arg,
-                                                     Args_... args) {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  ;
-  _impl_.open_.Set(static_cast<Arg_&&>(arg), args..., GetArena());
-  // @@protoc_insertion_point(field_set:io.deephaven.proto.backplane.script.grpc.FigureDescriptor.BusinessCalendarDescriptor.BusinessPeriod.open)
-}
-inline std::string* FigureDescriptor_BusinessCalendarDescriptor_BusinessPeriod::mutable_open() ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  std::string* _s = _internal_mutable_open();
-  // @@protoc_insertion_point(field_mutable:io.deephaven.proto.backplane.script.grpc.FigureDescriptor.BusinessCalendarDescriptor.BusinessPeriod.open)
-  return _s;
-}
-inline const std::string& FigureDescriptor_BusinessCalendarDescriptor_BusinessPeriod::_internal_open() const {
-  PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race);
-  return _impl_.open_.Get();
-}
-inline void FigureDescriptor_BusinessCalendarDescriptor_BusinessPeriod::_internal_set_open(const std::string& value) {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  ;
-  _impl_.open_.Set(value, GetArena());
-}
-inline std::string* FigureDescriptor_BusinessCalendarDescriptor_BusinessPeriod::_internal_mutable_open() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  ;
-  return _impl_.open_.Mutable( GetArena());
-}
-inline std::string* FigureDescriptor_BusinessCalendarDescriptor_BusinessPeriod::release_open() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  // @@protoc_insertion_point(field_release:io.deephaven.proto.backplane.script.grpc.FigureDescriptor.BusinessCalendarDescriptor.BusinessPeriod.open)
-  return _impl_.open_.Release();
-}
-inline void FigureDescriptor_BusinessCalendarDescriptor_BusinessPeriod::set_allocated_open(std::string* value) {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  _impl_.open_.SetAllocated(value, GetArena());
-  #ifdef PROTOBUF_FORCE_COPY_DEFAULT_STRING
-        if (_impl_.open_.IsDefault()) {
-          _impl_.open_.Set("", GetArena());
-        }
-  #endif  // PROTOBUF_FORCE_COPY_DEFAULT_STRING
-  // @@protoc_insertion_point(field_set_allocated:io.deephaven.proto.backplane.script.grpc.FigureDescriptor.BusinessCalendarDescriptor.BusinessPeriod.open)
-}
-
-// string close = 2;
-inline void FigureDescriptor_BusinessCalendarDescriptor_BusinessPeriod::clear_close() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  _impl_.close_.ClearToEmpty();
-}
-inline const std::string& FigureDescriptor_BusinessCalendarDescriptor_BusinessPeriod::close() const
-    ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  // @@protoc_insertion_point(field_get:io.deephaven.proto.backplane.script.grpc.FigureDescriptor.BusinessCalendarDescriptor.BusinessPeriod.close)
-  return _internal_close();
-}
-template <typename Arg_, typename... Args_>
-inline PROTOBUF_ALWAYS_INLINE void FigureDescriptor_BusinessCalendarDescriptor_BusinessPeriod::set_close(Arg_&& arg,
-                                                     Args_... args) {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  ;
-  _impl_.close_.Set(static_cast<Arg_&&>(arg), args..., GetArena());
-  // @@protoc_insertion_point(field_set:io.deephaven.proto.backplane.script.grpc.FigureDescriptor.BusinessCalendarDescriptor.BusinessPeriod.close)
-}
-inline std::string* FigureDescriptor_BusinessCalendarDescriptor_BusinessPeriod::mutable_close() ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  std::string* _s = _internal_mutable_close();
-  // @@protoc_insertion_point(field_mutable:io.deephaven.proto.backplane.script.grpc.FigureDescriptor.BusinessCalendarDescriptor.BusinessPeriod.close)
-  return _s;
-}
-inline const std::string& FigureDescriptor_BusinessCalendarDescriptor_BusinessPeriod::_internal_close() const {
-  PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race);
-  return _impl_.close_.Get();
-}
-inline void FigureDescriptor_BusinessCalendarDescriptor_BusinessPeriod::_internal_set_close(const std::string& value) {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  ;
-  _impl_.close_.Set(value, GetArena());
-}
-inline std::string* FigureDescriptor_BusinessCalendarDescriptor_BusinessPeriod::_internal_mutable_close() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  ;
-  return _impl_.close_.Mutable( GetArena());
-}
-inline std::string* FigureDescriptor_BusinessCalendarDescriptor_BusinessPeriod::release_close() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  // @@protoc_insertion_point(field_release:io.deephaven.proto.backplane.script.grpc.FigureDescriptor.BusinessCalendarDescriptor.BusinessPeriod.close)
-  return _impl_.close_.Release();
-}
-inline void FigureDescriptor_BusinessCalendarDescriptor_BusinessPeriod::set_allocated_close(std::string* value) {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  _impl_.close_.SetAllocated(value, GetArena());
-  #ifdef PROTOBUF_FORCE_COPY_DEFAULT_STRING
-        if (_impl_.close_.IsDefault()) {
-          _impl_.close_.Set("", GetArena());
-        }
-  #endif  // PROTOBUF_FORCE_COPY_DEFAULT_STRING
-  // @@protoc_insertion_point(field_set_allocated:io.deephaven.proto.backplane.script.grpc.FigureDescriptor.BusinessCalendarDescriptor.BusinessPeriod.close)
-}
-
-// -------------------------------------------------------------------
-
-// FigureDescriptor_BusinessCalendarDescriptor_Holiday
-
-// .io.deephaven.proto.backplane.script.grpc.FigureDescriptor.BusinessCalendarDescriptor.LocalDate date = 1;
-inline bool FigureDescriptor_BusinessCalendarDescriptor_Holiday::has_date() const {
-  bool value = (_impl_._has_bits_[0] & 0x00000001u) != 0;
-  PROTOBUF_ASSUME(!value || _impl_.date_ != nullptr);
-  return value;
-}
-inline void FigureDescriptor_BusinessCalendarDescriptor_Holiday::clear_date() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  if (_impl_.date_ != nullptr) _impl_.date_->Clear();
-  _impl_._has_bits_[0] &= ~0x00000001u;
-}
-inline const ::io::deephaven::proto::backplane::script::grpc::FigureDescriptor_BusinessCalendarDescriptor_LocalDate& FigureDescriptor_BusinessCalendarDescriptor_Holiday::_internal_date() const {
-  PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race);
-  const ::io::deephaven::proto::backplane::script::grpc::FigureDescriptor_BusinessCalendarDescriptor_LocalDate* p = _impl_.date_;
-  return p != nullptr ? *p : reinterpret_cast<const ::io::deephaven::proto::backplane::script::grpc::FigureDescriptor_BusinessCalendarDescriptor_LocalDate&>(::io::deephaven::proto::backplane::script::grpc::_FigureDescriptor_BusinessCalendarDescriptor_LocalDate_default_instance_);
-}
-inline const ::io::deephaven::proto::backplane::script::grpc::FigureDescriptor_BusinessCalendarDescriptor_LocalDate& FigureDescriptor_BusinessCalendarDescriptor_Holiday::date() const ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  // @@protoc_insertion_point(field_get:io.deephaven.proto.backplane.script.grpc.FigureDescriptor.BusinessCalendarDescriptor.Holiday.date)
-  return _internal_date();
-}
-inline void FigureDescriptor_BusinessCalendarDescriptor_Holiday::unsafe_arena_set_allocated_date(::io::deephaven::proto::backplane::script::grpc::FigureDescriptor_BusinessCalendarDescriptor_LocalDate* value) {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  if (GetArena() == nullptr) {
-    delete reinterpret_cast<::google::protobuf::MessageLite*>(_impl_.date_);
-  }
-  _impl_.date_ = reinterpret_cast<::io::deephaven::proto::backplane::script::grpc::FigureDescriptor_BusinessCalendarDescriptor_LocalDate*>(value);
-  if (value != nullptr) {
-    _impl_._has_bits_[0] |= 0x00000001u;
-  } else {
-    _impl_._has_bits_[0] &= ~0x00000001u;
-  }
-  // @@protoc_insertion_point(field_unsafe_arena_set_allocated:io.deephaven.proto.backplane.script.grpc.FigureDescriptor.BusinessCalendarDescriptor.Holiday.date)
-}
-inline ::io::deephaven::proto::backplane::script::grpc::FigureDescriptor_BusinessCalendarDescriptor_LocalDate* FigureDescriptor_BusinessCalendarDescriptor_Holiday::release_date() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-
-  _impl_._has_bits_[0] &= ~0x00000001u;
-  ::io::deephaven::proto::backplane::script::grpc::FigureDescriptor_BusinessCalendarDescriptor_LocalDate* released = _impl_.date_;
-  _impl_.date_ = nullptr;
-#ifdef PROTOBUF_FORCE_COPY_IN_RELEASE
-  auto* old = reinterpret_cast<::google::protobuf::MessageLite*>(released);
-  released = ::google::protobuf::internal::DuplicateIfNonNull(released);
-  if (GetArena() == nullptr) {
-    delete old;
-  }
-#else   // PROTOBUF_FORCE_COPY_IN_RELEASE
-  if (GetArena() != nullptr) {
-    released = ::google::protobuf::internal::DuplicateIfNonNull(released);
-  }
-#endif  // !PROTOBUF_FORCE_COPY_IN_RELEASE
-  return released;
-}
-inline ::io::deephaven::proto::backplane::script::grpc::FigureDescriptor_BusinessCalendarDescriptor_LocalDate* FigureDescriptor_BusinessCalendarDescriptor_Holiday::unsafe_arena_release_date() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  // @@protoc_insertion_point(field_release:io.deephaven.proto.backplane.script.grpc.FigureDescriptor.BusinessCalendarDescriptor.Holiday.date)
-
-  _impl_._has_bits_[0] &= ~0x00000001u;
-  ::io::deephaven::proto::backplane::script::grpc::FigureDescriptor_BusinessCalendarDescriptor_LocalDate* temp = _impl_.date_;
-  _impl_.date_ = nullptr;
-  return temp;
-}
-inline ::io::deephaven::proto::backplane::script::grpc::FigureDescriptor_BusinessCalendarDescriptor_LocalDate* FigureDescriptor_BusinessCalendarDescriptor_Holiday::_internal_mutable_date() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  _impl_._has_bits_[0] |= 0x00000001u;
-  if (_impl_.date_ == nullptr) {
-    auto* p = CreateMaybeMessage<::io::deephaven::proto::backplane::script::grpc::FigureDescriptor_BusinessCalendarDescriptor_LocalDate>(GetArena());
-    _impl_.date_ = reinterpret_cast<::io::deephaven::proto::backplane::script::grpc::FigureDescriptor_BusinessCalendarDescriptor_LocalDate*>(p);
-  }
-  return _impl_.date_;
-}
-inline ::io::deephaven::proto::backplane::script::grpc::FigureDescriptor_BusinessCalendarDescriptor_LocalDate* FigureDescriptor_BusinessCalendarDescriptor_Holiday::mutable_date() ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  ::io::deephaven::proto::backplane::script::grpc::FigureDescriptor_BusinessCalendarDescriptor_LocalDate* _msg = _internal_mutable_date();
-  // @@protoc_insertion_point(field_mutable:io.deephaven.proto.backplane.script.grpc.FigureDescriptor.BusinessCalendarDescriptor.Holiday.date)
-  return _msg;
-}
-inline void FigureDescriptor_BusinessCalendarDescriptor_Holiday::set_allocated_date(::io::deephaven::proto::backplane::script::grpc::FigureDescriptor_BusinessCalendarDescriptor_LocalDate* value) {
-  ::google::protobuf::Arena* message_arena = GetArena();
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  if (message_arena == nullptr) {
-    delete reinterpret_cast<::io::deephaven::proto::backplane::script::grpc::FigureDescriptor_BusinessCalendarDescriptor_LocalDate*>(_impl_.date_);
-  }
-
-  if (value != nullptr) {
-    ::google::protobuf::Arena* submessage_arena = reinterpret_cast<::io::deephaven::proto::backplane::script::grpc::FigureDescriptor_BusinessCalendarDescriptor_LocalDate*>(value)->GetArena();
-    if (message_arena != submessage_arena) {
-      value = ::google::protobuf::internal::GetOwnedMessage(message_arena, value, submessage_arena);
-    }
-    _impl_._has_bits_[0] |= 0x00000001u;
-  } else {
-    _impl_._has_bits_[0] &= ~0x00000001u;
-  }
-
-  _impl_.date_ = reinterpret_cast<::io::deephaven::proto::backplane::script::grpc::FigureDescriptor_BusinessCalendarDescriptor_LocalDate*>(value);
-  // @@protoc_insertion_point(field_set_allocated:io.deephaven.proto.backplane.script.grpc.FigureDescriptor.BusinessCalendarDescriptor.Holiday.date)
-}
-
-// repeated .io.deephaven.proto.backplane.script.grpc.FigureDescriptor.BusinessCalendarDescriptor.BusinessPeriod business_periods = 2;
-inline int FigureDescriptor_BusinessCalendarDescriptor_Holiday::_internal_business_periods_size() const {
-  return _internal_business_periods().size();
-}
-inline int FigureDescriptor_BusinessCalendarDescriptor_Holiday::business_periods_size() const {
-  return _internal_business_periods_size();
-}
-inline void FigureDescriptor_BusinessCalendarDescriptor_Holiday::clear_business_periods() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  _impl_.business_periods_.Clear();
-}
-inline ::io::deephaven::proto::backplane::script::grpc::FigureDescriptor_BusinessCalendarDescriptor_BusinessPeriod* FigureDescriptor_BusinessCalendarDescriptor_Holiday::mutable_business_periods(int index)
-    ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  // @@protoc_insertion_point(field_mutable:io.deephaven.proto.backplane.script.grpc.FigureDescriptor.BusinessCalendarDescriptor.Holiday.business_periods)
-  return _internal_mutable_business_periods()->Mutable(index);
-}
-inline ::google::protobuf::RepeatedPtrField<::io::deephaven::proto::backplane::script::grpc::FigureDescriptor_BusinessCalendarDescriptor_BusinessPeriod>* FigureDescriptor_BusinessCalendarDescriptor_Holiday::mutable_business_periods()
-    ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  // @@protoc_insertion_point(field_mutable_list:io.deephaven.proto.backplane.script.grpc.FigureDescriptor.BusinessCalendarDescriptor.Holiday.business_periods)
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  return _internal_mutable_business_periods();
-}
-inline const ::io::deephaven::proto::backplane::script::grpc::FigureDescriptor_BusinessCalendarDescriptor_BusinessPeriod& FigureDescriptor_BusinessCalendarDescriptor_Holiday::business_periods(int index) const
-    ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  // @@protoc_insertion_point(field_get:io.deephaven.proto.backplane.script.grpc.FigureDescriptor.BusinessCalendarDescriptor.Holiday.business_periods)
-  return _internal_business_periods().Get(index);
-}
-inline ::io::deephaven::proto::backplane::script::grpc::FigureDescriptor_BusinessCalendarDescriptor_BusinessPeriod* FigureDescriptor_BusinessCalendarDescriptor_Holiday::add_business_periods() ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  ::io::deephaven::proto::backplane::script::grpc::FigureDescriptor_BusinessCalendarDescriptor_BusinessPeriod* _add = _internal_mutable_business_periods()->Add();
-  // @@protoc_insertion_point(field_add:io.deephaven.proto.backplane.script.grpc.FigureDescriptor.BusinessCalendarDescriptor.Holiday.business_periods)
-  return _add;
-}
-inline const ::google::protobuf::RepeatedPtrField<::io::deephaven::proto::backplane::script::grpc::FigureDescriptor_BusinessCalendarDescriptor_BusinessPeriod>& FigureDescriptor_BusinessCalendarDescriptor_Holiday::business_periods() const
-    ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  // @@protoc_insertion_point(field_list:io.deephaven.proto.backplane.script.grpc.FigureDescriptor.BusinessCalendarDescriptor.Holiday.business_periods)
-  return _internal_business_periods();
-}
-inline const ::google::protobuf::RepeatedPtrField<::io::deephaven::proto::backplane::script::grpc::FigureDescriptor_BusinessCalendarDescriptor_BusinessPeriod>&
-FigureDescriptor_BusinessCalendarDescriptor_Holiday::_internal_business_periods() const {
-  PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race);
-  return _impl_.business_periods_;
-}
-inline ::google::protobuf::RepeatedPtrField<::io::deephaven::proto::backplane::script::grpc::FigureDescriptor_BusinessCalendarDescriptor_BusinessPeriod>*
-FigureDescriptor_BusinessCalendarDescriptor_Holiday::_internal_mutable_business_periods() {
-  PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race);
-  return &_impl_.business_periods_;
-}
-
-// -------------------------------------------------------------------
-
-// FigureDescriptor_BusinessCalendarDescriptor_LocalDate
-
-// int32 year = 1;
-inline void FigureDescriptor_BusinessCalendarDescriptor_LocalDate::clear_year() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  _impl_.year_ = 0;
-}
-inline ::int32_t FigureDescriptor_BusinessCalendarDescriptor_LocalDate::year() const {
-  // @@protoc_insertion_point(field_get:io.deephaven.proto.backplane.script.grpc.FigureDescriptor.BusinessCalendarDescriptor.LocalDate.year)
-  return _internal_year();
-}
-inline void FigureDescriptor_BusinessCalendarDescriptor_LocalDate::set_year(::int32_t value) {
-  _internal_set_year(value);
-  // @@protoc_insertion_point(field_set:io.deephaven.proto.backplane.script.grpc.FigureDescriptor.BusinessCalendarDescriptor.LocalDate.year)
-}
-inline ::int32_t FigureDescriptor_BusinessCalendarDescriptor_LocalDate::_internal_year() const {
-  PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race);
-  return _impl_.year_;
-}
-inline void FigureDescriptor_BusinessCalendarDescriptor_LocalDate::_internal_set_year(::int32_t value) {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  ;
-  _impl_.year_ = value;
-}
-
-// int32 month = 2;
-inline void FigureDescriptor_BusinessCalendarDescriptor_LocalDate::clear_month() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  _impl_.month_ = 0;
-}
-inline ::int32_t FigureDescriptor_BusinessCalendarDescriptor_LocalDate::month() const {
-  // @@protoc_insertion_point(field_get:io.deephaven.proto.backplane.script.grpc.FigureDescriptor.BusinessCalendarDescriptor.LocalDate.month)
-  return _internal_month();
-}
-inline void FigureDescriptor_BusinessCalendarDescriptor_LocalDate::set_month(::int32_t value) {
-  _internal_set_month(value);
-  // @@protoc_insertion_point(field_set:io.deephaven.proto.backplane.script.grpc.FigureDescriptor.BusinessCalendarDescriptor.LocalDate.month)
-}
-inline ::int32_t FigureDescriptor_BusinessCalendarDescriptor_LocalDate::_internal_month() const {
-  PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race);
-  return _impl_.month_;
-}
-inline void FigureDescriptor_BusinessCalendarDescriptor_LocalDate::_internal_set_month(::int32_t value) {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  ;
-  _impl_.month_ = value;
-}
-
-// int32 day = 3;
-inline void FigureDescriptor_BusinessCalendarDescriptor_LocalDate::clear_day() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  _impl_.day_ = 0;
-}
-inline ::int32_t FigureDescriptor_BusinessCalendarDescriptor_LocalDate::day() const {
-  // @@protoc_insertion_point(field_get:io.deephaven.proto.backplane.script.grpc.FigureDescriptor.BusinessCalendarDescriptor.LocalDate.day)
-  return _internal_day();
-}
-inline void FigureDescriptor_BusinessCalendarDescriptor_LocalDate::set_day(::int32_t value) {
-  _internal_set_day(value);
-  // @@protoc_insertion_point(field_set:io.deephaven.proto.backplane.script.grpc.FigureDescriptor.BusinessCalendarDescriptor.LocalDate.day)
-}
-inline ::int32_t FigureDescriptor_BusinessCalendarDescriptor_LocalDate::_internal_day() const {
-  PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race);
-  return _impl_.day_;
-}
-inline void FigureDescriptor_BusinessCalendarDescriptor_LocalDate::_internal_set_day(::int32_t value) {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  ;
-  _impl_.day_ = value;
-}
-
-// -------------------------------------------------------------------
-
-// FigureDescriptor_BusinessCalendarDescriptor
-
-// string name = 1;
-inline void FigureDescriptor_BusinessCalendarDescriptor::clear_name() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  _impl_.name_.ClearToEmpty();
-}
-inline const std::string& FigureDescriptor_BusinessCalendarDescriptor::name() const
-    ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  // @@protoc_insertion_point(field_get:io.deephaven.proto.backplane.script.grpc.FigureDescriptor.BusinessCalendarDescriptor.name)
-  return _internal_name();
-}
-template <typename Arg_, typename... Args_>
-inline PROTOBUF_ALWAYS_INLINE void FigureDescriptor_BusinessCalendarDescriptor::set_name(Arg_&& arg,
-                                                     Args_... args) {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  ;
-  _impl_.name_.Set(static_cast<Arg_&&>(arg), args..., GetArena());
-  // @@protoc_insertion_point(field_set:io.deephaven.proto.backplane.script.grpc.FigureDescriptor.BusinessCalendarDescriptor.name)
-}
-inline std::string* FigureDescriptor_BusinessCalendarDescriptor::mutable_name() ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  std::string* _s = _internal_mutable_name();
-  // @@protoc_insertion_point(field_mutable:io.deephaven.proto.backplane.script.grpc.FigureDescriptor.BusinessCalendarDescriptor.name)
-  return _s;
-}
-inline const std::string& FigureDescriptor_BusinessCalendarDescriptor::_internal_name() const {
-  PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race);
-  return _impl_.name_.Get();
-}
-inline void FigureDescriptor_BusinessCalendarDescriptor::_internal_set_name(const std::string& value) {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  ;
-  _impl_.name_.Set(value, GetArena());
-}
-inline std::string* FigureDescriptor_BusinessCalendarDescriptor::_internal_mutable_name() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  ;
-  return _impl_.name_.Mutable( GetArena());
-}
-inline std::string* FigureDescriptor_BusinessCalendarDescriptor::release_name() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  // @@protoc_insertion_point(field_release:io.deephaven.proto.backplane.script.grpc.FigureDescriptor.BusinessCalendarDescriptor.name)
-  return _impl_.name_.Release();
-}
-inline void FigureDescriptor_BusinessCalendarDescriptor::set_allocated_name(std::string* value) {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  _impl_.name_.SetAllocated(value, GetArena());
-  #ifdef PROTOBUF_FORCE_COPY_DEFAULT_STRING
-        if (_impl_.name_.IsDefault()) {
-          _impl_.name_.Set("", GetArena());
-        }
-  #endif  // PROTOBUF_FORCE_COPY_DEFAULT_STRING
-  // @@protoc_insertion_point(field_set_allocated:io.deephaven.proto.backplane.script.grpc.FigureDescriptor.BusinessCalendarDescriptor.name)
-}
-
-// string time_zone = 2;
-inline void FigureDescriptor_BusinessCalendarDescriptor::clear_time_zone() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  _impl_.time_zone_.ClearToEmpty();
-}
-inline const std::string& FigureDescriptor_BusinessCalendarDescriptor::time_zone() const
-    ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  // @@protoc_insertion_point(field_get:io.deephaven.proto.backplane.script.grpc.FigureDescriptor.BusinessCalendarDescriptor.time_zone)
-  return _internal_time_zone();
-}
-template <typename Arg_, typename... Args_>
-inline PROTOBUF_ALWAYS_INLINE void FigureDescriptor_BusinessCalendarDescriptor::set_time_zone(Arg_&& arg,
-                                                     Args_... args) {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  ;
-  _impl_.time_zone_.Set(static_cast<Arg_&&>(arg), args..., GetArena());
-  // @@protoc_insertion_point(field_set:io.deephaven.proto.backplane.script.grpc.FigureDescriptor.BusinessCalendarDescriptor.time_zone)
-}
-inline std::string* FigureDescriptor_BusinessCalendarDescriptor::mutable_time_zone() ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  std::string* _s = _internal_mutable_time_zone();
-  // @@protoc_insertion_point(field_mutable:io.deephaven.proto.backplane.script.grpc.FigureDescriptor.BusinessCalendarDescriptor.time_zone)
-  return _s;
-}
-inline const std::string& FigureDescriptor_BusinessCalendarDescriptor::_internal_time_zone() const {
-  PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race);
-  return _impl_.time_zone_.Get();
-}
-inline void FigureDescriptor_BusinessCalendarDescriptor::_internal_set_time_zone(const std::string& value) {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  ;
-  _impl_.time_zone_.Set(value, GetArena());
-}
-inline std::string* FigureDescriptor_BusinessCalendarDescriptor::_internal_mutable_time_zone() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  ;
-  return _impl_.time_zone_.Mutable( GetArena());
-}
-inline std::string* FigureDescriptor_BusinessCalendarDescriptor::release_time_zone() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  // @@protoc_insertion_point(field_release:io.deephaven.proto.backplane.script.grpc.FigureDescriptor.BusinessCalendarDescriptor.time_zone)
-  return _impl_.time_zone_.Release();
-}
-inline void FigureDescriptor_BusinessCalendarDescriptor::set_allocated_time_zone(std::string* value) {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  _impl_.time_zone_.SetAllocated(value, GetArena());
-  #ifdef PROTOBUF_FORCE_COPY_DEFAULT_STRING
-        if (_impl_.time_zone_.IsDefault()) {
-          _impl_.time_zone_.Set("", GetArena());
-        }
-  #endif  // PROTOBUF_FORCE_COPY_DEFAULT_STRING
-  // @@protoc_insertion_point(field_set_allocated:io.deephaven.proto.backplane.script.grpc.FigureDescriptor.BusinessCalendarDescriptor.time_zone)
-}
-
-// repeated .io.deephaven.proto.backplane.script.grpc.FigureDescriptor.BusinessCalendarDescriptor.DayOfWeek business_days = 3;
-inline int FigureDescriptor_BusinessCalendarDescriptor::_internal_business_days_size() const {
-  return _internal_business_days().size();
-}
-inline int FigureDescriptor_BusinessCalendarDescriptor::business_days_size() const {
-  return _internal_business_days_size();
-}
-inline void FigureDescriptor_BusinessCalendarDescriptor::clear_business_days() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  _impl_.business_days_.Clear();
-}
-inline ::io::deephaven::proto::backplane::script::grpc::FigureDescriptor_BusinessCalendarDescriptor_DayOfWeek FigureDescriptor_BusinessCalendarDescriptor::business_days(int index) const {
-  // @@protoc_insertion_point(field_get:io.deephaven.proto.backplane.script.grpc.FigureDescriptor.BusinessCalendarDescriptor.business_days)
-  return static_cast<::io::deephaven::proto::backplane::script::grpc::FigureDescriptor_BusinessCalendarDescriptor_DayOfWeek>(_internal_business_days().Get(index));
-}
-inline void FigureDescriptor_BusinessCalendarDescriptor::set_business_days(int index, ::io::deephaven::proto::backplane::script::grpc::FigureDescriptor_BusinessCalendarDescriptor_DayOfWeek value) {
-  _internal_mutable_business_days()->Set(index, value);
-  // @@protoc_insertion_point(field_set:io.deephaven.proto.backplane.script.grpc.FigureDescriptor.BusinessCalendarDescriptor.business_days)
-}
-inline void FigureDescriptor_BusinessCalendarDescriptor::add_business_days(::io::deephaven::proto::backplane::script::grpc::FigureDescriptor_BusinessCalendarDescriptor_DayOfWeek value) {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  _internal_mutable_business_days()->Add(value);
-  // @@protoc_insertion_point(field_add:io.deephaven.proto.backplane.script.grpc.FigureDescriptor.BusinessCalendarDescriptor.business_days)
-}
-inline const ::google::protobuf::RepeatedField<int>& FigureDescriptor_BusinessCalendarDescriptor::business_days() const
-    ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  // @@protoc_insertion_point(field_list:io.deephaven.proto.backplane.script.grpc.FigureDescriptor.BusinessCalendarDescriptor.business_days)
-  return _internal_business_days();
-}
-inline ::google::protobuf::RepeatedField<int>* FigureDescriptor_BusinessCalendarDescriptor::mutable_business_days()
-    ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  // @@protoc_insertion_point(field_mutable_list:io.deephaven.proto.backplane.script.grpc.FigureDescriptor.BusinessCalendarDescriptor.business_days)
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  return _internal_mutable_business_days();
-}
-inline const ::google::protobuf::RepeatedField<int>& FigureDescriptor_BusinessCalendarDescriptor::_internal_business_days() const {
-  PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race);
-  return _impl_.business_days_;
-}
-inline ::google::protobuf::RepeatedField<int>* FigureDescriptor_BusinessCalendarDescriptor::_internal_mutable_business_days() {
-  PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race);
-  return &_impl_.business_days_;
-}
-
-// repeated .io.deephaven.proto.backplane.script.grpc.FigureDescriptor.BusinessCalendarDescriptor.BusinessPeriod business_periods = 4;
-inline int FigureDescriptor_BusinessCalendarDescriptor::_internal_business_periods_size() const {
-  return _internal_business_periods().size();
-}
-inline int FigureDescriptor_BusinessCalendarDescriptor::business_periods_size() const {
-  return _internal_business_periods_size();
-}
-inline void FigureDescriptor_BusinessCalendarDescriptor::clear_business_periods() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  _impl_.business_periods_.Clear();
-}
-inline ::io::deephaven::proto::backplane::script::grpc::FigureDescriptor_BusinessCalendarDescriptor_BusinessPeriod* FigureDescriptor_BusinessCalendarDescriptor::mutable_business_periods(int index)
-    ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  // @@protoc_insertion_point(field_mutable:io.deephaven.proto.backplane.script.grpc.FigureDescriptor.BusinessCalendarDescriptor.business_periods)
-  return _internal_mutable_business_periods()->Mutable(index);
-}
-inline ::google::protobuf::RepeatedPtrField<::io::deephaven::proto::backplane::script::grpc::FigureDescriptor_BusinessCalendarDescriptor_BusinessPeriod>* FigureDescriptor_BusinessCalendarDescriptor::mutable_business_periods()
-    ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  // @@protoc_insertion_point(field_mutable_list:io.deephaven.proto.backplane.script.grpc.FigureDescriptor.BusinessCalendarDescriptor.business_periods)
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  return _internal_mutable_business_periods();
-}
-inline const ::io::deephaven::proto::backplane::script::grpc::FigureDescriptor_BusinessCalendarDescriptor_BusinessPeriod& FigureDescriptor_BusinessCalendarDescriptor::business_periods(int index) const
-    ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  // @@protoc_insertion_point(field_get:io.deephaven.proto.backplane.script.grpc.FigureDescriptor.BusinessCalendarDescriptor.business_periods)
-  return _internal_business_periods().Get(index);
-}
-inline ::io::deephaven::proto::backplane::script::grpc::FigureDescriptor_BusinessCalendarDescriptor_BusinessPeriod* FigureDescriptor_BusinessCalendarDescriptor::add_business_periods() ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  ::io::deephaven::proto::backplane::script::grpc::FigureDescriptor_BusinessCalendarDescriptor_BusinessPeriod* _add = _internal_mutable_business_periods()->Add();
-  // @@protoc_insertion_point(field_add:io.deephaven.proto.backplane.script.grpc.FigureDescriptor.BusinessCalendarDescriptor.business_periods)
-  return _add;
-}
-inline const ::google::protobuf::RepeatedPtrField<::io::deephaven::proto::backplane::script::grpc::FigureDescriptor_BusinessCalendarDescriptor_BusinessPeriod>& FigureDescriptor_BusinessCalendarDescriptor::business_periods() const
-    ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  // @@protoc_insertion_point(field_list:io.deephaven.proto.backplane.script.grpc.FigureDescriptor.BusinessCalendarDescriptor.business_periods)
-  return _internal_business_periods();
-}
-inline const ::google::protobuf::RepeatedPtrField<::io::deephaven::proto::backplane::script::grpc::FigureDescriptor_BusinessCalendarDescriptor_BusinessPeriod>&
-FigureDescriptor_BusinessCalendarDescriptor::_internal_business_periods() const {
-  PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race);
-  return _impl_.business_periods_;
-}
-inline ::google::protobuf::RepeatedPtrField<::io::deephaven::proto::backplane::script::grpc::FigureDescriptor_BusinessCalendarDescriptor_BusinessPeriod>*
-FigureDescriptor_BusinessCalendarDescriptor::_internal_mutable_business_periods() {
-  PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race);
-  return &_impl_.business_periods_;
-}
-
-// repeated .io.deephaven.proto.backplane.script.grpc.FigureDescriptor.BusinessCalendarDescriptor.Holiday holidays = 5;
-inline int FigureDescriptor_BusinessCalendarDescriptor::_internal_holidays_size() const {
-  return _internal_holidays().size();
-}
-inline int FigureDescriptor_BusinessCalendarDescriptor::holidays_size() const {
-  return _internal_holidays_size();
-}
-inline void FigureDescriptor_BusinessCalendarDescriptor::clear_holidays() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  _impl_.holidays_.Clear();
-}
-inline ::io::deephaven::proto::backplane::script::grpc::FigureDescriptor_BusinessCalendarDescriptor_Holiday* FigureDescriptor_BusinessCalendarDescriptor::mutable_holidays(int index)
-    ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  // @@protoc_insertion_point(field_mutable:io.deephaven.proto.backplane.script.grpc.FigureDescriptor.BusinessCalendarDescriptor.holidays)
-  return _internal_mutable_holidays()->Mutable(index);
-}
-inline ::google::protobuf::RepeatedPtrField<::io::deephaven::proto::backplane::script::grpc::FigureDescriptor_BusinessCalendarDescriptor_Holiday>* FigureDescriptor_BusinessCalendarDescriptor::mutable_holidays()
-    ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  // @@protoc_insertion_point(field_mutable_list:io.deephaven.proto.backplane.script.grpc.FigureDescriptor.BusinessCalendarDescriptor.holidays)
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  return _internal_mutable_holidays();
-}
-inline const ::io::deephaven::proto::backplane::script::grpc::FigureDescriptor_BusinessCalendarDescriptor_Holiday& FigureDescriptor_BusinessCalendarDescriptor::holidays(int index) const
-    ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  // @@protoc_insertion_point(field_get:io.deephaven.proto.backplane.script.grpc.FigureDescriptor.BusinessCalendarDescriptor.holidays)
-  return _internal_holidays().Get(index);
-}
-inline ::io::deephaven::proto::backplane::script::grpc::FigureDescriptor_BusinessCalendarDescriptor_Holiday* FigureDescriptor_BusinessCalendarDescriptor::add_holidays() ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  ::io::deephaven::proto::backplane::script::grpc::FigureDescriptor_BusinessCalendarDescriptor_Holiday* _add = _internal_mutable_holidays()->Add();
-  // @@protoc_insertion_point(field_add:io.deephaven.proto.backplane.script.grpc.FigureDescriptor.BusinessCalendarDescriptor.holidays)
-  return _add;
-}
-inline const ::google::protobuf::RepeatedPtrField<::io::deephaven::proto::backplane::script::grpc::FigureDescriptor_BusinessCalendarDescriptor_Holiday>& FigureDescriptor_BusinessCalendarDescriptor::holidays() const
-    ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  // @@protoc_insertion_point(field_list:io.deephaven.proto.backplane.script.grpc.FigureDescriptor.BusinessCalendarDescriptor.holidays)
-  return _internal_holidays();
-}
-inline const ::google::protobuf::RepeatedPtrField<::io::deephaven::proto::backplane::script::grpc::FigureDescriptor_BusinessCalendarDescriptor_Holiday>&
-FigureDescriptor_BusinessCalendarDescriptor::_internal_holidays() const {
-  PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race);
-  return _impl_.holidays_;
-}
-inline ::google::protobuf::RepeatedPtrField<::io::deephaven::proto::backplane::script::grpc::FigureDescriptor_BusinessCalendarDescriptor_Holiday>*
-FigureDescriptor_BusinessCalendarDescriptor::_internal_mutable_holidays() {
-  PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race);
-  return &_impl_.holidays_;
-}
-
-// -------------------------------------------------------------------
-
-// FigureDescriptor_MultiSeriesSourceDescriptor
-
-// string axis_id = 1;
-inline void FigureDescriptor_MultiSeriesSourceDescriptor::clear_axis_id() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  _impl_.axis_id_.ClearToEmpty();
-}
-inline const std::string& FigureDescriptor_MultiSeriesSourceDescriptor::axis_id() const
-    ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  // @@protoc_insertion_point(field_get:io.deephaven.proto.backplane.script.grpc.FigureDescriptor.MultiSeriesSourceDescriptor.axis_id)
-  return _internal_axis_id();
-}
-template <typename Arg_, typename... Args_>
-inline PROTOBUF_ALWAYS_INLINE void FigureDescriptor_MultiSeriesSourceDescriptor::set_axis_id(Arg_&& arg,
-                                                     Args_... args) {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  ;
-  _impl_.axis_id_.Set(static_cast<Arg_&&>(arg), args..., GetArena());
-  // @@protoc_insertion_point(field_set:io.deephaven.proto.backplane.script.grpc.FigureDescriptor.MultiSeriesSourceDescriptor.axis_id)
-}
-inline std::string* FigureDescriptor_MultiSeriesSourceDescriptor::mutable_axis_id() ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  std::string* _s = _internal_mutable_axis_id();
-  // @@protoc_insertion_point(field_mutable:io.deephaven.proto.backplane.script.grpc.FigureDescriptor.MultiSeriesSourceDescriptor.axis_id)
-  return _s;
-}
-inline const std::string& FigureDescriptor_MultiSeriesSourceDescriptor::_internal_axis_id() const {
-  PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race);
-  return _impl_.axis_id_.Get();
-}
-inline void FigureDescriptor_MultiSeriesSourceDescriptor::_internal_set_axis_id(const std::string& value) {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  ;
-  _impl_.axis_id_.Set(value, GetArena());
-}
-inline std::string* FigureDescriptor_MultiSeriesSourceDescriptor::_internal_mutable_axis_id() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  ;
-  return _impl_.axis_id_.Mutable( GetArena());
-}
-inline std::string* FigureDescriptor_MultiSeriesSourceDescriptor::release_axis_id() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  // @@protoc_insertion_point(field_release:io.deephaven.proto.backplane.script.grpc.FigureDescriptor.MultiSeriesSourceDescriptor.axis_id)
-  return _impl_.axis_id_.Release();
-}
-inline void FigureDescriptor_MultiSeriesSourceDescriptor::set_allocated_axis_id(std::string* value) {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  _impl_.axis_id_.SetAllocated(value, GetArena());
-  #ifdef PROTOBUF_FORCE_COPY_DEFAULT_STRING
-        if (_impl_.axis_id_.IsDefault()) {
-          _impl_.axis_id_.Set("", GetArena());
-        }
-  #endif  // PROTOBUF_FORCE_COPY_DEFAULT_STRING
-  // @@protoc_insertion_point(field_set_allocated:io.deephaven.proto.backplane.script.grpc.FigureDescriptor.MultiSeriesSourceDescriptor.axis_id)
-}
-
-// .io.deephaven.proto.backplane.script.grpc.FigureDescriptor.SourceType type = 2;
-inline void FigureDescriptor_MultiSeriesSourceDescriptor::clear_type() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  _impl_.type_ = 0;
-}
-inline ::io::deephaven::proto::backplane::script::grpc::FigureDescriptor_SourceType FigureDescriptor_MultiSeriesSourceDescriptor::type() const {
-  // @@protoc_insertion_point(field_get:io.deephaven.proto.backplane.script.grpc.FigureDescriptor.MultiSeriesSourceDescriptor.type)
-  return _internal_type();
-}
-inline void FigureDescriptor_MultiSeriesSourceDescriptor::set_type(::io::deephaven::proto::backplane::script::grpc::FigureDescriptor_SourceType value) {
-  _internal_set_type(value);
-  // @@protoc_insertion_point(field_set:io.deephaven.proto.backplane.script.grpc.FigureDescriptor.MultiSeriesSourceDescriptor.type)
-}
-inline ::io::deephaven::proto::backplane::script::grpc::FigureDescriptor_SourceType FigureDescriptor_MultiSeriesSourceDescriptor::_internal_type() const {
-  PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race);
-  return static_cast<::io::deephaven::proto::backplane::script::grpc::FigureDescriptor_SourceType>(_impl_.type_);
-}
-inline void FigureDescriptor_MultiSeriesSourceDescriptor::_internal_set_type(::io::deephaven::proto::backplane::script::grpc::FigureDescriptor_SourceType value) {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  ;
-  _impl_.type_ = value;
-}
-
-// int32 partitioned_table_id = 3;
-inline void FigureDescriptor_MultiSeriesSourceDescriptor::clear_partitioned_table_id() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  _impl_.partitioned_table_id_ = 0;
-}
-inline ::int32_t FigureDescriptor_MultiSeriesSourceDescriptor::partitioned_table_id() const {
-  // @@protoc_insertion_point(field_get:io.deephaven.proto.backplane.script.grpc.FigureDescriptor.MultiSeriesSourceDescriptor.partitioned_table_id)
-  return _internal_partitioned_table_id();
-}
-inline void FigureDescriptor_MultiSeriesSourceDescriptor::set_partitioned_table_id(::int32_t value) {
-  _internal_set_partitioned_table_id(value);
-  // @@protoc_insertion_point(field_set:io.deephaven.proto.backplane.script.grpc.FigureDescriptor.MultiSeriesSourceDescriptor.partitioned_table_id)
-}
-inline ::int32_t FigureDescriptor_MultiSeriesSourceDescriptor::_internal_partitioned_table_id() const {
-  PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race);
-  return _impl_.partitioned_table_id_;
-}
-inline void FigureDescriptor_MultiSeriesSourceDescriptor::_internal_set_partitioned_table_id(::int32_t value) {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  ;
-  _impl_.partitioned_table_id_ = value;
-}
-
-// string column_name = 4;
-inline void FigureDescriptor_MultiSeriesSourceDescriptor::clear_column_name() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  _impl_.column_name_.ClearToEmpty();
-}
-inline const std::string& FigureDescriptor_MultiSeriesSourceDescriptor::column_name() const
-    ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  // @@protoc_insertion_point(field_get:io.deephaven.proto.backplane.script.grpc.FigureDescriptor.MultiSeriesSourceDescriptor.column_name)
-  return _internal_column_name();
-}
-template <typename Arg_, typename... Args_>
-inline PROTOBUF_ALWAYS_INLINE void FigureDescriptor_MultiSeriesSourceDescriptor::set_column_name(Arg_&& arg,
-                                                     Args_... args) {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  ;
-  _impl_.column_name_.Set(static_cast<Arg_&&>(arg), args..., GetArena());
-  // @@protoc_insertion_point(field_set:io.deephaven.proto.backplane.script.grpc.FigureDescriptor.MultiSeriesSourceDescriptor.column_name)
-}
-inline std::string* FigureDescriptor_MultiSeriesSourceDescriptor::mutable_column_name() ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  std::string* _s = _internal_mutable_column_name();
-  // @@protoc_insertion_point(field_mutable:io.deephaven.proto.backplane.script.grpc.FigureDescriptor.MultiSeriesSourceDescriptor.column_name)
-  return _s;
-}
-inline const std::string& FigureDescriptor_MultiSeriesSourceDescriptor::_internal_column_name() const {
-  PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race);
-  return _impl_.column_name_.Get();
-}
-inline void FigureDescriptor_MultiSeriesSourceDescriptor::_internal_set_column_name(const std::string& value) {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  ;
-  _impl_.column_name_.Set(value, GetArena());
-}
-inline std::string* FigureDescriptor_MultiSeriesSourceDescriptor::_internal_mutable_column_name() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  ;
-  return _impl_.column_name_.Mutable( GetArena());
-}
-inline std::string* FigureDescriptor_MultiSeriesSourceDescriptor::release_column_name() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  // @@protoc_insertion_point(field_release:io.deephaven.proto.backplane.script.grpc.FigureDescriptor.MultiSeriesSourceDescriptor.column_name)
-  return _impl_.column_name_.Release();
-}
-inline void FigureDescriptor_MultiSeriesSourceDescriptor::set_allocated_column_name(std::string* value) {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  _impl_.column_name_.SetAllocated(value, GetArena());
-  #ifdef PROTOBUF_FORCE_COPY_DEFAULT_STRING
-        if (_impl_.column_name_.IsDefault()) {
-          _impl_.column_name_.Set("", GetArena());
-        }
-  #endif  // PROTOBUF_FORCE_COPY_DEFAULT_STRING
-  // @@protoc_insertion_point(field_set_allocated:io.deephaven.proto.backplane.script.grpc.FigureDescriptor.MultiSeriesSourceDescriptor.column_name)
-}
-
-// -------------------------------------------------------------------
-
-// FigureDescriptor_SourceDescriptor
-
-// string axis_id = 1;
-inline void FigureDescriptor_SourceDescriptor::clear_axis_id() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  _impl_.axis_id_.ClearToEmpty();
-}
-inline const std::string& FigureDescriptor_SourceDescriptor::axis_id() const
-    ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  // @@protoc_insertion_point(field_get:io.deephaven.proto.backplane.script.grpc.FigureDescriptor.SourceDescriptor.axis_id)
-  return _internal_axis_id();
-}
-template <typename Arg_, typename... Args_>
-inline PROTOBUF_ALWAYS_INLINE void FigureDescriptor_SourceDescriptor::set_axis_id(Arg_&& arg,
-                                                     Args_... args) {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  ;
-  _impl_.axis_id_.Set(static_cast<Arg_&&>(arg), args..., GetArena());
-  // @@protoc_insertion_point(field_set:io.deephaven.proto.backplane.script.grpc.FigureDescriptor.SourceDescriptor.axis_id)
-}
-inline std::string* FigureDescriptor_SourceDescriptor::mutable_axis_id() ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  std::string* _s = _internal_mutable_axis_id();
-  // @@protoc_insertion_point(field_mutable:io.deephaven.proto.backplane.script.grpc.FigureDescriptor.SourceDescriptor.axis_id)
-  return _s;
-}
-inline const std::string& FigureDescriptor_SourceDescriptor::_internal_axis_id() const {
-  PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race);
-  return _impl_.axis_id_.Get();
-}
-inline void FigureDescriptor_SourceDescriptor::_internal_set_axis_id(const std::string& value) {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  ;
-  _impl_.axis_id_.Set(value, GetArena());
-}
-inline std::string* FigureDescriptor_SourceDescriptor::_internal_mutable_axis_id() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  ;
-  return _impl_.axis_id_.Mutable( GetArena());
-}
-inline std::string* FigureDescriptor_SourceDescriptor::release_axis_id() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  // @@protoc_insertion_point(field_release:io.deephaven.proto.backplane.script.grpc.FigureDescriptor.SourceDescriptor.axis_id)
-  return _impl_.axis_id_.Release();
-}
-inline void FigureDescriptor_SourceDescriptor::set_allocated_axis_id(std::string* value) {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  _impl_.axis_id_.SetAllocated(value, GetArena());
-  #ifdef PROTOBUF_FORCE_COPY_DEFAULT_STRING
-        if (_impl_.axis_id_.IsDefault()) {
-          _impl_.axis_id_.Set("", GetArena());
-        }
-  #endif  // PROTOBUF_FORCE_COPY_DEFAULT_STRING
-  // @@protoc_insertion_point(field_set_allocated:io.deephaven.proto.backplane.script.grpc.FigureDescriptor.SourceDescriptor.axis_id)
-}
-
-// .io.deephaven.proto.backplane.script.grpc.FigureDescriptor.SourceType type = 2;
-inline void FigureDescriptor_SourceDescriptor::clear_type() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  _impl_.type_ = 0;
-}
-inline ::io::deephaven::proto::backplane::script::grpc::FigureDescriptor_SourceType FigureDescriptor_SourceDescriptor::type() const {
-  // @@protoc_insertion_point(field_get:io.deephaven.proto.backplane.script.grpc.FigureDescriptor.SourceDescriptor.type)
-  return _internal_type();
-}
-inline void FigureDescriptor_SourceDescriptor::set_type(::io::deephaven::proto::backplane::script::grpc::FigureDescriptor_SourceType value) {
-  _internal_set_type(value);
-  // @@protoc_insertion_point(field_set:io.deephaven.proto.backplane.script.grpc.FigureDescriptor.SourceDescriptor.type)
-}
-inline ::io::deephaven::proto::backplane::script::grpc::FigureDescriptor_SourceType FigureDescriptor_SourceDescriptor::_internal_type() const {
-  PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race);
-  return static_cast<::io::deephaven::proto::backplane::script::grpc::FigureDescriptor_SourceType>(_impl_.type_);
-}
-inline void FigureDescriptor_SourceDescriptor::_internal_set_type(::io::deephaven::proto::backplane::script::grpc::FigureDescriptor_SourceType value) {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  ;
-  _impl_.type_ = value;
-}
-
-// int32 table_id = 3;
-inline void FigureDescriptor_SourceDescriptor::clear_table_id() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  _impl_.table_id_ = 0;
-}
-inline ::int32_t FigureDescriptor_SourceDescriptor::table_id() const {
-  // @@protoc_insertion_point(field_get:io.deephaven.proto.backplane.script.grpc.FigureDescriptor.SourceDescriptor.table_id)
-  return _internal_table_id();
-}
-inline void FigureDescriptor_SourceDescriptor::set_table_id(::int32_t value) {
-  _internal_set_table_id(value);
-  // @@protoc_insertion_point(field_set:io.deephaven.proto.backplane.script.grpc.FigureDescriptor.SourceDescriptor.table_id)
-}
-inline ::int32_t FigureDescriptor_SourceDescriptor::_internal_table_id() const {
-  PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race);
-  return _impl_.table_id_;
-}
-inline void FigureDescriptor_SourceDescriptor::_internal_set_table_id(::int32_t value) {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  ;
-  _impl_.table_id_ = value;
-}
-
-// int32 partitioned_table_id = 4;
-inline void FigureDescriptor_SourceDescriptor::clear_partitioned_table_id() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  _impl_.partitioned_table_id_ = 0;
-}
-inline ::int32_t FigureDescriptor_SourceDescriptor::partitioned_table_id() const {
-  // @@protoc_insertion_point(field_get:io.deephaven.proto.backplane.script.grpc.FigureDescriptor.SourceDescriptor.partitioned_table_id)
-  return _internal_partitioned_table_id();
-}
-inline void FigureDescriptor_SourceDescriptor::set_partitioned_table_id(::int32_t value) {
-  _internal_set_partitioned_table_id(value);
-  // @@protoc_insertion_point(field_set:io.deephaven.proto.backplane.script.grpc.FigureDescriptor.SourceDescriptor.partitioned_table_id)
-}
-inline ::int32_t FigureDescriptor_SourceDescriptor::_internal_partitioned_table_id() const {
-  PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race);
-  return _impl_.partitioned_table_id_;
-}
-inline void FigureDescriptor_SourceDescriptor::_internal_set_partitioned_table_id(::int32_t value) {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  ;
-  _impl_.partitioned_table_id_ = value;
-}
-
-// string column_name = 5;
-inline void FigureDescriptor_SourceDescriptor::clear_column_name() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  _impl_.column_name_.ClearToEmpty();
-}
-inline const std::string& FigureDescriptor_SourceDescriptor::column_name() const
-    ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  // @@protoc_insertion_point(field_get:io.deephaven.proto.backplane.script.grpc.FigureDescriptor.SourceDescriptor.column_name)
-  return _internal_column_name();
-}
-template <typename Arg_, typename... Args_>
-inline PROTOBUF_ALWAYS_INLINE void FigureDescriptor_SourceDescriptor::set_column_name(Arg_&& arg,
-                                                     Args_... args) {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  ;
-  _impl_.column_name_.Set(static_cast<Arg_&&>(arg), args..., GetArena());
-  // @@protoc_insertion_point(field_set:io.deephaven.proto.backplane.script.grpc.FigureDescriptor.SourceDescriptor.column_name)
-}
-inline std::string* FigureDescriptor_SourceDescriptor::mutable_column_name() ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  std::string* _s = _internal_mutable_column_name();
-  // @@protoc_insertion_point(field_mutable:io.deephaven.proto.backplane.script.grpc.FigureDescriptor.SourceDescriptor.column_name)
-  return _s;
-}
-inline const std::string& FigureDescriptor_SourceDescriptor::_internal_column_name() const {
-  PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race);
-  return _impl_.column_name_.Get();
-}
-inline void FigureDescriptor_SourceDescriptor::_internal_set_column_name(const std::string& value) {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  ;
-  _impl_.column_name_.Set(value, GetArena());
-}
-inline std::string* FigureDescriptor_SourceDescriptor::_internal_mutable_column_name() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  ;
-  return _impl_.column_name_.Mutable( GetArena());
-}
-inline std::string* FigureDescriptor_SourceDescriptor::release_column_name() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  // @@protoc_insertion_point(field_release:io.deephaven.proto.backplane.script.grpc.FigureDescriptor.SourceDescriptor.column_name)
-  return _impl_.column_name_.Release();
-}
-inline void FigureDescriptor_SourceDescriptor::set_allocated_column_name(std::string* value) {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  _impl_.column_name_.SetAllocated(value, GetArena());
-  #ifdef PROTOBUF_FORCE_COPY_DEFAULT_STRING
-        if (_impl_.column_name_.IsDefault()) {
-          _impl_.column_name_.Set("", GetArena());
-        }
-  #endif  // PROTOBUF_FORCE_COPY_DEFAULT_STRING
-  // @@protoc_insertion_point(field_set_allocated:io.deephaven.proto.backplane.script.grpc.FigureDescriptor.SourceDescriptor.column_name)
-}
-
-// string column_type = 6;
-inline void FigureDescriptor_SourceDescriptor::clear_column_type() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  _impl_.column_type_.ClearToEmpty();
-}
-inline const std::string& FigureDescriptor_SourceDescriptor::column_type() const
-    ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  // @@protoc_insertion_point(field_get:io.deephaven.proto.backplane.script.grpc.FigureDescriptor.SourceDescriptor.column_type)
-  return _internal_column_type();
-}
-template <typename Arg_, typename... Args_>
-inline PROTOBUF_ALWAYS_INLINE void FigureDescriptor_SourceDescriptor::set_column_type(Arg_&& arg,
-                                                     Args_... args) {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  ;
-  _impl_.column_type_.Set(static_cast<Arg_&&>(arg), args..., GetArena());
-  // @@protoc_insertion_point(field_set:io.deephaven.proto.backplane.script.grpc.FigureDescriptor.SourceDescriptor.column_type)
-}
-inline std::string* FigureDescriptor_SourceDescriptor::mutable_column_type() ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  std::string* _s = _internal_mutable_column_type();
-  // @@protoc_insertion_point(field_mutable:io.deephaven.proto.backplane.script.grpc.FigureDescriptor.SourceDescriptor.column_type)
-  return _s;
-}
-inline const std::string& FigureDescriptor_SourceDescriptor::_internal_column_type() const {
-  PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race);
-  return _impl_.column_type_.Get();
-}
-inline void FigureDescriptor_SourceDescriptor::_internal_set_column_type(const std::string& value) {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  ;
-  _impl_.column_type_.Set(value, GetArena());
-}
-inline std::string* FigureDescriptor_SourceDescriptor::_internal_mutable_column_type() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  ;
-  return _impl_.column_type_.Mutable( GetArena());
-}
-inline std::string* FigureDescriptor_SourceDescriptor::release_column_type() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  // @@protoc_insertion_point(field_release:io.deephaven.proto.backplane.script.grpc.FigureDescriptor.SourceDescriptor.column_type)
-  return _impl_.column_type_.Release();
-}
-inline void FigureDescriptor_SourceDescriptor::set_allocated_column_type(std::string* value) {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  _impl_.column_type_.SetAllocated(value, GetArena());
-  #ifdef PROTOBUF_FORCE_COPY_DEFAULT_STRING
-        if (_impl_.column_type_.IsDefault()) {
-          _impl_.column_type_.Set("", GetArena());
-        }
-  #endif  // PROTOBUF_FORCE_COPY_DEFAULT_STRING
-  // @@protoc_insertion_point(field_set_allocated:io.deephaven.proto.backplane.script.grpc.FigureDescriptor.SourceDescriptor.column_type)
-}
-
-// .io.deephaven.proto.backplane.script.grpc.FigureDescriptor.OneClickDescriptor one_click = 7;
-inline bool FigureDescriptor_SourceDescriptor::has_one_click() const {
-  bool value = (_impl_._has_bits_[0] & 0x00000001u) != 0;
-  PROTOBUF_ASSUME(!value || _impl_.one_click_ != nullptr);
-  return value;
-}
-inline void FigureDescriptor_SourceDescriptor::clear_one_click() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  if (_impl_.one_click_ != nullptr) _impl_.one_click_->Clear();
-  _impl_._has_bits_[0] &= ~0x00000001u;
-}
-inline const ::io::deephaven::proto::backplane::script::grpc::FigureDescriptor_OneClickDescriptor& FigureDescriptor_SourceDescriptor::_internal_one_click() const {
-  PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race);
-  const ::io::deephaven::proto::backplane::script::grpc::FigureDescriptor_OneClickDescriptor* p = _impl_.one_click_;
-  return p != nullptr ? *p : reinterpret_cast<const ::io::deephaven::proto::backplane::script::grpc::FigureDescriptor_OneClickDescriptor&>(::io::deephaven::proto::backplane::script::grpc::_FigureDescriptor_OneClickDescriptor_default_instance_);
-}
-inline const ::io::deephaven::proto::backplane::script::grpc::FigureDescriptor_OneClickDescriptor& FigureDescriptor_SourceDescriptor::one_click() const ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  // @@protoc_insertion_point(field_get:io.deephaven.proto.backplane.script.grpc.FigureDescriptor.SourceDescriptor.one_click)
-  return _internal_one_click();
-}
-inline void FigureDescriptor_SourceDescriptor::unsafe_arena_set_allocated_one_click(::io::deephaven::proto::backplane::script::grpc::FigureDescriptor_OneClickDescriptor* value) {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  if (GetArena() == nullptr) {
-    delete reinterpret_cast<::google::protobuf::MessageLite*>(_impl_.one_click_);
-  }
-  _impl_.one_click_ = reinterpret_cast<::io::deephaven::proto::backplane::script::grpc::FigureDescriptor_OneClickDescriptor*>(value);
-  if (value != nullptr) {
-    _impl_._has_bits_[0] |= 0x00000001u;
-  } else {
-    _impl_._has_bits_[0] &= ~0x00000001u;
-  }
-  // @@protoc_insertion_point(field_unsafe_arena_set_allocated:io.deephaven.proto.backplane.script.grpc.FigureDescriptor.SourceDescriptor.one_click)
-}
-inline ::io::deephaven::proto::backplane::script::grpc::FigureDescriptor_OneClickDescriptor* FigureDescriptor_SourceDescriptor::release_one_click() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-
-  _impl_._has_bits_[0] &= ~0x00000001u;
-  ::io::deephaven::proto::backplane::script::grpc::FigureDescriptor_OneClickDescriptor* released = _impl_.one_click_;
-  _impl_.one_click_ = nullptr;
-#ifdef PROTOBUF_FORCE_COPY_IN_RELEASE
-  auto* old = reinterpret_cast<::google::protobuf::MessageLite*>(released);
-  released = ::google::protobuf::internal::DuplicateIfNonNull(released);
-  if (GetArena() == nullptr) {
-    delete old;
-  }
-#else   // PROTOBUF_FORCE_COPY_IN_RELEASE
-  if (GetArena() != nullptr) {
-    released = ::google::protobuf::internal::DuplicateIfNonNull(released);
-  }
-#endif  // !PROTOBUF_FORCE_COPY_IN_RELEASE
-  return released;
-}
-inline ::io::deephaven::proto::backplane::script::grpc::FigureDescriptor_OneClickDescriptor* FigureDescriptor_SourceDescriptor::unsafe_arena_release_one_click() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  // @@protoc_insertion_point(field_release:io.deephaven.proto.backplane.script.grpc.FigureDescriptor.SourceDescriptor.one_click)
-
-  _impl_._has_bits_[0] &= ~0x00000001u;
-  ::io::deephaven::proto::backplane::script::grpc::FigureDescriptor_OneClickDescriptor* temp = _impl_.one_click_;
-  _impl_.one_click_ = nullptr;
-  return temp;
-}
-inline ::io::deephaven::proto::backplane::script::grpc::FigureDescriptor_OneClickDescriptor* FigureDescriptor_SourceDescriptor::_internal_mutable_one_click() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  _impl_._has_bits_[0] |= 0x00000001u;
-  if (_impl_.one_click_ == nullptr) {
-    auto* p = CreateMaybeMessage<::io::deephaven::proto::backplane::script::grpc::FigureDescriptor_OneClickDescriptor>(GetArena());
-    _impl_.one_click_ = reinterpret_cast<::io::deephaven::proto::backplane::script::grpc::FigureDescriptor_OneClickDescriptor*>(p);
-  }
-  return _impl_.one_click_;
-}
-inline ::io::deephaven::proto::backplane::script::grpc::FigureDescriptor_OneClickDescriptor* FigureDescriptor_SourceDescriptor::mutable_one_click() ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  ::io::deephaven::proto::backplane::script::grpc::FigureDescriptor_OneClickDescriptor* _msg = _internal_mutable_one_click();
-  // @@protoc_insertion_point(field_mutable:io.deephaven.proto.backplane.script.grpc.FigureDescriptor.SourceDescriptor.one_click)
-  return _msg;
-}
-inline void FigureDescriptor_SourceDescriptor::set_allocated_one_click(::io::deephaven::proto::backplane::script::grpc::FigureDescriptor_OneClickDescriptor* value) {
-  ::google::protobuf::Arena* message_arena = GetArena();
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  if (message_arena == nullptr) {
-    delete reinterpret_cast<::io::deephaven::proto::backplane::script::grpc::FigureDescriptor_OneClickDescriptor*>(_impl_.one_click_);
-  }
-
-  if (value != nullptr) {
-    ::google::protobuf::Arena* submessage_arena = reinterpret_cast<::io::deephaven::proto::backplane::script::grpc::FigureDescriptor_OneClickDescriptor*>(value)->GetArena();
-    if (message_arena != submessage_arena) {
-      value = ::google::protobuf::internal::GetOwnedMessage(message_arena, value, submessage_arena);
-    }
-    _impl_._has_bits_[0] |= 0x00000001u;
-  } else {
-    _impl_._has_bits_[0] &= ~0x00000001u;
-  }
-
-  _impl_.one_click_ = reinterpret_cast<::io::deephaven::proto::backplane::script::grpc::FigureDescriptor_OneClickDescriptor*>(value);
-  // @@protoc_insertion_point(field_set_allocated:io.deephaven.proto.backplane.script.grpc.FigureDescriptor.SourceDescriptor.one_click)
-}
-
-// -------------------------------------------------------------------
-
-// FigureDescriptor_OneClickDescriptor
-
-// repeated string columns = 1;
-inline int FigureDescriptor_OneClickDescriptor::_internal_columns_size() const {
-  return _internal_columns().size();
-}
-inline int FigureDescriptor_OneClickDescriptor::columns_size() const {
-  return _internal_columns_size();
-}
-inline void FigureDescriptor_OneClickDescriptor::clear_columns() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  _impl_.columns_.Clear();
-}
-inline std::string* FigureDescriptor_OneClickDescriptor::add_columns()
-    ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  std::string* _s = _internal_mutable_columns()->Add();
-  // @@protoc_insertion_point(field_add_mutable:io.deephaven.proto.backplane.script.grpc.FigureDescriptor.OneClickDescriptor.columns)
-  return _s;
-}
-inline const std::string& FigureDescriptor_OneClickDescriptor::columns(int index) const
-    ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  // @@protoc_insertion_point(field_get:io.deephaven.proto.backplane.script.grpc.FigureDescriptor.OneClickDescriptor.columns)
-  return _internal_columns().Get(index);
-}
-inline std::string* FigureDescriptor_OneClickDescriptor::mutable_columns(int index)
-    ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  // @@protoc_insertion_point(field_mutable:io.deephaven.proto.backplane.script.grpc.FigureDescriptor.OneClickDescriptor.columns)
-  return _internal_mutable_columns()->Mutable(index);
-}
-inline void FigureDescriptor_OneClickDescriptor::set_columns(int index, const std::string& value) {
-  _internal_mutable_columns()->Mutable(index)->assign(value);
-  // @@protoc_insertion_point(field_set:io.deephaven.proto.backplane.script.grpc.FigureDescriptor.OneClickDescriptor.columns)
-}
-inline void FigureDescriptor_OneClickDescriptor::set_columns(int index, std::string&& value) {
-  _internal_mutable_columns()->Mutable(index)->assign(std::move(value));
-  // @@protoc_insertion_point(field_set:io.deephaven.proto.backplane.script.grpc.FigureDescriptor.OneClickDescriptor.columns)
-}
-inline void FigureDescriptor_OneClickDescriptor::set_columns(int index, const char* value) {
-  ABSL_DCHECK(value != nullptr);
-  _internal_mutable_columns()->Mutable(index)->assign(value);
-  // @@protoc_insertion_point(field_set_char:io.deephaven.proto.backplane.script.grpc.FigureDescriptor.OneClickDescriptor.columns)
-}
-inline void FigureDescriptor_OneClickDescriptor::set_columns(int index, const char* value,
-                              std::size_t size) {
-  _internal_mutable_columns()->Mutable(index)->assign(
-      reinterpret_cast<const char*>(value), size);
-  // @@protoc_insertion_point(field_set_pointer:io.deephaven.proto.backplane.script.grpc.FigureDescriptor.OneClickDescriptor.columns)
-}
-inline void FigureDescriptor_OneClickDescriptor::set_columns(int index, absl::string_view value) {
-  _internal_mutable_columns()->Mutable(index)->assign(value.data(),
-                                                     value.size());
-  // @@protoc_insertion_point(field_set_string_piece:io.deephaven.proto.backplane.script.grpc.FigureDescriptor.OneClickDescriptor.columns)
-}
-inline void FigureDescriptor_OneClickDescriptor::add_columns(const std::string& value) {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  _internal_mutable_columns()->Add()->assign(value);
-  // @@protoc_insertion_point(field_add:io.deephaven.proto.backplane.script.grpc.FigureDescriptor.OneClickDescriptor.columns)
-}
-inline void FigureDescriptor_OneClickDescriptor::add_columns(std::string&& value) {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  _internal_mutable_columns()->Add(std::move(value));
-  // @@protoc_insertion_point(field_add:io.deephaven.proto.backplane.script.grpc.FigureDescriptor.OneClickDescriptor.columns)
-}
-inline void FigureDescriptor_OneClickDescriptor::add_columns(const char* value) {
-  ABSL_DCHECK(value != nullptr);
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  _internal_mutable_columns()->Add()->assign(value);
-  // @@protoc_insertion_point(field_add_char:io.deephaven.proto.backplane.script.grpc.FigureDescriptor.OneClickDescriptor.columns)
-}
-inline void FigureDescriptor_OneClickDescriptor::add_columns(const char* value, std::size_t size) {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  _internal_mutable_columns()->Add()->assign(
-      reinterpret_cast<const char*>(value), size);
-  // @@protoc_insertion_point(field_add_pointer:io.deephaven.proto.backplane.script.grpc.FigureDescriptor.OneClickDescriptor.columns)
-}
-inline void FigureDescriptor_OneClickDescriptor::add_columns(absl::string_view value) {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  _internal_mutable_columns()->Add()->assign(value.data(), value.size());
-  // @@protoc_insertion_point(field_add_string_piece:io.deephaven.proto.backplane.script.grpc.FigureDescriptor.OneClickDescriptor.columns)
-}
-inline const ::google::protobuf::RepeatedPtrField<std::string>&
-FigureDescriptor_OneClickDescriptor::columns() const ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  // @@protoc_insertion_point(field_list:io.deephaven.proto.backplane.script.grpc.FigureDescriptor.OneClickDescriptor.columns)
-  return _internal_columns();
-}
-inline ::google::protobuf::RepeatedPtrField<std::string>*
-FigureDescriptor_OneClickDescriptor::mutable_columns() ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  // @@protoc_insertion_point(field_mutable_list:io.deephaven.proto.backplane.script.grpc.FigureDescriptor.OneClickDescriptor.columns)
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  return _internal_mutable_columns();
-}
-inline const ::google::protobuf::RepeatedPtrField<std::string>&
-FigureDescriptor_OneClickDescriptor::_internal_columns() const {
-  PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race);
-  return _impl_.columns_;
-}
-inline ::google::protobuf::RepeatedPtrField<std::string>*
-FigureDescriptor_OneClickDescriptor::_internal_mutable_columns() {
-  PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race);
-  return &_impl_.columns_;
-}
-
-// repeated string column_types = 2;
-inline int FigureDescriptor_OneClickDescriptor::_internal_column_types_size() const {
-  return _internal_column_types().size();
-}
-inline int FigureDescriptor_OneClickDescriptor::column_types_size() const {
-  return _internal_column_types_size();
-}
-inline void FigureDescriptor_OneClickDescriptor::clear_column_types() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  _impl_.column_types_.Clear();
-}
-inline std::string* FigureDescriptor_OneClickDescriptor::add_column_types()
-    ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  std::string* _s = _internal_mutable_column_types()->Add();
-  // @@protoc_insertion_point(field_add_mutable:io.deephaven.proto.backplane.script.grpc.FigureDescriptor.OneClickDescriptor.column_types)
-  return _s;
-}
-inline const std::string& FigureDescriptor_OneClickDescriptor::column_types(int index) const
-    ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  // @@protoc_insertion_point(field_get:io.deephaven.proto.backplane.script.grpc.FigureDescriptor.OneClickDescriptor.column_types)
-  return _internal_column_types().Get(index);
-}
-inline std::string* FigureDescriptor_OneClickDescriptor::mutable_column_types(int index)
-    ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  // @@protoc_insertion_point(field_mutable:io.deephaven.proto.backplane.script.grpc.FigureDescriptor.OneClickDescriptor.column_types)
-  return _internal_mutable_column_types()->Mutable(index);
-}
-inline void FigureDescriptor_OneClickDescriptor::set_column_types(int index, const std::string& value) {
-  _internal_mutable_column_types()->Mutable(index)->assign(value);
-  // @@protoc_insertion_point(field_set:io.deephaven.proto.backplane.script.grpc.FigureDescriptor.OneClickDescriptor.column_types)
-}
-inline void FigureDescriptor_OneClickDescriptor::set_column_types(int index, std::string&& value) {
-  _internal_mutable_column_types()->Mutable(index)->assign(std::move(value));
-  // @@protoc_insertion_point(field_set:io.deephaven.proto.backplane.script.grpc.FigureDescriptor.OneClickDescriptor.column_types)
-}
-inline void FigureDescriptor_OneClickDescriptor::set_column_types(int index, const char* value) {
-  ABSL_DCHECK(value != nullptr);
-  _internal_mutable_column_types()->Mutable(index)->assign(value);
-  // @@protoc_insertion_point(field_set_char:io.deephaven.proto.backplane.script.grpc.FigureDescriptor.OneClickDescriptor.column_types)
-}
-inline void FigureDescriptor_OneClickDescriptor::set_column_types(int index, const char* value,
-                              std::size_t size) {
-  _internal_mutable_column_types()->Mutable(index)->assign(
-      reinterpret_cast<const char*>(value), size);
-  // @@protoc_insertion_point(field_set_pointer:io.deephaven.proto.backplane.script.grpc.FigureDescriptor.OneClickDescriptor.column_types)
-}
-inline void FigureDescriptor_OneClickDescriptor::set_column_types(int index, absl::string_view value) {
-  _internal_mutable_column_types()->Mutable(index)->assign(value.data(),
-                                                     value.size());
-  // @@protoc_insertion_point(field_set_string_piece:io.deephaven.proto.backplane.script.grpc.FigureDescriptor.OneClickDescriptor.column_types)
-}
-inline void FigureDescriptor_OneClickDescriptor::add_column_types(const std::string& value) {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  _internal_mutable_column_types()->Add()->assign(value);
-  // @@protoc_insertion_point(field_add:io.deephaven.proto.backplane.script.grpc.FigureDescriptor.OneClickDescriptor.column_types)
-}
-inline void FigureDescriptor_OneClickDescriptor::add_column_types(std::string&& value) {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  _internal_mutable_column_types()->Add(std::move(value));
-  // @@protoc_insertion_point(field_add:io.deephaven.proto.backplane.script.grpc.FigureDescriptor.OneClickDescriptor.column_types)
-}
-inline void FigureDescriptor_OneClickDescriptor::add_column_types(const char* value) {
-  ABSL_DCHECK(value != nullptr);
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  _internal_mutable_column_types()->Add()->assign(value);
-  // @@protoc_insertion_point(field_add_char:io.deephaven.proto.backplane.script.grpc.FigureDescriptor.OneClickDescriptor.column_types)
-}
-inline void FigureDescriptor_OneClickDescriptor::add_column_types(const char* value, std::size_t size) {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  _internal_mutable_column_types()->Add()->assign(
-      reinterpret_cast<const char*>(value), size);
-  // @@protoc_insertion_point(field_add_pointer:io.deephaven.proto.backplane.script.grpc.FigureDescriptor.OneClickDescriptor.column_types)
-}
-inline void FigureDescriptor_OneClickDescriptor::add_column_types(absl::string_view value) {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  _internal_mutable_column_types()->Add()->assign(value.data(), value.size());
-  // @@protoc_insertion_point(field_add_string_piece:io.deephaven.proto.backplane.script.grpc.FigureDescriptor.OneClickDescriptor.column_types)
-}
-inline const ::google::protobuf::RepeatedPtrField<std::string>&
-FigureDescriptor_OneClickDescriptor::column_types() const ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  // @@protoc_insertion_point(field_list:io.deephaven.proto.backplane.script.grpc.FigureDescriptor.OneClickDescriptor.column_types)
-  return _internal_column_types();
-}
-inline ::google::protobuf::RepeatedPtrField<std::string>*
-FigureDescriptor_OneClickDescriptor::mutable_column_types() ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  // @@protoc_insertion_point(field_mutable_list:io.deephaven.proto.backplane.script.grpc.FigureDescriptor.OneClickDescriptor.column_types)
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  return _internal_mutable_column_types();
-}
-inline const ::google::protobuf::RepeatedPtrField<std::string>&
-FigureDescriptor_OneClickDescriptor::_internal_column_types() const {
-  PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race);
-  return _impl_.column_types_;
-}
-inline ::google::protobuf::RepeatedPtrField<std::string>*
-FigureDescriptor_OneClickDescriptor::_internal_mutable_column_types() {
-  PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race);
-  return &_impl_.column_types_;
-}
-
-// bool require_all_filters_to_display = 3;
-inline void FigureDescriptor_OneClickDescriptor::clear_require_all_filters_to_display() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  _impl_.require_all_filters_to_display_ = false;
-}
-inline bool FigureDescriptor_OneClickDescriptor::require_all_filters_to_display() const {
-  // @@protoc_insertion_point(field_get:io.deephaven.proto.backplane.script.grpc.FigureDescriptor.OneClickDescriptor.require_all_filters_to_display)
-  return _internal_require_all_filters_to_display();
-}
-inline void FigureDescriptor_OneClickDescriptor::set_require_all_filters_to_display(bool value) {
-  _internal_set_require_all_filters_to_display(value);
-  // @@protoc_insertion_point(field_set:io.deephaven.proto.backplane.script.grpc.FigureDescriptor.OneClickDescriptor.require_all_filters_to_display)
-}
-inline bool FigureDescriptor_OneClickDescriptor::_internal_require_all_filters_to_display() const {
-  PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race);
-  return _impl_.require_all_filters_to_display_;
-}
-inline void FigureDescriptor_OneClickDescriptor::_internal_set_require_all_filters_to_display(bool value) {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  ;
-  _impl_.require_all_filters_to_display_ = value;
-}
-
-// -------------------------------------------------------------------
-
-// FigureDescriptor
-
-// optional string title = 1;
-inline bool FigureDescriptor::has_title() const {
-  bool value = (_impl_._has_bits_[0] & 0x00000001u) != 0;
-  return value;
-}
-inline void FigureDescriptor::clear_title() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  _impl_.title_.ClearToEmpty();
-  _impl_._has_bits_[0] &= ~0x00000001u;
-}
-inline const std::string& FigureDescriptor::title() const
-    ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  // @@protoc_insertion_point(field_get:io.deephaven.proto.backplane.script.grpc.FigureDescriptor.title)
-  return _internal_title();
-}
-template <typename Arg_, typename... Args_>
-inline PROTOBUF_ALWAYS_INLINE void FigureDescriptor::set_title(Arg_&& arg,
-                                                     Args_... args) {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  _impl_._has_bits_[0] |= 0x00000001u;
-  _impl_.title_.Set(static_cast<Arg_&&>(arg), args..., GetArena());
-  // @@protoc_insertion_point(field_set:io.deephaven.proto.backplane.script.grpc.FigureDescriptor.title)
-}
-inline std::string* FigureDescriptor::mutable_title() ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  std::string* _s = _internal_mutable_title();
-  // @@protoc_insertion_point(field_mutable:io.deephaven.proto.backplane.script.grpc.FigureDescriptor.title)
-  return _s;
-}
-inline const std::string& FigureDescriptor::_internal_title() const {
-  PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race);
-  return _impl_.title_.Get();
-}
-inline void FigureDescriptor::_internal_set_title(const std::string& value) {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  _impl_._has_bits_[0] |= 0x00000001u;
-  _impl_.title_.Set(value, GetArena());
-}
-inline std::string* FigureDescriptor::_internal_mutable_title() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  _impl_._has_bits_[0] |= 0x00000001u;
-  return _impl_.title_.Mutable( GetArena());
-}
-inline std::string* FigureDescriptor::release_title() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  // @@protoc_insertion_point(field_release:io.deephaven.proto.backplane.script.grpc.FigureDescriptor.title)
-  if ((_impl_._has_bits_[0] & 0x00000001u) == 0) {
-    return nullptr;
-  }
-  _impl_._has_bits_[0] &= ~0x00000001u;
-  auto* released = _impl_.title_.Release();
-  #ifdef PROTOBUF_FORCE_COPY_DEFAULT_STRING
-  _impl_.title_.Set("", GetArena());
-  #endif  // PROTOBUF_FORCE_COPY_DEFAULT_STRING
-  return released;
-}
-inline void FigureDescriptor::set_allocated_title(std::string* value) {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  if (value != nullptr) {
-    _impl_._has_bits_[0] |= 0x00000001u;
-  } else {
-    _impl_._has_bits_[0] &= ~0x00000001u;
-  }
-  _impl_.title_.SetAllocated(value, GetArena());
-  #ifdef PROTOBUF_FORCE_COPY_DEFAULT_STRING
-        if (_impl_.title_.IsDefault()) {
-          _impl_.title_.Set("", GetArena());
-        }
-  #endif  // PROTOBUF_FORCE_COPY_DEFAULT_STRING
-  // @@protoc_insertion_point(field_set_allocated:io.deephaven.proto.backplane.script.grpc.FigureDescriptor.title)
-}
-
-// string title_font = 2;
-inline void FigureDescriptor::clear_title_font() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  _impl_.title_font_.ClearToEmpty();
-}
-inline const std::string& FigureDescriptor::title_font() const
-    ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  // @@protoc_insertion_point(field_get:io.deephaven.proto.backplane.script.grpc.FigureDescriptor.title_font)
-  return _internal_title_font();
-}
-template <typename Arg_, typename... Args_>
-inline PROTOBUF_ALWAYS_INLINE void FigureDescriptor::set_title_font(Arg_&& arg,
-                                                     Args_... args) {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  ;
-  _impl_.title_font_.Set(static_cast<Arg_&&>(arg), args..., GetArena());
-  // @@protoc_insertion_point(field_set:io.deephaven.proto.backplane.script.grpc.FigureDescriptor.title_font)
-}
-inline std::string* FigureDescriptor::mutable_title_font() ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  std::string* _s = _internal_mutable_title_font();
-  // @@protoc_insertion_point(field_mutable:io.deephaven.proto.backplane.script.grpc.FigureDescriptor.title_font)
-  return _s;
-}
-inline const std::string& FigureDescriptor::_internal_title_font() const {
-  PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race);
-  return _impl_.title_font_.Get();
-}
-inline void FigureDescriptor::_internal_set_title_font(const std::string& value) {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  ;
-  _impl_.title_font_.Set(value, GetArena());
-}
-inline std::string* FigureDescriptor::_internal_mutable_title_font() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  ;
-  return _impl_.title_font_.Mutable( GetArena());
-}
-inline std::string* FigureDescriptor::release_title_font() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  // @@protoc_insertion_point(field_release:io.deephaven.proto.backplane.script.grpc.FigureDescriptor.title_font)
-  return _impl_.title_font_.Release();
-}
-inline void FigureDescriptor::set_allocated_title_font(std::string* value) {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  _impl_.title_font_.SetAllocated(value, GetArena());
-  #ifdef PROTOBUF_FORCE_COPY_DEFAULT_STRING
-        if (_impl_.title_font_.IsDefault()) {
-          _impl_.title_font_.Set("", GetArena());
-        }
-  #endif  // PROTOBUF_FORCE_COPY_DEFAULT_STRING
-  // @@protoc_insertion_point(field_set_allocated:io.deephaven.proto.backplane.script.grpc.FigureDescriptor.title_font)
-}
-
-// string title_color = 3;
-inline void FigureDescriptor::clear_title_color() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  _impl_.title_color_.ClearToEmpty();
-}
-inline const std::string& FigureDescriptor::title_color() const
-    ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  // @@protoc_insertion_point(field_get:io.deephaven.proto.backplane.script.grpc.FigureDescriptor.title_color)
-  return _internal_title_color();
-}
-template <typename Arg_, typename... Args_>
-inline PROTOBUF_ALWAYS_INLINE void FigureDescriptor::set_title_color(Arg_&& arg,
-                                                     Args_... args) {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  ;
-  _impl_.title_color_.Set(static_cast<Arg_&&>(arg), args..., GetArena());
-  // @@protoc_insertion_point(field_set:io.deephaven.proto.backplane.script.grpc.FigureDescriptor.title_color)
-}
-inline std::string* FigureDescriptor::mutable_title_color() ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  std::string* _s = _internal_mutable_title_color();
-  // @@protoc_insertion_point(field_mutable:io.deephaven.proto.backplane.script.grpc.FigureDescriptor.title_color)
-  return _s;
-}
-inline const std::string& FigureDescriptor::_internal_title_color() const {
-  PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race);
-  return _impl_.title_color_.Get();
-}
-inline void FigureDescriptor::_internal_set_title_color(const std::string& value) {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  ;
-  _impl_.title_color_.Set(value, GetArena());
-}
-inline std::string* FigureDescriptor::_internal_mutable_title_color() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  ;
-  return _impl_.title_color_.Mutable( GetArena());
-}
-inline std::string* FigureDescriptor::release_title_color() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  // @@protoc_insertion_point(field_release:io.deephaven.proto.backplane.script.grpc.FigureDescriptor.title_color)
-  return _impl_.title_color_.Release();
-}
-inline void FigureDescriptor::set_allocated_title_color(std::string* value) {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  _impl_.title_color_.SetAllocated(value, GetArena());
-  #ifdef PROTOBUF_FORCE_COPY_DEFAULT_STRING
-        if (_impl_.title_color_.IsDefault()) {
-          _impl_.title_color_.Set("", GetArena());
-        }
-  #endif  // PROTOBUF_FORCE_COPY_DEFAULT_STRING
-  // @@protoc_insertion_point(field_set_allocated:io.deephaven.proto.backplane.script.grpc.FigureDescriptor.title_color)
-}
-
-// int64 update_interval = 7 [jstype = JS_STRING];
-inline void FigureDescriptor::clear_update_interval() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  _impl_.update_interval_ = ::int64_t{0};
-}
-inline ::int64_t FigureDescriptor::update_interval() const {
-  // @@protoc_insertion_point(field_get:io.deephaven.proto.backplane.script.grpc.FigureDescriptor.update_interval)
-  return _internal_update_interval();
-}
-inline void FigureDescriptor::set_update_interval(::int64_t value) {
-  _internal_set_update_interval(value);
-  // @@protoc_insertion_point(field_set:io.deephaven.proto.backplane.script.grpc.FigureDescriptor.update_interval)
-}
-inline ::int64_t FigureDescriptor::_internal_update_interval() const {
-  PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race);
-  return _impl_.update_interval_;
-}
-inline void FigureDescriptor::_internal_set_update_interval(::int64_t value) {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  ;
-  _impl_.update_interval_ = value;
-}
-
-// int32 cols = 8;
-inline void FigureDescriptor::clear_cols() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  _impl_.cols_ = 0;
-}
-inline ::int32_t FigureDescriptor::cols() const {
-  // @@protoc_insertion_point(field_get:io.deephaven.proto.backplane.script.grpc.FigureDescriptor.cols)
-  return _internal_cols();
-}
-inline void FigureDescriptor::set_cols(::int32_t value) {
-  _internal_set_cols(value);
-  // @@protoc_insertion_point(field_set:io.deephaven.proto.backplane.script.grpc.FigureDescriptor.cols)
-}
-inline ::int32_t FigureDescriptor::_internal_cols() const {
-  PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race);
-  return _impl_.cols_;
-}
-inline void FigureDescriptor::_internal_set_cols(::int32_t value) {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  ;
-  _impl_.cols_ = value;
-}
-
-// int32 rows = 9;
-inline void FigureDescriptor::clear_rows() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  _impl_.rows_ = 0;
-}
-inline ::int32_t FigureDescriptor::rows() const {
-  // @@protoc_insertion_point(field_get:io.deephaven.proto.backplane.script.grpc.FigureDescriptor.rows)
-  return _internal_rows();
-}
-inline void FigureDescriptor::set_rows(::int32_t value) {
-  _internal_set_rows(value);
-  // @@protoc_insertion_point(field_set:io.deephaven.proto.backplane.script.grpc.FigureDescriptor.rows)
-}
-inline ::int32_t FigureDescriptor::_internal_rows() const {
-  PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race);
-  return _impl_.rows_;
-}
-inline void FigureDescriptor::_internal_set_rows(::int32_t value) {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  ;
-  _impl_.rows_ = value;
-}
-
-// repeated .io.deephaven.proto.backplane.script.grpc.FigureDescriptor.ChartDescriptor charts = 10;
-inline int FigureDescriptor::_internal_charts_size() const {
-  return _internal_charts().size();
-}
-inline int FigureDescriptor::charts_size() const {
-  return _internal_charts_size();
-}
-inline void FigureDescriptor::clear_charts() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  _impl_.charts_.Clear();
-}
-inline ::io::deephaven::proto::backplane::script::grpc::FigureDescriptor_ChartDescriptor* FigureDescriptor::mutable_charts(int index)
-    ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  // @@protoc_insertion_point(field_mutable:io.deephaven.proto.backplane.script.grpc.FigureDescriptor.charts)
-  return _internal_mutable_charts()->Mutable(index);
-}
-inline ::google::protobuf::RepeatedPtrField<::io::deephaven::proto::backplane::script::grpc::FigureDescriptor_ChartDescriptor>* FigureDescriptor::mutable_charts()
-    ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  // @@protoc_insertion_point(field_mutable_list:io.deephaven.proto.backplane.script.grpc.FigureDescriptor.charts)
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  return _internal_mutable_charts();
-}
-inline const ::io::deephaven::proto::backplane::script::grpc::FigureDescriptor_ChartDescriptor& FigureDescriptor::charts(int index) const
-    ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  // @@protoc_insertion_point(field_get:io.deephaven.proto.backplane.script.grpc.FigureDescriptor.charts)
-  return _internal_charts().Get(index);
-}
-inline ::io::deephaven::proto::backplane::script::grpc::FigureDescriptor_ChartDescriptor* FigureDescriptor::add_charts() ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  ::io::deephaven::proto::backplane::script::grpc::FigureDescriptor_ChartDescriptor* _add = _internal_mutable_charts()->Add();
-  // @@protoc_insertion_point(field_add:io.deephaven.proto.backplane.script.grpc.FigureDescriptor.charts)
-  return _add;
-}
-inline const ::google::protobuf::RepeatedPtrField<::io::deephaven::proto::backplane::script::grpc::FigureDescriptor_ChartDescriptor>& FigureDescriptor::charts() const
-    ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  // @@protoc_insertion_point(field_list:io.deephaven.proto.backplane.script.grpc.FigureDescriptor.charts)
-  return _internal_charts();
-}
-inline const ::google::protobuf::RepeatedPtrField<::io::deephaven::proto::backplane::script::grpc::FigureDescriptor_ChartDescriptor>&
-FigureDescriptor::_internal_charts() const {
-  PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race);
-  return _impl_.charts_;
-}
-inline ::google::protobuf::RepeatedPtrField<::io::deephaven::proto::backplane::script::grpc::FigureDescriptor_ChartDescriptor>*
-FigureDescriptor::_internal_mutable_charts() {
-  PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race);
-  return &_impl_.charts_;
-}
-
-// repeated string errors = 13;
-inline int FigureDescriptor::_internal_errors_size() const {
-  return _internal_errors().size();
-}
-inline int FigureDescriptor::errors_size() const {
-  return _internal_errors_size();
-}
-inline void FigureDescriptor::clear_errors() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  _impl_.errors_.Clear();
-}
-inline std::string* FigureDescriptor::add_errors()
-    ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  std::string* _s = _internal_mutable_errors()->Add();
-  // @@protoc_insertion_point(field_add_mutable:io.deephaven.proto.backplane.script.grpc.FigureDescriptor.errors)
-  return _s;
-}
-inline const std::string& FigureDescriptor::errors(int index) const
-    ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  // @@protoc_insertion_point(field_get:io.deephaven.proto.backplane.script.grpc.FigureDescriptor.errors)
-  return _internal_errors().Get(index);
-}
-inline std::string* FigureDescriptor::mutable_errors(int index)
-    ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  // @@protoc_insertion_point(field_mutable:io.deephaven.proto.backplane.script.grpc.FigureDescriptor.errors)
-  return _internal_mutable_errors()->Mutable(index);
-}
-inline void FigureDescriptor::set_errors(int index, const std::string& value) {
-  _internal_mutable_errors()->Mutable(index)->assign(value);
-  // @@protoc_insertion_point(field_set:io.deephaven.proto.backplane.script.grpc.FigureDescriptor.errors)
-}
-inline void FigureDescriptor::set_errors(int index, std::string&& value) {
-  _internal_mutable_errors()->Mutable(index)->assign(std::move(value));
-  // @@protoc_insertion_point(field_set:io.deephaven.proto.backplane.script.grpc.FigureDescriptor.errors)
-}
-inline void FigureDescriptor::set_errors(int index, const char* value) {
-  ABSL_DCHECK(value != nullptr);
-  _internal_mutable_errors()->Mutable(index)->assign(value);
-  // @@protoc_insertion_point(field_set_char:io.deephaven.proto.backplane.script.grpc.FigureDescriptor.errors)
-}
-inline void FigureDescriptor::set_errors(int index, const char* value,
-                              std::size_t size) {
-  _internal_mutable_errors()->Mutable(index)->assign(
-      reinterpret_cast<const char*>(value), size);
-  // @@protoc_insertion_point(field_set_pointer:io.deephaven.proto.backplane.script.grpc.FigureDescriptor.errors)
-}
-inline void FigureDescriptor::set_errors(int index, absl::string_view value) {
-  _internal_mutable_errors()->Mutable(index)->assign(value.data(),
-                                                     value.size());
-  // @@protoc_insertion_point(field_set_string_piece:io.deephaven.proto.backplane.script.grpc.FigureDescriptor.errors)
-}
-inline void FigureDescriptor::add_errors(const std::string& value) {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  _internal_mutable_errors()->Add()->assign(value);
-  // @@protoc_insertion_point(field_add:io.deephaven.proto.backplane.script.grpc.FigureDescriptor.errors)
-}
-inline void FigureDescriptor::add_errors(std::string&& value) {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  _internal_mutable_errors()->Add(std::move(value));
-  // @@protoc_insertion_point(field_add:io.deephaven.proto.backplane.script.grpc.FigureDescriptor.errors)
-}
-inline void FigureDescriptor::add_errors(const char* value) {
-  ABSL_DCHECK(value != nullptr);
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  _internal_mutable_errors()->Add()->assign(value);
-  // @@protoc_insertion_point(field_add_char:io.deephaven.proto.backplane.script.grpc.FigureDescriptor.errors)
-}
-inline void FigureDescriptor::add_errors(const char* value, std::size_t size) {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  _internal_mutable_errors()->Add()->assign(
-      reinterpret_cast<const char*>(value), size);
-  // @@protoc_insertion_point(field_add_pointer:io.deephaven.proto.backplane.script.grpc.FigureDescriptor.errors)
-}
-inline void FigureDescriptor::add_errors(absl::string_view value) {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  _internal_mutable_errors()->Add()->assign(value.data(), value.size());
-  // @@protoc_insertion_point(field_add_string_piece:io.deephaven.proto.backplane.script.grpc.FigureDescriptor.errors)
-}
-inline const ::google::protobuf::RepeatedPtrField<std::string>&
-FigureDescriptor::errors() const ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  // @@protoc_insertion_point(field_list:io.deephaven.proto.backplane.script.grpc.FigureDescriptor.errors)
-  return _internal_errors();
-}
-inline ::google::protobuf::RepeatedPtrField<std::string>*
-FigureDescriptor::mutable_errors() ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  // @@protoc_insertion_point(field_mutable_list:io.deephaven.proto.backplane.script.grpc.FigureDescriptor.errors)
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  return _internal_mutable_errors();
-}
-inline const ::google::protobuf::RepeatedPtrField<std::string>&
-FigureDescriptor::_internal_errors() const {
-  PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race);
-  return _impl_.errors_;
-}
-inline ::google::protobuf::RepeatedPtrField<std::string>*
-FigureDescriptor::_internal_mutable_errors() {
-  PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race);
-  return &_impl_.errors_;
-}
-
-#ifdef __GNUC__
-#pragma GCC diagnostic pop
-#endif  // __GNUC__
-
-// @@protoc_insertion_point(namespace_scope)
-}  // namespace grpc
-}  // namespace script
-}  // namespace backplane
-}  // namespace proto
-}  // namespace deephaven
-}  // namespace io
-
-
-namespace google {
-namespace protobuf {
-
-template <>
-struct is_proto_enum<::io::deephaven::proto::backplane::script::grpc::Diagnostic_DiagnosticSeverity> : std::true_type {};
-template <>
-inline const EnumDescriptor* GetEnumDescriptor<::io::deephaven::proto::backplane::script::grpc::Diagnostic_DiagnosticSeverity>() {
-  return ::io::deephaven::proto::backplane::script::grpc::Diagnostic_DiagnosticSeverity_descriptor();
-}
-template <>
-struct is_proto_enum<::io::deephaven::proto::backplane::script::grpc::Diagnostic_DiagnosticTag> : std::true_type {};
-template <>
-inline const EnumDescriptor* GetEnumDescriptor<::io::deephaven::proto::backplane::script::grpc::Diagnostic_DiagnosticTag>() {
-  return ::io::deephaven::proto::backplane::script::grpc::Diagnostic_DiagnosticTag_descriptor();
-}
-template <>
-struct is_proto_enum<::io::deephaven::proto::backplane::script::grpc::FigureDescriptor_ChartDescriptor_ChartType> : std::true_type {};
-template <>
-inline const EnumDescriptor* GetEnumDescriptor<::io::deephaven::proto::backplane::script::grpc::FigureDescriptor_ChartDescriptor_ChartType>() {
-  return ::io::deephaven::proto::backplane::script::grpc::FigureDescriptor_ChartDescriptor_ChartType_descriptor();
-}
-template <>
-struct is_proto_enum<::io::deephaven::proto::backplane::script::grpc::FigureDescriptor_AxisDescriptor_AxisFormatType> : std::true_type {};
-template <>
-inline const EnumDescriptor* GetEnumDescriptor<::io::deephaven::proto::backplane::script::grpc::FigureDescriptor_AxisDescriptor_AxisFormatType>() {
-  return ::io::deephaven::proto::backplane::script::grpc::FigureDescriptor_AxisDescriptor_AxisFormatType_descriptor();
-}
-template <>
-struct is_proto_enum<::io::deephaven::proto::backplane::script::grpc::FigureDescriptor_AxisDescriptor_AxisType> : std::true_type {};
-template <>
-inline const EnumDescriptor* GetEnumDescriptor<::io::deephaven::proto::backplane::script::grpc::FigureDescriptor_AxisDescriptor_AxisType>() {
-  return ::io::deephaven::proto::backplane::script::grpc::FigureDescriptor_AxisDescriptor_AxisType_descriptor();
-}
-template <>
-struct is_proto_enum<::io::deephaven::proto::backplane::script::grpc::FigureDescriptor_AxisDescriptor_AxisPosition> : std::true_type {};
-template <>
-inline const EnumDescriptor* GetEnumDescriptor<::io::deephaven::proto::backplane::script::grpc::FigureDescriptor_AxisDescriptor_AxisPosition>() {
-  return ::io::deephaven::proto::backplane::script::grpc::FigureDescriptor_AxisDescriptor_AxisPosition_descriptor();
-}
-template <>
-struct is_proto_enum<::io::deephaven::proto::backplane::script::grpc::FigureDescriptor_BusinessCalendarDescriptor_DayOfWeek> : std::true_type {};
-template <>
-inline const EnumDescriptor* GetEnumDescriptor<::io::deephaven::proto::backplane::script::grpc::FigureDescriptor_BusinessCalendarDescriptor_DayOfWeek>() {
-  return ::io::deephaven::proto::backplane::script::grpc::FigureDescriptor_BusinessCalendarDescriptor_DayOfWeek_descriptor();
-}
-template <>
-struct is_proto_enum<::io::deephaven::proto::backplane::script::grpc::FigureDescriptor_SeriesPlotStyle> : std::true_type {};
-template <>
-inline const EnumDescriptor* GetEnumDescriptor<::io::deephaven::proto::backplane::script::grpc::FigureDescriptor_SeriesPlotStyle>() {
-  return ::io::deephaven::proto::backplane::script::grpc::FigureDescriptor_SeriesPlotStyle_descriptor();
-}
-template <>
-struct is_proto_enum<::io::deephaven::proto::backplane::script::grpc::FigureDescriptor_SourceType> : std::true_type {};
-template <>
-inline const EnumDescriptor* GetEnumDescriptor<::io::deephaven::proto::backplane::script::grpc::FigureDescriptor_SourceType>() {
-  return ::io::deephaven::proto::backplane::script::grpc::FigureDescriptor_SourceType_descriptor();
-}
-
-}  // namespace protobuf
-}  // namespace google
-
-// @@protoc_insertion_point(global_scope)
-
-#include "google/protobuf/port_undef.inc"
-
-#endif  // GOOGLE_PROTOBUF_INCLUDED_deephaven_2fproto_2fconsole_2eproto_2epb_2eh
diff --git a/cpp-client/deephaven/dhclient/proto/deephaven/proto/hierarchicaltable.grpc.pb.cc b/cpp-client/deephaven/dhclient/proto/deephaven/proto/hierarchicaltable.grpc.pb.cc
deleted file mode 100644
index a59789d3ceb..00000000000
--- a/cpp-client/deephaven/dhclient/proto/deephaven/proto/hierarchicaltable.grpc.pb.cc
+++ /dev/null
@@ -1,262 +0,0 @@
-// Generated by the gRPC C++ plugin.
-// If you make any local change, they will be lost.
-// source: deephaven/proto/hierarchicaltable.proto
-
-#include "deephaven/proto/hierarchicaltable.pb.h"
-#include "deephaven/proto/hierarchicaltable.grpc.pb.h"
-
-#include <functional>
-#include <grpcpp/support/async_stream.h>
-#include <grpcpp/support/async_unary_call.h>
-#include <grpcpp/impl/channel_interface.h>
-#include <grpcpp/impl/client_unary_call.h>
-#include <grpcpp/support/client_callback.h>
-#include <grpcpp/support/message_allocator.h>
-#include <grpcpp/support/method_handler.h>
-#include <grpcpp/impl/rpc_service_method.h>
-#include <grpcpp/support/server_callback.h>
-#include <grpcpp/impl/server_callback_handlers.h>
-#include <grpcpp/server_context.h>
-#include <grpcpp/impl/service_type.h>
-#include <grpcpp/support/sync_stream.h>
-namespace io {
-namespace deephaven {
-namespace proto {
-namespace backplane {
-namespace grpc {
-
-static const char* HierarchicalTableService_method_names[] = {
-  "/io.deephaven.proto.backplane.grpc.HierarchicalTableService/Rollup",
-  "/io.deephaven.proto.backplane.grpc.HierarchicalTableService/Tree",
-  "/io.deephaven.proto.backplane.grpc.HierarchicalTableService/Apply",
-  "/io.deephaven.proto.backplane.grpc.HierarchicalTableService/View",
-  "/io.deephaven.proto.backplane.grpc.HierarchicalTableService/ExportSource",
-};
-
-std::unique_ptr< HierarchicalTableService::Stub> HierarchicalTableService::NewStub(const std::shared_ptr< ::grpc::ChannelInterface>& channel, const ::grpc::StubOptions& options) {
-  (void)options;
-  std::unique_ptr< HierarchicalTableService::Stub> stub(new HierarchicalTableService::Stub(channel, options));
-  return stub;
-}
-
-HierarchicalTableService::Stub::Stub(const std::shared_ptr< ::grpc::ChannelInterface>& channel, const ::grpc::StubOptions& options)
-  : channel_(channel), rpcmethod_Rollup_(HierarchicalTableService_method_names[0], options.suffix_for_stats(),::grpc::internal::RpcMethod::NORMAL_RPC, channel)
-  , rpcmethod_Tree_(HierarchicalTableService_method_names[1], options.suffix_for_stats(),::grpc::internal::RpcMethod::NORMAL_RPC, channel)
-  , rpcmethod_Apply_(HierarchicalTableService_method_names[2], options.suffix_for_stats(),::grpc::internal::RpcMethod::NORMAL_RPC, channel)
-  , rpcmethod_View_(HierarchicalTableService_method_names[3], options.suffix_for_stats(),::grpc::internal::RpcMethod::NORMAL_RPC, channel)
-  , rpcmethod_ExportSource_(HierarchicalTableService_method_names[4], options.suffix_for_stats(),::grpc::internal::RpcMethod::NORMAL_RPC, channel)
-  {}
-
-::grpc::Status HierarchicalTableService::Stub::Rollup(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::RollupRequest& request, ::io::deephaven::proto::backplane::grpc::RollupResponse* response) {
-  return ::grpc::internal::BlockingUnaryCall< ::io::deephaven::proto::backplane::grpc::RollupRequest, ::io::deephaven::proto::backplane::grpc::RollupResponse, ::grpc::protobuf::MessageLite, ::grpc::protobuf::MessageLite>(channel_.get(), rpcmethod_Rollup_, context, request, response);
-}
-
-void HierarchicalTableService::Stub::async::Rollup(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::RollupRequest* request, ::io::deephaven::proto::backplane::grpc::RollupResponse* response, std::function<void(::grpc::Status)> f) {
-  ::grpc::internal::CallbackUnaryCall< ::io::deephaven::proto::backplane::grpc::RollupRequest, ::io::deephaven::proto::backplane::grpc::RollupResponse, ::grpc::protobuf::MessageLite, ::grpc::protobuf::MessageLite>(stub_->channel_.get(), stub_->rpcmethod_Rollup_, context, request, response, std::move(f));
-}
-
-void HierarchicalTableService::Stub::async::Rollup(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::RollupRequest* request, ::io::deephaven::proto::backplane::grpc::RollupResponse* response, ::grpc::ClientUnaryReactor* reactor) {
-  ::grpc::internal::ClientCallbackUnaryFactory::Create< ::grpc::protobuf::MessageLite, ::grpc::protobuf::MessageLite>(stub_->channel_.get(), stub_->rpcmethod_Rollup_, context, request, response, reactor);
-}
-
-::grpc::ClientAsyncResponseReader< ::io::deephaven::proto::backplane::grpc::RollupResponse>* HierarchicalTableService::Stub::PrepareAsyncRollupRaw(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::RollupRequest& request, ::grpc::CompletionQueue* cq) {
-  return ::grpc::internal::ClientAsyncResponseReaderHelper::Create< ::io::deephaven::proto::backplane::grpc::RollupResponse, ::io::deephaven::proto::backplane::grpc::RollupRequest, ::grpc::protobuf::MessageLite, ::grpc::protobuf::MessageLite>(channel_.get(), cq, rpcmethod_Rollup_, context, request);
-}
-
-::grpc::ClientAsyncResponseReader< ::io::deephaven::proto::backplane::grpc::RollupResponse>* HierarchicalTableService::Stub::AsyncRollupRaw(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::RollupRequest& request, ::grpc::CompletionQueue* cq) {
-  auto* result =
-    this->PrepareAsyncRollupRaw(context, request, cq);
-  result->StartCall();
-  return result;
-}
-
-::grpc::Status HierarchicalTableService::Stub::Tree(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::TreeRequest& request, ::io::deephaven::proto::backplane::grpc::TreeResponse* response) {
-  return ::grpc::internal::BlockingUnaryCall< ::io::deephaven::proto::backplane::grpc::TreeRequest, ::io::deephaven::proto::backplane::grpc::TreeResponse, ::grpc::protobuf::MessageLite, ::grpc::protobuf::MessageLite>(channel_.get(), rpcmethod_Tree_, context, request, response);
-}
-
-void HierarchicalTableService::Stub::async::Tree(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::TreeRequest* request, ::io::deephaven::proto::backplane::grpc::TreeResponse* response, std::function<void(::grpc::Status)> f) {
-  ::grpc::internal::CallbackUnaryCall< ::io::deephaven::proto::backplane::grpc::TreeRequest, ::io::deephaven::proto::backplane::grpc::TreeResponse, ::grpc::protobuf::MessageLite, ::grpc::protobuf::MessageLite>(stub_->channel_.get(), stub_->rpcmethod_Tree_, context, request, response, std::move(f));
-}
-
-void HierarchicalTableService::Stub::async::Tree(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::TreeRequest* request, ::io::deephaven::proto::backplane::grpc::TreeResponse* response, ::grpc::ClientUnaryReactor* reactor) {
-  ::grpc::internal::ClientCallbackUnaryFactory::Create< ::grpc::protobuf::MessageLite, ::grpc::protobuf::MessageLite>(stub_->channel_.get(), stub_->rpcmethod_Tree_, context, request, response, reactor);
-}
-
-::grpc::ClientAsyncResponseReader< ::io::deephaven::proto::backplane::grpc::TreeResponse>* HierarchicalTableService::Stub::PrepareAsyncTreeRaw(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::TreeRequest& request, ::grpc::CompletionQueue* cq) {
-  return ::grpc::internal::ClientAsyncResponseReaderHelper::Create< ::io::deephaven::proto::backplane::grpc::TreeResponse, ::io::deephaven::proto::backplane::grpc::TreeRequest, ::grpc::protobuf::MessageLite, ::grpc::protobuf::MessageLite>(channel_.get(), cq, rpcmethod_Tree_, context, request);
-}
-
-::grpc::ClientAsyncResponseReader< ::io::deephaven::proto::backplane::grpc::TreeResponse>* HierarchicalTableService::Stub::AsyncTreeRaw(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::TreeRequest& request, ::grpc::CompletionQueue* cq) {
-  auto* result =
-    this->PrepareAsyncTreeRaw(context, request, cq);
-  result->StartCall();
-  return result;
-}
-
-::grpc::Status HierarchicalTableService::Stub::Apply(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::HierarchicalTableApplyRequest& request, ::io::deephaven::proto::backplane::grpc::HierarchicalTableApplyResponse* response) {
-  return ::grpc::internal::BlockingUnaryCall< ::io::deephaven::proto::backplane::grpc::HierarchicalTableApplyRequest, ::io::deephaven::proto::backplane::grpc::HierarchicalTableApplyResponse, ::grpc::protobuf::MessageLite, ::grpc::protobuf::MessageLite>(channel_.get(), rpcmethod_Apply_, context, request, response);
-}
-
-void HierarchicalTableService::Stub::async::Apply(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::HierarchicalTableApplyRequest* request, ::io::deephaven::proto::backplane::grpc::HierarchicalTableApplyResponse* response, std::function<void(::grpc::Status)> f) {
-  ::grpc::internal::CallbackUnaryCall< ::io::deephaven::proto::backplane::grpc::HierarchicalTableApplyRequest, ::io::deephaven::proto::backplane::grpc::HierarchicalTableApplyResponse, ::grpc::protobuf::MessageLite, ::grpc::protobuf::MessageLite>(stub_->channel_.get(), stub_->rpcmethod_Apply_, context, request, response, std::move(f));
-}
-
-void HierarchicalTableService::Stub::async::Apply(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::HierarchicalTableApplyRequest* request, ::io::deephaven::proto::backplane::grpc::HierarchicalTableApplyResponse* response, ::grpc::ClientUnaryReactor* reactor) {
-  ::grpc::internal::ClientCallbackUnaryFactory::Create< ::grpc::protobuf::MessageLite, ::grpc::protobuf::MessageLite>(stub_->channel_.get(), stub_->rpcmethod_Apply_, context, request, response, reactor);
-}
-
-::grpc::ClientAsyncResponseReader< ::io::deephaven::proto::backplane::grpc::HierarchicalTableApplyResponse>* HierarchicalTableService::Stub::PrepareAsyncApplyRaw(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::HierarchicalTableApplyRequest& request, ::grpc::CompletionQueue* cq) {
-  return ::grpc::internal::ClientAsyncResponseReaderHelper::Create< ::io::deephaven::proto::backplane::grpc::HierarchicalTableApplyResponse, ::io::deephaven::proto::backplane::grpc::HierarchicalTableApplyRequest, ::grpc::protobuf::MessageLite, ::grpc::protobuf::MessageLite>(channel_.get(), cq, rpcmethod_Apply_, context, request);
-}
-
-::grpc::ClientAsyncResponseReader< ::io::deephaven::proto::backplane::grpc::HierarchicalTableApplyResponse>* HierarchicalTableService::Stub::AsyncApplyRaw(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::HierarchicalTableApplyRequest& request, ::grpc::CompletionQueue* cq) {
-  auto* result =
-    this->PrepareAsyncApplyRaw(context, request, cq);
-  result->StartCall();
-  return result;
-}
-
-::grpc::Status HierarchicalTableService::Stub::View(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::HierarchicalTableViewRequest& request, ::io::deephaven::proto::backplane::grpc::HierarchicalTableViewResponse* response) {
-  return ::grpc::internal::BlockingUnaryCall< ::io::deephaven::proto::backplane::grpc::HierarchicalTableViewRequest, ::io::deephaven::proto::backplane::grpc::HierarchicalTableViewResponse, ::grpc::protobuf::MessageLite, ::grpc::protobuf::MessageLite>(channel_.get(), rpcmethod_View_, context, request, response);
-}
-
-void HierarchicalTableService::Stub::async::View(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::HierarchicalTableViewRequest* request, ::io::deephaven::proto::backplane::grpc::HierarchicalTableViewResponse* response, std::function<void(::grpc::Status)> f) {
-  ::grpc::internal::CallbackUnaryCall< ::io::deephaven::proto::backplane::grpc::HierarchicalTableViewRequest, ::io::deephaven::proto::backplane::grpc::HierarchicalTableViewResponse, ::grpc::protobuf::MessageLite, ::grpc::protobuf::MessageLite>(stub_->channel_.get(), stub_->rpcmethod_View_, context, request, response, std::move(f));
-}
-
-void HierarchicalTableService::Stub::async::View(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::HierarchicalTableViewRequest* request, ::io::deephaven::proto::backplane::grpc::HierarchicalTableViewResponse* response, ::grpc::ClientUnaryReactor* reactor) {
-  ::grpc::internal::ClientCallbackUnaryFactory::Create< ::grpc::protobuf::MessageLite, ::grpc::protobuf::MessageLite>(stub_->channel_.get(), stub_->rpcmethod_View_, context, request, response, reactor);
-}
-
-::grpc::ClientAsyncResponseReader< ::io::deephaven::proto::backplane::grpc::HierarchicalTableViewResponse>* HierarchicalTableService::Stub::PrepareAsyncViewRaw(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::HierarchicalTableViewRequest& request, ::grpc::CompletionQueue* cq) {
-  return ::grpc::internal::ClientAsyncResponseReaderHelper::Create< ::io::deephaven::proto::backplane::grpc::HierarchicalTableViewResponse, ::io::deephaven::proto::backplane::grpc::HierarchicalTableViewRequest, ::grpc::protobuf::MessageLite, ::grpc::protobuf::MessageLite>(channel_.get(), cq, rpcmethod_View_, context, request);
-}
-
-::grpc::ClientAsyncResponseReader< ::io::deephaven::proto::backplane::grpc::HierarchicalTableViewResponse>* HierarchicalTableService::Stub::AsyncViewRaw(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::HierarchicalTableViewRequest& request, ::grpc::CompletionQueue* cq) {
-  auto* result =
-    this->PrepareAsyncViewRaw(context, request, cq);
-  result->StartCall();
-  return result;
-}
-
-::grpc::Status HierarchicalTableService::Stub::ExportSource(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::HierarchicalTableSourceExportRequest& request, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse* response) {
-  return ::grpc::internal::BlockingUnaryCall< ::io::deephaven::proto::backplane::grpc::HierarchicalTableSourceExportRequest, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse, ::grpc::protobuf::MessageLite, ::grpc::protobuf::MessageLite>(channel_.get(), rpcmethod_ExportSource_, context, request, response);
-}
-
-void HierarchicalTableService::Stub::async::ExportSource(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::HierarchicalTableSourceExportRequest* request, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse* response, std::function<void(::grpc::Status)> f) {
-  ::grpc::internal::CallbackUnaryCall< ::io::deephaven::proto::backplane::grpc::HierarchicalTableSourceExportRequest, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse, ::grpc::protobuf::MessageLite, ::grpc::protobuf::MessageLite>(stub_->channel_.get(), stub_->rpcmethod_ExportSource_, context, request, response, std::move(f));
-}
-
-void HierarchicalTableService::Stub::async::ExportSource(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::HierarchicalTableSourceExportRequest* request, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse* response, ::grpc::ClientUnaryReactor* reactor) {
-  ::grpc::internal::ClientCallbackUnaryFactory::Create< ::grpc::protobuf::MessageLite, ::grpc::protobuf::MessageLite>(stub_->channel_.get(), stub_->rpcmethod_ExportSource_, context, request, response, reactor);
-}
-
-::grpc::ClientAsyncResponseReader< ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse>* HierarchicalTableService::Stub::PrepareAsyncExportSourceRaw(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::HierarchicalTableSourceExportRequest& request, ::grpc::CompletionQueue* cq) {
-  return ::grpc::internal::ClientAsyncResponseReaderHelper::Create< ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse, ::io::deephaven::proto::backplane::grpc::HierarchicalTableSourceExportRequest, ::grpc::protobuf::MessageLite, ::grpc::protobuf::MessageLite>(channel_.get(), cq, rpcmethod_ExportSource_, context, request);
-}
-
-::grpc::ClientAsyncResponseReader< ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse>* HierarchicalTableService::Stub::AsyncExportSourceRaw(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::HierarchicalTableSourceExportRequest& request, ::grpc::CompletionQueue* cq) {
-  auto* result =
-    this->PrepareAsyncExportSourceRaw(context, request, cq);
-  result->StartCall();
-  return result;
-}
-
-HierarchicalTableService::Service::Service() {
-  AddMethod(new ::grpc::internal::RpcServiceMethod(
-      HierarchicalTableService_method_names[0],
-      ::grpc::internal::RpcMethod::NORMAL_RPC,
-      new ::grpc::internal::RpcMethodHandler< HierarchicalTableService::Service, ::io::deephaven::proto::backplane::grpc::RollupRequest, ::io::deephaven::proto::backplane::grpc::RollupResponse, ::grpc::protobuf::MessageLite, ::grpc::protobuf::MessageLite>(
-          [](HierarchicalTableService::Service* service,
-             ::grpc::ServerContext* ctx,
-             const ::io::deephaven::proto::backplane::grpc::RollupRequest* req,
-             ::io::deephaven::proto::backplane::grpc::RollupResponse* resp) {
-               return service->Rollup(ctx, req, resp);
-             }, this)));
-  AddMethod(new ::grpc::internal::RpcServiceMethod(
-      HierarchicalTableService_method_names[1],
-      ::grpc::internal::RpcMethod::NORMAL_RPC,
-      new ::grpc::internal::RpcMethodHandler< HierarchicalTableService::Service, ::io::deephaven::proto::backplane::grpc::TreeRequest, ::io::deephaven::proto::backplane::grpc::TreeResponse, ::grpc::protobuf::MessageLite, ::grpc::protobuf::MessageLite>(
-          [](HierarchicalTableService::Service* service,
-             ::grpc::ServerContext* ctx,
-             const ::io::deephaven::proto::backplane::grpc::TreeRequest* req,
-             ::io::deephaven::proto::backplane::grpc::TreeResponse* resp) {
-               return service->Tree(ctx, req, resp);
-             }, this)));
-  AddMethod(new ::grpc::internal::RpcServiceMethod(
-      HierarchicalTableService_method_names[2],
-      ::grpc::internal::RpcMethod::NORMAL_RPC,
-      new ::grpc::internal::RpcMethodHandler< HierarchicalTableService::Service, ::io::deephaven::proto::backplane::grpc::HierarchicalTableApplyRequest, ::io::deephaven::proto::backplane::grpc::HierarchicalTableApplyResponse, ::grpc::protobuf::MessageLite, ::grpc::protobuf::MessageLite>(
-          [](HierarchicalTableService::Service* service,
-             ::grpc::ServerContext* ctx,
-             const ::io::deephaven::proto::backplane::grpc::HierarchicalTableApplyRequest* req,
-             ::io::deephaven::proto::backplane::grpc::HierarchicalTableApplyResponse* resp) {
-               return service->Apply(ctx, req, resp);
-             }, this)));
-  AddMethod(new ::grpc::internal::RpcServiceMethod(
-      HierarchicalTableService_method_names[3],
-      ::grpc::internal::RpcMethod::NORMAL_RPC,
-      new ::grpc::internal::RpcMethodHandler< HierarchicalTableService::Service, ::io::deephaven::proto::backplane::grpc::HierarchicalTableViewRequest, ::io::deephaven::proto::backplane::grpc::HierarchicalTableViewResponse, ::grpc::protobuf::MessageLite, ::grpc::protobuf::MessageLite>(
-          [](HierarchicalTableService::Service* service,
-             ::grpc::ServerContext* ctx,
-             const ::io::deephaven::proto::backplane::grpc::HierarchicalTableViewRequest* req,
-             ::io::deephaven::proto::backplane::grpc::HierarchicalTableViewResponse* resp) {
-               return service->View(ctx, req, resp);
-             }, this)));
-  AddMethod(new ::grpc::internal::RpcServiceMethod(
-      HierarchicalTableService_method_names[4],
-      ::grpc::internal::RpcMethod::NORMAL_RPC,
-      new ::grpc::internal::RpcMethodHandler< HierarchicalTableService::Service, ::io::deephaven::proto::backplane::grpc::HierarchicalTableSourceExportRequest, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse, ::grpc::protobuf::MessageLite, ::grpc::protobuf::MessageLite>(
-          [](HierarchicalTableService::Service* service,
-             ::grpc::ServerContext* ctx,
-             const ::io::deephaven::proto::backplane::grpc::HierarchicalTableSourceExportRequest* req,
-             ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse* resp) {
-               return service->ExportSource(ctx, req, resp);
-             }, this)));
-}
-
-HierarchicalTableService::Service::~Service() {
-}
-
-::grpc::Status HierarchicalTableService::Service::Rollup(::grpc::ServerContext* context, const ::io::deephaven::proto::backplane::grpc::RollupRequest* request, ::io::deephaven::proto::backplane::grpc::RollupResponse* response) {
-  (void) context;
-  (void) request;
-  (void) response;
-  return ::grpc::Status(::grpc::StatusCode::UNIMPLEMENTED, "");
-}
-
-::grpc::Status HierarchicalTableService::Service::Tree(::grpc::ServerContext* context, const ::io::deephaven::proto::backplane::grpc::TreeRequest* request, ::io::deephaven::proto::backplane::grpc::TreeResponse* response) {
-  (void) context;
-  (void) request;
-  (void) response;
-  return ::grpc::Status(::grpc::StatusCode::UNIMPLEMENTED, "");
-}
-
-::grpc::Status HierarchicalTableService::Service::Apply(::grpc::ServerContext* context, const ::io::deephaven::proto::backplane::grpc::HierarchicalTableApplyRequest* request, ::io::deephaven::proto::backplane::grpc::HierarchicalTableApplyResponse* response) {
-  (void) context;
-  (void) request;
-  (void) response;
-  return ::grpc::Status(::grpc::StatusCode::UNIMPLEMENTED, "");
-}
-
-::grpc::Status HierarchicalTableService::Service::View(::grpc::ServerContext* context, const ::io::deephaven::proto::backplane::grpc::HierarchicalTableViewRequest* request, ::io::deephaven::proto::backplane::grpc::HierarchicalTableViewResponse* response) {
-  (void) context;
-  (void) request;
-  (void) response;
-  return ::grpc::Status(::grpc::StatusCode::UNIMPLEMENTED, "");
-}
-
-::grpc::Status HierarchicalTableService::Service::ExportSource(::grpc::ServerContext* context, const ::io::deephaven::proto::backplane::grpc::HierarchicalTableSourceExportRequest* request, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse* response) {
-  (void) context;
-  (void) request;
-  (void) response;
-  return ::grpc::Status(::grpc::StatusCode::UNIMPLEMENTED, "");
-}
-
-
-}  // namespace io
-}  // namespace deephaven
-}  // namespace proto
-}  // namespace backplane
-}  // namespace grpc
-
diff --git a/cpp-client/deephaven/dhclient/proto/deephaven/proto/hierarchicaltable.grpc.pb.h b/cpp-client/deephaven/dhclient/proto/deephaven/proto/hierarchicaltable.grpc.pb.h
deleted file mode 100644
index ea1c9d65936..00000000000
--- a/cpp-client/deephaven/dhclient/proto/deephaven/proto/hierarchicaltable.grpc.pb.h
+++ /dev/null
@@ -1,902 +0,0 @@
-// Generated by the gRPC C++ plugin.
-// If you make any local change, they will be lost.
-// source: deephaven/proto/hierarchicaltable.proto
-// Original file comments:
-//
-// Copyright (c) 2016-2021 Deephaven Data Labs and Patent Pending
-//
-#ifndef GRPC_deephaven_2fproto_2fhierarchicaltable_2eproto__INCLUDED
-#define GRPC_deephaven_2fproto_2fhierarchicaltable_2eproto__INCLUDED
-
-#include "deephaven/proto/hierarchicaltable.pb.h"
-
-#include <functional>
-#include <grpcpp/generic/async_generic_service.h>
-#include <grpcpp/support/async_stream.h>
-#include <grpcpp/support/async_unary_call.h>
-#include <grpcpp/support/client_callback.h>
-#include <grpcpp/client_context.h>
-#include <grpcpp/completion_queue.h>
-#include <grpcpp/support/message_allocator.h>
-#include <grpcpp/support/method_handler.h>
-#include <grpcpp/impl/proto_utils.h>
-#include <grpcpp/impl/rpc_method.h>
-#include <grpcpp/support/server_callback.h>
-#include <grpcpp/impl/server_callback_handlers.h>
-#include <grpcpp/server_context.h>
-#include <grpcpp/impl/service_type.h>
-#include <grpcpp/support/status.h>
-#include <grpcpp/support/stub_options.h>
-#include <grpcpp/support/sync_stream.h>
-
-namespace io {
-namespace deephaven {
-namespace proto {
-namespace backplane {
-namespace grpc {
-
-// This service provides tools to create and view hierarchical tables (rollups and trees).
-class HierarchicalTableService final {
- public:
-  static constexpr char const* service_full_name() {
-    return "io.deephaven.proto.backplane.grpc.HierarchicalTableService";
-  }
-  class StubInterface {
-   public:
-    virtual ~StubInterface() {}
-    // Applies a rollup operation to a Table and exports the resulting RollupTable
-    virtual ::grpc::Status Rollup(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::RollupRequest& request, ::io::deephaven::proto::backplane::grpc::RollupResponse* response) = 0;
-    std::unique_ptr< ::grpc::ClientAsyncResponseReaderInterface< ::io::deephaven::proto::backplane::grpc::RollupResponse>> AsyncRollup(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::RollupRequest& request, ::grpc::CompletionQueue* cq) {
-      return std::unique_ptr< ::grpc::ClientAsyncResponseReaderInterface< ::io::deephaven::proto::backplane::grpc::RollupResponse>>(AsyncRollupRaw(context, request, cq));
-    }
-    std::unique_ptr< ::grpc::ClientAsyncResponseReaderInterface< ::io::deephaven::proto::backplane::grpc::RollupResponse>> PrepareAsyncRollup(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::RollupRequest& request, ::grpc::CompletionQueue* cq) {
-      return std::unique_ptr< ::grpc::ClientAsyncResponseReaderInterface< ::io::deephaven::proto::backplane::grpc::RollupResponse>>(PrepareAsyncRollupRaw(context, request, cq));
-    }
-    // Applies a tree operation to a Table and exports the resulting TreeTable
-    virtual ::grpc::Status Tree(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::TreeRequest& request, ::io::deephaven::proto::backplane::grpc::TreeResponse* response) = 0;
-    std::unique_ptr< ::grpc::ClientAsyncResponseReaderInterface< ::io::deephaven::proto::backplane::grpc::TreeResponse>> AsyncTree(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::TreeRequest& request, ::grpc::CompletionQueue* cq) {
-      return std::unique_ptr< ::grpc::ClientAsyncResponseReaderInterface< ::io::deephaven::proto::backplane::grpc::TreeResponse>>(AsyncTreeRaw(context, request, cq));
-    }
-    std::unique_ptr< ::grpc::ClientAsyncResponseReaderInterface< ::io::deephaven::proto::backplane::grpc::TreeResponse>> PrepareAsyncTree(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::TreeRequest& request, ::grpc::CompletionQueue* cq) {
-      return std::unique_ptr< ::grpc::ClientAsyncResponseReaderInterface< ::io::deephaven::proto::backplane::grpc::TreeResponse>>(PrepareAsyncTreeRaw(context, request, cq));
-    }
-    // Applies operations to an existing HierarchicalTable (RollupTable or TreeTable) and exports the resulting
-    // HierarchicalTable
-    virtual ::grpc::Status Apply(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::HierarchicalTableApplyRequest& request, ::io::deephaven::proto::backplane::grpc::HierarchicalTableApplyResponse* response) = 0;
-    std::unique_ptr< ::grpc::ClientAsyncResponseReaderInterface< ::io::deephaven::proto::backplane::grpc::HierarchicalTableApplyResponse>> AsyncApply(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::HierarchicalTableApplyRequest& request, ::grpc::CompletionQueue* cq) {
-      return std::unique_ptr< ::grpc::ClientAsyncResponseReaderInterface< ::io::deephaven::proto::backplane::grpc::HierarchicalTableApplyResponse>>(AsyncApplyRaw(context, request, cq));
-    }
-    std::unique_ptr< ::grpc::ClientAsyncResponseReaderInterface< ::io::deephaven::proto::backplane::grpc::HierarchicalTableApplyResponse>> PrepareAsyncApply(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::HierarchicalTableApplyRequest& request, ::grpc::CompletionQueue* cq) {
-      return std::unique_ptr< ::grpc::ClientAsyncResponseReaderInterface< ::io::deephaven::proto::backplane::grpc::HierarchicalTableApplyResponse>>(PrepareAsyncApplyRaw(context, request, cq));
-    }
-    // Creates a view associating a Table of expansion keys and actions with an existing HierarchicalTable and exports
-    // the resulting HierarchicalTableView for subsequent snapshot or subscription requests
-    virtual ::grpc::Status View(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::HierarchicalTableViewRequest& request, ::io::deephaven::proto::backplane::grpc::HierarchicalTableViewResponse* response) = 0;
-    std::unique_ptr< ::grpc::ClientAsyncResponseReaderInterface< ::io::deephaven::proto::backplane::grpc::HierarchicalTableViewResponse>> AsyncView(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::HierarchicalTableViewRequest& request, ::grpc::CompletionQueue* cq) {
-      return std::unique_ptr< ::grpc::ClientAsyncResponseReaderInterface< ::io::deephaven::proto::backplane::grpc::HierarchicalTableViewResponse>>(AsyncViewRaw(context, request, cq));
-    }
-    std::unique_ptr< ::grpc::ClientAsyncResponseReaderInterface< ::io::deephaven::proto::backplane::grpc::HierarchicalTableViewResponse>> PrepareAsyncView(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::HierarchicalTableViewRequest& request, ::grpc::CompletionQueue* cq) {
-      return std::unique_ptr< ::grpc::ClientAsyncResponseReaderInterface< ::io::deephaven::proto::backplane::grpc::HierarchicalTableViewResponse>>(PrepareAsyncViewRaw(context, request, cq));
-    }
-    // Exports the source Table for a HierarchicalTable (Rollup or TreeTable)
-    virtual ::grpc::Status ExportSource(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::HierarchicalTableSourceExportRequest& request, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse* response) = 0;
-    std::unique_ptr< ::grpc::ClientAsyncResponseReaderInterface< ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse>> AsyncExportSource(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::HierarchicalTableSourceExportRequest& request, ::grpc::CompletionQueue* cq) {
-      return std::unique_ptr< ::grpc::ClientAsyncResponseReaderInterface< ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse>>(AsyncExportSourceRaw(context, request, cq));
-    }
-    std::unique_ptr< ::grpc::ClientAsyncResponseReaderInterface< ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse>> PrepareAsyncExportSource(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::HierarchicalTableSourceExportRequest& request, ::grpc::CompletionQueue* cq) {
-      return std::unique_ptr< ::grpc::ClientAsyncResponseReaderInterface< ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse>>(PrepareAsyncExportSourceRaw(context, request, cq));
-    }
-    class async_interface {
-     public:
-      virtual ~async_interface() {}
-      // Applies a rollup operation to a Table and exports the resulting RollupTable
-      virtual void Rollup(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::RollupRequest* request, ::io::deephaven::proto::backplane::grpc::RollupResponse* response, std::function<void(::grpc::Status)>) = 0;
-      virtual void Rollup(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::RollupRequest* request, ::io::deephaven::proto::backplane::grpc::RollupResponse* response, ::grpc::ClientUnaryReactor* reactor) = 0;
-      // Applies a tree operation to a Table and exports the resulting TreeTable
-      virtual void Tree(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::TreeRequest* request, ::io::deephaven::proto::backplane::grpc::TreeResponse* response, std::function<void(::grpc::Status)>) = 0;
-      virtual void Tree(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::TreeRequest* request, ::io::deephaven::proto::backplane::grpc::TreeResponse* response, ::grpc::ClientUnaryReactor* reactor) = 0;
-      // Applies operations to an existing HierarchicalTable (RollupTable or TreeTable) and exports the resulting
-      // HierarchicalTable
-      virtual void Apply(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::HierarchicalTableApplyRequest* request, ::io::deephaven::proto::backplane::grpc::HierarchicalTableApplyResponse* response, std::function<void(::grpc::Status)>) = 0;
-      virtual void Apply(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::HierarchicalTableApplyRequest* request, ::io::deephaven::proto::backplane::grpc::HierarchicalTableApplyResponse* response, ::grpc::ClientUnaryReactor* reactor) = 0;
-      // Creates a view associating a Table of expansion keys and actions with an existing HierarchicalTable and exports
-      // the resulting HierarchicalTableView for subsequent snapshot or subscription requests
-      virtual void View(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::HierarchicalTableViewRequest* request, ::io::deephaven::proto::backplane::grpc::HierarchicalTableViewResponse* response, std::function<void(::grpc::Status)>) = 0;
-      virtual void View(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::HierarchicalTableViewRequest* request, ::io::deephaven::proto::backplane::grpc::HierarchicalTableViewResponse* response, ::grpc::ClientUnaryReactor* reactor) = 0;
-      // Exports the source Table for a HierarchicalTable (Rollup or TreeTable)
-      virtual void ExportSource(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::HierarchicalTableSourceExportRequest* request, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse* response, std::function<void(::grpc::Status)>) = 0;
-      virtual void ExportSource(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::HierarchicalTableSourceExportRequest* request, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse* response, ::grpc::ClientUnaryReactor* reactor) = 0;
-    };
-    typedef class async_interface experimental_async_interface;
-    virtual class async_interface* async() { return nullptr; }
-    class async_interface* experimental_async() { return async(); }
-   private:
-    virtual ::grpc::ClientAsyncResponseReaderInterface< ::io::deephaven::proto::backplane::grpc::RollupResponse>* AsyncRollupRaw(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::RollupRequest& request, ::grpc::CompletionQueue* cq) = 0;
-    virtual ::grpc::ClientAsyncResponseReaderInterface< ::io::deephaven::proto::backplane::grpc::RollupResponse>* PrepareAsyncRollupRaw(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::RollupRequest& request, ::grpc::CompletionQueue* cq) = 0;
-    virtual ::grpc::ClientAsyncResponseReaderInterface< ::io::deephaven::proto::backplane::grpc::TreeResponse>* AsyncTreeRaw(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::TreeRequest& request, ::grpc::CompletionQueue* cq) = 0;
-    virtual ::grpc::ClientAsyncResponseReaderInterface< ::io::deephaven::proto::backplane::grpc::TreeResponse>* PrepareAsyncTreeRaw(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::TreeRequest& request, ::grpc::CompletionQueue* cq) = 0;
-    virtual ::grpc::ClientAsyncResponseReaderInterface< ::io::deephaven::proto::backplane::grpc::HierarchicalTableApplyResponse>* AsyncApplyRaw(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::HierarchicalTableApplyRequest& request, ::grpc::CompletionQueue* cq) = 0;
-    virtual ::grpc::ClientAsyncResponseReaderInterface< ::io::deephaven::proto::backplane::grpc::HierarchicalTableApplyResponse>* PrepareAsyncApplyRaw(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::HierarchicalTableApplyRequest& request, ::grpc::CompletionQueue* cq) = 0;
-    virtual ::grpc::ClientAsyncResponseReaderInterface< ::io::deephaven::proto::backplane::grpc::HierarchicalTableViewResponse>* AsyncViewRaw(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::HierarchicalTableViewRequest& request, ::grpc::CompletionQueue* cq) = 0;
-    virtual ::grpc::ClientAsyncResponseReaderInterface< ::io::deephaven::proto::backplane::grpc::HierarchicalTableViewResponse>* PrepareAsyncViewRaw(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::HierarchicalTableViewRequest& request, ::grpc::CompletionQueue* cq) = 0;
-    virtual ::grpc::ClientAsyncResponseReaderInterface< ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse>* AsyncExportSourceRaw(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::HierarchicalTableSourceExportRequest& request, ::grpc::CompletionQueue* cq) = 0;
-    virtual ::grpc::ClientAsyncResponseReaderInterface< ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse>* PrepareAsyncExportSourceRaw(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::HierarchicalTableSourceExportRequest& request, ::grpc::CompletionQueue* cq) = 0;
-  };
-  class Stub final : public StubInterface {
-   public:
-    Stub(const std::shared_ptr< ::grpc::ChannelInterface>& channel, const ::grpc::StubOptions& options = ::grpc::StubOptions());
-    ::grpc::Status Rollup(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::RollupRequest& request, ::io::deephaven::proto::backplane::grpc::RollupResponse* response) override;
-    std::unique_ptr< ::grpc::ClientAsyncResponseReader< ::io::deephaven::proto::backplane::grpc::RollupResponse>> AsyncRollup(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::RollupRequest& request, ::grpc::CompletionQueue* cq) {
-      return std::unique_ptr< ::grpc::ClientAsyncResponseReader< ::io::deephaven::proto::backplane::grpc::RollupResponse>>(AsyncRollupRaw(context, request, cq));
-    }
-    std::unique_ptr< ::grpc::ClientAsyncResponseReader< ::io::deephaven::proto::backplane::grpc::RollupResponse>> PrepareAsyncRollup(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::RollupRequest& request, ::grpc::CompletionQueue* cq) {
-      return std::unique_ptr< ::grpc::ClientAsyncResponseReader< ::io::deephaven::proto::backplane::grpc::RollupResponse>>(PrepareAsyncRollupRaw(context, request, cq));
-    }
-    ::grpc::Status Tree(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::TreeRequest& request, ::io::deephaven::proto::backplane::grpc::TreeResponse* response) override;
-    std::unique_ptr< ::grpc::ClientAsyncResponseReader< ::io::deephaven::proto::backplane::grpc::TreeResponse>> AsyncTree(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::TreeRequest& request, ::grpc::CompletionQueue* cq) {
-      return std::unique_ptr< ::grpc::ClientAsyncResponseReader< ::io::deephaven::proto::backplane::grpc::TreeResponse>>(AsyncTreeRaw(context, request, cq));
-    }
-    std::unique_ptr< ::grpc::ClientAsyncResponseReader< ::io::deephaven::proto::backplane::grpc::TreeResponse>> PrepareAsyncTree(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::TreeRequest& request, ::grpc::CompletionQueue* cq) {
-      return std::unique_ptr< ::grpc::ClientAsyncResponseReader< ::io::deephaven::proto::backplane::grpc::TreeResponse>>(PrepareAsyncTreeRaw(context, request, cq));
-    }
-    ::grpc::Status Apply(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::HierarchicalTableApplyRequest& request, ::io::deephaven::proto::backplane::grpc::HierarchicalTableApplyResponse* response) override;
-    std::unique_ptr< ::grpc::ClientAsyncResponseReader< ::io::deephaven::proto::backplane::grpc::HierarchicalTableApplyResponse>> AsyncApply(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::HierarchicalTableApplyRequest& request, ::grpc::CompletionQueue* cq) {
-      return std::unique_ptr< ::grpc::ClientAsyncResponseReader< ::io::deephaven::proto::backplane::grpc::HierarchicalTableApplyResponse>>(AsyncApplyRaw(context, request, cq));
-    }
-    std::unique_ptr< ::grpc::ClientAsyncResponseReader< ::io::deephaven::proto::backplane::grpc::HierarchicalTableApplyResponse>> PrepareAsyncApply(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::HierarchicalTableApplyRequest& request, ::grpc::CompletionQueue* cq) {
-      return std::unique_ptr< ::grpc::ClientAsyncResponseReader< ::io::deephaven::proto::backplane::grpc::HierarchicalTableApplyResponse>>(PrepareAsyncApplyRaw(context, request, cq));
-    }
-    ::grpc::Status View(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::HierarchicalTableViewRequest& request, ::io::deephaven::proto::backplane::grpc::HierarchicalTableViewResponse* response) override;
-    std::unique_ptr< ::grpc::ClientAsyncResponseReader< ::io::deephaven::proto::backplane::grpc::HierarchicalTableViewResponse>> AsyncView(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::HierarchicalTableViewRequest& request, ::grpc::CompletionQueue* cq) {
-      return std::unique_ptr< ::grpc::ClientAsyncResponseReader< ::io::deephaven::proto::backplane::grpc::HierarchicalTableViewResponse>>(AsyncViewRaw(context, request, cq));
-    }
-    std::unique_ptr< ::grpc::ClientAsyncResponseReader< ::io::deephaven::proto::backplane::grpc::HierarchicalTableViewResponse>> PrepareAsyncView(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::HierarchicalTableViewRequest& request, ::grpc::CompletionQueue* cq) {
-      return std::unique_ptr< ::grpc::ClientAsyncResponseReader< ::io::deephaven::proto::backplane::grpc::HierarchicalTableViewResponse>>(PrepareAsyncViewRaw(context, request, cq));
-    }
-    ::grpc::Status ExportSource(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::HierarchicalTableSourceExportRequest& request, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse* response) override;
-    std::unique_ptr< ::grpc::ClientAsyncResponseReader< ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse>> AsyncExportSource(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::HierarchicalTableSourceExportRequest& request, ::grpc::CompletionQueue* cq) {
-      return std::unique_ptr< ::grpc::ClientAsyncResponseReader< ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse>>(AsyncExportSourceRaw(context, request, cq));
-    }
-    std::unique_ptr< ::grpc::ClientAsyncResponseReader< ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse>> PrepareAsyncExportSource(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::HierarchicalTableSourceExportRequest& request, ::grpc::CompletionQueue* cq) {
-      return std::unique_ptr< ::grpc::ClientAsyncResponseReader< ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse>>(PrepareAsyncExportSourceRaw(context, request, cq));
-    }
-    class async final :
-      public StubInterface::async_interface {
-     public:
-      void Rollup(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::RollupRequest* request, ::io::deephaven::proto::backplane::grpc::RollupResponse* response, std::function<void(::grpc::Status)>) override;
-      void Rollup(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::RollupRequest* request, ::io::deephaven::proto::backplane::grpc::RollupResponse* response, ::grpc::ClientUnaryReactor* reactor) override;
-      void Tree(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::TreeRequest* request, ::io::deephaven::proto::backplane::grpc::TreeResponse* response, std::function<void(::grpc::Status)>) override;
-      void Tree(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::TreeRequest* request, ::io::deephaven::proto::backplane::grpc::TreeResponse* response, ::grpc::ClientUnaryReactor* reactor) override;
-      void Apply(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::HierarchicalTableApplyRequest* request, ::io::deephaven::proto::backplane::grpc::HierarchicalTableApplyResponse* response, std::function<void(::grpc::Status)>) override;
-      void Apply(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::HierarchicalTableApplyRequest* request, ::io::deephaven::proto::backplane::grpc::HierarchicalTableApplyResponse* response, ::grpc::ClientUnaryReactor* reactor) override;
-      void View(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::HierarchicalTableViewRequest* request, ::io::deephaven::proto::backplane::grpc::HierarchicalTableViewResponse* response, std::function<void(::grpc::Status)>) override;
-      void View(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::HierarchicalTableViewRequest* request, ::io::deephaven::proto::backplane::grpc::HierarchicalTableViewResponse* response, ::grpc::ClientUnaryReactor* reactor) override;
-      void ExportSource(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::HierarchicalTableSourceExportRequest* request, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse* response, std::function<void(::grpc::Status)>) override;
-      void ExportSource(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::HierarchicalTableSourceExportRequest* request, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse* response, ::grpc::ClientUnaryReactor* reactor) override;
-     private:
-      friend class Stub;
-      explicit async(Stub* stub): stub_(stub) { }
-      Stub* stub() { return stub_; }
-      Stub* stub_;
-    };
-    class async* async() override { return &async_stub_; }
-
-   private:
-    std::shared_ptr< ::grpc::ChannelInterface> channel_;
-    class async async_stub_{this};
-    ::grpc::ClientAsyncResponseReader< ::io::deephaven::proto::backplane::grpc::RollupResponse>* AsyncRollupRaw(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::RollupRequest& request, ::grpc::CompletionQueue* cq) override;
-    ::grpc::ClientAsyncResponseReader< ::io::deephaven::proto::backplane::grpc::RollupResponse>* PrepareAsyncRollupRaw(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::RollupRequest& request, ::grpc::CompletionQueue* cq) override;
-    ::grpc::ClientAsyncResponseReader< ::io::deephaven::proto::backplane::grpc::TreeResponse>* AsyncTreeRaw(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::TreeRequest& request, ::grpc::CompletionQueue* cq) override;
-    ::grpc::ClientAsyncResponseReader< ::io::deephaven::proto::backplane::grpc::TreeResponse>* PrepareAsyncTreeRaw(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::TreeRequest& request, ::grpc::CompletionQueue* cq) override;
-    ::grpc::ClientAsyncResponseReader< ::io::deephaven::proto::backplane::grpc::HierarchicalTableApplyResponse>* AsyncApplyRaw(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::HierarchicalTableApplyRequest& request, ::grpc::CompletionQueue* cq) override;
-    ::grpc::ClientAsyncResponseReader< ::io::deephaven::proto::backplane::grpc::HierarchicalTableApplyResponse>* PrepareAsyncApplyRaw(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::HierarchicalTableApplyRequest& request, ::grpc::CompletionQueue* cq) override;
-    ::grpc::ClientAsyncResponseReader< ::io::deephaven::proto::backplane::grpc::HierarchicalTableViewResponse>* AsyncViewRaw(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::HierarchicalTableViewRequest& request, ::grpc::CompletionQueue* cq) override;
-    ::grpc::ClientAsyncResponseReader< ::io::deephaven::proto::backplane::grpc::HierarchicalTableViewResponse>* PrepareAsyncViewRaw(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::HierarchicalTableViewRequest& request, ::grpc::CompletionQueue* cq) override;
-    ::grpc::ClientAsyncResponseReader< ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse>* AsyncExportSourceRaw(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::HierarchicalTableSourceExportRequest& request, ::grpc::CompletionQueue* cq) override;
-    ::grpc::ClientAsyncResponseReader< ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse>* PrepareAsyncExportSourceRaw(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::HierarchicalTableSourceExportRequest& request, ::grpc::CompletionQueue* cq) override;
-    const ::grpc::internal::RpcMethod rpcmethod_Rollup_;
-    const ::grpc::internal::RpcMethod rpcmethod_Tree_;
-    const ::grpc::internal::RpcMethod rpcmethod_Apply_;
-    const ::grpc::internal::RpcMethod rpcmethod_View_;
-    const ::grpc::internal::RpcMethod rpcmethod_ExportSource_;
-  };
-  static std::unique_ptr<Stub> NewStub(const std::shared_ptr< ::grpc::ChannelInterface>& channel, const ::grpc::StubOptions& options = ::grpc::StubOptions());
-
-  class Service : public ::grpc::Service {
-   public:
-    Service();
-    virtual ~Service();
-    // Applies a rollup operation to a Table and exports the resulting RollupTable
-    virtual ::grpc::Status Rollup(::grpc::ServerContext* context, const ::io::deephaven::proto::backplane::grpc::RollupRequest* request, ::io::deephaven::proto::backplane::grpc::RollupResponse* response);
-    // Applies a tree operation to a Table and exports the resulting TreeTable
-    virtual ::grpc::Status Tree(::grpc::ServerContext* context, const ::io::deephaven::proto::backplane::grpc::TreeRequest* request, ::io::deephaven::proto::backplane::grpc::TreeResponse* response);
-    // Applies operations to an existing HierarchicalTable (RollupTable or TreeTable) and exports the resulting
-    // HierarchicalTable
-    virtual ::grpc::Status Apply(::grpc::ServerContext* context, const ::io::deephaven::proto::backplane::grpc::HierarchicalTableApplyRequest* request, ::io::deephaven::proto::backplane::grpc::HierarchicalTableApplyResponse* response);
-    // Creates a view associating a Table of expansion keys and actions with an existing HierarchicalTable and exports
-    // the resulting HierarchicalTableView for subsequent snapshot or subscription requests
-    virtual ::grpc::Status View(::grpc::ServerContext* context, const ::io::deephaven::proto::backplane::grpc::HierarchicalTableViewRequest* request, ::io::deephaven::proto::backplane::grpc::HierarchicalTableViewResponse* response);
-    // Exports the source Table for a HierarchicalTable (Rollup or TreeTable)
-    virtual ::grpc::Status ExportSource(::grpc::ServerContext* context, const ::io::deephaven::proto::backplane::grpc::HierarchicalTableSourceExportRequest* request, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse* response);
-  };
-  template <class BaseClass>
-  class WithAsyncMethod_Rollup : public BaseClass {
-   private:
-    void BaseClassMustBeDerivedFromService(const Service* /*service*/) {}
-   public:
-    WithAsyncMethod_Rollup() {
-      ::grpc::Service::MarkMethodAsync(0);
-    }
-    ~WithAsyncMethod_Rollup() override {
-      BaseClassMustBeDerivedFromService(this);
-    }
-    // disable synchronous version of this method
-    ::grpc::Status Rollup(::grpc::ServerContext* /*context*/, const ::io::deephaven::proto::backplane::grpc::RollupRequest* /*request*/, ::io::deephaven::proto::backplane::grpc::RollupResponse* /*response*/) override {
-      abort();
-      return ::grpc::Status(::grpc::StatusCode::UNIMPLEMENTED, "");
-    }
-    void RequestRollup(::grpc::ServerContext* context, ::io::deephaven::proto::backplane::grpc::RollupRequest* request, ::grpc::ServerAsyncResponseWriter< ::io::deephaven::proto::backplane::grpc::RollupResponse>* response, ::grpc::CompletionQueue* new_call_cq, ::grpc::ServerCompletionQueue* notification_cq, void *tag) {
-      ::grpc::Service::RequestAsyncUnary(0, context, request, response, new_call_cq, notification_cq, tag);
-    }
-  };
-  template <class BaseClass>
-  class WithAsyncMethod_Tree : public BaseClass {
-   private:
-    void BaseClassMustBeDerivedFromService(const Service* /*service*/) {}
-   public:
-    WithAsyncMethod_Tree() {
-      ::grpc::Service::MarkMethodAsync(1);
-    }
-    ~WithAsyncMethod_Tree() override {
-      BaseClassMustBeDerivedFromService(this);
-    }
-    // disable synchronous version of this method
-    ::grpc::Status Tree(::grpc::ServerContext* /*context*/, const ::io::deephaven::proto::backplane::grpc::TreeRequest* /*request*/, ::io::deephaven::proto::backplane::grpc::TreeResponse* /*response*/) override {
-      abort();
-      return ::grpc::Status(::grpc::StatusCode::UNIMPLEMENTED, "");
-    }
-    void RequestTree(::grpc::ServerContext* context, ::io::deephaven::proto::backplane::grpc::TreeRequest* request, ::grpc::ServerAsyncResponseWriter< ::io::deephaven::proto::backplane::grpc::TreeResponse>* response, ::grpc::CompletionQueue* new_call_cq, ::grpc::ServerCompletionQueue* notification_cq, void *tag) {
-      ::grpc::Service::RequestAsyncUnary(1, context, request, response, new_call_cq, notification_cq, tag);
-    }
-  };
-  template <class BaseClass>
-  class WithAsyncMethod_Apply : public BaseClass {
-   private:
-    void BaseClassMustBeDerivedFromService(const Service* /*service*/) {}
-   public:
-    WithAsyncMethod_Apply() {
-      ::grpc::Service::MarkMethodAsync(2);
-    }
-    ~WithAsyncMethod_Apply() override {
-      BaseClassMustBeDerivedFromService(this);
-    }
-    // disable synchronous version of this method
-    ::grpc::Status Apply(::grpc::ServerContext* /*context*/, const ::io::deephaven::proto::backplane::grpc::HierarchicalTableApplyRequest* /*request*/, ::io::deephaven::proto::backplane::grpc::HierarchicalTableApplyResponse* /*response*/) override {
-      abort();
-      return ::grpc::Status(::grpc::StatusCode::UNIMPLEMENTED, "");
-    }
-    void RequestApply(::grpc::ServerContext* context, ::io::deephaven::proto::backplane::grpc::HierarchicalTableApplyRequest* request, ::grpc::ServerAsyncResponseWriter< ::io::deephaven::proto::backplane::grpc::HierarchicalTableApplyResponse>* response, ::grpc::CompletionQueue* new_call_cq, ::grpc::ServerCompletionQueue* notification_cq, void *tag) {
-      ::grpc::Service::RequestAsyncUnary(2, context, request, response, new_call_cq, notification_cq, tag);
-    }
-  };
-  template <class BaseClass>
-  class WithAsyncMethod_View : public BaseClass {
-   private:
-    void BaseClassMustBeDerivedFromService(const Service* /*service*/) {}
-   public:
-    WithAsyncMethod_View() {
-      ::grpc::Service::MarkMethodAsync(3);
-    }
-    ~WithAsyncMethod_View() override {
-      BaseClassMustBeDerivedFromService(this);
-    }
-    // disable synchronous version of this method
-    ::grpc::Status View(::grpc::ServerContext* /*context*/, const ::io::deephaven::proto::backplane::grpc::HierarchicalTableViewRequest* /*request*/, ::io::deephaven::proto::backplane::grpc::HierarchicalTableViewResponse* /*response*/) override {
-      abort();
-      return ::grpc::Status(::grpc::StatusCode::UNIMPLEMENTED, "");
-    }
-    void RequestView(::grpc::ServerContext* context, ::io::deephaven::proto::backplane::grpc::HierarchicalTableViewRequest* request, ::grpc::ServerAsyncResponseWriter< ::io::deephaven::proto::backplane::grpc::HierarchicalTableViewResponse>* response, ::grpc::CompletionQueue* new_call_cq, ::grpc::ServerCompletionQueue* notification_cq, void *tag) {
-      ::grpc::Service::RequestAsyncUnary(3, context, request, response, new_call_cq, notification_cq, tag);
-    }
-  };
-  template <class BaseClass>
-  class WithAsyncMethod_ExportSource : public BaseClass {
-   private:
-    void BaseClassMustBeDerivedFromService(const Service* /*service*/) {}
-   public:
-    WithAsyncMethod_ExportSource() {
-      ::grpc::Service::MarkMethodAsync(4);
-    }
-    ~WithAsyncMethod_ExportSource() override {
-      BaseClassMustBeDerivedFromService(this);
-    }
-    // disable synchronous version of this method
-    ::grpc::Status ExportSource(::grpc::ServerContext* /*context*/, const ::io::deephaven::proto::backplane::grpc::HierarchicalTableSourceExportRequest* /*request*/, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse* /*response*/) override {
-      abort();
-      return ::grpc::Status(::grpc::StatusCode::UNIMPLEMENTED, "");
-    }
-    void RequestExportSource(::grpc::ServerContext* context, ::io::deephaven::proto::backplane::grpc::HierarchicalTableSourceExportRequest* request, ::grpc::ServerAsyncResponseWriter< ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse>* response, ::grpc::CompletionQueue* new_call_cq, ::grpc::ServerCompletionQueue* notification_cq, void *tag) {
-      ::grpc::Service::RequestAsyncUnary(4, context, request, response, new_call_cq, notification_cq, tag);
-    }
-  };
-  typedef WithAsyncMethod_Rollup<WithAsyncMethod_Tree<WithAsyncMethod_Apply<WithAsyncMethod_View<WithAsyncMethod_ExportSource<Service > > > > > AsyncService;
-  template <class BaseClass>
-  class WithCallbackMethod_Rollup : public BaseClass {
-   private:
-    void BaseClassMustBeDerivedFromService(const Service* /*service*/) {}
-   public:
-    WithCallbackMethod_Rollup() {
-      ::grpc::Service::MarkMethodCallback(0,
-          new ::grpc::internal::CallbackUnaryHandler< ::io::deephaven::proto::backplane::grpc::RollupRequest, ::io::deephaven::proto::backplane::grpc::RollupResponse>(
-            [this](
-                   ::grpc::CallbackServerContext* context, const ::io::deephaven::proto::backplane::grpc::RollupRequest* request, ::io::deephaven::proto::backplane::grpc::RollupResponse* response) { return this->Rollup(context, request, response); }));}
-    void SetMessageAllocatorFor_Rollup(
-        ::grpc::MessageAllocator< ::io::deephaven::proto::backplane::grpc::RollupRequest, ::io::deephaven::proto::backplane::grpc::RollupResponse>* allocator) {
-      ::grpc::internal::MethodHandler* const handler = ::grpc::Service::GetHandler(0);
-      static_cast<::grpc::internal::CallbackUnaryHandler< ::io::deephaven::proto::backplane::grpc::RollupRequest, ::io::deephaven::proto::backplane::grpc::RollupResponse>*>(handler)
-              ->SetMessageAllocator(allocator);
-    }
-    ~WithCallbackMethod_Rollup() override {
-      BaseClassMustBeDerivedFromService(this);
-    }
-    // disable synchronous version of this method
-    ::grpc::Status Rollup(::grpc::ServerContext* /*context*/, const ::io::deephaven::proto::backplane::grpc::RollupRequest* /*request*/, ::io::deephaven::proto::backplane::grpc::RollupResponse* /*response*/) override {
-      abort();
-      return ::grpc::Status(::grpc::StatusCode::UNIMPLEMENTED, "");
-    }
-    virtual ::grpc::ServerUnaryReactor* Rollup(
-      ::grpc::CallbackServerContext* /*context*/, const ::io::deephaven::proto::backplane::grpc::RollupRequest* /*request*/, ::io::deephaven::proto::backplane::grpc::RollupResponse* /*response*/)  { return nullptr; }
-  };
-  template <class BaseClass>
-  class WithCallbackMethod_Tree : public BaseClass {
-   private:
-    void BaseClassMustBeDerivedFromService(const Service* /*service*/) {}
-   public:
-    WithCallbackMethod_Tree() {
-      ::grpc::Service::MarkMethodCallback(1,
-          new ::grpc::internal::CallbackUnaryHandler< ::io::deephaven::proto::backplane::grpc::TreeRequest, ::io::deephaven::proto::backplane::grpc::TreeResponse>(
-            [this](
-                   ::grpc::CallbackServerContext* context, const ::io::deephaven::proto::backplane::grpc::TreeRequest* request, ::io::deephaven::proto::backplane::grpc::TreeResponse* response) { return this->Tree(context, request, response); }));}
-    void SetMessageAllocatorFor_Tree(
-        ::grpc::MessageAllocator< ::io::deephaven::proto::backplane::grpc::TreeRequest, ::io::deephaven::proto::backplane::grpc::TreeResponse>* allocator) {
-      ::grpc::internal::MethodHandler* const handler = ::grpc::Service::GetHandler(1);
-      static_cast<::grpc::internal::CallbackUnaryHandler< ::io::deephaven::proto::backplane::grpc::TreeRequest, ::io::deephaven::proto::backplane::grpc::TreeResponse>*>(handler)
-              ->SetMessageAllocator(allocator);
-    }
-    ~WithCallbackMethod_Tree() override {
-      BaseClassMustBeDerivedFromService(this);
-    }
-    // disable synchronous version of this method
-    ::grpc::Status Tree(::grpc::ServerContext* /*context*/, const ::io::deephaven::proto::backplane::grpc::TreeRequest* /*request*/, ::io::deephaven::proto::backplane::grpc::TreeResponse* /*response*/) override {
-      abort();
-      return ::grpc::Status(::grpc::StatusCode::UNIMPLEMENTED, "");
-    }
-    virtual ::grpc::ServerUnaryReactor* Tree(
-      ::grpc::CallbackServerContext* /*context*/, const ::io::deephaven::proto::backplane::grpc::TreeRequest* /*request*/, ::io::deephaven::proto::backplane::grpc::TreeResponse* /*response*/)  { return nullptr; }
-  };
-  template <class BaseClass>
-  class WithCallbackMethod_Apply : public BaseClass {
-   private:
-    void BaseClassMustBeDerivedFromService(const Service* /*service*/) {}
-   public:
-    WithCallbackMethod_Apply() {
-      ::grpc::Service::MarkMethodCallback(2,
-          new ::grpc::internal::CallbackUnaryHandler< ::io::deephaven::proto::backplane::grpc::HierarchicalTableApplyRequest, ::io::deephaven::proto::backplane::grpc::HierarchicalTableApplyResponse>(
-            [this](
-                   ::grpc::CallbackServerContext* context, const ::io::deephaven::proto::backplane::grpc::HierarchicalTableApplyRequest* request, ::io::deephaven::proto::backplane::grpc::HierarchicalTableApplyResponse* response) { return this->Apply(context, request, response); }));}
-    void SetMessageAllocatorFor_Apply(
-        ::grpc::MessageAllocator< ::io::deephaven::proto::backplane::grpc::HierarchicalTableApplyRequest, ::io::deephaven::proto::backplane::grpc::HierarchicalTableApplyResponse>* allocator) {
-      ::grpc::internal::MethodHandler* const handler = ::grpc::Service::GetHandler(2);
-      static_cast<::grpc::internal::CallbackUnaryHandler< ::io::deephaven::proto::backplane::grpc::HierarchicalTableApplyRequest, ::io::deephaven::proto::backplane::grpc::HierarchicalTableApplyResponse>*>(handler)
-              ->SetMessageAllocator(allocator);
-    }
-    ~WithCallbackMethod_Apply() override {
-      BaseClassMustBeDerivedFromService(this);
-    }
-    // disable synchronous version of this method
-    ::grpc::Status Apply(::grpc::ServerContext* /*context*/, const ::io::deephaven::proto::backplane::grpc::HierarchicalTableApplyRequest* /*request*/, ::io::deephaven::proto::backplane::grpc::HierarchicalTableApplyResponse* /*response*/) override {
-      abort();
-      return ::grpc::Status(::grpc::StatusCode::UNIMPLEMENTED, "");
-    }
-    virtual ::grpc::ServerUnaryReactor* Apply(
-      ::grpc::CallbackServerContext* /*context*/, const ::io::deephaven::proto::backplane::grpc::HierarchicalTableApplyRequest* /*request*/, ::io::deephaven::proto::backplane::grpc::HierarchicalTableApplyResponse* /*response*/)  { return nullptr; }
-  };
-  template <class BaseClass>
-  class WithCallbackMethod_View : public BaseClass {
-   private:
-    void BaseClassMustBeDerivedFromService(const Service* /*service*/) {}
-   public:
-    WithCallbackMethod_View() {
-      ::grpc::Service::MarkMethodCallback(3,
-          new ::grpc::internal::CallbackUnaryHandler< ::io::deephaven::proto::backplane::grpc::HierarchicalTableViewRequest, ::io::deephaven::proto::backplane::grpc::HierarchicalTableViewResponse>(
-            [this](
-                   ::grpc::CallbackServerContext* context, const ::io::deephaven::proto::backplane::grpc::HierarchicalTableViewRequest* request, ::io::deephaven::proto::backplane::grpc::HierarchicalTableViewResponse* response) { return this->View(context, request, response); }));}
-    void SetMessageAllocatorFor_View(
-        ::grpc::MessageAllocator< ::io::deephaven::proto::backplane::grpc::HierarchicalTableViewRequest, ::io::deephaven::proto::backplane::grpc::HierarchicalTableViewResponse>* allocator) {
-      ::grpc::internal::MethodHandler* const handler = ::grpc::Service::GetHandler(3);
-      static_cast<::grpc::internal::CallbackUnaryHandler< ::io::deephaven::proto::backplane::grpc::HierarchicalTableViewRequest, ::io::deephaven::proto::backplane::grpc::HierarchicalTableViewResponse>*>(handler)
-              ->SetMessageAllocator(allocator);
-    }
-    ~WithCallbackMethod_View() override {
-      BaseClassMustBeDerivedFromService(this);
-    }
-    // disable synchronous version of this method
-    ::grpc::Status View(::grpc::ServerContext* /*context*/, const ::io::deephaven::proto::backplane::grpc::HierarchicalTableViewRequest* /*request*/, ::io::deephaven::proto::backplane::grpc::HierarchicalTableViewResponse* /*response*/) override {
-      abort();
-      return ::grpc::Status(::grpc::StatusCode::UNIMPLEMENTED, "");
-    }
-    virtual ::grpc::ServerUnaryReactor* View(
-      ::grpc::CallbackServerContext* /*context*/, const ::io::deephaven::proto::backplane::grpc::HierarchicalTableViewRequest* /*request*/, ::io::deephaven::proto::backplane::grpc::HierarchicalTableViewResponse* /*response*/)  { return nullptr; }
-  };
-  template <class BaseClass>
-  class WithCallbackMethod_ExportSource : public BaseClass {
-   private:
-    void BaseClassMustBeDerivedFromService(const Service* /*service*/) {}
-   public:
-    WithCallbackMethod_ExportSource() {
-      ::grpc::Service::MarkMethodCallback(4,
-          new ::grpc::internal::CallbackUnaryHandler< ::io::deephaven::proto::backplane::grpc::HierarchicalTableSourceExportRequest, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse>(
-            [this](
-                   ::grpc::CallbackServerContext* context, const ::io::deephaven::proto::backplane::grpc::HierarchicalTableSourceExportRequest* request, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse* response) { return this->ExportSource(context, request, response); }));}
-    void SetMessageAllocatorFor_ExportSource(
-        ::grpc::MessageAllocator< ::io::deephaven::proto::backplane::grpc::HierarchicalTableSourceExportRequest, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse>* allocator) {
-      ::grpc::internal::MethodHandler* const handler = ::grpc::Service::GetHandler(4);
-      static_cast<::grpc::internal::CallbackUnaryHandler< ::io::deephaven::proto::backplane::grpc::HierarchicalTableSourceExportRequest, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse>*>(handler)
-              ->SetMessageAllocator(allocator);
-    }
-    ~WithCallbackMethod_ExportSource() override {
-      BaseClassMustBeDerivedFromService(this);
-    }
-    // disable synchronous version of this method
-    ::grpc::Status ExportSource(::grpc::ServerContext* /*context*/, const ::io::deephaven::proto::backplane::grpc::HierarchicalTableSourceExportRequest* /*request*/, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse* /*response*/) override {
-      abort();
-      return ::grpc::Status(::grpc::StatusCode::UNIMPLEMENTED, "");
-    }
-    virtual ::grpc::ServerUnaryReactor* ExportSource(
-      ::grpc::CallbackServerContext* /*context*/, const ::io::deephaven::proto::backplane::grpc::HierarchicalTableSourceExportRequest* /*request*/, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse* /*response*/)  { return nullptr; }
-  };
-  typedef WithCallbackMethod_Rollup<WithCallbackMethod_Tree<WithCallbackMethod_Apply<WithCallbackMethod_View<WithCallbackMethod_ExportSource<Service > > > > > CallbackService;
-  typedef CallbackService ExperimentalCallbackService;
-  template <class BaseClass>
-  class WithGenericMethod_Rollup : public BaseClass {
-   private:
-    void BaseClassMustBeDerivedFromService(const Service* /*service*/) {}
-   public:
-    WithGenericMethod_Rollup() {
-      ::grpc::Service::MarkMethodGeneric(0);
-    }
-    ~WithGenericMethod_Rollup() override {
-      BaseClassMustBeDerivedFromService(this);
-    }
-    // disable synchronous version of this method
-    ::grpc::Status Rollup(::grpc::ServerContext* /*context*/, const ::io::deephaven::proto::backplane::grpc::RollupRequest* /*request*/, ::io::deephaven::proto::backplane::grpc::RollupResponse* /*response*/) override {
-      abort();
-      return ::grpc::Status(::grpc::StatusCode::UNIMPLEMENTED, "");
-    }
-  };
-  template <class BaseClass>
-  class WithGenericMethod_Tree : public BaseClass {
-   private:
-    void BaseClassMustBeDerivedFromService(const Service* /*service*/) {}
-   public:
-    WithGenericMethod_Tree() {
-      ::grpc::Service::MarkMethodGeneric(1);
-    }
-    ~WithGenericMethod_Tree() override {
-      BaseClassMustBeDerivedFromService(this);
-    }
-    // disable synchronous version of this method
-    ::grpc::Status Tree(::grpc::ServerContext* /*context*/, const ::io::deephaven::proto::backplane::grpc::TreeRequest* /*request*/, ::io::deephaven::proto::backplane::grpc::TreeResponse* /*response*/) override {
-      abort();
-      return ::grpc::Status(::grpc::StatusCode::UNIMPLEMENTED, "");
-    }
-  };
-  template <class BaseClass>
-  class WithGenericMethod_Apply : public BaseClass {
-   private:
-    void BaseClassMustBeDerivedFromService(const Service* /*service*/) {}
-   public:
-    WithGenericMethod_Apply() {
-      ::grpc::Service::MarkMethodGeneric(2);
-    }
-    ~WithGenericMethod_Apply() override {
-      BaseClassMustBeDerivedFromService(this);
-    }
-    // disable synchronous version of this method
-    ::grpc::Status Apply(::grpc::ServerContext* /*context*/, const ::io::deephaven::proto::backplane::grpc::HierarchicalTableApplyRequest* /*request*/, ::io::deephaven::proto::backplane::grpc::HierarchicalTableApplyResponse* /*response*/) override {
-      abort();
-      return ::grpc::Status(::grpc::StatusCode::UNIMPLEMENTED, "");
-    }
-  };
-  template <class BaseClass>
-  class WithGenericMethod_View : public BaseClass {
-   private:
-    void BaseClassMustBeDerivedFromService(const Service* /*service*/) {}
-   public:
-    WithGenericMethod_View() {
-      ::grpc::Service::MarkMethodGeneric(3);
-    }
-    ~WithGenericMethod_View() override {
-      BaseClassMustBeDerivedFromService(this);
-    }
-    // disable synchronous version of this method
-    ::grpc::Status View(::grpc::ServerContext* /*context*/, const ::io::deephaven::proto::backplane::grpc::HierarchicalTableViewRequest* /*request*/, ::io::deephaven::proto::backplane::grpc::HierarchicalTableViewResponse* /*response*/) override {
-      abort();
-      return ::grpc::Status(::grpc::StatusCode::UNIMPLEMENTED, "");
-    }
-  };
-  template <class BaseClass>
-  class WithGenericMethod_ExportSource : public BaseClass {
-   private:
-    void BaseClassMustBeDerivedFromService(const Service* /*service*/) {}
-   public:
-    WithGenericMethod_ExportSource() {
-      ::grpc::Service::MarkMethodGeneric(4);
-    }
-    ~WithGenericMethod_ExportSource() override {
-      BaseClassMustBeDerivedFromService(this);
-    }
-    // disable synchronous version of this method
-    ::grpc::Status ExportSource(::grpc::ServerContext* /*context*/, const ::io::deephaven::proto::backplane::grpc::HierarchicalTableSourceExportRequest* /*request*/, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse* /*response*/) override {
-      abort();
-      return ::grpc::Status(::grpc::StatusCode::UNIMPLEMENTED, "");
-    }
-  };
-  template <class BaseClass>
-  class WithRawMethod_Rollup : public BaseClass {
-   private:
-    void BaseClassMustBeDerivedFromService(const Service* /*service*/) {}
-   public:
-    WithRawMethod_Rollup() {
-      ::grpc::Service::MarkMethodRaw(0);
-    }
-    ~WithRawMethod_Rollup() override {
-      BaseClassMustBeDerivedFromService(this);
-    }
-    // disable synchronous version of this method
-    ::grpc::Status Rollup(::grpc::ServerContext* /*context*/, const ::io::deephaven::proto::backplane::grpc::RollupRequest* /*request*/, ::io::deephaven::proto::backplane::grpc::RollupResponse* /*response*/) override {
-      abort();
-      return ::grpc::Status(::grpc::StatusCode::UNIMPLEMENTED, "");
-    }
-    void RequestRollup(::grpc::ServerContext* context, ::grpc::ByteBuffer* request, ::grpc::ServerAsyncResponseWriter< ::grpc::ByteBuffer>* response, ::grpc::CompletionQueue* new_call_cq, ::grpc::ServerCompletionQueue* notification_cq, void *tag) {
-      ::grpc::Service::RequestAsyncUnary(0, context, request, response, new_call_cq, notification_cq, tag);
-    }
-  };
-  template <class BaseClass>
-  class WithRawMethod_Tree : public BaseClass {
-   private:
-    void BaseClassMustBeDerivedFromService(const Service* /*service*/) {}
-   public:
-    WithRawMethod_Tree() {
-      ::grpc::Service::MarkMethodRaw(1);
-    }
-    ~WithRawMethod_Tree() override {
-      BaseClassMustBeDerivedFromService(this);
-    }
-    // disable synchronous version of this method
-    ::grpc::Status Tree(::grpc::ServerContext* /*context*/, const ::io::deephaven::proto::backplane::grpc::TreeRequest* /*request*/, ::io::deephaven::proto::backplane::grpc::TreeResponse* /*response*/) override {
-      abort();
-      return ::grpc::Status(::grpc::StatusCode::UNIMPLEMENTED, "");
-    }
-    void RequestTree(::grpc::ServerContext* context, ::grpc::ByteBuffer* request, ::grpc::ServerAsyncResponseWriter< ::grpc::ByteBuffer>* response, ::grpc::CompletionQueue* new_call_cq, ::grpc::ServerCompletionQueue* notification_cq, void *tag) {
-      ::grpc::Service::RequestAsyncUnary(1, context, request, response, new_call_cq, notification_cq, tag);
-    }
-  };
-  template <class BaseClass>
-  class WithRawMethod_Apply : public BaseClass {
-   private:
-    void BaseClassMustBeDerivedFromService(const Service* /*service*/) {}
-   public:
-    WithRawMethod_Apply() {
-      ::grpc::Service::MarkMethodRaw(2);
-    }
-    ~WithRawMethod_Apply() override {
-      BaseClassMustBeDerivedFromService(this);
-    }
-    // disable synchronous version of this method
-    ::grpc::Status Apply(::grpc::ServerContext* /*context*/, const ::io::deephaven::proto::backplane::grpc::HierarchicalTableApplyRequest* /*request*/, ::io::deephaven::proto::backplane::grpc::HierarchicalTableApplyResponse* /*response*/) override {
-      abort();
-      return ::grpc::Status(::grpc::StatusCode::UNIMPLEMENTED, "");
-    }
-    void RequestApply(::grpc::ServerContext* context, ::grpc::ByteBuffer* request, ::grpc::ServerAsyncResponseWriter< ::grpc::ByteBuffer>* response, ::grpc::CompletionQueue* new_call_cq, ::grpc::ServerCompletionQueue* notification_cq, void *tag) {
-      ::grpc::Service::RequestAsyncUnary(2, context, request, response, new_call_cq, notification_cq, tag);
-    }
-  };
-  template <class BaseClass>
-  class WithRawMethod_View : public BaseClass {
-   private:
-    void BaseClassMustBeDerivedFromService(const Service* /*service*/) {}
-   public:
-    WithRawMethod_View() {
-      ::grpc::Service::MarkMethodRaw(3);
-    }
-    ~WithRawMethod_View() override {
-      BaseClassMustBeDerivedFromService(this);
-    }
-    // disable synchronous version of this method
-    ::grpc::Status View(::grpc::ServerContext* /*context*/, const ::io::deephaven::proto::backplane::grpc::HierarchicalTableViewRequest* /*request*/, ::io::deephaven::proto::backplane::grpc::HierarchicalTableViewResponse* /*response*/) override {
-      abort();
-      return ::grpc::Status(::grpc::StatusCode::UNIMPLEMENTED, "");
-    }
-    void RequestView(::grpc::ServerContext* context, ::grpc::ByteBuffer* request, ::grpc::ServerAsyncResponseWriter< ::grpc::ByteBuffer>* response, ::grpc::CompletionQueue* new_call_cq, ::grpc::ServerCompletionQueue* notification_cq, void *tag) {
-      ::grpc::Service::RequestAsyncUnary(3, context, request, response, new_call_cq, notification_cq, tag);
-    }
-  };
-  template <class BaseClass>
-  class WithRawMethod_ExportSource : public BaseClass {
-   private:
-    void BaseClassMustBeDerivedFromService(const Service* /*service*/) {}
-   public:
-    WithRawMethod_ExportSource() {
-      ::grpc::Service::MarkMethodRaw(4);
-    }
-    ~WithRawMethod_ExportSource() override {
-      BaseClassMustBeDerivedFromService(this);
-    }
-    // disable synchronous version of this method
-    ::grpc::Status ExportSource(::grpc::ServerContext* /*context*/, const ::io::deephaven::proto::backplane::grpc::HierarchicalTableSourceExportRequest* /*request*/, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse* /*response*/) override {
-      abort();
-      return ::grpc::Status(::grpc::StatusCode::UNIMPLEMENTED, "");
-    }
-    void RequestExportSource(::grpc::ServerContext* context, ::grpc::ByteBuffer* request, ::grpc::ServerAsyncResponseWriter< ::grpc::ByteBuffer>* response, ::grpc::CompletionQueue* new_call_cq, ::grpc::ServerCompletionQueue* notification_cq, void *tag) {
-      ::grpc::Service::RequestAsyncUnary(4, context, request, response, new_call_cq, notification_cq, tag);
-    }
-  };
-  template <class BaseClass>
-  class WithRawCallbackMethod_Rollup : public BaseClass {
-   private:
-    void BaseClassMustBeDerivedFromService(const Service* /*service*/) {}
-   public:
-    WithRawCallbackMethod_Rollup() {
-      ::grpc::Service::MarkMethodRawCallback(0,
-          new ::grpc::internal::CallbackUnaryHandler< ::grpc::ByteBuffer, ::grpc::ByteBuffer>(
-            [this](
-                   ::grpc::CallbackServerContext* context, const ::grpc::ByteBuffer* request, ::grpc::ByteBuffer* response) { return this->Rollup(context, request, response); }));
-    }
-    ~WithRawCallbackMethod_Rollup() override {
-      BaseClassMustBeDerivedFromService(this);
-    }
-    // disable synchronous version of this method
-    ::grpc::Status Rollup(::grpc::ServerContext* /*context*/, const ::io::deephaven::proto::backplane::grpc::RollupRequest* /*request*/, ::io::deephaven::proto::backplane::grpc::RollupResponse* /*response*/) override {
-      abort();
-      return ::grpc::Status(::grpc::StatusCode::UNIMPLEMENTED, "");
-    }
-    virtual ::grpc::ServerUnaryReactor* Rollup(
-      ::grpc::CallbackServerContext* /*context*/, const ::grpc::ByteBuffer* /*request*/, ::grpc::ByteBuffer* /*response*/)  { return nullptr; }
-  };
-  template <class BaseClass>
-  class WithRawCallbackMethod_Tree : public BaseClass {
-   private:
-    void BaseClassMustBeDerivedFromService(const Service* /*service*/) {}
-   public:
-    WithRawCallbackMethod_Tree() {
-      ::grpc::Service::MarkMethodRawCallback(1,
-          new ::grpc::internal::CallbackUnaryHandler< ::grpc::ByteBuffer, ::grpc::ByteBuffer>(
-            [this](
-                   ::grpc::CallbackServerContext* context, const ::grpc::ByteBuffer* request, ::grpc::ByteBuffer* response) { return this->Tree(context, request, response); }));
-    }
-    ~WithRawCallbackMethod_Tree() override {
-      BaseClassMustBeDerivedFromService(this);
-    }
-    // disable synchronous version of this method
-    ::grpc::Status Tree(::grpc::ServerContext* /*context*/, const ::io::deephaven::proto::backplane::grpc::TreeRequest* /*request*/, ::io::deephaven::proto::backplane::grpc::TreeResponse* /*response*/) override {
-      abort();
-      return ::grpc::Status(::grpc::StatusCode::UNIMPLEMENTED, "");
-    }
-    virtual ::grpc::ServerUnaryReactor* Tree(
-      ::grpc::CallbackServerContext* /*context*/, const ::grpc::ByteBuffer* /*request*/, ::grpc::ByteBuffer* /*response*/)  { return nullptr; }
-  };
-  template <class BaseClass>
-  class WithRawCallbackMethod_Apply : public BaseClass {
-   private:
-    void BaseClassMustBeDerivedFromService(const Service* /*service*/) {}
-   public:
-    WithRawCallbackMethod_Apply() {
-      ::grpc::Service::MarkMethodRawCallback(2,
-          new ::grpc::internal::CallbackUnaryHandler< ::grpc::ByteBuffer, ::grpc::ByteBuffer>(
-            [this](
-                   ::grpc::CallbackServerContext* context, const ::grpc::ByteBuffer* request, ::grpc::ByteBuffer* response) { return this->Apply(context, request, response); }));
-    }
-    ~WithRawCallbackMethod_Apply() override {
-      BaseClassMustBeDerivedFromService(this);
-    }
-    // disable synchronous version of this method
-    ::grpc::Status Apply(::grpc::ServerContext* /*context*/, const ::io::deephaven::proto::backplane::grpc::HierarchicalTableApplyRequest* /*request*/, ::io::deephaven::proto::backplane::grpc::HierarchicalTableApplyResponse* /*response*/) override {
-      abort();
-      return ::grpc::Status(::grpc::StatusCode::UNIMPLEMENTED, "");
-    }
-    virtual ::grpc::ServerUnaryReactor* Apply(
-      ::grpc::CallbackServerContext* /*context*/, const ::grpc::ByteBuffer* /*request*/, ::grpc::ByteBuffer* /*response*/)  { return nullptr; }
-  };
-  template <class BaseClass>
-  class WithRawCallbackMethod_View : public BaseClass {
-   private:
-    void BaseClassMustBeDerivedFromService(const Service* /*service*/) {}
-   public:
-    WithRawCallbackMethod_View() {
-      ::grpc::Service::MarkMethodRawCallback(3,
-          new ::grpc::internal::CallbackUnaryHandler< ::grpc::ByteBuffer, ::grpc::ByteBuffer>(
-            [this](
-                   ::grpc::CallbackServerContext* context, const ::grpc::ByteBuffer* request, ::grpc::ByteBuffer* response) { return this->View(context, request, response); }));
-    }
-    ~WithRawCallbackMethod_View() override {
-      BaseClassMustBeDerivedFromService(this);
-    }
-    // disable synchronous version of this method
-    ::grpc::Status View(::grpc::ServerContext* /*context*/, const ::io::deephaven::proto::backplane::grpc::HierarchicalTableViewRequest* /*request*/, ::io::deephaven::proto::backplane::grpc::HierarchicalTableViewResponse* /*response*/) override {
-      abort();
-      return ::grpc::Status(::grpc::StatusCode::UNIMPLEMENTED, "");
-    }
-    virtual ::grpc::ServerUnaryReactor* View(
-      ::grpc::CallbackServerContext* /*context*/, const ::grpc::ByteBuffer* /*request*/, ::grpc::ByteBuffer* /*response*/)  { return nullptr; }
-  };
-  template <class BaseClass>
-  class WithRawCallbackMethod_ExportSource : public BaseClass {
-   private:
-    void BaseClassMustBeDerivedFromService(const Service* /*service*/) {}
-   public:
-    WithRawCallbackMethod_ExportSource() {
-      ::grpc::Service::MarkMethodRawCallback(4,
-          new ::grpc::internal::CallbackUnaryHandler< ::grpc::ByteBuffer, ::grpc::ByteBuffer>(
-            [this](
-                   ::grpc::CallbackServerContext* context, const ::grpc::ByteBuffer* request, ::grpc::ByteBuffer* response) { return this->ExportSource(context, request, response); }));
-    }
-    ~WithRawCallbackMethod_ExportSource() override {
-      BaseClassMustBeDerivedFromService(this);
-    }
-    // disable synchronous version of this method
-    ::grpc::Status ExportSource(::grpc::ServerContext* /*context*/, const ::io::deephaven::proto::backplane::grpc::HierarchicalTableSourceExportRequest* /*request*/, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse* /*response*/) override {
-      abort();
-      return ::grpc::Status(::grpc::StatusCode::UNIMPLEMENTED, "");
-    }
-    virtual ::grpc::ServerUnaryReactor* ExportSource(
-      ::grpc::CallbackServerContext* /*context*/, const ::grpc::ByteBuffer* /*request*/, ::grpc::ByteBuffer* /*response*/)  { return nullptr; }
-  };
-  template <class BaseClass>
-  class WithStreamedUnaryMethod_Rollup : public BaseClass {
-   private:
-    void BaseClassMustBeDerivedFromService(const Service* /*service*/) {}
-   public:
-    WithStreamedUnaryMethod_Rollup() {
-      ::grpc::Service::MarkMethodStreamed(0,
-        new ::grpc::internal::StreamedUnaryHandler<
-          ::io::deephaven::proto::backplane::grpc::RollupRequest, ::io::deephaven::proto::backplane::grpc::RollupResponse>(
-            [this](::grpc::ServerContext* context,
-                   ::grpc::ServerUnaryStreamer<
-                     ::io::deephaven::proto::backplane::grpc::RollupRequest, ::io::deephaven::proto::backplane::grpc::RollupResponse>* streamer) {
-                       return this->StreamedRollup(context,
-                         streamer);
-                  }));
-    }
-    ~WithStreamedUnaryMethod_Rollup() override {
-      BaseClassMustBeDerivedFromService(this);
-    }
-    // disable regular version of this method
-    ::grpc::Status Rollup(::grpc::ServerContext* /*context*/, const ::io::deephaven::proto::backplane::grpc::RollupRequest* /*request*/, ::io::deephaven::proto::backplane::grpc::RollupResponse* /*response*/) override {
-      abort();
-      return ::grpc::Status(::grpc::StatusCode::UNIMPLEMENTED, "");
-    }
-    // replace default version of method with streamed unary
-    virtual ::grpc::Status StreamedRollup(::grpc::ServerContext* context, ::grpc::ServerUnaryStreamer< ::io::deephaven::proto::backplane::grpc::RollupRequest,::io::deephaven::proto::backplane::grpc::RollupResponse>* server_unary_streamer) = 0;
-  };
-  template <class BaseClass>
-  class WithStreamedUnaryMethod_Tree : public BaseClass {
-   private:
-    void BaseClassMustBeDerivedFromService(const Service* /*service*/) {}
-   public:
-    WithStreamedUnaryMethod_Tree() {
-      ::grpc::Service::MarkMethodStreamed(1,
-        new ::grpc::internal::StreamedUnaryHandler<
-          ::io::deephaven::proto::backplane::grpc::TreeRequest, ::io::deephaven::proto::backplane::grpc::TreeResponse>(
-            [this](::grpc::ServerContext* context,
-                   ::grpc::ServerUnaryStreamer<
-                     ::io::deephaven::proto::backplane::grpc::TreeRequest, ::io::deephaven::proto::backplane::grpc::TreeResponse>* streamer) {
-                       return this->StreamedTree(context,
-                         streamer);
-                  }));
-    }
-    ~WithStreamedUnaryMethod_Tree() override {
-      BaseClassMustBeDerivedFromService(this);
-    }
-    // disable regular version of this method
-    ::grpc::Status Tree(::grpc::ServerContext* /*context*/, const ::io::deephaven::proto::backplane::grpc::TreeRequest* /*request*/, ::io::deephaven::proto::backplane::grpc::TreeResponse* /*response*/) override {
-      abort();
-      return ::grpc::Status(::grpc::StatusCode::UNIMPLEMENTED, "");
-    }
-    // replace default version of method with streamed unary
-    virtual ::grpc::Status StreamedTree(::grpc::ServerContext* context, ::grpc::ServerUnaryStreamer< ::io::deephaven::proto::backplane::grpc::TreeRequest,::io::deephaven::proto::backplane::grpc::TreeResponse>* server_unary_streamer) = 0;
-  };
-  template <class BaseClass>
-  class WithStreamedUnaryMethod_Apply : public BaseClass {
-   private:
-    void BaseClassMustBeDerivedFromService(const Service* /*service*/) {}
-   public:
-    WithStreamedUnaryMethod_Apply() {
-      ::grpc::Service::MarkMethodStreamed(2,
-        new ::grpc::internal::StreamedUnaryHandler<
-          ::io::deephaven::proto::backplane::grpc::HierarchicalTableApplyRequest, ::io::deephaven::proto::backplane::grpc::HierarchicalTableApplyResponse>(
-            [this](::grpc::ServerContext* context,
-                   ::grpc::ServerUnaryStreamer<
-                     ::io::deephaven::proto::backplane::grpc::HierarchicalTableApplyRequest, ::io::deephaven::proto::backplane::grpc::HierarchicalTableApplyResponse>* streamer) {
-                       return this->StreamedApply(context,
-                         streamer);
-                  }));
-    }
-    ~WithStreamedUnaryMethod_Apply() override {
-      BaseClassMustBeDerivedFromService(this);
-    }
-    // disable regular version of this method
-    ::grpc::Status Apply(::grpc::ServerContext* /*context*/, const ::io::deephaven::proto::backplane::grpc::HierarchicalTableApplyRequest* /*request*/, ::io::deephaven::proto::backplane::grpc::HierarchicalTableApplyResponse* /*response*/) override {
-      abort();
-      return ::grpc::Status(::grpc::StatusCode::UNIMPLEMENTED, "");
-    }
-    // replace default version of method with streamed unary
-    virtual ::grpc::Status StreamedApply(::grpc::ServerContext* context, ::grpc::ServerUnaryStreamer< ::io::deephaven::proto::backplane::grpc::HierarchicalTableApplyRequest,::io::deephaven::proto::backplane::grpc::HierarchicalTableApplyResponse>* server_unary_streamer) = 0;
-  };
-  template <class BaseClass>
-  class WithStreamedUnaryMethod_View : public BaseClass {
-   private:
-    void BaseClassMustBeDerivedFromService(const Service* /*service*/) {}
-   public:
-    WithStreamedUnaryMethod_View() {
-      ::grpc::Service::MarkMethodStreamed(3,
-        new ::grpc::internal::StreamedUnaryHandler<
-          ::io::deephaven::proto::backplane::grpc::HierarchicalTableViewRequest, ::io::deephaven::proto::backplane::grpc::HierarchicalTableViewResponse>(
-            [this](::grpc::ServerContext* context,
-                   ::grpc::ServerUnaryStreamer<
-                     ::io::deephaven::proto::backplane::grpc::HierarchicalTableViewRequest, ::io::deephaven::proto::backplane::grpc::HierarchicalTableViewResponse>* streamer) {
-                       return this->StreamedView(context,
-                         streamer);
-                  }));
-    }
-    ~WithStreamedUnaryMethod_View() override {
-      BaseClassMustBeDerivedFromService(this);
-    }
-    // disable regular version of this method
-    ::grpc::Status View(::grpc::ServerContext* /*context*/, const ::io::deephaven::proto::backplane::grpc::HierarchicalTableViewRequest* /*request*/, ::io::deephaven::proto::backplane::grpc::HierarchicalTableViewResponse* /*response*/) override {
-      abort();
-      return ::grpc::Status(::grpc::StatusCode::UNIMPLEMENTED, "");
-    }
-    // replace default version of method with streamed unary
-    virtual ::grpc::Status StreamedView(::grpc::ServerContext* context, ::grpc::ServerUnaryStreamer< ::io::deephaven::proto::backplane::grpc::HierarchicalTableViewRequest,::io::deephaven::proto::backplane::grpc::HierarchicalTableViewResponse>* server_unary_streamer) = 0;
-  };
-  template <class BaseClass>
-  class WithStreamedUnaryMethod_ExportSource : public BaseClass {
-   private:
-    void BaseClassMustBeDerivedFromService(const Service* /*service*/) {}
-   public:
-    WithStreamedUnaryMethod_ExportSource() {
-      ::grpc::Service::MarkMethodStreamed(4,
-        new ::grpc::internal::StreamedUnaryHandler<
-          ::io::deephaven::proto::backplane::grpc::HierarchicalTableSourceExportRequest, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse>(
-            [this](::grpc::ServerContext* context,
-                   ::grpc::ServerUnaryStreamer<
-                     ::io::deephaven::proto::backplane::grpc::HierarchicalTableSourceExportRequest, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse>* streamer) {
-                       return this->StreamedExportSource(context,
-                         streamer);
-                  }));
-    }
-    ~WithStreamedUnaryMethod_ExportSource() override {
-      BaseClassMustBeDerivedFromService(this);
-    }
-    // disable regular version of this method
-    ::grpc::Status ExportSource(::grpc::ServerContext* /*context*/, const ::io::deephaven::proto::backplane::grpc::HierarchicalTableSourceExportRequest* /*request*/, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse* /*response*/) override {
-      abort();
-      return ::grpc::Status(::grpc::StatusCode::UNIMPLEMENTED, "");
-    }
-    // replace default version of method with streamed unary
-    virtual ::grpc::Status StreamedExportSource(::grpc::ServerContext* context, ::grpc::ServerUnaryStreamer< ::io::deephaven::proto::backplane::grpc::HierarchicalTableSourceExportRequest,::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse>* server_unary_streamer) = 0;
-  };
-  typedef WithStreamedUnaryMethod_Rollup<WithStreamedUnaryMethod_Tree<WithStreamedUnaryMethod_Apply<WithStreamedUnaryMethod_View<WithStreamedUnaryMethod_ExportSource<Service > > > > > StreamedUnaryService;
-  typedef Service SplitStreamedService;
-  typedef WithStreamedUnaryMethod_Rollup<WithStreamedUnaryMethod_Tree<WithStreamedUnaryMethod_Apply<WithStreamedUnaryMethod_View<WithStreamedUnaryMethod_ExportSource<Service > > > > > StreamedService;
-};
-
-}  // namespace grpc
-}  // namespace backplane
-}  // namespace proto
-}  // namespace deephaven
-}  // namespace io
-
-
-#endif  // GRPC_deephaven_2fproto_2fhierarchicaltable_2eproto__INCLUDED
diff --git a/cpp-client/deephaven/dhclient/proto/deephaven/proto/hierarchicaltable.pb.cc b/cpp-client/deephaven/dhclient/proto/deephaven/proto/hierarchicaltable.pb.cc
deleted file mode 100644
index 13898a9f0f8..00000000000
--- a/cpp-client/deephaven/dhclient/proto/deephaven/proto/hierarchicaltable.pb.cc
+++ /dev/null
@@ -1,2893 +0,0 @@
-// Generated by the protocol buffer compiler.  DO NOT EDIT!
-// source: deephaven/proto/hierarchicaltable.proto
-
-#include "deephaven/proto/hierarchicaltable.pb.h"
-
-#include <algorithm>
-#include "google/protobuf/io/coded_stream.h"
-#include "google/protobuf/extension_set.h"
-#include "google/protobuf/wire_format_lite.h"
-#include "google/protobuf/descriptor.h"
-#include "google/protobuf/generated_message_reflection.h"
-#include "google/protobuf/reflection_ops.h"
-#include "google/protobuf/wire_format.h"
-#include "google/protobuf/generated_message_tctable_impl.h"
-// @@protoc_insertion_point(includes)
-
-// Must be included last.
-#include "google/protobuf/port_def.inc"
-PROTOBUF_PRAGMA_INIT_SEG
-namespace _pb = ::google::protobuf;
-namespace _pbi = ::google::protobuf::internal;
-namespace _fl = ::google::protobuf::internal::field_layout;
-namespace io {
-namespace deephaven {
-namespace proto {
-namespace backplane {
-namespace grpc {
-      template <typename>
-PROTOBUF_CONSTEXPR TreeResponse::TreeResponse(::_pbi::ConstantInitialized) {}
-struct TreeResponseDefaultTypeInternal {
-  PROTOBUF_CONSTEXPR TreeResponseDefaultTypeInternal() : _instance(::_pbi::ConstantInitialized{}) {}
-  ~TreeResponseDefaultTypeInternal() {}
-  union {
-    TreeResponse _instance;
-  };
-};
-
-PROTOBUF_ATTRIBUTE_NO_DESTROY PROTOBUF_CONSTINIT
-    PROTOBUF_ATTRIBUTE_INIT_PRIORITY1 TreeResponseDefaultTypeInternal _TreeResponse_default_instance_;
-      template <typename>
-PROTOBUF_CONSTEXPR RollupResponse::RollupResponse(::_pbi::ConstantInitialized) {}
-struct RollupResponseDefaultTypeInternal {
-  PROTOBUF_CONSTEXPR RollupResponseDefaultTypeInternal() : _instance(::_pbi::ConstantInitialized{}) {}
-  ~RollupResponseDefaultTypeInternal() {}
-  union {
-    RollupResponse _instance;
-  };
-};
-
-PROTOBUF_ATTRIBUTE_NO_DESTROY PROTOBUF_CONSTINIT
-    PROTOBUF_ATTRIBUTE_INIT_PRIORITY1 RollupResponseDefaultTypeInternal _RollupResponse_default_instance_;
-      template <typename>
-PROTOBUF_CONSTEXPR HierarchicalTableViewResponse::HierarchicalTableViewResponse(::_pbi::ConstantInitialized) {}
-struct HierarchicalTableViewResponseDefaultTypeInternal {
-  PROTOBUF_CONSTEXPR HierarchicalTableViewResponseDefaultTypeInternal() : _instance(::_pbi::ConstantInitialized{}) {}
-  ~HierarchicalTableViewResponseDefaultTypeInternal() {}
-  union {
-    HierarchicalTableViewResponse _instance;
-  };
-};
-
-PROTOBUF_ATTRIBUTE_NO_DESTROY PROTOBUF_CONSTINIT
-    PROTOBUF_ATTRIBUTE_INIT_PRIORITY1 HierarchicalTableViewResponseDefaultTypeInternal _HierarchicalTableViewResponse_default_instance_;
-
-inline constexpr HierarchicalTableDescriptor::Impl_::Impl_(
-    ::_pbi::ConstantInitialized) noexcept
-      : snapshot_schema_(
-            &::google::protobuf::internal::fixed_address_empty_string,
-            ::_pbi::ConstantInitialized()),
-        is_static_{false},
-        _cached_size_{0} {}
-
-template <typename>
-PROTOBUF_CONSTEXPR HierarchicalTableDescriptor::HierarchicalTableDescriptor(::_pbi::ConstantInitialized)
-    : _impl_(::_pbi::ConstantInitialized()) {}
-struct HierarchicalTableDescriptorDefaultTypeInternal {
-  PROTOBUF_CONSTEXPR HierarchicalTableDescriptorDefaultTypeInternal() : _instance(::_pbi::ConstantInitialized{}) {}
-  ~HierarchicalTableDescriptorDefaultTypeInternal() {}
-  union {
-    HierarchicalTableDescriptor _instance;
-  };
-};
-
-PROTOBUF_ATTRIBUTE_NO_DESTROY PROTOBUF_CONSTINIT
-    PROTOBUF_ATTRIBUTE_INIT_PRIORITY1 HierarchicalTableDescriptorDefaultTypeInternal _HierarchicalTableDescriptor_default_instance_;
-      template <typename>
-PROTOBUF_CONSTEXPR HierarchicalTableApplyResponse::HierarchicalTableApplyResponse(::_pbi::ConstantInitialized) {}
-struct HierarchicalTableApplyResponseDefaultTypeInternal {
-  PROTOBUF_CONSTEXPR HierarchicalTableApplyResponseDefaultTypeInternal() : _instance(::_pbi::ConstantInitialized{}) {}
-  ~HierarchicalTableApplyResponseDefaultTypeInternal() {}
-  union {
-    HierarchicalTableApplyResponse _instance;
-  };
-};
-
-PROTOBUF_ATTRIBUTE_NO_DESTROY PROTOBUF_CONSTINIT
-    PROTOBUF_ATTRIBUTE_INIT_PRIORITY1 HierarchicalTableApplyResponseDefaultTypeInternal _HierarchicalTableApplyResponse_default_instance_;
-
-inline constexpr TreeRequest::Impl_::Impl_(
-    ::_pbi::ConstantInitialized) noexcept
-      : _cached_size_{0},
-        identifier_column_(
-            &::google::protobuf::internal::fixed_address_empty_string,
-            ::_pbi::ConstantInitialized()),
-        parent_identifier_column_(
-            &::google::protobuf::internal::fixed_address_empty_string,
-            ::_pbi::ConstantInitialized()),
-        result_tree_table_id_{nullptr},
-        source_table_id_{nullptr},
-        promote_orphans_{false} {}
-
-template <typename>
-PROTOBUF_CONSTEXPR TreeRequest::TreeRequest(::_pbi::ConstantInitialized)
-    : _impl_(::_pbi::ConstantInitialized()) {}
-struct TreeRequestDefaultTypeInternal {
-  PROTOBUF_CONSTEXPR TreeRequestDefaultTypeInternal() : _instance(::_pbi::ConstantInitialized{}) {}
-  ~TreeRequestDefaultTypeInternal() {}
-  union {
-    TreeRequest _instance;
-  };
-};
-
-PROTOBUF_ATTRIBUTE_NO_DESTROY PROTOBUF_CONSTINIT
-    PROTOBUF_ATTRIBUTE_INIT_PRIORITY1 TreeRequestDefaultTypeInternal _TreeRequest_default_instance_;
-
-inline constexpr HierarchicalTableViewKeyTableDescriptor::Impl_::Impl_(
-    ::_pbi::ConstantInitialized) noexcept
-      : _cached_size_{0},
-        key_table_action_column_(
-            &::google::protobuf::internal::fixed_address_empty_string,
-            ::_pbi::ConstantInitialized()),
-        key_table_id_{nullptr} {}
-
-template <typename>
-PROTOBUF_CONSTEXPR HierarchicalTableViewKeyTableDescriptor::HierarchicalTableViewKeyTableDescriptor(::_pbi::ConstantInitialized)
-    : _impl_(::_pbi::ConstantInitialized()) {}
-struct HierarchicalTableViewKeyTableDescriptorDefaultTypeInternal {
-  PROTOBUF_CONSTEXPR HierarchicalTableViewKeyTableDescriptorDefaultTypeInternal() : _instance(::_pbi::ConstantInitialized{}) {}
-  ~HierarchicalTableViewKeyTableDescriptorDefaultTypeInternal() {}
-  union {
-    HierarchicalTableViewKeyTableDescriptor _instance;
-  };
-};
-
-PROTOBUF_ATTRIBUTE_NO_DESTROY PROTOBUF_CONSTINIT
-    PROTOBUF_ATTRIBUTE_INIT_PRIORITY1 HierarchicalTableViewKeyTableDescriptorDefaultTypeInternal _HierarchicalTableViewKeyTableDescriptor_default_instance_;
-
-inline constexpr HierarchicalTableSourceExportRequest::Impl_::Impl_(
-    ::_pbi::ConstantInitialized) noexcept
-      : _cached_size_{0},
-        result_table_id_{nullptr},
-        hierarchical_table_id_{nullptr} {}
-
-template <typename>
-PROTOBUF_CONSTEXPR HierarchicalTableSourceExportRequest::HierarchicalTableSourceExportRequest(::_pbi::ConstantInitialized)
-    : _impl_(::_pbi::ConstantInitialized()) {}
-struct HierarchicalTableSourceExportRequestDefaultTypeInternal {
-  PROTOBUF_CONSTEXPR HierarchicalTableSourceExportRequestDefaultTypeInternal() : _instance(::_pbi::ConstantInitialized{}) {}
-  ~HierarchicalTableSourceExportRequestDefaultTypeInternal() {}
-  union {
-    HierarchicalTableSourceExportRequest _instance;
-  };
-};
-
-PROTOBUF_ATTRIBUTE_NO_DESTROY PROTOBUF_CONSTINIT
-    PROTOBUF_ATTRIBUTE_INIT_PRIORITY1 HierarchicalTableSourceExportRequestDefaultTypeInternal _HierarchicalTableSourceExportRequest_default_instance_;
-
-inline constexpr HierarchicalTableViewRequest::Impl_::Impl_(
-    ::_pbi::ConstantInitialized) noexcept
-      : _cached_size_{0},
-        result_view_id_{nullptr},
-        expansions_{nullptr},
-        target_{},
-        _oneof_case_{} {}
-
-template <typename>
-PROTOBUF_CONSTEXPR HierarchicalTableViewRequest::HierarchicalTableViewRequest(::_pbi::ConstantInitialized)
-    : _impl_(::_pbi::ConstantInitialized()) {}
-struct HierarchicalTableViewRequestDefaultTypeInternal {
-  PROTOBUF_CONSTEXPR HierarchicalTableViewRequestDefaultTypeInternal() : _instance(::_pbi::ConstantInitialized{}) {}
-  ~HierarchicalTableViewRequestDefaultTypeInternal() {}
-  union {
-    HierarchicalTableViewRequest _instance;
-  };
-};
-
-PROTOBUF_ATTRIBUTE_NO_DESTROY PROTOBUF_CONSTINIT
-    PROTOBUF_ATTRIBUTE_INIT_PRIORITY1 HierarchicalTableViewRequestDefaultTypeInternal _HierarchicalTableViewRequest_default_instance_;
-
-inline constexpr HierarchicalTableApplyRequest::Impl_::Impl_(
-    ::_pbi::ConstantInitialized) noexcept
-      : _cached_size_{0},
-        filters_{},
-        sorts_{},
-        result_hierarchical_table_id_{nullptr},
-        input_hierarchical_table_id_{nullptr} {}
-
-template <typename>
-PROTOBUF_CONSTEXPR HierarchicalTableApplyRequest::HierarchicalTableApplyRequest(::_pbi::ConstantInitialized)
-    : _impl_(::_pbi::ConstantInitialized()) {}
-struct HierarchicalTableApplyRequestDefaultTypeInternal {
-  PROTOBUF_CONSTEXPR HierarchicalTableApplyRequestDefaultTypeInternal() : _instance(::_pbi::ConstantInitialized{}) {}
-  ~HierarchicalTableApplyRequestDefaultTypeInternal() {}
-  union {
-    HierarchicalTableApplyRequest _instance;
-  };
-};
-
-PROTOBUF_ATTRIBUTE_NO_DESTROY PROTOBUF_CONSTINIT
-    PROTOBUF_ATTRIBUTE_INIT_PRIORITY1 HierarchicalTableApplyRequestDefaultTypeInternal _HierarchicalTableApplyRequest_default_instance_;
-
-inline constexpr RollupRequest::Impl_::Impl_(
-    ::_pbi::ConstantInitialized) noexcept
-      : _cached_size_{0},
-        aggregations_{},
-        group_by_columns_{},
-        result_rollup_table_id_{nullptr},
-        source_table_id_{nullptr},
-        include_constituents_{false} {}
-
-template <typename>
-PROTOBUF_CONSTEXPR RollupRequest::RollupRequest(::_pbi::ConstantInitialized)
-    : _impl_(::_pbi::ConstantInitialized()) {}
-struct RollupRequestDefaultTypeInternal {
-  PROTOBUF_CONSTEXPR RollupRequestDefaultTypeInternal() : _instance(::_pbi::ConstantInitialized{}) {}
-  ~RollupRequestDefaultTypeInternal() {}
-  union {
-    RollupRequest _instance;
-  };
-};
-
-PROTOBUF_ATTRIBUTE_NO_DESTROY PROTOBUF_CONSTINIT
-    PROTOBUF_ATTRIBUTE_INIT_PRIORITY1 RollupRequestDefaultTypeInternal _RollupRequest_default_instance_;
-}  // namespace grpc
-}  // namespace backplane
-}  // namespace proto
-}  // namespace deephaven
-}  // namespace io
-static ::_pb::Metadata file_level_metadata_deephaven_2fproto_2fhierarchicaltable_2eproto[11];
-static constexpr const ::_pb::EnumDescriptor**
-    file_level_enum_descriptors_deephaven_2fproto_2fhierarchicaltable_2eproto = nullptr;
-static constexpr const ::_pb::ServiceDescriptor**
-    file_level_service_descriptors_deephaven_2fproto_2fhierarchicaltable_2eproto = nullptr;
-const ::uint32_t TableStruct_deephaven_2fproto_2fhierarchicaltable_2eproto::offsets[] PROTOBUF_SECTION_VARIABLE(
-    protodesc_cold) = {
-    PROTOBUF_FIELD_OFFSET(::io::deephaven::proto::backplane::grpc::RollupRequest, _impl_._has_bits_),
-    PROTOBUF_FIELD_OFFSET(::io::deephaven::proto::backplane::grpc::RollupRequest, _internal_metadata_),
-    ~0u,  // no _extensions_
-    ~0u,  // no _oneof_case_
-    ~0u,  // no _weak_field_map_
-    ~0u,  // no _inlined_string_donated_
-    ~0u,  // no _split_
-    ~0u,  // no sizeof(Split)
-    PROTOBUF_FIELD_OFFSET(::io::deephaven::proto::backplane::grpc::RollupRequest, _impl_.result_rollup_table_id_),
-    PROTOBUF_FIELD_OFFSET(::io::deephaven::proto::backplane::grpc::RollupRequest, _impl_.source_table_id_),
-    PROTOBUF_FIELD_OFFSET(::io::deephaven::proto::backplane::grpc::RollupRequest, _impl_.aggregations_),
-    PROTOBUF_FIELD_OFFSET(::io::deephaven::proto::backplane::grpc::RollupRequest, _impl_.include_constituents_),
-    PROTOBUF_FIELD_OFFSET(::io::deephaven::proto::backplane::grpc::RollupRequest, _impl_.group_by_columns_),
-    0,
-    1,
-    ~0u,
-    ~0u,
-    ~0u,
-    ~0u,  // no _has_bits_
-    PROTOBUF_FIELD_OFFSET(::io::deephaven::proto::backplane::grpc::RollupResponse, _internal_metadata_),
-    ~0u,  // no _extensions_
-    ~0u,  // no _oneof_case_
-    ~0u,  // no _weak_field_map_
-    ~0u,  // no _inlined_string_donated_
-    ~0u,  // no _split_
-    ~0u,  // no sizeof(Split)
-    PROTOBUF_FIELD_OFFSET(::io::deephaven::proto::backplane::grpc::TreeRequest, _impl_._has_bits_),
-    PROTOBUF_FIELD_OFFSET(::io::deephaven::proto::backplane::grpc::TreeRequest, _internal_metadata_),
-    ~0u,  // no _extensions_
-    ~0u,  // no _oneof_case_
-    ~0u,  // no _weak_field_map_
-    ~0u,  // no _inlined_string_donated_
-    ~0u,  // no _split_
-    ~0u,  // no sizeof(Split)
-    PROTOBUF_FIELD_OFFSET(::io::deephaven::proto::backplane::grpc::TreeRequest, _impl_.result_tree_table_id_),
-    PROTOBUF_FIELD_OFFSET(::io::deephaven::proto::backplane::grpc::TreeRequest, _impl_.source_table_id_),
-    PROTOBUF_FIELD_OFFSET(::io::deephaven::proto::backplane::grpc::TreeRequest, _impl_.identifier_column_),
-    PROTOBUF_FIELD_OFFSET(::io::deephaven::proto::backplane::grpc::TreeRequest, _impl_.parent_identifier_column_),
-    PROTOBUF_FIELD_OFFSET(::io::deephaven::proto::backplane::grpc::TreeRequest, _impl_.promote_orphans_),
-    0,
-    1,
-    ~0u,
-    ~0u,
-    ~0u,
-    ~0u,  // no _has_bits_
-    PROTOBUF_FIELD_OFFSET(::io::deephaven::proto::backplane::grpc::TreeResponse, _internal_metadata_),
-    ~0u,  // no _extensions_
-    ~0u,  // no _oneof_case_
-    ~0u,  // no _weak_field_map_
-    ~0u,  // no _inlined_string_donated_
-    ~0u,  // no _split_
-    ~0u,  // no sizeof(Split)
-    PROTOBUF_FIELD_OFFSET(::io::deephaven::proto::backplane::grpc::HierarchicalTableApplyRequest, _impl_._has_bits_),
-    PROTOBUF_FIELD_OFFSET(::io::deephaven::proto::backplane::grpc::HierarchicalTableApplyRequest, _internal_metadata_),
-    ~0u,  // no _extensions_
-    ~0u,  // no _oneof_case_
-    ~0u,  // no _weak_field_map_
-    ~0u,  // no _inlined_string_donated_
-    ~0u,  // no _split_
-    ~0u,  // no sizeof(Split)
-    PROTOBUF_FIELD_OFFSET(::io::deephaven::proto::backplane::grpc::HierarchicalTableApplyRequest, _impl_.result_hierarchical_table_id_),
-    PROTOBUF_FIELD_OFFSET(::io::deephaven::proto::backplane::grpc::HierarchicalTableApplyRequest, _impl_.input_hierarchical_table_id_),
-    PROTOBUF_FIELD_OFFSET(::io::deephaven::proto::backplane::grpc::HierarchicalTableApplyRequest, _impl_.filters_),
-    PROTOBUF_FIELD_OFFSET(::io::deephaven::proto::backplane::grpc::HierarchicalTableApplyRequest, _impl_.sorts_),
-    0,
-    1,
-    ~0u,
-    ~0u,
-    ~0u,  // no _has_bits_
-    PROTOBUF_FIELD_OFFSET(::io::deephaven::proto::backplane::grpc::HierarchicalTableApplyResponse, _internal_metadata_),
-    ~0u,  // no _extensions_
-    ~0u,  // no _oneof_case_
-    ~0u,  // no _weak_field_map_
-    ~0u,  // no _inlined_string_donated_
-    ~0u,  // no _split_
-    ~0u,  // no sizeof(Split)
-    ~0u,  // no _has_bits_
-    PROTOBUF_FIELD_OFFSET(::io::deephaven::proto::backplane::grpc::HierarchicalTableDescriptor, _internal_metadata_),
-    ~0u,  // no _extensions_
-    ~0u,  // no _oneof_case_
-    ~0u,  // no _weak_field_map_
-    ~0u,  // no _inlined_string_donated_
-    ~0u,  // no _split_
-    ~0u,  // no sizeof(Split)
-    PROTOBUF_FIELD_OFFSET(::io::deephaven::proto::backplane::grpc::HierarchicalTableDescriptor, _impl_.snapshot_schema_),
-    PROTOBUF_FIELD_OFFSET(::io::deephaven::proto::backplane::grpc::HierarchicalTableDescriptor, _impl_.is_static_),
-    PROTOBUF_FIELD_OFFSET(::io::deephaven::proto::backplane::grpc::HierarchicalTableViewRequest, _impl_._has_bits_),
-    PROTOBUF_FIELD_OFFSET(::io::deephaven::proto::backplane::grpc::HierarchicalTableViewRequest, _internal_metadata_),
-    ~0u,  // no _extensions_
-    PROTOBUF_FIELD_OFFSET(::io::deephaven::proto::backplane::grpc::HierarchicalTableViewRequest, _impl_._oneof_case_[0]),
-    ~0u,  // no _weak_field_map_
-    ~0u,  // no _inlined_string_donated_
-    ~0u,  // no _split_
-    ~0u,  // no sizeof(Split)
-    PROTOBUF_FIELD_OFFSET(::io::deephaven::proto::backplane::grpc::HierarchicalTableViewRequest, _impl_.result_view_id_),
-    ::_pbi::kInvalidFieldOffsetTag,
-    ::_pbi::kInvalidFieldOffsetTag,
-    PROTOBUF_FIELD_OFFSET(::io::deephaven::proto::backplane::grpc::HierarchicalTableViewRequest, _impl_.expansions_),
-    PROTOBUF_FIELD_OFFSET(::io::deephaven::proto::backplane::grpc::HierarchicalTableViewRequest, _impl_.target_),
-    0,
-    ~0u,
-    ~0u,
-    1,
-    PROTOBUF_FIELD_OFFSET(::io::deephaven::proto::backplane::grpc::HierarchicalTableViewKeyTableDescriptor, _impl_._has_bits_),
-    PROTOBUF_FIELD_OFFSET(::io::deephaven::proto::backplane::grpc::HierarchicalTableViewKeyTableDescriptor, _internal_metadata_),
-    ~0u,  // no _extensions_
-    ~0u,  // no _oneof_case_
-    ~0u,  // no _weak_field_map_
-    ~0u,  // no _inlined_string_donated_
-    ~0u,  // no _split_
-    ~0u,  // no sizeof(Split)
-    PROTOBUF_FIELD_OFFSET(::io::deephaven::proto::backplane::grpc::HierarchicalTableViewKeyTableDescriptor, _impl_.key_table_id_),
-    PROTOBUF_FIELD_OFFSET(::io::deephaven::proto::backplane::grpc::HierarchicalTableViewKeyTableDescriptor, _impl_.key_table_action_column_),
-    1,
-    0,
-    ~0u,  // no _has_bits_
-    PROTOBUF_FIELD_OFFSET(::io::deephaven::proto::backplane::grpc::HierarchicalTableViewResponse, _internal_metadata_),
-    ~0u,  // no _extensions_
-    ~0u,  // no _oneof_case_
-    ~0u,  // no _weak_field_map_
-    ~0u,  // no _inlined_string_donated_
-    ~0u,  // no _split_
-    ~0u,  // no sizeof(Split)
-    PROTOBUF_FIELD_OFFSET(::io::deephaven::proto::backplane::grpc::HierarchicalTableSourceExportRequest, _impl_._has_bits_),
-    PROTOBUF_FIELD_OFFSET(::io::deephaven::proto::backplane::grpc::HierarchicalTableSourceExportRequest, _internal_metadata_),
-    ~0u,  // no _extensions_
-    ~0u,  // no _oneof_case_
-    ~0u,  // no _weak_field_map_
-    ~0u,  // no _inlined_string_donated_
-    ~0u,  // no _split_
-    ~0u,  // no sizeof(Split)
-    PROTOBUF_FIELD_OFFSET(::io::deephaven::proto::backplane::grpc::HierarchicalTableSourceExportRequest, _impl_.result_table_id_),
-    PROTOBUF_FIELD_OFFSET(::io::deephaven::proto::backplane::grpc::HierarchicalTableSourceExportRequest, _impl_.hierarchical_table_id_),
-    0,
-    1,
-};
-
-static const ::_pbi::MigrationSchema
-    schemas[] PROTOBUF_SECTION_VARIABLE(protodesc_cold) = {
-        {0, 13, -1, sizeof(::io::deephaven::proto::backplane::grpc::RollupRequest)},
-        {18, -1, -1, sizeof(::io::deephaven::proto::backplane::grpc::RollupResponse)},
-        {26, 39, -1, sizeof(::io::deephaven::proto::backplane::grpc::TreeRequest)},
-        {44, -1, -1, sizeof(::io::deephaven::proto::backplane::grpc::TreeResponse)},
-        {52, 64, -1, sizeof(::io::deephaven::proto::backplane::grpc::HierarchicalTableApplyRequest)},
-        {68, -1, -1, sizeof(::io::deephaven::proto::backplane::grpc::HierarchicalTableApplyResponse)},
-        {76, -1, -1, sizeof(::io::deephaven::proto::backplane::grpc::HierarchicalTableDescriptor)},
-        {86, 99, -1, sizeof(::io::deephaven::proto::backplane::grpc::HierarchicalTableViewRequest)},
-        {103, 113, -1, sizeof(::io::deephaven::proto::backplane::grpc::HierarchicalTableViewKeyTableDescriptor)},
-        {115, -1, -1, sizeof(::io::deephaven::proto::backplane::grpc::HierarchicalTableViewResponse)},
-        {123, 133, -1, sizeof(::io::deephaven::proto::backplane::grpc::HierarchicalTableSourceExportRequest)},
-};
-
-static const ::_pb::Message* const file_default_instances[] = {
-    &::io::deephaven::proto::backplane::grpc::_RollupRequest_default_instance_._instance,
-    &::io::deephaven::proto::backplane::grpc::_RollupResponse_default_instance_._instance,
-    &::io::deephaven::proto::backplane::grpc::_TreeRequest_default_instance_._instance,
-    &::io::deephaven::proto::backplane::grpc::_TreeResponse_default_instance_._instance,
-    &::io::deephaven::proto::backplane::grpc::_HierarchicalTableApplyRequest_default_instance_._instance,
-    &::io::deephaven::proto::backplane::grpc::_HierarchicalTableApplyResponse_default_instance_._instance,
-    &::io::deephaven::proto::backplane::grpc::_HierarchicalTableDescriptor_default_instance_._instance,
-    &::io::deephaven::proto::backplane::grpc::_HierarchicalTableViewRequest_default_instance_._instance,
-    &::io::deephaven::proto::backplane::grpc::_HierarchicalTableViewKeyTableDescriptor_default_instance_._instance,
-    &::io::deephaven::proto::backplane::grpc::_HierarchicalTableViewResponse_default_instance_._instance,
-    &::io::deephaven::proto::backplane::grpc::_HierarchicalTableSourceExportRequest_default_instance_._instance,
-};
-const char descriptor_table_protodef_deephaven_2fproto_2fhierarchicaltable_2eproto[] PROTOBUF_SECTION_VARIABLE(protodesc_cold) = {
-    "\n\'deephaven/proto/hierarchicaltable.prot"
-    "o\022!io.deephaven.proto.backplane.grpc\032\033de"
-    "ephaven/proto/table.proto\032\034deephaven/pro"
-    "to/ticket.proto\"\234\002\n\rRollupRequest\022I\n\026res"
-    "ult_rollup_table_id\030\001 \001(\0132).io.deephaven"
-    ".proto.backplane.grpc.Ticket\022B\n\017source_t"
-    "able_id\030\002 \001(\0132).io.deephaven.proto.backp"
-    "lane.grpc.Ticket\022D\n\014aggregations\030\003 \003(\0132."
-    ".io.deephaven.proto.backplane.grpc.Aggre"
-    "gation\022\034\n\024include_constituents\030\004 \001(\010\022\030\n\020"
-    "group_by_columns\030\005 \003(\t\"\020\n\016RollupResponse"
-    "\"\360\001\n\013TreeRequest\022G\n\024result_tree_table_id"
-    "\030\001 \001(\0132).io.deephaven.proto.backplane.gr"
-    "pc.Ticket\022B\n\017source_table_id\030\002 \001(\0132).io."
-    "deephaven.proto.backplane.grpc.Ticket\022\031\n"
-    "\021identifier_column\030\003 \001(\t\022 \n\030parent_ident"
-    "ifier_column\030\004 \001(\t\022\027\n\017promote_orphans\030\005 "
-    "\001(\010\"\016\n\014TreeResponse\"\301\002\n\035HierarchicalTabl"
-    "eApplyRequest\022O\n\034result_hierarchical_tab"
-    "le_id\030\001 \001(\0132).io.deephaven.proto.backpla"
-    "ne.grpc.Ticket\022N\n\033input_hierarchical_tab"
-    "le_id\030\002 \001(\0132).io.deephaven.proto.backpla"
-    "ne.grpc.Ticket\022=\n\007filters\030\003 \003(\0132,.io.dee"
-    "phaven.proto.backplane.grpc.Condition\022@\n"
-    "\005sorts\030\004 \003(\01321.io.deephaven.proto.backpl"
-    "ane.grpc.SortDescriptor\" \n\036HierarchicalT"
-    "ableApplyResponse\"I\n\033HierarchicalTableDe"
-    "scriptor\022\027\n\017snapshot_schema\030\001 \001(\014\022\021\n\tis_"
-    "static\030\002 \001(\010\"\336\002\n\034HierarchicalTableViewRe"
-    "quest\022A\n\016result_view_id\030\001 \001(\0132).io.deeph"
-    "aven.proto.backplane.grpc.Ticket\022J\n\025hier"
-    "archical_table_id\030\002 \001(\0132).io.deephaven.p"
-    "roto.backplane.grpc.TicketH\000\022E\n\020existing"
-    "_view_id\030\003 \001(\0132).io.deephaven.proto.back"
-    "plane.grpc.TicketH\000\022^\n\nexpansions\030\004 \001(\0132"
-    "J.io.deephaven.proto.backplane.grpc.Hier"
-    "archicalTableViewKeyTableDescriptorB\010\n\006t"
-    "arget\"\254\001\n\'HierarchicalTableViewKeyTableD"
-    "escriptor\022\?\n\014key_table_id\030\001 \001(\0132).io.dee"
-    "phaven.proto.backplane.grpc.Ticket\022$\n\027ke"
-    "y_table_action_column\030\002 \001(\tH\000\210\001\001B\032\n\030_key"
-    "_table_action_column\"\037\n\035HierarchicalTabl"
-    "eViewResponse\"\264\001\n$HierarchicalTableSourc"
-    "eExportRequest\022B\n\017result_table_id\030\001 \001(\0132"
-    ").io.deephaven.proto.backplane.grpc.Tick"
-    "et\022H\n\025hierarchical_table_id\030\002 \001(\0132).io.d"
-    "eephaven.proto.backplane.grpc.Ticket2\251\005\n"
-    "\030HierarchicalTableService\022m\n\006Rollup\0220.io"
-    ".deephaven.proto.backplane.grpc.RollupRe"
-    "quest\0321.io.deephaven.proto.backplane.grp"
-    "c.RollupResponse\022g\n\004Tree\022..io.deephaven."
-    "proto.backplane.grpc.TreeRequest\032/.io.de"
-    "ephaven.proto.backplane.grpc.TreeRespons"
-    "e\022\214\001\n\005Apply\022@.io.deephaven.proto.backpla"
-    "ne.grpc.HierarchicalTableApplyRequest\032A."
-    "io.deephaven.proto.backplane.grpc.Hierar"
-    "chicalTableApplyResponse\022\211\001\n\004View\022\?.io.d"
-    "eephaven.proto.backplane.grpc.Hierarchic"
-    "alTableViewRequest\032@.io.deephaven.proto."
-    "backplane.grpc.HierarchicalTableViewResp"
-    "onse\022\231\001\n\014ExportSource\022G.io.deephaven.pro"
-    "to.backplane.grpc.HierarchicalTableSourc"
-    "eExportRequest\032@.io.deephaven.proto.back"
-    "plane.grpc.ExportedTableCreationResponse"
-    "BMH\001P\001ZGgithub.com/deephaven/deephaven-c"
-    "ore/go/internal/proto/hierarchicaltableb"
-    "\006proto3"
-};
-static const ::_pbi::DescriptorTable* const descriptor_table_deephaven_2fproto_2fhierarchicaltable_2eproto_deps[2] =
-    {
-        &::descriptor_table_deephaven_2fproto_2ftable_2eproto,
-        &::descriptor_table_deephaven_2fproto_2fticket_2eproto,
-};
-static ::absl::once_flag descriptor_table_deephaven_2fproto_2fhierarchicaltable_2eproto_once;
-const ::_pbi::DescriptorTable descriptor_table_deephaven_2fproto_2fhierarchicaltable_2eproto = {
-    false,
-    false,
-    2647,
-    descriptor_table_protodef_deephaven_2fproto_2fhierarchicaltable_2eproto,
-    "deephaven/proto/hierarchicaltable.proto",
-    &descriptor_table_deephaven_2fproto_2fhierarchicaltable_2eproto_once,
-    descriptor_table_deephaven_2fproto_2fhierarchicaltable_2eproto_deps,
-    2,
-    11,
-    schemas,
-    file_default_instances,
-    TableStruct_deephaven_2fproto_2fhierarchicaltable_2eproto::offsets,
-    file_level_metadata_deephaven_2fproto_2fhierarchicaltable_2eproto,
-    file_level_enum_descriptors_deephaven_2fproto_2fhierarchicaltable_2eproto,
-    file_level_service_descriptors_deephaven_2fproto_2fhierarchicaltable_2eproto,
-};
-
-// This function exists to be marked as weak.
-// It can significantly speed up compilation by breaking up LLVM's SCC
-// in the .pb.cc translation units. Large translation units see a
-// reduction of more than 35% of walltime for optimized builds. Without
-// the weak attribute all the messages in the file, including all the
-// vtables and everything they use become part of the same SCC through
-// a cycle like:
-// GetMetadata -> descriptor table -> default instances ->
-//   vtables -> GetMetadata
-// By adding a weak function here we break the connection from the
-// individual vtables back into the descriptor table.
-PROTOBUF_ATTRIBUTE_WEAK const ::_pbi::DescriptorTable* descriptor_table_deephaven_2fproto_2fhierarchicaltable_2eproto_getter() {
-  return &descriptor_table_deephaven_2fproto_2fhierarchicaltable_2eproto;
-}
-// Force running AddDescriptors() at dynamic initialization time.
-PROTOBUF_ATTRIBUTE_INIT_PRIORITY2
-static ::_pbi::AddDescriptorsRunner dynamic_init_dummy_deephaven_2fproto_2fhierarchicaltable_2eproto(&descriptor_table_deephaven_2fproto_2fhierarchicaltable_2eproto);
-namespace io {
-namespace deephaven {
-namespace proto {
-namespace backplane {
-namespace grpc {
-// ===================================================================
-
-class RollupRequest::_Internal {
- public:
-  using HasBits = decltype(std::declval<RollupRequest>()._impl_._has_bits_);
-  static constexpr ::int32_t kHasBitsOffset =
-    8 * PROTOBUF_FIELD_OFFSET(RollupRequest, _impl_._has_bits_);
-  static const ::io::deephaven::proto::backplane::grpc::Ticket& result_rollup_table_id(const RollupRequest* msg);
-  static void set_has_result_rollup_table_id(HasBits* has_bits) {
-    (*has_bits)[0] |= 1u;
-  }
-  static const ::io::deephaven::proto::backplane::grpc::Ticket& source_table_id(const RollupRequest* msg);
-  static void set_has_source_table_id(HasBits* has_bits) {
-    (*has_bits)[0] |= 2u;
-  }
-};
-
-const ::io::deephaven::proto::backplane::grpc::Ticket& RollupRequest::_Internal::result_rollup_table_id(const RollupRequest* msg) {
-  return *msg->_impl_.result_rollup_table_id_;
-}
-const ::io::deephaven::proto::backplane::grpc::Ticket& RollupRequest::_Internal::source_table_id(const RollupRequest* msg) {
-  return *msg->_impl_.source_table_id_;
-}
-void RollupRequest::clear_result_rollup_table_id() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  if (_impl_.result_rollup_table_id_ != nullptr) _impl_.result_rollup_table_id_->Clear();
-  _impl_._has_bits_[0] &= ~0x00000001u;
-}
-void RollupRequest::clear_source_table_id() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  if (_impl_.source_table_id_ != nullptr) _impl_.source_table_id_->Clear();
-  _impl_._has_bits_[0] &= ~0x00000002u;
-}
-void RollupRequest::clear_aggregations() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  _impl_.aggregations_.Clear();
-}
-RollupRequest::RollupRequest(::google::protobuf::Arena* arena)
-    : ::google::protobuf::Message(arena) {
-  SharedCtor(arena);
-  // @@protoc_insertion_point(arena_constructor:io.deephaven.proto.backplane.grpc.RollupRequest)
-}
-inline PROTOBUF_NDEBUG_INLINE RollupRequest::Impl_::Impl_(
-    ::google::protobuf::internal::InternalVisibility visibility, ::google::protobuf::Arena* arena,
-    const Impl_& from)
-      : _has_bits_{from._has_bits_},
-        _cached_size_{0},
-        aggregations_{visibility, arena, from.aggregations_},
-        group_by_columns_{visibility, arena, from.group_by_columns_} {}
-
-RollupRequest::RollupRequest(
-    ::google::protobuf::Arena* arena,
-    const RollupRequest& from)
-    : ::google::protobuf::Message(arena) {
-  RollupRequest* const _this = this;
-  (void)_this;
-  _internal_metadata_.MergeFrom<::google::protobuf::UnknownFieldSet>(
-      from._internal_metadata_);
-  new (&_impl_) Impl_(internal_visibility(), arena, from._impl_);
-  ::uint32_t cached_has_bits = _impl_._has_bits_[0];
-  _impl_.result_rollup_table_id_ = (cached_has_bits & 0x00000001u)
-                ? CreateMaybeMessage<::io::deephaven::proto::backplane::grpc::Ticket>(arena, *from._impl_.result_rollup_table_id_)
-                : nullptr;
-  _impl_.source_table_id_ = (cached_has_bits & 0x00000002u)
-                ? CreateMaybeMessage<::io::deephaven::proto::backplane::grpc::Ticket>(arena, *from._impl_.source_table_id_)
-                : nullptr;
-  _impl_.include_constituents_ = from._impl_.include_constituents_;
-
-  // @@protoc_insertion_point(copy_constructor:io.deephaven.proto.backplane.grpc.RollupRequest)
-}
-inline PROTOBUF_NDEBUG_INLINE RollupRequest::Impl_::Impl_(
-    ::google::protobuf::internal::InternalVisibility visibility,
-    ::google::protobuf::Arena* arena)
-      : _cached_size_{0},
-        aggregations_{visibility, arena},
-        group_by_columns_{visibility, arena} {}
-
-inline void RollupRequest::SharedCtor(::_pb::Arena* arena) {
-  new (&_impl_) Impl_(internal_visibility(), arena);
-  ::memset(reinterpret_cast<char *>(&_impl_) +
-               offsetof(Impl_, result_rollup_table_id_),
-           0,
-           offsetof(Impl_, include_constituents_) -
-               offsetof(Impl_, result_rollup_table_id_) +
-               sizeof(Impl_::include_constituents_));
-}
-RollupRequest::~RollupRequest() {
-  // @@protoc_insertion_point(destructor:io.deephaven.proto.backplane.grpc.RollupRequest)
-  _internal_metadata_.Delete<::google::protobuf::UnknownFieldSet>();
-  SharedDtor();
-}
-inline void RollupRequest::SharedDtor() {
-  ABSL_DCHECK(GetArena() == nullptr);
-  delete _impl_.result_rollup_table_id_;
-  delete _impl_.source_table_id_;
-  _impl_.~Impl_();
-}
-
-PROTOBUF_NOINLINE void RollupRequest::Clear() {
-// @@protoc_insertion_point(message_clear_start:io.deephaven.proto.backplane.grpc.RollupRequest)
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  ::uint32_t cached_has_bits = 0;
-  // Prevent compiler warnings about cached_has_bits being unused
-  (void) cached_has_bits;
-
-  _impl_.aggregations_.Clear();
-  _impl_.group_by_columns_.Clear();
-  cached_has_bits = _impl_._has_bits_[0];
-  if (cached_has_bits & 0x00000003u) {
-    if (cached_has_bits & 0x00000001u) {
-      ABSL_DCHECK(_impl_.result_rollup_table_id_ != nullptr);
-      _impl_.result_rollup_table_id_->Clear();
-    }
-    if (cached_has_bits & 0x00000002u) {
-      ABSL_DCHECK(_impl_.source_table_id_ != nullptr);
-      _impl_.source_table_id_->Clear();
-    }
-  }
-  _impl_.include_constituents_ = false;
-  _impl_._has_bits_.Clear();
-  _internal_metadata_.Clear<::google::protobuf::UnknownFieldSet>();
-}
-
-const char* RollupRequest::_InternalParse(
-    const char* ptr, ::_pbi::ParseContext* ctx) {
-  ptr = ::_pbi::TcParser::ParseLoop(this, ptr, ctx, &_table_.header);
-  return ptr;
-}
-
-
-PROTOBUF_CONSTINIT PROTOBUF_ATTRIBUTE_INIT_PRIORITY1
-const ::_pbi::TcParseTable<3, 5, 3, 72, 2> RollupRequest::_table_ = {
-  {
-    PROTOBUF_FIELD_OFFSET(RollupRequest, _impl_._has_bits_),
-    0, // no _extensions_
-    5, 56,  // max_field_number, fast_idx_mask
-    offsetof(decltype(_table_), field_lookup_table),
-    4294967264,  // skipmap
-    offsetof(decltype(_table_), field_entries),
-    5,  // num_field_entries
-    3,  // num_aux_entries
-    offsetof(decltype(_table_), aux_entries),
-    &_RollupRequest_default_instance_._instance,
-    ::_pbi::TcParser::GenericFallback,  // fallback
-  }, {{
-    {::_pbi::TcParser::MiniParse, {}},
-    // .io.deephaven.proto.backplane.grpc.Ticket result_rollup_table_id = 1;
-    {::_pbi::TcParser::FastMtS1,
-     {10, 0, 0, PROTOBUF_FIELD_OFFSET(RollupRequest, _impl_.result_rollup_table_id_)}},
-    // .io.deephaven.proto.backplane.grpc.Ticket source_table_id = 2;
-    {::_pbi::TcParser::FastMtS1,
-     {18, 1, 1, PROTOBUF_FIELD_OFFSET(RollupRequest, _impl_.source_table_id_)}},
-    // repeated .io.deephaven.proto.backplane.grpc.Aggregation aggregations = 3;
-    {::_pbi::TcParser::FastMtR1,
-     {26, 63, 2, PROTOBUF_FIELD_OFFSET(RollupRequest, _impl_.aggregations_)}},
-    // bool include_constituents = 4;
-    {::_pbi::TcParser::SingularVarintNoZag1<bool, offsetof(RollupRequest, _impl_.include_constituents_), 63>(),
-     {32, 63, 0, PROTOBUF_FIELD_OFFSET(RollupRequest, _impl_.include_constituents_)}},
-    // repeated string group_by_columns = 5;
-    {::_pbi::TcParser::FastUR1,
-     {42, 63, 0, PROTOBUF_FIELD_OFFSET(RollupRequest, _impl_.group_by_columns_)}},
-    {::_pbi::TcParser::MiniParse, {}},
-    {::_pbi::TcParser::MiniParse, {}},
-  }}, {{
-    65535, 65535
-  }}, {{
-    // .io.deephaven.proto.backplane.grpc.Ticket result_rollup_table_id = 1;
-    {PROTOBUF_FIELD_OFFSET(RollupRequest, _impl_.result_rollup_table_id_), _Internal::kHasBitsOffset + 0, 0,
-    (0 | ::_fl::kFcOptional | ::_fl::kMessage | ::_fl::kTvTable)},
-    // .io.deephaven.proto.backplane.grpc.Ticket source_table_id = 2;
-    {PROTOBUF_FIELD_OFFSET(RollupRequest, _impl_.source_table_id_), _Internal::kHasBitsOffset + 1, 1,
-    (0 | ::_fl::kFcOptional | ::_fl::kMessage | ::_fl::kTvTable)},
-    // repeated .io.deephaven.proto.backplane.grpc.Aggregation aggregations = 3;
-    {PROTOBUF_FIELD_OFFSET(RollupRequest, _impl_.aggregations_), -1, 2,
-    (0 | ::_fl::kFcRepeated | ::_fl::kMessage | ::_fl::kTvTable)},
-    // bool include_constituents = 4;
-    {PROTOBUF_FIELD_OFFSET(RollupRequest, _impl_.include_constituents_), -1, 0,
-    (0 | ::_fl::kFcSingular | ::_fl::kBool)},
-    // repeated string group_by_columns = 5;
-    {PROTOBUF_FIELD_OFFSET(RollupRequest, _impl_.group_by_columns_), -1, 0,
-    (0 | ::_fl::kFcRepeated | ::_fl::kUtf8String | ::_fl::kRepSString)},
-  }}, {{
-    {::_pbi::TcParser::GetTable<::io::deephaven::proto::backplane::grpc::Ticket>()},
-    {::_pbi::TcParser::GetTable<::io::deephaven::proto::backplane::grpc::Ticket>()},
-    {::_pbi::TcParser::GetTable<::io::deephaven::proto::backplane::grpc::Aggregation>()},
-  }}, {{
-    "\57\0\0\0\0\20\0\0"
-    "io.deephaven.proto.backplane.grpc.RollupRequest"
-    "group_by_columns"
-  }},
-};
-
-::uint8_t* RollupRequest::_InternalSerialize(
-    ::uint8_t* target,
-    ::google::protobuf::io::EpsCopyOutputStream* stream) const {
-  // @@protoc_insertion_point(serialize_to_array_start:io.deephaven.proto.backplane.grpc.RollupRequest)
-  ::uint32_t cached_has_bits = 0;
-  (void)cached_has_bits;
-
-  cached_has_bits = _impl_._has_bits_[0];
-  // .io.deephaven.proto.backplane.grpc.Ticket result_rollup_table_id = 1;
-  if (cached_has_bits & 0x00000001u) {
-    target = ::google::protobuf::internal::WireFormatLite::InternalWriteMessage(
-        1, _Internal::result_rollup_table_id(this),
-        _Internal::result_rollup_table_id(this).GetCachedSize(), target, stream);
-  }
-
-  // .io.deephaven.proto.backplane.grpc.Ticket source_table_id = 2;
-  if (cached_has_bits & 0x00000002u) {
-    target = ::google::protobuf::internal::WireFormatLite::InternalWriteMessage(
-        2, _Internal::source_table_id(this),
-        _Internal::source_table_id(this).GetCachedSize(), target, stream);
-  }
-
-  // repeated .io.deephaven.proto.backplane.grpc.Aggregation aggregations = 3;
-  for (unsigned i = 0,
-      n = static_cast<unsigned>(this->_internal_aggregations_size()); i < n; i++) {
-    const auto& repfield = this->_internal_aggregations().Get(i);
-    target = ::google::protobuf::internal::WireFormatLite::
-        InternalWriteMessage(3, repfield, repfield.GetCachedSize(), target, stream);
-  }
-
-  // bool include_constituents = 4;
-  if (this->_internal_include_constituents() != 0) {
-    target = stream->EnsureSpace(target);
-    target = ::_pbi::WireFormatLite::WriteBoolToArray(
-        4, this->_internal_include_constituents(), target);
-  }
-
-  // repeated string group_by_columns = 5;
-  for (int i = 0, n = this->_internal_group_by_columns_size(); i < n; ++i) {
-    const auto& s = this->_internal_group_by_columns().Get(i);
-    ::google::protobuf::internal::WireFormatLite::VerifyUtf8String(
-        s.data(), static_cast<int>(s.length()), ::google::protobuf::internal::WireFormatLite::SERIALIZE, "io.deephaven.proto.backplane.grpc.RollupRequest.group_by_columns");
-    target = stream->WriteString(5, s, target);
-  }
-
-  if (PROTOBUF_PREDICT_FALSE(_internal_metadata_.have_unknown_fields())) {
-    target =
-        ::_pbi::WireFormat::InternalSerializeUnknownFieldsToArray(
-            _internal_metadata_.unknown_fields<::google::protobuf::UnknownFieldSet>(::google::protobuf::UnknownFieldSet::default_instance), target, stream);
-  }
-  // @@protoc_insertion_point(serialize_to_array_end:io.deephaven.proto.backplane.grpc.RollupRequest)
-  return target;
-}
-
-::size_t RollupRequest::ByteSizeLong() const {
-// @@protoc_insertion_point(message_byte_size_start:io.deephaven.proto.backplane.grpc.RollupRequest)
-  ::size_t total_size = 0;
-
-  ::uint32_t cached_has_bits = 0;
-  // Prevent compiler warnings about cached_has_bits being unused
-  (void) cached_has_bits;
-
-  // repeated .io.deephaven.proto.backplane.grpc.Aggregation aggregations = 3;
-  total_size += 1UL * this->_internal_aggregations_size();
-  for (const auto& msg : this->_internal_aggregations()) {
-    total_size +=
-      ::google::protobuf::internal::WireFormatLite::MessageSize(msg);
-  }
-  // repeated string group_by_columns = 5;
-  total_size += 1 * ::google::protobuf::internal::FromIntSize(_internal_group_by_columns().size());
-  for (int i = 0, n = _internal_group_by_columns().size(); i < n; ++i) {
-    total_size += ::google::protobuf::internal::WireFormatLite::StringSize(
-        _internal_group_by_columns().Get(i));
-  }
-  cached_has_bits = _impl_._has_bits_[0];
-  if (cached_has_bits & 0x00000003u) {
-    // .io.deephaven.proto.backplane.grpc.Ticket result_rollup_table_id = 1;
-    if (cached_has_bits & 0x00000001u) {
-      total_size +=
-          1 + ::google::protobuf::internal::WireFormatLite::MessageSize(*_impl_.result_rollup_table_id_);
-    }
-
-    // .io.deephaven.proto.backplane.grpc.Ticket source_table_id = 2;
-    if (cached_has_bits & 0x00000002u) {
-      total_size +=
-          1 + ::google::protobuf::internal::WireFormatLite::MessageSize(*_impl_.source_table_id_);
-    }
-
-  }
-  // bool include_constituents = 4;
-  if (this->_internal_include_constituents() != 0) {
-    total_size += 2;
-  }
-
-  return MaybeComputeUnknownFieldsSize(total_size, &_impl_._cached_size_);
-}
-
-const ::google::protobuf::Message::ClassData RollupRequest::_class_data_ = {
-    RollupRequest::MergeImpl,
-    nullptr,  // OnDemandRegisterArenaDtor
-};
-const ::google::protobuf::Message::ClassData* RollupRequest::GetClassData() const {
-  return &_class_data_;
-}
-
-void RollupRequest::MergeImpl(::google::protobuf::Message& to_msg, const ::google::protobuf::Message& from_msg) {
-  auto* const _this = static_cast<RollupRequest*>(&to_msg);
-  auto& from = static_cast<const RollupRequest&>(from_msg);
-  // @@protoc_insertion_point(class_specific_merge_from_start:io.deephaven.proto.backplane.grpc.RollupRequest)
-  ABSL_DCHECK_NE(&from, _this);
-  ::uint32_t cached_has_bits = 0;
-  (void) cached_has_bits;
-
-  _this->_internal_mutable_aggregations()->MergeFrom(
-      from._internal_aggregations());
-  _this->_internal_mutable_group_by_columns()->MergeFrom(from._internal_group_by_columns());
-  cached_has_bits = from._impl_._has_bits_[0];
-  if (cached_has_bits & 0x00000003u) {
-    if (cached_has_bits & 0x00000001u) {
-      _this->_internal_mutable_result_rollup_table_id()->::io::deephaven::proto::backplane::grpc::Ticket::MergeFrom(
-          from._internal_result_rollup_table_id());
-    }
-    if (cached_has_bits & 0x00000002u) {
-      _this->_internal_mutable_source_table_id()->::io::deephaven::proto::backplane::grpc::Ticket::MergeFrom(
-          from._internal_source_table_id());
-    }
-  }
-  if (from._internal_include_constituents() != 0) {
-    _this->_internal_set_include_constituents(from._internal_include_constituents());
-  }
-  _this->_internal_metadata_.MergeFrom<::google::protobuf::UnknownFieldSet>(from._internal_metadata_);
-}
-
-void RollupRequest::CopyFrom(const RollupRequest& from) {
-// @@protoc_insertion_point(class_specific_copy_from_start:io.deephaven.proto.backplane.grpc.RollupRequest)
-  if (&from == this) return;
-  Clear();
-  MergeFrom(from);
-}
-
-PROTOBUF_NOINLINE bool RollupRequest::IsInitialized() const {
-  return true;
-}
-
-::_pbi::CachedSize* RollupRequest::AccessCachedSize() const {
-  return &_impl_._cached_size_;
-}
-void RollupRequest::InternalSwap(RollupRequest* PROTOBUF_RESTRICT other) {
-  using std::swap;
-  _internal_metadata_.InternalSwap(&other->_internal_metadata_);
-  swap(_impl_._has_bits_[0], other->_impl_._has_bits_[0]);
-  _impl_.aggregations_.InternalSwap(&other->_impl_.aggregations_);
-  _impl_.group_by_columns_.InternalSwap(&other->_impl_.group_by_columns_);
-  ::google::protobuf::internal::memswap<
-      PROTOBUF_FIELD_OFFSET(RollupRequest, _impl_.include_constituents_)
-      + sizeof(RollupRequest::_impl_.include_constituents_)
-      - PROTOBUF_FIELD_OFFSET(RollupRequest, _impl_.result_rollup_table_id_)>(
-          reinterpret_cast<char*>(&_impl_.result_rollup_table_id_),
-          reinterpret_cast<char*>(&other->_impl_.result_rollup_table_id_));
-}
-
-::google::protobuf::Metadata RollupRequest::GetMetadata() const {
-  return ::_pbi::AssignDescriptors(
-      &descriptor_table_deephaven_2fproto_2fhierarchicaltable_2eproto_getter, &descriptor_table_deephaven_2fproto_2fhierarchicaltable_2eproto_once,
-      file_level_metadata_deephaven_2fproto_2fhierarchicaltable_2eproto[0]);
-}
-// ===================================================================
-
-class RollupResponse::_Internal {
- public:
-};
-
-RollupResponse::RollupResponse(::google::protobuf::Arena* arena)
-    : ::google::protobuf::internal::ZeroFieldsBase(arena) {
-  // @@protoc_insertion_point(arena_constructor:io.deephaven.proto.backplane.grpc.RollupResponse)
-}
-RollupResponse::RollupResponse(
-    ::google::protobuf::Arena* arena,
-    const RollupResponse& from)
-    : ::google::protobuf::internal::ZeroFieldsBase(arena) {
-  RollupResponse* const _this = this;
-  (void)_this;
-  _internal_metadata_.MergeFrom<::google::protobuf::UnknownFieldSet>(
-      from._internal_metadata_);
-
-  // @@protoc_insertion_point(copy_constructor:io.deephaven.proto.backplane.grpc.RollupResponse)
-}
-
-
-
-
-
-
-
-
-
-::google::protobuf::Metadata RollupResponse::GetMetadata() const {
-  return ::_pbi::AssignDescriptors(
-      &descriptor_table_deephaven_2fproto_2fhierarchicaltable_2eproto_getter, &descriptor_table_deephaven_2fproto_2fhierarchicaltable_2eproto_once,
-      file_level_metadata_deephaven_2fproto_2fhierarchicaltable_2eproto[1]);
-}
-// ===================================================================
-
-class TreeRequest::_Internal {
- public:
-  using HasBits = decltype(std::declval<TreeRequest>()._impl_._has_bits_);
-  static constexpr ::int32_t kHasBitsOffset =
-    8 * PROTOBUF_FIELD_OFFSET(TreeRequest, _impl_._has_bits_);
-  static const ::io::deephaven::proto::backplane::grpc::Ticket& result_tree_table_id(const TreeRequest* msg);
-  static void set_has_result_tree_table_id(HasBits* has_bits) {
-    (*has_bits)[0] |= 1u;
-  }
-  static const ::io::deephaven::proto::backplane::grpc::Ticket& source_table_id(const TreeRequest* msg);
-  static void set_has_source_table_id(HasBits* has_bits) {
-    (*has_bits)[0] |= 2u;
-  }
-};
-
-const ::io::deephaven::proto::backplane::grpc::Ticket& TreeRequest::_Internal::result_tree_table_id(const TreeRequest* msg) {
-  return *msg->_impl_.result_tree_table_id_;
-}
-const ::io::deephaven::proto::backplane::grpc::Ticket& TreeRequest::_Internal::source_table_id(const TreeRequest* msg) {
-  return *msg->_impl_.source_table_id_;
-}
-void TreeRequest::clear_result_tree_table_id() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  if (_impl_.result_tree_table_id_ != nullptr) _impl_.result_tree_table_id_->Clear();
-  _impl_._has_bits_[0] &= ~0x00000001u;
-}
-void TreeRequest::clear_source_table_id() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  if (_impl_.source_table_id_ != nullptr) _impl_.source_table_id_->Clear();
-  _impl_._has_bits_[0] &= ~0x00000002u;
-}
-TreeRequest::TreeRequest(::google::protobuf::Arena* arena)
-    : ::google::protobuf::Message(arena) {
-  SharedCtor(arena);
-  // @@protoc_insertion_point(arena_constructor:io.deephaven.proto.backplane.grpc.TreeRequest)
-}
-inline PROTOBUF_NDEBUG_INLINE TreeRequest::Impl_::Impl_(
-    ::google::protobuf::internal::InternalVisibility visibility, ::google::protobuf::Arena* arena,
-    const Impl_& from)
-      : _has_bits_{from._has_bits_},
-        _cached_size_{0},
-        identifier_column_(arena, from.identifier_column_),
-        parent_identifier_column_(arena, from.parent_identifier_column_) {}
-
-TreeRequest::TreeRequest(
-    ::google::protobuf::Arena* arena,
-    const TreeRequest& from)
-    : ::google::protobuf::Message(arena) {
-  TreeRequest* const _this = this;
-  (void)_this;
-  _internal_metadata_.MergeFrom<::google::protobuf::UnknownFieldSet>(
-      from._internal_metadata_);
-  new (&_impl_) Impl_(internal_visibility(), arena, from._impl_);
-  ::uint32_t cached_has_bits = _impl_._has_bits_[0];
-  _impl_.result_tree_table_id_ = (cached_has_bits & 0x00000001u)
-                ? CreateMaybeMessage<::io::deephaven::proto::backplane::grpc::Ticket>(arena, *from._impl_.result_tree_table_id_)
-                : nullptr;
-  _impl_.source_table_id_ = (cached_has_bits & 0x00000002u)
-                ? CreateMaybeMessage<::io::deephaven::proto::backplane::grpc::Ticket>(arena, *from._impl_.source_table_id_)
-                : nullptr;
-  _impl_.promote_orphans_ = from._impl_.promote_orphans_;
-
-  // @@protoc_insertion_point(copy_constructor:io.deephaven.proto.backplane.grpc.TreeRequest)
-}
-inline PROTOBUF_NDEBUG_INLINE TreeRequest::Impl_::Impl_(
-    ::google::protobuf::internal::InternalVisibility visibility,
-    ::google::protobuf::Arena* arena)
-      : _cached_size_{0},
-        identifier_column_(arena),
-        parent_identifier_column_(arena) {}
-
-inline void TreeRequest::SharedCtor(::_pb::Arena* arena) {
-  new (&_impl_) Impl_(internal_visibility(), arena);
-  ::memset(reinterpret_cast<char *>(&_impl_) +
-               offsetof(Impl_, result_tree_table_id_),
-           0,
-           offsetof(Impl_, promote_orphans_) -
-               offsetof(Impl_, result_tree_table_id_) +
-               sizeof(Impl_::promote_orphans_));
-}
-TreeRequest::~TreeRequest() {
-  // @@protoc_insertion_point(destructor:io.deephaven.proto.backplane.grpc.TreeRequest)
-  _internal_metadata_.Delete<::google::protobuf::UnknownFieldSet>();
-  SharedDtor();
-}
-inline void TreeRequest::SharedDtor() {
-  ABSL_DCHECK(GetArena() == nullptr);
-  _impl_.identifier_column_.Destroy();
-  _impl_.parent_identifier_column_.Destroy();
-  delete _impl_.result_tree_table_id_;
-  delete _impl_.source_table_id_;
-  _impl_.~Impl_();
-}
-
-PROTOBUF_NOINLINE void TreeRequest::Clear() {
-// @@protoc_insertion_point(message_clear_start:io.deephaven.proto.backplane.grpc.TreeRequest)
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  ::uint32_t cached_has_bits = 0;
-  // Prevent compiler warnings about cached_has_bits being unused
-  (void) cached_has_bits;
-
-  _impl_.identifier_column_.ClearToEmpty();
-  _impl_.parent_identifier_column_.ClearToEmpty();
-  cached_has_bits = _impl_._has_bits_[0];
-  if (cached_has_bits & 0x00000003u) {
-    if (cached_has_bits & 0x00000001u) {
-      ABSL_DCHECK(_impl_.result_tree_table_id_ != nullptr);
-      _impl_.result_tree_table_id_->Clear();
-    }
-    if (cached_has_bits & 0x00000002u) {
-      ABSL_DCHECK(_impl_.source_table_id_ != nullptr);
-      _impl_.source_table_id_->Clear();
-    }
-  }
-  _impl_.promote_orphans_ = false;
-  _impl_._has_bits_.Clear();
-  _internal_metadata_.Clear<::google::protobuf::UnknownFieldSet>();
-}
-
-const char* TreeRequest::_InternalParse(
-    const char* ptr, ::_pbi::ParseContext* ctx) {
-  ptr = ::_pbi::TcParser::ParseLoop(this, ptr, ctx, &_table_.header);
-  return ptr;
-}
-
-
-PROTOBUF_CONSTINIT PROTOBUF_ATTRIBUTE_INIT_PRIORITY1
-const ::_pbi::TcParseTable<3, 5, 2, 95, 2> TreeRequest::_table_ = {
-  {
-    PROTOBUF_FIELD_OFFSET(TreeRequest, _impl_._has_bits_),
-    0, // no _extensions_
-    5, 56,  // max_field_number, fast_idx_mask
-    offsetof(decltype(_table_), field_lookup_table),
-    4294967264,  // skipmap
-    offsetof(decltype(_table_), field_entries),
-    5,  // num_field_entries
-    2,  // num_aux_entries
-    offsetof(decltype(_table_), aux_entries),
-    &_TreeRequest_default_instance_._instance,
-    ::_pbi::TcParser::GenericFallback,  // fallback
-  }, {{
-    {::_pbi::TcParser::MiniParse, {}},
-    // .io.deephaven.proto.backplane.grpc.Ticket result_tree_table_id = 1;
-    {::_pbi::TcParser::FastMtS1,
-     {10, 0, 0, PROTOBUF_FIELD_OFFSET(TreeRequest, _impl_.result_tree_table_id_)}},
-    // .io.deephaven.proto.backplane.grpc.Ticket source_table_id = 2;
-    {::_pbi::TcParser::FastMtS1,
-     {18, 1, 1, PROTOBUF_FIELD_OFFSET(TreeRequest, _impl_.source_table_id_)}},
-    // string identifier_column = 3;
-    {::_pbi::TcParser::FastUS1,
-     {26, 63, 0, PROTOBUF_FIELD_OFFSET(TreeRequest, _impl_.identifier_column_)}},
-    // string parent_identifier_column = 4;
-    {::_pbi::TcParser::FastUS1,
-     {34, 63, 0, PROTOBUF_FIELD_OFFSET(TreeRequest, _impl_.parent_identifier_column_)}},
-    // bool promote_orphans = 5;
-    {::_pbi::TcParser::SingularVarintNoZag1<bool, offsetof(TreeRequest, _impl_.promote_orphans_), 63>(),
-     {40, 63, 0, PROTOBUF_FIELD_OFFSET(TreeRequest, _impl_.promote_orphans_)}},
-    {::_pbi::TcParser::MiniParse, {}},
-    {::_pbi::TcParser::MiniParse, {}},
-  }}, {{
-    65535, 65535
-  }}, {{
-    // .io.deephaven.proto.backplane.grpc.Ticket result_tree_table_id = 1;
-    {PROTOBUF_FIELD_OFFSET(TreeRequest, _impl_.result_tree_table_id_), _Internal::kHasBitsOffset + 0, 0,
-    (0 | ::_fl::kFcOptional | ::_fl::kMessage | ::_fl::kTvTable)},
-    // .io.deephaven.proto.backplane.grpc.Ticket source_table_id = 2;
-    {PROTOBUF_FIELD_OFFSET(TreeRequest, _impl_.source_table_id_), _Internal::kHasBitsOffset + 1, 1,
-    (0 | ::_fl::kFcOptional | ::_fl::kMessage | ::_fl::kTvTable)},
-    // string identifier_column = 3;
-    {PROTOBUF_FIELD_OFFSET(TreeRequest, _impl_.identifier_column_), -1, 0,
-    (0 | ::_fl::kFcSingular | ::_fl::kUtf8String | ::_fl::kRepAString)},
-    // string parent_identifier_column = 4;
-    {PROTOBUF_FIELD_OFFSET(TreeRequest, _impl_.parent_identifier_column_), -1, 0,
-    (0 | ::_fl::kFcSingular | ::_fl::kUtf8String | ::_fl::kRepAString)},
-    // bool promote_orphans = 5;
-    {PROTOBUF_FIELD_OFFSET(TreeRequest, _impl_.promote_orphans_), -1, 0,
-    (0 | ::_fl::kFcSingular | ::_fl::kBool)},
-  }}, {{
-    {::_pbi::TcParser::GetTable<::io::deephaven::proto::backplane::grpc::Ticket>()},
-    {::_pbi::TcParser::GetTable<::io::deephaven::proto::backplane::grpc::Ticket>()},
-  }}, {{
-    "\55\0\0\21\30\0\0\0"
-    "io.deephaven.proto.backplane.grpc.TreeRequest"
-    "identifier_column"
-    "parent_identifier_column"
-  }},
-};
-
-::uint8_t* TreeRequest::_InternalSerialize(
-    ::uint8_t* target,
-    ::google::protobuf::io::EpsCopyOutputStream* stream) const {
-  // @@protoc_insertion_point(serialize_to_array_start:io.deephaven.proto.backplane.grpc.TreeRequest)
-  ::uint32_t cached_has_bits = 0;
-  (void)cached_has_bits;
-
-  cached_has_bits = _impl_._has_bits_[0];
-  // .io.deephaven.proto.backplane.grpc.Ticket result_tree_table_id = 1;
-  if (cached_has_bits & 0x00000001u) {
-    target = ::google::protobuf::internal::WireFormatLite::InternalWriteMessage(
-        1, _Internal::result_tree_table_id(this),
-        _Internal::result_tree_table_id(this).GetCachedSize(), target, stream);
-  }
-
-  // .io.deephaven.proto.backplane.grpc.Ticket source_table_id = 2;
-  if (cached_has_bits & 0x00000002u) {
-    target = ::google::protobuf::internal::WireFormatLite::InternalWriteMessage(
-        2, _Internal::source_table_id(this),
-        _Internal::source_table_id(this).GetCachedSize(), target, stream);
-  }
-
-  // string identifier_column = 3;
-  if (!this->_internal_identifier_column().empty()) {
-    const std::string& _s = this->_internal_identifier_column();
-    ::google::protobuf::internal::WireFormatLite::VerifyUtf8String(
-        _s.data(), static_cast<int>(_s.length()), ::google::protobuf::internal::WireFormatLite::SERIALIZE, "io.deephaven.proto.backplane.grpc.TreeRequest.identifier_column");
-    target = stream->WriteStringMaybeAliased(3, _s, target);
-  }
-
-  // string parent_identifier_column = 4;
-  if (!this->_internal_parent_identifier_column().empty()) {
-    const std::string& _s = this->_internal_parent_identifier_column();
-    ::google::protobuf::internal::WireFormatLite::VerifyUtf8String(
-        _s.data(), static_cast<int>(_s.length()), ::google::protobuf::internal::WireFormatLite::SERIALIZE, "io.deephaven.proto.backplane.grpc.TreeRequest.parent_identifier_column");
-    target = stream->WriteStringMaybeAliased(4, _s, target);
-  }
-
-  // bool promote_orphans = 5;
-  if (this->_internal_promote_orphans() != 0) {
-    target = stream->EnsureSpace(target);
-    target = ::_pbi::WireFormatLite::WriteBoolToArray(
-        5, this->_internal_promote_orphans(), target);
-  }
-
-  if (PROTOBUF_PREDICT_FALSE(_internal_metadata_.have_unknown_fields())) {
-    target =
-        ::_pbi::WireFormat::InternalSerializeUnknownFieldsToArray(
-            _internal_metadata_.unknown_fields<::google::protobuf::UnknownFieldSet>(::google::protobuf::UnknownFieldSet::default_instance), target, stream);
-  }
-  // @@protoc_insertion_point(serialize_to_array_end:io.deephaven.proto.backplane.grpc.TreeRequest)
-  return target;
-}
-
-::size_t TreeRequest::ByteSizeLong() const {
-// @@protoc_insertion_point(message_byte_size_start:io.deephaven.proto.backplane.grpc.TreeRequest)
-  ::size_t total_size = 0;
-
-  ::uint32_t cached_has_bits = 0;
-  // Prevent compiler warnings about cached_has_bits being unused
-  (void) cached_has_bits;
-
-  // string identifier_column = 3;
-  if (!this->_internal_identifier_column().empty()) {
-    total_size += 1 + ::google::protobuf::internal::WireFormatLite::StringSize(
-                                    this->_internal_identifier_column());
-  }
-
-  // string parent_identifier_column = 4;
-  if (!this->_internal_parent_identifier_column().empty()) {
-    total_size += 1 + ::google::protobuf::internal::WireFormatLite::StringSize(
-                                    this->_internal_parent_identifier_column());
-  }
-
-  cached_has_bits = _impl_._has_bits_[0];
-  if (cached_has_bits & 0x00000003u) {
-    // .io.deephaven.proto.backplane.grpc.Ticket result_tree_table_id = 1;
-    if (cached_has_bits & 0x00000001u) {
-      total_size +=
-          1 + ::google::protobuf::internal::WireFormatLite::MessageSize(*_impl_.result_tree_table_id_);
-    }
-
-    // .io.deephaven.proto.backplane.grpc.Ticket source_table_id = 2;
-    if (cached_has_bits & 0x00000002u) {
-      total_size +=
-          1 + ::google::protobuf::internal::WireFormatLite::MessageSize(*_impl_.source_table_id_);
-    }
-
-  }
-  // bool promote_orphans = 5;
-  if (this->_internal_promote_orphans() != 0) {
-    total_size += 2;
-  }
-
-  return MaybeComputeUnknownFieldsSize(total_size, &_impl_._cached_size_);
-}
-
-const ::google::protobuf::Message::ClassData TreeRequest::_class_data_ = {
-    TreeRequest::MergeImpl,
-    nullptr,  // OnDemandRegisterArenaDtor
-};
-const ::google::protobuf::Message::ClassData* TreeRequest::GetClassData() const {
-  return &_class_data_;
-}
-
-void TreeRequest::MergeImpl(::google::protobuf::Message& to_msg, const ::google::protobuf::Message& from_msg) {
-  auto* const _this = static_cast<TreeRequest*>(&to_msg);
-  auto& from = static_cast<const TreeRequest&>(from_msg);
-  // @@protoc_insertion_point(class_specific_merge_from_start:io.deephaven.proto.backplane.grpc.TreeRequest)
-  ABSL_DCHECK_NE(&from, _this);
-  ::uint32_t cached_has_bits = 0;
-  (void) cached_has_bits;
-
-  if (!from._internal_identifier_column().empty()) {
-    _this->_internal_set_identifier_column(from._internal_identifier_column());
-  }
-  if (!from._internal_parent_identifier_column().empty()) {
-    _this->_internal_set_parent_identifier_column(from._internal_parent_identifier_column());
-  }
-  cached_has_bits = from._impl_._has_bits_[0];
-  if (cached_has_bits & 0x00000003u) {
-    if (cached_has_bits & 0x00000001u) {
-      _this->_internal_mutable_result_tree_table_id()->::io::deephaven::proto::backplane::grpc::Ticket::MergeFrom(
-          from._internal_result_tree_table_id());
-    }
-    if (cached_has_bits & 0x00000002u) {
-      _this->_internal_mutable_source_table_id()->::io::deephaven::proto::backplane::grpc::Ticket::MergeFrom(
-          from._internal_source_table_id());
-    }
-  }
-  if (from._internal_promote_orphans() != 0) {
-    _this->_internal_set_promote_orphans(from._internal_promote_orphans());
-  }
-  _this->_internal_metadata_.MergeFrom<::google::protobuf::UnknownFieldSet>(from._internal_metadata_);
-}
-
-void TreeRequest::CopyFrom(const TreeRequest& from) {
-// @@protoc_insertion_point(class_specific_copy_from_start:io.deephaven.proto.backplane.grpc.TreeRequest)
-  if (&from == this) return;
-  Clear();
-  MergeFrom(from);
-}
-
-PROTOBUF_NOINLINE bool TreeRequest::IsInitialized() const {
-  return true;
-}
-
-::_pbi::CachedSize* TreeRequest::AccessCachedSize() const {
-  return &_impl_._cached_size_;
-}
-void TreeRequest::InternalSwap(TreeRequest* PROTOBUF_RESTRICT other) {
-  using std::swap;
-  auto* arena = GetArena();
-  ABSL_DCHECK_EQ(arena, other->GetArena());
-  _internal_metadata_.InternalSwap(&other->_internal_metadata_);
-  swap(_impl_._has_bits_[0], other->_impl_._has_bits_[0]);
-  ::_pbi::ArenaStringPtr::InternalSwap(&_impl_.identifier_column_, &other->_impl_.identifier_column_, arena);
-  ::_pbi::ArenaStringPtr::InternalSwap(&_impl_.parent_identifier_column_, &other->_impl_.parent_identifier_column_, arena);
-  ::google::protobuf::internal::memswap<
-      PROTOBUF_FIELD_OFFSET(TreeRequest, _impl_.promote_orphans_)
-      + sizeof(TreeRequest::_impl_.promote_orphans_)
-      - PROTOBUF_FIELD_OFFSET(TreeRequest, _impl_.result_tree_table_id_)>(
-          reinterpret_cast<char*>(&_impl_.result_tree_table_id_),
-          reinterpret_cast<char*>(&other->_impl_.result_tree_table_id_));
-}
-
-::google::protobuf::Metadata TreeRequest::GetMetadata() const {
-  return ::_pbi::AssignDescriptors(
-      &descriptor_table_deephaven_2fproto_2fhierarchicaltable_2eproto_getter, &descriptor_table_deephaven_2fproto_2fhierarchicaltable_2eproto_once,
-      file_level_metadata_deephaven_2fproto_2fhierarchicaltable_2eproto[2]);
-}
-// ===================================================================
-
-class TreeResponse::_Internal {
- public:
-};
-
-TreeResponse::TreeResponse(::google::protobuf::Arena* arena)
-    : ::google::protobuf::internal::ZeroFieldsBase(arena) {
-  // @@protoc_insertion_point(arena_constructor:io.deephaven.proto.backplane.grpc.TreeResponse)
-}
-TreeResponse::TreeResponse(
-    ::google::protobuf::Arena* arena,
-    const TreeResponse& from)
-    : ::google::protobuf::internal::ZeroFieldsBase(arena) {
-  TreeResponse* const _this = this;
-  (void)_this;
-  _internal_metadata_.MergeFrom<::google::protobuf::UnknownFieldSet>(
-      from._internal_metadata_);
-
-  // @@protoc_insertion_point(copy_constructor:io.deephaven.proto.backplane.grpc.TreeResponse)
-}
-
-
-
-
-
-
-
-
-
-::google::protobuf::Metadata TreeResponse::GetMetadata() const {
-  return ::_pbi::AssignDescriptors(
-      &descriptor_table_deephaven_2fproto_2fhierarchicaltable_2eproto_getter, &descriptor_table_deephaven_2fproto_2fhierarchicaltable_2eproto_once,
-      file_level_metadata_deephaven_2fproto_2fhierarchicaltable_2eproto[3]);
-}
-// ===================================================================
-
-class HierarchicalTableApplyRequest::_Internal {
- public:
-  using HasBits = decltype(std::declval<HierarchicalTableApplyRequest>()._impl_._has_bits_);
-  static constexpr ::int32_t kHasBitsOffset =
-    8 * PROTOBUF_FIELD_OFFSET(HierarchicalTableApplyRequest, _impl_._has_bits_);
-  static const ::io::deephaven::proto::backplane::grpc::Ticket& result_hierarchical_table_id(const HierarchicalTableApplyRequest* msg);
-  static void set_has_result_hierarchical_table_id(HasBits* has_bits) {
-    (*has_bits)[0] |= 1u;
-  }
-  static const ::io::deephaven::proto::backplane::grpc::Ticket& input_hierarchical_table_id(const HierarchicalTableApplyRequest* msg);
-  static void set_has_input_hierarchical_table_id(HasBits* has_bits) {
-    (*has_bits)[0] |= 2u;
-  }
-};
-
-const ::io::deephaven::proto::backplane::grpc::Ticket& HierarchicalTableApplyRequest::_Internal::result_hierarchical_table_id(const HierarchicalTableApplyRequest* msg) {
-  return *msg->_impl_.result_hierarchical_table_id_;
-}
-const ::io::deephaven::proto::backplane::grpc::Ticket& HierarchicalTableApplyRequest::_Internal::input_hierarchical_table_id(const HierarchicalTableApplyRequest* msg) {
-  return *msg->_impl_.input_hierarchical_table_id_;
-}
-void HierarchicalTableApplyRequest::clear_result_hierarchical_table_id() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  if (_impl_.result_hierarchical_table_id_ != nullptr) _impl_.result_hierarchical_table_id_->Clear();
-  _impl_._has_bits_[0] &= ~0x00000001u;
-}
-void HierarchicalTableApplyRequest::clear_input_hierarchical_table_id() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  if (_impl_.input_hierarchical_table_id_ != nullptr) _impl_.input_hierarchical_table_id_->Clear();
-  _impl_._has_bits_[0] &= ~0x00000002u;
-}
-void HierarchicalTableApplyRequest::clear_filters() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  _impl_.filters_.Clear();
-}
-void HierarchicalTableApplyRequest::clear_sorts() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  _impl_.sorts_.Clear();
-}
-HierarchicalTableApplyRequest::HierarchicalTableApplyRequest(::google::protobuf::Arena* arena)
-    : ::google::protobuf::Message(arena) {
-  SharedCtor(arena);
-  // @@protoc_insertion_point(arena_constructor:io.deephaven.proto.backplane.grpc.HierarchicalTableApplyRequest)
-}
-inline PROTOBUF_NDEBUG_INLINE HierarchicalTableApplyRequest::Impl_::Impl_(
-    ::google::protobuf::internal::InternalVisibility visibility, ::google::protobuf::Arena* arena,
-    const Impl_& from)
-      : _has_bits_{from._has_bits_},
-        _cached_size_{0},
-        filters_{visibility, arena, from.filters_},
-        sorts_{visibility, arena, from.sorts_} {}
-
-HierarchicalTableApplyRequest::HierarchicalTableApplyRequest(
-    ::google::protobuf::Arena* arena,
-    const HierarchicalTableApplyRequest& from)
-    : ::google::protobuf::Message(arena) {
-  HierarchicalTableApplyRequest* const _this = this;
-  (void)_this;
-  _internal_metadata_.MergeFrom<::google::protobuf::UnknownFieldSet>(
-      from._internal_metadata_);
-  new (&_impl_) Impl_(internal_visibility(), arena, from._impl_);
-  ::uint32_t cached_has_bits = _impl_._has_bits_[0];
-  _impl_.result_hierarchical_table_id_ = (cached_has_bits & 0x00000001u)
-                ? CreateMaybeMessage<::io::deephaven::proto::backplane::grpc::Ticket>(arena, *from._impl_.result_hierarchical_table_id_)
-                : nullptr;
-  _impl_.input_hierarchical_table_id_ = (cached_has_bits & 0x00000002u)
-                ? CreateMaybeMessage<::io::deephaven::proto::backplane::grpc::Ticket>(arena, *from._impl_.input_hierarchical_table_id_)
-                : nullptr;
-
-  // @@protoc_insertion_point(copy_constructor:io.deephaven.proto.backplane.grpc.HierarchicalTableApplyRequest)
-}
-inline PROTOBUF_NDEBUG_INLINE HierarchicalTableApplyRequest::Impl_::Impl_(
-    ::google::protobuf::internal::InternalVisibility visibility,
-    ::google::protobuf::Arena* arena)
-      : _cached_size_{0},
-        filters_{visibility, arena},
-        sorts_{visibility, arena} {}
-
-inline void HierarchicalTableApplyRequest::SharedCtor(::_pb::Arena* arena) {
-  new (&_impl_) Impl_(internal_visibility(), arena);
-  ::memset(reinterpret_cast<char *>(&_impl_) +
-               offsetof(Impl_, result_hierarchical_table_id_),
-           0,
-           offsetof(Impl_, input_hierarchical_table_id_) -
-               offsetof(Impl_, result_hierarchical_table_id_) +
-               sizeof(Impl_::input_hierarchical_table_id_));
-}
-HierarchicalTableApplyRequest::~HierarchicalTableApplyRequest() {
-  // @@protoc_insertion_point(destructor:io.deephaven.proto.backplane.grpc.HierarchicalTableApplyRequest)
-  _internal_metadata_.Delete<::google::protobuf::UnknownFieldSet>();
-  SharedDtor();
-}
-inline void HierarchicalTableApplyRequest::SharedDtor() {
-  ABSL_DCHECK(GetArena() == nullptr);
-  delete _impl_.result_hierarchical_table_id_;
-  delete _impl_.input_hierarchical_table_id_;
-  _impl_.~Impl_();
-}
-
-PROTOBUF_NOINLINE void HierarchicalTableApplyRequest::Clear() {
-// @@protoc_insertion_point(message_clear_start:io.deephaven.proto.backplane.grpc.HierarchicalTableApplyRequest)
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  ::uint32_t cached_has_bits = 0;
-  // Prevent compiler warnings about cached_has_bits being unused
-  (void) cached_has_bits;
-
-  _impl_.filters_.Clear();
-  _impl_.sorts_.Clear();
-  cached_has_bits = _impl_._has_bits_[0];
-  if (cached_has_bits & 0x00000003u) {
-    if (cached_has_bits & 0x00000001u) {
-      ABSL_DCHECK(_impl_.result_hierarchical_table_id_ != nullptr);
-      _impl_.result_hierarchical_table_id_->Clear();
-    }
-    if (cached_has_bits & 0x00000002u) {
-      ABSL_DCHECK(_impl_.input_hierarchical_table_id_ != nullptr);
-      _impl_.input_hierarchical_table_id_->Clear();
-    }
-  }
-  _impl_._has_bits_.Clear();
-  _internal_metadata_.Clear<::google::protobuf::UnknownFieldSet>();
-}
-
-const char* HierarchicalTableApplyRequest::_InternalParse(
-    const char* ptr, ::_pbi::ParseContext* ctx) {
-  ptr = ::_pbi::TcParser::ParseLoop(this, ptr, ctx, &_table_.header);
-  return ptr;
-}
-
-
-PROTOBUF_CONSTINIT PROTOBUF_ATTRIBUTE_INIT_PRIORITY1
-const ::_pbi::TcParseTable<2, 4, 4, 0, 2> HierarchicalTableApplyRequest::_table_ = {
-  {
-    PROTOBUF_FIELD_OFFSET(HierarchicalTableApplyRequest, _impl_._has_bits_),
-    0, // no _extensions_
-    4, 24,  // max_field_number, fast_idx_mask
-    offsetof(decltype(_table_), field_lookup_table),
-    4294967280,  // skipmap
-    offsetof(decltype(_table_), field_entries),
-    4,  // num_field_entries
-    4,  // num_aux_entries
-    offsetof(decltype(_table_), aux_entries),
-    &_HierarchicalTableApplyRequest_default_instance_._instance,
-    ::_pbi::TcParser::GenericFallback,  // fallback
-  }, {{
-    // repeated .io.deephaven.proto.backplane.grpc.SortDescriptor sorts = 4;
-    {::_pbi::TcParser::FastMtR1,
-     {34, 63, 3, PROTOBUF_FIELD_OFFSET(HierarchicalTableApplyRequest, _impl_.sorts_)}},
-    // .io.deephaven.proto.backplane.grpc.Ticket result_hierarchical_table_id = 1;
-    {::_pbi::TcParser::FastMtS1,
-     {10, 0, 0, PROTOBUF_FIELD_OFFSET(HierarchicalTableApplyRequest, _impl_.result_hierarchical_table_id_)}},
-    // .io.deephaven.proto.backplane.grpc.Ticket input_hierarchical_table_id = 2;
-    {::_pbi::TcParser::FastMtS1,
-     {18, 1, 1, PROTOBUF_FIELD_OFFSET(HierarchicalTableApplyRequest, _impl_.input_hierarchical_table_id_)}},
-    // repeated .io.deephaven.proto.backplane.grpc.Condition filters = 3;
-    {::_pbi::TcParser::FastMtR1,
-     {26, 63, 2, PROTOBUF_FIELD_OFFSET(HierarchicalTableApplyRequest, _impl_.filters_)}},
-  }}, {{
-    65535, 65535
-  }}, {{
-    // .io.deephaven.proto.backplane.grpc.Ticket result_hierarchical_table_id = 1;
-    {PROTOBUF_FIELD_OFFSET(HierarchicalTableApplyRequest, _impl_.result_hierarchical_table_id_), _Internal::kHasBitsOffset + 0, 0,
-    (0 | ::_fl::kFcOptional | ::_fl::kMessage | ::_fl::kTvTable)},
-    // .io.deephaven.proto.backplane.grpc.Ticket input_hierarchical_table_id = 2;
-    {PROTOBUF_FIELD_OFFSET(HierarchicalTableApplyRequest, _impl_.input_hierarchical_table_id_), _Internal::kHasBitsOffset + 1, 1,
-    (0 | ::_fl::kFcOptional | ::_fl::kMessage | ::_fl::kTvTable)},
-    // repeated .io.deephaven.proto.backplane.grpc.Condition filters = 3;
-    {PROTOBUF_FIELD_OFFSET(HierarchicalTableApplyRequest, _impl_.filters_), -1, 2,
-    (0 | ::_fl::kFcRepeated | ::_fl::kMessage | ::_fl::kTvTable)},
-    // repeated .io.deephaven.proto.backplane.grpc.SortDescriptor sorts = 4;
-    {PROTOBUF_FIELD_OFFSET(HierarchicalTableApplyRequest, _impl_.sorts_), -1, 3,
-    (0 | ::_fl::kFcRepeated | ::_fl::kMessage | ::_fl::kTvTable)},
-  }}, {{
-    {::_pbi::TcParser::GetTable<::io::deephaven::proto::backplane::grpc::Ticket>()},
-    {::_pbi::TcParser::GetTable<::io::deephaven::proto::backplane::grpc::Ticket>()},
-    {::_pbi::TcParser::GetTable<::io::deephaven::proto::backplane::grpc::Condition>()},
-    {::_pbi::TcParser::GetTable<::io::deephaven::proto::backplane::grpc::SortDescriptor>()},
-  }}, {{
-  }},
-};
-
-::uint8_t* HierarchicalTableApplyRequest::_InternalSerialize(
-    ::uint8_t* target,
-    ::google::protobuf::io::EpsCopyOutputStream* stream) const {
-  // @@protoc_insertion_point(serialize_to_array_start:io.deephaven.proto.backplane.grpc.HierarchicalTableApplyRequest)
-  ::uint32_t cached_has_bits = 0;
-  (void)cached_has_bits;
-
-  cached_has_bits = _impl_._has_bits_[0];
-  // .io.deephaven.proto.backplane.grpc.Ticket result_hierarchical_table_id = 1;
-  if (cached_has_bits & 0x00000001u) {
-    target = ::google::protobuf::internal::WireFormatLite::InternalWriteMessage(
-        1, _Internal::result_hierarchical_table_id(this),
-        _Internal::result_hierarchical_table_id(this).GetCachedSize(), target, stream);
-  }
-
-  // .io.deephaven.proto.backplane.grpc.Ticket input_hierarchical_table_id = 2;
-  if (cached_has_bits & 0x00000002u) {
-    target = ::google::protobuf::internal::WireFormatLite::InternalWriteMessage(
-        2, _Internal::input_hierarchical_table_id(this),
-        _Internal::input_hierarchical_table_id(this).GetCachedSize(), target, stream);
-  }
-
-  // repeated .io.deephaven.proto.backplane.grpc.Condition filters = 3;
-  for (unsigned i = 0,
-      n = static_cast<unsigned>(this->_internal_filters_size()); i < n; i++) {
-    const auto& repfield = this->_internal_filters().Get(i);
-    target = ::google::protobuf::internal::WireFormatLite::
-        InternalWriteMessage(3, repfield, repfield.GetCachedSize(), target, stream);
-  }
-
-  // repeated .io.deephaven.proto.backplane.grpc.SortDescriptor sorts = 4;
-  for (unsigned i = 0,
-      n = static_cast<unsigned>(this->_internal_sorts_size()); i < n; i++) {
-    const auto& repfield = this->_internal_sorts().Get(i);
-    target = ::google::protobuf::internal::WireFormatLite::
-        InternalWriteMessage(4, repfield, repfield.GetCachedSize(), target, stream);
-  }
-
-  if (PROTOBUF_PREDICT_FALSE(_internal_metadata_.have_unknown_fields())) {
-    target =
-        ::_pbi::WireFormat::InternalSerializeUnknownFieldsToArray(
-            _internal_metadata_.unknown_fields<::google::protobuf::UnknownFieldSet>(::google::protobuf::UnknownFieldSet::default_instance), target, stream);
-  }
-  // @@protoc_insertion_point(serialize_to_array_end:io.deephaven.proto.backplane.grpc.HierarchicalTableApplyRequest)
-  return target;
-}
-
-::size_t HierarchicalTableApplyRequest::ByteSizeLong() const {
-// @@protoc_insertion_point(message_byte_size_start:io.deephaven.proto.backplane.grpc.HierarchicalTableApplyRequest)
-  ::size_t total_size = 0;
-
-  ::uint32_t cached_has_bits = 0;
-  // Prevent compiler warnings about cached_has_bits being unused
-  (void) cached_has_bits;
-
-  // repeated .io.deephaven.proto.backplane.grpc.Condition filters = 3;
-  total_size += 1UL * this->_internal_filters_size();
-  for (const auto& msg : this->_internal_filters()) {
-    total_size +=
-      ::google::protobuf::internal::WireFormatLite::MessageSize(msg);
-  }
-  // repeated .io.deephaven.proto.backplane.grpc.SortDescriptor sorts = 4;
-  total_size += 1UL * this->_internal_sorts_size();
-  for (const auto& msg : this->_internal_sorts()) {
-    total_size +=
-      ::google::protobuf::internal::WireFormatLite::MessageSize(msg);
-  }
-  cached_has_bits = _impl_._has_bits_[0];
-  if (cached_has_bits & 0x00000003u) {
-    // .io.deephaven.proto.backplane.grpc.Ticket result_hierarchical_table_id = 1;
-    if (cached_has_bits & 0x00000001u) {
-      total_size +=
-          1 + ::google::protobuf::internal::WireFormatLite::MessageSize(*_impl_.result_hierarchical_table_id_);
-    }
-
-    // .io.deephaven.proto.backplane.grpc.Ticket input_hierarchical_table_id = 2;
-    if (cached_has_bits & 0x00000002u) {
-      total_size +=
-          1 + ::google::protobuf::internal::WireFormatLite::MessageSize(*_impl_.input_hierarchical_table_id_);
-    }
-
-  }
-  return MaybeComputeUnknownFieldsSize(total_size, &_impl_._cached_size_);
-}
-
-const ::google::protobuf::Message::ClassData HierarchicalTableApplyRequest::_class_data_ = {
-    HierarchicalTableApplyRequest::MergeImpl,
-    nullptr,  // OnDemandRegisterArenaDtor
-};
-const ::google::protobuf::Message::ClassData* HierarchicalTableApplyRequest::GetClassData() const {
-  return &_class_data_;
-}
-
-void HierarchicalTableApplyRequest::MergeImpl(::google::protobuf::Message& to_msg, const ::google::protobuf::Message& from_msg) {
-  auto* const _this = static_cast<HierarchicalTableApplyRequest*>(&to_msg);
-  auto& from = static_cast<const HierarchicalTableApplyRequest&>(from_msg);
-  // @@protoc_insertion_point(class_specific_merge_from_start:io.deephaven.proto.backplane.grpc.HierarchicalTableApplyRequest)
-  ABSL_DCHECK_NE(&from, _this);
-  ::uint32_t cached_has_bits = 0;
-  (void) cached_has_bits;
-
-  _this->_internal_mutable_filters()->MergeFrom(
-      from._internal_filters());
-  _this->_internal_mutable_sorts()->MergeFrom(
-      from._internal_sorts());
-  cached_has_bits = from._impl_._has_bits_[0];
-  if (cached_has_bits & 0x00000003u) {
-    if (cached_has_bits & 0x00000001u) {
-      _this->_internal_mutable_result_hierarchical_table_id()->::io::deephaven::proto::backplane::grpc::Ticket::MergeFrom(
-          from._internal_result_hierarchical_table_id());
-    }
-    if (cached_has_bits & 0x00000002u) {
-      _this->_internal_mutable_input_hierarchical_table_id()->::io::deephaven::proto::backplane::grpc::Ticket::MergeFrom(
-          from._internal_input_hierarchical_table_id());
-    }
-  }
-  _this->_internal_metadata_.MergeFrom<::google::protobuf::UnknownFieldSet>(from._internal_metadata_);
-}
-
-void HierarchicalTableApplyRequest::CopyFrom(const HierarchicalTableApplyRequest& from) {
-// @@protoc_insertion_point(class_specific_copy_from_start:io.deephaven.proto.backplane.grpc.HierarchicalTableApplyRequest)
-  if (&from == this) return;
-  Clear();
-  MergeFrom(from);
-}
-
-PROTOBUF_NOINLINE bool HierarchicalTableApplyRequest::IsInitialized() const {
-  return true;
-}
-
-::_pbi::CachedSize* HierarchicalTableApplyRequest::AccessCachedSize() const {
-  return &_impl_._cached_size_;
-}
-void HierarchicalTableApplyRequest::InternalSwap(HierarchicalTableApplyRequest* PROTOBUF_RESTRICT other) {
-  using std::swap;
-  _internal_metadata_.InternalSwap(&other->_internal_metadata_);
-  swap(_impl_._has_bits_[0], other->_impl_._has_bits_[0]);
-  _impl_.filters_.InternalSwap(&other->_impl_.filters_);
-  _impl_.sorts_.InternalSwap(&other->_impl_.sorts_);
-  ::google::protobuf::internal::memswap<
-      PROTOBUF_FIELD_OFFSET(HierarchicalTableApplyRequest, _impl_.input_hierarchical_table_id_)
-      + sizeof(HierarchicalTableApplyRequest::_impl_.input_hierarchical_table_id_)
-      - PROTOBUF_FIELD_OFFSET(HierarchicalTableApplyRequest, _impl_.result_hierarchical_table_id_)>(
-          reinterpret_cast<char*>(&_impl_.result_hierarchical_table_id_),
-          reinterpret_cast<char*>(&other->_impl_.result_hierarchical_table_id_));
-}
-
-::google::protobuf::Metadata HierarchicalTableApplyRequest::GetMetadata() const {
-  return ::_pbi::AssignDescriptors(
-      &descriptor_table_deephaven_2fproto_2fhierarchicaltable_2eproto_getter, &descriptor_table_deephaven_2fproto_2fhierarchicaltable_2eproto_once,
-      file_level_metadata_deephaven_2fproto_2fhierarchicaltable_2eproto[4]);
-}
-// ===================================================================
-
-class HierarchicalTableApplyResponse::_Internal {
- public:
-};
-
-HierarchicalTableApplyResponse::HierarchicalTableApplyResponse(::google::protobuf::Arena* arena)
-    : ::google::protobuf::internal::ZeroFieldsBase(arena) {
-  // @@protoc_insertion_point(arena_constructor:io.deephaven.proto.backplane.grpc.HierarchicalTableApplyResponse)
-}
-HierarchicalTableApplyResponse::HierarchicalTableApplyResponse(
-    ::google::protobuf::Arena* arena,
-    const HierarchicalTableApplyResponse& from)
-    : ::google::protobuf::internal::ZeroFieldsBase(arena) {
-  HierarchicalTableApplyResponse* const _this = this;
-  (void)_this;
-  _internal_metadata_.MergeFrom<::google::protobuf::UnknownFieldSet>(
-      from._internal_metadata_);
-
-  // @@protoc_insertion_point(copy_constructor:io.deephaven.proto.backplane.grpc.HierarchicalTableApplyResponse)
-}
-
-
-
-
-
-
-
-
-
-::google::protobuf::Metadata HierarchicalTableApplyResponse::GetMetadata() const {
-  return ::_pbi::AssignDescriptors(
-      &descriptor_table_deephaven_2fproto_2fhierarchicaltable_2eproto_getter, &descriptor_table_deephaven_2fproto_2fhierarchicaltable_2eproto_once,
-      file_level_metadata_deephaven_2fproto_2fhierarchicaltable_2eproto[5]);
-}
-// ===================================================================
-
-class HierarchicalTableDescriptor::_Internal {
- public:
-};
-
-HierarchicalTableDescriptor::HierarchicalTableDescriptor(::google::protobuf::Arena* arena)
-    : ::google::protobuf::Message(arena) {
-  SharedCtor(arena);
-  // @@protoc_insertion_point(arena_constructor:io.deephaven.proto.backplane.grpc.HierarchicalTableDescriptor)
-}
-inline PROTOBUF_NDEBUG_INLINE HierarchicalTableDescriptor::Impl_::Impl_(
-    ::google::protobuf::internal::InternalVisibility visibility, ::google::protobuf::Arena* arena,
-    const Impl_& from)
-      : snapshot_schema_(arena, from.snapshot_schema_),
-        _cached_size_{0} {}
-
-HierarchicalTableDescriptor::HierarchicalTableDescriptor(
-    ::google::protobuf::Arena* arena,
-    const HierarchicalTableDescriptor& from)
-    : ::google::protobuf::Message(arena) {
-  HierarchicalTableDescriptor* const _this = this;
-  (void)_this;
-  _internal_metadata_.MergeFrom<::google::protobuf::UnknownFieldSet>(
-      from._internal_metadata_);
-  new (&_impl_) Impl_(internal_visibility(), arena, from._impl_);
-  _impl_.is_static_ = from._impl_.is_static_;
-
-  // @@protoc_insertion_point(copy_constructor:io.deephaven.proto.backplane.grpc.HierarchicalTableDescriptor)
-}
-inline PROTOBUF_NDEBUG_INLINE HierarchicalTableDescriptor::Impl_::Impl_(
-    ::google::protobuf::internal::InternalVisibility visibility,
-    ::google::protobuf::Arena* arena)
-      : snapshot_schema_(arena),
-        _cached_size_{0} {}
-
-inline void HierarchicalTableDescriptor::SharedCtor(::_pb::Arena* arena) {
-  new (&_impl_) Impl_(internal_visibility(), arena);
-  _impl_.is_static_ = {};
-}
-HierarchicalTableDescriptor::~HierarchicalTableDescriptor() {
-  // @@protoc_insertion_point(destructor:io.deephaven.proto.backplane.grpc.HierarchicalTableDescriptor)
-  _internal_metadata_.Delete<::google::protobuf::UnknownFieldSet>();
-  SharedDtor();
-}
-inline void HierarchicalTableDescriptor::SharedDtor() {
-  ABSL_DCHECK(GetArena() == nullptr);
-  _impl_.snapshot_schema_.Destroy();
-  _impl_.~Impl_();
-}
-
-PROTOBUF_NOINLINE void HierarchicalTableDescriptor::Clear() {
-// @@protoc_insertion_point(message_clear_start:io.deephaven.proto.backplane.grpc.HierarchicalTableDescriptor)
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  ::uint32_t cached_has_bits = 0;
-  // Prevent compiler warnings about cached_has_bits being unused
-  (void) cached_has_bits;
-
-  _impl_.snapshot_schema_.ClearToEmpty();
-  _impl_.is_static_ = false;
-  _internal_metadata_.Clear<::google::protobuf::UnknownFieldSet>();
-}
-
-const char* HierarchicalTableDescriptor::_InternalParse(
-    const char* ptr, ::_pbi::ParseContext* ctx) {
-  ptr = ::_pbi::TcParser::ParseLoop(this, ptr, ctx, &_table_.header);
-  return ptr;
-}
-
-
-PROTOBUF_CONSTINIT PROTOBUF_ATTRIBUTE_INIT_PRIORITY1
-const ::_pbi::TcParseTable<1, 2, 0, 0, 2> HierarchicalTableDescriptor::_table_ = {
-  {
-    0,  // no _has_bits_
-    0, // no _extensions_
-    2, 8,  // max_field_number, fast_idx_mask
-    offsetof(decltype(_table_), field_lookup_table),
-    4294967292,  // skipmap
-    offsetof(decltype(_table_), field_entries),
-    2,  // num_field_entries
-    0,  // num_aux_entries
-    offsetof(decltype(_table_), field_names),  // no aux_entries
-    &_HierarchicalTableDescriptor_default_instance_._instance,
-    ::_pbi::TcParser::GenericFallback,  // fallback
-  }, {{
-    // bool is_static = 2;
-    {::_pbi::TcParser::SingularVarintNoZag1<bool, offsetof(HierarchicalTableDescriptor, _impl_.is_static_), 63>(),
-     {16, 63, 0, PROTOBUF_FIELD_OFFSET(HierarchicalTableDescriptor, _impl_.is_static_)}},
-    // bytes snapshot_schema = 1;
-    {::_pbi::TcParser::FastBS1,
-     {10, 63, 0, PROTOBUF_FIELD_OFFSET(HierarchicalTableDescriptor, _impl_.snapshot_schema_)}},
-  }}, {{
-    65535, 65535
-  }}, {{
-    // bytes snapshot_schema = 1;
-    {PROTOBUF_FIELD_OFFSET(HierarchicalTableDescriptor, _impl_.snapshot_schema_), 0, 0,
-    (0 | ::_fl::kFcSingular | ::_fl::kBytes | ::_fl::kRepAString)},
-    // bool is_static = 2;
-    {PROTOBUF_FIELD_OFFSET(HierarchicalTableDescriptor, _impl_.is_static_), 0, 0,
-    (0 | ::_fl::kFcSingular | ::_fl::kBool)},
-  }},
-  // no aux_entries
-  {{
-  }},
-};
-
-::uint8_t* HierarchicalTableDescriptor::_InternalSerialize(
-    ::uint8_t* target,
-    ::google::protobuf::io::EpsCopyOutputStream* stream) const {
-  // @@protoc_insertion_point(serialize_to_array_start:io.deephaven.proto.backplane.grpc.HierarchicalTableDescriptor)
-  ::uint32_t cached_has_bits = 0;
-  (void)cached_has_bits;
-
-  // bytes snapshot_schema = 1;
-  if (!this->_internal_snapshot_schema().empty()) {
-    const std::string& _s = this->_internal_snapshot_schema();
-    target = stream->WriteBytesMaybeAliased(1, _s, target);
-  }
-
-  // bool is_static = 2;
-  if (this->_internal_is_static() != 0) {
-    target = stream->EnsureSpace(target);
-    target = ::_pbi::WireFormatLite::WriteBoolToArray(
-        2, this->_internal_is_static(), target);
-  }
-
-  if (PROTOBUF_PREDICT_FALSE(_internal_metadata_.have_unknown_fields())) {
-    target =
-        ::_pbi::WireFormat::InternalSerializeUnknownFieldsToArray(
-            _internal_metadata_.unknown_fields<::google::protobuf::UnknownFieldSet>(::google::protobuf::UnknownFieldSet::default_instance), target, stream);
-  }
-  // @@protoc_insertion_point(serialize_to_array_end:io.deephaven.proto.backplane.grpc.HierarchicalTableDescriptor)
-  return target;
-}
-
-::size_t HierarchicalTableDescriptor::ByteSizeLong() const {
-// @@protoc_insertion_point(message_byte_size_start:io.deephaven.proto.backplane.grpc.HierarchicalTableDescriptor)
-  ::size_t total_size = 0;
-
-  ::uint32_t cached_has_bits = 0;
-  // Prevent compiler warnings about cached_has_bits being unused
-  (void) cached_has_bits;
-
-  // bytes snapshot_schema = 1;
-  if (!this->_internal_snapshot_schema().empty()) {
-    total_size += 1 + ::google::protobuf::internal::WireFormatLite::BytesSize(
-                                    this->_internal_snapshot_schema());
-  }
-
-  // bool is_static = 2;
-  if (this->_internal_is_static() != 0) {
-    total_size += 2;
-  }
-
-  return MaybeComputeUnknownFieldsSize(total_size, &_impl_._cached_size_);
-}
-
-const ::google::protobuf::Message::ClassData HierarchicalTableDescriptor::_class_data_ = {
-    HierarchicalTableDescriptor::MergeImpl,
-    nullptr,  // OnDemandRegisterArenaDtor
-};
-const ::google::protobuf::Message::ClassData* HierarchicalTableDescriptor::GetClassData() const {
-  return &_class_data_;
-}
-
-void HierarchicalTableDescriptor::MergeImpl(::google::protobuf::Message& to_msg, const ::google::protobuf::Message& from_msg) {
-  auto* const _this = static_cast<HierarchicalTableDescriptor*>(&to_msg);
-  auto& from = static_cast<const HierarchicalTableDescriptor&>(from_msg);
-  // @@protoc_insertion_point(class_specific_merge_from_start:io.deephaven.proto.backplane.grpc.HierarchicalTableDescriptor)
-  ABSL_DCHECK_NE(&from, _this);
-  ::uint32_t cached_has_bits = 0;
-  (void) cached_has_bits;
-
-  if (!from._internal_snapshot_schema().empty()) {
-    _this->_internal_set_snapshot_schema(from._internal_snapshot_schema());
-  }
-  if (from._internal_is_static() != 0) {
-    _this->_internal_set_is_static(from._internal_is_static());
-  }
-  _this->_internal_metadata_.MergeFrom<::google::protobuf::UnknownFieldSet>(from._internal_metadata_);
-}
-
-void HierarchicalTableDescriptor::CopyFrom(const HierarchicalTableDescriptor& from) {
-// @@protoc_insertion_point(class_specific_copy_from_start:io.deephaven.proto.backplane.grpc.HierarchicalTableDescriptor)
-  if (&from == this) return;
-  Clear();
-  MergeFrom(from);
-}
-
-PROTOBUF_NOINLINE bool HierarchicalTableDescriptor::IsInitialized() const {
-  return true;
-}
-
-::_pbi::CachedSize* HierarchicalTableDescriptor::AccessCachedSize() const {
-  return &_impl_._cached_size_;
-}
-void HierarchicalTableDescriptor::InternalSwap(HierarchicalTableDescriptor* PROTOBUF_RESTRICT other) {
-  using std::swap;
-  auto* arena = GetArena();
-  ABSL_DCHECK_EQ(arena, other->GetArena());
-  _internal_metadata_.InternalSwap(&other->_internal_metadata_);
-  ::_pbi::ArenaStringPtr::InternalSwap(&_impl_.snapshot_schema_, &other->_impl_.snapshot_schema_, arena);
-        swap(_impl_.is_static_, other->_impl_.is_static_);
-}
-
-::google::protobuf::Metadata HierarchicalTableDescriptor::GetMetadata() const {
-  return ::_pbi::AssignDescriptors(
-      &descriptor_table_deephaven_2fproto_2fhierarchicaltable_2eproto_getter, &descriptor_table_deephaven_2fproto_2fhierarchicaltable_2eproto_once,
-      file_level_metadata_deephaven_2fproto_2fhierarchicaltable_2eproto[6]);
-}
-// ===================================================================
-
-class HierarchicalTableViewRequest::_Internal {
- public:
-  using HasBits = decltype(std::declval<HierarchicalTableViewRequest>()._impl_._has_bits_);
-  static constexpr ::int32_t kHasBitsOffset =
-    8 * PROTOBUF_FIELD_OFFSET(HierarchicalTableViewRequest, _impl_._has_bits_);
-  static constexpr ::int32_t kOneofCaseOffset =
-    PROTOBUF_FIELD_OFFSET(::io::deephaven::proto::backplane::grpc::HierarchicalTableViewRequest, _impl_._oneof_case_);
-  static const ::io::deephaven::proto::backplane::grpc::Ticket& result_view_id(const HierarchicalTableViewRequest* msg);
-  static void set_has_result_view_id(HasBits* has_bits) {
-    (*has_bits)[0] |= 1u;
-  }
-  static const ::io::deephaven::proto::backplane::grpc::Ticket& hierarchical_table_id(const HierarchicalTableViewRequest* msg);
-  static const ::io::deephaven::proto::backplane::grpc::Ticket& existing_view_id(const HierarchicalTableViewRequest* msg);
-  static const ::io::deephaven::proto::backplane::grpc::HierarchicalTableViewKeyTableDescriptor& expansions(const HierarchicalTableViewRequest* msg);
-  static void set_has_expansions(HasBits* has_bits) {
-    (*has_bits)[0] |= 2u;
-  }
-};
-
-const ::io::deephaven::proto::backplane::grpc::Ticket& HierarchicalTableViewRequest::_Internal::result_view_id(const HierarchicalTableViewRequest* msg) {
-  return *msg->_impl_.result_view_id_;
-}
-const ::io::deephaven::proto::backplane::grpc::Ticket& HierarchicalTableViewRequest::_Internal::hierarchical_table_id(const HierarchicalTableViewRequest* msg) {
-  return *msg->_impl_.target_.hierarchical_table_id_;
-}
-const ::io::deephaven::proto::backplane::grpc::Ticket& HierarchicalTableViewRequest::_Internal::existing_view_id(const HierarchicalTableViewRequest* msg) {
-  return *msg->_impl_.target_.existing_view_id_;
-}
-const ::io::deephaven::proto::backplane::grpc::HierarchicalTableViewKeyTableDescriptor& HierarchicalTableViewRequest::_Internal::expansions(const HierarchicalTableViewRequest* msg) {
-  return *msg->_impl_.expansions_;
-}
-void HierarchicalTableViewRequest::clear_result_view_id() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  if (_impl_.result_view_id_ != nullptr) _impl_.result_view_id_->Clear();
-  _impl_._has_bits_[0] &= ~0x00000001u;
-}
-void HierarchicalTableViewRequest::set_allocated_hierarchical_table_id(::io::deephaven::proto::backplane::grpc::Ticket* hierarchical_table_id) {
-  ::google::protobuf::Arena* message_arena = GetArena();
-  clear_target();
-  if (hierarchical_table_id) {
-    ::google::protobuf::Arena* submessage_arena = reinterpret_cast<::google::protobuf::MessageLite*>(hierarchical_table_id)->GetArena();
-    if (message_arena != submessage_arena) {
-      hierarchical_table_id = ::google::protobuf::internal::GetOwnedMessage(message_arena, hierarchical_table_id, submessage_arena);
-    }
-    set_has_hierarchical_table_id();
-    _impl_.target_.hierarchical_table_id_ = hierarchical_table_id;
-  }
-  // @@protoc_insertion_point(field_set_allocated:io.deephaven.proto.backplane.grpc.HierarchicalTableViewRequest.hierarchical_table_id)
-}
-void HierarchicalTableViewRequest::clear_hierarchical_table_id() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  if (target_case() == kHierarchicalTableId) {
-    if (GetArena() == nullptr) {
-      delete _impl_.target_.hierarchical_table_id_;
-    }
-    clear_has_target();
-  }
-}
-void HierarchicalTableViewRequest::set_allocated_existing_view_id(::io::deephaven::proto::backplane::grpc::Ticket* existing_view_id) {
-  ::google::protobuf::Arena* message_arena = GetArena();
-  clear_target();
-  if (existing_view_id) {
-    ::google::protobuf::Arena* submessage_arena = reinterpret_cast<::google::protobuf::MessageLite*>(existing_view_id)->GetArena();
-    if (message_arena != submessage_arena) {
-      existing_view_id = ::google::protobuf::internal::GetOwnedMessage(message_arena, existing_view_id, submessage_arena);
-    }
-    set_has_existing_view_id();
-    _impl_.target_.existing_view_id_ = existing_view_id;
-  }
-  // @@protoc_insertion_point(field_set_allocated:io.deephaven.proto.backplane.grpc.HierarchicalTableViewRequest.existing_view_id)
-}
-void HierarchicalTableViewRequest::clear_existing_view_id() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  if (target_case() == kExistingViewId) {
-    if (GetArena() == nullptr) {
-      delete _impl_.target_.existing_view_id_;
-    }
-    clear_has_target();
-  }
-}
-HierarchicalTableViewRequest::HierarchicalTableViewRequest(::google::protobuf::Arena* arena)
-    : ::google::protobuf::Message(arena) {
-  SharedCtor(arena);
-  // @@protoc_insertion_point(arena_constructor:io.deephaven.proto.backplane.grpc.HierarchicalTableViewRequest)
-}
-inline PROTOBUF_NDEBUG_INLINE HierarchicalTableViewRequest::Impl_::Impl_(
-    ::google::protobuf::internal::InternalVisibility visibility, ::google::protobuf::Arena* arena,
-    const Impl_& from)
-      : _has_bits_{from._has_bits_},
-        _cached_size_{0},
-        target_{},
-        _oneof_case_{from._oneof_case_[0]} {}
-
-HierarchicalTableViewRequest::HierarchicalTableViewRequest(
-    ::google::protobuf::Arena* arena,
-    const HierarchicalTableViewRequest& from)
-    : ::google::protobuf::Message(arena) {
-  HierarchicalTableViewRequest* const _this = this;
-  (void)_this;
-  _internal_metadata_.MergeFrom<::google::protobuf::UnknownFieldSet>(
-      from._internal_metadata_);
-  new (&_impl_) Impl_(internal_visibility(), arena, from._impl_);
-  ::uint32_t cached_has_bits = _impl_._has_bits_[0];
-  _impl_.result_view_id_ = (cached_has_bits & 0x00000001u)
-                ? CreateMaybeMessage<::io::deephaven::proto::backplane::grpc::Ticket>(arena, *from._impl_.result_view_id_)
-                : nullptr;
-  _impl_.expansions_ = (cached_has_bits & 0x00000002u)
-                ? CreateMaybeMessage<::io::deephaven::proto::backplane::grpc::HierarchicalTableViewKeyTableDescriptor>(arena, *from._impl_.expansions_)
-                : nullptr;
-  switch (target_case()) {
-    case TARGET_NOT_SET:
-      break;
-      case kHierarchicalTableId:
-        _impl_.target_.hierarchical_table_id_ = CreateMaybeMessage<::io::deephaven::proto::backplane::grpc::Ticket>(arena, *from._impl_.target_.hierarchical_table_id_);
-        break;
-      case kExistingViewId:
-        _impl_.target_.existing_view_id_ = CreateMaybeMessage<::io::deephaven::proto::backplane::grpc::Ticket>(arena, *from._impl_.target_.existing_view_id_);
-        break;
-  }
-
-  // @@protoc_insertion_point(copy_constructor:io.deephaven.proto.backplane.grpc.HierarchicalTableViewRequest)
-}
-inline PROTOBUF_NDEBUG_INLINE HierarchicalTableViewRequest::Impl_::Impl_(
-    ::google::protobuf::internal::InternalVisibility visibility,
-    ::google::protobuf::Arena* arena)
-      : _cached_size_{0},
-        target_{},
-        _oneof_case_{} {}
-
-inline void HierarchicalTableViewRequest::SharedCtor(::_pb::Arena* arena) {
-  new (&_impl_) Impl_(internal_visibility(), arena);
-  ::memset(reinterpret_cast<char *>(&_impl_) +
-               offsetof(Impl_, result_view_id_),
-           0,
-           offsetof(Impl_, expansions_) -
-               offsetof(Impl_, result_view_id_) +
-               sizeof(Impl_::expansions_));
-}
-HierarchicalTableViewRequest::~HierarchicalTableViewRequest() {
-  // @@protoc_insertion_point(destructor:io.deephaven.proto.backplane.grpc.HierarchicalTableViewRequest)
-  _internal_metadata_.Delete<::google::protobuf::UnknownFieldSet>();
-  SharedDtor();
-}
-inline void HierarchicalTableViewRequest::SharedDtor() {
-  ABSL_DCHECK(GetArena() == nullptr);
-  delete _impl_.result_view_id_;
-  delete _impl_.expansions_;
-  if (has_target()) {
-    clear_target();
-  }
-  _impl_.~Impl_();
-}
-
-void HierarchicalTableViewRequest::clear_target() {
-// @@protoc_insertion_point(one_of_clear_start:io.deephaven.proto.backplane.grpc.HierarchicalTableViewRequest)
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  switch (target_case()) {
-    case kHierarchicalTableId: {
-      if (GetArena() == nullptr) {
-        delete _impl_.target_.hierarchical_table_id_;
-      }
-      break;
-    }
-    case kExistingViewId: {
-      if (GetArena() == nullptr) {
-        delete _impl_.target_.existing_view_id_;
-      }
-      break;
-    }
-    case TARGET_NOT_SET: {
-      break;
-    }
-  }
-  _impl_._oneof_case_[0] = TARGET_NOT_SET;
-}
-
-
-PROTOBUF_NOINLINE void HierarchicalTableViewRequest::Clear() {
-// @@protoc_insertion_point(message_clear_start:io.deephaven.proto.backplane.grpc.HierarchicalTableViewRequest)
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  ::uint32_t cached_has_bits = 0;
-  // Prevent compiler warnings about cached_has_bits being unused
-  (void) cached_has_bits;
-
-  cached_has_bits = _impl_._has_bits_[0];
-  if (cached_has_bits & 0x00000003u) {
-    if (cached_has_bits & 0x00000001u) {
-      ABSL_DCHECK(_impl_.result_view_id_ != nullptr);
-      _impl_.result_view_id_->Clear();
-    }
-    if (cached_has_bits & 0x00000002u) {
-      ABSL_DCHECK(_impl_.expansions_ != nullptr);
-      _impl_.expansions_->Clear();
-    }
-  }
-  clear_target();
-  _impl_._has_bits_.Clear();
-  _internal_metadata_.Clear<::google::protobuf::UnknownFieldSet>();
-}
-
-const char* HierarchicalTableViewRequest::_InternalParse(
-    const char* ptr, ::_pbi::ParseContext* ctx) {
-  ptr = ::_pbi::TcParser::ParseLoop(this, ptr, ctx, &_table_.header);
-  return ptr;
-}
-
-
-PROTOBUF_CONSTINIT PROTOBUF_ATTRIBUTE_INIT_PRIORITY1
-const ::_pbi::TcParseTable<1, 4, 4, 0, 2> HierarchicalTableViewRequest::_table_ = {
-  {
-    PROTOBUF_FIELD_OFFSET(HierarchicalTableViewRequest, _impl_._has_bits_),
-    0, // no _extensions_
-    4, 8,  // max_field_number, fast_idx_mask
-    offsetof(decltype(_table_), field_lookup_table),
-    4294967280,  // skipmap
-    offsetof(decltype(_table_), field_entries),
-    4,  // num_field_entries
-    4,  // num_aux_entries
-    offsetof(decltype(_table_), aux_entries),
-    &_HierarchicalTableViewRequest_default_instance_._instance,
-    ::_pbi::TcParser::GenericFallback,  // fallback
-  }, {{
-    // .io.deephaven.proto.backplane.grpc.HierarchicalTableViewKeyTableDescriptor expansions = 4;
-    {::_pbi::TcParser::FastMtS1,
-     {34, 1, 3, PROTOBUF_FIELD_OFFSET(HierarchicalTableViewRequest, _impl_.expansions_)}},
-    // .io.deephaven.proto.backplane.grpc.Ticket result_view_id = 1;
-    {::_pbi::TcParser::FastMtS1,
-     {10, 0, 0, PROTOBUF_FIELD_OFFSET(HierarchicalTableViewRequest, _impl_.result_view_id_)}},
-  }}, {{
-    65535, 65535
-  }}, {{
-    // .io.deephaven.proto.backplane.grpc.Ticket result_view_id = 1;
-    {PROTOBUF_FIELD_OFFSET(HierarchicalTableViewRequest, _impl_.result_view_id_), _Internal::kHasBitsOffset + 0, 0,
-    (0 | ::_fl::kFcOptional | ::_fl::kMessage | ::_fl::kTvTable)},
-    // .io.deephaven.proto.backplane.grpc.Ticket hierarchical_table_id = 2;
-    {PROTOBUF_FIELD_OFFSET(HierarchicalTableViewRequest, _impl_.target_.hierarchical_table_id_), _Internal::kOneofCaseOffset + 0, 1,
-    (0 | ::_fl::kFcOneof | ::_fl::kMessage | ::_fl::kTvTable)},
-    // .io.deephaven.proto.backplane.grpc.Ticket existing_view_id = 3;
-    {PROTOBUF_FIELD_OFFSET(HierarchicalTableViewRequest, _impl_.target_.existing_view_id_), _Internal::kOneofCaseOffset + 0, 2,
-    (0 | ::_fl::kFcOneof | ::_fl::kMessage | ::_fl::kTvTable)},
-    // .io.deephaven.proto.backplane.grpc.HierarchicalTableViewKeyTableDescriptor expansions = 4;
-    {PROTOBUF_FIELD_OFFSET(HierarchicalTableViewRequest, _impl_.expansions_), _Internal::kHasBitsOffset + 1, 3,
-    (0 | ::_fl::kFcOptional | ::_fl::kMessage | ::_fl::kTvTable)},
-  }}, {{
-    {::_pbi::TcParser::GetTable<::io::deephaven::proto::backplane::grpc::Ticket>()},
-    {::_pbi::TcParser::GetTable<::io::deephaven::proto::backplane::grpc::Ticket>()},
-    {::_pbi::TcParser::GetTable<::io::deephaven::proto::backplane::grpc::Ticket>()},
-    {::_pbi::TcParser::GetTable<::io::deephaven::proto::backplane::grpc::HierarchicalTableViewKeyTableDescriptor>()},
-  }}, {{
-  }},
-};
-
-::uint8_t* HierarchicalTableViewRequest::_InternalSerialize(
-    ::uint8_t* target,
-    ::google::protobuf::io::EpsCopyOutputStream* stream) const {
-  // @@protoc_insertion_point(serialize_to_array_start:io.deephaven.proto.backplane.grpc.HierarchicalTableViewRequest)
-  ::uint32_t cached_has_bits = 0;
-  (void)cached_has_bits;
-
-  cached_has_bits = _impl_._has_bits_[0];
-  // .io.deephaven.proto.backplane.grpc.Ticket result_view_id = 1;
-  if (cached_has_bits & 0x00000001u) {
-    target = ::google::protobuf::internal::WireFormatLite::InternalWriteMessage(
-        1, _Internal::result_view_id(this),
-        _Internal::result_view_id(this).GetCachedSize(), target, stream);
-  }
-
-  switch (target_case()) {
-    case kHierarchicalTableId: {
-      target = ::google::protobuf::internal::WireFormatLite::InternalWriteMessage(
-          2, _Internal::hierarchical_table_id(this),
-          _Internal::hierarchical_table_id(this).GetCachedSize(), target, stream);
-      break;
-    }
-    case kExistingViewId: {
-      target = ::google::protobuf::internal::WireFormatLite::InternalWriteMessage(
-          3, _Internal::existing_view_id(this),
-          _Internal::existing_view_id(this).GetCachedSize(), target, stream);
-      break;
-    }
-    default:
-      break;
-  }
-  // .io.deephaven.proto.backplane.grpc.HierarchicalTableViewKeyTableDescriptor expansions = 4;
-  if (cached_has_bits & 0x00000002u) {
-    target = ::google::protobuf::internal::WireFormatLite::InternalWriteMessage(
-        4, _Internal::expansions(this),
-        _Internal::expansions(this).GetCachedSize(), target, stream);
-  }
-
-  if (PROTOBUF_PREDICT_FALSE(_internal_metadata_.have_unknown_fields())) {
-    target =
-        ::_pbi::WireFormat::InternalSerializeUnknownFieldsToArray(
-            _internal_metadata_.unknown_fields<::google::protobuf::UnknownFieldSet>(::google::protobuf::UnknownFieldSet::default_instance), target, stream);
-  }
-  // @@protoc_insertion_point(serialize_to_array_end:io.deephaven.proto.backplane.grpc.HierarchicalTableViewRequest)
-  return target;
-}
-
-::size_t HierarchicalTableViewRequest::ByteSizeLong() const {
-// @@protoc_insertion_point(message_byte_size_start:io.deephaven.proto.backplane.grpc.HierarchicalTableViewRequest)
-  ::size_t total_size = 0;
-
-  ::uint32_t cached_has_bits = 0;
-  // Prevent compiler warnings about cached_has_bits being unused
-  (void) cached_has_bits;
-
-  cached_has_bits = _impl_._has_bits_[0];
-  if (cached_has_bits & 0x00000003u) {
-    // .io.deephaven.proto.backplane.grpc.Ticket result_view_id = 1;
-    if (cached_has_bits & 0x00000001u) {
-      total_size +=
-          1 + ::google::protobuf::internal::WireFormatLite::MessageSize(*_impl_.result_view_id_);
-    }
-
-    // .io.deephaven.proto.backplane.grpc.HierarchicalTableViewKeyTableDescriptor expansions = 4;
-    if (cached_has_bits & 0x00000002u) {
-      total_size +=
-          1 + ::google::protobuf::internal::WireFormatLite::MessageSize(*_impl_.expansions_);
-    }
-
-  }
-  switch (target_case()) {
-    // .io.deephaven.proto.backplane.grpc.Ticket hierarchical_table_id = 2;
-    case kHierarchicalTableId: {
-      total_size +=
-          1 + ::google::protobuf::internal::WireFormatLite::MessageSize(*_impl_.target_.hierarchical_table_id_);
-      break;
-    }
-    // .io.deephaven.proto.backplane.grpc.Ticket existing_view_id = 3;
-    case kExistingViewId: {
-      total_size +=
-          1 + ::google::protobuf::internal::WireFormatLite::MessageSize(*_impl_.target_.existing_view_id_);
-      break;
-    }
-    case TARGET_NOT_SET: {
-      break;
-    }
-  }
-  return MaybeComputeUnknownFieldsSize(total_size, &_impl_._cached_size_);
-}
-
-const ::google::protobuf::Message::ClassData HierarchicalTableViewRequest::_class_data_ = {
-    HierarchicalTableViewRequest::MergeImpl,
-    nullptr,  // OnDemandRegisterArenaDtor
-};
-const ::google::protobuf::Message::ClassData* HierarchicalTableViewRequest::GetClassData() const {
-  return &_class_data_;
-}
-
-void HierarchicalTableViewRequest::MergeImpl(::google::protobuf::Message& to_msg, const ::google::protobuf::Message& from_msg) {
-  auto* const _this = static_cast<HierarchicalTableViewRequest*>(&to_msg);
-  auto& from = static_cast<const HierarchicalTableViewRequest&>(from_msg);
-  // @@protoc_insertion_point(class_specific_merge_from_start:io.deephaven.proto.backplane.grpc.HierarchicalTableViewRequest)
-  ABSL_DCHECK_NE(&from, _this);
-  ::uint32_t cached_has_bits = 0;
-  (void) cached_has_bits;
-
-  cached_has_bits = from._impl_._has_bits_[0];
-  if (cached_has_bits & 0x00000003u) {
-    if (cached_has_bits & 0x00000001u) {
-      _this->_internal_mutable_result_view_id()->::io::deephaven::proto::backplane::grpc::Ticket::MergeFrom(
-          from._internal_result_view_id());
-    }
-    if (cached_has_bits & 0x00000002u) {
-      _this->_internal_mutable_expansions()->::io::deephaven::proto::backplane::grpc::HierarchicalTableViewKeyTableDescriptor::MergeFrom(
-          from._internal_expansions());
-    }
-  }
-  switch (from.target_case()) {
-    case kHierarchicalTableId: {
-      _this->_internal_mutable_hierarchical_table_id()->::io::deephaven::proto::backplane::grpc::Ticket::MergeFrom(
-          from._internal_hierarchical_table_id());
-      break;
-    }
-    case kExistingViewId: {
-      _this->_internal_mutable_existing_view_id()->::io::deephaven::proto::backplane::grpc::Ticket::MergeFrom(
-          from._internal_existing_view_id());
-      break;
-    }
-    case TARGET_NOT_SET: {
-      break;
-    }
-  }
-  _this->_internal_metadata_.MergeFrom<::google::protobuf::UnknownFieldSet>(from._internal_metadata_);
-}
-
-void HierarchicalTableViewRequest::CopyFrom(const HierarchicalTableViewRequest& from) {
-// @@protoc_insertion_point(class_specific_copy_from_start:io.deephaven.proto.backplane.grpc.HierarchicalTableViewRequest)
-  if (&from == this) return;
-  Clear();
-  MergeFrom(from);
-}
-
-PROTOBUF_NOINLINE bool HierarchicalTableViewRequest::IsInitialized() const {
-  return true;
-}
-
-::_pbi::CachedSize* HierarchicalTableViewRequest::AccessCachedSize() const {
-  return &_impl_._cached_size_;
-}
-void HierarchicalTableViewRequest::InternalSwap(HierarchicalTableViewRequest* PROTOBUF_RESTRICT other) {
-  using std::swap;
-  _internal_metadata_.InternalSwap(&other->_internal_metadata_);
-  swap(_impl_._has_bits_[0], other->_impl_._has_bits_[0]);
-  ::google::protobuf::internal::memswap<
-      PROTOBUF_FIELD_OFFSET(HierarchicalTableViewRequest, _impl_.expansions_)
-      + sizeof(HierarchicalTableViewRequest::_impl_.expansions_)
-      - PROTOBUF_FIELD_OFFSET(HierarchicalTableViewRequest, _impl_.result_view_id_)>(
-          reinterpret_cast<char*>(&_impl_.result_view_id_),
-          reinterpret_cast<char*>(&other->_impl_.result_view_id_));
-  swap(_impl_.target_, other->_impl_.target_);
-  swap(_impl_._oneof_case_[0], other->_impl_._oneof_case_[0]);
-}
-
-::google::protobuf::Metadata HierarchicalTableViewRequest::GetMetadata() const {
-  return ::_pbi::AssignDescriptors(
-      &descriptor_table_deephaven_2fproto_2fhierarchicaltable_2eproto_getter, &descriptor_table_deephaven_2fproto_2fhierarchicaltable_2eproto_once,
-      file_level_metadata_deephaven_2fproto_2fhierarchicaltable_2eproto[7]);
-}
-// ===================================================================
-
-class HierarchicalTableViewKeyTableDescriptor::_Internal {
- public:
-  using HasBits = decltype(std::declval<HierarchicalTableViewKeyTableDescriptor>()._impl_._has_bits_);
-  static constexpr ::int32_t kHasBitsOffset =
-    8 * PROTOBUF_FIELD_OFFSET(HierarchicalTableViewKeyTableDescriptor, _impl_._has_bits_);
-  static const ::io::deephaven::proto::backplane::grpc::Ticket& key_table_id(const HierarchicalTableViewKeyTableDescriptor* msg);
-  static void set_has_key_table_id(HasBits* has_bits) {
-    (*has_bits)[0] |= 2u;
-  }
-  static void set_has_key_table_action_column(HasBits* has_bits) {
-    (*has_bits)[0] |= 1u;
-  }
-};
-
-const ::io::deephaven::proto::backplane::grpc::Ticket& HierarchicalTableViewKeyTableDescriptor::_Internal::key_table_id(const HierarchicalTableViewKeyTableDescriptor* msg) {
-  return *msg->_impl_.key_table_id_;
-}
-void HierarchicalTableViewKeyTableDescriptor::clear_key_table_id() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  if (_impl_.key_table_id_ != nullptr) _impl_.key_table_id_->Clear();
-  _impl_._has_bits_[0] &= ~0x00000002u;
-}
-HierarchicalTableViewKeyTableDescriptor::HierarchicalTableViewKeyTableDescriptor(::google::protobuf::Arena* arena)
-    : ::google::protobuf::Message(arena) {
-  SharedCtor(arena);
-  // @@protoc_insertion_point(arena_constructor:io.deephaven.proto.backplane.grpc.HierarchicalTableViewKeyTableDescriptor)
-}
-inline PROTOBUF_NDEBUG_INLINE HierarchicalTableViewKeyTableDescriptor::Impl_::Impl_(
-    ::google::protobuf::internal::InternalVisibility visibility, ::google::protobuf::Arena* arena,
-    const Impl_& from)
-      : _has_bits_{from._has_bits_},
-        _cached_size_{0},
-        key_table_action_column_(arena, from.key_table_action_column_) {}
-
-HierarchicalTableViewKeyTableDescriptor::HierarchicalTableViewKeyTableDescriptor(
-    ::google::protobuf::Arena* arena,
-    const HierarchicalTableViewKeyTableDescriptor& from)
-    : ::google::protobuf::Message(arena) {
-  HierarchicalTableViewKeyTableDescriptor* const _this = this;
-  (void)_this;
-  _internal_metadata_.MergeFrom<::google::protobuf::UnknownFieldSet>(
-      from._internal_metadata_);
-  new (&_impl_) Impl_(internal_visibility(), arena, from._impl_);
-  ::uint32_t cached_has_bits = _impl_._has_bits_[0];
-  _impl_.key_table_id_ = (cached_has_bits & 0x00000002u)
-                ? CreateMaybeMessage<::io::deephaven::proto::backplane::grpc::Ticket>(arena, *from._impl_.key_table_id_)
-                : nullptr;
-
-  // @@protoc_insertion_point(copy_constructor:io.deephaven.proto.backplane.grpc.HierarchicalTableViewKeyTableDescriptor)
-}
-inline PROTOBUF_NDEBUG_INLINE HierarchicalTableViewKeyTableDescriptor::Impl_::Impl_(
-    ::google::protobuf::internal::InternalVisibility visibility,
-    ::google::protobuf::Arena* arena)
-      : _cached_size_{0},
-        key_table_action_column_(arena) {}
-
-inline void HierarchicalTableViewKeyTableDescriptor::SharedCtor(::_pb::Arena* arena) {
-  new (&_impl_) Impl_(internal_visibility(), arena);
-  _impl_.key_table_id_ = {};
-}
-HierarchicalTableViewKeyTableDescriptor::~HierarchicalTableViewKeyTableDescriptor() {
-  // @@protoc_insertion_point(destructor:io.deephaven.proto.backplane.grpc.HierarchicalTableViewKeyTableDescriptor)
-  _internal_metadata_.Delete<::google::protobuf::UnknownFieldSet>();
-  SharedDtor();
-}
-inline void HierarchicalTableViewKeyTableDescriptor::SharedDtor() {
-  ABSL_DCHECK(GetArena() == nullptr);
-  _impl_.key_table_action_column_.Destroy();
-  delete _impl_.key_table_id_;
-  _impl_.~Impl_();
-}
-
-PROTOBUF_NOINLINE void HierarchicalTableViewKeyTableDescriptor::Clear() {
-// @@protoc_insertion_point(message_clear_start:io.deephaven.proto.backplane.grpc.HierarchicalTableViewKeyTableDescriptor)
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  ::uint32_t cached_has_bits = 0;
-  // Prevent compiler warnings about cached_has_bits being unused
-  (void) cached_has_bits;
-
-  cached_has_bits = _impl_._has_bits_[0];
-  if (cached_has_bits & 0x00000003u) {
-    if (cached_has_bits & 0x00000001u) {
-      _impl_.key_table_action_column_.ClearNonDefaultToEmpty();
-    }
-    if (cached_has_bits & 0x00000002u) {
-      ABSL_DCHECK(_impl_.key_table_id_ != nullptr);
-      _impl_.key_table_id_->Clear();
-    }
-  }
-  _impl_._has_bits_.Clear();
-  _internal_metadata_.Clear<::google::protobuf::UnknownFieldSet>();
-}
-
-const char* HierarchicalTableViewKeyTableDescriptor::_InternalParse(
-    const char* ptr, ::_pbi::ParseContext* ctx) {
-  ptr = ::_pbi::TcParser::ParseLoop(this, ptr, ctx, &_table_.header);
-  return ptr;
-}
-
-
-PROTOBUF_CONSTINIT PROTOBUF_ATTRIBUTE_INIT_PRIORITY1
-const ::_pbi::TcParseTable<1, 2, 1, 105, 2> HierarchicalTableViewKeyTableDescriptor::_table_ = {
-  {
-    PROTOBUF_FIELD_OFFSET(HierarchicalTableViewKeyTableDescriptor, _impl_._has_bits_),
-    0, // no _extensions_
-    2, 8,  // max_field_number, fast_idx_mask
-    offsetof(decltype(_table_), field_lookup_table),
-    4294967292,  // skipmap
-    offsetof(decltype(_table_), field_entries),
-    2,  // num_field_entries
-    1,  // num_aux_entries
-    offsetof(decltype(_table_), aux_entries),
-    &_HierarchicalTableViewKeyTableDescriptor_default_instance_._instance,
-    ::_pbi::TcParser::GenericFallback,  // fallback
-  }, {{
-    // optional string key_table_action_column = 2;
-    {::_pbi::TcParser::FastUS1,
-     {18, 0, 0, PROTOBUF_FIELD_OFFSET(HierarchicalTableViewKeyTableDescriptor, _impl_.key_table_action_column_)}},
-    // .io.deephaven.proto.backplane.grpc.Ticket key_table_id = 1;
-    {::_pbi::TcParser::FastMtS1,
-     {10, 1, 0, PROTOBUF_FIELD_OFFSET(HierarchicalTableViewKeyTableDescriptor, _impl_.key_table_id_)}},
-  }}, {{
-    65535, 65535
-  }}, {{
-    // .io.deephaven.proto.backplane.grpc.Ticket key_table_id = 1;
-    {PROTOBUF_FIELD_OFFSET(HierarchicalTableViewKeyTableDescriptor, _impl_.key_table_id_), _Internal::kHasBitsOffset + 1, 0,
-    (0 | ::_fl::kFcOptional | ::_fl::kMessage | ::_fl::kTvTable)},
-    // optional string key_table_action_column = 2;
-    {PROTOBUF_FIELD_OFFSET(HierarchicalTableViewKeyTableDescriptor, _impl_.key_table_action_column_), _Internal::kHasBitsOffset + 0, 0,
-    (0 | ::_fl::kFcOptional | ::_fl::kUtf8String | ::_fl::kRepAString)},
-  }}, {{
-    {::_pbi::TcParser::GetTable<::io::deephaven::proto::backplane::grpc::Ticket>()},
-  }}, {{
-    "\111\0\27\0\0\0\0\0"
-    "io.deephaven.proto.backplane.grpc.HierarchicalTableViewKeyTableDescriptor"
-    "key_table_action_column"
-  }},
-};
-
-::uint8_t* HierarchicalTableViewKeyTableDescriptor::_InternalSerialize(
-    ::uint8_t* target,
-    ::google::protobuf::io::EpsCopyOutputStream* stream) const {
-  // @@protoc_insertion_point(serialize_to_array_start:io.deephaven.proto.backplane.grpc.HierarchicalTableViewKeyTableDescriptor)
-  ::uint32_t cached_has_bits = 0;
-  (void)cached_has_bits;
-
-  cached_has_bits = _impl_._has_bits_[0];
-  // .io.deephaven.proto.backplane.grpc.Ticket key_table_id = 1;
-  if (cached_has_bits & 0x00000002u) {
-    target = ::google::protobuf::internal::WireFormatLite::InternalWriteMessage(
-        1, _Internal::key_table_id(this),
-        _Internal::key_table_id(this).GetCachedSize(), target, stream);
-  }
-
-  // optional string key_table_action_column = 2;
-  if (cached_has_bits & 0x00000001u) {
-    const std::string& _s = this->_internal_key_table_action_column();
-    ::google::protobuf::internal::WireFormatLite::VerifyUtf8String(
-        _s.data(), static_cast<int>(_s.length()), ::google::protobuf::internal::WireFormatLite::SERIALIZE, "io.deephaven.proto.backplane.grpc.HierarchicalTableViewKeyTableDescriptor.key_table_action_column");
-    target = stream->WriteStringMaybeAliased(2, _s, target);
-  }
-
-  if (PROTOBUF_PREDICT_FALSE(_internal_metadata_.have_unknown_fields())) {
-    target =
-        ::_pbi::WireFormat::InternalSerializeUnknownFieldsToArray(
-            _internal_metadata_.unknown_fields<::google::protobuf::UnknownFieldSet>(::google::protobuf::UnknownFieldSet::default_instance), target, stream);
-  }
-  // @@protoc_insertion_point(serialize_to_array_end:io.deephaven.proto.backplane.grpc.HierarchicalTableViewKeyTableDescriptor)
-  return target;
-}
-
-::size_t HierarchicalTableViewKeyTableDescriptor::ByteSizeLong() const {
-// @@protoc_insertion_point(message_byte_size_start:io.deephaven.proto.backplane.grpc.HierarchicalTableViewKeyTableDescriptor)
-  ::size_t total_size = 0;
-
-  ::uint32_t cached_has_bits = 0;
-  // Prevent compiler warnings about cached_has_bits being unused
-  (void) cached_has_bits;
-
-  cached_has_bits = _impl_._has_bits_[0];
-  if (cached_has_bits & 0x00000003u) {
-    // optional string key_table_action_column = 2;
-    if (cached_has_bits & 0x00000001u) {
-      total_size += 1 + ::google::protobuf::internal::WireFormatLite::StringSize(
-                                      this->_internal_key_table_action_column());
-    }
-
-    // .io.deephaven.proto.backplane.grpc.Ticket key_table_id = 1;
-    if (cached_has_bits & 0x00000002u) {
-      total_size +=
-          1 + ::google::protobuf::internal::WireFormatLite::MessageSize(*_impl_.key_table_id_);
-    }
-
-  }
-  return MaybeComputeUnknownFieldsSize(total_size, &_impl_._cached_size_);
-}
-
-const ::google::protobuf::Message::ClassData HierarchicalTableViewKeyTableDescriptor::_class_data_ = {
-    HierarchicalTableViewKeyTableDescriptor::MergeImpl,
-    nullptr,  // OnDemandRegisterArenaDtor
-};
-const ::google::protobuf::Message::ClassData* HierarchicalTableViewKeyTableDescriptor::GetClassData() const {
-  return &_class_data_;
-}
-
-void HierarchicalTableViewKeyTableDescriptor::MergeImpl(::google::protobuf::Message& to_msg, const ::google::protobuf::Message& from_msg) {
-  auto* const _this = static_cast<HierarchicalTableViewKeyTableDescriptor*>(&to_msg);
-  auto& from = static_cast<const HierarchicalTableViewKeyTableDescriptor&>(from_msg);
-  // @@protoc_insertion_point(class_specific_merge_from_start:io.deephaven.proto.backplane.grpc.HierarchicalTableViewKeyTableDescriptor)
-  ABSL_DCHECK_NE(&from, _this);
-  ::uint32_t cached_has_bits = 0;
-  (void) cached_has_bits;
-
-  cached_has_bits = from._impl_._has_bits_[0];
-  if (cached_has_bits & 0x00000003u) {
-    if (cached_has_bits & 0x00000001u) {
-      _this->_internal_set_key_table_action_column(from._internal_key_table_action_column());
-    }
-    if (cached_has_bits & 0x00000002u) {
-      _this->_internal_mutable_key_table_id()->::io::deephaven::proto::backplane::grpc::Ticket::MergeFrom(
-          from._internal_key_table_id());
-    }
-  }
-  _this->_internal_metadata_.MergeFrom<::google::protobuf::UnknownFieldSet>(from._internal_metadata_);
-}
-
-void HierarchicalTableViewKeyTableDescriptor::CopyFrom(const HierarchicalTableViewKeyTableDescriptor& from) {
-// @@protoc_insertion_point(class_specific_copy_from_start:io.deephaven.proto.backplane.grpc.HierarchicalTableViewKeyTableDescriptor)
-  if (&from == this) return;
-  Clear();
-  MergeFrom(from);
-}
-
-PROTOBUF_NOINLINE bool HierarchicalTableViewKeyTableDescriptor::IsInitialized() const {
-  return true;
-}
-
-::_pbi::CachedSize* HierarchicalTableViewKeyTableDescriptor::AccessCachedSize() const {
-  return &_impl_._cached_size_;
-}
-void HierarchicalTableViewKeyTableDescriptor::InternalSwap(HierarchicalTableViewKeyTableDescriptor* PROTOBUF_RESTRICT other) {
-  using std::swap;
-  auto* arena = GetArena();
-  ABSL_DCHECK_EQ(arena, other->GetArena());
-  _internal_metadata_.InternalSwap(&other->_internal_metadata_);
-  swap(_impl_._has_bits_[0], other->_impl_._has_bits_[0]);
-  ::_pbi::ArenaStringPtr::InternalSwap(&_impl_.key_table_action_column_, &other->_impl_.key_table_action_column_, arena);
-  swap(_impl_.key_table_id_, other->_impl_.key_table_id_);
-}
-
-::google::protobuf::Metadata HierarchicalTableViewKeyTableDescriptor::GetMetadata() const {
-  return ::_pbi::AssignDescriptors(
-      &descriptor_table_deephaven_2fproto_2fhierarchicaltable_2eproto_getter, &descriptor_table_deephaven_2fproto_2fhierarchicaltable_2eproto_once,
-      file_level_metadata_deephaven_2fproto_2fhierarchicaltable_2eproto[8]);
-}
-// ===================================================================
-
-class HierarchicalTableViewResponse::_Internal {
- public:
-};
-
-HierarchicalTableViewResponse::HierarchicalTableViewResponse(::google::protobuf::Arena* arena)
-    : ::google::protobuf::internal::ZeroFieldsBase(arena) {
-  // @@protoc_insertion_point(arena_constructor:io.deephaven.proto.backplane.grpc.HierarchicalTableViewResponse)
-}
-HierarchicalTableViewResponse::HierarchicalTableViewResponse(
-    ::google::protobuf::Arena* arena,
-    const HierarchicalTableViewResponse& from)
-    : ::google::protobuf::internal::ZeroFieldsBase(arena) {
-  HierarchicalTableViewResponse* const _this = this;
-  (void)_this;
-  _internal_metadata_.MergeFrom<::google::protobuf::UnknownFieldSet>(
-      from._internal_metadata_);
-
-  // @@protoc_insertion_point(copy_constructor:io.deephaven.proto.backplane.grpc.HierarchicalTableViewResponse)
-}
-
-
-
-
-
-
-
-
-
-::google::protobuf::Metadata HierarchicalTableViewResponse::GetMetadata() const {
-  return ::_pbi::AssignDescriptors(
-      &descriptor_table_deephaven_2fproto_2fhierarchicaltable_2eproto_getter, &descriptor_table_deephaven_2fproto_2fhierarchicaltable_2eproto_once,
-      file_level_metadata_deephaven_2fproto_2fhierarchicaltable_2eproto[9]);
-}
-// ===================================================================
-
-class HierarchicalTableSourceExportRequest::_Internal {
- public:
-  using HasBits = decltype(std::declval<HierarchicalTableSourceExportRequest>()._impl_._has_bits_);
-  static constexpr ::int32_t kHasBitsOffset =
-    8 * PROTOBUF_FIELD_OFFSET(HierarchicalTableSourceExportRequest, _impl_._has_bits_);
-  static const ::io::deephaven::proto::backplane::grpc::Ticket& result_table_id(const HierarchicalTableSourceExportRequest* msg);
-  static void set_has_result_table_id(HasBits* has_bits) {
-    (*has_bits)[0] |= 1u;
-  }
-  static const ::io::deephaven::proto::backplane::grpc::Ticket& hierarchical_table_id(const HierarchicalTableSourceExportRequest* msg);
-  static void set_has_hierarchical_table_id(HasBits* has_bits) {
-    (*has_bits)[0] |= 2u;
-  }
-};
-
-const ::io::deephaven::proto::backplane::grpc::Ticket& HierarchicalTableSourceExportRequest::_Internal::result_table_id(const HierarchicalTableSourceExportRequest* msg) {
-  return *msg->_impl_.result_table_id_;
-}
-const ::io::deephaven::proto::backplane::grpc::Ticket& HierarchicalTableSourceExportRequest::_Internal::hierarchical_table_id(const HierarchicalTableSourceExportRequest* msg) {
-  return *msg->_impl_.hierarchical_table_id_;
-}
-void HierarchicalTableSourceExportRequest::clear_result_table_id() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  if (_impl_.result_table_id_ != nullptr) _impl_.result_table_id_->Clear();
-  _impl_._has_bits_[0] &= ~0x00000001u;
-}
-void HierarchicalTableSourceExportRequest::clear_hierarchical_table_id() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  if (_impl_.hierarchical_table_id_ != nullptr) _impl_.hierarchical_table_id_->Clear();
-  _impl_._has_bits_[0] &= ~0x00000002u;
-}
-HierarchicalTableSourceExportRequest::HierarchicalTableSourceExportRequest(::google::protobuf::Arena* arena)
-    : ::google::protobuf::Message(arena) {
-  SharedCtor(arena);
-  // @@protoc_insertion_point(arena_constructor:io.deephaven.proto.backplane.grpc.HierarchicalTableSourceExportRequest)
-}
-inline PROTOBUF_NDEBUG_INLINE HierarchicalTableSourceExportRequest::Impl_::Impl_(
-    ::google::protobuf::internal::InternalVisibility visibility, ::google::protobuf::Arena* arena,
-    const Impl_& from)
-      : _has_bits_{from._has_bits_},
-        _cached_size_{0} {}
-
-HierarchicalTableSourceExportRequest::HierarchicalTableSourceExportRequest(
-    ::google::protobuf::Arena* arena,
-    const HierarchicalTableSourceExportRequest& from)
-    : ::google::protobuf::Message(arena) {
-  HierarchicalTableSourceExportRequest* const _this = this;
-  (void)_this;
-  _internal_metadata_.MergeFrom<::google::protobuf::UnknownFieldSet>(
-      from._internal_metadata_);
-  new (&_impl_) Impl_(internal_visibility(), arena, from._impl_);
-  ::uint32_t cached_has_bits = _impl_._has_bits_[0];
-  _impl_.result_table_id_ = (cached_has_bits & 0x00000001u)
-                ? CreateMaybeMessage<::io::deephaven::proto::backplane::grpc::Ticket>(arena, *from._impl_.result_table_id_)
-                : nullptr;
-  _impl_.hierarchical_table_id_ = (cached_has_bits & 0x00000002u)
-                ? CreateMaybeMessage<::io::deephaven::proto::backplane::grpc::Ticket>(arena, *from._impl_.hierarchical_table_id_)
-                : nullptr;
-
-  // @@protoc_insertion_point(copy_constructor:io.deephaven.proto.backplane.grpc.HierarchicalTableSourceExportRequest)
-}
-inline PROTOBUF_NDEBUG_INLINE HierarchicalTableSourceExportRequest::Impl_::Impl_(
-    ::google::protobuf::internal::InternalVisibility visibility,
-    ::google::protobuf::Arena* arena)
-      : _cached_size_{0} {}
-
-inline void HierarchicalTableSourceExportRequest::SharedCtor(::_pb::Arena* arena) {
-  new (&_impl_) Impl_(internal_visibility(), arena);
-  ::memset(reinterpret_cast<char *>(&_impl_) +
-               offsetof(Impl_, result_table_id_),
-           0,
-           offsetof(Impl_, hierarchical_table_id_) -
-               offsetof(Impl_, result_table_id_) +
-               sizeof(Impl_::hierarchical_table_id_));
-}
-HierarchicalTableSourceExportRequest::~HierarchicalTableSourceExportRequest() {
-  // @@protoc_insertion_point(destructor:io.deephaven.proto.backplane.grpc.HierarchicalTableSourceExportRequest)
-  _internal_metadata_.Delete<::google::protobuf::UnknownFieldSet>();
-  SharedDtor();
-}
-inline void HierarchicalTableSourceExportRequest::SharedDtor() {
-  ABSL_DCHECK(GetArena() == nullptr);
-  delete _impl_.result_table_id_;
-  delete _impl_.hierarchical_table_id_;
-  _impl_.~Impl_();
-}
-
-PROTOBUF_NOINLINE void HierarchicalTableSourceExportRequest::Clear() {
-// @@protoc_insertion_point(message_clear_start:io.deephaven.proto.backplane.grpc.HierarchicalTableSourceExportRequest)
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  ::uint32_t cached_has_bits = 0;
-  // Prevent compiler warnings about cached_has_bits being unused
-  (void) cached_has_bits;
-
-  cached_has_bits = _impl_._has_bits_[0];
-  if (cached_has_bits & 0x00000003u) {
-    if (cached_has_bits & 0x00000001u) {
-      ABSL_DCHECK(_impl_.result_table_id_ != nullptr);
-      _impl_.result_table_id_->Clear();
-    }
-    if (cached_has_bits & 0x00000002u) {
-      ABSL_DCHECK(_impl_.hierarchical_table_id_ != nullptr);
-      _impl_.hierarchical_table_id_->Clear();
-    }
-  }
-  _impl_._has_bits_.Clear();
-  _internal_metadata_.Clear<::google::protobuf::UnknownFieldSet>();
-}
-
-const char* HierarchicalTableSourceExportRequest::_InternalParse(
-    const char* ptr, ::_pbi::ParseContext* ctx) {
-  ptr = ::_pbi::TcParser::ParseLoop(this, ptr, ctx, &_table_.header);
-  return ptr;
-}
-
-
-PROTOBUF_CONSTINIT PROTOBUF_ATTRIBUTE_INIT_PRIORITY1
-const ::_pbi::TcParseTable<1, 2, 2, 0, 2> HierarchicalTableSourceExportRequest::_table_ = {
-  {
-    PROTOBUF_FIELD_OFFSET(HierarchicalTableSourceExportRequest, _impl_._has_bits_),
-    0, // no _extensions_
-    2, 8,  // max_field_number, fast_idx_mask
-    offsetof(decltype(_table_), field_lookup_table),
-    4294967292,  // skipmap
-    offsetof(decltype(_table_), field_entries),
-    2,  // num_field_entries
-    2,  // num_aux_entries
-    offsetof(decltype(_table_), aux_entries),
-    &_HierarchicalTableSourceExportRequest_default_instance_._instance,
-    ::_pbi::TcParser::GenericFallback,  // fallback
-  }, {{
-    // .io.deephaven.proto.backplane.grpc.Ticket hierarchical_table_id = 2;
-    {::_pbi::TcParser::FastMtS1,
-     {18, 1, 1, PROTOBUF_FIELD_OFFSET(HierarchicalTableSourceExportRequest, _impl_.hierarchical_table_id_)}},
-    // .io.deephaven.proto.backplane.grpc.Ticket result_table_id = 1;
-    {::_pbi::TcParser::FastMtS1,
-     {10, 0, 0, PROTOBUF_FIELD_OFFSET(HierarchicalTableSourceExportRequest, _impl_.result_table_id_)}},
-  }}, {{
-    65535, 65535
-  }}, {{
-    // .io.deephaven.proto.backplane.grpc.Ticket result_table_id = 1;
-    {PROTOBUF_FIELD_OFFSET(HierarchicalTableSourceExportRequest, _impl_.result_table_id_), _Internal::kHasBitsOffset + 0, 0,
-    (0 | ::_fl::kFcOptional | ::_fl::kMessage | ::_fl::kTvTable)},
-    // .io.deephaven.proto.backplane.grpc.Ticket hierarchical_table_id = 2;
-    {PROTOBUF_FIELD_OFFSET(HierarchicalTableSourceExportRequest, _impl_.hierarchical_table_id_), _Internal::kHasBitsOffset + 1, 1,
-    (0 | ::_fl::kFcOptional | ::_fl::kMessage | ::_fl::kTvTable)},
-  }}, {{
-    {::_pbi::TcParser::GetTable<::io::deephaven::proto::backplane::grpc::Ticket>()},
-    {::_pbi::TcParser::GetTable<::io::deephaven::proto::backplane::grpc::Ticket>()},
-  }}, {{
-  }},
-};
-
-::uint8_t* HierarchicalTableSourceExportRequest::_InternalSerialize(
-    ::uint8_t* target,
-    ::google::protobuf::io::EpsCopyOutputStream* stream) const {
-  // @@protoc_insertion_point(serialize_to_array_start:io.deephaven.proto.backplane.grpc.HierarchicalTableSourceExportRequest)
-  ::uint32_t cached_has_bits = 0;
-  (void)cached_has_bits;
-
-  cached_has_bits = _impl_._has_bits_[0];
-  // .io.deephaven.proto.backplane.grpc.Ticket result_table_id = 1;
-  if (cached_has_bits & 0x00000001u) {
-    target = ::google::protobuf::internal::WireFormatLite::InternalWriteMessage(
-        1, _Internal::result_table_id(this),
-        _Internal::result_table_id(this).GetCachedSize(), target, stream);
-  }
-
-  // .io.deephaven.proto.backplane.grpc.Ticket hierarchical_table_id = 2;
-  if (cached_has_bits & 0x00000002u) {
-    target = ::google::protobuf::internal::WireFormatLite::InternalWriteMessage(
-        2, _Internal::hierarchical_table_id(this),
-        _Internal::hierarchical_table_id(this).GetCachedSize(), target, stream);
-  }
-
-  if (PROTOBUF_PREDICT_FALSE(_internal_metadata_.have_unknown_fields())) {
-    target =
-        ::_pbi::WireFormat::InternalSerializeUnknownFieldsToArray(
-            _internal_metadata_.unknown_fields<::google::protobuf::UnknownFieldSet>(::google::protobuf::UnknownFieldSet::default_instance), target, stream);
-  }
-  // @@protoc_insertion_point(serialize_to_array_end:io.deephaven.proto.backplane.grpc.HierarchicalTableSourceExportRequest)
-  return target;
-}
-
-::size_t HierarchicalTableSourceExportRequest::ByteSizeLong() const {
-// @@protoc_insertion_point(message_byte_size_start:io.deephaven.proto.backplane.grpc.HierarchicalTableSourceExportRequest)
-  ::size_t total_size = 0;
-
-  ::uint32_t cached_has_bits = 0;
-  // Prevent compiler warnings about cached_has_bits being unused
-  (void) cached_has_bits;
-
-  cached_has_bits = _impl_._has_bits_[0];
-  if (cached_has_bits & 0x00000003u) {
-    // .io.deephaven.proto.backplane.grpc.Ticket result_table_id = 1;
-    if (cached_has_bits & 0x00000001u) {
-      total_size +=
-          1 + ::google::protobuf::internal::WireFormatLite::MessageSize(*_impl_.result_table_id_);
-    }
-
-    // .io.deephaven.proto.backplane.grpc.Ticket hierarchical_table_id = 2;
-    if (cached_has_bits & 0x00000002u) {
-      total_size +=
-          1 + ::google::protobuf::internal::WireFormatLite::MessageSize(*_impl_.hierarchical_table_id_);
-    }
-
-  }
-  return MaybeComputeUnknownFieldsSize(total_size, &_impl_._cached_size_);
-}
-
-const ::google::protobuf::Message::ClassData HierarchicalTableSourceExportRequest::_class_data_ = {
-    HierarchicalTableSourceExportRequest::MergeImpl,
-    nullptr,  // OnDemandRegisterArenaDtor
-};
-const ::google::protobuf::Message::ClassData* HierarchicalTableSourceExportRequest::GetClassData() const {
-  return &_class_data_;
-}
-
-void HierarchicalTableSourceExportRequest::MergeImpl(::google::protobuf::Message& to_msg, const ::google::protobuf::Message& from_msg) {
-  auto* const _this = static_cast<HierarchicalTableSourceExportRequest*>(&to_msg);
-  auto& from = static_cast<const HierarchicalTableSourceExportRequest&>(from_msg);
-  // @@protoc_insertion_point(class_specific_merge_from_start:io.deephaven.proto.backplane.grpc.HierarchicalTableSourceExportRequest)
-  ABSL_DCHECK_NE(&from, _this);
-  ::uint32_t cached_has_bits = 0;
-  (void) cached_has_bits;
-
-  cached_has_bits = from._impl_._has_bits_[0];
-  if (cached_has_bits & 0x00000003u) {
-    if (cached_has_bits & 0x00000001u) {
-      _this->_internal_mutable_result_table_id()->::io::deephaven::proto::backplane::grpc::Ticket::MergeFrom(
-          from._internal_result_table_id());
-    }
-    if (cached_has_bits & 0x00000002u) {
-      _this->_internal_mutable_hierarchical_table_id()->::io::deephaven::proto::backplane::grpc::Ticket::MergeFrom(
-          from._internal_hierarchical_table_id());
-    }
-  }
-  _this->_internal_metadata_.MergeFrom<::google::protobuf::UnknownFieldSet>(from._internal_metadata_);
-}
-
-void HierarchicalTableSourceExportRequest::CopyFrom(const HierarchicalTableSourceExportRequest& from) {
-// @@protoc_insertion_point(class_specific_copy_from_start:io.deephaven.proto.backplane.grpc.HierarchicalTableSourceExportRequest)
-  if (&from == this) return;
-  Clear();
-  MergeFrom(from);
-}
-
-PROTOBUF_NOINLINE bool HierarchicalTableSourceExportRequest::IsInitialized() const {
-  return true;
-}
-
-::_pbi::CachedSize* HierarchicalTableSourceExportRequest::AccessCachedSize() const {
-  return &_impl_._cached_size_;
-}
-void HierarchicalTableSourceExportRequest::InternalSwap(HierarchicalTableSourceExportRequest* PROTOBUF_RESTRICT other) {
-  using std::swap;
-  _internal_metadata_.InternalSwap(&other->_internal_metadata_);
-  swap(_impl_._has_bits_[0], other->_impl_._has_bits_[0]);
-  ::google::protobuf::internal::memswap<
-      PROTOBUF_FIELD_OFFSET(HierarchicalTableSourceExportRequest, _impl_.hierarchical_table_id_)
-      + sizeof(HierarchicalTableSourceExportRequest::_impl_.hierarchical_table_id_)
-      - PROTOBUF_FIELD_OFFSET(HierarchicalTableSourceExportRequest, _impl_.result_table_id_)>(
-          reinterpret_cast<char*>(&_impl_.result_table_id_),
-          reinterpret_cast<char*>(&other->_impl_.result_table_id_));
-}
-
-::google::protobuf::Metadata HierarchicalTableSourceExportRequest::GetMetadata() const {
-  return ::_pbi::AssignDescriptors(
-      &descriptor_table_deephaven_2fproto_2fhierarchicaltable_2eproto_getter, &descriptor_table_deephaven_2fproto_2fhierarchicaltable_2eproto_once,
-      file_level_metadata_deephaven_2fproto_2fhierarchicaltable_2eproto[10]);
-}
-// @@protoc_insertion_point(namespace_scope)
-}  // namespace grpc
-}  // namespace backplane
-}  // namespace proto
-}  // namespace deephaven
-}  // namespace io
-namespace google {
-namespace protobuf {
-}  // namespace protobuf
-}  // namespace google
-// @@protoc_insertion_point(global_scope)
-#include "google/protobuf/port_undef.inc"
diff --git a/cpp-client/deephaven/dhclient/proto/deephaven/proto/hierarchicaltable.pb.h b/cpp-client/deephaven/dhclient/proto/deephaven/proto/hierarchicaltable.pb.h
deleted file mode 100644
index 6cd28312720..00000000000
--- a/cpp-client/deephaven/dhclient/proto/deephaven/proto/hierarchicaltable.pb.h
+++ /dev/null
@@ -1,4014 +0,0 @@
-// Generated by the protocol buffer compiler.  DO NOT EDIT!
-// source: deephaven/proto/hierarchicaltable.proto
-// Protobuf C++ Version: 4.25.3
-
-#ifndef GOOGLE_PROTOBUF_INCLUDED_deephaven_2fproto_2fhierarchicaltable_2eproto_2epb_2eh
-#define GOOGLE_PROTOBUF_INCLUDED_deephaven_2fproto_2fhierarchicaltable_2eproto_2epb_2eh
-
-#include <limits>
-#include <string>
-#include <type_traits>
-#include <utility>
-
-#include "google/protobuf/port_def.inc"
-#if PROTOBUF_VERSION < 4025000
-#error "This file was generated by a newer version of protoc which is"
-#error "incompatible with your Protocol Buffer headers. Please update"
-#error "your headers."
-#endif  // PROTOBUF_VERSION
-
-#if 4025003 < PROTOBUF_MIN_PROTOC_VERSION
-#error "This file was generated by an older version of protoc which is"
-#error "incompatible with your Protocol Buffer headers. Please"
-#error "regenerate this file with a newer version of protoc."
-#endif  // PROTOBUF_MIN_PROTOC_VERSION
-#include "google/protobuf/port_undef.inc"
-#include "google/protobuf/io/coded_stream.h"
-#include "google/protobuf/arena.h"
-#include "google/protobuf/arenastring.h"
-#include "google/protobuf/generated_message_bases.h"
-#include "google/protobuf/generated_message_tctable_decl.h"
-#include "google/protobuf/generated_message_util.h"
-#include "google/protobuf/metadata_lite.h"
-#include "google/protobuf/generated_message_reflection.h"
-#include "google/protobuf/message.h"
-#include "google/protobuf/repeated_field.h"  // IWYU pragma: export
-#include "google/protobuf/extension_set.h"  // IWYU pragma: export
-#include "google/protobuf/unknown_field_set.h"
-#include "deephaven/proto/table.pb.h"
-#include "deephaven/proto/ticket.pb.h"
-// @@protoc_insertion_point(includes)
-
-// Must be included last.
-#include "google/protobuf/port_def.inc"
-
-#define PROTOBUF_INTERNAL_EXPORT_deephaven_2fproto_2fhierarchicaltable_2eproto
-
-namespace google {
-namespace protobuf {
-namespace internal {
-class AnyMetadata;
-}  // namespace internal
-}  // namespace protobuf
-}  // namespace google
-
-// Internal implementation detail -- do not use these members.
-struct TableStruct_deephaven_2fproto_2fhierarchicaltable_2eproto {
-  static const ::uint32_t offsets[];
-};
-extern const ::google::protobuf::internal::DescriptorTable
-    descriptor_table_deephaven_2fproto_2fhierarchicaltable_2eproto;
-namespace io {
-namespace deephaven {
-namespace proto {
-namespace backplane {
-namespace grpc {
-class HierarchicalTableApplyRequest;
-struct HierarchicalTableApplyRequestDefaultTypeInternal;
-extern HierarchicalTableApplyRequestDefaultTypeInternal _HierarchicalTableApplyRequest_default_instance_;
-class HierarchicalTableApplyResponse;
-struct HierarchicalTableApplyResponseDefaultTypeInternal;
-extern HierarchicalTableApplyResponseDefaultTypeInternal _HierarchicalTableApplyResponse_default_instance_;
-class HierarchicalTableDescriptor;
-struct HierarchicalTableDescriptorDefaultTypeInternal;
-extern HierarchicalTableDescriptorDefaultTypeInternal _HierarchicalTableDescriptor_default_instance_;
-class HierarchicalTableSourceExportRequest;
-struct HierarchicalTableSourceExportRequestDefaultTypeInternal;
-extern HierarchicalTableSourceExportRequestDefaultTypeInternal _HierarchicalTableSourceExportRequest_default_instance_;
-class HierarchicalTableViewKeyTableDescriptor;
-struct HierarchicalTableViewKeyTableDescriptorDefaultTypeInternal;
-extern HierarchicalTableViewKeyTableDescriptorDefaultTypeInternal _HierarchicalTableViewKeyTableDescriptor_default_instance_;
-class HierarchicalTableViewRequest;
-struct HierarchicalTableViewRequestDefaultTypeInternal;
-extern HierarchicalTableViewRequestDefaultTypeInternal _HierarchicalTableViewRequest_default_instance_;
-class HierarchicalTableViewResponse;
-struct HierarchicalTableViewResponseDefaultTypeInternal;
-extern HierarchicalTableViewResponseDefaultTypeInternal _HierarchicalTableViewResponse_default_instance_;
-class RollupRequest;
-struct RollupRequestDefaultTypeInternal;
-extern RollupRequestDefaultTypeInternal _RollupRequest_default_instance_;
-class RollupResponse;
-struct RollupResponseDefaultTypeInternal;
-extern RollupResponseDefaultTypeInternal _RollupResponse_default_instance_;
-class TreeRequest;
-struct TreeRequestDefaultTypeInternal;
-extern TreeRequestDefaultTypeInternal _TreeRequest_default_instance_;
-class TreeResponse;
-struct TreeResponseDefaultTypeInternal;
-extern TreeResponseDefaultTypeInternal _TreeResponse_default_instance_;
-}  // namespace grpc
-}  // namespace backplane
-}  // namespace proto
-}  // namespace deephaven
-}  // namespace io
-namespace google {
-namespace protobuf {
-}  // namespace protobuf
-}  // namespace google
-
-namespace io {
-namespace deephaven {
-namespace proto {
-namespace backplane {
-namespace grpc {
-
-// ===================================================================
-
-
-// -------------------------------------------------------------------
-
-class TreeResponse final :
-    public ::google::protobuf::internal::ZeroFieldsBase /* @@protoc_insertion_point(class_definition:io.deephaven.proto.backplane.grpc.TreeResponse) */ {
- public:
-  inline TreeResponse() : TreeResponse(nullptr) {}
-  template<typename = void>
-  explicit PROTOBUF_CONSTEXPR TreeResponse(::google::protobuf::internal::ConstantInitialized);
-
-  inline TreeResponse(const TreeResponse& from)
-      : TreeResponse(nullptr, from) {}
-  TreeResponse(TreeResponse&& from) noexcept
-    : TreeResponse() {
-    *this = ::std::move(from);
-  }
-
-  inline TreeResponse& operator=(const TreeResponse& from) {
-    CopyFrom(from);
-    return *this;
-  }
-  inline TreeResponse& operator=(TreeResponse&& from) noexcept {
-    if (this == &from) return *this;
-    if (GetArena() == from.GetArena()
-  #ifdef PROTOBUF_FORCE_COPY_IN_MOVE
-        && GetArena() != nullptr
-  #endif  // !PROTOBUF_FORCE_COPY_IN_MOVE
-    ) {
-      InternalSwap(&from);
-    } else {
-      CopyFrom(from);
-    }
-    return *this;
-  }
-
-  inline const ::google::protobuf::UnknownFieldSet& unknown_fields() const
-      ABSL_ATTRIBUTE_LIFETIME_BOUND {
-    return _internal_metadata_.unknown_fields<::google::protobuf::UnknownFieldSet>(::google::protobuf::UnknownFieldSet::default_instance);
-  }
-  inline ::google::protobuf::UnknownFieldSet* mutable_unknown_fields()
-      ABSL_ATTRIBUTE_LIFETIME_BOUND {
-    return _internal_metadata_.mutable_unknown_fields<::google::protobuf::UnknownFieldSet>();
-  }
-
-  static const ::google::protobuf::Descriptor* descriptor() {
-    return GetDescriptor();
-  }
-  static const ::google::protobuf::Descriptor* GetDescriptor() {
-    return default_instance().GetMetadata().descriptor;
-  }
-  static const ::google::protobuf::Reflection* GetReflection() {
-    return default_instance().GetMetadata().reflection;
-  }
-  static const TreeResponse& default_instance() {
-    return *internal_default_instance();
-  }
-  static inline const TreeResponse* internal_default_instance() {
-    return reinterpret_cast<const TreeResponse*>(
-               &_TreeResponse_default_instance_);
-  }
-  static constexpr int kIndexInFileMessages =
-    3;
-
-  friend void swap(TreeResponse& a, TreeResponse& b) {
-    a.Swap(&b);
-  }
-  inline void Swap(TreeResponse* other) {
-    if (other == this) return;
-  #ifdef PROTOBUF_FORCE_COPY_IN_SWAP
-    if (GetArena() != nullptr &&
-        GetArena() == other->GetArena()) {
-   #else  // PROTOBUF_FORCE_COPY_IN_SWAP
-    if (GetArena() == other->GetArena()) {
-  #endif  // !PROTOBUF_FORCE_COPY_IN_SWAP
-      InternalSwap(other);
-    } else {
-      ::google::protobuf::internal::GenericSwap(this, other);
-    }
-  }
-  void UnsafeArenaSwap(TreeResponse* other) {
-    if (other == this) return;
-    ABSL_DCHECK(GetArena() == other->GetArena());
-    InternalSwap(other);
-  }
-
-  // implements Message ----------------------------------------------
-
-  TreeResponse* New(::google::protobuf::Arena* arena = nullptr) const final {
-    return CreateMaybeMessage<TreeResponse>(arena);
-  }
-  using ::google::protobuf::internal::ZeroFieldsBase::CopyFrom;
-  inline void CopyFrom(const TreeResponse& from) {
-    ::google::protobuf::internal::ZeroFieldsBase::CopyImpl(*this, from);
-  }
-  using ::google::protobuf::internal::ZeroFieldsBase::MergeFrom;
-  void MergeFrom(const TreeResponse& from) {
-    ::google::protobuf::internal::ZeroFieldsBase::MergeImpl(*this, from);
-  }
-  public:
-
-  private:
-  friend class ::google::protobuf::internal::AnyMetadata;
-  static ::absl::string_view FullMessageName() {
-    return "io.deephaven.proto.backplane.grpc.TreeResponse";
-  }
-  protected:
-  explicit TreeResponse(::google::protobuf::Arena* arena);
-  TreeResponse(::google::protobuf::Arena* arena, const TreeResponse& from);
-  public:
-
-  ::google::protobuf::Metadata GetMetadata() const final;
-
-  // nested types ----------------------------------------------------
-
-  // accessors -------------------------------------------------------
-
-  // @@protoc_insertion_point(class_scope:io.deephaven.proto.backplane.grpc.TreeResponse)
- private:
-  class _Internal;
-
-  friend class ::google::protobuf::MessageLite;
-  friend class ::google::protobuf::Arena;
-  template <typename T>
-  friend class ::google::protobuf::Arena::InternalHelper;
-  using InternalArenaConstructable_ = void;
-  using DestructorSkippable_ = void;
-  struct Impl_ {
-
-        inline explicit constexpr Impl_(
-            ::google::protobuf::internal::ConstantInitialized) noexcept;
-        inline explicit Impl_(::google::protobuf::internal::InternalVisibility visibility,
-                              ::google::protobuf::Arena* arena);
-        inline explicit Impl_(::google::protobuf::internal::InternalVisibility visibility,
-                              ::google::protobuf::Arena* arena, const Impl_& from);
-    PROTOBUF_TSAN_DECLARE_MEMBER
-  };
-  friend struct ::TableStruct_deephaven_2fproto_2fhierarchicaltable_2eproto;
-};// -------------------------------------------------------------------
-
-class RollupResponse final :
-    public ::google::protobuf::internal::ZeroFieldsBase /* @@protoc_insertion_point(class_definition:io.deephaven.proto.backplane.grpc.RollupResponse) */ {
- public:
-  inline RollupResponse() : RollupResponse(nullptr) {}
-  template<typename = void>
-  explicit PROTOBUF_CONSTEXPR RollupResponse(::google::protobuf::internal::ConstantInitialized);
-
-  inline RollupResponse(const RollupResponse& from)
-      : RollupResponse(nullptr, from) {}
-  RollupResponse(RollupResponse&& from) noexcept
-    : RollupResponse() {
-    *this = ::std::move(from);
-  }
-
-  inline RollupResponse& operator=(const RollupResponse& from) {
-    CopyFrom(from);
-    return *this;
-  }
-  inline RollupResponse& operator=(RollupResponse&& from) noexcept {
-    if (this == &from) return *this;
-    if (GetArena() == from.GetArena()
-  #ifdef PROTOBUF_FORCE_COPY_IN_MOVE
-        && GetArena() != nullptr
-  #endif  // !PROTOBUF_FORCE_COPY_IN_MOVE
-    ) {
-      InternalSwap(&from);
-    } else {
-      CopyFrom(from);
-    }
-    return *this;
-  }
-
-  inline const ::google::protobuf::UnknownFieldSet& unknown_fields() const
-      ABSL_ATTRIBUTE_LIFETIME_BOUND {
-    return _internal_metadata_.unknown_fields<::google::protobuf::UnknownFieldSet>(::google::protobuf::UnknownFieldSet::default_instance);
-  }
-  inline ::google::protobuf::UnknownFieldSet* mutable_unknown_fields()
-      ABSL_ATTRIBUTE_LIFETIME_BOUND {
-    return _internal_metadata_.mutable_unknown_fields<::google::protobuf::UnknownFieldSet>();
-  }
-
-  static const ::google::protobuf::Descriptor* descriptor() {
-    return GetDescriptor();
-  }
-  static const ::google::protobuf::Descriptor* GetDescriptor() {
-    return default_instance().GetMetadata().descriptor;
-  }
-  static const ::google::protobuf::Reflection* GetReflection() {
-    return default_instance().GetMetadata().reflection;
-  }
-  static const RollupResponse& default_instance() {
-    return *internal_default_instance();
-  }
-  static inline const RollupResponse* internal_default_instance() {
-    return reinterpret_cast<const RollupResponse*>(
-               &_RollupResponse_default_instance_);
-  }
-  static constexpr int kIndexInFileMessages =
-    1;
-
-  friend void swap(RollupResponse& a, RollupResponse& b) {
-    a.Swap(&b);
-  }
-  inline void Swap(RollupResponse* other) {
-    if (other == this) return;
-  #ifdef PROTOBUF_FORCE_COPY_IN_SWAP
-    if (GetArena() != nullptr &&
-        GetArena() == other->GetArena()) {
-   #else  // PROTOBUF_FORCE_COPY_IN_SWAP
-    if (GetArena() == other->GetArena()) {
-  #endif  // !PROTOBUF_FORCE_COPY_IN_SWAP
-      InternalSwap(other);
-    } else {
-      ::google::protobuf::internal::GenericSwap(this, other);
-    }
-  }
-  void UnsafeArenaSwap(RollupResponse* other) {
-    if (other == this) return;
-    ABSL_DCHECK(GetArena() == other->GetArena());
-    InternalSwap(other);
-  }
-
-  // implements Message ----------------------------------------------
-
-  RollupResponse* New(::google::protobuf::Arena* arena = nullptr) const final {
-    return CreateMaybeMessage<RollupResponse>(arena);
-  }
-  using ::google::protobuf::internal::ZeroFieldsBase::CopyFrom;
-  inline void CopyFrom(const RollupResponse& from) {
-    ::google::protobuf::internal::ZeroFieldsBase::CopyImpl(*this, from);
-  }
-  using ::google::protobuf::internal::ZeroFieldsBase::MergeFrom;
-  void MergeFrom(const RollupResponse& from) {
-    ::google::protobuf::internal::ZeroFieldsBase::MergeImpl(*this, from);
-  }
-  public:
-
-  private:
-  friend class ::google::protobuf::internal::AnyMetadata;
-  static ::absl::string_view FullMessageName() {
-    return "io.deephaven.proto.backplane.grpc.RollupResponse";
-  }
-  protected:
-  explicit RollupResponse(::google::protobuf::Arena* arena);
-  RollupResponse(::google::protobuf::Arena* arena, const RollupResponse& from);
-  public:
-
-  ::google::protobuf::Metadata GetMetadata() const final;
-
-  // nested types ----------------------------------------------------
-
-  // accessors -------------------------------------------------------
-
-  // @@protoc_insertion_point(class_scope:io.deephaven.proto.backplane.grpc.RollupResponse)
- private:
-  class _Internal;
-
-  friend class ::google::protobuf::MessageLite;
-  friend class ::google::protobuf::Arena;
-  template <typename T>
-  friend class ::google::protobuf::Arena::InternalHelper;
-  using InternalArenaConstructable_ = void;
-  using DestructorSkippable_ = void;
-  struct Impl_ {
-
-        inline explicit constexpr Impl_(
-            ::google::protobuf::internal::ConstantInitialized) noexcept;
-        inline explicit Impl_(::google::protobuf::internal::InternalVisibility visibility,
-                              ::google::protobuf::Arena* arena);
-        inline explicit Impl_(::google::protobuf::internal::InternalVisibility visibility,
-                              ::google::protobuf::Arena* arena, const Impl_& from);
-    PROTOBUF_TSAN_DECLARE_MEMBER
-  };
-  friend struct ::TableStruct_deephaven_2fproto_2fhierarchicaltable_2eproto;
-};// -------------------------------------------------------------------
-
-class HierarchicalTableViewResponse final :
-    public ::google::protobuf::internal::ZeroFieldsBase /* @@protoc_insertion_point(class_definition:io.deephaven.proto.backplane.grpc.HierarchicalTableViewResponse) */ {
- public:
-  inline HierarchicalTableViewResponse() : HierarchicalTableViewResponse(nullptr) {}
-  template<typename = void>
-  explicit PROTOBUF_CONSTEXPR HierarchicalTableViewResponse(::google::protobuf::internal::ConstantInitialized);
-
-  inline HierarchicalTableViewResponse(const HierarchicalTableViewResponse& from)
-      : HierarchicalTableViewResponse(nullptr, from) {}
-  HierarchicalTableViewResponse(HierarchicalTableViewResponse&& from) noexcept
-    : HierarchicalTableViewResponse() {
-    *this = ::std::move(from);
-  }
-
-  inline HierarchicalTableViewResponse& operator=(const HierarchicalTableViewResponse& from) {
-    CopyFrom(from);
-    return *this;
-  }
-  inline HierarchicalTableViewResponse& operator=(HierarchicalTableViewResponse&& from) noexcept {
-    if (this == &from) return *this;
-    if (GetArena() == from.GetArena()
-  #ifdef PROTOBUF_FORCE_COPY_IN_MOVE
-        && GetArena() != nullptr
-  #endif  // !PROTOBUF_FORCE_COPY_IN_MOVE
-    ) {
-      InternalSwap(&from);
-    } else {
-      CopyFrom(from);
-    }
-    return *this;
-  }
-
-  inline const ::google::protobuf::UnknownFieldSet& unknown_fields() const
-      ABSL_ATTRIBUTE_LIFETIME_BOUND {
-    return _internal_metadata_.unknown_fields<::google::protobuf::UnknownFieldSet>(::google::protobuf::UnknownFieldSet::default_instance);
-  }
-  inline ::google::protobuf::UnknownFieldSet* mutable_unknown_fields()
-      ABSL_ATTRIBUTE_LIFETIME_BOUND {
-    return _internal_metadata_.mutable_unknown_fields<::google::protobuf::UnknownFieldSet>();
-  }
-
-  static const ::google::protobuf::Descriptor* descriptor() {
-    return GetDescriptor();
-  }
-  static const ::google::protobuf::Descriptor* GetDescriptor() {
-    return default_instance().GetMetadata().descriptor;
-  }
-  static const ::google::protobuf::Reflection* GetReflection() {
-    return default_instance().GetMetadata().reflection;
-  }
-  static const HierarchicalTableViewResponse& default_instance() {
-    return *internal_default_instance();
-  }
-  static inline const HierarchicalTableViewResponse* internal_default_instance() {
-    return reinterpret_cast<const HierarchicalTableViewResponse*>(
-               &_HierarchicalTableViewResponse_default_instance_);
-  }
-  static constexpr int kIndexInFileMessages =
-    9;
-
-  friend void swap(HierarchicalTableViewResponse& a, HierarchicalTableViewResponse& b) {
-    a.Swap(&b);
-  }
-  inline void Swap(HierarchicalTableViewResponse* other) {
-    if (other == this) return;
-  #ifdef PROTOBUF_FORCE_COPY_IN_SWAP
-    if (GetArena() != nullptr &&
-        GetArena() == other->GetArena()) {
-   #else  // PROTOBUF_FORCE_COPY_IN_SWAP
-    if (GetArena() == other->GetArena()) {
-  #endif  // !PROTOBUF_FORCE_COPY_IN_SWAP
-      InternalSwap(other);
-    } else {
-      ::google::protobuf::internal::GenericSwap(this, other);
-    }
-  }
-  void UnsafeArenaSwap(HierarchicalTableViewResponse* other) {
-    if (other == this) return;
-    ABSL_DCHECK(GetArena() == other->GetArena());
-    InternalSwap(other);
-  }
-
-  // implements Message ----------------------------------------------
-
-  HierarchicalTableViewResponse* New(::google::protobuf::Arena* arena = nullptr) const final {
-    return CreateMaybeMessage<HierarchicalTableViewResponse>(arena);
-  }
-  using ::google::protobuf::internal::ZeroFieldsBase::CopyFrom;
-  inline void CopyFrom(const HierarchicalTableViewResponse& from) {
-    ::google::protobuf::internal::ZeroFieldsBase::CopyImpl(*this, from);
-  }
-  using ::google::protobuf::internal::ZeroFieldsBase::MergeFrom;
-  void MergeFrom(const HierarchicalTableViewResponse& from) {
-    ::google::protobuf::internal::ZeroFieldsBase::MergeImpl(*this, from);
-  }
-  public:
-
-  private:
-  friend class ::google::protobuf::internal::AnyMetadata;
-  static ::absl::string_view FullMessageName() {
-    return "io.deephaven.proto.backplane.grpc.HierarchicalTableViewResponse";
-  }
-  protected:
-  explicit HierarchicalTableViewResponse(::google::protobuf::Arena* arena);
-  HierarchicalTableViewResponse(::google::protobuf::Arena* arena, const HierarchicalTableViewResponse& from);
-  public:
-
-  ::google::protobuf::Metadata GetMetadata() const final;
-
-  // nested types ----------------------------------------------------
-
-  // accessors -------------------------------------------------------
-
-  // @@protoc_insertion_point(class_scope:io.deephaven.proto.backplane.grpc.HierarchicalTableViewResponse)
- private:
-  class _Internal;
-
-  friend class ::google::protobuf::MessageLite;
-  friend class ::google::protobuf::Arena;
-  template <typename T>
-  friend class ::google::protobuf::Arena::InternalHelper;
-  using InternalArenaConstructable_ = void;
-  using DestructorSkippable_ = void;
-  struct Impl_ {
-
-        inline explicit constexpr Impl_(
-            ::google::protobuf::internal::ConstantInitialized) noexcept;
-        inline explicit Impl_(::google::protobuf::internal::InternalVisibility visibility,
-                              ::google::protobuf::Arena* arena);
-        inline explicit Impl_(::google::protobuf::internal::InternalVisibility visibility,
-                              ::google::protobuf::Arena* arena, const Impl_& from);
-    PROTOBUF_TSAN_DECLARE_MEMBER
-  };
-  friend struct ::TableStruct_deephaven_2fproto_2fhierarchicaltable_2eproto;
-};// -------------------------------------------------------------------
-
-class HierarchicalTableDescriptor final :
-    public ::google::protobuf::Message /* @@protoc_insertion_point(class_definition:io.deephaven.proto.backplane.grpc.HierarchicalTableDescriptor) */ {
- public:
-  inline HierarchicalTableDescriptor() : HierarchicalTableDescriptor(nullptr) {}
-  ~HierarchicalTableDescriptor() override;
-  template<typename = void>
-  explicit PROTOBUF_CONSTEXPR HierarchicalTableDescriptor(::google::protobuf::internal::ConstantInitialized);
-
-  inline HierarchicalTableDescriptor(const HierarchicalTableDescriptor& from)
-      : HierarchicalTableDescriptor(nullptr, from) {}
-  HierarchicalTableDescriptor(HierarchicalTableDescriptor&& from) noexcept
-    : HierarchicalTableDescriptor() {
-    *this = ::std::move(from);
-  }
-
-  inline HierarchicalTableDescriptor& operator=(const HierarchicalTableDescriptor& from) {
-    CopyFrom(from);
-    return *this;
-  }
-  inline HierarchicalTableDescriptor& operator=(HierarchicalTableDescriptor&& from) noexcept {
-    if (this == &from) return *this;
-    if (GetArena() == from.GetArena()
-  #ifdef PROTOBUF_FORCE_COPY_IN_MOVE
-        && GetArena() != nullptr
-  #endif  // !PROTOBUF_FORCE_COPY_IN_MOVE
-    ) {
-      InternalSwap(&from);
-    } else {
-      CopyFrom(from);
-    }
-    return *this;
-  }
-
-  inline const ::google::protobuf::UnknownFieldSet& unknown_fields() const
-      ABSL_ATTRIBUTE_LIFETIME_BOUND {
-    return _internal_metadata_.unknown_fields<::google::protobuf::UnknownFieldSet>(::google::protobuf::UnknownFieldSet::default_instance);
-  }
-  inline ::google::protobuf::UnknownFieldSet* mutable_unknown_fields()
-      ABSL_ATTRIBUTE_LIFETIME_BOUND {
-    return _internal_metadata_.mutable_unknown_fields<::google::protobuf::UnknownFieldSet>();
-  }
-
-  static const ::google::protobuf::Descriptor* descriptor() {
-    return GetDescriptor();
-  }
-  static const ::google::protobuf::Descriptor* GetDescriptor() {
-    return default_instance().GetMetadata().descriptor;
-  }
-  static const ::google::protobuf::Reflection* GetReflection() {
-    return default_instance().GetMetadata().reflection;
-  }
-  static const HierarchicalTableDescriptor& default_instance() {
-    return *internal_default_instance();
-  }
-  static inline const HierarchicalTableDescriptor* internal_default_instance() {
-    return reinterpret_cast<const HierarchicalTableDescriptor*>(
-               &_HierarchicalTableDescriptor_default_instance_);
-  }
-  static constexpr int kIndexInFileMessages =
-    6;
-
-  friend void swap(HierarchicalTableDescriptor& a, HierarchicalTableDescriptor& b) {
-    a.Swap(&b);
-  }
-  inline void Swap(HierarchicalTableDescriptor* other) {
-    if (other == this) return;
-  #ifdef PROTOBUF_FORCE_COPY_IN_SWAP
-    if (GetArena() != nullptr &&
-        GetArena() == other->GetArena()) {
-   #else  // PROTOBUF_FORCE_COPY_IN_SWAP
-    if (GetArena() == other->GetArena()) {
-  #endif  // !PROTOBUF_FORCE_COPY_IN_SWAP
-      InternalSwap(other);
-    } else {
-      ::google::protobuf::internal::GenericSwap(this, other);
-    }
-  }
-  void UnsafeArenaSwap(HierarchicalTableDescriptor* other) {
-    if (other == this) return;
-    ABSL_DCHECK(GetArena() == other->GetArena());
-    InternalSwap(other);
-  }
-
-  // implements Message ----------------------------------------------
-
-  HierarchicalTableDescriptor* New(::google::protobuf::Arena* arena = nullptr) const final {
-    return CreateMaybeMessage<HierarchicalTableDescriptor>(arena);
-  }
-  using ::google::protobuf::Message::CopyFrom;
-  void CopyFrom(const HierarchicalTableDescriptor& from);
-  using ::google::protobuf::Message::MergeFrom;
-  void MergeFrom( const HierarchicalTableDescriptor& from) {
-    HierarchicalTableDescriptor::MergeImpl(*this, from);
-  }
-  private:
-  static void MergeImpl(::google::protobuf::Message& to_msg, const ::google::protobuf::Message& from_msg);
-  public:
-  PROTOBUF_ATTRIBUTE_REINITIALIZES void Clear() final;
-  bool IsInitialized() const final;
-
-  ::size_t ByteSizeLong() const final;
-  const char* _InternalParse(const char* ptr, ::google::protobuf::internal::ParseContext* ctx) final;
-  ::uint8_t* _InternalSerialize(
-      ::uint8_t* target, ::google::protobuf::io::EpsCopyOutputStream* stream) const final;
-  int GetCachedSize() const { return _impl_._cached_size_.Get(); }
-
-  private:
-  ::google::protobuf::internal::CachedSize* AccessCachedSize() const final;
-  void SharedCtor(::google::protobuf::Arena* arena);
-  void SharedDtor();
-  void InternalSwap(HierarchicalTableDescriptor* other);
-
-  private:
-  friend class ::google::protobuf::internal::AnyMetadata;
-  static ::absl::string_view FullMessageName() {
-    return "io.deephaven.proto.backplane.grpc.HierarchicalTableDescriptor";
-  }
-  protected:
-  explicit HierarchicalTableDescriptor(::google::protobuf::Arena* arena);
-  HierarchicalTableDescriptor(::google::protobuf::Arena* arena, const HierarchicalTableDescriptor& from);
-  public:
-
-  static const ClassData _class_data_;
-  const ::google::protobuf::Message::ClassData*GetClassData() const final;
-
-  ::google::protobuf::Metadata GetMetadata() const final;
-
-  // nested types ----------------------------------------------------
-
-  // accessors -------------------------------------------------------
-
-  enum : int {
-    kSnapshotSchemaFieldNumber = 1,
-    kIsStaticFieldNumber = 2,
-  };
-  // bytes snapshot_schema = 1;
-  void clear_snapshot_schema() ;
-  const std::string& snapshot_schema() const;
-  template <typename Arg_ = const std::string&, typename... Args_>
-  void set_snapshot_schema(Arg_&& arg, Args_... args);
-  std::string* mutable_snapshot_schema();
-  PROTOBUF_NODISCARD std::string* release_snapshot_schema();
-  void set_allocated_snapshot_schema(std::string* value);
-
-  private:
-  const std::string& _internal_snapshot_schema() const;
-  inline PROTOBUF_ALWAYS_INLINE void _internal_set_snapshot_schema(
-      const std::string& value);
-  std::string* _internal_mutable_snapshot_schema();
-
-  public:
-  // bool is_static = 2;
-  void clear_is_static() ;
-  bool is_static() const;
-  void set_is_static(bool value);
-
-  private:
-  bool _internal_is_static() const;
-  void _internal_set_is_static(bool value);
-
-  public:
-  // @@protoc_insertion_point(class_scope:io.deephaven.proto.backplane.grpc.HierarchicalTableDescriptor)
- private:
-  class _Internal;
-
-  friend class ::google::protobuf::internal::TcParser;
-  static const ::google::protobuf::internal::TcParseTable<
-      1, 2, 0,
-      0, 2>
-      _table_;
-  friend class ::google::protobuf::MessageLite;
-  friend class ::google::protobuf::Arena;
-  template <typename T>
-  friend class ::google::protobuf::Arena::InternalHelper;
-  using InternalArenaConstructable_ = void;
-  using DestructorSkippable_ = void;
-  struct Impl_ {
-
-        inline explicit constexpr Impl_(
-            ::google::protobuf::internal::ConstantInitialized) noexcept;
-        inline explicit Impl_(::google::protobuf::internal::InternalVisibility visibility,
-                              ::google::protobuf::Arena* arena);
-        inline explicit Impl_(::google::protobuf::internal::InternalVisibility visibility,
-                              ::google::protobuf::Arena* arena, const Impl_& from);
-    ::google::protobuf::internal::ArenaStringPtr snapshot_schema_;
-    bool is_static_;
-    mutable ::google::protobuf::internal::CachedSize _cached_size_;
-    PROTOBUF_TSAN_DECLARE_MEMBER
-  };
-  union { Impl_ _impl_; };
-  friend struct ::TableStruct_deephaven_2fproto_2fhierarchicaltable_2eproto;
-};// -------------------------------------------------------------------
-
-class HierarchicalTableApplyResponse final :
-    public ::google::protobuf::internal::ZeroFieldsBase /* @@protoc_insertion_point(class_definition:io.deephaven.proto.backplane.grpc.HierarchicalTableApplyResponse) */ {
- public:
-  inline HierarchicalTableApplyResponse() : HierarchicalTableApplyResponse(nullptr) {}
-  template<typename = void>
-  explicit PROTOBUF_CONSTEXPR HierarchicalTableApplyResponse(::google::protobuf::internal::ConstantInitialized);
-
-  inline HierarchicalTableApplyResponse(const HierarchicalTableApplyResponse& from)
-      : HierarchicalTableApplyResponse(nullptr, from) {}
-  HierarchicalTableApplyResponse(HierarchicalTableApplyResponse&& from) noexcept
-    : HierarchicalTableApplyResponse() {
-    *this = ::std::move(from);
-  }
-
-  inline HierarchicalTableApplyResponse& operator=(const HierarchicalTableApplyResponse& from) {
-    CopyFrom(from);
-    return *this;
-  }
-  inline HierarchicalTableApplyResponse& operator=(HierarchicalTableApplyResponse&& from) noexcept {
-    if (this == &from) return *this;
-    if (GetArena() == from.GetArena()
-  #ifdef PROTOBUF_FORCE_COPY_IN_MOVE
-        && GetArena() != nullptr
-  #endif  // !PROTOBUF_FORCE_COPY_IN_MOVE
-    ) {
-      InternalSwap(&from);
-    } else {
-      CopyFrom(from);
-    }
-    return *this;
-  }
-
-  inline const ::google::protobuf::UnknownFieldSet& unknown_fields() const
-      ABSL_ATTRIBUTE_LIFETIME_BOUND {
-    return _internal_metadata_.unknown_fields<::google::protobuf::UnknownFieldSet>(::google::protobuf::UnknownFieldSet::default_instance);
-  }
-  inline ::google::protobuf::UnknownFieldSet* mutable_unknown_fields()
-      ABSL_ATTRIBUTE_LIFETIME_BOUND {
-    return _internal_metadata_.mutable_unknown_fields<::google::protobuf::UnknownFieldSet>();
-  }
-
-  static const ::google::protobuf::Descriptor* descriptor() {
-    return GetDescriptor();
-  }
-  static const ::google::protobuf::Descriptor* GetDescriptor() {
-    return default_instance().GetMetadata().descriptor;
-  }
-  static const ::google::protobuf::Reflection* GetReflection() {
-    return default_instance().GetMetadata().reflection;
-  }
-  static const HierarchicalTableApplyResponse& default_instance() {
-    return *internal_default_instance();
-  }
-  static inline const HierarchicalTableApplyResponse* internal_default_instance() {
-    return reinterpret_cast<const HierarchicalTableApplyResponse*>(
-               &_HierarchicalTableApplyResponse_default_instance_);
-  }
-  static constexpr int kIndexInFileMessages =
-    5;
-
-  friend void swap(HierarchicalTableApplyResponse& a, HierarchicalTableApplyResponse& b) {
-    a.Swap(&b);
-  }
-  inline void Swap(HierarchicalTableApplyResponse* other) {
-    if (other == this) return;
-  #ifdef PROTOBUF_FORCE_COPY_IN_SWAP
-    if (GetArena() != nullptr &&
-        GetArena() == other->GetArena()) {
-   #else  // PROTOBUF_FORCE_COPY_IN_SWAP
-    if (GetArena() == other->GetArena()) {
-  #endif  // !PROTOBUF_FORCE_COPY_IN_SWAP
-      InternalSwap(other);
-    } else {
-      ::google::protobuf::internal::GenericSwap(this, other);
-    }
-  }
-  void UnsafeArenaSwap(HierarchicalTableApplyResponse* other) {
-    if (other == this) return;
-    ABSL_DCHECK(GetArena() == other->GetArena());
-    InternalSwap(other);
-  }
-
-  // implements Message ----------------------------------------------
-
-  HierarchicalTableApplyResponse* New(::google::protobuf::Arena* arena = nullptr) const final {
-    return CreateMaybeMessage<HierarchicalTableApplyResponse>(arena);
-  }
-  using ::google::protobuf::internal::ZeroFieldsBase::CopyFrom;
-  inline void CopyFrom(const HierarchicalTableApplyResponse& from) {
-    ::google::protobuf::internal::ZeroFieldsBase::CopyImpl(*this, from);
-  }
-  using ::google::protobuf::internal::ZeroFieldsBase::MergeFrom;
-  void MergeFrom(const HierarchicalTableApplyResponse& from) {
-    ::google::protobuf::internal::ZeroFieldsBase::MergeImpl(*this, from);
-  }
-  public:
-
-  private:
-  friend class ::google::protobuf::internal::AnyMetadata;
-  static ::absl::string_view FullMessageName() {
-    return "io.deephaven.proto.backplane.grpc.HierarchicalTableApplyResponse";
-  }
-  protected:
-  explicit HierarchicalTableApplyResponse(::google::protobuf::Arena* arena);
-  HierarchicalTableApplyResponse(::google::protobuf::Arena* arena, const HierarchicalTableApplyResponse& from);
-  public:
-
-  ::google::protobuf::Metadata GetMetadata() const final;
-
-  // nested types ----------------------------------------------------
-
-  // accessors -------------------------------------------------------
-
-  // @@protoc_insertion_point(class_scope:io.deephaven.proto.backplane.grpc.HierarchicalTableApplyResponse)
- private:
-  class _Internal;
-
-  friend class ::google::protobuf::MessageLite;
-  friend class ::google::protobuf::Arena;
-  template <typename T>
-  friend class ::google::protobuf::Arena::InternalHelper;
-  using InternalArenaConstructable_ = void;
-  using DestructorSkippable_ = void;
-  struct Impl_ {
-
-        inline explicit constexpr Impl_(
-            ::google::protobuf::internal::ConstantInitialized) noexcept;
-        inline explicit Impl_(::google::protobuf::internal::InternalVisibility visibility,
-                              ::google::protobuf::Arena* arena);
-        inline explicit Impl_(::google::protobuf::internal::InternalVisibility visibility,
-                              ::google::protobuf::Arena* arena, const Impl_& from);
-    PROTOBUF_TSAN_DECLARE_MEMBER
-  };
-  friend struct ::TableStruct_deephaven_2fproto_2fhierarchicaltable_2eproto;
-};// -------------------------------------------------------------------
-
-class TreeRequest final :
-    public ::google::protobuf::Message /* @@protoc_insertion_point(class_definition:io.deephaven.proto.backplane.grpc.TreeRequest) */ {
- public:
-  inline TreeRequest() : TreeRequest(nullptr) {}
-  ~TreeRequest() override;
-  template<typename = void>
-  explicit PROTOBUF_CONSTEXPR TreeRequest(::google::protobuf::internal::ConstantInitialized);
-
-  inline TreeRequest(const TreeRequest& from)
-      : TreeRequest(nullptr, from) {}
-  TreeRequest(TreeRequest&& from) noexcept
-    : TreeRequest() {
-    *this = ::std::move(from);
-  }
-
-  inline TreeRequest& operator=(const TreeRequest& from) {
-    CopyFrom(from);
-    return *this;
-  }
-  inline TreeRequest& operator=(TreeRequest&& from) noexcept {
-    if (this == &from) return *this;
-    if (GetArena() == from.GetArena()
-  #ifdef PROTOBUF_FORCE_COPY_IN_MOVE
-        && GetArena() != nullptr
-  #endif  // !PROTOBUF_FORCE_COPY_IN_MOVE
-    ) {
-      InternalSwap(&from);
-    } else {
-      CopyFrom(from);
-    }
-    return *this;
-  }
-
-  inline const ::google::protobuf::UnknownFieldSet& unknown_fields() const
-      ABSL_ATTRIBUTE_LIFETIME_BOUND {
-    return _internal_metadata_.unknown_fields<::google::protobuf::UnknownFieldSet>(::google::protobuf::UnknownFieldSet::default_instance);
-  }
-  inline ::google::protobuf::UnknownFieldSet* mutable_unknown_fields()
-      ABSL_ATTRIBUTE_LIFETIME_BOUND {
-    return _internal_metadata_.mutable_unknown_fields<::google::protobuf::UnknownFieldSet>();
-  }
-
-  static const ::google::protobuf::Descriptor* descriptor() {
-    return GetDescriptor();
-  }
-  static const ::google::protobuf::Descriptor* GetDescriptor() {
-    return default_instance().GetMetadata().descriptor;
-  }
-  static const ::google::protobuf::Reflection* GetReflection() {
-    return default_instance().GetMetadata().reflection;
-  }
-  static const TreeRequest& default_instance() {
-    return *internal_default_instance();
-  }
-  static inline const TreeRequest* internal_default_instance() {
-    return reinterpret_cast<const TreeRequest*>(
-               &_TreeRequest_default_instance_);
-  }
-  static constexpr int kIndexInFileMessages =
-    2;
-
-  friend void swap(TreeRequest& a, TreeRequest& b) {
-    a.Swap(&b);
-  }
-  inline void Swap(TreeRequest* other) {
-    if (other == this) return;
-  #ifdef PROTOBUF_FORCE_COPY_IN_SWAP
-    if (GetArena() != nullptr &&
-        GetArena() == other->GetArena()) {
-   #else  // PROTOBUF_FORCE_COPY_IN_SWAP
-    if (GetArena() == other->GetArena()) {
-  #endif  // !PROTOBUF_FORCE_COPY_IN_SWAP
-      InternalSwap(other);
-    } else {
-      ::google::protobuf::internal::GenericSwap(this, other);
-    }
-  }
-  void UnsafeArenaSwap(TreeRequest* other) {
-    if (other == this) return;
-    ABSL_DCHECK(GetArena() == other->GetArena());
-    InternalSwap(other);
-  }
-
-  // implements Message ----------------------------------------------
-
-  TreeRequest* New(::google::protobuf::Arena* arena = nullptr) const final {
-    return CreateMaybeMessage<TreeRequest>(arena);
-  }
-  using ::google::protobuf::Message::CopyFrom;
-  void CopyFrom(const TreeRequest& from);
-  using ::google::protobuf::Message::MergeFrom;
-  void MergeFrom( const TreeRequest& from) {
-    TreeRequest::MergeImpl(*this, from);
-  }
-  private:
-  static void MergeImpl(::google::protobuf::Message& to_msg, const ::google::protobuf::Message& from_msg);
-  public:
-  PROTOBUF_ATTRIBUTE_REINITIALIZES void Clear() final;
-  bool IsInitialized() const final;
-
-  ::size_t ByteSizeLong() const final;
-  const char* _InternalParse(const char* ptr, ::google::protobuf::internal::ParseContext* ctx) final;
-  ::uint8_t* _InternalSerialize(
-      ::uint8_t* target, ::google::protobuf::io::EpsCopyOutputStream* stream) const final;
-  int GetCachedSize() const { return _impl_._cached_size_.Get(); }
-
-  private:
-  ::google::protobuf::internal::CachedSize* AccessCachedSize() const final;
-  void SharedCtor(::google::protobuf::Arena* arena);
-  void SharedDtor();
-  void InternalSwap(TreeRequest* other);
-
-  private:
-  friend class ::google::protobuf::internal::AnyMetadata;
-  static ::absl::string_view FullMessageName() {
-    return "io.deephaven.proto.backplane.grpc.TreeRequest";
-  }
-  protected:
-  explicit TreeRequest(::google::protobuf::Arena* arena);
-  TreeRequest(::google::protobuf::Arena* arena, const TreeRequest& from);
-  public:
-
-  static const ClassData _class_data_;
-  const ::google::protobuf::Message::ClassData*GetClassData() const final;
-
-  ::google::protobuf::Metadata GetMetadata() const final;
-
-  // nested types ----------------------------------------------------
-
-  // accessors -------------------------------------------------------
-
-  enum : int {
-    kIdentifierColumnFieldNumber = 3,
-    kParentIdentifierColumnFieldNumber = 4,
-    kResultTreeTableIdFieldNumber = 1,
-    kSourceTableIdFieldNumber = 2,
-    kPromoteOrphansFieldNumber = 5,
-  };
-  // string identifier_column = 3;
-  void clear_identifier_column() ;
-  const std::string& identifier_column() const;
-  template <typename Arg_ = const std::string&, typename... Args_>
-  void set_identifier_column(Arg_&& arg, Args_... args);
-  std::string* mutable_identifier_column();
-  PROTOBUF_NODISCARD std::string* release_identifier_column();
-  void set_allocated_identifier_column(std::string* value);
-
-  private:
-  const std::string& _internal_identifier_column() const;
-  inline PROTOBUF_ALWAYS_INLINE void _internal_set_identifier_column(
-      const std::string& value);
-  std::string* _internal_mutable_identifier_column();
-
-  public:
-  // string parent_identifier_column = 4;
-  void clear_parent_identifier_column() ;
-  const std::string& parent_identifier_column() const;
-  template <typename Arg_ = const std::string&, typename... Args_>
-  void set_parent_identifier_column(Arg_&& arg, Args_... args);
-  std::string* mutable_parent_identifier_column();
-  PROTOBUF_NODISCARD std::string* release_parent_identifier_column();
-  void set_allocated_parent_identifier_column(std::string* value);
-
-  private:
-  const std::string& _internal_parent_identifier_column() const;
-  inline PROTOBUF_ALWAYS_INLINE void _internal_set_parent_identifier_column(
-      const std::string& value);
-  std::string* _internal_mutable_parent_identifier_column();
-
-  public:
-  // .io.deephaven.proto.backplane.grpc.Ticket result_tree_table_id = 1;
-  bool has_result_tree_table_id() const;
-  void clear_result_tree_table_id() ;
-  const ::io::deephaven::proto::backplane::grpc::Ticket& result_tree_table_id() const;
-  PROTOBUF_NODISCARD ::io::deephaven::proto::backplane::grpc::Ticket* release_result_tree_table_id();
-  ::io::deephaven::proto::backplane::grpc::Ticket* mutable_result_tree_table_id();
-  void set_allocated_result_tree_table_id(::io::deephaven::proto::backplane::grpc::Ticket* value);
-  void unsafe_arena_set_allocated_result_tree_table_id(::io::deephaven::proto::backplane::grpc::Ticket* value);
-  ::io::deephaven::proto::backplane::grpc::Ticket* unsafe_arena_release_result_tree_table_id();
-
-  private:
-  const ::io::deephaven::proto::backplane::grpc::Ticket& _internal_result_tree_table_id() const;
-  ::io::deephaven::proto::backplane::grpc::Ticket* _internal_mutable_result_tree_table_id();
-
-  public:
-  // .io.deephaven.proto.backplane.grpc.Ticket source_table_id = 2;
-  bool has_source_table_id() const;
-  void clear_source_table_id() ;
-  const ::io::deephaven::proto::backplane::grpc::Ticket& source_table_id() const;
-  PROTOBUF_NODISCARD ::io::deephaven::proto::backplane::grpc::Ticket* release_source_table_id();
-  ::io::deephaven::proto::backplane::grpc::Ticket* mutable_source_table_id();
-  void set_allocated_source_table_id(::io::deephaven::proto::backplane::grpc::Ticket* value);
-  void unsafe_arena_set_allocated_source_table_id(::io::deephaven::proto::backplane::grpc::Ticket* value);
-  ::io::deephaven::proto::backplane::grpc::Ticket* unsafe_arena_release_source_table_id();
-
-  private:
-  const ::io::deephaven::proto::backplane::grpc::Ticket& _internal_source_table_id() const;
-  ::io::deephaven::proto::backplane::grpc::Ticket* _internal_mutable_source_table_id();
-
-  public:
-  // bool promote_orphans = 5;
-  void clear_promote_orphans() ;
-  bool promote_orphans() const;
-  void set_promote_orphans(bool value);
-
-  private:
-  bool _internal_promote_orphans() const;
-  void _internal_set_promote_orphans(bool value);
-
-  public:
-  // @@protoc_insertion_point(class_scope:io.deephaven.proto.backplane.grpc.TreeRequest)
- private:
-  class _Internal;
-
-  friend class ::google::protobuf::internal::TcParser;
-  static const ::google::protobuf::internal::TcParseTable<
-      3, 5, 2,
-      95, 2>
-      _table_;
-  friend class ::google::protobuf::MessageLite;
-  friend class ::google::protobuf::Arena;
-  template <typename T>
-  friend class ::google::protobuf::Arena::InternalHelper;
-  using InternalArenaConstructable_ = void;
-  using DestructorSkippable_ = void;
-  struct Impl_ {
-
-        inline explicit constexpr Impl_(
-            ::google::protobuf::internal::ConstantInitialized) noexcept;
-        inline explicit Impl_(::google::protobuf::internal::InternalVisibility visibility,
-                              ::google::protobuf::Arena* arena);
-        inline explicit Impl_(::google::protobuf::internal::InternalVisibility visibility,
-                              ::google::protobuf::Arena* arena, const Impl_& from);
-    ::google::protobuf::internal::HasBits<1> _has_bits_;
-    mutable ::google::protobuf::internal::CachedSize _cached_size_;
-    ::google::protobuf::internal::ArenaStringPtr identifier_column_;
-    ::google::protobuf::internal::ArenaStringPtr parent_identifier_column_;
-    ::io::deephaven::proto::backplane::grpc::Ticket* result_tree_table_id_;
-    ::io::deephaven::proto::backplane::grpc::Ticket* source_table_id_;
-    bool promote_orphans_;
-    PROTOBUF_TSAN_DECLARE_MEMBER
-  };
-  union { Impl_ _impl_; };
-  friend struct ::TableStruct_deephaven_2fproto_2fhierarchicaltable_2eproto;
-};// -------------------------------------------------------------------
-
-class HierarchicalTableViewKeyTableDescriptor final :
-    public ::google::protobuf::Message /* @@protoc_insertion_point(class_definition:io.deephaven.proto.backplane.grpc.HierarchicalTableViewKeyTableDescriptor) */ {
- public:
-  inline HierarchicalTableViewKeyTableDescriptor() : HierarchicalTableViewKeyTableDescriptor(nullptr) {}
-  ~HierarchicalTableViewKeyTableDescriptor() override;
-  template<typename = void>
-  explicit PROTOBUF_CONSTEXPR HierarchicalTableViewKeyTableDescriptor(::google::protobuf::internal::ConstantInitialized);
-
-  inline HierarchicalTableViewKeyTableDescriptor(const HierarchicalTableViewKeyTableDescriptor& from)
-      : HierarchicalTableViewKeyTableDescriptor(nullptr, from) {}
-  HierarchicalTableViewKeyTableDescriptor(HierarchicalTableViewKeyTableDescriptor&& from) noexcept
-    : HierarchicalTableViewKeyTableDescriptor() {
-    *this = ::std::move(from);
-  }
-
-  inline HierarchicalTableViewKeyTableDescriptor& operator=(const HierarchicalTableViewKeyTableDescriptor& from) {
-    CopyFrom(from);
-    return *this;
-  }
-  inline HierarchicalTableViewKeyTableDescriptor& operator=(HierarchicalTableViewKeyTableDescriptor&& from) noexcept {
-    if (this == &from) return *this;
-    if (GetArena() == from.GetArena()
-  #ifdef PROTOBUF_FORCE_COPY_IN_MOVE
-        && GetArena() != nullptr
-  #endif  // !PROTOBUF_FORCE_COPY_IN_MOVE
-    ) {
-      InternalSwap(&from);
-    } else {
-      CopyFrom(from);
-    }
-    return *this;
-  }
-
-  inline const ::google::protobuf::UnknownFieldSet& unknown_fields() const
-      ABSL_ATTRIBUTE_LIFETIME_BOUND {
-    return _internal_metadata_.unknown_fields<::google::protobuf::UnknownFieldSet>(::google::protobuf::UnknownFieldSet::default_instance);
-  }
-  inline ::google::protobuf::UnknownFieldSet* mutable_unknown_fields()
-      ABSL_ATTRIBUTE_LIFETIME_BOUND {
-    return _internal_metadata_.mutable_unknown_fields<::google::protobuf::UnknownFieldSet>();
-  }
-
-  static const ::google::protobuf::Descriptor* descriptor() {
-    return GetDescriptor();
-  }
-  static const ::google::protobuf::Descriptor* GetDescriptor() {
-    return default_instance().GetMetadata().descriptor;
-  }
-  static const ::google::protobuf::Reflection* GetReflection() {
-    return default_instance().GetMetadata().reflection;
-  }
-  static const HierarchicalTableViewKeyTableDescriptor& default_instance() {
-    return *internal_default_instance();
-  }
-  static inline const HierarchicalTableViewKeyTableDescriptor* internal_default_instance() {
-    return reinterpret_cast<const HierarchicalTableViewKeyTableDescriptor*>(
-               &_HierarchicalTableViewKeyTableDescriptor_default_instance_);
-  }
-  static constexpr int kIndexInFileMessages =
-    8;
-
-  friend void swap(HierarchicalTableViewKeyTableDescriptor& a, HierarchicalTableViewKeyTableDescriptor& b) {
-    a.Swap(&b);
-  }
-  inline void Swap(HierarchicalTableViewKeyTableDescriptor* other) {
-    if (other == this) return;
-  #ifdef PROTOBUF_FORCE_COPY_IN_SWAP
-    if (GetArena() != nullptr &&
-        GetArena() == other->GetArena()) {
-   #else  // PROTOBUF_FORCE_COPY_IN_SWAP
-    if (GetArena() == other->GetArena()) {
-  #endif  // !PROTOBUF_FORCE_COPY_IN_SWAP
-      InternalSwap(other);
-    } else {
-      ::google::protobuf::internal::GenericSwap(this, other);
-    }
-  }
-  void UnsafeArenaSwap(HierarchicalTableViewKeyTableDescriptor* other) {
-    if (other == this) return;
-    ABSL_DCHECK(GetArena() == other->GetArena());
-    InternalSwap(other);
-  }
-
-  // implements Message ----------------------------------------------
-
-  HierarchicalTableViewKeyTableDescriptor* New(::google::protobuf::Arena* arena = nullptr) const final {
-    return CreateMaybeMessage<HierarchicalTableViewKeyTableDescriptor>(arena);
-  }
-  using ::google::protobuf::Message::CopyFrom;
-  void CopyFrom(const HierarchicalTableViewKeyTableDescriptor& from);
-  using ::google::protobuf::Message::MergeFrom;
-  void MergeFrom( const HierarchicalTableViewKeyTableDescriptor& from) {
-    HierarchicalTableViewKeyTableDescriptor::MergeImpl(*this, from);
-  }
-  private:
-  static void MergeImpl(::google::protobuf::Message& to_msg, const ::google::protobuf::Message& from_msg);
-  public:
-  PROTOBUF_ATTRIBUTE_REINITIALIZES void Clear() final;
-  bool IsInitialized() const final;
-
-  ::size_t ByteSizeLong() const final;
-  const char* _InternalParse(const char* ptr, ::google::protobuf::internal::ParseContext* ctx) final;
-  ::uint8_t* _InternalSerialize(
-      ::uint8_t* target, ::google::protobuf::io::EpsCopyOutputStream* stream) const final;
-  int GetCachedSize() const { return _impl_._cached_size_.Get(); }
-
-  private:
-  ::google::protobuf::internal::CachedSize* AccessCachedSize() const final;
-  void SharedCtor(::google::protobuf::Arena* arena);
-  void SharedDtor();
-  void InternalSwap(HierarchicalTableViewKeyTableDescriptor* other);
-
-  private:
-  friend class ::google::protobuf::internal::AnyMetadata;
-  static ::absl::string_view FullMessageName() {
-    return "io.deephaven.proto.backplane.grpc.HierarchicalTableViewKeyTableDescriptor";
-  }
-  protected:
-  explicit HierarchicalTableViewKeyTableDescriptor(::google::protobuf::Arena* arena);
-  HierarchicalTableViewKeyTableDescriptor(::google::protobuf::Arena* arena, const HierarchicalTableViewKeyTableDescriptor& from);
-  public:
-
-  static const ClassData _class_data_;
-  const ::google::protobuf::Message::ClassData*GetClassData() const final;
-
-  ::google::protobuf::Metadata GetMetadata() const final;
-
-  // nested types ----------------------------------------------------
-
-  // accessors -------------------------------------------------------
-
-  enum : int {
-    kKeyTableActionColumnFieldNumber = 2,
-    kKeyTableIdFieldNumber = 1,
-  };
-  // optional string key_table_action_column = 2;
-  bool has_key_table_action_column() const;
-  void clear_key_table_action_column() ;
-  const std::string& key_table_action_column() const;
-  template <typename Arg_ = const std::string&, typename... Args_>
-  void set_key_table_action_column(Arg_&& arg, Args_... args);
-  std::string* mutable_key_table_action_column();
-  PROTOBUF_NODISCARD std::string* release_key_table_action_column();
-  void set_allocated_key_table_action_column(std::string* value);
-
-  private:
-  const std::string& _internal_key_table_action_column() const;
-  inline PROTOBUF_ALWAYS_INLINE void _internal_set_key_table_action_column(
-      const std::string& value);
-  std::string* _internal_mutable_key_table_action_column();
-
-  public:
-  // .io.deephaven.proto.backplane.grpc.Ticket key_table_id = 1;
-  bool has_key_table_id() const;
-  void clear_key_table_id() ;
-  const ::io::deephaven::proto::backplane::grpc::Ticket& key_table_id() const;
-  PROTOBUF_NODISCARD ::io::deephaven::proto::backplane::grpc::Ticket* release_key_table_id();
-  ::io::deephaven::proto::backplane::grpc::Ticket* mutable_key_table_id();
-  void set_allocated_key_table_id(::io::deephaven::proto::backplane::grpc::Ticket* value);
-  void unsafe_arena_set_allocated_key_table_id(::io::deephaven::proto::backplane::grpc::Ticket* value);
-  ::io::deephaven::proto::backplane::grpc::Ticket* unsafe_arena_release_key_table_id();
-
-  private:
-  const ::io::deephaven::proto::backplane::grpc::Ticket& _internal_key_table_id() const;
-  ::io::deephaven::proto::backplane::grpc::Ticket* _internal_mutable_key_table_id();
-
-  public:
-  // @@protoc_insertion_point(class_scope:io.deephaven.proto.backplane.grpc.HierarchicalTableViewKeyTableDescriptor)
- private:
-  class _Internal;
-
-  friend class ::google::protobuf::internal::TcParser;
-  static const ::google::protobuf::internal::TcParseTable<
-      1, 2, 1,
-      105, 2>
-      _table_;
-  friend class ::google::protobuf::MessageLite;
-  friend class ::google::protobuf::Arena;
-  template <typename T>
-  friend class ::google::protobuf::Arena::InternalHelper;
-  using InternalArenaConstructable_ = void;
-  using DestructorSkippable_ = void;
-  struct Impl_ {
-
-        inline explicit constexpr Impl_(
-            ::google::protobuf::internal::ConstantInitialized) noexcept;
-        inline explicit Impl_(::google::protobuf::internal::InternalVisibility visibility,
-                              ::google::protobuf::Arena* arena);
-        inline explicit Impl_(::google::protobuf::internal::InternalVisibility visibility,
-                              ::google::protobuf::Arena* arena, const Impl_& from);
-    ::google::protobuf::internal::HasBits<1> _has_bits_;
-    mutable ::google::protobuf::internal::CachedSize _cached_size_;
-    ::google::protobuf::internal::ArenaStringPtr key_table_action_column_;
-    ::io::deephaven::proto::backplane::grpc::Ticket* key_table_id_;
-    PROTOBUF_TSAN_DECLARE_MEMBER
-  };
-  union { Impl_ _impl_; };
-  friend struct ::TableStruct_deephaven_2fproto_2fhierarchicaltable_2eproto;
-};// -------------------------------------------------------------------
-
-class HierarchicalTableSourceExportRequest final :
-    public ::google::protobuf::Message /* @@protoc_insertion_point(class_definition:io.deephaven.proto.backplane.grpc.HierarchicalTableSourceExportRequest) */ {
- public:
-  inline HierarchicalTableSourceExportRequest() : HierarchicalTableSourceExportRequest(nullptr) {}
-  ~HierarchicalTableSourceExportRequest() override;
-  template<typename = void>
-  explicit PROTOBUF_CONSTEXPR HierarchicalTableSourceExportRequest(::google::protobuf::internal::ConstantInitialized);
-
-  inline HierarchicalTableSourceExportRequest(const HierarchicalTableSourceExportRequest& from)
-      : HierarchicalTableSourceExportRequest(nullptr, from) {}
-  HierarchicalTableSourceExportRequest(HierarchicalTableSourceExportRequest&& from) noexcept
-    : HierarchicalTableSourceExportRequest() {
-    *this = ::std::move(from);
-  }
-
-  inline HierarchicalTableSourceExportRequest& operator=(const HierarchicalTableSourceExportRequest& from) {
-    CopyFrom(from);
-    return *this;
-  }
-  inline HierarchicalTableSourceExportRequest& operator=(HierarchicalTableSourceExportRequest&& from) noexcept {
-    if (this == &from) return *this;
-    if (GetArena() == from.GetArena()
-  #ifdef PROTOBUF_FORCE_COPY_IN_MOVE
-        && GetArena() != nullptr
-  #endif  // !PROTOBUF_FORCE_COPY_IN_MOVE
-    ) {
-      InternalSwap(&from);
-    } else {
-      CopyFrom(from);
-    }
-    return *this;
-  }
-
-  inline const ::google::protobuf::UnknownFieldSet& unknown_fields() const
-      ABSL_ATTRIBUTE_LIFETIME_BOUND {
-    return _internal_metadata_.unknown_fields<::google::protobuf::UnknownFieldSet>(::google::protobuf::UnknownFieldSet::default_instance);
-  }
-  inline ::google::protobuf::UnknownFieldSet* mutable_unknown_fields()
-      ABSL_ATTRIBUTE_LIFETIME_BOUND {
-    return _internal_metadata_.mutable_unknown_fields<::google::protobuf::UnknownFieldSet>();
-  }
-
-  static const ::google::protobuf::Descriptor* descriptor() {
-    return GetDescriptor();
-  }
-  static const ::google::protobuf::Descriptor* GetDescriptor() {
-    return default_instance().GetMetadata().descriptor;
-  }
-  static const ::google::protobuf::Reflection* GetReflection() {
-    return default_instance().GetMetadata().reflection;
-  }
-  static const HierarchicalTableSourceExportRequest& default_instance() {
-    return *internal_default_instance();
-  }
-  static inline const HierarchicalTableSourceExportRequest* internal_default_instance() {
-    return reinterpret_cast<const HierarchicalTableSourceExportRequest*>(
-               &_HierarchicalTableSourceExportRequest_default_instance_);
-  }
-  static constexpr int kIndexInFileMessages =
-    10;
-
-  friend void swap(HierarchicalTableSourceExportRequest& a, HierarchicalTableSourceExportRequest& b) {
-    a.Swap(&b);
-  }
-  inline void Swap(HierarchicalTableSourceExportRequest* other) {
-    if (other == this) return;
-  #ifdef PROTOBUF_FORCE_COPY_IN_SWAP
-    if (GetArena() != nullptr &&
-        GetArena() == other->GetArena()) {
-   #else  // PROTOBUF_FORCE_COPY_IN_SWAP
-    if (GetArena() == other->GetArena()) {
-  #endif  // !PROTOBUF_FORCE_COPY_IN_SWAP
-      InternalSwap(other);
-    } else {
-      ::google::protobuf::internal::GenericSwap(this, other);
-    }
-  }
-  void UnsafeArenaSwap(HierarchicalTableSourceExportRequest* other) {
-    if (other == this) return;
-    ABSL_DCHECK(GetArena() == other->GetArena());
-    InternalSwap(other);
-  }
-
-  // implements Message ----------------------------------------------
-
-  HierarchicalTableSourceExportRequest* New(::google::protobuf::Arena* arena = nullptr) const final {
-    return CreateMaybeMessage<HierarchicalTableSourceExportRequest>(arena);
-  }
-  using ::google::protobuf::Message::CopyFrom;
-  void CopyFrom(const HierarchicalTableSourceExportRequest& from);
-  using ::google::protobuf::Message::MergeFrom;
-  void MergeFrom( const HierarchicalTableSourceExportRequest& from) {
-    HierarchicalTableSourceExportRequest::MergeImpl(*this, from);
-  }
-  private:
-  static void MergeImpl(::google::protobuf::Message& to_msg, const ::google::protobuf::Message& from_msg);
-  public:
-  PROTOBUF_ATTRIBUTE_REINITIALIZES void Clear() final;
-  bool IsInitialized() const final;
-
-  ::size_t ByteSizeLong() const final;
-  const char* _InternalParse(const char* ptr, ::google::protobuf::internal::ParseContext* ctx) final;
-  ::uint8_t* _InternalSerialize(
-      ::uint8_t* target, ::google::protobuf::io::EpsCopyOutputStream* stream) const final;
-  int GetCachedSize() const { return _impl_._cached_size_.Get(); }
-
-  private:
-  ::google::protobuf::internal::CachedSize* AccessCachedSize() const final;
-  void SharedCtor(::google::protobuf::Arena* arena);
-  void SharedDtor();
-  void InternalSwap(HierarchicalTableSourceExportRequest* other);
-
-  private:
-  friend class ::google::protobuf::internal::AnyMetadata;
-  static ::absl::string_view FullMessageName() {
-    return "io.deephaven.proto.backplane.grpc.HierarchicalTableSourceExportRequest";
-  }
-  protected:
-  explicit HierarchicalTableSourceExportRequest(::google::protobuf::Arena* arena);
-  HierarchicalTableSourceExportRequest(::google::protobuf::Arena* arena, const HierarchicalTableSourceExportRequest& from);
-  public:
-
-  static const ClassData _class_data_;
-  const ::google::protobuf::Message::ClassData*GetClassData() const final;
-
-  ::google::protobuf::Metadata GetMetadata() const final;
-
-  // nested types ----------------------------------------------------
-
-  // accessors -------------------------------------------------------
-
-  enum : int {
-    kResultTableIdFieldNumber = 1,
-    kHierarchicalTableIdFieldNumber = 2,
-  };
-  // .io.deephaven.proto.backplane.grpc.Ticket result_table_id = 1;
-  bool has_result_table_id() const;
-  void clear_result_table_id() ;
-  const ::io::deephaven::proto::backplane::grpc::Ticket& result_table_id() const;
-  PROTOBUF_NODISCARD ::io::deephaven::proto::backplane::grpc::Ticket* release_result_table_id();
-  ::io::deephaven::proto::backplane::grpc::Ticket* mutable_result_table_id();
-  void set_allocated_result_table_id(::io::deephaven::proto::backplane::grpc::Ticket* value);
-  void unsafe_arena_set_allocated_result_table_id(::io::deephaven::proto::backplane::grpc::Ticket* value);
-  ::io::deephaven::proto::backplane::grpc::Ticket* unsafe_arena_release_result_table_id();
-
-  private:
-  const ::io::deephaven::proto::backplane::grpc::Ticket& _internal_result_table_id() const;
-  ::io::deephaven::proto::backplane::grpc::Ticket* _internal_mutable_result_table_id();
-
-  public:
-  // .io.deephaven.proto.backplane.grpc.Ticket hierarchical_table_id = 2;
-  bool has_hierarchical_table_id() const;
-  void clear_hierarchical_table_id() ;
-  const ::io::deephaven::proto::backplane::grpc::Ticket& hierarchical_table_id() const;
-  PROTOBUF_NODISCARD ::io::deephaven::proto::backplane::grpc::Ticket* release_hierarchical_table_id();
-  ::io::deephaven::proto::backplane::grpc::Ticket* mutable_hierarchical_table_id();
-  void set_allocated_hierarchical_table_id(::io::deephaven::proto::backplane::grpc::Ticket* value);
-  void unsafe_arena_set_allocated_hierarchical_table_id(::io::deephaven::proto::backplane::grpc::Ticket* value);
-  ::io::deephaven::proto::backplane::grpc::Ticket* unsafe_arena_release_hierarchical_table_id();
-
-  private:
-  const ::io::deephaven::proto::backplane::grpc::Ticket& _internal_hierarchical_table_id() const;
-  ::io::deephaven::proto::backplane::grpc::Ticket* _internal_mutable_hierarchical_table_id();
-
-  public:
-  // @@protoc_insertion_point(class_scope:io.deephaven.proto.backplane.grpc.HierarchicalTableSourceExportRequest)
- private:
-  class _Internal;
-
-  friend class ::google::protobuf::internal::TcParser;
-  static const ::google::protobuf::internal::TcParseTable<
-      1, 2, 2,
-      0, 2>
-      _table_;
-  friend class ::google::protobuf::MessageLite;
-  friend class ::google::protobuf::Arena;
-  template <typename T>
-  friend class ::google::protobuf::Arena::InternalHelper;
-  using InternalArenaConstructable_ = void;
-  using DestructorSkippable_ = void;
-  struct Impl_ {
-
-        inline explicit constexpr Impl_(
-            ::google::protobuf::internal::ConstantInitialized) noexcept;
-        inline explicit Impl_(::google::protobuf::internal::InternalVisibility visibility,
-                              ::google::protobuf::Arena* arena);
-        inline explicit Impl_(::google::protobuf::internal::InternalVisibility visibility,
-                              ::google::protobuf::Arena* arena, const Impl_& from);
-    ::google::protobuf::internal::HasBits<1> _has_bits_;
-    mutable ::google::protobuf::internal::CachedSize _cached_size_;
-    ::io::deephaven::proto::backplane::grpc::Ticket* result_table_id_;
-    ::io::deephaven::proto::backplane::grpc::Ticket* hierarchical_table_id_;
-    PROTOBUF_TSAN_DECLARE_MEMBER
-  };
-  union { Impl_ _impl_; };
-  friend struct ::TableStruct_deephaven_2fproto_2fhierarchicaltable_2eproto;
-};// -------------------------------------------------------------------
-
-class HierarchicalTableViewRequest final :
-    public ::google::protobuf::Message /* @@protoc_insertion_point(class_definition:io.deephaven.proto.backplane.grpc.HierarchicalTableViewRequest) */ {
- public:
-  inline HierarchicalTableViewRequest() : HierarchicalTableViewRequest(nullptr) {}
-  ~HierarchicalTableViewRequest() override;
-  template<typename = void>
-  explicit PROTOBUF_CONSTEXPR HierarchicalTableViewRequest(::google::protobuf::internal::ConstantInitialized);
-
-  inline HierarchicalTableViewRequest(const HierarchicalTableViewRequest& from)
-      : HierarchicalTableViewRequest(nullptr, from) {}
-  HierarchicalTableViewRequest(HierarchicalTableViewRequest&& from) noexcept
-    : HierarchicalTableViewRequest() {
-    *this = ::std::move(from);
-  }
-
-  inline HierarchicalTableViewRequest& operator=(const HierarchicalTableViewRequest& from) {
-    CopyFrom(from);
-    return *this;
-  }
-  inline HierarchicalTableViewRequest& operator=(HierarchicalTableViewRequest&& from) noexcept {
-    if (this == &from) return *this;
-    if (GetArena() == from.GetArena()
-  #ifdef PROTOBUF_FORCE_COPY_IN_MOVE
-        && GetArena() != nullptr
-  #endif  // !PROTOBUF_FORCE_COPY_IN_MOVE
-    ) {
-      InternalSwap(&from);
-    } else {
-      CopyFrom(from);
-    }
-    return *this;
-  }
-
-  inline const ::google::protobuf::UnknownFieldSet& unknown_fields() const
-      ABSL_ATTRIBUTE_LIFETIME_BOUND {
-    return _internal_metadata_.unknown_fields<::google::protobuf::UnknownFieldSet>(::google::protobuf::UnknownFieldSet::default_instance);
-  }
-  inline ::google::protobuf::UnknownFieldSet* mutable_unknown_fields()
-      ABSL_ATTRIBUTE_LIFETIME_BOUND {
-    return _internal_metadata_.mutable_unknown_fields<::google::protobuf::UnknownFieldSet>();
-  }
-
-  static const ::google::protobuf::Descriptor* descriptor() {
-    return GetDescriptor();
-  }
-  static const ::google::protobuf::Descriptor* GetDescriptor() {
-    return default_instance().GetMetadata().descriptor;
-  }
-  static const ::google::protobuf::Reflection* GetReflection() {
-    return default_instance().GetMetadata().reflection;
-  }
-  static const HierarchicalTableViewRequest& default_instance() {
-    return *internal_default_instance();
-  }
-  enum TargetCase {
-    kHierarchicalTableId = 2,
-    kExistingViewId = 3,
-    TARGET_NOT_SET = 0,
-  };
-
-  static inline const HierarchicalTableViewRequest* internal_default_instance() {
-    return reinterpret_cast<const HierarchicalTableViewRequest*>(
-               &_HierarchicalTableViewRequest_default_instance_);
-  }
-  static constexpr int kIndexInFileMessages =
-    7;
-
-  friend void swap(HierarchicalTableViewRequest& a, HierarchicalTableViewRequest& b) {
-    a.Swap(&b);
-  }
-  inline void Swap(HierarchicalTableViewRequest* other) {
-    if (other == this) return;
-  #ifdef PROTOBUF_FORCE_COPY_IN_SWAP
-    if (GetArena() != nullptr &&
-        GetArena() == other->GetArena()) {
-   #else  // PROTOBUF_FORCE_COPY_IN_SWAP
-    if (GetArena() == other->GetArena()) {
-  #endif  // !PROTOBUF_FORCE_COPY_IN_SWAP
-      InternalSwap(other);
-    } else {
-      ::google::protobuf::internal::GenericSwap(this, other);
-    }
-  }
-  void UnsafeArenaSwap(HierarchicalTableViewRequest* other) {
-    if (other == this) return;
-    ABSL_DCHECK(GetArena() == other->GetArena());
-    InternalSwap(other);
-  }
-
-  // implements Message ----------------------------------------------
-
-  HierarchicalTableViewRequest* New(::google::protobuf::Arena* arena = nullptr) const final {
-    return CreateMaybeMessage<HierarchicalTableViewRequest>(arena);
-  }
-  using ::google::protobuf::Message::CopyFrom;
-  void CopyFrom(const HierarchicalTableViewRequest& from);
-  using ::google::protobuf::Message::MergeFrom;
-  void MergeFrom( const HierarchicalTableViewRequest& from) {
-    HierarchicalTableViewRequest::MergeImpl(*this, from);
-  }
-  private:
-  static void MergeImpl(::google::protobuf::Message& to_msg, const ::google::protobuf::Message& from_msg);
-  public:
-  PROTOBUF_ATTRIBUTE_REINITIALIZES void Clear() final;
-  bool IsInitialized() const final;
-
-  ::size_t ByteSizeLong() const final;
-  const char* _InternalParse(const char* ptr, ::google::protobuf::internal::ParseContext* ctx) final;
-  ::uint8_t* _InternalSerialize(
-      ::uint8_t* target, ::google::protobuf::io::EpsCopyOutputStream* stream) const final;
-  int GetCachedSize() const { return _impl_._cached_size_.Get(); }
-
-  private:
-  ::google::protobuf::internal::CachedSize* AccessCachedSize() const final;
-  void SharedCtor(::google::protobuf::Arena* arena);
-  void SharedDtor();
-  void InternalSwap(HierarchicalTableViewRequest* other);
-
-  private:
-  friend class ::google::protobuf::internal::AnyMetadata;
-  static ::absl::string_view FullMessageName() {
-    return "io.deephaven.proto.backplane.grpc.HierarchicalTableViewRequest";
-  }
-  protected:
-  explicit HierarchicalTableViewRequest(::google::protobuf::Arena* arena);
-  HierarchicalTableViewRequest(::google::protobuf::Arena* arena, const HierarchicalTableViewRequest& from);
-  public:
-
-  static const ClassData _class_data_;
-  const ::google::protobuf::Message::ClassData*GetClassData() const final;
-
-  ::google::protobuf::Metadata GetMetadata() const final;
-
-  // nested types ----------------------------------------------------
-
-  // accessors -------------------------------------------------------
-
-  enum : int {
-    kResultViewIdFieldNumber = 1,
-    kExpansionsFieldNumber = 4,
-    kHierarchicalTableIdFieldNumber = 2,
-    kExistingViewIdFieldNumber = 3,
-  };
-  // .io.deephaven.proto.backplane.grpc.Ticket result_view_id = 1;
-  bool has_result_view_id() const;
-  void clear_result_view_id() ;
-  const ::io::deephaven::proto::backplane::grpc::Ticket& result_view_id() const;
-  PROTOBUF_NODISCARD ::io::deephaven::proto::backplane::grpc::Ticket* release_result_view_id();
-  ::io::deephaven::proto::backplane::grpc::Ticket* mutable_result_view_id();
-  void set_allocated_result_view_id(::io::deephaven::proto::backplane::grpc::Ticket* value);
-  void unsafe_arena_set_allocated_result_view_id(::io::deephaven::proto::backplane::grpc::Ticket* value);
-  ::io::deephaven::proto::backplane::grpc::Ticket* unsafe_arena_release_result_view_id();
-
-  private:
-  const ::io::deephaven::proto::backplane::grpc::Ticket& _internal_result_view_id() const;
-  ::io::deephaven::proto::backplane::grpc::Ticket* _internal_mutable_result_view_id();
-
-  public:
-  // .io.deephaven.proto.backplane.grpc.HierarchicalTableViewKeyTableDescriptor expansions = 4;
-  bool has_expansions() const;
-  void clear_expansions() ;
-  const ::io::deephaven::proto::backplane::grpc::HierarchicalTableViewKeyTableDescriptor& expansions() const;
-  PROTOBUF_NODISCARD ::io::deephaven::proto::backplane::grpc::HierarchicalTableViewKeyTableDescriptor* release_expansions();
-  ::io::deephaven::proto::backplane::grpc::HierarchicalTableViewKeyTableDescriptor* mutable_expansions();
-  void set_allocated_expansions(::io::deephaven::proto::backplane::grpc::HierarchicalTableViewKeyTableDescriptor* value);
-  void unsafe_arena_set_allocated_expansions(::io::deephaven::proto::backplane::grpc::HierarchicalTableViewKeyTableDescriptor* value);
-  ::io::deephaven::proto::backplane::grpc::HierarchicalTableViewKeyTableDescriptor* unsafe_arena_release_expansions();
-
-  private:
-  const ::io::deephaven::proto::backplane::grpc::HierarchicalTableViewKeyTableDescriptor& _internal_expansions() const;
-  ::io::deephaven::proto::backplane::grpc::HierarchicalTableViewKeyTableDescriptor* _internal_mutable_expansions();
-
-  public:
-  // .io.deephaven.proto.backplane.grpc.Ticket hierarchical_table_id = 2;
-  bool has_hierarchical_table_id() const;
-  private:
-  bool _internal_has_hierarchical_table_id() const;
-
-  public:
-  void clear_hierarchical_table_id() ;
-  const ::io::deephaven::proto::backplane::grpc::Ticket& hierarchical_table_id() const;
-  PROTOBUF_NODISCARD ::io::deephaven::proto::backplane::grpc::Ticket* release_hierarchical_table_id();
-  ::io::deephaven::proto::backplane::grpc::Ticket* mutable_hierarchical_table_id();
-  void set_allocated_hierarchical_table_id(::io::deephaven::proto::backplane::grpc::Ticket* value);
-  void unsafe_arena_set_allocated_hierarchical_table_id(::io::deephaven::proto::backplane::grpc::Ticket* value);
-  ::io::deephaven::proto::backplane::grpc::Ticket* unsafe_arena_release_hierarchical_table_id();
-
-  private:
-  const ::io::deephaven::proto::backplane::grpc::Ticket& _internal_hierarchical_table_id() const;
-  ::io::deephaven::proto::backplane::grpc::Ticket* _internal_mutable_hierarchical_table_id();
-
-  public:
-  // .io.deephaven.proto.backplane.grpc.Ticket existing_view_id = 3;
-  bool has_existing_view_id() const;
-  private:
-  bool _internal_has_existing_view_id() const;
-
-  public:
-  void clear_existing_view_id() ;
-  const ::io::deephaven::proto::backplane::grpc::Ticket& existing_view_id() const;
-  PROTOBUF_NODISCARD ::io::deephaven::proto::backplane::grpc::Ticket* release_existing_view_id();
-  ::io::deephaven::proto::backplane::grpc::Ticket* mutable_existing_view_id();
-  void set_allocated_existing_view_id(::io::deephaven::proto::backplane::grpc::Ticket* value);
-  void unsafe_arena_set_allocated_existing_view_id(::io::deephaven::proto::backplane::grpc::Ticket* value);
-  ::io::deephaven::proto::backplane::grpc::Ticket* unsafe_arena_release_existing_view_id();
-
-  private:
-  const ::io::deephaven::proto::backplane::grpc::Ticket& _internal_existing_view_id() const;
-  ::io::deephaven::proto::backplane::grpc::Ticket* _internal_mutable_existing_view_id();
-
-  public:
-  void clear_target();
-  TargetCase target_case() const;
-  // @@protoc_insertion_point(class_scope:io.deephaven.proto.backplane.grpc.HierarchicalTableViewRequest)
- private:
-  class _Internal;
-  void set_has_hierarchical_table_id();
-  void set_has_existing_view_id();
-
-  inline bool has_target() const;
-  inline void clear_has_target();
-
-  friend class ::google::protobuf::internal::TcParser;
-  static const ::google::protobuf::internal::TcParseTable<
-      1, 4, 4,
-      0, 2>
-      _table_;
-  friend class ::google::protobuf::MessageLite;
-  friend class ::google::protobuf::Arena;
-  template <typename T>
-  friend class ::google::protobuf::Arena::InternalHelper;
-  using InternalArenaConstructable_ = void;
-  using DestructorSkippable_ = void;
-  struct Impl_ {
-
-        inline explicit constexpr Impl_(
-            ::google::protobuf::internal::ConstantInitialized) noexcept;
-        inline explicit Impl_(::google::protobuf::internal::InternalVisibility visibility,
-                              ::google::protobuf::Arena* arena);
-        inline explicit Impl_(::google::protobuf::internal::InternalVisibility visibility,
-                              ::google::protobuf::Arena* arena, const Impl_& from);
-    ::google::protobuf::internal::HasBits<1> _has_bits_;
-    mutable ::google::protobuf::internal::CachedSize _cached_size_;
-    ::io::deephaven::proto::backplane::grpc::Ticket* result_view_id_;
-    ::io::deephaven::proto::backplane::grpc::HierarchicalTableViewKeyTableDescriptor* expansions_;
-    union TargetUnion {
-      constexpr TargetUnion() : _constinit_{} {}
-        ::google::protobuf::internal::ConstantInitialized _constinit_;
-      ::io::deephaven::proto::backplane::grpc::Ticket* hierarchical_table_id_;
-      ::io::deephaven::proto::backplane::grpc::Ticket* existing_view_id_;
-    } target_;
-    ::uint32_t _oneof_case_[1];
-
-    PROTOBUF_TSAN_DECLARE_MEMBER
-  };
-  union { Impl_ _impl_; };
-  friend struct ::TableStruct_deephaven_2fproto_2fhierarchicaltable_2eproto;
-};// -------------------------------------------------------------------
-
-class HierarchicalTableApplyRequest final :
-    public ::google::protobuf::Message /* @@protoc_insertion_point(class_definition:io.deephaven.proto.backplane.grpc.HierarchicalTableApplyRequest) */ {
- public:
-  inline HierarchicalTableApplyRequest() : HierarchicalTableApplyRequest(nullptr) {}
-  ~HierarchicalTableApplyRequest() override;
-  template<typename = void>
-  explicit PROTOBUF_CONSTEXPR HierarchicalTableApplyRequest(::google::protobuf::internal::ConstantInitialized);
-
-  inline HierarchicalTableApplyRequest(const HierarchicalTableApplyRequest& from)
-      : HierarchicalTableApplyRequest(nullptr, from) {}
-  HierarchicalTableApplyRequest(HierarchicalTableApplyRequest&& from) noexcept
-    : HierarchicalTableApplyRequest() {
-    *this = ::std::move(from);
-  }
-
-  inline HierarchicalTableApplyRequest& operator=(const HierarchicalTableApplyRequest& from) {
-    CopyFrom(from);
-    return *this;
-  }
-  inline HierarchicalTableApplyRequest& operator=(HierarchicalTableApplyRequest&& from) noexcept {
-    if (this == &from) return *this;
-    if (GetArena() == from.GetArena()
-  #ifdef PROTOBUF_FORCE_COPY_IN_MOVE
-        && GetArena() != nullptr
-  #endif  // !PROTOBUF_FORCE_COPY_IN_MOVE
-    ) {
-      InternalSwap(&from);
-    } else {
-      CopyFrom(from);
-    }
-    return *this;
-  }
-
-  inline const ::google::protobuf::UnknownFieldSet& unknown_fields() const
-      ABSL_ATTRIBUTE_LIFETIME_BOUND {
-    return _internal_metadata_.unknown_fields<::google::protobuf::UnknownFieldSet>(::google::protobuf::UnknownFieldSet::default_instance);
-  }
-  inline ::google::protobuf::UnknownFieldSet* mutable_unknown_fields()
-      ABSL_ATTRIBUTE_LIFETIME_BOUND {
-    return _internal_metadata_.mutable_unknown_fields<::google::protobuf::UnknownFieldSet>();
-  }
-
-  static const ::google::protobuf::Descriptor* descriptor() {
-    return GetDescriptor();
-  }
-  static const ::google::protobuf::Descriptor* GetDescriptor() {
-    return default_instance().GetMetadata().descriptor;
-  }
-  static const ::google::protobuf::Reflection* GetReflection() {
-    return default_instance().GetMetadata().reflection;
-  }
-  static const HierarchicalTableApplyRequest& default_instance() {
-    return *internal_default_instance();
-  }
-  static inline const HierarchicalTableApplyRequest* internal_default_instance() {
-    return reinterpret_cast<const HierarchicalTableApplyRequest*>(
-               &_HierarchicalTableApplyRequest_default_instance_);
-  }
-  static constexpr int kIndexInFileMessages =
-    4;
-
-  friend void swap(HierarchicalTableApplyRequest& a, HierarchicalTableApplyRequest& b) {
-    a.Swap(&b);
-  }
-  inline void Swap(HierarchicalTableApplyRequest* other) {
-    if (other == this) return;
-  #ifdef PROTOBUF_FORCE_COPY_IN_SWAP
-    if (GetArena() != nullptr &&
-        GetArena() == other->GetArena()) {
-   #else  // PROTOBUF_FORCE_COPY_IN_SWAP
-    if (GetArena() == other->GetArena()) {
-  #endif  // !PROTOBUF_FORCE_COPY_IN_SWAP
-      InternalSwap(other);
-    } else {
-      ::google::protobuf::internal::GenericSwap(this, other);
-    }
-  }
-  void UnsafeArenaSwap(HierarchicalTableApplyRequest* other) {
-    if (other == this) return;
-    ABSL_DCHECK(GetArena() == other->GetArena());
-    InternalSwap(other);
-  }
-
-  // implements Message ----------------------------------------------
-
-  HierarchicalTableApplyRequest* New(::google::protobuf::Arena* arena = nullptr) const final {
-    return CreateMaybeMessage<HierarchicalTableApplyRequest>(arena);
-  }
-  using ::google::protobuf::Message::CopyFrom;
-  void CopyFrom(const HierarchicalTableApplyRequest& from);
-  using ::google::protobuf::Message::MergeFrom;
-  void MergeFrom( const HierarchicalTableApplyRequest& from) {
-    HierarchicalTableApplyRequest::MergeImpl(*this, from);
-  }
-  private:
-  static void MergeImpl(::google::protobuf::Message& to_msg, const ::google::protobuf::Message& from_msg);
-  public:
-  PROTOBUF_ATTRIBUTE_REINITIALIZES void Clear() final;
-  bool IsInitialized() const final;
-
-  ::size_t ByteSizeLong() const final;
-  const char* _InternalParse(const char* ptr, ::google::protobuf::internal::ParseContext* ctx) final;
-  ::uint8_t* _InternalSerialize(
-      ::uint8_t* target, ::google::protobuf::io::EpsCopyOutputStream* stream) const final;
-  int GetCachedSize() const { return _impl_._cached_size_.Get(); }
-
-  private:
-  ::google::protobuf::internal::CachedSize* AccessCachedSize() const final;
-  void SharedCtor(::google::protobuf::Arena* arena);
-  void SharedDtor();
-  void InternalSwap(HierarchicalTableApplyRequest* other);
-
-  private:
-  friend class ::google::protobuf::internal::AnyMetadata;
-  static ::absl::string_view FullMessageName() {
-    return "io.deephaven.proto.backplane.grpc.HierarchicalTableApplyRequest";
-  }
-  protected:
-  explicit HierarchicalTableApplyRequest(::google::protobuf::Arena* arena);
-  HierarchicalTableApplyRequest(::google::protobuf::Arena* arena, const HierarchicalTableApplyRequest& from);
-  public:
-
-  static const ClassData _class_data_;
-  const ::google::protobuf::Message::ClassData*GetClassData() const final;
-
-  ::google::protobuf::Metadata GetMetadata() const final;
-
-  // nested types ----------------------------------------------------
-
-  // accessors -------------------------------------------------------
-
-  enum : int {
-    kFiltersFieldNumber = 3,
-    kSortsFieldNumber = 4,
-    kResultHierarchicalTableIdFieldNumber = 1,
-    kInputHierarchicalTableIdFieldNumber = 2,
-  };
-  // repeated .io.deephaven.proto.backplane.grpc.Condition filters = 3;
-  int filters_size() const;
-  private:
-  int _internal_filters_size() const;
-
-  public:
-  void clear_filters() ;
-  ::io::deephaven::proto::backplane::grpc::Condition* mutable_filters(int index);
-  ::google::protobuf::RepeatedPtrField< ::io::deephaven::proto::backplane::grpc::Condition >*
-      mutable_filters();
-  private:
-  const ::google::protobuf::RepeatedPtrField<::io::deephaven::proto::backplane::grpc::Condition>& _internal_filters() const;
-  ::google::protobuf::RepeatedPtrField<::io::deephaven::proto::backplane::grpc::Condition>* _internal_mutable_filters();
-  public:
-  const ::io::deephaven::proto::backplane::grpc::Condition& filters(int index) const;
-  ::io::deephaven::proto::backplane::grpc::Condition* add_filters();
-  const ::google::protobuf::RepeatedPtrField< ::io::deephaven::proto::backplane::grpc::Condition >&
-      filters() const;
-  // repeated .io.deephaven.proto.backplane.grpc.SortDescriptor sorts = 4;
-  int sorts_size() const;
-  private:
-  int _internal_sorts_size() const;
-
-  public:
-  void clear_sorts() ;
-  ::io::deephaven::proto::backplane::grpc::SortDescriptor* mutable_sorts(int index);
-  ::google::protobuf::RepeatedPtrField< ::io::deephaven::proto::backplane::grpc::SortDescriptor >*
-      mutable_sorts();
-  private:
-  const ::google::protobuf::RepeatedPtrField<::io::deephaven::proto::backplane::grpc::SortDescriptor>& _internal_sorts() const;
-  ::google::protobuf::RepeatedPtrField<::io::deephaven::proto::backplane::grpc::SortDescriptor>* _internal_mutable_sorts();
-  public:
-  const ::io::deephaven::proto::backplane::grpc::SortDescriptor& sorts(int index) const;
-  ::io::deephaven::proto::backplane::grpc::SortDescriptor* add_sorts();
-  const ::google::protobuf::RepeatedPtrField< ::io::deephaven::proto::backplane::grpc::SortDescriptor >&
-      sorts() const;
-  // .io.deephaven.proto.backplane.grpc.Ticket result_hierarchical_table_id = 1;
-  bool has_result_hierarchical_table_id() const;
-  void clear_result_hierarchical_table_id() ;
-  const ::io::deephaven::proto::backplane::grpc::Ticket& result_hierarchical_table_id() const;
-  PROTOBUF_NODISCARD ::io::deephaven::proto::backplane::grpc::Ticket* release_result_hierarchical_table_id();
-  ::io::deephaven::proto::backplane::grpc::Ticket* mutable_result_hierarchical_table_id();
-  void set_allocated_result_hierarchical_table_id(::io::deephaven::proto::backplane::grpc::Ticket* value);
-  void unsafe_arena_set_allocated_result_hierarchical_table_id(::io::deephaven::proto::backplane::grpc::Ticket* value);
-  ::io::deephaven::proto::backplane::grpc::Ticket* unsafe_arena_release_result_hierarchical_table_id();
-
-  private:
-  const ::io::deephaven::proto::backplane::grpc::Ticket& _internal_result_hierarchical_table_id() const;
-  ::io::deephaven::proto::backplane::grpc::Ticket* _internal_mutable_result_hierarchical_table_id();
-
-  public:
-  // .io.deephaven.proto.backplane.grpc.Ticket input_hierarchical_table_id = 2;
-  bool has_input_hierarchical_table_id() const;
-  void clear_input_hierarchical_table_id() ;
-  const ::io::deephaven::proto::backplane::grpc::Ticket& input_hierarchical_table_id() const;
-  PROTOBUF_NODISCARD ::io::deephaven::proto::backplane::grpc::Ticket* release_input_hierarchical_table_id();
-  ::io::deephaven::proto::backplane::grpc::Ticket* mutable_input_hierarchical_table_id();
-  void set_allocated_input_hierarchical_table_id(::io::deephaven::proto::backplane::grpc::Ticket* value);
-  void unsafe_arena_set_allocated_input_hierarchical_table_id(::io::deephaven::proto::backplane::grpc::Ticket* value);
-  ::io::deephaven::proto::backplane::grpc::Ticket* unsafe_arena_release_input_hierarchical_table_id();
-
-  private:
-  const ::io::deephaven::proto::backplane::grpc::Ticket& _internal_input_hierarchical_table_id() const;
-  ::io::deephaven::proto::backplane::grpc::Ticket* _internal_mutable_input_hierarchical_table_id();
-
-  public:
-  // @@protoc_insertion_point(class_scope:io.deephaven.proto.backplane.grpc.HierarchicalTableApplyRequest)
- private:
-  class _Internal;
-
-  friend class ::google::protobuf::internal::TcParser;
-  static const ::google::protobuf::internal::TcParseTable<
-      2, 4, 4,
-      0, 2>
-      _table_;
-  friend class ::google::protobuf::MessageLite;
-  friend class ::google::protobuf::Arena;
-  template <typename T>
-  friend class ::google::protobuf::Arena::InternalHelper;
-  using InternalArenaConstructable_ = void;
-  using DestructorSkippable_ = void;
-  struct Impl_ {
-
-        inline explicit constexpr Impl_(
-            ::google::protobuf::internal::ConstantInitialized) noexcept;
-        inline explicit Impl_(::google::protobuf::internal::InternalVisibility visibility,
-                              ::google::protobuf::Arena* arena);
-        inline explicit Impl_(::google::protobuf::internal::InternalVisibility visibility,
-                              ::google::protobuf::Arena* arena, const Impl_& from);
-    ::google::protobuf::internal::HasBits<1> _has_bits_;
-    mutable ::google::protobuf::internal::CachedSize _cached_size_;
-    ::google::protobuf::RepeatedPtrField< ::io::deephaven::proto::backplane::grpc::Condition > filters_;
-    ::google::protobuf::RepeatedPtrField< ::io::deephaven::proto::backplane::grpc::SortDescriptor > sorts_;
-    ::io::deephaven::proto::backplane::grpc::Ticket* result_hierarchical_table_id_;
-    ::io::deephaven::proto::backplane::grpc::Ticket* input_hierarchical_table_id_;
-    PROTOBUF_TSAN_DECLARE_MEMBER
-  };
-  union { Impl_ _impl_; };
-  friend struct ::TableStruct_deephaven_2fproto_2fhierarchicaltable_2eproto;
-};// -------------------------------------------------------------------
-
-class RollupRequest final :
-    public ::google::protobuf::Message /* @@protoc_insertion_point(class_definition:io.deephaven.proto.backplane.grpc.RollupRequest) */ {
- public:
-  inline RollupRequest() : RollupRequest(nullptr) {}
-  ~RollupRequest() override;
-  template<typename = void>
-  explicit PROTOBUF_CONSTEXPR RollupRequest(::google::protobuf::internal::ConstantInitialized);
-
-  inline RollupRequest(const RollupRequest& from)
-      : RollupRequest(nullptr, from) {}
-  RollupRequest(RollupRequest&& from) noexcept
-    : RollupRequest() {
-    *this = ::std::move(from);
-  }
-
-  inline RollupRequest& operator=(const RollupRequest& from) {
-    CopyFrom(from);
-    return *this;
-  }
-  inline RollupRequest& operator=(RollupRequest&& from) noexcept {
-    if (this == &from) return *this;
-    if (GetArena() == from.GetArena()
-  #ifdef PROTOBUF_FORCE_COPY_IN_MOVE
-        && GetArena() != nullptr
-  #endif  // !PROTOBUF_FORCE_COPY_IN_MOVE
-    ) {
-      InternalSwap(&from);
-    } else {
-      CopyFrom(from);
-    }
-    return *this;
-  }
-
-  inline const ::google::protobuf::UnknownFieldSet& unknown_fields() const
-      ABSL_ATTRIBUTE_LIFETIME_BOUND {
-    return _internal_metadata_.unknown_fields<::google::protobuf::UnknownFieldSet>(::google::protobuf::UnknownFieldSet::default_instance);
-  }
-  inline ::google::protobuf::UnknownFieldSet* mutable_unknown_fields()
-      ABSL_ATTRIBUTE_LIFETIME_BOUND {
-    return _internal_metadata_.mutable_unknown_fields<::google::protobuf::UnknownFieldSet>();
-  }
-
-  static const ::google::protobuf::Descriptor* descriptor() {
-    return GetDescriptor();
-  }
-  static const ::google::protobuf::Descriptor* GetDescriptor() {
-    return default_instance().GetMetadata().descriptor;
-  }
-  static const ::google::protobuf::Reflection* GetReflection() {
-    return default_instance().GetMetadata().reflection;
-  }
-  static const RollupRequest& default_instance() {
-    return *internal_default_instance();
-  }
-  static inline const RollupRequest* internal_default_instance() {
-    return reinterpret_cast<const RollupRequest*>(
-               &_RollupRequest_default_instance_);
-  }
-  static constexpr int kIndexInFileMessages =
-    0;
-
-  friend void swap(RollupRequest& a, RollupRequest& b) {
-    a.Swap(&b);
-  }
-  inline void Swap(RollupRequest* other) {
-    if (other == this) return;
-  #ifdef PROTOBUF_FORCE_COPY_IN_SWAP
-    if (GetArena() != nullptr &&
-        GetArena() == other->GetArena()) {
-   #else  // PROTOBUF_FORCE_COPY_IN_SWAP
-    if (GetArena() == other->GetArena()) {
-  #endif  // !PROTOBUF_FORCE_COPY_IN_SWAP
-      InternalSwap(other);
-    } else {
-      ::google::protobuf::internal::GenericSwap(this, other);
-    }
-  }
-  void UnsafeArenaSwap(RollupRequest* other) {
-    if (other == this) return;
-    ABSL_DCHECK(GetArena() == other->GetArena());
-    InternalSwap(other);
-  }
-
-  // implements Message ----------------------------------------------
-
-  RollupRequest* New(::google::protobuf::Arena* arena = nullptr) const final {
-    return CreateMaybeMessage<RollupRequest>(arena);
-  }
-  using ::google::protobuf::Message::CopyFrom;
-  void CopyFrom(const RollupRequest& from);
-  using ::google::protobuf::Message::MergeFrom;
-  void MergeFrom( const RollupRequest& from) {
-    RollupRequest::MergeImpl(*this, from);
-  }
-  private:
-  static void MergeImpl(::google::protobuf::Message& to_msg, const ::google::protobuf::Message& from_msg);
-  public:
-  PROTOBUF_ATTRIBUTE_REINITIALIZES void Clear() final;
-  bool IsInitialized() const final;
-
-  ::size_t ByteSizeLong() const final;
-  const char* _InternalParse(const char* ptr, ::google::protobuf::internal::ParseContext* ctx) final;
-  ::uint8_t* _InternalSerialize(
-      ::uint8_t* target, ::google::protobuf::io::EpsCopyOutputStream* stream) const final;
-  int GetCachedSize() const { return _impl_._cached_size_.Get(); }
-
-  private:
-  ::google::protobuf::internal::CachedSize* AccessCachedSize() const final;
-  void SharedCtor(::google::protobuf::Arena* arena);
-  void SharedDtor();
-  void InternalSwap(RollupRequest* other);
-
-  private:
-  friend class ::google::protobuf::internal::AnyMetadata;
-  static ::absl::string_view FullMessageName() {
-    return "io.deephaven.proto.backplane.grpc.RollupRequest";
-  }
-  protected:
-  explicit RollupRequest(::google::protobuf::Arena* arena);
-  RollupRequest(::google::protobuf::Arena* arena, const RollupRequest& from);
-  public:
-
-  static const ClassData _class_data_;
-  const ::google::protobuf::Message::ClassData*GetClassData() const final;
-
-  ::google::protobuf::Metadata GetMetadata() const final;
-
-  // nested types ----------------------------------------------------
-
-  // accessors -------------------------------------------------------
-
-  enum : int {
-    kAggregationsFieldNumber = 3,
-    kGroupByColumnsFieldNumber = 5,
-    kResultRollupTableIdFieldNumber = 1,
-    kSourceTableIdFieldNumber = 2,
-    kIncludeConstituentsFieldNumber = 4,
-  };
-  // repeated .io.deephaven.proto.backplane.grpc.Aggregation aggregations = 3;
-  int aggregations_size() const;
-  private:
-  int _internal_aggregations_size() const;
-
-  public:
-  void clear_aggregations() ;
-  ::io::deephaven::proto::backplane::grpc::Aggregation* mutable_aggregations(int index);
-  ::google::protobuf::RepeatedPtrField< ::io::deephaven::proto::backplane::grpc::Aggregation >*
-      mutable_aggregations();
-  private:
-  const ::google::protobuf::RepeatedPtrField<::io::deephaven::proto::backplane::grpc::Aggregation>& _internal_aggregations() const;
-  ::google::protobuf::RepeatedPtrField<::io::deephaven::proto::backplane::grpc::Aggregation>* _internal_mutable_aggregations();
-  public:
-  const ::io::deephaven::proto::backplane::grpc::Aggregation& aggregations(int index) const;
-  ::io::deephaven::proto::backplane::grpc::Aggregation* add_aggregations();
-  const ::google::protobuf::RepeatedPtrField< ::io::deephaven::proto::backplane::grpc::Aggregation >&
-      aggregations() const;
-  // repeated string group_by_columns = 5;
-  int group_by_columns_size() const;
-  private:
-  int _internal_group_by_columns_size() const;
-
-  public:
-  void clear_group_by_columns() ;
-  const std::string& group_by_columns(int index) const;
-  std::string* mutable_group_by_columns(int index);
-  void set_group_by_columns(int index, const std::string& value);
-  void set_group_by_columns(int index, std::string&& value);
-  void set_group_by_columns(int index, const char* value);
-  void set_group_by_columns(int index, const char* value, std::size_t size);
-  void set_group_by_columns(int index, absl::string_view value);
-  std::string* add_group_by_columns();
-  void add_group_by_columns(const std::string& value);
-  void add_group_by_columns(std::string&& value);
-  void add_group_by_columns(const char* value);
-  void add_group_by_columns(const char* value, std::size_t size);
-  void add_group_by_columns(absl::string_view value);
-  const ::google::protobuf::RepeatedPtrField<std::string>& group_by_columns() const;
-  ::google::protobuf::RepeatedPtrField<std::string>* mutable_group_by_columns();
-
-  private:
-  const ::google::protobuf::RepeatedPtrField<std::string>& _internal_group_by_columns() const;
-  ::google::protobuf::RepeatedPtrField<std::string>* _internal_mutable_group_by_columns();
-
-  public:
-  // .io.deephaven.proto.backplane.grpc.Ticket result_rollup_table_id = 1;
-  bool has_result_rollup_table_id() const;
-  void clear_result_rollup_table_id() ;
-  const ::io::deephaven::proto::backplane::grpc::Ticket& result_rollup_table_id() const;
-  PROTOBUF_NODISCARD ::io::deephaven::proto::backplane::grpc::Ticket* release_result_rollup_table_id();
-  ::io::deephaven::proto::backplane::grpc::Ticket* mutable_result_rollup_table_id();
-  void set_allocated_result_rollup_table_id(::io::deephaven::proto::backplane::grpc::Ticket* value);
-  void unsafe_arena_set_allocated_result_rollup_table_id(::io::deephaven::proto::backplane::grpc::Ticket* value);
-  ::io::deephaven::proto::backplane::grpc::Ticket* unsafe_arena_release_result_rollup_table_id();
-
-  private:
-  const ::io::deephaven::proto::backplane::grpc::Ticket& _internal_result_rollup_table_id() const;
-  ::io::deephaven::proto::backplane::grpc::Ticket* _internal_mutable_result_rollup_table_id();
-
-  public:
-  // .io.deephaven.proto.backplane.grpc.Ticket source_table_id = 2;
-  bool has_source_table_id() const;
-  void clear_source_table_id() ;
-  const ::io::deephaven::proto::backplane::grpc::Ticket& source_table_id() const;
-  PROTOBUF_NODISCARD ::io::deephaven::proto::backplane::grpc::Ticket* release_source_table_id();
-  ::io::deephaven::proto::backplane::grpc::Ticket* mutable_source_table_id();
-  void set_allocated_source_table_id(::io::deephaven::proto::backplane::grpc::Ticket* value);
-  void unsafe_arena_set_allocated_source_table_id(::io::deephaven::proto::backplane::grpc::Ticket* value);
-  ::io::deephaven::proto::backplane::grpc::Ticket* unsafe_arena_release_source_table_id();
-
-  private:
-  const ::io::deephaven::proto::backplane::grpc::Ticket& _internal_source_table_id() const;
-  ::io::deephaven::proto::backplane::grpc::Ticket* _internal_mutable_source_table_id();
-
-  public:
-  // bool include_constituents = 4;
-  void clear_include_constituents() ;
-  bool include_constituents() const;
-  void set_include_constituents(bool value);
-
-  private:
-  bool _internal_include_constituents() const;
-  void _internal_set_include_constituents(bool value);
-
-  public:
-  // @@protoc_insertion_point(class_scope:io.deephaven.proto.backplane.grpc.RollupRequest)
- private:
-  class _Internal;
-
-  friend class ::google::protobuf::internal::TcParser;
-  static const ::google::protobuf::internal::TcParseTable<
-      3, 5, 3,
-      72, 2>
-      _table_;
-  friend class ::google::protobuf::MessageLite;
-  friend class ::google::protobuf::Arena;
-  template <typename T>
-  friend class ::google::protobuf::Arena::InternalHelper;
-  using InternalArenaConstructable_ = void;
-  using DestructorSkippable_ = void;
-  struct Impl_ {
-
-        inline explicit constexpr Impl_(
-            ::google::protobuf::internal::ConstantInitialized) noexcept;
-        inline explicit Impl_(::google::protobuf::internal::InternalVisibility visibility,
-                              ::google::protobuf::Arena* arena);
-        inline explicit Impl_(::google::protobuf::internal::InternalVisibility visibility,
-                              ::google::protobuf::Arena* arena, const Impl_& from);
-    ::google::protobuf::internal::HasBits<1> _has_bits_;
-    mutable ::google::protobuf::internal::CachedSize _cached_size_;
-    ::google::protobuf::RepeatedPtrField< ::io::deephaven::proto::backplane::grpc::Aggregation > aggregations_;
-    ::google::protobuf::RepeatedPtrField<std::string> group_by_columns_;
-    ::io::deephaven::proto::backplane::grpc::Ticket* result_rollup_table_id_;
-    ::io::deephaven::proto::backplane::grpc::Ticket* source_table_id_;
-    bool include_constituents_;
-    PROTOBUF_TSAN_DECLARE_MEMBER
-  };
-  union { Impl_ _impl_; };
-  friend struct ::TableStruct_deephaven_2fproto_2fhierarchicaltable_2eproto;
-};
-
-// ===================================================================
-
-
-
-
-// ===================================================================
-
-
-#ifdef __GNUC__
-#pragma GCC diagnostic push
-#pragma GCC diagnostic ignored "-Wstrict-aliasing"
-#endif  // __GNUC__
-// -------------------------------------------------------------------
-
-// RollupRequest
-
-// .io.deephaven.proto.backplane.grpc.Ticket result_rollup_table_id = 1;
-inline bool RollupRequest::has_result_rollup_table_id() const {
-  bool value = (_impl_._has_bits_[0] & 0x00000001u) != 0;
-  PROTOBUF_ASSUME(!value || _impl_.result_rollup_table_id_ != nullptr);
-  return value;
-}
-inline const ::io::deephaven::proto::backplane::grpc::Ticket& RollupRequest::_internal_result_rollup_table_id() const {
-  PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race);
-  const ::io::deephaven::proto::backplane::grpc::Ticket* p = _impl_.result_rollup_table_id_;
-  return p != nullptr ? *p : reinterpret_cast<const ::io::deephaven::proto::backplane::grpc::Ticket&>(::io::deephaven::proto::backplane::grpc::_Ticket_default_instance_);
-}
-inline const ::io::deephaven::proto::backplane::grpc::Ticket& RollupRequest::result_rollup_table_id() const ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  // @@protoc_insertion_point(field_get:io.deephaven.proto.backplane.grpc.RollupRequest.result_rollup_table_id)
-  return _internal_result_rollup_table_id();
-}
-inline void RollupRequest::unsafe_arena_set_allocated_result_rollup_table_id(::io::deephaven::proto::backplane::grpc::Ticket* value) {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  if (GetArena() == nullptr) {
-    delete reinterpret_cast<::google::protobuf::MessageLite*>(_impl_.result_rollup_table_id_);
-  }
-  _impl_.result_rollup_table_id_ = reinterpret_cast<::io::deephaven::proto::backplane::grpc::Ticket*>(value);
-  if (value != nullptr) {
-    _impl_._has_bits_[0] |= 0x00000001u;
-  } else {
-    _impl_._has_bits_[0] &= ~0x00000001u;
-  }
-  // @@protoc_insertion_point(field_unsafe_arena_set_allocated:io.deephaven.proto.backplane.grpc.RollupRequest.result_rollup_table_id)
-}
-inline ::io::deephaven::proto::backplane::grpc::Ticket* RollupRequest::release_result_rollup_table_id() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-
-  _impl_._has_bits_[0] &= ~0x00000001u;
-  ::io::deephaven::proto::backplane::grpc::Ticket* released = _impl_.result_rollup_table_id_;
-  _impl_.result_rollup_table_id_ = nullptr;
-#ifdef PROTOBUF_FORCE_COPY_IN_RELEASE
-  auto* old = reinterpret_cast<::google::protobuf::MessageLite*>(released);
-  released = ::google::protobuf::internal::DuplicateIfNonNull(released);
-  if (GetArena() == nullptr) {
-    delete old;
-  }
-#else   // PROTOBUF_FORCE_COPY_IN_RELEASE
-  if (GetArena() != nullptr) {
-    released = ::google::protobuf::internal::DuplicateIfNonNull(released);
-  }
-#endif  // !PROTOBUF_FORCE_COPY_IN_RELEASE
-  return released;
-}
-inline ::io::deephaven::proto::backplane::grpc::Ticket* RollupRequest::unsafe_arena_release_result_rollup_table_id() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  // @@protoc_insertion_point(field_release:io.deephaven.proto.backplane.grpc.RollupRequest.result_rollup_table_id)
-
-  _impl_._has_bits_[0] &= ~0x00000001u;
-  ::io::deephaven::proto::backplane::grpc::Ticket* temp = _impl_.result_rollup_table_id_;
-  _impl_.result_rollup_table_id_ = nullptr;
-  return temp;
-}
-inline ::io::deephaven::proto::backplane::grpc::Ticket* RollupRequest::_internal_mutable_result_rollup_table_id() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  _impl_._has_bits_[0] |= 0x00000001u;
-  if (_impl_.result_rollup_table_id_ == nullptr) {
-    auto* p = CreateMaybeMessage<::io::deephaven::proto::backplane::grpc::Ticket>(GetArena());
-    _impl_.result_rollup_table_id_ = reinterpret_cast<::io::deephaven::proto::backplane::grpc::Ticket*>(p);
-  }
-  return _impl_.result_rollup_table_id_;
-}
-inline ::io::deephaven::proto::backplane::grpc::Ticket* RollupRequest::mutable_result_rollup_table_id() ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  ::io::deephaven::proto::backplane::grpc::Ticket* _msg = _internal_mutable_result_rollup_table_id();
-  // @@protoc_insertion_point(field_mutable:io.deephaven.proto.backplane.grpc.RollupRequest.result_rollup_table_id)
-  return _msg;
-}
-inline void RollupRequest::set_allocated_result_rollup_table_id(::io::deephaven::proto::backplane::grpc::Ticket* value) {
-  ::google::protobuf::Arena* message_arena = GetArena();
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  if (message_arena == nullptr) {
-    delete reinterpret_cast<::google::protobuf::MessageLite*>(_impl_.result_rollup_table_id_);
-  }
-
-  if (value != nullptr) {
-    ::google::protobuf::Arena* submessage_arena = reinterpret_cast<::google::protobuf::MessageLite*>(value)->GetArena();
-    if (message_arena != submessage_arena) {
-      value = ::google::protobuf::internal::GetOwnedMessage(message_arena, value, submessage_arena);
-    }
-    _impl_._has_bits_[0] |= 0x00000001u;
-  } else {
-    _impl_._has_bits_[0] &= ~0x00000001u;
-  }
-
-  _impl_.result_rollup_table_id_ = reinterpret_cast<::io::deephaven::proto::backplane::grpc::Ticket*>(value);
-  // @@protoc_insertion_point(field_set_allocated:io.deephaven.proto.backplane.grpc.RollupRequest.result_rollup_table_id)
-}
-
-// .io.deephaven.proto.backplane.grpc.Ticket source_table_id = 2;
-inline bool RollupRequest::has_source_table_id() const {
-  bool value = (_impl_._has_bits_[0] & 0x00000002u) != 0;
-  PROTOBUF_ASSUME(!value || _impl_.source_table_id_ != nullptr);
-  return value;
-}
-inline const ::io::deephaven::proto::backplane::grpc::Ticket& RollupRequest::_internal_source_table_id() const {
-  PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race);
-  const ::io::deephaven::proto::backplane::grpc::Ticket* p = _impl_.source_table_id_;
-  return p != nullptr ? *p : reinterpret_cast<const ::io::deephaven::proto::backplane::grpc::Ticket&>(::io::deephaven::proto::backplane::grpc::_Ticket_default_instance_);
-}
-inline const ::io::deephaven::proto::backplane::grpc::Ticket& RollupRequest::source_table_id() const ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  // @@protoc_insertion_point(field_get:io.deephaven.proto.backplane.grpc.RollupRequest.source_table_id)
-  return _internal_source_table_id();
-}
-inline void RollupRequest::unsafe_arena_set_allocated_source_table_id(::io::deephaven::proto::backplane::grpc::Ticket* value) {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  if (GetArena() == nullptr) {
-    delete reinterpret_cast<::google::protobuf::MessageLite*>(_impl_.source_table_id_);
-  }
-  _impl_.source_table_id_ = reinterpret_cast<::io::deephaven::proto::backplane::grpc::Ticket*>(value);
-  if (value != nullptr) {
-    _impl_._has_bits_[0] |= 0x00000002u;
-  } else {
-    _impl_._has_bits_[0] &= ~0x00000002u;
-  }
-  // @@protoc_insertion_point(field_unsafe_arena_set_allocated:io.deephaven.proto.backplane.grpc.RollupRequest.source_table_id)
-}
-inline ::io::deephaven::proto::backplane::grpc::Ticket* RollupRequest::release_source_table_id() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-
-  _impl_._has_bits_[0] &= ~0x00000002u;
-  ::io::deephaven::proto::backplane::grpc::Ticket* released = _impl_.source_table_id_;
-  _impl_.source_table_id_ = nullptr;
-#ifdef PROTOBUF_FORCE_COPY_IN_RELEASE
-  auto* old = reinterpret_cast<::google::protobuf::MessageLite*>(released);
-  released = ::google::protobuf::internal::DuplicateIfNonNull(released);
-  if (GetArena() == nullptr) {
-    delete old;
-  }
-#else   // PROTOBUF_FORCE_COPY_IN_RELEASE
-  if (GetArena() != nullptr) {
-    released = ::google::protobuf::internal::DuplicateIfNonNull(released);
-  }
-#endif  // !PROTOBUF_FORCE_COPY_IN_RELEASE
-  return released;
-}
-inline ::io::deephaven::proto::backplane::grpc::Ticket* RollupRequest::unsafe_arena_release_source_table_id() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  // @@protoc_insertion_point(field_release:io.deephaven.proto.backplane.grpc.RollupRequest.source_table_id)
-
-  _impl_._has_bits_[0] &= ~0x00000002u;
-  ::io::deephaven::proto::backplane::grpc::Ticket* temp = _impl_.source_table_id_;
-  _impl_.source_table_id_ = nullptr;
-  return temp;
-}
-inline ::io::deephaven::proto::backplane::grpc::Ticket* RollupRequest::_internal_mutable_source_table_id() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  _impl_._has_bits_[0] |= 0x00000002u;
-  if (_impl_.source_table_id_ == nullptr) {
-    auto* p = CreateMaybeMessage<::io::deephaven::proto::backplane::grpc::Ticket>(GetArena());
-    _impl_.source_table_id_ = reinterpret_cast<::io::deephaven::proto::backplane::grpc::Ticket*>(p);
-  }
-  return _impl_.source_table_id_;
-}
-inline ::io::deephaven::proto::backplane::grpc::Ticket* RollupRequest::mutable_source_table_id() ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  ::io::deephaven::proto::backplane::grpc::Ticket* _msg = _internal_mutable_source_table_id();
-  // @@protoc_insertion_point(field_mutable:io.deephaven.proto.backplane.grpc.RollupRequest.source_table_id)
-  return _msg;
-}
-inline void RollupRequest::set_allocated_source_table_id(::io::deephaven::proto::backplane::grpc::Ticket* value) {
-  ::google::protobuf::Arena* message_arena = GetArena();
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  if (message_arena == nullptr) {
-    delete reinterpret_cast<::google::protobuf::MessageLite*>(_impl_.source_table_id_);
-  }
-
-  if (value != nullptr) {
-    ::google::protobuf::Arena* submessage_arena = reinterpret_cast<::google::protobuf::MessageLite*>(value)->GetArena();
-    if (message_arena != submessage_arena) {
-      value = ::google::protobuf::internal::GetOwnedMessage(message_arena, value, submessage_arena);
-    }
-    _impl_._has_bits_[0] |= 0x00000002u;
-  } else {
-    _impl_._has_bits_[0] &= ~0x00000002u;
-  }
-
-  _impl_.source_table_id_ = reinterpret_cast<::io::deephaven::proto::backplane::grpc::Ticket*>(value);
-  // @@protoc_insertion_point(field_set_allocated:io.deephaven.proto.backplane.grpc.RollupRequest.source_table_id)
-}
-
-// repeated .io.deephaven.proto.backplane.grpc.Aggregation aggregations = 3;
-inline int RollupRequest::_internal_aggregations_size() const {
-  return _internal_aggregations().size();
-}
-inline int RollupRequest::aggregations_size() const {
-  return _internal_aggregations_size();
-}
-inline ::io::deephaven::proto::backplane::grpc::Aggregation* RollupRequest::mutable_aggregations(int index)
-    ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  // @@protoc_insertion_point(field_mutable:io.deephaven.proto.backplane.grpc.RollupRequest.aggregations)
-  return _internal_mutable_aggregations()->Mutable(index);
-}
-inline ::google::protobuf::RepeatedPtrField<::io::deephaven::proto::backplane::grpc::Aggregation>* RollupRequest::mutable_aggregations()
-    ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  // @@protoc_insertion_point(field_mutable_list:io.deephaven.proto.backplane.grpc.RollupRequest.aggregations)
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  return _internal_mutable_aggregations();
-}
-inline const ::io::deephaven::proto::backplane::grpc::Aggregation& RollupRequest::aggregations(int index) const
-    ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  // @@protoc_insertion_point(field_get:io.deephaven.proto.backplane.grpc.RollupRequest.aggregations)
-  return _internal_aggregations().Get(index);
-}
-inline ::io::deephaven::proto::backplane::grpc::Aggregation* RollupRequest::add_aggregations() ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  ::io::deephaven::proto::backplane::grpc::Aggregation* _add = _internal_mutable_aggregations()->Add();
-  // @@protoc_insertion_point(field_add:io.deephaven.proto.backplane.grpc.RollupRequest.aggregations)
-  return _add;
-}
-inline const ::google::protobuf::RepeatedPtrField<::io::deephaven::proto::backplane::grpc::Aggregation>& RollupRequest::aggregations() const
-    ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  // @@protoc_insertion_point(field_list:io.deephaven.proto.backplane.grpc.RollupRequest.aggregations)
-  return _internal_aggregations();
-}
-inline const ::google::protobuf::RepeatedPtrField<::io::deephaven::proto::backplane::grpc::Aggregation>&
-RollupRequest::_internal_aggregations() const {
-  PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race);
-  return _impl_.aggregations_;
-}
-inline ::google::protobuf::RepeatedPtrField<::io::deephaven::proto::backplane::grpc::Aggregation>*
-RollupRequest::_internal_mutable_aggregations() {
-  PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race);
-  return &_impl_.aggregations_;
-}
-
-// bool include_constituents = 4;
-inline void RollupRequest::clear_include_constituents() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  _impl_.include_constituents_ = false;
-}
-inline bool RollupRequest::include_constituents() const {
-  // @@protoc_insertion_point(field_get:io.deephaven.proto.backplane.grpc.RollupRequest.include_constituents)
-  return _internal_include_constituents();
-}
-inline void RollupRequest::set_include_constituents(bool value) {
-  _internal_set_include_constituents(value);
-  // @@protoc_insertion_point(field_set:io.deephaven.proto.backplane.grpc.RollupRequest.include_constituents)
-}
-inline bool RollupRequest::_internal_include_constituents() const {
-  PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race);
-  return _impl_.include_constituents_;
-}
-inline void RollupRequest::_internal_set_include_constituents(bool value) {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  ;
-  _impl_.include_constituents_ = value;
-}
-
-// repeated string group_by_columns = 5;
-inline int RollupRequest::_internal_group_by_columns_size() const {
-  return _internal_group_by_columns().size();
-}
-inline int RollupRequest::group_by_columns_size() const {
-  return _internal_group_by_columns_size();
-}
-inline void RollupRequest::clear_group_by_columns() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  _impl_.group_by_columns_.Clear();
-}
-inline std::string* RollupRequest::add_group_by_columns()
-    ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  std::string* _s = _internal_mutable_group_by_columns()->Add();
-  // @@protoc_insertion_point(field_add_mutable:io.deephaven.proto.backplane.grpc.RollupRequest.group_by_columns)
-  return _s;
-}
-inline const std::string& RollupRequest::group_by_columns(int index) const
-    ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  // @@protoc_insertion_point(field_get:io.deephaven.proto.backplane.grpc.RollupRequest.group_by_columns)
-  return _internal_group_by_columns().Get(index);
-}
-inline std::string* RollupRequest::mutable_group_by_columns(int index)
-    ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  // @@protoc_insertion_point(field_mutable:io.deephaven.proto.backplane.grpc.RollupRequest.group_by_columns)
-  return _internal_mutable_group_by_columns()->Mutable(index);
-}
-inline void RollupRequest::set_group_by_columns(int index, const std::string& value) {
-  _internal_mutable_group_by_columns()->Mutable(index)->assign(value);
-  // @@protoc_insertion_point(field_set:io.deephaven.proto.backplane.grpc.RollupRequest.group_by_columns)
-}
-inline void RollupRequest::set_group_by_columns(int index, std::string&& value) {
-  _internal_mutable_group_by_columns()->Mutable(index)->assign(std::move(value));
-  // @@protoc_insertion_point(field_set:io.deephaven.proto.backplane.grpc.RollupRequest.group_by_columns)
-}
-inline void RollupRequest::set_group_by_columns(int index, const char* value) {
-  ABSL_DCHECK(value != nullptr);
-  _internal_mutable_group_by_columns()->Mutable(index)->assign(value);
-  // @@protoc_insertion_point(field_set_char:io.deephaven.proto.backplane.grpc.RollupRequest.group_by_columns)
-}
-inline void RollupRequest::set_group_by_columns(int index, const char* value,
-                              std::size_t size) {
-  _internal_mutable_group_by_columns()->Mutable(index)->assign(
-      reinterpret_cast<const char*>(value), size);
-  // @@protoc_insertion_point(field_set_pointer:io.deephaven.proto.backplane.grpc.RollupRequest.group_by_columns)
-}
-inline void RollupRequest::set_group_by_columns(int index, absl::string_view value) {
-  _internal_mutable_group_by_columns()->Mutable(index)->assign(value.data(),
-                                                     value.size());
-  // @@protoc_insertion_point(field_set_string_piece:io.deephaven.proto.backplane.grpc.RollupRequest.group_by_columns)
-}
-inline void RollupRequest::add_group_by_columns(const std::string& value) {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  _internal_mutable_group_by_columns()->Add()->assign(value);
-  // @@protoc_insertion_point(field_add:io.deephaven.proto.backplane.grpc.RollupRequest.group_by_columns)
-}
-inline void RollupRequest::add_group_by_columns(std::string&& value) {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  _internal_mutable_group_by_columns()->Add(std::move(value));
-  // @@protoc_insertion_point(field_add:io.deephaven.proto.backplane.grpc.RollupRequest.group_by_columns)
-}
-inline void RollupRequest::add_group_by_columns(const char* value) {
-  ABSL_DCHECK(value != nullptr);
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  _internal_mutable_group_by_columns()->Add()->assign(value);
-  // @@protoc_insertion_point(field_add_char:io.deephaven.proto.backplane.grpc.RollupRequest.group_by_columns)
-}
-inline void RollupRequest::add_group_by_columns(const char* value, std::size_t size) {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  _internal_mutable_group_by_columns()->Add()->assign(
-      reinterpret_cast<const char*>(value), size);
-  // @@protoc_insertion_point(field_add_pointer:io.deephaven.proto.backplane.grpc.RollupRequest.group_by_columns)
-}
-inline void RollupRequest::add_group_by_columns(absl::string_view value) {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  _internal_mutable_group_by_columns()->Add()->assign(value.data(), value.size());
-  // @@protoc_insertion_point(field_add_string_piece:io.deephaven.proto.backplane.grpc.RollupRequest.group_by_columns)
-}
-inline const ::google::protobuf::RepeatedPtrField<std::string>&
-RollupRequest::group_by_columns() const ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  // @@protoc_insertion_point(field_list:io.deephaven.proto.backplane.grpc.RollupRequest.group_by_columns)
-  return _internal_group_by_columns();
-}
-inline ::google::protobuf::RepeatedPtrField<std::string>*
-RollupRequest::mutable_group_by_columns() ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  // @@protoc_insertion_point(field_mutable_list:io.deephaven.proto.backplane.grpc.RollupRequest.group_by_columns)
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  return _internal_mutable_group_by_columns();
-}
-inline const ::google::protobuf::RepeatedPtrField<std::string>&
-RollupRequest::_internal_group_by_columns() const {
-  PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race);
-  return _impl_.group_by_columns_;
-}
-inline ::google::protobuf::RepeatedPtrField<std::string>*
-RollupRequest::_internal_mutable_group_by_columns() {
-  PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race);
-  return &_impl_.group_by_columns_;
-}
-
-// -------------------------------------------------------------------
-
-// RollupResponse
-
-// -------------------------------------------------------------------
-
-// TreeRequest
-
-// .io.deephaven.proto.backplane.grpc.Ticket result_tree_table_id = 1;
-inline bool TreeRequest::has_result_tree_table_id() const {
-  bool value = (_impl_._has_bits_[0] & 0x00000001u) != 0;
-  PROTOBUF_ASSUME(!value || _impl_.result_tree_table_id_ != nullptr);
-  return value;
-}
-inline const ::io::deephaven::proto::backplane::grpc::Ticket& TreeRequest::_internal_result_tree_table_id() const {
-  PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race);
-  const ::io::deephaven::proto::backplane::grpc::Ticket* p = _impl_.result_tree_table_id_;
-  return p != nullptr ? *p : reinterpret_cast<const ::io::deephaven::proto::backplane::grpc::Ticket&>(::io::deephaven::proto::backplane::grpc::_Ticket_default_instance_);
-}
-inline const ::io::deephaven::proto::backplane::grpc::Ticket& TreeRequest::result_tree_table_id() const ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  // @@protoc_insertion_point(field_get:io.deephaven.proto.backplane.grpc.TreeRequest.result_tree_table_id)
-  return _internal_result_tree_table_id();
-}
-inline void TreeRequest::unsafe_arena_set_allocated_result_tree_table_id(::io::deephaven::proto::backplane::grpc::Ticket* value) {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  if (GetArena() == nullptr) {
-    delete reinterpret_cast<::google::protobuf::MessageLite*>(_impl_.result_tree_table_id_);
-  }
-  _impl_.result_tree_table_id_ = reinterpret_cast<::io::deephaven::proto::backplane::grpc::Ticket*>(value);
-  if (value != nullptr) {
-    _impl_._has_bits_[0] |= 0x00000001u;
-  } else {
-    _impl_._has_bits_[0] &= ~0x00000001u;
-  }
-  // @@protoc_insertion_point(field_unsafe_arena_set_allocated:io.deephaven.proto.backplane.grpc.TreeRequest.result_tree_table_id)
-}
-inline ::io::deephaven::proto::backplane::grpc::Ticket* TreeRequest::release_result_tree_table_id() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-
-  _impl_._has_bits_[0] &= ~0x00000001u;
-  ::io::deephaven::proto::backplane::grpc::Ticket* released = _impl_.result_tree_table_id_;
-  _impl_.result_tree_table_id_ = nullptr;
-#ifdef PROTOBUF_FORCE_COPY_IN_RELEASE
-  auto* old = reinterpret_cast<::google::protobuf::MessageLite*>(released);
-  released = ::google::protobuf::internal::DuplicateIfNonNull(released);
-  if (GetArena() == nullptr) {
-    delete old;
-  }
-#else   // PROTOBUF_FORCE_COPY_IN_RELEASE
-  if (GetArena() != nullptr) {
-    released = ::google::protobuf::internal::DuplicateIfNonNull(released);
-  }
-#endif  // !PROTOBUF_FORCE_COPY_IN_RELEASE
-  return released;
-}
-inline ::io::deephaven::proto::backplane::grpc::Ticket* TreeRequest::unsafe_arena_release_result_tree_table_id() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  // @@protoc_insertion_point(field_release:io.deephaven.proto.backplane.grpc.TreeRequest.result_tree_table_id)
-
-  _impl_._has_bits_[0] &= ~0x00000001u;
-  ::io::deephaven::proto::backplane::grpc::Ticket* temp = _impl_.result_tree_table_id_;
-  _impl_.result_tree_table_id_ = nullptr;
-  return temp;
-}
-inline ::io::deephaven::proto::backplane::grpc::Ticket* TreeRequest::_internal_mutable_result_tree_table_id() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  _impl_._has_bits_[0] |= 0x00000001u;
-  if (_impl_.result_tree_table_id_ == nullptr) {
-    auto* p = CreateMaybeMessage<::io::deephaven::proto::backplane::grpc::Ticket>(GetArena());
-    _impl_.result_tree_table_id_ = reinterpret_cast<::io::deephaven::proto::backplane::grpc::Ticket*>(p);
-  }
-  return _impl_.result_tree_table_id_;
-}
-inline ::io::deephaven::proto::backplane::grpc::Ticket* TreeRequest::mutable_result_tree_table_id() ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  ::io::deephaven::proto::backplane::grpc::Ticket* _msg = _internal_mutable_result_tree_table_id();
-  // @@protoc_insertion_point(field_mutable:io.deephaven.proto.backplane.grpc.TreeRequest.result_tree_table_id)
-  return _msg;
-}
-inline void TreeRequest::set_allocated_result_tree_table_id(::io::deephaven::proto::backplane::grpc::Ticket* value) {
-  ::google::protobuf::Arena* message_arena = GetArena();
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  if (message_arena == nullptr) {
-    delete reinterpret_cast<::google::protobuf::MessageLite*>(_impl_.result_tree_table_id_);
-  }
-
-  if (value != nullptr) {
-    ::google::protobuf::Arena* submessage_arena = reinterpret_cast<::google::protobuf::MessageLite*>(value)->GetArena();
-    if (message_arena != submessage_arena) {
-      value = ::google::protobuf::internal::GetOwnedMessage(message_arena, value, submessage_arena);
-    }
-    _impl_._has_bits_[0] |= 0x00000001u;
-  } else {
-    _impl_._has_bits_[0] &= ~0x00000001u;
-  }
-
-  _impl_.result_tree_table_id_ = reinterpret_cast<::io::deephaven::proto::backplane::grpc::Ticket*>(value);
-  // @@protoc_insertion_point(field_set_allocated:io.deephaven.proto.backplane.grpc.TreeRequest.result_tree_table_id)
-}
-
-// .io.deephaven.proto.backplane.grpc.Ticket source_table_id = 2;
-inline bool TreeRequest::has_source_table_id() const {
-  bool value = (_impl_._has_bits_[0] & 0x00000002u) != 0;
-  PROTOBUF_ASSUME(!value || _impl_.source_table_id_ != nullptr);
-  return value;
-}
-inline const ::io::deephaven::proto::backplane::grpc::Ticket& TreeRequest::_internal_source_table_id() const {
-  PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race);
-  const ::io::deephaven::proto::backplane::grpc::Ticket* p = _impl_.source_table_id_;
-  return p != nullptr ? *p : reinterpret_cast<const ::io::deephaven::proto::backplane::grpc::Ticket&>(::io::deephaven::proto::backplane::grpc::_Ticket_default_instance_);
-}
-inline const ::io::deephaven::proto::backplane::grpc::Ticket& TreeRequest::source_table_id() const ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  // @@protoc_insertion_point(field_get:io.deephaven.proto.backplane.grpc.TreeRequest.source_table_id)
-  return _internal_source_table_id();
-}
-inline void TreeRequest::unsafe_arena_set_allocated_source_table_id(::io::deephaven::proto::backplane::grpc::Ticket* value) {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  if (GetArena() == nullptr) {
-    delete reinterpret_cast<::google::protobuf::MessageLite*>(_impl_.source_table_id_);
-  }
-  _impl_.source_table_id_ = reinterpret_cast<::io::deephaven::proto::backplane::grpc::Ticket*>(value);
-  if (value != nullptr) {
-    _impl_._has_bits_[0] |= 0x00000002u;
-  } else {
-    _impl_._has_bits_[0] &= ~0x00000002u;
-  }
-  // @@protoc_insertion_point(field_unsafe_arena_set_allocated:io.deephaven.proto.backplane.grpc.TreeRequest.source_table_id)
-}
-inline ::io::deephaven::proto::backplane::grpc::Ticket* TreeRequest::release_source_table_id() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-
-  _impl_._has_bits_[0] &= ~0x00000002u;
-  ::io::deephaven::proto::backplane::grpc::Ticket* released = _impl_.source_table_id_;
-  _impl_.source_table_id_ = nullptr;
-#ifdef PROTOBUF_FORCE_COPY_IN_RELEASE
-  auto* old = reinterpret_cast<::google::protobuf::MessageLite*>(released);
-  released = ::google::protobuf::internal::DuplicateIfNonNull(released);
-  if (GetArena() == nullptr) {
-    delete old;
-  }
-#else   // PROTOBUF_FORCE_COPY_IN_RELEASE
-  if (GetArena() != nullptr) {
-    released = ::google::protobuf::internal::DuplicateIfNonNull(released);
-  }
-#endif  // !PROTOBUF_FORCE_COPY_IN_RELEASE
-  return released;
-}
-inline ::io::deephaven::proto::backplane::grpc::Ticket* TreeRequest::unsafe_arena_release_source_table_id() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  // @@protoc_insertion_point(field_release:io.deephaven.proto.backplane.grpc.TreeRequest.source_table_id)
-
-  _impl_._has_bits_[0] &= ~0x00000002u;
-  ::io::deephaven::proto::backplane::grpc::Ticket* temp = _impl_.source_table_id_;
-  _impl_.source_table_id_ = nullptr;
-  return temp;
-}
-inline ::io::deephaven::proto::backplane::grpc::Ticket* TreeRequest::_internal_mutable_source_table_id() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  _impl_._has_bits_[0] |= 0x00000002u;
-  if (_impl_.source_table_id_ == nullptr) {
-    auto* p = CreateMaybeMessage<::io::deephaven::proto::backplane::grpc::Ticket>(GetArena());
-    _impl_.source_table_id_ = reinterpret_cast<::io::deephaven::proto::backplane::grpc::Ticket*>(p);
-  }
-  return _impl_.source_table_id_;
-}
-inline ::io::deephaven::proto::backplane::grpc::Ticket* TreeRequest::mutable_source_table_id() ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  ::io::deephaven::proto::backplane::grpc::Ticket* _msg = _internal_mutable_source_table_id();
-  // @@protoc_insertion_point(field_mutable:io.deephaven.proto.backplane.grpc.TreeRequest.source_table_id)
-  return _msg;
-}
-inline void TreeRequest::set_allocated_source_table_id(::io::deephaven::proto::backplane::grpc::Ticket* value) {
-  ::google::protobuf::Arena* message_arena = GetArena();
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  if (message_arena == nullptr) {
-    delete reinterpret_cast<::google::protobuf::MessageLite*>(_impl_.source_table_id_);
-  }
-
-  if (value != nullptr) {
-    ::google::protobuf::Arena* submessage_arena = reinterpret_cast<::google::protobuf::MessageLite*>(value)->GetArena();
-    if (message_arena != submessage_arena) {
-      value = ::google::protobuf::internal::GetOwnedMessage(message_arena, value, submessage_arena);
-    }
-    _impl_._has_bits_[0] |= 0x00000002u;
-  } else {
-    _impl_._has_bits_[0] &= ~0x00000002u;
-  }
-
-  _impl_.source_table_id_ = reinterpret_cast<::io::deephaven::proto::backplane::grpc::Ticket*>(value);
-  // @@protoc_insertion_point(field_set_allocated:io.deephaven.proto.backplane.grpc.TreeRequest.source_table_id)
-}
-
-// string identifier_column = 3;
-inline void TreeRequest::clear_identifier_column() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  _impl_.identifier_column_.ClearToEmpty();
-}
-inline const std::string& TreeRequest::identifier_column() const
-    ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  // @@protoc_insertion_point(field_get:io.deephaven.proto.backplane.grpc.TreeRequest.identifier_column)
-  return _internal_identifier_column();
-}
-template <typename Arg_, typename... Args_>
-inline PROTOBUF_ALWAYS_INLINE void TreeRequest::set_identifier_column(Arg_&& arg,
-                                                     Args_... args) {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  ;
-  _impl_.identifier_column_.Set(static_cast<Arg_&&>(arg), args..., GetArena());
-  // @@protoc_insertion_point(field_set:io.deephaven.proto.backplane.grpc.TreeRequest.identifier_column)
-}
-inline std::string* TreeRequest::mutable_identifier_column() ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  std::string* _s = _internal_mutable_identifier_column();
-  // @@protoc_insertion_point(field_mutable:io.deephaven.proto.backplane.grpc.TreeRequest.identifier_column)
-  return _s;
-}
-inline const std::string& TreeRequest::_internal_identifier_column() const {
-  PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race);
-  return _impl_.identifier_column_.Get();
-}
-inline void TreeRequest::_internal_set_identifier_column(const std::string& value) {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  ;
-  _impl_.identifier_column_.Set(value, GetArena());
-}
-inline std::string* TreeRequest::_internal_mutable_identifier_column() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  ;
-  return _impl_.identifier_column_.Mutable( GetArena());
-}
-inline std::string* TreeRequest::release_identifier_column() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  // @@protoc_insertion_point(field_release:io.deephaven.proto.backplane.grpc.TreeRequest.identifier_column)
-  return _impl_.identifier_column_.Release();
-}
-inline void TreeRequest::set_allocated_identifier_column(std::string* value) {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  _impl_.identifier_column_.SetAllocated(value, GetArena());
-  #ifdef PROTOBUF_FORCE_COPY_DEFAULT_STRING
-        if (_impl_.identifier_column_.IsDefault()) {
-          _impl_.identifier_column_.Set("", GetArena());
-        }
-  #endif  // PROTOBUF_FORCE_COPY_DEFAULT_STRING
-  // @@protoc_insertion_point(field_set_allocated:io.deephaven.proto.backplane.grpc.TreeRequest.identifier_column)
-}
-
-// string parent_identifier_column = 4;
-inline void TreeRequest::clear_parent_identifier_column() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  _impl_.parent_identifier_column_.ClearToEmpty();
-}
-inline const std::string& TreeRequest::parent_identifier_column() const
-    ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  // @@protoc_insertion_point(field_get:io.deephaven.proto.backplane.grpc.TreeRequest.parent_identifier_column)
-  return _internal_parent_identifier_column();
-}
-template <typename Arg_, typename... Args_>
-inline PROTOBUF_ALWAYS_INLINE void TreeRequest::set_parent_identifier_column(Arg_&& arg,
-                                                     Args_... args) {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  ;
-  _impl_.parent_identifier_column_.Set(static_cast<Arg_&&>(arg), args..., GetArena());
-  // @@protoc_insertion_point(field_set:io.deephaven.proto.backplane.grpc.TreeRequest.parent_identifier_column)
-}
-inline std::string* TreeRequest::mutable_parent_identifier_column() ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  std::string* _s = _internal_mutable_parent_identifier_column();
-  // @@protoc_insertion_point(field_mutable:io.deephaven.proto.backplane.grpc.TreeRequest.parent_identifier_column)
-  return _s;
-}
-inline const std::string& TreeRequest::_internal_parent_identifier_column() const {
-  PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race);
-  return _impl_.parent_identifier_column_.Get();
-}
-inline void TreeRequest::_internal_set_parent_identifier_column(const std::string& value) {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  ;
-  _impl_.parent_identifier_column_.Set(value, GetArena());
-}
-inline std::string* TreeRequest::_internal_mutable_parent_identifier_column() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  ;
-  return _impl_.parent_identifier_column_.Mutable( GetArena());
-}
-inline std::string* TreeRequest::release_parent_identifier_column() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  // @@protoc_insertion_point(field_release:io.deephaven.proto.backplane.grpc.TreeRequest.parent_identifier_column)
-  return _impl_.parent_identifier_column_.Release();
-}
-inline void TreeRequest::set_allocated_parent_identifier_column(std::string* value) {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  _impl_.parent_identifier_column_.SetAllocated(value, GetArena());
-  #ifdef PROTOBUF_FORCE_COPY_DEFAULT_STRING
-        if (_impl_.parent_identifier_column_.IsDefault()) {
-          _impl_.parent_identifier_column_.Set("", GetArena());
-        }
-  #endif  // PROTOBUF_FORCE_COPY_DEFAULT_STRING
-  // @@protoc_insertion_point(field_set_allocated:io.deephaven.proto.backplane.grpc.TreeRequest.parent_identifier_column)
-}
-
-// bool promote_orphans = 5;
-inline void TreeRequest::clear_promote_orphans() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  _impl_.promote_orphans_ = false;
-}
-inline bool TreeRequest::promote_orphans() const {
-  // @@protoc_insertion_point(field_get:io.deephaven.proto.backplane.grpc.TreeRequest.promote_orphans)
-  return _internal_promote_orphans();
-}
-inline void TreeRequest::set_promote_orphans(bool value) {
-  _internal_set_promote_orphans(value);
-  // @@protoc_insertion_point(field_set:io.deephaven.proto.backplane.grpc.TreeRequest.promote_orphans)
-}
-inline bool TreeRequest::_internal_promote_orphans() const {
-  PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race);
-  return _impl_.promote_orphans_;
-}
-inline void TreeRequest::_internal_set_promote_orphans(bool value) {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  ;
-  _impl_.promote_orphans_ = value;
-}
-
-// -------------------------------------------------------------------
-
-// TreeResponse
-
-// -------------------------------------------------------------------
-
-// HierarchicalTableApplyRequest
-
-// .io.deephaven.proto.backplane.grpc.Ticket result_hierarchical_table_id = 1;
-inline bool HierarchicalTableApplyRequest::has_result_hierarchical_table_id() const {
-  bool value = (_impl_._has_bits_[0] & 0x00000001u) != 0;
-  PROTOBUF_ASSUME(!value || _impl_.result_hierarchical_table_id_ != nullptr);
-  return value;
-}
-inline const ::io::deephaven::proto::backplane::grpc::Ticket& HierarchicalTableApplyRequest::_internal_result_hierarchical_table_id() const {
-  PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race);
-  const ::io::deephaven::proto::backplane::grpc::Ticket* p = _impl_.result_hierarchical_table_id_;
-  return p != nullptr ? *p : reinterpret_cast<const ::io::deephaven::proto::backplane::grpc::Ticket&>(::io::deephaven::proto::backplane::grpc::_Ticket_default_instance_);
-}
-inline const ::io::deephaven::proto::backplane::grpc::Ticket& HierarchicalTableApplyRequest::result_hierarchical_table_id() const ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  // @@protoc_insertion_point(field_get:io.deephaven.proto.backplane.grpc.HierarchicalTableApplyRequest.result_hierarchical_table_id)
-  return _internal_result_hierarchical_table_id();
-}
-inline void HierarchicalTableApplyRequest::unsafe_arena_set_allocated_result_hierarchical_table_id(::io::deephaven::proto::backplane::grpc::Ticket* value) {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  if (GetArena() == nullptr) {
-    delete reinterpret_cast<::google::protobuf::MessageLite*>(_impl_.result_hierarchical_table_id_);
-  }
-  _impl_.result_hierarchical_table_id_ = reinterpret_cast<::io::deephaven::proto::backplane::grpc::Ticket*>(value);
-  if (value != nullptr) {
-    _impl_._has_bits_[0] |= 0x00000001u;
-  } else {
-    _impl_._has_bits_[0] &= ~0x00000001u;
-  }
-  // @@protoc_insertion_point(field_unsafe_arena_set_allocated:io.deephaven.proto.backplane.grpc.HierarchicalTableApplyRequest.result_hierarchical_table_id)
-}
-inline ::io::deephaven::proto::backplane::grpc::Ticket* HierarchicalTableApplyRequest::release_result_hierarchical_table_id() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-
-  _impl_._has_bits_[0] &= ~0x00000001u;
-  ::io::deephaven::proto::backplane::grpc::Ticket* released = _impl_.result_hierarchical_table_id_;
-  _impl_.result_hierarchical_table_id_ = nullptr;
-#ifdef PROTOBUF_FORCE_COPY_IN_RELEASE
-  auto* old = reinterpret_cast<::google::protobuf::MessageLite*>(released);
-  released = ::google::protobuf::internal::DuplicateIfNonNull(released);
-  if (GetArena() == nullptr) {
-    delete old;
-  }
-#else   // PROTOBUF_FORCE_COPY_IN_RELEASE
-  if (GetArena() != nullptr) {
-    released = ::google::protobuf::internal::DuplicateIfNonNull(released);
-  }
-#endif  // !PROTOBUF_FORCE_COPY_IN_RELEASE
-  return released;
-}
-inline ::io::deephaven::proto::backplane::grpc::Ticket* HierarchicalTableApplyRequest::unsafe_arena_release_result_hierarchical_table_id() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  // @@protoc_insertion_point(field_release:io.deephaven.proto.backplane.grpc.HierarchicalTableApplyRequest.result_hierarchical_table_id)
-
-  _impl_._has_bits_[0] &= ~0x00000001u;
-  ::io::deephaven::proto::backplane::grpc::Ticket* temp = _impl_.result_hierarchical_table_id_;
-  _impl_.result_hierarchical_table_id_ = nullptr;
-  return temp;
-}
-inline ::io::deephaven::proto::backplane::grpc::Ticket* HierarchicalTableApplyRequest::_internal_mutable_result_hierarchical_table_id() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  _impl_._has_bits_[0] |= 0x00000001u;
-  if (_impl_.result_hierarchical_table_id_ == nullptr) {
-    auto* p = CreateMaybeMessage<::io::deephaven::proto::backplane::grpc::Ticket>(GetArena());
-    _impl_.result_hierarchical_table_id_ = reinterpret_cast<::io::deephaven::proto::backplane::grpc::Ticket*>(p);
-  }
-  return _impl_.result_hierarchical_table_id_;
-}
-inline ::io::deephaven::proto::backplane::grpc::Ticket* HierarchicalTableApplyRequest::mutable_result_hierarchical_table_id() ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  ::io::deephaven::proto::backplane::grpc::Ticket* _msg = _internal_mutable_result_hierarchical_table_id();
-  // @@protoc_insertion_point(field_mutable:io.deephaven.proto.backplane.grpc.HierarchicalTableApplyRequest.result_hierarchical_table_id)
-  return _msg;
-}
-inline void HierarchicalTableApplyRequest::set_allocated_result_hierarchical_table_id(::io::deephaven::proto::backplane::grpc::Ticket* value) {
-  ::google::protobuf::Arena* message_arena = GetArena();
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  if (message_arena == nullptr) {
-    delete reinterpret_cast<::google::protobuf::MessageLite*>(_impl_.result_hierarchical_table_id_);
-  }
-
-  if (value != nullptr) {
-    ::google::protobuf::Arena* submessage_arena = reinterpret_cast<::google::protobuf::MessageLite*>(value)->GetArena();
-    if (message_arena != submessage_arena) {
-      value = ::google::protobuf::internal::GetOwnedMessage(message_arena, value, submessage_arena);
-    }
-    _impl_._has_bits_[0] |= 0x00000001u;
-  } else {
-    _impl_._has_bits_[0] &= ~0x00000001u;
-  }
-
-  _impl_.result_hierarchical_table_id_ = reinterpret_cast<::io::deephaven::proto::backplane::grpc::Ticket*>(value);
-  // @@protoc_insertion_point(field_set_allocated:io.deephaven.proto.backplane.grpc.HierarchicalTableApplyRequest.result_hierarchical_table_id)
-}
-
-// .io.deephaven.proto.backplane.grpc.Ticket input_hierarchical_table_id = 2;
-inline bool HierarchicalTableApplyRequest::has_input_hierarchical_table_id() const {
-  bool value = (_impl_._has_bits_[0] & 0x00000002u) != 0;
-  PROTOBUF_ASSUME(!value || _impl_.input_hierarchical_table_id_ != nullptr);
-  return value;
-}
-inline const ::io::deephaven::proto::backplane::grpc::Ticket& HierarchicalTableApplyRequest::_internal_input_hierarchical_table_id() const {
-  PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race);
-  const ::io::deephaven::proto::backplane::grpc::Ticket* p = _impl_.input_hierarchical_table_id_;
-  return p != nullptr ? *p : reinterpret_cast<const ::io::deephaven::proto::backplane::grpc::Ticket&>(::io::deephaven::proto::backplane::grpc::_Ticket_default_instance_);
-}
-inline const ::io::deephaven::proto::backplane::grpc::Ticket& HierarchicalTableApplyRequest::input_hierarchical_table_id() const ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  // @@protoc_insertion_point(field_get:io.deephaven.proto.backplane.grpc.HierarchicalTableApplyRequest.input_hierarchical_table_id)
-  return _internal_input_hierarchical_table_id();
-}
-inline void HierarchicalTableApplyRequest::unsafe_arena_set_allocated_input_hierarchical_table_id(::io::deephaven::proto::backplane::grpc::Ticket* value) {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  if (GetArena() == nullptr) {
-    delete reinterpret_cast<::google::protobuf::MessageLite*>(_impl_.input_hierarchical_table_id_);
-  }
-  _impl_.input_hierarchical_table_id_ = reinterpret_cast<::io::deephaven::proto::backplane::grpc::Ticket*>(value);
-  if (value != nullptr) {
-    _impl_._has_bits_[0] |= 0x00000002u;
-  } else {
-    _impl_._has_bits_[0] &= ~0x00000002u;
-  }
-  // @@protoc_insertion_point(field_unsafe_arena_set_allocated:io.deephaven.proto.backplane.grpc.HierarchicalTableApplyRequest.input_hierarchical_table_id)
-}
-inline ::io::deephaven::proto::backplane::grpc::Ticket* HierarchicalTableApplyRequest::release_input_hierarchical_table_id() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-
-  _impl_._has_bits_[0] &= ~0x00000002u;
-  ::io::deephaven::proto::backplane::grpc::Ticket* released = _impl_.input_hierarchical_table_id_;
-  _impl_.input_hierarchical_table_id_ = nullptr;
-#ifdef PROTOBUF_FORCE_COPY_IN_RELEASE
-  auto* old = reinterpret_cast<::google::protobuf::MessageLite*>(released);
-  released = ::google::protobuf::internal::DuplicateIfNonNull(released);
-  if (GetArena() == nullptr) {
-    delete old;
-  }
-#else   // PROTOBUF_FORCE_COPY_IN_RELEASE
-  if (GetArena() != nullptr) {
-    released = ::google::protobuf::internal::DuplicateIfNonNull(released);
-  }
-#endif  // !PROTOBUF_FORCE_COPY_IN_RELEASE
-  return released;
-}
-inline ::io::deephaven::proto::backplane::grpc::Ticket* HierarchicalTableApplyRequest::unsafe_arena_release_input_hierarchical_table_id() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  // @@protoc_insertion_point(field_release:io.deephaven.proto.backplane.grpc.HierarchicalTableApplyRequest.input_hierarchical_table_id)
-
-  _impl_._has_bits_[0] &= ~0x00000002u;
-  ::io::deephaven::proto::backplane::grpc::Ticket* temp = _impl_.input_hierarchical_table_id_;
-  _impl_.input_hierarchical_table_id_ = nullptr;
-  return temp;
-}
-inline ::io::deephaven::proto::backplane::grpc::Ticket* HierarchicalTableApplyRequest::_internal_mutable_input_hierarchical_table_id() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  _impl_._has_bits_[0] |= 0x00000002u;
-  if (_impl_.input_hierarchical_table_id_ == nullptr) {
-    auto* p = CreateMaybeMessage<::io::deephaven::proto::backplane::grpc::Ticket>(GetArena());
-    _impl_.input_hierarchical_table_id_ = reinterpret_cast<::io::deephaven::proto::backplane::grpc::Ticket*>(p);
-  }
-  return _impl_.input_hierarchical_table_id_;
-}
-inline ::io::deephaven::proto::backplane::grpc::Ticket* HierarchicalTableApplyRequest::mutable_input_hierarchical_table_id() ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  ::io::deephaven::proto::backplane::grpc::Ticket* _msg = _internal_mutable_input_hierarchical_table_id();
-  // @@protoc_insertion_point(field_mutable:io.deephaven.proto.backplane.grpc.HierarchicalTableApplyRequest.input_hierarchical_table_id)
-  return _msg;
-}
-inline void HierarchicalTableApplyRequest::set_allocated_input_hierarchical_table_id(::io::deephaven::proto::backplane::grpc::Ticket* value) {
-  ::google::protobuf::Arena* message_arena = GetArena();
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  if (message_arena == nullptr) {
-    delete reinterpret_cast<::google::protobuf::MessageLite*>(_impl_.input_hierarchical_table_id_);
-  }
-
-  if (value != nullptr) {
-    ::google::protobuf::Arena* submessage_arena = reinterpret_cast<::google::protobuf::MessageLite*>(value)->GetArena();
-    if (message_arena != submessage_arena) {
-      value = ::google::protobuf::internal::GetOwnedMessage(message_arena, value, submessage_arena);
-    }
-    _impl_._has_bits_[0] |= 0x00000002u;
-  } else {
-    _impl_._has_bits_[0] &= ~0x00000002u;
-  }
-
-  _impl_.input_hierarchical_table_id_ = reinterpret_cast<::io::deephaven::proto::backplane::grpc::Ticket*>(value);
-  // @@protoc_insertion_point(field_set_allocated:io.deephaven.proto.backplane.grpc.HierarchicalTableApplyRequest.input_hierarchical_table_id)
-}
-
-// repeated .io.deephaven.proto.backplane.grpc.Condition filters = 3;
-inline int HierarchicalTableApplyRequest::_internal_filters_size() const {
-  return _internal_filters().size();
-}
-inline int HierarchicalTableApplyRequest::filters_size() const {
-  return _internal_filters_size();
-}
-inline ::io::deephaven::proto::backplane::grpc::Condition* HierarchicalTableApplyRequest::mutable_filters(int index)
-    ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  // @@protoc_insertion_point(field_mutable:io.deephaven.proto.backplane.grpc.HierarchicalTableApplyRequest.filters)
-  return _internal_mutable_filters()->Mutable(index);
-}
-inline ::google::protobuf::RepeatedPtrField<::io::deephaven::proto::backplane::grpc::Condition>* HierarchicalTableApplyRequest::mutable_filters()
-    ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  // @@protoc_insertion_point(field_mutable_list:io.deephaven.proto.backplane.grpc.HierarchicalTableApplyRequest.filters)
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  return _internal_mutable_filters();
-}
-inline const ::io::deephaven::proto::backplane::grpc::Condition& HierarchicalTableApplyRequest::filters(int index) const
-    ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  // @@protoc_insertion_point(field_get:io.deephaven.proto.backplane.grpc.HierarchicalTableApplyRequest.filters)
-  return _internal_filters().Get(index);
-}
-inline ::io::deephaven::proto::backplane::grpc::Condition* HierarchicalTableApplyRequest::add_filters() ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  ::io::deephaven::proto::backplane::grpc::Condition* _add = _internal_mutable_filters()->Add();
-  // @@protoc_insertion_point(field_add:io.deephaven.proto.backplane.grpc.HierarchicalTableApplyRequest.filters)
-  return _add;
-}
-inline const ::google::protobuf::RepeatedPtrField<::io::deephaven::proto::backplane::grpc::Condition>& HierarchicalTableApplyRequest::filters() const
-    ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  // @@protoc_insertion_point(field_list:io.deephaven.proto.backplane.grpc.HierarchicalTableApplyRequest.filters)
-  return _internal_filters();
-}
-inline const ::google::protobuf::RepeatedPtrField<::io::deephaven::proto::backplane::grpc::Condition>&
-HierarchicalTableApplyRequest::_internal_filters() const {
-  PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race);
-  return _impl_.filters_;
-}
-inline ::google::protobuf::RepeatedPtrField<::io::deephaven::proto::backplane::grpc::Condition>*
-HierarchicalTableApplyRequest::_internal_mutable_filters() {
-  PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race);
-  return &_impl_.filters_;
-}
-
-// repeated .io.deephaven.proto.backplane.grpc.SortDescriptor sorts = 4;
-inline int HierarchicalTableApplyRequest::_internal_sorts_size() const {
-  return _internal_sorts().size();
-}
-inline int HierarchicalTableApplyRequest::sorts_size() const {
-  return _internal_sorts_size();
-}
-inline ::io::deephaven::proto::backplane::grpc::SortDescriptor* HierarchicalTableApplyRequest::mutable_sorts(int index)
-    ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  // @@protoc_insertion_point(field_mutable:io.deephaven.proto.backplane.grpc.HierarchicalTableApplyRequest.sorts)
-  return _internal_mutable_sorts()->Mutable(index);
-}
-inline ::google::protobuf::RepeatedPtrField<::io::deephaven::proto::backplane::grpc::SortDescriptor>* HierarchicalTableApplyRequest::mutable_sorts()
-    ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  // @@protoc_insertion_point(field_mutable_list:io.deephaven.proto.backplane.grpc.HierarchicalTableApplyRequest.sorts)
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  return _internal_mutable_sorts();
-}
-inline const ::io::deephaven::proto::backplane::grpc::SortDescriptor& HierarchicalTableApplyRequest::sorts(int index) const
-    ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  // @@protoc_insertion_point(field_get:io.deephaven.proto.backplane.grpc.HierarchicalTableApplyRequest.sorts)
-  return _internal_sorts().Get(index);
-}
-inline ::io::deephaven::proto::backplane::grpc::SortDescriptor* HierarchicalTableApplyRequest::add_sorts() ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  ::io::deephaven::proto::backplane::grpc::SortDescriptor* _add = _internal_mutable_sorts()->Add();
-  // @@protoc_insertion_point(field_add:io.deephaven.proto.backplane.grpc.HierarchicalTableApplyRequest.sorts)
-  return _add;
-}
-inline const ::google::protobuf::RepeatedPtrField<::io::deephaven::proto::backplane::grpc::SortDescriptor>& HierarchicalTableApplyRequest::sorts() const
-    ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  // @@protoc_insertion_point(field_list:io.deephaven.proto.backplane.grpc.HierarchicalTableApplyRequest.sorts)
-  return _internal_sorts();
-}
-inline const ::google::protobuf::RepeatedPtrField<::io::deephaven::proto::backplane::grpc::SortDescriptor>&
-HierarchicalTableApplyRequest::_internal_sorts() const {
-  PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race);
-  return _impl_.sorts_;
-}
-inline ::google::protobuf::RepeatedPtrField<::io::deephaven::proto::backplane::grpc::SortDescriptor>*
-HierarchicalTableApplyRequest::_internal_mutable_sorts() {
-  PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race);
-  return &_impl_.sorts_;
-}
-
-// -------------------------------------------------------------------
-
-// HierarchicalTableApplyResponse
-
-// -------------------------------------------------------------------
-
-// HierarchicalTableDescriptor
-
-// bytes snapshot_schema = 1;
-inline void HierarchicalTableDescriptor::clear_snapshot_schema() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  _impl_.snapshot_schema_.ClearToEmpty();
-}
-inline const std::string& HierarchicalTableDescriptor::snapshot_schema() const
-    ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  // @@protoc_insertion_point(field_get:io.deephaven.proto.backplane.grpc.HierarchicalTableDescriptor.snapshot_schema)
-  return _internal_snapshot_schema();
-}
-template <typename Arg_, typename... Args_>
-inline PROTOBUF_ALWAYS_INLINE void HierarchicalTableDescriptor::set_snapshot_schema(Arg_&& arg,
-                                                     Args_... args) {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  ;
-  _impl_.snapshot_schema_.SetBytes(static_cast<Arg_&&>(arg), args..., GetArena());
-  // @@protoc_insertion_point(field_set:io.deephaven.proto.backplane.grpc.HierarchicalTableDescriptor.snapshot_schema)
-}
-inline std::string* HierarchicalTableDescriptor::mutable_snapshot_schema() ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  std::string* _s = _internal_mutable_snapshot_schema();
-  // @@protoc_insertion_point(field_mutable:io.deephaven.proto.backplane.grpc.HierarchicalTableDescriptor.snapshot_schema)
-  return _s;
-}
-inline const std::string& HierarchicalTableDescriptor::_internal_snapshot_schema() const {
-  PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race);
-  return _impl_.snapshot_schema_.Get();
-}
-inline void HierarchicalTableDescriptor::_internal_set_snapshot_schema(const std::string& value) {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  ;
-  _impl_.snapshot_schema_.Set(value, GetArena());
-}
-inline std::string* HierarchicalTableDescriptor::_internal_mutable_snapshot_schema() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  ;
-  return _impl_.snapshot_schema_.Mutable( GetArena());
-}
-inline std::string* HierarchicalTableDescriptor::release_snapshot_schema() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  // @@protoc_insertion_point(field_release:io.deephaven.proto.backplane.grpc.HierarchicalTableDescriptor.snapshot_schema)
-  return _impl_.snapshot_schema_.Release();
-}
-inline void HierarchicalTableDescriptor::set_allocated_snapshot_schema(std::string* value) {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  _impl_.snapshot_schema_.SetAllocated(value, GetArena());
-  #ifdef PROTOBUF_FORCE_COPY_DEFAULT_STRING
-        if (_impl_.snapshot_schema_.IsDefault()) {
-          _impl_.snapshot_schema_.Set("", GetArena());
-        }
-  #endif  // PROTOBUF_FORCE_COPY_DEFAULT_STRING
-  // @@protoc_insertion_point(field_set_allocated:io.deephaven.proto.backplane.grpc.HierarchicalTableDescriptor.snapshot_schema)
-}
-
-// bool is_static = 2;
-inline void HierarchicalTableDescriptor::clear_is_static() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  _impl_.is_static_ = false;
-}
-inline bool HierarchicalTableDescriptor::is_static() const {
-  // @@protoc_insertion_point(field_get:io.deephaven.proto.backplane.grpc.HierarchicalTableDescriptor.is_static)
-  return _internal_is_static();
-}
-inline void HierarchicalTableDescriptor::set_is_static(bool value) {
-  _internal_set_is_static(value);
-  // @@protoc_insertion_point(field_set:io.deephaven.proto.backplane.grpc.HierarchicalTableDescriptor.is_static)
-}
-inline bool HierarchicalTableDescriptor::_internal_is_static() const {
-  PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race);
-  return _impl_.is_static_;
-}
-inline void HierarchicalTableDescriptor::_internal_set_is_static(bool value) {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  ;
-  _impl_.is_static_ = value;
-}
-
-// -------------------------------------------------------------------
-
-// HierarchicalTableViewRequest
-
-// .io.deephaven.proto.backplane.grpc.Ticket result_view_id = 1;
-inline bool HierarchicalTableViewRequest::has_result_view_id() const {
-  bool value = (_impl_._has_bits_[0] & 0x00000001u) != 0;
-  PROTOBUF_ASSUME(!value || _impl_.result_view_id_ != nullptr);
-  return value;
-}
-inline const ::io::deephaven::proto::backplane::grpc::Ticket& HierarchicalTableViewRequest::_internal_result_view_id() const {
-  PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race);
-  const ::io::deephaven::proto::backplane::grpc::Ticket* p = _impl_.result_view_id_;
-  return p != nullptr ? *p : reinterpret_cast<const ::io::deephaven::proto::backplane::grpc::Ticket&>(::io::deephaven::proto::backplane::grpc::_Ticket_default_instance_);
-}
-inline const ::io::deephaven::proto::backplane::grpc::Ticket& HierarchicalTableViewRequest::result_view_id() const ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  // @@protoc_insertion_point(field_get:io.deephaven.proto.backplane.grpc.HierarchicalTableViewRequest.result_view_id)
-  return _internal_result_view_id();
-}
-inline void HierarchicalTableViewRequest::unsafe_arena_set_allocated_result_view_id(::io::deephaven::proto::backplane::grpc::Ticket* value) {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  if (GetArena() == nullptr) {
-    delete reinterpret_cast<::google::protobuf::MessageLite*>(_impl_.result_view_id_);
-  }
-  _impl_.result_view_id_ = reinterpret_cast<::io::deephaven::proto::backplane::grpc::Ticket*>(value);
-  if (value != nullptr) {
-    _impl_._has_bits_[0] |= 0x00000001u;
-  } else {
-    _impl_._has_bits_[0] &= ~0x00000001u;
-  }
-  // @@protoc_insertion_point(field_unsafe_arena_set_allocated:io.deephaven.proto.backplane.grpc.HierarchicalTableViewRequest.result_view_id)
-}
-inline ::io::deephaven::proto::backplane::grpc::Ticket* HierarchicalTableViewRequest::release_result_view_id() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-
-  _impl_._has_bits_[0] &= ~0x00000001u;
-  ::io::deephaven::proto::backplane::grpc::Ticket* released = _impl_.result_view_id_;
-  _impl_.result_view_id_ = nullptr;
-#ifdef PROTOBUF_FORCE_COPY_IN_RELEASE
-  auto* old = reinterpret_cast<::google::protobuf::MessageLite*>(released);
-  released = ::google::protobuf::internal::DuplicateIfNonNull(released);
-  if (GetArena() == nullptr) {
-    delete old;
-  }
-#else   // PROTOBUF_FORCE_COPY_IN_RELEASE
-  if (GetArena() != nullptr) {
-    released = ::google::protobuf::internal::DuplicateIfNonNull(released);
-  }
-#endif  // !PROTOBUF_FORCE_COPY_IN_RELEASE
-  return released;
-}
-inline ::io::deephaven::proto::backplane::grpc::Ticket* HierarchicalTableViewRequest::unsafe_arena_release_result_view_id() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  // @@protoc_insertion_point(field_release:io.deephaven.proto.backplane.grpc.HierarchicalTableViewRequest.result_view_id)
-
-  _impl_._has_bits_[0] &= ~0x00000001u;
-  ::io::deephaven::proto::backplane::grpc::Ticket* temp = _impl_.result_view_id_;
-  _impl_.result_view_id_ = nullptr;
-  return temp;
-}
-inline ::io::deephaven::proto::backplane::grpc::Ticket* HierarchicalTableViewRequest::_internal_mutable_result_view_id() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  _impl_._has_bits_[0] |= 0x00000001u;
-  if (_impl_.result_view_id_ == nullptr) {
-    auto* p = CreateMaybeMessage<::io::deephaven::proto::backplane::grpc::Ticket>(GetArena());
-    _impl_.result_view_id_ = reinterpret_cast<::io::deephaven::proto::backplane::grpc::Ticket*>(p);
-  }
-  return _impl_.result_view_id_;
-}
-inline ::io::deephaven::proto::backplane::grpc::Ticket* HierarchicalTableViewRequest::mutable_result_view_id() ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  ::io::deephaven::proto::backplane::grpc::Ticket* _msg = _internal_mutable_result_view_id();
-  // @@protoc_insertion_point(field_mutable:io.deephaven.proto.backplane.grpc.HierarchicalTableViewRequest.result_view_id)
-  return _msg;
-}
-inline void HierarchicalTableViewRequest::set_allocated_result_view_id(::io::deephaven::proto::backplane::grpc::Ticket* value) {
-  ::google::protobuf::Arena* message_arena = GetArena();
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  if (message_arena == nullptr) {
-    delete reinterpret_cast<::google::protobuf::MessageLite*>(_impl_.result_view_id_);
-  }
-
-  if (value != nullptr) {
-    ::google::protobuf::Arena* submessage_arena = reinterpret_cast<::google::protobuf::MessageLite*>(value)->GetArena();
-    if (message_arena != submessage_arena) {
-      value = ::google::protobuf::internal::GetOwnedMessage(message_arena, value, submessage_arena);
-    }
-    _impl_._has_bits_[0] |= 0x00000001u;
-  } else {
-    _impl_._has_bits_[0] &= ~0x00000001u;
-  }
-
-  _impl_.result_view_id_ = reinterpret_cast<::io::deephaven::proto::backplane::grpc::Ticket*>(value);
-  // @@protoc_insertion_point(field_set_allocated:io.deephaven.proto.backplane.grpc.HierarchicalTableViewRequest.result_view_id)
-}
-
-// .io.deephaven.proto.backplane.grpc.Ticket hierarchical_table_id = 2;
-inline bool HierarchicalTableViewRequest::has_hierarchical_table_id() const {
-  return target_case() == kHierarchicalTableId;
-}
-inline bool HierarchicalTableViewRequest::_internal_has_hierarchical_table_id() const {
-  return target_case() == kHierarchicalTableId;
-}
-inline void HierarchicalTableViewRequest::set_has_hierarchical_table_id() {
-  _impl_._oneof_case_[0] = kHierarchicalTableId;
-}
-inline ::io::deephaven::proto::backplane::grpc::Ticket* HierarchicalTableViewRequest::release_hierarchical_table_id() {
-  // @@protoc_insertion_point(field_release:io.deephaven.proto.backplane.grpc.HierarchicalTableViewRequest.hierarchical_table_id)
-  if (target_case() == kHierarchicalTableId) {
-    clear_has_target();
-    auto* temp = _impl_.target_.hierarchical_table_id_;
-    if (GetArena() != nullptr) {
-      temp = ::google::protobuf::internal::DuplicateIfNonNull(temp);
-    }
-    _impl_.target_.hierarchical_table_id_ = nullptr;
-    return temp;
-  } else {
-    return nullptr;
-  }
-}
-inline const ::io::deephaven::proto::backplane::grpc::Ticket& HierarchicalTableViewRequest::_internal_hierarchical_table_id() const {
-  return target_case() == kHierarchicalTableId ? *_impl_.target_.hierarchical_table_id_ : reinterpret_cast<::io::deephaven::proto::backplane::grpc::Ticket&>(::io::deephaven::proto::backplane::grpc::_Ticket_default_instance_);
-}
-inline const ::io::deephaven::proto::backplane::grpc::Ticket& HierarchicalTableViewRequest::hierarchical_table_id() const ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  // @@protoc_insertion_point(field_get:io.deephaven.proto.backplane.grpc.HierarchicalTableViewRequest.hierarchical_table_id)
-  return _internal_hierarchical_table_id();
-}
-inline ::io::deephaven::proto::backplane::grpc::Ticket* HierarchicalTableViewRequest::unsafe_arena_release_hierarchical_table_id() {
-  // @@protoc_insertion_point(field_unsafe_arena_release:io.deephaven.proto.backplane.grpc.HierarchicalTableViewRequest.hierarchical_table_id)
-  if (target_case() == kHierarchicalTableId) {
-    clear_has_target();
-    auto* temp = _impl_.target_.hierarchical_table_id_;
-    _impl_.target_.hierarchical_table_id_ = nullptr;
-    return temp;
-  } else {
-    return nullptr;
-  }
-}
-inline void HierarchicalTableViewRequest::unsafe_arena_set_allocated_hierarchical_table_id(::io::deephaven::proto::backplane::grpc::Ticket* value) {
-  // We rely on the oneof clear method to free the earlier contents
-  // of this oneof. We can directly use the pointer we're given to
-  // set the new value.
-  clear_target();
-  if (value) {
-    set_has_hierarchical_table_id();
-    _impl_.target_.hierarchical_table_id_ = value;
-  }
-  // @@protoc_insertion_point(field_unsafe_arena_set_allocated:io.deephaven.proto.backplane.grpc.HierarchicalTableViewRequest.hierarchical_table_id)
-}
-inline ::io::deephaven::proto::backplane::grpc::Ticket* HierarchicalTableViewRequest::_internal_mutable_hierarchical_table_id() {
-  if (target_case() != kHierarchicalTableId) {
-    clear_target();
-    set_has_hierarchical_table_id();
-    _impl_.target_.hierarchical_table_id_ = CreateMaybeMessage<::io::deephaven::proto::backplane::grpc::Ticket>(GetArena());
-  }
-  return _impl_.target_.hierarchical_table_id_;
-}
-inline ::io::deephaven::proto::backplane::grpc::Ticket* HierarchicalTableViewRequest::mutable_hierarchical_table_id() ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  ::io::deephaven::proto::backplane::grpc::Ticket* _msg = _internal_mutable_hierarchical_table_id();
-  // @@protoc_insertion_point(field_mutable:io.deephaven.proto.backplane.grpc.HierarchicalTableViewRequest.hierarchical_table_id)
-  return _msg;
-}
-
-// .io.deephaven.proto.backplane.grpc.Ticket existing_view_id = 3;
-inline bool HierarchicalTableViewRequest::has_existing_view_id() const {
-  return target_case() == kExistingViewId;
-}
-inline bool HierarchicalTableViewRequest::_internal_has_existing_view_id() const {
-  return target_case() == kExistingViewId;
-}
-inline void HierarchicalTableViewRequest::set_has_existing_view_id() {
-  _impl_._oneof_case_[0] = kExistingViewId;
-}
-inline ::io::deephaven::proto::backplane::grpc::Ticket* HierarchicalTableViewRequest::release_existing_view_id() {
-  // @@protoc_insertion_point(field_release:io.deephaven.proto.backplane.grpc.HierarchicalTableViewRequest.existing_view_id)
-  if (target_case() == kExistingViewId) {
-    clear_has_target();
-    auto* temp = _impl_.target_.existing_view_id_;
-    if (GetArena() != nullptr) {
-      temp = ::google::protobuf::internal::DuplicateIfNonNull(temp);
-    }
-    _impl_.target_.existing_view_id_ = nullptr;
-    return temp;
-  } else {
-    return nullptr;
-  }
-}
-inline const ::io::deephaven::proto::backplane::grpc::Ticket& HierarchicalTableViewRequest::_internal_existing_view_id() const {
-  return target_case() == kExistingViewId ? *_impl_.target_.existing_view_id_ : reinterpret_cast<::io::deephaven::proto::backplane::grpc::Ticket&>(::io::deephaven::proto::backplane::grpc::_Ticket_default_instance_);
-}
-inline const ::io::deephaven::proto::backplane::grpc::Ticket& HierarchicalTableViewRequest::existing_view_id() const ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  // @@protoc_insertion_point(field_get:io.deephaven.proto.backplane.grpc.HierarchicalTableViewRequest.existing_view_id)
-  return _internal_existing_view_id();
-}
-inline ::io::deephaven::proto::backplane::grpc::Ticket* HierarchicalTableViewRequest::unsafe_arena_release_existing_view_id() {
-  // @@protoc_insertion_point(field_unsafe_arena_release:io.deephaven.proto.backplane.grpc.HierarchicalTableViewRequest.existing_view_id)
-  if (target_case() == kExistingViewId) {
-    clear_has_target();
-    auto* temp = _impl_.target_.existing_view_id_;
-    _impl_.target_.existing_view_id_ = nullptr;
-    return temp;
-  } else {
-    return nullptr;
-  }
-}
-inline void HierarchicalTableViewRequest::unsafe_arena_set_allocated_existing_view_id(::io::deephaven::proto::backplane::grpc::Ticket* value) {
-  // We rely on the oneof clear method to free the earlier contents
-  // of this oneof. We can directly use the pointer we're given to
-  // set the new value.
-  clear_target();
-  if (value) {
-    set_has_existing_view_id();
-    _impl_.target_.existing_view_id_ = value;
-  }
-  // @@protoc_insertion_point(field_unsafe_arena_set_allocated:io.deephaven.proto.backplane.grpc.HierarchicalTableViewRequest.existing_view_id)
-}
-inline ::io::deephaven::proto::backplane::grpc::Ticket* HierarchicalTableViewRequest::_internal_mutable_existing_view_id() {
-  if (target_case() != kExistingViewId) {
-    clear_target();
-    set_has_existing_view_id();
-    _impl_.target_.existing_view_id_ = CreateMaybeMessage<::io::deephaven::proto::backplane::grpc::Ticket>(GetArena());
-  }
-  return _impl_.target_.existing_view_id_;
-}
-inline ::io::deephaven::proto::backplane::grpc::Ticket* HierarchicalTableViewRequest::mutable_existing_view_id() ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  ::io::deephaven::proto::backplane::grpc::Ticket* _msg = _internal_mutable_existing_view_id();
-  // @@protoc_insertion_point(field_mutable:io.deephaven.proto.backplane.grpc.HierarchicalTableViewRequest.existing_view_id)
-  return _msg;
-}
-
-// .io.deephaven.proto.backplane.grpc.HierarchicalTableViewKeyTableDescriptor expansions = 4;
-inline bool HierarchicalTableViewRequest::has_expansions() const {
-  bool value = (_impl_._has_bits_[0] & 0x00000002u) != 0;
-  PROTOBUF_ASSUME(!value || _impl_.expansions_ != nullptr);
-  return value;
-}
-inline void HierarchicalTableViewRequest::clear_expansions() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  if (_impl_.expansions_ != nullptr) _impl_.expansions_->Clear();
-  _impl_._has_bits_[0] &= ~0x00000002u;
-}
-inline const ::io::deephaven::proto::backplane::grpc::HierarchicalTableViewKeyTableDescriptor& HierarchicalTableViewRequest::_internal_expansions() const {
-  PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race);
-  const ::io::deephaven::proto::backplane::grpc::HierarchicalTableViewKeyTableDescriptor* p = _impl_.expansions_;
-  return p != nullptr ? *p : reinterpret_cast<const ::io::deephaven::proto::backplane::grpc::HierarchicalTableViewKeyTableDescriptor&>(::io::deephaven::proto::backplane::grpc::_HierarchicalTableViewKeyTableDescriptor_default_instance_);
-}
-inline const ::io::deephaven::proto::backplane::grpc::HierarchicalTableViewKeyTableDescriptor& HierarchicalTableViewRequest::expansions() const ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  // @@protoc_insertion_point(field_get:io.deephaven.proto.backplane.grpc.HierarchicalTableViewRequest.expansions)
-  return _internal_expansions();
-}
-inline void HierarchicalTableViewRequest::unsafe_arena_set_allocated_expansions(::io::deephaven::proto::backplane::grpc::HierarchicalTableViewKeyTableDescriptor* value) {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  if (GetArena() == nullptr) {
-    delete reinterpret_cast<::google::protobuf::MessageLite*>(_impl_.expansions_);
-  }
-  _impl_.expansions_ = reinterpret_cast<::io::deephaven::proto::backplane::grpc::HierarchicalTableViewKeyTableDescriptor*>(value);
-  if (value != nullptr) {
-    _impl_._has_bits_[0] |= 0x00000002u;
-  } else {
-    _impl_._has_bits_[0] &= ~0x00000002u;
-  }
-  // @@protoc_insertion_point(field_unsafe_arena_set_allocated:io.deephaven.proto.backplane.grpc.HierarchicalTableViewRequest.expansions)
-}
-inline ::io::deephaven::proto::backplane::grpc::HierarchicalTableViewKeyTableDescriptor* HierarchicalTableViewRequest::release_expansions() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-
-  _impl_._has_bits_[0] &= ~0x00000002u;
-  ::io::deephaven::proto::backplane::grpc::HierarchicalTableViewKeyTableDescriptor* released = _impl_.expansions_;
-  _impl_.expansions_ = nullptr;
-#ifdef PROTOBUF_FORCE_COPY_IN_RELEASE
-  auto* old = reinterpret_cast<::google::protobuf::MessageLite*>(released);
-  released = ::google::protobuf::internal::DuplicateIfNonNull(released);
-  if (GetArena() == nullptr) {
-    delete old;
-  }
-#else   // PROTOBUF_FORCE_COPY_IN_RELEASE
-  if (GetArena() != nullptr) {
-    released = ::google::protobuf::internal::DuplicateIfNonNull(released);
-  }
-#endif  // !PROTOBUF_FORCE_COPY_IN_RELEASE
-  return released;
-}
-inline ::io::deephaven::proto::backplane::grpc::HierarchicalTableViewKeyTableDescriptor* HierarchicalTableViewRequest::unsafe_arena_release_expansions() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  // @@protoc_insertion_point(field_release:io.deephaven.proto.backplane.grpc.HierarchicalTableViewRequest.expansions)
-
-  _impl_._has_bits_[0] &= ~0x00000002u;
-  ::io::deephaven::proto::backplane::grpc::HierarchicalTableViewKeyTableDescriptor* temp = _impl_.expansions_;
-  _impl_.expansions_ = nullptr;
-  return temp;
-}
-inline ::io::deephaven::proto::backplane::grpc::HierarchicalTableViewKeyTableDescriptor* HierarchicalTableViewRequest::_internal_mutable_expansions() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  _impl_._has_bits_[0] |= 0x00000002u;
-  if (_impl_.expansions_ == nullptr) {
-    auto* p = CreateMaybeMessage<::io::deephaven::proto::backplane::grpc::HierarchicalTableViewKeyTableDescriptor>(GetArena());
-    _impl_.expansions_ = reinterpret_cast<::io::deephaven::proto::backplane::grpc::HierarchicalTableViewKeyTableDescriptor*>(p);
-  }
-  return _impl_.expansions_;
-}
-inline ::io::deephaven::proto::backplane::grpc::HierarchicalTableViewKeyTableDescriptor* HierarchicalTableViewRequest::mutable_expansions() ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  ::io::deephaven::proto::backplane::grpc::HierarchicalTableViewKeyTableDescriptor* _msg = _internal_mutable_expansions();
-  // @@protoc_insertion_point(field_mutable:io.deephaven.proto.backplane.grpc.HierarchicalTableViewRequest.expansions)
-  return _msg;
-}
-inline void HierarchicalTableViewRequest::set_allocated_expansions(::io::deephaven::proto::backplane::grpc::HierarchicalTableViewKeyTableDescriptor* value) {
-  ::google::protobuf::Arena* message_arena = GetArena();
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  if (message_arena == nullptr) {
-    delete reinterpret_cast<::io::deephaven::proto::backplane::grpc::HierarchicalTableViewKeyTableDescriptor*>(_impl_.expansions_);
-  }
-
-  if (value != nullptr) {
-    ::google::protobuf::Arena* submessage_arena = reinterpret_cast<::io::deephaven::proto::backplane::grpc::HierarchicalTableViewKeyTableDescriptor*>(value)->GetArena();
-    if (message_arena != submessage_arena) {
-      value = ::google::protobuf::internal::GetOwnedMessage(message_arena, value, submessage_arena);
-    }
-    _impl_._has_bits_[0] |= 0x00000002u;
-  } else {
-    _impl_._has_bits_[0] &= ~0x00000002u;
-  }
-
-  _impl_.expansions_ = reinterpret_cast<::io::deephaven::proto::backplane::grpc::HierarchicalTableViewKeyTableDescriptor*>(value);
-  // @@protoc_insertion_point(field_set_allocated:io.deephaven.proto.backplane.grpc.HierarchicalTableViewRequest.expansions)
-}
-
-inline bool HierarchicalTableViewRequest::has_target() const {
-  return target_case() != TARGET_NOT_SET;
-}
-inline void HierarchicalTableViewRequest::clear_has_target() {
-  _impl_._oneof_case_[0] = TARGET_NOT_SET;
-}
-inline HierarchicalTableViewRequest::TargetCase HierarchicalTableViewRequest::target_case() const {
-  return HierarchicalTableViewRequest::TargetCase(_impl_._oneof_case_[0]);
-}
-// -------------------------------------------------------------------
-
-// HierarchicalTableViewKeyTableDescriptor
-
-// .io.deephaven.proto.backplane.grpc.Ticket key_table_id = 1;
-inline bool HierarchicalTableViewKeyTableDescriptor::has_key_table_id() const {
-  bool value = (_impl_._has_bits_[0] & 0x00000002u) != 0;
-  PROTOBUF_ASSUME(!value || _impl_.key_table_id_ != nullptr);
-  return value;
-}
-inline const ::io::deephaven::proto::backplane::grpc::Ticket& HierarchicalTableViewKeyTableDescriptor::_internal_key_table_id() const {
-  PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race);
-  const ::io::deephaven::proto::backplane::grpc::Ticket* p = _impl_.key_table_id_;
-  return p != nullptr ? *p : reinterpret_cast<const ::io::deephaven::proto::backplane::grpc::Ticket&>(::io::deephaven::proto::backplane::grpc::_Ticket_default_instance_);
-}
-inline const ::io::deephaven::proto::backplane::grpc::Ticket& HierarchicalTableViewKeyTableDescriptor::key_table_id() const ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  // @@protoc_insertion_point(field_get:io.deephaven.proto.backplane.grpc.HierarchicalTableViewKeyTableDescriptor.key_table_id)
-  return _internal_key_table_id();
-}
-inline void HierarchicalTableViewKeyTableDescriptor::unsafe_arena_set_allocated_key_table_id(::io::deephaven::proto::backplane::grpc::Ticket* value) {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  if (GetArena() == nullptr) {
-    delete reinterpret_cast<::google::protobuf::MessageLite*>(_impl_.key_table_id_);
-  }
-  _impl_.key_table_id_ = reinterpret_cast<::io::deephaven::proto::backplane::grpc::Ticket*>(value);
-  if (value != nullptr) {
-    _impl_._has_bits_[0] |= 0x00000002u;
-  } else {
-    _impl_._has_bits_[0] &= ~0x00000002u;
-  }
-  // @@protoc_insertion_point(field_unsafe_arena_set_allocated:io.deephaven.proto.backplane.grpc.HierarchicalTableViewKeyTableDescriptor.key_table_id)
-}
-inline ::io::deephaven::proto::backplane::grpc::Ticket* HierarchicalTableViewKeyTableDescriptor::release_key_table_id() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-
-  _impl_._has_bits_[0] &= ~0x00000002u;
-  ::io::deephaven::proto::backplane::grpc::Ticket* released = _impl_.key_table_id_;
-  _impl_.key_table_id_ = nullptr;
-#ifdef PROTOBUF_FORCE_COPY_IN_RELEASE
-  auto* old = reinterpret_cast<::google::protobuf::MessageLite*>(released);
-  released = ::google::protobuf::internal::DuplicateIfNonNull(released);
-  if (GetArena() == nullptr) {
-    delete old;
-  }
-#else   // PROTOBUF_FORCE_COPY_IN_RELEASE
-  if (GetArena() != nullptr) {
-    released = ::google::protobuf::internal::DuplicateIfNonNull(released);
-  }
-#endif  // !PROTOBUF_FORCE_COPY_IN_RELEASE
-  return released;
-}
-inline ::io::deephaven::proto::backplane::grpc::Ticket* HierarchicalTableViewKeyTableDescriptor::unsafe_arena_release_key_table_id() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  // @@protoc_insertion_point(field_release:io.deephaven.proto.backplane.grpc.HierarchicalTableViewKeyTableDescriptor.key_table_id)
-
-  _impl_._has_bits_[0] &= ~0x00000002u;
-  ::io::deephaven::proto::backplane::grpc::Ticket* temp = _impl_.key_table_id_;
-  _impl_.key_table_id_ = nullptr;
-  return temp;
-}
-inline ::io::deephaven::proto::backplane::grpc::Ticket* HierarchicalTableViewKeyTableDescriptor::_internal_mutable_key_table_id() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  _impl_._has_bits_[0] |= 0x00000002u;
-  if (_impl_.key_table_id_ == nullptr) {
-    auto* p = CreateMaybeMessage<::io::deephaven::proto::backplane::grpc::Ticket>(GetArena());
-    _impl_.key_table_id_ = reinterpret_cast<::io::deephaven::proto::backplane::grpc::Ticket*>(p);
-  }
-  return _impl_.key_table_id_;
-}
-inline ::io::deephaven::proto::backplane::grpc::Ticket* HierarchicalTableViewKeyTableDescriptor::mutable_key_table_id() ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  ::io::deephaven::proto::backplane::grpc::Ticket* _msg = _internal_mutable_key_table_id();
-  // @@protoc_insertion_point(field_mutable:io.deephaven.proto.backplane.grpc.HierarchicalTableViewKeyTableDescriptor.key_table_id)
-  return _msg;
-}
-inline void HierarchicalTableViewKeyTableDescriptor::set_allocated_key_table_id(::io::deephaven::proto::backplane::grpc::Ticket* value) {
-  ::google::protobuf::Arena* message_arena = GetArena();
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  if (message_arena == nullptr) {
-    delete reinterpret_cast<::google::protobuf::MessageLite*>(_impl_.key_table_id_);
-  }
-
-  if (value != nullptr) {
-    ::google::protobuf::Arena* submessage_arena = reinterpret_cast<::google::protobuf::MessageLite*>(value)->GetArena();
-    if (message_arena != submessage_arena) {
-      value = ::google::protobuf::internal::GetOwnedMessage(message_arena, value, submessage_arena);
-    }
-    _impl_._has_bits_[0] |= 0x00000002u;
-  } else {
-    _impl_._has_bits_[0] &= ~0x00000002u;
-  }
-
-  _impl_.key_table_id_ = reinterpret_cast<::io::deephaven::proto::backplane::grpc::Ticket*>(value);
-  // @@protoc_insertion_point(field_set_allocated:io.deephaven.proto.backplane.grpc.HierarchicalTableViewKeyTableDescriptor.key_table_id)
-}
-
-// optional string key_table_action_column = 2;
-inline bool HierarchicalTableViewKeyTableDescriptor::has_key_table_action_column() const {
-  bool value = (_impl_._has_bits_[0] & 0x00000001u) != 0;
-  return value;
-}
-inline void HierarchicalTableViewKeyTableDescriptor::clear_key_table_action_column() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  _impl_.key_table_action_column_.ClearToEmpty();
-  _impl_._has_bits_[0] &= ~0x00000001u;
-}
-inline const std::string& HierarchicalTableViewKeyTableDescriptor::key_table_action_column() const
-    ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  // @@protoc_insertion_point(field_get:io.deephaven.proto.backplane.grpc.HierarchicalTableViewKeyTableDescriptor.key_table_action_column)
-  return _internal_key_table_action_column();
-}
-template <typename Arg_, typename... Args_>
-inline PROTOBUF_ALWAYS_INLINE void HierarchicalTableViewKeyTableDescriptor::set_key_table_action_column(Arg_&& arg,
-                                                     Args_... args) {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  _impl_._has_bits_[0] |= 0x00000001u;
-  _impl_.key_table_action_column_.Set(static_cast<Arg_&&>(arg), args..., GetArena());
-  // @@protoc_insertion_point(field_set:io.deephaven.proto.backplane.grpc.HierarchicalTableViewKeyTableDescriptor.key_table_action_column)
-}
-inline std::string* HierarchicalTableViewKeyTableDescriptor::mutable_key_table_action_column() ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  std::string* _s = _internal_mutable_key_table_action_column();
-  // @@protoc_insertion_point(field_mutable:io.deephaven.proto.backplane.grpc.HierarchicalTableViewKeyTableDescriptor.key_table_action_column)
-  return _s;
-}
-inline const std::string& HierarchicalTableViewKeyTableDescriptor::_internal_key_table_action_column() const {
-  PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race);
-  return _impl_.key_table_action_column_.Get();
-}
-inline void HierarchicalTableViewKeyTableDescriptor::_internal_set_key_table_action_column(const std::string& value) {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  _impl_._has_bits_[0] |= 0x00000001u;
-  _impl_.key_table_action_column_.Set(value, GetArena());
-}
-inline std::string* HierarchicalTableViewKeyTableDescriptor::_internal_mutable_key_table_action_column() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  _impl_._has_bits_[0] |= 0x00000001u;
-  return _impl_.key_table_action_column_.Mutable( GetArena());
-}
-inline std::string* HierarchicalTableViewKeyTableDescriptor::release_key_table_action_column() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  // @@protoc_insertion_point(field_release:io.deephaven.proto.backplane.grpc.HierarchicalTableViewKeyTableDescriptor.key_table_action_column)
-  if ((_impl_._has_bits_[0] & 0x00000001u) == 0) {
-    return nullptr;
-  }
-  _impl_._has_bits_[0] &= ~0x00000001u;
-  auto* released = _impl_.key_table_action_column_.Release();
-  #ifdef PROTOBUF_FORCE_COPY_DEFAULT_STRING
-  _impl_.key_table_action_column_.Set("", GetArena());
-  #endif  // PROTOBUF_FORCE_COPY_DEFAULT_STRING
-  return released;
-}
-inline void HierarchicalTableViewKeyTableDescriptor::set_allocated_key_table_action_column(std::string* value) {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  if (value != nullptr) {
-    _impl_._has_bits_[0] |= 0x00000001u;
-  } else {
-    _impl_._has_bits_[0] &= ~0x00000001u;
-  }
-  _impl_.key_table_action_column_.SetAllocated(value, GetArena());
-  #ifdef PROTOBUF_FORCE_COPY_DEFAULT_STRING
-        if (_impl_.key_table_action_column_.IsDefault()) {
-          _impl_.key_table_action_column_.Set("", GetArena());
-        }
-  #endif  // PROTOBUF_FORCE_COPY_DEFAULT_STRING
-  // @@protoc_insertion_point(field_set_allocated:io.deephaven.proto.backplane.grpc.HierarchicalTableViewKeyTableDescriptor.key_table_action_column)
-}
-
-// -------------------------------------------------------------------
-
-// HierarchicalTableViewResponse
-
-// -------------------------------------------------------------------
-
-// HierarchicalTableSourceExportRequest
-
-// .io.deephaven.proto.backplane.grpc.Ticket result_table_id = 1;
-inline bool HierarchicalTableSourceExportRequest::has_result_table_id() const {
-  bool value = (_impl_._has_bits_[0] & 0x00000001u) != 0;
-  PROTOBUF_ASSUME(!value || _impl_.result_table_id_ != nullptr);
-  return value;
-}
-inline const ::io::deephaven::proto::backplane::grpc::Ticket& HierarchicalTableSourceExportRequest::_internal_result_table_id() const {
-  PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race);
-  const ::io::deephaven::proto::backplane::grpc::Ticket* p = _impl_.result_table_id_;
-  return p != nullptr ? *p : reinterpret_cast<const ::io::deephaven::proto::backplane::grpc::Ticket&>(::io::deephaven::proto::backplane::grpc::_Ticket_default_instance_);
-}
-inline const ::io::deephaven::proto::backplane::grpc::Ticket& HierarchicalTableSourceExportRequest::result_table_id() const ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  // @@protoc_insertion_point(field_get:io.deephaven.proto.backplane.grpc.HierarchicalTableSourceExportRequest.result_table_id)
-  return _internal_result_table_id();
-}
-inline void HierarchicalTableSourceExportRequest::unsafe_arena_set_allocated_result_table_id(::io::deephaven::proto::backplane::grpc::Ticket* value) {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  if (GetArena() == nullptr) {
-    delete reinterpret_cast<::google::protobuf::MessageLite*>(_impl_.result_table_id_);
-  }
-  _impl_.result_table_id_ = reinterpret_cast<::io::deephaven::proto::backplane::grpc::Ticket*>(value);
-  if (value != nullptr) {
-    _impl_._has_bits_[0] |= 0x00000001u;
-  } else {
-    _impl_._has_bits_[0] &= ~0x00000001u;
-  }
-  // @@protoc_insertion_point(field_unsafe_arena_set_allocated:io.deephaven.proto.backplane.grpc.HierarchicalTableSourceExportRequest.result_table_id)
-}
-inline ::io::deephaven::proto::backplane::grpc::Ticket* HierarchicalTableSourceExportRequest::release_result_table_id() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-
-  _impl_._has_bits_[0] &= ~0x00000001u;
-  ::io::deephaven::proto::backplane::grpc::Ticket* released = _impl_.result_table_id_;
-  _impl_.result_table_id_ = nullptr;
-#ifdef PROTOBUF_FORCE_COPY_IN_RELEASE
-  auto* old = reinterpret_cast<::google::protobuf::MessageLite*>(released);
-  released = ::google::protobuf::internal::DuplicateIfNonNull(released);
-  if (GetArena() == nullptr) {
-    delete old;
-  }
-#else   // PROTOBUF_FORCE_COPY_IN_RELEASE
-  if (GetArena() != nullptr) {
-    released = ::google::protobuf::internal::DuplicateIfNonNull(released);
-  }
-#endif  // !PROTOBUF_FORCE_COPY_IN_RELEASE
-  return released;
-}
-inline ::io::deephaven::proto::backplane::grpc::Ticket* HierarchicalTableSourceExportRequest::unsafe_arena_release_result_table_id() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  // @@protoc_insertion_point(field_release:io.deephaven.proto.backplane.grpc.HierarchicalTableSourceExportRequest.result_table_id)
-
-  _impl_._has_bits_[0] &= ~0x00000001u;
-  ::io::deephaven::proto::backplane::grpc::Ticket* temp = _impl_.result_table_id_;
-  _impl_.result_table_id_ = nullptr;
-  return temp;
-}
-inline ::io::deephaven::proto::backplane::grpc::Ticket* HierarchicalTableSourceExportRequest::_internal_mutable_result_table_id() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  _impl_._has_bits_[0] |= 0x00000001u;
-  if (_impl_.result_table_id_ == nullptr) {
-    auto* p = CreateMaybeMessage<::io::deephaven::proto::backplane::grpc::Ticket>(GetArena());
-    _impl_.result_table_id_ = reinterpret_cast<::io::deephaven::proto::backplane::grpc::Ticket*>(p);
-  }
-  return _impl_.result_table_id_;
-}
-inline ::io::deephaven::proto::backplane::grpc::Ticket* HierarchicalTableSourceExportRequest::mutable_result_table_id() ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  ::io::deephaven::proto::backplane::grpc::Ticket* _msg = _internal_mutable_result_table_id();
-  // @@protoc_insertion_point(field_mutable:io.deephaven.proto.backplane.grpc.HierarchicalTableSourceExportRequest.result_table_id)
-  return _msg;
-}
-inline void HierarchicalTableSourceExportRequest::set_allocated_result_table_id(::io::deephaven::proto::backplane::grpc::Ticket* value) {
-  ::google::protobuf::Arena* message_arena = GetArena();
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  if (message_arena == nullptr) {
-    delete reinterpret_cast<::google::protobuf::MessageLite*>(_impl_.result_table_id_);
-  }
-
-  if (value != nullptr) {
-    ::google::protobuf::Arena* submessage_arena = reinterpret_cast<::google::protobuf::MessageLite*>(value)->GetArena();
-    if (message_arena != submessage_arena) {
-      value = ::google::protobuf::internal::GetOwnedMessage(message_arena, value, submessage_arena);
-    }
-    _impl_._has_bits_[0] |= 0x00000001u;
-  } else {
-    _impl_._has_bits_[0] &= ~0x00000001u;
-  }
-
-  _impl_.result_table_id_ = reinterpret_cast<::io::deephaven::proto::backplane::grpc::Ticket*>(value);
-  // @@protoc_insertion_point(field_set_allocated:io.deephaven.proto.backplane.grpc.HierarchicalTableSourceExportRequest.result_table_id)
-}
-
-// .io.deephaven.proto.backplane.grpc.Ticket hierarchical_table_id = 2;
-inline bool HierarchicalTableSourceExportRequest::has_hierarchical_table_id() const {
-  bool value = (_impl_._has_bits_[0] & 0x00000002u) != 0;
-  PROTOBUF_ASSUME(!value || _impl_.hierarchical_table_id_ != nullptr);
-  return value;
-}
-inline const ::io::deephaven::proto::backplane::grpc::Ticket& HierarchicalTableSourceExportRequest::_internal_hierarchical_table_id() const {
-  PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race);
-  const ::io::deephaven::proto::backplane::grpc::Ticket* p = _impl_.hierarchical_table_id_;
-  return p != nullptr ? *p : reinterpret_cast<const ::io::deephaven::proto::backplane::grpc::Ticket&>(::io::deephaven::proto::backplane::grpc::_Ticket_default_instance_);
-}
-inline const ::io::deephaven::proto::backplane::grpc::Ticket& HierarchicalTableSourceExportRequest::hierarchical_table_id() const ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  // @@protoc_insertion_point(field_get:io.deephaven.proto.backplane.grpc.HierarchicalTableSourceExportRequest.hierarchical_table_id)
-  return _internal_hierarchical_table_id();
-}
-inline void HierarchicalTableSourceExportRequest::unsafe_arena_set_allocated_hierarchical_table_id(::io::deephaven::proto::backplane::grpc::Ticket* value) {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  if (GetArena() == nullptr) {
-    delete reinterpret_cast<::google::protobuf::MessageLite*>(_impl_.hierarchical_table_id_);
-  }
-  _impl_.hierarchical_table_id_ = reinterpret_cast<::io::deephaven::proto::backplane::grpc::Ticket*>(value);
-  if (value != nullptr) {
-    _impl_._has_bits_[0] |= 0x00000002u;
-  } else {
-    _impl_._has_bits_[0] &= ~0x00000002u;
-  }
-  // @@protoc_insertion_point(field_unsafe_arena_set_allocated:io.deephaven.proto.backplane.grpc.HierarchicalTableSourceExportRequest.hierarchical_table_id)
-}
-inline ::io::deephaven::proto::backplane::grpc::Ticket* HierarchicalTableSourceExportRequest::release_hierarchical_table_id() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-
-  _impl_._has_bits_[0] &= ~0x00000002u;
-  ::io::deephaven::proto::backplane::grpc::Ticket* released = _impl_.hierarchical_table_id_;
-  _impl_.hierarchical_table_id_ = nullptr;
-#ifdef PROTOBUF_FORCE_COPY_IN_RELEASE
-  auto* old = reinterpret_cast<::google::protobuf::MessageLite*>(released);
-  released = ::google::protobuf::internal::DuplicateIfNonNull(released);
-  if (GetArena() == nullptr) {
-    delete old;
-  }
-#else   // PROTOBUF_FORCE_COPY_IN_RELEASE
-  if (GetArena() != nullptr) {
-    released = ::google::protobuf::internal::DuplicateIfNonNull(released);
-  }
-#endif  // !PROTOBUF_FORCE_COPY_IN_RELEASE
-  return released;
-}
-inline ::io::deephaven::proto::backplane::grpc::Ticket* HierarchicalTableSourceExportRequest::unsafe_arena_release_hierarchical_table_id() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  // @@protoc_insertion_point(field_release:io.deephaven.proto.backplane.grpc.HierarchicalTableSourceExportRequest.hierarchical_table_id)
-
-  _impl_._has_bits_[0] &= ~0x00000002u;
-  ::io::deephaven::proto::backplane::grpc::Ticket* temp = _impl_.hierarchical_table_id_;
-  _impl_.hierarchical_table_id_ = nullptr;
-  return temp;
-}
-inline ::io::deephaven::proto::backplane::grpc::Ticket* HierarchicalTableSourceExportRequest::_internal_mutable_hierarchical_table_id() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  _impl_._has_bits_[0] |= 0x00000002u;
-  if (_impl_.hierarchical_table_id_ == nullptr) {
-    auto* p = CreateMaybeMessage<::io::deephaven::proto::backplane::grpc::Ticket>(GetArena());
-    _impl_.hierarchical_table_id_ = reinterpret_cast<::io::deephaven::proto::backplane::grpc::Ticket*>(p);
-  }
-  return _impl_.hierarchical_table_id_;
-}
-inline ::io::deephaven::proto::backplane::grpc::Ticket* HierarchicalTableSourceExportRequest::mutable_hierarchical_table_id() ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  ::io::deephaven::proto::backplane::grpc::Ticket* _msg = _internal_mutable_hierarchical_table_id();
-  // @@protoc_insertion_point(field_mutable:io.deephaven.proto.backplane.grpc.HierarchicalTableSourceExportRequest.hierarchical_table_id)
-  return _msg;
-}
-inline void HierarchicalTableSourceExportRequest::set_allocated_hierarchical_table_id(::io::deephaven::proto::backplane::grpc::Ticket* value) {
-  ::google::protobuf::Arena* message_arena = GetArena();
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  if (message_arena == nullptr) {
-    delete reinterpret_cast<::google::protobuf::MessageLite*>(_impl_.hierarchical_table_id_);
-  }
-
-  if (value != nullptr) {
-    ::google::protobuf::Arena* submessage_arena = reinterpret_cast<::google::protobuf::MessageLite*>(value)->GetArena();
-    if (message_arena != submessage_arena) {
-      value = ::google::protobuf::internal::GetOwnedMessage(message_arena, value, submessage_arena);
-    }
-    _impl_._has_bits_[0] |= 0x00000002u;
-  } else {
-    _impl_._has_bits_[0] &= ~0x00000002u;
-  }
-
-  _impl_.hierarchical_table_id_ = reinterpret_cast<::io::deephaven::proto::backplane::grpc::Ticket*>(value);
-  // @@protoc_insertion_point(field_set_allocated:io.deephaven.proto.backplane.grpc.HierarchicalTableSourceExportRequest.hierarchical_table_id)
-}
-
-#ifdef __GNUC__
-#pragma GCC diagnostic pop
-#endif  // __GNUC__
-
-// @@protoc_insertion_point(namespace_scope)
-}  // namespace grpc
-}  // namespace backplane
-}  // namespace proto
-}  // namespace deephaven
-}  // namespace io
-
-
-// @@protoc_insertion_point(global_scope)
-
-#include "google/protobuf/port_undef.inc"
-
-#endif  // GOOGLE_PROTOBUF_INCLUDED_deephaven_2fproto_2fhierarchicaltable_2eproto_2epb_2eh
diff --git a/cpp-client/deephaven/dhclient/proto/deephaven/proto/inputtable.grpc.pb.cc b/cpp-client/deephaven/dhclient/proto/deephaven/proto/inputtable.grpc.pb.cc
deleted file mode 100644
index acdea85ab7c..00000000000
--- a/cpp-client/deephaven/dhclient/proto/deephaven/proto/inputtable.grpc.pb.cc
+++ /dev/null
@@ -1,136 +0,0 @@
-// Generated by the gRPC C++ plugin.
-// If you make any local change, they will be lost.
-// source: deephaven/proto/inputtable.proto
-
-#include "deephaven/proto/inputtable.pb.h"
-#include "deephaven/proto/inputtable.grpc.pb.h"
-
-#include <functional>
-#include <grpcpp/support/async_stream.h>
-#include <grpcpp/support/async_unary_call.h>
-#include <grpcpp/impl/channel_interface.h>
-#include <grpcpp/impl/client_unary_call.h>
-#include <grpcpp/support/client_callback.h>
-#include <grpcpp/support/message_allocator.h>
-#include <grpcpp/support/method_handler.h>
-#include <grpcpp/impl/rpc_service_method.h>
-#include <grpcpp/support/server_callback.h>
-#include <grpcpp/impl/server_callback_handlers.h>
-#include <grpcpp/server_context.h>
-#include <grpcpp/impl/service_type.h>
-#include <grpcpp/support/sync_stream.h>
-namespace io {
-namespace deephaven {
-namespace proto {
-namespace backplane {
-namespace grpc {
-
-static const char* InputTableService_method_names[] = {
-  "/io.deephaven.proto.backplane.grpc.InputTableService/AddTableToInputTable",
-  "/io.deephaven.proto.backplane.grpc.InputTableService/DeleteTableFromInputTable",
-};
-
-std::unique_ptr< InputTableService::Stub> InputTableService::NewStub(const std::shared_ptr< ::grpc::ChannelInterface>& channel, const ::grpc::StubOptions& options) {
-  (void)options;
-  std::unique_ptr< InputTableService::Stub> stub(new InputTableService::Stub(channel, options));
-  return stub;
-}
-
-InputTableService::Stub::Stub(const std::shared_ptr< ::grpc::ChannelInterface>& channel, const ::grpc::StubOptions& options)
-  : channel_(channel), rpcmethod_AddTableToInputTable_(InputTableService_method_names[0], options.suffix_for_stats(),::grpc::internal::RpcMethod::NORMAL_RPC, channel)
-  , rpcmethod_DeleteTableFromInputTable_(InputTableService_method_names[1], options.suffix_for_stats(),::grpc::internal::RpcMethod::NORMAL_RPC, channel)
-  {}
-
-::grpc::Status InputTableService::Stub::AddTableToInputTable(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::AddTableRequest& request, ::io::deephaven::proto::backplane::grpc::AddTableResponse* response) {
-  return ::grpc::internal::BlockingUnaryCall< ::io::deephaven::proto::backplane::grpc::AddTableRequest, ::io::deephaven::proto::backplane::grpc::AddTableResponse, ::grpc::protobuf::MessageLite, ::grpc::protobuf::MessageLite>(channel_.get(), rpcmethod_AddTableToInputTable_, context, request, response);
-}
-
-void InputTableService::Stub::async::AddTableToInputTable(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::AddTableRequest* request, ::io::deephaven::proto::backplane::grpc::AddTableResponse* response, std::function<void(::grpc::Status)> f) {
-  ::grpc::internal::CallbackUnaryCall< ::io::deephaven::proto::backplane::grpc::AddTableRequest, ::io::deephaven::proto::backplane::grpc::AddTableResponse, ::grpc::protobuf::MessageLite, ::grpc::protobuf::MessageLite>(stub_->channel_.get(), stub_->rpcmethod_AddTableToInputTable_, context, request, response, std::move(f));
-}
-
-void InputTableService::Stub::async::AddTableToInputTable(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::AddTableRequest* request, ::io::deephaven::proto::backplane::grpc::AddTableResponse* response, ::grpc::ClientUnaryReactor* reactor) {
-  ::grpc::internal::ClientCallbackUnaryFactory::Create< ::grpc::protobuf::MessageLite, ::grpc::protobuf::MessageLite>(stub_->channel_.get(), stub_->rpcmethod_AddTableToInputTable_, context, request, response, reactor);
-}
-
-::grpc::ClientAsyncResponseReader< ::io::deephaven::proto::backplane::grpc::AddTableResponse>* InputTableService::Stub::PrepareAsyncAddTableToInputTableRaw(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::AddTableRequest& request, ::grpc::CompletionQueue* cq) {
-  return ::grpc::internal::ClientAsyncResponseReaderHelper::Create< ::io::deephaven::proto::backplane::grpc::AddTableResponse, ::io::deephaven::proto::backplane::grpc::AddTableRequest, ::grpc::protobuf::MessageLite, ::grpc::protobuf::MessageLite>(channel_.get(), cq, rpcmethod_AddTableToInputTable_, context, request);
-}
-
-::grpc::ClientAsyncResponseReader< ::io::deephaven::proto::backplane::grpc::AddTableResponse>* InputTableService::Stub::AsyncAddTableToInputTableRaw(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::AddTableRequest& request, ::grpc::CompletionQueue* cq) {
-  auto* result =
-    this->PrepareAsyncAddTableToInputTableRaw(context, request, cq);
-  result->StartCall();
-  return result;
-}
-
-::grpc::Status InputTableService::Stub::DeleteTableFromInputTable(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::DeleteTableRequest& request, ::io::deephaven::proto::backplane::grpc::DeleteTableResponse* response) {
-  return ::grpc::internal::BlockingUnaryCall< ::io::deephaven::proto::backplane::grpc::DeleteTableRequest, ::io::deephaven::proto::backplane::grpc::DeleteTableResponse, ::grpc::protobuf::MessageLite, ::grpc::protobuf::MessageLite>(channel_.get(), rpcmethod_DeleteTableFromInputTable_, context, request, response);
-}
-
-void InputTableService::Stub::async::DeleteTableFromInputTable(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::DeleteTableRequest* request, ::io::deephaven::proto::backplane::grpc::DeleteTableResponse* response, std::function<void(::grpc::Status)> f) {
-  ::grpc::internal::CallbackUnaryCall< ::io::deephaven::proto::backplane::grpc::DeleteTableRequest, ::io::deephaven::proto::backplane::grpc::DeleteTableResponse, ::grpc::protobuf::MessageLite, ::grpc::protobuf::MessageLite>(stub_->channel_.get(), stub_->rpcmethod_DeleteTableFromInputTable_, context, request, response, std::move(f));
-}
-
-void InputTableService::Stub::async::DeleteTableFromInputTable(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::DeleteTableRequest* request, ::io::deephaven::proto::backplane::grpc::DeleteTableResponse* response, ::grpc::ClientUnaryReactor* reactor) {
-  ::grpc::internal::ClientCallbackUnaryFactory::Create< ::grpc::protobuf::MessageLite, ::grpc::protobuf::MessageLite>(stub_->channel_.get(), stub_->rpcmethod_DeleteTableFromInputTable_, context, request, response, reactor);
-}
-
-::grpc::ClientAsyncResponseReader< ::io::deephaven::proto::backplane::grpc::DeleteTableResponse>* InputTableService::Stub::PrepareAsyncDeleteTableFromInputTableRaw(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::DeleteTableRequest& request, ::grpc::CompletionQueue* cq) {
-  return ::grpc::internal::ClientAsyncResponseReaderHelper::Create< ::io::deephaven::proto::backplane::grpc::DeleteTableResponse, ::io::deephaven::proto::backplane::grpc::DeleteTableRequest, ::grpc::protobuf::MessageLite, ::grpc::protobuf::MessageLite>(channel_.get(), cq, rpcmethod_DeleteTableFromInputTable_, context, request);
-}
-
-::grpc::ClientAsyncResponseReader< ::io::deephaven::proto::backplane::grpc::DeleteTableResponse>* InputTableService::Stub::AsyncDeleteTableFromInputTableRaw(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::DeleteTableRequest& request, ::grpc::CompletionQueue* cq) {
-  auto* result =
-    this->PrepareAsyncDeleteTableFromInputTableRaw(context, request, cq);
-  result->StartCall();
-  return result;
-}
-
-InputTableService::Service::Service() {
-  AddMethod(new ::grpc::internal::RpcServiceMethod(
-      InputTableService_method_names[0],
-      ::grpc::internal::RpcMethod::NORMAL_RPC,
-      new ::grpc::internal::RpcMethodHandler< InputTableService::Service, ::io::deephaven::proto::backplane::grpc::AddTableRequest, ::io::deephaven::proto::backplane::grpc::AddTableResponse, ::grpc::protobuf::MessageLite, ::grpc::protobuf::MessageLite>(
-          [](InputTableService::Service* service,
-             ::grpc::ServerContext* ctx,
-             const ::io::deephaven::proto::backplane::grpc::AddTableRequest* req,
-             ::io::deephaven::proto::backplane::grpc::AddTableResponse* resp) {
-               return service->AddTableToInputTable(ctx, req, resp);
-             }, this)));
-  AddMethod(new ::grpc::internal::RpcServiceMethod(
-      InputTableService_method_names[1],
-      ::grpc::internal::RpcMethod::NORMAL_RPC,
-      new ::grpc::internal::RpcMethodHandler< InputTableService::Service, ::io::deephaven::proto::backplane::grpc::DeleteTableRequest, ::io::deephaven::proto::backplane::grpc::DeleteTableResponse, ::grpc::protobuf::MessageLite, ::grpc::protobuf::MessageLite>(
-          [](InputTableService::Service* service,
-             ::grpc::ServerContext* ctx,
-             const ::io::deephaven::proto::backplane::grpc::DeleteTableRequest* req,
-             ::io::deephaven::proto::backplane::grpc::DeleteTableResponse* resp) {
-               return service->DeleteTableFromInputTable(ctx, req, resp);
-             }, this)));
-}
-
-InputTableService::Service::~Service() {
-}
-
-::grpc::Status InputTableService::Service::AddTableToInputTable(::grpc::ServerContext* context, const ::io::deephaven::proto::backplane::grpc::AddTableRequest* request, ::io::deephaven::proto::backplane::grpc::AddTableResponse* response) {
-  (void) context;
-  (void) request;
-  (void) response;
-  return ::grpc::Status(::grpc::StatusCode::UNIMPLEMENTED, "");
-}
-
-::grpc::Status InputTableService::Service::DeleteTableFromInputTable(::grpc::ServerContext* context, const ::io::deephaven::proto::backplane::grpc::DeleteTableRequest* request, ::io::deephaven::proto::backplane::grpc::DeleteTableResponse* response) {
-  (void) context;
-  (void) request;
-  (void) response;
-  return ::grpc::Status(::grpc::StatusCode::UNIMPLEMENTED, "");
-}
-
-
-}  // namespace io
-}  // namespace deephaven
-}  // namespace proto
-}  // namespace backplane
-}  // namespace grpc
-
diff --git a/cpp-client/deephaven/dhclient/proto/deephaven/proto/inputtable.grpc.pb.h b/cpp-client/deephaven/dhclient/proto/deephaven/proto/inputtable.grpc.pb.h
deleted file mode 100644
index 07655594b55..00000000000
--- a/cpp-client/deephaven/dhclient/proto/deephaven/proto/inputtable.grpc.pb.h
+++ /dev/null
@@ -1,428 +0,0 @@
-// Generated by the gRPC C++ plugin.
-// If you make any local change, they will be lost.
-// source: deephaven/proto/inputtable.proto
-// Original file comments:
-//
-// Copyright (c) 2016-2022 Deephaven Data Labs and Patent Pending
-#ifndef GRPC_deephaven_2fproto_2finputtable_2eproto__INCLUDED
-#define GRPC_deephaven_2fproto_2finputtable_2eproto__INCLUDED
-
-#include "deephaven/proto/inputtable.pb.h"
-
-#include <functional>
-#include <grpcpp/generic/async_generic_service.h>
-#include <grpcpp/support/async_stream.h>
-#include <grpcpp/support/async_unary_call.h>
-#include <grpcpp/support/client_callback.h>
-#include <grpcpp/client_context.h>
-#include <grpcpp/completion_queue.h>
-#include <grpcpp/support/message_allocator.h>
-#include <grpcpp/support/method_handler.h>
-#include <grpcpp/impl/proto_utils.h>
-#include <grpcpp/impl/rpc_method.h>
-#include <grpcpp/support/server_callback.h>
-#include <grpcpp/impl/server_callback_handlers.h>
-#include <grpcpp/server_context.h>
-#include <grpcpp/impl/service_type.h>
-#include <grpcpp/support/status.h>
-#include <grpcpp/support/stub_options.h>
-#include <grpcpp/support/sync_stream.h>
-
-namespace io {
-namespace deephaven {
-namespace proto {
-namespace backplane {
-namespace grpc {
-
-//
-// This service offers methods to manipulate the contents of input tables.
-class InputTableService final {
- public:
-  static constexpr char const* service_full_name() {
-    return "io.deephaven.proto.backplane.grpc.InputTableService";
-  }
-  class StubInterface {
-   public:
-    virtual ~StubInterface() {}
-    //
-    // Adds the provided table to the specified input table. The new data to add must only have
-    // columns (name, types, and order) which match the given input table's columns.
-    virtual ::grpc::Status AddTableToInputTable(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::AddTableRequest& request, ::io::deephaven::proto::backplane::grpc::AddTableResponse* response) = 0;
-    std::unique_ptr< ::grpc::ClientAsyncResponseReaderInterface< ::io::deephaven::proto::backplane::grpc::AddTableResponse>> AsyncAddTableToInputTable(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::AddTableRequest& request, ::grpc::CompletionQueue* cq) {
-      return std::unique_ptr< ::grpc::ClientAsyncResponseReaderInterface< ::io::deephaven::proto::backplane::grpc::AddTableResponse>>(AsyncAddTableToInputTableRaw(context, request, cq));
-    }
-    std::unique_ptr< ::grpc::ClientAsyncResponseReaderInterface< ::io::deephaven::proto::backplane::grpc::AddTableResponse>> PrepareAsyncAddTableToInputTable(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::AddTableRequest& request, ::grpc::CompletionQueue* cq) {
-      return std::unique_ptr< ::grpc::ClientAsyncResponseReaderInterface< ::io::deephaven::proto::backplane::grpc::AddTableResponse>>(PrepareAsyncAddTableToInputTableRaw(context, request, cq));
-    }
-    //
-    // Removes the provided table from the specified input tables. The tables indicating which rows
-    // to remove are expected to only have columns that match the key columns of the input table.
-    virtual ::grpc::Status DeleteTableFromInputTable(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::DeleteTableRequest& request, ::io::deephaven::proto::backplane::grpc::DeleteTableResponse* response) = 0;
-    std::unique_ptr< ::grpc::ClientAsyncResponseReaderInterface< ::io::deephaven::proto::backplane::grpc::DeleteTableResponse>> AsyncDeleteTableFromInputTable(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::DeleteTableRequest& request, ::grpc::CompletionQueue* cq) {
-      return std::unique_ptr< ::grpc::ClientAsyncResponseReaderInterface< ::io::deephaven::proto::backplane::grpc::DeleteTableResponse>>(AsyncDeleteTableFromInputTableRaw(context, request, cq));
-    }
-    std::unique_ptr< ::grpc::ClientAsyncResponseReaderInterface< ::io::deephaven::proto::backplane::grpc::DeleteTableResponse>> PrepareAsyncDeleteTableFromInputTable(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::DeleteTableRequest& request, ::grpc::CompletionQueue* cq) {
-      return std::unique_ptr< ::grpc::ClientAsyncResponseReaderInterface< ::io::deephaven::proto::backplane::grpc::DeleteTableResponse>>(PrepareAsyncDeleteTableFromInputTableRaw(context, request, cq));
-    }
-    class async_interface {
-     public:
-      virtual ~async_interface() {}
-      //
-      // Adds the provided table to the specified input table. The new data to add must only have
-      // columns (name, types, and order) which match the given input table's columns.
-      virtual void AddTableToInputTable(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::AddTableRequest* request, ::io::deephaven::proto::backplane::grpc::AddTableResponse* response, std::function<void(::grpc::Status)>) = 0;
-      virtual void AddTableToInputTable(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::AddTableRequest* request, ::io::deephaven::proto::backplane::grpc::AddTableResponse* response, ::grpc::ClientUnaryReactor* reactor) = 0;
-      //
-      // Removes the provided table from the specified input tables. The tables indicating which rows
-      // to remove are expected to only have columns that match the key columns of the input table.
-      virtual void DeleteTableFromInputTable(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::DeleteTableRequest* request, ::io::deephaven::proto::backplane::grpc::DeleteTableResponse* response, std::function<void(::grpc::Status)>) = 0;
-      virtual void DeleteTableFromInputTable(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::DeleteTableRequest* request, ::io::deephaven::proto::backplane::grpc::DeleteTableResponse* response, ::grpc::ClientUnaryReactor* reactor) = 0;
-    };
-    typedef class async_interface experimental_async_interface;
-    virtual class async_interface* async() { return nullptr; }
-    class async_interface* experimental_async() { return async(); }
-   private:
-    virtual ::grpc::ClientAsyncResponseReaderInterface< ::io::deephaven::proto::backplane::grpc::AddTableResponse>* AsyncAddTableToInputTableRaw(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::AddTableRequest& request, ::grpc::CompletionQueue* cq) = 0;
-    virtual ::grpc::ClientAsyncResponseReaderInterface< ::io::deephaven::proto::backplane::grpc::AddTableResponse>* PrepareAsyncAddTableToInputTableRaw(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::AddTableRequest& request, ::grpc::CompletionQueue* cq) = 0;
-    virtual ::grpc::ClientAsyncResponseReaderInterface< ::io::deephaven::proto::backplane::grpc::DeleteTableResponse>* AsyncDeleteTableFromInputTableRaw(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::DeleteTableRequest& request, ::grpc::CompletionQueue* cq) = 0;
-    virtual ::grpc::ClientAsyncResponseReaderInterface< ::io::deephaven::proto::backplane::grpc::DeleteTableResponse>* PrepareAsyncDeleteTableFromInputTableRaw(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::DeleteTableRequest& request, ::grpc::CompletionQueue* cq) = 0;
-  };
-  class Stub final : public StubInterface {
-   public:
-    Stub(const std::shared_ptr< ::grpc::ChannelInterface>& channel, const ::grpc::StubOptions& options = ::grpc::StubOptions());
-    ::grpc::Status AddTableToInputTable(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::AddTableRequest& request, ::io::deephaven::proto::backplane::grpc::AddTableResponse* response) override;
-    std::unique_ptr< ::grpc::ClientAsyncResponseReader< ::io::deephaven::proto::backplane::grpc::AddTableResponse>> AsyncAddTableToInputTable(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::AddTableRequest& request, ::grpc::CompletionQueue* cq) {
-      return std::unique_ptr< ::grpc::ClientAsyncResponseReader< ::io::deephaven::proto::backplane::grpc::AddTableResponse>>(AsyncAddTableToInputTableRaw(context, request, cq));
-    }
-    std::unique_ptr< ::grpc::ClientAsyncResponseReader< ::io::deephaven::proto::backplane::grpc::AddTableResponse>> PrepareAsyncAddTableToInputTable(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::AddTableRequest& request, ::grpc::CompletionQueue* cq) {
-      return std::unique_ptr< ::grpc::ClientAsyncResponseReader< ::io::deephaven::proto::backplane::grpc::AddTableResponse>>(PrepareAsyncAddTableToInputTableRaw(context, request, cq));
-    }
-    ::grpc::Status DeleteTableFromInputTable(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::DeleteTableRequest& request, ::io::deephaven::proto::backplane::grpc::DeleteTableResponse* response) override;
-    std::unique_ptr< ::grpc::ClientAsyncResponseReader< ::io::deephaven::proto::backplane::grpc::DeleteTableResponse>> AsyncDeleteTableFromInputTable(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::DeleteTableRequest& request, ::grpc::CompletionQueue* cq) {
-      return std::unique_ptr< ::grpc::ClientAsyncResponseReader< ::io::deephaven::proto::backplane::grpc::DeleteTableResponse>>(AsyncDeleteTableFromInputTableRaw(context, request, cq));
-    }
-    std::unique_ptr< ::grpc::ClientAsyncResponseReader< ::io::deephaven::proto::backplane::grpc::DeleteTableResponse>> PrepareAsyncDeleteTableFromInputTable(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::DeleteTableRequest& request, ::grpc::CompletionQueue* cq) {
-      return std::unique_ptr< ::grpc::ClientAsyncResponseReader< ::io::deephaven::proto::backplane::grpc::DeleteTableResponse>>(PrepareAsyncDeleteTableFromInputTableRaw(context, request, cq));
-    }
-    class async final :
-      public StubInterface::async_interface {
-     public:
-      void AddTableToInputTable(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::AddTableRequest* request, ::io::deephaven::proto::backplane::grpc::AddTableResponse* response, std::function<void(::grpc::Status)>) override;
-      void AddTableToInputTable(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::AddTableRequest* request, ::io::deephaven::proto::backplane::grpc::AddTableResponse* response, ::grpc::ClientUnaryReactor* reactor) override;
-      void DeleteTableFromInputTable(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::DeleteTableRequest* request, ::io::deephaven::proto::backplane::grpc::DeleteTableResponse* response, std::function<void(::grpc::Status)>) override;
-      void DeleteTableFromInputTable(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::DeleteTableRequest* request, ::io::deephaven::proto::backplane::grpc::DeleteTableResponse* response, ::grpc::ClientUnaryReactor* reactor) override;
-     private:
-      friend class Stub;
-      explicit async(Stub* stub): stub_(stub) { }
-      Stub* stub() { return stub_; }
-      Stub* stub_;
-    };
-    class async* async() override { return &async_stub_; }
-
-   private:
-    std::shared_ptr< ::grpc::ChannelInterface> channel_;
-    class async async_stub_{this};
-    ::grpc::ClientAsyncResponseReader< ::io::deephaven::proto::backplane::grpc::AddTableResponse>* AsyncAddTableToInputTableRaw(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::AddTableRequest& request, ::grpc::CompletionQueue* cq) override;
-    ::grpc::ClientAsyncResponseReader< ::io::deephaven::proto::backplane::grpc::AddTableResponse>* PrepareAsyncAddTableToInputTableRaw(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::AddTableRequest& request, ::grpc::CompletionQueue* cq) override;
-    ::grpc::ClientAsyncResponseReader< ::io::deephaven::proto::backplane::grpc::DeleteTableResponse>* AsyncDeleteTableFromInputTableRaw(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::DeleteTableRequest& request, ::grpc::CompletionQueue* cq) override;
-    ::grpc::ClientAsyncResponseReader< ::io::deephaven::proto::backplane::grpc::DeleteTableResponse>* PrepareAsyncDeleteTableFromInputTableRaw(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::DeleteTableRequest& request, ::grpc::CompletionQueue* cq) override;
-    const ::grpc::internal::RpcMethod rpcmethod_AddTableToInputTable_;
-    const ::grpc::internal::RpcMethod rpcmethod_DeleteTableFromInputTable_;
-  };
-  static std::unique_ptr<Stub> NewStub(const std::shared_ptr< ::grpc::ChannelInterface>& channel, const ::grpc::StubOptions& options = ::grpc::StubOptions());
-
-  class Service : public ::grpc::Service {
-   public:
-    Service();
-    virtual ~Service();
-    //
-    // Adds the provided table to the specified input table. The new data to add must only have
-    // columns (name, types, and order) which match the given input table's columns.
-    virtual ::grpc::Status AddTableToInputTable(::grpc::ServerContext* context, const ::io::deephaven::proto::backplane::grpc::AddTableRequest* request, ::io::deephaven::proto::backplane::grpc::AddTableResponse* response);
-    //
-    // Removes the provided table from the specified input tables. The tables indicating which rows
-    // to remove are expected to only have columns that match the key columns of the input table.
-    virtual ::grpc::Status DeleteTableFromInputTable(::grpc::ServerContext* context, const ::io::deephaven::proto::backplane::grpc::DeleteTableRequest* request, ::io::deephaven::proto::backplane::grpc::DeleteTableResponse* response);
-  };
-  template <class BaseClass>
-  class WithAsyncMethod_AddTableToInputTable : public BaseClass {
-   private:
-    void BaseClassMustBeDerivedFromService(const Service* /*service*/) {}
-   public:
-    WithAsyncMethod_AddTableToInputTable() {
-      ::grpc::Service::MarkMethodAsync(0);
-    }
-    ~WithAsyncMethod_AddTableToInputTable() override {
-      BaseClassMustBeDerivedFromService(this);
-    }
-    // disable synchronous version of this method
-    ::grpc::Status AddTableToInputTable(::grpc::ServerContext* /*context*/, const ::io::deephaven::proto::backplane::grpc::AddTableRequest* /*request*/, ::io::deephaven::proto::backplane::grpc::AddTableResponse* /*response*/) override {
-      abort();
-      return ::grpc::Status(::grpc::StatusCode::UNIMPLEMENTED, "");
-    }
-    void RequestAddTableToInputTable(::grpc::ServerContext* context, ::io::deephaven::proto::backplane::grpc::AddTableRequest* request, ::grpc::ServerAsyncResponseWriter< ::io::deephaven::proto::backplane::grpc::AddTableResponse>* response, ::grpc::CompletionQueue* new_call_cq, ::grpc::ServerCompletionQueue* notification_cq, void *tag) {
-      ::grpc::Service::RequestAsyncUnary(0, context, request, response, new_call_cq, notification_cq, tag);
-    }
-  };
-  template <class BaseClass>
-  class WithAsyncMethod_DeleteTableFromInputTable : public BaseClass {
-   private:
-    void BaseClassMustBeDerivedFromService(const Service* /*service*/) {}
-   public:
-    WithAsyncMethod_DeleteTableFromInputTable() {
-      ::grpc::Service::MarkMethodAsync(1);
-    }
-    ~WithAsyncMethod_DeleteTableFromInputTable() override {
-      BaseClassMustBeDerivedFromService(this);
-    }
-    // disable synchronous version of this method
-    ::grpc::Status DeleteTableFromInputTable(::grpc::ServerContext* /*context*/, const ::io::deephaven::proto::backplane::grpc::DeleteTableRequest* /*request*/, ::io::deephaven::proto::backplane::grpc::DeleteTableResponse* /*response*/) override {
-      abort();
-      return ::grpc::Status(::grpc::StatusCode::UNIMPLEMENTED, "");
-    }
-    void RequestDeleteTableFromInputTable(::grpc::ServerContext* context, ::io::deephaven::proto::backplane::grpc::DeleteTableRequest* request, ::grpc::ServerAsyncResponseWriter< ::io::deephaven::proto::backplane::grpc::DeleteTableResponse>* response, ::grpc::CompletionQueue* new_call_cq, ::grpc::ServerCompletionQueue* notification_cq, void *tag) {
-      ::grpc::Service::RequestAsyncUnary(1, context, request, response, new_call_cq, notification_cq, tag);
-    }
-  };
-  typedef WithAsyncMethod_AddTableToInputTable<WithAsyncMethod_DeleteTableFromInputTable<Service > > AsyncService;
-  template <class BaseClass>
-  class WithCallbackMethod_AddTableToInputTable : public BaseClass {
-   private:
-    void BaseClassMustBeDerivedFromService(const Service* /*service*/) {}
-   public:
-    WithCallbackMethod_AddTableToInputTable() {
-      ::grpc::Service::MarkMethodCallback(0,
-          new ::grpc::internal::CallbackUnaryHandler< ::io::deephaven::proto::backplane::grpc::AddTableRequest, ::io::deephaven::proto::backplane::grpc::AddTableResponse>(
-            [this](
-                   ::grpc::CallbackServerContext* context, const ::io::deephaven::proto::backplane::grpc::AddTableRequest* request, ::io::deephaven::proto::backplane::grpc::AddTableResponse* response) { return this->AddTableToInputTable(context, request, response); }));}
-    void SetMessageAllocatorFor_AddTableToInputTable(
-        ::grpc::MessageAllocator< ::io::deephaven::proto::backplane::grpc::AddTableRequest, ::io::deephaven::proto::backplane::grpc::AddTableResponse>* allocator) {
-      ::grpc::internal::MethodHandler* const handler = ::grpc::Service::GetHandler(0);
-      static_cast<::grpc::internal::CallbackUnaryHandler< ::io::deephaven::proto::backplane::grpc::AddTableRequest, ::io::deephaven::proto::backplane::grpc::AddTableResponse>*>(handler)
-              ->SetMessageAllocator(allocator);
-    }
-    ~WithCallbackMethod_AddTableToInputTable() override {
-      BaseClassMustBeDerivedFromService(this);
-    }
-    // disable synchronous version of this method
-    ::grpc::Status AddTableToInputTable(::grpc::ServerContext* /*context*/, const ::io::deephaven::proto::backplane::grpc::AddTableRequest* /*request*/, ::io::deephaven::proto::backplane::grpc::AddTableResponse* /*response*/) override {
-      abort();
-      return ::grpc::Status(::grpc::StatusCode::UNIMPLEMENTED, "");
-    }
-    virtual ::grpc::ServerUnaryReactor* AddTableToInputTable(
-      ::grpc::CallbackServerContext* /*context*/, const ::io::deephaven::proto::backplane::grpc::AddTableRequest* /*request*/, ::io::deephaven::proto::backplane::grpc::AddTableResponse* /*response*/)  { return nullptr; }
-  };
-  template <class BaseClass>
-  class WithCallbackMethod_DeleteTableFromInputTable : public BaseClass {
-   private:
-    void BaseClassMustBeDerivedFromService(const Service* /*service*/) {}
-   public:
-    WithCallbackMethod_DeleteTableFromInputTable() {
-      ::grpc::Service::MarkMethodCallback(1,
-          new ::grpc::internal::CallbackUnaryHandler< ::io::deephaven::proto::backplane::grpc::DeleteTableRequest, ::io::deephaven::proto::backplane::grpc::DeleteTableResponse>(
-            [this](
-                   ::grpc::CallbackServerContext* context, const ::io::deephaven::proto::backplane::grpc::DeleteTableRequest* request, ::io::deephaven::proto::backplane::grpc::DeleteTableResponse* response) { return this->DeleteTableFromInputTable(context, request, response); }));}
-    void SetMessageAllocatorFor_DeleteTableFromInputTable(
-        ::grpc::MessageAllocator< ::io::deephaven::proto::backplane::grpc::DeleteTableRequest, ::io::deephaven::proto::backplane::grpc::DeleteTableResponse>* allocator) {
-      ::grpc::internal::MethodHandler* const handler = ::grpc::Service::GetHandler(1);
-      static_cast<::grpc::internal::CallbackUnaryHandler< ::io::deephaven::proto::backplane::grpc::DeleteTableRequest, ::io::deephaven::proto::backplane::grpc::DeleteTableResponse>*>(handler)
-              ->SetMessageAllocator(allocator);
-    }
-    ~WithCallbackMethod_DeleteTableFromInputTable() override {
-      BaseClassMustBeDerivedFromService(this);
-    }
-    // disable synchronous version of this method
-    ::grpc::Status DeleteTableFromInputTable(::grpc::ServerContext* /*context*/, const ::io::deephaven::proto::backplane::grpc::DeleteTableRequest* /*request*/, ::io::deephaven::proto::backplane::grpc::DeleteTableResponse* /*response*/) override {
-      abort();
-      return ::grpc::Status(::grpc::StatusCode::UNIMPLEMENTED, "");
-    }
-    virtual ::grpc::ServerUnaryReactor* DeleteTableFromInputTable(
-      ::grpc::CallbackServerContext* /*context*/, const ::io::deephaven::proto::backplane::grpc::DeleteTableRequest* /*request*/, ::io::deephaven::proto::backplane::grpc::DeleteTableResponse* /*response*/)  { return nullptr; }
-  };
-  typedef WithCallbackMethod_AddTableToInputTable<WithCallbackMethod_DeleteTableFromInputTable<Service > > CallbackService;
-  typedef CallbackService ExperimentalCallbackService;
-  template <class BaseClass>
-  class WithGenericMethod_AddTableToInputTable : public BaseClass {
-   private:
-    void BaseClassMustBeDerivedFromService(const Service* /*service*/) {}
-   public:
-    WithGenericMethod_AddTableToInputTable() {
-      ::grpc::Service::MarkMethodGeneric(0);
-    }
-    ~WithGenericMethod_AddTableToInputTable() override {
-      BaseClassMustBeDerivedFromService(this);
-    }
-    // disable synchronous version of this method
-    ::grpc::Status AddTableToInputTable(::grpc::ServerContext* /*context*/, const ::io::deephaven::proto::backplane::grpc::AddTableRequest* /*request*/, ::io::deephaven::proto::backplane::grpc::AddTableResponse* /*response*/) override {
-      abort();
-      return ::grpc::Status(::grpc::StatusCode::UNIMPLEMENTED, "");
-    }
-  };
-  template <class BaseClass>
-  class WithGenericMethod_DeleteTableFromInputTable : public BaseClass {
-   private:
-    void BaseClassMustBeDerivedFromService(const Service* /*service*/) {}
-   public:
-    WithGenericMethod_DeleteTableFromInputTable() {
-      ::grpc::Service::MarkMethodGeneric(1);
-    }
-    ~WithGenericMethod_DeleteTableFromInputTable() override {
-      BaseClassMustBeDerivedFromService(this);
-    }
-    // disable synchronous version of this method
-    ::grpc::Status DeleteTableFromInputTable(::grpc::ServerContext* /*context*/, const ::io::deephaven::proto::backplane::grpc::DeleteTableRequest* /*request*/, ::io::deephaven::proto::backplane::grpc::DeleteTableResponse* /*response*/) override {
-      abort();
-      return ::grpc::Status(::grpc::StatusCode::UNIMPLEMENTED, "");
-    }
-  };
-  template <class BaseClass>
-  class WithRawMethod_AddTableToInputTable : public BaseClass {
-   private:
-    void BaseClassMustBeDerivedFromService(const Service* /*service*/) {}
-   public:
-    WithRawMethod_AddTableToInputTable() {
-      ::grpc::Service::MarkMethodRaw(0);
-    }
-    ~WithRawMethod_AddTableToInputTable() override {
-      BaseClassMustBeDerivedFromService(this);
-    }
-    // disable synchronous version of this method
-    ::grpc::Status AddTableToInputTable(::grpc::ServerContext* /*context*/, const ::io::deephaven::proto::backplane::grpc::AddTableRequest* /*request*/, ::io::deephaven::proto::backplane::grpc::AddTableResponse* /*response*/) override {
-      abort();
-      return ::grpc::Status(::grpc::StatusCode::UNIMPLEMENTED, "");
-    }
-    void RequestAddTableToInputTable(::grpc::ServerContext* context, ::grpc::ByteBuffer* request, ::grpc::ServerAsyncResponseWriter< ::grpc::ByteBuffer>* response, ::grpc::CompletionQueue* new_call_cq, ::grpc::ServerCompletionQueue* notification_cq, void *tag) {
-      ::grpc::Service::RequestAsyncUnary(0, context, request, response, new_call_cq, notification_cq, tag);
-    }
-  };
-  template <class BaseClass>
-  class WithRawMethod_DeleteTableFromInputTable : public BaseClass {
-   private:
-    void BaseClassMustBeDerivedFromService(const Service* /*service*/) {}
-   public:
-    WithRawMethod_DeleteTableFromInputTable() {
-      ::grpc::Service::MarkMethodRaw(1);
-    }
-    ~WithRawMethod_DeleteTableFromInputTable() override {
-      BaseClassMustBeDerivedFromService(this);
-    }
-    // disable synchronous version of this method
-    ::grpc::Status DeleteTableFromInputTable(::grpc::ServerContext* /*context*/, const ::io::deephaven::proto::backplane::grpc::DeleteTableRequest* /*request*/, ::io::deephaven::proto::backplane::grpc::DeleteTableResponse* /*response*/) override {
-      abort();
-      return ::grpc::Status(::grpc::StatusCode::UNIMPLEMENTED, "");
-    }
-    void RequestDeleteTableFromInputTable(::grpc::ServerContext* context, ::grpc::ByteBuffer* request, ::grpc::ServerAsyncResponseWriter< ::grpc::ByteBuffer>* response, ::grpc::CompletionQueue* new_call_cq, ::grpc::ServerCompletionQueue* notification_cq, void *tag) {
-      ::grpc::Service::RequestAsyncUnary(1, context, request, response, new_call_cq, notification_cq, tag);
-    }
-  };
-  template <class BaseClass>
-  class WithRawCallbackMethod_AddTableToInputTable : public BaseClass {
-   private:
-    void BaseClassMustBeDerivedFromService(const Service* /*service*/) {}
-   public:
-    WithRawCallbackMethod_AddTableToInputTable() {
-      ::grpc::Service::MarkMethodRawCallback(0,
-          new ::grpc::internal::CallbackUnaryHandler< ::grpc::ByteBuffer, ::grpc::ByteBuffer>(
-            [this](
-                   ::grpc::CallbackServerContext* context, const ::grpc::ByteBuffer* request, ::grpc::ByteBuffer* response) { return this->AddTableToInputTable(context, request, response); }));
-    }
-    ~WithRawCallbackMethod_AddTableToInputTable() override {
-      BaseClassMustBeDerivedFromService(this);
-    }
-    // disable synchronous version of this method
-    ::grpc::Status AddTableToInputTable(::grpc::ServerContext* /*context*/, const ::io::deephaven::proto::backplane::grpc::AddTableRequest* /*request*/, ::io::deephaven::proto::backplane::grpc::AddTableResponse* /*response*/) override {
-      abort();
-      return ::grpc::Status(::grpc::StatusCode::UNIMPLEMENTED, "");
-    }
-    virtual ::grpc::ServerUnaryReactor* AddTableToInputTable(
-      ::grpc::CallbackServerContext* /*context*/, const ::grpc::ByteBuffer* /*request*/, ::grpc::ByteBuffer* /*response*/)  { return nullptr; }
-  };
-  template <class BaseClass>
-  class WithRawCallbackMethod_DeleteTableFromInputTable : public BaseClass {
-   private:
-    void BaseClassMustBeDerivedFromService(const Service* /*service*/) {}
-   public:
-    WithRawCallbackMethod_DeleteTableFromInputTable() {
-      ::grpc::Service::MarkMethodRawCallback(1,
-          new ::grpc::internal::CallbackUnaryHandler< ::grpc::ByteBuffer, ::grpc::ByteBuffer>(
-            [this](
-                   ::grpc::CallbackServerContext* context, const ::grpc::ByteBuffer* request, ::grpc::ByteBuffer* response) { return this->DeleteTableFromInputTable(context, request, response); }));
-    }
-    ~WithRawCallbackMethod_DeleteTableFromInputTable() override {
-      BaseClassMustBeDerivedFromService(this);
-    }
-    // disable synchronous version of this method
-    ::grpc::Status DeleteTableFromInputTable(::grpc::ServerContext* /*context*/, const ::io::deephaven::proto::backplane::grpc::DeleteTableRequest* /*request*/, ::io::deephaven::proto::backplane::grpc::DeleteTableResponse* /*response*/) override {
-      abort();
-      return ::grpc::Status(::grpc::StatusCode::UNIMPLEMENTED, "");
-    }
-    virtual ::grpc::ServerUnaryReactor* DeleteTableFromInputTable(
-      ::grpc::CallbackServerContext* /*context*/, const ::grpc::ByteBuffer* /*request*/, ::grpc::ByteBuffer* /*response*/)  { return nullptr; }
-  };
-  template <class BaseClass>
-  class WithStreamedUnaryMethod_AddTableToInputTable : public BaseClass {
-   private:
-    void BaseClassMustBeDerivedFromService(const Service* /*service*/) {}
-   public:
-    WithStreamedUnaryMethod_AddTableToInputTable() {
-      ::grpc::Service::MarkMethodStreamed(0,
-        new ::grpc::internal::StreamedUnaryHandler<
-          ::io::deephaven::proto::backplane::grpc::AddTableRequest, ::io::deephaven::proto::backplane::grpc::AddTableResponse>(
-            [this](::grpc::ServerContext* context,
-                   ::grpc::ServerUnaryStreamer<
-                     ::io::deephaven::proto::backplane::grpc::AddTableRequest, ::io::deephaven::proto::backplane::grpc::AddTableResponse>* streamer) {
-                       return this->StreamedAddTableToInputTable(context,
-                         streamer);
-                  }));
-    }
-    ~WithStreamedUnaryMethod_AddTableToInputTable() override {
-      BaseClassMustBeDerivedFromService(this);
-    }
-    // disable regular version of this method
-    ::grpc::Status AddTableToInputTable(::grpc::ServerContext* /*context*/, const ::io::deephaven::proto::backplane::grpc::AddTableRequest* /*request*/, ::io::deephaven::proto::backplane::grpc::AddTableResponse* /*response*/) override {
-      abort();
-      return ::grpc::Status(::grpc::StatusCode::UNIMPLEMENTED, "");
-    }
-    // replace default version of method with streamed unary
-    virtual ::grpc::Status StreamedAddTableToInputTable(::grpc::ServerContext* context, ::grpc::ServerUnaryStreamer< ::io::deephaven::proto::backplane::grpc::AddTableRequest,::io::deephaven::proto::backplane::grpc::AddTableResponse>* server_unary_streamer) = 0;
-  };
-  template <class BaseClass>
-  class WithStreamedUnaryMethod_DeleteTableFromInputTable : public BaseClass {
-   private:
-    void BaseClassMustBeDerivedFromService(const Service* /*service*/) {}
-   public:
-    WithStreamedUnaryMethod_DeleteTableFromInputTable() {
-      ::grpc::Service::MarkMethodStreamed(1,
-        new ::grpc::internal::StreamedUnaryHandler<
-          ::io::deephaven::proto::backplane::grpc::DeleteTableRequest, ::io::deephaven::proto::backplane::grpc::DeleteTableResponse>(
-            [this](::grpc::ServerContext* context,
-                   ::grpc::ServerUnaryStreamer<
-                     ::io::deephaven::proto::backplane::grpc::DeleteTableRequest, ::io::deephaven::proto::backplane::grpc::DeleteTableResponse>* streamer) {
-                       return this->StreamedDeleteTableFromInputTable(context,
-                         streamer);
-                  }));
-    }
-    ~WithStreamedUnaryMethod_DeleteTableFromInputTable() override {
-      BaseClassMustBeDerivedFromService(this);
-    }
-    // disable regular version of this method
-    ::grpc::Status DeleteTableFromInputTable(::grpc::ServerContext* /*context*/, const ::io::deephaven::proto::backplane::grpc::DeleteTableRequest* /*request*/, ::io::deephaven::proto::backplane::grpc::DeleteTableResponse* /*response*/) override {
-      abort();
-      return ::grpc::Status(::grpc::StatusCode::UNIMPLEMENTED, "");
-    }
-    // replace default version of method with streamed unary
-    virtual ::grpc::Status StreamedDeleteTableFromInputTable(::grpc::ServerContext* context, ::grpc::ServerUnaryStreamer< ::io::deephaven::proto::backplane::grpc::DeleteTableRequest,::io::deephaven::proto::backplane::grpc::DeleteTableResponse>* server_unary_streamer) = 0;
-  };
-  typedef WithStreamedUnaryMethod_AddTableToInputTable<WithStreamedUnaryMethod_DeleteTableFromInputTable<Service > > StreamedUnaryService;
-  typedef Service SplitStreamedService;
-  typedef WithStreamedUnaryMethod_AddTableToInputTable<WithStreamedUnaryMethod_DeleteTableFromInputTable<Service > > StreamedService;
-};
-
-}  // namespace grpc
-}  // namespace backplane
-}  // namespace proto
-}  // namespace deephaven
-}  // namespace io
-
-
-#endif  // GRPC_deephaven_2fproto_2finputtable_2eproto__INCLUDED
diff --git a/cpp-client/deephaven/dhclient/proto/deephaven/proto/inputtable.pb.cc b/cpp-client/deephaven/dhclient/proto/deephaven/proto/inputtable.pb.cc
deleted file mode 100644
index ee54b2cd25f..00000000000
--- a/cpp-client/deephaven/dhclient/proto/deephaven/proto/inputtable.pb.cc
+++ /dev/null
@@ -1,855 +0,0 @@
-// Generated by the protocol buffer compiler.  DO NOT EDIT!
-// source: deephaven/proto/inputtable.proto
-
-#include "deephaven/proto/inputtable.pb.h"
-
-#include <algorithm>
-#include "google/protobuf/io/coded_stream.h"
-#include "google/protobuf/extension_set.h"
-#include "google/protobuf/wire_format_lite.h"
-#include "google/protobuf/descriptor.h"
-#include "google/protobuf/generated_message_reflection.h"
-#include "google/protobuf/reflection_ops.h"
-#include "google/protobuf/wire_format.h"
-#include "google/protobuf/generated_message_tctable_impl.h"
-// @@protoc_insertion_point(includes)
-
-// Must be included last.
-#include "google/protobuf/port_def.inc"
-PROTOBUF_PRAGMA_INIT_SEG
-namespace _pb = ::google::protobuf;
-namespace _pbi = ::google::protobuf::internal;
-namespace _fl = ::google::protobuf::internal::field_layout;
-namespace io {
-namespace deephaven {
-namespace proto {
-namespace backplane {
-namespace grpc {
-      template <typename>
-PROTOBUF_CONSTEXPR DeleteTableResponse::DeleteTableResponse(::_pbi::ConstantInitialized) {}
-struct DeleteTableResponseDefaultTypeInternal {
-  PROTOBUF_CONSTEXPR DeleteTableResponseDefaultTypeInternal() : _instance(::_pbi::ConstantInitialized{}) {}
-  ~DeleteTableResponseDefaultTypeInternal() {}
-  union {
-    DeleteTableResponse _instance;
-  };
-};
-
-PROTOBUF_ATTRIBUTE_NO_DESTROY PROTOBUF_CONSTINIT
-    PROTOBUF_ATTRIBUTE_INIT_PRIORITY1 DeleteTableResponseDefaultTypeInternal _DeleteTableResponse_default_instance_;
-      template <typename>
-PROTOBUF_CONSTEXPR AddTableResponse::AddTableResponse(::_pbi::ConstantInitialized) {}
-struct AddTableResponseDefaultTypeInternal {
-  PROTOBUF_CONSTEXPR AddTableResponseDefaultTypeInternal() : _instance(::_pbi::ConstantInitialized{}) {}
-  ~AddTableResponseDefaultTypeInternal() {}
-  union {
-    AddTableResponse _instance;
-  };
-};
-
-PROTOBUF_ATTRIBUTE_NO_DESTROY PROTOBUF_CONSTINIT
-    PROTOBUF_ATTRIBUTE_INIT_PRIORITY1 AddTableResponseDefaultTypeInternal _AddTableResponse_default_instance_;
-
-inline constexpr DeleteTableRequest::Impl_::Impl_(
-    ::_pbi::ConstantInitialized) noexcept
-      : _cached_size_{0},
-        input_table_{nullptr},
-        table_to_remove_{nullptr} {}
-
-template <typename>
-PROTOBUF_CONSTEXPR DeleteTableRequest::DeleteTableRequest(::_pbi::ConstantInitialized)
-    : _impl_(::_pbi::ConstantInitialized()) {}
-struct DeleteTableRequestDefaultTypeInternal {
-  PROTOBUF_CONSTEXPR DeleteTableRequestDefaultTypeInternal() : _instance(::_pbi::ConstantInitialized{}) {}
-  ~DeleteTableRequestDefaultTypeInternal() {}
-  union {
-    DeleteTableRequest _instance;
-  };
-};
-
-PROTOBUF_ATTRIBUTE_NO_DESTROY PROTOBUF_CONSTINIT
-    PROTOBUF_ATTRIBUTE_INIT_PRIORITY1 DeleteTableRequestDefaultTypeInternal _DeleteTableRequest_default_instance_;
-
-inline constexpr AddTableRequest::Impl_::Impl_(
-    ::_pbi::ConstantInitialized) noexcept
-      : _cached_size_{0},
-        input_table_{nullptr},
-        table_to_add_{nullptr} {}
-
-template <typename>
-PROTOBUF_CONSTEXPR AddTableRequest::AddTableRequest(::_pbi::ConstantInitialized)
-    : _impl_(::_pbi::ConstantInitialized()) {}
-struct AddTableRequestDefaultTypeInternal {
-  PROTOBUF_CONSTEXPR AddTableRequestDefaultTypeInternal() : _instance(::_pbi::ConstantInitialized{}) {}
-  ~AddTableRequestDefaultTypeInternal() {}
-  union {
-    AddTableRequest _instance;
-  };
-};
-
-PROTOBUF_ATTRIBUTE_NO_DESTROY PROTOBUF_CONSTINIT
-    PROTOBUF_ATTRIBUTE_INIT_PRIORITY1 AddTableRequestDefaultTypeInternal _AddTableRequest_default_instance_;
-}  // namespace grpc
-}  // namespace backplane
-}  // namespace proto
-}  // namespace deephaven
-}  // namespace io
-static ::_pb::Metadata file_level_metadata_deephaven_2fproto_2finputtable_2eproto[4];
-static constexpr const ::_pb::EnumDescriptor**
-    file_level_enum_descriptors_deephaven_2fproto_2finputtable_2eproto = nullptr;
-static constexpr const ::_pb::ServiceDescriptor**
-    file_level_service_descriptors_deephaven_2fproto_2finputtable_2eproto = nullptr;
-const ::uint32_t TableStruct_deephaven_2fproto_2finputtable_2eproto::offsets[] PROTOBUF_SECTION_VARIABLE(
-    protodesc_cold) = {
-    PROTOBUF_FIELD_OFFSET(::io::deephaven::proto::backplane::grpc::AddTableRequest, _impl_._has_bits_),
-    PROTOBUF_FIELD_OFFSET(::io::deephaven::proto::backplane::grpc::AddTableRequest, _internal_metadata_),
-    ~0u,  // no _extensions_
-    ~0u,  // no _oneof_case_
-    ~0u,  // no _weak_field_map_
-    ~0u,  // no _inlined_string_donated_
-    ~0u,  // no _split_
-    ~0u,  // no sizeof(Split)
-    PROTOBUF_FIELD_OFFSET(::io::deephaven::proto::backplane::grpc::AddTableRequest, _impl_.input_table_),
-    PROTOBUF_FIELD_OFFSET(::io::deephaven::proto::backplane::grpc::AddTableRequest, _impl_.table_to_add_),
-    0,
-    1,
-    ~0u,  // no _has_bits_
-    PROTOBUF_FIELD_OFFSET(::io::deephaven::proto::backplane::grpc::AddTableResponse, _internal_metadata_),
-    ~0u,  // no _extensions_
-    ~0u,  // no _oneof_case_
-    ~0u,  // no _weak_field_map_
-    ~0u,  // no _inlined_string_donated_
-    ~0u,  // no _split_
-    ~0u,  // no sizeof(Split)
-    PROTOBUF_FIELD_OFFSET(::io::deephaven::proto::backplane::grpc::DeleteTableRequest, _impl_._has_bits_),
-    PROTOBUF_FIELD_OFFSET(::io::deephaven::proto::backplane::grpc::DeleteTableRequest, _internal_metadata_),
-    ~0u,  // no _extensions_
-    ~0u,  // no _oneof_case_
-    ~0u,  // no _weak_field_map_
-    ~0u,  // no _inlined_string_donated_
-    ~0u,  // no _split_
-    ~0u,  // no sizeof(Split)
-    PROTOBUF_FIELD_OFFSET(::io::deephaven::proto::backplane::grpc::DeleteTableRequest, _impl_.input_table_),
-    PROTOBUF_FIELD_OFFSET(::io::deephaven::proto::backplane::grpc::DeleteTableRequest, _impl_.table_to_remove_),
-    0,
-    1,
-    ~0u,  // no _has_bits_
-    PROTOBUF_FIELD_OFFSET(::io::deephaven::proto::backplane::grpc::DeleteTableResponse, _internal_metadata_),
-    ~0u,  // no _extensions_
-    ~0u,  // no _oneof_case_
-    ~0u,  // no _weak_field_map_
-    ~0u,  // no _inlined_string_donated_
-    ~0u,  // no _split_
-    ~0u,  // no sizeof(Split)
-};
-
-static const ::_pbi::MigrationSchema
-    schemas[] PROTOBUF_SECTION_VARIABLE(protodesc_cold) = {
-        {0, 10, -1, sizeof(::io::deephaven::proto::backplane::grpc::AddTableRequest)},
-        {12, -1, -1, sizeof(::io::deephaven::proto::backplane::grpc::AddTableResponse)},
-        {20, 30, -1, sizeof(::io::deephaven::proto::backplane::grpc::DeleteTableRequest)},
-        {32, -1, -1, sizeof(::io::deephaven::proto::backplane::grpc::DeleteTableResponse)},
-};
-
-static const ::_pb::Message* const file_default_instances[] = {
-    &::io::deephaven::proto::backplane::grpc::_AddTableRequest_default_instance_._instance,
-    &::io::deephaven::proto::backplane::grpc::_AddTableResponse_default_instance_._instance,
-    &::io::deephaven::proto::backplane::grpc::_DeleteTableRequest_default_instance_._instance,
-    &::io::deephaven::proto::backplane::grpc::_DeleteTableResponse_default_instance_._instance,
-};
-const char descriptor_table_protodef_deephaven_2fproto_2finputtable_2eproto[] PROTOBUF_SECTION_VARIABLE(protodesc_cold) = {
-    "\n deephaven/proto/inputtable.proto\022!io.d"
-    "eephaven.proto.backplane.grpc\032\034deephaven"
-    "/proto/ticket.proto\"\222\001\n\017AddTableRequest\022"
-    ">\n\013input_table\030\001 \001(\0132).io.deephaven.prot"
-    "o.backplane.grpc.Ticket\022\?\n\014table_to_add\030"
-    "\002 \001(\0132).io.deephaven.proto.backplane.grp"
-    "c.Ticket\"\022\n\020AddTableResponse\"\230\001\n\022DeleteT"
-    "ableRequest\022>\n\013input_table\030\001 \001(\0132).io.de"
-    "ephaven.proto.backplane.grpc.Ticket\022B\n\017t"
-    "able_to_remove\030\002 \001(\0132).io.deephaven.prot"
-    "o.backplane.grpc.Ticket\"\025\n\023DeleteTableRe"
-    "sponse2\246\002\n\021InputTableService\022\201\001\n\024AddTabl"
-    "eToInputTable\0222.io.deephaven.proto.backp"
-    "lane.grpc.AddTableRequest\0323.io.deephaven"
-    ".proto.backplane.grpc.AddTableResponse\"\000"
-    "\022\214\001\n\031DeleteTableFromInputTable\0225.io.deep"
-    "haven.proto.backplane.grpc.DeleteTableRe"
-    "quest\0326.io.deephaven.proto.backplane.grp"
-    "c.DeleteTableResponse\"\000BFH\001P\001Z@github.co"
-    "m/deephaven/deephaven-core/go/internal/p"
-    "roto/inputtableb\006proto3"
-};
-static const ::_pbi::DescriptorTable* const descriptor_table_deephaven_2fproto_2finputtable_2eproto_deps[1] =
-    {
-        &::descriptor_table_deephaven_2fproto_2fticket_2eproto,
-};
-static ::absl::once_flag descriptor_table_deephaven_2fproto_2finputtable_2eproto_once;
-const ::_pbi::DescriptorTable descriptor_table_deephaven_2fproto_2finputtable_2eproto = {
-    false,
-    false,
-    823,
-    descriptor_table_protodef_deephaven_2fproto_2finputtable_2eproto,
-    "deephaven/proto/inputtable.proto",
-    &descriptor_table_deephaven_2fproto_2finputtable_2eproto_once,
-    descriptor_table_deephaven_2fproto_2finputtable_2eproto_deps,
-    1,
-    4,
-    schemas,
-    file_default_instances,
-    TableStruct_deephaven_2fproto_2finputtable_2eproto::offsets,
-    file_level_metadata_deephaven_2fproto_2finputtable_2eproto,
-    file_level_enum_descriptors_deephaven_2fproto_2finputtable_2eproto,
-    file_level_service_descriptors_deephaven_2fproto_2finputtable_2eproto,
-};
-
-// This function exists to be marked as weak.
-// It can significantly speed up compilation by breaking up LLVM's SCC
-// in the .pb.cc translation units. Large translation units see a
-// reduction of more than 35% of walltime for optimized builds. Without
-// the weak attribute all the messages in the file, including all the
-// vtables and everything they use become part of the same SCC through
-// a cycle like:
-// GetMetadata -> descriptor table -> default instances ->
-//   vtables -> GetMetadata
-// By adding a weak function here we break the connection from the
-// individual vtables back into the descriptor table.
-PROTOBUF_ATTRIBUTE_WEAK const ::_pbi::DescriptorTable* descriptor_table_deephaven_2fproto_2finputtable_2eproto_getter() {
-  return &descriptor_table_deephaven_2fproto_2finputtable_2eproto;
-}
-// Force running AddDescriptors() at dynamic initialization time.
-PROTOBUF_ATTRIBUTE_INIT_PRIORITY2
-static ::_pbi::AddDescriptorsRunner dynamic_init_dummy_deephaven_2fproto_2finputtable_2eproto(&descriptor_table_deephaven_2fproto_2finputtable_2eproto);
-namespace io {
-namespace deephaven {
-namespace proto {
-namespace backplane {
-namespace grpc {
-// ===================================================================
-
-class AddTableRequest::_Internal {
- public:
-  using HasBits = decltype(std::declval<AddTableRequest>()._impl_._has_bits_);
-  static constexpr ::int32_t kHasBitsOffset =
-    8 * PROTOBUF_FIELD_OFFSET(AddTableRequest, _impl_._has_bits_);
-  static const ::io::deephaven::proto::backplane::grpc::Ticket& input_table(const AddTableRequest* msg);
-  static void set_has_input_table(HasBits* has_bits) {
-    (*has_bits)[0] |= 1u;
-  }
-  static const ::io::deephaven::proto::backplane::grpc::Ticket& table_to_add(const AddTableRequest* msg);
-  static void set_has_table_to_add(HasBits* has_bits) {
-    (*has_bits)[0] |= 2u;
-  }
-};
-
-const ::io::deephaven::proto::backplane::grpc::Ticket& AddTableRequest::_Internal::input_table(const AddTableRequest* msg) {
-  return *msg->_impl_.input_table_;
-}
-const ::io::deephaven::proto::backplane::grpc::Ticket& AddTableRequest::_Internal::table_to_add(const AddTableRequest* msg) {
-  return *msg->_impl_.table_to_add_;
-}
-void AddTableRequest::clear_input_table() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  if (_impl_.input_table_ != nullptr) _impl_.input_table_->Clear();
-  _impl_._has_bits_[0] &= ~0x00000001u;
-}
-void AddTableRequest::clear_table_to_add() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  if (_impl_.table_to_add_ != nullptr) _impl_.table_to_add_->Clear();
-  _impl_._has_bits_[0] &= ~0x00000002u;
-}
-AddTableRequest::AddTableRequest(::google::protobuf::Arena* arena)
-    : ::google::protobuf::Message(arena) {
-  SharedCtor(arena);
-  // @@protoc_insertion_point(arena_constructor:io.deephaven.proto.backplane.grpc.AddTableRequest)
-}
-inline PROTOBUF_NDEBUG_INLINE AddTableRequest::Impl_::Impl_(
-    ::google::protobuf::internal::InternalVisibility visibility, ::google::protobuf::Arena* arena,
-    const Impl_& from)
-      : _has_bits_{from._has_bits_},
-        _cached_size_{0} {}
-
-AddTableRequest::AddTableRequest(
-    ::google::protobuf::Arena* arena,
-    const AddTableRequest& from)
-    : ::google::protobuf::Message(arena) {
-  AddTableRequest* const _this = this;
-  (void)_this;
-  _internal_metadata_.MergeFrom<::google::protobuf::UnknownFieldSet>(
-      from._internal_metadata_);
-  new (&_impl_) Impl_(internal_visibility(), arena, from._impl_);
-  ::uint32_t cached_has_bits = _impl_._has_bits_[0];
-  _impl_.input_table_ = (cached_has_bits & 0x00000001u)
-                ? CreateMaybeMessage<::io::deephaven::proto::backplane::grpc::Ticket>(arena, *from._impl_.input_table_)
-                : nullptr;
-  _impl_.table_to_add_ = (cached_has_bits & 0x00000002u)
-                ? CreateMaybeMessage<::io::deephaven::proto::backplane::grpc::Ticket>(arena, *from._impl_.table_to_add_)
-                : nullptr;
-
-  // @@protoc_insertion_point(copy_constructor:io.deephaven.proto.backplane.grpc.AddTableRequest)
-}
-inline PROTOBUF_NDEBUG_INLINE AddTableRequest::Impl_::Impl_(
-    ::google::protobuf::internal::InternalVisibility visibility,
-    ::google::protobuf::Arena* arena)
-      : _cached_size_{0} {}
-
-inline void AddTableRequest::SharedCtor(::_pb::Arena* arena) {
-  new (&_impl_) Impl_(internal_visibility(), arena);
-  ::memset(reinterpret_cast<char *>(&_impl_) +
-               offsetof(Impl_, input_table_),
-           0,
-           offsetof(Impl_, table_to_add_) -
-               offsetof(Impl_, input_table_) +
-               sizeof(Impl_::table_to_add_));
-}
-AddTableRequest::~AddTableRequest() {
-  // @@protoc_insertion_point(destructor:io.deephaven.proto.backplane.grpc.AddTableRequest)
-  _internal_metadata_.Delete<::google::protobuf::UnknownFieldSet>();
-  SharedDtor();
-}
-inline void AddTableRequest::SharedDtor() {
-  ABSL_DCHECK(GetArena() == nullptr);
-  delete _impl_.input_table_;
-  delete _impl_.table_to_add_;
-  _impl_.~Impl_();
-}
-
-PROTOBUF_NOINLINE void AddTableRequest::Clear() {
-// @@protoc_insertion_point(message_clear_start:io.deephaven.proto.backplane.grpc.AddTableRequest)
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  ::uint32_t cached_has_bits = 0;
-  // Prevent compiler warnings about cached_has_bits being unused
-  (void) cached_has_bits;
-
-  cached_has_bits = _impl_._has_bits_[0];
-  if (cached_has_bits & 0x00000003u) {
-    if (cached_has_bits & 0x00000001u) {
-      ABSL_DCHECK(_impl_.input_table_ != nullptr);
-      _impl_.input_table_->Clear();
-    }
-    if (cached_has_bits & 0x00000002u) {
-      ABSL_DCHECK(_impl_.table_to_add_ != nullptr);
-      _impl_.table_to_add_->Clear();
-    }
-  }
-  _impl_._has_bits_.Clear();
-  _internal_metadata_.Clear<::google::protobuf::UnknownFieldSet>();
-}
-
-const char* AddTableRequest::_InternalParse(
-    const char* ptr, ::_pbi::ParseContext* ctx) {
-  ptr = ::_pbi::TcParser::ParseLoop(this, ptr, ctx, &_table_.header);
-  return ptr;
-}
-
-
-PROTOBUF_CONSTINIT PROTOBUF_ATTRIBUTE_INIT_PRIORITY1
-const ::_pbi::TcParseTable<1, 2, 2, 0, 2> AddTableRequest::_table_ = {
-  {
-    PROTOBUF_FIELD_OFFSET(AddTableRequest, _impl_._has_bits_),
-    0, // no _extensions_
-    2, 8,  // max_field_number, fast_idx_mask
-    offsetof(decltype(_table_), field_lookup_table),
-    4294967292,  // skipmap
-    offsetof(decltype(_table_), field_entries),
-    2,  // num_field_entries
-    2,  // num_aux_entries
-    offsetof(decltype(_table_), aux_entries),
-    &_AddTableRequest_default_instance_._instance,
-    ::_pbi::TcParser::GenericFallback,  // fallback
-  }, {{
-    // .io.deephaven.proto.backplane.grpc.Ticket table_to_add = 2;
-    {::_pbi::TcParser::FastMtS1,
-     {18, 1, 1, PROTOBUF_FIELD_OFFSET(AddTableRequest, _impl_.table_to_add_)}},
-    // .io.deephaven.proto.backplane.grpc.Ticket input_table = 1;
-    {::_pbi::TcParser::FastMtS1,
-     {10, 0, 0, PROTOBUF_FIELD_OFFSET(AddTableRequest, _impl_.input_table_)}},
-  }}, {{
-    65535, 65535
-  }}, {{
-    // .io.deephaven.proto.backplane.grpc.Ticket input_table = 1;
-    {PROTOBUF_FIELD_OFFSET(AddTableRequest, _impl_.input_table_), _Internal::kHasBitsOffset + 0, 0,
-    (0 | ::_fl::kFcOptional | ::_fl::kMessage | ::_fl::kTvTable)},
-    // .io.deephaven.proto.backplane.grpc.Ticket table_to_add = 2;
-    {PROTOBUF_FIELD_OFFSET(AddTableRequest, _impl_.table_to_add_), _Internal::kHasBitsOffset + 1, 1,
-    (0 | ::_fl::kFcOptional | ::_fl::kMessage | ::_fl::kTvTable)},
-  }}, {{
-    {::_pbi::TcParser::GetTable<::io::deephaven::proto::backplane::grpc::Ticket>()},
-    {::_pbi::TcParser::GetTable<::io::deephaven::proto::backplane::grpc::Ticket>()},
-  }}, {{
-  }},
-};
-
-::uint8_t* AddTableRequest::_InternalSerialize(
-    ::uint8_t* target,
-    ::google::protobuf::io::EpsCopyOutputStream* stream) const {
-  // @@protoc_insertion_point(serialize_to_array_start:io.deephaven.proto.backplane.grpc.AddTableRequest)
-  ::uint32_t cached_has_bits = 0;
-  (void)cached_has_bits;
-
-  cached_has_bits = _impl_._has_bits_[0];
-  // .io.deephaven.proto.backplane.grpc.Ticket input_table = 1;
-  if (cached_has_bits & 0x00000001u) {
-    target = ::google::protobuf::internal::WireFormatLite::InternalWriteMessage(
-        1, _Internal::input_table(this),
-        _Internal::input_table(this).GetCachedSize(), target, stream);
-  }
-
-  // .io.deephaven.proto.backplane.grpc.Ticket table_to_add = 2;
-  if (cached_has_bits & 0x00000002u) {
-    target = ::google::protobuf::internal::WireFormatLite::InternalWriteMessage(
-        2, _Internal::table_to_add(this),
-        _Internal::table_to_add(this).GetCachedSize(), target, stream);
-  }
-
-  if (PROTOBUF_PREDICT_FALSE(_internal_metadata_.have_unknown_fields())) {
-    target =
-        ::_pbi::WireFormat::InternalSerializeUnknownFieldsToArray(
-            _internal_metadata_.unknown_fields<::google::protobuf::UnknownFieldSet>(::google::protobuf::UnknownFieldSet::default_instance), target, stream);
-  }
-  // @@protoc_insertion_point(serialize_to_array_end:io.deephaven.proto.backplane.grpc.AddTableRequest)
-  return target;
-}
-
-::size_t AddTableRequest::ByteSizeLong() const {
-// @@protoc_insertion_point(message_byte_size_start:io.deephaven.proto.backplane.grpc.AddTableRequest)
-  ::size_t total_size = 0;
-
-  ::uint32_t cached_has_bits = 0;
-  // Prevent compiler warnings about cached_has_bits being unused
-  (void) cached_has_bits;
-
-  cached_has_bits = _impl_._has_bits_[0];
-  if (cached_has_bits & 0x00000003u) {
-    // .io.deephaven.proto.backplane.grpc.Ticket input_table = 1;
-    if (cached_has_bits & 0x00000001u) {
-      total_size +=
-          1 + ::google::protobuf::internal::WireFormatLite::MessageSize(*_impl_.input_table_);
-    }
-
-    // .io.deephaven.proto.backplane.grpc.Ticket table_to_add = 2;
-    if (cached_has_bits & 0x00000002u) {
-      total_size +=
-          1 + ::google::protobuf::internal::WireFormatLite::MessageSize(*_impl_.table_to_add_);
-    }
-
-  }
-  return MaybeComputeUnknownFieldsSize(total_size, &_impl_._cached_size_);
-}
-
-const ::google::protobuf::Message::ClassData AddTableRequest::_class_data_ = {
-    AddTableRequest::MergeImpl,
-    nullptr,  // OnDemandRegisterArenaDtor
-};
-const ::google::protobuf::Message::ClassData* AddTableRequest::GetClassData() const {
-  return &_class_data_;
-}
-
-void AddTableRequest::MergeImpl(::google::protobuf::Message& to_msg, const ::google::protobuf::Message& from_msg) {
-  auto* const _this = static_cast<AddTableRequest*>(&to_msg);
-  auto& from = static_cast<const AddTableRequest&>(from_msg);
-  // @@protoc_insertion_point(class_specific_merge_from_start:io.deephaven.proto.backplane.grpc.AddTableRequest)
-  ABSL_DCHECK_NE(&from, _this);
-  ::uint32_t cached_has_bits = 0;
-  (void) cached_has_bits;
-
-  cached_has_bits = from._impl_._has_bits_[0];
-  if (cached_has_bits & 0x00000003u) {
-    if (cached_has_bits & 0x00000001u) {
-      _this->_internal_mutable_input_table()->::io::deephaven::proto::backplane::grpc::Ticket::MergeFrom(
-          from._internal_input_table());
-    }
-    if (cached_has_bits & 0x00000002u) {
-      _this->_internal_mutable_table_to_add()->::io::deephaven::proto::backplane::grpc::Ticket::MergeFrom(
-          from._internal_table_to_add());
-    }
-  }
-  _this->_internal_metadata_.MergeFrom<::google::protobuf::UnknownFieldSet>(from._internal_metadata_);
-}
-
-void AddTableRequest::CopyFrom(const AddTableRequest& from) {
-// @@protoc_insertion_point(class_specific_copy_from_start:io.deephaven.proto.backplane.grpc.AddTableRequest)
-  if (&from == this) return;
-  Clear();
-  MergeFrom(from);
-}
-
-PROTOBUF_NOINLINE bool AddTableRequest::IsInitialized() const {
-  return true;
-}
-
-::_pbi::CachedSize* AddTableRequest::AccessCachedSize() const {
-  return &_impl_._cached_size_;
-}
-void AddTableRequest::InternalSwap(AddTableRequest* PROTOBUF_RESTRICT other) {
-  using std::swap;
-  _internal_metadata_.InternalSwap(&other->_internal_metadata_);
-  swap(_impl_._has_bits_[0], other->_impl_._has_bits_[0]);
-  ::google::protobuf::internal::memswap<
-      PROTOBUF_FIELD_OFFSET(AddTableRequest, _impl_.table_to_add_)
-      + sizeof(AddTableRequest::_impl_.table_to_add_)
-      - PROTOBUF_FIELD_OFFSET(AddTableRequest, _impl_.input_table_)>(
-          reinterpret_cast<char*>(&_impl_.input_table_),
-          reinterpret_cast<char*>(&other->_impl_.input_table_));
-}
-
-::google::protobuf::Metadata AddTableRequest::GetMetadata() const {
-  return ::_pbi::AssignDescriptors(
-      &descriptor_table_deephaven_2fproto_2finputtable_2eproto_getter, &descriptor_table_deephaven_2fproto_2finputtable_2eproto_once,
-      file_level_metadata_deephaven_2fproto_2finputtable_2eproto[0]);
-}
-// ===================================================================
-
-class AddTableResponse::_Internal {
- public:
-};
-
-AddTableResponse::AddTableResponse(::google::protobuf::Arena* arena)
-    : ::google::protobuf::internal::ZeroFieldsBase(arena) {
-  // @@protoc_insertion_point(arena_constructor:io.deephaven.proto.backplane.grpc.AddTableResponse)
-}
-AddTableResponse::AddTableResponse(
-    ::google::protobuf::Arena* arena,
-    const AddTableResponse& from)
-    : ::google::protobuf::internal::ZeroFieldsBase(arena) {
-  AddTableResponse* const _this = this;
-  (void)_this;
-  _internal_metadata_.MergeFrom<::google::protobuf::UnknownFieldSet>(
-      from._internal_metadata_);
-
-  // @@protoc_insertion_point(copy_constructor:io.deephaven.proto.backplane.grpc.AddTableResponse)
-}
-
-
-
-
-
-
-
-
-
-::google::protobuf::Metadata AddTableResponse::GetMetadata() const {
-  return ::_pbi::AssignDescriptors(
-      &descriptor_table_deephaven_2fproto_2finputtable_2eproto_getter, &descriptor_table_deephaven_2fproto_2finputtable_2eproto_once,
-      file_level_metadata_deephaven_2fproto_2finputtable_2eproto[1]);
-}
-// ===================================================================
-
-class DeleteTableRequest::_Internal {
- public:
-  using HasBits = decltype(std::declval<DeleteTableRequest>()._impl_._has_bits_);
-  static constexpr ::int32_t kHasBitsOffset =
-    8 * PROTOBUF_FIELD_OFFSET(DeleteTableRequest, _impl_._has_bits_);
-  static const ::io::deephaven::proto::backplane::grpc::Ticket& input_table(const DeleteTableRequest* msg);
-  static void set_has_input_table(HasBits* has_bits) {
-    (*has_bits)[0] |= 1u;
-  }
-  static const ::io::deephaven::proto::backplane::grpc::Ticket& table_to_remove(const DeleteTableRequest* msg);
-  static void set_has_table_to_remove(HasBits* has_bits) {
-    (*has_bits)[0] |= 2u;
-  }
-};
-
-const ::io::deephaven::proto::backplane::grpc::Ticket& DeleteTableRequest::_Internal::input_table(const DeleteTableRequest* msg) {
-  return *msg->_impl_.input_table_;
-}
-const ::io::deephaven::proto::backplane::grpc::Ticket& DeleteTableRequest::_Internal::table_to_remove(const DeleteTableRequest* msg) {
-  return *msg->_impl_.table_to_remove_;
-}
-void DeleteTableRequest::clear_input_table() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  if (_impl_.input_table_ != nullptr) _impl_.input_table_->Clear();
-  _impl_._has_bits_[0] &= ~0x00000001u;
-}
-void DeleteTableRequest::clear_table_to_remove() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  if (_impl_.table_to_remove_ != nullptr) _impl_.table_to_remove_->Clear();
-  _impl_._has_bits_[0] &= ~0x00000002u;
-}
-DeleteTableRequest::DeleteTableRequest(::google::protobuf::Arena* arena)
-    : ::google::protobuf::Message(arena) {
-  SharedCtor(arena);
-  // @@protoc_insertion_point(arena_constructor:io.deephaven.proto.backplane.grpc.DeleteTableRequest)
-}
-inline PROTOBUF_NDEBUG_INLINE DeleteTableRequest::Impl_::Impl_(
-    ::google::protobuf::internal::InternalVisibility visibility, ::google::protobuf::Arena* arena,
-    const Impl_& from)
-      : _has_bits_{from._has_bits_},
-        _cached_size_{0} {}
-
-DeleteTableRequest::DeleteTableRequest(
-    ::google::protobuf::Arena* arena,
-    const DeleteTableRequest& from)
-    : ::google::protobuf::Message(arena) {
-  DeleteTableRequest* const _this = this;
-  (void)_this;
-  _internal_metadata_.MergeFrom<::google::protobuf::UnknownFieldSet>(
-      from._internal_metadata_);
-  new (&_impl_) Impl_(internal_visibility(), arena, from._impl_);
-  ::uint32_t cached_has_bits = _impl_._has_bits_[0];
-  _impl_.input_table_ = (cached_has_bits & 0x00000001u)
-                ? CreateMaybeMessage<::io::deephaven::proto::backplane::grpc::Ticket>(arena, *from._impl_.input_table_)
-                : nullptr;
-  _impl_.table_to_remove_ = (cached_has_bits & 0x00000002u)
-                ? CreateMaybeMessage<::io::deephaven::proto::backplane::grpc::Ticket>(arena, *from._impl_.table_to_remove_)
-                : nullptr;
-
-  // @@protoc_insertion_point(copy_constructor:io.deephaven.proto.backplane.grpc.DeleteTableRequest)
-}
-inline PROTOBUF_NDEBUG_INLINE DeleteTableRequest::Impl_::Impl_(
-    ::google::protobuf::internal::InternalVisibility visibility,
-    ::google::protobuf::Arena* arena)
-      : _cached_size_{0} {}
-
-inline void DeleteTableRequest::SharedCtor(::_pb::Arena* arena) {
-  new (&_impl_) Impl_(internal_visibility(), arena);
-  ::memset(reinterpret_cast<char *>(&_impl_) +
-               offsetof(Impl_, input_table_),
-           0,
-           offsetof(Impl_, table_to_remove_) -
-               offsetof(Impl_, input_table_) +
-               sizeof(Impl_::table_to_remove_));
-}
-DeleteTableRequest::~DeleteTableRequest() {
-  // @@protoc_insertion_point(destructor:io.deephaven.proto.backplane.grpc.DeleteTableRequest)
-  _internal_metadata_.Delete<::google::protobuf::UnknownFieldSet>();
-  SharedDtor();
-}
-inline void DeleteTableRequest::SharedDtor() {
-  ABSL_DCHECK(GetArena() == nullptr);
-  delete _impl_.input_table_;
-  delete _impl_.table_to_remove_;
-  _impl_.~Impl_();
-}
-
-PROTOBUF_NOINLINE void DeleteTableRequest::Clear() {
-// @@protoc_insertion_point(message_clear_start:io.deephaven.proto.backplane.grpc.DeleteTableRequest)
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  ::uint32_t cached_has_bits = 0;
-  // Prevent compiler warnings about cached_has_bits being unused
-  (void) cached_has_bits;
-
-  cached_has_bits = _impl_._has_bits_[0];
-  if (cached_has_bits & 0x00000003u) {
-    if (cached_has_bits & 0x00000001u) {
-      ABSL_DCHECK(_impl_.input_table_ != nullptr);
-      _impl_.input_table_->Clear();
-    }
-    if (cached_has_bits & 0x00000002u) {
-      ABSL_DCHECK(_impl_.table_to_remove_ != nullptr);
-      _impl_.table_to_remove_->Clear();
-    }
-  }
-  _impl_._has_bits_.Clear();
-  _internal_metadata_.Clear<::google::protobuf::UnknownFieldSet>();
-}
-
-const char* DeleteTableRequest::_InternalParse(
-    const char* ptr, ::_pbi::ParseContext* ctx) {
-  ptr = ::_pbi::TcParser::ParseLoop(this, ptr, ctx, &_table_.header);
-  return ptr;
-}
-
-
-PROTOBUF_CONSTINIT PROTOBUF_ATTRIBUTE_INIT_PRIORITY1
-const ::_pbi::TcParseTable<1, 2, 2, 0, 2> DeleteTableRequest::_table_ = {
-  {
-    PROTOBUF_FIELD_OFFSET(DeleteTableRequest, _impl_._has_bits_),
-    0, // no _extensions_
-    2, 8,  // max_field_number, fast_idx_mask
-    offsetof(decltype(_table_), field_lookup_table),
-    4294967292,  // skipmap
-    offsetof(decltype(_table_), field_entries),
-    2,  // num_field_entries
-    2,  // num_aux_entries
-    offsetof(decltype(_table_), aux_entries),
-    &_DeleteTableRequest_default_instance_._instance,
-    ::_pbi::TcParser::GenericFallback,  // fallback
-  }, {{
-    // .io.deephaven.proto.backplane.grpc.Ticket table_to_remove = 2;
-    {::_pbi::TcParser::FastMtS1,
-     {18, 1, 1, PROTOBUF_FIELD_OFFSET(DeleteTableRequest, _impl_.table_to_remove_)}},
-    // .io.deephaven.proto.backplane.grpc.Ticket input_table = 1;
-    {::_pbi::TcParser::FastMtS1,
-     {10, 0, 0, PROTOBUF_FIELD_OFFSET(DeleteTableRequest, _impl_.input_table_)}},
-  }}, {{
-    65535, 65535
-  }}, {{
-    // .io.deephaven.proto.backplane.grpc.Ticket input_table = 1;
-    {PROTOBUF_FIELD_OFFSET(DeleteTableRequest, _impl_.input_table_), _Internal::kHasBitsOffset + 0, 0,
-    (0 | ::_fl::kFcOptional | ::_fl::kMessage | ::_fl::kTvTable)},
-    // .io.deephaven.proto.backplane.grpc.Ticket table_to_remove = 2;
-    {PROTOBUF_FIELD_OFFSET(DeleteTableRequest, _impl_.table_to_remove_), _Internal::kHasBitsOffset + 1, 1,
-    (0 | ::_fl::kFcOptional | ::_fl::kMessage | ::_fl::kTvTable)},
-  }}, {{
-    {::_pbi::TcParser::GetTable<::io::deephaven::proto::backplane::grpc::Ticket>()},
-    {::_pbi::TcParser::GetTable<::io::deephaven::proto::backplane::grpc::Ticket>()},
-  }}, {{
-  }},
-};
-
-::uint8_t* DeleteTableRequest::_InternalSerialize(
-    ::uint8_t* target,
-    ::google::protobuf::io::EpsCopyOutputStream* stream) const {
-  // @@protoc_insertion_point(serialize_to_array_start:io.deephaven.proto.backplane.grpc.DeleteTableRequest)
-  ::uint32_t cached_has_bits = 0;
-  (void)cached_has_bits;
-
-  cached_has_bits = _impl_._has_bits_[0];
-  // .io.deephaven.proto.backplane.grpc.Ticket input_table = 1;
-  if (cached_has_bits & 0x00000001u) {
-    target = ::google::protobuf::internal::WireFormatLite::InternalWriteMessage(
-        1, _Internal::input_table(this),
-        _Internal::input_table(this).GetCachedSize(), target, stream);
-  }
-
-  // .io.deephaven.proto.backplane.grpc.Ticket table_to_remove = 2;
-  if (cached_has_bits & 0x00000002u) {
-    target = ::google::protobuf::internal::WireFormatLite::InternalWriteMessage(
-        2, _Internal::table_to_remove(this),
-        _Internal::table_to_remove(this).GetCachedSize(), target, stream);
-  }
-
-  if (PROTOBUF_PREDICT_FALSE(_internal_metadata_.have_unknown_fields())) {
-    target =
-        ::_pbi::WireFormat::InternalSerializeUnknownFieldsToArray(
-            _internal_metadata_.unknown_fields<::google::protobuf::UnknownFieldSet>(::google::protobuf::UnknownFieldSet::default_instance), target, stream);
-  }
-  // @@protoc_insertion_point(serialize_to_array_end:io.deephaven.proto.backplane.grpc.DeleteTableRequest)
-  return target;
-}
-
-::size_t DeleteTableRequest::ByteSizeLong() const {
-// @@protoc_insertion_point(message_byte_size_start:io.deephaven.proto.backplane.grpc.DeleteTableRequest)
-  ::size_t total_size = 0;
-
-  ::uint32_t cached_has_bits = 0;
-  // Prevent compiler warnings about cached_has_bits being unused
-  (void) cached_has_bits;
-
-  cached_has_bits = _impl_._has_bits_[0];
-  if (cached_has_bits & 0x00000003u) {
-    // .io.deephaven.proto.backplane.grpc.Ticket input_table = 1;
-    if (cached_has_bits & 0x00000001u) {
-      total_size +=
-          1 + ::google::protobuf::internal::WireFormatLite::MessageSize(*_impl_.input_table_);
-    }
-
-    // .io.deephaven.proto.backplane.grpc.Ticket table_to_remove = 2;
-    if (cached_has_bits & 0x00000002u) {
-      total_size +=
-          1 + ::google::protobuf::internal::WireFormatLite::MessageSize(*_impl_.table_to_remove_);
-    }
-
-  }
-  return MaybeComputeUnknownFieldsSize(total_size, &_impl_._cached_size_);
-}
-
-const ::google::protobuf::Message::ClassData DeleteTableRequest::_class_data_ = {
-    DeleteTableRequest::MergeImpl,
-    nullptr,  // OnDemandRegisterArenaDtor
-};
-const ::google::protobuf::Message::ClassData* DeleteTableRequest::GetClassData() const {
-  return &_class_data_;
-}
-
-void DeleteTableRequest::MergeImpl(::google::protobuf::Message& to_msg, const ::google::protobuf::Message& from_msg) {
-  auto* const _this = static_cast<DeleteTableRequest*>(&to_msg);
-  auto& from = static_cast<const DeleteTableRequest&>(from_msg);
-  // @@protoc_insertion_point(class_specific_merge_from_start:io.deephaven.proto.backplane.grpc.DeleteTableRequest)
-  ABSL_DCHECK_NE(&from, _this);
-  ::uint32_t cached_has_bits = 0;
-  (void) cached_has_bits;
-
-  cached_has_bits = from._impl_._has_bits_[0];
-  if (cached_has_bits & 0x00000003u) {
-    if (cached_has_bits & 0x00000001u) {
-      _this->_internal_mutable_input_table()->::io::deephaven::proto::backplane::grpc::Ticket::MergeFrom(
-          from._internal_input_table());
-    }
-    if (cached_has_bits & 0x00000002u) {
-      _this->_internal_mutable_table_to_remove()->::io::deephaven::proto::backplane::grpc::Ticket::MergeFrom(
-          from._internal_table_to_remove());
-    }
-  }
-  _this->_internal_metadata_.MergeFrom<::google::protobuf::UnknownFieldSet>(from._internal_metadata_);
-}
-
-void DeleteTableRequest::CopyFrom(const DeleteTableRequest& from) {
-// @@protoc_insertion_point(class_specific_copy_from_start:io.deephaven.proto.backplane.grpc.DeleteTableRequest)
-  if (&from == this) return;
-  Clear();
-  MergeFrom(from);
-}
-
-PROTOBUF_NOINLINE bool DeleteTableRequest::IsInitialized() const {
-  return true;
-}
-
-::_pbi::CachedSize* DeleteTableRequest::AccessCachedSize() const {
-  return &_impl_._cached_size_;
-}
-void DeleteTableRequest::InternalSwap(DeleteTableRequest* PROTOBUF_RESTRICT other) {
-  using std::swap;
-  _internal_metadata_.InternalSwap(&other->_internal_metadata_);
-  swap(_impl_._has_bits_[0], other->_impl_._has_bits_[0]);
-  ::google::protobuf::internal::memswap<
-      PROTOBUF_FIELD_OFFSET(DeleteTableRequest, _impl_.table_to_remove_)
-      + sizeof(DeleteTableRequest::_impl_.table_to_remove_)
-      - PROTOBUF_FIELD_OFFSET(DeleteTableRequest, _impl_.input_table_)>(
-          reinterpret_cast<char*>(&_impl_.input_table_),
-          reinterpret_cast<char*>(&other->_impl_.input_table_));
-}
-
-::google::protobuf::Metadata DeleteTableRequest::GetMetadata() const {
-  return ::_pbi::AssignDescriptors(
-      &descriptor_table_deephaven_2fproto_2finputtable_2eproto_getter, &descriptor_table_deephaven_2fproto_2finputtable_2eproto_once,
-      file_level_metadata_deephaven_2fproto_2finputtable_2eproto[2]);
-}
-// ===================================================================
-
-class DeleteTableResponse::_Internal {
- public:
-};
-
-DeleteTableResponse::DeleteTableResponse(::google::protobuf::Arena* arena)
-    : ::google::protobuf::internal::ZeroFieldsBase(arena) {
-  // @@protoc_insertion_point(arena_constructor:io.deephaven.proto.backplane.grpc.DeleteTableResponse)
-}
-DeleteTableResponse::DeleteTableResponse(
-    ::google::protobuf::Arena* arena,
-    const DeleteTableResponse& from)
-    : ::google::protobuf::internal::ZeroFieldsBase(arena) {
-  DeleteTableResponse* const _this = this;
-  (void)_this;
-  _internal_metadata_.MergeFrom<::google::protobuf::UnknownFieldSet>(
-      from._internal_metadata_);
-
-  // @@protoc_insertion_point(copy_constructor:io.deephaven.proto.backplane.grpc.DeleteTableResponse)
-}
-
-
-
-
-
-
-
-
-
-::google::protobuf::Metadata DeleteTableResponse::GetMetadata() const {
-  return ::_pbi::AssignDescriptors(
-      &descriptor_table_deephaven_2fproto_2finputtable_2eproto_getter, &descriptor_table_deephaven_2fproto_2finputtable_2eproto_once,
-      file_level_metadata_deephaven_2fproto_2finputtable_2eproto[3]);
-}
-// @@protoc_insertion_point(namespace_scope)
-}  // namespace grpc
-}  // namespace backplane
-}  // namespace proto
-}  // namespace deephaven
-}  // namespace io
-namespace google {
-namespace protobuf {
-}  // namespace protobuf
-}  // namespace google
-// @@protoc_insertion_point(global_scope)
-#include "google/protobuf/port_undef.inc"
diff --git a/cpp-client/deephaven/dhclient/proto/deephaven/proto/inputtable.pb.h b/cpp-client/deephaven/dhclient/proto/deephaven/proto/inputtable.pb.h
deleted file mode 100644
index 00baa4ead2a..00000000000
--- a/cpp-client/deephaven/dhclient/proto/deephaven/proto/inputtable.pb.h
+++ /dev/null
@@ -1,1174 +0,0 @@
-// Generated by the protocol buffer compiler.  DO NOT EDIT!
-// source: deephaven/proto/inputtable.proto
-// Protobuf C++ Version: 4.25.3
-
-#ifndef GOOGLE_PROTOBUF_INCLUDED_deephaven_2fproto_2finputtable_2eproto_2epb_2eh
-#define GOOGLE_PROTOBUF_INCLUDED_deephaven_2fproto_2finputtable_2eproto_2epb_2eh
-
-#include <limits>
-#include <string>
-#include <type_traits>
-#include <utility>
-
-#include "google/protobuf/port_def.inc"
-#if PROTOBUF_VERSION < 4025000
-#error "This file was generated by a newer version of protoc which is"
-#error "incompatible with your Protocol Buffer headers. Please update"
-#error "your headers."
-#endif  // PROTOBUF_VERSION
-
-#if 4025003 < PROTOBUF_MIN_PROTOC_VERSION
-#error "This file was generated by an older version of protoc which is"
-#error "incompatible with your Protocol Buffer headers. Please"
-#error "regenerate this file with a newer version of protoc."
-#endif  // PROTOBUF_MIN_PROTOC_VERSION
-#include "google/protobuf/port_undef.inc"
-#include "google/protobuf/io/coded_stream.h"
-#include "google/protobuf/arena.h"
-#include "google/protobuf/arenastring.h"
-#include "google/protobuf/generated_message_bases.h"
-#include "google/protobuf/generated_message_tctable_decl.h"
-#include "google/protobuf/generated_message_util.h"
-#include "google/protobuf/metadata_lite.h"
-#include "google/protobuf/generated_message_reflection.h"
-#include "google/protobuf/message.h"
-#include "google/protobuf/repeated_field.h"  // IWYU pragma: export
-#include "google/protobuf/extension_set.h"  // IWYU pragma: export
-#include "google/protobuf/unknown_field_set.h"
-#include "deephaven/proto/ticket.pb.h"
-// @@protoc_insertion_point(includes)
-
-// Must be included last.
-#include "google/protobuf/port_def.inc"
-
-#define PROTOBUF_INTERNAL_EXPORT_deephaven_2fproto_2finputtable_2eproto
-
-namespace google {
-namespace protobuf {
-namespace internal {
-class AnyMetadata;
-}  // namespace internal
-}  // namespace protobuf
-}  // namespace google
-
-// Internal implementation detail -- do not use these members.
-struct TableStruct_deephaven_2fproto_2finputtable_2eproto {
-  static const ::uint32_t offsets[];
-};
-extern const ::google::protobuf::internal::DescriptorTable
-    descriptor_table_deephaven_2fproto_2finputtable_2eproto;
-namespace io {
-namespace deephaven {
-namespace proto {
-namespace backplane {
-namespace grpc {
-class AddTableRequest;
-struct AddTableRequestDefaultTypeInternal;
-extern AddTableRequestDefaultTypeInternal _AddTableRequest_default_instance_;
-class AddTableResponse;
-struct AddTableResponseDefaultTypeInternal;
-extern AddTableResponseDefaultTypeInternal _AddTableResponse_default_instance_;
-class DeleteTableRequest;
-struct DeleteTableRequestDefaultTypeInternal;
-extern DeleteTableRequestDefaultTypeInternal _DeleteTableRequest_default_instance_;
-class DeleteTableResponse;
-struct DeleteTableResponseDefaultTypeInternal;
-extern DeleteTableResponseDefaultTypeInternal _DeleteTableResponse_default_instance_;
-}  // namespace grpc
-}  // namespace backplane
-}  // namespace proto
-}  // namespace deephaven
-}  // namespace io
-namespace google {
-namespace protobuf {
-}  // namespace protobuf
-}  // namespace google
-
-namespace io {
-namespace deephaven {
-namespace proto {
-namespace backplane {
-namespace grpc {
-
-// ===================================================================
-
-
-// -------------------------------------------------------------------
-
-class DeleteTableResponse final :
-    public ::google::protobuf::internal::ZeroFieldsBase /* @@protoc_insertion_point(class_definition:io.deephaven.proto.backplane.grpc.DeleteTableResponse) */ {
- public:
-  inline DeleteTableResponse() : DeleteTableResponse(nullptr) {}
-  template<typename = void>
-  explicit PROTOBUF_CONSTEXPR DeleteTableResponse(::google::protobuf::internal::ConstantInitialized);
-
-  inline DeleteTableResponse(const DeleteTableResponse& from)
-      : DeleteTableResponse(nullptr, from) {}
-  DeleteTableResponse(DeleteTableResponse&& from) noexcept
-    : DeleteTableResponse() {
-    *this = ::std::move(from);
-  }
-
-  inline DeleteTableResponse& operator=(const DeleteTableResponse& from) {
-    CopyFrom(from);
-    return *this;
-  }
-  inline DeleteTableResponse& operator=(DeleteTableResponse&& from) noexcept {
-    if (this == &from) return *this;
-    if (GetArena() == from.GetArena()
-  #ifdef PROTOBUF_FORCE_COPY_IN_MOVE
-        && GetArena() != nullptr
-  #endif  // !PROTOBUF_FORCE_COPY_IN_MOVE
-    ) {
-      InternalSwap(&from);
-    } else {
-      CopyFrom(from);
-    }
-    return *this;
-  }
-
-  inline const ::google::protobuf::UnknownFieldSet& unknown_fields() const
-      ABSL_ATTRIBUTE_LIFETIME_BOUND {
-    return _internal_metadata_.unknown_fields<::google::protobuf::UnknownFieldSet>(::google::protobuf::UnknownFieldSet::default_instance);
-  }
-  inline ::google::protobuf::UnknownFieldSet* mutable_unknown_fields()
-      ABSL_ATTRIBUTE_LIFETIME_BOUND {
-    return _internal_metadata_.mutable_unknown_fields<::google::protobuf::UnknownFieldSet>();
-  }
-
-  static const ::google::protobuf::Descriptor* descriptor() {
-    return GetDescriptor();
-  }
-  static const ::google::protobuf::Descriptor* GetDescriptor() {
-    return default_instance().GetMetadata().descriptor;
-  }
-  static const ::google::protobuf::Reflection* GetReflection() {
-    return default_instance().GetMetadata().reflection;
-  }
-  static const DeleteTableResponse& default_instance() {
-    return *internal_default_instance();
-  }
-  static inline const DeleteTableResponse* internal_default_instance() {
-    return reinterpret_cast<const DeleteTableResponse*>(
-               &_DeleteTableResponse_default_instance_);
-  }
-  static constexpr int kIndexInFileMessages =
-    3;
-
-  friend void swap(DeleteTableResponse& a, DeleteTableResponse& b) {
-    a.Swap(&b);
-  }
-  inline void Swap(DeleteTableResponse* other) {
-    if (other == this) return;
-  #ifdef PROTOBUF_FORCE_COPY_IN_SWAP
-    if (GetArena() != nullptr &&
-        GetArena() == other->GetArena()) {
-   #else  // PROTOBUF_FORCE_COPY_IN_SWAP
-    if (GetArena() == other->GetArena()) {
-  #endif  // !PROTOBUF_FORCE_COPY_IN_SWAP
-      InternalSwap(other);
-    } else {
-      ::google::protobuf::internal::GenericSwap(this, other);
-    }
-  }
-  void UnsafeArenaSwap(DeleteTableResponse* other) {
-    if (other == this) return;
-    ABSL_DCHECK(GetArena() == other->GetArena());
-    InternalSwap(other);
-  }
-
-  // implements Message ----------------------------------------------
-
-  DeleteTableResponse* New(::google::protobuf::Arena* arena = nullptr) const final {
-    return CreateMaybeMessage<DeleteTableResponse>(arena);
-  }
-  using ::google::protobuf::internal::ZeroFieldsBase::CopyFrom;
-  inline void CopyFrom(const DeleteTableResponse& from) {
-    ::google::protobuf::internal::ZeroFieldsBase::CopyImpl(*this, from);
-  }
-  using ::google::protobuf::internal::ZeroFieldsBase::MergeFrom;
-  void MergeFrom(const DeleteTableResponse& from) {
-    ::google::protobuf::internal::ZeroFieldsBase::MergeImpl(*this, from);
-  }
-  public:
-
-  private:
-  friend class ::google::protobuf::internal::AnyMetadata;
-  static ::absl::string_view FullMessageName() {
-    return "io.deephaven.proto.backplane.grpc.DeleteTableResponse";
-  }
-  protected:
-  explicit DeleteTableResponse(::google::protobuf::Arena* arena);
-  DeleteTableResponse(::google::protobuf::Arena* arena, const DeleteTableResponse& from);
-  public:
-
-  ::google::protobuf::Metadata GetMetadata() const final;
-
-  // nested types ----------------------------------------------------
-
-  // accessors -------------------------------------------------------
-
-  // @@protoc_insertion_point(class_scope:io.deephaven.proto.backplane.grpc.DeleteTableResponse)
- private:
-  class _Internal;
-
-  friend class ::google::protobuf::MessageLite;
-  friend class ::google::protobuf::Arena;
-  template <typename T>
-  friend class ::google::protobuf::Arena::InternalHelper;
-  using InternalArenaConstructable_ = void;
-  using DestructorSkippable_ = void;
-  struct Impl_ {
-
-        inline explicit constexpr Impl_(
-            ::google::protobuf::internal::ConstantInitialized) noexcept;
-        inline explicit Impl_(::google::protobuf::internal::InternalVisibility visibility,
-                              ::google::protobuf::Arena* arena);
-        inline explicit Impl_(::google::protobuf::internal::InternalVisibility visibility,
-                              ::google::protobuf::Arena* arena, const Impl_& from);
-    PROTOBUF_TSAN_DECLARE_MEMBER
-  };
-  friend struct ::TableStruct_deephaven_2fproto_2finputtable_2eproto;
-};// -------------------------------------------------------------------
-
-class AddTableResponse final :
-    public ::google::protobuf::internal::ZeroFieldsBase /* @@protoc_insertion_point(class_definition:io.deephaven.proto.backplane.grpc.AddTableResponse) */ {
- public:
-  inline AddTableResponse() : AddTableResponse(nullptr) {}
-  template<typename = void>
-  explicit PROTOBUF_CONSTEXPR AddTableResponse(::google::protobuf::internal::ConstantInitialized);
-
-  inline AddTableResponse(const AddTableResponse& from)
-      : AddTableResponse(nullptr, from) {}
-  AddTableResponse(AddTableResponse&& from) noexcept
-    : AddTableResponse() {
-    *this = ::std::move(from);
-  }
-
-  inline AddTableResponse& operator=(const AddTableResponse& from) {
-    CopyFrom(from);
-    return *this;
-  }
-  inline AddTableResponse& operator=(AddTableResponse&& from) noexcept {
-    if (this == &from) return *this;
-    if (GetArena() == from.GetArena()
-  #ifdef PROTOBUF_FORCE_COPY_IN_MOVE
-        && GetArena() != nullptr
-  #endif  // !PROTOBUF_FORCE_COPY_IN_MOVE
-    ) {
-      InternalSwap(&from);
-    } else {
-      CopyFrom(from);
-    }
-    return *this;
-  }
-
-  inline const ::google::protobuf::UnknownFieldSet& unknown_fields() const
-      ABSL_ATTRIBUTE_LIFETIME_BOUND {
-    return _internal_metadata_.unknown_fields<::google::protobuf::UnknownFieldSet>(::google::protobuf::UnknownFieldSet::default_instance);
-  }
-  inline ::google::protobuf::UnknownFieldSet* mutable_unknown_fields()
-      ABSL_ATTRIBUTE_LIFETIME_BOUND {
-    return _internal_metadata_.mutable_unknown_fields<::google::protobuf::UnknownFieldSet>();
-  }
-
-  static const ::google::protobuf::Descriptor* descriptor() {
-    return GetDescriptor();
-  }
-  static const ::google::protobuf::Descriptor* GetDescriptor() {
-    return default_instance().GetMetadata().descriptor;
-  }
-  static const ::google::protobuf::Reflection* GetReflection() {
-    return default_instance().GetMetadata().reflection;
-  }
-  static const AddTableResponse& default_instance() {
-    return *internal_default_instance();
-  }
-  static inline const AddTableResponse* internal_default_instance() {
-    return reinterpret_cast<const AddTableResponse*>(
-               &_AddTableResponse_default_instance_);
-  }
-  static constexpr int kIndexInFileMessages =
-    1;
-
-  friend void swap(AddTableResponse& a, AddTableResponse& b) {
-    a.Swap(&b);
-  }
-  inline void Swap(AddTableResponse* other) {
-    if (other == this) return;
-  #ifdef PROTOBUF_FORCE_COPY_IN_SWAP
-    if (GetArena() != nullptr &&
-        GetArena() == other->GetArena()) {
-   #else  // PROTOBUF_FORCE_COPY_IN_SWAP
-    if (GetArena() == other->GetArena()) {
-  #endif  // !PROTOBUF_FORCE_COPY_IN_SWAP
-      InternalSwap(other);
-    } else {
-      ::google::protobuf::internal::GenericSwap(this, other);
-    }
-  }
-  void UnsafeArenaSwap(AddTableResponse* other) {
-    if (other == this) return;
-    ABSL_DCHECK(GetArena() == other->GetArena());
-    InternalSwap(other);
-  }
-
-  // implements Message ----------------------------------------------
-
-  AddTableResponse* New(::google::protobuf::Arena* arena = nullptr) const final {
-    return CreateMaybeMessage<AddTableResponse>(arena);
-  }
-  using ::google::protobuf::internal::ZeroFieldsBase::CopyFrom;
-  inline void CopyFrom(const AddTableResponse& from) {
-    ::google::protobuf::internal::ZeroFieldsBase::CopyImpl(*this, from);
-  }
-  using ::google::protobuf::internal::ZeroFieldsBase::MergeFrom;
-  void MergeFrom(const AddTableResponse& from) {
-    ::google::protobuf::internal::ZeroFieldsBase::MergeImpl(*this, from);
-  }
-  public:
-
-  private:
-  friend class ::google::protobuf::internal::AnyMetadata;
-  static ::absl::string_view FullMessageName() {
-    return "io.deephaven.proto.backplane.grpc.AddTableResponse";
-  }
-  protected:
-  explicit AddTableResponse(::google::protobuf::Arena* arena);
-  AddTableResponse(::google::protobuf::Arena* arena, const AddTableResponse& from);
-  public:
-
-  ::google::protobuf::Metadata GetMetadata() const final;
-
-  // nested types ----------------------------------------------------
-
-  // accessors -------------------------------------------------------
-
-  // @@protoc_insertion_point(class_scope:io.deephaven.proto.backplane.grpc.AddTableResponse)
- private:
-  class _Internal;
-
-  friend class ::google::protobuf::MessageLite;
-  friend class ::google::protobuf::Arena;
-  template <typename T>
-  friend class ::google::protobuf::Arena::InternalHelper;
-  using InternalArenaConstructable_ = void;
-  using DestructorSkippable_ = void;
-  struct Impl_ {
-
-        inline explicit constexpr Impl_(
-            ::google::protobuf::internal::ConstantInitialized) noexcept;
-        inline explicit Impl_(::google::protobuf::internal::InternalVisibility visibility,
-                              ::google::protobuf::Arena* arena);
-        inline explicit Impl_(::google::protobuf::internal::InternalVisibility visibility,
-                              ::google::protobuf::Arena* arena, const Impl_& from);
-    PROTOBUF_TSAN_DECLARE_MEMBER
-  };
-  friend struct ::TableStruct_deephaven_2fproto_2finputtable_2eproto;
-};// -------------------------------------------------------------------
-
-class DeleteTableRequest final :
-    public ::google::protobuf::Message /* @@protoc_insertion_point(class_definition:io.deephaven.proto.backplane.grpc.DeleteTableRequest) */ {
- public:
-  inline DeleteTableRequest() : DeleteTableRequest(nullptr) {}
-  ~DeleteTableRequest() override;
-  template<typename = void>
-  explicit PROTOBUF_CONSTEXPR DeleteTableRequest(::google::protobuf::internal::ConstantInitialized);
-
-  inline DeleteTableRequest(const DeleteTableRequest& from)
-      : DeleteTableRequest(nullptr, from) {}
-  DeleteTableRequest(DeleteTableRequest&& from) noexcept
-    : DeleteTableRequest() {
-    *this = ::std::move(from);
-  }
-
-  inline DeleteTableRequest& operator=(const DeleteTableRequest& from) {
-    CopyFrom(from);
-    return *this;
-  }
-  inline DeleteTableRequest& operator=(DeleteTableRequest&& from) noexcept {
-    if (this == &from) return *this;
-    if (GetArena() == from.GetArena()
-  #ifdef PROTOBUF_FORCE_COPY_IN_MOVE
-        && GetArena() != nullptr
-  #endif  // !PROTOBUF_FORCE_COPY_IN_MOVE
-    ) {
-      InternalSwap(&from);
-    } else {
-      CopyFrom(from);
-    }
-    return *this;
-  }
-
-  inline const ::google::protobuf::UnknownFieldSet& unknown_fields() const
-      ABSL_ATTRIBUTE_LIFETIME_BOUND {
-    return _internal_metadata_.unknown_fields<::google::protobuf::UnknownFieldSet>(::google::protobuf::UnknownFieldSet::default_instance);
-  }
-  inline ::google::protobuf::UnknownFieldSet* mutable_unknown_fields()
-      ABSL_ATTRIBUTE_LIFETIME_BOUND {
-    return _internal_metadata_.mutable_unknown_fields<::google::protobuf::UnknownFieldSet>();
-  }
-
-  static const ::google::protobuf::Descriptor* descriptor() {
-    return GetDescriptor();
-  }
-  static const ::google::protobuf::Descriptor* GetDescriptor() {
-    return default_instance().GetMetadata().descriptor;
-  }
-  static const ::google::protobuf::Reflection* GetReflection() {
-    return default_instance().GetMetadata().reflection;
-  }
-  static const DeleteTableRequest& default_instance() {
-    return *internal_default_instance();
-  }
-  static inline const DeleteTableRequest* internal_default_instance() {
-    return reinterpret_cast<const DeleteTableRequest*>(
-               &_DeleteTableRequest_default_instance_);
-  }
-  static constexpr int kIndexInFileMessages =
-    2;
-
-  friend void swap(DeleteTableRequest& a, DeleteTableRequest& b) {
-    a.Swap(&b);
-  }
-  inline void Swap(DeleteTableRequest* other) {
-    if (other == this) return;
-  #ifdef PROTOBUF_FORCE_COPY_IN_SWAP
-    if (GetArena() != nullptr &&
-        GetArena() == other->GetArena()) {
-   #else  // PROTOBUF_FORCE_COPY_IN_SWAP
-    if (GetArena() == other->GetArena()) {
-  #endif  // !PROTOBUF_FORCE_COPY_IN_SWAP
-      InternalSwap(other);
-    } else {
-      ::google::protobuf::internal::GenericSwap(this, other);
-    }
-  }
-  void UnsafeArenaSwap(DeleteTableRequest* other) {
-    if (other == this) return;
-    ABSL_DCHECK(GetArena() == other->GetArena());
-    InternalSwap(other);
-  }
-
-  // implements Message ----------------------------------------------
-
-  DeleteTableRequest* New(::google::protobuf::Arena* arena = nullptr) const final {
-    return CreateMaybeMessage<DeleteTableRequest>(arena);
-  }
-  using ::google::protobuf::Message::CopyFrom;
-  void CopyFrom(const DeleteTableRequest& from);
-  using ::google::protobuf::Message::MergeFrom;
-  void MergeFrom( const DeleteTableRequest& from) {
-    DeleteTableRequest::MergeImpl(*this, from);
-  }
-  private:
-  static void MergeImpl(::google::protobuf::Message& to_msg, const ::google::protobuf::Message& from_msg);
-  public:
-  PROTOBUF_ATTRIBUTE_REINITIALIZES void Clear() final;
-  bool IsInitialized() const final;
-
-  ::size_t ByteSizeLong() const final;
-  const char* _InternalParse(const char* ptr, ::google::protobuf::internal::ParseContext* ctx) final;
-  ::uint8_t* _InternalSerialize(
-      ::uint8_t* target, ::google::protobuf::io::EpsCopyOutputStream* stream) const final;
-  int GetCachedSize() const { return _impl_._cached_size_.Get(); }
-
-  private:
-  ::google::protobuf::internal::CachedSize* AccessCachedSize() const final;
-  void SharedCtor(::google::protobuf::Arena* arena);
-  void SharedDtor();
-  void InternalSwap(DeleteTableRequest* other);
-
-  private:
-  friend class ::google::protobuf::internal::AnyMetadata;
-  static ::absl::string_view FullMessageName() {
-    return "io.deephaven.proto.backplane.grpc.DeleteTableRequest";
-  }
-  protected:
-  explicit DeleteTableRequest(::google::protobuf::Arena* arena);
-  DeleteTableRequest(::google::protobuf::Arena* arena, const DeleteTableRequest& from);
-  public:
-
-  static const ClassData _class_data_;
-  const ::google::protobuf::Message::ClassData*GetClassData() const final;
-
-  ::google::protobuf::Metadata GetMetadata() const final;
-
-  // nested types ----------------------------------------------------
-
-  // accessors -------------------------------------------------------
-
-  enum : int {
-    kInputTableFieldNumber = 1,
-    kTableToRemoveFieldNumber = 2,
-  };
-  // .io.deephaven.proto.backplane.grpc.Ticket input_table = 1;
-  bool has_input_table() const;
-  void clear_input_table() ;
-  const ::io::deephaven::proto::backplane::grpc::Ticket& input_table() const;
-  PROTOBUF_NODISCARD ::io::deephaven::proto::backplane::grpc::Ticket* release_input_table();
-  ::io::deephaven::proto::backplane::grpc::Ticket* mutable_input_table();
-  void set_allocated_input_table(::io::deephaven::proto::backplane::grpc::Ticket* value);
-  void unsafe_arena_set_allocated_input_table(::io::deephaven::proto::backplane::grpc::Ticket* value);
-  ::io::deephaven::proto::backplane::grpc::Ticket* unsafe_arena_release_input_table();
-
-  private:
-  const ::io::deephaven::proto::backplane::grpc::Ticket& _internal_input_table() const;
-  ::io::deephaven::proto::backplane::grpc::Ticket* _internal_mutable_input_table();
-
-  public:
-  // .io.deephaven.proto.backplane.grpc.Ticket table_to_remove = 2;
-  bool has_table_to_remove() const;
-  void clear_table_to_remove() ;
-  const ::io::deephaven::proto::backplane::grpc::Ticket& table_to_remove() const;
-  PROTOBUF_NODISCARD ::io::deephaven::proto::backplane::grpc::Ticket* release_table_to_remove();
-  ::io::deephaven::proto::backplane::grpc::Ticket* mutable_table_to_remove();
-  void set_allocated_table_to_remove(::io::deephaven::proto::backplane::grpc::Ticket* value);
-  void unsafe_arena_set_allocated_table_to_remove(::io::deephaven::proto::backplane::grpc::Ticket* value);
-  ::io::deephaven::proto::backplane::grpc::Ticket* unsafe_arena_release_table_to_remove();
-
-  private:
-  const ::io::deephaven::proto::backplane::grpc::Ticket& _internal_table_to_remove() const;
-  ::io::deephaven::proto::backplane::grpc::Ticket* _internal_mutable_table_to_remove();
-
-  public:
-  // @@protoc_insertion_point(class_scope:io.deephaven.proto.backplane.grpc.DeleteTableRequest)
- private:
-  class _Internal;
-
-  friend class ::google::protobuf::internal::TcParser;
-  static const ::google::protobuf::internal::TcParseTable<
-      1, 2, 2,
-      0, 2>
-      _table_;
-  friend class ::google::protobuf::MessageLite;
-  friend class ::google::protobuf::Arena;
-  template <typename T>
-  friend class ::google::protobuf::Arena::InternalHelper;
-  using InternalArenaConstructable_ = void;
-  using DestructorSkippable_ = void;
-  struct Impl_ {
-
-        inline explicit constexpr Impl_(
-            ::google::protobuf::internal::ConstantInitialized) noexcept;
-        inline explicit Impl_(::google::protobuf::internal::InternalVisibility visibility,
-                              ::google::protobuf::Arena* arena);
-        inline explicit Impl_(::google::protobuf::internal::InternalVisibility visibility,
-                              ::google::protobuf::Arena* arena, const Impl_& from);
-    ::google::protobuf::internal::HasBits<1> _has_bits_;
-    mutable ::google::protobuf::internal::CachedSize _cached_size_;
-    ::io::deephaven::proto::backplane::grpc::Ticket* input_table_;
-    ::io::deephaven::proto::backplane::grpc::Ticket* table_to_remove_;
-    PROTOBUF_TSAN_DECLARE_MEMBER
-  };
-  union { Impl_ _impl_; };
-  friend struct ::TableStruct_deephaven_2fproto_2finputtable_2eproto;
-};// -------------------------------------------------------------------
-
-class AddTableRequest final :
-    public ::google::protobuf::Message /* @@protoc_insertion_point(class_definition:io.deephaven.proto.backplane.grpc.AddTableRequest) */ {
- public:
-  inline AddTableRequest() : AddTableRequest(nullptr) {}
-  ~AddTableRequest() override;
-  template<typename = void>
-  explicit PROTOBUF_CONSTEXPR AddTableRequest(::google::protobuf::internal::ConstantInitialized);
-
-  inline AddTableRequest(const AddTableRequest& from)
-      : AddTableRequest(nullptr, from) {}
-  AddTableRequest(AddTableRequest&& from) noexcept
-    : AddTableRequest() {
-    *this = ::std::move(from);
-  }
-
-  inline AddTableRequest& operator=(const AddTableRequest& from) {
-    CopyFrom(from);
-    return *this;
-  }
-  inline AddTableRequest& operator=(AddTableRequest&& from) noexcept {
-    if (this == &from) return *this;
-    if (GetArena() == from.GetArena()
-  #ifdef PROTOBUF_FORCE_COPY_IN_MOVE
-        && GetArena() != nullptr
-  #endif  // !PROTOBUF_FORCE_COPY_IN_MOVE
-    ) {
-      InternalSwap(&from);
-    } else {
-      CopyFrom(from);
-    }
-    return *this;
-  }
-
-  inline const ::google::protobuf::UnknownFieldSet& unknown_fields() const
-      ABSL_ATTRIBUTE_LIFETIME_BOUND {
-    return _internal_metadata_.unknown_fields<::google::protobuf::UnknownFieldSet>(::google::protobuf::UnknownFieldSet::default_instance);
-  }
-  inline ::google::protobuf::UnknownFieldSet* mutable_unknown_fields()
-      ABSL_ATTRIBUTE_LIFETIME_BOUND {
-    return _internal_metadata_.mutable_unknown_fields<::google::protobuf::UnknownFieldSet>();
-  }
-
-  static const ::google::protobuf::Descriptor* descriptor() {
-    return GetDescriptor();
-  }
-  static const ::google::protobuf::Descriptor* GetDescriptor() {
-    return default_instance().GetMetadata().descriptor;
-  }
-  static const ::google::protobuf::Reflection* GetReflection() {
-    return default_instance().GetMetadata().reflection;
-  }
-  static const AddTableRequest& default_instance() {
-    return *internal_default_instance();
-  }
-  static inline const AddTableRequest* internal_default_instance() {
-    return reinterpret_cast<const AddTableRequest*>(
-               &_AddTableRequest_default_instance_);
-  }
-  static constexpr int kIndexInFileMessages =
-    0;
-
-  friend void swap(AddTableRequest& a, AddTableRequest& b) {
-    a.Swap(&b);
-  }
-  inline void Swap(AddTableRequest* other) {
-    if (other == this) return;
-  #ifdef PROTOBUF_FORCE_COPY_IN_SWAP
-    if (GetArena() != nullptr &&
-        GetArena() == other->GetArena()) {
-   #else  // PROTOBUF_FORCE_COPY_IN_SWAP
-    if (GetArena() == other->GetArena()) {
-  #endif  // !PROTOBUF_FORCE_COPY_IN_SWAP
-      InternalSwap(other);
-    } else {
-      ::google::protobuf::internal::GenericSwap(this, other);
-    }
-  }
-  void UnsafeArenaSwap(AddTableRequest* other) {
-    if (other == this) return;
-    ABSL_DCHECK(GetArena() == other->GetArena());
-    InternalSwap(other);
-  }
-
-  // implements Message ----------------------------------------------
-
-  AddTableRequest* New(::google::protobuf::Arena* arena = nullptr) const final {
-    return CreateMaybeMessage<AddTableRequest>(arena);
-  }
-  using ::google::protobuf::Message::CopyFrom;
-  void CopyFrom(const AddTableRequest& from);
-  using ::google::protobuf::Message::MergeFrom;
-  void MergeFrom( const AddTableRequest& from) {
-    AddTableRequest::MergeImpl(*this, from);
-  }
-  private:
-  static void MergeImpl(::google::protobuf::Message& to_msg, const ::google::protobuf::Message& from_msg);
-  public:
-  PROTOBUF_ATTRIBUTE_REINITIALIZES void Clear() final;
-  bool IsInitialized() const final;
-
-  ::size_t ByteSizeLong() const final;
-  const char* _InternalParse(const char* ptr, ::google::protobuf::internal::ParseContext* ctx) final;
-  ::uint8_t* _InternalSerialize(
-      ::uint8_t* target, ::google::protobuf::io::EpsCopyOutputStream* stream) const final;
-  int GetCachedSize() const { return _impl_._cached_size_.Get(); }
-
-  private:
-  ::google::protobuf::internal::CachedSize* AccessCachedSize() const final;
-  void SharedCtor(::google::protobuf::Arena* arena);
-  void SharedDtor();
-  void InternalSwap(AddTableRequest* other);
-
-  private:
-  friend class ::google::protobuf::internal::AnyMetadata;
-  static ::absl::string_view FullMessageName() {
-    return "io.deephaven.proto.backplane.grpc.AddTableRequest";
-  }
-  protected:
-  explicit AddTableRequest(::google::protobuf::Arena* arena);
-  AddTableRequest(::google::protobuf::Arena* arena, const AddTableRequest& from);
-  public:
-
-  static const ClassData _class_data_;
-  const ::google::protobuf::Message::ClassData*GetClassData() const final;
-
-  ::google::protobuf::Metadata GetMetadata() const final;
-
-  // nested types ----------------------------------------------------
-
-  // accessors -------------------------------------------------------
-
-  enum : int {
-    kInputTableFieldNumber = 1,
-    kTableToAddFieldNumber = 2,
-  };
-  // .io.deephaven.proto.backplane.grpc.Ticket input_table = 1;
-  bool has_input_table() const;
-  void clear_input_table() ;
-  const ::io::deephaven::proto::backplane::grpc::Ticket& input_table() const;
-  PROTOBUF_NODISCARD ::io::deephaven::proto::backplane::grpc::Ticket* release_input_table();
-  ::io::deephaven::proto::backplane::grpc::Ticket* mutable_input_table();
-  void set_allocated_input_table(::io::deephaven::proto::backplane::grpc::Ticket* value);
-  void unsafe_arena_set_allocated_input_table(::io::deephaven::proto::backplane::grpc::Ticket* value);
-  ::io::deephaven::proto::backplane::grpc::Ticket* unsafe_arena_release_input_table();
-
-  private:
-  const ::io::deephaven::proto::backplane::grpc::Ticket& _internal_input_table() const;
-  ::io::deephaven::proto::backplane::grpc::Ticket* _internal_mutable_input_table();
-
-  public:
-  // .io.deephaven.proto.backplane.grpc.Ticket table_to_add = 2;
-  bool has_table_to_add() const;
-  void clear_table_to_add() ;
-  const ::io::deephaven::proto::backplane::grpc::Ticket& table_to_add() const;
-  PROTOBUF_NODISCARD ::io::deephaven::proto::backplane::grpc::Ticket* release_table_to_add();
-  ::io::deephaven::proto::backplane::grpc::Ticket* mutable_table_to_add();
-  void set_allocated_table_to_add(::io::deephaven::proto::backplane::grpc::Ticket* value);
-  void unsafe_arena_set_allocated_table_to_add(::io::deephaven::proto::backplane::grpc::Ticket* value);
-  ::io::deephaven::proto::backplane::grpc::Ticket* unsafe_arena_release_table_to_add();
-
-  private:
-  const ::io::deephaven::proto::backplane::grpc::Ticket& _internal_table_to_add() const;
-  ::io::deephaven::proto::backplane::grpc::Ticket* _internal_mutable_table_to_add();
-
-  public:
-  // @@protoc_insertion_point(class_scope:io.deephaven.proto.backplane.grpc.AddTableRequest)
- private:
-  class _Internal;
-
-  friend class ::google::protobuf::internal::TcParser;
-  static const ::google::protobuf::internal::TcParseTable<
-      1, 2, 2,
-      0, 2>
-      _table_;
-  friend class ::google::protobuf::MessageLite;
-  friend class ::google::protobuf::Arena;
-  template <typename T>
-  friend class ::google::protobuf::Arena::InternalHelper;
-  using InternalArenaConstructable_ = void;
-  using DestructorSkippable_ = void;
-  struct Impl_ {
-
-        inline explicit constexpr Impl_(
-            ::google::protobuf::internal::ConstantInitialized) noexcept;
-        inline explicit Impl_(::google::protobuf::internal::InternalVisibility visibility,
-                              ::google::protobuf::Arena* arena);
-        inline explicit Impl_(::google::protobuf::internal::InternalVisibility visibility,
-                              ::google::protobuf::Arena* arena, const Impl_& from);
-    ::google::protobuf::internal::HasBits<1> _has_bits_;
-    mutable ::google::protobuf::internal::CachedSize _cached_size_;
-    ::io::deephaven::proto::backplane::grpc::Ticket* input_table_;
-    ::io::deephaven::proto::backplane::grpc::Ticket* table_to_add_;
-    PROTOBUF_TSAN_DECLARE_MEMBER
-  };
-  union { Impl_ _impl_; };
-  friend struct ::TableStruct_deephaven_2fproto_2finputtable_2eproto;
-};
-
-// ===================================================================
-
-
-
-
-// ===================================================================
-
-
-#ifdef __GNUC__
-#pragma GCC diagnostic push
-#pragma GCC diagnostic ignored "-Wstrict-aliasing"
-#endif  // __GNUC__
-// -------------------------------------------------------------------
-
-// AddTableRequest
-
-// .io.deephaven.proto.backplane.grpc.Ticket input_table = 1;
-inline bool AddTableRequest::has_input_table() const {
-  bool value = (_impl_._has_bits_[0] & 0x00000001u) != 0;
-  PROTOBUF_ASSUME(!value || _impl_.input_table_ != nullptr);
-  return value;
-}
-inline const ::io::deephaven::proto::backplane::grpc::Ticket& AddTableRequest::_internal_input_table() const {
-  PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race);
-  const ::io::deephaven::proto::backplane::grpc::Ticket* p = _impl_.input_table_;
-  return p != nullptr ? *p : reinterpret_cast<const ::io::deephaven::proto::backplane::grpc::Ticket&>(::io::deephaven::proto::backplane::grpc::_Ticket_default_instance_);
-}
-inline const ::io::deephaven::proto::backplane::grpc::Ticket& AddTableRequest::input_table() const ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  // @@protoc_insertion_point(field_get:io.deephaven.proto.backplane.grpc.AddTableRequest.input_table)
-  return _internal_input_table();
-}
-inline void AddTableRequest::unsafe_arena_set_allocated_input_table(::io::deephaven::proto::backplane::grpc::Ticket* value) {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  if (GetArena() == nullptr) {
-    delete reinterpret_cast<::google::protobuf::MessageLite*>(_impl_.input_table_);
-  }
-  _impl_.input_table_ = reinterpret_cast<::io::deephaven::proto::backplane::grpc::Ticket*>(value);
-  if (value != nullptr) {
-    _impl_._has_bits_[0] |= 0x00000001u;
-  } else {
-    _impl_._has_bits_[0] &= ~0x00000001u;
-  }
-  // @@protoc_insertion_point(field_unsafe_arena_set_allocated:io.deephaven.proto.backplane.grpc.AddTableRequest.input_table)
-}
-inline ::io::deephaven::proto::backplane::grpc::Ticket* AddTableRequest::release_input_table() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-
-  _impl_._has_bits_[0] &= ~0x00000001u;
-  ::io::deephaven::proto::backplane::grpc::Ticket* released = _impl_.input_table_;
-  _impl_.input_table_ = nullptr;
-#ifdef PROTOBUF_FORCE_COPY_IN_RELEASE
-  auto* old = reinterpret_cast<::google::protobuf::MessageLite*>(released);
-  released = ::google::protobuf::internal::DuplicateIfNonNull(released);
-  if (GetArena() == nullptr) {
-    delete old;
-  }
-#else   // PROTOBUF_FORCE_COPY_IN_RELEASE
-  if (GetArena() != nullptr) {
-    released = ::google::protobuf::internal::DuplicateIfNonNull(released);
-  }
-#endif  // !PROTOBUF_FORCE_COPY_IN_RELEASE
-  return released;
-}
-inline ::io::deephaven::proto::backplane::grpc::Ticket* AddTableRequest::unsafe_arena_release_input_table() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  // @@protoc_insertion_point(field_release:io.deephaven.proto.backplane.grpc.AddTableRequest.input_table)
-
-  _impl_._has_bits_[0] &= ~0x00000001u;
-  ::io::deephaven::proto::backplane::grpc::Ticket* temp = _impl_.input_table_;
-  _impl_.input_table_ = nullptr;
-  return temp;
-}
-inline ::io::deephaven::proto::backplane::grpc::Ticket* AddTableRequest::_internal_mutable_input_table() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  _impl_._has_bits_[0] |= 0x00000001u;
-  if (_impl_.input_table_ == nullptr) {
-    auto* p = CreateMaybeMessage<::io::deephaven::proto::backplane::grpc::Ticket>(GetArena());
-    _impl_.input_table_ = reinterpret_cast<::io::deephaven::proto::backplane::grpc::Ticket*>(p);
-  }
-  return _impl_.input_table_;
-}
-inline ::io::deephaven::proto::backplane::grpc::Ticket* AddTableRequest::mutable_input_table() ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  ::io::deephaven::proto::backplane::grpc::Ticket* _msg = _internal_mutable_input_table();
-  // @@protoc_insertion_point(field_mutable:io.deephaven.proto.backplane.grpc.AddTableRequest.input_table)
-  return _msg;
-}
-inline void AddTableRequest::set_allocated_input_table(::io::deephaven::proto::backplane::grpc::Ticket* value) {
-  ::google::protobuf::Arena* message_arena = GetArena();
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  if (message_arena == nullptr) {
-    delete reinterpret_cast<::google::protobuf::MessageLite*>(_impl_.input_table_);
-  }
-
-  if (value != nullptr) {
-    ::google::protobuf::Arena* submessage_arena = reinterpret_cast<::google::protobuf::MessageLite*>(value)->GetArena();
-    if (message_arena != submessage_arena) {
-      value = ::google::protobuf::internal::GetOwnedMessage(message_arena, value, submessage_arena);
-    }
-    _impl_._has_bits_[0] |= 0x00000001u;
-  } else {
-    _impl_._has_bits_[0] &= ~0x00000001u;
-  }
-
-  _impl_.input_table_ = reinterpret_cast<::io::deephaven::proto::backplane::grpc::Ticket*>(value);
-  // @@protoc_insertion_point(field_set_allocated:io.deephaven.proto.backplane.grpc.AddTableRequest.input_table)
-}
-
-// .io.deephaven.proto.backplane.grpc.Ticket table_to_add = 2;
-inline bool AddTableRequest::has_table_to_add() const {
-  bool value = (_impl_._has_bits_[0] & 0x00000002u) != 0;
-  PROTOBUF_ASSUME(!value || _impl_.table_to_add_ != nullptr);
-  return value;
-}
-inline const ::io::deephaven::proto::backplane::grpc::Ticket& AddTableRequest::_internal_table_to_add() const {
-  PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race);
-  const ::io::deephaven::proto::backplane::grpc::Ticket* p = _impl_.table_to_add_;
-  return p != nullptr ? *p : reinterpret_cast<const ::io::deephaven::proto::backplane::grpc::Ticket&>(::io::deephaven::proto::backplane::grpc::_Ticket_default_instance_);
-}
-inline const ::io::deephaven::proto::backplane::grpc::Ticket& AddTableRequest::table_to_add() const ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  // @@protoc_insertion_point(field_get:io.deephaven.proto.backplane.grpc.AddTableRequest.table_to_add)
-  return _internal_table_to_add();
-}
-inline void AddTableRequest::unsafe_arena_set_allocated_table_to_add(::io::deephaven::proto::backplane::grpc::Ticket* value) {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  if (GetArena() == nullptr) {
-    delete reinterpret_cast<::google::protobuf::MessageLite*>(_impl_.table_to_add_);
-  }
-  _impl_.table_to_add_ = reinterpret_cast<::io::deephaven::proto::backplane::grpc::Ticket*>(value);
-  if (value != nullptr) {
-    _impl_._has_bits_[0] |= 0x00000002u;
-  } else {
-    _impl_._has_bits_[0] &= ~0x00000002u;
-  }
-  // @@protoc_insertion_point(field_unsafe_arena_set_allocated:io.deephaven.proto.backplane.grpc.AddTableRequest.table_to_add)
-}
-inline ::io::deephaven::proto::backplane::grpc::Ticket* AddTableRequest::release_table_to_add() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-
-  _impl_._has_bits_[0] &= ~0x00000002u;
-  ::io::deephaven::proto::backplane::grpc::Ticket* released = _impl_.table_to_add_;
-  _impl_.table_to_add_ = nullptr;
-#ifdef PROTOBUF_FORCE_COPY_IN_RELEASE
-  auto* old = reinterpret_cast<::google::protobuf::MessageLite*>(released);
-  released = ::google::protobuf::internal::DuplicateIfNonNull(released);
-  if (GetArena() == nullptr) {
-    delete old;
-  }
-#else   // PROTOBUF_FORCE_COPY_IN_RELEASE
-  if (GetArena() != nullptr) {
-    released = ::google::protobuf::internal::DuplicateIfNonNull(released);
-  }
-#endif  // !PROTOBUF_FORCE_COPY_IN_RELEASE
-  return released;
-}
-inline ::io::deephaven::proto::backplane::grpc::Ticket* AddTableRequest::unsafe_arena_release_table_to_add() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  // @@protoc_insertion_point(field_release:io.deephaven.proto.backplane.grpc.AddTableRequest.table_to_add)
-
-  _impl_._has_bits_[0] &= ~0x00000002u;
-  ::io::deephaven::proto::backplane::grpc::Ticket* temp = _impl_.table_to_add_;
-  _impl_.table_to_add_ = nullptr;
-  return temp;
-}
-inline ::io::deephaven::proto::backplane::grpc::Ticket* AddTableRequest::_internal_mutable_table_to_add() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  _impl_._has_bits_[0] |= 0x00000002u;
-  if (_impl_.table_to_add_ == nullptr) {
-    auto* p = CreateMaybeMessage<::io::deephaven::proto::backplane::grpc::Ticket>(GetArena());
-    _impl_.table_to_add_ = reinterpret_cast<::io::deephaven::proto::backplane::grpc::Ticket*>(p);
-  }
-  return _impl_.table_to_add_;
-}
-inline ::io::deephaven::proto::backplane::grpc::Ticket* AddTableRequest::mutable_table_to_add() ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  ::io::deephaven::proto::backplane::grpc::Ticket* _msg = _internal_mutable_table_to_add();
-  // @@protoc_insertion_point(field_mutable:io.deephaven.proto.backplane.grpc.AddTableRequest.table_to_add)
-  return _msg;
-}
-inline void AddTableRequest::set_allocated_table_to_add(::io::deephaven::proto::backplane::grpc::Ticket* value) {
-  ::google::protobuf::Arena* message_arena = GetArena();
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  if (message_arena == nullptr) {
-    delete reinterpret_cast<::google::protobuf::MessageLite*>(_impl_.table_to_add_);
-  }
-
-  if (value != nullptr) {
-    ::google::protobuf::Arena* submessage_arena = reinterpret_cast<::google::protobuf::MessageLite*>(value)->GetArena();
-    if (message_arena != submessage_arena) {
-      value = ::google::protobuf::internal::GetOwnedMessage(message_arena, value, submessage_arena);
-    }
-    _impl_._has_bits_[0] |= 0x00000002u;
-  } else {
-    _impl_._has_bits_[0] &= ~0x00000002u;
-  }
-
-  _impl_.table_to_add_ = reinterpret_cast<::io::deephaven::proto::backplane::grpc::Ticket*>(value);
-  // @@protoc_insertion_point(field_set_allocated:io.deephaven.proto.backplane.grpc.AddTableRequest.table_to_add)
-}
-
-// -------------------------------------------------------------------
-
-// AddTableResponse
-
-// -------------------------------------------------------------------
-
-// DeleteTableRequest
-
-// .io.deephaven.proto.backplane.grpc.Ticket input_table = 1;
-inline bool DeleteTableRequest::has_input_table() const {
-  bool value = (_impl_._has_bits_[0] & 0x00000001u) != 0;
-  PROTOBUF_ASSUME(!value || _impl_.input_table_ != nullptr);
-  return value;
-}
-inline const ::io::deephaven::proto::backplane::grpc::Ticket& DeleteTableRequest::_internal_input_table() const {
-  PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race);
-  const ::io::deephaven::proto::backplane::grpc::Ticket* p = _impl_.input_table_;
-  return p != nullptr ? *p : reinterpret_cast<const ::io::deephaven::proto::backplane::grpc::Ticket&>(::io::deephaven::proto::backplane::grpc::_Ticket_default_instance_);
-}
-inline const ::io::deephaven::proto::backplane::grpc::Ticket& DeleteTableRequest::input_table() const ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  // @@protoc_insertion_point(field_get:io.deephaven.proto.backplane.grpc.DeleteTableRequest.input_table)
-  return _internal_input_table();
-}
-inline void DeleteTableRequest::unsafe_arena_set_allocated_input_table(::io::deephaven::proto::backplane::grpc::Ticket* value) {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  if (GetArena() == nullptr) {
-    delete reinterpret_cast<::google::protobuf::MessageLite*>(_impl_.input_table_);
-  }
-  _impl_.input_table_ = reinterpret_cast<::io::deephaven::proto::backplane::grpc::Ticket*>(value);
-  if (value != nullptr) {
-    _impl_._has_bits_[0] |= 0x00000001u;
-  } else {
-    _impl_._has_bits_[0] &= ~0x00000001u;
-  }
-  // @@protoc_insertion_point(field_unsafe_arena_set_allocated:io.deephaven.proto.backplane.grpc.DeleteTableRequest.input_table)
-}
-inline ::io::deephaven::proto::backplane::grpc::Ticket* DeleteTableRequest::release_input_table() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-
-  _impl_._has_bits_[0] &= ~0x00000001u;
-  ::io::deephaven::proto::backplane::grpc::Ticket* released = _impl_.input_table_;
-  _impl_.input_table_ = nullptr;
-#ifdef PROTOBUF_FORCE_COPY_IN_RELEASE
-  auto* old = reinterpret_cast<::google::protobuf::MessageLite*>(released);
-  released = ::google::protobuf::internal::DuplicateIfNonNull(released);
-  if (GetArena() == nullptr) {
-    delete old;
-  }
-#else   // PROTOBUF_FORCE_COPY_IN_RELEASE
-  if (GetArena() != nullptr) {
-    released = ::google::protobuf::internal::DuplicateIfNonNull(released);
-  }
-#endif  // !PROTOBUF_FORCE_COPY_IN_RELEASE
-  return released;
-}
-inline ::io::deephaven::proto::backplane::grpc::Ticket* DeleteTableRequest::unsafe_arena_release_input_table() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  // @@protoc_insertion_point(field_release:io.deephaven.proto.backplane.grpc.DeleteTableRequest.input_table)
-
-  _impl_._has_bits_[0] &= ~0x00000001u;
-  ::io::deephaven::proto::backplane::grpc::Ticket* temp = _impl_.input_table_;
-  _impl_.input_table_ = nullptr;
-  return temp;
-}
-inline ::io::deephaven::proto::backplane::grpc::Ticket* DeleteTableRequest::_internal_mutable_input_table() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  _impl_._has_bits_[0] |= 0x00000001u;
-  if (_impl_.input_table_ == nullptr) {
-    auto* p = CreateMaybeMessage<::io::deephaven::proto::backplane::grpc::Ticket>(GetArena());
-    _impl_.input_table_ = reinterpret_cast<::io::deephaven::proto::backplane::grpc::Ticket*>(p);
-  }
-  return _impl_.input_table_;
-}
-inline ::io::deephaven::proto::backplane::grpc::Ticket* DeleteTableRequest::mutable_input_table() ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  ::io::deephaven::proto::backplane::grpc::Ticket* _msg = _internal_mutable_input_table();
-  // @@protoc_insertion_point(field_mutable:io.deephaven.proto.backplane.grpc.DeleteTableRequest.input_table)
-  return _msg;
-}
-inline void DeleteTableRequest::set_allocated_input_table(::io::deephaven::proto::backplane::grpc::Ticket* value) {
-  ::google::protobuf::Arena* message_arena = GetArena();
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  if (message_arena == nullptr) {
-    delete reinterpret_cast<::google::protobuf::MessageLite*>(_impl_.input_table_);
-  }
-
-  if (value != nullptr) {
-    ::google::protobuf::Arena* submessage_arena = reinterpret_cast<::google::protobuf::MessageLite*>(value)->GetArena();
-    if (message_arena != submessage_arena) {
-      value = ::google::protobuf::internal::GetOwnedMessage(message_arena, value, submessage_arena);
-    }
-    _impl_._has_bits_[0] |= 0x00000001u;
-  } else {
-    _impl_._has_bits_[0] &= ~0x00000001u;
-  }
-
-  _impl_.input_table_ = reinterpret_cast<::io::deephaven::proto::backplane::grpc::Ticket*>(value);
-  // @@protoc_insertion_point(field_set_allocated:io.deephaven.proto.backplane.grpc.DeleteTableRequest.input_table)
-}
-
-// .io.deephaven.proto.backplane.grpc.Ticket table_to_remove = 2;
-inline bool DeleteTableRequest::has_table_to_remove() const {
-  bool value = (_impl_._has_bits_[0] & 0x00000002u) != 0;
-  PROTOBUF_ASSUME(!value || _impl_.table_to_remove_ != nullptr);
-  return value;
-}
-inline const ::io::deephaven::proto::backplane::grpc::Ticket& DeleteTableRequest::_internal_table_to_remove() const {
-  PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race);
-  const ::io::deephaven::proto::backplane::grpc::Ticket* p = _impl_.table_to_remove_;
-  return p != nullptr ? *p : reinterpret_cast<const ::io::deephaven::proto::backplane::grpc::Ticket&>(::io::deephaven::proto::backplane::grpc::_Ticket_default_instance_);
-}
-inline const ::io::deephaven::proto::backplane::grpc::Ticket& DeleteTableRequest::table_to_remove() const ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  // @@protoc_insertion_point(field_get:io.deephaven.proto.backplane.grpc.DeleteTableRequest.table_to_remove)
-  return _internal_table_to_remove();
-}
-inline void DeleteTableRequest::unsafe_arena_set_allocated_table_to_remove(::io::deephaven::proto::backplane::grpc::Ticket* value) {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  if (GetArena() == nullptr) {
-    delete reinterpret_cast<::google::protobuf::MessageLite*>(_impl_.table_to_remove_);
-  }
-  _impl_.table_to_remove_ = reinterpret_cast<::io::deephaven::proto::backplane::grpc::Ticket*>(value);
-  if (value != nullptr) {
-    _impl_._has_bits_[0] |= 0x00000002u;
-  } else {
-    _impl_._has_bits_[0] &= ~0x00000002u;
-  }
-  // @@protoc_insertion_point(field_unsafe_arena_set_allocated:io.deephaven.proto.backplane.grpc.DeleteTableRequest.table_to_remove)
-}
-inline ::io::deephaven::proto::backplane::grpc::Ticket* DeleteTableRequest::release_table_to_remove() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-
-  _impl_._has_bits_[0] &= ~0x00000002u;
-  ::io::deephaven::proto::backplane::grpc::Ticket* released = _impl_.table_to_remove_;
-  _impl_.table_to_remove_ = nullptr;
-#ifdef PROTOBUF_FORCE_COPY_IN_RELEASE
-  auto* old = reinterpret_cast<::google::protobuf::MessageLite*>(released);
-  released = ::google::protobuf::internal::DuplicateIfNonNull(released);
-  if (GetArena() == nullptr) {
-    delete old;
-  }
-#else   // PROTOBUF_FORCE_COPY_IN_RELEASE
-  if (GetArena() != nullptr) {
-    released = ::google::protobuf::internal::DuplicateIfNonNull(released);
-  }
-#endif  // !PROTOBUF_FORCE_COPY_IN_RELEASE
-  return released;
-}
-inline ::io::deephaven::proto::backplane::grpc::Ticket* DeleteTableRequest::unsafe_arena_release_table_to_remove() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  // @@protoc_insertion_point(field_release:io.deephaven.proto.backplane.grpc.DeleteTableRequest.table_to_remove)
-
-  _impl_._has_bits_[0] &= ~0x00000002u;
-  ::io::deephaven::proto::backplane::grpc::Ticket* temp = _impl_.table_to_remove_;
-  _impl_.table_to_remove_ = nullptr;
-  return temp;
-}
-inline ::io::deephaven::proto::backplane::grpc::Ticket* DeleteTableRequest::_internal_mutable_table_to_remove() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  _impl_._has_bits_[0] |= 0x00000002u;
-  if (_impl_.table_to_remove_ == nullptr) {
-    auto* p = CreateMaybeMessage<::io::deephaven::proto::backplane::grpc::Ticket>(GetArena());
-    _impl_.table_to_remove_ = reinterpret_cast<::io::deephaven::proto::backplane::grpc::Ticket*>(p);
-  }
-  return _impl_.table_to_remove_;
-}
-inline ::io::deephaven::proto::backplane::grpc::Ticket* DeleteTableRequest::mutable_table_to_remove() ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  ::io::deephaven::proto::backplane::grpc::Ticket* _msg = _internal_mutable_table_to_remove();
-  // @@protoc_insertion_point(field_mutable:io.deephaven.proto.backplane.grpc.DeleteTableRequest.table_to_remove)
-  return _msg;
-}
-inline void DeleteTableRequest::set_allocated_table_to_remove(::io::deephaven::proto::backplane::grpc::Ticket* value) {
-  ::google::protobuf::Arena* message_arena = GetArena();
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  if (message_arena == nullptr) {
-    delete reinterpret_cast<::google::protobuf::MessageLite*>(_impl_.table_to_remove_);
-  }
-
-  if (value != nullptr) {
-    ::google::protobuf::Arena* submessage_arena = reinterpret_cast<::google::protobuf::MessageLite*>(value)->GetArena();
-    if (message_arena != submessage_arena) {
-      value = ::google::protobuf::internal::GetOwnedMessage(message_arena, value, submessage_arena);
-    }
-    _impl_._has_bits_[0] |= 0x00000002u;
-  } else {
-    _impl_._has_bits_[0] &= ~0x00000002u;
-  }
-
-  _impl_.table_to_remove_ = reinterpret_cast<::io::deephaven::proto::backplane::grpc::Ticket*>(value);
-  // @@protoc_insertion_point(field_set_allocated:io.deephaven.proto.backplane.grpc.DeleteTableRequest.table_to_remove)
-}
-
-// -------------------------------------------------------------------
-
-// DeleteTableResponse
-
-#ifdef __GNUC__
-#pragma GCC diagnostic pop
-#endif  // __GNUC__
-
-// @@protoc_insertion_point(namespace_scope)
-}  // namespace grpc
-}  // namespace backplane
-}  // namespace proto
-}  // namespace deephaven
-}  // namespace io
-
-
-// @@protoc_insertion_point(global_scope)
-
-#include "google/protobuf/port_undef.inc"
-
-#endif  // GOOGLE_PROTOBUF_INCLUDED_deephaven_2fproto_2finputtable_2eproto_2epb_2eh
diff --git a/cpp-client/deephaven/dhclient/proto/deephaven/proto/object.grpc.pb.cc b/cpp-client/deephaven/dhclient/proto/deephaven/proto/object.grpc.pb.cc
deleted file mode 100644
index 8f72aabe983..00000000000
--- a/cpp-client/deephaven/dhclient/proto/deephaven/proto/object.grpc.pb.cc
+++ /dev/null
@@ -1,205 +0,0 @@
-// Generated by the gRPC C++ plugin.
-// If you make any local change, they will be lost.
-// source: deephaven/proto/object.proto
-
-#include "deephaven/proto/object.pb.h"
-#include "deephaven/proto/object.grpc.pb.h"
-
-#include <functional>
-#include <grpcpp/support/async_stream.h>
-#include <grpcpp/support/async_unary_call.h>
-#include <grpcpp/impl/channel_interface.h>
-#include <grpcpp/impl/client_unary_call.h>
-#include <grpcpp/support/client_callback.h>
-#include <grpcpp/support/message_allocator.h>
-#include <grpcpp/support/method_handler.h>
-#include <grpcpp/impl/rpc_service_method.h>
-#include <grpcpp/support/server_callback.h>
-#include <grpcpp/impl/server_callback_handlers.h>
-#include <grpcpp/server_context.h>
-#include <grpcpp/impl/service_type.h>
-#include <grpcpp/support/sync_stream.h>
-namespace io {
-namespace deephaven {
-namespace proto {
-namespace backplane {
-namespace grpc {
-
-static const char* ObjectService_method_names[] = {
-  "/io.deephaven.proto.backplane.grpc.ObjectService/FetchObject",
-  "/io.deephaven.proto.backplane.grpc.ObjectService/MessageStream",
-  "/io.deephaven.proto.backplane.grpc.ObjectService/OpenMessageStream",
-  "/io.deephaven.proto.backplane.grpc.ObjectService/NextMessageStream",
-};
-
-std::unique_ptr< ObjectService::Stub> ObjectService::NewStub(const std::shared_ptr< ::grpc::ChannelInterface>& channel, const ::grpc::StubOptions& options) {
-  (void)options;
-  std::unique_ptr< ObjectService::Stub> stub(new ObjectService::Stub(channel, options));
-  return stub;
-}
-
-ObjectService::Stub::Stub(const std::shared_ptr< ::grpc::ChannelInterface>& channel, const ::grpc::StubOptions& options)
-  : channel_(channel), rpcmethod_FetchObject_(ObjectService_method_names[0], options.suffix_for_stats(),::grpc::internal::RpcMethod::NORMAL_RPC, channel)
-  , rpcmethod_MessageStream_(ObjectService_method_names[1], options.suffix_for_stats(),::grpc::internal::RpcMethod::BIDI_STREAMING, channel)
-  , rpcmethod_OpenMessageStream_(ObjectService_method_names[2], options.suffix_for_stats(),::grpc::internal::RpcMethod::SERVER_STREAMING, channel)
-  , rpcmethod_NextMessageStream_(ObjectService_method_names[3], options.suffix_for_stats(),::grpc::internal::RpcMethod::NORMAL_RPC, channel)
-  {}
-
-::grpc::Status ObjectService::Stub::FetchObject(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::FetchObjectRequest& request, ::io::deephaven::proto::backplane::grpc::FetchObjectResponse* response) {
-  return ::grpc::internal::BlockingUnaryCall< ::io::deephaven::proto::backplane::grpc::FetchObjectRequest, ::io::deephaven::proto::backplane::grpc::FetchObjectResponse, ::grpc::protobuf::MessageLite, ::grpc::protobuf::MessageLite>(channel_.get(), rpcmethod_FetchObject_, context, request, response);
-}
-
-void ObjectService::Stub::async::FetchObject(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::FetchObjectRequest* request, ::io::deephaven::proto::backplane::grpc::FetchObjectResponse* response, std::function<void(::grpc::Status)> f) {
-  ::grpc::internal::CallbackUnaryCall< ::io::deephaven::proto::backplane::grpc::FetchObjectRequest, ::io::deephaven::proto::backplane::grpc::FetchObjectResponse, ::grpc::protobuf::MessageLite, ::grpc::protobuf::MessageLite>(stub_->channel_.get(), stub_->rpcmethod_FetchObject_, context, request, response, std::move(f));
-}
-
-void ObjectService::Stub::async::FetchObject(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::FetchObjectRequest* request, ::io::deephaven::proto::backplane::grpc::FetchObjectResponse* response, ::grpc::ClientUnaryReactor* reactor) {
-  ::grpc::internal::ClientCallbackUnaryFactory::Create< ::grpc::protobuf::MessageLite, ::grpc::protobuf::MessageLite>(stub_->channel_.get(), stub_->rpcmethod_FetchObject_, context, request, response, reactor);
-}
-
-::grpc::ClientAsyncResponseReader< ::io::deephaven::proto::backplane::grpc::FetchObjectResponse>* ObjectService::Stub::PrepareAsyncFetchObjectRaw(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::FetchObjectRequest& request, ::grpc::CompletionQueue* cq) {
-  return ::grpc::internal::ClientAsyncResponseReaderHelper::Create< ::io::deephaven::proto::backplane::grpc::FetchObjectResponse, ::io::deephaven::proto::backplane::grpc::FetchObjectRequest, ::grpc::protobuf::MessageLite, ::grpc::protobuf::MessageLite>(channel_.get(), cq, rpcmethod_FetchObject_, context, request);
-}
-
-::grpc::ClientAsyncResponseReader< ::io::deephaven::proto::backplane::grpc::FetchObjectResponse>* ObjectService::Stub::AsyncFetchObjectRaw(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::FetchObjectRequest& request, ::grpc::CompletionQueue* cq) {
-  auto* result =
-    this->PrepareAsyncFetchObjectRaw(context, request, cq);
-  result->StartCall();
-  return result;
-}
-
-::grpc::ClientReaderWriter< ::io::deephaven::proto::backplane::grpc::StreamRequest, ::io::deephaven::proto::backplane::grpc::StreamResponse>* ObjectService::Stub::MessageStreamRaw(::grpc::ClientContext* context) {
-  return ::grpc::internal::ClientReaderWriterFactory< ::io::deephaven::proto::backplane::grpc::StreamRequest, ::io::deephaven::proto::backplane::grpc::StreamResponse>::Create(channel_.get(), rpcmethod_MessageStream_, context);
-}
-
-void ObjectService::Stub::async::MessageStream(::grpc::ClientContext* context, ::grpc::ClientBidiReactor< ::io::deephaven::proto::backplane::grpc::StreamRequest,::io::deephaven::proto::backplane::grpc::StreamResponse>* reactor) {
-  ::grpc::internal::ClientCallbackReaderWriterFactory< ::io::deephaven::proto::backplane::grpc::StreamRequest,::io::deephaven::proto::backplane::grpc::StreamResponse>::Create(stub_->channel_.get(), stub_->rpcmethod_MessageStream_, context, reactor);
-}
-
-::grpc::ClientAsyncReaderWriter< ::io::deephaven::proto::backplane::grpc::StreamRequest, ::io::deephaven::proto::backplane::grpc::StreamResponse>* ObjectService::Stub::AsyncMessageStreamRaw(::grpc::ClientContext* context, ::grpc::CompletionQueue* cq, void* tag) {
-  return ::grpc::internal::ClientAsyncReaderWriterFactory< ::io::deephaven::proto::backplane::grpc::StreamRequest, ::io::deephaven::proto::backplane::grpc::StreamResponse>::Create(channel_.get(), cq, rpcmethod_MessageStream_, context, true, tag);
-}
-
-::grpc::ClientAsyncReaderWriter< ::io::deephaven::proto::backplane::grpc::StreamRequest, ::io::deephaven::proto::backplane::grpc::StreamResponse>* ObjectService::Stub::PrepareAsyncMessageStreamRaw(::grpc::ClientContext* context, ::grpc::CompletionQueue* cq) {
-  return ::grpc::internal::ClientAsyncReaderWriterFactory< ::io::deephaven::proto::backplane::grpc::StreamRequest, ::io::deephaven::proto::backplane::grpc::StreamResponse>::Create(channel_.get(), cq, rpcmethod_MessageStream_, context, false, nullptr);
-}
-
-::grpc::ClientReader< ::io::deephaven::proto::backplane::grpc::StreamResponse>* ObjectService::Stub::OpenMessageStreamRaw(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::StreamRequest& request) {
-  return ::grpc::internal::ClientReaderFactory< ::io::deephaven::proto::backplane::grpc::StreamResponse>::Create(channel_.get(), rpcmethod_OpenMessageStream_, context, request);
-}
-
-void ObjectService::Stub::async::OpenMessageStream(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::StreamRequest* request, ::grpc::ClientReadReactor< ::io::deephaven::proto::backplane::grpc::StreamResponse>* reactor) {
-  ::grpc::internal::ClientCallbackReaderFactory< ::io::deephaven::proto::backplane::grpc::StreamResponse>::Create(stub_->channel_.get(), stub_->rpcmethod_OpenMessageStream_, context, request, reactor);
-}
-
-::grpc::ClientAsyncReader< ::io::deephaven::proto::backplane::grpc::StreamResponse>* ObjectService::Stub::AsyncOpenMessageStreamRaw(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::StreamRequest& request, ::grpc::CompletionQueue* cq, void* tag) {
-  return ::grpc::internal::ClientAsyncReaderFactory< ::io::deephaven::proto::backplane::grpc::StreamResponse>::Create(channel_.get(), cq, rpcmethod_OpenMessageStream_, context, request, true, tag);
-}
-
-::grpc::ClientAsyncReader< ::io::deephaven::proto::backplane::grpc::StreamResponse>* ObjectService::Stub::PrepareAsyncOpenMessageStreamRaw(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::StreamRequest& request, ::grpc::CompletionQueue* cq) {
-  return ::grpc::internal::ClientAsyncReaderFactory< ::io::deephaven::proto::backplane::grpc::StreamResponse>::Create(channel_.get(), cq, rpcmethod_OpenMessageStream_, context, request, false, nullptr);
-}
-
-::grpc::Status ObjectService::Stub::NextMessageStream(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::StreamRequest& request, ::io::deephaven::proto::backplane::grpc::BrowserNextResponse* response) {
-  return ::grpc::internal::BlockingUnaryCall< ::io::deephaven::proto::backplane::grpc::StreamRequest, ::io::deephaven::proto::backplane::grpc::BrowserNextResponse, ::grpc::protobuf::MessageLite, ::grpc::protobuf::MessageLite>(channel_.get(), rpcmethod_NextMessageStream_, context, request, response);
-}
-
-void ObjectService::Stub::async::NextMessageStream(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::StreamRequest* request, ::io::deephaven::proto::backplane::grpc::BrowserNextResponse* response, std::function<void(::grpc::Status)> f) {
-  ::grpc::internal::CallbackUnaryCall< ::io::deephaven::proto::backplane::grpc::StreamRequest, ::io::deephaven::proto::backplane::grpc::BrowserNextResponse, ::grpc::protobuf::MessageLite, ::grpc::protobuf::MessageLite>(stub_->channel_.get(), stub_->rpcmethod_NextMessageStream_, context, request, response, std::move(f));
-}
-
-void ObjectService::Stub::async::NextMessageStream(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::StreamRequest* request, ::io::deephaven::proto::backplane::grpc::BrowserNextResponse* response, ::grpc::ClientUnaryReactor* reactor) {
-  ::grpc::internal::ClientCallbackUnaryFactory::Create< ::grpc::protobuf::MessageLite, ::grpc::protobuf::MessageLite>(stub_->channel_.get(), stub_->rpcmethod_NextMessageStream_, context, request, response, reactor);
-}
-
-::grpc::ClientAsyncResponseReader< ::io::deephaven::proto::backplane::grpc::BrowserNextResponse>* ObjectService::Stub::PrepareAsyncNextMessageStreamRaw(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::StreamRequest& request, ::grpc::CompletionQueue* cq) {
-  return ::grpc::internal::ClientAsyncResponseReaderHelper::Create< ::io::deephaven::proto::backplane::grpc::BrowserNextResponse, ::io::deephaven::proto::backplane::grpc::StreamRequest, ::grpc::protobuf::MessageLite, ::grpc::protobuf::MessageLite>(channel_.get(), cq, rpcmethod_NextMessageStream_, context, request);
-}
-
-::grpc::ClientAsyncResponseReader< ::io::deephaven::proto::backplane::grpc::BrowserNextResponse>* ObjectService::Stub::AsyncNextMessageStreamRaw(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::StreamRequest& request, ::grpc::CompletionQueue* cq) {
-  auto* result =
-    this->PrepareAsyncNextMessageStreamRaw(context, request, cq);
-  result->StartCall();
-  return result;
-}
-
-ObjectService::Service::Service() {
-  AddMethod(new ::grpc::internal::RpcServiceMethod(
-      ObjectService_method_names[0],
-      ::grpc::internal::RpcMethod::NORMAL_RPC,
-      new ::grpc::internal::RpcMethodHandler< ObjectService::Service, ::io::deephaven::proto::backplane::grpc::FetchObjectRequest, ::io::deephaven::proto::backplane::grpc::FetchObjectResponse, ::grpc::protobuf::MessageLite, ::grpc::protobuf::MessageLite>(
-          [](ObjectService::Service* service,
-             ::grpc::ServerContext* ctx,
-             const ::io::deephaven::proto::backplane::grpc::FetchObjectRequest* req,
-             ::io::deephaven::proto::backplane::grpc::FetchObjectResponse* resp) {
-               return service->FetchObject(ctx, req, resp);
-             }, this)));
-  AddMethod(new ::grpc::internal::RpcServiceMethod(
-      ObjectService_method_names[1],
-      ::grpc::internal::RpcMethod::BIDI_STREAMING,
-      new ::grpc::internal::BidiStreamingHandler< ObjectService::Service, ::io::deephaven::proto::backplane::grpc::StreamRequest, ::io::deephaven::proto::backplane::grpc::StreamResponse>(
-          [](ObjectService::Service* service,
-             ::grpc::ServerContext* ctx,
-             ::grpc::ServerReaderWriter<::io::deephaven::proto::backplane::grpc::StreamResponse,
-             ::io::deephaven::proto::backplane::grpc::StreamRequest>* stream) {
-               return service->MessageStream(ctx, stream);
-             }, this)));
-  AddMethod(new ::grpc::internal::RpcServiceMethod(
-      ObjectService_method_names[2],
-      ::grpc::internal::RpcMethod::SERVER_STREAMING,
-      new ::grpc::internal::ServerStreamingHandler< ObjectService::Service, ::io::deephaven::proto::backplane::grpc::StreamRequest, ::io::deephaven::proto::backplane::grpc::StreamResponse>(
-          [](ObjectService::Service* service,
-             ::grpc::ServerContext* ctx,
-             const ::io::deephaven::proto::backplane::grpc::StreamRequest* req,
-             ::grpc::ServerWriter<::io::deephaven::proto::backplane::grpc::StreamResponse>* writer) {
-               return service->OpenMessageStream(ctx, req, writer);
-             }, this)));
-  AddMethod(new ::grpc::internal::RpcServiceMethod(
-      ObjectService_method_names[3],
-      ::grpc::internal::RpcMethod::NORMAL_RPC,
-      new ::grpc::internal::RpcMethodHandler< ObjectService::Service, ::io::deephaven::proto::backplane::grpc::StreamRequest, ::io::deephaven::proto::backplane::grpc::BrowserNextResponse, ::grpc::protobuf::MessageLite, ::grpc::protobuf::MessageLite>(
-          [](ObjectService::Service* service,
-             ::grpc::ServerContext* ctx,
-             const ::io::deephaven::proto::backplane::grpc::StreamRequest* req,
-             ::io::deephaven::proto::backplane::grpc::BrowserNextResponse* resp) {
-               return service->NextMessageStream(ctx, req, resp);
-             }, this)));
-}
-
-ObjectService::Service::~Service() {
-}
-
-::grpc::Status ObjectService::Service::FetchObject(::grpc::ServerContext* context, const ::io::deephaven::proto::backplane::grpc::FetchObjectRequest* request, ::io::deephaven::proto::backplane::grpc::FetchObjectResponse* response) {
-  (void) context;
-  (void) request;
-  (void) response;
-  return ::grpc::Status(::grpc::StatusCode::UNIMPLEMENTED, "");
-}
-
-::grpc::Status ObjectService::Service::MessageStream(::grpc::ServerContext* context, ::grpc::ServerReaderWriter< ::io::deephaven::proto::backplane::grpc::StreamResponse, ::io::deephaven::proto::backplane::grpc::StreamRequest>* stream) {
-  (void) context;
-  (void) stream;
-  return ::grpc::Status(::grpc::StatusCode::UNIMPLEMENTED, "");
-}
-
-::grpc::Status ObjectService::Service::OpenMessageStream(::grpc::ServerContext* context, const ::io::deephaven::proto::backplane::grpc::StreamRequest* request, ::grpc::ServerWriter< ::io::deephaven::proto::backplane::grpc::StreamResponse>* writer) {
-  (void) context;
-  (void) request;
-  (void) writer;
-  return ::grpc::Status(::grpc::StatusCode::UNIMPLEMENTED, "");
-}
-
-::grpc::Status ObjectService::Service::NextMessageStream(::grpc::ServerContext* context, const ::io::deephaven::proto::backplane::grpc::StreamRequest* request, ::io::deephaven::proto::backplane::grpc::BrowserNextResponse* response) {
-  (void) context;
-  (void) request;
-  (void) response;
-  return ::grpc::Status(::grpc::StatusCode::UNIMPLEMENTED, "");
-}
-
-
-}  // namespace io
-}  // namespace deephaven
-}  // namespace proto
-}  // namespace backplane
-}  // namespace grpc
-
diff --git a/cpp-client/deephaven/dhclient/proto/deephaven/proto/object.grpc.pb.h b/cpp-client/deephaven/dhclient/proto/deephaven/proto/object.grpc.pb.h
deleted file mode 100644
index a6c7b2bbf60..00000000000
--- a/cpp-client/deephaven/dhclient/proto/deephaven/proto/object.grpc.pb.h
+++ /dev/null
@@ -1,848 +0,0 @@
-// Generated by the gRPC C++ plugin.
-// If you make any local change, they will be lost.
-// source: deephaven/proto/object.proto
-// Original file comments:
-//
-// Copyright (c) 2016-2022 Deephaven Data Labs and Patent Pending
-#ifndef GRPC_deephaven_2fproto_2fobject_2eproto__INCLUDED
-#define GRPC_deephaven_2fproto_2fobject_2eproto__INCLUDED
-
-#include "deephaven/proto/object.pb.h"
-
-#include <functional>
-#include <grpcpp/generic/async_generic_service.h>
-#include <grpcpp/support/async_stream.h>
-#include <grpcpp/support/async_unary_call.h>
-#include <grpcpp/support/client_callback.h>
-#include <grpcpp/client_context.h>
-#include <grpcpp/completion_queue.h>
-#include <grpcpp/support/message_allocator.h>
-#include <grpcpp/support/method_handler.h>
-#include <grpcpp/impl/proto_utils.h>
-#include <grpcpp/impl/rpc_method.h>
-#include <grpcpp/support/server_callback.h>
-#include <grpcpp/impl/server_callback_handlers.h>
-#include <grpcpp/server_context.h>
-#include <grpcpp/impl/service_type.h>
-#include <grpcpp/support/status.h>
-#include <grpcpp/support/stub_options.h>
-#include <grpcpp/support/sync_stream.h>
-
-namespace io {
-namespace deephaven {
-namespace proto {
-namespace backplane {
-namespace grpc {
-
-class ObjectService final {
- public:
-  static constexpr char const* service_full_name() {
-    return "io.deephaven.proto.backplane.grpc.ObjectService";
-  }
-  class StubInterface {
-   public:
-    virtual ~StubInterface() {}
-    //
-    // Fetches a server-side object as a binary payload and assorted other tickets pointing at
-    // other server-side objects that may need to be read to properly use this payload. The binary
-    // format is implementation specific, but the implementation should be specified by the "type"
-    // identifier in the typed ticket.
-    //
-    // Deprecated in favor of MessageStream, which is able to handle the same content.
-    virtual ::grpc::Status FetchObject(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::FetchObjectRequest& request, ::io::deephaven::proto::backplane::grpc::FetchObjectResponse* response) = 0;
-    std::unique_ptr< ::grpc::ClientAsyncResponseReaderInterface< ::io::deephaven::proto::backplane::grpc::FetchObjectResponse>> AsyncFetchObject(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::FetchObjectRequest& request, ::grpc::CompletionQueue* cq) {
-      return std::unique_ptr< ::grpc::ClientAsyncResponseReaderInterface< ::io::deephaven::proto::backplane::grpc::FetchObjectResponse>>(AsyncFetchObjectRaw(context, request, cq));
-    }
-    std::unique_ptr< ::grpc::ClientAsyncResponseReaderInterface< ::io::deephaven::proto::backplane::grpc::FetchObjectResponse>> PrepareAsyncFetchObject(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::FetchObjectRequest& request, ::grpc::CompletionQueue* cq) {
-      return std::unique_ptr< ::grpc::ClientAsyncResponseReaderInterface< ::io::deephaven::proto::backplane::grpc::FetchObjectResponse>>(PrepareAsyncFetchObjectRaw(context, request, cq));
-    }
-    //
-    // Provides a generic stream feature for Deephaven instances to use to add arbitrary functionality.
-    // Presently these take the form of "object type plugins", where server-side code can specify how
-    // an object could be serialized and/or communicate with a client. This gRPC stream is somewhat lower level
-    // than the plugin API, giving the server and client APIs features to correctly establish and
-    // control the stream. At this time, this is limited to a "ConnectRequest" to start the call.
-    //
-    // The first message sent to the server is expected to have a ConnectRequest, indicating which
-    // export ticket to connect to. It is an error for the client to attempt to connect to an object
-    // that has no plugin for its object type installed.
-    //
-    // The first request sent by the client should be a ConnectRequest. No other client message should
-    // be sent until the server responds. The server will respond with Data as soon as it is able (i.e.
-    // once the object in question has been resolved and the plugin has responded), indicating that the
-    // request was successful. After that point, the client may send Data requests.
-    //
-    // All replies from the server to the client contain Data instances. When sent from the server to
-    // the client, Data contains a bytes payload created by the server implementation of the plugin,
-    // and server-created export tickets containing any object references specified to be sent by the
-    // server-side plugin. As server-created exports, they are already resolved, and can be fetched or
-    // otherwise referenced right away. The client API is expected to wrap those tickets in appropriate
-    // objects, and the client is expected to release those tickets as appropriate, according to the
-    // plugin's use case. Note that it is possible for the "type" field to be null, indicating that
-    // there is no corresponding ObjectType plugin for these exported objects. This limits the client
-    // to specifying those tickets in a subsequent request, or releasing the ticket to let the object
-    // be garbage collected on the server.
-    //
-    // All Data instances sent from the client likewise contain a bytes payload, and may contain
-    // references to objects that already exist or may soon exist on the server, not just tickets sent
-    // by this same plugin. Note however that if those tickets are not yet resolved, neither the current
-    // Data nor subsequent requests can be processed by the plugin, as the required references can't be
-    // resolved.
-    //
-    // Presently there is no explicit "close" message to send, but plugin implementations can devise
-    // their own "half-close" protocol if they so choose. For now, if one end closes the connection,
-    // the other is expected to follow suit by closing their end too. At present, if there is an error
-    // with the stream, it is conveyed to the client in the usual gRPC fashion, but the server plugin
-    // will only be informed that the stream closed.
-    //
-    std::unique_ptr< ::grpc::ClientReaderWriterInterface< ::io::deephaven::proto::backplane::grpc::StreamRequest, ::io::deephaven::proto::backplane::grpc::StreamResponse>> MessageStream(::grpc::ClientContext* context) {
-      return std::unique_ptr< ::grpc::ClientReaderWriterInterface< ::io::deephaven::proto::backplane::grpc::StreamRequest, ::io::deephaven::proto::backplane::grpc::StreamResponse>>(MessageStreamRaw(context));
-    }
-    std::unique_ptr< ::grpc::ClientAsyncReaderWriterInterface< ::io::deephaven::proto::backplane::grpc::StreamRequest, ::io::deephaven::proto::backplane::grpc::StreamResponse>> AsyncMessageStream(::grpc::ClientContext* context, ::grpc::CompletionQueue* cq, void* tag) {
-      return std::unique_ptr< ::grpc::ClientAsyncReaderWriterInterface< ::io::deephaven::proto::backplane::grpc::StreamRequest, ::io::deephaven::proto::backplane::grpc::StreamResponse>>(AsyncMessageStreamRaw(context, cq, tag));
-    }
-    std::unique_ptr< ::grpc::ClientAsyncReaderWriterInterface< ::io::deephaven::proto::backplane::grpc::StreamRequest, ::io::deephaven::proto::backplane::grpc::StreamResponse>> PrepareAsyncMessageStream(::grpc::ClientContext* context, ::grpc::CompletionQueue* cq) {
-      return std::unique_ptr< ::grpc::ClientAsyncReaderWriterInterface< ::io::deephaven::proto::backplane::grpc::StreamRequest, ::io::deephaven::proto::backplane::grpc::StreamResponse>>(PrepareAsyncMessageStreamRaw(context, cq));
-    }
-    //
-    // Half of the browser-based (browser's can't do bidirectional streams without websockets)
-    // implementation for MessageStream.
-    std::unique_ptr< ::grpc::ClientReaderInterface< ::io::deephaven::proto::backplane::grpc::StreamResponse>> OpenMessageStream(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::StreamRequest& request) {
-      return std::unique_ptr< ::grpc::ClientReaderInterface< ::io::deephaven::proto::backplane::grpc::StreamResponse>>(OpenMessageStreamRaw(context, request));
-    }
-    std::unique_ptr< ::grpc::ClientAsyncReaderInterface< ::io::deephaven::proto::backplane::grpc::StreamResponse>> AsyncOpenMessageStream(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::StreamRequest& request, ::grpc::CompletionQueue* cq, void* tag) {
-      return std::unique_ptr< ::grpc::ClientAsyncReaderInterface< ::io::deephaven::proto::backplane::grpc::StreamResponse>>(AsyncOpenMessageStreamRaw(context, request, cq, tag));
-    }
-    std::unique_ptr< ::grpc::ClientAsyncReaderInterface< ::io::deephaven::proto::backplane::grpc::StreamResponse>> PrepareAsyncOpenMessageStream(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::StreamRequest& request, ::grpc::CompletionQueue* cq) {
-      return std::unique_ptr< ::grpc::ClientAsyncReaderInterface< ::io::deephaven::proto::backplane::grpc::StreamResponse>>(PrepareAsyncOpenMessageStreamRaw(context, request, cq));
-    }
-    //
-    // Other half of the browser-based implementation for MessageStream.
-    virtual ::grpc::Status NextMessageStream(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::StreamRequest& request, ::io::deephaven::proto::backplane::grpc::BrowserNextResponse* response) = 0;
-    std::unique_ptr< ::grpc::ClientAsyncResponseReaderInterface< ::io::deephaven::proto::backplane::grpc::BrowserNextResponse>> AsyncNextMessageStream(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::StreamRequest& request, ::grpc::CompletionQueue* cq) {
-      return std::unique_ptr< ::grpc::ClientAsyncResponseReaderInterface< ::io::deephaven::proto::backplane::grpc::BrowserNextResponse>>(AsyncNextMessageStreamRaw(context, request, cq));
-    }
-    std::unique_ptr< ::grpc::ClientAsyncResponseReaderInterface< ::io::deephaven::proto::backplane::grpc::BrowserNextResponse>> PrepareAsyncNextMessageStream(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::StreamRequest& request, ::grpc::CompletionQueue* cq) {
-      return std::unique_ptr< ::grpc::ClientAsyncResponseReaderInterface< ::io::deephaven::proto::backplane::grpc::BrowserNextResponse>>(PrepareAsyncNextMessageStreamRaw(context, request, cq));
-    }
-    class async_interface {
-     public:
-      virtual ~async_interface() {}
-      //
-      // Fetches a server-side object as a binary payload and assorted other tickets pointing at
-      // other server-side objects that may need to be read to properly use this payload. The binary
-      // format is implementation specific, but the implementation should be specified by the "type"
-      // identifier in the typed ticket.
-      //
-      // Deprecated in favor of MessageStream, which is able to handle the same content.
-      virtual void FetchObject(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::FetchObjectRequest* request, ::io::deephaven::proto::backplane::grpc::FetchObjectResponse* response, std::function<void(::grpc::Status)>) = 0;
-      virtual void FetchObject(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::FetchObjectRequest* request, ::io::deephaven::proto::backplane::grpc::FetchObjectResponse* response, ::grpc::ClientUnaryReactor* reactor) = 0;
-      //
-      // Provides a generic stream feature for Deephaven instances to use to add arbitrary functionality.
-      // Presently these take the form of "object type plugins", where server-side code can specify how
-      // an object could be serialized and/or communicate with a client. This gRPC stream is somewhat lower level
-      // than the plugin API, giving the server and client APIs features to correctly establish and
-      // control the stream. At this time, this is limited to a "ConnectRequest" to start the call.
-      //
-      // The first message sent to the server is expected to have a ConnectRequest, indicating which
-      // export ticket to connect to. It is an error for the client to attempt to connect to an object
-      // that has no plugin for its object type installed.
-      //
-      // The first request sent by the client should be a ConnectRequest. No other client message should
-      // be sent until the server responds. The server will respond with Data as soon as it is able (i.e.
-      // once the object in question has been resolved and the plugin has responded), indicating that the
-      // request was successful. After that point, the client may send Data requests.
-      //
-      // All replies from the server to the client contain Data instances. When sent from the server to
-      // the client, Data contains a bytes payload created by the server implementation of the plugin,
-      // and server-created export tickets containing any object references specified to be sent by the
-      // server-side plugin. As server-created exports, they are already resolved, and can be fetched or
-      // otherwise referenced right away. The client API is expected to wrap those tickets in appropriate
-      // objects, and the client is expected to release those tickets as appropriate, according to the
-      // plugin's use case. Note that it is possible for the "type" field to be null, indicating that
-      // there is no corresponding ObjectType plugin for these exported objects. This limits the client
-      // to specifying those tickets in a subsequent request, or releasing the ticket to let the object
-      // be garbage collected on the server.
-      //
-      // All Data instances sent from the client likewise contain a bytes payload, and may contain
-      // references to objects that already exist or may soon exist on the server, not just tickets sent
-      // by this same plugin. Note however that if those tickets are not yet resolved, neither the current
-      // Data nor subsequent requests can be processed by the plugin, as the required references can't be
-      // resolved.
-      //
-      // Presently there is no explicit "close" message to send, but plugin implementations can devise
-      // their own "half-close" protocol if they so choose. For now, if one end closes the connection,
-      // the other is expected to follow suit by closing their end too. At present, if there is an error
-      // with the stream, it is conveyed to the client in the usual gRPC fashion, but the server plugin
-      // will only be informed that the stream closed.
-      //
-      virtual void MessageStream(::grpc::ClientContext* context, ::grpc::ClientBidiReactor< ::io::deephaven::proto::backplane::grpc::StreamRequest,::io::deephaven::proto::backplane::grpc::StreamResponse>* reactor) = 0;
-      //
-      // Half of the browser-based (browser's can't do bidirectional streams without websockets)
-      // implementation for MessageStream.
-      virtual void OpenMessageStream(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::StreamRequest* request, ::grpc::ClientReadReactor< ::io::deephaven::proto::backplane::grpc::StreamResponse>* reactor) = 0;
-      //
-      // Other half of the browser-based implementation for MessageStream.
-      virtual void NextMessageStream(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::StreamRequest* request, ::io::deephaven::proto::backplane::grpc::BrowserNextResponse* response, std::function<void(::grpc::Status)>) = 0;
-      virtual void NextMessageStream(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::StreamRequest* request, ::io::deephaven::proto::backplane::grpc::BrowserNextResponse* response, ::grpc::ClientUnaryReactor* reactor) = 0;
-    };
-    typedef class async_interface experimental_async_interface;
-    virtual class async_interface* async() { return nullptr; }
-    class async_interface* experimental_async() { return async(); }
-   private:
-    virtual ::grpc::ClientAsyncResponseReaderInterface< ::io::deephaven::proto::backplane::grpc::FetchObjectResponse>* AsyncFetchObjectRaw(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::FetchObjectRequest& request, ::grpc::CompletionQueue* cq) = 0;
-    virtual ::grpc::ClientAsyncResponseReaderInterface< ::io::deephaven::proto::backplane::grpc::FetchObjectResponse>* PrepareAsyncFetchObjectRaw(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::FetchObjectRequest& request, ::grpc::CompletionQueue* cq) = 0;
-    virtual ::grpc::ClientReaderWriterInterface< ::io::deephaven::proto::backplane::grpc::StreamRequest, ::io::deephaven::proto::backplane::grpc::StreamResponse>* MessageStreamRaw(::grpc::ClientContext* context) = 0;
-    virtual ::grpc::ClientAsyncReaderWriterInterface< ::io::deephaven::proto::backplane::grpc::StreamRequest, ::io::deephaven::proto::backplane::grpc::StreamResponse>* AsyncMessageStreamRaw(::grpc::ClientContext* context, ::grpc::CompletionQueue* cq, void* tag) = 0;
-    virtual ::grpc::ClientAsyncReaderWriterInterface< ::io::deephaven::proto::backplane::grpc::StreamRequest, ::io::deephaven::proto::backplane::grpc::StreamResponse>* PrepareAsyncMessageStreamRaw(::grpc::ClientContext* context, ::grpc::CompletionQueue* cq) = 0;
-    virtual ::grpc::ClientReaderInterface< ::io::deephaven::proto::backplane::grpc::StreamResponse>* OpenMessageStreamRaw(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::StreamRequest& request) = 0;
-    virtual ::grpc::ClientAsyncReaderInterface< ::io::deephaven::proto::backplane::grpc::StreamResponse>* AsyncOpenMessageStreamRaw(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::StreamRequest& request, ::grpc::CompletionQueue* cq, void* tag) = 0;
-    virtual ::grpc::ClientAsyncReaderInterface< ::io::deephaven::proto::backplane::grpc::StreamResponse>* PrepareAsyncOpenMessageStreamRaw(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::StreamRequest& request, ::grpc::CompletionQueue* cq) = 0;
-    virtual ::grpc::ClientAsyncResponseReaderInterface< ::io::deephaven::proto::backplane::grpc::BrowserNextResponse>* AsyncNextMessageStreamRaw(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::StreamRequest& request, ::grpc::CompletionQueue* cq) = 0;
-    virtual ::grpc::ClientAsyncResponseReaderInterface< ::io::deephaven::proto::backplane::grpc::BrowserNextResponse>* PrepareAsyncNextMessageStreamRaw(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::StreamRequest& request, ::grpc::CompletionQueue* cq) = 0;
-  };
-  class Stub final : public StubInterface {
-   public:
-    Stub(const std::shared_ptr< ::grpc::ChannelInterface>& channel, const ::grpc::StubOptions& options = ::grpc::StubOptions());
-    ::grpc::Status FetchObject(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::FetchObjectRequest& request, ::io::deephaven::proto::backplane::grpc::FetchObjectResponse* response) override;
-    std::unique_ptr< ::grpc::ClientAsyncResponseReader< ::io::deephaven::proto::backplane::grpc::FetchObjectResponse>> AsyncFetchObject(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::FetchObjectRequest& request, ::grpc::CompletionQueue* cq) {
-      return std::unique_ptr< ::grpc::ClientAsyncResponseReader< ::io::deephaven::proto::backplane::grpc::FetchObjectResponse>>(AsyncFetchObjectRaw(context, request, cq));
-    }
-    std::unique_ptr< ::grpc::ClientAsyncResponseReader< ::io::deephaven::proto::backplane::grpc::FetchObjectResponse>> PrepareAsyncFetchObject(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::FetchObjectRequest& request, ::grpc::CompletionQueue* cq) {
-      return std::unique_ptr< ::grpc::ClientAsyncResponseReader< ::io::deephaven::proto::backplane::grpc::FetchObjectResponse>>(PrepareAsyncFetchObjectRaw(context, request, cq));
-    }
-    std::unique_ptr< ::grpc::ClientReaderWriter< ::io::deephaven::proto::backplane::grpc::StreamRequest, ::io::deephaven::proto::backplane::grpc::StreamResponse>> MessageStream(::grpc::ClientContext* context) {
-      return std::unique_ptr< ::grpc::ClientReaderWriter< ::io::deephaven::proto::backplane::grpc::StreamRequest, ::io::deephaven::proto::backplane::grpc::StreamResponse>>(MessageStreamRaw(context));
-    }
-    std::unique_ptr<  ::grpc::ClientAsyncReaderWriter< ::io::deephaven::proto::backplane::grpc::StreamRequest, ::io::deephaven::proto::backplane::grpc::StreamResponse>> AsyncMessageStream(::grpc::ClientContext* context, ::grpc::CompletionQueue* cq, void* tag) {
-      return std::unique_ptr< ::grpc::ClientAsyncReaderWriter< ::io::deephaven::proto::backplane::grpc::StreamRequest, ::io::deephaven::proto::backplane::grpc::StreamResponse>>(AsyncMessageStreamRaw(context, cq, tag));
-    }
-    std::unique_ptr<  ::grpc::ClientAsyncReaderWriter< ::io::deephaven::proto::backplane::grpc::StreamRequest, ::io::deephaven::proto::backplane::grpc::StreamResponse>> PrepareAsyncMessageStream(::grpc::ClientContext* context, ::grpc::CompletionQueue* cq) {
-      return std::unique_ptr< ::grpc::ClientAsyncReaderWriter< ::io::deephaven::proto::backplane::grpc::StreamRequest, ::io::deephaven::proto::backplane::grpc::StreamResponse>>(PrepareAsyncMessageStreamRaw(context, cq));
-    }
-    std::unique_ptr< ::grpc::ClientReader< ::io::deephaven::proto::backplane::grpc::StreamResponse>> OpenMessageStream(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::StreamRequest& request) {
-      return std::unique_ptr< ::grpc::ClientReader< ::io::deephaven::proto::backplane::grpc::StreamResponse>>(OpenMessageStreamRaw(context, request));
-    }
-    std::unique_ptr< ::grpc::ClientAsyncReader< ::io::deephaven::proto::backplane::grpc::StreamResponse>> AsyncOpenMessageStream(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::StreamRequest& request, ::grpc::CompletionQueue* cq, void* tag) {
-      return std::unique_ptr< ::grpc::ClientAsyncReader< ::io::deephaven::proto::backplane::grpc::StreamResponse>>(AsyncOpenMessageStreamRaw(context, request, cq, tag));
-    }
-    std::unique_ptr< ::grpc::ClientAsyncReader< ::io::deephaven::proto::backplane::grpc::StreamResponse>> PrepareAsyncOpenMessageStream(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::StreamRequest& request, ::grpc::CompletionQueue* cq) {
-      return std::unique_ptr< ::grpc::ClientAsyncReader< ::io::deephaven::proto::backplane::grpc::StreamResponse>>(PrepareAsyncOpenMessageStreamRaw(context, request, cq));
-    }
-    ::grpc::Status NextMessageStream(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::StreamRequest& request, ::io::deephaven::proto::backplane::grpc::BrowserNextResponse* response) override;
-    std::unique_ptr< ::grpc::ClientAsyncResponseReader< ::io::deephaven::proto::backplane::grpc::BrowserNextResponse>> AsyncNextMessageStream(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::StreamRequest& request, ::grpc::CompletionQueue* cq) {
-      return std::unique_ptr< ::grpc::ClientAsyncResponseReader< ::io::deephaven::proto::backplane::grpc::BrowserNextResponse>>(AsyncNextMessageStreamRaw(context, request, cq));
-    }
-    std::unique_ptr< ::grpc::ClientAsyncResponseReader< ::io::deephaven::proto::backplane::grpc::BrowserNextResponse>> PrepareAsyncNextMessageStream(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::StreamRequest& request, ::grpc::CompletionQueue* cq) {
-      return std::unique_ptr< ::grpc::ClientAsyncResponseReader< ::io::deephaven::proto::backplane::grpc::BrowserNextResponse>>(PrepareAsyncNextMessageStreamRaw(context, request, cq));
-    }
-    class async final :
-      public StubInterface::async_interface {
-     public:
-      void FetchObject(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::FetchObjectRequest* request, ::io::deephaven::proto::backplane::grpc::FetchObjectResponse* response, std::function<void(::grpc::Status)>) override;
-      void FetchObject(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::FetchObjectRequest* request, ::io::deephaven::proto::backplane::grpc::FetchObjectResponse* response, ::grpc::ClientUnaryReactor* reactor) override;
-      void MessageStream(::grpc::ClientContext* context, ::grpc::ClientBidiReactor< ::io::deephaven::proto::backplane::grpc::StreamRequest,::io::deephaven::proto::backplane::grpc::StreamResponse>* reactor) override;
-      void OpenMessageStream(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::StreamRequest* request, ::grpc::ClientReadReactor< ::io::deephaven::proto::backplane::grpc::StreamResponse>* reactor) override;
-      void NextMessageStream(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::StreamRequest* request, ::io::deephaven::proto::backplane::grpc::BrowserNextResponse* response, std::function<void(::grpc::Status)>) override;
-      void NextMessageStream(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::StreamRequest* request, ::io::deephaven::proto::backplane::grpc::BrowserNextResponse* response, ::grpc::ClientUnaryReactor* reactor) override;
-     private:
-      friend class Stub;
-      explicit async(Stub* stub): stub_(stub) { }
-      Stub* stub() { return stub_; }
-      Stub* stub_;
-    };
-    class async* async() override { return &async_stub_; }
-
-   private:
-    std::shared_ptr< ::grpc::ChannelInterface> channel_;
-    class async async_stub_{this};
-    ::grpc::ClientAsyncResponseReader< ::io::deephaven::proto::backplane::grpc::FetchObjectResponse>* AsyncFetchObjectRaw(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::FetchObjectRequest& request, ::grpc::CompletionQueue* cq) override;
-    ::grpc::ClientAsyncResponseReader< ::io::deephaven::proto::backplane::grpc::FetchObjectResponse>* PrepareAsyncFetchObjectRaw(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::FetchObjectRequest& request, ::grpc::CompletionQueue* cq) override;
-    ::grpc::ClientReaderWriter< ::io::deephaven::proto::backplane::grpc::StreamRequest, ::io::deephaven::proto::backplane::grpc::StreamResponse>* MessageStreamRaw(::grpc::ClientContext* context) override;
-    ::grpc::ClientAsyncReaderWriter< ::io::deephaven::proto::backplane::grpc::StreamRequest, ::io::deephaven::proto::backplane::grpc::StreamResponse>* AsyncMessageStreamRaw(::grpc::ClientContext* context, ::grpc::CompletionQueue* cq, void* tag) override;
-    ::grpc::ClientAsyncReaderWriter< ::io::deephaven::proto::backplane::grpc::StreamRequest, ::io::deephaven::proto::backplane::grpc::StreamResponse>* PrepareAsyncMessageStreamRaw(::grpc::ClientContext* context, ::grpc::CompletionQueue* cq) override;
-    ::grpc::ClientReader< ::io::deephaven::proto::backplane::grpc::StreamResponse>* OpenMessageStreamRaw(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::StreamRequest& request) override;
-    ::grpc::ClientAsyncReader< ::io::deephaven::proto::backplane::grpc::StreamResponse>* AsyncOpenMessageStreamRaw(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::StreamRequest& request, ::grpc::CompletionQueue* cq, void* tag) override;
-    ::grpc::ClientAsyncReader< ::io::deephaven::proto::backplane::grpc::StreamResponse>* PrepareAsyncOpenMessageStreamRaw(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::StreamRequest& request, ::grpc::CompletionQueue* cq) override;
-    ::grpc::ClientAsyncResponseReader< ::io::deephaven::proto::backplane::grpc::BrowserNextResponse>* AsyncNextMessageStreamRaw(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::StreamRequest& request, ::grpc::CompletionQueue* cq) override;
-    ::grpc::ClientAsyncResponseReader< ::io::deephaven::proto::backplane::grpc::BrowserNextResponse>* PrepareAsyncNextMessageStreamRaw(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::StreamRequest& request, ::grpc::CompletionQueue* cq) override;
-    const ::grpc::internal::RpcMethod rpcmethod_FetchObject_;
-    const ::grpc::internal::RpcMethod rpcmethod_MessageStream_;
-    const ::grpc::internal::RpcMethod rpcmethod_OpenMessageStream_;
-    const ::grpc::internal::RpcMethod rpcmethod_NextMessageStream_;
-  };
-  static std::unique_ptr<Stub> NewStub(const std::shared_ptr< ::grpc::ChannelInterface>& channel, const ::grpc::StubOptions& options = ::grpc::StubOptions());
-
-  class Service : public ::grpc::Service {
-   public:
-    Service();
-    virtual ~Service();
-    //
-    // Fetches a server-side object as a binary payload and assorted other tickets pointing at
-    // other server-side objects that may need to be read to properly use this payload. The binary
-    // format is implementation specific, but the implementation should be specified by the "type"
-    // identifier in the typed ticket.
-    //
-    // Deprecated in favor of MessageStream, which is able to handle the same content.
-    virtual ::grpc::Status FetchObject(::grpc::ServerContext* context, const ::io::deephaven::proto::backplane::grpc::FetchObjectRequest* request, ::io::deephaven::proto::backplane::grpc::FetchObjectResponse* response);
-    //
-    // Provides a generic stream feature for Deephaven instances to use to add arbitrary functionality.
-    // Presently these take the form of "object type plugins", where server-side code can specify how
-    // an object could be serialized and/or communicate with a client. This gRPC stream is somewhat lower level
-    // than the plugin API, giving the server and client APIs features to correctly establish and
-    // control the stream. At this time, this is limited to a "ConnectRequest" to start the call.
-    //
-    // The first message sent to the server is expected to have a ConnectRequest, indicating which
-    // export ticket to connect to. It is an error for the client to attempt to connect to an object
-    // that has no plugin for its object type installed.
-    //
-    // The first request sent by the client should be a ConnectRequest. No other client message should
-    // be sent until the server responds. The server will respond with Data as soon as it is able (i.e.
-    // once the object in question has been resolved and the plugin has responded), indicating that the
-    // request was successful. After that point, the client may send Data requests.
-    //
-    // All replies from the server to the client contain Data instances. When sent from the server to
-    // the client, Data contains a bytes payload created by the server implementation of the plugin,
-    // and server-created export tickets containing any object references specified to be sent by the
-    // server-side plugin. As server-created exports, they are already resolved, and can be fetched or
-    // otherwise referenced right away. The client API is expected to wrap those tickets in appropriate
-    // objects, and the client is expected to release those tickets as appropriate, according to the
-    // plugin's use case. Note that it is possible for the "type" field to be null, indicating that
-    // there is no corresponding ObjectType plugin for these exported objects. This limits the client
-    // to specifying those tickets in a subsequent request, or releasing the ticket to let the object
-    // be garbage collected on the server.
-    //
-    // All Data instances sent from the client likewise contain a bytes payload, and may contain
-    // references to objects that already exist or may soon exist on the server, not just tickets sent
-    // by this same plugin. Note however that if those tickets are not yet resolved, neither the current
-    // Data nor subsequent requests can be processed by the plugin, as the required references can't be
-    // resolved.
-    //
-    // Presently there is no explicit "close" message to send, but plugin implementations can devise
-    // their own "half-close" protocol if they so choose. For now, if one end closes the connection,
-    // the other is expected to follow suit by closing their end too. At present, if there is an error
-    // with the stream, it is conveyed to the client in the usual gRPC fashion, but the server plugin
-    // will only be informed that the stream closed.
-    //
-    virtual ::grpc::Status MessageStream(::grpc::ServerContext* context, ::grpc::ServerReaderWriter< ::io::deephaven::proto::backplane::grpc::StreamResponse, ::io::deephaven::proto::backplane::grpc::StreamRequest>* stream);
-    //
-    // Half of the browser-based (browser's can't do bidirectional streams without websockets)
-    // implementation for MessageStream.
-    virtual ::grpc::Status OpenMessageStream(::grpc::ServerContext* context, const ::io::deephaven::proto::backplane::grpc::StreamRequest* request, ::grpc::ServerWriter< ::io::deephaven::proto::backplane::grpc::StreamResponse>* writer);
-    //
-    // Other half of the browser-based implementation for MessageStream.
-    virtual ::grpc::Status NextMessageStream(::grpc::ServerContext* context, const ::io::deephaven::proto::backplane::grpc::StreamRequest* request, ::io::deephaven::proto::backplane::grpc::BrowserNextResponse* response);
-  };
-  template <class BaseClass>
-  class WithAsyncMethod_FetchObject : public BaseClass {
-   private:
-    void BaseClassMustBeDerivedFromService(const Service* /*service*/) {}
-   public:
-    WithAsyncMethod_FetchObject() {
-      ::grpc::Service::MarkMethodAsync(0);
-    }
-    ~WithAsyncMethod_FetchObject() override {
-      BaseClassMustBeDerivedFromService(this);
-    }
-    // disable synchronous version of this method
-    ::grpc::Status FetchObject(::grpc::ServerContext* /*context*/, const ::io::deephaven::proto::backplane::grpc::FetchObjectRequest* /*request*/, ::io::deephaven::proto::backplane::grpc::FetchObjectResponse* /*response*/) override {
-      abort();
-      return ::grpc::Status(::grpc::StatusCode::UNIMPLEMENTED, "");
-    }
-    void RequestFetchObject(::grpc::ServerContext* context, ::io::deephaven::proto::backplane::grpc::FetchObjectRequest* request, ::grpc::ServerAsyncResponseWriter< ::io::deephaven::proto::backplane::grpc::FetchObjectResponse>* response, ::grpc::CompletionQueue* new_call_cq, ::grpc::ServerCompletionQueue* notification_cq, void *tag) {
-      ::grpc::Service::RequestAsyncUnary(0, context, request, response, new_call_cq, notification_cq, tag);
-    }
-  };
-  template <class BaseClass>
-  class WithAsyncMethod_MessageStream : public BaseClass {
-   private:
-    void BaseClassMustBeDerivedFromService(const Service* /*service*/) {}
-   public:
-    WithAsyncMethod_MessageStream() {
-      ::grpc::Service::MarkMethodAsync(1);
-    }
-    ~WithAsyncMethod_MessageStream() override {
-      BaseClassMustBeDerivedFromService(this);
-    }
-    // disable synchronous version of this method
-    ::grpc::Status MessageStream(::grpc::ServerContext* /*context*/, ::grpc::ServerReaderWriter< ::io::deephaven::proto::backplane::grpc::StreamResponse, ::io::deephaven::proto::backplane::grpc::StreamRequest>* /*stream*/)  override {
-      abort();
-      return ::grpc::Status(::grpc::StatusCode::UNIMPLEMENTED, "");
-    }
-    void RequestMessageStream(::grpc::ServerContext* context, ::grpc::ServerAsyncReaderWriter< ::io::deephaven::proto::backplane::grpc::StreamResponse, ::io::deephaven::proto::backplane::grpc::StreamRequest>* stream, ::grpc::CompletionQueue* new_call_cq, ::grpc::ServerCompletionQueue* notification_cq, void *tag) {
-      ::grpc::Service::RequestAsyncBidiStreaming(1, context, stream, new_call_cq, notification_cq, tag);
-    }
-  };
-  template <class BaseClass>
-  class WithAsyncMethod_OpenMessageStream : public BaseClass {
-   private:
-    void BaseClassMustBeDerivedFromService(const Service* /*service*/) {}
-   public:
-    WithAsyncMethod_OpenMessageStream() {
-      ::grpc::Service::MarkMethodAsync(2);
-    }
-    ~WithAsyncMethod_OpenMessageStream() override {
-      BaseClassMustBeDerivedFromService(this);
-    }
-    // disable synchronous version of this method
-    ::grpc::Status OpenMessageStream(::grpc::ServerContext* /*context*/, const ::io::deephaven::proto::backplane::grpc::StreamRequest* /*request*/, ::grpc::ServerWriter< ::io::deephaven::proto::backplane::grpc::StreamResponse>* /*writer*/) override {
-      abort();
-      return ::grpc::Status(::grpc::StatusCode::UNIMPLEMENTED, "");
-    }
-    void RequestOpenMessageStream(::grpc::ServerContext* context, ::io::deephaven::proto::backplane::grpc::StreamRequest* request, ::grpc::ServerAsyncWriter< ::io::deephaven::proto::backplane::grpc::StreamResponse>* writer, ::grpc::CompletionQueue* new_call_cq, ::grpc::ServerCompletionQueue* notification_cq, void *tag) {
-      ::grpc::Service::RequestAsyncServerStreaming(2, context, request, writer, new_call_cq, notification_cq, tag);
-    }
-  };
-  template <class BaseClass>
-  class WithAsyncMethod_NextMessageStream : public BaseClass {
-   private:
-    void BaseClassMustBeDerivedFromService(const Service* /*service*/) {}
-   public:
-    WithAsyncMethod_NextMessageStream() {
-      ::grpc::Service::MarkMethodAsync(3);
-    }
-    ~WithAsyncMethod_NextMessageStream() override {
-      BaseClassMustBeDerivedFromService(this);
-    }
-    // disable synchronous version of this method
-    ::grpc::Status NextMessageStream(::grpc::ServerContext* /*context*/, const ::io::deephaven::proto::backplane::grpc::StreamRequest* /*request*/, ::io::deephaven::proto::backplane::grpc::BrowserNextResponse* /*response*/) override {
-      abort();
-      return ::grpc::Status(::grpc::StatusCode::UNIMPLEMENTED, "");
-    }
-    void RequestNextMessageStream(::grpc::ServerContext* context, ::io::deephaven::proto::backplane::grpc::StreamRequest* request, ::grpc::ServerAsyncResponseWriter< ::io::deephaven::proto::backplane::grpc::BrowserNextResponse>* response, ::grpc::CompletionQueue* new_call_cq, ::grpc::ServerCompletionQueue* notification_cq, void *tag) {
-      ::grpc::Service::RequestAsyncUnary(3, context, request, response, new_call_cq, notification_cq, tag);
-    }
-  };
-  typedef WithAsyncMethod_FetchObject<WithAsyncMethod_MessageStream<WithAsyncMethod_OpenMessageStream<WithAsyncMethod_NextMessageStream<Service > > > > AsyncService;
-  template <class BaseClass>
-  class WithCallbackMethod_FetchObject : public BaseClass {
-   private:
-    void BaseClassMustBeDerivedFromService(const Service* /*service*/) {}
-   public:
-    WithCallbackMethod_FetchObject() {
-      ::grpc::Service::MarkMethodCallback(0,
-          new ::grpc::internal::CallbackUnaryHandler< ::io::deephaven::proto::backplane::grpc::FetchObjectRequest, ::io::deephaven::proto::backplane::grpc::FetchObjectResponse>(
-            [this](
-                   ::grpc::CallbackServerContext* context, const ::io::deephaven::proto::backplane::grpc::FetchObjectRequest* request, ::io::deephaven::proto::backplane::grpc::FetchObjectResponse* response) { return this->FetchObject(context, request, response); }));}
-    void SetMessageAllocatorFor_FetchObject(
-        ::grpc::MessageAllocator< ::io::deephaven::proto::backplane::grpc::FetchObjectRequest, ::io::deephaven::proto::backplane::grpc::FetchObjectResponse>* allocator) {
-      ::grpc::internal::MethodHandler* const handler = ::grpc::Service::GetHandler(0);
-      static_cast<::grpc::internal::CallbackUnaryHandler< ::io::deephaven::proto::backplane::grpc::FetchObjectRequest, ::io::deephaven::proto::backplane::grpc::FetchObjectResponse>*>(handler)
-              ->SetMessageAllocator(allocator);
-    }
-    ~WithCallbackMethod_FetchObject() override {
-      BaseClassMustBeDerivedFromService(this);
-    }
-    // disable synchronous version of this method
-    ::grpc::Status FetchObject(::grpc::ServerContext* /*context*/, const ::io::deephaven::proto::backplane::grpc::FetchObjectRequest* /*request*/, ::io::deephaven::proto::backplane::grpc::FetchObjectResponse* /*response*/) override {
-      abort();
-      return ::grpc::Status(::grpc::StatusCode::UNIMPLEMENTED, "");
-    }
-    virtual ::grpc::ServerUnaryReactor* FetchObject(
-      ::grpc::CallbackServerContext* /*context*/, const ::io::deephaven::proto::backplane::grpc::FetchObjectRequest* /*request*/, ::io::deephaven::proto::backplane::grpc::FetchObjectResponse* /*response*/)  { return nullptr; }
-  };
-  template <class BaseClass>
-  class WithCallbackMethod_MessageStream : public BaseClass {
-   private:
-    void BaseClassMustBeDerivedFromService(const Service* /*service*/) {}
-   public:
-    WithCallbackMethod_MessageStream() {
-      ::grpc::Service::MarkMethodCallback(1,
-          new ::grpc::internal::CallbackBidiHandler< ::io::deephaven::proto::backplane::grpc::StreamRequest, ::io::deephaven::proto::backplane::grpc::StreamResponse>(
-            [this](
-                   ::grpc::CallbackServerContext* context) { return this->MessageStream(context); }));
-    }
-    ~WithCallbackMethod_MessageStream() override {
-      BaseClassMustBeDerivedFromService(this);
-    }
-    // disable synchronous version of this method
-    ::grpc::Status MessageStream(::grpc::ServerContext* /*context*/, ::grpc::ServerReaderWriter< ::io::deephaven::proto::backplane::grpc::StreamResponse, ::io::deephaven::proto::backplane::grpc::StreamRequest>* /*stream*/)  override {
-      abort();
-      return ::grpc::Status(::grpc::StatusCode::UNIMPLEMENTED, "");
-    }
-    virtual ::grpc::ServerBidiReactor< ::io::deephaven::proto::backplane::grpc::StreamRequest, ::io::deephaven::proto::backplane::grpc::StreamResponse>* MessageStream(
-      ::grpc::CallbackServerContext* /*context*/)
-      { return nullptr; }
-  };
-  template <class BaseClass>
-  class WithCallbackMethod_OpenMessageStream : public BaseClass {
-   private:
-    void BaseClassMustBeDerivedFromService(const Service* /*service*/) {}
-   public:
-    WithCallbackMethod_OpenMessageStream() {
-      ::grpc::Service::MarkMethodCallback(2,
-          new ::grpc::internal::CallbackServerStreamingHandler< ::io::deephaven::proto::backplane::grpc::StreamRequest, ::io::deephaven::proto::backplane::grpc::StreamResponse>(
-            [this](
-                   ::grpc::CallbackServerContext* context, const ::io::deephaven::proto::backplane::grpc::StreamRequest* request) { return this->OpenMessageStream(context, request); }));
-    }
-    ~WithCallbackMethod_OpenMessageStream() override {
-      BaseClassMustBeDerivedFromService(this);
-    }
-    // disable synchronous version of this method
-    ::grpc::Status OpenMessageStream(::grpc::ServerContext* /*context*/, const ::io::deephaven::proto::backplane::grpc::StreamRequest* /*request*/, ::grpc::ServerWriter< ::io::deephaven::proto::backplane::grpc::StreamResponse>* /*writer*/) override {
-      abort();
-      return ::grpc::Status(::grpc::StatusCode::UNIMPLEMENTED, "");
-    }
-    virtual ::grpc::ServerWriteReactor< ::io::deephaven::proto::backplane::grpc::StreamResponse>* OpenMessageStream(
-      ::grpc::CallbackServerContext* /*context*/, const ::io::deephaven::proto::backplane::grpc::StreamRequest* /*request*/)  { return nullptr; }
-  };
-  template <class BaseClass>
-  class WithCallbackMethod_NextMessageStream : public BaseClass {
-   private:
-    void BaseClassMustBeDerivedFromService(const Service* /*service*/) {}
-   public:
-    WithCallbackMethod_NextMessageStream() {
-      ::grpc::Service::MarkMethodCallback(3,
-          new ::grpc::internal::CallbackUnaryHandler< ::io::deephaven::proto::backplane::grpc::StreamRequest, ::io::deephaven::proto::backplane::grpc::BrowserNextResponse>(
-            [this](
-                   ::grpc::CallbackServerContext* context, const ::io::deephaven::proto::backplane::grpc::StreamRequest* request, ::io::deephaven::proto::backplane::grpc::BrowserNextResponse* response) { return this->NextMessageStream(context, request, response); }));}
-    void SetMessageAllocatorFor_NextMessageStream(
-        ::grpc::MessageAllocator< ::io::deephaven::proto::backplane::grpc::StreamRequest, ::io::deephaven::proto::backplane::grpc::BrowserNextResponse>* allocator) {
-      ::grpc::internal::MethodHandler* const handler = ::grpc::Service::GetHandler(3);
-      static_cast<::grpc::internal::CallbackUnaryHandler< ::io::deephaven::proto::backplane::grpc::StreamRequest, ::io::deephaven::proto::backplane::grpc::BrowserNextResponse>*>(handler)
-              ->SetMessageAllocator(allocator);
-    }
-    ~WithCallbackMethod_NextMessageStream() override {
-      BaseClassMustBeDerivedFromService(this);
-    }
-    // disable synchronous version of this method
-    ::grpc::Status NextMessageStream(::grpc::ServerContext* /*context*/, const ::io::deephaven::proto::backplane::grpc::StreamRequest* /*request*/, ::io::deephaven::proto::backplane::grpc::BrowserNextResponse* /*response*/) override {
-      abort();
-      return ::grpc::Status(::grpc::StatusCode::UNIMPLEMENTED, "");
-    }
-    virtual ::grpc::ServerUnaryReactor* NextMessageStream(
-      ::grpc::CallbackServerContext* /*context*/, const ::io::deephaven::proto::backplane::grpc::StreamRequest* /*request*/, ::io::deephaven::proto::backplane::grpc::BrowserNextResponse* /*response*/)  { return nullptr; }
-  };
-  typedef WithCallbackMethod_FetchObject<WithCallbackMethod_MessageStream<WithCallbackMethod_OpenMessageStream<WithCallbackMethod_NextMessageStream<Service > > > > CallbackService;
-  typedef CallbackService ExperimentalCallbackService;
-  template <class BaseClass>
-  class WithGenericMethod_FetchObject : public BaseClass {
-   private:
-    void BaseClassMustBeDerivedFromService(const Service* /*service*/) {}
-   public:
-    WithGenericMethod_FetchObject() {
-      ::grpc::Service::MarkMethodGeneric(0);
-    }
-    ~WithGenericMethod_FetchObject() override {
-      BaseClassMustBeDerivedFromService(this);
-    }
-    // disable synchronous version of this method
-    ::grpc::Status FetchObject(::grpc::ServerContext* /*context*/, const ::io::deephaven::proto::backplane::grpc::FetchObjectRequest* /*request*/, ::io::deephaven::proto::backplane::grpc::FetchObjectResponse* /*response*/) override {
-      abort();
-      return ::grpc::Status(::grpc::StatusCode::UNIMPLEMENTED, "");
-    }
-  };
-  template <class BaseClass>
-  class WithGenericMethod_MessageStream : public BaseClass {
-   private:
-    void BaseClassMustBeDerivedFromService(const Service* /*service*/) {}
-   public:
-    WithGenericMethod_MessageStream() {
-      ::grpc::Service::MarkMethodGeneric(1);
-    }
-    ~WithGenericMethod_MessageStream() override {
-      BaseClassMustBeDerivedFromService(this);
-    }
-    // disable synchronous version of this method
-    ::grpc::Status MessageStream(::grpc::ServerContext* /*context*/, ::grpc::ServerReaderWriter< ::io::deephaven::proto::backplane::grpc::StreamResponse, ::io::deephaven::proto::backplane::grpc::StreamRequest>* /*stream*/)  override {
-      abort();
-      return ::grpc::Status(::grpc::StatusCode::UNIMPLEMENTED, "");
-    }
-  };
-  template <class BaseClass>
-  class WithGenericMethod_OpenMessageStream : public BaseClass {
-   private:
-    void BaseClassMustBeDerivedFromService(const Service* /*service*/) {}
-   public:
-    WithGenericMethod_OpenMessageStream() {
-      ::grpc::Service::MarkMethodGeneric(2);
-    }
-    ~WithGenericMethod_OpenMessageStream() override {
-      BaseClassMustBeDerivedFromService(this);
-    }
-    // disable synchronous version of this method
-    ::grpc::Status OpenMessageStream(::grpc::ServerContext* /*context*/, const ::io::deephaven::proto::backplane::grpc::StreamRequest* /*request*/, ::grpc::ServerWriter< ::io::deephaven::proto::backplane::grpc::StreamResponse>* /*writer*/) override {
-      abort();
-      return ::grpc::Status(::grpc::StatusCode::UNIMPLEMENTED, "");
-    }
-  };
-  template <class BaseClass>
-  class WithGenericMethod_NextMessageStream : public BaseClass {
-   private:
-    void BaseClassMustBeDerivedFromService(const Service* /*service*/) {}
-   public:
-    WithGenericMethod_NextMessageStream() {
-      ::grpc::Service::MarkMethodGeneric(3);
-    }
-    ~WithGenericMethod_NextMessageStream() override {
-      BaseClassMustBeDerivedFromService(this);
-    }
-    // disable synchronous version of this method
-    ::grpc::Status NextMessageStream(::grpc::ServerContext* /*context*/, const ::io::deephaven::proto::backplane::grpc::StreamRequest* /*request*/, ::io::deephaven::proto::backplane::grpc::BrowserNextResponse* /*response*/) override {
-      abort();
-      return ::grpc::Status(::grpc::StatusCode::UNIMPLEMENTED, "");
-    }
-  };
-  template <class BaseClass>
-  class WithRawMethod_FetchObject : public BaseClass {
-   private:
-    void BaseClassMustBeDerivedFromService(const Service* /*service*/) {}
-   public:
-    WithRawMethod_FetchObject() {
-      ::grpc::Service::MarkMethodRaw(0);
-    }
-    ~WithRawMethod_FetchObject() override {
-      BaseClassMustBeDerivedFromService(this);
-    }
-    // disable synchronous version of this method
-    ::grpc::Status FetchObject(::grpc::ServerContext* /*context*/, const ::io::deephaven::proto::backplane::grpc::FetchObjectRequest* /*request*/, ::io::deephaven::proto::backplane::grpc::FetchObjectResponse* /*response*/) override {
-      abort();
-      return ::grpc::Status(::grpc::StatusCode::UNIMPLEMENTED, "");
-    }
-    void RequestFetchObject(::grpc::ServerContext* context, ::grpc::ByteBuffer* request, ::grpc::ServerAsyncResponseWriter< ::grpc::ByteBuffer>* response, ::grpc::CompletionQueue* new_call_cq, ::grpc::ServerCompletionQueue* notification_cq, void *tag) {
-      ::grpc::Service::RequestAsyncUnary(0, context, request, response, new_call_cq, notification_cq, tag);
-    }
-  };
-  template <class BaseClass>
-  class WithRawMethod_MessageStream : public BaseClass {
-   private:
-    void BaseClassMustBeDerivedFromService(const Service* /*service*/) {}
-   public:
-    WithRawMethod_MessageStream() {
-      ::grpc::Service::MarkMethodRaw(1);
-    }
-    ~WithRawMethod_MessageStream() override {
-      BaseClassMustBeDerivedFromService(this);
-    }
-    // disable synchronous version of this method
-    ::grpc::Status MessageStream(::grpc::ServerContext* /*context*/, ::grpc::ServerReaderWriter< ::io::deephaven::proto::backplane::grpc::StreamResponse, ::io::deephaven::proto::backplane::grpc::StreamRequest>* /*stream*/)  override {
-      abort();
-      return ::grpc::Status(::grpc::StatusCode::UNIMPLEMENTED, "");
-    }
-    void RequestMessageStream(::grpc::ServerContext* context, ::grpc::ServerAsyncReaderWriter< ::grpc::ByteBuffer, ::grpc::ByteBuffer>* stream, ::grpc::CompletionQueue* new_call_cq, ::grpc::ServerCompletionQueue* notification_cq, void *tag) {
-      ::grpc::Service::RequestAsyncBidiStreaming(1, context, stream, new_call_cq, notification_cq, tag);
-    }
-  };
-  template <class BaseClass>
-  class WithRawMethod_OpenMessageStream : public BaseClass {
-   private:
-    void BaseClassMustBeDerivedFromService(const Service* /*service*/) {}
-   public:
-    WithRawMethod_OpenMessageStream() {
-      ::grpc::Service::MarkMethodRaw(2);
-    }
-    ~WithRawMethod_OpenMessageStream() override {
-      BaseClassMustBeDerivedFromService(this);
-    }
-    // disable synchronous version of this method
-    ::grpc::Status OpenMessageStream(::grpc::ServerContext* /*context*/, const ::io::deephaven::proto::backplane::grpc::StreamRequest* /*request*/, ::grpc::ServerWriter< ::io::deephaven::proto::backplane::grpc::StreamResponse>* /*writer*/) override {
-      abort();
-      return ::grpc::Status(::grpc::StatusCode::UNIMPLEMENTED, "");
-    }
-    void RequestOpenMessageStream(::grpc::ServerContext* context, ::grpc::ByteBuffer* request, ::grpc::ServerAsyncWriter< ::grpc::ByteBuffer>* writer, ::grpc::CompletionQueue* new_call_cq, ::grpc::ServerCompletionQueue* notification_cq, void *tag) {
-      ::grpc::Service::RequestAsyncServerStreaming(2, context, request, writer, new_call_cq, notification_cq, tag);
-    }
-  };
-  template <class BaseClass>
-  class WithRawMethod_NextMessageStream : public BaseClass {
-   private:
-    void BaseClassMustBeDerivedFromService(const Service* /*service*/) {}
-   public:
-    WithRawMethod_NextMessageStream() {
-      ::grpc::Service::MarkMethodRaw(3);
-    }
-    ~WithRawMethod_NextMessageStream() override {
-      BaseClassMustBeDerivedFromService(this);
-    }
-    // disable synchronous version of this method
-    ::grpc::Status NextMessageStream(::grpc::ServerContext* /*context*/, const ::io::deephaven::proto::backplane::grpc::StreamRequest* /*request*/, ::io::deephaven::proto::backplane::grpc::BrowserNextResponse* /*response*/) override {
-      abort();
-      return ::grpc::Status(::grpc::StatusCode::UNIMPLEMENTED, "");
-    }
-    void RequestNextMessageStream(::grpc::ServerContext* context, ::grpc::ByteBuffer* request, ::grpc::ServerAsyncResponseWriter< ::grpc::ByteBuffer>* response, ::grpc::CompletionQueue* new_call_cq, ::grpc::ServerCompletionQueue* notification_cq, void *tag) {
-      ::grpc::Service::RequestAsyncUnary(3, context, request, response, new_call_cq, notification_cq, tag);
-    }
-  };
-  template <class BaseClass>
-  class WithRawCallbackMethod_FetchObject : public BaseClass {
-   private:
-    void BaseClassMustBeDerivedFromService(const Service* /*service*/) {}
-   public:
-    WithRawCallbackMethod_FetchObject() {
-      ::grpc::Service::MarkMethodRawCallback(0,
-          new ::grpc::internal::CallbackUnaryHandler< ::grpc::ByteBuffer, ::grpc::ByteBuffer>(
-            [this](
-                   ::grpc::CallbackServerContext* context, const ::grpc::ByteBuffer* request, ::grpc::ByteBuffer* response) { return this->FetchObject(context, request, response); }));
-    }
-    ~WithRawCallbackMethod_FetchObject() override {
-      BaseClassMustBeDerivedFromService(this);
-    }
-    // disable synchronous version of this method
-    ::grpc::Status FetchObject(::grpc::ServerContext* /*context*/, const ::io::deephaven::proto::backplane::grpc::FetchObjectRequest* /*request*/, ::io::deephaven::proto::backplane::grpc::FetchObjectResponse* /*response*/) override {
-      abort();
-      return ::grpc::Status(::grpc::StatusCode::UNIMPLEMENTED, "");
-    }
-    virtual ::grpc::ServerUnaryReactor* FetchObject(
-      ::grpc::CallbackServerContext* /*context*/, const ::grpc::ByteBuffer* /*request*/, ::grpc::ByteBuffer* /*response*/)  { return nullptr; }
-  };
-  template <class BaseClass>
-  class WithRawCallbackMethod_MessageStream : public BaseClass {
-   private:
-    void BaseClassMustBeDerivedFromService(const Service* /*service*/) {}
-   public:
-    WithRawCallbackMethod_MessageStream() {
-      ::grpc::Service::MarkMethodRawCallback(1,
-          new ::grpc::internal::CallbackBidiHandler< ::grpc::ByteBuffer, ::grpc::ByteBuffer>(
-            [this](
-                   ::grpc::CallbackServerContext* context) { return this->MessageStream(context); }));
-    }
-    ~WithRawCallbackMethod_MessageStream() override {
-      BaseClassMustBeDerivedFromService(this);
-    }
-    // disable synchronous version of this method
-    ::grpc::Status MessageStream(::grpc::ServerContext* /*context*/, ::grpc::ServerReaderWriter< ::io::deephaven::proto::backplane::grpc::StreamResponse, ::io::deephaven::proto::backplane::grpc::StreamRequest>* /*stream*/)  override {
-      abort();
-      return ::grpc::Status(::grpc::StatusCode::UNIMPLEMENTED, "");
-    }
-    virtual ::grpc::ServerBidiReactor< ::grpc::ByteBuffer, ::grpc::ByteBuffer>* MessageStream(
-      ::grpc::CallbackServerContext* /*context*/)
-      { return nullptr; }
-  };
-  template <class BaseClass>
-  class WithRawCallbackMethod_OpenMessageStream : public BaseClass {
-   private:
-    void BaseClassMustBeDerivedFromService(const Service* /*service*/) {}
-   public:
-    WithRawCallbackMethod_OpenMessageStream() {
-      ::grpc::Service::MarkMethodRawCallback(2,
-          new ::grpc::internal::CallbackServerStreamingHandler< ::grpc::ByteBuffer, ::grpc::ByteBuffer>(
-            [this](
-                   ::grpc::CallbackServerContext* context, const::grpc::ByteBuffer* request) { return this->OpenMessageStream(context, request); }));
-    }
-    ~WithRawCallbackMethod_OpenMessageStream() override {
-      BaseClassMustBeDerivedFromService(this);
-    }
-    // disable synchronous version of this method
-    ::grpc::Status OpenMessageStream(::grpc::ServerContext* /*context*/, const ::io::deephaven::proto::backplane::grpc::StreamRequest* /*request*/, ::grpc::ServerWriter< ::io::deephaven::proto::backplane::grpc::StreamResponse>* /*writer*/) override {
-      abort();
-      return ::grpc::Status(::grpc::StatusCode::UNIMPLEMENTED, "");
-    }
-    virtual ::grpc::ServerWriteReactor< ::grpc::ByteBuffer>* OpenMessageStream(
-      ::grpc::CallbackServerContext* /*context*/, const ::grpc::ByteBuffer* /*request*/)  { return nullptr; }
-  };
-  template <class BaseClass>
-  class WithRawCallbackMethod_NextMessageStream : public BaseClass {
-   private:
-    void BaseClassMustBeDerivedFromService(const Service* /*service*/) {}
-   public:
-    WithRawCallbackMethod_NextMessageStream() {
-      ::grpc::Service::MarkMethodRawCallback(3,
-          new ::grpc::internal::CallbackUnaryHandler< ::grpc::ByteBuffer, ::grpc::ByteBuffer>(
-            [this](
-                   ::grpc::CallbackServerContext* context, const ::grpc::ByteBuffer* request, ::grpc::ByteBuffer* response) { return this->NextMessageStream(context, request, response); }));
-    }
-    ~WithRawCallbackMethod_NextMessageStream() override {
-      BaseClassMustBeDerivedFromService(this);
-    }
-    // disable synchronous version of this method
-    ::grpc::Status NextMessageStream(::grpc::ServerContext* /*context*/, const ::io::deephaven::proto::backplane::grpc::StreamRequest* /*request*/, ::io::deephaven::proto::backplane::grpc::BrowserNextResponse* /*response*/) override {
-      abort();
-      return ::grpc::Status(::grpc::StatusCode::UNIMPLEMENTED, "");
-    }
-    virtual ::grpc::ServerUnaryReactor* NextMessageStream(
-      ::grpc::CallbackServerContext* /*context*/, const ::grpc::ByteBuffer* /*request*/, ::grpc::ByteBuffer* /*response*/)  { return nullptr; }
-  };
-  template <class BaseClass>
-  class WithStreamedUnaryMethod_FetchObject : public BaseClass {
-   private:
-    void BaseClassMustBeDerivedFromService(const Service* /*service*/) {}
-   public:
-    WithStreamedUnaryMethod_FetchObject() {
-      ::grpc::Service::MarkMethodStreamed(0,
-        new ::grpc::internal::StreamedUnaryHandler<
-          ::io::deephaven::proto::backplane::grpc::FetchObjectRequest, ::io::deephaven::proto::backplane::grpc::FetchObjectResponse>(
-            [this](::grpc::ServerContext* context,
-                   ::grpc::ServerUnaryStreamer<
-                     ::io::deephaven::proto::backplane::grpc::FetchObjectRequest, ::io::deephaven::proto::backplane::grpc::FetchObjectResponse>* streamer) {
-                       return this->StreamedFetchObject(context,
-                         streamer);
-                  }));
-    }
-    ~WithStreamedUnaryMethod_FetchObject() override {
-      BaseClassMustBeDerivedFromService(this);
-    }
-    // disable regular version of this method
-    ::grpc::Status FetchObject(::grpc::ServerContext* /*context*/, const ::io::deephaven::proto::backplane::grpc::FetchObjectRequest* /*request*/, ::io::deephaven::proto::backplane::grpc::FetchObjectResponse* /*response*/) override {
-      abort();
-      return ::grpc::Status(::grpc::StatusCode::UNIMPLEMENTED, "");
-    }
-    // replace default version of method with streamed unary
-    virtual ::grpc::Status StreamedFetchObject(::grpc::ServerContext* context, ::grpc::ServerUnaryStreamer< ::io::deephaven::proto::backplane::grpc::FetchObjectRequest,::io::deephaven::proto::backplane::grpc::FetchObjectResponse>* server_unary_streamer) = 0;
-  };
-  template <class BaseClass>
-  class WithStreamedUnaryMethod_NextMessageStream : public BaseClass {
-   private:
-    void BaseClassMustBeDerivedFromService(const Service* /*service*/) {}
-   public:
-    WithStreamedUnaryMethod_NextMessageStream() {
-      ::grpc::Service::MarkMethodStreamed(3,
-        new ::grpc::internal::StreamedUnaryHandler<
-          ::io::deephaven::proto::backplane::grpc::StreamRequest, ::io::deephaven::proto::backplane::grpc::BrowserNextResponse>(
-            [this](::grpc::ServerContext* context,
-                   ::grpc::ServerUnaryStreamer<
-                     ::io::deephaven::proto::backplane::grpc::StreamRequest, ::io::deephaven::proto::backplane::grpc::BrowserNextResponse>* streamer) {
-                       return this->StreamedNextMessageStream(context,
-                         streamer);
-                  }));
-    }
-    ~WithStreamedUnaryMethod_NextMessageStream() override {
-      BaseClassMustBeDerivedFromService(this);
-    }
-    // disable regular version of this method
-    ::grpc::Status NextMessageStream(::grpc::ServerContext* /*context*/, const ::io::deephaven::proto::backplane::grpc::StreamRequest* /*request*/, ::io::deephaven::proto::backplane::grpc::BrowserNextResponse* /*response*/) override {
-      abort();
-      return ::grpc::Status(::grpc::StatusCode::UNIMPLEMENTED, "");
-    }
-    // replace default version of method with streamed unary
-    virtual ::grpc::Status StreamedNextMessageStream(::grpc::ServerContext* context, ::grpc::ServerUnaryStreamer< ::io::deephaven::proto::backplane::grpc::StreamRequest,::io::deephaven::proto::backplane::grpc::BrowserNextResponse>* server_unary_streamer) = 0;
-  };
-  typedef WithStreamedUnaryMethod_FetchObject<WithStreamedUnaryMethod_NextMessageStream<Service > > StreamedUnaryService;
-  template <class BaseClass>
-  class WithSplitStreamingMethod_OpenMessageStream : public BaseClass {
-   private:
-    void BaseClassMustBeDerivedFromService(const Service* /*service*/) {}
-   public:
-    WithSplitStreamingMethod_OpenMessageStream() {
-      ::grpc::Service::MarkMethodStreamed(2,
-        new ::grpc::internal::SplitServerStreamingHandler<
-          ::io::deephaven::proto::backplane::grpc::StreamRequest, ::io::deephaven::proto::backplane::grpc::StreamResponse>(
-            [this](::grpc::ServerContext* context,
-                   ::grpc::ServerSplitStreamer<
-                     ::io::deephaven::proto::backplane::grpc::StreamRequest, ::io::deephaven::proto::backplane::grpc::StreamResponse>* streamer) {
-                       return this->StreamedOpenMessageStream(context,
-                         streamer);
-                  }));
-    }
-    ~WithSplitStreamingMethod_OpenMessageStream() override {
-      BaseClassMustBeDerivedFromService(this);
-    }
-    // disable regular version of this method
-    ::grpc::Status OpenMessageStream(::grpc::ServerContext* /*context*/, const ::io::deephaven::proto::backplane::grpc::StreamRequest* /*request*/, ::grpc::ServerWriter< ::io::deephaven::proto::backplane::grpc::StreamResponse>* /*writer*/) override {
-      abort();
-      return ::grpc::Status(::grpc::StatusCode::UNIMPLEMENTED, "");
-    }
-    // replace default version of method with split streamed
-    virtual ::grpc::Status StreamedOpenMessageStream(::grpc::ServerContext* context, ::grpc::ServerSplitStreamer< ::io::deephaven::proto::backplane::grpc::StreamRequest,::io::deephaven::proto::backplane::grpc::StreamResponse>* server_split_streamer) = 0;
-  };
-  typedef WithSplitStreamingMethod_OpenMessageStream<Service > SplitStreamedService;
-  typedef WithStreamedUnaryMethod_FetchObject<WithSplitStreamingMethod_OpenMessageStream<WithStreamedUnaryMethod_NextMessageStream<Service > > > StreamedService;
-};
-
-}  // namespace grpc
-}  // namespace backplane
-}  // namespace proto
-}  // namespace deephaven
-}  // namespace io
-
-
-#endif  // GRPC_deephaven_2fproto_2fobject_2eproto__INCLUDED
diff --git a/cpp-client/deephaven/dhclient/proto/deephaven/proto/object.pb.cc b/cpp-client/deephaven/dhclient/proto/deephaven/proto/object.pb.cc
deleted file mode 100644
index be7a90f8b13..00000000000
--- a/cpp-client/deephaven/dhclient/proto/deephaven/proto/object.pb.cc
+++ /dev/null
@@ -1,2071 +0,0 @@
-// Generated by the protocol buffer compiler.  DO NOT EDIT!
-// source: deephaven/proto/object.proto
-
-#include "deephaven/proto/object.pb.h"
-
-#include <algorithm>
-#include "google/protobuf/io/coded_stream.h"
-#include "google/protobuf/extension_set.h"
-#include "google/protobuf/wire_format_lite.h"
-#include "google/protobuf/descriptor.h"
-#include "google/protobuf/generated_message_reflection.h"
-#include "google/protobuf/reflection_ops.h"
-#include "google/protobuf/wire_format.h"
-#include "google/protobuf/generated_message_tctable_impl.h"
-// @@protoc_insertion_point(includes)
-
-// Must be included last.
-#include "google/protobuf/port_def.inc"
-PROTOBUF_PRAGMA_INIT_SEG
-namespace _pb = ::google::protobuf;
-namespace _pbi = ::google::protobuf::internal;
-namespace _fl = ::google::protobuf::internal::field_layout;
-namespace io {
-namespace deephaven {
-namespace proto {
-namespace backplane {
-namespace grpc {
-      template <typename>
-PROTOBUF_CONSTEXPR BrowserNextResponse::BrowserNextResponse(::_pbi::ConstantInitialized) {}
-struct BrowserNextResponseDefaultTypeInternal {
-  PROTOBUF_CONSTEXPR BrowserNextResponseDefaultTypeInternal() : _instance(::_pbi::ConstantInitialized{}) {}
-  ~BrowserNextResponseDefaultTypeInternal() {}
-  union {
-    BrowserNextResponse _instance;
-  };
-};
-
-PROTOBUF_ATTRIBUTE_NO_DESTROY PROTOBUF_CONSTINIT
-    PROTOBUF_ATTRIBUTE_INIT_PRIORITY1 BrowserNextResponseDefaultTypeInternal _BrowserNextResponse_default_instance_;
-
-inline constexpr ServerData::Impl_::Impl_(
-    ::_pbi::ConstantInitialized) noexcept
-      : exported_references_{},
-        payload_(
-            &::google::protobuf::internal::fixed_address_empty_string,
-            ::_pbi::ConstantInitialized()),
-        _cached_size_{0} {}
-
-template <typename>
-PROTOBUF_CONSTEXPR ServerData::ServerData(::_pbi::ConstantInitialized)
-    : _impl_(::_pbi::ConstantInitialized()) {}
-struct ServerDataDefaultTypeInternal {
-  PROTOBUF_CONSTEXPR ServerDataDefaultTypeInternal() : _instance(::_pbi::ConstantInitialized{}) {}
-  ~ServerDataDefaultTypeInternal() {}
-  union {
-    ServerData _instance;
-  };
-};
-
-PROTOBUF_ATTRIBUTE_NO_DESTROY PROTOBUF_CONSTINIT
-    PROTOBUF_ATTRIBUTE_INIT_PRIORITY1 ServerDataDefaultTypeInternal _ServerData_default_instance_;
-
-inline constexpr FetchObjectResponse::Impl_::Impl_(
-    ::_pbi::ConstantInitialized) noexcept
-      : typed_export_ids_{},
-        type_(
-            &::google::protobuf::internal::fixed_address_empty_string,
-            ::_pbi::ConstantInitialized()),
-        data_(
-            &::google::protobuf::internal::fixed_address_empty_string,
-            ::_pbi::ConstantInitialized()),
-        _cached_size_{0} {}
-
-template <typename>
-PROTOBUF_CONSTEXPR FetchObjectResponse::FetchObjectResponse(::_pbi::ConstantInitialized)
-    : _impl_(::_pbi::ConstantInitialized()) {}
-struct FetchObjectResponseDefaultTypeInternal {
-  PROTOBUF_CONSTEXPR FetchObjectResponseDefaultTypeInternal() : _instance(::_pbi::ConstantInitialized{}) {}
-  ~FetchObjectResponseDefaultTypeInternal() {}
-  union {
-    FetchObjectResponse _instance;
-  };
-};
-
-PROTOBUF_ATTRIBUTE_NO_DESTROY PROTOBUF_CONSTINIT
-    PROTOBUF_ATTRIBUTE_INIT_PRIORITY1 FetchObjectResponseDefaultTypeInternal _FetchObjectResponse_default_instance_;
-
-inline constexpr FetchObjectRequest::Impl_::Impl_(
-    ::_pbi::ConstantInitialized) noexcept
-      : _cached_size_{0},
-        source_id_{nullptr} {}
-
-template <typename>
-PROTOBUF_CONSTEXPR FetchObjectRequest::FetchObjectRequest(::_pbi::ConstantInitialized)
-    : _impl_(::_pbi::ConstantInitialized()) {}
-struct FetchObjectRequestDefaultTypeInternal {
-  PROTOBUF_CONSTEXPR FetchObjectRequestDefaultTypeInternal() : _instance(::_pbi::ConstantInitialized{}) {}
-  ~FetchObjectRequestDefaultTypeInternal() {}
-  union {
-    FetchObjectRequest _instance;
-  };
-};
-
-PROTOBUF_ATTRIBUTE_NO_DESTROY PROTOBUF_CONSTINIT
-    PROTOBUF_ATTRIBUTE_INIT_PRIORITY1 FetchObjectRequestDefaultTypeInternal _FetchObjectRequest_default_instance_;
-
-inline constexpr ConnectRequest::Impl_::Impl_(
-    ::_pbi::ConstantInitialized) noexcept
-      : _cached_size_{0},
-        source_id_{nullptr} {}
-
-template <typename>
-PROTOBUF_CONSTEXPR ConnectRequest::ConnectRequest(::_pbi::ConstantInitialized)
-    : _impl_(::_pbi::ConstantInitialized()) {}
-struct ConnectRequestDefaultTypeInternal {
-  PROTOBUF_CONSTEXPR ConnectRequestDefaultTypeInternal() : _instance(::_pbi::ConstantInitialized{}) {}
-  ~ConnectRequestDefaultTypeInternal() {}
-  union {
-    ConnectRequest _instance;
-  };
-};
-
-PROTOBUF_ATTRIBUTE_NO_DESTROY PROTOBUF_CONSTINIT
-    PROTOBUF_ATTRIBUTE_INIT_PRIORITY1 ConnectRequestDefaultTypeInternal _ConnectRequest_default_instance_;
-
-inline constexpr ClientData::Impl_::Impl_(
-    ::_pbi::ConstantInitialized) noexcept
-      : references_{},
-        payload_(
-            &::google::protobuf::internal::fixed_address_empty_string,
-            ::_pbi::ConstantInitialized()),
-        _cached_size_{0} {}
-
-template <typename>
-PROTOBUF_CONSTEXPR ClientData::ClientData(::_pbi::ConstantInitialized)
-    : _impl_(::_pbi::ConstantInitialized()) {}
-struct ClientDataDefaultTypeInternal {
-  PROTOBUF_CONSTEXPR ClientDataDefaultTypeInternal() : _instance(::_pbi::ConstantInitialized{}) {}
-  ~ClientDataDefaultTypeInternal() {}
-  union {
-    ClientData _instance;
-  };
-};
-
-PROTOBUF_ATTRIBUTE_NO_DESTROY PROTOBUF_CONSTINIT
-    PROTOBUF_ATTRIBUTE_INIT_PRIORITY1 ClientDataDefaultTypeInternal _ClientData_default_instance_;
-
-inline constexpr StreamResponse::Impl_::Impl_(
-    ::_pbi::ConstantInitialized) noexcept
-      : message_{},
-        _cached_size_{0},
-        _oneof_case_{} {}
-
-template <typename>
-PROTOBUF_CONSTEXPR StreamResponse::StreamResponse(::_pbi::ConstantInitialized)
-    : _impl_(::_pbi::ConstantInitialized()) {}
-struct StreamResponseDefaultTypeInternal {
-  PROTOBUF_CONSTEXPR StreamResponseDefaultTypeInternal() : _instance(::_pbi::ConstantInitialized{}) {}
-  ~StreamResponseDefaultTypeInternal() {}
-  union {
-    StreamResponse _instance;
-  };
-};
-
-PROTOBUF_ATTRIBUTE_NO_DESTROY PROTOBUF_CONSTINIT
-    PROTOBUF_ATTRIBUTE_INIT_PRIORITY1 StreamResponseDefaultTypeInternal _StreamResponse_default_instance_;
-
-inline constexpr StreamRequest::Impl_::Impl_(
-    ::_pbi::ConstantInitialized) noexcept
-      : message_{},
-        _cached_size_{0},
-        _oneof_case_{} {}
-
-template <typename>
-PROTOBUF_CONSTEXPR StreamRequest::StreamRequest(::_pbi::ConstantInitialized)
-    : _impl_(::_pbi::ConstantInitialized()) {}
-struct StreamRequestDefaultTypeInternal {
-  PROTOBUF_CONSTEXPR StreamRequestDefaultTypeInternal() : _instance(::_pbi::ConstantInitialized{}) {}
-  ~StreamRequestDefaultTypeInternal() {}
-  union {
-    StreamRequest _instance;
-  };
-};
-
-PROTOBUF_ATTRIBUTE_NO_DESTROY PROTOBUF_CONSTINIT
-    PROTOBUF_ATTRIBUTE_INIT_PRIORITY1 StreamRequestDefaultTypeInternal _StreamRequest_default_instance_;
-}  // namespace grpc
-}  // namespace backplane
-}  // namespace proto
-}  // namespace deephaven
-}  // namespace io
-static ::_pb::Metadata file_level_metadata_deephaven_2fproto_2fobject_2eproto[8];
-static constexpr const ::_pb::EnumDescriptor**
-    file_level_enum_descriptors_deephaven_2fproto_2fobject_2eproto = nullptr;
-static constexpr const ::_pb::ServiceDescriptor**
-    file_level_service_descriptors_deephaven_2fproto_2fobject_2eproto = nullptr;
-const ::uint32_t TableStruct_deephaven_2fproto_2fobject_2eproto::offsets[] PROTOBUF_SECTION_VARIABLE(
-    protodesc_cold) = {
-    PROTOBUF_FIELD_OFFSET(::io::deephaven::proto::backplane::grpc::FetchObjectRequest, _impl_._has_bits_),
-    PROTOBUF_FIELD_OFFSET(::io::deephaven::proto::backplane::grpc::FetchObjectRequest, _internal_metadata_),
-    ~0u,  // no _extensions_
-    ~0u,  // no _oneof_case_
-    ~0u,  // no _weak_field_map_
-    ~0u,  // no _inlined_string_donated_
-    ~0u,  // no _split_
-    ~0u,  // no sizeof(Split)
-    PROTOBUF_FIELD_OFFSET(::io::deephaven::proto::backplane::grpc::FetchObjectRequest, _impl_.source_id_),
-    0,
-    ~0u,  // no _has_bits_
-    PROTOBUF_FIELD_OFFSET(::io::deephaven::proto::backplane::grpc::FetchObjectResponse, _internal_metadata_),
-    ~0u,  // no _extensions_
-    ~0u,  // no _oneof_case_
-    ~0u,  // no _weak_field_map_
-    ~0u,  // no _inlined_string_donated_
-    ~0u,  // no _split_
-    ~0u,  // no sizeof(Split)
-    PROTOBUF_FIELD_OFFSET(::io::deephaven::proto::backplane::grpc::FetchObjectResponse, _impl_.type_),
-    PROTOBUF_FIELD_OFFSET(::io::deephaven::proto::backplane::grpc::FetchObjectResponse, _impl_.data_),
-    PROTOBUF_FIELD_OFFSET(::io::deephaven::proto::backplane::grpc::FetchObjectResponse, _impl_.typed_export_ids_),
-    PROTOBUF_FIELD_OFFSET(::io::deephaven::proto::backplane::grpc::ConnectRequest, _impl_._has_bits_),
-    PROTOBUF_FIELD_OFFSET(::io::deephaven::proto::backplane::grpc::ConnectRequest, _internal_metadata_),
-    ~0u,  // no _extensions_
-    ~0u,  // no _oneof_case_
-    ~0u,  // no _weak_field_map_
-    ~0u,  // no _inlined_string_donated_
-    ~0u,  // no _split_
-    ~0u,  // no sizeof(Split)
-    PROTOBUF_FIELD_OFFSET(::io::deephaven::proto::backplane::grpc::ConnectRequest, _impl_.source_id_),
-    0,
-    ~0u,  // no _has_bits_
-    PROTOBUF_FIELD_OFFSET(::io::deephaven::proto::backplane::grpc::ClientData, _internal_metadata_),
-    ~0u,  // no _extensions_
-    ~0u,  // no _oneof_case_
-    ~0u,  // no _weak_field_map_
-    ~0u,  // no _inlined_string_donated_
-    ~0u,  // no _split_
-    ~0u,  // no sizeof(Split)
-    PROTOBUF_FIELD_OFFSET(::io::deephaven::proto::backplane::grpc::ClientData, _impl_.payload_),
-    PROTOBUF_FIELD_OFFSET(::io::deephaven::proto::backplane::grpc::ClientData, _impl_.references_),
-    ~0u,  // no _has_bits_
-    PROTOBUF_FIELD_OFFSET(::io::deephaven::proto::backplane::grpc::ServerData, _internal_metadata_),
-    ~0u,  // no _extensions_
-    ~0u,  // no _oneof_case_
-    ~0u,  // no _weak_field_map_
-    ~0u,  // no _inlined_string_donated_
-    ~0u,  // no _split_
-    ~0u,  // no sizeof(Split)
-    PROTOBUF_FIELD_OFFSET(::io::deephaven::proto::backplane::grpc::ServerData, _impl_.payload_),
-    PROTOBUF_FIELD_OFFSET(::io::deephaven::proto::backplane::grpc::ServerData, _impl_.exported_references_),
-    ~0u,  // no _has_bits_
-    PROTOBUF_FIELD_OFFSET(::io::deephaven::proto::backplane::grpc::StreamRequest, _internal_metadata_),
-    ~0u,  // no _extensions_
-    PROTOBUF_FIELD_OFFSET(::io::deephaven::proto::backplane::grpc::StreamRequest, _impl_._oneof_case_[0]),
-    ~0u,  // no _weak_field_map_
-    ~0u,  // no _inlined_string_donated_
-    ~0u,  // no _split_
-    ~0u,  // no sizeof(Split)
-    ::_pbi::kInvalidFieldOffsetTag,
-    ::_pbi::kInvalidFieldOffsetTag,
-    PROTOBUF_FIELD_OFFSET(::io::deephaven::proto::backplane::grpc::StreamRequest, _impl_.message_),
-    ~0u,  // no _has_bits_
-    PROTOBUF_FIELD_OFFSET(::io::deephaven::proto::backplane::grpc::StreamResponse, _internal_metadata_),
-    ~0u,  // no _extensions_
-    PROTOBUF_FIELD_OFFSET(::io::deephaven::proto::backplane::grpc::StreamResponse, _impl_._oneof_case_[0]),
-    ~0u,  // no _weak_field_map_
-    ~0u,  // no _inlined_string_donated_
-    ~0u,  // no _split_
-    ~0u,  // no sizeof(Split)
-    ::_pbi::kInvalidFieldOffsetTag,
-    PROTOBUF_FIELD_OFFSET(::io::deephaven::proto::backplane::grpc::StreamResponse, _impl_.message_),
-    ~0u,  // no _has_bits_
-    PROTOBUF_FIELD_OFFSET(::io::deephaven::proto::backplane::grpc::BrowserNextResponse, _internal_metadata_),
-    ~0u,  // no _extensions_
-    ~0u,  // no _oneof_case_
-    ~0u,  // no _weak_field_map_
-    ~0u,  // no _inlined_string_donated_
-    ~0u,  // no _split_
-    ~0u,  // no sizeof(Split)
-};
-
-static const ::_pbi::MigrationSchema
-    schemas[] PROTOBUF_SECTION_VARIABLE(protodesc_cold) = {
-        {0, 9, -1, sizeof(::io::deephaven::proto::backplane::grpc::FetchObjectRequest)},
-        {10, -1, -1, sizeof(::io::deephaven::proto::backplane::grpc::FetchObjectResponse)},
-        {21, 30, -1, sizeof(::io::deephaven::proto::backplane::grpc::ConnectRequest)},
-        {31, -1, -1, sizeof(::io::deephaven::proto::backplane::grpc::ClientData)},
-        {41, -1, -1, sizeof(::io::deephaven::proto::backplane::grpc::ServerData)},
-        {51, -1, -1, sizeof(::io::deephaven::proto::backplane::grpc::StreamRequest)},
-        {62, -1, -1, sizeof(::io::deephaven::proto::backplane::grpc::StreamResponse)},
-        {72, -1, -1, sizeof(::io::deephaven::proto::backplane::grpc::BrowserNextResponse)},
-};
-
-static const ::_pb::Message* const file_default_instances[] = {
-    &::io::deephaven::proto::backplane::grpc::_FetchObjectRequest_default_instance_._instance,
-    &::io::deephaven::proto::backplane::grpc::_FetchObjectResponse_default_instance_._instance,
-    &::io::deephaven::proto::backplane::grpc::_ConnectRequest_default_instance_._instance,
-    &::io::deephaven::proto::backplane::grpc::_ClientData_default_instance_._instance,
-    &::io::deephaven::proto::backplane::grpc::_ServerData_default_instance_._instance,
-    &::io::deephaven::proto::backplane::grpc::_StreamRequest_default_instance_._instance,
-    &::io::deephaven::proto::backplane::grpc::_StreamResponse_default_instance_._instance,
-    &::io::deephaven::proto::backplane::grpc::_BrowserNextResponse_default_instance_._instance,
-};
-const char descriptor_table_protodef_deephaven_2fproto_2fobject_2eproto[] PROTOBUF_SECTION_VARIABLE(protodesc_cold) = {
-    "\n\034deephaven/proto/object.proto\022!io.deeph"
-    "aven.proto.backplane.grpc\032\034deephaven/pro"
-    "to/ticket.proto\"W\n\022FetchObjectRequest\022A\n"
-    "\tsource_id\030\001 \001(\0132..io.deephaven.proto.ba"
-    "ckplane.grpc.TypedTicket\"{\n\023FetchObjectR"
-    "esponse\022\014\n\004type\030\001 \001(\t\022\014\n\004data\030\002 \001(\014\022H\n\020t"
-    "yped_export_ids\030\003 \003(\0132..io.deephaven.pro"
-    "to.backplane.grpc.TypedTicket\"S\n\016Connect"
-    "Request\022A\n\tsource_id\030\001 \001(\0132..io.deephave"
-    "n.proto.backplane.grpc.TypedTicket\"a\n\nCl"
-    "ientData\022\017\n\007payload\030\001 \001(\014\022B\n\nreferences\030"
-    "\002 \003(\0132..io.deephaven.proto.backplane.grp"
-    "c.TypedTicket\"j\n\nServerData\022\017\n\007payload\030\001"
-    " \001(\014\022K\n\023exported_references\030\002 \003(\0132..io.d"
-    "eephaven.proto.backplane.grpc.TypedTicke"
-    "t\"\237\001\n\rStreamRequest\022D\n\007connect\030\001 \001(\01321.i"
-    "o.deephaven.proto.backplane.grpc.Connect"
-    "RequestH\000\022=\n\004data\030\002 \001(\0132-.io.deephaven.p"
-    "roto.backplane.grpc.ClientDataH\000B\t\n\007mess"
-    "age\"Z\n\016StreamResponse\022=\n\004data\030\001 \001(\0132-.io"
-    ".deephaven.proto.backplane.grpc.ServerDa"
-    "taH\000B\t\n\007message\"\025\n\023BrowserNextResponse2\216"
-    "\004\n\rObjectService\022\201\001\n\013FetchObject\0225.io.de"
-    "ephaven.proto.backplane.grpc.FetchObject"
-    "Request\0326.io.deephaven.proto.backplane.g"
-    "rpc.FetchObjectResponse\"\003\210\002\001\022z\n\rMessageS"
-    "tream\0220.io.deephaven.proto.backplane.grp"
-    "c.StreamRequest\0321.io.deephaven.proto.bac"
-    "kplane.grpc.StreamResponse\"\000(\0010\001\022|\n\021Open"
-    "MessageStream\0220.io.deephaven.proto.backp"
-    "lane.grpc.StreamRequest\0321.io.deephaven.p"
-    "roto.backplane.grpc.StreamResponse\"\0000\001\022\177"
-    "\n\021NextMessageStream\0220.io.deephaven.proto"
-    ".backplane.grpc.StreamRequest\0326.io.deeph"
-    "aven.proto.backplane.grpc.BrowserNextRes"
-    "ponse\"\000BBH\001P\001Z<github.com/deephaven/deep"
-    "haven-core/go/internal/proto/objectb\006pro"
-    "to3"
-};
-static const ::_pbi::DescriptorTable* const descriptor_table_deephaven_2fproto_2fobject_2eproto_deps[1] =
-    {
-        &::descriptor_table_deephaven_2fproto_2fticket_2eproto,
-};
-static ::absl::once_flag descriptor_table_deephaven_2fproto_2fobject_2eproto_once;
-const ::_pbi::DescriptorTable descriptor_table_deephaven_2fproto_2fobject_2eproto = {
-    false,
-    false,
-    1483,
-    descriptor_table_protodef_deephaven_2fproto_2fobject_2eproto,
-    "deephaven/proto/object.proto",
-    &descriptor_table_deephaven_2fproto_2fobject_2eproto_once,
-    descriptor_table_deephaven_2fproto_2fobject_2eproto_deps,
-    1,
-    8,
-    schemas,
-    file_default_instances,
-    TableStruct_deephaven_2fproto_2fobject_2eproto::offsets,
-    file_level_metadata_deephaven_2fproto_2fobject_2eproto,
-    file_level_enum_descriptors_deephaven_2fproto_2fobject_2eproto,
-    file_level_service_descriptors_deephaven_2fproto_2fobject_2eproto,
-};
-
-// This function exists to be marked as weak.
-// It can significantly speed up compilation by breaking up LLVM's SCC
-// in the .pb.cc translation units. Large translation units see a
-// reduction of more than 35% of walltime for optimized builds. Without
-// the weak attribute all the messages in the file, including all the
-// vtables and everything they use become part of the same SCC through
-// a cycle like:
-// GetMetadata -> descriptor table -> default instances ->
-//   vtables -> GetMetadata
-// By adding a weak function here we break the connection from the
-// individual vtables back into the descriptor table.
-PROTOBUF_ATTRIBUTE_WEAK const ::_pbi::DescriptorTable* descriptor_table_deephaven_2fproto_2fobject_2eproto_getter() {
-  return &descriptor_table_deephaven_2fproto_2fobject_2eproto;
-}
-// Force running AddDescriptors() at dynamic initialization time.
-PROTOBUF_ATTRIBUTE_INIT_PRIORITY2
-static ::_pbi::AddDescriptorsRunner dynamic_init_dummy_deephaven_2fproto_2fobject_2eproto(&descriptor_table_deephaven_2fproto_2fobject_2eproto);
-namespace io {
-namespace deephaven {
-namespace proto {
-namespace backplane {
-namespace grpc {
-// ===================================================================
-
-class FetchObjectRequest::_Internal {
- public:
-  using HasBits = decltype(std::declval<FetchObjectRequest>()._impl_._has_bits_);
-  static constexpr ::int32_t kHasBitsOffset =
-    8 * PROTOBUF_FIELD_OFFSET(FetchObjectRequest, _impl_._has_bits_);
-  static const ::io::deephaven::proto::backplane::grpc::TypedTicket& source_id(const FetchObjectRequest* msg);
-  static void set_has_source_id(HasBits* has_bits) {
-    (*has_bits)[0] |= 1u;
-  }
-};
-
-const ::io::deephaven::proto::backplane::grpc::TypedTicket& FetchObjectRequest::_Internal::source_id(const FetchObjectRequest* msg) {
-  return *msg->_impl_.source_id_;
-}
-void FetchObjectRequest::clear_source_id() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  if (_impl_.source_id_ != nullptr) _impl_.source_id_->Clear();
-  _impl_._has_bits_[0] &= ~0x00000001u;
-}
-FetchObjectRequest::FetchObjectRequest(::google::protobuf::Arena* arena)
-    : ::google::protobuf::Message(arena) {
-  SharedCtor(arena);
-  // @@protoc_insertion_point(arena_constructor:io.deephaven.proto.backplane.grpc.FetchObjectRequest)
-}
-inline PROTOBUF_NDEBUG_INLINE FetchObjectRequest::Impl_::Impl_(
-    ::google::protobuf::internal::InternalVisibility visibility, ::google::protobuf::Arena* arena,
-    const Impl_& from)
-      : _has_bits_{from._has_bits_},
-        _cached_size_{0} {}
-
-FetchObjectRequest::FetchObjectRequest(
-    ::google::protobuf::Arena* arena,
-    const FetchObjectRequest& from)
-    : ::google::protobuf::Message(arena) {
-  FetchObjectRequest* const _this = this;
-  (void)_this;
-  _internal_metadata_.MergeFrom<::google::protobuf::UnknownFieldSet>(
-      from._internal_metadata_);
-  new (&_impl_) Impl_(internal_visibility(), arena, from._impl_);
-  ::uint32_t cached_has_bits = _impl_._has_bits_[0];
-  _impl_.source_id_ = (cached_has_bits & 0x00000001u)
-                ? CreateMaybeMessage<::io::deephaven::proto::backplane::grpc::TypedTicket>(arena, *from._impl_.source_id_)
-                : nullptr;
-
-  // @@protoc_insertion_point(copy_constructor:io.deephaven.proto.backplane.grpc.FetchObjectRequest)
-}
-inline PROTOBUF_NDEBUG_INLINE FetchObjectRequest::Impl_::Impl_(
-    ::google::protobuf::internal::InternalVisibility visibility,
-    ::google::protobuf::Arena* arena)
-      : _cached_size_{0} {}
-
-inline void FetchObjectRequest::SharedCtor(::_pb::Arena* arena) {
-  new (&_impl_) Impl_(internal_visibility(), arena);
-  _impl_.source_id_ = {};
-}
-FetchObjectRequest::~FetchObjectRequest() {
-  // @@protoc_insertion_point(destructor:io.deephaven.proto.backplane.grpc.FetchObjectRequest)
-  _internal_metadata_.Delete<::google::protobuf::UnknownFieldSet>();
-  SharedDtor();
-}
-inline void FetchObjectRequest::SharedDtor() {
-  ABSL_DCHECK(GetArena() == nullptr);
-  delete _impl_.source_id_;
-  _impl_.~Impl_();
-}
-
-PROTOBUF_NOINLINE void FetchObjectRequest::Clear() {
-// @@protoc_insertion_point(message_clear_start:io.deephaven.proto.backplane.grpc.FetchObjectRequest)
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  ::uint32_t cached_has_bits = 0;
-  // Prevent compiler warnings about cached_has_bits being unused
-  (void) cached_has_bits;
-
-  cached_has_bits = _impl_._has_bits_[0];
-  if (cached_has_bits & 0x00000001u) {
-    ABSL_DCHECK(_impl_.source_id_ != nullptr);
-    _impl_.source_id_->Clear();
-  }
-  _impl_._has_bits_.Clear();
-  _internal_metadata_.Clear<::google::protobuf::UnknownFieldSet>();
-}
-
-const char* FetchObjectRequest::_InternalParse(
-    const char* ptr, ::_pbi::ParseContext* ctx) {
-  ptr = ::_pbi::TcParser::ParseLoop(this, ptr, ctx, &_table_.header);
-  return ptr;
-}
-
-
-PROTOBUF_CONSTINIT PROTOBUF_ATTRIBUTE_INIT_PRIORITY1
-const ::_pbi::TcParseTable<0, 1, 1, 0, 2> FetchObjectRequest::_table_ = {
-  {
-    PROTOBUF_FIELD_OFFSET(FetchObjectRequest, _impl_._has_bits_),
-    0, // no _extensions_
-    1, 0,  // max_field_number, fast_idx_mask
-    offsetof(decltype(_table_), field_lookup_table),
-    4294967294,  // skipmap
-    offsetof(decltype(_table_), field_entries),
-    1,  // num_field_entries
-    1,  // num_aux_entries
-    offsetof(decltype(_table_), aux_entries),
-    &_FetchObjectRequest_default_instance_._instance,
-    ::_pbi::TcParser::GenericFallback,  // fallback
-  }, {{
-    // .io.deephaven.proto.backplane.grpc.TypedTicket source_id = 1;
-    {::_pbi::TcParser::FastMtS1,
-     {10, 0, 0, PROTOBUF_FIELD_OFFSET(FetchObjectRequest, _impl_.source_id_)}},
-  }}, {{
-    65535, 65535
-  }}, {{
-    // .io.deephaven.proto.backplane.grpc.TypedTicket source_id = 1;
-    {PROTOBUF_FIELD_OFFSET(FetchObjectRequest, _impl_.source_id_), _Internal::kHasBitsOffset + 0, 0,
-    (0 | ::_fl::kFcOptional | ::_fl::kMessage | ::_fl::kTvTable)},
-  }}, {{
-    {::_pbi::TcParser::GetTable<::io::deephaven::proto::backplane::grpc::TypedTicket>()},
-  }}, {{
-  }},
-};
-
-::uint8_t* FetchObjectRequest::_InternalSerialize(
-    ::uint8_t* target,
-    ::google::protobuf::io::EpsCopyOutputStream* stream) const {
-  // @@protoc_insertion_point(serialize_to_array_start:io.deephaven.proto.backplane.grpc.FetchObjectRequest)
-  ::uint32_t cached_has_bits = 0;
-  (void)cached_has_bits;
-
-  cached_has_bits = _impl_._has_bits_[0];
-  // .io.deephaven.proto.backplane.grpc.TypedTicket source_id = 1;
-  if (cached_has_bits & 0x00000001u) {
-    target = ::google::protobuf::internal::WireFormatLite::InternalWriteMessage(
-        1, _Internal::source_id(this),
-        _Internal::source_id(this).GetCachedSize(), target, stream);
-  }
-
-  if (PROTOBUF_PREDICT_FALSE(_internal_metadata_.have_unknown_fields())) {
-    target =
-        ::_pbi::WireFormat::InternalSerializeUnknownFieldsToArray(
-            _internal_metadata_.unknown_fields<::google::protobuf::UnknownFieldSet>(::google::protobuf::UnknownFieldSet::default_instance), target, stream);
-  }
-  // @@protoc_insertion_point(serialize_to_array_end:io.deephaven.proto.backplane.grpc.FetchObjectRequest)
-  return target;
-}
-
-::size_t FetchObjectRequest::ByteSizeLong() const {
-// @@protoc_insertion_point(message_byte_size_start:io.deephaven.proto.backplane.grpc.FetchObjectRequest)
-  ::size_t total_size = 0;
-
-  ::uint32_t cached_has_bits = 0;
-  // Prevent compiler warnings about cached_has_bits being unused
-  (void) cached_has_bits;
-
-  // .io.deephaven.proto.backplane.grpc.TypedTicket source_id = 1;
-  cached_has_bits = _impl_._has_bits_[0];
-  if (cached_has_bits & 0x00000001u) {
-    total_size +=
-        1 + ::google::protobuf::internal::WireFormatLite::MessageSize(*_impl_.source_id_);
-  }
-
-  return MaybeComputeUnknownFieldsSize(total_size, &_impl_._cached_size_);
-}
-
-const ::google::protobuf::Message::ClassData FetchObjectRequest::_class_data_ = {
-    FetchObjectRequest::MergeImpl,
-    nullptr,  // OnDemandRegisterArenaDtor
-};
-const ::google::protobuf::Message::ClassData* FetchObjectRequest::GetClassData() const {
-  return &_class_data_;
-}
-
-void FetchObjectRequest::MergeImpl(::google::protobuf::Message& to_msg, const ::google::protobuf::Message& from_msg) {
-  auto* const _this = static_cast<FetchObjectRequest*>(&to_msg);
-  auto& from = static_cast<const FetchObjectRequest&>(from_msg);
-  // @@protoc_insertion_point(class_specific_merge_from_start:io.deephaven.proto.backplane.grpc.FetchObjectRequest)
-  ABSL_DCHECK_NE(&from, _this);
-  ::uint32_t cached_has_bits = 0;
-  (void) cached_has_bits;
-
-  if ((from._impl_._has_bits_[0] & 0x00000001u) != 0) {
-    _this->_internal_mutable_source_id()->::io::deephaven::proto::backplane::grpc::TypedTicket::MergeFrom(
-        from._internal_source_id());
-  }
-  _this->_internal_metadata_.MergeFrom<::google::protobuf::UnknownFieldSet>(from._internal_metadata_);
-}
-
-void FetchObjectRequest::CopyFrom(const FetchObjectRequest& from) {
-// @@protoc_insertion_point(class_specific_copy_from_start:io.deephaven.proto.backplane.grpc.FetchObjectRequest)
-  if (&from == this) return;
-  Clear();
-  MergeFrom(from);
-}
-
-PROTOBUF_NOINLINE bool FetchObjectRequest::IsInitialized() const {
-  return true;
-}
-
-::_pbi::CachedSize* FetchObjectRequest::AccessCachedSize() const {
-  return &_impl_._cached_size_;
-}
-void FetchObjectRequest::InternalSwap(FetchObjectRequest* PROTOBUF_RESTRICT other) {
-  using std::swap;
-  _internal_metadata_.InternalSwap(&other->_internal_metadata_);
-  swap(_impl_._has_bits_[0], other->_impl_._has_bits_[0]);
-  swap(_impl_.source_id_, other->_impl_.source_id_);
-}
-
-::google::protobuf::Metadata FetchObjectRequest::GetMetadata() const {
-  return ::_pbi::AssignDescriptors(
-      &descriptor_table_deephaven_2fproto_2fobject_2eproto_getter, &descriptor_table_deephaven_2fproto_2fobject_2eproto_once,
-      file_level_metadata_deephaven_2fproto_2fobject_2eproto[0]);
-}
-// ===================================================================
-
-class FetchObjectResponse::_Internal {
- public:
-};
-
-void FetchObjectResponse::clear_typed_export_ids() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  _impl_.typed_export_ids_.Clear();
-}
-FetchObjectResponse::FetchObjectResponse(::google::protobuf::Arena* arena)
-    : ::google::protobuf::Message(arena) {
-  SharedCtor(arena);
-  // @@protoc_insertion_point(arena_constructor:io.deephaven.proto.backplane.grpc.FetchObjectResponse)
-}
-inline PROTOBUF_NDEBUG_INLINE FetchObjectResponse::Impl_::Impl_(
-    ::google::protobuf::internal::InternalVisibility visibility, ::google::protobuf::Arena* arena,
-    const Impl_& from)
-      : typed_export_ids_{visibility, arena, from.typed_export_ids_},
-        type_(arena, from.type_),
-        data_(arena, from.data_),
-        _cached_size_{0} {}
-
-FetchObjectResponse::FetchObjectResponse(
-    ::google::protobuf::Arena* arena,
-    const FetchObjectResponse& from)
-    : ::google::protobuf::Message(arena) {
-  FetchObjectResponse* const _this = this;
-  (void)_this;
-  _internal_metadata_.MergeFrom<::google::protobuf::UnknownFieldSet>(
-      from._internal_metadata_);
-  new (&_impl_) Impl_(internal_visibility(), arena, from._impl_);
-
-  // @@protoc_insertion_point(copy_constructor:io.deephaven.proto.backplane.grpc.FetchObjectResponse)
-}
-inline PROTOBUF_NDEBUG_INLINE FetchObjectResponse::Impl_::Impl_(
-    ::google::protobuf::internal::InternalVisibility visibility,
-    ::google::protobuf::Arena* arena)
-      : typed_export_ids_{visibility, arena},
-        type_(arena),
-        data_(arena),
-        _cached_size_{0} {}
-
-inline void FetchObjectResponse::SharedCtor(::_pb::Arena* arena) {
-  new (&_impl_) Impl_(internal_visibility(), arena);
-}
-FetchObjectResponse::~FetchObjectResponse() {
-  // @@protoc_insertion_point(destructor:io.deephaven.proto.backplane.grpc.FetchObjectResponse)
-  _internal_metadata_.Delete<::google::protobuf::UnknownFieldSet>();
-  SharedDtor();
-}
-inline void FetchObjectResponse::SharedDtor() {
-  ABSL_DCHECK(GetArena() == nullptr);
-  _impl_.type_.Destroy();
-  _impl_.data_.Destroy();
-  _impl_.~Impl_();
-}
-
-PROTOBUF_NOINLINE void FetchObjectResponse::Clear() {
-// @@protoc_insertion_point(message_clear_start:io.deephaven.proto.backplane.grpc.FetchObjectResponse)
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  ::uint32_t cached_has_bits = 0;
-  // Prevent compiler warnings about cached_has_bits being unused
-  (void) cached_has_bits;
-
-  _impl_.typed_export_ids_.Clear();
-  _impl_.type_.ClearToEmpty();
-  _impl_.data_.ClearToEmpty();
-  _internal_metadata_.Clear<::google::protobuf::UnknownFieldSet>();
-}
-
-const char* FetchObjectResponse::_InternalParse(
-    const char* ptr, ::_pbi::ParseContext* ctx) {
-  ptr = ::_pbi::TcParser::ParseLoop(this, ptr, ctx, &_table_.header);
-  return ptr;
-}
-
-
-PROTOBUF_CONSTINIT PROTOBUF_ATTRIBUTE_INIT_PRIORITY1
-const ::_pbi::TcParseTable<2, 3, 1, 66, 2> FetchObjectResponse::_table_ = {
-  {
-    0,  // no _has_bits_
-    0, // no _extensions_
-    3, 24,  // max_field_number, fast_idx_mask
-    offsetof(decltype(_table_), field_lookup_table),
-    4294967288,  // skipmap
-    offsetof(decltype(_table_), field_entries),
-    3,  // num_field_entries
-    1,  // num_aux_entries
-    offsetof(decltype(_table_), aux_entries),
-    &_FetchObjectResponse_default_instance_._instance,
-    ::_pbi::TcParser::GenericFallback,  // fallback
-  }, {{
-    {::_pbi::TcParser::MiniParse, {}},
-    // string type = 1;
-    {::_pbi::TcParser::FastUS1,
-     {10, 63, 0, PROTOBUF_FIELD_OFFSET(FetchObjectResponse, _impl_.type_)}},
-    // bytes data = 2;
-    {::_pbi::TcParser::FastBS1,
-     {18, 63, 0, PROTOBUF_FIELD_OFFSET(FetchObjectResponse, _impl_.data_)}},
-    // repeated .io.deephaven.proto.backplane.grpc.TypedTicket typed_export_ids = 3;
-    {::_pbi::TcParser::FastMtR1,
-     {26, 63, 0, PROTOBUF_FIELD_OFFSET(FetchObjectResponse, _impl_.typed_export_ids_)}},
-  }}, {{
-    65535, 65535
-  }}, {{
-    // string type = 1;
-    {PROTOBUF_FIELD_OFFSET(FetchObjectResponse, _impl_.type_), 0, 0,
-    (0 | ::_fl::kFcSingular | ::_fl::kUtf8String | ::_fl::kRepAString)},
-    // bytes data = 2;
-    {PROTOBUF_FIELD_OFFSET(FetchObjectResponse, _impl_.data_), 0, 0,
-    (0 | ::_fl::kFcSingular | ::_fl::kBytes | ::_fl::kRepAString)},
-    // repeated .io.deephaven.proto.backplane.grpc.TypedTicket typed_export_ids = 3;
-    {PROTOBUF_FIELD_OFFSET(FetchObjectResponse, _impl_.typed_export_ids_), 0, 0,
-    (0 | ::_fl::kFcRepeated | ::_fl::kMessage | ::_fl::kTvTable)},
-  }}, {{
-    {::_pbi::TcParser::GetTable<::io::deephaven::proto::backplane::grpc::TypedTicket>()},
-  }}, {{
-    "\65\4\0\0\0\0\0\0"
-    "io.deephaven.proto.backplane.grpc.FetchObjectResponse"
-    "type"
-  }},
-};
-
-::uint8_t* FetchObjectResponse::_InternalSerialize(
-    ::uint8_t* target,
-    ::google::protobuf::io::EpsCopyOutputStream* stream) const {
-  // @@protoc_insertion_point(serialize_to_array_start:io.deephaven.proto.backplane.grpc.FetchObjectResponse)
-  ::uint32_t cached_has_bits = 0;
-  (void)cached_has_bits;
-
-  // string type = 1;
-  if (!this->_internal_type().empty()) {
-    const std::string& _s = this->_internal_type();
-    ::google::protobuf::internal::WireFormatLite::VerifyUtf8String(
-        _s.data(), static_cast<int>(_s.length()), ::google::protobuf::internal::WireFormatLite::SERIALIZE, "io.deephaven.proto.backplane.grpc.FetchObjectResponse.type");
-    target = stream->WriteStringMaybeAliased(1, _s, target);
-  }
-
-  // bytes data = 2;
-  if (!this->_internal_data().empty()) {
-    const std::string& _s = this->_internal_data();
-    target = stream->WriteBytesMaybeAliased(2, _s, target);
-  }
-
-  // repeated .io.deephaven.proto.backplane.grpc.TypedTicket typed_export_ids = 3;
-  for (unsigned i = 0,
-      n = static_cast<unsigned>(this->_internal_typed_export_ids_size()); i < n; i++) {
-    const auto& repfield = this->_internal_typed_export_ids().Get(i);
-    target = ::google::protobuf::internal::WireFormatLite::
-        InternalWriteMessage(3, repfield, repfield.GetCachedSize(), target, stream);
-  }
-
-  if (PROTOBUF_PREDICT_FALSE(_internal_metadata_.have_unknown_fields())) {
-    target =
-        ::_pbi::WireFormat::InternalSerializeUnknownFieldsToArray(
-            _internal_metadata_.unknown_fields<::google::protobuf::UnknownFieldSet>(::google::protobuf::UnknownFieldSet::default_instance), target, stream);
-  }
-  // @@protoc_insertion_point(serialize_to_array_end:io.deephaven.proto.backplane.grpc.FetchObjectResponse)
-  return target;
-}
-
-::size_t FetchObjectResponse::ByteSizeLong() const {
-// @@protoc_insertion_point(message_byte_size_start:io.deephaven.proto.backplane.grpc.FetchObjectResponse)
-  ::size_t total_size = 0;
-
-  ::uint32_t cached_has_bits = 0;
-  // Prevent compiler warnings about cached_has_bits being unused
-  (void) cached_has_bits;
-
-  // repeated .io.deephaven.proto.backplane.grpc.TypedTicket typed_export_ids = 3;
-  total_size += 1UL * this->_internal_typed_export_ids_size();
-  for (const auto& msg : this->_internal_typed_export_ids()) {
-    total_size +=
-      ::google::protobuf::internal::WireFormatLite::MessageSize(msg);
-  }
-  // string type = 1;
-  if (!this->_internal_type().empty()) {
-    total_size += 1 + ::google::protobuf::internal::WireFormatLite::StringSize(
-                                    this->_internal_type());
-  }
-
-  // bytes data = 2;
-  if (!this->_internal_data().empty()) {
-    total_size += 1 + ::google::protobuf::internal::WireFormatLite::BytesSize(
-                                    this->_internal_data());
-  }
-
-  return MaybeComputeUnknownFieldsSize(total_size, &_impl_._cached_size_);
-}
-
-const ::google::protobuf::Message::ClassData FetchObjectResponse::_class_data_ = {
-    FetchObjectResponse::MergeImpl,
-    nullptr,  // OnDemandRegisterArenaDtor
-};
-const ::google::protobuf::Message::ClassData* FetchObjectResponse::GetClassData() const {
-  return &_class_data_;
-}
-
-void FetchObjectResponse::MergeImpl(::google::protobuf::Message& to_msg, const ::google::protobuf::Message& from_msg) {
-  auto* const _this = static_cast<FetchObjectResponse*>(&to_msg);
-  auto& from = static_cast<const FetchObjectResponse&>(from_msg);
-  // @@protoc_insertion_point(class_specific_merge_from_start:io.deephaven.proto.backplane.grpc.FetchObjectResponse)
-  ABSL_DCHECK_NE(&from, _this);
-  ::uint32_t cached_has_bits = 0;
-  (void) cached_has_bits;
-
-  _this->_internal_mutable_typed_export_ids()->MergeFrom(
-      from._internal_typed_export_ids());
-  if (!from._internal_type().empty()) {
-    _this->_internal_set_type(from._internal_type());
-  }
-  if (!from._internal_data().empty()) {
-    _this->_internal_set_data(from._internal_data());
-  }
-  _this->_internal_metadata_.MergeFrom<::google::protobuf::UnknownFieldSet>(from._internal_metadata_);
-}
-
-void FetchObjectResponse::CopyFrom(const FetchObjectResponse& from) {
-// @@protoc_insertion_point(class_specific_copy_from_start:io.deephaven.proto.backplane.grpc.FetchObjectResponse)
-  if (&from == this) return;
-  Clear();
-  MergeFrom(from);
-}
-
-PROTOBUF_NOINLINE bool FetchObjectResponse::IsInitialized() const {
-  return true;
-}
-
-::_pbi::CachedSize* FetchObjectResponse::AccessCachedSize() const {
-  return &_impl_._cached_size_;
-}
-void FetchObjectResponse::InternalSwap(FetchObjectResponse* PROTOBUF_RESTRICT other) {
-  using std::swap;
-  auto* arena = GetArena();
-  ABSL_DCHECK_EQ(arena, other->GetArena());
-  _internal_metadata_.InternalSwap(&other->_internal_metadata_);
-  _impl_.typed_export_ids_.InternalSwap(&other->_impl_.typed_export_ids_);
-  ::_pbi::ArenaStringPtr::InternalSwap(&_impl_.type_, &other->_impl_.type_, arena);
-  ::_pbi::ArenaStringPtr::InternalSwap(&_impl_.data_, &other->_impl_.data_, arena);
-}
-
-::google::protobuf::Metadata FetchObjectResponse::GetMetadata() const {
-  return ::_pbi::AssignDescriptors(
-      &descriptor_table_deephaven_2fproto_2fobject_2eproto_getter, &descriptor_table_deephaven_2fproto_2fobject_2eproto_once,
-      file_level_metadata_deephaven_2fproto_2fobject_2eproto[1]);
-}
-// ===================================================================
-
-class ConnectRequest::_Internal {
- public:
-  using HasBits = decltype(std::declval<ConnectRequest>()._impl_._has_bits_);
-  static constexpr ::int32_t kHasBitsOffset =
-    8 * PROTOBUF_FIELD_OFFSET(ConnectRequest, _impl_._has_bits_);
-  static const ::io::deephaven::proto::backplane::grpc::TypedTicket& source_id(const ConnectRequest* msg);
-  static void set_has_source_id(HasBits* has_bits) {
-    (*has_bits)[0] |= 1u;
-  }
-};
-
-const ::io::deephaven::proto::backplane::grpc::TypedTicket& ConnectRequest::_Internal::source_id(const ConnectRequest* msg) {
-  return *msg->_impl_.source_id_;
-}
-void ConnectRequest::clear_source_id() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  if (_impl_.source_id_ != nullptr) _impl_.source_id_->Clear();
-  _impl_._has_bits_[0] &= ~0x00000001u;
-}
-ConnectRequest::ConnectRequest(::google::protobuf::Arena* arena)
-    : ::google::protobuf::Message(arena) {
-  SharedCtor(arena);
-  // @@protoc_insertion_point(arena_constructor:io.deephaven.proto.backplane.grpc.ConnectRequest)
-}
-inline PROTOBUF_NDEBUG_INLINE ConnectRequest::Impl_::Impl_(
-    ::google::protobuf::internal::InternalVisibility visibility, ::google::protobuf::Arena* arena,
-    const Impl_& from)
-      : _has_bits_{from._has_bits_},
-        _cached_size_{0} {}
-
-ConnectRequest::ConnectRequest(
-    ::google::protobuf::Arena* arena,
-    const ConnectRequest& from)
-    : ::google::protobuf::Message(arena) {
-  ConnectRequest* const _this = this;
-  (void)_this;
-  _internal_metadata_.MergeFrom<::google::protobuf::UnknownFieldSet>(
-      from._internal_metadata_);
-  new (&_impl_) Impl_(internal_visibility(), arena, from._impl_);
-  ::uint32_t cached_has_bits = _impl_._has_bits_[0];
-  _impl_.source_id_ = (cached_has_bits & 0x00000001u)
-                ? CreateMaybeMessage<::io::deephaven::proto::backplane::grpc::TypedTicket>(arena, *from._impl_.source_id_)
-                : nullptr;
-
-  // @@protoc_insertion_point(copy_constructor:io.deephaven.proto.backplane.grpc.ConnectRequest)
-}
-inline PROTOBUF_NDEBUG_INLINE ConnectRequest::Impl_::Impl_(
-    ::google::protobuf::internal::InternalVisibility visibility,
-    ::google::protobuf::Arena* arena)
-      : _cached_size_{0} {}
-
-inline void ConnectRequest::SharedCtor(::_pb::Arena* arena) {
-  new (&_impl_) Impl_(internal_visibility(), arena);
-  _impl_.source_id_ = {};
-}
-ConnectRequest::~ConnectRequest() {
-  // @@protoc_insertion_point(destructor:io.deephaven.proto.backplane.grpc.ConnectRequest)
-  _internal_metadata_.Delete<::google::protobuf::UnknownFieldSet>();
-  SharedDtor();
-}
-inline void ConnectRequest::SharedDtor() {
-  ABSL_DCHECK(GetArena() == nullptr);
-  delete _impl_.source_id_;
-  _impl_.~Impl_();
-}
-
-PROTOBUF_NOINLINE void ConnectRequest::Clear() {
-// @@protoc_insertion_point(message_clear_start:io.deephaven.proto.backplane.grpc.ConnectRequest)
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  ::uint32_t cached_has_bits = 0;
-  // Prevent compiler warnings about cached_has_bits being unused
-  (void) cached_has_bits;
-
-  cached_has_bits = _impl_._has_bits_[0];
-  if (cached_has_bits & 0x00000001u) {
-    ABSL_DCHECK(_impl_.source_id_ != nullptr);
-    _impl_.source_id_->Clear();
-  }
-  _impl_._has_bits_.Clear();
-  _internal_metadata_.Clear<::google::protobuf::UnknownFieldSet>();
-}
-
-const char* ConnectRequest::_InternalParse(
-    const char* ptr, ::_pbi::ParseContext* ctx) {
-  ptr = ::_pbi::TcParser::ParseLoop(this, ptr, ctx, &_table_.header);
-  return ptr;
-}
-
-
-PROTOBUF_CONSTINIT PROTOBUF_ATTRIBUTE_INIT_PRIORITY1
-const ::_pbi::TcParseTable<0, 1, 1, 0, 2> ConnectRequest::_table_ = {
-  {
-    PROTOBUF_FIELD_OFFSET(ConnectRequest, _impl_._has_bits_),
-    0, // no _extensions_
-    1, 0,  // max_field_number, fast_idx_mask
-    offsetof(decltype(_table_), field_lookup_table),
-    4294967294,  // skipmap
-    offsetof(decltype(_table_), field_entries),
-    1,  // num_field_entries
-    1,  // num_aux_entries
-    offsetof(decltype(_table_), aux_entries),
-    &_ConnectRequest_default_instance_._instance,
-    ::_pbi::TcParser::GenericFallback,  // fallback
-  }, {{
-    // .io.deephaven.proto.backplane.grpc.TypedTicket source_id = 1;
-    {::_pbi::TcParser::FastMtS1,
-     {10, 0, 0, PROTOBUF_FIELD_OFFSET(ConnectRequest, _impl_.source_id_)}},
-  }}, {{
-    65535, 65535
-  }}, {{
-    // .io.deephaven.proto.backplane.grpc.TypedTicket source_id = 1;
-    {PROTOBUF_FIELD_OFFSET(ConnectRequest, _impl_.source_id_), _Internal::kHasBitsOffset + 0, 0,
-    (0 | ::_fl::kFcOptional | ::_fl::kMessage | ::_fl::kTvTable)},
-  }}, {{
-    {::_pbi::TcParser::GetTable<::io::deephaven::proto::backplane::grpc::TypedTicket>()},
-  }}, {{
-  }},
-};
-
-::uint8_t* ConnectRequest::_InternalSerialize(
-    ::uint8_t* target,
-    ::google::protobuf::io::EpsCopyOutputStream* stream) const {
-  // @@protoc_insertion_point(serialize_to_array_start:io.deephaven.proto.backplane.grpc.ConnectRequest)
-  ::uint32_t cached_has_bits = 0;
-  (void)cached_has_bits;
-
-  cached_has_bits = _impl_._has_bits_[0];
-  // .io.deephaven.proto.backplane.grpc.TypedTicket source_id = 1;
-  if (cached_has_bits & 0x00000001u) {
-    target = ::google::protobuf::internal::WireFormatLite::InternalWriteMessage(
-        1, _Internal::source_id(this),
-        _Internal::source_id(this).GetCachedSize(), target, stream);
-  }
-
-  if (PROTOBUF_PREDICT_FALSE(_internal_metadata_.have_unknown_fields())) {
-    target =
-        ::_pbi::WireFormat::InternalSerializeUnknownFieldsToArray(
-            _internal_metadata_.unknown_fields<::google::protobuf::UnknownFieldSet>(::google::protobuf::UnknownFieldSet::default_instance), target, stream);
-  }
-  // @@protoc_insertion_point(serialize_to_array_end:io.deephaven.proto.backplane.grpc.ConnectRequest)
-  return target;
-}
-
-::size_t ConnectRequest::ByteSizeLong() const {
-// @@protoc_insertion_point(message_byte_size_start:io.deephaven.proto.backplane.grpc.ConnectRequest)
-  ::size_t total_size = 0;
-
-  ::uint32_t cached_has_bits = 0;
-  // Prevent compiler warnings about cached_has_bits being unused
-  (void) cached_has_bits;
-
-  // .io.deephaven.proto.backplane.grpc.TypedTicket source_id = 1;
-  cached_has_bits = _impl_._has_bits_[0];
-  if (cached_has_bits & 0x00000001u) {
-    total_size +=
-        1 + ::google::protobuf::internal::WireFormatLite::MessageSize(*_impl_.source_id_);
-  }
-
-  return MaybeComputeUnknownFieldsSize(total_size, &_impl_._cached_size_);
-}
-
-const ::google::protobuf::Message::ClassData ConnectRequest::_class_data_ = {
-    ConnectRequest::MergeImpl,
-    nullptr,  // OnDemandRegisterArenaDtor
-};
-const ::google::protobuf::Message::ClassData* ConnectRequest::GetClassData() const {
-  return &_class_data_;
-}
-
-void ConnectRequest::MergeImpl(::google::protobuf::Message& to_msg, const ::google::protobuf::Message& from_msg) {
-  auto* const _this = static_cast<ConnectRequest*>(&to_msg);
-  auto& from = static_cast<const ConnectRequest&>(from_msg);
-  // @@protoc_insertion_point(class_specific_merge_from_start:io.deephaven.proto.backplane.grpc.ConnectRequest)
-  ABSL_DCHECK_NE(&from, _this);
-  ::uint32_t cached_has_bits = 0;
-  (void) cached_has_bits;
-
-  if ((from._impl_._has_bits_[0] & 0x00000001u) != 0) {
-    _this->_internal_mutable_source_id()->::io::deephaven::proto::backplane::grpc::TypedTicket::MergeFrom(
-        from._internal_source_id());
-  }
-  _this->_internal_metadata_.MergeFrom<::google::protobuf::UnknownFieldSet>(from._internal_metadata_);
-}
-
-void ConnectRequest::CopyFrom(const ConnectRequest& from) {
-// @@protoc_insertion_point(class_specific_copy_from_start:io.deephaven.proto.backplane.grpc.ConnectRequest)
-  if (&from == this) return;
-  Clear();
-  MergeFrom(from);
-}
-
-PROTOBUF_NOINLINE bool ConnectRequest::IsInitialized() const {
-  return true;
-}
-
-::_pbi::CachedSize* ConnectRequest::AccessCachedSize() const {
-  return &_impl_._cached_size_;
-}
-void ConnectRequest::InternalSwap(ConnectRequest* PROTOBUF_RESTRICT other) {
-  using std::swap;
-  _internal_metadata_.InternalSwap(&other->_internal_metadata_);
-  swap(_impl_._has_bits_[0], other->_impl_._has_bits_[0]);
-  swap(_impl_.source_id_, other->_impl_.source_id_);
-}
-
-::google::protobuf::Metadata ConnectRequest::GetMetadata() const {
-  return ::_pbi::AssignDescriptors(
-      &descriptor_table_deephaven_2fproto_2fobject_2eproto_getter, &descriptor_table_deephaven_2fproto_2fobject_2eproto_once,
-      file_level_metadata_deephaven_2fproto_2fobject_2eproto[2]);
-}
-// ===================================================================
-
-class ClientData::_Internal {
- public:
-};
-
-void ClientData::clear_references() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  _impl_.references_.Clear();
-}
-ClientData::ClientData(::google::protobuf::Arena* arena)
-    : ::google::protobuf::Message(arena) {
-  SharedCtor(arena);
-  // @@protoc_insertion_point(arena_constructor:io.deephaven.proto.backplane.grpc.ClientData)
-}
-inline PROTOBUF_NDEBUG_INLINE ClientData::Impl_::Impl_(
-    ::google::protobuf::internal::InternalVisibility visibility, ::google::protobuf::Arena* arena,
-    const Impl_& from)
-      : references_{visibility, arena, from.references_},
-        payload_(arena, from.payload_),
-        _cached_size_{0} {}
-
-ClientData::ClientData(
-    ::google::protobuf::Arena* arena,
-    const ClientData& from)
-    : ::google::protobuf::Message(arena) {
-  ClientData* const _this = this;
-  (void)_this;
-  _internal_metadata_.MergeFrom<::google::protobuf::UnknownFieldSet>(
-      from._internal_metadata_);
-  new (&_impl_) Impl_(internal_visibility(), arena, from._impl_);
-
-  // @@protoc_insertion_point(copy_constructor:io.deephaven.proto.backplane.grpc.ClientData)
-}
-inline PROTOBUF_NDEBUG_INLINE ClientData::Impl_::Impl_(
-    ::google::protobuf::internal::InternalVisibility visibility,
-    ::google::protobuf::Arena* arena)
-      : references_{visibility, arena},
-        payload_(arena),
-        _cached_size_{0} {}
-
-inline void ClientData::SharedCtor(::_pb::Arena* arena) {
-  new (&_impl_) Impl_(internal_visibility(), arena);
-}
-ClientData::~ClientData() {
-  // @@protoc_insertion_point(destructor:io.deephaven.proto.backplane.grpc.ClientData)
-  _internal_metadata_.Delete<::google::protobuf::UnknownFieldSet>();
-  SharedDtor();
-}
-inline void ClientData::SharedDtor() {
-  ABSL_DCHECK(GetArena() == nullptr);
-  _impl_.payload_.Destroy();
-  _impl_.~Impl_();
-}
-
-PROTOBUF_NOINLINE void ClientData::Clear() {
-// @@protoc_insertion_point(message_clear_start:io.deephaven.proto.backplane.grpc.ClientData)
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  ::uint32_t cached_has_bits = 0;
-  // Prevent compiler warnings about cached_has_bits being unused
-  (void) cached_has_bits;
-
-  _impl_.references_.Clear();
-  _impl_.payload_.ClearToEmpty();
-  _internal_metadata_.Clear<::google::protobuf::UnknownFieldSet>();
-}
-
-const char* ClientData::_InternalParse(
-    const char* ptr, ::_pbi::ParseContext* ctx) {
-  ptr = ::_pbi::TcParser::ParseLoop(this, ptr, ctx, &_table_.header);
-  return ptr;
-}
-
-
-PROTOBUF_CONSTINIT PROTOBUF_ATTRIBUTE_INIT_PRIORITY1
-const ::_pbi::TcParseTable<1, 2, 1, 0, 2> ClientData::_table_ = {
-  {
-    0,  // no _has_bits_
-    0, // no _extensions_
-    2, 8,  // max_field_number, fast_idx_mask
-    offsetof(decltype(_table_), field_lookup_table),
-    4294967292,  // skipmap
-    offsetof(decltype(_table_), field_entries),
-    2,  // num_field_entries
-    1,  // num_aux_entries
-    offsetof(decltype(_table_), aux_entries),
-    &_ClientData_default_instance_._instance,
-    ::_pbi::TcParser::GenericFallback,  // fallback
-  }, {{
-    // repeated .io.deephaven.proto.backplane.grpc.TypedTicket references = 2;
-    {::_pbi::TcParser::FastMtR1,
-     {18, 63, 0, PROTOBUF_FIELD_OFFSET(ClientData, _impl_.references_)}},
-    // bytes payload = 1;
-    {::_pbi::TcParser::FastBS1,
-     {10, 63, 0, PROTOBUF_FIELD_OFFSET(ClientData, _impl_.payload_)}},
-  }}, {{
-    65535, 65535
-  }}, {{
-    // bytes payload = 1;
-    {PROTOBUF_FIELD_OFFSET(ClientData, _impl_.payload_), 0, 0,
-    (0 | ::_fl::kFcSingular | ::_fl::kBytes | ::_fl::kRepAString)},
-    // repeated .io.deephaven.proto.backplane.grpc.TypedTicket references = 2;
-    {PROTOBUF_FIELD_OFFSET(ClientData, _impl_.references_), 0, 0,
-    (0 | ::_fl::kFcRepeated | ::_fl::kMessage | ::_fl::kTvTable)},
-  }}, {{
-    {::_pbi::TcParser::GetTable<::io::deephaven::proto::backplane::grpc::TypedTicket>()},
-  }}, {{
-  }},
-};
-
-::uint8_t* ClientData::_InternalSerialize(
-    ::uint8_t* target,
-    ::google::protobuf::io::EpsCopyOutputStream* stream) const {
-  // @@protoc_insertion_point(serialize_to_array_start:io.deephaven.proto.backplane.grpc.ClientData)
-  ::uint32_t cached_has_bits = 0;
-  (void)cached_has_bits;
-
-  // bytes payload = 1;
-  if (!this->_internal_payload().empty()) {
-    const std::string& _s = this->_internal_payload();
-    target = stream->WriteBytesMaybeAliased(1, _s, target);
-  }
-
-  // repeated .io.deephaven.proto.backplane.grpc.TypedTicket references = 2;
-  for (unsigned i = 0,
-      n = static_cast<unsigned>(this->_internal_references_size()); i < n; i++) {
-    const auto& repfield = this->_internal_references().Get(i);
-    target = ::google::protobuf::internal::WireFormatLite::
-        InternalWriteMessage(2, repfield, repfield.GetCachedSize(), target, stream);
-  }
-
-  if (PROTOBUF_PREDICT_FALSE(_internal_metadata_.have_unknown_fields())) {
-    target =
-        ::_pbi::WireFormat::InternalSerializeUnknownFieldsToArray(
-            _internal_metadata_.unknown_fields<::google::protobuf::UnknownFieldSet>(::google::protobuf::UnknownFieldSet::default_instance), target, stream);
-  }
-  // @@protoc_insertion_point(serialize_to_array_end:io.deephaven.proto.backplane.grpc.ClientData)
-  return target;
-}
-
-::size_t ClientData::ByteSizeLong() const {
-// @@protoc_insertion_point(message_byte_size_start:io.deephaven.proto.backplane.grpc.ClientData)
-  ::size_t total_size = 0;
-
-  ::uint32_t cached_has_bits = 0;
-  // Prevent compiler warnings about cached_has_bits being unused
-  (void) cached_has_bits;
-
-  // repeated .io.deephaven.proto.backplane.grpc.TypedTicket references = 2;
-  total_size += 1UL * this->_internal_references_size();
-  for (const auto& msg : this->_internal_references()) {
-    total_size +=
-      ::google::protobuf::internal::WireFormatLite::MessageSize(msg);
-  }
-  // bytes payload = 1;
-  if (!this->_internal_payload().empty()) {
-    total_size += 1 + ::google::protobuf::internal::WireFormatLite::BytesSize(
-                                    this->_internal_payload());
-  }
-
-  return MaybeComputeUnknownFieldsSize(total_size, &_impl_._cached_size_);
-}
-
-const ::google::protobuf::Message::ClassData ClientData::_class_data_ = {
-    ClientData::MergeImpl,
-    nullptr,  // OnDemandRegisterArenaDtor
-};
-const ::google::protobuf::Message::ClassData* ClientData::GetClassData() const {
-  return &_class_data_;
-}
-
-void ClientData::MergeImpl(::google::protobuf::Message& to_msg, const ::google::protobuf::Message& from_msg) {
-  auto* const _this = static_cast<ClientData*>(&to_msg);
-  auto& from = static_cast<const ClientData&>(from_msg);
-  // @@protoc_insertion_point(class_specific_merge_from_start:io.deephaven.proto.backplane.grpc.ClientData)
-  ABSL_DCHECK_NE(&from, _this);
-  ::uint32_t cached_has_bits = 0;
-  (void) cached_has_bits;
-
-  _this->_internal_mutable_references()->MergeFrom(
-      from._internal_references());
-  if (!from._internal_payload().empty()) {
-    _this->_internal_set_payload(from._internal_payload());
-  }
-  _this->_internal_metadata_.MergeFrom<::google::protobuf::UnknownFieldSet>(from._internal_metadata_);
-}
-
-void ClientData::CopyFrom(const ClientData& from) {
-// @@protoc_insertion_point(class_specific_copy_from_start:io.deephaven.proto.backplane.grpc.ClientData)
-  if (&from == this) return;
-  Clear();
-  MergeFrom(from);
-}
-
-PROTOBUF_NOINLINE bool ClientData::IsInitialized() const {
-  return true;
-}
-
-::_pbi::CachedSize* ClientData::AccessCachedSize() const {
-  return &_impl_._cached_size_;
-}
-void ClientData::InternalSwap(ClientData* PROTOBUF_RESTRICT other) {
-  using std::swap;
-  auto* arena = GetArena();
-  ABSL_DCHECK_EQ(arena, other->GetArena());
-  _internal_metadata_.InternalSwap(&other->_internal_metadata_);
-  _impl_.references_.InternalSwap(&other->_impl_.references_);
-  ::_pbi::ArenaStringPtr::InternalSwap(&_impl_.payload_, &other->_impl_.payload_, arena);
-}
-
-::google::protobuf::Metadata ClientData::GetMetadata() const {
-  return ::_pbi::AssignDescriptors(
-      &descriptor_table_deephaven_2fproto_2fobject_2eproto_getter, &descriptor_table_deephaven_2fproto_2fobject_2eproto_once,
-      file_level_metadata_deephaven_2fproto_2fobject_2eproto[3]);
-}
-// ===================================================================
-
-class ServerData::_Internal {
- public:
-};
-
-void ServerData::clear_exported_references() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  _impl_.exported_references_.Clear();
-}
-ServerData::ServerData(::google::protobuf::Arena* arena)
-    : ::google::protobuf::Message(arena) {
-  SharedCtor(arena);
-  // @@protoc_insertion_point(arena_constructor:io.deephaven.proto.backplane.grpc.ServerData)
-}
-inline PROTOBUF_NDEBUG_INLINE ServerData::Impl_::Impl_(
-    ::google::protobuf::internal::InternalVisibility visibility, ::google::protobuf::Arena* arena,
-    const Impl_& from)
-      : exported_references_{visibility, arena, from.exported_references_},
-        payload_(arena, from.payload_),
-        _cached_size_{0} {}
-
-ServerData::ServerData(
-    ::google::protobuf::Arena* arena,
-    const ServerData& from)
-    : ::google::protobuf::Message(arena) {
-  ServerData* const _this = this;
-  (void)_this;
-  _internal_metadata_.MergeFrom<::google::protobuf::UnknownFieldSet>(
-      from._internal_metadata_);
-  new (&_impl_) Impl_(internal_visibility(), arena, from._impl_);
-
-  // @@protoc_insertion_point(copy_constructor:io.deephaven.proto.backplane.grpc.ServerData)
-}
-inline PROTOBUF_NDEBUG_INLINE ServerData::Impl_::Impl_(
-    ::google::protobuf::internal::InternalVisibility visibility,
-    ::google::protobuf::Arena* arena)
-      : exported_references_{visibility, arena},
-        payload_(arena),
-        _cached_size_{0} {}
-
-inline void ServerData::SharedCtor(::_pb::Arena* arena) {
-  new (&_impl_) Impl_(internal_visibility(), arena);
-}
-ServerData::~ServerData() {
-  // @@protoc_insertion_point(destructor:io.deephaven.proto.backplane.grpc.ServerData)
-  _internal_metadata_.Delete<::google::protobuf::UnknownFieldSet>();
-  SharedDtor();
-}
-inline void ServerData::SharedDtor() {
-  ABSL_DCHECK(GetArena() == nullptr);
-  _impl_.payload_.Destroy();
-  _impl_.~Impl_();
-}
-
-PROTOBUF_NOINLINE void ServerData::Clear() {
-// @@protoc_insertion_point(message_clear_start:io.deephaven.proto.backplane.grpc.ServerData)
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  ::uint32_t cached_has_bits = 0;
-  // Prevent compiler warnings about cached_has_bits being unused
-  (void) cached_has_bits;
-
-  _impl_.exported_references_.Clear();
-  _impl_.payload_.ClearToEmpty();
-  _internal_metadata_.Clear<::google::protobuf::UnknownFieldSet>();
-}
-
-const char* ServerData::_InternalParse(
-    const char* ptr, ::_pbi::ParseContext* ctx) {
-  ptr = ::_pbi::TcParser::ParseLoop(this, ptr, ctx, &_table_.header);
-  return ptr;
-}
-
-
-PROTOBUF_CONSTINIT PROTOBUF_ATTRIBUTE_INIT_PRIORITY1
-const ::_pbi::TcParseTable<1, 2, 1, 0, 2> ServerData::_table_ = {
-  {
-    0,  // no _has_bits_
-    0, // no _extensions_
-    2, 8,  // max_field_number, fast_idx_mask
-    offsetof(decltype(_table_), field_lookup_table),
-    4294967292,  // skipmap
-    offsetof(decltype(_table_), field_entries),
-    2,  // num_field_entries
-    1,  // num_aux_entries
-    offsetof(decltype(_table_), aux_entries),
-    &_ServerData_default_instance_._instance,
-    ::_pbi::TcParser::GenericFallback,  // fallback
-  }, {{
-    // repeated .io.deephaven.proto.backplane.grpc.TypedTicket exported_references = 2;
-    {::_pbi::TcParser::FastMtR1,
-     {18, 63, 0, PROTOBUF_FIELD_OFFSET(ServerData, _impl_.exported_references_)}},
-    // bytes payload = 1;
-    {::_pbi::TcParser::FastBS1,
-     {10, 63, 0, PROTOBUF_FIELD_OFFSET(ServerData, _impl_.payload_)}},
-  }}, {{
-    65535, 65535
-  }}, {{
-    // bytes payload = 1;
-    {PROTOBUF_FIELD_OFFSET(ServerData, _impl_.payload_), 0, 0,
-    (0 | ::_fl::kFcSingular | ::_fl::kBytes | ::_fl::kRepAString)},
-    // repeated .io.deephaven.proto.backplane.grpc.TypedTicket exported_references = 2;
-    {PROTOBUF_FIELD_OFFSET(ServerData, _impl_.exported_references_), 0, 0,
-    (0 | ::_fl::kFcRepeated | ::_fl::kMessage | ::_fl::kTvTable)},
-  }}, {{
-    {::_pbi::TcParser::GetTable<::io::deephaven::proto::backplane::grpc::TypedTicket>()},
-  }}, {{
-  }},
-};
-
-::uint8_t* ServerData::_InternalSerialize(
-    ::uint8_t* target,
-    ::google::protobuf::io::EpsCopyOutputStream* stream) const {
-  // @@protoc_insertion_point(serialize_to_array_start:io.deephaven.proto.backplane.grpc.ServerData)
-  ::uint32_t cached_has_bits = 0;
-  (void)cached_has_bits;
-
-  // bytes payload = 1;
-  if (!this->_internal_payload().empty()) {
-    const std::string& _s = this->_internal_payload();
-    target = stream->WriteBytesMaybeAliased(1, _s, target);
-  }
-
-  // repeated .io.deephaven.proto.backplane.grpc.TypedTicket exported_references = 2;
-  for (unsigned i = 0,
-      n = static_cast<unsigned>(this->_internal_exported_references_size()); i < n; i++) {
-    const auto& repfield = this->_internal_exported_references().Get(i);
-    target = ::google::protobuf::internal::WireFormatLite::
-        InternalWriteMessage(2, repfield, repfield.GetCachedSize(), target, stream);
-  }
-
-  if (PROTOBUF_PREDICT_FALSE(_internal_metadata_.have_unknown_fields())) {
-    target =
-        ::_pbi::WireFormat::InternalSerializeUnknownFieldsToArray(
-            _internal_metadata_.unknown_fields<::google::protobuf::UnknownFieldSet>(::google::protobuf::UnknownFieldSet::default_instance), target, stream);
-  }
-  // @@protoc_insertion_point(serialize_to_array_end:io.deephaven.proto.backplane.grpc.ServerData)
-  return target;
-}
-
-::size_t ServerData::ByteSizeLong() const {
-// @@protoc_insertion_point(message_byte_size_start:io.deephaven.proto.backplane.grpc.ServerData)
-  ::size_t total_size = 0;
-
-  ::uint32_t cached_has_bits = 0;
-  // Prevent compiler warnings about cached_has_bits being unused
-  (void) cached_has_bits;
-
-  // repeated .io.deephaven.proto.backplane.grpc.TypedTicket exported_references = 2;
-  total_size += 1UL * this->_internal_exported_references_size();
-  for (const auto& msg : this->_internal_exported_references()) {
-    total_size +=
-      ::google::protobuf::internal::WireFormatLite::MessageSize(msg);
-  }
-  // bytes payload = 1;
-  if (!this->_internal_payload().empty()) {
-    total_size += 1 + ::google::protobuf::internal::WireFormatLite::BytesSize(
-                                    this->_internal_payload());
-  }
-
-  return MaybeComputeUnknownFieldsSize(total_size, &_impl_._cached_size_);
-}
-
-const ::google::protobuf::Message::ClassData ServerData::_class_data_ = {
-    ServerData::MergeImpl,
-    nullptr,  // OnDemandRegisterArenaDtor
-};
-const ::google::protobuf::Message::ClassData* ServerData::GetClassData() const {
-  return &_class_data_;
-}
-
-void ServerData::MergeImpl(::google::protobuf::Message& to_msg, const ::google::protobuf::Message& from_msg) {
-  auto* const _this = static_cast<ServerData*>(&to_msg);
-  auto& from = static_cast<const ServerData&>(from_msg);
-  // @@protoc_insertion_point(class_specific_merge_from_start:io.deephaven.proto.backplane.grpc.ServerData)
-  ABSL_DCHECK_NE(&from, _this);
-  ::uint32_t cached_has_bits = 0;
-  (void) cached_has_bits;
-
-  _this->_internal_mutable_exported_references()->MergeFrom(
-      from._internal_exported_references());
-  if (!from._internal_payload().empty()) {
-    _this->_internal_set_payload(from._internal_payload());
-  }
-  _this->_internal_metadata_.MergeFrom<::google::protobuf::UnknownFieldSet>(from._internal_metadata_);
-}
-
-void ServerData::CopyFrom(const ServerData& from) {
-// @@protoc_insertion_point(class_specific_copy_from_start:io.deephaven.proto.backplane.grpc.ServerData)
-  if (&from == this) return;
-  Clear();
-  MergeFrom(from);
-}
-
-PROTOBUF_NOINLINE bool ServerData::IsInitialized() const {
-  return true;
-}
-
-::_pbi::CachedSize* ServerData::AccessCachedSize() const {
-  return &_impl_._cached_size_;
-}
-void ServerData::InternalSwap(ServerData* PROTOBUF_RESTRICT other) {
-  using std::swap;
-  auto* arena = GetArena();
-  ABSL_DCHECK_EQ(arena, other->GetArena());
-  _internal_metadata_.InternalSwap(&other->_internal_metadata_);
-  _impl_.exported_references_.InternalSwap(&other->_impl_.exported_references_);
-  ::_pbi::ArenaStringPtr::InternalSwap(&_impl_.payload_, &other->_impl_.payload_, arena);
-}
-
-::google::protobuf::Metadata ServerData::GetMetadata() const {
-  return ::_pbi::AssignDescriptors(
-      &descriptor_table_deephaven_2fproto_2fobject_2eproto_getter, &descriptor_table_deephaven_2fproto_2fobject_2eproto_once,
-      file_level_metadata_deephaven_2fproto_2fobject_2eproto[4]);
-}
-// ===================================================================
-
-class StreamRequest::_Internal {
- public:
-  static constexpr ::int32_t kOneofCaseOffset =
-    PROTOBUF_FIELD_OFFSET(::io::deephaven::proto::backplane::grpc::StreamRequest, _impl_._oneof_case_);
-  static const ::io::deephaven::proto::backplane::grpc::ConnectRequest& connect(const StreamRequest* msg);
-  static const ::io::deephaven::proto::backplane::grpc::ClientData& data(const StreamRequest* msg);
-};
-
-const ::io::deephaven::proto::backplane::grpc::ConnectRequest& StreamRequest::_Internal::connect(const StreamRequest* msg) {
-  return *msg->_impl_.message_.connect_;
-}
-const ::io::deephaven::proto::backplane::grpc::ClientData& StreamRequest::_Internal::data(const StreamRequest* msg) {
-  return *msg->_impl_.message_.data_;
-}
-void StreamRequest::set_allocated_connect(::io::deephaven::proto::backplane::grpc::ConnectRequest* connect) {
-  ::google::protobuf::Arena* message_arena = GetArena();
-  clear_message();
-  if (connect) {
-    ::google::protobuf::Arena* submessage_arena = connect->GetArena();
-    if (message_arena != submessage_arena) {
-      connect = ::google::protobuf::internal::GetOwnedMessage(message_arena, connect, submessage_arena);
-    }
-    set_has_connect();
-    _impl_.message_.connect_ = connect;
-  }
-  // @@protoc_insertion_point(field_set_allocated:io.deephaven.proto.backplane.grpc.StreamRequest.connect)
-}
-void StreamRequest::set_allocated_data(::io::deephaven::proto::backplane::grpc::ClientData* data) {
-  ::google::protobuf::Arena* message_arena = GetArena();
-  clear_message();
-  if (data) {
-    ::google::protobuf::Arena* submessage_arena = data->GetArena();
-    if (message_arena != submessage_arena) {
-      data = ::google::protobuf::internal::GetOwnedMessage(message_arena, data, submessage_arena);
-    }
-    set_has_data();
-    _impl_.message_.data_ = data;
-  }
-  // @@protoc_insertion_point(field_set_allocated:io.deephaven.proto.backplane.grpc.StreamRequest.data)
-}
-StreamRequest::StreamRequest(::google::protobuf::Arena* arena)
-    : ::google::protobuf::Message(arena) {
-  SharedCtor(arena);
-  // @@protoc_insertion_point(arena_constructor:io.deephaven.proto.backplane.grpc.StreamRequest)
-}
-inline PROTOBUF_NDEBUG_INLINE StreamRequest::Impl_::Impl_(
-    ::google::protobuf::internal::InternalVisibility visibility, ::google::protobuf::Arena* arena,
-    const Impl_& from)
-      : message_{},
-        _cached_size_{0},
-        _oneof_case_{from._oneof_case_[0]} {}
-
-StreamRequest::StreamRequest(
-    ::google::protobuf::Arena* arena,
-    const StreamRequest& from)
-    : ::google::protobuf::Message(arena) {
-  StreamRequest* const _this = this;
-  (void)_this;
-  _internal_metadata_.MergeFrom<::google::protobuf::UnknownFieldSet>(
-      from._internal_metadata_);
-  new (&_impl_) Impl_(internal_visibility(), arena, from._impl_);
-  switch (message_case()) {
-    case MESSAGE_NOT_SET:
-      break;
-      case kConnect:
-        _impl_.message_.connect_ = CreateMaybeMessage<::io::deephaven::proto::backplane::grpc::ConnectRequest>(arena, *from._impl_.message_.connect_);
-        break;
-      case kData:
-        _impl_.message_.data_ = CreateMaybeMessage<::io::deephaven::proto::backplane::grpc::ClientData>(arena, *from._impl_.message_.data_);
-        break;
-  }
-
-  // @@protoc_insertion_point(copy_constructor:io.deephaven.proto.backplane.grpc.StreamRequest)
-}
-inline PROTOBUF_NDEBUG_INLINE StreamRequest::Impl_::Impl_(
-    ::google::protobuf::internal::InternalVisibility visibility,
-    ::google::protobuf::Arena* arena)
-      : message_{},
-        _cached_size_{0},
-        _oneof_case_{} {}
-
-inline void StreamRequest::SharedCtor(::_pb::Arena* arena) {
-  new (&_impl_) Impl_(internal_visibility(), arena);
-}
-StreamRequest::~StreamRequest() {
-  // @@protoc_insertion_point(destructor:io.deephaven.proto.backplane.grpc.StreamRequest)
-  _internal_metadata_.Delete<::google::protobuf::UnknownFieldSet>();
-  SharedDtor();
-}
-inline void StreamRequest::SharedDtor() {
-  ABSL_DCHECK(GetArena() == nullptr);
-  if (has_message()) {
-    clear_message();
-  }
-  _impl_.~Impl_();
-}
-
-void StreamRequest::clear_message() {
-// @@protoc_insertion_point(one_of_clear_start:io.deephaven.proto.backplane.grpc.StreamRequest)
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  switch (message_case()) {
-    case kConnect: {
-      if (GetArena() == nullptr) {
-        delete _impl_.message_.connect_;
-      }
-      break;
-    }
-    case kData: {
-      if (GetArena() == nullptr) {
-        delete _impl_.message_.data_;
-      }
-      break;
-    }
-    case MESSAGE_NOT_SET: {
-      break;
-    }
-  }
-  _impl_._oneof_case_[0] = MESSAGE_NOT_SET;
-}
-
-
-PROTOBUF_NOINLINE void StreamRequest::Clear() {
-// @@protoc_insertion_point(message_clear_start:io.deephaven.proto.backplane.grpc.StreamRequest)
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  ::uint32_t cached_has_bits = 0;
-  // Prevent compiler warnings about cached_has_bits being unused
-  (void) cached_has_bits;
-
-  clear_message();
-  _internal_metadata_.Clear<::google::protobuf::UnknownFieldSet>();
-}
-
-const char* StreamRequest::_InternalParse(
-    const char* ptr, ::_pbi::ParseContext* ctx) {
-  ptr = ::_pbi::TcParser::ParseLoop(this, ptr, ctx, &_table_.header);
-  return ptr;
-}
-
-
-PROTOBUF_CONSTINIT PROTOBUF_ATTRIBUTE_INIT_PRIORITY1
-const ::_pbi::TcParseTable<0, 2, 2, 0, 2> StreamRequest::_table_ = {
-  {
-    0,  // no _has_bits_
-    0, // no _extensions_
-    2, 0,  // max_field_number, fast_idx_mask
-    offsetof(decltype(_table_), field_lookup_table),
-    4294967292,  // skipmap
-    offsetof(decltype(_table_), field_entries),
-    2,  // num_field_entries
-    2,  // num_aux_entries
-    offsetof(decltype(_table_), aux_entries),
-    &_StreamRequest_default_instance_._instance,
-    ::_pbi::TcParser::GenericFallback,  // fallback
-  }, {{
-    {::_pbi::TcParser::MiniParse, {}},
-  }}, {{
-    65535, 65535
-  }}, {{
-    // .io.deephaven.proto.backplane.grpc.ConnectRequest connect = 1;
-    {PROTOBUF_FIELD_OFFSET(StreamRequest, _impl_.message_.connect_), _Internal::kOneofCaseOffset + 0, 0,
-    (0 | ::_fl::kFcOneof | ::_fl::kMessage | ::_fl::kTvTable)},
-    // .io.deephaven.proto.backplane.grpc.ClientData data = 2;
-    {PROTOBUF_FIELD_OFFSET(StreamRequest, _impl_.message_.data_), _Internal::kOneofCaseOffset + 0, 1,
-    (0 | ::_fl::kFcOneof | ::_fl::kMessage | ::_fl::kTvTable)},
-  }}, {{
-    {::_pbi::TcParser::GetTable<::io::deephaven::proto::backplane::grpc::ConnectRequest>()},
-    {::_pbi::TcParser::GetTable<::io::deephaven::proto::backplane::grpc::ClientData>()},
-  }}, {{
-  }},
-};
-
-::uint8_t* StreamRequest::_InternalSerialize(
-    ::uint8_t* target,
-    ::google::protobuf::io::EpsCopyOutputStream* stream) const {
-  // @@protoc_insertion_point(serialize_to_array_start:io.deephaven.proto.backplane.grpc.StreamRequest)
-  ::uint32_t cached_has_bits = 0;
-  (void)cached_has_bits;
-
-  switch (message_case()) {
-    case kConnect: {
-      target = ::google::protobuf::internal::WireFormatLite::InternalWriteMessage(
-          1, _Internal::connect(this),
-          _Internal::connect(this).GetCachedSize(), target, stream);
-      break;
-    }
-    case kData: {
-      target = ::google::protobuf::internal::WireFormatLite::InternalWriteMessage(
-          2, _Internal::data(this),
-          _Internal::data(this).GetCachedSize(), target, stream);
-      break;
-    }
-    default:
-      break;
-  }
-  if (PROTOBUF_PREDICT_FALSE(_internal_metadata_.have_unknown_fields())) {
-    target =
-        ::_pbi::WireFormat::InternalSerializeUnknownFieldsToArray(
-            _internal_metadata_.unknown_fields<::google::protobuf::UnknownFieldSet>(::google::protobuf::UnknownFieldSet::default_instance), target, stream);
-  }
-  // @@protoc_insertion_point(serialize_to_array_end:io.deephaven.proto.backplane.grpc.StreamRequest)
-  return target;
-}
-
-::size_t StreamRequest::ByteSizeLong() const {
-// @@protoc_insertion_point(message_byte_size_start:io.deephaven.proto.backplane.grpc.StreamRequest)
-  ::size_t total_size = 0;
-
-  ::uint32_t cached_has_bits = 0;
-  // Prevent compiler warnings about cached_has_bits being unused
-  (void) cached_has_bits;
-
-  switch (message_case()) {
-    // .io.deephaven.proto.backplane.grpc.ConnectRequest connect = 1;
-    case kConnect: {
-      total_size +=
-          1 + ::google::protobuf::internal::WireFormatLite::MessageSize(*_impl_.message_.connect_);
-      break;
-    }
-    // .io.deephaven.proto.backplane.grpc.ClientData data = 2;
-    case kData: {
-      total_size +=
-          1 + ::google::protobuf::internal::WireFormatLite::MessageSize(*_impl_.message_.data_);
-      break;
-    }
-    case MESSAGE_NOT_SET: {
-      break;
-    }
-  }
-  return MaybeComputeUnknownFieldsSize(total_size, &_impl_._cached_size_);
-}
-
-const ::google::protobuf::Message::ClassData StreamRequest::_class_data_ = {
-    StreamRequest::MergeImpl,
-    nullptr,  // OnDemandRegisterArenaDtor
-};
-const ::google::protobuf::Message::ClassData* StreamRequest::GetClassData() const {
-  return &_class_data_;
-}
-
-void StreamRequest::MergeImpl(::google::protobuf::Message& to_msg, const ::google::protobuf::Message& from_msg) {
-  auto* const _this = static_cast<StreamRequest*>(&to_msg);
-  auto& from = static_cast<const StreamRequest&>(from_msg);
-  // @@protoc_insertion_point(class_specific_merge_from_start:io.deephaven.proto.backplane.grpc.StreamRequest)
-  ABSL_DCHECK_NE(&from, _this);
-  ::uint32_t cached_has_bits = 0;
-  (void) cached_has_bits;
-
-  switch (from.message_case()) {
-    case kConnect: {
-      _this->_internal_mutable_connect()->::io::deephaven::proto::backplane::grpc::ConnectRequest::MergeFrom(
-          from._internal_connect());
-      break;
-    }
-    case kData: {
-      _this->_internal_mutable_data()->::io::deephaven::proto::backplane::grpc::ClientData::MergeFrom(
-          from._internal_data());
-      break;
-    }
-    case MESSAGE_NOT_SET: {
-      break;
-    }
-  }
-  _this->_internal_metadata_.MergeFrom<::google::protobuf::UnknownFieldSet>(from._internal_metadata_);
-}
-
-void StreamRequest::CopyFrom(const StreamRequest& from) {
-// @@protoc_insertion_point(class_specific_copy_from_start:io.deephaven.proto.backplane.grpc.StreamRequest)
-  if (&from == this) return;
-  Clear();
-  MergeFrom(from);
-}
-
-PROTOBUF_NOINLINE bool StreamRequest::IsInitialized() const {
-  return true;
-}
-
-::_pbi::CachedSize* StreamRequest::AccessCachedSize() const {
-  return &_impl_._cached_size_;
-}
-void StreamRequest::InternalSwap(StreamRequest* PROTOBUF_RESTRICT other) {
-  using std::swap;
-  _internal_metadata_.InternalSwap(&other->_internal_metadata_);
-  swap(_impl_.message_, other->_impl_.message_);
-  swap(_impl_._oneof_case_[0], other->_impl_._oneof_case_[0]);
-}
-
-::google::protobuf::Metadata StreamRequest::GetMetadata() const {
-  return ::_pbi::AssignDescriptors(
-      &descriptor_table_deephaven_2fproto_2fobject_2eproto_getter, &descriptor_table_deephaven_2fproto_2fobject_2eproto_once,
-      file_level_metadata_deephaven_2fproto_2fobject_2eproto[5]);
-}
-// ===================================================================
-
-class StreamResponse::_Internal {
- public:
-  static constexpr ::int32_t kOneofCaseOffset =
-    PROTOBUF_FIELD_OFFSET(::io::deephaven::proto::backplane::grpc::StreamResponse, _impl_._oneof_case_);
-  static const ::io::deephaven::proto::backplane::grpc::ServerData& data(const StreamResponse* msg);
-};
-
-const ::io::deephaven::proto::backplane::grpc::ServerData& StreamResponse::_Internal::data(const StreamResponse* msg) {
-  return *msg->_impl_.message_.data_;
-}
-void StreamResponse::set_allocated_data(::io::deephaven::proto::backplane::grpc::ServerData* data) {
-  ::google::protobuf::Arena* message_arena = GetArena();
-  clear_message();
-  if (data) {
-    ::google::protobuf::Arena* submessage_arena = data->GetArena();
-    if (message_arena != submessage_arena) {
-      data = ::google::protobuf::internal::GetOwnedMessage(message_arena, data, submessage_arena);
-    }
-    set_has_data();
-    _impl_.message_.data_ = data;
-  }
-  // @@protoc_insertion_point(field_set_allocated:io.deephaven.proto.backplane.grpc.StreamResponse.data)
-}
-StreamResponse::StreamResponse(::google::protobuf::Arena* arena)
-    : ::google::protobuf::Message(arena) {
-  SharedCtor(arena);
-  // @@protoc_insertion_point(arena_constructor:io.deephaven.proto.backplane.grpc.StreamResponse)
-}
-inline PROTOBUF_NDEBUG_INLINE StreamResponse::Impl_::Impl_(
-    ::google::protobuf::internal::InternalVisibility visibility, ::google::protobuf::Arena* arena,
-    const Impl_& from)
-      : message_{},
-        _cached_size_{0},
-        _oneof_case_{from._oneof_case_[0]} {}
-
-StreamResponse::StreamResponse(
-    ::google::protobuf::Arena* arena,
-    const StreamResponse& from)
-    : ::google::protobuf::Message(arena) {
-  StreamResponse* const _this = this;
-  (void)_this;
-  _internal_metadata_.MergeFrom<::google::protobuf::UnknownFieldSet>(
-      from._internal_metadata_);
-  new (&_impl_) Impl_(internal_visibility(), arena, from._impl_);
-  switch (message_case()) {
-    case MESSAGE_NOT_SET:
-      break;
-      case kData:
-        _impl_.message_.data_ = CreateMaybeMessage<::io::deephaven::proto::backplane::grpc::ServerData>(arena, *from._impl_.message_.data_);
-        break;
-  }
-
-  // @@protoc_insertion_point(copy_constructor:io.deephaven.proto.backplane.grpc.StreamResponse)
-}
-inline PROTOBUF_NDEBUG_INLINE StreamResponse::Impl_::Impl_(
-    ::google::protobuf::internal::InternalVisibility visibility,
-    ::google::protobuf::Arena* arena)
-      : message_{},
-        _cached_size_{0},
-        _oneof_case_{} {}
-
-inline void StreamResponse::SharedCtor(::_pb::Arena* arena) {
-  new (&_impl_) Impl_(internal_visibility(), arena);
-}
-StreamResponse::~StreamResponse() {
-  // @@protoc_insertion_point(destructor:io.deephaven.proto.backplane.grpc.StreamResponse)
-  _internal_metadata_.Delete<::google::protobuf::UnknownFieldSet>();
-  SharedDtor();
-}
-inline void StreamResponse::SharedDtor() {
-  ABSL_DCHECK(GetArena() == nullptr);
-  if (has_message()) {
-    clear_message();
-  }
-  _impl_.~Impl_();
-}
-
-void StreamResponse::clear_message() {
-// @@protoc_insertion_point(one_of_clear_start:io.deephaven.proto.backplane.grpc.StreamResponse)
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  switch (message_case()) {
-    case kData: {
-      if (GetArena() == nullptr) {
-        delete _impl_.message_.data_;
-      }
-      break;
-    }
-    case MESSAGE_NOT_SET: {
-      break;
-    }
-  }
-  _impl_._oneof_case_[0] = MESSAGE_NOT_SET;
-}
-
-
-PROTOBUF_NOINLINE void StreamResponse::Clear() {
-// @@protoc_insertion_point(message_clear_start:io.deephaven.proto.backplane.grpc.StreamResponse)
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  ::uint32_t cached_has_bits = 0;
-  // Prevent compiler warnings about cached_has_bits being unused
-  (void) cached_has_bits;
-
-  clear_message();
-  _internal_metadata_.Clear<::google::protobuf::UnknownFieldSet>();
-}
-
-const char* StreamResponse::_InternalParse(
-    const char* ptr, ::_pbi::ParseContext* ctx) {
-  ptr = ::_pbi::TcParser::ParseLoop(this, ptr, ctx, &_table_.header);
-  return ptr;
-}
-
-
-PROTOBUF_CONSTINIT PROTOBUF_ATTRIBUTE_INIT_PRIORITY1
-const ::_pbi::TcParseTable<0, 1, 1, 0, 2> StreamResponse::_table_ = {
-  {
-    0,  // no _has_bits_
-    0, // no _extensions_
-    1, 0,  // max_field_number, fast_idx_mask
-    offsetof(decltype(_table_), field_lookup_table),
-    4294967294,  // skipmap
-    offsetof(decltype(_table_), field_entries),
-    1,  // num_field_entries
-    1,  // num_aux_entries
-    offsetof(decltype(_table_), aux_entries),
-    &_StreamResponse_default_instance_._instance,
-    ::_pbi::TcParser::GenericFallback,  // fallback
-  }, {{
-    {::_pbi::TcParser::MiniParse, {}},
-  }}, {{
-    65535, 65535
-  }}, {{
-    // .io.deephaven.proto.backplane.grpc.ServerData data = 1;
-    {PROTOBUF_FIELD_OFFSET(StreamResponse, _impl_.message_.data_), _Internal::kOneofCaseOffset + 0, 0,
-    (0 | ::_fl::kFcOneof | ::_fl::kMessage | ::_fl::kTvTable)},
-  }}, {{
-    {::_pbi::TcParser::GetTable<::io::deephaven::proto::backplane::grpc::ServerData>()},
-  }}, {{
-  }},
-};
-
-::uint8_t* StreamResponse::_InternalSerialize(
-    ::uint8_t* target,
-    ::google::protobuf::io::EpsCopyOutputStream* stream) const {
-  // @@protoc_insertion_point(serialize_to_array_start:io.deephaven.proto.backplane.grpc.StreamResponse)
-  ::uint32_t cached_has_bits = 0;
-  (void)cached_has_bits;
-
-  // .io.deephaven.proto.backplane.grpc.ServerData data = 1;
-  if (message_case() == kData) {
-    target = ::google::protobuf::internal::WireFormatLite::InternalWriteMessage(
-        1, _Internal::data(this),
-        _Internal::data(this).GetCachedSize(), target, stream);
-  }
-
-  if (PROTOBUF_PREDICT_FALSE(_internal_metadata_.have_unknown_fields())) {
-    target =
-        ::_pbi::WireFormat::InternalSerializeUnknownFieldsToArray(
-            _internal_metadata_.unknown_fields<::google::protobuf::UnknownFieldSet>(::google::protobuf::UnknownFieldSet::default_instance), target, stream);
-  }
-  // @@protoc_insertion_point(serialize_to_array_end:io.deephaven.proto.backplane.grpc.StreamResponse)
-  return target;
-}
-
-::size_t StreamResponse::ByteSizeLong() const {
-// @@protoc_insertion_point(message_byte_size_start:io.deephaven.proto.backplane.grpc.StreamResponse)
-  ::size_t total_size = 0;
-
-  ::uint32_t cached_has_bits = 0;
-  // Prevent compiler warnings about cached_has_bits being unused
-  (void) cached_has_bits;
-
-  switch (message_case()) {
-    // .io.deephaven.proto.backplane.grpc.ServerData data = 1;
-    case kData: {
-      total_size +=
-          1 + ::google::protobuf::internal::WireFormatLite::MessageSize(*_impl_.message_.data_);
-      break;
-    }
-    case MESSAGE_NOT_SET: {
-      break;
-    }
-  }
-  return MaybeComputeUnknownFieldsSize(total_size, &_impl_._cached_size_);
-}
-
-const ::google::protobuf::Message::ClassData StreamResponse::_class_data_ = {
-    StreamResponse::MergeImpl,
-    nullptr,  // OnDemandRegisterArenaDtor
-};
-const ::google::protobuf::Message::ClassData* StreamResponse::GetClassData() const {
-  return &_class_data_;
-}
-
-void StreamResponse::MergeImpl(::google::protobuf::Message& to_msg, const ::google::protobuf::Message& from_msg) {
-  auto* const _this = static_cast<StreamResponse*>(&to_msg);
-  auto& from = static_cast<const StreamResponse&>(from_msg);
-  // @@protoc_insertion_point(class_specific_merge_from_start:io.deephaven.proto.backplane.grpc.StreamResponse)
-  ABSL_DCHECK_NE(&from, _this);
-  ::uint32_t cached_has_bits = 0;
-  (void) cached_has_bits;
-
-  switch (from.message_case()) {
-    case kData: {
-      _this->_internal_mutable_data()->::io::deephaven::proto::backplane::grpc::ServerData::MergeFrom(
-          from._internal_data());
-      break;
-    }
-    case MESSAGE_NOT_SET: {
-      break;
-    }
-  }
-  _this->_internal_metadata_.MergeFrom<::google::protobuf::UnknownFieldSet>(from._internal_metadata_);
-}
-
-void StreamResponse::CopyFrom(const StreamResponse& from) {
-// @@protoc_insertion_point(class_specific_copy_from_start:io.deephaven.proto.backplane.grpc.StreamResponse)
-  if (&from == this) return;
-  Clear();
-  MergeFrom(from);
-}
-
-PROTOBUF_NOINLINE bool StreamResponse::IsInitialized() const {
-  return true;
-}
-
-::_pbi::CachedSize* StreamResponse::AccessCachedSize() const {
-  return &_impl_._cached_size_;
-}
-void StreamResponse::InternalSwap(StreamResponse* PROTOBUF_RESTRICT other) {
-  using std::swap;
-  _internal_metadata_.InternalSwap(&other->_internal_metadata_);
-  swap(_impl_.message_, other->_impl_.message_);
-  swap(_impl_._oneof_case_[0], other->_impl_._oneof_case_[0]);
-}
-
-::google::protobuf::Metadata StreamResponse::GetMetadata() const {
-  return ::_pbi::AssignDescriptors(
-      &descriptor_table_deephaven_2fproto_2fobject_2eproto_getter, &descriptor_table_deephaven_2fproto_2fobject_2eproto_once,
-      file_level_metadata_deephaven_2fproto_2fobject_2eproto[6]);
-}
-// ===================================================================
-
-class BrowserNextResponse::_Internal {
- public:
-};
-
-BrowserNextResponse::BrowserNextResponse(::google::protobuf::Arena* arena)
-    : ::google::protobuf::internal::ZeroFieldsBase(arena) {
-  // @@protoc_insertion_point(arena_constructor:io.deephaven.proto.backplane.grpc.BrowserNextResponse)
-}
-BrowserNextResponse::BrowserNextResponse(
-    ::google::protobuf::Arena* arena,
-    const BrowserNextResponse& from)
-    : ::google::protobuf::internal::ZeroFieldsBase(arena) {
-  BrowserNextResponse* const _this = this;
-  (void)_this;
-  _internal_metadata_.MergeFrom<::google::protobuf::UnknownFieldSet>(
-      from._internal_metadata_);
-
-  // @@protoc_insertion_point(copy_constructor:io.deephaven.proto.backplane.grpc.BrowserNextResponse)
-}
-
-
-
-
-
-
-
-
-
-::google::protobuf::Metadata BrowserNextResponse::GetMetadata() const {
-  return ::_pbi::AssignDescriptors(
-      &descriptor_table_deephaven_2fproto_2fobject_2eproto_getter, &descriptor_table_deephaven_2fproto_2fobject_2eproto_once,
-      file_level_metadata_deephaven_2fproto_2fobject_2eproto[7]);
-}
-// @@protoc_insertion_point(namespace_scope)
-}  // namespace grpc
-}  // namespace backplane
-}  // namespace proto
-}  // namespace deephaven
-}  // namespace io
-namespace google {
-namespace protobuf {
-}  // namespace protobuf
-}  // namespace google
-// @@protoc_insertion_point(global_scope)
-#include "google/protobuf/port_undef.inc"
diff --git a/cpp-client/deephaven/dhclient/proto/deephaven/proto/object.pb.h b/cpp-client/deephaven/dhclient/proto/deephaven/proto/object.pb.h
deleted file mode 100644
index 4dcc2ce24f5..00000000000
--- a/cpp-client/deephaven/dhclient/proto/deephaven/proto/object.pb.h
+++ /dev/null
@@ -1,2489 +0,0 @@
-// Generated by the protocol buffer compiler.  DO NOT EDIT!
-// source: deephaven/proto/object.proto
-// Protobuf C++ Version: 4.25.3
-
-#ifndef GOOGLE_PROTOBUF_INCLUDED_deephaven_2fproto_2fobject_2eproto_2epb_2eh
-#define GOOGLE_PROTOBUF_INCLUDED_deephaven_2fproto_2fobject_2eproto_2epb_2eh
-
-#include <limits>
-#include <string>
-#include <type_traits>
-#include <utility>
-
-#include "google/protobuf/port_def.inc"
-#if PROTOBUF_VERSION < 4025000
-#error "This file was generated by a newer version of protoc which is"
-#error "incompatible with your Protocol Buffer headers. Please update"
-#error "your headers."
-#endif  // PROTOBUF_VERSION
-
-#if 4025003 < PROTOBUF_MIN_PROTOC_VERSION
-#error "This file was generated by an older version of protoc which is"
-#error "incompatible with your Protocol Buffer headers. Please"
-#error "regenerate this file with a newer version of protoc."
-#endif  // PROTOBUF_MIN_PROTOC_VERSION
-#include "google/protobuf/port_undef.inc"
-#include "google/protobuf/io/coded_stream.h"
-#include "google/protobuf/arena.h"
-#include "google/protobuf/arenastring.h"
-#include "google/protobuf/generated_message_bases.h"
-#include "google/protobuf/generated_message_tctable_decl.h"
-#include "google/protobuf/generated_message_util.h"
-#include "google/protobuf/metadata_lite.h"
-#include "google/protobuf/generated_message_reflection.h"
-#include "google/protobuf/message.h"
-#include "google/protobuf/repeated_field.h"  // IWYU pragma: export
-#include "google/protobuf/extension_set.h"  // IWYU pragma: export
-#include "google/protobuf/unknown_field_set.h"
-#include "deephaven/proto/ticket.pb.h"
-// @@protoc_insertion_point(includes)
-
-// Must be included last.
-#include "google/protobuf/port_def.inc"
-
-#define PROTOBUF_INTERNAL_EXPORT_deephaven_2fproto_2fobject_2eproto
-
-namespace google {
-namespace protobuf {
-namespace internal {
-class AnyMetadata;
-}  // namespace internal
-}  // namespace protobuf
-}  // namespace google
-
-// Internal implementation detail -- do not use these members.
-struct TableStruct_deephaven_2fproto_2fobject_2eproto {
-  static const ::uint32_t offsets[];
-};
-extern const ::google::protobuf::internal::DescriptorTable
-    descriptor_table_deephaven_2fproto_2fobject_2eproto;
-namespace io {
-namespace deephaven {
-namespace proto {
-namespace backplane {
-namespace grpc {
-class BrowserNextResponse;
-struct BrowserNextResponseDefaultTypeInternal;
-extern BrowserNextResponseDefaultTypeInternal _BrowserNextResponse_default_instance_;
-class ClientData;
-struct ClientDataDefaultTypeInternal;
-extern ClientDataDefaultTypeInternal _ClientData_default_instance_;
-class ConnectRequest;
-struct ConnectRequestDefaultTypeInternal;
-extern ConnectRequestDefaultTypeInternal _ConnectRequest_default_instance_;
-class FetchObjectRequest;
-struct FetchObjectRequestDefaultTypeInternal;
-extern FetchObjectRequestDefaultTypeInternal _FetchObjectRequest_default_instance_;
-class FetchObjectResponse;
-struct FetchObjectResponseDefaultTypeInternal;
-extern FetchObjectResponseDefaultTypeInternal _FetchObjectResponse_default_instance_;
-class ServerData;
-struct ServerDataDefaultTypeInternal;
-extern ServerDataDefaultTypeInternal _ServerData_default_instance_;
-class StreamRequest;
-struct StreamRequestDefaultTypeInternal;
-extern StreamRequestDefaultTypeInternal _StreamRequest_default_instance_;
-class StreamResponse;
-struct StreamResponseDefaultTypeInternal;
-extern StreamResponseDefaultTypeInternal _StreamResponse_default_instance_;
-}  // namespace grpc
-}  // namespace backplane
-}  // namespace proto
-}  // namespace deephaven
-}  // namespace io
-namespace google {
-namespace protobuf {
-}  // namespace protobuf
-}  // namespace google
-
-namespace io {
-namespace deephaven {
-namespace proto {
-namespace backplane {
-namespace grpc {
-
-// ===================================================================
-
-
-// -------------------------------------------------------------------
-
-class BrowserNextResponse final :
-    public ::google::protobuf::internal::ZeroFieldsBase /* @@protoc_insertion_point(class_definition:io.deephaven.proto.backplane.grpc.BrowserNextResponse) */ {
- public:
-  inline BrowserNextResponse() : BrowserNextResponse(nullptr) {}
-  template<typename = void>
-  explicit PROTOBUF_CONSTEXPR BrowserNextResponse(::google::protobuf::internal::ConstantInitialized);
-
-  inline BrowserNextResponse(const BrowserNextResponse& from)
-      : BrowserNextResponse(nullptr, from) {}
-  BrowserNextResponse(BrowserNextResponse&& from) noexcept
-    : BrowserNextResponse() {
-    *this = ::std::move(from);
-  }
-
-  inline BrowserNextResponse& operator=(const BrowserNextResponse& from) {
-    CopyFrom(from);
-    return *this;
-  }
-  inline BrowserNextResponse& operator=(BrowserNextResponse&& from) noexcept {
-    if (this == &from) return *this;
-    if (GetArena() == from.GetArena()
-  #ifdef PROTOBUF_FORCE_COPY_IN_MOVE
-        && GetArena() != nullptr
-  #endif  // !PROTOBUF_FORCE_COPY_IN_MOVE
-    ) {
-      InternalSwap(&from);
-    } else {
-      CopyFrom(from);
-    }
-    return *this;
-  }
-
-  inline const ::google::protobuf::UnknownFieldSet& unknown_fields() const
-      ABSL_ATTRIBUTE_LIFETIME_BOUND {
-    return _internal_metadata_.unknown_fields<::google::protobuf::UnknownFieldSet>(::google::protobuf::UnknownFieldSet::default_instance);
-  }
-  inline ::google::protobuf::UnknownFieldSet* mutable_unknown_fields()
-      ABSL_ATTRIBUTE_LIFETIME_BOUND {
-    return _internal_metadata_.mutable_unknown_fields<::google::protobuf::UnknownFieldSet>();
-  }
-
-  static const ::google::protobuf::Descriptor* descriptor() {
-    return GetDescriptor();
-  }
-  static const ::google::protobuf::Descriptor* GetDescriptor() {
-    return default_instance().GetMetadata().descriptor;
-  }
-  static const ::google::protobuf::Reflection* GetReflection() {
-    return default_instance().GetMetadata().reflection;
-  }
-  static const BrowserNextResponse& default_instance() {
-    return *internal_default_instance();
-  }
-  static inline const BrowserNextResponse* internal_default_instance() {
-    return reinterpret_cast<const BrowserNextResponse*>(
-               &_BrowserNextResponse_default_instance_);
-  }
-  static constexpr int kIndexInFileMessages =
-    7;
-
-  friend void swap(BrowserNextResponse& a, BrowserNextResponse& b) {
-    a.Swap(&b);
-  }
-  inline void Swap(BrowserNextResponse* other) {
-    if (other == this) return;
-  #ifdef PROTOBUF_FORCE_COPY_IN_SWAP
-    if (GetArena() != nullptr &&
-        GetArena() == other->GetArena()) {
-   #else  // PROTOBUF_FORCE_COPY_IN_SWAP
-    if (GetArena() == other->GetArena()) {
-  #endif  // !PROTOBUF_FORCE_COPY_IN_SWAP
-      InternalSwap(other);
-    } else {
-      ::google::protobuf::internal::GenericSwap(this, other);
-    }
-  }
-  void UnsafeArenaSwap(BrowserNextResponse* other) {
-    if (other == this) return;
-    ABSL_DCHECK(GetArena() == other->GetArena());
-    InternalSwap(other);
-  }
-
-  // implements Message ----------------------------------------------
-
-  BrowserNextResponse* New(::google::protobuf::Arena* arena = nullptr) const final {
-    return CreateMaybeMessage<BrowserNextResponse>(arena);
-  }
-  using ::google::protobuf::internal::ZeroFieldsBase::CopyFrom;
-  inline void CopyFrom(const BrowserNextResponse& from) {
-    ::google::protobuf::internal::ZeroFieldsBase::CopyImpl(*this, from);
-  }
-  using ::google::protobuf::internal::ZeroFieldsBase::MergeFrom;
-  void MergeFrom(const BrowserNextResponse& from) {
-    ::google::protobuf::internal::ZeroFieldsBase::MergeImpl(*this, from);
-  }
-  public:
-
-  private:
-  friend class ::google::protobuf::internal::AnyMetadata;
-  static ::absl::string_view FullMessageName() {
-    return "io.deephaven.proto.backplane.grpc.BrowserNextResponse";
-  }
-  protected:
-  explicit BrowserNextResponse(::google::protobuf::Arena* arena);
-  BrowserNextResponse(::google::protobuf::Arena* arena, const BrowserNextResponse& from);
-  public:
-
-  ::google::protobuf::Metadata GetMetadata() const final;
-
-  // nested types ----------------------------------------------------
-
-  // accessors -------------------------------------------------------
-
-  // @@protoc_insertion_point(class_scope:io.deephaven.proto.backplane.grpc.BrowserNextResponse)
- private:
-  class _Internal;
-
-  friend class ::google::protobuf::MessageLite;
-  friend class ::google::protobuf::Arena;
-  template <typename T>
-  friend class ::google::protobuf::Arena::InternalHelper;
-  using InternalArenaConstructable_ = void;
-  using DestructorSkippable_ = void;
-  struct Impl_ {
-
-        inline explicit constexpr Impl_(
-            ::google::protobuf::internal::ConstantInitialized) noexcept;
-        inline explicit Impl_(::google::protobuf::internal::InternalVisibility visibility,
-                              ::google::protobuf::Arena* arena);
-        inline explicit Impl_(::google::protobuf::internal::InternalVisibility visibility,
-                              ::google::protobuf::Arena* arena, const Impl_& from);
-    PROTOBUF_TSAN_DECLARE_MEMBER
-  };
-  friend struct ::TableStruct_deephaven_2fproto_2fobject_2eproto;
-};// -------------------------------------------------------------------
-
-class ServerData final :
-    public ::google::protobuf::Message /* @@protoc_insertion_point(class_definition:io.deephaven.proto.backplane.grpc.ServerData) */ {
- public:
-  inline ServerData() : ServerData(nullptr) {}
-  ~ServerData() override;
-  template<typename = void>
-  explicit PROTOBUF_CONSTEXPR ServerData(::google::protobuf::internal::ConstantInitialized);
-
-  inline ServerData(const ServerData& from)
-      : ServerData(nullptr, from) {}
-  ServerData(ServerData&& from) noexcept
-    : ServerData() {
-    *this = ::std::move(from);
-  }
-
-  inline ServerData& operator=(const ServerData& from) {
-    CopyFrom(from);
-    return *this;
-  }
-  inline ServerData& operator=(ServerData&& from) noexcept {
-    if (this == &from) return *this;
-    if (GetArena() == from.GetArena()
-  #ifdef PROTOBUF_FORCE_COPY_IN_MOVE
-        && GetArena() != nullptr
-  #endif  // !PROTOBUF_FORCE_COPY_IN_MOVE
-    ) {
-      InternalSwap(&from);
-    } else {
-      CopyFrom(from);
-    }
-    return *this;
-  }
-
-  inline const ::google::protobuf::UnknownFieldSet& unknown_fields() const
-      ABSL_ATTRIBUTE_LIFETIME_BOUND {
-    return _internal_metadata_.unknown_fields<::google::protobuf::UnknownFieldSet>(::google::protobuf::UnknownFieldSet::default_instance);
-  }
-  inline ::google::protobuf::UnknownFieldSet* mutable_unknown_fields()
-      ABSL_ATTRIBUTE_LIFETIME_BOUND {
-    return _internal_metadata_.mutable_unknown_fields<::google::protobuf::UnknownFieldSet>();
-  }
-
-  static const ::google::protobuf::Descriptor* descriptor() {
-    return GetDescriptor();
-  }
-  static const ::google::protobuf::Descriptor* GetDescriptor() {
-    return default_instance().GetMetadata().descriptor;
-  }
-  static const ::google::protobuf::Reflection* GetReflection() {
-    return default_instance().GetMetadata().reflection;
-  }
-  static const ServerData& default_instance() {
-    return *internal_default_instance();
-  }
-  static inline const ServerData* internal_default_instance() {
-    return reinterpret_cast<const ServerData*>(
-               &_ServerData_default_instance_);
-  }
-  static constexpr int kIndexInFileMessages =
-    4;
-
-  friend void swap(ServerData& a, ServerData& b) {
-    a.Swap(&b);
-  }
-  inline void Swap(ServerData* other) {
-    if (other == this) return;
-  #ifdef PROTOBUF_FORCE_COPY_IN_SWAP
-    if (GetArena() != nullptr &&
-        GetArena() == other->GetArena()) {
-   #else  // PROTOBUF_FORCE_COPY_IN_SWAP
-    if (GetArena() == other->GetArena()) {
-  #endif  // !PROTOBUF_FORCE_COPY_IN_SWAP
-      InternalSwap(other);
-    } else {
-      ::google::protobuf::internal::GenericSwap(this, other);
-    }
-  }
-  void UnsafeArenaSwap(ServerData* other) {
-    if (other == this) return;
-    ABSL_DCHECK(GetArena() == other->GetArena());
-    InternalSwap(other);
-  }
-
-  // implements Message ----------------------------------------------
-
-  ServerData* New(::google::protobuf::Arena* arena = nullptr) const final {
-    return CreateMaybeMessage<ServerData>(arena);
-  }
-  using ::google::protobuf::Message::CopyFrom;
-  void CopyFrom(const ServerData& from);
-  using ::google::protobuf::Message::MergeFrom;
-  void MergeFrom( const ServerData& from) {
-    ServerData::MergeImpl(*this, from);
-  }
-  private:
-  static void MergeImpl(::google::protobuf::Message& to_msg, const ::google::protobuf::Message& from_msg);
-  public:
-  PROTOBUF_ATTRIBUTE_REINITIALIZES void Clear() final;
-  bool IsInitialized() const final;
-
-  ::size_t ByteSizeLong() const final;
-  const char* _InternalParse(const char* ptr, ::google::protobuf::internal::ParseContext* ctx) final;
-  ::uint8_t* _InternalSerialize(
-      ::uint8_t* target, ::google::protobuf::io::EpsCopyOutputStream* stream) const final;
-  int GetCachedSize() const { return _impl_._cached_size_.Get(); }
-
-  private:
-  ::google::protobuf::internal::CachedSize* AccessCachedSize() const final;
-  void SharedCtor(::google::protobuf::Arena* arena);
-  void SharedDtor();
-  void InternalSwap(ServerData* other);
-
-  private:
-  friend class ::google::protobuf::internal::AnyMetadata;
-  static ::absl::string_view FullMessageName() {
-    return "io.deephaven.proto.backplane.grpc.ServerData";
-  }
-  protected:
-  explicit ServerData(::google::protobuf::Arena* arena);
-  ServerData(::google::protobuf::Arena* arena, const ServerData& from);
-  public:
-
-  static const ClassData _class_data_;
-  const ::google::protobuf::Message::ClassData*GetClassData() const final;
-
-  ::google::protobuf::Metadata GetMetadata() const final;
-
-  // nested types ----------------------------------------------------
-
-  // accessors -------------------------------------------------------
-
-  enum : int {
-    kExportedReferencesFieldNumber = 2,
-    kPayloadFieldNumber = 1,
-  };
-  // repeated .io.deephaven.proto.backplane.grpc.TypedTicket exported_references = 2;
-  int exported_references_size() const;
-  private:
-  int _internal_exported_references_size() const;
-
-  public:
-  void clear_exported_references() ;
-  ::io::deephaven::proto::backplane::grpc::TypedTicket* mutable_exported_references(int index);
-  ::google::protobuf::RepeatedPtrField< ::io::deephaven::proto::backplane::grpc::TypedTicket >*
-      mutable_exported_references();
-  private:
-  const ::google::protobuf::RepeatedPtrField<::io::deephaven::proto::backplane::grpc::TypedTicket>& _internal_exported_references() const;
-  ::google::protobuf::RepeatedPtrField<::io::deephaven::proto::backplane::grpc::TypedTicket>* _internal_mutable_exported_references();
-  public:
-  const ::io::deephaven::proto::backplane::grpc::TypedTicket& exported_references(int index) const;
-  ::io::deephaven::proto::backplane::grpc::TypedTicket* add_exported_references();
-  const ::google::protobuf::RepeatedPtrField< ::io::deephaven::proto::backplane::grpc::TypedTicket >&
-      exported_references() const;
-  // bytes payload = 1;
-  void clear_payload() ;
-  const std::string& payload() const;
-  template <typename Arg_ = const std::string&, typename... Args_>
-  void set_payload(Arg_&& arg, Args_... args);
-  std::string* mutable_payload();
-  PROTOBUF_NODISCARD std::string* release_payload();
-  void set_allocated_payload(std::string* value);
-
-  private:
-  const std::string& _internal_payload() const;
-  inline PROTOBUF_ALWAYS_INLINE void _internal_set_payload(
-      const std::string& value);
-  std::string* _internal_mutable_payload();
-
-  public:
-  // @@protoc_insertion_point(class_scope:io.deephaven.proto.backplane.grpc.ServerData)
- private:
-  class _Internal;
-
-  friend class ::google::protobuf::internal::TcParser;
-  static const ::google::protobuf::internal::TcParseTable<
-      1, 2, 1,
-      0, 2>
-      _table_;
-  friend class ::google::protobuf::MessageLite;
-  friend class ::google::protobuf::Arena;
-  template <typename T>
-  friend class ::google::protobuf::Arena::InternalHelper;
-  using InternalArenaConstructable_ = void;
-  using DestructorSkippable_ = void;
-  struct Impl_ {
-
-        inline explicit constexpr Impl_(
-            ::google::protobuf::internal::ConstantInitialized) noexcept;
-        inline explicit Impl_(::google::protobuf::internal::InternalVisibility visibility,
-                              ::google::protobuf::Arena* arena);
-        inline explicit Impl_(::google::protobuf::internal::InternalVisibility visibility,
-                              ::google::protobuf::Arena* arena, const Impl_& from);
-    ::google::protobuf::RepeatedPtrField< ::io::deephaven::proto::backplane::grpc::TypedTicket > exported_references_;
-    ::google::protobuf::internal::ArenaStringPtr payload_;
-    mutable ::google::protobuf::internal::CachedSize _cached_size_;
-    PROTOBUF_TSAN_DECLARE_MEMBER
-  };
-  union { Impl_ _impl_; };
-  friend struct ::TableStruct_deephaven_2fproto_2fobject_2eproto;
-};// -------------------------------------------------------------------
-
-class FetchObjectResponse final :
-    public ::google::protobuf::Message /* @@protoc_insertion_point(class_definition:io.deephaven.proto.backplane.grpc.FetchObjectResponse) */ {
- public:
-  inline FetchObjectResponse() : FetchObjectResponse(nullptr) {}
-  ~FetchObjectResponse() override;
-  template<typename = void>
-  explicit PROTOBUF_CONSTEXPR FetchObjectResponse(::google::protobuf::internal::ConstantInitialized);
-
-  inline FetchObjectResponse(const FetchObjectResponse& from)
-      : FetchObjectResponse(nullptr, from) {}
-  FetchObjectResponse(FetchObjectResponse&& from) noexcept
-    : FetchObjectResponse() {
-    *this = ::std::move(from);
-  }
-
-  inline FetchObjectResponse& operator=(const FetchObjectResponse& from) {
-    CopyFrom(from);
-    return *this;
-  }
-  inline FetchObjectResponse& operator=(FetchObjectResponse&& from) noexcept {
-    if (this == &from) return *this;
-    if (GetArena() == from.GetArena()
-  #ifdef PROTOBUF_FORCE_COPY_IN_MOVE
-        && GetArena() != nullptr
-  #endif  // !PROTOBUF_FORCE_COPY_IN_MOVE
-    ) {
-      InternalSwap(&from);
-    } else {
-      CopyFrom(from);
-    }
-    return *this;
-  }
-
-  inline const ::google::protobuf::UnknownFieldSet& unknown_fields() const
-      ABSL_ATTRIBUTE_LIFETIME_BOUND {
-    return _internal_metadata_.unknown_fields<::google::protobuf::UnknownFieldSet>(::google::protobuf::UnknownFieldSet::default_instance);
-  }
-  inline ::google::protobuf::UnknownFieldSet* mutable_unknown_fields()
-      ABSL_ATTRIBUTE_LIFETIME_BOUND {
-    return _internal_metadata_.mutable_unknown_fields<::google::protobuf::UnknownFieldSet>();
-  }
-
-  static const ::google::protobuf::Descriptor* descriptor() {
-    return GetDescriptor();
-  }
-  static const ::google::protobuf::Descriptor* GetDescriptor() {
-    return default_instance().GetMetadata().descriptor;
-  }
-  static const ::google::protobuf::Reflection* GetReflection() {
-    return default_instance().GetMetadata().reflection;
-  }
-  static const FetchObjectResponse& default_instance() {
-    return *internal_default_instance();
-  }
-  static inline const FetchObjectResponse* internal_default_instance() {
-    return reinterpret_cast<const FetchObjectResponse*>(
-               &_FetchObjectResponse_default_instance_);
-  }
-  static constexpr int kIndexInFileMessages =
-    1;
-
-  friend void swap(FetchObjectResponse& a, FetchObjectResponse& b) {
-    a.Swap(&b);
-  }
-  inline void Swap(FetchObjectResponse* other) {
-    if (other == this) return;
-  #ifdef PROTOBUF_FORCE_COPY_IN_SWAP
-    if (GetArena() != nullptr &&
-        GetArena() == other->GetArena()) {
-   #else  // PROTOBUF_FORCE_COPY_IN_SWAP
-    if (GetArena() == other->GetArena()) {
-  #endif  // !PROTOBUF_FORCE_COPY_IN_SWAP
-      InternalSwap(other);
-    } else {
-      ::google::protobuf::internal::GenericSwap(this, other);
-    }
-  }
-  void UnsafeArenaSwap(FetchObjectResponse* other) {
-    if (other == this) return;
-    ABSL_DCHECK(GetArena() == other->GetArena());
-    InternalSwap(other);
-  }
-
-  // implements Message ----------------------------------------------
-
-  FetchObjectResponse* New(::google::protobuf::Arena* arena = nullptr) const final {
-    return CreateMaybeMessage<FetchObjectResponse>(arena);
-  }
-  using ::google::protobuf::Message::CopyFrom;
-  void CopyFrom(const FetchObjectResponse& from);
-  using ::google::protobuf::Message::MergeFrom;
-  void MergeFrom( const FetchObjectResponse& from) {
-    FetchObjectResponse::MergeImpl(*this, from);
-  }
-  private:
-  static void MergeImpl(::google::protobuf::Message& to_msg, const ::google::protobuf::Message& from_msg);
-  public:
-  PROTOBUF_ATTRIBUTE_REINITIALIZES void Clear() final;
-  bool IsInitialized() const final;
-
-  ::size_t ByteSizeLong() const final;
-  const char* _InternalParse(const char* ptr, ::google::protobuf::internal::ParseContext* ctx) final;
-  ::uint8_t* _InternalSerialize(
-      ::uint8_t* target, ::google::protobuf::io::EpsCopyOutputStream* stream) const final;
-  int GetCachedSize() const { return _impl_._cached_size_.Get(); }
-
-  private:
-  ::google::protobuf::internal::CachedSize* AccessCachedSize() const final;
-  void SharedCtor(::google::protobuf::Arena* arena);
-  void SharedDtor();
-  void InternalSwap(FetchObjectResponse* other);
-
-  private:
-  friend class ::google::protobuf::internal::AnyMetadata;
-  static ::absl::string_view FullMessageName() {
-    return "io.deephaven.proto.backplane.grpc.FetchObjectResponse";
-  }
-  protected:
-  explicit FetchObjectResponse(::google::protobuf::Arena* arena);
-  FetchObjectResponse(::google::protobuf::Arena* arena, const FetchObjectResponse& from);
-  public:
-
-  static const ClassData _class_data_;
-  const ::google::protobuf::Message::ClassData*GetClassData() const final;
-
-  ::google::protobuf::Metadata GetMetadata() const final;
-
-  // nested types ----------------------------------------------------
-
-  // accessors -------------------------------------------------------
-
-  enum : int {
-    kTypedExportIdsFieldNumber = 3,
-    kTypeFieldNumber = 1,
-    kDataFieldNumber = 2,
-  };
-  // repeated .io.deephaven.proto.backplane.grpc.TypedTicket typed_export_ids = 3;
-  int typed_export_ids_size() const;
-  private:
-  int _internal_typed_export_ids_size() const;
-
-  public:
-  void clear_typed_export_ids() ;
-  ::io::deephaven::proto::backplane::grpc::TypedTicket* mutable_typed_export_ids(int index);
-  ::google::protobuf::RepeatedPtrField< ::io::deephaven::proto::backplane::grpc::TypedTicket >*
-      mutable_typed_export_ids();
-  private:
-  const ::google::protobuf::RepeatedPtrField<::io::deephaven::proto::backplane::grpc::TypedTicket>& _internal_typed_export_ids() const;
-  ::google::protobuf::RepeatedPtrField<::io::deephaven::proto::backplane::grpc::TypedTicket>* _internal_mutable_typed_export_ids();
-  public:
-  const ::io::deephaven::proto::backplane::grpc::TypedTicket& typed_export_ids(int index) const;
-  ::io::deephaven::proto::backplane::grpc::TypedTicket* add_typed_export_ids();
-  const ::google::protobuf::RepeatedPtrField< ::io::deephaven::proto::backplane::grpc::TypedTicket >&
-      typed_export_ids() const;
-  // string type = 1;
-  void clear_type() ;
-  const std::string& type() const;
-  template <typename Arg_ = const std::string&, typename... Args_>
-  void set_type(Arg_&& arg, Args_... args);
-  std::string* mutable_type();
-  PROTOBUF_NODISCARD std::string* release_type();
-  void set_allocated_type(std::string* value);
-
-  private:
-  const std::string& _internal_type() const;
-  inline PROTOBUF_ALWAYS_INLINE void _internal_set_type(
-      const std::string& value);
-  std::string* _internal_mutable_type();
-
-  public:
-  // bytes data = 2;
-  void clear_data() ;
-  const std::string& data() const;
-  template <typename Arg_ = const std::string&, typename... Args_>
-  void set_data(Arg_&& arg, Args_... args);
-  std::string* mutable_data();
-  PROTOBUF_NODISCARD std::string* release_data();
-  void set_allocated_data(std::string* value);
-
-  private:
-  const std::string& _internal_data() const;
-  inline PROTOBUF_ALWAYS_INLINE void _internal_set_data(
-      const std::string& value);
-  std::string* _internal_mutable_data();
-
-  public:
-  // @@protoc_insertion_point(class_scope:io.deephaven.proto.backplane.grpc.FetchObjectResponse)
- private:
-  class _Internal;
-
-  friend class ::google::protobuf::internal::TcParser;
-  static const ::google::protobuf::internal::TcParseTable<
-      2, 3, 1,
-      66, 2>
-      _table_;
-  friend class ::google::protobuf::MessageLite;
-  friend class ::google::protobuf::Arena;
-  template <typename T>
-  friend class ::google::protobuf::Arena::InternalHelper;
-  using InternalArenaConstructable_ = void;
-  using DestructorSkippable_ = void;
-  struct Impl_ {
-
-        inline explicit constexpr Impl_(
-            ::google::protobuf::internal::ConstantInitialized) noexcept;
-        inline explicit Impl_(::google::protobuf::internal::InternalVisibility visibility,
-                              ::google::protobuf::Arena* arena);
-        inline explicit Impl_(::google::protobuf::internal::InternalVisibility visibility,
-                              ::google::protobuf::Arena* arena, const Impl_& from);
-    ::google::protobuf::RepeatedPtrField< ::io::deephaven::proto::backplane::grpc::TypedTicket > typed_export_ids_;
-    ::google::protobuf::internal::ArenaStringPtr type_;
-    ::google::protobuf::internal::ArenaStringPtr data_;
-    mutable ::google::protobuf::internal::CachedSize _cached_size_;
-    PROTOBUF_TSAN_DECLARE_MEMBER
-  };
-  union { Impl_ _impl_; };
-  friend struct ::TableStruct_deephaven_2fproto_2fobject_2eproto;
-};// -------------------------------------------------------------------
-
-class FetchObjectRequest final :
-    public ::google::protobuf::Message /* @@protoc_insertion_point(class_definition:io.deephaven.proto.backplane.grpc.FetchObjectRequest) */ {
- public:
-  inline FetchObjectRequest() : FetchObjectRequest(nullptr) {}
-  ~FetchObjectRequest() override;
-  template<typename = void>
-  explicit PROTOBUF_CONSTEXPR FetchObjectRequest(::google::protobuf::internal::ConstantInitialized);
-
-  inline FetchObjectRequest(const FetchObjectRequest& from)
-      : FetchObjectRequest(nullptr, from) {}
-  FetchObjectRequest(FetchObjectRequest&& from) noexcept
-    : FetchObjectRequest() {
-    *this = ::std::move(from);
-  }
-
-  inline FetchObjectRequest& operator=(const FetchObjectRequest& from) {
-    CopyFrom(from);
-    return *this;
-  }
-  inline FetchObjectRequest& operator=(FetchObjectRequest&& from) noexcept {
-    if (this == &from) return *this;
-    if (GetArena() == from.GetArena()
-  #ifdef PROTOBUF_FORCE_COPY_IN_MOVE
-        && GetArena() != nullptr
-  #endif  // !PROTOBUF_FORCE_COPY_IN_MOVE
-    ) {
-      InternalSwap(&from);
-    } else {
-      CopyFrom(from);
-    }
-    return *this;
-  }
-
-  inline const ::google::protobuf::UnknownFieldSet& unknown_fields() const
-      ABSL_ATTRIBUTE_LIFETIME_BOUND {
-    return _internal_metadata_.unknown_fields<::google::protobuf::UnknownFieldSet>(::google::protobuf::UnknownFieldSet::default_instance);
-  }
-  inline ::google::protobuf::UnknownFieldSet* mutable_unknown_fields()
-      ABSL_ATTRIBUTE_LIFETIME_BOUND {
-    return _internal_metadata_.mutable_unknown_fields<::google::protobuf::UnknownFieldSet>();
-  }
-
-  static const ::google::protobuf::Descriptor* descriptor() {
-    return GetDescriptor();
-  }
-  static const ::google::protobuf::Descriptor* GetDescriptor() {
-    return default_instance().GetMetadata().descriptor;
-  }
-  static const ::google::protobuf::Reflection* GetReflection() {
-    return default_instance().GetMetadata().reflection;
-  }
-  static const FetchObjectRequest& default_instance() {
-    return *internal_default_instance();
-  }
-  static inline const FetchObjectRequest* internal_default_instance() {
-    return reinterpret_cast<const FetchObjectRequest*>(
-               &_FetchObjectRequest_default_instance_);
-  }
-  static constexpr int kIndexInFileMessages =
-    0;
-
-  friend void swap(FetchObjectRequest& a, FetchObjectRequest& b) {
-    a.Swap(&b);
-  }
-  inline void Swap(FetchObjectRequest* other) {
-    if (other == this) return;
-  #ifdef PROTOBUF_FORCE_COPY_IN_SWAP
-    if (GetArena() != nullptr &&
-        GetArena() == other->GetArena()) {
-   #else  // PROTOBUF_FORCE_COPY_IN_SWAP
-    if (GetArena() == other->GetArena()) {
-  #endif  // !PROTOBUF_FORCE_COPY_IN_SWAP
-      InternalSwap(other);
-    } else {
-      ::google::protobuf::internal::GenericSwap(this, other);
-    }
-  }
-  void UnsafeArenaSwap(FetchObjectRequest* other) {
-    if (other == this) return;
-    ABSL_DCHECK(GetArena() == other->GetArena());
-    InternalSwap(other);
-  }
-
-  // implements Message ----------------------------------------------
-
-  FetchObjectRequest* New(::google::protobuf::Arena* arena = nullptr) const final {
-    return CreateMaybeMessage<FetchObjectRequest>(arena);
-  }
-  using ::google::protobuf::Message::CopyFrom;
-  void CopyFrom(const FetchObjectRequest& from);
-  using ::google::protobuf::Message::MergeFrom;
-  void MergeFrom( const FetchObjectRequest& from) {
-    FetchObjectRequest::MergeImpl(*this, from);
-  }
-  private:
-  static void MergeImpl(::google::protobuf::Message& to_msg, const ::google::protobuf::Message& from_msg);
-  public:
-  PROTOBUF_ATTRIBUTE_REINITIALIZES void Clear() final;
-  bool IsInitialized() const final;
-
-  ::size_t ByteSizeLong() const final;
-  const char* _InternalParse(const char* ptr, ::google::protobuf::internal::ParseContext* ctx) final;
-  ::uint8_t* _InternalSerialize(
-      ::uint8_t* target, ::google::protobuf::io::EpsCopyOutputStream* stream) const final;
-  int GetCachedSize() const { return _impl_._cached_size_.Get(); }
-
-  private:
-  ::google::protobuf::internal::CachedSize* AccessCachedSize() const final;
-  void SharedCtor(::google::protobuf::Arena* arena);
-  void SharedDtor();
-  void InternalSwap(FetchObjectRequest* other);
-
-  private:
-  friend class ::google::protobuf::internal::AnyMetadata;
-  static ::absl::string_view FullMessageName() {
-    return "io.deephaven.proto.backplane.grpc.FetchObjectRequest";
-  }
-  protected:
-  explicit FetchObjectRequest(::google::protobuf::Arena* arena);
-  FetchObjectRequest(::google::protobuf::Arena* arena, const FetchObjectRequest& from);
-  public:
-
-  static const ClassData _class_data_;
-  const ::google::protobuf::Message::ClassData*GetClassData() const final;
-
-  ::google::protobuf::Metadata GetMetadata() const final;
-
-  // nested types ----------------------------------------------------
-
-  // accessors -------------------------------------------------------
-
-  enum : int {
-    kSourceIdFieldNumber = 1,
-  };
-  // .io.deephaven.proto.backplane.grpc.TypedTicket source_id = 1;
-  bool has_source_id() const;
-  void clear_source_id() ;
-  const ::io::deephaven::proto::backplane::grpc::TypedTicket& source_id() const;
-  PROTOBUF_NODISCARD ::io::deephaven::proto::backplane::grpc::TypedTicket* release_source_id();
-  ::io::deephaven::proto::backplane::grpc::TypedTicket* mutable_source_id();
-  void set_allocated_source_id(::io::deephaven::proto::backplane::grpc::TypedTicket* value);
-  void unsafe_arena_set_allocated_source_id(::io::deephaven::proto::backplane::grpc::TypedTicket* value);
-  ::io::deephaven::proto::backplane::grpc::TypedTicket* unsafe_arena_release_source_id();
-
-  private:
-  const ::io::deephaven::proto::backplane::grpc::TypedTicket& _internal_source_id() const;
-  ::io::deephaven::proto::backplane::grpc::TypedTicket* _internal_mutable_source_id();
-
-  public:
-  // @@protoc_insertion_point(class_scope:io.deephaven.proto.backplane.grpc.FetchObjectRequest)
- private:
-  class _Internal;
-
-  friend class ::google::protobuf::internal::TcParser;
-  static const ::google::protobuf::internal::TcParseTable<
-      0, 1, 1,
-      0, 2>
-      _table_;
-  friend class ::google::protobuf::MessageLite;
-  friend class ::google::protobuf::Arena;
-  template <typename T>
-  friend class ::google::protobuf::Arena::InternalHelper;
-  using InternalArenaConstructable_ = void;
-  using DestructorSkippable_ = void;
-  struct Impl_ {
-
-        inline explicit constexpr Impl_(
-            ::google::protobuf::internal::ConstantInitialized) noexcept;
-        inline explicit Impl_(::google::protobuf::internal::InternalVisibility visibility,
-                              ::google::protobuf::Arena* arena);
-        inline explicit Impl_(::google::protobuf::internal::InternalVisibility visibility,
-                              ::google::protobuf::Arena* arena, const Impl_& from);
-    ::google::protobuf::internal::HasBits<1> _has_bits_;
-    mutable ::google::protobuf::internal::CachedSize _cached_size_;
-    ::io::deephaven::proto::backplane::grpc::TypedTicket* source_id_;
-    PROTOBUF_TSAN_DECLARE_MEMBER
-  };
-  union { Impl_ _impl_; };
-  friend struct ::TableStruct_deephaven_2fproto_2fobject_2eproto;
-};// -------------------------------------------------------------------
-
-class ConnectRequest final :
-    public ::google::protobuf::Message /* @@protoc_insertion_point(class_definition:io.deephaven.proto.backplane.grpc.ConnectRequest) */ {
- public:
-  inline ConnectRequest() : ConnectRequest(nullptr) {}
-  ~ConnectRequest() override;
-  template<typename = void>
-  explicit PROTOBUF_CONSTEXPR ConnectRequest(::google::protobuf::internal::ConstantInitialized);
-
-  inline ConnectRequest(const ConnectRequest& from)
-      : ConnectRequest(nullptr, from) {}
-  ConnectRequest(ConnectRequest&& from) noexcept
-    : ConnectRequest() {
-    *this = ::std::move(from);
-  }
-
-  inline ConnectRequest& operator=(const ConnectRequest& from) {
-    CopyFrom(from);
-    return *this;
-  }
-  inline ConnectRequest& operator=(ConnectRequest&& from) noexcept {
-    if (this == &from) return *this;
-    if (GetArena() == from.GetArena()
-  #ifdef PROTOBUF_FORCE_COPY_IN_MOVE
-        && GetArena() != nullptr
-  #endif  // !PROTOBUF_FORCE_COPY_IN_MOVE
-    ) {
-      InternalSwap(&from);
-    } else {
-      CopyFrom(from);
-    }
-    return *this;
-  }
-
-  inline const ::google::protobuf::UnknownFieldSet& unknown_fields() const
-      ABSL_ATTRIBUTE_LIFETIME_BOUND {
-    return _internal_metadata_.unknown_fields<::google::protobuf::UnknownFieldSet>(::google::protobuf::UnknownFieldSet::default_instance);
-  }
-  inline ::google::protobuf::UnknownFieldSet* mutable_unknown_fields()
-      ABSL_ATTRIBUTE_LIFETIME_BOUND {
-    return _internal_metadata_.mutable_unknown_fields<::google::protobuf::UnknownFieldSet>();
-  }
-
-  static const ::google::protobuf::Descriptor* descriptor() {
-    return GetDescriptor();
-  }
-  static const ::google::protobuf::Descriptor* GetDescriptor() {
-    return default_instance().GetMetadata().descriptor;
-  }
-  static const ::google::protobuf::Reflection* GetReflection() {
-    return default_instance().GetMetadata().reflection;
-  }
-  static const ConnectRequest& default_instance() {
-    return *internal_default_instance();
-  }
-  static inline const ConnectRequest* internal_default_instance() {
-    return reinterpret_cast<const ConnectRequest*>(
-               &_ConnectRequest_default_instance_);
-  }
-  static constexpr int kIndexInFileMessages =
-    2;
-
-  friend void swap(ConnectRequest& a, ConnectRequest& b) {
-    a.Swap(&b);
-  }
-  inline void Swap(ConnectRequest* other) {
-    if (other == this) return;
-  #ifdef PROTOBUF_FORCE_COPY_IN_SWAP
-    if (GetArena() != nullptr &&
-        GetArena() == other->GetArena()) {
-   #else  // PROTOBUF_FORCE_COPY_IN_SWAP
-    if (GetArena() == other->GetArena()) {
-  #endif  // !PROTOBUF_FORCE_COPY_IN_SWAP
-      InternalSwap(other);
-    } else {
-      ::google::protobuf::internal::GenericSwap(this, other);
-    }
-  }
-  void UnsafeArenaSwap(ConnectRequest* other) {
-    if (other == this) return;
-    ABSL_DCHECK(GetArena() == other->GetArena());
-    InternalSwap(other);
-  }
-
-  // implements Message ----------------------------------------------
-
-  ConnectRequest* New(::google::protobuf::Arena* arena = nullptr) const final {
-    return CreateMaybeMessage<ConnectRequest>(arena);
-  }
-  using ::google::protobuf::Message::CopyFrom;
-  void CopyFrom(const ConnectRequest& from);
-  using ::google::protobuf::Message::MergeFrom;
-  void MergeFrom( const ConnectRequest& from) {
-    ConnectRequest::MergeImpl(*this, from);
-  }
-  private:
-  static void MergeImpl(::google::protobuf::Message& to_msg, const ::google::protobuf::Message& from_msg);
-  public:
-  PROTOBUF_ATTRIBUTE_REINITIALIZES void Clear() final;
-  bool IsInitialized() const final;
-
-  ::size_t ByteSizeLong() const final;
-  const char* _InternalParse(const char* ptr, ::google::protobuf::internal::ParseContext* ctx) final;
-  ::uint8_t* _InternalSerialize(
-      ::uint8_t* target, ::google::protobuf::io::EpsCopyOutputStream* stream) const final;
-  int GetCachedSize() const { return _impl_._cached_size_.Get(); }
-
-  private:
-  ::google::protobuf::internal::CachedSize* AccessCachedSize() const final;
-  void SharedCtor(::google::protobuf::Arena* arena);
-  void SharedDtor();
-  void InternalSwap(ConnectRequest* other);
-
-  private:
-  friend class ::google::protobuf::internal::AnyMetadata;
-  static ::absl::string_view FullMessageName() {
-    return "io.deephaven.proto.backplane.grpc.ConnectRequest";
-  }
-  protected:
-  explicit ConnectRequest(::google::protobuf::Arena* arena);
-  ConnectRequest(::google::protobuf::Arena* arena, const ConnectRequest& from);
-  public:
-
-  static const ClassData _class_data_;
-  const ::google::protobuf::Message::ClassData*GetClassData() const final;
-
-  ::google::protobuf::Metadata GetMetadata() const final;
-
-  // nested types ----------------------------------------------------
-
-  // accessors -------------------------------------------------------
-
-  enum : int {
-    kSourceIdFieldNumber = 1,
-  };
-  // .io.deephaven.proto.backplane.grpc.TypedTicket source_id = 1;
-  bool has_source_id() const;
-  void clear_source_id() ;
-  const ::io::deephaven::proto::backplane::grpc::TypedTicket& source_id() const;
-  PROTOBUF_NODISCARD ::io::deephaven::proto::backplane::grpc::TypedTicket* release_source_id();
-  ::io::deephaven::proto::backplane::grpc::TypedTicket* mutable_source_id();
-  void set_allocated_source_id(::io::deephaven::proto::backplane::grpc::TypedTicket* value);
-  void unsafe_arena_set_allocated_source_id(::io::deephaven::proto::backplane::grpc::TypedTicket* value);
-  ::io::deephaven::proto::backplane::grpc::TypedTicket* unsafe_arena_release_source_id();
-
-  private:
-  const ::io::deephaven::proto::backplane::grpc::TypedTicket& _internal_source_id() const;
-  ::io::deephaven::proto::backplane::grpc::TypedTicket* _internal_mutable_source_id();
-
-  public:
-  // @@protoc_insertion_point(class_scope:io.deephaven.proto.backplane.grpc.ConnectRequest)
- private:
-  class _Internal;
-
-  friend class ::google::protobuf::internal::TcParser;
-  static const ::google::protobuf::internal::TcParseTable<
-      0, 1, 1,
-      0, 2>
-      _table_;
-  friend class ::google::protobuf::MessageLite;
-  friend class ::google::protobuf::Arena;
-  template <typename T>
-  friend class ::google::protobuf::Arena::InternalHelper;
-  using InternalArenaConstructable_ = void;
-  using DestructorSkippable_ = void;
-  struct Impl_ {
-
-        inline explicit constexpr Impl_(
-            ::google::protobuf::internal::ConstantInitialized) noexcept;
-        inline explicit Impl_(::google::protobuf::internal::InternalVisibility visibility,
-                              ::google::protobuf::Arena* arena);
-        inline explicit Impl_(::google::protobuf::internal::InternalVisibility visibility,
-                              ::google::protobuf::Arena* arena, const Impl_& from);
-    ::google::protobuf::internal::HasBits<1> _has_bits_;
-    mutable ::google::protobuf::internal::CachedSize _cached_size_;
-    ::io::deephaven::proto::backplane::grpc::TypedTicket* source_id_;
-    PROTOBUF_TSAN_DECLARE_MEMBER
-  };
-  union { Impl_ _impl_; };
-  friend struct ::TableStruct_deephaven_2fproto_2fobject_2eproto;
-};// -------------------------------------------------------------------
-
-class ClientData final :
-    public ::google::protobuf::Message /* @@protoc_insertion_point(class_definition:io.deephaven.proto.backplane.grpc.ClientData) */ {
- public:
-  inline ClientData() : ClientData(nullptr) {}
-  ~ClientData() override;
-  template<typename = void>
-  explicit PROTOBUF_CONSTEXPR ClientData(::google::protobuf::internal::ConstantInitialized);
-
-  inline ClientData(const ClientData& from)
-      : ClientData(nullptr, from) {}
-  ClientData(ClientData&& from) noexcept
-    : ClientData() {
-    *this = ::std::move(from);
-  }
-
-  inline ClientData& operator=(const ClientData& from) {
-    CopyFrom(from);
-    return *this;
-  }
-  inline ClientData& operator=(ClientData&& from) noexcept {
-    if (this == &from) return *this;
-    if (GetArena() == from.GetArena()
-  #ifdef PROTOBUF_FORCE_COPY_IN_MOVE
-        && GetArena() != nullptr
-  #endif  // !PROTOBUF_FORCE_COPY_IN_MOVE
-    ) {
-      InternalSwap(&from);
-    } else {
-      CopyFrom(from);
-    }
-    return *this;
-  }
-
-  inline const ::google::protobuf::UnknownFieldSet& unknown_fields() const
-      ABSL_ATTRIBUTE_LIFETIME_BOUND {
-    return _internal_metadata_.unknown_fields<::google::protobuf::UnknownFieldSet>(::google::protobuf::UnknownFieldSet::default_instance);
-  }
-  inline ::google::protobuf::UnknownFieldSet* mutable_unknown_fields()
-      ABSL_ATTRIBUTE_LIFETIME_BOUND {
-    return _internal_metadata_.mutable_unknown_fields<::google::protobuf::UnknownFieldSet>();
-  }
-
-  static const ::google::protobuf::Descriptor* descriptor() {
-    return GetDescriptor();
-  }
-  static const ::google::protobuf::Descriptor* GetDescriptor() {
-    return default_instance().GetMetadata().descriptor;
-  }
-  static const ::google::protobuf::Reflection* GetReflection() {
-    return default_instance().GetMetadata().reflection;
-  }
-  static const ClientData& default_instance() {
-    return *internal_default_instance();
-  }
-  static inline const ClientData* internal_default_instance() {
-    return reinterpret_cast<const ClientData*>(
-               &_ClientData_default_instance_);
-  }
-  static constexpr int kIndexInFileMessages =
-    3;
-
-  friend void swap(ClientData& a, ClientData& b) {
-    a.Swap(&b);
-  }
-  inline void Swap(ClientData* other) {
-    if (other == this) return;
-  #ifdef PROTOBUF_FORCE_COPY_IN_SWAP
-    if (GetArena() != nullptr &&
-        GetArena() == other->GetArena()) {
-   #else  // PROTOBUF_FORCE_COPY_IN_SWAP
-    if (GetArena() == other->GetArena()) {
-  #endif  // !PROTOBUF_FORCE_COPY_IN_SWAP
-      InternalSwap(other);
-    } else {
-      ::google::protobuf::internal::GenericSwap(this, other);
-    }
-  }
-  void UnsafeArenaSwap(ClientData* other) {
-    if (other == this) return;
-    ABSL_DCHECK(GetArena() == other->GetArena());
-    InternalSwap(other);
-  }
-
-  // implements Message ----------------------------------------------
-
-  ClientData* New(::google::protobuf::Arena* arena = nullptr) const final {
-    return CreateMaybeMessage<ClientData>(arena);
-  }
-  using ::google::protobuf::Message::CopyFrom;
-  void CopyFrom(const ClientData& from);
-  using ::google::protobuf::Message::MergeFrom;
-  void MergeFrom( const ClientData& from) {
-    ClientData::MergeImpl(*this, from);
-  }
-  private:
-  static void MergeImpl(::google::protobuf::Message& to_msg, const ::google::protobuf::Message& from_msg);
-  public:
-  PROTOBUF_ATTRIBUTE_REINITIALIZES void Clear() final;
-  bool IsInitialized() const final;
-
-  ::size_t ByteSizeLong() const final;
-  const char* _InternalParse(const char* ptr, ::google::protobuf::internal::ParseContext* ctx) final;
-  ::uint8_t* _InternalSerialize(
-      ::uint8_t* target, ::google::protobuf::io::EpsCopyOutputStream* stream) const final;
-  int GetCachedSize() const { return _impl_._cached_size_.Get(); }
-
-  private:
-  ::google::protobuf::internal::CachedSize* AccessCachedSize() const final;
-  void SharedCtor(::google::protobuf::Arena* arena);
-  void SharedDtor();
-  void InternalSwap(ClientData* other);
-
-  private:
-  friend class ::google::protobuf::internal::AnyMetadata;
-  static ::absl::string_view FullMessageName() {
-    return "io.deephaven.proto.backplane.grpc.ClientData";
-  }
-  protected:
-  explicit ClientData(::google::protobuf::Arena* arena);
-  ClientData(::google::protobuf::Arena* arena, const ClientData& from);
-  public:
-
-  static const ClassData _class_data_;
-  const ::google::protobuf::Message::ClassData*GetClassData() const final;
-
-  ::google::protobuf::Metadata GetMetadata() const final;
-
-  // nested types ----------------------------------------------------
-
-  // accessors -------------------------------------------------------
-
-  enum : int {
-    kReferencesFieldNumber = 2,
-    kPayloadFieldNumber = 1,
-  };
-  // repeated .io.deephaven.proto.backplane.grpc.TypedTicket references = 2;
-  int references_size() const;
-  private:
-  int _internal_references_size() const;
-
-  public:
-  void clear_references() ;
-  ::io::deephaven::proto::backplane::grpc::TypedTicket* mutable_references(int index);
-  ::google::protobuf::RepeatedPtrField< ::io::deephaven::proto::backplane::grpc::TypedTicket >*
-      mutable_references();
-  private:
-  const ::google::protobuf::RepeatedPtrField<::io::deephaven::proto::backplane::grpc::TypedTicket>& _internal_references() const;
-  ::google::protobuf::RepeatedPtrField<::io::deephaven::proto::backplane::grpc::TypedTicket>* _internal_mutable_references();
-  public:
-  const ::io::deephaven::proto::backplane::grpc::TypedTicket& references(int index) const;
-  ::io::deephaven::proto::backplane::grpc::TypedTicket* add_references();
-  const ::google::protobuf::RepeatedPtrField< ::io::deephaven::proto::backplane::grpc::TypedTicket >&
-      references() const;
-  // bytes payload = 1;
-  void clear_payload() ;
-  const std::string& payload() const;
-  template <typename Arg_ = const std::string&, typename... Args_>
-  void set_payload(Arg_&& arg, Args_... args);
-  std::string* mutable_payload();
-  PROTOBUF_NODISCARD std::string* release_payload();
-  void set_allocated_payload(std::string* value);
-
-  private:
-  const std::string& _internal_payload() const;
-  inline PROTOBUF_ALWAYS_INLINE void _internal_set_payload(
-      const std::string& value);
-  std::string* _internal_mutable_payload();
-
-  public:
-  // @@protoc_insertion_point(class_scope:io.deephaven.proto.backplane.grpc.ClientData)
- private:
-  class _Internal;
-
-  friend class ::google::protobuf::internal::TcParser;
-  static const ::google::protobuf::internal::TcParseTable<
-      1, 2, 1,
-      0, 2>
-      _table_;
-  friend class ::google::protobuf::MessageLite;
-  friend class ::google::protobuf::Arena;
-  template <typename T>
-  friend class ::google::protobuf::Arena::InternalHelper;
-  using InternalArenaConstructable_ = void;
-  using DestructorSkippable_ = void;
-  struct Impl_ {
-
-        inline explicit constexpr Impl_(
-            ::google::protobuf::internal::ConstantInitialized) noexcept;
-        inline explicit Impl_(::google::protobuf::internal::InternalVisibility visibility,
-                              ::google::protobuf::Arena* arena);
-        inline explicit Impl_(::google::protobuf::internal::InternalVisibility visibility,
-                              ::google::protobuf::Arena* arena, const Impl_& from);
-    ::google::protobuf::RepeatedPtrField< ::io::deephaven::proto::backplane::grpc::TypedTicket > references_;
-    ::google::protobuf::internal::ArenaStringPtr payload_;
-    mutable ::google::protobuf::internal::CachedSize _cached_size_;
-    PROTOBUF_TSAN_DECLARE_MEMBER
-  };
-  union { Impl_ _impl_; };
-  friend struct ::TableStruct_deephaven_2fproto_2fobject_2eproto;
-};// -------------------------------------------------------------------
-
-class StreamResponse final :
-    public ::google::protobuf::Message /* @@protoc_insertion_point(class_definition:io.deephaven.proto.backplane.grpc.StreamResponse) */ {
- public:
-  inline StreamResponse() : StreamResponse(nullptr) {}
-  ~StreamResponse() override;
-  template<typename = void>
-  explicit PROTOBUF_CONSTEXPR StreamResponse(::google::protobuf::internal::ConstantInitialized);
-
-  inline StreamResponse(const StreamResponse& from)
-      : StreamResponse(nullptr, from) {}
-  StreamResponse(StreamResponse&& from) noexcept
-    : StreamResponse() {
-    *this = ::std::move(from);
-  }
-
-  inline StreamResponse& operator=(const StreamResponse& from) {
-    CopyFrom(from);
-    return *this;
-  }
-  inline StreamResponse& operator=(StreamResponse&& from) noexcept {
-    if (this == &from) return *this;
-    if (GetArena() == from.GetArena()
-  #ifdef PROTOBUF_FORCE_COPY_IN_MOVE
-        && GetArena() != nullptr
-  #endif  // !PROTOBUF_FORCE_COPY_IN_MOVE
-    ) {
-      InternalSwap(&from);
-    } else {
-      CopyFrom(from);
-    }
-    return *this;
-  }
-
-  inline const ::google::protobuf::UnknownFieldSet& unknown_fields() const
-      ABSL_ATTRIBUTE_LIFETIME_BOUND {
-    return _internal_metadata_.unknown_fields<::google::protobuf::UnknownFieldSet>(::google::protobuf::UnknownFieldSet::default_instance);
-  }
-  inline ::google::protobuf::UnknownFieldSet* mutable_unknown_fields()
-      ABSL_ATTRIBUTE_LIFETIME_BOUND {
-    return _internal_metadata_.mutable_unknown_fields<::google::protobuf::UnknownFieldSet>();
-  }
-
-  static const ::google::protobuf::Descriptor* descriptor() {
-    return GetDescriptor();
-  }
-  static const ::google::protobuf::Descriptor* GetDescriptor() {
-    return default_instance().GetMetadata().descriptor;
-  }
-  static const ::google::protobuf::Reflection* GetReflection() {
-    return default_instance().GetMetadata().reflection;
-  }
-  static const StreamResponse& default_instance() {
-    return *internal_default_instance();
-  }
-  enum MessageCase {
-    kData = 1,
-    MESSAGE_NOT_SET = 0,
-  };
-
-  static inline const StreamResponse* internal_default_instance() {
-    return reinterpret_cast<const StreamResponse*>(
-               &_StreamResponse_default_instance_);
-  }
-  static constexpr int kIndexInFileMessages =
-    6;
-
-  friend void swap(StreamResponse& a, StreamResponse& b) {
-    a.Swap(&b);
-  }
-  inline void Swap(StreamResponse* other) {
-    if (other == this) return;
-  #ifdef PROTOBUF_FORCE_COPY_IN_SWAP
-    if (GetArena() != nullptr &&
-        GetArena() == other->GetArena()) {
-   #else  // PROTOBUF_FORCE_COPY_IN_SWAP
-    if (GetArena() == other->GetArena()) {
-  #endif  // !PROTOBUF_FORCE_COPY_IN_SWAP
-      InternalSwap(other);
-    } else {
-      ::google::protobuf::internal::GenericSwap(this, other);
-    }
-  }
-  void UnsafeArenaSwap(StreamResponse* other) {
-    if (other == this) return;
-    ABSL_DCHECK(GetArena() == other->GetArena());
-    InternalSwap(other);
-  }
-
-  // implements Message ----------------------------------------------
-
-  StreamResponse* New(::google::protobuf::Arena* arena = nullptr) const final {
-    return CreateMaybeMessage<StreamResponse>(arena);
-  }
-  using ::google::protobuf::Message::CopyFrom;
-  void CopyFrom(const StreamResponse& from);
-  using ::google::protobuf::Message::MergeFrom;
-  void MergeFrom( const StreamResponse& from) {
-    StreamResponse::MergeImpl(*this, from);
-  }
-  private:
-  static void MergeImpl(::google::protobuf::Message& to_msg, const ::google::protobuf::Message& from_msg);
-  public:
-  PROTOBUF_ATTRIBUTE_REINITIALIZES void Clear() final;
-  bool IsInitialized() const final;
-
-  ::size_t ByteSizeLong() const final;
-  const char* _InternalParse(const char* ptr, ::google::protobuf::internal::ParseContext* ctx) final;
-  ::uint8_t* _InternalSerialize(
-      ::uint8_t* target, ::google::protobuf::io::EpsCopyOutputStream* stream) const final;
-  int GetCachedSize() const { return _impl_._cached_size_.Get(); }
-
-  private:
-  ::google::protobuf::internal::CachedSize* AccessCachedSize() const final;
-  void SharedCtor(::google::protobuf::Arena* arena);
-  void SharedDtor();
-  void InternalSwap(StreamResponse* other);
-
-  private:
-  friend class ::google::protobuf::internal::AnyMetadata;
-  static ::absl::string_view FullMessageName() {
-    return "io.deephaven.proto.backplane.grpc.StreamResponse";
-  }
-  protected:
-  explicit StreamResponse(::google::protobuf::Arena* arena);
-  StreamResponse(::google::protobuf::Arena* arena, const StreamResponse& from);
-  public:
-
-  static const ClassData _class_data_;
-  const ::google::protobuf::Message::ClassData*GetClassData() const final;
-
-  ::google::protobuf::Metadata GetMetadata() const final;
-
-  // nested types ----------------------------------------------------
-
-  // accessors -------------------------------------------------------
-
-  enum : int {
-    kDataFieldNumber = 1,
-  };
-  // .io.deephaven.proto.backplane.grpc.ServerData data = 1;
-  bool has_data() const;
-  private:
-  bool _internal_has_data() const;
-
-  public:
-  void clear_data() ;
-  const ::io::deephaven::proto::backplane::grpc::ServerData& data() const;
-  PROTOBUF_NODISCARD ::io::deephaven::proto::backplane::grpc::ServerData* release_data();
-  ::io::deephaven::proto::backplane::grpc::ServerData* mutable_data();
-  void set_allocated_data(::io::deephaven::proto::backplane::grpc::ServerData* value);
-  void unsafe_arena_set_allocated_data(::io::deephaven::proto::backplane::grpc::ServerData* value);
-  ::io::deephaven::proto::backplane::grpc::ServerData* unsafe_arena_release_data();
-
-  private:
-  const ::io::deephaven::proto::backplane::grpc::ServerData& _internal_data() const;
-  ::io::deephaven::proto::backplane::grpc::ServerData* _internal_mutable_data();
-
-  public:
-  void clear_message();
-  MessageCase message_case() const;
-  // @@protoc_insertion_point(class_scope:io.deephaven.proto.backplane.grpc.StreamResponse)
- private:
-  class _Internal;
-  void set_has_data();
-
-  inline bool has_message() const;
-  inline void clear_has_message();
-
-  friend class ::google::protobuf::internal::TcParser;
-  static const ::google::protobuf::internal::TcParseTable<
-      0, 1, 1,
-      0, 2>
-      _table_;
-  friend class ::google::protobuf::MessageLite;
-  friend class ::google::protobuf::Arena;
-  template <typename T>
-  friend class ::google::protobuf::Arena::InternalHelper;
-  using InternalArenaConstructable_ = void;
-  using DestructorSkippable_ = void;
-  struct Impl_ {
-
-        inline explicit constexpr Impl_(
-            ::google::protobuf::internal::ConstantInitialized) noexcept;
-        inline explicit Impl_(::google::protobuf::internal::InternalVisibility visibility,
-                              ::google::protobuf::Arena* arena);
-        inline explicit Impl_(::google::protobuf::internal::InternalVisibility visibility,
-                              ::google::protobuf::Arena* arena, const Impl_& from);
-    union MessageUnion {
-      constexpr MessageUnion() : _constinit_{} {}
-        ::google::protobuf::internal::ConstantInitialized _constinit_;
-      ::io::deephaven::proto::backplane::grpc::ServerData* data_;
-    } message_;
-    mutable ::google::protobuf::internal::CachedSize _cached_size_;
-    ::uint32_t _oneof_case_[1];
-
-    PROTOBUF_TSAN_DECLARE_MEMBER
-  };
-  union { Impl_ _impl_; };
-  friend struct ::TableStruct_deephaven_2fproto_2fobject_2eproto;
-};// -------------------------------------------------------------------
-
-class StreamRequest final :
-    public ::google::protobuf::Message /* @@protoc_insertion_point(class_definition:io.deephaven.proto.backplane.grpc.StreamRequest) */ {
- public:
-  inline StreamRequest() : StreamRequest(nullptr) {}
-  ~StreamRequest() override;
-  template<typename = void>
-  explicit PROTOBUF_CONSTEXPR StreamRequest(::google::protobuf::internal::ConstantInitialized);
-
-  inline StreamRequest(const StreamRequest& from)
-      : StreamRequest(nullptr, from) {}
-  StreamRequest(StreamRequest&& from) noexcept
-    : StreamRequest() {
-    *this = ::std::move(from);
-  }
-
-  inline StreamRequest& operator=(const StreamRequest& from) {
-    CopyFrom(from);
-    return *this;
-  }
-  inline StreamRequest& operator=(StreamRequest&& from) noexcept {
-    if (this == &from) return *this;
-    if (GetArena() == from.GetArena()
-  #ifdef PROTOBUF_FORCE_COPY_IN_MOVE
-        && GetArena() != nullptr
-  #endif  // !PROTOBUF_FORCE_COPY_IN_MOVE
-    ) {
-      InternalSwap(&from);
-    } else {
-      CopyFrom(from);
-    }
-    return *this;
-  }
-
-  inline const ::google::protobuf::UnknownFieldSet& unknown_fields() const
-      ABSL_ATTRIBUTE_LIFETIME_BOUND {
-    return _internal_metadata_.unknown_fields<::google::protobuf::UnknownFieldSet>(::google::protobuf::UnknownFieldSet::default_instance);
-  }
-  inline ::google::protobuf::UnknownFieldSet* mutable_unknown_fields()
-      ABSL_ATTRIBUTE_LIFETIME_BOUND {
-    return _internal_metadata_.mutable_unknown_fields<::google::protobuf::UnknownFieldSet>();
-  }
-
-  static const ::google::protobuf::Descriptor* descriptor() {
-    return GetDescriptor();
-  }
-  static const ::google::protobuf::Descriptor* GetDescriptor() {
-    return default_instance().GetMetadata().descriptor;
-  }
-  static const ::google::protobuf::Reflection* GetReflection() {
-    return default_instance().GetMetadata().reflection;
-  }
-  static const StreamRequest& default_instance() {
-    return *internal_default_instance();
-  }
-  enum MessageCase {
-    kConnect = 1,
-    kData = 2,
-    MESSAGE_NOT_SET = 0,
-  };
-
-  static inline const StreamRequest* internal_default_instance() {
-    return reinterpret_cast<const StreamRequest*>(
-               &_StreamRequest_default_instance_);
-  }
-  static constexpr int kIndexInFileMessages =
-    5;
-
-  friend void swap(StreamRequest& a, StreamRequest& b) {
-    a.Swap(&b);
-  }
-  inline void Swap(StreamRequest* other) {
-    if (other == this) return;
-  #ifdef PROTOBUF_FORCE_COPY_IN_SWAP
-    if (GetArena() != nullptr &&
-        GetArena() == other->GetArena()) {
-   #else  // PROTOBUF_FORCE_COPY_IN_SWAP
-    if (GetArena() == other->GetArena()) {
-  #endif  // !PROTOBUF_FORCE_COPY_IN_SWAP
-      InternalSwap(other);
-    } else {
-      ::google::protobuf::internal::GenericSwap(this, other);
-    }
-  }
-  void UnsafeArenaSwap(StreamRequest* other) {
-    if (other == this) return;
-    ABSL_DCHECK(GetArena() == other->GetArena());
-    InternalSwap(other);
-  }
-
-  // implements Message ----------------------------------------------
-
-  StreamRequest* New(::google::protobuf::Arena* arena = nullptr) const final {
-    return CreateMaybeMessage<StreamRequest>(arena);
-  }
-  using ::google::protobuf::Message::CopyFrom;
-  void CopyFrom(const StreamRequest& from);
-  using ::google::protobuf::Message::MergeFrom;
-  void MergeFrom( const StreamRequest& from) {
-    StreamRequest::MergeImpl(*this, from);
-  }
-  private:
-  static void MergeImpl(::google::protobuf::Message& to_msg, const ::google::protobuf::Message& from_msg);
-  public:
-  PROTOBUF_ATTRIBUTE_REINITIALIZES void Clear() final;
-  bool IsInitialized() const final;
-
-  ::size_t ByteSizeLong() const final;
-  const char* _InternalParse(const char* ptr, ::google::protobuf::internal::ParseContext* ctx) final;
-  ::uint8_t* _InternalSerialize(
-      ::uint8_t* target, ::google::protobuf::io::EpsCopyOutputStream* stream) const final;
-  int GetCachedSize() const { return _impl_._cached_size_.Get(); }
-
-  private:
-  ::google::protobuf::internal::CachedSize* AccessCachedSize() const final;
-  void SharedCtor(::google::protobuf::Arena* arena);
-  void SharedDtor();
-  void InternalSwap(StreamRequest* other);
-
-  private:
-  friend class ::google::protobuf::internal::AnyMetadata;
-  static ::absl::string_view FullMessageName() {
-    return "io.deephaven.proto.backplane.grpc.StreamRequest";
-  }
-  protected:
-  explicit StreamRequest(::google::protobuf::Arena* arena);
-  StreamRequest(::google::protobuf::Arena* arena, const StreamRequest& from);
-  public:
-
-  static const ClassData _class_data_;
-  const ::google::protobuf::Message::ClassData*GetClassData() const final;
-
-  ::google::protobuf::Metadata GetMetadata() const final;
-
-  // nested types ----------------------------------------------------
-
-  // accessors -------------------------------------------------------
-
-  enum : int {
-    kConnectFieldNumber = 1,
-    kDataFieldNumber = 2,
-  };
-  // .io.deephaven.proto.backplane.grpc.ConnectRequest connect = 1;
-  bool has_connect() const;
-  private:
-  bool _internal_has_connect() const;
-
-  public:
-  void clear_connect() ;
-  const ::io::deephaven::proto::backplane::grpc::ConnectRequest& connect() const;
-  PROTOBUF_NODISCARD ::io::deephaven::proto::backplane::grpc::ConnectRequest* release_connect();
-  ::io::deephaven::proto::backplane::grpc::ConnectRequest* mutable_connect();
-  void set_allocated_connect(::io::deephaven::proto::backplane::grpc::ConnectRequest* value);
-  void unsafe_arena_set_allocated_connect(::io::deephaven::proto::backplane::grpc::ConnectRequest* value);
-  ::io::deephaven::proto::backplane::grpc::ConnectRequest* unsafe_arena_release_connect();
-
-  private:
-  const ::io::deephaven::proto::backplane::grpc::ConnectRequest& _internal_connect() const;
-  ::io::deephaven::proto::backplane::grpc::ConnectRequest* _internal_mutable_connect();
-
-  public:
-  // .io.deephaven.proto.backplane.grpc.ClientData data = 2;
-  bool has_data() const;
-  private:
-  bool _internal_has_data() const;
-
-  public:
-  void clear_data() ;
-  const ::io::deephaven::proto::backplane::grpc::ClientData& data() const;
-  PROTOBUF_NODISCARD ::io::deephaven::proto::backplane::grpc::ClientData* release_data();
-  ::io::deephaven::proto::backplane::grpc::ClientData* mutable_data();
-  void set_allocated_data(::io::deephaven::proto::backplane::grpc::ClientData* value);
-  void unsafe_arena_set_allocated_data(::io::deephaven::proto::backplane::grpc::ClientData* value);
-  ::io::deephaven::proto::backplane::grpc::ClientData* unsafe_arena_release_data();
-
-  private:
-  const ::io::deephaven::proto::backplane::grpc::ClientData& _internal_data() const;
-  ::io::deephaven::proto::backplane::grpc::ClientData* _internal_mutable_data();
-
-  public:
-  void clear_message();
-  MessageCase message_case() const;
-  // @@protoc_insertion_point(class_scope:io.deephaven.proto.backplane.grpc.StreamRequest)
- private:
-  class _Internal;
-  void set_has_connect();
-  void set_has_data();
-
-  inline bool has_message() const;
-  inline void clear_has_message();
-
-  friend class ::google::protobuf::internal::TcParser;
-  static const ::google::protobuf::internal::TcParseTable<
-      0, 2, 2,
-      0, 2>
-      _table_;
-  friend class ::google::protobuf::MessageLite;
-  friend class ::google::protobuf::Arena;
-  template <typename T>
-  friend class ::google::protobuf::Arena::InternalHelper;
-  using InternalArenaConstructable_ = void;
-  using DestructorSkippable_ = void;
-  struct Impl_ {
-
-        inline explicit constexpr Impl_(
-            ::google::protobuf::internal::ConstantInitialized) noexcept;
-        inline explicit Impl_(::google::protobuf::internal::InternalVisibility visibility,
-                              ::google::protobuf::Arena* arena);
-        inline explicit Impl_(::google::protobuf::internal::InternalVisibility visibility,
-                              ::google::protobuf::Arena* arena, const Impl_& from);
-    union MessageUnion {
-      constexpr MessageUnion() : _constinit_{} {}
-        ::google::protobuf::internal::ConstantInitialized _constinit_;
-      ::io::deephaven::proto::backplane::grpc::ConnectRequest* connect_;
-      ::io::deephaven::proto::backplane::grpc::ClientData* data_;
-    } message_;
-    mutable ::google::protobuf::internal::CachedSize _cached_size_;
-    ::uint32_t _oneof_case_[1];
-
-    PROTOBUF_TSAN_DECLARE_MEMBER
-  };
-  union { Impl_ _impl_; };
-  friend struct ::TableStruct_deephaven_2fproto_2fobject_2eproto;
-};
-
-// ===================================================================
-
-
-
-
-// ===================================================================
-
-
-#ifdef __GNUC__
-#pragma GCC diagnostic push
-#pragma GCC diagnostic ignored "-Wstrict-aliasing"
-#endif  // __GNUC__
-// -------------------------------------------------------------------
-
-// FetchObjectRequest
-
-// .io.deephaven.proto.backplane.grpc.TypedTicket source_id = 1;
-inline bool FetchObjectRequest::has_source_id() const {
-  bool value = (_impl_._has_bits_[0] & 0x00000001u) != 0;
-  PROTOBUF_ASSUME(!value || _impl_.source_id_ != nullptr);
-  return value;
-}
-inline const ::io::deephaven::proto::backplane::grpc::TypedTicket& FetchObjectRequest::_internal_source_id() const {
-  PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race);
-  const ::io::deephaven::proto::backplane::grpc::TypedTicket* p = _impl_.source_id_;
-  return p != nullptr ? *p : reinterpret_cast<const ::io::deephaven::proto::backplane::grpc::TypedTicket&>(::io::deephaven::proto::backplane::grpc::_TypedTicket_default_instance_);
-}
-inline const ::io::deephaven::proto::backplane::grpc::TypedTicket& FetchObjectRequest::source_id() const ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  // @@protoc_insertion_point(field_get:io.deephaven.proto.backplane.grpc.FetchObjectRequest.source_id)
-  return _internal_source_id();
-}
-inline void FetchObjectRequest::unsafe_arena_set_allocated_source_id(::io::deephaven::proto::backplane::grpc::TypedTicket* value) {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  if (GetArena() == nullptr) {
-    delete reinterpret_cast<::google::protobuf::MessageLite*>(_impl_.source_id_);
-  }
-  _impl_.source_id_ = reinterpret_cast<::io::deephaven::proto::backplane::grpc::TypedTicket*>(value);
-  if (value != nullptr) {
-    _impl_._has_bits_[0] |= 0x00000001u;
-  } else {
-    _impl_._has_bits_[0] &= ~0x00000001u;
-  }
-  // @@protoc_insertion_point(field_unsafe_arena_set_allocated:io.deephaven.proto.backplane.grpc.FetchObjectRequest.source_id)
-}
-inline ::io::deephaven::proto::backplane::grpc::TypedTicket* FetchObjectRequest::release_source_id() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-
-  _impl_._has_bits_[0] &= ~0x00000001u;
-  ::io::deephaven::proto::backplane::grpc::TypedTicket* released = _impl_.source_id_;
-  _impl_.source_id_ = nullptr;
-#ifdef PROTOBUF_FORCE_COPY_IN_RELEASE
-  auto* old = reinterpret_cast<::google::protobuf::MessageLite*>(released);
-  released = ::google::protobuf::internal::DuplicateIfNonNull(released);
-  if (GetArena() == nullptr) {
-    delete old;
-  }
-#else   // PROTOBUF_FORCE_COPY_IN_RELEASE
-  if (GetArena() != nullptr) {
-    released = ::google::protobuf::internal::DuplicateIfNonNull(released);
-  }
-#endif  // !PROTOBUF_FORCE_COPY_IN_RELEASE
-  return released;
-}
-inline ::io::deephaven::proto::backplane::grpc::TypedTicket* FetchObjectRequest::unsafe_arena_release_source_id() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  // @@protoc_insertion_point(field_release:io.deephaven.proto.backplane.grpc.FetchObjectRequest.source_id)
-
-  _impl_._has_bits_[0] &= ~0x00000001u;
-  ::io::deephaven::proto::backplane::grpc::TypedTicket* temp = _impl_.source_id_;
-  _impl_.source_id_ = nullptr;
-  return temp;
-}
-inline ::io::deephaven::proto::backplane::grpc::TypedTicket* FetchObjectRequest::_internal_mutable_source_id() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  _impl_._has_bits_[0] |= 0x00000001u;
-  if (_impl_.source_id_ == nullptr) {
-    auto* p = CreateMaybeMessage<::io::deephaven::proto::backplane::grpc::TypedTicket>(GetArena());
-    _impl_.source_id_ = reinterpret_cast<::io::deephaven::proto::backplane::grpc::TypedTicket*>(p);
-  }
-  return _impl_.source_id_;
-}
-inline ::io::deephaven::proto::backplane::grpc::TypedTicket* FetchObjectRequest::mutable_source_id() ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  ::io::deephaven::proto::backplane::grpc::TypedTicket* _msg = _internal_mutable_source_id();
-  // @@protoc_insertion_point(field_mutable:io.deephaven.proto.backplane.grpc.FetchObjectRequest.source_id)
-  return _msg;
-}
-inline void FetchObjectRequest::set_allocated_source_id(::io::deephaven::proto::backplane::grpc::TypedTicket* value) {
-  ::google::protobuf::Arena* message_arena = GetArena();
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  if (message_arena == nullptr) {
-    delete reinterpret_cast<::google::protobuf::MessageLite*>(_impl_.source_id_);
-  }
-
-  if (value != nullptr) {
-    ::google::protobuf::Arena* submessage_arena = reinterpret_cast<::google::protobuf::MessageLite*>(value)->GetArena();
-    if (message_arena != submessage_arena) {
-      value = ::google::protobuf::internal::GetOwnedMessage(message_arena, value, submessage_arena);
-    }
-    _impl_._has_bits_[0] |= 0x00000001u;
-  } else {
-    _impl_._has_bits_[0] &= ~0x00000001u;
-  }
-
-  _impl_.source_id_ = reinterpret_cast<::io::deephaven::proto::backplane::grpc::TypedTicket*>(value);
-  // @@protoc_insertion_point(field_set_allocated:io.deephaven.proto.backplane.grpc.FetchObjectRequest.source_id)
-}
-
-// -------------------------------------------------------------------
-
-// FetchObjectResponse
-
-// string type = 1;
-inline void FetchObjectResponse::clear_type() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  _impl_.type_.ClearToEmpty();
-}
-inline const std::string& FetchObjectResponse::type() const
-    ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  // @@protoc_insertion_point(field_get:io.deephaven.proto.backplane.grpc.FetchObjectResponse.type)
-  return _internal_type();
-}
-template <typename Arg_, typename... Args_>
-inline PROTOBUF_ALWAYS_INLINE void FetchObjectResponse::set_type(Arg_&& arg,
-                                                     Args_... args) {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  ;
-  _impl_.type_.Set(static_cast<Arg_&&>(arg), args..., GetArena());
-  // @@protoc_insertion_point(field_set:io.deephaven.proto.backplane.grpc.FetchObjectResponse.type)
-}
-inline std::string* FetchObjectResponse::mutable_type() ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  std::string* _s = _internal_mutable_type();
-  // @@protoc_insertion_point(field_mutable:io.deephaven.proto.backplane.grpc.FetchObjectResponse.type)
-  return _s;
-}
-inline const std::string& FetchObjectResponse::_internal_type() const {
-  PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race);
-  return _impl_.type_.Get();
-}
-inline void FetchObjectResponse::_internal_set_type(const std::string& value) {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  ;
-  _impl_.type_.Set(value, GetArena());
-}
-inline std::string* FetchObjectResponse::_internal_mutable_type() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  ;
-  return _impl_.type_.Mutable( GetArena());
-}
-inline std::string* FetchObjectResponse::release_type() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  // @@protoc_insertion_point(field_release:io.deephaven.proto.backplane.grpc.FetchObjectResponse.type)
-  return _impl_.type_.Release();
-}
-inline void FetchObjectResponse::set_allocated_type(std::string* value) {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  _impl_.type_.SetAllocated(value, GetArena());
-  #ifdef PROTOBUF_FORCE_COPY_DEFAULT_STRING
-        if (_impl_.type_.IsDefault()) {
-          _impl_.type_.Set("", GetArena());
-        }
-  #endif  // PROTOBUF_FORCE_COPY_DEFAULT_STRING
-  // @@protoc_insertion_point(field_set_allocated:io.deephaven.proto.backplane.grpc.FetchObjectResponse.type)
-}
-
-// bytes data = 2;
-inline void FetchObjectResponse::clear_data() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  _impl_.data_.ClearToEmpty();
-}
-inline const std::string& FetchObjectResponse::data() const
-    ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  // @@protoc_insertion_point(field_get:io.deephaven.proto.backplane.grpc.FetchObjectResponse.data)
-  return _internal_data();
-}
-template <typename Arg_, typename... Args_>
-inline PROTOBUF_ALWAYS_INLINE void FetchObjectResponse::set_data(Arg_&& arg,
-                                                     Args_... args) {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  ;
-  _impl_.data_.SetBytes(static_cast<Arg_&&>(arg), args..., GetArena());
-  // @@protoc_insertion_point(field_set:io.deephaven.proto.backplane.grpc.FetchObjectResponse.data)
-}
-inline std::string* FetchObjectResponse::mutable_data() ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  std::string* _s = _internal_mutable_data();
-  // @@protoc_insertion_point(field_mutable:io.deephaven.proto.backplane.grpc.FetchObjectResponse.data)
-  return _s;
-}
-inline const std::string& FetchObjectResponse::_internal_data() const {
-  PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race);
-  return _impl_.data_.Get();
-}
-inline void FetchObjectResponse::_internal_set_data(const std::string& value) {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  ;
-  _impl_.data_.Set(value, GetArena());
-}
-inline std::string* FetchObjectResponse::_internal_mutable_data() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  ;
-  return _impl_.data_.Mutable( GetArena());
-}
-inline std::string* FetchObjectResponse::release_data() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  // @@protoc_insertion_point(field_release:io.deephaven.proto.backplane.grpc.FetchObjectResponse.data)
-  return _impl_.data_.Release();
-}
-inline void FetchObjectResponse::set_allocated_data(std::string* value) {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  _impl_.data_.SetAllocated(value, GetArena());
-  #ifdef PROTOBUF_FORCE_COPY_DEFAULT_STRING
-        if (_impl_.data_.IsDefault()) {
-          _impl_.data_.Set("", GetArena());
-        }
-  #endif  // PROTOBUF_FORCE_COPY_DEFAULT_STRING
-  // @@protoc_insertion_point(field_set_allocated:io.deephaven.proto.backplane.grpc.FetchObjectResponse.data)
-}
-
-// repeated .io.deephaven.proto.backplane.grpc.TypedTicket typed_export_ids = 3;
-inline int FetchObjectResponse::_internal_typed_export_ids_size() const {
-  return _internal_typed_export_ids().size();
-}
-inline int FetchObjectResponse::typed_export_ids_size() const {
-  return _internal_typed_export_ids_size();
-}
-inline ::io::deephaven::proto::backplane::grpc::TypedTicket* FetchObjectResponse::mutable_typed_export_ids(int index)
-    ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  // @@protoc_insertion_point(field_mutable:io.deephaven.proto.backplane.grpc.FetchObjectResponse.typed_export_ids)
-  return _internal_mutable_typed_export_ids()->Mutable(index);
-}
-inline ::google::protobuf::RepeatedPtrField<::io::deephaven::proto::backplane::grpc::TypedTicket>* FetchObjectResponse::mutable_typed_export_ids()
-    ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  // @@protoc_insertion_point(field_mutable_list:io.deephaven.proto.backplane.grpc.FetchObjectResponse.typed_export_ids)
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  return _internal_mutable_typed_export_ids();
-}
-inline const ::io::deephaven::proto::backplane::grpc::TypedTicket& FetchObjectResponse::typed_export_ids(int index) const
-    ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  // @@protoc_insertion_point(field_get:io.deephaven.proto.backplane.grpc.FetchObjectResponse.typed_export_ids)
-  return _internal_typed_export_ids().Get(index);
-}
-inline ::io::deephaven::proto::backplane::grpc::TypedTicket* FetchObjectResponse::add_typed_export_ids() ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  ::io::deephaven::proto::backplane::grpc::TypedTicket* _add = _internal_mutable_typed_export_ids()->Add();
-  // @@protoc_insertion_point(field_add:io.deephaven.proto.backplane.grpc.FetchObjectResponse.typed_export_ids)
-  return _add;
-}
-inline const ::google::protobuf::RepeatedPtrField<::io::deephaven::proto::backplane::grpc::TypedTicket>& FetchObjectResponse::typed_export_ids() const
-    ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  // @@protoc_insertion_point(field_list:io.deephaven.proto.backplane.grpc.FetchObjectResponse.typed_export_ids)
-  return _internal_typed_export_ids();
-}
-inline const ::google::protobuf::RepeatedPtrField<::io::deephaven::proto::backplane::grpc::TypedTicket>&
-FetchObjectResponse::_internal_typed_export_ids() const {
-  PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race);
-  return _impl_.typed_export_ids_;
-}
-inline ::google::protobuf::RepeatedPtrField<::io::deephaven::proto::backplane::grpc::TypedTicket>*
-FetchObjectResponse::_internal_mutable_typed_export_ids() {
-  PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race);
-  return &_impl_.typed_export_ids_;
-}
-
-// -------------------------------------------------------------------
-
-// ConnectRequest
-
-// .io.deephaven.proto.backplane.grpc.TypedTicket source_id = 1;
-inline bool ConnectRequest::has_source_id() const {
-  bool value = (_impl_._has_bits_[0] & 0x00000001u) != 0;
-  PROTOBUF_ASSUME(!value || _impl_.source_id_ != nullptr);
-  return value;
-}
-inline const ::io::deephaven::proto::backplane::grpc::TypedTicket& ConnectRequest::_internal_source_id() const {
-  PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race);
-  const ::io::deephaven::proto::backplane::grpc::TypedTicket* p = _impl_.source_id_;
-  return p != nullptr ? *p : reinterpret_cast<const ::io::deephaven::proto::backplane::grpc::TypedTicket&>(::io::deephaven::proto::backplane::grpc::_TypedTicket_default_instance_);
-}
-inline const ::io::deephaven::proto::backplane::grpc::TypedTicket& ConnectRequest::source_id() const ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  // @@protoc_insertion_point(field_get:io.deephaven.proto.backplane.grpc.ConnectRequest.source_id)
-  return _internal_source_id();
-}
-inline void ConnectRequest::unsafe_arena_set_allocated_source_id(::io::deephaven::proto::backplane::grpc::TypedTicket* value) {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  if (GetArena() == nullptr) {
-    delete reinterpret_cast<::google::protobuf::MessageLite*>(_impl_.source_id_);
-  }
-  _impl_.source_id_ = reinterpret_cast<::io::deephaven::proto::backplane::grpc::TypedTicket*>(value);
-  if (value != nullptr) {
-    _impl_._has_bits_[0] |= 0x00000001u;
-  } else {
-    _impl_._has_bits_[0] &= ~0x00000001u;
-  }
-  // @@protoc_insertion_point(field_unsafe_arena_set_allocated:io.deephaven.proto.backplane.grpc.ConnectRequest.source_id)
-}
-inline ::io::deephaven::proto::backplane::grpc::TypedTicket* ConnectRequest::release_source_id() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-
-  _impl_._has_bits_[0] &= ~0x00000001u;
-  ::io::deephaven::proto::backplane::grpc::TypedTicket* released = _impl_.source_id_;
-  _impl_.source_id_ = nullptr;
-#ifdef PROTOBUF_FORCE_COPY_IN_RELEASE
-  auto* old = reinterpret_cast<::google::protobuf::MessageLite*>(released);
-  released = ::google::protobuf::internal::DuplicateIfNonNull(released);
-  if (GetArena() == nullptr) {
-    delete old;
-  }
-#else   // PROTOBUF_FORCE_COPY_IN_RELEASE
-  if (GetArena() != nullptr) {
-    released = ::google::protobuf::internal::DuplicateIfNonNull(released);
-  }
-#endif  // !PROTOBUF_FORCE_COPY_IN_RELEASE
-  return released;
-}
-inline ::io::deephaven::proto::backplane::grpc::TypedTicket* ConnectRequest::unsafe_arena_release_source_id() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  // @@protoc_insertion_point(field_release:io.deephaven.proto.backplane.grpc.ConnectRequest.source_id)
-
-  _impl_._has_bits_[0] &= ~0x00000001u;
-  ::io::deephaven::proto::backplane::grpc::TypedTicket* temp = _impl_.source_id_;
-  _impl_.source_id_ = nullptr;
-  return temp;
-}
-inline ::io::deephaven::proto::backplane::grpc::TypedTicket* ConnectRequest::_internal_mutable_source_id() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  _impl_._has_bits_[0] |= 0x00000001u;
-  if (_impl_.source_id_ == nullptr) {
-    auto* p = CreateMaybeMessage<::io::deephaven::proto::backplane::grpc::TypedTicket>(GetArena());
-    _impl_.source_id_ = reinterpret_cast<::io::deephaven::proto::backplane::grpc::TypedTicket*>(p);
-  }
-  return _impl_.source_id_;
-}
-inline ::io::deephaven::proto::backplane::grpc::TypedTicket* ConnectRequest::mutable_source_id() ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  ::io::deephaven::proto::backplane::grpc::TypedTicket* _msg = _internal_mutable_source_id();
-  // @@protoc_insertion_point(field_mutable:io.deephaven.proto.backplane.grpc.ConnectRequest.source_id)
-  return _msg;
-}
-inline void ConnectRequest::set_allocated_source_id(::io::deephaven::proto::backplane::grpc::TypedTicket* value) {
-  ::google::protobuf::Arena* message_arena = GetArena();
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  if (message_arena == nullptr) {
-    delete reinterpret_cast<::google::protobuf::MessageLite*>(_impl_.source_id_);
-  }
-
-  if (value != nullptr) {
-    ::google::protobuf::Arena* submessage_arena = reinterpret_cast<::google::protobuf::MessageLite*>(value)->GetArena();
-    if (message_arena != submessage_arena) {
-      value = ::google::protobuf::internal::GetOwnedMessage(message_arena, value, submessage_arena);
-    }
-    _impl_._has_bits_[0] |= 0x00000001u;
-  } else {
-    _impl_._has_bits_[0] &= ~0x00000001u;
-  }
-
-  _impl_.source_id_ = reinterpret_cast<::io::deephaven::proto::backplane::grpc::TypedTicket*>(value);
-  // @@protoc_insertion_point(field_set_allocated:io.deephaven.proto.backplane.grpc.ConnectRequest.source_id)
-}
-
-// -------------------------------------------------------------------
-
-// ClientData
-
-// bytes payload = 1;
-inline void ClientData::clear_payload() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  _impl_.payload_.ClearToEmpty();
-}
-inline const std::string& ClientData::payload() const
-    ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  // @@protoc_insertion_point(field_get:io.deephaven.proto.backplane.grpc.ClientData.payload)
-  return _internal_payload();
-}
-template <typename Arg_, typename... Args_>
-inline PROTOBUF_ALWAYS_INLINE void ClientData::set_payload(Arg_&& arg,
-                                                     Args_... args) {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  ;
-  _impl_.payload_.SetBytes(static_cast<Arg_&&>(arg), args..., GetArena());
-  // @@protoc_insertion_point(field_set:io.deephaven.proto.backplane.grpc.ClientData.payload)
-}
-inline std::string* ClientData::mutable_payload() ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  std::string* _s = _internal_mutable_payload();
-  // @@protoc_insertion_point(field_mutable:io.deephaven.proto.backplane.grpc.ClientData.payload)
-  return _s;
-}
-inline const std::string& ClientData::_internal_payload() const {
-  PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race);
-  return _impl_.payload_.Get();
-}
-inline void ClientData::_internal_set_payload(const std::string& value) {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  ;
-  _impl_.payload_.Set(value, GetArena());
-}
-inline std::string* ClientData::_internal_mutable_payload() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  ;
-  return _impl_.payload_.Mutable( GetArena());
-}
-inline std::string* ClientData::release_payload() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  // @@protoc_insertion_point(field_release:io.deephaven.proto.backplane.grpc.ClientData.payload)
-  return _impl_.payload_.Release();
-}
-inline void ClientData::set_allocated_payload(std::string* value) {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  _impl_.payload_.SetAllocated(value, GetArena());
-  #ifdef PROTOBUF_FORCE_COPY_DEFAULT_STRING
-        if (_impl_.payload_.IsDefault()) {
-          _impl_.payload_.Set("", GetArena());
-        }
-  #endif  // PROTOBUF_FORCE_COPY_DEFAULT_STRING
-  // @@protoc_insertion_point(field_set_allocated:io.deephaven.proto.backplane.grpc.ClientData.payload)
-}
-
-// repeated .io.deephaven.proto.backplane.grpc.TypedTicket references = 2;
-inline int ClientData::_internal_references_size() const {
-  return _internal_references().size();
-}
-inline int ClientData::references_size() const {
-  return _internal_references_size();
-}
-inline ::io::deephaven::proto::backplane::grpc::TypedTicket* ClientData::mutable_references(int index)
-    ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  // @@protoc_insertion_point(field_mutable:io.deephaven.proto.backplane.grpc.ClientData.references)
-  return _internal_mutable_references()->Mutable(index);
-}
-inline ::google::protobuf::RepeatedPtrField<::io::deephaven::proto::backplane::grpc::TypedTicket>* ClientData::mutable_references()
-    ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  // @@protoc_insertion_point(field_mutable_list:io.deephaven.proto.backplane.grpc.ClientData.references)
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  return _internal_mutable_references();
-}
-inline const ::io::deephaven::proto::backplane::grpc::TypedTicket& ClientData::references(int index) const
-    ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  // @@protoc_insertion_point(field_get:io.deephaven.proto.backplane.grpc.ClientData.references)
-  return _internal_references().Get(index);
-}
-inline ::io::deephaven::proto::backplane::grpc::TypedTicket* ClientData::add_references() ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  ::io::deephaven::proto::backplane::grpc::TypedTicket* _add = _internal_mutable_references()->Add();
-  // @@protoc_insertion_point(field_add:io.deephaven.proto.backplane.grpc.ClientData.references)
-  return _add;
-}
-inline const ::google::protobuf::RepeatedPtrField<::io::deephaven::proto::backplane::grpc::TypedTicket>& ClientData::references() const
-    ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  // @@protoc_insertion_point(field_list:io.deephaven.proto.backplane.grpc.ClientData.references)
-  return _internal_references();
-}
-inline const ::google::protobuf::RepeatedPtrField<::io::deephaven::proto::backplane::grpc::TypedTicket>&
-ClientData::_internal_references() const {
-  PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race);
-  return _impl_.references_;
-}
-inline ::google::protobuf::RepeatedPtrField<::io::deephaven::proto::backplane::grpc::TypedTicket>*
-ClientData::_internal_mutable_references() {
-  PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race);
-  return &_impl_.references_;
-}
-
-// -------------------------------------------------------------------
-
-// ServerData
-
-// bytes payload = 1;
-inline void ServerData::clear_payload() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  _impl_.payload_.ClearToEmpty();
-}
-inline const std::string& ServerData::payload() const
-    ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  // @@protoc_insertion_point(field_get:io.deephaven.proto.backplane.grpc.ServerData.payload)
-  return _internal_payload();
-}
-template <typename Arg_, typename... Args_>
-inline PROTOBUF_ALWAYS_INLINE void ServerData::set_payload(Arg_&& arg,
-                                                     Args_... args) {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  ;
-  _impl_.payload_.SetBytes(static_cast<Arg_&&>(arg), args..., GetArena());
-  // @@protoc_insertion_point(field_set:io.deephaven.proto.backplane.grpc.ServerData.payload)
-}
-inline std::string* ServerData::mutable_payload() ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  std::string* _s = _internal_mutable_payload();
-  // @@protoc_insertion_point(field_mutable:io.deephaven.proto.backplane.grpc.ServerData.payload)
-  return _s;
-}
-inline const std::string& ServerData::_internal_payload() const {
-  PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race);
-  return _impl_.payload_.Get();
-}
-inline void ServerData::_internal_set_payload(const std::string& value) {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  ;
-  _impl_.payload_.Set(value, GetArena());
-}
-inline std::string* ServerData::_internal_mutable_payload() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  ;
-  return _impl_.payload_.Mutable( GetArena());
-}
-inline std::string* ServerData::release_payload() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  // @@protoc_insertion_point(field_release:io.deephaven.proto.backplane.grpc.ServerData.payload)
-  return _impl_.payload_.Release();
-}
-inline void ServerData::set_allocated_payload(std::string* value) {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  _impl_.payload_.SetAllocated(value, GetArena());
-  #ifdef PROTOBUF_FORCE_COPY_DEFAULT_STRING
-        if (_impl_.payload_.IsDefault()) {
-          _impl_.payload_.Set("", GetArena());
-        }
-  #endif  // PROTOBUF_FORCE_COPY_DEFAULT_STRING
-  // @@protoc_insertion_point(field_set_allocated:io.deephaven.proto.backplane.grpc.ServerData.payload)
-}
-
-// repeated .io.deephaven.proto.backplane.grpc.TypedTicket exported_references = 2;
-inline int ServerData::_internal_exported_references_size() const {
-  return _internal_exported_references().size();
-}
-inline int ServerData::exported_references_size() const {
-  return _internal_exported_references_size();
-}
-inline ::io::deephaven::proto::backplane::grpc::TypedTicket* ServerData::mutable_exported_references(int index)
-    ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  // @@protoc_insertion_point(field_mutable:io.deephaven.proto.backplane.grpc.ServerData.exported_references)
-  return _internal_mutable_exported_references()->Mutable(index);
-}
-inline ::google::protobuf::RepeatedPtrField<::io::deephaven::proto::backplane::grpc::TypedTicket>* ServerData::mutable_exported_references()
-    ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  // @@protoc_insertion_point(field_mutable_list:io.deephaven.proto.backplane.grpc.ServerData.exported_references)
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  return _internal_mutable_exported_references();
-}
-inline const ::io::deephaven::proto::backplane::grpc::TypedTicket& ServerData::exported_references(int index) const
-    ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  // @@protoc_insertion_point(field_get:io.deephaven.proto.backplane.grpc.ServerData.exported_references)
-  return _internal_exported_references().Get(index);
-}
-inline ::io::deephaven::proto::backplane::grpc::TypedTicket* ServerData::add_exported_references() ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  ::io::deephaven::proto::backplane::grpc::TypedTicket* _add = _internal_mutable_exported_references()->Add();
-  // @@protoc_insertion_point(field_add:io.deephaven.proto.backplane.grpc.ServerData.exported_references)
-  return _add;
-}
-inline const ::google::protobuf::RepeatedPtrField<::io::deephaven::proto::backplane::grpc::TypedTicket>& ServerData::exported_references() const
-    ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  // @@protoc_insertion_point(field_list:io.deephaven.proto.backplane.grpc.ServerData.exported_references)
-  return _internal_exported_references();
-}
-inline const ::google::protobuf::RepeatedPtrField<::io::deephaven::proto::backplane::grpc::TypedTicket>&
-ServerData::_internal_exported_references() const {
-  PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race);
-  return _impl_.exported_references_;
-}
-inline ::google::protobuf::RepeatedPtrField<::io::deephaven::proto::backplane::grpc::TypedTicket>*
-ServerData::_internal_mutable_exported_references() {
-  PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race);
-  return &_impl_.exported_references_;
-}
-
-// -------------------------------------------------------------------
-
-// StreamRequest
-
-// .io.deephaven.proto.backplane.grpc.ConnectRequest connect = 1;
-inline bool StreamRequest::has_connect() const {
-  return message_case() == kConnect;
-}
-inline bool StreamRequest::_internal_has_connect() const {
-  return message_case() == kConnect;
-}
-inline void StreamRequest::set_has_connect() {
-  _impl_._oneof_case_[0] = kConnect;
-}
-inline void StreamRequest::clear_connect() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  if (message_case() == kConnect) {
-    if (GetArena() == nullptr) {
-      delete _impl_.message_.connect_;
-    }
-    clear_has_message();
-  }
-}
-inline ::io::deephaven::proto::backplane::grpc::ConnectRequest* StreamRequest::release_connect() {
-  // @@protoc_insertion_point(field_release:io.deephaven.proto.backplane.grpc.StreamRequest.connect)
-  if (message_case() == kConnect) {
-    clear_has_message();
-    auto* temp = _impl_.message_.connect_;
-    if (GetArena() != nullptr) {
-      temp = ::google::protobuf::internal::DuplicateIfNonNull(temp);
-    }
-    _impl_.message_.connect_ = nullptr;
-    return temp;
-  } else {
-    return nullptr;
-  }
-}
-inline const ::io::deephaven::proto::backplane::grpc::ConnectRequest& StreamRequest::_internal_connect() const {
-  return message_case() == kConnect ? *_impl_.message_.connect_ : reinterpret_cast<::io::deephaven::proto::backplane::grpc::ConnectRequest&>(::io::deephaven::proto::backplane::grpc::_ConnectRequest_default_instance_);
-}
-inline const ::io::deephaven::proto::backplane::grpc::ConnectRequest& StreamRequest::connect() const ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  // @@protoc_insertion_point(field_get:io.deephaven.proto.backplane.grpc.StreamRequest.connect)
-  return _internal_connect();
-}
-inline ::io::deephaven::proto::backplane::grpc::ConnectRequest* StreamRequest::unsafe_arena_release_connect() {
-  // @@protoc_insertion_point(field_unsafe_arena_release:io.deephaven.proto.backplane.grpc.StreamRequest.connect)
-  if (message_case() == kConnect) {
-    clear_has_message();
-    auto* temp = _impl_.message_.connect_;
-    _impl_.message_.connect_ = nullptr;
-    return temp;
-  } else {
-    return nullptr;
-  }
-}
-inline void StreamRequest::unsafe_arena_set_allocated_connect(::io::deephaven::proto::backplane::grpc::ConnectRequest* value) {
-  // We rely on the oneof clear method to free the earlier contents
-  // of this oneof. We can directly use the pointer we're given to
-  // set the new value.
-  clear_message();
-  if (value) {
-    set_has_connect();
-    _impl_.message_.connect_ = value;
-  }
-  // @@protoc_insertion_point(field_unsafe_arena_set_allocated:io.deephaven.proto.backplane.grpc.StreamRequest.connect)
-}
-inline ::io::deephaven::proto::backplane::grpc::ConnectRequest* StreamRequest::_internal_mutable_connect() {
-  if (message_case() != kConnect) {
-    clear_message();
-    set_has_connect();
-    _impl_.message_.connect_ = CreateMaybeMessage<::io::deephaven::proto::backplane::grpc::ConnectRequest>(GetArena());
-  }
-  return _impl_.message_.connect_;
-}
-inline ::io::deephaven::proto::backplane::grpc::ConnectRequest* StreamRequest::mutable_connect() ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  ::io::deephaven::proto::backplane::grpc::ConnectRequest* _msg = _internal_mutable_connect();
-  // @@protoc_insertion_point(field_mutable:io.deephaven.proto.backplane.grpc.StreamRequest.connect)
-  return _msg;
-}
-
-// .io.deephaven.proto.backplane.grpc.ClientData data = 2;
-inline bool StreamRequest::has_data() const {
-  return message_case() == kData;
-}
-inline bool StreamRequest::_internal_has_data() const {
-  return message_case() == kData;
-}
-inline void StreamRequest::set_has_data() {
-  _impl_._oneof_case_[0] = kData;
-}
-inline void StreamRequest::clear_data() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  if (message_case() == kData) {
-    if (GetArena() == nullptr) {
-      delete _impl_.message_.data_;
-    }
-    clear_has_message();
-  }
-}
-inline ::io::deephaven::proto::backplane::grpc::ClientData* StreamRequest::release_data() {
-  // @@protoc_insertion_point(field_release:io.deephaven.proto.backplane.grpc.StreamRequest.data)
-  if (message_case() == kData) {
-    clear_has_message();
-    auto* temp = _impl_.message_.data_;
-    if (GetArena() != nullptr) {
-      temp = ::google::protobuf::internal::DuplicateIfNonNull(temp);
-    }
-    _impl_.message_.data_ = nullptr;
-    return temp;
-  } else {
-    return nullptr;
-  }
-}
-inline const ::io::deephaven::proto::backplane::grpc::ClientData& StreamRequest::_internal_data() const {
-  return message_case() == kData ? *_impl_.message_.data_ : reinterpret_cast<::io::deephaven::proto::backplane::grpc::ClientData&>(::io::deephaven::proto::backplane::grpc::_ClientData_default_instance_);
-}
-inline const ::io::deephaven::proto::backplane::grpc::ClientData& StreamRequest::data() const ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  // @@protoc_insertion_point(field_get:io.deephaven.proto.backplane.grpc.StreamRequest.data)
-  return _internal_data();
-}
-inline ::io::deephaven::proto::backplane::grpc::ClientData* StreamRequest::unsafe_arena_release_data() {
-  // @@protoc_insertion_point(field_unsafe_arena_release:io.deephaven.proto.backplane.grpc.StreamRequest.data)
-  if (message_case() == kData) {
-    clear_has_message();
-    auto* temp = _impl_.message_.data_;
-    _impl_.message_.data_ = nullptr;
-    return temp;
-  } else {
-    return nullptr;
-  }
-}
-inline void StreamRequest::unsafe_arena_set_allocated_data(::io::deephaven::proto::backplane::grpc::ClientData* value) {
-  // We rely on the oneof clear method to free the earlier contents
-  // of this oneof. We can directly use the pointer we're given to
-  // set the new value.
-  clear_message();
-  if (value) {
-    set_has_data();
-    _impl_.message_.data_ = value;
-  }
-  // @@protoc_insertion_point(field_unsafe_arena_set_allocated:io.deephaven.proto.backplane.grpc.StreamRequest.data)
-}
-inline ::io::deephaven::proto::backplane::grpc::ClientData* StreamRequest::_internal_mutable_data() {
-  if (message_case() != kData) {
-    clear_message();
-    set_has_data();
-    _impl_.message_.data_ = CreateMaybeMessage<::io::deephaven::proto::backplane::grpc::ClientData>(GetArena());
-  }
-  return _impl_.message_.data_;
-}
-inline ::io::deephaven::proto::backplane::grpc::ClientData* StreamRequest::mutable_data() ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  ::io::deephaven::proto::backplane::grpc::ClientData* _msg = _internal_mutable_data();
-  // @@protoc_insertion_point(field_mutable:io.deephaven.proto.backplane.grpc.StreamRequest.data)
-  return _msg;
-}
-
-inline bool StreamRequest::has_message() const {
-  return message_case() != MESSAGE_NOT_SET;
-}
-inline void StreamRequest::clear_has_message() {
-  _impl_._oneof_case_[0] = MESSAGE_NOT_SET;
-}
-inline StreamRequest::MessageCase StreamRequest::message_case() const {
-  return StreamRequest::MessageCase(_impl_._oneof_case_[0]);
-}
-// -------------------------------------------------------------------
-
-// StreamResponse
-
-// .io.deephaven.proto.backplane.grpc.ServerData data = 1;
-inline bool StreamResponse::has_data() const {
-  return message_case() == kData;
-}
-inline bool StreamResponse::_internal_has_data() const {
-  return message_case() == kData;
-}
-inline void StreamResponse::set_has_data() {
-  _impl_._oneof_case_[0] = kData;
-}
-inline void StreamResponse::clear_data() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  if (message_case() == kData) {
-    if (GetArena() == nullptr) {
-      delete _impl_.message_.data_;
-    }
-    clear_has_message();
-  }
-}
-inline ::io::deephaven::proto::backplane::grpc::ServerData* StreamResponse::release_data() {
-  // @@protoc_insertion_point(field_release:io.deephaven.proto.backplane.grpc.StreamResponse.data)
-  if (message_case() == kData) {
-    clear_has_message();
-    auto* temp = _impl_.message_.data_;
-    if (GetArena() != nullptr) {
-      temp = ::google::protobuf::internal::DuplicateIfNonNull(temp);
-    }
-    _impl_.message_.data_ = nullptr;
-    return temp;
-  } else {
-    return nullptr;
-  }
-}
-inline const ::io::deephaven::proto::backplane::grpc::ServerData& StreamResponse::_internal_data() const {
-  return message_case() == kData ? *_impl_.message_.data_ : reinterpret_cast<::io::deephaven::proto::backplane::grpc::ServerData&>(::io::deephaven::proto::backplane::grpc::_ServerData_default_instance_);
-}
-inline const ::io::deephaven::proto::backplane::grpc::ServerData& StreamResponse::data() const ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  // @@protoc_insertion_point(field_get:io.deephaven.proto.backplane.grpc.StreamResponse.data)
-  return _internal_data();
-}
-inline ::io::deephaven::proto::backplane::grpc::ServerData* StreamResponse::unsafe_arena_release_data() {
-  // @@protoc_insertion_point(field_unsafe_arena_release:io.deephaven.proto.backplane.grpc.StreamResponse.data)
-  if (message_case() == kData) {
-    clear_has_message();
-    auto* temp = _impl_.message_.data_;
-    _impl_.message_.data_ = nullptr;
-    return temp;
-  } else {
-    return nullptr;
-  }
-}
-inline void StreamResponse::unsafe_arena_set_allocated_data(::io::deephaven::proto::backplane::grpc::ServerData* value) {
-  // We rely on the oneof clear method to free the earlier contents
-  // of this oneof. We can directly use the pointer we're given to
-  // set the new value.
-  clear_message();
-  if (value) {
-    set_has_data();
-    _impl_.message_.data_ = value;
-  }
-  // @@protoc_insertion_point(field_unsafe_arena_set_allocated:io.deephaven.proto.backplane.grpc.StreamResponse.data)
-}
-inline ::io::deephaven::proto::backplane::grpc::ServerData* StreamResponse::_internal_mutable_data() {
-  if (message_case() != kData) {
-    clear_message();
-    set_has_data();
-    _impl_.message_.data_ = CreateMaybeMessage<::io::deephaven::proto::backplane::grpc::ServerData>(GetArena());
-  }
-  return _impl_.message_.data_;
-}
-inline ::io::deephaven::proto::backplane::grpc::ServerData* StreamResponse::mutable_data() ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  ::io::deephaven::proto::backplane::grpc::ServerData* _msg = _internal_mutable_data();
-  // @@protoc_insertion_point(field_mutable:io.deephaven.proto.backplane.grpc.StreamResponse.data)
-  return _msg;
-}
-
-inline bool StreamResponse::has_message() const {
-  return message_case() != MESSAGE_NOT_SET;
-}
-inline void StreamResponse::clear_has_message() {
-  _impl_._oneof_case_[0] = MESSAGE_NOT_SET;
-}
-inline StreamResponse::MessageCase StreamResponse::message_case() const {
-  return StreamResponse::MessageCase(_impl_._oneof_case_[0]);
-}
-// -------------------------------------------------------------------
-
-// BrowserNextResponse
-
-#ifdef __GNUC__
-#pragma GCC diagnostic pop
-#endif  // __GNUC__
-
-// @@protoc_insertion_point(namespace_scope)
-}  // namespace grpc
-}  // namespace backplane
-}  // namespace proto
-}  // namespace deephaven
-}  // namespace io
-
-
-// @@protoc_insertion_point(global_scope)
-
-#include "google/protobuf/port_undef.inc"
-
-#endif  // GOOGLE_PROTOBUF_INCLUDED_deephaven_2fproto_2fobject_2eproto_2epb_2eh
diff --git a/cpp-client/deephaven/dhclient/proto/deephaven/proto/partitionedtable.grpc.pb.cc b/cpp-client/deephaven/dhclient/proto/deephaven/proto/partitionedtable.grpc.pb.cc
deleted file mode 100644
index 61e06242d87..00000000000
--- a/cpp-client/deephaven/dhclient/proto/deephaven/proto/partitionedtable.grpc.pb.cc
+++ /dev/null
@@ -1,178 +0,0 @@
-// Generated by the gRPC C++ plugin.
-// If you make any local change, they will be lost.
-// source: deephaven/proto/partitionedtable.proto
-
-#include "deephaven/proto/partitionedtable.pb.h"
-#include "deephaven/proto/partitionedtable.grpc.pb.h"
-
-#include <functional>
-#include <grpcpp/support/async_stream.h>
-#include <grpcpp/support/async_unary_call.h>
-#include <grpcpp/impl/channel_interface.h>
-#include <grpcpp/impl/client_unary_call.h>
-#include <grpcpp/support/client_callback.h>
-#include <grpcpp/support/message_allocator.h>
-#include <grpcpp/support/method_handler.h>
-#include <grpcpp/impl/rpc_service_method.h>
-#include <grpcpp/support/server_callback.h>
-#include <grpcpp/impl/server_callback_handlers.h>
-#include <grpcpp/server_context.h>
-#include <grpcpp/impl/service_type.h>
-#include <grpcpp/support/sync_stream.h>
-namespace io {
-namespace deephaven {
-namespace proto {
-namespace backplane {
-namespace grpc {
-
-static const char* PartitionedTableService_method_names[] = {
-  "/io.deephaven.proto.backplane.grpc.PartitionedTableService/PartitionBy",
-  "/io.deephaven.proto.backplane.grpc.PartitionedTableService/Merge",
-  "/io.deephaven.proto.backplane.grpc.PartitionedTableService/GetTable",
-};
-
-std::unique_ptr< PartitionedTableService::Stub> PartitionedTableService::NewStub(const std::shared_ptr< ::grpc::ChannelInterface>& channel, const ::grpc::StubOptions& options) {
-  (void)options;
-  std::unique_ptr< PartitionedTableService::Stub> stub(new PartitionedTableService::Stub(channel, options));
-  return stub;
-}
-
-PartitionedTableService::Stub::Stub(const std::shared_ptr< ::grpc::ChannelInterface>& channel, const ::grpc::StubOptions& options)
-  : channel_(channel), rpcmethod_PartitionBy_(PartitionedTableService_method_names[0], options.suffix_for_stats(),::grpc::internal::RpcMethod::NORMAL_RPC, channel)
-  , rpcmethod_Merge_(PartitionedTableService_method_names[1], options.suffix_for_stats(),::grpc::internal::RpcMethod::NORMAL_RPC, channel)
-  , rpcmethod_GetTable_(PartitionedTableService_method_names[2], options.suffix_for_stats(),::grpc::internal::RpcMethod::NORMAL_RPC, channel)
-  {}
-
-::grpc::Status PartitionedTableService::Stub::PartitionBy(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::PartitionByRequest& request, ::io::deephaven::proto::backplane::grpc::PartitionByResponse* response) {
-  return ::grpc::internal::BlockingUnaryCall< ::io::deephaven::proto::backplane::grpc::PartitionByRequest, ::io::deephaven::proto::backplane::grpc::PartitionByResponse, ::grpc::protobuf::MessageLite, ::grpc::protobuf::MessageLite>(channel_.get(), rpcmethod_PartitionBy_, context, request, response);
-}
-
-void PartitionedTableService::Stub::async::PartitionBy(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::PartitionByRequest* request, ::io::deephaven::proto::backplane::grpc::PartitionByResponse* response, std::function<void(::grpc::Status)> f) {
-  ::grpc::internal::CallbackUnaryCall< ::io::deephaven::proto::backplane::grpc::PartitionByRequest, ::io::deephaven::proto::backplane::grpc::PartitionByResponse, ::grpc::protobuf::MessageLite, ::grpc::protobuf::MessageLite>(stub_->channel_.get(), stub_->rpcmethod_PartitionBy_, context, request, response, std::move(f));
-}
-
-void PartitionedTableService::Stub::async::PartitionBy(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::PartitionByRequest* request, ::io::deephaven::proto::backplane::grpc::PartitionByResponse* response, ::grpc::ClientUnaryReactor* reactor) {
-  ::grpc::internal::ClientCallbackUnaryFactory::Create< ::grpc::protobuf::MessageLite, ::grpc::protobuf::MessageLite>(stub_->channel_.get(), stub_->rpcmethod_PartitionBy_, context, request, response, reactor);
-}
-
-::grpc::ClientAsyncResponseReader< ::io::deephaven::proto::backplane::grpc::PartitionByResponse>* PartitionedTableService::Stub::PrepareAsyncPartitionByRaw(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::PartitionByRequest& request, ::grpc::CompletionQueue* cq) {
-  return ::grpc::internal::ClientAsyncResponseReaderHelper::Create< ::io::deephaven::proto::backplane::grpc::PartitionByResponse, ::io::deephaven::proto::backplane::grpc::PartitionByRequest, ::grpc::protobuf::MessageLite, ::grpc::protobuf::MessageLite>(channel_.get(), cq, rpcmethod_PartitionBy_, context, request);
-}
-
-::grpc::ClientAsyncResponseReader< ::io::deephaven::proto::backplane::grpc::PartitionByResponse>* PartitionedTableService::Stub::AsyncPartitionByRaw(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::PartitionByRequest& request, ::grpc::CompletionQueue* cq) {
-  auto* result =
-    this->PrepareAsyncPartitionByRaw(context, request, cq);
-  result->StartCall();
-  return result;
-}
-
-::grpc::Status PartitionedTableService::Stub::Merge(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::MergeRequest& request, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse* response) {
-  return ::grpc::internal::BlockingUnaryCall< ::io::deephaven::proto::backplane::grpc::MergeRequest, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse, ::grpc::protobuf::MessageLite, ::grpc::protobuf::MessageLite>(channel_.get(), rpcmethod_Merge_, context, request, response);
-}
-
-void PartitionedTableService::Stub::async::Merge(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::MergeRequest* request, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse* response, std::function<void(::grpc::Status)> f) {
-  ::grpc::internal::CallbackUnaryCall< ::io::deephaven::proto::backplane::grpc::MergeRequest, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse, ::grpc::protobuf::MessageLite, ::grpc::protobuf::MessageLite>(stub_->channel_.get(), stub_->rpcmethod_Merge_, context, request, response, std::move(f));
-}
-
-void PartitionedTableService::Stub::async::Merge(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::MergeRequest* request, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse* response, ::grpc::ClientUnaryReactor* reactor) {
-  ::grpc::internal::ClientCallbackUnaryFactory::Create< ::grpc::protobuf::MessageLite, ::grpc::protobuf::MessageLite>(stub_->channel_.get(), stub_->rpcmethod_Merge_, context, request, response, reactor);
-}
-
-::grpc::ClientAsyncResponseReader< ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse>* PartitionedTableService::Stub::PrepareAsyncMergeRaw(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::MergeRequest& request, ::grpc::CompletionQueue* cq) {
-  return ::grpc::internal::ClientAsyncResponseReaderHelper::Create< ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse, ::io::deephaven::proto::backplane::grpc::MergeRequest, ::grpc::protobuf::MessageLite, ::grpc::protobuf::MessageLite>(channel_.get(), cq, rpcmethod_Merge_, context, request);
-}
-
-::grpc::ClientAsyncResponseReader< ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse>* PartitionedTableService::Stub::AsyncMergeRaw(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::MergeRequest& request, ::grpc::CompletionQueue* cq) {
-  auto* result =
-    this->PrepareAsyncMergeRaw(context, request, cq);
-  result->StartCall();
-  return result;
-}
-
-::grpc::Status PartitionedTableService::Stub::GetTable(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::GetTableRequest& request, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse* response) {
-  return ::grpc::internal::BlockingUnaryCall< ::io::deephaven::proto::backplane::grpc::GetTableRequest, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse, ::grpc::protobuf::MessageLite, ::grpc::protobuf::MessageLite>(channel_.get(), rpcmethod_GetTable_, context, request, response);
-}
-
-void PartitionedTableService::Stub::async::GetTable(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::GetTableRequest* request, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse* response, std::function<void(::grpc::Status)> f) {
-  ::grpc::internal::CallbackUnaryCall< ::io::deephaven::proto::backplane::grpc::GetTableRequest, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse, ::grpc::protobuf::MessageLite, ::grpc::protobuf::MessageLite>(stub_->channel_.get(), stub_->rpcmethod_GetTable_, context, request, response, std::move(f));
-}
-
-void PartitionedTableService::Stub::async::GetTable(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::GetTableRequest* request, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse* response, ::grpc::ClientUnaryReactor* reactor) {
-  ::grpc::internal::ClientCallbackUnaryFactory::Create< ::grpc::protobuf::MessageLite, ::grpc::protobuf::MessageLite>(stub_->channel_.get(), stub_->rpcmethod_GetTable_, context, request, response, reactor);
-}
-
-::grpc::ClientAsyncResponseReader< ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse>* PartitionedTableService::Stub::PrepareAsyncGetTableRaw(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::GetTableRequest& request, ::grpc::CompletionQueue* cq) {
-  return ::grpc::internal::ClientAsyncResponseReaderHelper::Create< ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse, ::io::deephaven::proto::backplane::grpc::GetTableRequest, ::grpc::protobuf::MessageLite, ::grpc::protobuf::MessageLite>(channel_.get(), cq, rpcmethod_GetTable_, context, request);
-}
-
-::grpc::ClientAsyncResponseReader< ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse>* PartitionedTableService::Stub::AsyncGetTableRaw(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::GetTableRequest& request, ::grpc::CompletionQueue* cq) {
-  auto* result =
-    this->PrepareAsyncGetTableRaw(context, request, cq);
-  result->StartCall();
-  return result;
-}
-
-PartitionedTableService::Service::Service() {
-  AddMethod(new ::grpc::internal::RpcServiceMethod(
-      PartitionedTableService_method_names[0],
-      ::grpc::internal::RpcMethod::NORMAL_RPC,
-      new ::grpc::internal::RpcMethodHandler< PartitionedTableService::Service, ::io::deephaven::proto::backplane::grpc::PartitionByRequest, ::io::deephaven::proto::backplane::grpc::PartitionByResponse, ::grpc::protobuf::MessageLite, ::grpc::protobuf::MessageLite>(
-          [](PartitionedTableService::Service* service,
-             ::grpc::ServerContext* ctx,
-             const ::io::deephaven::proto::backplane::grpc::PartitionByRequest* req,
-             ::io::deephaven::proto::backplane::grpc::PartitionByResponse* resp) {
-               return service->PartitionBy(ctx, req, resp);
-             }, this)));
-  AddMethod(new ::grpc::internal::RpcServiceMethod(
-      PartitionedTableService_method_names[1],
-      ::grpc::internal::RpcMethod::NORMAL_RPC,
-      new ::grpc::internal::RpcMethodHandler< PartitionedTableService::Service, ::io::deephaven::proto::backplane::grpc::MergeRequest, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse, ::grpc::protobuf::MessageLite, ::grpc::protobuf::MessageLite>(
-          [](PartitionedTableService::Service* service,
-             ::grpc::ServerContext* ctx,
-             const ::io::deephaven::proto::backplane::grpc::MergeRequest* req,
-             ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse* resp) {
-               return service->Merge(ctx, req, resp);
-             }, this)));
-  AddMethod(new ::grpc::internal::RpcServiceMethod(
-      PartitionedTableService_method_names[2],
-      ::grpc::internal::RpcMethod::NORMAL_RPC,
-      new ::grpc::internal::RpcMethodHandler< PartitionedTableService::Service, ::io::deephaven::proto::backplane::grpc::GetTableRequest, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse, ::grpc::protobuf::MessageLite, ::grpc::protobuf::MessageLite>(
-          [](PartitionedTableService::Service* service,
-             ::grpc::ServerContext* ctx,
-             const ::io::deephaven::proto::backplane::grpc::GetTableRequest* req,
-             ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse* resp) {
-               return service->GetTable(ctx, req, resp);
-             }, this)));
-}
-
-PartitionedTableService::Service::~Service() {
-}
-
-::grpc::Status PartitionedTableService::Service::PartitionBy(::grpc::ServerContext* context, const ::io::deephaven::proto::backplane::grpc::PartitionByRequest* request, ::io::deephaven::proto::backplane::grpc::PartitionByResponse* response) {
-  (void) context;
-  (void) request;
-  (void) response;
-  return ::grpc::Status(::grpc::StatusCode::UNIMPLEMENTED, "");
-}
-
-::grpc::Status PartitionedTableService::Service::Merge(::grpc::ServerContext* context, const ::io::deephaven::proto::backplane::grpc::MergeRequest* request, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse* response) {
-  (void) context;
-  (void) request;
-  (void) response;
-  return ::grpc::Status(::grpc::StatusCode::UNIMPLEMENTED, "");
-}
-
-::grpc::Status PartitionedTableService::Service::GetTable(::grpc::ServerContext* context, const ::io::deephaven::proto::backplane::grpc::GetTableRequest* request, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse* response) {
-  (void) context;
-  (void) request;
-  (void) response;
-  return ::grpc::Status(::grpc::StatusCode::UNIMPLEMENTED, "");
-}
-
-
-}  // namespace io
-}  // namespace deephaven
-}  // namespace proto
-}  // namespace backplane
-}  // namespace grpc
-
diff --git a/cpp-client/deephaven/dhclient/proto/deephaven/proto/partitionedtable.grpc.pb.h b/cpp-client/deephaven/dhclient/proto/deephaven/proto/partitionedtable.grpc.pb.h
deleted file mode 100644
index 493424c465c..00000000000
--- a/cpp-client/deephaven/dhclient/proto/deephaven/proto/partitionedtable.grpc.pb.h
+++ /dev/null
@@ -1,622 +0,0 @@
-// Generated by the gRPC C++ plugin.
-// If you make any local change, they will be lost.
-// source: deephaven/proto/partitionedtable.proto
-// Original file comments:
-//
-// Copyright (c) 2016-2021 Deephaven Data Labs and Patent Pending
-//
-#ifndef GRPC_deephaven_2fproto_2fpartitionedtable_2eproto__INCLUDED
-#define GRPC_deephaven_2fproto_2fpartitionedtable_2eproto__INCLUDED
-
-#include "deephaven/proto/partitionedtable.pb.h"
-
-#include <functional>
-#include <grpcpp/generic/async_generic_service.h>
-#include <grpcpp/support/async_stream.h>
-#include <grpcpp/support/async_unary_call.h>
-#include <grpcpp/support/client_callback.h>
-#include <grpcpp/client_context.h>
-#include <grpcpp/completion_queue.h>
-#include <grpcpp/support/message_allocator.h>
-#include <grpcpp/support/method_handler.h>
-#include <grpcpp/impl/proto_utils.h>
-#include <grpcpp/impl/rpc_method.h>
-#include <grpcpp/support/server_callback.h>
-#include <grpcpp/impl/server_callback_handlers.h>
-#include <grpcpp/server_context.h>
-#include <grpcpp/impl/service_type.h>
-#include <grpcpp/support/status.h>
-#include <grpcpp/support/stub_options.h>
-#include <grpcpp/support/sync_stream.h>
-
-namespace io {
-namespace deephaven {
-namespace proto {
-namespace backplane {
-namespace grpc {
-
-//
-// This service provides tools to create and query partitioned tables.
-class PartitionedTableService final {
- public:
-  static constexpr char const* service_full_name() {
-    return "io.deephaven.proto.backplane.grpc.PartitionedTableService";
-  }
-  class StubInterface {
-   public:
-    virtual ~StubInterface() {}
-    //
-    // Transforms a table into a partitioned table, consisting of many separate tables, each individually
-    // addressable. The result will be a FetchObjectResponse populated with a PartitionedTable.
-    virtual ::grpc::Status PartitionBy(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::PartitionByRequest& request, ::io::deephaven::proto::backplane::grpc::PartitionByResponse* response) = 0;
-    std::unique_ptr< ::grpc::ClientAsyncResponseReaderInterface< ::io::deephaven::proto::backplane::grpc::PartitionByResponse>> AsyncPartitionBy(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::PartitionByRequest& request, ::grpc::CompletionQueue* cq) {
-      return std::unique_ptr< ::grpc::ClientAsyncResponseReaderInterface< ::io::deephaven::proto::backplane::grpc::PartitionByResponse>>(AsyncPartitionByRaw(context, request, cq));
-    }
-    std::unique_ptr< ::grpc::ClientAsyncResponseReaderInterface< ::io::deephaven::proto::backplane::grpc::PartitionByResponse>> PrepareAsyncPartitionBy(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::PartitionByRequest& request, ::grpc::CompletionQueue* cq) {
-      return std::unique_ptr< ::grpc::ClientAsyncResponseReaderInterface< ::io::deephaven::proto::backplane::grpc::PartitionByResponse>>(PrepareAsyncPartitionByRaw(context, request, cq));
-    }
-    //
-    // Given a partitioned table, returns a table with the contents of all of the constituent tables.
-    virtual ::grpc::Status Merge(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::MergeRequest& request, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse* response) = 0;
-    std::unique_ptr< ::grpc::ClientAsyncResponseReaderInterface< ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse>> AsyncMerge(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::MergeRequest& request, ::grpc::CompletionQueue* cq) {
-      return std::unique_ptr< ::grpc::ClientAsyncResponseReaderInterface< ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse>>(AsyncMergeRaw(context, request, cq));
-    }
-    std::unique_ptr< ::grpc::ClientAsyncResponseReaderInterface< ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse>> PrepareAsyncMerge(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::MergeRequest& request, ::grpc::CompletionQueue* cq) {
-      return std::unique_ptr< ::grpc::ClientAsyncResponseReaderInterface< ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse>>(PrepareAsyncMergeRaw(context, request, cq));
-    }
-    //
-    // Given a partitioned table and a row described by another table's contents, returns a table
-    // that matched that row, if any. If none is present, NOT_FOUND will be sent in response. If
-    // more than one is present, FAILED_PRECONDITION will be sent in response.
-    //
-    // If the provided key table has any number of rows other than one, INVALID_ARGUMENT will be
-    // sent in response.
-    //
-    // The simplest way to generally use this is to subscribe to the key columns of the underlying
-    // table of a given PartitionedTable, then use /FlightService/DoPut to create a table with the
-    // desired keys, and pass that ticket to this service. After that request is sent (note that it
-    // is not required to wait for it to complete), that new table ticket can be used to make this
-    // GetTable request.
-    virtual ::grpc::Status GetTable(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::GetTableRequest& request, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse* response) = 0;
-    std::unique_ptr< ::grpc::ClientAsyncResponseReaderInterface< ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse>> AsyncGetTable(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::GetTableRequest& request, ::grpc::CompletionQueue* cq) {
-      return std::unique_ptr< ::grpc::ClientAsyncResponseReaderInterface< ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse>>(AsyncGetTableRaw(context, request, cq));
-    }
-    std::unique_ptr< ::grpc::ClientAsyncResponseReaderInterface< ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse>> PrepareAsyncGetTable(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::GetTableRequest& request, ::grpc::CompletionQueue* cq) {
-      return std::unique_ptr< ::grpc::ClientAsyncResponseReaderInterface< ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse>>(PrepareAsyncGetTableRaw(context, request, cq));
-    }
-    class async_interface {
-     public:
-      virtual ~async_interface() {}
-      //
-      // Transforms a table into a partitioned table, consisting of many separate tables, each individually
-      // addressable. The result will be a FetchObjectResponse populated with a PartitionedTable.
-      virtual void PartitionBy(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::PartitionByRequest* request, ::io::deephaven::proto::backplane::grpc::PartitionByResponse* response, std::function<void(::grpc::Status)>) = 0;
-      virtual void PartitionBy(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::PartitionByRequest* request, ::io::deephaven::proto::backplane::grpc::PartitionByResponse* response, ::grpc::ClientUnaryReactor* reactor) = 0;
-      //
-      // Given a partitioned table, returns a table with the contents of all of the constituent tables.
-      virtual void Merge(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::MergeRequest* request, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse* response, std::function<void(::grpc::Status)>) = 0;
-      virtual void Merge(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::MergeRequest* request, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse* response, ::grpc::ClientUnaryReactor* reactor) = 0;
-      //
-      // Given a partitioned table and a row described by another table's contents, returns a table
-      // that matched that row, if any. If none is present, NOT_FOUND will be sent in response. If
-      // more than one is present, FAILED_PRECONDITION will be sent in response.
-      //
-      // If the provided key table has any number of rows other than one, INVALID_ARGUMENT will be
-      // sent in response.
-      //
-      // The simplest way to generally use this is to subscribe to the key columns of the underlying
-      // table of a given PartitionedTable, then use /FlightService/DoPut to create a table with the
-      // desired keys, and pass that ticket to this service. After that request is sent (note that it
-      // is not required to wait for it to complete), that new table ticket can be used to make this
-      // GetTable request.
-      virtual void GetTable(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::GetTableRequest* request, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse* response, std::function<void(::grpc::Status)>) = 0;
-      virtual void GetTable(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::GetTableRequest* request, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse* response, ::grpc::ClientUnaryReactor* reactor) = 0;
-    };
-    typedef class async_interface experimental_async_interface;
-    virtual class async_interface* async() { return nullptr; }
-    class async_interface* experimental_async() { return async(); }
-   private:
-    virtual ::grpc::ClientAsyncResponseReaderInterface< ::io::deephaven::proto::backplane::grpc::PartitionByResponse>* AsyncPartitionByRaw(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::PartitionByRequest& request, ::grpc::CompletionQueue* cq) = 0;
-    virtual ::grpc::ClientAsyncResponseReaderInterface< ::io::deephaven::proto::backplane::grpc::PartitionByResponse>* PrepareAsyncPartitionByRaw(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::PartitionByRequest& request, ::grpc::CompletionQueue* cq) = 0;
-    virtual ::grpc::ClientAsyncResponseReaderInterface< ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse>* AsyncMergeRaw(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::MergeRequest& request, ::grpc::CompletionQueue* cq) = 0;
-    virtual ::grpc::ClientAsyncResponseReaderInterface< ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse>* PrepareAsyncMergeRaw(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::MergeRequest& request, ::grpc::CompletionQueue* cq) = 0;
-    virtual ::grpc::ClientAsyncResponseReaderInterface< ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse>* AsyncGetTableRaw(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::GetTableRequest& request, ::grpc::CompletionQueue* cq) = 0;
-    virtual ::grpc::ClientAsyncResponseReaderInterface< ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse>* PrepareAsyncGetTableRaw(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::GetTableRequest& request, ::grpc::CompletionQueue* cq) = 0;
-  };
-  class Stub final : public StubInterface {
-   public:
-    Stub(const std::shared_ptr< ::grpc::ChannelInterface>& channel, const ::grpc::StubOptions& options = ::grpc::StubOptions());
-    ::grpc::Status PartitionBy(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::PartitionByRequest& request, ::io::deephaven::proto::backplane::grpc::PartitionByResponse* response) override;
-    std::unique_ptr< ::grpc::ClientAsyncResponseReader< ::io::deephaven::proto::backplane::grpc::PartitionByResponse>> AsyncPartitionBy(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::PartitionByRequest& request, ::grpc::CompletionQueue* cq) {
-      return std::unique_ptr< ::grpc::ClientAsyncResponseReader< ::io::deephaven::proto::backplane::grpc::PartitionByResponse>>(AsyncPartitionByRaw(context, request, cq));
-    }
-    std::unique_ptr< ::grpc::ClientAsyncResponseReader< ::io::deephaven::proto::backplane::grpc::PartitionByResponse>> PrepareAsyncPartitionBy(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::PartitionByRequest& request, ::grpc::CompletionQueue* cq) {
-      return std::unique_ptr< ::grpc::ClientAsyncResponseReader< ::io::deephaven::proto::backplane::grpc::PartitionByResponse>>(PrepareAsyncPartitionByRaw(context, request, cq));
-    }
-    ::grpc::Status Merge(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::MergeRequest& request, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse* response) override;
-    std::unique_ptr< ::grpc::ClientAsyncResponseReader< ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse>> AsyncMerge(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::MergeRequest& request, ::grpc::CompletionQueue* cq) {
-      return std::unique_ptr< ::grpc::ClientAsyncResponseReader< ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse>>(AsyncMergeRaw(context, request, cq));
-    }
-    std::unique_ptr< ::grpc::ClientAsyncResponseReader< ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse>> PrepareAsyncMerge(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::MergeRequest& request, ::grpc::CompletionQueue* cq) {
-      return std::unique_ptr< ::grpc::ClientAsyncResponseReader< ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse>>(PrepareAsyncMergeRaw(context, request, cq));
-    }
-    ::grpc::Status GetTable(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::GetTableRequest& request, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse* response) override;
-    std::unique_ptr< ::grpc::ClientAsyncResponseReader< ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse>> AsyncGetTable(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::GetTableRequest& request, ::grpc::CompletionQueue* cq) {
-      return std::unique_ptr< ::grpc::ClientAsyncResponseReader< ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse>>(AsyncGetTableRaw(context, request, cq));
-    }
-    std::unique_ptr< ::grpc::ClientAsyncResponseReader< ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse>> PrepareAsyncGetTable(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::GetTableRequest& request, ::grpc::CompletionQueue* cq) {
-      return std::unique_ptr< ::grpc::ClientAsyncResponseReader< ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse>>(PrepareAsyncGetTableRaw(context, request, cq));
-    }
-    class async final :
-      public StubInterface::async_interface {
-     public:
-      void PartitionBy(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::PartitionByRequest* request, ::io::deephaven::proto::backplane::grpc::PartitionByResponse* response, std::function<void(::grpc::Status)>) override;
-      void PartitionBy(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::PartitionByRequest* request, ::io::deephaven::proto::backplane::grpc::PartitionByResponse* response, ::grpc::ClientUnaryReactor* reactor) override;
-      void Merge(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::MergeRequest* request, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse* response, std::function<void(::grpc::Status)>) override;
-      void Merge(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::MergeRequest* request, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse* response, ::grpc::ClientUnaryReactor* reactor) override;
-      void GetTable(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::GetTableRequest* request, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse* response, std::function<void(::grpc::Status)>) override;
-      void GetTable(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::GetTableRequest* request, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse* response, ::grpc::ClientUnaryReactor* reactor) override;
-     private:
-      friend class Stub;
-      explicit async(Stub* stub): stub_(stub) { }
-      Stub* stub() { return stub_; }
-      Stub* stub_;
-    };
-    class async* async() override { return &async_stub_; }
-
-   private:
-    std::shared_ptr< ::grpc::ChannelInterface> channel_;
-    class async async_stub_{this};
-    ::grpc::ClientAsyncResponseReader< ::io::deephaven::proto::backplane::grpc::PartitionByResponse>* AsyncPartitionByRaw(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::PartitionByRequest& request, ::grpc::CompletionQueue* cq) override;
-    ::grpc::ClientAsyncResponseReader< ::io::deephaven::proto::backplane::grpc::PartitionByResponse>* PrepareAsyncPartitionByRaw(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::PartitionByRequest& request, ::grpc::CompletionQueue* cq) override;
-    ::grpc::ClientAsyncResponseReader< ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse>* AsyncMergeRaw(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::MergeRequest& request, ::grpc::CompletionQueue* cq) override;
-    ::grpc::ClientAsyncResponseReader< ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse>* PrepareAsyncMergeRaw(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::MergeRequest& request, ::grpc::CompletionQueue* cq) override;
-    ::grpc::ClientAsyncResponseReader< ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse>* AsyncGetTableRaw(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::GetTableRequest& request, ::grpc::CompletionQueue* cq) override;
-    ::grpc::ClientAsyncResponseReader< ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse>* PrepareAsyncGetTableRaw(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::GetTableRequest& request, ::grpc::CompletionQueue* cq) override;
-    const ::grpc::internal::RpcMethod rpcmethod_PartitionBy_;
-    const ::grpc::internal::RpcMethod rpcmethod_Merge_;
-    const ::grpc::internal::RpcMethod rpcmethod_GetTable_;
-  };
-  static std::unique_ptr<Stub> NewStub(const std::shared_ptr< ::grpc::ChannelInterface>& channel, const ::grpc::StubOptions& options = ::grpc::StubOptions());
-
-  class Service : public ::grpc::Service {
-   public:
-    Service();
-    virtual ~Service();
-    //
-    // Transforms a table into a partitioned table, consisting of many separate tables, each individually
-    // addressable. The result will be a FetchObjectResponse populated with a PartitionedTable.
-    virtual ::grpc::Status PartitionBy(::grpc::ServerContext* context, const ::io::deephaven::proto::backplane::grpc::PartitionByRequest* request, ::io::deephaven::proto::backplane::grpc::PartitionByResponse* response);
-    //
-    // Given a partitioned table, returns a table with the contents of all of the constituent tables.
-    virtual ::grpc::Status Merge(::grpc::ServerContext* context, const ::io::deephaven::proto::backplane::grpc::MergeRequest* request, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse* response);
-    //
-    // Given a partitioned table and a row described by another table's contents, returns a table
-    // that matched that row, if any. If none is present, NOT_FOUND will be sent in response. If
-    // more than one is present, FAILED_PRECONDITION will be sent in response.
-    //
-    // If the provided key table has any number of rows other than one, INVALID_ARGUMENT will be
-    // sent in response.
-    //
-    // The simplest way to generally use this is to subscribe to the key columns of the underlying
-    // table of a given PartitionedTable, then use /FlightService/DoPut to create a table with the
-    // desired keys, and pass that ticket to this service. After that request is sent (note that it
-    // is not required to wait for it to complete), that new table ticket can be used to make this
-    // GetTable request.
-    virtual ::grpc::Status GetTable(::grpc::ServerContext* context, const ::io::deephaven::proto::backplane::grpc::GetTableRequest* request, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse* response);
-  };
-  template <class BaseClass>
-  class WithAsyncMethod_PartitionBy : public BaseClass {
-   private:
-    void BaseClassMustBeDerivedFromService(const Service* /*service*/) {}
-   public:
-    WithAsyncMethod_PartitionBy() {
-      ::grpc::Service::MarkMethodAsync(0);
-    }
-    ~WithAsyncMethod_PartitionBy() override {
-      BaseClassMustBeDerivedFromService(this);
-    }
-    // disable synchronous version of this method
-    ::grpc::Status PartitionBy(::grpc::ServerContext* /*context*/, const ::io::deephaven::proto::backplane::grpc::PartitionByRequest* /*request*/, ::io::deephaven::proto::backplane::grpc::PartitionByResponse* /*response*/) override {
-      abort();
-      return ::grpc::Status(::grpc::StatusCode::UNIMPLEMENTED, "");
-    }
-    void RequestPartitionBy(::grpc::ServerContext* context, ::io::deephaven::proto::backplane::grpc::PartitionByRequest* request, ::grpc::ServerAsyncResponseWriter< ::io::deephaven::proto::backplane::grpc::PartitionByResponse>* response, ::grpc::CompletionQueue* new_call_cq, ::grpc::ServerCompletionQueue* notification_cq, void *tag) {
-      ::grpc::Service::RequestAsyncUnary(0, context, request, response, new_call_cq, notification_cq, tag);
-    }
-  };
-  template <class BaseClass>
-  class WithAsyncMethod_Merge : public BaseClass {
-   private:
-    void BaseClassMustBeDerivedFromService(const Service* /*service*/) {}
-   public:
-    WithAsyncMethod_Merge() {
-      ::grpc::Service::MarkMethodAsync(1);
-    }
-    ~WithAsyncMethod_Merge() override {
-      BaseClassMustBeDerivedFromService(this);
-    }
-    // disable synchronous version of this method
-    ::grpc::Status Merge(::grpc::ServerContext* /*context*/, const ::io::deephaven::proto::backplane::grpc::MergeRequest* /*request*/, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse* /*response*/) override {
-      abort();
-      return ::grpc::Status(::grpc::StatusCode::UNIMPLEMENTED, "");
-    }
-    void RequestMerge(::grpc::ServerContext* context, ::io::deephaven::proto::backplane::grpc::MergeRequest* request, ::grpc::ServerAsyncResponseWriter< ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse>* response, ::grpc::CompletionQueue* new_call_cq, ::grpc::ServerCompletionQueue* notification_cq, void *tag) {
-      ::grpc::Service::RequestAsyncUnary(1, context, request, response, new_call_cq, notification_cq, tag);
-    }
-  };
-  template <class BaseClass>
-  class WithAsyncMethod_GetTable : public BaseClass {
-   private:
-    void BaseClassMustBeDerivedFromService(const Service* /*service*/) {}
-   public:
-    WithAsyncMethod_GetTable() {
-      ::grpc::Service::MarkMethodAsync(2);
-    }
-    ~WithAsyncMethod_GetTable() override {
-      BaseClassMustBeDerivedFromService(this);
-    }
-    // disable synchronous version of this method
-    ::grpc::Status GetTable(::grpc::ServerContext* /*context*/, const ::io::deephaven::proto::backplane::grpc::GetTableRequest* /*request*/, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse* /*response*/) override {
-      abort();
-      return ::grpc::Status(::grpc::StatusCode::UNIMPLEMENTED, "");
-    }
-    void RequestGetTable(::grpc::ServerContext* context, ::io::deephaven::proto::backplane::grpc::GetTableRequest* request, ::grpc::ServerAsyncResponseWriter< ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse>* response, ::grpc::CompletionQueue* new_call_cq, ::grpc::ServerCompletionQueue* notification_cq, void *tag) {
-      ::grpc::Service::RequestAsyncUnary(2, context, request, response, new_call_cq, notification_cq, tag);
-    }
-  };
-  typedef WithAsyncMethod_PartitionBy<WithAsyncMethod_Merge<WithAsyncMethod_GetTable<Service > > > AsyncService;
-  template <class BaseClass>
-  class WithCallbackMethod_PartitionBy : public BaseClass {
-   private:
-    void BaseClassMustBeDerivedFromService(const Service* /*service*/) {}
-   public:
-    WithCallbackMethod_PartitionBy() {
-      ::grpc::Service::MarkMethodCallback(0,
-          new ::grpc::internal::CallbackUnaryHandler< ::io::deephaven::proto::backplane::grpc::PartitionByRequest, ::io::deephaven::proto::backplane::grpc::PartitionByResponse>(
-            [this](
-                   ::grpc::CallbackServerContext* context, const ::io::deephaven::proto::backplane::grpc::PartitionByRequest* request, ::io::deephaven::proto::backplane::grpc::PartitionByResponse* response) { return this->PartitionBy(context, request, response); }));}
-    void SetMessageAllocatorFor_PartitionBy(
-        ::grpc::MessageAllocator< ::io::deephaven::proto::backplane::grpc::PartitionByRequest, ::io::deephaven::proto::backplane::grpc::PartitionByResponse>* allocator) {
-      ::grpc::internal::MethodHandler* const handler = ::grpc::Service::GetHandler(0);
-      static_cast<::grpc::internal::CallbackUnaryHandler< ::io::deephaven::proto::backplane::grpc::PartitionByRequest, ::io::deephaven::proto::backplane::grpc::PartitionByResponse>*>(handler)
-              ->SetMessageAllocator(allocator);
-    }
-    ~WithCallbackMethod_PartitionBy() override {
-      BaseClassMustBeDerivedFromService(this);
-    }
-    // disable synchronous version of this method
-    ::grpc::Status PartitionBy(::grpc::ServerContext* /*context*/, const ::io::deephaven::proto::backplane::grpc::PartitionByRequest* /*request*/, ::io::deephaven::proto::backplane::grpc::PartitionByResponse* /*response*/) override {
-      abort();
-      return ::grpc::Status(::grpc::StatusCode::UNIMPLEMENTED, "");
-    }
-    virtual ::grpc::ServerUnaryReactor* PartitionBy(
-      ::grpc::CallbackServerContext* /*context*/, const ::io::deephaven::proto::backplane::grpc::PartitionByRequest* /*request*/, ::io::deephaven::proto::backplane::grpc::PartitionByResponse* /*response*/)  { return nullptr; }
-  };
-  template <class BaseClass>
-  class WithCallbackMethod_Merge : public BaseClass {
-   private:
-    void BaseClassMustBeDerivedFromService(const Service* /*service*/) {}
-   public:
-    WithCallbackMethod_Merge() {
-      ::grpc::Service::MarkMethodCallback(1,
-          new ::grpc::internal::CallbackUnaryHandler< ::io::deephaven::proto::backplane::grpc::MergeRequest, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse>(
-            [this](
-                   ::grpc::CallbackServerContext* context, const ::io::deephaven::proto::backplane::grpc::MergeRequest* request, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse* response) { return this->Merge(context, request, response); }));}
-    void SetMessageAllocatorFor_Merge(
-        ::grpc::MessageAllocator< ::io::deephaven::proto::backplane::grpc::MergeRequest, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse>* allocator) {
-      ::grpc::internal::MethodHandler* const handler = ::grpc::Service::GetHandler(1);
-      static_cast<::grpc::internal::CallbackUnaryHandler< ::io::deephaven::proto::backplane::grpc::MergeRequest, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse>*>(handler)
-              ->SetMessageAllocator(allocator);
-    }
-    ~WithCallbackMethod_Merge() override {
-      BaseClassMustBeDerivedFromService(this);
-    }
-    // disable synchronous version of this method
-    ::grpc::Status Merge(::grpc::ServerContext* /*context*/, const ::io::deephaven::proto::backplane::grpc::MergeRequest* /*request*/, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse* /*response*/) override {
-      abort();
-      return ::grpc::Status(::grpc::StatusCode::UNIMPLEMENTED, "");
-    }
-    virtual ::grpc::ServerUnaryReactor* Merge(
-      ::grpc::CallbackServerContext* /*context*/, const ::io::deephaven::proto::backplane::grpc::MergeRequest* /*request*/, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse* /*response*/)  { return nullptr; }
-  };
-  template <class BaseClass>
-  class WithCallbackMethod_GetTable : public BaseClass {
-   private:
-    void BaseClassMustBeDerivedFromService(const Service* /*service*/) {}
-   public:
-    WithCallbackMethod_GetTable() {
-      ::grpc::Service::MarkMethodCallback(2,
-          new ::grpc::internal::CallbackUnaryHandler< ::io::deephaven::proto::backplane::grpc::GetTableRequest, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse>(
-            [this](
-                   ::grpc::CallbackServerContext* context, const ::io::deephaven::proto::backplane::grpc::GetTableRequest* request, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse* response) { return this->GetTable(context, request, response); }));}
-    void SetMessageAllocatorFor_GetTable(
-        ::grpc::MessageAllocator< ::io::deephaven::proto::backplane::grpc::GetTableRequest, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse>* allocator) {
-      ::grpc::internal::MethodHandler* const handler = ::grpc::Service::GetHandler(2);
-      static_cast<::grpc::internal::CallbackUnaryHandler< ::io::deephaven::proto::backplane::grpc::GetTableRequest, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse>*>(handler)
-              ->SetMessageAllocator(allocator);
-    }
-    ~WithCallbackMethod_GetTable() override {
-      BaseClassMustBeDerivedFromService(this);
-    }
-    // disable synchronous version of this method
-    ::grpc::Status GetTable(::grpc::ServerContext* /*context*/, const ::io::deephaven::proto::backplane::grpc::GetTableRequest* /*request*/, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse* /*response*/) override {
-      abort();
-      return ::grpc::Status(::grpc::StatusCode::UNIMPLEMENTED, "");
-    }
-    virtual ::grpc::ServerUnaryReactor* GetTable(
-      ::grpc::CallbackServerContext* /*context*/, const ::io::deephaven::proto::backplane::grpc::GetTableRequest* /*request*/, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse* /*response*/)  { return nullptr; }
-  };
-  typedef WithCallbackMethod_PartitionBy<WithCallbackMethod_Merge<WithCallbackMethod_GetTable<Service > > > CallbackService;
-  typedef CallbackService ExperimentalCallbackService;
-  template <class BaseClass>
-  class WithGenericMethod_PartitionBy : public BaseClass {
-   private:
-    void BaseClassMustBeDerivedFromService(const Service* /*service*/) {}
-   public:
-    WithGenericMethod_PartitionBy() {
-      ::grpc::Service::MarkMethodGeneric(0);
-    }
-    ~WithGenericMethod_PartitionBy() override {
-      BaseClassMustBeDerivedFromService(this);
-    }
-    // disable synchronous version of this method
-    ::grpc::Status PartitionBy(::grpc::ServerContext* /*context*/, const ::io::deephaven::proto::backplane::grpc::PartitionByRequest* /*request*/, ::io::deephaven::proto::backplane::grpc::PartitionByResponse* /*response*/) override {
-      abort();
-      return ::grpc::Status(::grpc::StatusCode::UNIMPLEMENTED, "");
-    }
-  };
-  template <class BaseClass>
-  class WithGenericMethod_Merge : public BaseClass {
-   private:
-    void BaseClassMustBeDerivedFromService(const Service* /*service*/) {}
-   public:
-    WithGenericMethod_Merge() {
-      ::grpc::Service::MarkMethodGeneric(1);
-    }
-    ~WithGenericMethod_Merge() override {
-      BaseClassMustBeDerivedFromService(this);
-    }
-    // disable synchronous version of this method
-    ::grpc::Status Merge(::grpc::ServerContext* /*context*/, const ::io::deephaven::proto::backplane::grpc::MergeRequest* /*request*/, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse* /*response*/) override {
-      abort();
-      return ::grpc::Status(::grpc::StatusCode::UNIMPLEMENTED, "");
-    }
-  };
-  template <class BaseClass>
-  class WithGenericMethod_GetTable : public BaseClass {
-   private:
-    void BaseClassMustBeDerivedFromService(const Service* /*service*/) {}
-   public:
-    WithGenericMethod_GetTable() {
-      ::grpc::Service::MarkMethodGeneric(2);
-    }
-    ~WithGenericMethod_GetTable() override {
-      BaseClassMustBeDerivedFromService(this);
-    }
-    // disable synchronous version of this method
-    ::grpc::Status GetTable(::grpc::ServerContext* /*context*/, const ::io::deephaven::proto::backplane::grpc::GetTableRequest* /*request*/, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse* /*response*/) override {
-      abort();
-      return ::grpc::Status(::grpc::StatusCode::UNIMPLEMENTED, "");
-    }
-  };
-  template <class BaseClass>
-  class WithRawMethod_PartitionBy : public BaseClass {
-   private:
-    void BaseClassMustBeDerivedFromService(const Service* /*service*/) {}
-   public:
-    WithRawMethod_PartitionBy() {
-      ::grpc::Service::MarkMethodRaw(0);
-    }
-    ~WithRawMethod_PartitionBy() override {
-      BaseClassMustBeDerivedFromService(this);
-    }
-    // disable synchronous version of this method
-    ::grpc::Status PartitionBy(::grpc::ServerContext* /*context*/, const ::io::deephaven::proto::backplane::grpc::PartitionByRequest* /*request*/, ::io::deephaven::proto::backplane::grpc::PartitionByResponse* /*response*/) override {
-      abort();
-      return ::grpc::Status(::grpc::StatusCode::UNIMPLEMENTED, "");
-    }
-    void RequestPartitionBy(::grpc::ServerContext* context, ::grpc::ByteBuffer* request, ::grpc::ServerAsyncResponseWriter< ::grpc::ByteBuffer>* response, ::grpc::CompletionQueue* new_call_cq, ::grpc::ServerCompletionQueue* notification_cq, void *tag) {
-      ::grpc::Service::RequestAsyncUnary(0, context, request, response, new_call_cq, notification_cq, tag);
-    }
-  };
-  template <class BaseClass>
-  class WithRawMethod_Merge : public BaseClass {
-   private:
-    void BaseClassMustBeDerivedFromService(const Service* /*service*/) {}
-   public:
-    WithRawMethod_Merge() {
-      ::grpc::Service::MarkMethodRaw(1);
-    }
-    ~WithRawMethod_Merge() override {
-      BaseClassMustBeDerivedFromService(this);
-    }
-    // disable synchronous version of this method
-    ::grpc::Status Merge(::grpc::ServerContext* /*context*/, const ::io::deephaven::proto::backplane::grpc::MergeRequest* /*request*/, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse* /*response*/) override {
-      abort();
-      return ::grpc::Status(::grpc::StatusCode::UNIMPLEMENTED, "");
-    }
-    void RequestMerge(::grpc::ServerContext* context, ::grpc::ByteBuffer* request, ::grpc::ServerAsyncResponseWriter< ::grpc::ByteBuffer>* response, ::grpc::CompletionQueue* new_call_cq, ::grpc::ServerCompletionQueue* notification_cq, void *tag) {
-      ::grpc::Service::RequestAsyncUnary(1, context, request, response, new_call_cq, notification_cq, tag);
-    }
-  };
-  template <class BaseClass>
-  class WithRawMethod_GetTable : public BaseClass {
-   private:
-    void BaseClassMustBeDerivedFromService(const Service* /*service*/) {}
-   public:
-    WithRawMethod_GetTable() {
-      ::grpc::Service::MarkMethodRaw(2);
-    }
-    ~WithRawMethod_GetTable() override {
-      BaseClassMustBeDerivedFromService(this);
-    }
-    // disable synchronous version of this method
-    ::grpc::Status GetTable(::grpc::ServerContext* /*context*/, const ::io::deephaven::proto::backplane::grpc::GetTableRequest* /*request*/, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse* /*response*/) override {
-      abort();
-      return ::grpc::Status(::grpc::StatusCode::UNIMPLEMENTED, "");
-    }
-    void RequestGetTable(::grpc::ServerContext* context, ::grpc::ByteBuffer* request, ::grpc::ServerAsyncResponseWriter< ::grpc::ByteBuffer>* response, ::grpc::CompletionQueue* new_call_cq, ::grpc::ServerCompletionQueue* notification_cq, void *tag) {
-      ::grpc::Service::RequestAsyncUnary(2, context, request, response, new_call_cq, notification_cq, tag);
-    }
-  };
-  template <class BaseClass>
-  class WithRawCallbackMethod_PartitionBy : public BaseClass {
-   private:
-    void BaseClassMustBeDerivedFromService(const Service* /*service*/) {}
-   public:
-    WithRawCallbackMethod_PartitionBy() {
-      ::grpc::Service::MarkMethodRawCallback(0,
-          new ::grpc::internal::CallbackUnaryHandler< ::grpc::ByteBuffer, ::grpc::ByteBuffer>(
-            [this](
-                   ::grpc::CallbackServerContext* context, const ::grpc::ByteBuffer* request, ::grpc::ByteBuffer* response) { return this->PartitionBy(context, request, response); }));
-    }
-    ~WithRawCallbackMethod_PartitionBy() override {
-      BaseClassMustBeDerivedFromService(this);
-    }
-    // disable synchronous version of this method
-    ::grpc::Status PartitionBy(::grpc::ServerContext* /*context*/, const ::io::deephaven::proto::backplane::grpc::PartitionByRequest* /*request*/, ::io::deephaven::proto::backplane::grpc::PartitionByResponse* /*response*/) override {
-      abort();
-      return ::grpc::Status(::grpc::StatusCode::UNIMPLEMENTED, "");
-    }
-    virtual ::grpc::ServerUnaryReactor* PartitionBy(
-      ::grpc::CallbackServerContext* /*context*/, const ::grpc::ByteBuffer* /*request*/, ::grpc::ByteBuffer* /*response*/)  { return nullptr; }
-  };
-  template <class BaseClass>
-  class WithRawCallbackMethod_Merge : public BaseClass {
-   private:
-    void BaseClassMustBeDerivedFromService(const Service* /*service*/) {}
-   public:
-    WithRawCallbackMethod_Merge() {
-      ::grpc::Service::MarkMethodRawCallback(1,
-          new ::grpc::internal::CallbackUnaryHandler< ::grpc::ByteBuffer, ::grpc::ByteBuffer>(
-            [this](
-                   ::grpc::CallbackServerContext* context, const ::grpc::ByteBuffer* request, ::grpc::ByteBuffer* response) { return this->Merge(context, request, response); }));
-    }
-    ~WithRawCallbackMethod_Merge() override {
-      BaseClassMustBeDerivedFromService(this);
-    }
-    // disable synchronous version of this method
-    ::grpc::Status Merge(::grpc::ServerContext* /*context*/, const ::io::deephaven::proto::backplane::grpc::MergeRequest* /*request*/, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse* /*response*/) override {
-      abort();
-      return ::grpc::Status(::grpc::StatusCode::UNIMPLEMENTED, "");
-    }
-    virtual ::grpc::ServerUnaryReactor* Merge(
-      ::grpc::CallbackServerContext* /*context*/, const ::grpc::ByteBuffer* /*request*/, ::grpc::ByteBuffer* /*response*/)  { return nullptr; }
-  };
-  template <class BaseClass>
-  class WithRawCallbackMethod_GetTable : public BaseClass {
-   private:
-    void BaseClassMustBeDerivedFromService(const Service* /*service*/) {}
-   public:
-    WithRawCallbackMethod_GetTable() {
-      ::grpc::Service::MarkMethodRawCallback(2,
-          new ::grpc::internal::CallbackUnaryHandler< ::grpc::ByteBuffer, ::grpc::ByteBuffer>(
-            [this](
-                   ::grpc::CallbackServerContext* context, const ::grpc::ByteBuffer* request, ::grpc::ByteBuffer* response) { return this->GetTable(context, request, response); }));
-    }
-    ~WithRawCallbackMethod_GetTable() override {
-      BaseClassMustBeDerivedFromService(this);
-    }
-    // disable synchronous version of this method
-    ::grpc::Status GetTable(::grpc::ServerContext* /*context*/, const ::io::deephaven::proto::backplane::grpc::GetTableRequest* /*request*/, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse* /*response*/) override {
-      abort();
-      return ::grpc::Status(::grpc::StatusCode::UNIMPLEMENTED, "");
-    }
-    virtual ::grpc::ServerUnaryReactor* GetTable(
-      ::grpc::CallbackServerContext* /*context*/, const ::grpc::ByteBuffer* /*request*/, ::grpc::ByteBuffer* /*response*/)  { return nullptr; }
-  };
-  template <class BaseClass>
-  class WithStreamedUnaryMethod_PartitionBy : public BaseClass {
-   private:
-    void BaseClassMustBeDerivedFromService(const Service* /*service*/) {}
-   public:
-    WithStreamedUnaryMethod_PartitionBy() {
-      ::grpc::Service::MarkMethodStreamed(0,
-        new ::grpc::internal::StreamedUnaryHandler<
-          ::io::deephaven::proto::backplane::grpc::PartitionByRequest, ::io::deephaven::proto::backplane::grpc::PartitionByResponse>(
-            [this](::grpc::ServerContext* context,
-                   ::grpc::ServerUnaryStreamer<
-                     ::io::deephaven::proto::backplane::grpc::PartitionByRequest, ::io::deephaven::proto::backplane::grpc::PartitionByResponse>* streamer) {
-                       return this->StreamedPartitionBy(context,
-                         streamer);
-                  }));
-    }
-    ~WithStreamedUnaryMethod_PartitionBy() override {
-      BaseClassMustBeDerivedFromService(this);
-    }
-    // disable regular version of this method
-    ::grpc::Status PartitionBy(::grpc::ServerContext* /*context*/, const ::io::deephaven::proto::backplane::grpc::PartitionByRequest* /*request*/, ::io::deephaven::proto::backplane::grpc::PartitionByResponse* /*response*/) override {
-      abort();
-      return ::grpc::Status(::grpc::StatusCode::UNIMPLEMENTED, "");
-    }
-    // replace default version of method with streamed unary
-    virtual ::grpc::Status StreamedPartitionBy(::grpc::ServerContext* context, ::grpc::ServerUnaryStreamer< ::io::deephaven::proto::backplane::grpc::PartitionByRequest,::io::deephaven::proto::backplane::grpc::PartitionByResponse>* server_unary_streamer) = 0;
-  };
-  template <class BaseClass>
-  class WithStreamedUnaryMethod_Merge : public BaseClass {
-   private:
-    void BaseClassMustBeDerivedFromService(const Service* /*service*/) {}
-   public:
-    WithStreamedUnaryMethod_Merge() {
-      ::grpc::Service::MarkMethodStreamed(1,
-        new ::grpc::internal::StreamedUnaryHandler<
-          ::io::deephaven::proto::backplane::grpc::MergeRequest, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse>(
-            [this](::grpc::ServerContext* context,
-                   ::grpc::ServerUnaryStreamer<
-                     ::io::deephaven::proto::backplane::grpc::MergeRequest, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse>* streamer) {
-                       return this->StreamedMerge(context,
-                         streamer);
-                  }));
-    }
-    ~WithStreamedUnaryMethod_Merge() override {
-      BaseClassMustBeDerivedFromService(this);
-    }
-    // disable regular version of this method
-    ::grpc::Status Merge(::grpc::ServerContext* /*context*/, const ::io::deephaven::proto::backplane::grpc::MergeRequest* /*request*/, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse* /*response*/) override {
-      abort();
-      return ::grpc::Status(::grpc::StatusCode::UNIMPLEMENTED, "");
-    }
-    // replace default version of method with streamed unary
-    virtual ::grpc::Status StreamedMerge(::grpc::ServerContext* context, ::grpc::ServerUnaryStreamer< ::io::deephaven::proto::backplane::grpc::MergeRequest,::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse>* server_unary_streamer) = 0;
-  };
-  template <class BaseClass>
-  class WithStreamedUnaryMethod_GetTable : public BaseClass {
-   private:
-    void BaseClassMustBeDerivedFromService(const Service* /*service*/) {}
-   public:
-    WithStreamedUnaryMethod_GetTable() {
-      ::grpc::Service::MarkMethodStreamed(2,
-        new ::grpc::internal::StreamedUnaryHandler<
-          ::io::deephaven::proto::backplane::grpc::GetTableRequest, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse>(
-            [this](::grpc::ServerContext* context,
-                   ::grpc::ServerUnaryStreamer<
-                     ::io::deephaven::proto::backplane::grpc::GetTableRequest, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse>* streamer) {
-                       return this->StreamedGetTable(context,
-                         streamer);
-                  }));
-    }
-    ~WithStreamedUnaryMethod_GetTable() override {
-      BaseClassMustBeDerivedFromService(this);
-    }
-    // disable regular version of this method
-    ::grpc::Status GetTable(::grpc::ServerContext* /*context*/, const ::io::deephaven::proto::backplane::grpc::GetTableRequest* /*request*/, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse* /*response*/) override {
-      abort();
-      return ::grpc::Status(::grpc::StatusCode::UNIMPLEMENTED, "");
-    }
-    // replace default version of method with streamed unary
-    virtual ::grpc::Status StreamedGetTable(::grpc::ServerContext* context, ::grpc::ServerUnaryStreamer< ::io::deephaven::proto::backplane::grpc::GetTableRequest,::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse>* server_unary_streamer) = 0;
-  };
-  typedef WithStreamedUnaryMethod_PartitionBy<WithStreamedUnaryMethod_Merge<WithStreamedUnaryMethod_GetTable<Service > > > StreamedUnaryService;
-  typedef Service SplitStreamedService;
-  typedef WithStreamedUnaryMethod_PartitionBy<WithStreamedUnaryMethod_Merge<WithStreamedUnaryMethod_GetTable<Service > > > StreamedService;
-};
-
-}  // namespace grpc
-}  // namespace backplane
-}  // namespace proto
-}  // namespace deephaven
-}  // namespace io
-
-
-#endif  // GRPC_deephaven_2fproto_2fpartitionedtable_2eproto__INCLUDED
diff --git a/cpp-client/deephaven/dhclient/proto/deephaven/proto/partitionedtable.pb.cc b/cpp-client/deephaven/dhclient/proto/deephaven/proto/partitionedtable.pb.cc
deleted file mode 100644
index b93c55ecd54..00000000000
--- a/cpp-client/deephaven/dhclient/proto/deephaven/proto/partitionedtable.pb.cc
+++ /dev/null
@@ -1,1577 +0,0 @@
-// Generated by the protocol buffer compiler.  DO NOT EDIT!
-// source: deephaven/proto/partitionedtable.proto
-
-#include "deephaven/proto/partitionedtable.pb.h"
-
-#include <algorithm>
-#include "google/protobuf/io/coded_stream.h"
-#include "google/protobuf/extension_set.h"
-#include "google/protobuf/wire_format_lite.h"
-#include "google/protobuf/descriptor.h"
-#include "google/protobuf/generated_message_reflection.h"
-#include "google/protobuf/reflection_ops.h"
-#include "google/protobuf/wire_format.h"
-#include "google/protobuf/generated_message_tctable_impl.h"
-// @@protoc_insertion_point(includes)
-
-// Must be included last.
-#include "google/protobuf/port_def.inc"
-PROTOBUF_PRAGMA_INIT_SEG
-namespace _pb = ::google::protobuf;
-namespace _pbi = ::google::protobuf::internal;
-namespace _fl = ::google::protobuf::internal::field_layout;
-namespace io {
-namespace deephaven {
-namespace proto {
-namespace backplane {
-namespace grpc {
-
-inline constexpr PartitionedTableDescriptor::Impl_::Impl_(
-    ::_pbi::ConstantInitialized) noexcept
-      : key_column_names_{},
-        constituent_definition_schema_(
-            &::google::protobuf::internal::fixed_address_empty_string,
-            ::_pbi::ConstantInitialized()),
-        constituent_column_name_(
-            &::google::protobuf::internal::fixed_address_empty_string,
-            ::_pbi::ConstantInitialized()),
-        unique_keys_{false},
-        constituent_changes_permitted_{false},
-        _cached_size_{0} {}
-
-template <typename>
-PROTOBUF_CONSTEXPR PartitionedTableDescriptor::PartitionedTableDescriptor(::_pbi::ConstantInitialized)
-    : _impl_(::_pbi::ConstantInitialized()) {}
-struct PartitionedTableDescriptorDefaultTypeInternal {
-  PROTOBUF_CONSTEXPR PartitionedTableDescriptorDefaultTypeInternal() : _instance(::_pbi::ConstantInitialized{}) {}
-  ~PartitionedTableDescriptorDefaultTypeInternal() {}
-  union {
-    PartitionedTableDescriptor _instance;
-  };
-};
-
-PROTOBUF_ATTRIBUTE_NO_DESTROY PROTOBUF_CONSTINIT
-    PROTOBUF_ATTRIBUTE_INIT_PRIORITY1 PartitionedTableDescriptorDefaultTypeInternal _PartitionedTableDescriptor_default_instance_;
-      template <typename>
-PROTOBUF_CONSTEXPR PartitionByResponse::PartitionByResponse(::_pbi::ConstantInitialized) {}
-struct PartitionByResponseDefaultTypeInternal {
-  PROTOBUF_CONSTEXPR PartitionByResponseDefaultTypeInternal() : _instance(::_pbi::ConstantInitialized{}) {}
-  ~PartitionByResponseDefaultTypeInternal() {}
-  union {
-    PartitionByResponse _instance;
-  };
-};
-
-PROTOBUF_ATTRIBUTE_NO_DESTROY PROTOBUF_CONSTINIT
-    PROTOBUF_ATTRIBUTE_INIT_PRIORITY1 PartitionByResponseDefaultTypeInternal _PartitionByResponse_default_instance_;
-
-inline constexpr PartitionByRequest::Impl_::Impl_(
-    ::_pbi::ConstantInitialized) noexcept
-      : _cached_size_{0},
-        key_column_names_{},
-        table_id_{nullptr},
-        result_id_{nullptr},
-        drop_keys_{false} {}
-
-template <typename>
-PROTOBUF_CONSTEXPR PartitionByRequest::PartitionByRequest(::_pbi::ConstantInitialized)
-    : _impl_(::_pbi::ConstantInitialized()) {}
-struct PartitionByRequestDefaultTypeInternal {
-  PROTOBUF_CONSTEXPR PartitionByRequestDefaultTypeInternal() : _instance(::_pbi::ConstantInitialized{}) {}
-  ~PartitionByRequestDefaultTypeInternal() {}
-  union {
-    PartitionByRequest _instance;
-  };
-};
-
-PROTOBUF_ATTRIBUTE_NO_DESTROY PROTOBUF_CONSTINIT
-    PROTOBUF_ATTRIBUTE_INIT_PRIORITY1 PartitionByRequestDefaultTypeInternal _PartitionByRequest_default_instance_;
-
-inline constexpr MergeRequest::Impl_::Impl_(
-    ::_pbi::ConstantInitialized) noexcept
-      : _cached_size_{0},
-        partitioned_table_{nullptr},
-        result_id_{nullptr} {}
-
-template <typename>
-PROTOBUF_CONSTEXPR MergeRequest::MergeRequest(::_pbi::ConstantInitialized)
-    : _impl_(::_pbi::ConstantInitialized()) {}
-struct MergeRequestDefaultTypeInternal {
-  PROTOBUF_CONSTEXPR MergeRequestDefaultTypeInternal() : _instance(::_pbi::ConstantInitialized{}) {}
-  ~MergeRequestDefaultTypeInternal() {}
-  union {
-    MergeRequest _instance;
-  };
-};
-
-PROTOBUF_ATTRIBUTE_NO_DESTROY PROTOBUF_CONSTINIT
-    PROTOBUF_ATTRIBUTE_INIT_PRIORITY1 MergeRequestDefaultTypeInternal _MergeRequest_default_instance_;
-
-inline constexpr GetTableRequest::Impl_::Impl_(
-    ::_pbi::ConstantInitialized) noexcept
-      : _cached_size_{0},
-        partitioned_table_{nullptr},
-        key_table_ticket_{nullptr},
-        result_id_{nullptr} {}
-
-template <typename>
-PROTOBUF_CONSTEXPR GetTableRequest::GetTableRequest(::_pbi::ConstantInitialized)
-    : _impl_(::_pbi::ConstantInitialized()) {}
-struct GetTableRequestDefaultTypeInternal {
-  PROTOBUF_CONSTEXPR GetTableRequestDefaultTypeInternal() : _instance(::_pbi::ConstantInitialized{}) {}
-  ~GetTableRequestDefaultTypeInternal() {}
-  union {
-    GetTableRequest _instance;
-  };
-};
-
-PROTOBUF_ATTRIBUTE_NO_DESTROY PROTOBUF_CONSTINIT
-    PROTOBUF_ATTRIBUTE_INIT_PRIORITY1 GetTableRequestDefaultTypeInternal _GetTableRequest_default_instance_;
-}  // namespace grpc
-}  // namespace backplane
-}  // namespace proto
-}  // namespace deephaven
-}  // namespace io
-static ::_pb::Metadata file_level_metadata_deephaven_2fproto_2fpartitionedtable_2eproto[5];
-static constexpr const ::_pb::EnumDescriptor**
-    file_level_enum_descriptors_deephaven_2fproto_2fpartitionedtable_2eproto = nullptr;
-static constexpr const ::_pb::ServiceDescriptor**
-    file_level_service_descriptors_deephaven_2fproto_2fpartitionedtable_2eproto = nullptr;
-const ::uint32_t TableStruct_deephaven_2fproto_2fpartitionedtable_2eproto::offsets[] PROTOBUF_SECTION_VARIABLE(
-    protodesc_cold) = {
-    PROTOBUF_FIELD_OFFSET(::io::deephaven::proto::backplane::grpc::PartitionByRequest, _impl_._has_bits_),
-    PROTOBUF_FIELD_OFFSET(::io::deephaven::proto::backplane::grpc::PartitionByRequest, _internal_metadata_),
-    ~0u,  // no _extensions_
-    ~0u,  // no _oneof_case_
-    ~0u,  // no _weak_field_map_
-    ~0u,  // no _inlined_string_donated_
-    ~0u,  // no _split_
-    ~0u,  // no sizeof(Split)
-    PROTOBUF_FIELD_OFFSET(::io::deephaven::proto::backplane::grpc::PartitionByRequest, _impl_.table_id_),
-    PROTOBUF_FIELD_OFFSET(::io::deephaven::proto::backplane::grpc::PartitionByRequest, _impl_.result_id_),
-    PROTOBUF_FIELD_OFFSET(::io::deephaven::proto::backplane::grpc::PartitionByRequest, _impl_.key_column_names_),
-    PROTOBUF_FIELD_OFFSET(::io::deephaven::proto::backplane::grpc::PartitionByRequest, _impl_.drop_keys_),
-    0,
-    1,
-    ~0u,
-    ~0u,
-    ~0u,  // no _has_bits_
-    PROTOBUF_FIELD_OFFSET(::io::deephaven::proto::backplane::grpc::PartitionByResponse, _internal_metadata_),
-    ~0u,  // no _extensions_
-    ~0u,  // no _oneof_case_
-    ~0u,  // no _weak_field_map_
-    ~0u,  // no _inlined_string_donated_
-    ~0u,  // no _split_
-    ~0u,  // no sizeof(Split)
-    PROTOBUF_FIELD_OFFSET(::io::deephaven::proto::backplane::grpc::MergeRequest, _impl_._has_bits_),
-    PROTOBUF_FIELD_OFFSET(::io::deephaven::proto::backplane::grpc::MergeRequest, _internal_metadata_),
-    ~0u,  // no _extensions_
-    ~0u,  // no _oneof_case_
-    ~0u,  // no _weak_field_map_
-    ~0u,  // no _inlined_string_donated_
-    ~0u,  // no _split_
-    ~0u,  // no sizeof(Split)
-    PROTOBUF_FIELD_OFFSET(::io::deephaven::proto::backplane::grpc::MergeRequest, _impl_.partitioned_table_),
-    PROTOBUF_FIELD_OFFSET(::io::deephaven::proto::backplane::grpc::MergeRequest, _impl_.result_id_),
-    0,
-    1,
-    PROTOBUF_FIELD_OFFSET(::io::deephaven::proto::backplane::grpc::GetTableRequest, _impl_._has_bits_),
-    PROTOBUF_FIELD_OFFSET(::io::deephaven::proto::backplane::grpc::GetTableRequest, _internal_metadata_),
-    ~0u,  // no _extensions_
-    ~0u,  // no _oneof_case_
-    ~0u,  // no _weak_field_map_
-    ~0u,  // no _inlined_string_donated_
-    ~0u,  // no _split_
-    ~0u,  // no sizeof(Split)
-    PROTOBUF_FIELD_OFFSET(::io::deephaven::proto::backplane::grpc::GetTableRequest, _impl_.partitioned_table_),
-    PROTOBUF_FIELD_OFFSET(::io::deephaven::proto::backplane::grpc::GetTableRequest, _impl_.key_table_ticket_),
-    PROTOBUF_FIELD_OFFSET(::io::deephaven::proto::backplane::grpc::GetTableRequest, _impl_.result_id_),
-    0,
-    1,
-    2,
-    ~0u,  // no _has_bits_
-    PROTOBUF_FIELD_OFFSET(::io::deephaven::proto::backplane::grpc::PartitionedTableDescriptor, _internal_metadata_),
-    ~0u,  // no _extensions_
-    ~0u,  // no _oneof_case_
-    ~0u,  // no _weak_field_map_
-    ~0u,  // no _inlined_string_donated_
-    ~0u,  // no _split_
-    ~0u,  // no sizeof(Split)
-    PROTOBUF_FIELD_OFFSET(::io::deephaven::proto::backplane::grpc::PartitionedTableDescriptor, _impl_.key_column_names_),
-    PROTOBUF_FIELD_OFFSET(::io::deephaven::proto::backplane::grpc::PartitionedTableDescriptor, _impl_.constituent_column_name_),
-    PROTOBUF_FIELD_OFFSET(::io::deephaven::proto::backplane::grpc::PartitionedTableDescriptor, _impl_.unique_keys_),
-    PROTOBUF_FIELD_OFFSET(::io::deephaven::proto::backplane::grpc::PartitionedTableDescriptor, _impl_.constituent_definition_schema_),
-    PROTOBUF_FIELD_OFFSET(::io::deephaven::proto::backplane::grpc::PartitionedTableDescriptor, _impl_.constituent_changes_permitted_),
-};
-
-static const ::_pbi::MigrationSchema
-    schemas[] PROTOBUF_SECTION_VARIABLE(protodesc_cold) = {
-        {0, 12, -1, sizeof(::io::deephaven::proto::backplane::grpc::PartitionByRequest)},
-        {16, -1, -1, sizeof(::io::deephaven::proto::backplane::grpc::PartitionByResponse)},
-        {24, 34, -1, sizeof(::io::deephaven::proto::backplane::grpc::MergeRequest)},
-        {36, 47, -1, sizeof(::io::deephaven::proto::backplane::grpc::GetTableRequest)},
-        {50, -1, -1, sizeof(::io::deephaven::proto::backplane::grpc::PartitionedTableDescriptor)},
-};
-
-static const ::_pb::Message* const file_default_instances[] = {
-    &::io::deephaven::proto::backplane::grpc::_PartitionByRequest_default_instance_._instance,
-    &::io::deephaven::proto::backplane::grpc::_PartitionByResponse_default_instance_._instance,
-    &::io::deephaven::proto::backplane::grpc::_MergeRequest_default_instance_._instance,
-    &::io::deephaven::proto::backplane::grpc::_GetTableRequest_default_instance_._instance,
-    &::io::deephaven::proto::backplane::grpc::_PartitionedTableDescriptor_default_instance_._instance,
-};
-const char descriptor_table_protodef_deephaven_2fproto_2fpartitionedtable_2eproto[] PROTOBUF_SECTION_VARIABLE(protodesc_cold) = {
-    "\n&deephaven/proto/partitionedtable.proto"
-    "\022!io.deephaven.proto.backplane.grpc\032\033dee"
-    "phaven/proto/table.proto\032\034deephaven/prot"
-    "o/ticket.proto\"\274\001\n\022PartitionByRequest\022;\n"
-    "\010table_id\030\001 \001(\0132).io.deephaven.proto.bac"
-    "kplane.grpc.Ticket\022<\n\tresult_id\030\002 \001(\0132)."
-    "io.deephaven.proto.backplane.grpc.Ticket"
-    "\022\030\n\020key_column_names\030\003 \003(\t\022\021\n\tdrop_keys\030"
-    "\004 \001(\010\"\025\n\023PartitionByResponse\"\222\001\n\014MergeRe"
-    "quest\022D\n\021partitioned_table\030\001 \001(\0132).io.de"
-    "ephaven.proto.backplane.grpc.Ticket\022<\n\tr"
-    "esult_id\030\002 \001(\0132).io.deephaven.proto.back"
-    "plane.grpc.Ticket\"\332\001\n\017GetTableRequest\022D\n"
-    "\021partitioned_table\030\001 \001(\0132).io.deephaven."
-    "proto.backplane.grpc.Ticket\022C\n\020key_table"
-    "_ticket\030\002 \001(\0132).io.deephaven.proto.backp"
-    "lane.grpc.Ticket\022<\n\tresult_id\030\004 \001(\0132).io"
-    ".deephaven.proto.backplane.grpc.Ticket\"\272"
-    "\001\n\032PartitionedTableDescriptor\022\030\n\020key_col"
-    "umn_names\030\001 \003(\t\022\037\n\027constituent_column_na"
-    "me\030\004 \001(\t\022\023\n\013unique_keys\030\002 \001(\010\022%\n\035constit"
-    "uent_definition_schema\030\003 \001(\014\022%\n\035constitu"
-    "ent_changes_permitted\030\005 \001(\0102\226\003\n\027Partitio"
-    "nedTableService\022|\n\013PartitionBy\0225.io.deep"
-    "haven.proto.backplane.grpc.PartitionByRe"
-    "quest\0326.io.deephaven.proto.backplane.grp"
-    "c.PartitionByResponse\022z\n\005Merge\022/.io.deep"
-    "haven.proto.backplane.grpc.MergeRequest\032"
-    "@.io.deephaven.proto.backplane.grpc.Expo"
-    "rtedTableCreationResponse\022\200\001\n\010GetTable\0222"
-    ".io.deephaven.proto.backplane.grpc.GetTa"
-    "bleRequest\032@.io.deephaven.proto.backplan"
-    "e.grpc.ExportedTableCreationResponseBLH\001"
-    "P\001ZFgithub.com/deephaven/deephaven-core/"
-    "go/internal/proto/partitionedtableb\006prot"
-    "o3"
-};
-static const ::_pbi::DescriptorTable* const descriptor_table_deephaven_2fproto_2fpartitionedtable_2eproto_deps[2] =
-    {
-        &::descriptor_table_deephaven_2fproto_2ftable_2eproto,
-        &::descriptor_table_deephaven_2fproto_2fticket_2eproto,
-};
-static ::absl::once_flag descriptor_table_deephaven_2fproto_2fpartitionedtable_2eproto_once;
-const ::_pbi::DescriptorTable descriptor_table_deephaven_2fproto_2fpartitionedtable_2eproto = {
-    false,
-    false,
-    1402,
-    descriptor_table_protodef_deephaven_2fproto_2fpartitionedtable_2eproto,
-    "deephaven/proto/partitionedtable.proto",
-    &descriptor_table_deephaven_2fproto_2fpartitionedtable_2eproto_once,
-    descriptor_table_deephaven_2fproto_2fpartitionedtable_2eproto_deps,
-    2,
-    5,
-    schemas,
-    file_default_instances,
-    TableStruct_deephaven_2fproto_2fpartitionedtable_2eproto::offsets,
-    file_level_metadata_deephaven_2fproto_2fpartitionedtable_2eproto,
-    file_level_enum_descriptors_deephaven_2fproto_2fpartitionedtable_2eproto,
-    file_level_service_descriptors_deephaven_2fproto_2fpartitionedtable_2eproto,
-};
-
-// This function exists to be marked as weak.
-// It can significantly speed up compilation by breaking up LLVM's SCC
-// in the .pb.cc translation units. Large translation units see a
-// reduction of more than 35% of walltime for optimized builds. Without
-// the weak attribute all the messages in the file, including all the
-// vtables and everything they use become part of the same SCC through
-// a cycle like:
-// GetMetadata -> descriptor table -> default instances ->
-//   vtables -> GetMetadata
-// By adding a weak function here we break the connection from the
-// individual vtables back into the descriptor table.
-PROTOBUF_ATTRIBUTE_WEAK const ::_pbi::DescriptorTable* descriptor_table_deephaven_2fproto_2fpartitionedtable_2eproto_getter() {
-  return &descriptor_table_deephaven_2fproto_2fpartitionedtable_2eproto;
-}
-// Force running AddDescriptors() at dynamic initialization time.
-PROTOBUF_ATTRIBUTE_INIT_PRIORITY2
-static ::_pbi::AddDescriptorsRunner dynamic_init_dummy_deephaven_2fproto_2fpartitionedtable_2eproto(&descriptor_table_deephaven_2fproto_2fpartitionedtable_2eproto);
-namespace io {
-namespace deephaven {
-namespace proto {
-namespace backplane {
-namespace grpc {
-// ===================================================================
-
-class PartitionByRequest::_Internal {
- public:
-  using HasBits = decltype(std::declval<PartitionByRequest>()._impl_._has_bits_);
-  static constexpr ::int32_t kHasBitsOffset =
-    8 * PROTOBUF_FIELD_OFFSET(PartitionByRequest, _impl_._has_bits_);
-  static const ::io::deephaven::proto::backplane::grpc::Ticket& table_id(const PartitionByRequest* msg);
-  static void set_has_table_id(HasBits* has_bits) {
-    (*has_bits)[0] |= 1u;
-  }
-  static const ::io::deephaven::proto::backplane::grpc::Ticket& result_id(const PartitionByRequest* msg);
-  static void set_has_result_id(HasBits* has_bits) {
-    (*has_bits)[0] |= 2u;
-  }
-};
-
-const ::io::deephaven::proto::backplane::grpc::Ticket& PartitionByRequest::_Internal::table_id(const PartitionByRequest* msg) {
-  return *msg->_impl_.table_id_;
-}
-const ::io::deephaven::proto::backplane::grpc::Ticket& PartitionByRequest::_Internal::result_id(const PartitionByRequest* msg) {
-  return *msg->_impl_.result_id_;
-}
-void PartitionByRequest::clear_table_id() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  if (_impl_.table_id_ != nullptr) _impl_.table_id_->Clear();
-  _impl_._has_bits_[0] &= ~0x00000001u;
-}
-void PartitionByRequest::clear_result_id() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  if (_impl_.result_id_ != nullptr) _impl_.result_id_->Clear();
-  _impl_._has_bits_[0] &= ~0x00000002u;
-}
-PartitionByRequest::PartitionByRequest(::google::protobuf::Arena* arena)
-    : ::google::protobuf::Message(arena) {
-  SharedCtor(arena);
-  // @@protoc_insertion_point(arena_constructor:io.deephaven.proto.backplane.grpc.PartitionByRequest)
-}
-inline PROTOBUF_NDEBUG_INLINE PartitionByRequest::Impl_::Impl_(
-    ::google::protobuf::internal::InternalVisibility visibility, ::google::protobuf::Arena* arena,
-    const Impl_& from)
-      : _has_bits_{from._has_bits_},
-        _cached_size_{0},
-        key_column_names_{visibility, arena, from.key_column_names_} {}
-
-PartitionByRequest::PartitionByRequest(
-    ::google::protobuf::Arena* arena,
-    const PartitionByRequest& from)
-    : ::google::protobuf::Message(arena) {
-  PartitionByRequest* const _this = this;
-  (void)_this;
-  _internal_metadata_.MergeFrom<::google::protobuf::UnknownFieldSet>(
-      from._internal_metadata_);
-  new (&_impl_) Impl_(internal_visibility(), arena, from._impl_);
-  ::uint32_t cached_has_bits = _impl_._has_bits_[0];
-  _impl_.table_id_ = (cached_has_bits & 0x00000001u)
-                ? CreateMaybeMessage<::io::deephaven::proto::backplane::grpc::Ticket>(arena, *from._impl_.table_id_)
-                : nullptr;
-  _impl_.result_id_ = (cached_has_bits & 0x00000002u)
-                ? CreateMaybeMessage<::io::deephaven::proto::backplane::grpc::Ticket>(arena, *from._impl_.result_id_)
-                : nullptr;
-  _impl_.drop_keys_ = from._impl_.drop_keys_;
-
-  // @@protoc_insertion_point(copy_constructor:io.deephaven.proto.backplane.grpc.PartitionByRequest)
-}
-inline PROTOBUF_NDEBUG_INLINE PartitionByRequest::Impl_::Impl_(
-    ::google::protobuf::internal::InternalVisibility visibility,
-    ::google::protobuf::Arena* arena)
-      : _cached_size_{0},
-        key_column_names_{visibility, arena} {}
-
-inline void PartitionByRequest::SharedCtor(::_pb::Arena* arena) {
-  new (&_impl_) Impl_(internal_visibility(), arena);
-  ::memset(reinterpret_cast<char *>(&_impl_) +
-               offsetof(Impl_, table_id_),
-           0,
-           offsetof(Impl_, drop_keys_) -
-               offsetof(Impl_, table_id_) +
-               sizeof(Impl_::drop_keys_));
-}
-PartitionByRequest::~PartitionByRequest() {
-  // @@protoc_insertion_point(destructor:io.deephaven.proto.backplane.grpc.PartitionByRequest)
-  _internal_metadata_.Delete<::google::protobuf::UnknownFieldSet>();
-  SharedDtor();
-}
-inline void PartitionByRequest::SharedDtor() {
-  ABSL_DCHECK(GetArena() == nullptr);
-  delete _impl_.table_id_;
-  delete _impl_.result_id_;
-  _impl_.~Impl_();
-}
-
-PROTOBUF_NOINLINE void PartitionByRequest::Clear() {
-// @@protoc_insertion_point(message_clear_start:io.deephaven.proto.backplane.grpc.PartitionByRequest)
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  ::uint32_t cached_has_bits = 0;
-  // Prevent compiler warnings about cached_has_bits being unused
-  (void) cached_has_bits;
-
-  _impl_.key_column_names_.Clear();
-  cached_has_bits = _impl_._has_bits_[0];
-  if (cached_has_bits & 0x00000003u) {
-    if (cached_has_bits & 0x00000001u) {
-      ABSL_DCHECK(_impl_.table_id_ != nullptr);
-      _impl_.table_id_->Clear();
-    }
-    if (cached_has_bits & 0x00000002u) {
-      ABSL_DCHECK(_impl_.result_id_ != nullptr);
-      _impl_.result_id_->Clear();
-    }
-  }
-  _impl_.drop_keys_ = false;
-  _impl_._has_bits_.Clear();
-  _internal_metadata_.Clear<::google::protobuf::UnknownFieldSet>();
-}
-
-const char* PartitionByRequest::_InternalParse(
-    const char* ptr, ::_pbi::ParseContext* ctx) {
-  ptr = ::_pbi::TcParser::ParseLoop(this, ptr, ctx, &_table_.header);
-  return ptr;
-}
-
-
-PROTOBUF_CONSTINIT PROTOBUF_ATTRIBUTE_INIT_PRIORITY1
-const ::_pbi::TcParseTable<2, 4, 2, 77, 2> PartitionByRequest::_table_ = {
-  {
-    PROTOBUF_FIELD_OFFSET(PartitionByRequest, _impl_._has_bits_),
-    0, // no _extensions_
-    4, 24,  // max_field_number, fast_idx_mask
-    offsetof(decltype(_table_), field_lookup_table),
-    4294967280,  // skipmap
-    offsetof(decltype(_table_), field_entries),
-    4,  // num_field_entries
-    2,  // num_aux_entries
-    offsetof(decltype(_table_), aux_entries),
-    &_PartitionByRequest_default_instance_._instance,
-    ::_pbi::TcParser::GenericFallback,  // fallback
-  }, {{
-    // bool drop_keys = 4;
-    {::_pbi::TcParser::SingularVarintNoZag1<bool, offsetof(PartitionByRequest, _impl_.drop_keys_), 63>(),
-     {32, 63, 0, PROTOBUF_FIELD_OFFSET(PartitionByRequest, _impl_.drop_keys_)}},
-    // .io.deephaven.proto.backplane.grpc.Ticket table_id = 1;
-    {::_pbi::TcParser::FastMtS1,
-     {10, 0, 0, PROTOBUF_FIELD_OFFSET(PartitionByRequest, _impl_.table_id_)}},
-    // .io.deephaven.proto.backplane.grpc.Ticket result_id = 2;
-    {::_pbi::TcParser::FastMtS1,
-     {18, 1, 1, PROTOBUF_FIELD_OFFSET(PartitionByRequest, _impl_.result_id_)}},
-    // repeated string key_column_names = 3;
-    {::_pbi::TcParser::FastUR1,
-     {26, 63, 0, PROTOBUF_FIELD_OFFSET(PartitionByRequest, _impl_.key_column_names_)}},
-  }}, {{
-    65535, 65535
-  }}, {{
-    // .io.deephaven.proto.backplane.grpc.Ticket table_id = 1;
-    {PROTOBUF_FIELD_OFFSET(PartitionByRequest, _impl_.table_id_), _Internal::kHasBitsOffset + 0, 0,
-    (0 | ::_fl::kFcOptional | ::_fl::kMessage | ::_fl::kTvTable)},
-    // .io.deephaven.proto.backplane.grpc.Ticket result_id = 2;
-    {PROTOBUF_FIELD_OFFSET(PartitionByRequest, _impl_.result_id_), _Internal::kHasBitsOffset + 1, 1,
-    (0 | ::_fl::kFcOptional | ::_fl::kMessage | ::_fl::kTvTable)},
-    // repeated string key_column_names = 3;
-    {PROTOBUF_FIELD_OFFSET(PartitionByRequest, _impl_.key_column_names_), -1, 0,
-    (0 | ::_fl::kFcRepeated | ::_fl::kUtf8String | ::_fl::kRepSString)},
-    // bool drop_keys = 4;
-    {PROTOBUF_FIELD_OFFSET(PartitionByRequest, _impl_.drop_keys_), -1, 0,
-    (0 | ::_fl::kFcSingular | ::_fl::kBool)},
-  }}, {{
-    {::_pbi::TcParser::GetTable<::io::deephaven::proto::backplane::grpc::Ticket>()},
-    {::_pbi::TcParser::GetTable<::io::deephaven::proto::backplane::grpc::Ticket>()},
-  }}, {{
-    "\64\0\0\20\0\0\0\0"
-    "io.deephaven.proto.backplane.grpc.PartitionByRequest"
-    "key_column_names"
-  }},
-};
-
-::uint8_t* PartitionByRequest::_InternalSerialize(
-    ::uint8_t* target,
-    ::google::protobuf::io::EpsCopyOutputStream* stream) const {
-  // @@protoc_insertion_point(serialize_to_array_start:io.deephaven.proto.backplane.grpc.PartitionByRequest)
-  ::uint32_t cached_has_bits = 0;
-  (void)cached_has_bits;
-
-  cached_has_bits = _impl_._has_bits_[0];
-  // .io.deephaven.proto.backplane.grpc.Ticket table_id = 1;
-  if (cached_has_bits & 0x00000001u) {
-    target = ::google::protobuf::internal::WireFormatLite::InternalWriteMessage(
-        1, _Internal::table_id(this),
-        _Internal::table_id(this).GetCachedSize(), target, stream);
-  }
-
-  // .io.deephaven.proto.backplane.grpc.Ticket result_id = 2;
-  if (cached_has_bits & 0x00000002u) {
-    target = ::google::protobuf::internal::WireFormatLite::InternalWriteMessage(
-        2, _Internal::result_id(this),
-        _Internal::result_id(this).GetCachedSize(), target, stream);
-  }
-
-  // repeated string key_column_names = 3;
-  for (int i = 0, n = this->_internal_key_column_names_size(); i < n; ++i) {
-    const auto& s = this->_internal_key_column_names().Get(i);
-    ::google::protobuf::internal::WireFormatLite::VerifyUtf8String(
-        s.data(), static_cast<int>(s.length()), ::google::protobuf::internal::WireFormatLite::SERIALIZE, "io.deephaven.proto.backplane.grpc.PartitionByRequest.key_column_names");
-    target = stream->WriteString(3, s, target);
-  }
-
-  // bool drop_keys = 4;
-  if (this->_internal_drop_keys() != 0) {
-    target = stream->EnsureSpace(target);
-    target = ::_pbi::WireFormatLite::WriteBoolToArray(
-        4, this->_internal_drop_keys(), target);
-  }
-
-  if (PROTOBUF_PREDICT_FALSE(_internal_metadata_.have_unknown_fields())) {
-    target =
-        ::_pbi::WireFormat::InternalSerializeUnknownFieldsToArray(
-            _internal_metadata_.unknown_fields<::google::protobuf::UnknownFieldSet>(::google::protobuf::UnknownFieldSet::default_instance), target, stream);
-  }
-  // @@protoc_insertion_point(serialize_to_array_end:io.deephaven.proto.backplane.grpc.PartitionByRequest)
-  return target;
-}
-
-::size_t PartitionByRequest::ByteSizeLong() const {
-// @@protoc_insertion_point(message_byte_size_start:io.deephaven.proto.backplane.grpc.PartitionByRequest)
-  ::size_t total_size = 0;
-
-  ::uint32_t cached_has_bits = 0;
-  // Prevent compiler warnings about cached_has_bits being unused
-  (void) cached_has_bits;
-
-  // repeated string key_column_names = 3;
-  total_size += 1 * ::google::protobuf::internal::FromIntSize(_internal_key_column_names().size());
-  for (int i = 0, n = _internal_key_column_names().size(); i < n; ++i) {
-    total_size += ::google::protobuf::internal::WireFormatLite::StringSize(
-        _internal_key_column_names().Get(i));
-  }
-  cached_has_bits = _impl_._has_bits_[0];
-  if (cached_has_bits & 0x00000003u) {
-    // .io.deephaven.proto.backplane.grpc.Ticket table_id = 1;
-    if (cached_has_bits & 0x00000001u) {
-      total_size +=
-          1 + ::google::protobuf::internal::WireFormatLite::MessageSize(*_impl_.table_id_);
-    }
-
-    // .io.deephaven.proto.backplane.grpc.Ticket result_id = 2;
-    if (cached_has_bits & 0x00000002u) {
-      total_size +=
-          1 + ::google::protobuf::internal::WireFormatLite::MessageSize(*_impl_.result_id_);
-    }
-
-  }
-  // bool drop_keys = 4;
-  if (this->_internal_drop_keys() != 0) {
-    total_size += 2;
-  }
-
-  return MaybeComputeUnknownFieldsSize(total_size, &_impl_._cached_size_);
-}
-
-const ::google::protobuf::Message::ClassData PartitionByRequest::_class_data_ = {
-    PartitionByRequest::MergeImpl,
-    nullptr,  // OnDemandRegisterArenaDtor
-};
-const ::google::protobuf::Message::ClassData* PartitionByRequest::GetClassData() const {
-  return &_class_data_;
-}
-
-void PartitionByRequest::MergeImpl(::google::protobuf::Message& to_msg, const ::google::protobuf::Message& from_msg) {
-  auto* const _this = static_cast<PartitionByRequest*>(&to_msg);
-  auto& from = static_cast<const PartitionByRequest&>(from_msg);
-  // @@protoc_insertion_point(class_specific_merge_from_start:io.deephaven.proto.backplane.grpc.PartitionByRequest)
-  ABSL_DCHECK_NE(&from, _this);
-  ::uint32_t cached_has_bits = 0;
-  (void) cached_has_bits;
-
-  _this->_internal_mutable_key_column_names()->MergeFrom(from._internal_key_column_names());
-  cached_has_bits = from._impl_._has_bits_[0];
-  if (cached_has_bits & 0x00000003u) {
-    if (cached_has_bits & 0x00000001u) {
-      _this->_internal_mutable_table_id()->::io::deephaven::proto::backplane::grpc::Ticket::MergeFrom(
-          from._internal_table_id());
-    }
-    if (cached_has_bits & 0x00000002u) {
-      _this->_internal_mutable_result_id()->::io::deephaven::proto::backplane::grpc::Ticket::MergeFrom(
-          from._internal_result_id());
-    }
-  }
-  if (from._internal_drop_keys() != 0) {
-    _this->_internal_set_drop_keys(from._internal_drop_keys());
-  }
-  _this->_internal_metadata_.MergeFrom<::google::protobuf::UnknownFieldSet>(from._internal_metadata_);
-}
-
-void PartitionByRequest::CopyFrom(const PartitionByRequest& from) {
-// @@protoc_insertion_point(class_specific_copy_from_start:io.deephaven.proto.backplane.grpc.PartitionByRequest)
-  if (&from == this) return;
-  Clear();
-  MergeFrom(from);
-}
-
-PROTOBUF_NOINLINE bool PartitionByRequest::IsInitialized() const {
-  return true;
-}
-
-::_pbi::CachedSize* PartitionByRequest::AccessCachedSize() const {
-  return &_impl_._cached_size_;
-}
-void PartitionByRequest::InternalSwap(PartitionByRequest* PROTOBUF_RESTRICT other) {
-  using std::swap;
-  _internal_metadata_.InternalSwap(&other->_internal_metadata_);
-  swap(_impl_._has_bits_[0], other->_impl_._has_bits_[0]);
-  _impl_.key_column_names_.InternalSwap(&other->_impl_.key_column_names_);
-  ::google::protobuf::internal::memswap<
-      PROTOBUF_FIELD_OFFSET(PartitionByRequest, _impl_.drop_keys_)
-      + sizeof(PartitionByRequest::_impl_.drop_keys_)
-      - PROTOBUF_FIELD_OFFSET(PartitionByRequest, _impl_.table_id_)>(
-          reinterpret_cast<char*>(&_impl_.table_id_),
-          reinterpret_cast<char*>(&other->_impl_.table_id_));
-}
-
-::google::protobuf::Metadata PartitionByRequest::GetMetadata() const {
-  return ::_pbi::AssignDescriptors(
-      &descriptor_table_deephaven_2fproto_2fpartitionedtable_2eproto_getter, &descriptor_table_deephaven_2fproto_2fpartitionedtable_2eproto_once,
-      file_level_metadata_deephaven_2fproto_2fpartitionedtable_2eproto[0]);
-}
-// ===================================================================
-
-class PartitionByResponse::_Internal {
- public:
-};
-
-PartitionByResponse::PartitionByResponse(::google::protobuf::Arena* arena)
-    : ::google::protobuf::internal::ZeroFieldsBase(arena) {
-  // @@protoc_insertion_point(arena_constructor:io.deephaven.proto.backplane.grpc.PartitionByResponse)
-}
-PartitionByResponse::PartitionByResponse(
-    ::google::protobuf::Arena* arena,
-    const PartitionByResponse& from)
-    : ::google::protobuf::internal::ZeroFieldsBase(arena) {
-  PartitionByResponse* const _this = this;
-  (void)_this;
-  _internal_metadata_.MergeFrom<::google::protobuf::UnknownFieldSet>(
-      from._internal_metadata_);
-
-  // @@protoc_insertion_point(copy_constructor:io.deephaven.proto.backplane.grpc.PartitionByResponse)
-}
-
-
-
-
-
-
-
-
-
-::google::protobuf::Metadata PartitionByResponse::GetMetadata() const {
-  return ::_pbi::AssignDescriptors(
-      &descriptor_table_deephaven_2fproto_2fpartitionedtable_2eproto_getter, &descriptor_table_deephaven_2fproto_2fpartitionedtable_2eproto_once,
-      file_level_metadata_deephaven_2fproto_2fpartitionedtable_2eproto[1]);
-}
-// ===================================================================
-
-class MergeRequest::_Internal {
- public:
-  using HasBits = decltype(std::declval<MergeRequest>()._impl_._has_bits_);
-  static constexpr ::int32_t kHasBitsOffset =
-    8 * PROTOBUF_FIELD_OFFSET(MergeRequest, _impl_._has_bits_);
-  static const ::io::deephaven::proto::backplane::grpc::Ticket& partitioned_table(const MergeRequest* msg);
-  static void set_has_partitioned_table(HasBits* has_bits) {
-    (*has_bits)[0] |= 1u;
-  }
-  static const ::io::deephaven::proto::backplane::grpc::Ticket& result_id(const MergeRequest* msg);
-  static void set_has_result_id(HasBits* has_bits) {
-    (*has_bits)[0] |= 2u;
-  }
-};
-
-const ::io::deephaven::proto::backplane::grpc::Ticket& MergeRequest::_Internal::partitioned_table(const MergeRequest* msg) {
-  return *msg->_impl_.partitioned_table_;
-}
-const ::io::deephaven::proto::backplane::grpc::Ticket& MergeRequest::_Internal::result_id(const MergeRequest* msg) {
-  return *msg->_impl_.result_id_;
-}
-void MergeRequest::clear_partitioned_table() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  if (_impl_.partitioned_table_ != nullptr) _impl_.partitioned_table_->Clear();
-  _impl_._has_bits_[0] &= ~0x00000001u;
-}
-void MergeRequest::clear_result_id() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  if (_impl_.result_id_ != nullptr) _impl_.result_id_->Clear();
-  _impl_._has_bits_[0] &= ~0x00000002u;
-}
-MergeRequest::MergeRequest(::google::protobuf::Arena* arena)
-    : ::google::protobuf::Message(arena) {
-  SharedCtor(arena);
-  // @@protoc_insertion_point(arena_constructor:io.deephaven.proto.backplane.grpc.MergeRequest)
-}
-inline PROTOBUF_NDEBUG_INLINE MergeRequest::Impl_::Impl_(
-    ::google::protobuf::internal::InternalVisibility visibility, ::google::protobuf::Arena* arena,
-    const Impl_& from)
-      : _has_bits_{from._has_bits_},
-        _cached_size_{0} {}
-
-MergeRequest::MergeRequest(
-    ::google::protobuf::Arena* arena,
-    const MergeRequest& from)
-    : ::google::protobuf::Message(arena) {
-  MergeRequest* const _this = this;
-  (void)_this;
-  _internal_metadata_.MergeFrom<::google::protobuf::UnknownFieldSet>(
-      from._internal_metadata_);
-  new (&_impl_) Impl_(internal_visibility(), arena, from._impl_);
-  ::uint32_t cached_has_bits = _impl_._has_bits_[0];
-  _impl_.partitioned_table_ = (cached_has_bits & 0x00000001u)
-                ? CreateMaybeMessage<::io::deephaven::proto::backplane::grpc::Ticket>(arena, *from._impl_.partitioned_table_)
-                : nullptr;
-  _impl_.result_id_ = (cached_has_bits & 0x00000002u)
-                ? CreateMaybeMessage<::io::deephaven::proto::backplane::grpc::Ticket>(arena, *from._impl_.result_id_)
-                : nullptr;
-
-  // @@protoc_insertion_point(copy_constructor:io.deephaven.proto.backplane.grpc.MergeRequest)
-}
-inline PROTOBUF_NDEBUG_INLINE MergeRequest::Impl_::Impl_(
-    ::google::protobuf::internal::InternalVisibility visibility,
-    ::google::protobuf::Arena* arena)
-      : _cached_size_{0} {}
-
-inline void MergeRequest::SharedCtor(::_pb::Arena* arena) {
-  new (&_impl_) Impl_(internal_visibility(), arena);
-  ::memset(reinterpret_cast<char *>(&_impl_) +
-               offsetof(Impl_, partitioned_table_),
-           0,
-           offsetof(Impl_, result_id_) -
-               offsetof(Impl_, partitioned_table_) +
-               sizeof(Impl_::result_id_));
-}
-MergeRequest::~MergeRequest() {
-  // @@protoc_insertion_point(destructor:io.deephaven.proto.backplane.grpc.MergeRequest)
-  _internal_metadata_.Delete<::google::protobuf::UnknownFieldSet>();
-  SharedDtor();
-}
-inline void MergeRequest::SharedDtor() {
-  ABSL_DCHECK(GetArena() == nullptr);
-  delete _impl_.partitioned_table_;
-  delete _impl_.result_id_;
-  _impl_.~Impl_();
-}
-
-PROTOBUF_NOINLINE void MergeRequest::Clear() {
-// @@protoc_insertion_point(message_clear_start:io.deephaven.proto.backplane.grpc.MergeRequest)
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  ::uint32_t cached_has_bits = 0;
-  // Prevent compiler warnings about cached_has_bits being unused
-  (void) cached_has_bits;
-
-  cached_has_bits = _impl_._has_bits_[0];
-  if (cached_has_bits & 0x00000003u) {
-    if (cached_has_bits & 0x00000001u) {
-      ABSL_DCHECK(_impl_.partitioned_table_ != nullptr);
-      _impl_.partitioned_table_->Clear();
-    }
-    if (cached_has_bits & 0x00000002u) {
-      ABSL_DCHECK(_impl_.result_id_ != nullptr);
-      _impl_.result_id_->Clear();
-    }
-  }
-  _impl_._has_bits_.Clear();
-  _internal_metadata_.Clear<::google::protobuf::UnknownFieldSet>();
-}
-
-const char* MergeRequest::_InternalParse(
-    const char* ptr, ::_pbi::ParseContext* ctx) {
-  ptr = ::_pbi::TcParser::ParseLoop(this, ptr, ctx, &_table_.header);
-  return ptr;
-}
-
-
-PROTOBUF_CONSTINIT PROTOBUF_ATTRIBUTE_INIT_PRIORITY1
-const ::_pbi::TcParseTable<1, 2, 2, 0, 2> MergeRequest::_table_ = {
-  {
-    PROTOBUF_FIELD_OFFSET(MergeRequest, _impl_._has_bits_),
-    0, // no _extensions_
-    2, 8,  // max_field_number, fast_idx_mask
-    offsetof(decltype(_table_), field_lookup_table),
-    4294967292,  // skipmap
-    offsetof(decltype(_table_), field_entries),
-    2,  // num_field_entries
-    2,  // num_aux_entries
-    offsetof(decltype(_table_), aux_entries),
-    &_MergeRequest_default_instance_._instance,
-    ::_pbi::TcParser::GenericFallback,  // fallback
-  }, {{
-    // .io.deephaven.proto.backplane.grpc.Ticket result_id = 2;
-    {::_pbi::TcParser::FastMtS1,
-     {18, 1, 1, PROTOBUF_FIELD_OFFSET(MergeRequest, _impl_.result_id_)}},
-    // .io.deephaven.proto.backplane.grpc.Ticket partitioned_table = 1;
-    {::_pbi::TcParser::FastMtS1,
-     {10, 0, 0, PROTOBUF_FIELD_OFFSET(MergeRequest, _impl_.partitioned_table_)}},
-  }}, {{
-    65535, 65535
-  }}, {{
-    // .io.deephaven.proto.backplane.grpc.Ticket partitioned_table = 1;
-    {PROTOBUF_FIELD_OFFSET(MergeRequest, _impl_.partitioned_table_), _Internal::kHasBitsOffset + 0, 0,
-    (0 | ::_fl::kFcOptional | ::_fl::kMessage | ::_fl::kTvTable)},
-    // .io.deephaven.proto.backplane.grpc.Ticket result_id = 2;
-    {PROTOBUF_FIELD_OFFSET(MergeRequest, _impl_.result_id_), _Internal::kHasBitsOffset + 1, 1,
-    (0 | ::_fl::kFcOptional | ::_fl::kMessage | ::_fl::kTvTable)},
-  }}, {{
-    {::_pbi::TcParser::GetTable<::io::deephaven::proto::backplane::grpc::Ticket>()},
-    {::_pbi::TcParser::GetTable<::io::deephaven::proto::backplane::grpc::Ticket>()},
-  }}, {{
-  }},
-};
-
-::uint8_t* MergeRequest::_InternalSerialize(
-    ::uint8_t* target,
-    ::google::protobuf::io::EpsCopyOutputStream* stream) const {
-  // @@protoc_insertion_point(serialize_to_array_start:io.deephaven.proto.backplane.grpc.MergeRequest)
-  ::uint32_t cached_has_bits = 0;
-  (void)cached_has_bits;
-
-  cached_has_bits = _impl_._has_bits_[0];
-  // .io.deephaven.proto.backplane.grpc.Ticket partitioned_table = 1;
-  if (cached_has_bits & 0x00000001u) {
-    target = ::google::protobuf::internal::WireFormatLite::InternalWriteMessage(
-        1, _Internal::partitioned_table(this),
-        _Internal::partitioned_table(this).GetCachedSize(), target, stream);
-  }
-
-  // .io.deephaven.proto.backplane.grpc.Ticket result_id = 2;
-  if (cached_has_bits & 0x00000002u) {
-    target = ::google::protobuf::internal::WireFormatLite::InternalWriteMessage(
-        2, _Internal::result_id(this),
-        _Internal::result_id(this).GetCachedSize(), target, stream);
-  }
-
-  if (PROTOBUF_PREDICT_FALSE(_internal_metadata_.have_unknown_fields())) {
-    target =
-        ::_pbi::WireFormat::InternalSerializeUnknownFieldsToArray(
-            _internal_metadata_.unknown_fields<::google::protobuf::UnknownFieldSet>(::google::protobuf::UnknownFieldSet::default_instance), target, stream);
-  }
-  // @@protoc_insertion_point(serialize_to_array_end:io.deephaven.proto.backplane.grpc.MergeRequest)
-  return target;
-}
-
-::size_t MergeRequest::ByteSizeLong() const {
-// @@protoc_insertion_point(message_byte_size_start:io.deephaven.proto.backplane.grpc.MergeRequest)
-  ::size_t total_size = 0;
-
-  ::uint32_t cached_has_bits = 0;
-  // Prevent compiler warnings about cached_has_bits being unused
-  (void) cached_has_bits;
-
-  cached_has_bits = _impl_._has_bits_[0];
-  if (cached_has_bits & 0x00000003u) {
-    // .io.deephaven.proto.backplane.grpc.Ticket partitioned_table = 1;
-    if (cached_has_bits & 0x00000001u) {
-      total_size +=
-          1 + ::google::protobuf::internal::WireFormatLite::MessageSize(*_impl_.partitioned_table_);
-    }
-
-    // .io.deephaven.proto.backplane.grpc.Ticket result_id = 2;
-    if (cached_has_bits & 0x00000002u) {
-      total_size +=
-          1 + ::google::protobuf::internal::WireFormatLite::MessageSize(*_impl_.result_id_);
-    }
-
-  }
-  return MaybeComputeUnknownFieldsSize(total_size, &_impl_._cached_size_);
-}
-
-const ::google::protobuf::Message::ClassData MergeRequest::_class_data_ = {
-    MergeRequest::MergeImpl,
-    nullptr,  // OnDemandRegisterArenaDtor
-};
-const ::google::protobuf::Message::ClassData* MergeRequest::GetClassData() const {
-  return &_class_data_;
-}
-
-void MergeRequest::MergeImpl(::google::protobuf::Message& to_msg, const ::google::protobuf::Message& from_msg) {
-  auto* const _this = static_cast<MergeRequest*>(&to_msg);
-  auto& from = static_cast<const MergeRequest&>(from_msg);
-  // @@protoc_insertion_point(class_specific_merge_from_start:io.deephaven.proto.backplane.grpc.MergeRequest)
-  ABSL_DCHECK_NE(&from, _this);
-  ::uint32_t cached_has_bits = 0;
-  (void) cached_has_bits;
-
-  cached_has_bits = from._impl_._has_bits_[0];
-  if (cached_has_bits & 0x00000003u) {
-    if (cached_has_bits & 0x00000001u) {
-      _this->_internal_mutable_partitioned_table()->::io::deephaven::proto::backplane::grpc::Ticket::MergeFrom(
-          from._internal_partitioned_table());
-    }
-    if (cached_has_bits & 0x00000002u) {
-      _this->_internal_mutable_result_id()->::io::deephaven::proto::backplane::grpc::Ticket::MergeFrom(
-          from._internal_result_id());
-    }
-  }
-  _this->_internal_metadata_.MergeFrom<::google::protobuf::UnknownFieldSet>(from._internal_metadata_);
-}
-
-void MergeRequest::CopyFrom(const MergeRequest& from) {
-// @@protoc_insertion_point(class_specific_copy_from_start:io.deephaven.proto.backplane.grpc.MergeRequest)
-  if (&from == this) return;
-  Clear();
-  MergeFrom(from);
-}
-
-PROTOBUF_NOINLINE bool MergeRequest::IsInitialized() const {
-  return true;
-}
-
-::_pbi::CachedSize* MergeRequest::AccessCachedSize() const {
-  return &_impl_._cached_size_;
-}
-void MergeRequest::InternalSwap(MergeRequest* PROTOBUF_RESTRICT other) {
-  using std::swap;
-  _internal_metadata_.InternalSwap(&other->_internal_metadata_);
-  swap(_impl_._has_bits_[0], other->_impl_._has_bits_[0]);
-  ::google::protobuf::internal::memswap<
-      PROTOBUF_FIELD_OFFSET(MergeRequest, _impl_.result_id_)
-      + sizeof(MergeRequest::_impl_.result_id_)
-      - PROTOBUF_FIELD_OFFSET(MergeRequest, _impl_.partitioned_table_)>(
-          reinterpret_cast<char*>(&_impl_.partitioned_table_),
-          reinterpret_cast<char*>(&other->_impl_.partitioned_table_));
-}
-
-::google::protobuf::Metadata MergeRequest::GetMetadata() const {
-  return ::_pbi::AssignDescriptors(
-      &descriptor_table_deephaven_2fproto_2fpartitionedtable_2eproto_getter, &descriptor_table_deephaven_2fproto_2fpartitionedtable_2eproto_once,
-      file_level_metadata_deephaven_2fproto_2fpartitionedtable_2eproto[2]);
-}
-// ===================================================================
-
-class GetTableRequest::_Internal {
- public:
-  using HasBits = decltype(std::declval<GetTableRequest>()._impl_._has_bits_);
-  static constexpr ::int32_t kHasBitsOffset =
-    8 * PROTOBUF_FIELD_OFFSET(GetTableRequest, _impl_._has_bits_);
-  static const ::io::deephaven::proto::backplane::grpc::Ticket& partitioned_table(const GetTableRequest* msg);
-  static void set_has_partitioned_table(HasBits* has_bits) {
-    (*has_bits)[0] |= 1u;
-  }
-  static const ::io::deephaven::proto::backplane::grpc::Ticket& key_table_ticket(const GetTableRequest* msg);
-  static void set_has_key_table_ticket(HasBits* has_bits) {
-    (*has_bits)[0] |= 2u;
-  }
-  static const ::io::deephaven::proto::backplane::grpc::Ticket& result_id(const GetTableRequest* msg);
-  static void set_has_result_id(HasBits* has_bits) {
-    (*has_bits)[0] |= 4u;
-  }
-};
-
-const ::io::deephaven::proto::backplane::grpc::Ticket& GetTableRequest::_Internal::partitioned_table(const GetTableRequest* msg) {
-  return *msg->_impl_.partitioned_table_;
-}
-const ::io::deephaven::proto::backplane::grpc::Ticket& GetTableRequest::_Internal::key_table_ticket(const GetTableRequest* msg) {
-  return *msg->_impl_.key_table_ticket_;
-}
-const ::io::deephaven::proto::backplane::grpc::Ticket& GetTableRequest::_Internal::result_id(const GetTableRequest* msg) {
-  return *msg->_impl_.result_id_;
-}
-void GetTableRequest::clear_partitioned_table() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  if (_impl_.partitioned_table_ != nullptr) _impl_.partitioned_table_->Clear();
-  _impl_._has_bits_[0] &= ~0x00000001u;
-}
-void GetTableRequest::clear_key_table_ticket() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  if (_impl_.key_table_ticket_ != nullptr) _impl_.key_table_ticket_->Clear();
-  _impl_._has_bits_[0] &= ~0x00000002u;
-}
-void GetTableRequest::clear_result_id() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  if (_impl_.result_id_ != nullptr) _impl_.result_id_->Clear();
-  _impl_._has_bits_[0] &= ~0x00000004u;
-}
-GetTableRequest::GetTableRequest(::google::protobuf::Arena* arena)
-    : ::google::protobuf::Message(arena) {
-  SharedCtor(arena);
-  // @@protoc_insertion_point(arena_constructor:io.deephaven.proto.backplane.grpc.GetTableRequest)
-}
-inline PROTOBUF_NDEBUG_INLINE GetTableRequest::Impl_::Impl_(
-    ::google::protobuf::internal::InternalVisibility visibility, ::google::protobuf::Arena* arena,
-    const Impl_& from)
-      : _has_bits_{from._has_bits_},
-        _cached_size_{0} {}
-
-GetTableRequest::GetTableRequest(
-    ::google::protobuf::Arena* arena,
-    const GetTableRequest& from)
-    : ::google::protobuf::Message(arena) {
-  GetTableRequest* const _this = this;
-  (void)_this;
-  _internal_metadata_.MergeFrom<::google::protobuf::UnknownFieldSet>(
-      from._internal_metadata_);
-  new (&_impl_) Impl_(internal_visibility(), arena, from._impl_);
-  ::uint32_t cached_has_bits = _impl_._has_bits_[0];
-  _impl_.partitioned_table_ = (cached_has_bits & 0x00000001u)
-                ? CreateMaybeMessage<::io::deephaven::proto::backplane::grpc::Ticket>(arena, *from._impl_.partitioned_table_)
-                : nullptr;
-  _impl_.key_table_ticket_ = (cached_has_bits & 0x00000002u)
-                ? CreateMaybeMessage<::io::deephaven::proto::backplane::grpc::Ticket>(arena, *from._impl_.key_table_ticket_)
-                : nullptr;
-  _impl_.result_id_ = (cached_has_bits & 0x00000004u)
-                ? CreateMaybeMessage<::io::deephaven::proto::backplane::grpc::Ticket>(arena, *from._impl_.result_id_)
-                : nullptr;
-
-  // @@protoc_insertion_point(copy_constructor:io.deephaven.proto.backplane.grpc.GetTableRequest)
-}
-inline PROTOBUF_NDEBUG_INLINE GetTableRequest::Impl_::Impl_(
-    ::google::protobuf::internal::InternalVisibility visibility,
-    ::google::protobuf::Arena* arena)
-      : _cached_size_{0} {}
-
-inline void GetTableRequest::SharedCtor(::_pb::Arena* arena) {
-  new (&_impl_) Impl_(internal_visibility(), arena);
-  ::memset(reinterpret_cast<char *>(&_impl_) +
-               offsetof(Impl_, partitioned_table_),
-           0,
-           offsetof(Impl_, result_id_) -
-               offsetof(Impl_, partitioned_table_) +
-               sizeof(Impl_::result_id_));
-}
-GetTableRequest::~GetTableRequest() {
-  // @@protoc_insertion_point(destructor:io.deephaven.proto.backplane.grpc.GetTableRequest)
-  _internal_metadata_.Delete<::google::protobuf::UnknownFieldSet>();
-  SharedDtor();
-}
-inline void GetTableRequest::SharedDtor() {
-  ABSL_DCHECK(GetArena() == nullptr);
-  delete _impl_.partitioned_table_;
-  delete _impl_.key_table_ticket_;
-  delete _impl_.result_id_;
-  _impl_.~Impl_();
-}
-
-PROTOBUF_NOINLINE void GetTableRequest::Clear() {
-// @@protoc_insertion_point(message_clear_start:io.deephaven.proto.backplane.grpc.GetTableRequest)
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  ::uint32_t cached_has_bits = 0;
-  // Prevent compiler warnings about cached_has_bits being unused
-  (void) cached_has_bits;
-
-  cached_has_bits = _impl_._has_bits_[0];
-  if (cached_has_bits & 0x00000007u) {
-    if (cached_has_bits & 0x00000001u) {
-      ABSL_DCHECK(_impl_.partitioned_table_ != nullptr);
-      _impl_.partitioned_table_->Clear();
-    }
-    if (cached_has_bits & 0x00000002u) {
-      ABSL_DCHECK(_impl_.key_table_ticket_ != nullptr);
-      _impl_.key_table_ticket_->Clear();
-    }
-    if (cached_has_bits & 0x00000004u) {
-      ABSL_DCHECK(_impl_.result_id_ != nullptr);
-      _impl_.result_id_->Clear();
-    }
-  }
-  _impl_._has_bits_.Clear();
-  _internal_metadata_.Clear<::google::protobuf::UnknownFieldSet>();
-}
-
-const char* GetTableRequest::_InternalParse(
-    const char* ptr, ::_pbi::ParseContext* ctx) {
-  ptr = ::_pbi::TcParser::ParseLoop(this, ptr, ctx, &_table_.header);
-  return ptr;
-}
-
-
-PROTOBUF_CONSTINIT PROTOBUF_ATTRIBUTE_INIT_PRIORITY1
-const ::_pbi::TcParseTable<2, 3, 3, 0, 2> GetTableRequest::_table_ = {
-  {
-    PROTOBUF_FIELD_OFFSET(GetTableRequest, _impl_._has_bits_),
-    0, // no _extensions_
-    4, 24,  // max_field_number, fast_idx_mask
-    offsetof(decltype(_table_), field_lookup_table),
-    4294967284,  // skipmap
-    offsetof(decltype(_table_), field_entries),
-    3,  // num_field_entries
-    3,  // num_aux_entries
-    offsetof(decltype(_table_), aux_entries),
-    &_GetTableRequest_default_instance_._instance,
-    ::_pbi::TcParser::GenericFallback,  // fallback
-  }, {{
-    // .io.deephaven.proto.backplane.grpc.Ticket result_id = 4;
-    {::_pbi::TcParser::FastMtS1,
-     {34, 2, 2, PROTOBUF_FIELD_OFFSET(GetTableRequest, _impl_.result_id_)}},
-    // .io.deephaven.proto.backplane.grpc.Ticket partitioned_table = 1;
-    {::_pbi::TcParser::FastMtS1,
-     {10, 0, 0, PROTOBUF_FIELD_OFFSET(GetTableRequest, _impl_.partitioned_table_)}},
-    // .io.deephaven.proto.backplane.grpc.Ticket key_table_ticket = 2;
-    {::_pbi::TcParser::FastMtS1,
-     {18, 1, 1, PROTOBUF_FIELD_OFFSET(GetTableRequest, _impl_.key_table_ticket_)}},
-    {::_pbi::TcParser::MiniParse, {}},
-  }}, {{
-    65535, 65535
-  }}, {{
-    // .io.deephaven.proto.backplane.grpc.Ticket partitioned_table = 1;
-    {PROTOBUF_FIELD_OFFSET(GetTableRequest, _impl_.partitioned_table_), _Internal::kHasBitsOffset + 0, 0,
-    (0 | ::_fl::kFcOptional | ::_fl::kMessage | ::_fl::kTvTable)},
-    // .io.deephaven.proto.backplane.grpc.Ticket key_table_ticket = 2;
-    {PROTOBUF_FIELD_OFFSET(GetTableRequest, _impl_.key_table_ticket_), _Internal::kHasBitsOffset + 1, 1,
-    (0 | ::_fl::kFcOptional | ::_fl::kMessage | ::_fl::kTvTable)},
-    // .io.deephaven.proto.backplane.grpc.Ticket result_id = 4;
-    {PROTOBUF_FIELD_OFFSET(GetTableRequest, _impl_.result_id_), _Internal::kHasBitsOffset + 2, 2,
-    (0 | ::_fl::kFcOptional | ::_fl::kMessage | ::_fl::kTvTable)},
-  }}, {{
-    {::_pbi::TcParser::GetTable<::io::deephaven::proto::backplane::grpc::Ticket>()},
-    {::_pbi::TcParser::GetTable<::io::deephaven::proto::backplane::grpc::Ticket>()},
-    {::_pbi::TcParser::GetTable<::io::deephaven::proto::backplane::grpc::Ticket>()},
-  }}, {{
-  }},
-};
-
-::uint8_t* GetTableRequest::_InternalSerialize(
-    ::uint8_t* target,
-    ::google::protobuf::io::EpsCopyOutputStream* stream) const {
-  // @@protoc_insertion_point(serialize_to_array_start:io.deephaven.proto.backplane.grpc.GetTableRequest)
-  ::uint32_t cached_has_bits = 0;
-  (void)cached_has_bits;
-
-  cached_has_bits = _impl_._has_bits_[0];
-  // .io.deephaven.proto.backplane.grpc.Ticket partitioned_table = 1;
-  if (cached_has_bits & 0x00000001u) {
-    target = ::google::protobuf::internal::WireFormatLite::InternalWriteMessage(
-        1, _Internal::partitioned_table(this),
-        _Internal::partitioned_table(this).GetCachedSize(), target, stream);
-  }
-
-  // .io.deephaven.proto.backplane.grpc.Ticket key_table_ticket = 2;
-  if (cached_has_bits & 0x00000002u) {
-    target = ::google::protobuf::internal::WireFormatLite::InternalWriteMessage(
-        2, _Internal::key_table_ticket(this),
-        _Internal::key_table_ticket(this).GetCachedSize(), target, stream);
-  }
-
-  // .io.deephaven.proto.backplane.grpc.Ticket result_id = 4;
-  if (cached_has_bits & 0x00000004u) {
-    target = ::google::protobuf::internal::WireFormatLite::InternalWriteMessage(
-        4, _Internal::result_id(this),
-        _Internal::result_id(this).GetCachedSize(), target, stream);
-  }
-
-  if (PROTOBUF_PREDICT_FALSE(_internal_metadata_.have_unknown_fields())) {
-    target =
-        ::_pbi::WireFormat::InternalSerializeUnknownFieldsToArray(
-            _internal_metadata_.unknown_fields<::google::protobuf::UnknownFieldSet>(::google::protobuf::UnknownFieldSet::default_instance), target, stream);
-  }
-  // @@protoc_insertion_point(serialize_to_array_end:io.deephaven.proto.backplane.grpc.GetTableRequest)
-  return target;
-}
-
-::size_t GetTableRequest::ByteSizeLong() const {
-// @@protoc_insertion_point(message_byte_size_start:io.deephaven.proto.backplane.grpc.GetTableRequest)
-  ::size_t total_size = 0;
-
-  ::uint32_t cached_has_bits = 0;
-  // Prevent compiler warnings about cached_has_bits being unused
-  (void) cached_has_bits;
-
-  cached_has_bits = _impl_._has_bits_[0];
-  if (cached_has_bits & 0x00000007u) {
-    // .io.deephaven.proto.backplane.grpc.Ticket partitioned_table = 1;
-    if (cached_has_bits & 0x00000001u) {
-      total_size +=
-          1 + ::google::protobuf::internal::WireFormatLite::MessageSize(*_impl_.partitioned_table_);
-    }
-
-    // .io.deephaven.proto.backplane.grpc.Ticket key_table_ticket = 2;
-    if (cached_has_bits & 0x00000002u) {
-      total_size +=
-          1 + ::google::protobuf::internal::WireFormatLite::MessageSize(*_impl_.key_table_ticket_);
-    }
-
-    // .io.deephaven.proto.backplane.grpc.Ticket result_id = 4;
-    if (cached_has_bits & 0x00000004u) {
-      total_size +=
-          1 + ::google::protobuf::internal::WireFormatLite::MessageSize(*_impl_.result_id_);
-    }
-
-  }
-  return MaybeComputeUnknownFieldsSize(total_size, &_impl_._cached_size_);
-}
-
-const ::google::protobuf::Message::ClassData GetTableRequest::_class_data_ = {
-    GetTableRequest::MergeImpl,
-    nullptr,  // OnDemandRegisterArenaDtor
-};
-const ::google::protobuf::Message::ClassData* GetTableRequest::GetClassData() const {
-  return &_class_data_;
-}
-
-void GetTableRequest::MergeImpl(::google::protobuf::Message& to_msg, const ::google::protobuf::Message& from_msg) {
-  auto* const _this = static_cast<GetTableRequest*>(&to_msg);
-  auto& from = static_cast<const GetTableRequest&>(from_msg);
-  // @@protoc_insertion_point(class_specific_merge_from_start:io.deephaven.proto.backplane.grpc.GetTableRequest)
-  ABSL_DCHECK_NE(&from, _this);
-  ::uint32_t cached_has_bits = 0;
-  (void) cached_has_bits;
-
-  cached_has_bits = from._impl_._has_bits_[0];
-  if (cached_has_bits & 0x00000007u) {
-    if (cached_has_bits & 0x00000001u) {
-      _this->_internal_mutable_partitioned_table()->::io::deephaven::proto::backplane::grpc::Ticket::MergeFrom(
-          from._internal_partitioned_table());
-    }
-    if (cached_has_bits & 0x00000002u) {
-      _this->_internal_mutable_key_table_ticket()->::io::deephaven::proto::backplane::grpc::Ticket::MergeFrom(
-          from._internal_key_table_ticket());
-    }
-    if (cached_has_bits & 0x00000004u) {
-      _this->_internal_mutable_result_id()->::io::deephaven::proto::backplane::grpc::Ticket::MergeFrom(
-          from._internal_result_id());
-    }
-  }
-  _this->_internal_metadata_.MergeFrom<::google::protobuf::UnknownFieldSet>(from._internal_metadata_);
-}
-
-void GetTableRequest::CopyFrom(const GetTableRequest& from) {
-// @@protoc_insertion_point(class_specific_copy_from_start:io.deephaven.proto.backplane.grpc.GetTableRequest)
-  if (&from == this) return;
-  Clear();
-  MergeFrom(from);
-}
-
-PROTOBUF_NOINLINE bool GetTableRequest::IsInitialized() const {
-  return true;
-}
-
-::_pbi::CachedSize* GetTableRequest::AccessCachedSize() const {
-  return &_impl_._cached_size_;
-}
-void GetTableRequest::InternalSwap(GetTableRequest* PROTOBUF_RESTRICT other) {
-  using std::swap;
-  _internal_metadata_.InternalSwap(&other->_internal_metadata_);
-  swap(_impl_._has_bits_[0], other->_impl_._has_bits_[0]);
-  ::google::protobuf::internal::memswap<
-      PROTOBUF_FIELD_OFFSET(GetTableRequest, _impl_.result_id_)
-      + sizeof(GetTableRequest::_impl_.result_id_)
-      - PROTOBUF_FIELD_OFFSET(GetTableRequest, _impl_.partitioned_table_)>(
-          reinterpret_cast<char*>(&_impl_.partitioned_table_),
-          reinterpret_cast<char*>(&other->_impl_.partitioned_table_));
-}
-
-::google::protobuf::Metadata GetTableRequest::GetMetadata() const {
-  return ::_pbi::AssignDescriptors(
-      &descriptor_table_deephaven_2fproto_2fpartitionedtable_2eproto_getter, &descriptor_table_deephaven_2fproto_2fpartitionedtable_2eproto_once,
-      file_level_metadata_deephaven_2fproto_2fpartitionedtable_2eproto[3]);
-}
-// ===================================================================
-
-class PartitionedTableDescriptor::_Internal {
- public:
-};
-
-PartitionedTableDescriptor::PartitionedTableDescriptor(::google::protobuf::Arena* arena)
-    : ::google::protobuf::Message(arena) {
-  SharedCtor(arena);
-  // @@protoc_insertion_point(arena_constructor:io.deephaven.proto.backplane.grpc.PartitionedTableDescriptor)
-}
-inline PROTOBUF_NDEBUG_INLINE PartitionedTableDescriptor::Impl_::Impl_(
-    ::google::protobuf::internal::InternalVisibility visibility, ::google::protobuf::Arena* arena,
-    const Impl_& from)
-      : key_column_names_{visibility, arena, from.key_column_names_},
-        constituent_definition_schema_(arena, from.constituent_definition_schema_),
-        constituent_column_name_(arena, from.constituent_column_name_),
-        _cached_size_{0} {}
-
-PartitionedTableDescriptor::PartitionedTableDescriptor(
-    ::google::protobuf::Arena* arena,
-    const PartitionedTableDescriptor& from)
-    : ::google::protobuf::Message(arena) {
-  PartitionedTableDescriptor* const _this = this;
-  (void)_this;
-  _internal_metadata_.MergeFrom<::google::protobuf::UnknownFieldSet>(
-      from._internal_metadata_);
-  new (&_impl_) Impl_(internal_visibility(), arena, from._impl_);
-  ::memcpy(reinterpret_cast<char *>(&_impl_) +
-               offsetof(Impl_, unique_keys_),
-           reinterpret_cast<const char *>(&from._impl_) +
-               offsetof(Impl_, unique_keys_),
-           offsetof(Impl_, constituent_changes_permitted_) -
-               offsetof(Impl_, unique_keys_) +
-               sizeof(Impl_::constituent_changes_permitted_));
-
-  // @@protoc_insertion_point(copy_constructor:io.deephaven.proto.backplane.grpc.PartitionedTableDescriptor)
-}
-inline PROTOBUF_NDEBUG_INLINE PartitionedTableDescriptor::Impl_::Impl_(
-    ::google::protobuf::internal::InternalVisibility visibility,
-    ::google::protobuf::Arena* arena)
-      : key_column_names_{visibility, arena},
-        constituent_definition_schema_(arena),
-        constituent_column_name_(arena),
-        _cached_size_{0} {}
-
-inline void PartitionedTableDescriptor::SharedCtor(::_pb::Arena* arena) {
-  new (&_impl_) Impl_(internal_visibility(), arena);
-  ::memset(reinterpret_cast<char *>(&_impl_) +
-               offsetof(Impl_, unique_keys_),
-           0,
-           offsetof(Impl_, constituent_changes_permitted_) -
-               offsetof(Impl_, unique_keys_) +
-               sizeof(Impl_::constituent_changes_permitted_));
-}
-PartitionedTableDescriptor::~PartitionedTableDescriptor() {
-  // @@protoc_insertion_point(destructor:io.deephaven.proto.backplane.grpc.PartitionedTableDescriptor)
-  _internal_metadata_.Delete<::google::protobuf::UnknownFieldSet>();
-  SharedDtor();
-}
-inline void PartitionedTableDescriptor::SharedDtor() {
-  ABSL_DCHECK(GetArena() == nullptr);
-  _impl_.constituent_definition_schema_.Destroy();
-  _impl_.constituent_column_name_.Destroy();
-  _impl_.~Impl_();
-}
-
-PROTOBUF_NOINLINE void PartitionedTableDescriptor::Clear() {
-// @@protoc_insertion_point(message_clear_start:io.deephaven.proto.backplane.grpc.PartitionedTableDescriptor)
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  ::uint32_t cached_has_bits = 0;
-  // Prevent compiler warnings about cached_has_bits being unused
-  (void) cached_has_bits;
-
-  _impl_.key_column_names_.Clear();
-  _impl_.constituent_definition_schema_.ClearToEmpty();
-  _impl_.constituent_column_name_.ClearToEmpty();
-  ::memset(&_impl_.unique_keys_, 0, static_cast<::size_t>(
-      reinterpret_cast<char*>(&_impl_.constituent_changes_permitted_) -
-      reinterpret_cast<char*>(&_impl_.unique_keys_)) + sizeof(_impl_.constituent_changes_permitted_));
-  _internal_metadata_.Clear<::google::protobuf::UnknownFieldSet>();
-}
-
-const char* PartitionedTableDescriptor::_InternalParse(
-    const char* ptr, ::_pbi::ParseContext* ctx) {
-  ptr = ::_pbi::TcParser::ParseLoop(this, ptr, ctx, &_table_.header);
-  return ptr;
-}
-
-
-PROTOBUF_CONSTINIT PROTOBUF_ATTRIBUTE_INIT_PRIORITY1
-const ::_pbi::TcParseTable<3, 5, 0, 108, 2> PartitionedTableDescriptor::_table_ = {
-  {
-    0,  // no _has_bits_
-    0, // no _extensions_
-    5, 56,  // max_field_number, fast_idx_mask
-    offsetof(decltype(_table_), field_lookup_table),
-    4294967264,  // skipmap
-    offsetof(decltype(_table_), field_entries),
-    5,  // num_field_entries
-    0,  // num_aux_entries
-    offsetof(decltype(_table_), field_names),  // no aux_entries
-    &_PartitionedTableDescriptor_default_instance_._instance,
-    ::_pbi::TcParser::GenericFallback,  // fallback
-  }, {{
-    {::_pbi::TcParser::MiniParse, {}},
-    // repeated string key_column_names = 1;
-    {::_pbi::TcParser::FastUR1,
-     {10, 63, 0, PROTOBUF_FIELD_OFFSET(PartitionedTableDescriptor, _impl_.key_column_names_)}},
-    // bool unique_keys = 2;
-    {::_pbi::TcParser::SingularVarintNoZag1<bool, offsetof(PartitionedTableDescriptor, _impl_.unique_keys_), 63>(),
-     {16, 63, 0, PROTOBUF_FIELD_OFFSET(PartitionedTableDescriptor, _impl_.unique_keys_)}},
-    // bytes constituent_definition_schema = 3;
-    {::_pbi::TcParser::FastBS1,
-     {26, 63, 0, PROTOBUF_FIELD_OFFSET(PartitionedTableDescriptor, _impl_.constituent_definition_schema_)}},
-    // string constituent_column_name = 4;
-    {::_pbi::TcParser::FastUS1,
-     {34, 63, 0, PROTOBUF_FIELD_OFFSET(PartitionedTableDescriptor, _impl_.constituent_column_name_)}},
-    // bool constituent_changes_permitted = 5;
-    {::_pbi::TcParser::SingularVarintNoZag1<bool, offsetof(PartitionedTableDescriptor, _impl_.constituent_changes_permitted_), 63>(),
-     {40, 63, 0, PROTOBUF_FIELD_OFFSET(PartitionedTableDescriptor, _impl_.constituent_changes_permitted_)}},
-    {::_pbi::TcParser::MiniParse, {}},
-    {::_pbi::TcParser::MiniParse, {}},
-  }}, {{
-    65535, 65535
-  }}, {{
-    // repeated string key_column_names = 1;
-    {PROTOBUF_FIELD_OFFSET(PartitionedTableDescriptor, _impl_.key_column_names_), 0, 0,
-    (0 | ::_fl::kFcRepeated | ::_fl::kUtf8String | ::_fl::kRepSString)},
-    // bool unique_keys = 2;
-    {PROTOBUF_FIELD_OFFSET(PartitionedTableDescriptor, _impl_.unique_keys_), 0, 0,
-    (0 | ::_fl::kFcSingular | ::_fl::kBool)},
-    // bytes constituent_definition_schema = 3;
-    {PROTOBUF_FIELD_OFFSET(PartitionedTableDescriptor, _impl_.constituent_definition_schema_), 0, 0,
-    (0 | ::_fl::kFcSingular | ::_fl::kBytes | ::_fl::kRepAString)},
-    // string constituent_column_name = 4;
-    {PROTOBUF_FIELD_OFFSET(PartitionedTableDescriptor, _impl_.constituent_column_name_), 0, 0,
-    (0 | ::_fl::kFcSingular | ::_fl::kUtf8String | ::_fl::kRepAString)},
-    // bool constituent_changes_permitted = 5;
-    {PROTOBUF_FIELD_OFFSET(PartitionedTableDescriptor, _impl_.constituent_changes_permitted_), 0, 0,
-    (0 | ::_fl::kFcSingular | ::_fl::kBool)},
-  }},
-  // no aux_entries
-  {{
-    "\74\20\0\0\27\0\0\0"
-    "io.deephaven.proto.backplane.grpc.PartitionedTableDescriptor"
-    "key_column_names"
-    "constituent_column_name"
-  }},
-};
-
-::uint8_t* PartitionedTableDescriptor::_InternalSerialize(
-    ::uint8_t* target,
-    ::google::protobuf::io::EpsCopyOutputStream* stream) const {
-  // @@protoc_insertion_point(serialize_to_array_start:io.deephaven.proto.backplane.grpc.PartitionedTableDescriptor)
-  ::uint32_t cached_has_bits = 0;
-  (void)cached_has_bits;
-
-  // repeated string key_column_names = 1;
-  for (int i = 0, n = this->_internal_key_column_names_size(); i < n; ++i) {
-    const auto& s = this->_internal_key_column_names().Get(i);
-    ::google::protobuf::internal::WireFormatLite::VerifyUtf8String(
-        s.data(), static_cast<int>(s.length()), ::google::protobuf::internal::WireFormatLite::SERIALIZE, "io.deephaven.proto.backplane.grpc.PartitionedTableDescriptor.key_column_names");
-    target = stream->WriteString(1, s, target);
-  }
-
-  // bool unique_keys = 2;
-  if (this->_internal_unique_keys() != 0) {
-    target = stream->EnsureSpace(target);
-    target = ::_pbi::WireFormatLite::WriteBoolToArray(
-        2, this->_internal_unique_keys(), target);
-  }
-
-  // bytes constituent_definition_schema = 3;
-  if (!this->_internal_constituent_definition_schema().empty()) {
-    const std::string& _s = this->_internal_constituent_definition_schema();
-    target = stream->WriteBytesMaybeAliased(3, _s, target);
-  }
-
-  // string constituent_column_name = 4;
-  if (!this->_internal_constituent_column_name().empty()) {
-    const std::string& _s = this->_internal_constituent_column_name();
-    ::google::protobuf::internal::WireFormatLite::VerifyUtf8String(
-        _s.data(), static_cast<int>(_s.length()), ::google::protobuf::internal::WireFormatLite::SERIALIZE, "io.deephaven.proto.backplane.grpc.PartitionedTableDescriptor.constituent_column_name");
-    target = stream->WriteStringMaybeAliased(4, _s, target);
-  }
-
-  // bool constituent_changes_permitted = 5;
-  if (this->_internal_constituent_changes_permitted() != 0) {
-    target = stream->EnsureSpace(target);
-    target = ::_pbi::WireFormatLite::WriteBoolToArray(
-        5, this->_internal_constituent_changes_permitted(), target);
-  }
-
-  if (PROTOBUF_PREDICT_FALSE(_internal_metadata_.have_unknown_fields())) {
-    target =
-        ::_pbi::WireFormat::InternalSerializeUnknownFieldsToArray(
-            _internal_metadata_.unknown_fields<::google::protobuf::UnknownFieldSet>(::google::protobuf::UnknownFieldSet::default_instance), target, stream);
-  }
-  // @@protoc_insertion_point(serialize_to_array_end:io.deephaven.proto.backplane.grpc.PartitionedTableDescriptor)
-  return target;
-}
-
-::size_t PartitionedTableDescriptor::ByteSizeLong() const {
-// @@protoc_insertion_point(message_byte_size_start:io.deephaven.proto.backplane.grpc.PartitionedTableDescriptor)
-  ::size_t total_size = 0;
-
-  ::uint32_t cached_has_bits = 0;
-  // Prevent compiler warnings about cached_has_bits being unused
-  (void) cached_has_bits;
-
-  // repeated string key_column_names = 1;
-  total_size += 1 * ::google::protobuf::internal::FromIntSize(_internal_key_column_names().size());
-  for (int i = 0, n = _internal_key_column_names().size(); i < n; ++i) {
-    total_size += ::google::protobuf::internal::WireFormatLite::StringSize(
-        _internal_key_column_names().Get(i));
-  }
-  // bytes constituent_definition_schema = 3;
-  if (!this->_internal_constituent_definition_schema().empty()) {
-    total_size += 1 + ::google::protobuf::internal::WireFormatLite::BytesSize(
-                                    this->_internal_constituent_definition_schema());
-  }
-
-  // string constituent_column_name = 4;
-  if (!this->_internal_constituent_column_name().empty()) {
-    total_size += 1 + ::google::protobuf::internal::WireFormatLite::StringSize(
-                                    this->_internal_constituent_column_name());
-  }
-
-  // bool unique_keys = 2;
-  if (this->_internal_unique_keys() != 0) {
-    total_size += 2;
-  }
-
-  // bool constituent_changes_permitted = 5;
-  if (this->_internal_constituent_changes_permitted() != 0) {
-    total_size += 2;
-  }
-
-  return MaybeComputeUnknownFieldsSize(total_size, &_impl_._cached_size_);
-}
-
-const ::google::protobuf::Message::ClassData PartitionedTableDescriptor::_class_data_ = {
-    PartitionedTableDescriptor::MergeImpl,
-    nullptr,  // OnDemandRegisterArenaDtor
-};
-const ::google::protobuf::Message::ClassData* PartitionedTableDescriptor::GetClassData() const {
-  return &_class_data_;
-}
-
-void PartitionedTableDescriptor::MergeImpl(::google::protobuf::Message& to_msg, const ::google::protobuf::Message& from_msg) {
-  auto* const _this = static_cast<PartitionedTableDescriptor*>(&to_msg);
-  auto& from = static_cast<const PartitionedTableDescriptor&>(from_msg);
-  // @@protoc_insertion_point(class_specific_merge_from_start:io.deephaven.proto.backplane.grpc.PartitionedTableDescriptor)
-  ABSL_DCHECK_NE(&from, _this);
-  ::uint32_t cached_has_bits = 0;
-  (void) cached_has_bits;
-
-  _this->_internal_mutable_key_column_names()->MergeFrom(from._internal_key_column_names());
-  if (!from._internal_constituent_definition_schema().empty()) {
-    _this->_internal_set_constituent_definition_schema(from._internal_constituent_definition_schema());
-  }
-  if (!from._internal_constituent_column_name().empty()) {
-    _this->_internal_set_constituent_column_name(from._internal_constituent_column_name());
-  }
-  if (from._internal_unique_keys() != 0) {
-    _this->_internal_set_unique_keys(from._internal_unique_keys());
-  }
-  if (from._internal_constituent_changes_permitted() != 0) {
-    _this->_internal_set_constituent_changes_permitted(from._internal_constituent_changes_permitted());
-  }
-  _this->_internal_metadata_.MergeFrom<::google::protobuf::UnknownFieldSet>(from._internal_metadata_);
-}
-
-void PartitionedTableDescriptor::CopyFrom(const PartitionedTableDescriptor& from) {
-// @@protoc_insertion_point(class_specific_copy_from_start:io.deephaven.proto.backplane.grpc.PartitionedTableDescriptor)
-  if (&from == this) return;
-  Clear();
-  MergeFrom(from);
-}
-
-PROTOBUF_NOINLINE bool PartitionedTableDescriptor::IsInitialized() const {
-  return true;
-}
-
-::_pbi::CachedSize* PartitionedTableDescriptor::AccessCachedSize() const {
-  return &_impl_._cached_size_;
-}
-void PartitionedTableDescriptor::InternalSwap(PartitionedTableDescriptor* PROTOBUF_RESTRICT other) {
-  using std::swap;
-  auto* arena = GetArena();
-  ABSL_DCHECK_EQ(arena, other->GetArena());
-  _internal_metadata_.InternalSwap(&other->_internal_metadata_);
-  _impl_.key_column_names_.InternalSwap(&other->_impl_.key_column_names_);
-  ::_pbi::ArenaStringPtr::InternalSwap(&_impl_.constituent_definition_schema_, &other->_impl_.constituent_definition_schema_, arena);
-  ::_pbi::ArenaStringPtr::InternalSwap(&_impl_.constituent_column_name_, &other->_impl_.constituent_column_name_, arena);
-  ::google::protobuf::internal::memswap<
-      PROTOBUF_FIELD_OFFSET(PartitionedTableDescriptor, _impl_.constituent_changes_permitted_)
-      + sizeof(PartitionedTableDescriptor::_impl_.constituent_changes_permitted_)
-      - PROTOBUF_FIELD_OFFSET(PartitionedTableDescriptor, _impl_.unique_keys_)>(
-          reinterpret_cast<char*>(&_impl_.unique_keys_),
-          reinterpret_cast<char*>(&other->_impl_.unique_keys_));
-}
-
-::google::protobuf::Metadata PartitionedTableDescriptor::GetMetadata() const {
-  return ::_pbi::AssignDescriptors(
-      &descriptor_table_deephaven_2fproto_2fpartitionedtable_2eproto_getter, &descriptor_table_deephaven_2fproto_2fpartitionedtable_2eproto_once,
-      file_level_metadata_deephaven_2fproto_2fpartitionedtable_2eproto[4]);
-}
-// @@protoc_insertion_point(namespace_scope)
-}  // namespace grpc
-}  // namespace backplane
-}  // namespace proto
-}  // namespace deephaven
-}  // namespace io
-namespace google {
-namespace protobuf {
-}  // namespace protobuf
-}  // namespace google
-// @@protoc_insertion_point(global_scope)
-#include "google/protobuf/port_undef.inc"
diff --git a/cpp-client/deephaven/dhclient/proto/deephaven/proto/partitionedtable.pb.h b/cpp-client/deephaven/dhclient/proto/deephaven/proto/partitionedtable.pb.h
deleted file mode 100644
index 0a3bdca482d..00000000000
--- a/cpp-client/deephaven/dhclient/proto/deephaven/proto/partitionedtable.pb.h
+++ /dev/null
@@ -1,2206 +0,0 @@
-// Generated by the protocol buffer compiler.  DO NOT EDIT!
-// source: deephaven/proto/partitionedtable.proto
-// Protobuf C++ Version: 4.25.3
-
-#ifndef GOOGLE_PROTOBUF_INCLUDED_deephaven_2fproto_2fpartitionedtable_2eproto_2epb_2eh
-#define GOOGLE_PROTOBUF_INCLUDED_deephaven_2fproto_2fpartitionedtable_2eproto_2epb_2eh
-
-#include <limits>
-#include <string>
-#include <type_traits>
-#include <utility>
-
-#include "google/protobuf/port_def.inc"
-#if PROTOBUF_VERSION < 4025000
-#error "This file was generated by a newer version of protoc which is"
-#error "incompatible with your Protocol Buffer headers. Please update"
-#error "your headers."
-#endif  // PROTOBUF_VERSION
-
-#if 4025003 < PROTOBUF_MIN_PROTOC_VERSION
-#error "This file was generated by an older version of protoc which is"
-#error "incompatible with your Protocol Buffer headers. Please"
-#error "regenerate this file with a newer version of protoc."
-#endif  // PROTOBUF_MIN_PROTOC_VERSION
-#include "google/protobuf/port_undef.inc"
-#include "google/protobuf/io/coded_stream.h"
-#include "google/protobuf/arena.h"
-#include "google/protobuf/arenastring.h"
-#include "google/protobuf/generated_message_bases.h"
-#include "google/protobuf/generated_message_tctable_decl.h"
-#include "google/protobuf/generated_message_util.h"
-#include "google/protobuf/metadata_lite.h"
-#include "google/protobuf/generated_message_reflection.h"
-#include "google/protobuf/message.h"
-#include "google/protobuf/repeated_field.h"  // IWYU pragma: export
-#include "google/protobuf/extension_set.h"  // IWYU pragma: export
-#include "google/protobuf/unknown_field_set.h"
-#include "deephaven/proto/table.pb.h"
-#include "deephaven/proto/ticket.pb.h"
-// @@protoc_insertion_point(includes)
-
-// Must be included last.
-#include "google/protobuf/port_def.inc"
-
-#define PROTOBUF_INTERNAL_EXPORT_deephaven_2fproto_2fpartitionedtable_2eproto
-
-namespace google {
-namespace protobuf {
-namespace internal {
-class AnyMetadata;
-}  // namespace internal
-}  // namespace protobuf
-}  // namespace google
-
-// Internal implementation detail -- do not use these members.
-struct TableStruct_deephaven_2fproto_2fpartitionedtable_2eproto {
-  static const ::uint32_t offsets[];
-};
-extern const ::google::protobuf::internal::DescriptorTable
-    descriptor_table_deephaven_2fproto_2fpartitionedtable_2eproto;
-namespace io {
-namespace deephaven {
-namespace proto {
-namespace backplane {
-namespace grpc {
-class GetTableRequest;
-struct GetTableRequestDefaultTypeInternal;
-extern GetTableRequestDefaultTypeInternal _GetTableRequest_default_instance_;
-class MergeRequest;
-struct MergeRequestDefaultTypeInternal;
-extern MergeRequestDefaultTypeInternal _MergeRequest_default_instance_;
-class PartitionByRequest;
-struct PartitionByRequestDefaultTypeInternal;
-extern PartitionByRequestDefaultTypeInternal _PartitionByRequest_default_instance_;
-class PartitionByResponse;
-struct PartitionByResponseDefaultTypeInternal;
-extern PartitionByResponseDefaultTypeInternal _PartitionByResponse_default_instance_;
-class PartitionedTableDescriptor;
-struct PartitionedTableDescriptorDefaultTypeInternal;
-extern PartitionedTableDescriptorDefaultTypeInternal _PartitionedTableDescriptor_default_instance_;
-}  // namespace grpc
-}  // namespace backplane
-}  // namespace proto
-}  // namespace deephaven
-}  // namespace io
-namespace google {
-namespace protobuf {
-}  // namespace protobuf
-}  // namespace google
-
-namespace io {
-namespace deephaven {
-namespace proto {
-namespace backplane {
-namespace grpc {
-
-// ===================================================================
-
-
-// -------------------------------------------------------------------
-
-class PartitionedTableDescriptor final :
-    public ::google::protobuf::Message /* @@protoc_insertion_point(class_definition:io.deephaven.proto.backplane.grpc.PartitionedTableDescriptor) */ {
- public:
-  inline PartitionedTableDescriptor() : PartitionedTableDescriptor(nullptr) {}
-  ~PartitionedTableDescriptor() override;
-  template<typename = void>
-  explicit PROTOBUF_CONSTEXPR PartitionedTableDescriptor(::google::protobuf::internal::ConstantInitialized);
-
-  inline PartitionedTableDescriptor(const PartitionedTableDescriptor& from)
-      : PartitionedTableDescriptor(nullptr, from) {}
-  PartitionedTableDescriptor(PartitionedTableDescriptor&& from) noexcept
-    : PartitionedTableDescriptor() {
-    *this = ::std::move(from);
-  }
-
-  inline PartitionedTableDescriptor& operator=(const PartitionedTableDescriptor& from) {
-    CopyFrom(from);
-    return *this;
-  }
-  inline PartitionedTableDescriptor& operator=(PartitionedTableDescriptor&& from) noexcept {
-    if (this == &from) return *this;
-    if (GetArena() == from.GetArena()
-  #ifdef PROTOBUF_FORCE_COPY_IN_MOVE
-        && GetArena() != nullptr
-  #endif  // !PROTOBUF_FORCE_COPY_IN_MOVE
-    ) {
-      InternalSwap(&from);
-    } else {
-      CopyFrom(from);
-    }
-    return *this;
-  }
-
-  inline const ::google::protobuf::UnknownFieldSet& unknown_fields() const
-      ABSL_ATTRIBUTE_LIFETIME_BOUND {
-    return _internal_metadata_.unknown_fields<::google::protobuf::UnknownFieldSet>(::google::protobuf::UnknownFieldSet::default_instance);
-  }
-  inline ::google::protobuf::UnknownFieldSet* mutable_unknown_fields()
-      ABSL_ATTRIBUTE_LIFETIME_BOUND {
-    return _internal_metadata_.mutable_unknown_fields<::google::protobuf::UnknownFieldSet>();
-  }
-
-  static const ::google::protobuf::Descriptor* descriptor() {
-    return GetDescriptor();
-  }
-  static const ::google::protobuf::Descriptor* GetDescriptor() {
-    return default_instance().GetMetadata().descriptor;
-  }
-  static const ::google::protobuf::Reflection* GetReflection() {
-    return default_instance().GetMetadata().reflection;
-  }
-  static const PartitionedTableDescriptor& default_instance() {
-    return *internal_default_instance();
-  }
-  static inline const PartitionedTableDescriptor* internal_default_instance() {
-    return reinterpret_cast<const PartitionedTableDescriptor*>(
-               &_PartitionedTableDescriptor_default_instance_);
-  }
-  static constexpr int kIndexInFileMessages =
-    4;
-
-  friend void swap(PartitionedTableDescriptor& a, PartitionedTableDescriptor& b) {
-    a.Swap(&b);
-  }
-  inline void Swap(PartitionedTableDescriptor* other) {
-    if (other == this) return;
-  #ifdef PROTOBUF_FORCE_COPY_IN_SWAP
-    if (GetArena() != nullptr &&
-        GetArena() == other->GetArena()) {
-   #else  // PROTOBUF_FORCE_COPY_IN_SWAP
-    if (GetArena() == other->GetArena()) {
-  #endif  // !PROTOBUF_FORCE_COPY_IN_SWAP
-      InternalSwap(other);
-    } else {
-      ::google::protobuf::internal::GenericSwap(this, other);
-    }
-  }
-  void UnsafeArenaSwap(PartitionedTableDescriptor* other) {
-    if (other == this) return;
-    ABSL_DCHECK(GetArena() == other->GetArena());
-    InternalSwap(other);
-  }
-
-  // implements Message ----------------------------------------------
-
-  PartitionedTableDescriptor* New(::google::protobuf::Arena* arena = nullptr) const final {
-    return CreateMaybeMessage<PartitionedTableDescriptor>(arena);
-  }
-  using ::google::protobuf::Message::CopyFrom;
-  void CopyFrom(const PartitionedTableDescriptor& from);
-  using ::google::protobuf::Message::MergeFrom;
-  void MergeFrom( const PartitionedTableDescriptor& from) {
-    PartitionedTableDescriptor::MergeImpl(*this, from);
-  }
-  private:
-  static void MergeImpl(::google::protobuf::Message& to_msg, const ::google::protobuf::Message& from_msg);
-  public:
-  PROTOBUF_ATTRIBUTE_REINITIALIZES void Clear() final;
-  bool IsInitialized() const final;
-
-  ::size_t ByteSizeLong() const final;
-  const char* _InternalParse(const char* ptr, ::google::protobuf::internal::ParseContext* ctx) final;
-  ::uint8_t* _InternalSerialize(
-      ::uint8_t* target, ::google::protobuf::io::EpsCopyOutputStream* stream) const final;
-  int GetCachedSize() const { return _impl_._cached_size_.Get(); }
-
-  private:
-  ::google::protobuf::internal::CachedSize* AccessCachedSize() const final;
-  void SharedCtor(::google::protobuf::Arena* arena);
-  void SharedDtor();
-  void InternalSwap(PartitionedTableDescriptor* other);
-
-  private:
-  friend class ::google::protobuf::internal::AnyMetadata;
-  static ::absl::string_view FullMessageName() {
-    return "io.deephaven.proto.backplane.grpc.PartitionedTableDescriptor";
-  }
-  protected:
-  explicit PartitionedTableDescriptor(::google::protobuf::Arena* arena);
-  PartitionedTableDescriptor(::google::protobuf::Arena* arena, const PartitionedTableDescriptor& from);
-  public:
-
-  static const ClassData _class_data_;
-  const ::google::protobuf::Message::ClassData*GetClassData() const final;
-
-  ::google::protobuf::Metadata GetMetadata() const final;
-
-  // nested types ----------------------------------------------------
-
-  // accessors -------------------------------------------------------
-
-  enum : int {
-    kKeyColumnNamesFieldNumber = 1,
-    kConstituentDefinitionSchemaFieldNumber = 3,
-    kConstituentColumnNameFieldNumber = 4,
-    kUniqueKeysFieldNumber = 2,
-    kConstituentChangesPermittedFieldNumber = 5,
-  };
-  // repeated string key_column_names = 1;
-  int key_column_names_size() const;
-  private:
-  int _internal_key_column_names_size() const;
-
-  public:
-  void clear_key_column_names() ;
-  const std::string& key_column_names(int index) const;
-  std::string* mutable_key_column_names(int index);
-  void set_key_column_names(int index, const std::string& value);
-  void set_key_column_names(int index, std::string&& value);
-  void set_key_column_names(int index, const char* value);
-  void set_key_column_names(int index, const char* value, std::size_t size);
-  void set_key_column_names(int index, absl::string_view value);
-  std::string* add_key_column_names();
-  void add_key_column_names(const std::string& value);
-  void add_key_column_names(std::string&& value);
-  void add_key_column_names(const char* value);
-  void add_key_column_names(const char* value, std::size_t size);
-  void add_key_column_names(absl::string_view value);
-  const ::google::protobuf::RepeatedPtrField<std::string>& key_column_names() const;
-  ::google::protobuf::RepeatedPtrField<std::string>* mutable_key_column_names();
-
-  private:
-  const ::google::protobuf::RepeatedPtrField<std::string>& _internal_key_column_names() const;
-  ::google::protobuf::RepeatedPtrField<std::string>* _internal_mutable_key_column_names();
-
-  public:
-  // bytes constituent_definition_schema = 3;
-  void clear_constituent_definition_schema() ;
-  const std::string& constituent_definition_schema() const;
-  template <typename Arg_ = const std::string&, typename... Args_>
-  void set_constituent_definition_schema(Arg_&& arg, Args_... args);
-  std::string* mutable_constituent_definition_schema();
-  PROTOBUF_NODISCARD std::string* release_constituent_definition_schema();
-  void set_allocated_constituent_definition_schema(std::string* value);
-
-  private:
-  const std::string& _internal_constituent_definition_schema() const;
-  inline PROTOBUF_ALWAYS_INLINE void _internal_set_constituent_definition_schema(
-      const std::string& value);
-  std::string* _internal_mutable_constituent_definition_schema();
-
-  public:
-  // string constituent_column_name = 4;
-  void clear_constituent_column_name() ;
-  const std::string& constituent_column_name() const;
-  template <typename Arg_ = const std::string&, typename... Args_>
-  void set_constituent_column_name(Arg_&& arg, Args_... args);
-  std::string* mutable_constituent_column_name();
-  PROTOBUF_NODISCARD std::string* release_constituent_column_name();
-  void set_allocated_constituent_column_name(std::string* value);
-
-  private:
-  const std::string& _internal_constituent_column_name() const;
-  inline PROTOBUF_ALWAYS_INLINE void _internal_set_constituent_column_name(
-      const std::string& value);
-  std::string* _internal_mutable_constituent_column_name();
-
-  public:
-  // bool unique_keys = 2;
-  void clear_unique_keys() ;
-  bool unique_keys() const;
-  void set_unique_keys(bool value);
-
-  private:
-  bool _internal_unique_keys() const;
-  void _internal_set_unique_keys(bool value);
-
-  public:
-  // bool constituent_changes_permitted = 5;
-  void clear_constituent_changes_permitted() ;
-  bool constituent_changes_permitted() const;
-  void set_constituent_changes_permitted(bool value);
-
-  private:
-  bool _internal_constituent_changes_permitted() const;
-  void _internal_set_constituent_changes_permitted(bool value);
-
-  public:
-  // @@protoc_insertion_point(class_scope:io.deephaven.proto.backplane.grpc.PartitionedTableDescriptor)
- private:
-  class _Internal;
-
-  friend class ::google::protobuf::internal::TcParser;
-  static const ::google::protobuf::internal::TcParseTable<
-      3, 5, 0,
-      108, 2>
-      _table_;
-  friend class ::google::protobuf::MessageLite;
-  friend class ::google::protobuf::Arena;
-  template <typename T>
-  friend class ::google::protobuf::Arena::InternalHelper;
-  using InternalArenaConstructable_ = void;
-  using DestructorSkippable_ = void;
-  struct Impl_ {
-
-        inline explicit constexpr Impl_(
-            ::google::protobuf::internal::ConstantInitialized) noexcept;
-        inline explicit Impl_(::google::protobuf::internal::InternalVisibility visibility,
-                              ::google::protobuf::Arena* arena);
-        inline explicit Impl_(::google::protobuf::internal::InternalVisibility visibility,
-                              ::google::protobuf::Arena* arena, const Impl_& from);
-    ::google::protobuf::RepeatedPtrField<std::string> key_column_names_;
-    ::google::protobuf::internal::ArenaStringPtr constituent_definition_schema_;
-    ::google::protobuf::internal::ArenaStringPtr constituent_column_name_;
-    bool unique_keys_;
-    bool constituent_changes_permitted_;
-    mutable ::google::protobuf::internal::CachedSize _cached_size_;
-    PROTOBUF_TSAN_DECLARE_MEMBER
-  };
-  union { Impl_ _impl_; };
-  friend struct ::TableStruct_deephaven_2fproto_2fpartitionedtable_2eproto;
-};// -------------------------------------------------------------------
-
-class PartitionByResponse final :
-    public ::google::protobuf::internal::ZeroFieldsBase /* @@protoc_insertion_point(class_definition:io.deephaven.proto.backplane.grpc.PartitionByResponse) */ {
- public:
-  inline PartitionByResponse() : PartitionByResponse(nullptr) {}
-  template<typename = void>
-  explicit PROTOBUF_CONSTEXPR PartitionByResponse(::google::protobuf::internal::ConstantInitialized);
-
-  inline PartitionByResponse(const PartitionByResponse& from)
-      : PartitionByResponse(nullptr, from) {}
-  PartitionByResponse(PartitionByResponse&& from) noexcept
-    : PartitionByResponse() {
-    *this = ::std::move(from);
-  }
-
-  inline PartitionByResponse& operator=(const PartitionByResponse& from) {
-    CopyFrom(from);
-    return *this;
-  }
-  inline PartitionByResponse& operator=(PartitionByResponse&& from) noexcept {
-    if (this == &from) return *this;
-    if (GetArena() == from.GetArena()
-  #ifdef PROTOBUF_FORCE_COPY_IN_MOVE
-        && GetArena() != nullptr
-  #endif  // !PROTOBUF_FORCE_COPY_IN_MOVE
-    ) {
-      InternalSwap(&from);
-    } else {
-      CopyFrom(from);
-    }
-    return *this;
-  }
-
-  inline const ::google::protobuf::UnknownFieldSet& unknown_fields() const
-      ABSL_ATTRIBUTE_LIFETIME_BOUND {
-    return _internal_metadata_.unknown_fields<::google::protobuf::UnknownFieldSet>(::google::protobuf::UnknownFieldSet::default_instance);
-  }
-  inline ::google::protobuf::UnknownFieldSet* mutable_unknown_fields()
-      ABSL_ATTRIBUTE_LIFETIME_BOUND {
-    return _internal_metadata_.mutable_unknown_fields<::google::protobuf::UnknownFieldSet>();
-  }
-
-  static const ::google::protobuf::Descriptor* descriptor() {
-    return GetDescriptor();
-  }
-  static const ::google::protobuf::Descriptor* GetDescriptor() {
-    return default_instance().GetMetadata().descriptor;
-  }
-  static const ::google::protobuf::Reflection* GetReflection() {
-    return default_instance().GetMetadata().reflection;
-  }
-  static const PartitionByResponse& default_instance() {
-    return *internal_default_instance();
-  }
-  static inline const PartitionByResponse* internal_default_instance() {
-    return reinterpret_cast<const PartitionByResponse*>(
-               &_PartitionByResponse_default_instance_);
-  }
-  static constexpr int kIndexInFileMessages =
-    1;
-
-  friend void swap(PartitionByResponse& a, PartitionByResponse& b) {
-    a.Swap(&b);
-  }
-  inline void Swap(PartitionByResponse* other) {
-    if (other == this) return;
-  #ifdef PROTOBUF_FORCE_COPY_IN_SWAP
-    if (GetArena() != nullptr &&
-        GetArena() == other->GetArena()) {
-   #else  // PROTOBUF_FORCE_COPY_IN_SWAP
-    if (GetArena() == other->GetArena()) {
-  #endif  // !PROTOBUF_FORCE_COPY_IN_SWAP
-      InternalSwap(other);
-    } else {
-      ::google::protobuf::internal::GenericSwap(this, other);
-    }
-  }
-  void UnsafeArenaSwap(PartitionByResponse* other) {
-    if (other == this) return;
-    ABSL_DCHECK(GetArena() == other->GetArena());
-    InternalSwap(other);
-  }
-
-  // implements Message ----------------------------------------------
-
-  PartitionByResponse* New(::google::protobuf::Arena* arena = nullptr) const final {
-    return CreateMaybeMessage<PartitionByResponse>(arena);
-  }
-  using ::google::protobuf::internal::ZeroFieldsBase::CopyFrom;
-  inline void CopyFrom(const PartitionByResponse& from) {
-    ::google::protobuf::internal::ZeroFieldsBase::CopyImpl(*this, from);
-  }
-  using ::google::protobuf::internal::ZeroFieldsBase::MergeFrom;
-  void MergeFrom(const PartitionByResponse& from) {
-    ::google::protobuf::internal::ZeroFieldsBase::MergeImpl(*this, from);
-  }
-  public:
-
-  private:
-  friend class ::google::protobuf::internal::AnyMetadata;
-  static ::absl::string_view FullMessageName() {
-    return "io.deephaven.proto.backplane.grpc.PartitionByResponse";
-  }
-  protected:
-  explicit PartitionByResponse(::google::protobuf::Arena* arena);
-  PartitionByResponse(::google::protobuf::Arena* arena, const PartitionByResponse& from);
-  public:
-
-  ::google::protobuf::Metadata GetMetadata() const final;
-
-  // nested types ----------------------------------------------------
-
-  // accessors -------------------------------------------------------
-
-  // @@protoc_insertion_point(class_scope:io.deephaven.proto.backplane.grpc.PartitionByResponse)
- private:
-  class _Internal;
-
-  friend class ::google::protobuf::MessageLite;
-  friend class ::google::protobuf::Arena;
-  template <typename T>
-  friend class ::google::protobuf::Arena::InternalHelper;
-  using InternalArenaConstructable_ = void;
-  using DestructorSkippable_ = void;
-  struct Impl_ {
-
-        inline explicit constexpr Impl_(
-            ::google::protobuf::internal::ConstantInitialized) noexcept;
-        inline explicit Impl_(::google::protobuf::internal::InternalVisibility visibility,
-                              ::google::protobuf::Arena* arena);
-        inline explicit Impl_(::google::protobuf::internal::InternalVisibility visibility,
-                              ::google::protobuf::Arena* arena, const Impl_& from);
-    PROTOBUF_TSAN_DECLARE_MEMBER
-  };
-  friend struct ::TableStruct_deephaven_2fproto_2fpartitionedtable_2eproto;
-};// -------------------------------------------------------------------
-
-class PartitionByRequest final :
-    public ::google::protobuf::Message /* @@protoc_insertion_point(class_definition:io.deephaven.proto.backplane.grpc.PartitionByRequest) */ {
- public:
-  inline PartitionByRequest() : PartitionByRequest(nullptr) {}
-  ~PartitionByRequest() override;
-  template<typename = void>
-  explicit PROTOBUF_CONSTEXPR PartitionByRequest(::google::protobuf::internal::ConstantInitialized);
-
-  inline PartitionByRequest(const PartitionByRequest& from)
-      : PartitionByRequest(nullptr, from) {}
-  PartitionByRequest(PartitionByRequest&& from) noexcept
-    : PartitionByRequest() {
-    *this = ::std::move(from);
-  }
-
-  inline PartitionByRequest& operator=(const PartitionByRequest& from) {
-    CopyFrom(from);
-    return *this;
-  }
-  inline PartitionByRequest& operator=(PartitionByRequest&& from) noexcept {
-    if (this == &from) return *this;
-    if (GetArena() == from.GetArena()
-  #ifdef PROTOBUF_FORCE_COPY_IN_MOVE
-        && GetArena() != nullptr
-  #endif  // !PROTOBUF_FORCE_COPY_IN_MOVE
-    ) {
-      InternalSwap(&from);
-    } else {
-      CopyFrom(from);
-    }
-    return *this;
-  }
-
-  inline const ::google::protobuf::UnknownFieldSet& unknown_fields() const
-      ABSL_ATTRIBUTE_LIFETIME_BOUND {
-    return _internal_metadata_.unknown_fields<::google::protobuf::UnknownFieldSet>(::google::protobuf::UnknownFieldSet::default_instance);
-  }
-  inline ::google::protobuf::UnknownFieldSet* mutable_unknown_fields()
-      ABSL_ATTRIBUTE_LIFETIME_BOUND {
-    return _internal_metadata_.mutable_unknown_fields<::google::protobuf::UnknownFieldSet>();
-  }
-
-  static const ::google::protobuf::Descriptor* descriptor() {
-    return GetDescriptor();
-  }
-  static const ::google::protobuf::Descriptor* GetDescriptor() {
-    return default_instance().GetMetadata().descriptor;
-  }
-  static const ::google::protobuf::Reflection* GetReflection() {
-    return default_instance().GetMetadata().reflection;
-  }
-  static const PartitionByRequest& default_instance() {
-    return *internal_default_instance();
-  }
-  static inline const PartitionByRequest* internal_default_instance() {
-    return reinterpret_cast<const PartitionByRequest*>(
-               &_PartitionByRequest_default_instance_);
-  }
-  static constexpr int kIndexInFileMessages =
-    0;
-
-  friend void swap(PartitionByRequest& a, PartitionByRequest& b) {
-    a.Swap(&b);
-  }
-  inline void Swap(PartitionByRequest* other) {
-    if (other == this) return;
-  #ifdef PROTOBUF_FORCE_COPY_IN_SWAP
-    if (GetArena() != nullptr &&
-        GetArena() == other->GetArena()) {
-   #else  // PROTOBUF_FORCE_COPY_IN_SWAP
-    if (GetArena() == other->GetArena()) {
-  #endif  // !PROTOBUF_FORCE_COPY_IN_SWAP
-      InternalSwap(other);
-    } else {
-      ::google::protobuf::internal::GenericSwap(this, other);
-    }
-  }
-  void UnsafeArenaSwap(PartitionByRequest* other) {
-    if (other == this) return;
-    ABSL_DCHECK(GetArena() == other->GetArena());
-    InternalSwap(other);
-  }
-
-  // implements Message ----------------------------------------------
-
-  PartitionByRequest* New(::google::protobuf::Arena* arena = nullptr) const final {
-    return CreateMaybeMessage<PartitionByRequest>(arena);
-  }
-  using ::google::protobuf::Message::CopyFrom;
-  void CopyFrom(const PartitionByRequest& from);
-  using ::google::protobuf::Message::MergeFrom;
-  void MergeFrom( const PartitionByRequest& from) {
-    PartitionByRequest::MergeImpl(*this, from);
-  }
-  private:
-  static void MergeImpl(::google::protobuf::Message& to_msg, const ::google::protobuf::Message& from_msg);
-  public:
-  PROTOBUF_ATTRIBUTE_REINITIALIZES void Clear() final;
-  bool IsInitialized() const final;
-
-  ::size_t ByteSizeLong() const final;
-  const char* _InternalParse(const char* ptr, ::google::protobuf::internal::ParseContext* ctx) final;
-  ::uint8_t* _InternalSerialize(
-      ::uint8_t* target, ::google::protobuf::io::EpsCopyOutputStream* stream) const final;
-  int GetCachedSize() const { return _impl_._cached_size_.Get(); }
-
-  private:
-  ::google::protobuf::internal::CachedSize* AccessCachedSize() const final;
-  void SharedCtor(::google::protobuf::Arena* arena);
-  void SharedDtor();
-  void InternalSwap(PartitionByRequest* other);
-
-  private:
-  friend class ::google::protobuf::internal::AnyMetadata;
-  static ::absl::string_view FullMessageName() {
-    return "io.deephaven.proto.backplane.grpc.PartitionByRequest";
-  }
-  protected:
-  explicit PartitionByRequest(::google::protobuf::Arena* arena);
-  PartitionByRequest(::google::protobuf::Arena* arena, const PartitionByRequest& from);
-  public:
-
-  static const ClassData _class_data_;
-  const ::google::protobuf::Message::ClassData*GetClassData() const final;
-
-  ::google::protobuf::Metadata GetMetadata() const final;
-
-  // nested types ----------------------------------------------------
-
-  // accessors -------------------------------------------------------
-
-  enum : int {
-    kKeyColumnNamesFieldNumber = 3,
-    kTableIdFieldNumber = 1,
-    kResultIdFieldNumber = 2,
-    kDropKeysFieldNumber = 4,
-  };
-  // repeated string key_column_names = 3;
-  int key_column_names_size() const;
-  private:
-  int _internal_key_column_names_size() const;
-
-  public:
-  void clear_key_column_names() ;
-  const std::string& key_column_names(int index) const;
-  std::string* mutable_key_column_names(int index);
-  void set_key_column_names(int index, const std::string& value);
-  void set_key_column_names(int index, std::string&& value);
-  void set_key_column_names(int index, const char* value);
-  void set_key_column_names(int index, const char* value, std::size_t size);
-  void set_key_column_names(int index, absl::string_view value);
-  std::string* add_key_column_names();
-  void add_key_column_names(const std::string& value);
-  void add_key_column_names(std::string&& value);
-  void add_key_column_names(const char* value);
-  void add_key_column_names(const char* value, std::size_t size);
-  void add_key_column_names(absl::string_view value);
-  const ::google::protobuf::RepeatedPtrField<std::string>& key_column_names() const;
-  ::google::protobuf::RepeatedPtrField<std::string>* mutable_key_column_names();
-
-  private:
-  const ::google::protobuf::RepeatedPtrField<std::string>& _internal_key_column_names() const;
-  ::google::protobuf::RepeatedPtrField<std::string>* _internal_mutable_key_column_names();
-
-  public:
-  // .io.deephaven.proto.backplane.grpc.Ticket table_id = 1;
-  bool has_table_id() const;
-  void clear_table_id() ;
-  const ::io::deephaven::proto::backplane::grpc::Ticket& table_id() const;
-  PROTOBUF_NODISCARD ::io::deephaven::proto::backplane::grpc::Ticket* release_table_id();
-  ::io::deephaven::proto::backplane::grpc::Ticket* mutable_table_id();
-  void set_allocated_table_id(::io::deephaven::proto::backplane::grpc::Ticket* value);
-  void unsafe_arena_set_allocated_table_id(::io::deephaven::proto::backplane::grpc::Ticket* value);
-  ::io::deephaven::proto::backplane::grpc::Ticket* unsafe_arena_release_table_id();
-
-  private:
-  const ::io::deephaven::proto::backplane::grpc::Ticket& _internal_table_id() const;
-  ::io::deephaven::proto::backplane::grpc::Ticket* _internal_mutable_table_id();
-
-  public:
-  // .io.deephaven.proto.backplane.grpc.Ticket result_id = 2;
-  bool has_result_id() const;
-  void clear_result_id() ;
-  const ::io::deephaven::proto::backplane::grpc::Ticket& result_id() const;
-  PROTOBUF_NODISCARD ::io::deephaven::proto::backplane::grpc::Ticket* release_result_id();
-  ::io::deephaven::proto::backplane::grpc::Ticket* mutable_result_id();
-  void set_allocated_result_id(::io::deephaven::proto::backplane::grpc::Ticket* value);
-  void unsafe_arena_set_allocated_result_id(::io::deephaven::proto::backplane::grpc::Ticket* value);
-  ::io::deephaven::proto::backplane::grpc::Ticket* unsafe_arena_release_result_id();
-
-  private:
-  const ::io::deephaven::proto::backplane::grpc::Ticket& _internal_result_id() const;
-  ::io::deephaven::proto::backplane::grpc::Ticket* _internal_mutable_result_id();
-
-  public:
-  // bool drop_keys = 4;
-  void clear_drop_keys() ;
-  bool drop_keys() const;
-  void set_drop_keys(bool value);
-
-  private:
-  bool _internal_drop_keys() const;
-  void _internal_set_drop_keys(bool value);
-
-  public:
-  // @@protoc_insertion_point(class_scope:io.deephaven.proto.backplane.grpc.PartitionByRequest)
- private:
-  class _Internal;
-
-  friend class ::google::protobuf::internal::TcParser;
-  static const ::google::protobuf::internal::TcParseTable<
-      2, 4, 2,
-      77, 2>
-      _table_;
-  friend class ::google::protobuf::MessageLite;
-  friend class ::google::protobuf::Arena;
-  template <typename T>
-  friend class ::google::protobuf::Arena::InternalHelper;
-  using InternalArenaConstructable_ = void;
-  using DestructorSkippable_ = void;
-  struct Impl_ {
-
-        inline explicit constexpr Impl_(
-            ::google::protobuf::internal::ConstantInitialized) noexcept;
-        inline explicit Impl_(::google::protobuf::internal::InternalVisibility visibility,
-                              ::google::protobuf::Arena* arena);
-        inline explicit Impl_(::google::protobuf::internal::InternalVisibility visibility,
-                              ::google::protobuf::Arena* arena, const Impl_& from);
-    ::google::protobuf::internal::HasBits<1> _has_bits_;
-    mutable ::google::protobuf::internal::CachedSize _cached_size_;
-    ::google::protobuf::RepeatedPtrField<std::string> key_column_names_;
-    ::io::deephaven::proto::backplane::grpc::Ticket* table_id_;
-    ::io::deephaven::proto::backplane::grpc::Ticket* result_id_;
-    bool drop_keys_;
-    PROTOBUF_TSAN_DECLARE_MEMBER
-  };
-  union { Impl_ _impl_; };
-  friend struct ::TableStruct_deephaven_2fproto_2fpartitionedtable_2eproto;
-};// -------------------------------------------------------------------
-
-class MergeRequest final :
-    public ::google::protobuf::Message /* @@protoc_insertion_point(class_definition:io.deephaven.proto.backplane.grpc.MergeRequest) */ {
- public:
-  inline MergeRequest() : MergeRequest(nullptr) {}
-  ~MergeRequest() override;
-  template<typename = void>
-  explicit PROTOBUF_CONSTEXPR MergeRequest(::google::protobuf::internal::ConstantInitialized);
-
-  inline MergeRequest(const MergeRequest& from)
-      : MergeRequest(nullptr, from) {}
-  MergeRequest(MergeRequest&& from) noexcept
-    : MergeRequest() {
-    *this = ::std::move(from);
-  }
-
-  inline MergeRequest& operator=(const MergeRequest& from) {
-    CopyFrom(from);
-    return *this;
-  }
-  inline MergeRequest& operator=(MergeRequest&& from) noexcept {
-    if (this == &from) return *this;
-    if (GetArena() == from.GetArena()
-  #ifdef PROTOBUF_FORCE_COPY_IN_MOVE
-        && GetArena() != nullptr
-  #endif  // !PROTOBUF_FORCE_COPY_IN_MOVE
-    ) {
-      InternalSwap(&from);
-    } else {
-      CopyFrom(from);
-    }
-    return *this;
-  }
-
-  inline const ::google::protobuf::UnknownFieldSet& unknown_fields() const
-      ABSL_ATTRIBUTE_LIFETIME_BOUND {
-    return _internal_metadata_.unknown_fields<::google::protobuf::UnknownFieldSet>(::google::protobuf::UnknownFieldSet::default_instance);
-  }
-  inline ::google::protobuf::UnknownFieldSet* mutable_unknown_fields()
-      ABSL_ATTRIBUTE_LIFETIME_BOUND {
-    return _internal_metadata_.mutable_unknown_fields<::google::protobuf::UnknownFieldSet>();
-  }
-
-  static const ::google::protobuf::Descriptor* descriptor() {
-    return GetDescriptor();
-  }
-  static const ::google::protobuf::Descriptor* GetDescriptor() {
-    return default_instance().GetMetadata().descriptor;
-  }
-  static const ::google::protobuf::Reflection* GetReflection() {
-    return default_instance().GetMetadata().reflection;
-  }
-  static const MergeRequest& default_instance() {
-    return *internal_default_instance();
-  }
-  static inline const MergeRequest* internal_default_instance() {
-    return reinterpret_cast<const MergeRequest*>(
-               &_MergeRequest_default_instance_);
-  }
-  static constexpr int kIndexInFileMessages =
-    2;
-
-  friend void swap(MergeRequest& a, MergeRequest& b) {
-    a.Swap(&b);
-  }
-  inline void Swap(MergeRequest* other) {
-    if (other == this) return;
-  #ifdef PROTOBUF_FORCE_COPY_IN_SWAP
-    if (GetArena() != nullptr &&
-        GetArena() == other->GetArena()) {
-   #else  // PROTOBUF_FORCE_COPY_IN_SWAP
-    if (GetArena() == other->GetArena()) {
-  #endif  // !PROTOBUF_FORCE_COPY_IN_SWAP
-      InternalSwap(other);
-    } else {
-      ::google::protobuf::internal::GenericSwap(this, other);
-    }
-  }
-  void UnsafeArenaSwap(MergeRequest* other) {
-    if (other == this) return;
-    ABSL_DCHECK(GetArena() == other->GetArena());
-    InternalSwap(other);
-  }
-
-  // implements Message ----------------------------------------------
-
-  MergeRequest* New(::google::protobuf::Arena* arena = nullptr) const final {
-    return CreateMaybeMessage<MergeRequest>(arena);
-  }
-  using ::google::protobuf::Message::CopyFrom;
-  void CopyFrom(const MergeRequest& from);
-  using ::google::protobuf::Message::MergeFrom;
-  void MergeFrom( const MergeRequest& from) {
-    MergeRequest::MergeImpl(*this, from);
-  }
-  private:
-  static void MergeImpl(::google::protobuf::Message& to_msg, const ::google::protobuf::Message& from_msg);
-  public:
-  PROTOBUF_ATTRIBUTE_REINITIALIZES void Clear() final;
-  bool IsInitialized() const final;
-
-  ::size_t ByteSizeLong() const final;
-  const char* _InternalParse(const char* ptr, ::google::protobuf::internal::ParseContext* ctx) final;
-  ::uint8_t* _InternalSerialize(
-      ::uint8_t* target, ::google::protobuf::io::EpsCopyOutputStream* stream) const final;
-  int GetCachedSize() const { return _impl_._cached_size_.Get(); }
-
-  private:
-  ::google::protobuf::internal::CachedSize* AccessCachedSize() const final;
-  void SharedCtor(::google::protobuf::Arena* arena);
-  void SharedDtor();
-  void InternalSwap(MergeRequest* other);
-
-  private:
-  friend class ::google::protobuf::internal::AnyMetadata;
-  static ::absl::string_view FullMessageName() {
-    return "io.deephaven.proto.backplane.grpc.MergeRequest";
-  }
-  protected:
-  explicit MergeRequest(::google::protobuf::Arena* arena);
-  MergeRequest(::google::protobuf::Arena* arena, const MergeRequest& from);
-  public:
-
-  static const ClassData _class_data_;
-  const ::google::protobuf::Message::ClassData*GetClassData() const final;
-
-  ::google::protobuf::Metadata GetMetadata() const final;
-
-  // nested types ----------------------------------------------------
-
-  // accessors -------------------------------------------------------
-
-  enum : int {
-    kPartitionedTableFieldNumber = 1,
-    kResultIdFieldNumber = 2,
-  };
-  // .io.deephaven.proto.backplane.grpc.Ticket partitioned_table = 1;
-  bool has_partitioned_table() const;
-  void clear_partitioned_table() ;
-  const ::io::deephaven::proto::backplane::grpc::Ticket& partitioned_table() const;
-  PROTOBUF_NODISCARD ::io::deephaven::proto::backplane::grpc::Ticket* release_partitioned_table();
-  ::io::deephaven::proto::backplane::grpc::Ticket* mutable_partitioned_table();
-  void set_allocated_partitioned_table(::io::deephaven::proto::backplane::grpc::Ticket* value);
-  void unsafe_arena_set_allocated_partitioned_table(::io::deephaven::proto::backplane::grpc::Ticket* value);
-  ::io::deephaven::proto::backplane::grpc::Ticket* unsafe_arena_release_partitioned_table();
-
-  private:
-  const ::io::deephaven::proto::backplane::grpc::Ticket& _internal_partitioned_table() const;
-  ::io::deephaven::proto::backplane::grpc::Ticket* _internal_mutable_partitioned_table();
-
-  public:
-  // .io.deephaven.proto.backplane.grpc.Ticket result_id = 2;
-  bool has_result_id() const;
-  void clear_result_id() ;
-  const ::io::deephaven::proto::backplane::grpc::Ticket& result_id() const;
-  PROTOBUF_NODISCARD ::io::deephaven::proto::backplane::grpc::Ticket* release_result_id();
-  ::io::deephaven::proto::backplane::grpc::Ticket* mutable_result_id();
-  void set_allocated_result_id(::io::deephaven::proto::backplane::grpc::Ticket* value);
-  void unsafe_arena_set_allocated_result_id(::io::deephaven::proto::backplane::grpc::Ticket* value);
-  ::io::deephaven::proto::backplane::grpc::Ticket* unsafe_arena_release_result_id();
-
-  private:
-  const ::io::deephaven::proto::backplane::grpc::Ticket& _internal_result_id() const;
-  ::io::deephaven::proto::backplane::grpc::Ticket* _internal_mutable_result_id();
-
-  public:
-  // @@protoc_insertion_point(class_scope:io.deephaven.proto.backplane.grpc.MergeRequest)
- private:
-  class _Internal;
-
-  friend class ::google::protobuf::internal::TcParser;
-  static const ::google::protobuf::internal::TcParseTable<
-      1, 2, 2,
-      0, 2>
-      _table_;
-  friend class ::google::protobuf::MessageLite;
-  friend class ::google::protobuf::Arena;
-  template <typename T>
-  friend class ::google::protobuf::Arena::InternalHelper;
-  using InternalArenaConstructable_ = void;
-  using DestructorSkippable_ = void;
-  struct Impl_ {
-
-        inline explicit constexpr Impl_(
-            ::google::protobuf::internal::ConstantInitialized) noexcept;
-        inline explicit Impl_(::google::protobuf::internal::InternalVisibility visibility,
-                              ::google::protobuf::Arena* arena);
-        inline explicit Impl_(::google::protobuf::internal::InternalVisibility visibility,
-                              ::google::protobuf::Arena* arena, const Impl_& from);
-    ::google::protobuf::internal::HasBits<1> _has_bits_;
-    mutable ::google::protobuf::internal::CachedSize _cached_size_;
-    ::io::deephaven::proto::backplane::grpc::Ticket* partitioned_table_;
-    ::io::deephaven::proto::backplane::grpc::Ticket* result_id_;
-    PROTOBUF_TSAN_DECLARE_MEMBER
-  };
-  union { Impl_ _impl_; };
-  friend struct ::TableStruct_deephaven_2fproto_2fpartitionedtable_2eproto;
-};// -------------------------------------------------------------------
-
-class GetTableRequest final :
-    public ::google::protobuf::Message /* @@protoc_insertion_point(class_definition:io.deephaven.proto.backplane.grpc.GetTableRequest) */ {
- public:
-  inline GetTableRequest() : GetTableRequest(nullptr) {}
-  ~GetTableRequest() override;
-  template<typename = void>
-  explicit PROTOBUF_CONSTEXPR GetTableRequest(::google::protobuf::internal::ConstantInitialized);
-
-  inline GetTableRequest(const GetTableRequest& from)
-      : GetTableRequest(nullptr, from) {}
-  GetTableRequest(GetTableRequest&& from) noexcept
-    : GetTableRequest() {
-    *this = ::std::move(from);
-  }
-
-  inline GetTableRequest& operator=(const GetTableRequest& from) {
-    CopyFrom(from);
-    return *this;
-  }
-  inline GetTableRequest& operator=(GetTableRequest&& from) noexcept {
-    if (this == &from) return *this;
-    if (GetArena() == from.GetArena()
-  #ifdef PROTOBUF_FORCE_COPY_IN_MOVE
-        && GetArena() != nullptr
-  #endif  // !PROTOBUF_FORCE_COPY_IN_MOVE
-    ) {
-      InternalSwap(&from);
-    } else {
-      CopyFrom(from);
-    }
-    return *this;
-  }
-
-  inline const ::google::protobuf::UnknownFieldSet& unknown_fields() const
-      ABSL_ATTRIBUTE_LIFETIME_BOUND {
-    return _internal_metadata_.unknown_fields<::google::protobuf::UnknownFieldSet>(::google::protobuf::UnknownFieldSet::default_instance);
-  }
-  inline ::google::protobuf::UnknownFieldSet* mutable_unknown_fields()
-      ABSL_ATTRIBUTE_LIFETIME_BOUND {
-    return _internal_metadata_.mutable_unknown_fields<::google::protobuf::UnknownFieldSet>();
-  }
-
-  static const ::google::protobuf::Descriptor* descriptor() {
-    return GetDescriptor();
-  }
-  static const ::google::protobuf::Descriptor* GetDescriptor() {
-    return default_instance().GetMetadata().descriptor;
-  }
-  static const ::google::protobuf::Reflection* GetReflection() {
-    return default_instance().GetMetadata().reflection;
-  }
-  static const GetTableRequest& default_instance() {
-    return *internal_default_instance();
-  }
-  static inline const GetTableRequest* internal_default_instance() {
-    return reinterpret_cast<const GetTableRequest*>(
-               &_GetTableRequest_default_instance_);
-  }
-  static constexpr int kIndexInFileMessages =
-    3;
-
-  friend void swap(GetTableRequest& a, GetTableRequest& b) {
-    a.Swap(&b);
-  }
-  inline void Swap(GetTableRequest* other) {
-    if (other == this) return;
-  #ifdef PROTOBUF_FORCE_COPY_IN_SWAP
-    if (GetArena() != nullptr &&
-        GetArena() == other->GetArena()) {
-   #else  // PROTOBUF_FORCE_COPY_IN_SWAP
-    if (GetArena() == other->GetArena()) {
-  #endif  // !PROTOBUF_FORCE_COPY_IN_SWAP
-      InternalSwap(other);
-    } else {
-      ::google::protobuf::internal::GenericSwap(this, other);
-    }
-  }
-  void UnsafeArenaSwap(GetTableRequest* other) {
-    if (other == this) return;
-    ABSL_DCHECK(GetArena() == other->GetArena());
-    InternalSwap(other);
-  }
-
-  // implements Message ----------------------------------------------
-
-  GetTableRequest* New(::google::protobuf::Arena* arena = nullptr) const final {
-    return CreateMaybeMessage<GetTableRequest>(arena);
-  }
-  using ::google::protobuf::Message::CopyFrom;
-  void CopyFrom(const GetTableRequest& from);
-  using ::google::protobuf::Message::MergeFrom;
-  void MergeFrom( const GetTableRequest& from) {
-    GetTableRequest::MergeImpl(*this, from);
-  }
-  private:
-  static void MergeImpl(::google::protobuf::Message& to_msg, const ::google::protobuf::Message& from_msg);
-  public:
-  PROTOBUF_ATTRIBUTE_REINITIALIZES void Clear() final;
-  bool IsInitialized() const final;
-
-  ::size_t ByteSizeLong() const final;
-  const char* _InternalParse(const char* ptr, ::google::protobuf::internal::ParseContext* ctx) final;
-  ::uint8_t* _InternalSerialize(
-      ::uint8_t* target, ::google::protobuf::io::EpsCopyOutputStream* stream) const final;
-  int GetCachedSize() const { return _impl_._cached_size_.Get(); }
-
-  private:
-  ::google::protobuf::internal::CachedSize* AccessCachedSize() const final;
-  void SharedCtor(::google::protobuf::Arena* arena);
-  void SharedDtor();
-  void InternalSwap(GetTableRequest* other);
-
-  private:
-  friend class ::google::protobuf::internal::AnyMetadata;
-  static ::absl::string_view FullMessageName() {
-    return "io.deephaven.proto.backplane.grpc.GetTableRequest";
-  }
-  protected:
-  explicit GetTableRequest(::google::protobuf::Arena* arena);
-  GetTableRequest(::google::protobuf::Arena* arena, const GetTableRequest& from);
-  public:
-
-  static const ClassData _class_data_;
-  const ::google::protobuf::Message::ClassData*GetClassData() const final;
-
-  ::google::protobuf::Metadata GetMetadata() const final;
-
-  // nested types ----------------------------------------------------
-
-  // accessors -------------------------------------------------------
-
-  enum : int {
-    kPartitionedTableFieldNumber = 1,
-    kKeyTableTicketFieldNumber = 2,
-    kResultIdFieldNumber = 4,
-  };
-  // .io.deephaven.proto.backplane.grpc.Ticket partitioned_table = 1;
-  bool has_partitioned_table() const;
-  void clear_partitioned_table() ;
-  const ::io::deephaven::proto::backplane::grpc::Ticket& partitioned_table() const;
-  PROTOBUF_NODISCARD ::io::deephaven::proto::backplane::grpc::Ticket* release_partitioned_table();
-  ::io::deephaven::proto::backplane::grpc::Ticket* mutable_partitioned_table();
-  void set_allocated_partitioned_table(::io::deephaven::proto::backplane::grpc::Ticket* value);
-  void unsafe_arena_set_allocated_partitioned_table(::io::deephaven::proto::backplane::grpc::Ticket* value);
-  ::io::deephaven::proto::backplane::grpc::Ticket* unsafe_arena_release_partitioned_table();
-
-  private:
-  const ::io::deephaven::proto::backplane::grpc::Ticket& _internal_partitioned_table() const;
-  ::io::deephaven::proto::backplane::grpc::Ticket* _internal_mutable_partitioned_table();
-
-  public:
-  // .io.deephaven.proto.backplane.grpc.Ticket key_table_ticket = 2;
-  bool has_key_table_ticket() const;
-  void clear_key_table_ticket() ;
-  const ::io::deephaven::proto::backplane::grpc::Ticket& key_table_ticket() const;
-  PROTOBUF_NODISCARD ::io::deephaven::proto::backplane::grpc::Ticket* release_key_table_ticket();
-  ::io::deephaven::proto::backplane::grpc::Ticket* mutable_key_table_ticket();
-  void set_allocated_key_table_ticket(::io::deephaven::proto::backplane::grpc::Ticket* value);
-  void unsafe_arena_set_allocated_key_table_ticket(::io::deephaven::proto::backplane::grpc::Ticket* value);
-  ::io::deephaven::proto::backplane::grpc::Ticket* unsafe_arena_release_key_table_ticket();
-
-  private:
-  const ::io::deephaven::proto::backplane::grpc::Ticket& _internal_key_table_ticket() const;
-  ::io::deephaven::proto::backplane::grpc::Ticket* _internal_mutable_key_table_ticket();
-
-  public:
-  // .io.deephaven.proto.backplane.grpc.Ticket result_id = 4;
-  bool has_result_id() const;
-  void clear_result_id() ;
-  const ::io::deephaven::proto::backplane::grpc::Ticket& result_id() const;
-  PROTOBUF_NODISCARD ::io::deephaven::proto::backplane::grpc::Ticket* release_result_id();
-  ::io::deephaven::proto::backplane::grpc::Ticket* mutable_result_id();
-  void set_allocated_result_id(::io::deephaven::proto::backplane::grpc::Ticket* value);
-  void unsafe_arena_set_allocated_result_id(::io::deephaven::proto::backplane::grpc::Ticket* value);
-  ::io::deephaven::proto::backplane::grpc::Ticket* unsafe_arena_release_result_id();
-
-  private:
-  const ::io::deephaven::proto::backplane::grpc::Ticket& _internal_result_id() const;
-  ::io::deephaven::proto::backplane::grpc::Ticket* _internal_mutable_result_id();
-
-  public:
-  // @@protoc_insertion_point(class_scope:io.deephaven.proto.backplane.grpc.GetTableRequest)
- private:
-  class _Internal;
-
-  friend class ::google::protobuf::internal::TcParser;
-  static const ::google::protobuf::internal::TcParseTable<
-      2, 3, 3,
-      0, 2>
-      _table_;
-  friend class ::google::protobuf::MessageLite;
-  friend class ::google::protobuf::Arena;
-  template <typename T>
-  friend class ::google::protobuf::Arena::InternalHelper;
-  using InternalArenaConstructable_ = void;
-  using DestructorSkippable_ = void;
-  struct Impl_ {
-
-        inline explicit constexpr Impl_(
-            ::google::protobuf::internal::ConstantInitialized) noexcept;
-        inline explicit Impl_(::google::protobuf::internal::InternalVisibility visibility,
-                              ::google::protobuf::Arena* arena);
-        inline explicit Impl_(::google::protobuf::internal::InternalVisibility visibility,
-                              ::google::protobuf::Arena* arena, const Impl_& from);
-    ::google::protobuf::internal::HasBits<1> _has_bits_;
-    mutable ::google::protobuf::internal::CachedSize _cached_size_;
-    ::io::deephaven::proto::backplane::grpc::Ticket* partitioned_table_;
-    ::io::deephaven::proto::backplane::grpc::Ticket* key_table_ticket_;
-    ::io::deephaven::proto::backplane::grpc::Ticket* result_id_;
-    PROTOBUF_TSAN_DECLARE_MEMBER
-  };
-  union { Impl_ _impl_; };
-  friend struct ::TableStruct_deephaven_2fproto_2fpartitionedtable_2eproto;
-};
-
-// ===================================================================
-
-
-
-
-// ===================================================================
-
-
-#ifdef __GNUC__
-#pragma GCC diagnostic push
-#pragma GCC diagnostic ignored "-Wstrict-aliasing"
-#endif  // __GNUC__
-// -------------------------------------------------------------------
-
-// PartitionByRequest
-
-// .io.deephaven.proto.backplane.grpc.Ticket table_id = 1;
-inline bool PartitionByRequest::has_table_id() const {
-  bool value = (_impl_._has_bits_[0] & 0x00000001u) != 0;
-  PROTOBUF_ASSUME(!value || _impl_.table_id_ != nullptr);
-  return value;
-}
-inline const ::io::deephaven::proto::backplane::grpc::Ticket& PartitionByRequest::_internal_table_id() const {
-  PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race);
-  const ::io::deephaven::proto::backplane::grpc::Ticket* p = _impl_.table_id_;
-  return p != nullptr ? *p : reinterpret_cast<const ::io::deephaven::proto::backplane::grpc::Ticket&>(::io::deephaven::proto::backplane::grpc::_Ticket_default_instance_);
-}
-inline const ::io::deephaven::proto::backplane::grpc::Ticket& PartitionByRequest::table_id() const ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  // @@protoc_insertion_point(field_get:io.deephaven.proto.backplane.grpc.PartitionByRequest.table_id)
-  return _internal_table_id();
-}
-inline void PartitionByRequest::unsafe_arena_set_allocated_table_id(::io::deephaven::proto::backplane::grpc::Ticket* value) {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  if (GetArena() == nullptr) {
-    delete reinterpret_cast<::google::protobuf::MessageLite*>(_impl_.table_id_);
-  }
-  _impl_.table_id_ = reinterpret_cast<::io::deephaven::proto::backplane::grpc::Ticket*>(value);
-  if (value != nullptr) {
-    _impl_._has_bits_[0] |= 0x00000001u;
-  } else {
-    _impl_._has_bits_[0] &= ~0x00000001u;
-  }
-  // @@protoc_insertion_point(field_unsafe_arena_set_allocated:io.deephaven.proto.backplane.grpc.PartitionByRequest.table_id)
-}
-inline ::io::deephaven::proto::backplane::grpc::Ticket* PartitionByRequest::release_table_id() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-
-  _impl_._has_bits_[0] &= ~0x00000001u;
-  ::io::deephaven::proto::backplane::grpc::Ticket* released = _impl_.table_id_;
-  _impl_.table_id_ = nullptr;
-#ifdef PROTOBUF_FORCE_COPY_IN_RELEASE
-  auto* old = reinterpret_cast<::google::protobuf::MessageLite*>(released);
-  released = ::google::protobuf::internal::DuplicateIfNonNull(released);
-  if (GetArena() == nullptr) {
-    delete old;
-  }
-#else   // PROTOBUF_FORCE_COPY_IN_RELEASE
-  if (GetArena() != nullptr) {
-    released = ::google::protobuf::internal::DuplicateIfNonNull(released);
-  }
-#endif  // !PROTOBUF_FORCE_COPY_IN_RELEASE
-  return released;
-}
-inline ::io::deephaven::proto::backplane::grpc::Ticket* PartitionByRequest::unsafe_arena_release_table_id() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  // @@protoc_insertion_point(field_release:io.deephaven.proto.backplane.grpc.PartitionByRequest.table_id)
-
-  _impl_._has_bits_[0] &= ~0x00000001u;
-  ::io::deephaven::proto::backplane::grpc::Ticket* temp = _impl_.table_id_;
-  _impl_.table_id_ = nullptr;
-  return temp;
-}
-inline ::io::deephaven::proto::backplane::grpc::Ticket* PartitionByRequest::_internal_mutable_table_id() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  _impl_._has_bits_[0] |= 0x00000001u;
-  if (_impl_.table_id_ == nullptr) {
-    auto* p = CreateMaybeMessage<::io::deephaven::proto::backplane::grpc::Ticket>(GetArena());
-    _impl_.table_id_ = reinterpret_cast<::io::deephaven::proto::backplane::grpc::Ticket*>(p);
-  }
-  return _impl_.table_id_;
-}
-inline ::io::deephaven::proto::backplane::grpc::Ticket* PartitionByRequest::mutable_table_id() ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  ::io::deephaven::proto::backplane::grpc::Ticket* _msg = _internal_mutable_table_id();
-  // @@protoc_insertion_point(field_mutable:io.deephaven.proto.backplane.grpc.PartitionByRequest.table_id)
-  return _msg;
-}
-inline void PartitionByRequest::set_allocated_table_id(::io::deephaven::proto::backplane::grpc::Ticket* value) {
-  ::google::protobuf::Arena* message_arena = GetArena();
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  if (message_arena == nullptr) {
-    delete reinterpret_cast<::google::protobuf::MessageLite*>(_impl_.table_id_);
-  }
-
-  if (value != nullptr) {
-    ::google::protobuf::Arena* submessage_arena = reinterpret_cast<::google::protobuf::MessageLite*>(value)->GetArena();
-    if (message_arena != submessage_arena) {
-      value = ::google::protobuf::internal::GetOwnedMessage(message_arena, value, submessage_arena);
-    }
-    _impl_._has_bits_[0] |= 0x00000001u;
-  } else {
-    _impl_._has_bits_[0] &= ~0x00000001u;
-  }
-
-  _impl_.table_id_ = reinterpret_cast<::io::deephaven::proto::backplane::grpc::Ticket*>(value);
-  // @@protoc_insertion_point(field_set_allocated:io.deephaven.proto.backplane.grpc.PartitionByRequest.table_id)
-}
-
-// .io.deephaven.proto.backplane.grpc.Ticket result_id = 2;
-inline bool PartitionByRequest::has_result_id() const {
-  bool value = (_impl_._has_bits_[0] & 0x00000002u) != 0;
-  PROTOBUF_ASSUME(!value || _impl_.result_id_ != nullptr);
-  return value;
-}
-inline const ::io::deephaven::proto::backplane::grpc::Ticket& PartitionByRequest::_internal_result_id() const {
-  PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race);
-  const ::io::deephaven::proto::backplane::grpc::Ticket* p = _impl_.result_id_;
-  return p != nullptr ? *p : reinterpret_cast<const ::io::deephaven::proto::backplane::grpc::Ticket&>(::io::deephaven::proto::backplane::grpc::_Ticket_default_instance_);
-}
-inline const ::io::deephaven::proto::backplane::grpc::Ticket& PartitionByRequest::result_id() const ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  // @@protoc_insertion_point(field_get:io.deephaven.proto.backplane.grpc.PartitionByRequest.result_id)
-  return _internal_result_id();
-}
-inline void PartitionByRequest::unsafe_arena_set_allocated_result_id(::io::deephaven::proto::backplane::grpc::Ticket* value) {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  if (GetArena() == nullptr) {
-    delete reinterpret_cast<::google::protobuf::MessageLite*>(_impl_.result_id_);
-  }
-  _impl_.result_id_ = reinterpret_cast<::io::deephaven::proto::backplane::grpc::Ticket*>(value);
-  if (value != nullptr) {
-    _impl_._has_bits_[0] |= 0x00000002u;
-  } else {
-    _impl_._has_bits_[0] &= ~0x00000002u;
-  }
-  // @@protoc_insertion_point(field_unsafe_arena_set_allocated:io.deephaven.proto.backplane.grpc.PartitionByRequest.result_id)
-}
-inline ::io::deephaven::proto::backplane::grpc::Ticket* PartitionByRequest::release_result_id() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-
-  _impl_._has_bits_[0] &= ~0x00000002u;
-  ::io::deephaven::proto::backplane::grpc::Ticket* released = _impl_.result_id_;
-  _impl_.result_id_ = nullptr;
-#ifdef PROTOBUF_FORCE_COPY_IN_RELEASE
-  auto* old = reinterpret_cast<::google::protobuf::MessageLite*>(released);
-  released = ::google::protobuf::internal::DuplicateIfNonNull(released);
-  if (GetArena() == nullptr) {
-    delete old;
-  }
-#else   // PROTOBUF_FORCE_COPY_IN_RELEASE
-  if (GetArena() != nullptr) {
-    released = ::google::protobuf::internal::DuplicateIfNonNull(released);
-  }
-#endif  // !PROTOBUF_FORCE_COPY_IN_RELEASE
-  return released;
-}
-inline ::io::deephaven::proto::backplane::grpc::Ticket* PartitionByRequest::unsafe_arena_release_result_id() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  // @@protoc_insertion_point(field_release:io.deephaven.proto.backplane.grpc.PartitionByRequest.result_id)
-
-  _impl_._has_bits_[0] &= ~0x00000002u;
-  ::io::deephaven::proto::backplane::grpc::Ticket* temp = _impl_.result_id_;
-  _impl_.result_id_ = nullptr;
-  return temp;
-}
-inline ::io::deephaven::proto::backplane::grpc::Ticket* PartitionByRequest::_internal_mutable_result_id() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  _impl_._has_bits_[0] |= 0x00000002u;
-  if (_impl_.result_id_ == nullptr) {
-    auto* p = CreateMaybeMessage<::io::deephaven::proto::backplane::grpc::Ticket>(GetArena());
-    _impl_.result_id_ = reinterpret_cast<::io::deephaven::proto::backplane::grpc::Ticket*>(p);
-  }
-  return _impl_.result_id_;
-}
-inline ::io::deephaven::proto::backplane::grpc::Ticket* PartitionByRequest::mutable_result_id() ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  ::io::deephaven::proto::backplane::grpc::Ticket* _msg = _internal_mutable_result_id();
-  // @@protoc_insertion_point(field_mutable:io.deephaven.proto.backplane.grpc.PartitionByRequest.result_id)
-  return _msg;
-}
-inline void PartitionByRequest::set_allocated_result_id(::io::deephaven::proto::backplane::grpc::Ticket* value) {
-  ::google::protobuf::Arena* message_arena = GetArena();
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  if (message_arena == nullptr) {
-    delete reinterpret_cast<::google::protobuf::MessageLite*>(_impl_.result_id_);
-  }
-
-  if (value != nullptr) {
-    ::google::protobuf::Arena* submessage_arena = reinterpret_cast<::google::protobuf::MessageLite*>(value)->GetArena();
-    if (message_arena != submessage_arena) {
-      value = ::google::protobuf::internal::GetOwnedMessage(message_arena, value, submessage_arena);
-    }
-    _impl_._has_bits_[0] |= 0x00000002u;
-  } else {
-    _impl_._has_bits_[0] &= ~0x00000002u;
-  }
-
-  _impl_.result_id_ = reinterpret_cast<::io::deephaven::proto::backplane::grpc::Ticket*>(value);
-  // @@protoc_insertion_point(field_set_allocated:io.deephaven.proto.backplane.grpc.PartitionByRequest.result_id)
-}
-
-// repeated string key_column_names = 3;
-inline int PartitionByRequest::_internal_key_column_names_size() const {
-  return _internal_key_column_names().size();
-}
-inline int PartitionByRequest::key_column_names_size() const {
-  return _internal_key_column_names_size();
-}
-inline void PartitionByRequest::clear_key_column_names() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  _impl_.key_column_names_.Clear();
-}
-inline std::string* PartitionByRequest::add_key_column_names()
-    ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  std::string* _s = _internal_mutable_key_column_names()->Add();
-  // @@protoc_insertion_point(field_add_mutable:io.deephaven.proto.backplane.grpc.PartitionByRequest.key_column_names)
-  return _s;
-}
-inline const std::string& PartitionByRequest::key_column_names(int index) const
-    ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  // @@protoc_insertion_point(field_get:io.deephaven.proto.backplane.grpc.PartitionByRequest.key_column_names)
-  return _internal_key_column_names().Get(index);
-}
-inline std::string* PartitionByRequest::mutable_key_column_names(int index)
-    ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  // @@protoc_insertion_point(field_mutable:io.deephaven.proto.backplane.grpc.PartitionByRequest.key_column_names)
-  return _internal_mutable_key_column_names()->Mutable(index);
-}
-inline void PartitionByRequest::set_key_column_names(int index, const std::string& value) {
-  _internal_mutable_key_column_names()->Mutable(index)->assign(value);
-  // @@protoc_insertion_point(field_set:io.deephaven.proto.backplane.grpc.PartitionByRequest.key_column_names)
-}
-inline void PartitionByRequest::set_key_column_names(int index, std::string&& value) {
-  _internal_mutable_key_column_names()->Mutable(index)->assign(std::move(value));
-  // @@protoc_insertion_point(field_set:io.deephaven.proto.backplane.grpc.PartitionByRequest.key_column_names)
-}
-inline void PartitionByRequest::set_key_column_names(int index, const char* value) {
-  ABSL_DCHECK(value != nullptr);
-  _internal_mutable_key_column_names()->Mutable(index)->assign(value);
-  // @@protoc_insertion_point(field_set_char:io.deephaven.proto.backplane.grpc.PartitionByRequest.key_column_names)
-}
-inline void PartitionByRequest::set_key_column_names(int index, const char* value,
-                              std::size_t size) {
-  _internal_mutable_key_column_names()->Mutable(index)->assign(
-      reinterpret_cast<const char*>(value), size);
-  // @@protoc_insertion_point(field_set_pointer:io.deephaven.proto.backplane.grpc.PartitionByRequest.key_column_names)
-}
-inline void PartitionByRequest::set_key_column_names(int index, absl::string_view value) {
-  _internal_mutable_key_column_names()->Mutable(index)->assign(value.data(),
-                                                     value.size());
-  // @@protoc_insertion_point(field_set_string_piece:io.deephaven.proto.backplane.grpc.PartitionByRequest.key_column_names)
-}
-inline void PartitionByRequest::add_key_column_names(const std::string& value) {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  _internal_mutable_key_column_names()->Add()->assign(value);
-  // @@protoc_insertion_point(field_add:io.deephaven.proto.backplane.grpc.PartitionByRequest.key_column_names)
-}
-inline void PartitionByRequest::add_key_column_names(std::string&& value) {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  _internal_mutable_key_column_names()->Add(std::move(value));
-  // @@protoc_insertion_point(field_add:io.deephaven.proto.backplane.grpc.PartitionByRequest.key_column_names)
-}
-inline void PartitionByRequest::add_key_column_names(const char* value) {
-  ABSL_DCHECK(value != nullptr);
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  _internal_mutable_key_column_names()->Add()->assign(value);
-  // @@protoc_insertion_point(field_add_char:io.deephaven.proto.backplane.grpc.PartitionByRequest.key_column_names)
-}
-inline void PartitionByRequest::add_key_column_names(const char* value, std::size_t size) {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  _internal_mutable_key_column_names()->Add()->assign(
-      reinterpret_cast<const char*>(value), size);
-  // @@protoc_insertion_point(field_add_pointer:io.deephaven.proto.backplane.grpc.PartitionByRequest.key_column_names)
-}
-inline void PartitionByRequest::add_key_column_names(absl::string_view value) {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  _internal_mutable_key_column_names()->Add()->assign(value.data(), value.size());
-  // @@protoc_insertion_point(field_add_string_piece:io.deephaven.proto.backplane.grpc.PartitionByRequest.key_column_names)
-}
-inline const ::google::protobuf::RepeatedPtrField<std::string>&
-PartitionByRequest::key_column_names() const ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  // @@protoc_insertion_point(field_list:io.deephaven.proto.backplane.grpc.PartitionByRequest.key_column_names)
-  return _internal_key_column_names();
-}
-inline ::google::protobuf::RepeatedPtrField<std::string>*
-PartitionByRequest::mutable_key_column_names() ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  // @@protoc_insertion_point(field_mutable_list:io.deephaven.proto.backplane.grpc.PartitionByRequest.key_column_names)
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  return _internal_mutable_key_column_names();
-}
-inline const ::google::protobuf::RepeatedPtrField<std::string>&
-PartitionByRequest::_internal_key_column_names() const {
-  PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race);
-  return _impl_.key_column_names_;
-}
-inline ::google::protobuf::RepeatedPtrField<std::string>*
-PartitionByRequest::_internal_mutable_key_column_names() {
-  PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race);
-  return &_impl_.key_column_names_;
-}
-
-// bool drop_keys = 4;
-inline void PartitionByRequest::clear_drop_keys() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  _impl_.drop_keys_ = false;
-}
-inline bool PartitionByRequest::drop_keys() const {
-  // @@protoc_insertion_point(field_get:io.deephaven.proto.backplane.grpc.PartitionByRequest.drop_keys)
-  return _internal_drop_keys();
-}
-inline void PartitionByRequest::set_drop_keys(bool value) {
-  _internal_set_drop_keys(value);
-  // @@protoc_insertion_point(field_set:io.deephaven.proto.backplane.grpc.PartitionByRequest.drop_keys)
-}
-inline bool PartitionByRequest::_internal_drop_keys() const {
-  PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race);
-  return _impl_.drop_keys_;
-}
-inline void PartitionByRequest::_internal_set_drop_keys(bool value) {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  ;
-  _impl_.drop_keys_ = value;
-}
-
-// -------------------------------------------------------------------
-
-// PartitionByResponse
-
-// -------------------------------------------------------------------
-
-// MergeRequest
-
-// .io.deephaven.proto.backplane.grpc.Ticket partitioned_table = 1;
-inline bool MergeRequest::has_partitioned_table() const {
-  bool value = (_impl_._has_bits_[0] & 0x00000001u) != 0;
-  PROTOBUF_ASSUME(!value || _impl_.partitioned_table_ != nullptr);
-  return value;
-}
-inline const ::io::deephaven::proto::backplane::grpc::Ticket& MergeRequest::_internal_partitioned_table() const {
-  PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race);
-  const ::io::deephaven::proto::backplane::grpc::Ticket* p = _impl_.partitioned_table_;
-  return p != nullptr ? *p : reinterpret_cast<const ::io::deephaven::proto::backplane::grpc::Ticket&>(::io::deephaven::proto::backplane::grpc::_Ticket_default_instance_);
-}
-inline const ::io::deephaven::proto::backplane::grpc::Ticket& MergeRequest::partitioned_table() const ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  // @@protoc_insertion_point(field_get:io.deephaven.proto.backplane.grpc.MergeRequest.partitioned_table)
-  return _internal_partitioned_table();
-}
-inline void MergeRequest::unsafe_arena_set_allocated_partitioned_table(::io::deephaven::proto::backplane::grpc::Ticket* value) {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  if (GetArena() == nullptr) {
-    delete reinterpret_cast<::google::protobuf::MessageLite*>(_impl_.partitioned_table_);
-  }
-  _impl_.partitioned_table_ = reinterpret_cast<::io::deephaven::proto::backplane::grpc::Ticket*>(value);
-  if (value != nullptr) {
-    _impl_._has_bits_[0] |= 0x00000001u;
-  } else {
-    _impl_._has_bits_[0] &= ~0x00000001u;
-  }
-  // @@protoc_insertion_point(field_unsafe_arena_set_allocated:io.deephaven.proto.backplane.grpc.MergeRequest.partitioned_table)
-}
-inline ::io::deephaven::proto::backplane::grpc::Ticket* MergeRequest::release_partitioned_table() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-
-  _impl_._has_bits_[0] &= ~0x00000001u;
-  ::io::deephaven::proto::backplane::grpc::Ticket* released = _impl_.partitioned_table_;
-  _impl_.partitioned_table_ = nullptr;
-#ifdef PROTOBUF_FORCE_COPY_IN_RELEASE
-  auto* old = reinterpret_cast<::google::protobuf::MessageLite*>(released);
-  released = ::google::protobuf::internal::DuplicateIfNonNull(released);
-  if (GetArena() == nullptr) {
-    delete old;
-  }
-#else   // PROTOBUF_FORCE_COPY_IN_RELEASE
-  if (GetArena() != nullptr) {
-    released = ::google::protobuf::internal::DuplicateIfNonNull(released);
-  }
-#endif  // !PROTOBUF_FORCE_COPY_IN_RELEASE
-  return released;
-}
-inline ::io::deephaven::proto::backplane::grpc::Ticket* MergeRequest::unsafe_arena_release_partitioned_table() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  // @@protoc_insertion_point(field_release:io.deephaven.proto.backplane.grpc.MergeRequest.partitioned_table)
-
-  _impl_._has_bits_[0] &= ~0x00000001u;
-  ::io::deephaven::proto::backplane::grpc::Ticket* temp = _impl_.partitioned_table_;
-  _impl_.partitioned_table_ = nullptr;
-  return temp;
-}
-inline ::io::deephaven::proto::backplane::grpc::Ticket* MergeRequest::_internal_mutable_partitioned_table() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  _impl_._has_bits_[0] |= 0x00000001u;
-  if (_impl_.partitioned_table_ == nullptr) {
-    auto* p = CreateMaybeMessage<::io::deephaven::proto::backplane::grpc::Ticket>(GetArena());
-    _impl_.partitioned_table_ = reinterpret_cast<::io::deephaven::proto::backplane::grpc::Ticket*>(p);
-  }
-  return _impl_.partitioned_table_;
-}
-inline ::io::deephaven::proto::backplane::grpc::Ticket* MergeRequest::mutable_partitioned_table() ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  ::io::deephaven::proto::backplane::grpc::Ticket* _msg = _internal_mutable_partitioned_table();
-  // @@protoc_insertion_point(field_mutable:io.deephaven.proto.backplane.grpc.MergeRequest.partitioned_table)
-  return _msg;
-}
-inline void MergeRequest::set_allocated_partitioned_table(::io::deephaven::proto::backplane::grpc::Ticket* value) {
-  ::google::protobuf::Arena* message_arena = GetArena();
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  if (message_arena == nullptr) {
-    delete reinterpret_cast<::google::protobuf::MessageLite*>(_impl_.partitioned_table_);
-  }
-
-  if (value != nullptr) {
-    ::google::protobuf::Arena* submessage_arena = reinterpret_cast<::google::protobuf::MessageLite*>(value)->GetArena();
-    if (message_arena != submessage_arena) {
-      value = ::google::protobuf::internal::GetOwnedMessage(message_arena, value, submessage_arena);
-    }
-    _impl_._has_bits_[0] |= 0x00000001u;
-  } else {
-    _impl_._has_bits_[0] &= ~0x00000001u;
-  }
-
-  _impl_.partitioned_table_ = reinterpret_cast<::io::deephaven::proto::backplane::grpc::Ticket*>(value);
-  // @@protoc_insertion_point(field_set_allocated:io.deephaven.proto.backplane.grpc.MergeRequest.partitioned_table)
-}
-
-// .io.deephaven.proto.backplane.grpc.Ticket result_id = 2;
-inline bool MergeRequest::has_result_id() const {
-  bool value = (_impl_._has_bits_[0] & 0x00000002u) != 0;
-  PROTOBUF_ASSUME(!value || _impl_.result_id_ != nullptr);
-  return value;
-}
-inline const ::io::deephaven::proto::backplane::grpc::Ticket& MergeRequest::_internal_result_id() const {
-  PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race);
-  const ::io::deephaven::proto::backplane::grpc::Ticket* p = _impl_.result_id_;
-  return p != nullptr ? *p : reinterpret_cast<const ::io::deephaven::proto::backplane::grpc::Ticket&>(::io::deephaven::proto::backplane::grpc::_Ticket_default_instance_);
-}
-inline const ::io::deephaven::proto::backplane::grpc::Ticket& MergeRequest::result_id() const ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  // @@protoc_insertion_point(field_get:io.deephaven.proto.backplane.grpc.MergeRequest.result_id)
-  return _internal_result_id();
-}
-inline void MergeRequest::unsafe_arena_set_allocated_result_id(::io::deephaven::proto::backplane::grpc::Ticket* value) {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  if (GetArena() == nullptr) {
-    delete reinterpret_cast<::google::protobuf::MessageLite*>(_impl_.result_id_);
-  }
-  _impl_.result_id_ = reinterpret_cast<::io::deephaven::proto::backplane::grpc::Ticket*>(value);
-  if (value != nullptr) {
-    _impl_._has_bits_[0] |= 0x00000002u;
-  } else {
-    _impl_._has_bits_[0] &= ~0x00000002u;
-  }
-  // @@protoc_insertion_point(field_unsafe_arena_set_allocated:io.deephaven.proto.backplane.grpc.MergeRequest.result_id)
-}
-inline ::io::deephaven::proto::backplane::grpc::Ticket* MergeRequest::release_result_id() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-
-  _impl_._has_bits_[0] &= ~0x00000002u;
-  ::io::deephaven::proto::backplane::grpc::Ticket* released = _impl_.result_id_;
-  _impl_.result_id_ = nullptr;
-#ifdef PROTOBUF_FORCE_COPY_IN_RELEASE
-  auto* old = reinterpret_cast<::google::protobuf::MessageLite*>(released);
-  released = ::google::protobuf::internal::DuplicateIfNonNull(released);
-  if (GetArena() == nullptr) {
-    delete old;
-  }
-#else   // PROTOBUF_FORCE_COPY_IN_RELEASE
-  if (GetArena() != nullptr) {
-    released = ::google::protobuf::internal::DuplicateIfNonNull(released);
-  }
-#endif  // !PROTOBUF_FORCE_COPY_IN_RELEASE
-  return released;
-}
-inline ::io::deephaven::proto::backplane::grpc::Ticket* MergeRequest::unsafe_arena_release_result_id() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  // @@protoc_insertion_point(field_release:io.deephaven.proto.backplane.grpc.MergeRequest.result_id)
-
-  _impl_._has_bits_[0] &= ~0x00000002u;
-  ::io::deephaven::proto::backplane::grpc::Ticket* temp = _impl_.result_id_;
-  _impl_.result_id_ = nullptr;
-  return temp;
-}
-inline ::io::deephaven::proto::backplane::grpc::Ticket* MergeRequest::_internal_mutable_result_id() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  _impl_._has_bits_[0] |= 0x00000002u;
-  if (_impl_.result_id_ == nullptr) {
-    auto* p = CreateMaybeMessage<::io::deephaven::proto::backplane::grpc::Ticket>(GetArena());
-    _impl_.result_id_ = reinterpret_cast<::io::deephaven::proto::backplane::grpc::Ticket*>(p);
-  }
-  return _impl_.result_id_;
-}
-inline ::io::deephaven::proto::backplane::grpc::Ticket* MergeRequest::mutable_result_id() ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  ::io::deephaven::proto::backplane::grpc::Ticket* _msg = _internal_mutable_result_id();
-  // @@protoc_insertion_point(field_mutable:io.deephaven.proto.backplane.grpc.MergeRequest.result_id)
-  return _msg;
-}
-inline void MergeRequest::set_allocated_result_id(::io::deephaven::proto::backplane::grpc::Ticket* value) {
-  ::google::protobuf::Arena* message_arena = GetArena();
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  if (message_arena == nullptr) {
-    delete reinterpret_cast<::google::protobuf::MessageLite*>(_impl_.result_id_);
-  }
-
-  if (value != nullptr) {
-    ::google::protobuf::Arena* submessage_arena = reinterpret_cast<::google::protobuf::MessageLite*>(value)->GetArena();
-    if (message_arena != submessage_arena) {
-      value = ::google::protobuf::internal::GetOwnedMessage(message_arena, value, submessage_arena);
-    }
-    _impl_._has_bits_[0] |= 0x00000002u;
-  } else {
-    _impl_._has_bits_[0] &= ~0x00000002u;
-  }
-
-  _impl_.result_id_ = reinterpret_cast<::io::deephaven::proto::backplane::grpc::Ticket*>(value);
-  // @@protoc_insertion_point(field_set_allocated:io.deephaven.proto.backplane.grpc.MergeRequest.result_id)
-}
-
-// -------------------------------------------------------------------
-
-// GetTableRequest
-
-// .io.deephaven.proto.backplane.grpc.Ticket partitioned_table = 1;
-inline bool GetTableRequest::has_partitioned_table() const {
-  bool value = (_impl_._has_bits_[0] & 0x00000001u) != 0;
-  PROTOBUF_ASSUME(!value || _impl_.partitioned_table_ != nullptr);
-  return value;
-}
-inline const ::io::deephaven::proto::backplane::grpc::Ticket& GetTableRequest::_internal_partitioned_table() const {
-  PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race);
-  const ::io::deephaven::proto::backplane::grpc::Ticket* p = _impl_.partitioned_table_;
-  return p != nullptr ? *p : reinterpret_cast<const ::io::deephaven::proto::backplane::grpc::Ticket&>(::io::deephaven::proto::backplane::grpc::_Ticket_default_instance_);
-}
-inline const ::io::deephaven::proto::backplane::grpc::Ticket& GetTableRequest::partitioned_table() const ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  // @@protoc_insertion_point(field_get:io.deephaven.proto.backplane.grpc.GetTableRequest.partitioned_table)
-  return _internal_partitioned_table();
-}
-inline void GetTableRequest::unsafe_arena_set_allocated_partitioned_table(::io::deephaven::proto::backplane::grpc::Ticket* value) {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  if (GetArena() == nullptr) {
-    delete reinterpret_cast<::google::protobuf::MessageLite*>(_impl_.partitioned_table_);
-  }
-  _impl_.partitioned_table_ = reinterpret_cast<::io::deephaven::proto::backplane::grpc::Ticket*>(value);
-  if (value != nullptr) {
-    _impl_._has_bits_[0] |= 0x00000001u;
-  } else {
-    _impl_._has_bits_[0] &= ~0x00000001u;
-  }
-  // @@protoc_insertion_point(field_unsafe_arena_set_allocated:io.deephaven.proto.backplane.grpc.GetTableRequest.partitioned_table)
-}
-inline ::io::deephaven::proto::backplane::grpc::Ticket* GetTableRequest::release_partitioned_table() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-
-  _impl_._has_bits_[0] &= ~0x00000001u;
-  ::io::deephaven::proto::backplane::grpc::Ticket* released = _impl_.partitioned_table_;
-  _impl_.partitioned_table_ = nullptr;
-#ifdef PROTOBUF_FORCE_COPY_IN_RELEASE
-  auto* old = reinterpret_cast<::google::protobuf::MessageLite*>(released);
-  released = ::google::protobuf::internal::DuplicateIfNonNull(released);
-  if (GetArena() == nullptr) {
-    delete old;
-  }
-#else   // PROTOBUF_FORCE_COPY_IN_RELEASE
-  if (GetArena() != nullptr) {
-    released = ::google::protobuf::internal::DuplicateIfNonNull(released);
-  }
-#endif  // !PROTOBUF_FORCE_COPY_IN_RELEASE
-  return released;
-}
-inline ::io::deephaven::proto::backplane::grpc::Ticket* GetTableRequest::unsafe_arena_release_partitioned_table() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  // @@protoc_insertion_point(field_release:io.deephaven.proto.backplane.grpc.GetTableRequest.partitioned_table)
-
-  _impl_._has_bits_[0] &= ~0x00000001u;
-  ::io::deephaven::proto::backplane::grpc::Ticket* temp = _impl_.partitioned_table_;
-  _impl_.partitioned_table_ = nullptr;
-  return temp;
-}
-inline ::io::deephaven::proto::backplane::grpc::Ticket* GetTableRequest::_internal_mutable_partitioned_table() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  _impl_._has_bits_[0] |= 0x00000001u;
-  if (_impl_.partitioned_table_ == nullptr) {
-    auto* p = CreateMaybeMessage<::io::deephaven::proto::backplane::grpc::Ticket>(GetArena());
-    _impl_.partitioned_table_ = reinterpret_cast<::io::deephaven::proto::backplane::grpc::Ticket*>(p);
-  }
-  return _impl_.partitioned_table_;
-}
-inline ::io::deephaven::proto::backplane::grpc::Ticket* GetTableRequest::mutable_partitioned_table() ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  ::io::deephaven::proto::backplane::grpc::Ticket* _msg = _internal_mutable_partitioned_table();
-  // @@protoc_insertion_point(field_mutable:io.deephaven.proto.backplane.grpc.GetTableRequest.partitioned_table)
-  return _msg;
-}
-inline void GetTableRequest::set_allocated_partitioned_table(::io::deephaven::proto::backplane::grpc::Ticket* value) {
-  ::google::protobuf::Arena* message_arena = GetArena();
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  if (message_arena == nullptr) {
-    delete reinterpret_cast<::google::protobuf::MessageLite*>(_impl_.partitioned_table_);
-  }
-
-  if (value != nullptr) {
-    ::google::protobuf::Arena* submessage_arena = reinterpret_cast<::google::protobuf::MessageLite*>(value)->GetArena();
-    if (message_arena != submessage_arena) {
-      value = ::google::protobuf::internal::GetOwnedMessage(message_arena, value, submessage_arena);
-    }
-    _impl_._has_bits_[0] |= 0x00000001u;
-  } else {
-    _impl_._has_bits_[0] &= ~0x00000001u;
-  }
-
-  _impl_.partitioned_table_ = reinterpret_cast<::io::deephaven::proto::backplane::grpc::Ticket*>(value);
-  // @@protoc_insertion_point(field_set_allocated:io.deephaven.proto.backplane.grpc.GetTableRequest.partitioned_table)
-}
-
-// .io.deephaven.proto.backplane.grpc.Ticket key_table_ticket = 2;
-inline bool GetTableRequest::has_key_table_ticket() const {
-  bool value = (_impl_._has_bits_[0] & 0x00000002u) != 0;
-  PROTOBUF_ASSUME(!value || _impl_.key_table_ticket_ != nullptr);
-  return value;
-}
-inline const ::io::deephaven::proto::backplane::grpc::Ticket& GetTableRequest::_internal_key_table_ticket() const {
-  PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race);
-  const ::io::deephaven::proto::backplane::grpc::Ticket* p = _impl_.key_table_ticket_;
-  return p != nullptr ? *p : reinterpret_cast<const ::io::deephaven::proto::backplane::grpc::Ticket&>(::io::deephaven::proto::backplane::grpc::_Ticket_default_instance_);
-}
-inline const ::io::deephaven::proto::backplane::grpc::Ticket& GetTableRequest::key_table_ticket() const ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  // @@protoc_insertion_point(field_get:io.deephaven.proto.backplane.grpc.GetTableRequest.key_table_ticket)
-  return _internal_key_table_ticket();
-}
-inline void GetTableRequest::unsafe_arena_set_allocated_key_table_ticket(::io::deephaven::proto::backplane::grpc::Ticket* value) {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  if (GetArena() == nullptr) {
-    delete reinterpret_cast<::google::protobuf::MessageLite*>(_impl_.key_table_ticket_);
-  }
-  _impl_.key_table_ticket_ = reinterpret_cast<::io::deephaven::proto::backplane::grpc::Ticket*>(value);
-  if (value != nullptr) {
-    _impl_._has_bits_[0] |= 0x00000002u;
-  } else {
-    _impl_._has_bits_[0] &= ~0x00000002u;
-  }
-  // @@protoc_insertion_point(field_unsafe_arena_set_allocated:io.deephaven.proto.backplane.grpc.GetTableRequest.key_table_ticket)
-}
-inline ::io::deephaven::proto::backplane::grpc::Ticket* GetTableRequest::release_key_table_ticket() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-
-  _impl_._has_bits_[0] &= ~0x00000002u;
-  ::io::deephaven::proto::backplane::grpc::Ticket* released = _impl_.key_table_ticket_;
-  _impl_.key_table_ticket_ = nullptr;
-#ifdef PROTOBUF_FORCE_COPY_IN_RELEASE
-  auto* old = reinterpret_cast<::google::protobuf::MessageLite*>(released);
-  released = ::google::protobuf::internal::DuplicateIfNonNull(released);
-  if (GetArena() == nullptr) {
-    delete old;
-  }
-#else   // PROTOBUF_FORCE_COPY_IN_RELEASE
-  if (GetArena() != nullptr) {
-    released = ::google::protobuf::internal::DuplicateIfNonNull(released);
-  }
-#endif  // !PROTOBUF_FORCE_COPY_IN_RELEASE
-  return released;
-}
-inline ::io::deephaven::proto::backplane::grpc::Ticket* GetTableRequest::unsafe_arena_release_key_table_ticket() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  // @@protoc_insertion_point(field_release:io.deephaven.proto.backplane.grpc.GetTableRequest.key_table_ticket)
-
-  _impl_._has_bits_[0] &= ~0x00000002u;
-  ::io::deephaven::proto::backplane::grpc::Ticket* temp = _impl_.key_table_ticket_;
-  _impl_.key_table_ticket_ = nullptr;
-  return temp;
-}
-inline ::io::deephaven::proto::backplane::grpc::Ticket* GetTableRequest::_internal_mutable_key_table_ticket() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  _impl_._has_bits_[0] |= 0x00000002u;
-  if (_impl_.key_table_ticket_ == nullptr) {
-    auto* p = CreateMaybeMessage<::io::deephaven::proto::backplane::grpc::Ticket>(GetArena());
-    _impl_.key_table_ticket_ = reinterpret_cast<::io::deephaven::proto::backplane::grpc::Ticket*>(p);
-  }
-  return _impl_.key_table_ticket_;
-}
-inline ::io::deephaven::proto::backplane::grpc::Ticket* GetTableRequest::mutable_key_table_ticket() ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  ::io::deephaven::proto::backplane::grpc::Ticket* _msg = _internal_mutable_key_table_ticket();
-  // @@protoc_insertion_point(field_mutable:io.deephaven.proto.backplane.grpc.GetTableRequest.key_table_ticket)
-  return _msg;
-}
-inline void GetTableRequest::set_allocated_key_table_ticket(::io::deephaven::proto::backplane::grpc::Ticket* value) {
-  ::google::protobuf::Arena* message_arena = GetArena();
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  if (message_arena == nullptr) {
-    delete reinterpret_cast<::google::protobuf::MessageLite*>(_impl_.key_table_ticket_);
-  }
-
-  if (value != nullptr) {
-    ::google::protobuf::Arena* submessage_arena = reinterpret_cast<::google::protobuf::MessageLite*>(value)->GetArena();
-    if (message_arena != submessage_arena) {
-      value = ::google::protobuf::internal::GetOwnedMessage(message_arena, value, submessage_arena);
-    }
-    _impl_._has_bits_[0] |= 0x00000002u;
-  } else {
-    _impl_._has_bits_[0] &= ~0x00000002u;
-  }
-
-  _impl_.key_table_ticket_ = reinterpret_cast<::io::deephaven::proto::backplane::grpc::Ticket*>(value);
-  // @@protoc_insertion_point(field_set_allocated:io.deephaven.proto.backplane.grpc.GetTableRequest.key_table_ticket)
-}
-
-// .io.deephaven.proto.backplane.grpc.Ticket result_id = 4;
-inline bool GetTableRequest::has_result_id() const {
-  bool value = (_impl_._has_bits_[0] & 0x00000004u) != 0;
-  PROTOBUF_ASSUME(!value || _impl_.result_id_ != nullptr);
-  return value;
-}
-inline const ::io::deephaven::proto::backplane::grpc::Ticket& GetTableRequest::_internal_result_id() const {
-  PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race);
-  const ::io::deephaven::proto::backplane::grpc::Ticket* p = _impl_.result_id_;
-  return p != nullptr ? *p : reinterpret_cast<const ::io::deephaven::proto::backplane::grpc::Ticket&>(::io::deephaven::proto::backplane::grpc::_Ticket_default_instance_);
-}
-inline const ::io::deephaven::proto::backplane::grpc::Ticket& GetTableRequest::result_id() const ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  // @@protoc_insertion_point(field_get:io.deephaven.proto.backplane.grpc.GetTableRequest.result_id)
-  return _internal_result_id();
-}
-inline void GetTableRequest::unsafe_arena_set_allocated_result_id(::io::deephaven::proto::backplane::grpc::Ticket* value) {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  if (GetArena() == nullptr) {
-    delete reinterpret_cast<::google::protobuf::MessageLite*>(_impl_.result_id_);
-  }
-  _impl_.result_id_ = reinterpret_cast<::io::deephaven::proto::backplane::grpc::Ticket*>(value);
-  if (value != nullptr) {
-    _impl_._has_bits_[0] |= 0x00000004u;
-  } else {
-    _impl_._has_bits_[0] &= ~0x00000004u;
-  }
-  // @@protoc_insertion_point(field_unsafe_arena_set_allocated:io.deephaven.proto.backplane.grpc.GetTableRequest.result_id)
-}
-inline ::io::deephaven::proto::backplane::grpc::Ticket* GetTableRequest::release_result_id() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-
-  _impl_._has_bits_[0] &= ~0x00000004u;
-  ::io::deephaven::proto::backplane::grpc::Ticket* released = _impl_.result_id_;
-  _impl_.result_id_ = nullptr;
-#ifdef PROTOBUF_FORCE_COPY_IN_RELEASE
-  auto* old = reinterpret_cast<::google::protobuf::MessageLite*>(released);
-  released = ::google::protobuf::internal::DuplicateIfNonNull(released);
-  if (GetArena() == nullptr) {
-    delete old;
-  }
-#else   // PROTOBUF_FORCE_COPY_IN_RELEASE
-  if (GetArena() != nullptr) {
-    released = ::google::protobuf::internal::DuplicateIfNonNull(released);
-  }
-#endif  // !PROTOBUF_FORCE_COPY_IN_RELEASE
-  return released;
-}
-inline ::io::deephaven::proto::backplane::grpc::Ticket* GetTableRequest::unsafe_arena_release_result_id() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  // @@protoc_insertion_point(field_release:io.deephaven.proto.backplane.grpc.GetTableRequest.result_id)
-
-  _impl_._has_bits_[0] &= ~0x00000004u;
-  ::io::deephaven::proto::backplane::grpc::Ticket* temp = _impl_.result_id_;
-  _impl_.result_id_ = nullptr;
-  return temp;
-}
-inline ::io::deephaven::proto::backplane::grpc::Ticket* GetTableRequest::_internal_mutable_result_id() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  _impl_._has_bits_[0] |= 0x00000004u;
-  if (_impl_.result_id_ == nullptr) {
-    auto* p = CreateMaybeMessage<::io::deephaven::proto::backplane::grpc::Ticket>(GetArena());
-    _impl_.result_id_ = reinterpret_cast<::io::deephaven::proto::backplane::grpc::Ticket*>(p);
-  }
-  return _impl_.result_id_;
-}
-inline ::io::deephaven::proto::backplane::grpc::Ticket* GetTableRequest::mutable_result_id() ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  ::io::deephaven::proto::backplane::grpc::Ticket* _msg = _internal_mutable_result_id();
-  // @@protoc_insertion_point(field_mutable:io.deephaven.proto.backplane.grpc.GetTableRequest.result_id)
-  return _msg;
-}
-inline void GetTableRequest::set_allocated_result_id(::io::deephaven::proto::backplane::grpc::Ticket* value) {
-  ::google::protobuf::Arena* message_arena = GetArena();
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  if (message_arena == nullptr) {
-    delete reinterpret_cast<::google::protobuf::MessageLite*>(_impl_.result_id_);
-  }
-
-  if (value != nullptr) {
-    ::google::protobuf::Arena* submessage_arena = reinterpret_cast<::google::protobuf::MessageLite*>(value)->GetArena();
-    if (message_arena != submessage_arena) {
-      value = ::google::protobuf::internal::GetOwnedMessage(message_arena, value, submessage_arena);
-    }
-    _impl_._has_bits_[0] |= 0x00000004u;
-  } else {
-    _impl_._has_bits_[0] &= ~0x00000004u;
-  }
-
-  _impl_.result_id_ = reinterpret_cast<::io::deephaven::proto::backplane::grpc::Ticket*>(value);
-  // @@protoc_insertion_point(field_set_allocated:io.deephaven.proto.backplane.grpc.GetTableRequest.result_id)
-}
-
-// -------------------------------------------------------------------
-
-// PartitionedTableDescriptor
-
-// repeated string key_column_names = 1;
-inline int PartitionedTableDescriptor::_internal_key_column_names_size() const {
-  return _internal_key_column_names().size();
-}
-inline int PartitionedTableDescriptor::key_column_names_size() const {
-  return _internal_key_column_names_size();
-}
-inline void PartitionedTableDescriptor::clear_key_column_names() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  _impl_.key_column_names_.Clear();
-}
-inline std::string* PartitionedTableDescriptor::add_key_column_names()
-    ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  std::string* _s = _internal_mutable_key_column_names()->Add();
-  // @@protoc_insertion_point(field_add_mutable:io.deephaven.proto.backplane.grpc.PartitionedTableDescriptor.key_column_names)
-  return _s;
-}
-inline const std::string& PartitionedTableDescriptor::key_column_names(int index) const
-    ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  // @@protoc_insertion_point(field_get:io.deephaven.proto.backplane.grpc.PartitionedTableDescriptor.key_column_names)
-  return _internal_key_column_names().Get(index);
-}
-inline std::string* PartitionedTableDescriptor::mutable_key_column_names(int index)
-    ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  // @@protoc_insertion_point(field_mutable:io.deephaven.proto.backplane.grpc.PartitionedTableDescriptor.key_column_names)
-  return _internal_mutable_key_column_names()->Mutable(index);
-}
-inline void PartitionedTableDescriptor::set_key_column_names(int index, const std::string& value) {
-  _internal_mutable_key_column_names()->Mutable(index)->assign(value);
-  // @@protoc_insertion_point(field_set:io.deephaven.proto.backplane.grpc.PartitionedTableDescriptor.key_column_names)
-}
-inline void PartitionedTableDescriptor::set_key_column_names(int index, std::string&& value) {
-  _internal_mutable_key_column_names()->Mutable(index)->assign(std::move(value));
-  // @@protoc_insertion_point(field_set:io.deephaven.proto.backplane.grpc.PartitionedTableDescriptor.key_column_names)
-}
-inline void PartitionedTableDescriptor::set_key_column_names(int index, const char* value) {
-  ABSL_DCHECK(value != nullptr);
-  _internal_mutable_key_column_names()->Mutable(index)->assign(value);
-  // @@protoc_insertion_point(field_set_char:io.deephaven.proto.backplane.grpc.PartitionedTableDescriptor.key_column_names)
-}
-inline void PartitionedTableDescriptor::set_key_column_names(int index, const char* value,
-                              std::size_t size) {
-  _internal_mutable_key_column_names()->Mutable(index)->assign(
-      reinterpret_cast<const char*>(value), size);
-  // @@protoc_insertion_point(field_set_pointer:io.deephaven.proto.backplane.grpc.PartitionedTableDescriptor.key_column_names)
-}
-inline void PartitionedTableDescriptor::set_key_column_names(int index, absl::string_view value) {
-  _internal_mutable_key_column_names()->Mutable(index)->assign(value.data(),
-                                                     value.size());
-  // @@protoc_insertion_point(field_set_string_piece:io.deephaven.proto.backplane.grpc.PartitionedTableDescriptor.key_column_names)
-}
-inline void PartitionedTableDescriptor::add_key_column_names(const std::string& value) {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  _internal_mutable_key_column_names()->Add()->assign(value);
-  // @@protoc_insertion_point(field_add:io.deephaven.proto.backplane.grpc.PartitionedTableDescriptor.key_column_names)
-}
-inline void PartitionedTableDescriptor::add_key_column_names(std::string&& value) {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  _internal_mutable_key_column_names()->Add(std::move(value));
-  // @@protoc_insertion_point(field_add:io.deephaven.proto.backplane.grpc.PartitionedTableDescriptor.key_column_names)
-}
-inline void PartitionedTableDescriptor::add_key_column_names(const char* value) {
-  ABSL_DCHECK(value != nullptr);
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  _internal_mutable_key_column_names()->Add()->assign(value);
-  // @@protoc_insertion_point(field_add_char:io.deephaven.proto.backplane.grpc.PartitionedTableDescriptor.key_column_names)
-}
-inline void PartitionedTableDescriptor::add_key_column_names(const char* value, std::size_t size) {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  _internal_mutable_key_column_names()->Add()->assign(
-      reinterpret_cast<const char*>(value), size);
-  // @@protoc_insertion_point(field_add_pointer:io.deephaven.proto.backplane.grpc.PartitionedTableDescriptor.key_column_names)
-}
-inline void PartitionedTableDescriptor::add_key_column_names(absl::string_view value) {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  _internal_mutable_key_column_names()->Add()->assign(value.data(), value.size());
-  // @@protoc_insertion_point(field_add_string_piece:io.deephaven.proto.backplane.grpc.PartitionedTableDescriptor.key_column_names)
-}
-inline const ::google::protobuf::RepeatedPtrField<std::string>&
-PartitionedTableDescriptor::key_column_names() const ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  // @@protoc_insertion_point(field_list:io.deephaven.proto.backplane.grpc.PartitionedTableDescriptor.key_column_names)
-  return _internal_key_column_names();
-}
-inline ::google::protobuf::RepeatedPtrField<std::string>*
-PartitionedTableDescriptor::mutable_key_column_names() ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  // @@protoc_insertion_point(field_mutable_list:io.deephaven.proto.backplane.grpc.PartitionedTableDescriptor.key_column_names)
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  return _internal_mutable_key_column_names();
-}
-inline const ::google::protobuf::RepeatedPtrField<std::string>&
-PartitionedTableDescriptor::_internal_key_column_names() const {
-  PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race);
-  return _impl_.key_column_names_;
-}
-inline ::google::protobuf::RepeatedPtrField<std::string>*
-PartitionedTableDescriptor::_internal_mutable_key_column_names() {
-  PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race);
-  return &_impl_.key_column_names_;
-}
-
-// string constituent_column_name = 4;
-inline void PartitionedTableDescriptor::clear_constituent_column_name() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  _impl_.constituent_column_name_.ClearToEmpty();
-}
-inline const std::string& PartitionedTableDescriptor::constituent_column_name() const
-    ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  // @@protoc_insertion_point(field_get:io.deephaven.proto.backplane.grpc.PartitionedTableDescriptor.constituent_column_name)
-  return _internal_constituent_column_name();
-}
-template <typename Arg_, typename... Args_>
-inline PROTOBUF_ALWAYS_INLINE void PartitionedTableDescriptor::set_constituent_column_name(Arg_&& arg,
-                                                     Args_... args) {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  ;
-  _impl_.constituent_column_name_.Set(static_cast<Arg_&&>(arg), args..., GetArena());
-  // @@protoc_insertion_point(field_set:io.deephaven.proto.backplane.grpc.PartitionedTableDescriptor.constituent_column_name)
-}
-inline std::string* PartitionedTableDescriptor::mutable_constituent_column_name() ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  std::string* _s = _internal_mutable_constituent_column_name();
-  // @@protoc_insertion_point(field_mutable:io.deephaven.proto.backplane.grpc.PartitionedTableDescriptor.constituent_column_name)
-  return _s;
-}
-inline const std::string& PartitionedTableDescriptor::_internal_constituent_column_name() const {
-  PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race);
-  return _impl_.constituent_column_name_.Get();
-}
-inline void PartitionedTableDescriptor::_internal_set_constituent_column_name(const std::string& value) {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  ;
-  _impl_.constituent_column_name_.Set(value, GetArena());
-}
-inline std::string* PartitionedTableDescriptor::_internal_mutable_constituent_column_name() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  ;
-  return _impl_.constituent_column_name_.Mutable( GetArena());
-}
-inline std::string* PartitionedTableDescriptor::release_constituent_column_name() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  // @@protoc_insertion_point(field_release:io.deephaven.proto.backplane.grpc.PartitionedTableDescriptor.constituent_column_name)
-  return _impl_.constituent_column_name_.Release();
-}
-inline void PartitionedTableDescriptor::set_allocated_constituent_column_name(std::string* value) {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  _impl_.constituent_column_name_.SetAllocated(value, GetArena());
-  #ifdef PROTOBUF_FORCE_COPY_DEFAULT_STRING
-        if (_impl_.constituent_column_name_.IsDefault()) {
-          _impl_.constituent_column_name_.Set("", GetArena());
-        }
-  #endif  // PROTOBUF_FORCE_COPY_DEFAULT_STRING
-  // @@protoc_insertion_point(field_set_allocated:io.deephaven.proto.backplane.grpc.PartitionedTableDescriptor.constituent_column_name)
-}
-
-// bool unique_keys = 2;
-inline void PartitionedTableDescriptor::clear_unique_keys() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  _impl_.unique_keys_ = false;
-}
-inline bool PartitionedTableDescriptor::unique_keys() const {
-  // @@protoc_insertion_point(field_get:io.deephaven.proto.backplane.grpc.PartitionedTableDescriptor.unique_keys)
-  return _internal_unique_keys();
-}
-inline void PartitionedTableDescriptor::set_unique_keys(bool value) {
-  _internal_set_unique_keys(value);
-  // @@protoc_insertion_point(field_set:io.deephaven.proto.backplane.grpc.PartitionedTableDescriptor.unique_keys)
-}
-inline bool PartitionedTableDescriptor::_internal_unique_keys() const {
-  PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race);
-  return _impl_.unique_keys_;
-}
-inline void PartitionedTableDescriptor::_internal_set_unique_keys(bool value) {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  ;
-  _impl_.unique_keys_ = value;
-}
-
-// bytes constituent_definition_schema = 3;
-inline void PartitionedTableDescriptor::clear_constituent_definition_schema() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  _impl_.constituent_definition_schema_.ClearToEmpty();
-}
-inline const std::string& PartitionedTableDescriptor::constituent_definition_schema() const
-    ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  // @@protoc_insertion_point(field_get:io.deephaven.proto.backplane.grpc.PartitionedTableDescriptor.constituent_definition_schema)
-  return _internal_constituent_definition_schema();
-}
-template <typename Arg_, typename... Args_>
-inline PROTOBUF_ALWAYS_INLINE void PartitionedTableDescriptor::set_constituent_definition_schema(Arg_&& arg,
-                                                     Args_... args) {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  ;
-  _impl_.constituent_definition_schema_.SetBytes(static_cast<Arg_&&>(arg), args..., GetArena());
-  // @@protoc_insertion_point(field_set:io.deephaven.proto.backplane.grpc.PartitionedTableDescriptor.constituent_definition_schema)
-}
-inline std::string* PartitionedTableDescriptor::mutable_constituent_definition_schema() ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  std::string* _s = _internal_mutable_constituent_definition_schema();
-  // @@protoc_insertion_point(field_mutable:io.deephaven.proto.backplane.grpc.PartitionedTableDescriptor.constituent_definition_schema)
-  return _s;
-}
-inline const std::string& PartitionedTableDescriptor::_internal_constituent_definition_schema() const {
-  PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race);
-  return _impl_.constituent_definition_schema_.Get();
-}
-inline void PartitionedTableDescriptor::_internal_set_constituent_definition_schema(const std::string& value) {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  ;
-  _impl_.constituent_definition_schema_.Set(value, GetArena());
-}
-inline std::string* PartitionedTableDescriptor::_internal_mutable_constituent_definition_schema() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  ;
-  return _impl_.constituent_definition_schema_.Mutable( GetArena());
-}
-inline std::string* PartitionedTableDescriptor::release_constituent_definition_schema() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  // @@protoc_insertion_point(field_release:io.deephaven.proto.backplane.grpc.PartitionedTableDescriptor.constituent_definition_schema)
-  return _impl_.constituent_definition_schema_.Release();
-}
-inline void PartitionedTableDescriptor::set_allocated_constituent_definition_schema(std::string* value) {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  _impl_.constituent_definition_schema_.SetAllocated(value, GetArena());
-  #ifdef PROTOBUF_FORCE_COPY_DEFAULT_STRING
-        if (_impl_.constituent_definition_schema_.IsDefault()) {
-          _impl_.constituent_definition_schema_.Set("", GetArena());
-        }
-  #endif  // PROTOBUF_FORCE_COPY_DEFAULT_STRING
-  // @@protoc_insertion_point(field_set_allocated:io.deephaven.proto.backplane.grpc.PartitionedTableDescriptor.constituent_definition_schema)
-}
-
-// bool constituent_changes_permitted = 5;
-inline void PartitionedTableDescriptor::clear_constituent_changes_permitted() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  _impl_.constituent_changes_permitted_ = false;
-}
-inline bool PartitionedTableDescriptor::constituent_changes_permitted() const {
-  // @@protoc_insertion_point(field_get:io.deephaven.proto.backplane.grpc.PartitionedTableDescriptor.constituent_changes_permitted)
-  return _internal_constituent_changes_permitted();
-}
-inline void PartitionedTableDescriptor::set_constituent_changes_permitted(bool value) {
-  _internal_set_constituent_changes_permitted(value);
-  // @@protoc_insertion_point(field_set:io.deephaven.proto.backplane.grpc.PartitionedTableDescriptor.constituent_changes_permitted)
-}
-inline bool PartitionedTableDescriptor::_internal_constituent_changes_permitted() const {
-  PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race);
-  return _impl_.constituent_changes_permitted_;
-}
-inline void PartitionedTableDescriptor::_internal_set_constituent_changes_permitted(bool value) {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  ;
-  _impl_.constituent_changes_permitted_ = value;
-}
-
-#ifdef __GNUC__
-#pragma GCC diagnostic pop
-#endif  // __GNUC__
-
-// @@protoc_insertion_point(namespace_scope)
-}  // namespace grpc
-}  // namespace backplane
-}  // namespace proto
-}  // namespace deephaven
-}  // namespace io
-
-
-// @@protoc_insertion_point(global_scope)
-
-#include "google/protobuf/port_undef.inc"
-
-#endif  // GOOGLE_PROTOBUF_INCLUDED_deephaven_2fproto_2fpartitionedtable_2eproto_2epb_2eh
diff --git a/cpp-client/deephaven/dhclient/proto/deephaven/proto/session.grpc.pb.cc b/cpp-client/deephaven/dhclient/proto/deephaven/proto/session.grpc.pb.cc
deleted file mode 100644
index a87d23ff9f2..00000000000
--- a/cpp-client/deephaven/dhclient/proto/deephaven/proto/session.grpc.pb.cc
+++ /dev/null
@@ -1,381 +0,0 @@
-// Generated by the gRPC C++ plugin.
-// If you make any local change, they will be lost.
-// source: deephaven/proto/session.proto
-
-#include "deephaven/proto/session.pb.h"
-#include "deephaven/proto/session.grpc.pb.h"
-
-#include <functional>
-#include <grpcpp/support/async_stream.h>
-#include <grpcpp/support/async_unary_call.h>
-#include <grpcpp/impl/channel_interface.h>
-#include <grpcpp/impl/client_unary_call.h>
-#include <grpcpp/support/client_callback.h>
-#include <grpcpp/support/message_allocator.h>
-#include <grpcpp/support/method_handler.h>
-#include <grpcpp/impl/rpc_service_method.h>
-#include <grpcpp/support/server_callback.h>
-#include <grpcpp/impl/server_callback_handlers.h>
-#include <grpcpp/server_context.h>
-#include <grpcpp/impl/service_type.h>
-#include <grpcpp/support/sync_stream.h>
-namespace io {
-namespace deephaven {
-namespace proto {
-namespace backplane {
-namespace grpc {
-
-static const char* SessionService_method_names[] = {
-  "/io.deephaven.proto.backplane.grpc.SessionService/NewSession",
-  "/io.deephaven.proto.backplane.grpc.SessionService/RefreshSessionToken",
-  "/io.deephaven.proto.backplane.grpc.SessionService/CloseSession",
-  "/io.deephaven.proto.backplane.grpc.SessionService/Release",
-  "/io.deephaven.proto.backplane.grpc.SessionService/ExportFromTicket",
-  "/io.deephaven.proto.backplane.grpc.SessionService/PublishFromTicket",
-  "/io.deephaven.proto.backplane.grpc.SessionService/ExportNotifications",
-  "/io.deephaven.proto.backplane.grpc.SessionService/TerminationNotification",
-};
-
-std::unique_ptr< SessionService::Stub> SessionService::NewStub(const std::shared_ptr< ::grpc::ChannelInterface>& channel, const ::grpc::StubOptions& options) {
-  (void)options;
-  std::unique_ptr< SessionService::Stub> stub(new SessionService::Stub(channel, options));
-  return stub;
-}
-
-SessionService::Stub::Stub(const std::shared_ptr< ::grpc::ChannelInterface>& channel, const ::grpc::StubOptions& options)
-  : channel_(channel), rpcmethod_NewSession_(SessionService_method_names[0], options.suffix_for_stats(),::grpc::internal::RpcMethod::NORMAL_RPC, channel)
-  , rpcmethod_RefreshSessionToken_(SessionService_method_names[1], options.suffix_for_stats(),::grpc::internal::RpcMethod::NORMAL_RPC, channel)
-  , rpcmethod_CloseSession_(SessionService_method_names[2], options.suffix_for_stats(),::grpc::internal::RpcMethod::NORMAL_RPC, channel)
-  , rpcmethod_Release_(SessionService_method_names[3], options.suffix_for_stats(),::grpc::internal::RpcMethod::NORMAL_RPC, channel)
-  , rpcmethod_ExportFromTicket_(SessionService_method_names[4], options.suffix_for_stats(),::grpc::internal::RpcMethod::NORMAL_RPC, channel)
-  , rpcmethod_PublishFromTicket_(SessionService_method_names[5], options.suffix_for_stats(),::grpc::internal::RpcMethod::NORMAL_RPC, channel)
-  , rpcmethod_ExportNotifications_(SessionService_method_names[6], options.suffix_for_stats(),::grpc::internal::RpcMethod::SERVER_STREAMING, channel)
-  , rpcmethod_TerminationNotification_(SessionService_method_names[7], options.suffix_for_stats(),::grpc::internal::RpcMethod::NORMAL_RPC, channel)
-  {}
-
-::grpc::Status SessionService::Stub::NewSession(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::HandshakeRequest& request, ::io::deephaven::proto::backplane::grpc::HandshakeResponse* response) {
-  return ::grpc::internal::BlockingUnaryCall< ::io::deephaven::proto::backplane::grpc::HandshakeRequest, ::io::deephaven::proto::backplane::grpc::HandshakeResponse, ::grpc::protobuf::MessageLite, ::grpc::protobuf::MessageLite>(channel_.get(), rpcmethod_NewSession_, context, request, response);
-}
-
-void SessionService::Stub::async::NewSession(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::HandshakeRequest* request, ::io::deephaven::proto::backplane::grpc::HandshakeResponse* response, std::function<void(::grpc::Status)> f) {
-  ::grpc::internal::CallbackUnaryCall< ::io::deephaven::proto::backplane::grpc::HandshakeRequest, ::io::deephaven::proto::backplane::grpc::HandshakeResponse, ::grpc::protobuf::MessageLite, ::grpc::protobuf::MessageLite>(stub_->channel_.get(), stub_->rpcmethod_NewSession_, context, request, response, std::move(f));
-}
-
-void SessionService::Stub::async::NewSession(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::HandshakeRequest* request, ::io::deephaven::proto::backplane::grpc::HandshakeResponse* response, ::grpc::ClientUnaryReactor* reactor) {
-  ::grpc::internal::ClientCallbackUnaryFactory::Create< ::grpc::protobuf::MessageLite, ::grpc::protobuf::MessageLite>(stub_->channel_.get(), stub_->rpcmethod_NewSession_, context, request, response, reactor);
-}
-
-::grpc::ClientAsyncResponseReader< ::io::deephaven::proto::backplane::grpc::HandshakeResponse>* SessionService::Stub::PrepareAsyncNewSessionRaw(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::HandshakeRequest& request, ::grpc::CompletionQueue* cq) {
-  return ::grpc::internal::ClientAsyncResponseReaderHelper::Create< ::io::deephaven::proto::backplane::grpc::HandshakeResponse, ::io::deephaven::proto::backplane::grpc::HandshakeRequest, ::grpc::protobuf::MessageLite, ::grpc::protobuf::MessageLite>(channel_.get(), cq, rpcmethod_NewSession_, context, request);
-}
-
-::grpc::ClientAsyncResponseReader< ::io::deephaven::proto::backplane::grpc::HandshakeResponse>* SessionService::Stub::AsyncNewSessionRaw(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::HandshakeRequest& request, ::grpc::CompletionQueue* cq) {
-  auto* result =
-    this->PrepareAsyncNewSessionRaw(context, request, cq);
-  result->StartCall();
-  return result;
-}
-
-::grpc::Status SessionService::Stub::RefreshSessionToken(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::HandshakeRequest& request, ::io::deephaven::proto::backplane::grpc::HandshakeResponse* response) {
-  return ::grpc::internal::BlockingUnaryCall< ::io::deephaven::proto::backplane::grpc::HandshakeRequest, ::io::deephaven::proto::backplane::grpc::HandshakeResponse, ::grpc::protobuf::MessageLite, ::grpc::protobuf::MessageLite>(channel_.get(), rpcmethod_RefreshSessionToken_, context, request, response);
-}
-
-void SessionService::Stub::async::RefreshSessionToken(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::HandshakeRequest* request, ::io::deephaven::proto::backplane::grpc::HandshakeResponse* response, std::function<void(::grpc::Status)> f) {
-  ::grpc::internal::CallbackUnaryCall< ::io::deephaven::proto::backplane::grpc::HandshakeRequest, ::io::deephaven::proto::backplane::grpc::HandshakeResponse, ::grpc::protobuf::MessageLite, ::grpc::protobuf::MessageLite>(stub_->channel_.get(), stub_->rpcmethod_RefreshSessionToken_, context, request, response, std::move(f));
-}
-
-void SessionService::Stub::async::RefreshSessionToken(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::HandshakeRequest* request, ::io::deephaven::proto::backplane::grpc::HandshakeResponse* response, ::grpc::ClientUnaryReactor* reactor) {
-  ::grpc::internal::ClientCallbackUnaryFactory::Create< ::grpc::protobuf::MessageLite, ::grpc::protobuf::MessageLite>(stub_->channel_.get(), stub_->rpcmethod_RefreshSessionToken_, context, request, response, reactor);
-}
-
-::grpc::ClientAsyncResponseReader< ::io::deephaven::proto::backplane::grpc::HandshakeResponse>* SessionService::Stub::PrepareAsyncRefreshSessionTokenRaw(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::HandshakeRequest& request, ::grpc::CompletionQueue* cq) {
-  return ::grpc::internal::ClientAsyncResponseReaderHelper::Create< ::io::deephaven::proto::backplane::grpc::HandshakeResponse, ::io::deephaven::proto::backplane::grpc::HandshakeRequest, ::grpc::protobuf::MessageLite, ::grpc::protobuf::MessageLite>(channel_.get(), cq, rpcmethod_RefreshSessionToken_, context, request);
-}
-
-::grpc::ClientAsyncResponseReader< ::io::deephaven::proto::backplane::grpc::HandshakeResponse>* SessionService::Stub::AsyncRefreshSessionTokenRaw(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::HandshakeRequest& request, ::grpc::CompletionQueue* cq) {
-  auto* result =
-    this->PrepareAsyncRefreshSessionTokenRaw(context, request, cq);
-  result->StartCall();
-  return result;
-}
-
-::grpc::Status SessionService::Stub::CloseSession(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::HandshakeRequest& request, ::io::deephaven::proto::backplane::grpc::CloseSessionResponse* response) {
-  return ::grpc::internal::BlockingUnaryCall< ::io::deephaven::proto::backplane::grpc::HandshakeRequest, ::io::deephaven::proto::backplane::grpc::CloseSessionResponse, ::grpc::protobuf::MessageLite, ::grpc::protobuf::MessageLite>(channel_.get(), rpcmethod_CloseSession_, context, request, response);
-}
-
-void SessionService::Stub::async::CloseSession(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::HandshakeRequest* request, ::io::deephaven::proto::backplane::grpc::CloseSessionResponse* response, std::function<void(::grpc::Status)> f) {
-  ::grpc::internal::CallbackUnaryCall< ::io::deephaven::proto::backplane::grpc::HandshakeRequest, ::io::deephaven::proto::backplane::grpc::CloseSessionResponse, ::grpc::protobuf::MessageLite, ::grpc::protobuf::MessageLite>(stub_->channel_.get(), stub_->rpcmethod_CloseSession_, context, request, response, std::move(f));
-}
-
-void SessionService::Stub::async::CloseSession(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::HandshakeRequest* request, ::io::deephaven::proto::backplane::grpc::CloseSessionResponse* response, ::grpc::ClientUnaryReactor* reactor) {
-  ::grpc::internal::ClientCallbackUnaryFactory::Create< ::grpc::protobuf::MessageLite, ::grpc::protobuf::MessageLite>(stub_->channel_.get(), stub_->rpcmethod_CloseSession_, context, request, response, reactor);
-}
-
-::grpc::ClientAsyncResponseReader< ::io::deephaven::proto::backplane::grpc::CloseSessionResponse>* SessionService::Stub::PrepareAsyncCloseSessionRaw(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::HandshakeRequest& request, ::grpc::CompletionQueue* cq) {
-  return ::grpc::internal::ClientAsyncResponseReaderHelper::Create< ::io::deephaven::proto::backplane::grpc::CloseSessionResponse, ::io::deephaven::proto::backplane::grpc::HandshakeRequest, ::grpc::protobuf::MessageLite, ::grpc::protobuf::MessageLite>(channel_.get(), cq, rpcmethod_CloseSession_, context, request);
-}
-
-::grpc::ClientAsyncResponseReader< ::io::deephaven::proto::backplane::grpc::CloseSessionResponse>* SessionService::Stub::AsyncCloseSessionRaw(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::HandshakeRequest& request, ::grpc::CompletionQueue* cq) {
-  auto* result =
-    this->PrepareAsyncCloseSessionRaw(context, request, cq);
-  result->StartCall();
-  return result;
-}
-
-::grpc::Status SessionService::Stub::Release(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::ReleaseRequest& request, ::io::deephaven::proto::backplane::grpc::ReleaseResponse* response) {
-  return ::grpc::internal::BlockingUnaryCall< ::io::deephaven::proto::backplane::grpc::ReleaseRequest, ::io::deephaven::proto::backplane::grpc::ReleaseResponse, ::grpc::protobuf::MessageLite, ::grpc::protobuf::MessageLite>(channel_.get(), rpcmethod_Release_, context, request, response);
-}
-
-void SessionService::Stub::async::Release(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::ReleaseRequest* request, ::io::deephaven::proto::backplane::grpc::ReleaseResponse* response, std::function<void(::grpc::Status)> f) {
-  ::grpc::internal::CallbackUnaryCall< ::io::deephaven::proto::backplane::grpc::ReleaseRequest, ::io::deephaven::proto::backplane::grpc::ReleaseResponse, ::grpc::protobuf::MessageLite, ::grpc::protobuf::MessageLite>(stub_->channel_.get(), stub_->rpcmethod_Release_, context, request, response, std::move(f));
-}
-
-void SessionService::Stub::async::Release(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::ReleaseRequest* request, ::io::deephaven::proto::backplane::grpc::ReleaseResponse* response, ::grpc::ClientUnaryReactor* reactor) {
-  ::grpc::internal::ClientCallbackUnaryFactory::Create< ::grpc::protobuf::MessageLite, ::grpc::protobuf::MessageLite>(stub_->channel_.get(), stub_->rpcmethod_Release_, context, request, response, reactor);
-}
-
-::grpc::ClientAsyncResponseReader< ::io::deephaven::proto::backplane::grpc::ReleaseResponse>* SessionService::Stub::PrepareAsyncReleaseRaw(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::ReleaseRequest& request, ::grpc::CompletionQueue* cq) {
-  return ::grpc::internal::ClientAsyncResponseReaderHelper::Create< ::io::deephaven::proto::backplane::grpc::ReleaseResponse, ::io::deephaven::proto::backplane::grpc::ReleaseRequest, ::grpc::protobuf::MessageLite, ::grpc::protobuf::MessageLite>(channel_.get(), cq, rpcmethod_Release_, context, request);
-}
-
-::grpc::ClientAsyncResponseReader< ::io::deephaven::proto::backplane::grpc::ReleaseResponse>* SessionService::Stub::AsyncReleaseRaw(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::ReleaseRequest& request, ::grpc::CompletionQueue* cq) {
-  auto* result =
-    this->PrepareAsyncReleaseRaw(context, request, cq);
-  result->StartCall();
-  return result;
-}
-
-::grpc::Status SessionService::Stub::ExportFromTicket(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::ExportRequest& request, ::io::deephaven::proto::backplane::grpc::ExportResponse* response) {
-  return ::grpc::internal::BlockingUnaryCall< ::io::deephaven::proto::backplane::grpc::ExportRequest, ::io::deephaven::proto::backplane::grpc::ExportResponse, ::grpc::protobuf::MessageLite, ::grpc::protobuf::MessageLite>(channel_.get(), rpcmethod_ExportFromTicket_, context, request, response);
-}
-
-void SessionService::Stub::async::ExportFromTicket(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::ExportRequest* request, ::io::deephaven::proto::backplane::grpc::ExportResponse* response, std::function<void(::grpc::Status)> f) {
-  ::grpc::internal::CallbackUnaryCall< ::io::deephaven::proto::backplane::grpc::ExportRequest, ::io::deephaven::proto::backplane::grpc::ExportResponse, ::grpc::protobuf::MessageLite, ::grpc::protobuf::MessageLite>(stub_->channel_.get(), stub_->rpcmethod_ExportFromTicket_, context, request, response, std::move(f));
-}
-
-void SessionService::Stub::async::ExportFromTicket(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::ExportRequest* request, ::io::deephaven::proto::backplane::grpc::ExportResponse* response, ::grpc::ClientUnaryReactor* reactor) {
-  ::grpc::internal::ClientCallbackUnaryFactory::Create< ::grpc::protobuf::MessageLite, ::grpc::protobuf::MessageLite>(stub_->channel_.get(), stub_->rpcmethod_ExportFromTicket_, context, request, response, reactor);
-}
-
-::grpc::ClientAsyncResponseReader< ::io::deephaven::proto::backplane::grpc::ExportResponse>* SessionService::Stub::PrepareAsyncExportFromTicketRaw(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::ExportRequest& request, ::grpc::CompletionQueue* cq) {
-  return ::grpc::internal::ClientAsyncResponseReaderHelper::Create< ::io::deephaven::proto::backplane::grpc::ExportResponse, ::io::deephaven::proto::backplane::grpc::ExportRequest, ::grpc::protobuf::MessageLite, ::grpc::protobuf::MessageLite>(channel_.get(), cq, rpcmethod_ExportFromTicket_, context, request);
-}
-
-::grpc::ClientAsyncResponseReader< ::io::deephaven::proto::backplane::grpc::ExportResponse>* SessionService::Stub::AsyncExportFromTicketRaw(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::ExportRequest& request, ::grpc::CompletionQueue* cq) {
-  auto* result =
-    this->PrepareAsyncExportFromTicketRaw(context, request, cq);
-  result->StartCall();
-  return result;
-}
-
-::grpc::Status SessionService::Stub::PublishFromTicket(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::PublishRequest& request, ::io::deephaven::proto::backplane::grpc::PublishResponse* response) {
-  return ::grpc::internal::BlockingUnaryCall< ::io::deephaven::proto::backplane::grpc::PublishRequest, ::io::deephaven::proto::backplane::grpc::PublishResponse, ::grpc::protobuf::MessageLite, ::grpc::protobuf::MessageLite>(channel_.get(), rpcmethod_PublishFromTicket_, context, request, response);
-}
-
-void SessionService::Stub::async::PublishFromTicket(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::PublishRequest* request, ::io::deephaven::proto::backplane::grpc::PublishResponse* response, std::function<void(::grpc::Status)> f) {
-  ::grpc::internal::CallbackUnaryCall< ::io::deephaven::proto::backplane::grpc::PublishRequest, ::io::deephaven::proto::backplane::grpc::PublishResponse, ::grpc::protobuf::MessageLite, ::grpc::protobuf::MessageLite>(stub_->channel_.get(), stub_->rpcmethod_PublishFromTicket_, context, request, response, std::move(f));
-}
-
-void SessionService::Stub::async::PublishFromTicket(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::PublishRequest* request, ::io::deephaven::proto::backplane::grpc::PublishResponse* response, ::grpc::ClientUnaryReactor* reactor) {
-  ::grpc::internal::ClientCallbackUnaryFactory::Create< ::grpc::protobuf::MessageLite, ::grpc::protobuf::MessageLite>(stub_->channel_.get(), stub_->rpcmethod_PublishFromTicket_, context, request, response, reactor);
-}
-
-::grpc::ClientAsyncResponseReader< ::io::deephaven::proto::backplane::grpc::PublishResponse>* SessionService::Stub::PrepareAsyncPublishFromTicketRaw(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::PublishRequest& request, ::grpc::CompletionQueue* cq) {
-  return ::grpc::internal::ClientAsyncResponseReaderHelper::Create< ::io::deephaven::proto::backplane::grpc::PublishResponse, ::io::deephaven::proto::backplane::grpc::PublishRequest, ::grpc::protobuf::MessageLite, ::grpc::protobuf::MessageLite>(channel_.get(), cq, rpcmethod_PublishFromTicket_, context, request);
-}
-
-::grpc::ClientAsyncResponseReader< ::io::deephaven::proto::backplane::grpc::PublishResponse>* SessionService::Stub::AsyncPublishFromTicketRaw(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::PublishRequest& request, ::grpc::CompletionQueue* cq) {
-  auto* result =
-    this->PrepareAsyncPublishFromTicketRaw(context, request, cq);
-  result->StartCall();
-  return result;
-}
-
-::grpc::ClientReader< ::io::deephaven::proto::backplane::grpc::ExportNotification>* SessionService::Stub::ExportNotificationsRaw(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::ExportNotificationRequest& request) {
-  return ::grpc::internal::ClientReaderFactory< ::io::deephaven::proto::backplane::grpc::ExportNotification>::Create(channel_.get(), rpcmethod_ExportNotifications_, context, request);
-}
-
-void SessionService::Stub::async::ExportNotifications(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::ExportNotificationRequest* request, ::grpc::ClientReadReactor< ::io::deephaven::proto::backplane::grpc::ExportNotification>* reactor) {
-  ::grpc::internal::ClientCallbackReaderFactory< ::io::deephaven::proto::backplane::grpc::ExportNotification>::Create(stub_->channel_.get(), stub_->rpcmethod_ExportNotifications_, context, request, reactor);
-}
-
-::grpc::ClientAsyncReader< ::io::deephaven::proto::backplane::grpc::ExportNotification>* SessionService::Stub::AsyncExportNotificationsRaw(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::ExportNotificationRequest& request, ::grpc::CompletionQueue* cq, void* tag) {
-  return ::grpc::internal::ClientAsyncReaderFactory< ::io::deephaven::proto::backplane::grpc::ExportNotification>::Create(channel_.get(), cq, rpcmethod_ExportNotifications_, context, request, true, tag);
-}
-
-::grpc::ClientAsyncReader< ::io::deephaven::proto::backplane::grpc::ExportNotification>* SessionService::Stub::PrepareAsyncExportNotificationsRaw(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::ExportNotificationRequest& request, ::grpc::CompletionQueue* cq) {
-  return ::grpc::internal::ClientAsyncReaderFactory< ::io::deephaven::proto::backplane::grpc::ExportNotification>::Create(channel_.get(), cq, rpcmethod_ExportNotifications_, context, request, false, nullptr);
-}
-
-::grpc::Status SessionService::Stub::TerminationNotification(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::TerminationNotificationRequest& request, ::io::deephaven::proto::backplane::grpc::TerminationNotificationResponse* response) {
-  return ::grpc::internal::BlockingUnaryCall< ::io::deephaven::proto::backplane::grpc::TerminationNotificationRequest, ::io::deephaven::proto::backplane::grpc::TerminationNotificationResponse, ::grpc::protobuf::MessageLite, ::grpc::protobuf::MessageLite>(channel_.get(), rpcmethod_TerminationNotification_, context, request, response);
-}
-
-void SessionService::Stub::async::TerminationNotification(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::TerminationNotificationRequest* request, ::io::deephaven::proto::backplane::grpc::TerminationNotificationResponse* response, std::function<void(::grpc::Status)> f) {
-  ::grpc::internal::CallbackUnaryCall< ::io::deephaven::proto::backplane::grpc::TerminationNotificationRequest, ::io::deephaven::proto::backplane::grpc::TerminationNotificationResponse, ::grpc::protobuf::MessageLite, ::grpc::protobuf::MessageLite>(stub_->channel_.get(), stub_->rpcmethod_TerminationNotification_, context, request, response, std::move(f));
-}
-
-void SessionService::Stub::async::TerminationNotification(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::TerminationNotificationRequest* request, ::io::deephaven::proto::backplane::grpc::TerminationNotificationResponse* response, ::grpc::ClientUnaryReactor* reactor) {
-  ::grpc::internal::ClientCallbackUnaryFactory::Create< ::grpc::protobuf::MessageLite, ::grpc::protobuf::MessageLite>(stub_->channel_.get(), stub_->rpcmethod_TerminationNotification_, context, request, response, reactor);
-}
-
-::grpc::ClientAsyncResponseReader< ::io::deephaven::proto::backplane::grpc::TerminationNotificationResponse>* SessionService::Stub::PrepareAsyncTerminationNotificationRaw(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::TerminationNotificationRequest& request, ::grpc::CompletionQueue* cq) {
-  return ::grpc::internal::ClientAsyncResponseReaderHelper::Create< ::io::deephaven::proto::backplane::grpc::TerminationNotificationResponse, ::io::deephaven::proto::backplane::grpc::TerminationNotificationRequest, ::grpc::protobuf::MessageLite, ::grpc::protobuf::MessageLite>(channel_.get(), cq, rpcmethod_TerminationNotification_, context, request);
-}
-
-::grpc::ClientAsyncResponseReader< ::io::deephaven::proto::backplane::grpc::TerminationNotificationResponse>* SessionService::Stub::AsyncTerminationNotificationRaw(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::TerminationNotificationRequest& request, ::grpc::CompletionQueue* cq) {
-  auto* result =
-    this->PrepareAsyncTerminationNotificationRaw(context, request, cq);
-  result->StartCall();
-  return result;
-}
-
-SessionService::Service::Service() {
-  AddMethod(new ::grpc::internal::RpcServiceMethod(
-      SessionService_method_names[0],
-      ::grpc::internal::RpcMethod::NORMAL_RPC,
-      new ::grpc::internal::RpcMethodHandler< SessionService::Service, ::io::deephaven::proto::backplane::grpc::HandshakeRequest, ::io::deephaven::proto::backplane::grpc::HandshakeResponse, ::grpc::protobuf::MessageLite, ::grpc::protobuf::MessageLite>(
-          [](SessionService::Service* service,
-             ::grpc::ServerContext* ctx,
-             const ::io::deephaven::proto::backplane::grpc::HandshakeRequest* req,
-             ::io::deephaven::proto::backplane::grpc::HandshakeResponse* resp) {
-               return service->NewSession(ctx, req, resp);
-             }, this)));
-  AddMethod(new ::grpc::internal::RpcServiceMethod(
-      SessionService_method_names[1],
-      ::grpc::internal::RpcMethod::NORMAL_RPC,
-      new ::grpc::internal::RpcMethodHandler< SessionService::Service, ::io::deephaven::proto::backplane::grpc::HandshakeRequest, ::io::deephaven::proto::backplane::grpc::HandshakeResponse, ::grpc::protobuf::MessageLite, ::grpc::protobuf::MessageLite>(
-          [](SessionService::Service* service,
-             ::grpc::ServerContext* ctx,
-             const ::io::deephaven::proto::backplane::grpc::HandshakeRequest* req,
-             ::io::deephaven::proto::backplane::grpc::HandshakeResponse* resp) {
-               return service->RefreshSessionToken(ctx, req, resp);
-             }, this)));
-  AddMethod(new ::grpc::internal::RpcServiceMethod(
-      SessionService_method_names[2],
-      ::grpc::internal::RpcMethod::NORMAL_RPC,
-      new ::grpc::internal::RpcMethodHandler< SessionService::Service, ::io::deephaven::proto::backplane::grpc::HandshakeRequest, ::io::deephaven::proto::backplane::grpc::CloseSessionResponse, ::grpc::protobuf::MessageLite, ::grpc::protobuf::MessageLite>(
-          [](SessionService::Service* service,
-             ::grpc::ServerContext* ctx,
-             const ::io::deephaven::proto::backplane::grpc::HandshakeRequest* req,
-             ::io::deephaven::proto::backplane::grpc::CloseSessionResponse* resp) {
-               return service->CloseSession(ctx, req, resp);
-             }, this)));
-  AddMethod(new ::grpc::internal::RpcServiceMethod(
-      SessionService_method_names[3],
-      ::grpc::internal::RpcMethod::NORMAL_RPC,
-      new ::grpc::internal::RpcMethodHandler< SessionService::Service, ::io::deephaven::proto::backplane::grpc::ReleaseRequest, ::io::deephaven::proto::backplane::grpc::ReleaseResponse, ::grpc::protobuf::MessageLite, ::grpc::protobuf::MessageLite>(
-          [](SessionService::Service* service,
-             ::grpc::ServerContext* ctx,
-             const ::io::deephaven::proto::backplane::grpc::ReleaseRequest* req,
-             ::io::deephaven::proto::backplane::grpc::ReleaseResponse* resp) {
-               return service->Release(ctx, req, resp);
-             }, this)));
-  AddMethod(new ::grpc::internal::RpcServiceMethod(
-      SessionService_method_names[4],
-      ::grpc::internal::RpcMethod::NORMAL_RPC,
-      new ::grpc::internal::RpcMethodHandler< SessionService::Service, ::io::deephaven::proto::backplane::grpc::ExportRequest, ::io::deephaven::proto::backplane::grpc::ExportResponse, ::grpc::protobuf::MessageLite, ::grpc::protobuf::MessageLite>(
-          [](SessionService::Service* service,
-             ::grpc::ServerContext* ctx,
-             const ::io::deephaven::proto::backplane::grpc::ExportRequest* req,
-             ::io::deephaven::proto::backplane::grpc::ExportResponse* resp) {
-               return service->ExportFromTicket(ctx, req, resp);
-             }, this)));
-  AddMethod(new ::grpc::internal::RpcServiceMethod(
-      SessionService_method_names[5],
-      ::grpc::internal::RpcMethod::NORMAL_RPC,
-      new ::grpc::internal::RpcMethodHandler< SessionService::Service, ::io::deephaven::proto::backplane::grpc::PublishRequest, ::io::deephaven::proto::backplane::grpc::PublishResponse, ::grpc::protobuf::MessageLite, ::grpc::protobuf::MessageLite>(
-          [](SessionService::Service* service,
-             ::grpc::ServerContext* ctx,
-             const ::io::deephaven::proto::backplane::grpc::PublishRequest* req,
-             ::io::deephaven::proto::backplane::grpc::PublishResponse* resp) {
-               return service->PublishFromTicket(ctx, req, resp);
-             }, this)));
-  AddMethod(new ::grpc::internal::RpcServiceMethod(
-      SessionService_method_names[6],
-      ::grpc::internal::RpcMethod::SERVER_STREAMING,
-      new ::grpc::internal::ServerStreamingHandler< SessionService::Service, ::io::deephaven::proto::backplane::grpc::ExportNotificationRequest, ::io::deephaven::proto::backplane::grpc::ExportNotification>(
-          [](SessionService::Service* service,
-             ::grpc::ServerContext* ctx,
-             const ::io::deephaven::proto::backplane::grpc::ExportNotificationRequest* req,
-             ::grpc::ServerWriter<::io::deephaven::proto::backplane::grpc::ExportNotification>* writer) {
-               return service->ExportNotifications(ctx, req, writer);
-             }, this)));
-  AddMethod(new ::grpc::internal::RpcServiceMethod(
-      SessionService_method_names[7],
-      ::grpc::internal::RpcMethod::NORMAL_RPC,
-      new ::grpc::internal::RpcMethodHandler< SessionService::Service, ::io::deephaven::proto::backplane::grpc::TerminationNotificationRequest, ::io::deephaven::proto::backplane::grpc::TerminationNotificationResponse, ::grpc::protobuf::MessageLite, ::grpc::protobuf::MessageLite>(
-          [](SessionService::Service* service,
-             ::grpc::ServerContext* ctx,
-             const ::io::deephaven::proto::backplane::grpc::TerminationNotificationRequest* req,
-             ::io::deephaven::proto::backplane::grpc::TerminationNotificationResponse* resp) {
-               return service->TerminationNotification(ctx, req, resp);
-             }, this)));
-}
-
-SessionService::Service::~Service() {
-}
-
-::grpc::Status SessionService::Service::NewSession(::grpc::ServerContext* context, const ::io::deephaven::proto::backplane::grpc::HandshakeRequest* request, ::io::deephaven::proto::backplane::grpc::HandshakeResponse* response) {
-  (void) context;
-  (void) request;
-  (void) response;
-  return ::grpc::Status(::grpc::StatusCode::UNIMPLEMENTED, "");
-}
-
-::grpc::Status SessionService::Service::RefreshSessionToken(::grpc::ServerContext* context, const ::io::deephaven::proto::backplane::grpc::HandshakeRequest* request, ::io::deephaven::proto::backplane::grpc::HandshakeResponse* response) {
-  (void) context;
-  (void) request;
-  (void) response;
-  return ::grpc::Status(::grpc::StatusCode::UNIMPLEMENTED, "");
-}
-
-::grpc::Status SessionService::Service::CloseSession(::grpc::ServerContext* context, const ::io::deephaven::proto::backplane::grpc::HandshakeRequest* request, ::io::deephaven::proto::backplane::grpc::CloseSessionResponse* response) {
-  (void) context;
-  (void) request;
-  (void) response;
-  return ::grpc::Status(::grpc::StatusCode::UNIMPLEMENTED, "");
-}
-
-::grpc::Status SessionService::Service::Release(::grpc::ServerContext* context, const ::io::deephaven::proto::backplane::grpc::ReleaseRequest* request, ::io::deephaven::proto::backplane::grpc::ReleaseResponse* response) {
-  (void) context;
-  (void) request;
-  (void) response;
-  return ::grpc::Status(::grpc::StatusCode::UNIMPLEMENTED, "");
-}
-
-::grpc::Status SessionService::Service::ExportFromTicket(::grpc::ServerContext* context, const ::io::deephaven::proto::backplane::grpc::ExportRequest* request, ::io::deephaven::proto::backplane::grpc::ExportResponse* response) {
-  (void) context;
-  (void) request;
-  (void) response;
-  return ::grpc::Status(::grpc::StatusCode::UNIMPLEMENTED, "");
-}
-
-::grpc::Status SessionService::Service::PublishFromTicket(::grpc::ServerContext* context, const ::io::deephaven::proto::backplane::grpc::PublishRequest* request, ::io::deephaven::proto::backplane::grpc::PublishResponse* response) {
-  (void) context;
-  (void) request;
-  (void) response;
-  return ::grpc::Status(::grpc::StatusCode::UNIMPLEMENTED, "");
-}
-
-::grpc::Status SessionService::Service::ExportNotifications(::grpc::ServerContext* context, const ::io::deephaven::proto::backplane::grpc::ExportNotificationRequest* request, ::grpc::ServerWriter< ::io::deephaven::proto::backplane::grpc::ExportNotification>* writer) {
-  (void) context;
-  (void) request;
-  (void) writer;
-  return ::grpc::Status(::grpc::StatusCode::UNIMPLEMENTED, "");
-}
-
-::grpc::Status SessionService::Service::TerminationNotification(::grpc::ServerContext* context, const ::io::deephaven::proto::backplane::grpc::TerminationNotificationRequest* request, ::io::deephaven::proto::backplane::grpc::TerminationNotificationResponse* response) {
-  (void) context;
-  (void) request;
-  (void) response;
-  return ::grpc::Status(::grpc::StatusCode::UNIMPLEMENTED, "");
-}
-
-
-}  // namespace io
-}  // namespace deephaven
-}  // namespace proto
-}  // namespace backplane
-}  // namespace grpc
-
diff --git a/cpp-client/deephaven/dhclient/proto/deephaven/proto/session.grpc.pb.h b/cpp-client/deephaven/dhclient/proto/deephaven/proto/session.grpc.pb.h
deleted file mode 100644
index 6be5ef4d538..00000000000
--- a/cpp-client/deephaven/dhclient/proto/deephaven/proto/session.grpc.pb.h
+++ /dev/null
@@ -1,1462 +0,0 @@
-// Generated by the gRPC C++ plugin.
-// If you make any local change, they will be lost.
-// source: deephaven/proto/session.proto
-// Original file comments:
-//
-// Copyright (c) 2016-2022 Deephaven Data Labs and Patent Pending
-#ifndef GRPC_deephaven_2fproto_2fsession_2eproto__INCLUDED
-#define GRPC_deephaven_2fproto_2fsession_2eproto__INCLUDED
-
-#include "deephaven/proto/session.pb.h"
-
-#include <functional>
-#include <grpcpp/generic/async_generic_service.h>
-#include <grpcpp/support/async_stream.h>
-#include <grpcpp/support/async_unary_call.h>
-#include <grpcpp/support/client_callback.h>
-#include <grpcpp/client_context.h>
-#include <grpcpp/completion_queue.h>
-#include <grpcpp/support/message_allocator.h>
-#include <grpcpp/support/method_handler.h>
-#include <grpcpp/impl/proto_utils.h>
-#include <grpcpp/impl/rpc_method.h>
-#include <grpcpp/support/server_callback.h>
-#include <grpcpp/impl/server_callback_handlers.h>
-#include <grpcpp/server_context.h>
-#include <grpcpp/impl/service_type.h>
-#include <grpcpp/support/status.h>
-#include <grpcpp/support/stub_options.h>
-#include <grpcpp/support/sync_stream.h>
-
-namespace io {
-namespace deephaven {
-namespace proto {
-namespace backplane {
-namespace grpc {
-
-//
-// User supplied Flight.Ticket(s) should begin with 'e' byte followed by an signed little-endian int. The client is only
-// allowed to use the positive exportId key-space (client generated exportIds should be greater than 0). The client is
-// encouraged to use a packed ranges of ids as this yields the smallest footprint server side for long running sessions.
-//
-// The client is responsible for releasing all Flight.Tickets that they create or that were created for them via a gRPC
-// call. The documentation for the gRPC call will indicate that the exports must be released. Exports that need to be
-// released will always be communicated over the session's ExportNotification stream.
-//
-// When a session ends, either explicitly or due to timeout, all exported objects in that session are released
-// automatically.
-//
-// Some parts of the API return a Flight.Ticket that does not need to be released. It is not an error to attempt to
-// release them.
-class SessionService final {
- public:
-  static constexpr char const* service_full_name() {
-    return "io.deephaven.proto.backplane.grpc.SessionService";
-  }
-  class StubInterface {
-   public:
-    virtual ~StubInterface() {}
-    //
-    // Handshake between client and server to create a new session. The response includes a metadata header name and the
-    // token to send on every subsequent request. The auth mechanisms here are unary to best support grpc-web.
-    //
-    // Deprecated: Please use Flight's Handshake or http authorization headers instead.
-    virtual ::grpc::Status NewSession(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::HandshakeRequest& request, ::io::deephaven::proto::backplane::grpc::HandshakeResponse* response) = 0;
-    std::unique_ptr< ::grpc::ClientAsyncResponseReaderInterface< ::io::deephaven::proto::backplane::grpc::HandshakeResponse>> AsyncNewSession(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::HandshakeRequest& request, ::grpc::CompletionQueue* cq) {
-      return std::unique_ptr< ::grpc::ClientAsyncResponseReaderInterface< ::io::deephaven::proto::backplane::grpc::HandshakeResponse>>(AsyncNewSessionRaw(context, request, cq));
-    }
-    std::unique_ptr< ::grpc::ClientAsyncResponseReaderInterface< ::io::deephaven::proto::backplane::grpc::HandshakeResponse>> PrepareAsyncNewSession(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::HandshakeRequest& request, ::grpc::CompletionQueue* cq) {
-      return std::unique_ptr< ::grpc::ClientAsyncResponseReaderInterface< ::io::deephaven::proto::backplane::grpc::HandshakeResponse>>(PrepareAsyncNewSessionRaw(context, request, cq));
-    }
-    //
-    // Keep-alive a given token to ensure that a session is not cleaned prematurely. The response may include an updated
-    // token that should replace the existing token for subsequent requests.
-    //
-    // Deprecated: Please use Flight's Handshake with an empty payload.
-    virtual ::grpc::Status RefreshSessionToken(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::HandshakeRequest& request, ::io::deephaven::proto::backplane::grpc::HandshakeResponse* response) = 0;
-    std::unique_ptr< ::grpc::ClientAsyncResponseReaderInterface< ::io::deephaven::proto::backplane::grpc::HandshakeResponse>> AsyncRefreshSessionToken(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::HandshakeRequest& request, ::grpc::CompletionQueue* cq) {
-      return std::unique_ptr< ::grpc::ClientAsyncResponseReaderInterface< ::io::deephaven::proto::backplane::grpc::HandshakeResponse>>(AsyncRefreshSessionTokenRaw(context, request, cq));
-    }
-    std::unique_ptr< ::grpc::ClientAsyncResponseReaderInterface< ::io::deephaven::proto::backplane::grpc::HandshakeResponse>> PrepareAsyncRefreshSessionToken(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::HandshakeRequest& request, ::grpc::CompletionQueue* cq) {
-      return std::unique_ptr< ::grpc::ClientAsyncResponseReaderInterface< ::io::deephaven::proto::backplane::grpc::HandshakeResponse>>(PrepareAsyncRefreshSessionTokenRaw(context, request, cq));
-    }
-    //
-    // Proactively close an open session. Sessions will automatically close on timeout. When a session is closed, all
-    // unreleased exports will be automatically released.
-    virtual ::grpc::Status CloseSession(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::HandshakeRequest& request, ::io::deephaven::proto::backplane::grpc::CloseSessionResponse* response) = 0;
-    std::unique_ptr< ::grpc::ClientAsyncResponseReaderInterface< ::io::deephaven::proto::backplane::grpc::CloseSessionResponse>> AsyncCloseSession(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::HandshakeRequest& request, ::grpc::CompletionQueue* cq) {
-      return std::unique_ptr< ::grpc::ClientAsyncResponseReaderInterface< ::io::deephaven::proto::backplane::grpc::CloseSessionResponse>>(AsyncCloseSessionRaw(context, request, cq));
-    }
-    std::unique_ptr< ::grpc::ClientAsyncResponseReaderInterface< ::io::deephaven::proto::backplane::grpc::CloseSessionResponse>> PrepareAsyncCloseSession(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::HandshakeRequest& request, ::grpc::CompletionQueue* cq) {
-      return std::unique_ptr< ::grpc::ClientAsyncResponseReaderInterface< ::io::deephaven::proto::backplane::grpc::CloseSessionResponse>>(PrepareAsyncCloseSessionRaw(context, request, cq));
-    }
-    //
-    // Attempts to release an export by its ticket. Returns true if an existing export was found. It is the client's
-    // responsibility to release all resources they no longer want the server to hold on to. Proactively cancels work; do
-    // not release a ticket that is needed by dependent work that has not yet finished
-    // (i.e. the dependencies that are staying around should first be in EXPORTED state).
-    virtual ::grpc::Status Release(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::ReleaseRequest& request, ::io::deephaven::proto::backplane::grpc::ReleaseResponse* response) = 0;
-    std::unique_ptr< ::grpc::ClientAsyncResponseReaderInterface< ::io::deephaven::proto::backplane::grpc::ReleaseResponse>> AsyncRelease(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::ReleaseRequest& request, ::grpc::CompletionQueue* cq) {
-      return std::unique_ptr< ::grpc::ClientAsyncResponseReaderInterface< ::io::deephaven::proto::backplane::grpc::ReleaseResponse>>(AsyncReleaseRaw(context, request, cq));
-    }
-    std::unique_ptr< ::grpc::ClientAsyncResponseReaderInterface< ::io::deephaven::proto::backplane::grpc::ReleaseResponse>> PrepareAsyncRelease(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::ReleaseRequest& request, ::grpc::CompletionQueue* cq) {
-      return std::unique_ptr< ::grpc::ClientAsyncResponseReaderInterface< ::io::deephaven::proto::backplane::grpc::ReleaseResponse>>(PrepareAsyncReleaseRaw(context, request, cq));
-    }
-    //
-    // Makes a copy from a source ticket to a client managed result ticket. The source ticket does not need to be
-    // a client managed ticket.
-    virtual ::grpc::Status ExportFromTicket(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::ExportRequest& request, ::io::deephaven::proto::backplane::grpc::ExportResponse* response) = 0;
-    std::unique_ptr< ::grpc::ClientAsyncResponseReaderInterface< ::io::deephaven::proto::backplane::grpc::ExportResponse>> AsyncExportFromTicket(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::ExportRequest& request, ::grpc::CompletionQueue* cq) {
-      return std::unique_ptr< ::grpc::ClientAsyncResponseReaderInterface< ::io::deephaven::proto::backplane::grpc::ExportResponse>>(AsyncExportFromTicketRaw(context, request, cq));
-    }
-    std::unique_ptr< ::grpc::ClientAsyncResponseReaderInterface< ::io::deephaven::proto::backplane::grpc::ExportResponse>> PrepareAsyncExportFromTicket(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::ExportRequest& request, ::grpc::CompletionQueue* cq) {
-      return std::unique_ptr< ::grpc::ClientAsyncResponseReaderInterface< ::io::deephaven::proto::backplane::grpc::ExportResponse>>(PrepareAsyncExportFromTicketRaw(context, request, cq));
-    }
-    //
-    // Makes a copy from a source ticket and publishes to a result ticket. Neither the source ticket, nor the destination
-    // ticket, need to be a client managed ticket.
-    virtual ::grpc::Status PublishFromTicket(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::PublishRequest& request, ::io::deephaven::proto::backplane::grpc::PublishResponse* response) = 0;
-    std::unique_ptr< ::grpc::ClientAsyncResponseReaderInterface< ::io::deephaven::proto::backplane::grpc::PublishResponse>> AsyncPublishFromTicket(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::PublishRequest& request, ::grpc::CompletionQueue* cq) {
-      return std::unique_ptr< ::grpc::ClientAsyncResponseReaderInterface< ::io::deephaven::proto::backplane::grpc::PublishResponse>>(AsyncPublishFromTicketRaw(context, request, cq));
-    }
-    std::unique_ptr< ::grpc::ClientAsyncResponseReaderInterface< ::io::deephaven::proto::backplane::grpc::PublishResponse>> PrepareAsyncPublishFromTicket(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::PublishRequest& request, ::grpc::CompletionQueue* cq) {
-      return std::unique_ptr< ::grpc::ClientAsyncResponseReaderInterface< ::io::deephaven::proto::backplane::grpc::PublishResponse>>(PrepareAsyncPublishFromTicketRaw(context, request, cq));
-    }
-    //
-    // Establish a stream to manage all session exports, including those lost due to partially complete rpc calls.
-    //
-    // New streams will flush notifications for all un-released exports, prior to seeing any new or updated exports
-    // for all live exports. After the refresh of existing state, subscribers will receive notifications of new and
-    // updated exports. An export id of zero will be sent to indicate all pre-existing exports have been sent.
-    std::unique_ptr< ::grpc::ClientReaderInterface< ::io::deephaven::proto::backplane::grpc::ExportNotification>> ExportNotifications(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::ExportNotificationRequest& request) {
-      return std::unique_ptr< ::grpc::ClientReaderInterface< ::io::deephaven::proto::backplane::grpc::ExportNotification>>(ExportNotificationsRaw(context, request));
-    }
-    std::unique_ptr< ::grpc::ClientAsyncReaderInterface< ::io::deephaven::proto::backplane::grpc::ExportNotification>> AsyncExportNotifications(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::ExportNotificationRequest& request, ::grpc::CompletionQueue* cq, void* tag) {
-      return std::unique_ptr< ::grpc::ClientAsyncReaderInterface< ::io::deephaven::proto::backplane::grpc::ExportNotification>>(AsyncExportNotificationsRaw(context, request, cq, tag));
-    }
-    std::unique_ptr< ::grpc::ClientAsyncReaderInterface< ::io::deephaven::proto::backplane::grpc::ExportNotification>> PrepareAsyncExportNotifications(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::ExportNotificationRequest& request, ::grpc::CompletionQueue* cq) {
-      return std::unique_ptr< ::grpc::ClientAsyncReaderInterface< ::io::deephaven::proto::backplane::grpc::ExportNotification>>(PrepareAsyncExportNotificationsRaw(context, request, cq));
-    }
-    //
-    // Receive a best-effort message on-exit indicating why this server is exiting. Reception of this message cannot be
-    // guaranteed.
-    virtual ::grpc::Status TerminationNotification(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::TerminationNotificationRequest& request, ::io::deephaven::proto::backplane::grpc::TerminationNotificationResponse* response) = 0;
-    std::unique_ptr< ::grpc::ClientAsyncResponseReaderInterface< ::io::deephaven::proto::backplane::grpc::TerminationNotificationResponse>> AsyncTerminationNotification(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::TerminationNotificationRequest& request, ::grpc::CompletionQueue* cq) {
-      return std::unique_ptr< ::grpc::ClientAsyncResponseReaderInterface< ::io::deephaven::proto::backplane::grpc::TerminationNotificationResponse>>(AsyncTerminationNotificationRaw(context, request, cq));
-    }
-    std::unique_ptr< ::grpc::ClientAsyncResponseReaderInterface< ::io::deephaven::proto::backplane::grpc::TerminationNotificationResponse>> PrepareAsyncTerminationNotification(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::TerminationNotificationRequest& request, ::grpc::CompletionQueue* cq) {
-      return std::unique_ptr< ::grpc::ClientAsyncResponseReaderInterface< ::io::deephaven::proto::backplane::grpc::TerminationNotificationResponse>>(PrepareAsyncTerminationNotificationRaw(context, request, cq));
-    }
-    class async_interface {
-     public:
-      virtual ~async_interface() {}
-      //
-      // Handshake between client and server to create a new session. The response includes a metadata header name and the
-      // token to send on every subsequent request. The auth mechanisms here are unary to best support grpc-web.
-      //
-      // Deprecated: Please use Flight's Handshake or http authorization headers instead.
-      virtual void NewSession(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::HandshakeRequest* request, ::io::deephaven::proto::backplane::grpc::HandshakeResponse* response, std::function<void(::grpc::Status)>) = 0;
-      virtual void NewSession(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::HandshakeRequest* request, ::io::deephaven::proto::backplane::grpc::HandshakeResponse* response, ::grpc::ClientUnaryReactor* reactor) = 0;
-      //
-      // Keep-alive a given token to ensure that a session is not cleaned prematurely. The response may include an updated
-      // token that should replace the existing token for subsequent requests.
-      //
-      // Deprecated: Please use Flight's Handshake with an empty payload.
-      virtual void RefreshSessionToken(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::HandshakeRequest* request, ::io::deephaven::proto::backplane::grpc::HandshakeResponse* response, std::function<void(::grpc::Status)>) = 0;
-      virtual void RefreshSessionToken(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::HandshakeRequest* request, ::io::deephaven::proto::backplane::grpc::HandshakeResponse* response, ::grpc::ClientUnaryReactor* reactor) = 0;
-      //
-      // Proactively close an open session. Sessions will automatically close on timeout. When a session is closed, all
-      // unreleased exports will be automatically released.
-      virtual void CloseSession(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::HandshakeRequest* request, ::io::deephaven::proto::backplane::grpc::CloseSessionResponse* response, std::function<void(::grpc::Status)>) = 0;
-      virtual void CloseSession(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::HandshakeRequest* request, ::io::deephaven::proto::backplane::grpc::CloseSessionResponse* response, ::grpc::ClientUnaryReactor* reactor) = 0;
-      //
-      // Attempts to release an export by its ticket. Returns true if an existing export was found. It is the client's
-      // responsibility to release all resources they no longer want the server to hold on to. Proactively cancels work; do
-      // not release a ticket that is needed by dependent work that has not yet finished
-      // (i.e. the dependencies that are staying around should first be in EXPORTED state).
-      virtual void Release(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::ReleaseRequest* request, ::io::deephaven::proto::backplane::grpc::ReleaseResponse* response, std::function<void(::grpc::Status)>) = 0;
-      virtual void Release(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::ReleaseRequest* request, ::io::deephaven::proto::backplane::grpc::ReleaseResponse* response, ::grpc::ClientUnaryReactor* reactor) = 0;
-      //
-      // Makes a copy from a source ticket to a client managed result ticket. The source ticket does not need to be
-      // a client managed ticket.
-      virtual void ExportFromTicket(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::ExportRequest* request, ::io::deephaven::proto::backplane::grpc::ExportResponse* response, std::function<void(::grpc::Status)>) = 0;
-      virtual void ExportFromTicket(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::ExportRequest* request, ::io::deephaven::proto::backplane::grpc::ExportResponse* response, ::grpc::ClientUnaryReactor* reactor) = 0;
-      //
-      // Makes a copy from a source ticket and publishes to a result ticket. Neither the source ticket, nor the destination
-      // ticket, need to be a client managed ticket.
-      virtual void PublishFromTicket(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::PublishRequest* request, ::io::deephaven::proto::backplane::grpc::PublishResponse* response, std::function<void(::grpc::Status)>) = 0;
-      virtual void PublishFromTicket(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::PublishRequest* request, ::io::deephaven::proto::backplane::grpc::PublishResponse* response, ::grpc::ClientUnaryReactor* reactor) = 0;
-      //
-      // Establish a stream to manage all session exports, including those lost due to partially complete rpc calls.
-      //
-      // New streams will flush notifications for all un-released exports, prior to seeing any new or updated exports
-      // for all live exports. After the refresh of existing state, subscribers will receive notifications of new and
-      // updated exports. An export id of zero will be sent to indicate all pre-existing exports have been sent.
-      virtual void ExportNotifications(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::ExportNotificationRequest* request, ::grpc::ClientReadReactor< ::io::deephaven::proto::backplane::grpc::ExportNotification>* reactor) = 0;
-      //
-      // Receive a best-effort message on-exit indicating why this server is exiting. Reception of this message cannot be
-      // guaranteed.
-      virtual void TerminationNotification(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::TerminationNotificationRequest* request, ::io::deephaven::proto::backplane::grpc::TerminationNotificationResponse* response, std::function<void(::grpc::Status)>) = 0;
-      virtual void TerminationNotification(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::TerminationNotificationRequest* request, ::io::deephaven::proto::backplane::grpc::TerminationNotificationResponse* response, ::grpc::ClientUnaryReactor* reactor) = 0;
-    };
-    typedef class async_interface experimental_async_interface;
-    virtual class async_interface* async() { return nullptr; }
-    class async_interface* experimental_async() { return async(); }
-   private:
-    virtual ::grpc::ClientAsyncResponseReaderInterface< ::io::deephaven::proto::backplane::grpc::HandshakeResponse>* AsyncNewSessionRaw(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::HandshakeRequest& request, ::grpc::CompletionQueue* cq) = 0;
-    virtual ::grpc::ClientAsyncResponseReaderInterface< ::io::deephaven::proto::backplane::grpc::HandshakeResponse>* PrepareAsyncNewSessionRaw(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::HandshakeRequest& request, ::grpc::CompletionQueue* cq) = 0;
-    virtual ::grpc::ClientAsyncResponseReaderInterface< ::io::deephaven::proto::backplane::grpc::HandshakeResponse>* AsyncRefreshSessionTokenRaw(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::HandshakeRequest& request, ::grpc::CompletionQueue* cq) = 0;
-    virtual ::grpc::ClientAsyncResponseReaderInterface< ::io::deephaven::proto::backplane::grpc::HandshakeResponse>* PrepareAsyncRefreshSessionTokenRaw(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::HandshakeRequest& request, ::grpc::CompletionQueue* cq) = 0;
-    virtual ::grpc::ClientAsyncResponseReaderInterface< ::io::deephaven::proto::backplane::grpc::CloseSessionResponse>* AsyncCloseSessionRaw(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::HandshakeRequest& request, ::grpc::CompletionQueue* cq) = 0;
-    virtual ::grpc::ClientAsyncResponseReaderInterface< ::io::deephaven::proto::backplane::grpc::CloseSessionResponse>* PrepareAsyncCloseSessionRaw(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::HandshakeRequest& request, ::grpc::CompletionQueue* cq) = 0;
-    virtual ::grpc::ClientAsyncResponseReaderInterface< ::io::deephaven::proto::backplane::grpc::ReleaseResponse>* AsyncReleaseRaw(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::ReleaseRequest& request, ::grpc::CompletionQueue* cq) = 0;
-    virtual ::grpc::ClientAsyncResponseReaderInterface< ::io::deephaven::proto::backplane::grpc::ReleaseResponse>* PrepareAsyncReleaseRaw(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::ReleaseRequest& request, ::grpc::CompletionQueue* cq) = 0;
-    virtual ::grpc::ClientAsyncResponseReaderInterface< ::io::deephaven::proto::backplane::grpc::ExportResponse>* AsyncExportFromTicketRaw(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::ExportRequest& request, ::grpc::CompletionQueue* cq) = 0;
-    virtual ::grpc::ClientAsyncResponseReaderInterface< ::io::deephaven::proto::backplane::grpc::ExportResponse>* PrepareAsyncExportFromTicketRaw(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::ExportRequest& request, ::grpc::CompletionQueue* cq) = 0;
-    virtual ::grpc::ClientAsyncResponseReaderInterface< ::io::deephaven::proto::backplane::grpc::PublishResponse>* AsyncPublishFromTicketRaw(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::PublishRequest& request, ::grpc::CompletionQueue* cq) = 0;
-    virtual ::grpc::ClientAsyncResponseReaderInterface< ::io::deephaven::proto::backplane::grpc::PublishResponse>* PrepareAsyncPublishFromTicketRaw(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::PublishRequest& request, ::grpc::CompletionQueue* cq) = 0;
-    virtual ::grpc::ClientReaderInterface< ::io::deephaven::proto::backplane::grpc::ExportNotification>* ExportNotificationsRaw(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::ExportNotificationRequest& request) = 0;
-    virtual ::grpc::ClientAsyncReaderInterface< ::io::deephaven::proto::backplane::grpc::ExportNotification>* AsyncExportNotificationsRaw(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::ExportNotificationRequest& request, ::grpc::CompletionQueue* cq, void* tag) = 0;
-    virtual ::grpc::ClientAsyncReaderInterface< ::io::deephaven::proto::backplane::grpc::ExportNotification>* PrepareAsyncExportNotificationsRaw(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::ExportNotificationRequest& request, ::grpc::CompletionQueue* cq) = 0;
-    virtual ::grpc::ClientAsyncResponseReaderInterface< ::io::deephaven::proto::backplane::grpc::TerminationNotificationResponse>* AsyncTerminationNotificationRaw(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::TerminationNotificationRequest& request, ::grpc::CompletionQueue* cq) = 0;
-    virtual ::grpc::ClientAsyncResponseReaderInterface< ::io::deephaven::proto::backplane::grpc::TerminationNotificationResponse>* PrepareAsyncTerminationNotificationRaw(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::TerminationNotificationRequest& request, ::grpc::CompletionQueue* cq) = 0;
-  };
-  class Stub final : public StubInterface {
-   public:
-    Stub(const std::shared_ptr< ::grpc::ChannelInterface>& channel, const ::grpc::StubOptions& options = ::grpc::StubOptions());
-    ::grpc::Status NewSession(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::HandshakeRequest& request, ::io::deephaven::proto::backplane::grpc::HandshakeResponse* response) override;
-    std::unique_ptr< ::grpc::ClientAsyncResponseReader< ::io::deephaven::proto::backplane::grpc::HandshakeResponse>> AsyncNewSession(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::HandshakeRequest& request, ::grpc::CompletionQueue* cq) {
-      return std::unique_ptr< ::grpc::ClientAsyncResponseReader< ::io::deephaven::proto::backplane::grpc::HandshakeResponse>>(AsyncNewSessionRaw(context, request, cq));
-    }
-    std::unique_ptr< ::grpc::ClientAsyncResponseReader< ::io::deephaven::proto::backplane::grpc::HandshakeResponse>> PrepareAsyncNewSession(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::HandshakeRequest& request, ::grpc::CompletionQueue* cq) {
-      return std::unique_ptr< ::grpc::ClientAsyncResponseReader< ::io::deephaven::proto::backplane::grpc::HandshakeResponse>>(PrepareAsyncNewSessionRaw(context, request, cq));
-    }
-    ::grpc::Status RefreshSessionToken(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::HandshakeRequest& request, ::io::deephaven::proto::backplane::grpc::HandshakeResponse* response) override;
-    std::unique_ptr< ::grpc::ClientAsyncResponseReader< ::io::deephaven::proto::backplane::grpc::HandshakeResponse>> AsyncRefreshSessionToken(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::HandshakeRequest& request, ::grpc::CompletionQueue* cq) {
-      return std::unique_ptr< ::grpc::ClientAsyncResponseReader< ::io::deephaven::proto::backplane::grpc::HandshakeResponse>>(AsyncRefreshSessionTokenRaw(context, request, cq));
-    }
-    std::unique_ptr< ::grpc::ClientAsyncResponseReader< ::io::deephaven::proto::backplane::grpc::HandshakeResponse>> PrepareAsyncRefreshSessionToken(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::HandshakeRequest& request, ::grpc::CompletionQueue* cq) {
-      return std::unique_ptr< ::grpc::ClientAsyncResponseReader< ::io::deephaven::proto::backplane::grpc::HandshakeResponse>>(PrepareAsyncRefreshSessionTokenRaw(context, request, cq));
-    }
-    ::grpc::Status CloseSession(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::HandshakeRequest& request, ::io::deephaven::proto::backplane::grpc::CloseSessionResponse* response) override;
-    std::unique_ptr< ::grpc::ClientAsyncResponseReader< ::io::deephaven::proto::backplane::grpc::CloseSessionResponse>> AsyncCloseSession(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::HandshakeRequest& request, ::grpc::CompletionQueue* cq) {
-      return std::unique_ptr< ::grpc::ClientAsyncResponseReader< ::io::deephaven::proto::backplane::grpc::CloseSessionResponse>>(AsyncCloseSessionRaw(context, request, cq));
-    }
-    std::unique_ptr< ::grpc::ClientAsyncResponseReader< ::io::deephaven::proto::backplane::grpc::CloseSessionResponse>> PrepareAsyncCloseSession(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::HandshakeRequest& request, ::grpc::CompletionQueue* cq) {
-      return std::unique_ptr< ::grpc::ClientAsyncResponseReader< ::io::deephaven::proto::backplane::grpc::CloseSessionResponse>>(PrepareAsyncCloseSessionRaw(context, request, cq));
-    }
-    ::grpc::Status Release(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::ReleaseRequest& request, ::io::deephaven::proto::backplane::grpc::ReleaseResponse* response) override;
-    std::unique_ptr< ::grpc::ClientAsyncResponseReader< ::io::deephaven::proto::backplane::grpc::ReleaseResponse>> AsyncRelease(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::ReleaseRequest& request, ::grpc::CompletionQueue* cq) {
-      return std::unique_ptr< ::grpc::ClientAsyncResponseReader< ::io::deephaven::proto::backplane::grpc::ReleaseResponse>>(AsyncReleaseRaw(context, request, cq));
-    }
-    std::unique_ptr< ::grpc::ClientAsyncResponseReader< ::io::deephaven::proto::backplane::grpc::ReleaseResponse>> PrepareAsyncRelease(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::ReleaseRequest& request, ::grpc::CompletionQueue* cq) {
-      return std::unique_ptr< ::grpc::ClientAsyncResponseReader< ::io::deephaven::proto::backplane::grpc::ReleaseResponse>>(PrepareAsyncReleaseRaw(context, request, cq));
-    }
-    ::grpc::Status ExportFromTicket(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::ExportRequest& request, ::io::deephaven::proto::backplane::grpc::ExportResponse* response) override;
-    std::unique_ptr< ::grpc::ClientAsyncResponseReader< ::io::deephaven::proto::backplane::grpc::ExportResponse>> AsyncExportFromTicket(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::ExportRequest& request, ::grpc::CompletionQueue* cq) {
-      return std::unique_ptr< ::grpc::ClientAsyncResponseReader< ::io::deephaven::proto::backplane::grpc::ExportResponse>>(AsyncExportFromTicketRaw(context, request, cq));
-    }
-    std::unique_ptr< ::grpc::ClientAsyncResponseReader< ::io::deephaven::proto::backplane::grpc::ExportResponse>> PrepareAsyncExportFromTicket(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::ExportRequest& request, ::grpc::CompletionQueue* cq) {
-      return std::unique_ptr< ::grpc::ClientAsyncResponseReader< ::io::deephaven::proto::backplane::grpc::ExportResponse>>(PrepareAsyncExportFromTicketRaw(context, request, cq));
-    }
-    ::grpc::Status PublishFromTicket(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::PublishRequest& request, ::io::deephaven::proto::backplane::grpc::PublishResponse* response) override;
-    std::unique_ptr< ::grpc::ClientAsyncResponseReader< ::io::deephaven::proto::backplane::grpc::PublishResponse>> AsyncPublishFromTicket(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::PublishRequest& request, ::grpc::CompletionQueue* cq) {
-      return std::unique_ptr< ::grpc::ClientAsyncResponseReader< ::io::deephaven::proto::backplane::grpc::PublishResponse>>(AsyncPublishFromTicketRaw(context, request, cq));
-    }
-    std::unique_ptr< ::grpc::ClientAsyncResponseReader< ::io::deephaven::proto::backplane::grpc::PublishResponse>> PrepareAsyncPublishFromTicket(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::PublishRequest& request, ::grpc::CompletionQueue* cq) {
-      return std::unique_ptr< ::grpc::ClientAsyncResponseReader< ::io::deephaven::proto::backplane::grpc::PublishResponse>>(PrepareAsyncPublishFromTicketRaw(context, request, cq));
-    }
-    std::unique_ptr< ::grpc::ClientReader< ::io::deephaven::proto::backplane::grpc::ExportNotification>> ExportNotifications(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::ExportNotificationRequest& request) {
-      return std::unique_ptr< ::grpc::ClientReader< ::io::deephaven::proto::backplane::grpc::ExportNotification>>(ExportNotificationsRaw(context, request));
-    }
-    std::unique_ptr< ::grpc::ClientAsyncReader< ::io::deephaven::proto::backplane::grpc::ExportNotification>> AsyncExportNotifications(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::ExportNotificationRequest& request, ::grpc::CompletionQueue* cq, void* tag) {
-      return std::unique_ptr< ::grpc::ClientAsyncReader< ::io::deephaven::proto::backplane::grpc::ExportNotification>>(AsyncExportNotificationsRaw(context, request, cq, tag));
-    }
-    std::unique_ptr< ::grpc::ClientAsyncReader< ::io::deephaven::proto::backplane::grpc::ExportNotification>> PrepareAsyncExportNotifications(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::ExportNotificationRequest& request, ::grpc::CompletionQueue* cq) {
-      return std::unique_ptr< ::grpc::ClientAsyncReader< ::io::deephaven::proto::backplane::grpc::ExportNotification>>(PrepareAsyncExportNotificationsRaw(context, request, cq));
-    }
-    ::grpc::Status TerminationNotification(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::TerminationNotificationRequest& request, ::io::deephaven::proto::backplane::grpc::TerminationNotificationResponse* response) override;
-    std::unique_ptr< ::grpc::ClientAsyncResponseReader< ::io::deephaven::proto::backplane::grpc::TerminationNotificationResponse>> AsyncTerminationNotification(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::TerminationNotificationRequest& request, ::grpc::CompletionQueue* cq) {
-      return std::unique_ptr< ::grpc::ClientAsyncResponseReader< ::io::deephaven::proto::backplane::grpc::TerminationNotificationResponse>>(AsyncTerminationNotificationRaw(context, request, cq));
-    }
-    std::unique_ptr< ::grpc::ClientAsyncResponseReader< ::io::deephaven::proto::backplane::grpc::TerminationNotificationResponse>> PrepareAsyncTerminationNotification(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::TerminationNotificationRequest& request, ::grpc::CompletionQueue* cq) {
-      return std::unique_ptr< ::grpc::ClientAsyncResponseReader< ::io::deephaven::proto::backplane::grpc::TerminationNotificationResponse>>(PrepareAsyncTerminationNotificationRaw(context, request, cq));
-    }
-    class async final :
-      public StubInterface::async_interface {
-     public:
-      void NewSession(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::HandshakeRequest* request, ::io::deephaven::proto::backplane::grpc::HandshakeResponse* response, std::function<void(::grpc::Status)>) override;
-      void NewSession(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::HandshakeRequest* request, ::io::deephaven::proto::backplane::grpc::HandshakeResponse* response, ::grpc::ClientUnaryReactor* reactor) override;
-      void RefreshSessionToken(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::HandshakeRequest* request, ::io::deephaven::proto::backplane::grpc::HandshakeResponse* response, std::function<void(::grpc::Status)>) override;
-      void RefreshSessionToken(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::HandshakeRequest* request, ::io::deephaven::proto::backplane::grpc::HandshakeResponse* response, ::grpc::ClientUnaryReactor* reactor) override;
-      void CloseSession(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::HandshakeRequest* request, ::io::deephaven::proto::backplane::grpc::CloseSessionResponse* response, std::function<void(::grpc::Status)>) override;
-      void CloseSession(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::HandshakeRequest* request, ::io::deephaven::proto::backplane::grpc::CloseSessionResponse* response, ::grpc::ClientUnaryReactor* reactor) override;
-      void Release(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::ReleaseRequest* request, ::io::deephaven::proto::backplane::grpc::ReleaseResponse* response, std::function<void(::grpc::Status)>) override;
-      void Release(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::ReleaseRequest* request, ::io::deephaven::proto::backplane::grpc::ReleaseResponse* response, ::grpc::ClientUnaryReactor* reactor) override;
-      void ExportFromTicket(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::ExportRequest* request, ::io::deephaven::proto::backplane::grpc::ExportResponse* response, std::function<void(::grpc::Status)>) override;
-      void ExportFromTicket(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::ExportRequest* request, ::io::deephaven::proto::backplane::grpc::ExportResponse* response, ::grpc::ClientUnaryReactor* reactor) override;
-      void PublishFromTicket(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::PublishRequest* request, ::io::deephaven::proto::backplane::grpc::PublishResponse* response, std::function<void(::grpc::Status)>) override;
-      void PublishFromTicket(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::PublishRequest* request, ::io::deephaven::proto::backplane::grpc::PublishResponse* response, ::grpc::ClientUnaryReactor* reactor) override;
-      void ExportNotifications(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::ExportNotificationRequest* request, ::grpc::ClientReadReactor< ::io::deephaven::proto::backplane::grpc::ExportNotification>* reactor) override;
-      void TerminationNotification(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::TerminationNotificationRequest* request, ::io::deephaven::proto::backplane::grpc::TerminationNotificationResponse* response, std::function<void(::grpc::Status)>) override;
-      void TerminationNotification(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::TerminationNotificationRequest* request, ::io::deephaven::proto::backplane::grpc::TerminationNotificationResponse* response, ::grpc::ClientUnaryReactor* reactor) override;
-     private:
-      friend class Stub;
-      explicit async(Stub* stub): stub_(stub) { }
-      Stub* stub() { return stub_; }
-      Stub* stub_;
-    };
-    class async* async() override { return &async_stub_; }
-
-   private:
-    std::shared_ptr< ::grpc::ChannelInterface> channel_;
-    class async async_stub_{this};
-    ::grpc::ClientAsyncResponseReader< ::io::deephaven::proto::backplane::grpc::HandshakeResponse>* AsyncNewSessionRaw(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::HandshakeRequest& request, ::grpc::CompletionQueue* cq) override;
-    ::grpc::ClientAsyncResponseReader< ::io::deephaven::proto::backplane::grpc::HandshakeResponse>* PrepareAsyncNewSessionRaw(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::HandshakeRequest& request, ::grpc::CompletionQueue* cq) override;
-    ::grpc::ClientAsyncResponseReader< ::io::deephaven::proto::backplane::grpc::HandshakeResponse>* AsyncRefreshSessionTokenRaw(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::HandshakeRequest& request, ::grpc::CompletionQueue* cq) override;
-    ::grpc::ClientAsyncResponseReader< ::io::deephaven::proto::backplane::grpc::HandshakeResponse>* PrepareAsyncRefreshSessionTokenRaw(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::HandshakeRequest& request, ::grpc::CompletionQueue* cq) override;
-    ::grpc::ClientAsyncResponseReader< ::io::deephaven::proto::backplane::grpc::CloseSessionResponse>* AsyncCloseSessionRaw(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::HandshakeRequest& request, ::grpc::CompletionQueue* cq) override;
-    ::grpc::ClientAsyncResponseReader< ::io::deephaven::proto::backplane::grpc::CloseSessionResponse>* PrepareAsyncCloseSessionRaw(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::HandshakeRequest& request, ::grpc::CompletionQueue* cq) override;
-    ::grpc::ClientAsyncResponseReader< ::io::deephaven::proto::backplane::grpc::ReleaseResponse>* AsyncReleaseRaw(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::ReleaseRequest& request, ::grpc::CompletionQueue* cq) override;
-    ::grpc::ClientAsyncResponseReader< ::io::deephaven::proto::backplane::grpc::ReleaseResponse>* PrepareAsyncReleaseRaw(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::ReleaseRequest& request, ::grpc::CompletionQueue* cq) override;
-    ::grpc::ClientAsyncResponseReader< ::io::deephaven::proto::backplane::grpc::ExportResponse>* AsyncExportFromTicketRaw(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::ExportRequest& request, ::grpc::CompletionQueue* cq) override;
-    ::grpc::ClientAsyncResponseReader< ::io::deephaven::proto::backplane::grpc::ExportResponse>* PrepareAsyncExportFromTicketRaw(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::ExportRequest& request, ::grpc::CompletionQueue* cq) override;
-    ::grpc::ClientAsyncResponseReader< ::io::deephaven::proto::backplane::grpc::PublishResponse>* AsyncPublishFromTicketRaw(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::PublishRequest& request, ::grpc::CompletionQueue* cq) override;
-    ::grpc::ClientAsyncResponseReader< ::io::deephaven::proto::backplane::grpc::PublishResponse>* PrepareAsyncPublishFromTicketRaw(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::PublishRequest& request, ::grpc::CompletionQueue* cq) override;
-    ::grpc::ClientReader< ::io::deephaven::proto::backplane::grpc::ExportNotification>* ExportNotificationsRaw(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::ExportNotificationRequest& request) override;
-    ::grpc::ClientAsyncReader< ::io::deephaven::proto::backplane::grpc::ExportNotification>* AsyncExportNotificationsRaw(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::ExportNotificationRequest& request, ::grpc::CompletionQueue* cq, void* tag) override;
-    ::grpc::ClientAsyncReader< ::io::deephaven::proto::backplane::grpc::ExportNotification>* PrepareAsyncExportNotificationsRaw(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::ExportNotificationRequest& request, ::grpc::CompletionQueue* cq) override;
-    ::grpc::ClientAsyncResponseReader< ::io::deephaven::proto::backplane::grpc::TerminationNotificationResponse>* AsyncTerminationNotificationRaw(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::TerminationNotificationRequest& request, ::grpc::CompletionQueue* cq) override;
-    ::grpc::ClientAsyncResponseReader< ::io::deephaven::proto::backplane::grpc::TerminationNotificationResponse>* PrepareAsyncTerminationNotificationRaw(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::TerminationNotificationRequest& request, ::grpc::CompletionQueue* cq) override;
-    const ::grpc::internal::RpcMethod rpcmethod_NewSession_;
-    const ::grpc::internal::RpcMethod rpcmethod_RefreshSessionToken_;
-    const ::grpc::internal::RpcMethod rpcmethod_CloseSession_;
-    const ::grpc::internal::RpcMethod rpcmethod_Release_;
-    const ::grpc::internal::RpcMethod rpcmethod_ExportFromTicket_;
-    const ::grpc::internal::RpcMethod rpcmethod_PublishFromTicket_;
-    const ::grpc::internal::RpcMethod rpcmethod_ExportNotifications_;
-    const ::grpc::internal::RpcMethod rpcmethod_TerminationNotification_;
-  };
-  static std::unique_ptr<Stub> NewStub(const std::shared_ptr< ::grpc::ChannelInterface>& channel, const ::grpc::StubOptions& options = ::grpc::StubOptions());
-
-  class Service : public ::grpc::Service {
-   public:
-    Service();
-    virtual ~Service();
-    //
-    // Handshake between client and server to create a new session. The response includes a metadata header name and the
-    // token to send on every subsequent request. The auth mechanisms here are unary to best support grpc-web.
-    //
-    // Deprecated: Please use Flight's Handshake or http authorization headers instead.
-    virtual ::grpc::Status NewSession(::grpc::ServerContext* context, const ::io::deephaven::proto::backplane::grpc::HandshakeRequest* request, ::io::deephaven::proto::backplane::grpc::HandshakeResponse* response);
-    //
-    // Keep-alive a given token to ensure that a session is not cleaned prematurely. The response may include an updated
-    // token that should replace the existing token for subsequent requests.
-    //
-    // Deprecated: Please use Flight's Handshake with an empty payload.
-    virtual ::grpc::Status RefreshSessionToken(::grpc::ServerContext* context, const ::io::deephaven::proto::backplane::grpc::HandshakeRequest* request, ::io::deephaven::proto::backplane::grpc::HandshakeResponse* response);
-    //
-    // Proactively close an open session. Sessions will automatically close on timeout. When a session is closed, all
-    // unreleased exports will be automatically released.
-    virtual ::grpc::Status CloseSession(::grpc::ServerContext* context, const ::io::deephaven::proto::backplane::grpc::HandshakeRequest* request, ::io::deephaven::proto::backplane::grpc::CloseSessionResponse* response);
-    //
-    // Attempts to release an export by its ticket. Returns true if an existing export was found. It is the client's
-    // responsibility to release all resources they no longer want the server to hold on to. Proactively cancels work; do
-    // not release a ticket that is needed by dependent work that has not yet finished
-    // (i.e. the dependencies that are staying around should first be in EXPORTED state).
-    virtual ::grpc::Status Release(::grpc::ServerContext* context, const ::io::deephaven::proto::backplane::grpc::ReleaseRequest* request, ::io::deephaven::proto::backplane::grpc::ReleaseResponse* response);
-    //
-    // Makes a copy from a source ticket to a client managed result ticket. The source ticket does not need to be
-    // a client managed ticket.
-    virtual ::grpc::Status ExportFromTicket(::grpc::ServerContext* context, const ::io::deephaven::proto::backplane::grpc::ExportRequest* request, ::io::deephaven::proto::backplane::grpc::ExportResponse* response);
-    //
-    // Makes a copy from a source ticket and publishes to a result ticket. Neither the source ticket, nor the destination
-    // ticket, need to be a client managed ticket.
-    virtual ::grpc::Status PublishFromTicket(::grpc::ServerContext* context, const ::io::deephaven::proto::backplane::grpc::PublishRequest* request, ::io::deephaven::proto::backplane::grpc::PublishResponse* response);
-    //
-    // Establish a stream to manage all session exports, including those lost due to partially complete rpc calls.
-    //
-    // New streams will flush notifications for all un-released exports, prior to seeing any new or updated exports
-    // for all live exports. After the refresh of existing state, subscribers will receive notifications of new and
-    // updated exports. An export id of zero will be sent to indicate all pre-existing exports have been sent.
-    virtual ::grpc::Status ExportNotifications(::grpc::ServerContext* context, const ::io::deephaven::proto::backplane::grpc::ExportNotificationRequest* request, ::grpc::ServerWriter< ::io::deephaven::proto::backplane::grpc::ExportNotification>* writer);
-    //
-    // Receive a best-effort message on-exit indicating why this server is exiting. Reception of this message cannot be
-    // guaranteed.
-    virtual ::grpc::Status TerminationNotification(::grpc::ServerContext* context, const ::io::deephaven::proto::backplane::grpc::TerminationNotificationRequest* request, ::io::deephaven::proto::backplane::grpc::TerminationNotificationResponse* response);
-  };
-  template <class BaseClass>
-  class WithAsyncMethod_NewSession : public BaseClass {
-   private:
-    void BaseClassMustBeDerivedFromService(const Service* /*service*/) {}
-   public:
-    WithAsyncMethod_NewSession() {
-      ::grpc::Service::MarkMethodAsync(0);
-    }
-    ~WithAsyncMethod_NewSession() override {
-      BaseClassMustBeDerivedFromService(this);
-    }
-    // disable synchronous version of this method
-    ::grpc::Status NewSession(::grpc::ServerContext* /*context*/, const ::io::deephaven::proto::backplane::grpc::HandshakeRequest* /*request*/, ::io::deephaven::proto::backplane::grpc::HandshakeResponse* /*response*/) override {
-      abort();
-      return ::grpc::Status(::grpc::StatusCode::UNIMPLEMENTED, "");
-    }
-    void RequestNewSession(::grpc::ServerContext* context, ::io::deephaven::proto::backplane::grpc::HandshakeRequest* request, ::grpc::ServerAsyncResponseWriter< ::io::deephaven::proto::backplane::grpc::HandshakeResponse>* response, ::grpc::CompletionQueue* new_call_cq, ::grpc::ServerCompletionQueue* notification_cq, void *tag) {
-      ::grpc::Service::RequestAsyncUnary(0, context, request, response, new_call_cq, notification_cq, tag);
-    }
-  };
-  template <class BaseClass>
-  class WithAsyncMethod_RefreshSessionToken : public BaseClass {
-   private:
-    void BaseClassMustBeDerivedFromService(const Service* /*service*/) {}
-   public:
-    WithAsyncMethod_RefreshSessionToken() {
-      ::grpc::Service::MarkMethodAsync(1);
-    }
-    ~WithAsyncMethod_RefreshSessionToken() override {
-      BaseClassMustBeDerivedFromService(this);
-    }
-    // disable synchronous version of this method
-    ::grpc::Status RefreshSessionToken(::grpc::ServerContext* /*context*/, const ::io::deephaven::proto::backplane::grpc::HandshakeRequest* /*request*/, ::io::deephaven::proto::backplane::grpc::HandshakeResponse* /*response*/) override {
-      abort();
-      return ::grpc::Status(::grpc::StatusCode::UNIMPLEMENTED, "");
-    }
-    void RequestRefreshSessionToken(::grpc::ServerContext* context, ::io::deephaven::proto::backplane::grpc::HandshakeRequest* request, ::grpc::ServerAsyncResponseWriter< ::io::deephaven::proto::backplane::grpc::HandshakeResponse>* response, ::grpc::CompletionQueue* new_call_cq, ::grpc::ServerCompletionQueue* notification_cq, void *tag) {
-      ::grpc::Service::RequestAsyncUnary(1, context, request, response, new_call_cq, notification_cq, tag);
-    }
-  };
-  template <class BaseClass>
-  class WithAsyncMethod_CloseSession : public BaseClass {
-   private:
-    void BaseClassMustBeDerivedFromService(const Service* /*service*/) {}
-   public:
-    WithAsyncMethod_CloseSession() {
-      ::grpc::Service::MarkMethodAsync(2);
-    }
-    ~WithAsyncMethod_CloseSession() override {
-      BaseClassMustBeDerivedFromService(this);
-    }
-    // disable synchronous version of this method
-    ::grpc::Status CloseSession(::grpc::ServerContext* /*context*/, const ::io::deephaven::proto::backplane::grpc::HandshakeRequest* /*request*/, ::io::deephaven::proto::backplane::grpc::CloseSessionResponse* /*response*/) override {
-      abort();
-      return ::grpc::Status(::grpc::StatusCode::UNIMPLEMENTED, "");
-    }
-    void RequestCloseSession(::grpc::ServerContext* context, ::io::deephaven::proto::backplane::grpc::HandshakeRequest* request, ::grpc::ServerAsyncResponseWriter< ::io::deephaven::proto::backplane::grpc::CloseSessionResponse>* response, ::grpc::CompletionQueue* new_call_cq, ::grpc::ServerCompletionQueue* notification_cq, void *tag) {
-      ::grpc::Service::RequestAsyncUnary(2, context, request, response, new_call_cq, notification_cq, tag);
-    }
-  };
-  template <class BaseClass>
-  class WithAsyncMethod_Release : public BaseClass {
-   private:
-    void BaseClassMustBeDerivedFromService(const Service* /*service*/) {}
-   public:
-    WithAsyncMethod_Release() {
-      ::grpc::Service::MarkMethodAsync(3);
-    }
-    ~WithAsyncMethod_Release() override {
-      BaseClassMustBeDerivedFromService(this);
-    }
-    // disable synchronous version of this method
-    ::grpc::Status Release(::grpc::ServerContext* /*context*/, const ::io::deephaven::proto::backplane::grpc::ReleaseRequest* /*request*/, ::io::deephaven::proto::backplane::grpc::ReleaseResponse* /*response*/) override {
-      abort();
-      return ::grpc::Status(::grpc::StatusCode::UNIMPLEMENTED, "");
-    }
-    void RequestRelease(::grpc::ServerContext* context, ::io::deephaven::proto::backplane::grpc::ReleaseRequest* request, ::grpc::ServerAsyncResponseWriter< ::io::deephaven::proto::backplane::grpc::ReleaseResponse>* response, ::grpc::CompletionQueue* new_call_cq, ::grpc::ServerCompletionQueue* notification_cq, void *tag) {
-      ::grpc::Service::RequestAsyncUnary(3, context, request, response, new_call_cq, notification_cq, tag);
-    }
-  };
-  template <class BaseClass>
-  class WithAsyncMethod_ExportFromTicket : public BaseClass {
-   private:
-    void BaseClassMustBeDerivedFromService(const Service* /*service*/) {}
-   public:
-    WithAsyncMethod_ExportFromTicket() {
-      ::grpc::Service::MarkMethodAsync(4);
-    }
-    ~WithAsyncMethod_ExportFromTicket() override {
-      BaseClassMustBeDerivedFromService(this);
-    }
-    // disable synchronous version of this method
-    ::grpc::Status ExportFromTicket(::grpc::ServerContext* /*context*/, const ::io::deephaven::proto::backplane::grpc::ExportRequest* /*request*/, ::io::deephaven::proto::backplane::grpc::ExportResponse* /*response*/) override {
-      abort();
-      return ::grpc::Status(::grpc::StatusCode::UNIMPLEMENTED, "");
-    }
-    void RequestExportFromTicket(::grpc::ServerContext* context, ::io::deephaven::proto::backplane::grpc::ExportRequest* request, ::grpc::ServerAsyncResponseWriter< ::io::deephaven::proto::backplane::grpc::ExportResponse>* response, ::grpc::CompletionQueue* new_call_cq, ::grpc::ServerCompletionQueue* notification_cq, void *tag) {
-      ::grpc::Service::RequestAsyncUnary(4, context, request, response, new_call_cq, notification_cq, tag);
-    }
-  };
-  template <class BaseClass>
-  class WithAsyncMethod_PublishFromTicket : public BaseClass {
-   private:
-    void BaseClassMustBeDerivedFromService(const Service* /*service*/) {}
-   public:
-    WithAsyncMethod_PublishFromTicket() {
-      ::grpc::Service::MarkMethodAsync(5);
-    }
-    ~WithAsyncMethod_PublishFromTicket() override {
-      BaseClassMustBeDerivedFromService(this);
-    }
-    // disable synchronous version of this method
-    ::grpc::Status PublishFromTicket(::grpc::ServerContext* /*context*/, const ::io::deephaven::proto::backplane::grpc::PublishRequest* /*request*/, ::io::deephaven::proto::backplane::grpc::PublishResponse* /*response*/) override {
-      abort();
-      return ::grpc::Status(::grpc::StatusCode::UNIMPLEMENTED, "");
-    }
-    void RequestPublishFromTicket(::grpc::ServerContext* context, ::io::deephaven::proto::backplane::grpc::PublishRequest* request, ::grpc::ServerAsyncResponseWriter< ::io::deephaven::proto::backplane::grpc::PublishResponse>* response, ::grpc::CompletionQueue* new_call_cq, ::grpc::ServerCompletionQueue* notification_cq, void *tag) {
-      ::grpc::Service::RequestAsyncUnary(5, context, request, response, new_call_cq, notification_cq, tag);
-    }
-  };
-  template <class BaseClass>
-  class WithAsyncMethod_ExportNotifications : public BaseClass {
-   private:
-    void BaseClassMustBeDerivedFromService(const Service* /*service*/) {}
-   public:
-    WithAsyncMethod_ExportNotifications() {
-      ::grpc::Service::MarkMethodAsync(6);
-    }
-    ~WithAsyncMethod_ExportNotifications() override {
-      BaseClassMustBeDerivedFromService(this);
-    }
-    // disable synchronous version of this method
-    ::grpc::Status ExportNotifications(::grpc::ServerContext* /*context*/, const ::io::deephaven::proto::backplane::grpc::ExportNotificationRequest* /*request*/, ::grpc::ServerWriter< ::io::deephaven::proto::backplane::grpc::ExportNotification>* /*writer*/) override {
-      abort();
-      return ::grpc::Status(::grpc::StatusCode::UNIMPLEMENTED, "");
-    }
-    void RequestExportNotifications(::grpc::ServerContext* context, ::io::deephaven::proto::backplane::grpc::ExportNotificationRequest* request, ::grpc::ServerAsyncWriter< ::io::deephaven::proto::backplane::grpc::ExportNotification>* writer, ::grpc::CompletionQueue* new_call_cq, ::grpc::ServerCompletionQueue* notification_cq, void *tag) {
-      ::grpc::Service::RequestAsyncServerStreaming(6, context, request, writer, new_call_cq, notification_cq, tag);
-    }
-  };
-  template <class BaseClass>
-  class WithAsyncMethod_TerminationNotification : public BaseClass {
-   private:
-    void BaseClassMustBeDerivedFromService(const Service* /*service*/) {}
-   public:
-    WithAsyncMethod_TerminationNotification() {
-      ::grpc::Service::MarkMethodAsync(7);
-    }
-    ~WithAsyncMethod_TerminationNotification() override {
-      BaseClassMustBeDerivedFromService(this);
-    }
-    // disable synchronous version of this method
-    ::grpc::Status TerminationNotification(::grpc::ServerContext* /*context*/, const ::io::deephaven::proto::backplane::grpc::TerminationNotificationRequest* /*request*/, ::io::deephaven::proto::backplane::grpc::TerminationNotificationResponse* /*response*/) override {
-      abort();
-      return ::grpc::Status(::grpc::StatusCode::UNIMPLEMENTED, "");
-    }
-    void RequestTerminationNotification(::grpc::ServerContext* context, ::io::deephaven::proto::backplane::grpc::TerminationNotificationRequest* request, ::grpc::ServerAsyncResponseWriter< ::io::deephaven::proto::backplane::grpc::TerminationNotificationResponse>* response, ::grpc::CompletionQueue* new_call_cq, ::grpc::ServerCompletionQueue* notification_cq, void *tag) {
-      ::grpc::Service::RequestAsyncUnary(7, context, request, response, new_call_cq, notification_cq, tag);
-    }
-  };
-  typedef WithAsyncMethod_NewSession<WithAsyncMethod_RefreshSessionToken<WithAsyncMethod_CloseSession<WithAsyncMethod_Release<WithAsyncMethod_ExportFromTicket<WithAsyncMethod_PublishFromTicket<WithAsyncMethod_ExportNotifications<WithAsyncMethod_TerminationNotification<Service > > > > > > > > AsyncService;
-  template <class BaseClass>
-  class WithCallbackMethod_NewSession : public BaseClass {
-   private:
-    void BaseClassMustBeDerivedFromService(const Service* /*service*/) {}
-   public:
-    WithCallbackMethod_NewSession() {
-      ::grpc::Service::MarkMethodCallback(0,
-          new ::grpc::internal::CallbackUnaryHandler< ::io::deephaven::proto::backplane::grpc::HandshakeRequest, ::io::deephaven::proto::backplane::grpc::HandshakeResponse>(
-            [this](
-                   ::grpc::CallbackServerContext* context, const ::io::deephaven::proto::backplane::grpc::HandshakeRequest* request, ::io::deephaven::proto::backplane::grpc::HandshakeResponse* response) { return this->NewSession(context, request, response); }));}
-    void SetMessageAllocatorFor_NewSession(
-        ::grpc::MessageAllocator< ::io::deephaven::proto::backplane::grpc::HandshakeRequest, ::io::deephaven::proto::backplane::grpc::HandshakeResponse>* allocator) {
-      ::grpc::internal::MethodHandler* const handler = ::grpc::Service::GetHandler(0);
-      static_cast<::grpc::internal::CallbackUnaryHandler< ::io::deephaven::proto::backplane::grpc::HandshakeRequest, ::io::deephaven::proto::backplane::grpc::HandshakeResponse>*>(handler)
-              ->SetMessageAllocator(allocator);
-    }
-    ~WithCallbackMethod_NewSession() override {
-      BaseClassMustBeDerivedFromService(this);
-    }
-    // disable synchronous version of this method
-    ::grpc::Status NewSession(::grpc::ServerContext* /*context*/, const ::io::deephaven::proto::backplane::grpc::HandshakeRequest* /*request*/, ::io::deephaven::proto::backplane::grpc::HandshakeResponse* /*response*/) override {
-      abort();
-      return ::grpc::Status(::grpc::StatusCode::UNIMPLEMENTED, "");
-    }
-    virtual ::grpc::ServerUnaryReactor* NewSession(
-      ::grpc::CallbackServerContext* /*context*/, const ::io::deephaven::proto::backplane::grpc::HandshakeRequest* /*request*/, ::io::deephaven::proto::backplane::grpc::HandshakeResponse* /*response*/)  { return nullptr; }
-  };
-  template <class BaseClass>
-  class WithCallbackMethod_RefreshSessionToken : public BaseClass {
-   private:
-    void BaseClassMustBeDerivedFromService(const Service* /*service*/) {}
-   public:
-    WithCallbackMethod_RefreshSessionToken() {
-      ::grpc::Service::MarkMethodCallback(1,
-          new ::grpc::internal::CallbackUnaryHandler< ::io::deephaven::proto::backplane::grpc::HandshakeRequest, ::io::deephaven::proto::backplane::grpc::HandshakeResponse>(
-            [this](
-                   ::grpc::CallbackServerContext* context, const ::io::deephaven::proto::backplane::grpc::HandshakeRequest* request, ::io::deephaven::proto::backplane::grpc::HandshakeResponse* response) { return this->RefreshSessionToken(context, request, response); }));}
-    void SetMessageAllocatorFor_RefreshSessionToken(
-        ::grpc::MessageAllocator< ::io::deephaven::proto::backplane::grpc::HandshakeRequest, ::io::deephaven::proto::backplane::grpc::HandshakeResponse>* allocator) {
-      ::grpc::internal::MethodHandler* const handler = ::grpc::Service::GetHandler(1);
-      static_cast<::grpc::internal::CallbackUnaryHandler< ::io::deephaven::proto::backplane::grpc::HandshakeRequest, ::io::deephaven::proto::backplane::grpc::HandshakeResponse>*>(handler)
-              ->SetMessageAllocator(allocator);
-    }
-    ~WithCallbackMethod_RefreshSessionToken() override {
-      BaseClassMustBeDerivedFromService(this);
-    }
-    // disable synchronous version of this method
-    ::grpc::Status RefreshSessionToken(::grpc::ServerContext* /*context*/, const ::io::deephaven::proto::backplane::grpc::HandshakeRequest* /*request*/, ::io::deephaven::proto::backplane::grpc::HandshakeResponse* /*response*/) override {
-      abort();
-      return ::grpc::Status(::grpc::StatusCode::UNIMPLEMENTED, "");
-    }
-    virtual ::grpc::ServerUnaryReactor* RefreshSessionToken(
-      ::grpc::CallbackServerContext* /*context*/, const ::io::deephaven::proto::backplane::grpc::HandshakeRequest* /*request*/, ::io::deephaven::proto::backplane::grpc::HandshakeResponse* /*response*/)  { return nullptr; }
-  };
-  template <class BaseClass>
-  class WithCallbackMethod_CloseSession : public BaseClass {
-   private:
-    void BaseClassMustBeDerivedFromService(const Service* /*service*/) {}
-   public:
-    WithCallbackMethod_CloseSession() {
-      ::grpc::Service::MarkMethodCallback(2,
-          new ::grpc::internal::CallbackUnaryHandler< ::io::deephaven::proto::backplane::grpc::HandshakeRequest, ::io::deephaven::proto::backplane::grpc::CloseSessionResponse>(
-            [this](
-                   ::grpc::CallbackServerContext* context, const ::io::deephaven::proto::backplane::grpc::HandshakeRequest* request, ::io::deephaven::proto::backplane::grpc::CloseSessionResponse* response) { return this->CloseSession(context, request, response); }));}
-    void SetMessageAllocatorFor_CloseSession(
-        ::grpc::MessageAllocator< ::io::deephaven::proto::backplane::grpc::HandshakeRequest, ::io::deephaven::proto::backplane::grpc::CloseSessionResponse>* allocator) {
-      ::grpc::internal::MethodHandler* const handler = ::grpc::Service::GetHandler(2);
-      static_cast<::grpc::internal::CallbackUnaryHandler< ::io::deephaven::proto::backplane::grpc::HandshakeRequest, ::io::deephaven::proto::backplane::grpc::CloseSessionResponse>*>(handler)
-              ->SetMessageAllocator(allocator);
-    }
-    ~WithCallbackMethod_CloseSession() override {
-      BaseClassMustBeDerivedFromService(this);
-    }
-    // disable synchronous version of this method
-    ::grpc::Status CloseSession(::grpc::ServerContext* /*context*/, const ::io::deephaven::proto::backplane::grpc::HandshakeRequest* /*request*/, ::io::deephaven::proto::backplane::grpc::CloseSessionResponse* /*response*/) override {
-      abort();
-      return ::grpc::Status(::grpc::StatusCode::UNIMPLEMENTED, "");
-    }
-    virtual ::grpc::ServerUnaryReactor* CloseSession(
-      ::grpc::CallbackServerContext* /*context*/, const ::io::deephaven::proto::backplane::grpc::HandshakeRequest* /*request*/, ::io::deephaven::proto::backplane::grpc::CloseSessionResponse* /*response*/)  { return nullptr; }
-  };
-  template <class BaseClass>
-  class WithCallbackMethod_Release : public BaseClass {
-   private:
-    void BaseClassMustBeDerivedFromService(const Service* /*service*/) {}
-   public:
-    WithCallbackMethod_Release() {
-      ::grpc::Service::MarkMethodCallback(3,
-          new ::grpc::internal::CallbackUnaryHandler< ::io::deephaven::proto::backplane::grpc::ReleaseRequest, ::io::deephaven::proto::backplane::grpc::ReleaseResponse>(
-            [this](
-                   ::grpc::CallbackServerContext* context, const ::io::deephaven::proto::backplane::grpc::ReleaseRequest* request, ::io::deephaven::proto::backplane::grpc::ReleaseResponse* response) { return this->Release(context, request, response); }));}
-    void SetMessageAllocatorFor_Release(
-        ::grpc::MessageAllocator< ::io::deephaven::proto::backplane::grpc::ReleaseRequest, ::io::deephaven::proto::backplane::grpc::ReleaseResponse>* allocator) {
-      ::grpc::internal::MethodHandler* const handler = ::grpc::Service::GetHandler(3);
-      static_cast<::grpc::internal::CallbackUnaryHandler< ::io::deephaven::proto::backplane::grpc::ReleaseRequest, ::io::deephaven::proto::backplane::grpc::ReleaseResponse>*>(handler)
-              ->SetMessageAllocator(allocator);
-    }
-    ~WithCallbackMethod_Release() override {
-      BaseClassMustBeDerivedFromService(this);
-    }
-    // disable synchronous version of this method
-    ::grpc::Status Release(::grpc::ServerContext* /*context*/, const ::io::deephaven::proto::backplane::grpc::ReleaseRequest* /*request*/, ::io::deephaven::proto::backplane::grpc::ReleaseResponse* /*response*/) override {
-      abort();
-      return ::grpc::Status(::grpc::StatusCode::UNIMPLEMENTED, "");
-    }
-    virtual ::grpc::ServerUnaryReactor* Release(
-      ::grpc::CallbackServerContext* /*context*/, const ::io::deephaven::proto::backplane::grpc::ReleaseRequest* /*request*/, ::io::deephaven::proto::backplane::grpc::ReleaseResponse* /*response*/)  { return nullptr; }
-  };
-  template <class BaseClass>
-  class WithCallbackMethod_ExportFromTicket : public BaseClass {
-   private:
-    void BaseClassMustBeDerivedFromService(const Service* /*service*/) {}
-   public:
-    WithCallbackMethod_ExportFromTicket() {
-      ::grpc::Service::MarkMethodCallback(4,
-          new ::grpc::internal::CallbackUnaryHandler< ::io::deephaven::proto::backplane::grpc::ExportRequest, ::io::deephaven::proto::backplane::grpc::ExportResponse>(
-            [this](
-                   ::grpc::CallbackServerContext* context, const ::io::deephaven::proto::backplane::grpc::ExportRequest* request, ::io::deephaven::proto::backplane::grpc::ExportResponse* response) { return this->ExportFromTicket(context, request, response); }));}
-    void SetMessageAllocatorFor_ExportFromTicket(
-        ::grpc::MessageAllocator< ::io::deephaven::proto::backplane::grpc::ExportRequest, ::io::deephaven::proto::backplane::grpc::ExportResponse>* allocator) {
-      ::grpc::internal::MethodHandler* const handler = ::grpc::Service::GetHandler(4);
-      static_cast<::grpc::internal::CallbackUnaryHandler< ::io::deephaven::proto::backplane::grpc::ExportRequest, ::io::deephaven::proto::backplane::grpc::ExportResponse>*>(handler)
-              ->SetMessageAllocator(allocator);
-    }
-    ~WithCallbackMethod_ExportFromTicket() override {
-      BaseClassMustBeDerivedFromService(this);
-    }
-    // disable synchronous version of this method
-    ::grpc::Status ExportFromTicket(::grpc::ServerContext* /*context*/, const ::io::deephaven::proto::backplane::grpc::ExportRequest* /*request*/, ::io::deephaven::proto::backplane::grpc::ExportResponse* /*response*/) override {
-      abort();
-      return ::grpc::Status(::grpc::StatusCode::UNIMPLEMENTED, "");
-    }
-    virtual ::grpc::ServerUnaryReactor* ExportFromTicket(
-      ::grpc::CallbackServerContext* /*context*/, const ::io::deephaven::proto::backplane::grpc::ExportRequest* /*request*/, ::io::deephaven::proto::backplane::grpc::ExportResponse* /*response*/)  { return nullptr; }
-  };
-  template <class BaseClass>
-  class WithCallbackMethod_PublishFromTicket : public BaseClass {
-   private:
-    void BaseClassMustBeDerivedFromService(const Service* /*service*/) {}
-   public:
-    WithCallbackMethod_PublishFromTicket() {
-      ::grpc::Service::MarkMethodCallback(5,
-          new ::grpc::internal::CallbackUnaryHandler< ::io::deephaven::proto::backplane::grpc::PublishRequest, ::io::deephaven::proto::backplane::grpc::PublishResponse>(
-            [this](
-                   ::grpc::CallbackServerContext* context, const ::io::deephaven::proto::backplane::grpc::PublishRequest* request, ::io::deephaven::proto::backplane::grpc::PublishResponse* response) { return this->PublishFromTicket(context, request, response); }));}
-    void SetMessageAllocatorFor_PublishFromTicket(
-        ::grpc::MessageAllocator< ::io::deephaven::proto::backplane::grpc::PublishRequest, ::io::deephaven::proto::backplane::grpc::PublishResponse>* allocator) {
-      ::grpc::internal::MethodHandler* const handler = ::grpc::Service::GetHandler(5);
-      static_cast<::grpc::internal::CallbackUnaryHandler< ::io::deephaven::proto::backplane::grpc::PublishRequest, ::io::deephaven::proto::backplane::grpc::PublishResponse>*>(handler)
-              ->SetMessageAllocator(allocator);
-    }
-    ~WithCallbackMethod_PublishFromTicket() override {
-      BaseClassMustBeDerivedFromService(this);
-    }
-    // disable synchronous version of this method
-    ::grpc::Status PublishFromTicket(::grpc::ServerContext* /*context*/, const ::io::deephaven::proto::backplane::grpc::PublishRequest* /*request*/, ::io::deephaven::proto::backplane::grpc::PublishResponse* /*response*/) override {
-      abort();
-      return ::grpc::Status(::grpc::StatusCode::UNIMPLEMENTED, "");
-    }
-    virtual ::grpc::ServerUnaryReactor* PublishFromTicket(
-      ::grpc::CallbackServerContext* /*context*/, const ::io::deephaven::proto::backplane::grpc::PublishRequest* /*request*/, ::io::deephaven::proto::backplane::grpc::PublishResponse* /*response*/)  { return nullptr; }
-  };
-  template <class BaseClass>
-  class WithCallbackMethod_ExportNotifications : public BaseClass {
-   private:
-    void BaseClassMustBeDerivedFromService(const Service* /*service*/) {}
-   public:
-    WithCallbackMethod_ExportNotifications() {
-      ::grpc::Service::MarkMethodCallback(6,
-          new ::grpc::internal::CallbackServerStreamingHandler< ::io::deephaven::proto::backplane::grpc::ExportNotificationRequest, ::io::deephaven::proto::backplane::grpc::ExportNotification>(
-            [this](
-                   ::grpc::CallbackServerContext* context, const ::io::deephaven::proto::backplane::grpc::ExportNotificationRequest* request) { return this->ExportNotifications(context, request); }));
-    }
-    ~WithCallbackMethod_ExportNotifications() override {
-      BaseClassMustBeDerivedFromService(this);
-    }
-    // disable synchronous version of this method
-    ::grpc::Status ExportNotifications(::grpc::ServerContext* /*context*/, const ::io::deephaven::proto::backplane::grpc::ExportNotificationRequest* /*request*/, ::grpc::ServerWriter< ::io::deephaven::proto::backplane::grpc::ExportNotification>* /*writer*/) override {
-      abort();
-      return ::grpc::Status(::grpc::StatusCode::UNIMPLEMENTED, "");
-    }
-    virtual ::grpc::ServerWriteReactor< ::io::deephaven::proto::backplane::grpc::ExportNotification>* ExportNotifications(
-      ::grpc::CallbackServerContext* /*context*/, const ::io::deephaven::proto::backplane::grpc::ExportNotificationRequest* /*request*/)  { return nullptr; }
-  };
-  template <class BaseClass>
-  class WithCallbackMethod_TerminationNotification : public BaseClass {
-   private:
-    void BaseClassMustBeDerivedFromService(const Service* /*service*/) {}
-   public:
-    WithCallbackMethod_TerminationNotification() {
-      ::grpc::Service::MarkMethodCallback(7,
-          new ::grpc::internal::CallbackUnaryHandler< ::io::deephaven::proto::backplane::grpc::TerminationNotificationRequest, ::io::deephaven::proto::backplane::grpc::TerminationNotificationResponse>(
-            [this](
-                   ::grpc::CallbackServerContext* context, const ::io::deephaven::proto::backplane::grpc::TerminationNotificationRequest* request, ::io::deephaven::proto::backplane::grpc::TerminationNotificationResponse* response) { return this->TerminationNotification(context, request, response); }));}
-    void SetMessageAllocatorFor_TerminationNotification(
-        ::grpc::MessageAllocator< ::io::deephaven::proto::backplane::grpc::TerminationNotificationRequest, ::io::deephaven::proto::backplane::grpc::TerminationNotificationResponse>* allocator) {
-      ::grpc::internal::MethodHandler* const handler = ::grpc::Service::GetHandler(7);
-      static_cast<::grpc::internal::CallbackUnaryHandler< ::io::deephaven::proto::backplane::grpc::TerminationNotificationRequest, ::io::deephaven::proto::backplane::grpc::TerminationNotificationResponse>*>(handler)
-              ->SetMessageAllocator(allocator);
-    }
-    ~WithCallbackMethod_TerminationNotification() override {
-      BaseClassMustBeDerivedFromService(this);
-    }
-    // disable synchronous version of this method
-    ::grpc::Status TerminationNotification(::grpc::ServerContext* /*context*/, const ::io::deephaven::proto::backplane::grpc::TerminationNotificationRequest* /*request*/, ::io::deephaven::proto::backplane::grpc::TerminationNotificationResponse* /*response*/) override {
-      abort();
-      return ::grpc::Status(::grpc::StatusCode::UNIMPLEMENTED, "");
-    }
-    virtual ::grpc::ServerUnaryReactor* TerminationNotification(
-      ::grpc::CallbackServerContext* /*context*/, const ::io::deephaven::proto::backplane::grpc::TerminationNotificationRequest* /*request*/, ::io::deephaven::proto::backplane::grpc::TerminationNotificationResponse* /*response*/)  { return nullptr; }
-  };
-  typedef WithCallbackMethod_NewSession<WithCallbackMethod_RefreshSessionToken<WithCallbackMethod_CloseSession<WithCallbackMethod_Release<WithCallbackMethod_ExportFromTicket<WithCallbackMethod_PublishFromTicket<WithCallbackMethod_ExportNotifications<WithCallbackMethod_TerminationNotification<Service > > > > > > > > CallbackService;
-  typedef CallbackService ExperimentalCallbackService;
-  template <class BaseClass>
-  class WithGenericMethod_NewSession : public BaseClass {
-   private:
-    void BaseClassMustBeDerivedFromService(const Service* /*service*/) {}
-   public:
-    WithGenericMethod_NewSession() {
-      ::grpc::Service::MarkMethodGeneric(0);
-    }
-    ~WithGenericMethod_NewSession() override {
-      BaseClassMustBeDerivedFromService(this);
-    }
-    // disable synchronous version of this method
-    ::grpc::Status NewSession(::grpc::ServerContext* /*context*/, const ::io::deephaven::proto::backplane::grpc::HandshakeRequest* /*request*/, ::io::deephaven::proto::backplane::grpc::HandshakeResponse* /*response*/) override {
-      abort();
-      return ::grpc::Status(::grpc::StatusCode::UNIMPLEMENTED, "");
-    }
-  };
-  template <class BaseClass>
-  class WithGenericMethod_RefreshSessionToken : public BaseClass {
-   private:
-    void BaseClassMustBeDerivedFromService(const Service* /*service*/) {}
-   public:
-    WithGenericMethod_RefreshSessionToken() {
-      ::grpc::Service::MarkMethodGeneric(1);
-    }
-    ~WithGenericMethod_RefreshSessionToken() override {
-      BaseClassMustBeDerivedFromService(this);
-    }
-    // disable synchronous version of this method
-    ::grpc::Status RefreshSessionToken(::grpc::ServerContext* /*context*/, const ::io::deephaven::proto::backplane::grpc::HandshakeRequest* /*request*/, ::io::deephaven::proto::backplane::grpc::HandshakeResponse* /*response*/) override {
-      abort();
-      return ::grpc::Status(::grpc::StatusCode::UNIMPLEMENTED, "");
-    }
-  };
-  template <class BaseClass>
-  class WithGenericMethod_CloseSession : public BaseClass {
-   private:
-    void BaseClassMustBeDerivedFromService(const Service* /*service*/) {}
-   public:
-    WithGenericMethod_CloseSession() {
-      ::grpc::Service::MarkMethodGeneric(2);
-    }
-    ~WithGenericMethod_CloseSession() override {
-      BaseClassMustBeDerivedFromService(this);
-    }
-    // disable synchronous version of this method
-    ::grpc::Status CloseSession(::grpc::ServerContext* /*context*/, const ::io::deephaven::proto::backplane::grpc::HandshakeRequest* /*request*/, ::io::deephaven::proto::backplane::grpc::CloseSessionResponse* /*response*/) override {
-      abort();
-      return ::grpc::Status(::grpc::StatusCode::UNIMPLEMENTED, "");
-    }
-  };
-  template <class BaseClass>
-  class WithGenericMethod_Release : public BaseClass {
-   private:
-    void BaseClassMustBeDerivedFromService(const Service* /*service*/) {}
-   public:
-    WithGenericMethod_Release() {
-      ::grpc::Service::MarkMethodGeneric(3);
-    }
-    ~WithGenericMethod_Release() override {
-      BaseClassMustBeDerivedFromService(this);
-    }
-    // disable synchronous version of this method
-    ::grpc::Status Release(::grpc::ServerContext* /*context*/, const ::io::deephaven::proto::backplane::grpc::ReleaseRequest* /*request*/, ::io::deephaven::proto::backplane::grpc::ReleaseResponse* /*response*/) override {
-      abort();
-      return ::grpc::Status(::grpc::StatusCode::UNIMPLEMENTED, "");
-    }
-  };
-  template <class BaseClass>
-  class WithGenericMethod_ExportFromTicket : public BaseClass {
-   private:
-    void BaseClassMustBeDerivedFromService(const Service* /*service*/) {}
-   public:
-    WithGenericMethod_ExportFromTicket() {
-      ::grpc::Service::MarkMethodGeneric(4);
-    }
-    ~WithGenericMethod_ExportFromTicket() override {
-      BaseClassMustBeDerivedFromService(this);
-    }
-    // disable synchronous version of this method
-    ::grpc::Status ExportFromTicket(::grpc::ServerContext* /*context*/, const ::io::deephaven::proto::backplane::grpc::ExportRequest* /*request*/, ::io::deephaven::proto::backplane::grpc::ExportResponse* /*response*/) override {
-      abort();
-      return ::grpc::Status(::grpc::StatusCode::UNIMPLEMENTED, "");
-    }
-  };
-  template <class BaseClass>
-  class WithGenericMethod_PublishFromTicket : public BaseClass {
-   private:
-    void BaseClassMustBeDerivedFromService(const Service* /*service*/) {}
-   public:
-    WithGenericMethod_PublishFromTicket() {
-      ::grpc::Service::MarkMethodGeneric(5);
-    }
-    ~WithGenericMethod_PublishFromTicket() override {
-      BaseClassMustBeDerivedFromService(this);
-    }
-    // disable synchronous version of this method
-    ::grpc::Status PublishFromTicket(::grpc::ServerContext* /*context*/, const ::io::deephaven::proto::backplane::grpc::PublishRequest* /*request*/, ::io::deephaven::proto::backplane::grpc::PublishResponse* /*response*/) override {
-      abort();
-      return ::grpc::Status(::grpc::StatusCode::UNIMPLEMENTED, "");
-    }
-  };
-  template <class BaseClass>
-  class WithGenericMethod_ExportNotifications : public BaseClass {
-   private:
-    void BaseClassMustBeDerivedFromService(const Service* /*service*/) {}
-   public:
-    WithGenericMethod_ExportNotifications() {
-      ::grpc::Service::MarkMethodGeneric(6);
-    }
-    ~WithGenericMethod_ExportNotifications() override {
-      BaseClassMustBeDerivedFromService(this);
-    }
-    // disable synchronous version of this method
-    ::grpc::Status ExportNotifications(::grpc::ServerContext* /*context*/, const ::io::deephaven::proto::backplane::grpc::ExportNotificationRequest* /*request*/, ::grpc::ServerWriter< ::io::deephaven::proto::backplane::grpc::ExportNotification>* /*writer*/) override {
-      abort();
-      return ::grpc::Status(::grpc::StatusCode::UNIMPLEMENTED, "");
-    }
-  };
-  template <class BaseClass>
-  class WithGenericMethod_TerminationNotification : public BaseClass {
-   private:
-    void BaseClassMustBeDerivedFromService(const Service* /*service*/) {}
-   public:
-    WithGenericMethod_TerminationNotification() {
-      ::grpc::Service::MarkMethodGeneric(7);
-    }
-    ~WithGenericMethod_TerminationNotification() override {
-      BaseClassMustBeDerivedFromService(this);
-    }
-    // disable synchronous version of this method
-    ::grpc::Status TerminationNotification(::grpc::ServerContext* /*context*/, const ::io::deephaven::proto::backplane::grpc::TerminationNotificationRequest* /*request*/, ::io::deephaven::proto::backplane::grpc::TerminationNotificationResponse* /*response*/) override {
-      abort();
-      return ::grpc::Status(::grpc::StatusCode::UNIMPLEMENTED, "");
-    }
-  };
-  template <class BaseClass>
-  class WithRawMethod_NewSession : public BaseClass {
-   private:
-    void BaseClassMustBeDerivedFromService(const Service* /*service*/) {}
-   public:
-    WithRawMethod_NewSession() {
-      ::grpc::Service::MarkMethodRaw(0);
-    }
-    ~WithRawMethod_NewSession() override {
-      BaseClassMustBeDerivedFromService(this);
-    }
-    // disable synchronous version of this method
-    ::grpc::Status NewSession(::grpc::ServerContext* /*context*/, const ::io::deephaven::proto::backplane::grpc::HandshakeRequest* /*request*/, ::io::deephaven::proto::backplane::grpc::HandshakeResponse* /*response*/) override {
-      abort();
-      return ::grpc::Status(::grpc::StatusCode::UNIMPLEMENTED, "");
-    }
-    void RequestNewSession(::grpc::ServerContext* context, ::grpc::ByteBuffer* request, ::grpc::ServerAsyncResponseWriter< ::grpc::ByteBuffer>* response, ::grpc::CompletionQueue* new_call_cq, ::grpc::ServerCompletionQueue* notification_cq, void *tag) {
-      ::grpc::Service::RequestAsyncUnary(0, context, request, response, new_call_cq, notification_cq, tag);
-    }
-  };
-  template <class BaseClass>
-  class WithRawMethod_RefreshSessionToken : public BaseClass {
-   private:
-    void BaseClassMustBeDerivedFromService(const Service* /*service*/) {}
-   public:
-    WithRawMethod_RefreshSessionToken() {
-      ::grpc::Service::MarkMethodRaw(1);
-    }
-    ~WithRawMethod_RefreshSessionToken() override {
-      BaseClassMustBeDerivedFromService(this);
-    }
-    // disable synchronous version of this method
-    ::grpc::Status RefreshSessionToken(::grpc::ServerContext* /*context*/, const ::io::deephaven::proto::backplane::grpc::HandshakeRequest* /*request*/, ::io::deephaven::proto::backplane::grpc::HandshakeResponse* /*response*/) override {
-      abort();
-      return ::grpc::Status(::grpc::StatusCode::UNIMPLEMENTED, "");
-    }
-    void RequestRefreshSessionToken(::grpc::ServerContext* context, ::grpc::ByteBuffer* request, ::grpc::ServerAsyncResponseWriter< ::grpc::ByteBuffer>* response, ::grpc::CompletionQueue* new_call_cq, ::grpc::ServerCompletionQueue* notification_cq, void *tag) {
-      ::grpc::Service::RequestAsyncUnary(1, context, request, response, new_call_cq, notification_cq, tag);
-    }
-  };
-  template <class BaseClass>
-  class WithRawMethod_CloseSession : public BaseClass {
-   private:
-    void BaseClassMustBeDerivedFromService(const Service* /*service*/) {}
-   public:
-    WithRawMethod_CloseSession() {
-      ::grpc::Service::MarkMethodRaw(2);
-    }
-    ~WithRawMethod_CloseSession() override {
-      BaseClassMustBeDerivedFromService(this);
-    }
-    // disable synchronous version of this method
-    ::grpc::Status CloseSession(::grpc::ServerContext* /*context*/, const ::io::deephaven::proto::backplane::grpc::HandshakeRequest* /*request*/, ::io::deephaven::proto::backplane::grpc::CloseSessionResponse* /*response*/) override {
-      abort();
-      return ::grpc::Status(::grpc::StatusCode::UNIMPLEMENTED, "");
-    }
-    void RequestCloseSession(::grpc::ServerContext* context, ::grpc::ByteBuffer* request, ::grpc::ServerAsyncResponseWriter< ::grpc::ByteBuffer>* response, ::grpc::CompletionQueue* new_call_cq, ::grpc::ServerCompletionQueue* notification_cq, void *tag) {
-      ::grpc::Service::RequestAsyncUnary(2, context, request, response, new_call_cq, notification_cq, tag);
-    }
-  };
-  template <class BaseClass>
-  class WithRawMethod_Release : public BaseClass {
-   private:
-    void BaseClassMustBeDerivedFromService(const Service* /*service*/) {}
-   public:
-    WithRawMethod_Release() {
-      ::grpc::Service::MarkMethodRaw(3);
-    }
-    ~WithRawMethod_Release() override {
-      BaseClassMustBeDerivedFromService(this);
-    }
-    // disable synchronous version of this method
-    ::grpc::Status Release(::grpc::ServerContext* /*context*/, const ::io::deephaven::proto::backplane::grpc::ReleaseRequest* /*request*/, ::io::deephaven::proto::backplane::grpc::ReleaseResponse* /*response*/) override {
-      abort();
-      return ::grpc::Status(::grpc::StatusCode::UNIMPLEMENTED, "");
-    }
-    void RequestRelease(::grpc::ServerContext* context, ::grpc::ByteBuffer* request, ::grpc::ServerAsyncResponseWriter< ::grpc::ByteBuffer>* response, ::grpc::CompletionQueue* new_call_cq, ::grpc::ServerCompletionQueue* notification_cq, void *tag) {
-      ::grpc::Service::RequestAsyncUnary(3, context, request, response, new_call_cq, notification_cq, tag);
-    }
-  };
-  template <class BaseClass>
-  class WithRawMethod_ExportFromTicket : public BaseClass {
-   private:
-    void BaseClassMustBeDerivedFromService(const Service* /*service*/) {}
-   public:
-    WithRawMethod_ExportFromTicket() {
-      ::grpc::Service::MarkMethodRaw(4);
-    }
-    ~WithRawMethod_ExportFromTicket() override {
-      BaseClassMustBeDerivedFromService(this);
-    }
-    // disable synchronous version of this method
-    ::grpc::Status ExportFromTicket(::grpc::ServerContext* /*context*/, const ::io::deephaven::proto::backplane::grpc::ExportRequest* /*request*/, ::io::deephaven::proto::backplane::grpc::ExportResponse* /*response*/) override {
-      abort();
-      return ::grpc::Status(::grpc::StatusCode::UNIMPLEMENTED, "");
-    }
-    void RequestExportFromTicket(::grpc::ServerContext* context, ::grpc::ByteBuffer* request, ::grpc::ServerAsyncResponseWriter< ::grpc::ByteBuffer>* response, ::grpc::CompletionQueue* new_call_cq, ::grpc::ServerCompletionQueue* notification_cq, void *tag) {
-      ::grpc::Service::RequestAsyncUnary(4, context, request, response, new_call_cq, notification_cq, tag);
-    }
-  };
-  template <class BaseClass>
-  class WithRawMethod_PublishFromTicket : public BaseClass {
-   private:
-    void BaseClassMustBeDerivedFromService(const Service* /*service*/) {}
-   public:
-    WithRawMethod_PublishFromTicket() {
-      ::grpc::Service::MarkMethodRaw(5);
-    }
-    ~WithRawMethod_PublishFromTicket() override {
-      BaseClassMustBeDerivedFromService(this);
-    }
-    // disable synchronous version of this method
-    ::grpc::Status PublishFromTicket(::grpc::ServerContext* /*context*/, const ::io::deephaven::proto::backplane::grpc::PublishRequest* /*request*/, ::io::deephaven::proto::backplane::grpc::PublishResponse* /*response*/) override {
-      abort();
-      return ::grpc::Status(::grpc::StatusCode::UNIMPLEMENTED, "");
-    }
-    void RequestPublishFromTicket(::grpc::ServerContext* context, ::grpc::ByteBuffer* request, ::grpc::ServerAsyncResponseWriter< ::grpc::ByteBuffer>* response, ::grpc::CompletionQueue* new_call_cq, ::grpc::ServerCompletionQueue* notification_cq, void *tag) {
-      ::grpc::Service::RequestAsyncUnary(5, context, request, response, new_call_cq, notification_cq, tag);
-    }
-  };
-  template <class BaseClass>
-  class WithRawMethod_ExportNotifications : public BaseClass {
-   private:
-    void BaseClassMustBeDerivedFromService(const Service* /*service*/) {}
-   public:
-    WithRawMethod_ExportNotifications() {
-      ::grpc::Service::MarkMethodRaw(6);
-    }
-    ~WithRawMethod_ExportNotifications() override {
-      BaseClassMustBeDerivedFromService(this);
-    }
-    // disable synchronous version of this method
-    ::grpc::Status ExportNotifications(::grpc::ServerContext* /*context*/, const ::io::deephaven::proto::backplane::grpc::ExportNotificationRequest* /*request*/, ::grpc::ServerWriter< ::io::deephaven::proto::backplane::grpc::ExportNotification>* /*writer*/) override {
-      abort();
-      return ::grpc::Status(::grpc::StatusCode::UNIMPLEMENTED, "");
-    }
-    void RequestExportNotifications(::grpc::ServerContext* context, ::grpc::ByteBuffer* request, ::grpc::ServerAsyncWriter< ::grpc::ByteBuffer>* writer, ::grpc::CompletionQueue* new_call_cq, ::grpc::ServerCompletionQueue* notification_cq, void *tag) {
-      ::grpc::Service::RequestAsyncServerStreaming(6, context, request, writer, new_call_cq, notification_cq, tag);
-    }
-  };
-  template <class BaseClass>
-  class WithRawMethod_TerminationNotification : public BaseClass {
-   private:
-    void BaseClassMustBeDerivedFromService(const Service* /*service*/) {}
-   public:
-    WithRawMethod_TerminationNotification() {
-      ::grpc::Service::MarkMethodRaw(7);
-    }
-    ~WithRawMethod_TerminationNotification() override {
-      BaseClassMustBeDerivedFromService(this);
-    }
-    // disable synchronous version of this method
-    ::grpc::Status TerminationNotification(::grpc::ServerContext* /*context*/, const ::io::deephaven::proto::backplane::grpc::TerminationNotificationRequest* /*request*/, ::io::deephaven::proto::backplane::grpc::TerminationNotificationResponse* /*response*/) override {
-      abort();
-      return ::grpc::Status(::grpc::StatusCode::UNIMPLEMENTED, "");
-    }
-    void RequestTerminationNotification(::grpc::ServerContext* context, ::grpc::ByteBuffer* request, ::grpc::ServerAsyncResponseWriter< ::grpc::ByteBuffer>* response, ::grpc::CompletionQueue* new_call_cq, ::grpc::ServerCompletionQueue* notification_cq, void *tag) {
-      ::grpc::Service::RequestAsyncUnary(7, context, request, response, new_call_cq, notification_cq, tag);
-    }
-  };
-  template <class BaseClass>
-  class WithRawCallbackMethod_NewSession : public BaseClass {
-   private:
-    void BaseClassMustBeDerivedFromService(const Service* /*service*/) {}
-   public:
-    WithRawCallbackMethod_NewSession() {
-      ::grpc::Service::MarkMethodRawCallback(0,
-          new ::grpc::internal::CallbackUnaryHandler< ::grpc::ByteBuffer, ::grpc::ByteBuffer>(
-            [this](
-                   ::grpc::CallbackServerContext* context, const ::grpc::ByteBuffer* request, ::grpc::ByteBuffer* response) { return this->NewSession(context, request, response); }));
-    }
-    ~WithRawCallbackMethod_NewSession() override {
-      BaseClassMustBeDerivedFromService(this);
-    }
-    // disable synchronous version of this method
-    ::grpc::Status NewSession(::grpc::ServerContext* /*context*/, const ::io::deephaven::proto::backplane::grpc::HandshakeRequest* /*request*/, ::io::deephaven::proto::backplane::grpc::HandshakeResponse* /*response*/) override {
-      abort();
-      return ::grpc::Status(::grpc::StatusCode::UNIMPLEMENTED, "");
-    }
-    virtual ::grpc::ServerUnaryReactor* NewSession(
-      ::grpc::CallbackServerContext* /*context*/, const ::grpc::ByteBuffer* /*request*/, ::grpc::ByteBuffer* /*response*/)  { return nullptr; }
-  };
-  template <class BaseClass>
-  class WithRawCallbackMethod_RefreshSessionToken : public BaseClass {
-   private:
-    void BaseClassMustBeDerivedFromService(const Service* /*service*/) {}
-   public:
-    WithRawCallbackMethod_RefreshSessionToken() {
-      ::grpc::Service::MarkMethodRawCallback(1,
-          new ::grpc::internal::CallbackUnaryHandler< ::grpc::ByteBuffer, ::grpc::ByteBuffer>(
-            [this](
-                   ::grpc::CallbackServerContext* context, const ::grpc::ByteBuffer* request, ::grpc::ByteBuffer* response) { return this->RefreshSessionToken(context, request, response); }));
-    }
-    ~WithRawCallbackMethod_RefreshSessionToken() override {
-      BaseClassMustBeDerivedFromService(this);
-    }
-    // disable synchronous version of this method
-    ::grpc::Status RefreshSessionToken(::grpc::ServerContext* /*context*/, const ::io::deephaven::proto::backplane::grpc::HandshakeRequest* /*request*/, ::io::deephaven::proto::backplane::grpc::HandshakeResponse* /*response*/) override {
-      abort();
-      return ::grpc::Status(::grpc::StatusCode::UNIMPLEMENTED, "");
-    }
-    virtual ::grpc::ServerUnaryReactor* RefreshSessionToken(
-      ::grpc::CallbackServerContext* /*context*/, const ::grpc::ByteBuffer* /*request*/, ::grpc::ByteBuffer* /*response*/)  { return nullptr; }
-  };
-  template <class BaseClass>
-  class WithRawCallbackMethod_CloseSession : public BaseClass {
-   private:
-    void BaseClassMustBeDerivedFromService(const Service* /*service*/) {}
-   public:
-    WithRawCallbackMethod_CloseSession() {
-      ::grpc::Service::MarkMethodRawCallback(2,
-          new ::grpc::internal::CallbackUnaryHandler< ::grpc::ByteBuffer, ::grpc::ByteBuffer>(
-            [this](
-                   ::grpc::CallbackServerContext* context, const ::grpc::ByteBuffer* request, ::grpc::ByteBuffer* response) { return this->CloseSession(context, request, response); }));
-    }
-    ~WithRawCallbackMethod_CloseSession() override {
-      BaseClassMustBeDerivedFromService(this);
-    }
-    // disable synchronous version of this method
-    ::grpc::Status CloseSession(::grpc::ServerContext* /*context*/, const ::io::deephaven::proto::backplane::grpc::HandshakeRequest* /*request*/, ::io::deephaven::proto::backplane::grpc::CloseSessionResponse* /*response*/) override {
-      abort();
-      return ::grpc::Status(::grpc::StatusCode::UNIMPLEMENTED, "");
-    }
-    virtual ::grpc::ServerUnaryReactor* CloseSession(
-      ::grpc::CallbackServerContext* /*context*/, const ::grpc::ByteBuffer* /*request*/, ::grpc::ByteBuffer* /*response*/)  { return nullptr; }
-  };
-  template <class BaseClass>
-  class WithRawCallbackMethod_Release : public BaseClass {
-   private:
-    void BaseClassMustBeDerivedFromService(const Service* /*service*/) {}
-   public:
-    WithRawCallbackMethod_Release() {
-      ::grpc::Service::MarkMethodRawCallback(3,
-          new ::grpc::internal::CallbackUnaryHandler< ::grpc::ByteBuffer, ::grpc::ByteBuffer>(
-            [this](
-                   ::grpc::CallbackServerContext* context, const ::grpc::ByteBuffer* request, ::grpc::ByteBuffer* response) { return this->Release(context, request, response); }));
-    }
-    ~WithRawCallbackMethod_Release() override {
-      BaseClassMustBeDerivedFromService(this);
-    }
-    // disable synchronous version of this method
-    ::grpc::Status Release(::grpc::ServerContext* /*context*/, const ::io::deephaven::proto::backplane::grpc::ReleaseRequest* /*request*/, ::io::deephaven::proto::backplane::grpc::ReleaseResponse* /*response*/) override {
-      abort();
-      return ::grpc::Status(::grpc::StatusCode::UNIMPLEMENTED, "");
-    }
-    virtual ::grpc::ServerUnaryReactor* Release(
-      ::grpc::CallbackServerContext* /*context*/, const ::grpc::ByteBuffer* /*request*/, ::grpc::ByteBuffer* /*response*/)  { return nullptr; }
-  };
-  template <class BaseClass>
-  class WithRawCallbackMethod_ExportFromTicket : public BaseClass {
-   private:
-    void BaseClassMustBeDerivedFromService(const Service* /*service*/) {}
-   public:
-    WithRawCallbackMethod_ExportFromTicket() {
-      ::grpc::Service::MarkMethodRawCallback(4,
-          new ::grpc::internal::CallbackUnaryHandler< ::grpc::ByteBuffer, ::grpc::ByteBuffer>(
-            [this](
-                   ::grpc::CallbackServerContext* context, const ::grpc::ByteBuffer* request, ::grpc::ByteBuffer* response) { return this->ExportFromTicket(context, request, response); }));
-    }
-    ~WithRawCallbackMethod_ExportFromTicket() override {
-      BaseClassMustBeDerivedFromService(this);
-    }
-    // disable synchronous version of this method
-    ::grpc::Status ExportFromTicket(::grpc::ServerContext* /*context*/, const ::io::deephaven::proto::backplane::grpc::ExportRequest* /*request*/, ::io::deephaven::proto::backplane::grpc::ExportResponse* /*response*/) override {
-      abort();
-      return ::grpc::Status(::grpc::StatusCode::UNIMPLEMENTED, "");
-    }
-    virtual ::grpc::ServerUnaryReactor* ExportFromTicket(
-      ::grpc::CallbackServerContext* /*context*/, const ::grpc::ByteBuffer* /*request*/, ::grpc::ByteBuffer* /*response*/)  { return nullptr; }
-  };
-  template <class BaseClass>
-  class WithRawCallbackMethod_PublishFromTicket : public BaseClass {
-   private:
-    void BaseClassMustBeDerivedFromService(const Service* /*service*/) {}
-   public:
-    WithRawCallbackMethod_PublishFromTicket() {
-      ::grpc::Service::MarkMethodRawCallback(5,
-          new ::grpc::internal::CallbackUnaryHandler< ::grpc::ByteBuffer, ::grpc::ByteBuffer>(
-            [this](
-                   ::grpc::CallbackServerContext* context, const ::grpc::ByteBuffer* request, ::grpc::ByteBuffer* response) { return this->PublishFromTicket(context, request, response); }));
-    }
-    ~WithRawCallbackMethod_PublishFromTicket() override {
-      BaseClassMustBeDerivedFromService(this);
-    }
-    // disable synchronous version of this method
-    ::grpc::Status PublishFromTicket(::grpc::ServerContext* /*context*/, const ::io::deephaven::proto::backplane::grpc::PublishRequest* /*request*/, ::io::deephaven::proto::backplane::grpc::PublishResponse* /*response*/) override {
-      abort();
-      return ::grpc::Status(::grpc::StatusCode::UNIMPLEMENTED, "");
-    }
-    virtual ::grpc::ServerUnaryReactor* PublishFromTicket(
-      ::grpc::CallbackServerContext* /*context*/, const ::grpc::ByteBuffer* /*request*/, ::grpc::ByteBuffer* /*response*/)  { return nullptr; }
-  };
-  template <class BaseClass>
-  class WithRawCallbackMethod_ExportNotifications : public BaseClass {
-   private:
-    void BaseClassMustBeDerivedFromService(const Service* /*service*/) {}
-   public:
-    WithRawCallbackMethod_ExportNotifications() {
-      ::grpc::Service::MarkMethodRawCallback(6,
-          new ::grpc::internal::CallbackServerStreamingHandler< ::grpc::ByteBuffer, ::grpc::ByteBuffer>(
-            [this](
-                   ::grpc::CallbackServerContext* context, const::grpc::ByteBuffer* request) { return this->ExportNotifications(context, request); }));
-    }
-    ~WithRawCallbackMethod_ExportNotifications() override {
-      BaseClassMustBeDerivedFromService(this);
-    }
-    // disable synchronous version of this method
-    ::grpc::Status ExportNotifications(::grpc::ServerContext* /*context*/, const ::io::deephaven::proto::backplane::grpc::ExportNotificationRequest* /*request*/, ::grpc::ServerWriter< ::io::deephaven::proto::backplane::grpc::ExportNotification>* /*writer*/) override {
-      abort();
-      return ::grpc::Status(::grpc::StatusCode::UNIMPLEMENTED, "");
-    }
-    virtual ::grpc::ServerWriteReactor< ::grpc::ByteBuffer>* ExportNotifications(
-      ::grpc::CallbackServerContext* /*context*/, const ::grpc::ByteBuffer* /*request*/)  { return nullptr; }
-  };
-  template <class BaseClass>
-  class WithRawCallbackMethod_TerminationNotification : public BaseClass {
-   private:
-    void BaseClassMustBeDerivedFromService(const Service* /*service*/) {}
-   public:
-    WithRawCallbackMethod_TerminationNotification() {
-      ::grpc::Service::MarkMethodRawCallback(7,
-          new ::grpc::internal::CallbackUnaryHandler< ::grpc::ByteBuffer, ::grpc::ByteBuffer>(
-            [this](
-                   ::grpc::CallbackServerContext* context, const ::grpc::ByteBuffer* request, ::grpc::ByteBuffer* response) { return this->TerminationNotification(context, request, response); }));
-    }
-    ~WithRawCallbackMethod_TerminationNotification() override {
-      BaseClassMustBeDerivedFromService(this);
-    }
-    // disable synchronous version of this method
-    ::grpc::Status TerminationNotification(::grpc::ServerContext* /*context*/, const ::io::deephaven::proto::backplane::grpc::TerminationNotificationRequest* /*request*/, ::io::deephaven::proto::backplane::grpc::TerminationNotificationResponse* /*response*/) override {
-      abort();
-      return ::grpc::Status(::grpc::StatusCode::UNIMPLEMENTED, "");
-    }
-    virtual ::grpc::ServerUnaryReactor* TerminationNotification(
-      ::grpc::CallbackServerContext* /*context*/, const ::grpc::ByteBuffer* /*request*/, ::grpc::ByteBuffer* /*response*/)  { return nullptr; }
-  };
-  template <class BaseClass>
-  class WithStreamedUnaryMethod_NewSession : public BaseClass {
-   private:
-    void BaseClassMustBeDerivedFromService(const Service* /*service*/) {}
-   public:
-    WithStreamedUnaryMethod_NewSession() {
-      ::grpc::Service::MarkMethodStreamed(0,
-        new ::grpc::internal::StreamedUnaryHandler<
-          ::io::deephaven::proto::backplane::grpc::HandshakeRequest, ::io::deephaven::proto::backplane::grpc::HandshakeResponse>(
-            [this](::grpc::ServerContext* context,
-                   ::grpc::ServerUnaryStreamer<
-                     ::io::deephaven::proto::backplane::grpc::HandshakeRequest, ::io::deephaven::proto::backplane::grpc::HandshakeResponse>* streamer) {
-                       return this->StreamedNewSession(context,
-                         streamer);
-                  }));
-    }
-    ~WithStreamedUnaryMethod_NewSession() override {
-      BaseClassMustBeDerivedFromService(this);
-    }
-    // disable regular version of this method
-    ::grpc::Status NewSession(::grpc::ServerContext* /*context*/, const ::io::deephaven::proto::backplane::grpc::HandshakeRequest* /*request*/, ::io::deephaven::proto::backplane::grpc::HandshakeResponse* /*response*/) override {
-      abort();
-      return ::grpc::Status(::grpc::StatusCode::UNIMPLEMENTED, "");
-    }
-    // replace default version of method with streamed unary
-    virtual ::grpc::Status StreamedNewSession(::grpc::ServerContext* context, ::grpc::ServerUnaryStreamer< ::io::deephaven::proto::backplane::grpc::HandshakeRequest,::io::deephaven::proto::backplane::grpc::HandshakeResponse>* server_unary_streamer) = 0;
-  };
-  template <class BaseClass>
-  class WithStreamedUnaryMethod_RefreshSessionToken : public BaseClass {
-   private:
-    void BaseClassMustBeDerivedFromService(const Service* /*service*/) {}
-   public:
-    WithStreamedUnaryMethod_RefreshSessionToken() {
-      ::grpc::Service::MarkMethodStreamed(1,
-        new ::grpc::internal::StreamedUnaryHandler<
-          ::io::deephaven::proto::backplane::grpc::HandshakeRequest, ::io::deephaven::proto::backplane::grpc::HandshakeResponse>(
-            [this](::grpc::ServerContext* context,
-                   ::grpc::ServerUnaryStreamer<
-                     ::io::deephaven::proto::backplane::grpc::HandshakeRequest, ::io::deephaven::proto::backplane::grpc::HandshakeResponse>* streamer) {
-                       return this->StreamedRefreshSessionToken(context,
-                         streamer);
-                  }));
-    }
-    ~WithStreamedUnaryMethod_RefreshSessionToken() override {
-      BaseClassMustBeDerivedFromService(this);
-    }
-    // disable regular version of this method
-    ::grpc::Status RefreshSessionToken(::grpc::ServerContext* /*context*/, const ::io::deephaven::proto::backplane::grpc::HandshakeRequest* /*request*/, ::io::deephaven::proto::backplane::grpc::HandshakeResponse* /*response*/) override {
-      abort();
-      return ::grpc::Status(::grpc::StatusCode::UNIMPLEMENTED, "");
-    }
-    // replace default version of method with streamed unary
-    virtual ::grpc::Status StreamedRefreshSessionToken(::grpc::ServerContext* context, ::grpc::ServerUnaryStreamer< ::io::deephaven::proto::backplane::grpc::HandshakeRequest,::io::deephaven::proto::backplane::grpc::HandshakeResponse>* server_unary_streamer) = 0;
-  };
-  template <class BaseClass>
-  class WithStreamedUnaryMethod_CloseSession : public BaseClass {
-   private:
-    void BaseClassMustBeDerivedFromService(const Service* /*service*/) {}
-   public:
-    WithStreamedUnaryMethod_CloseSession() {
-      ::grpc::Service::MarkMethodStreamed(2,
-        new ::grpc::internal::StreamedUnaryHandler<
-          ::io::deephaven::proto::backplane::grpc::HandshakeRequest, ::io::deephaven::proto::backplane::grpc::CloseSessionResponse>(
-            [this](::grpc::ServerContext* context,
-                   ::grpc::ServerUnaryStreamer<
-                     ::io::deephaven::proto::backplane::grpc::HandshakeRequest, ::io::deephaven::proto::backplane::grpc::CloseSessionResponse>* streamer) {
-                       return this->StreamedCloseSession(context,
-                         streamer);
-                  }));
-    }
-    ~WithStreamedUnaryMethod_CloseSession() override {
-      BaseClassMustBeDerivedFromService(this);
-    }
-    // disable regular version of this method
-    ::grpc::Status CloseSession(::grpc::ServerContext* /*context*/, const ::io::deephaven::proto::backplane::grpc::HandshakeRequest* /*request*/, ::io::deephaven::proto::backplane::grpc::CloseSessionResponse* /*response*/) override {
-      abort();
-      return ::grpc::Status(::grpc::StatusCode::UNIMPLEMENTED, "");
-    }
-    // replace default version of method with streamed unary
-    virtual ::grpc::Status StreamedCloseSession(::grpc::ServerContext* context, ::grpc::ServerUnaryStreamer< ::io::deephaven::proto::backplane::grpc::HandshakeRequest,::io::deephaven::proto::backplane::grpc::CloseSessionResponse>* server_unary_streamer) = 0;
-  };
-  template <class BaseClass>
-  class WithStreamedUnaryMethod_Release : public BaseClass {
-   private:
-    void BaseClassMustBeDerivedFromService(const Service* /*service*/) {}
-   public:
-    WithStreamedUnaryMethod_Release() {
-      ::grpc::Service::MarkMethodStreamed(3,
-        new ::grpc::internal::StreamedUnaryHandler<
-          ::io::deephaven::proto::backplane::grpc::ReleaseRequest, ::io::deephaven::proto::backplane::grpc::ReleaseResponse>(
-            [this](::grpc::ServerContext* context,
-                   ::grpc::ServerUnaryStreamer<
-                     ::io::deephaven::proto::backplane::grpc::ReleaseRequest, ::io::deephaven::proto::backplane::grpc::ReleaseResponse>* streamer) {
-                       return this->StreamedRelease(context,
-                         streamer);
-                  }));
-    }
-    ~WithStreamedUnaryMethod_Release() override {
-      BaseClassMustBeDerivedFromService(this);
-    }
-    // disable regular version of this method
-    ::grpc::Status Release(::grpc::ServerContext* /*context*/, const ::io::deephaven::proto::backplane::grpc::ReleaseRequest* /*request*/, ::io::deephaven::proto::backplane::grpc::ReleaseResponse* /*response*/) override {
-      abort();
-      return ::grpc::Status(::grpc::StatusCode::UNIMPLEMENTED, "");
-    }
-    // replace default version of method with streamed unary
-    virtual ::grpc::Status StreamedRelease(::grpc::ServerContext* context, ::grpc::ServerUnaryStreamer< ::io::deephaven::proto::backplane::grpc::ReleaseRequest,::io::deephaven::proto::backplane::grpc::ReleaseResponse>* server_unary_streamer) = 0;
-  };
-  template <class BaseClass>
-  class WithStreamedUnaryMethod_ExportFromTicket : public BaseClass {
-   private:
-    void BaseClassMustBeDerivedFromService(const Service* /*service*/) {}
-   public:
-    WithStreamedUnaryMethod_ExportFromTicket() {
-      ::grpc::Service::MarkMethodStreamed(4,
-        new ::grpc::internal::StreamedUnaryHandler<
-          ::io::deephaven::proto::backplane::grpc::ExportRequest, ::io::deephaven::proto::backplane::grpc::ExportResponse>(
-            [this](::grpc::ServerContext* context,
-                   ::grpc::ServerUnaryStreamer<
-                     ::io::deephaven::proto::backplane::grpc::ExportRequest, ::io::deephaven::proto::backplane::grpc::ExportResponse>* streamer) {
-                       return this->StreamedExportFromTicket(context,
-                         streamer);
-                  }));
-    }
-    ~WithStreamedUnaryMethod_ExportFromTicket() override {
-      BaseClassMustBeDerivedFromService(this);
-    }
-    // disable regular version of this method
-    ::grpc::Status ExportFromTicket(::grpc::ServerContext* /*context*/, const ::io::deephaven::proto::backplane::grpc::ExportRequest* /*request*/, ::io::deephaven::proto::backplane::grpc::ExportResponse* /*response*/) override {
-      abort();
-      return ::grpc::Status(::grpc::StatusCode::UNIMPLEMENTED, "");
-    }
-    // replace default version of method with streamed unary
-    virtual ::grpc::Status StreamedExportFromTicket(::grpc::ServerContext* context, ::grpc::ServerUnaryStreamer< ::io::deephaven::proto::backplane::grpc::ExportRequest,::io::deephaven::proto::backplane::grpc::ExportResponse>* server_unary_streamer) = 0;
-  };
-  template <class BaseClass>
-  class WithStreamedUnaryMethod_PublishFromTicket : public BaseClass {
-   private:
-    void BaseClassMustBeDerivedFromService(const Service* /*service*/) {}
-   public:
-    WithStreamedUnaryMethod_PublishFromTicket() {
-      ::grpc::Service::MarkMethodStreamed(5,
-        new ::grpc::internal::StreamedUnaryHandler<
-          ::io::deephaven::proto::backplane::grpc::PublishRequest, ::io::deephaven::proto::backplane::grpc::PublishResponse>(
-            [this](::grpc::ServerContext* context,
-                   ::grpc::ServerUnaryStreamer<
-                     ::io::deephaven::proto::backplane::grpc::PublishRequest, ::io::deephaven::proto::backplane::grpc::PublishResponse>* streamer) {
-                       return this->StreamedPublishFromTicket(context,
-                         streamer);
-                  }));
-    }
-    ~WithStreamedUnaryMethod_PublishFromTicket() override {
-      BaseClassMustBeDerivedFromService(this);
-    }
-    // disable regular version of this method
-    ::grpc::Status PublishFromTicket(::grpc::ServerContext* /*context*/, const ::io::deephaven::proto::backplane::grpc::PublishRequest* /*request*/, ::io::deephaven::proto::backplane::grpc::PublishResponse* /*response*/) override {
-      abort();
-      return ::grpc::Status(::grpc::StatusCode::UNIMPLEMENTED, "");
-    }
-    // replace default version of method with streamed unary
-    virtual ::grpc::Status StreamedPublishFromTicket(::grpc::ServerContext* context, ::grpc::ServerUnaryStreamer< ::io::deephaven::proto::backplane::grpc::PublishRequest,::io::deephaven::proto::backplane::grpc::PublishResponse>* server_unary_streamer) = 0;
-  };
-  template <class BaseClass>
-  class WithStreamedUnaryMethod_TerminationNotification : public BaseClass {
-   private:
-    void BaseClassMustBeDerivedFromService(const Service* /*service*/) {}
-   public:
-    WithStreamedUnaryMethod_TerminationNotification() {
-      ::grpc::Service::MarkMethodStreamed(7,
-        new ::grpc::internal::StreamedUnaryHandler<
-          ::io::deephaven::proto::backplane::grpc::TerminationNotificationRequest, ::io::deephaven::proto::backplane::grpc::TerminationNotificationResponse>(
-            [this](::grpc::ServerContext* context,
-                   ::grpc::ServerUnaryStreamer<
-                     ::io::deephaven::proto::backplane::grpc::TerminationNotificationRequest, ::io::deephaven::proto::backplane::grpc::TerminationNotificationResponse>* streamer) {
-                       return this->StreamedTerminationNotification(context,
-                         streamer);
-                  }));
-    }
-    ~WithStreamedUnaryMethod_TerminationNotification() override {
-      BaseClassMustBeDerivedFromService(this);
-    }
-    // disable regular version of this method
-    ::grpc::Status TerminationNotification(::grpc::ServerContext* /*context*/, const ::io::deephaven::proto::backplane::grpc::TerminationNotificationRequest* /*request*/, ::io::deephaven::proto::backplane::grpc::TerminationNotificationResponse* /*response*/) override {
-      abort();
-      return ::grpc::Status(::grpc::StatusCode::UNIMPLEMENTED, "");
-    }
-    // replace default version of method with streamed unary
-    virtual ::grpc::Status StreamedTerminationNotification(::grpc::ServerContext* context, ::grpc::ServerUnaryStreamer< ::io::deephaven::proto::backplane::grpc::TerminationNotificationRequest,::io::deephaven::proto::backplane::grpc::TerminationNotificationResponse>* server_unary_streamer) = 0;
-  };
-  typedef WithStreamedUnaryMethod_NewSession<WithStreamedUnaryMethod_RefreshSessionToken<WithStreamedUnaryMethod_CloseSession<WithStreamedUnaryMethod_Release<WithStreamedUnaryMethod_ExportFromTicket<WithStreamedUnaryMethod_PublishFromTicket<WithStreamedUnaryMethod_TerminationNotification<Service > > > > > > > StreamedUnaryService;
-  template <class BaseClass>
-  class WithSplitStreamingMethod_ExportNotifications : public BaseClass {
-   private:
-    void BaseClassMustBeDerivedFromService(const Service* /*service*/) {}
-   public:
-    WithSplitStreamingMethod_ExportNotifications() {
-      ::grpc::Service::MarkMethodStreamed(6,
-        new ::grpc::internal::SplitServerStreamingHandler<
-          ::io::deephaven::proto::backplane::grpc::ExportNotificationRequest, ::io::deephaven::proto::backplane::grpc::ExportNotification>(
-            [this](::grpc::ServerContext* context,
-                   ::grpc::ServerSplitStreamer<
-                     ::io::deephaven::proto::backplane::grpc::ExportNotificationRequest, ::io::deephaven::proto::backplane::grpc::ExportNotification>* streamer) {
-                       return this->StreamedExportNotifications(context,
-                         streamer);
-                  }));
-    }
-    ~WithSplitStreamingMethod_ExportNotifications() override {
-      BaseClassMustBeDerivedFromService(this);
-    }
-    // disable regular version of this method
-    ::grpc::Status ExportNotifications(::grpc::ServerContext* /*context*/, const ::io::deephaven::proto::backplane::grpc::ExportNotificationRequest* /*request*/, ::grpc::ServerWriter< ::io::deephaven::proto::backplane::grpc::ExportNotification>* /*writer*/) override {
-      abort();
-      return ::grpc::Status(::grpc::StatusCode::UNIMPLEMENTED, "");
-    }
-    // replace default version of method with split streamed
-    virtual ::grpc::Status StreamedExportNotifications(::grpc::ServerContext* context, ::grpc::ServerSplitStreamer< ::io::deephaven::proto::backplane::grpc::ExportNotificationRequest,::io::deephaven::proto::backplane::grpc::ExportNotification>* server_split_streamer) = 0;
-  };
-  typedef WithSplitStreamingMethod_ExportNotifications<Service > SplitStreamedService;
-  typedef WithStreamedUnaryMethod_NewSession<WithStreamedUnaryMethod_RefreshSessionToken<WithStreamedUnaryMethod_CloseSession<WithStreamedUnaryMethod_Release<WithStreamedUnaryMethod_ExportFromTicket<WithStreamedUnaryMethod_PublishFromTicket<WithSplitStreamingMethod_ExportNotifications<WithStreamedUnaryMethod_TerminationNotification<Service > > > > > > > > StreamedService;
-};
-
-}  // namespace grpc
-}  // namespace backplane
-}  // namespace proto
-}  // namespace deephaven
-}  // namespace io
-
-
-#endif  // GRPC_deephaven_2fproto_2fsession_2eproto__INCLUDED
diff --git a/cpp-client/deephaven/dhclient/proto/deephaven/proto/session.pb.cc b/cpp-client/deephaven/dhclient/proto/deephaven/proto/session.pb.cc
deleted file mode 100644
index 6088117987a..00000000000
--- a/cpp-client/deephaven/dhclient/proto/deephaven/proto/session.pb.cc
+++ /dev/null
@@ -1,3173 +0,0 @@
-// Generated by the protocol buffer compiler.  DO NOT EDIT!
-// source: deephaven/proto/session.proto
-
-#include "deephaven/proto/session.pb.h"
-
-#include <algorithm>
-#include "google/protobuf/io/coded_stream.h"
-#include "google/protobuf/extension_set.h"
-#include "google/protobuf/wire_format_lite.h"
-#include "google/protobuf/descriptor.h"
-#include "google/protobuf/generated_message_reflection.h"
-#include "google/protobuf/reflection_ops.h"
-#include "google/protobuf/wire_format.h"
-#include "google/protobuf/generated_message_tctable_impl.h"
-// @@protoc_insertion_point(includes)
-
-// Must be included last.
-#include "google/protobuf/port_def.inc"
-PROTOBUF_PRAGMA_INIT_SEG
-namespace _pb = ::google::protobuf;
-namespace _pbi = ::google::protobuf::internal;
-namespace _fl = ::google::protobuf::internal::field_layout;
-namespace io {
-namespace deephaven {
-namespace proto {
-namespace backplane {
-namespace grpc {
-
-inline constexpr WrappedAuthenticationRequest::Impl_::Impl_(
-    ::_pbi::ConstantInitialized) noexcept
-      : type_(
-            &::google::protobuf::internal::fixed_address_empty_string,
-            ::_pbi::ConstantInitialized()),
-        payload_(
-            &::google::protobuf::internal::fixed_address_empty_string,
-            ::_pbi::ConstantInitialized()),
-        _cached_size_{0} {}
-
-template <typename>
-PROTOBUF_CONSTEXPR WrappedAuthenticationRequest::WrappedAuthenticationRequest(::_pbi::ConstantInitialized)
-    : _impl_(::_pbi::ConstantInitialized()) {}
-struct WrappedAuthenticationRequestDefaultTypeInternal {
-  PROTOBUF_CONSTEXPR WrappedAuthenticationRequestDefaultTypeInternal() : _instance(::_pbi::ConstantInitialized{}) {}
-  ~WrappedAuthenticationRequestDefaultTypeInternal() {}
-  union {
-    WrappedAuthenticationRequest _instance;
-  };
-};
-
-PROTOBUF_ATTRIBUTE_NO_DESTROY PROTOBUF_CONSTINIT
-    PROTOBUF_ATTRIBUTE_INIT_PRIORITY1 WrappedAuthenticationRequestDefaultTypeInternal _WrappedAuthenticationRequest_default_instance_;
-
-inline constexpr TerminationNotificationResponse_StackTrace::Impl_::Impl_(
-    ::_pbi::ConstantInitialized) noexcept
-      : elements_{},
-        type_(
-            &::google::protobuf::internal::fixed_address_empty_string,
-            ::_pbi::ConstantInitialized()),
-        message_(
-            &::google::protobuf::internal::fixed_address_empty_string,
-            ::_pbi::ConstantInitialized()),
-        _cached_size_{0} {}
-
-template <typename>
-PROTOBUF_CONSTEXPR TerminationNotificationResponse_StackTrace::TerminationNotificationResponse_StackTrace(::_pbi::ConstantInitialized)
-    : _impl_(::_pbi::ConstantInitialized()) {}
-struct TerminationNotificationResponse_StackTraceDefaultTypeInternal {
-  PROTOBUF_CONSTEXPR TerminationNotificationResponse_StackTraceDefaultTypeInternal() : _instance(::_pbi::ConstantInitialized{}) {}
-  ~TerminationNotificationResponse_StackTraceDefaultTypeInternal() {}
-  union {
-    TerminationNotificationResponse_StackTrace _instance;
-  };
-};
-
-PROTOBUF_ATTRIBUTE_NO_DESTROY PROTOBUF_CONSTINIT
-    PROTOBUF_ATTRIBUTE_INIT_PRIORITY1 TerminationNotificationResponse_StackTraceDefaultTypeInternal _TerminationNotificationResponse_StackTrace_default_instance_;
-      template <typename>
-PROTOBUF_CONSTEXPR TerminationNotificationRequest::TerminationNotificationRequest(::_pbi::ConstantInitialized) {}
-struct TerminationNotificationRequestDefaultTypeInternal {
-  PROTOBUF_CONSTEXPR TerminationNotificationRequestDefaultTypeInternal() : _instance(::_pbi::ConstantInitialized{}) {}
-  ~TerminationNotificationRequestDefaultTypeInternal() {}
-  union {
-    TerminationNotificationRequest _instance;
-  };
-};
-
-PROTOBUF_ATTRIBUTE_NO_DESTROY PROTOBUF_CONSTINIT
-    PROTOBUF_ATTRIBUTE_INIT_PRIORITY1 TerminationNotificationRequestDefaultTypeInternal _TerminationNotificationRequest_default_instance_;
-      template <typename>
-PROTOBUF_CONSTEXPR ReleaseResponse::ReleaseResponse(::_pbi::ConstantInitialized) {}
-struct ReleaseResponseDefaultTypeInternal {
-  PROTOBUF_CONSTEXPR ReleaseResponseDefaultTypeInternal() : _instance(::_pbi::ConstantInitialized{}) {}
-  ~ReleaseResponseDefaultTypeInternal() {}
-  union {
-    ReleaseResponse _instance;
-  };
-};
-
-PROTOBUF_ATTRIBUTE_NO_DESTROY PROTOBUF_CONSTINIT
-    PROTOBUF_ATTRIBUTE_INIT_PRIORITY1 ReleaseResponseDefaultTypeInternal _ReleaseResponse_default_instance_;
-      template <typename>
-PROTOBUF_CONSTEXPR PublishResponse::PublishResponse(::_pbi::ConstantInitialized) {}
-struct PublishResponseDefaultTypeInternal {
-  PROTOBUF_CONSTEXPR PublishResponseDefaultTypeInternal() : _instance(::_pbi::ConstantInitialized{}) {}
-  ~PublishResponseDefaultTypeInternal() {}
-  union {
-    PublishResponse _instance;
-  };
-};
-
-PROTOBUF_ATTRIBUTE_NO_DESTROY PROTOBUF_CONSTINIT
-    PROTOBUF_ATTRIBUTE_INIT_PRIORITY1 PublishResponseDefaultTypeInternal _PublishResponse_default_instance_;
-
-inline constexpr HandshakeResponse::Impl_::Impl_(
-    ::_pbi::ConstantInitialized) noexcept
-      : metadata_header_(
-            &::google::protobuf::internal::fixed_address_empty_string,
-            ::_pbi::ConstantInitialized()),
-        session_token_(
-            &::google::protobuf::internal::fixed_address_empty_string,
-            ::_pbi::ConstantInitialized()),
-        token_deadline_time_millis_{::int64_t{0}},
-        token_expiration_delay_millis_{::int64_t{0}},
-        _cached_size_{0} {}
-
-template <typename>
-PROTOBUF_CONSTEXPR HandshakeResponse::HandshakeResponse(::_pbi::ConstantInitialized)
-    : _impl_(::_pbi::ConstantInitialized()) {}
-struct HandshakeResponseDefaultTypeInternal {
-  PROTOBUF_CONSTEXPR HandshakeResponseDefaultTypeInternal() : _instance(::_pbi::ConstantInitialized{}) {}
-  ~HandshakeResponseDefaultTypeInternal() {}
-  union {
-    HandshakeResponse _instance;
-  };
-};
-
-PROTOBUF_ATTRIBUTE_NO_DESTROY PROTOBUF_CONSTINIT
-    PROTOBUF_ATTRIBUTE_INIT_PRIORITY1 HandshakeResponseDefaultTypeInternal _HandshakeResponse_default_instance_;
-
-inline constexpr HandshakeRequest::Impl_::Impl_(
-    ::_pbi::ConstantInitialized) noexcept
-      : payload_(
-            &::google::protobuf::internal::fixed_address_empty_string,
-            ::_pbi::ConstantInitialized()),
-        auth_protocol_{0},
-        _cached_size_{0} {}
-
-template <typename>
-PROTOBUF_CONSTEXPR HandshakeRequest::HandshakeRequest(::_pbi::ConstantInitialized)
-    : _impl_(::_pbi::ConstantInitialized()) {}
-struct HandshakeRequestDefaultTypeInternal {
-  PROTOBUF_CONSTEXPR HandshakeRequestDefaultTypeInternal() : _instance(::_pbi::ConstantInitialized{}) {}
-  ~HandshakeRequestDefaultTypeInternal() {}
-  union {
-    HandshakeRequest _instance;
-  };
-};
-
-PROTOBUF_ATTRIBUTE_NO_DESTROY PROTOBUF_CONSTINIT
-    PROTOBUF_ATTRIBUTE_INIT_PRIORITY1 HandshakeRequestDefaultTypeInternal _HandshakeRequest_default_instance_;
-      template <typename>
-PROTOBUF_CONSTEXPR ExportResponse::ExportResponse(::_pbi::ConstantInitialized) {}
-struct ExportResponseDefaultTypeInternal {
-  PROTOBUF_CONSTEXPR ExportResponseDefaultTypeInternal() : _instance(::_pbi::ConstantInitialized{}) {}
-  ~ExportResponseDefaultTypeInternal() {}
-  union {
-    ExportResponse _instance;
-  };
-};
-
-PROTOBUF_ATTRIBUTE_NO_DESTROY PROTOBUF_CONSTINIT
-    PROTOBUF_ATTRIBUTE_INIT_PRIORITY1 ExportResponseDefaultTypeInternal _ExportResponse_default_instance_;
-      template <typename>
-PROTOBUF_CONSTEXPR ExportNotificationRequest::ExportNotificationRequest(::_pbi::ConstantInitialized) {}
-struct ExportNotificationRequestDefaultTypeInternal {
-  PROTOBUF_CONSTEXPR ExportNotificationRequestDefaultTypeInternal() : _instance(::_pbi::ConstantInitialized{}) {}
-  ~ExportNotificationRequestDefaultTypeInternal() {}
-  union {
-    ExportNotificationRequest _instance;
-  };
-};
-
-PROTOBUF_ATTRIBUTE_NO_DESTROY PROTOBUF_CONSTINIT
-    PROTOBUF_ATTRIBUTE_INIT_PRIORITY1 ExportNotificationRequestDefaultTypeInternal _ExportNotificationRequest_default_instance_;
-      template <typename>
-PROTOBUF_CONSTEXPR CloseSessionResponse::CloseSessionResponse(::_pbi::ConstantInitialized) {}
-struct CloseSessionResponseDefaultTypeInternal {
-  PROTOBUF_CONSTEXPR CloseSessionResponseDefaultTypeInternal() : _instance(::_pbi::ConstantInitialized{}) {}
-  ~CloseSessionResponseDefaultTypeInternal() {}
-  union {
-    CloseSessionResponse _instance;
-  };
-};
-
-PROTOBUF_ATTRIBUTE_NO_DESTROY PROTOBUF_CONSTINIT
-    PROTOBUF_ATTRIBUTE_INIT_PRIORITY1 CloseSessionResponseDefaultTypeInternal _CloseSessionResponse_default_instance_;
-
-inline constexpr TerminationNotificationResponse::Impl_::Impl_(
-    ::_pbi::ConstantInitialized) noexcept
-      : stack_traces_{},
-        reason_(
-            &::google::protobuf::internal::fixed_address_empty_string,
-            ::_pbi::ConstantInitialized()),
-        abnormal_termination_{false},
-        is_from_uncaught_exception_{false},
-        _cached_size_{0} {}
-
-template <typename>
-PROTOBUF_CONSTEXPR TerminationNotificationResponse::TerminationNotificationResponse(::_pbi::ConstantInitialized)
-    : _impl_(::_pbi::ConstantInitialized()) {}
-struct TerminationNotificationResponseDefaultTypeInternal {
-  PROTOBUF_CONSTEXPR TerminationNotificationResponseDefaultTypeInternal() : _instance(::_pbi::ConstantInitialized{}) {}
-  ~TerminationNotificationResponseDefaultTypeInternal() {}
-  union {
-    TerminationNotificationResponse _instance;
-  };
-};
-
-PROTOBUF_ATTRIBUTE_NO_DESTROY PROTOBUF_CONSTINIT
-    PROTOBUF_ATTRIBUTE_INIT_PRIORITY1 TerminationNotificationResponseDefaultTypeInternal _TerminationNotificationResponse_default_instance_;
-
-inline constexpr ReleaseRequest::Impl_::Impl_(
-    ::_pbi::ConstantInitialized) noexcept
-      : _cached_size_{0},
-        id_{nullptr} {}
-
-template <typename>
-PROTOBUF_CONSTEXPR ReleaseRequest::ReleaseRequest(::_pbi::ConstantInitialized)
-    : _impl_(::_pbi::ConstantInitialized()) {}
-struct ReleaseRequestDefaultTypeInternal {
-  PROTOBUF_CONSTEXPR ReleaseRequestDefaultTypeInternal() : _instance(::_pbi::ConstantInitialized{}) {}
-  ~ReleaseRequestDefaultTypeInternal() {}
-  union {
-    ReleaseRequest _instance;
-  };
-};
-
-PROTOBUF_ATTRIBUTE_NO_DESTROY PROTOBUF_CONSTINIT
-    PROTOBUF_ATTRIBUTE_INIT_PRIORITY1 ReleaseRequestDefaultTypeInternal _ReleaseRequest_default_instance_;
-
-inline constexpr PublishRequest::Impl_::Impl_(
-    ::_pbi::ConstantInitialized) noexcept
-      : _cached_size_{0},
-        source_id_{nullptr},
-        result_id_{nullptr} {}
-
-template <typename>
-PROTOBUF_CONSTEXPR PublishRequest::PublishRequest(::_pbi::ConstantInitialized)
-    : _impl_(::_pbi::ConstantInitialized()) {}
-struct PublishRequestDefaultTypeInternal {
-  PROTOBUF_CONSTEXPR PublishRequestDefaultTypeInternal() : _instance(::_pbi::ConstantInitialized{}) {}
-  ~PublishRequestDefaultTypeInternal() {}
-  union {
-    PublishRequest _instance;
-  };
-};
-
-PROTOBUF_ATTRIBUTE_NO_DESTROY PROTOBUF_CONSTINIT
-    PROTOBUF_ATTRIBUTE_INIT_PRIORITY1 PublishRequestDefaultTypeInternal _PublishRequest_default_instance_;
-
-inline constexpr ExportRequest::Impl_::Impl_(
-    ::_pbi::ConstantInitialized) noexcept
-      : _cached_size_{0},
-        source_id_{nullptr},
-        result_id_{nullptr} {}
-
-template <typename>
-PROTOBUF_CONSTEXPR ExportRequest::ExportRequest(::_pbi::ConstantInitialized)
-    : _impl_(::_pbi::ConstantInitialized()) {}
-struct ExportRequestDefaultTypeInternal {
-  PROTOBUF_CONSTEXPR ExportRequestDefaultTypeInternal() : _instance(::_pbi::ConstantInitialized{}) {}
-  ~ExportRequestDefaultTypeInternal() {}
-  union {
-    ExportRequest _instance;
-  };
-};
-
-PROTOBUF_ATTRIBUTE_NO_DESTROY PROTOBUF_CONSTINIT
-    PROTOBUF_ATTRIBUTE_INIT_PRIORITY1 ExportRequestDefaultTypeInternal _ExportRequest_default_instance_;
-
-inline constexpr ExportNotification::Impl_::Impl_(
-    ::_pbi::ConstantInitialized) noexcept
-      : _cached_size_{0},
-        context_(
-            &::google::protobuf::internal::fixed_address_empty_string,
-            ::_pbi::ConstantInitialized()),
-        dependent_handle_(
-            &::google::protobuf::internal::fixed_address_empty_string,
-            ::_pbi::ConstantInitialized()),
-        ticket_{nullptr},
-        export_state_{static_cast< ::io::deephaven::proto::backplane::grpc::ExportNotification_State >(0)} {}
-
-template <typename>
-PROTOBUF_CONSTEXPR ExportNotification::ExportNotification(::_pbi::ConstantInitialized)
-    : _impl_(::_pbi::ConstantInitialized()) {}
-struct ExportNotificationDefaultTypeInternal {
-  PROTOBUF_CONSTEXPR ExportNotificationDefaultTypeInternal() : _instance(::_pbi::ConstantInitialized{}) {}
-  ~ExportNotificationDefaultTypeInternal() {}
-  union {
-    ExportNotification _instance;
-  };
-};
-
-PROTOBUF_ATTRIBUTE_NO_DESTROY PROTOBUF_CONSTINIT
-    PROTOBUF_ATTRIBUTE_INIT_PRIORITY1 ExportNotificationDefaultTypeInternal _ExportNotification_default_instance_;
-}  // namespace grpc
-}  // namespace backplane
-}  // namespace proto
-}  // namespace deephaven
-}  // namespace io
-static ::_pb::Metadata file_level_metadata_deephaven_2fproto_2fsession_2eproto[15];
-static const ::_pb::EnumDescriptor* file_level_enum_descriptors_deephaven_2fproto_2fsession_2eproto[1];
-static constexpr const ::_pb::ServiceDescriptor**
-    file_level_service_descriptors_deephaven_2fproto_2fsession_2eproto = nullptr;
-const ::uint32_t TableStruct_deephaven_2fproto_2fsession_2eproto::offsets[] PROTOBUF_SECTION_VARIABLE(
-    protodesc_cold) = {
-    ~0u,  // no _has_bits_
-    PROTOBUF_FIELD_OFFSET(::io::deephaven::proto::backplane::grpc::WrappedAuthenticationRequest, _internal_metadata_),
-    ~0u,  // no _extensions_
-    ~0u,  // no _oneof_case_
-    ~0u,  // no _weak_field_map_
-    ~0u,  // no _inlined_string_donated_
-    ~0u,  // no _split_
-    ~0u,  // no sizeof(Split)
-    PROTOBUF_FIELD_OFFSET(::io::deephaven::proto::backplane::grpc::WrappedAuthenticationRequest, _impl_.type_),
-    PROTOBUF_FIELD_OFFSET(::io::deephaven::proto::backplane::grpc::WrappedAuthenticationRequest, _impl_.payload_),
-    ~0u,  // no _has_bits_
-    PROTOBUF_FIELD_OFFSET(::io::deephaven::proto::backplane::grpc::HandshakeRequest, _internal_metadata_),
-    ~0u,  // no _extensions_
-    ~0u,  // no _oneof_case_
-    ~0u,  // no _weak_field_map_
-    ~0u,  // no _inlined_string_donated_
-    ~0u,  // no _split_
-    ~0u,  // no sizeof(Split)
-    PROTOBUF_FIELD_OFFSET(::io::deephaven::proto::backplane::grpc::HandshakeRequest, _impl_.auth_protocol_),
-    PROTOBUF_FIELD_OFFSET(::io::deephaven::proto::backplane::grpc::HandshakeRequest, _impl_.payload_),
-    ~0u,  // no _has_bits_
-    PROTOBUF_FIELD_OFFSET(::io::deephaven::proto::backplane::grpc::HandshakeResponse, _internal_metadata_),
-    ~0u,  // no _extensions_
-    ~0u,  // no _oneof_case_
-    ~0u,  // no _weak_field_map_
-    ~0u,  // no _inlined_string_donated_
-    ~0u,  // no _split_
-    ~0u,  // no sizeof(Split)
-    PROTOBUF_FIELD_OFFSET(::io::deephaven::proto::backplane::grpc::HandshakeResponse, _impl_.metadata_header_),
-    PROTOBUF_FIELD_OFFSET(::io::deephaven::proto::backplane::grpc::HandshakeResponse, _impl_.session_token_),
-    PROTOBUF_FIELD_OFFSET(::io::deephaven::proto::backplane::grpc::HandshakeResponse, _impl_.token_deadline_time_millis_),
-    PROTOBUF_FIELD_OFFSET(::io::deephaven::proto::backplane::grpc::HandshakeResponse, _impl_.token_expiration_delay_millis_),
-    ~0u,  // no _has_bits_
-    PROTOBUF_FIELD_OFFSET(::io::deephaven::proto::backplane::grpc::CloseSessionResponse, _internal_metadata_),
-    ~0u,  // no _extensions_
-    ~0u,  // no _oneof_case_
-    ~0u,  // no _weak_field_map_
-    ~0u,  // no _inlined_string_donated_
-    ~0u,  // no _split_
-    ~0u,  // no sizeof(Split)
-    PROTOBUF_FIELD_OFFSET(::io::deephaven::proto::backplane::grpc::ReleaseRequest, _impl_._has_bits_),
-    PROTOBUF_FIELD_OFFSET(::io::deephaven::proto::backplane::grpc::ReleaseRequest, _internal_metadata_),
-    ~0u,  // no _extensions_
-    ~0u,  // no _oneof_case_
-    ~0u,  // no _weak_field_map_
-    ~0u,  // no _inlined_string_donated_
-    ~0u,  // no _split_
-    ~0u,  // no sizeof(Split)
-    PROTOBUF_FIELD_OFFSET(::io::deephaven::proto::backplane::grpc::ReleaseRequest, _impl_.id_),
-    0,
-    ~0u,  // no _has_bits_
-    PROTOBUF_FIELD_OFFSET(::io::deephaven::proto::backplane::grpc::ReleaseResponse, _internal_metadata_),
-    ~0u,  // no _extensions_
-    ~0u,  // no _oneof_case_
-    ~0u,  // no _weak_field_map_
-    ~0u,  // no _inlined_string_donated_
-    ~0u,  // no _split_
-    ~0u,  // no sizeof(Split)
-    PROTOBUF_FIELD_OFFSET(::io::deephaven::proto::backplane::grpc::ExportRequest, _impl_._has_bits_),
-    PROTOBUF_FIELD_OFFSET(::io::deephaven::proto::backplane::grpc::ExportRequest, _internal_metadata_),
-    ~0u,  // no _extensions_
-    ~0u,  // no _oneof_case_
-    ~0u,  // no _weak_field_map_
-    ~0u,  // no _inlined_string_donated_
-    ~0u,  // no _split_
-    ~0u,  // no sizeof(Split)
-    PROTOBUF_FIELD_OFFSET(::io::deephaven::proto::backplane::grpc::ExportRequest, _impl_.source_id_),
-    PROTOBUF_FIELD_OFFSET(::io::deephaven::proto::backplane::grpc::ExportRequest, _impl_.result_id_),
-    0,
-    1,
-    ~0u,  // no _has_bits_
-    PROTOBUF_FIELD_OFFSET(::io::deephaven::proto::backplane::grpc::ExportResponse, _internal_metadata_),
-    ~0u,  // no _extensions_
-    ~0u,  // no _oneof_case_
-    ~0u,  // no _weak_field_map_
-    ~0u,  // no _inlined_string_donated_
-    ~0u,  // no _split_
-    ~0u,  // no sizeof(Split)
-    PROTOBUF_FIELD_OFFSET(::io::deephaven::proto::backplane::grpc::PublishRequest, _impl_._has_bits_),
-    PROTOBUF_FIELD_OFFSET(::io::deephaven::proto::backplane::grpc::PublishRequest, _internal_metadata_),
-    ~0u,  // no _extensions_
-    ~0u,  // no _oneof_case_
-    ~0u,  // no _weak_field_map_
-    ~0u,  // no _inlined_string_donated_
-    ~0u,  // no _split_
-    ~0u,  // no sizeof(Split)
-    PROTOBUF_FIELD_OFFSET(::io::deephaven::proto::backplane::grpc::PublishRequest, _impl_.source_id_),
-    PROTOBUF_FIELD_OFFSET(::io::deephaven::proto::backplane::grpc::PublishRequest, _impl_.result_id_),
-    0,
-    1,
-    ~0u,  // no _has_bits_
-    PROTOBUF_FIELD_OFFSET(::io::deephaven::proto::backplane::grpc::PublishResponse, _internal_metadata_),
-    ~0u,  // no _extensions_
-    ~0u,  // no _oneof_case_
-    ~0u,  // no _weak_field_map_
-    ~0u,  // no _inlined_string_donated_
-    ~0u,  // no _split_
-    ~0u,  // no sizeof(Split)
-    ~0u,  // no _has_bits_
-    PROTOBUF_FIELD_OFFSET(::io::deephaven::proto::backplane::grpc::ExportNotificationRequest, _internal_metadata_),
-    ~0u,  // no _extensions_
-    ~0u,  // no _oneof_case_
-    ~0u,  // no _weak_field_map_
-    ~0u,  // no _inlined_string_donated_
-    ~0u,  // no _split_
-    ~0u,  // no sizeof(Split)
-    PROTOBUF_FIELD_OFFSET(::io::deephaven::proto::backplane::grpc::ExportNotification, _impl_._has_bits_),
-    PROTOBUF_FIELD_OFFSET(::io::deephaven::proto::backplane::grpc::ExportNotification, _internal_metadata_),
-    ~0u,  // no _extensions_
-    ~0u,  // no _oneof_case_
-    ~0u,  // no _weak_field_map_
-    ~0u,  // no _inlined_string_donated_
-    ~0u,  // no _split_
-    ~0u,  // no sizeof(Split)
-    PROTOBUF_FIELD_OFFSET(::io::deephaven::proto::backplane::grpc::ExportNotification, _impl_.ticket_),
-    PROTOBUF_FIELD_OFFSET(::io::deephaven::proto::backplane::grpc::ExportNotification, _impl_.export_state_),
-    PROTOBUF_FIELD_OFFSET(::io::deephaven::proto::backplane::grpc::ExportNotification, _impl_.context_),
-    PROTOBUF_FIELD_OFFSET(::io::deephaven::proto::backplane::grpc::ExportNotification, _impl_.dependent_handle_),
-    0,
-    ~0u,
-    ~0u,
-    ~0u,
-    ~0u,  // no _has_bits_
-    PROTOBUF_FIELD_OFFSET(::io::deephaven::proto::backplane::grpc::TerminationNotificationRequest, _internal_metadata_),
-    ~0u,  // no _extensions_
-    ~0u,  // no _oneof_case_
-    ~0u,  // no _weak_field_map_
-    ~0u,  // no _inlined_string_donated_
-    ~0u,  // no _split_
-    ~0u,  // no sizeof(Split)
-    ~0u,  // no _has_bits_
-    PROTOBUF_FIELD_OFFSET(::io::deephaven::proto::backplane::grpc::TerminationNotificationResponse_StackTrace, _internal_metadata_),
-    ~0u,  // no _extensions_
-    ~0u,  // no _oneof_case_
-    ~0u,  // no _weak_field_map_
-    ~0u,  // no _inlined_string_donated_
-    ~0u,  // no _split_
-    ~0u,  // no sizeof(Split)
-    PROTOBUF_FIELD_OFFSET(::io::deephaven::proto::backplane::grpc::TerminationNotificationResponse_StackTrace, _impl_.type_),
-    PROTOBUF_FIELD_OFFSET(::io::deephaven::proto::backplane::grpc::TerminationNotificationResponse_StackTrace, _impl_.message_),
-    PROTOBUF_FIELD_OFFSET(::io::deephaven::proto::backplane::grpc::TerminationNotificationResponse_StackTrace, _impl_.elements_),
-    ~0u,  // no _has_bits_
-    PROTOBUF_FIELD_OFFSET(::io::deephaven::proto::backplane::grpc::TerminationNotificationResponse, _internal_metadata_),
-    ~0u,  // no _extensions_
-    ~0u,  // no _oneof_case_
-    ~0u,  // no _weak_field_map_
-    ~0u,  // no _inlined_string_donated_
-    ~0u,  // no _split_
-    ~0u,  // no sizeof(Split)
-    PROTOBUF_FIELD_OFFSET(::io::deephaven::proto::backplane::grpc::TerminationNotificationResponse, _impl_.abnormal_termination_),
-    PROTOBUF_FIELD_OFFSET(::io::deephaven::proto::backplane::grpc::TerminationNotificationResponse, _impl_.reason_),
-    PROTOBUF_FIELD_OFFSET(::io::deephaven::proto::backplane::grpc::TerminationNotificationResponse, _impl_.is_from_uncaught_exception_),
-    PROTOBUF_FIELD_OFFSET(::io::deephaven::proto::backplane::grpc::TerminationNotificationResponse, _impl_.stack_traces_),
-};
-
-static const ::_pbi::MigrationSchema
-    schemas[] PROTOBUF_SECTION_VARIABLE(protodesc_cold) = {
-        {0, -1, -1, sizeof(::io::deephaven::proto::backplane::grpc::WrappedAuthenticationRequest)},
-        {10, -1, -1, sizeof(::io::deephaven::proto::backplane::grpc::HandshakeRequest)},
-        {20, -1, -1, sizeof(::io::deephaven::proto::backplane::grpc::HandshakeResponse)},
-        {32, -1, -1, sizeof(::io::deephaven::proto::backplane::grpc::CloseSessionResponse)},
-        {40, 49, -1, sizeof(::io::deephaven::proto::backplane::grpc::ReleaseRequest)},
-        {50, -1, -1, sizeof(::io::deephaven::proto::backplane::grpc::ReleaseResponse)},
-        {58, 68, -1, sizeof(::io::deephaven::proto::backplane::grpc::ExportRequest)},
-        {70, -1, -1, sizeof(::io::deephaven::proto::backplane::grpc::ExportResponse)},
-        {78, 88, -1, sizeof(::io::deephaven::proto::backplane::grpc::PublishRequest)},
-        {90, -1, -1, sizeof(::io::deephaven::proto::backplane::grpc::PublishResponse)},
-        {98, -1, -1, sizeof(::io::deephaven::proto::backplane::grpc::ExportNotificationRequest)},
-        {106, 118, -1, sizeof(::io::deephaven::proto::backplane::grpc::ExportNotification)},
-        {122, -1, -1, sizeof(::io::deephaven::proto::backplane::grpc::TerminationNotificationRequest)},
-        {130, -1, -1, sizeof(::io::deephaven::proto::backplane::grpc::TerminationNotificationResponse_StackTrace)},
-        {141, -1, -1, sizeof(::io::deephaven::proto::backplane::grpc::TerminationNotificationResponse)},
-};
-
-static const ::_pb::Message* const file_default_instances[] = {
-    &::io::deephaven::proto::backplane::grpc::_WrappedAuthenticationRequest_default_instance_._instance,
-    &::io::deephaven::proto::backplane::grpc::_HandshakeRequest_default_instance_._instance,
-    &::io::deephaven::proto::backplane::grpc::_HandshakeResponse_default_instance_._instance,
-    &::io::deephaven::proto::backplane::grpc::_CloseSessionResponse_default_instance_._instance,
-    &::io::deephaven::proto::backplane::grpc::_ReleaseRequest_default_instance_._instance,
-    &::io::deephaven::proto::backplane::grpc::_ReleaseResponse_default_instance_._instance,
-    &::io::deephaven::proto::backplane::grpc::_ExportRequest_default_instance_._instance,
-    &::io::deephaven::proto::backplane::grpc::_ExportResponse_default_instance_._instance,
-    &::io::deephaven::proto::backplane::grpc::_PublishRequest_default_instance_._instance,
-    &::io::deephaven::proto::backplane::grpc::_PublishResponse_default_instance_._instance,
-    &::io::deephaven::proto::backplane::grpc::_ExportNotificationRequest_default_instance_._instance,
-    &::io::deephaven::proto::backplane::grpc::_ExportNotification_default_instance_._instance,
-    &::io::deephaven::proto::backplane::grpc::_TerminationNotificationRequest_default_instance_._instance,
-    &::io::deephaven::proto::backplane::grpc::_TerminationNotificationResponse_StackTrace_default_instance_._instance,
-    &::io::deephaven::proto::backplane::grpc::_TerminationNotificationResponse_default_instance_._instance,
-};
-const char descriptor_table_protodef_deephaven_2fproto_2fsession_2eproto[] PROTOBUF_SECTION_VARIABLE(protodesc_cold) = {
-    "\n\035deephaven/proto/session.proto\022!io.deep"
-    "haven.proto.backplane.grpc\032\034deephaven/pr"
-    "oto/ticket.proto\"I\n\034WrappedAuthenticatio"
-    "nRequest\022\014\n\004type\030\004 \001(\t\022\017\n\007payload\030\005 \001(\014J"
-    "\004\010\002\020\003J\004\010\003\020\004\"B\n\020HandshakeRequest\022\031\n\rauth_"
-    "protocol\030\001 \001(\021B\002\030\001\022\023\n\007payload\030\002 \001(\014B\002\030\001\""
-    "\242\001\n\021HandshakeResponse\022\033\n\017metadata_header"
-    "\030\001 \001(\014B\002\030\001\022\031\n\rsession_token\030\002 \001(\014B\002\030\001\022(\n"
-    "\032token_deadline_time_millis\030\003 \001(\022B\004\030\0010\001\022"
-    "+\n\035token_expiration_delay_millis\030\004 \001(\022B\004"
-    "\030\0010\001\"\026\n\024CloseSessionResponse\"G\n\016ReleaseR"
-    "equest\0225\n\002id\030\001 \001(\0132).io.deephaven.proto."
-    "backplane.grpc.Ticket\"\021\n\017ReleaseResponse"
-    "\"\213\001\n\rExportRequest\022<\n\tsource_id\030\001 \001(\0132)."
-    "io.deephaven.proto.backplane.grpc.Ticket"
-    "\022<\n\tresult_id\030\002 \001(\0132).io.deephaven.proto"
-    ".backplane.grpc.Ticket\"\020\n\016ExportResponse"
-    "\"\214\001\n\016PublishRequest\022<\n\tsource_id\030\001 \001(\0132)"
-    ".io.deephaven.proto.backplane.grpc.Ticke"
-    "t\022<\n\tresult_id\030\002 \001(\0132).io.deephaven.prot"
-    "o.backplane.grpc.Ticket\"\021\n\017PublishRespon"
-    "se\"\033\n\031ExportNotificationRequest\"\267\003\n\022Expo"
-    "rtNotification\0229\n\006ticket\030\001 \001(\0132).io.deep"
-    "haven.proto.backplane.grpc.Ticket\022Q\n\014exp"
-    "ort_state\030\002 \001(\0162;.io.deephaven.proto.bac"
-    "kplane.grpc.ExportNotification.State\022\017\n\007"
-    "context\030\003 \001(\t\022\030\n\020dependent_handle\030\004 \001(\t\""
-    "\347\001\n\005State\022\013\n\007UNKNOWN\020\000\022\013\n\007PENDING\020\001\022\016\n\nP"
-    "UBLISHING\020\002\022\n\n\006QUEUED\020\003\022\013\n\007RUNNING\020\004\022\014\n\010"
-    "EXPORTED\020\005\022\014\n\010RELEASED\020\006\022\r\n\tCANCELLED\020\007\022"
-    "\n\n\006FAILED\020\010\022\025\n\021DEPENDENCY_FAILED\020\t\022\032\n\026DE"
-    "PENDENCY_NEVER_FOUND\020\n\022\030\n\024DEPENDENCY_CAN"
-    "CELLED\020\013\022\027\n\023DEPENDENCY_RELEASED\020\014\" \n\036Ter"
-    "minationNotificationRequest\"\227\002\n\037Terminat"
-    "ionNotificationResponse\022\034\n\024abnormal_term"
-    "ination\030\001 \001(\010\022\016\n\006reason\030\002 \001(\t\022\"\n\032is_from"
-    "_uncaught_exception\030\003 \001(\010\022c\n\014stack_trace"
-    "s\030\004 \003(\0132M.io.deephaven.proto.backplane.g"
-    "rpc.TerminationNotificationResponse.Stac"
-    "kTrace\032=\n\nStackTrace\022\014\n\004type\030\001 \001(\t\022\017\n\007me"
-    "ssage\030\002 \001(\t\022\020\n\010elements\030\003 \003(\t2\271\010\n\016Sessio"
-    "nService\022|\n\nNewSession\0223.io.deephaven.pr"
-    "oto.backplane.grpc.HandshakeRequest\0324.io"
-    ".deephaven.proto.backplane.grpc.Handshak"
-    "eResponse\"\003\210\002\001\022\205\001\n\023RefreshSessionToken\0223"
-    ".io.deephaven.proto.backplane.grpc.Hands"
-    "hakeRequest\0324.io.deephaven.proto.backpla"
-    "ne.grpc.HandshakeResponse\"\003\210\002\001\022~\n\014CloseS"
-    "ession\0223.io.deephaven.proto.backplane.gr"
-    "pc.HandshakeRequest\0327.io.deephaven.proto"
-    ".backplane.grpc.CloseSessionResponse\"\000\022r"
-    "\n\007Release\0221.io.deephaven.proto.backplane"
-    ".grpc.ReleaseRequest\0322.io.deephaven.prot"
-    "o.backplane.grpc.ReleaseResponse\"\000\022y\n\020Ex"
-    "portFromTicket\0220.io.deephaven.proto.back"
-    "plane.grpc.ExportRequest\0321.io.deephaven."
-    "proto.backplane.grpc.ExportResponse\"\000\022|\n"
-    "\021PublishFromTicket\0221.io.deephaven.proto."
-    "backplane.grpc.PublishRequest\0322.io.deeph"
-    "aven.proto.backplane.grpc.PublishRespons"
-    "e\"\000\022\216\001\n\023ExportNotifications\022<.io.deephav"
-    "en.proto.backplane.grpc.ExportNotificati"
-    "onRequest\0325.io.deephaven.proto.backplane"
-    ".grpc.ExportNotification\"\0000\001\022\242\001\n\027Termina"
-    "tionNotification\022A.io.deephaven.proto.ba"
-    "ckplane.grpc.TerminationNotificationRequ"
-    "est\032B.io.deephaven.proto.backplane.grpc."
-    "TerminationNotificationResponse\"\000BCH\001P\001Z"
-    "=github.com/deephaven/deephaven-core/go/"
-    "internal/proto/sessionb\006proto3"
-};
-static const ::_pbi::DescriptorTable* const descriptor_table_deephaven_2fproto_2fsession_2eproto_deps[1] =
-    {
-        &::descriptor_table_deephaven_2fproto_2fticket_2eproto,
-};
-static ::absl::once_flag descriptor_table_deephaven_2fproto_2fsession_2eproto_once;
-const ::_pbi::DescriptorTable descriptor_table_deephaven_2fproto_2fsession_2eproto = {
-    false,
-    false,
-    2790,
-    descriptor_table_protodef_deephaven_2fproto_2fsession_2eproto,
-    "deephaven/proto/session.proto",
-    &descriptor_table_deephaven_2fproto_2fsession_2eproto_once,
-    descriptor_table_deephaven_2fproto_2fsession_2eproto_deps,
-    1,
-    15,
-    schemas,
-    file_default_instances,
-    TableStruct_deephaven_2fproto_2fsession_2eproto::offsets,
-    file_level_metadata_deephaven_2fproto_2fsession_2eproto,
-    file_level_enum_descriptors_deephaven_2fproto_2fsession_2eproto,
-    file_level_service_descriptors_deephaven_2fproto_2fsession_2eproto,
-};
-
-// This function exists to be marked as weak.
-// It can significantly speed up compilation by breaking up LLVM's SCC
-// in the .pb.cc translation units. Large translation units see a
-// reduction of more than 35% of walltime for optimized builds. Without
-// the weak attribute all the messages in the file, including all the
-// vtables and everything they use become part of the same SCC through
-// a cycle like:
-// GetMetadata -> descriptor table -> default instances ->
-//   vtables -> GetMetadata
-// By adding a weak function here we break the connection from the
-// individual vtables back into the descriptor table.
-PROTOBUF_ATTRIBUTE_WEAK const ::_pbi::DescriptorTable* descriptor_table_deephaven_2fproto_2fsession_2eproto_getter() {
-  return &descriptor_table_deephaven_2fproto_2fsession_2eproto;
-}
-// Force running AddDescriptors() at dynamic initialization time.
-PROTOBUF_ATTRIBUTE_INIT_PRIORITY2
-static ::_pbi::AddDescriptorsRunner dynamic_init_dummy_deephaven_2fproto_2fsession_2eproto(&descriptor_table_deephaven_2fproto_2fsession_2eproto);
-namespace io {
-namespace deephaven {
-namespace proto {
-namespace backplane {
-namespace grpc {
-const ::google::protobuf::EnumDescriptor* ExportNotification_State_descriptor() {
-  ::google::protobuf::internal::AssignDescriptors(&descriptor_table_deephaven_2fproto_2fsession_2eproto);
-  return file_level_enum_descriptors_deephaven_2fproto_2fsession_2eproto[0];
-}
-PROTOBUF_CONSTINIT const uint32_t ExportNotification_State_internal_data_[] = {
-    851968u, 0u, };
-bool ExportNotification_State_IsValid(int value) {
-  return 0 <= value && value <= 12;
-}
-#if (__cplusplus < 201703) && \
-  (!defined(_MSC_VER) || (_MSC_VER >= 1900 && _MSC_VER < 1912))
-
-constexpr ExportNotification_State ExportNotification::UNKNOWN;
-constexpr ExportNotification_State ExportNotification::PENDING;
-constexpr ExportNotification_State ExportNotification::PUBLISHING;
-constexpr ExportNotification_State ExportNotification::QUEUED;
-constexpr ExportNotification_State ExportNotification::RUNNING;
-constexpr ExportNotification_State ExportNotification::EXPORTED;
-constexpr ExportNotification_State ExportNotification::RELEASED;
-constexpr ExportNotification_State ExportNotification::CANCELLED;
-constexpr ExportNotification_State ExportNotification::FAILED;
-constexpr ExportNotification_State ExportNotification::DEPENDENCY_FAILED;
-constexpr ExportNotification_State ExportNotification::DEPENDENCY_NEVER_FOUND;
-constexpr ExportNotification_State ExportNotification::DEPENDENCY_CANCELLED;
-constexpr ExportNotification_State ExportNotification::DEPENDENCY_RELEASED;
-constexpr ExportNotification_State ExportNotification::State_MIN;
-constexpr ExportNotification_State ExportNotification::State_MAX;
-constexpr int ExportNotification::State_ARRAYSIZE;
-
-#endif  // (__cplusplus < 201703) &&
-        // (!defined(_MSC_VER) || (_MSC_VER >= 1900 && _MSC_VER < 1912))
-// ===================================================================
-
-class WrappedAuthenticationRequest::_Internal {
- public:
-};
-
-WrappedAuthenticationRequest::WrappedAuthenticationRequest(::google::protobuf::Arena* arena)
-    : ::google::protobuf::Message(arena) {
-  SharedCtor(arena);
-  // @@protoc_insertion_point(arena_constructor:io.deephaven.proto.backplane.grpc.WrappedAuthenticationRequest)
-}
-inline PROTOBUF_NDEBUG_INLINE WrappedAuthenticationRequest::Impl_::Impl_(
-    ::google::protobuf::internal::InternalVisibility visibility, ::google::protobuf::Arena* arena,
-    const Impl_& from)
-      : type_(arena, from.type_),
-        payload_(arena, from.payload_),
-        _cached_size_{0} {}
-
-WrappedAuthenticationRequest::WrappedAuthenticationRequest(
-    ::google::protobuf::Arena* arena,
-    const WrappedAuthenticationRequest& from)
-    : ::google::protobuf::Message(arena) {
-  WrappedAuthenticationRequest* const _this = this;
-  (void)_this;
-  _internal_metadata_.MergeFrom<::google::protobuf::UnknownFieldSet>(
-      from._internal_metadata_);
-  new (&_impl_) Impl_(internal_visibility(), arena, from._impl_);
-
-  // @@protoc_insertion_point(copy_constructor:io.deephaven.proto.backplane.grpc.WrappedAuthenticationRequest)
-}
-inline PROTOBUF_NDEBUG_INLINE WrappedAuthenticationRequest::Impl_::Impl_(
-    ::google::protobuf::internal::InternalVisibility visibility,
-    ::google::protobuf::Arena* arena)
-      : type_(arena),
-        payload_(arena),
-        _cached_size_{0} {}
-
-inline void WrappedAuthenticationRequest::SharedCtor(::_pb::Arena* arena) {
-  new (&_impl_) Impl_(internal_visibility(), arena);
-}
-WrappedAuthenticationRequest::~WrappedAuthenticationRequest() {
-  // @@protoc_insertion_point(destructor:io.deephaven.proto.backplane.grpc.WrappedAuthenticationRequest)
-  _internal_metadata_.Delete<::google::protobuf::UnknownFieldSet>();
-  SharedDtor();
-}
-inline void WrappedAuthenticationRequest::SharedDtor() {
-  ABSL_DCHECK(GetArena() == nullptr);
-  _impl_.type_.Destroy();
-  _impl_.payload_.Destroy();
-  _impl_.~Impl_();
-}
-
-PROTOBUF_NOINLINE void WrappedAuthenticationRequest::Clear() {
-// @@protoc_insertion_point(message_clear_start:io.deephaven.proto.backplane.grpc.WrappedAuthenticationRequest)
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  ::uint32_t cached_has_bits = 0;
-  // Prevent compiler warnings about cached_has_bits being unused
-  (void) cached_has_bits;
-
-  _impl_.type_.ClearToEmpty();
-  _impl_.payload_.ClearToEmpty();
-  _internal_metadata_.Clear<::google::protobuf::UnknownFieldSet>();
-}
-
-const char* WrappedAuthenticationRequest::_InternalParse(
-    const char* ptr, ::_pbi::ParseContext* ctx) {
-  ptr = ::_pbi::TcParser::ParseLoop(this, ptr, ctx, &_table_.header);
-  return ptr;
-}
-
-
-PROTOBUF_CONSTINIT PROTOBUF_ATTRIBUTE_INIT_PRIORITY1
-const ::_pbi::TcParseTable<1, 2, 0, 75, 2> WrappedAuthenticationRequest::_table_ = {
-  {
-    0,  // no _has_bits_
-    0, // no _extensions_
-    5, 8,  // max_field_number, fast_idx_mask
-    offsetof(decltype(_table_), field_lookup_table),
-    4294967271,  // skipmap
-    offsetof(decltype(_table_), field_entries),
-    2,  // num_field_entries
-    0,  // num_aux_entries
-    offsetof(decltype(_table_), field_names),  // no aux_entries
-    &_WrappedAuthenticationRequest_default_instance_._instance,
-    ::_pbi::TcParser::GenericFallback,  // fallback
-  }, {{
-    // string type = 4;
-    {::_pbi::TcParser::FastUS1,
-     {34, 63, 0, PROTOBUF_FIELD_OFFSET(WrappedAuthenticationRequest, _impl_.type_)}},
-    // bytes payload = 5;
-    {::_pbi::TcParser::FastBS1,
-     {42, 63, 0, PROTOBUF_FIELD_OFFSET(WrappedAuthenticationRequest, _impl_.payload_)}},
-  }}, {{
-    65535, 65535
-  }}, {{
-    // string type = 4;
-    {PROTOBUF_FIELD_OFFSET(WrappedAuthenticationRequest, _impl_.type_), 0, 0,
-    (0 | ::_fl::kFcSingular | ::_fl::kUtf8String | ::_fl::kRepAString)},
-    // bytes payload = 5;
-    {PROTOBUF_FIELD_OFFSET(WrappedAuthenticationRequest, _impl_.payload_), 0, 0,
-    (0 | ::_fl::kFcSingular | ::_fl::kBytes | ::_fl::kRepAString)},
-  }},
-  // no aux_entries
-  {{
-    "\76\4\0\0\0\0\0\0"
-    "io.deephaven.proto.backplane.grpc.WrappedAuthenticationRequest"
-    "type"
-  }},
-};
-
-::uint8_t* WrappedAuthenticationRequest::_InternalSerialize(
-    ::uint8_t* target,
-    ::google::protobuf::io::EpsCopyOutputStream* stream) const {
-  // @@protoc_insertion_point(serialize_to_array_start:io.deephaven.proto.backplane.grpc.WrappedAuthenticationRequest)
-  ::uint32_t cached_has_bits = 0;
-  (void)cached_has_bits;
-
-  // string type = 4;
-  if (!this->_internal_type().empty()) {
-    const std::string& _s = this->_internal_type();
-    ::google::protobuf::internal::WireFormatLite::VerifyUtf8String(
-        _s.data(), static_cast<int>(_s.length()), ::google::protobuf::internal::WireFormatLite::SERIALIZE, "io.deephaven.proto.backplane.grpc.WrappedAuthenticationRequest.type");
-    target = stream->WriteStringMaybeAliased(4, _s, target);
-  }
-
-  // bytes payload = 5;
-  if (!this->_internal_payload().empty()) {
-    const std::string& _s = this->_internal_payload();
-    target = stream->WriteBytesMaybeAliased(5, _s, target);
-  }
-
-  if (PROTOBUF_PREDICT_FALSE(_internal_metadata_.have_unknown_fields())) {
-    target =
-        ::_pbi::WireFormat::InternalSerializeUnknownFieldsToArray(
-            _internal_metadata_.unknown_fields<::google::protobuf::UnknownFieldSet>(::google::protobuf::UnknownFieldSet::default_instance), target, stream);
-  }
-  // @@protoc_insertion_point(serialize_to_array_end:io.deephaven.proto.backplane.grpc.WrappedAuthenticationRequest)
-  return target;
-}
-
-::size_t WrappedAuthenticationRequest::ByteSizeLong() const {
-// @@protoc_insertion_point(message_byte_size_start:io.deephaven.proto.backplane.grpc.WrappedAuthenticationRequest)
-  ::size_t total_size = 0;
-
-  ::uint32_t cached_has_bits = 0;
-  // Prevent compiler warnings about cached_has_bits being unused
-  (void) cached_has_bits;
-
-  // string type = 4;
-  if (!this->_internal_type().empty()) {
-    total_size += 1 + ::google::protobuf::internal::WireFormatLite::StringSize(
-                                    this->_internal_type());
-  }
-
-  // bytes payload = 5;
-  if (!this->_internal_payload().empty()) {
-    total_size += 1 + ::google::protobuf::internal::WireFormatLite::BytesSize(
-                                    this->_internal_payload());
-  }
-
-  return MaybeComputeUnknownFieldsSize(total_size, &_impl_._cached_size_);
-}
-
-const ::google::protobuf::Message::ClassData WrappedAuthenticationRequest::_class_data_ = {
-    WrappedAuthenticationRequest::MergeImpl,
-    nullptr,  // OnDemandRegisterArenaDtor
-};
-const ::google::protobuf::Message::ClassData* WrappedAuthenticationRequest::GetClassData() const {
-  return &_class_data_;
-}
-
-void WrappedAuthenticationRequest::MergeImpl(::google::protobuf::Message& to_msg, const ::google::protobuf::Message& from_msg) {
-  auto* const _this = static_cast<WrappedAuthenticationRequest*>(&to_msg);
-  auto& from = static_cast<const WrappedAuthenticationRequest&>(from_msg);
-  // @@protoc_insertion_point(class_specific_merge_from_start:io.deephaven.proto.backplane.grpc.WrappedAuthenticationRequest)
-  ABSL_DCHECK_NE(&from, _this);
-  ::uint32_t cached_has_bits = 0;
-  (void) cached_has_bits;
-
-  if (!from._internal_type().empty()) {
-    _this->_internal_set_type(from._internal_type());
-  }
-  if (!from._internal_payload().empty()) {
-    _this->_internal_set_payload(from._internal_payload());
-  }
-  _this->_internal_metadata_.MergeFrom<::google::protobuf::UnknownFieldSet>(from._internal_metadata_);
-}
-
-void WrappedAuthenticationRequest::CopyFrom(const WrappedAuthenticationRequest& from) {
-// @@protoc_insertion_point(class_specific_copy_from_start:io.deephaven.proto.backplane.grpc.WrappedAuthenticationRequest)
-  if (&from == this) return;
-  Clear();
-  MergeFrom(from);
-}
-
-PROTOBUF_NOINLINE bool WrappedAuthenticationRequest::IsInitialized() const {
-  return true;
-}
-
-::_pbi::CachedSize* WrappedAuthenticationRequest::AccessCachedSize() const {
-  return &_impl_._cached_size_;
-}
-void WrappedAuthenticationRequest::InternalSwap(WrappedAuthenticationRequest* PROTOBUF_RESTRICT other) {
-  using std::swap;
-  auto* arena = GetArena();
-  ABSL_DCHECK_EQ(arena, other->GetArena());
-  _internal_metadata_.InternalSwap(&other->_internal_metadata_);
-  ::_pbi::ArenaStringPtr::InternalSwap(&_impl_.type_, &other->_impl_.type_, arena);
-  ::_pbi::ArenaStringPtr::InternalSwap(&_impl_.payload_, &other->_impl_.payload_, arena);
-}
-
-::google::protobuf::Metadata WrappedAuthenticationRequest::GetMetadata() const {
-  return ::_pbi::AssignDescriptors(
-      &descriptor_table_deephaven_2fproto_2fsession_2eproto_getter, &descriptor_table_deephaven_2fproto_2fsession_2eproto_once,
-      file_level_metadata_deephaven_2fproto_2fsession_2eproto[0]);
-}
-// ===================================================================
-
-class HandshakeRequest::_Internal {
- public:
-};
-
-HandshakeRequest::HandshakeRequest(::google::protobuf::Arena* arena)
-    : ::google::protobuf::Message(arena) {
-  SharedCtor(arena);
-  // @@protoc_insertion_point(arena_constructor:io.deephaven.proto.backplane.grpc.HandshakeRequest)
-}
-inline PROTOBUF_NDEBUG_INLINE HandshakeRequest::Impl_::Impl_(
-    ::google::protobuf::internal::InternalVisibility visibility, ::google::protobuf::Arena* arena,
-    const Impl_& from)
-      : payload_(arena, from.payload_),
-        _cached_size_{0} {}
-
-HandshakeRequest::HandshakeRequest(
-    ::google::protobuf::Arena* arena,
-    const HandshakeRequest& from)
-    : ::google::protobuf::Message(arena) {
-  HandshakeRequest* const _this = this;
-  (void)_this;
-  _internal_metadata_.MergeFrom<::google::protobuf::UnknownFieldSet>(
-      from._internal_metadata_);
-  new (&_impl_) Impl_(internal_visibility(), arena, from._impl_);
-  _impl_.auth_protocol_ = from._impl_.auth_protocol_;
-
-  // @@protoc_insertion_point(copy_constructor:io.deephaven.proto.backplane.grpc.HandshakeRequest)
-}
-inline PROTOBUF_NDEBUG_INLINE HandshakeRequest::Impl_::Impl_(
-    ::google::protobuf::internal::InternalVisibility visibility,
-    ::google::protobuf::Arena* arena)
-      : payload_(arena),
-        _cached_size_{0} {}
-
-inline void HandshakeRequest::SharedCtor(::_pb::Arena* arena) {
-  new (&_impl_) Impl_(internal_visibility(), arena);
-  _impl_.auth_protocol_ = {};
-}
-HandshakeRequest::~HandshakeRequest() {
-  // @@protoc_insertion_point(destructor:io.deephaven.proto.backplane.grpc.HandshakeRequest)
-  _internal_metadata_.Delete<::google::protobuf::UnknownFieldSet>();
-  SharedDtor();
-}
-inline void HandshakeRequest::SharedDtor() {
-  ABSL_DCHECK(GetArena() == nullptr);
-  _impl_.payload_.Destroy();
-  _impl_.~Impl_();
-}
-
-PROTOBUF_NOINLINE void HandshakeRequest::Clear() {
-// @@protoc_insertion_point(message_clear_start:io.deephaven.proto.backplane.grpc.HandshakeRequest)
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  ::uint32_t cached_has_bits = 0;
-  // Prevent compiler warnings about cached_has_bits being unused
-  (void) cached_has_bits;
-
-  _impl_.payload_.ClearToEmpty();
-  _impl_.auth_protocol_ = 0;
-  _internal_metadata_.Clear<::google::protobuf::UnknownFieldSet>();
-}
-
-const char* HandshakeRequest::_InternalParse(
-    const char* ptr, ::_pbi::ParseContext* ctx) {
-  ptr = ::_pbi::TcParser::ParseLoop(this, ptr, ctx, &_table_.header);
-  return ptr;
-}
-
-
-PROTOBUF_CONSTINIT PROTOBUF_ATTRIBUTE_INIT_PRIORITY1
-const ::_pbi::TcParseTable<1, 2, 0, 0, 2> HandshakeRequest::_table_ = {
-  {
-    0,  // no _has_bits_
-    0, // no _extensions_
-    2, 8,  // max_field_number, fast_idx_mask
-    offsetof(decltype(_table_), field_lookup_table),
-    4294967292,  // skipmap
-    offsetof(decltype(_table_), field_entries),
-    2,  // num_field_entries
-    0,  // num_aux_entries
-    offsetof(decltype(_table_), field_names),  // no aux_entries
-    &_HandshakeRequest_default_instance_._instance,
-    ::_pbi::TcParser::GenericFallback,  // fallback
-  }, {{
-    // bytes payload = 2 [deprecated = true];
-    {::_pbi::TcParser::FastBS1,
-     {18, 63, 0, PROTOBUF_FIELD_OFFSET(HandshakeRequest, _impl_.payload_)}},
-    // sint32 auth_protocol = 1 [deprecated = true];
-    {::_pbi::TcParser::FastZ32S1,
-     {8, 63, 0, PROTOBUF_FIELD_OFFSET(HandshakeRequest, _impl_.auth_protocol_)}},
-  }}, {{
-    65535, 65535
-  }}, {{
-    // sint32 auth_protocol = 1 [deprecated = true];
-    {PROTOBUF_FIELD_OFFSET(HandshakeRequest, _impl_.auth_protocol_), 0, 0,
-    (0 | ::_fl::kFcSingular | ::_fl::kSInt32)},
-    // bytes payload = 2 [deprecated = true];
-    {PROTOBUF_FIELD_OFFSET(HandshakeRequest, _impl_.payload_), 0, 0,
-    (0 | ::_fl::kFcSingular | ::_fl::kBytes | ::_fl::kRepAString)},
-  }},
-  // no aux_entries
-  {{
-  }},
-};
-
-::uint8_t* HandshakeRequest::_InternalSerialize(
-    ::uint8_t* target,
-    ::google::protobuf::io::EpsCopyOutputStream* stream) const {
-  // @@protoc_insertion_point(serialize_to_array_start:io.deephaven.proto.backplane.grpc.HandshakeRequest)
-  ::uint32_t cached_has_bits = 0;
-  (void)cached_has_bits;
-
-  // sint32 auth_protocol = 1 [deprecated = true];
-  if (this->_internal_auth_protocol() != 0) {
-    target = stream->EnsureSpace(target);
-    target = ::_pbi::WireFormatLite::WriteSInt32ToArray(
-        1, this->_internal_auth_protocol(), target);
-  }
-
-  // bytes payload = 2 [deprecated = true];
-  if (!this->_internal_payload().empty()) {
-    const std::string& _s = this->_internal_payload();
-    target = stream->WriteBytesMaybeAliased(2, _s, target);
-  }
-
-  if (PROTOBUF_PREDICT_FALSE(_internal_metadata_.have_unknown_fields())) {
-    target =
-        ::_pbi::WireFormat::InternalSerializeUnknownFieldsToArray(
-            _internal_metadata_.unknown_fields<::google::protobuf::UnknownFieldSet>(::google::protobuf::UnknownFieldSet::default_instance), target, stream);
-  }
-  // @@protoc_insertion_point(serialize_to_array_end:io.deephaven.proto.backplane.grpc.HandshakeRequest)
-  return target;
-}
-
-::size_t HandshakeRequest::ByteSizeLong() const {
-// @@protoc_insertion_point(message_byte_size_start:io.deephaven.proto.backplane.grpc.HandshakeRequest)
-  ::size_t total_size = 0;
-
-  ::uint32_t cached_has_bits = 0;
-  // Prevent compiler warnings about cached_has_bits being unused
-  (void) cached_has_bits;
-
-  // bytes payload = 2 [deprecated = true];
-  if (!this->_internal_payload().empty()) {
-    total_size += 1 + ::google::protobuf::internal::WireFormatLite::BytesSize(
-                                    this->_internal_payload());
-  }
-
-  // sint32 auth_protocol = 1 [deprecated = true];
-  if (this->_internal_auth_protocol() != 0) {
-    total_size += ::_pbi::WireFormatLite::SInt32SizePlusOne(
-        this->_internal_auth_protocol());
-  }
-
-  return MaybeComputeUnknownFieldsSize(total_size, &_impl_._cached_size_);
-}
-
-const ::google::protobuf::Message::ClassData HandshakeRequest::_class_data_ = {
-    HandshakeRequest::MergeImpl,
-    nullptr,  // OnDemandRegisterArenaDtor
-};
-const ::google::protobuf::Message::ClassData* HandshakeRequest::GetClassData() const {
-  return &_class_data_;
-}
-
-void HandshakeRequest::MergeImpl(::google::protobuf::Message& to_msg, const ::google::protobuf::Message& from_msg) {
-  auto* const _this = static_cast<HandshakeRequest*>(&to_msg);
-  auto& from = static_cast<const HandshakeRequest&>(from_msg);
-  // @@protoc_insertion_point(class_specific_merge_from_start:io.deephaven.proto.backplane.grpc.HandshakeRequest)
-  ABSL_DCHECK_NE(&from, _this);
-  ::uint32_t cached_has_bits = 0;
-  (void) cached_has_bits;
-
-  if (!from._internal_payload().empty()) {
-    _this->_internal_set_payload(from._internal_payload());
-  }
-  if (from._internal_auth_protocol() != 0) {
-    _this->_internal_set_auth_protocol(from._internal_auth_protocol());
-  }
-  _this->_internal_metadata_.MergeFrom<::google::protobuf::UnknownFieldSet>(from._internal_metadata_);
-}
-
-void HandshakeRequest::CopyFrom(const HandshakeRequest& from) {
-// @@protoc_insertion_point(class_specific_copy_from_start:io.deephaven.proto.backplane.grpc.HandshakeRequest)
-  if (&from == this) return;
-  Clear();
-  MergeFrom(from);
-}
-
-PROTOBUF_NOINLINE bool HandshakeRequest::IsInitialized() const {
-  return true;
-}
-
-::_pbi::CachedSize* HandshakeRequest::AccessCachedSize() const {
-  return &_impl_._cached_size_;
-}
-void HandshakeRequest::InternalSwap(HandshakeRequest* PROTOBUF_RESTRICT other) {
-  using std::swap;
-  auto* arena = GetArena();
-  ABSL_DCHECK_EQ(arena, other->GetArena());
-  _internal_metadata_.InternalSwap(&other->_internal_metadata_);
-  ::_pbi::ArenaStringPtr::InternalSwap(&_impl_.payload_, &other->_impl_.payload_, arena);
-        swap(_impl_.auth_protocol_, other->_impl_.auth_protocol_);
-}
-
-::google::protobuf::Metadata HandshakeRequest::GetMetadata() const {
-  return ::_pbi::AssignDescriptors(
-      &descriptor_table_deephaven_2fproto_2fsession_2eproto_getter, &descriptor_table_deephaven_2fproto_2fsession_2eproto_once,
-      file_level_metadata_deephaven_2fproto_2fsession_2eproto[1]);
-}
-// ===================================================================
-
-class HandshakeResponse::_Internal {
- public:
-};
-
-HandshakeResponse::HandshakeResponse(::google::protobuf::Arena* arena)
-    : ::google::protobuf::Message(arena) {
-  SharedCtor(arena);
-  // @@protoc_insertion_point(arena_constructor:io.deephaven.proto.backplane.grpc.HandshakeResponse)
-}
-inline PROTOBUF_NDEBUG_INLINE HandshakeResponse::Impl_::Impl_(
-    ::google::protobuf::internal::InternalVisibility visibility, ::google::protobuf::Arena* arena,
-    const Impl_& from)
-      : metadata_header_(arena, from.metadata_header_),
-        session_token_(arena, from.session_token_),
-        _cached_size_{0} {}
-
-HandshakeResponse::HandshakeResponse(
-    ::google::protobuf::Arena* arena,
-    const HandshakeResponse& from)
-    : ::google::protobuf::Message(arena) {
-  HandshakeResponse* const _this = this;
-  (void)_this;
-  _internal_metadata_.MergeFrom<::google::protobuf::UnknownFieldSet>(
-      from._internal_metadata_);
-  new (&_impl_) Impl_(internal_visibility(), arena, from._impl_);
-  ::memcpy(reinterpret_cast<char *>(&_impl_) +
-               offsetof(Impl_, token_deadline_time_millis_),
-           reinterpret_cast<const char *>(&from._impl_) +
-               offsetof(Impl_, token_deadline_time_millis_),
-           offsetof(Impl_, token_expiration_delay_millis_) -
-               offsetof(Impl_, token_deadline_time_millis_) +
-               sizeof(Impl_::token_expiration_delay_millis_));
-
-  // @@protoc_insertion_point(copy_constructor:io.deephaven.proto.backplane.grpc.HandshakeResponse)
-}
-inline PROTOBUF_NDEBUG_INLINE HandshakeResponse::Impl_::Impl_(
-    ::google::protobuf::internal::InternalVisibility visibility,
-    ::google::protobuf::Arena* arena)
-      : metadata_header_(arena),
-        session_token_(arena),
-        _cached_size_{0} {}
-
-inline void HandshakeResponse::SharedCtor(::_pb::Arena* arena) {
-  new (&_impl_) Impl_(internal_visibility(), arena);
-  ::memset(reinterpret_cast<char *>(&_impl_) +
-               offsetof(Impl_, token_deadline_time_millis_),
-           0,
-           offsetof(Impl_, token_expiration_delay_millis_) -
-               offsetof(Impl_, token_deadline_time_millis_) +
-               sizeof(Impl_::token_expiration_delay_millis_));
-}
-HandshakeResponse::~HandshakeResponse() {
-  // @@protoc_insertion_point(destructor:io.deephaven.proto.backplane.grpc.HandshakeResponse)
-  _internal_metadata_.Delete<::google::protobuf::UnknownFieldSet>();
-  SharedDtor();
-}
-inline void HandshakeResponse::SharedDtor() {
-  ABSL_DCHECK(GetArena() == nullptr);
-  _impl_.metadata_header_.Destroy();
-  _impl_.session_token_.Destroy();
-  _impl_.~Impl_();
-}
-
-PROTOBUF_NOINLINE void HandshakeResponse::Clear() {
-// @@protoc_insertion_point(message_clear_start:io.deephaven.proto.backplane.grpc.HandshakeResponse)
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  ::uint32_t cached_has_bits = 0;
-  // Prevent compiler warnings about cached_has_bits being unused
-  (void) cached_has_bits;
-
-  _impl_.metadata_header_.ClearToEmpty();
-  _impl_.session_token_.ClearToEmpty();
-  ::memset(&_impl_.token_deadline_time_millis_, 0, static_cast<::size_t>(
-      reinterpret_cast<char*>(&_impl_.token_expiration_delay_millis_) -
-      reinterpret_cast<char*>(&_impl_.token_deadline_time_millis_)) + sizeof(_impl_.token_expiration_delay_millis_));
-  _internal_metadata_.Clear<::google::protobuf::UnknownFieldSet>();
-}
-
-const char* HandshakeResponse::_InternalParse(
-    const char* ptr, ::_pbi::ParseContext* ctx) {
-  ptr = ::_pbi::TcParser::ParseLoop(this, ptr, ctx, &_table_.header);
-  return ptr;
-}
-
-
-PROTOBUF_CONSTINIT PROTOBUF_ATTRIBUTE_INIT_PRIORITY1
-const ::_pbi::TcParseTable<2, 4, 0, 0, 2> HandshakeResponse::_table_ = {
-  {
-    0,  // no _has_bits_
-    0, // no _extensions_
-    4, 24,  // max_field_number, fast_idx_mask
-    offsetof(decltype(_table_), field_lookup_table),
-    4294967280,  // skipmap
-    offsetof(decltype(_table_), field_entries),
-    4,  // num_field_entries
-    0,  // num_aux_entries
-    offsetof(decltype(_table_), field_names),  // no aux_entries
-    &_HandshakeResponse_default_instance_._instance,
-    ::_pbi::TcParser::GenericFallback,  // fallback
-  }, {{
-    // sint64 token_expiration_delay_millis = 4 [deprecated = true, jstype = JS_STRING];
-    {::_pbi::TcParser::FastZ64S1,
-     {32, 63, 0, PROTOBUF_FIELD_OFFSET(HandshakeResponse, _impl_.token_expiration_delay_millis_)}},
-    // bytes metadata_header = 1 [deprecated = true];
-    {::_pbi::TcParser::FastBS1,
-     {10, 63, 0, PROTOBUF_FIELD_OFFSET(HandshakeResponse, _impl_.metadata_header_)}},
-    // bytes session_token = 2 [deprecated = true];
-    {::_pbi::TcParser::FastBS1,
-     {18, 63, 0, PROTOBUF_FIELD_OFFSET(HandshakeResponse, _impl_.session_token_)}},
-    // sint64 token_deadline_time_millis = 3 [deprecated = true, jstype = JS_STRING];
-    {::_pbi::TcParser::FastZ64S1,
-     {24, 63, 0, PROTOBUF_FIELD_OFFSET(HandshakeResponse, _impl_.token_deadline_time_millis_)}},
-  }}, {{
-    65535, 65535
-  }}, {{
-    // bytes metadata_header = 1 [deprecated = true];
-    {PROTOBUF_FIELD_OFFSET(HandshakeResponse, _impl_.metadata_header_), 0, 0,
-    (0 | ::_fl::kFcSingular | ::_fl::kBytes | ::_fl::kRepAString)},
-    // bytes session_token = 2 [deprecated = true];
-    {PROTOBUF_FIELD_OFFSET(HandshakeResponse, _impl_.session_token_), 0, 0,
-    (0 | ::_fl::kFcSingular | ::_fl::kBytes | ::_fl::kRepAString)},
-    // sint64 token_deadline_time_millis = 3 [deprecated = true, jstype = JS_STRING];
-    {PROTOBUF_FIELD_OFFSET(HandshakeResponse, _impl_.token_deadline_time_millis_), 0, 0,
-    (0 | ::_fl::kFcSingular | ::_fl::kSInt64)},
-    // sint64 token_expiration_delay_millis = 4 [deprecated = true, jstype = JS_STRING];
-    {PROTOBUF_FIELD_OFFSET(HandshakeResponse, _impl_.token_expiration_delay_millis_), 0, 0,
-    (0 | ::_fl::kFcSingular | ::_fl::kSInt64)},
-  }},
-  // no aux_entries
-  {{
-  }},
-};
-
-::uint8_t* HandshakeResponse::_InternalSerialize(
-    ::uint8_t* target,
-    ::google::protobuf::io::EpsCopyOutputStream* stream) const {
-  // @@protoc_insertion_point(serialize_to_array_start:io.deephaven.proto.backplane.grpc.HandshakeResponse)
-  ::uint32_t cached_has_bits = 0;
-  (void)cached_has_bits;
-
-  // bytes metadata_header = 1 [deprecated = true];
-  if (!this->_internal_metadata_header().empty()) {
-    const std::string& _s = this->_internal_metadata_header();
-    target = stream->WriteBytesMaybeAliased(1, _s, target);
-  }
-
-  // bytes session_token = 2 [deprecated = true];
-  if (!this->_internal_session_token().empty()) {
-    const std::string& _s = this->_internal_session_token();
-    target = stream->WriteBytesMaybeAliased(2, _s, target);
-  }
-
-  // sint64 token_deadline_time_millis = 3 [deprecated = true, jstype = JS_STRING];
-  if (this->_internal_token_deadline_time_millis() != 0) {
-    target = stream->EnsureSpace(target);
-    target = ::_pbi::WireFormatLite::WriteSInt64ToArray(
-        3, this->_internal_token_deadline_time_millis(), target);
-  }
-
-  // sint64 token_expiration_delay_millis = 4 [deprecated = true, jstype = JS_STRING];
-  if (this->_internal_token_expiration_delay_millis() != 0) {
-    target = stream->EnsureSpace(target);
-    target = ::_pbi::WireFormatLite::WriteSInt64ToArray(
-        4, this->_internal_token_expiration_delay_millis(), target);
-  }
-
-  if (PROTOBUF_PREDICT_FALSE(_internal_metadata_.have_unknown_fields())) {
-    target =
-        ::_pbi::WireFormat::InternalSerializeUnknownFieldsToArray(
-            _internal_metadata_.unknown_fields<::google::protobuf::UnknownFieldSet>(::google::protobuf::UnknownFieldSet::default_instance), target, stream);
-  }
-  // @@protoc_insertion_point(serialize_to_array_end:io.deephaven.proto.backplane.grpc.HandshakeResponse)
-  return target;
-}
-
-::size_t HandshakeResponse::ByteSizeLong() const {
-// @@protoc_insertion_point(message_byte_size_start:io.deephaven.proto.backplane.grpc.HandshakeResponse)
-  ::size_t total_size = 0;
-
-  ::uint32_t cached_has_bits = 0;
-  // Prevent compiler warnings about cached_has_bits being unused
-  (void) cached_has_bits;
-
-  // bytes metadata_header = 1 [deprecated = true];
-  if (!this->_internal_metadata_header().empty()) {
-    total_size += 1 + ::google::protobuf::internal::WireFormatLite::BytesSize(
-                                    this->_internal_metadata_header());
-  }
-
-  // bytes session_token = 2 [deprecated = true];
-  if (!this->_internal_session_token().empty()) {
-    total_size += 1 + ::google::protobuf::internal::WireFormatLite::BytesSize(
-                                    this->_internal_session_token());
-  }
-
-  // sint64 token_deadline_time_millis = 3 [deprecated = true, jstype = JS_STRING];
-  if (this->_internal_token_deadline_time_millis() != 0) {
-    total_size += ::_pbi::WireFormatLite::SInt64SizePlusOne(
-        this->_internal_token_deadline_time_millis());
-  }
-
-  // sint64 token_expiration_delay_millis = 4 [deprecated = true, jstype = JS_STRING];
-  if (this->_internal_token_expiration_delay_millis() != 0) {
-    total_size += ::_pbi::WireFormatLite::SInt64SizePlusOne(
-        this->_internal_token_expiration_delay_millis());
-  }
-
-  return MaybeComputeUnknownFieldsSize(total_size, &_impl_._cached_size_);
-}
-
-const ::google::protobuf::Message::ClassData HandshakeResponse::_class_data_ = {
-    HandshakeResponse::MergeImpl,
-    nullptr,  // OnDemandRegisterArenaDtor
-};
-const ::google::protobuf::Message::ClassData* HandshakeResponse::GetClassData() const {
-  return &_class_data_;
-}
-
-void HandshakeResponse::MergeImpl(::google::protobuf::Message& to_msg, const ::google::protobuf::Message& from_msg) {
-  auto* const _this = static_cast<HandshakeResponse*>(&to_msg);
-  auto& from = static_cast<const HandshakeResponse&>(from_msg);
-  // @@protoc_insertion_point(class_specific_merge_from_start:io.deephaven.proto.backplane.grpc.HandshakeResponse)
-  ABSL_DCHECK_NE(&from, _this);
-  ::uint32_t cached_has_bits = 0;
-  (void) cached_has_bits;
-
-  if (!from._internal_metadata_header().empty()) {
-    _this->_internal_set_metadata_header(from._internal_metadata_header());
-  }
-  if (!from._internal_session_token().empty()) {
-    _this->_internal_set_session_token(from._internal_session_token());
-  }
-  if (from._internal_token_deadline_time_millis() != 0) {
-    _this->_internal_set_token_deadline_time_millis(from._internal_token_deadline_time_millis());
-  }
-  if (from._internal_token_expiration_delay_millis() != 0) {
-    _this->_internal_set_token_expiration_delay_millis(from._internal_token_expiration_delay_millis());
-  }
-  _this->_internal_metadata_.MergeFrom<::google::protobuf::UnknownFieldSet>(from._internal_metadata_);
-}
-
-void HandshakeResponse::CopyFrom(const HandshakeResponse& from) {
-// @@protoc_insertion_point(class_specific_copy_from_start:io.deephaven.proto.backplane.grpc.HandshakeResponse)
-  if (&from == this) return;
-  Clear();
-  MergeFrom(from);
-}
-
-PROTOBUF_NOINLINE bool HandshakeResponse::IsInitialized() const {
-  return true;
-}
-
-::_pbi::CachedSize* HandshakeResponse::AccessCachedSize() const {
-  return &_impl_._cached_size_;
-}
-void HandshakeResponse::InternalSwap(HandshakeResponse* PROTOBUF_RESTRICT other) {
-  using std::swap;
-  auto* arena = GetArena();
-  ABSL_DCHECK_EQ(arena, other->GetArena());
-  _internal_metadata_.InternalSwap(&other->_internal_metadata_);
-  ::_pbi::ArenaStringPtr::InternalSwap(&_impl_.metadata_header_, &other->_impl_.metadata_header_, arena);
-  ::_pbi::ArenaStringPtr::InternalSwap(&_impl_.session_token_, &other->_impl_.session_token_, arena);
-  ::google::protobuf::internal::memswap<
-      PROTOBUF_FIELD_OFFSET(HandshakeResponse, _impl_.token_expiration_delay_millis_)
-      + sizeof(HandshakeResponse::_impl_.token_expiration_delay_millis_)
-      - PROTOBUF_FIELD_OFFSET(HandshakeResponse, _impl_.token_deadline_time_millis_)>(
-          reinterpret_cast<char*>(&_impl_.token_deadline_time_millis_),
-          reinterpret_cast<char*>(&other->_impl_.token_deadline_time_millis_));
-}
-
-::google::protobuf::Metadata HandshakeResponse::GetMetadata() const {
-  return ::_pbi::AssignDescriptors(
-      &descriptor_table_deephaven_2fproto_2fsession_2eproto_getter, &descriptor_table_deephaven_2fproto_2fsession_2eproto_once,
-      file_level_metadata_deephaven_2fproto_2fsession_2eproto[2]);
-}
-// ===================================================================
-
-class CloseSessionResponse::_Internal {
- public:
-};
-
-CloseSessionResponse::CloseSessionResponse(::google::protobuf::Arena* arena)
-    : ::google::protobuf::internal::ZeroFieldsBase(arena) {
-  // @@protoc_insertion_point(arena_constructor:io.deephaven.proto.backplane.grpc.CloseSessionResponse)
-}
-CloseSessionResponse::CloseSessionResponse(
-    ::google::protobuf::Arena* arena,
-    const CloseSessionResponse& from)
-    : ::google::protobuf::internal::ZeroFieldsBase(arena) {
-  CloseSessionResponse* const _this = this;
-  (void)_this;
-  _internal_metadata_.MergeFrom<::google::protobuf::UnknownFieldSet>(
-      from._internal_metadata_);
-
-  // @@protoc_insertion_point(copy_constructor:io.deephaven.proto.backplane.grpc.CloseSessionResponse)
-}
-
-
-
-
-
-
-
-
-
-::google::protobuf::Metadata CloseSessionResponse::GetMetadata() const {
-  return ::_pbi::AssignDescriptors(
-      &descriptor_table_deephaven_2fproto_2fsession_2eproto_getter, &descriptor_table_deephaven_2fproto_2fsession_2eproto_once,
-      file_level_metadata_deephaven_2fproto_2fsession_2eproto[3]);
-}
-// ===================================================================
-
-class ReleaseRequest::_Internal {
- public:
-  using HasBits = decltype(std::declval<ReleaseRequest>()._impl_._has_bits_);
-  static constexpr ::int32_t kHasBitsOffset =
-    8 * PROTOBUF_FIELD_OFFSET(ReleaseRequest, _impl_._has_bits_);
-  static const ::io::deephaven::proto::backplane::grpc::Ticket& id(const ReleaseRequest* msg);
-  static void set_has_id(HasBits* has_bits) {
-    (*has_bits)[0] |= 1u;
-  }
-};
-
-const ::io::deephaven::proto::backplane::grpc::Ticket& ReleaseRequest::_Internal::id(const ReleaseRequest* msg) {
-  return *msg->_impl_.id_;
-}
-void ReleaseRequest::clear_id() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  if (_impl_.id_ != nullptr) _impl_.id_->Clear();
-  _impl_._has_bits_[0] &= ~0x00000001u;
-}
-ReleaseRequest::ReleaseRequest(::google::protobuf::Arena* arena)
-    : ::google::protobuf::Message(arena) {
-  SharedCtor(arena);
-  // @@protoc_insertion_point(arena_constructor:io.deephaven.proto.backplane.grpc.ReleaseRequest)
-}
-inline PROTOBUF_NDEBUG_INLINE ReleaseRequest::Impl_::Impl_(
-    ::google::protobuf::internal::InternalVisibility visibility, ::google::protobuf::Arena* arena,
-    const Impl_& from)
-      : _has_bits_{from._has_bits_},
-        _cached_size_{0} {}
-
-ReleaseRequest::ReleaseRequest(
-    ::google::protobuf::Arena* arena,
-    const ReleaseRequest& from)
-    : ::google::protobuf::Message(arena) {
-  ReleaseRequest* const _this = this;
-  (void)_this;
-  _internal_metadata_.MergeFrom<::google::protobuf::UnknownFieldSet>(
-      from._internal_metadata_);
-  new (&_impl_) Impl_(internal_visibility(), arena, from._impl_);
-  ::uint32_t cached_has_bits = _impl_._has_bits_[0];
-  _impl_.id_ = (cached_has_bits & 0x00000001u)
-                ? CreateMaybeMessage<::io::deephaven::proto::backplane::grpc::Ticket>(arena, *from._impl_.id_)
-                : nullptr;
-
-  // @@protoc_insertion_point(copy_constructor:io.deephaven.proto.backplane.grpc.ReleaseRequest)
-}
-inline PROTOBUF_NDEBUG_INLINE ReleaseRequest::Impl_::Impl_(
-    ::google::protobuf::internal::InternalVisibility visibility,
-    ::google::protobuf::Arena* arena)
-      : _cached_size_{0} {}
-
-inline void ReleaseRequest::SharedCtor(::_pb::Arena* arena) {
-  new (&_impl_) Impl_(internal_visibility(), arena);
-  _impl_.id_ = {};
-}
-ReleaseRequest::~ReleaseRequest() {
-  // @@protoc_insertion_point(destructor:io.deephaven.proto.backplane.grpc.ReleaseRequest)
-  _internal_metadata_.Delete<::google::protobuf::UnknownFieldSet>();
-  SharedDtor();
-}
-inline void ReleaseRequest::SharedDtor() {
-  ABSL_DCHECK(GetArena() == nullptr);
-  delete _impl_.id_;
-  _impl_.~Impl_();
-}
-
-PROTOBUF_NOINLINE void ReleaseRequest::Clear() {
-// @@protoc_insertion_point(message_clear_start:io.deephaven.proto.backplane.grpc.ReleaseRequest)
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  ::uint32_t cached_has_bits = 0;
-  // Prevent compiler warnings about cached_has_bits being unused
-  (void) cached_has_bits;
-
-  cached_has_bits = _impl_._has_bits_[0];
-  if (cached_has_bits & 0x00000001u) {
-    ABSL_DCHECK(_impl_.id_ != nullptr);
-    _impl_.id_->Clear();
-  }
-  _impl_._has_bits_.Clear();
-  _internal_metadata_.Clear<::google::protobuf::UnknownFieldSet>();
-}
-
-const char* ReleaseRequest::_InternalParse(
-    const char* ptr, ::_pbi::ParseContext* ctx) {
-  ptr = ::_pbi::TcParser::ParseLoop(this, ptr, ctx, &_table_.header);
-  return ptr;
-}
-
-
-PROTOBUF_CONSTINIT PROTOBUF_ATTRIBUTE_INIT_PRIORITY1
-const ::_pbi::TcParseTable<0, 1, 1, 0, 2> ReleaseRequest::_table_ = {
-  {
-    PROTOBUF_FIELD_OFFSET(ReleaseRequest, _impl_._has_bits_),
-    0, // no _extensions_
-    1, 0,  // max_field_number, fast_idx_mask
-    offsetof(decltype(_table_), field_lookup_table),
-    4294967294,  // skipmap
-    offsetof(decltype(_table_), field_entries),
-    1,  // num_field_entries
-    1,  // num_aux_entries
-    offsetof(decltype(_table_), aux_entries),
-    &_ReleaseRequest_default_instance_._instance,
-    ::_pbi::TcParser::GenericFallback,  // fallback
-  }, {{
-    // .io.deephaven.proto.backplane.grpc.Ticket id = 1;
-    {::_pbi::TcParser::FastMtS1,
-     {10, 0, 0, PROTOBUF_FIELD_OFFSET(ReleaseRequest, _impl_.id_)}},
-  }}, {{
-    65535, 65535
-  }}, {{
-    // .io.deephaven.proto.backplane.grpc.Ticket id = 1;
-    {PROTOBUF_FIELD_OFFSET(ReleaseRequest, _impl_.id_), _Internal::kHasBitsOffset + 0, 0,
-    (0 | ::_fl::kFcOptional | ::_fl::kMessage | ::_fl::kTvTable)},
-  }}, {{
-    {::_pbi::TcParser::GetTable<::io::deephaven::proto::backplane::grpc::Ticket>()},
-  }}, {{
-  }},
-};
-
-::uint8_t* ReleaseRequest::_InternalSerialize(
-    ::uint8_t* target,
-    ::google::protobuf::io::EpsCopyOutputStream* stream) const {
-  // @@protoc_insertion_point(serialize_to_array_start:io.deephaven.proto.backplane.grpc.ReleaseRequest)
-  ::uint32_t cached_has_bits = 0;
-  (void)cached_has_bits;
-
-  cached_has_bits = _impl_._has_bits_[0];
-  // .io.deephaven.proto.backplane.grpc.Ticket id = 1;
-  if (cached_has_bits & 0x00000001u) {
-    target = ::google::protobuf::internal::WireFormatLite::InternalWriteMessage(
-        1, _Internal::id(this),
-        _Internal::id(this).GetCachedSize(), target, stream);
-  }
-
-  if (PROTOBUF_PREDICT_FALSE(_internal_metadata_.have_unknown_fields())) {
-    target =
-        ::_pbi::WireFormat::InternalSerializeUnknownFieldsToArray(
-            _internal_metadata_.unknown_fields<::google::protobuf::UnknownFieldSet>(::google::protobuf::UnknownFieldSet::default_instance), target, stream);
-  }
-  // @@protoc_insertion_point(serialize_to_array_end:io.deephaven.proto.backplane.grpc.ReleaseRequest)
-  return target;
-}
-
-::size_t ReleaseRequest::ByteSizeLong() const {
-// @@protoc_insertion_point(message_byte_size_start:io.deephaven.proto.backplane.grpc.ReleaseRequest)
-  ::size_t total_size = 0;
-
-  ::uint32_t cached_has_bits = 0;
-  // Prevent compiler warnings about cached_has_bits being unused
-  (void) cached_has_bits;
-
-  // .io.deephaven.proto.backplane.grpc.Ticket id = 1;
-  cached_has_bits = _impl_._has_bits_[0];
-  if (cached_has_bits & 0x00000001u) {
-    total_size +=
-        1 + ::google::protobuf::internal::WireFormatLite::MessageSize(*_impl_.id_);
-  }
-
-  return MaybeComputeUnknownFieldsSize(total_size, &_impl_._cached_size_);
-}
-
-const ::google::protobuf::Message::ClassData ReleaseRequest::_class_data_ = {
-    ReleaseRequest::MergeImpl,
-    nullptr,  // OnDemandRegisterArenaDtor
-};
-const ::google::protobuf::Message::ClassData* ReleaseRequest::GetClassData() const {
-  return &_class_data_;
-}
-
-void ReleaseRequest::MergeImpl(::google::protobuf::Message& to_msg, const ::google::protobuf::Message& from_msg) {
-  auto* const _this = static_cast<ReleaseRequest*>(&to_msg);
-  auto& from = static_cast<const ReleaseRequest&>(from_msg);
-  // @@protoc_insertion_point(class_specific_merge_from_start:io.deephaven.proto.backplane.grpc.ReleaseRequest)
-  ABSL_DCHECK_NE(&from, _this);
-  ::uint32_t cached_has_bits = 0;
-  (void) cached_has_bits;
-
-  if ((from._impl_._has_bits_[0] & 0x00000001u) != 0) {
-    _this->_internal_mutable_id()->::io::deephaven::proto::backplane::grpc::Ticket::MergeFrom(
-        from._internal_id());
-  }
-  _this->_internal_metadata_.MergeFrom<::google::protobuf::UnknownFieldSet>(from._internal_metadata_);
-}
-
-void ReleaseRequest::CopyFrom(const ReleaseRequest& from) {
-// @@protoc_insertion_point(class_specific_copy_from_start:io.deephaven.proto.backplane.grpc.ReleaseRequest)
-  if (&from == this) return;
-  Clear();
-  MergeFrom(from);
-}
-
-PROTOBUF_NOINLINE bool ReleaseRequest::IsInitialized() const {
-  return true;
-}
-
-::_pbi::CachedSize* ReleaseRequest::AccessCachedSize() const {
-  return &_impl_._cached_size_;
-}
-void ReleaseRequest::InternalSwap(ReleaseRequest* PROTOBUF_RESTRICT other) {
-  using std::swap;
-  _internal_metadata_.InternalSwap(&other->_internal_metadata_);
-  swap(_impl_._has_bits_[0], other->_impl_._has_bits_[0]);
-  swap(_impl_.id_, other->_impl_.id_);
-}
-
-::google::protobuf::Metadata ReleaseRequest::GetMetadata() const {
-  return ::_pbi::AssignDescriptors(
-      &descriptor_table_deephaven_2fproto_2fsession_2eproto_getter, &descriptor_table_deephaven_2fproto_2fsession_2eproto_once,
-      file_level_metadata_deephaven_2fproto_2fsession_2eproto[4]);
-}
-// ===================================================================
-
-class ReleaseResponse::_Internal {
- public:
-};
-
-ReleaseResponse::ReleaseResponse(::google::protobuf::Arena* arena)
-    : ::google::protobuf::internal::ZeroFieldsBase(arena) {
-  // @@protoc_insertion_point(arena_constructor:io.deephaven.proto.backplane.grpc.ReleaseResponse)
-}
-ReleaseResponse::ReleaseResponse(
-    ::google::protobuf::Arena* arena,
-    const ReleaseResponse& from)
-    : ::google::protobuf::internal::ZeroFieldsBase(arena) {
-  ReleaseResponse* const _this = this;
-  (void)_this;
-  _internal_metadata_.MergeFrom<::google::protobuf::UnknownFieldSet>(
-      from._internal_metadata_);
-
-  // @@protoc_insertion_point(copy_constructor:io.deephaven.proto.backplane.grpc.ReleaseResponse)
-}
-
-
-
-
-
-
-
-
-
-::google::protobuf::Metadata ReleaseResponse::GetMetadata() const {
-  return ::_pbi::AssignDescriptors(
-      &descriptor_table_deephaven_2fproto_2fsession_2eproto_getter, &descriptor_table_deephaven_2fproto_2fsession_2eproto_once,
-      file_level_metadata_deephaven_2fproto_2fsession_2eproto[5]);
-}
-// ===================================================================
-
-class ExportRequest::_Internal {
- public:
-  using HasBits = decltype(std::declval<ExportRequest>()._impl_._has_bits_);
-  static constexpr ::int32_t kHasBitsOffset =
-    8 * PROTOBUF_FIELD_OFFSET(ExportRequest, _impl_._has_bits_);
-  static const ::io::deephaven::proto::backplane::grpc::Ticket& source_id(const ExportRequest* msg);
-  static void set_has_source_id(HasBits* has_bits) {
-    (*has_bits)[0] |= 1u;
-  }
-  static const ::io::deephaven::proto::backplane::grpc::Ticket& result_id(const ExportRequest* msg);
-  static void set_has_result_id(HasBits* has_bits) {
-    (*has_bits)[0] |= 2u;
-  }
-};
-
-const ::io::deephaven::proto::backplane::grpc::Ticket& ExportRequest::_Internal::source_id(const ExportRequest* msg) {
-  return *msg->_impl_.source_id_;
-}
-const ::io::deephaven::proto::backplane::grpc::Ticket& ExportRequest::_Internal::result_id(const ExportRequest* msg) {
-  return *msg->_impl_.result_id_;
-}
-void ExportRequest::clear_source_id() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  if (_impl_.source_id_ != nullptr) _impl_.source_id_->Clear();
-  _impl_._has_bits_[0] &= ~0x00000001u;
-}
-void ExportRequest::clear_result_id() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  if (_impl_.result_id_ != nullptr) _impl_.result_id_->Clear();
-  _impl_._has_bits_[0] &= ~0x00000002u;
-}
-ExportRequest::ExportRequest(::google::protobuf::Arena* arena)
-    : ::google::protobuf::Message(arena) {
-  SharedCtor(arena);
-  // @@protoc_insertion_point(arena_constructor:io.deephaven.proto.backplane.grpc.ExportRequest)
-}
-inline PROTOBUF_NDEBUG_INLINE ExportRequest::Impl_::Impl_(
-    ::google::protobuf::internal::InternalVisibility visibility, ::google::protobuf::Arena* arena,
-    const Impl_& from)
-      : _has_bits_{from._has_bits_},
-        _cached_size_{0} {}
-
-ExportRequest::ExportRequest(
-    ::google::protobuf::Arena* arena,
-    const ExportRequest& from)
-    : ::google::protobuf::Message(arena) {
-  ExportRequest* const _this = this;
-  (void)_this;
-  _internal_metadata_.MergeFrom<::google::protobuf::UnknownFieldSet>(
-      from._internal_metadata_);
-  new (&_impl_) Impl_(internal_visibility(), arena, from._impl_);
-  ::uint32_t cached_has_bits = _impl_._has_bits_[0];
-  _impl_.source_id_ = (cached_has_bits & 0x00000001u)
-                ? CreateMaybeMessage<::io::deephaven::proto::backplane::grpc::Ticket>(arena, *from._impl_.source_id_)
-                : nullptr;
-  _impl_.result_id_ = (cached_has_bits & 0x00000002u)
-                ? CreateMaybeMessage<::io::deephaven::proto::backplane::grpc::Ticket>(arena, *from._impl_.result_id_)
-                : nullptr;
-
-  // @@protoc_insertion_point(copy_constructor:io.deephaven.proto.backplane.grpc.ExportRequest)
-}
-inline PROTOBUF_NDEBUG_INLINE ExportRequest::Impl_::Impl_(
-    ::google::protobuf::internal::InternalVisibility visibility,
-    ::google::protobuf::Arena* arena)
-      : _cached_size_{0} {}
-
-inline void ExportRequest::SharedCtor(::_pb::Arena* arena) {
-  new (&_impl_) Impl_(internal_visibility(), arena);
-  ::memset(reinterpret_cast<char *>(&_impl_) +
-               offsetof(Impl_, source_id_),
-           0,
-           offsetof(Impl_, result_id_) -
-               offsetof(Impl_, source_id_) +
-               sizeof(Impl_::result_id_));
-}
-ExportRequest::~ExportRequest() {
-  // @@protoc_insertion_point(destructor:io.deephaven.proto.backplane.grpc.ExportRequest)
-  _internal_metadata_.Delete<::google::protobuf::UnknownFieldSet>();
-  SharedDtor();
-}
-inline void ExportRequest::SharedDtor() {
-  ABSL_DCHECK(GetArena() == nullptr);
-  delete _impl_.source_id_;
-  delete _impl_.result_id_;
-  _impl_.~Impl_();
-}
-
-PROTOBUF_NOINLINE void ExportRequest::Clear() {
-// @@protoc_insertion_point(message_clear_start:io.deephaven.proto.backplane.grpc.ExportRequest)
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  ::uint32_t cached_has_bits = 0;
-  // Prevent compiler warnings about cached_has_bits being unused
-  (void) cached_has_bits;
-
-  cached_has_bits = _impl_._has_bits_[0];
-  if (cached_has_bits & 0x00000003u) {
-    if (cached_has_bits & 0x00000001u) {
-      ABSL_DCHECK(_impl_.source_id_ != nullptr);
-      _impl_.source_id_->Clear();
-    }
-    if (cached_has_bits & 0x00000002u) {
-      ABSL_DCHECK(_impl_.result_id_ != nullptr);
-      _impl_.result_id_->Clear();
-    }
-  }
-  _impl_._has_bits_.Clear();
-  _internal_metadata_.Clear<::google::protobuf::UnknownFieldSet>();
-}
-
-const char* ExportRequest::_InternalParse(
-    const char* ptr, ::_pbi::ParseContext* ctx) {
-  ptr = ::_pbi::TcParser::ParseLoop(this, ptr, ctx, &_table_.header);
-  return ptr;
-}
-
-
-PROTOBUF_CONSTINIT PROTOBUF_ATTRIBUTE_INIT_PRIORITY1
-const ::_pbi::TcParseTable<1, 2, 2, 0, 2> ExportRequest::_table_ = {
-  {
-    PROTOBUF_FIELD_OFFSET(ExportRequest, _impl_._has_bits_),
-    0, // no _extensions_
-    2, 8,  // max_field_number, fast_idx_mask
-    offsetof(decltype(_table_), field_lookup_table),
-    4294967292,  // skipmap
-    offsetof(decltype(_table_), field_entries),
-    2,  // num_field_entries
-    2,  // num_aux_entries
-    offsetof(decltype(_table_), aux_entries),
-    &_ExportRequest_default_instance_._instance,
-    ::_pbi::TcParser::GenericFallback,  // fallback
-  }, {{
-    // .io.deephaven.proto.backplane.grpc.Ticket result_id = 2;
-    {::_pbi::TcParser::FastMtS1,
-     {18, 1, 1, PROTOBUF_FIELD_OFFSET(ExportRequest, _impl_.result_id_)}},
-    // .io.deephaven.proto.backplane.grpc.Ticket source_id = 1;
-    {::_pbi::TcParser::FastMtS1,
-     {10, 0, 0, PROTOBUF_FIELD_OFFSET(ExportRequest, _impl_.source_id_)}},
-  }}, {{
-    65535, 65535
-  }}, {{
-    // .io.deephaven.proto.backplane.grpc.Ticket source_id = 1;
-    {PROTOBUF_FIELD_OFFSET(ExportRequest, _impl_.source_id_), _Internal::kHasBitsOffset + 0, 0,
-    (0 | ::_fl::kFcOptional | ::_fl::kMessage | ::_fl::kTvTable)},
-    // .io.deephaven.proto.backplane.grpc.Ticket result_id = 2;
-    {PROTOBUF_FIELD_OFFSET(ExportRequest, _impl_.result_id_), _Internal::kHasBitsOffset + 1, 1,
-    (0 | ::_fl::kFcOptional | ::_fl::kMessage | ::_fl::kTvTable)},
-  }}, {{
-    {::_pbi::TcParser::GetTable<::io::deephaven::proto::backplane::grpc::Ticket>()},
-    {::_pbi::TcParser::GetTable<::io::deephaven::proto::backplane::grpc::Ticket>()},
-  }}, {{
-  }},
-};
-
-::uint8_t* ExportRequest::_InternalSerialize(
-    ::uint8_t* target,
-    ::google::protobuf::io::EpsCopyOutputStream* stream) const {
-  // @@protoc_insertion_point(serialize_to_array_start:io.deephaven.proto.backplane.grpc.ExportRequest)
-  ::uint32_t cached_has_bits = 0;
-  (void)cached_has_bits;
-
-  cached_has_bits = _impl_._has_bits_[0];
-  // .io.deephaven.proto.backplane.grpc.Ticket source_id = 1;
-  if (cached_has_bits & 0x00000001u) {
-    target = ::google::protobuf::internal::WireFormatLite::InternalWriteMessage(
-        1, _Internal::source_id(this),
-        _Internal::source_id(this).GetCachedSize(), target, stream);
-  }
-
-  // .io.deephaven.proto.backplane.grpc.Ticket result_id = 2;
-  if (cached_has_bits & 0x00000002u) {
-    target = ::google::protobuf::internal::WireFormatLite::InternalWriteMessage(
-        2, _Internal::result_id(this),
-        _Internal::result_id(this).GetCachedSize(), target, stream);
-  }
-
-  if (PROTOBUF_PREDICT_FALSE(_internal_metadata_.have_unknown_fields())) {
-    target =
-        ::_pbi::WireFormat::InternalSerializeUnknownFieldsToArray(
-            _internal_metadata_.unknown_fields<::google::protobuf::UnknownFieldSet>(::google::protobuf::UnknownFieldSet::default_instance), target, stream);
-  }
-  // @@protoc_insertion_point(serialize_to_array_end:io.deephaven.proto.backplane.grpc.ExportRequest)
-  return target;
-}
-
-::size_t ExportRequest::ByteSizeLong() const {
-// @@protoc_insertion_point(message_byte_size_start:io.deephaven.proto.backplane.grpc.ExportRequest)
-  ::size_t total_size = 0;
-
-  ::uint32_t cached_has_bits = 0;
-  // Prevent compiler warnings about cached_has_bits being unused
-  (void) cached_has_bits;
-
-  cached_has_bits = _impl_._has_bits_[0];
-  if (cached_has_bits & 0x00000003u) {
-    // .io.deephaven.proto.backplane.grpc.Ticket source_id = 1;
-    if (cached_has_bits & 0x00000001u) {
-      total_size +=
-          1 + ::google::protobuf::internal::WireFormatLite::MessageSize(*_impl_.source_id_);
-    }
-
-    // .io.deephaven.proto.backplane.grpc.Ticket result_id = 2;
-    if (cached_has_bits & 0x00000002u) {
-      total_size +=
-          1 + ::google::protobuf::internal::WireFormatLite::MessageSize(*_impl_.result_id_);
-    }
-
-  }
-  return MaybeComputeUnknownFieldsSize(total_size, &_impl_._cached_size_);
-}
-
-const ::google::protobuf::Message::ClassData ExportRequest::_class_data_ = {
-    ExportRequest::MergeImpl,
-    nullptr,  // OnDemandRegisterArenaDtor
-};
-const ::google::protobuf::Message::ClassData* ExportRequest::GetClassData() const {
-  return &_class_data_;
-}
-
-void ExportRequest::MergeImpl(::google::protobuf::Message& to_msg, const ::google::protobuf::Message& from_msg) {
-  auto* const _this = static_cast<ExportRequest*>(&to_msg);
-  auto& from = static_cast<const ExportRequest&>(from_msg);
-  // @@protoc_insertion_point(class_specific_merge_from_start:io.deephaven.proto.backplane.grpc.ExportRequest)
-  ABSL_DCHECK_NE(&from, _this);
-  ::uint32_t cached_has_bits = 0;
-  (void) cached_has_bits;
-
-  cached_has_bits = from._impl_._has_bits_[0];
-  if (cached_has_bits & 0x00000003u) {
-    if (cached_has_bits & 0x00000001u) {
-      _this->_internal_mutable_source_id()->::io::deephaven::proto::backplane::grpc::Ticket::MergeFrom(
-          from._internal_source_id());
-    }
-    if (cached_has_bits & 0x00000002u) {
-      _this->_internal_mutable_result_id()->::io::deephaven::proto::backplane::grpc::Ticket::MergeFrom(
-          from._internal_result_id());
-    }
-  }
-  _this->_internal_metadata_.MergeFrom<::google::protobuf::UnknownFieldSet>(from._internal_metadata_);
-}
-
-void ExportRequest::CopyFrom(const ExportRequest& from) {
-// @@protoc_insertion_point(class_specific_copy_from_start:io.deephaven.proto.backplane.grpc.ExportRequest)
-  if (&from == this) return;
-  Clear();
-  MergeFrom(from);
-}
-
-PROTOBUF_NOINLINE bool ExportRequest::IsInitialized() const {
-  return true;
-}
-
-::_pbi::CachedSize* ExportRequest::AccessCachedSize() const {
-  return &_impl_._cached_size_;
-}
-void ExportRequest::InternalSwap(ExportRequest* PROTOBUF_RESTRICT other) {
-  using std::swap;
-  _internal_metadata_.InternalSwap(&other->_internal_metadata_);
-  swap(_impl_._has_bits_[0], other->_impl_._has_bits_[0]);
-  ::google::protobuf::internal::memswap<
-      PROTOBUF_FIELD_OFFSET(ExportRequest, _impl_.result_id_)
-      + sizeof(ExportRequest::_impl_.result_id_)
-      - PROTOBUF_FIELD_OFFSET(ExportRequest, _impl_.source_id_)>(
-          reinterpret_cast<char*>(&_impl_.source_id_),
-          reinterpret_cast<char*>(&other->_impl_.source_id_));
-}
-
-::google::protobuf::Metadata ExportRequest::GetMetadata() const {
-  return ::_pbi::AssignDescriptors(
-      &descriptor_table_deephaven_2fproto_2fsession_2eproto_getter, &descriptor_table_deephaven_2fproto_2fsession_2eproto_once,
-      file_level_metadata_deephaven_2fproto_2fsession_2eproto[6]);
-}
-// ===================================================================
-
-class ExportResponse::_Internal {
- public:
-};
-
-ExportResponse::ExportResponse(::google::protobuf::Arena* arena)
-    : ::google::protobuf::internal::ZeroFieldsBase(arena) {
-  // @@protoc_insertion_point(arena_constructor:io.deephaven.proto.backplane.grpc.ExportResponse)
-}
-ExportResponse::ExportResponse(
-    ::google::protobuf::Arena* arena,
-    const ExportResponse& from)
-    : ::google::protobuf::internal::ZeroFieldsBase(arena) {
-  ExportResponse* const _this = this;
-  (void)_this;
-  _internal_metadata_.MergeFrom<::google::protobuf::UnknownFieldSet>(
-      from._internal_metadata_);
-
-  // @@protoc_insertion_point(copy_constructor:io.deephaven.proto.backplane.grpc.ExportResponse)
-}
-
-
-
-
-
-
-
-
-
-::google::protobuf::Metadata ExportResponse::GetMetadata() const {
-  return ::_pbi::AssignDescriptors(
-      &descriptor_table_deephaven_2fproto_2fsession_2eproto_getter, &descriptor_table_deephaven_2fproto_2fsession_2eproto_once,
-      file_level_metadata_deephaven_2fproto_2fsession_2eproto[7]);
-}
-// ===================================================================
-
-class PublishRequest::_Internal {
- public:
-  using HasBits = decltype(std::declval<PublishRequest>()._impl_._has_bits_);
-  static constexpr ::int32_t kHasBitsOffset =
-    8 * PROTOBUF_FIELD_OFFSET(PublishRequest, _impl_._has_bits_);
-  static const ::io::deephaven::proto::backplane::grpc::Ticket& source_id(const PublishRequest* msg);
-  static void set_has_source_id(HasBits* has_bits) {
-    (*has_bits)[0] |= 1u;
-  }
-  static const ::io::deephaven::proto::backplane::grpc::Ticket& result_id(const PublishRequest* msg);
-  static void set_has_result_id(HasBits* has_bits) {
-    (*has_bits)[0] |= 2u;
-  }
-};
-
-const ::io::deephaven::proto::backplane::grpc::Ticket& PublishRequest::_Internal::source_id(const PublishRequest* msg) {
-  return *msg->_impl_.source_id_;
-}
-const ::io::deephaven::proto::backplane::grpc::Ticket& PublishRequest::_Internal::result_id(const PublishRequest* msg) {
-  return *msg->_impl_.result_id_;
-}
-void PublishRequest::clear_source_id() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  if (_impl_.source_id_ != nullptr) _impl_.source_id_->Clear();
-  _impl_._has_bits_[0] &= ~0x00000001u;
-}
-void PublishRequest::clear_result_id() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  if (_impl_.result_id_ != nullptr) _impl_.result_id_->Clear();
-  _impl_._has_bits_[0] &= ~0x00000002u;
-}
-PublishRequest::PublishRequest(::google::protobuf::Arena* arena)
-    : ::google::protobuf::Message(arena) {
-  SharedCtor(arena);
-  // @@protoc_insertion_point(arena_constructor:io.deephaven.proto.backplane.grpc.PublishRequest)
-}
-inline PROTOBUF_NDEBUG_INLINE PublishRequest::Impl_::Impl_(
-    ::google::protobuf::internal::InternalVisibility visibility, ::google::protobuf::Arena* arena,
-    const Impl_& from)
-      : _has_bits_{from._has_bits_},
-        _cached_size_{0} {}
-
-PublishRequest::PublishRequest(
-    ::google::protobuf::Arena* arena,
-    const PublishRequest& from)
-    : ::google::protobuf::Message(arena) {
-  PublishRequest* const _this = this;
-  (void)_this;
-  _internal_metadata_.MergeFrom<::google::protobuf::UnknownFieldSet>(
-      from._internal_metadata_);
-  new (&_impl_) Impl_(internal_visibility(), arena, from._impl_);
-  ::uint32_t cached_has_bits = _impl_._has_bits_[0];
-  _impl_.source_id_ = (cached_has_bits & 0x00000001u)
-                ? CreateMaybeMessage<::io::deephaven::proto::backplane::grpc::Ticket>(arena, *from._impl_.source_id_)
-                : nullptr;
-  _impl_.result_id_ = (cached_has_bits & 0x00000002u)
-                ? CreateMaybeMessage<::io::deephaven::proto::backplane::grpc::Ticket>(arena, *from._impl_.result_id_)
-                : nullptr;
-
-  // @@protoc_insertion_point(copy_constructor:io.deephaven.proto.backplane.grpc.PublishRequest)
-}
-inline PROTOBUF_NDEBUG_INLINE PublishRequest::Impl_::Impl_(
-    ::google::protobuf::internal::InternalVisibility visibility,
-    ::google::protobuf::Arena* arena)
-      : _cached_size_{0} {}
-
-inline void PublishRequest::SharedCtor(::_pb::Arena* arena) {
-  new (&_impl_) Impl_(internal_visibility(), arena);
-  ::memset(reinterpret_cast<char *>(&_impl_) +
-               offsetof(Impl_, source_id_),
-           0,
-           offsetof(Impl_, result_id_) -
-               offsetof(Impl_, source_id_) +
-               sizeof(Impl_::result_id_));
-}
-PublishRequest::~PublishRequest() {
-  // @@protoc_insertion_point(destructor:io.deephaven.proto.backplane.grpc.PublishRequest)
-  _internal_metadata_.Delete<::google::protobuf::UnknownFieldSet>();
-  SharedDtor();
-}
-inline void PublishRequest::SharedDtor() {
-  ABSL_DCHECK(GetArena() == nullptr);
-  delete _impl_.source_id_;
-  delete _impl_.result_id_;
-  _impl_.~Impl_();
-}
-
-PROTOBUF_NOINLINE void PublishRequest::Clear() {
-// @@protoc_insertion_point(message_clear_start:io.deephaven.proto.backplane.grpc.PublishRequest)
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  ::uint32_t cached_has_bits = 0;
-  // Prevent compiler warnings about cached_has_bits being unused
-  (void) cached_has_bits;
-
-  cached_has_bits = _impl_._has_bits_[0];
-  if (cached_has_bits & 0x00000003u) {
-    if (cached_has_bits & 0x00000001u) {
-      ABSL_DCHECK(_impl_.source_id_ != nullptr);
-      _impl_.source_id_->Clear();
-    }
-    if (cached_has_bits & 0x00000002u) {
-      ABSL_DCHECK(_impl_.result_id_ != nullptr);
-      _impl_.result_id_->Clear();
-    }
-  }
-  _impl_._has_bits_.Clear();
-  _internal_metadata_.Clear<::google::protobuf::UnknownFieldSet>();
-}
-
-const char* PublishRequest::_InternalParse(
-    const char* ptr, ::_pbi::ParseContext* ctx) {
-  ptr = ::_pbi::TcParser::ParseLoop(this, ptr, ctx, &_table_.header);
-  return ptr;
-}
-
-
-PROTOBUF_CONSTINIT PROTOBUF_ATTRIBUTE_INIT_PRIORITY1
-const ::_pbi::TcParseTable<1, 2, 2, 0, 2> PublishRequest::_table_ = {
-  {
-    PROTOBUF_FIELD_OFFSET(PublishRequest, _impl_._has_bits_),
-    0, // no _extensions_
-    2, 8,  // max_field_number, fast_idx_mask
-    offsetof(decltype(_table_), field_lookup_table),
-    4294967292,  // skipmap
-    offsetof(decltype(_table_), field_entries),
-    2,  // num_field_entries
-    2,  // num_aux_entries
-    offsetof(decltype(_table_), aux_entries),
-    &_PublishRequest_default_instance_._instance,
-    ::_pbi::TcParser::GenericFallback,  // fallback
-  }, {{
-    // .io.deephaven.proto.backplane.grpc.Ticket result_id = 2;
-    {::_pbi::TcParser::FastMtS1,
-     {18, 1, 1, PROTOBUF_FIELD_OFFSET(PublishRequest, _impl_.result_id_)}},
-    // .io.deephaven.proto.backplane.grpc.Ticket source_id = 1;
-    {::_pbi::TcParser::FastMtS1,
-     {10, 0, 0, PROTOBUF_FIELD_OFFSET(PublishRequest, _impl_.source_id_)}},
-  }}, {{
-    65535, 65535
-  }}, {{
-    // .io.deephaven.proto.backplane.grpc.Ticket source_id = 1;
-    {PROTOBUF_FIELD_OFFSET(PublishRequest, _impl_.source_id_), _Internal::kHasBitsOffset + 0, 0,
-    (0 | ::_fl::kFcOptional | ::_fl::kMessage | ::_fl::kTvTable)},
-    // .io.deephaven.proto.backplane.grpc.Ticket result_id = 2;
-    {PROTOBUF_FIELD_OFFSET(PublishRequest, _impl_.result_id_), _Internal::kHasBitsOffset + 1, 1,
-    (0 | ::_fl::kFcOptional | ::_fl::kMessage | ::_fl::kTvTable)},
-  }}, {{
-    {::_pbi::TcParser::GetTable<::io::deephaven::proto::backplane::grpc::Ticket>()},
-    {::_pbi::TcParser::GetTable<::io::deephaven::proto::backplane::grpc::Ticket>()},
-  }}, {{
-  }},
-};
-
-::uint8_t* PublishRequest::_InternalSerialize(
-    ::uint8_t* target,
-    ::google::protobuf::io::EpsCopyOutputStream* stream) const {
-  // @@protoc_insertion_point(serialize_to_array_start:io.deephaven.proto.backplane.grpc.PublishRequest)
-  ::uint32_t cached_has_bits = 0;
-  (void)cached_has_bits;
-
-  cached_has_bits = _impl_._has_bits_[0];
-  // .io.deephaven.proto.backplane.grpc.Ticket source_id = 1;
-  if (cached_has_bits & 0x00000001u) {
-    target = ::google::protobuf::internal::WireFormatLite::InternalWriteMessage(
-        1, _Internal::source_id(this),
-        _Internal::source_id(this).GetCachedSize(), target, stream);
-  }
-
-  // .io.deephaven.proto.backplane.grpc.Ticket result_id = 2;
-  if (cached_has_bits & 0x00000002u) {
-    target = ::google::protobuf::internal::WireFormatLite::InternalWriteMessage(
-        2, _Internal::result_id(this),
-        _Internal::result_id(this).GetCachedSize(), target, stream);
-  }
-
-  if (PROTOBUF_PREDICT_FALSE(_internal_metadata_.have_unknown_fields())) {
-    target =
-        ::_pbi::WireFormat::InternalSerializeUnknownFieldsToArray(
-            _internal_metadata_.unknown_fields<::google::protobuf::UnknownFieldSet>(::google::protobuf::UnknownFieldSet::default_instance), target, stream);
-  }
-  // @@protoc_insertion_point(serialize_to_array_end:io.deephaven.proto.backplane.grpc.PublishRequest)
-  return target;
-}
-
-::size_t PublishRequest::ByteSizeLong() const {
-// @@protoc_insertion_point(message_byte_size_start:io.deephaven.proto.backplane.grpc.PublishRequest)
-  ::size_t total_size = 0;
-
-  ::uint32_t cached_has_bits = 0;
-  // Prevent compiler warnings about cached_has_bits being unused
-  (void) cached_has_bits;
-
-  cached_has_bits = _impl_._has_bits_[0];
-  if (cached_has_bits & 0x00000003u) {
-    // .io.deephaven.proto.backplane.grpc.Ticket source_id = 1;
-    if (cached_has_bits & 0x00000001u) {
-      total_size +=
-          1 + ::google::protobuf::internal::WireFormatLite::MessageSize(*_impl_.source_id_);
-    }
-
-    // .io.deephaven.proto.backplane.grpc.Ticket result_id = 2;
-    if (cached_has_bits & 0x00000002u) {
-      total_size +=
-          1 + ::google::protobuf::internal::WireFormatLite::MessageSize(*_impl_.result_id_);
-    }
-
-  }
-  return MaybeComputeUnknownFieldsSize(total_size, &_impl_._cached_size_);
-}
-
-const ::google::protobuf::Message::ClassData PublishRequest::_class_data_ = {
-    PublishRequest::MergeImpl,
-    nullptr,  // OnDemandRegisterArenaDtor
-};
-const ::google::protobuf::Message::ClassData* PublishRequest::GetClassData() const {
-  return &_class_data_;
-}
-
-void PublishRequest::MergeImpl(::google::protobuf::Message& to_msg, const ::google::protobuf::Message& from_msg) {
-  auto* const _this = static_cast<PublishRequest*>(&to_msg);
-  auto& from = static_cast<const PublishRequest&>(from_msg);
-  // @@protoc_insertion_point(class_specific_merge_from_start:io.deephaven.proto.backplane.grpc.PublishRequest)
-  ABSL_DCHECK_NE(&from, _this);
-  ::uint32_t cached_has_bits = 0;
-  (void) cached_has_bits;
-
-  cached_has_bits = from._impl_._has_bits_[0];
-  if (cached_has_bits & 0x00000003u) {
-    if (cached_has_bits & 0x00000001u) {
-      _this->_internal_mutable_source_id()->::io::deephaven::proto::backplane::grpc::Ticket::MergeFrom(
-          from._internal_source_id());
-    }
-    if (cached_has_bits & 0x00000002u) {
-      _this->_internal_mutable_result_id()->::io::deephaven::proto::backplane::grpc::Ticket::MergeFrom(
-          from._internal_result_id());
-    }
-  }
-  _this->_internal_metadata_.MergeFrom<::google::protobuf::UnknownFieldSet>(from._internal_metadata_);
-}
-
-void PublishRequest::CopyFrom(const PublishRequest& from) {
-// @@protoc_insertion_point(class_specific_copy_from_start:io.deephaven.proto.backplane.grpc.PublishRequest)
-  if (&from == this) return;
-  Clear();
-  MergeFrom(from);
-}
-
-PROTOBUF_NOINLINE bool PublishRequest::IsInitialized() const {
-  return true;
-}
-
-::_pbi::CachedSize* PublishRequest::AccessCachedSize() const {
-  return &_impl_._cached_size_;
-}
-void PublishRequest::InternalSwap(PublishRequest* PROTOBUF_RESTRICT other) {
-  using std::swap;
-  _internal_metadata_.InternalSwap(&other->_internal_metadata_);
-  swap(_impl_._has_bits_[0], other->_impl_._has_bits_[0]);
-  ::google::protobuf::internal::memswap<
-      PROTOBUF_FIELD_OFFSET(PublishRequest, _impl_.result_id_)
-      + sizeof(PublishRequest::_impl_.result_id_)
-      - PROTOBUF_FIELD_OFFSET(PublishRequest, _impl_.source_id_)>(
-          reinterpret_cast<char*>(&_impl_.source_id_),
-          reinterpret_cast<char*>(&other->_impl_.source_id_));
-}
-
-::google::protobuf::Metadata PublishRequest::GetMetadata() const {
-  return ::_pbi::AssignDescriptors(
-      &descriptor_table_deephaven_2fproto_2fsession_2eproto_getter, &descriptor_table_deephaven_2fproto_2fsession_2eproto_once,
-      file_level_metadata_deephaven_2fproto_2fsession_2eproto[8]);
-}
-// ===================================================================
-
-class PublishResponse::_Internal {
- public:
-};
-
-PublishResponse::PublishResponse(::google::protobuf::Arena* arena)
-    : ::google::protobuf::internal::ZeroFieldsBase(arena) {
-  // @@protoc_insertion_point(arena_constructor:io.deephaven.proto.backplane.grpc.PublishResponse)
-}
-PublishResponse::PublishResponse(
-    ::google::protobuf::Arena* arena,
-    const PublishResponse& from)
-    : ::google::protobuf::internal::ZeroFieldsBase(arena) {
-  PublishResponse* const _this = this;
-  (void)_this;
-  _internal_metadata_.MergeFrom<::google::protobuf::UnknownFieldSet>(
-      from._internal_metadata_);
-
-  // @@protoc_insertion_point(copy_constructor:io.deephaven.proto.backplane.grpc.PublishResponse)
-}
-
-
-
-
-
-
-
-
-
-::google::protobuf::Metadata PublishResponse::GetMetadata() const {
-  return ::_pbi::AssignDescriptors(
-      &descriptor_table_deephaven_2fproto_2fsession_2eproto_getter, &descriptor_table_deephaven_2fproto_2fsession_2eproto_once,
-      file_level_metadata_deephaven_2fproto_2fsession_2eproto[9]);
-}
-// ===================================================================
-
-class ExportNotificationRequest::_Internal {
- public:
-};
-
-ExportNotificationRequest::ExportNotificationRequest(::google::protobuf::Arena* arena)
-    : ::google::protobuf::internal::ZeroFieldsBase(arena) {
-  // @@protoc_insertion_point(arena_constructor:io.deephaven.proto.backplane.grpc.ExportNotificationRequest)
-}
-ExportNotificationRequest::ExportNotificationRequest(
-    ::google::protobuf::Arena* arena,
-    const ExportNotificationRequest& from)
-    : ::google::protobuf::internal::ZeroFieldsBase(arena) {
-  ExportNotificationRequest* const _this = this;
-  (void)_this;
-  _internal_metadata_.MergeFrom<::google::protobuf::UnknownFieldSet>(
-      from._internal_metadata_);
-
-  // @@protoc_insertion_point(copy_constructor:io.deephaven.proto.backplane.grpc.ExportNotificationRequest)
-}
-
-
-
-
-
-
-
-
-
-::google::protobuf::Metadata ExportNotificationRequest::GetMetadata() const {
-  return ::_pbi::AssignDescriptors(
-      &descriptor_table_deephaven_2fproto_2fsession_2eproto_getter, &descriptor_table_deephaven_2fproto_2fsession_2eproto_once,
-      file_level_metadata_deephaven_2fproto_2fsession_2eproto[10]);
-}
-// ===================================================================
-
-class ExportNotification::_Internal {
- public:
-  using HasBits = decltype(std::declval<ExportNotification>()._impl_._has_bits_);
-  static constexpr ::int32_t kHasBitsOffset =
-    8 * PROTOBUF_FIELD_OFFSET(ExportNotification, _impl_._has_bits_);
-  static const ::io::deephaven::proto::backplane::grpc::Ticket& ticket(const ExportNotification* msg);
-  static void set_has_ticket(HasBits* has_bits) {
-    (*has_bits)[0] |= 1u;
-  }
-};
-
-const ::io::deephaven::proto::backplane::grpc::Ticket& ExportNotification::_Internal::ticket(const ExportNotification* msg) {
-  return *msg->_impl_.ticket_;
-}
-void ExportNotification::clear_ticket() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  if (_impl_.ticket_ != nullptr) _impl_.ticket_->Clear();
-  _impl_._has_bits_[0] &= ~0x00000001u;
-}
-ExportNotification::ExportNotification(::google::protobuf::Arena* arena)
-    : ::google::protobuf::Message(arena) {
-  SharedCtor(arena);
-  // @@protoc_insertion_point(arena_constructor:io.deephaven.proto.backplane.grpc.ExportNotification)
-}
-inline PROTOBUF_NDEBUG_INLINE ExportNotification::Impl_::Impl_(
-    ::google::protobuf::internal::InternalVisibility visibility, ::google::protobuf::Arena* arena,
-    const Impl_& from)
-      : _has_bits_{from._has_bits_},
-        _cached_size_{0},
-        context_(arena, from.context_),
-        dependent_handle_(arena, from.dependent_handle_) {}
-
-ExportNotification::ExportNotification(
-    ::google::protobuf::Arena* arena,
-    const ExportNotification& from)
-    : ::google::protobuf::Message(arena) {
-  ExportNotification* const _this = this;
-  (void)_this;
-  _internal_metadata_.MergeFrom<::google::protobuf::UnknownFieldSet>(
-      from._internal_metadata_);
-  new (&_impl_) Impl_(internal_visibility(), arena, from._impl_);
-  ::uint32_t cached_has_bits = _impl_._has_bits_[0];
-  _impl_.ticket_ = (cached_has_bits & 0x00000001u)
-                ? CreateMaybeMessage<::io::deephaven::proto::backplane::grpc::Ticket>(arena, *from._impl_.ticket_)
-                : nullptr;
-  _impl_.export_state_ = from._impl_.export_state_;
-
-  // @@protoc_insertion_point(copy_constructor:io.deephaven.proto.backplane.grpc.ExportNotification)
-}
-inline PROTOBUF_NDEBUG_INLINE ExportNotification::Impl_::Impl_(
-    ::google::protobuf::internal::InternalVisibility visibility,
-    ::google::protobuf::Arena* arena)
-      : _cached_size_{0},
-        context_(arena),
-        dependent_handle_(arena) {}
-
-inline void ExportNotification::SharedCtor(::_pb::Arena* arena) {
-  new (&_impl_) Impl_(internal_visibility(), arena);
-  ::memset(reinterpret_cast<char *>(&_impl_) +
-               offsetof(Impl_, ticket_),
-           0,
-           offsetof(Impl_, export_state_) -
-               offsetof(Impl_, ticket_) +
-               sizeof(Impl_::export_state_));
-}
-ExportNotification::~ExportNotification() {
-  // @@protoc_insertion_point(destructor:io.deephaven.proto.backplane.grpc.ExportNotification)
-  _internal_metadata_.Delete<::google::protobuf::UnknownFieldSet>();
-  SharedDtor();
-}
-inline void ExportNotification::SharedDtor() {
-  ABSL_DCHECK(GetArena() == nullptr);
-  _impl_.context_.Destroy();
-  _impl_.dependent_handle_.Destroy();
-  delete _impl_.ticket_;
-  _impl_.~Impl_();
-}
-
-PROTOBUF_NOINLINE void ExportNotification::Clear() {
-// @@protoc_insertion_point(message_clear_start:io.deephaven.proto.backplane.grpc.ExportNotification)
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  ::uint32_t cached_has_bits = 0;
-  // Prevent compiler warnings about cached_has_bits being unused
-  (void) cached_has_bits;
-
-  _impl_.context_.ClearToEmpty();
-  _impl_.dependent_handle_.ClearToEmpty();
-  cached_has_bits = _impl_._has_bits_[0];
-  if (cached_has_bits & 0x00000001u) {
-    ABSL_DCHECK(_impl_.ticket_ != nullptr);
-    _impl_.ticket_->Clear();
-  }
-  _impl_.export_state_ = 0;
-  _impl_._has_bits_.Clear();
-  _internal_metadata_.Clear<::google::protobuf::UnknownFieldSet>();
-}
-
-const char* ExportNotification::_InternalParse(
-    const char* ptr, ::_pbi::ParseContext* ctx) {
-  ptr = ::_pbi::TcParser::ParseLoop(this, ptr, ctx, &_table_.header);
-  return ptr;
-}
-
-
-PROTOBUF_CONSTINIT PROTOBUF_ATTRIBUTE_INIT_PRIORITY1
-const ::_pbi::TcParseTable<2, 4, 1, 84, 2> ExportNotification::_table_ = {
-  {
-    PROTOBUF_FIELD_OFFSET(ExportNotification, _impl_._has_bits_),
-    0, // no _extensions_
-    4, 24,  // max_field_number, fast_idx_mask
-    offsetof(decltype(_table_), field_lookup_table),
-    4294967280,  // skipmap
-    offsetof(decltype(_table_), field_entries),
-    4,  // num_field_entries
-    1,  // num_aux_entries
-    offsetof(decltype(_table_), aux_entries),
-    &_ExportNotification_default_instance_._instance,
-    ::_pbi::TcParser::GenericFallback,  // fallback
-  }, {{
-    // string dependent_handle = 4;
-    {::_pbi::TcParser::FastUS1,
-     {34, 63, 0, PROTOBUF_FIELD_OFFSET(ExportNotification, _impl_.dependent_handle_)}},
-    // .io.deephaven.proto.backplane.grpc.Ticket ticket = 1;
-    {::_pbi::TcParser::FastMtS1,
-     {10, 0, 0, PROTOBUF_FIELD_OFFSET(ExportNotification, _impl_.ticket_)}},
-    // .io.deephaven.proto.backplane.grpc.ExportNotification.State export_state = 2;
-    {::_pbi::TcParser::SingularVarintNoZag1<::uint32_t, offsetof(ExportNotification, _impl_.export_state_), 63>(),
-     {16, 63, 0, PROTOBUF_FIELD_OFFSET(ExportNotification, _impl_.export_state_)}},
-    // string context = 3;
-    {::_pbi::TcParser::FastUS1,
-     {26, 63, 0, PROTOBUF_FIELD_OFFSET(ExportNotification, _impl_.context_)}},
-  }}, {{
-    65535, 65535
-  }}, {{
-    // .io.deephaven.proto.backplane.grpc.Ticket ticket = 1;
-    {PROTOBUF_FIELD_OFFSET(ExportNotification, _impl_.ticket_), _Internal::kHasBitsOffset + 0, 0,
-    (0 | ::_fl::kFcOptional | ::_fl::kMessage | ::_fl::kTvTable)},
-    // .io.deephaven.proto.backplane.grpc.ExportNotification.State export_state = 2;
-    {PROTOBUF_FIELD_OFFSET(ExportNotification, _impl_.export_state_), -1, 0,
-    (0 | ::_fl::kFcSingular | ::_fl::kOpenEnum)},
-    // string context = 3;
-    {PROTOBUF_FIELD_OFFSET(ExportNotification, _impl_.context_), -1, 0,
-    (0 | ::_fl::kFcSingular | ::_fl::kUtf8String | ::_fl::kRepAString)},
-    // string dependent_handle = 4;
-    {PROTOBUF_FIELD_OFFSET(ExportNotification, _impl_.dependent_handle_), -1, 0,
-    (0 | ::_fl::kFcSingular | ::_fl::kUtf8String | ::_fl::kRepAString)},
-  }}, {{
-    {::_pbi::TcParser::GetTable<::io::deephaven::proto::backplane::grpc::Ticket>()},
-  }}, {{
-    "\64\0\0\7\20\0\0\0"
-    "io.deephaven.proto.backplane.grpc.ExportNotification"
-    "context"
-    "dependent_handle"
-  }},
-};
-
-::uint8_t* ExportNotification::_InternalSerialize(
-    ::uint8_t* target,
-    ::google::protobuf::io::EpsCopyOutputStream* stream) const {
-  // @@protoc_insertion_point(serialize_to_array_start:io.deephaven.proto.backplane.grpc.ExportNotification)
-  ::uint32_t cached_has_bits = 0;
-  (void)cached_has_bits;
-
-  cached_has_bits = _impl_._has_bits_[0];
-  // .io.deephaven.proto.backplane.grpc.Ticket ticket = 1;
-  if (cached_has_bits & 0x00000001u) {
-    target = ::google::protobuf::internal::WireFormatLite::InternalWriteMessage(
-        1, _Internal::ticket(this),
-        _Internal::ticket(this).GetCachedSize(), target, stream);
-  }
-
-  // .io.deephaven.proto.backplane.grpc.ExportNotification.State export_state = 2;
-  if (this->_internal_export_state() != 0) {
-    target = stream->EnsureSpace(target);
-    target = ::_pbi::WireFormatLite::WriteEnumToArray(
-        2, this->_internal_export_state(), target);
-  }
-
-  // string context = 3;
-  if (!this->_internal_context().empty()) {
-    const std::string& _s = this->_internal_context();
-    ::google::protobuf::internal::WireFormatLite::VerifyUtf8String(
-        _s.data(), static_cast<int>(_s.length()), ::google::protobuf::internal::WireFormatLite::SERIALIZE, "io.deephaven.proto.backplane.grpc.ExportNotification.context");
-    target = stream->WriteStringMaybeAliased(3, _s, target);
-  }
-
-  // string dependent_handle = 4;
-  if (!this->_internal_dependent_handle().empty()) {
-    const std::string& _s = this->_internal_dependent_handle();
-    ::google::protobuf::internal::WireFormatLite::VerifyUtf8String(
-        _s.data(), static_cast<int>(_s.length()), ::google::protobuf::internal::WireFormatLite::SERIALIZE, "io.deephaven.proto.backplane.grpc.ExportNotification.dependent_handle");
-    target = stream->WriteStringMaybeAliased(4, _s, target);
-  }
-
-  if (PROTOBUF_PREDICT_FALSE(_internal_metadata_.have_unknown_fields())) {
-    target =
-        ::_pbi::WireFormat::InternalSerializeUnknownFieldsToArray(
-            _internal_metadata_.unknown_fields<::google::protobuf::UnknownFieldSet>(::google::protobuf::UnknownFieldSet::default_instance), target, stream);
-  }
-  // @@protoc_insertion_point(serialize_to_array_end:io.deephaven.proto.backplane.grpc.ExportNotification)
-  return target;
-}
-
-::size_t ExportNotification::ByteSizeLong() const {
-// @@protoc_insertion_point(message_byte_size_start:io.deephaven.proto.backplane.grpc.ExportNotification)
-  ::size_t total_size = 0;
-
-  ::uint32_t cached_has_bits = 0;
-  // Prevent compiler warnings about cached_has_bits being unused
-  (void) cached_has_bits;
-
-  // string context = 3;
-  if (!this->_internal_context().empty()) {
-    total_size += 1 + ::google::protobuf::internal::WireFormatLite::StringSize(
-                                    this->_internal_context());
-  }
-
-  // string dependent_handle = 4;
-  if (!this->_internal_dependent_handle().empty()) {
-    total_size += 1 + ::google::protobuf::internal::WireFormatLite::StringSize(
-                                    this->_internal_dependent_handle());
-  }
-
-  // .io.deephaven.proto.backplane.grpc.Ticket ticket = 1;
-  cached_has_bits = _impl_._has_bits_[0];
-  if (cached_has_bits & 0x00000001u) {
-    total_size +=
-        1 + ::google::protobuf::internal::WireFormatLite::MessageSize(*_impl_.ticket_);
-  }
-
-  // .io.deephaven.proto.backplane.grpc.ExportNotification.State export_state = 2;
-  if (this->_internal_export_state() != 0) {
-    total_size += 1 +
-                  ::_pbi::WireFormatLite::EnumSize(this->_internal_export_state());
-  }
-
-  return MaybeComputeUnknownFieldsSize(total_size, &_impl_._cached_size_);
-}
-
-const ::google::protobuf::Message::ClassData ExportNotification::_class_data_ = {
-    ExportNotification::MergeImpl,
-    nullptr,  // OnDemandRegisterArenaDtor
-};
-const ::google::protobuf::Message::ClassData* ExportNotification::GetClassData() const {
-  return &_class_data_;
-}
-
-void ExportNotification::MergeImpl(::google::protobuf::Message& to_msg, const ::google::protobuf::Message& from_msg) {
-  auto* const _this = static_cast<ExportNotification*>(&to_msg);
-  auto& from = static_cast<const ExportNotification&>(from_msg);
-  // @@protoc_insertion_point(class_specific_merge_from_start:io.deephaven.proto.backplane.grpc.ExportNotification)
-  ABSL_DCHECK_NE(&from, _this);
-  ::uint32_t cached_has_bits = 0;
-  (void) cached_has_bits;
-
-  if (!from._internal_context().empty()) {
-    _this->_internal_set_context(from._internal_context());
-  }
-  if (!from._internal_dependent_handle().empty()) {
-    _this->_internal_set_dependent_handle(from._internal_dependent_handle());
-  }
-  if ((from._impl_._has_bits_[0] & 0x00000001u) != 0) {
-    _this->_internal_mutable_ticket()->::io::deephaven::proto::backplane::grpc::Ticket::MergeFrom(
-        from._internal_ticket());
-  }
-  if (from._internal_export_state() != 0) {
-    _this->_internal_set_export_state(from._internal_export_state());
-  }
-  _this->_internal_metadata_.MergeFrom<::google::protobuf::UnknownFieldSet>(from._internal_metadata_);
-}
-
-void ExportNotification::CopyFrom(const ExportNotification& from) {
-// @@protoc_insertion_point(class_specific_copy_from_start:io.deephaven.proto.backplane.grpc.ExportNotification)
-  if (&from == this) return;
-  Clear();
-  MergeFrom(from);
-}
-
-PROTOBUF_NOINLINE bool ExportNotification::IsInitialized() const {
-  return true;
-}
-
-::_pbi::CachedSize* ExportNotification::AccessCachedSize() const {
-  return &_impl_._cached_size_;
-}
-void ExportNotification::InternalSwap(ExportNotification* PROTOBUF_RESTRICT other) {
-  using std::swap;
-  auto* arena = GetArena();
-  ABSL_DCHECK_EQ(arena, other->GetArena());
-  _internal_metadata_.InternalSwap(&other->_internal_metadata_);
-  swap(_impl_._has_bits_[0], other->_impl_._has_bits_[0]);
-  ::_pbi::ArenaStringPtr::InternalSwap(&_impl_.context_, &other->_impl_.context_, arena);
-  ::_pbi::ArenaStringPtr::InternalSwap(&_impl_.dependent_handle_, &other->_impl_.dependent_handle_, arena);
-  ::google::protobuf::internal::memswap<
-      PROTOBUF_FIELD_OFFSET(ExportNotification, _impl_.export_state_)
-      + sizeof(ExportNotification::_impl_.export_state_)
-      - PROTOBUF_FIELD_OFFSET(ExportNotification, _impl_.ticket_)>(
-          reinterpret_cast<char*>(&_impl_.ticket_),
-          reinterpret_cast<char*>(&other->_impl_.ticket_));
-}
-
-::google::protobuf::Metadata ExportNotification::GetMetadata() const {
-  return ::_pbi::AssignDescriptors(
-      &descriptor_table_deephaven_2fproto_2fsession_2eproto_getter, &descriptor_table_deephaven_2fproto_2fsession_2eproto_once,
-      file_level_metadata_deephaven_2fproto_2fsession_2eproto[11]);
-}
-// ===================================================================
-
-class TerminationNotificationRequest::_Internal {
- public:
-};
-
-TerminationNotificationRequest::TerminationNotificationRequest(::google::protobuf::Arena* arena)
-    : ::google::protobuf::internal::ZeroFieldsBase(arena) {
-  // @@protoc_insertion_point(arena_constructor:io.deephaven.proto.backplane.grpc.TerminationNotificationRequest)
-}
-TerminationNotificationRequest::TerminationNotificationRequest(
-    ::google::protobuf::Arena* arena,
-    const TerminationNotificationRequest& from)
-    : ::google::protobuf::internal::ZeroFieldsBase(arena) {
-  TerminationNotificationRequest* const _this = this;
-  (void)_this;
-  _internal_metadata_.MergeFrom<::google::protobuf::UnknownFieldSet>(
-      from._internal_metadata_);
-
-  // @@protoc_insertion_point(copy_constructor:io.deephaven.proto.backplane.grpc.TerminationNotificationRequest)
-}
-
-
-
-
-
-
-
-
-
-::google::protobuf::Metadata TerminationNotificationRequest::GetMetadata() const {
-  return ::_pbi::AssignDescriptors(
-      &descriptor_table_deephaven_2fproto_2fsession_2eproto_getter, &descriptor_table_deephaven_2fproto_2fsession_2eproto_once,
-      file_level_metadata_deephaven_2fproto_2fsession_2eproto[12]);
-}
-// ===================================================================
-
-class TerminationNotificationResponse_StackTrace::_Internal {
- public:
-};
-
-TerminationNotificationResponse_StackTrace::TerminationNotificationResponse_StackTrace(::google::protobuf::Arena* arena)
-    : ::google::protobuf::Message(arena) {
-  SharedCtor(arena);
-  // @@protoc_insertion_point(arena_constructor:io.deephaven.proto.backplane.grpc.TerminationNotificationResponse.StackTrace)
-}
-inline PROTOBUF_NDEBUG_INLINE TerminationNotificationResponse_StackTrace::Impl_::Impl_(
-    ::google::protobuf::internal::InternalVisibility visibility, ::google::protobuf::Arena* arena,
-    const Impl_& from)
-      : elements_{visibility, arena, from.elements_},
-        type_(arena, from.type_),
-        message_(arena, from.message_),
-        _cached_size_{0} {}
-
-TerminationNotificationResponse_StackTrace::TerminationNotificationResponse_StackTrace(
-    ::google::protobuf::Arena* arena,
-    const TerminationNotificationResponse_StackTrace& from)
-    : ::google::protobuf::Message(arena) {
-  TerminationNotificationResponse_StackTrace* const _this = this;
-  (void)_this;
-  _internal_metadata_.MergeFrom<::google::protobuf::UnknownFieldSet>(
-      from._internal_metadata_);
-  new (&_impl_) Impl_(internal_visibility(), arena, from._impl_);
-
-  // @@protoc_insertion_point(copy_constructor:io.deephaven.proto.backplane.grpc.TerminationNotificationResponse.StackTrace)
-}
-inline PROTOBUF_NDEBUG_INLINE TerminationNotificationResponse_StackTrace::Impl_::Impl_(
-    ::google::protobuf::internal::InternalVisibility visibility,
-    ::google::protobuf::Arena* arena)
-      : elements_{visibility, arena},
-        type_(arena),
-        message_(arena),
-        _cached_size_{0} {}
-
-inline void TerminationNotificationResponse_StackTrace::SharedCtor(::_pb::Arena* arena) {
-  new (&_impl_) Impl_(internal_visibility(), arena);
-}
-TerminationNotificationResponse_StackTrace::~TerminationNotificationResponse_StackTrace() {
-  // @@protoc_insertion_point(destructor:io.deephaven.proto.backplane.grpc.TerminationNotificationResponse.StackTrace)
-  _internal_metadata_.Delete<::google::protobuf::UnknownFieldSet>();
-  SharedDtor();
-}
-inline void TerminationNotificationResponse_StackTrace::SharedDtor() {
-  ABSL_DCHECK(GetArena() == nullptr);
-  _impl_.type_.Destroy();
-  _impl_.message_.Destroy();
-  _impl_.~Impl_();
-}
-
-PROTOBUF_NOINLINE void TerminationNotificationResponse_StackTrace::Clear() {
-// @@protoc_insertion_point(message_clear_start:io.deephaven.proto.backplane.grpc.TerminationNotificationResponse.StackTrace)
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  ::uint32_t cached_has_bits = 0;
-  // Prevent compiler warnings about cached_has_bits being unused
-  (void) cached_has_bits;
-
-  _impl_.elements_.Clear();
-  _impl_.type_.ClearToEmpty();
-  _impl_.message_.ClearToEmpty();
-  _internal_metadata_.Clear<::google::protobuf::UnknownFieldSet>();
-}
-
-const char* TerminationNotificationResponse_StackTrace::_InternalParse(
-    const char* ptr, ::_pbi::ParseContext* ctx) {
-  ptr = ::_pbi::TcParser::ParseLoop(this, ptr, ctx, &_table_.header);
-  return ptr;
-}
-
-
-PROTOBUF_CONSTINIT PROTOBUF_ATTRIBUTE_INIT_PRIORITY1
-const ::_pbi::TcParseTable<2, 3, 0, 104, 2> TerminationNotificationResponse_StackTrace::_table_ = {
-  {
-    0,  // no _has_bits_
-    0, // no _extensions_
-    3, 24,  // max_field_number, fast_idx_mask
-    offsetof(decltype(_table_), field_lookup_table),
-    4294967288,  // skipmap
-    offsetof(decltype(_table_), field_entries),
-    3,  // num_field_entries
-    0,  // num_aux_entries
-    offsetof(decltype(_table_), field_names),  // no aux_entries
-    &_TerminationNotificationResponse_StackTrace_default_instance_._instance,
-    ::_pbi::TcParser::GenericFallback,  // fallback
-  }, {{
-    {::_pbi::TcParser::MiniParse, {}},
-    // string type = 1;
-    {::_pbi::TcParser::FastUS1,
-     {10, 63, 0, PROTOBUF_FIELD_OFFSET(TerminationNotificationResponse_StackTrace, _impl_.type_)}},
-    // string message = 2;
-    {::_pbi::TcParser::FastUS1,
-     {18, 63, 0, PROTOBUF_FIELD_OFFSET(TerminationNotificationResponse_StackTrace, _impl_.message_)}},
-    // repeated string elements = 3;
-    {::_pbi::TcParser::FastUR1,
-     {26, 63, 0, PROTOBUF_FIELD_OFFSET(TerminationNotificationResponse_StackTrace, _impl_.elements_)}},
-  }}, {{
-    65535, 65535
-  }}, {{
-    // string type = 1;
-    {PROTOBUF_FIELD_OFFSET(TerminationNotificationResponse_StackTrace, _impl_.type_), 0, 0,
-    (0 | ::_fl::kFcSingular | ::_fl::kUtf8String | ::_fl::kRepAString)},
-    // string message = 2;
-    {PROTOBUF_FIELD_OFFSET(TerminationNotificationResponse_StackTrace, _impl_.message_), 0, 0,
-    (0 | ::_fl::kFcSingular | ::_fl::kUtf8String | ::_fl::kRepAString)},
-    // repeated string elements = 3;
-    {PROTOBUF_FIELD_OFFSET(TerminationNotificationResponse_StackTrace, _impl_.elements_), 0, 0,
-    (0 | ::_fl::kFcRepeated | ::_fl::kUtf8String | ::_fl::kRepSString)},
-  }},
-  // no aux_entries
-  {{
-    "\114\4\7\10\0\0\0\0"
-    "io.deephaven.proto.backplane.grpc.TerminationNotificationResponse.StackTrace"
-    "type"
-    "message"
-    "elements"
-  }},
-};
-
-::uint8_t* TerminationNotificationResponse_StackTrace::_InternalSerialize(
-    ::uint8_t* target,
-    ::google::protobuf::io::EpsCopyOutputStream* stream) const {
-  // @@protoc_insertion_point(serialize_to_array_start:io.deephaven.proto.backplane.grpc.TerminationNotificationResponse.StackTrace)
-  ::uint32_t cached_has_bits = 0;
-  (void)cached_has_bits;
-
-  // string type = 1;
-  if (!this->_internal_type().empty()) {
-    const std::string& _s = this->_internal_type();
-    ::google::protobuf::internal::WireFormatLite::VerifyUtf8String(
-        _s.data(), static_cast<int>(_s.length()), ::google::protobuf::internal::WireFormatLite::SERIALIZE, "io.deephaven.proto.backplane.grpc.TerminationNotificationResponse.StackTrace.type");
-    target = stream->WriteStringMaybeAliased(1, _s, target);
-  }
-
-  // string message = 2;
-  if (!this->_internal_message().empty()) {
-    const std::string& _s = this->_internal_message();
-    ::google::protobuf::internal::WireFormatLite::VerifyUtf8String(
-        _s.data(), static_cast<int>(_s.length()), ::google::protobuf::internal::WireFormatLite::SERIALIZE, "io.deephaven.proto.backplane.grpc.TerminationNotificationResponse.StackTrace.message");
-    target = stream->WriteStringMaybeAliased(2, _s, target);
-  }
-
-  // repeated string elements = 3;
-  for (int i = 0, n = this->_internal_elements_size(); i < n; ++i) {
-    const auto& s = this->_internal_elements().Get(i);
-    ::google::protobuf::internal::WireFormatLite::VerifyUtf8String(
-        s.data(), static_cast<int>(s.length()), ::google::protobuf::internal::WireFormatLite::SERIALIZE, "io.deephaven.proto.backplane.grpc.TerminationNotificationResponse.StackTrace.elements");
-    target = stream->WriteString(3, s, target);
-  }
-
-  if (PROTOBUF_PREDICT_FALSE(_internal_metadata_.have_unknown_fields())) {
-    target =
-        ::_pbi::WireFormat::InternalSerializeUnknownFieldsToArray(
-            _internal_metadata_.unknown_fields<::google::protobuf::UnknownFieldSet>(::google::protobuf::UnknownFieldSet::default_instance), target, stream);
-  }
-  // @@protoc_insertion_point(serialize_to_array_end:io.deephaven.proto.backplane.grpc.TerminationNotificationResponse.StackTrace)
-  return target;
-}
-
-::size_t TerminationNotificationResponse_StackTrace::ByteSizeLong() const {
-// @@protoc_insertion_point(message_byte_size_start:io.deephaven.proto.backplane.grpc.TerminationNotificationResponse.StackTrace)
-  ::size_t total_size = 0;
-
-  ::uint32_t cached_has_bits = 0;
-  // Prevent compiler warnings about cached_has_bits being unused
-  (void) cached_has_bits;
-
-  // repeated string elements = 3;
-  total_size += 1 * ::google::protobuf::internal::FromIntSize(_internal_elements().size());
-  for (int i = 0, n = _internal_elements().size(); i < n; ++i) {
-    total_size += ::google::protobuf::internal::WireFormatLite::StringSize(
-        _internal_elements().Get(i));
-  }
-  // string type = 1;
-  if (!this->_internal_type().empty()) {
-    total_size += 1 + ::google::protobuf::internal::WireFormatLite::StringSize(
-                                    this->_internal_type());
-  }
-
-  // string message = 2;
-  if (!this->_internal_message().empty()) {
-    total_size += 1 + ::google::protobuf::internal::WireFormatLite::StringSize(
-                                    this->_internal_message());
-  }
-
-  return MaybeComputeUnknownFieldsSize(total_size, &_impl_._cached_size_);
-}
-
-const ::google::protobuf::Message::ClassData TerminationNotificationResponse_StackTrace::_class_data_ = {
-    TerminationNotificationResponse_StackTrace::MergeImpl,
-    nullptr,  // OnDemandRegisterArenaDtor
-};
-const ::google::protobuf::Message::ClassData* TerminationNotificationResponse_StackTrace::GetClassData() const {
-  return &_class_data_;
-}
-
-void TerminationNotificationResponse_StackTrace::MergeImpl(::google::protobuf::Message& to_msg, const ::google::protobuf::Message& from_msg) {
-  auto* const _this = static_cast<TerminationNotificationResponse_StackTrace*>(&to_msg);
-  auto& from = static_cast<const TerminationNotificationResponse_StackTrace&>(from_msg);
-  // @@protoc_insertion_point(class_specific_merge_from_start:io.deephaven.proto.backplane.grpc.TerminationNotificationResponse.StackTrace)
-  ABSL_DCHECK_NE(&from, _this);
-  ::uint32_t cached_has_bits = 0;
-  (void) cached_has_bits;
-
-  _this->_internal_mutable_elements()->MergeFrom(from._internal_elements());
-  if (!from._internal_type().empty()) {
-    _this->_internal_set_type(from._internal_type());
-  }
-  if (!from._internal_message().empty()) {
-    _this->_internal_set_message(from._internal_message());
-  }
-  _this->_internal_metadata_.MergeFrom<::google::protobuf::UnknownFieldSet>(from._internal_metadata_);
-}
-
-void TerminationNotificationResponse_StackTrace::CopyFrom(const TerminationNotificationResponse_StackTrace& from) {
-// @@protoc_insertion_point(class_specific_copy_from_start:io.deephaven.proto.backplane.grpc.TerminationNotificationResponse.StackTrace)
-  if (&from == this) return;
-  Clear();
-  MergeFrom(from);
-}
-
-PROTOBUF_NOINLINE bool TerminationNotificationResponse_StackTrace::IsInitialized() const {
-  return true;
-}
-
-::_pbi::CachedSize* TerminationNotificationResponse_StackTrace::AccessCachedSize() const {
-  return &_impl_._cached_size_;
-}
-void TerminationNotificationResponse_StackTrace::InternalSwap(TerminationNotificationResponse_StackTrace* PROTOBUF_RESTRICT other) {
-  using std::swap;
-  auto* arena = GetArena();
-  ABSL_DCHECK_EQ(arena, other->GetArena());
-  _internal_metadata_.InternalSwap(&other->_internal_metadata_);
-  _impl_.elements_.InternalSwap(&other->_impl_.elements_);
-  ::_pbi::ArenaStringPtr::InternalSwap(&_impl_.type_, &other->_impl_.type_, arena);
-  ::_pbi::ArenaStringPtr::InternalSwap(&_impl_.message_, &other->_impl_.message_, arena);
-}
-
-::google::protobuf::Metadata TerminationNotificationResponse_StackTrace::GetMetadata() const {
-  return ::_pbi::AssignDescriptors(
-      &descriptor_table_deephaven_2fproto_2fsession_2eproto_getter, &descriptor_table_deephaven_2fproto_2fsession_2eproto_once,
-      file_level_metadata_deephaven_2fproto_2fsession_2eproto[13]);
-}
-// ===================================================================
-
-class TerminationNotificationResponse::_Internal {
- public:
-};
-
-TerminationNotificationResponse::TerminationNotificationResponse(::google::protobuf::Arena* arena)
-    : ::google::protobuf::Message(arena) {
-  SharedCtor(arena);
-  // @@protoc_insertion_point(arena_constructor:io.deephaven.proto.backplane.grpc.TerminationNotificationResponse)
-}
-inline PROTOBUF_NDEBUG_INLINE TerminationNotificationResponse::Impl_::Impl_(
-    ::google::protobuf::internal::InternalVisibility visibility, ::google::protobuf::Arena* arena,
-    const Impl_& from)
-      : stack_traces_{visibility, arena, from.stack_traces_},
-        reason_(arena, from.reason_),
-        _cached_size_{0} {}
-
-TerminationNotificationResponse::TerminationNotificationResponse(
-    ::google::protobuf::Arena* arena,
-    const TerminationNotificationResponse& from)
-    : ::google::protobuf::Message(arena) {
-  TerminationNotificationResponse* const _this = this;
-  (void)_this;
-  _internal_metadata_.MergeFrom<::google::protobuf::UnknownFieldSet>(
-      from._internal_metadata_);
-  new (&_impl_) Impl_(internal_visibility(), arena, from._impl_);
-  ::memcpy(reinterpret_cast<char *>(&_impl_) +
-               offsetof(Impl_, abnormal_termination_),
-           reinterpret_cast<const char *>(&from._impl_) +
-               offsetof(Impl_, abnormal_termination_),
-           offsetof(Impl_, is_from_uncaught_exception_) -
-               offsetof(Impl_, abnormal_termination_) +
-               sizeof(Impl_::is_from_uncaught_exception_));
-
-  // @@protoc_insertion_point(copy_constructor:io.deephaven.proto.backplane.grpc.TerminationNotificationResponse)
-}
-inline PROTOBUF_NDEBUG_INLINE TerminationNotificationResponse::Impl_::Impl_(
-    ::google::protobuf::internal::InternalVisibility visibility,
-    ::google::protobuf::Arena* arena)
-      : stack_traces_{visibility, arena},
-        reason_(arena),
-        _cached_size_{0} {}
-
-inline void TerminationNotificationResponse::SharedCtor(::_pb::Arena* arena) {
-  new (&_impl_) Impl_(internal_visibility(), arena);
-  ::memset(reinterpret_cast<char *>(&_impl_) +
-               offsetof(Impl_, abnormal_termination_),
-           0,
-           offsetof(Impl_, is_from_uncaught_exception_) -
-               offsetof(Impl_, abnormal_termination_) +
-               sizeof(Impl_::is_from_uncaught_exception_));
-}
-TerminationNotificationResponse::~TerminationNotificationResponse() {
-  // @@protoc_insertion_point(destructor:io.deephaven.proto.backplane.grpc.TerminationNotificationResponse)
-  _internal_metadata_.Delete<::google::protobuf::UnknownFieldSet>();
-  SharedDtor();
-}
-inline void TerminationNotificationResponse::SharedDtor() {
-  ABSL_DCHECK(GetArena() == nullptr);
-  _impl_.reason_.Destroy();
-  _impl_.~Impl_();
-}
-
-PROTOBUF_NOINLINE void TerminationNotificationResponse::Clear() {
-// @@protoc_insertion_point(message_clear_start:io.deephaven.proto.backplane.grpc.TerminationNotificationResponse)
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  ::uint32_t cached_has_bits = 0;
-  // Prevent compiler warnings about cached_has_bits being unused
-  (void) cached_has_bits;
-
-  _impl_.stack_traces_.Clear();
-  _impl_.reason_.ClearToEmpty();
-  ::memset(&_impl_.abnormal_termination_, 0, static_cast<::size_t>(
-      reinterpret_cast<char*>(&_impl_.is_from_uncaught_exception_) -
-      reinterpret_cast<char*>(&_impl_.abnormal_termination_)) + sizeof(_impl_.is_from_uncaught_exception_));
-  _internal_metadata_.Clear<::google::protobuf::UnknownFieldSet>();
-}
-
-const char* TerminationNotificationResponse::_InternalParse(
-    const char* ptr, ::_pbi::ParseContext* ctx) {
-  ptr = ::_pbi::TcParser::ParseLoop(this, ptr, ctx, &_table_.header);
-  return ptr;
-}
-
-
-PROTOBUF_CONSTINIT PROTOBUF_ATTRIBUTE_INIT_PRIORITY1
-const ::_pbi::TcParseTable<2, 4, 1, 80, 2> TerminationNotificationResponse::_table_ = {
-  {
-    0,  // no _has_bits_
-    0, // no _extensions_
-    4, 24,  // max_field_number, fast_idx_mask
-    offsetof(decltype(_table_), field_lookup_table),
-    4294967280,  // skipmap
-    offsetof(decltype(_table_), field_entries),
-    4,  // num_field_entries
-    1,  // num_aux_entries
-    offsetof(decltype(_table_), aux_entries),
-    &_TerminationNotificationResponse_default_instance_._instance,
-    ::_pbi::TcParser::GenericFallback,  // fallback
-  }, {{
-    // repeated .io.deephaven.proto.backplane.grpc.TerminationNotificationResponse.StackTrace stack_traces = 4;
-    {::_pbi::TcParser::FastMtR1,
-     {34, 63, 0, PROTOBUF_FIELD_OFFSET(TerminationNotificationResponse, _impl_.stack_traces_)}},
-    // bool abnormal_termination = 1;
-    {::_pbi::TcParser::SingularVarintNoZag1<bool, offsetof(TerminationNotificationResponse, _impl_.abnormal_termination_), 63>(),
-     {8, 63, 0, PROTOBUF_FIELD_OFFSET(TerminationNotificationResponse, _impl_.abnormal_termination_)}},
-    // string reason = 2;
-    {::_pbi::TcParser::FastUS1,
-     {18, 63, 0, PROTOBUF_FIELD_OFFSET(TerminationNotificationResponse, _impl_.reason_)}},
-    // bool is_from_uncaught_exception = 3;
-    {::_pbi::TcParser::SingularVarintNoZag1<bool, offsetof(TerminationNotificationResponse, _impl_.is_from_uncaught_exception_), 63>(),
-     {24, 63, 0, PROTOBUF_FIELD_OFFSET(TerminationNotificationResponse, _impl_.is_from_uncaught_exception_)}},
-  }}, {{
-    65535, 65535
-  }}, {{
-    // bool abnormal_termination = 1;
-    {PROTOBUF_FIELD_OFFSET(TerminationNotificationResponse, _impl_.abnormal_termination_), 0, 0,
-    (0 | ::_fl::kFcSingular | ::_fl::kBool)},
-    // string reason = 2;
-    {PROTOBUF_FIELD_OFFSET(TerminationNotificationResponse, _impl_.reason_), 0, 0,
-    (0 | ::_fl::kFcSingular | ::_fl::kUtf8String | ::_fl::kRepAString)},
-    // bool is_from_uncaught_exception = 3;
-    {PROTOBUF_FIELD_OFFSET(TerminationNotificationResponse, _impl_.is_from_uncaught_exception_), 0, 0,
-    (0 | ::_fl::kFcSingular | ::_fl::kBool)},
-    // repeated .io.deephaven.proto.backplane.grpc.TerminationNotificationResponse.StackTrace stack_traces = 4;
-    {PROTOBUF_FIELD_OFFSET(TerminationNotificationResponse, _impl_.stack_traces_), 0, 0,
-    (0 | ::_fl::kFcRepeated | ::_fl::kMessage | ::_fl::kTvTable)},
-  }}, {{
-    {::_pbi::TcParser::GetTable<::io::deephaven::proto::backplane::grpc::TerminationNotificationResponse_StackTrace>()},
-  }}, {{
-    "\101\0\6\0\0\0\0\0"
-    "io.deephaven.proto.backplane.grpc.TerminationNotificationResponse"
-    "reason"
-  }},
-};
-
-::uint8_t* TerminationNotificationResponse::_InternalSerialize(
-    ::uint8_t* target,
-    ::google::protobuf::io::EpsCopyOutputStream* stream) const {
-  // @@protoc_insertion_point(serialize_to_array_start:io.deephaven.proto.backplane.grpc.TerminationNotificationResponse)
-  ::uint32_t cached_has_bits = 0;
-  (void)cached_has_bits;
-
-  // bool abnormal_termination = 1;
-  if (this->_internal_abnormal_termination() != 0) {
-    target = stream->EnsureSpace(target);
-    target = ::_pbi::WireFormatLite::WriteBoolToArray(
-        1, this->_internal_abnormal_termination(), target);
-  }
-
-  // string reason = 2;
-  if (!this->_internal_reason().empty()) {
-    const std::string& _s = this->_internal_reason();
-    ::google::protobuf::internal::WireFormatLite::VerifyUtf8String(
-        _s.data(), static_cast<int>(_s.length()), ::google::protobuf::internal::WireFormatLite::SERIALIZE, "io.deephaven.proto.backplane.grpc.TerminationNotificationResponse.reason");
-    target = stream->WriteStringMaybeAliased(2, _s, target);
-  }
-
-  // bool is_from_uncaught_exception = 3;
-  if (this->_internal_is_from_uncaught_exception() != 0) {
-    target = stream->EnsureSpace(target);
-    target = ::_pbi::WireFormatLite::WriteBoolToArray(
-        3, this->_internal_is_from_uncaught_exception(), target);
-  }
-
-  // repeated .io.deephaven.proto.backplane.grpc.TerminationNotificationResponse.StackTrace stack_traces = 4;
-  for (unsigned i = 0,
-      n = static_cast<unsigned>(this->_internal_stack_traces_size()); i < n; i++) {
-    const auto& repfield = this->_internal_stack_traces().Get(i);
-    target = ::google::protobuf::internal::WireFormatLite::
-        InternalWriteMessage(4, repfield, repfield.GetCachedSize(), target, stream);
-  }
-
-  if (PROTOBUF_PREDICT_FALSE(_internal_metadata_.have_unknown_fields())) {
-    target =
-        ::_pbi::WireFormat::InternalSerializeUnknownFieldsToArray(
-            _internal_metadata_.unknown_fields<::google::protobuf::UnknownFieldSet>(::google::protobuf::UnknownFieldSet::default_instance), target, stream);
-  }
-  // @@protoc_insertion_point(serialize_to_array_end:io.deephaven.proto.backplane.grpc.TerminationNotificationResponse)
-  return target;
-}
-
-::size_t TerminationNotificationResponse::ByteSizeLong() const {
-// @@protoc_insertion_point(message_byte_size_start:io.deephaven.proto.backplane.grpc.TerminationNotificationResponse)
-  ::size_t total_size = 0;
-
-  ::uint32_t cached_has_bits = 0;
-  // Prevent compiler warnings about cached_has_bits being unused
-  (void) cached_has_bits;
-
-  // repeated .io.deephaven.proto.backplane.grpc.TerminationNotificationResponse.StackTrace stack_traces = 4;
-  total_size += 1UL * this->_internal_stack_traces_size();
-  for (const auto& msg : this->_internal_stack_traces()) {
-    total_size +=
-      ::google::protobuf::internal::WireFormatLite::MessageSize(msg);
-  }
-  // string reason = 2;
-  if (!this->_internal_reason().empty()) {
-    total_size += 1 + ::google::protobuf::internal::WireFormatLite::StringSize(
-                                    this->_internal_reason());
-  }
-
-  // bool abnormal_termination = 1;
-  if (this->_internal_abnormal_termination() != 0) {
-    total_size += 2;
-  }
-
-  // bool is_from_uncaught_exception = 3;
-  if (this->_internal_is_from_uncaught_exception() != 0) {
-    total_size += 2;
-  }
-
-  return MaybeComputeUnknownFieldsSize(total_size, &_impl_._cached_size_);
-}
-
-const ::google::protobuf::Message::ClassData TerminationNotificationResponse::_class_data_ = {
-    TerminationNotificationResponse::MergeImpl,
-    nullptr,  // OnDemandRegisterArenaDtor
-};
-const ::google::protobuf::Message::ClassData* TerminationNotificationResponse::GetClassData() const {
-  return &_class_data_;
-}
-
-void TerminationNotificationResponse::MergeImpl(::google::protobuf::Message& to_msg, const ::google::protobuf::Message& from_msg) {
-  auto* const _this = static_cast<TerminationNotificationResponse*>(&to_msg);
-  auto& from = static_cast<const TerminationNotificationResponse&>(from_msg);
-  // @@protoc_insertion_point(class_specific_merge_from_start:io.deephaven.proto.backplane.grpc.TerminationNotificationResponse)
-  ABSL_DCHECK_NE(&from, _this);
-  ::uint32_t cached_has_bits = 0;
-  (void) cached_has_bits;
-
-  _this->_internal_mutable_stack_traces()->MergeFrom(
-      from._internal_stack_traces());
-  if (!from._internal_reason().empty()) {
-    _this->_internal_set_reason(from._internal_reason());
-  }
-  if (from._internal_abnormal_termination() != 0) {
-    _this->_internal_set_abnormal_termination(from._internal_abnormal_termination());
-  }
-  if (from._internal_is_from_uncaught_exception() != 0) {
-    _this->_internal_set_is_from_uncaught_exception(from._internal_is_from_uncaught_exception());
-  }
-  _this->_internal_metadata_.MergeFrom<::google::protobuf::UnknownFieldSet>(from._internal_metadata_);
-}
-
-void TerminationNotificationResponse::CopyFrom(const TerminationNotificationResponse& from) {
-// @@protoc_insertion_point(class_specific_copy_from_start:io.deephaven.proto.backplane.grpc.TerminationNotificationResponse)
-  if (&from == this) return;
-  Clear();
-  MergeFrom(from);
-}
-
-PROTOBUF_NOINLINE bool TerminationNotificationResponse::IsInitialized() const {
-  return true;
-}
-
-::_pbi::CachedSize* TerminationNotificationResponse::AccessCachedSize() const {
-  return &_impl_._cached_size_;
-}
-void TerminationNotificationResponse::InternalSwap(TerminationNotificationResponse* PROTOBUF_RESTRICT other) {
-  using std::swap;
-  auto* arena = GetArena();
-  ABSL_DCHECK_EQ(arena, other->GetArena());
-  _internal_metadata_.InternalSwap(&other->_internal_metadata_);
-  _impl_.stack_traces_.InternalSwap(&other->_impl_.stack_traces_);
-  ::_pbi::ArenaStringPtr::InternalSwap(&_impl_.reason_, &other->_impl_.reason_, arena);
-  ::google::protobuf::internal::memswap<
-      PROTOBUF_FIELD_OFFSET(TerminationNotificationResponse, _impl_.is_from_uncaught_exception_)
-      + sizeof(TerminationNotificationResponse::_impl_.is_from_uncaught_exception_)
-      - PROTOBUF_FIELD_OFFSET(TerminationNotificationResponse, _impl_.abnormal_termination_)>(
-          reinterpret_cast<char*>(&_impl_.abnormal_termination_),
-          reinterpret_cast<char*>(&other->_impl_.abnormal_termination_));
-}
-
-::google::protobuf::Metadata TerminationNotificationResponse::GetMetadata() const {
-  return ::_pbi::AssignDescriptors(
-      &descriptor_table_deephaven_2fproto_2fsession_2eproto_getter, &descriptor_table_deephaven_2fproto_2fsession_2eproto_once,
-      file_level_metadata_deephaven_2fproto_2fsession_2eproto[14]);
-}
-// @@protoc_insertion_point(namespace_scope)
-}  // namespace grpc
-}  // namespace backplane
-}  // namespace proto
-}  // namespace deephaven
-}  // namespace io
-namespace google {
-namespace protobuf {
-}  // namespace protobuf
-}  // namespace google
-// @@protoc_insertion_point(global_scope)
-#include "google/protobuf/port_undef.inc"
diff --git a/cpp-client/deephaven/dhclient/proto/deephaven/proto/session.pb.h b/cpp-client/deephaven/dhclient/proto/deephaven/proto/session.pb.h
deleted file mode 100644
index 9db26ca460d..00000000000
--- a/cpp-client/deephaven/dhclient/proto/deephaven/proto/session.pb.h
+++ /dev/null
@@ -1,4365 +0,0 @@
-// Generated by the protocol buffer compiler.  DO NOT EDIT!
-// source: deephaven/proto/session.proto
-// Protobuf C++ Version: 4.25.3
-
-#ifndef GOOGLE_PROTOBUF_INCLUDED_deephaven_2fproto_2fsession_2eproto_2epb_2eh
-#define GOOGLE_PROTOBUF_INCLUDED_deephaven_2fproto_2fsession_2eproto_2epb_2eh
-
-#include <limits>
-#include <string>
-#include <type_traits>
-#include <utility>
-
-#include "google/protobuf/port_def.inc"
-#if PROTOBUF_VERSION < 4025000
-#error "This file was generated by a newer version of protoc which is"
-#error "incompatible with your Protocol Buffer headers. Please update"
-#error "your headers."
-#endif  // PROTOBUF_VERSION
-
-#if 4025003 < PROTOBUF_MIN_PROTOC_VERSION
-#error "This file was generated by an older version of protoc which is"
-#error "incompatible with your Protocol Buffer headers. Please"
-#error "regenerate this file with a newer version of protoc."
-#endif  // PROTOBUF_MIN_PROTOC_VERSION
-#include "google/protobuf/port_undef.inc"
-#include "google/protobuf/io/coded_stream.h"
-#include "google/protobuf/arena.h"
-#include "google/protobuf/arenastring.h"
-#include "google/protobuf/generated_message_bases.h"
-#include "google/protobuf/generated_message_tctable_decl.h"
-#include "google/protobuf/generated_message_util.h"
-#include "google/protobuf/metadata_lite.h"
-#include "google/protobuf/generated_message_reflection.h"
-#include "google/protobuf/message.h"
-#include "google/protobuf/repeated_field.h"  // IWYU pragma: export
-#include "google/protobuf/extension_set.h"  // IWYU pragma: export
-#include "google/protobuf/generated_enum_reflection.h"
-#include "google/protobuf/unknown_field_set.h"
-#include "deephaven/proto/ticket.pb.h"
-// @@protoc_insertion_point(includes)
-
-// Must be included last.
-#include "google/protobuf/port_def.inc"
-
-#define PROTOBUF_INTERNAL_EXPORT_deephaven_2fproto_2fsession_2eproto
-
-namespace google {
-namespace protobuf {
-namespace internal {
-class AnyMetadata;
-}  // namespace internal
-}  // namespace protobuf
-}  // namespace google
-
-// Internal implementation detail -- do not use these members.
-struct TableStruct_deephaven_2fproto_2fsession_2eproto {
-  static const ::uint32_t offsets[];
-};
-extern const ::google::protobuf::internal::DescriptorTable
-    descriptor_table_deephaven_2fproto_2fsession_2eproto;
-namespace io {
-namespace deephaven {
-namespace proto {
-namespace backplane {
-namespace grpc {
-class CloseSessionResponse;
-struct CloseSessionResponseDefaultTypeInternal;
-extern CloseSessionResponseDefaultTypeInternal _CloseSessionResponse_default_instance_;
-class ExportNotification;
-struct ExportNotificationDefaultTypeInternal;
-extern ExportNotificationDefaultTypeInternal _ExportNotification_default_instance_;
-class ExportNotificationRequest;
-struct ExportNotificationRequestDefaultTypeInternal;
-extern ExportNotificationRequestDefaultTypeInternal _ExportNotificationRequest_default_instance_;
-class ExportRequest;
-struct ExportRequestDefaultTypeInternal;
-extern ExportRequestDefaultTypeInternal _ExportRequest_default_instance_;
-class ExportResponse;
-struct ExportResponseDefaultTypeInternal;
-extern ExportResponseDefaultTypeInternal _ExportResponse_default_instance_;
-class HandshakeRequest;
-struct HandshakeRequestDefaultTypeInternal;
-extern HandshakeRequestDefaultTypeInternal _HandshakeRequest_default_instance_;
-class HandshakeResponse;
-struct HandshakeResponseDefaultTypeInternal;
-extern HandshakeResponseDefaultTypeInternal _HandshakeResponse_default_instance_;
-class PublishRequest;
-struct PublishRequestDefaultTypeInternal;
-extern PublishRequestDefaultTypeInternal _PublishRequest_default_instance_;
-class PublishResponse;
-struct PublishResponseDefaultTypeInternal;
-extern PublishResponseDefaultTypeInternal _PublishResponse_default_instance_;
-class ReleaseRequest;
-struct ReleaseRequestDefaultTypeInternal;
-extern ReleaseRequestDefaultTypeInternal _ReleaseRequest_default_instance_;
-class ReleaseResponse;
-struct ReleaseResponseDefaultTypeInternal;
-extern ReleaseResponseDefaultTypeInternal _ReleaseResponse_default_instance_;
-class TerminationNotificationRequest;
-struct TerminationNotificationRequestDefaultTypeInternal;
-extern TerminationNotificationRequestDefaultTypeInternal _TerminationNotificationRequest_default_instance_;
-class TerminationNotificationResponse;
-struct TerminationNotificationResponseDefaultTypeInternal;
-extern TerminationNotificationResponseDefaultTypeInternal _TerminationNotificationResponse_default_instance_;
-class TerminationNotificationResponse_StackTrace;
-struct TerminationNotificationResponse_StackTraceDefaultTypeInternal;
-extern TerminationNotificationResponse_StackTraceDefaultTypeInternal _TerminationNotificationResponse_StackTrace_default_instance_;
-class WrappedAuthenticationRequest;
-struct WrappedAuthenticationRequestDefaultTypeInternal;
-extern WrappedAuthenticationRequestDefaultTypeInternal _WrappedAuthenticationRequest_default_instance_;
-}  // namespace grpc
-}  // namespace backplane
-}  // namespace proto
-}  // namespace deephaven
-}  // namespace io
-namespace google {
-namespace protobuf {
-}  // namespace protobuf
-}  // namespace google
-
-namespace io {
-namespace deephaven {
-namespace proto {
-namespace backplane {
-namespace grpc {
-enum ExportNotification_State : int {
-  ExportNotification_State_UNKNOWN = 0,
-  ExportNotification_State_PENDING = 1,
-  ExportNotification_State_PUBLISHING = 2,
-  ExportNotification_State_QUEUED = 3,
-  ExportNotification_State_RUNNING = 4,
-  ExportNotification_State_EXPORTED = 5,
-  ExportNotification_State_RELEASED = 6,
-  ExportNotification_State_CANCELLED = 7,
-  ExportNotification_State_FAILED = 8,
-  ExportNotification_State_DEPENDENCY_FAILED = 9,
-  ExportNotification_State_DEPENDENCY_NEVER_FOUND = 10,
-  ExportNotification_State_DEPENDENCY_CANCELLED = 11,
-  ExportNotification_State_DEPENDENCY_RELEASED = 12,
-  ExportNotification_State_ExportNotification_State_INT_MIN_SENTINEL_DO_NOT_USE_ =
-      std::numeric_limits<::int32_t>::min(),
-  ExportNotification_State_ExportNotification_State_INT_MAX_SENTINEL_DO_NOT_USE_ =
-      std::numeric_limits<::int32_t>::max(),
-};
-
-bool ExportNotification_State_IsValid(int value);
-extern const uint32_t ExportNotification_State_internal_data_[];
-constexpr ExportNotification_State ExportNotification_State_State_MIN = static_cast<ExportNotification_State>(0);
-constexpr ExportNotification_State ExportNotification_State_State_MAX = static_cast<ExportNotification_State>(12);
-constexpr int ExportNotification_State_State_ARRAYSIZE = 12 + 1;
-const ::google::protobuf::EnumDescriptor*
-ExportNotification_State_descriptor();
-template <typename T>
-const std::string& ExportNotification_State_Name(T value) {
-  static_assert(std::is_same<T, ExportNotification_State>::value ||
-                    std::is_integral<T>::value,
-                "Incorrect type passed to State_Name().");
-  return ExportNotification_State_Name(static_cast<ExportNotification_State>(value));
-}
-template <>
-inline const std::string& ExportNotification_State_Name(ExportNotification_State value) {
-  return ::google::protobuf::internal::NameOfDenseEnum<ExportNotification_State_descriptor,
-                                                 0, 12>(
-      static_cast<int>(value));
-}
-inline bool ExportNotification_State_Parse(absl::string_view name, ExportNotification_State* value) {
-  return ::google::protobuf::internal::ParseNamedEnum<ExportNotification_State>(
-      ExportNotification_State_descriptor(), name, value);
-}
-
-// ===================================================================
-
-
-// -------------------------------------------------------------------
-
-class WrappedAuthenticationRequest final :
-    public ::google::protobuf::Message /* @@protoc_insertion_point(class_definition:io.deephaven.proto.backplane.grpc.WrappedAuthenticationRequest) */ {
- public:
-  inline WrappedAuthenticationRequest() : WrappedAuthenticationRequest(nullptr) {}
-  ~WrappedAuthenticationRequest() override;
-  template<typename = void>
-  explicit PROTOBUF_CONSTEXPR WrappedAuthenticationRequest(::google::protobuf::internal::ConstantInitialized);
-
-  inline WrappedAuthenticationRequest(const WrappedAuthenticationRequest& from)
-      : WrappedAuthenticationRequest(nullptr, from) {}
-  WrappedAuthenticationRequest(WrappedAuthenticationRequest&& from) noexcept
-    : WrappedAuthenticationRequest() {
-    *this = ::std::move(from);
-  }
-
-  inline WrappedAuthenticationRequest& operator=(const WrappedAuthenticationRequest& from) {
-    CopyFrom(from);
-    return *this;
-  }
-  inline WrappedAuthenticationRequest& operator=(WrappedAuthenticationRequest&& from) noexcept {
-    if (this == &from) return *this;
-    if (GetArena() == from.GetArena()
-  #ifdef PROTOBUF_FORCE_COPY_IN_MOVE
-        && GetArena() != nullptr
-  #endif  // !PROTOBUF_FORCE_COPY_IN_MOVE
-    ) {
-      InternalSwap(&from);
-    } else {
-      CopyFrom(from);
-    }
-    return *this;
-  }
-
-  inline const ::google::protobuf::UnknownFieldSet& unknown_fields() const
-      ABSL_ATTRIBUTE_LIFETIME_BOUND {
-    return _internal_metadata_.unknown_fields<::google::protobuf::UnknownFieldSet>(::google::protobuf::UnknownFieldSet::default_instance);
-  }
-  inline ::google::protobuf::UnknownFieldSet* mutable_unknown_fields()
-      ABSL_ATTRIBUTE_LIFETIME_BOUND {
-    return _internal_metadata_.mutable_unknown_fields<::google::protobuf::UnknownFieldSet>();
-  }
-
-  static const ::google::protobuf::Descriptor* descriptor() {
-    return GetDescriptor();
-  }
-  static const ::google::protobuf::Descriptor* GetDescriptor() {
-    return default_instance().GetMetadata().descriptor;
-  }
-  static const ::google::protobuf::Reflection* GetReflection() {
-    return default_instance().GetMetadata().reflection;
-  }
-  static const WrappedAuthenticationRequest& default_instance() {
-    return *internal_default_instance();
-  }
-  static inline const WrappedAuthenticationRequest* internal_default_instance() {
-    return reinterpret_cast<const WrappedAuthenticationRequest*>(
-               &_WrappedAuthenticationRequest_default_instance_);
-  }
-  static constexpr int kIndexInFileMessages =
-    0;
-
-  friend void swap(WrappedAuthenticationRequest& a, WrappedAuthenticationRequest& b) {
-    a.Swap(&b);
-  }
-  inline void Swap(WrappedAuthenticationRequest* other) {
-    if (other == this) return;
-  #ifdef PROTOBUF_FORCE_COPY_IN_SWAP
-    if (GetArena() != nullptr &&
-        GetArena() == other->GetArena()) {
-   #else  // PROTOBUF_FORCE_COPY_IN_SWAP
-    if (GetArena() == other->GetArena()) {
-  #endif  // !PROTOBUF_FORCE_COPY_IN_SWAP
-      InternalSwap(other);
-    } else {
-      ::google::protobuf::internal::GenericSwap(this, other);
-    }
-  }
-  void UnsafeArenaSwap(WrappedAuthenticationRequest* other) {
-    if (other == this) return;
-    ABSL_DCHECK(GetArena() == other->GetArena());
-    InternalSwap(other);
-  }
-
-  // implements Message ----------------------------------------------
-
-  WrappedAuthenticationRequest* New(::google::protobuf::Arena* arena = nullptr) const final {
-    return CreateMaybeMessage<WrappedAuthenticationRequest>(arena);
-  }
-  using ::google::protobuf::Message::CopyFrom;
-  void CopyFrom(const WrappedAuthenticationRequest& from);
-  using ::google::protobuf::Message::MergeFrom;
-  void MergeFrom( const WrappedAuthenticationRequest& from) {
-    WrappedAuthenticationRequest::MergeImpl(*this, from);
-  }
-  private:
-  static void MergeImpl(::google::protobuf::Message& to_msg, const ::google::protobuf::Message& from_msg);
-  public:
-  PROTOBUF_ATTRIBUTE_REINITIALIZES void Clear() final;
-  bool IsInitialized() const final;
-
-  ::size_t ByteSizeLong() const final;
-  const char* _InternalParse(const char* ptr, ::google::protobuf::internal::ParseContext* ctx) final;
-  ::uint8_t* _InternalSerialize(
-      ::uint8_t* target, ::google::protobuf::io::EpsCopyOutputStream* stream) const final;
-  int GetCachedSize() const { return _impl_._cached_size_.Get(); }
-
-  private:
-  ::google::protobuf::internal::CachedSize* AccessCachedSize() const final;
-  void SharedCtor(::google::protobuf::Arena* arena);
-  void SharedDtor();
-  void InternalSwap(WrappedAuthenticationRequest* other);
-
-  private:
-  friend class ::google::protobuf::internal::AnyMetadata;
-  static ::absl::string_view FullMessageName() {
-    return "io.deephaven.proto.backplane.grpc.WrappedAuthenticationRequest";
-  }
-  protected:
-  explicit WrappedAuthenticationRequest(::google::protobuf::Arena* arena);
-  WrappedAuthenticationRequest(::google::protobuf::Arena* arena, const WrappedAuthenticationRequest& from);
-  public:
-
-  static const ClassData _class_data_;
-  const ::google::protobuf::Message::ClassData*GetClassData() const final;
-
-  ::google::protobuf::Metadata GetMetadata() const final;
-
-  // nested types ----------------------------------------------------
-
-  // accessors -------------------------------------------------------
-
-  enum : int {
-    kTypeFieldNumber = 4,
-    kPayloadFieldNumber = 5,
-  };
-  // string type = 4;
-  void clear_type() ;
-  const std::string& type() const;
-  template <typename Arg_ = const std::string&, typename... Args_>
-  void set_type(Arg_&& arg, Args_... args);
-  std::string* mutable_type();
-  PROTOBUF_NODISCARD std::string* release_type();
-  void set_allocated_type(std::string* value);
-
-  private:
-  const std::string& _internal_type() const;
-  inline PROTOBUF_ALWAYS_INLINE void _internal_set_type(
-      const std::string& value);
-  std::string* _internal_mutable_type();
-
-  public:
-  // bytes payload = 5;
-  void clear_payload() ;
-  const std::string& payload() const;
-  template <typename Arg_ = const std::string&, typename... Args_>
-  void set_payload(Arg_&& arg, Args_... args);
-  std::string* mutable_payload();
-  PROTOBUF_NODISCARD std::string* release_payload();
-  void set_allocated_payload(std::string* value);
-
-  private:
-  const std::string& _internal_payload() const;
-  inline PROTOBUF_ALWAYS_INLINE void _internal_set_payload(
-      const std::string& value);
-  std::string* _internal_mutable_payload();
-
-  public:
-  // @@protoc_insertion_point(class_scope:io.deephaven.proto.backplane.grpc.WrappedAuthenticationRequest)
- private:
-  class _Internal;
-
-  friend class ::google::protobuf::internal::TcParser;
-  static const ::google::protobuf::internal::TcParseTable<
-      1, 2, 0,
-      75, 2>
-      _table_;
-  friend class ::google::protobuf::MessageLite;
-  friend class ::google::protobuf::Arena;
-  template <typename T>
-  friend class ::google::protobuf::Arena::InternalHelper;
-  using InternalArenaConstructable_ = void;
-  using DestructorSkippable_ = void;
-  struct Impl_ {
-
-        inline explicit constexpr Impl_(
-            ::google::protobuf::internal::ConstantInitialized) noexcept;
-        inline explicit Impl_(::google::protobuf::internal::InternalVisibility visibility,
-                              ::google::protobuf::Arena* arena);
-        inline explicit Impl_(::google::protobuf::internal::InternalVisibility visibility,
-                              ::google::protobuf::Arena* arena, const Impl_& from);
-    ::google::protobuf::internal::ArenaStringPtr type_;
-    ::google::protobuf::internal::ArenaStringPtr payload_;
-    mutable ::google::protobuf::internal::CachedSize _cached_size_;
-    PROTOBUF_TSAN_DECLARE_MEMBER
-  };
-  union { Impl_ _impl_; };
-  friend struct ::TableStruct_deephaven_2fproto_2fsession_2eproto;
-};// -------------------------------------------------------------------
-
-class TerminationNotificationResponse_StackTrace final :
-    public ::google::protobuf::Message /* @@protoc_insertion_point(class_definition:io.deephaven.proto.backplane.grpc.TerminationNotificationResponse.StackTrace) */ {
- public:
-  inline TerminationNotificationResponse_StackTrace() : TerminationNotificationResponse_StackTrace(nullptr) {}
-  ~TerminationNotificationResponse_StackTrace() override;
-  template<typename = void>
-  explicit PROTOBUF_CONSTEXPR TerminationNotificationResponse_StackTrace(::google::protobuf::internal::ConstantInitialized);
-
-  inline TerminationNotificationResponse_StackTrace(const TerminationNotificationResponse_StackTrace& from)
-      : TerminationNotificationResponse_StackTrace(nullptr, from) {}
-  TerminationNotificationResponse_StackTrace(TerminationNotificationResponse_StackTrace&& from) noexcept
-    : TerminationNotificationResponse_StackTrace() {
-    *this = ::std::move(from);
-  }
-
-  inline TerminationNotificationResponse_StackTrace& operator=(const TerminationNotificationResponse_StackTrace& from) {
-    CopyFrom(from);
-    return *this;
-  }
-  inline TerminationNotificationResponse_StackTrace& operator=(TerminationNotificationResponse_StackTrace&& from) noexcept {
-    if (this == &from) return *this;
-    if (GetArena() == from.GetArena()
-  #ifdef PROTOBUF_FORCE_COPY_IN_MOVE
-        && GetArena() != nullptr
-  #endif  // !PROTOBUF_FORCE_COPY_IN_MOVE
-    ) {
-      InternalSwap(&from);
-    } else {
-      CopyFrom(from);
-    }
-    return *this;
-  }
-
-  inline const ::google::protobuf::UnknownFieldSet& unknown_fields() const
-      ABSL_ATTRIBUTE_LIFETIME_BOUND {
-    return _internal_metadata_.unknown_fields<::google::protobuf::UnknownFieldSet>(::google::protobuf::UnknownFieldSet::default_instance);
-  }
-  inline ::google::protobuf::UnknownFieldSet* mutable_unknown_fields()
-      ABSL_ATTRIBUTE_LIFETIME_BOUND {
-    return _internal_metadata_.mutable_unknown_fields<::google::protobuf::UnknownFieldSet>();
-  }
-
-  static const ::google::protobuf::Descriptor* descriptor() {
-    return GetDescriptor();
-  }
-  static const ::google::protobuf::Descriptor* GetDescriptor() {
-    return default_instance().GetMetadata().descriptor;
-  }
-  static const ::google::protobuf::Reflection* GetReflection() {
-    return default_instance().GetMetadata().reflection;
-  }
-  static const TerminationNotificationResponse_StackTrace& default_instance() {
-    return *internal_default_instance();
-  }
-  static inline const TerminationNotificationResponse_StackTrace* internal_default_instance() {
-    return reinterpret_cast<const TerminationNotificationResponse_StackTrace*>(
-               &_TerminationNotificationResponse_StackTrace_default_instance_);
-  }
-  static constexpr int kIndexInFileMessages =
-    13;
-
-  friend void swap(TerminationNotificationResponse_StackTrace& a, TerminationNotificationResponse_StackTrace& b) {
-    a.Swap(&b);
-  }
-  inline void Swap(TerminationNotificationResponse_StackTrace* other) {
-    if (other == this) return;
-  #ifdef PROTOBUF_FORCE_COPY_IN_SWAP
-    if (GetArena() != nullptr &&
-        GetArena() == other->GetArena()) {
-   #else  // PROTOBUF_FORCE_COPY_IN_SWAP
-    if (GetArena() == other->GetArena()) {
-  #endif  // !PROTOBUF_FORCE_COPY_IN_SWAP
-      InternalSwap(other);
-    } else {
-      ::google::protobuf::internal::GenericSwap(this, other);
-    }
-  }
-  void UnsafeArenaSwap(TerminationNotificationResponse_StackTrace* other) {
-    if (other == this) return;
-    ABSL_DCHECK(GetArena() == other->GetArena());
-    InternalSwap(other);
-  }
-
-  // implements Message ----------------------------------------------
-
-  TerminationNotificationResponse_StackTrace* New(::google::protobuf::Arena* arena = nullptr) const final {
-    return CreateMaybeMessage<TerminationNotificationResponse_StackTrace>(arena);
-  }
-  using ::google::protobuf::Message::CopyFrom;
-  void CopyFrom(const TerminationNotificationResponse_StackTrace& from);
-  using ::google::protobuf::Message::MergeFrom;
-  void MergeFrom( const TerminationNotificationResponse_StackTrace& from) {
-    TerminationNotificationResponse_StackTrace::MergeImpl(*this, from);
-  }
-  private:
-  static void MergeImpl(::google::protobuf::Message& to_msg, const ::google::protobuf::Message& from_msg);
-  public:
-  PROTOBUF_ATTRIBUTE_REINITIALIZES void Clear() final;
-  bool IsInitialized() const final;
-
-  ::size_t ByteSizeLong() const final;
-  const char* _InternalParse(const char* ptr, ::google::protobuf::internal::ParseContext* ctx) final;
-  ::uint8_t* _InternalSerialize(
-      ::uint8_t* target, ::google::protobuf::io::EpsCopyOutputStream* stream) const final;
-  int GetCachedSize() const { return _impl_._cached_size_.Get(); }
-
-  private:
-  ::google::protobuf::internal::CachedSize* AccessCachedSize() const final;
-  void SharedCtor(::google::protobuf::Arena* arena);
-  void SharedDtor();
-  void InternalSwap(TerminationNotificationResponse_StackTrace* other);
-
-  private:
-  friend class ::google::protobuf::internal::AnyMetadata;
-  static ::absl::string_view FullMessageName() {
-    return "io.deephaven.proto.backplane.grpc.TerminationNotificationResponse.StackTrace";
-  }
-  protected:
-  explicit TerminationNotificationResponse_StackTrace(::google::protobuf::Arena* arena);
-  TerminationNotificationResponse_StackTrace(::google::protobuf::Arena* arena, const TerminationNotificationResponse_StackTrace& from);
-  public:
-
-  static const ClassData _class_data_;
-  const ::google::protobuf::Message::ClassData*GetClassData() const final;
-
-  ::google::protobuf::Metadata GetMetadata() const final;
-
-  // nested types ----------------------------------------------------
-
-  // accessors -------------------------------------------------------
-
-  enum : int {
-    kElementsFieldNumber = 3,
-    kTypeFieldNumber = 1,
-    kMessageFieldNumber = 2,
-  };
-  // repeated string elements = 3;
-  int elements_size() const;
-  private:
-  int _internal_elements_size() const;
-
-  public:
-  void clear_elements() ;
-  const std::string& elements(int index) const;
-  std::string* mutable_elements(int index);
-  void set_elements(int index, const std::string& value);
-  void set_elements(int index, std::string&& value);
-  void set_elements(int index, const char* value);
-  void set_elements(int index, const char* value, std::size_t size);
-  void set_elements(int index, absl::string_view value);
-  std::string* add_elements();
-  void add_elements(const std::string& value);
-  void add_elements(std::string&& value);
-  void add_elements(const char* value);
-  void add_elements(const char* value, std::size_t size);
-  void add_elements(absl::string_view value);
-  const ::google::protobuf::RepeatedPtrField<std::string>& elements() const;
-  ::google::protobuf::RepeatedPtrField<std::string>* mutable_elements();
-
-  private:
-  const ::google::protobuf::RepeatedPtrField<std::string>& _internal_elements() const;
-  ::google::protobuf::RepeatedPtrField<std::string>* _internal_mutable_elements();
-
-  public:
-  // string type = 1;
-  void clear_type() ;
-  const std::string& type() const;
-  template <typename Arg_ = const std::string&, typename... Args_>
-  void set_type(Arg_&& arg, Args_... args);
-  std::string* mutable_type();
-  PROTOBUF_NODISCARD std::string* release_type();
-  void set_allocated_type(std::string* value);
-
-  private:
-  const std::string& _internal_type() const;
-  inline PROTOBUF_ALWAYS_INLINE void _internal_set_type(
-      const std::string& value);
-  std::string* _internal_mutable_type();
-
-  public:
-  // string message = 2;
-  void clear_message() ;
-  const std::string& message() const;
-  template <typename Arg_ = const std::string&, typename... Args_>
-  void set_message(Arg_&& arg, Args_... args);
-  std::string* mutable_message();
-  PROTOBUF_NODISCARD std::string* release_message();
-  void set_allocated_message(std::string* value);
-
-  private:
-  const std::string& _internal_message() const;
-  inline PROTOBUF_ALWAYS_INLINE void _internal_set_message(
-      const std::string& value);
-  std::string* _internal_mutable_message();
-
-  public:
-  // @@protoc_insertion_point(class_scope:io.deephaven.proto.backplane.grpc.TerminationNotificationResponse.StackTrace)
- private:
-  class _Internal;
-
-  friend class ::google::protobuf::internal::TcParser;
-  static const ::google::protobuf::internal::TcParseTable<
-      2, 3, 0,
-      104, 2>
-      _table_;
-  friend class ::google::protobuf::MessageLite;
-  friend class ::google::protobuf::Arena;
-  template <typename T>
-  friend class ::google::protobuf::Arena::InternalHelper;
-  using InternalArenaConstructable_ = void;
-  using DestructorSkippable_ = void;
-  struct Impl_ {
-
-        inline explicit constexpr Impl_(
-            ::google::protobuf::internal::ConstantInitialized) noexcept;
-        inline explicit Impl_(::google::protobuf::internal::InternalVisibility visibility,
-                              ::google::protobuf::Arena* arena);
-        inline explicit Impl_(::google::protobuf::internal::InternalVisibility visibility,
-                              ::google::protobuf::Arena* arena, const Impl_& from);
-    ::google::protobuf::RepeatedPtrField<std::string> elements_;
-    ::google::protobuf::internal::ArenaStringPtr type_;
-    ::google::protobuf::internal::ArenaStringPtr message_;
-    mutable ::google::protobuf::internal::CachedSize _cached_size_;
-    PROTOBUF_TSAN_DECLARE_MEMBER
-  };
-  union { Impl_ _impl_; };
-  friend struct ::TableStruct_deephaven_2fproto_2fsession_2eproto;
-};// -------------------------------------------------------------------
-
-class TerminationNotificationRequest final :
-    public ::google::protobuf::internal::ZeroFieldsBase /* @@protoc_insertion_point(class_definition:io.deephaven.proto.backplane.grpc.TerminationNotificationRequest) */ {
- public:
-  inline TerminationNotificationRequest() : TerminationNotificationRequest(nullptr) {}
-  template<typename = void>
-  explicit PROTOBUF_CONSTEXPR TerminationNotificationRequest(::google::protobuf::internal::ConstantInitialized);
-
-  inline TerminationNotificationRequest(const TerminationNotificationRequest& from)
-      : TerminationNotificationRequest(nullptr, from) {}
-  TerminationNotificationRequest(TerminationNotificationRequest&& from) noexcept
-    : TerminationNotificationRequest() {
-    *this = ::std::move(from);
-  }
-
-  inline TerminationNotificationRequest& operator=(const TerminationNotificationRequest& from) {
-    CopyFrom(from);
-    return *this;
-  }
-  inline TerminationNotificationRequest& operator=(TerminationNotificationRequest&& from) noexcept {
-    if (this == &from) return *this;
-    if (GetArena() == from.GetArena()
-  #ifdef PROTOBUF_FORCE_COPY_IN_MOVE
-        && GetArena() != nullptr
-  #endif  // !PROTOBUF_FORCE_COPY_IN_MOVE
-    ) {
-      InternalSwap(&from);
-    } else {
-      CopyFrom(from);
-    }
-    return *this;
-  }
-
-  inline const ::google::protobuf::UnknownFieldSet& unknown_fields() const
-      ABSL_ATTRIBUTE_LIFETIME_BOUND {
-    return _internal_metadata_.unknown_fields<::google::protobuf::UnknownFieldSet>(::google::protobuf::UnknownFieldSet::default_instance);
-  }
-  inline ::google::protobuf::UnknownFieldSet* mutable_unknown_fields()
-      ABSL_ATTRIBUTE_LIFETIME_BOUND {
-    return _internal_metadata_.mutable_unknown_fields<::google::protobuf::UnknownFieldSet>();
-  }
-
-  static const ::google::protobuf::Descriptor* descriptor() {
-    return GetDescriptor();
-  }
-  static const ::google::protobuf::Descriptor* GetDescriptor() {
-    return default_instance().GetMetadata().descriptor;
-  }
-  static const ::google::protobuf::Reflection* GetReflection() {
-    return default_instance().GetMetadata().reflection;
-  }
-  static const TerminationNotificationRequest& default_instance() {
-    return *internal_default_instance();
-  }
-  static inline const TerminationNotificationRequest* internal_default_instance() {
-    return reinterpret_cast<const TerminationNotificationRequest*>(
-               &_TerminationNotificationRequest_default_instance_);
-  }
-  static constexpr int kIndexInFileMessages =
-    12;
-
-  friend void swap(TerminationNotificationRequest& a, TerminationNotificationRequest& b) {
-    a.Swap(&b);
-  }
-  inline void Swap(TerminationNotificationRequest* other) {
-    if (other == this) return;
-  #ifdef PROTOBUF_FORCE_COPY_IN_SWAP
-    if (GetArena() != nullptr &&
-        GetArena() == other->GetArena()) {
-   #else  // PROTOBUF_FORCE_COPY_IN_SWAP
-    if (GetArena() == other->GetArena()) {
-  #endif  // !PROTOBUF_FORCE_COPY_IN_SWAP
-      InternalSwap(other);
-    } else {
-      ::google::protobuf::internal::GenericSwap(this, other);
-    }
-  }
-  void UnsafeArenaSwap(TerminationNotificationRequest* other) {
-    if (other == this) return;
-    ABSL_DCHECK(GetArena() == other->GetArena());
-    InternalSwap(other);
-  }
-
-  // implements Message ----------------------------------------------
-
-  TerminationNotificationRequest* New(::google::protobuf::Arena* arena = nullptr) const final {
-    return CreateMaybeMessage<TerminationNotificationRequest>(arena);
-  }
-  using ::google::protobuf::internal::ZeroFieldsBase::CopyFrom;
-  inline void CopyFrom(const TerminationNotificationRequest& from) {
-    ::google::protobuf::internal::ZeroFieldsBase::CopyImpl(*this, from);
-  }
-  using ::google::protobuf::internal::ZeroFieldsBase::MergeFrom;
-  void MergeFrom(const TerminationNotificationRequest& from) {
-    ::google::protobuf::internal::ZeroFieldsBase::MergeImpl(*this, from);
-  }
-  public:
-
-  private:
-  friend class ::google::protobuf::internal::AnyMetadata;
-  static ::absl::string_view FullMessageName() {
-    return "io.deephaven.proto.backplane.grpc.TerminationNotificationRequest";
-  }
-  protected:
-  explicit TerminationNotificationRequest(::google::protobuf::Arena* arena);
-  TerminationNotificationRequest(::google::protobuf::Arena* arena, const TerminationNotificationRequest& from);
-  public:
-
-  ::google::protobuf::Metadata GetMetadata() const final;
-
-  // nested types ----------------------------------------------------
-
-  // accessors -------------------------------------------------------
-
-  // @@protoc_insertion_point(class_scope:io.deephaven.proto.backplane.grpc.TerminationNotificationRequest)
- private:
-  class _Internal;
-
-  friend class ::google::protobuf::MessageLite;
-  friend class ::google::protobuf::Arena;
-  template <typename T>
-  friend class ::google::protobuf::Arena::InternalHelper;
-  using InternalArenaConstructable_ = void;
-  using DestructorSkippable_ = void;
-  struct Impl_ {
-
-        inline explicit constexpr Impl_(
-            ::google::protobuf::internal::ConstantInitialized) noexcept;
-        inline explicit Impl_(::google::protobuf::internal::InternalVisibility visibility,
-                              ::google::protobuf::Arena* arena);
-        inline explicit Impl_(::google::protobuf::internal::InternalVisibility visibility,
-                              ::google::protobuf::Arena* arena, const Impl_& from);
-    PROTOBUF_TSAN_DECLARE_MEMBER
-  };
-  friend struct ::TableStruct_deephaven_2fproto_2fsession_2eproto;
-};// -------------------------------------------------------------------
-
-class ReleaseResponse final :
-    public ::google::protobuf::internal::ZeroFieldsBase /* @@protoc_insertion_point(class_definition:io.deephaven.proto.backplane.grpc.ReleaseResponse) */ {
- public:
-  inline ReleaseResponse() : ReleaseResponse(nullptr) {}
-  template<typename = void>
-  explicit PROTOBUF_CONSTEXPR ReleaseResponse(::google::protobuf::internal::ConstantInitialized);
-
-  inline ReleaseResponse(const ReleaseResponse& from)
-      : ReleaseResponse(nullptr, from) {}
-  ReleaseResponse(ReleaseResponse&& from) noexcept
-    : ReleaseResponse() {
-    *this = ::std::move(from);
-  }
-
-  inline ReleaseResponse& operator=(const ReleaseResponse& from) {
-    CopyFrom(from);
-    return *this;
-  }
-  inline ReleaseResponse& operator=(ReleaseResponse&& from) noexcept {
-    if (this == &from) return *this;
-    if (GetArena() == from.GetArena()
-  #ifdef PROTOBUF_FORCE_COPY_IN_MOVE
-        && GetArena() != nullptr
-  #endif  // !PROTOBUF_FORCE_COPY_IN_MOVE
-    ) {
-      InternalSwap(&from);
-    } else {
-      CopyFrom(from);
-    }
-    return *this;
-  }
-
-  inline const ::google::protobuf::UnknownFieldSet& unknown_fields() const
-      ABSL_ATTRIBUTE_LIFETIME_BOUND {
-    return _internal_metadata_.unknown_fields<::google::protobuf::UnknownFieldSet>(::google::protobuf::UnknownFieldSet::default_instance);
-  }
-  inline ::google::protobuf::UnknownFieldSet* mutable_unknown_fields()
-      ABSL_ATTRIBUTE_LIFETIME_BOUND {
-    return _internal_metadata_.mutable_unknown_fields<::google::protobuf::UnknownFieldSet>();
-  }
-
-  static const ::google::protobuf::Descriptor* descriptor() {
-    return GetDescriptor();
-  }
-  static const ::google::protobuf::Descriptor* GetDescriptor() {
-    return default_instance().GetMetadata().descriptor;
-  }
-  static const ::google::protobuf::Reflection* GetReflection() {
-    return default_instance().GetMetadata().reflection;
-  }
-  static const ReleaseResponse& default_instance() {
-    return *internal_default_instance();
-  }
-  static inline const ReleaseResponse* internal_default_instance() {
-    return reinterpret_cast<const ReleaseResponse*>(
-               &_ReleaseResponse_default_instance_);
-  }
-  static constexpr int kIndexInFileMessages =
-    5;
-
-  friend void swap(ReleaseResponse& a, ReleaseResponse& b) {
-    a.Swap(&b);
-  }
-  inline void Swap(ReleaseResponse* other) {
-    if (other == this) return;
-  #ifdef PROTOBUF_FORCE_COPY_IN_SWAP
-    if (GetArena() != nullptr &&
-        GetArena() == other->GetArena()) {
-   #else  // PROTOBUF_FORCE_COPY_IN_SWAP
-    if (GetArena() == other->GetArena()) {
-  #endif  // !PROTOBUF_FORCE_COPY_IN_SWAP
-      InternalSwap(other);
-    } else {
-      ::google::protobuf::internal::GenericSwap(this, other);
-    }
-  }
-  void UnsafeArenaSwap(ReleaseResponse* other) {
-    if (other == this) return;
-    ABSL_DCHECK(GetArena() == other->GetArena());
-    InternalSwap(other);
-  }
-
-  // implements Message ----------------------------------------------
-
-  ReleaseResponse* New(::google::protobuf::Arena* arena = nullptr) const final {
-    return CreateMaybeMessage<ReleaseResponse>(arena);
-  }
-  using ::google::protobuf::internal::ZeroFieldsBase::CopyFrom;
-  inline void CopyFrom(const ReleaseResponse& from) {
-    ::google::protobuf::internal::ZeroFieldsBase::CopyImpl(*this, from);
-  }
-  using ::google::protobuf::internal::ZeroFieldsBase::MergeFrom;
-  void MergeFrom(const ReleaseResponse& from) {
-    ::google::protobuf::internal::ZeroFieldsBase::MergeImpl(*this, from);
-  }
-  public:
-
-  private:
-  friend class ::google::protobuf::internal::AnyMetadata;
-  static ::absl::string_view FullMessageName() {
-    return "io.deephaven.proto.backplane.grpc.ReleaseResponse";
-  }
-  protected:
-  explicit ReleaseResponse(::google::protobuf::Arena* arena);
-  ReleaseResponse(::google::protobuf::Arena* arena, const ReleaseResponse& from);
-  public:
-
-  ::google::protobuf::Metadata GetMetadata() const final;
-
-  // nested types ----------------------------------------------------
-
-  // accessors -------------------------------------------------------
-
-  // @@protoc_insertion_point(class_scope:io.deephaven.proto.backplane.grpc.ReleaseResponse)
- private:
-  class _Internal;
-
-  friend class ::google::protobuf::MessageLite;
-  friend class ::google::protobuf::Arena;
-  template <typename T>
-  friend class ::google::protobuf::Arena::InternalHelper;
-  using InternalArenaConstructable_ = void;
-  using DestructorSkippable_ = void;
-  struct Impl_ {
-
-        inline explicit constexpr Impl_(
-            ::google::protobuf::internal::ConstantInitialized) noexcept;
-        inline explicit Impl_(::google::protobuf::internal::InternalVisibility visibility,
-                              ::google::protobuf::Arena* arena);
-        inline explicit Impl_(::google::protobuf::internal::InternalVisibility visibility,
-                              ::google::protobuf::Arena* arena, const Impl_& from);
-    PROTOBUF_TSAN_DECLARE_MEMBER
-  };
-  friend struct ::TableStruct_deephaven_2fproto_2fsession_2eproto;
-};// -------------------------------------------------------------------
-
-class PublishResponse final :
-    public ::google::protobuf::internal::ZeroFieldsBase /* @@protoc_insertion_point(class_definition:io.deephaven.proto.backplane.grpc.PublishResponse) */ {
- public:
-  inline PublishResponse() : PublishResponse(nullptr) {}
-  template<typename = void>
-  explicit PROTOBUF_CONSTEXPR PublishResponse(::google::protobuf::internal::ConstantInitialized);
-
-  inline PublishResponse(const PublishResponse& from)
-      : PublishResponse(nullptr, from) {}
-  PublishResponse(PublishResponse&& from) noexcept
-    : PublishResponse() {
-    *this = ::std::move(from);
-  }
-
-  inline PublishResponse& operator=(const PublishResponse& from) {
-    CopyFrom(from);
-    return *this;
-  }
-  inline PublishResponse& operator=(PublishResponse&& from) noexcept {
-    if (this == &from) return *this;
-    if (GetArena() == from.GetArena()
-  #ifdef PROTOBUF_FORCE_COPY_IN_MOVE
-        && GetArena() != nullptr
-  #endif  // !PROTOBUF_FORCE_COPY_IN_MOVE
-    ) {
-      InternalSwap(&from);
-    } else {
-      CopyFrom(from);
-    }
-    return *this;
-  }
-
-  inline const ::google::protobuf::UnknownFieldSet& unknown_fields() const
-      ABSL_ATTRIBUTE_LIFETIME_BOUND {
-    return _internal_metadata_.unknown_fields<::google::protobuf::UnknownFieldSet>(::google::protobuf::UnknownFieldSet::default_instance);
-  }
-  inline ::google::protobuf::UnknownFieldSet* mutable_unknown_fields()
-      ABSL_ATTRIBUTE_LIFETIME_BOUND {
-    return _internal_metadata_.mutable_unknown_fields<::google::protobuf::UnknownFieldSet>();
-  }
-
-  static const ::google::protobuf::Descriptor* descriptor() {
-    return GetDescriptor();
-  }
-  static const ::google::protobuf::Descriptor* GetDescriptor() {
-    return default_instance().GetMetadata().descriptor;
-  }
-  static const ::google::protobuf::Reflection* GetReflection() {
-    return default_instance().GetMetadata().reflection;
-  }
-  static const PublishResponse& default_instance() {
-    return *internal_default_instance();
-  }
-  static inline const PublishResponse* internal_default_instance() {
-    return reinterpret_cast<const PublishResponse*>(
-               &_PublishResponse_default_instance_);
-  }
-  static constexpr int kIndexInFileMessages =
-    9;
-
-  friend void swap(PublishResponse& a, PublishResponse& b) {
-    a.Swap(&b);
-  }
-  inline void Swap(PublishResponse* other) {
-    if (other == this) return;
-  #ifdef PROTOBUF_FORCE_COPY_IN_SWAP
-    if (GetArena() != nullptr &&
-        GetArena() == other->GetArena()) {
-   #else  // PROTOBUF_FORCE_COPY_IN_SWAP
-    if (GetArena() == other->GetArena()) {
-  #endif  // !PROTOBUF_FORCE_COPY_IN_SWAP
-      InternalSwap(other);
-    } else {
-      ::google::protobuf::internal::GenericSwap(this, other);
-    }
-  }
-  void UnsafeArenaSwap(PublishResponse* other) {
-    if (other == this) return;
-    ABSL_DCHECK(GetArena() == other->GetArena());
-    InternalSwap(other);
-  }
-
-  // implements Message ----------------------------------------------
-
-  PublishResponse* New(::google::protobuf::Arena* arena = nullptr) const final {
-    return CreateMaybeMessage<PublishResponse>(arena);
-  }
-  using ::google::protobuf::internal::ZeroFieldsBase::CopyFrom;
-  inline void CopyFrom(const PublishResponse& from) {
-    ::google::protobuf::internal::ZeroFieldsBase::CopyImpl(*this, from);
-  }
-  using ::google::protobuf::internal::ZeroFieldsBase::MergeFrom;
-  void MergeFrom(const PublishResponse& from) {
-    ::google::protobuf::internal::ZeroFieldsBase::MergeImpl(*this, from);
-  }
-  public:
-
-  private:
-  friend class ::google::protobuf::internal::AnyMetadata;
-  static ::absl::string_view FullMessageName() {
-    return "io.deephaven.proto.backplane.grpc.PublishResponse";
-  }
-  protected:
-  explicit PublishResponse(::google::protobuf::Arena* arena);
-  PublishResponse(::google::protobuf::Arena* arena, const PublishResponse& from);
-  public:
-
-  ::google::protobuf::Metadata GetMetadata() const final;
-
-  // nested types ----------------------------------------------------
-
-  // accessors -------------------------------------------------------
-
-  // @@protoc_insertion_point(class_scope:io.deephaven.proto.backplane.grpc.PublishResponse)
- private:
-  class _Internal;
-
-  friend class ::google::protobuf::MessageLite;
-  friend class ::google::protobuf::Arena;
-  template <typename T>
-  friend class ::google::protobuf::Arena::InternalHelper;
-  using InternalArenaConstructable_ = void;
-  using DestructorSkippable_ = void;
-  struct Impl_ {
-
-        inline explicit constexpr Impl_(
-            ::google::protobuf::internal::ConstantInitialized) noexcept;
-        inline explicit Impl_(::google::protobuf::internal::InternalVisibility visibility,
-                              ::google::protobuf::Arena* arena);
-        inline explicit Impl_(::google::protobuf::internal::InternalVisibility visibility,
-                              ::google::protobuf::Arena* arena, const Impl_& from);
-    PROTOBUF_TSAN_DECLARE_MEMBER
-  };
-  friend struct ::TableStruct_deephaven_2fproto_2fsession_2eproto;
-};// -------------------------------------------------------------------
-
-class HandshakeResponse final :
-    public ::google::protobuf::Message /* @@protoc_insertion_point(class_definition:io.deephaven.proto.backplane.grpc.HandshakeResponse) */ {
- public:
-  inline HandshakeResponse() : HandshakeResponse(nullptr) {}
-  ~HandshakeResponse() override;
-  template<typename = void>
-  explicit PROTOBUF_CONSTEXPR HandshakeResponse(::google::protobuf::internal::ConstantInitialized);
-
-  inline HandshakeResponse(const HandshakeResponse& from)
-      : HandshakeResponse(nullptr, from) {}
-  HandshakeResponse(HandshakeResponse&& from) noexcept
-    : HandshakeResponse() {
-    *this = ::std::move(from);
-  }
-
-  inline HandshakeResponse& operator=(const HandshakeResponse& from) {
-    CopyFrom(from);
-    return *this;
-  }
-  inline HandshakeResponse& operator=(HandshakeResponse&& from) noexcept {
-    if (this == &from) return *this;
-    if (GetArena() == from.GetArena()
-  #ifdef PROTOBUF_FORCE_COPY_IN_MOVE
-        && GetArena() != nullptr
-  #endif  // !PROTOBUF_FORCE_COPY_IN_MOVE
-    ) {
-      InternalSwap(&from);
-    } else {
-      CopyFrom(from);
-    }
-    return *this;
-  }
-
-  inline const ::google::protobuf::UnknownFieldSet& unknown_fields() const
-      ABSL_ATTRIBUTE_LIFETIME_BOUND {
-    return _internal_metadata_.unknown_fields<::google::protobuf::UnknownFieldSet>(::google::protobuf::UnknownFieldSet::default_instance);
-  }
-  inline ::google::protobuf::UnknownFieldSet* mutable_unknown_fields()
-      ABSL_ATTRIBUTE_LIFETIME_BOUND {
-    return _internal_metadata_.mutable_unknown_fields<::google::protobuf::UnknownFieldSet>();
-  }
-
-  static const ::google::protobuf::Descriptor* descriptor() {
-    return GetDescriptor();
-  }
-  static const ::google::protobuf::Descriptor* GetDescriptor() {
-    return default_instance().GetMetadata().descriptor;
-  }
-  static const ::google::protobuf::Reflection* GetReflection() {
-    return default_instance().GetMetadata().reflection;
-  }
-  static const HandshakeResponse& default_instance() {
-    return *internal_default_instance();
-  }
-  static inline const HandshakeResponse* internal_default_instance() {
-    return reinterpret_cast<const HandshakeResponse*>(
-               &_HandshakeResponse_default_instance_);
-  }
-  static constexpr int kIndexInFileMessages =
-    2;
-
-  friend void swap(HandshakeResponse& a, HandshakeResponse& b) {
-    a.Swap(&b);
-  }
-  inline void Swap(HandshakeResponse* other) {
-    if (other == this) return;
-  #ifdef PROTOBUF_FORCE_COPY_IN_SWAP
-    if (GetArena() != nullptr &&
-        GetArena() == other->GetArena()) {
-   #else  // PROTOBUF_FORCE_COPY_IN_SWAP
-    if (GetArena() == other->GetArena()) {
-  #endif  // !PROTOBUF_FORCE_COPY_IN_SWAP
-      InternalSwap(other);
-    } else {
-      ::google::protobuf::internal::GenericSwap(this, other);
-    }
-  }
-  void UnsafeArenaSwap(HandshakeResponse* other) {
-    if (other == this) return;
-    ABSL_DCHECK(GetArena() == other->GetArena());
-    InternalSwap(other);
-  }
-
-  // implements Message ----------------------------------------------
-
-  HandshakeResponse* New(::google::protobuf::Arena* arena = nullptr) const final {
-    return CreateMaybeMessage<HandshakeResponse>(arena);
-  }
-  using ::google::protobuf::Message::CopyFrom;
-  void CopyFrom(const HandshakeResponse& from);
-  using ::google::protobuf::Message::MergeFrom;
-  void MergeFrom( const HandshakeResponse& from) {
-    HandshakeResponse::MergeImpl(*this, from);
-  }
-  private:
-  static void MergeImpl(::google::protobuf::Message& to_msg, const ::google::protobuf::Message& from_msg);
-  public:
-  PROTOBUF_ATTRIBUTE_REINITIALIZES void Clear() final;
-  bool IsInitialized() const final;
-
-  ::size_t ByteSizeLong() const final;
-  const char* _InternalParse(const char* ptr, ::google::protobuf::internal::ParseContext* ctx) final;
-  ::uint8_t* _InternalSerialize(
-      ::uint8_t* target, ::google::protobuf::io::EpsCopyOutputStream* stream) const final;
-  int GetCachedSize() const { return _impl_._cached_size_.Get(); }
-
-  private:
-  ::google::protobuf::internal::CachedSize* AccessCachedSize() const final;
-  void SharedCtor(::google::protobuf::Arena* arena);
-  void SharedDtor();
-  void InternalSwap(HandshakeResponse* other);
-
-  private:
-  friend class ::google::protobuf::internal::AnyMetadata;
-  static ::absl::string_view FullMessageName() {
-    return "io.deephaven.proto.backplane.grpc.HandshakeResponse";
-  }
-  protected:
-  explicit HandshakeResponse(::google::protobuf::Arena* arena);
-  HandshakeResponse(::google::protobuf::Arena* arena, const HandshakeResponse& from);
-  public:
-
-  static const ClassData _class_data_;
-  const ::google::protobuf::Message::ClassData*GetClassData() const final;
-
-  ::google::protobuf::Metadata GetMetadata() const final;
-
-  // nested types ----------------------------------------------------
-
-  // accessors -------------------------------------------------------
-
-  enum : int {
-    kMetadataHeaderFieldNumber = 1,
-    kSessionTokenFieldNumber = 2,
-    kTokenDeadlineTimeMillisFieldNumber = 3,
-    kTokenExpirationDelayMillisFieldNumber = 4,
-  };
-  // bytes metadata_header = 1 [deprecated = true];
-  [[deprecated]]  void clear_metadata_header() ;
-  [[deprecated]] const std::string& metadata_header() const;
-  template <typename Arg_ = const std::string&, typename... Args_>
-  [[deprecated]] void set_metadata_header(Arg_&& arg, Args_... args);
-  [[deprecated]] std::string* mutable_metadata_header();
-  [[deprecated]] PROTOBUF_NODISCARD std::string* release_metadata_header();
-  [[deprecated]] void set_allocated_metadata_header(std::string* value);
-
-  private:
-  const std::string& _internal_metadata_header() const;
-  inline PROTOBUF_ALWAYS_INLINE void _internal_set_metadata_header(
-      const std::string& value);
-  std::string* _internal_mutable_metadata_header();
-
-  public:
-  // bytes session_token = 2 [deprecated = true];
-  [[deprecated]]  void clear_session_token() ;
-  [[deprecated]] const std::string& session_token() const;
-  template <typename Arg_ = const std::string&, typename... Args_>
-  [[deprecated]] void set_session_token(Arg_&& arg, Args_... args);
-  [[deprecated]] std::string* mutable_session_token();
-  [[deprecated]] PROTOBUF_NODISCARD std::string* release_session_token();
-  [[deprecated]] void set_allocated_session_token(std::string* value);
-
-  private:
-  const std::string& _internal_session_token() const;
-  inline PROTOBUF_ALWAYS_INLINE void _internal_set_session_token(
-      const std::string& value);
-  std::string* _internal_mutable_session_token();
-
-  public:
-  // sint64 token_deadline_time_millis = 3 [deprecated = true, jstype = JS_STRING];
-  [[deprecated]]  void clear_token_deadline_time_millis() ;
-  [[deprecated]] ::int64_t token_deadline_time_millis() const;
-  [[deprecated]] void set_token_deadline_time_millis(::int64_t value);
-
-  private:
-  ::int64_t _internal_token_deadline_time_millis() const;
-  void _internal_set_token_deadline_time_millis(::int64_t value);
-
-  public:
-  // sint64 token_expiration_delay_millis = 4 [deprecated = true, jstype = JS_STRING];
-  [[deprecated]]  void clear_token_expiration_delay_millis() ;
-  [[deprecated]] ::int64_t token_expiration_delay_millis() const;
-  [[deprecated]] void set_token_expiration_delay_millis(::int64_t value);
-
-  private:
-  ::int64_t _internal_token_expiration_delay_millis() const;
-  void _internal_set_token_expiration_delay_millis(::int64_t value);
-
-  public:
-  // @@protoc_insertion_point(class_scope:io.deephaven.proto.backplane.grpc.HandshakeResponse)
- private:
-  class _Internal;
-
-  friend class ::google::protobuf::internal::TcParser;
-  static const ::google::protobuf::internal::TcParseTable<
-      2, 4, 0,
-      0, 2>
-      _table_;
-  friend class ::google::protobuf::MessageLite;
-  friend class ::google::protobuf::Arena;
-  template <typename T>
-  friend class ::google::protobuf::Arena::InternalHelper;
-  using InternalArenaConstructable_ = void;
-  using DestructorSkippable_ = void;
-  struct Impl_ {
-
-        inline explicit constexpr Impl_(
-            ::google::protobuf::internal::ConstantInitialized) noexcept;
-        inline explicit Impl_(::google::protobuf::internal::InternalVisibility visibility,
-                              ::google::protobuf::Arena* arena);
-        inline explicit Impl_(::google::protobuf::internal::InternalVisibility visibility,
-                              ::google::protobuf::Arena* arena, const Impl_& from);
-    ::google::protobuf::internal::ArenaStringPtr metadata_header_;
-    ::google::protobuf::internal::ArenaStringPtr session_token_;
-    ::int64_t token_deadline_time_millis_;
-    ::int64_t token_expiration_delay_millis_;
-    mutable ::google::protobuf::internal::CachedSize _cached_size_;
-    PROTOBUF_TSAN_DECLARE_MEMBER
-  };
-  union { Impl_ _impl_; };
-  friend struct ::TableStruct_deephaven_2fproto_2fsession_2eproto;
-};// -------------------------------------------------------------------
-
-class HandshakeRequest final :
-    public ::google::protobuf::Message /* @@protoc_insertion_point(class_definition:io.deephaven.proto.backplane.grpc.HandshakeRequest) */ {
- public:
-  inline HandshakeRequest() : HandshakeRequest(nullptr) {}
-  ~HandshakeRequest() override;
-  template<typename = void>
-  explicit PROTOBUF_CONSTEXPR HandshakeRequest(::google::protobuf::internal::ConstantInitialized);
-
-  inline HandshakeRequest(const HandshakeRequest& from)
-      : HandshakeRequest(nullptr, from) {}
-  HandshakeRequest(HandshakeRequest&& from) noexcept
-    : HandshakeRequest() {
-    *this = ::std::move(from);
-  }
-
-  inline HandshakeRequest& operator=(const HandshakeRequest& from) {
-    CopyFrom(from);
-    return *this;
-  }
-  inline HandshakeRequest& operator=(HandshakeRequest&& from) noexcept {
-    if (this == &from) return *this;
-    if (GetArena() == from.GetArena()
-  #ifdef PROTOBUF_FORCE_COPY_IN_MOVE
-        && GetArena() != nullptr
-  #endif  // !PROTOBUF_FORCE_COPY_IN_MOVE
-    ) {
-      InternalSwap(&from);
-    } else {
-      CopyFrom(from);
-    }
-    return *this;
-  }
-
-  inline const ::google::protobuf::UnknownFieldSet& unknown_fields() const
-      ABSL_ATTRIBUTE_LIFETIME_BOUND {
-    return _internal_metadata_.unknown_fields<::google::protobuf::UnknownFieldSet>(::google::protobuf::UnknownFieldSet::default_instance);
-  }
-  inline ::google::protobuf::UnknownFieldSet* mutable_unknown_fields()
-      ABSL_ATTRIBUTE_LIFETIME_BOUND {
-    return _internal_metadata_.mutable_unknown_fields<::google::protobuf::UnknownFieldSet>();
-  }
-
-  static const ::google::protobuf::Descriptor* descriptor() {
-    return GetDescriptor();
-  }
-  static const ::google::protobuf::Descriptor* GetDescriptor() {
-    return default_instance().GetMetadata().descriptor;
-  }
-  static const ::google::protobuf::Reflection* GetReflection() {
-    return default_instance().GetMetadata().reflection;
-  }
-  static const HandshakeRequest& default_instance() {
-    return *internal_default_instance();
-  }
-  static inline const HandshakeRequest* internal_default_instance() {
-    return reinterpret_cast<const HandshakeRequest*>(
-               &_HandshakeRequest_default_instance_);
-  }
-  static constexpr int kIndexInFileMessages =
-    1;
-
-  friend void swap(HandshakeRequest& a, HandshakeRequest& b) {
-    a.Swap(&b);
-  }
-  inline void Swap(HandshakeRequest* other) {
-    if (other == this) return;
-  #ifdef PROTOBUF_FORCE_COPY_IN_SWAP
-    if (GetArena() != nullptr &&
-        GetArena() == other->GetArena()) {
-   #else  // PROTOBUF_FORCE_COPY_IN_SWAP
-    if (GetArena() == other->GetArena()) {
-  #endif  // !PROTOBUF_FORCE_COPY_IN_SWAP
-      InternalSwap(other);
-    } else {
-      ::google::protobuf::internal::GenericSwap(this, other);
-    }
-  }
-  void UnsafeArenaSwap(HandshakeRequest* other) {
-    if (other == this) return;
-    ABSL_DCHECK(GetArena() == other->GetArena());
-    InternalSwap(other);
-  }
-
-  // implements Message ----------------------------------------------
-
-  HandshakeRequest* New(::google::protobuf::Arena* arena = nullptr) const final {
-    return CreateMaybeMessage<HandshakeRequest>(arena);
-  }
-  using ::google::protobuf::Message::CopyFrom;
-  void CopyFrom(const HandshakeRequest& from);
-  using ::google::protobuf::Message::MergeFrom;
-  void MergeFrom( const HandshakeRequest& from) {
-    HandshakeRequest::MergeImpl(*this, from);
-  }
-  private:
-  static void MergeImpl(::google::protobuf::Message& to_msg, const ::google::protobuf::Message& from_msg);
-  public:
-  PROTOBUF_ATTRIBUTE_REINITIALIZES void Clear() final;
-  bool IsInitialized() const final;
-
-  ::size_t ByteSizeLong() const final;
-  const char* _InternalParse(const char* ptr, ::google::protobuf::internal::ParseContext* ctx) final;
-  ::uint8_t* _InternalSerialize(
-      ::uint8_t* target, ::google::protobuf::io::EpsCopyOutputStream* stream) const final;
-  int GetCachedSize() const { return _impl_._cached_size_.Get(); }
-
-  private:
-  ::google::protobuf::internal::CachedSize* AccessCachedSize() const final;
-  void SharedCtor(::google::protobuf::Arena* arena);
-  void SharedDtor();
-  void InternalSwap(HandshakeRequest* other);
-
-  private:
-  friend class ::google::protobuf::internal::AnyMetadata;
-  static ::absl::string_view FullMessageName() {
-    return "io.deephaven.proto.backplane.grpc.HandshakeRequest";
-  }
-  protected:
-  explicit HandshakeRequest(::google::protobuf::Arena* arena);
-  HandshakeRequest(::google::protobuf::Arena* arena, const HandshakeRequest& from);
-  public:
-
-  static const ClassData _class_data_;
-  const ::google::protobuf::Message::ClassData*GetClassData() const final;
-
-  ::google::protobuf::Metadata GetMetadata() const final;
-
-  // nested types ----------------------------------------------------
-
-  // accessors -------------------------------------------------------
-
-  enum : int {
-    kPayloadFieldNumber = 2,
-    kAuthProtocolFieldNumber = 1,
-  };
-  // bytes payload = 2 [deprecated = true];
-  [[deprecated]]  void clear_payload() ;
-  [[deprecated]] const std::string& payload() const;
-  template <typename Arg_ = const std::string&, typename... Args_>
-  [[deprecated]] void set_payload(Arg_&& arg, Args_... args);
-  [[deprecated]] std::string* mutable_payload();
-  [[deprecated]] PROTOBUF_NODISCARD std::string* release_payload();
-  [[deprecated]] void set_allocated_payload(std::string* value);
-
-  private:
-  const std::string& _internal_payload() const;
-  inline PROTOBUF_ALWAYS_INLINE void _internal_set_payload(
-      const std::string& value);
-  std::string* _internal_mutable_payload();
-
-  public:
-  // sint32 auth_protocol = 1 [deprecated = true];
-  [[deprecated]]  void clear_auth_protocol() ;
-  [[deprecated]] ::int32_t auth_protocol() const;
-  [[deprecated]] void set_auth_protocol(::int32_t value);
-
-  private:
-  ::int32_t _internal_auth_protocol() const;
-  void _internal_set_auth_protocol(::int32_t value);
-
-  public:
-  // @@protoc_insertion_point(class_scope:io.deephaven.proto.backplane.grpc.HandshakeRequest)
- private:
-  class _Internal;
-
-  friend class ::google::protobuf::internal::TcParser;
-  static const ::google::protobuf::internal::TcParseTable<
-      1, 2, 0,
-      0, 2>
-      _table_;
-  friend class ::google::protobuf::MessageLite;
-  friend class ::google::protobuf::Arena;
-  template <typename T>
-  friend class ::google::protobuf::Arena::InternalHelper;
-  using InternalArenaConstructable_ = void;
-  using DestructorSkippable_ = void;
-  struct Impl_ {
-
-        inline explicit constexpr Impl_(
-            ::google::protobuf::internal::ConstantInitialized) noexcept;
-        inline explicit Impl_(::google::protobuf::internal::InternalVisibility visibility,
-                              ::google::protobuf::Arena* arena);
-        inline explicit Impl_(::google::protobuf::internal::InternalVisibility visibility,
-                              ::google::protobuf::Arena* arena, const Impl_& from);
-    ::google::protobuf::internal::ArenaStringPtr payload_;
-    ::int32_t auth_protocol_;
-    mutable ::google::protobuf::internal::CachedSize _cached_size_;
-    PROTOBUF_TSAN_DECLARE_MEMBER
-  };
-  union { Impl_ _impl_; };
-  friend struct ::TableStruct_deephaven_2fproto_2fsession_2eproto;
-};// -------------------------------------------------------------------
-
-class ExportResponse final :
-    public ::google::protobuf::internal::ZeroFieldsBase /* @@protoc_insertion_point(class_definition:io.deephaven.proto.backplane.grpc.ExportResponse) */ {
- public:
-  inline ExportResponse() : ExportResponse(nullptr) {}
-  template<typename = void>
-  explicit PROTOBUF_CONSTEXPR ExportResponse(::google::protobuf::internal::ConstantInitialized);
-
-  inline ExportResponse(const ExportResponse& from)
-      : ExportResponse(nullptr, from) {}
-  ExportResponse(ExportResponse&& from) noexcept
-    : ExportResponse() {
-    *this = ::std::move(from);
-  }
-
-  inline ExportResponse& operator=(const ExportResponse& from) {
-    CopyFrom(from);
-    return *this;
-  }
-  inline ExportResponse& operator=(ExportResponse&& from) noexcept {
-    if (this == &from) return *this;
-    if (GetArena() == from.GetArena()
-  #ifdef PROTOBUF_FORCE_COPY_IN_MOVE
-        && GetArena() != nullptr
-  #endif  // !PROTOBUF_FORCE_COPY_IN_MOVE
-    ) {
-      InternalSwap(&from);
-    } else {
-      CopyFrom(from);
-    }
-    return *this;
-  }
-
-  inline const ::google::protobuf::UnknownFieldSet& unknown_fields() const
-      ABSL_ATTRIBUTE_LIFETIME_BOUND {
-    return _internal_metadata_.unknown_fields<::google::protobuf::UnknownFieldSet>(::google::protobuf::UnknownFieldSet::default_instance);
-  }
-  inline ::google::protobuf::UnknownFieldSet* mutable_unknown_fields()
-      ABSL_ATTRIBUTE_LIFETIME_BOUND {
-    return _internal_metadata_.mutable_unknown_fields<::google::protobuf::UnknownFieldSet>();
-  }
-
-  static const ::google::protobuf::Descriptor* descriptor() {
-    return GetDescriptor();
-  }
-  static const ::google::protobuf::Descriptor* GetDescriptor() {
-    return default_instance().GetMetadata().descriptor;
-  }
-  static const ::google::protobuf::Reflection* GetReflection() {
-    return default_instance().GetMetadata().reflection;
-  }
-  static const ExportResponse& default_instance() {
-    return *internal_default_instance();
-  }
-  static inline const ExportResponse* internal_default_instance() {
-    return reinterpret_cast<const ExportResponse*>(
-               &_ExportResponse_default_instance_);
-  }
-  static constexpr int kIndexInFileMessages =
-    7;
-
-  friend void swap(ExportResponse& a, ExportResponse& b) {
-    a.Swap(&b);
-  }
-  inline void Swap(ExportResponse* other) {
-    if (other == this) return;
-  #ifdef PROTOBUF_FORCE_COPY_IN_SWAP
-    if (GetArena() != nullptr &&
-        GetArena() == other->GetArena()) {
-   #else  // PROTOBUF_FORCE_COPY_IN_SWAP
-    if (GetArena() == other->GetArena()) {
-  #endif  // !PROTOBUF_FORCE_COPY_IN_SWAP
-      InternalSwap(other);
-    } else {
-      ::google::protobuf::internal::GenericSwap(this, other);
-    }
-  }
-  void UnsafeArenaSwap(ExportResponse* other) {
-    if (other == this) return;
-    ABSL_DCHECK(GetArena() == other->GetArena());
-    InternalSwap(other);
-  }
-
-  // implements Message ----------------------------------------------
-
-  ExportResponse* New(::google::protobuf::Arena* arena = nullptr) const final {
-    return CreateMaybeMessage<ExportResponse>(arena);
-  }
-  using ::google::protobuf::internal::ZeroFieldsBase::CopyFrom;
-  inline void CopyFrom(const ExportResponse& from) {
-    ::google::protobuf::internal::ZeroFieldsBase::CopyImpl(*this, from);
-  }
-  using ::google::protobuf::internal::ZeroFieldsBase::MergeFrom;
-  void MergeFrom(const ExportResponse& from) {
-    ::google::protobuf::internal::ZeroFieldsBase::MergeImpl(*this, from);
-  }
-  public:
-
-  private:
-  friend class ::google::protobuf::internal::AnyMetadata;
-  static ::absl::string_view FullMessageName() {
-    return "io.deephaven.proto.backplane.grpc.ExportResponse";
-  }
-  protected:
-  explicit ExportResponse(::google::protobuf::Arena* arena);
-  ExportResponse(::google::protobuf::Arena* arena, const ExportResponse& from);
-  public:
-
-  ::google::protobuf::Metadata GetMetadata() const final;
-
-  // nested types ----------------------------------------------------
-
-  // accessors -------------------------------------------------------
-
-  // @@protoc_insertion_point(class_scope:io.deephaven.proto.backplane.grpc.ExportResponse)
- private:
-  class _Internal;
-
-  friend class ::google::protobuf::MessageLite;
-  friend class ::google::protobuf::Arena;
-  template <typename T>
-  friend class ::google::protobuf::Arena::InternalHelper;
-  using InternalArenaConstructable_ = void;
-  using DestructorSkippable_ = void;
-  struct Impl_ {
-
-        inline explicit constexpr Impl_(
-            ::google::protobuf::internal::ConstantInitialized) noexcept;
-        inline explicit Impl_(::google::protobuf::internal::InternalVisibility visibility,
-                              ::google::protobuf::Arena* arena);
-        inline explicit Impl_(::google::protobuf::internal::InternalVisibility visibility,
-                              ::google::protobuf::Arena* arena, const Impl_& from);
-    PROTOBUF_TSAN_DECLARE_MEMBER
-  };
-  friend struct ::TableStruct_deephaven_2fproto_2fsession_2eproto;
-};// -------------------------------------------------------------------
-
-class ExportNotificationRequest final :
-    public ::google::protobuf::internal::ZeroFieldsBase /* @@protoc_insertion_point(class_definition:io.deephaven.proto.backplane.grpc.ExportNotificationRequest) */ {
- public:
-  inline ExportNotificationRequest() : ExportNotificationRequest(nullptr) {}
-  template<typename = void>
-  explicit PROTOBUF_CONSTEXPR ExportNotificationRequest(::google::protobuf::internal::ConstantInitialized);
-
-  inline ExportNotificationRequest(const ExportNotificationRequest& from)
-      : ExportNotificationRequest(nullptr, from) {}
-  ExportNotificationRequest(ExportNotificationRequest&& from) noexcept
-    : ExportNotificationRequest() {
-    *this = ::std::move(from);
-  }
-
-  inline ExportNotificationRequest& operator=(const ExportNotificationRequest& from) {
-    CopyFrom(from);
-    return *this;
-  }
-  inline ExportNotificationRequest& operator=(ExportNotificationRequest&& from) noexcept {
-    if (this == &from) return *this;
-    if (GetArena() == from.GetArena()
-  #ifdef PROTOBUF_FORCE_COPY_IN_MOVE
-        && GetArena() != nullptr
-  #endif  // !PROTOBUF_FORCE_COPY_IN_MOVE
-    ) {
-      InternalSwap(&from);
-    } else {
-      CopyFrom(from);
-    }
-    return *this;
-  }
-
-  inline const ::google::protobuf::UnknownFieldSet& unknown_fields() const
-      ABSL_ATTRIBUTE_LIFETIME_BOUND {
-    return _internal_metadata_.unknown_fields<::google::protobuf::UnknownFieldSet>(::google::protobuf::UnknownFieldSet::default_instance);
-  }
-  inline ::google::protobuf::UnknownFieldSet* mutable_unknown_fields()
-      ABSL_ATTRIBUTE_LIFETIME_BOUND {
-    return _internal_metadata_.mutable_unknown_fields<::google::protobuf::UnknownFieldSet>();
-  }
-
-  static const ::google::protobuf::Descriptor* descriptor() {
-    return GetDescriptor();
-  }
-  static const ::google::protobuf::Descriptor* GetDescriptor() {
-    return default_instance().GetMetadata().descriptor;
-  }
-  static const ::google::protobuf::Reflection* GetReflection() {
-    return default_instance().GetMetadata().reflection;
-  }
-  static const ExportNotificationRequest& default_instance() {
-    return *internal_default_instance();
-  }
-  static inline const ExportNotificationRequest* internal_default_instance() {
-    return reinterpret_cast<const ExportNotificationRequest*>(
-               &_ExportNotificationRequest_default_instance_);
-  }
-  static constexpr int kIndexInFileMessages =
-    10;
-
-  friend void swap(ExportNotificationRequest& a, ExportNotificationRequest& b) {
-    a.Swap(&b);
-  }
-  inline void Swap(ExportNotificationRequest* other) {
-    if (other == this) return;
-  #ifdef PROTOBUF_FORCE_COPY_IN_SWAP
-    if (GetArena() != nullptr &&
-        GetArena() == other->GetArena()) {
-   #else  // PROTOBUF_FORCE_COPY_IN_SWAP
-    if (GetArena() == other->GetArena()) {
-  #endif  // !PROTOBUF_FORCE_COPY_IN_SWAP
-      InternalSwap(other);
-    } else {
-      ::google::protobuf::internal::GenericSwap(this, other);
-    }
-  }
-  void UnsafeArenaSwap(ExportNotificationRequest* other) {
-    if (other == this) return;
-    ABSL_DCHECK(GetArena() == other->GetArena());
-    InternalSwap(other);
-  }
-
-  // implements Message ----------------------------------------------
-
-  ExportNotificationRequest* New(::google::protobuf::Arena* arena = nullptr) const final {
-    return CreateMaybeMessage<ExportNotificationRequest>(arena);
-  }
-  using ::google::protobuf::internal::ZeroFieldsBase::CopyFrom;
-  inline void CopyFrom(const ExportNotificationRequest& from) {
-    ::google::protobuf::internal::ZeroFieldsBase::CopyImpl(*this, from);
-  }
-  using ::google::protobuf::internal::ZeroFieldsBase::MergeFrom;
-  void MergeFrom(const ExportNotificationRequest& from) {
-    ::google::protobuf::internal::ZeroFieldsBase::MergeImpl(*this, from);
-  }
-  public:
-
-  private:
-  friend class ::google::protobuf::internal::AnyMetadata;
-  static ::absl::string_view FullMessageName() {
-    return "io.deephaven.proto.backplane.grpc.ExportNotificationRequest";
-  }
-  protected:
-  explicit ExportNotificationRequest(::google::protobuf::Arena* arena);
-  ExportNotificationRequest(::google::protobuf::Arena* arena, const ExportNotificationRequest& from);
-  public:
-
-  ::google::protobuf::Metadata GetMetadata() const final;
-
-  // nested types ----------------------------------------------------
-
-  // accessors -------------------------------------------------------
-
-  // @@protoc_insertion_point(class_scope:io.deephaven.proto.backplane.grpc.ExportNotificationRequest)
- private:
-  class _Internal;
-
-  friend class ::google::protobuf::MessageLite;
-  friend class ::google::protobuf::Arena;
-  template <typename T>
-  friend class ::google::protobuf::Arena::InternalHelper;
-  using InternalArenaConstructable_ = void;
-  using DestructorSkippable_ = void;
-  struct Impl_ {
-
-        inline explicit constexpr Impl_(
-            ::google::protobuf::internal::ConstantInitialized) noexcept;
-        inline explicit Impl_(::google::protobuf::internal::InternalVisibility visibility,
-                              ::google::protobuf::Arena* arena);
-        inline explicit Impl_(::google::protobuf::internal::InternalVisibility visibility,
-                              ::google::protobuf::Arena* arena, const Impl_& from);
-    PROTOBUF_TSAN_DECLARE_MEMBER
-  };
-  friend struct ::TableStruct_deephaven_2fproto_2fsession_2eproto;
-};// -------------------------------------------------------------------
-
-class CloseSessionResponse final :
-    public ::google::protobuf::internal::ZeroFieldsBase /* @@protoc_insertion_point(class_definition:io.deephaven.proto.backplane.grpc.CloseSessionResponse) */ {
- public:
-  inline CloseSessionResponse() : CloseSessionResponse(nullptr) {}
-  template<typename = void>
-  explicit PROTOBUF_CONSTEXPR CloseSessionResponse(::google::protobuf::internal::ConstantInitialized);
-
-  inline CloseSessionResponse(const CloseSessionResponse& from)
-      : CloseSessionResponse(nullptr, from) {}
-  CloseSessionResponse(CloseSessionResponse&& from) noexcept
-    : CloseSessionResponse() {
-    *this = ::std::move(from);
-  }
-
-  inline CloseSessionResponse& operator=(const CloseSessionResponse& from) {
-    CopyFrom(from);
-    return *this;
-  }
-  inline CloseSessionResponse& operator=(CloseSessionResponse&& from) noexcept {
-    if (this == &from) return *this;
-    if (GetArena() == from.GetArena()
-  #ifdef PROTOBUF_FORCE_COPY_IN_MOVE
-        && GetArena() != nullptr
-  #endif  // !PROTOBUF_FORCE_COPY_IN_MOVE
-    ) {
-      InternalSwap(&from);
-    } else {
-      CopyFrom(from);
-    }
-    return *this;
-  }
-
-  inline const ::google::protobuf::UnknownFieldSet& unknown_fields() const
-      ABSL_ATTRIBUTE_LIFETIME_BOUND {
-    return _internal_metadata_.unknown_fields<::google::protobuf::UnknownFieldSet>(::google::protobuf::UnknownFieldSet::default_instance);
-  }
-  inline ::google::protobuf::UnknownFieldSet* mutable_unknown_fields()
-      ABSL_ATTRIBUTE_LIFETIME_BOUND {
-    return _internal_metadata_.mutable_unknown_fields<::google::protobuf::UnknownFieldSet>();
-  }
-
-  static const ::google::protobuf::Descriptor* descriptor() {
-    return GetDescriptor();
-  }
-  static const ::google::protobuf::Descriptor* GetDescriptor() {
-    return default_instance().GetMetadata().descriptor;
-  }
-  static const ::google::protobuf::Reflection* GetReflection() {
-    return default_instance().GetMetadata().reflection;
-  }
-  static const CloseSessionResponse& default_instance() {
-    return *internal_default_instance();
-  }
-  static inline const CloseSessionResponse* internal_default_instance() {
-    return reinterpret_cast<const CloseSessionResponse*>(
-               &_CloseSessionResponse_default_instance_);
-  }
-  static constexpr int kIndexInFileMessages =
-    3;
-
-  friend void swap(CloseSessionResponse& a, CloseSessionResponse& b) {
-    a.Swap(&b);
-  }
-  inline void Swap(CloseSessionResponse* other) {
-    if (other == this) return;
-  #ifdef PROTOBUF_FORCE_COPY_IN_SWAP
-    if (GetArena() != nullptr &&
-        GetArena() == other->GetArena()) {
-   #else  // PROTOBUF_FORCE_COPY_IN_SWAP
-    if (GetArena() == other->GetArena()) {
-  #endif  // !PROTOBUF_FORCE_COPY_IN_SWAP
-      InternalSwap(other);
-    } else {
-      ::google::protobuf::internal::GenericSwap(this, other);
-    }
-  }
-  void UnsafeArenaSwap(CloseSessionResponse* other) {
-    if (other == this) return;
-    ABSL_DCHECK(GetArena() == other->GetArena());
-    InternalSwap(other);
-  }
-
-  // implements Message ----------------------------------------------
-
-  CloseSessionResponse* New(::google::protobuf::Arena* arena = nullptr) const final {
-    return CreateMaybeMessage<CloseSessionResponse>(arena);
-  }
-  using ::google::protobuf::internal::ZeroFieldsBase::CopyFrom;
-  inline void CopyFrom(const CloseSessionResponse& from) {
-    ::google::protobuf::internal::ZeroFieldsBase::CopyImpl(*this, from);
-  }
-  using ::google::protobuf::internal::ZeroFieldsBase::MergeFrom;
-  void MergeFrom(const CloseSessionResponse& from) {
-    ::google::protobuf::internal::ZeroFieldsBase::MergeImpl(*this, from);
-  }
-  public:
-
-  private:
-  friend class ::google::protobuf::internal::AnyMetadata;
-  static ::absl::string_view FullMessageName() {
-    return "io.deephaven.proto.backplane.grpc.CloseSessionResponse";
-  }
-  protected:
-  explicit CloseSessionResponse(::google::protobuf::Arena* arena);
-  CloseSessionResponse(::google::protobuf::Arena* arena, const CloseSessionResponse& from);
-  public:
-
-  ::google::protobuf::Metadata GetMetadata() const final;
-
-  // nested types ----------------------------------------------------
-
-  // accessors -------------------------------------------------------
-
-  // @@protoc_insertion_point(class_scope:io.deephaven.proto.backplane.grpc.CloseSessionResponse)
- private:
-  class _Internal;
-
-  friend class ::google::protobuf::MessageLite;
-  friend class ::google::protobuf::Arena;
-  template <typename T>
-  friend class ::google::protobuf::Arena::InternalHelper;
-  using InternalArenaConstructable_ = void;
-  using DestructorSkippable_ = void;
-  struct Impl_ {
-
-        inline explicit constexpr Impl_(
-            ::google::protobuf::internal::ConstantInitialized) noexcept;
-        inline explicit Impl_(::google::protobuf::internal::InternalVisibility visibility,
-                              ::google::protobuf::Arena* arena);
-        inline explicit Impl_(::google::protobuf::internal::InternalVisibility visibility,
-                              ::google::protobuf::Arena* arena, const Impl_& from);
-    PROTOBUF_TSAN_DECLARE_MEMBER
-  };
-  friend struct ::TableStruct_deephaven_2fproto_2fsession_2eproto;
-};// -------------------------------------------------------------------
-
-class TerminationNotificationResponse final :
-    public ::google::protobuf::Message /* @@protoc_insertion_point(class_definition:io.deephaven.proto.backplane.grpc.TerminationNotificationResponse) */ {
- public:
-  inline TerminationNotificationResponse() : TerminationNotificationResponse(nullptr) {}
-  ~TerminationNotificationResponse() override;
-  template<typename = void>
-  explicit PROTOBUF_CONSTEXPR TerminationNotificationResponse(::google::protobuf::internal::ConstantInitialized);
-
-  inline TerminationNotificationResponse(const TerminationNotificationResponse& from)
-      : TerminationNotificationResponse(nullptr, from) {}
-  TerminationNotificationResponse(TerminationNotificationResponse&& from) noexcept
-    : TerminationNotificationResponse() {
-    *this = ::std::move(from);
-  }
-
-  inline TerminationNotificationResponse& operator=(const TerminationNotificationResponse& from) {
-    CopyFrom(from);
-    return *this;
-  }
-  inline TerminationNotificationResponse& operator=(TerminationNotificationResponse&& from) noexcept {
-    if (this == &from) return *this;
-    if (GetArena() == from.GetArena()
-  #ifdef PROTOBUF_FORCE_COPY_IN_MOVE
-        && GetArena() != nullptr
-  #endif  // !PROTOBUF_FORCE_COPY_IN_MOVE
-    ) {
-      InternalSwap(&from);
-    } else {
-      CopyFrom(from);
-    }
-    return *this;
-  }
-
-  inline const ::google::protobuf::UnknownFieldSet& unknown_fields() const
-      ABSL_ATTRIBUTE_LIFETIME_BOUND {
-    return _internal_metadata_.unknown_fields<::google::protobuf::UnknownFieldSet>(::google::protobuf::UnknownFieldSet::default_instance);
-  }
-  inline ::google::protobuf::UnknownFieldSet* mutable_unknown_fields()
-      ABSL_ATTRIBUTE_LIFETIME_BOUND {
-    return _internal_metadata_.mutable_unknown_fields<::google::protobuf::UnknownFieldSet>();
-  }
-
-  static const ::google::protobuf::Descriptor* descriptor() {
-    return GetDescriptor();
-  }
-  static const ::google::protobuf::Descriptor* GetDescriptor() {
-    return default_instance().GetMetadata().descriptor;
-  }
-  static const ::google::protobuf::Reflection* GetReflection() {
-    return default_instance().GetMetadata().reflection;
-  }
-  static const TerminationNotificationResponse& default_instance() {
-    return *internal_default_instance();
-  }
-  static inline const TerminationNotificationResponse* internal_default_instance() {
-    return reinterpret_cast<const TerminationNotificationResponse*>(
-               &_TerminationNotificationResponse_default_instance_);
-  }
-  static constexpr int kIndexInFileMessages =
-    14;
-
-  friend void swap(TerminationNotificationResponse& a, TerminationNotificationResponse& b) {
-    a.Swap(&b);
-  }
-  inline void Swap(TerminationNotificationResponse* other) {
-    if (other == this) return;
-  #ifdef PROTOBUF_FORCE_COPY_IN_SWAP
-    if (GetArena() != nullptr &&
-        GetArena() == other->GetArena()) {
-   #else  // PROTOBUF_FORCE_COPY_IN_SWAP
-    if (GetArena() == other->GetArena()) {
-  #endif  // !PROTOBUF_FORCE_COPY_IN_SWAP
-      InternalSwap(other);
-    } else {
-      ::google::protobuf::internal::GenericSwap(this, other);
-    }
-  }
-  void UnsafeArenaSwap(TerminationNotificationResponse* other) {
-    if (other == this) return;
-    ABSL_DCHECK(GetArena() == other->GetArena());
-    InternalSwap(other);
-  }
-
-  // implements Message ----------------------------------------------
-
-  TerminationNotificationResponse* New(::google::protobuf::Arena* arena = nullptr) const final {
-    return CreateMaybeMessage<TerminationNotificationResponse>(arena);
-  }
-  using ::google::protobuf::Message::CopyFrom;
-  void CopyFrom(const TerminationNotificationResponse& from);
-  using ::google::protobuf::Message::MergeFrom;
-  void MergeFrom( const TerminationNotificationResponse& from) {
-    TerminationNotificationResponse::MergeImpl(*this, from);
-  }
-  private:
-  static void MergeImpl(::google::protobuf::Message& to_msg, const ::google::protobuf::Message& from_msg);
-  public:
-  PROTOBUF_ATTRIBUTE_REINITIALIZES void Clear() final;
-  bool IsInitialized() const final;
-
-  ::size_t ByteSizeLong() const final;
-  const char* _InternalParse(const char* ptr, ::google::protobuf::internal::ParseContext* ctx) final;
-  ::uint8_t* _InternalSerialize(
-      ::uint8_t* target, ::google::protobuf::io::EpsCopyOutputStream* stream) const final;
-  int GetCachedSize() const { return _impl_._cached_size_.Get(); }
-
-  private:
-  ::google::protobuf::internal::CachedSize* AccessCachedSize() const final;
-  void SharedCtor(::google::protobuf::Arena* arena);
-  void SharedDtor();
-  void InternalSwap(TerminationNotificationResponse* other);
-
-  private:
-  friend class ::google::protobuf::internal::AnyMetadata;
-  static ::absl::string_view FullMessageName() {
-    return "io.deephaven.proto.backplane.grpc.TerminationNotificationResponse";
-  }
-  protected:
-  explicit TerminationNotificationResponse(::google::protobuf::Arena* arena);
-  TerminationNotificationResponse(::google::protobuf::Arena* arena, const TerminationNotificationResponse& from);
-  public:
-
-  static const ClassData _class_data_;
-  const ::google::protobuf::Message::ClassData*GetClassData() const final;
-
-  ::google::protobuf::Metadata GetMetadata() const final;
-
-  // nested types ----------------------------------------------------
-
-  using StackTrace = TerminationNotificationResponse_StackTrace;
-
-  // accessors -------------------------------------------------------
-
-  enum : int {
-    kStackTracesFieldNumber = 4,
-    kReasonFieldNumber = 2,
-    kAbnormalTerminationFieldNumber = 1,
-    kIsFromUncaughtExceptionFieldNumber = 3,
-  };
-  // repeated .io.deephaven.proto.backplane.grpc.TerminationNotificationResponse.StackTrace stack_traces = 4;
-  int stack_traces_size() const;
-  private:
-  int _internal_stack_traces_size() const;
-
-  public:
-  void clear_stack_traces() ;
-  ::io::deephaven::proto::backplane::grpc::TerminationNotificationResponse_StackTrace* mutable_stack_traces(int index);
-  ::google::protobuf::RepeatedPtrField< ::io::deephaven::proto::backplane::grpc::TerminationNotificationResponse_StackTrace >*
-      mutable_stack_traces();
-  private:
-  const ::google::protobuf::RepeatedPtrField<::io::deephaven::proto::backplane::grpc::TerminationNotificationResponse_StackTrace>& _internal_stack_traces() const;
-  ::google::protobuf::RepeatedPtrField<::io::deephaven::proto::backplane::grpc::TerminationNotificationResponse_StackTrace>* _internal_mutable_stack_traces();
-  public:
-  const ::io::deephaven::proto::backplane::grpc::TerminationNotificationResponse_StackTrace& stack_traces(int index) const;
-  ::io::deephaven::proto::backplane::grpc::TerminationNotificationResponse_StackTrace* add_stack_traces();
-  const ::google::protobuf::RepeatedPtrField< ::io::deephaven::proto::backplane::grpc::TerminationNotificationResponse_StackTrace >&
-      stack_traces() const;
-  // string reason = 2;
-  void clear_reason() ;
-  const std::string& reason() const;
-  template <typename Arg_ = const std::string&, typename... Args_>
-  void set_reason(Arg_&& arg, Args_... args);
-  std::string* mutable_reason();
-  PROTOBUF_NODISCARD std::string* release_reason();
-  void set_allocated_reason(std::string* value);
-
-  private:
-  const std::string& _internal_reason() const;
-  inline PROTOBUF_ALWAYS_INLINE void _internal_set_reason(
-      const std::string& value);
-  std::string* _internal_mutable_reason();
-
-  public:
-  // bool abnormal_termination = 1;
-  void clear_abnormal_termination() ;
-  bool abnormal_termination() const;
-  void set_abnormal_termination(bool value);
-
-  private:
-  bool _internal_abnormal_termination() const;
-  void _internal_set_abnormal_termination(bool value);
-
-  public:
-  // bool is_from_uncaught_exception = 3;
-  void clear_is_from_uncaught_exception() ;
-  bool is_from_uncaught_exception() const;
-  void set_is_from_uncaught_exception(bool value);
-
-  private:
-  bool _internal_is_from_uncaught_exception() const;
-  void _internal_set_is_from_uncaught_exception(bool value);
-
-  public:
-  // @@protoc_insertion_point(class_scope:io.deephaven.proto.backplane.grpc.TerminationNotificationResponse)
- private:
-  class _Internal;
-
-  friend class ::google::protobuf::internal::TcParser;
-  static const ::google::protobuf::internal::TcParseTable<
-      2, 4, 1,
-      80, 2>
-      _table_;
-  friend class ::google::protobuf::MessageLite;
-  friend class ::google::protobuf::Arena;
-  template <typename T>
-  friend class ::google::protobuf::Arena::InternalHelper;
-  using InternalArenaConstructable_ = void;
-  using DestructorSkippable_ = void;
-  struct Impl_ {
-
-        inline explicit constexpr Impl_(
-            ::google::protobuf::internal::ConstantInitialized) noexcept;
-        inline explicit Impl_(::google::protobuf::internal::InternalVisibility visibility,
-                              ::google::protobuf::Arena* arena);
-        inline explicit Impl_(::google::protobuf::internal::InternalVisibility visibility,
-                              ::google::protobuf::Arena* arena, const Impl_& from);
-    ::google::protobuf::RepeatedPtrField< ::io::deephaven::proto::backplane::grpc::TerminationNotificationResponse_StackTrace > stack_traces_;
-    ::google::protobuf::internal::ArenaStringPtr reason_;
-    bool abnormal_termination_;
-    bool is_from_uncaught_exception_;
-    mutable ::google::protobuf::internal::CachedSize _cached_size_;
-    PROTOBUF_TSAN_DECLARE_MEMBER
-  };
-  union { Impl_ _impl_; };
-  friend struct ::TableStruct_deephaven_2fproto_2fsession_2eproto;
-};// -------------------------------------------------------------------
-
-class ReleaseRequest final :
-    public ::google::protobuf::Message /* @@protoc_insertion_point(class_definition:io.deephaven.proto.backplane.grpc.ReleaseRequest) */ {
- public:
-  inline ReleaseRequest() : ReleaseRequest(nullptr) {}
-  ~ReleaseRequest() override;
-  template<typename = void>
-  explicit PROTOBUF_CONSTEXPR ReleaseRequest(::google::protobuf::internal::ConstantInitialized);
-
-  inline ReleaseRequest(const ReleaseRequest& from)
-      : ReleaseRequest(nullptr, from) {}
-  ReleaseRequest(ReleaseRequest&& from) noexcept
-    : ReleaseRequest() {
-    *this = ::std::move(from);
-  }
-
-  inline ReleaseRequest& operator=(const ReleaseRequest& from) {
-    CopyFrom(from);
-    return *this;
-  }
-  inline ReleaseRequest& operator=(ReleaseRequest&& from) noexcept {
-    if (this == &from) return *this;
-    if (GetArena() == from.GetArena()
-  #ifdef PROTOBUF_FORCE_COPY_IN_MOVE
-        && GetArena() != nullptr
-  #endif  // !PROTOBUF_FORCE_COPY_IN_MOVE
-    ) {
-      InternalSwap(&from);
-    } else {
-      CopyFrom(from);
-    }
-    return *this;
-  }
-
-  inline const ::google::protobuf::UnknownFieldSet& unknown_fields() const
-      ABSL_ATTRIBUTE_LIFETIME_BOUND {
-    return _internal_metadata_.unknown_fields<::google::protobuf::UnknownFieldSet>(::google::protobuf::UnknownFieldSet::default_instance);
-  }
-  inline ::google::protobuf::UnknownFieldSet* mutable_unknown_fields()
-      ABSL_ATTRIBUTE_LIFETIME_BOUND {
-    return _internal_metadata_.mutable_unknown_fields<::google::protobuf::UnknownFieldSet>();
-  }
-
-  static const ::google::protobuf::Descriptor* descriptor() {
-    return GetDescriptor();
-  }
-  static const ::google::protobuf::Descriptor* GetDescriptor() {
-    return default_instance().GetMetadata().descriptor;
-  }
-  static const ::google::protobuf::Reflection* GetReflection() {
-    return default_instance().GetMetadata().reflection;
-  }
-  static const ReleaseRequest& default_instance() {
-    return *internal_default_instance();
-  }
-  static inline const ReleaseRequest* internal_default_instance() {
-    return reinterpret_cast<const ReleaseRequest*>(
-               &_ReleaseRequest_default_instance_);
-  }
-  static constexpr int kIndexInFileMessages =
-    4;
-
-  friend void swap(ReleaseRequest& a, ReleaseRequest& b) {
-    a.Swap(&b);
-  }
-  inline void Swap(ReleaseRequest* other) {
-    if (other == this) return;
-  #ifdef PROTOBUF_FORCE_COPY_IN_SWAP
-    if (GetArena() != nullptr &&
-        GetArena() == other->GetArena()) {
-   #else  // PROTOBUF_FORCE_COPY_IN_SWAP
-    if (GetArena() == other->GetArena()) {
-  #endif  // !PROTOBUF_FORCE_COPY_IN_SWAP
-      InternalSwap(other);
-    } else {
-      ::google::protobuf::internal::GenericSwap(this, other);
-    }
-  }
-  void UnsafeArenaSwap(ReleaseRequest* other) {
-    if (other == this) return;
-    ABSL_DCHECK(GetArena() == other->GetArena());
-    InternalSwap(other);
-  }
-
-  // implements Message ----------------------------------------------
-
-  ReleaseRequest* New(::google::protobuf::Arena* arena = nullptr) const final {
-    return CreateMaybeMessage<ReleaseRequest>(arena);
-  }
-  using ::google::protobuf::Message::CopyFrom;
-  void CopyFrom(const ReleaseRequest& from);
-  using ::google::protobuf::Message::MergeFrom;
-  void MergeFrom( const ReleaseRequest& from) {
-    ReleaseRequest::MergeImpl(*this, from);
-  }
-  private:
-  static void MergeImpl(::google::protobuf::Message& to_msg, const ::google::protobuf::Message& from_msg);
-  public:
-  PROTOBUF_ATTRIBUTE_REINITIALIZES void Clear() final;
-  bool IsInitialized() const final;
-
-  ::size_t ByteSizeLong() const final;
-  const char* _InternalParse(const char* ptr, ::google::protobuf::internal::ParseContext* ctx) final;
-  ::uint8_t* _InternalSerialize(
-      ::uint8_t* target, ::google::protobuf::io::EpsCopyOutputStream* stream) const final;
-  int GetCachedSize() const { return _impl_._cached_size_.Get(); }
-
-  private:
-  ::google::protobuf::internal::CachedSize* AccessCachedSize() const final;
-  void SharedCtor(::google::protobuf::Arena* arena);
-  void SharedDtor();
-  void InternalSwap(ReleaseRequest* other);
-
-  private:
-  friend class ::google::protobuf::internal::AnyMetadata;
-  static ::absl::string_view FullMessageName() {
-    return "io.deephaven.proto.backplane.grpc.ReleaseRequest";
-  }
-  protected:
-  explicit ReleaseRequest(::google::protobuf::Arena* arena);
-  ReleaseRequest(::google::protobuf::Arena* arena, const ReleaseRequest& from);
-  public:
-
-  static const ClassData _class_data_;
-  const ::google::protobuf::Message::ClassData*GetClassData() const final;
-
-  ::google::protobuf::Metadata GetMetadata() const final;
-
-  // nested types ----------------------------------------------------
-
-  // accessors -------------------------------------------------------
-
-  enum : int {
-    kIdFieldNumber = 1,
-  };
-  // .io.deephaven.proto.backplane.grpc.Ticket id = 1;
-  bool has_id() const;
-  void clear_id() ;
-  const ::io::deephaven::proto::backplane::grpc::Ticket& id() const;
-  PROTOBUF_NODISCARD ::io::deephaven::proto::backplane::grpc::Ticket* release_id();
-  ::io::deephaven::proto::backplane::grpc::Ticket* mutable_id();
-  void set_allocated_id(::io::deephaven::proto::backplane::grpc::Ticket* value);
-  void unsafe_arena_set_allocated_id(::io::deephaven::proto::backplane::grpc::Ticket* value);
-  ::io::deephaven::proto::backplane::grpc::Ticket* unsafe_arena_release_id();
-
-  private:
-  const ::io::deephaven::proto::backplane::grpc::Ticket& _internal_id() const;
-  ::io::deephaven::proto::backplane::grpc::Ticket* _internal_mutable_id();
-
-  public:
-  // @@protoc_insertion_point(class_scope:io.deephaven.proto.backplane.grpc.ReleaseRequest)
- private:
-  class _Internal;
-
-  friend class ::google::protobuf::internal::TcParser;
-  static const ::google::protobuf::internal::TcParseTable<
-      0, 1, 1,
-      0, 2>
-      _table_;
-  friend class ::google::protobuf::MessageLite;
-  friend class ::google::protobuf::Arena;
-  template <typename T>
-  friend class ::google::protobuf::Arena::InternalHelper;
-  using InternalArenaConstructable_ = void;
-  using DestructorSkippable_ = void;
-  struct Impl_ {
-
-        inline explicit constexpr Impl_(
-            ::google::protobuf::internal::ConstantInitialized) noexcept;
-        inline explicit Impl_(::google::protobuf::internal::InternalVisibility visibility,
-                              ::google::protobuf::Arena* arena);
-        inline explicit Impl_(::google::protobuf::internal::InternalVisibility visibility,
-                              ::google::protobuf::Arena* arena, const Impl_& from);
-    ::google::protobuf::internal::HasBits<1> _has_bits_;
-    mutable ::google::protobuf::internal::CachedSize _cached_size_;
-    ::io::deephaven::proto::backplane::grpc::Ticket* id_;
-    PROTOBUF_TSAN_DECLARE_MEMBER
-  };
-  union { Impl_ _impl_; };
-  friend struct ::TableStruct_deephaven_2fproto_2fsession_2eproto;
-};// -------------------------------------------------------------------
-
-class PublishRequest final :
-    public ::google::protobuf::Message /* @@protoc_insertion_point(class_definition:io.deephaven.proto.backplane.grpc.PublishRequest) */ {
- public:
-  inline PublishRequest() : PublishRequest(nullptr) {}
-  ~PublishRequest() override;
-  template<typename = void>
-  explicit PROTOBUF_CONSTEXPR PublishRequest(::google::protobuf::internal::ConstantInitialized);
-
-  inline PublishRequest(const PublishRequest& from)
-      : PublishRequest(nullptr, from) {}
-  PublishRequest(PublishRequest&& from) noexcept
-    : PublishRequest() {
-    *this = ::std::move(from);
-  }
-
-  inline PublishRequest& operator=(const PublishRequest& from) {
-    CopyFrom(from);
-    return *this;
-  }
-  inline PublishRequest& operator=(PublishRequest&& from) noexcept {
-    if (this == &from) return *this;
-    if (GetArena() == from.GetArena()
-  #ifdef PROTOBUF_FORCE_COPY_IN_MOVE
-        && GetArena() != nullptr
-  #endif  // !PROTOBUF_FORCE_COPY_IN_MOVE
-    ) {
-      InternalSwap(&from);
-    } else {
-      CopyFrom(from);
-    }
-    return *this;
-  }
-
-  inline const ::google::protobuf::UnknownFieldSet& unknown_fields() const
-      ABSL_ATTRIBUTE_LIFETIME_BOUND {
-    return _internal_metadata_.unknown_fields<::google::protobuf::UnknownFieldSet>(::google::protobuf::UnknownFieldSet::default_instance);
-  }
-  inline ::google::protobuf::UnknownFieldSet* mutable_unknown_fields()
-      ABSL_ATTRIBUTE_LIFETIME_BOUND {
-    return _internal_metadata_.mutable_unknown_fields<::google::protobuf::UnknownFieldSet>();
-  }
-
-  static const ::google::protobuf::Descriptor* descriptor() {
-    return GetDescriptor();
-  }
-  static const ::google::protobuf::Descriptor* GetDescriptor() {
-    return default_instance().GetMetadata().descriptor;
-  }
-  static const ::google::protobuf::Reflection* GetReflection() {
-    return default_instance().GetMetadata().reflection;
-  }
-  static const PublishRequest& default_instance() {
-    return *internal_default_instance();
-  }
-  static inline const PublishRequest* internal_default_instance() {
-    return reinterpret_cast<const PublishRequest*>(
-               &_PublishRequest_default_instance_);
-  }
-  static constexpr int kIndexInFileMessages =
-    8;
-
-  friend void swap(PublishRequest& a, PublishRequest& b) {
-    a.Swap(&b);
-  }
-  inline void Swap(PublishRequest* other) {
-    if (other == this) return;
-  #ifdef PROTOBUF_FORCE_COPY_IN_SWAP
-    if (GetArena() != nullptr &&
-        GetArena() == other->GetArena()) {
-   #else  // PROTOBUF_FORCE_COPY_IN_SWAP
-    if (GetArena() == other->GetArena()) {
-  #endif  // !PROTOBUF_FORCE_COPY_IN_SWAP
-      InternalSwap(other);
-    } else {
-      ::google::protobuf::internal::GenericSwap(this, other);
-    }
-  }
-  void UnsafeArenaSwap(PublishRequest* other) {
-    if (other == this) return;
-    ABSL_DCHECK(GetArena() == other->GetArena());
-    InternalSwap(other);
-  }
-
-  // implements Message ----------------------------------------------
-
-  PublishRequest* New(::google::protobuf::Arena* arena = nullptr) const final {
-    return CreateMaybeMessage<PublishRequest>(arena);
-  }
-  using ::google::protobuf::Message::CopyFrom;
-  void CopyFrom(const PublishRequest& from);
-  using ::google::protobuf::Message::MergeFrom;
-  void MergeFrom( const PublishRequest& from) {
-    PublishRequest::MergeImpl(*this, from);
-  }
-  private:
-  static void MergeImpl(::google::protobuf::Message& to_msg, const ::google::protobuf::Message& from_msg);
-  public:
-  PROTOBUF_ATTRIBUTE_REINITIALIZES void Clear() final;
-  bool IsInitialized() const final;
-
-  ::size_t ByteSizeLong() const final;
-  const char* _InternalParse(const char* ptr, ::google::protobuf::internal::ParseContext* ctx) final;
-  ::uint8_t* _InternalSerialize(
-      ::uint8_t* target, ::google::protobuf::io::EpsCopyOutputStream* stream) const final;
-  int GetCachedSize() const { return _impl_._cached_size_.Get(); }
-
-  private:
-  ::google::protobuf::internal::CachedSize* AccessCachedSize() const final;
-  void SharedCtor(::google::protobuf::Arena* arena);
-  void SharedDtor();
-  void InternalSwap(PublishRequest* other);
-
-  private:
-  friend class ::google::protobuf::internal::AnyMetadata;
-  static ::absl::string_view FullMessageName() {
-    return "io.deephaven.proto.backplane.grpc.PublishRequest";
-  }
-  protected:
-  explicit PublishRequest(::google::protobuf::Arena* arena);
-  PublishRequest(::google::protobuf::Arena* arena, const PublishRequest& from);
-  public:
-
-  static const ClassData _class_data_;
-  const ::google::protobuf::Message::ClassData*GetClassData() const final;
-
-  ::google::protobuf::Metadata GetMetadata() const final;
-
-  // nested types ----------------------------------------------------
-
-  // accessors -------------------------------------------------------
-
-  enum : int {
-    kSourceIdFieldNumber = 1,
-    kResultIdFieldNumber = 2,
-  };
-  // .io.deephaven.proto.backplane.grpc.Ticket source_id = 1;
-  bool has_source_id() const;
-  void clear_source_id() ;
-  const ::io::deephaven::proto::backplane::grpc::Ticket& source_id() const;
-  PROTOBUF_NODISCARD ::io::deephaven::proto::backplane::grpc::Ticket* release_source_id();
-  ::io::deephaven::proto::backplane::grpc::Ticket* mutable_source_id();
-  void set_allocated_source_id(::io::deephaven::proto::backplane::grpc::Ticket* value);
-  void unsafe_arena_set_allocated_source_id(::io::deephaven::proto::backplane::grpc::Ticket* value);
-  ::io::deephaven::proto::backplane::grpc::Ticket* unsafe_arena_release_source_id();
-
-  private:
-  const ::io::deephaven::proto::backplane::grpc::Ticket& _internal_source_id() const;
-  ::io::deephaven::proto::backplane::grpc::Ticket* _internal_mutable_source_id();
-
-  public:
-  // .io.deephaven.proto.backplane.grpc.Ticket result_id = 2;
-  bool has_result_id() const;
-  void clear_result_id() ;
-  const ::io::deephaven::proto::backplane::grpc::Ticket& result_id() const;
-  PROTOBUF_NODISCARD ::io::deephaven::proto::backplane::grpc::Ticket* release_result_id();
-  ::io::deephaven::proto::backplane::grpc::Ticket* mutable_result_id();
-  void set_allocated_result_id(::io::deephaven::proto::backplane::grpc::Ticket* value);
-  void unsafe_arena_set_allocated_result_id(::io::deephaven::proto::backplane::grpc::Ticket* value);
-  ::io::deephaven::proto::backplane::grpc::Ticket* unsafe_arena_release_result_id();
-
-  private:
-  const ::io::deephaven::proto::backplane::grpc::Ticket& _internal_result_id() const;
-  ::io::deephaven::proto::backplane::grpc::Ticket* _internal_mutable_result_id();
-
-  public:
-  // @@protoc_insertion_point(class_scope:io.deephaven.proto.backplane.grpc.PublishRequest)
- private:
-  class _Internal;
-
-  friend class ::google::protobuf::internal::TcParser;
-  static const ::google::protobuf::internal::TcParseTable<
-      1, 2, 2,
-      0, 2>
-      _table_;
-  friend class ::google::protobuf::MessageLite;
-  friend class ::google::protobuf::Arena;
-  template <typename T>
-  friend class ::google::protobuf::Arena::InternalHelper;
-  using InternalArenaConstructable_ = void;
-  using DestructorSkippable_ = void;
-  struct Impl_ {
-
-        inline explicit constexpr Impl_(
-            ::google::protobuf::internal::ConstantInitialized) noexcept;
-        inline explicit Impl_(::google::protobuf::internal::InternalVisibility visibility,
-                              ::google::protobuf::Arena* arena);
-        inline explicit Impl_(::google::protobuf::internal::InternalVisibility visibility,
-                              ::google::protobuf::Arena* arena, const Impl_& from);
-    ::google::protobuf::internal::HasBits<1> _has_bits_;
-    mutable ::google::protobuf::internal::CachedSize _cached_size_;
-    ::io::deephaven::proto::backplane::grpc::Ticket* source_id_;
-    ::io::deephaven::proto::backplane::grpc::Ticket* result_id_;
-    PROTOBUF_TSAN_DECLARE_MEMBER
-  };
-  union { Impl_ _impl_; };
-  friend struct ::TableStruct_deephaven_2fproto_2fsession_2eproto;
-};// -------------------------------------------------------------------
-
-class ExportRequest final :
-    public ::google::protobuf::Message /* @@protoc_insertion_point(class_definition:io.deephaven.proto.backplane.grpc.ExportRequest) */ {
- public:
-  inline ExportRequest() : ExportRequest(nullptr) {}
-  ~ExportRequest() override;
-  template<typename = void>
-  explicit PROTOBUF_CONSTEXPR ExportRequest(::google::protobuf::internal::ConstantInitialized);
-
-  inline ExportRequest(const ExportRequest& from)
-      : ExportRequest(nullptr, from) {}
-  ExportRequest(ExportRequest&& from) noexcept
-    : ExportRequest() {
-    *this = ::std::move(from);
-  }
-
-  inline ExportRequest& operator=(const ExportRequest& from) {
-    CopyFrom(from);
-    return *this;
-  }
-  inline ExportRequest& operator=(ExportRequest&& from) noexcept {
-    if (this == &from) return *this;
-    if (GetArena() == from.GetArena()
-  #ifdef PROTOBUF_FORCE_COPY_IN_MOVE
-        && GetArena() != nullptr
-  #endif  // !PROTOBUF_FORCE_COPY_IN_MOVE
-    ) {
-      InternalSwap(&from);
-    } else {
-      CopyFrom(from);
-    }
-    return *this;
-  }
-
-  inline const ::google::protobuf::UnknownFieldSet& unknown_fields() const
-      ABSL_ATTRIBUTE_LIFETIME_BOUND {
-    return _internal_metadata_.unknown_fields<::google::protobuf::UnknownFieldSet>(::google::protobuf::UnknownFieldSet::default_instance);
-  }
-  inline ::google::protobuf::UnknownFieldSet* mutable_unknown_fields()
-      ABSL_ATTRIBUTE_LIFETIME_BOUND {
-    return _internal_metadata_.mutable_unknown_fields<::google::protobuf::UnknownFieldSet>();
-  }
-
-  static const ::google::protobuf::Descriptor* descriptor() {
-    return GetDescriptor();
-  }
-  static const ::google::protobuf::Descriptor* GetDescriptor() {
-    return default_instance().GetMetadata().descriptor;
-  }
-  static const ::google::protobuf::Reflection* GetReflection() {
-    return default_instance().GetMetadata().reflection;
-  }
-  static const ExportRequest& default_instance() {
-    return *internal_default_instance();
-  }
-  static inline const ExportRequest* internal_default_instance() {
-    return reinterpret_cast<const ExportRequest*>(
-               &_ExportRequest_default_instance_);
-  }
-  static constexpr int kIndexInFileMessages =
-    6;
-
-  friend void swap(ExportRequest& a, ExportRequest& b) {
-    a.Swap(&b);
-  }
-  inline void Swap(ExportRequest* other) {
-    if (other == this) return;
-  #ifdef PROTOBUF_FORCE_COPY_IN_SWAP
-    if (GetArena() != nullptr &&
-        GetArena() == other->GetArena()) {
-   #else  // PROTOBUF_FORCE_COPY_IN_SWAP
-    if (GetArena() == other->GetArena()) {
-  #endif  // !PROTOBUF_FORCE_COPY_IN_SWAP
-      InternalSwap(other);
-    } else {
-      ::google::protobuf::internal::GenericSwap(this, other);
-    }
-  }
-  void UnsafeArenaSwap(ExportRequest* other) {
-    if (other == this) return;
-    ABSL_DCHECK(GetArena() == other->GetArena());
-    InternalSwap(other);
-  }
-
-  // implements Message ----------------------------------------------
-
-  ExportRequest* New(::google::protobuf::Arena* arena = nullptr) const final {
-    return CreateMaybeMessage<ExportRequest>(arena);
-  }
-  using ::google::protobuf::Message::CopyFrom;
-  void CopyFrom(const ExportRequest& from);
-  using ::google::protobuf::Message::MergeFrom;
-  void MergeFrom( const ExportRequest& from) {
-    ExportRequest::MergeImpl(*this, from);
-  }
-  private:
-  static void MergeImpl(::google::protobuf::Message& to_msg, const ::google::protobuf::Message& from_msg);
-  public:
-  PROTOBUF_ATTRIBUTE_REINITIALIZES void Clear() final;
-  bool IsInitialized() const final;
-
-  ::size_t ByteSizeLong() const final;
-  const char* _InternalParse(const char* ptr, ::google::protobuf::internal::ParseContext* ctx) final;
-  ::uint8_t* _InternalSerialize(
-      ::uint8_t* target, ::google::protobuf::io::EpsCopyOutputStream* stream) const final;
-  int GetCachedSize() const { return _impl_._cached_size_.Get(); }
-
-  private:
-  ::google::protobuf::internal::CachedSize* AccessCachedSize() const final;
-  void SharedCtor(::google::protobuf::Arena* arena);
-  void SharedDtor();
-  void InternalSwap(ExportRequest* other);
-
-  private:
-  friend class ::google::protobuf::internal::AnyMetadata;
-  static ::absl::string_view FullMessageName() {
-    return "io.deephaven.proto.backplane.grpc.ExportRequest";
-  }
-  protected:
-  explicit ExportRequest(::google::protobuf::Arena* arena);
-  ExportRequest(::google::protobuf::Arena* arena, const ExportRequest& from);
-  public:
-
-  static const ClassData _class_data_;
-  const ::google::protobuf::Message::ClassData*GetClassData() const final;
-
-  ::google::protobuf::Metadata GetMetadata() const final;
-
-  // nested types ----------------------------------------------------
-
-  // accessors -------------------------------------------------------
-
-  enum : int {
-    kSourceIdFieldNumber = 1,
-    kResultIdFieldNumber = 2,
-  };
-  // .io.deephaven.proto.backplane.grpc.Ticket source_id = 1;
-  bool has_source_id() const;
-  void clear_source_id() ;
-  const ::io::deephaven::proto::backplane::grpc::Ticket& source_id() const;
-  PROTOBUF_NODISCARD ::io::deephaven::proto::backplane::grpc::Ticket* release_source_id();
-  ::io::deephaven::proto::backplane::grpc::Ticket* mutable_source_id();
-  void set_allocated_source_id(::io::deephaven::proto::backplane::grpc::Ticket* value);
-  void unsafe_arena_set_allocated_source_id(::io::deephaven::proto::backplane::grpc::Ticket* value);
-  ::io::deephaven::proto::backplane::grpc::Ticket* unsafe_arena_release_source_id();
-
-  private:
-  const ::io::deephaven::proto::backplane::grpc::Ticket& _internal_source_id() const;
-  ::io::deephaven::proto::backplane::grpc::Ticket* _internal_mutable_source_id();
-
-  public:
-  // .io.deephaven.proto.backplane.grpc.Ticket result_id = 2;
-  bool has_result_id() const;
-  void clear_result_id() ;
-  const ::io::deephaven::proto::backplane::grpc::Ticket& result_id() const;
-  PROTOBUF_NODISCARD ::io::deephaven::proto::backplane::grpc::Ticket* release_result_id();
-  ::io::deephaven::proto::backplane::grpc::Ticket* mutable_result_id();
-  void set_allocated_result_id(::io::deephaven::proto::backplane::grpc::Ticket* value);
-  void unsafe_arena_set_allocated_result_id(::io::deephaven::proto::backplane::grpc::Ticket* value);
-  ::io::deephaven::proto::backplane::grpc::Ticket* unsafe_arena_release_result_id();
-
-  private:
-  const ::io::deephaven::proto::backplane::grpc::Ticket& _internal_result_id() const;
-  ::io::deephaven::proto::backplane::grpc::Ticket* _internal_mutable_result_id();
-
-  public:
-  // @@protoc_insertion_point(class_scope:io.deephaven.proto.backplane.grpc.ExportRequest)
- private:
-  class _Internal;
-
-  friend class ::google::protobuf::internal::TcParser;
-  static const ::google::protobuf::internal::TcParseTable<
-      1, 2, 2,
-      0, 2>
-      _table_;
-  friend class ::google::protobuf::MessageLite;
-  friend class ::google::protobuf::Arena;
-  template <typename T>
-  friend class ::google::protobuf::Arena::InternalHelper;
-  using InternalArenaConstructable_ = void;
-  using DestructorSkippable_ = void;
-  struct Impl_ {
-
-        inline explicit constexpr Impl_(
-            ::google::protobuf::internal::ConstantInitialized) noexcept;
-        inline explicit Impl_(::google::protobuf::internal::InternalVisibility visibility,
-                              ::google::protobuf::Arena* arena);
-        inline explicit Impl_(::google::protobuf::internal::InternalVisibility visibility,
-                              ::google::protobuf::Arena* arena, const Impl_& from);
-    ::google::protobuf::internal::HasBits<1> _has_bits_;
-    mutable ::google::protobuf::internal::CachedSize _cached_size_;
-    ::io::deephaven::proto::backplane::grpc::Ticket* source_id_;
-    ::io::deephaven::proto::backplane::grpc::Ticket* result_id_;
-    PROTOBUF_TSAN_DECLARE_MEMBER
-  };
-  union { Impl_ _impl_; };
-  friend struct ::TableStruct_deephaven_2fproto_2fsession_2eproto;
-};// -------------------------------------------------------------------
-
-class ExportNotification final :
-    public ::google::protobuf::Message /* @@protoc_insertion_point(class_definition:io.deephaven.proto.backplane.grpc.ExportNotification) */ {
- public:
-  inline ExportNotification() : ExportNotification(nullptr) {}
-  ~ExportNotification() override;
-  template<typename = void>
-  explicit PROTOBUF_CONSTEXPR ExportNotification(::google::protobuf::internal::ConstantInitialized);
-
-  inline ExportNotification(const ExportNotification& from)
-      : ExportNotification(nullptr, from) {}
-  ExportNotification(ExportNotification&& from) noexcept
-    : ExportNotification() {
-    *this = ::std::move(from);
-  }
-
-  inline ExportNotification& operator=(const ExportNotification& from) {
-    CopyFrom(from);
-    return *this;
-  }
-  inline ExportNotification& operator=(ExportNotification&& from) noexcept {
-    if (this == &from) return *this;
-    if (GetArena() == from.GetArena()
-  #ifdef PROTOBUF_FORCE_COPY_IN_MOVE
-        && GetArena() != nullptr
-  #endif  // !PROTOBUF_FORCE_COPY_IN_MOVE
-    ) {
-      InternalSwap(&from);
-    } else {
-      CopyFrom(from);
-    }
-    return *this;
-  }
-
-  inline const ::google::protobuf::UnknownFieldSet& unknown_fields() const
-      ABSL_ATTRIBUTE_LIFETIME_BOUND {
-    return _internal_metadata_.unknown_fields<::google::protobuf::UnknownFieldSet>(::google::protobuf::UnknownFieldSet::default_instance);
-  }
-  inline ::google::protobuf::UnknownFieldSet* mutable_unknown_fields()
-      ABSL_ATTRIBUTE_LIFETIME_BOUND {
-    return _internal_metadata_.mutable_unknown_fields<::google::protobuf::UnknownFieldSet>();
-  }
-
-  static const ::google::protobuf::Descriptor* descriptor() {
-    return GetDescriptor();
-  }
-  static const ::google::protobuf::Descriptor* GetDescriptor() {
-    return default_instance().GetMetadata().descriptor;
-  }
-  static const ::google::protobuf::Reflection* GetReflection() {
-    return default_instance().GetMetadata().reflection;
-  }
-  static const ExportNotification& default_instance() {
-    return *internal_default_instance();
-  }
-  static inline const ExportNotification* internal_default_instance() {
-    return reinterpret_cast<const ExportNotification*>(
-               &_ExportNotification_default_instance_);
-  }
-  static constexpr int kIndexInFileMessages =
-    11;
-
-  friend void swap(ExportNotification& a, ExportNotification& b) {
-    a.Swap(&b);
-  }
-  inline void Swap(ExportNotification* other) {
-    if (other == this) return;
-  #ifdef PROTOBUF_FORCE_COPY_IN_SWAP
-    if (GetArena() != nullptr &&
-        GetArena() == other->GetArena()) {
-   #else  // PROTOBUF_FORCE_COPY_IN_SWAP
-    if (GetArena() == other->GetArena()) {
-  #endif  // !PROTOBUF_FORCE_COPY_IN_SWAP
-      InternalSwap(other);
-    } else {
-      ::google::protobuf::internal::GenericSwap(this, other);
-    }
-  }
-  void UnsafeArenaSwap(ExportNotification* other) {
-    if (other == this) return;
-    ABSL_DCHECK(GetArena() == other->GetArena());
-    InternalSwap(other);
-  }
-
-  // implements Message ----------------------------------------------
-
-  ExportNotification* New(::google::protobuf::Arena* arena = nullptr) const final {
-    return CreateMaybeMessage<ExportNotification>(arena);
-  }
-  using ::google::protobuf::Message::CopyFrom;
-  void CopyFrom(const ExportNotification& from);
-  using ::google::protobuf::Message::MergeFrom;
-  void MergeFrom( const ExportNotification& from) {
-    ExportNotification::MergeImpl(*this, from);
-  }
-  private:
-  static void MergeImpl(::google::protobuf::Message& to_msg, const ::google::protobuf::Message& from_msg);
-  public:
-  PROTOBUF_ATTRIBUTE_REINITIALIZES void Clear() final;
-  bool IsInitialized() const final;
-
-  ::size_t ByteSizeLong() const final;
-  const char* _InternalParse(const char* ptr, ::google::protobuf::internal::ParseContext* ctx) final;
-  ::uint8_t* _InternalSerialize(
-      ::uint8_t* target, ::google::protobuf::io::EpsCopyOutputStream* stream) const final;
-  int GetCachedSize() const { return _impl_._cached_size_.Get(); }
-
-  private:
-  ::google::protobuf::internal::CachedSize* AccessCachedSize() const final;
-  void SharedCtor(::google::protobuf::Arena* arena);
-  void SharedDtor();
-  void InternalSwap(ExportNotification* other);
-
-  private:
-  friend class ::google::protobuf::internal::AnyMetadata;
-  static ::absl::string_view FullMessageName() {
-    return "io.deephaven.proto.backplane.grpc.ExportNotification";
-  }
-  protected:
-  explicit ExportNotification(::google::protobuf::Arena* arena);
-  ExportNotification(::google::protobuf::Arena* arena, const ExportNotification& from);
-  public:
-
-  static const ClassData _class_data_;
-  const ::google::protobuf::Message::ClassData*GetClassData() const final;
-
-  ::google::protobuf::Metadata GetMetadata() const final;
-
-  // nested types ----------------------------------------------------
-
-  using State = ExportNotification_State;
-  static constexpr State UNKNOWN = ExportNotification_State_UNKNOWN;
-  static constexpr State PENDING = ExportNotification_State_PENDING;
-  static constexpr State PUBLISHING = ExportNotification_State_PUBLISHING;
-  static constexpr State QUEUED = ExportNotification_State_QUEUED;
-  static constexpr State RUNNING = ExportNotification_State_RUNNING;
-  static constexpr State EXPORTED = ExportNotification_State_EXPORTED;
-  static constexpr State RELEASED = ExportNotification_State_RELEASED;
-  static constexpr State CANCELLED = ExportNotification_State_CANCELLED;
-  static constexpr State FAILED = ExportNotification_State_FAILED;
-  static constexpr State DEPENDENCY_FAILED = ExportNotification_State_DEPENDENCY_FAILED;
-  static constexpr State DEPENDENCY_NEVER_FOUND = ExportNotification_State_DEPENDENCY_NEVER_FOUND;
-  static constexpr State DEPENDENCY_CANCELLED = ExportNotification_State_DEPENDENCY_CANCELLED;
-  static constexpr State DEPENDENCY_RELEASED = ExportNotification_State_DEPENDENCY_RELEASED;
-  static inline bool State_IsValid(int value) {
-    return ExportNotification_State_IsValid(value);
-  }
-  static constexpr State State_MIN = ExportNotification_State_State_MIN;
-  static constexpr State State_MAX = ExportNotification_State_State_MAX;
-  static constexpr int State_ARRAYSIZE = ExportNotification_State_State_ARRAYSIZE;
-  static inline const ::google::protobuf::EnumDescriptor* State_descriptor() {
-    return ExportNotification_State_descriptor();
-  }
-  template <typename T>
-  static inline const std::string& State_Name(T value) {
-    return ExportNotification_State_Name(value);
-  }
-  static inline bool State_Parse(absl::string_view name, State* value) {
-    return ExportNotification_State_Parse(name, value);
-  }
-
-  // accessors -------------------------------------------------------
-
-  enum : int {
-    kContextFieldNumber = 3,
-    kDependentHandleFieldNumber = 4,
-    kTicketFieldNumber = 1,
-    kExportStateFieldNumber = 2,
-  };
-  // string context = 3;
-  void clear_context() ;
-  const std::string& context() const;
-  template <typename Arg_ = const std::string&, typename... Args_>
-  void set_context(Arg_&& arg, Args_... args);
-  std::string* mutable_context();
-  PROTOBUF_NODISCARD std::string* release_context();
-  void set_allocated_context(std::string* value);
-
-  private:
-  const std::string& _internal_context() const;
-  inline PROTOBUF_ALWAYS_INLINE void _internal_set_context(
-      const std::string& value);
-  std::string* _internal_mutable_context();
-
-  public:
-  // string dependent_handle = 4;
-  void clear_dependent_handle() ;
-  const std::string& dependent_handle() const;
-  template <typename Arg_ = const std::string&, typename... Args_>
-  void set_dependent_handle(Arg_&& arg, Args_... args);
-  std::string* mutable_dependent_handle();
-  PROTOBUF_NODISCARD std::string* release_dependent_handle();
-  void set_allocated_dependent_handle(std::string* value);
-
-  private:
-  const std::string& _internal_dependent_handle() const;
-  inline PROTOBUF_ALWAYS_INLINE void _internal_set_dependent_handle(
-      const std::string& value);
-  std::string* _internal_mutable_dependent_handle();
-
-  public:
-  // .io.deephaven.proto.backplane.grpc.Ticket ticket = 1;
-  bool has_ticket() const;
-  void clear_ticket() ;
-  const ::io::deephaven::proto::backplane::grpc::Ticket& ticket() const;
-  PROTOBUF_NODISCARD ::io::deephaven::proto::backplane::grpc::Ticket* release_ticket();
-  ::io::deephaven::proto::backplane::grpc::Ticket* mutable_ticket();
-  void set_allocated_ticket(::io::deephaven::proto::backplane::grpc::Ticket* value);
-  void unsafe_arena_set_allocated_ticket(::io::deephaven::proto::backplane::grpc::Ticket* value);
-  ::io::deephaven::proto::backplane::grpc::Ticket* unsafe_arena_release_ticket();
-
-  private:
-  const ::io::deephaven::proto::backplane::grpc::Ticket& _internal_ticket() const;
-  ::io::deephaven::proto::backplane::grpc::Ticket* _internal_mutable_ticket();
-
-  public:
-  // .io.deephaven.proto.backplane.grpc.ExportNotification.State export_state = 2;
-  void clear_export_state() ;
-  ::io::deephaven::proto::backplane::grpc::ExportNotification_State export_state() const;
-  void set_export_state(::io::deephaven::proto::backplane::grpc::ExportNotification_State value);
-
-  private:
-  ::io::deephaven::proto::backplane::grpc::ExportNotification_State _internal_export_state() const;
-  void _internal_set_export_state(::io::deephaven::proto::backplane::grpc::ExportNotification_State value);
-
-  public:
-  // @@protoc_insertion_point(class_scope:io.deephaven.proto.backplane.grpc.ExportNotification)
- private:
-  class _Internal;
-
-  friend class ::google::protobuf::internal::TcParser;
-  static const ::google::protobuf::internal::TcParseTable<
-      2, 4, 1,
-      84, 2>
-      _table_;
-  friend class ::google::protobuf::MessageLite;
-  friend class ::google::protobuf::Arena;
-  template <typename T>
-  friend class ::google::protobuf::Arena::InternalHelper;
-  using InternalArenaConstructable_ = void;
-  using DestructorSkippable_ = void;
-  struct Impl_ {
-
-        inline explicit constexpr Impl_(
-            ::google::protobuf::internal::ConstantInitialized) noexcept;
-        inline explicit Impl_(::google::protobuf::internal::InternalVisibility visibility,
-                              ::google::protobuf::Arena* arena);
-        inline explicit Impl_(::google::protobuf::internal::InternalVisibility visibility,
-                              ::google::protobuf::Arena* arena, const Impl_& from);
-    ::google::protobuf::internal::HasBits<1> _has_bits_;
-    mutable ::google::protobuf::internal::CachedSize _cached_size_;
-    ::google::protobuf::internal::ArenaStringPtr context_;
-    ::google::protobuf::internal::ArenaStringPtr dependent_handle_;
-    ::io::deephaven::proto::backplane::grpc::Ticket* ticket_;
-    int export_state_;
-    PROTOBUF_TSAN_DECLARE_MEMBER
-  };
-  union { Impl_ _impl_; };
-  friend struct ::TableStruct_deephaven_2fproto_2fsession_2eproto;
-};
-
-// ===================================================================
-
-
-
-
-// ===================================================================
-
-
-#ifdef __GNUC__
-#pragma GCC diagnostic push
-#pragma GCC diagnostic ignored "-Wstrict-aliasing"
-#endif  // __GNUC__
-// -------------------------------------------------------------------
-
-// WrappedAuthenticationRequest
-
-// string type = 4;
-inline void WrappedAuthenticationRequest::clear_type() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  _impl_.type_.ClearToEmpty();
-}
-inline const std::string& WrappedAuthenticationRequest::type() const
-    ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  // @@protoc_insertion_point(field_get:io.deephaven.proto.backplane.grpc.WrappedAuthenticationRequest.type)
-  return _internal_type();
-}
-template <typename Arg_, typename... Args_>
-inline PROTOBUF_ALWAYS_INLINE void WrappedAuthenticationRequest::set_type(Arg_&& arg,
-                                                     Args_... args) {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  ;
-  _impl_.type_.Set(static_cast<Arg_&&>(arg), args..., GetArena());
-  // @@protoc_insertion_point(field_set:io.deephaven.proto.backplane.grpc.WrappedAuthenticationRequest.type)
-}
-inline std::string* WrappedAuthenticationRequest::mutable_type() ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  std::string* _s = _internal_mutable_type();
-  // @@protoc_insertion_point(field_mutable:io.deephaven.proto.backplane.grpc.WrappedAuthenticationRequest.type)
-  return _s;
-}
-inline const std::string& WrappedAuthenticationRequest::_internal_type() const {
-  PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race);
-  return _impl_.type_.Get();
-}
-inline void WrappedAuthenticationRequest::_internal_set_type(const std::string& value) {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  ;
-  _impl_.type_.Set(value, GetArena());
-}
-inline std::string* WrappedAuthenticationRequest::_internal_mutable_type() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  ;
-  return _impl_.type_.Mutable( GetArena());
-}
-inline std::string* WrappedAuthenticationRequest::release_type() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  // @@protoc_insertion_point(field_release:io.deephaven.proto.backplane.grpc.WrappedAuthenticationRequest.type)
-  return _impl_.type_.Release();
-}
-inline void WrappedAuthenticationRequest::set_allocated_type(std::string* value) {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  _impl_.type_.SetAllocated(value, GetArena());
-  #ifdef PROTOBUF_FORCE_COPY_DEFAULT_STRING
-        if (_impl_.type_.IsDefault()) {
-          _impl_.type_.Set("", GetArena());
-        }
-  #endif  // PROTOBUF_FORCE_COPY_DEFAULT_STRING
-  // @@protoc_insertion_point(field_set_allocated:io.deephaven.proto.backplane.grpc.WrappedAuthenticationRequest.type)
-}
-
-// bytes payload = 5;
-inline void WrappedAuthenticationRequest::clear_payload() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  _impl_.payload_.ClearToEmpty();
-}
-inline const std::string& WrappedAuthenticationRequest::payload() const
-    ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  // @@protoc_insertion_point(field_get:io.deephaven.proto.backplane.grpc.WrappedAuthenticationRequest.payload)
-  return _internal_payload();
-}
-template <typename Arg_, typename... Args_>
-inline PROTOBUF_ALWAYS_INLINE void WrappedAuthenticationRequest::set_payload(Arg_&& arg,
-                                                     Args_... args) {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  ;
-  _impl_.payload_.SetBytes(static_cast<Arg_&&>(arg), args..., GetArena());
-  // @@protoc_insertion_point(field_set:io.deephaven.proto.backplane.grpc.WrappedAuthenticationRequest.payload)
-}
-inline std::string* WrappedAuthenticationRequest::mutable_payload() ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  std::string* _s = _internal_mutable_payload();
-  // @@protoc_insertion_point(field_mutable:io.deephaven.proto.backplane.grpc.WrappedAuthenticationRequest.payload)
-  return _s;
-}
-inline const std::string& WrappedAuthenticationRequest::_internal_payload() const {
-  PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race);
-  return _impl_.payload_.Get();
-}
-inline void WrappedAuthenticationRequest::_internal_set_payload(const std::string& value) {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  ;
-  _impl_.payload_.Set(value, GetArena());
-}
-inline std::string* WrappedAuthenticationRequest::_internal_mutable_payload() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  ;
-  return _impl_.payload_.Mutable( GetArena());
-}
-inline std::string* WrappedAuthenticationRequest::release_payload() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  // @@protoc_insertion_point(field_release:io.deephaven.proto.backplane.grpc.WrappedAuthenticationRequest.payload)
-  return _impl_.payload_.Release();
-}
-inline void WrappedAuthenticationRequest::set_allocated_payload(std::string* value) {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  _impl_.payload_.SetAllocated(value, GetArena());
-  #ifdef PROTOBUF_FORCE_COPY_DEFAULT_STRING
-        if (_impl_.payload_.IsDefault()) {
-          _impl_.payload_.Set("", GetArena());
-        }
-  #endif  // PROTOBUF_FORCE_COPY_DEFAULT_STRING
-  // @@protoc_insertion_point(field_set_allocated:io.deephaven.proto.backplane.grpc.WrappedAuthenticationRequest.payload)
-}
-
-// -------------------------------------------------------------------
-
-// HandshakeRequest
-
-// sint32 auth_protocol = 1 [deprecated = true];
-inline void HandshakeRequest::clear_auth_protocol() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  _impl_.auth_protocol_ = 0;
-}
-inline ::int32_t HandshakeRequest::auth_protocol() const {
-  // @@protoc_insertion_point(field_get:io.deephaven.proto.backplane.grpc.HandshakeRequest.auth_protocol)
-  return _internal_auth_protocol();
-}
-inline void HandshakeRequest::set_auth_protocol(::int32_t value) {
-  _internal_set_auth_protocol(value);
-  // @@protoc_insertion_point(field_set:io.deephaven.proto.backplane.grpc.HandshakeRequest.auth_protocol)
-}
-inline ::int32_t HandshakeRequest::_internal_auth_protocol() const {
-  PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race);
-  return _impl_.auth_protocol_;
-}
-inline void HandshakeRequest::_internal_set_auth_protocol(::int32_t value) {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  ;
-  _impl_.auth_protocol_ = value;
-}
-
-// bytes payload = 2 [deprecated = true];
-inline void HandshakeRequest::clear_payload() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  _impl_.payload_.ClearToEmpty();
-}
-inline const std::string& HandshakeRequest::payload() const
-    ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  // @@protoc_insertion_point(field_get:io.deephaven.proto.backplane.grpc.HandshakeRequest.payload)
-  return _internal_payload();
-}
-template <typename Arg_, typename... Args_>
-inline PROTOBUF_ALWAYS_INLINE void HandshakeRequest::set_payload(Arg_&& arg,
-                                                     Args_... args) {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  ;
-  _impl_.payload_.SetBytes(static_cast<Arg_&&>(arg), args..., GetArena());
-  // @@protoc_insertion_point(field_set:io.deephaven.proto.backplane.grpc.HandshakeRequest.payload)
-}
-inline std::string* HandshakeRequest::mutable_payload() ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  std::string* _s = _internal_mutable_payload();
-  // @@protoc_insertion_point(field_mutable:io.deephaven.proto.backplane.grpc.HandshakeRequest.payload)
-  return _s;
-}
-inline const std::string& HandshakeRequest::_internal_payload() const {
-  PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race);
-  return _impl_.payload_.Get();
-}
-inline void HandshakeRequest::_internal_set_payload(const std::string& value) {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  ;
-  _impl_.payload_.Set(value, GetArena());
-}
-inline std::string* HandshakeRequest::_internal_mutable_payload() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  ;
-  return _impl_.payload_.Mutable( GetArena());
-}
-inline std::string* HandshakeRequest::release_payload() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  // @@protoc_insertion_point(field_release:io.deephaven.proto.backplane.grpc.HandshakeRequest.payload)
-  return _impl_.payload_.Release();
-}
-inline void HandshakeRequest::set_allocated_payload(std::string* value) {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  _impl_.payload_.SetAllocated(value, GetArena());
-  #ifdef PROTOBUF_FORCE_COPY_DEFAULT_STRING
-        if (_impl_.payload_.IsDefault()) {
-          _impl_.payload_.Set("", GetArena());
-        }
-  #endif  // PROTOBUF_FORCE_COPY_DEFAULT_STRING
-  // @@protoc_insertion_point(field_set_allocated:io.deephaven.proto.backplane.grpc.HandshakeRequest.payload)
-}
-
-// -------------------------------------------------------------------
-
-// HandshakeResponse
-
-// bytes metadata_header = 1 [deprecated = true];
-inline void HandshakeResponse::clear_metadata_header() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  _impl_.metadata_header_.ClearToEmpty();
-}
-inline const std::string& HandshakeResponse::metadata_header() const
-    ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  // @@protoc_insertion_point(field_get:io.deephaven.proto.backplane.grpc.HandshakeResponse.metadata_header)
-  return _internal_metadata_header();
-}
-template <typename Arg_, typename... Args_>
-inline PROTOBUF_ALWAYS_INLINE void HandshakeResponse::set_metadata_header(Arg_&& arg,
-                                                     Args_... args) {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  ;
-  _impl_.metadata_header_.SetBytes(static_cast<Arg_&&>(arg), args..., GetArena());
-  // @@protoc_insertion_point(field_set:io.deephaven.proto.backplane.grpc.HandshakeResponse.metadata_header)
-}
-inline std::string* HandshakeResponse::mutable_metadata_header() ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  std::string* _s = _internal_mutable_metadata_header();
-  // @@protoc_insertion_point(field_mutable:io.deephaven.proto.backplane.grpc.HandshakeResponse.metadata_header)
-  return _s;
-}
-inline const std::string& HandshakeResponse::_internal_metadata_header() const {
-  PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race);
-  return _impl_.metadata_header_.Get();
-}
-inline void HandshakeResponse::_internal_set_metadata_header(const std::string& value) {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  ;
-  _impl_.metadata_header_.Set(value, GetArena());
-}
-inline std::string* HandshakeResponse::_internal_mutable_metadata_header() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  ;
-  return _impl_.metadata_header_.Mutable( GetArena());
-}
-inline std::string* HandshakeResponse::release_metadata_header() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  // @@protoc_insertion_point(field_release:io.deephaven.proto.backplane.grpc.HandshakeResponse.metadata_header)
-  return _impl_.metadata_header_.Release();
-}
-inline void HandshakeResponse::set_allocated_metadata_header(std::string* value) {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  _impl_.metadata_header_.SetAllocated(value, GetArena());
-  #ifdef PROTOBUF_FORCE_COPY_DEFAULT_STRING
-        if (_impl_.metadata_header_.IsDefault()) {
-          _impl_.metadata_header_.Set("", GetArena());
-        }
-  #endif  // PROTOBUF_FORCE_COPY_DEFAULT_STRING
-  // @@protoc_insertion_point(field_set_allocated:io.deephaven.proto.backplane.grpc.HandshakeResponse.metadata_header)
-}
-
-// bytes session_token = 2 [deprecated = true];
-inline void HandshakeResponse::clear_session_token() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  _impl_.session_token_.ClearToEmpty();
-}
-inline const std::string& HandshakeResponse::session_token() const
-    ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  // @@protoc_insertion_point(field_get:io.deephaven.proto.backplane.grpc.HandshakeResponse.session_token)
-  return _internal_session_token();
-}
-template <typename Arg_, typename... Args_>
-inline PROTOBUF_ALWAYS_INLINE void HandshakeResponse::set_session_token(Arg_&& arg,
-                                                     Args_... args) {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  ;
-  _impl_.session_token_.SetBytes(static_cast<Arg_&&>(arg), args..., GetArena());
-  // @@protoc_insertion_point(field_set:io.deephaven.proto.backplane.grpc.HandshakeResponse.session_token)
-}
-inline std::string* HandshakeResponse::mutable_session_token() ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  std::string* _s = _internal_mutable_session_token();
-  // @@protoc_insertion_point(field_mutable:io.deephaven.proto.backplane.grpc.HandshakeResponse.session_token)
-  return _s;
-}
-inline const std::string& HandshakeResponse::_internal_session_token() const {
-  PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race);
-  return _impl_.session_token_.Get();
-}
-inline void HandshakeResponse::_internal_set_session_token(const std::string& value) {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  ;
-  _impl_.session_token_.Set(value, GetArena());
-}
-inline std::string* HandshakeResponse::_internal_mutable_session_token() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  ;
-  return _impl_.session_token_.Mutable( GetArena());
-}
-inline std::string* HandshakeResponse::release_session_token() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  // @@protoc_insertion_point(field_release:io.deephaven.proto.backplane.grpc.HandshakeResponse.session_token)
-  return _impl_.session_token_.Release();
-}
-inline void HandshakeResponse::set_allocated_session_token(std::string* value) {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  _impl_.session_token_.SetAllocated(value, GetArena());
-  #ifdef PROTOBUF_FORCE_COPY_DEFAULT_STRING
-        if (_impl_.session_token_.IsDefault()) {
-          _impl_.session_token_.Set("", GetArena());
-        }
-  #endif  // PROTOBUF_FORCE_COPY_DEFAULT_STRING
-  // @@protoc_insertion_point(field_set_allocated:io.deephaven.proto.backplane.grpc.HandshakeResponse.session_token)
-}
-
-// sint64 token_deadline_time_millis = 3 [deprecated = true, jstype = JS_STRING];
-inline void HandshakeResponse::clear_token_deadline_time_millis() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  _impl_.token_deadline_time_millis_ = ::int64_t{0};
-}
-inline ::int64_t HandshakeResponse::token_deadline_time_millis() const {
-  // @@protoc_insertion_point(field_get:io.deephaven.proto.backplane.grpc.HandshakeResponse.token_deadline_time_millis)
-  return _internal_token_deadline_time_millis();
-}
-inline void HandshakeResponse::set_token_deadline_time_millis(::int64_t value) {
-  _internal_set_token_deadline_time_millis(value);
-  // @@protoc_insertion_point(field_set:io.deephaven.proto.backplane.grpc.HandshakeResponse.token_deadline_time_millis)
-}
-inline ::int64_t HandshakeResponse::_internal_token_deadline_time_millis() const {
-  PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race);
-  return _impl_.token_deadline_time_millis_;
-}
-inline void HandshakeResponse::_internal_set_token_deadline_time_millis(::int64_t value) {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  ;
-  _impl_.token_deadline_time_millis_ = value;
-}
-
-// sint64 token_expiration_delay_millis = 4 [deprecated = true, jstype = JS_STRING];
-inline void HandshakeResponse::clear_token_expiration_delay_millis() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  _impl_.token_expiration_delay_millis_ = ::int64_t{0};
-}
-inline ::int64_t HandshakeResponse::token_expiration_delay_millis() const {
-  // @@protoc_insertion_point(field_get:io.deephaven.proto.backplane.grpc.HandshakeResponse.token_expiration_delay_millis)
-  return _internal_token_expiration_delay_millis();
-}
-inline void HandshakeResponse::set_token_expiration_delay_millis(::int64_t value) {
-  _internal_set_token_expiration_delay_millis(value);
-  // @@protoc_insertion_point(field_set:io.deephaven.proto.backplane.grpc.HandshakeResponse.token_expiration_delay_millis)
-}
-inline ::int64_t HandshakeResponse::_internal_token_expiration_delay_millis() const {
-  PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race);
-  return _impl_.token_expiration_delay_millis_;
-}
-inline void HandshakeResponse::_internal_set_token_expiration_delay_millis(::int64_t value) {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  ;
-  _impl_.token_expiration_delay_millis_ = value;
-}
-
-// -------------------------------------------------------------------
-
-// CloseSessionResponse
-
-// -------------------------------------------------------------------
-
-// ReleaseRequest
-
-// .io.deephaven.proto.backplane.grpc.Ticket id = 1;
-inline bool ReleaseRequest::has_id() const {
-  bool value = (_impl_._has_bits_[0] & 0x00000001u) != 0;
-  PROTOBUF_ASSUME(!value || _impl_.id_ != nullptr);
-  return value;
-}
-inline const ::io::deephaven::proto::backplane::grpc::Ticket& ReleaseRequest::_internal_id() const {
-  PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race);
-  const ::io::deephaven::proto::backplane::grpc::Ticket* p = _impl_.id_;
-  return p != nullptr ? *p : reinterpret_cast<const ::io::deephaven::proto::backplane::grpc::Ticket&>(::io::deephaven::proto::backplane::grpc::_Ticket_default_instance_);
-}
-inline const ::io::deephaven::proto::backplane::grpc::Ticket& ReleaseRequest::id() const ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  // @@protoc_insertion_point(field_get:io.deephaven.proto.backplane.grpc.ReleaseRequest.id)
-  return _internal_id();
-}
-inline void ReleaseRequest::unsafe_arena_set_allocated_id(::io::deephaven::proto::backplane::grpc::Ticket* value) {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  if (GetArena() == nullptr) {
-    delete reinterpret_cast<::google::protobuf::MessageLite*>(_impl_.id_);
-  }
-  _impl_.id_ = reinterpret_cast<::io::deephaven::proto::backplane::grpc::Ticket*>(value);
-  if (value != nullptr) {
-    _impl_._has_bits_[0] |= 0x00000001u;
-  } else {
-    _impl_._has_bits_[0] &= ~0x00000001u;
-  }
-  // @@protoc_insertion_point(field_unsafe_arena_set_allocated:io.deephaven.proto.backplane.grpc.ReleaseRequest.id)
-}
-inline ::io::deephaven::proto::backplane::grpc::Ticket* ReleaseRequest::release_id() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-
-  _impl_._has_bits_[0] &= ~0x00000001u;
-  ::io::deephaven::proto::backplane::grpc::Ticket* released = _impl_.id_;
-  _impl_.id_ = nullptr;
-#ifdef PROTOBUF_FORCE_COPY_IN_RELEASE
-  auto* old = reinterpret_cast<::google::protobuf::MessageLite*>(released);
-  released = ::google::protobuf::internal::DuplicateIfNonNull(released);
-  if (GetArena() == nullptr) {
-    delete old;
-  }
-#else   // PROTOBUF_FORCE_COPY_IN_RELEASE
-  if (GetArena() != nullptr) {
-    released = ::google::protobuf::internal::DuplicateIfNonNull(released);
-  }
-#endif  // !PROTOBUF_FORCE_COPY_IN_RELEASE
-  return released;
-}
-inline ::io::deephaven::proto::backplane::grpc::Ticket* ReleaseRequest::unsafe_arena_release_id() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  // @@protoc_insertion_point(field_release:io.deephaven.proto.backplane.grpc.ReleaseRequest.id)
-
-  _impl_._has_bits_[0] &= ~0x00000001u;
-  ::io::deephaven::proto::backplane::grpc::Ticket* temp = _impl_.id_;
-  _impl_.id_ = nullptr;
-  return temp;
-}
-inline ::io::deephaven::proto::backplane::grpc::Ticket* ReleaseRequest::_internal_mutable_id() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  _impl_._has_bits_[0] |= 0x00000001u;
-  if (_impl_.id_ == nullptr) {
-    auto* p = CreateMaybeMessage<::io::deephaven::proto::backplane::grpc::Ticket>(GetArena());
-    _impl_.id_ = reinterpret_cast<::io::deephaven::proto::backplane::grpc::Ticket*>(p);
-  }
-  return _impl_.id_;
-}
-inline ::io::deephaven::proto::backplane::grpc::Ticket* ReleaseRequest::mutable_id() ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  ::io::deephaven::proto::backplane::grpc::Ticket* _msg = _internal_mutable_id();
-  // @@protoc_insertion_point(field_mutable:io.deephaven.proto.backplane.grpc.ReleaseRequest.id)
-  return _msg;
-}
-inline void ReleaseRequest::set_allocated_id(::io::deephaven::proto::backplane::grpc::Ticket* value) {
-  ::google::protobuf::Arena* message_arena = GetArena();
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  if (message_arena == nullptr) {
-    delete reinterpret_cast<::google::protobuf::MessageLite*>(_impl_.id_);
-  }
-
-  if (value != nullptr) {
-    ::google::protobuf::Arena* submessage_arena = reinterpret_cast<::google::protobuf::MessageLite*>(value)->GetArena();
-    if (message_arena != submessage_arena) {
-      value = ::google::protobuf::internal::GetOwnedMessage(message_arena, value, submessage_arena);
-    }
-    _impl_._has_bits_[0] |= 0x00000001u;
-  } else {
-    _impl_._has_bits_[0] &= ~0x00000001u;
-  }
-
-  _impl_.id_ = reinterpret_cast<::io::deephaven::proto::backplane::grpc::Ticket*>(value);
-  // @@protoc_insertion_point(field_set_allocated:io.deephaven.proto.backplane.grpc.ReleaseRequest.id)
-}
-
-// -------------------------------------------------------------------
-
-// ReleaseResponse
-
-// -------------------------------------------------------------------
-
-// ExportRequest
-
-// .io.deephaven.proto.backplane.grpc.Ticket source_id = 1;
-inline bool ExportRequest::has_source_id() const {
-  bool value = (_impl_._has_bits_[0] & 0x00000001u) != 0;
-  PROTOBUF_ASSUME(!value || _impl_.source_id_ != nullptr);
-  return value;
-}
-inline const ::io::deephaven::proto::backplane::grpc::Ticket& ExportRequest::_internal_source_id() const {
-  PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race);
-  const ::io::deephaven::proto::backplane::grpc::Ticket* p = _impl_.source_id_;
-  return p != nullptr ? *p : reinterpret_cast<const ::io::deephaven::proto::backplane::grpc::Ticket&>(::io::deephaven::proto::backplane::grpc::_Ticket_default_instance_);
-}
-inline const ::io::deephaven::proto::backplane::grpc::Ticket& ExportRequest::source_id() const ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  // @@protoc_insertion_point(field_get:io.deephaven.proto.backplane.grpc.ExportRequest.source_id)
-  return _internal_source_id();
-}
-inline void ExportRequest::unsafe_arena_set_allocated_source_id(::io::deephaven::proto::backplane::grpc::Ticket* value) {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  if (GetArena() == nullptr) {
-    delete reinterpret_cast<::google::protobuf::MessageLite*>(_impl_.source_id_);
-  }
-  _impl_.source_id_ = reinterpret_cast<::io::deephaven::proto::backplane::grpc::Ticket*>(value);
-  if (value != nullptr) {
-    _impl_._has_bits_[0] |= 0x00000001u;
-  } else {
-    _impl_._has_bits_[0] &= ~0x00000001u;
-  }
-  // @@protoc_insertion_point(field_unsafe_arena_set_allocated:io.deephaven.proto.backplane.grpc.ExportRequest.source_id)
-}
-inline ::io::deephaven::proto::backplane::grpc::Ticket* ExportRequest::release_source_id() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-
-  _impl_._has_bits_[0] &= ~0x00000001u;
-  ::io::deephaven::proto::backplane::grpc::Ticket* released = _impl_.source_id_;
-  _impl_.source_id_ = nullptr;
-#ifdef PROTOBUF_FORCE_COPY_IN_RELEASE
-  auto* old = reinterpret_cast<::google::protobuf::MessageLite*>(released);
-  released = ::google::protobuf::internal::DuplicateIfNonNull(released);
-  if (GetArena() == nullptr) {
-    delete old;
-  }
-#else   // PROTOBUF_FORCE_COPY_IN_RELEASE
-  if (GetArena() != nullptr) {
-    released = ::google::protobuf::internal::DuplicateIfNonNull(released);
-  }
-#endif  // !PROTOBUF_FORCE_COPY_IN_RELEASE
-  return released;
-}
-inline ::io::deephaven::proto::backplane::grpc::Ticket* ExportRequest::unsafe_arena_release_source_id() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  // @@protoc_insertion_point(field_release:io.deephaven.proto.backplane.grpc.ExportRequest.source_id)
-
-  _impl_._has_bits_[0] &= ~0x00000001u;
-  ::io::deephaven::proto::backplane::grpc::Ticket* temp = _impl_.source_id_;
-  _impl_.source_id_ = nullptr;
-  return temp;
-}
-inline ::io::deephaven::proto::backplane::grpc::Ticket* ExportRequest::_internal_mutable_source_id() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  _impl_._has_bits_[0] |= 0x00000001u;
-  if (_impl_.source_id_ == nullptr) {
-    auto* p = CreateMaybeMessage<::io::deephaven::proto::backplane::grpc::Ticket>(GetArena());
-    _impl_.source_id_ = reinterpret_cast<::io::deephaven::proto::backplane::grpc::Ticket*>(p);
-  }
-  return _impl_.source_id_;
-}
-inline ::io::deephaven::proto::backplane::grpc::Ticket* ExportRequest::mutable_source_id() ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  ::io::deephaven::proto::backplane::grpc::Ticket* _msg = _internal_mutable_source_id();
-  // @@protoc_insertion_point(field_mutable:io.deephaven.proto.backplane.grpc.ExportRequest.source_id)
-  return _msg;
-}
-inline void ExportRequest::set_allocated_source_id(::io::deephaven::proto::backplane::grpc::Ticket* value) {
-  ::google::protobuf::Arena* message_arena = GetArena();
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  if (message_arena == nullptr) {
-    delete reinterpret_cast<::google::protobuf::MessageLite*>(_impl_.source_id_);
-  }
-
-  if (value != nullptr) {
-    ::google::protobuf::Arena* submessage_arena = reinterpret_cast<::google::protobuf::MessageLite*>(value)->GetArena();
-    if (message_arena != submessage_arena) {
-      value = ::google::protobuf::internal::GetOwnedMessage(message_arena, value, submessage_arena);
-    }
-    _impl_._has_bits_[0] |= 0x00000001u;
-  } else {
-    _impl_._has_bits_[0] &= ~0x00000001u;
-  }
-
-  _impl_.source_id_ = reinterpret_cast<::io::deephaven::proto::backplane::grpc::Ticket*>(value);
-  // @@protoc_insertion_point(field_set_allocated:io.deephaven.proto.backplane.grpc.ExportRequest.source_id)
-}
-
-// .io.deephaven.proto.backplane.grpc.Ticket result_id = 2;
-inline bool ExportRequest::has_result_id() const {
-  bool value = (_impl_._has_bits_[0] & 0x00000002u) != 0;
-  PROTOBUF_ASSUME(!value || _impl_.result_id_ != nullptr);
-  return value;
-}
-inline const ::io::deephaven::proto::backplane::grpc::Ticket& ExportRequest::_internal_result_id() const {
-  PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race);
-  const ::io::deephaven::proto::backplane::grpc::Ticket* p = _impl_.result_id_;
-  return p != nullptr ? *p : reinterpret_cast<const ::io::deephaven::proto::backplane::grpc::Ticket&>(::io::deephaven::proto::backplane::grpc::_Ticket_default_instance_);
-}
-inline const ::io::deephaven::proto::backplane::grpc::Ticket& ExportRequest::result_id() const ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  // @@protoc_insertion_point(field_get:io.deephaven.proto.backplane.grpc.ExportRequest.result_id)
-  return _internal_result_id();
-}
-inline void ExportRequest::unsafe_arena_set_allocated_result_id(::io::deephaven::proto::backplane::grpc::Ticket* value) {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  if (GetArena() == nullptr) {
-    delete reinterpret_cast<::google::protobuf::MessageLite*>(_impl_.result_id_);
-  }
-  _impl_.result_id_ = reinterpret_cast<::io::deephaven::proto::backplane::grpc::Ticket*>(value);
-  if (value != nullptr) {
-    _impl_._has_bits_[0] |= 0x00000002u;
-  } else {
-    _impl_._has_bits_[0] &= ~0x00000002u;
-  }
-  // @@protoc_insertion_point(field_unsafe_arena_set_allocated:io.deephaven.proto.backplane.grpc.ExportRequest.result_id)
-}
-inline ::io::deephaven::proto::backplane::grpc::Ticket* ExportRequest::release_result_id() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-
-  _impl_._has_bits_[0] &= ~0x00000002u;
-  ::io::deephaven::proto::backplane::grpc::Ticket* released = _impl_.result_id_;
-  _impl_.result_id_ = nullptr;
-#ifdef PROTOBUF_FORCE_COPY_IN_RELEASE
-  auto* old = reinterpret_cast<::google::protobuf::MessageLite*>(released);
-  released = ::google::protobuf::internal::DuplicateIfNonNull(released);
-  if (GetArena() == nullptr) {
-    delete old;
-  }
-#else   // PROTOBUF_FORCE_COPY_IN_RELEASE
-  if (GetArena() != nullptr) {
-    released = ::google::protobuf::internal::DuplicateIfNonNull(released);
-  }
-#endif  // !PROTOBUF_FORCE_COPY_IN_RELEASE
-  return released;
-}
-inline ::io::deephaven::proto::backplane::grpc::Ticket* ExportRequest::unsafe_arena_release_result_id() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  // @@protoc_insertion_point(field_release:io.deephaven.proto.backplane.grpc.ExportRequest.result_id)
-
-  _impl_._has_bits_[0] &= ~0x00000002u;
-  ::io::deephaven::proto::backplane::grpc::Ticket* temp = _impl_.result_id_;
-  _impl_.result_id_ = nullptr;
-  return temp;
-}
-inline ::io::deephaven::proto::backplane::grpc::Ticket* ExportRequest::_internal_mutable_result_id() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  _impl_._has_bits_[0] |= 0x00000002u;
-  if (_impl_.result_id_ == nullptr) {
-    auto* p = CreateMaybeMessage<::io::deephaven::proto::backplane::grpc::Ticket>(GetArena());
-    _impl_.result_id_ = reinterpret_cast<::io::deephaven::proto::backplane::grpc::Ticket*>(p);
-  }
-  return _impl_.result_id_;
-}
-inline ::io::deephaven::proto::backplane::grpc::Ticket* ExportRequest::mutable_result_id() ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  ::io::deephaven::proto::backplane::grpc::Ticket* _msg = _internal_mutable_result_id();
-  // @@protoc_insertion_point(field_mutable:io.deephaven.proto.backplane.grpc.ExportRequest.result_id)
-  return _msg;
-}
-inline void ExportRequest::set_allocated_result_id(::io::deephaven::proto::backplane::grpc::Ticket* value) {
-  ::google::protobuf::Arena* message_arena = GetArena();
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  if (message_arena == nullptr) {
-    delete reinterpret_cast<::google::protobuf::MessageLite*>(_impl_.result_id_);
-  }
-
-  if (value != nullptr) {
-    ::google::protobuf::Arena* submessage_arena = reinterpret_cast<::google::protobuf::MessageLite*>(value)->GetArena();
-    if (message_arena != submessage_arena) {
-      value = ::google::protobuf::internal::GetOwnedMessage(message_arena, value, submessage_arena);
-    }
-    _impl_._has_bits_[0] |= 0x00000002u;
-  } else {
-    _impl_._has_bits_[0] &= ~0x00000002u;
-  }
-
-  _impl_.result_id_ = reinterpret_cast<::io::deephaven::proto::backplane::grpc::Ticket*>(value);
-  // @@protoc_insertion_point(field_set_allocated:io.deephaven.proto.backplane.grpc.ExportRequest.result_id)
-}
-
-// -------------------------------------------------------------------
-
-// ExportResponse
-
-// -------------------------------------------------------------------
-
-// PublishRequest
-
-// .io.deephaven.proto.backplane.grpc.Ticket source_id = 1;
-inline bool PublishRequest::has_source_id() const {
-  bool value = (_impl_._has_bits_[0] & 0x00000001u) != 0;
-  PROTOBUF_ASSUME(!value || _impl_.source_id_ != nullptr);
-  return value;
-}
-inline const ::io::deephaven::proto::backplane::grpc::Ticket& PublishRequest::_internal_source_id() const {
-  PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race);
-  const ::io::deephaven::proto::backplane::grpc::Ticket* p = _impl_.source_id_;
-  return p != nullptr ? *p : reinterpret_cast<const ::io::deephaven::proto::backplane::grpc::Ticket&>(::io::deephaven::proto::backplane::grpc::_Ticket_default_instance_);
-}
-inline const ::io::deephaven::proto::backplane::grpc::Ticket& PublishRequest::source_id() const ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  // @@protoc_insertion_point(field_get:io.deephaven.proto.backplane.grpc.PublishRequest.source_id)
-  return _internal_source_id();
-}
-inline void PublishRequest::unsafe_arena_set_allocated_source_id(::io::deephaven::proto::backplane::grpc::Ticket* value) {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  if (GetArena() == nullptr) {
-    delete reinterpret_cast<::google::protobuf::MessageLite*>(_impl_.source_id_);
-  }
-  _impl_.source_id_ = reinterpret_cast<::io::deephaven::proto::backplane::grpc::Ticket*>(value);
-  if (value != nullptr) {
-    _impl_._has_bits_[0] |= 0x00000001u;
-  } else {
-    _impl_._has_bits_[0] &= ~0x00000001u;
-  }
-  // @@protoc_insertion_point(field_unsafe_arena_set_allocated:io.deephaven.proto.backplane.grpc.PublishRequest.source_id)
-}
-inline ::io::deephaven::proto::backplane::grpc::Ticket* PublishRequest::release_source_id() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-
-  _impl_._has_bits_[0] &= ~0x00000001u;
-  ::io::deephaven::proto::backplane::grpc::Ticket* released = _impl_.source_id_;
-  _impl_.source_id_ = nullptr;
-#ifdef PROTOBUF_FORCE_COPY_IN_RELEASE
-  auto* old = reinterpret_cast<::google::protobuf::MessageLite*>(released);
-  released = ::google::protobuf::internal::DuplicateIfNonNull(released);
-  if (GetArena() == nullptr) {
-    delete old;
-  }
-#else   // PROTOBUF_FORCE_COPY_IN_RELEASE
-  if (GetArena() != nullptr) {
-    released = ::google::protobuf::internal::DuplicateIfNonNull(released);
-  }
-#endif  // !PROTOBUF_FORCE_COPY_IN_RELEASE
-  return released;
-}
-inline ::io::deephaven::proto::backplane::grpc::Ticket* PublishRequest::unsafe_arena_release_source_id() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  // @@protoc_insertion_point(field_release:io.deephaven.proto.backplane.grpc.PublishRequest.source_id)
-
-  _impl_._has_bits_[0] &= ~0x00000001u;
-  ::io::deephaven::proto::backplane::grpc::Ticket* temp = _impl_.source_id_;
-  _impl_.source_id_ = nullptr;
-  return temp;
-}
-inline ::io::deephaven::proto::backplane::grpc::Ticket* PublishRequest::_internal_mutable_source_id() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  _impl_._has_bits_[0] |= 0x00000001u;
-  if (_impl_.source_id_ == nullptr) {
-    auto* p = CreateMaybeMessage<::io::deephaven::proto::backplane::grpc::Ticket>(GetArena());
-    _impl_.source_id_ = reinterpret_cast<::io::deephaven::proto::backplane::grpc::Ticket*>(p);
-  }
-  return _impl_.source_id_;
-}
-inline ::io::deephaven::proto::backplane::grpc::Ticket* PublishRequest::mutable_source_id() ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  ::io::deephaven::proto::backplane::grpc::Ticket* _msg = _internal_mutable_source_id();
-  // @@protoc_insertion_point(field_mutable:io.deephaven.proto.backplane.grpc.PublishRequest.source_id)
-  return _msg;
-}
-inline void PublishRequest::set_allocated_source_id(::io::deephaven::proto::backplane::grpc::Ticket* value) {
-  ::google::protobuf::Arena* message_arena = GetArena();
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  if (message_arena == nullptr) {
-    delete reinterpret_cast<::google::protobuf::MessageLite*>(_impl_.source_id_);
-  }
-
-  if (value != nullptr) {
-    ::google::protobuf::Arena* submessage_arena = reinterpret_cast<::google::protobuf::MessageLite*>(value)->GetArena();
-    if (message_arena != submessage_arena) {
-      value = ::google::protobuf::internal::GetOwnedMessage(message_arena, value, submessage_arena);
-    }
-    _impl_._has_bits_[0] |= 0x00000001u;
-  } else {
-    _impl_._has_bits_[0] &= ~0x00000001u;
-  }
-
-  _impl_.source_id_ = reinterpret_cast<::io::deephaven::proto::backplane::grpc::Ticket*>(value);
-  // @@protoc_insertion_point(field_set_allocated:io.deephaven.proto.backplane.grpc.PublishRequest.source_id)
-}
-
-// .io.deephaven.proto.backplane.grpc.Ticket result_id = 2;
-inline bool PublishRequest::has_result_id() const {
-  bool value = (_impl_._has_bits_[0] & 0x00000002u) != 0;
-  PROTOBUF_ASSUME(!value || _impl_.result_id_ != nullptr);
-  return value;
-}
-inline const ::io::deephaven::proto::backplane::grpc::Ticket& PublishRequest::_internal_result_id() const {
-  PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race);
-  const ::io::deephaven::proto::backplane::grpc::Ticket* p = _impl_.result_id_;
-  return p != nullptr ? *p : reinterpret_cast<const ::io::deephaven::proto::backplane::grpc::Ticket&>(::io::deephaven::proto::backplane::grpc::_Ticket_default_instance_);
-}
-inline const ::io::deephaven::proto::backplane::grpc::Ticket& PublishRequest::result_id() const ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  // @@protoc_insertion_point(field_get:io.deephaven.proto.backplane.grpc.PublishRequest.result_id)
-  return _internal_result_id();
-}
-inline void PublishRequest::unsafe_arena_set_allocated_result_id(::io::deephaven::proto::backplane::grpc::Ticket* value) {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  if (GetArena() == nullptr) {
-    delete reinterpret_cast<::google::protobuf::MessageLite*>(_impl_.result_id_);
-  }
-  _impl_.result_id_ = reinterpret_cast<::io::deephaven::proto::backplane::grpc::Ticket*>(value);
-  if (value != nullptr) {
-    _impl_._has_bits_[0] |= 0x00000002u;
-  } else {
-    _impl_._has_bits_[0] &= ~0x00000002u;
-  }
-  // @@protoc_insertion_point(field_unsafe_arena_set_allocated:io.deephaven.proto.backplane.grpc.PublishRequest.result_id)
-}
-inline ::io::deephaven::proto::backplane::grpc::Ticket* PublishRequest::release_result_id() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-
-  _impl_._has_bits_[0] &= ~0x00000002u;
-  ::io::deephaven::proto::backplane::grpc::Ticket* released = _impl_.result_id_;
-  _impl_.result_id_ = nullptr;
-#ifdef PROTOBUF_FORCE_COPY_IN_RELEASE
-  auto* old = reinterpret_cast<::google::protobuf::MessageLite*>(released);
-  released = ::google::protobuf::internal::DuplicateIfNonNull(released);
-  if (GetArena() == nullptr) {
-    delete old;
-  }
-#else   // PROTOBUF_FORCE_COPY_IN_RELEASE
-  if (GetArena() != nullptr) {
-    released = ::google::protobuf::internal::DuplicateIfNonNull(released);
-  }
-#endif  // !PROTOBUF_FORCE_COPY_IN_RELEASE
-  return released;
-}
-inline ::io::deephaven::proto::backplane::grpc::Ticket* PublishRequest::unsafe_arena_release_result_id() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  // @@protoc_insertion_point(field_release:io.deephaven.proto.backplane.grpc.PublishRequest.result_id)
-
-  _impl_._has_bits_[0] &= ~0x00000002u;
-  ::io::deephaven::proto::backplane::grpc::Ticket* temp = _impl_.result_id_;
-  _impl_.result_id_ = nullptr;
-  return temp;
-}
-inline ::io::deephaven::proto::backplane::grpc::Ticket* PublishRequest::_internal_mutable_result_id() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  _impl_._has_bits_[0] |= 0x00000002u;
-  if (_impl_.result_id_ == nullptr) {
-    auto* p = CreateMaybeMessage<::io::deephaven::proto::backplane::grpc::Ticket>(GetArena());
-    _impl_.result_id_ = reinterpret_cast<::io::deephaven::proto::backplane::grpc::Ticket*>(p);
-  }
-  return _impl_.result_id_;
-}
-inline ::io::deephaven::proto::backplane::grpc::Ticket* PublishRequest::mutable_result_id() ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  ::io::deephaven::proto::backplane::grpc::Ticket* _msg = _internal_mutable_result_id();
-  // @@protoc_insertion_point(field_mutable:io.deephaven.proto.backplane.grpc.PublishRequest.result_id)
-  return _msg;
-}
-inline void PublishRequest::set_allocated_result_id(::io::deephaven::proto::backplane::grpc::Ticket* value) {
-  ::google::protobuf::Arena* message_arena = GetArena();
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  if (message_arena == nullptr) {
-    delete reinterpret_cast<::google::protobuf::MessageLite*>(_impl_.result_id_);
-  }
-
-  if (value != nullptr) {
-    ::google::protobuf::Arena* submessage_arena = reinterpret_cast<::google::protobuf::MessageLite*>(value)->GetArena();
-    if (message_arena != submessage_arena) {
-      value = ::google::protobuf::internal::GetOwnedMessage(message_arena, value, submessage_arena);
-    }
-    _impl_._has_bits_[0] |= 0x00000002u;
-  } else {
-    _impl_._has_bits_[0] &= ~0x00000002u;
-  }
-
-  _impl_.result_id_ = reinterpret_cast<::io::deephaven::proto::backplane::grpc::Ticket*>(value);
-  // @@protoc_insertion_point(field_set_allocated:io.deephaven.proto.backplane.grpc.PublishRequest.result_id)
-}
-
-// -------------------------------------------------------------------
-
-// PublishResponse
-
-// -------------------------------------------------------------------
-
-// ExportNotificationRequest
-
-// -------------------------------------------------------------------
-
-// ExportNotification
-
-// .io.deephaven.proto.backplane.grpc.Ticket ticket = 1;
-inline bool ExportNotification::has_ticket() const {
-  bool value = (_impl_._has_bits_[0] & 0x00000001u) != 0;
-  PROTOBUF_ASSUME(!value || _impl_.ticket_ != nullptr);
-  return value;
-}
-inline const ::io::deephaven::proto::backplane::grpc::Ticket& ExportNotification::_internal_ticket() const {
-  PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race);
-  const ::io::deephaven::proto::backplane::grpc::Ticket* p = _impl_.ticket_;
-  return p != nullptr ? *p : reinterpret_cast<const ::io::deephaven::proto::backplane::grpc::Ticket&>(::io::deephaven::proto::backplane::grpc::_Ticket_default_instance_);
-}
-inline const ::io::deephaven::proto::backplane::grpc::Ticket& ExportNotification::ticket() const ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  // @@protoc_insertion_point(field_get:io.deephaven.proto.backplane.grpc.ExportNotification.ticket)
-  return _internal_ticket();
-}
-inline void ExportNotification::unsafe_arena_set_allocated_ticket(::io::deephaven::proto::backplane::grpc::Ticket* value) {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  if (GetArena() == nullptr) {
-    delete reinterpret_cast<::google::protobuf::MessageLite*>(_impl_.ticket_);
-  }
-  _impl_.ticket_ = reinterpret_cast<::io::deephaven::proto::backplane::grpc::Ticket*>(value);
-  if (value != nullptr) {
-    _impl_._has_bits_[0] |= 0x00000001u;
-  } else {
-    _impl_._has_bits_[0] &= ~0x00000001u;
-  }
-  // @@protoc_insertion_point(field_unsafe_arena_set_allocated:io.deephaven.proto.backplane.grpc.ExportNotification.ticket)
-}
-inline ::io::deephaven::proto::backplane::grpc::Ticket* ExportNotification::release_ticket() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-
-  _impl_._has_bits_[0] &= ~0x00000001u;
-  ::io::deephaven::proto::backplane::grpc::Ticket* released = _impl_.ticket_;
-  _impl_.ticket_ = nullptr;
-#ifdef PROTOBUF_FORCE_COPY_IN_RELEASE
-  auto* old = reinterpret_cast<::google::protobuf::MessageLite*>(released);
-  released = ::google::protobuf::internal::DuplicateIfNonNull(released);
-  if (GetArena() == nullptr) {
-    delete old;
-  }
-#else   // PROTOBUF_FORCE_COPY_IN_RELEASE
-  if (GetArena() != nullptr) {
-    released = ::google::protobuf::internal::DuplicateIfNonNull(released);
-  }
-#endif  // !PROTOBUF_FORCE_COPY_IN_RELEASE
-  return released;
-}
-inline ::io::deephaven::proto::backplane::grpc::Ticket* ExportNotification::unsafe_arena_release_ticket() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  // @@protoc_insertion_point(field_release:io.deephaven.proto.backplane.grpc.ExportNotification.ticket)
-
-  _impl_._has_bits_[0] &= ~0x00000001u;
-  ::io::deephaven::proto::backplane::grpc::Ticket* temp = _impl_.ticket_;
-  _impl_.ticket_ = nullptr;
-  return temp;
-}
-inline ::io::deephaven::proto::backplane::grpc::Ticket* ExportNotification::_internal_mutable_ticket() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  _impl_._has_bits_[0] |= 0x00000001u;
-  if (_impl_.ticket_ == nullptr) {
-    auto* p = CreateMaybeMessage<::io::deephaven::proto::backplane::grpc::Ticket>(GetArena());
-    _impl_.ticket_ = reinterpret_cast<::io::deephaven::proto::backplane::grpc::Ticket*>(p);
-  }
-  return _impl_.ticket_;
-}
-inline ::io::deephaven::proto::backplane::grpc::Ticket* ExportNotification::mutable_ticket() ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  ::io::deephaven::proto::backplane::grpc::Ticket* _msg = _internal_mutable_ticket();
-  // @@protoc_insertion_point(field_mutable:io.deephaven.proto.backplane.grpc.ExportNotification.ticket)
-  return _msg;
-}
-inline void ExportNotification::set_allocated_ticket(::io::deephaven::proto::backplane::grpc::Ticket* value) {
-  ::google::protobuf::Arena* message_arena = GetArena();
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  if (message_arena == nullptr) {
-    delete reinterpret_cast<::google::protobuf::MessageLite*>(_impl_.ticket_);
-  }
-
-  if (value != nullptr) {
-    ::google::protobuf::Arena* submessage_arena = reinterpret_cast<::google::protobuf::MessageLite*>(value)->GetArena();
-    if (message_arena != submessage_arena) {
-      value = ::google::protobuf::internal::GetOwnedMessage(message_arena, value, submessage_arena);
-    }
-    _impl_._has_bits_[0] |= 0x00000001u;
-  } else {
-    _impl_._has_bits_[0] &= ~0x00000001u;
-  }
-
-  _impl_.ticket_ = reinterpret_cast<::io::deephaven::proto::backplane::grpc::Ticket*>(value);
-  // @@protoc_insertion_point(field_set_allocated:io.deephaven.proto.backplane.grpc.ExportNotification.ticket)
-}
-
-// .io.deephaven.proto.backplane.grpc.ExportNotification.State export_state = 2;
-inline void ExportNotification::clear_export_state() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  _impl_.export_state_ = 0;
-}
-inline ::io::deephaven::proto::backplane::grpc::ExportNotification_State ExportNotification::export_state() const {
-  // @@protoc_insertion_point(field_get:io.deephaven.proto.backplane.grpc.ExportNotification.export_state)
-  return _internal_export_state();
-}
-inline void ExportNotification::set_export_state(::io::deephaven::proto::backplane::grpc::ExportNotification_State value) {
-  _internal_set_export_state(value);
-  // @@protoc_insertion_point(field_set:io.deephaven.proto.backplane.grpc.ExportNotification.export_state)
-}
-inline ::io::deephaven::proto::backplane::grpc::ExportNotification_State ExportNotification::_internal_export_state() const {
-  PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race);
-  return static_cast<::io::deephaven::proto::backplane::grpc::ExportNotification_State>(_impl_.export_state_);
-}
-inline void ExportNotification::_internal_set_export_state(::io::deephaven::proto::backplane::grpc::ExportNotification_State value) {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  ;
-  _impl_.export_state_ = value;
-}
-
-// string context = 3;
-inline void ExportNotification::clear_context() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  _impl_.context_.ClearToEmpty();
-}
-inline const std::string& ExportNotification::context() const
-    ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  // @@protoc_insertion_point(field_get:io.deephaven.proto.backplane.grpc.ExportNotification.context)
-  return _internal_context();
-}
-template <typename Arg_, typename... Args_>
-inline PROTOBUF_ALWAYS_INLINE void ExportNotification::set_context(Arg_&& arg,
-                                                     Args_... args) {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  ;
-  _impl_.context_.Set(static_cast<Arg_&&>(arg), args..., GetArena());
-  // @@protoc_insertion_point(field_set:io.deephaven.proto.backplane.grpc.ExportNotification.context)
-}
-inline std::string* ExportNotification::mutable_context() ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  std::string* _s = _internal_mutable_context();
-  // @@protoc_insertion_point(field_mutable:io.deephaven.proto.backplane.grpc.ExportNotification.context)
-  return _s;
-}
-inline const std::string& ExportNotification::_internal_context() const {
-  PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race);
-  return _impl_.context_.Get();
-}
-inline void ExportNotification::_internal_set_context(const std::string& value) {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  ;
-  _impl_.context_.Set(value, GetArena());
-}
-inline std::string* ExportNotification::_internal_mutable_context() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  ;
-  return _impl_.context_.Mutable( GetArena());
-}
-inline std::string* ExportNotification::release_context() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  // @@protoc_insertion_point(field_release:io.deephaven.proto.backplane.grpc.ExportNotification.context)
-  return _impl_.context_.Release();
-}
-inline void ExportNotification::set_allocated_context(std::string* value) {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  _impl_.context_.SetAllocated(value, GetArena());
-  #ifdef PROTOBUF_FORCE_COPY_DEFAULT_STRING
-        if (_impl_.context_.IsDefault()) {
-          _impl_.context_.Set("", GetArena());
-        }
-  #endif  // PROTOBUF_FORCE_COPY_DEFAULT_STRING
-  // @@protoc_insertion_point(field_set_allocated:io.deephaven.proto.backplane.grpc.ExportNotification.context)
-}
-
-// string dependent_handle = 4;
-inline void ExportNotification::clear_dependent_handle() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  _impl_.dependent_handle_.ClearToEmpty();
-}
-inline const std::string& ExportNotification::dependent_handle() const
-    ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  // @@protoc_insertion_point(field_get:io.deephaven.proto.backplane.grpc.ExportNotification.dependent_handle)
-  return _internal_dependent_handle();
-}
-template <typename Arg_, typename... Args_>
-inline PROTOBUF_ALWAYS_INLINE void ExportNotification::set_dependent_handle(Arg_&& arg,
-                                                     Args_... args) {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  ;
-  _impl_.dependent_handle_.Set(static_cast<Arg_&&>(arg), args..., GetArena());
-  // @@protoc_insertion_point(field_set:io.deephaven.proto.backplane.grpc.ExportNotification.dependent_handle)
-}
-inline std::string* ExportNotification::mutable_dependent_handle() ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  std::string* _s = _internal_mutable_dependent_handle();
-  // @@protoc_insertion_point(field_mutable:io.deephaven.proto.backplane.grpc.ExportNotification.dependent_handle)
-  return _s;
-}
-inline const std::string& ExportNotification::_internal_dependent_handle() const {
-  PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race);
-  return _impl_.dependent_handle_.Get();
-}
-inline void ExportNotification::_internal_set_dependent_handle(const std::string& value) {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  ;
-  _impl_.dependent_handle_.Set(value, GetArena());
-}
-inline std::string* ExportNotification::_internal_mutable_dependent_handle() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  ;
-  return _impl_.dependent_handle_.Mutable( GetArena());
-}
-inline std::string* ExportNotification::release_dependent_handle() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  // @@protoc_insertion_point(field_release:io.deephaven.proto.backplane.grpc.ExportNotification.dependent_handle)
-  return _impl_.dependent_handle_.Release();
-}
-inline void ExportNotification::set_allocated_dependent_handle(std::string* value) {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  _impl_.dependent_handle_.SetAllocated(value, GetArena());
-  #ifdef PROTOBUF_FORCE_COPY_DEFAULT_STRING
-        if (_impl_.dependent_handle_.IsDefault()) {
-          _impl_.dependent_handle_.Set("", GetArena());
-        }
-  #endif  // PROTOBUF_FORCE_COPY_DEFAULT_STRING
-  // @@protoc_insertion_point(field_set_allocated:io.deephaven.proto.backplane.grpc.ExportNotification.dependent_handle)
-}
-
-// -------------------------------------------------------------------
-
-// TerminationNotificationRequest
-
-// -------------------------------------------------------------------
-
-// TerminationNotificationResponse_StackTrace
-
-// string type = 1;
-inline void TerminationNotificationResponse_StackTrace::clear_type() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  _impl_.type_.ClearToEmpty();
-}
-inline const std::string& TerminationNotificationResponse_StackTrace::type() const
-    ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  // @@protoc_insertion_point(field_get:io.deephaven.proto.backplane.grpc.TerminationNotificationResponse.StackTrace.type)
-  return _internal_type();
-}
-template <typename Arg_, typename... Args_>
-inline PROTOBUF_ALWAYS_INLINE void TerminationNotificationResponse_StackTrace::set_type(Arg_&& arg,
-                                                     Args_... args) {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  ;
-  _impl_.type_.Set(static_cast<Arg_&&>(arg), args..., GetArena());
-  // @@protoc_insertion_point(field_set:io.deephaven.proto.backplane.grpc.TerminationNotificationResponse.StackTrace.type)
-}
-inline std::string* TerminationNotificationResponse_StackTrace::mutable_type() ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  std::string* _s = _internal_mutable_type();
-  // @@protoc_insertion_point(field_mutable:io.deephaven.proto.backplane.grpc.TerminationNotificationResponse.StackTrace.type)
-  return _s;
-}
-inline const std::string& TerminationNotificationResponse_StackTrace::_internal_type() const {
-  PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race);
-  return _impl_.type_.Get();
-}
-inline void TerminationNotificationResponse_StackTrace::_internal_set_type(const std::string& value) {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  ;
-  _impl_.type_.Set(value, GetArena());
-}
-inline std::string* TerminationNotificationResponse_StackTrace::_internal_mutable_type() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  ;
-  return _impl_.type_.Mutable( GetArena());
-}
-inline std::string* TerminationNotificationResponse_StackTrace::release_type() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  // @@protoc_insertion_point(field_release:io.deephaven.proto.backplane.grpc.TerminationNotificationResponse.StackTrace.type)
-  return _impl_.type_.Release();
-}
-inline void TerminationNotificationResponse_StackTrace::set_allocated_type(std::string* value) {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  _impl_.type_.SetAllocated(value, GetArena());
-  #ifdef PROTOBUF_FORCE_COPY_DEFAULT_STRING
-        if (_impl_.type_.IsDefault()) {
-          _impl_.type_.Set("", GetArena());
-        }
-  #endif  // PROTOBUF_FORCE_COPY_DEFAULT_STRING
-  // @@protoc_insertion_point(field_set_allocated:io.deephaven.proto.backplane.grpc.TerminationNotificationResponse.StackTrace.type)
-}
-
-// string message = 2;
-inline void TerminationNotificationResponse_StackTrace::clear_message() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  _impl_.message_.ClearToEmpty();
-}
-inline const std::string& TerminationNotificationResponse_StackTrace::message() const
-    ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  // @@protoc_insertion_point(field_get:io.deephaven.proto.backplane.grpc.TerminationNotificationResponse.StackTrace.message)
-  return _internal_message();
-}
-template <typename Arg_, typename... Args_>
-inline PROTOBUF_ALWAYS_INLINE void TerminationNotificationResponse_StackTrace::set_message(Arg_&& arg,
-                                                     Args_... args) {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  ;
-  _impl_.message_.Set(static_cast<Arg_&&>(arg), args..., GetArena());
-  // @@protoc_insertion_point(field_set:io.deephaven.proto.backplane.grpc.TerminationNotificationResponse.StackTrace.message)
-}
-inline std::string* TerminationNotificationResponse_StackTrace::mutable_message() ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  std::string* _s = _internal_mutable_message();
-  // @@protoc_insertion_point(field_mutable:io.deephaven.proto.backplane.grpc.TerminationNotificationResponse.StackTrace.message)
-  return _s;
-}
-inline const std::string& TerminationNotificationResponse_StackTrace::_internal_message() const {
-  PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race);
-  return _impl_.message_.Get();
-}
-inline void TerminationNotificationResponse_StackTrace::_internal_set_message(const std::string& value) {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  ;
-  _impl_.message_.Set(value, GetArena());
-}
-inline std::string* TerminationNotificationResponse_StackTrace::_internal_mutable_message() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  ;
-  return _impl_.message_.Mutable( GetArena());
-}
-inline std::string* TerminationNotificationResponse_StackTrace::release_message() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  // @@protoc_insertion_point(field_release:io.deephaven.proto.backplane.grpc.TerminationNotificationResponse.StackTrace.message)
-  return _impl_.message_.Release();
-}
-inline void TerminationNotificationResponse_StackTrace::set_allocated_message(std::string* value) {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  _impl_.message_.SetAllocated(value, GetArena());
-  #ifdef PROTOBUF_FORCE_COPY_DEFAULT_STRING
-        if (_impl_.message_.IsDefault()) {
-          _impl_.message_.Set("", GetArena());
-        }
-  #endif  // PROTOBUF_FORCE_COPY_DEFAULT_STRING
-  // @@protoc_insertion_point(field_set_allocated:io.deephaven.proto.backplane.grpc.TerminationNotificationResponse.StackTrace.message)
-}
-
-// repeated string elements = 3;
-inline int TerminationNotificationResponse_StackTrace::_internal_elements_size() const {
-  return _internal_elements().size();
-}
-inline int TerminationNotificationResponse_StackTrace::elements_size() const {
-  return _internal_elements_size();
-}
-inline void TerminationNotificationResponse_StackTrace::clear_elements() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  _impl_.elements_.Clear();
-}
-inline std::string* TerminationNotificationResponse_StackTrace::add_elements()
-    ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  std::string* _s = _internal_mutable_elements()->Add();
-  // @@protoc_insertion_point(field_add_mutable:io.deephaven.proto.backplane.grpc.TerminationNotificationResponse.StackTrace.elements)
-  return _s;
-}
-inline const std::string& TerminationNotificationResponse_StackTrace::elements(int index) const
-    ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  // @@protoc_insertion_point(field_get:io.deephaven.proto.backplane.grpc.TerminationNotificationResponse.StackTrace.elements)
-  return _internal_elements().Get(index);
-}
-inline std::string* TerminationNotificationResponse_StackTrace::mutable_elements(int index)
-    ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  // @@protoc_insertion_point(field_mutable:io.deephaven.proto.backplane.grpc.TerminationNotificationResponse.StackTrace.elements)
-  return _internal_mutable_elements()->Mutable(index);
-}
-inline void TerminationNotificationResponse_StackTrace::set_elements(int index, const std::string& value) {
-  _internal_mutable_elements()->Mutable(index)->assign(value);
-  // @@protoc_insertion_point(field_set:io.deephaven.proto.backplane.grpc.TerminationNotificationResponse.StackTrace.elements)
-}
-inline void TerminationNotificationResponse_StackTrace::set_elements(int index, std::string&& value) {
-  _internal_mutable_elements()->Mutable(index)->assign(std::move(value));
-  // @@protoc_insertion_point(field_set:io.deephaven.proto.backplane.grpc.TerminationNotificationResponse.StackTrace.elements)
-}
-inline void TerminationNotificationResponse_StackTrace::set_elements(int index, const char* value) {
-  ABSL_DCHECK(value != nullptr);
-  _internal_mutable_elements()->Mutable(index)->assign(value);
-  // @@protoc_insertion_point(field_set_char:io.deephaven.proto.backplane.grpc.TerminationNotificationResponse.StackTrace.elements)
-}
-inline void TerminationNotificationResponse_StackTrace::set_elements(int index, const char* value,
-                              std::size_t size) {
-  _internal_mutable_elements()->Mutable(index)->assign(
-      reinterpret_cast<const char*>(value), size);
-  // @@protoc_insertion_point(field_set_pointer:io.deephaven.proto.backplane.grpc.TerminationNotificationResponse.StackTrace.elements)
-}
-inline void TerminationNotificationResponse_StackTrace::set_elements(int index, absl::string_view value) {
-  _internal_mutable_elements()->Mutable(index)->assign(value.data(),
-                                                     value.size());
-  // @@protoc_insertion_point(field_set_string_piece:io.deephaven.proto.backplane.grpc.TerminationNotificationResponse.StackTrace.elements)
-}
-inline void TerminationNotificationResponse_StackTrace::add_elements(const std::string& value) {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  _internal_mutable_elements()->Add()->assign(value);
-  // @@protoc_insertion_point(field_add:io.deephaven.proto.backplane.grpc.TerminationNotificationResponse.StackTrace.elements)
-}
-inline void TerminationNotificationResponse_StackTrace::add_elements(std::string&& value) {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  _internal_mutable_elements()->Add(std::move(value));
-  // @@protoc_insertion_point(field_add:io.deephaven.proto.backplane.grpc.TerminationNotificationResponse.StackTrace.elements)
-}
-inline void TerminationNotificationResponse_StackTrace::add_elements(const char* value) {
-  ABSL_DCHECK(value != nullptr);
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  _internal_mutable_elements()->Add()->assign(value);
-  // @@protoc_insertion_point(field_add_char:io.deephaven.proto.backplane.grpc.TerminationNotificationResponse.StackTrace.elements)
-}
-inline void TerminationNotificationResponse_StackTrace::add_elements(const char* value, std::size_t size) {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  _internal_mutable_elements()->Add()->assign(
-      reinterpret_cast<const char*>(value), size);
-  // @@protoc_insertion_point(field_add_pointer:io.deephaven.proto.backplane.grpc.TerminationNotificationResponse.StackTrace.elements)
-}
-inline void TerminationNotificationResponse_StackTrace::add_elements(absl::string_view value) {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  _internal_mutable_elements()->Add()->assign(value.data(), value.size());
-  // @@protoc_insertion_point(field_add_string_piece:io.deephaven.proto.backplane.grpc.TerminationNotificationResponse.StackTrace.elements)
-}
-inline const ::google::protobuf::RepeatedPtrField<std::string>&
-TerminationNotificationResponse_StackTrace::elements() const ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  // @@protoc_insertion_point(field_list:io.deephaven.proto.backplane.grpc.TerminationNotificationResponse.StackTrace.elements)
-  return _internal_elements();
-}
-inline ::google::protobuf::RepeatedPtrField<std::string>*
-TerminationNotificationResponse_StackTrace::mutable_elements() ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  // @@protoc_insertion_point(field_mutable_list:io.deephaven.proto.backplane.grpc.TerminationNotificationResponse.StackTrace.elements)
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  return _internal_mutable_elements();
-}
-inline const ::google::protobuf::RepeatedPtrField<std::string>&
-TerminationNotificationResponse_StackTrace::_internal_elements() const {
-  PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race);
-  return _impl_.elements_;
-}
-inline ::google::protobuf::RepeatedPtrField<std::string>*
-TerminationNotificationResponse_StackTrace::_internal_mutable_elements() {
-  PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race);
-  return &_impl_.elements_;
-}
-
-// -------------------------------------------------------------------
-
-// TerminationNotificationResponse
-
-// bool abnormal_termination = 1;
-inline void TerminationNotificationResponse::clear_abnormal_termination() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  _impl_.abnormal_termination_ = false;
-}
-inline bool TerminationNotificationResponse::abnormal_termination() const {
-  // @@protoc_insertion_point(field_get:io.deephaven.proto.backplane.grpc.TerminationNotificationResponse.abnormal_termination)
-  return _internal_abnormal_termination();
-}
-inline void TerminationNotificationResponse::set_abnormal_termination(bool value) {
-  _internal_set_abnormal_termination(value);
-  // @@protoc_insertion_point(field_set:io.deephaven.proto.backplane.grpc.TerminationNotificationResponse.abnormal_termination)
-}
-inline bool TerminationNotificationResponse::_internal_abnormal_termination() const {
-  PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race);
-  return _impl_.abnormal_termination_;
-}
-inline void TerminationNotificationResponse::_internal_set_abnormal_termination(bool value) {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  ;
-  _impl_.abnormal_termination_ = value;
-}
-
-// string reason = 2;
-inline void TerminationNotificationResponse::clear_reason() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  _impl_.reason_.ClearToEmpty();
-}
-inline const std::string& TerminationNotificationResponse::reason() const
-    ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  // @@protoc_insertion_point(field_get:io.deephaven.proto.backplane.grpc.TerminationNotificationResponse.reason)
-  return _internal_reason();
-}
-template <typename Arg_, typename... Args_>
-inline PROTOBUF_ALWAYS_INLINE void TerminationNotificationResponse::set_reason(Arg_&& arg,
-                                                     Args_... args) {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  ;
-  _impl_.reason_.Set(static_cast<Arg_&&>(arg), args..., GetArena());
-  // @@protoc_insertion_point(field_set:io.deephaven.proto.backplane.grpc.TerminationNotificationResponse.reason)
-}
-inline std::string* TerminationNotificationResponse::mutable_reason() ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  std::string* _s = _internal_mutable_reason();
-  // @@protoc_insertion_point(field_mutable:io.deephaven.proto.backplane.grpc.TerminationNotificationResponse.reason)
-  return _s;
-}
-inline const std::string& TerminationNotificationResponse::_internal_reason() const {
-  PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race);
-  return _impl_.reason_.Get();
-}
-inline void TerminationNotificationResponse::_internal_set_reason(const std::string& value) {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  ;
-  _impl_.reason_.Set(value, GetArena());
-}
-inline std::string* TerminationNotificationResponse::_internal_mutable_reason() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  ;
-  return _impl_.reason_.Mutable( GetArena());
-}
-inline std::string* TerminationNotificationResponse::release_reason() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  // @@protoc_insertion_point(field_release:io.deephaven.proto.backplane.grpc.TerminationNotificationResponse.reason)
-  return _impl_.reason_.Release();
-}
-inline void TerminationNotificationResponse::set_allocated_reason(std::string* value) {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  _impl_.reason_.SetAllocated(value, GetArena());
-  #ifdef PROTOBUF_FORCE_COPY_DEFAULT_STRING
-        if (_impl_.reason_.IsDefault()) {
-          _impl_.reason_.Set("", GetArena());
-        }
-  #endif  // PROTOBUF_FORCE_COPY_DEFAULT_STRING
-  // @@protoc_insertion_point(field_set_allocated:io.deephaven.proto.backplane.grpc.TerminationNotificationResponse.reason)
-}
-
-// bool is_from_uncaught_exception = 3;
-inline void TerminationNotificationResponse::clear_is_from_uncaught_exception() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  _impl_.is_from_uncaught_exception_ = false;
-}
-inline bool TerminationNotificationResponse::is_from_uncaught_exception() const {
-  // @@protoc_insertion_point(field_get:io.deephaven.proto.backplane.grpc.TerminationNotificationResponse.is_from_uncaught_exception)
-  return _internal_is_from_uncaught_exception();
-}
-inline void TerminationNotificationResponse::set_is_from_uncaught_exception(bool value) {
-  _internal_set_is_from_uncaught_exception(value);
-  // @@protoc_insertion_point(field_set:io.deephaven.proto.backplane.grpc.TerminationNotificationResponse.is_from_uncaught_exception)
-}
-inline bool TerminationNotificationResponse::_internal_is_from_uncaught_exception() const {
-  PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race);
-  return _impl_.is_from_uncaught_exception_;
-}
-inline void TerminationNotificationResponse::_internal_set_is_from_uncaught_exception(bool value) {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  ;
-  _impl_.is_from_uncaught_exception_ = value;
-}
-
-// repeated .io.deephaven.proto.backplane.grpc.TerminationNotificationResponse.StackTrace stack_traces = 4;
-inline int TerminationNotificationResponse::_internal_stack_traces_size() const {
-  return _internal_stack_traces().size();
-}
-inline int TerminationNotificationResponse::stack_traces_size() const {
-  return _internal_stack_traces_size();
-}
-inline void TerminationNotificationResponse::clear_stack_traces() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  _impl_.stack_traces_.Clear();
-}
-inline ::io::deephaven::proto::backplane::grpc::TerminationNotificationResponse_StackTrace* TerminationNotificationResponse::mutable_stack_traces(int index)
-    ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  // @@protoc_insertion_point(field_mutable:io.deephaven.proto.backplane.grpc.TerminationNotificationResponse.stack_traces)
-  return _internal_mutable_stack_traces()->Mutable(index);
-}
-inline ::google::protobuf::RepeatedPtrField<::io::deephaven::proto::backplane::grpc::TerminationNotificationResponse_StackTrace>* TerminationNotificationResponse::mutable_stack_traces()
-    ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  // @@protoc_insertion_point(field_mutable_list:io.deephaven.proto.backplane.grpc.TerminationNotificationResponse.stack_traces)
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  return _internal_mutable_stack_traces();
-}
-inline const ::io::deephaven::proto::backplane::grpc::TerminationNotificationResponse_StackTrace& TerminationNotificationResponse::stack_traces(int index) const
-    ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  // @@protoc_insertion_point(field_get:io.deephaven.proto.backplane.grpc.TerminationNotificationResponse.stack_traces)
-  return _internal_stack_traces().Get(index);
-}
-inline ::io::deephaven::proto::backplane::grpc::TerminationNotificationResponse_StackTrace* TerminationNotificationResponse::add_stack_traces() ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  ::io::deephaven::proto::backplane::grpc::TerminationNotificationResponse_StackTrace* _add = _internal_mutable_stack_traces()->Add();
-  // @@protoc_insertion_point(field_add:io.deephaven.proto.backplane.grpc.TerminationNotificationResponse.stack_traces)
-  return _add;
-}
-inline const ::google::protobuf::RepeatedPtrField<::io::deephaven::proto::backplane::grpc::TerminationNotificationResponse_StackTrace>& TerminationNotificationResponse::stack_traces() const
-    ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  // @@protoc_insertion_point(field_list:io.deephaven.proto.backplane.grpc.TerminationNotificationResponse.stack_traces)
-  return _internal_stack_traces();
-}
-inline const ::google::protobuf::RepeatedPtrField<::io::deephaven::proto::backplane::grpc::TerminationNotificationResponse_StackTrace>&
-TerminationNotificationResponse::_internal_stack_traces() const {
-  PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race);
-  return _impl_.stack_traces_;
-}
-inline ::google::protobuf::RepeatedPtrField<::io::deephaven::proto::backplane::grpc::TerminationNotificationResponse_StackTrace>*
-TerminationNotificationResponse::_internal_mutable_stack_traces() {
-  PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race);
-  return &_impl_.stack_traces_;
-}
-
-#ifdef __GNUC__
-#pragma GCC diagnostic pop
-#endif  // __GNUC__
-
-// @@protoc_insertion_point(namespace_scope)
-}  // namespace grpc
-}  // namespace backplane
-}  // namespace proto
-}  // namespace deephaven
-}  // namespace io
-
-
-namespace google {
-namespace protobuf {
-
-template <>
-struct is_proto_enum<::io::deephaven::proto::backplane::grpc::ExportNotification_State> : std::true_type {};
-template <>
-inline const EnumDescriptor* GetEnumDescriptor<::io::deephaven::proto::backplane::grpc::ExportNotification_State>() {
-  return ::io::deephaven::proto::backplane::grpc::ExportNotification_State_descriptor();
-}
-
-}  // namespace protobuf
-}  // namespace google
-
-// @@protoc_insertion_point(global_scope)
-
-#include "google/protobuf/port_undef.inc"
-
-#endif  // GOOGLE_PROTOBUF_INCLUDED_deephaven_2fproto_2fsession_2eproto_2epb_2eh
diff --git a/cpp-client/deephaven/dhclient/proto/deephaven/proto/storage.grpc.pb.cc b/cpp-client/deephaven/dhclient/proto/deephaven/proto/storage.grpc.pb.cc
deleted file mode 100644
index eec7ddcbd60..00000000000
--- a/cpp-client/deephaven/dhclient/proto/deephaven/proto/storage.grpc.pb.cc
+++ /dev/null
@@ -1,304 +0,0 @@
-// Generated by the gRPC C++ plugin.
-// If you make any local change, they will be lost.
-// source: deephaven/proto/storage.proto
-
-#include "deephaven/proto/storage.pb.h"
-#include "deephaven/proto/storage.grpc.pb.h"
-
-#include <functional>
-#include <grpcpp/support/async_stream.h>
-#include <grpcpp/support/async_unary_call.h>
-#include <grpcpp/impl/channel_interface.h>
-#include <grpcpp/impl/client_unary_call.h>
-#include <grpcpp/support/client_callback.h>
-#include <grpcpp/support/message_allocator.h>
-#include <grpcpp/support/method_handler.h>
-#include <grpcpp/impl/rpc_service_method.h>
-#include <grpcpp/support/server_callback.h>
-#include <grpcpp/impl/server_callback_handlers.h>
-#include <grpcpp/server_context.h>
-#include <grpcpp/impl/service_type.h>
-#include <grpcpp/support/sync_stream.h>
-namespace io {
-namespace deephaven {
-namespace proto {
-namespace backplane {
-namespace grpc {
-
-static const char* StorageService_method_names[] = {
-  "/io.deephaven.proto.backplane.grpc.StorageService/ListItems",
-  "/io.deephaven.proto.backplane.grpc.StorageService/FetchFile",
-  "/io.deephaven.proto.backplane.grpc.StorageService/SaveFile",
-  "/io.deephaven.proto.backplane.grpc.StorageService/MoveItem",
-  "/io.deephaven.proto.backplane.grpc.StorageService/CreateDirectory",
-  "/io.deephaven.proto.backplane.grpc.StorageService/DeleteItem",
-};
-
-std::unique_ptr< StorageService::Stub> StorageService::NewStub(const std::shared_ptr< ::grpc::ChannelInterface>& channel, const ::grpc::StubOptions& options) {
-  (void)options;
-  std::unique_ptr< StorageService::Stub> stub(new StorageService::Stub(channel, options));
-  return stub;
-}
-
-StorageService::Stub::Stub(const std::shared_ptr< ::grpc::ChannelInterface>& channel, const ::grpc::StubOptions& options)
-  : channel_(channel), rpcmethod_ListItems_(StorageService_method_names[0], options.suffix_for_stats(),::grpc::internal::RpcMethod::NORMAL_RPC, channel)
-  , rpcmethod_FetchFile_(StorageService_method_names[1], options.suffix_for_stats(),::grpc::internal::RpcMethod::NORMAL_RPC, channel)
-  , rpcmethod_SaveFile_(StorageService_method_names[2], options.suffix_for_stats(),::grpc::internal::RpcMethod::NORMAL_RPC, channel)
-  , rpcmethod_MoveItem_(StorageService_method_names[3], options.suffix_for_stats(),::grpc::internal::RpcMethod::NORMAL_RPC, channel)
-  , rpcmethod_CreateDirectory_(StorageService_method_names[4], options.suffix_for_stats(),::grpc::internal::RpcMethod::NORMAL_RPC, channel)
-  , rpcmethod_DeleteItem_(StorageService_method_names[5], options.suffix_for_stats(),::grpc::internal::RpcMethod::NORMAL_RPC, channel)
-  {}
-
-::grpc::Status StorageService::Stub::ListItems(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::ListItemsRequest& request, ::io::deephaven::proto::backplane::grpc::ListItemsResponse* response) {
-  return ::grpc::internal::BlockingUnaryCall< ::io::deephaven::proto::backplane::grpc::ListItemsRequest, ::io::deephaven::proto::backplane::grpc::ListItemsResponse, ::grpc::protobuf::MessageLite, ::grpc::protobuf::MessageLite>(channel_.get(), rpcmethod_ListItems_, context, request, response);
-}
-
-void StorageService::Stub::async::ListItems(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::ListItemsRequest* request, ::io::deephaven::proto::backplane::grpc::ListItemsResponse* response, std::function<void(::grpc::Status)> f) {
-  ::grpc::internal::CallbackUnaryCall< ::io::deephaven::proto::backplane::grpc::ListItemsRequest, ::io::deephaven::proto::backplane::grpc::ListItemsResponse, ::grpc::protobuf::MessageLite, ::grpc::protobuf::MessageLite>(stub_->channel_.get(), stub_->rpcmethod_ListItems_, context, request, response, std::move(f));
-}
-
-void StorageService::Stub::async::ListItems(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::ListItemsRequest* request, ::io::deephaven::proto::backplane::grpc::ListItemsResponse* response, ::grpc::ClientUnaryReactor* reactor) {
-  ::grpc::internal::ClientCallbackUnaryFactory::Create< ::grpc::protobuf::MessageLite, ::grpc::protobuf::MessageLite>(stub_->channel_.get(), stub_->rpcmethod_ListItems_, context, request, response, reactor);
-}
-
-::grpc::ClientAsyncResponseReader< ::io::deephaven::proto::backplane::grpc::ListItemsResponse>* StorageService::Stub::PrepareAsyncListItemsRaw(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::ListItemsRequest& request, ::grpc::CompletionQueue* cq) {
-  return ::grpc::internal::ClientAsyncResponseReaderHelper::Create< ::io::deephaven::proto::backplane::grpc::ListItemsResponse, ::io::deephaven::proto::backplane::grpc::ListItemsRequest, ::grpc::protobuf::MessageLite, ::grpc::protobuf::MessageLite>(channel_.get(), cq, rpcmethod_ListItems_, context, request);
-}
-
-::grpc::ClientAsyncResponseReader< ::io::deephaven::proto::backplane::grpc::ListItemsResponse>* StorageService::Stub::AsyncListItemsRaw(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::ListItemsRequest& request, ::grpc::CompletionQueue* cq) {
-  auto* result =
-    this->PrepareAsyncListItemsRaw(context, request, cq);
-  result->StartCall();
-  return result;
-}
-
-::grpc::Status StorageService::Stub::FetchFile(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::FetchFileRequest& request, ::io::deephaven::proto::backplane::grpc::FetchFileResponse* response) {
-  return ::grpc::internal::BlockingUnaryCall< ::io::deephaven::proto::backplane::grpc::FetchFileRequest, ::io::deephaven::proto::backplane::grpc::FetchFileResponse, ::grpc::protobuf::MessageLite, ::grpc::protobuf::MessageLite>(channel_.get(), rpcmethod_FetchFile_, context, request, response);
-}
-
-void StorageService::Stub::async::FetchFile(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::FetchFileRequest* request, ::io::deephaven::proto::backplane::grpc::FetchFileResponse* response, std::function<void(::grpc::Status)> f) {
-  ::grpc::internal::CallbackUnaryCall< ::io::deephaven::proto::backplane::grpc::FetchFileRequest, ::io::deephaven::proto::backplane::grpc::FetchFileResponse, ::grpc::protobuf::MessageLite, ::grpc::protobuf::MessageLite>(stub_->channel_.get(), stub_->rpcmethod_FetchFile_, context, request, response, std::move(f));
-}
-
-void StorageService::Stub::async::FetchFile(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::FetchFileRequest* request, ::io::deephaven::proto::backplane::grpc::FetchFileResponse* response, ::grpc::ClientUnaryReactor* reactor) {
-  ::grpc::internal::ClientCallbackUnaryFactory::Create< ::grpc::protobuf::MessageLite, ::grpc::protobuf::MessageLite>(stub_->channel_.get(), stub_->rpcmethod_FetchFile_, context, request, response, reactor);
-}
-
-::grpc::ClientAsyncResponseReader< ::io::deephaven::proto::backplane::grpc::FetchFileResponse>* StorageService::Stub::PrepareAsyncFetchFileRaw(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::FetchFileRequest& request, ::grpc::CompletionQueue* cq) {
-  return ::grpc::internal::ClientAsyncResponseReaderHelper::Create< ::io::deephaven::proto::backplane::grpc::FetchFileResponse, ::io::deephaven::proto::backplane::grpc::FetchFileRequest, ::grpc::protobuf::MessageLite, ::grpc::protobuf::MessageLite>(channel_.get(), cq, rpcmethod_FetchFile_, context, request);
-}
-
-::grpc::ClientAsyncResponseReader< ::io::deephaven::proto::backplane::grpc::FetchFileResponse>* StorageService::Stub::AsyncFetchFileRaw(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::FetchFileRequest& request, ::grpc::CompletionQueue* cq) {
-  auto* result =
-    this->PrepareAsyncFetchFileRaw(context, request, cq);
-  result->StartCall();
-  return result;
-}
-
-::grpc::Status StorageService::Stub::SaveFile(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::SaveFileRequest& request, ::io::deephaven::proto::backplane::grpc::SaveFileResponse* response) {
-  return ::grpc::internal::BlockingUnaryCall< ::io::deephaven::proto::backplane::grpc::SaveFileRequest, ::io::deephaven::proto::backplane::grpc::SaveFileResponse, ::grpc::protobuf::MessageLite, ::grpc::protobuf::MessageLite>(channel_.get(), rpcmethod_SaveFile_, context, request, response);
-}
-
-void StorageService::Stub::async::SaveFile(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::SaveFileRequest* request, ::io::deephaven::proto::backplane::grpc::SaveFileResponse* response, std::function<void(::grpc::Status)> f) {
-  ::grpc::internal::CallbackUnaryCall< ::io::deephaven::proto::backplane::grpc::SaveFileRequest, ::io::deephaven::proto::backplane::grpc::SaveFileResponse, ::grpc::protobuf::MessageLite, ::grpc::protobuf::MessageLite>(stub_->channel_.get(), stub_->rpcmethod_SaveFile_, context, request, response, std::move(f));
-}
-
-void StorageService::Stub::async::SaveFile(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::SaveFileRequest* request, ::io::deephaven::proto::backplane::grpc::SaveFileResponse* response, ::grpc::ClientUnaryReactor* reactor) {
-  ::grpc::internal::ClientCallbackUnaryFactory::Create< ::grpc::protobuf::MessageLite, ::grpc::protobuf::MessageLite>(stub_->channel_.get(), stub_->rpcmethod_SaveFile_, context, request, response, reactor);
-}
-
-::grpc::ClientAsyncResponseReader< ::io::deephaven::proto::backplane::grpc::SaveFileResponse>* StorageService::Stub::PrepareAsyncSaveFileRaw(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::SaveFileRequest& request, ::grpc::CompletionQueue* cq) {
-  return ::grpc::internal::ClientAsyncResponseReaderHelper::Create< ::io::deephaven::proto::backplane::grpc::SaveFileResponse, ::io::deephaven::proto::backplane::grpc::SaveFileRequest, ::grpc::protobuf::MessageLite, ::grpc::protobuf::MessageLite>(channel_.get(), cq, rpcmethod_SaveFile_, context, request);
-}
-
-::grpc::ClientAsyncResponseReader< ::io::deephaven::proto::backplane::grpc::SaveFileResponse>* StorageService::Stub::AsyncSaveFileRaw(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::SaveFileRequest& request, ::grpc::CompletionQueue* cq) {
-  auto* result =
-    this->PrepareAsyncSaveFileRaw(context, request, cq);
-  result->StartCall();
-  return result;
-}
-
-::grpc::Status StorageService::Stub::MoveItem(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::MoveItemRequest& request, ::io::deephaven::proto::backplane::grpc::MoveItemResponse* response) {
-  return ::grpc::internal::BlockingUnaryCall< ::io::deephaven::proto::backplane::grpc::MoveItemRequest, ::io::deephaven::proto::backplane::grpc::MoveItemResponse, ::grpc::protobuf::MessageLite, ::grpc::protobuf::MessageLite>(channel_.get(), rpcmethod_MoveItem_, context, request, response);
-}
-
-void StorageService::Stub::async::MoveItem(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::MoveItemRequest* request, ::io::deephaven::proto::backplane::grpc::MoveItemResponse* response, std::function<void(::grpc::Status)> f) {
-  ::grpc::internal::CallbackUnaryCall< ::io::deephaven::proto::backplane::grpc::MoveItemRequest, ::io::deephaven::proto::backplane::grpc::MoveItemResponse, ::grpc::protobuf::MessageLite, ::grpc::protobuf::MessageLite>(stub_->channel_.get(), stub_->rpcmethod_MoveItem_, context, request, response, std::move(f));
-}
-
-void StorageService::Stub::async::MoveItem(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::MoveItemRequest* request, ::io::deephaven::proto::backplane::grpc::MoveItemResponse* response, ::grpc::ClientUnaryReactor* reactor) {
-  ::grpc::internal::ClientCallbackUnaryFactory::Create< ::grpc::protobuf::MessageLite, ::grpc::protobuf::MessageLite>(stub_->channel_.get(), stub_->rpcmethod_MoveItem_, context, request, response, reactor);
-}
-
-::grpc::ClientAsyncResponseReader< ::io::deephaven::proto::backplane::grpc::MoveItemResponse>* StorageService::Stub::PrepareAsyncMoveItemRaw(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::MoveItemRequest& request, ::grpc::CompletionQueue* cq) {
-  return ::grpc::internal::ClientAsyncResponseReaderHelper::Create< ::io::deephaven::proto::backplane::grpc::MoveItemResponse, ::io::deephaven::proto::backplane::grpc::MoveItemRequest, ::grpc::protobuf::MessageLite, ::grpc::protobuf::MessageLite>(channel_.get(), cq, rpcmethod_MoveItem_, context, request);
-}
-
-::grpc::ClientAsyncResponseReader< ::io::deephaven::proto::backplane::grpc::MoveItemResponse>* StorageService::Stub::AsyncMoveItemRaw(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::MoveItemRequest& request, ::grpc::CompletionQueue* cq) {
-  auto* result =
-    this->PrepareAsyncMoveItemRaw(context, request, cq);
-  result->StartCall();
-  return result;
-}
-
-::grpc::Status StorageService::Stub::CreateDirectory(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::CreateDirectoryRequest& request, ::io::deephaven::proto::backplane::grpc::CreateDirectoryResponse* response) {
-  return ::grpc::internal::BlockingUnaryCall< ::io::deephaven::proto::backplane::grpc::CreateDirectoryRequest, ::io::deephaven::proto::backplane::grpc::CreateDirectoryResponse, ::grpc::protobuf::MessageLite, ::grpc::protobuf::MessageLite>(channel_.get(), rpcmethod_CreateDirectory_, context, request, response);
-}
-
-void StorageService::Stub::async::CreateDirectory(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::CreateDirectoryRequest* request, ::io::deephaven::proto::backplane::grpc::CreateDirectoryResponse* response, std::function<void(::grpc::Status)> f) {
-  ::grpc::internal::CallbackUnaryCall< ::io::deephaven::proto::backplane::grpc::CreateDirectoryRequest, ::io::deephaven::proto::backplane::grpc::CreateDirectoryResponse, ::grpc::protobuf::MessageLite, ::grpc::protobuf::MessageLite>(stub_->channel_.get(), stub_->rpcmethod_CreateDirectory_, context, request, response, std::move(f));
-}
-
-void StorageService::Stub::async::CreateDirectory(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::CreateDirectoryRequest* request, ::io::deephaven::proto::backplane::grpc::CreateDirectoryResponse* response, ::grpc::ClientUnaryReactor* reactor) {
-  ::grpc::internal::ClientCallbackUnaryFactory::Create< ::grpc::protobuf::MessageLite, ::grpc::protobuf::MessageLite>(stub_->channel_.get(), stub_->rpcmethod_CreateDirectory_, context, request, response, reactor);
-}
-
-::grpc::ClientAsyncResponseReader< ::io::deephaven::proto::backplane::grpc::CreateDirectoryResponse>* StorageService::Stub::PrepareAsyncCreateDirectoryRaw(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::CreateDirectoryRequest& request, ::grpc::CompletionQueue* cq) {
-  return ::grpc::internal::ClientAsyncResponseReaderHelper::Create< ::io::deephaven::proto::backplane::grpc::CreateDirectoryResponse, ::io::deephaven::proto::backplane::grpc::CreateDirectoryRequest, ::grpc::protobuf::MessageLite, ::grpc::protobuf::MessageLite>(channel_.get(), cq, rpcmethod_CreateDirectory_, context, request);
-}
-
-::grpc::ClientAsyncResponseReader< ::io::deephaven::proto::backplane::grpc::CreateDirectoryResponse>* StorageService::Stub::AsyncCreateDirectoryRaw(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::CreateDirectoryRequest& request, ::grpc::CompletionQueue* cq) {
-  auto* result =
-    this->PrepareAsyncCreateDirectoryRaw(context, request, cq);
-  result->StartCall();
-  return result;
-}
-
-::grpc::Status StorageService::Stub::DeleteItem(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::DeleteItemRequest& request, ::io::deephaven::proto::backplane::grpc::DeleteItemResponse* response) {
-  return ::grpc::internal::BlockingUnaryCall< ::io::deephaven::proto::backplane::grpc::DeleteItemRequest, ::io::deephaven::proto::backplane::grpc::DeleteItemResponse, ::grpc::protobuf::MessageLite, ::grpc::protobuf::MessageLite>(channel_.get(), rpcmethod_DeleteItem_, context, request, response);
-}
-
-void StorageService::Stub::async::DeleteItem(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::DeleteItemRequest* request, ::io::deephaven::proto::backplane::grpc::DeleteItemResponse* response, std::function<void(::grpc::Status)> f) {
-  ::grpc::internal::CallbackUnaryCall< ::io::deephaven::proto::backplane::grpc::DeleteItemRequest, ::io::deephaven::proto::backplane::grpc::DeleteItemResponse, ::grpc::protobuf::MessageLite, ::grpc::protobuf::MessageLite>(stub_->channel_.get(), stub_->rpcmethod_DeleteItem_, context, request, response, std::move(f));
-}
-
-void StorageService::Stub::async::DeleteItem(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::DeleteItemRequest* request, ::io::deephaven::proto::backplane::grpc::DeleteItemResponse* response, ::grpc::ClientUnaryReactor* reactor) {
-  ::grpc::internal::ClientCallbackUnaryFactory::Create< ::grpc::protobuf::MessageLite, ::grpc::protobuf::MessageLite>(stub_->channel_.get(), stub_->rpcmethod_DeleteItem_, context, request, response, reactor);
-}
-
-::grpc::ClientAsyncResponseReader< ::io::deephaven::proto::backplane::grpc::DeleteItemResponse>* StorageService::Stub::PrepareAsyncDeleteItemRaw(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::DeleteItemRequest& request, ::grpc::CompletionQueue* cq) {
-  return ::grpc::internal::ClientAsyncResponseReaderHelper::Create< ::io::deephaven::proto::backplane::grpc::DeleteItemResponse, ::io::deephaven::proto::backplane::grpc::DeleteItemRequest, ::grpc::protobuf::MessageLite, ::grpc::protobuf::MessageLite>(channel_.get(), cq, rpcmethod_DeleteItem_, context, request);
-}
-
-::grpc::ClientAsyncResponseReader< ::io::deephaven::proto::backplane::grpc::DeleteItemResponse>* StorageService::Stub::AsyncDeleteItemRaw(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::DeleteItemRequest& request, ::grpc::CompletionQueue* cq) {
-  auto* result =
-    this->PrepareAsyncDeleteItemRaw(context, request, cq);
-  result->StartCall();
-  return result;
-}
-
-StorageService::Service::Service() {
-  AddMethod(new ::grpc::internal::RpcServiceMethod(
-      StorageService_method_names[0],
-      ::grpc::internal::RpcMethod::NORMAL_RPC,
-      new ::grpc::internal::RpcMethodHandler< StorageService::Service, ::io::deephaven::proto::backplane::grpc::ListItemsRequest, ::io::deephaven::proto::backplane::grpc::ListItemsResponse, ::grpc::protobuf::MessageLite, ::grpc::protobuf::MessageLite>(
-          [](StorageService::Service* service,
-             ::grpc::ServerContext* ctx,
-             const ::io::deephaven::proto::backplane::grpc::ListItemsRequest* req,
-             ::io::deephaven::proto::backplane::grpc::ListItemsResponse* resp) {
-               return service->ListItems(ctx, req, resp);
-             }, this)));
-  AddMethod(new ::grpc::internal::RpcServiceMethod(
-      StorageService_method_names[1],
-      ::grpc::internal::RpcMethod::NORMAL_RPC,
-      new ::grpc::internal::RpcMethodHandler< StorageService::Service, ::io::deephaven::proto::backplane::grpc::FetchFileRequest, ::io::deephaven::proto::backplane::grpc::FetchFileResponse, ::grpc::protobuf::MessageLite, ::grpc::protobuf::MessageLite>(
-          [](StorageService::Service* service,
-             ::grpc::ServerContext* ctx,
-             const ::io::deephaven::proto::backplane::grpc::FetchFileRequest* req,
-             ::io::deephaven::proto::backplane::grpc::FetchFileResponse* resp) {
-               return service->FetchFile(ctx, req, resp);
-             }, this)));
-  AddMethod(new ::grpc::internal::RpcServiceMethod(
-      StorageService_method_names[2],
-      ::grpc::internal::RpcMethod::NORMAL_RPC,
-      new ::grpc::internal::RpcMethodHandler< StorageService::Service, ::io::deephaven::proto::backplane::grpc::SaveFileRequest, ::io::deephaven::proto::backplane::grpc::SaveFileResponse, ::grpc::protobuf::MessageLite, ::grpc::protobuf::MessageLite>(
-          [](StorageService::Service* service,
-             ::grpc::ServerContext* ctx,
-             const ::io::deephaven::proto::backplane::grpc::SaveFileRequest* req,
-             ::io::deephaven::proto::backplane::grpc::SaveFileResponse* resp) {
-               return service->SaveFile(ctx, req, resp);
-             }, this)));
-  AddMethod(new ::grpc::internal::RpcServiceMethod(
-      StorageService_method_names[3],
-      ::grpc::internal::RpcMethod::NORMAL_RPC,
-      new ::grpc::internal::RpcMethodHandler< StorageService::Service, ::io::deephaven::proto::backplane::grpc::MoveItemRequest, ::io::deephaven::proto::backplane::grpc::MoveItemResponse, ::grpc::protobuf::MessageLite, ::grpc::protobuf::MessageLite>(
-          [](StorageService::Service* service,
-             ::grpc::ServerContext* ctx,
-             const ::io::deephaven::proto::backplane::grpc::MoveItemRequest* req,
-             ::io::deephaven::proto::backplane::grpc::MoveItemResponse* resp) {
-               return service->MoveItem(ctx, req, resp);
-             }, this)));
-  AddMethod(new ::grpc::internal::RpcServiceMethod(
-      StorageService_method_names[4],
-      ::grpc::internal::RpcMethod::NORMAL_RPC,
-      new ::grpc::internal::RpcMethodHandler< StorageService::Service, ::io::deephaven::proto::backplane::grpc::CreateDirectoryRequest, ::io::deephaven::proto::backplane::grpc::CreateDirectoryResponse, ::grpc::protobuf::MessageLite, ::grpc::protobuf::MessageLite>(
-          [](StorageService::Service* service,
-             ::grpc::ServerContext* ctx,
-             const ::io::deephaven::proto::backplane::grpc::CreateDirectoryRequest* req,
-             ::io::deephaven::proto::backplane::grpc::CreateDirectoryResponse* resp) {
-               return service->CreateDirectory(ctx, req, resp);
-             }, this)));
-  AddMethod(new ::grpc::internal::RpcServiceMethod(
-      StorageService_method_names[5],
-      ::grpc::internal::RpcMethod::NORMAL_RPC,
-      new ::grpc::internal::RpcMethodHandler< StorageService::Service, ::io::deephaven::proto::backplane::grpc::DeleteItemRequest, ::io::deephaven::proto::backplane::grpc::DeleteItemResponse, ::grpc::protobuf::MessageLite, ::grpc::protobuf::MessageLite>(
-          [](StorageService::Service* service,
-             ::grpc::ServerContext* ctx,
-             const ::io::deephaven::proto::backplane::grpc::DeleteItemRequest* req,
-             ::io::deephaven::proto::backplane::grpc::DeleteItemResponse* resp) {
-               return service->DeleteItem(ctx, req, resp);
-             }, this)));
-}
-
-StorageService::Service::~Service() {
-}
-
-::grpc::Status StorageService::Service::ListItems(::grpc::ServerContext* context, const ::io::deephaven::proto::backplane::grpc::ListItemsRequest* request, ::io::deephaven::proto::backplane::grpc::ListItemsResponse* response) {
-  (void) context;
-  (void) request;
-  (void) response;
-  return ::grpc::Status(::grpc::StatusCode::UNIMPLEMENTED, "");
-}
-
-::grpc::Status StorageService::Service::FetchFile(::grpc::ServerContext* context, const ::io::deephaven::proto::backplane::grpc::FetchFileRequest* request, ::io::deephaven::proto::backplane::grpc::FetchFileResponse* response) {
-  (void) context;
-  (void) request;
-  (void) response;
-  return ::grpc::Status(::grpc::StatusCode::UNIMPLEMENTED, "");
-}
-
-::grpc::Status StorageService::Service::SaveFile(::grpc::ServerContext* context, const ::io::deephaven::proto::backplane::grpc::SaveFileRequest* request, ::io::deephaven::proto::backplane::grpc::SaveFileResponse* response) {
-  (void) context;
-  (void) request;
-  (void) response;
-  return ::grpc::Status(::grpc::StatusCode::UNIMPLEMENTED, "");
-}
-
-::grpc::Status StorageService::Service::MoveItem(::grpc::ServerContext* context, const ::io::deephaven::proto::backplane::grpc::MoveItemRequest* request, ::io::deephaven::proto::backplane::grpc::MoveItemResponse* response) {
-  (void) context;
-  (void) request;
-  (void) response;
-  return ::grpc::Status(::grpc::StatusCode::UNIMPLEMENTED, "");
-}
-
-::grpc::Status StorageService::Service::CreateDirectory(::grpc::ServerContext* context, const ::io::deephaven::proto::backplane::grpc::CreateDirectoryRequest* request, ::io::deephaven::proto::backplane::grpc::CreateDirectoryResponse* response) {
-  (void) context;
-  (void) request;
-  (void) response;
-  return ::grpc::Status(::grpc::StatusCode::UNIMPLEMENTED, "");
-}
-
-::grpc::Status StorageService::Service::DeleteItem(::grpc::ServerContext* context, const ::io::deephaven::proto::backplane::grpc::DeleteItemRequest* request, ::io::deephaven::proto::backplane::grpc::DeleteItemResponse* response) {
-  (void) context;
-  (void) request;
-  (void) response;
-  return ::grpc::Status(::grpc::StatusCode::UNIMPLEMENTED, "");
-}
-
-
-}  // namespace io
-}  // namespace deephaven
-}  // namespace proto
-}  // namespace backplane
-}  // namespace grpc
-
diff --git a/cpp-client/deephaven/dhclient/proto/deephaven/proto/storage.grpc.pb.h b/cpp-client/deephaven/dhclient/proto/deephaven/proto/storage.grpc.pb.h
deleted file mode 100644
index f0214dc9fcd..00000000000
--- a/cpp-client/deephaven/dhclient/proto/deephaven/proto/storage.grpc.pb.h
+++ /dev/null
@@ -1,1063 +0,0 @@
-// Generated by the gRPC C++ plugin.
-// If you make any local change, they will be lost.
-// source: deephaven/proto/storage.proto
-// Original file comments:
-//
-// Copyright (c) 2016-2022 Deephaven Data Labs and Patent Pending
-#ifndef GRPC_deephaven_2fproto_2fstorage_2eproto__INCLUDED
-#define GRPC_deephaven_2fproto_2fstorage_2eproto__INCLUDED
-
-#include "deephaven/proto/storage.pb.h"
-
-#include <functional>
-#include <grpcpp/generic/async_generic_service.h>
-#include <grpcpp/support/async_stream.h>
-#include <grpcpp/support/async_unary_call.h>
-#include <grpcpp/support/client_callback.h>
-#include <grpcpp/client_context.h>
-#include <grpcpp/completion_queue.h>
-#include <grpcpp/support/message_allocator.h>
-#include <grpcpp/support/method_handler.h>
-#include <grpcpp/impl/proto_utils.h>
-#include <grpcpp/impl/rpc_method.h>
-#include <grpcpp/support/server_callback.h>
-#include <grpcpp/impl/server_callback_handlers.h>
-#include <grpcpp/server_context.h>
-#include <grpcpp/impl/service_type.h>
-#include <grpcpp/support/status.h>
-#include <grpcpp/support/stub_options.h>
-#include <grpcpp/support/sync_stream.h>
-
-namespace io {
-namespace deephaven {
-namespace proto {
-namespace backplane {
-namespace grpc {
-
-//
-// Shared storage management service.
-//
-// Operations may fail (or omit data) if the current session does not have permission to read or write that resource.
-//
-// Paths will be "/" delimited and must start with a leading slash.
-class StorageService final {
- public:
-  static constexpr char const* service_full_name() {
-    return "io.deephaven.proto.backplane.grpc.StorageService";
-  }
-  class StubInterface {
-   public:
-    virtual ~StubInterface() {}
-    // Lists the files and directories present in a given directory. Will return an error
-    virtual ::grpc::Status ListItems(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::ListItemsRequest& request, ::io::deephaven::proto::backplane::grpc::ListItemsResponse* response) = 0;
-    std::unique_ptr< ::grpc::ClientAsyncResponseReaderInterface< ::io::deephaven::proto::backplane::grpc::ListItemsResponse>> AsyncListItems(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::ListItemsRequest& request, ::grpc::CompletionQueue* cq) {
-      return std::unique_ptr< ::grpc::ClientAsyncResponseReaderInterface< ::io::deephaven::proto::backplane::grpc::ListItemsResponse>>(AsyncListItemsRaw(context, request, cq));
-    }
-    std::unique_ptr< ::grpc::ClientAsyncResponseReaderInterface< ::io::deephaven::proto::backplane::grpc::ListItemsResponse>> PrepareAsyncListItems(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::ListItemsRequest& request, ::grpc::CompletionQueue* cq) {
-      return std::unique_ptr< ::grpc::ClientAsyncResponseReaderInterface< ::io::deephaven::proto::backplane::grpc::ListItemsResponse>>(PrepareAsyncListItemsRaw(context, request, cq));
-    }
-    // Reads the file at the given path. Client can optionally specify an etag, asking the server
-    // not to send the file if it hasn't changed.
-    virtual ::grpc::Status FetchFile(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::FetchFileRequest& request, ::io::deephaven::proto::backplane::grpc::FetchFileResponse* response) = 0;
-    std::unique_ptr< ::grpc::ClientAsyncResponseReaderInterface< ::io::deephaven::proto::backplane::grpc::FetchFileResponse>> AsyncFetchFile(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::FetchFileRequest& request, ::grpc::CompletionQueue* cq) {
-      return std::unique_ptr< ::grpc::ClientAsyncResponseReaderInterface< ::io::deephaven::proto::backplane::grpc::FetchFileResponse>>(AsyncFetchFileRaw(context, request, cq));
-    }
-    std::unique_ptr< ::grpc::ClientAsyncResponseReaderInterface< ::io::deephaven::proto::backplane::grpc::FetchFileResponse>> PrepareAsyncFetchFile(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::FetchFileRequest& request, ::grpc::CompletionQueue* cq) {
-      return std::unique_ptr< ::grpc::ClientAsyncResponseReaderInterface< ::io::deephaven::proto::backplane::grpc::FetchFileResponse>>(PrepareAsyncFetchFileRaw(context, request, cq));
-    }
-    // Can create new files or modify existing with client provided contents.
-    virtual ::grpc::Status SaveFile(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::SaveFileRequest& request, ::io::deephaven::proto::backplane::grpc::SaveFileResponse* response) = 0;
-    std::unique_ptr< ::grpc::ClientAsyncResponseReaderInterface< ::io::deephaven::proto::backplane::grpc::SaveFileResponse>> AsyncSaveFile(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::SaveFileRequest& request, ::grpc::CompletionQueue* cq) {
-      return std::unique_ptr< ::grpc::ClientAsyncResponseReaderInterface< ::io::deephaven::proto::backplane::grpc::SaveFileResponse>>(AsyncSaveFileRaw(context, request, cq));
-    }
-    std::unique_ptr< ::grpc::ClientAsyncResponseReaderInterface< ::io::deephaven::proto::backplane::grpc::SaveFileResponse>> PrepareAsyncSaveFile(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::SaveFileRequest& request, ::grpc::CompletionQueue* cq) {
-      return std::unique_ptr< ::grpc::ClientAsyncResponseReaderInterface< ::io::deephaven::proto::backplane::grpc::SaveFileResponse>>(PrepareAsyncSaveFileRaw(context, request, cq));
-    }
-    // Moves a file from one path to another.
-    virtual ::grpc::Status MoveItem(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::MoveItemRequest& request, ::io::deephaven::proto::backplane::grpc::MoveItemResponse* response) = 0;
-    std::unique_ptr< ::grpc::ClientAsyncResponseReaderInterface< ::io::deephaven::proto::backplane::grpc::MoveItemResponse>> AsyncMoveItem(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::MoveItemRequest& request, ::grpc::CompletionQueue* cq) {
-      return std::unique_ptr< ::grpc::ClientAsyncResponseReaderInterface< ::io::deephaven::proto::backplane::grpc::MoveItemResponse>>(AsyncMoveItemRaw(context, request, cq));
-    }
-    std::unique_ptr< ::grpc::ClientAsyncResponseReaderInterface< ::io::deephaven::proto::backplane::grpc::MoveItemResponse>> PrepareAsyncMoveItem(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::MoveItemRequest& request, ::grpc::CompletionQueue* cq) {
-      return std::unique_ptr< ::grpc::ClientAsyncResponseReaderInterface< ::io::deephaven::proto::backplane::grpc::MoveItemResponse>>(PrepareAsyncMoveItemRaw(context, request, cq));
-    }
-    // Creates a directory at the given path.
-    virtual ::grpc::Status CreateDirectory(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::CreateDirectoryRequest& request, ::io::deephaven::proto::backplane::grpc::CreateDirectoryResponse* response) = 0;
-    std::unique_ptr< ::grpc::ClientAsyncResponseReaderInterface< ::io::deephaven::proto::backplane::grpc::CreateDirectoryResponse>> AsyncCreateDirectory(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::CreateDirectoryRequest& request, ::grpc::CompletionQueue* cq) {
-      return std::unique_ptr< ::grpc::ClientAsyncResponseReaderInterface< ::io::deephaven::proto::backplane::grpc::CreateDirectoryResponse>>(AsyncCreateDirectoryRaw(context, request, cq));
-    }
-    std::unique_ptr< ::grpc::ClientAsyncResponseReaderInterface< ::io::deephaven::proto::backplane::grpc::CreateDirectoryResponse>> PrepareAsyncCreateDirectory(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::CreateDirectoryRequest& request, ::grpc::CompletionQueue* cq) {
-      return std::unique_ptr< ::grpc::ClientAsyncResponseReaderInterface< ::io::deephaven::proto::backplane::grpc::CreateDirectoryResponse>>(PrepareAsyncCreateDirectoryRaw(context, request, cq));
-    }
-    // Deletes the file or directory at the given path. Directories must be empty to be deleted.
-    virtual ::grpc::Status DeleteItem(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::DeleteItemRequest& request, ::io::deephaven::proto::backplane::grpc::DeleteItemResponse* response) = 0;
-    std::unique_ptr< ::grpc::ClientAsyncResponseReaderInterface< ::io::deephaven::proto::backplane::grpc::DeleteItemResponse>> AsyncDeleteItem(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::DeleteItemRequest& request, ::grpc::CompletionQueue* cq) {
-      return std::unique_ptr< ::grpc::ClientAsyncResponseReaderInterface< ::io::deephaven::proto::backplane::grpc::DeleteItemResponse>>(AsyncDeleteItemRaw(context, request, cq));
-    }
-    std::unique_ptr< ::grpc::ClientAsyncResponseReaderInterface< ::io::deephaven::proto::backplane::grpc::DeleteItemResponse>> PrepareAsyncDeleteItem(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::DeleteItemRequest& request, ::grpc::CompletionQueue* cq) {
-      return std::unique_ptr< ::grpc::ClientAsyncResponseReaderInterface< ::io::deephaven::proto::backplane::grpc::DeleteItemResponse>>(PrepareAsyncDeleteItemRaw(context, request, cq));
-    }
-    class async_interface {
-     public:
-      virtual ~async_interface() {}
-      // Lists the files and directories present in a given directory. Will return an error
-      virtual void ListItems(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::ListItemsRequest* request, ::io::deephaven::proto::backplane::grpc::ListItemsResponse* response, std::function<void(::grpc::Status)>) = 0;
-      virtual void ListItems(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::ListItemsRequest* request, ::io::deephaven::proto::backplane::grpc::ListItemsResponse* response, ::grpc::ClientUnaryReactor* reactor) = 0;
-      // Reads the file at the given path. Client can optionally specify an etag, asking the server
-      // not to send the file if it hasn't changed.
-      virtual void FetchFile(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::FetchFileRequest* request, ::io::deephaven::proto::backplane::grpc::FetchFileResponse* response, std::function<void(::grpc::Status)>) = 0;
-      virtual void FetchFile(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::FetchFileRequest* request, ::io::deephaven::proto::backplane::grpc::FetchFileResponse* response, ::grpc::ClientUnaryReactor* reactor) = 0;
-      // Can create new files or modify existing with client provided contents.
-      virtual void SaveFile(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::SaveFileRequest* request, ::io::deephaven::proto::backplane::grpc::SaveFileResponse* response, std::function<void(::grpc::Status)>) = 0;
-      virtual void SaveFile(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::SaveFileRequest* request, ::io::deephaven::proto::backplane::grpc::SaveFileResponse* response, ::grpc::ClientUnaryReactor* reactor) = 0;
-      // Moves a file from one path to another.
-      virtual void MoveItem(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::MoveItemRequest* request, ::io::deephaven::proto::backplane::grpc::MoveItemResponse* response, std::function<void(::grpc::Status)>) = 0;
-      virtual void MoveItem(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::MoveItemRequest* request, ::io::deephaven::proto::backplane::grpc::MoveItemResponse* response, ::grpc::ClientUnaryReactor* reactor) = 0;
-      // Creates a directory at the given path.
-      virtual void CreateDirectory(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::CreateDirectoryRequest* request, ::io::deephaven::proto::backplane::grpc::CreateDirectoryResponse* response, std::function<void(::grpc::Status)>) = 0;
-      virtual void CreateDirectory(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::CreateDirectoryRequest* request, ::io::deephaven::proto::backplane::grpc::CreateDirectoryResponse* response, ::grpc::ClientUnaryReactor* reactor) = 0;
-      // Deletes the file or directory at the given path. Directories must be empty to be deleted.
-      virtual void DeleteItem(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::DeleteItemRequest* request, ::io::deephaven::proto::backplane::grpc::DeleteItemResponse* response, std::function<void(::grpc::Status)>) = 0;
-      virtual void DeleteItem(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::DeleteItemRequest* request, ::io::deephaven::proto::backplane::grpc::DeleteItemResponse* response, ::grpc::ClientUnaryReactor* reactor) = 0;
-    };
-    typedef class async_interface experimental_async_interface;
-    virtual class async_interface* async() { return nullptr; }
-    class async_interface* experimental_async() { return async(); }
-   private:
-    virtual ::grpc::ClientAsyncResponseReaderInterface< ::io::deephaven::proto::backplane::grpc::ListItemsResponse>* AsyncListItemsRaw(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::ListItemsRequest& request, ::grpc::CompletionQueue* cq) = 0;
-    virtual ::grpc::ClientAsyncResponseReaderInterface< ::io::deephaven::proto::backplane::grpc::ListItemsResponse>* PrepareAsyncListItemsRaw(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::ListItemsRequest& request, ::grpc::CompletionQueue* cq) = 0;
-    virtual ::grpc::ClientAsyncResponseReaderInterface< ::io::deephaven::proto::backplane::grpc::FetchFileResponse>* AsyncFetchFileRaw(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::FetchFileRequest& request, ::grpc::CompletionQueue* cq) = 0;
-    virtual ::grpc::ClientAsyncResponseReaderInterface< ::io::deephaven::proto::backplane::grpc::FetchFileResponse>* PrepareAsyncFetchFileRaw(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::FetchFileRequest& request, ::grpc::CompletionQueue* cq) = 0;
-    virtual ::grpc::ClientAsyncResponseReaderInterface< ::io::deephaven::proto::backplane::grpc::SaveFileResponse>* AsyncSaveFileRaw(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::SaveFileRequest& request, ::grpc::CompletionQueue* cq) = 0;
-    virtual ::grpc::ClientAsyncResponseReaderInterface< ::io::deephaven::proto::backplane::grpc::SaveFileResponse>* PrepareAsyncSaveFileRaw(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::SaveFileRequest& request, ::grpc::CompletionQueue* cq) = 0;
-    virtual ::grpc::ClientAsyncResponseReaderInterface< ::io::deephaven::proto::backplane::grpc::MoveItemResponse>* AsyncMoveItemRaw(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::MoveItemRequest& request, ::grpc::CompletionQueue* cq) = 0;
-    virtual ::grpc::ClientAsyncResponseReaderInterface< ::io::deephaven::proto::backplane::grpc::MoveItemResponse>* PrepareAsyncMoveItemRaw(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::MoveItemRequest& request, ::grpc::CompletionQueue* cq) = 0;
-    virtual ::grpc::ClientAsyncResponseReaderInterface< ::io::deephaven::proto::backplane::grpc::CreateDirectoryResponse>* AsyncCreateDirectoryRaw(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::CreateDirectoryRequest& request, ::grpc::CompletionQueue* cq) = 0;
-    virtual ::grpc::ClientAsyncResponseReaderInterface< ::io::deephaven::proto::backplane::grpc::CreateDirectoryResponse>* PrepareAsyncCreateDirectoryRaw(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::CreateDirectoryRequest& request, ::grpc::CompletionQueue* cq) = 0;
-    virtual ::grpc::ClientAsyncResponseReaderInterface< ::io::deephaven::proto::backplane::grpc::DeleteItemResponse>* AsyncDeleteItemRaw(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::DeleteItemRequest& request, ::grpc::CompletionQueue* cq) = 0;
-    virtual ::grpc::ClientAsyncResponseReaderInterface< ::io::deephaven::proto::backplane::grpc::DeleteItemResponse>* PrepareAsyncDeleteItemRaw(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::DeleteItemRequest& request, ::grpc::CompletionQueue* cq) = 0;
-  };
-  class Stub final : public StubInterface {
-   public:
-    Stub(const std::shared_ptr< ::grpc::ChannelInterface>& channel, const ::grpc::StubOptions& options = ::grpc::StubOptions());
-    ::grpc::Status ListItems(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::ListItemsRequest& request, ::io::deephaven::proto::backplane::grpc::ListItemsResponse* response) override;
-    std::unique_ptr< ::grpc::ClientAsyncResponseReader< ::io::deephaven::proto::backplane::grpc::ListItemsResponse>> AsyncListItems(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::ListItemsRequest& request, ::grpc::CompletionQueue* cq) {
-      return std::unique_ptr< ::grpc::ClientAsyncResponseReader< ::io::deephaven::proto::backplane::grpc::ListItemsResponse>>(AsyncListItemsRaw(context, request, cq));
-    }
-    std::unique_ptr< ::grpc::ClientAsyncResponseReader< ::io::deephaven::proto::backplane::grpc::ListItemsResponse>> PrepareAsyncListItems(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::ListItemsRequest& request, ::grpc::CompletionQueue* cq) {
-      return std::unique_ptr< ::grpc::ClientAsyncResponseReader< ::io::deephaven::proto::backplane::grpc::ListItemsResponse>>(PrepareAsyncListItemsRaw(context, request, cq));
-    }
-    ::grpc::Status FetchFile(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::FetchFileRequest& request, ::io::deephaven::proto::backplane::grpc::FetchFileResponse* response) override;
-    std::unique_ptr< ::grpc::ClientAsyncResponseReader< ::io::deephaven::proto::backplane::grpc::FetchFileResponse>> AsyncFetchFile(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::FetchFileRequest& request, ::grpc::CompletionQueue* cq) {
-      return std::unique_ptr< ::grpc::ClientAsyncResponseReader< ::io::deephaven::proto::backplane::grpc::FetchFileResponse>>(AsyncFetchFileRaw(context, request, cq));
-    }
-    std::unique_ptr< ::grpc::ClientAsyncResponseReader< ::io::deephaven::proto::backplane::grpc::FetchFileResponse>> PrepareAsyncFetchFile(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::FetchFileRequest& request, ::grpc::CompletionQueue* cq) {
-      return std::unique_ptr< ::grpc::ClientAsyncResponseReader< ::io::deephaven::proto::backplane::grpc::FetchFileResponse>>(PrepareAsyncFetchFileRaw(context, request, cq));
-    }
-    ::grpc::Status SaveFile(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::SaveFileRequest& request, ::io::deephaven::proto::backplane::grpc::SaveFileResponse* response) override;
-    std::unique_ptr< ::grpc::ClientAsyncResponseReader< ::io::deephaven::proto::backplane::grpc::SaveFileResponse>> AsyncSaveFile(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::SaveFileRequest& request, ::grpc::CompletionQueue* cq) {
-      return std::unique_ptr< ::grpc::ClientAsyncResponseReader< ::io::deephaven::proto::backplane::grpc::SaveFileResponse>>(AsyncSaveFileRaw(context, request, cq));
-    }
-    std::unique_ptr< ::grpc::ClientAsyncResponseReader< ::io::deephaven::proto::backplane::grpc::SaveFileResponse>> PrepareAsyncSaveFile(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::SaveFileRequest& request, ::grpc::CompletionQueue* cq) {
-      return std::unique_ptr< ::grpc::ClientAsyncResponseReader< ::io::deephaven::proto::backplane::grpc::SaveFileResponse>>(PrepareAsyncSaveFileRaw(context, request, cq));
-    }
-    ::grpc::Status MoveItem(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::MoveItemRequest& request, ::io::deephaven::proto::backplane::grpc::MoveItemResponse* response) override;
-    std::unique_ptr< ::grpc::ClientAsyncResponseReader< ::io::deephaven::proto::backplane::grpc::MoveItemResponse>> AsyncMoveItem(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::MoveItemRequest& request, ::grpc::CompletionQueue* cq) {
-      return std::unique_ptr< ::grpc::ClientAsyncResponseReader< ::io::deephaven::proto::backplane::grpc::MoveItemResponse>>(AsyncMoveItemRaw(context, request, cq));
-    }
-    std::unique_ptr< ::grpc::ClientAsyncResponseReader< ::io::deephaven::proto::backplane::grpc::MoveItemResponse>> PrepareAsyncMoveItem(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::MoveItemRequest& request, ::grpc::CompletionQueue* cq) {
-      return std::unique_ptr< ::grpc::ClientAsyncResponseReader< ::io::deephaven::proto::backplane::grpc::MoveItemResponse>>(PrepareAsyncMoveItemRaw(context, request, cq));
-    }
-    ::grpc::Status CreateDirectory(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::CreateDirectoryRequest& request, ::io::deephaven::proto::backplane::grpc::CreateDirectoryResponse* response) override;
-    std::unique_ptr< ::grpc::ClientAsyncResponseReader< ::io::deephaven::proto::backplane::grpc::CreateDirectoryResponse>> AsyncCreateDirectory(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::CreateDirectoryRequest& request, ::grpc::CompletionQueue* cq) {
-      return std::unique_ptr< ::grpc::ClientAsyncResponseReader< ::io::deephaven::proto::backplane::grpc::CreateDirectoryResponse>>(AsyncCreateDirectoryRaw(context, request, cq));
-    }
-    std::unique_ptr< ::grpc::ClientAsyncResponseReader< ::io::deephaven::proto::backplane::grpc::CreateDirectoryResponse>> PrepareAsyncCreateDirectory(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::CreateDirectoryRequest& request, ::grpc::CompletionQueue* cq) {
-      return std::unique_ptr< ::grpc::ClientAsyncResponseReader< ::io::deephaven::proto::backplane::grpc::CreateDirectoryResponse>>(PrepareAsyncCreateDirectoryRaw(context, request, cq));
-    }
-    ::grpc::Status DeleteItem(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::DeleteItemRequest& request, ::io::deephaven::proto::backplane::grpc::DeleteItemResponse* response) override;
-    std::unique_ptr< ::grpc::ClientAsyncResponseReader< ::io::deephaven::proto::backplane::grpc::DeleteItemResponse>> AsyncDeleteItem(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::DeleteItemRequest& request, ::grpc::CompletionQueue* cq) {
-      return std::unique_ptr< ::grpc::ClientAsyncResponseReader< ::io::deephaven::proto::backplane::grpc::DeleteItemResponse>>(AsyncDeleteItemRaw(context, request, cq));
-    }
-    std::unique_ptr< ::grpc::ClientAsyncResponseReader< ::io::deephaven::proto::backplane::grpc::DeleteItemResponse>> PrepareAsyncDeleteItem(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::DeleteItemRequest& request, ::grpc::CompletionQueue* cq) {
-      return std::unique_ptr< ::grpc::ClientAsyncResponseReader< ::io::deephaven::proto::backplane::grpc::DeleteItemResponse>>(PrepareAsyncDeleteItemRaw(context, request, cq));
-    }
-    class async final :
-      public StubInterface::async_interface {
-     public:
-      void ListItems(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::ListItemsRequest* request, ::io::deephaven::proto::backplane::grpc::ListItemsResponse* response, std::function<void(::grpc::Status)>) override;
-      void ListItems(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::ListItemsRequest* request, ::io::deephaven::proto::backplane::grpc::ListItemsResponse* response, ::grpc::ClientUnaryReactor* reactor) override;
-      void FetchFile(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::FetchFileRequest* request, ::io::deephaven::proto::backplane::grpc::FetchFileResponse* response, std::function<void(::grpc::Status)>) override;
-      void FetchFile(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::FetchFileRequest* request, ::io::deephaven::proto::backplane::grpc::FetchFileResponse* response, ::grpc::ClientUnaryReactor* reactor) override;
-      void SaveFile(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::SaveFileRequest* request, ::io::deephaven::proto::backplane::grpc::SaveFileResponse* response, std::function<void(::grpc::Status)>) override;
-      void SaveFile(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::SaveFileRequest* request, ::io::deephaven::proto::backplane::grpc::SaveFileResponse* response, ::grpc::ClientUnaryReactor* reactor) override;
-      void MoveItem(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::MoveItemRequest* request, ::io::deephaven::proto::backplane::grpc::MoveItemResponse* response, std::function<void(::grpc::Status)>) override;
-      void MoveItem(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::MoveItemRequest* request, ::io::deephaven::proto::backplane::grpc::MoveItemResponse* response, ::grpc::ClientUnaryReactor* reactor) override;
-      void CreateDirectory(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::CreateDirectoryRequest* request, ::io::deephaven::proto::backplane::grpc::CreateDirectoryResponse* response, std::function<void(::grpc::Status)>) override;
-      void CreateDirectory(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::CreateDirectoryRequest* request, ::io::deephaven::proto::backplane::grpc::CreateDirectoryResponse* response, ::grpc::ClientUnaryReactor* reactor) override;
-      void DeleteItem(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::DeleteItemRequest* request, ::io::deephaven::proto::backplane::grpc::DeleteItemResponse* response, std::function<void(::grpc::Status)>) override;
-      void DeleteItem(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::DeleteItemRequest* request, ::io::deephaven::proto::backplane::grpc::DeleteItemResponse* response, ::grpc::ClientUnaryReactor* reactor) override;
-     private:
-      friend class Stub;
-      explicit async(Stub* stub): stub_(stub) { }
-      Stub* stub() { return stub_; }
-      Stub* stub_;
-    };
-    class async* async() override { return &async_stub_; }
-
-   private:
-    std::shared_ptr< ::grpc::ChannelInterface> channel_;
-    class async async_stub_{this};
-    ::grpc::ClientAsyncResponseReader< ::io::deephaven::proto::backplane::grpc::ListItemsResponse>* AsyncListItemsRaw(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::ListItemsRequest& request, ::grpc::CompletionQueue* cq) override;
-    ::grpc::ClientAsyncResponseReader< ::io::deephaven::proto::backplane::grpc::ListItemsResponse>* PrepareAsyncListItemsRaw(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::ListItemsRequest& request, ::grpc::CompletionQueue* cq) override;
-    ::grpc::ClientAsyncResponseReader< ::io::deephaven::proto::backplane::grpc::FetchFileResponse>* AsyncFetchFileRaw(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::FetchFileRequest& request, ::grpc::CompletionQueue* cq) override;
-    ::grpc::ClientAsyncResponseReader< ::io::deephaven::proto::backplane::grpc::FetchFileResponse>* PrepareAsyncFetchFileRaw(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::FetchFileRequest& request, ::grpc::CompletionQueue* cq) override;
-    ::grpc::ClientAsyncResponseReader< ::io::deephaven::proto::backplane::grpc::SaveFileResponse>* AsyncSaveFileRaw(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::SaveFileRequest& request, ::grpc::CompletionQueue* cq) override;
-    ::grpc::ClientAsyncResponseReader< ::io::deephaven::proto::backplane::grpc::SaveFileResponse>* PrepareAsyncSaveFileRaw(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::SaveFileRequest& request, ::grpc::CompletionQueue* cq) override;
-    ::grpc::ClientAsyncResponseReader< ::io::deephaven::proto::backplane::grpc::MoveItemResponse>* AsyncMoveItemRaw(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::MoveItemRequest& request, ::grpc::CompletionQueue* cq) override;
-    ::grpc::ClientAsyncResponseReader< ::io::deephaven::proto::backplane::grpc::MoveItemResponse>* PrepareAsyncMoveItemRaw(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::MoveItemRequest& request, ::grpc::CompletionQueue* cq) override;
-    ::grpc::ClientAsyncResponseReader< ::io::deephaven::proto::backplane::grpc::CreateDirectoryResponse>* AsyncCreateDirectoryRaw(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::CreateDirectoryRequest& request, ::grpc::CompletionQueue* cq) override;
-    ::grpc::ClientAsyncResponseReader< ::io::deephaven::proto::backplane::grpc::CreateDirectoryResponse>* PrepareAsyncCreateDirectoryRaw(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::CreateDirectoryRequest& request, ::grpc::CompletionQueue* cq) override;
-    ::grpc::ClientAsyncResponseReader< ::io::deephaven::proto::backplane::grpc::DeleteItemResponse>* AsyncDeleteItemRaw(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::DeleteItemRequest& request, ::grpc::CompletionQueue* cq) override;
-    ::grpc::ClientAsyncResponseReader< ::io::deephaven::proto::backplane::grpc::DeleteItemResponse>* PrepareAsyncDeleteItemRaw(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::DeleteItemRequest& request, ::grpc::CompletionQueue* cq) override;
-    const ::grpc::internal::RpcMethod rpcmethod_ListItems_;
-    const ::grpc::internal::RpcMethod rpcmethod_FetchFile_;
-    const ::grpc::internal::RpcMethod rpcmethod_SaveFile_;
-    const ::grpc::internal::RpcMethod rpcmethod_MoveItem_;
-    const ::grpc::internal::RpcMethod rpcmethod_CreateDirectory_;
-    const ::grpc::internal::RpcMethod rpcmethod_DeleteItem_;
-  };
-  static std::unique_ptr<Stub> NewStub(const std::shared_ptr< ::grpc::ChannelInterface>& channel, const ::grpc::StubOptions& options = ::grpc::StubOptions());
-
-  class Service : public ::grpc::Service {
-   public:
-    Service();
-    virtual ~Service();
-    // Lists the files and directories present in a given directory. Will return an error
-    virtual ::grpc::Status ListItems(::grpc::ServerContext* context, const ::io::deephaven::proto::backplane::grpc::ListItemsRequest* request, ::io::deephaven::proto::backplane::grpc::ListItemsResponse* response);
-    // Reads the file at the given path. Client can optionally specify an etag, asking the server
-    // not to send the file if it hasn't changed.
-    virtual ::grpc::Status FetchFile(::grpc::ServerContext* context, const ::io::deephaven::proto::backplane::grpc::FetchFileRequest* request, ::io::deephaven::proto::backplane::grpc::FetchFileResponse* response);
-    // Can create new files or modify existing with client provided contents.
-    virtual ::grpc::Status SaveFile(::grpc::ServerContext* context, const ::io::deephaven::proto::backplane::grpc::SaveFileRequest* request, ::io::deephaven::proto::backplane::grpc::SaveFileResponse* response);
-    // Moves a file from one path to another.
-    virtual ::grpc::Status MoveItem(::grpc::ServerContext* context, const ::io::deephaven::proto::backplane::grpc::MoveItemRequest* request, ::io::deephaven::proto::backplane::grpc::MoveItemResponse* response);
-    // Creates a directory at the given path.
-    virtual ::grpc::Status CreateDirectory(::grpc::ServerContext* context, const ::io::deephaven::proto::backplane::grpc::CreateDirectoryRequest* request, ::io::deephaven::proto::backplane::grpc::CreateDirectoryResponse* response);
-    // Deletes the file or directory at the given path. Directories must be empty to be deleted.
-    virtual ::grpc::Status DeleteItem(::grpc::ServerContext* context, const ::io::deephaven::proto::backplane::grpc::DeleteItemRequest* request, ::io::deephaven::proto::backplane::grpc::DeleteItemResponse* response);
-  };
-  template <class BaseClass>
-  class WithAsyncMethod_ListItems : public BaseClass {
-   private:
-    void BaseClassMustBeDerivedFromService(const Service* /*service*/) {}
-   public:
-    WithAsyncMethod_ListItems() {
-      ::grpc::Service::MarkMethodAsync(0);
-    }
-    ~WithAsyncMethod_ListItems() override {
-      BaseClassMustBeDerivedFromService(this);
-    }
-    // disable synchronous version of this method
-    ::grpc::Status ListItems(::grpc::ServerContext* /*context*/, const ::io::deephaven::proto::backplane::grpc::ListItemsRequest* /*request*/, ::io::deephaven::proto::backplane::grpc::ListItemsResponse* /*response*/) override {
-      abort();
-      return ::grpc::Status(::grpc::StatusCode::UNIMPLEMENTED, "");
-    }
-    void RequestListItems(::grpc::ServerContext* context, ::io::deephaven::proto::backplane::grpc::ListItemsRequest* request, ::grpc::ServerAsyncResponseWriter< ::io::deephaven::proto::backplane::grpc::ListItemsResponse>* response, ::grpc::CompletionQueue* new_call_cq, ::grpc::ServerCompletionQueue* notification_cq, void *tag) {
-      ::grpc::Service::RequestAsyncUnary(0, context, request, response, new_call_cq, notification_cq, tag);
-    }
-  };
-  template <class BaseClass>
-  class WithAsyncMethod_FetchFile : public BaseClass {
-   private:
-    void BaseClassMustBeDerivedFromService(const Service* /*service*/) {}
-   public:
-    WithAsyncMethod_FetchFile() {
-      ::grpc::Service::MarkMethodAsync(1);
-    }
-    ~WithAsyncMethod_FetchFile() override {
-      BaseClassMustBeDerivedFromService(this);
-    }
-    // disable synchronous version of this method
-    ::grpc::Status FetchFile(::grpc::ServerContext* /*context*/, const ::io::deephaven::proto::backplane::grpc::FetchFileRequest* /*request*/, ::io::deephaven::proto::backplane::grpc::FetchFileResponse* /*response*/) override {
-      abort();
-      return ::grpc::Status(::grpc::StatusCode::UNIMPLEMENTED, "");
-    }
-    void RequestFetchFile(::grpc::ServerContext* context, ::io::deephaven::proto::backplane::grpc::FetchFileRequest* request, ::grpc::ServerAsyncResponseWriter< ::io::deephaven::proto::backplane::grpc::FetchFileResponse>* response, ::grpc::CompletionQueue* new_call_cq, ::grpc::ServerCompletionQueue* notification_cq, void *tag) {
-      ::grpc::Service::RequestAsyncUnary(1, context, request, response, new_call_cq, notification_cq, tag);
-    }
-  };
-  template <class BaseClass>
-  class WithAsyncMethod_SaveFile : public BaseClass {
-   private:
-    void BaseClassMustBeDerivedFromService(const Service* /*service*/) {}
-   public:
-    WithAsyncMethod_SaveFile() {
-      ::grpc::Service::MarkMethodAsync(2);
-    }
-    ~WithAsyncMethod_SaveFile() override {
-      BaseClassMustBeDerivedFromService(this);
-    }
-    // disable synchronous version of this method
-    ::grpc::Status SaveFile(::grpc::ServerContext* /*context*/, const ::io::deephaven::proto::backplane::grpc::SaveFileRequest* /*request*/, ::io::deephaven::proto::backplane::grpc::SaveFileResponse* /*response*/) override {
-      abort();
-      return ::grpc::Status(::grpc::StatusCode::UNIMPLEMENTED, "");
-    }
-    void RequestSaveFile(::grpc::ServerContext* context, ::io::deephaven::proto::backplane::grpc::SaveFileRequest* request, ::grpc::ServerAsyncResponseWriter< ::io::deephaven::proto::backplane::grpc::SaveFileResponse>* response, ::grpc::CompletionQueue* new_call_cq, ::grpc::ServerCompletionQueue* notification_cq, void *tag) {
-      ::grpc::Service::RequestAsyncUnary(2, context, request, response, new_call_cq, notification_cq, tag);
-    }
-  };
-  template <class BaseClass>
-  class WithAsyncMethod_MoveItem : public BaseClass {
-   private:
-    void BaseClassMustBeDerivedFromService(const Service* /*service*/) {}
-   public:
-    WithAsyncMethod_MoveItem() {
-      ::grpc::Service::MarkMethodAsync(3);
-    }
-    ~WithAsyncMethod_MoveItem() override {
-      BaseClassMustBeDerivedFromService(this);
-    }
-    // disable synchronous version of this method
-    ::grpc::Status MoveItem(::grpc::ServerContext* /*context*/, const ::io::deephaven::proto::backplane::grpc::MoveItemRequest* /*request*/, ::io::deephaven::proto::backplane::grpc::MoveItemResponse* /*response*/) override {
-      abort();
-      return ::grpc::Status(::grpc::StatusCode::UNIMPLEMENTED, "");
-    }
-    void RequestMoveItem(::grpc::ServerContext* context, ::io::deephaven::proto::backplane::grpc::MoveItemRequest* request, ::grpc::ServerAsyncResponseWriter< ::io::deephaven::proto::backplane::grpc::MoveItemResponse>* response, ::grpc::CompletionQueue* new_call_cq, ::grpc::ServerCompletionQueue* notification_cq, void *tag) {
-      ::grpc::Service::RequestAsyncUnary(3, context, request, response, new_call_cq, notification_cq, tag);
-    }
-  };
-  template <class BaseClass>
-  class WithAsyncMethod_CreateDirectory : public BaseClass {
-   private:
-    void BaseClassMustBeDerivedFromService(const Service* /*service*/) {}
-   public:
-    WithAsyncMethod_CreateDirectory() {
-      ::grpc::Service::MarkMethodAsync(4);
-    }
-    ~WithAsyncMethod_CreateDirectory() override {
-      BaseClassMustBeDerivedFromService(this);
-    }
-    // disable synchronous version of this method
-    ::grpc::Status CreateDirectory(::grpc::ServerContext* /*context*/, const ::io::deephaven::proto::backplane::grpc::CreateDirectoryRequest* /*request*/, ::io::deephaven::proto::backplane::grpc::CreateDirectoryResponse* /*response*/) override {
-      abort();
-      return ::grpc::Status(::grpc::StatusCode::UNIMPLEMENTED, "");
-    }
-    void RequestCreateDirectory(::grpc::ServerContext* context, ::io::deephaven::proto::backplane::grpc::CreateDirectoryRequest* request, ::grpc::ServerAsyncResponseWriter< ::io::deephaven::proto::backplane::grpc::CreateDirectoryResponse>* response, ::grpc::CompletionQueue* new_call_cq, ::grpc::ServerCompletionQueue* notification_cq, void *tag) {
-      ::grpc::Service::RequestAsyncUnary(4, context, request, response, new_call_cq, notification_cq, tag);
-    }
-  };
-  template <class BaseClass>
-  class WithAsyncMethod_DeleteItem : public BaseClass {
-   private:
-    void BaseClassMustBeDerivedFromService(const Service* /*service*/) {}
-   public:
-    WithAsyncMethod_DeleteItem() {
-      ::grpc::Service::MarkMethodAsync(5);
-    }
-    ~WithAsyncMethod_DeleteItem() override {
-      BaseClassMustBeDerivedFromService(this);
-    }
-    // disable synchronous version of this method
-    ::grpc::Status DeleteItem(::grpc::ServerContext* /*context*/, const ::io::deephaven::proto::backplane::grpc::DeleteItemRequest* /*request*/, ::io::deephaven::proto::backplane::grpc::DeleteItemResponse* /*response*/) override {
-      abort();
-      return ::grpc::Status(::grpc::StatusCode::UNIMPLEMENTED, "");
-    }
-    void RequestDeleteItem(::grpc::ServerContext* context, ::io::deephaven::proto::backplane::grpc::DeleteItemRequest* request, ::grpc::ServerAsyncResponseWriter< ::io::deephaven::proto::backplane::grpc::DeleteItemResponse>* response, ::grpc::CompletionQueue* new_call_cq, ::grpc::ServerCompletionQueue* notification_cq, void *tag) {
-      ::grpc::Service::RequestAsyncUnary(5, context, request, response, new_call_cq, notification_cq, tag);
-    }
-  };
-  typedef WithAsyncMethod_ListItems<WithAsyncMethod_FetchFile<WithAsyncMethod_SaveFile<WithAsyncMethod_MoveItem<WithAsyncMethod_CreateDirectory<WithAsyncMethod_DeleteItem<Service > > > > > > AsyncService;
-  template <class BaseClass>
-  class WithCallbackMethod_ListItems : public BaseClass {
-   private:
-    void BaseClassMustBeDerivedFromService(const Service* /*service*/) {}
-   public:
-    WithCallbackMethod_ListItems() {
-      ::grpc::Service::MarkMethodCallback(0,
-          new ::grpc::internal::CallbackUnaryHandler< ::io::deephaven::proto::backplane::grpc::ListItemsRequest, ::io::deephaven::proto::backplane::grpc::ListItemsResponse>(
-            [this](
-                   ::grpc::CallbackServerContext* context, const ::io::deephaven::proto::backplane::grpc::ListItemsRequest* request, ::io::deephaven::proto::backplane::grpc::ListItemsResponse* response) { return this->ListItems(context, request, response); }));}
-    void SetMessageAllocatorFor_ListItems(
-        ::grpc::MessageAllocator< ::io::deephaven::proto::backplane::grpc::ListItemsRequest, ::io::deephaven::proto::backplane::grpc::ListItemsResponse>* allocator) {
-      ::grpc::internal::MethodHandler* const handler = ::grpc::Service::GetHandler(0);
-      static_cast<::grpc::internal::CallbackUnaryHandler< ::io::deephaven::proto::backplane::grpc::ListItemsRequest, ::io::deephaven::proto::backplane::grpc::ListItemsResponse>*>(handler)
-              ->SetMessageAllocator(allocator);
-    }
-    ~WithCallbackMethod_ListItems() override {
-      BaseClassMustBeDerivedFromService(this);
-    }
-    // disable synchronous version of this method
-    ::grpc::Status ListItems(::grpc::ServerContext* /*context*/, const ::io::deephaven::proto::backplane::grpc::ListItemsRequest* /*request*/, ::io::deephaven::proto::backplane::grpc::ListItemsResponse* /*response*/) override {
-      abort();
-      return ::grpc::Status(::grpc::StatusCode::UNIMPLEMENTED, "");
-    }
-    virtual ::grpc::ServerUnaryReactor* ListItems(
-      ::grpc::CallbackServerContext* /*context*/, const ::io::deephaven::proto::backplane::grpc::ListItemsRequest* /*request*/, ::io::deephaven::proto::backplane::grpc::ListItemsResponse* /*response*/)  { return nullptr; }
-  };
-  template <class BaseClass>
-  class WithCallbackMethod_FetchFile : public BaseClass {
-   private:
-    void BaseClassMustBeDerivedFromService(const Service* /*service*/) {}
-   public:
-    WithCallbackMethod_FetchFile() {
-      ::grpc::Service::MarkMethodCallback(1,
-          new ::grpc::internal::CallbackUnaryHandler< ::io::deephaven::proto::backplane::grpc::FetchFileRequest, ::io::deephaven::proto::backplane::grpc::FetchFileResponse>(
-            [this](
-                   ::grpc::CallbackServerContext* context, const ::io::deephaven::proto::backplane::grpc::FetchFileRequest* request, ::io::deephaven::proto::backplane::grpc::FetchFileResponse* response) { return this->FetchFile(context, request, response); }));}
-    void SetMessageAllocatorFor_FetchFile(
-        ::grpc::MessageAllocator< ::io::deephaven::proto::backplane::grpc::FetchFileRequest, ::io::deephaven::proto::backplane::grpc::FetchFileResponse>* allocator) {
-      ::grpc::internal::MethodHandler* const handler = ::grpc::Service::GetHandler(1);
-      static_cast<::grpc::internal::CallbackUnaryHandler< ::io::deephaven::proto::backplane::grpc::FetchFileRequest, ::io::deephaven::proto::backplane::grpc::FetchFileResponse>*>(handler)
-              ->SetMessageAllocator(allocator);
-    }
-    ~WithCallbackMethod_FetchFile() override {
-      BaseClassMustBeDerivedFromService(this);
-    }
-    // disable synchronous version of this method
-    ::grpc::Status FetchFile(::grpc::ServerContext* /*context*/, const ::io::deephaven::proto::backplane::grpc::FetchFileRequest* /*request*/, ::io::deephaven::proto::backplane::grpc::FetchFileResponse* /*response*/) override {
-      abort();
-      return ::grpc::Status(::grpc::StatusCode::UNIMPLEMENTED, "");
-    }
-    virtual ::grpc::ServerUnaryReactor* FetchFile(
-      ::grpc::CallbackServerContext* /*context*/, const ::io::deephaven::proto::backplane::grpc::FetchFileRequest* /*request*/, ::io::deephaven::proto::backplane::grpc::FetchFileResponse* /*response*/)  { return nullptr; }
-  };
-  template <class BaseClass>
-  class WithCallbackMethod_SaveFile : public BaseClass {
-   private:
-    void BaseClassMustBeDerivedFromService(const Service* /*service*/) {}
-   public:
-    WithCallbackMethod_SaveFile() {
-      ::grpc::Service::MarkMethodCallback(2,
-          new ::grpc::internal::CallbackUnaryHandler< ::io::deephaven::proto::backplane::grpc::SaveFileRequest, ::io::deephaven::proto::backplane::grpc::SaveFileResponse>(
-            [this](
-                   ::grpc::CallbackServerContext* context, const ::io::deephaven::proto::backplane::grpc::SaveFileRequest* request, ::io::deephaven::proto::backplane::grpc::SaveFileResponse* response) { return this->SaveFile(context, request, response); }));}
-    void SetMessageAllocatorFor_SaveFile(
-        ::grpc::MessageAllocator< ::io::deephaven::proto::backplane::grpc::SaveFileRequest, ::io::deephaven::proto::backplane::grpc::SaveFileResponse>* allocator) {
-      ::grpc::internal::MethodHandler* const handler = ::grpc::Service::GetHandler(2);
-      static_cast<::grpc::internal::CallbackUnaryHandler< ::io::deephaven::proto::backplane::grpc::SaveFileRequest, ::io::deephaven::proto::backplane::grpc::SaveFileResponse>*>(handler)
-              ->SetMessageAllocator(allocator);
-    }
-    ~WithCallbackMethod_SaveFile() override {
-      BaseClassMustBeDerivedFromService(this);
-    }
-    // disable synchronous version of this method
-    ::grpc::Status SaveFile(::grpc::ServerContext* /*context*/, const ::io::deephaven::proto::backplane::grpc::SaveFileRequest* /*request*/, ::io::deephaven::proto::backplane::grpc::SaveFileResponse* /*response*/) override {
-      abort();
-      return ::grpc::Status(::grpc::StatusCode::UNIMPLEMENTED, "");
-    }
-    virtual ::grpc::ServerUnaryReactor* SaveFile(
-      ::grpc::CallbackServerContext* /*context*/, const ::io::deephaven::proto::backplane::grpc::SaveFileRequest* /*request*/, ::io::deephaven::proto::backplane::grpc::SaveFileResponse* /*response*/)  { return nullptr; }
-  };
-  template <class BaseClass>
-  class WithCallbackMethod_MoveItem : public BaseClass {
-   private:
-    void BaseClassMustBeDerivedFromService(const Service* /*service*/) {}
-   public:
-    WithCallbackMethod_MoveItem() {
-      ::grpc::Service::MarkMethodCallback(3,
-          new ::grpc::internal::CallbackUnaryHandler< ::io::deephaven::proto::backplane::grpc::MoveItemRequest, ::io::deephaven::proto::backplane::grpc::MoveItemResponse>(
-            [this](
-                   ::grpc::CallbackServerContext* context, const ::io::deephaven::proto::backplane::grpc::MoveItemRequest* request, ::io::deephaven::proto::backplane::grpc::MoveItemResponse* response) { return this->MoveItem(context, request, response); }));}
-    void SetMessageAllocatorFor_MoveItem(
-        ::grpc::MessageAllocator< ::io::deephaven::proto::backplane::grpc::MoveItemRequest, ::io::deephaven::proto::backplane::grpc::MoveItemResponse>* allocator) {
-      ::grpc::internal::MethodHandler* const handler = ::grpc::Service::GetHandler(3);
-      static_cast<::grpc::internal::CallbackUnaryHandler< ::io::deephaven::proto::backplane::grpc::MoveItemRequest, ::io::deephaven::proto::backplane::grpc::MoveItemResponse>*>(handler)
-              ->SetMessageAllocator(allocator);
-    }
-    ~WithCallbackMethod_MoveItem() override {
-      BaseClassMustBeDerivedFromService(this);
-    }
-    // disable synchronous version of this method
-    ::grpc::Status MoveItem(::grpc::ServerContext* /*context*/, const ::io::deephaven::proto::backplane::grpc::MoveItemRequest* /*request*/, ::io::deephaven::proto::backplane::grpc::MoveItemResponse* /*response*/) override {
-      abort();
-      return ::grpc::Status(::grpc::StatusCode::UNIMPLEMENTED, "");
-    }
-    virtual ::grpc::ServerUnaryReactor* MoveItem(
-      ::grpc::CallbackServerContext* /*context*/, const ::io::deephaven::proto::backplane::grpc::MoveItemRequest* /*request*/, ::io::deephaven::proto::backplane::grpc::MoveItemResponse* /*response*/)  { return nullptr; }
-  };
-  template <class BaseClass>
-  class WithCallbackMethod_CreateDirectory : public BaseClass {
-   private:
-    void BaseClassMustBeDerivedFromService(const Service* /*service*/) {}
-   public:
-    WithCallbackMethod_CreateDirectory() {
-      ::grpc::Service::MarkMethodCallback(4,
-          new ::grpc::internal::CallbackUnaryHandler< ::io::deephaven::proto::backplane::grpc::CreateDirectoryRequest, ::io::deephaven::proto::backplane::grpc::CreateDirectoryResponse>(
-            [this](
-                   ::grpc::CallbackServerContext* context, const ::io::deephaven::proto::backplane::grpc::CreateDirectoryRequest* request, ::io::deephaven::proto::backplane::grpc::CreateDirectoryResponse* response) { return this->CreateDirectory(context, request, response); }));}
-    void SetMessageAllocatorFor_CreateDirectory(
-        ::grpc::MessageAllocator< ::io::deephaven::proto::backplane::grpc::CreateDirectoryRequest, ::io::deephaven::proto::backplane::grpc::CreateDirectoryResponse>* allocator) {
-      ::grpc::internal::MethodHandler* const handler = ::grpc::Service::GetHandler(4);
-      static_cast<::grpc::internal::CallbackUnaryHandler< ::io::deephaven::proto::backplane::grpc::CreateDirectoryRequest, ::io::deephaven::proto::backplane::grpc::CreateDirectoryResponse>*>(handler)
-              ->SetMessageAllocator(allocator);
-    }
-    ~WithCallbackMethod_CreateDirectory() override {
-      BaseClassMustBeDerivedFromService(this);
-    }
-    // disable synchronous version of this method
-    ::grpc::Status CreateDirectory(::grpc::ServerContext* /*context*/, const ::io::deephaven::proto::backplane::grpc::CreateDirectoryRequest* /*request*/, ::io::deephaven::proto::backplane::grpc::CreateDirectoryResponse* /*response*/) override {
-      abort();
-      return ::grpc::Status(::grpc::StatusCode::UNIMPLEMENTED, "");
-    }
-    virtual ::grpc::ServerUnaryReactor* CreateDirectory(
-      ::grpc::CallbackServerContext* /*context*/, const ::io::deephaven::proto::backplane::grpc::CreateDirectoryRequest* /*request*/, ::io::deephaven::proto::backplane::grpc::CreateDirectoryResponse* /*response*/)  { return nullptr; }
-  };
-  template <class BaseClass>
-  class WithCallbackMethod_DeleteItem : public BaseClass {
-   private:
-    void BaseClassMustBeDerivedFromService(const Service* /*service*/) {}
-   public:
-    WithCallbackMethod_DeleteItem() {
-      ::grpc::Service::MarkMethodCallback(5,
-          new ::grpc::internal::CallbackUnaryHandler< ::io::deephaven::proto::backplane::grpc::DeleteItemRequest, ::io::deephaven::proto::backplane::grpc::DeleteItemResponse>(
-            [this](
-                   ::grpc::CallbackServerContext* context, const ::io::deephaven::proto::backplane::grpc::DeleteItemRequest* request, ::io::deephaven::proto::backplane::grpc::DeleteItemResponse* response) { return this->DeleteItem(context, request, response); }));}
-    void SetMessageAllocatorFor_DeleteItem(
-        ::grpc::MessageAllocator< ::io::deephaven::proto::backplane::grpc::DeleteItemRequest, ::io::deephaven::proto::backplane::grpc::DeleteItemResponse>* allocator) {
-      ::grpc::internal::MethodHandler* const handler = ::grpc::Service::GetHandler(5);
-      static_cast<::grpc::internal::CallbackUnaryHandler< ::io::deephaven::proto::backplane::grpc::DeleteItemRequest, ::io::deephaven::proto::backplane::grpc::DeleteItemResponse>*>(handler)
-              ->SetMessageAllocator(allocator);
-    }
-    ~WithCallbackMethod_DeleteItem() override {
-      BaseClassMustBeDerivedFromService(this);
-    }
-    // disable synchronous version of this method
-    ::grpc::Status DeleteItem(::grpc::ServerContext* /*context*/, const ::io::deephaven::proto::backplane::grpc::DeleteItemRequest* /*request*/, ::io::deephaven::proto::backplane::grpc::DeleteItemResponse* /*response*/) override {
-      abort();
-      return ::grpc::Status(::grpc::StatusCode::UNIMPLEMENTED, "");
-    }
-    virtual ::grpc::ServerUnaryReactor* DeleteItem(
-      ::grpc::CallbackServerContext* /*context*/, const ::io::deephaven::proto::backplane::grpc::DeleteItemRequest* /*request*/, ::io::deephaven::proto::backplane::grpc::DeleteItemResponse* /*response*/)  { return nullptr; }
-  };
-  typedef WithCallbackMethod_ListItems<WithCallbackMethod_FetchFile<WithCallbackMethod_SaveFile<WithCallbackMethod_MoveItem<WithCallbackMethod_CreateDirectory<WithCallbackMethod_DeleteItem<Service > > > > > > CallbackService;
-  typedef CallbackService ExperimentalCallbackService;
-  template <class BaseClass>
-  class WithGenericMethod_ListItems : public BaseClass {
-   private:
-    void BaseClassMustBeDerivedFromService(const Service* /*service*/) {}
-   public:
-    WithGenericMethod_ListItems() {
-      ::grpc::Service::MarkMethodGeneric(0);
-    }
-    ~WithGenericMethod_ListItems() override {
-      BaseClassMustBeDerivedFromService(this);
-    }
-    // disable synchronous version of this method
-    ::grpc::Status ListItems(::grpc::ServerContext* /*context*/, const ::io::deephaven::proto::backplane::grpc::ListItemsRequest* /*request*/, ::io::deephaven::proto::backplane::grpc::ListItemsResponse* /*response*/) override {
-      abort();
-      return ::grpc::Status(::grpc::StatusCode::UNIMPLEMENTED, "");
-    }
-  };
-  template <class BaseClass>
-  class WithGenericMethod_FetchFile : public BaseClass {
-   private:
-    void BaseClassMustBeDerivedFromService(const Service* /*service*/) {}
-   public:
-    WithGenericMethod_FetchFile() {
-      ::grpc::Service::MarkMethodGeneric(1);
-    }
-    ~WithGenericMethod_FetchFile() override {
-      BaseClassMustBeDerivedFromService(this);
-    }
-    // disable synchronous version of this method
-    ::grpc::Status FetchFile(::grpc::ServerContext* /*context*/, const ::io::deephaven::proto::backplane::grpc::FetchFileRequest* /*request*/, ::io::deephaven::proto::backplane::grpc::FetchFileResponse* /*response*/) override {
-      abort();
-      return ::grpc::Status(::grpc::StatusCode::UNIMPLEMENTED, "");
-    }
-  };
-  template <class BaseClass>
-  class WithGenericMethod_SaveFile : public BaseClass {
-   private:
-    void BaseClassMustBeDerivedFromService(const Service* /*service*/) {}
-   public:
-    WithGenericMethod_SaveFile() {
-      ::grpc::Service::MarkMethodGeneric(2);
-    }
-    ~WithGenericMethod_SaveFile() override {
-      BaseClassMustBeDerivedFromService(this);
-    }
-    // disable synchronous version of this method
-    ::grpc::Status SaveFile(::grpc::ServerContext* /*context*/, const ::io::deephaven::proto::backplane::grpc::SaveFileRequest* /*request*/, ::io::deephaven::proto::backplane::grpc::SaveFileResponse* /*response*/) override {
-      abort();
-      return ::grpc::Status(::grpc::StatusCode::UNIMPLEMENTED, "");
-    }
-  };
-  template <class BaseClass>
-  class WithGenericMethod_MoveItem : public BaseClass {
-   private:
-    void BaseClassMustBeDerivedFromService(const Service* /*service*/) {}
-   public:
-    WithGenericMethod_MoveItem() {
-      ::grpc::Service::MarkMethodGeneric(3);
-    }
-    ~WithGenericMethod_MoveItem() override {
-      BaseClassMustBeDerivedFromService(this);
-    }
-    // disable synchronous version of this method
-    ::grpc::Status MoveItem(::grpc::ServerContext* /*context*/, const ::io::deephaven::proto::backplane::grpc::MoveItemRequest* /*request*/, ::io::deephaven::proto::backplane::grpc::MoveItemResponse* /*response*/) override {
-      abort();
-      return ::grpc::Status(::grpc::StatusCode::UNIMPLEMENTED, "");
-    }
-  };
-  template <class BaseClass>
-  class WithGenericMethod_CreateDirectory : public BaseClass {
-   private:
-    void BaseClassMustBeDerivedFromService(const Service* /*service*/) {}
-   public:
-    WithGenericMethod_CreateDirectory() {
-      ::grpc::Service::MarkMethodGeneric(4);
-    }
-    ~WithGenericMethod_CreateDirectory() override {
-      BaseClassMustBeDerivedFromService(this);
-    }
-    // disable synchronous version of this method
-    ::grpc::Status CreateDirectory(::grpc::ServerContext* /*context*/, const ::io::deephaven::proto::backplane::grpc::CreateDirectoryRequest* /*request*/, ::io::deephaven::proto::backplane::grpc::CreateDirectoryResponse* /*response*/) override {
-      abort();
-      return ::grpc::Status(::grpc::StatusCode::UNIMPLEMENTED, "");
-    }
-  };
-  template <class BaseClass>
-  class WithGenericMethod_DeleteItem : public BaseClass {
-   private:
-    void BaseClassMustBeDerivedFromService(const Service* /*service*/) {}
-   public:
-    WithGenericMethod_DeleteItem() {
-      ::grpc::Service::MarkMethodGeneric(5);
-    }
-    ~WithGenericMethod_DeleteItem() override {
-      BaseClassMustBeDerivedFromService(this);
-    }
-    // disable synchronous version of this method
-    ::grpc::Status DeleteItem(::grpc::ServerContext* /*context*/, const ::io::deephaven::proto::backplane::grpc::DeleteItemRequest* /*request*/, ::io::deephaven::proto::backplane::grpc::DeleteItemResponse* /*response*/) override {
-      abort();
-      return ::grpc::Status(::grpc::StatusCode::UNIMPLEMENTED, "");
-    }
-  };
-  template <class BaseClass>
-  class WithRawMethod_ListItems : public BaseClass {
-   private:
-    void BaseClassMustBeDerivedFromService(const Service* /*service*/) {}
-   public:
-    WithRawMethod_ListItems() {
-      ::grpc::Service::MarkMethodRaw(0);
-    }
-    ~WithRawMethod_ListItems() override {
-      BaseClassMustBeDerivedFromService(this);
-    }
-    // disable synchronous version of this method
-    ::grpc::Status ListItems(::grpc::ServerContext* /*context*/, const ::io::deephaven::proto::backplane::grpc::ListItemsRequest* /*request*/, ::io::deephaven::proto::backplane::grpc::ListItemsResponse* /*response*/) override {
-      abort();
-      return ::grpc::Status(::grpc::StatusCode::UNIMPLEMENTED, "");
-    }
-    void RequestListItems(::grpc::ServerContext* context, ::grpc::ByteBuffer* request, ::grpc::ServerAsyncResponseWriter< ::grpc::ByteBuffer>* response, ::grpc::CompletionQueue* new_call_cq, ::grpc::ServerCompletionQueue* notification_cq, void *tag) {
-      ::grpc::Service::RequestAsyncUnary(0, context, request, response, new_call_cq, notification_cq, tag);
-    }
-  };
-  template <class BaseClass>
-  class WithRawMethod_FetchFile : public BaseClass {
-   private:
-    void BaseClassMustBeDerivedFromService(const Service* /*service*/) {}
-   public:
-    WithRawMethod_FetchFile() {
-      ::grpc::Service::MarkMethodRaw(1);
-    }
-    ~WithRawMethod_FetchFile() override {
-      BaseClassMustBeDerivedFromService(this);
-    }
-    // disable synchronous version of this method
-    ::grpc::Status FetchFile(::grpc::ServerContext* /*context*/, const ::io::deephaven::proto::backplane::grpc::FetchFileRequest* /*request*/, ::io::deephaven::proto::backplane::grpc::FetchFileResponse* /*response*/) override {
-      abort();
-      return ::grpc::Status(::grpc::StatusCode::UNIMPLEMENTED, "");
-    }
-    void RequestFetchFile(::grpc::ServerContext* context, ::grpc::ByteBuffer* request, ::grpc::ServerAsyncResponseWriter< ::grpc::ByteBuffer>* response, ::grpc::CompletionQueue* new_call_cq, ::grpc::ServerCompletionQueue* notification_cq, void *tag) {
-      ::grpc::Service::RequestAsyncUnary(1, context, request, response, new_call_cq, notification_cq, tag);
-    }
-  };
-  template <class BaseClass>
-  class WithRawMethod_SaveFile : public BaseClass {
-   private:
-    void BaseClassMustBeDerivedFromService(const Service* /*service*/) {}
-   public:
-    WithRawMethod_SaveFile() {
-      ::grpc::Service::MarkMethodRaw(2);
-    }
-    ~WithRawMethod_SaveFile() override {
-      BaseClassMustBeDerivedFromService(this);
-    }
-    // disable synchronous version of this method
-    ::grpc::Status SaveFile(::grpc::ServerContext* /*context*/, const ::io::deephaven::proto::backplane::grpc::SaveFileRequest* /*request*/, ::io::deephaven::proto::backplane::grpc::SaveFileResponse* /*response*/) override {
-      abort();
-      return ::grpc::Status(::grpc::StatusCode::UNIMPLEMENTED, "");
-    }
-    void RequestSaveFile(::grpc::ServerContext* context, ::grpc::ByteBuffer* request, ::grpc::ServerAsyncResponseWriter< ::grpc::ByteBuffer>* response, ::grpc::CompletionQueue* new_call_cq, ::grpc::ServerCompletionQueue* notification_cq, void *tag) {
-      ::grpc::Service::RequestAsyncUnary(2, context, request, response, new_call_cq, notification_cq, tag);
-    }
-  };
-  template <class BaseClass>
-  class WithRawMethod_MoveItem : public BaseClass {
-   private:
-    void BaseClassMustBeDerivedFromService(const Service* /*service*/) {}
-   public:
-    WithRawMethod_MoveItem() {
-      ::grpc::Service::MarkMethodRaw(3);
-    }
-    ~WithRawMethod_MoveItem() override {
-      BaseClassMustBeDerivedFromService(this);
-    }
-    // disable synchronous version of this method
-    ::grpc::Status MoveItem(::grpc::ServerContext* /*context*/, const ::io::deephaven::proto::backplane::grpc::MoveItemRequest* /*request*/, ::io::deephaven::proto::backplane::grpc::MoveItemResponse* /*response*/) override {
-      abort();
-      return ::grpc::Status(::grpc::StatusCode::UNIMPLEMENTED, "");
-    }
-    void RequestMoveItem(::grpc::ServerContext* context, ::grpc::ByteBuffer* request, ::grpc::ServerAsyncResponseWriter< ::grpc::ByteBuffer>* response, ::grpc::CompletionQueue* new_call_cq, ::grpc::ServerCompletionQueue* notification_cq, void *tag) {
-      ::grpc::Service::RequestAsyncUnary(3, context, request, response, new_call_cq, notification_cq, tag);
-    }
-  };
-  template <class BaseClass>
-  class WithRawMethod_CreateDirectory : public BaseClass {
-   private:
-    void BaseClassMustBeDerivedFromService(const Service* /*service*/) {}
-   public:
-    WithRawMethod_CreateDirectory() {
-      ::grpc::Service::MarkMethodRaw(4);
-    }
-    ~WithRawMethod_CreateDirectory() override {
-      BaseClassMustBeDerivedFromService(this);
-    }
-    // disable synchronous version of this method
-    ::grpc::Status CreateDirectory(::grpc::ServerContext* /*context*/, const ::io::deephaven::proto::backplane::grpc::CreateDirectoryRequest* /*request*/, ::io::deephaven::proto::backplane::grpc::CreateDirectoryResponse* /*response*/) override {
-      abort();
-      return ::grpc::Status(::grpc::StatusCode::UNIMPLEMENTED, "");
-    }
-    void RequestCreateDirectory(::grpc::ServerContext* context, ::grpc::ByteBuffer* request, ::grpc::ServerAsyncResponseWriter< ::grpc::ByteBuffer>* response, ::grpc::CompletionQueue* new_call_cq, ::grpc::ServerCompletionQueue* notification_cq, void *tag) {
-      ::grpc::Service::RequestAsyncUnary(4, context, request, response, new_call_cq, notification_cq, tag);
-    }
-  };
-  template <class BaseClass>
-  class WithRawMethod_DeleteItem : public BaseClass {
-   private:
-    void BaseClassMustBeDerivedFromService(const Service* /*service*/) {}
-   public:
-    WithRawMethod_DeleteItem() {
-      ::grpc::Service::MarkMethodRaw(5);
-    }
-    ~WithRawMethod_DeleteItem() override {
-      BaseClassMustBeDerivedFromService(this);
-    }
-    // disable synchronous version of this method
-    ::grpc::Status DeleteItem(::grpc::ServerContext* /*context*/, const ::io::deephaven::proto::backplane::grpc::DeleteItemRequest* /*request*/, ::io::deephaven::proto::backplane::grpc::DeleteItemResponse* /*response*/) override {
-      abort();
-      return ::grpc::Status(::grpc::StatusCode::UNIMPLEMENTED, "");
-    }
-    void RequestDeleteItem(::grpc::ServerContext* context, ::grpc::ByteBuffer* request, ::grpc::ServerAsyncResponseWriter< ::grpc::ByteBuffer>* response, ::grpc::CompletionQueue* new_call_cq, ::grpc::ServerCompletionQueue* notification_cq, void *tag) {
-      ::grpc::Service::RequestAsyncUnary(5, context, request, response, new_call_cq, notification_cq, tag);
-    }
-  };
-  template <class BaseClass>
-  class WithRawCallbackMethod_ListItems : public BaseClass {
-   private:
-    void BaseClassMustBeDerivedFromService(const Service* /*service*/) {}
-   public:
-    WithRawCallbackMethod_ListItems() {
-      ::grpc::Service::MarkMethodRawCallback(0,
-          new ::grpc::internal::CallbackUnaryHandler< ::grpc::ByteBuffer, ::grpc::ByteBuffer>(
-            [this](
-                   ::grpc::CallbackServerContext* context, const ::grpc::ByteBuffer* request, ::grpc::ByteBuffer* response) { return this->ListItems(context, request, response); }));
-    }
-    ~WithRawCallbackMethod_ListItems() override {
-      BaseClassMustBeDerivedFromService(this);
-    }
-    // disable synchronous version of this method
-    ::grpc::Status ListItems(::grpc::ServerContext* /*context*/, const ::io::deephaven::proto::backplane::grpc::ListItemsRequest* /*request*/, ::io::deephaven::proto::backplane::grpc::ListItemsResponse* /*response*/) override {
-      abort();
-      return ::grpc::Status(::grpc::StatusCode::UNIMPLEMENTED, "");
-    }
-    virtual ::grpc::ServerUnaryReactor* ListItems(
-      ::grpc::CallbackServerContext* /*context*/, const ::grpc::ByteBuffer* /*request*/, ::grpc::ByteBuffer* /*response*/)  { return nullptr; }
-  };
-  template <class BaseClass>
-  class WithRawCallbackMethod_FetchFile : public BaseClass {
-   private:
-    void BaseClassMustBeDerivedFromService(const Service* /*service*/) {}
-   public:
-    WithRawCallbackMethod_FetchFile() {
-      ::grpc::Service::MarkMethodRawCallback(1,
-          new ::grpc::internal::CallbackUnaryHandler< ::grpc::ByteBuffer, ::grpc::ByteBuffer>(
-            [this](
-                   ::grpc::CallbackServerContext* context, const ::grpc::ByteBuffer* request, ::grpc::ByteBuffer* response) { return this->FetchFile(context, request, response); }));
-    }
-    ~WithRawCallbackMethod_FetchFile() override {
-      BaseClassMustBeDerivedFromService(this);
-    }
-    // disable synchronous version of this method
-    ::grpc::Status FetchFile(::grpc::ServerContext* /*context*/, const ::io::deephaven::proto::backplane::grpc::FetchFileRequest* /*request*/, ::io::deephaven::proto::backplane::grpc::FetchFileResponse* /*response*/) override {
-      abort();
-      return ::grpc::Status(::grpc::StatusCode::UNIMPLEMENTED, "");
-    }
-    virtual ::grpc::ServerUnaryReactor* FetchFile(
-      ::grpc::CallbackServerContext* /*context*/, const ::grpc::ByteBuffer* /*request*/, ::grpc::ByteBuffer* /*response*/)  { return nullptr; }
-  };
-  template <class BaseClass>
-  class WithRawCallbackMethod_SaveFile : public BaseClass {
-   private:
-    void BaseClassMustBeDerivedFromService(const Service* /*service*/) {}
-   public:
-    WithRawCallbackMethod_SaveFile() {
-      ::grpc::Service::MarkMethodRawCallback(2,
-          new ::grpc::internal::CallbackUnaryHandler< ::grpc::ByteBuffer, ::grpc::ByteBuffer>(
-            [this](
-                   ::grpc::CallbackServerContext* context, const ::grpc::ByteBuffer* request, ::grpc::ByteBuffer* response) { return this->SaveFile(context, request, response); }));
-    }
-    ~WithRawCallbackMethod_SaveFile() override {
-      BaseClassMustBeDerivedFromService(this);
-    }
-    // disable synchronous version of this method
-    ::grpc::Status SaveFile(::grpc::ServerContext* /*context*/, const ::io::deephaven::proto::backplane::grpc::SaveFileRequest* /*request*/, ::io::deephaven::proto::backplane::grpc::SaveFileResponse* /*response*/) override {
-      abort();
-      return ::grpc::Status(::grpc::StatusCode::UNIMPLEMENTED, "");
-    }
-    virtual ::grpc::ServerUnaryReactor* SaveFile(
-      ::grpc::CallbackServerContext* /*context*/, const ::grpc::ByteBuffer* /*request*/, ::grpc::ByteBuffer* /*response*/)  { return nullptr; }
-  };
-  template <class BaseClass>
-  class WithRawCallbackMethod_MoveItem : public BaseClass {
-   private:
-    void BaseClassMustBeDerivedFromService(const Service* /*service*/) {}
-   public:
-    WithRawCallbackMethod_MoveItem() {
-      ::grpc::Service::MarkMethodRawCallback(3,
-          new ::grpc::internal::CallbackUnaryHandler< ::grpc::ByteBuffer, ::grpc::ByteBuffer>(
-            [this](
-                   ::grpc::CallbackServerContext* context, const ::grpc::ByteBuffer* request, ::grpc::ByteBuffer* response) { return this->MoveItem(context, request, response); }));
-    }
-    ~WithRawCallbackMethod_MoveItem() override {
-      BaseClassMustBeDerivedFromService(this);
-    }
-    // disable synchronous version of this method
-    ::grpc::Status MoveItem(::grpc::ServerContext* /*context*/, const ::io::deephaven::proto::backplane::grpc::MoveItemRequest* /*request*/, ::io::deephaven::proto::backplane::grpc::MoveItemResponse* /*response*/) override {
-      abort();
-      return ::grpc::Status(::grpc::StatusCode::UNIMPLEMENTED, "");
-    }
-    virtual ::grpc::ServerUnaryReactor* MoveItem(
-      ::grpc::CallbackServerContext* /*context*/, const ::grpc::ByteBuffer* /*request*/, ::grpc::ByteBuffer* /*response*/)  { return nullptr; }
-  };
-  template <class BaseClass>
-  class WithRawCallbackMethod_CreateDirectory : public BaseClass {
-   private:
-    void BaseClassMustBeDerivedFromService(const Service* /*service*/) {}
-   public:
-    WithRawCallbackMethod_CreateDirectory() {
-      ::grpc::Service::MarkMethodRawCallback(4,
-          new ::grpc::internal::CallbackUnaryHandler< ::grpc::ByteBuffer, ::grpc::ByteBuffer>(
-            [this](
-                   ::grpc::CallbackServerContext* context, const ::grpc::ByteBuffer* request, ::grpc::ByteBuffer* response) { return this->CreateDirectory(context, request, response); }));
-    }
-    ~WithRawCallbackMethod_CreateDirectory() override {
-      BaseClassMustBeDerivedFromService(this);
-    }
-    // disable synchronous version of this method
-    ::grpc::Status CreateDirectory(::grpc::ServerContext* /*context*/, const ::io::deephaven::proto::backplane::grpc::CreateDirectoryRequest* /*request*/, ::io::deephaven::proto::backplane::grpc::CreateDirectoryResponse* /*response*/) override {
-      abort();
-      return ::grpc::Status(::grpc::StatusCode::UNIMPLEMENTED, "");
-    }
-    virtual ::grpc::ServerUnaryReactor* CreateDirectory(
-      ::grpc::CallbackServerContext* /*context*/, const ::grpc::ByteBuffer* /*request*/, ::grpc::ByteBuffer* /*response*/)  { return nullptr; }
-  };
-  template <class BaseClass>
-  class WithRawCallbackMethod_DeleteItem : public BaseClass {
-   private:
-    void BaseClassMustBeDerivedFromService(const Service* /*service*/) {}
-   public:
-    WithRawCallbackMethod_DeleteItem() {
-      ::grpc::Service::MarkMethodRawCallback(5,
-          new ::grpc::internal::CallbackUnaryHandler< ::grpc::ByteBuffer, ::grpc::ByteBuffer>(
-            [this](
-                   ::grpc::CallbackServerContext* context, const ::grpc::ByteBuffer* request, ::grpc::ByteBuffer* response) { return this->DeleteItem(context, request, response); }));
-    }
-    ~WithRawCallbackMethod_DeleteItem() override {
-      BaseClassMustBeDerivedFromService(this);
-    }
-    // disable synchronous version of this method
-    ::grpc::Status DeleteItem(::grpc::ServerContext* /*context*/, const ::io::deephaven::proto::backplane::grpc::DeleteItemRequest* /*request*/, ::io::deephaven::proto::backplane::grpc::DeleteItemResponse* /*response*/) override {
-      abort();
-      return ::grpc::Status(::grpc::StatusCode::UNIMPLEMENTED, "");
-    }
-    virtual ::grpc::ServerUnaryReactor* DeleteItem(
-      ::grpc::CallbackServerContext* /*context*/, const ::grpc::ByteBuffer* /*request*/, ::grpc::ByteBuffer* /*response*/)  { return nullptr; }
-  };
-  template <class BaseClass>
-  class WithStreamedUnaryMethod_ListItems : public BaseClass {
-   private:
-    void BaseClassMustBeDerivedFromService(const Service* /*service*/) {}
-   public:
-    WithStreamedUnaryMethod_ListItems() {
-      ::grpc::Service::MarkMethodStreamed(0,
-        new ::grpc::internal::StreamedUnaryHandler<
-          ::io::deephaven::proto::backplane::grpc::ListItemsRequest, ::io::deephaven::proto::backplane::grpc::ListItemsResponse>(
-            [this](::grpc::ServerContext* context,
-                   ::grpc::ServerUnaryStreamer<
-                     ::io::deephaven::proto::backplane::grpc::ListItemsRequest, ::io::deephaven::proto::backplane::grpc::ListItemsResponse>* streamer) {
-                       return this->StreamedListItems(context,
-                         streamer);
-                  }));
-    }
-    ~WithStreamedUnaryMethod_ListItems() override {
-      BaseClassMustBeDerivedFromService(this);
-    }
-    // disable regular version of this method
-    ::grpc::Status ListItems(::grpc::ServerContext* /*context*/, const ::io::deephaven::proto::backplane::grpc::ListItemsRequest* /*request*/, ::io::deephaven::proto::backplane::grpc::ListItemsResponse* /*response*/) override {
-      abort();
-      return ::grpc::Status(::grpc::StatusCode::UNIMPLEMENTED, "");
-    }
-    // replace default version of method with streamed unary
-    virtual ::grpc::Status StreamedListItems(::grpc::ServerContext* context, ::grpc::ServerUnaryStreamer< ::io::deephaven::proto::backplane::grpc::ListItemsRequest,::io::deephaven::proto::backplane::grpc::ListItemsResponse>* server_unary_streamer) = 0;
-  };
-  template <class BaseClass>
-  class WithStreamedUnaryMethod_FetchFile : public BaseClass {
-   private:
-    void BaseClassMustBeDerivedFromService(const Service* /*service*/) {}
-   public:
-    WithStreamedUnaryMethod_FetchFile() {
-      ::grpc::Service::MarkMethodStreamed(1,
-        new ::grpc::internal::StreamedUnaryHandler<
-          ::io::deephaven::proto::backplane::grpc::FetchFileRequest, ::io::deephaven::proto::backplane::grpc::FetchFileResponse>(
-            [this](::grpc::ServerContext* context,
-                   ::grpc::ServerUnaryStreamer<
-                     ::io::deephaven::proto::backplane::grpc::FetchFileRequest, ::io::deephaven::proto::backplane::grpc::FetchFileResponse>* streamer) {
-                       return this->StreamedFetchFile(context,
-                         streamer);
-                  }));
-    }
-    ~WithStreamedUnaryMethod_FetchFile() override {
-      BaseClassMustBeDerivedFromService(this);
-    }
-    // disable regular version of this method
-    ::grpc::Status FetchFile(::grpc::ServerContext* /*context*/, const ::io::deephaven::proto::backplane::grpc::FetchFileRequest* /*request*/, ::io::deephaven::proto::backplane::grpc::FetchFileResponse* /*response*/) override {
-      abort();
-      return ::grpc::Status(::grpc::StatusCode::UNIMPLEMENTED, "");
-    }
-    // replace default version of method with streamed unary
-    virtual ::grpc::Status StreamedFetchFile(::grpc::ServerContext* context, ::grpc::ServerUnaryStreamer< ::io::deephaven::proto::backplane::grpc::FetchFileRequest,::io::deephaven::proto::backplane::grpc::FetchFileResponse>* server_unary_streamer) = 0;
-  };
-  template <class BaseClass>
-  class WithStreamedUnaryMethod_SaveFile : public BaseClass {
-   private:
-    void BaseClassMustBeDerivedFromService(const Service* /*service*/) {}
-   public:
-    WithStreamedUnaryMethod_SaveFile() {
-      ::grpc::Service::MarkMethodStreamed(2,
-        new ::grpc::internal::StreamedUnaryHandler<
-          ::io::deephaven::proto::backplane::grpc::SaveFileRequest, ::io::deephaven::proto::backplane::grpc::SaveFileResponse>(
-            [this](::grpc::ServerContext* context,
-                   ::grpc::ServerUnaryStreamer<
-                     ::io::deephaven::proto::backplane::grpc::SaveFileRequest, ::io::deephaven::proto::backplane::grpc::SaveFileResponse>* streamer) {
-                       return this->StreamedSaveFile(context,
-                         streamer);
-                  }));
-    }
-    ~WithStreamedUnaryMethod_SaveFile() override {
-      BaseClassMustBeDerivedFromService(this);
-    }
-    // disable regular version of this method
-    ::grpc::Status SaveFile(::grpc::ServerContext* /*context*/, const ::io::deephaven::proto::backplane::grpc::SaveFileRequest* /*request*/, ::io::deephaven::proto::backplane::grpc::SaveFileResponse* /*response*/) override {
-      abort();
-      return ::grpc::Status(::grpc::StatusCode::UNIMPLEMENTED, "");
-    }
-    // replace default version of method with streamed unary
-    virtual ::grpc::Status StreamedSaveFile(::grpc::ServerContext* context, ::grpc::ServerUnaryStreamer< ::io::deephaven::proto::backplane::grpc::SaveFileRequest,::io::deephaven::proto::backplane::grpc::SaveFileResponse>* server_unary_streamer) = 0;
-  };
-  template <class BaseClass>
-  class WithStreamedUnaryMethod_MoveItem : public BaseClass {
-   private:
-    void BaseClassMustBeDerivedFromService(const Service* /*service*/) {}
-   public:
-    WithStreamedUnaryMethod_MoveItem() {
-      ::grpc::Service::MarkMethodStreamed(3,
-        new ::grpc::internal::StreamedUnaryHandler<
-          ::io::deephaven::proto::backplane::grpc::MoveItemRequest, ::io::deephaven::proto::backplane::grpc::MoveItemResponse>(
-            [this](::grpc::ServerContext* context,
-                   ::grpc::ServerUnaryStreamer<
-                     ::io::deephaven::proto::backplane::grpc::MoveItemRequest, ::io::deephaven::proto::backplane::grpc::MoveItemResponse>* streamer) {
-                       return this->StreamedMoveItem(context,
-                         streamer);
-                  }));
-    }
-    ~WithStreamedUnaryMethod_MoveItem() override {
-      BaseClassMustBeDerivedFromService(this);
-    }
-    // disable regular version of this method
-    ::grpc::Status MoveItem(::grpc::ServerContext* /*context*/, const ::io::deephaven::proto::backplane::grpc::MoveItemRequest* /*request*/, ::io::deephaven::proto::backplane::grpc::MoveItemResponse* /*response*/) override {
-      abort();
-      return ::grpc::Status(::grpc::StatusCode::UNIMPLEMENTED, "");
-    }
-    // replace default version of method with streamed unary
-    virtual ::grpc::Status StreamedMoveItem(::grpc::ServerContext* context, ::grpc::ServerUnaryStreamer< ::io::deephaven::proto::backplane::grpc::MoveItemRequest,::io::deephaven::proto::backplane::grpc::MoveItemResponse>* server_unary_streamer) = 0;
-  };
-  template <class BaseClass>
-  class WithStreamedUnaryMethod_CreateDirectory : public BaseClass {
-   private:
-    void BaseClassMustBeDerivedFromService(const Service* /*service*/) {}
-   public:
-    WithStreamedUnaryMethod_CreateDirectory() {
-      ::grpc::Service::MarkMethodStreamed(4,
-        new ::grpc::internal::StreamedUnaryHandler<
-          ::io::deephaven::proto::backplane::grpc::CreateDirectoryRequest, ::io::deephaven::proto::backplane::grpc::CreateDirectoryResponse>(
-            [this](::grpc::ServerContext* context,
-                   ::grpc::ServerUnaryStreamer<
-                     ::io::deephaven::proto::backplane::grpc::CreateDirectoryRequest, ::io::deephaven::proto::backplane::grpc::CreateDirectoryResponse>* streamer) {
-                       return this->StreamedCreateDirectory(context,
-                         streamer);
-                  }));
-    }
-    ~WithStreamedUnaryMethod_CreateDirectory() override {
-      BaseClassMustBeDerivedFromService(this);
-    }
-    // disable regular version of this method
-    ::grpc::Status CreateDirectory(::grpc::ServerContext* /*context*/, const ::io::deephaven::proto::backplane::grpc::CreateDirectoryRequest* /*request*/, ::io::deephaven::proto::backplane::grpc::CreateDirectoryResponse* /*response*/) override {
-      abort();
-      return ::grpc::Status(::grpc::StatusCode::UNIMPLEMENTED, "");
-    }
-    // replace default version of method with streamed unary
-    virtual ::grpc::Status StreamedCreateDirectory(::grpc::ServerContext* context, ::grpc::ServerUnaryStreamer< ::io::deephaven::proto::backplane::grpc::CreateDirectoryRequest,::io::deephaven::proto::backplane::grpc::CreateDirectoryResponse>* server_unary_streamer) = 0;
-  };
-  template <class BaseClass>
-  class WithStreamedUnaryMethod_DeleteItem : public BaseClass {
-   private:
-    void BaseClassMustBeDerivedFromService(const Service* /*service*/) {}
-   public:
-    WithStreamedUnaryMethod_DeleteItem() {
-      ::grpc::Service::MarkMethodStreamed(5,
-        new ::grpc::internal::StreamedUnaryHandler<
-          ::io::deephaven::proto::backplane::grpc::DeleteItemRequest, ::io::deephaven::proto::backplane::grpc::DeleteItemResponse>(
-            [this](::grpc::ServerContext* context,
-                   ::grpc::ServerUnaryStreamer<
-                     ::io::deephaven::proto::backplane::grpc::DeleteItemRequest, ::io::deephaven::proto::backplane::grpc::DeleteItemResponse>* streamer) {
-                       return this->StreamedDeleteItem(context,
-                         streamer);
-                  }));
-    }
-    ~WithStreamedUnaryMethod_DeleteItem() override {
-      BaseClassMustBeDerivedFromService(this);
-    }
-    // disable regular version of this method
-    ::grpc::Status DeleteItem(::grpc::ServerContext* /*context*/, const ::io::deephaven::proto::backplane::grpc::DeleteItemRequest* /*request*/, ::io::deephaven::proto::backplane::grpc::DeleteItemResponse* /*response*/) override {
-      abort();
-      return ::grpc::Status(::grpc::StatusCode::UNIMPLEMENTED, "");
-    }
-    // replace default version of method with streamed unary
-    virtual ::grpc::Status StreamedDeleteItem(::grpc::ServerContext* context, ::grpc::ServerUnaryStreamer< ::io::deephaven::proto::backplane::grpc::DeleteItemRequest,::io::deephaven::proto::backplane::grpc::DeleteItemResponse>* server_unary_streamer) = 0;
-  };
-  typedef WithStreamedUnaryMethod_ListItems<WithStreamedUnaryMethod_FetchFile<WithStreamedUnaryMethod_SaveFile<WithStreamedUnaryMethod_MoveItem<WithStreamedUnaryMethod_CreateDirectory<WithStreamedUnaryMethod_DeleteItem<Service > > > > > > StreamedUnaryService;
-  typedef Service SplitStreamedService;
-  typedef WithStreamedUnaryMethod_ListItems<WithStreamedUnaryMethod_FetchFile<WithStreamedUnaryMethod_SaveFile<WithStreamedUnaryMethod_MoveItem<WithStreamedUnaryMethod_CreateDirectory<WithStreamedUnaryMethod_DeleteItem<Service > > > > > > StreamedService;
-};
-
-}  // namespace grpc
-}  // namespace backplane
-}  // namespace proto
-}  // namespace deephaven
-}  // namespace io
-
-
-#endif  // GRPC_deephaven_2fproto_2fstorage_2eproto__INCLUDED
diff --git a/cpp-client/deephaven/dhclient/proto/deephaven/proto/storage.pb.cc b/cpp-client/deephaven/dhclient/proto/deephaven/proto/storage.pb.cc
deleted file mode 100644
index 331da2f4a33..00000000000
--- a/cpp-client/deephaven/dhclient/proto/deephaven/proto/storage.pb.cc
+++ /dev/null
@@ -1,2972 +0,0 @@
-// Generated by the protocol buffer compiler.  DO NOT EDIT!
-// source: deephaven/proto/storage.proto
-
-#include "deephaven/proto/storage.pb.h"
-
-#include <algorithm>
-#include "google/protobuf/io/coded_stream.h"
-#include "google/protobuf/extension_set.h"
-#include "google/protobuf/wire_format_lite.h"
-#include "google/protobuf/descriptor.h"
-#include "google/protobuf/generated_message_reflection.h"
-#include "google/protobuf/reflection_ops.h"
-#include "google/protobuf/wire_format.h"
-#include "google/protobuf/generated_message_tctable_impl.h"
-// @@protoc_insertion_point(includes)
-
-// Must be included last.
-#include "google/protobuf/port_def.inc"
-PROTOBUF_PRAGMA_INIT_SEG
-namespace _pb = ::google::protobuf;
-namespace _pbi = ::google::protobuf::internal;
-namespace _fl = ::google::protobuf::internal::field_layout;
-namespace io {
-namespace deephaven {
-namespace proto {
-namespace backplane {
-namespace grpc {
-
-inline constexpr SaveFileResponse::Impl_::Impl_(
-    ::_pbi::ConstantInitialized) noexcept
-      : _cached_size_{0},
-        etag_(
-            &::google::protobuf::internal::fixed_address_empty_string,
-            ::_pbi::ConstantInitialized()) {}
-
-template <typename>
-PROTOBUF_CONSTEXPR SaveFileResponse::SaveFileResponse(::_pbi::ConstantInitialized)
-    : _impl_(::_pbi::ConstantInitialized()) {}
-struct SaveFileResponseDefaultTypeInternal {
-  PROTOBUF_CONSTEXPR SaveFileResponseDefaultTypeInternal() : _instance(::_pbi::ConstantInitialized{}) {}
-  ~SaveFileResponseDefaultTypeInternal() {}
-  union {
-    SaveFileResponse _instance;
-  };
-};
-
-PROTOBUF_ATTRIBUTE_NO_DESTROY PROTOBUF_CONSTINIT
-    PROTOBUF_ATTRIBUTE_INIT_PRIORITY1 SaveFileResponseDefaultTypeInternal _SaveFileResponse_default_instance_;
-
-inline constexpr SaveFileRequest::Impl_::Impl_(
-    ::_pbi::ConstantInitialized) noexcept
-      : path_(
-            &::google::protobuf::internal::fixed_address_empty_string,
-            ::_pbi::ConstantInitialized()),
-        contents_(
-            &::google::protobuf::internal::fixed_address_empty_string,
-            ::_pbi::ConstantInitialized()),
-        allow_overwrite_{false},
-        _cached_size_{0} {}
-
-template <typename>
-PROTOBUF_CONSTEXPR SaveFileRequest::SaveFileRequest(::_pbi::ConstantInitialized)
-    : _impl_(::_pbi::ConstantInitialized()) {}
-struct SaveFileRequestDefaultTypeInternal {
-  PROTOBUF_CONSTEXPR SaveFileRequestDefaultTypeInternal() : _instance(::_pbi::ConstantInitialized{}) {}
-  ~SaveFileRequestDefaultTypeInternal() {}
-  union {
-    SaveFileRequest _instance;
-  };
-};
-
-PROTOBUF_ATTRIBUTE_NO_DESTROY PROTOBUF_CONSTINIT
-    PROTOBUF_ATTRIBUTE_INIT_PRIORITY1 SaveFileRequestDefaultTypeInternal _SaveFileRequest_default_instance_;
-      template <typename>
-PROTOBUF_CONSTEXPR MoveItemResponse::MoveItemResponse(::_pbi::ConstantInitialized) {}
-struct MoveItemResponseDefaultTypeInternal {
-  PROTOBUF_CONSTEXPR MoveItemResponseDefaultTypeInternal() : _instance(::_pbi::ConstantInitialized{}) {}
-  ~MoveItemResponseDefaultTypeInternal() {}
-  union {
-    MoveItemResponse _instance;
-  };
-};
-
-PROTOBUF_ATTRIBUTE_NO_DESTROY PROTOBUF_CONSTINIT
-    PROTOBUF_ATTRIBUTE_INIT_PRIORITY1 MoveItemResponseDefaultTypeInternal _MoveItemResponse_default_instance_;
-
-inline constexpr MoveItemRequest::Impl_::Impl_(
-    ::_pbi::ConstantInitialized) noexcept
-      : old_path_(
-            &::google::protobuf::internal::fixed_address_empty_string,
-            ::_pbi::ConstantInitialized()),
-        new_path_(
-            &::google::protobuf::internal::fixed_address_empty_string,
-            ::_pbi::ConstantInitialized()),
-        allow_overwrite_{false},
-        _cached_size_{0} {}
-
-template <typename>
-PROTOBUF_CONSTEXPR MoveItemRequest::MoveItemRequest(::_pbi::ConstantInitialized)
-    : _impl_(::_pbi::ConstantInitialized()) {}
-struct MoveItemRequestDefaultTypeInternal {
-  PROTOBUF_CONSTEXPR MoveItemRequestDefaultTypeInternal() : _instance(::_pbi::ConstantInitialized{}) {}
-  ~MoveItemRequestDefaultTypeInternal() {}
-  union {
-    MoveItemRequest _instance;
-  };
-};
-
-PROTOBUF_ATTRIBUTE_NO_DESTROY PROTOBUF_CONSTINIT
-    PROTOBUF_ATTRIBUTE_INIT_PRIORITY1 MoveItemRequestDefaultTypeInternal _MoveItemRequest_default_instance_;
-
-inline constexpr ListItemsRequest::Impl_::Impl_(
-    ::_pbi::ConstantInitialized) noexcept
-      : _cached_size_{0},
-        path_(
-            &::google::protobuf::internal::fixed_address_empty_string,
-            ::_pbi::ConstantInitialized()),
-        filter_glob_(
-            &::google::protobuf::internal::fixed_address_empty_string,
-            ::_pbi::ConstantInitialized()) {}
-
-template <typename>
-PROTOBUF_CONSTEXPR ListItemsRequest::ListItemsRequest(::_pbi::ConstantInitialized)
-    : _impl_(::_pbi::ConstantInitialized()) {}
-struct ListItemsRequestDefaultTypeInternal {
-  PROTOBUF_CONSTEXPR ListItemsRequestDefaultTypeInternal() : _instance(::_pbi::ConstantInitialized{}) {}
-  ~ListItemsRequestDefaultTypeInternal() {}
-  union {
-    ListItemsRequest _instance;
-  };
-};
-
-PROTOBUF_ATTRIBUTE_NO_DESTROY PROTOBUF_CONSTINIT
-    PROTOBUF_ATTRIBUTE_INIT_PRIORITY1 ListItemsRequestDefaultTypeInternal _ListItemsRequest_default_instance_;
-
-inline constexpr ItemInfo::Impl_::Impl_(
-    ::_pbi::ConstantInitialized) noexcept
-      : _cached_size_{0},
-        path_(
-            &::google::protobuf::internal::fixed_address_empty_string,
-            ::_pbi::ConstantInitialized()),
-        etag_(
-            &::google::protobuf::internal::fixed_address_empty_string,
-            ::_pbi::ConstantInitialized()),
-        size_{::int64_t{0}},
-        type_{static_cast< ::io::deephaven::proto::backplane::grpc::ItemType >(0)} {}
-
-template <typename>
-PROTOBUF_CONSTEXPR ItemInfo::ItemInfo(::_pbi::ConstantInitialized)
-    : _impl_(::_pbi::ConstantInitialized()) {}
-struct ItemInfoDefaultTypeInternal {
-  PROTOBUF_CONSTEXPR ItemInfoDefaultTypeInternal() : _instance(::_pbi::ConstantInitialized{}) {}
-  ~ItemInfoDefaultTypeInternal() {}
-  union {
-    ItemInfo _instance;
-  };
-};
-
-PROTOBUF_ATTRIBUTE_NO_DESTROY PROTOBUF_CONSTINIT
-    PROTOBUF_ATTRIBUTE_INIT_PRIORITY1 ItemInfoDefaultTypeInternal _ItemInfo_default_instance_;
-
-inline constexpr FetchFileResponse::Impl_::Impl_(
-    ::_pbi::ConstantInitialized) noexcept
-      : _cached_size_{0},
-        contents_(
-            &::google::protobuf::internal::fixed_address_empty_string,
-            ::_pbi::ConstantInitialized()),
-        etag_(
-            &::google::protobuf::internal::fixed_address_empty_string,
-            ::_pbi::ConstantInitialized()) {}
-
-template <typename>
-PROTOBUF_CONSTEXPR FetchFileResponse::FetchFileResponse(::_pbi::ConstantInitialized)
-    : _impl_(::_pbi::ConstantInitialized()) {}
-struct FetchFileResponseDefaultTypeInternal {
-  PROTOBUF_CONSTEXPR FetchFileResponseDefaultTypeInternal() : _instance(::_pbi::ConstantInitialized{}) {}
-  ~FetchFileResponseDefaultTypeInternal() {}
-  union {
-    FetchFileResponse _instance;
-  };
-};
-
-PROTOBUF_ATTRIBUTE_NO_DESTROY PROTOBUF_CONSTINIT
-    PROTOBUF_ATTRIBUTE_INIT_PRIORITY1 FetchFileResponseDefaultTypeInternal _FetchFileResponse_default_instance_;
-
-inline constexpr FetchFileRequest::Impl_::Impl_(
-    ::_pbi::ConstantInitialized) noexcept
-      : _cached_size_{0},
-        path_(
-            &::google::protobuf::internal::fixed_address_empty_string,
-            ::_pbi::ConstantInitialized()),
-        etag_(
-            &::google::protobuf::internal::fixed_address_empty_string,
-            ::_pbi::ConstantInitialized()) {}
-
-template <typename>
-PROTOBUF_CONSTEXPR FetchFileRequest::FetchFileRequest(::_pbi::ConstantInitialized)
-    : _impl_(::_pbi::ConstantInitialized()) {}
-struct FetchFileRequestDefaultTypeInternal {
-  PROTOBUF_CONSTEXPR FetchFileRequestDefaultTypeInternal() : _instance(::_pbi::ConstantInitialized{}) {}
-  ~FetchFileRequestDefaultTypeInternal() {}
-  union {
-    FetchFileRequest _instance;
-  };
-};
-
-PROTOBUF_ATTRIBUTE_NO_DESTROY PROTOBUF_CONSTINIT
-    PROTOBUF_ATTRIBUTE_INIT_PRIORITY1 FetchFileRequestDefaultTypeInternal _FetchFileRequest_default_instance_;
-      template <typename>
-PROTOBUF_CONSTEXPR DeleteItemResponse::DeleteItemResponse(::_pbi::ConstantInitialized) {}
-struct DeleteItemResponseDefaultTypeInternal {
-  PROTOBUF_CONSTEXPR DeleteItemResponseDefaultTypeInternal() : _instance(::_pbi::ConstantInitialized{}) {}
-  ~DeleteItemResponseDefaultTypeInternal() {}
-  union {
-    DeleteItemResponse _instance;
-  };
-};
-
-PROTOBUF_ATTRIBUTE_NO_DESTROY PROTOBUF_CONSTINIT
-    PROTOBUF_ATTRIBUTE_INIT_PRIORITY1 DeleteItemResponseDefaultTypeInternal _DeleteItemResponse_default_instance_;
-
-inline constexpr DeleteItemRequest::Impl_::Impl_(
-    ::_pbi::ConstantInitialized) noexcept
-      : path_(
-            &::google::protobuf::internal::fixed_address_empty_string,
-            ::_pbi::ConstantInitialized()),
-        _cached_size_{0} {}
-
-template <typename>
-PROTOBUF_CONSTEXPR DeleteItemRequest::DeleteItemRequest(::_pbi::ConstantInitialized)
-    : _impl_(::_pbi::ConstantInitialized()) {}
-struct DeleteItemRequestDefaultTypeInternal {
-  PROTOBUF_CONSTEXPR DeleteItemRequestDefaultTypeInternal() : _instance(::_pbi::ConstantInitialized{}) {}
-  ~DeleteItemRequestDefaultTypeInternal() {}
-  union {
-    DeleteItemRequest _instance;
-  };
-};
-
-PROTOBUF_ATTRIBUTE_NO_DESTROY PROTOBUF_CONSTINIT
-    PROTOBUF_ATTRIBUTE_INIT_PRIORITY1 DeleteItemRequestDefaultTypeInternal _DeleteItemRequest_default_instance_;
-      template <typename>
-PROTOBUF_CONSTEXPR CreateDirectoryResponse::CreateDirectoryResponse(::_pbi::ConstantInitialized) {}
-struct CreateDirectoryResponseDefaultTypeInternal {
-  PROTOBUF_CONSTEXPR CreateDirectoryResponseDefaultTypeInternal() : _instance(::_pbi::ConstantInitialized{}) {}
-  ~CreateDirectoryResponseDefaultTypeInternal() {}
-  union {
-    CreateDirectoryResponse _instance;
-  };
-};
-
-PROTOBUF_ATTRIBUTE_NO_DESTROY PROTOBUF_CONSTINIT
-    PROTOBUF_ATTRIBUTE_INIT_PRIORITY1 CreateDirectoryResponseDefaultTypeInternal _CreateDirectoryResponse_default_instance_;
-
-inline constexpr CreateDirectoryRequest::Impl_::Impl_(
-    ::_pbi::ConstantInitialized) noexcept
-      : path_(
-            &::google::protobuf::internal::fixed_address_empty_string,
-            ::_pbi::ConstantInitialized()),
-        _cached_size_{0} {}
-
-template <typename>
-PROTOBUF_CONSTEXPR CreateDirectoryRequest::CreateDirectoryRequest(::_pbi::ConstantInitialized)
-    : _impl_(::_pbi::ConstantInitialized()) {}
-struct CreateDirectoryRequestDefaultTypeInternal {
-  PROTOBUF_CONSTEXPR CreateDirectoryRequestDefaultTypeInternal() : _instance(::_pbi::ConstantInitialized{}) {}
-  ~CreateDirectoryRequestDefaultTypeInternal() {}
-  union {
-    CreateDirectoryRequest _instance;
-  };
-};
-
-PROTOBUF_ATTRIBUTE_NO_DESTROY PROTOBUF_CONSTINIT
-    PROTOBUF_ATTRIBUTE_INIT_PRIORITY1 CreateDirectoryRequestDefaultTypeInternal _CreateDirectoryRequest_default_instance_;
-
-inline constexpr ListItemsResponse::Impl_::Impl_(
-    ::_pbi::ConstantInitialized) noexcept
-      : items_{},
-        canonical_path_(
-            &::google::protobuf::internal::fixed_address_empty_string,
-            ::_pbi::ConstantInitialized()),
-        _cached_size_{0} {}
-
-template <typename>
-PROTOBUF_CONSTEXPR ListItemsResponse::ListItemsResponse(::_pbi::ConstantInitialized)
-    : _impl_(::_pbi::ConstantInitialized()) {}
-struct ListItemsResponseDefaultTypeInternal {
-  PROTOBUF_CONSTEXPR ListItemsResponseDefaultTypeInternal() : _instance(::_pbi::ConstantInitialized{}) {}
-  ~ListItemsResponseDefaultTypeInternal() {}
-  union {
-    ListItemsResponse _instance;
-  };
-};
-
-PROTOBUF_ATTRIBUTE_NO_DESTROY PROTOBUF_CONSTINIT
-    PROTOBUF_ATTRIBUTE_INIT_PRIORITY1 ListItemsResponseDefaultTypeInternal _ListItemsResponse_default_instance_;
-}  // namespace grpc
-}  // namespace backplane
-}  // namespace proto
-}  // namespace deephaven
-}  // namespace io
-static ::_pb::Metadata file_level_metadata_deephaven_2fproto_2fstorage_2eproto[13];
-static const ::_pb::EnumDescriptor* file_level_enum_descriptors_deephaven_2fproto_2fstorage_2eproto[1];
-static constexpr const ::_pb::ServiceDescriptor**
-    file_level_service_descriptors_deephaven_2fproto_2fstorage_2eproto = nullptr;
-const ::uint32_t TableStruct_deephaven_2fproto_2fstorage_2eproto::offsets[] PROTOBUF_SECTION_VARIABLE(
-    protodesc_cold) = {
-    PROTOBUF_FIELD_OFFSET(::io::deephaven::proto::backplane::grpc::ListItemsRequest, _impl_._has_bits_),
-    PROTOBUF_FIELD_OFFSET(::io::deephaven::proto::backplane::grpc::ListItemsRequest, _internal_metadata_),
-    ~0u,  // no _extensions_
-    ~0u,  // no _oneof_case_
-    ~0u,  // no _weak_field_map_
-    ~0u,  // no _inlined_string_donated_
-    ~0u,  // no _split_
-    ~0u,  // no sizeof(Split)
-    PROTOBUF_FIELD_OFFSET(::io::deephaven::proto::backplane::grpc::ListItemsRequest, _impl_.path_),
-    PROTOBUF_FIELD_OFFSET(::io::deephaven::proto::backplane::grpc::ListItemsRequest, _impl_.filter_glob_),
-    ~0u,
-    0,
-    PROTOBUF_FIELD_OFFSET(::io::deephaven::proto::backplane::grpc::ItemInfo, _impl_._has_bits_),
-    PROTOBUF_FIELD_OFFSET(::io::deephaven::proto::backplane::grpc::ItemInfo, _internal_metadata_),
-    ~0u,  // no _extensions_
-    ~0u,  // no _oneof_case_
-    ~0u,  // no _weak_field_map_
-    ~0u,  // no _inlined_string_donated_
-    ~0u,  // no _split_
-    ~0u,  // no sizeof(Split)
-    PROTOBUF_FIELD_OFFSET(::io::deephaven::proto::backplane::grpc::ItemInfo, _impl_.path_),
-    PROTOBUF_FIELD_OFFSET(::io::deephaven::proto::backplane::grpc::ItemInfo, _impl_.type_),
-    PROTOBUF_FIELD_OFFSET(::io::deephaven::proto::backplane::grpc::ItemInfo, _impl_.size_),
-    PROTOBUF_FIELD_OFFSET(::io::deephaven::proto::backplane::grpc::ItemInfo, _impl_.etag_),
-    ~0u,
-    ~0u,
-    ~0u,
-    0,
-    ~0u,  // no _has_bits_
-    PROTOBUF_FIELD_OFFSET(::io::deephaven::proto::backplane::grpc::ListItemsResponse, _internal_metadata_),
-    ~0u,  // no _extensions_
-    ~0u,  // no _oneof_case_
-    ~0u,  // no _weak_field_map_
-    ~0u,  // no _inlined_string_donated_
-    ~0u,  // no _split_
-    ~0u,  // no sizeof(Split)
-    PROTOBUF_FIELD_OFFSET(::io::deephaven::proto::backplane::grpc::ListItemsResponse, _impl_.items_),
-    PROTOBUF_FIELD_OFFSET(::io::deephaven::proto::backplane::grpc::ListItemsResponse, _impl_.canonical_path_),
-    PROTOBUF_FIELD_OFFSET(::io::deephaven::proto::backplane::grpc::FetchFileRequest, _impl_._has_bits_),
-    PROTOBUF_FIELD_OFFSET(::io::deephaven::proto::backplane::grpc::FetchFileRequest, _internal_metadata_),
-    ~0u,  // no _extensions_
-    ~0u,  // no _oneof_case_
-    ~0u,  // no _weak_field_map_
-    ~0u,  // no _inlined_string_donated_
-    ~0u,  // no _split_
-    ~0u,  // no sizeof(Split)
-    PROTOBUF_FIELD_OFFSET(::io::deephaven::proto::backplane::grpc::FetchFileRequest, _impl_.path_),
-    PROTOBUF_FIELD_OFFSET(::io::deephaven::proto::backplane::grpc::FetchFileRequest, _impl_.etag_),
-    ~0u,
-    0,
-    PROTOBUF_FIELD_OFFSET(::io::deephaven::proto::backplane::grpc::FetchFileResponse, _impl_._has_bits_),
-    PROTOBUF_FIELD_OFFSET(::io::deephaven::proto::backplane::grpc::FetchFileResponse, _internal_metadata_),
-    ~0u,  // no _extensions_
-    ~0u,  // no _oneof_case_
-    ~0u,  // no _weak_field_map_
-    ~0u,  // no _inlined_string_donated_
-    ~0u,  // no _split_
-    ~0u,  // no sizeof(Split)
-    PROTOBUF_FIELD_OFFSET(::io::deephaven::proto::backplane::grpc::FetchFileResponse, _impl_.contents_),
-    PROTOBUF_FIELD_OFFSET(::io::deephaven::proto::backplane::grpc::FetchFileResponse, _impl_.etag_),
-    ~0u,
-    0,
-    ~0u,  // no _has_bits_
-    PROTOBUF_FIELD_OFFSET(::io::deephaven::proto::backplane::grpc::SaveFileRequest, _internal_metadata_),
-    ~0u,  // no _extensions_
-    ~0u,  // no _oneof_case_
-    ~0u,  // no _weak_field_map_
-    ~0u,  // no _inlined_string_donated_
-    ~0u,  // no _split_
-    ~0u,  // no sizeof(Split)
-    PROTOBUF_FIELD_OFFSET(::io::deephaven::proto::backplane::grpc::SaveFileRequest, _impl_.allow_overwrite_),
-    PROTOBUF_FIELD_OFFSET(::io::deephaven::proto::backplane::grpc::SaveFileRequest, _impl_.path_),
-    PROTOBUF_FIELD_OFFSET(::io::deephaven::proto::backplane::grpc::SaveFileRequest, _impl_.contents_),
-    PROTOBUF_FIELD_OFFSET(::io::deephaven::proto::backplane::grpc::SaveFileResponse, _impl_._has_bits_),
-    PROTOBUF_FIELD_OFFSET(::io::deephaven::proto::backplane::grpc::SaveFileResponse, _internal_metadata_),
-    ~0u,  // no _extensions_
-    ~0u,  // no _oneof_case_
-    ~0u,  // no _weak_field_map_
-    ~0u,  // no _inlined_string_donated_
-    ~0u,  // no _split_
-    ~0u,  // no sizeof(Split)
-    PROTOBUF_FIELD_OFFSET(::io::deephaven::proto::backplane::grpc::SaveFileResponse, _impl_.etag_),
-    0,
-    ~0u,  // no _has_bits_
-    PROTOBUF_FIELD_OFFSET(::io::deephaven::proto::backplane::grpc::MoveItemRequest, _internal_metadata_),
-    ~0u,  // no _extensions_
-    ~0u,  // no _oneof_case_
-    ~0u,  // no _weak_field_map_
-    ~0u,  // no _inlined_string_donated_
-    ~0u,  // no _split_
-    ~0u,  // no sizeof(Split)
-    PROTOBUF_FIELD_OFFSET(::io::deephaven::proto::backplane::grpc::MoveItemRequest, _impl_.old_path_),
-    PROTOBUF_FIELD_OFFSET(::io::deephaven::proto::backplane::grpc::MoveItemRequest, _impl_.new_path_),
-    PROTOBUF_FIELD_OFFSET(::io::deephaven::proto::backplane::grpc::MoveItemRequest, _impl_.allow_overwrite_),
-    ~0u,  // no _has_bits_
-    PROTOBUF_FIELD_OFFSET(::io::deephaven::proto::backplane::grpc::MoveItemResponse, _internal_metadata_),
-    ~0u,  // no _extensions_
-    ~0u,  // no _oneof_case_
-    ~0u,  // no _weak_field_map_
-    ~0u,  // no _inlined_string_donated_
-    ~0u,  // no _split_
-    ~0u,  // no sizeof(Split)
-    ~0u,  // no _has_bits_
-    PROTOBUF_FIELD_OFFSET(::io::deephaven::proto::backplane::grpc::CreateDirectoryRequest, _internal_metadata_),
-    ~0u,  // no _extensions_
-    ~0u,  // no _oneof_case_
-    ~0u,  // no _weak_field_map_
-    ~0u,  // no _inlined_string_donated_
-    ~0u,  // no _split_
-    ~0u,  // no sizeof(Split)
-    PROTOBUF_FIELD_OFFSET(::io::deephaven::proto::backplane::grpc::CreateDirectoryRequest, _impl_.path_),
-    ~0u,  // no _has_bits_
-    PROTOBUF_FIELD_OFFSET(::io::deephaven::proto::backplane::grpc::CreateDirectoryResponse, _internal_metadata_),
-    ~0u,  // no _extensions_
-    ~0u,  // no _oneof_case_
-    ~0u,  // no _weak_field_map_
-    ~0u,  // no _inlined_string_donated_
-    ~0u,  // no _split_
-    ~0u,  // no sizeof(Split)
-    ~0u,  // no _has_bits_
-    PROTOBUF_FIELD_OFFSET(::io::deephaven::proto::backplane::grpc::DeleteItemRequest, _internal_metadata_),
-    ~0u,  // no _extensions_
-    ~0u,  // no _oneof_case_
-    ~0u,  // no _weak_field_map_
-    ~0u,  // no _inlined_string_donated_
-    ~0u,  // no _split_
-    ~0u,  // no sizeof(Split)
-    PROTOBUF_FIELD_OFFSET(::io::deephaven::proto::backplane::grpc::DeleteItemRequest, _impl_.path_),
-    ~0u,  // no _has_bits_
-    PROTOBUF_FIELD_OFFSET(::io::deephaven::proto::backplane::grpc::DeleteItemResponse, _internal_metadata_),
-    ~0u,  // no _extensions_
-    ~0u,  // no _oneof_case_
-    ~0u,  // no _weak_field_map_
-    ~0u,  // no _inlined_string_donated_
-    ~0u,  // no _split_
-    ~0u,  // no sizeof(Split)
-};
-
-static const ::_pbi::MigrationSchema
-    schemas[] PROTOBUF_SECTION_VARIABLE(protodesc_cold) = {
-        {0, 10, -1, sizeof(::io::deephaven::proto::backplane::grpc::ListItemsRequest)},
-        {12, 24, -1, sizeof(::io::deephaven::proto::backplane::grpc::ItemInfo)},
-        {28, -1, -1, sizeof(::io::deephaven::proto::backplane::grpc::ListItemsResponse)},
-        {38, 48, -1, sizeof(::io::deephaven::proto::backplane::grpc::FetchFileRequest)},
-        {50, 60, -1, sizeof(::io::deephaven::proto::backplane::grpc::FetchFileResponse)},
-        {62, -1, -1, sizeof(::io::deephaven::proto::backplane::grpc::SaveFileRequest)},
-        {73, 82, -1, sizeof(::io::deephaven::proto::backplane::grpc::SaveFileResponse)},
-        {83, -1, -1, sizeof(::io::deephaven::proto::backplane::grpc::MoveItemRequest)},
-        {94, -1, -1, sizeof(::io::deephaven::proto::backplane::grpc::MoveItemResponse)},
-        {102, -1, -1, sizeof(::io::deephaven::proto::backplane::grpc::CreateDirectoryRequest)},
-        {111, -1, -1, sizeof(::io::deephaven::proto::backplane::grpc::CreateDirectoryResponse)},
-        {119, -1, -1, sizeof(::io::deephaven::proto::backplane::grpc::DeleteItemRequest)},
-        {128, -1, -1, sizeof(::io::deephaven::proto::backplane::grpc::DeleteItemResponse)},
-};
-
-static const ::_pb::Message* const file_default_instances[] = {
-    &::io::deephaven::proto::backplane::grpc::_ListItemsRequest_default_instance_._instance,
-    &::io::deephaven::proto::backplane::grpc::_ItemInfo_default_instance_._instance,
-    &::io::deephaven::proto::backplane::grpc::_ListItemsResponse_default_instance_._instance,
-    &::io::deephaven::proto::backplane::grpc::_FetchFileRequest_default_instance_._instance,
-    &::io::deephaven::proto::backplane::grpc::_FetchFileResponse_default_instance_._instance,
-    &::io::deephaven::proto::backplane::grpc::_SaveFileRequest_default_instance_._instance,
-    &::io::deephaven::proto::backplane::grpc::_SaveFileResponse_default_instance_._instance,
-    &::io::deephaven::proto::backplane::grpc::_MoveItemRequest_default_instance_._instance,
-    &::io::deephaven::proto::backplane::grpc::_MoveItemResponse_default_instance_._instance,
-    &::io::deephaven::proto::backplane::grpc::_CreateDirectoryRequest_default_instance_._instance,
-    &::io::deephaven::proto::backplane::grpc::_CreateDirectoryResponse_default_instance_._instance,
-    &::io::deephaven::proto::backplane::grpc::_DeleteItemRequest_default_instance_._instance,
-    &::io::deephaven::proto::backplane::grpc::_DeleteItemResponse_default_instance_._instance,
-};
-const char descriptor_table_protodef_deephaven_2fproto_2fstorage_2eproto[] PROTOBUF_SECTION_VARIABLE(protodesc_cold) = {
-    "\n\035deephaven/proto/storage.proto\022!io.deep"
-    "haven.proto.backplane.grpc\"J\n\020ListItemsR"
-    "equest\022\014\n\004path\030\001 \001(\t\022\030\n\013filter_glob\030\004 \001("
-    "\tH\000\210\001\001B\016\n\014_filter_glob\"\201\001\n\010ItemInfo\022\014\n\004p"
-    "ath\030\001 \001(\t\0229\n\004type\030\002 \001(\0162+.io.deephaven.p"
-    "roto.backplane.grpc.ItemType\022\020\n\004size\030\003 \001"
-    "(\022B\0020\001\022\021\n\004etag\030\004 \001(\tH\000\210\001\001B\007\n\005_etag\"g\n\021Li"
-    "stItemsResponse\022:\n\005items\030\001 \003(\0132+.io.deep"
-    "haven.proto.backplane.grpc.ItemInfo\022\026\n\016c"
-    "anonical_path\030\002 \001(\t\"<\n\020FetchFileRequest\022"
-    "\014\n\004path\030\001 \001(\t\022\021\n\004etag\030\002 \001(\tH\000\210\001\001B\007\n\005_eta"
-    "g\"A\n\021FetchFileResponse\022\020\n\010contents\030\001 \001(\014"
-    "\022\021\n\004etag\030\002 \001(\tH\000\210\001\001B\007\n\005_etag\"J\n\017SaveFile"
-    "Request\022\027\n\017allow_overwrite\030\001 \001(\010\022\014\n\004path"
-    "\030\002 \001(\t\022\020\n\010contents\030\003 \001(\014\".\n\020SaveFileResp"
-    "onse\022\021\n\004etag\030\001 \001(\tH\000\210\001\001B\007\n\005_etag\"N\n\017Move"
-    "ItemRequest\022\020\n\010old_path\030\001 \001(\t\022\020\n\010new_pat"
-    "h\030\002 \001(\t\022\027\n\017allow_overwrite\030\003 \001(\010\"\022\n\020Move"
-    "ItemResponse\"&\n\026CreateDirectoryRequest\022\014"
-    "\n\004path\030\001 \001(\t\"\031\n\027CreateDirectoryResponse\""
-    "!\n\021DeleteItemRequest\022\014\n\004path\030\001 \001(\t\"\024\n\022De"
-    "leteItemResponse*0\n\010ItemType\022\013\n\007UNKNOWN\020"
-    "\000\022\r\n\tDIRECTORY\020\001\022\010\n\004FILE\020\0022\374\005\n\016StorageSe"
-    "rvice\022x\n\tListItems\0223.io.deephaven.proto."
-    "backplane.grpc.ListItemsRequest\0324.io.dee"
-    "phaven.proto.backplane.grpc.ListItemsRes"
-    "ponse\"\000\022x\n\tFetchFile\0223.io.deephaven.prot"
-    "o.backplane.grpc.FetchFileRequest\0324.io.d"
-    "eephaven.proto.backplane.grpc.FetchFileR"
-    "esponse\"\000\022u\n\010SaveFile\0222.io.deephaven.pro"
-    "to.backplane.grpc.SaveFileRequest\0323.io.d"
-    "eephaven.proto.backplane.grpc.SaveFileRe"
-    "sponse\"\000\022u\n\010MoveItem\0222.io.deephaven.prot"
-    "o.backplane.grpc.MoveItemRequest\0323.io.de"
-    "ephaven.proto.backplane.grpc.MoveItemRes"
-    "ponse\"\000\022\212\001\n\017CreateDirectory\0229.io.deephav"
-    "en.proto.backplane.grpc.CreateDirectoryR"
-    "equest\032:.io.deephaven.proto.backplane.gr"
-    "pc.CreateDirectoryResponse\"\000\022{\n\nDeleteIt"
-    "em\0224.io.deephaven.proto.backplane.grpc.D"
-    "eleteItemRequest\0325.io.deephaven.proto.ba"
-    "ckplane.grpc.DeleteItemResponse\"\000BCH\001P\001Z"
-    "=github.com/deephaven/deephaven-core/go/"
-    "internal/proto/storageb\006proto3"
-};
-static ::absl::once_flag descriptor_table_deephaven_2fproto_2fstorage_2eproto_once;
-const ::_pbi::DescriptorTable descriptor_table_deephaven_2fproto_2fstorage_2eproto = {
-    false,
-    false,
-    1750,
-    descriptor_table_protodef_deephaven_2fproto_2fstorage_2eproto,
-    "deephaven/proto/storage.proto",
-    &descriptor_table_deephaven_2fproto_2fstorage_2eproto_once,
-    nullptr,
-    0,
-    13,
-    schemas,
-    file_default_instances,
-    TableStruct_deephaven_2fproto_2fstorage_2eproto::offsets,
-    file_level_metadata_deephaven_2fproto_2fstorage_2eproto,
-    file_level_enum_descriptors_deephaven_2fproto_2fstorage_2eproto,
-    file_level_service_descriptors_deephaven_2fproto_2fstorage_2eproto,
-};
-
-// This function exists to be marked as weak.
-// It can significantly speed up compilation by breaking up LLVM's SCC
-// in the .pb.cc translation units. Large translation units see a
-// reduction of more than 35% of walltime for optimized builds. Without
-// the weak attribute all the messages in the file, including all the
-// vtables and everything they use become part of the same SCC through
-// a cycle like:
-// GetMetadata -> descriptor table -> default instances ->
-//   vtables -> GetMetadata
-// By adding a weak function here we break the connection from the
-// individual vtables back into the descriptor table.
-PROTOBUF_ATTRIBUTE_WEAK const ::_pbi::DescriptorTable* descriptor_table_deephaven_2fproto_2fstorage_2eproto_getter() {
-  return &descriptor_table_deephaven_2fproto_2fstorage_2eproto;
-}
-// Force running AddDescriptors() at dynamic initialization time.
-PROTOBUF_ATTRIBUTE_INIT_PRIORITY2
-static ::_pbi::AddDescriptorsRunner dynamic_init_dummy_deephaven_2fproto_2fstorage_2eproto(&descriptor_table_deephaven_2fproto_2fstorage_2eproto);
-namespace io {
-namespace deephaven {
-namespace proto {
-namespace backplane {
-namespace grpc {
-const ::google::protobuf::EnumDescriptor* ItemType_descriptor() {
-  ::google::protobuf::internal::AssignDescriptors(&descriptor_table_deephaven_2fproto_2fstorage_2eproto);
-  return file_level_enum_descriptors_deephaven_2fproto_2fstorage_2eproto[0];
-}
-PROTOBUF_CONSTINIT const uint32_t ItemType_internal_data_[] = {
-    196608u, 0u, };
-bool ItemType_IsValid(int value) {
-  return 0 <= value && value <= 2;
-}
-// ===================================================================
-
-class ListItemsRequest::_Internal {
- public:
-  using HasBits = decltype(std::declval<ListItemsRequest>()._impl_._has_bits_);
-  static constexpr ::int32_t kHasBitsOffset =
-    8 * PROTOBUF_FIELD_OFFSET(ListItemsRequest, _impl_._has_bits_);
-  static void set_has_filter_glob(HasBits* has_bits) {
-    (*has_bits)[0] |= 1u;
-  }
-};
-
-ListItemsRequest::ListItemsRequest(::google::protobuf::Arena* arena)
-    : ::google::protobuf::Message(arena) {
-  SharedCtor(arena);
-  // @@protoc_insertion_point(arena_constructor:io.deephaven.proto.backplane.grpc.ListItemsRequest)
-}
-inline PROTOBUF_NDEBUG_INLINE ListItemsRequest::Impl_::Impl_(
-    ::google::protobuf::internal::InternalVisibility visibility, ::google::protobuf::Arena* arena,
-    const Impl_& from)
-      : _has_bits_{from._has_bits_},
-        _cached_size_{0},
-        path_(arena, from.path_),
-        filter_glob_(arena, from.filter_glob_) {}
-
-ListItemsRequest::ListItemsRequest(
-    ::google::protobuf::Arena* arena,
-    const ListItemsRequest& from)
-    : ::google::protobuf::Message(arena) {
-  ListItemsRequest* const _this = this;
-  (void)_this;
-  _internal_metadata_.MergeFrom<::google::protobuf::UnknownFieldSet>(
-      from._internal_metadata_);
-  new (&_impl_) Impl_(internal_visibility(), arena, from._impl_);
-
-  // @@protoc_insertion_point(copy_constructor:io.deephaven.proto.backplane.grpc.ListItemsRequest)
-}
-inline PROTOBUF_NDEBUG_INLINE ListItemsRequest::Impl_::Impl_(
-    ::google::protobuf::internal::InternalVisibility visibility,
-    ::google::protobuf::Arena* arena)
-      : _cached_size_{0},
-        path_(arena),
-        filter_glob_(arena) {}
-
-inline void ListItemsRequest::SharedCtor(::_pb::Arena* arena) {
-  new (&_impl_) Impl_(internal_visibility(), arena);
-}
-ListItemsRequest::~ListItemsRequest() {
-  // @@protoc_insertion_point(destructor:io.deephaven.proto.backplane.grpc.ListItemsRequest)
-  _internal_metadata_.Delete<::google::protobuf::UnknownFieldSet>();
-  SharedDtor();
-}
-inline void ListItemsRequest::SharedDtor() {
-  ABSL_DCHECK(GetArena() == nullptr);
-  _impl_.path_.Destroy();
-  _impl_.filter_glob_.Destroy();
-  _impl_.~Impl_();
-}
-
-PROTOBUF_NOINLINE void ListItemsRequest::Clear() {
-// @@protoc_insertion_point(message_clear_start:io.deephaven.proto.backplane.grpc.ListItemsRequest)
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  ::uint32_t cached_has_bits = 0;
-  // Prevent compiler warnings about cached_has_bits being unused
-  (void) cached_has_bits;
-
-  _impl_.path_.ClearToEmpty();
-  cached_has_bits = _impl_._has_bits_[0];
-  if (cached_has_bits & 0x00000001u) {
-    _impl_.filter_glob_.ClearNonDefaultToEmpty();
-  }
-  _impl_._has_bits_.Clear();
-  _internal_metadata_.Clear<::google::protobuf::UnknownFieldSet>();
-}
-
-const char* ListItemsRequest::_InternalParse(
-    const char* ptr, ::_pbi::ParseContext* ctx) {
-  ptr = ::_pbi::TcParser::ParseLoop(this, ptr, ctx, &_table_.header);
-  return ptr;
-}
-
-
-PROTOBUF_CONSTINIT PROTOBUF_ATTRIBUTE_INIT_PRIORITY1
-const ::_pbi::TcParseTable<1, 2, 0, 74, 2> ListItemsRequest::_table_ = {
-  {
-    PROTOBUF_FIELD_OFFSET(ListItemsRequest, _impl_._has_bits_),
-    0, // no _extensions_
-    4, 8,  // max_field_number, fast_idx_mask
-    offsetof(decltype(_table_), field_lookup_table),
-    4294967286,  // skipmap
-    offsetof(decltype(_table_), field_entries),
-    2,  // num_field_entries
-    0,  // num_aux_entries
-    offsetof(decltype(_table_), field_names),  // no aux_entries
-    &_ListItemsRequest_default_instance_._instance,
-    ::_pbi::TcParser::GenericFallback,  // fallback
-  }, {{
-    // optional string filter_glob = 4;
-    {::_pbi::TcParser::FastUS1,
-     {34, 0, 0, PROTOBUF_FIELD_OFFSET(ListItemsRequest, _impl_.filter_glob_)}},
-    // string path = 1;
-    {::_pbi::TcParser::FastUS1,
-     {10, 63, 0, PROTOBUF_FIELD_OFFSET(ListItemsRequest, _impl_.path_)}},
-  }}, {{
-    65535, 65535
-  }}, {{
-    // string path = 1;
-    {PROTOBUF_FIELD_OFFSET(ListItemsRequest, _impl_.path_), -1, 0,
-    (0 | ::_fl::kFcSingular | ::_fl::kUtf8String | ::_fl::kRepAString)},
-    // optional string filter_glob = 4;
-    {PROTOBUF_FIELD_OFFSET(ListItemsRequest, _impl_.filter_glob_), _Internal::kHasBitsOffset + 0, 0,
-    (0 | ::_fl::kFcOptional | ::_fl::kUtf8String | ::_fl::kRepAString)},
-  }},
-  // no aux_entries
-  {{
-    "\62\4\13\0\0\0\0\0"
-    "io.deephaven.proto.backplane.grpc.ListItemsRequest"
-    "path"
-    "filter_glob"
-  }},
-};
-
-::uint8_t* ListItemsRequest::_InternalSerialize(
-    ::uint8_t* target,
-    ::google::protobuf::io::EpsCopyOutputStream* stream) const {
-  // @@protoc_insertion_point(serialize_to_array_start:io.deephaven.proto.backplane.grpc.ListItemsRequest)
-  ::uint32_t cached_has_bits = 0;
-  (void)cached_has_bits;
-
-  // string path = 1;
-  if (!this->_internal_path().empty()) {
-    const std::string& _s = this->_internal_path();
-    ::google::protobuf::internal::WireFormatLite::VerifyUtf8String(
-        _s.data(), static_cast<int>(_s.length()), ::google::protobuf::internal::WireFormatLite::SERIALIZE, "io.deephaven.proto.backplane.grpc.ListItemsRequest.path");
-    target = stream->WriteStringMaybeAliased(1, _s, target);
-  }
-
-  cached_has_bits = _impl_._has_bits_[0];
-  // optional string filter_glob = 4;
-  if (cached_has_bits & 0x00000001u) {
-    const std::string& _s = this->_internal_filter_glob();
-    ::google::protobuf::internal::WireFormatLite::VerifyUtf8String(
-        _s.data(), static_cast<int>(_s.length()), ::google::protobuf::internal::WireFormatLite::SERIALIZE, "io.deephaven.proto.backplane.grpc.ListItemsRequest.filter_glob");
-    target = stream->WriteStringMaybeAliased(4, _s, target);
-  }
-
-  if (PROTOBUF_PREDICT_FALSE(_internal_metadata_.have_unknown_fields())) {
-    target =
-        ::_pbi::WireFormat::InternalSerializeUnknownFieldsToArray(
-            _internal_metadata_.unknown_fields<::google::protobuf::UnknownFieldSet>(::google::protobuf::UnknownFieldSet::default_instance), target, stream);
-  }
-  // @@protoc_insertion_point(serialize_to_array_end:io.deephaven.proto.backplane.grpc.ListItemsRequest)
-  return target;
-}
-
-::size_t ListItemsRequest::ByteSizeLong() const {
-// @@protoc_insertion_point(message_byte_size_start:io.deephaven.proto.backplane.grpc.ListItemsRequest)
-  ::size_t total_size = 0;
-
-  ::uint32_t cached_has_bits = 0;
-  // Prevent compiler warnings about cached_has_bits being unused
-  (void) cached_has_bits;
-
-  // string path = 1;
-  if (!this->_internal_path().empty()) {
-    total_size += 1 + ::google::protobuf::internal::WireFormatLite::StringSize(
-                                    this->_internal_path());
-  }
-
-  // optional string filter_glob = 4;
-  cached_has_bits = _impl_._has_bits_[0];
-  if (cached_has_bits & 0x00000001u) {
-    total_size += 1 + ::google::protobuf::internal::WireFormatLite::StringSize(
-                                    this->_internal_filter_glob());
-  }
-
-  return MaybeComputeUnknownFieldsSize(total_size, &_impl_._cached_size_);
-}
-
-const ::google::protobuf::Message::ClassData ListItemsRequest::_class_data_ = {
-    ListItemsRequest::MergeImpl,
-    nullptr,  // OnDemandRegisterArenaDtor
-};
-const ::google::protobuf::Message::ClassData* ListItemsRequest::GetClassData() const {
-  return &_class_data_;
-}
-
-void ListItemsRequest::MergeImpl(::google::protobuf::Message& to_msg, const ::google::protobuf::Message& from_msg) {
-  auto* const _this = static_cast<ListItemsRequest*>(&to_msg);
-  auto& from = static_cast<const ListItemsRequest&>(from_msg);
-  // @@protoc_insertion_point(class_specific_merge_from_start:io.deephaven.proto.backplane.grpc.ListItemsRequest)
-  ABSL_DCHECK_NE(&from, _this);
-  ::uint32_t cached_has_bits = 0;
-  (void) cached_has_bits;
-
-  if (!from._internal_path().empty()) {
-    _this->_internal_set_path(from._internal_path());
-  }
-  if ((from._impl_._has_bits_[0] & 0x00000001u) != 0) {
-    _this->_internal_set_filter_glob(from._internal_filter_glob());
-  }
-  _this->_internal_metadata_.MergeFrom<::google::protobuf::UnknownFieldSet>(from._internal_metadata_);
-}
-
-void ListItemsRequest::CopyFrom(const ListItemsRequest& from) {
-// @@protoc_insertion_point(class_specific_copy_from_start:io.deephaven.proto.backplane.grpc.ListItemsRequest)
-  if (&from == this) return;
-  Clear();
-  MergeFrom(from);
-}
-
-PROTOBUF_NOINLINE bool ListItemsRequest::IsInitialized() const {
-  return true;
-}
-
-::_pbi::CachedSize* ListItemsRequest::AccessCachedSize() const {
-  return &_impl_._cached_size_;
-}
-void ListItemsRequest::InternalSwap(ListItemsRequest* PROTOBUF_RESTRICT other) {
-  using std::swap;
-  auto* arena = GetArena();
-  ABSL_DCHECK_EQ(arena, other->GetArena());
-  _internal_metadata_.InternalSwap(&other->_internal_metadata_);
-  swap(_impl_._has_bits_[0], other->_impl_._has_bits_[0]);
-  ::_pbi::ArenaStringPtr::InternalSwap(&_impl_.path_, &other->_impl_.path_, arena);
-  ::_pbi::ArenaStringPtr::InternalSwap(&_impl_.filter_glob_, &other->_impl_.filter_glob_, arena);
-}
-
-::google::protobuf::Metadata ListItemsRequest::GetMetadata() const {
-  return ::_pbi::AssignDescriptors(
-      &descriptor_table_deephaven_2fproto_2fstorage_2eproto_getter, &descriptor_table_deephaven_2fproto_2fstorage_2eproto_once,
-      file_level_metadata_deephaven_2fproto_2fstorage_2eproto[0]);
-}
-// ===================================================================
-
-class ItemInfo::_Internal {
- public:
-  using HasBits = decltype(std::declval<ItemInfo>()._impl_._has_bits_);
-  static constexpr ::int32_t kHasBitsOffset =
-    8 * PROTOBUF_FIELD_OFFSET(ItemInfo, _impl_._has_bits_);
-  static void set_has_etag(HasBits* has_bits) {
-    (*has_bits)[0] |= 1u;
-  }
-};
-
-ItemInfo::ItemInfo(::google::protobuf::Arena* arena)
-    : ::google::protobuf::Message(arena) {
-  SharedCtor(arena);
-  // @@protoc_insertion_point(arena_constructor:io.deephaven.proto.backplane.grpc.ItemInfo)
-}
-inline PROTOBUF_NDEBUG_INLINE ItemInfo::Impl_::Impl_(
-    ::google::protobuf::internal::InternalVisibility visibility, ::google::protobuf::Arena* arena,
-    const Impl_& from)
-      : _has_bits_{from._has_bits_},
-        _cached_size_{0},
-        path_(arena, from.path_),
-        etag_(arena, from.etag_) {}
-
-ItemInfo::ItemInfo(
-    ::google::protobuf::Arena* arena,
-    const ItemInfo& from)
-    : ::google::protobuf::Message(arena) {
-  ItemInfo* const _this = this;
-  (void)_this;
-  _internal_metadata_.MergeFrom<::google::protobuf::UnknownFieldSet>(
-      from._internal_metadata_);
-  new (&_impl_) Impl_(internal_visibility(), arena, from._impl_);
-  ::memcpy(reinterpret_cast<char *>(&_impl_) +
-               offsetof(Impl_, size_),
-           reinterpret_cast<const char *>(&from._impl_) +
-               offsetof(Impl_, size_),
-           offsetof(Impl_, type_) -
-               offsetof(Impl_, size_) +
-               sizeof(Impl_::type_));
-
-  // @@protoc_insertion_point(copy_constructor:io.deephaven.proto.backplane.grpc.ItemInfo)
-}
-inline PROTOBUF_NDEBUG_INLINE ItemInfo::Impl_::Impl_(
-    ::google::protobuf::internal::InternalVisibility visibility,
-    ::google::protobuf::Arena* arena)
-      : _cached_size_{0},
-        path_(arena),
-        etag_(arena) {}
-
-inline void ItemInfo::SharedCtor(::_pb::Arena* arena) {
-  new (&_impl_) Impl_(internal_visibility(), arena);
-  ::memset(reinterpret_cast<char *>(&_impl_) +
-               offsetof(Impl_, size_),
-           0,
-           offsetof(Impl_, type_) -
-               offsetof(Impl_, size_) +
-               sizeof(Impl_::type_));
-}
-ItemInfo::~ItemInfo() {
-  // @@protoc_insertion_point(destructor:io.deephaven.proto.backplane.grpc.ItemInfo)
-  _internal_metadata_.Delete<::google::protobuf::UnknownFieldSet>();
-  SharedDtor();
-}
-inline void ItemInfo::SharedDtor() {
-  ABSL_DCHECK(GetArena() == nullptr);
-  _impl_.path_.Destroy();
-  _impl_.etag_.Destroy();
-  _impl_.~Impl_();
-}
-
-PROTOBUF_NOINLINE void ItemInfo::Clear() {
-// @@protoc_insertion_point(message_clear_start:io.deephaven.proto.backplane.grpc.ItemInfo)
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  ::uint32_t cached_has_bits = 0;
-  // Prevent compiler warnings about cached_has_bits being unused
-  (void) cached_has_bits;
-
-  _impl_.path_.ClearToEmpty();
-  cached_has_bits = _impl_._has_bits_[0];
-  if (cached_has_bits & 0x00000001u) {
-    _impl_.etag_.ClearNonDefaultToEmpty();
-  }
-  ::memset(&_impl_.size_, 0, static_cast<::size_t>(
-      reinterpret_cast<char*>(&_impl_.type_) -
-      reinterpret_cast<char*>(&_impl_.size_)) + sizeof(_impl_.type_));
-  _impl_._has_bits_.Clear();
-  _internal_metadata_.Clear<::google::protobuf::UnknownFieldSet>();
-}
-
-const char* ItemInfo::_InternalParse(
-    const char* ptr, ::_pbi::ParseContext* ctx) {
-  ptr = ::_pbi::TcParser::ParseLoop(this, ptr, ctx, &_table_.header);
-  return ptr;
-}
-
-
-PROTOBUF_CONSTINIT PROTOBUF_ATTRIBUTE_INIT_PRIORITY1
-const ::_pbi::TcParseTable<2, 4, 0, 59, 2> ItemInfo::_table_ = {
-  {
-    PROTOBUF_FIELD_OFFSET(ItemInfo, _impl_._has_bits_),
-    0, // no _extensions_
-    4, 24,  // max_field_number, fast_idx_mask
-    offsetof(decltype(_table_), field_lookup_table),
-    4294967280,  // skipmap
-    offsetof(decltype(_table_), field_entries),
-    4,  // num_field_entries
-    0,  // num_aux_entries
-    offsetof(decltype(_table_), field_names),  // no aux_entries
-    &_ItemInfo_default_instance_._instance,
-    ::_pbi::TcParser::GenericFallback,  // fallback
-  }, {{
-    // optional string etag = 4;
-    {::_pbi::TcParser::FastUS1,
-     {34, 0, 0, PROTOBUF_FIELD_OFFSET(ItemInfo, _impl_.etag_)}},
-    // string path = 1;
-    {::_pbi::TcParser::FastUS1,
-     {10, 63, 0, PROTOBUF_FIELD_OFFSET(ItemInfo, _impl_.path_)}},
-    // .io.deephaven.proto.backplane.grpc.ItemType type = 2;
-    {::_pbi::TcParser::SingularVarintNoZag1<::uint32_t, offsetof(ItemInfo, _impl_.type_), 63>(),
-     {16, 63, 0, PROTOBUF_FIELD_OFFSET(ItemInfo, _impl_.type_)}},
-    // sint64 size = 3 [jstype = JS_STRING];
-    {::_pbi::TcParser::FastZ64S1,
-     {24, 63, 0, PROTOBUF_FIELD_OFFSET(ItemInfo, _impl_.size_)}},
-  }}, {{
-    65535, 65535
-  }}, {{
-    // string path = 1;
-    {PROTOBUF_FIELD_OFFSET(ItemInfo, _impl_.path_), -1, 0,
-    (0 | ::_fl::kFcSingular | ::_fl::kUtf8String | ::_fl::kRepAString)},
-    // .io.deephaven.proto.backplane.grpc.ItemType type = 2;
-    {PROTOBUF_FIELD_OFFSET(ItemInfo, _impl_.type_), -1, 0,
-    (0 | ::_fl::kFcSingular | ::_fl::kOpenEnum)},
-    // sint64 size = 3 [jstype = JS_STRING];
-    {PROTOBUF_FIELD_OFFSET(ItemInfo, _impl_.size_), -1, 0,
-    (0 | ::_fl::kFcSingular | ::_fl::kSInt64)},
-    // optional string etag = 4;
-    {PROTOBUF_FIELD_OFFSET(ItemInfo, _impl_.etag_), _Internal::kHasBitsOffset + 0, 0,
-    (0 | ::_fl::kFcOptional | ::_fl::kUtf8String | ::_fl::kRepAString)},
-  }},
-  // no aux_entries
-  {{
-    "\52\4\0\0\4\0\0\0"
-    "io.deephaven.proto.backplane.grpc.ItemInfo"
-    "path"
-    "etag"
-  }},
-};
-
-::uint8_t* ItemInfo::_InternalSerialize(
-    ::uint8_t* target,
-    ::google::protobuf::io::EpsCopyOutputStream* stream) const {
-  // @@protoc_insertion_point(serialize_to_array_start:io.deephaven.proto.backplane.grpc.ItemInfo)
-  ::uint32_t cached_has_bits = 0;
-  (void)cached_has_bits;
-
-  // string path = 1;
-  if (!this->_internal_path().empty()) {
-    const std::string& _s = this->_internal_path();
-    ::google::protobuf::internal::WireFormatLite::VerifyUtf8String(
-        _s.data(), static_cast<int>(_s.length()), ::google::protobuf::internal::WireFormatLite::SERIALIZE, "io.deephaven.proto.backplane.grpc.ItemInfo.path");
-    target = stream->WriteStringMaybeAliased(1, _s, target);
-  }
-
-  // .io.deephaven.proto.backplane.grpc.ItemType type = 2;
-  if (this->_internal_type() != 0) {
-    target = stream->EnsureSpace(target);
-    target = ::_pbi::WireFormatLite::WriteEnumToArray(
-        2, this->_internal_type(), target);
-  }
-
-  // sint64 size = 3 [jstype = JS_STRING];
-  if (this->_internal_size() != 0) {
-    target = stream->EnsureSpace(target);
-    target = ::_pbi::WireFormatLite::WriteSInt64ToArray(
-        3, this->_internal_size(), target);
-  }
-
-  cached_has_bits = _impl_._has_bits_[0];
-  // optional string etag = 4;
-  if (cached_has_bits & 0x00000001u) {
-    const std::string& _s = this->_internal_etag();
-    ::google::protobuf::internal::WireFormatLite::VerifyUtf8String(
-        _s.data(), static_cast<int>(_s.length()), ::google::protobuf::internal::WireFormatLite::SERIALIZE, "io.deephaven.proto.backplane.grpc.ItemInfo.etag");
-    target = stream->WriteStringMaybeAliased(4, _s, target);
-  }
-
-  if (PROTOBUF_PREDICT_FALSE(_internal_metadata_.have_unknown_fields())) {
-    target =
-        ::_pbi::WireFormat::InternalSerializeUnknownFieldsToArray(
-            _internal_metadata_.unknown_fields<::google::protobuf::UnknownFieldSet>(::google::protobuf::UnknownFieldSet::default_instance), target, stream);
-  }
-  // @@protoc_insertion_point(serialize_to_array_end:io.deephaven.proto.backplane.grpc.ItemInfo)
-  return target;
-}
-
-::size_t ItemInfo::ByteSizeLong() const {
-// @@protoc_insertion_point(message_byte_size_start:io.deephaven.proto.backplane.grpc.ItemInfo)
-  ::size_t total_size = 0;
-
-  ::uint32_t cached_has_bits = 0;
-  // Prevent compiler warnings about cached_has_bits being unused
-  (void) cached_has_bits;
-
-  // string path = 1;
-  if (!this->_internal_path().empty()) {
-    total_size += 1 + ::google::protobuf::internal::WireFormatLite::StringSize(
-                                    this->_internal_path());
-  }
-
-  // optional string etag = 4;
-  cached_has_bits = _impl_._has_bits_[0];
-  if (cached_has_bits & 0x00000001u) {
-    total_size += 1 + ::google::protobuf::internal::WireFormatLite::StringSize(
-                                    this->_internal_etag());
-  }
-
-  // sint64 size = 3 [jstype = JS_STRING];
-  if (this->_internal_size() != 0) {
-    total_size += ::_pbi::WireFormatLite::SInt64SizePlusOne(
-        this->_internal_size());
-  }
-
-  // .io.deephaven.proto.backplane.grpc.ItemType type = 2;
-  if (this->_internal_type() != 0) {
-    total_size += 1 +
-                  ::_pbi::WireFormatLite::EnumSize(this->_internal_type());
-  }
-
-  return MaybeComputeUnknownFieldsSize(total_size, &_impl_._cached_size_);
-}
-
-const ::google::protobuf::Message::ClassData ItemInfo::_class_data_ = {
-    ItemInfo::MergeImpl,
-    nullptr,  // OnDemandRegisterArenaDtor
-};
-const ::google::protobuf::Message::ClassData* ItemInfo::GetClassData() const {
-  return &_class_data_;
-}
-
-void ItemInfo::MergeImpl(::google::protobuf::Message& to_msg, const ::google::protobuf::Message& from_msg) {
-  auto* const _this = static_cast<ItemInfo*>(&to_msg);
-  auto& from = static_cast<const ItemInfo&>(from_msg);
-  // @@protoc_insertion_point(class_specific_merge_from_start:io.deephaven.proto.backplane.grpc.ItemInfo)
-  ABSL_DCHECK_NE(&from, _this);
-  ::uint32_t cached_has_bits = 0;
-  (void) cached_has_bits;
-
-  if (!from._internal_path().empty()) {
-    _this->_internal_set_path(from._internal_path());
-  }
-  if ((from._impl_._has_bits_[0] & 0x00000001u) != 0) {
-    _this->_internal_set_etag(from._internal_etag());
-  }
-  if (from._internal_size() != 0) {
-    _this->_internal_set_size(from._internal_size());
-  }
-  if (from._internal_type() != 0) {
-    _this->_internal_set_type(from._internal_type());
-  }
-  _this->_internal_metadata_.MergeFrom<::google::protobuf::UnknownFieldSet>(from._internal_metadata_);
-}
-
-void ItemInfo::CopyFrom(const ItemInfo& from) {
-// @@protoc_insertion_point(class_specific_copy_from_start:io.deephaven.proto.backplane.grpc.ItemInfo)
-  if (&from == this) return;
-  Clear();
-  MergeFrom(from);
-}
-
-PROTOBUF_NOINLINE bool ItemInfo::IsInitialized() const {
-  return true;
-}
-
-::_pbi::CachedSize* ItemInfo::AccessCachedSize() const {
-  return &_impl_._cached_size_;
-}
-void ItemInfo::InternalSwap(ItemInfo* PROTOBUF_RESTRICT other) {
-  using std::swap;
-  auto* arena = GetArena();
-  ABSL_DCHECK_EQ(arena, other->GetArena());
-  _internal_metadata_.InternalSwap(&other->_internal_metadata_);
-  swap(_impl_._has_bits_[0], other->_impl_._has_bits_[0]);
-  ::_pbi::ArenaStringPtr::InternalSwap(&_impl_.path_, &other->_impl_.path_, arena);
-  ::_pbi::ArenaStringPtr::InternalSwap(&_impl_.etag_, &other->_impl_.etag_, arena);
-  ::google::protobuf::internal::memswap<
-      PROTOBUF_FIELD_OFFSET(ItemInfo, _impl_.type_)
-      + sizeof(ItemInfo::_impl_.type_)
-      - PROTOBUF_FIELD_OFFSET(ItemInfo, _impl_.size_)>(
-          reinterpret_cast<char*>(&_impl_.size_),
-          reinterpret_cast<char*>(&other->_impl_.size_));
-}
-
-::google::protobuf::Metadata ItemInfo::GetMetadata() const {
-  return ::_pbi::AssignDescriptors(
-      &descriptor_table_deephaven_2fproto_2fstorage_2eproto_getter, &descriptor_table_deephaven_2fproto_2fstorage_2eproto_once,
-      file_level_metadata_deephaven_2fproto_2fstorage_2eproto[1]);
-}
-// ===================================================================
-
-class ListItemsResponse::_Internal {
- public:
-};
-
-ListItemsResponse::ListItemsResponse(::google::protobuf::Arena* arena)
-    : ::google::protobuf::Message(arena) {
-  SharedCtor(arena);
-  // @@protoc_insertion_point(arena_constructor:io.deephaven.proto.backplane.grpc.ListItemsResponse)
-}
-inline PROTOBUF_NDEBUG_INLINE ListItemsResponse::Impl_::Impl_(
-    ::google::protobuf::internal::InternalVisibility visibility, ::google::protobuf::Arena* arena,
-    const Impl_& from)
-      : items_{visibility, arena, from.items_},
-        canonical_path_(arena, from.canonical_path_),
-        _cached_size_{0} {}
-
-ListItemsResponse::ListItemsResponse(
-    ::google::protobuf::Arena* arena,
-    const ListItemsResponse& from)
-    : ::google::protobuf::Message(arena) {
-  ListItemsResponse* const _this = this;
-  (void)_this;
-  _internal_metadata_.MergeFrom<::google::protobuf::UnknownFieldSet>(
-      from._internal_metadata_);
-  new (&_impl_) Impl_(internal_visibility(), arena, from._impl_);
-
-  // @@protoc_insertion_point(copy_constructor:io.deephaven.proto.backplane.grpc.ListItemsResponse)
-}
-inline PROTOBUF_NDEBUG_INLINE ListItemsResponse::Impl_::Impl_(
-    ::google::protobuf::internal::InternalVisibility visibility,
-    ::google::protobuf::Arena* arena)
-      : items_{visibility, arena},
-        canonical_path_(arena),
-        _cached_size_{0} {}
-
-inline void ListItemsResponse::SharedCtor(::_pb::Arena* arena) {
-  new (&_impl_) Impl_(internal_visibility(), arena);
-}
-ListItemsResponse::~ListItemsResponse() {
-  // @@protoc_insertion_point(destructor:io.deephaven.proto.backplane.grpc.ListItemsResponse)
-  _internal_metadata_.Delete<::google::protobuf::UnknownFieldSet>();
-  SharedDtor();
-}
-inline void ListItemsResponse::SharedDtor() {
-  ABSL_DCHECK(GetArena() == nullptr);
-  _impl_.canonical_path_.Destroy();
-  _impl_.~Impl_();
-}
-
-PROTOBUF_NOINLINE void ListItemsResponse::Clear() {
-// @@protoc_insertion_point(message_clear_start:io.deephaven.proto.backplane.grpc.ListItemsResponse)
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  ::uint32_t cached_has_bits = 0;
-  // Prevent compiler warnings about cached_has_bits being unused
-  (void) cached_has_bits;
-
-  _impl_.items_.Clear();
-  _impl_.canonical_path_.ClearToEmpty();
-  _internal_metadata_.Clear<::google::protobuf::UnknownFieldSet>();
-}
-
-const char* ListItemsResponse::_InternalParse(
-    const char* ptr, ::_pbi::ParseContext* ctx) {
-  ptr = ::_pbi::TcParser::ParseLoop(this, ptr, ctx, &_table_.header);
-  return ptr;
-}
-
-
-PROTOBUF_CONSTINIT PROTOBUF_ATTRIBUTE_INIT_PRIORITY1
-const ::_pbi::TcParseTable<1, 2, 1, 74, 2> ListItemsResponse::_table_ = {
-  {
-    0,  // no _has_bits_
-    0, // no _extensions_
-    2, 8,  // max_field_number, fast_idx_mask
-    offsetof(decltype(_table_), field_lookup_table),
-    4294967292,  // skipmap
-    offsetof(decltype(_table_), field_entries),
-    2,  // num_field_entries
-    1,  // num_aux_entries
-    offsetof(decltype(_table_), aux_entries),
-    &_ListItemsResponse_default_instance_._instance,
-    ::_pbi::TcParser::GenericFallback,  // fallback
-  }, {{
-    // string canonical_path = 2;
-    {::_pbi::TcParser::FastUS1,
-     {18, 63, 0, PROTOBUF_FIELD_OFFSET(ListItemsResponse, _impl_.canonical_path_)}},
-    // repeated .io.deephaven.proto.backplane.grpc.ItemInfo items = 1;
-    {::_pbi::TcParser::FastMtR1,
-     {10, 63, 0, PROTOBUF_FIELD_OFFSET(ListItemsResponse, _impl_.items_)}},
-  }}, {{
-    65535, 65535
-  }}, {{
-    // repeated .io.deephaven.proto.backplane.grpc.ItemInfo items = 1;
-    {PROTOBUF_FIELD_OFFSET(ListItemsResponse, _impl_.items_), 0, 0,
-    (0 | ::_fl::kFcRepeated | ::_fl::kMessage | ::_fl::kTvTable)},
-    // string canonical_path = 2;
-    {PROTOBUF_FIELD_OFFSET(ListItemsResponse, _impl_.canonical_path_), 0, 0,
-    (0 | ::_fl::kFcSingular | ::_fl::kUtf8String | ::_fl::kRepAString)},
-  }}, {{
-    {::_pbi::TcParser::GetTable<::io::deephaven::proto::backplane::grpc::ItemInfo>()},
-  }}, {{
-    "\63\0\16\0\0\0\0\0"
-    "io.deephaven.proto.backplane.grpc.ListItemsResponse"
-    "canonical_path"
-  }},
-};
-
-::uint8_t* ListItemsResponse::_InternalSerialize(
-    ::uint8_t* target,
-    ::google::protobuf::io::EpsCopyOutputStream* stream) const {
-  // @@protoc_insertion_point(serialize_to_array_start:io.deephaven.proto.backplane.grpc.ListItemsResponse)
-  ::uint32_t cached_has_bits = 0;
-  (void)cached_has_bits;
-
-  // repeated .io.deephaven.proto.backplane.grpc.ItemInfo items = 1;
-  for (unsigned i = 0,
-      n = static_cast<unsigned>(this->_internal_items_size()); i < n; i++) {
-    const auto& repfield = this->_internal_items().Get(i);
-    target = ::google::protobuf::internal::WireFormatLite::
-        InternalWriteMessage(1, repfield, repfield.GetCachedSize(), target, stream);
-  }
-
-  // string canonical_path = 2;
-  if (!this->_internal_canonical_path().empty()) {
-    const std::string& _s = this->_internal_canonical_path();
-    ::google::protobuf::internal::WireFormatLite::VerifyUtf8String(
-        _s.data(), static_cast<int>(_s.length()), ::google::protobuf::internal::WireFormatLite::SERIALIZE, "io.deephaven.proto.backplane.grpc.ListItemsResponse.canonical_path");
-    target = stream->WriteStringMaybeAliased(2, _s, target);
-  }
-
-  if (PROTOBUF_PREDICT_FALSE(_internal_metadata_.have_unknown_fields())) {
-    target =
-        ::_pbi::WireFormat::InternalSerializeUnknownFieldsToArray(
-            _internal_metadata_.unknown_fields<::google::protobuf::UnknownFieldSet>(::google::protobuf::UnknownFieldSet::default_instance), target, stream);
-  }
-  // @@protoc_insertion_point(serialize_to_array_end:io.deephaven.proto.backplane.grpc.ListItemsResponse)
-  return target;
-}
-
-::size_t ListItemsResponse::ByteSizeLong() const {
-// @@protoc_insertion_point(message_byte_size_start:io.deephaven.proto.backplane.grpc.ListItemsResponse)
-  ::size_t total_size = 0;
-
-  ::uint32_t cached_has_bits = 0;
-  // Prevent compiler warnings about cached_has_bits being unused
-  (void) cached_has_bits;
-
-  // repeated .io.deephaven.proto.backplane.grpc.ItemInfo items = 1;
-  total_size += 1UL * this->_internal_items_size();
-  for (const auto& msg : this->_internal_items()) {
-    total_size +=
-      ::google::protobuf::internal::WireFormatLite::MessageSize(msg);
-  }
-  // string canonical_path = 2;
-  if (!this->_internal_canonical_path().empty()) {
-    total_size += 1 + ::google::protobuf::internal::WireFormatLite::StringSize(
-                                    this->_internal_canonical_path());
-  }
-
-  return MaybeComputeUnknownFieldsSize(total_size, &_impl_._cached_size_);
-}
-
-const ::google::protobuf::Message::ClassData ListItemsResponse::_class_data_ = {
-    ListItemsResponse::MergeImpl,
-    nullptr,  // OnDemandRegisterArenaDtor
-};
-const ::google::protobuf::Message::ClassData* ListItemsResponse::GetClassData() const {
-  return &_class_data_;
-}
-
-void ListItemsResponse::MergeImpl(::google::protobuf::Message& to_msg, const ::google::protobuf::Message& from_msg) {
-  auto* const _this = static_cast<ListItemsResponse*>(&to_msg);
-  auto& from = static_cast<const ListItemsResponse&>(from_msg);
-  // @@protoc_insertion_point(class_specific_merge_from_start:io.deephaven.proto.backplane.grpc.ListItemsResponse)
-  ABSL_DCHECK_NE(&from, _this);
-  ::uint32_t cached_has_bits = 0;
-  (void) cached_has_bits;
-
-  _this->_internal_mutable_items()->MergeFrom(
-      from._internal_items());
-  if (!from._internal_canonical_path().empty()) {
-    _this->_internal_set_canonical_path(from._internal_canonical_path());
-  }
-  _this->_internal_metadata_.MergeFrom<::google::protobuf::UnknownFieldSet>(from._internal_metadata_);
-}
-
-void ListItemsResponse::CopyFrom(const ListItemsResponse& from) {
-// @@protoc_insertion_point(class_specific_copy_from_start:io.deephaven.proto.backplane.grpc.ListItemsResponse)
-  if (&from == this) return;
-  Clear();
-  MergeFrom(from);
-}
-
-PROTOBUF_NOINLINE bool ListItemsResponse::IsInitialized() const {
-  return true;
-}
-
-::_pbi::CachedSize* ListItemsResponse::AccessCachedSize() const {
-  return &_impl_._cached_size_;
-}
-void ListItemsResponse::InternalSwap(ListItemsResponse* PROTOBUF_RESTRICT other) {
-  using std::swap;
-  auto* arena = GetArena();
-  ABSL_DCHECK_EQ(arena, other->GetArena());
-  _internal_metadata_.InternalSwap(&other->_internal_metadata_);
-  _impl_.items_.InternalSwap(&other->_impl_.items_);
-  ::_pbi::ArenaStringPtr::InternalSwap(&_impl_.canonical_path_, &other->_impl_.canonical_path_, arena);
-}
-
-::google::protobuf::Metadata ListItemsResponse::GetMetadata() const {
-  return ::_pbi::AssignDescriptors(
-      &descriptor_table_deephaven_2fproto_2fstorage_2eproto_getter, &descriptor_table_deephaven_2fproto_2fstorage_2eproto_once,
-      file_level_metadata_deephaven_2fproto_2fstorage_2eproto[2]);
-}
-// ===================================================================
-
-class FetchFileRequest::_Internal {
- public:
-  using HasBits = decltype(std::declval<FetchFileRequest>()._impl_._has_bits_);
-  static constexpr ::int32_t kHasBitsOffset =
-    8 * PROTOBUF_FIELD_OFFSET(FetchFileRequest, _impl_._has_bits_);
-  static void set_has_etag(HasBits* has_bits) {
-    (*has_bits)[0] |= 1u;
-  }
-};
-
-FetchFileRequest::FetchFileRequest(::google::protobuf::Arena* arena)
-    : ::google::protobuf::Message(arena) {
-  SharedCtor(arena);
-  // @@protoc_insertion_point(arena_constructor:io.deephaven.proto.backplane.grpc.FetchFileRequest)
-}
-inline PROTOBUF_NDEBUG_INLINE FetchFileRequest::Impl_::Impl_(
-    ::google::protobuf::internal::InternalVisibility visibility, ::google::protobuf::Arena* arena,
-    const Impl_& from)
-      : _has_bits_{from._has_bits_},
-        _cached_size_{0},
-        path_(arena, from.path_),
-        etag_(arena, from.etag_) {}
-
-FetchFileRequest::FetchFileRequest(
-    ::google::protobuf::Arena* arena,
-    const FetchFileRequest& from)
-    : ::google::protobuf::Message(arena) {
-  FetchFileRequest* const _this = this;
-  (void)_this;
-  _internal_metadata_.MergeFrom<::google::protobuf::UnknownFieldSet>(
-      from._internal_metadata_);
-  new (&_impl_) Impl_(internal_visibility(), arena, from._impl_);
-
-  // @@protoc_insertion_point(copy_constructor:io.deephaven.proto.backplane.grpc.FetchFileRequest)
-}
-inline PROTOBUF_NDEBUG_INLINE FetchFileRequest::Impl_::Impl_(
-    ::google::protobuf::internal::InternalVisibility visibility,
-    ::google::protobuf::Arena* arena)
-      : _cached_size_{0},
-        path_(arena),
-        etag_(arena) {}
-
-inline void FetchFileRequest::SharedCtor(::_pb::Arena* arena) {
-  new (&_impl_) Impl_(internal_visibility(), arena);
-}
-FetchFileRequest::~FetchFileRequest() {
-  // @@protoc_insertion_point(destructor:io.deephaven.proto.backplane.grpc.FetchFileRequest)
-  _internal_metadata_.Delete<::google::protobuf::UnknownFieldSet>();
-  SharedDtor();
-}
-inline void FetchFileRequest::SharedDtor() {
-  ABSL_DCHECK(GetArena() == nullptr);
-  _impl_.path_.Destroy();
-  _impl_.etag_.Destroy();
-  _impl_.~Impl_();
-}
-
-PROTOBUF_NOINLINE void FetchFileRequest::Clear() {
-// @@protoc_insertion_point(message_clear_start:io.deephaven.proto.backplane.grpc.FetchFileRequest)
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  ::uint32_t cached_has_bits = 0;
-  // Prevent compiler warnings about cached_has_bits being unused
-  (void) cached_has_bits;
-
-  _impl_.path_.ClearToEmpty();
-  cached_has_bits = _impl_._has_bits_[0];
-  if (cached_has_bits & 0x00000001u) {
-    _impl_.etag_.ClearNonDefaultToEmpty();
-  }
-  _impl_._has_bits_.Clear();
-  _internal_metadata_.Clear<::google::protobuf::UnknownFieldSet>();
-}
-
-const char* FetchFileRequest::_InternalParse(
-    const char* ptr, ::_pbi::ParseContext* ctx) {
-  ptr = ::_pbi::TcParser::ParseLoop(this, ptr, ctx, &_table_.header);
-  return ptr;
-}
-
-
-PROTOBUF_CONSTINIT PROTOBUF_ATTRIBUTE_INIT_PRIORITY1
-const ::_pbi::TcParseTable<1, 2, 0, 67, 2> FetchFileRequest::_table_ = {
-  {
-    PROTOBUF_FIELD_OFFSET(FetchFileRequest, _impl_._has_bits_),
-    0, // no _extensions_
-    2, 8,  // max_field_number, fast_idx_mask
-    offsetof(decltype(_table_), field_lookup_table),
-    4294967292,  // skipmap
-    offsetof(decltype(_table_), field_entries),
-    2,  // num_field_entries
-    0,  // num_aux_entries
-    offsetof(decltype(_table_), field_names),  // no aux_entries
-    &_FetchFileRequest_default_instance_._instance,
-    ::_pbi::TcParser::GenericFallback,  // fallback
-  }, {{
-    // optional string etag = 2;
-    {::_pbi::TcParser::FastUS1,
-     {18, 0, 0, PROTOBUF_FIELD_OFFSET(FetchFileRequest, _impl_.etag_)}},
-    // string path = 1;
-    {::_pbi::TcParser::FastUS1,
-     {10, 63, 0, PROTOBUF_FIELD_OFFSET(FetchFileRequest, _impl_.path_)}},
-  }}, {{
-    65535, 65535
-  }}, {{
-    // string path = 1;
-    {PROTOBUF_FIELD_OFFSET(FetchFileRequest, _impl_.path_), -1, 0,
-    (0 | ::_fl::kFcSingular | ::_fl::kUtf8String | ::_fl::kRepAString)},
-    // optional string etag = 2;
-    {PROTOBUF_FIELD_OFFSET(FetchFileRequest, _impl_.etag_), _Internal::kHasBitsOffset + 0, 0,
-    (0 | ::_fl::kFcOptional | ::_fl::kUtf8String | ::_fl::kRepAString)},
-  }},
-  // no aux_entries
-  {{
-    "\62\4\4\0\0\0\0\0"
-    "io.deephaven.proto.backplane.grpc.FetchFileRequest"
-    "path"
-    "etag"
-  }},
-};
-
-::uint8_t* FetchFileRequest::_InternalSerialize(
-    ::uint8_t* target,
-    ::google::protobuf::io::EpsCopyOutputStream* stream) const {
-  // @@protoc_insertion_point(serialize_to_array_start:io.deephaven.proto.backplane.grpc.FetchFileRequest)
-  ::uint32_t cached_has_bits = 0;
-  (void)cached_has_bits;
-
-  // string path = 1;
-  if (!this->_internal_path().empty()) {
-    const std::string& _s = this->_internal_path();
-    ::google::protobuf::internal::WireFormatLite::VerifyUtf8String(
-        _s.data(), static_cast<int>(_s.length()), ::google::protobuf::internal::WireFormatLite::SERIALIZE, "io.deephaven.proto.backplane.grpc.FetchFileRequest.path");
-    target = stream->WriteStringMaybeAliased(1, _s, target);
-  }
-
-  cached_has_bits = _impl_._has_bits_[0];
-  // optional string etag = 2;
-  if (cached_has_bits & 0x00000001u) {
-    const std::string& _s = this->_internal_etag();
-    ::google::protobuf::internal::WireFormatLite::VerifyUtf8String(
-        _s.data(), static_cast<int>(_s.length()), ::google::protobuf::internal::WireFormatLite::SERIALIZE, "io.deephaven.proto.backplane.grpc.FetchFileRequest.etag");
-    target = stream->WriteStringMaybeAliased(2, _s, target);
-  }
-
-  if (PROTOBUF_PREDICT_FALSE(_internal_metadata_.have_unknown_fields())) {
-    target =
-        ::_pbi::WireFormat::InternalSerializeUnknownFieldsToArray(
-            _internal_metadata_.unknown_fields<::google::protobuf::UnknownFieldSet>(::google::protobuf::UnknownFieldSet::default_instance), target, stream);
-  }
-  // @@protoc_insertion_point(serialize_to_array_end:io.deephaven.proto.backplane.grpc.FetchFileRequest)
-  return target;
-}
-
-::size_t FetchFileRequest::ByteSizeLong() const {
-// @@protoc_insertion_point(message_byte_size_start:io.deephaven.proto.backplane.grpc.FetchFileRequest)
-  ::size_t total_size = 0;
-
-  ::uint32_t cached_has_bits = 0;
-  // Prevent compiler warnings about cached_has_bits being unused
-  (void) cached_has_bits;
-
-  // string path = 1;
-  if (!this->_internal_path().empty()) {
-    total_size += 1 + ::google::protobuf::internal::WireFormatLite::StringSize(
-                                    this->_internal_path());
-  }
-
-  // optional string etag = 2;
-  cached_has_bits = _impl_._has_bits_[0];
-  if (cached_has_bits & 0x00000001u) {
-    total_size += 1 + ::google::protobuf::internal::WireFormatLite::StringSize(
-                                    this->_internal_etag());
-  }
-
-  return MaybeComputeUnknownFieldsSize(total_size, &_impl_._cached_size_);
-}
-
-const ::google::protobuf::Message::ClassData FetchFileRequest::_class_data_ = {
-    FetchFileRequest::MergeImpl,
-    nullptr,  // OnDemandRegisterArenaDtor
-};
-const ::google::protobuf::Message::ClassData* FetchFileRequest::GetClassData() const {
-  return &_class_data_;
-}
-
-void FetchFileRequest::MergeImpl(::google::protobuf::Message& to_msg, const ::google::protobuf::Message& from_msg) {
-  auto* const _this = static_cast<FetchFileRequest*>(&to_msg);
-  auto& from = static_cast<const FetchFileRequest&>(from_msg);
-  // @@protoc_insertion_point(class_specific_merge_from_start:io.deephaven.proto.backplane.grpc.FetchFileRequest)
-  ABSL_DCHECK_NE(&from, _this);
-  ::uint32_t cached_has_bits = 0;
-  (void) cached_has_bits;
-
-  if (!from._internal_path().empty()) {
-    _this->_internal_set_path(from._internal_path());
-  }
-  if ((from._impl_._has_bits_[0] & 0x00000001u) != 0) {
-    _this->_internal_set_etag(from._internal_etag());
-  }
-  _this->_internal_metadata_.MergeFrom<::google::protobuf::UnknownFieldSet>(from._internal_metadata_);
-}
-
-void FetchFileRequest::CopyFrom(const FetchFileRequest& from) {
-// @@protoc_insertion_point(class_specific_copy_from_start:io.deephaven.proto.backplane.grpc.FetchFileRequest)
-  if (&from == this) return;
-  Clear();
-  MergeFrom(from);
-}
-
-PROTOBUF_NOINLINE bool FetchFileRequest::IsInitialized() const {
-  return true;
-}
-
-::_pbi::CachedSize* FetchFileRequest::AccessCachedSize() const {
-  return &_impl_._cached_size_;
-}
-void FetchFileRequest::InternalSwap(FetchFileRequest* PROTOBUF_RESTRICT other) {
-  using std::swap;
-  auto* arena = GetArena();
-  ABSL_DCHECK_EQ(arena, other->GetArena());
-  _internal_metadata_.InternalSwap(&other->_internal_metadata_);
-  swap(_impl_._has_bits_[0], other->_impl_._has_bits_[0]);
-  ::_pbi::ArenaStringPtr::InternalSwap(&_impl_.path_, &other->_impl_.path_, arena);
-  ::_pbi::ArenaStringPtr::InternalSwap(&_impl_.etag_, &other->_impl_.etag_, arena);
-}
-
-::google::protobuf::Metadata FetchFileRequest::GetMetadata() const {
-  return ::_pbi::AssignDescriptors(
-      &descriptor_table_deephaven_2fproto_2fstorage_2eproto_getter, &descriptor_table_deephaven_2fproto_2fstorage_2eproto_once,
-      file_level_metadata_deephaven_2fproto_2fstorage_2eproto[3]);
-}
-// ===================================================================
-
-class FetchFileResponse::_Internal {
- public:
-  using HasBits = decltype(std::declval<FetchFileResponse>()._impl_._has_bits_);
-  static constexpr ::int32_t kHasBitsOffset =
-    8 * PROTOBUF_FIELD_OFFSET(FetchFileResponse, _impl_._has_bits_);
-  static void set_has_etag(HasBits* has_bits) {
-    (*has_bits)[0] |= 1u;
-  }
-};
-
-FetchFileResponse::FetchFileResponse(::google::protobuf::Arena* arena)
-    : ::google::protobuf::Message(arena) {
-  SharedCtor(arena);
-  // @@protoc_insertion_point(arena_constructor:io.deephaven.proto.backplane.grpc.FetchFileResponse)
-}
-inline PROTOBUF_NDEBUG_INLINE FetchFileResponse::Impl_::Impl_(
-    ::google::protobuf::internal::InternalVisibility visibility, ::google::protobuf::Arena* arena,
-    const Impl_& from)
-      : _has_bits_{from._has_bits_},
-        _cached_size_{0},
-        contents_(arena, from.contents_),
-        etag_(arena, from.etag_) {}
-
-FetchFileResponse::FetchFileResponse(
-    ::google::protobuf::Arena* arena,
-    const FetchFileResponse& from)
-    : ::google::protobuf::Message(arena) {
-  FetchFileResponse* const _this = this;
-  (void)_this;
-  _internal_metadata_.MergeFrom<::google::protobuf::UnknownFieldSet>(
-      from._internal_metadata_);
-  new (&_impl_) Impl_(internal_visibility(), arena, from._impl_);
-
-  // @@protoc_insertion_point(copy_constructor:io.deephaven.proto.backplane.grpc.FetchFileResponse)
-}
-inline PROTOBUF_NDEBUG_INLINE FetchFileResponse::Impl_::Impl_(
-    ::google::protobuf::internal::InternalVisibility visibility,
-    ::google::protobuf::Arena* arena)
-      : _cached_size_{0},
-        contents_(arena),
-        etag_(arena) {}
-
-inline void FetchFileResponse::SharedCtor(::_pb::Arena* arena) {
-  new (&_impl_) Impl_(internal_visibility(), arena);
-}
-FetchFileResponse::~FetchFileResponse() {
-  // @@protoc_insertion_point(destructor:io.deephaven.proto.backplane.grpc.FetchFileResponse)
-  _internal_metadata_.Delete<::google::protobuf::UnknownFieldSet>();
-  SharedDtor();
-}
-inline void FetchFileResponse::SharedDtor() {
-  ABSL_DCHECK(GetArena() == nullptr);
-  _impl_.contents_.Destroy();
-  _impl_.etag_.Destroy();
-  _impl_.~Impl_();
-}
-
-PROTOBUF_NOINLINE void FetchFileResponse::Clear() {
-// @@protoc_insertion_point(message_clear_start:io.deephaven.proto.backplane.grpc.FetchFileResponse)
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  ::uint32_t cached_has_bits = 0;
-  // Prevent compiler warnings about cached_has_bits being unused
-  (void) cached_has_bits;
-
-  _impl_.contents_.ClearToEmpty();
-  cached_has_bits = _impl_._has_bits_[0];
-  if (cached_has_bits & 0x00000001u) {
-    _impl_.etag_.ClearNonDefaultToEmpty();
-  }
-  _impl_._has_bits_.Clear();
-  _internal_metadata_.Clear<::google::protobuf::UnknownFieldSet>();
-}
-
-const char* FetchFileResponse::_InternalParse(
-    const char* ptr, ::_pbi::ParseContext* ctx) {
-  ptr = ::_pbi::TcParser::ParseLoop(this, ptr, ctx, &_table_.header);
-  return ptr;
-}
-
-
-PROTOBUF_CONSTINIT PROTOBUF_ATTRIBUTE_INIT_PRIORITY1
-const ::_pbi::TcParseTable<1, 2, 0, 64, 2> FetchFileResponse::_table_ = {
-  {
-    PROTOBUF_FIELD_OFFSET(FetchFileResponse, _impl_._has_bits_),
-    0, // no _extensions_
-    2, 8,  // max_field_number, fast_idx_mask
-    offsetof(decltype(_table_), field_lookup_table),
-    4294967292,  // skipmap
-    offsetof(decltype(_table_), field_entries),
-    2,  // num_field_entries
-    0,  // num_aux_entries
-    offsetof(decltype(_table_), field_names),  // no aux_entries
-    &_FetchFileResponse_default_instance_._instance,
-    ::_pbi::TcParser::GenericFallback,  // fallback
-  }, {{
-    // optional string etag = 2;
-    {::_pbi::TcParser::FastUS1,
-     {18, 0, 0, PROTOBUF_FIELD_OFFSET(FetchFileResponse, _impl_.etag_)}},
-    // bytes contents = 1;
-    {::_pbi::TcParser::FastBS1,
-     {10, 63, 0, PROTOBUF_FIELD_OFFSET(FetchFileResponse, _impl_.contents_)}},
-  }}, {{
-    65535, 65535
-  }}, {{
-    // bytes contents = 1;
-    {PROTOBUF_FIELD_OFFSET(FetchFileResponse, _impl_.contents_), -1, 0,
-    (0 | ::_fl::kFcSingular | ::_fl::kBytes | ::_fl::kRepAString)},
-    // optional string etag = 2;
-    {PROTOBUF_FIELD_OFFSET(FetchFileResponse, _impl_.etag_), _Internal::kHasBitsOffset + 0, 0,
-    (0 | ::_fl::kFcOptional | ::_fl::kUtf8String | ::_fl::kRepAString)},
-  }},
-  // no aux_entries
-  {{
-    "\63\0\4\0\0\0\0\0"
-    "io.deephaven.proto.backplane.grpc.FetchFileResponse"
-    "etag"
-  }},
-};
-
-::uint8_t* FetchFileResponse::_InternalSerialize(
-    ::uint8_t* target,
-    ::google::protobuf::io::EpsCopyOutputStream* stream) const {
-  // @@protoc_insertion_point(serialize_to_array_start:io.deephaven.proto.backplane.grpc.FetchFileResponse)
-  ::uint32_t cached_has_bits = 0;
-  (void)cached_has_bits;
-
-  // bytes contents = 1;
-  if (!this->_internal_contents().empty()) {
-    const std::string& _s = this->_internal_contents();
-    target = stream->WriteBytesMaybeAliased(1, _s, target);
-  }
-
-  cached_has_bits = _impl_._has_bits_[0];
-  // optional string etag = 2;
-  if (cached_has_bits & 0x00000001u) {
-    const std::string& _s = this->_internal_etag();
-    ::google::protobuf::internal::WireFormatLite::VerifyUtf8String(
-        _s.data(), static_cast<int>(_s.length()), ::google::protobuf::internal::WireFormatLite::SERIALIZE, "io.deephaven.proto.backplane.grpc.FetchFileResponse.etag");
-    target = stream->WriteStringMaybeAliased(2, _s, target);
-  }
-
-  if (PROTOBUF_PREDICT_FALSE(_internal_metadata_.have_unknown_fields())) {
-    target =
-        ::_pbi::WireFormat::InternalSerializeUnknownFieldsToArray(
-            _internal_metadata_.unknown_fields<::google::protobuf::UnknownFieldSet>(::google::protobuf::UnknownFieldSet::default_instance), target, stream);
-  }
-  // @@protoc_insertion_point(serialize_to_array_end:io.deephaven.proto.backplane.grpc.FetchFileResponse)
-  return target;
-}
-
-::size_t FetchFileResponse::ByteSizeLong() const {
-// @@protoc_insertion_point(message_byte_size_start:io.deephaven.proto.backplane.grpc.FetchFileResponse)
-  ::size_t total_size = 0;
-
-  ::uint32_t cached_has_bits = 0;
-  // Prevent compiler warnings about cached_has_bits being unused
-  (void) cached_has_bits;
-
-  // bytes contents = 1;
-  if (!this->_internal_contents().empty()) {
-    total_size += 1 + ::google::protobuf::internal::WireFormatLite::BytesSize(
-                                    this->_internal_contents());
-  }
-
-  // optional string etag = 2;
-  cached_has_bits = _impl_._has_bits_[0];
-  if (cached_has_bits & 0x00000001u) {
-    total_size += 1 + ::google::protobuf::internal::WireFormatLite::StringSize(
-                                    this->_internal_etag());
-  }
-
-  return MaybeComputeUnknownFieldsSize(total_size, &_impl_._cached_size_);
-}
-
-const ::google::protobuf::Message::ClassData FetchFileResponse::_class_data_ = {
-    FetchFileResponse::MergeImpl,
-    nullptr,  // OnDemandRegisterArenaDtor
-};
-const ::google::protobuf::Message::ClassData* FetchFileResponse::GetClassData() const {
-  return &_class_data_;
-}
-
-void FetchFileResponse::MergeImpl(::google::protobuf::Message& to_msg, const ::google::protobuf::Message& from_msg) {
-  auto* const _this = static_cast<FetchFileResponse*>(&to_msg);
-  auto& from = static_cast<const FetchFileResponse&>(from_msg);
-  // @@protoc_insertion_point(class_specific_merge_from_start:io.deephaven.proto.backplane.grpc.FetchFileResponse)
-  ABSL_DCHECK_NE(&from, _this);
-  ::uint32_t cached_has_bits = 0;
-  (void) cached_has_bits;
-
-  if (!from._internal_contents().empty()) {
-    _this->_internal_set_contents(from._internal_contents());
-  }
-  if ((from._impl_._has_bits_[0] & 0x00000001u) != 0) {
-    _this->_internal_set_etag(from._internal_etag());
-  }
-  _this->_internal_metadata_.MergeFrom<::google::protobuf::UnknownFieldSet>(from._internal_metadata_);
-}
-
-void FetchFileResponse::CopyFrom(const FetchFileResponse& from) {
-// @@protoc_insertion_point(class_specific_copy_from_start:io.deephaven.proto.backplane.grpc.FetchFileResponse)
-  if (&from == this) return;
-  Clear();
-  MergeFrom(from);
-}
-
-PROTOBUF_NOINLINE bool FetchFileResponse::IsInitialized() const {
-  return true;
-}
-
-::_pbi::CachedSize* FetchFileResponse::AccessCachedSize() const {
-  return &_impl_._cached_size_;
-}
-void FetchFileResponse::InternalSwap(FetchFileResponse* PROTOBUF_RESTRICT other) {
-  using std::swap;
-  auto* arena = GetArena();
-  ABSL_DCHECK_EQ(arena, other->GetArena());
-  _internal_metadata_.InternalSwap(&other->_internal_metadata_);
-  swap(_impl_._has_bits_[0], other->_impl_._has_bits_[0]);
-  ::_pbi::ArenaStringPtr::InternalSwap(&_impl_.contents_, &other->_impl_.contents_, arena);
-  ::_pbi::ArenaStringPtr::InternalSwap(&_impl_.etag_, &other->_impl_.etag_, arena);
-}
-
-::google::protobuf::Metadata FetchFileResponse::GetMetadata() const {
-  return ::_pbi::AssignDescriptors(
-      &descriptor_table_deephaven_2fproto_2fstorage_2eproto_getter, &descriptor_table_deephaven_2fproto_2fstorage_2eproto_once,
-      file_level_metadata_deephaven_2fproto_2fstorage_2eproto[4]);
-}
-// ===================================================================
-
-class SaveFileRequest::_Internal {
- public:
-};
-
-SaveFileRequest::SaveFileRequest(::google::protobuf::Arena* arena)
-    : ::google::protobuf::Message(arena) {
-  SharedCtor(arena);
-  // @@protoc_insertion_point(arena_constructor:io.deephaven.proto.backplane.grpc.SaveFileRequest)
-}
-inline PROTOBUF_NDEBUG_INLINE SaveFileRequest::Impl_::Impl_(
-    ::google::protobuf::internal::InternalVisibility visibility, ::google::protobuf::Arena* arena,
-    const Impl_& from)
-      : path_(arena, from.path_),
-        contents_(arena, from.contents_),
-        _cached_size_{0} {}
-
-SaveFileRequest::SaveFileRequest(
-    ::google::protobuf::Arena* arena,
-    const SaveFileRequest& from)
-    : ::google::protobuf::Message(arena) {
-  SaveFileRequest* const _this = this;
-  (void)_this;
-  _internal_metadata_.MergeFrom<::google::protobuf::UnknownFieldSet>(
-      from._internal_metadata_);
-  new (&_impl_) Impl_(internal_visibility(), arena, from._impl_);
-  _impl_.allow_overwrite_ = from._impl_.allow_overwrite_;
-
-  // @@protoc_insertion_point(copy_constructor:io.deephaven.proto.backplane.grpc.SaveFileRequest)
-}
-inline PROTOBUF_NDEBUG_INLINE SaveFileRequest::Impl_::Impl_(
-    ::google::protobuf::internal::InternalVisibility visibility,
-    ::google::protobuf::Arena* arena)
-      : path_(arena),
-        contents_(arena),
-        _cached_size_{0} {}
-
-inline void SaveFileRequest::SharedCtor(::_pb::Arena* arena) {
-  new (&_impl_) Impl_(internal_visibility(), arena);
-  _impl_.allow_overwrite_ = {};
-}
-SaveFileRequest::~SaveFileRequest() {
-  // @@protoc_insertion_point(destructor:io.deephaven.proto.backplane.grpc.SaveFileRequest)
-  _internal_metadata_.Delete<::google::protobuf::UnknownFieldSet>();
-  SharedDtor();
-}
-inline void SaveFileRequest::SharedDtor() {
-  ABSL_DCHECK(GetArena() == nullptr);
-  _impl_.path_.Destroy();
-  _impl_.contents_.Destroy();
-  _impl_.~Impl_();
-}
-
-PROTOBUF_NOINLINE void SaveFileRequest::Clear() {
-// @@protoc_insertion_point(message_clear_start:io.deephaven.proto.backplane.grpc.SaveFileRequest)
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  ::uint32_t cached_has_bits = 0;
-  // Prevent compiler warnings about cached_has_bits being unused
-  (void) cached_has_bits;
-
-  _impl_.path_.ClearToEmpty();
-  _impl_.contents_.ClearToEmpty();
-  _impl_.allow_overwrite_ = false;
-  _internal_metadata_.Clear<::google::protobuf::UnknownFieldSet>();
-}
-
-const char* SaveFileRequest::_InternalParse(
-    const char* ptr, ::_pbi::ParseContext* ctx) {
-  ptr = ::_pbi::TcParser::ParseLoop(this, ptr, ctx, &_table_.header);
-  return ptr;
-}
-
-
-PROTOBUF_CONSTINIT PROTOBUF_ATTRIBUTE_INIT_PRIORITY1
-const ::_pbi::TcParseTable<2, 3, 0, 62, 2> SaveFileRequest::_table_ = {
-  {
-    0,  // no _has_bits_
-    0, // no _extensions_
-    3, 24,  // max_field_number, fast_idx_mask
-    offsetof(decltype(_table_), field_lookup_table),
-    4294967288,  // skipmap
-    offsetof(decltype(_table_), field_entries),
-    3,  // num_field_entries
-    0,  // num_aux_entries
-    offsetof(decltype(_table_), field_names),  // no aux_entries
-    &_SaveFileRequest_default_instance_._instance,
-    ::_pbi::TcParser::GenericFallback,  // fallback
-  }, {{
-    {::_pbi::TcParser::MiniParse, {}},
-    // bool allow_overwrite = 1;
-    {::_pbi::TcParser::SingularVarintNoZag1<bool, offsetof(SaveFileRequest, _impl_.allow_overwrite_), 63>(),
-     {8, 63, 0, PROTOBUF_FIELD_OFFSET(SaveFileRequest, _impl_.allow_overwrite_)}},
-    // string path = 2;
-    {::_pbi::TcParser::FastUS1,
-     {18, 63, 0, PROTOBUF_FIELD_OFFSET(SaveFileRequest, _impl_.path_)}},
-    // bytes contents = 3;
-    {::_pbi::TcParser::FastBS1,
-     {26, 63, 0, PROTOBUF_FIELD_OFFSET(SaveFileRequest, _impl_.contents_)}},
-  }}, {{
-    65535, 65535
-  }}, {{
-    // bool allow_overwrite = 1;
-    {PROTOBUF_FIELD_OFFSET(SaveFileRequest, _impl_.allow_overwrite_), 0, 0,
-    (0 | ::_fl::kFcSingular | ::_fl::kBool)},
-    // string path = 2;
-    {PROTOBUF_FIELD_OFFSET(SaveFileRequest, _impl_.path_), 0, 0,
-    (0 | ::_fl::kFcSingular | ::_fl::kUtf8String | ::_fl::kRepAString)},
-    // bytes contents = 3;
-    {PROTOBUF_FIELD_OFFSET(SaveFileRequest, _impl_.contents_), 0, 0,
-    (0 | ::_fl::kFcSingular | ::_fl::kBytes | ::_fl::kRepAString)},
-  }},
-  // no aux_entries
-  {{
-    "\61\0\4\0\0\0\0\0"
-    "io.deephaven.proto.backplane.grpc.SaveFileRequest"
-    "path"
-  }},
-};
-
-::uint8_t* SaveFileRequest::_InternalSerialize(
-    ::uint8_t* target,
-    ::google::protobuf::io::EpsCopyOutputStream* stream) const {
-  // @@protoc_insertion_point(serialize_to_array_start:io.deephaven.proto.backplane.grpc.SaveFileRequest)
-  ::uint32_t cached_has_bits = 0;
-  (void)cached_has_bits;
-
-  // bool allow_overwrite = 1;
-  if (this->_internal_allow_overwrite() != 0) {
-    target = stream->EnsureSpace(target);
-    target = ::_pbi::WireFormatLite::WriteBoolToArray(
-        1, this->_internal_allow_overwrite(), target);
-  }
-
-  // string path = 2;
-  if (!this->_internal_path().empty()) {
-    const std::string& _s = this->_internal_path();
-    ::google::protobuf::internal::WireFormatLite::VerifyUtf8String(
-        _s.data(), static_cast<int>(_s.length()), ::google::protobuf::internal::WireFormatLite::SERIALIZE, "io.deephaven.proto.backplane.grpc.SaveFileRequest.path");
-    target = stream->WriteStringMaybeAliased(2, _s, target);
-  }
-
-  // bytes contents = 3;
-  if (!this->_internal_contents().empty()) {
-    const std::string& _s = this->_internal_contents();
-    target = stream->WriteBytesMaybeAliased(3, _s, target);
-  }
-
-  if (PROTOBUF_PREDICT_FALSE(_internal_metadata_.have_unknown_fields())) {
-    target =
-        ::_pbi::WireFormat::InternalSerializeUnknownFieldsToArray(
-            _internal_metadata_.unknown_fields<::google::protobuf::UnknownFieldSet>(::google::protobuf::UnknownFieldSet::default_instance), target, stream);
-  }
-  // @@protoc_insertion_point(serialize_to_array_end:io.deephaven.proto.backplane.grpc.SaveFileRequest)
-  return target;
-}
-
-::size_t SaveFileRequest::ByteSizeLong() const {
-// @@protoc_insertion_point(message_byte_size_start:io.deephaven.proto.backplane.grpc.SaveFileRequest)
-  ::size_t total_size = 0;
-
-  ::uint32_t cached_has_bits = 0;
-  // Prevent compiler warnings about cached_has_bits being unused
-  (void) cached_has_bits;
-
-  // string path = 2;
-  if (!this->_internal_path().empty()) {
-    total_size += 1 + ::google::protobuf::internal::WireFormatLite::StringSize(
-                                    this->_internal_path());
-  }
-
-  // bytes contents = 3;
-  if (!this->_internal_contents().empty()) {
-    total_size += 1 + ::google::protobuf::internal::WireFormatLite::BytesSize(
-                                    this->_internal_contents());
-  }
-
-  // bool allow_overwrite = 1;
-  if (this->_internal_allow_overwrite() != 0) {
-    total_size += 2;
-  }
-
-  return MaybeComputeUnknownFieldsSize(total_size, &_impl_._cached_size_);
-}
-
-const ::google::protobuf::Message::ClassData SaveFileRequest::_class_data_ = {
-    SaveFileRequest::MergeImpl,
-    nullptr,  // OnDemandRegisterArenaDtor
-};
-const ::google::protobuf::Message::ClassData* SaveFileRequest::GetClassData() const {
-  return &_class_data_;
-}
-
-void SaveFileRequest::MergeImpl(::google::protobuf::Message& to_msg, const ::google::protobuf::Message& from_msg) {
-  auto* const _this = static_cast<SaveFileRequest*>(&to_msg);
-  auto& from = static_cast<const SaveFileRequest&>(from_msg);
-  // @@protoc_insertion_point(class_specific_merge_from_start:io.deephaven.proto.backplane.grpc.SaveFileRequest)
-  ABSL_DCHECK_NE(&from, _this);
-  ::uint32_t cached_has_bits = 0;
-  (void) cached_has_bits;
-
-  if (!from._internal_path().empty()) {
-    _this->_internal_set_path(from._internal_path());
-  }
-  if (!from._internal_contents().empty()) {
-    _this->_internal_set_contents(from._internal_contents());
-  }
-  if (from._internal_allow_overwrite() != 0) {
-    _this->_internal_set_allow_overwrite(from._internal_allow_overwrite());
-  }
-  _this->_internal_metadata_.MergeFrom<::google::protobuf::UnknownFieldSet>(from._internal_metadata_);
-}
-
-void SaveFileRequest::CopyFrom(const SaveFileRequest& from) {
-// @@protoc_insertion_point(class_specific_copy_from_start:io.deephaven.proto.backplane.grpc.SaveFileRequest)
-  if (&from == this) return;
-  Clear();
-  MergeFrom(from);
-}
-
-PROTOBUF_NOINLINE bool SaveFileRequest::IsInitialized() const {
-  return true;
-}
-
-::_pbi::CachedSize* SaveFileRequest::AccessCachedSize() const {
-  return &_impl_._cached_size_;
-}
-void SaveFileRequest::InternalSwap(SaveFileRequest* PROTOBUF_RESTRICT other) {
-  using std::swap;
-  auto* arena = GetArena();
-  ABSL_DCHECK_EQ(arena, other->GetArena());
-  _internal_metadata_.InternalSwap(&other->_internal_metadata_);
-  ::_pbi::ArenaStringPtr::InternalSwap(&_impl_.path_, &other->_impl_.path_, arena);
-  ::_pbi::ArenaStringPtr::InternalSwap(&_impl_.contents_, &other->_impl_.contents_, arena);
-        swap(_impl_.allow_overwrite_, other->_impl_.allow_overwrite_);
-}
-
-::google::protobuf::Metadata SaveFileRequest::GetMetadata() const {
-  return ::_pbi::AssignDescriptors(
-      &descriptor_table_deephaven_2fproto_2fstorage_2eproto_getter, &descriptor_table_deephaven_2fproto_2fstorage_2eproto_once,
-      file_level_metadata_deephaven_2fproto_2fstorage_2eproto[5]);
-}
-// ===================================================================
-
-class SaveFileResponse::_Internal {
- public:
-  using HasBits = decltype(std::declval<SaveFileResponse>()._impl_._has_bits_);
-  static constexpr ::int32_t kHasBitsOffset =
-    8 * PROTOBUF_FIELD_OFFSET(SaveFileResponse, _impl_._has_bits_);
-  static void set_has_etag(HasBits* has_bits) {
-    (*has_bits)[0] |= 1u;
-  }
-};
-
-SaveFileResponse::SaveFileResponse(::google::protobuf::Arena* arena)
-    : ::google::protobuf::Message(arena) {
-  SharedCtor(arena);
-  // @@protoc_insertion_point(arena_constructor:io.deephaven.proto.backplane.grpc.SaveFileResponse)
-}
-inline PROTOBUF_NDEBUG_INLINE SaveFileResponse::Impl_::Impl_(
-    ::google::protobuf::internal::InternalVisibility visibility, ::google::protobuf::Arena* arena,
-    const Impl_& from)
-      : _has_bits_{from._has_bits_},
-        _cached_size_{0},
-        etag_(arena, from.etag_) {}
-
-SaveFileResponse::SaveFileResponse(
-    ::google::protobuf::Arena* arena,
-    const SaveFileResponse& from)
-    : ::google::protobuf::Message(arena) {
-  SaveFileResponse* const _this = this;
-  (void)_this;
-  _internal_metadata_.MergeFrom<::google::protobuf::UnknownFieldSet>(
-      from._internal_metadata_);
-  new (&_impl_) Impl_(internal_visibility(), arena, from._impl_);
-
-  // @@protoc_insertion_point(copy_constructor:io.deephaven.proto.backplane.grpc.SaveFileResponse)
-}
-inline PROTOBUF_NDEBUG_INLINE SaveFileResponse::Impl_::Impl_(
-    ::google::protobuf::internal::InternalVisibility visibility,
-    ::google::protobuf::Arena* arena)
-      : _cached_size_{0},
-        etag_(arena) {}
-
-inline void SaveFileResponse::SharedCtor(::_pb::Arena* arena) {
-  new (&_impl_) Impl_(internal_visibility(), arena);
-}
-SaveFileResponse::~SaveFileResponse() {
-  // @@protoc_insertion_point(destructor:io.deephaven.proto.backplane.grpc.SaveFileResponse)
-  _internal_metadata_.Delete<::google::protobuf::UnknownFieldSet>();
-  SharedDtor();
-}
-inline void SaveFileResponse::SharedDtor() {
-  ABSL_DCHECK(GetArena() == nullptr);
-  _impl_.etag_.Destroy();
-  _impl_.~Impl_();
-}
-
-PROTOBUF_NOINLINE void SaveFileResponse::Clear() {
-// @@protoc_insertion_point(message_clear_start:io.deephaven.proto.backplane.grpc.SaveFileResponse)
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  ::uint32_t cached_has_bits = 0;
-  // Prevent compiler warnings about cached_has_bits being unused
-  (void) cached_has_bits;
-
-  cached_has_bits = _impl_._has_bits_[0];
-  if (cached_has_bits & 0x00000001u) {
-    _impl_.etag_.ClearNonDefaultToEmpty();
-  }
-  _impl_._has_bits_.Clear();
-  _internal_metadata_.Clear<::google::protobuf::UnknownFieldSet>();
-}
-
-const char* SaveFileResponse::_InternalParse(
-    const char* ptr, ::_pbi::ParseContext* ctx) {
-  ptr = ::_pbi::TcParser::ParseLoop(this, ptr, ctx, &_table_.header);
-  return ptr;
-}
-
-
-PROTOBUF_CONSTINIT PROTOBUF_ATTRIBUTE_INIT_PRIORITY1
-const ::_pbi::TcParseTable<0, 1, 0, 63, 2> SaveFileResponse::_table_ = {
-  {
-    PROTOBUF_FIELD_OFFSET(SaveFileResponse, _impl_._has_bits_),
-    0, // no _extensions_
-    1, 0,  // max_field_number, fast_idx_mask
-    offsetof(decltype(_table_), field_lookup_table),
-    4294967294,  // skipmap
-    offsetof(decltype(_table_), field_entries),
-    1,  // num_field_entries
-    0,  // num_aux_entries
-    offsetof(decltype(_table_), field_names),  // no aux_entries
-    &_SaveFileResponse_default_instance_._instance,
-    ::_pbi::TcParser::GenericFallback,  // fallback
-  }, {{
-    // optional string etag = 1;
-    {::_pbi::TcParser::FastUS1,
-     {10, 0, 0, PROTOBUF_FIELD_OFFSET(SaveFileResponse, _impl_.etag_)}},
-  }}, {{
-    65535, 65535
-  }}, {{
-    // optional string etag = 1;
-    {PROTOBUF_FIELD_OFFSET(SaveFileResponse, _impl_.etag_), _Internal::kHasBitsOffset + 0, 0,
-    (0 | ::_fl::kFcOptional | ::_fl::kUtf8String | ::_fl::kRepAString)},
-  }},
-  // no aux_entries
-  {{
-    "\62\4\0\0\0\0\0\0"
-    "io.deephaven.proto.backplane.grpc.SaveFileResponse"
-    "etag"
-  }},
-};
-
-::uint8_t* SaveFileResponse::_InternalSerialize(
-    ::uint8_t* target,
-    ::google::protobuf::io::EpsCopyOutputStream* stream) const {
-  // @@protoc_insertion_point(serialize_to_array_start:io.deephaven.proto.backplane.grpc.SaveFileResponse)
-  ::uint32_t cached_has_bits = 0;
-  (void)cached_has_bits;
-
-  cached_has_bits = _impl_._has_bits_[0];
-  // optional string etag = 1;
-  if (cached_has_bits & 0x00000001u) {
-    const std::string& _s = this->_internal_etag();
-    ::google::protobuf::internal::WireFormatLite::VerifyUtf8String(
-        _s.data(), static_cast<int>(_s.length()), ::google::protobuf::internal::WireFormatLite::SERIALIZE, "io.deephaven.proto.backplane.grpc.SaveFileResponse.etag");
-    target = stream->WriteStringMaybeAliased(1, _s, target);
-  }
-
-  if (PROTOBUF_PREDICT_FALSE(_internal_metadata_.have_unknown_fields())) {
-    target =
-        ::_pbi::WireFormat::InternalSerializeUnknownFieldsToArray(
-            _internal_metadata_.unknown_fields<::google::protobuf::UnknownFieldSet>(::google::protobuf::UnknownFieldSet::default_instance), target, stream);
-  }
-  // @@protoc_insertion_point(serialize_to_array_end:io.deephaven.proto.backplane.grpc.SaveFileResponse)
-  return target;
-}
-
-::size_t SaveFileResponse::ByteSizeLong() const {
-// @@protoc_insertion_point(message_byte_size_start:io.deephaven.proto.backplane.grpc.SaveFileResponse)
-  ::size_t total_size = 0;
-
-  ::uint32_t cached_has_bits = 0;
-  // Prevent compiler warnings about cached_has_bits being unused
-  (void) cached_has_bits;
-
-  // optional string etag = 1;
-  cached_has_bits = _impl_._has_bits_[0];
-  if (cached_has_bits & 0x00000001u) {
-    total_size += 1 + ::google::protobuf::internal::WireFormatLite::StringSize(
-                                    this->_internal_etag());
-  }
-
-  return MaybeComputeUnknownFieldsSize(total_size, &_impl_._cached_size_);
-}
-
-const ::google::protobuf::Message::ClassData SaveFileResponse::_class_data_ = {
-    SaveFileResponse::MergeImpl,
-    nullptr,  // OnDemandRegisterArenaDtor
-};
-const ::google::protobuf::Message::ClassData* SaveFileResponse::GetClassData() const {
-  return &_class_data_;
-}
-
-void SaveFileResponse::MergeImpl(::google::protobuf::Message& to_msg, const ::google::protobuf::Message& from_msg) {
-  auto* const _this = static_cast<SaveFileResponse*>(&to_msg);
-  auto& from = static_cast<const SaveFileResponse&>(from_msg);
-  // @@protoc_insertion_point(class_specific_merge_from_start:io.deephaven.proto.backplane.grpc.SaveFileResponse)
-  ABSL_DCHECK_NE(&from, _this);
-  ::uint32_t cached_has_bits = 0;
-  (void) cached_has_bits;
-
-  if ((from._impl_._has_bits_[0] & 0x00000001u) != 0) {
-    _this->_internal_set_etag(from._internal_etag());
-  }
-  _this->_internal_metadata_.MergeFrom<::google::protobuf::UnknownFieldSet>(from._internal_metadata_);
-}
-
-void SaveFileResponse::CopyFrom(const SaveFileResponse& from) {
-// @@protoc_insertion_point(class_specific_copy_from_start:io.deephaven.proto.backplane.grpc.SaveFileResponse)
-  if (&from == this) return;
-  Clear();
-  MergeFrom(from);
-}
-
-PROTOBUF_NOINLINE bool SaveFileResponse::IsInitialized() const {
-  return true;
-}
-
-::_pbi::CachedSize* SaveFileResponse::AccessCachedSize() const {
-  return &_impl_._cached_size_;
-}
-void SaveFileResponse::InternalSwap(SaveFileResponse* PROTOBUF_RESTRICT other) {
-  using std::swap;
-  auto* arena = GetArena();
-  ABSL_DCHECK_EQ(arena, other->GetArena());
-  _internal_metadata_.InternalSwap(&other->_internal_metadata_);
-  swap(_impl_._has_bits_[0], other->_impl_._has_bits_[0]);
-  ::_pbi::ArenaStringPtr::InternalSwap(&_impl_.etag_, &other->_impl_.etag_, arena);
-}
-
-::google::protobuf::Metadata SaveFileResponse::GetMetadata() const {
-  return ::_pbi::AssignDescriptors(
-      &descriptor_table_deephaven_2fproto_2fstorage_2eproto_getter, &descriptor_table_deephaven_2fproto_2fstorage_2eproto_once,
-      file_level_metadata_deephaven_2fproto_2fstorage_2eproto[6]);
-}
-// ===================================================================
-
-class MoveItemRequest::_Internal {
- public:
-};
-
-MoveItemRequest::MoveItemRequest(::google::protobuf::Arena* arena)
-    : ::google::protobuf::Message(arena) {
-  SharedCtor(arena);
-  // @@protoc_insertion_point(arena_constructor:io.deephaven.proto.backplane.grpc.MoveItemRequest)
-}
-inline PROTOBUF_NDEBUG_INLINE MoveItemRequest::Impl_::Impl_(
-    ::google::protobuf::internal::InternalVisibility visibility, ::google::protobuf::Arena* arena,
-    const Impl_& from)
-      : old_path_(arena, from.old_path_),
-        new_path_(arena, from.new_path_),
-        _cached_size_{0} {}
-
-MoveItemRequest::MoveItemRequest(
-    ::google::protobuf::Arena* arena,
-    const MoveItemRequest& from)
-    : ::google::protobuf::Message(arena) {
-  MoveItemRequest* const _this = this;
-  (void)_this;
-  _internal_metadata_.MergeFrom<::google::protobuf::UnknownFieldSet>(
-      from._internal_metadata_);
-  new (&_impl_) Impl_(internal_visibility(), arena, from._impl_);
-  _impl_.allow_overwrite_ = from._impl_.allow_overwrite_;
-
-  // @@protoc_insertion_point(copy_constructor:io.deephaven.proto.backplane.grpc.MoveItemRequest)
-}
-inline PROTOBUF_NDEBUG_INLINE MoveItemRequest::Impl_::Impl_(
-    ::google::protobuf::internal::InternalVisibility visibility,
-    ::google::protobuf::Arena* arena)
-      : old_path_(arena),
-        new_path_(arena),
-        _cached_size_{0} {}
-
-inline void MoveItemRequest::SharedCtor(::_pb::Arena* arena) {
-  new (&_impl_) Impl_(internal_visibility(), arena);
-  _impl_.allow_overwrite_ = {};
-}
-MoveItemRequest::~MoveItemRequest() {
-  // @@protoc_insertion_point(destructor:io.deephaven.proto.backplane.grpc.MoveItemRequest)
-  _internal_metadata_.Delete<::google::protobuf::UnknownFieldSet>();
-  SharedDtor();
-}
-inline void MoveItemRequest::SharedDtor() {
-  ABSL_DCHECK(GetArena() == nullptr);
-  _impl_.old_path_.Destroy();
-  _impl_.new_path_.Destroy();
-  _impl_.~Impl_();
-}
-
-PROTOBUF_NOINLINE void MoveItemRequest::Clear() {
-// @@protoc_insertion_point(message_clear_start:io.deephaven.proto.backplane.grpc.MoveItemRequest)
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  ::uint32_t cached_has_bits = 0;
-  // Prevent compiler warnings about cached_has_bits being unused
-  (void) cached_has_bits;
-
-  _impl_.old_path_.ClearToEmpty();
-  _impl_.new_path_.ClearToEmpty();
-  _impl_.allow_overwrite_ = false;
-  _internal_metadata_.Clear<::google::protobuf::UnknownFieldSet>();
-}
-
-const char* MoveItemRequest::_InternalParse(
-    const char* ptr, ::_pbi::ParseContext* ctx) {
-  ptr = ::_pbi::TcParser::ParseLoop(this, ptr, ctx, &_table_.header);
-  return ptr;
-}
-
-
-PROTOBUF_CONSTINIT PROTOBUF_ATTRIBUTE_INIT_PRIORITY1
-const ::_pbi::TcParseTable<2, 3, 0, 74, 2> MoveItemRequest::_table_ = {
-  {
-    0,  // no _has_bits_
-    0, // no _extensions_
-    3, 24,  // max_field_number, fast_idx_mask
-    offsetof(decltype(_table_), field_lookup_table),
-    4294967288,  // skipmap
-    offsetof(decltype(_table_), field_entries),
-    3,  // num_field_entries
-    0,  // num_aux_entries
-    offsetof(decltype(_table_), field_names),  // no aux_entries
-    &_MoveItemRequest_default_instance_._instance,
-    ::_pbi::TcParser::GenericFallback,  // fallback
-  }, {{
-    {::_pbi::TcParser::MiniParse, {}},
-    // string old_path = 1;
-    {::_pbi::TcParser::FastUS1,
-     {10, 63, 0, PROTOBUF_FIELD_OFFSET(MoveItemRequest, _impl_.old_path_)}},
-    // string new_path = 2;
-    {::_pbi::TcParser::FastUS1,
-     {18, 63, 0, PROTOBUF_FIELD_OFFSET(MoveItemRequest, _impl_.new_path_)}},
-    // bool allow_overwrite = 3;
-    {::_pbi::TcParser::SingularVarintNoZag1<bool, offsetof(MoveItemRequest, _impl_.allow_overwrite_), 63>(),
-     {24, 63, 0, PROTOBUF_FIELD_OFFSET(MoveItemRequest, _impl_.allow_overwrite_)}},
-  }}, {{
-    65535, 65535
-  }}, {{
-    // string old_path = 1;
-    {PROTOBUF_FIELD_OFFSET(MoveItemRequest, _impl_.old_path_), 0, 0,
-    (0 | ::_fl::kFcSingular | ::_fl::kUtf8String | ::_fl::kRepAString)},
-    // string new_path = 2;
-    {PROTOBUF_FIELD_OFFSET(MoveItemRequest, _impl_.new_path_), 0, 0,
-    (0 | ::_fl::kFcSingular | ::_fl::kUtf8String | ::_fl::kRepAString)},
-    // bool allow_overwrite = 3;
-    {PROTOBUF_FIELD_OFFSET(MoveItemRequest, _impl_.allow_overwrite_), 0, 0,
-    (0 | ::_fl::kFcSingular | ::_fl::kBool)},
-  }},
-  // no aux_entries
-  {{
-    "\61\10\10\0\0\0\0\0"
-    "io.deephaven.proto.backplane.grpc.MoveItemRequest"
-    "old_path"
-    "new_path"
-  }},
-};
-
-::uint8_t* MoveItemRequest::_InternalSerialize(
-    ::uint8_t* target,
-    ::google::protobuf::io::EpsCopyOutputStream* stream) const {
-  // @@protoc_insertion_point(serialize_to_array_start:io.deephaven.proto.backplane.grpc.MoveItemRequest)
-  ::uint32_t cached_has_bits = 0;
-  (void)cached_has_bits;
-
-  // string old_path = 1;
-  if (!this->_internal_old_path().empty()) {
-    const std::string& _s = this->_internal_old_path();
-    ::google::protobuf::internal::WireFormatLite::VerifyUtf8String(
-        _s.data(), static_cast<int>(_s.length()), ::google::protobuf::internal::WireFormatLite::SERIALIZE, "io.deephaven.proto.backplane.grpc.MoveItemRequest.old_path");
-    target = stream->WriteStringMaybeAliased(1, _s, target);
-  }
-
-  // string new_path = 2;
-  if (!this->_internal_new_path().empty()) {
-    const std::string& _s = this->_internal_new_path();
-    ::google::protobuf::internal::WireFormatLite::VerifyUtf8String(
-        _s.data(), static_cast<int>(_s.length()), ::google::protobuf::internal::WireFormatLite::SERIALIZE, "io.deephaven.proto.backplane.grpc.MoveItemRequest.new_path");
-    target = stream->WriteStringMaybeAliased(2, _s, target);
-  }
-
-  // bool allow_overwrite = 3;
-  if (this->_internal_allow_overwrite() != 0) {
-    target = stream->EnsureSpace(target);
-    target = ::_pbi::WireFormatLite::WriteBoolToArray(
-        3, this->_internal_allow_overwrite(), target);
-  }
-
-  if (PROTOBUF_PREDICT_FALSE(_internal_metadata_.have_unknown_fields())) {
-    target =
-        ::_pbi::WireFormat::InternalSerializeUnknownFieldsToArray(
-            _internal_metadata_.unknown_fields<::google::protobuf::UnknownFieldSet>(::google::protobuf::UnknownFieldSet::default_instance), target, stream);
-  }
-  // @@protoc_insertion_point(serialize_to_array_end:io.deephaven.proto.backplane.grpc.MoveItemRequest)
-  return target;
-}
-
-::size_t MoveItemRequest::ByteSizeLong() const {
-// @@protoc_insertion_point(message_byte_size_start:io.deephaven.proto.backplane.grpc.MoveItemRequest)
-  ::size_t total_size = 0;
-
-  ::uint32_t cached_has_bits = 0;
-  // Prevent compiler warnings about cached_has_bits being unused
-  (void) cached_has_bits;
-
-  // string old_path = 1;
-  if (!this->_internal_old_path().empty()) {
-    total_size += 1 + ::google::protobuf::internal::WireFormatLite::StringSize(
-                                    this->_internal_old_path());
-  }
-
-  // string new_path = 2;
-  if (!this->_internal_new_path().empty()) {
-    total_size += 1 + ::google::protobuf::internal::WireFormatLite::StringSize(
-                                    this->_internal_new_path());
-  }
-
-  // bool allow_overwrite = 3;
-  if (this->_internal_allow_overwrite() != 0) {
-    total_size += 2;
-  }
-
-  return MaybeComputeUnknownFieldsSize(total_size, &_impl_._cached_size_);
-}
-
-const ::google::protobuf::Message::ClassData MoveItemRequest::_class_data_ = {
-    MoveItemRequest::MergeImpl,
-    nullptr,  // OnDemandRegisterArenaDtor
-};
-const ::google::protobuf::Message::ClassData* MoveItemRequest::GetClassData() const {
-  return &_class_data_;
-}
-
-void MoveItemRequest::MergeImpl(::google::protobuf::Message& to_msg, const ::google::protobuf::Message& from_msg) {
-  auto* const _this = static_cast<MoveItemRequest*>(&to_msg);
-  auto& from = static_cast<const MoveItemRequest&>(from_msg);
-  // @@protoc_insertion_point(class_specific_merge_from_start:io.deephaven.proto.backplane.grpc.MoveItemRequest)
-  ABSL_DCHECK_NE(&from, _this);
-  ::uint32_t cached_has_bits = 0;
-  (void) cached_has_bits;
-
-  if (!from._internal_old_path().empty()) {
-    _this->_internal_set_old_path(from._internal_old_path());
-  }
-  if (!from._internal_new_path().empty()) {
-    _this->_internal_set_new_path(from._internal_new_path());
-  }
-  if (from._internal_allow_overwrite() != 0) {
-    _this->_internal_set_allow_overwrite(from._internal_allow_overwrite());
-  }
-  _this->_internal_metadata_.MergeFrom<::google::protobuf::UnknownFieldSet>(from._internal_metadata_);
-}
-
-void MoveItemRequest::CopyFrom(const MoveItemRequest& from) {
-// @@protoc_insertion_point(class_specific_copy_from_start:io.deephaven.proto.backplane.grpc.MoveItemRequest)
-  if (&from == this) return;
-  Clear();
-  MergeFrom(from);
-}
-
-PROTOBUF_NOINLINE bool MoveItemRequest::IsInitialized() const {
-  return true;
-}
-
-::_pbi::CachedSize* MoveItemRequest::AccessCachedSize() const {
-  return &_impl_._cached_size_;
-}
-void MoveItemRequest::InternalSwap(MoveItemRequest* PROTOBUF_RESTRICT other) {
-  using std::swap;
-  auto* arena = GetArena();
-  ABSL_DCHECK_EQ(arena, other->GetArena());
-  _internal_metadata_.InternalSwap(&other->_internal_metadata_);
-  ::_pbi::ArenaStringPtr::InternalSwap(&_impl_.old_path_, &other->_impl_.old_path_, arena);
-  ::_pbi::ArenaStringPtr::InternalSwap(&_impl_.new_path_, &other->_impl_.new_path_, arena);
-        swap(_impl_.allow_overwrite_, other->_impl_.allow_overwrite_);
-}
-
-::google::protobuf::Metadata MoveItemRequest::GetMetadata() const {
-  return ::_pbi::AssignDescriptors(
-      &descriptor_table_deephaven_2fproto_2fstorage_2eproto_getter, &descriptor_table_deephaven_2fproto_2fstorage_2eproto_once,
-      file_level_metadata_deephaven_2fproto_2fstorage_2eproto[7]);
-}
-// ===================================================================
-
-class MoveItemResponse::_Internal {
- public:
-};
-
-MoveItemResponse::MoveItemResponse(::google::protobuf::Arena* arena)
-    : ::google::protobuf::internal::ZeroFieldsBase(arena) {
-  // @@protoc_insertion_point(arena_constructor:io.deephaven.proto.backplane.grpc.MoveItemResponse)
-}
-MoveItemResponse::MoveItemResponse(
-    ::google::protobuf::Arena* arena,
-    const MoveItemResponse& from)
-    : ::google::protobuf::internal::ZeroFieldsBase(arena) {
-  MoveItemResponse* const _this = this;
-  (void)_this;
-  _internal_metadata_.MergeFrom<::google::protobuf::UnknownFieldSet>(
-      from._internal_metadata_);
-
-  // @@protoc_insertion_point(copy_constructor:io.deephaven.proto.backplane.grpc.MoveItemResponse)
-}
-
-
-
-
-
-
-
-
-
-::google::protobuf::Metadata MoveItemResponse::GetMetadata() const {
-  return ::_pbi::AssignDescriptors(
-      &descriptor_table_deephaven_2fproto_2fstorage_2eproto_getter, &descriptor_table_deephaven_2fproto_2fstorage_2eproto_once,
-      file_level_metadata_deephaven_2fproto_2fstorage_2eproto[8]);
-}
-// ===================================================================
-
-class CreateDirectoryRequest::_Internal {
- public:
-};
-
-CreateDirectoryRequest::CreateDirectoryRequest(::google::protobuf::Arena* arena)
-    : ::google::protobuf::Message(arena) {
-  SharedCtor(arena);
-  // @@protoc_insertion_point(arena_constructor:io.deephaven.proto.backplane.grpc.CreateDirectoryRequest)
-}
-inline PROTOBUF_NDEBUG_INLINE CreateDirectoryRequest::Impl_::Impl_(
-    ::google::protobuf::internal::InternalVisibility visibility, ::google::protobuf::Arena* arena,
-    const Impl_& from)
-      : path_(arena, from.path_),
-        _cached_size_{0} {}
-
-CreateDirectoryRequest::CreateDirectoryRequest(
-    ::google::protobuf::Arena* arena,
-    const CreateDirectoryRequest& from)
-    : ::google::protobuf::Message(arena) {
-  CreateDirectoryRequest* const _this = this;
-  (void)_this;
-  _internal_metadata_.MergeFrom<::google::protobuf::UnknownFieldSet>(
-      from._internal_metadata_);
-  new (&_impl_) Impl_(internal_visibility(), arena, from._impl_);
-
-  // @@protoc_insertion_point(copy_constructor:io.deephaven.proto.backplane.grpc.CreateDirectoryRequest)
-}
-inline PROTOBUF_NDEBUG_INLINE CreateDirectoryRequest::Impl_::Impl_(
-    ::google::protobuf::internal::InternalVisibility visibility,
-    ::google::protobuf::Arena* arena)
-      : path_(arena),
-        _cached_size_{0} {}
-
-inline void CreateDirectoryRequest::SharedCtor(::_pb::Arena* arena) {
-  new (&_impl_) Impl_(internal_visibility(), arena);
-}
-CreateDirectoryRequest::~CreateDirectoryRequest() {
-  // @@protoc_insertion_point(destructor:io.deephaven.proto.backplane.grpc.CreateDirectoryRequest)
-  _internal_metadata_.Delete<::google::protobuf::UnknownFieldSet>();
-  SharedDtor();
-}
-inline void CreateDirectoryRequest::SharedDtor() {
-  ABSL_DCHECK(GetArena() == nullptr);
-  _impl_.path_.Destroy();
-  _impl_.~Impl_();
-}
-
-PROTOBUF_NOINLINE void CreateDirectoryRequest::Clear() {
-// @@protoc_insertion_point(message_clear_start:io.deephaven.proto.backplane.grpc.CreateDirectoryRequest)
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  ::uint32_t cached_has_bits = 0;
-  // Prevent compiler warnings about cached_has_bits being unused
-  (void) cached_has_bits;
-
-  _impl_.path_.ClearToEmpty();
-  _internal_metadata_.Clear<::google::protobuf::UnknownFieldSet>();
-}
-
-const char* CreateDirectoryRequest::_InternalParse(
-    const char* ptr, ::_pbi::ParseContext* ctx) {
-  ptr = ::_pbi::TcParser::ParseLoop(this, ptr, ctx, &_table_.header);
-  return ptr;
-}
-
-
-PROTOBUF_CONSTINIT PROTOBUF_ATTRIBUTE_INIT_PRIORITY1
-const ::_pbi::TcParseTable<0, 1, 0, 69, 2> CreateDirectoryRequest::_table_ = {
-  {
-    0,  // no _has_bits_
-    0, // no _extensions_
-    1, 0,  // max_field_number, fast_idx_mask
-    offsetof(decltype(_table_), field_lookup_table),
-    4294967294,  // skipmap
-    offsetof(decltype(_table_), field_entries),
-    1,  // num_field_entries
-    0,  // num_aux_entries
-    offsetof(decltype(_table_), field_names),  // no aux_entries
-    &_CreateDirectoryRequest_default_instance_._instance,
-    ::_pbi::TcParser::GenericFallback,  // fallback
-  }, {{
-    // string path = 1;
-    {::_pbi::TcParser::FastUS1,
-     {10, 63, 0, PROTOBUF_FIELD_OFFSET(CreateDirectoryRequest, _impl_.path_)}},
-  }}, {{
-    65535, 65535
-  }}, {{
-    // string path = 1;
-    {PROTOBUF_FIELD_OFFSET(CreateDirectoryRequest, _impl_.path_), 0, 0,
-    (0 | ::_fl::kFcSingular | ::_fl::kUtf8String | ::_fl::kRepAString)},
-  }},
-  // no aux_entries
-  {{
-    "\70\4\0\0\0\0\0\0"
-    "io.deephaven.proto.backplane.grpc.CreateDirectoryRequest"
-    "path"
-  }},
-};
-
-::uint8_t* CreateDirectoryRequest::_InternalSerialize(
-    ::uint8_t* target,
-    ::google::protobuf::io::EpsCopyOutputStream* stream) const {
-  // @@protoc_insertion_point(serialize_to_array_start:io.deephaven.proto.backplane.grpc.CreateDirectoryRequest)
-  ::uint32_t cached_has_bits = 0;
-  (void)cached_has_bits;
-
-  // string path = 1;
-  if (!this->_internal_path().empty()) {
-    const std::string& _s = this->_internal_path();
-    ::google::protobuf::internal::WireFormatLite::VerifyUtf8String(
-        _s.data(), static_cast<int>(_s.length()), ::google::protobuf::internal::WireFormatLite::SERIALIZE, "io.deephaven.proto.backplane.grpc.CreateDirectoryRequest.path");
-    target = stream->WriteStringMaybeAliased(1, _s, target);
-  }
-
-  if (PROTOBUF_PREDICT_FALSE(_internal_metadata_.have_unknown_fields())) {
-    target =
-        ::_pbi::WireFormat::InternalSerializeUnknownFieldsToArray(
-            _internal_metadata_.unknown_fields<::google::protobuf::UnknownFieldSet>(::google::protobuf::UnknownFieldSet::default_instance), target, stream);
-  }
-  // @@protoc_insertion_point(serialize_to_array_end:io.deephaven.proto.backplane.grpc.CreateDirectoryRequest)
-  return target;
-}
-
-::size_t CreateDirectoryRequest::ByteSizeLong() const {
-// @@protoc_insertion_point(message_byte_size_start:io.deephaven.proto.backplane.grpc.CreateDirectoryRequest)
-  ::size_t total_size = 0;
-
-  ::uint32_t cached_has_bits = 0;
-  // Prevent compiler warnings about cached_has_bits being unused
-  (void) cached_has_bits;
-
-  // string path = 1;
-  if (!this->_internal_path().empty()) {
-    total_size += 1 + ::google::protobuf::internal::WireFormatLite::StringSize(
-                                    this->_internal_path());
-  }
-
-  return MaybeComputeUnknownFieldsSize(total_size, &_impl_._cached_size_);
-}
-
-const ::google::protobuf::Message::ClassData CreateDirectoryRequest::_class_data_ = {
-    CreateDirectoryRequest::MergeImpl,
-    nullptr,  // OnDemandRegisterArenaDtor
-};
-const ::google::protobuf::Message::ClassData* CreateDirectoryRequest::GetClassData() const {
-  return &_class_data_;
-}
-
-void CreateDirectoryRequest::MergeImpl(::google::protobuf::Message& to_msg, const ::google::protobuf::Message& from_msg) {
-  auto* const _this = static_cast<CreateDirectoryRequest*>(&to_msg);
-  auto& from = static_cast<const CreateDirectoryRequest&>(from_msg);
-  // @@protoc_insertion_point(class_specific_merge_from_start:io.deephaven.proto.backplane.grpc.CreateDirectoryRequest)
-  ABSL_DCHECK_NE(&from, _this);
-  ::uint32_t cached_has_bits = 0;
-  (void) cached_has_bits;
-
-  if (!from._internal_path().empty()) {
-    _this->_internal_set_path(from._internal_path());
-  }
-  _this->_internal_metadata_.MergeFrom<::google::protobuf::UnknownFieldSet>(from._internal_metadata_);
-}
-
-void CreateDirectoryRequest::CopyFrom(const CreateDirectoryRequest& from) {
-// @@protoc_insertion_point(class_specific_copy_from_start:io.deephaven.proto.backplane.grpc.CreateDirectoryRequest)
-  if (&from == this) return;
-  Clear();
-  MergeFrom(from);
-}
-
-PROTOBUF_NOINLINE bool CreateDirectoryRequest::IsInitialized() const {
-  return true;
-}
-
-::_pbi::CachedSize* CreateDirectoryRequest::AccessCachedSize() const {
-  return &_impl_._cached_size_;
-}
-void CreateDirectoryRequest::InternalSwap(CreateDirectoryRequest* PROTOBUF_RESTRICT other) {
-  using std::swap;
-  auto* arena = GetArena();
-  ABSL_DCHECK_EQ(arena, other->GetArena());
-  _internal_metadata_.InternalSwap(&other->_internal_metadata_);
-  ::_pbi::ArenaStringPtr::InternalSwap(&_impl_.path_, &other->_impl_.path_, arena);
-}
-
-::google::protobuf::Metadata CreateDirectoryRequest::GetMetadata() const {
-  return ::_pbi::AssignDescriptors(
-      &descriptor_table_deephaven_2fproto_2fstorage_2eproto_getter, &descriptor_table_deephaven_2fproto_2fstorage_2eproto_once,
-      file_level_metadata_deephaven_2fproto_2fstorage_2eproto[9]);
-}
-// ===================================================================
-
-class CreateDirectoryResponse::_Internal {
- public:
-};
-
-CreateDirectoryResponse::CreateDirectoryResponse(::google::protobuf::Arena* arena)
-    : ::google::protobuf::internal::ZeroFieldsBase(arena) {
-  // @@protoc_insertion_point(arena_constructor:io.deephaven.proto.backplane.grpc.CreateDirectoryResponse)
-}
-CreateDirectoryResponse::CreateDirectoryResponse(
-    ::google::protobuf::Arena* arena,
-    const CreateDirectoryResponse& from)
-    : ::google::protobuf::internal::ZeroFieldsBase(arena) {
-  CreateDirectoryResponse* const _this = this;
-  (void)_this;
-  _internal_metadata_.MergeFrom<::google::protobuf::UnknownFieldSet>(
-      from._internal_metadata_);
-
-  // @@protoc_insertion_point(copy_constructor:io.deephaven.proto.backplane.grpc.CreateDirectoryResponse)
-}
-
-
-
-
-
-
-
-
-
-::google::protobuf::Metadata CreateDirectoryResponse::GetMetadata() const {
-  return ::_pbi::AssignDescriptors(
-      &descriptor_table_deephaven_2fproto_2fstorage_2eproto_getter, &descriptor_table_deephaven_2fproto_2fstorage_2eproto_once,
-      file_level_metadata_deephaven_2fproto_2fstorage_2eproto[10]);
-}
-// ===================================================================
-
-class DeleteItemRequest::_Internal {
- public:
-};
-
-DeleteItemRequest::DeleteItemRequest(::google::protobuf::Arena* arena)
-    : ::google::protobuf::Message(arena) {
-  SharedCtor(arena);
-  // @@protoc_insertion_point(arena_constructor:io.deephaven.proto.backplane.grpc.DeleteItemRequest)
-}
-inline PROTOBUF_NDEBUG_INLINE DeleteItemRequest::Impl_::Impl_(
-    ::google::protobuf::internal::InternalVisibility visibility, ::google::protobuf::Arena* arena,
-    const Impl_& from)
-      : path_(arena, from.path_),
-        _cached_size_{0} {}
-
-DeleteItemRequest::DeleteItemRequest(
-    ::google::protobuf::Arena* arena,
-    const DeleteItemRequest& from)
-    : ::google::protobuf::Message(arena) {
-  DeleteItemRequest* const _this = this;
-  (void)_this;
-  _internal_metadata_.MergeFrom<::google::protobuf::UnknownFieldSet>(
-      from._internal_metadata_);
-  new (&_impl_) Impl_(internal_visibility(), arena, from._impl_);
-
-  // @@protoc_insertion_point(copy_constructor:io.deephaven.proto.backplane.grpc.DeleteItemRequest)
-}
-inline PROTOBUF_NDEBUG_INLINE DeleteItemRequest::Impl_::Impl_(
-    ::google::protobuf::internal::InternalVisibility visibility,
-    ::google::protobuf::Arena* arena)
-      : path_(arena),
-        _cached_size_{0} {}
-
-inline void DeleteItemRequest::SharedCtor(::_pb::Arena* arena) {
-  new (&_impl_) Impl_(internal_visibility(), arena);
-}
-DeleteItemRequest::~DeleteItemRequest() {
-  // @@protoc_insertion_point(destructor:io.deephaven.proto.backplane.grpc.DeleteItemRequest)
-  _internal_metadata_.Delete<::google::protobuf::UnknownFieldSet>();
-  SharedDtor();
-}
-inline void DeleteItemRequest::SharedDtor() {
-  ABSL_DCHECK(GetArena() == nullptr);
-  _impl_.path_.Destroy();
-  _impl_.~Impl_();
-}
-
-PROTOBUF_NOINLINE void DeleteItemRequest::Clear() {
-// @@protoc_insertion_point(message_clear_start:io.deephaven.proto.backplane.grpc.DeleteItemRequest)
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  ::uint32_t cached_has_bits = 0;
-  // Prevent compiler warnings about cached_has_bits being unused
-  (void) cached_has_bits;
-
-  _impl_.path_.ClearToEmpty();
-  _internal_metadata_.Clear<::google::protobuf::UnknownFieldSet>();
-}
-
-const char* DeleteItemRequest::_InternalParse(
-    const char* ptr, ::_pbi::ParseContext* ctx) {
-  ptr = ::_pbi::TcParser::ParseLoop(this, ptr, ctx, &_table_.header);
-  return ptr;
-}
-
-
-PROTOBUF_CONSTINIT PROTOBUF_ATTRIBUTE_INIT_PRIORITY1
-const ::_pbi::TcParseTable<0, 1, 0, 64, 2> DeleteItemRequest::_table_ = {
-  {
-    0,  // no _has_bits_
-    0, // no _extensions_
-    1, 0,  // max_field_number, fast_idx_mask
-    offsetof(decltype(_table_), field_lookup_table),
-    4294967294,  // skipmap
-    offsetof(decltype(_table_), field_entries),
-    1,  // num_field_entries
-    0,  // num_aux_entries
-    offsetof(decltype(_table_), field_names),  // no aux_entries
-    &_DeleteItemRequest_default_instance_._instance,
-    ::_pbi::TcParser::GenericFallback,  // fallback
-  }, {{
-    // string path = 1;
-    {::_pbi::TcParser::FastUS1,
-     {10, 63, 0, PROTOBUF_FIELD_OFFSET(DeleteItemRequest, _impl_.path_)}},
-  }}, {{
-    65535, 65535
-  }}, {{
-    // string path = 1;
-    {PROTOBUF_FIELD_OFFSET(DeleteItemRequest, _impl_.path_), 0, 0,
-    (0 | ::_fl::kFcSingular | ::_fl::kUtf8String | ::_fl::kRepAString)},
-  }},
-  // no aux_entries
-  {{
-    "\63\4\0\0\0\0\0\0"
-    "io.deephaven.proto.backplane.grpc.DeleteItemRequest"
-    "path"
-  }},
-};
-
-::uint8_t* DeleteItemRequest::_InternalSerialize(
-    ::uint8_t* target,
-    ::google::protobuf::io::EpsCopyOutputStream* stream) const {
-  // @@protoc_insertion_point(serialize_to_array_start:io.deephaven.proto.backplane.grpc.DeleteItemRequest)
-  ::uint32_t cached_has_bits = 0;
-  (void)cached_has_bits;
-
-  // string path = 1;
-  if (!this->_internal_path().empty()) {
-    const std::string& _s = this->_internal_path();
-    ::google::protobuf::internal::WireFormatLite::VerifyUtf8String(
-        _s.data(), static_cast<int>(_s.length()), ::google::protobuf::internal::WireFormatLite::SERIALIZE, "io.deephaven.proto.backplane.grpc.DeleteItemRequest.path");
-    target = stream->WriteStringMaybeAliased(1, _s, target);
-  }
-
-  if (PROTOBUF_PREDICT_FALSE(_internal_metadata_.have_unknown_fields())) {
-    target =
-        ::_pbi::WireFormat::InternalSerializeUnknownFieldsToArray(
-            _internal_metadata_.unknown_fields<::google::protobuf::UnknownFieldSet>(::google::protobuf::UnknownFieldSet::default_instance), target, stream);
-  }
-  // @@protoc_insertion_point(serialize_to_array_end:io.deephaven.proto.backplane.grpc.DeleteItemRequest)
-  return target;
-}
-
-::size_t DeleteItemRequest::ByteSizeLong() const {
-// @@protoc_insertion_point(message_byte_size_start:io.deephaven.proto.backplane.grpc.DeleteItemRequest)
-  ::size_t total_size = 0;
-
-  ::uint32_t cached_has_bits = 0;
-  // Prevent compiler warnings about cached_has_bits being unused
-  (void) cached_has_bits;
-
-  // string path = 1;
-  if (!this->_internal_path().empty()) {
-    total_size += 1 + ::google::protobuf::internal::WireFormatLite::StringSize(
-                                    this->_internal_path());
-  }
-
-  return MaybeComputeUnknownFieldsSize(total_size, &_impl_._cached_size_);
-}
-
-const ::google::protobuf::Message::ClassData DeleteItemRequest::_class_data_ = {
-    DeleteItemRequest::MergeImpl,
-    nullptr,  // OnDemandRegisterArenaDtor
-};
-const ::google::protobuf::Message::ClassData* DeleteItemRequest::GetClassData() const {
-  return &_class_data_;
-}
-
-void DeleteItemRequest::MergeImpl(::google::protobuf::Message& to_msg, const ::google::protobuf::Message& from_msg) {
-  auto* const _this = static_cast<DeleteItemRequest*>(&to_msg);
-  auto& from = static_cast<const DeleteItemRequest&>(from_msg);
-  // @@protoc_insertion_point(class_specific_merge_from_start:io.deephaven.proto.backplane.grpc.DeleteItemRequest)
-  ABSL_DCHECK_NE(&from, _this);
-  ::uint32_t cached_has_bits = 0;
-  (void) cached_has_bits;
-
-  if (!from._internal_path().empty()) {
-    _this->_internal_set_path(from._internal_path());
-  }
-  _this->_internal_metadata_.MergeFrom<::google::protobuf::UnknownFieldSet>(from._internal_metadata_);
-}
-
-void DeleteItemRequest::CopyFrom(const DeleteItemRequest& from) {
-// @@protoc_insertion_point(class_specific_copy_from_start:io.deephaven.proto.backplane.grpc.DeleteItemRequest)
-  if (&from == this) return;
-  Clear();
-  MergeFrom(from);
-}
-
-PROTOBUF_NOINLINE bool DeleteItemRequest::IsInitialized() const {
-  return true;
-}
-
-::_pbi::CachedSize* DeleteItemRequest::AccessCachedSize() const {
-  return &_impl_._cached_size_;
-}
-void DeleteItemRequest::InternalSwap(DeleteItemRequest* PROTOBUF_RESTRICT other) {
-  using std::swap;
-  auto* arena = GetArena();
-  ABSL_DCHECK_EQ(arena, other->GetArena());
-  _internal_metadata_.InternalSwap(&other->_internal_metadata_);
-  ::_pbi::ArenaStringPtr::InternalSwap(&_impl_.path_, &other->_impl_.path_, arena);
-}
-
-::google::protobuf::Metadata DeleteItemRequest::GetMetadata() const {
-  return ::_pbi::AssignDescriptors(
-      &descriptor_table_deephaven_2fproto_2fstorage_2eproto_getter, &descriptor_table_deephaven_2fproto_2fstorage_2eproto_once,
-      file_level_metadata_deephaven_2fproto_2fstorage_2eproto[11]);
-}
-// ===================================================================
-
-class DeleteItemResponse::_Internal {
- public:
-};
-
-DeleteItemResponse::DeleteItemResponse(::google::protobuf::Arena* arena)
-    : ::google::protobuf::internal::ZeroFieldsBase(arena) {
-  // @@protoc_insertion_point(arena_constructor:io.deephaven.proto.backplane.grpc.DeleteItemResponse)
-}
-DeleteItemResponse::DeleteItemResponse(
-    ::google::protobuf::Arena* arena,
-    const DeleteItemResponse& from)
-    : ::google::protobuf::internal::ZeroFieldsBase(arena) {
-  DeleteItemResponse* const _this = this;
-  (void)_this;
-  _internal_metadata_.MergeFrom<::google::protobuf::UnknownFieldSet>(
-      from._internal_metadata_);
-
-  // @@protoc_insertion_point(copy_constructor:io.deephaven.proto.backplane.grpc.DeleteItemResponse)
-}
-
-
-
-
-
-
-
-
-
-::google::protobuf::Metadata DeleteItemResponse::GetMetadata() const {
-  return ::_pbi::AssignDescriptors(
-      &descriptor_table_deephaven_2fproto_2fstorage_2eproto_getter, &descriptor_table_deephaven_2fproto_2fstorage_2eproto_once,
-      file_level_metadata_deephaven_2fproto_2fstorage_2eproto[12]);
-}
-// @@protoc_insertion_point(namespace_scope)
-}  // namespace grpc
-}  // namespace backplane
-}  // namespace proto
-}  // namespace deephaven
-}  // namespace io
-namespace google {
-namespace protobuf {
-}  // namespace protobuf
-}  // namespace google
-// @@protoc_insertion_point(global_scope)
-#include "google/protobuf/port_undef.inc"
diff --git a/cpp-client/deephaven/dhclient/proto/deephaven/proto/storage.pb.h b/cpp-client/deephaven/dhclient/proto/deephaven/proto/storage.pb.h
deleted file mode 100644
index 9d2a9b9d6a7..00000000000
--- a/cpp-client/deephaven/dhclient/proto/deephaven/proto/storage.pb.h
+++ /dev/null
@@ -1,3735 +0,0 @@
-// Generated by the protocol buffer compiler.  DO NOT EDIT!
-// source: deephaven/proto/storage.proto
-// Protobuf C++ Version: 4.25.3
-
-#ifndef GOOGLE_PROTOBUF_INCLUDED_deephaven_2fproto_2fstorage_2eproto_2epb_2eh
-#define GOOGLE_PROTOBUF_INCLUDED_deephaven_2fproto_2fstorage_2eproto_2epb_2eh
-
-#include <limits>
-#include <string>
-#include <type_traits>
-#include <utility>
-
-#include "google/protobuf/port_def.inc"
-#if PROTOBUF_VERSION < 4025000
-#error "This file was generated by a newer version of protoc which is"
-#error "incompatible with your Protocol Buffer headers. Please update"
-#error "your headers."
-#endif  // PROTOBUF_VERSION
-
-#if 4025003 < PROTOBUF_MIN_PROTOC_VERSION
-#error "This file was generated by an older version of protoc which is"
-#error "incompatible with your Protocol Buffer headers. Please"
-#error "regenerate this file with a newer version of protoc."
-#endif  // PROTOBUF_MIN_PROTOC_VERSION
-#include "google/protobuf/port_undef.inc"
-#include "google/protobuf/io/coded_stream.h"
-#include "google/protobuf/arena.h"
-#include "google/protobuf/arenastring.h"
-#include "google/protobuf/generated_message_bases.h"
-#include "google/protobuf/generated_message_tctable_decl.h"
-#include "google/protobuf/generated_message_util.h"
-#include "google/protobuf/metadata_lite.h"
-#include "google/protobuf/generated_message_reflection.h"
-#include "google/protobuf/message.h"
-#include "google/protobuf/repeated_field.h"  // IWYU pragma: export
-#include "google/protobuf/extension_set.h"  // IWYU pragma: export
-#include "google/protobuf/generated_enum_reflection.h"
-#include "google/protobuf/unknown_field_set.h"
-// @@protoc_insertion_point(includes)
-
-// Must be included last.
-#include "google/protobuf/port_def.inc"
-
-#define PROTOBUF_INTERNAL_EXPORT_deephaven_2fproto_2fstorage_2eproto
-
-namespace google {
-namespace protobuf {
-namespace internal {
-class AnyMetadata;
-}  // namespace internal
-}  // namespace protobuf
-}  // namespace google
-
-// Internal implementation detail -- do not use these members.
-struct TableStruct_deephaven_2fproto_2fstorage_2eproto {
-  static const ::uint32_t offsets[];
-};
-extern const ::google::protobuf::internal::DescriptorTable
-    descriptor_table_deephaven_2fproto_2fstorage_2eproto;
-namespace io {
-namespace deephaven {
-namespace proto {
-namespace backplane {
-namespace grpc {
-class CreateDirectoryRequest;
-struct CreateDirectoryRequestDefaultTypeInternal;
-extern CreateDirectoryRequestDefaultTypeInternal _CreateDirectoryRequest_default_instance_;
-class CreateDirectoryResponse;
-struct CreateDirectoryResponseDefaultTypeInternal;
-extern CreateDirectoryResponseDefaultTypeInternal _CreateDirectoryResponse_default_instance_;
-class DeleteItemRequest;
-struct DeleteItemRequestDefaultTypeInternal;
-extern DeleteItemRequestDefaultTypeInternal _DeleteItemRequest_default_instance_;
-class DeleteItemResponse;
-struct DeleteItemResponseDefaultTypeInternal;
-extern DeleteItemResponseDefaultTypeInternal _DeleteItemResponse_default_instance_;
-class FetchFileRequest;
-struct FetchFileRequestDefaultTypeInternal;
-extern FetchFileRequestDefaultTypeInternal _FetchFileRequest_default_instance_;
-class FetchFileResponse;
-struct FetchFileResponseDefaultTypeInternal;
-extern FetchFileResponseDefaultTypeInternal _FetchFileResponse_default_instance_;
-class ItemInfo;
-struct ItemInfoDefaultTypeInternal;
-extern ItemInfoDefaultTypeInternal _ItemInfo_default_instance_;
-class ListItemsRequest;
-struct ListItemsRequestDefaultTypeInternal;
-extern ListItemsRequestDefaultTypeInternal _ListItemsRequest_default_instance_;
-class ListItemsResponse;
-struct ListItemsResponseDefaultTypeInternal;
-extern ListItemsResponseDefaultTypeInternal _ListItemsResponse_default_instance_;
-class MoveItemRequest;
-struct MoveItemRequestDefaultTypeInternal;
-extern MoveItemRequestDefaultTypeInternal _MoveItemRequest_default_instance_;
-class MoveItemResponse;
-struct MoveItemResponseDefaultTypeInternal;
-extern MoveItemResponseDefaultTypeInternal _MoveItemResponse_default_instance_;
-class SaveFileRequest;
-struct SaveFileRequestDefaultTypeInternal;
-extern SaveFileRequestDefaultTypeInternal _SaveFileRequest_default_instance_;
-class SaveFileResponse;
-struct SaveFileResponseDefaultTypeInternal;
-extern SaveFileResponseDefaultTypeInternal _SaveFileResponse_default_instance_;
-}  // namespace grpc
-}  // namespace backplane
-}  // namespace proto
-}  // namespace deephaven
-}  // namespace io
-namespace google {
-namespace protobuf {
-}  // namespace protobuf
-}  // namespace google
-
-namespace io {
-namespace deephaven {
-namespace proto {
-namespace backplane {
-namespace grpc {
-enum ItemType : int {
-  UNKNOWN = 0,
-  DIRECTORY = 1,
-  FILE = 2,
-  ItemType_INT_MIN_SENTINEL_DO_NOT_USE_ =
-      std::numeric_limits<::int32_t>::min(),
-  ItemType_INT_MAX_SENTINEL_DO_NOT_USE_ =
-      std::numeric_limits<::int32_t>::max(),
-};
-
-bool ItemType_IsValid(int value);
-extern const uint32_t ItemType_internal_data_[];
-constexpr ItemType ItemType_MIN = static_cast<ItemType>(0);
-constexpr ItemType ItemType_MAX = static_cast<ItemType>(2);
-constexpr int ItemType_ARRAYSIZE = 2 + 1;
-const ::google::protobuf::EnumDescriptor*
-ItemType_descriptor();
-template <typename T>
-const std::string& ItemType_Name(T value) {
-  static_assert(std::is_same<T, ItemType>::value ||
-                    std::is_integral<T>::value,
-                "Incorrect type passed to ItemType_Name().");
-  return ItemType_Name(static_cast<ItemType>(value));
-}
-template <>
-inline const std::string& ItemType_Name(ItemType value) {
-  return ::google::protobuf::internal::NameOfDenseEnum<ItemType_descriptor,
-                                                 0, 2>(
-      static_cast<int>(value));
-}
-inline bool ItemType_Parse(absl::string_view name, ItemType* value) {
-  return ::google::protobuf::internal::ParseNamedEnum<ItemType>(
-      ItemType_descriptor(), name, value);
-}
-
-// ===================================================================
-
-
-// -------------------------------------------------------------------
-
-class SaveFileResponse final :
-    public ::google::protobuf::Message /* @@protoc_insertion_point(class_definition:io.deephaven.proto.backplane.grpc.SaveFileResponse) */ {
- public:
-  inline SaveFileResponse() : SaveFileResponse(nullptr) {}
-  ~SaveFileResponse() override;
-  template<typename = void>
-  explicit PROTOBUF_CONSTEXPR SaveFileResponse(::google::protobuf::internal::ConstantInitialized);
-
-  inline SaveFileResponse(const SaveFileResponse& from)
-      : SaveFileResponse(nullptr, from) {}
-  SaveFileResponse(SaveFileResponse&& from) noexcept
-    : SaveFileResponse() {
-    *this = ::std::move(from);
-  }
-
-  inline SaveFileResponse& operator=(const SaveFileResponse& from) {
-    CopyFrom(from);
-    return *this;
-  }
-  inline SaveFileResponse& operator=(SaveFileResponse&& from) noexcept {
-    if (this == &from) return *this;
-    if (GetArena() == from.GetArena()
-  #ifdef PROTOBUF_FORCE_COPY_IN_MOVE
-        && GetArena() != nullptr
-  #endif  // !PROTOBUF_FORCE_COPY_IN_MOVE
-    ) {
-      InternalSwap(&from);
-    } else {
-      CopyFrom(from);
-    }
-    return *this;
-  }
-
-  inline const ::google::protobuf::UnknownFieldSet& unknown_fields() const
-      ABSL_ATTRIBUTE_LIFETIME_BOUND {
-    return _internal_metadata_.unknown_fields<::google::protobuf::UnknownFieldSet>(::google::protobuf::UnknownFieldSet::default_instance);
-  }
-  inline ::google::protobuf::UnknownFieldSet* mutable_unknown_fields()
-      ABSL_ATTRIBUTE_LIFETIME_BOUND {
-    return _internal_metadata_.mutable_unknown_fields<::google::protobuf::UnknownFieldSet>();
-  }
-
-  static const ::google::protobuf::Descriptor* descriptor() {
-    return GetDescriptor();
-  }
-  static const ::google::protobuf::Descriptor* GetDescriptor() {
-    return default_instance().GetMetadata().descriptor;
-  }
-  static const ::google::protobuf::Reflection* GetReflection() {
-    return default_instance().GetMetadata().reflection;
-  }
-  static const SaveFileResponse& default_instance() {
-    return *internal_default_instance();
-  }
-  static inline const SaveFileResponse* internal_default_instance() {
-    return reinterpret_cast<const SaveFileResponse*>(
-               &_SaveFileResponse_default_instance_);
-  }
-  static constexpr int kIndexInFileMessages =
-    6;
-
-  friend void swap(SaveFileResponse& a, SaveFileResponse& b) {
-    a.Swap(&b);
-  }
-  inline void Swap(SaveFileResponse* other) {
-    if (other == this) return;
-  #ifdef PROTOBUF_FORCE_COPY_IN_SWAP
-    if (GetArena() != nullptr &&
-        GetArena() == other->GetArena()) {
-   #else  // PROTOBUF_FORCE_COPY_IN_SWAP
-    if (GetArena() == other->GetArena()) {
-  #endif  // !PROTOBUF_FORCE_COPY_IN_SWAP
-      InternalSwap(other);
-    } else {
-      ::google::protobuf::internal::GenericSwap(this, other);
-    }
-  }
-  void UnsafeArenaSwap(SaveFileResponse* other) {
-    if (other == this) return;
-    ABSL_DCHECK(GetArena() == other->GetArena());
-    InternalSwap(other);
-  }
-
-  // implements Message ----------------------------------------------
-
-  SaveFileResponse* New(::google::protobuf::Arena* arena = nullptr) const final {
-    return CreateMaybeMessage<SaveFileResponse>(arena);
-  }
-  using ::google::protobuf::Message::CopyFrom;
-  void CopyFrom(const SaveFileResponse& from);
-  using ::google::protobuf::Message::MergeFrom;
-  void MergeFrom( const SaveFileResponse& from) {
-    SaveFileResponse::MergeImpl(*this, from);
-  }
-  private:
-  static void MergeImpl(::google::protobuf::Message& to_msg, const ::google::protobuf::Message& from_msg);
-  public:
-  PROTOBUF_ATTRIBUTE_REINITIALIZES void Clear() final;
-  bool IsInitialized() const final;
-
-  ::size_t ByteSizeLong() const final;
-  const char* _InternalParse(const char* ptr, ::google::protobuf::internal::ParseContext* ctx) final;
-  ::uint8_t* _InternalSerialize(
-      ::uint8_t* target, ::google::protobuf::io::EpsCopyOutputStream* stream) const final;
-  int GetCachedSize() const { return _impl_._cached_size_.Get(); }
-
-  private:
-  ::google::protobuf::internal::CachedSize* AccessCachedSize() const final;
-  void SharedCtor(::google::protobuf::Arena* arena);
-  void SharedDtor();
-  void InternalSwap(SaveFileResponse* other);
-
-  private:
-  friend class ::google::protobuf::internal::AnyMetadata;
-  static ::absl::string_view FullMessageName() {
-    return "io.deephaven.proto.backplane.grpc.SaveFileResponse";
-  }
-  protected:
-  explicit SaveFileResponse(::google::protobuf::Arena* arena);
-  SaveFileResponse(::google::protobuf::Arena* arena, const SaveFileResponse& from);
-  public:
-
-  static const ClassData _class_data_;
-  const ::google::protobuf::Message::ClassData*GetClassData() const final;
-
-  ::google::protobuf::Metadata GetMetadata() const final;
-
-  // nested types ----------------------------------------------------
-
-  // accessors -------------------------------------------------------
-
-  enum : int {
-    kEtagFieldNumber = 1,
-  };
-  // optional string etag = 1;
-  bool has_etag() const;
-  void clear_etag() ;
-  const std::string& etag() const;
-  template <typename Arg_ = const std::string&, typename... Args_>
-  void set_etag(Arg_&& arg, Args_... args);
-  std::string* mutable_etag();
-  PROTOBUF_NODISCARD std::string* release_etag();
-  void set_allocated_etag(std::string* value);
-
-  private:
-  const std::string& _internal_etag() const;
-  inline PROTOBUF_ALWAYS_INLINE void _internal_set_etag(
-      const std::string& value);
-  std::string* _internal_mutable_etag();
-
-  public:
-  // @@protoc_insertion_point(class_scope:io.deephaven.proto.backplane.grpc.SaveFileResponse)
- private:
-  class _Internal;
-
-  friend class ::google::protobuf::internal::TcParser;
-  static const ::google::protobuf::internal::TcParseTable<
-      0, 1, 0,
-      63, 2>
-      _table_;
-  friend class ::google::protobuf::MessageLite;
-  friend class ::google::protobuf::Arena;
-  template <typename T>
-  friend class ::google::protobuf::Arena::InternalHelper;
-  using InternalArenaConstructable_ = void;
-  using DestructorSkippable_ = void;
-  struct Impl_ {
-
-        inline explicit constexpr Impl_(
-            ::google::protobuf::internal::ConstantInitialized) noexcept;
-        inline explicit Impl_(::google::protobuf::internal::InternalVisibility visibility,
-                              ::google::protobuf::Arena* arena);
-        inline explicit Impl_(::google::protobuf::internal::InternalVisibility visibility,
-                              ::google::protobuf::Arena* arena, const Impl_& from);
-    ::google::protobuf::internal::HasBits<1> _has_bits_;
-    mutable ::google::protobuf::internal::CachedSize _cached_size_;
-    ::google::protobuf::internal::ArenaStringPtr etag_;
-    PROTOBUF_TSAN_DECLARE_MEMBER
-  };
-  union { Impl_ _impl_; };
-  friend struct ::TableStruct_deephaven_2fproto_2fstorage_2eproto;
-};// -------------------------------------------------------------------
-
-class SaveFileRequest final :
-    public ::google::protobuf::Message /* @@protoc_insertion_point(class_definition:io.deephaven.proto.backplane.grpc.SaveFileRequest) */ {
- public:
-  inline SaveFileRequest() : SaveFileRequest(nullptr) {}
-  ~SaveFileRequest() override;
-  template<typename = void>
-  explicit PROTOBUF_CONSTEXPR SaveFileRequest(::google::protobuf::internal::ConstantInitialized);
-
-  inline SaveFileRequest(const SaveFileRequest& from)
-      : SaveFileRequest(nullptr, from) {}
-  SaveFileRequest(SaveFileRequest&& from) noexcept
-    : SaveFileRequest() {
-    *this = ::std::move(from);
-  }
-
-  inline SaveFileRequest& operator=(const SaveFileRequest& from) {
-    CopyFrom(from);
-    return *this;
-  }
-  inline SaveFileRequest& operator=(SaveFileRequest&& from) noexcept {
-    if (this == &from) return *this;
-    if (GetArena() == from.GetArena()
-  #ifdef PROTOBUF_FORCE_COPY_IN_MOVE
-        && GetArena() != nullptr
-  #endif  // !PROTOBUF_FORCE_COPY_IN_MOVE
-    ) {
-      InternalSwap(&from);
-    } else {
-      CopyFrom(from);
-    }
-    return *this;
-  }
-
-  inline const ::google::protobuf::UnknownFieldSet& unknown_fields() const
-      ABSL_ATTRIBUTE_LIFETIME_BOUND {
-    return _internal_metadata_.unknown_fields<::google::protobuf::UnknownFieldSet>(::google::protobuf::UnknownFieldSet::default_instance);
-  }
-  inline ::google::protobuf::UnknownFieldSet* mutable_unknown_fields()
-      ABSL_ATTRIBUTE_LIFETIME_BOUND {
-    return _internal_metadata_.mutable_unknown_fields<::google::protobuf::UnknownFieldSet>();
-  }
-
-  static const ::google::protobuf::Descriptor* descriptor() {
-    return GetDescriptor();
-  }
-  static const ::google::protobuf::Descriptor* GetDescriptor() {
-    return default_instance().GetMetadata().descriptor;
-  }
-  static const ::google::protobuf::Reflection* GetReflection() {
-    return default_instance().GetMetadata().reflection;
-  }
-  static const SaveFileRequest& default_instance() {
-    return *internal_default_instance();
-  }
-  static inline const SaveFileRequest* internal_default_instance() {
-    return reinterpret_cast<const SaveFileRequest*>(
-               &_SaveFileRequest_default_instance_);
-  }
-  static constexpr int kIndexInFileMessages =
-    5;
-
-  friend void swap(SaveFileRequest& a, SaveFileRequest& b) {
-    a.Swap(&b);
-  }
-  inline void Swap(SaveFileRequest* other) {
-    if (other == this) return;
-  #ifdef PROTOBUF_FORCE_COPY_IN_SWAP
-    if (GetArena() != nullptr &&
-        GetArena() == other->GetArena()) {
-   #else  // PROTOBUF_FORCE_COPY_IN_SWAP
-    if (GetArena() == other->GetArena()) {
-  #endif  // !PROTOBUF_FORCE_COPY_IN_SWAP
-      InternalSwap(other);
-    } else {
-      ::google::protobuf::internal::GenericSwap(this, other);
-    }
-  }
-  void UnsafeArenaSwap(SaveFileRequest* other) {
-    if (other == this) return;
-    ABSL_DCHECK(GetArena() == other->GetArena());
-    InternalSwap(other);
-  }
-
-  // implements Message ----------------------------------------------
-
-  SaveFileRequest* New(::google::protobuf::Arena* arena = nullptr) const final {
-    return CreateMaybeMessage<SaveFileRequest>(arena);
-  }
-  using ::google::protobuf::Message::CopyFrom;
-  void CopyFrom(const SaveFileRequest& from);
-  using ::google::protobuf::Message::MergeFrom;
-  void MergeFrom( const SaveFileRequest& from) {
-    SaveFileRequest::MergeImpl(*this, from);
-  }
-  private:
-  static void MergeImpl(::google::protobuf::Message& to_msg, const ::google::protobuf::Message& from_msg);
-  public:
-  PROTOBUF_ATTRIBUTE_REINITIALIZES void Clear() final;
-  bool IsInitialized() const final;
-
-  ::size_t ByteSizeLong() const final;
-  const char* _InternalParse(const char* ptr, ::google::protobuf::internal::ParseContext* ctx) final;
-  ::uint8_t* _InternalSerialize(
-      ::uint8_t* target, ::google::protobuf::io::EpsCopyOutputStream* stream) const final;
-  int GetCachedSize() const { return _impl_._cached_size_.Get(); }
-
-  private:
-  ::google::protobuf::internal::CachedSize* AccessCachedSize() const final;
-  void SharedCtor(::google::protobuf::Arena* arena);
-  void SharedDtor();
-  void InternalSwap(SaveFileRequest* other);
-
-  private:
-  friend class ::google::protobuf::internal::AnyMetadata;
-  static ::absl::string_view FullMessageName() {
-    return "io.deephaven.proto.backplane.grpc.SaveFileRequest";
-  }
-  protected:
-  explicit SaveFileRequest(::google::protobuf::Arena* arena);
-  SaveFileRequest(::google::protobuf::Arena* arena, const SaveFileRequest& from);
-  public:
-
-  static const ClassData _class_data_;
-  const ::google::protobuf::Message::ClassData*GetClassData() const final;
-
-  ::google::protobuf::Metadata GetMetadata() const final;
-
-  // nested types ----------------------------------------------------
-
-  // accessors -------------------------------------------------------
-
-  enum : int {
-    kPathFieldNumber = 2,
-    kContentsFieldNumber = 3,
-    kAllowOverwriteFieldNumber = 1,
-  };
-  // string path = 2;
-  void clear_path() ;
-  const std::string& path() const;
-  template <typename Arg_ = const std::string&, typename... Args_>
-  void set_path(Arg_&& arg, Args_... args);
-  std::string* mutable_path();
-  PROTOBUF_NODISCARD std::string* release_path();
-  void set_allocated_path(std::string* value);
-
-  private:
-  const std::string& _internal_path() const;
-  inline PROTOBUF_ALWAYS_INLINE void _internal_set_path(
-      const std::string& value);
-  std::string* _internal_mutable_path();
-
-  public:
-  // bytes contents = 3;
-  void clear_contents() ;
-  const std::string& contents() const;
-  template <typename Arg_ = const std::string&, typename... Args_>
-  void set_contents(Arg_&& arg, Args_... args);
-  std::string* mutable_contents();
-  PROTOBUF_NODISCARD std::string* release_contents();
-  void set_allocated_contents(std::string* value);
-
-  private:
-  const std::string& _internal_contents() const;
-  inline PROTOBUF_ALWAYS_INLINE void _internal_set_contents(
-      const std::string& value);
-  std::string* _internal_mutable_contents();
-
-  public:
-  // bool allow_overwrite = 1;
-  void clear_allow_overwrite() ;
-  bool allow_overwrite() const;
-  void set_allow_overwrite(bool value);
-
-  private:
-  bool _internal_allow_overwrite() const;
-  void _internal_set_allow_overwrite(bool value);
-
-  public:
-  // @@protoc_insertion_point(class_scope:io.deephaven.proto.backplane.grpc.SaveFileRequest)
- private:
-  class _Internal;
-
-  friend class ::google::protobuf::internal::TcParser;
-  static const ::google::protobuf::internal::TcParseTable<
-      2, 3, 0,
-      62, 2>
-      _table_;
-  friend class ::google::protobuf::MessageLite;
-  friend class ::google::protobuf::Arena;
-  template <typename T>
-  friend class ::google::protobuf::Arena::InternalHelper;
-  using InternalArenaConstructable_ = void;
-  using DestructorSkippable_ = void;
-  struct Impl_ {
-
-        inline explicit constexpr Impl_(
-            ::google::protobuf::internal::ConstantInitialized) noexcept;
-        inline explicit Impl_(::google::protobuf::internal::InternalVisibility visibility,
-                              ::google::protobuf::Arena* arena);
-        inline explicit Impl_(::google::protobuf::internal::InternalVisibility visibility,
-                              ::google::protobuf::Arena* arena, const Impl_& from);
-    ::google::protobuf::internal::ArenaStringPtr path_;
-    ::google::protobuf::internal::ArenaStringPtr contents_;
-    bool allow_overwrite_;
-    mutable ::google::protobuf::internal::CachedSize _cached_size_;
-    PROTOBUF_TSAN_DECLARE_MEMBER
-  };
-  union { Impl_ _impl_; };
-  friend struct ::TableStruct_deephaven_2fproto_2fstorage_2eproto;
-};// -------------------------------------------------------------------
-
-class MoveItemResponse final :
-    public ::google::protobuf::internal::ZeroFieldsBase /* @@protoc_insertion_point(class_definition:io.deephaven.proto.backplane.grpc.MoveItemResponse) */ {
- public:
-  inline MoveItemResponse() : MoveItemResponse(nullptr) {}
-  template<typename = void>
-  explicit PROTOBUF_CONSTEXPR MoveItemResponse(::google::protobuf::internal::ConstantInitialized);
-
-  inline MoveItemResponse(const MoveItemResponse& from)
-      : MoveItemResponse(nullptr, from) {}
-  MoveItemResponse(MoveItemResponse&& from) noexcept
-    : MoveItemResponse() {
-    *this = ::std::move(from);
-  }
-
-  inline MoveItemResponse& operator=(const MoveItemResponse& from) {
-    CopyFrom(from);
-    return *this;
-  }
-  inline MoveItemResponse& operator=(MoveItemResponse&& from) noexcept {
-    if (this == &from) return *this;
-    if (GetArena() == from.GetArena()
-  #ifdef PROTOBUF_FORCE_COPY_IN_MOVE
-        && GetArena() != nullptr
-  #endif  // !PROTOBUF_FORCE_COPY_IN_MOVE
-    ) {
-      InternalSwap(&from);
-    } else {
-      CopyFrom(from);
-    }
-    return *this;
-  }
-
-  inline const ::google::protobuf::UnknownFieldSet& unknown_fields() const
-      ABSL_ATTRIBUTE_LIFETIME_BOUND {
-    return _internal_metadata_.unknown_fields<::google::protobuf::UnknownFieldSet>(::google::protobuf::UnknownFieldSet::default_instance);
-  }
-  inline ::google::protobuf::UnknownFieldSet* mutable_unknown_fields()
-      ABSL_ATTRIBUTE_LIFETIME_BOUND {
-    return _internal_metadata_.mutable_unknown_fields<::google::protobuf::UnknownFieldSet>();
-  }
-
-  static const ::google::protobuf::Descriptor* descriptor() {
-    return GetDescriptor();
-  }
-  static const ::google::protobuf::Descriptor* GetDescriptor() {
-    return default_instance().GetMetadata().descriptor;
-  }
-  static const ::google::protobuf::Reflection* GetReflection() {
-    return default_instance().GetMetadata().reflection;
-  }
-  static const MoveItemResponse& default_instance() {
-    return *internal_default_instance();
-  }
-  static inline const MoveItemResponse* internal_default_instance() {
-    return reinterpret_cast<const MoveItemResponse*>(
-               &_MoveItemResponse_default_instance_);
-  }
-  static constexpr int kIndexInFileMessages =
-    8;
-
-  friend void swap(MoveItemResponse& a, MoveItemResponse& b) {
-    a.Swap(&b);
-  }
-  inline void Swap(MoveItemResponse* other) {
-    if (other == this) return;
-  #ifdef PROTOBUF_FORCE_COPY_IN_SWAP
-    if (GetArena() != nullptr &&
-        GetArena() == other->GetArena()) {
-   #else  // PROTOBUF_FORCE_COPY_IN_SWAP
-    if (GetArena() == other->GetArena()) {
-  #endif  // !PROTOBUF_FORCE_COPY_IN_SWAP
-      InternalSwap(other);
-    } else {
-      ::google::protobuf::internal::GenericSwap(this, other);
-    }
-  }
-  void UnsafeArenaSwap(MoveItemResponse* other) {
-    if (other == this) return;
-    ABSL_DCHECK(GetArena() == other->GetArena());
-    InternalSwap(other);
-  }
-
-  // implements Message ----------------------------------------------
-
-  MoveItemResponse* New(::google::protobuf::Arena* arena = nullptr) const final {
-    return CreateMaybeMessage<MoveItemResponse>(arena);
-  }
-  using ::google::protobuf::internal::ZeroFieldsBase::CopyFrom;
-  inline void CopyFrom(const MoveItemResponse& from) {
-    ::google::protobuf::internal::ZeroFieldsBase::CopyImpl(*this, from);
-  }
-  using ::google::protobuf::internal::ZeroFieldsBase::MergeFrom;
-  void MergeFrom(const MoveItemResponse& from) {
-    ::google::protobuf::internal::ZeroFieldsBase::MergeImpl(*this, from);
-  }
-  public:
-
-  private:
-  friend class ::google::protobuf::internal::AnyMetadata;
-  static ::absl::string_view FullMessageName() {
-    return "io.deephaven.proto.backplane.grpc.MoveItemResponse";
-  }
-  protected:
-  explicit MoveItemResponse(::google::protobuf::Arena* arena);
-  MoveItemResponse(::google::protobuf::Arena* arena, const MoveItemResponse& from);
-  public:
-
-  ::google::protobuf::Metadata GetMetadata() const final;
-
-  // nested types ----------------------------------------------------
-
-  // accessors -------------------------------------------------------
-
-  // @@protoc_insertion_point(class_scope:io.deephaven.proto.backplane.grpc.MoveItemResponse)
- private:
-  class _Internal;
-
-  friend class ::google::protobuf::MessageLite;
-  friend class ::google::protobuf::Arena;
-  template <typename T>
-  friend class ::google::protobuf::Arena::InternalHelper;
-  using InternalArenaConstructable_ = void;
-  using DestructorSkippable_ = void;
-  struct Impl_ {
-
-        inline explicit constexpr Impl_(
-            ::google::protobuf::internal::ConstantInitialized) noexcept;
-        inline explicit Impl_(::google::protobuf::internal::InternalVisibility visibility,
-                              ::google::protobuf::Arena* arena);
-        inline explicit Impl_(::google::protobuf::internal::InternalVisibility visibility,
-                              ::google::protobuf::Arena* arena, const Impl_& from);
-    PROTOBUF_TSAN_DECLARE_MEMBER
-  };
-  friend struct ::TableStruct_deephaven_2fproto_2fstorage_2eproto;
-};// -------------------------------------------------------------------
-
-class MoveItemRequest final :
-    public ::google::protobuf::Message /* @@protoc_insertion_point(class_definition:io.deephaven.proto.backplane.grpc.MoveItemRequest) */ {
- public:
-  inline MoveItemRequest() : MoveItemRequest(nullptr) {}
-  ~MoveItemRequest() override;
-  template<typename = void>
-  explicit PROTOBUF_CONSTEXPR MoveItemRequest(::google::protobuf::internal::ConstantInitialized);
-
-  inline MoveItemRequest(const MoveItemRequest& from)
-      : MoveItemRequest(nullptr, from) {}
-  MoveItemRequest(MoveItemRequest&& from) noexcept
-    : MoveItemRequest() {
-    *this = ::std::move(from);
-  }
-
-  inline MoveItemRequest& operator=(const MoveItemRequest& from) {
-    CopyFrom(from);
-    return *this;
-  }
-  inline MoveItemRequest& operator=(MoveItemRequest&& from) noexcept {
-    if (this == &from) return *this;
-    if (GetArena() == from.GetArena()
-  #ifdef PROTOBUF_FORCE_COPY_IN_MOVE
-        && GetArena() != nullptr
-  #endif  // !PROTOBUF_FORCE_COPY_IN_MOVE
-    ) {
-      InternalSwap(&from);
-    } else {
-      CopyFrom(from);
-    }
-    return *this;
-  }
-
-  inline const ::google::protobuf::UnknownFieldSet& unknown_fields() const
-      ABSL_ATTRIBUTE_LIFETIME_BOUND {
-    return _internal_metadata_.unknown_fields<::google::protobuf::UnknownFieldSet>(::google::protobuf::UnknownFieldSet::default_instance);
-  }
-  inline ::google::protobuf::UnknownFieldSet* mutable_unknown_fields()
-      ABSL_ATTRIBUTE_LIFETIME_BOUND {
-    return _internal_metadata_.mutable_unknown_fields<::google::protobuf::UnknownFieldSet>();
-  }
-
-  static const ::google::protobuf::Descriptor* descriptor() {
-    return GetDescriptor();
-  }
-  static const ::google::protobuf::Descriptor* GetDescriptor() {
-    return default_instance().GetMetadata().descriptor;
-  }
-  static const ::google::protobuf::Reflection* GetReflection() {
-    return default_instance().GetMetadata().reflection;
-  }
-  static const MoveItemRequest& default_instance() {
-    return *internal_default_instance();
-  }
-  static inline const MoveItemRequest* internal_default_instance() {
-    return reinterpret_cast<const MoveItemRequest*>(
-               &_MoveItemRequest_default_instance_);
-  }
-  static constexpr int kIndexInFileMessages =
-    7;
-
-  friend void swap(MoveItemRequest& a, MoveItemRequest& b) {
-    a.Swap(&b);
-  }
-  inline void Swap(MoveItemRequest* other) {
-    if (other == this) return;
-  #ifdef PROTOBUF_FORCE_COPY_IN_SWAP
-    if (GetArena() != nullptr &&
-        GetArena() == other->GetArena()) {
-   #else  // PROTOBUF_FORCE_COPY_IN_SWAP
-    if (GetArena() == other->GetArena()) {
-  #endif  // !PROTOBUF_FORCE_COPY_IN_SWAP
-      InternalSwap(other);
-    } else {
-      ::google::protobuf::internal::GenericSwap(this, other);
-    }
-  }
-  void UnsafeArenaSwap(MoveItemRequest* other) {
-    if (other == this) return;
-    ABSL_DCHECK(GetArena() == other->GetArena());
-    InternalSwap(other);
-  }
-
-  // implements Message ----------------------------------------------
-
-  MoveItemRequest* New(::google::protobuf::Arena* arena = nullptr) const final {
-    return CreateMaybeMessage<MoveItemRequest>(arena);
-  }
-  using ::google::protobuf::Message::CopyFrom;
-  void CopyFrom(const MoveItemRequest& from);
-  using ::google::protobuf::Message::MergeFrom;
-  void MergeFrom( const MoveItemRequest& from) {
-    MoveItemRequest::MergeImpl(*this, from);
-  }
-  private:
-  static void MergeImpl(::google::protobuf::Message& to_msg, const ::google::protobuf::Message& from_msg);
-  public:
-  PROTOBUF_ATTRIBUTE_REINITIALIZES void Clear() final;
-  bool IsInitialized() const final;
-
-  ::size_t ByteSizeLong() const final;
-  const char* _InternalParse(const char* ptr, ::google::protobuf::internal::ParseContext* ctx) final;
-  ::uint8_t* _InternalSerialize(
-      ::uint8_t* target, ::google::protobuf::io::EpsCopyOutputStream* stream) const final;
-  int GetCachedSize() const { return _impl_._cached_size_.Get(); }
-
-  private:
-  ::google::protobuf::internal::CachedSize* AccessCachedSize() const final;
-  void SharedCtor(::google::protobuf::Arena* arena);
-  void SharedDtor();
-  void InternalSwap(MoveItemRequest* other);
-
-  private:
-  friend class ::google::protobuf::internal::AnyMetadata;
-  static ::absl::string_view FullMessageName() {
-    return "io.deephaven.proto.backplane.grpc.MoveItemRequest";
-  }
-  protected:
-  explicit MoveItemRequest(::google::protobuf::Arena* arena);
-  MoveItemRequest(::google::protobuf::Arena* arena, const MoveItemRequest& from);
-  public:
-
-  static const ClassData _class_data_;
-  const ::google::protobuf::Message::ClassData*GetClassData() const final;
-
-  ::google::protobuf::Metadata GetMetadata() const final;
-
-  // nested types ----------------------------------------------------
-
-  // accessors -------------------------------------------------------
-
-  enum : int {
-    kOldPathFieldNumber = 1,
-    kNewPathFieldNumber = 2,
-    kAllowOverwriteFieldNumber = 3,
-  };
-  // string old_path = 1;
-  void clear_old_path() ;
-  const std::string& old_path() const;
-  template <typename Arg_ = const std::string&, typename... Args_>
-  void set_old_path(Arg_&& arg, Args_... args);
-  std::string* mutable_old_path();
-  PROTOBUF_NODISCARD std::string* release_old_path();
-  void set_allocated_old_path(std::string* value);
-
-  private:
-  const std::string& _internal_old_path() const;
-  inline PROTOBUF_ALWAYS_INLINE void _internal_set_old_path(
-      const std::string& value);
-  std::string* _internal_mutable_old_path();
-
-  public:
-  // string new_path = 2;
-  void clear_new_path() ;
-  const std::string& new_path() const;
-  template <typename Arg_ = const std::string&, typename... Args_>
-  void set_new_path(Arg_&& arg, Args_... args);
-  std::string* mutable_new_path();
-  PROTOBUF_NODISCARD std::string* release_new_path();
-  void set_allocated_new_path(std::string* value);
-
-  private:
-  const std::string& _internal_new_path() const;
-  inline PROTOBUF_ALWAYS_INLINE void _internal_set_new_path(
-      const std::string& value);
-  std::string* _internal_mutable_new_path();
-
-  public:
-  // bool allow_overwrite = 3;
-  void clear_allow_overwrite() ;
-  bool allow_overwrite() const;
-  void set_allow_overwrite(bool value);
-
-  private:
-  bool _internal_allow_overwrite() const;
-  void _internal_set_allow_overwrite(bool value);
-
-  public:
-  // @@protoc_insertion_point(class_scope:io.deephaven.proto.backplane.grpc.MoveItemRequest)
- private:
-  class _Internal;
-
-  friend class ::google::protobuf::internal::TcParser;
-  static const ::google::protobuf::internal::TcParseTable<
-      2, 3, 0,
-      74, 2>
-      _table_;
-  friend class ::google::protobuf::MessageLite;
-  friend class ::google::protobuf::Arena;
-  template <typename T>
-  friend class ::google::protobuf::Arena::InternalHelper;
-  using InternalArenaConstructable_ = void;
-  using DestructorSkippable_ = void;
-  struct Impl_ {
-
-        inline explicit constexpr Impl_(
-            ::google::protobuf::internal::ConstantInitialized) noexcept;
-        inline explicit Impl_(::google::protobuf::internal::InternalVisibility visibility,
-                              ::google::protobuf::Arena* arena);
-        inline explicit Impl_(::google::protobuf::internal::InternalVisibility visibility,
-                              ::google::protobuf::Arena* arena, const Impl_& from);
-    ::google::protobuf::internal::ArenaStringPtr old_path_;
-    ::google::protobuf::internal::ArenaStringPtr new_path_;
-    bool allow_overwrite_;
-    mutable ::google::protobuf::internal::CachedSize _cached_size_;
-    PROTOBUF_TSAN_DECLARE_MEMBER
-  };
-  union { Impl_ _impl_; };
-  friend struct ::TableStruct_deephaven_2fproto_2fstorage_2eproto;
-};// -------------------------------------------------------------------
-
-class ListItemsRequest final :
-    public ::google::protobuf::Message /* @@protoc_insertion_point(class_definition:io.deephaven.proto.backplane.grpc.ListItemsRequest) */ {
- public:
-  inline ListItemsRequest() : ListItemsRequest(nullptr) {}
-  ~ListItemsRequest() override;
-  template<typename = void>
-  explicit PROTOBUF_CONSTEXPR ListItemsRequest(::google::protobuf::internal::ConstantInitialized);
-
-  inline ListItemsRequest(const ListItemsRequest& from)
-      : ListItemsRequest(nullptr, from) {}
-  ListItemsRequest(ListItemsRequest&& from) noexcept
-    : ListItemsRequest() {
-    *this = ::std::move(from);
-  }
-
-  inline ListItemsRequest& operator=(const ListItemsRequest& from) {
-    CopyFrom(from);
-    return *this;
-  }
-  inline ListItemsRequest& operator=(ListItemsRequest&& from) noexcept {
-    if (this == &from) return *this;
-    if (GetArena() == from.GetArena()
-  #ifdef PROTOBUF_FORCE_COPY_IN_MOVE
-        && GetArena() != nullptr
-  #endif  // !PROTOBUF_FORCE_COPY_IN_MOVE
-    ) {
-      InternalSwap(&from);
-    } else {
-      CopyFrom(from);
-    }
-    return *this;
-  }
-
-  inline const ::google::protobuf::UnknownFieldSet& unknown_fields() const
-      ABSL_ATTRIBUTE_LIFETIME_BOUND {
-    return _internal_metadata_.unknown_fields<::google::protobuf::UnknownFieldSet>(::google::protobuf::UnknownFieldSet::default_instance);
-  }
-  inline ::google::protobuf::UnknownFieldSet* mutable_unknown_fields()
-      ABSL_ATTRIBUTE_LIFETIME_BOUND {
-    return _internal_metadata_.mutable_unknown_fields<::google::protobuf::UnknownFieldSet>();
-  }
-
-  static const ::google::protobuf::Descriptor* descriptor() {
-    return GetDescriptor();
-  }
-  static const ::google::protobuf::Descriptor* GetDescriptor() {
-    return default_instance().GetMetadata().descriptor;
-  }
-  static const ::google::protobuf::Reflection* GetReflection() {
-    return default_instance().GetMetadata().reflection;
-  }
-  static const ListItemsRequest& default_instance() {
-    return *internal_default_instance();
-  }
-  static inline const ListItemsRequest* internal_default_instance() {
-    return reinterpret_cast<const ListItemsRequest*>(
-               &_ListItemsRequest_default_instance_);
-  }
-  static constexpr int kIndexInFileMessages =
-    0;
-
-  friend void swap(ListItemsRequest& a, ListItemsRequest& b) {
-    a.Swap(&b);
-  }
-  inline void Swap(ListItemsRequest* other) {
-    if (other == this) return;
-  #ifdef PROTOBUF_FORCE_COPY_IN_SWAP
-    if (GetArena() != nullptr &&
-        GetArena() == other->GetArena()) {
-   #else  // PROTOBUF_FORCE_COPY_IN_SWAP
-    if (GetArena() == other->GetArena()) {
-  #endif  // !PROTOBUF_FORCE_COPY_IN_SWAP
-      InternalSwap(other);
-    } else {
-      ::google::protobuf::internal::GenericSwap(this, other);
-    }
-  }
-  void UnsafeArenaSwap(ListItemsRequest* other) {
-    if (other == this) return;
-    ABSL_DCHECK(GetArena() == other->GetArena());
-    InternalSwap(other);
-  }
-
-  // implements Message ----------------------------------------------
-
-  ListItemsRequest* New(::google::protobuf::Arena* arena = nullptr) const final {
-    return CreateMaybeMessage<ListItemsRequest>(arena);
-  }
-  using ::google::protobuf::Message::CopyFrom;
-  void CopyFrom(const ListItemsRequest& from);
-  using ::google::protobuf::Message::MergeFrom;
-  void MergeFrom( const ListItemsRequest& from) {
-    ListItemsRequest::MergeImpl(*this, from);
-  }
-  private:
-  static void MergeImpl(::google::protobuf::Message& to_msg, const ::google::protobuf::Message& from_msg);
-  public:
-  PROTOBUF_ATTRIBUTE_REINITIALIZES void Clear() final;
-  bool IsInitialized() const final;
-
-  ::size_t ByteSizeLong() const final;
-  const char* _InternalParse(const char* ptr, ::google::protobuf::internal::ParseContext* ctx) final;
-  ::uint8_t* _InternalSerialize(
-      ::uint8_t* target, ::google::protobuf::io::EpsCopyOutputStream* stream) const final;
-  int GetCachedSize() const { return _impl_._cached_size_.Get(); }
-
-  private:
-  ::google::protobuf::internal::CachedSize* AccessCachedSize() const final;
-  void SharedCtor(::google::protobuf::Arena* arena);
-  void SharedDtor();
-  void InternalSwap(ListItemsRequest* other);
-
-  private:
-  friend class ::google::protobuf::internal::AnyMetadata;
-  static ::absl::string_view FullMessageName() {
-    return "io.deephaven.proto.backplane.grpc.ListItemsRequest";
-  }
-  protected:
-  explicit ListItemsRequest(::google::protobuf::Arena* arena);
-  ListItemsRequest(::google::protobuf::Arena* arena, const ListItemsRequest& from);
-  public:
-
-  static const ClassData _class_data_;
-  const ::google::protobuf::Message::ClassData*GetClassData() const final;
-
-  ::google::protobuf::Metadata GetMetadata() const final;
-
-  // nested types ----------------------------------------------------
-
-  // accessors -------------------------------------------------------
-
-  enum : int {
-    kPathFieldNumber = 1,
-    kFilterGlobFieldNumber = 4,
-  };
-  // string path = 1;
-  void clear_path() ;
-  const std::string& path() const;
-  template <typename Arg_ = const std::string&, typename... Args_>
-  void set_path(Arg_&& arg, Args_... args);
-  std::string* mutable_path();
-  PROTOBUF_NODISCARD std::string* release_path();
-  void set_allocated_path(std::string* value);
-
-  private:
-  const std::string& _internal_path() const;
-  inline PROTOBUF_ALWAYS_INLINE void _internal_set_path(
-      const std::string& value);
-  std::string* _internal_mutable_path();
-
-  public:
-  // optional string filter_glob = 4;
-  bool has_filter_glob() const;
-  void clear_filter_glob() ;
-  const std::string& filter_glob() const;
-  template <typename Arg_ = const std::string&, typename... Args_>
-  void set_filter_glob(Arg_&& arg, Args_... args);
-  std::string* mutable_filter_glob();
-  PROTOBUF_NODISCARD std::string* release_filter_glob();
-  void set_allocated_filter_glob(std::string* value);
-
-  private:
-  const std::string& _internal_filter_glob() const;
-  inline PROTOBUF_ALWAYS_INLINE void _internal_set_filter_glob(
-      const std::string& value);
-  std::string* _internal_mutable_filter_glob();
-
-  public:
-  // @@protoc_insertion_point(class_scope:io.deephaven.proto.backplane.grpc.ListItemsRequest)
- private:
-  class _Internal;
-
-  friend class ::google::protobuf::internal::TcParser;
-  static const ::google::protobuf::internal::TcParseTable<
-      1, 2, 0,
-      74, 2>
-      _table_;
-  friend class ::google::protobuf::MessageLite;
-  friend class ::google::protobuf::Arena;
-  template <typename T>
-  friend class ::google::protobuf::Arena::InternalHelper;
-  using InternalArenaConstructable_ = void;
-  using DestructorSkippable_ = void;
-  struct Impl_ {
-
-        inline explicit constexpr Impl_(
-            ::google::protobuf::internal::ConstantInitialized) noexcept;
-        inline explicit Impl_(::google::protobuf::internal::InternalVisibility visibility,
-                              ::google::protobuf::Arena* arena);
-        inline explicit Impl_(::google::protobuf::internal::InternalVisibility visibility,
-                              ::google::protobuf::Arena* arena, const Impl_& from);
-    ::google::protobuf::internal::HasBits<1> _has_bits_;
-    mutable ::google::protobuf::internal::CachedSize _cached_size_;
-    ::google::protobuf::internal::ArenaStringPtr path_;
-    ::google::protobuf::internal::ArenaStringPtr filter_glob_;
-    PROTOBUF_TSAN_DECLARE_MEMBER
-  };
-  union { Impl_ _impl_; };
-  friend struct ::TableStruct_deephaven_2fproto_2fstorage_2eproto;
-};// -------------------------------------------------------------------
-
-class ItemInfo final :
-    public ::google::protobuf::Message /* @@protoc_insertion_point(class_definition:io.deephaven.proto.backplane.grpc.ItemInfo) */ {
- public:
-  inline ItemInfo() : ItemInfo(nullptr) {}
-  ~ItemInfo() override;
-  template<typename = void>
-  explicit PROTOBUF_CONSTEXPR ItemInfo(::google::protobuf::internal::ConstantInitialized);
-
-  inline ItemInfo(const ItemInfo& from)
-      : ItemInfo(nullptr, from) {}
-  ItemInfo(ItemInfo&& from) noexcept
-    : ItemInfo() {
-    *this = ::std::move(from);
-  }
-
-  inline ItemInfo& operator=(const ItemInfo& from) {
-    CopyFrom(from);
-    return *this;
-  }
-  inline ItemInfo& operator=(ItemInfo&& from) noexcept {
-    if (this == &from) return *this;
-    if (GetArena() == from.GetArena()
-  #ifdef PROTOBUF_FORCE_COPY_IN_MOVE
-        && GetArena() != nullptr
-  #endif  // !PROTOBUF_FORCE_COPY_IN_MOVE
-    ) {
-      InternalSwap(&from);
-    } else {
-      CopyFrom(from);
-    }
-    return *this;
-  }
-
-  inline const ::google::protobuf::UnknownFieldSet& unknown_fields() const
-      ABSL_ATTRIBUTE_LIFETIME_BOUND {
-    return _internal_metadata_.unknown_fields<::google::protobuf::UnknownFieldSet>(::google::protobuf::UnknownFieldSet::default_instance);
-  }
-  inline ::google::protobuf::UnknownFieldSet* mutable_unknown_fields()
-      ABSL_ATTRIBUTE_LIFETIME_BOUND {
-    return _internal_metadata_.mutable_unknown_fields<::google::protobuf::UnknownFieldSet>();
-  }
-
-  static const ::google::protobuf::Descriptor* descriptor() {
-    return GetDescriptor();
-  }
-  static const ::google::protobuf::Descriptor* GetDescriptor() {
-    return default_instance().GetMetadata().descriptor;
-  }
-  static const ::google::protobuf::Reflection* GetReflection() {
-    return default_instance().GetMetadata().reflection;
-  }
-  static const ItemInfo& default_instance() {
-    return *internal_default_instance();
-  }
-  static inline const ItemInfo* internal_default_instance() {
-    return reinterpret_cast<const ItemInfo*>(
-               &_ItemInfo_default_instance_);
-  }
-  static constexpr int kIndexInFileMessages =
-    1;
-
-  friend void swap(ItemInfo& a, ItemInfo& b) {
-    a.Swap(&b);
-  }
-  inline void Swap(ItemInfo* other) {
-    if (other == this) return;
-  #ifdef PROTOBUF_FORCE_COPY_IN_SWAP
-    if (GetArena() != nullptr &&
-        GetArena() == other->GetArena()) {
-   #else  // PROTOBUF_FORCE_COPY_IN_SWAP
-    if (GetArena() == other->GetArena()) {
-  #endif  // !PROTOBUF_FORCE_COPY_IN_SWAP
-      InternalSwap(other);
-    } else {
-      ::google::protobuf::internal::GenericSwap(this, other);
-    }
-  }
-  void UnsafeArenaSwap(ItemInfo* other) {
-    if (other == this) return;
-    ABSL_DCHECK(GetArena() == other->GetArena());
-    InternalSwap(other);
-  }
-
-  // implements Message ----------------------------------------------
-
-  ItemInfo* New(::google::protobuf::Arena* arena = nullptr) const final {
-    return CreateMaybeMessage<ItemInfo>(arena);
-  }
-  using ::google::protobuf::Message::CopyFrom;
-  void CopyFrom(const ItemInfo& from);
-  using ::google::protobuf::Message::MergeFrom;
-  void MergeFrom( const ItemInfo& from) {
-    ItemInfo::MergeImpl(*this, from);
-  }
-  private:
-  static void MergeImpl(::google::protobuf::Message& to_msg, const ::google::protobuf::Message& from_msg);
-  public:
-  PROTOBUF_ATTRIBUTE_REINITIALIZES void Clear() final;
-  bool IsInitialized() const final;
-
-  ::size_t ByteSizeLong() const final;
-  const char* _InternalParse(const char* ptr, ::google::protobuf::internal::ParseContext* ctx) final;
-  ::uint8_t* _InternalSerialize(
-      ::uint8_t* target, ::google::protobuf::io::EpsCopyOutputStream* stream) const final;
-  int GetCachedSize() const { return _impl_._cached_size_.Get(); }
-
-  private:
-  ::google::protobuf::internal::CachedSize* AccessCachedSize() const final;
-  void SharedCtor(::google::protobuf::Arena* arena);
-  void SharedDtor();
-  void InternalSwap(ItemInfo* other);
-
-  private:
-  friend class ::google::protobuf::internal::AnyMetadata;
-  static ::absl::string_view FullMessageName() {
-    return "io.deephaven.proto.backplane.grpc.ItemInfo";
-  }
-  protected:
-  explicit ItemInfo(::google::protobuf::Arena* arena);
-  ItemInfo(::google::protobuf::Arena* arena, const ItemInfo& from);
-  public:
-
-  static const ClassData _class_data_;
-  const ::google::protobuf::Message::ClassData*GetClassData() const final;
-
-  ::google::protobuf::Metadata GetMetadata() const final;
-
-  // nested types ----------------------------------------------------
-
-  // accessors -------------------------------------------------------
-
-  enum : int {
-    kPathFieldNumber = 1,
-    kEtagFieldNumber = 4,
-    kSizeFieldNumber = 3,
-    kTypeFieldNumber = 2,
-  };
-  // string path = 1;
-  void clear_path() ;
-  const std::string& path() const;
-  template <typename Arg_ = const std::string&, typename... Args_>
-  void set_path(Arg_&& arg, Args_... args);
-  std::string* mutable_path();
-  PROTOBUF_NODISCARD std::string* release_path();
-  void set_allocated_path(std::string* value);
-
-  private:
-  const std::string& _internal_path() const;
-  inline PROTOBUF_ALWAYS_INLINE void _internal_set_path(
-      const std::string& value);
-  std::string* _internal_mutable_path();
-
-  public:
-  // optional string etag = 4;
-  bool has_etag() const;
-  void clear_etag() ;
-  const std::string& etag() const;
-  template <typename Arg_ = const std::string&, typename... Args_>
-  void set_etag(Arg_&& arg, Args_... args);
-  std::string* mutable_etag();
-  PROTOBUF_NODISCARD std::string* release_etag();
-  void set_allocated_etag(std::string* value);
-
-  private:
-  const std::string& _internal_etag() const;
-  inline PROTOBUF_ALWAYS_INLINE void _internal_set_etag(
-      const std::string& value);
-  std::string* _internal_mutable_etag();
-
-  public:
-  // sint64 size = 3 [jstype = JS_STRING];
-  void clear_size() ;
-  ::int64_t size() const;
-  void set_size(::int64_t value);
-
-  private:
-  ::int64_t _internal_size() const;
-  void _internal_set_size(::int64_t value);
-
-  public:
-  // .io.deephaven.proto.backplane.grpc.ItemType type = 2;
-  void clear_type() ;
-  ::io::deephaven::proto::backplane::grpc::ItemType type() const;
-  void set_type(::io::deephaven::proto::backplane::grpc::ItemType value);
-
-  private:
-  ::io::deephaven::proto::backplane::grpc::ItemType _internal_type() const;
-  void _internal_set_type(::io::deephaven::proto::backplane::grpc::ItemType value);
-
-  public:
-  // @@protoc_insertion_point(class_scope:io.deephaven.proto.backplane.grpc.ItemInfo)
- private:
-  class _Internal;
-
-  friend class ::google::protobuf::internal::TcParser;
-  static const ::google::protobuf::internal::TcParseTable<
-      2, 4, 0,
-      59, 2>
-      _table_;
-  friend class ::google::protobuf::MessageLite;
-  friend class ::google::protobuf::Arena;
-  template <typename T>
-  friend class ::google::protobuf::Arena::InternalHelper;
-  using InternalArenaConstructable_ = void;
-  using DestructorSkippable_ = void;
-  struct Impl_ {
-
-        inline explicit constexpr Impl_(
-            ::google::protobuf::internal::ConstantInitialized) noexcept;
-        inline explicit Impl_(::google::protobuf::internal::InternalVisibility visibility,
-                              ::google::protobuf::Arena* arena);
-        inline explicit Impl_(::google::protobuf::internal::InternalVisibility visibility,
-                              ::google::protobuf::Arena* arena, const Impl_& from);
-    ::google::protobuf::internal::HasBits<1> _has_bits_;
-    mutable ::google::protobuf::internal::CachedSize _cached_size_;
-    ::google::protobuf::internal::ArenaStringPtr path_;
-    ::google::protobuf::internal::ArenaStringPtr etag_;
-    ::int64_t size_;
-    int type_;
-    PROTOBUF_TSAN_DECLARE_MEMBER
-  };
-  union { Impl_ _impl_; };
-  friend struct ::TableStruct_deephaven_2fproto_2fstorage_2eproto;
-};// -------------------------------------------------------------------
-
-class FetchFileResponse final :
-    public ::google::protobuf::Message /* @@protoc_insertion_point(class_definition:io.deephaven.proto.backplane.grpc.FetchFileResponse) */ {
- public:
-  inline FetchFileResponse() : FetchFileResponse(nullptr) {}
-  ~FetchFileResponse() override;
-  template<typename = void>
-  explicit PROTOBUF_CONSTEXPR FetchFileResponse(::google::protobuf::internal::ConstantInitialized);
-
-  inline FetchFileResponse(const FetchFileResponse& from)
-      : FetchFileResponse(nullptr, from) {}
-  FetchFileResponse(FetchFileResponse&& from) noexcept
-    : FetchFileResponse() {
-    *this = ::std::move(from);
-  }
-
-  inline FetchFileResponse& operator=(const FetchFileResponse& from) {
-    CopyFrom(from);
-    return *this;
-  }
-  inline FetchFileResponse& operator=(FetchFileResponse&& from) noexcept {
-    if (this == &from) return *this;
-    if (GetArena() == from.GetArena()
-  #ifdef PROTOBUF_FORCE_COPY_IN_MOVE
-        && GetArena() != nullptr
-  #endif  // !PROTOBUF_FORCE_COPY_IN_MOVE
-    ) {
-      InternalSwap(&from);
-    } else {
-      CopyFrom(from);
-    }
-    return *this;
-  }
-
-  inline const ::google::protobuf::UnknownFieldSet& unknown_fields() const
-      ABSL_ATTRIBUTE_LIFETIME_BOUND {
-    return _internal_metadata_.unknown_fields<::google::protobuf::UnknownFieldSet>(::google::protobuf::UnknownFieldSet::default_instance);
-  }
-  inline ::google::protobuf::UnknownFieldSet* mutable_unknown_fields()
-      ABSL_ATTRIBUTE_LIFETIME_BOUND {
-    return _internal_metadata_.mutable_unknown_fields<::google::protobuf::UnknownFieldSet>();
-  }
-
-  static const ::google::protobuf::Descriptor* descriptor() {
-    return GetDescriptor();
-  }
-  static const ::google::protobuf::Descriptor* GetDescriptor() {
-    return default_instance().GetMetadata().descriptor;
-  }
-  static const ::google::protobuf::Reflection* GetReflection() {
-    return default_instance().GetMetadata().reflection;
-  }
-  static const FetchFileResponse& default_instance() {
-    return *internal_default_instance();
-  }
-  static inline const FetchFileResponse* internal_default_instance() {
-    return reinterpret_cast<const FetchFileResponse*>(
-               &_FetchFileResponse_default_instance_);
-  }
-  static constexpr int kIndexInFileMessages =
-    4;
-
-  friend void swap(FetchFileResponse& a, FetchFileResponse& b) {
-    a.Swap(&b);
-  }
-  inline void Swap(FetchFileResponse* other) {
-    if (other == this) return;
-  #ifdef PROTOBUF_FORCE_COPY_IN_SWAP
-    if (GetArena() != nullptr &&
-        GetArena() == other->GetArena()) {
-   #else  // PROTOBUF_FORCE_COPY_IN_SWAP
-    if (GetArena() == other->GetArena()) {
-  #endif  // !PROTOBUF_FORCE_COPY_IN_SWAP
-      InternalSwap(other);
-    } else {
-      ::google::protobuf::internal::GenericSwap(this, other);
-    }
-  }
-  void UnsafeArenaSwap(FetchFileResponse* other) {
-    if (other == this) return;
-    ABSL_DCHECK(GetArena() == other->GetArena());
-    InternalSwap(other);
-  }
-
-  // implements Message ----------------------------------------------
-
-  FetchFileResponse* New(::google::protobuf::Arena* arena = nullptr) const final {
-    return CreateMaybeMessage<FetchFileResponse>(arena);
-  }
-  using ::google::protobuf::Message::CopyFrom;
-  void CopyFrom(const FetchFileResponse& from);
-  using ::google::protobuf::Message::MergeFrom;
-  void MergeFrom( const FetchFileResponse& from) {
-    FetchFileResponse::MergeImpl(*this, from);
-  }
-  private:
-  static void MergeImpl(::google::protobuf::Message& to_msg, const ::google::protobuf::Message& from_msg);
-  public:
-  PROTOBUF_ATTRIBUTE_REINITIALIZES void Clear() final;
-  bool IsInitialized() const final;
-
-  ::size_t ByteSizeLong() const final;
-  const char* _InternalParse(const char* ptr, ::google::protobuf::internal::ParseContext* ctx) final;
-  ::uint8_t* _InternalSerialize(
-      ::uint8_t* target, ::google::protobuf::io::EpsCopyOutputStream* stream) const final;
-  int GetCachedSize() const { return _impl_._cached_size_.Get(); }
-
-  private:
-  ::google::protobuf::internal::CachedSize* AccessCachedSize() const final;
-  void SharedCtor(::google::protobuf::Arena* arena);
-  void SharedDtor();
-  void InternalSwap(FetchFileResponse* other);
-
-  private:
-  friend class ::google::protobuf::internal::AnyMetadata;
-  static ::absl::string_view FullMessageName() {
-    return "io.deephaven.proto.backplane.grpc.FetchFileResponse";
-  }
-  protected:
-  explicit FetchFileResponse(::google::protobuf::Arena* arena);
-  FetchFileResponse(::google::protobuf::Arena* arena, const FetchFileResponse& from);
-  public:
-
-  static const ClassData _class_data_;
-  const ::google::protobuf::Message::ClassData*GetClassData() const final;
-
-  ::google::protobuf::Metadata GetMetadata() const final;
-
-  // nested types ----------------------------------------------------
-
-  // accessors -------------------------------------------------------
-
-  enum : int {
-    kContentsFieldNumber = 1,
-    kEtagFieldNumber = 2,
-  };
-  // bytes contents = 1;
-  void clear_contents() ;
-  const std::string& contents() const;
-  template <typename Arg_ = const std::string&, typename... Args_>
-  void set_contents(Arg_&& arg, Args_... args);
-  std::string* mutable_contents();
-  PROTOBUF_NODISCARD std::string* release_contents();
-  void set_allocated_contents(std::string* value);
-
-  private:
-  const std::string& _internal_contents() const;
-  inline PROTOBUF_ALWAYS_INLINE void _internal_set_contents(
-      const std::string& value);
-  std::string* _internal_mutable_contents();
-
-  public:
-  // optional string etag = 2;
-  bool has_etag() const;
-  void clear_etag() ;
-  const std::string& etag() const;
-  template <typename Arg_ = const std::string&, typename... Args_>
-  void set_etag(Arg_&& arg, Args_... args);
-  std::string* mutable_etag();
-  PROTOBUF_NODISCARD std::string* release_etag();
-  void set_allocated_etag(std::string* value);
-
-  private:
-  const std::string& _internal_etag() const;
-  inline PROTOBUF_ALWAYS_INLINE void _internal_set_etag(
-      const std::string& value);
-  std::string* _internal_mutable_etag();
-
-  public:
-  // @@protoc_insertion_point(class_scope:io.deephaven.proto.backplane.grpc.FetchFileResponse)
- private:
-  class _Internal;
-
-  friend class ::google::protobuf::internal::TcParser;
-  static const ::google::protobuf::internal::TcParseTable<
-      1, 2, 0,
-      64, 2>
-      _table_;
-  friend class ::google::protobuf::MessageLite;
-  friend class ::google::protobuf::Arena;
-  template <typename T>
-  friend class ::google::protobuf::Arena::InternalHelper;
-  using InternalArenaConstructable_ = void;
-  using DestructorSkippable_ = void;
-  struct Impl_ {
-
-        inline explicit constexpr Impl_(
-            ::google::protobuf::internal::ConstantInitialized) noexcept;
-        inline explicit Impl_(::google::protobuf::internal::InternalVisibility visibility,
-                              ::google::protobuf::Arena* arena);
-        inline explicit Impl_(::google::protobuf::internal::InternalVisibility visibility,
-                              ::google::protobuf::Arena* arena, const Impl_& from);
-    ::google::protobuf::internal::HasBits<1> _has_bits_;
-    mutable ::google::protobuf::internal::CachedSize _cached_size_;
-    ::google::protobuf::internal::ArenaStringPtr contents_;
-    ::google::protobuf::internal::ArenaStringPtr etag_;
-    PROTOBUF_TSAN_DECLARE_MEMBER
-  };
-  union { Impl_ _impl_; };
-  friend struct ::TableStruct_deephaven_2fproto_2fstorage_2eproto;
-};// -------------------------------------------------------------------
-
-class FetchFileRequest final :
-    public ::google::protobuf::Message /* @@protoc_insertion_point(class_definition:io.deephaven.proto.backplane.grpc.FetchFileRequest) */ {
- public:
-  inline FetchFileRequest() : FetchFileRequest(nullptr) {}
-  ~FetchFileRequest() override;
-  template<typename = void>
-  explicit PROTOBUF_CONSTEXPR FetchFileRequest(::google::protobuf::internal::ConstantInitialized);
-
-  inline FetchFileRequest(const FetchFileRequest& from)
-      : FetchFileRequest(nullptr, from) {}
-  FetchFileRequest(FetchFileRequest&& from) noexcept
-    : FetchFileRequest() {
-    *this = ::std::move(from);
-  }
-
-  inline FetchFileRequest& operator=(const FetchFileRequest& from) {
-    CopyFrom(from);
-    return *this;
-  }
-  inline FetchFileRequest& operator=(FetchFileRequest&& from) noexcept {
-    if (this == &from) return *this;
-    if (GetArena() == from.GetArena()
-  #ifdef PROTOBUF_FORCE_COPY_IN_MOVE
-        && GetArena() != nullptr
-  #endif  // !PROTOBUF_FORCE_COPY_IN_MOVE
-    ) {
-      InternalSwap(&from);
-    } else {
-      CopyFrom(from);
-    }
-    return *this;
-  }
-
-  inline const ::google::protobuf::UnknownFieldSet& unknown_fields() const
-      ABSL_ATTRIBUTE_LIFETIME_BOUND {
-    return _internal_metadata_.unknown_fields<::google::protobuf::UnknownFieldSet>(::google::protobuf::UnknownFieldSet::default_instance);
-  }
-  inline ::google::protobuf::UnknownFieldSet* mutable_unknown_fields()
-      ABSL_ATTRIBUTE_LIFETIME_BOUND {
-    return _internal_metadata_.mutable_unknown_fields<::google::protobuf::UnknownFieldSet>();
-  }
-
-  static const ::google::protobuf::Descriptor* descriptor() {
-    return GetDescriptor();
-  }
-  static const ::google::protobuf::Descriptor* GetDescriptor() {
-    return default_instance().GetMetadata().descriptor;
-  }
-  static const ::google::protobuf::Reflection* GetReflection() {
-    return default_instance().GetMetadata().reflection;
-  }
-  static const FetchFileRequest& default_instance() {
-    return *internal_default_instance();
-  }
-  static inline const FetchFileRequest* internal_default_instance() {
-    return reinterpret_cast<const FetchFileRequest*>(
-               &_FetchFileRequest_default_instance_);
-  }
-  static constexpr int kIndexInFileMessages =
-    3;
-
-  friend void swap(FetchFileRequest& a, FetchFileRequest& b) {
-    a.Swap(&b);
-  }
-  inline void Swap(FetchFileRequest* other) {
-    if (other == this) return;
-  #ifdef PROTOBUF_FORCE_COPY_IN_SWAP
-    if (GetArena() != nullptr &&
-        GetArena() == other->GetArena()) {
-   #else  // PROTOBUF_FORCE_COPY_IN_SWAP
-    if (GetArena() == other->GetArena()) {
-  #endif  // !PROTOBUF_FORCE_COPY_IN_SWAP
-      InternalSwap(other);
-    } else {
-      ::google::protobuf::internal::GenericSwap(this, other);
-    }
-  }
-  void UnsafeArenaSwap(FetchFileRequest* other) {
-    if (other == this) return;
-    ABSL_DCHECK(GetArena() == other->GetArena());
-    InternalSwap(other);
-  }
-
-  // implements Message ----------------------------------------------
-
-  FetchFileRequest* New(::google::protobuf::Arena* arena = nullptr) const final {
-    return CreateMaybeMessage<FetchFileRequest>(arena);
-  }
-  using ::google::protobuf::Message::CopyFrom;
-  void CopyFrom(const FetchFileRequest& from);
-  using ::google::protobuf::Message::MergeFrom;
-  void MergeFrom( const FetchFileRequest& from) {
-    FetchFileRequest::MergeImpl(*this, from);
-  }
-  private:
-  static void MergeImpl(::google::protobuf::Message& to_msg, const ::google::protobuf::Message& from_msg);
-  public:
-  PROTOBUF_ATTRIBUTE_REINITIALIZES void Clear() final;
-  bool IsInitialized() const final;
-
-  ::size_t ByteSizeLong() const final;
-  const char* _InternalParse(const char* ptr, ::google::protobuf::internal::ParseContext* ctx) final;
-  ::uint8_t* _InternalSerialize(
-      ::uint8_t* target, ::google::protobuf::io::EpsCopyOutputStream* stream) const final;
-  int GetCachedSize() const { return _impl_._cached_size_.Get(); }
-
-  private:
-  ::google::protobuf::internal::CachedSize* AccessCachedSize() const final;
-  void SharedCtor(::google::protobuf::Arena* arena);
-  void SharedDtor();
-  void InternalSwap(FetchFileRequest* other);
-
-  private:
-  friend class ::google::protobuf::internal::AnyMetadata;
-  static ::absl::string_view FullMessageName() {
-    return "io.deephaven.proto.backplane.grpc.FetchFileRequest";
-  }
-  protected:
-  explicit FetchFileRequest(::google::protobuf::Arena* arena);
-  FetchFileRequest(::google::protobuf::Arena* arena, const FetchFileRequest& from);
-  public:
-
-  static const ClassData _class_data_;
-  const ::google::protobuf::Message::ClassData*GetClassData() const final;
-
-  ::google::protobuf::Metadata GetMetadata() const final;
-
-  // nested types ----------------------------------------------------
-
-  // accessors -------------------------------------------------------
-
-  enum : int {
-    kPathFieldNumber = 1,
-    kEtagFieldNumber = 2,
-  };
-  // string path = 1;
-  void clear_path() ;
-  const std::string& path() const;
-  template <typename Arg_ = const std::string&, typename... Args_>
-  void set_path(Arg_&& arg, Args_... args);
-  std::string* mutable_path();
-  PROTOBUF_NODISCARD std::string* release_path();
-  void set_allocated_path(std::string* value);
-
-  private:
-  const std::string& _internal_path() const;
-  inline PROTOBUF_ALWAYS_INLINE void _internal_set_path(
-      const std::string& value);
-  std::string* _internal_mutable_path();
-
-  public:
-  // optional string etag = 2;
-  bool has_etag() const;
-  void clear_etag() ;
-  const std::string& etag() const;
-  template <typename Arg_ = const std::string&, typename... Args_>
-  void set_etag(Arg_&& arg, Args_... args);
-  std::string* mutable_etag();
-  PROTOBUF_NODISCARD std::string* release_etag();
-  void set_allocated_etag(std::string* value);
-
-  private:
-  const std::string& _internal_etag() const;
-  inline PROTOBUF_ALWAYS_INLINE void _internal_set_etag(
-      const std::string& value);
-  std::string* _internal_mutable_etag();
-
-  public:
-  // @@protoc_insertion_point(class_scope:io.deephaven.proto.backplane.grpc.FetchFileRequest)
- private:
-  class _Internal;
-
-  friend class ::google::protobuf::internal::TcParser;
-  static const ::google::protobuf::internal::TcParseTable<
-      1, 2, 0,
-      67, 2>
-      _table_;
-  friend class ::google::protobuf::MessageLite;
-  friend class ::google::protobuf::Arena;
-  template <typename T>
-  friend class ::google::protobuf::Arena::InternalHelper;
-  using InternalArenaConstructable_ = void;
-  using DestructorSkippable_ = void;
-  struct Impl_ {
-
-        inline explicit constexpr Impl_(
-            ::google::protobuf::internal::ConstantInitialized) noexcept;
-        inline explicit Impl_(::google::protobuf::internal::InternalVisibility visibility,
-                              ::google::protobuf::Arena* arena);
-        inline explicit Impl_(::google::protobuf::internal::InternalVisibility visibility,
-                              ::google::protobuf::Arena* arena, const Impl_& from);
-    ::google::protobuf::internal::HasBits<1> _has_bits_;
-    mutable ::google::protobuf::internal::CachedSize _cached_size_;
-    ::google::protobuf::internal::ArenaStringPtr path_;
-    ::google::protobuf::internal::ArenaStringPtr etag_;
-    PROTOBUF_TSAN_DECLARE_MEMBER
-  };
-  union { Impl_ _impl_; };
-  friend struct ::TableStruct_deephaven_2fproto_2fstorage_2eproto;
-};// -------------------------------------------------------------------
-
-class DeleteItemResponse final :
-    public ::google::protobuf::internal::ZeroFieldsBase /* @@protoc_insertion_point(class_definition:io.deephaven.proto.backplane.grpc.DeleteItemResponse) */ {
- public:
-  inline DeleteItemResponse() : DeleteItemResponse(nullptr) {}
-  template<typename = void>
-  explicit PROTOBUF_CONSTEXPR DeleteItemResponse(::google::protobuf::internal::ConstantInitialized);
-
-  inline DeleteItemResponse(const DeleteItemResponse& from)
-      : DeleteItemResponse(nullptr, from) {}
-  DeleteItemResponse(DeleteItemResponse&& from) noexcept
-    : DeleteItemResponse() {
-    *this = ::std::move(from);
-  }
-
-  inline DeleteItemResponse& operator=(const DeleteItemResponse& from) {
-    CopyFrom(from);
-    return *this;
-  }
-  inline DeleteItemResponse& operator=(DeleteItemResponse&& from) noexcept {
-    if (this == &from) return *this;
-    if (GetArena() == from.GetArena()
-  #ifdef PROTOBUF_FORCE_COPY_IN_MOVE
-        && GetArena() != nullptr
-  #endif  // !PROTOBUF_FORCE_COPY_IN_MOVE
-    ) {
-      InternalSwap(&from);
-    } else {
-      CopyFrom(from);
-    }
-    return *this;
-  }
-
-  inline const ::google::protobuf::UnknownFieldSet& unknown_fields() const
-      ABSL_ATTRIBUTE_LIFETIME_BOUND {
-    return _internal_metadata_.unknown_fields<::google::protobuf::UnknownFieldSet>(::google::protobuf::UnknownFieldSet::default_instance);
-  }
-  inline ::google::protobuf::UnknownFieldSet* mutable_unknown_fields()
-      ABSL_ATTRIBUTE_LIFETIME_BOUND {
-    return _internal_metadata_.mutable_unknown_fields<::google::protobuf::UnknownFieldSet>();
-  }
-
-  static const ::google::protobuf::Descriptor* descriptor() {
-    return GetDescriptor();
-  }
-  static const ::google::protobuf::Descriptor* GetDescriptor() {
-    return default_instance().GetMetadata().descriptor;
-  }
-  static const ::google::protobuf::Reflection* GetReflection() {
-    return default_instance().GetMetadata().reflection;
-  }
-  static const DeleteItemResponse& default_instance() {
-    return *internal_default_instance();
-  }
-  static inline const DeleteItemResponse* internal_default_instance() {
-    return reinterpret_cast<const DeleteItemResponse*>(
-               &_DeleteItemResponse_default_instance_);
-  }
-  static constexpr int kIndexInFileMessages =
-    12;
-
-  friend void swap(DeleteItemResponse& a, DeleteItemResponse& b) {
-    a.Swap(&b);
-  }
-  inline void Swap(DeleteItemResponse* other) {
-    if (other == this) return;
-  #ifdef PROTOBUF_FORCE_COPY_IN_SWAP
-    if (GetArena() != nullptr &&
-        GetArena() == other->GetArena()) {
-   #else  // PROTOBUF_FORCE_COPY_IN_SWAP
-    if (GetArena() == other->GetArena()) {
-  #endif  // !PROTOBUF_FORCE_COPY_IN_SWAP
-      InternalSwap(other);
-    } else {
-      ::google::protobuf::internal::GenericSwap(this, other);
-    }
-  }
-  void UnsafeArenaSwap(DeleteItemResponse* other) {
-    if (other == this) return;
-    ABSL_DCHECK(GetArena() == other->GetArena());
-    InternalSwap(other);
-  }
-
-  // implements Message ----------------------------------------------
-
-  DeleteItemResponse* New(::google::protobuf::Arena* arena = nullptr) const final {
-    return CreateMaybeMessage<DeleteItemResponse>(arena);
-  }
-  using ::google::protobuf::internal::ZeroFieldsBase::CopyFrom;
-  inline void CopyFrom(const DeleteItemResponse& from) {
-    ::google::protobuf::internal::ZeroFieldsBase::CopyImpl(*this, from);
-  }
-  using ::google::protobuf::internal::ZeroFieldsBase::MergeFrom;
-  void MergeFrom(const DeleteItemResponse& from) {
-    ::google::protobuf::internal::ZeroFieldsBase::MergeImpl(*this, from);
-  }
-  public:
-
-  private:
-  friend class ::google::protobuf::internal::AnyMetadata;
-  static ::absl::string_view FullMessageName() {
-    return "io.deephaven.proto.backplane.grpc.DeleteItemResponse";
-  }
-  protected:
-  explicit DeleteItemResponse(::google::protobuf::Arena* arena);
-  DeleteItemResponse(::google::protobuf::Arena* arena, const DeleteItemResponse& from);
-  public:
-
-  ::google::protobuf::Metadata GetMetadata() const final;
-
-  // nested types ----------------------------------------------------
-
-  // accessors -------------------------------------------------------
-
-  // @@protoc_insertion_point(class_scope:io.deephaven.proto.backplane.grpc.DeleteItemResponse)
- private:
-  class _Internal;
-
-  friend class ::google::protobuf::MessageLite;
-  friend class ::google::protobuf::Arena;
-  template <typename T>
-  friend class ::google::protobuf::Arena::InternalHelper;
-  using InternalArenaConstructable_ = void;
-  using DestructorSkippable_ = void;
-  struct Impl_ {
-
-        inline explicit constexpr Impl_(
-            ::google::protobuf::internal::ConstantInitialized) noexcept;
-        inline explicit Impl_(::google::protobuf::internal::InternalVisibility visibility,
-                              ::google::protobuf::Arena* arena);
-        inline explicit Impl_(::google::protobuf::internal::InternalVisibility visibility,
-                              ::google::protobuf::Arena* arena, const Impl_& from);
-    PROTOBUF_TSAN_DECLARE_MEMBER
-  };
-  friend struct ::TableStruct_deephaven_2fproto_2fstorage_2eproto;
-};// -------------------------------------------------------------------
-
-class DeleteItemRequest final :
-    public ::google::protobuf::Message /* @@protoc_insertion_point(class_definition:io.deephaven.proto.backplane.grpc.DeleteItemRequest) */ {
- public:
-  inline DeleteItemRequest() : DeleteItemRequest(nullptr) {}
-  ~DeleteItemRequest() override;
-  template<typename = void>
-  explicit PROTOBUF_CONSTEXPR DeleteItemRequest(::google::protobuf::internal::ConstantInitialized);
-
-  inline DeleteItemRequest(const DeleteItemRequest& from)
-      : DeleteItemRequest(nullptr, from) {}
-  DeleteItemRequest(DeleteItemRequest&& from) noexcept
-    : DeleteItemRequest() {
-    *this = ::std::move(from);
-  }
-
-  inline DeleteItemRequest& operator=(const DeleteItemRequest& from) {
-    CopyFrom(from);
-    return *this;
-  }
-  inline DeleteItemRequest& operator=(DeleteItemRequest&& from) noexcept {
-    if (this == &from) return *this;
-    if (GetArena() == from.GetArena()
-  #ifdef PROTOBUF_FORCE_COPY_IN_MOVE
-        && GetArena() != nullptr
-  #endif  // !PROTOBUF_FORCE_COPY_IN_MOVE
-    ) {
-      InternalSwap(&from);
-    } else {
-      CopyFrom(from);
-    }
-    return *this;
-  }
-
-  inline const ::google::protobuf::UnknownFieldSet& unknown_fields() const
-      ABSL_ATTRIBUTE_LIFETIME_BOUND {
-    return _internal_metadata_.unknown_fields<::google::protobuf::UnknownFieldSet>(::google::protobuf::UnknownFieldSet::default_instance);
-  }
-  inline ::google::protobuf::UnknownFieldSet* mutable_unknown_fields()
-      ABSL_ATTRIBUTE_LIFETIME_BOUND {
-    return _internal_metadata_.mutable_unknown_fields<::google::protobuf::UnknownFieldSet>();
-  }
-
-  static const ::google::protobuf::Descriptor* descriptor() {
-    return GetDescriptor();
-  }
-  static const ::google::protobuf::Descriptor* GetDescriptor() {
-    return default_instance().GetMetadata().descriptor;
-  }
-  static const ::google::protobuf::Reflection* GetReflection() {
-    return default_instance().GetMetadata().reflection;
-  }
-  static const DeleteItemRequest& default_instance() {
-    return *internal_default_instance();
-  }
-  static inline const DeleteItemRequest* internal_default_instance() {
-    return reinterpret_cast<const DeleteItemRequest*>(
-               &_DeleteItemRequest_default_instance_);
-  }
-  static constexpr int kIndexInFileMessages =
-    11;
-
-  friend void swap(DeleteItemRequest& a, DeleteItemRequest& b) {
-    a.Swap(&b);
-  }
-  inline void Swap(DeleteItemRequest* other) {
-    if (other == this) return;
-  #ifdef PROTOBUF_FORCE_COPY_IN_SWAP
-    if (GetArena() != nullptr &&
-        GetArena() == other->GetArena()) {
-   #else  // PROTOBUF_FORCE_COPY_IN_SWAP
-    if (GetArena() == other->GetArena()) {
-  #endif  // !PROTOBUF_FORCE_COPY_IN_SWAP
-      InternalSwap(other);
-    } else {
-      ::google::protobuf::internal::GenericSwap(this, other);
-    }
-  }
-  void UnsafeArenaSwap(DeleteItemRequest* other) {
-    if (other == this) return;
-    ABSL_DCHECK(GetArena() == other->GetArena());
-    InternalSwap(other);
-  }
-
-  // implements Message ----------------------------------------------
-
-  DeleteItemRequest* New(::google::protobuf::Arena* arena = nullptr) const final {
-    return CreateMaybeMessage<DeleteItemRequest>(arena);
-  }
-  using ::google::protobuf::Message::CopyFrom;
-  void CopyFrom(const DeleteItemRequest& from);
-  using ::google::protobuf::Message::MergeFrom;
-  void MergeFrom( const DeleteItemRequest& from) {
-    DeleteItemRequest::MergeImpl(*this, from);
-  }
-  private:
-  static void MergeImpl(::google::protobuf::Message& to_msg, const ::google::protobuf::Message& from_msg);
-  public:
-  PROTOBUF_ATTRIBUTE_REINITIALIZES void Clear() final;
-  bool IsInitialized() const final;
-
-  ::size_t ByteSizeLong() const final;
-  const char* _InternalParse(const char* ptr, ::google::protobuf::internal::ParseContext* ctx) final;
-  ::uint8_t* _InternalSerialize(
-      ::uint8_t* target, ::google::protobuf::io::EpsCopyOutputStream* stream) const final;
-  int GetCachedSize() const { return _impl_._cached_size_.Get(); }
-
-  private:
-  ::google::protobuf::internal::CachedSize* AccessCachedSize() const final;
-  void SharedCtor(::google::protobuf::Arena* arena);
-  void SharedDtor();
-  void InternalSwap(DeleteItemRequest* other);
-
-  private:
-  friend class ::google::protobuf::internal::AnyMetadata;
-  static ::absl::string_view FullMessageName() {
-    return "io.deephaven.proto.backplane.grpc.DeleteItemRequest";
-  }
-  protected:
-  explicit DeleteItemRequest(::google::protobuf::Arena* arena);
-  DeleteItemRequest(::google::protobuf::Arena* arena, const DeleteItemRequest& from);
-  public:
-
-  static const ClassData _class_data_;
-  const ::google::protobuf::Message::ClassData*GetClassData() const final;
-
-  ::google::protobuf::Metadata GetMetadata() const final;
-
-  // nested types ----------------------------------------------------
-
-  // accessors -------------------------------------------------------
-
-  enum : int {
-    kPathFieldNumber = 1,
-  };
-  // string path = 1;
-  void clear_path() ;
-  const std::string& path() const;
-  template <typename Arg_ = const std::string&, typename... Args_>
-  void set_path(Arg_&& arg, Args_... args);
-  std::string* mutable_path();
-  PROTOBUF_NODISCARD std::string* release_path();
-  void set_allocated_path(std::string* value);
-
-  private:
-  const std::string& _internal_path() const;
-  inline PROTOBUF_ALWAYS_INLINE void _internal_set_path(
-      const std::string& value);
-  std::string* _internal_mutable_path();
-
-  public:
-  // @@protoc_insertion_point(class_scope:io.deephaven.proto.backplane.grpc.DeleteItemRequest)
- private:
-  class _Internal;
-
-  friend class ::google::protobuf::internal::TcParser;
-  static const ::google::protobuf::internal::TcParseTable<
-      0, 1, 0,
-      64, 2>
-      _table_;
-  friend class ::google::protobuf::MessageLite;
-  friend class ::google::protobuf::Arena;
-  template <typename T>
-  friend class ::google::protobuf::Arena::InternalHelper;
-  using InternalArenaConstructable_ = void;
-  using DestructorSkippable_ = void;
-  struct Impl_ {
-
-        inline explicit constexpr Impl_(
-            ::google::protobuf::internal::ConstantInitialized) noexcept;
-        inline explicit Impl_(::google::protobuf::internal::InternalVisibility visibility,
-                              ::google::protobuf::Arena* arena);
-        inline explicit Impl_(::google::protobuf::internal::InternalVisibility visibility,
-                              ::google::protobuf::Arena* arena, const Impl_& from);
-    ::google::protobuf::internal::ArenaStringPtr path_;
-    mutable ::google::protobuf::internal::CachedSize _cached_size_;
-    PROTOBUF_TSAN_DECLARE_MEMBER
-  };
-  union { Impl_ _impl_; };
-  friend struct ::TableStruct_deephaven_2fproto_2fstorage_2eproto;
-};// -------------------------------------------------------------------
-
-class CreateDirectoryResponse final :
-    public ::google::protobuf::internal::ZeroFieldsBase /* @@protoc_insertion_point(class_definition:io.deephaven.proto.backplane.grpc.CreateDirectoryResponse) */ {
- public:
-  inline CreateDirectoryResponse() : CreateDirectoryResponse(nullptr) {}
-  template<typename = void>
-  explicit PROTOBUF_CONSTEXPR CreateDirectoryResponse(::google::protobuf::internal::ConstantInitialized);
-
-  inline CreateDirectoryResponse(const CreateDirectoryResponse& from)
-      : CreateDirectoryResponse(nullptr, from) {}
-  CreateDirectoryResponse(CreateDirectoryResponse&& from) noexcept
-    : CreateDirectoryResponse() {
-    *this = ::std::move(from);
-  }
-
-  inline CreateDirectoryResponse& operator=(const CreateDirectoryResponse& from) {
-    CopyFrom(from);
-    return *this;
-  }
-  inline CreateDirectoryResponse& operator=(CreateDirectoryResponse&& from) noexcept {
-    if (this == &from) return *this;
-    if (GetArena() == from.GetArena()
-  #ifdef PROTOBUF_FORCE_COPY_IN_MOVE
-        && GetArena() != nullptr
-  #endif  // !PROTOBUF_FORCE_COPY_IN_MOVE
-    ) {
-      InternalSwap(&from);
-    } else {
-      CopyFrom(from);
-    }
-    return *this;
-  }
-
-  inline const ::google::protobuf::UnknownFieldSet& unknown_fields() const
-      ABSL_ATTRIBUTE_LIFETIME_BOUND {
-    return _internal_metadata_.unknown_fields<::google::protobuf::UnknownFieldSet>(::google::protobuf::UnknownFieldSet::default_instance);
-  }
-  inline ::google::protobuf::UnknownFieldSet* mutable_unknown_fields()
-      ABSL_ATTRIBUTE_LIFETIME_BOUND {
-    return _internal_metadata_.mutable_unknown_fields<::google::protobuf::UnknownFieldSet>();
-  }
-
-  static const ::google::protobuf::Descriptor* descriptor() {
-    return GetDescriptor();
-  }
-  static const ::google::protobuf::Descriptor* GetDescriptor() {
-    return default_instance().GetMetadata().descriptor;
-  }
-  static const ::google::protobuf::Reflection* GetReflection() {
-    return default_instance().GetMetadata().reflection;
-  }
-  static const CreateDirectoryResponse& default_instance() {
-    return *internal_default_instance();
-  }
-  static inline const CreateDirectoryResponse* internal_default_instance() {
-    return reinterpret_cast<const CreateDirectoryResponse*>(
-               &_CreateDirectoryResponse_default_instance_);
-  }
-  static constexpr int kIndexInFileMessages =
-    10;
-
-  friend void swap(CreateDirectoryResponse& a, CreateDirectoryResponse& b) {
-    a.Swap(&b);
-  }
-  inline void Swap(CreateDirectoryResponse* other) {
-    if (other == this) return;
-  #ifdef PROTOBUF_FORCE_COPY_IN_SWAP
-    if (GetArena() != nullptr &&
-        GetArena() == other->GetArena()) {
-   #else  // PROTOBUF_FORCE_COPY_IN_SWAP
-    if (GetArena() == other->GetArena()) {
-  #endif  // !PROTOBUF_FORCE_COPY_IN_SWAP
-      InternalSwap(other);
-    } else {
-      ::google::protobuf::internal::GenericSwap(this, other);
-    }
-  }
-  void UnsafeArenaSwap(CreateDirectoryResponse* other) {
-    if (other == this) return;
-    ABSL_DCHECK(GetArena() == other->GetArena());
-    InternalSwap(other);
-  }
-
-  // implements Message ----------------------------------------------
-
-  CreateDirectoryResponse* New(::google::protobuf::Arena* arena = nullptr) const final {
-    return CreateMaybeMessage<CreateDirectoryResponse>(arena);
-  }
-  using ::google::protobuf::internal::ZeroFieldsBase::CopyFrom;
-  inline void CopyFrom(const CreateDirectoryResponse& from) {
-    ::google::protobuf::internal::ZeroFieldsBase::CopyImpl(*this, from);
-  }
-  using ::google::protobuf::internal::ZeroFieldsBase::MergeFrom;
-  void MergeFrom(const CreateDirectoryResponse& from) {
-    ::google::protobuf::internal::ZeroFieldsBase::MergeImpl(*this, from);
-  }
-  public:
-
-  private:
-  friend class ::google::protobuf::internal::AnyMetadata;
-  static ::absl::string_view FullMessageName() {
-    return "io.deephaven.proto.backplane.grpc.CreateDirectoryResponse";
-  }
-  protected:
-  explicit CreateDirectoryResponse(::google::protobuf::Arena* arena);
-  CreateDirectoryResponse(::google::protobuf::Arena* arena, const CreateDirectoryResponse& from);
-  public:
-
-  ::google::protobuf::Metadata GetMetadata() const final;
-
-  // nested types ----------------------------------------------------
-
-  // accessors -------------------------------------------------------
-
-  // @@protoc_insertion_point(class_scope:io.deephaven.proto.backplane.grpc.CreateDirectoryResponse)
- private:
-  class _Internal;
-
-  friend class ::google::protobuf::MessageLite;
-  friend class ::google::protobuf::Arena;
-  template <typename T>
-  friend class ::google::protobuf::Arena::InternalHelper;
-  using InternalArenaConstructable_ = void;
-  using DestructorSkippable_ = void;
-  struct Impl_ {
-
-        inline explicit constexpr Impl_(
-            ::google::protobuf::internal::ConstantInitialized) noexcept;
-        inline explicit Impl_(::google::protobuf::internal::InternalVisibility visibility,
-                              ::google::protobuf::Arena* arena);
-        inline explicit Impl_(::google::protobuf::internal::InternalVisibility visibility,
-                              ::google::protobuf::Arena* arena, const Impl_& from);
-    PROTOBUF_TSAN_DECLARE_MEMBER
-  };
-  friend struct ::TableStruct_deephaven_2fproto_2fstorage_2eproto;
-};// -------------------------------------------------------------------
-
-class CreateDirectoryRequest final :
-    public ::google::protobuf::Message /* @@protoc_insertion_point(class_definition:io.deephaven.proto.backplane.grpc.CreateDirectoryRequest) */ {
- public:
-  inline CreateDirectoryRequest() : CreateDirectoryRequest(nullptr) {}
-  ~CreateDirectoryRequest() override;
-  template<typename = void>
-  explicit PROTOBUF_CONSTEXPR CreateDirectoryRequest(::google::protobuf::internal::ConstantInitialized);
-
-  inline CreateDirectoryRequest(const CreateDirectoryRequest& from)
-      : CreateDirectoryRequest(nullptr, from) {}
-  CreateDirectoryRequest(CreateDirectoryRequest&& from) noexcept
-    : CreateDirectoryRequest() {
-    *this = ::std::move(from);
-  }
-
-  inline CreateDirectoryRequest& operator=(const CreateDirectoryRequest& from) {
-    CopyFrom(from);
-    return *this;
-  }
-  inline CreateDirectoryRequest& operator=(CreateDirectoryRequest&& from) noexcept {
-    if (this == &from) return *this;
-    if (GetArena() == from.GetArena()
-  #ifdef PROTOBUF_FORCE_COPY_IN_MOVE
-        && GetArena() != nullptr
-  #endif  // !PROTOBUF_FORCE_COPY_IN_MOVE
-    ) {
-      InternalSwap(&from);
-    } else {
-      CopyFrom(from);
-    }
-    return *this;
-  }
-
-  inline const ::google::protobuf::UnknownFieldSet& unknown_fields() const
-      ABSL_ATTRIBUTE_LIFETIME_BOUND {
-    return _internal_metadata_.unknown_fields<::google::protobuf::UnknownFieldSet>(::google::protobuf::UnknownFieldSet::default_instance);
-  }
-  inline ::google::protobuf::UnknownFieldSet* mutable_unknown_fields()
-      ABSL_ATTRIBUTE_LIFETIME_BOUND {
-    return _internal_metadata_.mutable_unknown_fields<::google::protobuf::UnknownFieldSet>();
-  }
-
-  static const ::google::protobuf::Descriptor* descriptor() {
-    return GetDescriptor();
-  }
-  static const ::google::protobuf::Descriptor* GetDescriptor() {
-    return default_instance().GetMetadata().descriptor;
-  }
-  static const ::google::protobuf::Reflection* GetReflection() {
-    return default_instance().GetMetadata().reflection;
-  }
-  static const CreateDirectoryRequest& default_instance() {
-    return *internal_default_instance();
-  }
-  static inline const CreateDirectoryRequest* internal_default_instance() {
-    return reinterpret_cast<const CreateDirectoryRequest*>(
-               &_CreateDirectoryRequest_default_instance_);
-  }
-  static constexpr int kIndexInFileMessages =
-    9;
-
-  friend void swap(CreateDirectoryRequest& a, CreateDirectoryRequest& b) {
-    a.Swap(&b);
-  }
-  inline void Swap(CreateDirectoryRequest* other) {
-    if (other == this) return;
-  #ifdef PROTOBUF_FORCE_COPY_IN_SWAP
-    if (GetArena() != nullptr &&
-        GetArena() == other->GetArena()) {
-   #else  // PROTOBUF_FORCE_COPY_IN_SWAP
-    if (GetArena() == other->GetArena()) {
-  #endif  // !PROTOBUF_FORCE_COPY_IN_SWAP
-      InternalSwap(other);
-    } else {
-      ::google::protobuf::internal::GenericSwap(this, other);
-    }
-  }
-  void UnsafeArenaSwap(CreateDirectoryRequest* other) {
-    if (other == this) return;
-    ABSL_DCHECK(GetArena() == other->GetArena());
-    InternalSwap(other);
-  }
-
-  // implements Message ----------------------------------------------
-
-  CreateDirectoryRequest* New(::google::protobuf::Arena* arena = nullptr) const final {
-    return CreateMaybeMessage<CreateDirectoryRequest>(arena);
-  }
-  using ::google::protobuf::Message::CopyFrom;
-  void CopyFrom(const CreateDirectoryRequest& from);
-  using ::google::protobuf::Message::MergeFrom;
-  void MergeFrom( const CreateDirectoryRequest& from) {
-    CreateDirectoryRequest::MergeImpl(*this, from);
-  }
-  private:
-  static void MergeImpl(::google::protobuf::Message& to_msg, const ::google::protobuf::Message& from_msg);
-  public:
-  PROTOBUF_ATTRIBUTE_REINITIALIZES void Clear() final;
-  bool IsInitialized() const final;
-
-  ::size_t ByteSizeLong() const final;
-  const char* _InternalParse(const char* ptr, ::google::protobuf::internal::ParseContext* ctx) final;
-  ::uint8_t* _InternalSerialize(
-      ::uint8_t* target, ::google::protobuf::io::EpsCopyOutputStream* stream) const final;
-  int GetCachedSize() const { return _impl_._cached_size_.Get(); }
-
-  private:
-  ::google::protobuf::internal::CachedSize* AccessCachedSize() const final;
-  void SharedCtor(::google::protobuf::Arena* arena);
-  void SharedDtor();
-  void InternalSwap(CreateDirectoryRequest* other);
-
-  private:
-  friend class ::google::protobuf::internal::AnyMetadata;
-  static ::absl::string_view FullMessageName() {
-    return "io.deephaven.proto.backplane.grpc.CreateDirectoryRequest";
-  }
-  protected:
-  explicit CreateDirectoryRequest(::google::protobuf::Arena* arena);
-  CreateDirectoryRequest(::google::protobuf::Arena* arena, const CreateDirectoryRequest& from);
-  public:
-
-  static const ClassData _class_data_;
-  const ::google::protobuf::Message::ClassData*GetClassData() const final;
-
-  ::google::protobuf::Metadata GetMetadata() const final;
-
-  // nested types ----------------------------------------------------
-
-  // accessors -------------------------------------------------------
-
-  enum : int {
-    kPathFieldNumber = 1,
-  };
-  // string path = 1;
-  void clear_path() ;
-  const std::string& path() const;
-  template <typename Arg_ = const std::string&, typename... Args_>
-  void set_path(Arg_&& arg, Args_... args);
-  std::string* mutable_path();
-  PROTOBUF_NODISCARD std::string* release_path();
-  void set_allocated_path(std::string* value);
-
-  private:
-  const std::string& _internal_path() const;
-  inline PROTOBUF_ALWAYS_INLINE void _internal_set_path(
-      const std::string& value);
-  std::string* _internal_mutable_path();
-
-  public:
-  // @@protoc_insertion_point(class_scope:io.deephaven.proto.backplane.grpc.CreateDirectoryRequest)
- private:
-  class _Internal;
-
-  friend class ::google::protobuf::internal::TcParser;
-  static const ::google::protobuf::internal::TcParseTable<
-      0, 1, 0,
-      69, 2>
-      _table_;
-  friend class ::google::protobuf::MessageLite;
-  friend class ::google::protobuf::Arena;
-  template <typename T>
-  friend class ::google::protobuf::Arena::InternalHelper;
-  using InternalArenaConstructable_ = void;
-  using DestructorSkippable_ = void;
-  struct Impl_ {
-
-        inline explicit constexpr Impl_(
-            ::google::protobuf::internal::ConstantInitialized) noexcept;
-        inline explicit Impl_(::google::protobuf::internal::InternalVisibility visibility,
-                              ::google::protobuf::Arena* arena);
-        inline explicit Impl_(::google::protobuf::internal::InternalVisibility visibility,
-                              ::google::protobuf::Arena* arena, const Impl_& from);
-    ::google::protobuf::internal::ArenaStringPtr path_;
-    mutable ::google::protobuf::internal::CachedSize _cached_size_;
-    PROTOBUF_TSAN_DECLARE_MEMBER
-  };
-  union { Impl_ _impl_; };
-  friend struct ::TableStruct_deephaven_2fproto_2fstorage_2eproto;
-};// -------------------------------------------------------------------
-
-class ListItemsResponse final :
-    public ::google::protobuf::Message /* @@protoc_insertion_point(class_definition:io.deephaven.proto.backplane.grpc.ListItemsResponse) */ {
- public:
-  inline ListItemsResponse() : ListItemsResponse(nullptr) {}
-  ~ListItemsResponse() override;
-  template<typename = void>
-  explicit PROTOBUF_CONSTEXPR ListItemsResponse(::google::protobuf::internal::ConstantInitialized);
-
-  inline ListItemsResponse(const ListItemsResponse& from)
-      : ListItemsResponse(nullptr, from) {}
-  ListItemsResponse(ListItemsResponse&& from) noexcept
-    : ListItemsResponse() {
-    *this = ::std::move(from);
-  }
-
-  inline ListItemsResponse& operator=(const ListItemsResponse& from) {
-    CopyFrom(from);
-    return *this;
-  }
-  inline ListItemsResponse& operator=(ListItemsResponse&& from) noexcept {
-    if (this == &from) return *this;
-    if (GetArena() == from.GetArena()
-  #ifdef PROTOBUF_FORCE_COPY_IN_MOVE
-        && GetArena() != nullptr
-  #endif  // !PROTOBUF_FORCE_COPY_IN_MOVE
-    ) {
-      InternalSwap(&from);
-    } else {
-      CopyFrom(from);
-    }
-    return *this;
-  }
-
-  inline const ::google::protobuf::UnknownFieldSet& unknown_fields() const
-      ABSL_ATTRIBUTE_LIFETIME_BOUND {
-    return _internal_metadata_.unknown_fields<::google::protobuf::UnknownFieldSet>(::google::protobuf::UnknownFieldSet::default_instance);
-  }
-  inline ::google::protobuf::UnknownFieldSet* mutable_unknown_fields()
-      ABSL_ATTRIBUTE_LIFETIME_BOUND {
-    return _internal_metadata_.mutable_unknown_fields<::google::protobuf::UnknownFieldSet>();
-  }
-
-  static const ::google::protobuf::Descriptor* descriptor() {
-    return GetDescriptor();
-  }
-  static const ::google::protobuf::Descriptor* GetDescriptor() {
-    return default_instance().GetMetadata().descriptor;
-  }
-  static const ::google::protobuf::Reflection* GetReflection() {
-    return default_instance().GetMetadata().reflection;
-  }
-  static const ListItemsResponse& default_instance() {
-    return *internal_default_instance();
-  }
-  static inline const ListItemsResponse* internal_default_instance() {
-    return reinterpret_cast<const ListItemsResponse*>(
-               &_ListItemsResponse_default_instance_);
-  }
-  static constexpr int kIndexInFileMessages =
-    2;
-
-  friend void swap(ListItemsResponse& a, ListItemsResponse& b) {
-    a.Swap(&b);
-  }
-  inline void Swap(ListItemsResponse* other) {
-    if (other == this) return;
-  #ifdef PROTOBUF_FORCE_COPY_IN_SWAP
-    if (GetArena() != nullptr &&
-        GetArena() == other->GetArena()) {
-   #else  // PROTOBUF_FORCE_COPY_IN_SWAP
-    if (GetArena() == other->GetArena()) {
-  #endif  // !PROTOBUF_FORCE_COPY_IN_SWAP
-      InternalSwap(other);
-    } else {
-      ::google::protobuf::internal::GenericSwap(this, other);
-    }
-  }
-  void UnsafeArenaSwap(ListItemsResponse* other) {
-    if (other == this) return;
-    ABSL_DCHECK(GetArena() == other->GetArena());
-    InternalSwap(other);
-  }
-
-  // implements Message ----------------------------------------------
-
-  ListItemsResponse* New(::google::protobuf::Arena* arena = nullptr) const final {
-    return CreateMaybeMessage<ListItemsResponse>(arena);
-  }
-  using ::google::protobuf::Message::CopyFrom;
-  void CopyFrom(const ListItemsResponse& from);
-  using ::google::protobuf::Message::MergeFrom;
-  void MergeFrom( const ListItemsResponse& from) {
-    ListItemsResponse::MergeImpl(*this, from);
-  }
-  private:
-  static void MergeImpl(::google::protobuf::Message& to_msg, const ::google::protobuf::Message& from_msg);
-  public:
-  PROTOBUF_ATTRIBUTE_REINITIALIZES void Clear() final;
-  bool IsInitialized() const final;
-
-  ::size_t ByteSizeLong() const final;
-  const char* _InternalParse(const char* ptr, ::google::protobuf::internal::ParseContext* ctx) final;
-  ::uint8_t* _InternalSerialize(
-      ::uint8_t* target, ::google::protobuf::io::EpsCopyOutputStream* stream) const final;
-  int GetCachedSize() const { return _impl_._cached_size_.Get(); }
-
-  private:
-  ::google::protobuf::internal::CachedSize* AccessCachedSize() const final;
-  void SharedCtor(::google::protobuf::Arena* arena);
-  void SharedDtor();
-  void InternalSwap(ListItemsResponse* other);
-
-  private:
-  friend class ::google::protobuf::internal::AnyMetadata;
-  static ::absl::string_view FullMessageName() {
-    return "io.deephaven.proto.backplane.grpc.ListItemsResponse";
-  }
-  protected:
-  explicit ListItemsResponse(::google::protobuf::Arena* arena);
-  ListItemsResponse(::google::protobuf::Arena* arena, const ListItemsResponse& from);
-  public:
-
-  static const ClassData _class_data_;
-  const ::google::protobuf::Message::ClassData*GetClassData() const final;
-
-  ::google::protobuf::Metadata GetMetadata() const final;
-
-  // nested types ----------------------------------------------------
-
-  // accessors -------------------------------------------------------
-
-  enum : int {
-    kItemsFieldNumber = 1,
-    kCanonicalPathFieldNumber = 2,
-  };
-  // repeated .io.deephaven.proto.backplane.grpc.ItemInfo items = 1;
-  int items_size() const;
-  private:
-  int _internal_items_size() const;
-
-  public:
-  void clear_items() ;
-  ::io::deephaven::proto::backplane::grpc::ItemInfo* mutable_items(int index);
-  ::google::protobuf::RepeatedPtrField< ::io::deephaven::proto::backplane::grpc::ItemInfo >*
-      mutable_items();
-  private:
-  const ::google::protobuf::RepeatedPtrField<::io::deephaven::proto::backplane::grpc::ItemInfo>& _internal_items() const;
-  ::google::protobuf::RepeatedPtrField<::io::deephaven::proto::backplane::grpc::ItemInfo>* _internal_mutable_items();
-  public:
-  const ::io::deephaven::proto::backplane::grpc::ItemInfo& items(int index) const;
-  ::io::deephaven::proto::backplane::grpc::ItemInfo* add_items();
-  const ::google::protobuf::RepeatedPtrField< ::io::deephaven::proto::backplane::grpc::ItemInfo >&
-      items() const;
-  // string canonical_path = 2;
-  void clear_canonical_path() ;
-  const std::string& canonical_path() const;
-  template <typename Arg_ = const std::string&, typename... Args_>
-  void set_canonical_path(Arg_&& arg, Args_... args);
-  std::string* mutable_canonical_path();
-  PROTOBUF_NODISCARD std::string* release_canonical_path();
-  void set_allocated_canonical_path(std::string* value);
-
-  private:
-  const std::string& _internal_canonical_path() const;
-  inline PROTOBUF_ALWAYS_INLINE void _internal_set_canonical_path(
-      const std::string& value);
-  std::string* _internal_mutable_canonical_path();
-
-  public:
-  // @@protoc_insertion_point(class_scope:io.deephaven.proto.backplane.grpc.ListItemsResponse)
- private:
-  class _Internal;
-
-  friend class ::google::protobuf::internal::TcParser;
-  static const ::google::protobuf::internal::TcParseTable<
-      1, 2, 1,
-      74, 2>
-      _table_;
-  friend class ::google::protobuf::MessageLite;
-  friend class ::google::protobuf::Arena;
-  template <typename T>
-  friend class ::google::protobuf::Arena::InternalHelper;
-  using InternalArenaConstructable_ = void;
-  using DestructorSkippable_ = void;
-  struct Impl_ {
-
-        inline explicit constexpr Impl_(
-            ::google::protobuf::internal::ConstantInitialized) noexcept;
-        inline explicit Impl_(::google::protobuf::internal::InternalVisibility visibility,
-                              ::google::protobuf::Arena* arena);
-        inline explicit Impl_(::google::protobuf::internal::InternalVisibility visibility,
-                              ::google::protobuf::Arena* arena, const Impl_& from);
-    ::google::protobuf::RepeatedPtrField< ::io::deephaven::proto::backplane::grpc::ItemInfo > items_;
-    ::google::protobuf::internal::ArenaStringPtr canonical_path_;
-    mutable ::google::protobuf::internal::CachedSize _cached_size_;
-    PROTOBUF_TSAN_DECLARE_MEMBER
-  };
-  union { Impl_ _impl_; };
-  friend struct ::TableStruct_deephaven_2fproto_2fstorage_2eproto;
-};
-
-// ===================================================================
-
-
-
-
-// ===================================================================
-
-
-#ifdef __GNUC__
-#pragma GCC diagnostic push
-#pragma GCC diagnostic ignored "-Wstrict-aliasing"
-#endif  // __GNUC__
-// -------------------------------------------------------------------
-
-// ListItemsRequest
-
-// string path = 1;
-inline void ListItemsRequest::clear_path() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  _impl_.path_.ClearToEmpty();
-}
-inline const std::string& ListItemsRequest::path() const
-    ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  // @@protoc_insertion_point(field_get:io.deephaven.proto.backplane.grpc.ListItemsRequest.path)
-  return _internal_path();
-}
-template <typename Arg_, typename... Args_>
-inline PROTOBUF_ALWAYS_INLINE void ListItemsRequest::set_path(Arg_&& arg,
-                                                     Args_... args) {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  ;
-  _impl_.path_.Set(static_cast<Arg_&&>(arg), args..., GetArena());
-  // @@protoc_insertion_point(field_set:io.deephaven.proto.backplane.grpc.ListItemsRequest.path)
-}
-inline std::string* ListItemsRequest::mutable_path() ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  std::string* _s = _internal_mutable_path();
-  // @@protoc_insertion_point(field_mutable:io.deephaven.proto.backplane.grpc.ListItemsRequest.path)
-  return _s;
-}
-inline const std::string& ListItemsRequest::_internal_path() const {
-  PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race);
-  return _impl_.path_.Get();
-}
-inline void ListItemsRequest::_internal_set_path(const std::string& value) {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  ;
-  _impl_.path_.Set(value, GetArena());
-}
-inline std::string* ListItemsRequest::_internal_mutable_path() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  ;
-  return _impl_.path_.Mutable( GetArena());
-}
-inline std::string* ListItemsRequest::release_path() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  // @@protoc_insertion_point(field_release:io.deephaven.proto.backplane.grpc.ListItemsRequest.path)
-  return _impl_.path_.Release();
-}
-inline void ListItemsRequest::set_allocated_path(std::string* value) {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  _impl_.path_.SetAllocated(value, GetArena());
-  #ifdef PROTOBUF_FORCE_COPY_DEFAULT_STRING
-        if (_impl_.path_.IsDefault()) {
-          _impl_.path_.Set("", GetArena());
-        }
-  #endif  // PROTOBUF_FORCE_COPY_DEFAULT_STRING
-  // @@protoc_insertion_point(field_set_allocated:io.deephaven.proto.backplane.grpc.ListItemsRequest.path)
-}
-
-// optional string filter_glob = 4;
-inline bool ListItemsRequest::has_filter_glob() const {
-  bool value = (_impl_._has_bits_[0] & 0x00000001u) != 0;
-  return value;
-}
-inline void ListItemsRequest::clear_filter_glob() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  _impl_.filter_glob_.ClearToEmpty();
-  _impl_._has_bits_[0] &= ~0x00000001u;
-}
-inline const std::string& ListItemsRequest::filter_glob() const
-    ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  // @@protoc_insertion_point(field_get:io.deephaven.proto.backplane.grpc.ListItemsRequest.filter_glob)
-  return _internal_filter_glob();
-}
-template <typename Arg_, typename... Args_>
-inline PROTOBUF_ALWAYS_INLINE void ListItemsRequest::set_filter_glob(Arg_&& arg,
-                                                     Args_... args) {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  _impl_._has_bits_[0] |= 0x00000001u;
-  _impl_.filter_glob_.Set(static_cast<Arg_&&>(arg), args..., GetArena());
-  // @@protoc_insertion_point(field_set:io.deephaven.proto.backplane.grpc.ListItemsRequest.filter_glob)
-}
-inline std::string* ListItemsRequest::mutable_filter_glob() ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  std::string* _s = _internal_mutable_filter_glob();
-  // @@protoc_insertion_point(field_mutable:io.deephaven.proto.backplane.grpc.ListItemsRequest.filter_glob)
-  return _s;
-}
-inline const std::string& ListItemsRequest::_internal_filter_glob() const {
-  PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race);
-  return _impl_.filter_glob_.Get();
-}
-inline void ListItemsRequest::_internal_set_filter_glob(const std::string& value) {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  _impl_._has_bits_[0] |= 0x00000001u;
-  _impl_.filter_glob_.Set(value, GetArena());
-}
-inline std::string* ListItemsRequest::_internal_mutable_filter_glob() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  _impl_._has_bits_[0] |= 0x00000001u;
-  return _impl_.filter_glob_.Mutable( GetArena());
-}
-inline std::string* ListItemsRequest::release_filter_glob() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  // @@protoc_insertion_point(field_release:io.deephaven.proto.backplane.grpc.ListItemsRequest.filter_glob)
-  if ((_impl_._has_bits_[0] & 0x00000001u) == 0) {
-    return nullptr;
-  }
-  _impl_._has_bits_[0] &= ~0x00000001u;
-  auto* released = _impl_.filter_glob_.Release();
-  #ifdef PROTOBUF_FORCE_COPY_DEFAULT_STRING
-  _impl_.filter_glob_.Set("", GetArena());
-  #endif  // PROTOBUF_FORCE_COPY_DEFAULT_STRING
-  return released;
-}
-inline void ListItemsRequest::set_allocated_filter_glob(std::string* value) {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  if (value != nullptr) {
-    _impl_._has_bits_[0] |= 0x00000001u;
-  } else {
-    _impl_._has_bits_[0] &= ~0x00000001u;
-  }
-  _impl_.filter_glob_.SetAllocated(value, GetArena());
-  #ifdef PROTOBUF_FORCE_COPY_DEFAULT_STRING
-        if (_impl_.filter_glob_.IsDefault()) {
-          _impl_.filter_glob_.Set("", GetArena());
-        }
-  #endif  // PROTOBUF_FORCE_COPY_DEFAULT_STRING
-  // @@protoc_insertion_point(field_set_allocated:io.deephaven.proto.backplane.grpc.ListItemsRequest.filter_glob)
-}
-
-// -------------------------------------------------------------------
-
-// ItemInfo
-
-// string path = 1;
-inline void ItemInfo::clear_path() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  _impl_.path_.ClearToEmpty();
-}
-inline const std::string& ItemInfo::path() const
-    ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  // @@protoc_insertion_point(field_get:io.deephaven.proto.backplane.grpc.ItemInfo.path)
-  return _internal_path();
-}
-template <typename Arg_, typename... Args_>
-inline PROTOBUF_ALWAYS_INLINE void ItemInfo::set_path(Arg_&& arg,
-                                                     Args_... args) {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  ;
-  _impl_.path_.Set(static_cast<Arg_&&>(arg), args..., GetArena());
-  // @@protoc_insertion_point(field_set:io.deephaven.proto.backplane.grpc.ItemInfo.path)
-}
-inline std::string* ItemInfo::mutable_path() ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  std::string* _s = _internal_mutable_path();
-  // @@protoc_insertion_point(field_mutable:io.deephaven.proto.backplane.grpc.ItemInfo.path)
-  return _s;
-}
-inline const std::string& ItemInfo::_internal_path() const {
-  PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race);
-  return _impl_.path_.Get();
-}
-inline void ItemInfo::_internal_set_path(const std::string& value) {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  ;
-  _impl_.path_.Set(value, GetArena());
-}
-inline std::string* ItemInfo::_internal_mutable_path() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  ;
-  return _impl_.path_.Mutable( GetArena());
-}
-inline std::string* ItemInfo::release_path() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  // @@protoc_insertion_point(field_release:io.deephaven.proto.backplane.grpc.ItemInfo.path)
-  return _impl_.path_.Release();
-}
-inline void ItemInfo::set_allocated_path(std::string* value) {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  _impl_.path_.SetAllocated(value, GetArena());
-  #ifdef PROTOBUF_FORCE_COPY_DEFAULT_STRING
-        if (_impl_.path_.IsDefault()) {
-          _impl_.path_.Set("", GetArena());
-        }
-  #endif  // PROTOBUF_FORCE_COPY_DEFAULT_STRING
-  // @@protoc_insertion_point(field_set_allocated:io.deephaven.proto.backplane.grpc.ItemInfo.path)
-}
-
-// .io.deephaven.proto.backplane.grpc.ItemType type = 2;
-inline void ItemInfo::clear_type() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  _impl_.type_ = 0;
-}
-inline ::io::deephaven::proto::backplane::grpc::ItemType ItemInfo::type() const {
-  // @@protoc_insertion_point(field_get:io.deephaven.proto.backplane.grpc.ItemInfo.type)
-  return _internal_type();
-}
-inline void ItemInfo::set_type(::io::deephaven::proto::backplane::grpc::ItemType value) {
-  _internal_set_type(value);
-  // @@protoc_insertion_point(field_set:io.deephaven.proto.backplane.grpc.ItemInfo.type)
-}
-inline ::io::deephaven::proto::backplane::grpc::ItemType ItemInfo::_internal_type() const {
-  PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race);
-  return static_cast<::io::deephaven::proto::backplane::grpc::ItemType>(_impl_.type_);
-}
-inline void ItemInfo::_internal_set_type(::io::deephaven::proto::backplane::grpc::ItemType value) {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  ;
-  _impl_.type_ = value;
-}
-
-// sint64 size = 3 [jstype = JS_STRING];
-inline void ItemInfo::clear_size() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  _impl_.size_ = ::int64_t{0};
-}
-inline ::int64_t ItemInfo::size() const {
-  // @@protoc_insertion_point(field_get:io.deephaven.proto.backplane.grpc.ItemInfo.size)
-  return _internal_size();
-}
-inline void ItemInfo::set_size(::int64_t value) {
-  _internal_set_size(value);
-  // @@protoc_insertion_point(field_set:io.deephaven.proto.backplane.grpc.ItemInfo.size)
-}
-inline ::int64_t ItemInfo::_internal_size() const {
-  PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race);
-  return _impl_.size_;
-}
-inline void ItemInfo::_internal_set_size(::int64_t value) {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  ;
-  _impl_.size_ = value;
-}
-
-// optional string etag = 4;
-inline bool ItemInfo::has_etag() const {
-  bool value = (_impl_._has_bits_[0] & 0x00000001u) != 0;
-  return value;
-}
-inline void ItemInfo::clear_etag() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  _impl_.etag_.ClearToEmpty();
-  _impl_._has_bits_[0] &= ~0x00000001u;
-}
-inline const std::string& ItemInfo::etag() const
-    ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  // @@protoc_insertion_point(field_get:io.deephaven.proto.backplane.grpc.ItemInfo.etag)
-  return _internal_etag();
-}
-template <typename Arg_, typename... Args_>
-inline PROTOBUF_ALWAYS_INLINE void ItemInfo::set_etag(Arg_&& arg,
-                                                     Args_... args) {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  _impl_._has_bits_[0] |= 0x00000001u;
-  _impl_.etag_.Set(static_cast<Arg_&&>(arg), args..., GetArena());
-  // @@protoc_insertion_point(field_set:io.deephaven.proto.backplane.grpc.ItemInfo.etag)
-}
-inline std::string* ItemInfo::mutable_etag() ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  std::string* _s = _internal_mutable_etag();
-  // @@protoc_insertion_point(field_mutable:io.deephaven.proto.backplane.grpc.ItemInfo.etag)
-  return _s;
-}
-inline const std::string& ItemInfo::_internal_etag() const {
-  PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race);
-  return _impl_.etag_.Get();
-}
-inline void ItemInfo::_internal_set_etag(const std::string& value) {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  _impl_._has_bits_[0] |= 0x00000001u;
-  _impl_.etag_.Set(value, GetArena());
-}
-inline std::string* ItemInfo::_internal_mutable_etag() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  _impl_._has_bits_[0] |= 0x00000001u;
-  return _impl_.etag_.Mutable( GetArena());
-}
-inline std::string* ItemInfo::release_etag() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  // @@protoc_insertion_point(field_release:io.deephaven.proto.backplane.grpc.ItemInfo.etag)
-  if ((_impl_._has_bits_[0] & 0x00000001u) == 0) {
-    return nullptr;
-  }
-  _impl_._has_bits_[0] &= ~0x00000001u;
-  auto* released = _impl_.etag_.Release();
-  #ifdef PROTOBUF_FORCE_COPY_DEFAULT_STRING
-  _impl_.etag_.Set("", GetArena());
-  #endif  // PROTOBUF_FORCE_COPY_DEFAULT_STRING
-  return released;
-}
-inline void ItemInfo::set_allocated_etag(std::string* value) {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  if (value != nullptr) {
-    _impl_._has_bits_[0] |= 0x00000001u;
-  } else {
-    _impl_._has_bits_[0] &= ~0x00000001u;
-  }
-  _impl_.etag_.SetAllocated(value, GetArena());
-  #ifdef PROTOBUF_FORCE_COPY_DEFAULT_STRING
-        if (_impl_.etag_.IsDefault()) {
-          _impl_.etag_.Set("", GetArena());
-        }
-  #endif  // PROTOBUF_FORCE_COPY_DEFAULT_STRING
-  // @@protoc_insertion_point(field_set_allocated:io.deephaven.proto.backplane.grpc.ItemInfo.etag)
-}
-
-// -------------------------------------------------------------------
-
-// ListItemsResponse
-
-// repeated .io.deephaven.proto.backplane.grpc.ItemInfo items = 1;
-inline int ListItemsResponse::_internal_items_size() const {
-  return _internal_items().size();
-}
-inline int ListItemsResponse::items_size() const {
-  return _internal_items_size();
-}
-inline void ListItemsResponse::clear_items() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  _impl_.items_.Clear();
-}
-inline ::io::deephaven::proto::backplane::grpc::ItemInfo* ListItemsResponse::mutable_items(int index)
-    ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  // @@protoc_insertion_point(field_mutable:io.deephaven.proto.backplane.grpc.ListItemsResponse.items)
-  return _internal_mutable_items()->Mutable(index);
-}
-inline ::google::protobuf::RepeatedPtrField<::io::deephaven::proto::backplane::grpc::ItemInfo>* ListItemsResponse::mutable_items()
-    ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  // @@protoc_insertion_point(field_mutable_list:io.deephaven.proto.backplane.grpc.ListItemsResponse.items)
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  return _internal_mutable_items();
-}
-inline const ::io::deephaven::proto::backplane::grpc::ItemInfo& ListItemsResponse::items(int index) const
-    ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  // @@protoc_insertion_point(field_get:io.deephaven.proto.backplane.grpc.ListItemsResponse.items)
-  return _internal_items().Get(index);
-}
-inline ::io::deephaven::proto::backplane::grpc::ItemInfo* ListItemsResponse::add_items() ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  ::io::deephaven::proto::backplane::grpc::ItemInfo* _add = _internal_mutable_items()->Add();
-  // @@protoc_insertion_point(field_add:io.deephaven.proto.backplane.grpc.ListItemsResponse.items)
-  return _add;
-}
-inline const ::google::protobuf::RepeatedPtrField<::io::deephaven::proto::backplane::grpc::ItemInfo>& ListItemsResponse::items() const
-    ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  // @@protoc_insertion_point(field_list:io.deephaven.proto.backplane.grpc.ListItemsResponse.items)
-  return _internal_items();
-}
-inline const ::google::protobuf::RepeatedPtrField<::io::deephaven::proto::backplane::grpc::ItemInfo>&
-ListItemsResponse::_internal_items() const {
-  PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race);
-  return _impl_.items_;
-}
-inline ::google::protobuf::RepeatedPtrField<::io::deephaven::proto::backplane::grpc::ItemInfo>*
-ListItemsResponse::_internal_mutable_items() {
-  PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race);
-  return &_impl_.items_;
-}
-
-// string canonical_path = 2;
-inline void ListItemsResponse::clear_canonical_path() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  _impl_.canonical_path_.ClearToEmpty();
-}
-inline const std::string& ListItemsResponse::canonical_path() const
-    ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  // @@protoc_insertion_point(field_get:io.deephaven.proto.backplane.grpc.ListItemsResponse.canonical_path)
-  return _internal_canonical_path();
-}
-template <typename Arg_, typename... Args_>
-inline PROTOBUF_ALWAYS_INLINE void ListItemsResponse::set_canonical_path(Arg_&& arg,
-                                                     Args_... args) {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  ;
-  _impl_.canonical_path_.Set(static_cast<Arg_&&>(arg), args..., GetArena());
-  // @@protoc_insertion_point(field_set:io.deephaven.proto.backplane.grpc.ListItemsResponse.canonical_path)
-}
-inline std::string* ListItemsResponse::mutable_canonical_path() ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  std::string* _s = _internal_mutable_canonical_path();
-  // @@protoc_insertion_point(field_mutable:io.deephaven.proto.backplane.grpc.ListItemsResponse.canonical_path)
-  return _s;
-}
-inline const std::string& ListItemsResponse::_internal_canonical_path() const {
-  PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race);
-  return _impl_.canonical_path_.Get();
-}
-inline void ListItemsResponse::_internal_set_canonical_path(const std::string& value) {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  ;
-  _impl_.canonical_path_.Set(value, GetArena());
-}
-inline std::string* ListItemsResponse::_internal_mutable_canonical_path() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  ;
-  return _impl_.canonical_path_.Mutable( GetArena());
-}
-inline std::string* ListItemsResponse::release_canonical_path() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  // @@protoc_insertion_point(field_release:io.deephaven.proto.backplane.grpc.ListItemsResponse.canonical_path)
-  return _impl_.canonical_path_.Release();
-}
-inline void ListItemsResponse::set_allocated_canonical_path(std::string* value) {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  _impl_.canonical_path_.SetAllocated(value, GetArena());
-  #ifdef PROTOBUF_FORCE_COPY_DEFAULT_STRING
-        if (_impl_.canonical_path_.IsDefault()) {
-          _impl_.canonical_path_.Set("", GetArena());
-        }
-  #endif  // PROTOBUF_FORCE_COPY_DEFAULT_STRING
-  // @@protoc_insertion_point(field_set_allocated:io.deephaven.proto.backplane.grpc.ListItemsResponse.canonical_path)
-}
-
-// -------------------------------------------------------------------
-
-// FetchFileRequest
-
-// string path = 1;
-inline void FetchFileRequest::clear_path() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  _impl_.path_.ClearToEmpty();
-}
-inline const std::string& FetchFileRequest::path() const
-    ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  // @@protoc_insertion_point(field_get:io.deephaven.proto.backplane.grpc.FetchFileRequest.path)
-  return _internal_path();
-}
-template <typename Arg_, typename... Args_>
-inline PROTOBUF_ALWAYS_INLINE void FetchFileRequest::set_path(Arg_&& arg,
-                                                     Args_... args) {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  ;
-  _impl_.path_.Set(static_cast<Arg_&&>(arg), args..., GetArena());
-  // @@protoc_insertion_point(field_set:io.deephaven.proto.backplane.grpc.FetchFileRequest.path)
-}
-inline std::string* FetchFileRequest::mutable_path() ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  std::string* _s = _internal_mutable_path();
-  // @@protoc_insertion_point(field_mutable:io.deephaven.proto.backplane.grpc.FetchFileRequest.path)
-  return _s;
-}
-inline const std::string& FetchFileRequest::_internal_path() const {
-  PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race);
-  return _impl_.path_.Get();
-}
-inline void FetchFileRequest::_internal_set_path(const std::string& value) {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  ;
-  _impl_.path_.Set(value, GetArena());
-}
-inline std::string* FetchFileRequest::_internal_mutable_path() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  ;
-  return _impl_.path_.Mutable( GetArena());
-}
-inline std::string* FetchFileRequest::release_path() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  // @@protoc_insertion_point(field_release:io.deephaven.proto.backplane.grpc.FetchFileRequest.path)
-  return _impl_.path_.Release();
-}
-inline void FetchFileRequest::set_allocated_path(std::string* value) {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  _impl_.path_.SetAllocated(value, GetArena());
-  #ifdef PROTOBUF_FORCE_COPY_DEFAULT_STRING
-        if (_impl_.path_.IsDefault()) {
-          _impl_.path_.Set("", GetArena());
-        }
-  #endif  // PROTOBUF_FORCE_COPY_DEFAULT_STRING
-  // @@protoc_insertion_point(field_set_allocated:io.deephaven.proto.backplane.grpc.FetchFileRequest.path)
-}
-
-// optional string etag = 2;
-inline bool FetchFileRequest::has_etag() const {
-  bool value = (_impl_._has_bits_[0] & 0x00000001u) != 0;
-  return value;
-}
-inline void FetchFileRequest::clear_etag() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  _impl_.etag_.ClearToEmpty();
-  _impl_._has_bits_[0] &= ~0x00000001u;
-}
-inline const std::string& FetchFileRequest::etag() const
-    ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  // @@protoc_insertion_point(field_get:io.deephaven.proto.backplane.grpc.FetchFileRequest.etag)
-  return _internal_etag();
-}
-template <typename Arg_, typename... Args_>
-inline PROTOBUF_ALWAYS_INLINE void FetchFileRequest::set_etag(Arg_&& arg,
-                                                     Args_... args) {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  _impl_._has_bits_[0] |= 0x00000001u;
-  _impl_.etag_.Set(static_cast<Arg_&&>(arg), args..., GetArena());
-  // @@protoc_insertion_point(field_set:io.deephaven.proto.backplane.grpc.FetchFileRequest.etag)
-}
-inline std::string* FetchFileRequest::mutable_etag() ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  std::string* _s = _internal_mutable_etag();
-  // @@protoc_insertion_point(field_mutable:io.deephaven.proto.backplane.grpc.FetchFileRequest.etag)
-  return _s;
-}
-inline const std::string& FetchFileRequest::_internal_etag() const {
-  PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race);
-  return _impl_.etag_.Get();
-}
-inline void FetchFileRequest::_internal_set_etag(const std::string& value) {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  _impl_._has_bits_[0] |= 0x00000001u;
-  _impl_.etag_.Set(value, GetArena());
-}
-inline std::string* FetchFileRequest::_internal_mutable_etag() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  _impl_._has_bits_[0] |= 0x00000001u;
-  return _impl_.etag_.Mutable( GetArena());
-}
-inline std::string* FetchFileRequest::release_etag() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  // @@protoc_insertion_point(field_release:io.deephaven.proto.backplane.grpc.FetchFileRequest.etag)
-  if ((_impl_._has_bits_[0] & 0x00000001u) == 0) {
-    return nullptr;
-  }
-  _impl_._has_bits_[0] &= ~0x00000001u;
-  auto* released = _impl_.etag_.Release();
-  #ifdef PROTOBUF_FORCE_COPY_DEFAULT_STRING
-  _impl_.etag_.Set("", GetArena());
-  #endif  // PROTOBUF_FORCE_COPY_DEFAULT_STRING
-  return released;
-}
-inline void FetchFileRequest::set_allocated_etag(std::string* value) {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  if (value != nullptr) {
-    _impl_._has_bits_[0] |= 0x00000001u;
-  } else {
-    _impl_._has_bits_[0] &= ~0x00000001u;
-  }
-  _impl_.etag_.SetAllocated(value, GetArena());
-  #ifdef PROTOBUF_FORCE_COPY_DEFAULT_STRING
-        if (_impl_.etag_.IsDefault()) {
-          _impl_.etag_.Set("", GetArena());
-        }
-  #endif  // PROTOBUF_FORCE_COPY_DEFAULT_STRING
-  // @@protoc_insertion_point(field_set_allocated:io.deephaven.proto.backplane.grpc.FetchFileRequest.etag)
-}
-
-// -------------------------------------------------------------------
-
-// FetchFileResponse
-
-// bytes contents = 1;
-inline void FetchFileResponse::clear_contents() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  _impl_.contents_.ClearToEmpty();
-}
-inline const std::string& FetchFileResponse::contents() const
-    ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  // @@protoc_insertion_point(field_get:io.deephaven.proto.backplane.grpc.FetchFileResponse.contents)
-  return _internal_contents();
-}
-template <typename Arg_, typename... Args_>
-inline PROTOBUF_ALWAYS_INLINE void FetchFileResponse::set_contents(Arg_&& arg,
-                                                     Args_... args) {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  ;
-  _impl_.contents_.SetBytes(static_cast<Arg_&&>(arg), args..., GetArena());
-  // @@protoc_insertion_point(field_set:io.deephaven.proto.backplane.grpc.FetchFileResponse.contents)
-}
-inline std::string* FetchFileResponse::mutable_contents() ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  std::string* _s = _internal_mutable_contents();
-  // @@protoc_insertion_point(field_mutable:io.deephaven.proto.backplane.grpc.FetchFileResponse.contents)
-  return _s;
-}
-inline const std::string& FetchFileResponse::_internal_contents() const {
-  PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race);
-  return _impl_.contents_.Get();
-}
-inline void FetchFileResponse::_internal_set_contents(const std::string& value) {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  ;
-  _impl_.contents_.Set(value, GetArena());
-}
-inline std::string* FetchFileResponse::_internal_mutable_contents() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  ;
-  return _impl_.contents_.Mutable( GetArena());
-}
-inline std::string* FetchFileResponse::release_contents() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  // @@protoc_insertion_point(field_release:io.deephaven.proto.backplane.grpc.FetchFileResponse.contents)
-  return _impl_.contents_.Release();
-}
-inline void FetchFileResponse::set_allocated_contents(std::string* value) {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  _impl_.contents_.SetAllocated(value, GetArena());
-  #ifdef PROTOBUF_FORCE_COPY_DEFAULT_STRING
-        if (_impl_.contents_.IsDefault()) {
-          _impl_.contents_.Set("", GetArena());
-        }
-  #endif  // PROTOBUF_FORCE_COPY_DEFAULT_STRING
-  // @@protoc_insertion_point(field_set_allocated:io.deephaven.proto.backplane.grpc.FetchFileResponse.contents)
-}
-
-// optional string etag = 2;
-inline bool FetchFileResponse::has_etag() const {
-  bool value = (_impl_._has_bits_[0] & 0x00000001u) != 0;
-  return value;
-}
-inline void FetchFileResponse::clear_etag() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  _impl_.etag_.ClearToEmpty();
-  _impl_._has_bits_[0] &= ~0x00000001u;
-}
-inline const std::string& FetchFileResponse::etag() const
-    ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  // @@protoc_insertion_point(field_get:io.deephaven.proto.backplane.grpc.FetchFileResponse.etag)
-  return _internal_etag();
-}
-template <typename Arg_, typename... Args_>
-inline PROTOBUF_ALWAYS_INLINE void FetchFileResponse::set_etag(Arg_&& arg,
-                                                     Args_... args) {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  _impl_._has_bits_[0] |= 0x00000001u;
-  _impl_.etag_.Set(static_cast<Arg_&&>(arg), args..., GetArena());
-  // @@protoc_insertion_point(field_set:io.deephaven.proto.backplane.grpc.FetchFileResponse.etag)
-}
-inline std::string* FetchFileResponse::mutable_etag() ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  std::string* _s = _internal_mutable_etag();
-  // @@protoc_insertion_point(field_mutable:io.deephaven.proto.backplane.grpc.FetchFileResponse.etag)
-  return _s;
-}
-inline const std::string& FetchFileResponse::_internal_etag() const {
-  PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race);
-  return _impl_.etag_.Get();
-}
-inline void FetchFileResponse::_internal_set_etag(const std::string& value) {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  _impl_._has_bits_[0] |= 0x00000001u;
-  _impl_.etag_.Set(value, GetArena());
-}
-inline std::string* FetchFileResponse::_internal_mutable_etag() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  _impl_._has_bits_[0] |= 0x00000001u;
-  return _impl_.etag_.Mutable( GetArena());
-}
-inline std::string* FetchFileResponse::release_etag() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  // @@protoc_insertion_point(field_release:io.deephaven.proto.backplane.grpc.FetchFileResponse.etag)
-  if ((_impl_._has_bits_[0] & 0x00000001u) == 0) {
-    return nullptr;
-  }
-  _impl_._has_bits_[0] &= ~0x00000001u;
-  auto* released = _impl_.etag_.Release();
-  #ifdef PROTOBUF_FORCE_COPY_DEFAULT_STRING
-  _impl_.etag_.Set("", GetArena());
-  #endif  // PROTOBUF_FORCE_COPY_DEFAULT_STRING
-  return released;
-}
-inline void FetchFileResponse::set_allocated_etag(std::string* value) {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  if (value != nullptr) {
-    _impl_._has_bits_[0] |= 0x00000001u;
-  } else {
-    _impl_._has_bits_[0] &= ~0x00000001u;
-  }
-  _impl_.etag_.SetAllocated(value, GetArena());
-  #ifdef PROTOBUF_FORCE_COPY_DEFAULT_STRING
-        if (_impl_.etag_.IsDefault()) {
-          _impl_.etag_.Set("", GetArena());
-        }
-  #endif  // PROTOBUF_FORCE_COPY_DEFAULT_STRING
-  // @@protoc_insertion_point(field_set_allocated:io.deephaven.proto.backplane.grpc.FetchFileResponse.etag)
-}
-
-// -------------------------------------------------------------------
-
-// SaveFileRequest
-
-// bool allow_overwrite = 1;
-inline void SaveFileRequest::clear_allow_overwrite() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  _impl_.allow_overwrite_ = false;
-}
-inline bool SaveFileRequest::allow_overwrite() const {
-  // @@protoc_insertion_point(field_get:io.deephaven.proto.backplane.grpc.SaveFileRequest.allow_overwrite)
-  return _internal_allow_overwrite();
-}
-inline void SaveFileRequest::set_allow_overwrite(bool value) {
-  _internal_set_allow_overwrite(value);
-  // @@protoc_insertion_point(field_set:io.deephaven.proto.backplane.grpc.SaveFileRequest.allow_overwrite)
-}
-inline bool SaveFileRequest::_internal_allow_overwrite() const {
-  PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race);
-  return _impl_.allow_overwrite_;
-}
-inline void SaveFileRequest::_internal_set_allow_overwrite(bool value) {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  ;
-  _impl_.allow_overwrite_ = value;
-}
-
-// string path = 2;
-inline void SaveFileRequest::clear_path() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  _impl_.path_.ClearToEmpty();
-}
-inline const std::string& SaveFileRequest::path() const
-    ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  // @@protoc_insertion_point(field_get:io.deephaven.proto.backplane.grpc.SaveFileRequest.path)
-  return _internal_path();
-}
-template <typename Arg_, typename... Args_>
-inline PROTOBUF_ALWAYS_INLINE void SaveFileRequest::set_path(Arg_&& arg,
-                                                     Args_... args) {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  ;
-  _impl_.path_.Set(static_cast<Arg_&&>(arg), args..., GetArena());
-  // @@protoc_insertion_point(field_set:io.deephaven.proto.backplane.grpc.SaveFileRequest.path)
-}
-inline std::string* SaveFileRequest::mutable_path() ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  std::string* _s = _internal_mutable_path();
-  // @@protoc_insertion_point(field_mutable:io.deephaven.proto.backplane.grpc.SaveFileRequest.path)
-  return _s;
-}
-inline const std::string& SaveFileRequest::_internal_path() const {
-  PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race);
-  return _impl_.path_.Get();
-}
-inline void SaveFileRequest::_internal_set_path(const std::string& value) {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  ;
-  _impl_.path_.Set(value, GetArena());
-}
-inline std::string* SaveFileRequest::_internal_mutable_path() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  ;
-  return _impl_.path_.Mutable( GetArena());
-}
-inline std::string* SaveFileRequest::release_path() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  // @@protoc_insertion_point(field_release:io.deephaven.proto.backplane.grpc.SaveFileRequest.path)
-  return _impl_.path_.Release();
-}
-inline void SaveFileRequest::set_allocated_path(std::string* value) {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  _impl_.path_.SetAllocated(value, GetArena());
-  #ifdef PROTOBUF_FORCE_COPY_DEFAULT_STRING
-        if (_impl_.path_.IsDefault()) {
-          _impl_.path_.Set("", GetArena());
-        }
-  #endif  // PROTOBUF_FORCE_COPY_DEFAULT_STRING
-  // @@protoc_insertion_point(field_set_allocated:io.deephaven.proto.backplane.grpc.SaveFileRequest.path)
-}
-
-// bytes contents = 3;
-inline void SaveFileRequest::clear_contents() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  _impl_.contents_.ClearToEmpty();
-}
-inline const std::string& SaveFileRequest::contents() const
-    ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  // @@protoc_insertion_point(field_get:io.deephaven.proto.backplane.grpc.SaveFileRequest.contents)
-  return _internal_contents();
-}
-template <typename Arg_, typename... Args_>
-inline PROTOBUF_ALWAYS_INLINE void SaveFileRequest::set_contents(Arg_&& arg,
-                                                     Args_... args) {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  ;
-  _impl_.contents_.SetBytes(static_cast<Arg_&&>(arg), args..., GetArena());
-  // @@protoc_insertion_point(field_set:io.deephaven.proto.backplane.grpc.SaveFileRequest.contents)
-}
-inline std::string* SaveFileRequest::mutable_contents() ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  std::string* _s = _internal_mutable_contents();
-  // @@protoc_insertion_point(field_mutable:io.deephaven.proto.backplane.grpc.SaveFileRequest.contents)
-  return _s;
-}
-inline const std::string& SaveFileRequest::_internal_contents() const {
-  PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race);
-  return _impl_.contents_.Get();
-}
-inline void SaveFileRequest::_internal_set_contents(const std::string& value) {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  ;
-  _impl_.contents_.Set(value, GetArena());
-}
-inline std::string* SaveFileRequest::_internal_mutable_contents() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  ;
-  return _impl_.contents_.Mutable( GetArena());
-}
-inline std::string* SaveFileRequest::release_contents() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  // @@protoc_insertion_point(field_release:io.deephaven.proto.backplane.grpc.SaveFileRequest.contents)
-  return _impl_.contents_.Release();
-}
-inline void SaveFileRequest::set_allocated_contents(std::string* value) {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  _impl_.contents_.SetAllocated(value, GetArena());
-  #ifdef PROTOBUF_FORCE_COPY_DEFAULT_STRING
-        if (_impl_.contents_.IsDefault()) {
-          _impl_.contents_.Set("", GetArena());
-        }
-  #endif  // PROTOBUF_FORCE_COPY_DEFAULT_STRING
-  // @@protoc_insertion_point(field_set_allocated:io.deephaven.proto.backplane.grpc.SaveFileRequest.contents)
-}
-
-// -------------------------------------------------------------------
-
-// SaveFileResponse
-
-// optional string etag = 1;
-inline bool SaveFileResponse::has_etag() const {
-  bool value = (_impl_._has_bits_[0] & 0x00000001u) != 0;
-  return value;
-}
-inline void SaveFileResponse::clear_etag() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  _impl_.etag_.ClearToEmpty();
-  _impl_._has_bits_[0] &= ~0x00000001u;
-}
-inline const std::string& SaveFileResponse::etag() const
-    ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  // @@protoc_insertion_point(field_get:io.deephaven.proto.backplane.grpc.SaveFileResponse.etag)
-  return _internal_etag();
-}
-template <typename Arg_, typename... Args_>
-inline PROTOBUF_ALWAYS_INLINE void SaveFileResponse::set_etag(Arg_&& arg,
-                                                     Args_... args) {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  _impl_._has_bits_[0] |= 0x00000001u;
-  _impl_.etag_.Set(static_cast<Arg_&&>(arg), args..., GetArena());
-  // @@protoc_insertion_point(field_set:io.deephaven.proto.backplane.grpc.SaveFileResponse.etag)
-}
-inline std::string* SaveFileResponse::mutable_etag() ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  std::string* _s = _internal_mutable_etag();
-  // @@protoc_insertion_point(field_mutable:io.deephaven.proto.backplane.grpc.SaveFileResponse.etag)
-  return _s;
-}
-inline const std::string& SaveFileResponse::_internal_etag() const {
-  PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race);
-  return _impl_.etag_.Get();
-}
-inline void SaveFileResponse::_internal_set_etag(const std::string& value) {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  _impl_._has_bits_[0] |= 0x00000001u;
-  _impl_.etag_.Set(value, GetArena());
-}
-inline std::string* SaveFileResponse::_internal_mutable_etag() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  _impl_._has_bits_[0] |= 0x00000001u;
-  return _impl_.etag_.Mutable( GetArena());
-}
-inline std::string* SaveFileResponse::release_etag() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  // @@protoc_insertion_point(field_release:io.deephaven.proto.backplane.grpc.SaveFileResponse.etag)
-  if ((_impl_._has_bits_[0] & 0x00000001u) == 0) {
-    return nullptr;
-  }
-  _impl_._has_bits_[0] &= ~0x00000001u;
-  auto* released = _impl_.etag_.Release();
-  #ifdef PROTOBUF_FORCE_COPY_DEFAULT_STRING
-  _impl_.etag_.Set("", GetArena());
-  #endif  // PROTOBUF_FORCE_COPY_DEFAULT_STRING
-  return released;
-}
-inline void SaveFileResponse::set_allocated_etag(std::string* value) {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  if (value != nullptr) {
-    _impl_._has_bits_[0] |= 0x00000001u;
-  } else {
-    _impl_._has_bits_[0] &= ~0x00000001u;
-  }
-  _impl_.etag_.SetAllocated(value, GetArena());
-  #ifdef PROTOBUF_FORCE_COPY_DEFAULT_STRING
-        if (_impl_.etag_.IsDefault()) {
-          _impl_.etag_.Set("", GetArena());
-        }
-  #endif  // PROTOBUF_FORCE_COPY_DEFAULT_STRING
-  // @@protoc_insertion_point(field_set_allocated:io.deephaven.proto.backplane.grpc.SaveFileResponse.etag)
-}
-
-// -------------------------------------------------------------------
-
-// MoveItemRequest
-
-// string old_path = 1;
-inline void MoveItemRequest::clear_old_path() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  _impl_.old_path_.ClearToEmpty();
-}
-inline const std::string& MoveItemRequest::old_path() const
-    ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  // @@protoc_insertion_point(field_get:io.deephaven.proto.backplane.grpc.MoveItemRequest.old_path)
-  return _internal_old_path();
-}
-template <typename Arg_, typename... Args_>
-inline PROTOBUF_ALWAYS_INLINE void MoveItemRequest::set_old_path(Arg_&& arg,
-                                                     Args_... args) {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  ;
-  _impl_.old_path_.Set(static_cast<Arg_&&>(arg), args..., GetArena());
-  // @@protoc_insertion_point(field_set:io.deephaven.proto.backplane.grpc.MoveItemRequest.old_path)
-}
-inline std::string* MoveItemRequest::mutable_old_path() ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  std::string* _s = _internal_mutable_old_path();
-  // @@protoc_insertion_point(field_mutable:io.deephaven.proto.backplane.grpc.MoveItemRequest.old_path)
-  return _s;
-}
-inline const std::string& MoveItemRequest::_internal_old_path() const {
-  PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race);
-  return _impl_.old_path_.Get();
-}
-inline void MoveItemRequest::_internal_set_old_path(const std::string& value) {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  ;
-  _impl_.old_path_.Set(value, GetArena());
-}
-inline std::string* MoveItemRequest::_internal_mutable_old_path() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  ;
-  return _impl_.old_path_.Mutable( GetArena());
-}
-inline std::string* MoveItemRequest::release_old_path() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  // @@protoc_insertion_point(field_release:io.deephaven.proto.backplane.grpc.MoveItemRequest.old_path)
-  return _impl_.old_path_.Release();
-}
-inline void MoveItemRequest::set_allocated_old_path(std::string* value) {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  _impl_.old_path_.SetAllocated(value, GetArena());
-  #ifdef PROTOBUF_FORCE_COPY_DEFAULT_STRING
-        if (_impl_.old_path_.IsDefault()) {
-          _impl_.old_path_.Set("", GetArena());
-        }
-  #endif  // PROTOBUF_FORCE_COPY_DEFAULT_STRING
-  // @@protoc_insertion_point(field_set_allocated:io.deephaven.proto.backplane.grpc.MoveItemRequest.old_path)
-}
-
-// string new_path = 2;
-inline void MoveItemRequest::clear_new_path() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  _impl_.new_path_.ClearToEmpty();
-}
-inline const std::string& MoveItemRequest::new_path() const
-    ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  // @@protoc_insertion_point(field_get:io.deephaven.proto.backplane.grpc.MoveItemRequest.new_path)
-  return _internal_new_path();
-}
-template <typename Arg_, typename... Args_>
-inline PROTOBUF_ALWAYS_INLINE void MoveItemRequest::set_new_path(Arg_&& arg,
-                                                     Args_... args) {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  ;
-  _impl_.new_path_.Set(static_cast<Arg_&&>(arg), args..., GetArena());
-  // @@protoc_insertion_point(field_set:io.deephaven.proto.backplane.grpc.MoveItemRequest.new_path)
-}
-inline std::string* MoveItemRequest::mutable_new_path() ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  std::string* _s = _internal_mutable_new_path();
-  // @@protoc_insertion_point(field_mutable:io.deephaven.proto.backplane.grpc.MoveItemRequest.new_path)
-  return _s;
-}
-inline const std::string& MoveItemRequest::_internal_new_path() const {
-  PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race);
-  return _impl_.new_path_.Get();
-}
-inline void MoveItemRequest::_internal_set_new_path(const std::string& value) {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  ;
-  _impl_.new_path_.Set(value, GetArena());
-}
-inline std::string* MoveItemRequest::_internal_mutable_new_path() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  ;
-  return _impl_.new_path_.Mutable( GetArena());
-}
-inline std::string* MoveItemRequest::release_new_path() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  // @@protoc_insertion_point(field_release:io.deephaven.proto.backplane.grpc.MoveItemRequest.new_path)
-  return _impl_.new_path_.Release();
-}
-inline void MoveItemRequest::set_allocated_new_path(std::string* value) {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  _impl_.new_path_.SetAllocated(value, GetArena());
-  #ifdef PROTOBUF_FORCE_COPY_DEFAULT_STRING
-        if (_impl_.new_path_.IsDefault()) {
-          _impl_.new_path_.Set("", GetArena());
-        }
-  #endif  // PROTOBUF_FORCE_COPY_DEFAULT_STRING
-  // @@protoc_insertion_point(field_set_allocated:io.deephaven.proto.backplane.grpc.MoveItemRequest.new_path)
-}
-
-// bool allow_overwrite = 3;
-inline void MoveItemRequest::clear_allow_overwrite() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  _impl_.allow_overwrite_ = false;
-}
-inline bool MoveItemRequest::allow_overwrite() const {
-  // @@protoc_insertion_point(field_get:io.deephaven.proto.backplane.grpc.MoveItemRequest.allow_overwrite)
-  return _internal_allow_overwrite();
-}
-inline void MoveItemRequest::set_allow_overwrite(bool value) {
-  _internal_set_allow_overwrite(value);
-  // @@protoc_insertion_point(field_set:io.deephaven.proto.backplane.grpc.MoveItemRequest.allow_overwrite)
-}
-inline bool MoveItemRequest::_internal_allow_overwrite() const {
-  PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race);
-  return _impl_.allow_overwrite_;
-}
-inline void MoveItemRequest::_internal_set_allow_overwrite(bool value) {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  ;
-  _impl_.allow_overwrite_ = value;
-}
-
-// -------------------------------------------------------------------
-
-// MoveItemResponse
-
-// -------------------------------------------------------------------
-
-// CreateDirectoryRequest
-
-// string path = 1;
-inline void CreateDirectoryRequest::clear_path() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  _impl_.path_.ClearToEmpty();
-}
-inline const std::string& CreateDirectoryRequest::path() const
-    ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  // @@protoc_insertion_point(field_get:io.deephaven.proto.backplane.grpc.CreateDirectoryRequest.path)
-  return _internal_path();
-}
-template <typename Arg_, typename... Args_>
-inline PROTOBUF_ALWAYS_INLINE void CreateDirectoryRequest::set_path(Arg_&& arg,
-                                                     Args_... args) {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  ;
-  _impl_.path_.Set(static_cast<Arg_&&>(arg), args..., GetArena());
-  // @@protoc_insertion_point(field_set:io.deephaven.proto.backplane.grpc.CreateDirectoryRequest.path)
-}
-inline std::string* CreateDirectoryRequest::mutable_path() ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  std::string* _s = _internal_mutable_path();
-  // @@protoc_insertion_point(field_mutable:io.deephaven.proto.backplane.grpc.CreateDirectoryRequest.path)
-  return _s;
-}
-inline const std::string& CreateDirectoryRequest::_internal_path() const {
-  PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race);
-  return _impl_.path_.Get();
-}
-inline void CreateDirectoryRequest::_internal_set_path(const std::string& value) {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  ;
-  _impl_.path_.Set(value, GetArena());
-}
-inline std::string* CreateDirectoryRequest::_internal_mutable_path() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  ;
-  return _impl_.path_.Mutable( GetArena());
-}
-inline std::string* CreateDirectoryRequest::release_path() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  // @@protoc_insertion_point(field_release:io.deephaven.proto.backplane.grpc.CreateDirectoryRequest.path)
-  return _impl_.path_.Release();
-}
-inline void CreateDirectoryRequest::set_allocated_path(std::string* value) {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  _impl_.path_.SetAllocated(value, GetArena());
-  #ifdef PROTOBUF_FORCE_COPY_DEFAULT_STRING
-        if (_impl_.path_.IsDefault()) {
-          _impl_.path_.Set("", GetArena());
-        }
-  #endif  // PROTOBUF_FORCE_COPY_DEFAULT_STRING
-  // @@protoc_insertion_point(field_set_allocated:io.deephaven.proto.backplane.grpc.CreateDirectoryRequest.path)
-}
-
-// -------------------------------------------------------------------
-
-// CreateDirectoryResponse
-
-// -------------------------------------------------------------------
-
-// DeleteItemRequest
-
-// string path = 1;
-inline void DeleteItemRequest::clear_path() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  _impl_.path_.ClearToEmpty();
-}
-inline const std::string& DeleteItemRequest::path() const
-    ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  // @@protoc_insertion_point(field_get:io.deephaven.proto.backplane.grpc.DeleteItemRequest.path)
-  return _internal_path();
-}
-template <typename Arg_, typename... Args_>
-inline PROTOBUF_ALWAYS_INLINE void DeleteItemRequest::set_path(Arg_&& arg,
-                                                     Args_... args) {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  ;
-  _impl_.path_.Set(static_cast<Arg_&&>(arg), args..., GetArena());
-  // @@protoc_insertion_point(field_set:io.deephaven.proto.backplane.grpc.DeleteItemRequest.path)
-}
-inline std::string* DeleteItemRequest::mutable_path() ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  std::string* _s = _internal_mutable_path();
-  // @@protoc_insertion_point(field_mutable:io.deephaven.proto.backplane.grpc.DeleteItemRequest.path)
-  return _s;
-}
-inline const std::string& DeleteItemRequest::_internal_path() const {
-  PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race);
-  return _impl_.path_.Get();
-}
-inline void DeleteItemRequest::_internal_set_path(const std::string& value) {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  ;
-  _impl_.path_.Set(value, GetArena());
-}
-inline std::string* DeleteItemRequest::_internal_mutable_path() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  ;
-  return _impl_.path_.Mutable( GetArena());
-}
-inline std::string* DeleteItemRequest::release_path() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  // @@protoc_insertion_point(field_release:io.deephaven.proto.backplane.grpc.DeleteItemRequest.path)
-  return _impl_.path_.Release();
-}
-inline void DeleteItemRequest::set_allocated_path(std::string* value) {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  _impl_.path_.SetAllocated(value, GetArena());
-  #ifdef PROTOBUF_FORCE_COPY_DEFAULT_STRING
-        if (_impl_.path_.IsDefault()) {
-          _impl_.path_.Set("", GetArena());
-        }
-  #endif  // PROTOBUF_FORCE_COPY_DEFAULT_STRING
-  // @@protoc_insertion_point(field_set_allocated:io.deephaven.proto.backplane.grpc.DeleteItemRequest.path)
-}
-
-// -------------------------------------------------------------------
-
-// DeleteItemResponse
-
-#ifdef __GNUC__
-#pragma GCC diagnostic pop
-#endif  // __GNUC__
-
-// @@protoc_insertion_point(namespace_scope)
-}  // namespace grpc
-}  // namespace backplane
-}  // namespace proto
-}  // namespace deephaven
-}  // namespace io
-
-
-namespace google {
-namespace protobuf {
-
-template <>
-struct is_proto_enum<::io::deephaven::proto::backplane::grpc::ItemType> : std::true_type {};
-template <>
-inline const EnumDescriptor* GetEnumDescriptor<::io::deephaven::proto::backplane::grpc::ItemType>() {
-  return ::io::deephaven::proto::backplane::grpc::ItemType_descriptor();
-}
-
-}  // namespace protobuf
-}  // namespace google
-
-// @@protoc_insertion_point(global_scope)
-
-#include "google/protobuf/port_undef.inc"
-
-#endif  // GOOGLE_PROTOBUF_INCLUDED_deephaven_2fproto_2fstorage_2eproto_2epb_2eh
diff --git a/cpp-client/deephaven/dhclient/proto/deephaven/proto/table.grpc.pb.cc b/cpp-client/deephaven/dhclient/proto/deephaven/proto/table.grpc.pb.cc
deleted file mode 100644
index abca769311a..00000000000
--- a/cpp-client/deephaven/dhclient/proto/deephaven/proto/table.grpc.pb.cc
+++ /dev/null
@@ -1,1928 +0,0 @@
-// Generated by the gRPC C++ plugin.
-// If you make any local change, they will be lost.
-// source: deephaven/proto/table.proto
-
-#include "deephaven/proto/table.pb.h"
-#include "deephaven/proto/table.grpc.pb.h"
-
-#include <functional>
-#include <grpcpp/support/async_stream.h>
-#include <grpcpp/support/async_unary_call.h>
-#include <grpcpp/impl/channel_interface.h>
-#include <grpcpp/impl/client_unary_call.h>
-#include <grpcpp/support/client_callback.h>
-#include <grpcpp/support/message_allocator.h>
-#include <grpcpp/support/method_handler.h>
-#include <grpcpp/impl/rpc_service_method.h>
-#include <grpcpp/support/server_callback.h>
-#include <grpcpp/impl/server_callback_handlers.h>
-#include <grpcpp/server_context.h>
-#include <grpcpp/impl/service_type.h>
-#include <grpcpp/support/sync_stream.h>
-namespace io {
-namespace deephaven {
-namespace proto {
-namespace backplane {
-namespace grpc {
-
-static const char* TableService_method_names[] = {
-  "/io.deephaven.proto.backplane.grpc.TableService/GetExportedTableCreationResponse",
-  "/io.deephaven.proto.backplane.grpc.TableService/FetchTable",
-  "/io.deephaven.proto.backplane.grpc.TableService/ApplyPreviewColumns",
-  "/io.deephaven.proto.backplane.grpc.TableService/EmptyTable",
-  "/io.deephaven.proto.backplane.grpc.TableService/TimeTable",
-  "/io.deephaven.proto.backplane.grpc.TableService/DropColumns",
-  "/io.deephaven.proto.backplane.grpc.TableService/Update",
-  "/io.deephaven.proto.backplane.grpc.TableService/LazyUpdate",
-  "/io.deephaven.proto.backplane.grpc.TableService/View",
-  "/io.deephaven.proto.backplane.grpc.TableService/UpdateView",
-  "/io.deephaven.proto.backplane.grpc.TableService/Select",
-  "/io.deephaven.proto.backplane.grpc.TableService/UpdateBy",
-  "/io.deephaven.proto.backplane.grpc.TableService/SelectDistinct",
-  "/io.deephaven.proto.backplane.grpc.TableService/Filter",
-  "/io.deephaven.proto.backplane.grpc.TableService/UnstructuredFilter",
-  "/io.deephaven.proto.backplane.grpc.TableService/Sort",
-  "/io.deephaven.proto.backplane.grpc.TableService/Head",
-  "/io.deephaven.proto.backplane.grpc.TableService/Tail",
-  "/io.deephaven.proto.backplane.grpc.TableService/HeadBy",
-  "/io.deephaven.proto.backplane.grpc.TableService/TailBy",
-  "/io.deephaven.proto.backplane.grpc.TableService/Ungroup",
-  "/io.deephaven.proto.backplane.grpc.TableService/MergeTables",
-  "/io.deephaven.proto.backplane.grpc.TableService/CrossJoinTables",
-  "/io.deephaven.proto.backplane.grpc.TableService/NaturalJoinTables",
-  "/io.deephaven.proto.backplane.grpc.TableService/ExactJoinTables",
-  "/io.deephaven.proto.backplane.grpc.TableService/LeftJoinTables",
-  "/io.deephaven.proto.backplane.grpc.TableService/AsOfJoinTables",
-  "/io.deephaven.proto.backplane.grpc.TableService/AjTables",
-  "/io.deephaven.proto.backplane.grpc.TableService/RajTables",
-  "/io.deephaven.proto.backplane.grpc.TableService/MultiJoinTables",
-  "/io.deephaven.proto.backplane.grpc.TableService/RangeJoinTables",
-  "/io.deephaven.proto.backplane.grpc.TableService/ComboAggregate",
-  "/io.deephaven.proto.backplane.grpc.TableService/AggregateAll",
-  "/io.deephaven.proto.backplane.grpc.TableService/Aggregate",
-  "/io.deephaven.proto.backplane.grpc.TableService/Snapshot",
-  "/io.deephaven.proto.backplane.grpc.TableService/SnapshotWhen",
-  "/io.deephaven.proto.backplane.grpc.TableService/Flatten",
-  "/io.deephaven.proto.backplane.grpc.TableService/RunChartDownsample",
-  "/io.deephaven.proto.backplane.grpc.TableService/CreateInputTable",
-  "/io.deephaven.proto.backplane.grpc.TableService/WhereIn",
-  "/io.deephaven.proto.backplane.grpc.TableService/Batch",
-  "/io.deephaven.proto.backplane.grpc.TableService/ExportedTableUpdates",
-  "/io.deephaven.proto.backplane.grpc.TableService/SeekRow",
-  "/io.deephaven.proto.backplane.grpc.TableService/MetaTable",
-  "/io.deephaven.proto.backplane.grpc.TableService/ComputeColumnStatistics",
-};
-
-std::unique_ptr< TableService::Stub> TableService::NewStub(const std::shared_ptr< ::grpc::ChannelInterface>& channel, const ::grpc::StubOptions& options) {
-  (void)options;
-  std::unique_ptr< TableService::Stub> stub(new TableService::Stub(channel, options));
-  return stub;
-}
-
-TableService::Stub::Stub(const std::shared_ptr< ::grpc::ChannelInterface>& channel, const ::grpc::StubOptions& options)
-  : channel_(channel), rpcmethod_GetExportedTableCreationResponse_(TableService_method_names[0], options.suffix_for_stats(),::grpc::internal::RpcMethod::NORMAL_RPC, channel)
-  , rpcmethod_FetchTable_(TableService_method_names[1], options.suffix_for_stats(),::grpc::internal::RpcMethod::NORMAL_RPC, channel)
-  , rpcmethod_ApplyPreviewColumns_(TableService_method_names[2], options.suffix_for_stats(),::grpc::internal::RpcMethod::NORMAL_RPC, channel)
-  , rpcmethod_EmptyTable_(TableService_method_names[3], options.suffix_for_stats(),::grpc::internal::RpcMethod::NORMAL_RPC, channel)
-  , rpcmethod_TimeTable_(TableService_method_names[4], options.suffix_for_stats(),::grpc::internal::RpcMethod::NORMAL_RPC, channel)
-  , rpcmethod_DropColumns_(TableService_method_names[5], options.suffix_for_stats(),::grpc::internal::RpcMethod::NORMAL_RPC, channel)
-  , rpcmethod_Update_(TableService_method_names[6], options.suffix_for_stats(),::grpc::internal::RpcMethod::NORMAL_RPC, channel)
-  , rpcmethod_LazyUpdate_(TableService_method_names[7], options.suffix_for_stats(),::grpc::internal::RpcMethod::NORMAL_RPC, channel)
-  , rpcmethod_View_(TableService_method_names[8], options.suffix_for_stats(),::grpc::internal::RpcMethod::NORMAL_RPC, channel)
-  , rpcmethod_UpdateView_(TableService_method_names[9], options.suffix_for_stats(),::grpc::internal::RpcMethod::NORMAL_RPC, channel)
-  , rpcmethod_Select_(TableService_method_names[10], options.suffix_for_stats(),::grpc::internal::RpcMethod::NORMAL_RPC, channel)
-  , rpcmethod_UpdateBy_(TableService_method_names[11], options.suffix_for_stats(),::grpc::internal::RpcMethod::NORMAL_RPC, channel)
-  , rpcmethod_SelectDistinct_(TableService_method_names[12], options.suffix_for_stats(),::grpc::internal::RpcMethod::NORMAL_RPC, channel)
-  , rpcmethod_Filter_(TableService_method_names[13], options.suffix_for_stats(),::grpc::internal::RpcMethod::NORMAL_RPC, channel)
-  , rpcmethod_UnstructuredFilter_(TableService_method_names[14], options.suffix_for_stats(),::grpc::internal::RpcMethod::NORMAL_RPC, channel)
-  , rpcmethod_Sort_(TableService_method_names[15], options.suffix_for_stats(),::grpc::internal::RpcMethod::NORMAL_RPC, channel)
-  , rpcmethod_Head_(TableService_method_names[16], options.suffix_for_stats(),::grpc::internal::RpcMethod::NORMAL_RPC, channel)
-  , rpcmethod_Tail_(TableService_method_names[17], options.suffix_for_stats(),::grpc::internal::RpcMethod::NORMAL_RPC, channel)
-  , rpcmethod_HeadBy_(TableService_method_names[18], options.suffix_for_stats(),::grpc::internal::RpcMethod::NORMAL_RPC, channel)
-  , rpcmethod_TailBy_(TableService_method_names[19], options.suffix_for_stats(),::grpc::internal::RpcMethod::NORMAL_RPC, channel)
-  , rpcmethod_Ungroup_(TableService_method_names[20], options.suffix_for_stats(),::grpc::internal::RpcMethod::NORMAL_RPC, channel)
-  , rpcmethod_MergeTables_(TableService_method_names[21], options.suffix_for_stats(),::grpc::internal::RpcMethod::NORMAL_RPC, channel)
-  , rpcmethod_CrossJoinTables_(TableService_method_names[22], options.suffix_for_stats(),::grpc::internal::RpcMethod::NORMAL_RPC, channel)
-  , rpcmethod_NaturalJoinTables_(TableService_method_names[23], options.suffix_for_stats(),::grpc::internal::RpcMethod::NORMAL_RPC, channel)
-  , rpcmethod_ExactJoinTables_(TableService_method_names[24], options.suffix_for_stats(),::grpc::internal::RpcMethod::NORMAL_RPC, channel)
-  , rpcmethod_LeftJoinTables_(TableService_method_names[25], options.suffix_for_stats(),::grpc::internal::RpcMethod::NORMAL_RPC, channel)
-  , rpcmethod_AsOfJoinTables_(TableService_method_names[26], options.suffix_for_stats(),::grpc::internal::RpcMethod::NORMAL_RPC, channel)
-  , rpcmethod_AjTables_(TableService_method_names[27], options.suffix_for_stats(),::grpc::internal::RpcMethod::NORMAL_RPC, channel)
-  , rpcmethod_RajTables_(TableService_method_names[28], options.suffix_for_stats(),::grpc::internal::RpcMethod::NORMAL_RPC, channel)
-  , rpcmethod_MultiJoinTables_(TableService_method_names[29], options.suffix_for_stats(),::grpc::internal::RpcMethod::NORMAL_RPC, channel)
-  , rpcmethod_RangeJoinTables_(TableService_method_names[30], options.suffix_for_stats(),::grpc::internal::RpcMethod::NORMAL_RPC, channel)
-  , rpcmethod_ComboAggregate_(TableService_method_names[31], options.suffix_for_stats(),::grpc::internal::RpcMethod::NORMAL_RPC, channel)
-  , rpcmethod_AggregateAll_(TableService_method_names[32], options.suffix_for_stats(),::grpc::internal::RpcMethod::NORMAL_RPC, channel)
-  , rpcmethod_Aggregate_(TableService_method_names[33], options.suffix_for_stats(),::grpc::internal::RpcMethod::NORMAL_RPC, channel)
-  , rpcmethod_Snapshot_(TableService_method_names[34], options.suffix_for_stats(),::grpc::internal::RpcMethod::NORMAL_RPC, channel)
-  , rpcmethod_SnapshotWhen_(TableService_method_names[35], options.suffix_for_stats(),::grpc::internal::RpcMethod::NORMAL_RPC, channel)
-  , rpcmethod_Flatten_(TableService_method_names[36], options.suffix_for_stats(),::grpc::internal::RpcMethod::NORMAL_RPC, channel)
-  , rpcmethod_RunChartDownsample_(TableService_method_names[37], options.suffix_for_stats(),::grpc::internal::RpcMethod::NORMAL_RPC, channel)
-  , rpcmethod_CreateInputTable_(TableService_method_names[38], options.suffix_for_stats(),::grpc::internal::RpcMethod::NORMAL_RPC, channel)
-  , rpcmethod_WhereIn_(TableService_method_names[39], options.suffix_for_stats(),::grpc::internal::RpcMethod::NORMAL_RPC, channel)
-  , rpcmethod_Batch_(TableService_method_names[40], options.suffix_for_stats(),::grpc::internal::RpcMethod::SERVER_STREAMING, channel)
-  , rpcmethod_ExportedTableUpdates_(TableService_method_names[41], options.suffix_for_stats(),::grpc::internal::RpcMethod::SERVER_STREAMING, channel)
-  , rpcmethod_SeekRow_(TableService_method_names[42], options.suffix_for_stats(),::grpc::internal::RpcMethod::NORMAL_RPC, channel)
-  , rpcmethod_MetaTable_(TableService_method_names[43], options.suffix_for_stats(),::grpc::internal::RpcMethod::NORMAL_RPC, channel)
-  , rpcmethod_ComputeColumnStatistics_(TableService_method_names[44], options.suffix_for_stats(),::grpc::internal::RpcMethod::NORMAL_RPC, channel)
-  {}
-
-::grpc::Status TableService::Stub::GetExportedTableCreationResponse(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::Ticket& request, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse* response) {
-  return ::grpc::internal::BlockingUnaryCall< ::io::deephaven::proto::backplane::grpc::Ticket, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse, ::grpc::protobuf::MessageLite, ::grpc::protobuf::MessageLite>(channel_.get(), rpcmethod_GetExportedTableCreationResponse_, context, request, response);
-}
-
-void TableService::Stub::async::GetExportedTableCreationResponse(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::Ticket* request, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse* response, std::function<void(::grpc::Status)> f) {
-  ::grpc::internal::CallbackUnaryCall< ::io::deephaven::proto::backplane::grpc::Ticket, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse, ::grpc::protobuf::MessageLite, ::grpc::protobuf::MessageLite>(stub_->channel_.get(), stub_->rpcmethod_GetExportedTableCreationResponse_, context, request, response, std::move(f));
-}
-
-void TableService::Stub::async::GetExportedTableCreationResponse(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::Ticket* request, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse* response, ::grpc::ClientUnaryReactor* reactor) {
-  ::grpc::internal::ClientCallbackUnaryFactory::Create< ::grpc::protobuf::MessageLite, ::grpc::protobuf::MessageLite>(stub_->channel_.get(), stub_->rpcmethod_GetExportedTableCreationResponse_, context, request, response, reactor);
-}
-
-::grpc::ClientAsyncResponseReader< ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse>* TableService::Stub::PrepareAsyncGetExportedTableCreationResponseRaw(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::Ticket& request, ::grpc::CompletionQueue* cq) {
-  return ::grpc::internal::ClientAsyncResponseReaderHelper::Create< ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse, ::io::deephaven::proto::backplane::grpc::Ticket, ::grpc::protobuf::MessageLite, ::grpc::protobuf::MessageLite>(channel_.get(), cq, rpcmethod_GetExportedTableCreationResponse_, context, request);
-}
-
-::grpc::ClientAsyncResponseReader< ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse>* TableService::Stub::AsyncGetExportedTableCreationResponseRaw(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::Ticket& request, ::grpc::CompletionQueue* cq) {
-  auto* result =
-    this->PrepareAsyncGetExportedTableCreationResponseRaw(context, request, cq);
-  result->StartCall();
-  return result;
-}
-
-::grpc::Status TableService::Stub::FetchTable(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::FetchTableRequest& request, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse* response) {
-  return ::grpc::internal::BlockingUnaryCall< ::io::deephaven::proto::backplane::grpc::FetchTableRequest, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse, ::grpc::protobuf::MessageLite, ::grpc::protobuf::MessageLite>(channel_.get(), rpcmethod_FetchTable_, context, request, response);
-}
-
-void TableService::Stub::async::FetchTable(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::FetchTableRequest* request, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse* response, std::function<void(::grpc::Status)> f) {
-  ::grpc::internal::CallbackUnaryCall< ::io::deephaven::proto::backplane::grpc::FetchTableRequest, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse, ::grpc::protobuf::MessageLite, ::grpc::protobuf::MessageLite>(stub_->channel_.get(), stub_->rpcmethod_FetchTable_, context, request, response, std::move(f));
-}
-
-void TableService::Stub::async::FetchTable(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::FetchTableRequest* request, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse* response, ::grpc::ClientUnaryReactor* reactor) {
-  ::grpc::internal::ClientCallbackUnaryFactory::Create< ::grpc::protobuf::MessageLite, ::grpc::protobuf::MessageLite>(stub_->channel_.get(), stub_->rpcmethod_FetchTable_, context, request, response, reactor);
-}
-
-::grpc::ClientAsyncResponseReader< ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse>* TableService::Stub::PrepareAsyncFetchTableRaw(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::FetchTableRequest& request, ::grpc::CompletionQueue* cq) {
-  return ::grpc::internal::ClientAsyncResponseReaderHelper::Create< ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse, ::io::deephaven::proto::backplane::grpc::FetchTableRequest, ::grpc::protobuf::MessageLite, ::grpc::protobuf::MessageLite>(channel_.get(), cq, rpcmethod_FetchTable_, context, request);
-}
-
-::grpc::ClientAsyncResponseReader< ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse>* TableService::Stub::AsyncFetchTableRaw(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::FetchTableRequest& request, ::grpc::CompletionQueue* cq) {
-  auto* result =
-    this->PrepareAsyncFetchTableRaw(context, request, cq);
-  result->StartCall();
-  return result;
-}
-
-::grpc::Status TableService::Stub::ApplyPreviewColumns(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::ApplyPreviewColumnsRequest& request, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse* response) {
-  return ::grpc::internal::BlockingUnaryCall< ::io::deephaven::proto::backplane::grpc::ApplyPreviewColumnsRequest, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse, ::grpc::protobuf::MessageLite, ::grpc::protobuf::MessageLite>(channel_.get(), rpcmethod_ApplyPreviewColumns_, context, request, response);
-}
-
-void TableService::Stub::async::ApplyPreviewColumns(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::ApplyPreviewColumnsRequest* request, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse* response, std::function<void(::grpc::Status)> f) {
-  ::grpc::internal::CallbackUnaryCall< ::io::deephaven::proto::backplane::grpc::ApplyPreviewColumnsRequest, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse, ::grpc::protobuf::MessageLite, ::grpc::protobuf::MessageLite>(stub_->channel_.get(), stub_->rpcmethod_ApplyPreviewColumns_, context, request, response, std::move(f));
-}
-
-void TableService::Stub::async::ApplyPreviewColumns(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::ApplyPreviewColumnsRequest* request, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse* response, ::grpc::ClientUnaryReactor* reactor) {
-  ::grpc::internal::ClientCallbackUnaryFactory::Create< ::grpc::protobuf::MessageLite, ::grpc::protobuf::MessageLite>(stub_->channel_.get(), stub_->rpcmethod_ApplyPreviewColumns_, context, request, response, reactor);
-}
-
-::grpc::ClientAsyncResponseReader< ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse>* TableService::Stub::PrepareAsyncApplyPreviewColumnsRaw(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::ApplyPreviewColumnsRequest& request, ::grpc::CompletionQueue* cq) {
-  return ::grpc::internal::ClientAsyncResponseReaderHelper::Create< ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse, ::io::deephaven::proto::backplane::grpc::ApplyPreviewColumnsRequest, ::grpc::protobuf::MessageLite, ::grpc::protobuf::MessageLite>(channel_.get(), cq, rpcmethod_ApplyPreviewColumns_, context, request);
-}
-
-::grpc::ClientAsyncResponseReader< ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse>* TableService::Stub::AsyncApplyPreviewColumnsRaw(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::ApplyPreviewColumnsRequest& request, ::grpc::CompletionQueue* cq) {
-  auto* result =
-    this->PrepareAsyncApplyPreviewColumnsRaw(context, request, cq);
-  result->StartCall();
-  return result;
-}
-
-::grpc::Status TableService::Stub::EmptyTable(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::EmptyTableRequest& request, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse* response) {
-  return ::grpc::internal::BlockingUnaryCall< ::io::deephaven::proto::backplane::grpc::EmptyTableRequest, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse, ::grpc::protobuf::MessageLite, ::grpc::protobuf::MessageLite>(channel_.get(), rpcmethod_EmptyTable_, context, request, response);
-}
-
-void TableService::Stub::async::EmptyTable(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::EmptyTableRequest* request, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse* response, std::function<void(::grpc::Status)> f) {
-  ::grpc::internal::CallbackUnaryCall< ::io::deephaven::proto::backplane::grpc::EmptyTableRequest, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse, ::grpc::protobuf::MessageLite, ::grpc::protobuf::MessageLite>(stub_->channel_.get(), stub_->rpcmethod_EmptyTable_, context, request, response, std::move(f));
-}
-
-void TableService::Stub::async::EmptyTable(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::EmptyTableRequest* request, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse* response, ::grpc::ClientUnaryReactor* reactor) {
-  ::grpc::internal::ClientCallbackUnaryFactory::Create< ::grpc::protobuf::MessageLite, ::grpc::protobuf::MessageLite>(stub_->channel_.get(), stub_->rpcmethod_EmptyTable_, context, request, response, reactor);
-}
-
-::grpc::ClientAsyncResponseReader< ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse>* TableService::Stub::PrepareAsyncEmptyTableRaw(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::EmptyTableRequest& request, ::grpc::CompletionQueue* cq) {
-  return ::grpc::internal::ClientAsyncResponseReaderHelper::Create< ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse, ::io::deephaven::proto::backplane::grpc::EmptyTableRequest, ::grpc::protobuf::MessageLite, ::grpc::protobuf::MessageLite>(channel_.get(), cq, rpcmethod_EmptyTable_, context, request);
-}
-
-::grpc::ClientAsyncResponseReader< ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse>* TableService::Stub::AsyncEmptyTableRaw(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::EmptyTableRequest& request, ::grpc::CompletionQueue* cq) {
-  auto* result =
-    this->PrepareAsyncEmptyTableRaw(context, request, cq);
-  result->StartCall();
-  return result;
-}
-
-::grpc::Status TableService::Stub::TimeTable(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::TimeTableRequest& request, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse* response) {
-  return ::grpc::internal::BlockingUnaryCall< ::io::deephaven::proto::backplane::grpc::TimeTableRequest, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse, ::grpc::protobuf::MessageLite, ::grpc::protobuf::MessageLite>(channel_.get(), rpcmethod_TimeTable_, context, request, response);
-}
-
-void TableService::Stub::async::TimeTable(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::TimeTableRequest* request, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse* response, std::function<void(::grpc::Status)> f) {
-  ::grpc::internal::CallbackUnaryCall< ::io::deephaven::proto::backplane::grpc::TimeTableRequest, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse, ::grpc::protobuf::MessageLite, ::grpc::protobuf::MessageLite>(stub_->channel_.get(), stub_->rpcmethod_TimeTable_, context, request, response, std::move(f));
-}
-
-void TableService::Stub::async::TimeTable(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::TimeTableRequest* request, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse* response, ::grpc::ClientUnaryReactor* reactor) {
-  ::grpc::internal::ClientCallbackUnaryFactory::Create< ::grpc::protobuf::MessageLite, ::grpc::protobuf::MessageLite>(stub_->channel_.get(), stub_->rpcmethod_TimeTable_, context, request, response, reactor);
-}
-
-::grpc::ClientAsyncResponseReader< ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse>* TableService::Stub::PrepareAsyncTimeTableRaw(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::TimeTableRequest& request, ::grpc::CompletionQueue* cq) {
-  return ::grpc::internal::ClientAsyncResponseReaderHelper::Create< ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse, ::io::deephaven::proto::backplane::grpc::TimeTableRequest, ::grpc::protobuf::MessageLite, ::grpc::protobuf::MessageLite>(channel_.get(), cq, rpcmethod_TimeTable_, context, request);
-}
-
-::grpc::ClientAsyncResponseReader< ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse>* TableService::Stub::AsyncTimeTableRaw(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::TimeTableRequest& request, ::grpc::CompletionQueue* cq) {
-  auto* result =
-    this->PrepareAsyncTimeTableRaw(context, request, cq);
-  result->StartCall();
-  return result;
-}
-
-::grpc::Status TableService::Stub::DropColumns(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::DropColumnsRequest& request, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse* response) {
-  return ::grpc::internal::BlockingUnaryCall< ::io::deephaven::proto::backplane::grpc::DropColumnsRequest, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse, ::grpc::protobuf::MessageLite, ::grpc::protobuf::MessageLite>(channel_.get(), rpcmethod_DropColumns_, context, request, response);
-}
-
-void TableService::Stub::async::DropColumns(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::DropColumnsRequest* request, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse* response, std::function<void(::grpc::Status)> f) {
-  ::grpc::internal::CallbackUnaryCall< ::io::deephaven::proto::backplane::grpc::DropColumnsRequest, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse, ::grpc::protobuf::MessageLite, ::grpc::protobuf::MessageLite>(stub_->channel_.get(), stub_->rpcmethod_DropColumns_, context, request, response, std::move(f));
-}
-
-void TableService::Stub::async::DropColumns(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::DropColumnsRequest* request, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse* response, ::grpc::ClientUnaryReactor* reactor) {
-  ::grpc::internal::ClientCallbackUnaryFactory::Create< ::grpc::protobuf::MessageLite, ::grpc::protobuf::MessageLite>(stub_->channel_.get(), stub_->rpcmethod_DropColumns_, context, request, response, reactor);
-}
-
-::grpc::ClientAsyncResponseReader< ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse>* TableService::Stub::PrepareAsyncDropColumnsRaw(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::DropColumnsRequest& request, ::grpc::CompletionQueue* cq) {
-  return ::grpc::internal::ClientAsyncResponseReaderHelper::Create< ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse, ::io::deephaven::proto::backplane::grpc::DropColumnsRequest, ::grpc::protobuf::MessageLite, ::grpc::protobuf::MessageLite>(channel_.get(), cq, rpcmethod_DropColumns_, context, request);
-}
-
-::grpc::ClientAsyncResponseReader< ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse>* TableService::Stub::AsyncDropColumnsRaw(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::DropColumnsRequest& request, ::grpc::CompletionQueue* cq) {
-  auto* result =
-    this->PrepareAsyncDropColumnsRaw(context, request, cq);
-  result->StartCall();
-  return result;
-}
-
-::grpc::Status TableService::Stub::Update(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::SelectOrUpdateRequest& request, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse* response) {
-  return ::grpc::internal::BlockingUnaryCall< ::io::deephaven::proto::backplane::grpc::SelectOrUpdateRequest, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse, ::grpc::protobuf::MessageLite, ::grpc::protobuf::MessageLite>(channel_.get(), rpcmethod_Update_, context, request, response);
-}
-
-void TableService::Stub::async::Update(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::SelectOrUpdateRequest* request, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse* response, std::function<void(::grpc::Status)> f) {
-  ::grpc::internal::CallbackUnaryCall< ::io::deephaven::proto::backplane::grpc::SelectOrUpdateRequest, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse, ::grpc::protobuf::MessageLite, ::grpc::protobuf::MessageLite>(stub_->channel_.get(), stub_->rpcmethod_Update_, context, request, response, std::move(f));
-}
-
-void TableService::Stub::async::Update(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::SelectOrUpdateRequest* request, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse* response, ::grpc::ClientUnaryReactor* reactor) {
-  ::grpc::internal::ClientCallbackUnaryFactory::Create< ::grpc::protobuf::MessageLite, ::grpc::protobuf::MessageLite>(stub_->channel_.get(), stub_->rpcmethod_Update_, context, request, response, reactor);
-}
-
-::grpc::ClientAsyncResponseReader< ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse>* TableService::Stub::PrepareAsyncUpdateRaw(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::SelectOrUpdateRequest& request, ::grpc::CompletionQueue* cq) {
-  return ::grpc::internal::ClientAsyncResponseReaderHelper::Create< ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse, ::io::deephaven::proto::backplane::grpc::SelectOrUpdateRequest, ::grpc::protobuf::MessageLite, ::grpc::protobuf::MessageLite>(channel_.get(), cq, rpcmethod_Update_, context, request);
-}
-
-::grpc::ClientAsyncResponseReader< ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse>* TableService::Stub::AsyncUpdateRaw(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::SelectOrUpdateRequest& request, ::grpc::CompletionQueue* cq) {
-  auto* result =
-    this->PrepareAsyncUpdateRaw(context, request, cq);
-  result->StartCall();
-  return result;
-}
-
-::grpc::Status TableService::Stub::LazyUpdate(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::SelectOrUpdateRequest& request, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse* response) {
-  return ::grpc::internal::BlockingUnaryCall< ::io::deephaven::proto::backplane::grpc::SelectOrUpdateRequest, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse, ::grpc::protobuf::MessageLite, ::grpc::protobuf::MessageLite>(channel_.get(), rpcmethod_LazyUpdate_, context, request, response);
-}
-
-void TableService::Stub::async::LazyUpdate(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::SelectOrUpdateRequest* request, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse* response, std::function<void(::grpc::Status)> f) {
-  ::grpc::internal::CallbackUnaryCall< ::io::deephaven::proto::backplane::grpc::SelectOrUpdateRequest, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse, ::grpc::protobuf::MessageLite, ::grpc::protobuf::MessageLite>(stub_->channel_.get(), stub_->rpcmethod_LazyUpdate_, context, request, response, std::move(f));
-}
-
-void TableService::Stub::async::LazyUpdate(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::SelectOrUpdateRequest* request, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse* response, ::grpc::ClientUnaryReactor* reactor) {
-  ::grpc::internal::ClientCallbackUnaryFactory::Create< ::grpc::protobuf::MessageLite, ::grpc::protobuf::MessageLite>(stub_->channel_.get(), stub_->rpcmethod_LazyUpdate_, context, request, response, reactor);
-}
-
-::grpc::ClientAsyncResponseReader< ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse>* TableService::Stub::PrepareAsyncLazyUpdateRaw(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::SelectOrUpdateRequest& request, ::grpc::CompletionQueue* cq) {
-  return ::grpc::internal::ClientAsyncResponseReaderHelper::Create< ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse, ::io::deephaven::proto::backplane::grpc::SelectOrUpdateRequest, ::grpc::protobuf::MessageLite, ::grpc::protobuf::MessageLite>(channel_.get(), cq, rpcmethod_LazyUpdate_, context, request);
-}
-
-::grpc::ClientAsyncResponseReader< ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse>* TableService::Stub::AsyncLazyUpdateRaw(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::SelectOrUpdateRequest& request, ::grpc::CompletionQueue* cq) {
-  auto* result =
-    this->PrepareAsyncLazyUpdateRaw(context, request, cq);
-  result->StartCall();
-  return result;
-}
-
-::grpc::Status TableService::Stub::View(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::SelectOrUpdateRequest& request, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse* response) {
-  return ::grpc::internal::BlockingUnaryCall< ::io::deephaven::proto::backplane::grpc::SelectOrUpdateRequest, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse, ::grpc::protobuf::MessageLite, ::grpc::protobuf::MessageLite>(channel_.get(), rpcmethod_View_, context, request, response);
-}
-
-void TableService::Stub::async::View(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::SelectOrUpdateRequest* request, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse* response, std::function<void(::grpc::Status)> f) {
-  ::grpc::internal::CallbackUnaryCall< ::io::deephaven::proto::backplane::grpc::SelectOrUpdateRequest, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse, ::grpc::protobuf::MessageLite, ::grpc::protobuf::MessageLite>(stub_->channel_.get(), stub_->rpcmethod_View_, context, request, response, std::move(f));
-}
-
-void TableService::Stub::async::View(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::SelectOrUpdateRequest* request, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse* response, ::grpc::ClientUnaryReactor* reactor) {
-  ::grpc::internal::ClientCallbackUnaryFactory::Create< ::grpc::protobuf::MessageLite, ::grpc::protobuf::MessageLite>(stub_->channel_.get(), stub_->rpcmethod_View_, context, request, response, reactor);
-}
-
-::grpc::ClientAsyncResponseReader< ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse>* TableService::Stub::PrepareAsyncViewRaw(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::SelectOrUpdateRequest& request, ::grpc::CompletionQueue* cq) {
-  return ::grpc::internal::ClientAsyncResponseReaderHelper::Create< ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse, ::io::deephaven::proto::backplane::grpc::SelectOrUpdateRequest, ::grpc::protobuf::MessageLite, ::grpc::protobuf::MessageLite>(channel_.get(), cq, rpcmethod_View_, context, request);
-}
-
-::grpc::ClientAsyncResponseReader< ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse>* TableService::Stub::AsyncViewRaw(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::SelectOrUpdateRequest& request, ::grpc::CompletionQueue* cq) {
-  auto* result =
-    this->PrepareAsyncViewRaw(context, request, cq);
-  result->StartCall();
-  return result;
-}
-
-::grpc::Status TableService::Stub::UpdateView(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::SelectOrUpdateRequest& request, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse* response) {
-  return ::grpc::internal::BlockingUnaryCall< ::io::deephaven::proto::backplane::grpc::SelectOrUpdateRequest, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse, ::grpc::protobuf::MessageLite, ::grpc::protobuf::MessageLite>(channel_.get(), rpcmethod_UpdateView_, context, request, response);
-}
-
-void TableService::Stub::async::UpdateView(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::SelectOrUpdateRequest* request, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse* response, std::function<void(::grpc::Status)> f) {
-  ::grpc::internal::CallbackUnaryCall< ::io::deephaven::proto::backplane::grpc::SelectOrUpdateRequest, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse, ::grpc::protobuf::MessageLite, ::grpc::protobuf::MessageLite>(stub_->channel_.get(), stub_->rpcmethod_UpdateView_, context, request, response, std::move(f));
-}
-
-void TableService::Stub::async::UpdateView(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::SelectOrUpdateRequest* request, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse* response, ::grpc::ClientUnaryReactor* reactor) {
-  ::grpc::internal::ClientCallbackUnaryFactory::Create< ::grpc::protobuf::MessageLite, ::grpc::protobuf::MessageLite>(stub_->channel_.get(), stub_->rpcmethod_UpdateView_, context, request, response, reactor);
-}
-
-::grpc::ClientAsyncResponseReader< ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse>* TableService::Stub::PrepareAsyncUpdateViewRaw(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::SelectOrUpdateRequest& request, ::grpc::CompletionQueue* cq) {
-  return ::grpc::internal::ClientAsyncResponseReaderHelper::Create< ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse, ::io::deephaven::proto::backplane::grpc::SelectOrUpdateRequest, ::grpc::protobuf::MessageLite, ::grpc::protobuf::MessageLite>(channel_.get(), cq, rpcmethod_UpdateView_, context, request);
-}
-
-::grpc::ClientAsyncResponseReader< ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse>* TableService::Stub::AsyncUpdateViewRaw(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::SelectOrUpdateRequest& request, ::grpc::CompletionQueue* cq) {
-  auto* result =
-    this->PrepareAsyncUpdateViewRaw(context, request, cq);
-  result->StartCall();
-  return result;
-}
-
-::grpc::Status TableService::Stub::Select(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::SelectOrUpdateRequest& request, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse* response) {
-  return ::grpc::internal::BlockingUnaryCall< ::io::deephaven::proto::backplane::grpc::SelectOrUpdateRequest, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse, ::grpc::protobuf::MessageLite, ::grpc::protobuf::MessageLite>(channel_.get(), rpcmethod_Select_, context, request, response);
-}
-
-void TableService::Stub::async::Select(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::SelectOrUpdateRequest* request, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse* response, std::function<void(::grpc::Status)> f) {
-  ::grpc::internal::CallbackUnaryCall< ::io::deephaven::proto::backplane::grpc::SelectOrUpdateRequest, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse, ::grpc::protobuf::MessageLite, ::grpc::protobuf::MessageLite>(stub_->channel_.get(), stub_->rpcmethod_Select_, context, request, response, std::move(f));
-}
-
-void TableService::Stub::async::Select(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::SelectOrUpdateRequest* request, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse* response, ::grpc::ClientUnaryReactor* reactor) {
-  ::grpc::internal::ClientCallbackUnaryFactory::Create< ::grpc::protobuf::MessageLite, ::grpc::protobuf::MessageLite>(stub_->channel_.get(), stub_->rpcmethod_Select_, context, request, response, reactor);
-}
-
-::grpc::ClientAsyncResponseReader< ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse>* TableService::Stub::PrepareAsyncSelectRaw(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::SelectOrUpdateRequest& request, ::grpc::CompletionQueue* cq) {
-  return ::grpc::internal::ClientAsyncResponseReaderHelper::Create< ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse, ::io::deephaven::proto::backplane::grpc::SelectOrUpdateRequest, ::grpc::protobuf::MessageLite, ::grpc::protobuf::MessageLite>(channel_.get(), cq, rpcmethod_Select_, context, request);
-}
-
-::grpc::ClientAsyncResponseReader< ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse>* TableService::Stub::AsyncSelectRaw(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::SelectOrUpdateRequest& request, ::grpc::CompletionQueue* cq) {
-  auto* result =
-    this->PrepareAsyncSelectRaw(context, request, cq);
-  result->StartCall();
-  return result;
-}
-
-::grpc::Status TableService::Stub::UpdateBy(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::UpdateByRequest& request, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse* response) {
-  return ::grpc::internal::BlockingUnaryCall< ::io::deephaven::proto::backplane::grpc::UpdateByRequest, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse, ::grpc::protobuf::MessageLite, ::grpc::protobuf::MessageLite>(channel_.get(), rpcmethod_UpdateBy_, context, request, response);
-}
-
-void TableService::Stub::async::UpdateBy(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::UpdateByRequest* request, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse* response, std::function<void(::grpc::Status)> f) {
-  ::grpc::internal::CallbackUnaryCall< ::io::deephaven::proto::backplane::grpc::UpdateByRequest, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse, ::grpc::protobuf::MessageLite, ::grpc::protobuf::MessageLite>(stub_->channel_.get(), stub_->rpcmethod_UpdateBy_, context, request, response, std::move(f));
-}
-
-void TableService::Stub::async::UpdateBy(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::UpdateByRequest* request, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse* response, ::grpc::ClientUnaryReactor* reactor) {
-  ::grpc::internal::ClientCallbackUnaryFactory::Create< ::grpc::protobuf::MessageLite, ::grpc::protobuf::MessageLite>(stub_->channel_.get(), stub_->rpcmethod_UpdateBy_, context, request, response, reactor);
-}
-
-::grpc::ClientAsyncResponseReader< ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse>* TableService::Stub::PrepareAsyncUpdateByRaw(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::UpdateByRequest& request, ::grpc::CompletionQueue* cq) {
-  return ::grpc::internal::ClientAsyncResponseReaderHelper::Create< ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse, ::io::deephaven::proto::backplane::grpc::UpdateByRequest, ::grpc::protobuf::MessageLite, ::grpc::protobuf::MessageLite>(channel_.get(), cq, rpcmethod_UpdateBy_, context, request);
-}
-
-::grpc::ClientAsyncResponseReader< ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse>* TableService::Stub::AsyncUpdateByRaw(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::UpdateByRequest& request, ::grpc::CompletionQueue* cq) {
-  auto* result =
-    this->PrepareAsyncUpdateByRaw(context, request, cq);
-  result->StartCall();
-  return result;
-}
-
-::grpc::Status TableService::Stub::SelectDistinct(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::SelectDistinctRequest& request, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse* response) {
-  return ::grpc::internal::BlockingUnaryCall< ::io::deephaven::proto::backplane::grpc::SelectDistinctRequest, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse, ::grpc::protobuf::MessageLite, ::grpc::protobuf::MessageLite>(channel_.get(), rpcmethod_SelectDistinct_, context, request, response);
-}
-
-void TableService::Stub::async::SelectDistinct(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::SelectDistinctRequest* request, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse* response, std::function<void(::grpc::Status)> f) {
-  ::grpc::internal::CallbackUnaryCall< ::io::deephaven::proto::backplane::grpc::SelectDistinctRequest, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse, ::grpc::protobuf::MessageLite, ::grpc::protobuf::MessageLite>(stub_->channel_.get(), stub_->rpcmethod_SelectDistinct_, context, request, response, std::move(f));
-}
-
-void TableService::Stub::async::SelectDistinct(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::SelectDistinctRequest* request, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse* response, ::grpc::ClientUnaryReactor* reactor) {
-  ::grpc::internal::ClientCallbackUnaryFactory::Create< ::grpc::protobuf::MessageLite, ::grpc::protobuf::MessageLite>(stub_->channel_.get(), stub_->rpcmethod_SelectDistinct_, context, request, response, reactor);
-}
-
-::grpc::ClientAsyncResponseReader< ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse>* TableService::Stub::PrepareAsyncSelectDistinctRaw(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::SelectDistinctRequest& request, ::grpc::CompletionQueue* cq) {
-  return ::grpc::internal::ClientAsyncResponseReaderHelper::Create< ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse, ::io::deephaven::proto::backplane::grpc::SelectDistinctRequest, ::grpc::protobuf::MessageLite, ::grpc::protobuf::MessageLite>(channel_.get(), cq, rpcmethod_SelectDistinct_, context, request);
-}
-
-::grpc::ClientAsyncResponseReader< ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse>* TableService::Stub::AsyncSelectDistinctRaw(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::SelectDistinctRequest& request, ::grpc::CompletionQueue* cq) {
-  auto* result =
-    this->PrepareAsyncSelectDistinctRaw(context, request, cq);
-  result->StartCall();
-  return result;
-}
-
-::grpc::Status TableService::Stub::Filter(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::FilterTableRequest& request, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse* response) {
-  return ::grpc::internal::BlockingUnaryCall< ::io::deephaven::proto::backplane::grpc::FilterTableRequest, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse, ::grpc::protobuf::MessageLite, ::grpc::protobuf::MessageLite>(channel_.get(), rpcmethod_Filter_, context, request, response);
-}
-
-void TableService::Stub::async::Filter(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::FilterTableRequest* request, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse* response, std::function<void(::grpc::Status)> f) {
-  ::grpc::internal::CallbackUnaryCall< ::io::deephaven::proto::backplane::grpc::FilterTableRequest, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse, ::grpc::protobuf::MessageLite, ::grpc::protobuf::MessageLite>(stub_->channel_.get(), stub_->rpcmethod_Filter_, context, request, response, std::move(f));
-}
-
-void TableService::Stub::async::Filter(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::FilterTableRequest* request, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse* response, ::grpc::ClientUnaryReactor* reactor) {
-  ::grpc::internal::ClientCallbackUnaryFactory::Create< ::grpc::protobuf::MessageLite, ::grpc::protobuf::MessageLite>(stub_->channel_.get(), stub_->rpcmethod_Filter_, context, request, response, reactor);
-}
-
-::grpc::ClientAsyncResponseReader< ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse>* TableService::Stub::PrepareAsyncFilterRaw(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::FilterTableRequest& request, ::grpc::CompletionQueue* cq) {
-  return ::grpc::internal::ClientAsyncResponseReaderHelper::Create< ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse, ::io::deephaven::proto::backplane::grpc::FilterTableRequest, ::grpc::protobuf::MessageLite, ::grpc::protobuf::MessageLite>(channel_.get(), cq, rpcmethod_Filter_, context, request);
-}
-
-::grpc::ClientAsyncResponseReader< ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse>* TableService::Stub::AsyncFilterRaw(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::FilterTableRequest& request, ::grpc::CompletionQueue* cq) {
-  auto* result =
-    this->PrepareAsyncFilterRaw(context, request, cq);
-  result->StartCall();
-  return result;
-}
-
-::grpc::Status TableService::Stub::UnstructuredFilter(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::UnstructuredFilterTableRequest& request, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse* response) {
-  return ::grpc::internal::BlockingUnaryCall< ::io::deephaven::proto::backplane::grpc::UnstructuredFilterTableRequest, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse, ::grpc::protobuf::MessageLite, ::grpc::protobuf::MessageLite>(channel_.get(), rpcmethod_UnstructuredFilter_, context, request, response);
-}
-
-void TableService::Stub::async::UnstructuredFilter(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::UnstructuredFilterTableRequest* request, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse* response, std::function<void(::grpc::Status)> f) {
-  ::grpc::internal::CallbackUnaryCall< ::io::deephaven::proto::backplane::grpc::UnstructuredFilterTableRequest, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse, ::grpc::protobuf::MessageLite, ::grpc::protobuf::MessageLite>(stub_->channel_.get(), stub_->rpcmethod_UnstructuredFilter_, context, request, response, std::move(f));
-}
-
-void TableService::Stub::async::UnstructuredFilter(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::UnstructuredFilterTableRequest* request, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse* response, ::grpc::ClientUnaryReactor* reactor) {
-  ::grpc::internal::ClientCallbackUnaryFactory::Create< ::grpc::protobuf::MessageLite, ::grpc::protobuf::MessageLite>(stub_->channel_.get(), stub_->rpcmethod_UnstructuredFilter_, context, request, response, reactor);
-}
-
-::grpc::ClientAsyncResponseReader< ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse>* TableService::Stub::PrepareAsyncUnstructuredFilterRaw(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::UnstructuredFilterTableRequest& request, ::grpc::CompletionQueue* cq) {
-  return ::grpc::internal::ClientAsyncResponseReaderHelper::Create< ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse, ::io::deephaven::proto::backplane::grpc::UnstructuredFilterTableRequest, ::grpc::protobuf::MessageLite, ::grpc::protobuf::MessageLite>(channel_.get(), cq, rpcmethod_UnstructuredFilter_, context, request);
-}
-
-::grpc::ClientAsyncResponseReader< ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse>* TableService::Stub::AsyncUnstructuredFilterRaw(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::UnstructuredFilterTableRequest& request, ::grpc::CompletionQueue* cq) {
-  auto* result =
-    this->PrepareAsyncUnstructuredFilterRaw(context, request, cq);
-  result->StartCall();
-  return result;
-}
-
-::grpc::Status TableService::Stub::Sort(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::SortTableRequest& request, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse* response) {
-  return ::grpc::internal::BlockingUnaryCall< ::io::deephaven::proto::backplane::grpc::SortTableRequest, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse, ::grpc::protobuf::MessageLite, ::grpc::protobuf::MessageLite>(channel_.get(), rpcmethod_Sort_, context, request, response);
-}
-
-void TableService::Stub::async::Sort(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::SortTableRequest* request, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse* response, std::function<void(::grpc::Status)> f) {
-  ::grpc::internal::CallbackUnaryCall< ::io::deephaven::proto::backplane::grpc::SortTableRequest, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse, ::grpc::protobuf::MessageLite, ::grpc::protobuf::MessageLite>(stub_->channel_.get(), stub_->rpcmethod_Sort_, context, request, response, std::move(f));
-}
-
-void TableService::Stub::async::Sort(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::SortTableRequest* request, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse* response, ::grpc::ClientUnaryReactor* reactor) {
-  ::grpc::internal::ClientCallbackUnaryFactory::Create< ::grpc::protobuf::MessageLite, ::grpc::protobuf::MessageLite>(stub_->channel_.get(), stub_->rpcmethod_Sort_, context, request, response, reactor);
-}
-
-::grpc::ClientAsyncResponseReader< ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse>* TableService::Stub::PrepareAsyncSortRaw(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::SortTableRequest& request, ::grpc::CompletionQueue* cq) {
-  return ::grpc::internal::ClientAsyncResponseReaderHelper::Create< ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse, ::io::deephaven::proto::backplane::grpc::SortTableRequest, ::grpc::protobuf::MessageLite, ::grpc::protobuf::MessageLite>(channel_.get(), cq, rpcmethod_Sort_, context, request);
-}
-
-::grpc::ClientAsyncResponseReader< ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse>* TableService::Stub::AsyncSortRaw(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::SortTableRequest& request, ::grpc::CompletionQueue* cq) {
-  auto* result =
-    this->PrepareAsyncSortRaw(context, request, cq);
-  result->StartCall();
-  return result;
-}
-
-::grpc::Status TableService::Stub::Head(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::HeadOrTailRequest& request, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse* response) {
-  return ::grpc::internal::BlockingUnaryCall< ::io::deephaven::proto::backplane::grpc::HeadOrTailRequest, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse, ::grpc::protobuf::MessageLite, ::grpc::protobuf::MessageLite>(channel_.get(), rpcmethod_Head_, context, request, response);
-}
-
-void TableService::Stub::async::Head(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::HeadOrTailRequest* request, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse* response, std::function<void(::grpc::Status)> f) {
-  ::grpc::internal::CallbackUnaryCall< ::io::deephaven::proto::backplane::grpc::HeadOrTailRequest, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse, ::grpc::protobuf::MessageLite, ::grpc::protobuf::MessageLite>(stub_->channel_.get(), stub_->rpcmethod_Head_, context, request, response, std::move(f));
-}
-
-void TableService::Stub::async::Head(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::HeadOrTailRequest* request, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse* response, ::grpc::ClientUnaryReactor* reactor) {
-  ::grpc::internal::ClientCallbackUnaryFactory::Create< ::grpc::protobuf::MessageLite, ::grpc::protobuf::MessageLite>(stub_->channel_.get(), stub_->rpcmethod_Head_, context, request, response, reactor);
-}
-
-::grpc::ClientAsyncResponseReader< ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse>* TableService::Stub::PrepareAsyncHeadRaw(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::HeadOrTailRequest& request, ::grpc::CompletionQueue* cq) {
-  return ::grpc::internal::ClientAsyncResponseReaderHelper::Create< ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse, ::io::deephaven::proto::backplane::grpc::HeadOrTailRequest, ::grpc::protobuf::MessageLite, ::grpc::protobuf::MessageLite>(channel_.get(), cq, rpcmethod_Head_, context, request);
-}
-
-::grpc::ClientAsyncResponseReader< ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse>* TableService::Stub::AsyncHeadRaw(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::HeadOrTailRequest& request, ::grpc::CompletionQueue* cq) {
-  auto* result =
-    this->PrepareAsyncHeadRaw(context, request, cq);
-  result->StartCall();
-  return result;
-}
-
-::grpc::Status TableService::Stub::Tail(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::HeadOrTailRequest& request, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse* response) {
-  return ::grpc::internal::BlockingUnaryCall< ::io::deephaven::proto::backplane::grpc::HeadOrTailRequest, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse, ::grpc::protobuf::MessageLite, ::grpc::protobuf::MessageLite>(channel_.get(), rpcmethod_Tail_, context, request, response);
-}
-
-void TableService::Stub::async::Tail(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::HeadOrTailRequest* request, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse* response, std::function<void(::grpc::Status)> f) {
-  ::grpc::internal::CallbackUnaryCall< ::io::deephaven::proto::backplane::grpc::HeadOrTailRequest, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse, ::grpc::protobuf::MessageLite, ::grpc::protobuf::MessageLite>(stub_->channel_.get(), stub_->rpcmethod_Tail_, context, request, response, std::move(f));
-}
-
-void TableService::Stub::async::Tail(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::HeadOrTailRequest* request, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse* response, ::grpc::ClientUnaryReactor* reactor) {
-  ::grpc::internal::ClientCallbackUnaryFactory::Create< ::grpc::protobuf::MessageLite, ::grpc::protobuf::MessageLite>(stub_->channel_.get(), stub_->rpcmethod_Tail_, context, request, response, reactor);
-}
-
-::grpc::ClientAsyncResponseReader< ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse>* TableService::Stub::PrepareAsyncTailRaw(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::HeadOrTailRequest& request, ::grpc::CompletionQueue* cq) {
-  return ::grpc::internal::ClientAsyncResponseReaderHelper::Create< ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse, ::io::deephaven::proto::backplane::grpc::HeadOrTailRequest, ::grpc::protobuf::MessageLite, ::grpc::protobuf::MessageLite>(channel_.get(), cq, rpcmethod_Tail_, context, request);
-}
-
-::grpc::ClientAsyncResponseReader< ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse>* TableService::Stub::AsyncTailRaw(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::HeadOrTailRequest& request, ::grpc::CompletionQueue* cq) {
-  auto* result =
-    this->PrepareAsyncTailRaw(context, request, cq);
-  result->StartCall();
-  return result;
-}
-
-::grpc::Status TableService::Stub::HeadBy(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::HeadOrTailByRequest& request, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse* response) {
-  return ::grpc::internal::BlockingUnaryCall< ::io::deephaven::proto::backplane::grpc::HeadOrTailByRequest, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse, ::grpc::protobuf::MessageLite, ::grpc::protobuf::MessageLite>(channel_.get(), rpcmethod_HeadBy_, context, request, response);
-}
-
-void TableService::Stub::async::HeadBy(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::HeadOrTailByRequest* request, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse* response, std::function<void(::grpc::Status)> f) {
-  ::grpc::internal::CallbackUnaryCall< ::io::deephaven::proto::backplane::grpc::HeadOrTailByRequest, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse, ::grpc::protobuf::MessageLite, ::grpc::protobuf::MessageLite>(stub_->channel_.get(), stub_->rpcmethod_HeadBy_, context, request, response, std::move(f));
-}
-
-void TableService::Stub::async::HeadBy(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::HeadOrTailByRequest* request, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse* response, ::grpc::ClientUnaryReactor* reactor) {
-  ::grpc::internal::ClientCallbackUnaryFactory::Create< ::grpc::protobuf::MessageLite, ::grpc::protobuf::MessageLite>(stub_->channel_.get(), stub_->rpcmethod_HeadBy_, context, request, response, reactor);
-}
-
-::grpc::ClientAsyncResponseReader< ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse>* TableService::Stub::PrepareAsyncHeadByRaw(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::HeadOrTailByRequest& request, ::grpc::CompletionQueue* cq) {
-  return ::grpc::internal::ClientAsyncResponseReaderHelper::Create< ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse, ::io::deephaven::proto::backplane::grpc::HeadOrTailByRequest, ::grpc::protobuf::MessageLite, ::grpc::protobuf::MessageLite>(channel_.get(), cq, rpcmethod_HeadBy_, context, request);
-}
-
-::grpc::ClientAsyncResponseReader< ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse>* TableService::Stub::AsyncHeadByRaw(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::HeadOrTailByRequest& request, ::grpc::CompletionQueue* cq) {
-  auto* result =
-    this->PrepareAsyncHeadByRaw(context, request, cq);
-  result->StartCall();
-  return result;
-}
-
-::grpc::Status TableService::Stub::TailBy(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::HeadOrTailByRequest& request, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse* response) {
-  return ::grpc::internal::BlockingUnaryCall< ::io::deephaven::proto::backplane::grpc::HeadOrTailByRequest, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse, ::grpc::protobuf::MessageLite, ::grpc::protobuf::MessageLite>(channel_.get(), rpcmethod_TailBy_, context, request, response);
-}
-
-void TableService::Stub::async::TailBy(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::HeadOrTailByRequest* request, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse* response, std::function<void(::grpc::Status)> f) {
-  ::grpc::internal::CallbackUnaryCall< ::io::deephaven::proto::backplane::grpc::HeadOrTailByRequest, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse, ::grpc::protobuf::MessageLite, ::grpc::protobuf::MessageLite>(stub_->channel_.get(), stub_->rpcmethod_TailBy_, context, request, response, std::move(f));
-}
-
-void TableService::Stub::async::TailBy(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::HeadOrTailByRequest* request, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse* response, ::grpc::ClientUnaryReactor* reactor) {
-  ::grpc::internal::ClientCallbackUnaryFactory::Create< ::grpc::protobuf::MessageLite, ::grpc::protobuf::MessageLite>(stub_->channel_.get(), stub_->rpcmethod_TailBy_, context, request, response, reactor);
-}
-
-::grpc::ClientAsyncResponseReader< ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse>* TableService::Stub::PrepareAsyncTailByRaw(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::HeadOrTailByRequest& request, ::grpc::CompletionQueue* cq) {
-  return ::grpc::internal::ClientAsyncResponseReaderHelper::Create< ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse, ::io::deephaven::proto::backplane::grpc::HeadOrTailByRequest, ::grpc::protobuf::MessageLite, ::grpc::protobuf::MessageLite>(channel_.get(), cq, rpcmethod_TailBy_, context, request);
-}
-
-::grpc::ClientAsyncResponseReader< ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse>* TableService::Stub::AsyncTailByRaw(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::HeadOrTailByRequest& request, ::grpc::CompletionQueue* cq) {
-  auto* result =
-    this->PrepareAsyncTailByRaw(context, request, cq);
-  result->StartCall();
-  return result;
-}
-
-::grpc::Status TableService::Stub::Ungroup(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::UngroupRequest& request, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse* response) {
-  return ::grpc::internal::BlockingUnaryCall< ::io::deephaven::proto::backplane::grpc::UngroupRequest, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse, ::grpc::protobuf::MessageLite, ::grpc::protobuf::MessageLite>(channel_.get(), rpcmethod_Ungroup_, context, request, response);
-}
-
-void TableService::Stub::async::Ungroup(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::UngroupRequest* request, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse* response, std::function<void(::grpc::Status)> f) {
-  ::grpc::internal::CallbackUnaryCall< ::io::deephaven::proto::backplane::grpc::UngroupRequest, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse, ::grpc::protobuf::MessageLite, ::grpc::protobuf::MessageLite>(stub_->channel_.get(), stub_->rpcmethod_Ungroup_, context, request, response, std::move(f));
-}
-
-void TableService::Stub::async::Ungroup(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::UngroupRequest* request, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse* response, ::grpc::ClientUnaryReactor* reactor) {
-  ::grpc::internal::ClientCallbackUnaryFactory::Create< ::grpc::protobuf::MessageLite, ::grpc::protobuf::MessageLite>(stub_->channel_.get(), stub_->rpcmethod_Ungroup_, context, request, response, reactor);
-}
-
-::grpc::ClientAsyncResponseReader< ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse>* TableService::Stub::PrepareAsyncUngroupRaw(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::UngroupRequest& request, ::grpc::CompletionQueue* cq) {
-  return ::grpc::internal::ClientAsyncResponseReaderHelper::Create< ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse, ::io::deephaven::proto::backplane::grpc::UngroupRequest, ::grpc::protobuf::MessageLite, ::grpc::protobuf::MessageLite>(channel_.get(), cq, rpcmethod_Ungroup_, context, request);
-}
-
-::grpc::ClientAsyncResponseReader< ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse>* TableService::Stub::AsyncUngroupRaw(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::UngroupRequest& request, ::grpc::CompletionQueue* cq) {
-  auto* result =
-    this->PrepareAsyncUngroupRaw(context, request, cq);
-  result->StartCall();
-  return result;
-}
-
-::grpc::Status TableService::Stub::MergeTables(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::MergeTablesRequest& request, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse* response) {
-  return ::grpc::internal::BlockingUnaryCall< ::io::deephaven::proto::backplane::grpc::MergeTablesRequest, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse, ::grpc::protobuf::MessageLite, ::grpc::protobuf::MessageLite>(channel_.get(), rpcmethod_MergeTables_, context, request, response);
-}
-
-void TableService::Stub::async::MergeTables(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::MergeTablesRequest* request, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse* response, std::function<void(::grpc::Status)> f) {
-  ::grpc::internal::CallbackUnaryCall< ::io::deephaven::proto::backplane::grpc::MergeTablesRequest, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse, ::grpc::protobuf::MessageLite, ::grpc::protobuf::MessageLite>(stub_->channel_.get(), stub_->rpcmethod_MergeTables_, context, request, response, std::move(f));
-}
-
-void TableService::Stub::async::MergeTables(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::MergeTablesRequest* request, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse* response, ::grpc::ClientUnaryReactor* reactor) {
-  ::grpc::internal::ClientCallbackUnaryFactory::Create< ::grpc::protobuf::MessageLite, ::grpc::protobuf::MessageLite>(stub_->channel_.get(), stub_->rpcmethod_MergeTables_, context, request, response, reactor);
-}
-
-::grpc::ClientAsyncResponseReader< ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse>* TableService::Stub::PrepareAsyncMergeTablesRaw(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::MergeTablesRequest& request, ::grpc::CompletionQueue* cq) {
-  return ::grpc::internal::ClientAsyncResponseReaderHelper::Create< ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse, ::io::deephaven::proto::backplane::grpc::MergeTablesRequest, ::grpc::protobuf::MessageLite, ::grpc::protobuf::MessageLite>(channel_.get(), cq, rpcmethod_MergeTables_, context, request);
-}
-
-::grpc::ClientAsyncResponseReader< ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse>* TableService::Stub::AsyncMergeTablesRaw(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::MergeTablesRequest& request, ::grpc::CompletionQueue* cq) {
-  auto* result =
-    this->PrepareAsyncMergeTablesRaw(context, request, cq);
-  result->StartCall();
-  return result;
-}
-
-::grpc::Status TableService::Stub::CrossJoinTables(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::CrossJoinTablesRequest& request, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse* response) {
-  return ::grpc::internal::BlockingUnaryCall< ::io::deephaven::proto::backplane::grpc::CrossJoinTablesRequest, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse, ::grpc::protobuf::MessageLite, ::grpc::protobuf::MessageLite>(channel_.get(), rpcmethod_CrossJoinTables_, context, request, response);
-}
-
-void TableService::Stub::async::CrossJoinTables(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::CrossJoinTablesRequest* request, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse* response, std::function<void(::grpc::Status)> f) {
-  ::grpc::internal::CallbackUnaryCall< ::io::deephaven::proto::backplane::grpc::CrossJoinTablesRequest, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse, ::grpc::protobuf::MessageLite, ::grpc::protobuf::MessageLite>(stub_->channel_.get(), stub_->rpcmethod_CrossJoinTables_, context, request, response, std::move(f));
-}
-
-void TableService::Stub::async::CrossJoinTables(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::CrossJoinTablesRequest* request, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse* response, ::grpc::ClientUnaryReactor* reactor) {
-  ::grpc::internal::ClientCallbackUnaryFactory::Create< ::grpc::protobuf::MessageLite, ::grpc::protobuf::MessageLite>(stub_->channel_.get(), stub_->rpcmethod_CrossJoinTables_, context, request, response, reactor);
-}
-
-::grpc::ClientAsyncResponseReader< ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse>* TableService::Stub::PrepareAsyncCrossJoinTablesRaw(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::CrossJoinTablesRequest& request, ::grpc::CompletionQueue* cq) {
-  return ::grpc::internal::ClientAsyncResponseReaderHelper::Create< ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse, ::io::deephaven::proto::backplane::grpc::CrossJoinTablesRequest, ::grpc::protobuf::MessageLite, ::grpc::protobuf::MessageLite>(channel_.get(), cq, rpcmethod_CrossJoinTables_, context, request);
-}
-
-::grpc::ClientAsyncResponseReader< ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse>* TableService::Stub::AsyncCrossJoinTablesRaw(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::CrossJoinTablesRequest& request, ::grpc::CompletionQueue* cq) {
-  auto* result =
-    this->PrepareAsyncCrossJoinTablesRaw(context, request, cq);
-  result->StartCall();
-  return result;
-}
-
-::grpc::Status TableService::Stub::NaturalJoinTables(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::NaturalJoinTablesRequest& request, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse* response) {
-  return ::grpc::internal::BlockingUnaryCall< ::io::deephaven::proto::backplane::grpc::NaturalJoinTablesRequest, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse, ::grpc::protobuf::MessageLite, ::grpc::protobuf::MessageLite>(channel_.get(), rpcmethod_NaturalJoinTables_, context, request, response);
-}
-
-void TableService::Stub::async::NaturalJoinTables(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::NaturalJoinTablesRequest* request, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse* response, std::function<void(::grpc::Status)> f) {
-  ::grpc::internal::CallbackUnaryCall< ::io::deephaven::proto::backplane::grpc::NaturalJoinTablesRequest, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse, ::grpc::protobuf::MessageLite, ::grpc::protobuf::MessageLite>(stub_->channel_.get(), stub_->rpcmethod_NaturalJoinTables_, context, request, response, std::move(f));
-}
-
-void TableService::Stub::async::NaturalJoinTables(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::NaturalJoinTablesRequest* request, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse* response, ::grpc::ClientUnaryReactor* reactor) {
-  ::grpc::internal::ClientCallbackUnaryFactory::Create< ::grpc::protobuf::MessageLite, ::grpc::protobuf::MessageLite>(stub_->channel_.get(), stub_->rpcmethod_NaturalJoinTables_, context, request, response, reactor);
-}
-
-::grpc::ClientAsyncResponseReader< ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse>* TableService::Stub::PrepareAsyncNaturalJoinTablesRaw(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::NaturalJoinTablesRequest& request, ::grpc::CompletionQueue* cq) {
-  return ::grpc::internal::ClientAsyncResponseReaderHelper::Create< ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse, ::io::deephaven::proto::backplane::grpc::NaturalJoinTablesRequest, ::grpc::protobuf::MessageLite, ::grpc::protobuf::MessageLite>(channel_.get(), cq, rpcmethod_NaturalJoinTables_, context, request);
-}
-
-::grpc::ClientAsyncResponseReader< ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse>* TableService::Stub::AsyncNaturalJoinTablesRaw(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::NaturalJoinTablesRequest& request, ::grpc::CompletionQueue* cq) {
-  auto* result =
-    this->PrepareAsyncNaturalJoinTablesRaw(context, request, cq);
-  result->StartCall();
-  return result;
-}
-
-::grpc::Status TableService::Stub::ExactJoinTables(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::ExactJoinTablesRequest& request, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse* response) {
-  return ::grpc::internal::BlockingUnaryCall< ::io::deephaven::proto::backplane::grpc::ExactJoinTablesRequest, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse, ::grpc::protobuf::MessageLite, ::grpc::protobuf::MessageLite>(channel_.get(), rpcmethod_ExactJoinTables_, context, request, response);
-}
-
-void TableService::Stub::async::ExactJoinTables(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::ExactJoinTablesRequest* request, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse* response, std::function<void(::grpc::Status)> f) {
-  ::grpc::internal::CallbackUnaryCall< ::io::deephaven::proto::backplane::grpc::ExactJoinTablesRequest, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse, ::grpc::protobuf::MessageLite, ::grpc::protobuf::MessageLite>(stub_->channel_.get(), stub_->rpcmethod_ExactJoinTables_, context, request, response, std::move(f));
-}
-
-void TableService::Stub::async::ExactJoinTables(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::ExactJoinTablesRequest* request, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse* response, ::grpc::ClientUnaryReactor* reactor) {
-  ::grpc::internal::ClientCallbackUnaryFactory::Create< ::grpc::protobuf::MessageLite, ::grpc::protobuf::MessageLite>(stub_->channel_.get(), stub_->rpcmethod_ExactJoinTables_, context, request, response, reactor);
-}
-
-::grpc::ClientAsyncResponseReader< ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse>* TableService::Stub::PrepareAsyncExactJoinTablesRaw(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::ExactJoinTablesRequest& request, ::grpc::CompletionQueue* cq) {
-  return ::grpc::internal::ClientAsyncResponseReaderHelper::Create< ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse, ::io::deephaven::proto::backplane::grpc::ExactJoinTablesRequest, ::grpc::protobuf::MessageLite, ::grpc::protobuf::MessageLite>(channel_.get(), cq, rpcmethod_ExactJoinTables_, context, request);
-}
-
-::grpc::ClientAsyncResponseReader< ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse>* TableService::Stub::AsyncExactJoinTablesRaw(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::ExactJoinTablesRequest& request, ::grpc::CompletionQueue* cq) {
-  auto* result =
-    this->PrepareAsyncExactJoinTablesRaw(context, request, cq);
-  result->StartCall();
-  return result;
-}
-
-::grpc::Status TableService::Stub::LeftJoinTables(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::LeftJoinTablesRequest& request, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse* response) {
-  return ::grpc::internal::BlockingUnaryCall< ::io::deephaven::proto::backplane::grpc::LeftJoinTablesRequest, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse, ::grpc::protobuf::MessageLite, ::grpc::protobuf::MessageLite>(channel_.get(), rpcmethod_LeftJoinTables_, context, request, response);
-}
-
-void TableService::Stub::async::LeftJoinTables(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::LeftJoinTablesRequest* request, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse* response, std::function<void(::grpc::Status)> f) {
-  ::grpc::internal::CallbackUnaryCall< ::io::deephaven::proto::backplane::grpc::LeftJoinTablesRequest, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse, ::grpc::protobuf::MessageLite, ::grpc::protobuf::MessageLite>(stub_->channel_.get(), stub_->rpcmethod_LeftJoinTables_, context, request, response, std::move(f));
-}
-
-void TableService::Stub::async::LeftJoinTables(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::LeftJoinTablesRequest* request, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse* response, ::grpc::ClientUnaryReactor* reactor) {
-  ::grpc::internal::ClientCallbackUnaryFactory::Create< ::grpc::protobuf::MessageLite, ::grpc::protobuf::MessageLite>(stub_->channel_.get(), stub_->rpcmethod_LeftJoinTables_, context, request, response, reactor);
-}
-
-::grpc::ClientAsyncResponseReader< ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse>* TableService::Stub::PrepareAsyncLeftJoinTablesRaw(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::LeftJoinTablesRequest& request, ::grpc::CompletionQueue* cq) {
-  return ::grpc::internal::ClientAsyncResponseReaderHelper::Create< ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse, ::io::deephaven::proto::backplane::grpc::LeftJoinTablesRequest, ::grpc::protobuf::MessageLite, ::grpc::protobuf::MessageLite>(channel_.get(), cq, rpcmethod_LeftJoinTables_, context, request);
-}
-
-::grpc::ClientAsyncResponseReader< ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse>* TableService::Stub::AsyncLeftJoinTablesRaw(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::LeftJoinTablesRequest& request, ::grpc::CompletionQueue* cq) {
-  auto* result =
-    this->PrepareAsyncLeftJoinTablesRaw(context, request, cq);
-  result->StartCall();
-  return result;
-}
-
-::grpc::Status TableService::Stub::AsOfJoinTables(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::AsOfJoinTablesRequest& request, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse* response) {
-  return ::grpc::internal::BlockingUnaryCall< ::io::deephaven::proto::backplane::grpc::AsOfJoinTablesRequest, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse, ::grpc::protobuf::MessageLite, ::grpc::protobuf::MessageLite>(channel_.get(), rpcmethod_AsOfJoinTables_, context, request, response);
-}
-
-void TableService::Stub::async::AsOfJoinTables(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::AsOfJoinTablesRequest* request, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse* response, std::function<void(::grpc::Status)> f) {
-  ::grpc::internal::CallbackUnaryCall< ::io::deephaven::proto::backplane::grpc::AsOfJoinTablesRequest, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse, ::grpc::protobuf::MessageLite, ::grpc::protobuf::MessageLite>(stub_->channel_.get(), stub_->rpcmethod_AsOfJoinTables_, context, request, response, std::move(f));
-}
-
-void TableService::Stub::async::AsOfJoinTables(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::AsOfJoinTablesRequest* request, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse* response, ::grpc::ClientUnaryReactor* reactor) {
-  ::grpc::internal::ClientCallbackUnaryFactory::Create< ::grpc::protobuf::MessageLite, ::grpc::protobuf::MessageLite>(stub_->channel_.get(), stub_->rpcmethod_AsOfJoinTables_, context, request, response, reactor);
-}
-
-::grpc::ClientAsyncResponseReader< ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse>* TableService::Stub::PrepareAsyncAsOfJoinTablesRaw(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::AsOfJoinTablesRequest& request, ::grpc::CompletionQueue* cq) {
-  return ::grpc::internal::ClientAsyncResponseReaderHelper::Create< ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse, ::io::deephaven::proto::backplane::grpc::AsOfJoinTablesRequest, ::grpc::protobuf::MessageLite, ::grpc::protobuf::MessageLite>(channel_.get(), cq, rpcmethod_AsOfJoinTables_, context, request);
-}
-
-::grpc::ClientAsyncResponseReader< ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse>* TableService::Stub::AsyncAsOfJoinTablesRaw(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::AsOfJoinTablesRequest& request, ::grpc::CompletionQueue* cq) {
-  auto* result =
-    this->PrepareAsyncAsOfJoinTablesRaw(context, request, cq);
-  result->StartCall();
-  return result;
-}
-
-::grpc::Status TableService::Stub::AjTables(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::AjRajTablesRequest& request, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse* response) {
-  return ::grpc::internal::BlockingUnaryCall< ::io::deephaven::proto::backplane::grpc::AjRajTablesRequest, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse, ::grpc::protobuf::MessageLite, ::grpc::protobuf::MessageLite>(channel_.get(), rpcmethod_AjTables_, context, request, response);
-}
-
-void TableService::Stub::async::AjTables(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::AjRajTablesRequest* request, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse* response, std::function<void(::grpc::Status)> f) {
-  ::grpc::internal::CallbackUnaryCall< ::io::deephaven::proto::backplane::grpc::AjRajTablesRequest, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse, ::grpc::protobuf::MessageLite, ::grpc::protobuf::MessageLite>(stub_->channel_.get(), stub_->rpcmethod_AjTables_, context, request, response, std::move(f));
-}
-
-void TableService::Stub::async::AjTables(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::AjRajTablesRequest* request, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse* response, ::grpc::ClientUnaryReactor* reactor) {
-  ::grpc::internal::ClientCallbackUnaryFactory::Create< ::grpc::protobuf::MessageLite, ::grpc::protobuf::MessageLite>(stub_->channel_.get(), stub_->rpcmethod_AjTables_, context, request, response, reactor);
-}
-
-::grpc::ClientAsyncResponseReader< ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse>* TableService::Stub::PrepareAsyncAjTablesRaw(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::AjRajTablesRequest& request, ::grpc::CompletionQueue* cq) {
-  return ::grpc::internal::ClientAsyncResponseReaderHelper::Create< ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse, ::io::deephaven::proto::backplane::grpc::AjRajTablesRequest, ::grpc::protobuf::MessageLite, ::grpc::protobuf::MessageLite>(channel_.get(), cq, rpcmethod_AjTables_, context, request);
-}
-
-::grpc::ClientAsyncResponseReader< ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse>* TableService::Stub::AsyncAjTablesRaw(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::AjRajTablesRequest& request, ::grpc::CompletionQueue* cq) {
-  auto* result =
-    this->PrepareAsyncAjTablesRaw(context, request, cq);
-  result->StartCall();
-  return result;
-}
-
-::grpc::Status TableService::Stub::RajTables(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::AjRajTablesRequest& request, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse* response) {
-  return ::grpc::internal::BlockingUnaryCall< ::io::deephaven::proto::backplane::grpc::AjRajTablesRequest, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse, ::grpc::protobuf::MessageLite, ::grpc::protobuf::MessageLite>(channel_.get(), rpcmethod_RajTables_, context, request, response);
-}
-
-void TableService::Stub::async::RajTables(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::AjRajTablesRequest* request, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse* response, std::function<void(::grpc::Status)> f) {
-  ::grpc::internal::CallbackUnaryCall< ::io::deephaven::proto::backplane::grpc::AjRajTablesRequest, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse, ::grpc::protobuf::MessageLite, ::grpc::protobuf::MessageLite>(stub_->channel_.get(), stub_->rpcmethod_RajTables_, context, request, response, std::move(f));
-}
-
-void TableService::Stub::async::RajTables(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::AjRajTablesRequest* request, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse* response, ::grpc::ClientUnaryReactor* reactor) {
-  ::grpc::internal::ClientCallbackUnaryFactory::Create< ::grpc::protobuf::MessageLite, ::grpc::protobuf::MessageLite>(stub_->channel_.get(), stub_->rpcmethod_RajTables_, context, request, response, reactor);
-}
-
-::grpc::ClientAsyncResponseReader< ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse>* TableService::Stub::PrepareAsyncRajTablesRaw(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::AjRajTablesRequest& request, ::grpc::CompletionQueue* cq) {
-  return ::grpc::internal::ClientAsyncResponseReaderHelper::Create< ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse, ::io::deephaven::proto::backplane::grpc::AjRajTablesRequest, ::grpc::protobuf::MessageLite, ::grpc::protobuf::MessageLite>(channel_.get(), cq, rpcmethod_RajTables_, context, request);
-}
-
-::grpc::ClientAsyncResponseReader< ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse>* TableService::Stub::AsyncRajTablesRaw(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::AjRajTablesRequest& request, ::grpc::CompletionQueue* cq) {
-  auto* result =
-    this->PrepareAsyncRajTablesRaw(context, request, cq);
-  result->StartCall();
-  return result;
-}
-
-::grpc::Status TableService::Stub::MultiJoinTables(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::MultiJoinTablesRequest& request, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse* response) {
-  return ::grpc::internal::BlockingUnaryCall< ::io::deephaven::proto::backplane::grpc::MultiJoinTablesRequest, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse, ::grpc::protobuf::MessageLite, ::grpc::protobuf::MessageLite>(channel_.get(), rpcmethod_MultiJoinTables_, context, request, response);
-}
-
-void TableService::Stub::async::MultiJoinTables(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::MultiJoinTablesRequest* request, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse* response, std::function<void(::grpc::Status)> f) {
-  ::grpc::internal::CallbackUnaryCall< ::io::deephaven::proto::backplane::grpc::MultiJoinTablesRequest, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse, ::grpc::protobuf::MessageLite, ::grpc::protobuf::MessageLite>(stub_->channel_.get(), stub_->rpcmethod_MultiJoinTables_, context, request, response, std::move(f));
-}
-
-void TableService::Stub::async::MultiJoinTables(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::MultiJoinTablesRequest* request, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse* response, ::grpc::ClientUnaryReactor* reactor) {
-  ::grpc::internal::ClientCallbackUnaryFactory::Create< ::grpc::protobuf::MessageLite, ::grpc::protobuf::MessageLite>(stub_->channel_.get(), stub_->rpcmethod_MultiJoinTables_, context, request, response, reactor);
-}
-
-::grpc::ClientAsyncResponseReader< ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse>* TableService::Stub::PrepareAsyncMultiJoinTablesRaw(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::MultiJoinTablesRequest& request, ::grpc::CompletionQueue* cq) {
-  return ::grpc::internal::ClientAsyncResponseReaderHelper::Create< ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse, ::io::deephaven::proto::backplane::grpc::MultiJoinTablesRequest, ::grpc::protobuf::MessageLite, ::grpc::protobuf::MessageLite>(channel_.get(), cq, rpcmethod_MultiJoinTables_, context, request);
-}
-
-::grpc::ClientAsyncResponseReader< ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse>* TableService::Stub::AsyncMultiJoinTablesRaw(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::MultiJoinTablesRequest& request, ::grpc::CompletionQueue* cq) {
-  auto* result =
-    this->PrepareAsyncMultiJoinTablesRaw(context, request, cq);
-  result->StartCall();
-  return result;
-}
-
-::grpc::Status TableService::Stub::RangeJoinTables(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::RangeJoinTablesRequest& request, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse* response) {
-  return ::grpc::internal::BlockingUnaryCall< ::io::deephaven::proto::backplane::grpc::RangeJoinTablesRequest, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse, ::grpc::protobuf::MessageLite, ::grpc::protobuf::MessageLite>(channel_.get(), rpcmethod_RangeJoinTables_, context, request, response);
-}
-
-void TableService::Stub::async::RangeJoinTables(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::RangeJoinTablesRequest* request, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse* response, std::function<void(::grpc::Status)> f) {
-  ::grpc::internal::CallbackUnaryCall< ::io::deephaven::proto::backplane::grpc::RangeJoinTablesRequest, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse, ::grpc::protobuf::MessageLite, ::grpc::protobuf::MessageLite>(stub_->channel_.get(), stub_->rpcmethod_RangeJoinTables_, context, request, response, std::move(f));
-}
-
-void TableService::Stub::async::RangeJoinTables(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::RangeJoinTablesRequest* request, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse* response, ::grpc::ClientUnaryReactor* reactor) {
-  ::grpc::internal::ClientCallbackUnaryFactory::Create< ::grpc::protobuf::MessageLite, ::grpc::protobuf::MessageLite>(stub_->channel_.get(), stub_->rpcmethod_RangeJoinTables_, context, request, response, reactor);
-}
-
-::grpc::ClientAsyncResponseReader< ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse>* TableService::Stub::PrepareAsyncRangeJoinTablesRaw(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::RangeJoinTablesRequest& request, ::grpc::CompletionQueue* cq) {
-  return ::grpc::internal::ClientAsyncResponseReaderHelper::Create< ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse, ::io::deephaven::proto::backplane::grpc::RangeJoinTablesRequest, ::grpc::protobuf::MessageLite, ::grpc::protobuf::MessageLite>(channel_.get(), cq, rpcmethod_RangeJoinTables_, context, request);
-}
-
-::grpc::ClientAsyncResponseReader< ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse>* TableService::Stub::AsyncRangeJoinTablesRaw(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::RangeJoinTablesRequest& request, ::grpc::CompletionQueue* cq) {
-  auto* result =
-    this->PrepareAsyncRangeJoinTablesRaw(context, request, cq);
-  result->StartCall();
-  return result;
-}
-
-::grpc::Status TableService::Stub::ComboAggregate(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::ComboAggregateRequest& request, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse* response) {
-  return ::grpc::internal::BlockingUnaryCall< ::io::deephaven::proto::backplane::grpc::ComboAggregateRequest, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse, ::grpc::protobuf::MessageLite, ::grpc::protobuf::MessageLite>(channel_.get(), rpcmethod_ComboAggregate_, context, request, response);
-}
-
-void TableService::Stub::async::ComboAggregate(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::ComboAggregateRequest* request, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse* response, std::function<void(::grpc::Status)> f) {
-  ::grpc::internal::CallbackUnaryCall< ::io::deephaven::proto::backplane::grpc::ComboAggregateRequest, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse, ::grpc::protobuf::MessageLite, ::grpc::protobuf::MessageLite>(stub_->channel_.get(), stub_->rpcmethod_ComboAggregate_, context, request, response, std::move(f));
-}
-
-void TableService::Stub::async::ComboAggregate(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::ComboAggregateRequest* request, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse* response, ::grpc::ClientUnaryReactor* reactor) {
-  ::grpc::internal::ClientCallbackUnaryFactory::Create< ::grpc::protobuf::MessageLite, ::grpc::protobuf::MessageLite>(stub_->channel_.get(), stub_->rpcmethod_ComboAggregate_, context, request, response, reactor);
-}
-
-::grpc::ClientAsyncResponseReader< ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse>* TableService::Stub::PrepareAsyncComboAggregateRaw(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::ComboAggregateRequest& request, ::grpc::CompletionQueue* cq) {
-  return ::grpc::internal::ClientAsyncResponseReaderHelper::Create< ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse, ::io::deephaven::proto::backplane::grpc::ComboAggregateRequest, ::grpc::protobuf::MessageLite, ::grpc::protobuf::MessageLite>(channel_.get(), cq, rpcmethod_ComboAggregate_, context, request);
-}
-
-::grpc::ClientAsyncResponseReader< ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse>* TableService::Stub::AsyncComboAggregateRaw(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::ComboAggregateRequest& request, ::grpc::CompletionQueue* cq) {
-  auto* result =
-    this->PrepareAsyncComboAggregateRaw(context, request, cq);
-  result->StartCall();
-  return result;
-}
-
-::grpc::Status TableService::Stub::AggregateAll(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::AggregateAllRequest& request, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse* response) {
-  return ::grpc::internal::BlockingUnaryCall< ::io::deephaven::proto::backplane::grpc::AggregateAllRequest, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse, ::grpc::protobuf::MessageLite, ::grpc::protobuf::MessageLite>(channel_.get(), rpcmethod_AggregateAll_, context, request, response);
-}
-
-void TableService::Stub::async::AggregateAll(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::AggregateAllRequest* request, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse* response, std::function<void(::grpc::Status)> f) {
-  ::grpc::internal::CallbackUnaryCall< ::io::deephaven::proto::backplane::grpc::AggregateAllRequest, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse, ::grpc::protobuf::MessageLite, ::grpc::protobuf::MessageLite>(stub_->channel_.get(), stub_->rpcmethod_AggregateAll_, context, request, response, std::move(f));
-}
-
-void TableService::Stub::async::AggregateAll(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::AggregateAllRequest* request, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse* response, ::grpc::ClientUnaryReactor* reactor) {
-  ::grpc::internal::ClientCallbackUnaryFactory::Create< ::grpc::protobuf::MessageLite, ::grpc::protobuf::MessageLite>(stub_->channel_.get(), stub_->rpcmethod_AggregateAll_, context, request, response, reactor);
-}
-
-::grpc::ClientAsyncResponseReader< ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse>* TableService::Stub::PrepareAsyncAggregateAllRaw(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::AggregateAllRequest& request, ::grpc::CompletionQueue* cq) {
-  return ::grpc::internal::ClientAsyncResponseReaderHelper::Create< ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse, ::io::deephaven::proto::backplane::grpc::AggregateAllRequest, ::grpc::protobuf::MessageLite, ::grpc::protobuf::MessageLite>(channel_.get(), cq, rpcmethod_AggregateAll_, context, request);
-}
-
-::grpc::ClientAsyncResponseReader< ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse>* TableService::Stub::AsyncAggregateAllRaw(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::AggregateAllRequest& request, ::grpc::CompletionQueue* cq) {
-  auto* result =
-    this->PrepareAsyncAggregateAllRaw(context, request, cq);
-  result->StartCall();
-  return result;
-}
-
-::grpc::Status TableService::Stub::Aggregate(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::AggregateRequest& request, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse* response) {
-  return ::grpc::internal::BlockingUnaryCall< ::io::deephaven::proto::backplane::grpc::AggregateRequest, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse, ::grpc::protobuf::MessageLite, ::grpc::protobuf::MessageLite>(channel_.get(), rpcmethod_Aggregate_, context, request, response);
-}
-
-void TableService::Stub::async::Aggregate(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::AggregateRequest* request, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse* response, std::function<void(::grpc::Status)> f) {
-  ::grpc::internal::CallbackUnaryCall< ::io::deephaven::proto::backplane::grpc::AggregateRequest, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse, ::grpc::protobuf::MessageLite, ::grpc::protobuf::MessageLite>(stub_->channel_.get(), stub_->rpcmethod_Aggregate_, context, request, response, std::move(f));
-}
-
-void TableService::Stub::async::Aggregate(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::AggregateRequest* request, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse* response, ::grpc::ClientUnaryReactor* reactor) {
-  ::grpc::internal::ClientCallbackUnaryFactory::Create< ::grpc::protobuf::MessageLite, ::grpc::protobuf::MessageLite>(stub_->channel_.get(), stub_->rpcmethod_Aggregate_, context, request, response, reactor);
-}
-
-::grpc::ClientAsyncResponseReader< ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse>* TableService::Stub::PrepareAsyncAggregateRaw(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::AggregateRequest& request, ::grpc::CompletionQueue* cq) {
-  return ::grpc::internal::ClientAsyncResponseReaderHelper::Create< ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse, ::io::deephaven::proto::backplane::grpc::AggregateRequest, ::grpc::protobuf::MessageLite, ::grpc::protobuf::MessageLite>(channel_.get(), cq, rpcmethod_Aggregate_, context, request);
-}
-
-::grpc::ClientAsyncResponseReader< ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse>* TableService::Stub::AsyncAggregateRaw(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::AggregateRequest& request, ::grpc::CompletionQueue* cq) {
-  auto* result =
-    this->PrepareAsyncAggregateRaw(context, request, cq);
-  result->StartCall();
-  return result;
-}
-
-::grpc::Status TableService::Stub::Snapshot(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::SnapshotTableRequest& request, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse* response) {
-  return ::grpc::internal::BlockingUnaryCall< ::io::deephaven::proto::backplane::grpc::SnapshotTableRequest, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse, ::grpc::protobuf::MessageLite, ::grpc::protobuf::MessageLite>(channel_.get(), rpcmethod_Snapshot_, context, request, response);
-}
-
-void TableService::Stub::async::Snapshot(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::SnapshotTableRequest* request, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse* response, std::function<void(::grpc::Status)> f) {
-  ::grpc::internal::CallbackUnaryCall< ::io::deephaven::proto::backplane::grpc::SnapshotTableRequest, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse, ::grpc::protobuf::MessageLite, ::grpc::protobuf::MessageLite>(stub_->channel_.get(), stub_->rpcmethod_Snapshot_, context, request, response, std::move(f));
-}
-
-void TableService::Stub::async::Snapshot(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::SnapshotTableRequest* request, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse* response, ::grpc::ClientUnaryReactor* reactor) {
-  ::grpc::internal::ClientCallbackUnaryFactory::Create< ::grpc::protobuf::MessageLite, ::grpc::protobuf::MessageLite>(stub_->channel_.get(), stub_->rpcmethod_Snapshot_, context, request, response, reactor);
-}
-
-::grpc::ClientAsyncResponseReader< ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse>* TableService::Stub::PrepareAsyncSnapshotRaw(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::SnapshotTableRequest& request, ::grpc::CompletionQueue* cq) {
-  return ::grpc::internal::ClientAsyncResponseReaderHelper::Create< ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse, ::io::deephaven::proto::backplane::grpc::SnapshotTableRequest, ::grpc::protobuf::MessageLite, ::grpc::protobuf::MessageLite>(channel_.get(), cq, rpcmethod_Snapshot_, context, request);
-}
-
-::grpc::ClientAsyncResponseReader< ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse>* TableService::Stub::AsyncSnapshotRaw(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::SnapshotTableRequest& request, ::grpc::CompletionQueue* cq) {
-  auto* result =
-    this->PrepareAsyncSnapshotRaw(context, request, cq);
-  result->StartCall();
-  return result;
-}
-
-::grpc::Status TableService::Stub::SnapshotWhen(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::SnapshotWhenTableRequest& request, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse* response) {
-  return ::grpc::internal::BlockingUnaryCall< ::io::deephaven::proto::backplane::grpc::SnapshotWhenTableRequest, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse, ::grpc::protobuf::MessageLite, ::grpc::protobuf::MessageLite>(channel_.get(), rpcmethod_SnapshotWhen_, context, request, response);
-}
-
-void TableService::Stub::async::SnapshotWhen(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::SnapshotWhenTableRequest* request, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse* response, std::function<void(::grpc::Status)> f) {
-  ::grpc::internal::CallbackUnaryCall< ::io::deephaven::proto::backplane::grpc::SnapshotWhenTableRequest, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse, ::grpc::protobuf::MessageLite, ::grpc::protobuf::MessageLite>(stub_->channel_.get(), stub_->rpcmethod_SnapshotWhen_, context, request, response, std::move(f));
-}
-
-void TableService::Stub::async::SnapshotWhen(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::SnapshotWhenTableRequest* request, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse* response, ::grpc::ClientUnaryReactor* reactor) {
-  ::grpc::internal::ClientCallbackUnaryFactory::Create< ::grpc::protobuf::MessageLite, ::grpc::protobuf::MessageLite>(stub_->channel_.get(), stub_->rpcmethod_SnapshotWhen_, context, request, response, reactor);
-}
-
-::grpc::ClientAsyncResponseReader< ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse>* TableService::Stub::PrepareAsyncSnapshotWhenRaw(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::SnapshotWhenTableRequest& request, ::grpc::CompletionQueue* cq) {
-  return ::grpc::internal::ClientAsyncResponseReaderHelper::Create< ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse, ::io::deephaven::proto::backplane::grpc::SnapshotWhenTableRequest, ::grpc::protobuf::MessageLite, ::grpc::protobuf::MessageLite>(channel_.get(), cq, rpcmethod_SnapshotWhen_, context, request);
-}
-
-::grpc::ClientAsyncResponseReader< ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse>* TableService::Stub::AsyncSnapshotWhenRaw(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::SnapshotWhenTableRequest& request, ::grpc::CompletionQueue* cq) {
-  auto* result =
-    this->PrepareAsyncSnapshotWhenRaw(context, request, cq);
-  result->StartCall();
-  return result;
-}
-
-::grpc::Status TableService::Stub::Flatten(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::FlattenRequest& request, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse* response) {
-  return ::grpc::internal::BlockingUnaryCall< ::io::deephaven::proto::backplane::grpc::FlattenRequest, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse, ::grpc::protobuf::MessageLite, ::grpc::protobuf::MessageLite>(channel_.get(), rpcmethod_Flatten_, context, request, response);
-}
-
-void TableService::Stub::async::Flatten(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::FlattenRequest* request, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse* response, std::function<void(::grpc::Status)> f) {
-  ::grpc::internal::CallbackUnaryCall< ::io::deephaven::proto::backplane::grpc::FlattenRequest, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse, ::grpc::protobuf::MessageLite, ::grpc::protobuf::MessageLite>(stub_->channel_.get(), stub_->rpcmethod_Flatten_, context, request, response, std::move(f));
-}
-
-void TableService::Stub::async::Flatten(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::FlattenRequest* request, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse* response, ::grpc::ClientUnaryReactor* reactor) {
-  ::grpc::internal::ClientCallbackUnaryFactory::Create< ::grpc::protobuf::MessageLite, ::grpc::protobuf::MessageLite>(stub_->channel_.get(), stub_->rpcmethod_Flatten_, context, request, response, reactor);
-}
-
-::grpc::ClientAsyncResponseReader< ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse>* TableService::Stub::PrepareAsyncFlattenRaw(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::FlattenRequest& request, ::grpc::CompletionQueue* cq) {
-  return ::grpc::internal::ClientAsyncResponseReaderHelper::Create< ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse, ::io::deephaven::proto::backplane::grpc::FlattenRequest, ::grpc::protobuf::MessageLite, ::grpc::protobuf::MessageLite>(channel_.get(), cq, rpcmethod_Flatten_, context, request);
-}
-
-::grpc::ClientAsyncResponseReader< ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse>* TableService::Stub::AsyncFlattenRaw(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::FlattenRequest& request, ::grpc::CompletionQueue* cq) {
-  auto* result =
-    this->PrepareAsyncFlattenRaw(context, request, cq);
-  result->StartCall();
-  return result;
-}
-
-::grpc::Status TableService::Stub::RunChartDownsample(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::RunChartDownsampleRequest& request, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse* response) {
-  return ::grpc::internal::BlockingUnaryCall< ::io::deephaven::proto::backplane::grpc::RunChartDownsampleRequest, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse, ::grpc::protobuf::MessageLite, ::grpc::protobuf::MessageLite>(channel_.get(), rpcmethod_RunChartDownsample_, context, request, response);
-}
-
-void TableService::Stub::async::RunChartDownsample(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::RunChartDownsampleRequest* request, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse* response, std::function<void(::grpc::Status)> f) {
-  ::grpc::internal::CallbackUnaryCall< ::io::deephaven::proto::backplane::grpc::RunChartDownsampleRequest, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse, ::grpc::protobuf::MessageLite, ::grpc::protobuf::MessageLite>(stub_->channel_.get(), stub_->rpcmethod_RunChartDownsample_, context, request, response, std::move(f));
-}
-
-void TableService::Stub::async::RunChartDownsample(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::RunChartDownsampleRequest* request, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse* response, ::grpc::ClientUnaryReactor* reactor) {
-  ::grpc::internal::ClientCallbackUnaryFactory::Create< ::grpc::protobuf::MessageLite, ::grpc::protobuf::MessageLite>(stub_->channel_.get(), stub_->rpcmethod_RunChartDownsample_, context, request, response, reactor);
-}
-
-::grpc::ClientAsyncResponseReader< ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse>* TableService::Stub::PrepareAsyncRunChartDownsampleRaw(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::RunChartDownsampleRequest& request, ::grpc::CompletionQueue* cq) {
-  return ::grpc::internal::ClientAsyncResponseReaderHelper::Create< ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse, ::io::deephaven::proto::backplane::grpc::RunChartDownsampleRequest, ::grpc::protobuf::MessageLite, ::grpc::protobuf::MessageLite>(channel_.get(), cq, rpcmethod_RunChartDownsample_, context, request);
-}
-
-::grpc::ClientAsyncResponseReader< ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse>* TableService::Stub::AsyncRunChartDownsampleRaw(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::RunChartDownsampleRequest& request, ::grpc::CompletionQueue* cq) {
-  auto* result =
-    this->PrepareAsyncRunChartDownsampleRaw(context, request, cq);
-  result->StartCall();
-  return result;
-}
-
-::grpc::Status TableService::Stub::CreateInputTable(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::CreateInputTableRequest& request, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse* response) {
-  return ::grpc::internal::BlockingUnaryCall< ::io::deephaven::proto::backplane::grpc::CreateInputTableRequest, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse, ::grpc::protobuf::MessageLite, ::grpc::protobuf::MessageLite>(channel_.get(), rpcmethod_CreateInputTable_, context, request, response);
-}
-
-void TableService::Stub::async::CreateInputTable(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::CreateInputTableRequest* request, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse* response, std::function<void(::grpc::Status)> f) {
-  ::grpc::internal::CallbackUnaryCall< ::io::deephaven::proto::backplane::grpc::CreateInputTableRequest, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse, ::grpc::protobuf::MessageLite, ::grpc::protobuf::MessageLite>(stub_->channel_.get(), stub_->rpcmethod_CreateInputTable_, context, request, response, std::move(f));
-}
-
-void TableService::Stub::async::CreateInputTable(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::CreateInputTableRequest* request, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse* response, ::grpc::ClientUnaryReactor* reactor) {
-  ::grpc::internal::ClientCallbackUnaryFactory::Create< ::grpc::protobuf::MessageLite, ::grpc::protobuf::MessageLite>(stub_->channel_.get(), stub_->rpcmethod_CreateInputTable_, context, request, response, reactor);
-}
-
-::grpc::ClientAsyncResponseReader< ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse>* TableService::Stub::PrepareAsyncCreateInputTableRaw(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::CreateInputTableRequest& request, ::grpc::CompletionQueue* cq) {
-  return ::grpc::internal::ClientAsyncResponseReaderHelper::Create< ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse, ::io::deephaven::proto::backplane::grpc::CreateInputTableRequest, ::grpc::protobuf::MessageLite, ::grpc::protobuf::MessageLite>(channel_.get(), cq, rpcmethod_CreateInputTable_, context, request);
-}
-
-::grpc::ClientAsyncResponseReader< ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse>* TableService::Stub::AsyncCreateInputTableRaw(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::CreateInputTableRequest& request, ::grpc::CompletionQueue* cq) {
-  auto* result =
-    this->PrepareAsyncCreateInputTableRaw(context, request, cq);
-  result->StartCall();
-  return result;
-}
-
-::grpc::Status TableService::Stub::WhereIn(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::WhereInRequest& request, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse* response) {
-  return ::grpc::internal::BlockingUnaryCall< ::io::deephaven::proto::backplane::grpc::WhereInRequest, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse, ::grpc::protobuf::MessageLite, ::grpc::protobuf::MessageLite>(channel_.get(), rpcmethod_WhereIn_, context, request, response);
-}
-
-void TableService::Stub::async::WhereIn(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::WhereInRequest* request, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse* response, std::function<void(::grpc::Status)> f) {
-  ::grpc::internal::CallbackUnaryCall< ::io::deephaven::proto::backplane::grpc::WhereInRequest, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse, ::grpc::protobuf::MessageLite, ::grpc::protobuf::MessageLite>(stub_->channel_.get(), stub_->rpcmethod_WhereIn_, context, request, response, std::move(f));
-}
-
-void TableService::Stub::async::WhereIn(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::WhereInRequest* request, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse* response, ::grpc::ClientUnaryReactor* reactor) {
-  ::grpc::internal::ClientCallbackUnaryFactory::Create< ::grpc::protobuf::MessageLite, ::grpc::protobuf::MessageLite>(stub_->channel_.get(), stub_->rpcmethod_WhereIn_, context, request, response, reactor);
-}
-
-::grpc::ClientAsyncResponseReader< ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse>* TableService::Stub::PrepareAsyncWhereInRaw(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::WhereInRequest& request, ::grpc::CompletionQueue* cq) {
-  return ::grpc::internal::ClientAsyncResponseReaderHelper::Create< ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse, ::io::deephaven::proto::backplane::grpc::WhereInRequest, ::grpc::protobuf::MessageLite, ::grpc::protobuf::MessageLite>(channel_.get(), cq, rpcmethod_WhereIn_, context, request);
-}
-
-::grpc::ClientAsyncResponseReader< ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse>* TableService::Stub::AsyncWhereInRaw(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::WhereInRequest& request, ::grpc::CompletionQueue* cq) {
-  auto* result =
-    this->PrepareAsyncWhereInRaw(context, request, cq);
-  result->StartCall();
-  return result;
-}
-
-::grpc::ClientReader< ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse>* TableService::Stub::BatchRaw(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::BatchTableRequest& request) {
-  return ::grpc::internal::ClientReaderFactory< ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse>::Create(channel_.get(), rpcmethod_Batch_, context, request);
-}
-
-void TableService::Stub::async::Batch(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::BatchTableRequest* request, ::grpc::ClientReadReactor< ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse>* reactor) {
-  ::grpc::internal::ClientCallbackReaderFactory< ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse>::Create(stub_->channel_.get(), stub_->rpcmethod_Batch_, context, request, reactor);
-}
-
-::grpc::ClientAsyncReader< ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse>* TableService::Stub::AsyncBatchRaw(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::BatchTableRequest& request, ::grpc::CompletionQueue* cq, void* tag) {
-  return ::grpc::internal::ClientAsyncReaderFactory< ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse>::Create(channel_.get(), cq, rpcmethod_Batch_, context, request, true, tag);
-}
-
-::grpc::ClientAsyncReader< ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse>* TableService::Stub::PrepareAsyncBatchRaw(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::BatchTableRequest& request, ::grpc::CompletionQueue* cq) {
-  return ::grpc::internal::ClientAsyncReaderFactory< ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse>::Create(channel_.get(), cq, rpcmethod_Batch_, context, request, false, nullptr);
-}
-
-::grpc::ClientReader< ::io::deephaven::proto::backplane::grpc::ExportedTableUpdateMessage>* TableService::Stub::ExportedTableUpdatesRaw(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::ExportedTableUpdatesRequest& request) {
-  return ::grpc::internal::ClientReaderFactory< ::io::deephaven::proto::backplane::grpc::ExportedTableUpdateMessage>::Create(channel_.get(), rpcmethod_ExportedTableUpdates_, context, request);
-}
-
-void TableService::Stub::async::ExportedTableUpdates(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::ExportedTableUpdatesRequest* request, ::grpc::ClientReadReactor< ::io::deephaven::proto::backplane::grpc::ExportedTableUpdateMessage>* reactor) {
-  ::grpc::internal::ClientCallbackReaderFactory< ::io::deephaven::proto::backplane::grpc::ExportedTableUpdateMessage>::Create(stub_->channel_.get(), stub_->rpcmethod_ExportedTableUpdates_, context, request, reactor);
-}
-
-::grpc::ClientAsyncReader< ::io::deephaven::proto::backplane::grpc::ExportedTableUpdateMessage>* TableService::Stub::AsyncExportedTableUpdatesRaw(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::ExportedTableUpdatesRequest& request, ::grpc::CompletionQueue* cq, void* tag) {
-  return ::grpc::internal::ClientAsyncReaderFactory< ::io::deephaven::proto::backplane::grpc::ExportedTableUpdateMessage>::Create(channel_.get(), cq, rpcmethod_ExportedTableUpdates_, context, request, true, tag);
-}
-
-::grpc::ClientAsyncReader< ::io::deephaven::proto::backplane::grpc::ExportedTableUpdateMessage>* TableService::Stub::PrepareAsyncExportedTableUpdatesRaw(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::ExportedTableUpdatesRequest& request, ::grpc::CompletionQueue* cq) {
-  return ::grpc::internal::ClientAsyncReaderFactory< ::io::deephaven::proto::backplane::grpc::ExportedTableUpdateMessage>::Create(channel_.get(), cq, rpcmethod_ExportedTableUpdates_, context, request, false, nullptr);
-}
-
-::grpc::Status TableService::Stub::SeekRow(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::SeekRowRequest& request, ::io::deephaven::proto::backplane::grpc::SeekRowResponse* response) {
-  return ::grpc::internal::BlockingUnaryCall< ::io::deephaven::proto::backplane::grpc::SeekRowRequest, ::io::deephaven::proto::backplane::grpc::SeekRowResponse, ::grpc::protobuf::MessageLite, ::grpc::protobuf::MessageLite>(channel_.get(), rpcmethod_SeekRow_, context, request, response);
-}
-
-void TableService::Stub::async::SeekRow(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::SeekRowRequest* request, ::io::deephaven::proto::backplane::grpc::SeekRowResponse* response, std::function<void(::grpc::Status)> f) {
-  ::grpc::internal::CallbackUnaryCall< ::io::deephaven::proto::backplane::grpc::SeekRowRequest, ::io::deephaven::proto::backplane::grpc::SeekRowResponse, ::grpc::protobuf::MessageLite, ::grpc::protobuf::MessageLite>(stub_->channel_.get(), stub_->rpcmethod_SeekRow_, context, request, response, std::move(f));
-}
-
-void TableService::Stub::async::SeekRow(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::SeekRowRequest* request, ::io::deephaven::proto::backplane::grpc::SeekRowResponse* response, ::grpc::ClientUnaryReactor* reactor) {
-  ::grpc::internal::ClientCallbackUnaryFactory::Create< ::grpc::protobuf::MessageLite, ::grpc::protobuf::MessageLite>(stub_->channel_.get(), stub_->rpcmethod_SeekRow_, context, request, response, reactor);
-}
-
-::grpc::ClientAsyncResponseReader< ::io::deephaven::proto::backplane::grpc::SeekRowResponse>* TableService::Stub::PrepareAsyncSeekRowRaw(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::SeekRowRequest& request, ::grpc::CompletionQueue* cq) {
-  return ::grpc::internal::ClientAsyncResponseReaderHelper::Create< ::io::deephaven::proto::backplane::grpc::SeekRowResponse, ::io::deephaven::proto::backplane::grpc::SeekRowRequest, ::grpc::protobuf::MessageLite, ::grpc::protobuf::MessageLite>(channel_.get(), cq, rpcmethod_SeekRow_, context, request);
-}
-
-::grpc::ClientAsyncResponseReader< ::io::deephaven::proto::backplane::grpc::SeekRowResponse>* TableService::Stub::AsyncSeekRowRaw(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::SeekRowRequest& request, ::grpc::CompletionQueue* cq) {
-  auto* result =
-    this->PrepareAsyncSeekRowRaw(context, request, cq);
-  result->StartCall();
-  return result;
-}
-
-::grpc::Status TableService::Stub::MetaTable(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::MetaTableRequest& request, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse* response) {
-  return ::grpc::internal::BlockingUnaryCall< ::io::deephaven::proto::backplane::grpc::MetaTableRequest, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse, ::grpc::protobuf::MessageLite, ::grpc::protobuf::MessageLite>(channel_.get(), rpcmethod_MetaTable_, context, request, response);
-}
-
-void TableService::Stub::async::MetaTable(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::MetaTableRequest* request, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse* response, std::function<void(::grpc::Status)> f) {
-  ::grpc::internal::CallbackUnaryCall< ::io::deephaven::proto::backplane::grpc::MetaTableRequest, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse, ::grpc::protobuf::MessageLite, ::grpc::protobuf::MessageLite>(stub_->channel_.get(), stub_->rpcmethod_MetaTable_, context, request, response, std::move(f));
-}
-
-void TableService::Stub::async::MetaTable(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::MetaTableRequest* request, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse* response, ::grpc::ClientUnaryReactor* reactor) {
-  ::grpc::internal::ClientCallbackUnaryFactory::Create< ::grpc::protobuf::MessageLite, ::grpc::protobuf::MessageLite>(stub_->channel_.get(), stub_->rpcmethod_MetaTable_, context, request, response, reactor);
-}
-
-::grpc::ClientAsyncResponseReader< ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse>* TableService::Stub::PrepareAsyncMetaTableRaw(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::MetaTableRequest& request, ::grpc::CompletionQueue* cq) {
-  return ::grpc::internal::ClientAsyncResponseReaderHelper::Create< ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse, ::io::deephaven::proto::backplane::grpc::MetaTableRequest, ::grpc::protobuf::MessageLite, ::grpc::protobuf::MessageLite>(channel_.get(), cq, rpcmethod_MetaTable_, context, request);
-}
-
-::grpc::ClientAsyncResponseReader< ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse>* TableService::Stub::AsyncMetaTableRaw(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::MetaTableRequest& request, ::grpc::CompletionQueue* cq) {
-  auto* result =
-    this->PrepareAsyncMetaTableRaw(context, request, cq);
-  result->StartCall();
-  return result;
-}
-
-::grpc::Status TableService::Stub::ComputeColumnStatistics(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::ColumnStatisticsRequest& request, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse* response) {
-  return ::grpc::internal::BlockingUnaryCall< ::io::deephaven::proto::backplane::grpc::ColumnStatisticsRequest, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse, ::grpc::protobuf::MessageLite, ::grpc::protobuf::MessageLite>(channel_.get(), rpcmethod_ComputeColumnStatistics_, context, request, response);
-}
-
-void TableService::Stub::async::ComputeColumnStatistics(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::ColumnStatisticsRequest* request, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse* response, std::function<void(::grpc::Status)> f) {
-  ::grpc::internal::CallbackUnaryCall< ::io::deephaven::proto::backplane::grpc::ColumnStatisticsRequest, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse, ::grpc::protobuf::MessageLite, ::grpc::protobuf::MessageLite>(stub_->channel_.get(), stub_->rpcmethod_ComputeColumnStatistics_, context, request, response, std::move(f));
-}
-
-void TableService::Stub::async::ComputeColumnStatistics(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::ColumnStatisticsRequest* request, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse* response, ::grpc::ClientUnaryReactor* reactor) {
-  ::grpc::internal::ClientCallbackUnaryFactory::Create< ::grpc::protobuf::MessageLite, ::grpc::protobuf::MessageLite>(stub_->channel_.get(), stub_->rpcmethod_ComputeColumnStatistics_, context, request, response, reactor);
-}
-
-::grpc::ClientAsyncResponseReader< ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse>* TableService::Stub::PrepareAsyncComputeColumnStatisticsRaw(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::ColumnStatisticsRequest& request, ::grpc::CompletionQueue* cq) {
-  return ::grpc::internal::ClientAsyncResponseReaderHelper::Create< ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse, ::io::deephaven::proto::backplane::grpc::ColumnStatisticsRequest, ::grpc::protobuf::MessageLite, ::grpc::protobuf::MessageLite>(channel_.get(), cq, rpcmethod_ComputeColumnStatistics_, context, request);
-}
-
-::grpc::ClientAsyncResponseReader< ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse>* TableService::Stub::AsyncComputeColumnStatisticsRaw(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::ColumnStatisticsRequest& request, ::grpc::CompletionQueue* cq) {
-  auto* result =
-    this->PrepareAsyncComputeColumnStatisticsRaw(context, request, cq);
-  result->StartCall();
-  return result;
-}
-
-TableService::Service::Service() {
-  AddMethod(new ::grpc::internal::RpcServiceMethod(
-      TableService_method_names[0],
-      ::grpc::internal::RpcMethod::NORMAL_RPC,
-      new ::grpc::internal::RpcMethodHandler< TableService::Service, ::io::deephaven::proto::backplane::grpc::Ticket, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse, ::grpc::protobuf::MessageLite, ::grpc::protobuf::MessageLite>(
-          [](TableService::Service* service,
-             ::grpc::ServerContext* ctx,
-             const ::io::deephaven::proto::backplane::grpc::Ticket* req,
-             ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse* resp) {
-               return service->GetExportedTableCreationResponse(ctx, req, resp);
-             }, this)));
-  AddMethod(new ::grpc::internal::RpcServiceMethod(
-      TableService_method_names[1],
-      ::grpc::internal::RpcMethod::NORMAL_RPC,
-      new ::grpc::internal::RpcMethodHandler< TableService::Service, ::io::deephaven::proto::backplane::grpc::FetchTableRequest, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse, ::grpc::protobuf::MessageLite, ::grpc::protobuf::MessageLite>(
-          [](TableService::Service* service,
-             ::grpc::ServerContext* ctx,
-             const ::io::deephaven::proto::backplane::grpc::FetchTableRequest* req,
-             ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse* resp) {
-               return service->FetchTable(ctx, req, resp);
-             }, this)));
-  AddMethod(new ::grpc::internal::RpcServiceMethod(
-      TableService_method_names[2],
-      ::grpc::internal::RpcMethod::NORMAL_RPC,
-      new ::grpc::internal::RpcMethodHandler< TableService::Service, ::io::deephaven::proto::backplane::grpc::ApplyPreviewColumnsRequest, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse, ::grpc::protobuf::MessageLite, ::grpc::protobuf::MessageLite>(
-          [](TableService::Service* service,
-             ::grpc::ServerContext* ctx,
-             const ::io::deephaven::proto::backplane::grpc::ApplyPreviewColumnsRequest* req,
-             ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse* resp) {
-               return service->ApplyPreviewColumns(ctx, req, resp);
-             }, this)));
-  AddMethod(new ::grpc::internal::RpcServiceMethod(
-      TableService_method_names[3],
-      ::grpc::internal::RpcMethod::NORMAL_RPC,
-      new ::grpc::internal::RpcMethodHandler< TableService::Service, ::io::deephaven::proto::backplane::grpc::EmptyTableRequest, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse, ::grpc::protobuf::MessageLite, ::grpc::protobuf::MessageLite>(
-          [](TableService::Service* service,
-             ::grpc::ServerContext* ctx,
-             const ::io::deephaven::proto::backplane::grpc::EmptyTableRequest* req,
-             ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse* resp) {
-               return service->EmptyTable(ctx, req, resp);
-             }, this)));
-  AddMethod(new ::grpc::internal::RpcServiceMethod(
-      TableService_method_names[4],
-      ::grpc::internal::RpcMethod::NORMAL_RPC,
-      new ::grpc::internal::RpcMethodHandler< TableService::Service, ::io::deephaven::proto::backplane::grpc::TimeTableRequest, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse, ::grpc::protobuf::MessageLite, ::grpc::protobuf::MessageLite>(
-          [](TableService::Service* service,
-             ::grpc::ServerContext* ctx,
-             const ::io::deephaven::proto::backplane::grpc::TimeTableRequest* req,
-             ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse* resp) {
-               return service->TimeTable(ctx, req, resp);
-             }, this)));
-  AddMethod(new ::grpc::internal::RpcServiceMethod(
-      TableService_method_names[5],
-      ::grpc::internal::RpcMethod::NORMAL_RPC,
-      new ::grpc::internal::RpcMethodHandler< TableService::Service, ::io::deephaven::proto::backplane::grpc::DropColumnsRequest, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse, ::grpc::protobuf::MessageLite, ::grpc::protobuf::MessageLite>(
-          [](TableService::Service* service,
-             ::grpc::ServerContext* ctx,
-             const ::io::deephaven::proto::backplane::grpc::DropColumnsRequest* req,
-             ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse* resp) {
-               return service->DropColumns(ctx, req, resp);
-             }, this)));
-  AddMethod(new ::grpc::internal::RpcServiceMethod(
-      TableService_method_names[6],
-      ::grpc::internal::RpcMethod::NORMAL_RPC,
-      new ::grpc::internal::RpcMethodHandler< TableService::Service, ::io::deephaven::proto::backplane::grpc::SelectOrUpdateRequest, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse, ::grpc::protobuf::MessageLite, ::grpc::protobuf::MessageLite>(
-          [](TableService::Service* service,
-             ::grpc::ServerContext* ctx,
-             const ::io::deephaven::proto::backplane::grpc::SelectOrUpdateRequest* req,
-             ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse* resp) {
-               return service->Update(ctx, req, resp);
-             }, this)));
-  AddMethod(new ::grpc::internal::RpcServiceMethod(
-      TableService_method_names[7],
-      ::grpc::internal::RpcMethod::NORMAL_RPC,
-      new ::grpc::internal::RpcMethodHandler< TableService::Service, ::io::deephaven::proto::backplane::grpc::SelectOrUpdateRequest, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse, ::grpc::protobuf::MessageLite, ::grpc::protobuf::MessageLite>(
-          [](TableService::Service* service,
-             ::grpc::ServerContext* ctx,
-             const ::io::deephaven::proto::backplane::grpc::SelectOrUpdateRequest* req,
-             ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse* resp) {
-               return service->LazyUpdate(ctx, req, resp);
-             }, this)));
-  AddMethod(new ::grpc::internal::RpcServiceMethod(
-      TableService_method_names[8],
-      ::grpc::internal::RpcMethod::NORMAL_RPC,
-      new ::grpc::internal::RpcMethodHandler< TableService::Service, ::io::deephaven::proto::backplane::grpc::SelectOrUpdateRequest, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse, ::grpc::protobuf::MessageLite, ::grpc::protobuf::MessageLite>(
-          [](TableService::Service* service,
-             ::grpc::ServerContext* ctx,
-             const ::io::deephaven::proto::backplane::grpc::SelectOrUpdateRequest* req,
-             ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse* resp) {
-               return service->View(ctx, req, resp);
-             }, this)));
-  AddMethod(new ::grpc::internal::RpcServiceMethod(
-      TableService_method_names[9],
-      ::grpc::internal::RpcMethod::NORMAL_RPC,
-      new ::grpc::internal::RpcMethodHandler< TableService::Service, ::io::deephaven::proto::backplane::grpc::SelectOrUpdateRequest, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse, ::grpc::protobuf::MessageLite, ::grpc::protobuf::MessageLite>(
-          [](TableService::Service* service,
-             ::grpc::ServerContext* ctx,
-             const ::io::deephaven::proto::backplane::grpc::SelectOrUpdateRequest* req,
-             ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse* resp) {
-               return service->UpdateView(ctx, req, resp);
-             }, this)));
-  AddMethod(new ::grpc::internal::RpcServiceMethod(
-      TableService_method_names[10],
-      ::grpc::internal::RpcMethod::NORMAL_RPC,
-      new ::grpc::internal::RpcMethodHandler< TableService::Service, ::io::deephaven::proto::backplane::grpc::SelectOrUpdateRequest, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse, ::grpc::protobuf::MessageLite, ::grpc::protobuf::MessageLite>(
-          [](TableService::Service* service,
-             ::grpc::ServerContext* ctx,
-             const ::io::deephaven::proto::backplane::grpc::SelectOrUpdateRequest* req,
-             ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse* resp) {
-               return service->Select(ctx, req, resp);
-             }, this)));
-  AddMethod(new ::grpc::internal::RpcServiceMethod(
-      TableService_method_names[11],
-      ::grpc::internal::RpcMethod::NORMAL_RPC,
-      new ::grpc::internal::RpcMethodHandler< TableService::Service, ::io::deephaven::proto::backplane::grpc::UpdateByRequest, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse, ::grpc::protobuf::MessageLite, ::grpc::protobuf::MessageLite>(
-          [](TableService::Service* service,
-             ::grpc::ServerContext* ctx,
-             const ::io::deephaven::proto::backplane::grpc::UpdateByRequest* req,
-             ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse* resp) {
-               return service->UpdateBy(ctx, req, resp);
-             }, this)));
-  AddMethod(new ::grpc::internal::RpcServiceMethod(
-      TableService_method_names[12],
-      ::grpc::internal::RpcMethod::NORMAL_RPC,
-      new ::grpc::internal::RpcMethodHandler< TableService::Service, ::io::deephaven::proto::backplane::grpc::SelectDistinctRequest, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse, ::grpc::protobuf::MessageLite, ::grpc::protobuf::MessageLite>(
-          [](TableService::Service* service,
-             ::grpc::ServerContext* ctx,
-             const ::io::deephaven::proto::backplane::grpc::SelectDistinctRequest* req,
-             ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse* resp) {
-               return service->SelectDistinct(ctx, req, resp);
-             }, this)));
-  AddMethod(new ::grpc::internal::RpcServiceMethod(
-      TableService_method_names[13],
-      ::grpc::internal::RpcMethod::NORMAL_RPC,
-      new ::grpc::internal::RpcMethodHandler< TableService::Service, ::io::deephaven::proto::backplane::grpc::FilterTableRequest, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse, ::grpc::protobuf::MessageLite, ::grpc::protobuf::MessageLite>(
-          [](TableService::Service* service,
-             ::grpc::ServerContext* ctx,
-             const ::io::deephaven::proto::backplane::grpc::FilterTableRequest* req,
-             ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse* resp) {
-               return service->Filter(ctx, req, resp);
-             }, this)));
-  AddMethod(new ::grpc::internal::RpcServiceMethod(
-      TableService_method_names[14],
-      ::grpc::internal::RpcMethod::NORMAL_RPC,
-      new ::grpc::internal::RpcMethodHandler< TableService::Service, ::io::deephaven::proto::backplane::grpc::UnstructuredFilterTableRequest, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse, ::grpc::protobuf::MessageLite, ::grpc::protobuf::MessageLite>(
-          [](TableService::Service* service,
-             ::grpc::ServerContext* ctx,
-             const ::io::deephaven::proto::backplane::grpc::UnstructuredFilterTableRequest* req,
-             ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse* resp) {
-               return service->UnstructuredFilter(ctx, req, resp);
-             }, this)));
-  AddMethod(new ::grpc::internal::RpcServiceMethod(
-      TableService_method_names[15],
-      ::grpc::internal::RpcMethod::NORMAL_RPC,
-      new ::grpc::internal::RpcMethodHandler< TableService::Service, ::io::deephaven::proto::backplane::grpc::SortTableRequest, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse, ::grpc::protobuf::MessageLite, ::grpc::protobuf::MessageLite>(
-          [](TableService::Service* service,
-             ::grpc::ServerContext* ctx,
-             const ::io::deephaven::proto::backplane::grpc::SortTableRequest* req,
-             ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse* resp) {
-               return service->Sort(ctx, req, resp);
-             }, this)));
-  AddMethod(new ::grpc::internal::RpcServiceMethod(
-      TableService_method_names[16],
-      ::grpc::internal::RpcMethod::NORMAL_RPC,
-      new ::grpc::internal::RpcMethodHandler< TableService::Service, ::io::deephaven::proto::backplane::grpc::HeadOrTailRequest, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse, ::grpc::protobuf::MessageLite, ::grpc::protobuf::MessageLite>(
-          [](TableService::Service* service,
-             ::grpc::ServerContext* ctx,
-             const ::io::deephaven::proto::backplane::grpc::HeadOrTailRequest* req,
-             ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse* resp) {
-               return service->Head(ctx, req, resp);
-             }, this)));
-  AddMethod(new ::grpc::internal::RpcServiceMethod(
-      TableService_method_names[17],
-      ::grpc::internal::RpcMethod::NORMAL_RPC,
-      new ::grpc::internal::RpcMethodHandler< TableService::Service, ::io::deephaven::proto::backplane::grpc::HeadOrTailRequest, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse, ::grpc::protobuf::MessageLite, ::grpc::protobuf::MessageLite>(
-          [](TableService::Service* service,
-             ::grpc::ServerContext* ctx,
-             const ::io::deephaven::proto::backplane::grpc::HeadOrTailRequest* req,
-             ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse* resp) {
-               return service->Tail(ctx, req, resp);
-             }, this)));
-  AddMethod(new ::grpc::internal::RpcServiceMethod(
-      TableService_method_names[18],
-      ::grpc::internal::RpcMethod::NORMAL_RPC,
-      new ::grpc::internal::RpcMethodHandler< TableService::Service, ::io::deephaven::proto::backplane::grpc::HeadOrTailByRequest, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse, ::grpc::protobuf::MessageLite, ::grpc::protobuf::MessageLite>(
-          [](TableService::Service* service,
-             ::grpc::ServerContext* ctx,
-             const ::io::deephaven::proto::backplane::grpc::HeadOrTailByRequest* req,
-             ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse* resp) {
-               return service->HeadBy(ctx, req, resp);
-             }, this)));
-  AddMethod(new ::grpc::internal::RpcServiceMethod(
-      TableService_method_names[19],
-      ::grpc::internal::RpcMethod::NORMAL_RPC,
-      new ::grpc::internal::RpcMethodHandler< TableService::Service, ::io::deephaven::proto::backplane::grpc::HeadOrTailByRequest, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse, ::grpc::protobuf::MessageLite, ::grpc::protobuf::MessageLite>(
-          [](TableService::Service* service,
-             ::grpc::ServerContext* ctx,
-             const ::io::deephaven::proto::backplane::grpc::HeadOrTailByRequest* req,
-             ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse* resp) {
-               return service->TailBy(ctx, req, resp);
-             }, this)));
-  AddMethod(new ::grpc::internal::RpcServiceMethod(
-      TableService_method_names[20],
-      ::grpc::internal::RpcMethod::NORMAL_RPC,
-      new ::grpc::internal::RpcMethodHandler< TableService::Service, ::io::deephaven::proto::backplane::grpc::UngroupRequest, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse, ::grpc::protobuf::MessageLite, ::grpc::protobuf::MessageLite>(
-          [](TableService::Service* service,
-             ::grpc::ServerContext* ctx,
-             const ::io::deephaven::proto::backplane::grpc::UngroupRequest* req,
-             ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse* resp) {
-               return service->Ungroup(ctx, req, resp);
-             }, this)));
-  AddMethod(new ::grpc::internal::RpcServiceMethod(
-      TableService_method_names[21],
-      ::grpc::internal::RpcMethod::NORMAL_RPC,
-      new ::grpc::internal::RpcMethodHandler< TableService::Service, ::io::deephaven::proto::backplane::grpc::MergeTablesRequest, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse, ::grpc::protobuf::MessageLite, ::grpc::protobuf::MessageLite>(
-          [](TableService::Service* service,
-             ::grpc::ServerContext* ctx,
-             const ::io::deephaven::proto::backplane::grpc::MergeTablesRequest* req,
-             ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse* resp) {
-               return service->MergeTables(ctx, req, resp);
-             }, this)));
-  AddMethod(new ::grpc::internal::RpcServiceMethod(
-      TableService_method_names[22],
-      ::grpc::internal::RpcMethod::NORMAL_RPC,
-      new ::grpc::internal::RpcMethodHandler< TableService::Service, ::io::deephaven::proto::backplane::grpc::CrossJoinTablesRequest, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse, ::grpc::protobuf::MessageLite, ::grpc::protobuf::MessageLite>(
-          [](TableService::Service* service,
-             ::grpc::ServerContext* ctx,
-             const ::io::deephaven::proto::backplane::grpc::CrossJoinTablesRequest* req,
-             ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse* resp) {
-               return service->CrossJoinTables(ctx, req, resp);
-             }, this)));
-  AddMethod(new ::grpc::internal::RpcServiceMethod(
-      TableService_method_names[23],
-      ::grpc::internal::RpcMethod::NORMAL_RPC,
-      new ::grpc::internal::RpcMethodHandler< TableService::Service, ::io::deephaven::proto::backplane::grpc::NaturalJoinTablesRequest, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse, ::grpc::protobuf::MessageLite, ::grpc::protobuf::MessageLite>(
-          [](TableService::Service* service,
-             ::grpc::ServerContext* ctx,
-             const ::io::deephaven::proto::backplane::grpc::NaturalJoinTablesRequest* req,
-             ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse* resp) {
-               return service->NaturalJoinTables(ctx, req, resp);
-             }, this)));
-  AddMethod(new ::grpc::internal::RpcServiceMethod(
-      TableService_method_names[24],
-      ::grpc::internal::RpcMethod::NORMAL_RPC,
-      new ::grpc::internal::RpcMethodHandler< TableService::Service, ::io::deephaven::proto::backplane::grpc::ExactJoinTablesRequest, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse, ::grpc::protobuf::MessageLite, ::grpc::protobuf::MessageLite>(
-          [](TableService::Service* service,
-             ::grpc::ServerContext* ctx,
-             const ::io::deephaven::proto::backplane::grpc::ExactJoinTablesRequest* req,
-             ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse* resp) {
-               return service->ExactJoinTables(ctx, req, resp);
-             }, this)));
-  AddMethod(new ::grpc::internal::RpcServiceMethod(
-      TableService_method_names[25],
-      ::grpc::internal::RpcMethod::NORMAL_RPC,
-      new ::grpc::internal::RpcMethodHandler< TableService::Service, ::io::deephaven::proto::backplane::grpc::LeftJoinTablesRequest, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse, ::grpc::protobuf::MessageLite, ::grpc::protobuf::MessageLite>(
-          [](TableService::Service* service,
-             ::grpc::ServerContext* ctx,
-             const ::io::deephaven::proto::backplane::grpc::LeftJoinTablesRequest* req,
-             ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse* resp) {
-               return service->LeftJoinTables(ctx, req, resp);
-             }, this)));
-  AddMethod(new ::grpc::internal::RpcServiceMethod(
-      TableService_method_names[26],
-      ::grpc::internal::RpcMethod::NORMAL_RPC,
-      new ::grpc::internal::RpcMethodHandler< TableService::Service, ::io::deephaven::proto::backplane::grpc::AsOfJoinTablesRequest, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse, ::grpc::protobuf::MessageLite, ::grpc::protobuf::MessageLite>(
-          [](TableService::Service* service,
-             ::grpc::ServerContext* ctx,
-             const ::io::deephaven::proto::backplane::grpc::AsOfJoinTablesRequest* req,
-             ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse* resp) {
-               return service->AsOfJoinTables(ctx, req, resp);
-             }, this)));
-  AddMethod(new ::grpc::internal::RpcServiceMethod(
-      TableService_method_names[27],
-      ::grpc::internal::RpcMethod::NORMAL_RPC,
-      new ::grpc::internal::RpcMethodHandler< TableService::Service, ::io::deephaven::proto::backplane::grpc::AjRajTablesRequest, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse, ::grpc::protobuf::MessageLite, ::grpc::protobuf::MessageLite>(
-          [](TableService::Service* service,
-             ::grpc::ServerContext* ctx,
-             const ::io::deephaven::proto::backplane::grpc::AjRajTablesRequest* req,
-             ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse* resp) {
-               return service->AjTables(ctx, req, resp);
-             }, this)));
-  AddMethod(new ::grpc::internal::RpcServiceMethod(
-      TableService_method_names[28],
-      ::grpc::internal::RpcMethod::NORMAL_RPC,
-      new ::grpc::internal::RpcMethodHandler< TableService::Service, ::io::deephaven::proto::backplane::grpc::AjRajTablesRequest, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse, ::grpc::protobuf::MessageLite, ::grpc::protobuf::MessageLite>(
-          [](TableService::Service* service,
-             ::grpc::ServerContext* ctx,
-             const ::io::deephaven::proto::backplane::grpc::AjRajTablesRequest* req,
-             ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse* resp) {
-               return service->RajTables(ctx, req, resp);
-             }, this)));
-  AddMethod(new ::grpc::internal::RpcServiceMethod(
-      TableService_method_names[29],
-      ::grpc::internal::RpcMethod::NORMAL_RPC,
-      new ::grpc::internal::RpcMethodHandler< TableService::Service, ::io::deephaven::proto::backplane::grpc::MultiJoinTablesRequest, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse, ::grpc::protobuf::MessageLite, ::grpc::protobuf::MessageLite>(
-          [](TableService::Service* service,
-             ::grpc::ServerContext* ctx,
-             const ::io::deephaven::proto::backplane::grpc::MultiJoinTablesRequest* req,
-             ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse* resp) {
-               return service->MultiJoinTables(ctx, req, resp);
-             }, this)));
-  AddMethod(new ::grpc::internal::RpcServiceMethod(
-      TableService_method_names[30],
-      ::grpc::internal::RpcMethod::NORMAL_RPC,
-      new ::grpc::internal::RpcMethodHandler< TableService::Service, ::io::deephaven::proto::backplane::grpc::RangeJoinTablesRequest, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse, ::grpc::protobuf::MessageLite, ::grpc::protobuf::MessageLite>(
-          [](TableService::Service* service,
-             ::grpc::ServerContext* ctx,
-             const ::io::deephaven::proto::backplane::grpc::RangeJoinTablesRequest* req,
-             ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse* resp) {
-               return service->RangeJoinTables(ctx, req, resp);
-             }, this)));
-  AddMethod(new ::grpc::internal::RpcServiceMethod(
-      TableService_method_names[31],
-      ::grpc::internal::RpcMethod::NORMAL_RPC,
-      new ::grpc::internal::RpcMethodHandler< TableService::Service, ::io::deephaven::proto::backplane::grpc::ComboAggregateRequest, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse, ::grpc::protobuf::MessageLite, ::grpc::protobuf::MessageLite>(
-          [](TableService::Service* service,
-             ::grpc::ServerContext* ctx,
-             const ::io::deephaven::proto::backplane::grpc::ComboAggregateRequest* req,
-             ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse* resp) {
-               return service->ComboAggregate(ctx, req, resp);
-             }, this)));
-  AddMethod(new ::grpc::internal::RpcServiceMethod(
-      TableService_method_names[32],
-      ::grpc::internal::RpcMethod::NORMAL_RPC,
-      new ::grpc::internal::RpcMethodHandler< TableService::Service, ::io::deephaven::proto::backplane::grpc::AggregateAllRequest, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse, ::grpc::protobuf::MessageLite, ::grpc::protobuf::MessageLite>(
-          [](TableService::Service* service,
-             ::grpc::ServerContext* ctx,
-             const ::io::deephaven::proto::backplane::grpc::AggregateAllRequest* req,
-             ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse* resp) {
-               return service->AggregateAll(ctx, req, resp);
-             }, this)));
-  AddMethod(new ::grpc::internal::RpcServiceMethod(
-      TableService_method_names[33],
-      ::grpc::internal::RpcMethod::NORMAL_RPC,
-      new ::grpc::internal::RpcMethodHandler< TableService::Service, ::io::deephaven::proto::backplane::grpc::AggregateRequest, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse, ::grpc::protobuf::MessageLite, ::grpc::protobuf::MessageLite>(
-          [](TableService::Service* service,
-             ::grpc::ServerContext* ctx,
-             const ::io::deephaven::proto::backplane::grpc::AggregateRequest* req,
-             ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse* resp) {
-               return service->Aggregate(ctx, req, resp);
-             }, this)));
-  AddMethod(new ::grpc::internal::RpcServiceMethod(
-      TableService_method_names[34],
-      ::grpc::internal::RpcMethod::NORMAL_RPC,
-      new ::grpc::internal::RpcMethodHandler< TableService::Service, ::io::deephaven::proto::backplane::grpc::SnapshotTableRequest, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse, ::grpc::protobuf::MessageLite, ::grpc::protobuf::MessageLite>(
-          [](TableService::Service* service,
-             ::grpc::ServerContext* ctx,
-             const ::io::deephaven::proto::backplane::grpc::SnapshotTableRequest* req,
-             ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse* resp) {
-               return service->Snapshot(ctx, req, resp);
-             }, this)));
-  AddMethod(new ::grpc::internal::RpcServiceMethod(
-      TableService_method_names[35],
-      ::grpc::internal::RpcMethod::NORMAL_RPC,
-      new ::grpc::internal::RpcMethodHandler< TableService::Service, ::io::deephaven::proto::backplane::grpc::SnapshotWhenTableRequest, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse, ::grpc::protobuf::MessageLite, ::grpc::protobuf::MessageLite>(
-          [](TableService::Service* service,
-             ::grpc::ServerContext* ctx,
-             const ::io::deephaven::proto::backplane::grpc::SnapshotWhenTableRequest* req,
-             ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse* resp) {
-               return service->SnapshotWhen(ctx, req, resp);
-             }, this)));
-  AddMethod(new ::grpc::internal::RpcServiceMethod(
-      TableService_method_names[36],
-      ::grpc::internal::RpcMethod::NORMAL_RPC,
-      new ::grpc::internal::RpcMethodHandler< TableService::Service, ::io::deephaven::proto::backplane::grpc::FlattenRequest, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse, ::grpc::protobuf::MessageLite, ::grpc::protobuf::MessageLite>(
-          [](TableService::Service* service,
-             ::grpc::ServerContext* ctx,
-             const ::io::deephaven::proto::backplane::grpc::FlattenRequest* req,
-             ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse* resp) {
-               return service->Flatten(ctx, req, resp);
-             }, this)));
-  AddMethod(new ::grpc::internal::RpcServiceMethod(
-      TableService_method_names[37],
-      ::grpc::internal::RpcMethod::NORMAL_RPC,
-      new ::grpc::internal::RpcMethodHandler< TableService::Service, ::io::deephaven::proto::backplane::grpc::RunChartDownsampleRequest, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse, ::grpc::protobuf::MessageLite, ::grpc::protobuf::MessageLite>(
-          [](TableService::Service* service,
-             ::grpc::ServerContext* ctx,
-             const ::io::deephaven::proto::backplane::grpc::RunChartDownsampleRequest* req,
-             ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse* resp) {
-               return service->RunChartDownsample(ctx, req, resp);
-             }, this)));
-  AddMethod(new ::grpc::internal::RpcServiceMethod(
-      TableService_method_names[38],
-      ::grpc::internal::RpcMethod::NORMAL_RPC,
-      new ::grpc::internal::RpcMethodHandler< TableService::Service, ::io::deephaven::proto::backplane::grpc::CreateInputTableRequest, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse, ::grpc::protobuf::MessageLite, ::grpc::protobuf::MessageLite>(
-          [](TableService::Service* service,
-             ::grpc::ServerContext* ctx,
-             const ::io::deephaven::proto::backplane::grpc::CreateInputTableRequest* req,
-             ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse* resp) {
-               return service->CreateInputTable(ctx, req, resp);
-             }, this)));
-  AddMethod(new ::grpc::internal::RpcServiceMethod(
-      TableService_method_names[39],
-      ::grpc::internal::RpcMethod::NORMAL_RPC,
-      new ::grpc::internal::RpcMethodHandler< TableService::Service, ::io::deephaven::proto::backplane::grpc::WhereInRequest, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse, ::grpc::protobuf::MessageLite, ::grpc::protobuf::MessageLite>(
-          [](TableService::Service* service,
-             ::grpc::ServerContext* ctx,
-             const ::io::deephaven::proto::backplane::grpc::WhereInRequest* req,
-             ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse* resp) {
-               return service->WhereIn(ctx, req, resp);
-             }, this)));
-  AddMethod(new ::grpc::internal::RpcServiceMethod(
-      TableService_method_names[40],
-      ::grpc::internal::RpcMethod::SERVER_STREAMING,
-      new ::grpc::internal::ServerStreamingHandler< TableService::Service, ::io::deephaven::proto::backplane::grpc::BatchTableRequest, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse>(
-          [](TableService::Service* service,
-             ::grpc::ServerContext* ctx,
-             const ::io::deephaven::proto::backplane::grpc::BatchTableRequest* req,
-             ::grpc::ServerWriter<::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse>* writer) {
-               return service->Batch(ctx, req, writer);
-             }, this)));
-  AddMethod(new ::grpc::internal::RpcServiceMethod(
-      TableService_method_names[41],
-      ::grpc::internal::RpcMethod::SERVER_STREAMING,
-      new ::grpc::internal::ServerStreamingHandler< TableService::Service, ::io::deephaven::proto::backplane::grpc::ExportedTableUpdatesRequest, ::io::deephaven::proto::backplane::grpc::ExportedTableUpdateMessage>(
-          [](TableService::Service* service,
-             ::grpc::ServerContext* ctx,
-             const ::io::deephaven::proto::backplane::grpc::ExportedTableUpdatesRequest* req,
-             ::grpc::ServerWriter<::io::deephaven::proto::backplane::grpc::ExportedTableUpdateMessage>* writer) {
-               return service->ExportedTableUpdates(ctx, req, writer);
-             }, this)));
-  AddMethod(new ::grpc::internal::RpcServiceMethod(
-      TableService_method_names[42],
-      ::grpc::internal::RpcMethod::NORMAL_RPC,
-      new ::grpc::internal::RpcMethodHandler< TableService::Service, ::io::deephaven::proto::backplane::grpc::SeekRowRequest, ::io::deephaven::proto::backplane::grpc::SeekRowResponse, ::grpc::protobuf::MessageLite, ::grpc::protobuf::MessageLite>(
-          [](TableService::Service* service,
-             ::grpc::ServerContext* ctx,
-             const ::io::deephaven::proto::backplane::grpc::SeekRowRequest* req,
-             ::io::deephaven::proto::backplane::grpc::SeekRowResponse* resp) {
-               return service->SeekRow(ctx, req, resp);
-             }, this)));
-  AddMethod(new ::grpc::internal::RpcServiceMethod(
-      TableService_method_names[43],
-      ::grpc::internal::RpcMethod::NORMAL_RPC,
-      new ::grpc::internal::RpcMethodHandler< TableService::Service, ::io::deephaven::proto::backplane::grpc::MetaTableRequest, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse, ::grpc::protobuf::MessageLite, ::grpc::protobuf::MessageLite>(
-          [](TableService::Service* service,
-             ::grpc::ServerContext* ctx,
-             const ::io::deephaven::proto::backplane::grpc::MetaTableRequest* req,
-             ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse* resp) {
-               return service->MetaTable(ctx, req, resp);
-             }, this)));
-  AddMethod(new ::grpc::internal::RpcServiceMethod(
-      TableService_method_names[44],
-      ::grpc::internal::RpcMethod::NORMAL_RPC,
-      new ::grpc::internal::RpcMethodHandler< TableService::Service, ::io::deephaven::proto::backplane::grpc::ColumnStatisticsRequest, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse, ::grpc::protobuf::MessageLite, ::grpc::protobuf::MessageLite>(
-          [](TableService::Service* service,
-             ::grpc::ServerContext* ctx,
-             const ::io::deephaven::proto::backplane::grpc::ColumnStatisticsRequest* req,
-             ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse* resp) {
-               return service->ComputeColumnStatistics(ctx, req, resp);
-             }, this)));
-}
-
-TableService::Service::~Service() {
-}
-
-::grpc::Status TableService::Service::GetExportedTableCreationResponse(::grpc::ServerContext* context, const ::io::deephaven::proto::backplane::grpc::Ticket* request, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse* response) {
-  (void) context;
-  (void) request;
-  (void) response;
-  return ::grpc::Status(::grpc::StatusCode::UNIMPLEMENTED, "");
-}
-
-::grpc::Status TableService::Service::FetchTable(::grpc::ServerContext* context, const ::io::deephaven::proto::backplane::grpc::FetchTableRequest* request, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse* response) {
-  (void) context;
-  (void) request;
-  (void) response;
-  return ::grpc::Status(::grpc::StatusCode::UNIMPLEMENTED, "");
-}
-
-::grpc::Status TableService::Service::ApplyPreviewColumns(::grpc::ServerContext* context, const ::io::deephaven::proto::backplane::grpc::ApplyPreviewColumnsRequest* request, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse* response) {
-  (void) context;
-  (void) request;
-  (void) response;
-  return ::grpc::Status(::grpc::StatusCode::UNIMPLEMENTED, "");
-}
-
-::grpc::Status TableService::Service::EmptyTable(::grpc::ServerContext* context, const ::io::deephaven::proto::backplane::grpc::EmptyTableRequest* request, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse* response) {
-  (void) context;
-  (void) request;
-  (void) response;
-  return ::grpc::Status(::grpc::StatusCode::UNIMPLEMENTED, "");
-}
-
-::grpc::Status TableService::Service::TimeTable(::grpc::ServerContext* context, const ::io::deephaven::proto::backplane::grpc::TimeTableRequest* request, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse* response) {
-  (void) context;
-  (void) request;
-  (void) response;
-  return ::grpc::Status(::grpc::StatusCode::UNIMPLEMENTED, "");
-}
-
-::grpc::Status TableService::Service::DropColumns(::grpc::ServerContext* context, const ::io::deephaven::proto::backplane::grpc::DropColumnsRequest* request, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse* response) {
-  (void) context;
-  (void) request;
-  (void) response;
-  return ::grpc::Status(::grpc::StatusCode::UNIMPLEMENTED, "");
-}
-
-::grpc::Status TableService::Service::Update(::grpc::ServerContext* context, const ::io::deephaven::proto::backplane::grpc::SelectOrUpdateRequest* request, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse* response) {
-  (void) context;
-  (void) request;
-  (void) response;
-  return ::grpc::Status(::grpc::StatusCode::UNIMPLEMENTED, "");
-}
-
-::grpc::Status TableService::Service::LazyUpdate(::grpc::ServerContext* context, const ::io::deephaven::proto::backplane::grpc::SelectOrUpdateRequest* request, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse* response) {
-  (void) context;
-  (void) request;
-  (void) response;
-  return ::grpc::Status(::grpc::StatusCode::UNIMPLEMENTED, "");
-}
-
-::grpc::Status TableService::Service::View(::grpc::ServerContext* context, const ::io::deephaven::proto::backplane::grpc::SelectOrUpdateRequest* request, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse* response) {
-  (void) context;
-  (void) request;
-  (void) response;
-  return ::grpc::Status(::grpc::StatusCode::UNIMPLEMENTED, "");
-}
-
-::grpc::Status TableService::Service::UpdateView(::grpc::ServerContext* context, const ::io::deephaven::proto::backplane::grpc::SelectOrUpdateRequest* request, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse* response) {
-  (void) context;
-  (void) request;
-  (void) response;
-  return ::grpc::Status(::grpc::StatusCode::UNIMPLEMENTED, "");
-}
-
-::grpc::Status TableService::Service::Select(::grpc::ServerContext* context, const ::io::deephaven::proto::backplane::grpc::SelectOrUpdateRequest* request, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse* response) {
-  (void) context;
-  (void) request;
-  (void) response;
-  return ::grpc::Status(::grpc::StatusCode::UNIMPLEMENTED, "");
-}
-
-::grpc::Status TableService::Service::UpdateBy(::grpc::ServerContext* context, const ::io::deephaven::proto::backplane::grpc::UpdateByRequest* request, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse* response) {
-  (void) context;
-  (void) request;
-  (void) response;
-  return ::grpc::Status(::grpc::StatusCode::UNIMPLEMENTED, "");
-}
-
-::grpc::Status TableService::Service::SelectDistinct(::grpc::ServerContext* context, const ::io::deephaven::proto::backplane::grpc::SelectDistinctRequest* request, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse* response) {
-  (void) context;
-  (void) request;
-  (void) response;
-  return ::grpc::Status(::grpc::StatusCode::UNIMPLEMENTED, "");
-}
-
-::grpc::Status TableService::Service::Filter(::grpc::ServerContext* context, const ::io::deephaven::proto::backplane::grpc::FilterTableRequest* request, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse* response) {
-  (void) context;
-  (void) request;
-  (void) response;
-  return ::grpc::Status(::grpc::StatusCode::UNIMPLEMENTED, "");
-}
-
-::grpc::Status TableService::Service::UnstructuredFilter(::grpc::ServerContext* context, const ::io::deephaven::proto::backplane::grpc::UnstructuredFilterTableRequest* request, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse* response) {
-  (void) context;
-  (void) request;
-  (void) response;
-  return ::grpc::Status(::grpc::StatusCode::UNIMPLEMENTED, "");
-}
-
-::grpc::Status TableService::Service::Sort(::grpc::ServerContext* context, const ::io::deephaven::proto::backplane::grpc::SortTableRequest* request, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse* response) {
-  (void) context;
-  (void) request;
-  (void) response;
-  return ::grpc::Status(::grpc::StatusCode::UNIMPLEMENTED, "");
-}
-
-::grpc::Status TableService::Service::Head(::grpc::ServerContext* context, const ::io::deephaven::proto::backplane::grpc::HeadOrTailRequest* request, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse* response) {
-  (void) context;
-  (void) request;
-  (void) response;
-  return ::grpc::Status(::grpc::StatusCode::UNIMPLEMENTED, "");
-}
-
-::grpc::Status TableService::Service::Tail(::grpc::ServerContext* context, const ::io::deephaven::proto::backplane::grpc::HeadOrTailRequest* request, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse* response) {
-  (void) context;
-  (void) request;
-  (void) response;
-  return ::grpc::Status(::grpc::StatusCode::UNIMPLEMENTED, "");
-}
-
-::grpc::Status TableService::Service::HeadBy(::grpc::ServerContext* context, const ::io::deephaven::proto::backplane::grpc::HeadOrTailByRequest* request, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse* response) {
-  (void) context;
-  (void) request;
-  (void) response;
-  return ::grpc::Status(::grpc::StatusCode::UNIMPLEMENTED, "");
-}
-
-::grpc::Status TableService::Service::TailBy(::grpc::ServerContext* context, const ::io::deephaven::proto::backplane::grpc::HeadOrTailByRequest* request, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse* response) {
-  (void) context;
-  (void) request;
-  (void) response;
-  return ::grpc::Status(::grpc::StatusCode::UNIMPLEMENTED, "");
-}
-
-::grpc::Status TableService::Service::Ungroup(::grpc::ServerContext* context, const ::io::deephaven::proto::backplane::grpc::UngroupRequest* request, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse* response) {
-  (void) context;
-  (void) request;
-  (void) response;
-  return ::grpc::Status(::grpc::StatusCode::UNIMPLEMENTED, "");
-}
-
-::grpc::Status TableService::Service::MergeTables(::grpc::ServerContext* context, const ::io::deephaven::proto::backplane::grpc::MergeTablesRequest* request, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse* response) {
-  (void) context;
-  (void) request;
-  (void) response;
-  return ::grpc::Status(::grpc::StatusCode::UNIMPLEMENTED, "");
-}
-
-::grpc::Status TableService::Service::CrossJoinTables(::grpc::ServerContext* context, const ::io::deephaven::proto::backplane::grpc::CrossJoinTablesRequest* request, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse* response) {
-  (void) context;
-  (void) request;
-  (void) response;
-  return ::grpc::Status(::grpc::StatusCode::UNIMPLEMENTED, "");
-}
-
-::grpc::Status TableService::Service::NaturalJoinTables(::grpc::ServerContext* context, const ::io::deephaven::proto::backplane::grpc::NaturalJoinTablesRequest* request, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse* response) {
-  (void) context;
-  (void) request;
-  (void) response;
-  return ::grpc::Status(::grpc::StatusCode::UNIMPLEMENTED, "");
-}
-
-::grpc::Status TableService::Service::ExactJoinTables(::grpc::ServerContext* context, const ::io::deephaven::proto::backplane::grpc::ExactJoinTablesRequest* request, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse* response) {
-  (void) context;
-  (void) request;
-  (void) response;
-  return ::grpc::Status(::grpc::StatusCode::UNIMPLEMENTED, "");
-}
-
-::grpc::Status TableService::Service::LeftJoinTables(::grpc::ServerContext* context, const ::io::deephaven::proto::backplane::grpc::LeftJoinTablesRequest* request, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse* response) {
-  (void) context;
-  (void) request;
-  (void) response;
-  return ::grpc::Status(::grpc::StatusCode::UNIMPLEMENTED, "");
-}
-
-::grpc::Status TableService::Service::AsOfJoinTables(::grpc::ServerContext* context, const ::io::deephaven::proto::backplane::grpc::AsOfJoinTablesRequest* request, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse* response) {
-  (void) context;
-  (void) request;
-  (void) response;
-  return ::grpc::Status(::grpc::StatusCode::UNIMPLEMENTED, "");
-}
-
-::grpc::Status TableService::Service::AjTables(::grpc::ServerContext* context, const ::io::deephaven::proto::backplane::grpc::AjRajTablesRequest* request, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse* response) {
-  (void) context;
-  (void) request;
-  (void) response;
-  return ::grpc::Status(::grpc::StatusCode::UNIMPLEMENTED, "");
-}
-
-::grpc::Status TableService::Service::RajTables(::grpc::ServerContext* context, const ::io::deephaven::proto::backplane::grpc::AjRajTablesRequest* request, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse* response) {
-  (void) context;
-  (void) request;
-  (void) response;
-  return ::grpc::Status(::grpc::StatusCode::UNIMPLEMENTED, "");
-}
-
-::grpc::Status TableService::Service::MultiJoinTables(::grpc::ServerContext* context, const ::io::deephaven::proto::backplane::grpc::MultiJoinTablesRequest* request, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse* response) {
-  (void) context;
-  (void) request;
-  (void) response;
-  return ::grpc::Status(::grpc::StatusCode::UNIMPLEMENTED, "");
-}
-
-::grpc::Status TableService::Service::RangeJoinTables(::grpc::ServerContext* context, const ::io::deephaven::proto::backplane::grpc::RangeJoinTablesRequest* request, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse* response) {
-  (void) context;
-  (void) request;
-  (void) response;
-  return ::grpc::Status(::grpc::StatusCode::UNIMPLEMENTED, "");
-}
-
-::grpc::Status TableService::Service::ComboAggregate(::grpc::ServerContext* context, const ::io::deephaven::proto::backplane::grpc::ComboAggregateRequest* request, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse* response) {
-  (void) context;
-  (void) request;
-  (void) response;
-  return ::grpc::Status(::grpc::StatusCode::UNIMPLEMENTED, "");
-}
-
-::grpc::Status TableService::Service::AggregateAll(::grpc::ServerContext* context, const ::io::deephaven::proto::backplane::grpc::AggregateAllRequest* request, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse* response) {
-  (void) context;
-  (void) request;
-  (void) response;
-  return ::grpc::Status(::grpc::StatusCode::UNIMPLEMENTED, "");
-}
-
-::grpc::Status TableService::Service::Aggregate(::grpc::ServerContext* context, const ::io::deephaven::proto::backplane::grpc::AggregateRequest* request, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse* response) {
-  (void) context;
-  (void) request;
-  (void) response;
-  return ::grpc::Status(::grpc::StatusCode::UNIMPLEMENTED, "");
-}
-
-::grpc::Status TableService::Service::Snapshot(::grpc::ServerContext* context, const ::io::deephaven::proto::backplane::grpc::SnapshotTableRequest* request, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse* response) {
-  (void) context;
-  (void) request;
-  (void) response;
-  return ::grpc::Status(::grpc::StatusCode::UNIMPLEMENTED, "");
-}
-
-::grpc::Status TableService::Service::SnapshotWhen(::grpc::ServerContext* context, const ::io::deephaven::proto::backplane::grpc::SnapshotWhenTableRequest* request, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse* response) {
-  (void) context;
-  (void) request;
-  (void) response;
-  return ::grpc::Status(::grpc::StatusCode::UNIMPLEMENTED, "");
-}
-
-::grpc::Status TableService::Service::Flatten(::grpc::ServerContext* context, const ::io::deephaven::proto::backplane::grpc::FlattenRequest* request, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse* response) {
-  (void) context;
-  (void) request;
-  (void) response;
-  return ::grpc::Status(::grpc::StatusCode::UNIMPLEMENTED, "");
-}
-
-::grpc::Status TableService::Service::RunChartDownsample(::grpc::ServerContext* context, const ::io::deephaven::proto::backplane::grpc::RunChartDownsampleRequest* request, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse* response) {
-  (void) context;
-  (void) request;
-  (void) response;
-  return ::grpc::Status(::grpc::StatusCode::UNIMPLEMENTED, "");
-}
-
-::grpc::Status TableService::Service::CreateInputTable(::grpc::ServerContext* context, const ::io::deephaven::proto::backplane::grpc::CreateInputTableRequest* request, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse* response) {
-  (void) context;
-  (void) request;
-  (void) response;
-  return ::grpc::Status(::grpc::StatusCode::UNIMPLEMENTED, "");
-}
-
-::grpc::Status TableService::Service::WhereIn(::grpc::ServerContext* context, const ::io::deephaven::proto::backplane::grpc::WhereInRequest* request, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse* response) {
-  (void) context;
-  (void) request;
-  (void) response;
-  return ::grpc::Status(::grpc::StatusCode::UNIMPLEMENTED, "");
-}
-
-::grpc::Status TableService::Service::Batch(::grpc::ServerContext* context, const ::io::deephaven::proto::backplane::grpc::BatchTableRequest* request, ::grpc::ServerWriter< ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse>* writer) {
-  (void) context;
-  (void) request;
-  (void) writer;
-  return ::grpc::Status(::grpc::StatusCode::UNIMPLEMENTED, "");
-}
-
-::grpc::Status TableService::Service::ExportedTableUpdates(::grpc::ServerContext* context, const ::io::deephaven::proto::backplane::grpc::ExportedTableUpdatesRequest* request, ::grpc::ServerWriter< ::io::deephaven::proto::backplane::grpc::ExportedTableUpdateMessage>* writer) {
-  (void) context;
-  (void) request;
-  (void) writer;
-  return ::grpc::Status(::grpc::StatusCode::UNIMPLEMENTED, "");
-}
-
-::grpc::Status TableService::Service::SeekRow(::grpc::ServerContext* context, const ::io::deephaven::proto::backplane::grpc::SeekRowRequest* request, ::io::deephaven::proto::backplane::grpc::SeekRowResponse* response) {
-  (void) context;
-  (void) request;
-  (void) response;
-  return ::grpc::Status(::grpc::StatusCode::UNIMPLEMENTED, "");
-}
-
-::grpc::Status TableService::Service::MetaTable(::grpc::ServerContext* context, const ::io::deephaven::proto::backplane::grpc::MetaTableRequest* request, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse* response) {
-  (void) context;
-  (void) request;
-  (void) response;
-  return ::grpc::Status(::grpc::StatusCode::UNIMPLEMENTED, "");
-}
-
-::grpc::Status TableService::Service::ComputeColumnStatistics(::grpc::ServerContext* context, const ::io::deephaven::proto::backplane::grpc::ColumnStatisticsRequest* request, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse* response) {
-  (void) context;
-  (void) request;
-  (void) response;
-  return ::grpc::Status(::grpc::StatusCode::UNIMPLEMENTED, "");
-}
-
-
-}  // namespace io
-}  // namespace deephaven
-}  // namespace proto
-}  // namespace backplane
-}  // namespace grpc
-
diff --git a/cpp-client/deephaven/dhclient/proto/deephaven/proto/table.grpc.pb.h b/cpp-client/deephaven/dhclient/proto/deephaven/proto/table.grpc.pb.h
deleted file mode 100644
index a1c00be0876..00000000000
--- a/cpp-client/deephaven/dhclient/proto/deephaven/proto/table.grpc.pb.h
+++ /dev/null
@@ -1,7502 +0,0 @@
-// Generated by the gRPC C++ plugin.
-// If you make any local change, they will be lost.
-// source: deephaven/proto/table.proto
-// Original file comments:
-//
-// Copyright (c) 2016-2022 Deephaven Data Labs and Patent Pending
-#ifndef GRPC_deephaven_2fproto_2ftable_2eproto__INCLUDED
-#define GRPC_deephaven_2fproto_2ftable_2eproto__INCLUDED
-
-#include "deephaven/proto/table.pb.h"
-
-#include <functional>
-#include <grpcpp/generic/async_generic_service.h>
-#include <grpcpp/support/async_stream.h>
-#include <grpcpp/support/async_unary_call.h>
-#include <grpcpp/support/client_callback.h>
-#include <grpcpp/client_context.h>
-#include <grpcpp/completion_queue.h>
-#include <grpcpp/support/message_allocator.h>
-#include <grpcpp/support/method_handler.h>
-#include <grpcpp/impl/proto_utils.h>
-#include <grpcpp/impl/rpc_method.h>
-#include <grpcpp/support/server_callback.h>
-#include <grpcpp/impl/server_callback_handlers.h>
-#include <grpcpp/server_context.h>
-#include <grpcpp/impl/service_type.h>
-#include <grpcpp/support/status.h>
-#include <grpcpp/support/stub_options.h>
-#include <grpcpp/support/sync_stream.h>
-
-namespace io {
-namespace deephaven {
-namespace proto {
-namespace backplane {
-namespace grpc {
-
-class TableService final {
- public:
-  static constexpr char const* service_full_name() {
-    return "io.deephaven.proto.backplane.grpc.TableService";
-  }
-  class StubInterface {
-   public:
-    virtual ~StubInterface() {}
-    //
-    // Request an ETCR for this ticket. Ticket must reference a Table.
-    virtual ::grpc::Status GetExportedTableCreationResponse(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::Ticket& request, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse* response) = 0;
-    std::unique_ptr< ::grpc::ClientAsyncResponseReaderInterface< ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse>> AsyncGetExportedTableCreationResponse(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::Ticket& request, ::grpc::CompletionQueue* cq) {
-      return std::unique_ptr< ::grpc::ClientAsyncResponseReaderInterface< ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse>>(AsyncGetExportedTableCreationResponseRaw(context, request, cq));
-    }
-    std::unique_ptr< ::grpc::ClientAsyncResponseReaderInterface< ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse>> PrepareAsyncGetExportedTableCreationResponse(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::Ticket& request, ::grpc::CompletionQueue* cq) {
-      return std::unique_ptr< ::grpc::ClientAsyncResponseReaderInterface< ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse>>(PrepareAsyncGetExportedTableCreationResponseRaw(context, request, cq));
-    }
-    //
-    // Fetches a Table from an existing source ticket and exports it to the local session result ticket.
-    virtual ::grpc::Status FetchTable(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::FetchTableRequest& request, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse* response) = 0;
-    std::unique_ptr< ::grpc::ClientAsyncResponseReaderInterface< ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse>> AsyncFetchTable(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::FetchTableRequest& request, ::grpc::CompletionQueue* cq) {
-      return std::unique_ptr< ::grpc::ClientAsyncResponseReaderInterface< ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse>>(AsyncFetchTableRaw(context, request, cq));
-    }
-    std::unique_ptr< ::grpc::ClientAsyncResponseReaderInterface< ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse>> PrepareAsyncFetchTable(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::FetchTableRequest& request, ::grpc::CompletionQueue* cq) {
-      return std::unique_ptr< ::grpc::ClientAsyncResponseReaderInterface< ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse>>(PrepareAsyncFetchTableRaw(context, request, cq));
-    }
-    //
-    // Create a table that has preview columns applied to an existing source table.
-    virtual ::grpc::Status ApplyPreviewColumns(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::ApplyPreviewColumnsRequest& request, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse* response) = 0;
-    std::unique_ptr< ::grpc::ClientAsyncResponseReaderInterface< ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse>> AsyncApplyPreviewColumns(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::ApplyPreviewColumnsRequest& request, ::grpc::CompletionQueue* cq) {
-      return std::unique_ptr< ::grpc::ClientAsyncResponseReaderInterface< ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse>>(AsyncApplyPreviewColumnsRaw(context, request, cq));
-    }
-    std::unique_ptr< ::grpc::ClientAsyncResponseReaderInterface< ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse>> PrepareAsyncApplyPreviewColumns(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::ApplyPreviewColumnsRequest& request, ::grpc::CompletionQueue* cq) {
-      return std::unique_ptr< ::grpc::ClientAsyncResponseReaderInterface< ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse>>(PrepareAsyncApplyPreviewColumnsRaw(context, request, cq));
-    }
-    //
-    // Create an empty table with the given column names and types.
-    virtual ::grpc::Status EmptyTable(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::EmptyTableRequest& request, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse* response) = 0;
-    std::unique_ptr< ::grpc::ClientAsyncResponseReaderInterface< ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse>> AsyncEmptyTable(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::EmptyTableRequest& request, ::grpc::CompletionQueue* cq) {
-      return std::unique_ptr< ::grpc::ClientAsyncResponseReaderInterface< ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse>>(AsyncEmptyTableRaw(context, request, cq));
-    }
-    std::unique_ptr< ::grpc::ClientAsyncResponseReaderInterface< ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse>> PrepareAsyncEmptyTable(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::EmptyTableRequest& request, ::grpc::CompletionQueue* cq) {
-      return std::unique_ptr< ::grpc::ClientAsyncResponseReaderInterface< ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse>>(PrepareAsyncEmptyTableRaw(context, request, cq));
-    }
-    //
-    // Create a time table with the given start time and period.
-    virtual ::grpc::Status TimeTable(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::TimeTableRequest& request, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse* response) = 0;
-    std::unique_ptr< ::grpc::ClientAsyncResponseReaderInterface< ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse>> AsyncTimeTable(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::TimeTableRequest& request, ::grpc::CompletionQueue* cq) {
-      return std::unique_ptr< ::grpc::ClientAsyncResponseReaderInterface< ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse>>(AsyncTimeTableRaw(context, request, cq));
-    }
-    std::unique_ptr< ::grpc::ClientAsyncResponseReaderInterface< ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse>> PrepareAsyncTimeTable(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::TimeTableRequest& request, ::grpc::CompletionQueue* cq) {
-      return std::unique_ptr< ::grpc::ClientAsyncResponseReaderInterface< ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse>>(PrepareAsyncTimeTableRaw(context, request, cq));
-    }
-    //
-    // Drop columns from the parent table.
-    virtual ::grpc::Status DropColumns(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::DropColumnsRequest& request, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse* response) = 0;
-    std::unique_ptr< ::grpc::ClientAsyncResponseReaderInterface< ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse>> AsyncDropColumns(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::DropColumnsRequest& request, ::grpc::CompletionQueue* cq) {
-      return std::unique_ptr< ::grpc::ClientAsyncResponseReaderInterface< ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse>>(AsyncDropColumnsRaw(context, request, cq));
-    }
-    std::unique_ptr< ::grpc::ClientAsyncResponseReaderInterface< ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse>> PrepareAsyncDropColumns(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::DropColumnsRequest& request, ::grpc::CompletionQueue* cq) {
-      return std::unique_ptr< ::grpc::ClientAsyncResponseReaderInterface< ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse>>(PrepareAsyncDropColumnsRaw(context, request, cq));
-    }
-    //
-    // Add columns to the given table using the given column specifications and the update table operation.
-    virtual ::grpc::Status Update(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::SelectOrUpdateRequest& request, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse* response) = 0;
-    std::unique_ptr< ::grpc::ClientAsyncResponseReaderInterface< ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse>> AsyncUpdate(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::SelectOrUpdateRequest& request, ::grpc::CompletionQueue* cq) {
-      return std::unique_ptr< ::grpc::ClientAsyncResponseReaderInterface< ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse>>(AsyncUpdateRaw(context, request, cq));
-    }
-    std::unique_ptr< ::grpc::ClientAsyncResponseReaderInterface< ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse>> PrepareAsyncUpdate(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::SelectOrUpdateRequest& request, ::grpc::CompletionQueue* cq) {
-      return std::unique_ptr< ::grpc::ClientAsyncResponseReaderInterface< ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse>>(PrepareAsyncUpdateRaw(context, request, cq));
-    }
-    //
-    // Add columns to the given table using the given column specifications and the lazyUpdate table operation.
-    virtual ::grpc::Status LazyUpdate(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::SelectOrUpdateRequest& request, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse* response) = 0;
-    std::unique_ptr< ::grpc::ClientAsyncResponseReaderInterface< ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse>> AsyncLazyUpdate(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::SelectOrUpdateRequest& request, ::grpc::CompletionQueue* cq) {
-      return std::unique_ptr< ::grpc::ClientAsyncResponseReaderInterface< ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse>>(AsyncLazyUpdateRaw(context, request, cq));
-    }
-    std::unique_ptr< ::grpc::ClientAsyncResponseReaderInterface< ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse>> PrepareAsyncLazyUpdate(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::SelectOrUpdateRequest& request, ::grpc::CompletionQueue* cq) {
-      return std::unique_ptr< ::grpc::ClientAsyncResponseReaderInterface< ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse>>(PrepareAsyncLazyUpdateRaw(context, request, cq));
-    }
-    //
-    // Add columns to the given table using the given column specifications and the view table operation.
-    virtual ::grpc::Status View(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::SelectOrUpdateRequest& request, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse* response) = 0;
-    std::unique_ptr< ::grpc::ClientAsyncResponseReaderInterface< ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse>> AsyncView(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::SelectOrUpdateRequest& request, ::grpc::CompletionQueue* cq) {
-      return std::unique_ptr< ::grpc::ClientAsyncResponseReaderInterface< ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse>>(AsyncViewRaw(context, request, cq));
-    }
-    std::unique_ptr< ::grpc::ClientAsyncResponseReaderInterface< ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse>> PrepareAsyncView(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::SelectOrUpdateRequest& request, ::grpc::CompletionQueue* cq) {
-      return std::unique_ptr< ::grpc::ClientAsyncResponseReaderInterface< ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse>>(PrepareAsyncViewRaw(context, request, cq));
-    }
-    //
-    // Add columns to the given table using the given column specifications and the updateView table operation.
-    virtual ::grpc::Status UpdateView(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::SelectOrUpdateRequest& request, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse* response) = 0;
-    std::unique_ptr< ::grpc::ClientAsyncResponseReaderInterface< ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse>> AsyncUpdateView(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::SelectOrUpdateRequest& request, ::grpc::CompletionQueue* cq) {
-      return std::unique_ptr< ::grpc::ClientAsyncResponseReaderInterface< ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse>>(AsyncUpdateViewRaw(context, request, cq));
-    }
-    std::unique_ptr< ::grpc::ClientAsyncResponseReaderInterface< ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse>> PrepareAsyncUpdateView(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::SelectOrUpdateRequest& request, ::grpc::CompletionQueue* cq) {
-      return std::unique_ptr< ::grpc::ClientAsyncResponseReaderInterface< ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse>>(PrepareAsyncUpdateViewRaw(context, request, cq));
-    }
-    //
-    // Select the given columns from the given table.
-    virtual ::grpc::Status Select(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::SelectOrUpdateRequest& request, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse* response) = 0;
-    std::unique_ptr< ::grpc::ClientAsyncResponseReaderInterface< ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse>> AsyncSelect(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::SelectOrUpdateRequest& request, ::grpc::CompletionQueue* cq) {
-      return std::unique_ptr< ::grpc::ClientAsyncResponseReaderInterface< ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse>>(AsyncSelectRaw(context, request, cq));
-    }
-    std::unique_ptr< ::grpc::ClientAsyncResponseReaderInterface< ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse>> PrepareAsyncSelect(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::SelectOrUpdateRequest& request, ::grpc::CompletionQueue* cq) {
-      return std::unique_ptr< ::grpc::ClientAsyncResponseReaderInterface< ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse>>(PrepareAsyncSelectRaw(context, request, cq));
-    }
-    //
-    // Returns the result of an updateBy table operation.
-    virtual ::grpc::Status UpdateBy(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::UpdateByRequest& request, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse* response) = 0;
-    std::unique_ptr< ::grpc::ClientAsyncResponseReaderInterface< ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse>> AsyncUpdateBy(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::UpdateByRequest& request, ::grpc::CompletionQueue* cq) {
-      return std::unique_ptr< ::grpc::ClientAsyncResponseReaderInterface< ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse>>(AsyncUpdateByRaw(context, request, cq));
-    }
-    std::unique_ptr< ::grpc::ClientAsyncResponseReaderInterface< ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse>> PrepareAsyncUpdateBy(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::UpdateByRequest& request, ::grpc::CompletionQueue* cq) {
-      return std::unique_ptr< ::grpc::ClientAsyncResponseReaderInterface< ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse>>(PrepareAsyncUpdateByRaw(context, request, cq));
-    }
-    //
-    // Returns a new table definition with the unique tuples of the specified columns
-    virtual ::grpc::Status SelectDistinct(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::SelectDistinctRequest& request, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse* response) = 0;
-    std::unique_ptr< ::grpc::ClientAsyncResponseReaderInterface< ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse>> AsyncSelectDistinct(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::SelectDistinctRequest& request, ::grpc::CompletionQueue* cq) {
-      return std::unique_ptr< ::grpc::ClientAsyncResponseReaderInterface< ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse>>(AsyncSelectDistinctRaw(context, request, cq));
-    }
-    std::unique_ptr< ::grpc::ClientAsyncResponseReaderInterface< ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse>> PrepareAsyncSelectDistinct(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::SelectDistinctRequest& request, ::grpc::CompletionQueue* cq) {
-      return std::unique_ptr< ::grpc::ClientAsyncResponseReaderInterface< ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse>>(PrepareAsyncSelectDistinctRaw(context, request, cq));
-    }
-    //
-    // Filter parent table with structured filters.
-    virtual ::grpc::Status Filter(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::FilterTableRequest& request, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse* response) = 0;
-    std::unique_ptr< ::grpc::ClientAsyncResponseReaderInterface< ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse>> AsyncFilter(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::FilterTableRequest& request, ::grpc::CompletionQueue* cq) {
-      return std::unique_ptr< ::grpc::ClientAsyncResponseReaderInterface< ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse>>(AsyncFilterRaw(context, request, cq));
-    }
-    std::unique_ptr< ::grpc::ClientAsyncResponseReaderInterface< ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse>> PrepareAsyncFilter(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::FilterTableRequest& request, ::grpc::CompletionQueue* cq) {
-      return std::unique_ptr< ::grpc::ClientAsyncResponseReaderInterface< ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse>>(PrepareAsyncFilterRaw(context, request, cq));
-    }
-    //
-    // Filter parent table with unstructured filters.
-    virtual ::grpc::Status UnstructuredFilter(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::UnstructuredFilterTableRequest& request, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse* response) = 0;
-    std::unique_ptr< ::grpc::ClientAsyncResponseReaderInterface< ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse>> AsyncUnstructuredFilter(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::UnstructuredFilterTableRequest& request, ::grpc::CompletionQueue* cq) {
-      return std::unique_ptr< ::grpc::ClientAsyncResponseReaderInterface< ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse>>(AsyncUnstructuredFilterRaw(context, request, cq));
-    }
-    std::unique_ptr< ::grpc::ClientAsyncResponseReaderInterface< ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse>> PrepareAsyncUnstructuredFilter(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::UnstructuredFilterTableRequest& request, ::grpc::CompletionQueue* cq) {
-      return std::unique_ptr< ::grpc::ClientAsyncResponseReaderInterface< ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse>>(PrepareAsyncUnstructuredFilterRaw(context, request, cq));
-    }
-    //
-    // Sort parent table via the provide sort descriptors.
-    virtual ::grpc::Status Sort(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::SortTableRequest& request, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse* response) = 0;
-    std::unique_ptr< ::grpc::ClientAsyncResponseReaderInterface< ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse>> AsyncSort(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::SortTableRequest& request, ::grpc::CompletionQueue* cq) {
-      return std::unique_ptr< ::grpc::ClientAsyncResponseReaderInterface< ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse>>(AsyncSortRaw(context, request, cq));
-    }
-    std::unique_ptr< ::grpc::ClientAsyncResponseReaderInterface< ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse>> PrepareAsyncSort(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::SortTableRequest& request, ::grpc::CompletionQueue* cq) {
-      return std::unique_ptr< ::grpc::ClientAsyncResponseReaderInterface< ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse>>(PrepareAsyncSortRaw(context, request, cq));
-    }
-    //
-    // Extract rows from the head of the parent table.
-    virtual ::grpc::Status Head(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::HeadOrTailRequest& request, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse* response) = 0;
-    std::unique_ptr< ::grpc::ClientAsyncResponseReaderInterface< ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse>> AsyncHead(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::HeadOrTailRequest& request, ::grpc::CompletionQueue* cq) {
-      return std::unique_ptr< ::grpc::ClientAsyncResponseReaderInterface< ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse>>(AsyncHeadRaw(context, request, cq));
-    }
-    std::unique_ptr< ::grpc::ClientAsyncResponseReaderInterface< ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse>> PrepareAsyncHead(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::HeadOrTailRequest& request, ::grpc::CompletionQueue* cq) {
-      return std::unique_ptr< ::grpc::ClientAsyncResponseReaderInterface< ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse>>(PrepareAsyncHeadRaw(context, request, cq));
-    }
-    //
-    // Extract rows from the tail of the parent table.
-    virtual ::grpc::Status Tail(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::HeadOrTailRequest& request, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse* response) = 0;
-    std::unique_ptr< ::grpc::ClientAsyncResponseReaderInterface< ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse>> AsyncTail(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::HeadOrTailRequest& request, ::grpc::CompletionQueue* cq) {
-      return std::unique_ptr< ::grpc::ClientAsyncResponseReaderInterface< ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse>>(AsyncTailRaw(context, request, cq));
-    }
-    std::unique_ptr< ::grpc::ClientAsyncResponseReaderInterface< ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse>> PrepareAsyncTail(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::HeadOrTailRequest& request, ::grpc::CompletionQueue* cq) {
-      return std::unique_ptr< ::grpc::ClientAsyncResponseReaderInterface< ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse>>(PrepareAsyncTailRaw(context, request, cq));
-    }
-    //
-    // Run the headBy table operation for the given group by columns on the given table.
-    virtual ::grpc::Status HeadBy(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::HeadOrTailByRequest& request, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse* response) = 0;
-    std::unique_ptr< ::grpc::ClientAsyncResponseReaderInterface< ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse>> AsyncHeadBy(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::HeadOrTailByRequest& request, ::grpc::CompletionQueue* cq) {
-      return std::unique_ptr< ::grpc::ClientAsyncResponseReaderInterface< ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse>>(AsyncHeadByRaw(context, request, cq));
-    }
-    std::unique_ptr< ::grpc::ClientAsyncResponseReaderInterface< ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse>> PrepareAsyncHeadBy(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::HeadOrTailByRequest& request, ::grpc::CompletionQueue* cq) {
-      return std::unique_ptr< ::grpc::ClientAsyncResponseReaderInterface< ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse>>(PrepareAsyncHeadByRaw(context, request, cq));
-    }
-    //
-    // Run the tailBy operation for the given group by columns on the given table.
-    virtual ::grpc::Status TailBy(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::HeadOrTailByRequest& request, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse* response) = 0;
-    std::unique_ptr< ::grpc::ClientAsyncResponseReaderInterface< ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse>> AsyncTailBy(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::HeadOrTailByRequest& request, ::grpc::CompletionQueue* cq) {
-      return std::unique_ptr< ::grpc::ClientAsyncResponseReaderInterface< ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse>>(AsyncTailByRaw(context, request, cq));
-    }
-    std::unique_ptr< ::grpc::ClientAsyncResponseReaderInterface< ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse>> PrepareAsyncTailBy(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::HeadOrTailByRequest& request, ::grpc::CompletionQueue* cq) {
-      return std::unique_ptr< ::grpc::ClientAsyncResponseReaderInterface< ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse>>(PrepareAsyncTailByRaw(context, request, cq));
-    }
-    //
-    // Ungroup the given columns (all columns will be ungrouped if columnsToUngroup is empty or unspecified).
-    virtual ::grpc::Status Ungroup(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::UngroupRequest& request, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse* response) = 0;
-    std::unique_ptr< ::grpc::ClientAsyncResponseReaderInterface< ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse>> AsyncUngroup(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::UngroupRequest& request, ::grpc::CompletionQueue* cq) {
-      return std::unique_ptr< ::grpc::ClientAsyncResponseReaderInterface< ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse>>(AsyncUngroupRaw(context, request, cq));
-    }
-    std::unique_ptr< ::grpc::ClientAsyncResponseReaderInterface< ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse>> PrepareAsyncUngroup(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::UngroupRequest& request, ::grpc::CompletionQueue* cq) {
-      return std::unique_ptr< ::grpc::ClientAsyncResponseReaderInterface< ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse>>(PrepareAsyncUngroupRaw(context, request, cq));
-    }
-    //
-    // Create a merged table from the given input tables. If a key column is provided (not null), a sorted
-    // merged will be performed using that column.
-    virtual ::grpc::Status MergeTables(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::MergeTablesRequest& request, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse* response) = 0;
-    std::unique_ptr< ::grpc::ClientAsyncResponseReaderInterface< ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse>> AsyncMergeTables(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::MergeTablesRequest& request, ::grpc::CompletionQueue* cq) {
-      return std::unique_ptr< ::grpc::ClientAsyncResponseReaderInterface< ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse>>(AsyncMergeTablesRaw(context, request, cq));
-    }
-    std::unique_ptr< ::grpc::ClientAsyncResponseReaderInterface< ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse>> PrepareAsyncMergeTables(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::MergeTablesRequest& request, ::grpc::CompletionQueue* cq) {
-      return std::unique_ptr< ::grpc::ClientAsyncResponseReaderInterface< ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse>>(PrepareAsyncMergeTablesRaw(context, request, cq));
-    }
-    //
-    // Returns the result of a cross join operation. Also known as the cartesian product.
-    virtual ::grpc::Status CrossJoinTables(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::CrossJoinTablesRequest& request, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse* response) = 0;
-    std::unique_ptr< ::grpc::ClientAsyncResponseReaderInterface< ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse>> AsyncCrossJoinTables(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::CrossJoinTablesRequest& request, ::grpc::CompletionQueue* cq) {
-      return std::unique_ptr< ::grpc::ClientAsyncResponseReaderInterface< ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse>>(AsyncCrossJoinTablesRaw(context, request, cq));
-    }
-    std::unique_ptr< ::grpc::ClientAsyncResponseReaderInterface< ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse>> PrepareAsyncCrossJoinTables(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::CrossJoinTablesRequest& request, ::grpc::CompletionQueue* cq) {
-      return std::unique_ptr< ::grpc::ClientAsyncResponseReaderInterface< ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse>>(PrepareAsyncCrossJoinTablesRaw(context, request, cq));
-    }
-    //
-    // Returns the result of a natural join operation.
-    virtual ::grpc::Status NaturalJoinTables(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::NaturalJoinTablesRequest& request, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse* response) = 0;
-    std::unique_ptr< ::grpc::ClientAsyncResponseReaderInterface< ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse>> AsyncNaturalJoinTables(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::NaturalJoinTablesRequest& request, ::grpc::CompletionQueue* cq) {
-      return std::unique_ptr< ::grpc::ClientAsyncResponseReaderInterface< ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse>>(AsyncNaturalJoinTablesRaw(context, request, cq));
-    }
-    std::unique_ptr< ::grpc::ClientAsyncResponseReaderInterface< ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse>> PrepareAsyncNaturalJoinTables(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::NaturalJoinTablesRequest& request, ::grpc::CompletionQueue* cq) {
-      return std::unique_ptr< ::grpc::ClientAsyncResponseReaderInterface< ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse>>(PrepareAsyncNaturalJoinTablesRaw(context, request, cq));
-    }
-    //
-    // Returns the result of an exact join operation.
-    virtual ::grpc::Status ExactJoinTables(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::ExactJoinTablesRequest& request, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse* response) = 0;
-    std::unique_ptr< ::grpc::ClientAsyncResponseReaderInterface< ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse>> AsyncExactJoinTables(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::ExactJoinTablesRequest& request, ::grpc::CompletionQueue* cq) {
-      return std::unique_ptr< ::grpc::ClientAsyncResponseReaderInterface< ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse>>(AsyncExactJoinTablesRaw(context, request, cq));
-    }
-    std::unique_ptr< ::grpc::ClientAsyncResponseReaderInterface< ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse>> PrepareAsyncExactJoinTables(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::ExactJoinTablesRequest& request, ::grpc::CompletionQueue* cq) {
-      return std::unique_ptr< ::grpc::ClientAsyncResponseReaderInterface< ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse>>(PrepareAsyncExactJoinTablesRaw(context, request, cq));
-    }
-    //
-    // Returns the result of a left join operation.
-    virtual ::grpc::Status LeftJoinTables(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::LeftJoinTablesRequest& request, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse* response) = 0;
-    std::unique_ptr< ::grpc::ClientAsyncResponseReaderInterface< ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse>> AsyncLeftJoinTables(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::LeftJoinTablesRequest& request, ::grpc::CompletionQueue* cq) {
-      return std::unique_ptr< ::grpc::ClientAsyncResponseReaderInterface< ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse>>(AsyncLeftJoinTablesRaw(context, request, cq));
-    }
-    std::unique_ptr< ::grpc::ClientAsyncResponseReaderInterface< ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse>> PrepareAsyncLeftJoinTables(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::LeftJoinTablesRequest& request, ::grpc::CompletionQueue* cq) {
-      return std::unique_ptr< ::grpc::ClientAsyncResponseReaderInterface< ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse>>(PrepareAsyncLeftJoinTablesRaw(context, request, cq));
-    }
-    //
-    // Returns the result of an as of join operation.
-    //
-    // Deprecated: Please use AjTables or RajTables.
-    virtual ::grpc::Status AsOfJoinTables(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::AsOfJoinTablesRequest& request, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse* response) = 0;
-    std::unique_ptr< ::grpc::ClientAsyncResponseReaderInterface< ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse>> AsyncAsOfJoinTables(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::AsOfJoinTablesRequest& request, ::grpc::CompletionQueue* cq) {
-      return std::unique_ptr< ::grpc::ClientAsyncResponseReaderInterface< ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse>>(AsyncAsOfJoinTablesRaw(context, request, cq));
-    }
-    std::unique_ptr< ::grpc::ClientAsyncResponseReaderInterface< ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse>> PrepareAsyncAsOfJoinTables(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::AsOfJoinTablesRequest& request, ::grpc::CompletionQueue* cq) {
-      return std::unique_ptr< ::grpc::ClientAsyncResponseReaderInterface< ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse>>(PrepareAsyncAsOfJoinTablesRaw(context, request, cq));
-    }
-    //
-    // Returns the result of an aj operation.
-    virtual ::grpc::Status AjTables(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::AjRajTablesRequest& request, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse* response) = 0;
-    std::unique_ptr< ::grpc::ClientAsyncResponseReaderInterface< ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse>> AsyncAjTables(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::AjRajTablesRequest& request, ::grpc::CompletionQueue* cq) {
-      return std::unique_ptr< ::grpc::ClientAsyncResponseReaderInterface< ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse>>(AsyncAjTablesRaw(context, request, cq));
-    }
-    std::unique_ptr< ::grpc::ClientAsyncResponseReaderInterface< ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse>> PrepareAsyncAjTables(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::AjRajTablesRequest& request, ::grpc::CompletionQueue* cq) {
-      return std::unique_ptr< ::grpc::ClientAsyncResponseReaderInterface< ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse>>(PrepareAsyncAjTablesRaw(context, request, cq));
-    }
-    //
-    // Returns the result of an raj operation.
-    virtual ::grpc::Status RajTables(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::AjRajTablesRequest& request, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse* response) = 0;
-    std::unique_ptr< ::grpc::ClientAsyncResponseReaderInterface< ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse>> AsyncRajTables(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::AjRajTablesRequest& request, ::grpc::CompletionQueue* cq) {
-      return std::unique_ptr< ::grpc::ClientAsyncResponseReaderInterface< ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse>>(AsyncRajTablesRaw(context, request, cq));
-    }
-    std::unique_ptr< ::grpc::ClientAsyncResponseReaderInterface< ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse>> PrepareAsyncRajTables(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::AjRajTablesRequest& request, ::grpc::CompletionQueue* cq) {
-      return std::unique_ptr< ::grpc::ClientAsyncResponseReaderInterface< ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse>>(PrepareAsyncRajTablesRaw(context, request, cq));
-    }
-    //
-    // Returns the result of a multi-join operation.
-    virtual ::grpc::Status MultiJoinTables(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::MultiJoinTablesRequest& request, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse* response) = 0;
-    std::unique_ptr< ::grpc::ClientAsyncResponseReaderInterface< ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse>> AsyncMultiJoinTables(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::MultiJoinTablesRequest& request, ::grpc::CompletionQueue* cq) {
-      return std::unique_ptr< ::grpc::ClientAsyncResponseReaderInterface< ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse>>(AsyncMultiJoinTablesRaw(context, request, cq));
-    }
-    std::unique_ptr< ::grpc::ClientAsyncResponseReaderInterface< ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse>> PrepareAsyncMultiJoinTables(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::MultiJoinTablesRequest& request, ::grpc::CompletionQueue* cq) {
-      return std::unique_ptr< ::grpc::ClientAsyncResponseReaderInterface< ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse>>(PrepareAsyncMultiJoinTablesRaw(context, request, cq));
-    }
-    //
-    // Returns the result of a range join operation.
-    virtual ::grpc::Status RangeJoinTables(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::RangeJoinTablesRequest& request, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse* response) = 0;
-    std::unique_ptr< ::grpc::ClientAsyncResponseReaderInterface< ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse>> AsyncRangeJoinTables(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::RangeJoinTablesRequest& request, ::grpc::CompletionQueue* cq) {
-      return std::unique_ptr< ::grpc::ClientAsyncResponseReaderInterface< ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse>>(AsyncRangeJoinTablesRaw(context, request, cq));
-    }
-    std::unique_ptr< ::grpc::ClientAsyncResponseReaderInterface< ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse>> PrepareAsyncRangeJoinTables(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::RangeJoinTablesRequest& request, ::grpc::CompletionQueue* cq) {
-      return std::unique_ptr< ::grpc::ClientAsyncResponseReaderInterface< ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse>>(PrepareAsyncRangeJoinTablesRaw(context, request, cq));
-    }
-    //
-    // Returns the result of an aggregate table operation.
-    //
-    // Deprecated: Please use AggregateAll or Aggregate instead
-    virtual ::grpc::Status ComboAggregate(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::ComboAggregateRequest& request, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse* response) = 0;
-    std::unique_ptr< ::grpc::ClientAsyncResponseReaderInterface< ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse>> AsyncComboAggregate(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::ComboAggregateRequest& request, ::grpc::CompletionQueue* cq) {
-      return std::unique_ptr< ::grpc::ClientAsyncResponseReaderInterface< ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse>>(AsyncComboAggregateRaw(context, request, cq));
-    }
-    std::unique_ptr< ::grpc::ClientAsyncResponseReaderInterface< ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse>> PrepareAsyncComboAggregate(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::ComboAggregateRequest& request, ::grpc::CompletionQueue* cq) {
-      return std::unique_ptr< ::grpc::ClientAsyncResponseReaderInterface< ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse>>(PrepareAsyncComboAggregateRaw(context, request, cq));
-    }
-    //
-    // Aggregates all non-grouping columns against a single aggregation specification.
-    virtual ::grpc::Status AggregateAll(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::AggregateAllRequest& request, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse* response) = 0;
-    std::unique_ptr< ::grpc::ClientAsyncResponseReaderInterface< ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse>> AsyncAggregateAll(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::AggregateAllRequest& request, ::grpc::CompletionQueue* cq) {
-      return std::unique_ptr< ::grpc::ClientAsyncResponseReaderInterface< ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse>>(AsyncAggregateAllRaw(context, request, cq));
-    }
-    std::unique_ptr< ::grpc::ClientAsyncResponseReaderInterface< ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse>> PrepareAsyncAggregateAll(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::AggregateAllRequest& request, ::grpc::CompletionQueue* cq) {
-      return std::unique_ptr< ::grpc::ClientAsyncResponseReaderInterface< ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse>>(PrepareAsyncAggregateAllRaw(context, request, cq));
-    }
-    //
-    // Produce an aggregated result by grouping the source_id table according to the group_by_columns and applying
-    // aggregations to each resulting group of rows. The result table will have one row per group, ordered by
-    // the encounter order within the source_id table, thereby ensuring that the row key for a given group never
-    // changes.
-    virtual ::grpc::Status Aggregate(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::AggregateRequest& request, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse* response) = 0;
-    std::unique_ptr< ::grpc::ClientAsyncResponseReaderInterface< ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse>> AsyncAggregate(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::AggregateRequest& request, ::grpc::CompletionQueue* cq) {
-      return std::unique_ptr< ::grpc::ClientAsyncResponseReaderInterface< ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse>>(AsyncAggregateRaw(context, request, cq));
-    }
-    std::unique_ptr< ::grpc::ClientAsyncResponseReaderInterface< ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse>> PrepareAsyncAggregate(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::AggregateRequest& request, ::grpc::CompletionQueue* cq) {
-      return std::unique_ptr< ::grpc::ClientAsyncResponseReaderInterface< ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse>>(PrepareAsyncAggregateRaw(context, request, cq));
-    }
-    //
-    // Takes a single snapshot of the source_id table.
-    virtual ::grpc::Status Snapshot(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::SnapshotTableRequest& request, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse* response) = 0;
-    std::unique_ptr< ::grpc::ClientAsyncResponseReaderInterface< ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse>> AsyncSnapshot(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::SnapshotTableRequest& request, ::grpc::CompletionQueue* cq) {
-      return std::unique_ptr< ::grpc::ClientAsyncResponseReaderInterface< ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse>>(AsyncSnapshotRaw(context, request, cq));
-    }
-    std::unique_ptr< ::grpc::ClientAsyncResponseReaderInterface< ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse>> PrepareAsyncSnapshot(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::SnapshotTableRequest& request, ::grpc::CompletionQueue* cq) {
-      return std::unique_ptr< ::grpc::ClientAsyncResponseReaderInterface< ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse>>(PrepareAsyncSnapshotRaw(context, request, cq));
-    }
-    //
-    // Snapshot base_id, triggered by trigger_id, and export the resulting new table.
-    // The trigger_id table's change events cause a new snapshot to be taken. The result table includes a
-    // "snapshot key" which is a subset (possibly all) of the base_id table's columns. The
-    // remaining columns in the result table come from base_id table, the table being snapshotted.
-    virtual ::grpc::Status SnapshotWhen(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::SnapshotWhenTableRequest& request, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse* response) = 0;
-    std::unique_ptr< ::grpc::ClientAsyncResponseReaderInterface< ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse>> AsyncSnapshotWhen(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::SnapshotWhenTableRequest& request, ::grpc::CompletionQueue* cq) {
-      return std::unique_ptr< ::grpc::ClientAsyncResponseReaderInterface< ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse>>(AsyncSnapshotWhenRaw(context, request, cq));
-    }
-    std::unique_ptr< ::grpc::ClientAsyncResponseReaderInterface< ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse>> PrepareAsyncSnapshotWhen(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::SnapshotWhenTableRequest& request, ::grpc::CompletionQueue* cq) {
-      return std::unique_ptr< ::grpc::ClientAsyncResponseReaderInterface< ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse>>(PrepareAsyncSnapshotWhenRaw(context, request, cq));
-    }
-    //
-    // Returns a new table with a flattened row set.
-    virtual ::grpc::Status Flatten(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::FlattenRequest& request, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse* response) = 0;
-    std::unique_ptr< ::grpc::ClientAsyncResponseReaderInterface< ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse>> AsyncFlatten(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::FlattenRequest& request, ::grpc::CompletionQueue* cq) {
-      return std::unique_ptr< ::grpc::ClientAsyncResponseReaderInterface< ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse>>(AsyncFlattenRaw(context, request, cq));
-    }
-    std::unique_ptr< ::grpc::ClientAsyncResponseReaderInterface< ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse>> PrepareAsyncFlatten(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::FlattenRequest& request, ::grpc::CompletionQueue* cq) {
-      return std::unique_ptr< ::grpc::ClientAsyncResponseReaderInterface< ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse>>(PrepareAsyncFlattenRaw(context, request, cq));
-    }
-    // *
-    // Downsamples a table assume its contents will be rendered in a run chart, with each subsequent row holding a later
-    // X value (i.e., sorted on that column). Multiple Y columns can be specified, as can a range of values for the X
-    // column to support zooming in.
-    virtual ::grpc::Status RunChartDownsample(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::RunChartDownsampleRequest& request, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse* response) = 0;
-    std::unique_ptr< ::grpc::ClientAsyncResponseReaderInterface< ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse>> AsyncRunChartDownsample(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::RunChartDownsampleRequest& request, ::grpc::CompletionQueue* cq) {
-      return std::unique_ptr< ::grpc::ClientAsyncResponseReaderInterface< ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse>>(AsyncRunChartDownsampleRaw(context, request, cq));
-    }
-    std::unique_ptr< ::grpc::ClientAsyncResponseReaderInterface< ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse>> PrepareAsyncRunChartDownsample(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::RunChartDownsampleRequest& request, ::grpc::CompletionQueue* cq) {
-      return std::unique_ptr< ::grpc::ClientAsyncResponseReaderInterface< ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse>>(PrepareAsyncRunChartDownsampleRaw(context, request, cq));
-    }
-    // *
-    // Creates a new Table based on the provided configuration. This can be used as a regular table from the other methods
-    // in this interface, or can be interacted with via the InputTableService to modify its contents.
-    virtual ::grpc::Status CreateInputTable(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::CreateInputTableRequest& request, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse* response) = 0;
-    std::unique_ptr< ::grpc::ClientAsyncResponseReaderInterface< ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse>> AsyncCreateInputTable(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::CreateInputTableRequest& request, ::grpc::CompletionQueue* cq) {
-      return std::unique_ptr< ::grpc::ClientAsyncResponseReaderInterface< ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse>>(AsyncCreateInputTableRaw(context, request, cq));
-    }
-    std::unique_ptr< ::grpc::ClientAsyncResponseReaderInterface< ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse>> PrepareAsyncCreateInputTable(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::CreateInputTableRequest& request, ::grpc::CompletionQueue* cq) {
-      return std::unique_ptr< ::grpc::ClientAsyncResponseReaderInterface< ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse>>(PrepareAsyncCreateInputTableRaw(context, request, cq));
-    }
-    // *
-    // Filters the left table based on the set of values in the right table.
-    //
-    // Note that when the right table ticks, all of the rows in the left table are going to be re-evaluated,
-    // thus the intention is that the right table is fairly slow moving compared with the left table.
-    virtual ::grpc::Status WhereIn(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::WhereInRequest& request, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse* response) = 0;
-    std::unique_ptr< ::grpc::ClientAsyncResponseReaderInterface< ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse>> AsyncWhereIn(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::WhereInRequest& request, ::grpc::CompletionQueue* cq) {
-      return std::unique_ptr< ::grpc::ClientAsyncResponseReaderInterface< ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse>>(AsyncWhereInRaw(context, request, cq));
-    }
-    std::unique_ptr< ::grpc::ClientAsyncResponseReaderInterface< ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse>> PrepareAsyncWhereIn(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::WhereInRequest& request, ::grpc::CompletionQueue* cq) {
-      return std::unique_ptr< ::grpc::ClientAsyncResponseReaderInterface< ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse>>(PrepareAsyncWhereInRaw(context, request, cq));
-    }
-    //
-    // Batch a series of requests and send them all at once. This enables the user to create intermediate tables without
-    // requiring them to be exported and managed by the client. The server will automatically release any tables when they
-    // are no longer depended upon.
-    std::unique_ptr< ::grpc::ClientReaderInterface< ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse>> Batch(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::BatchTableRequest& request) {
-      return std::unique_ptr< ::grpc::ClientReaderInterface< ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse>>(BatchRaw(context, request));
-    }
-    std::unique_ptr< ::grpc::ClientAsyncReaderInterface< ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse>> AsyncBatch(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::BatchTableRequest& request, ::grpc::CompletionQueue* cq, void* tag) {
-      return std::unique_ptr< ::grpc::ClientAsyncReaderInterface< ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse>>(AsyncBatchRaw(context, request, cq, tag));
-    }
-    std::unique_ptr< ::grpc::ClientAsyncReaderInterface< ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse>> PrepareAsyncBatch(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::BatchTableRequest& request, ::grpc::CompletionQueue* cq) {
-      return std::unique_ptr< ::grpc::ClientAsyncReaderInterface< ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse>>(PrepareAsyncBatchRaw(context, request, cq));
-    }
-    //
-    // Establish a stream of table updates for cheap notifications of table size updates.
-    //
-    // New streams will flush updates for all existing table exports. An export id of zero will be sent to indicate all
-    // exports have sent their refresh update. Table updates may be intermingled with initial refresh updates after their
-    // initial update had been sent.
-    std::unique_ptr< ::grpc::ClientReaderInterface< ::io::deephaven::proto::backplane::grpc::ExportedTableUpdateMessage>> ExportedTableUpdates(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::ExportedTableUpdatesRequest& request) {
-      return std::unique_ptr< ::grpc::ClientReaderInterface< ::io::deephaven::proto::backplane::grpc::ExportedTableUpdateMessage>>(ExportedTableUpdatesRaw(context, request));
-    }
-    std::unique_ptr< ::grpc::ClientAsyncReaderInterface< ::io::deephaven::proto::backplane::grpc::ExportedTableUpdateMessage>> AsyncExportedTableUpdates(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::ExportedTableUpdatesRequest& request, ::grpc::CompletionQueue* cq, void* tag) {
-      return std::unique_ptr< ::grpc::ClientAsyncReaderInterface< ::io::deephaven::proto::backplane::grpc::ExportedTableUpdateMessage>>(AsyncExportedTableUpdatesRaw(context, request, cq, tag));
-    }
-    std::unique_ptr< ::grpc::ClientAsyncReaderInterface< ::io::deephaven::proto::backplane::grpc::ExportedTableUpdateMessage>> PrepareAsyncExportedTableUpdates(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::ExportedTableUpdatesRequest& request, ::grpc::CompletionQueue* cq) {
-      return std::unique_ptr< ::grpc::ClientAsyncReaderInterface< ::io::deephaven::proto::backplane::grpc::ExportedTableUpdateMessage>>(PrepareAsyncExportedTableUpdatesRaw(context, request, cq));
-    }
-    //
-    // Seek a row number within a table.
-    virtual ::grpc::Status SeekRow(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::SeekRowRequest& request, ::io::deephaven::proto::backplane::grpc::SeekRowResponse* response) = 0;
-    std::unique_ptr< ::grpc::ClientAsyncResponseReaderInterface< ::io::deephaven::proto::backplane::grpc::SeekRowResponse>> AsyncSeekRow(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::SeekRowRequest& request, ::grpc::CompletionQueue* cq) {
-      return std::unique_ptr< ::grpc::ClientAsyncResponseReaderInterface< ::io::deephaven::proto::backplane::grpc::SeekRowResponse>>(AsyncSeekRowRaw(context, request, cq));
-    }
-    std::unique_ptr< ::grpc::ClientAsyncResponseReaderInterface< ::io::deephaven::proto::backplane::grpc::SeekRowResponse>> PrepareAsyncSeekRow(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::SeekRowRequest& request, ::grpc::CompletionQueue* cq) {
-      return std::unique_ptr< ::grpc::ClientAsyncResponseReaderInterface< ::io::deephaven::proto::backplane::grpc::SeekRowResponse>>(PrepareAsyncSeekRowRaw(context, request, cq));
-    }
-    //
-    // Returns the meta table of a table.
-    virtual ::grpc::Status MetaTable(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::MetaTableRequest& request, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse* response) = 0;
-    std::unique_ptr< ::grpc::ClientAsyncResponseReaderInterface< ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse>> AsyncMetaTable(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::MetaTableRequest& request, ::grpc::CompletionQueue* cq) {
-      return std::unique_ptr< ::grpc::ClientAsyncResponseReaderInterface< ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse>>(AsyncMetaTableRaw(context, request, cq));
-    }
-    std::unique_ptr< ::grpc::ClientAsyncResponseReaderInterface< ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse>> PrepareAsyncMetaTable(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::MetaTableRequest& request, ::grpc::CompletionQueue* cq) {
-      return std::unique_ptr< ::grpc::ClientAsyncResponseReaderInterface< ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse>>(PrepareAsyncMetaTableRaw(context, request, cq));
-    }
-    // *
-    // Returns a new table representing statistics about a single column of the provided table. This
-    // result table will be static - use Aggregation() instead for updating results. Presently, the
-    // primary use case for this is the Deephaven Web UI.
-    virtual ::grpc::Status ComputeColumnStatistics(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::ColumnStatisticsRequest& request, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse* response) = 0;
-    std::unique_ptr< ::grpc::ClientAsyncResponseReaderInterface< ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse>> AsyncComputeColumnStatistics(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::ColumnStatisticsRequest& request, ::grpc::CompletionQueue* cq) {
-      return std::unique_ptr< ::grpc::ClientAsyncResponseReaderInterface< ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse>>(AsyncComputeColumnStatisticsRaw(context, request, cq));
-    }
-    std::unique_ptr< ::grpc::ClientAsyncResponseReaderInterface< ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse>> PrepareAsyncComputeColumnStatistics(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::ColumnStatisticsRequest& request, ::grpc::CompletionQueue* cq) {
-      return std::unique_ptr< ::grpc::ClientAsyncResponseReaderInterface< ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse>>(PrepareAsyncComputeColumnStatisticsRaw(context, request, cq));
-    }
-    class async_interface {
-     public:
-      virtual ~async_interface() {}
-      //
-      // Request an ETCR for this ticket. Ticket must reference a Table.
-      virtual void GetExportedTableCreationResponse(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::Ticket* request, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse* response, std::function<void(::grpc::Status)>) = 0;
-      virtual void GetExportedTableCreationResponse(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::Ticket* request, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse* response, ::grpc::ClientUnaryReactor* reactor) = 0;
-      //
-      // Fetches a Table from an existing source ticket and exports it to the local session result ticket.
-      virtual void FetchTable(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::FetchTableRequest* request, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse* response, std::function<void(::grpc::Status)>) = 0;
-      virtual void FetchTable(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::FetchTableRequest* request, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse* response, ::grpc::ClientUnaryReactor* reactor) = 0;
-      //
-      // Create a table that has preview columns applied to an existing source table.
-      virtual void ApplyPreviewColumns(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::ApplyPreviewColumnsRequest* request, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse* response, std::function<void(::grpc::Status)>) = 0;
-      virtual void ApplyPreviewColumns(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::ApplyPreviewColumnsRequest* request, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse* response, ::grpc::ClientUnaryReactor* reactor) = 0;
-      //
-      // Create an empty table with the given column names and types.
-      virtual void EmptyTable(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::EmptyTableRequest* request, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse* response, std::function<void(::grpc::Status)>) = 0;
-      virtual void EmptyTable(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::EmptyTableRequest* request, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse* response, ::grpc::ClientUnaryReactor* reactor) = 0;
-      //
-      // Create a time table with the given start time and period.
-      virtual void TimeTable(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::TimeTableRequest* request, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse* response, std::function<void(::grpc::Status)>) = 0;
-      virtual void TimeTable(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::TimeTableRequest* request, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse* response, ::grpc::ClientUnaryReactor* reactor) = 0;
-      //
-      // Drop columns from the parent table.
-      virtual void DropColumns(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::DropColumnsRequest* request, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse* response, std::function<void(::grpc::Status)>) = 0;
-      virtual void DropColumns(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::DropColumnsRequest* request, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse* response, ::grpc::ClientUnaryReactor* reactor) = 0;
-      //
-      // Add columns to the given table using the given column specifications and the update table operation.
-      virtual void Update(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::SelectOrUpdateRequest* request, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse* response, std::function<void(::grpc::Status)>) = 0;
-      virtual void Update(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::SelectOrUpdateRequest* request, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse* response, ::grpc::ClientUnaryReactor* reactor) = 0;
-      //
-      // Add columns to the given table using the given column specifications and the lazyUpdate table operation.
-      virtual void LazyUpdate(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::SelectOrUpdateRequest* request, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse* response, std::function<void(::grpc::Status)>) = 0;
-      virtual void LazyUpdate(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::SelectOrUpdateRequest* request, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse* response, ::grpc::ClientUnaryReactor* reactor) = 0;
-      //
-      // Add columns to the given table using the given column specifications and the view table operation.
-      virtual void View(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::SelectOrUpdateRequest* request, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse* response, std::function<void(::grpc::Status)>) = 0;
-      virtual void View(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::SelectOrUpdateRequest* request, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse* response, ::grpc::ClientUnaryReactor* reactor) = 0;
-      //
-      // Add columns to the given table using the given column specifications and the updateView table operation.
-      virtual void UpdateView(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::SelectOrUpdateRequest* request, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse* response, std::function<void(::grpc::Status)>) = 0;
-      virtual void UpdateView(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::SelectOrUpdateRequest* request, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse* response, ::grpc::ClientUnaryReactor* reactor) = 0;
-      //
-      // Select the given columns from the given table.
-      virtual void Select(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::SelectOrUpdateRequest* request, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse* response, std::function<void(::grpc::Status)>) = 0;
-      virtual void Select(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::SelectOrUpdateRequest* request, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse* response, ::grpc::ClientUnaryReactor* reactor) = 0;
-      //
-      // Returns the result of an updateBy table operation.
-      virtual void UpdateBy(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::UpdateByRequest* request, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse* response, std::function<void(::grpc::Status)>) = 0;
-      virtual void UpdateBy(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::UpdateByRequest* request, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse* response, ::grpc::ClientUnaryReactor* reactor) = 0;
-      //
-      // Returns a new table definition with the unique tuples of the specified columns
-      virtual void SelectDistinct(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::SelectDistinctRequest* request, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse* response, std::function<void(::grpc::Status)>) = 0;
-      virtual void SelectDistinct(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::SelectDistinctRequest* request, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse* response, ::grpc::ClientUnaryReactor* reactor) = 0;
-      //
-      // Filter parent table with structured filters.
-      virtual void Filter(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::FilterTableRequest* request, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse* response, std::function<void(::grpc::Status)>) = 0;
-      virtual void Filter(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::FilterTableRequest* request, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse* response, ::grpc::ClientUnaryReactor* reactor) = 0;
-      //
-      // Filter parent table with unstructured filters.
-      virtual void UnstructuredFilter(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::UnstructuredFilterTableRequest* request, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse* response, std::function<void(::grpc::Status)>) = 0;
-      virtual void UnstructuredFilter(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::UnstructuredFilterTableRequest* request, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse* response, ::grpc::ClientUnaryReactor* reactor) = 0;
-      //
-      // Sort parent table via the provide sort descriptors.
-      virtual void Sort(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::SortTableRequest* request, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse* response, std::function<void(::grpc::Status)>) = 0;
-      virtual void Sort(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::SortTableRequest* request, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse* response, ::grpc::ClientUnaryReactor* reactor) = 0;
-      //
-      // Extract rows from the head of the parent table.
-      virtual void Head(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::HeadOrTailRequest* request, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse* response, std::function<void(::grpc::Status)>) = 0;
-      virtual void Head(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::HeadOrTailRequest* request, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse* response, ::grpc::ClientUnaryReactor* reactor) = 0;
-      //
-      // Extract rows from the tail of the parent table.
-      virtual void Tail(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::HeadOrTailRequest* request, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse* response, std::function<void(::grpc::Status)>) = 0;
-      virtual void Tail(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::HeadOrTailRequest* request, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse* response, ::grpc::ClientUnaryReactor* reactor) = 0;
-      //
-      // Run the headBy table operation for the given group by columns on the given table.
-      virtual void HeadBy(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::HeadOrTailByRequest* request, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse* response, std::function<void(::grpc::Status)>) = 0;
-      virtual void HeadBy(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::HeadOrTailByRequest* request, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse* response, ::grpc::ClientUnaryReactor* reactor) = 0;
-      //
-      // Run the tailBy operation for the given group by columns on the given table.
-      virtual void TailBy(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::HeadOrTailByRequest* request, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse* response, std::function<void(::grpc::Status)>) = 0;
-      virtual void TailBy(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::HeadOrTailByRequest* request, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse* response, ::grpc::ClientUnaryReactor* reactor) = 0;
-      //
-      // Ungroup the given columns (all columns will be ungrouped if columnsToUngroup is empty or unspecified).
-      virtual void Ungroup(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::UngroupRequest* request, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse* response, std::function<void(::grpc::Status)>) = 0;
-      virtual void Ungroup(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::UngroupRequest* request, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse* response, ::grpc::ClientUnaryReactor* reactor) = 0;
-      //
-      // Create a merged table from the given input tables. If a key column is provided (not null), a sorted
-      // merged will be performed using that column.
-      virtual void MergeTables(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::MergeTablesRequest* request, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse* response, std::function<void(::grpc::Status)>) = 0;
-      virtual void MergeTables(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::MergeTablesRequest* request, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse* response, ::grpc::ClientUnaryReactor* reactor) = 0;
-      //
-      // Returns the result of a cross join operation. Also known as the cartesian product.
-      virtual void CrossJoinTables(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::CrossJoinTablesRequest* request, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse* response, std::function<void(::grpc::Status)>) = 0;
-      virtual void CrossJoinTables(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::CrossJoinTablesRequest* request, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse* response, ::grpc::ClientUnaryReactor* reactor) = 0;
-      //
-      // Returns the result of a natural join operation.
-      virtual void NaturalJoinTables(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::NaturalJoinTablesRequest* request, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse* response, std::function<void(::grpc::Status)>) = 0;
-      virtual void NaturalJoinTables(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::NaturalJoinTablesRequest* request, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse* response, ::grpc::ClientUnaryReactor* reactor) = 0;
-      //
-      // Returns the result of an exact join operation.
-      virtual void ExactJoinTables(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::ExactJoinTablesRequest* request, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse* response, std::function<void(::grpc::Status)>) = 0;
-      virtual void ExactJoinTables(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::ExactJoinTablesRequest* request, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse* response, ::grpc::ClientUnaryReactor* reactor) = 0;
-      //
-      // Returns the result of a left join operation.
-      virtual void LeftJoinTables(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::LeftJoinTablesRequest* request, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse* response, std::function<void(::grpc::Status)>) = 0;
-      virtual void LeftJoinTables(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::LeftJoinTablesRequest* request, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse* response, ::grpc::ClientUnaryReactor* reactor) = 0;
-      //
-      // Returns the result of an as of join operation.
-      //
-      // Deprecated: Please use AjTables or RajTables.
-      virtual void AsOfJoinTables(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::AsOfJoinTablesRequest* request, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse* response, std::function<void(::grpc::Status)>) = 0;
-      virtual void AsOfJoinTables(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::AsOfJoinTablesRequest* request, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse* response, ::grpc::ClientUnaryReactor* reactor) = 0;
-      //
-      // Returns the result of an aj operation.
-      virtual void AjTables(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::AjRajTablesRequest* request, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse* response, std::function<void(::grpc::Status)>) = 0;
-      virtual void AjTables(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::AjRajTablesRequest* request, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse* response, ::grpc::ClientUnaryReactor* reactor) = 0;
-      //
-      // Returns the result of an raj operation.
-      virtual void RajTables(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::AjRajTablesRequest* request, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse* response, std::function<void(::grpc::Status)>) = 0;
-      virtual void RajTables(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::AjRajTablesRequest* request, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse* response, ::grpc::ClientUnaryReactor* reactor) = 0;
-      //
-      // Returns the result of a multi-join operation.
-      virtual void MultiJoinTables(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::MultiJoinTablesRequest* request, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse* response, std::function<void(::grpc::Status)>) = 0;
-      virtual void MultiJoinTables(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::MultiJoinTablesRequest* request, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse* response, ::grpc::ClientUnaryReactor* reactor) = 0;
-      //
-      // Returns the result of a range join operation.
-      virtual void RangeJoinTables(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::RangeJoinTablesRequest* request, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse* response, std::function<void(::grpc::Status)>) = 0;
-      virtual void RangeJoinTables(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::RangeJoinTablesRequest* request, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse* response, ::grpc::ClientUnaryReactor* reactor) = 0;
-      //
-      // Returns the result of an aggregate table operation.
-      //
-      // Deprecated: Please use AggregateAll or Aggregate instead
-      virtual void ComboAggregate(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::ComboAggregateRequest* request, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse* response, std::function<void(::grpc::Status)>) = 0;
-      virtual void ComboAggregate(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::ComboAggregateRequest* request, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse* response, ::grpc::ClientUnaryReactor* reactor) = 0;
-      //
-      // Aggregates all non-grouping columns against a single aggregation specification.
-      virtual void AggregateAll(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::AggregateAllRequest* request, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse* response, std::function<void(::grpc::Status)>) = 0;
-      virtual void AggregateAll(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::AggregateAllRequest* request, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse* response, ::grpc::ClientUnaryReactor* reactor) = 0;
-      //
-      // Produce an aggregated result by grouping the source_id table according to the group_by_columns and applying
-      // aggregations to each resulting group of rows. The result table will have one row per group, ordered by
-      // the encounter order within the source_id table, thereby ensuring that the row key for a given group never
-      // changes.
-      virtual void Aggregate(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::AggregateRequest* request, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse* response, std::function<void(::grpc::Status)>) = 0;
-      virtual void Aggregate(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::AggregateRequest* request, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse* response, ::grpc::ClientUnaryReactor* reactor) = 0;
-      //
-      // Takes a single snapshot of the source_id table.
-      virtual void Snapshot(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::SnapshotTableRequest* request, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse* response, std::function<void(::grpc::Status)>) = 0;
-      virtual void Snapshot(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::SnapshotTableRequest* request, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse* response, ::grpc::ClientUnaryReactor* reactor) = 0;
-      //
-      // Snapshot base_id, triggered by trigger_id, and export the resulting new table.
-      // The trigger_id table's change events cause a new snapshot to be taken. The result table includes a
-      // "snapshot key" which is a subset (possibly all) of the base_id table's columns. The
-      // remaining columns in the result table come from base_id table, the table being snapshotted.
-      virtual void SnapshotWhen(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::SnapshotWhenTableRequest* request, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse* response, std::function<void(::grpc::Status)>) = 0;
-      virtual void SnapshotWhen(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::SnapshotWhenTableRequest* request, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse* response, ::grpc::ClientUnaryReactor* reactor) = 0;
-      //
-      // Returns a new table with a flattened row set.
-      virtual void Flatten(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::FlattenRequest* request, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse* response, std::function<void(::grpc::Status)>) = 0;
-      virtual void Flatten(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::FlattenRequest* request, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse* response, ::grpc::ClientUnaryReactor* reactor) = 0;
-      // *
-      // Downsamples a table assume its contents will be rendered in a run chart, with each subsequent row holding a later
-      // X value (i.e., sorted on that column). Multiple Y columns can be specified, as can a range of values for the X
-      // column to support zooming in.
-      virtual void RunChartDownsample(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::RunChartDownsampleRequest* request, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse* response, std::function<void(::grpc::Status)>) = 0;
-      virtual void RunChartDownsample(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::RunChartDownsampleRequest* request, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse* response, ::grpc::ClientUnaryReactor* reactor) = 0;
-      // *
-      // Creates a new Table based on the provided configuration. This can be used as a regular table from the other methods
-      // in this interface, or can be interacted with via the InputTableService to modify its contents.
-      virtual void CreateInputTable(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::CreateInputTableRequest* request, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse* response, std::function<void(::grpc::Status)>) = 0;
-      virtual void CreateInputTable(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::CreateInputTableRequest* request, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse* response, ::grpc::ClientUnaryReactor* reactor) = 0;
-      // *
-      // Filters the left table based on the set of values in the right table.
-      //
-      // Note that when the right table ticks, all of the rows in the left table are going to be re-evaluated,
-      // thus the intention is that the right table is fairly slow moving compared with the left table.
-      virtual void WhereIn(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::WhereInRequest* request, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse* response, std::function<void(::grpc::Status)>) = 0;
-      virtual void WhereIn(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::WhereInRequest* request, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse* response, ::grpc::ClientUnaryReactor* reactor) = 0;
-      //
-      // Batch a series of requests and send them all at once. This enables the user to create intermediate tables without
-      // requiring them to be exported and managed by the client. The server will automatically release any tables when they
-      // are no longer depended upon.
-      virtual void Batch(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::BatchTableRequest* request, ::grpc::ClientReadReactor< ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse>* reactor) = 0;
-      //
-      // Establish a stream of table updates for cheap notifications of table size updates.
-      //
-      // New streams will flush updates for all existing table exports. An export id of zero will be sent to indicate all
-      // exports have sent their refresh update. Table updates may be intermingled with initial refresh updates after their
-      // initial update had been sent.
-      virtual void ExportedTableUpdates(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::ExportedTableUpdatesRequest* request, ::grpc::ClientReadReactor< ::io::deephaven::proto::backplane::grpc::ExportedTableUpdateMessage>* reactor) = 0;
-      //
-      // Seek a row number within a table.
-      virtual void SeekRow(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::SeekRowRequest* request, ::io::deephaven::proto::backplane::grpc::SeekRowResponse* response, std::function<void(::grpc::Status)>) = 0;
-      virtual void SeekRow(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::SeekRowRequest* request, ::io::deephaven::proto::backplane::grpc::SeekRowResponse* response, ::grpc::ClientUnaryReactor* reactor) = 0;
-      //
-      // Returns the meta table of a table.
-      virtual void MetaTable(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::MetaTableRequest* request, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse* response, std::function<void(::grpc::Status)>) = 0;
-      virtual void MetaTable(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::MetaTableRequest* request, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse* response, ::grpc::ClientUnaryReactor* reactor) = 0;
-      // *
-      // Returns a new table representing statistics about a single column of the provided table. This
-      // result table will be static - use Aggregation() instead for updating results. Presently, the
-      // primary use case for this is the Deephaven Web UI.
-      virtual void ComputeColumnStatistics(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::ColumnStatisticsRequest* request, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse* response, std::function<void(::grpc::Status)>) = 0;
-      virtual void ComputeColumnStatistics(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::ColumnStatisticsRequest* request, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse* response, ::grpc::ClientUnaryReactor* reactor) = 0;
-    };
-    typedef class async_interface experimental_async_interface;
-    virtual class async_interface* async() { return nullptr; }
-    class async_interface* experimental_async() { return async(); }
-   private:
-    virtual ::grpc::ClientAsyncResponseReaderInterface< ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse>* AsyncGetExportedTableCreationResponseRaw(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::Ticket& request, ::grpc::CompletionQueue* cq) = 0;
-    virtual ::grpc::ClientAsyncResponseReaderInterface< ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse>* PrepareAsyncGetExportedTableCreationResponseRaw(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::Ticket& request, ::grpc::CompletionQueue* cq) = 0;
-    virtual ::grpc::ClientAsyncResponseReaderInterface< ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse>* AsyncFetchTableRaw(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::FetchTableRequest& request, ::grpc::CompletionQueue* cq) = 0;
-    virtual ::grpc::ClientAsyncResponseReaderInterface< ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse>* PrepareAsyncFetchTableRaw(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::FetchTableRequest& request, ::grpc::CompletionQueue* cq) = 0;
-    virtual ::grpc::ClientAsyncResponseReaderInterface< ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse>* AsyncApplyPreviewColumnsRaw(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::ApplyPreviewColumnsRequest& request, ::grpc::CompletionQueue* cq) = 0;
-    virtual ::grpc::ClientAsyncResponseReaderInterface< ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse>* PrepareAsyncApplyPreviewColumnsRaw(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::ApplyPreviewColumnsRequest& request, ::grpc::CompletionQueue* cq) = 0;
-    virtual ::grpc::ClientAsyncResponseReaderInterface< ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse>* AsyncEmptyTableRaw(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::EmptyTableRequest& request, ::grpc::CompletionQueue* cq) = 0;
-    virtual ::grpc::ClientAsyncResponseReaderInterface< ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse>* PrepareAsyncEmptyTableRaw(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::EmptyTableRequest& request, ::grpc::CompletionQueue* cq) = 0;
-    virtual ::grpc::ClientAsyncResponseReaderInterface< ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse>* AsyncTimeTableRaw(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::TimeTableRequest& request, ::grpc::CompletionQueue* cq) = 0;
-    virtual ::grpc::ClientAsyncResponseReaderInterface< ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse>* PrepareAsyncTimeTableRaw(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::TimeTableRequest& request, ::grpc::CompletionQueue* cq) = 0;
-    virtual ::grpc::ClientAsyncResponseReaderInterface< ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse>* AsyncDropColumnsRaw(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::DropColumnsRequest& request, ::grpc::CompletionQueue* cq) = 0;
-    virtual ::grpc::ClientAsyncResponseReaderInterface< ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse>* PrepareAsyncDropColumnsRaw(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::DropColumnsRequest& request, ::grpc::CompletionQueue* cq) = 0;
-    virtual ::grpc::ClientAsyncResponseReaderInterface< ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse>* AsyncUpdateRaw(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::SelectOrUpdateRequest& request, ::grpc::CompletionQueue* cq) = 0;
-    virtual ::grpc::ClientAsyncResponseReaderInterface< ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse>* PrepareAsyncUpdateRaw(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::SelectOrUpdateRequest& request, ::grpc::CompletionQueue* cq) = 0;
-    virtual ::grpc::ClientAsyncResponseReaderInterface< ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse>* AsyncLazyUpdateRaw(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::SelectOrUpdateRequest& request, ::grpc::CompletionQueue* cq) = 0;
-    virtual ::grpc::ClientAsyncResponseReaderInterface< ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse>* PrepareAsyncLazyUpdateRaw(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::SelectOrUpdateRequest& request, ::grpc::CompletionQueue* cq) = 0;
-    virtual ::grpc::ClientAsyncResponseReaderInterface< ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse>* AsyncViewRaw(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::SelectOrUpdateRequest& request, ::grpc::CompletionQueue* cq) = 0;
-    virtual ::grpc::ClientAsyncResponseReaderInterface< ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse>* PrepareAsyncViewRaw(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::SelectOrUpdateRequest& request, ::grpc::CompletionQueue* cq) = 0;
-    virtual ::grpc::ClientAsyncResponseReaderInterface< ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse>* AsyncUpdateViewRaw(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::SelectOrUpdateRequest& request, ::grpc::CompletionQueue* cq) = 0;
-    virtual ::grpc::ClientAsyncResponseReaderInterface< ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse>* PrepareAsyncUpdateViewRaw(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::SelectOrUpdateRequest& request, ::grpc::CompletionQueue* cq) = 0;
-    virtual ::grpc::ClientAsyncResponseReaderInterface< ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse>* AsyncSelectRaw(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::SelectOrUpdateRequest& request, ::grpc::CompletionQueue* cq) = 0;
-    virtual ::grpc::ClientAsyncResponseReaderInterface< ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse>* PrepareAsyncSelectRaw(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::SelectOrUpdateRequest& request, ::grpc::CompletionQueue* cq) = 0;
-    virtual ::grpc::ClientAsyncResponseReaderInterface< ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse>* AsyncUpdateByRaw(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::UpdateByRequest& request, ::grpc::CompletionQueue* cq) = 0;
-    virtual ::grpc::ClientAsyncResponseReaderInterface< ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse>* PrepareAsyncUpdateByRaw(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::UpdateByRequest& request, ::grpc::CompletionQueue* cq) = 0;
-    virtual ::grpc::ClientAsyncResponseReaderInterface< ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse>* AsyncSelectDistinctRaw(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::SelectDistinctRequest& request, ::grpc::CompletionQueue* cq) = 0;
-    virtual ::grpc::ClientAsyncResponseReaderInterface< ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse>* PrepareAsyncSelectDistinctRaw(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::SelectDistinctRequest& request, ::grpc::CompletionQueue* cq) = 0;
-    virtual ::grpc::ClientAsyncResponseReaderInterface< ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse>* AsyncFilterRaw(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::FilterTableRequest& request, ::grpc::CompletionQueue* cq) = 0;
-    virtual ::grpc::ClientAsyncResponseReaderInterface< ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse>* PrepareAsyncFilterRaw(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::FilterTableRequest& request, ::grpc::CompletionQueue* cq) = 0;
-    virtual ::grpc::ClientAsyncResponseReaderInterface< ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse>* AsyncUnstructuredFilterRaw(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::UnstructuredFilterTableRequest& request, ::grpc::CompletionQueue* cq) = 0;
-    virtual ::grpc::ClientAsyncResponseReaderInterface< ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse>* PrepareAsyncUnstructuredFilterRaw(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::UnstructuredFilterTableRequest& request, ::grpc::CompletionQueue* cq) = 0;
-    virtual ::grpc::ClientAsyncResponseReaderInterface< ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse>* AsyncSortRaw(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::SortTableRequest& request, ::grpc::CompletionQueue* cq) = 0;
-    virtual ::grpc::ClientAsyncResponseReaderInterface< ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse>* PrepareAsyncSortRaw(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::SortTableRequest& request, ::grpc::CompletionQueue* cq) = 0;
-    virtual ::grpc::ClientAsyncResponseReaderInterface< ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse>* AsyncHeadRaw(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::HeadOrTailRequest& request, ::grpc::CompletionQueue* cq) = 0;
-    virtual ::grpc::ClientAsyncResponseReaderInterface< ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse>* PrepareAsyncHeadRaw(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::HeadOrTailRequest& request, ::grpc::CompletionQueue* cq) = 0;
-    virtual ::grpc::ClientAsyncResponseReaderInterface< ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse>* AsyncTailRaw(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::HeadOrTailRequest& request, ::grpc::CompletionQueue* cq) = 0;
-    virtual ::grpc::ClientAsyncResponseReaderInterface< ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse>* PrepareAsyncTailRaw(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::HeadOrTailRequest& request, ::grpc::CompletionQueue* cq) = 0;
-    virtual ::grpc::ClientAsyncResponseReaderInterface< ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse>* AsyncHeadByRaw(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::HeadOrTailByRequest& request, ::grpc::CompletionQueue* cq) = 0;
-    virtual ::grpc::ClientAsyncResponseReaderInterface< ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse>* PrepareAsyncHeadByRaw(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::HeadOrTailByRequest& request, ::grpc::CompletionQueue* cq) = 0;
-    virtual ::grpc::ClientAsyncResponseReaderInterface< ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse>* AsyncTailByRaw(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::HeadOrTailByRequest& request, ::grpc::CompletionQueue* cq) = 0;
-    virtual ::grpc::ClientAsyncResponseReaderInterface< ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse>* PrepareAsyncTailByRaw(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::HeadOrTailByRequest& request, ::grpc::CompletionQueue* cq) = 0;
-    virtual ::grpc::ClientAsyncResponseReaderInterface< ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse>* AsyncUngroupRaw(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::UngroupRequest& request, ::grpc::CompletionQueue* cq) = 0;
-    virtual ::grpc::ClientAsyncResponseReaderInterface< ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse>* PrepareAsyncUngroupRaw(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::UngroupRequest& request, ::grpc::CompletionQueue* cq) = 0;
-    virtual ::grpc::ClientAsyncResponseReaderInterface< ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse>* AsyncMergeTablesRaw(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::MergeTablesRequest& request, ::grpc::CompletionQueue* cq) = 0;
-    virtual ::grpc::ClientAsyncResponseReaderInterface< ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse>* PrepareAsyncMergeTablesRaw(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::MergeTablesRequest& request, ::grpc::CompletionQueue* cq) = 0;
-    virtual ::grpc::ClientAsyncResponseReaderInterface< ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse>* AsyncCrossJoinTablesRaw(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::CrossJoinTablesRequest& request, ::grpc::CompletionQueue* cq) = 0;
-    virtual ::grpc::ClientAsyncResponseReaderInterface< ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse>* PrepareAsyncCrossJoinTablesRaw(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::CrossJoinTablesRequest& request, ::grpc::CompletionQueue* cq) = 0;
-    virtual ::grpc::ClientAsyncResponseReaderInterface< ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse>* AsyncNaturalJoinTablesRaw(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::NaturalJoinTablesRequest& request, ::grpc::CompletionQueue* cq) = 0;
-    virtual ::grpc::ClientAsyncResponseReaderInterface< ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse>* PrepareAsyncNaturalJoinTablesRaw(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::NaturalJoinTablesRequest& request, ::grpc::CompletionQueue* cq) = 0;
-    virtual ::grpc::ClientAsyncResponseReaderInterface< ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse>* AsyncExactJoinTablesRaw(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::ExactJoinTablesRequest& request, ::grpc::CompletionQueue* cq) = 0;
-    virtual ::grpc::ClientAsyncResponseReaderInterface< ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse>* PrepareAsyncExactJoinTablesRaw(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::ExactJoinTablesRequest& request, ::grpc::CompletionQueue* cq) = 0;
-    virtual ::grpc::ClientAsyncResponseReaderInterface< ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse>* AsyncLeftJoinTablesRaw(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::LeftJoinTablesRequest& request, ::grpc::CompletionQueue* cq) = 0;
-    virtual ::grpc::ClientAsyncResponseReaderInterface< ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse>* PrepareAsyncLeftJoinTablesRaw(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::LeftJoinTablesRequest& request, ::grpc::CompletionQueue* cq) = 0;
-    virtual ::grpc::ClientAsyncResponseReaderInterface< ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse>* AsyncAsOfJoinTablesRaw(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::AsOfJoinTablesRequest& request, ::grpc::CompletionQueue* cq) = 0;
-    virtual ::grpc::ClientAsyncResponseReaderInterface< ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse>* PrepareAsyncAsOfJoinTablesRaw(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::AsOfJoinTablesRequest& request, ::grpc::CompletionQueue* cq) = 0;
-    virtual ::grpc::ClientAsyncResponseReaderInterface< ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse>* AsyncAjTablesRaw(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::AjRajTablesRequest& request, ::grpc::CompletionQueue* cq) = 0;
-    virtual ::grpc::ClientAsyncResponseReaderInterface< ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse>* PrepareAsyncAjTablesRaw(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::AjRajTablesRequest& request, ::grpc::CompletionQueue* cq) = 0;
-    virtual ::grpc::ClientAsyncResponseReaderInterface< ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse>* AsyncRajTablesRaw(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::AjRajTablesRequest& request, ::grpc::CompletionQueue* cq) = 0;
-    virtual ::grpc::ClientAsyncResponseReaderInterface< ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse>* PrepareAsyncRajTablesRaw(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::AjRajTablesRequest& request, ::grpc::CompletionQueue* cq) = 0;
-    virtual ::grpc::ClientAsyncResponseReaderInterface< ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse>* AsyncMultiJoinTablesRaw(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::MultiJoinTablesRequest& request, ::grpc::CompletionQueue* cq) = 0;
-    virtual ::grpc::ClientAsyncResponseReaderInterface< ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse>* PrepareAsyncMultiJoinTablesRaw(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::MultiJoinTablesRequest& request, ::grpc::CompletionQueue* cq) = 0;
-    virtual ::grpc::ClientAsyncResponseReaderInterface< ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse>* AsyncRangeJoinTablesRaw(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::RangeJoinTablesRequest& request, ::grpc::CompletionQueue* cq) = 0;
-    virtual ::grpc::ClientAsyncResponseReaderInterface< ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse>* PrepareAsyncRangeJoinTablesRaw(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::RangeJoinTablesRequest& request, ::grpc::CompletionQueue* cq) = 0;
-    virtual ::grpc::ClientAsyncResponseReaderInterface< ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse>* AsyncComboAggregateRaw(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::ComboAggregateRequest& request, ::grpc::CompletionQueue* cq) = 0;
-    virtual ::grpc::ClientAsyncResponseReaderInterface< ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse>* PrepareAsyncComboAggregateRaw(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::ComboAggregateRequest& request, ::grpc::CompletionQueue* cq) = 0;
-    virtual ::grpc::ClientAsyncResponseReaderInterface< ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse>* AsyncAggregateAllRaw(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::AggregateAllRequest& request, ::grpc::CompletionQueue* cq) = 0;
-    virtual ::grpc::ClientAsyncResponseReaderInterface< ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse>* PrepareAsyncAggregateAllRaw(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::AggregateAllRequest& request, ::grpc::CompletionQueue* cq) = 0;
-    virtual ::grpc::ClientAsyncResponseReaderInterface< ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse>* AsyncAggregateRaw(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::AggregateRequest& request, ::grpc::CompletionQueue* cq) = 0;
-    virtual ::grpc::ClientAsyncResponseReaderInterface< ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse>* PrepareAsyncAggregateRaw(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::AggregateRequest& request, ::grpc::CompletionQueue* cq) = 0;
-    virtual ::grpc::ClientAsyncResponseReaderInterface< ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse>* AsyncSnapshotRaw(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::SnapshotTableRequest& request, ::grpc::CompletionQueue* cq) = 0;
-    virtual ::grpc::ClientAsyncResponseReaderInterface< ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse>* PrepareAsyncSnapshotRaw(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::SnapshotTableRequest& request, ::grpc::CompletionQueue* cq) = 0;
-    virtual ::grpc::ClientAsyncResponseReaderInterface< ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse>* AsyncSnapshotWhenRaw(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::SnapshotWhenTableRequest& request, ::grpc::CompletionQueue* cq) = 0;
-    virtual ::grpc::ClientAsyncResponseReaderInterface< ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse>* PrepareAsyncSnapshotWhenRaw(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::SnapshotWhenTableRequest& request, ::grpc::CompletionQueue* cq) = 0;
-    virtual ::grpc::ClientAsyncResponseReaderInterface< ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse>* AsyncFlattenRaw(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::FlattenRequest& request, ::grpc::CompletionQueue* cq) = 0;
-    virtual ::grpc::ClientAsyncResponseReaderInterface< ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse>* PrepareAsyncFlattenRaw(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::FlattenRequest& request, ::grpc::CompletionQueue* cq) = 0;
-    virtual ::grpc::ClientAsyncResponseReaderInterface< ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse>* AsyncRunChartDownsampleRaw(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::RunChartDownsampleRequest& request, ::grpc::CompletionQueue* cq) = 0;
-    virtual ::grpc::ClientAsyncResponseReaderInterface< ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse>* PrepareAsyncRunChartDownsampleRaw(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::RunChartDownsampleRequest& request, ::grpc::CompletionQueue* cq) = 0;
-    virtual ::grpc::ClientAsyncResponseReaderInterface< ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse>* AsyncCreateInputTableRaw(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::CreateInputTableRequest& request, ::grpc::CompletionQueue* cq) = 0;
-    virtual ::grpc::ClientAsyncResponseReaderInterface< ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse>* PrepareAsyncCreateInputTableRaw(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::CreateInputTableRequest& request, ::grpc::CompletionQueue* cq) = 0;
-    virtual ::grpc::ClientAsyncResponseReaderInterface< ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse>* AsyncWhereInRaw(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::WhereInRequest& request, ::grpc::CompletionQueue* cq) = 0;
-    virtual ::grpc::ClientAsyncResponseReaderInterface< ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse>* PrepareAsyncWhereInRaw(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::WhereInRequest& request, ::grpc::CompletionQueue* cq) = 0;
-    virtual ::grpc::ClientReaderInterface< ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse>* BatchRaw(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::BatchTableRequest& request) = 0;
-    virtual ::grpc::ClientAsyncReaderInterface< ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse>* AsyncBatchRaw(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::BatchTableRequest& request, ::grpc::CompletionQueue* cq, void* tag) = 0;
-    virtual ::grpc::ClientAsyncReaderInterface< ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse>* PrepareAsyncBatchRaw(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::BatchTableRequest& request, ::grpc::CompletionQueue* cq) = 0;
-    virtual ::grpc::ClientReaderInterface< ::io::deephaven::proto::backplane::grpc::ExportedTableUpdateMessage>* ExportedTableUpdatesRaw(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::ExportedTableUpdatesRequest& request) = 0;
-    virtual ::grpc::ClientAsyncReaderInterface< ::io::deephaven::proto::backplane::grpc::ExportedTableUpdateMessage>* AsyncExportedTableUpdatesRaw(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::ExportedTableUpdatesRequest& request, ::grpc::CompletionQueue* cq, void* tag) = 0;
-    virtual ::grpc::ClientAsyncReaderInterface< ::io::deephaven::proto::backplane::grpc::ExportedTableUpdateMessage>* PrepareAsyncExportedTableUpdatesRaw(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::ExportedTableUpdatesRequest& request, ::grpc::CompletionQueue* cq) = 0;
-    virtual ::grpc::ClientAsyncResponseReaderInterface< ::io::deephaven::proto::backplane::grpc::SeekRowResponse>* AsyncSeekRowRaw(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::SeekRowRequest& request, ::grpc::CompletionQueue* cq) = 0;
-    virtual ::grpc::ClientAsyncResponseReaderInterface< ::io::deephaven::proto::backplane::grpc::SeekRowResponse>* PrepareAsyncSeekRowRaw(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::SeekRowRequest& request, ::grpc::CompletionQueue* cq) = 0;
-    virtual ::grpc::ClientAsyncResponseReaderInterface< ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse>* AsyncMetaTableRaw(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::MetaTableRequest& request, ::grpc::CompletionQueue* cq) = 0;
-    virtual ::grpc::ClientAsyncResponseReaderInterface< ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse>* PrepareAsyncMetaTableRaw(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::MetaTableRequest& request, ::grpc::CompletionQueue* cq) = 0;
-    virtual ::grpc::ClientAsyncResponseReaderInterface< ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse>* AsyncComputeColumnStatisticsRaw(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::ColumnStatisticsRequest& request, ::grpc::CompletionQueue* cq) = 0;
-    virtual ::grpc::ClientAsyncResponseReaderInterface< ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse>* PrepareAsyncComputeColumnStatisticsRaw(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::ColumnStatisticsRequest& request, ::grpc::CompletionQueue* cq) = 0;
-  };
-  class Stub final : public StubInterface {
-   public:
-    Stub(const std::shared_ptr< ::grpc::ChannelInterface>& channel, const ::grpc::StubOptions& options = ::grpc::StubOptions());
-    ::grpc::Status GetExportedTableCreationResponse(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::Ticket& request, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse* response) override;
-    std::unique_ptr< ::grpc::ClientAsyncResponseReader< ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse>> AsyncGetExportedTableCreationResponse(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::Ticket& request, ::grpc::CompletionQueue* cq) {
-      return std::unique_ptr< ::grpc::ClientAsyncResponseReader< ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse>>(AsyncGetExportedTableCreationResponseRaw(context, request, cq));
-    }
-    std::unique_ptr< ::grpc::ClientAsyncResponseReader< ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse>> PrepareAsyncGetExportedTableCreationResponse(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::Ticket& request, ::grpc::CompletionQueue* cq) {
-      return std::unique_ptr< ::grpc::ClientAsyncResponseReader< ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse>>(PrepareAsyncGetExportedTableCreationResponseRaw(context, request, cq));
-    }
-    ::grpc::Status FetchTable(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::FetchTableRequest& request, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse* response) override;
-    std::unique_ptr< ::grpc::ClientAsyncResponseReader< ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse>> AsyncFetchTable(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::FetchTableRequest& request, ::grpc::CompletionQueue* cq) {
-      return std::unique_ptr< ::grpc::ClientAsyncResponseReader< ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse>>(AsyncFetchTableRaw(context, request, cq));
-    }
-    std::unique_ptr< ::grpc::ClientAsyncResponseReader< ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse>> PrepareAsyncFetchTable(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::FetchTableRequest& request, ::grpc::CompletionQueue* cq) {
-      return std::unique_ptr< ::grpc::ClientAsyncResponseReader< ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse>>(PrepareAsyncFetchTableRaw(context, request, cq));
-    }
-    ::grpc::Status ApplyPreviewColumns(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::ApplyPreviewColumnsRequest& request, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse* response) override;
-    std::unique_ptr< ::grpc::ClientAsyncResponseReader< ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse>> AsyncApplyPreviewColumns(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::ApplyPreviewColumnsRequest& request, ::grpc::CompletionQueue* cq) {
-      return std::unique_ptr< ::grpc::ClientAsyncResponseReader< ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse>>(AsyncApplyPreviewColumnsRaw(context, request, cq));
-    }
-    std::unique_ptr< ::grpc::ClientAsyncResponseReader< ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse>> PrepareAsyncApplyPreviewColumns(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::ApplyPreviewColumnsRequest& request, ::grpc::CompletionQueue* cq) {
-      return std::unique_ptr< ::grpc::ClientAsyncResponseReader< ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse>>(PrepareAsyncApplyPreviewColumnsRaw(context, request, cq));
-    }
-    ::grpc::Status EmptyTable(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::EmptyTableRequest& request, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse* response) override;
-    std::unique_ptr< ::grpc::ClientAsyncResponseReader< ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse>> AsyncEmptyTable(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::EmptyTableRequest& request, ::grpc::CompletionQueue* cq) {
-      return std::unique_ptr< ::grpc::ClientAsyncResponseReader< ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse>>(AsyncEmptyTableRaw(context, request, cq));
-    }
-    std::unique_ptr< ::grpc::ClientAsyncResponseReader< ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse>> PrepareAsyncEmptyTable(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::EmptyTableRequest& request, ::grpc::CompletionQueue* cq) {
-      return std::unique_ptr< ::grpc::ClientAsyncResponseReader< ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse>>(PrepareAsyncEmptyTableRaw(context, request, cq));
-    }
-    ::grpc::Status TimeTable(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::TimeTableRequest& request, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse* response) override;
-    std::unique_ptr< ::grpc::ClientAsyncResponseReader< ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse>> AsyncTimeTable(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::TimeTableRequest& request, ::grpc::CompletionQueue* cq) {
-      return std::unique_ptr< ::grpc::ClientAsyncResponseReader< ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse>>(AsyncTimeTableRaw(context, request, cq));
-    }
-    std::unique_ptr< ::grpc::ClientAsyncResponseReader< ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse>> PrepareAsyncTimeTable(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::TimeTableRequest& request, ::grpc::CompletionQueue* cq) {
-      return std::unique_ptr< ::grpc::ClientAsyncResponseReader< ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse>>(PrepareAsyncTimeTableRaw(context, request, cq));
-    }
-    ::grpc::Status DropColumns(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::DropColumnsRequest& request, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse* response) override;
-    std::unique_ptr< ::grpc::ClientAsyncResponseReader< ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse>> AsyncDropColumns(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::DropColumnsRequest& request, ::grpc::CompletionQueue* cq) {
-      return std::unique_ptr< ::grpc::ClientAsyncResponseReader< ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse>>(AsyncDropColumnsRaw(context, request, cq));
-    }
-    std::unique_ptr< ::grpc::ClientAsyncResponseReader< ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse>> PrepareAsyncDropColumns(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::DropColumnsRequest& request, ::grpc::CompletionQueue* cq) {
-      return std::unique_ptr< ::grpc::ClientAsyncResponseReader< ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse>>(PrepareAsyncDropColumnsRaw(context, request, cq));
-    }
-    ::grpc::Status Update(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::SelectOrUpdateRequest& request, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse* response) override;
-    std::unique_ptr< ::grpc::ClientAsyncResponseReader< ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse>> AsyncUpdate(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::SelectOrUpdateRequest& request, ::grpc::CompletionQueue* cq) {
-      return std::unique_ptr< ::grpc::ClientAsyncResponseReader< ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse>>(AsyncUpdateRaw(context, request, cq));
-    }
-    std::unique_ptr< ::grpc::ClientAsyncResponseReader< ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse>> PrepareAsyncUpdate(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::SelectOrUpdateRequest& request, ::grpc::CompletionQueue* cq) {
-      return std::unique_ptr< ::grpc::ClientAsyncResponseReader< ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse>>(PrepareAsyncUpdateRaw(context, request, cq));
-    }
-    ::grpc::Status LazyUpdate(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::SelectOrUpdateRequest& request, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse* response) override;
-    std::unique_ptr< ::grpc::ClientAsyncResponseReader< ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse>> AsyncLazyUpdate(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::SelectOrUpdateRequest& request, ::grpc::CompletionQueue* cq) {
-      return std::unique_ptr< ::grpc::ClientAsyncResponseReader< ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse>>(AsyncLazyUpdateRaw(context, request, cq));
-    }
-    std::unique_ptr< ::grpc::ClientAsyncResponseReader< ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse>> PrepareAsyncLazyUpdate(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::SelectOrUpdateRequest& request, ::grpc::CompletionQueue* cq) {
-      return std::unique_ptr< ::grpc::ClientAsyncResponseReader< ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse>>(PrepareAsyncLazyUpdateRaw(context, request, cq));
-    }
-    ::grpc::Status View(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::SelectOrUpdateRequest& request, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse* response) override;
-    std::unique_ptr< ::grpc::ClientAsyncResponseReader< ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse>> AsyncView(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::SelectOrUpdateRequest& request, ::grpc::CompletionQueue* cq) {
-      return std::unique_ptr< ::grpc::ClientAsyncResponseReader< ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse>>(AsyncViewRaw(context, request, cq));
-    }
-    std::unique_ptr< ::grpc::ClientAsyncResponseReader< ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse>> PrepareAsyncView(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::SelectOrUpdateRequest& request, ::grpc::CompletionQueue* cq) {
-      return std::unique_ptr< ::grpc::ClientAsyncResponseReader< ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse>>(PrepareAsyncViewRaw(context, request, cq));
-    }
-    ::grpc::Status UpdateView(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::SelectOrUpdateRequest& request, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse* response) override;
-    std::unique_ptr< ::grpc::ClientAsyncResponseReader< ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse>> AsyncUpdateView(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::SelectOrUpdateRequest& request, ::grpc::CompletionQueue* cq) {
-      return std::unique_ptr< ::grpc::ClientAsyncResponseReader< ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse>>(AsyncUpdateViewRaw(context, request, cq));
-    }
-    std::unique_ptr< ::grpc::ClientAsyncResponseReader< ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse>> PrepareAsyncUpdateView(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::SelectOrUpdateRequest& request, ::grpc::CompletionQueue* cq) {
-      return std::unique_ptr< ::grpc::ClientAsyncResponseReader< ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse>>(PrepareAsyncUpdateViewRaw(context, request, cq));
-    }
-    ::grpc::Status Select(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::SelectOrUpdateRequest& request, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse* response) override;
-    std::unique_ptr< ::grpc::ClientAsyncResponseReader< ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse>> AsyncSelect(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::SelectOrUpdateRequest& request, ::grpc::CompletionQueue* cq) {
-      return std::unique_ptr< ::grpc::ClientAsyncResponseReader< ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse>>(AsyncSelectRaw(context, request, cq));
-    }
-    std::unique_ptr< ::grpc::ClientAsyncResponseReader< ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse>> PrepareAsyncSelect(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::SelectOrUpdateRequest& request, ::grpc::CompletionQueue* cq) {
-      return std::unique_ptr< ::grpc::ClientAsyncResponseReader< ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse>>(PrepareAsyncSelectRaw(context, request, cq));
-    }
-    ::grpc::Status UpdateBy(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::UpdateByRequest& request, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse* response) override;
-    std::unique_ptr< ::grpc::ClientAsyncResponseReader< ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse>> AsyncUpdateBy(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::UpdateByRequest& request, ::grpc::CompletionQueue* cq) {
-      return std::unique_ptr< ::grpc::ClientAsyncResponseReader< ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse>>(AsyncUpdateByRaw(context, request, cq));
-    }
-    std::unique_ptr< ::grpc::ClientAsyncResponseReader< ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse>> PrepareAsyncUpdateBy(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::UpdateByRequest& request, ::grpc::CompletionQueue* cq) {
-      return std::unique_ptr< ::grpc::ClientAsyncResponseReader< ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse>>(PrepareAsyncUpdateByRaw(context, request, cq));
-    }
-    ::grpc::Status SelectDistinct(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::SelectDistinctRequest& request, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse* response) override;
-    std::unique_ptr< ::grpc::ClientAsyncResponseReader< ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse>> AsyncSelectDistinct(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::SelectDistinctRequest& request, ::grpc::CompletionQueue* cq) {
-      return std::unique_ptr< ::grpc::ClientAsyncResponseReader< ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse>>(AsyncSelectDistinctRaw(context, request, cq));
-    }
-    std::unique_ptr< ::grpc::ClientAsyncResponseReader< ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse>> PrepareAsyncSelectDistinct(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::SelectDistinctRequest& request, ::grpc::CompletionQueue* cq) {
-      return std::unique_ptr< ::grpc::ClientAsyncResponseReader< ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse>>(PrepareAsyncSelectDistinctRaw(context, request, cq));
-    }
-    ::grpc::Status Filter(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::FilterTableRequest& request, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse* response) override;
-    std::unique_ptr< ::grpc::ClientAsyncResponseReader< ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse>> AsyncFilter(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::FilterTableRequest& request, ::grpc::CompletionQueue* cq) {
-      return std::unique_ptr< ::grpc::ClientAsyncResponseReader< ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse>>(AsyncFilterRaw(context, request, cq));
-    }
-    std::unique_ptr< ::grpc::ClientAsyncResponseReader< ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse>> PrepareAsyncFilter(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::FilterTableRequest& request, ::grpc::CompletionQueue* cq) {
-      return std::unique_ptr< ::grpc::ClientAsyncResponseReader< ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse>>(PrepareAsyncFilterRaw(context, request, cq));
-    }
-    ::grpc::Status UnstructuredFilter(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::UnstructuredFilterTableRequest& request, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse* response) override;
-    std::unique_ptr< ::grpc::ClientAsyncResponseReader< ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse>> AsyncUnstructuredFilter(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::UnstructuredFilterTableRequest& request, ::grpc::CompletionQueue* cq) {
-      return std::unique_ptr< ::grpc::ClientAsyncResponseReader< ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse>>(AsyncUnstructuredFilterRaw(context, request, cq));
-    }
-    std::unique_ptr< ::grpc::ClientAsyncResponseReader< ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse>> PrepareAsyncUnstructuredFilter(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::UnstructuredFilterTableRequest& request, ::grpc::CompletionQueue* cq) {
-      return std::unique_ptr< ::grpc::ClientAsyncResponseReader< ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse>>(PrepareAsyncUnstructuredFilterRaw(context, request, cq));
-    }
-    ::grpc::Status Sort(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::SortTableRequest& request, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse* response) override;
-    std::unique_ptr< ::grpc::ClientAsyncResponseReader< ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse>> AsyncSort(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::SortTableRequest& request, ::grpc::CompletionQueue* cq) {
-      return std::unique_ptr< ::grpc::ClientAsyncResponseReader< ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse>>(AsyncSortRaw(context, request, cq));
-    }
-    std::unique_ptr< ::grpc::ClientAsyncResponseReader< ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse>> PrepareAsyncSort(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::SortTableRequest& request, ::grpc::CompletionQueue* cq) {
-      return std::unique_ptr< ::grpc::ClientAsyncResponseReader< ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse>>(PrepareAsyncSortRaw(context, request, cq));
-    }
-    ::grpc::Status Head(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::HeadOrTailRequest& request, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse* response) override;
-    std::unique_ptr< ::grpc::ClientAsyncResponseReader< ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse>> AsyncHead(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::HeadOrTailRequest& request, ::grpc::CompletionQueue* cq) {
-      return std::unique_ptr< ::grpc::ClientAsyncResponseReader< ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse>>(AsyncHeadRaw(context, request, cq));
-    }
-    std::unique_ptr< ::grpc::ClientAsyncResponseReader< ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse>> PrepareAsyncHead(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::HeadOrTailRequest& request, ::grpc::CompletionQueue* cq) {
-      return std::unique_ptr< ::grpc::ClientAsyncResponseReader< ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse>>(PrepareAsyncHeadRaw(context, request, cq));
-    }
-    ::grpc::Status Tail(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::HeadOrTailRequest& request, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse* response) override;
-    std::unique_ptr< ::grpc::ClientAsyncResponseReader< ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse>> AsyncTail(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::HeadOrTailRequest& request, ::grpc::CompletionQueue* cq) {
-      return std::unique_ptr< ::grpc::ClientAsyncResponseReader< ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse>>(AsyncTailRaw(context, request, cq));
-    }
-    std::unique_ptr< ::grpc::ClientAsyncResponseReader< ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse>> PrepareAsyncTail(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::HeadOrTailRequest& request, ::grpc::CompletionQueue* cq) {
-      return std::unique_ptr< ::grpc::ClientAsyncResponseReader< ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse>>(PrepareAsyncTailRaw(context, request, cq));
-    }
-    ::grpc::Status HeadBy(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::HeadOrTailByRequest& request, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse* response) override;
-    std::unique_ptr< ::grpc::ClientAsyncResponseReader< ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse>> AsyncHeadBy(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::HeadOrTailByRequest& request, ::grpc::CompletionQueue* cq) {
-      return std::unique_ptr< ::grpc::ClientAsyncResponseReader< ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse>>(AsyncHeadByRaw(context, request, cq));
-    }
-    std::unique_ptr< ::grpc::ClientAsyncResponseReader< ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse>> PrepareAsyncHeadBy(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::HeadOrTailByRequest& request, ::grpc::CompletionQueue* cq) {
-      return std::unique_ptr< ::grpc::ClientAsyncResponseReader< ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse>>(PrepareAsyncHeadByRaw(context, request, cq));
-    }
-    ::grpc::Status TailBy(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::HeadOrTailByRequest& request, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse* response) override;
-    std::unique_ptr< ::grpc::ClientAsyncResponseReader< ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse>> AsyncTailBy(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::HeadOrTailByRequest& request, ::grpc::CompletionQueue* cq) {
-      return std::unique_ptr< ::grpc::ClientAsyncResponseReader< ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse>>(AsyncTailByRaw(context, request, cq));
-    }
-    std::unique_ptr< ::grpc::ClientAsyncResponseReader< ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse>> PrepareAsyncTailBy(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::HeadOrTailByRequest& request, ::grpc::CompletionQueue* cq) {
-      return std::unique_ptr< ::grpc::ClientAsyncResponseReader< ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse>>(PrepareAsyncTailByRaw(context, request, cq));
-    }
-    ::grpc::Status Ungroup(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::UngroupRequest& request, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse* response) override;
-    std::unique_ptr< ::grpc::ClientAsyncResponseReader< ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse>> AsyncUngroup(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::UngroupRequest& request, ::grpc::CompletionQueue* cq) {
-      return std::unique_ptr< ::grpc::ClientAsyncResponseReader< ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse>>(AsyncUngroupRaw(context, request, cq));
-    }
-    std::unique_ptr< ::grpc::ClientAsyncResponseReader< ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse>> PrepareAsyncUngroup(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::UngroupRequest& request, ::grpc::CompletionQueue* cq) {
-      return std::unique_ptr< ::grpc::ClientAsyncResponseReader< ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse>>(PrepareAsyncUngroupRaw(context, request, cq));
-    }
-    ::grpc::Status MergeTables(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::MergeTablesRequest& request, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse* response) override;
-    std::unique_ptr< ::grpc::ClientAsyncResponseReader< ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse>> AsyncMergeTables(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::MergeTablesRequest& request, ::grpc::CompletionQueue* cq) {
-      return std::unique_ptr< ::grpc::ClientAsyncResponseReader< ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse>>(AsyncMergeTablesRaw(context, request, cq));
-    }
-    std::unique_ptr< ::grpc::ClientAsyncResponseReader< ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse>> PrepareAsyncMergeTables(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::MergeTablesRequest& request, ::grpc::CompletionQueue* cq) {
-      return std::unique_ptr< ::grpc::ClientAsyncResponseReader< ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse>>(PrepareAsyncMergeTablesRaw(context, request, cq));
-    }
-    ::grpc::Status CrossJoinTables(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::CrossJoinTablesRequest& request, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse* response) override;
-    std::unique_ptr< ::grpc::ClientAsyncResponseReader< ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse>> AsyncCrossJoinTables(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::CrossJoinTablesRequest& request, ::grpc::CompletionQueue* cq) {
-      return std::unique_ptr< ::grpc::ClientAsyncResponseReader< ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse>>(AsyncCrossJoinTablesRaw(context, request, cq));
-    }
-    std::unique_ptr< ::grpc::ClientAsyncResponseReader< ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse>> PrepareAsyncCrossJoinTables(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::CrossJoinTablesRequest& request, ::grpc::CompletionQueue* cq) {
-      return std::unique_ptr< ::grpc::ClientAsyncResponseReader< ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse>>(PrepareAsyncCrossJoinTablesRaw(context, request, cq));
-    }
-    ::grpc::Status NaturalJoinTables(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::NaturalJoinTablesRequest& request, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse* response) override;
-    std::unique_ptr< ::grpc::ClientAsyncResponseReader< ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse>> AsyncNaturalJoinTables(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::NaturalJoinTablesRequest& request, ::grpc::CompletionQueue* cq) {
-      return std::unique_ptr< ::grpc::ClientAsyncResponseReader< ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse>>(AsyncNaturalJoinTablesRaw(context, request, cq));
-    }
-    std::unique_ptr< ::grpc::ClientAsyncResponseReader< ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse>> PrepareAsyncNaturalJoinTables(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::NaturalJoinTablesRequest& request, ::grpc::CompletionQueue* cq) {
-      return std::unique_ptr< ::grpc::ClientAsyncResponseReader< ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse>>(PrepareAsyncNaturalJoinTablesRaw(context, request, cq));
-    }
-    ::grpc::Status ExactJoinTables(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::ExactJoinTablesRequest& request, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse* response) override;
-    std::unique_ptr< ::grpc::ClientAsyncResponseReader< ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse>> AsyncExactJoinTables(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::ExactJoinTablesRequest& request, ::grpc::CompletionQueue* cq) {
-      return std::unique_ptr< ::grpc::ClientAsyncResponseReader< ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse>>(AsyncExactJoinTablesRaw(context, request, cq));
-    }
-    std::unique_ptr< ::grpc::ClientAsyncResponseReader< ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse>> PrepareAsyncExactJoinTables(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::ExactJoinTablesRequest& request, ::grpc::CompletionQueue* cq) {
-      return std::unique_ptr< ::grpc::ClientAsyncResponseReader< ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse>>(PrepareAsyncExactJoinTablesRaw(context, request, cq));
-    }
-    ::grpc::Status LeftJoinTables(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::LeftJoinTablesRequest& request, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse* response) override;
-    std::unique_ptr< ::grpc::ClientAsyncResponseReader< ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse>> AsyncLeftJoinTables(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::LeftJoinTablesRequest& request, ::grpc::CompletionQueue* cq) {
-      return std::unique_ptr< ::grpc::ClientAsyncResponseReader< ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse>>(AsyncLeftJoinTablesRaw(context, request, cq));
-    }
-    std::unique_ptr< ::grpc::ClientAsyncResponseReader< ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse>> PrepareAsyncLeftJoinTables(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::LeftJoinTablesRequest& request, ::grpc::CompletionQueue* cq) {
-      return std::unique_ptr< ::grpc::ClientAsyncResponseReader< ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse>>(PrepareAsyncLeftJoinTablesRaw(context, request, cq));
-    }
-    ::grpc::Status AsOfJoinTables(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::AsOfJoinTablesRequest& request, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse* response) override;
-    std::unique_ptr< ::grpc::ClientAsyncResponseReader< ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse>> AsyncAsOfJoinTables(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::AsOfJoinTablesRequest& request, ::grpc::CompletionQueue* cq) {
-      return std::unique_ptr< ::grpc::ClientAsyncResponseReader< ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse>>(AsyncAsOfJoinTablesRaw(context, request, cq));
-    }
-    std::unique_ptr< ::grpc::ClientAsyncResponseReader< ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse>> PrepareAsyncAsOfJoinTables(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::AsOfJoinTablesRequest& request, ::grpc::CompletionQueue* cq) {
-      return std::unique_ptr< ::grpc::ClientAsyncResponseReader< ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse>>(PrepareAsyncAsOfJoinTablesRaw(context, request, cq));
-    }
-    ::grpc::Status AjTables(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::AjRajTablesRequest& request, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse* response) override;
-    std::unique_ptr< ::grpc::ClientAsyncResponseReader< ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse>> AsyncAjTables(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::AjRajTablesRequest& request, ::grpc::CompletionQueue* cq) {
-      return std::unique_ptr< ::grpc::ClientAsyncResponseReader< ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse>>(AsyncAjTablesRaw(context, request, cq));
-    }
-    std::unique_ptr< ::grpc::ClientAsyncResponseReader< ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse>> PrepareAsyncAjTables(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::AjRajTablesRequest& request, ::grpc::CompletionQueue* cq) {
-      return std::unique_ptr< ::grpc::ClientAsyncResponseReader< ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse>>(PrepareAsyncAjTablesRaw(context, request, cq));
-    }
-    ::grpc::Status RajTables(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::AjRajTablesRequest& request, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse* response) override;
-    std::unique_ptr< ::grpc::ClientAsyncResponseReader< ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse>> AsyncRajTables(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::AjRajTablesRequest& request, ::grpc::CompletionQueue* cq) {
-      return std::unique_ptr< ::grpc::ClientAsyncResponseReader< ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse>>(AsyncRajTablesRaw(context, request, cq));
-    }
-    std::unique_ptr< ::grpc::ClientAsyncResponseReader< ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse>> PrepareAsyncRajTables(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::AjRajTablesRequest& request, ::grpc::CompletionQueue* cq) {
-      return std::unique_ptr< ::grpc::ClientAsyncResponseReader< ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse>>(PrepareAsyncRajTablesRaw(context, request, cq));
-    }
-    ::grpc::Status MultiJoinTables(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::MultiJoinTablesRequest& request, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse* response) override;
-    std::unique_ptr< ::grpc::ClientAsyncResponseReader< ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse>> AsyncMultiJoinTables(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::MultiJoinTablesRequest& request, ::grpc::CompletionQueue* cq) {
-      return std::unique_ptr< ::grpc::ClientAsyncResponseReader< ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse>>(AsyncMultiJoinTablesRaw(context, request, cq));
-    }
-    std::unique_ptr< ::grpc::ClientAsyncResponseReader< ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse>> PrepareAsyncMultiJoinTables(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::MultiJoinTablesRequest& request, ::grpc::CompletionQueue* cq) {
-      return std::unique_ptr< ::grpc::ClientAsyncResponseReader< ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse>>(PrepareAsyncMultiJoinTablesRaw(context, request, cq));
-    }
-    ::grpc::Status RangeJoinTables(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::RangeJoinTablesRequest& request, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse* response) override;
-    std::unique_ptr< ::grpc::ClientAsyncResponseReader< ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse>> AsyncRangeJoinTables(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::RangeJoinTablesRequest& request, ::grpc::CompletionQueue* cq) {
-      return std::unique_ptr< ::grpc::ClientAsyncResponseReader< ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse>>(AsyncRangeJoinTablesRaw(context, request, cq));
-    }
-    std::unique_ptr< ::grpc::ClientAsyncResponseReader< ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse>> PrepareAsyncRangeJoinTables(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::RangeJoinTablesRequest& request, ::grpc::CompletionQueue* cq) {
-      return std::unique_ptr< ::grpc::ClientAsyncResponseReader< ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse>>(PrepareAsyncRangeJoinTablesRaw(context, request, cq));
-    }
-    ::grpc::Status ComboAggregate(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::ComboAggregateRequest& request, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse* response) override;
-    std::unique_ptr< ::grpc::ClientAsyncResponseReader< ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse>> AsyncComboAggregate(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::ComboAggregateRequest& request, ::grpc::CompletionQueue* cq) {
-      return std::unique_ptr< ::grpc::ClientAsyncResponseReader< ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse>>(AsyncComboAggregateRaw(context, request, cq));
-    }
-    std::unique_ptr< ::grpc::ClientAsyncResponseReader< ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse>> PrepareAsyncComboAggregate(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::ComboAggregateRequest& request, ::grpc::CompletionQueue* cq) {
-      return std::unique_ptr< ::grpc::ClientAsyncResponseReader< ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse>>(PrepareAsyncComboAggregateRaw(context, request, cq));
-    }
-    ::grpc::Status AggregateAll(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::AggregateAllRequest& request, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse* response) override;
-    std::unique_ptr< ::grpc::ClientAsyncResponseReader< ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse>> AsyncAggregateAll(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::AggregateAllRequest& request, ::grpc::CompletionQueue* cq) {
-      return std::unique_ptr< ::grpc::ClientAsyncResponseReader< ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse>>(AsyncAggregateAllRaw(context, request, cq));
-    }
-    std::unique_ptr< ::grpc::ClientAsyncResponseReader< ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse>> PrepareAsyncAggregateAll(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::AggregateAllRequest& request, ::grpc::CompletionQueue* cq) {
-      return std::unique_ptr< ::grpc::ClientAsyncResponseReader< ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse>>(PrepareAsyncAggregateAllRaw(context, request, cq));
-    }
-    ::grpc::Status Aggregate(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::AggregateRequest& request, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse* response) override;
-    std::unique_ptr< ::grpc::ClientAsyncResponseReader< ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse>> AsyncAggregate(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::AggregateRequest& request, ::grpc::CompletionQueue* cq) {
-      return std::unique_ptr< ::grpc::ClientAsyncResponseReader< ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse>>(AsyncAggregateRaw(context, request, cq));
-    }
-    std::unique_ptr< ::grpc::ClientAsyncResponseReader< ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse>> PrepareAsyncAggregate(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::AggregateRequest& request, ::grpc::CompletionQueue* cq) {
-      return std::unique_ptr< ::grpc::ClientAsyncResponseReader< ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse>>(PrepareAsyncAggregateRaw(context, request, cq));
-    }
-    ::grpc::Status Snapshot(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::SnapshotTableRequest& request, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse* response) override;
-    std::unique_ptr< ::grpc::ClientAsyncResponseReader< ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse>> AsyncSnapshot(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::SnapshotTableRequest& request, ::grpc::CompletionQueue* cq) {
-      return std::unique_ptr< ::grpc::ClientAsyncResponseReader< ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse>>(AsyncSnapshotRaw(context, request, cq));
-    }
-    std::unique_ptr< ::grpc::ClientAsyncResponseReader< ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse>> PrepareAsyncSnapshot(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::SnapshotTableRequest& request, ::grpc::CompletionQueue* cq) {
-      return std::unique_ptr< ::grpc::ClientAsyncResponseReader< ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse>>(PrepareAsyncSnapshotRaw(context, request, cq));
-    }
-    ::grpc::Status SnapshotWhen(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::SnapshotWhenTableRequest& request, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse* response) override;
-    std::unique_ptr< ::grpc::ClientAsyncResponseReader< ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse>> AsyncSnapshotWhen(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::SnapshotWhenTableRequest& request, ::grpc::CompletionQueue* cq) {
-      return std::unique_ptr< ::grpc::ClientAsyncResponseReader< ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse>>(AsyncSnapshotWhenRaw(context, request, cq));
-    }
-    std::unique_ptr< ::grpc::ClientAsyncResponseReader< ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse>> PrepareAsyncSnapshotWhen(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::SnapshotWhenTableRequest& request, ::grpc::CompletionQueue* cq) {
-      return std::unique_ptr< ::grpc::ClientAsyncResponseReader< ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse>>(PrepareAsyncSnapshotWhenRaw(context, request, cq));
-    }
-    ::grpc::Status Flatten(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::FlattenRequest& request, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse* response) override;
-    std::unique_ptr< ::grpc::ClientAsyncResponseReader< ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse>> AsyncFlatten(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::FlattenRequest& request, ::grpc::CompletionQueue* cq) {
-      return std::unique_ptr< ::grpc::ClientAsyncResponseReader< ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse>>(AsyncFlattenRaw(context, request, cq));
-    }
-    std::unique_ptr< ::grpc::ClientAsyncResponseReader< ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse>> PrepareAsyncFlatten(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::FlattenRequest& request, ::grpc::CompletionQueue* cq) {
-      return std::unique_ptr< ::grpc::ClientAsyncResponseReader< ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse>>(PrepareAsyncFlattenRaw(context, request, cq));
-    }
-    ::grpc::Status RunChartDownsample(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::RunChartDownsampleRequest& request, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse* response) override;
-    std::unique_ptr< ::grpc::ClientAsyncResponseReader< ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse>> AsyncRunChartDownsample(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::RunChartDownsampleRequest& request, ::grpc::CompletionQueue* cq) {
-      return std::unique_ptr< ::grpc::ClientAsyncResponseReader< ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse>>(AsyncRunChartDownsampleRaw(context, request, cq));
-    }
-    std::unique_ptr< ::grpc::ClientAsyncResponseReader< ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse>> PrepareAsyncRunChartDownsample(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::RunChartDownsampleRequest& request, ::grpc::CompletionQueue* cq) {
-      return std::unique_ptr< ::grpc::ClientAsyncResponseReader< ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse>>(PrepareAsyncRunChartDownsampleRaw(context, request, cq));
-    }
-    ::grpc::Status CreateInputTable(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::CreateInputTableRequest& request, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse* response) override;
-    std::unique_ptr< ::grpc::ClientAsyncResponseReader< ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse>> AsyncCreateInputTable(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::CreateInputTableRequest& request, ::grpc::CompletionQueue* cq) {
-      return std::unique_ptr< ::grpc::ClientAsyncResponseReader< ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse>>(AsyncCreateInputTableRaw(context, request, cq));
-    }
-    std::unique_ptr< ::grpc::ClientAsyncResponseReader< ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse>> PrepareAsyncCreateInputTable(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::CreateInputTableRequest& request, ::grpc::CompletionQueue* cq) {
-      return std::unique_ptr< ::grpc::ClientAsyncResponseReader< ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse>>(PrepareAsyncCreateInputTableRaw(context, request, cq));
-    }
-    ::grpc::Status WhereIn(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::WhereInRequest& request, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse* response) override;
-    std::unique_ptr< ::grpc::ClientAsyncResponseReader< ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse>> AsyncWhereIn(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::WhereInRequest& request, ::grpc::CompletionQueue* cq) {
-      return std::unique_ptr< ::grpc::ClientAsyncResponseReader< ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse>>(AsyncWhereInRaw(context, request, cq));
-    }
-    std::unique_ptr< ::grpc::ClientAsyncResponseReader< ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse>> PrepareAsyncWhereIn(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::WhereInRequest& request, ::grpc::CompletionQueue* cq) {
-      return std::unique_ptr< ::grpc::ClientAsyncResponseReader< ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse>>(PrepareAsyncWhereInRaw(context, request, cq));
-    }
-    std::unique_ptr< ::grpc::ClientReader< ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse>> Batch(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::BatchTableRequest& request) {
-      return std::unique_ptr< ::grpc::ClientReader< ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse>>(BatchRaw(context, request));
-    }
-    std::unique_ptr< ::grpc::ClientAsyncReader< ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse>> AsyncBatch(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::BatchTableRequest& request, ::grpc::CompletionQueue* cq, void* tag) {
-      return std::unique_ptr< ::grpc::ClientAsyncReader< ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse>>(AsyncBatchRaw(context, request, cq, tag));
-    }
-    std::unique_ptr< ::grpc::ClientAsyncReader< ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse>> PrepareAsyncBatch(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::BatchTableRequest& request, ::grpc::CompletionQueue* cq) {
-      return std::unique_ptr< ::grpc::ClientAsyncReader< ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse>>(PrepareAsyncBatchRaw(context, request, cq));
-    }
-    std::unique_ptr< ::grpc::ClientReader< ::io::deephaven::proto::backplane::grpc::ExportedTableUpdateMessage>> ExportedTableUpdates(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::ExportedTableUpdatesRequest& request) {
-      return std::unique_ptr< ::grpc::ClientReader< ::io::deephaven::proto::backplane::grpc::ExportedTableUpdateMessage>>(ExportedTableUpdatesRaw(context, request));
-    }
-    std::unique_ptr< ::grpc::ClientAsyncReader< ::io::deephaven::proto::backplane::grpc::ExportedTableUpdateMessage>> AsyncExportedTableUpdates(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::ExportedTableUpdatesRequest& request, ::grpc::CompletionQueue* cq, void* tag) {
-      return std::unique_ptr< ::grpc::ClientAsyncReader< ::io::deephaven::proto::backplane::grpc::ExportedTableUpdateMessage>>(AsyncExportedTableUpdatesRaw(context, request, cq, tag));
-    }
-    std::unique_ptr< ::grpc::ClientAsyncReader< ::io::deephaven::proto::backplane::grpc::ExportedTableUpdateMessage>> PrepareAsyncExportedTableUpdates(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::ExportedTableUpdatesRequest& request, ::grpc::CompletionQueue* cq) {
-      return std::unique_ptr< ::grpc::ClientAsyncReader< ::io::deephaven::proto::backplane::grpc::ExportedTableUpdateMessage>>(PrepareAsyncExportedTableUpdatesRaw(context, request, cq));
-    }
-    ::grpc::Status SeekRow(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::SeekRowRequest& request, ::io::deephaven::proto::backplane::grpc::SeekRowResponse* response) override;
-    std::unique_ptr< ::grpc::ClientAsyncResponseReader< ::io::deephaven::proto::backplane::grpc::SeekRowResponse>> AsyncSeekRow(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::SeekRowRequest& request, ::grpc::CompletionQueue* cq) {
-      return std::unique_ptr< ::grpc::ClientAsyncResponseReader< ::io::deephaven::proto::backplane::grpc::SeekRowResponse>>(AsyncSeekRowRaw(context, request, cq));
-    }
-    std::unique_ptr< ::grpc::ClientAsyncResponseReader< ::io::deephaven::proto::backplane::grpc::SeekRowResponse>> PrepareAsyncSeekRow(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::SeekRowRequest& request, ::grpc::CompletionQueue* cq) {
-      return std::unique_ptr< ::grpc::ClientAsyncResponseReader< ::io::deephaven::proto::backplane::grpc::SeekRowResponse>>(PrepareAsyncSeekRowRaw(context, request, cq));
-    }
-    ::grpc::Status MetaTable(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::MetaTableRequest& request, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse* response) override;
-    std::unique_ptr< ::grpc::ClientAsyncResponseReader< ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse>> AsyncMetaTable(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::MetaTableRequest& request, ::grpc::CompletionQueue* cq) {
-      return std::unique_ptr< ::grpc::ClientAsyncResponseReader< ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse>>(AsyncMetaTableRaw(context, request, cq));
-    }
-    std::unique_ptr< ::grpc::ClientAsyncResponseReader< ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse>> PrepareAsyncMetaTable(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::MetaTableRequest& request, ::grpc::CompletionQueue* cq) {
-      return std::unique_ptr< ::grpc::ClientAsyncResponseReader< ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse>>(PrepareAsyncMetaTableRaw(context, request, cq));
-    }
-    ::grpc::Status ComputeColumnStatistics(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::ColumnStatisticsRequest& request, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse* response) override;
-    std::unique_ptr< ::grpc::ClientAsyncResponseReader< ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse>> AsyncComputeColumnStatistics(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::ColumnStatisticsRequest& request, ::grpc::CompletionQueue* cq) {
-      return std::unique_ptr< ::grpc::ClientAsyncResponseReader< ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse>>(AsyncComputeColumnStatisticsRaw(context, request, cq));
-    }
-    std::unique_ptr< ::grpc::ClientAsyncResponseReader< ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse>> PrepareAsyncComputeColumnStatistics(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::ColumnStatisticsRequest& request, ::grpc::CompletionQueue* cq) {
-      return std::unique_ptr< ::grpc::ClientAsyncResponseReader< ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse>>(PrepareAsyncComputeColumnStatisticsRaw(context, request, cq));
-    }
-    class async final :
-      public StubInterface::async_interface {
-     public:
-      void GetExportedTableCreationResponse(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::Ticket* request, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse* response, std::function<void(::grpc::Status)>) override;
-      void GetExportedTableCreationResponse(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::Ticket* request, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse* response, ::grpc::ClientUnaryReactor* reactor) override;
-      void FetchTable(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::FetchTableRequest* request, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse* response, std::function<void(::grpc::Status)>) override;
-      void FetchTable(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::FetchTableRequest* request, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse* response, ::grpc::ClientUnaryReactor* reactor) override;
-      void ApplyPreviewColumns(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::ApplyPreviewColumnsRequest* request, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse* response, std::function<void(::grpc::Status)>) override;
-      void ApplyPreviewColumns(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::ApplyPreviewColumnsRequest* request, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse* response, ::grpc::ClientUnaryReactor* reactor) override;
-      void EmptyTable(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::EmptyTableRequest* request, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse* response, std::function<void(::grpc::Status)>) override;
-      void EmptyTable(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::EmptyTableRequest* request, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse* response, ::grpc::ClientUnaryReactor* reactor) override;
-      void TimeTable(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::TimeTableRequest* request, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse* response, std::function<void(::grpc::Status)>) override;
-      void TimeTable(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::TimeTableRequest* request, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse* response, ::grpc::ClientUnaryReactor* reactor) override;
-      void DropColumns(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::DropColumnsRequest* request, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse* response, std::function<void(::grpc::Status)>) override;
-      void DropColumns(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::DropColumnsRequest* request, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse* response, ::grpc::ClientUnaryReactor* reactor) override;
-      void Update(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::SelectOrUpdateRequest* request, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse* response, std::function<void(::grpc::Status)>) override;
-      void Update(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::SelectOrUpdateRequest* request, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse* response, ::grpc::ClientUnaryReactor* reactor) override;
-      void LazyUpdate(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::SelectOrUpdateRequest* request, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse* response, std::function<void(::grpc::Status)>) override;
-      void LazyUpdate(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::SelectOrUpdateRequest* request, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse* response, ::grpc::ClientUnaryReactor* reactor) override;
-      void View(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::SelectOrUpdateRequest* request, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse* response, std::function<void(::grpc::Status)>) override;
-      void View(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::SelectOrUpdateRequest* request, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse* response, ::grpc::ClientUnaryReactor* reactor) override;
-      void UpdateView(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::SelectOrUpdateRequest* request, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse* response, std::function<void(::grpc::Status)>) override;
-      void UpdateView(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::SelectOrUpdateRequest* request, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse* response, ::grpc::ClientUnaryReactor* reactor) override;
-      void Select(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::SelectOrUpdateRequest* request, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse* response, std::function<void(::grpc::Status)>) override;
-      void Select(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::SelectOrUpdateRequest* request, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse* response, ::grpc::ClientUnaryReactor* reactor) override;
-      void UpdateBy(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::UpdateByRequest* request, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse* response, std::function<void(::grpc::Status)>) override;
-      void UpdateBy(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::UpdateByRequest* request, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse* response, ::grpc::ClientUnaryReactor* reactor) override;
-      void SelectDistinct(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::SelectDistinctRequest* request, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse* response, std::function<void(::grpc::Status)>) override;
-      void SelectDistinct(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::SelectDistinctRequest* request, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse* response, ::grpc::ClientUnaryReactor* reactor) override;
-      void Filter(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::FilterTableRequest* request, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse* response, std::function<void(::grpc::Status)>) override;
-      void Filter(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::FilterTableRequest* request, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse* response, ::grpc::ClientUnaryReactor* reactor) override;
-      void UnstructuredFilter(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::UnstructuredFilterTableRequest* request, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse* response, std::function<void(::grpc::Status)>) override;
-      void UnstructuredFilter(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::UnstructuredFilterTableRequest* request, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse* response, ::grpc::ClientUnaryReactor* reactor) override;
-      void Sort(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::SortTableRequest* request, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse* response, std::function<void(::grpc::Status)>) override;
-      void Sort(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::SortTableRequest* request, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse* response, ::grpc::ClientUnaryReactor* reactor) override;
-      void Head(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::HeadOrTailRequest* request, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse* response, std::function<void(::grpc::Status)>) override;
-      void Head(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::HeadOrTailRequest* request, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse* response, ::grpc::ClientUnaryReactor* reactor) override;
-      void Tail(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::HeadOrTailRequest* request, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse* response, std::function<void(::grpc::Status)>) override;
-      void Tail(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::HeadOrTailRequest* request, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse* response, ::grpc::ClientUnaryReactor* reactor) override;
-      void HeadBy(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::HeadOrTailByRequest* request, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse* response, std::function<void(::grpc::Status)>) override;
-      void HeadBy(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::HeadOrTailByRequest* request, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse* response, ::grpc::ClientUnaryReactor* reactor) override;
-      void TailBy(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::HeadOrTailByRequest* request, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse* response, std::function<void(::grpc::Status)>) override;
-      void TailBy(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::HeadOrTailByRequest* request, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse* response, ::grpc::ClientUnaryReactor* reactor) override;
-      void Ungroup(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::UngroupRequest* request, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse* response, std::function<void(::grpc::Status)>) override;
-      void Ungroup(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::UngroupRequest* request, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse* response, ::grpc::ClientUnaryReactor* reactor) override;
-      void MergeTables(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::MergeTablesRequest* request, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse* response, std::function<void(::grpc::Status)>) override;
-      void MergeTables(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::MergeTablesRequest* request, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse* response, ::grpc::ClientUnaryReactor* reactor) override;
-      void CrossJoinTables(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::CrossJoinTablesRequest* request, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse* response, std::function<void(::grpc::Status)>) override;
-      void CrossJoinTables(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::CrossJoinTablesRequest* request, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse* response, ::grpc::ClientUnaryReactor* reactor) override;
-      void NaturalJoinTables(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::NaturalJoinTablesRequest* request, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse* response, std::function<void(::grpc::Status)>) override;
-      void NaturalJoinTables(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::NaturalJoinTablesRequest* request, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse* response, ::grpc::ClientUnaryReactor* reactor) override;
-      void ExactJoinTables(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::ExactJoinTablesRequest* request, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse* response, std::function<void(::grpc::Status)>) override;
-      void ExactJoinTables(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::ExactJoinTablesRequest* request, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse* response, ::grpc::ClientUnaryReactor* reactor) override;
-      void LeftJoinTables(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::LeftJoinTablesRequest* request, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse* response, std::function<void(::grpc::Status)>) override;
-      void LeftJoinTables(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::LeftJoinTablesRequest* request, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse* response, ::grpc::ClientUnaryReactor* reactor) override;
-      void AsOfJoinTables(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::AsOfJoinTablesRequest* request, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse* response, std::function<void(::grpc::Status)>) override;
-      void AsOfJoinTables(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::AsOfJoinTablesRequest* request, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse* response, ::grpc::ClientUnaryReactor* reactor) override;
-      void AjTables(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::AjRajTablesRequest* request, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse* response, std::function<void(::grpc::Status)>) override;
-      void AjTables(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::AjRajTablesRequest* request, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse* response, ::grpc::ClientUnaryReactor* reactor) override;
-      void RajTables(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::AjRajTablesRequest* request, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse* response, std::function<void(::grpc::Status)>) override;
-      void RajTables(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::AjRajTablesRequest* request, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse* response, ::grpc::ClientUnaryReactor* reactor) override;
-      void MultiJoinTables(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::MultiJoinTablesRequest* request, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse* response, std::function<void(::grpc::Status)>) override;
-      void MultiJoinTables(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::MultiJoinTablesRequest* request, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse* response, ::grpc::ClientUnaryReactor* reactor) override;
-      void RangeJoinTables(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::RangeJoinTablesRequest* request, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse* response, std::function<void(::grpc::Status)>) override;
-      void RangeJoinTables(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::RangeJoinTablesRequest* request, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse* response, ::grpc::ClientUnaryReactor* reactor) override;
-      void ComboAggregate(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::ComboAggregateRequest* request, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse* response, std::function<void(::grpc::Status)>) override;
-      void ComboAggregate(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::ComboAggregateRequest* request, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse* response, ::grpc::ClientUnaryReactor* reactor) override;
-      void AggregateAll(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::AggregateAllRequest* request, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse* response, std::function<void(::grpc::Status)>) override;
-      void AggregateAll(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::AggregateAllRequest* request, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse* response, ::grpc::ClientUnaryReactor* reactor) override;
-      void Aggregate(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::AggregateRequest* request, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse* response, std::function<void(::grpc::Status)>) override;
-      void Aggregate(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::AggregateRequest* request, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse* response, ::grpc::ClientUnaryReactor* reactor) override;
-      void Snapshot(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::SnapshotTableRequest* request, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse* response, std::function<void(::grpc::Status)>) override;
-      void Snapshot(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::SnapshotTableRequest* request, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse* response, ::grpc::ClientUnaryReactor* reactor) override;
-      void SnapshotWhen(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::SnapshotWhenTableRequest* request, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse* response, std::function<void(::grpc::Status)>) override;
-      void SnapshotWhen(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::SnapshotWhenTableRequest* request, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse* response, ::grpc::ClientUnaryReactor* reactor) override;
-      void Flatten(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::FlattenRequest* request, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse* response, std::function<void(::grpc::Status)>) override;
-      void Flatten(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::FlattenRequest* request, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse* response, ::grpc::ClientUnaryReactor* reactor) override;
-      void RunChartDownsample(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::RunChartDownsampleRequest* request, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse* response, std::function<void(::grpc::Status)>) override;
-      void RunChartDownsample(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::RunChartDownsampleRequest* request, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse* response, ::grpc::ClientUnaryReactor* reactor) override;
-      void CreateInputTable(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::CreateInputTableRequest* request, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse* response, std::function<void(::grpc::Status)>) override;
-      void CreateInputTable(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::CreateInputTableRequest* request, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse* response, ::grpc::ClientUnaryReactor* reactor) override;
-      void WhereIn(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::WhereInRequest* request, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse* response, std::function<void(::grpc::Status)>) override;
-      void WhereIn(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::WhereInRequest* request, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse* response, ::grpc::ClientUnaryReactor* reactor) override;
-      void Batch(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::BatchTableRequest* request, ::grpc::ClientReadReactor< ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse>* reactor) override;
-      void ExportedTableUpdates(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::ExportedTableUpdatesRequest* request, ::grpc::ClientReadReactor< ::io::deephaven::proto::backplane::grpc::ExportedTableUpdateMessage>* reactor) override;
-      void SeekRow(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::SeekRowRequest* request, ::io::deephaven::proto::backplane::grpc::SeekRowResponse* response, std::function<void(::grpc::Status)>) override;
-      void SeekRow(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::SeekRowRequest* request, ::io::deephaven::proto::backplane::grpc::SeekRowResponse* response, ::grpc::ClientUnaryReactor* reactor) override;
-      void MetaTable(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::MetaTableRequest* request, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse* response, std::function<void(::grpc::Status)>) override;
-      void MetaTable(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::MetaTableRequest* request, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse* response, ::grpc::ClientUnaryReactor* reactor) override;
-      void ComputeColumnStatistics(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::ColumnStatisticsRequest* request, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse* response, std::function<void(::grpc::Status)>) override;
-      void ComputeColumnStatistics(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::ColumnStatisticsRequest* request, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse* response, ::grpc::ClientUnaryReactor* reactor) override;
-     private:
-      friend class Stub;
-      explicit async(Stub* stub): stub_(stub) { }
-      Stub* stub() { return stub_; }
-      Stub* stub_;
-    };
-    class async* async() override { return &async_stub_; }
-
-   private:
-    std::shared_ptr< ::grpc::ChannelInterface> channel_;
-    class async async_stub_{this};
-    ::grpc::ClientAsyncResponseReader< ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse>* AsyncGetExportedTableCreationResponseRaw(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::Ticket& request, ::grpc::CompletionQueue* cq) override;
-    ::grpc::ClientAsyncResponseReader< ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse>* PrepareAsyncGetExportedTableCreationResponseRaw(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::Ticket& request, ::grpc::CompletionQueue* cq) override;
-    ::grpc::ClientAsyncResponseReader< ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse>* AsyncFetchTableRaw(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::FetchTableRequest& request, ::grpc::CompletionQueue* cq) override;
-    ::grpc::ClientAsyncResponseReader< ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse>* PrepareAsyncFetchTableRaw(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::FetchTableRequest& request, ::grpc::CompletionQueue* cq) override;
-    ::grpc::ClientAsyncResponseReader< ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse>* AsyncApplyPreviewColumnsRaw(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::ApplyPreviewColumnsRequest& request, ::grpc::CompletionQueue* cq) override;
-    ::grpc::ClientAsyncResponseReader< ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse>* PrepareAsyncApplyPreviewColumnsRaw(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::ApplyPreviewColumnsRequest& request, ::grpc::CompletionQueue* cq) override;
-    ::grpc::ClientAsyncResponseReader< ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse>* AsyncEmptyTableRaw(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::EmptyTableRequest& request, ::grpc::CompletionQueue* cq) override;
-    ::grpc::ClientAsyncResponseReader< ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse>* PrepareAsyncEmptyTableRaw(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::EmptyTableRequest& request, ::grpc::CompletionQueue* cq) override;
-    ::grpc::ClientAsyncResponseReader< ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse>* AsyncTimeTableRaw(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::TimeTableRequest& request, ::grpc::CompletionQueue* cq) override;
-    ::grpc::ClientAsyncResponseReader< ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse>* PrepareAsyncTimeTableRaw(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::TimeTableRequest& request, ::grpc::CompletionQueue* cq) override;
-    ::grpc::ClientAsyncResponseReader< ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse>* AsyncDropColumnsRaw(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::DropColumnsRequest& request, ::grpc::CompletionQueue* cq) override;
-    ::grpc::ClientAsyncResponseReader< ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse>* PrepareAsyncDropColumnsRaw(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::DropColumnsRequest& request, ::grpc::CompletionQueue* cq) override;
-    ::grpc::ClientAsyncResponseReader< ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse>* AsyncUpdateRaw(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::SelectOrUpdateRequest& request, ::grpc::CompletionQueue* cq) override;
-    ::grpc::ClientAsyncResponseReader< ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse>* PrepareAsyncUpdateRaw(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::SelectOrUpdateRequest& request, ::grpc::CompletionQueue* cq) override;
-    ::grpc::ClientAsyncResponseReader< ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse>* AsyncLazyUpdateRaw(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::SelectOrUpdateRequest& request, ::grpc::CompletionQueue* cq) override;
-    ::grpc::ClientAsyncResponseReader< ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse>* PrepareAsyncLazyUpdateRaw(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::SelectOrUpdateRequest& request, ::grpc::CompletionQueue* cq) override;
-    ::grpc::ClientAsyncResponseReader< ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse>* AsyncViewRaw(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::SelectOrUpdateRequest& request, ::grpc::CompletionQueue* cq) override;
-    ::grpc::ClientAsyncResponseReader< ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse>* PrepareAsyncViewRaw(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::SelectOrUpdateRequest& request, ::grpc::CompletionQueue* cq) override;
-    ::grpc::ClientAsyncResponseReader< ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse>* AsyncUpdateViewRaw(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::SelectOrUpdateRequest& request, ::grpc::CompletionQueue* cq) override;
-    ::grpc::ClientAsyncResponseReader< ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse>* PrepareAsyncUpdateViewRaw(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::SelectOrUpdateRequest& request, ::grpc::CompletionQueue* cq) override;
-    ::grpc::ClientAsyncResponseReader< ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse>* AsyncSelectRaw(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::SelectOrUpdateRequest& request, ::grpc::CompletionQueue* cq) override;
-    ::grpc::ClientAsyncResponseReader< ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse>* PrepareAsyncSelectRaw(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::SelectOrUpdateRequest& request, ::grpc::CompletionQueue* cq) override;
-    ::grpc::ClientAsyncResponseReader< ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse>* AsyncUpdateByRaw(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::UpdateByRequest& request, ::grpc::CompletionQueue* cq) override;
-    ::grpc::ClientAsyncResponseReader< ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse>* PrepareAsyncUpdateByRaw(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::UpdateByRequest& request, ::grpc::CompletionQueue* cq) override;
-    ::grpc::ClientAsyncResponseReader< ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse>* AsyncSelectDistinctRaw(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::SelectDistinctRequest& request, ::grpc::CompletionQueue* cq) override;
-    ::grpc::ClientAsyncResponseReader< ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse>* PrepareAsyncSelectDistinctRaw(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::SelectDistinctRequest& request, ::grpc::CompletionQueue* cq) override;
-    ::grpc::ClientAsyncResponseReader< ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse>* AsyncFilterRaw(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::FilterTableRequest& request, ::grpc::CompletionQueue* cq) override;
-    ::grpc::ClientAsyncResponseReader< ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse>* PrepareAsyncFilterRaw(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::FilterTableRequest& request, ::grpc::CompletionQueue* cq) override;
-    ::grpc::ClientAsyncResponseReader< ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse>* AsyncUnstructuredFilterRaw(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::UnstructuredFilterTableRequest& request, ::grpc::CompletionQueue* cq) override;
-    ::grpc::ClientAsyncResponseReader< ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse>* PrepareAsyncUnstructuredFilterRaw(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::UnstructuredFilterTableRequest& request, ::grpc::CompletionQueue* cq) override;
-    ::grpc::ClientAsyncResponseReader< ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse>* AsyncSortRaw(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::SortTableRequest& request, ::grpc::CompletionQueue* cq) override;
-    ::grpc::ClientAsyncResponseReader< ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse>* PrepareAsyncSortRaw(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::SortTableRequest& request, ::grpc::CompletionQueue* cq) override;
-    ::grpc::ClientAsyncResponseReader< ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse>* AsyncHeadRaw(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::HeadOrTailRequest& request, ::grpc::CompletionQueue* cq) override;
-    ::grpc::ClientAsyncResponseReader< ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse>* PrepareAsyncHeadRaw(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::HeadOrTailRequest& request, ::grpc::CompletionQueue* cq) override;
-    ::grpc::ClientAsyncResponseReader< ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse>* AsyncTailRaw(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::HeadOrTailRequest& request, ::grpc::CompletionQueue* cq) override;
-    ::grpc::ClientAsyncResponseReader< ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse>* PrepareAsyncTailRaw(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::HeadOrTailRequest& request, ::grpc::CompletionQueue* cq) override;
-    ::grpc::ClientAsyncResponseReader< ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse>* AsyncHeadByRaw(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::HeadOrTailByRequest& request, ::grpc::CompletionQueue* cq) override;
-    ::grpc::ClientAsyncResponseReader< ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse>* PrepareAsyncHeadByRaw(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::HeadOrTailByRequest& request, ::grpc::CompletionQueue* cq) override;
-    ::grpc::ClientAsyncResponseReader< ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse>* AsyncTailByRaw(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::HeadOrTailByRequest& request, ::grpc::CompletionQueue* cq) override;
-    ::grpc::ClientAsyncResponseReader< ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse>* PrepareAsyncTailByRaw(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::HeadOrTailByRequest& request, ::grpc::CompletionQueue* cq) override;
-    ::grpc::ClientAsyncResponseReader< ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse>* AsyncUngroupRaw(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::UngroupRequest& request, ::grpc::CompletionQueue* cq) override;
-    ::grpc::ClientAsyncResponseReader< ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse>* PrepareAsyncUngroupRaw(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::UngroupRequest& request, ::grpc::CompletionQueue* cq) override;
-    ::grpc::ClientAsyncResponseReader< ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse>* AsyncMergeTablesRaw(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::MergeTablesRequest& request, ::grpc::CompletionQueue* cq) override;
-    ::grpc::ClientAsyncResponseReader< ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse>* PrepareAsyncMergeTablesRaw(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::MergeTablesRequest& request, ::grpc::CompletionQueue* cq) override;
-    ::grpc::ClientAsyncResponseReader< ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse>* AsyncCrossJoinTablesRaw(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::CrossJoinTablesRequest& request, ::grpc::CompletionQueue* cq) override;
-    ::grpc::ClientAsyncResponseReader< ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse>* PrepareAsyncCrossJoinTablesRaw(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::CrossJoinTablesRequest& request, ::grpc::CompletionQueue* cq) override;
-    ::grpc::ClientAsyncResponseReader< ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse>* AsyncNaturalJoinTablesRaw(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::NaturalJoinTablesRequest& request, ::grpc::CompletionQueue* cq) override;
-    ::grpc::ClientAsyncResponseReader< ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse>* PrepareAsyncNaturalJoinTablesRaw(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::NaturalJoinTablesRequest& request, ::grpc::CompletionQueue* cq) override;
-    ::grpc::ClientAsyncResponseReader< ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse>* AsyncExactJoinTablesRaw(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::ExactJoinTablesRequest& request, ::grpc::CompletionQueue* cq) override;
-    ::grpc::ClientAsyncResponseReader< ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse>* PrepareAsyncExactJoinTablesRaw(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::ExactJoinTablesRequest& request, ::grpc::CompletionQueue* cq) override;
-    ::grpc::ClientAsyncResponseReader< ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse>* AsyncLeftJoinTablesRaw(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::LeftJoinTablesRequest& request, ::grpc::CompletionQueue* cq) override;
-    ::grpc::ClientAsyncResponseReader< ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse>* PrepareAsyncLeftJoinTablesRaw(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::LeftJoinTablesRequest& request, ::grpc::CompletionQueue* cq) override;
-    ::grpc::ClientAsyncResponseReader< ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse>* AsyncAsOfJoinTablesRaw(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::AsOfJoinTablesRequest& request, ::grpc::CompletionQueue* cq) override;
-    ::grpc::ClientAsyncResponseReader< ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse>* PrepareAsyncAsOfJoinTablesRaw(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::AsOfJoinTablesRequest& request, ::grpc::CompletionQueue* cq) override;
-    ::grpc::ClientAsyncResponseReader< ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse>* AsyncAjTablesRaw(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::AjRajTablesRequest& request, ::grpc::CompletionQueue* cq) override;
-    ::grpc::ClientAsyncResponseReader< ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse>* PrepareAsyncAjTablesRaw(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::AjRajTablesRequest& request, ::grpc::CompletionQueue* cq) override;
-    ::grpc::ClientAsyncResponseReader< ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse>* AsyncRajTablesRaw(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::AjRajTablesRequest& request, ::grpc::CompletionQueue* cq) override;
-    ::grpc::ClientAsyncResponseReader< ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse>* PrepareAsyncRajTablesRaw(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::AjRajTablesRequest& request, ::grpc::CompletionQueue* cq) override;
-    ::grpc::ClientAsyncResponseReader< ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse>* AsyncMultiJoinTablesRaw(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::MultiJoinTablesRequest& request, ::grpc::CompletionQueue* cq) override;
-    ::grpc::ClientAsyncResponseReader< ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse>* PrepareAsyncMultiJoinTablesRaw(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::MultiJoinTablesRequest& request, ::grpc::CompletionQueue* cq) override;
-    ::grpc::ClientAsyncResponseReader< ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse>* AsyncRangeJoinTablesRaw(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::RangeJoinTablesRequest& request, ::grpc::CompletionQueue* cq) override;
-    ::grpc::ClientAsyncResponseReader< ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse>* PrepareAsyncRangeJoinTablesRaw(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::RangeJoinTablesRequest& request, ::grpc::CompletionQueue* cq) override;
-    ::grpc::ClientAsyncResponseReader< ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse>* AsyncComboAggregateRaw(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::ComboAggregateRequest& request, ::grpc::CompletionQueue* cq) override;
-    ::grpc::ClientAsyncResponseReader< ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse>* PrepareAsyncComboAggregateRaw(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::ComboAggregateRequest& request, ::grpc::CompletionQueue* cq) override;
-    ::grpc::ClientAsyncResponseReader< ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse>* AsyncAggregateAllRaw(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::AggregateAllRequest& request, ::grpc::CompletionQueue* cq) override;
-    ::grpc::ClientAsyncResponseReader< ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse>* PrepareAsyncAggregateAllRaw(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::AggregateAllRequest& request, ::grpc::CompletionQueue* cq) override;
-    ::grpc::ClientAsyncResponseReader< ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse>* AsyncAggregateRaw(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::AggregateRequest& request, ::grpc::CompletionQueue* cq) override;
-    ::grpc::ClientAsyncResponseReader< ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse>* PrepareAsyncAggregateRaw(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::AggregateRequest& request, ::grpc::CompletionQueue* cq) override;
-    ::grpc::ClientAsyncResponseReader< ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse>* AsyncSnapshotRaw(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::SnapshotTableRequest& request, ::grpc::CompletionQueue* cq) override;
-    ::grpc::ClientAsyncResponseReader< ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse>* PrepareAsyncSnapshotRaw(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::SnapshotTableRequest& request, ::grpc::CompletionQueue* cq) override;
-    ::grpc::ClientAsyncResponseReader< ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse>* AsyncSnapshotWhenRaw(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::SnapshotWhenTableRequest& request, ::grpc::CompletionQueue* cq) override;
-    ::grpc::ClientAsyncResponseReader< ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse>* PrepareAsyncSnapshotWhenRaw(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::SnapshotWhenTableRequest& request, ::grpc::CompletionQueue* cq) override;
-    ::grpc::ClientAsyncResponseReader< ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse>* AsyncFlattenRaw(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::FlattenRequest& request, ::grpc::CompletionQueue* cq) override;
-    ::grpc::ClientAsyncResponseReader< ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse>* PrepareAsyncFlattenRaw(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::FlattenRequest& request, ::grpc::CompletionQueue* cq) override;
-    ::grpc::ClientAsyncResponseReader< ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse>* AsyncRunChartDownsampleRaw(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::RunChartDownsampleRequest& request, ::grpc::CompletionQueue* cq) override;
-    ::grpc::ClientAsyncResponseReader< ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse>* PrepareAsyncRunChartDownsampleRaw(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::RunChartDownsampleRequest& request, ::grpc::CompletionQueue* cq) override;
-    ::grpc::ClientAsyncResponseReader< ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse>* AsyncCreateInputTableRaw(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::CreateInputTableRequest& request, ::grpc::CompletionQueue* cq) override;
-    ::grpc::ClientAsyncResponseReader< ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse>* PrepareAsyncCreateInputTableRaw(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::CreateInputTableRequest& request, ::grpc::CompletionQueue* cq) override;
-    ::grpc::ClientAsyncResponseReader< ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse>* AsyncWhereInRaw(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::WhereInRequest& request, ::grpc::CompletionQueue* cq) override;
-    ::grpc::ClientAsyncResponseReader< ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse>* PrepareAsyncWhereInRaw(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::WhereInRequest& request, ::grpc::CompletionQueue* cq) override;
-    ::grpc::ClientReader< ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse>* BatchRaw(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::BatchTableRequest& request) override;
-    ::grpc::ClientAsyncReader< ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse>* AsyncBatchRaw(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::BatchTableRequest& request, ::grpc::CompletionQueue* cq, void* tag) override;
-    ::grpc::ClientAsyncReader< ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse>* PrepareAsyncBatchRaw(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::BatchTableRequest& request, ::grpc::CompletionQueue* cq) override;
-    ::grpc::ClientReader< ::io::deephaven::proto::backplane::grpc::ExportedTableUpdateMessage>* ExportedTableUpdatesRaw(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::ExportedTableUpdatesRequest& request) override;
-    ::grpc::ClientAsyncReader< ::io::deephaven::proto::backplane::grpc::ExportedTableUpdateMessage>* AsyncExportedTableUpdatesRaw(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::ExportedTableUpdatesRequest& request, ::grpc::CompletionQueue* cq, void* tag) override;
-    ::grpc::ClientAsyncReader< ::io::deephaven::proto::backplane::grpc::ExportedTableUpdateMessage>* PrepareAsyncExportedTableUpdatesRaw(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::ExportedTableUpdatesRequest& request, ::grpc::CompletionQueue* cq) override;
-    ::grpc::ClientAsyncResponseReader< ::io::deephaven::proto::backplane::grpc::SeekRowResponse>* AsyncSeekRowRaw(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::SeekRowRequest& request, ::grpc::CompletionQueue* cq) override;
-    ::grpc::ClientAsyncResponseReader< ::io::deephaven::proto::backplane::grpc::SeekRowResponse>* PrepareAsyncSeekRowRaw(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::SeekRowRequest& request, ::grpc::CompletionQueue* cq) override;
-    ::grpc::ClientAsyncResponseReader< ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse>* AsyncMetaTableRaw(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::MetaTableRequest& request, ::grpc::CompletionQueue* cq) override;
-    ::grpc::ClientAsyncResponseReader< ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse>* PrepareAsyncMetaTableRaw(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::MetaTableRequest& request, ::grpc::CompletionQueue* cq) override;
-    ::grpc::ClientAsyncResponseReader< ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse>* AsyncComputeColumnStatisticsRaw(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::ColumnStatisticsRequest& request, ::grpc::CompletionQueue* cq) override;
-    ::grpc::ClientAsyncResponseReader< ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse>* PrepareAsyncComputeColumnStatisticsRaw(::grpc::ClientContext* context, const ::io::deephaven::proto::backplane::grpc::ColumnStatisticsRequest& request, ::grpc::CompletionQueue* cq) override;
-    const ::grpc::internal::RpcMethod rpcmethod_GetExportedTableCreationResponse_;
-    const ::grpc::internal::RpcMethod rpcmethod_FetchTable_;
-    const ::grpc::internal::RpcMethod rpcmethod_ApplyPreviewColumns_;
-    const ::grpc::internal::RpcMethod rpcmethod_EmptyTable_;
-    const ::grpc::internal::RpcMethod rpcmethod_TimeTable_;
-    const ::grpc::internal::RpcMethod rpcmethod_DropColumns_;
-    const ::grpc::internal::RpcMethod rpcmethod_Update_;
-    const ::grpc::internal::RpcMethod rpcmethod_LazyUpdate_;
-    const ::grpc::internal::RpcMethod rpcmethod_View_;
-    const ::grpc::internal::RpcMethod rpcmethod_UpdateView_;
-    const ::grpc::internal::RpcMethod rpcmethod_Select_;
-    const ::grpc::internal::RpcMethod rpcmethod_UpdateBy_;
-    const ::grpc::internal::RpcMethod rpcmethod_SelectDistinct_;
-    const ::grpc::internal::RpcMethod rpcmethod_Filter_;
-    const ::grpc::internal::RpcMethod rpcmethod_UnstructuredFilter_;
-    const ::grpc::internal::RpcMethod rpcmethod_Sort_;
-    const ::grpc::internal::RpcMethod rpcmethod_Head_;
-    const ::grpc::internal::RpcMethod rpcmethod_Tail_;
-    const ::grpc::internal::RpcMethod rpcmethod_HeadBy_;
-    const ::grpc::internal::RpcMethod rpcmethod_TailBy_;
-    const ::grpc::internal::RpcMethod rpcmethod_Ungroup_;
-    const ::grpc::internal::RpcMethod rpcmethod_MergeTables_;
-    const ::grpc::internal::RpcMethod rpcmethod_CrossJoinTables_;
-    const ::grpc::internal::RpcMethod rpcmethod_NaturalJoinTables_;
-    const ::grpc::internal::RpcMethod rpcmethod_ExactJoinTables_;
-    const ::grpc::internal::RpcMethod rpcmethod_LeftJoinTables_;
-    const ::grpc::internal::RpcMethod rpcmethod_AsOfJoinTables_;
-    const ::grpc::internal::RpcMethod rpcmethod_AjTables_;
-    const ::grpc::internal::RpcMethod rpcmethod_RajTables_;
-    const ::grpc::internal::RpcMethod rpcmethod_MultiJoinTables_;
-    const ::grpc::internal::RpcMethod rpcmethod_RangeJoinTables_;
-    const ::grpc::internal::RpcMethod rpcmethod_ComboAggregate_;
-    const ::grpc::internal::RpcMethod rpcmethod_AggregateAll_;
-    const ::grpc::internal::RpcMethod rpcmethod_Aggregate_;
-    const ::grpc::internal::RpcMethod rpcmethod_Snapshot_;
-    const ::grpc::internal::RpcMethod rpcmethod_SnapshotWhen_;
-    const ::grpc::internal::RpcMethod rpcmethod_Flatten_;
-    const ::grpc::internal::RpcMethod rpcmethod_RunChartDownsample_;
-    const ::grpc::internal::RpcMethod rpcmethod_CreateInputTable_;
-    const ::grpc::internal::RpcMethod rpcmethod_WhereIn_;
-    const ::grpc::internal::RpcMethod rpcmethod_Batch_;
-    const ::grpc::internal::RpcMethod rpcmethod_ExportedTableUpdates_;
-    const ::grpc::internal::RpcMethod rpcmethod_SeekRow_;
-    const ::grpc::internal::RpcMethod rpcmethod_MetaTable_;
-    const ::grpc::internal::RpcMethod rpcmethod_ComputeColumnStatistics_;
-  };
-  static std::unique_ptr<Stub> NewStub(const std::shared_ptr< ::grpc::ChannelInterface>& channel, const ::grpc::StubOptions& options = ::grpc::StubOptions());
-
-  class Service : public ::grpc::Service {
-   public:
-    Service();
-    virtual ~Service();
-    //
-    // Request an ETCR for this ticket. Ticket must reference a Table.
-    virtual ::grpc::Status GetExportedTableCreationResponse(::grpc::ServerContext* context, const ::io::deephaven::proto::backplane::grpc::Ticket* request, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse* response);
-    //
-    // Fetches a Table from an existing source ticket and exports it to the local session result ticket.
-    virtual ::grpc::Status FetchTable(::grpc::ServerContext* context, const ::io::deephaven::proto::backplane::grpc::FetchTableRequest* request, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse* response);
-    //
-    // Create a table that has preview columns applied to an existing source table.
-    virtual ::grpc::Status ApplyPreviewColumns(::grpc::ServerContext* context, const ::io::deephaven::proto::backplane::grpc::ApplyPreviewColumnsRequest* request, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse* response);
-    //
-    // Create an empty table with the given column names and types.
-    virtual ::grpc::Status EmptyTable(::grpc::ServerContext* context, const ::io::deephaven::proto::backplane::grpc::EmptyTableRequest* request, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse* response);
-    //
-    // Create a time table with the given start time and period.
-    virtual ::grpc::Status TimeTable(::grpc::ServerContext* context, const ::io::deephaven::proto::backplane::grpc::TimeTableRequest* request, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse* response);
-    //
-    // Drop columns from the parent table.
-    virtual ::grpc::Status DropColumns(::grpc::ServerContext* context, const ::io::deephaven::proto::backplane::grpc::DropColumnsRequest* request, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse* response);
-    //
-    // Add columns to the given table using the given column specifications and the update table operation.
-    virtual ::grpc::Status Update(::grpc::ServerContext* context, const ::io::deephaven::proto::backplane::grpc::SelectOrUpdateRequest* request, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse* response);
-    //
-    // Add columns to the given table using the given column specifications and the lazyUpdate table operation.
-    virtual ::grpc::Status LazyUpdate(::grpc::ServerContext* context, const ::io::deephaven::proto::backplane::grpc::SelectOrUpdateRequest* request, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse* response);
-    //
-    // Add columns to the given table using the given column specifications and the view table operation.
-    virtual ::grpc::Status View(::grpc::ServerContext* context, const ::io::deephaven::proto::backplane::grpc::SelectOrUpdateRequest* request, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse* response);
-    //
-    // Add columns to the given table using the given column specifications and the updateView table operation.
-    virtual ::grpc::Status UpdateView(::grpc::ServerContext* context, const ::io::deephaven::proto::backplane::grpc::SelectOrUpdateRequest* request, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse* response);
-    //
-    // Select the given columns from the given table.
-    virtual ::grpc::Status Select(::grpc::ServerContext* context, const ::io::deephaven::proto::backplane::grpc::SelectOrUpdateRequest* request, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse* response);
-    //
-    // Returns the result of an updateBy table operation.
-    virtual ::grpc::Status UpdateBy(::grpc::ServerContext* context, const ::io::deephaven::proto::backplane::grpc::UpdateByRequest* request, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse* response);
-    //
-    // Returns a new table definition with the unique tuples of the specified columns
-    virtual ::grpc::Status SelectDistinct(::grpc::ServerContext* context, const ::io::deephaven::proto::backplane::grpc::SelectDistinctRequest* request, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse* response);
-    //
-    // Filter parent table with structured filters.
-    virtual ::grpc::Status Filter(::grpc::ServerContext* context, const ::io::deephaven::proto::backplane::grpc::FilterTableRequest* request, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse* response);
-    //
-    // Filter parent table with unstructured filters.
-    virtual ::grpc::Status UnstructuredFilter(::grpc::ServerContext* context, const ::io::deephaven::proto::backplane::grpc::UnstructuredFilterTableRequest* request, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse* response);
-    //
-    // Sort parent table via the provide sort descriptors.
-    virtual ::grpc::Status Sort(::grpc::ServerContext* context, const ::io::deephaven::proto::backplane::grpc::SortTableRequest* request, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse* response);
-    //
-    // Extract rows from the head of the parent table.
-    virtual ::grpc::Status Head(::grpc::ServerContext* context, const ::io::deephaven::proto::backplane::grpc::HeadOrTailRequest* request, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse* response);
-    //
-    // Extract rows from the tail of the parent table.
-    virtual ::grpc::Status Tail(::grpc::ServerContext* context, const ::io::deephaven::proto::backplane::grpc::HeadOrTailRequest* request, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse* response);
-    //
-    // Run the headBy table operation for the given group by columns on the given table.
-    virtual ::grpc::Status HeadBy(::grpc::ServerContext* context, const ::io::deephaven::proto::backplane::grpc::HeadOrTailByRequest* request, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse* response);
-    //
-    // Run the tailBy operation for the given group by columns on the given table.
-    virtual ::grpc::Status TailBy(::grpc::ServerContext* context, const ::io::deephaven::proto::backplane::grpc::HeadOrTailByRequest* request, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse* response);
-    //
-    // Ungroup the given columns (all columns will be ungrouped if columnsToUngroup is empty or unspecified).
-    virtual ::grpc::Status Ungroup(::grpc::ServerContext* context, const ::io::deephaven::proto::backplane::grpc::UngroupRequest* request, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse* response);
-    //
-    // Create a merged table from the given input tables. If a key column is provided (not null), a sorted
-    // merged will be performed using that column.
-    virtual ::grpc::Status MergeTables(::grpc::ServerContext* context, const ::io::deephaven::proto::backplane::grpc::MergeTablesRequest* request, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse* response);
-    //
-    // Returns the result of a cross join operation. Also known as the cartesian product.
-    virtual ::grpc::Status CrossJoinTables(::grpc::ServerContext* context, const ::io::deephaven::proto::backplane::grpc::CrossJoinTablesRequest* request, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse* response);
-    //
-    // Returns the result of a natural join operation.
-    virtual ::grpc::Status NaturalJoinTables(::grpc::ServerContext* context, const ::io::deephaven::proto::backplane::grpc::NaturalJoinTablesRequest* request, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse* response);
-    //
-    // Returns the result of an exact join operation.
-    virtual ::grpc::Status ExactJoinTables(::grpc::ServerContext* context, const ::io::deephaven::proto::backplane::grpc::ExactJoinTablesRequest* request, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse* response);
-    //
-    // Returns the result of a left join operation.
-    virtual ::grpc::Status LeftJoinTables(::grpc::ServerContext* context, const ::io::deephaven::proto::backplane::grpc::LeftJoinTablesRequest* request, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse* response);
-    //
-    // Returns the result of an as of join operation.
-    //
-    // Deprecated: Please use AjTables or RajTables.
-    virtual ::grpc::Status AsOfJoinTables(::grpc::ServerContext* context, const ::io::deephaven::proto::backplane::grpc::AsOfJoinTablesRequest* request, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse* response);
-    //
-    // Returns the result of an aj operation.
-    virtual ::grpc::Status AjTables(::grpc::ServerContext* context, const ::io::deephaven::proto::backplane::grpc::AjRajTablesRequest* request, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse* response);
-    //
-    // Returns the result of an raj operation.
-    virtual ::grpc::Status RajTables(::grpc::ServerContext* context, const ::io::deephaven::proto::backplane::grpc::AjRajTablesRequest* request, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse* response);
-    //
-    // Returns the result of a multi-join operation.
-    virtual ::grpc::Status MultiJoinTables(::grpc::ServerContext* context, const ::io::deephaven::proto::backplane::grpc::MultiJoinTablesRequest* request, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse* response);
-    //
-    // Returns the result of a range join operation.
-    virtual ::grpc::Status RangeJoinTables(::grpc::ServerContext* context, const ::io::deephaven::proto::backplane::grpc::RangeJoinTablesRequest* request, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse* response);
-    //
-    // Returns the result of an aggregate table operation.
-    //
-    // Deprecated: Please use AggregateAll or Aggregate instead
-    virtual ::grpc::Status ComboAggregate(::grpc::ServerContext* context, const ::io::deephaven::proto::backplane::grpc::ComboAggregateRequest* request, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse* response);
-    //
-    // Aggregates all non-grouping columns against a single aggregation specification.
-    virtual ::grpc::Status AggregateAll(::grpc::ServerContext* context, const ::io::deephaven::proto::backplane::grpc::AggregateAllRequest* request, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse* response);
-    //
-    // Produce an aggregated result by grouping the source_id table according to the group_by_columns and applying
-    // aggregations to each resulting group of rows. The result table will have one row per group, ordered by
-    // the encounter order within the source_id table, thereby ensuring that the row key for a given group never
-    // changes.
-    virtual ::grpc::Status Aggregate(::grpc::ServerContext* context, const ::io::deephaven::proto::backplane::grpc::AggregateRequest* request, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse* response);
-    //
-    // Takes a single snapshot of the source_id table.
-    virtual ::grpc::Status Snapshot(::grpc::ServerContext* context, const ::io::deephaven::proto::backplane::grpc::SnapshotTableRequest* request, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse* response);
-    //
-    // Snapshot base_id, triggered by trigger_id, and export the resulting new table.
-    // The trigger_id table's change events cause a new snapshot to be taken. The result table includes a
-    // "snapshot key" which is a subset (possibly all) of the base_id table's columns. The
-    // remaining columns in the result table come from base_id table, the table being snapshotted.
-    virtual ::grpc::Status SnapshotWhen(::grpc::ServerContext* context, const ::io::deephaven::proto::backplane::grpc::SnapshotWhenTableRequest* request, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse* response);
-    //
-    // Returns a new table with a flattened row set.
-    virtual ::grpc::Status Flatten(::grpc::ServerContext* context, const ::io::deephaven::proto::backplane::grpc::FlattenRequest* request, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse* response);
-    // *
-    // Downsamples a table assume its contents will be rendered in a run chart, with each subsequent row holding a later
-    // X value (i.e., sorted on that column). Multiple Y columns can be specified, as can a range of values for the X
-    // column to support zooming in.
-    virtual ::grpc::Status RunChartDownsample(::grpc::ServerContext* context, const ::io::deephaven::proto::backplane::grpc::RunChartDownsampleRequest* request, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse* response);
-    // *
-    // Creates a new Table based on the provided configuration. This can be used as a regular table from the other methods
-    // in this interface, or can be interacted with via the InputTableService to modify its contents.
-    virtual ::grpc::Status CreateInputTable(::grpc::ServerContext* context, const ::io::deephaven::proto::backplane::grpc::CreateInputTableRequest* request, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse* response);
-    // *
-    // Filters the left table based on the set of values in the right table.
-    //
-    // Note that when the right table ticks, all of the rows in the left table are going to be re-evaluated,
-    // thus the intention is that the right table is fairly slow moving compared with the left table.
-    virtual ::grpc::Status WhereIn(::grpc::ServerContext* context, const ::io::deephaven::proto::backplane::grpc::WhereInRequest* request, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse* response);
-    //
-    // Batch a series of requests and send them all at once. This enables the user to create intermediate tables without
-    // requiring them to be exported and managed by the client. The server will automatically release any tables when they
-    // are no longer depended upon.
-    virtual ::grpc::Status Batch(::grpc::ServerContext* context, const ::io::deephaven::proto::backplane::grpc::BatchTableRequest* request, ::grpc::ServerWriter< ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse>* writer);
-    //
-    // Establish a stream of table updates for cheap notifications of table size updates.
-    //
-    // New streams will flush updates for all existing table exports. An export id of zero will be sent to indicate all
-    // exports have sent their refresh update. Table updates may be intermingled with initial refresh updates after their
-    // initial update had been sent.
-    virtual ::grpc::Status ExportedTableUpdates(::grpc::ServerContext* context, const ::io::deephaven::proto::backplane::grpc::ExportedTableUpdatesRequest* request, ::grpc::ServerWriter< ::io::deephaven::proto::backplane::grpc::ExportedTableUpdateMessage>* writer);
-    //
-    // Seek a row number within a table.
-    virtual ::grpc::Status SeekRow(::grpc::ServerContext* context, const ::io::deephaven::proto::backplane::grpc::SeekRowRequest* request, ::io::deephaven::proto::backplane::grpc::SeekRowResponse* response);
-    //
-    // Returns the meta table of a table.
-    virtual ::grpc::Status MetaTable(::grpc::ServerContext* context, const ::io::deephaven::proto::backplane::grpc::MetaTableRequest* request, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse* response);
-    // *
-    // Returns a new table representing statistics about a single column of the provided table. This
-    // result table will be static - use Aggregation() instead for updating results. Presently, the
-    // primary use case for this is the Deephaven Web UI.
-    virtual ::grpc::Status ComputeColumnStatistics(::grpc::ServerContext* context, const ::io::deephaven::proto::backplane::grpc::ColumnStatisticsRequest* request, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse* response);
-  };
-  template <class BaseClass>
-  class WithAsyncMethod_GetExportedTableCreationResponse : public BaseClass {
-   private:
-    void BaseClassMustBeDerivedFromService(const Service* /*service*/) {}
-   public:
-    WithAsyncMethod_GetExportedTableCreationResponse() {
-      ::grpc::Service::MarkMethodAsync(0);
-    }
-    ~WithAsyncMethod_GetExportedTableCreationResponse() override {
-      BaseClassMustBeDerivedFromService(this);
-    }
-    // disable synchronous version of this method
-    ::grpc::Status GetExportedTableCreationResponse(::grpc::ServerContext* /*context*/, const ::io::deephaven::proto::backplane::grpc::Ticket* /*request*/, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse* /*response*/) override {
-      abort();
-      return ::grpc::Status(::grpc::StatusCode::UNIMPLEMENTED, "");
-    }
-    void RequestGetExportedTableCreationResponse(::grpc::ServerContext* context, ::io::deephaven::proto::backplane::grpc::Ticket* request, ::grpc::ServerAsyncResponseWriter< ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse>* response, ::grpc::CompletionQueue* new_call_cq, ::grpc::ServerCompletionQueue* notification_cq, void *tag) {
-      ::grpc::Service::RequestAsyncUnary(0, context, request, response, new_call_cq, notification_cq, tag);
-    }
-  };
-  template <class BaseClass>
-  class WithAsyncMethod_FetchTable : public BaseClass {
-   private:
-    void BaseClassMustBeDerivedFromService(const Service* /*service*/) {}
-   public:
-    WithAsyncMethod_FetchTable() {
-      ::grpc::Service::MarkMethodAsync(1);
-    }
-    ~WithAsyncMethod_FetchTable() override {
-      BaseClassMustBeDerivedFromService(this);
-    }
-    // disable synchronous version of this method
-    ::grpc::Status FetchTable(::grpc::ServerContext* /*context*/, const ::io::deephaven::proto::backplane::grpc::FetchTableRequest* /*request*/, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse* /*response*/) override {
-      abort();
-      return ::grpc::Status(::grpc::StatusCode::UNIMPLEMENTED, "");
-    }
-    void RequestFetchTable(::grpc::ServerContext* context, ::io::deephaven::proto::backplane::grpc::FetchTableRequest* request, ::grpc::ServerAsyncResponseWriter< ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse>* response, ::grpc::CompletionQueue* new_call_cq, ::grpc::ServerCompletionQueue* notification_cq, void *tag) {
-      ::grpc::Service::RequestAsyncUnary(1, context, request, response, new_call_cq, notification_cq, tag);
-    }
-  };
-  template <class BaseClass>
-  class WithAsyncMethod_ApplyPreviewColumns : public BaseClass {
-   private:
-    void BaseClassMustBeDerivedFromService(const Service* /*service*/) {}
-   public:
-    WithAsyncMethod_ApplyPreviewColumns() {
-      ::grpc::Service::MarkMethodAsync(2);
-    }
-    ~WithAsyncMethod_ApplyPreviewColumns() override {
-      BaseClassMustBeDerivedFromService(this);
-    }
-    // disable synchronous version of this method
-    ::grpc::Status ApplyPreviewColumns(::grpc::ServerContext* /*context*/, const ::io::deephaven::proto::backplane::grpc::ApplyPreviewColumnsRequest* /*request*/, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse* /*response*/) override {
-      abort();
-      return ::grpc::Status(::grpc::StatusCode::UNIMPLEMENTED, "");
-    }
-    void RequestApplyPreviewColumns(::grpc::ServerContext* context, ::io::deephaven::proto::backplane::grpc::ApplyPreviewColumnsRequest* request, ::grpc::ServerAsyncResponseWriter< ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse>* response, ::grpc::CompletionQueue* new_call_cq, ::grpc::ServerCompletionQueue* notification_cq, void *tag) {
-      ::grpc::Service::RequestAsyncUnary(2, context, request, response, new_call_cq, notification_cq, tag);
-    }
-  };
-  template <class BaseClass>
-  class WithAsyncMethod_EmptyTable : public BaseClass {
-   private:
-    void BaseClassMustBeDerivedFromService(const Service* /*service*/) {}
-   public:
-    WithAsyncMethod_EmptyTable() {
-      ::grpc::Service::MarkMethodAsync(3);
-    }
-    ~WithAsyncMethod_EmptyTable() override {
-      BaseClassMustBeDerivedFromService(this);
-    }
-    // disable synchronous version of this method
-    ::grpc::Status EmptyTable(::grpc::ServerContext* /*context*/, const ::io::deephaven::proto::backplane::grpc::EmptyTableRequest* /*request*/, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse* /*response*/) override {
-      abort();
-      return ::grpc::Status(::grpc::StatusCode::UNIMPLEMENTED, "");
-    }
-    void RequestEmptyTable(::grpc::ServerContext* context, ::io::deephaven::proto::backplane::grpc::EmptyTableRequest* request, ::grpc::ServerAsyncResponseWriter< ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse>* response, ::grpc::CompletionQueue* new_call_cq, ::grpc::ServerCompletionQueue* notification_cq, void *tag) {
-      ::grpc::Service::RequestAsyncUnary(3, context, request, response, new_call_cq, notification_cq, tag);
-    }
-  };
-  template <class BaseClass>
-  class WithAsyncMethod_TimeTable : public BaseClass {
-   private:
-    void BaseClassMustBeDerivedFromService(const Service* /*service*/) {}
-   public:
-    WithAsyncMethod_TimeTable() {
-      ::grpc::Service::MarkMethodAsync(4);
-    }
-    ~WithAsyncMethod_TimeTable() override {
-      BaseClassMustBeDerivedFromService(this);
-    }
-    // disable synchronous version of this method
-    ::grpc::Status TimeTable(::grpc::ServerContext* /*context*/, const ::io::deephaven::proto::backplane::grpc::TimeTableRequest* /*request*/, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse* /*response*/) override {
-      abort();
-      return ::grpc::Status(::grpc::StatusCode::UNIMPLEMENTED, "");
-    }
-    void RequestTimeTable(::grpc::ServerContext* context, ::io::deephaven::proto::backplane::grpc::TimeTableRequest* request, ::grpc::ServerAsyncResponseWriter< ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse>* response, ::grpc::CompletionQueue* new_call_cq, ::grpc::ServerCompletionQueue* notification_cq, void *tag) {
-      ::grpc::Service::RequestAsyncUnary(4, context, request, response, new_call_cq, notification_cq, tag);
-    }
-  };
-  template <class BaseClass>
-  class WithAsyncMethod_DropColumns : public BaseClass {
-   private:
-    void BaseClassMustBeDerivedFromService(const Service* /*service*/) {}
-   public:
-    WithAsyncMethod_DropColumns() {
-      ::grpc::Service::MarkMethodAsync(5);
-    }
-    ~WithAsyncMethod_DropColumns() override {
-      BaseClassMustBeDerivedFromService(this);
-    }
-    // disable synchronous version of this method
-    ::grpc::Status DropColumns(::grpc::ServerContext* /*context*/, const ::io::deephaven::proto::backplane::grpc::DropColumnsRequest* /*request*/, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse* /*response*/) override {
-      abort();
-      return ::grpc::Status(::grpc::StatusCode::UNIMPLEMENTED, "");
-    }
-    void RequestDropColumns(::grpc::ServerContext* context, ::io::deephaven::proto::backplane::grpc::DropColumnsRequest* request, ::grpc::ServerAsyncResponseWriter< ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse>* response, ::grpc::CompletionQueue* new_call_cq, ::grpc::ServerCompletionQueue* notification_cq, void *tag) {
-      ::grpc::Service::RequestAsyncUnary(5, context, request, response, new_call_cq, notification_cq, tag);
-    }
-  };
-  template <class BaseClass>
-  class WithAsyncMethod_Update : public BaseClass {
-   private:
-    void BaseClassMustBeDerivedFromService(const Service* /*service*/) {}
-   public:
-    WithAsyncMethod_Update() {
-      ::grpc::Service::MarkMethodAsync(6);
-    }
-    ~WithAsyncMethod_Update() override {
-      BaseClassMustBeDerivedFromService(this);
-    }
-    // disable synchronous version of this method
-    ::grpc::Status Update(::grpc::ServerContext* /*context*/, const ::io::deephaven::proto::backplane::grpc::SelectOrUpdateRequest* /*request*/, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse* /*response*/) override {
-      abort();
-      return ::grpc::Status(::grpc::StatusCode::UNIMPLEMENTED, "");
-    }
-    void RequestUpdate(::grpc::ServerContext* context, ::io::deephaven::proto::backplane::grpc::SelectOrUpdateRequest* request, ::grpc::ServerAsyncResponseWriter< ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse>* response, ::grpc::CompletionQueue* new_call_cq, ::grpc::ServerCompletionQueue* notification_cq, void *tag) {
-      ::grpc::Service::RequestAsyncUnary(6, context, request, response, new_call_cq, notification_cq, tag);
-    }
-  };
-  template <class BaseClass>
-  class WithAsyncMethod_LazyUpdate : public BaseClass {
-   private:
-    void BaseClassMustBeDerivedFromService(const Service* /*service*/) {}
-   public:
-    WithAsyncMethod_LazyUpdate() {
-      ::grpc::Service::MarkMethodAsync(7);
-    }
-    ~WithAsyncMethod_LazyUpdate() override {
-      BaseClassMustBeDerivedFromService(this);
-    }
-    // disable synchronous version of this method
-    ::grpc::Status LazyUpdate(::grpc::ServerContext* /*context*/, const ::io::deephaven::proto::backplane::grpc::SelectOrUpdateRequest* /*request*/, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse* /*response*/) override {
-      abort();
-      return ::grpc::Status(::grpc::StatusCode::UNIMPLEMENTED, "");
-    }
-    void RequestLazyUpdate(::grpc::ServerContext* context, ::io::deephaven::proto::backplane::grpc::SelectOrUpdateRequest* request, ::grpc::ServerAsyncResponseWriter< ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse>* response, ::grpc::CompletionQueue* new_call_cq, ::grpc::ServerCompletionQueue* notification_cq, void *tag) {
-      ::grpc::Service::RequestAsyncUnary(7, context, request, response, new_call_cq, notification_cq, tag);
-    }
-  };
-  template <class BaseClass>
-  class WithAsyncMethod_View : public BaseClass {
-   private:
-    void BaseClassMustBeDerivedFromService(const Service* /*service*/) {}
-   public:
-    WithAsyncMethod_View() {
-      ::grpc::Service::MarkMethodAsync(8);
-    }
-    ~WithAsyncMethod_View() override {
-      BaseClassMustBeDerivedFromService(this);
-    }
-    // disable synchronous version of this method
-    ::grpc::Status View(::grpc::ServerContext* /*context*/, const ::io::deephaven::proto::backplane::grpc::SelectOrUpdateRequest* /*request*/, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse* /*response*/) override {
-      abort();
-      return ::grpc::Status(::grpc::StatusCode::UNIMPLEMENTED, "");
-    }
-    void RequestView(::grpc::ServerContext* context, ::io::deephaven::proto::backplane::grpc::SelectOrUpdateRequest* request, ::grpc::ServerAsyncResponseWriter< ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse>* response, ::grpc::CompletionQueue* new_call_cq, ::grpc::ServerCompletionQueue* notification_cq, void *tag) {
-      ::grpc::Service::RequestAsyncUnary(8, context, request, response, new_call_cq, notification_cq, tag);
-    }
-  };
-  template <class BaseClass>
-  class WithAsyncMethod_UpdateView : public BaseClass {
-   private:
-    void BaseClassMustBeDerivedFromService(const Service* /*service*/) {}
-   public:
-    WithAsyncMethod_UpdateView() {
-      ::grpc::Service::MarkMethodAsync(9);
-    }
-    ~WithAsyncMethod_UpdateView() override {
-      BaseClassMustBeDerivedFromService(this);
-    }
-    // disable synchronous version of this method
-    ::grpc::Status UpdateView(::grpc::ServerContext* /*context*/, const ::io::deephaven::proto::backplane::grpc::SelectOrUpdateRequest* /*request*/, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse* /*response*/) override {
-      abort();
-      return ::grpc::Status(::grpc::StatusCode::UNIMPLEMENTED, "");
-    }
-    void RequestUpdateView(::grpc::ServerContext* context, ::io::deephaven::proto::backplane::grpc::SelectOrUpdateRequest* request, ::grpc::ServerAsyncResponseWriter< ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse>* response, ::grpc::CompletionQueue* new_call_cq, ::grpc::ServerCompletionQueue* notification_cq, void *tag) {
-      ::grpc::Service::RequestAsyncUnary(9, context, request, response, new_call_cq, notification_cq, tag);
-    }
-  };
-  template <class BaseClass>
-  class WithAsyncMethod_Select : public BaseClass {
-   private:
-    void BaseClassMustBeDerivedFromService(const Service* /*service*/) {}
-   public:
-    WithAsyncMethod_Select() {
-      ::grpc::Service::MarkMethodAsync(10);
-    }
-    ~WithAsyncMethod_Select() override {
-      BaseClassMustBeDerivedFromService(this);
-    }
-    // disable synchronous version of this method
-    ::grpc::Status Select(::grpc::ServerContext* /*context*/, const ::io::deephaven::proto::backplane::grpc::SelectOrUpdateRequest* /*request*/, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse* /*response*/) override {
-      abort();
-      return ::grpc::Status(::grpc::StatusCode::UNIMPLEMENTED, "");
-    }
-    void RequestSelect(::grpc::ServerContext* context, ::io::deephaven::proto::backplane::grpc::SelectOrUpdateRequest* request, ::grpc::ServerAsyncResponseWriter< ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse>* response, ::grpc::CompletionQueue* new_call_cq, ::grpc::ServerCompletionQueue* notification_cq, void *tag) {
-      ::grpc::Service::RequestAsyncUnary(10, context, request, response, new_call_cq, notification_cq, tag);
-    }
-  };
-  template <class BaseClass>
-  class WithAsyncMethod_UpdateBy : public BaseClass {
-   private:
-    void BaseClassMustBeDerivedFromService(const Service* /*service*/) {}
-   public:
-    WithAsyncMethod_UpdateBy() {
-      ::grpc::Service::MarkMethodAsync(11);
-    }
-    ~WithAsyncMethod_UpdateBy() override {
-      BaseClassMustBeDerivedFromService(this);
-    }
-    // disable synchronous version of this method
-    ::grpc::Status UpdateBy(::grpc::ServerContext* /*context*/, const ::io::deephaven::proto::backplane::grpc::UpdateByRequest* /*request*/, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse* /*response*/) override {
-      abort();
-      return ::grpc::Status(::grpc::StatusCode::UNIMPLEMENTED, "");
-    }
-    void RequestUpdateBy(::grpc::ServerContext* context, ::io::deephaven::proto::backplane::grpc::UpdateByRequest* request, ::grpc::ServerAsyncResponseWriter< ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse>* response, ::grpc::CompletionQueue* new_call_cq, ::grpc::ServerCompletionQueue* notification_cq, void *tag) {
-      ::grpc::Service::RequestAsyncUnary(11, context, request, response, new_call_cq, notification_cq, tag);
-    }
-  };
-  template <class BaseClass>
-  class WithAsyncMethod_SelectDistinct : public BaseClass {
-   private:
-    void BaseClassMustBeDerivedFromService(const Service* /*service*/) {}
-   public:
-    WithAsyncMethod_SelectDistinct() {
-      ::grpc::Service::MarkMethodAsync(12);
-    }
-    ~WithAsyncMethod_SelectDistinct() override {
-      BaseClassMustBeDerivedFromService(this);
-    }
-    // disable synchronous version of this method
-    ::grpc::Status SelectDistinct(::grpc::ServerContext* /*context*/, const ::io::deephaven::proto::backplane::grpc::SelectDistinctRequest* /*request*/, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse* /*response*/) override {
-      abort();
-      return ::grpc::Status(::grpc::StatusCode::UNIMPLEMENTED, "");
-    }
-    void RequestSelectDistinct(::grpc::ServerContext* context, ::io::deephaven::proto::backplane::grpc::SelectDistinctRequest* request, ::grpc::ServerAsyncResponseWriter< ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse>* response, ::grpc::CompletionQueue* new_call_cq, ::grpc::ServerCompletionQueue* notification_cq, void *tag) {
-      ::grpc::Service::RequestAsyncUnary(12, context, request, response, new_call_cq, notification_cq, tag);
-    }
-  };
-  template <class BaseClass>
-  class WithAsyncMethod_Filter : public BaseClass {
-   private:
-    void BaseClassMustBeDerivedFromService(const Service* /*service*/) {}
-   public:
-    WithAsyncMethod_Filter() {
-      ::grpc::Service::MarkMethodAsync(13);
-    }
-    ~WithAsyncMethod_Filter() override {
-      BaseClassMustBeDerivedFromService(this);
-    }
-    // disable synchronous version of this method
-    ::grpc::Status Filter(::grpc::ServerContext* /*context*/, const ::io::deephaven::proto::backplane::grpc::FilterTableRequest* /*request*/, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse* /*response*/) override {
-      abort();
-      return ::grpc::Status(::grpc::StatusCode::UNIMPLEMENTED, "");
-    }
-    void RequestFilter(::grpc::ServerContext* context, ::io::deephaven::proto::backplane::grpc::FilterTableRequest* request, ::grpc::ServerAsyncResponseWriter< ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse>* response, ::grpc::CompletionQueue* new_call_cq, ::grpc::ServerCompletionQueue* notification_cq, void *tag) {
-      ::grpc::Service::RequestAsyncUnary(13, context, request, response, new_call_cq, notification_cq, tag);
-    }
-  };
-  template <class BaseClass>
-  class WithAsyncMethod_UnstructuredFilter : public BaseClass {
-   private:
-    void BaseClassMustBeDerivedFromService(const Service* /*service*/) {}
-   public:
-    WithAsyncMethod_UnstructuredFilter() {
-      ::grpc::Service::MarkMethodAsync(14);
-    }
-    ~WithAsyncMethod_UnstructuredFilter() override {
-      BaseClassMustBeDerivedFromService(this);
-    }
-    // disable synchronous version of this method
-    ::grpc::Status UnstructuredFilter(::grpc::ServerContext* /*context*/, const ::io::deephaven::proto::backplane::grpc::UnstructuredFilterTableRequest* /*request*/, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse* /*response*/) override {
-      abort();
-      return ::grpc::Status(::grpc::StatusCode::UNIMPLEMENTED, "");
-    }
-    void RequestUnstructuredFilter(::grpc::ServerContext* context, ::io::deephaven::proto::backplane::grpc::UnstructuredFilterTableRequest* request, ::grpc::ServerAsyncResponseWriter< ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse>* response, ::grpc::CompletionQueue* new_call_cq, ::grpc::ServerCompletionQueue* notification_cq, void *tag) {
-      ::grpc::Service::RequestAsyncUnary(14, context, request, response, new_call_cq, notification_cq, tag);
-    }
-  };
-  template <class BaseClass>
-  class WithAsyncMethod_Sort : public BaseClass {
-   private:
-    void BaseClassMustBeDerivedFromService(const Service* /*service*/) {}
-   public:
-    WithAsyncMethod_Sort() {
-      ::grpc::Service::MarkMethodAsync(15);
-    }
-    ~WithAsyncMethod_Sort() override {
-      BaseClassMustBeDerivedFromService(this);
-    }
-    // disable synchronous version of this method
-    ::grpc::Status Sort(::grpc::ServerContext* /*context*/, const ::io::deephaven::proto::backplane::grpc::SortTableRequest* /*request*/, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse* /*response*/) override {
-      abort();
-      return ::grpc::Status(::grpc::StatusCode::UNIMPLEMENTED, "");
-    }
-    void RequestSort(::grpc::ServerContext* context, ::io::deephaven::proto::backplane::grpc::SortTableRequest* request, ::grpc::ServerAsyncResponseWriter< ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse>* response, ::grpc::CompletionQueue* new_call_cq, ::grpc::ServerCompletionQueue* notification_cq, void *tag) {
-      ::grpc::Service::RequestAsyncUnary(15, context, request, response, new_call_cq, notification_cq, tag);
-    }
-  };
-  template <class BaseClass>
-  class WithAsyncMethod_Head : public BaseClass {
-   private:
-    void BaseClassMustBeDerivedFromService(const Service* /*service*/) {}
-   public:
-    WithAsyncMethod_Head() {
-      ::grpc::Service::MarkMethodAsync(16);
-    }
-    ~WithAsyncMethod_Head() override {
-      BaseClassMustBeDerivedFromService(this);
-    }
-    // disable synchronous version of this method
-    ::grpc::Status Head(::grpc::ServerContext* /*context*/, const ::io::deephaven::proto::backplane::grpc::HeadOrTailRequest* /*request*/, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse* /*response*/) override {
-      abort();
-      return ::grpc::Status(::grpc::StatusCode::UNIMPLEMENTED, "");
-    }
-    void RequestHead(::grpc::ServerContext* context, ::io::deephaven::proto::backplane::grpc::HeadOrTailRequest* request, ::grpc::ServerAsyncResponseWriter< ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse>* response, ::grpc::CompletionQueue* new_call_cq, ::grpc::ServerCompletionQueue* notification_cq, void *tag) {
-      ::grpc::Service::RequestAsyncUnary(16, context, request, response, new_call_cq, notification_cq, tag);
-    }
-  };
-  template <class BaseClass>
-  class WithAsyncMethod_Tail : public BaseClass {
-   private:
-    void BaseClassMustBeDerivedFromService(const Service* /*service*/) {}
-   public:
-    WithAsyncMethod_Tail() {
-      ::grpc::Service::MarkMethodAsync(17);
-    }
-    ~WithAsyncMethod_Tail() override {
-      BaseClassMustBeDerivedFromService(this);
-    }
-    // disable synchronous version of this method
-    ::grpc::Status Tail(::grpc::ServerContext* /*context*/, const ::io::deephaven::proto::backplane::grpc::HeadOrTailRequest* /*request*/, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse* /*response*/) override {
-      abort();
-      return ::grpc::Status(::grpc::StatusCode::UNIMPLEMENTED, "");
-    }
-    void RequestTail(::grpc::ServerContext* context, ::io::deephaven::proto::backplane::grpc::HeadOrTailRequest* request, ::grpc::ServerAsyncResponseWriter< ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse>* response, ::grpc::CompletionQueue* new_call_cq, ::grpc::ServerCompletionQueue* notification_cq, void *tag) {
-      ::grpc::Service::RequestAsyncUnary(17, context, request, response, new_call_cq, notification_cq, tag);
-    }
-  };
-  template <class BaseClass>
-  class WithAsyncMethod_HeadBy : public BaseClass {
-   private:
-    void BaseClassMustBeDerivedFromService(const Service* /*service*/) {}
-   public:
-    WithAsyncMethod_HeadBy() {
-      ::grpc::Service::MarkMethodAsync(18);
-    }
-    ~WithAsyncMethod_HeadBy() override {
-      BaseClassMustBeDerivedFromService(this);
-    }
-    // disable synchronous version of this method
-    ::grpc::Status HeadBy(::grpc::ServerContext* /*context*/, const ::io::deephaven::proto::backplane::grpc::HeadOrTailByRequest* /*request*/, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse* /*response*/) override {
-      abort();
-      return ::grpc::Status(::grpc::StatusCode::UNIMPLEMENTED, "");
-    }
-    void RequestHeadBy(::grpc::ServerContext* context, ::io::deephaven::proto::backplane::grpc::HeadOrTailByRequest* request, ::grpc::ServerAsyncResponseWriter< ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse>* response, ::grpc::CompletionQueue* new_call_cq, ::grpc::ServerCompletionQueue* notification_cq, void *tag) {
-      ::grpc::Service::RequestAsyncUnary(18, context, request, response, new_call_cq, notification_cq, tag);
-    }
-  };
-  template <class BaseClass>
-  class WithAsyncMethod_TailBy : public BaseClass {
-   private:
-    void BaseClassMustBeDerivedFromService(const Service* /*service*/) {}
-   public:
-    WithAsyncMethod_TailBy() {
-      ::grpc::Service::MarkMethodAsync(19);
-    }
-    ~WithAsyncMethod_TailBy() override {
-      BaseClassMustBeDerivedFromService(this);
-    }
-    // disable synchronous version of this method
-    ::grpc::Status TailBy(::grpc::ServerContext* /*context*/, const ::io::deephaven::proto::backplane::grpc::HeadOrTailByRequest* /*request*/, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse* /*response*/) override {
-      abort();
-      return ::grpc::Status(::grpc::StatusCode::UNIMPLEMENTED, "");
-    }
-    void RequestTailBy(::grpc::ServerContext* context, ::io::deephaven::proto::backplane::grpc::HeadOrTailByRequest* request, ::grpc::ServerAsyncResponseWriter< ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse>* response, ::grpc::CompletionQueue* new_call_cq, ::grpc::ServerCompletionQueue* notification_cq, void *tag) {
-      ::grpc::Service::RequestAsyncUnary(19, context, request, response, new_call_cq, notification_cq, tag);
-    }
-  };
-  template <class BaseClass>
-  class WithAsyncMethod_Ungroup : public BaseClass {
-   private:
-    void BaseClassMustBeDerivedFromService(const Service* /*service*/) {}
-   public:
-    WithAsyncMethod_Ungroup() {
-      ::grpc::Service::MarkMethodAsync(20);
-    }
-    ~WithAsyncMethod_Ungroup() override {
-      BaseClassMustBeDerivedFromService(this);
-    }
-    // disable synchronous version of this method
-    ::grpc::Status Ungroup(::grpc::ServerContext* /*context*/, const ::io::deephaven::proto::backplane::grpc::UngroupRequest* /*request*/, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse* /*response*/) override {
-      abort();
-      return ::grpc::Status(::grpc::StatusCode::UNIMPLEMENTED, "");
-    }
-    void RequestUngroup(::grpc::ServerContext* context, ::io::deephaven::proto::backplane::grpc::UngroupRequest* request, ::grpc::ServerAsyncResponseWriter< ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse>* response, ::grpc::CompletionQueue* new_call_cq, ::grpc::ServerCompletionQueue* notification_cq, void *tag) {
-      ::grpc::Service::RequestAsyncUnary(20, context, request, response, new_call_cq, notification_cq, tag);
-    }
-  };
-  template <class BaseClass>
-  class WithAsyncMethod_MergeTables : public BaseClass {
-   private:
-    void BaseClassMustBeDerivedFromService(const Service* /*service*/) {}
-   public:
-    WithAsyncMethod_MergeTables() {
-      ::grpc::Service::MarkMethodAsync(21);
-    }
-    ~WithAsyncMethod_MergeTables() override {
-      BaseClassMustBeDerivedFromService(this);
-    }
-    // disable synchronous version of this method
-    ::grpc::Status MergeTables(::grpc::ServerContext* /*context*/, const ::io::deephaven::proto::backplane::grpc::MergeTablesRequest* /*request*/, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse* /*response*/) override {
-      abort();
-      return ::grpc::Status(::grpc::StatusCode::UNIMPLEMENTED, "");
-    }
-    void RequestMergeTables(::grpc::ServerContext* context, ::io::deephaven::proto::backplane::grpc::MergeTablesRequest* request, ::grpc::ServerAsyncResponseWriter< ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse>* response, ::grpc::CompletionQueue* new_call_cq, ::grpc::ServerCompletionQueue* notification_cq, void *tag) {
-      ::grpc::Service::RequestAsyncUnary(21, context, request, response, new_call_cq, notification_cq, tag);
-    }
-  };
-  template <class BaseClass>
-  class WithAsyncMethod_CrossJoinTables : public BaseClass {
-   private:
-    void BaseClassMustBeDerivedFromService(const Service* /*service*/) {}
-   public:
-    WithAsyncMethod_CrossJoinTables() {
-      ::grpc::Service::MarkMethodAsync(22);
-    }
-    ~WithAsyncMethod_CrossJoinTables() override {
-      BaseClassMustBeDerivedFromService(this);
-    }
-    // disable synchronous version of this method
-    ::grpc::Status CrossJoinTables(::grpc::ServerContext* /*context*/, const ::io::deephaven::proto::backplane::grpc::CrossJoinTablesRequest* /*request*/, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse* /*response*/) override {
-      abort();
-      return ::grpc::Status(::grpc::StatusCode::UNIMPLEMENTED, "");
-    }
-    void RequestCrossJoinTables(::grpc::ServerContext* context, ::io::deephaven::proto::backplane::grpc::CrossJoinTablesRequest* request, ::grpc::ServerAsyncResponseWriter< ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse>* response, ::grpc::CompletionQueue* new_call_cq, ::grpc::ServerCompletionQueue* notification_cq, void *tag) {
-      ::grpc::Service::RequestAsyncUnary(22, context, request, response, new_call_cq, notification_cq, tag);
-    }
-  };
-  template <class BaseClass>
-  class WithAsyncMethod_NaturalJoinTables : public BaseClass {
-   private:
-    void BaseClassMustBeDerivedFromService(const Service* /*service*/) {}
-   public:
-    WithAsyncMethod_NaturalJoinTables() {
-      ::grpc::Service::MarkMethodAsync(23);
-    }
-    ~WithAsyncMethod_NaturalJoinTables() override {
-      BaseClassMustBeDerivedFromService(this);
-    }
-    // disable synchronous version of this method
-    ::grpc::Status NaturalJoinTables(::grpc::ServerContext* /*context*/, const ::io::deephaven::proto::backplane::grpc::NaturalJoinTablesRequest* /*request*/, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse* /*response*/) override {
-      abort();
-      return ::grpc::Status(::grpc::StatusCode::UNIMPLEMENTED, "");
-    }
-    void RequestNaturalJoinTables(::grpc::ServerContext* context, ::io::deephaven::proto::backplane::grpc::NaturalJoinTablesRequest* request, ::grpc::ServerAsyncResponseWriter< ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse>* response, ::grpc::CompletionQueue* new_call_cq, ::grpc::ServerCompletionQueue* notification_cq, void *tag) {
-      ::grpc::Service::RequestAsyncUnary(23, context, request, response, new_call_cq, notification_cq, tag);
-    }
-  };
-  template <class BaseClass>
-  class WithAsyncMethod_ExactJoinTables : public BaseClass {
-   private:
-    void BaseClassMustBeDerivedFromService(const Service* /*service*/) {}
-   public:
-    WithAsyncMethod_ExactJoinTables() {
-      ::grpc::Service::MarkMethodAsync(24);
-    }
-    ~WithAsyncMethod_ExactJoinTables() override {
-      BaseClassMustBeDerivedFromService(this);
-    }
-    // disable synchronous version of this method
-    ::grpc::Status ExactJoinTables(::grpc::ServerContext* /*context*/, const ::io::deephaven::proto::backplane::grpc::ExactJoinTablesRequest* /*request*/, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse* /*response*/) override {
-      abort();
-      return ::grpc::Status(::grpc::StatusCode::UNIMPLEMENTED, "");
-    }
-    void RequestExactJoinTables(::grpc::ServerContext* context, ::io::deephaven::proto::backplane::grpc::ExactJoinTablesRequest* request, ::grpc::ServerAsyncResponseWriter< ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse>* response, ::grpc::CompletionQueue* new_call_cq, ::grpc::ServerCompletionQueue* notification_cq, void *tag) {
-      ::grpc::Service::RequestAsyncUnary(24, context, request, response, new_call_cq, notification_cq, tag);
-    }
-  };
-  template <class BaseClass>
-  class WithAsyncMethod_LeftJoinTables : public BaseClass {
-   private:
-    void BaseClassMustBeDerivedFromService(const Service* /*service*/) {}
-   public:
-    WithAsyncMethod_LeftJoinTables() {
-      ::grpc::Service::MarkMethodAsync(25);
-    }
-    ~WithAsyncMethod_LeftJoinTables() override {
-      BaseClassMustBeDerivedFromService(this);
-    }
-    // disable synchronous version of this method
-    ::grpc::Status LeftJoinTables(::grpc::ServerContext* /*context*/, const ::io::deephaven::proto::backplane::grpc::LeftJoinTablesRequest* /*request*/, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse* /*response*/) override {
-      abort();
-      return ::grpc::Status(::grpc::StatusCode::UNIMPLEMENTED, "");
-    }
-    void RequestLeftJoinTables(::grpc::ServerContext* context, ::io::deephaven::proto::backplane::grpc::LeftJoinTablesRequest* request, ::grpc::ServerAsyncResponseWriter< ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse>* response, ::grpc::CompletionQueue* new_call_cq, ::grpc::ServerCompletionQueue* notification_cq, void *tag) {
-      ::grpc::Service::RequestAsyncUnary(25, context, request, response, new_call_cq, notification_cq, tag);
-    }
-  };
-  template <class BaseClass>
-  class WithAsyncMethod_AsOfJoinTables : public BaseClass {
-   private:
-    void BaseClassMustBeDerivedFromService(const Service* /*service*/) {}
-   public:
-    WithAsyncMethod_AsOfJoinTables() {
-      ::grpc::Service::MarkMethodAsync(26);
-    }
-    ~WithAsyncMethod_AsOfJoinTables() override {
-      BaseClassMustBeDerivedFromService(this);
-    }
-    // disable synchronous version of this method
-    ::grpc::Status AsOfJoinTables(::grpc::ServerContext* /*context*/, const ::io::deephaven::proto::backplane::grpc::AsOfJoinTablesRequest* /*request*/, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse* /*response*/) override {
-      abort();
-      return ::grpc::Status(::grpc::StatusCode::UNIMPLEMENTED, "");
-    }
-    void RequestAsOfJoinTables(::grpc::ServerContext* context, ::io::deephaven::proto::backplane::grpc::AsOfJoinTablesRequest* request, ::grpc::ServerAsyncResponseWriter< ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse>* response, ::grpc::CompletionQueue* new_call_cq, ::grpc::ServerCompletionQueue* notification_cq, void *tag) {
-      ::grpc::Service::RequestAsyncUnary(26, context, request, response, new_call_cq, notification_cq, tag);
-    }
-  };
-  template <class BaseClass>
-  class WithAsyncMethod_AjTables : public BaseClass {
-   private:
-    void BaseClassMustBeDerivedFromService(const Service* /*service*/) {}
-   public:
-    WithAsyncMethod_AjTables() {
-      ::grpc::Service::MarkMethodAsync(27);
-    }
-    ~WithAsyncMethod_AjTables() override {
-      BaseClassMustBeDerivedFromService(this);
-    }
-    // disable synchronous version of this method
-    ::grpc::Status AjTables(::grpc::ServerContext* /*context*/, const ::io::deephaven::proto::backplane::grpc::AjRajTablesRequest* /*request*/, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse* /*response*/) override {
-      abort();
-      return ::grpc::Status(::grpc::StatusCode::UNIMPLEMENTED, "");
-    }
-    void RequestAjTables(::grpc::ServerContext* context, ::io::deephaven::proto::backplane::grpc::AjRajTablesRequest* request, ::grpc::ServerAsyncResponseWriter< ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse>* response, ::grpc::CompletionQueue* new_call_cq, ::grpc::ServerCompletionQueue* notification_cq, void *tag) {
-      ::grpc::Service::RequestAsyncUnary(27, context, request, response, new_call_cq, notification_cq, tag);
-    }
-  };
-  template <class BaseClass>
-  class WithAsyncMethod_RajTables : public BaseClass {
-   private:
-    void BaseClassMustBeDerivedFromService(const Service* /*service*/) {}
-   public:
-    WithAsyncMethod_RajTables() {
-      ::grpc::Service::MarkMethodAsync(28);
-    }
-    ~WithAsyncMethod_RajTables() override {
-      BaseClassMustBeDerivedFromService(this);
-    }
-    // disable synchronous version of this method
-    ::grpc::Status RajTables(::grpc::ServerContext* /*context*/, const ::io::deephaven::proto::backplane::grpc::AjRajTablesRequest* /*request*/, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse* /*response*/) override {
-      abort();
-      return ::grpc::Status(::grpc::StatusCode::UNIMPLEMENTED, "");
-    }
-    void RequestRajTables(::grpc::ServerContext* context, ::io::deephaven::proto::backplane::grpc::AjRajTablesRequest* request, ::grpc::ServerAsyncResponseWriter< ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse>* response, ::grpc::CompletionQueue* new_call_cq, ::grpc::ServerCompletionQueue* notification_cq, void *tag) {
-      ::grpc::Service::RequestAsyncUnary(28, context, request, response, new_call_cq, notification_cq, tag);
-    }
-  };
-  template <class BaseClass>
-  class WithAsyncMethod_MultiJoinTables : public BaseClass {
-   private:
-    void BaseClassMustBeDerivedFromService(const Service* /*service*/) {}
-   public:
-    WithAsyncMethod_MultiJoinTables() {
-      ::grpc::Service::MarkMethodAsync(29);
-    }
-    ~WithAsyncMethod_MultiJoinTables() override {
-      BaseClassMustBeDerivedFromService(this);
-    }
-    // disable synchronous version of this method
-    ::grpc::Status MultiJoinTables(::grpc::ServerContext* /*context*/, const ::io::deephaven::proto::backplane::grpc::MultiJoinTablesRequest* /*request*/, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse* /*response*/) override {
-      abort();
-      return ::grpc::Status(::grpc::StatusCode::UNIMPLEMENTED, "");
-    }
-    void RequestMultiJoinTables(::grpc::ServerContext* context, ::io::deephaven::proto::backplane::grpc::MultiJoinTablesRequest* request, ::grpc::ServerAsyncResponseWriter< ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse>* response, ::grpc::CompletionQueue* new_call_cq, ::grpc::ServerCompletionQueue* notification_cq, void *tag) {
-      ::grpc::Service::RequestAsyncUnary(29, context, request, response, new_call_cq, notification_cq, tag);
-    }
-  };
-  template <class BaseClass>
-  class WithAsyncMethod_RangeJoinTables : public BaseClass {
-   private:
-    void BaseClassMustBeDerivedFromService(const Service* /*service*/) {}
-   public:
-    WithAsyncMethod_RangeJoinTables() {
-      ::grpc::Service::MarkMethodAsync(30);
-    }
-    ~WithAsyncMethod_RangeJoinTables() override {
-      BaseClassMustBeDerivedFromService(this);
-    }
-    // disable synchronous version of this method
-    ::grpc::Status RangeJoinTables(::grpc::ServerContext* /*context*/, const ::io::deephaven::proto::backplane::grpc::RangeJoinTablesRequest* /*request*/, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse* /*response*/) override {
-      abort();
-      return ::grpc::Status(::grpc::StatusCode::UNIMPLEMENTED, "");
-    }
-    void RequestRangeJoinTables(::grpc::ServerContext* context, ::io::deephaven::proto::backplane::grpc::RangeJoinTablesRequest* request, ::grpc::ServerAsyncResponseWriter< ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse>* response, ::grpc::CompletionQueue* new_call_cq, ::grpc::ServerCompletionQueue* notification_cq, void *tag) {
-      ::grpc::Service::RequestAsyncUnary(30, context, request, response, new_call_cq, notification_cq, tag);
-    }
-  };
-  template <class BaseClass>
-  class WithAsyncMethod_ComboAggregate : public BaseClass {
-   private:
-    void BaseClassMustBeDerivedFromService(const Service* /*service*/) {}
-   public:
-    WithAsyncMethod_ComboAggregate() {
-      ::grpc::Service::MarkMethodAsync(31);
-    }
-    ~WithAsyncMethod_ComboAggregate() override {
-      BaseClassMustBeDerivedFromService(this);
-    }
-    // disable synchronous version of this method
-    ::grpc::Status ComboAggregate(::grpc::ServerContext* /*context*/, const ::io::deephaven::proto::backplane::grpc::ComboAggregateRequest* /*request*/, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse* /*response*/) override {
-      abort();
-      return ::grpc::Status(::grpc::StatusCode::UNIMPLEMENTED, "");
-    }
-    void RequestComboAggregate(::grpc::ServerContext* context, ::io::deephaven::proto::backplane::grpc::ComboAggregateRequest* request, ::grpc::ServerAsyncResponseWriter< ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse>* response, ::grpc::CompletionQueue* new_call_cq, ::grpc::ServerCompletionQueue* notification_cq, void *tag) {
-      ::grpc::Service::RequestAsyncUnary(31, context, request, response, new_call_cq, notification_cq, tag);
-    }
-  };
-  template <class BaseClass>
-  class WithAsyncMethod_AggregateAll : public BaseClass {
-   private:
-    void BaseClassMustBeDerivedFromService(const Service* /*service*/) {}
-   public:
-    WithAsyncMethod_AggregateAll() {
-      ::grpc::Service::MarkMethodAsync(32);
-    }
-    ~WithAsyncMethod_AggregateAll() override {
-      BaseClassMustBeDerivedFromService(this);
-    }
-    // disable synchronous version of this method
-    ::grpc::Status AggregateAll(::grpc::ServerContext* /*context*/, const ::io::deephaven::proto::backplane::grpc::AggregateAllRequest* /*request*/, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse* /*response*/) override {
-      abort();
-      return ::grpc::Status(::grpc::StatusCode::UNIMPLEMENTED, "");
-    }
-    void RequestAggregateAll(::grpc::ServerContext* context, ::io::deephaven::proto::backplane::grpc::AggregateAllRequest* request, ::grpc::ServerAsyncResponseWriter< ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse>* response, ::grpc::CompletionQueue* new_call_cq, ::grpc::ServerCompletionQueue* notification_cq, void *tag) {
-      ::grpc::Service::RequestAsyncUnary(32, context, request, response, new_call_cq, notification_cq, tag);
-    }
-  };
-  template <class BaseClass>
-  class WithAsyncMethod_Aggregate : public BaseClass {
-   private:
-    void BaseClassMustBeDerivedFromService(const Service* /*service*/) {}
-   public:
-    WithAsyncMethod_Aggregate() {
-      ::grpc::Service::MarkMethodAsync(33);
-    }
-    ~WithAsyncMethod_Aggregate() override {
-      BaseClassMustBeDerivedFromService(this);
-    }
-    // disable synchronous version of this method
-    ::grpc::Status Aggregate(::grpc::ServerContext* /*context*/, const ::io::deephaven::proto::backplane::grpc::AggregateRequest* /*request*/, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse* /*response*/) override {
-      abort();
-      return ::grpc::Status(::grpc::StatusCode::UNIMPLEMENTED, "");
-    }
-    void RequestAggregate(::grpc::ServerContext* context, ::io::deephaven::proto::backplane::grpc::AggregateRequest* request, ::grpc::ServerAsyncResponseWriter< ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse>* response, ::grpc::CompletionQueue* new_call_cq, ::grpc::ServerCompletionQueue* notification_cq, void *tag) {
-      ::grpc::Service::RequestAsyncUnary(33, context, request, response, new_call_cq, notification_cq, tag);
-    }
-  };
-  template <class BaseClass>
-  class WithAsyncMethod_Snapshot : public BaseClass {
-   private:
-    void BaseClassMustBeDerivedFromService(const Service* /*service*/) {}
-   public:
-    WithAsyncMethod_Snapshot() {
-      ::grpc::Service::MarkMethodAsync(34);
-    }
-    ~WithAsyncMethod_Snapshot() override {
-      BaseClassMustBeDerivedFromService(this);
-    }
-    // disable synchronous version of this method
-    ::grpc::Status Snapshot(::grpc::ServerContext* /*context*/, const ::io::deephaven::proto::backplane::grpc::SnapshotTableRequest* /*request*/, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse* /*response*/) override {
-      abort();
-      return ::grpc::Status(::grpc::StatusCode::UNIMPLEMENTED, "");
-    }
-    void RequestSnapshot(::grpc::ServerContext* context, ::io::deephaven::proto::backplane::grpc::SnapshotTableRequest* request, ::grpc::ServerAsyncResponseWriter< ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse>* response, ::grpc::CompletionQueue* new_call_cq, ::grpc::ServerCompletionQueue* notification_cq, void *tag) {
-      ::grpc::Service::RequestAsyncUnary(34, context, request, response, new_call_cq, notification_cq, tag);
-    }
-  };
-  template <class BaseClass>
-  class WithAsyncMethod_SnapshotWhen : public BaseClass {
-   private:
-    void BaseClassMustBeDerivedFromService(const Service* /*service*/) {}
-   public:
-    WithAsyncMethod_SnapshotWhen() {
-      ::grpc::Service::MarkMethodAsync(35);
-    }
-    ~WithAsyncMethod_SnapshotWhen() override {
-      BaseClassMustBeDerivedFromService(this);
-    }
-    // disable synchronous version of this method
-    ::grpc::Status SnapshotWhen(::grpc::ServerContext* /*context*/, const ::io::deephaven::proto::backplane::grpc::SnapshotWhenTableRequest* /*request*/, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse* /*response*/) override {
-      abort();
-      return ::grpc::Status(::grpc::StatusCode::UNIMPLEMENTED, "");
-    }
-    void RequestSnapshotWhen(::grpc::ServerContext* context, ::io::deephaven::proto::backplane::grpc::SnapshotWhenTableRequest* request, ::grpc::ServerAsyncResponseWriter< ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse>* response, ::grpc::CompletionQueue* new_call_cq, ::grpc::ServerCompletionQueue* notification_cq, void *tag) {
-      ::grpc::Service::RequestAsyncUnary(35, context, request, response, new_call_cq, notification_cq, tag);
-    }
-  };
-  template <class BaseClass>
-  class WithAsyncMethod_Flatten : public BaseClass {
-   private:
-    void BaseClassMustBeDerivedFromService(const Service* /*service*/) {}
-   public:
-    WithAsyncMethod_Flatten() {
-      ::grpc::Service::MarkMethodAsync(36);
-    }
-    ~WithAsyncMethod_Flatten() override {
-      BaseClassMustBeDerivedFromService(this);
-    }
-    // disable synchronous version of this method
-    ::grpc::Status Flatten(::grpc::ServerContext* /*context*/, const ::io::deephaven::proto::backplane::grpc::FlattenRequest* /*request*/, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse* /*response*/) override {
-      abort();
-      return ::grpc::Status(::grpc::StatusCode::UNIMPLEMENTED, "");
-    }
-    void RequestFlatten(::grpc::ServerContext* context, ::io::deephaven::proto::backplane::grpc::FlattenRequest* request, ::grpc::ServerAsyncResponseWriter< ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse>* response, ::grpc::CompletionQueue* new_call_cq, ::grpc::ServerCompletionQueue* notification_cq, void *tag) {
-      ::grpc::Service::RequestAsyncUnary(36, context, request, response, new_call_cq, notification_cq, tag);
-    }
-  };
-  template <class BaseClass>
-  class WithAsyncMethod_RunChartDownsample : public BaseClass {
-   private:
-    void BaseClassMustBeDerivedFromService(const Service* /*service*/) {}
-   public:
-    WithAsyncMethod_RunChartDownsample() {
-      ::grpc::Service::MarkMethodAsync(37);
-    }
-    ~WithAsyncMethod_RunChartDownsample() override {
-      BaseClassMustBeDerivedFromService(this);
-    }
-    // disable synchronous version of this method
-    ::grpc::Status RunChartDownsample(::grpc::ServerContext* /*context*/, const ::io::deephaven::proto::backplane::grpc::RunChartDownsampleRequest* /*request*/, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse* /*response*/) override {
-      abort();
-      return ::grpc::Status(::grpc::StatusCode::UNIMPLEMENTED, "");
-    }
-    void RequestRunChartDownsample(::grpc::ServerContext* context, ::io::deephaven::proto::backplane::grpc::RunChartDownsampleRequest* request, ::grpc::ServerAsyncResponseWriter< ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse>* response, ::grpc::CompletionQueue* new_call_cq, ::grpc::ServerCompletionQueue* notification_cq, void *tag) {
-      ::grpc::Service::RequestAsyncUnary(37, context, request, response, new_call_cq, notification_cq, tag);
-    }
-  };
-  template <class BaseClass>
-  class WithAsyncMethod_CreateInputTable : public BaseClass {
-   private:
-    void BaseClassMustBeDerivedFromService(const Service* /*service*/) {}
-   public:
-    WithAsyncMethod_CreateInputTable() {
-      ::grpc::Service::MarkMethodAsync(38);
-    }
-    ~WithAsyncMethod_CreateInputTable() override {
-      BaseClassMustBeDerivedFromService(this);
-    }
-    // disable synchronous version of this method
-    ::grpc::Status CreateInputTable(::grpc::ServerContext* /*context*/, const ::io::deephaven::proto::backplane::grpc::CreateInputTableRequest* /*request*/, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse* /*response*/) override {
-      abort();
-      return ::grpc::Status(::grpc::StatusCode::UNIMPLEMENTED, "");
-    }
-    void RequestCreateInputTable(::grpc::ServerContext* context, ::io::deephaven::proto::backplane::grpc::CreateInputTableRequest* request, ::grpc::ServerAsyncResponseWriter< ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse>* response, ::grpc::CompletionQueue* new_call_cq, ::grpc::ServerCompletionQueue* notification_cq, void *tag) {
-      ::grpc::Service::RequestAsyncUnary(38, context, request, response, new_call_cq, notification_cq, tag);
-    }
-  };
-  template <class BaseClass>
-  class WithAsyncMethod_WhereIn : public BaseClass {
-   private:
-    void BaseClassMustBeDerivedFromService(const Service* /*service*/) {}
-   public:
-    WithAsyncMethod_WhereIn() {
-      ::grpc::Service::MarkMethodAsync(39);
-    }
-    ~WithAsyncMethod_WhereIn() override {
-      BaseClassMustBeDerivedFromService(this);
-    }
-    // disable synchronous version of this method
-    ::grpc::Status WhereIn(::grpc::ServerContext* /*context*/, const ::io::deephaven::proto::backplane::grpc::WhereInRequest* /*request*/, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse* /*response*/) override {
-      abort();
-      return ::grpc::Status(::grpc::StatusCode::UNIMPLEMENTED, "");
-    }
-    void RequestWhereIn(::grpc::ServerContext* context, ::io::deephaven::proto::backplane::grpc::WhereInRequest* request, ::grpc::ServerAsyncResponseWriter< ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse>* response, ::grpc::CompletionQueue* new_call_cq, ::grpc::ServerCompletionQueue* notification_cq, void *tag) {
-      ::grpc::Service::RequestAsyncUnary(39, context, request, response, new_call_cq, notification_cq, tag);
-    }
-  };
-  template <class BaseClass>
-  class WithAsyncMethod_Batch : public BaseClass {
-   private:
-    void BaseClassMustBeDerivedFromService(const Service* /*service*/) {}
-   public:
-    WithAsyncMethod_Batch() {
-      ::grpc::Service::MarkMethodAsync(40);
-    }
-    ~WithAsyncMethod_Batch() override {
-      BaseClassMustBeDerivedFromService(this);
-    }
-    // disable synchronous version of this method
-    ::grpc::Status Batch(::grpc::ServerContext* /*context*/, const ::io::deephaven::proto::backplane::grpc::BatchTableRequest* /*request*/, ::grpc::ServerWriter< ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse>* /*writer*/) override {
-      abort();
-      return ::grpc::Status(::grpc::StatusCode::UNIMPLEMENTED, "");
-    }
-    void RequestBatch(::grpc::ServerContext* context, ::io::deephaven::proto::backplane::grpc::BatchTableRequest* request, ::grpc::ServerAsyncWriter< ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse>* writer, ::grpc::CompletionQueue* new_call_cq, ::grpc::ServerCompletionQueue* notification_cq, void *tag) {
-      ::grpc::Service::RequestAsyncServerStreaming(40, context, request, writer, new_call_cq, notification_cq, tag);
-    }
-  };
-  template <class BaseClass>
-  class WithAsyncMethod_ExportedTableUpdates : public BaseClass {
-   private:
-    void BaseClassMustBeDerivedFromService(const Service* /*service*/) {}
-   public:
-    WithAsyncMethod_ExportedTableUpdates() {
-      ::grpc::Service::MarkMethodAsync(41);
-    }
-    ~WithAsyncMethod_ExportedTableUpdates() override {
-      BaseClassMustBeDerivedFromService(this);
-    }
-    // disable synchronous version of this method
-    ::grpc::Status ExportedTableUpdates(::grpc::ServerContext* /*context*/, const ::io::deephaven::proto::backplane::grpc::ExportedTableUpdatesRequest* /*request*/, ::grpc::ServerWriter< ::io::deephaven::proto::backplane::grpc::ExportedTableUpdateMessage>* /*writer*/) override {
-      abort();
-      return ::grpc::Status(::grpc::StatusCode::UNIMPLEMENTED, "");
-    }
-    void RequestExportedTableUpdates(::grpc::ServerContext* context, ::io::deephaven::proto::backplane::grpc::ExportedTableUpdatesRequest* request, ::grpc::ServerAsyncWriter< ::io::deephaven::proto::backplane::grpc::ExportedTableUpdateMessage>* writer, ::grpc::CompletionQueue* new_call_cq, ::grpc::ServerCompletionQueue* notification_cq, void *tag) {
-      ::grpc::Service::RequestAsyncServerStreaming(41, context, request, writer, new_call_cq, notification_cq, tag);
-    }
-  };
-  template <class BaseClass>
-  class WithAsyncMethod_SeekRow : public BaseClass {
-   private:
-    void BaseClassMustBeDerivedFromService(const Service* /*service*/) {}
-   public:
-    WithAsyncMethod_SeekRow() {
-      ::grpc::Service::MarkMethodAsync(42);
-    }
-    ~WithAsyncMethod_SeekRow() override {
-      BaseClassMustBeDerivedFromService(this);
-    }
-    // disable synchronous version of this method
-    ::grpc::Status SeekRow(::grpc::ServerContext* /*context*/, const ::io::deephaven::proto::backplane::grpc::SeekRowRequest* /*request*/, ::io::deephaven::proto::backplane::grpc::SeekRowResponse* /*response*/) override {
-      abort();
-      return ::grpc::Status(::grpc::StatusCode::UNIMPLEMENTED, "");
-    }
-    void RequestSeekRow(::grpc::ServerContext* context, ::io::deephaven::proto::backplane::grpc::SeekRowRequest* request, ::grpc::ServerAsyncResponseWriter< ::io::deephaven::proto::backplane::grpc::SeekRowResponse>* response, ::grpc::CompletionQueue* new_call_cq, ::grpc::ServerCompletionQueue* notification_cq, void *tag) {
-      ::grpc::Service::RequestAsyncUnary(42, context, request, response, new_call_cq, notification_cq, tag);
-    }
-  };
-  template <class BaseClass>
-  class WithAsyncMethod_MetaTable : public BaseClass {
-   private:
-    void BaseClassMustBeDerivedFromService(const Service* /*service*/) {}
-   public:
-    WithAsyncMethod_MetaTable() {
-      ::grpc::Service::MarkMethodAsync(43);
-    }
-    ~WithAsyncMethod_MetaTable() override {
-      BaseClassMustBeDerivedFromService(this);
-    }
-    // disable synchronous version of this method
-    ::grpc::Status MetaTable(::grpc::ServerContext* /*context*/, const ::io::deephaven::proto::backplane::grpc::MetaTableRequest* /*request*/, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse* /*response*/) override {
-      abort();
-      return ::grpc::Status(::grpc::StatusCode::UNIMPLEMENTED, "");
-    }
-    void RequestMetaTable(::grpc::ServerContext* context, ::io::deephaven::proto::backplane::grpc::MetaTableRequest* request, ::grpc::ServerAsyncResponseWriter< ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse>* response, ::grpc::CompletionQueue* new_call_cq, ::grpc::ServerCompletionQueue* notification_cq, void *tag) {
-      ::grpc::Service::RequestAsyncUnary(43, context, request, response, new_call_cq, notification_cq, tag);
-    }
-  };
-  template <class BaseClass>
-  class WithAsyncMethod_ComputeColumnStatistics : public BaseClass {
-   private:
-    void BaseClassMustBeDerivedFromService(const Service* /*service*/) {}
-   public:
-    WithAsyncMethod_ComputeColumnStatistics() {
-      ::grpc::Service::MarkMethodAsync(44);
-    }
-    ~WithAsyncMethod_ComputeColumnStatistics() override {
-      BaseClassMustBeDerivedFromService(this);
-    }
-    // disable synchronous version of this method
-    ::grpc::Status ComputeColumnStatistics(::grpc::ServerContext* /*context*/, const ::io::deephaven::proto::backplane::grpc::ColumnStatisticsRequest* /*request*/, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse* /*response*/) override {
-      abort();
-      return ::grpc::Status(::grpc::StatusCode::UNIMPLEMENTED, "");
-    }
-    void RequestComputeColumnStatistics(::grpc::ServerContext* context, ::io::deephaven::proto::backplane::grpc::ColumnStatisticsRequest* request, ::grpc::ServerAsyncResponseWriter< ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse>* response, ::grpc::CompletionQueue* new_call_cq, ::grpc::ServerCompletionQueue* notification_cq, void *tag) {
-      ::grpc::Service::RequestAsyncUnary(44, context, request, response, new_call_cq, notification_cq, tag);
-    }
-  };
-  typedef WithAsyncMethod_GetExportedTableCreationResponse<WithAsyncMethod_FetchTable<WithAsyncMethod_ApplyPreviewColumns<WithAsyncMethod_EmptyTable<WithAsyncMethod_TimeTable<WithAsyncMethod_DropColumns<WithAsyncMethod_Update<WithAsyncMethod_LazyUpdate<WithAsyncMethod_View<WithAsyncMethod_UpdateView<WithAsyncMethod_Select<WithAsyncMethod_UpdateBy<WithAsyncMethod_SelectDistinct<WithAsyncMethod_Filter<WithAsyncMethod_UnstructuredFilter<WithAsyncMethod_Sort<WithAsyncMethod_Head<WithAsyncMethod_Tail<WithAsyncMethod_HeadBy<WithAsyncMethod_TailBy<WithAsyncMethod_Ungroup<WithAsyncMethod_MergeTables<WithAsyncMethod_CrossJoinTables<WithAsyncMethod_NaturalJoinTables<WithAsyncMethod_ExactJoinTables<WithAsyncMethod_LeftJoinTables<WithAsyncMethod_AsOfJoinTables<WithAsyncMethod_AjTables<WithAsyncMethod_RajTables<WithAsyncMethod_MultiJoinTables<WithAsyncMethod_RangeJoinTables<WithAsyncMethod_ComboAggregate<WithAsyncMethod_AggregateAll<WithAsyncMethod_Aggregate<WithAsyncMethod_Snapshot<WithAsyncMethod_SnapshotWhen<WithAsyncMethod_Flatten<WithAsyncMethod_RunChartDownsample<WithAsyncMethod_CreateInputTable<WithAsyncMethod_WhereIn<WithAsyncMethod_Batch<WithAsyncMethod_ExportedTableUpdates<WithAsyncMethod_SeekRow<WithAsyncMethod_MetaTable<WithAsyncMethod_ComputeColumnStatistics<Service > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > AsyncService;
-  template <class BaseClass>
-  class WithCallbackMethod_GetExportedTableCreationResponse : public BaseClass {
-   private:
-    void BaseClassMustBeDerivedFromService(const Service* /*service*/) {}
-   public:
-    WithCallbackMethod_GetExportedTableCreationResponse() {
-      ::grpc::Service::MarkMethodCallback(0,
-          new ::grpc::internal::CallbackUnaryHandler< ::io::deephaven::proto::backplane::grpc::Ticket, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse>(
-            [this](
-                   ::grpc::CallbackServerContext* context, const ::io::deephaven::proto::backplane::grpc::Ticket* request, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse* response) { return this->GetExportedTableCreationResponse(context, request, response); }));}
-    void SetMessageAllocatorFor_GetExportedTableCreationResponse(
-        ::grpc::MessageAllocator< ::io::deephaven::proto::backplane::grpc::Ticket, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse>* allocator) {
-      ::grpc::internal::MethodHandler* const handler = ::grpc::Service::GetHandler(0);
-      static_cast<::grpc::internal::CallbackUnaryHandler< ::io::deephaven::proto::backplane::grpc::Ticket, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse>*>(handler)
-              ->SetMessageAllocator(allocator);
-    }
-    ~WithCallbackMethod_GetExportedTableCreationResponse() override {
-      BaseClassMustBeDerivedFromService(this);
-    }
-    // disable synchronous version of this method
-    ::grpc::Status GetExportedTableCreationResponse(::grpc::ServerContext* /*context*/, const ::io::deephaven::proto::backplane::grpc::Ticket* /*request*/, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse* /*response*/) override {
-      abort();
-      return ::grpc::Status(::grpc::StatusCode::UNIMPLEMENTED, "");
-    }
-    virtual ::grpc::ServerUnaryReactor* GetExportedTableCreationResponse(
-      ::grpc::CallbackServerContext* /*context*/, const ::io::deephaven::proto::backplane::grpc::Ticket* /*request*/, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse* /*response*/)  { return nullptr; }
-  };
-  template <class BaseClass>
-  class WithCallbackMethod_FetchTable : public BaseClass {
-   private:
-    void BaseClassMustBeDerivedFromService(const Service* /*service*/) {}
-   public:
-    WithCallbackMethod_FetchTable() {
-      ::grpc::Service::MarkMethodCallback(1,
-          new ::grpc::internal::CallbackUnaryHandler< ::io::deephaven::proto::backplane::grpc::FetchTableRequest, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse>(
-            [this](
-                   ::grpc::CallbackServerContext* context, const ::io::deephaven::proto::backplane::grpc::FetchTableRequest* request, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse* response) { return this->FetchTable(context, request, response); }));}
-    void SetMessageAllocatorFor_FetchTable(
-        ::grpc::MessageAllocator< ::io::deephaven::proto::backplane::grpc::FetchTableRequest, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse>* allocator) {
-      ::grpc::internal::MethodHandler* const handler = ::grpc::Service::GetHandler(1);
-      static_cast<::grpc::internal::CallbackUnaryHandler< ::io::deephaven::proto::backplane::grpc::FetchTableRequest, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse>*>(handler)
-              ->SetMessageAllocator(allocator);
-    }
-    ~WithCallbackMethod_FetchTable() override {
-      BaseClassMustBeDerivedFromService(this);
-    }
-    // disable synchronous version of this method
-    ::grpc::Status FetchTable(::grpc::ServerContext* /*context*/, const ::io::deephaven::proto::backplane::grpc::FetchTableRequest* /*request*/, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse* /*response*/) override {
-      abort();
-      return ::grpc::Status(::grpc::StatusCode::UNIMPLEMENTED, "");
-    }
-    virtual ::grpc::ServerUnaryReactor* FetchTable(
-      ::grpc::CallbackServerContext* /*context*/, const ::io::deephaven::proto::backplane::grpc::FetchTableRequest* /*request*/, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse* /*response*/)  { return nullptr; }
-  };
-  template <class BaseClass>
-  class WithCallbackMethod_ApplyPreviewColumns : public BaseClass {
-   private:
-    void BaseClassMustBeDerivedFromService(const Service* /*service*/) {}
-   public:
-    WithCallbackMethod_ApplyPreviewColumns() {
-      ::grpc::Service::MarkMethodCallback(2,
-          new ::grpc::internal::CallbackUnaryHandler< ::io::deephaven::proto::backplane::grpc::ApplyPreviewColumnsRequest, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse>(
-            [this](
-                   ::grpc::CallbackServerContext* context, const ::io::deephaven::proto::backplane::grpc::ApplyPreviewColumnsRequest* request, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse* response) { return this->ApplyPreviewColumns(context, request, response); }));}
-    void SetMessageAllocatorFor_ApplyPreviewColumns(
-        ::grpc::MessageAllocator< ::io::deephaven::proto::backplane::grpc::ApplyPreviewColumnsRequest, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse>* allocator) {
-      ::grpc::internal::MethodHandler* const handler = ::grpc::Service::GetHandler(2);
-      static_cast<::grpc::internal::CallbackUnaryHandler< ::io::deephaven::proto::backplane::grpc::ApplyPreviewColumnsRequest, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse>*>(handler)
-              ->SetMessageAllocator(allocator);
-    }
-    ~WithCallbackMethod_ApplyPreviewColumns() override {
-      BaseClassMustBeDerivedFromService(this);
-    }
-    // disable synchronous version of this method
-    ::grpc::Status ApplyPreviewColumns(::grpc::ServerContext* /*context*/, const ::io::deephaven::proto::backplane::grpc::ApplyPreviewColumnsRequest* /*request*/, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse* /*response*/) override {
-      abort();
-      return ::grpc::Status(::grpc::StatusCode::UNIMPLEMENTED, "");
-    }
-    virtual ::grpc::ServerUnaryReactor* ApplyPreviewColumns(
-      ::grpc::CallbackServerContext* /*context*/, const ::io::deephaven::proto::backplane::grpc::ApplyPreviewColumnsRequest* /*request*/, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse* /*response*/)  { return nullptr; }
-  };
-  template <class BaseClass>
-  class WithCallbackMethod_EmptyTable : public BaseClass {
-   private:
-    void BaseClassMustBeDerivedFromService(const Service* /*service*/) {}
-   public:
-    WithCallbackMethod_EmptyTable() {
-      ::grpc::Service::MarkMethodCallback(3,
-          new ::grpc::internal::CallbackUnaryHandler< ::io::deephaven::proto::backplane::grpc::EmptyTableRequest, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse>(
-            [this](
-                   ::grpc::CallbackServerContext* context, const ::io::deephaven::proto::backplane::grpc::EmptyTableRequest* request, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse* response) { return this->EmptyTable(context, request, response); }));}
-    void SetMessageAllocatorFor_EmptyTable(
-        ::grpc::MessageAllocator< ::io::deephaven::proto::backplane::grpc::EmptyTableRequest, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse>* allocator) {
-      ::grpc::internal::MethodHandler* const handler = ::grpc::Service::GetHandler(3);
-      static_cast<::grpc::internal::CallbackUnaryHandler< ::io::deephaven::proto::backplane::grpc::EmptyTableRequest, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse>*>(handler)
-              ->SetMessageAllocator(allocator);
-    }
-    ~WithCallbackMethod_EmptyTable() override {
-      BaseClassMustBeDerivedFromService(this);
-    }
-    // disable synchronous version of this method
-    ::grpc::Status EmptyTable(::grpc::ServerContext* /*context*/, const ::io::deephaven::proto::backplane::grpc::EmptyTableRequest* /*request*/, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse* /*response*/) override {
-      abort();
-      return ::grpc::Status(::grpc::StatusCode::UNIMPLEMENTED, "");
-    }
-    virtual ::grpc::ServerUnaryReactor* EmptyTable(
-      ::grpc::CallbackServerContext* /*context*/, const ::io::deephaven::proto::backplane::grpc::EmptyTableRequest* /*request*/, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse* /*response*/)  { return nullptr; }
-  };
-  template <class BaseClass>
-  class WithCallbackMethod_TimeTable : public BaseClass {
-   private:
-    void BaseClassMustBeDerivedFromService(const Service* /*service*/) {}
-   public:
-    WithCallbackMethod_TimeTable() {
-      ::grpc::Service::MarkMethodCallback(4,
-          new ::grpc::internal::CallbackUnaryHandler< ::io::deephaven::proto::backplane::grpc::TimeTableRequest, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse>(
-            [this](
-                   ::grpc::CallbackServerContext* context, const ::io::deephaven::proto::backplane::grpc::TimeTableRequest* request, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse* response) { return this->TimeTable(context, request, response); }));}
-    void SetMessageAllocatorFor_TimeTable(
-        ::grpc::MessageAllocator< ::io::deephaven::proto::backplane::grpc::TimeTableRequest, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse>* allocator) {
-      ::grpc::internal::MethodHandler* const handler = ::grpc::Service::GetHandler(4);
-      static_cast<::grpc::internal::CallbackUnaryHandler< ::io::deephaven::proto::backplane::grpc::TimeTableRequest, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse>*>(handler)
-              ->SetMessageAllocator(allocator);
-    }
-    ~WithCallbackMethod_TimeTable() override {
-      BaseClassMustBeDerivedFromService(this);
-    }
-    // disable synchronous version of this method
-    ::grpc::Status TimeTable(::grpc::ServerContext* /*context*/, const ::io::deephaven::proto::backplane::grpc::TimeTableRequest* /*request*/, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse* /*response*/) override {
-      abort();
-      return ::grpc::Status(::grpc::StatusCode::UNIMPLEMENTED, "");
-    }
-    virtual ::grpc::ServerUnaryReactor* TimeTable(
-      ::grpc::CallbackServerContext* /*context*/, const ::io::deephaven::proto::backplane::grpc::TimeTableRequest* /*request*/, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse* /*response*/)  { return nullptr; }
-  };
-  template <class BaseClass>
-  class WithCallbackMethod_DropColumns : public BaseClass {
-   private:
-    void BaseClassMustBeDerivedFromService(const Service* /*service*/) {}
-   public:
-    WithCallbackMethod_DropColumns() {
-      ::grpc::Service::MarkMethodCallback(5,
-          new ::grpc::internal::CallbackUnaryHandler< ::io::deephaven::proto::backplane::grpc::DropColumnsRequest, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse>(
-            [this](
-                   ::grpc::CallbackServerContext* context, const ::io::deephaven::proto::backplane::grpc::DropColumnsRequest* request, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse* response) { return this->DropColumns(context, request, response); }));}
-    void SetMessageAllocatorFor_DropColumns(
-        ::grpc::MessageAllocator< ::io::deephaven::proto::backplane::grpc::DropColumnsRequest, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse>* allocator) {
-      ::grpc::internal::MethodHandler* const handler = ::grpc::Service::GetHandler(5);
-      static_cast<::grpc::internal::CallbackUnaryHandler< ::io::deephaven::proto::backplane::grpc::DropColumnsRequest, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse>*>(handler)
-              ->SetMessageAllocator(allocator);
-    }
-    ~WithCallbackMethod_DropColumns() override {
-      BaseClassMustBeDerivedFromService(this);
-    }
-    // disable synchronous version of this method
-    ::grpc::Status DropColumns(::grpc::ServerContext* /*context*/, const ::io::deephaven::proto::backplane::grpc::DropColumnsRequest* /*request*/, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse* /*response*/) override {
-      abort();
-      return ::grpc::Status(::grpc::StatusCode::UNIMPLEMENTED, "");
-    }
-    virtual ::grpc::ServerUnaryReactor* DropColumns(
-      ::grpc::CallbackServerContext* /*context*/, const ::io::deephaven::proto::backplane::grpc::DropColumnsRequest* /*request*/, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse* /*response*/)  { return nullptr; }
-  };
-  template <class BaseClass>
-  class WithCallbackMethod_Update : public BaseClass {
-   private:
-    void BaseClassMustBeDerivedFromService(const Service* /*service*/) {}
-   public:
-    WithCallbackMethod_Update() {
-      ::grpc::Service::MarkMethodCallback(6,
-          new ::grpc::internal::CallbackUnaryHandler< ::io::deephaven::proto::backplane::grpc::SelectOrUpdateRequest, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse>(
-            [this](
-                   ::grpc::CallbackServerContext* context, const ::io::deephaven::proto::backplane::grpc::SelectOrUpdateRequest* request, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse* response) { return this->Update(context, request, response); }));}
-    void SetMessageAllocatorFor_Update(
-        ::grpc::MessageAllocator< ::io::deephaven::proto::backplane::grpc::SelectOrUpdateRequest, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse>* allocator) {
-      ::grpc::internal::MethodHandler* const handler = ::grpc::Service::GetHandler(6);
-      static_cast<::grpc::internal::CallbackUnaryHandler< ::io::deephaven::proto::backplane::grpc::SelectOrUpdateRequest, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse>*>(handler)
-              ->SetMessageAllocator(allocator);
-    }
-    ~WithCallbackMethod_Update() override {
-      BaseClassMustBeDerivedFromService(this);
-    }
-    // disable synchronous version of this method
-    ::grpc::Status Update(::grpc::ServerContext* /*context*/, const ::io::deephaven::proto::backplane::grpc::SelectOrUpdateRequest* /*request*/, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse* /*response*/) override {
-      abort();
-      return ::grpc::Status(::grpc::StatusCode::UNIMPLEMENTED, "");
-    }
-    virtual ::grpc::ServerUnaryReactor* Update(
-      ::grpc::CallbackServerContext* /*context*/, const ::io::deephaven::proto::backplane::grpc::SelectOrUpdateRequest* /*request*/, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse* /*response*/)  { return nullptr; }
-  };
-  template <class BaseClass>
-  class WithCallbackMethod_LazyUpdate : public BaseClass {
-   private:
-    void BaseClassMustBeDerivedFromService(const Service* /*service*/) {}
-   public:
-    WithCallbackMethod_LazyUpdate() {
-      ::grpc::Service::MarkMethodCallback(7,
-          new ::grpc::internal::CallbackUnaryHandler< ::io::deephaven::proto::backplane::grpc::SelectOrUpdateRequest, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse>(
-            [this](
-                   ::grpc::CallbackServerContext* context, const ::io::deephaven::proto::backplane::grpc::SelectOrUpdateRequest* request, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse* response) { return this->LazyUpdate(context, request, response); }));}
-    void SetMessageAllocatorFor_LazyUpdate(
-        ::grpc::MessageAllocator< ::io::deephaven::proto::backplane::grpc::SelectOrUpdateRequest, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse>* allocator) {
-      ::grpc::internal::MethodHandler* const handler = ::grpc::Service::GetHandler(7);
-      static_cast<::grpc::internal::CallbackUnaryHandler< ::io::deephaven::proto::backplane::grpc::SelectOrUpdateRequest, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse>*>(handler)
-              ->SetMessageAllocator(allocator);
-    }
-    ~WithCallbackMethod_LazyUpdate() override {
-      BaseClassMustBeDerivedFromService(this);
-    }
-    // disable synchronous version of this method
-    ::grpc::Status LazyUpdate(::grpc::ServerContext* /*context*/, const ::io::deephaven::proto::backplane::grpc::SelectOrUpdateRequest* /*request*/, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse* /*response*/) override {
-      abort();
-      return ::grpc::Status(::grpc::StatusCode::UNIMPLEMENTED, "");
-    }
-    virtual ::grpc::ServerUnaryReactor* LazyUpdate(
-      ::grpc::CallbackServerContext* /*context*/, const ::io::deephaven::proto::backplane::grpc::SelectOrUpdateRequest* /*request*/, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse* /*response*/)  { return nullptr; }
-  };
-  template <class BaseClass>
-  class WithCallbackMethod_View : public BaseClass {
-   private:
-    void BaseClassMustBeDerivedFromService(const Service* /*service*/) {}
-   public:
-    WithCallbackMethod_View() {
-      ::grpc::Service::MarkMethodCallback(8,
-          new ::grpc::internal::CallbackUnaryHandler< ::io::deephaven::proto::backplane::grpc::SelectOrUpdateRequest, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse>(
-            [this](
-                   ::grpc::CallbackServerContext* context, const ::io::deephaven::proto::backplane::grpc::SelectOrUpdateRequest* request, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse* response) { return this->View(context, request, response); }));}
-    void SetMessageAllocatorFor_View(
-        ::grpc::MessageAllocator< ::io::deephaven::proto::backplane::grpc::SelectOrUpdateRequest, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse>* allocator) {
-      ::grpc::internal::MethodHandler* const handler = ::grpc::Service::GetHandler(8);
-      static_cast<::grpc::internal::CallbackUnaryHandler< ::io::deephaven::proto::backplane::grpc::SelectOrUpdateRequest, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse>*>(handler)
-              ->SetMessageAllocator(allocator);
-    }
-    ~WithCallbackMethod_View() override {
-      BaseClassMustBeDerivedFromService(this);
-    }
-    // disable synchronous version of this method
-    ::grpc::Status View(::grpc::ServerContext* /*context*/, const ::io::deephaven::proto::backplane::grpc::SelectOrUpdateRequest* /*request*/, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse* /*response*/) override {
-      abort();
-      return ::grpc::Status(::grpc::StatusCode::UNIMPLEMENTED, "");
-    }
-    virtual ::grpc::ServerUnaryReactor* View(
-      ::grpc::CallbackServerContext* /*context*/, const ::io::deephaven::proto::backplane::grpc::SelectOrUpdateRequest* /*request*/, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse* /*response*/)  { return nullptr; }
-  };
-  template <class BaseClass>
-  class WithCallbackMethod_UpdateView : public BaseClass {
-   private:
-    void BaseClassMustBeDerivedFromService(const Service* /*service*/) {}
-   public:
-    WithCallbackMethod_UpdateView() {
-      ::grpc::Service::MarkMethodCallback(9,
-          new ::grpc::internal::CallbackUnaryHandler< ::io::deephaven::proto::backplane::grpc::SelectOrUpdateRequest, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse>(
-            [this](
-                   ::grpc::CallbackServerContext* context, const ::io::deephaven::proto::backplane::grpc::SelectOrUpdateRequest* request, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse* response) { return this->UpdateView(context, request, response); }));}
-    void SetMessageAllocatorFor_UpdateView(
-        ::grpc::MessageAllocator< ::io::deephaven::proto::backplane::grpc::SelectOrUpdateRequest, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse>* allocator) {
-      ::grpc::internal::MethodHandler* const handler = ::grpc::Service::GetHandler(9);
-      static_cast<::grpc::internal::CallbackUnaryHandler< ::io::deephaven::proto::backplane::grpc::SelectOrUpdateRequest, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse>*>(handler)
-              ->SetMessageAllocator(allocator);
-    }
-    ~WithCallbackMethod_UpdateView() override {
-      BaseClassMustBeDerivedFromService(this);
-    }
-    // disable synchronous version of this method
-    ::grpc::Status UpdateView(::grpc::ServerContext* /*context*/, const ::io::deephaven::proto::backplane::grpc::SelectOrUpdateRequest* /*request*/, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse* /*response*/) override {
-      abort();
-      return ::grpc::Status(::grpc::StatusCode::UNIMPLEMENTED, "");
-    }
-    virtual ::grpc::ServerUnaryReactor* UpdateView(
-      ::grpc::CallbackServerContext* /*context*/, const ::io::deephaven::proto::backplane::grpc::SelectOrUpdateRequest* /*request*/, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse* /*response*/)  { return nullptr; }
-  };
-  template <class BaseClass>
-  class WithCallbackMethod_Select : public BaseClass {
-   private:
-    void BaseClassMustBeDerivedFromService(const Service* /*service*/) {}
-   public:
-    WithCallbackMethod_Select() {
-      ::grpc::Service::MarkMethodCallback(10,
-          new ::grpc::internal::CallbackUnaryHandler< ::io::deephaven::proto::backplane::grpc::SelectOrUpdateRequest, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse>(
-            [this](
-                   ::grpc::CallbackServerContext* context, const ::io::deephaven::proto::backplane::grpc::SelectOrUpdateRequest* request, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse* response) { return this->Select(context, request, response); }));}
-    void SetMessageAllocatorFor_Select(
-        ::grpc::MessageAllocator< ::io::deephaven::proto::backplane::grpc::SelectOrUpdateRequest, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse>* allocator) {
-      ::grpc::internal::MethodHandler* const handler = ::grpc::Service::GetHandler(10);
-      static_cast<::grpc::internal::CallbackUnaryHandler< ::io::deephaven::proto::backplane::grpc::SelectOrUpdateRequest, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse>*>(handler)
-              ->SetMessageAllocator(allocator);
-    }
-    ~WithCallbackMethod_Select() override {
-      BaseClassMustBeDerivedFromService(this);
-    }
-    // disable synchronous version of this method
-    ::grpc::Status Select(::grpc::ServerContext* /*context*/, const ::io::deephaven::proto::backplane::grpc::SelectOrUpdateRequest* /*request*/, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse* /*response*/) override {
-      abort();
-      return ::grpc::Status(::grpc::StatusCode::UNIMPLEMENTED, "");
-    }
-    virtual ::grpc::ServerUnaryReactor* Select(
-      ::grpc::CallbackServerContext* /*context*/, const ::io::deephaven::proto::backplane::grpc::SelectOrUpdateRequest* /*request*/, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse* /*response*/)  { return nullptr; }
-  };
-  template <class BaseClass>
-  class WithCallbackMethod_UpdateBy : public BaseClass {
-   private:
-    void BaseClassMustBeDerivedFromService(const Service* /*service*/) {}
-   public:
-    WithCallbackMethod_UpdateBy() {
-      ::grpc::Service::MarkMethodCallback(11,
-          new ::grpc::internal::CallbackUnaryHandler< ::io::deephaven::proto::backplane::grpc::UpdateByRequest, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse>(
-            [this](
-                   ::grpc::CallbackServerContext* context, const ::io::deephaven::proto::backplane::grpc::UpdateByRequest* request, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse* response) { return this->UpdateBy(context, request, response); }));}
-    void SetMessageAllocatorFor_UpdateBy(
-        ::grpc::MessageAllocator< ::io::deephaven::proto::backplane::grpc::UpdateByRequest, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse>* allocator) {
-      ::grpc::internal::MethodHandler* const handler = ::grpc::Service::GetHandler(11);
-      static_cast<::grpc::internal::CallbackUnaryHandler< ::io::deephaven::proto::backplane::grpc::UpdateByRequest, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse>*>(handler)
-              ->SetMessageAllocator(allocator);
-    }
-    ~WithCallbackMethod_UpdateBy() override {
-      BaseClassMustBeDerivedFromService(this);
-    }
-    // disable synchronous version of this method
-    ::grpc::Status UpdateBy(::grpc::ServerContext* /*context*/, const ::io::deephaven::proto::backplane::grpc::UpdateByRequest* /*request*/, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse* /*response*/) override {
-      abort();
-      return ::grpc::Status(::grpc::StatusCode::UNIMPLEMENTED, "");
-    }
-    virtual ::grpc::ServerUnaryReactor* UpdateBy(
-      ::grpc::CallbackServerContext* /*context*/, const ::io::deephaven::proto::backplane::grpc::UpdateByRequest* /*request*/, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse* /*response*/)  { return nullptr; }
-  };
-  template <class BaseClass>
-  class WithCallbackMethod_SelectDistinct : public BaseClass {
-   private:
-    void BaseClassMustBeDerivedFromService(const Service* /*service*/) {}
-   public:
-    WithCallbackMethod_SelectDistinct() {
-      ::grpc::Service::MarkMethodCallback(12,
-          new ::grpc::internal::CallbackUnaryHandler< ::io::deephaven::proto::backplane::grpc::SelectDistinctRequest, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse>(
-            [this](
-                   ::grpc::CallbackServerContext* context, const ::io::deephaven::proto::backplane::grpc::SelectDistinctRequest* request, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse* response) { return this->SelectDistinct(context, request, response); }));}
-    void SetMessageAllocatorFor_SelectDistinct(
-        ::grpc::MessageAllocator< ::io::deephaven::proto::backplane::grpc::SelectDistinctRequest, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse>* allocator) {
-      ::grpc::internal::MethodHandler* const handler = ::grpc::Service::GetHandler(12);
-      static_cast<::grpc::internal::CallbackUnaryHandler< ::io::deephaven::proto::backplane::grpc::SelectDistinctRequest, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse>*>(handler)
-              ->SetMessageAllocator(allocator);
-    }
-    ~WithCallbackMethod_SelectDistinct() override {
-      BaseClassMustBeDerivedFromService(this);
-    }
-    // disable synchronous version of this method
-    ::grpc::Status SelectDistinct(::grpc::ServerContext* /*context*/, const ::io::deephaven::proto::backplane::grpc::SelectDistinctRequest* /*request*/, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse* /*response*/) override {
-      abort();
-      return ::grpc::Status(::grpc::StatusCode::UNIMPLEMENTED, "");
-    }
-    virtual ::grpc::ServerUnaryReactor* SelectDistinct(
-      ::grpc::CallbackServerContext* /*context*/, const ::io::deephaven::proto::backplane::grpc::SelectDistinctRequest* /*request*/, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse* /*response*/)  { return nullptr; }
-  };
-  template <class BaseClass>
-  class WithCallbackMethod_Filter : public BaseClass {
-   private:
-    void BaseClassMustBeDerivedFromService(const Service* /*service*/) {}
-   public:
-    WithCallbackMethod_Filter() {
-      ::grpc::Service::MarkMethodCallback(13,
-          new ::grpc::internal::CallbackUnaryHandler< ::io::deephaven::proto::backplane::grpc::FilterTableRequest, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse>(
-            [this](
-                   ::grpc::CallbackServerContext* context, const ::io::deephaven::proto::backplane::grpc::FilterTableRequest* request, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse* response) { return this->Filter(context, request, response); }));}
-    void SetMessageAllocatorFor_Filter(
-        ::grpc::MessageAllocator< ::io::deephaven::proto::backplane::grpc::FilterTableRequest, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse>* allocator) {
-      ::grpc::internal::MethodHandler* const handler = ::grpc::Service::GetHandler(13);
-      static_cast<::grpc::internal::CallbackUnaryHandler< ::io::deephaven::proto::backplane::grpc::FilterTableRequest, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse>*>(handler)
-              ->SetMessageAllocator(allocator);
-    }
-    ~WithCallbackMethod_Filter() override {
-      BaseClassMustBeDerivedFromService(this);
-    }
-    // disable synchronous version of this method
-    ::grpc::Status Filter(::grpc::ServerContext* /*context*/, const ::io::deephaven::proto::backplane::grpc::FilterTableRequest* /*request*/, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse* /*response*/) override {
-      abort();
-      return ::grpc::Status(::grpc::StatusCode::UNIMPLEMENTED, "");
-    }
-    virtual ::grpc::ServerUnaryReactor* Filter(
-      ::grpc::CallbackServerContext* /*context*/, const ::io::deephaven::proto::backplane::grpc::FilterTableRequest* /*request*/, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse* /*response*/)  { return nullptr; }
-  };
-  template <class BaseClass>
-  class WithCallbackMethod_UnstructuredFilter : public BaseClass {
-   private:
-    void BaseClassMustBeDerivedFromService(const Service* /*service*/) {}
-   public:
-    WithCallbackMethod_UnstructuredFilter() {
-      ::grpc::Service::MarkMethodCallback(14,
-          new ::grpc::internal::CallbackUnaryHandler< ::io::deephaven::proto::backplane::grpc::UnstructuredFilterTableRequest, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse>(
-            [this](
-                   ::grpc::CallbackServerContext* context, const ::io::deephaven::proto::backplane::grpc::UnstructuredFilterTableRequest* request, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse* response) { return this->UnstructuredFilter(context, request, response); }));}
-    void SetMessageAllocatorFor_UnstructuredFilter(
-        ::grpc::MessageAllocator< ::io::deephaven::proto::backplane::grpc::UnstructuredFilterTableRequest, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse>* allocator) {
-      ::grpc::internal::MethodHandler* const handler = ::grpc::Service::GetHandler(14);
-      static_cast<::grpc::internal::CallbackUnaryHandler< ::io::deephaven::proto::backplane::grpc::UnstructuredFilterTableRequest, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse>*>(handler)
-              ->SetMessageAllocator(allocator);
-    }
-    ~WithCallbackMethod_UnstructuredFilter() override {
-      BaseClassMustBeDerivedFromService(this);
-    }
-    // disable synchronous version of this method
-    ::grpc::Status UnstructuredFilter(::grpc::ServerContext* /*context*/, const ::io::deephaven::proto::backplane::grpc::UnstructuredFilterTableRequest* /*request*/, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse* /*response*/) override {
-      abort();
-      return ::grpc::Status(::grpc::StatusCode::UNIMPLEMENTED, "");
-    }
-    virtual ::grpc::ServerUnaryReactor* UnstructuredFilter(
-      ::grpc::CallbackServerContext* /*context*/, const ::io::deephaven::proto::backplane::grpc::UnstructuredFilterTableRequest* /*request*/, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse* /*response*/)  { return nullptr; }
-  };
-  template <class BaseClass>
-  class WithCallbackMethod_Sort : public BaseClass {
-   private:
-    void BaseClassMustBeDerivedFromService(const Service* /*service*/) {}
-   public:
-    WithCallbackMethod_Sort() {
-      ::grpc::Service::MarkMethodCallback(15,
-          new ::grpc::internal::CallbackUnaryHandler< ::io::deephaven::proto::backplane::grpc::SortTableRequest, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse>(
-            [this](
-                   ::grpc::CallbackServerContext* context, const ::io::deephaven::proto::backplane::grpc::SortTableRequest* request, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse* response) { return this->Sort(context, request, response); }));}
-    void SetMessageAllocatorFor_Sort(
-        ::grpc::MessageAllocator< ::io::deephaven::proto::backplane::grpc::SortTableRequest, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse>* allocator) {
-      ::grpc::internal::MethodHandler* const handler = ::grpc::Service::GetHandler(15);
-      static_cast<::grpc::internal::CallbackUnaryHandler< ::io::deephaven::proto::backplane::grpc::SortTableRequest, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse>*>(handler)
-              ->SetMessageAllocator(allocator);
-    }
-    ~WithCallbackMethod_Sort() override {
-      BaseClassMustBeDerivedFromService(this);
-    }
-    // disable synchronous version of this method
-    ::grpc::Status Sort(::grpc::ServerContext* /*context*/, const ::io::deephaven::proto::backplane::grpc::SortTableRequest* /*request*/, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse* /*response*/) override {
-      abort();
-      return ::grpc::Status(::grpc::StatusCode::UNIMPLEMENTED, "");
-    }
-    virtual ::grpc::ServerUnaryReactor* Sort(
-      ::grpc::CallbackServerContext* /*context*/, const ::io::deephaven::proto::backplane::grpc::SortTableRequest* /*request*/, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse* /*response*/)  { return nullptr; }
-  };
-  template <class BaseClass>
-  class WithCallbackMethod_Head : public BaseClass {
-   private:
-    void BaseClassMustBeDerivedFromService(const Service* /*service*/) {}
-   public:
-    WithCallbackMethod_Head() {
-      ::grpc::Service::MarkMethodCallback(16,
-          new ::grpc::internal::CallbackUnaryHandler< ::io::deephaven::proto::backplane::grpc::HeadOrTailRequest, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse>(
-            [this](
-                   ::grpc::CallbackServerContext* context, const ::io::deephaven::proto::backplane::grpc::HeadOrTailRequest* request, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse* response) { return this->Head(context, request, response); }));}
-    void SetMessageAllocatorFor_Head(
-        ::grpc::MessageAllocator< ::io::deephaven::proto::backplane::grpc::HeadOrTailRequest, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse>* allocator) {
-      ::grpc::internal::MethodHandler* const handler = ::grpc::Service::GetHandler(16);
-      static_cast<::grpc::internal::CallbackUnaryHandler< ::io::deephaven::proto::backplane::grpc::HeadOrTailRequest, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse>*>(handler)
-              ->SetMessageAllocator(allocator);
-    }
-    ~WithCallbackMethod_Head() override {
-      BaseClassMustBeDerivedFromService(this);
-    }
-    // disable synchronous version of this method
-    ::grpc::Status Head(::grpc::ServerContext* /*context*/, const ::io::deephaven::proto::backplane::grpc::HeadOrTailRequest* /*request*/, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse* /*response*/) override {
-      abort();
-      return ::grpc::Status(::grpc::StatusCode::UNIMPLEMENTED, "");
-    }
-    virtual ::grpc::ServerUnaryReactor* Head(
-      ::grpc::CallbackServerContext* /*context*/, const ::io::deephaven::proto::backplane::grpc::HeadOrTailRequest* /*request*/, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse* /*response*/)  { return nullptr; }
-  };
-  template <class BaseClass>
-  class WithCallbackMethod_Tail : public BaseClass {
-   private:
-    void BaseClassMustBeDerivedFromService(const Service* /*service*/) {}
-   public:
-    WithCallbackMethod_Tail() {
-      ::grpc::Service::MarkMethodCallback(17,
-          new ::grpc::internal::CallbackUnaryHandler< ::io::deephaven::proto::backplane::grpc::HeadOrTailRequest, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse>(
-            [this](
-                   ::grpc::CallbackServerContext* context, const ::io::deephaven::proto::backplane::grpc::HeadOrTailRequest* request, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse* response) { return this->Tail(context, request, response); }));}
-    void SetMessageAllocatorFor_Tail(
-        ::grpc::MessageAllocator< ::io::deephaven::proto::backplane::grpc::HeadOrTailRequest, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse>* allocator) {
-      ::grpc::internal::MethodHandler* const handler = ::grpc::Service::GetHandler(17);
-      static_cast<::grpc::internal::CallbackUnaryHandler< ::io::deephaven::proto::backplane::grpc::HeadOrTailRequest, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse>*>(handler)
-              ->SetMessageAllocator(allocator);
-    }
-    ~WithCallbackMethod_Tail() override {
-      BaseClassMustBeDerivedFromService(this);
-    }
-    // disable synchronous version of this method
-    ::grpc::Status Tail(::grpc::ServerContext* /*context*/, const ::io::deephaven::proto::backplane::grpc::HeadOrTailRequest* /*request*/, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse* /*response*/) override {
-      abort();
-      return ::grpc::Status(::grpc::StatusCode::UNIMPLEMENTED, "");
-    }
-    virtual ::grpc::ServerUnaryReactor* Tail(
-      ::grpc::CallbackServerContext* /*context*/, const ::io::deephaven::proto::backplane::grpc::HeadOrTailRequest* /*request*/, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse* /*response*/)  { return nullptr; }
-  };
-  template <class BaseClass>
-  class WithCallbackMethod_HeadBy : public BaseClass {
-   private:
-    void BaseClassMustBeDerivedFromService(const Service* /*service*/) {}
-   public:
-    WithCallbackMethod_HeadBy() {
-      ::grpc::Service::MarkMethodCallback(18,
-          new ::grpc::internal::CallbackUnaryHandler< ::io::deephaven::proto::backplane::grpc::HeadOrTailByRequest, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse>(
-            [this](
-                   ::grpc::CallbackServerContext* context, const ::io::deephaven::proto::backplane::grpc::HeadOrTailByRequest* request, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse* response) { return this->HeadBy(context, request, response); }));}
-    void SetMessageAllocatorFor_HeadBy(
-        ::grpc::MessageAllocator< ::io::deephaven::proto::backplane::grpc::HeadOrTailByRequest, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse>* allocator) {
-      ::grpc::internal::MethodHandler* const handler = ::grpc::Service::GetHandler(18);
-      static_cast<::grpc::internal::CallbackUnaryHandler< ::io::deephaven::proto::backplane::grpc::HeadOrTailByRequest, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse>*>(handler)
-              ->SetMessageAllocator(allocator);
-    }
-    ~WithCallbackMethod_HeadBy() override {
-      BaseClassMustBeDerivedFromService(this);
-    }
-    // disable synchronous version of this method
-    ::grpc::Status HeadBy(::grpc::ServerContext* /*context*/, const ::io::deephaven::proto::backplane::grpc::HeadOrTailByRequest* /*request*/, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse* /*response*/) override {
-      abort();
-      return ::grpc::Status(::grpc::StatusCode::UNIMPLEMENTED, "");
-    }
-    virtual ::grpc::ServerUnaryReactor* HeadBy(
-      ::grpc::CallbackServerContext* /*context*/, const ::io::deephaven::proto::backplane::grpc::HeadOrTailByRequest* /*request*/, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse* /*response*/)  { return nullptr; }
-  };
-  template <class BaseClass>
-  class WithCallbackMethod_TailBy : public BaseClass {
-   private:
-    void BaseClassMustBeDerivedFromService(const Service* /*service*/) {}
-   public:
-    WithCallbackMethod_TailBy() {
-      ::grpc::Service::MarkMethodCallback(19,
-          new ::grpc::internal::CallbackUnaryHandler< ::io::deephaven::proto::backplane::grpc::HeadOrTailByRequest, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse>(
-            [this](
-                   ::grpc::CallbackServerContext* context, const ::io::deephaven::proto::backplane::grpc::HeadOrTailByRequest* request, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse* response) { return this->TailBy(context, request, response); }));}
-    void SetMessageAllocatorFor_TailBy(
-        ::grpc::MessageAllocator< ::io::deephaven::proto::backplane::grpc::HeadOrTailByRequest, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse>* allocator) {
-      ::grpc::internal::MethodHandler* const handler = ::grpc::Service::GetHandler(19);
-      static_cast<::grpc::internal::CallbackUnaryHandler< ::io::deephaven::proto::backplane::grpc::HeadOrTailByRequest, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse>*>(handler)
-              ->SetMessageAllocator(allocator);
-    }
-    ~WithCallbackMethod_TailBy() override {
-      BaseClassMustBeDerivedFromService(this);
-    }
-    // disable synchronous version of this method
-    ::grpc::Status TailBy(::grpc::ServerContext* /*context*/, const ::io::deephaven::proto::backplane::grpc::HeadOrTailByRequest* /*request*/, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse* /*response*/) override {
-      abort();
-      return ::grpc::Status(::grpc::StatusCode::UNIMPLEMENTED, "");
-    }
-    virtual ::grpc::ServerUnaryReactor* TailBy(
-      ::grpc::CallbackServerContext* /*context*/, const ::io::deephaven::proto::backplane::grpc::HeadOrTailByRequest* /*request*/, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse* /*response*/)  { return nullptr; }
-  };
-  template <class BaseClass>
-  class WithCallbackMethod_Ungroup : public BaseClass {
-   private:
-    void BaseClassMustBeDerivedFromService(const Service* /*service*/) {}
-   public:
-    WithCallbackMethod_Ungroup() {
-      ::grpc::Service::MarkMethodCallback(20,
-          new ::grpc::internal::CallbackUnaryHandler< ::io::deephaven::proto::backplane::grpc::UngroupRequest, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse>(
-            [this](
-                   ::grpc::CallbackServerContext* context, const ::io::deephaven::proto::backplane::grpc::UngroupRequest* request, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse* response) { return this->Ungroup(context, request, response); }));}
-    void SetMessageAllocatorFor_Ungroup(
-        ::grpc::MessageAllocator< ::io::deephaven::proto::backplane::grpc::UngroupRequest, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse>* allocator) {
-      ::grpc::internal::MethodHandler* const handler = ::grpc::Service::GetHandler(20);
-      static_cast<::grpc::internal::CallbackUnaryHandler< ::io::deephaven::proto::backplane::grpc::UngroupRequest, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse>*>(handler)
-              ->SetMessageAllocator(allocator);
-    }
-    ~WithCallbackMethod_Ungroup() override {
-      BaseClassMustBeDerivedFromService(this);
-    }
-    // disable synchronous version of this method
-    ::grpc::Status Ungroup(::grpc::ServerContext* /*context*/, const ::io::deephaven::proto::backplane::grpc::UngroupRequest* /*request*/, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse* /*response*/) override {
-      abort();
-      return ::grpc::Status(::grpc::StatusCode::UNIMPLEMENTED, "");
-    }
-    virtual ::grpc::ServerUnaryReactor* Ungroup(
-      ::grpc::CallbackServerContext* /*context*/, const ::io::deephaven::proto::backplane::grpc::UngroupRequest* /*request*/, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse* /*response*/)  { return nullptr; }
-  };
-  template <class BaseClass>
-  class WithCallbackMethod_MergeTables : public BaseClass {
-   private:
-    void BaseClassMustBeDerivedFromService(const Service* /*service*/) {}
-   public:
-    WithCallbackMethod_MergeTables() {
-      ::grpc::Service::MarkMethodCallback(21,
-          new ::grpc::internal::CallbackUnaryHandler< ::io::deephaven::proto::backplane::grpc::MergeTablesRequest, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse>(
-            [this](
-                   ::grpc::CallbackServerContext* context, const ::io::deephaven::proto::backplane::grpc::MergeTablesRequest* request, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse* response) { return this->MergeTables(context, request, response); }));}
-    void SetMessageAllocatorFor_MergeTables(
-        ::grpc::MessageAllocator< ::io::deephaven::proto::backplane::grpc::MergeTablesRequest, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse>* allocator) {
-      ::grpc::internal::MethodHandler* const handler = ::grpc::Service::GetHandler(21);
-      static_cast<::grpc::internal::CallbackUnaryHandler< ::io::deephaven::proto::backplane::grpc::MergeTablesRequest, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse>*>(handler)
-              ->SetMessageAllocator(allocator);
-    }
-    ~WithCallbackMethod_MergeTables() override {
-      BaseClassMustBeDerivedFromService(this);
-    }
-    // disable synchronous version of this method
-    ::grpc::Status MergeTables(::grpc::ServerContext* /*context*/, const ::io::deephaven::proto::backplane::grpc::MergeTablesRequest* /*request*/, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse* /*response*/) override {
-      abort();
-      return ::grpc::Status(::grpc::StatusCode::UNIMPLEMENTED, "");
-    }
-    virtual ::grpc::ServerUnaryReactor* MergeTables(
-      ::grpc::CallbackServerContext* /*context*/, const ::io::deephaven::proto::backplane::grpc::MergeTablesRequest* /*request*/, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse* /*response*/)  { return nullptr; }
-  };
-  template <class BaseClass>
-  class WithCallbackMethod_CrossJoinTables : public BaseClass {
-   private:
-    void BaseClassMustBeDerivedFromService(const Service* /*service*/) {}
-   public:
-    WithCallbackMethod_CrossJoinTables() {
-      ::grpc::Service::MarkMethodCallback(22,
-          new ::grpc::internal::CallbackUnaryHandler< ::io::deephaven::proto::backplane::grpc::CrossJoinTablesRequest, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse>(
-            [this](
-                   ::grpc::CallbackServerContext* context, const ::io::deephaven::proto::backplane::grpc::CrossJoinTablesRequest* request, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse* response) { return this->CrossJoinTables(context, request, response); }));}
-    void SetMessageAllocatorFor_CrossJoinTables(
-        ::grpc::MessageAllocator< ::io::deephaven::proto::backplane::grpc::CrossJoinTablesRequest, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse>* allocator) {
-      ::grpc::internal::MethodHandler* const handler = ::grpc::Service::GetHandler(22);
-      static_cast<::grpc::internal::CallbackUnaryHandler< ::io::deephaven::proto::backplane::grpc::CrossJoinTablesRequest, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse>*>(handler)
-              ->SetMessageAllocator(allocator);
-    }
-    ~WithCallbackMethod_CrossJoinTables() override {
-      BaseClassMustBeDerivedFromService(this);
-    }
-    // disable synchronous version of this method
-    ::grpc::Status CrossJoinTables(::grpc::ServerContext* /*context*/, const ::io::deephaven::proto::backplane::grpc::CrossJoinTablesRequest* /*request*/, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse* /*response*/) override {
-      abort();
-      return ::grpc::Status(::grpc::StatusCode::UNIMPLEMENTED, "");
-    }
-    virtual ::grpc::ServerUnaryReactor* CrossJoinTables(
-      ::grpc::CallbackServerContext* /*context*/, const ::io::deephaven::proto::backplane::grpc::CrossJoinTablesRequest* /*request*/, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse* /*response*/)  { return nullptr; }
-  };
-  template <class BaseClass>
-  class WithCallbackMethod_NaturalJoinTables : public BaseClass {
-   private:
-    void BaseClassMustBeDerivedFromService(const Service* /*service*/) {}
-   public:
-    WithCallbackMethod_NaturalJoinTables() {
-      ::grpc::Service::MarkMethodCallback(23,
-          new ::grpc::internal::CallbackUnaryHandler< ::io::deephaven::proto::backplane::grpc::NaturalJoinTablesRequest, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse>(
-            [this](
-                   ::grpc::CallbackServerContext* context, const ::io::deephaven::proto::backplane::grpc::NaturalJoinTablesRequest* request, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse* response) { return this->NaturalJoinTables(context, request, response); }));}
-    void SetMessageAllocatorFor_NaturalJoinTables(
-        ::grpc::MessageAllocator< ::io::deephaven::proto::backplane::grpc::NaturalJoinTablesRequest, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse>* allocator) {
-      ::grpc::internal::MethodHandler* const handler = ::grpc::Service::GetHandler(23);
-      static_cast<::grpc::internal::CallbackUnaryHandler< ::io::deephaven::proto::backplane::grpc::NaturalJoinTablesRequest, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse>*>(handler)
-              ->SetMessageAllocator(allocator);
-    }
-    ~WithCallbackMethod_NaturalJoinTables() override {
-      BaseClassMustBeDerivedFromService(this);
-    }
-    // disable synchronous version of this method
-    ::grpc::Status NaturalJoinTables(::grpc::ServerContext* /*context*/, const ::io::deephaven::proto::backplane::grpc::NaturalJoinTablesRequest* /*request*/, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse* /*response*/) override {
-      abort();
-      return ::grpc::Status(::grpc::StatusCode::UNIMPLEMENTED, "");
-    }
-    virtual ::grpc::ServerUnaryReactor* NaturalJoinTables(
-      ::grpc::CallbackServerContext* /*context*/, const ::io::deephaven::proto::backplane::grpc::NaturalJoinTablesRequest* /*request*/, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse* /*response*/)  { return nullptr; }
-  };
-  template <class BaseClass>
-  class WithCallbackMethod_ExactJoinTables : public BaseClass {
-   private:
-    void BaseClassMustBeDerivedFromService(const Service* /*service*/) {}
-   public:
-    WithCallbackMethod_ExactJoinTables() {
-      ::grpc::Service::MarkMethodCallback(24,
-          new ::grpc::internal::CallbackUnaryHandler< ::io::deephaven::proto::backplane::grpc::ExactJoinTablesRequest, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse>(
-            [this](
-                   ::grpc::CallbackServerContext* context, const ::io::deephaven::proto::backplane::grpc::ExactJoinTablesRequest* request, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse* response) { return this->ExactJoinTables(context, request, response); }));}
-    void SetMessageAllocatorFor_ExactJoinTables(
-        ::grpc::MessageAllocator< ::io::deephaven::proto::backplane::grpc::ExactJoinTablesRequest, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse>* allocator) {
-      ::grpc::internal::MethodHandler* const handler = ::grpc::Service::GetHandler(24);
-      static_cast<::grpc::internal::CallbackUnaryHandler< ::io::deephaven::proto::backplane::grpc::ExactJoinTablesRequest, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse>*>(handler)
-              ->SetMessageAllocator(allocator);
-    }
-    ~WithCallbackMethod_ExactJoinTables() override {
-      BaseClassMustBeDerivedFromService(this);
-    }
-    // disable synchronous version of this method
-    ::grpc::Status ExactJoinTables(::grpc::ServerContext* /*context*/, const ::io::deephaven::proto::backplane::grpc::ExactJoinTablesRequest* /*request*/, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse* /*response*/) override {
-      abort();
-      return ::grpc::Status(::grpc::StatusCode::UNIMPLEMENTED, "");
-    }
-    virtual ::grpc::ServerUnaryReactor* ExactJoinTables(
-      ::grpc::CallbackServerContext* /*context*/, const ::io::deephaven::proto::backplane::grpc::ExactJoinTablesRequest* /*request*/, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse* /*response*/)  { return nullptr; }
-  };
-  template <class BaseClass>
-  class WithCallbackMethod_LeftJoinTables : public BaseClass {
-   private:
-    void BaseClassMustBeDerivedFromService(const Service* /*service*/) {}
-   public:
-    WithCallbackMethod_LeftJoinTables() {
-      ::grpc::Service::MarkMethodCallback(25,
-          new ::grpc::internal::CallbackUnaryHandler< ::io::deephaven::proto::backplane::grpc::LeftJoinTablesRequest, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse>(
-            [this](
-                   ::grpc::CallbackServerContext* context, const ::io::deephaven::proto::backplane::grpc::LeftJoinTablesRequest* request, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse* response) { return this->LeftJoinTables(context, request, response); }));}
-    void SetMessageAllocatorFor_LeftJoinTables(
-        ::grpc::MessageAllocator< ::io::deephaven::proto::backplane::grpc::LeftJoinTablesRequest, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse>* allocator) {
-      ::grpc::internal::MethodHandler* const handler = ::grpc::Service::GetHandler(25);
-      static_cast<::grpc::internal::CallbackUnaryHandler< ::io::deephaven::proto::backplane::grpc::LeftJoinTablesRequest, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse>*>(handler)
-              ->SetMessageAllocator(allocator);
-    }
-    ~WithCallbackMethod_LeftJoinTables() override {
-      BaseClassMustBeDerivedFromService(this);
-    }
-    // disable synchronous version of this method
-    ::grpc::Status LeftJoinTables(::grpc::ServerContext* /*context*/, const ::io::deephaven::proto::backplane::grpc::LeftJoinTablesRequest* /*request*/, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse* /*response*/) override {
-      abort();
-      return ::grpc::Status(::grpc::StatusCode::UNIMPLEMENTED, "");
-    }
-    virtual ::grpc::ServerUnaryReactor* LeftJoinTables(
-      ::grpc::CallbackServerContext* /*context*/, const ::io::deephaven::proto::backplane::grpc::LeftJoinTablesRequest* /*request*/, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse* /*response*/)  { return nullptr; }
-  };
-  template <class BaseClass>
-  class WithCallbackMethod_AsOfJoinTables : public BaseClass {
-   private:
-    void BaseClassMustBeDerivedFromService(const Service* /*service*/) {}
-   public:
-    WithCallbackMethod_AsOfJoinTables() {
-      ::grpc::Service::MarkMethodCallback(26,
-          new ::grpc::internal::CallbackUnaryHandler< ::io::deephaven::proto::backplane::grpc::AsOfJoinTablesRequest, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse>(
-            [this](
-                   ::grpc::CallbackServerContext* context, const ::io::deephaven::proto::backplane::grpc::AsOfJoinTablesRequest* request, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse* response) { return this->AsOfJoinTables(context, request, response); }));}
-    void SetMessageAllocatorFor_AsOfJoinTables(
-        ::grpc::MessageAllocator< ::io::deephaven::proto::backplane::grpc::AsOfJoinTablesRequest, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse>* allocator) {
-      ::grpc::internal::MethodHandler* const handler = ::grpc::Service::GetHandler(26);
-      static_cast<::grpc::internal::CallbackUnaryHandler< ::io::deephaven::proto::backplane::grpc::AsOfJoinTablesRequest, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse>*>(handler)
-              ->SetMessageAllocator(allocator);
-    }
-    ~WithCallbackMethod_AsOfJoinTables() override {
-      BaseClassMustBeDerivedFromService(this);
-    }
-    // disable synchronous version of this method
-    ::grpc::Status AsOfJoinTables(::grpc::ServerContext* /*context*/, const ::io::deephaven::proto::backplane::grpc::AsOfJoinTablesRequest* /*request*/, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse* /*response*/) override {
-      abort();
-      return ::grpc::Status(::grpc::StatusCode::UNIMPLEMENTED, "");
-    }
-    virtual ::grpc::ServerUnaryReactor* AsOfJoinTables(
-      ::grpc::CallbackServerContext* /*context*/, const ::io::deephaven::proto::backplane::grpc::AsOfJoinTablesRequest* /*request*/, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse* /*response*/)  { return nullptr; }
-  };
-  template <class BaseClass>
-  class WithCallbackMethod_AjTables : public BaseClass {
-   private:
-    void BaseClassMustBeDerivedFromService(const Service* /*service*/) {}
-   public:
-    WithCallbackMethod_AjTables() {
-      ::grpc::Service::MarkMethodCallback(27,
-          new ::grpc::internal::CallbackUnaryHandler< ::io::deephaven::proto::backplane::grpc::AjRajTablesRequest, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse>(
-            [this](
-                   ::grpc::CallbackServerContext* context, const ::io::deephaven::proto::backplane::grpc::AjRajTablesRequest* request, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse* response) { return this->AjTables(context, request, response); }));}
-    void SetMessageAllocatorFor_AjTables(
-        ::grpc::MessageAllocator< ::io::deephaven::proto::backplane::grpc::AjRajTablesRequest, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse>* allocator) {
-      ::grpc::internal::MethodHandler* const handler = ::grpc::Service::GetHandler(27);
-      static_cast<::grpc::internal::CallbackUnaryHandler< ::io::deephaven::proto::backplane::grpc::AjRajTablesRequest, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse>*>(handler)
-              ->SetMessageAllocator(allocator);
-    }
-    ~WithCallbackMethod_AjTables() override {
-      BaseClassMustBeDerivedFromService(this);
-    }
-    // disable synchronous version of this method
-    ::grpc::Status AjTables(::grpc::ServerContext* /*context*/, const ::io::deephaven::proto::backplane::grpc::AjRajTablesRequest* /*request*/, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse* /*response*/) override {
-      abort();
-      return ::grpc::Status(::grpc::StatusCode::UNIMPLEMENTED, "");
-    }
-    virtual ::grpc::ServerUnaryReactor* AjTables(
-      ::grpc::CallbackServerContext* /*context*/, const ::io::deephaven::proto::backplane::grpc::AjRajTablesRequest* /*request*/, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse* /*response*/)  { return nullptr; }
-  };
-  template <class BaseClass>
-  class WithCallbackMethod_RajTables : public BaseClass {
-   private:
-    void BaseClassMustBeDerivedFromService(const Service* /*service*/) {}
-   public:
-    WithCallbackMethod_RajTables() {
-      ::grpc::Service::MarkMethodCallback(28,
-          new ::grpc::internal::CallbackUnaryHandler< ::io::deephaven::proto::backplane::grpc::AjRajTablesRequest, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse>(
-            [this](
-                   ::grpc::CallbackServerContext* context, const ::io::deephaven::proto::backplane::grpc::AjRajTablesRequest* request, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse* response) { return this->RajTables(context, request, response); }));}
-    void SetMessageAllocatorFor_RajTables(
-        ::grpc::MessageAllocator< ::io::deephaven::proto::backplane::grpc::AjRajTablesRequest, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse>* allocator) {
-      ::grpc::internal::MethodHandler* const handler = ::grpc::Service::GetHandler(28);
-      static_cast<::grpc::internal::CallbackUnaryHandler< ::io::deephaven::proto::backplane::grpc::AjRajTablesRequest, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse>*>(handler)
-              ->SetMessageAllocator(allocator);
-    }
-    ~WithCallbackMethod_RajTables() override {
-      BaseClassMustBeDerivedFromService(this);
-    }
-    // disable synchronous version of this method
-    ::grpc::Status RajTables(::grpc::ServerContext* /*context*/, const ::io::deephaven::proto::backplane::grpc::AjRajTablesRequest* /*request*/, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse* /*response*/) override {
-      abort();
-      return ::grpc::Status(::grpc::StatusCode::UNIMPLEMENTED, "");
-    }
-    virtual ::grpc::ServerUnaryReactor* RajTables(
-      ::grpc::CallbackServerContext* /*context*/, const ::io::deephaven::proto::backplane::grpc::AjRajTablesRequest* /*request*/, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse* /*response*/)  { return nullptr; }
-  };
-  template <class BaseClass>
-  class WithCallbackMethod_MultiJoinTables : public BaseClass {
-   private:
-    void BaseClassMustBeDerivedFromService(const Service* /*service*/) {}
-   public:
-    WithCallbackMethod_MultiJoinTables() {
-      ::grpc::Service::MarkMethodCallback(29,
-          new ::grpc::internal::CallbackUnaryHandler< ::io::deephaven::proto::backplane::grpc::MultiJoinTablesRequest, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse>(
-            [this](
-                   ::grpc::CallbackServerContext* context, const ::io::deephaven::proto::backplane::grpc::MultiJoinTablesRequest* request, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse* response) { return this->MultiJoinTables(context, request, response); }));}
-    void SetMessageAllocatorFor_MultiJoinTables(
-        ::grpc::MessageAllocator< ::io::deephaven::proto::backplane::grpc::MultiJoinTablesRequest, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse>* allocator) {
-      ::grpc::internal::MethodHandler* const handler = ::grpc::Service::GetHandler(29);
-      static_cast<::grpc::internal::CallbackUnaryHandler< ::io::deephaven::proto::backplane::grpc::MultiJoinTablesRequest, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse>*>(handler)
-              ->SetMessageAllocator(allocator);
-    }
-    ~WithCallbackMethod_MultiJoinTables() override {
-      BaseClassMustBeDerivedFromService(this);
-    }
-    // disable synchronous version of this method
-    ::grpc::Status MultiJoinTables(::grpc::ServerContext* /*context*/, const ::io::deephaven::proto::backplane::grpc::MultiJoinTablesRequest* /*request*/, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse* /*response*/) override {
-      abort();
-      return ::grpc::Status(::grpc::StatusCode::UNIMPLEMENTED, "");
-    }
-    virtual ::grpc::ServerUnaryReactor* MultiJoinTables(
-      ::grpc::CallbackServerContext* /*context*/, const ::io::deephaven::proto::backplane::grpc::MultiJoinTablesRequest* /*request*/, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse* /*response*/)  { return nullptr; }
-  };
-  template <class BaseClass>
-  class WithCallbackMethod_RangeJoinTables : public BaseClass {
-   private:
-    void BaseClassMustBeDerivedFromService(const Service* /*service*/) {}
-   public:
-    WithCallbackMethod_RangeJoinTables() {
-      ::grpc::Service::MarkMethodCallback(30,
-          new ::grpc::internal::CallbackUnaryHandler< ::io::deephaven::proto::backplane::grpc::RangeJoinTablesRequest, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse>(
-            [this](
-                   ::grpc::CallbackServerContext* context, const ::io::deephaven::proto::backplane::grpc::RangeJoinTablesRequest* request, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse* response) { return this->RangeJoinTables(context, request, response); }));}
-    void SetMessageAllocatorFor_RangeJoinTables(
-        ::grpc::MessageAllocator< ::io::deephaven::proto::backplane::grpc::RangeJoinTablesRequest, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse>* allocator) {
-      ::grpc::internal::MethodHandler* const handler = ::grpc::Service::GetHandler(30);
-      static_cast<::grpc::internal::CallbackUnaryHandler< ::io::deephaven::proto::backplane::grpc::RangeJoinTablesRequest, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse>*>(handler)
-              ->SetMessageAllocator(allocator);
-    }
-    ~WithCallbackMethod_RangeJoinTables() override {
-      BaseClassMustBeDerivedFromService(this);
-    }
-    // disable synchronous version of this method
-    ::grpc::Status RangeJoinTables(::grpc::ServerContext* /*context*/, const ::io::deephaven::proto::backplane::grpc::RangeJoinTablesRequest* /*request*/, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse* /*response*/) override {
-      abort();
-      return ::grpc::Status(::grpc::StatusCode::UNIMPLEMENTED, "");
-    }
-    virtual ::grpc::ServerUnaryReactor* RangeJoinTables(
-      ::grpc::CallbackServerContext* /*context*/, const ::io::deephaven::proto::backplane::grpc::RangeJoinTablesRequest* /*request*/, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse* /*response*/)  { return nullptr; }
-  };
-  template <class BaseClass>
-  class WithCallbackMethod_ComboAggregate : public BaseClass {
-   private:
-    void BaseClassMustBeDerivedFromService(const Service* /*service*/) {}
-   public:
-    WithCallbackMethod_ComboAggregate() {
-      ::grpc::Service::MarkMethodCallback(31,
-          new ::grpc::internal::CallbackUnaryHandler< ::io::deephaven::proto::backplane::grpc::ComboAggregateRequest, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse>(
-            [this](
-                   ::grpc::CallbackServerContext* context, const ::io::deephaven::proto::backplane::grpc::ComboAggregateRequest* request, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse* response) { return this->ComboAggregate(context, request, response); }));}
-    void SetMessageAllocatorFor_ComboAggregate(
-        ::grpc::MessageAllocator< ::io::deephaven::proto::backplane::grpc::ComboAggregateRequest, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse>* allocator) {
-      ::grpc::internal::MethodHandler* const handler = ::grpc::Service::GetHandler(31);
-      static_cast<::grpc::internal::CallbackUnaryHandler< ::io::deephaven::proto::backplane::grpc::ComboAggregateRequest, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse>*>(handler)
-              ->SetMessageAllocator(allocator);
-    }
-    ~WithCallbackMethod_ComboAggregate() override {
-      BaseClassMustBeDerivedFromService(this);
-    }
-    // disable synchronous version of this method
-    ::grpc::Status ComboAggregate(::grpc::ServerContext* /*context*/, const ::io::deephaven::proto::backplane::grpc::ComboAggregateRequest* /*request*/, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse* /*response*/) override {
-      abort();
-      return ::grpc::Status(::grpc::StatusCode::UNIMPLEMENTED, "");
-    }
-    virtual ::grpc::ServerUnaryReactor* ComboAggregate(
-      ::grpc::CallbackServerContext* /*context*/, const ::io::deephaven::proto::backplane::grpc::ComboAggregateRequest* /*request*/, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse* /*response*/)  { return nullptr; }
-  };
-  template <class BaseClass>
-  class WithCallbackMethod_AggregateAll : public BaseClass {
-   private:
-    void BaseClassMustBeDerivedFromService(const Service* /*service*/) {}
-   public:
-    WithCallbackMethod_AggregateAll() {
-      ::grpc::Service::MarkMethodCallback(32,
-          new ::grpc::internal::CallbackUnaryHandler< ::io::deephaven::proto::backplane::grpc::AggregateAllRequest, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse>(
-            [this](
-                   ::grpc::CallbackServerContext* context, const ::io::deephaven::proto::backplane::grpc::AggregateAllRequest* request, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse* response) { return this->AggregateAll(context, request, response); }));}
-    void SetMessageAllocatorFor_AggregateAll(
-        ::grpc::MessageAllocator< ::io::deephaven::proto::backplane::grpc::AggregateAllRequest, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse>* allocator) {
-      ::grpc::internal::MethodHandler* const handler = ::grpc::Service::GetHandler(32);
-      static_cast<::grpc::internal::CallbackUnaryHandler< ::io::deephaven::proto::backplane::grpc::AggregateAllRequest, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse>*>(handler)
-              ->SetMessageAllocator(allocator);
-    }
-    ~WithCallbackMethod_AggregateAll() override {
-      BaseClassMustBeDerivedFromService(this);
-    }
-    // disable synchronous version of this method
-    ::grpc::Status AggregateAll(::grpc::ServerContext* /*context*/, const ::io::deephaven::proto::backplane::grpc::AggregateAllRequest* /*request*/, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse* /*response*/) override {
-      abort();
-      return ::grpc::Status(::grpc::StatusCode::UNIMPLEMENTED, "");
-    }
-    virtual ::grpc::ServerUnaryReactor* AggregateAll(
-      ::grpc::CallbackServerContext* /*context*/, const ::io::deephaven::proto::backplane::grpc::AggregateAllRequest* /*request*/, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse* /*response*/)  { return nullptr; }
-  };
-  template <class BaseClass>
-  class WithCallbackMethod_Aggregate : public BaseClass {
-   private:
-    void BaseClassMustBeDerivedFromService(const Service* /*service*/) {}
-   public:
-    WithCallbackMethod_Aggregate() {
-      ::grpc::Service::MarkMethodCallback(33,
-          new ::grpc::internal::CallbackUnaryHandler< ::io::deephaven::proto::backplane::grpc::AggregateRequest, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse>(
-            [this](
-                   ::grpc::CallbackServerContext* context, const ::io::deephaven::proto::backplane::grpc::AggregateRequest* request, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse* response) { return this->Aggregate(context, request, response); }));}
-    void SetMessageAllocatorFor_Aggregate(
-        ::grpc::MessageAllocator< ::io::deephaven::proto::backplane::grpc::AggregateRequest, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse>* allocator) {
-      ::grpc::internal::MethodHandler* const handler = ::grpc::Service::GetHandler(33);
-      static_cast<::grpc::internal::CallbackUnaryHandler< ::io::deephaven::proto::backplane::grpc::AggregateRequest, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse>*>(handler)
-              ->SetMessageAllocator(allocator);
-    }
-    ~WithCallbackMethod_Aggregate() override {
-      BaseClassMustBeDerivedFromService(this);
-    }
-    // disable synchronous version of this method
-    ::grpc::Status Aggregate(::grpc::ServerContext* /*context*/, const ::io::deephaven::proto::backplane::grpc::AggregateRequest* /*request*/, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse* /*response*/) override {
-      abort();
-      return ::grpc::Status(::grpc::StatusCode::UNIMPLEMENTED, "");
-    }
-    virtual ::grpc::ServerUnaryReactor* Aggregate(
-      ::grpc::CallbackServerContext* /*context*/, const ::io::deephaven::proto::backplane::grpc::AggregateRequest* /*request*/, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse* /*response*/)  { return nullptr; }
-  };
-  template <class BaseClass>
-  class WithCallbackMethod_Snapshot : public BaseClass {
-   private:
-    void BaseClassMustBeDerivedFromService(const Service* /*service*/) {}
-   public:
-    WithCallbackMethod_Snapshot() {
-      ::grpc::Service::MarkMethodCallback(34,
-          new ::grpc::internal::CallbackUnaryHandler< ::io::deephaven::proto::backplane::grpc::SnapshotTableRequest, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse>(
-            [this](
-                   ::grpc::CallbackServerContext* context, const ::io::deephaven::proto::backplane::grpc::SnapshotTableRequest* request, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse* response) { return this->Snapshot(context, request, response); }));}
-    void SetMessageAllocatorFor_Snapshot(
-        ::grpc::MessageAllocator< ::io::deephaven::proto::backplane::grpc::SnapshotTableRequest, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse>* allocator) {
-      ::grpc::internal::MethodHandler* const handler = ::grpc::Service::GetHandler(34);
-      static_cast<::grpc::internal::CallbackUnaryHandler< ::io::deephaven::proto::backplane::grpc::SnapshotTableRequest, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse>*>(handler)
-              ->SetMessageAllocator(allocator);
-    }
-    ~WithCallbackMethod_Snapshot() override {
-      BaseClassMustBeDerivedFromService(this);
-    }
-    // disable synchronous version of this method
-    ::grpc::Status Snapshot(::grpc::ServerContext* /*context*/, const ::io::deephaven::proto::backplane::grpc::SnapshotTableRequest* /*request*/, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse* /*response*/) override {
-      abort();
-      return ::grpc::Status(::grpc::StatusCode::UNIMPLEMENTED, "");
-    }
-    virtual ::grpc::ServerUnaryReactor* Snapshot(
-      ::grpc::CallbackServerContext* /*context*/, const ::io::deephaven::proto::backplane::grpc::SnapshotTableRequest* /*request*/, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse* /*response*/)  { return nullptr; }
-  };
-  template <class BaseClass>
-  class WithCallbackMethod_SnapshotWhen : public BaseClass {
-   private:
-    void BaseClassMustBeDerivedFromService(const Service* /*service*/) {}
-   public:
-    WithCallbackMethod_SnapshotWhen() {
-      ::grpc::Service::MarkMethodCallback(35,
-          new ::grpc::internal::CallbackUnaryHandler< ::io::deephaven::proto::backplane::grpc::SnapshotWhenTableRequest, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse>(
-            [this](
-                   ::grpc::CallbackServerContext* context, const ::io::deephaven::proto::backplane::grpc::SnapshotWhenTableRequest* request, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse* response) { return this->SnapshotWhen(context, request, response); }));}
-    void SetMessageAllocatorFor_SnapshotWhen(
-        ::grpc::MessageAllocator< ::io::deephaven::proto::backplane::grpc::SnapshotWhenTableRequest, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse>* allocator) {
-      ::grpc::internal::MethodHandler* const handler = ::grpc::Service::GetHandler(35);
-      static_cast<::grpc::internal::CallbackUnaryHandler< ::io::deephaven::proto::backplane::grpc::SnapshotWhenTableRequest, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse>*>(handler)
-              ->SetMessageAllocator(allocator);
-    }
-    ~WithCallbackMethod_SnapshotWhen() override {
-      BaseClassMustBeDerivedFromService(this);
-    }
-    // disable synchronous version of this method
-    ::grpc::Status SnapshotWhen(::grpc::ServerContext* /*context*/, const ::io::deephaven::proto::backplane::grpc::SnapshotWhenTableRequest* /*request*/, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse* /*response*/) override {
-      abort();
-      return ::grpc::Status(::grpc::StatusCode::UNIMPLEMENTED, "");
-    }
-    virtual ::grpc::ServerUnaryReactor* SnapshotWhen(
-      ::grpc::CallbackServerContext* /*context*/, const ::io::deephaven::proto::backplane::grpc::SnapshotWhenTableRequest* /*request*/, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse* /*response*/)  { return nullptr; }
-  };
-  template <class BaseClass>
-  class WithCallbackMethod_Flatten : public BaseClass {
-   private:
-    void BaseClassMustBeDerivedFromService(const Service* /*service*/) {}
-   public:
-    WithCallbackMethod_Flatten() {
-      ::grpc::Service::MarkMethodCallback(36,
-          new ::grpc::internal::CallbackUnaryHandler< ::io::deephaven::proto::backplane::grpc::FlattenRequest, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse>(
-            [this](
-                   ::grpc::CallbackServerContext* context, const ::io::deephaven::proto::backplane::grpc::FlattenRequest* request, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse* response) { return this->Flatten(context, request, response); }));}
-    void SetMessageAllocatorFor_Flatten(
-        ::grpc::MessageAllocator< ::io::deephaven::proto::backplane::grpc::FlattenRequest, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse>* allocator) {
-      ::grpc::internal::MethodHandler* const handler = ::grpc::Service::GetHandler(36);
-      static_cast<::grpc::internal::CallbackUnaryHandler< ::io::deephaven::proto::backplane::grpc::FlattenRequest, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse>*>(handler)
-              ->SetMessageAllocator(allocator);
-    }
-    ~WithCallbackMethod_Flatten() override {
-      BaseClassMustBeDerivedFromService(this);
-    }
-    // disable synchronous version of this method
-    ::grpc::Status Flatten(::grpc::ServerContext* /*context*/, const ::io::deephaven::proto::backplane::grpc::FlattenRequest* /*request*/, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse* /*response*/) override {
-      abort();
-      return ::grpc::Status(::grpc::StatusCode::UNIMPLEMENTED, "");
-    }
-    virtual ::grpc::ServerUnaryReactor* Flatten(
-      ::grpc::CallbackServerContext* /*context*/, const ::io::deephaven::proto::backplane::grpc::FlattenRequest* /*request*/, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse* /*response*/)  { return nullptr; }
-  };
-  template <class BaseClass>
-  class WithCallbackMethod_RunChartDownsample : public BaseClass {
-   private:
-    void BaseClassMustBeDerivedFromService(const Service* /*service*/) {}
-   public:
-    WithCallbackMethod_RunChartDownsample() {
-      ::grpc::Service::MarkMethodCallback(37,
-          new ::grpc::internal::CallbackUnaryHandler< ::io::deephaven::proto::backplane::grpc::RunChartDownsampleRequest, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse>(
-            [this](
-                   ::grpc::CallbackServerContext* context, const ::io::deephaven::proto::backplane::grpc::RunChartDownsampleRequest* request, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse* response) { return this->RunChartDownsample(context, request, response); }));}
-    void SetMessageAllocatorFor_RunChartDownsample(
-        ::grpc::MessageAllocator< ::io::deephaven::proto::backplane::grpc::RunChartDownsampleRequest, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse>* allocator) {
-      ::grpc::internal::MethodHandler* const handler = ::grpc::Service::GetHandler(37);
-      static_cast<::grpc::internal::CallbackUnaryHandler< ::io::deephaven::proto::backplane::grpc::RunChartDownsampleRequest, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse>*>(handler)
-              ->SetMessageAllocator(allocator);
-    }
-    ~WithCallbackMethod_RunChartDownsample() override {
-      BaseClassMustBeDerivedFromService(this);
-    }
-    // disable synchronous version of this method
-    ::grpc::Status RunChartDownsample(::grpc::ServerContext* /*context*/, const ::io::deephaven::proto::backplane::grpc::RunChartDownsampleRequest* /*request*/, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse* /*response*/) override {
-      abort();
-      return ::grpc::Status(::grpc::StatusCode::UNIMPLEMENTED, "");
-    }
-    virtual ::grpc::ServerUnaryReactor* RunChartDownsample(
-      ::grpc::CallbackServerContext* /*context*/, const ::io::deephaven::proto::backplane::grpc::RunChartDownsampleRequest* /*request*/, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse* /*response*/)  { return nullptr; }
-  };
-  template <class BaseClass>
-  class WithCallbackMethod_CreateInputTable : public BaseClass {
-   private:
-    void BaseClassMustBeDerivedFromService(const Service* /*service*/) {}
-   public:
-    WithCallbackMethod_CreateInputTable() {
-      ::grpc::Service::MarkMethodCallback(38,
-          new ::grpc::internal::CallbackUnaryHandler< ::io::deephaven::proto::backplane::grpc::CreateInputTableRequest, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse>(
-            [this](
-                   ::grpc::CallbackServerContext* context, const ::io::deephaven::proto::backplane::grpc::CreateInputTableRequest* request, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse* response) { return this->CreateInputTable(context, request, response); }));}
-    void SetMessageAllocatorFor_CreateInputTable(
-        ::grpc::MessageAllocator< ::io::deephaven::proto::backplane::grpc::CreateInputTableRequest, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse>* allocator) {
-      ::grpc::internal::MethodHandler* const handler = ::grpc::Service::GetHandler(38);
-      static_cast<::grpc::internal::CallbackUnaryHandler< ::io::deephaven::proto::backplane::grpc::CreateInputTableRequest, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse>*>(handler)
-              ->SetMessageAllocator(allocator);
-    }
-    ~WithCallbackMethod_CreateInputTable() override {
-      BaseClassMustBeDerivedFromService(this);
-    }
-    // disable synchronous version of this method
-    ::grpc::Status CreateInputTable(::grpc::ServerContext* /*context*/, const ::io::deephaven::proto::backplane::grpc::CreateInputTableRequest* /*request*/, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse* /*response*/) override {
-      abort();
-      return ::grpc::Status(::grpc::StatusCode::UNIMPLEMENTED, "");
-    }
-    virtual ::grpc::ServerUnaryReactor* CreateInputTable(
-      ::grpc::CallbackServerContext* /*context*/, const ::io::deephaven::proto::backplane::grpc::CreateInputTableRequest* /*request*/, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse* /*response*/)  { return nullptr; }
-  };
-  template <class BaseClass>
-  class WithCallbackMethod_WhereIn : public BaseClass {
-   private:
-    void BaseClassMustBeDerivedFromService(const Service* /*service*/) {}
-   public:
-    WithCallbackMethod_WhereIn() {
-      ::grpc::Service::MarkMethodCallback(39,
-          new ::grpc::internal::CallbackUnaryHandler< ::io::deephaven::proto::backplane::grpc::WhereInRequest, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse>(
-            [this](
-                   ::grpc::CallbackServerContext* context, const ::io::deephaven::proto::backplane::grpc::WhereInRequest* request, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse* response) { return this->WhereIn(context, request, response); }));}
-    void SetMessageAllocatorFor_WhereIn(
-        ::grpc::MessageAllocator< ::io::deephaven::proto::backplane::grpc::WhereInRequest, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse>* allocator) {
-      ::grpc::internal::MethodHandler* const handler = ::grpc::Service::GetHandler(39);
-      static_cast<::grpc::internal::CallbackUnaryHandler< ::io::deephaven::proto::backplane::grpc::WhereInRequest, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse>*>(handler)
-              ->SetMessageAllocator(allocator);
-    }
-    ~WithCallbackMethod_WhereIn() override {
-      BaseClassMustBeDerivedFromService(this);
-    }
-    // disable synchronous version of this method
-    ::grpc::Status WhereIn(::grpc::ServerContext* /*context*/, const ::io::deephaven::proto::backplane::grpc::WhereInRequest* /*request*/, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse* /*response*/) override {
-      abort();
-      return ::grpc::Status(::grpc::StatusCode::UNIMPLEMENTED, "");
-    }
-    virtual ::grpc::ServerUnaryReactor* WhereIn(
-      ::grpc::CallbackServerContext* /*context*/, const ::io::deephaven::proto::backplane::grpc::WhereInRequest* /*request*/, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse* /*response*/)  { return nullptr; }
-  };
-  template <class BaseClass>
-  class WithCallbackMethod_Batch : public BaseClass {
-   private:
-    void BaseClassMustBeDerivedFromService(const Service* /*service*/) {}
-   public:
-    WithCallbackMethod_Batch() {
-      ::grpc::Service::MarkMethodCallback(40,
-          new ::grpc::internal::CallbackServerStreamingHandler< ::io::deephaven::proto::backplane::grpc::BatchTableRequest, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse>(
-            [this](
-                   ::grpc::CallbackServerContext* context, const ::io::deephaven::proto::backplane::grpc::BatchTableRequest* request) { return this->Batch(context, request); }));
-    }
-    ~WithCallbackMethod_Batch() override {
-      BaseClassMustBeDerivedFromService(this);
-    }
-    // disable synchronous version of this method
-    ::grpc::Status Batch(::grpc::ServerContext* /*context*/, const ::io::deephaven::proto::backplane::grpc::BatchTableRequest* /*request*/, ::grpc::ServerWriter< ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse>* /*writer*/) override {
-      abort();
-      return ::grpc::Status(::grpc::StatusCode::UNIMPLEMENTED, "");
-    }
-    virtual ::grpc::ServerWriteReactor< ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse>* Batch(
-      ::grpc::CallbackServerContext* /*context*/, const ::io::deephaven::proto::backplane::grpc::BatchTableRequest* /*request*/)  { return nullptr; }
-  };
-  template <class BaseClass>
-  class WithCallbackMethod_ExportedTableUpdates : public BaseClass {
-   private:
-    void BaseClassMustBeDerivedFromService(const Service* /*service*/) {}
-   public:
-    WithCallbackMethod_ExportedTableUpdates() {
-      ::grpc::Service::MarkMethodCallback(41,
-          new ::grpc::internal::CallbackServerStreamingHandler< ::io::deephaven::proto::backplane::grpc::ExportedTableUpdatesRequest, ::io::deephaven::proto::backplane::grpc::ExportedTableUpdateMessage>(
-            [this](
-                   ::grpc::CallbackServerContext* context, const ::io::deephaven::proto::backplane::grpc::ExportedTableUpdatesRequest* request) { return this->ExportedTableUpdates(context, request); }));
-    }
-    ~WithCallbackMethod_ExportedTableUpdates() override {
-      BaseClassMustBeDerivedFromService(this);
-    }
-    // disable synchronous version of this method
-    ::grpc::Status ExportedTableUpdates(::grpc::ServerContext* /*context*/, const ::io::deephaven::proto::backplane::grpc::ExportedTableUpdatesRequest* /*request*/, ::grpc::ServerWriter< ::io::deephaven::proto::backplane::grpc::ExportedTableUpdateMessage>* /*writer*/) override {
-      abort();
-      return ::grpc::Status(::grpc::StatusCode::UNIMPLEMENTED, "");
-    }
-    virtual ::grpc::ServerWriteReactor< ::io::deephaven::proto::backplane::grpc::ExportedTableUpdateMessage>* ExportedTableUpdates(
-      ::grpc::CallbackServerContext* /*context*/, const ::io::deephaven::proto::backplane::grpc::ExportedTableUpdatesRequest* /*request*/)  { return nullptr; }
-  };
-  template <class BaseClass>
-  class WithCallbackMethod_SeekRow : public BaseClass {
-   private:
-    void BaseClassMustBeDerivedFromService(const Service* /*service*/) {}
-   public:
-    WithCallbackMethod_SeekRow() {
-      ::grpc::Service::MarkMethodCallback(42,
-          new ::grpc::internal::CallbackUnaryHandler< ::io::deephaven::proto::backplane::grpc::SeekRowRequest, ::io::deephaven::proto::backplane::grpc::SeekRowResponse>(
-            [this](
-                   ::grpc::CallbackServerContext* context, const ::io::deephaven::proto::backplane::grpc::SeekRowRequest* request, ::io::deephaven::proto::backplane::grpc::SeekRowResponse* response) { return this->SeekRow(context, request, response); }));}
-    void SetMessageAllocatorFor_SeekRow(
-        ::grpc::MessageAllocator< ::io::deephaven::proto::backplane::grpc::SeekRowRequest, ::io::deephaven::proto::backplane::grpc::SeekRowResponse>* allocator) {
-      ::grpc::internal::MethodHandler* const handler = ::grpc::Service::GetHandler(42);
-      static_cast<::grpc::internal::CallbackUnaryHandler< ::io::deephaven::proto::backplane::grpc::SeekRowRequest, ::io::deephaven::proto::backplane::grpc::SeekRowResponse>*>(handler)
-              ->SetMessageAllocator(allocator);
-    }
-    ~WithCallbackMethod_SeekRow() override {
-      BaseClassMustBeDerivedFromService(this);
-    }
-    // disable synchronous version of this method
-    ::grpc::Status SeekRow(::grpc::ServerContext* /*context*/, const ::io::deephaven::proto::backplane::grpc::SeekRowRequest* /*request*/, ::io::deephaven::proto::backplane::grpc::SeekRowResponse* /*response*/) override {
-      abort();
-      return ::grpc::Status(::grpc::StatusCode::UNIMPLEMENTED, "");
-    }
-    virtual ::grpc::ServerUnaryReactor* SeekRow(
-      ::grpc::CallbackServerContext* /*context*/, const ::io::deephaven::proto::backplane::grpc::SeekRowRequest* /*request*/, ::io::deephaven::proto::backplane::grpc::SeekRowResponse* /*response*/)  { return nullptr; }
-  };
-  template <class BaseClass>
-  class WithCallbackMethod_MetaTable : public BaseClass {
-   private:
-    void BaseClassMustBeDerivedFromService(const Service* /*service*/) {}
-   public:
-    WithCallbackMethod_MetaTable() {
-      ::grpc::Service::MarkMethodCallback(43,
-          new ::grpc::internal::CallbackUnaryHandler< ::io::deephaven::proto::backplane::grpc::MetaTableRequest, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse>(
-            [this](
-                   ::grpc::CallbackServerContext* context, const ::io::deephaven::proto::backplane::grpc::MetaTableRequest* request, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse* response) { return this->MetaTable(context, request, response); }));}
-    void SetMessageAllocatorFor_MetaTable(
-        ::grpc::MessageAllocator< ::io::deephaven::proto::backplane::grpc::MetaTableRequest, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse>* allocator) {
-      ::grpc::internal::MethodHandler* const handler = ::grpc::Service::GetHandler(43);
-      static_cast<::grpc::internal::CallbackUnaryHandler< ::io::deephaven::proto::backplane::grpc::MetaTableRequest, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse>*>(handler)
-              ->SetMessageAllocator(allocator);
-    }
-    ~WithCallbackMethod_MetaTable() override {
-      BaseClassMustBeDerivedFromService(this);
-    }
-    // disable synchronous version of this method
-    ::grpc::Status MetaTable(::grpc::ServerContext* /*context*/, const ::io::deephaven::proto::backplane::grpc::MetaTableRequest* /*request*/, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse* /*response*/) override {
-      abort();
-      return ::grpc::Status(::grpc::StatusCode::UNIMPLEMENTED, "");
-    }
-    virtual ::grpc::ServerUnaryReactor* MetaTable(
-      ::grpc::CallbackServerContext* /*context*/, const ::io::deephaven::proto::backplane::grpc::MetaTableRequest* /*request*/, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse* /*response*/)  { return nullptr; }
-  };
-  template <class BaseClass>
-  class WithCallbackMethod_ComputeColumnStatistics : public BaseClass {
-   private:
-    void BaseClassMustBeDerivedFromService(const Service* /*service*/) {}
-   public:
-    WithCallbackMethod_ComputeColumnStatistics() {
-      ::grpc::Service::MarkMethodCallback(44,
-          new ::grpc::internal::CallbackUnaryHandler< ::io::deephaven::proto::backplane::grpc::ColumnStatisticsRequest, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse>(
-            [this](
-                   ::grpc::CallbackServerContext* context, const ::io::deephaven::proto::backplane::grpc::ColumnStatisticsRequest* request, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse* response) { return this->ComputeColumnStatistics(context, request, response); }));}
-    void SetMessageAllocatorFor_ComputeColumnStatistics(
-        ::grpc::MessageAllocator< ::io::deephaven::proto::backplane::grpc::ColumnStatisticsRequest, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse>* allocator) {
-      ::grpc::internal::MethodHandler* const handler = ::grpc::Service::GetHandler(44);
-      static_cast<::grpc::internal::CallbackUnaryHandler< ::io::deephaven::proto::backplane::grpc::ColumnStatisticsRequest, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse>*>(handler)
-              ->SetMessageAllocator(allocator);
-    }
-    ~WithCallbackMethod_ComputeColumnStatistics() override {
-      BaseClassMustBeDerivedFromService(this);
-    }
-    // disable synchronous version of this method
-    ::grpc::Status ComputeColumnStatistics(::grpc::ServerContext* /*context*/, const ::io::deephaven::proto::backplane::grpc::ColumnStatisticsRequest* /*request*/, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse* /*response*/) override {
-      abort();
-      return ::grpc::Status(::grpc::StatusCode::UNIMPLEMENTED, "");
-    }
-    virtual ::grpc::ServerUnaryReactor* ComputeColumnStatistics(
-      ::grpc::CallbackServerContext* /*context*/, const ::io::deephaven::proto::backplane::grpc::ColumnStatisticsRequest* /*request*/, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse* /*response*/)  { return nullptr; }
-  };
-  typedef WithCallbackMethod_GetExportedTableCreationResponse<WithCallbackMethod_FetchTable<WithCallbackMethod_ApplyPreviewColumns<WithCallbackMethod_EmptyTable<WithCallbackMethod_TimeTable<WithCallbackMethod_DropColumns<WithCallbackMethod_Update<WithCallbackMethod_LazyUpdate<WithCallbackMethod_View<WithCallbackMethod_UpdateView<WithCallbackMethod_Select<WithCallbackMethod_UpdateBy<WithCallbackMethod_SelectDistinct<WithCallbackMethod_Filter<WithCallbackMethod_UnstructuredFilter<WithCallbackMethod_Sort<WithCallbackMethod_Head<WithCallbackMethod_Tail<WithCallbackMethod_HeadBy<WithCallbackMethod_TailBy<WithCallbackMethod_Ungroup<WithCallbackMethod_MergeTables<WithCallbackMethod_CrossJoinTables<WithCallbackMethod_NaturalJoinTables<WithCallbackMethod_ExactJoinTables<WithCallbackMethod_LeftJoinTables<WithCallbackMethod_AsOfJoinTables<WithCallbackMethod_AjTables<WithCallbackMethod_RajTables<WithCallbackMethod_MultiJoinTables<WithCallbackMethod_RangeJoinTables<WithCallbackMethod_ComboAggregate<WithCallbackMethod_AggregateAll<WithCallbackMethod_Aggregate<WithCallbackMethod_Snapshot<WithCallbackMethod_SnapshotWhen<WithCallbackMethod_Flatten<WithCallbackMethod_RunChartDownsample<WithCallbackMethod_CreateInputTable<WithCallbackMethod_WhereIn<WithCallbackMethod_Batch<WithCallbackMethod_ExportedTableUpdates<WithCallbackMethod_SeekRow<WithCallbackMethod_MetaTable<WithCallbackMethod_ComputeColumnStatistics<Service > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > CallbackService;
-  typedef CallbackService ExperimentalCallbackService;
-  template <class BaseClass>
-  class WithGenericMethod_GetExportedTableCreationResponse : public BaseClass {
-   private:
-    void BaseClassMustBeDerivedFromService(const Service* /*service*/) {}
-   public:
-    WithGenericMethod_GetExportedTableCreationResponse() {
-      ::grpc::Service::MarkMethodGeneric(0);
-    }
-    ~WithGenericMethod_GetExportedTableCreationResponse() override {
-      BaseClassMustBeDerivedFromService(this);
-    }
-    // disable synchronous version of this method
-    ::grpc::Status GetExportedTableCreationResponse(::grpc::ServerContext* /*context*/, const ::io::deephaven::proto::backplane::grpc::Ticket* /*request*/, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse* /*response*/) override {
-      abort();
-      return ::grpc::Status(::grpc::StatusCode::UNIMPLEMENTED, "");
-    }
-  };
-  template <class BaseClass>
-  class WithGenericMethod_FetchTable : public BaseClass {
-   private:
-    void BaseClassMustBeDerivedFromService(const Service* /*service*/) {}
-   public:
-    WithGenericMethod_FetchTable() {
-      ::grpc::Service::MarkMethodGeneric(1);
-    }
-    ~WithGenericMethod_FetchTable() override {
-      BaseClassMustBeDerivedFromService(this);
-    }
-    // disable synchronous version of this method
-    ::grpc::Status FetchTable(::grpc::ServerContext* /*context*/, const ::io::deephaven::proto::backplane::grpc::FetchTableRequest* /*request*/, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse* /*response*/) override {
-      abort();
-      return ::grpc::Status(::grpc::StatusCode::UNIMPLEMENTED, "");
-    }
-  };
-  template <class BaseClass>
-  class WithGenericMethod_ApplyPreviewColumns : public BaseClass {
-   private:
-    void BaseClassMustBeDerivedFromService(const Service* /*service*/) {}
-   public:
-    WithGenericMethod_ApplyPreviewColumns() {
-      ::grpc::Service::MarkMethodGeneric(2);
-    }
-    ~WithGenericMethod_ApplyPreviewColumns() override {
-      BaseClassMustBeDerivedFromService(this);
-    }
-    // disable synchronous version of this method
-    ::grpc::Status ApplyPreviewColumns(::grpc::ServerContext* /*context*/, const ::io::deephaven::proto::backplane::grpc::ApplyPreviewColumnsRequest* /*request*/, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse* /*response*/) override {
-      abort();
-      return ::grpc::Status(::grpc::StatusCode::UNIMPLEMENTED, "");
-    }
-  };
-  template <class BaseClass>
-  class WithGenericMethod_EmptyTable : public BaseClass {
-   private:
-    void BaseClassMustBeDerivedFromService(const Service* /*service*/) {}
-   public:
-    WithGenericMethod_EmptyTable() {
-      ::grpc::Service::MarkMethodGeneric(3);
-    }
-    ~WithGenericMethod_EmptyTable() override {
-      BaseClassMustBeDerivedFromService(this);
-    }
-    // disable synchronous version of this method
-    ::grpc::Status EmptyTable(::grpc::ServerContext* /*context*/, const ::io::deephaven::proto::backplane::grpc::EmptyTableRequest* /*request*/, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse* /*response*/) override {
-      abort();
-      return ::grpc::Status(::grpc::StatusCode::UNIMPLEMENTED, "");
-    }
-  };
-  template <class BaseClass>
-  class WithGenericMethod_TimeTable : public BaseClass {
-   private:
-    void BaseClassMustBeDerivedFromService(const Service* /*service*/) {}
-   public:
-    WithGenericMethod_TimeTable() {
-      ::grpc::Service::MarkMethodGeneric(4);
-    }
-    ~WithGenericMethod_TimeTable() override {
-      BaseClassMustBeDerivedFromService(this);
-    }
-    // disable synchronous version of this method
-    ::grpc::Status TimeTable(::grpc::ServerContext* /*context*/, const ::io::deephaven::proto::backplane::grpc::TimeTableRequest* /*request*/, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse* /*response*/) override {
-      abort();
-      return ::grpc::Status(::grpc::StatusCode::UNIMPLEMENTED, "");
-    }
-  };
-  template <class BaseClass>
-  class WithGenericMethod_DropColumns : public BaseClass {
-   private:
-    void BaseClassMustBeDerivedFromService(const Service* /*service*/) {}
-   public:
-    WithGenericMethod_DropColumns() {
-      ::grpc::Service::MarkMethodGeneric(5);
-    }
-    ~WithGenericMethod_DropColumns() override {
-      BaseClassMustBeDerivedFromService(this);
-    }
-    // disable synchronous version of this method
-    ::grpc::Status DropColumns(::grpc::ServerContext* /*context*/, const ::io::deephaven::proto::backplane::grpc::DropColumnsRequest* /*request*/, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse* /*response*/) override {
-      abort();
-      return ::grpc::Status(::grpc::StatusCode::UNIMPLEMENTED, "");
-    }
-  };
-  template <class BaseClass>
-  class WithGenericMethod_Update : public BaseClass {
-   private:
-    void BaseClassMustBeDerivedFromService(const Service* /*service*/) {}
-   public:
-    WithGenericMethod_Update() {
-      ::grpc::Service::MarkMethodGeneric(6);
-    }
-    ~WithGenericMethod_Update() override {
-      BaseClassMustBeDerivedFromService(this);
-    }
-    // disable synchronous version of this method
-    ::grpc::Status Update(::grpc::ServerContext* /*context*/, const ::io::deephaven::proto::backplane::grpc::SelectOrUpdateRequest* /*request*/, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse* /*response*/) override {
-      abort();
-      return ::grpc::Status(::grpc::StatusCode::UNIMPLEMENTED, "");
-    }
-  };
-  template <class BaseClass>
-  class WithGenericMethod_LazyUpdate : public BaseClass {
-   private:
-    void BaseClassMustBeDerivedFromService(const Service* /*service*/) {}
-   public:
-    WithGenericMethod_LazyUpdate() {
-      ::grpc::Service::MarkMethodGeneric(7);
-    }
-    ~WithGenericMethod_LazyUpdate() override {
-      BaseClassMustBeDerivedFromService(this);
-    }
-    // disable synchronous version of this method
-    ::grpc::Status LazyUpdate(::grpc::ServerContext* /*context*/, const ::io::deephaven::proto::backplane::grpc::SelectOrUpdateRequest* /*request*/, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse* /*response*/) override {
-      abort();
-      return ::grpc::Status(::grpc::StatusCode::UNIMPLEMENTED, "");
-    }
-  };
-  template <class BaseClass>
-  class WithGenericMethod_View : public BaseClass {
-   private:
-    void BaseClassMustBeDerivedFromService(const Service* /*service*/) {}
-   public:
-    WithGenericMethod_View() {
-      ::grpc::Service::MarkMethodGeneric(8);
-    }
-    ~WithGenericMethod_View() override {
-      BaseClassMustBeDerivedFromService(this);
-    }
-    // disable synchronous version of this method
-    ::grpc::Status View(::grpc::ServerContext* /*context*/, const ::io::deephaven::proto::backplane::grpc::SelectOrUpdateRequest* /*request*/, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse* /*response*/) override {
-      abort();
-      return ::grpc::Status(::grpc::StatusCode::UNIMPLEMENTED, "");
-    }
-  };
-  template <class BaseClass>
-  class WithGenericMethod_UpdateView : public BaseClass {
-   private:
-    void BaseClassMustBeDerivedFromService(const Service* /*service*/) {}
-   public:
-    WithGenericMethod_UpdateView() {
-      ::grpc::Service::MarkMethodGeneric(9);
-    }
-    ~WithGenericMethod_UpdateView() override {
-      BaseClassMustBeDerivedFromService(this);
-    }
-    // disable synchronous version of this method
-    ::grpc::Status UpdateView(::grpc::ServerContext* /*context*/, const ::io::deephaven::proto::backplane::grpc::SelectOrUpdateRequest* /*request*/, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse* /*response*/) override {
-      abort();
-      return ::grpc::Status(::grpc::StatusCode::UNIMPLEMENTED, "");
-    }
-  };
-  template <class BaseClass>
-  class WithGenericMethod_Select : public BaseClass {
-   private:
-    void BaseClassMustBeDerivedFromService(const Service* /*service*/) {}
-   public:
-    WithGenericMethod_Select() {
-      ::grpc::Service::MarkMethodGeneric(10);
-    }
-    ~WithGenericMethod_Select() override {
-      BaseClassMustBeDerivedFromService(this);
-    }
-    // disable synchronous version of this method
-    ::grpc::Status Select(::grpc::ServerContext* /*context*/, const ::io::deephaven::proto::backplane::grpc::SelectOrUpdateRequest* /*request*/, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse* /*response*/) override {
-      abort();
-      return ::grpc::Status(::grpc::StatusCode::UNIMPLEMENTED, "");
-    }
-  };
-  template <class BaseClass>
-  class WithGenericMethod_UpdateBy : public BaseClass {
-   private:
-    void BaseClassMustBeDerivedFromService(const Service* /*service*/) {}
-   public:
-    WithGenericMethod_UpdateBy() {
-      ::grpc::Service::MarkMethodGeneric(11);
-    }
-    ~WithGenericMethod_UpdateBy() override {
-      BaseClassMustBeDerivedFromService(this);
-    }
-    // disable synchronous version of this method
-    ::grpc::Status UpdateBy(::grpc::ServerContext* /*context*/, const ::io::deephaven::proto::backplane::grpc::UpdateByRequest* /*request*/, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse* /*response*/) override {
-      abort();
-      return ::grpc::Status(::grpc::StatusCode::UNIMPLEMENTED, "");
-    }
-  };
-  template <class BaseClass>
-  class WithGenericMethod_SelectDistinct : public BaseClass {
-   private:
-    void BaseClassMustBeDerivedFromService(const Service* /*service*/) {}
-   public:
-    WithGenericMethod_SelectDistinct() {
-      ::grpc::Service::MarkMethodGeneric(12);
-    }
-    ~WithGenericMethod_SelectDistinct() override {
-      BaseClassMustBeDerivedFromService(this);
-    }
-    // disable synchronous version of this method
-    ::grpc::Status SelectDistinct(::grpc::ServerContext* /*context*/, const ::io::deephaven::proto::backplane::grpc::SelectDistinctRequest* /*request*/, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse* /*response*/) override {
-      abort();
-      return ::grpc::Status(::grpc::StatusCode::UNIMPLEMENTED, "");
-    }
-  };
-  template <class BaseClass>
-  class WithGenericMethod_Filter : public BaseClass {
-   private:
-    void BaseClassMustBeDerivedFromService(const Service* /*service*/) {}
-   public:
-    WithGenericMethod_Filter() {
-      ::grpc::Service::MarkMethodGeneric(13);
-    }
-    ~WithGenericMethod_Filter() override {
-      BaseClassMustBeDerivedFromService(this);
-    }
-    // disable synchronous version of this method
-    ::grpc::Status Filter(::grpc::ServerContext* /*context*/, const ::io::deephaven::proto::backplane::grpc::FilterTableRequest* /*request*/, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse* /*response*/) override {
-      abort();
-      return ::grpc::Status(::grpc::StatusCode::UNIMPLEMENTED, "");
-    }
-  };
-  template <class BaseClass>
-  class WithGenericMethod_UnstructuredFilter : public BaseClass {
-   private:
-    void BaseClassMustBeDerivedFromService(const Service* /*service*/) {}
-   public:
-    WithGenericMethod_UnstructuredFilter() {
-      ::grpc::Service::MarkMethodGeneric(14);
-    }
-    ~WithGenericMethod_UnstructuredFilter() override {
-      BaseClassMustBeDerivedFromService(this);
-    }
-    // disable synchronous version of this method
-    ::grpc::Status UnstructuredFilter(::grpc::ServerContext* /*context*/, const ::io::deephaven::proto::backplane::grpc::UnstructuredFilterTableRequest* /*request*/, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse* /*response*/) override {
-      abort();
-      return ::grpc::Status(::grpc::StatusCode::UNIMPLEMENTED, "");
-    }
-  };
-  template <class BaseClass>
-  class WithGenericMethod_Sort : public BaseClass {
-   private:
-    void BaseClassMustBeDerivedFromService(const Service* /*service*/) {}
-   public:
-    WithGenericMethod_Sort() {
-      ::grpc::Service::MarkMethodGeneric(15);
-    }
-    ~WithGenericMethod_Sort() override {
-      BaseClassMustBeDerivedFromService(this);
-    }
-    // disable synchronous version of this method
-    ::grpc::Status Sort(::grpc::ServerContext* /*context*/, const ::io::deephaven::proto::backplane::grpc::SortTableRequest* /*request*/, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse* /*response*/) override {
-      abort();
-      return ::grpc::Status(::grpc::StatusCode::UNIMPLEMENTED, "");
-    }
-  };
-  template <class BaseClass>
-  class WithGenericMethod_Head : public BaseClass {
-   private:
-    void BaseClassMustBeDerivedFromService(const Service* /*service*/) {}
-   public:
-    WithGenericMethod_Head() {
-      ::grpc::Service::MarkMethodGeneric(16);
-    }
-    ~WithGenericMethod_Head() override {
-      BaseClassMustBeDerivedFromService(this);
-    }
-    // disable synchronous version of this method
-    ::grpc::Status Head(::grpc::ServerContext* /*context*/, const ::io::deephaven::proto::backplane::grpc::HeadOrTailRequest* /*request*/, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse* /*response*/) override {
-      abort();
-      return ::grpc::Status(::grpc::StatusCode::UNIMPLEMENTED, "");
-    }
-  };
-  template <class BaseClass>
-  class WithGenericMethod_Tail : public BaseClass {
-   private:
-    void BaseClassMustBeDerivedFromService(const Service* /*service*/) {}
-   public:
-    WithGenericMethod_Tail() {
-      ::grpc::Service::MarkMethodGeneric(17);
-    }
-    ~WithGenericMethod_Tail() override {
-      BaseClassMustBeDerivedFromService(this);
-    }
-    // disable synchronous version of this method
-    ::grpc::Status Tail(::grpc::ServerContext* /*context*/, const ::io::deephaven::proto::backplane::grpc::HeadOrTailRequest* /*request*/, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse* /*response*/) override {
-      abort();
-      return ::grpc::Status(::grpc::StatusCode::UNIMPLEMENTED, "");
-    }
-  };
-  template <class BaseClass>
-  class WithGenericMethod_HeadBy : public BaseClass {
-   private:
-    void BaseClassMustBeDerivedFromService(const Service* /*service*/) {}
-   public:
-    WithGenericMethod_HeadBy() {
-      ::grpc::Service::MarkMethodGeneric(18);
-    }
-    ~WithGenericMethod_HeadBy() override {
-      BaseClassMustBeDerivedFromService(this);
-    }
-    // disable synchronous version of this method
-    ::grpc::Status HeadBy(::grpc::ServerContext* /*context*/, const ::io::deephaven::proto::backplane::grpc::HeadOrTailByRequest* /*request*/, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse* /*response*/) override {
-      abort();
-      return ::grpc::Status(::grpc::StatusCode::UNIMPLEMENTED, "");
-    }
-  };
-  template <class BaseClass>
-  class WithGenericMethod_TailBy : public BaseClass {
-   private:
-    void BaseClassMustBeDerivedFromService(const Service* /*service*/) {}
-   public:
-    WithGenericMethod_TailBy() {
-      ::grpc::Service::MarkMethodGeneric(19);
-    }
-    ~WithGenericMethod_TailBy() override {
-      BaseClassMustBeDerivedFromService(this);
-    }
-    // disable synchronous version of this method
-    ::grpc::Status TailBy(::grpc::ServerContext* /*context*/, const ::io::deephaven::proto::backplane::grpc::HeadOrTailByRequest* /*request*/, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse* /*response*/) override {
-      abort();
-      return ::grpc::Status(::grpc::StatusCode::UNIMPLEMENTED, "");
-    }
-  };
-  template <class BaseClass>
-  class WithGenericMethod_Ungroup : public BaseClass {
-   private:
-    void BaseClassMustBeDerivedFromService(const Service* /*service*/) {}
-   public:
-    WithGenericMethod_Ungroup() {
-      ::grpc::Service::MarkMethodGeneric(20);
-    }
-    ~WithGenericMethod_Ungroup() override {
-      BaseClassMustBeDerivedFromService(this);
-    }
-    // disable synchronous version of this method
-    ::grpc::Status Ungroup(::grpc::ServerContext* /*context*/, const ::io::deephaven::proto::backplane::grpc::UngroupRequest* /*request*/, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse* /*response*/) override {
-      abort();
-      return ::grpc::Status(::grpc::StatusCode::UNIMPLEMENTED, "");
-    }
-  };
-  template <class BaseClass>
-  class WithGenericMethod_MergeTables : public BaseClass {
-   private:
-    void BaseClassMustBeDerivedFromService(const Service* /*service*/) {}
-   public:
-    WithGenericMethod_MergeTables() {
-      ::grpc::Service::MarkMethodGeneric(21);
-    }
-    ~WithGenericMethod_MergeTables() override {
-      BaseClassMustBeDerivedFromService(this);
-    }
-    // disable synchronous version of this method
-    ::grpc::Status MergeTables(::grpc::ServerContext* /*context*/, const ::io::deephaven::proto::backplane::grpc::MergeTablesRequest* /*request*/, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse* /*response*/) override {
-      abort();
-      return ::grpc::Status(::grpc::StatusCode::UNIMPLEMENTED, "");
-    }
-  };
-  template <class BaseClass>
-  class WithGenericMethod_CrossJoinTables : public BaseClass {
-   private:
-    void BaseClassMustBeDerivedFromService(const Service* /*service*/) {}
-   public:
-    WithGenericMethod_CrossJoinTables() {
-      ::grpc::Service::MarkMethodGeneric(22);
-    }
-    ~WithGenericMethod_CrossJoinTables() override {
-      BaseClassMustBeDerivedFromService(this);
-    }
-    // disable synchronous version of this method
-    ::grpc::Status CrossJoinTables(::grpc::ServerContext* /*context*/, const ::io::deephaven::proto::backplane::grpc::CrossJoinTablesRequest* /*request*/, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse* /*response*/) override {
-      abort();
-      return ::grpc::Status(::grpc::StatusCode::UNIMPLEMENTED, "");
-    }
-  };
-  template <class BaseClass>
-  class WithGenericMethod_NaturalJoinTables : public BaseClass {
-   private:
-    void BaseClassMustBeDerivedFromService(const Service* /*service*/) {}
-   public:
-    WithGenericMethod_NaturalJoinTables() {
-      ::grpc::Service::MarkMethodGeneric(23);
-    }
-    ~WithGenericMethod_NaturalJoinTables() override {
-      BaseClassMustBeDerivedFromService(this);
-    }
-    // disable synchronous version of this method
-    ::grpc::Status NaturalJoinTables(::grpc::ServerContext* /*context*/, const ::io::deephaven::proto::backplane::grpc::NaturalJoinTablesRequest* /*request*/, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse* /*response*/) override {
-      abort();
-      return ::grpc::Status(::grpc::StatusCode::UNIMPLEMENTED, "");
-    }
-  };
-  template <class BaseClass>
-  class WithGenericMethod_ExactJoinTables : public BaseClass {
-   private:
-    void BaseClassMustBeDerivedFromService(const Service* /*service*/) {}
-   public:
-    WithGenericMethod_ExactJoinTables() {
-      ::grpc::Service::MarkMethodGeneric(24);
-    }
-    ~WithGenericMethod_ExactJoinTables() override {
-      BaseClassMustBeDerivedFromService(this);
-    }
-    // disable synchronous version of this method
-    ::grpc::Status ExactJoinTables(::grpc::ServerContext* /*context*/, const ::io::deephaven::proto::backplane::grpc::ExactJoinTablesRequest* /*request*/, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse* /*response*/) override {
-      abort();
-      return ::grpc::Status(::grpc::StatusCode::UNIMPLEMENTED, "");
-    }
-  };
-  template <class BaseClass>
-  class WithGenericMethod_LeftJoinTables : public BaseClass {
-   private:
-    void BaseClassMustBeDerivedFromService(const Service* /*service*/) {}
-   public:
-    WithGenericMethod_LeftJoinTables() {
-      ::grpc::Service::MarkMethodGeneric(25);
-    }
-    ~WithGenericMethod_LeftJoinTables() override {
-      BaseClassMustBeDerivedFromService(this);
-    }
-    // disable synchronous version of this method
-    ::grpc::Status LeftJoinTables(::grpc::ServerContext* /*context*/, const ::io::deephaven::proto::backplane::grpc::LeftJoinTablesRequest* /*request*/, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse* /*response*/) override {
-      abort();
-      return ::grpc::Status(::grpc::StatusCode::UNIMPLEMENTED, "");
-    }
-  };
-  template <class BaseClass>
-  class WithGenericMethod_AsOfJoinTables : public BaseClass {
-   private:
-    void BaseClassMustBeDerivedFromService(const Service* /*service*/) {}
-   public:
-    WithGenericMethod_AsOfJoinTables() {
-      ::grpc::Service::MarkMethodGeneric(26);
-    }
-    ~WithGenericMethod_AsOfJoinTables() override {
-      BaseClassMustBeDerivedFromService(this);
-    }
-    // disable synchronous version of this method
-    ::grpc::Status AsOfJoinTables(::grpc::ServerContext* /*context*/, const ::io::deephaven::proto::backplane::grpc::AsOfJoinTablesRequest* /*request*/, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse* /*response*/) override {
-      abort();
-      return ::grpc::Status(::grpc::StatusCode::UNIMPLEMENTED, "");
-    }
-  };
-  template <class BaseClass>
-  class WithGenericMethod_AjTables : public BaseClass {
-   private:
-    void BaseClassMustBeDerivedFromService(const Service* /*service*/) {}
-   public:
-    WithGenericMethod_AjTables() {
-      ::grpc::Service::MarkMethodGeneric(27);
-    }
-    ~WithGenericMethod_AjTables() override {
-      BaseClassMustBeDerivedFromService(this);
-    }
-    // disable synchronous version of this method
-    ::grpc::Status AjTables(::grpc::ServerContext* /*context*/, const ::io::deephaven::proto::backplane::grpc::AjRajTablesRequest* /*request*/, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse* /*response*/) override {
-      abort();
-      return ::grpc::Status(::grpc::StatusCode::UNIMPLEMENTED, "");
-    }
-  };
-  template <class BaseClass>
-  class WithGenericMethod_RajTables : public BaseClass {
-   private:
-    void BaseClassMustBeDerivedFromService(const Service* /*service*/) {}
-   public:
-    WithGenericMethod_RajTables() {
-      ::grpc::Service::MarkMethodGeneric(28);
-    }
-    ~WithGenericMethod_RajTables() override {
-      BaseClassMustBeDerivedFromService(this);
-    }
-    // disable synchronous version of this method
-    ::grpc::Status RajTables(::grpc::ServerContext* /*context*/, const ::io::deephaven::proto::backplane::grpc::AjRajTablesRequest* /*request*/, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse* /*response*/) override {
-      abort();
-      return ::grpc::Status(::grpc::StatusCode::UNIMPLEMENTED, "");
-    }
-  };
-  template <class BaseClass>
-  class WithGenericMethod_MultiJoinTables : public BaseClass {
-   private:
-    void BaseClassMustBeDerivedFromService(const Service* /*service*/) {}
-   public:
-    WithGenericMethod_MultiJoinTables() {
-      ::grpc::Service::MarkMethodGeneric(29);
-    }
-    ~WithGenericMethod_MultiJoinTables() override {
-      BaseClassMustBeDerivedFromService(this);
-    }
-    // disable synchronous version of this method
-    ::grpc::Status MultiJoinTables(::grpc::ServerContext* /*context*/, const ::io::deephaven::proto::backplane::grpc::MultiJoinTablesRequest* /*request*/, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse* /*response*/) override {
-      abort();
-      return ::grpc::Status(::grpc::StatusCode::UNIMPLEMENTED, "");
-    }
-  };
-  template <class BaseClass>
-  class WithGenericMethod_RangeJoinTables : public BaseClass {
-   private:
-    void BaseClassMustBeDerivedFromService(const Service* /*service*/) {}
-   public:
-    WithGenericMethod_RangeJoinTables() {
-      ::grpc::Service::MarkMethodGeneric(30);
-    }
-    ~WithGenericMethod_RangeJoinTables() override {
-      BaseClassMustBeDerivedFromService(this);
-    }
-    // disable synchronous version of this method
-    ::grpc::Status RangeJoinTables(::grpc::ServerContext* /*context*/, const ::io::deephaven::proto::backplane::grpc::RangeJoinTablesRequest* /*request*/, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse* /*response*/) override {
-      abort();
-      return ::grpc::Status(::grpc::StatusCode::UNIMPLEMENTED, "");
-    }
-  };
-  template <class BaseClass>
-  class WithGenericMethod_ComboAggregate : public BaseClass {
-   private:
-    void BaseClassMustBeDerivedFromService(const Service* /*service*/) {}
-   public:
-    WithGenericMethod_ComboAggregate() {
-      ::grpc::Service::MarkMethodGeneric(31);
-    }
-    ~WithGenericMethod_ComboAggregate() override {
-      BaseClassMustBeDerivedFromService(this);
-    }
-    // disable synchronous version of this method
-    ::grpc::Status ComboAggregate(::grpc::ServerContext* /*context*/, const ::io::deephaven::proto::backplane::grpc::ComboAggregateRequest* /*request*/, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse* /*response*/) override {
-      abort();
-      return ::grpc::Status(::grpc::StatusCode::UNIMPLEMENTED, "");
-    }
-  };
-  template <class BaseClass>
-  class WithGenericMethod_AggregateAll : public BaseClass {
-   private:
-    void BaseClassMustBeDerivedFromService(const Service* /*service*/) {}
-   public:
-    WithGenericMethod_AggregateAll() {
-      ::grpc::Service::MarkMethodGeneric(32);
-    }
-    ~WithGenericMethod_AggregateAll() override {
-      BaseClassMustBeDerivedFromService(this);
-    }
-    // disable synchronous version of this method
-    ::grpc::Status AggregateAll(::grpc::ServerContext* /*context*/, const ::io::deephaven::proto::backplane::grpc::AggregateAllRequest* /*request*/, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse* /*response*/) override {
-      abort();
-      return ::grpc::Status(::grpc::StatusCode::UNIMPLEMENTED, "");
-    }
-  };
-  template <class BaseClass>
-  class WithGenericMethod_Aggregate : public BaseClass {
-   private:
-    void BaseClassMustBeDerivedFromService(const Service* /*service*/) {}
-   public:
-    WithGenericMethod_Aggregate() {
-      ::grpc::Service::MarkMethodGeneric(33);
-    }
-    ~WithGenericMethod_Aggregate() override {
-      BaseClassMustBeDerivedFromService(this);
-    }
-    // disable synchronous version of this method
-    ::grpc::Status Aggregate(::grpc::ServerContext* /*context*/, const ::io::deephaven::proto::backplane::grpc::AggregateRequest* /*request*/, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse* /*response*/) override {
-      abort();
-      return ::grpc::Status(::grpc::StatusCode::UNIMPLEMENTED, "");
-    }
-  };
-  template <class BaseClass>
-  class WithGenericMethod_Snapshot : public BaseClass {
-   private:
-    void BaseClassMustBeDerivedFromService(const Service* /*service*/) {}
-   public:
-    WithGenericMethod_Snapshot() {
-      ::grpc::Service::MarkMethodGeneric(34);
-    }
-    ~WithGenericMethod_Snapshot() override {
-      BaseClassMustBeDerivedFromService(this);
-    }
-    // disable synchronous version of this method
-    ::grpc::Status Snapshot(::grpc::ServerContext* /*context*/, const ::io::deephaven::proto::backplane::grpc::SnapshotTableRequest* /*request*/, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse* /*response*/) override {
-      abort();
-      return ::grpc::Status(::grpc::StatusCode::UNIMPLEMENTED, "");
-    }
-  };
-  template <class BaseClass>
-  class WithGenericMethod_SnapshotWhen : public BaseClass {
-   private:
-    void BaseClassMustBeDerivedFromService(const Service* /*service*/) {}
-   public:
-    WithGenericMethod_SnapshotWhen() {
-      ::grpc::Service::MarkMethodGeneric(35);
-    }
-    ~WithGenericMethod_SnapshotWhen() override {
-      BaseClassMustBeDerivedFromService(this);
-    }
-    // disable synchronous version of this method
-    ::grpc::Status SnapshotWhen(::grpc::ServerContext* /*context*/, const ::io::deephaven::proto::backplane::grpc::SnapshotWhenTableRequest* /*request*/, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse* /*response*/) override {
-      abort();
-      return ::grpc::Status(::grpc::StatusCode::UNIMPLEMENTED, "");
-    }
-  };
-  template <class BaseClass>
-  class WithGenericMethod_Flatten : public BaseClass {
-   private:
-    void BaseClassMustBeDerivedFromService(const Service* /*service*/) {}
-   public:
-    WithGenericMethod_Flatten() {
-      ::grpc::Service::MarkMethodGeneric(36);
-    }
-    ~WithGenericMethod_Flatten() override {
-      BaseClassMustBeDerivedFromService(this);
-    }
-    // disable synchronous version of this method
-    ::grpc::Status Flatten(::grpc::ServerContext* /*context*/, const ::io::deephaven::proto::backplane::grpc::FlattenRequest* /*request*/, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse* /*response*/) override {
-      abort();
-      return ::grpc::Status(::grpc::StatusCode::UNIMPLEMENTED, "");
-    }
-  };
-  template <class BaseClass>
-  class WithGenericMethod_RunChartDownsample : public BaseClass {
-   private:
-    void BaseClassMustBeDerivedFromService(const Service* /*service*/) {}
-   public:
-    WithGenericMethod_RunChartDownsample() {
-      ::grpc::Service::MarkMethodGeneric(37);
-    }
-    ~WithGenericMethod_RunChartDownsample() override {
-      BaseClassMustBeDerivedFromService(this);
-    }
-    // disable synchronous version of this method
-    ::grpc::Status RunChartDownsample(::grpc::ServerContext* /*context*/, const ::io::deephaven::proto::backplane::grpc::RunChartDownsampleRequest* /*request*/, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse* /*response*/) override {
-      abort();
-      return ::grpc::Status(::grpc::StatusCode::UNIMPLEMENTED, "");
-    }
-  };
-  template <class BaseClass>
-  class WithGenericMethod_CreateInputTable : public BaseClass {
-   private:
-    void BaseClassMustBeDerivedFromService(const Service* /*service*/) {}
-   public:
-    WithGenericMethod_CreateInputTable() {
-      ::grpc::Service::MarkMethodGeneric(38);
-    }
-    ~WithGenericMethod_CreateInputTable() override {
-      BaseClassMustBeDerivedFromService(this);
-    }
-    // disable synchronous version of this method
-    ::grpc::Status CreateInputTable(::grpc::ServerContext* /*context*/, const ::io::deephaven::proto::backplane::grpc::CreateInputTableRequest* /*request*/, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse* /*response*/) override {
-      abort();
-      return ::grpc::Status(::grpc::StatusCode::UNIMPLEMENTED, "");
-    }
-  };
-  template <class BaseClass>
-  class WithGenericMethod_WhereIn : public BaseClass {
-   private:
-    void BaseClassMustBeDerivedFromService(const Service* /*service*/) {}
-   public:
-    WithGenericMethod_WhereIn() {
-      ::grpc::Service::MarkMethodGeneric(39);
-    }
-    ~WithGenericMethod_WhereIn() override {
-      BaseClassMustBeDerivedFromService(this);
-    }
-    // disable synchronous version of this method
-    ::grpc::Status WhereIn(::grpc::ServerContext* /*context*/, const ::io::deephaven::proto::backplane::grpc::WhereInRequest* /*request*/, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse* /*response*/) override {
-      abort();
-      return ::grpc::Status(::grpc::StatusCode::UNIMPLEMENTED, "");
-    }
-  };
-  template <class BaseClass>
-  class WithGenericMethod_Batch : public BaseClass {
-   private:
-    void BaseClassMustBeDerivedFromService(const Service* /*service*/) {}
-   public:
-    WithGenericMethod_Batch() {
-      ::grpc::Service::MarkMethodGeneric(40);
-    }
-    ~WithGenericMethod_Batch() override {
-      BaseClassMustBeDerivedFromService(this);
-    }
-    // disable synchronous version of this method
-    ::grpc::Status Batch(::grpc::ServerContext* /*context*/, const ::io::deephaven::proto::backplane::grpc::BatchTableRequest* /*request*/, ::grpc::ServerWriter< ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse>* /*writer*/) override {
-      abort();
-      return ::grpc::Status(::grpc::StatusCode::UNIMPLEMENTED, "");
-    }
-  };
-  template <class BaseClass>
-  class WithGenericMethod_ExportedTableUpdates : public BaseClass {
-   private:
-    void BaseClassMustBeDerivedFromService(const Service* /*service*/) {}
-   public:
-    WithGenericMethod_ExportedTableUpdates() {
-      ::grpc::Service::MarkMethodGeneric(41);
-    }
-    ~WithGenericMethod_ExportedTableUpdates() override {
-      BaseClassMustBeDerivedFromService(this);
-    }
-    // disable synchronous version of this method
-    ::grpc::Status ExportedTableUpdates(::grpc::ServerContext* /*context*/, const ::io::deephaven::proto::backplane::grpc::ExportedTableUpdatesRequest* /*request*/, ::grpc::ServerWriter< ::io::deephaven::proto::backplane::grpc::ExportedTableUpdateMessage>* /*writer*/) override {
-      abort();
-      return ::grpc::Status(::grpc::StatusCode::UNIMPLEMENTED, "");
-    }
-  };
-  template <class BaseClass>
-  class WithGenericMethod_SeekRow : public BaseClass {
-   private:
-    void BaseClassMustBeDerivedFromService(const Service* /*service*/) {}
-   public:
-    WithGenericMethod_SeekRow() {
-      ::grpc::Service::MarkMethodGeneric(42);
-    }
-    ~WithGenericMethod_SeekRow() override {
-      BaseClassMustBeDerivedFromService(this);
-    }
-    // disable synchronous version of this method
-    ::grpc::Status SeekRow(::grpc::ServerContext* /*context*/, const ::io::deephaven::proto::backplane::grpc::SeekRowRequest* /*request*/, ::io::deephaven::proto::backplane::grpc::SeekRowResponse* /*response*/) override {
-      abort();
-      return ::grpc::Status(::grpc::StatusCode::UNIMPLEMENTED, "");
-    }
-  };
-  template <class BaseClass>
-  class WithGenericMethod_MetaTable : public BaseClass {
-   private:
-    void BaseClassMustBeDerivedFromService(const Service* /*service*/) {}
-   public:
-    WithGenericMethod_MetaTable() {
-      ::grpc::Service::MarkMethodGeneric(43);
-    }
-    ~WithGenericMethod_MetaTable() override {
-      BaseClassMustBeDerivedFromService(this);
-    }
-    // disable synchronous version of this method
-    ::grpc::Status MetaTable(::grpc::ServerContext* /*context*/, const ::io::deephaven::proto::backplane::grpc::MetaTableRequest* /*request*/, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse* /*response*/) override {
-      abort();
-      return ::grpc::Status(::grpc::StatusCode::UNIMPLEMENTED, "");
-    }
-  };
-  template <class BaseClass>
-  class WithGenericMethod_ComputeColumnStatistics : public BaseClass {
-   private:
-    void BaseClassMustBeDerivedFromService(const Service* /*service*/) {}
-   public:
-    WithGenericMethod_ComputeColumnStatistics() {
-      ::grpc::Service::MarkMethodGeneric(44);
-    }
-    ~WithGenericMethod_ComputeColumnStatistics() override {
-      BaseClassMustBeDerivedFromService(this);
-    }
-    // disable synchronous version of this method
-    ::grpc::Status ComputeColumnStatistics(::grpc::ServerContext* /*context*/, const ::io::deephaven::proto::backplane::grpc::ColumnStatisticsRequest* /*request*/, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse* /*response*/) override {
-      abort();
-      return ::grpc::Status(::grpc::StatusCode::UNIMPLEMENTED, "");
-    }
-  };
-  template <class BaseClass>
-  class WithRawMethod_GetExportedTableCreationResponse : public BaseClass {
-   private:
-    void BaseClassMustBeDerivedFromService(const Service* /*service*/) {}
-   public:
-    WithRawMethod_GetExportedTableCreationResponse() {
-      ::grpc::Service::MarkMethodRaw(0);
-    }
-    ~WithRawMethod_GetExportedTableCreationResponse() override {
-      BaseClassMustBeDerivedFromService(this);
-    }
-    // disable synchronous version of this method
-    ::grpc::Status GetExportedTableCreationResponse(::grpc::ServerContext* /*context*/, const ::io::deephaven::proto::backplane::grpc::Ticket* /*request*/, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse* /*response*/) override {
-      abort();
-      return ::grpc::Status(::grpc::StatusCode::UNIMPLEMENTED, "");
-    }
-    void RequestGetExportedTableCreationResponse(::grpc::ServerContext* context, ::grpc::ByteBuffer* request, ::grpc::ServerAsyncResponseWriter< ::grpc::ByteBuffer>* response, ::grpc::CompletionQueue* new_call_cq, ::grpc::ServerCompletionQueue* notification_cq, void *tag) {
-      ::grpc::Service::RequestAsyncUnary(0, context, request, response, new_call_cq, notification_cq, tag);
-    }
-  };
-  template <class BaseClass>
-  class WithRawMethod_FetchTable : public BaseClass {
-   private:
-    void BaseClassMustBeDerivedFromService(const Service* /*service*/) {}
-   public:
-    WithRawMethod_FetchTable() {
-      ::grpc::Service::MarkMethodRaw(1);
-    }
-    ~WithRawMethod_FetchTable() override {
-      BaseClassMustBeDerivedFromService(this);
-    }
-    // disable synchronous version of this method
-    ::grpc::Status FetchTable(::grpc::ServerContext* /*context*/, const ::io::deephaven::proto::backplane::grpc::FetchTableRequest* /*request*/, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse* /*response*/) override {
-      abort();
-      return ::grpc::Status(::grpc::StatusCode::UNIMPLEMENTED, "");
-    }
-    void RequestFetchTable(::grpc::ServerContext* context, ::grpc::ByteBuffer* request, ::grpc::ServerAsyncResponseWriter< ::grpc::ByteBuffer>* response, ::grpc::CompletionQueue* new_call_cq, ::grpc::ServerCompletionQueue* notification_cq, void *tag) {
-      ::grpc::Service::RequestAsyncUnary(1, context, request, response, new_call_cq, notification_cq, tag);
-    }
-  };
-  template <class BaseClass>
-  class WithRawMethod_ApplyPreviewColumns : public BaseClass {
-   private:
-    void BaseClassMustBeDerivedFromService(const Service* /*service*/) {}
-   public:
-    WithRawMethod_ApplyPreviewColumns() {
-      ::grpc::Service::MarkMethodRaw(2);
-    }
-    ~WithRawMethod_ApplyPreviewColumns() override {
-      BaseClassMustBeDerivedFromService(this);
-    }
-    // disable synchronous version of this method
-    ::grpc::Status ApplyPreviewColumns(::grpc::ServerContext* /*context*/, const ::io::deephaven::proto::backplane::grpc::ApplyPreviewColumnsRequest* /*request*/, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse* /*response*/) override {
-      abort();
-      return ::grpc::Status(::grpc::StatusCode::UNIMPLEMENTED, "");
-    }
-    void RequestApplyPreviewColumns(::grpc::ServerContext* context, ::grpc::ByteBuffer* request, ::grpc::ServerAsyncResponseWriter< ::grpc::ByteBuffer>* response, ::grpc::CompletionQueue* new_call_cq, ::grpc::ServerCompletionQueue* notification_cq, void *tag) {
-      ::grpc::Service::RequestAsyncUnary(2, context, request, response, new_call_cq, notification_cq, tag);
-    }
-  };
-  template <class BaseClass>
-  class WithRawMethod_EmptyTable : public BaseClass {
-   private:
-    void BaseClassMustBeDerivedFromService(const Service* /*service*/) {}
-   public:
-    WithRawMethod_EmptyTable() {
-      ::grpc::Service::MarkMethodRaw(3);
-    }
-    ~WithRawMethod_EmptyTable() override {
-      BaseClassMustBeDerivedFromService(this);
-    }
-    // disable synchronous version of this method
-    ::grpc::Status EmptyTable(::grpc::ServerContext* /*context*/, const ::io::deephaven::proto::backplane::grpc::EmptyTableRequest* /*request*/, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse* /*response*/) override {
-      abort();
-      return ::grpc::Status(::grpc::StatusCode::UNIMPLEMENTED, "");
-    }
-    void RequestEmptyTable(::grpc::ServerContext* context, ::grpc::ByteBuffer* request, ::grpc::ServerAsyncResponseWriter< ::grpc::ByteBuffer>* response, ::grpc::CompletionQueue* new_call_cq, ::grpc::ServerCompletionQueue* notification_cq, void *tag) {
-      ::grpc::Service::RequestAsyncUnary(3, context, request, response, new_call_cq, notification_cq, tag);
-    }
-  };
-  template <class BaseClass>
-  class WithRawMethod_TimeTable : public BaseClass {
-   private:
-    void BaseClassMustBeDerivedFromService(const Service* /*service*/) {}
-   public:
-    WithRawMethod_TimeTable() {
-      ::grpc::Service::MarkMethodRaw(4);
-    }
-    ~WithRawMethod_TimeTable() override {
-      BaseClassMustBeDerivedFromService(this);
-    }
-    // disable synchronous version of this method
-    ::grpc::Status TimeTable(::grpc::ServerContext* /*context*/, const ::io::deephaven::proto::backplane::grpc::TimeTableRequest* /*request*/, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse* /*response*/) override {
-      abort();
-      return ::grpc::Status(::grpc::StatusCode::UNIMPLEMENTED, "");
-    }
-    void RequestTimeTable(::grpc::ServerContext* context, ::grpc::ByteBuffer* request, ::grpc::ServerAsyncResponseWriter< ::grpc::ByteBuffer>* response, ::grpc::CompletionQueue* new_call_cq, ::grpc::ServerCompletionQueue* notification_cq, void *tag) {
-      ::grpc::Service::RequestAsyncUnary(4, context, request, response, new_call_cq, notification_cq, tag);
-    }
-  };
-  template <class BaseClass>
-  class WithRawMethod_DropColumns : public BaseClass {
-   private:
-    void BaseClassMustBeDerivedFromService(const Service* /*service*/) {}
-   public:
-    WithRawMethod_DropColumns() {
-      ::grpc::Service::MarkMethodRaw(5);
-    }
-    ~WithRawMethod_DropColumns() override {
-      BaseClassMustBeDerivedFromService(this);
-    }
-    // disable synchronous version of this method
-    ::grpc::Status DropColumns(::grpc::ServerContext* /*context*/, const ::io::deephaven::proto::backplane::grpc::DropColumnsRequest* /*request*/, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse* /*response*/) override {
-      abort();
-      return ::grpc::Status(::grpc::StatusCode::UNIMPLEMENTED, "");
-    }
-    void RequestDropColumns(::grpc::ServerContext* context, ::grpc::ByteBuffer* request, ::grpc::ServerAsyncResponseWriter< ::grpc::ByteBuffer>* response, ::grpc::CompletionQueue* new_call_cq, ::grpc::ServerCompletionQueue* notification_cq, void *tag) {
-      ::grpc::Service::RequestAsyncUnary(5, context, request, response, new_call_cq, notification_cq, tag);
-    }
-  };
-  template <class BaseClass>
-  class WithRawMethod_Update : public BaseClass {
-   private:
-    void BaseClassMustBeDerivedFromService(const Service* /*service*/) {}
-   public:
-    WithRawMethod_Update() {
-      ::grpc::Service::MarkMethodRaw(6);
-    }
-    ~WithRawMethod_Update() override {
-      BaseClassMustBeDerivedFromService(this);
-    }
-    // disable synchronous version of this method
-    ::grpc::Status Update(::grpc::ServerContext* /*context*/, const ::io::deephaven::proto::backplane::grpc::SelectOrUpdateRequest* /*request*/, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse* /*response*/) override {
-      abort();
-      return ::grpc::Status(::grpc::StatusCode::UNIMPLEMENTED, "");
-    }
-    void RequestUpdate(::grpc::ServerContext* context, ::grpc::ByteBuffer* request, ::grpc::ServerAsyncResponseWriter< ::grpc::ByteBuffer>* response, ::grpc::CompletionQueue* new_call_cq, ::grpc::ServerCompletionQueue* notification_cq, void *tag) {
-      ::grpc::Service::RequestAsyncUnary(6, context, request, response, new_call_cq, notification_cq, tag);
-    }
-  };
-  template <class BaseClass>
-  class WithRawMethod_LazyUpdate : public BaseClass {
-   private:
-    void BaseClassMustBeDerivedFromService(const Service* /*service*/) {}
-   public:
-    WithRawMethod_LazyUpdate() {
-      ::grpc::Service::MarkMethodRaw(7);
-    }
-    ~WithRawMethod_LazyUpdate() override {
-      BaseClassMustBeDerivedFromService(this);
-    }
-    // disable synchronous version of this method
-    ::grpc::Status LazyUpdate(::grpc::ServerContext* /*context*/, const ::io::deephaven::proto::backplane::grpc::SelectOrUpdateRequest* /*request*/, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse* /*response*/) override {
-      abort();
-      return ::grpc::Status(::grpc::StatusCode::UNIMPLEMENTED, "");
-    }
-    void RequestLazyUpdate(::grpc::ServerContext* context, ::grpc::ByteBuffer* request, ::grpc::ServerAsyncResponseWriter< ::grpc::ByteBuffer>* response, ::grpc::CompletionQueue* new_call_cq, ::grpc::ServerCompletionQueue* notification_cq, void *tag) {
-      ::grpc::Service::RequestAsyncUnary(7, context, request, response, new_call_cq, notification_cq, tag);
-    }
-  };
-  template <class BaseClass>
-  class WithRawMethod_View : public BaseClass {
-   private:
-    void BaseClassMustBeDerivedFromService(const Service* /*service*/) {}
-   public:
-    WithRawMethod_View() {
-      ::grpc::Service::MarkMethodRaw(8);
-    }
-    ~WithRawMethod_View() override {
-      BaseClassMustBeDerivedFromService(this);
-    }
-    // disable synchronous version of this method
-    ::grpc::Status View(::grpc::ServerContext* /*context*/, const ::io::deephaven::proto::backplane::grpc::SelectOrUpdateRequest* /*request*/, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse* /*response*/) override {
-      abort();
-      return ::grpc::Status(::grpc::StatusCode::UNIMPLEMENTED, "");
-    }
-    void RequestView(::grpc::ServerContext* context, ::grpc::ByteBuffer* request, ::grpc::ServerAsyncResponseWriter< ::grpc::ByteBuffer>* response, ::grpc::CompletionQueue* new_call_cq, ::grpc::ServerCompletionQueue* notification_cq, void *tag) {
-      ::grpc::Service::RequestAsyncUnary(8, context, request, response, new_call_cq, notification_cq, tag);
-    }
-  };
-  template <class BaseClass>
-  class WithRawMethod_UpdateView : public BaseClass {
-   private:
-    void BaseClassMustBeDerivedFromService(const Service* /*service*/) {}
-   public:
-    WithRawMethod_UpdateView() {
-      ::grpc::Service::MarkMethodRaw(9);
-    }
-    ~WithRawMethod_UpdateView() override {
-      BaseClassMustBeDerivedFromService(this);
-    }
-    // disable synchronous version of this method
-    ::grpc::Status UpdateView(::grpc::ServerContext* /*context*/, const ::io::deephaven::proto::backplane::grpc::SelectOrUpdateRequest* /*request*/, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse* /*response*/) override {
-      abort();
-      return ::grpc::Status(::grpc::StatusCode::UNIMPLEMENTED, "");
-    }
-    void RequestUpdateView(::grpc::ServerContext* context, ::grpc::ByteBuffer* request, ::grpc::ServerAsyncResponseWriter< ::grpc::ByteBuffer>* response, ::grpc::CompletionQueue* new_call_cq, ::grpc::ServerCompletionQueue* notification_cq, void *tag) {
-      ::grpc::Service::RequestAsyncUnary(9, context, request, response, new_call_cq, notification_cq, tag);
-    }
-  };
-  template <class BaseClass>
-  class WithRawMethod_Select : public BaseClass {
-   private:
-    void BaseClassMustBeDerivedFromService(const Service* /*service*/) {}
-   public:
-    WithRawMethod_Select() {
-      ::grpc::Service::MarkMethodRaw(10);
-    }
-    ~WithRawMethod_Select() override {
-      BaseClassMustBeDerivedFromService(this);
-    }
-    // disable synchronous version of this method
-    ::grpc::Status Select(::grpc::ServerContext* /*context*/, const ::io::deephaven::proto::backplane::grpc::SelectOrUpdateRequest* /*request*/, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse* /*response*/) override {
-      abort();
-      return ::grpc::Status(::grpc::StatusCode::UNIMPLEMENTED, "");
-    }
-    void RequestSelect(::grpc::ServerContext* context, ::grpc::ByteBuffer* request, ::grpc::ServerAsyncResponseWriter< ::grpc::ByteBuffer>* response, ::grpc::CompletionQueue* new_call_cq, ::grpc::ServerCompletionQueue* notification_cq, void *tag) {
-      ::grpc::Service::RequestAsyncUnary(10, context, request, response, new_call_cq, notification_cq, tag);
-    }
-  };
-  template <class BaseClass>
-  class WithRawMethod_UpdateBy : public BaseClass {
-   private:
-    void BaseClassMustBeDerivedFromService(const Service* /*service*/) {}
-   public:
-    WithRawMethod_UpdateBy() {
-      ::grpc::Service::MarkMethodRaw(11);
-    }
-    ~WithRawMethod_UpdateBy() override {
-      BaseClassMustBeDerivedFromService(this);
-    }
-    // disable synchronous version of this method
-    ::grpc::Status UpdateBy(::grpc::ServerContext* /*context*/, const ::io::deephaven::proto::backplane::grpc::UpdateByRequest* /*request*/, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse* /*response*/) override {
-      abort();
-      return ::grpc::Status(::grpc::StatusCode::UNIMPLEMENTED, "");
-    }
-    void RequestUpdateBy(::grpc::ServerContext* context, ::grpc::ByteBuffer* request, ::grpc::ServerAsyncResponseWriter< ::grpc::ByteBuffer>* response, ::grpc::CompletionQueue* new_call_cq, ::grpc::ServerCompletionQueue* notification_cq, void *tag) {
-      ::grpc::Service::RequestAsyncUnary(11, context, request, response, new_call_cq, notification_cq, tag);
-    }
-  };
-  template <class BaseClass>
-  class WithRawMethod_SelectDistinct : public BaseClass {
-   private:
-    void BaseClassMustBeDerivedFromService(const Service* /*service*/) {}
-   public:
-    WithRawMethod_SelectDistinct() {
-      ::grpc::Service::MarkMethodRaw(12);
-    }
-    ~WithRawMethod_SelectDistinct() override {
-      BaseClassMustBeDerivedFromService(this);
-    }
-    // disable synchronous version of this method
-    ::grpc::Status SelectDistinct(::grpc::ServerContext* /*context*/, const ::io::deephaven::proto::backplane::grpc::SelectDistinctRequest* /*request*/, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse* /*response*/) override {
-      abort();
-      return ::grpc::Status(::grpc::StatusCode::UNIMPLEMENTED, "");
-    }
-    void RequestSelectDistinct(::grpc::ServerContext* context, ::grpc::ByteBuffer* request, ::grpc::ServerAsyncResponseWriter< ::grpc::ByteBuffer>* response, ::grpc::CompletionQueue* new_call_cq, ::grpc::ServerCompletionQueue* notification_cq, void *tag) {
-      ::grpc::Service::RequestAsyncUnary(12, context, request, response, new_call_cq, notification_cq, tag);
-    }
-  };
-  template <class BaseClass>
-  class WithRawMethod_Filter : public BaseClass {
-   private:
-    void BaseClassMustBeDerivedFromService(const Service* /*service*/) {}
-   public:
-    WithRawMethod_Filter() {
-      ::grpc::Service::MarkMethodRaw(13);
-    }
-    ~WithRawMethod_Filter() override {
-      BaseClassMustBeDerivedFromService(this);
-    }
-    // disable synchronous version of this method
-    ::grpc::Status Filter(::grpc::ServerContext* /*context*/, const ::io::deephaven::proto::backplane::grpc::FilterTableRequest* /*request*/, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse* /*response*/) override {
-      abort();
-      return ::grpc::Status(::grpc::StatusCode::UNIMPLEMENTED, "");
-    }
-    void RequestFilter(::grpc::ServerContext* context, ::grpc::ByteBuffer* request, ::grpc::ServerAsyncResponseWriter< ::grpc::ByteBuffer>* response, ::grpc::CompletionQueue* new_call_cq, ::grpc::ServerCompletionQueue* notification_cq, void *tag) {
-      ::grpc::Service::RequestAsyncUnary(13, context, request, response, new_call_cq, notification_cq, tag);
-    }
-  };
-  template <class BaseClass>
-  class WithRawMethod_UnstructuredFilter : public BaseClass {
-   private:
-    void BaseClassMustBeDerivedFromService(const Service* /*service*/) {}
-   public:
-    WithRawMethod_UnstructuredFilter() {
-      ::grpc::Service::MarkMethodRaw(14);
-    }
-    ~WithRawMethod_UnstructuredFilter() override {
-      BaseClassMustBeDerivedFromService(this);
-    }
-    // disable synchronous version of this method
-    ::grpc::Status UnstructuredFilter(::grpc::ServerContext* /*context*/, const ::io::deephaven::proto::backplane::grpc::UnstructuredFilterTableRequest* /*request*/, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse* /*response*/) override {
-      abort();
-      return ::grpc::Status(::grpc::StatusCode::UNIMPLEMENTED, "");
-    }
-    void RequestUnstructuredFilter(::grpc::ServerContext* context, ::grpc::ByteBuffer* request, ::grpc::ServerAsyncResponseWriter< ::grpc::ByteBuffer>* response, ::grpc::CompletionQueue* new_call_cq, ::grpc::ServerCompletionQueue* notification_cq, void *tag) {
-      ::grpc::Service::RequestAsyncUnary(14, context, request, response, new_call_cq, notification_cq, tag);
-    }
-  };
-  template <class BaseClass>
-  class WithRawMethod_Sort : public BaseClass {
-   private:
-    void BaseClassMustBeDerivedFromService(const Service* /*service*/) {}
-   public:
-    WithRawMethod_Sort() {
-      ::grpc::Service::MarkMethodRaw(15);
-    }
-    ~WithRawMethod_Sort() override {
-      BaseClassMustBeDerivedFromService(this);
-    }
-    // disable synchronous version of this method
-    ::grpc::Status Sort(::grpc::ServerContext* /*context*/, const ::io::deephaven::proto::backplane::grpc::SortTableRequest* /*request*/, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse* /*response*/) override {
-      abort();
-      return ::grpc::Status(::grpc::StatusCode::UNIMPLEMENTED, "");
-    }
-    void RequestSort(::grpc::ServerContext* context, ::grpc::ByteBuffer* request, ::grpc::ServerAsyncResponseWriter< ::grpc::ByteBuffer>* response, ::grpc::CompletionQueue* new_call_cq, ::grpc::ServerCompletionQueue* notification_cq, void *tag) {
-      ::grpc::Service::RequestAsyncUnary(15, context, request, response, new_call_cq, notification_cq, tag);
-    }
-  };
-  template <class BaseClass>
-  class WithRawMethod_Head : public BaseClass {
-   private:
-    void BaseClassMustBeDerivedFromService(const Service* /*service*/) {}
-   public:
-    WithRawMethod_Head() {
-      ::grpc::Service::MarkMethodRaw(16);
-    }
-    ~WithRawMethod_Head() override {
-      BaseClassMustBeDerivedFromService(this);
-    }
-    // disable synchronous version of this method
-    ::grpc::Status Head(::grpc::ServerContext* /*context*/, const ::io::deephaven::proto::backplane::grpc::HeadOrTailRequest* /*request*/, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse* /*response*/) override {
-      abort();
-      return ::grpc::Status(::grpc::StatusCode::UNIMPLEMENTED, "");
-    }
-    void RequestHead(::grpc::ServerContext* context, ::grpc::ByteBuffer* request, ::grpc::ServerAsyncResponseWriter< ::grpc::ByteBuffer>* response, ::grpc::CompletionQueue* new_call_cq, ::grpc::ServerCompletionQueue* notification_cq, void *tag) {
-      ::grpc::Service::RequestAsyncUnary(16, context, request, response, new_call_cq, notification_cq, tag);
-    }
-  };
-  template <class BaseClass>
-  class WithRawMethod_Tail : public BaseClass {
-   private:
-    void BaseClassMustBeDerivedFromService(const Service* /*service*/) {}
-   public:
-    WithRawMethod_Tail() {
-      ::grpc::Service::MarkMethodRaw(17);
-    }
-    ~WithRawMethod_Tail() override {
-      BaseClassMustBeDerivedFromService(this);
-    }
-    // disable synchronous version of this method
-    ::grpc::Status Tail(::grpc::ServerContext* /*context*/, const ::io::deephaven::proto::backplane::grpc::HeadOrTailRequest* /*request*/, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse* /*response*/) override {
-      abort();
-      return ::grpc::Status(::grpc::StatusCode::UNIMPLEMENTED, "");
-    }
-    void RequestTail(::grpc::ServerContext* context, ::grpc::ByteBuffer* request, ::grpc::ServerAsyncResponseWriter< ::grpc::ByteBuffer>* response, ::grpc::CompletionQueue* new_call_cq, ::grpc::ServerCompletionQueue* notification_cq, void *tag) {
-      ::grpc::Service::RequestAsyncUnary(17, context, request, response, new_call_cq, notification_cq, tag);
-    }
-  };
-  template <class BaseClass>
-  class WithRawMethod_HeadBy : public BaseClass {
-   private:
-    void BaseClassMustBeDerivedFromService(const Service* /*service*/) {}
-   public:
-    WithRawMethod_HeadBy() {
-      ::grpc::Service::MarkMethodRaw(18);
-    }
-    ~WithRawMethod_HeadBy() override {
-      BaseClassMustBeDerivedFromService(this);
-    }
-    // disable synchronous version of this method
-    ::grpc::Status HeadBy(::grpc::ServerContext* /*context*/, const ::io::deephaven::proto::backplane::grpc::HeadOrTailByRequest* /*request*/, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse* /*response*/) override {
-      abort();
-      return ::grpc::Status(::grpc::StatusCode::UNIMPLEMENTED, "");
-    }
-    void RequestHeadBy(::grpc::ServerContext* context, ::grpc::ByteBuffer* request, ::grpc::ServerAsyncResponseWriter< ::grpc::ByteBuffer>* response, ::grpc::CompletionQueue* new_call_cq, ::grpc::ServerCompletionQueue* notification_cq, void *tag) {
-      ::grpc::Service::RequestAsyncUnary(18, context, request, response, new_call_cq, notification_cq, tag);
-    }
-  };
-  template <class BaseClass>
-  class WithRawMethod_TailBy : public BaseClass {
-   private:
-    void BaseClassMustBeDerivedFromService(const Service* /*service*/) {}
-   public:
-    WithRawMethod_TailBy() {
-      ::grpc::Service::MarkMethodRaw(19);
-    }
-    ~WithRawMethod_TailBy() override {
-      BaseClassMustBeDerivedFromService(this);
-    }
-    // disable synchronous version of this method
-    ::grpc::Status TailBy(::grpc::ServerContext* /*context*/, const ::io::deephaven::proto::backplane::grpc::HeadOrTailByRequest* /*request*/, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse* /*response*/) override {
-      abort();
-      return ::grpc::Status(::grpc::StatusCode::UNIMPLEMENTED, "");
-    }
-    void RequestTailBy(::grpc::ServerContext* context, ::grpc::ByteBuffer* request, ::grpc::ServerAsyncResponseWriter< ::grpc::ByteBuffer>* response, ::grpc::CompletionQueue* new_call_cq, ::grpc::ServerCompletionQueue* notification_cq, void *tag) {
-      ::grpc::Service::RequestAsyncUnary(19, context, request, response, new_call_cq, notification_cq, tag);
-    }
-  };
-  template <class BaseClass>
-  class WithRawMethod_Ungroup : public BaseClass {
-   private:
-    void BaseClassMustBeDerivedFromService(const Service* /*service*/) {}
-   public:
-    WithRawMethod_Ungroup() {
-      ::grpc::Service::MarkMethodRaw(20);
-    }
-    ~WithRawMethod_Ungroup() override {
-      BaseClassMustBeDerivedFromService(this);
-    }
-    // disable synchronous version of this method
-    ::grpc::Status Ungroup(::grpc::ServerContext* /*context*/, const ::io::deephaven::proto::backplane::grpc::UngroupRequest* /*request*/, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse* /*response*/) override {
-      abort();
-      return ::grpc::Status(::grpc::StatusCode::UNIMPLEMENTED, "");
-    }
-    void RequestUngroup(::grpc::ServerContext* context, ::grpc::ByteBuffer* request, ::grpc::ServerAsyncResponseWriter< ::grpc::ByteBuffer>* response, ::grpc::CompletionQueue* new_call_cq, ::grpc::ServerCompletionQueue* notification_cq, void *tag) {
-      ::grpc::Service::RequestAsyncUnary(20, context, request, response, new_call_cq, notification_cq, tag);
-    }
-  };
-  template <class BaseClass>
-  class WithRawMethod_MergeTables : public BaseClass {
-   private:
-    void BaseClassMustBeDerivedFromService(const Service* /*service*/) {}
-   public:
-    WithRawMethod_MergeTables() {
-      ::grpc::Service::MarkMethodRaw(21);
-    }
-    ~WithRawMethod_MergeTables() override {
-      BaseClassMustBeDerivedFromService(this);
-    }
-    // disable synchronous version of this method
-    ::grpc::Status MergeTables(::grpc::ServerContext* /*context*/, const ::io::deephaven::proto::backplane::grpc::MergeTablesRequest* /*request*/, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse* /*response*/) override {
-      abort();
-      return ::grpc::Status(::grpc::StatusCode::UNIMPLEMENTED, "");
-    }
-    void RequestMergeTables(::grpc::ServerContext* context, ::grpc::ByteBuffer* request, ::grpc::ServerAsyncResponseWriter< ::grpc::ByteBuffer>* response, ::grpc::CompletionQueue* new_call_cq, ::grpc::ServerCompletionQueue* notification_cq, void *tag) {
-      ::grpc::Service::RequestAsyncUnary(21, context, request, response, new_call_cq, notification_cq, tag);
-    }
-  };
-  template <class BaseClass>
-  class WithRawMethod_CrossJoinTables : public BaseClass {
-   private:
-    void BaseClassMustBeDerivedFromService(const Service* /*service*/) {}
-   public:
-    WithRawMethod_CrossJoinTables() {
-      ::grpc::Service::MarkMethodRaw(22);
-    }
-    ~WithRawMethod_CrossJoinTables() override {
-      BaseClassMustBeDerivedFromService(this);
-    }
-    // disable synchronous version of this method
-    ::grpc::Status CrossJoinTables(::grpc::ServerContext* /*context*/, const ::io::deephaven::proto::backplane::grpc::CrossJoinTablesRequest* /*request*/, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse* /*response*/) override {
-      abort();
-      return ::grpc::Status(::grpc::StatusCode::UNIMPLEMENTED, "");
-    }
-    void RequestCrossJoinTables(::grpc::ServerContext* context, ::grpc::ByteBuffer* request, ::grpc::ServerAsyncResponseWriter< ::grpc::ByteBuffer>* response, ::grpc::CompletionQueue* new_call_cq, ::grpc::ServerCompletionQueue* notification_cq, void *tag) {
-      ::grpc::Service::RequestAsyncUnary(22, context, request, response, new_call_cq, notification_cq, tag);
-    }
-  };
-  template <class BaseClass>
-  class WithRawMethod_NaturalJoinTables : public BaseClass {
-   private:
-    void BaseClassMustBeDerivedFromService(const Service* /*service*/) {}
-   public:
-    WithRawMethod_NaturalJoinTables() {
-      ::grpc::Service::MarkMethodRaw(23);
-    }
-    ~WithRawMethod_NaturalJoinTables() override {
-      BaseClassMustBeDerivedFromService(this);
-    }
-    // disable synchronous version of this method
-    ::grpc::Status NaturalJoinTables(::grpc::ServerContext* /*context*/, const ::io::deephaven::proto::backplane::grpc::NaturalJoinTablesRequest* /*request*/, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse* /*response*/) override {
-      abort();
-      return ::grpc::Status(::grpc::StatusCode::UNIMPLEMENTED, "");
-    }
-    void RequestNaturalJoinTables(::grpc::ServerContext* context, ::grpc::ByteBuffer* request, ::grpc::ServerAsyncResponseWriter< ::grpc::ByteBuffer>* response, ::grpc::CompletionQueue* new_call_cq, ::grpc::ServerCompletionQueue* notification_cq, void *tag) {
-      ::grpc::Service::RequestAsyncUnary(23, context, request, response, new_call_cq, notification_cq, tag);
-    }
-  };
-  template <class BaseClass>
-  class WithRawMethod_ExactJoinTables : public BaseClass {
-   private:
-    void BaseClassMustBeDerivedFromService(const Service* /*service*/) {}
-   public:
-    WithRawMethod_ExactJoinTables() {
-      ::grpc::Service::MarkMethodRaw(24);
-    }
-    ~WithRawMethod_ExactJoinTables() override {
-      BaseClassMustBeDerivedFromService(this);
-    }
-    // disable synchronous version of this method
-    ::grpc::Status ExactJoinTables(::grpc::ServerContext* /*context*/, const ::io::deephaven::proto::backplane::grpc::ExactJoinTablesRequest* /*request*/, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse* /*response*/) override {
-      abort();
-      return ::grpc::Status(::grpc::StatusCode::UNIMPLEMENTED, "");
-    }
-    void RequestExactJoinTables(::grpc::ServerContext* context, ::grpc::ByteBuffer* request, ::grpc::ServerAsyncResponseWriter< ::grpc::ByteBuffer>* response, ::grpc::CompletionQueue* new_call_cq, ::grpc::ServerCompletionQueue* notification_cq, void *tag) {
-      ::grpc::Service::RequestAsyncUnary(24, context, request, response, new_call_cq, notification_cq, tag);
-    }
-  };
-  template <class BaseClass>
-  class WithRawMethod_LeftJoinTables : public BaseClass {
-   private:
-    void BaseClassMustBeDerivedFromService(const Service* /*service*/) {}
-   public:
-    WithRawMethod_LeftJoinTables() {
-      ::grpc::Service::MarkMethodRaw(25);
-    }
-    ~WithRawMethod_LeftJoinTables() override {
-      BaseClassMustBeDerivedFromService(this);
-    }
-    // disable synchronous version of this method
-    ::grpc::Status LeftJoinTables(::grpc::ServerContext* /*context*/, const ::io::deephaven::proto::backplane::grpc::LeftJoinTablesRequest* /*request*/, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse* /*response*/) override {
-      abort();
-      return ::grpc::Status(::grpc::StatusCode::UNIMPLEMENTED, "");
-    }
-    void RequestLeftJoinTables(::grpc::ServerContext* context, ::grpc::ByteBuffer* request, ::grpc::ServerAsyncResponseWriter< ::grpc::ByteBuffer>* response, ::grpc::CompletionQueue* new_call_cq, ::grpc::ServerCompletionQueue* notification_cq, void *tag) {
-      ::grpc::Service::RequestAsyncUnary(25, context, request, response, new_call_cq, notification_cq, tag);
-    }
-  };
-  template <class BaseClass>
-  class WithRawMethod_AsOfJoinTables : public BaseClass {
-   private:
-    void BaseClassMustBeDerivedFromService(const Service* /*service*/) {}
-   public:
-    WithRawMethod_AsOfJoinTables() {
-      ::grpc::Service::MarkMethodRaw(26);
-    }
-    ~WithRawMethod_AsOfJoinTables() override {
-      BaseClassMustBeDerivedFromService(this);
-    }
-    // disable synchronous version of this method
-    ::grpc::Status AsOfJoinTables(::grpc::ServerContext* /*context*/, const ::io::deephaven::proto::backplane::grpc::AsOfJoinTablesRequest* /*request*/, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse* /*response*/) override {
-      abort();
-      return ::grpc::Status(::grpc::StatusCode::UNIMPLEMENTED, "");
-    }
-    void RequestAsOfJoinTables(::grpc::ServerContext* context, ::grpc::ByteBuffer* request, ::grpc::ServerAsyncResponseWriter< ::grpc::ByteBuffer>* response, ::grpc::CompletionQueue* new_call_cq, ::grpc::ServerCompletionQueue* notification_cq, void *tag) {
-      ::grpc::Service::RequestAsyncUnary(26, context, request, response, new_call_cq, notification_cq, tag);
-    }
-  };
-  template <class BaseClass>
-  class WithRawMethod_AjTables : public BaseClass {
-   private:
-    void BaseClassMustBeDerivedFromService(const Service* /*service*/) {}
-   public:
-    WithRawMethod_AjTables() {
-      ::grpc::Service::MarkMethodRaw(27);
-    }
-    ~WithRawMethod_AjTables() override {
-      BaseClassMustBeDerivedFromService(this);
-    }
-    // disable synchronous version of this method
-    ::grpc::Status AjTables(::grpc::ServerContext* /*context*/, const ::io::deephaven::proto::backplane::grpc::AjRajTablesRequest* /*request*/, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse* /*response*/) override {
-      abort();
-      return ::grpc::Status(::grpc::StatusCode::UNIMPLEMENTED, "");
-    }
-    void RequestAjTables(::grpc::ServerContext* context, ::grpc::ByteBuffer* request, ::grpc::ServerAsyncResponseWriter< ::grpc::ByteBuffer>* response, ::grpc::CompletionQueue* new_call_cq, ::grpc::ServerCompletionQueue* notification_cq, void *tag) {
-      ::grpc::Service::RequestAsyncUnary(27, context, request, response, new_call_cq, notification_cq, tag);
-    }
-  };
-  template <class BaseClass>
-  class WithRawMethod_RajTables : public BaseClass {
-   private:
-    void BaseClassMustBeDerivedFromService(const Service* /*service*/) {}
-   public:
-    WithRawMethod_RajTables() {
-      ::grpc::Service::MarkMethodRaw(28);
-    }
-    ~WithRawMethod_RajTables() override {
-      BaseClassMustBeDerivedFromService(this);
-    }
-    // disable synchronous version of this method
-    ::grpc::Status RajTables(::grpc::ServerContext* /*context*/, const ::io::deephaven::proto::backplane::grpc::AjRajTablesRequest* /*request*/, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse* /*response*/) override {
-      abort();
-      return ::grpc::Status(::grpc::StatusCode::UNIMPLEMENTED, "");
-    }
-    void RequestRajTables(::grpc::ServerContext* context, ::grpc::ByteBuffer* request, ::grpc::ServerAsyncResponseWriter< ::grpc::ByteBuffer>* response, ::grpc::CompletionQueue* new_call_cq, ::grpc::ServerCompletionQueue* notification_cq, void *tag) {
-      ::grpc::Service::RequestAsyncUnary(28, context, request, response, new_call_cq, notification_cq, tag);
-    }
-  };
-  template <class BaseClass>
-  class WithRawMethod_MultiJoinTables : public BaseClass {
-   private:
-    void BaseClassMustBeDerivedFromService(const Service* /*service*/) {}
-   public:
-    WithRawMethod_MultiJoinTables() {
-      ::grpc::Service::MarkMethodRaw(29);
-    }
-    ~WithRawMethod_MultiJoinTables() override {
-      BaseClassMustBeDerivedFromService(this);
-    }
-    // disable synchronous version of this method
-    ::grpc::Status MultiJoinTables(::grpc::ServerContext* /*context*/, const ::io::deephaven::proto::backplane::grpc::MultiJoinTablesRequest* /*request*/, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse* /*response*/) override {
-      abort();
-      return ::grpc::Status(::grpc::StatusCode::UNIMPLEMENTED, "");
-    }
-    void RequestMultiJoinTables(::grpc::ServerContext* context, ::grpc::ByteBuffer* request, ::grpc::ServerAsyncResponseWriter< ::grpc::ByteBuffer>* response, ::grpc::CompletionQueue* new_call_cq, ::grpc::ServerCompletionQueue* notification_cq, void *tag) {
-      ::grpc::Service::RequestAsyncUnary(29, context, request, response, new_call_cq, notification_cq, tag);
-    }
-  };
-  template <class BaseClass>
-  class WithRawMethod_RangeJoinTables : public BaseClass {
-   private:
-    void BaseClassMustBeDerivedFromService(const Service* /*service*/) {}
-   public:
-    WithRawMethod_RangeJoinTables() {
-      ::grpc::Service::MarkMethodRaw(30);
-    }
-    ~WithRawMethod_RangeJoinTables() override {
-      BaseClassMustBeDerivedFromService(this);
-    }
-    // disable synchronous version of this method
-    ::grpc::Status RangeJoinTables(::grpc::ServerContext* /*context*/, const ::io::deephaven::proto::backplane::grpc::RangeJoinTablesRequest* /*request*/, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse* /*response*/) override {
-      abort();
-      return ::grpc::Status(::grpc::StatusCode::UNIMPLEMENTED, "");
-    }
-    void RequestRangeJoinTables(::grpc::ServerContext* context, ::grpc::ByteBuffer* request, ::grpc::ServerAsyncResponseWriter< ::grpc::ByteBuffer>* response, ::grpc::CompletionQueue* new_call_cq, ::grpc::ServerCompletionQueue* notification_cq, void *tag) {
-      ::grpc::Service::RequestAsyncUnary(30, context, request, response, new_call_cq, notification_cq, tag);
-    }
-  };
-  template <class BaseClass>
-  class WithRawMethod_ComboAggregate : public BaseClass {
-   private:
-    void BaseClassMustBeDerivedFromService(const Service* /*service*/) {}
-   public:
-    WithRawMethod_ComboAggregate() {
-      ::grpc::Service::MarkMethodRaw(31);
-    }
-    ~WithRawMethod_ComboAggregate() override {
-      BaseClassMustBeDerivedFromService(this);
-    }
-    // disable synchronous version of this method
-    ::grpc::Status ComboAggregate(::grpc::ServerContext* /*context*/, const ::io::deephaven::proto::backplane::grpc::ComboAggregateRequest* /*request*/, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse* /*response*/) override {
-      abort();
-      return ::grpc::Status(::grpc::StatusCode::UNIMPLEMENTED, "");
-    }
-    void RequestComboAggregate(::grpc::ServerContext* context, ::grpc::ByteBuffer* request, ::grpc::ServerAsyncResponseWriter< ::grpc::ByteBuffer>* response, ::grpc::CompletionQueue* new_call_cq, ::grpc::ServerCompletionQueue* notification_cq, void *tag) {
-      ::grpc::Service::RequestAsyncUnary(31, context, request, response, new_call_cq, notification_cq, tag);
-    }
-  };
-  template <class BaseClass>
-  class WithRawMethod_AggregateAll : public BaseClass {
-   private:
-    void BaseClassMustBeDerivedFromService(const Service* /*service*/) {}
-   public:
-    WithRawMethod_AggregateAll() {
-      ::grpc::Service::MarkMethodRaw(32);
-    }
-    ~WithRawMethod_AggregateAll() override {
-      BaseClassMustBeDerivedFromService(this);
-    }
-    // disable synchronous version of this method
-    ::grpc::Status AggregateAll(::grpc::ServerContext* /*context*/, const ::io::deephaven::proto::backplane::grpc::AggregateAllRequest* /*request*/, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse* /*response*/) override {
-      abort();
-      return ::grpc::Status(::grpc::StatusCode::UNIMPLEMENTED, "");
-    }
-    void RequestAggregateAll(::grpc::ServerContext* context, ::grpc::ByteBuffer* request, ::grpc::ServerAsyncResponseWriter< ::grpc::ByteBuffer>* response, ::grpc::CompletionQueue* new_call_cq, ::grpc::ServerCompletionQueue* notification_cq, void *tag) {
-      ::grpc::Service::RequestAsyncUnary(32, context, request, response, new_call_cq, notification_cq, tag);
-    }
-  };
-  template <class BaseClass>
-  class WithRawMethod_Aggregate : public BaseClass {
-   private:
-    void BaseClassMustBeDerivedFromService(const Service* /*service*/) {}
-   public:
-    WithRawMethod_Aggregate() {
-      ::grpc::Service::MarkMethodRaw(33);
-    }
-    ~WithRawMethod_Aggregate() override {
-      BaseClassMustBeDerivedFromService(this);
-    }
-    // disable synchronous version of this method
-    ::grpc::Status Aggregate(::grpc::ServerContext* /*context*/, const ::io::deephaven::proto::backplane::grpc::AggregateRequest* /*request*/, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse* /*response*/) override {
-      abort();
-      return ::grpc::Status(::grpc::StatusCode::UNIMPLEMENTED, "");
-    }
-    void RequestAggregate(::grpc::ServerContext* context, ::grpc::ByteBuffer* request, ::grpc::ServerAsyncResponseWriter< ::grpc::ByteBuffer>* response, ::grpc::CompletionQueue* new_call_cq, ::grpc::ServerCompletionQueue* notification_cq, void *tag) {
-      ::grpc::Service::RequestAsyncUnary(33, context, request, response, new_call_cq, notification_cq, tag);
-    }
-  };
-  template <class BaseClass>
-  class WithRawMethod_Snapshot : public BaseClass {
-   private:
-    void BaseClassMustBeDerivedFromService(const Service* /*service*/) {}
-   public:
-    WithRawMethod_Snapshot() {
-      ::grpc::Service::MarkMethodRaw(34);
-    }
-    ~WithRawMethod_Snapshot() override {
-      BaseClassMustBeDerivedFromService(this);
-    }
-    // disable synchronous version of this method
-    ::grpc::Status Snapshot(::grpc::ServerContext* /*context*/, const ::io::deephaven::proto::backplane::grpc::SnapshotTableRequest* /*request*/, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse* /*response*/) override {
-      abort();
-      return ::grpc::Status(::grpc::StatusCode::UNIMPLEMENTED, "");
-    }
-    void RequestSnapshot(::grpc::ServerContext* context, ::grpc::ByteBuffer* request, ::grpc::ServerAsyncResponseWriter< ::grpc::ByteBuffer>* response, ::grpc::CompletionQueue* new_call_cq, ::grpc::ServerCompletionQueue* notification_cq, void *tag) {
-      ::grpc::Service::RequestAsyncUnary(34, context, request, response, new_call_cq, notification_cq, tag);
-    }
-  };
-  template <class BaseClass>
-  class WithRawMethod_SnapshotWhen : public BaseClass {
-   private:
-    void BaseClassMustBeDerivedFromService(const Service* /*service*/) {}
-   public:
-    WithRawMethod_SnapshotWhen() {
-      ::grpc::Service::MarkMethodRaw(35);
-    }
-    ~WithRawMethod_SnapshotWhen() override {
-      BaseClassMustBeDerivedFromService(this);
-    }
-    // disable synchronous version of this method
-    ::grpc::Status SnapshotWhen(::grpc::ServerContext* /*context*/, const ::io::deephaven::proto::backplane::grpc::SnapshotWhenTableRequest* /*request*/, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse* /*response*/) override {
-      abort();
-      return ::grpc::Status(::grpc::StatusCode::UNIMPLEMENTED, "");
-    }
-    void RequestSnapshotWhen(::grpc::ServerContext* context, ::grpc::ByteBuffer* request, ::grpc::ServerAsyncResponseWriter< ::grpc::ByteBuffer>* response, ::grpc::CompletionQueue* new_call_cq, ::grpc::ServerCompletionQueue* notification_cq, void *tag) {
-      ::grpc::Service::RequestAsyncUnary(35, context, request, response, new_call_cq, notification_cq, tag);
-    }
-  };
-  template <class BaseClass>
-  class WithRawMethod_Flatten : public BaseClass {
-   private:
-    void BaseClassMustBeDerivedFromService(const Service* /*service*/) {}
-   public:
-    WithRawMethod_Flatten() {
-      ::grpc::Service::MarkMethodRaw(36);
-    }
-    ~WithRawMethod_Flatten() override {
-      BaseClassMustBeDerivedFromService(this);
-    }
-    // disable synchronous version of this method
-    ::grpc::Status Flatten(::grpc::ServerContext* /*context*/, const ::io::deephaven::proto::backplane::grpc::FlattenRequest* /*request*/, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse* /*response*/) override {
-      abort();
-      return ::grpc::Status(::grpc::StatusCode::UNIMPLEMENTED, "");
-    }
-    void RequestFlatten(::grpc::ServerContext* context, ::grpc::ByteBuffer* request, ::grpc::ServerAsyncResponseWriter< ::grpc::ByteBuffer>* response, ::grpc::CompletionQueue* new_call_cq, ::grpc::ServerCompletionQueue* notification_cq, void *tag) {
-      ::grpc::Service::RequestAsyncUnary(36, context, request, response, new_call_cq, notification_cq, tag);
-    }
-  };
-  template <class BaseClass>
-  class WithRawMethod_RunChartDownsample : public BaseClass {
-   private:
-    void BaseClassMustBeDerivedFromService(const Service* /*service*/) {}
-   public:
-    WithRawMethod_RunChartDownsample() {
-      ::grpc::Service::MarkMethodRaw(37);
-    }
-    ~WithRawMethod_RunChartDownsample() override {
-      BaseClassMustBeDerivedFromService(this);
-    }
-    // disable synchronous version of this method
-    ::grpc::Status RunChartDownsample(::grpc::ServerContext* /*context*/, const ::io::deephaven::proto::backplane::grpc::RunChartDownsampleRequest* /*request*/, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse* /*response*/) override {
-      abort();
-      return ::grpc::Status(::grpc::StatusCode::UNIMPLEMENTED, "");
-    }
-    void RequestRunChartDownsample(::grpc::ServerContext* context, ::grpc::ByteBuffer* request, ::grpc::ServerAsyncResponseWriter< ::grpc::ByteBuffer>* response, ::grpc::CompletionQueue* new_call_cq, ::grpc::ServerCompletionQueue* notification_cq, void *tag) {
-      ::grpc::Service::RequestAsyncUnary(37, context, request, response, new_call_cq, notification_cq, tag);
-    }
-  };
-  template <class BaseClass>
-  class WithRawMethod_CreateInputTable : public BaseClass {
-   private:
-    void BaseClassMustBeDerivedFromService(const Service* /*service*/) {}
-   public:
-    WithRawMethod_CreateInputTable() {
-      ::grpc::Service::MarkMethodRaw(38);
-    }
-    ~WithRawMethod_CreateInputTable() override {
-      BaseClassMustBeDerivedFromService(this);
-    }
-    // disable synchronous version of this method
-    ::grpc::Status CreateInputTable(::grpc::ServerContext* /*context*/, const ::io::deephaven::proto::backplane::grpc::CreateInputTableRequest* /*request*/, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse* /*response*/) override {
-      abort();
-      return ::grpc::Status(::grpc::StatusCode::UNIMPLEMENTED, "");
-    }
-    void RequestCreateInputTable(::grpc::ServerContext* context, ::grpc::ByteBuffer* request, ::grpc::ServerAsyncResponseWriter< ::grpc::ByteBuffer>* response, ::grpc::CompletionQueue* new_call_cq, ::grpc::ServerCompletionQueue* notification_cq, void *tag) {
-      ::grpc::Service::RequestAsyncUnary(38, context, request, response, new_call_cq, notification_cq, tag);
-    }
-  };
-  template <class BaseClass>
-  class WithRawMethod_WhereIn : public BaseClass {
-   private:
-    void BaseClassMustBeDerivedFromService(const Service* /*service*/) {}
-   public:
-    WithRawMethod_WhereIn() {
-      ::grpc::Service::MarkMethodRaw(39);
-    }
-    ~WithRawMethod_WhereIn() override {
-      BaseClassMustBeDerivedFromService(this);
-    }
-    // disable synchronous version of this method
-    ::grpc::Status WhereIn(::grpc::ServerContext* /*context*/, const ::io::deephaven::proto::backplane::grpc::WhereInRequest* /*request*/, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse* /*response*/) override {
-      abort();
-      return ::grpc::Status(::grpc::StatusCode::UNIMPLEMENTED, "");
-    }
-    void RequestWhereIn(::grpc::ServerContext* context, ::grpc::ByteBuffer* request, ::grpc::ServerAsyncResponseWriter< ::grpc::ByteBuffer>* response, ::grpc::CompletionQueue* new_call_cq, ::grpc::ServerCompletionQueue* notification_cq, void *tag) {
-      ::grpc::Service::RequestAsyncUnary(39, context, request, response, new_call_cq, notification_cq, tag);
-    }
-  };
-  template <class BaseClass>
-  class WithRawMethod_Batch : public BaseClass {
-   private:
-    void BaseClassMustBeDerivedFromService(const Service* /*service*/) {}
-   public:
-    WithRawMethod_Batch() {
-      ::grpc::Service::MarkMethodRaw(40);
-    }
-    ~WithRawMethod_Batch() override {
-      BaseClassMustBeDerivedFromService(this);
-    }
-    // disable synchronous version of this method
-    ::grpc::Status Batch(::grpc::ServerContext* /*context*/, const ::io::deephaven::proto::backplane::grpc::BatchTableRequest* /*request*/, ::grpc::ServerWriter< ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse>* /*writer*/) override {
-      abort();
-      return ::grpc::Status(::grpc::StatusCode::UNIMPLEMENTED, "");
-    }
-    void RequestBatch(::grpc::ServerContext* context, ::grpc::ByteBuffer* request, ::grpc::ServerAsyncWriter< ::grpc::ByteBuffer>* writer, ::grpc::CompletionQueue* new_call_cq, ::grpc::ServerCompletionQueue* notification_cq, void *tag) {
-      ::grpc::Service::RequestAsyncServerStreaming(40, context, request, writer, new_call_cq, notification_cq, tag);
-    }
-  };
-  template <class BaseClass>
-  class WithRawMethod_ExportedTableUpdates : public BaseClass {
-   private:
-    void BaseClassMustBeDerivedFromService(const Service* /*service*/) {}
-   public:
-    WithRawMethod_ExportedTableUpdates() {
-      ::grpc::Service::MarkMethodRaw(41);
-    }
-    ~WithRawMethod_ExportedTableUpdates() override {
-      BaseClassMustBeDerivedFromService(this);
-    }
-    // disable synchronous version of this method
-    ::grpc::Status ExportedTableUpdates(::grpc::ServerContext* /*context*/, const ::io::deephaven::proto::backplane::grpc::ExportedTableUpdatesRequest* /*request*/, ::grpc::ServerWriter< ::io::deephaven::proto::backplane::grpc::ExportedTableUpdateMessage>* /*writer*/) override {
-      abort();
-      return ::grpc::Status(::grpc::StatusCode::UNIMPLEMENTED, "");
-    }
-    void RequestExportedTableUpdates(::grpc::ServerContext* context, ::grpc::ByteBuffer* request, ::grpc::ServerAsyncWriter< ::grpc::ByteBuffer>* writer, ::grpc::CompletionQueue* new_call_cq, ::grpc::ServerCompletionQueue* notification_cq, void *tag) {
-      ::grpc::Service::RequestAsyncServerStreaming(41, context, request, writer, new_call_cq, notification_cq, tag);
-    }
-  };
-  template <class BaseClass>
-  class WithRawMethod_SeekRow : public BaseClass {
-   private:
-    void BaseClassMustBeDerivedFromService(const Service* /*service*/) {}
-   public:
-    WithRawMethod_SeekRow() {
-      ::grpc::Service::MarkMethodRaw(42);
-    }
-    ~WithRawMethod_SeekRow() override {
-      BaseClassMustBeDerivedFromService(this);
-    }
-    // disable synchronous version of this method
-    ::grpc::Status SeekRow(::grpc::ServerContext* /*context*/, const ::io::deephaven::proto::backplane::grpc::SeekRowRequest* /*request*/, ::io::deephaven::proto::backplane::grpc::SeekRowResponse* /*response*/) override {
-      abort();
-      return ::grpc::Status(::grpc::StatusCode::UNIMPLEMENTED, "");
-    }
-    void RequestSeekRow(::grpc::ServerContext* context, ::grpc::ByteBuffer* request, ::grpc::ServerAsyncResponseWriter< ::grpc::ByteBuffer>* response, ::grpc::CompletionQueue* new_call_cq, ::grpc::ServerCompletionQueue* notification_cq, void *tag) {
-      ::grpc::Service::RequestAsyncUnary(42, context, request, response, new_call_cq, notification_cq, tag);
-    }
-  };
-  template <class BaseClass>
-  class WithRawMethod_MetaTable : public BaseClass {
-   private:
-    void BaseClassMustBeDerivedFromService(const Service* /*service*/) {}
-   public:
-    WithRawMethod_MetaTable() {
-      ::grpc::Service::MarkMethodRaw(43);
-    }
-    ~WithRawMethod_MetaTable() override {
-      BaseClassMustBeDerivedFromService(this);
-    }
-    // disable synchronous version of this method
-    ::grpc::Status MetaTable(::grpc::ServerContext* /*context*/, const ::io::deephaven::proto::backplane::grpc::MetaTableRequest* /*request*/, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse* /*response*/) override {
-      abort();
-      return ::grpc::Status(::grpc::StatusCode::UNIMPLEMENTED, "");
-    }
-    void RequestMetaTable(::grpc::ServerContext* context, ::grpc::ByteBuffer* request, ::grpc::ServerAsyncResponseWriter< ::grpc::ByteBuffer>* response, ::grpc::CompletionQueue* new_call_cq, ::grpc::ServerCompletionQueue* notification_cq, void *tag) {
-      ::grpc::Service::RequestAsyncUnary(43, context, request, response, new_call_cq, notification_cq, tag);
-    }
-  };
-  template <class BaseClass>
-  class WithRawMethod_ComputeColumnStatistics : public BaseClass {
-   private:
-    void BaseClassMustBeDerivedFromService(const Service* /*service*/) {}
-   public:
-    WithRawMethod_ComputeColumnStatistics() {
-      ::grpc::Service::MarkMethodRaw(44);
-    }
-    ~WithRawMethod_ComputeColumnStatistics() override {
-      BaseClassMustBeDerivedFromService(this);
-    }
-    // disable synchronous version of this method
-    ::grpc::Status ComputeColumnStatistics(::grpc::ServerContext* /*context*/, const ::io::deephaven::proto::backplane::grpc::ColumnStatisticsRequest* /*request*/, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse* /*response*/) override {
-      abort();
-      return ::grpc::Status(::grpc::StatusCode::UNIMPLEMENTED, "");
-    }
-    void RequestComputeColumnStatistics(::grpc::ServerContext* context, ::grpc::ByteBuffer* request, ::grpc::ServerAsyncResponseWriter< ::grpc::ByteBuffer>* response, ::grpc::CompletionQueue* new_call_cq, ::grpc::ServerCompletionQueue* notification_cq, void *tag) {
-      ::grpc::Service::RequestAsyncUnary(44, context, request, response, new_call_cq, notification_cq, tag);
-    }
-  };
-  template <class BaseClass>
-  class WithRawCallbackMethod_GetExportedTableCreationResponse : public BaseClass {
-   private:
-    void BaseClassMustBeDerivedFromService(const Service* /*service*/) {}
-   public:
-    WithRawCallbackMethod_GetExportedTableCreationResponse() {
-      ::grpc::Service::MarkMethodRawCallback(0,
-          new ::grpc::internal::CallbackUnaryHandler< ::grpc::ByteBuffer, ::grpc::ByteBuffer>(
-            [this](
-                   ::grpc::CallbackServerContext* context, const ::grpc::ByteBuffer* request, ::grpc::ByteBuffer* response) { return this->GetExportedTableCreationResponse(context, request, response); }));
-    }
-    ~WithRawCallbackMethod_GetExportedTableCreationResponse() override {
-      BaseClassMustBeDerivedFromService(this);
-    }
-    // disable synchronous version of this method
-    ::grpc::Status GetExportedTableCreationResponse(::grpc::ServerContext* /*context*/, const ::io::deephaven::proto::backplane::grpc::Ticket* /*request*/, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse* /*response*/) override {
-      abort();
-      return ::grpc::Status(::grpc::StatusCode::UNIMPLEMENTED, "");
-    }
-    virtual ::grpc::ServerUnaryReactor* GetExportedTableCreationResponse(
-      ::grpc::CallbackServerContext* /*context*/, const ::grpc::ByteBuffer* /*request*/, ::grpc::ByteBuffer* /*response*/)  { return nullptr; }
-  };
-  template <class BaseClass>
-  class WithRawCallbackMethod_FetchTable : public BaseClass {
-   private:
-    void BaseClassMustBeDerivedFromService(const Service* /*service*/) {}
-   public:
-    WithRawCallbackMethod_FetchTable() {
-      ::grpc::Service::MarkMethodRawCallback(1,
-          new ::grpc::internal::CallbackUnaryHandler< ::grpc::ByteBuffer, ::grpc::ByteBuffer>(
-            [this](
-                   ::grpc::CallbackServerContext* context, const ::grpc::ByteBuffer* request, ::grpc::ByteBuffer* response) { return this->FetchTable(context, request, response); }));
-    }
-    ~WithRawCallbackMethod_FetchTable() override {
-      BaseClassMustBeDerivedFromService(this);
-    }
-    // disable synchronous version of this method
-    ::grpc::Status FetchTable(::grpc::ServerContext* /*context*/, const ::io::deephaven::proto::backplane::grpc::FetchTableRequest* /*request*/, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse* /*response*/) override {
-      abort();
-      return ::grpc::Status(::grpc::StatusCode::UNIMPLEMENTED, "");
-    }
-    virtual ::grpc::ServerUnaryReactor* FetchTable(
-      ::grpc::CallbackServerContext* /*context*/, const ::grpc::ByteBuffer* /*request*/, ::grpc::ByteBuffer* /*response*/)  { return nullptr; }
-  };
-  template <class BaseClass>
-  class WithRawCallbackMethod_ApplyPreviewColumns : public BaseClass {
-   private:
-    void BaseClassMustBeDerivedFromService(const Service* /*service*/) {}
-   public:
-    WithRawCallbackMethod_ApplyPreviewColumns() {
-      ::grpc::Service::MarkMethodRawCallback(2,
-          new ::grpc::internal::CallbackUnaryHandler< ::grpc::ByteBuffer, ::grpc::ByteBuffer>(
-            [this](
-                   ::grpc::CallbackServerContext* context, const ::grpc::ByteBuffer* request, ::grpc::ByteBuffer* response) { return this->ApplyPreviewColumns(context, request, response); }));
-    }
-    ~WithRawCallbackMethod_ApplyPreviewColumns() override {
-      BaseClassMustBeDerivedFromService(this);
-    }
-    // disable synchronous version of this method
-    ::grpc::Status ApplyPreviewColumns(::grpc::ServerContext* /*context*/, const ::io::deephaven::proto::backplane::grpc::ApplyPreviewColumnsRequest* /*request*/, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse* /*response*/) override {
-      abort();
-      return ::grpc::Status(::grpc::StatusCode::UNIMPLEMENTED, "");
-    }
-    virtual ::grpc::ServerUnaryReactor* ApplyPreviewColumns(
-      ::grpc::CallbackServerContext* /*context*/, const ::grpc::ByteBuffer* /*request*/, ::grpc::ByteBuffer* /*response*/)  { return nullptr; }
-  };
-  template <class BaseClass>
-  class WithRawCallbackMethod_EmptyTable : public BaseClass {
-   private:
-    void BaseClassMustBeDerivedFromService(const Service* /*service*/) {}
-   public:
-    WithRawCallbackMethod_EmptyTable() {
-      ::grpc::Service::MarkMethodRawCallback(3,
-          new ::grpc::internal::CallbackUnaryHandler< ::grpc::ByteBuffer, ::grpc::ByteBuffer>(
-            [this](
-                   ::grpc::CallbackServerContext* context, const ::grpc::ByteBuffer* request, ::grpc::ByteBuffer* response) { return this->EmptyTable(context, request, response); }));
-    }
-    ~WithRawCallbackMethod_EmptyTable() override {
-      BaseClassMustBeDerivedFromService(this);
-    }
-    // disable synchronous version of this method
-    ::grpc::Status EmptyTable(::grpc::ServerContext* /*context*/, const ::io::deephaven::proto::backplane::grpc::EmptyTableRequest* /*request*/, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse* /*response*/) override {
-      abort();
-      return ::grpc::Status(::grpc::StatusCode::UNIMPLEMENTED, "");
-    }
-    virtual ::grpc::ServerUnaryReactor* EmptyTable(
-      ::grpc::CallbackServerContext* /*context*/, const ::grpc::ByteBuffer* /*request*/, ::grpc::ByteBuffer* /*response*/)  { return nullptr; }
-  };
-  template <class BaseClass>
-  class WithRawCallbackMethod_TimeTable : public BaseClass {
-   private:
-    void BaseClassMustBeDerivedFromService(const Service* /*service*/) {}
-   public:
-    WithRawCallbackMethod_TimeTable() {
-      ::grpc::Service::MarkMethodRawCallback(4,
-          new ::grpc::internal::CallbackUnaryHandler< ::grpc::ByteBuffer, ::grpc::ByteBuffer>(
-            [this](
-                   ::grpc::CallbackServerContext* context, const ::grpc::ByteBuffer* request, ::grpc::ByteBuffer* response) { return this->TimeTable(context, request, response); }));
-    }
-    ~WithRawCallbackMethod_TimeTable() override {
-      BaseClassMustBeDerivedFromService(this);
-    }
-    // disable synchronous version of this method
-    ::grpc::Status TimeTable(::grpc::ServerContext* /*context*/, const ::io::deephaven::proto::backplane::grpc::TimeTableRequest* /*request*/, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse* /*response*/) override {
-      abort();
-      return ::grpc::Status(::grpc::StatusCode::UNIMPLEMENTED, "");
-    }
-    virtual ::grpc::ServerUnaryReactor* TimeTable(
-      ::grpc::CallbackServerContext* /*context*/, const ::grpc::ByteBuffer* /*request*/, ::grpc::ByteBuffer* /*response*/)  { return nullptr; }
-  };
-  template <class BaseClass>
-  class WithRawCallbackMethod_DropColumns : public BaseClass {
-   private:
-    void BaseClassMustBeDerivedFromService(const Service* /*service*/) {}
-   public:
-    WithRawCallbackMethod_DropColumns() {
-      ::grpc::Service::MarkMethodRawCallback(5,
-          new ::grpc::internal::CallbackUnaryHandler< ::grpc::ByteBuffer, ::grpc::ByteBuffer>(
-            [this](
-                   ::grpc::CallbackServerContext* context, const ::grpc::ByteBuffer* request, ::grpc::ByteBuffer* response) { return this->DropColumns(context, request, response); }));
-    }
-    ~WithRawCallbackMethod_DropColumns() override {
-      BaseClassMustBeDerivedFromService(this);
-    }
-    // disable synchronous version of this method
-    ::grpc::Status DropColumns(::grpc::ServerContext* /*context*/, const ::io::deephaven::proto::backplane::grpc::DropColumnsRequest* /*request*/, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse* /*response*/) override {
-      abort();
-      return ::grpc::Status(::grpc::StatusCode::UNIMPLEMENTED, "");
-    }
-    virtual ::grpc::ServerUnaryReactor* DropColumns(
-      ::grpc::CallbackServerContext* /*context*/, const ::grpc::ByteBuffer* /*request*/, ::grpc::ByteBuffer* /*response*/)  { return nullptr; }
-  };
-  template <class BaseClass>
-  class WithRawCallbackMethod_Update : public BaseClass {
-   private:
-    void BaseClassMustBeDerivedFromService(const Service* /*service*/) {}
-   public:
-    WithRawCallbackMethod_Update() {
-      ::grpc::Service::MarkMethodRawCallback(6,
-          new ::grpc::internal::CallbackUnaryHandler< ::grpc::ByteBuffer, ::grpc::ByteBuffer>(
-            [this](
-                   ::grpc::CallbackServerContext* context, const ::grpc::ByteBuffer* request, ::grpc::ByteBuffer* response) { return this->Update(context, request, response); }));
-    }
-    ~WithRawCallbackMethod_Update() override {
-      BaseClassMustBeDerivedFromService(this);
-    }
-    // disable synchronous version of this method
-    ::grpc::Status Update(::grpc::ServerContext* /*context*/, const ::io::deephaven::proto::backplane::grpc::SelectOrUpdateRequest* /*request*/, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse* /*response*/) override {
-      abort();
-      return ::grpc::Status(::grpc::StatusCode::UNIMPLEMENTED, "");
-    }
-    virtual ::grpc::ServerUnaryReactor* Update(
-      ::grpc::CallbackServerContext* /*context*/, const ::grpc::ByteBuffer* /*request*/, ::grpc::ByteBuffer* /*response*/)  { return nullptr; }
-  };
-  template <class BaseClass>
-  class WithRawCallbackMethod_LazyUpdate : public BaseClass {
-   private:
-    void BaseClassMustBeDerivedFromService(const Service* /*service*/) {}
-   public:
-    WithRawCallbackMethod_LazyUpdate() {
-      ::grpc::Service::MarkMethodRawCallback(7,
-          new ::grpc::internal::CallbackUnaryHandler< ::grpc::ByteBuffer, ::grpc::ByteBuffer>(
-            [this](
-                   ::grpc::CallbackServerContext* context, const ::grpc::ByteBuffer* request, ::grpc::ByteBuffer* response) { return this->LazyUpdate(context, request, response); }));
-    }
-    ~WithRawCallbackMethod_LazyUpdate() override {
-      BaseClassMustBeDerivedFromService(this);
-    }
-    // disable synchronous version of this method
-    ::grpc::Status LazyUpdate(::grpc::ServerContext* /*context*/, const ::io::deephaven::proto::backplane::grpc::SelectOrUpdateRequest* /*request*/, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse* /*response*/) override {
-      abort();
-      return ::grpc::Status(::grpc::StatusCode::UNIMPLEMENTED, "");
-    }
-    virtual ::grpc::ServerUnaryReactor* LazyUpdate(
-      ::grpc::CallbackServerContext* /*context*/, const ::grpc::ByteBuffer* /*request*/, ::grpc::ByteBuffer* /*response*/)  { return nullptr; }
-  };
-  template <class BaseClass>
-  class WithRawCallbackMethod_View : public BaseClass {
-   private:
-    void BaseClassMustBeDerivedFromService(const Service* /*service*/) {}
-   public:
-    WithRawCallbackMethod_View() {
-      ::grpc::Service::MarkMethodRawCallback(8,
-          new ::grpc::internal::CallbackUnaryHandler< ::grpc::ByteBuffer, ::grpc::ByteBuffer>(
-            [this](
-                   ::grpc::CallbackServerContext* context, const ::grpc::ByteBuffer* request, ::grpc::ByteBuffer* response) { return this->View(context, request, response); }));
-    }
-    ~WithRawCallbackMethod_View() override {
-      BaseClassMustBeDerivedFromService(this);
-    }
-    // disable synchronous version of this method
-    ::grpc::Status View(::grpc::ServerContext* /*context*/, const ::io::deephaven::proto::backplane::grpc::SelectOrUpdateRequest* /*request*/, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse* /*response*/) override {
-      abort();
-      return ::grpc::Status(::grpc::StatusCode::UNIMPLEMENTED, "");
-    }
-    virtual ::grpc::ServerUnaryReactor* View(
-      ::grpc::CallbackServerContext* /*context*/, const ::grpc::ByteBuffer* /*request*/, ::grpc::ByteBuffer* /*response*/)  { return nullptr; }
-  };
-  template <class BaseClass>
-  class WithRawCallbackMethod_UpdateView : public BaseClass {
-   private:
-    void BaseClassMustBeDerivedFromService(const Service* /*service*/) {}
-   public:
-    WithRawCallbackMethod_UpdateView() {
-      ::grpc::Service::MarkMethodRawCallback(9,
-          new ::grpc::internal::CallbackUnaryHandler< ::grpc::ByteBuffer, ::grpc::ByteBuffer>(
-            [this](
-                   ::grpc::CallbackServerContext* context, const ::grpc::ByteBuffer* request, ::grpc::ByteBuffer* response) { return this->UpdateView(context, request, response); }));
-    }
-    ~WithRawCallbackMethod_UpdateView() override {
-      BaseClassMustBeDerivedFromService(this);
-    }
-    // disable synchronous version of this method
-    ::grpc::Status UpdateView(::grpc::ServerContext* /*context*/, const ::io::deephaven::proto::backplane::grpc::SelectOrUpdateRequest* /*request*/, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse* /*response*/) override {
-      abort();
-      return ::grpc::Status(::grpc::StatusCode::UNIMPLEMENTED, "");
-    }
-    virtual ::grpc::ServerUnaryReactor* UpdateView(
-      ::grpc::CallbackServerContext* /*context*/, const ::grpc::ByteBuffer* /*request*/, ::grpc::ByteBuffer* /*response*/)  { return nullptr; }
-  };
-  template <class BaseClass>
-  class WithRawCallbackMethod_Select : public BaseClass {
-   private:
-    void BaseClassMustBeDerivedFromService(const Service* /*service*/) {}
-   public:
-    WithRawCallbackMethod_Select() {
-      ::grpc::Service::MarkMethodRawCallback(10,
-          new ::grpc::internal::CallbackUnaryHandler< ::grpc::ByteBuffer, ::grpc::ByteBuffer>(
-            [this](
-                   ::grpc::CallbackServerContext* context, const ::grpc::ByteBuffer* request, ::grpc::ByteBuffer* response) { return this->Select(context, request, response); }));
-    }
-    ~WithRawCallbackMethod_Select() override {
-      BaseClassMustBeDerivedFromService(this);
-    }
-    // disable synchronous version of this method
-    ::grpc::Status Select(::grpc::ServerContext* /*context*/, const ::io::deephaven::proto::backplane::grpc::SelectOrUpdateRequest* /*request*/, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse* /*response*/) override {
-      abort();
-      return ::grpc::Status(::grpc::StatusCode::UNIMPLEMENTED, "");
-    }
-    virtual ::grpc::ServerUnaryReactor* Select(
-      ::grpc::CallbackServerContext* /*context*/, const ::grpc::ByteBuffer* /*request*/, ::grpc::ByteBuffer* /*response*/)  { return nullptr; }
-  };
-  template <class BaseClass>
-  class WithRawCallbackMethod_UpdateBy : public BaseClass {
-   private:
-    void BaseClassMustBeDerivedFromService(const Service* /*service*/) {}
-   public:
-    WithRawCallbackMethod_UpdateBy() {
-      ::grpc::Service::MarkMethodRawCallback(11,
-          new ::grpc::internal::CallbackUnaryHandler< ::grpc::ByteBuffer, ::grpc::ByteBuffer>(
-            [this](
-                   ::grpc::CallbackServerContext* context, const ::grpc::ByteBuffer* request, ::grpc::ByteBuffer* response) { return this->UpdateBy(context, request, response); }));
-    }
-    ~WithRawCallbackMethod_UpdateBy() override {
-      BaseClassMustBeDerivedFromService(this);
-    }
-    // disable synchronous version of this method
-    ::grpc::Status UpdateBy(::grpc::ServerContext* /*context*/, const ::io::deephaven::proto::backplane::grpc::UpdateByRequest* /*request*/, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse* /*response*/) override {
-      abort();
-      return ::grpc::Status(::grpc::StatusCode::UNIMPLEMENTED, "");
-    }
-    virtual ::grpc::ServerUnaryReactor* UpdateBy(
-      ::grpc::CallbackServerContext* /*context*/, const ::grpc::ByteBuffer* /*request*/, ::grpc::ByteBuffer* /*response*/)  { return nullptr; }
-  };
-  template <class BaseClass>
-  class WithRawCallbackMethod_SelectDistinct : public BaseClass {
-   private:
-    void BaseClassMustBeDerivedFromService(const Service* /*service*/) {}
-   public:
-    WithRawCallbackMethod_SelectDistinct() {
-      ::grpc::Service::MarkMethodRawCallback(12,
-          new ::grpc::internal::CallbackUnaryHandler< ::grpc::ByteBuffer, ::grpc::ByteBuffer>(
-            [this](
-                   ::grpc::CallbackServerContext* context, const ::grpc::ByteBuffer* request, ::grpc::ByteBuffer* response) { return this->SelectDistinct(context, request, response); }));
-    }
-    ~WithRawCallbackMethod_SelectDistinct() override {
-      BaseClassMustBeDerivedFromService(this);
-    }
-    // disable synchronous version of this method
-    ::grpc::Status SelectDistinct(::grpc::ServerContext* /*context*/, const ::io::deephaven::proto::backplane::grpc::SelectDistinctRequest* /*request*/, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse* /*response*/) override {
-      abort();
-      return ::grpc::Status(::grpc::StatusCode::UNIMPLEMENTED, "");
-    }
-    virtual ::grpc::ServerUnaryReactor* SelectDistinct(
-      ::grpc::CallbackServerContext* /*context*/, const ::grpc::ByteBuffer* /*request*/, ::grpc::ByteBuffer* /*response*/)  { return nullptr; }
-  };
-  template <class BaseClass>
-  class WithRawCallbackMethod_Filter : public BaseClass {
-   private:
-    void BaseClassMustBeDerivedFromService(const Service* /*service*/) {}
-   public:
-    WithRawCallbackMethod_Filter() {
-      ::grpc::Service::MarkMethodRawCallback(13,
-          new ::grpc::internal::CallbackUnaryHandler< ::grpc::ByteBuffer, ::grpc::ByteBuffer>(
-            [this](
-                   ::grpc::CallbackServerContext* context, const ::grpc::ByteBuffer* request, ::grpc::ByteBuffer* response) { return this->Filter(context, request, response); }));
-    }
-    ~WithRawCallbackMethod_Filter() override {
-      BaseClassMustBeDerivedFromService(this);
-    }
-    // disable synchronous version of this method
-    ::grpc::Status Filter(::grpc::ServerContext* /*context*/, const ::io::deephaven::proto::backplane::grpc::FilterTableRequest* /*request*/, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse* /*response*/) override {
-      abort();
-      return ::grpc::Status(::grpc::StatusCode::UNIMPLEMENTED, "");
-    }
-    virtual ::grpc::ServerUnaryReactor* Filter(
-      ::grpc::CallbackServerContext* /*context*/, const ::grpc::ByteBuffer* /*request*/, ::grpc::ByteBuffer* /*response*/)  { return nullptr; }
-  };
-  template <class BaseClass>
-  class WithRawCallbackMethod_UnstructuredFilter : public BaseClass {
-   private:
-    void BaseClassMustBeDerivedFromService(const Service* /*service*/) {}
-   public:
-    WithRawCallbackMethod_UnstructuredFilter() {
-      ::grpc::Service::MarkMethodRawCallback(14,
-          new ::grpc::internal::CallbackUnaryHandler< ::grpc::ByteBuffer, ::grpc::ByteBuffer>(
-            [this](
-                   ::grpc::CallbackServerContext* context, const ::grpc::ByteBuffer* request, ::grpc::ByteBuffer* response) { return this->UnstructuredFilter(context, request, response); }));
-    }
-    ~WithRawCallbackMethod_UnstructuredFilter() override {
-      BaseClassMustBeDerivedFromService(this);
-    }
-    // disable synchronous version of this method
-    ::grpc::Status UnstructuredFilter(::grpc::ServerContext* /*context*/, const ::io::deephaven::proto::backplane::grpc::UnstructuredFilterTableRequest* /*request*/, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse* /*response*/) override {
-      abort();
-      return ::grpc::Status(::grpc::StatusCode::UNIMPLEMENTED, "");
-    }
-    virtual ::grpc::ServerUnaryReactor* UnstructuredFilter(
-      ::grpc::CallbackServerContext* /*context*/, const ::grpc::ByteBuffer* /*request*/, ::grpc::ByteBuffer* /*response*/)  { return nullptr; }
-  };
-  template <class BaseClass>
-  class WithRawCallbackMethod_Sort : public BaseClass {
-   private:
-    void BaseClassMustBeDerivedFromService(const Service* /*service*/) {}
-   public:
-    WithRawCallbackMethod_Sort() {
-      ::grpc::Service::MarkMethodRawCallback(15,
-          new ::grpc::internal::CallbackUnaryHandler< ::grpc::ByteBuffer, ::grpc::ByteBuffer>(
-            [this](
-                   ::grpc::CallbackServerContext* context, const ::grpc::ByteBuffer* request, ::grpc::ByteBuffer* response) { return this->Sort(context, request, response); }));
-    }
-    ~WithRawCallbackMethod_Sort() override {
-      BaseClassMustBeDerivedFromService(this);
-    }
-    // disable synchronous version of this method
-    ::grpc::Status Sort(::grpc::ServerContext* /*context*/, const ::io::deephaven::proto::backplane::grpc::SortTableRequest* /*request*/, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse* /*response*/) override {
-      abort();
-      return ::grpc::Status(::grpc::StatusCode::UNIMPLEMENTED, "");
-    }
-    virtual ::grpc::ServerUnaryReactor* Sort(
-      ::grpc::CallbackServerContext* /*context*/, const ::grpc::ByteBuffer* /*request*/, ::grpc::ByteBuffer* /*response*/)  { return nullptr; }
-  };
-  template <class BaseClass>
-  class WithRawCallbackMethod_Head : public BaseClass {
-   private:
-    void BaseClassMustBeDerivedFromService(const Service* /*service*/) {}
-   public:
-    WithRawCallbackMethod_Head() {
-      ::grpc::Service::MarkMethodRawCallback(16,
-          new ::grpc::internal::CallbackUnaryHandler< ::grpc::ByteBuffer, ::grpc::ByteBuffer>(
-            [this](
-                   ::grpc::CallbackServerContext* context, const ::grpc::ByteBuffer* request, ::grpc::ByteBuffer* response) { return this->Head(context, request, response); }));
-    }
-    ~WithRawCallbackMethod_Head() override {
-      BaseClassMustBeDerivedFromService(this);
-    }
-    // disable synchronous version of this method
-    ::grpc::Status Head(::grpc::ServerContext* /*context*/, const ::io::deephaven::proto::backplane::grpc::HeadOrTailRequest* /*request*/, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse* /*response*/) override {
-      abort();
-      return ::grpc::Status(::grpc::StatusCode::UNIMPLEMENTED, "");
-    }
-    virtual ::grpc::ServerUnaryReactor* Head(
-      ::grpc::CallbackServerContext* /*context*/, const ::grpc::ByteBuffer* /*request*/, ::grpc::ByteBuffer* /*response*/)  { return nullptr; }
-  };
-  template <class BaseClass>
-  class WithRawCallbackMethod_Tail : public BaseClass {
-   private:
-    void BaseClassMustBeDerivedFromService(const Service* /*service*/) {}
-   public:
-    WithRawCallbackMethod_Tail() {
-      ::grpc::Service::MarkMethodRawCallback(17,
-          new ::grpc::internal::CallbackUnaryHandler< ::grpc::ByteBuffer, ::grpc::ByteBuffer>(
-            [this](
-                   ::grpc::CallbackServerContext* context, const ::grpc::ByteBuffer* request, ::grpc::ByteBuffer* response) { return this->Tail(context, request, response); }));
-    }
-    ~WithRawCallbackMethod_Tail() override {
-      BaseClassMustBeDerivedFromService(this);
-    }
-    // disable synchronous version of this method
-    ::grpc::Status Tail(::grpc::ServerContext* /*context*/, const ::io::deephaven::proto::backplane::grpc::HeadOrTailRequest* /*request*/, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse* /*response*/) override {
-      abort();
-      return ::grpc::Status(::grpc::StatusCode::UNIMPLEMENTED, "");
-    }
-    virtual ::grpc::ServerUnaryReactor* Tail(
-      ::grpc::CallbackServerContext* /*context*/, const ::grpc::ByteBuffer* /*request*/, ::grpc::ByteBuffer* /*response*/)  { return nullptr; }
-  };
-  template <class BaseClass>
-  class WithRawCallbackMethod_HeadBy : public BaseClass {
-   private:
-    void BaseClassMustBeDerivedFromService(const Service* /*service*/) {}
-   public:
-    WithRawCallbackMethod_HeadBy() {
-      ::grpc::Service::MarkMethodRawCallback(18,
-          new ::grpc::internal::CallbackUnaryHandler< ::grpc::ByteBuffer, ::grpc::ByteBuffer>(
-            [this](
-                   ::grpc::CallbackServerContext* context, const ::grpc::ByteBuffer* request, ::grpc::ByteBuffer* response) { return this->HeadBy(context, request, response); }));
-    }
-    ~WithRawCallbackMethod_HeadBy() override {
-      BaseClassMustBeDerivedFromService(this);
-    }
-    // disable synchronous version of this method
-    ::grpc::Status HeadBy(::grpc::ServerContext* /*context*/, const ::io::deephaven::proto::backplane::grpc::HeadOrTailByRequest* /*request*/, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse* /*response*/) override {
-      abort();
-      return ::grpc::Status(::grpc::StatusCode::UNIMPLEMENTED, "");
-    }
-    virtual ::grpc::ServerUnaryReactor* HeadBy(
-      ::grpc::CallbackServerContext* /*context*/, const ::grpc::ByteBuffer* /*request*/, ::grpc::ByteBuffer* /*response*/)  { return nullptr; }
-  };
-  template <class BaseClass>
-  class WithRawCallbackMethod_TailBy : public BaseClass {
-   private:
-    void BaseClassMustBeDerivedFromService(const Service* /*service*/) {}
-   public:
-    WithRawCallbackMethod_TailBy() {
-      ::grpc::Service::MarkMethodRawCallback(19,
-          new ::grpc::internal::CallbackUnaryHandler< ::grpc::ByteBuffer, ::grpc::ByteBuffer>(
-            [this](
-                   ::grpc::CallbackServerContext* context, const ::grpc::ByteBuffer* request, ::grpc::ByteBuffer* response) { return this->TailBy(context, request, response); }));
-    }
-    ~WithRawCallbackMethod_TailBy() override {
-      BaseClassMustBeDerivedFromService(this);
-    }
-    // disable synchronous version of this method
-    ::grpc::Status TailBy(::grpc::ServerContext* /*context*/, const ::io::deephaven::proto::backplane::grpc::HeadOrTailByRequest* /*request*/, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse* /*response*/) override {
-      abort();
-      return ::grpc::Status(::grpc::StatusCode::UNIMPLEMENTED, "");
-    }
-    virtual ::grpc::ServerUnaryReactor* TailBy(
-      ::grpc::CallbackServerContext* /*context*/, const ::grpc::ByteBuffer* /*request*/, ::grpc::ByteBuffer* /*response*/)  { return nullptr; }
-  };
-  template <class BaseClass>
-  class WithRawCallbackMethod_Ungroup : public BaseClass {
-   private:
-    void BaseClassMustBeDerivedFromService(const Service* /*service*/) {}
-   public:
-    WithRawCallbackMethod_Ungroup() {
-      ::grpc::Service::MarkMethodRawCallback(20,
-          new ::grpc::internal::CallbackUnaryHandler< ::grpc::ByteBuffer, ::grpc::ByteBuffer>(
-            [this](
-                   ::grpc::CallbackServerContext* context, const ::grpc::ByteBuffer* request, ::grpc::ByteBuffer* response) { return this->Ungroup(context, request, response); }));
-    }
-    ~WithRawCallbackMethod_Ungroup() override {
-      BaseClassMustBeDerivedFromService(this);
-    }
-    // disable synchronous version of this method
-    ::grpc::Status Ungroup(::grpc::ServerContext* /*context*/, const ::io::deephaven::proto::backplane::grpc::UngroupRequest* /*request*/, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse* /*response*/) override {
-      abort();
-      return ::grpc::Status(::grpc::StatusCode::UNIMPLEMENTED, "");
-    }
-    virtual ::grpc::ServerUnaryReactor* Ungroup(
-      ::grpc::CallbackServerContext* /*context*/, const ::grpc::ByteBuffer* /*request*/, ::grpc::ByteBuffer* /*response*/)  { return nullptr; }
-  };
-  template <class BaseClass>
-  class WithRawCallbackMethod_MergeTables : public BaseClass {
-   private:
-    void BaseClassMustBeDerivedFromService(const Service* /*service*/) {}
-   public:
-    WithRawCallbackMethod_MergeTables() {
-      ::grpc::Service::MarkMethodRawCallback(21,
-          new ::grpc::internal::CallbackUnaryHandler< ::grpc::ByteBuffer, ::grpc::ByteBuffer>(
-            [this](
-                   ::grpc::CallbackServerContext* context, const ::grpc::ByteBuffer* request, ::grpc::ByteBuffer* response) { return this->MergeTables(context, request, response); }));
-    }
-    ~WithRawCallbackMethod_MergeTables() override {
-      BaseClassMustBeDerivedFromService(this);
-    }
-    // disable synchronous version of this method
-    ::grpc::Status MergeTables(::grpc::ServerContext* /*context*/, const ::io::deephaven::proto::backplane::grpc::MergeTablesRequest* /*request*/, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse* /*response*/) override {
-      abort();
-      return ::grpc::Status(::grpc::StatusCode::UNIMPLEMENTED, "");
-    }
-    virtual ::grpc::ServerUnaryReactor* MergeTables(
-      ::grpc::CallbackServerContext* /*context*/, const ::grpc::ByteBuffer* /*request*/, ::grpc::ByteBuffer* /*response*/)  { return nullptr; }
-  };
-  template <class BaseClass>
-  class WithRawCallbackMethod_CrossJoinTables : public BaseClass {
-   private:
-    void BaseClassMustBeDerivedFromService(const Service* /*service*/) {}
-   public:
-    WithRawCallbackMethod_CrossJoinTables() {
-      ::grpc::Service::MarkMethodRawCallback(22,
-          new ::grpc::internal::CallbackUnaryHandler< ::grpc::ByteBuffer, ::grpc::ByteBuffer>(
-            [this](
-                   ::grpc::CallbackServerContext* context, const ::grpc::ByteBuffer* request, ::grpc::ByteBuffer* response) { return this->CrossJoinTables(context, request, response); }));
-    }
-    ~WithRawCallbackMethod_CrossJoinTables() override {
-      BaseClassMustBeDerivedFromService(this);
-    }
-    // disable synchronous version of this method
-    ::grpc::Status CrossJoinTables(::grpc::ServerContext* /*context*/, const ::io::deephaven::proto::backplane::grpc::CrossJoinTablesRequest* /*request*/, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse* /*response*/) override {
-      abort();
-      return ::grpc::Status(::grpc::StatusCode::UNIMPLEMENTED, "");
-    }
-    virtual ::grpc::ServerUnaryReactor* CrossJoinTables(
-      ::grpc::CallbackServerContext* /*context*/, const ::grpc::ByteBuffer* /*request*/, ::grpc::ByteBuffer* /*response*/)  { return nullptr; }
-  };
-  template <class BaseClass>
-  class WithRawCallbackMethod_NaturalJoinTables : public BaseClass {
-   private:
-    void BaseClassMustBeDerivedFromService(const Service* /*service*/) {}
-   public:
-    WithRawCallbackMethod_NaturalJoinTables() {
-      ::grpc::Service::MarkMethodRawCallback(23,
-          new ::grpc::internal::CallbackUnaryHandler< ::grpc::ByteBuffer, ::grpc::ByteBuffer>(
-            [this](
-                   ::grpc::CallbackServerContext* context, const ::grpc::ByteBuffer* request, ::grpc::ByteBuffer* response) { return this->NaturalJoinTables(context, request, response); }));
-    }
-    ~WithRawCallbackMethod_NaturalJoinTables() override {
-      BaseClassMustBeDerivedFromService(this);
-    }
-    // disable synchronous version of this method
-    ::grpc::Status NaturalJoinTables(::grpc::ServerContext* /*context*/, const ::io::deephaven::proto::backplane::grpc::NaturalJoinTablesRequest* /*request*/, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse* /*response*/) override {
-      abort();
-      return ::grpc::Status(::grpc::StatusCode::UNIMPLEMENTED, "");
-    }
-    virtual ::grpc::ServerUnaryReactor* NaturalJoinTables(
-      ::grpc::CallbackServerContext* /*context*/, const ::grpc::ByteBuffer* /*request*/, ::grpc::ByteBuffer* /*response*/)  { return nullptr; }
-  };
-  template <class BaseClass>
-  class WithRawCallbackMethod_ExactJoinTables : public BaseClass {
-   private:
-    void BaseClassMustBeDerivedFromService(const Service* /*service*/) {}
-   public:
-    WithRawCallbackMethod_ExactJoinTables() {
-      ::grpc::Service::MarkMethodRawCallback(24,
-          new ::grpc::internal::CallbackUnaryHandler< ::grpc::ByteBuffer, ::grpc::ByteBuffer>(
-            [this](
-                   ::grpc::CallbackServerContext* context, const ::grpc::ByteBuffer* request, ::grpc::ByteBuffer* response) { return this->ExactJoinTables(context, request, response); }));
-    }
-    ~WithRawCallbackMethod_ExactJoinTables() override {
-      BaseClassMustBeDerivedFromService(this);
-    }
-    // disable synchronous version of this method
-    ::grpc::Status ExactJoinTables(::grpc::ServerContext* /*context*/, const ::io::deephaven::proto::backplane::grpc::ExactJoinTablesRequest* /*request*/, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse* /*response*/) override {
-      abort();
-      return ::grpc::Status(::grpc::StatusCode::UNIMPLEMENTED, "");
-    }
-    virtual ::grpc::ServerUnaryReactor* ExactJoinTables(
-      ::grpc::CallbackServerContext* /*context*/, const ::grpc::ByteBuffer* /*request*/, ::grpc::ByteBuffer* /*response*/)  { return nullptr; }
-  };
-  template <class BaseClass>
-  class WithRawCallbackMethod_LeftJoinTables : public BaseClass {
-   private:
-    void BaseClassMustBeDerivedFromService(const Service* /*service*/) {}
-   public:
-    WithRawCallbackMethod_LeftJoinTables() {
-      ::grpc::Service::MarkMethodRawCallback(25,
-          new ::grpc::internal::CallbackUnaryHandler< ::grpc::ByteBuffer, ::grpc::ByteBuffer>(
-            [this](
-                   ::grpc::CallbackServerContext* context, const ::grpc::ByteBuffer* request, ::grpc::ByteBuffer* response) { return this->LeftJoinTables(context, request, response); }));
-    }
-    ~WithRawCallbackMethod_LeftJoinTables() override {
-      BaseClassMustBeDerivedFromService(this);
-    }
-    // disable synchronous version of this method
-    ::grpc::Status LeftJoinTables(::grpc::ServerContext* /*context*/, const ::io::deephaven::proto::backplane::grpc::LeftJoinTablesRequest* /*request*/, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse* /*response*/) override {
-      abort();
-      return ::grpc::Status(::grpc::StatusCode::UNIMPLEMENTED, "");
-    }
-    virtual ::grpc::ServerUnaryReactor* LeftJoinTables(
-      ::grpc::CallbackServerContext* /*context*/, const ::grpc::ByteBuffer* /*request*/, ::grpc::ByteBuffer* /*response*/)  { return nullptr; }
-  };
-  template <class BaseClass>
-  class WithRawCallbackMethod_AsOfJoinTables : public BaseClass {
-   private:
-    void BaseClassMustBeDerivedFromService(const Service* /*service*/) {}
-   public:
-    WithRawCallbackMethod_AsOfJoinTables() {
-      ::grpc::Service::MarkMethodRawCallback(26,
-          new ::grpc::internal::CallbackUnaryHandler< ::grpc::ByteBuffer, ::grpc::ByteBuffer>(
-            [this](
-                   ::grpc::CallbackServerContext* context, const ::grpc::ByteBuffer* request, ::grpc::ByteBuffer* response) { return this->AsOfJoinTables(context, request, response); }));
-    }
-    ~WithRawCallbackMethod_AsOfJoinTables() override {
-      BaseClassMustBeDerivedFromService(this);
-    }
-    // disable synchronous version of this method
-    ::grpc::Status AsOfJoinTables(::grpc::ServerContext* /*context*/, const ::io::deephaven::proto::backplane::grpc::AsOfJoinTablesRequest* /*request*/, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse* /*response*/) override {
-      abort();
-      return ::grpc::Status(::grpc::StatusCode::UNIMPLEMENTED, "");
-    }
-    virtual ::grpc::ServerUnaryReactor* AsOfJoinTables(
-      ::grpc::CallbackServerContext* /*context*/, const ::grpc::ByteBuffer* /*request*/, ::grpc::ByteBuffer* /*response*/)  { return nullptr; }
-  };
-  template <class BaseClass>
-  class WithRawCallbackMethod_AjTables : public BaseClass {
-   private:
-    void BaseClassMustBeDerivedFromService(const Service* /*service*/) {}
-   public:
-    WithRawCallbackMethod_AjTables() {
-      ::grpc::Service::MarkMethodRawCallback(27,
-          new ::grpc::internal::CallbackUnaryHandler< ::grpc::ByteBuffer, ::grpc::ByteBuffer>(
-            [this](
-                   ::grpc::CallbackServerContext* context, const ::grpc::ByteBuffer* request, ::grpc::ByteBuffer* response) { return this->AjTables(context, request, response); }));
-    }
-    ~WithRawCallbackMethod_AjTables() override {
-      BaseClassMustBeDerivedFromService(this);
-    }
-    // disable synchronous version of this method
-    ::grpc::Status AjTables(::grpc::ServerContext* /*context*/, const ::io::deephaven::proto::backplane::grpc::AjRajTablesRequest* /*request*/, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse* /*response*/) override {
-      abort();
-      return ::grpc::Status(::grpc::StatusCode::UNIMPLEMENTED, "");
-    }
-    virtual ::grpc::ServerUnaryReactor* AjTables(
-      ::grpc::CallbackServerContext* /*context*/, const ::grpc::ByteBuffer* /*request*/, ::grpc::ByteBuffer* /*response*/)  { return nullptr; }
-  };
-  template <class BaseClass>
-  class WithRawCallbackMethod_RajTables : public BaseClass {
-   private:
-    void BaseClassMustBeDerivedFromService(const Service* /*service*/) {}
-   public:
-    WithRawCallbackMethod_RajTables() {
-      ::grpc::Service::MarkMethodRawCallback(28,
-          new ::grpc::internal::CallbackUnaryHandler< ::grpc::ByteBuffer, ::grpc::ByteBuffer>(
-            [this](
-                   ::grpc::CallbackServerContext* context, const ::grpc::ByteBuffer* request, ::grpc::ByteBuffer* response) { return this->RajTables(context, request, response); }));
-    }
-    ~WithRawCallbackMethod_RajTables() override {
-      BaseClassMustBeDerivedFromService(this);
-    }
-    // disable synchronous version of this method
-    ::grpc::Status RajTables(::grpc::ServerContext* /*context*/, const ::io::deephaven::proto::backplane::grpc::AjRajTablesRequest* /*request*/, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse* /*response*/) override {
-      abort();
-      return ::grpc::Status(::grpc::StatusCode::UNIMPLEMENTED, "");
-    }
-    virtual ::grpc::ServerUnaryReactor* RajTables(
-      ::grpc::CallbackServerContext* /*context*/, const ::grpc::ByteBuffer* /*request*/, ::grpc::ByteBuffer* /*response*/)  { return nullptr; }
-  };
-  template <class BaseClass>
-  class WithRawCallbackMethod_MultiJoinTables : public BaseClass {
-   private:
-    void BaseClassMustBeDerivedFromService(const Service* /*service*/) {}
-   public:
-    WithRawCallbackMethod_MultiJoinTables() {
-      ::grpc::Service::MarkMethodRawCallback(29,
-          new ::grpc::internal::CallbackUnaryHandler< ::grpc::ByteBuffer, ::grpc::ByteBuffer>(
-            [this](
-                   ::grpc::CallbackServerContext* context, const ::grpc::ByteBuffer* request, ::grpc::ByteBuffer* response) { return this->MultiJoinTables(context, request, response); }));
-    }
-    ~WithRawCallbackMethod_MultiJoinTables() override {
-      BaseClassMustBeDerivedFromService(this);
-    }
-    // disable synchronous version of this method
-    ::grpc::Status MultiJoinTables(::grpc::ServerContext* /*context*/, const ::io::deephaven::proto::backplane::grpc::MultiJoinTablesRequest* /*request*/, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse* /*response*/) override {
-      abort();
-      return ::grpc::Status(::grpc::StatusCode::UNIMPLEMENTED, "");
-    }
-    virtual ::grpc::ServerUnaryReactor* MultiJoinTables(
-      ::grpc::CallbackServerContext* /*context*/, const ::grpc::ByteBuffer* /*request*/, ::grpc::ByteBuffer* /*response*/)  { return nullptr; }
-  };
-  template <class BaseClass>
-  class WithRawCallbackMethod_RangeJoinTables : public BaseClass {
-   private:
-    void BaseClassMustBeDerivedFromService(const Service* /*service*/) {}
-   public:
-    WithRawCallbackMethod_RangeJoinTables() {
-      ::grpc::Service::MarkMethodRawCallback(30,
-          new ::grpc::internal::CallbackUnaryHandler< ::grpc::ByteBuffer, ::grpc::ByteBuffer>(
-            [this](
-                   ::grpc::CallbackServerContext* context, const ::grpc::ByteBuffer* request, ::grpc::ByteBuffer* response) { return this->RangeJoinTables(context, request, response); }));
-    }
-    ~WithRawCallbackMethod_RangeJoinTables() override {
-      BaseClassMustBeDerivedFromService(this);
-    }
-    // disable synchronous version of this method
-    ::grpc::Status RangeJoinTables(::grpc::ServerContext* /*context*/, const ::io::deephaven::proto::backplane::grpc::RangeJoinTablesRequest* /*request*/, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse* /*response*/) override {
-      abort();
-      return ::grpc::Status(::grpc::StatusCode::UNIMPLEMENTED, "");
-    }
-    virtual ::grpc::ServerUnaryReactor* RangeJoinTables(
-      ::grpc::CallbackServerContext* /*context*/, const ::grpc::ByteBuffer* /*request*/, ::grpc::ByteBuffer* /*response*/)  { return nullptr; }
-  };
-  template <class BaseClass>
-  class WithRawCallbackMethod_ComboAggregate : public BaseClass {
-   private:
-    void BaseClassMustBeDerivedFromService(const Service* /*service*/) {}
-   public:
-    WithRawCallbackMethod_ComboAggregate() {
-      ::grpc::Service::MarkMethodRawCallback(31,
-          new ::grpc::internal::CallbackUnaryHandler< ::grpc::ByteBuffer, ::grpc::ByteBuffer>(
-            [this](
-                   ::grpc::CallbackServerContext* context, const ::grpc::ByteBuffer* request, ::grpc::ByteBuffer* response) { return this->ComboAggregate(context, request, response); }));
-    }
-    ~WithRawCallbackMethod_ComboAggregate() override {
-      BaseClassMustBeDerivedFromService(this);
-    }
-    // disable synchronous version of this method
-    ::grpc::Status ComboAggregate(::grpc::ServerContext* /*context*/, const ::io::deephaven::proto::backplane::grpc::ComboAggregateRequest* /*request*/, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse* /*response*/) override {
-      abort();
-      return ::grpc::Status(::grpc::StatusCode::UNIMPLEMENTED, "");
-    }
-    virtual ::grpc::ServerUnaryReactor* ComboAggregate(
-      ::grpc::CallbackServerContext* /*context*/, const ::grpc::ByteBuffer* /*request*/, ::grpc::ByteBuffer* /*response*/)  { return nullptr; }
-  };
-  template <class BaseClass>
-  class WithRawCallbackMethod_AggregateAll : public BaseClass {
-   private:
-    void BaseClassMustBeDerivedFromService(const Service* /*service*/) {}
-   public:
-    WithRawCallbackMethod_AggregateAll() {
-      ::grpc::Service::MarkMethodRawCallback(32,
-          new ::grpc::internal::CallbackUnaryHandler< ::grpc::ByteBuffer, ::grpc::ByteBuffer>(
-            [this](
-                   ::grpc::CallbackServerContext* context, const ::grpc::ByteBuffer* request, ::grpc::ByteBuffer* response) { return this->AggregateAll(context, request, response); }));
-    }
-    ~WithRawCallbackMethod_AggregateAll() override {
-      BaseClassMustBeDerivedFromService(this);
-    }
-    // disable synchronous version of this method
-    ::grpc::Status AggregateAll(::grpc::ServerContext* /*context*/, const ::io::deephaven::proto::backplane::grpc::AggregateAllRequest* /*request*/, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse* /*response*/) override {
-      abort();
-      return ::grpc::Status(::grpc::StatusCode::UNIMPLEMENTED, "");
-    }
-    virtual ::grpc::ServerUnaryReactor* AggregateAll(
-      ::grpc::CallbackServerContext* /*context*/, const ::grpc::ByteBuffer* /*request*/, ::grpc::ByteBuffer* /*response*/)  { return nullptr; }
-  };
-  template <class BaseClass>
-  class WithRawCallbackMethod_Aggregate : public BaseClass {
-   private:
-    void BaseClassMustBeDerivedFromService(const Service* /*service*/) {}
-   public:
-    WithRawCallbackMethod_Aggregate() {
-      ::grpc::Service::MarkMethodRawCallback(33,
-          new ::grpc::internal::CallbackUnaryHandler< ::grpc::ByteBuffer, ::grpc::ByteBuffer>(
-            [this](
-                   ::grpc::CallbackServerContext* context, const ::grpc::ByteBuffer* request, ::grpc::ByteBuffer* response) { return this->Aggregate(context, request, response); }));
-    }
-    ~WithRawCallbackMethod_Aggregate() override {
-      BaseClassMustBeDerivedFromService(this);
-    }
-    // disable synchronous version of this method
-    ::grpc::Status Aggregate(::grpc::ServerContext* /*context*/, const ::io::deephaven::proto::backplane::grpc::AggregateRequest* /*request*/, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse* /*response*/) override {
-      abort();
-      return ::grpc::Status(::grpc::StatusCode::UNIMPLEMENTED, "");
-    }
-    virtual ::grpc::ServerUnaryReactor* Aggregate(
-      ::grpc::CallbackServerContext* /*context*/, const ::grpc::ByteBuffer* /*request*/, ::grpc::ByteBuffer* /*response*/)  { return nullptr; }
-  };
-  template <class BaseClass>
-  class WithRawCallbackMethod_Snapshot : public BaseClass {
-   private:
-    void BaseClassMustBeDerivedFromService(const Service* /*service*/) {}
-   public:
-    WithRawCallbackMethod_Snapshot() {
-      ::grpc::Service::MarkMethodRawCallback(34,
-          new ::grpc::internal::CallbackUnaryHandler< ::grpc::ByteBuffer, ::grpc::ByteBuffer>(
-            [this](
-                   ::grpc::CallbackServerContext* context, const ::grpc::ByteBuffer* request, ::grpc::ByteBuffer* response) { return this->Snapshot(context, request, response); }));
-    }
-    ~WithRawCallbackMethod_Snapshot() override {
-      BaseClassMustBeDerivedFromService(this);
-    }
-    // disable synchronous version of this method
-    ::grpc::Status Snapshot(::grpc::ServerContext* /*context*/, const ::io::deephaven::proto::backplane::grpc::SnapshotTableRequest* /*request*/, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse* /*response*/) override {
-      abort();
-      return ::grpc::Status(::grpc::StatusCode::UNIMPLEMENTED, "");
-    }
-    virtual ::grpc::ServerUnaryReactor* Snapshot(
-      ::grpc::CallbackServerContext* /*context*/, const ::grpc::ByteBuffer* /*request*/, ::grpc::ByteBuffer* /*response*/)  { return nullptr; }
-  };
-  template <class BaseClass>
-  class WithRawCallbackMethod_SnapshotWhen : public BaseClass {
-   private:
-    void BaseClassMustBeDerivedFromService(const Service* /*service*/) {}
-   public:
-    WithRawCallbackMethod_SnapshotWhen() {
-      ::grpc::Service::MarkMethodRawCallback(35,
-          new ::grpc::internal::CallbackUnaryHandler< ::grpc::ByteBuffer, ::grpc::ByteBuffer>(
-            [this](
-                   ::grpc::CallbackServerContext* context, const ::grpc::ByteBuffer* request, ::grpc::ByteBuffer* response) { return this->SnapshotWhen(context, request, response); }));
-    }
-    ~WithRawCallbackMethod_SnapshotWhen() override {
-      BaseClassMustBeDerivedFromService(this);
-    }
-    // disable synchronous version of this method
-    ::grpc::Status SnapshotWhen(::grpc::ServerContext* /*context*/, const ::io::deephaven::proto::backplane::grpc::SnapshotWhenTableRequest* /*request*/, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse* /*response*/) override {
-      abort();
-      return ::grpc::Status(::grpc::StatusCode::UNIMPLEMENTED, "");
-    }
-    virtual ::grpc::ServerUnaryReactor* SnapshotWhen(
-      ::grpc::CallbackServerContext* /*context*/, const ::grpc::ByteBuffer* /*request*/, ::grpc::ByteBuffer* /*response*/)  { return nullptr; }
-  };
-  template <class BaseClass>
-  class WithRawCallbackMethod_Flatten : public BaseClass {
-   private:
-    void BaseClassMustBeDerivedFromService(const Service* /*service*/) {}
-   public:
-    WithRawCallbackMethod_Flatten() {
-      ::grpc::Service::MarkMethodRawCallback(36,
-          new ::grpc::internal::CallbackUnaryHandler< ::grpc::ByteBuffer, ::grpc::ByteBuffer>(
-            [this](
-                   ::grpc::CallbackServerContext* context, const ::grpc::ByteBuffer* request, ::grpc::ByteBuffer* response) { return this->Flatten(context, request, response); }));
-    }
-    ~WithRawCallbackMethod_Flatten() override {
-      BaseClassMustBeDerivedFromService(this);
-    }
-    // disable synchronous version of this method
-    ::grpc::Status Flatten(::grpc::ServerContext* /*context*/, const ::io::deephaven::proto::backplane::grpc::FlattenRequest* /*request*/, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse* /*response*/) override {
-      abort();
-      return ::grpc::Status(::grpc::StatusCode::UNIMPLEMENTED, "");
-    }
-    virtual ::grpc::ServerUnaryReactor* Flatten(
-      ::grpc::CallbackServerContext* /*context*/, const ::grpc::ByteBuffer* /*request*/, ::grpc::ByteBuffer* /*response*/)  { return nullptr; }
-  };
-  template <class BaseClass>
-  class WithRawCallbackMethod_RunChartDownsample : public BaseClass {
-   private:
-    void BaseClassMustBeDerivedFromService(const Service* /*service*/) {}
-   public:
-    WithRawCallbackMethod_RunChartDownsample() {
-      ::grpc::Service::MarkMethodRawCallback(37,
-          new ::grpc::internal::CallbackUnaryHandler< ::grpc::ByteBuffer, ::grpc::ByteBuffer>(
-            [this](
-                   ::grpc::CallbackServerContext* context, const ::grpc::ByteBuffer* request, ::grpc::ByteBuffer* response) { return this->RunChartDownsample(context, request, response); }));
-    }
-    ~WithRawCallbackMethod_RunChartDownsample() override {
-      BaseClassMustBeDerivedFromService(this);
-    }
-    // disable synchronous version of this method
-    ::grpc::Status RunChartDownsample(::grpc::ServerContext* /*context*/, const ::io::deephaven::proto::backplane::grpc::RunChartDownsampleRequest* /*request*/, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse* /*response*/) override {
-      abort();
-      return ::grpc::Status(::grpc::StatusCode::UNIMPLEMENTED, "");
-    }
-    virtual ::grpc::ServerUnaryReactor* RunChartDownsample(
-      ::grpc::CallbackServerContext* /*context*/, const ::grpc::ByteBuffer* /*request*/, ::grpc::ByteBuffer* /*response*/)  { return nullptr; }
-  };
-  template <class BaseClass>
-  class WithRawCallbackMethod_CreateInputTable : public BaseClass {
-   private:
-    void BaseClassMustBeDerivedFromService(const Service* /*service*/) {}
-   public:
-    WithRawCallbackMethod_CreateInputTable() {
-      ::grpc::Service::MarkMethodRawCallback(38,
-          new ::grpc::internal::CallbackUnaryHandler< ::grpc::ByteBuffer, ::grpc::ByteBuffer>(
-            [this](
-                   ::grpc::CallbackServerContext* context, const ::grpc::ByteBuffer* request, ::grpc::ByteBuffer* response) { return this->CreateInputTable(context, request, response); }));
-    }
-    ~WithRawCallbackMethod_CreateInputTable() override {
-      BaseClassMustBeDerivedFromService(this);
-    }
-    // disable synchronous version of this method
-    ::grpc::Status CreateInputTable(::grpc::ServerContext* /*context*/, const ::io::deephaven::proto::backplane::grpc::CreateInputTableRequest* /*request*/, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse* /*response*/) override {
-      abort();
-      return ::grpc::Status(::grpc::StatusCode::UNIMPLEMENTED, "");
-    }
-    virtual ::grpc::ServerUnaryReactor* CreateInputTable(
-      ::grpc::CallbackServerContext* /*context*/, const ::grpc::ByteBuffer* /*request*/, ::grpc::ByteBuffer* /*response*/)  { return nullptr; }
-  };
-  template <class BaseClass>
-  class WithRawCallbackMethod_WhereIn : public BaseClass {
-   private:
-    void BaseClassMustBeDerivedFromService(const Service* /*service*/) {}
-   public:
-    WithRawCallbackMethod_WhereIn() {
-      ::grpc::Service::MarkMethodRawCallback(39,
-          new ::grpc::internal::CallbackUnaryHandler< ::grpc::ByteBuffer, ::grpc::ByteBuffer>(
-            [this](
-                   ::grpc::CallbackServerContext* context, const ::grpc::ByteBuffer* request, ::grpc::ByteBuffer* response) { return this->WhereIn(context, request, response); }));
-    }
-    ~WithRawCallbackMethod_WhereIn() override {
-      BaseClassMustBeDerivedFromService(this);
-    }
-    // disable synchronous version of this method
-    ::grpc::Status WhereIn(::grpc::ServerContext* /*context*/, const ::io::deephaven::proto::backplane::grpc::WhereInRequest* /*request*/, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse* /*response*/) override {
-      abort();
-      return ::grpc::Status(::grpc::StatusCode::UNIMPLEMENTED, "");
-    }
-    virtual ::grpc::ServerUnaryReactor* WhereIn(
-      ::grpc::CallbackServerContext* /*context*/, const ::grpc::ByteBuffer* /*request*/, ::grpc::ByteBuffer* /*response*/)  { return nullptr; }
-  };
-  template <class BaseClass>
-  class WithRawCallbackMethod_Batch : public BaseClass {
-   private:
-    void BaseClassMustBeDerivedFromService(const Service* /*service*/) {}
-   public:
-    WithRawCallbackMethod_Batch() {
-      ::grpc::Service::MarkMethodRawCallback(40,
-          new ::grpc::internal::CallbackServerStreamingHandler< ::grpc::ByteBuffer, ::grpc::ByteBuffer>(
-            [this](
-                   ::grpc::CallbackServerContext* context, const::grpc::ByteBuffer* request) { return this->Batch(context, request); }));
-    }
-    ~WithRawCallbackMethod_Batch() override {
-      BaseClassMustBeDerivedFromService(this);
-    }
-    // disable synchronous version of this method
-    ::grpc::Status Batch(::grpc::ServerContext* /*context*/, const ::io::deephaven::proto::backplane::grpc::BatchTableRequest* /*request*/, ::grpc::ServerWriter< ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse>* /*writer*/) override {
-      abort();
-      return ::grpc::Status(::grpc::StatusCode::UNIMPLEMENTED, "");
-    }
-    virtual ::grpc::ServerWriteReactor< ::grpc::ByteBuffer>* Batch(
-      ::grpc::CallbackServerContext* /*context*/, const ::grpc::ByteBuffer* /*request*/)  { return nullptr; }
-  };
-  template <class BaseClass>
-  class WithRawCallbackMethod_ExportedTableUpdates : public BaseClass {
-   private:
-    void BaseClassMustBeDerivedFromService(const Service* /*service*/) {}
-   public:
-    WithRawCallbackMethod_ExportedTableUpdates() {
-      ::grpc::Service::MarkMethodRawCallback(41,
-          new ::grpc::internal::CallbackServerStreamingHandler< ::grpc::ByteBuffer, ::grpc::ByteBuffer>(
-            [this](
-                   ::grpc::CallbackServerContext* context, const::grpc::ByteBuffer* request) { return this->ExportedTableUpdates(context, request); }));
-    }
-    ~WithRawCallbackMethod_ExportedTableUpdates() override {
-      BaseClassMustBeDerivedFromService(this);
-    }
-    // disable synchronous version of this method
-    ::grpc::Status ExportedTableUpdates(::grpc::ServerContext* /*context*/, const ::io::deephaven::proto::backplane::grpc::ExportedTableUpdatesRequest* /*request*/, ::grpc::ServerWriter< ::io::deephaven::proto::backplane::grpc::ExportedTableUpdateMessage>* /*writer*/) override {
-      abort();
-      return ::grpc::Status(::grpc::StatusCode::UNIMPLEMENTED, "");
-    }
-    virtual ::grpc::ServerWriteReactor< ::grpc::ByteBuffer>* ExportedTableUpdates(
-      ::grpc::CallbackServerContext* /*context*/, const ::grpc::ByteBuffer* /*request*/)  { return nullptr; }
-  };
-  template <class BaseClass>
-  class WithRawCallbackMethod_SeekRow : public BaseClass {
-   private:
-    void BaseClassMustBeDerivedFromService(const Service* /*service*/) {}
-   public:
-    WithRawCallbackMethod_SeekRow() {
-      ::grpc::Service::MarkMethodRawCallback(42,
-          new ::grpc::internal::CallbackUnaryHandler< ::grpc::ByteBuffer, ::grpc::ByteBuffer>(
-            [this](
-                   ::grpc::CallbackServerContext* context, const ::grpc::ByteBuffer* request, ::grpc::ByteBuffer* response) { return this->SeekRow(context, request, response); }));
-    }
-    ~WithRawCallbackMethod_SeekRow() override {
-      BaseClassMustBeDerivedFromService(this);
-    }
-    // disable synchronous version of this method
-    ::grpc::Status SeekRow(::grpc::ServerContext* /*context*/, const ::io::deephaven::proto::backplane::grpc::SeekRowRequest* /*request*/, ::io::deephaven::proto::backplane::grpc::SeekRowResponse* /*response*/) override {
-      abort();
-      return ::grpc::Status(::grpc::StatusCode::UNIMPLEMENTED, "");
-    }
-    virtual ::grpc::ServerUnaryReactor* SeekRow(
-      ::grpc::CallbackServerContext* /*context*/, const ::grpc::ByteBuffer* /*request*/, ::grpc::ByteBuffer* /*response*/)  { return nullptr; }
-  };
-  template <class BaseClass>
-  class WithRawCallbackMethod_MetaTable : public BaseClass {
-   private:
-    void BaseClassMustBeDerivedFromService(const Service* /*service*/) {}
-   public:
-    WithRawCallbackMethod_MetaTable() {
-      ::grpc::Service::MarkMethodRawCallback(43,
-          new ::grpc::internal::CallbackUnaryHandler< ::grpc::ByteBuffer, ::grpc::ByteBuffer>(
-            [this](
-                   ::grpc::CallbackServerContext* context, const ::grpc::ByteBuffer* request, ::grpc::ByteBuffer* response) { return this->MetaTable(context, request, response); }));
-    }
-    ~WithRawCallbackMethod_MetaTable() override {
-      BaseClassMustBeDerivedFromService(this);
-    }
-    // disable synchronous version of this method
-    ::grpc::Status MetaTable(::grpc::ServerContext* /*context*/, const ::io::deephaven::proto::backplane::grpc::MetaTableRequest* /*request*/, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse* /*response*/) override {
-      abort();
-      return ::grpc::Status(::grpc::StatusCode::UNIMPLEMENTED, "");
-    }
-    virtual ::grpc::ServerUnaryReactor* MetaTable(
-      ::grpc::CallbackServerContext* /*context*/, const ::grpc::ByteBuffer* /*request*/, ::grpc::ByteBuffer* /*response*/)  { return nullptr; }
-  };
-  template <class BaseClass>
-  class WithRawCallbackMethod_ComputeColumnStatistics : public BaseClass {
-   private:
-    void BaseClassMustBeDerivedFromService(const Service* /*service*/) {}
-   public:
-    WithRawCallbackMethod_ComputeColumnStatistics() {
-      ::grpc::Service::MarkMethodRawCallback(44,
-          new ::grpc::internal::CallbackUnaryHandler< ::grpc::ByteBuffer, ::grpc::ByteBuffer>(
-            [this](
-                   ::grpc::CallbackServerContext* context, const ::grpc::ByteBuffer* request, ::grpc::ByteBuffer* response) { return this->ComputeColumnStatistics(context, request, response); }));
-    }
-    ~WithRawCallbackMethod_ComputeColumnStatistics() override {
-      BaseClassMustBeDerivedFromService(this);
-    }
-    // disable synchronous version of this method
-    ::grpc::Status ComputeColumnStatistics(::grpc::ServerContext* /*context*/, const ::io::deephaven::proto::backplane::grpc::ColumnStatisticsRequest* /*request*/, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse* /*response*/) override {
-      abort();
-      return ::grpc::Status(::grpc::StatusCode::UNIMPLEMENTED, "");
-    }
-    virtual ::grpc::ServerUnaryReactor* ComputeColumnStatistics(
-      ::grpc::CallbackServerContext* /*context*/, const ::grpc::ByteBuffer* /*request*/, ::grpc::ByteBuffer* /*response*/)  { return nullptr; }
-  };
-  template <class BaseClass>
-  class WithStreamedUnaryMethod_GetExportedTableCreationResponse : public BaseClass {
-   private:
-    void BaseClassMustBeDerivedFromService(const Service* /*service*/) {}
-   public:
-    WithStreamedUnaryMethod_GetExportedTableCreationResponse() {
-      ::grpc::Service::MarkMethodStreamed(0,
-        new ::grpc::internal::StreamedUnaryHandler<
-          ::io::deephaven::proto::backplane::grpc::Ticket, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse>(
-            [this](::grpc::ServerContext* context,
-                   ::grpc::ServerUnaryStreamer<
-                     ::io::deephaven::proto::backplane::grpc::Ticket, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse>* streamer) {
-                       return this->StreamedGetExportedTableCreationResponse(context,
-                         streamer);
-                  }));
-    }
-    ~WithStreamedUnaryMethod_GetExportedTableCreationResponse() override {
-      BaseClassMustBeDerivedFromService(this);
-    }
-    // disable regular version of this method
-    ::grpc::Status GetExportedTableCreationResponse(::grpc::ServerContext* /*context*/, const ::io::deephaven::proto::backplane::grpc::Ticket* /*request*/, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse* /*response*/) override {
-      abort();
-      return ::grpc::Status(::grpc::StatusCode::UNIMPLEMENTED, "");
-    }
-    // replace default version of method with streamed unary
-    virtual ::grpc::Status StreamedGetExportedTableCreationResponse(::grpc::ServerContext* context, ::grpc::ServerUnaryStreamer< ::io::deephaven::proto::backplane::grpc::Ticket,::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse>* server_unary_streamer) = 0;
-  };
-  template <class BaseClass>
-  class WithStreamedUnaryMethod_FetchTable : public BaseClass {
-   private:
-    void BaseClassMustBeDerivedFromService(const Service* /*service*/) {}
-   public:
-    WithStreamedUnaryMethod_FetchTable() {
-      ::grpc::Service::MarkMethodStreamed(1,
-        new ::grpc::internal::StreamedUnaryHandler<
-          ::io::deephaven::proto::backplane::grpc::FetchTableRequest, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse>(
-            [this](::grpc::ServerContext* context,
-                   ::grpc::ServerUnaryStreamer<
-                     ::io::deephaven::proto::backplane::grpc::FetchTableRequest, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse>* streamer) {
-                       return this->StreamedFetchTable(context,
-                         streamer);
-                  }));
-    }
-    ~WithStreamedUnaryMethod_FetchTable() override {
-      BaseClassMustBeDerivedFromService(this);
-    }
-    // disable regular version of this method
-    ::grpc::Status FetchTable(::grpc::ServerContext* /*context*/, const ::io::deephaven::proto::backplane::grpc::FetchTableRequest* /*request*/, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse* /*response*/) override {
-      abort();
-      return ::grpc::Status(::grpc::StatusCode::UNIMPLEMENTED, "");
-    }
-    // replace default version of method with streamed unary
-    virtual ::grpc::Status StreamedFetchTable(::grpc::ServerContext* context, ::grpc::ServerUnaryStreamer< ::io::deephaven::proto::backplane::grpc::FetchTableRequest,::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse>* server_unary_streamer) = 0;
-  };
-  template <class BaseClass>
-  class WithStreamedUnaryMethod_ApplyPreviewColumns : public BaseClass {
-   private:
-    void BaseClassMustBeDerivedFromService(const Service* /*service*/) {}
-   public:
-    WithStreamedUnaryMethod_ApplyPreviewColumns() {
-      ::grpc::Service::MarkMethodStreamed(2,
-        new ::grpc::internal::StreamedUnaryHandler<
-          ::io::deephaven::proto::backplane::grpc::ApplyPreviewColumnsRequest, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse>(
-            [this](::grpc::ServerContext* context,
-                   ::grpc::ServerUnaryStreamer<
-                     ::io::deephaven::proto::backplane::grpc::ApplyPreviewColumnsRequest, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse>* streamer) {
-                       return this->StreamedApplyPreviewColumns(context,
-                         streamer);
-                  }));
-    }
-    ~WithStreamedUnaryMethod_ApplyPreviewColumns() override {
-      BaseClassMustBeDerivedFromService(this);
-    }
-    // disable regular version of this method
-    ::grpc::Status ApplyPreviewColumns(::grpc::ServerContext* /*context*/, const ::io::deephaven::proto::backplane::grpc::ApplyPreviewColumnsRequest* /*request*/, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse* /*response*/) override {
-      abort();
-      return ::grpc::Status(::grpc::StatusCode::UNIMPLEMENTED, "");
-    }
-    // replace default version of method with streamed unary
-    virtual ::grpc::Status StreamedApplyPreviewColumns(::grpc::ServerContext* context, ::grpc::ServerUnaryStreamer< ::io::deephaven::proto::backplane::grpc::ApplyPreviewColumnsRequest,::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse>* server_unary_streamer) = 0;
-  };
-  template <class BaseClass>
-  class WithStreamedUnaryMethod_EmptyTable : public BaseClass {
-   private:
-    void BaseClassMustBeDerivedFromService(const Service* /*service*/) {}
-   public:
-    WithStreamedUnaryMethod_EmptyTable() {
-      ::grpc::Service::MarkMethodStreamed(3,
-        new ::grpc::internal::StreamedUnaryHandler<
-          ::io::deephaven::proto::backplane::grpc::EmptyTableRequest, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse>(
-            [this](::grpc::ServerContext* context,
-                   ::grpc::ServerUnaryStreamer<
-                     ::io::deephaven::proto::backplane::grpc::EmptyTableRequest, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse>* streamer) {
-                       return this->StreamedEmptyTable(context,
-                         streamer);
-                  }));
-    }
-    ~WithStreamedUnaryMethod_EmptyTable() override {
-      BaseClassMustBeDerivedFromService(this);
-    }
-    // disable regular version of this method
-    ::grpc::Status EmptyTable(::grpc::ServerContext* /*context*/, const ::io::deephaven::proto::backplane::grpc::EmptyTableRequest* /*request*/, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse* /*response*/) override {
-      abort();
-      return ::grpc::Status(::grpc::StatusCode::UNIMPLEMENTED, "");
-    }
-    // replace default version of method with streamed unary
-    virtual ::grpc::Status StreamedEmptyTable(::grpc::ServerContext* context, ::grpc::ServerUnaryStreamer< ::io::deephaven::proto::backplane::grpc::EmptyTableRequest,::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse>* server_unary_streamer) = 0;
-  };
-  template <class BaseClass>
-  class WithStreamedUnaryMethod_TimeTable : public BaseClass {
-   private:
-    void BaseClassMustBeDerivedFromService(const Service* /*service*/) {}
-   public:
-    WithStreamedUnaryMethod_TimeTable() {
-      ::grpc::Service::MarkMethodStreamed(4,
-        new ::grpc::internal::StreamedUnaryHandler<
-          ::io::deephaven::proto::backplane::grpc::TimeTableRequest, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse>(
-            [this](::grpc::ServerContext* context,
-                   ::grpc::ServerUnaryStreamer<
-                     ::io::deephaven::proto::backplane::grpc::TimeTableRequest, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse>* streamer) {
-                       return this->StreamedTimeTable(context,
-                         streamer);
-                  }));
-    }
-    ~WithStreamedUnaryMethod_TimeTable() override {
-      BaseClassMustBeDerivedFromService(this);
-    }
-    // disable regular version of this method
-    ::grpc::Status TimeTable(::grpc::ServerContext* /*context*/, const ::io::deephaven::proto::backplane::grpc::TimeTableRequest* /*request*/, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse* /*response*/) override {
-      abort();
-      return ::grpc::Status(::grpc::StatusCode::UNIMPLEMENTED, "");
-    }
-    // replace default version of method with streamed unary
-    virtual ::grpc::Status StreamedTimeTable(::grpc::ServerContext* context, ::grpc::ServerUnaryStreamer< ::io::deephaven::proto::backplane::grpc::TimeTableRequest,::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse>* server_unary_streamer) = 0;
-  };
-  template <class BaseClass>
-  class WithStreamedUnaryMethod_DropColumns : public BaseClass {
-   private:
-    void BaseClassMustBeDerivedFromService(const Service* /*service*/) {}
-   public:
-    WithStreamedUnaryMethod_DropColumns() {
-      ::grpc::Service::MarkMethodStreamed(5,
-        new ::grpc::internal::StreamedUnaryHandler<
-          ::io::deephaven::proto::backplane::grpc::DropColumnsRequest, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse>(
-            [this](::grpc::ServerContext* context,
-                   ::grpc::ServerUnaryStreamer<
-                     ::io::deephaven::proto::backplane::grpc::DropColumnsRequest, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse>* streamer) {
-                       return this->StreamedDropColumns(context,
-                         streamer);
-                  }));
-    }
-    ~WithStreamedUnaryMethod_DropColumns() override {
-      BaseClassMustBeDerivedFromService(this);
-    }
-    // disable regular version of this method
-    ::grpc::Status DropColumns(::grpc::ServerContext* /*context*/, const ::io::deephaven::proto::backplane::grpc::DropColumnsRequest* /*request*/, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse* /*response*/) override {
-      abort();
-      return ::grpc::Status(::grpc::StatusCode::UNIMPLEMENTED, "");
-    }
-    // replace default version of method with streamed unary
-    virtual ::grpc::Status StreamedDropColumns(::grpc::ServerContext* context, ::grpc::ServerUnaryStreamer< ::io::deephaven::proto::backplane::grpc::DropColumnsRequest,::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse>* server_unary_streamer) = 0;
-  };
-  template <class BaseClass>
-  class WithStreamedUnaryMethod_Update : public BaseClass {
-   private:
-    void BaseClassMustBeDerivedFromService(const Service* /*service*/) {}
-   public:
-    WithStreamedUnaryMethod_Update() {
-      ::grpc::Service::MarkMethodStreamed(6,
-        new ::grpc::internal::StreamedUnaryHandler<
-          ::io::deephaven::proto::backplane::grpc::SelectOrUpdateRequest, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse>(
-            [this](::grpc::ServerContext* context,
-                   ::grpc::ServerUnaryStreamer<
-                     ::io::deephaven::proto::backplane::grpc::SelectOrUpdateRequest, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse>* streamer) {
-                       return this->StreamedUpdate(context,
-                         streamer);
-                  }));
-    }
-    ~WithStreamedUnaryMethod_Update() override {
-      BaseClassMustBeDerivedFromService(this);
-    }
-    // disable regular version of this method
-    ::grpc::Status Update(::grpc::ServerContext* /*context*/, const ::io::deephaven::proto::backplane::grpc::SelectOrUpdateRequest* /*request*/, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse* /*response*/) override {
-      abort();
-      return ::grpc::Status(::grpc::StatusCode::UNIMPLEMENTED, "");
-    }
-    // replace default version of method with streamed unary
-    virtual ::grpc::Status StreamedUpdate(::grpc::ServerContext* context, ::grpc::ServerUnaryStreamer< ::io::deephaven::proto::backplane::grpc::SelectOrUpdateRequest,::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse>* server_unary_streamer) = 0;
-  };
-  template <class BaseClass>
-  class WithStreamedUnaryMethod_LazyUpdate : public BaseClass {
-   private:
-    void BaseClassMustBeDerivedFromService(const Service* /*service*/) {}
-   public:
-    WithStreamedUnaryMethod_LazyUpdate() {
-      ::grpc::Service::MarkMethodStreamed(7,
-        new ::grpc::internal::StreamedUnaryHandler<
-          ::io::deephaven::proto::backplane::grpc::SelectOrUpdateRequest, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse>(
-            [this](::grpc::ServerContext* context,
-                   ::grpc::ServerUnaryStreamer<
-                     ::io::deephaven::proto::backplane::grpc::SelectOrUpdateRequest, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse>* streamer) {
-                       return this->StreamedLazyUpdate(context,
-                         streamer);
-                  }));
-    }
-    ~WithStreamedUnaryMethod_LazyUpdate() override {
-      BaseClassMustBeDerivedFromService(this);
-    }
-    // disable regular version of this method
-    ::grpc::Status LazyUpdate(::grpc::ServerContext* /*context*/, const ::io::deephaven::proto::backplane::grpc::SelectOrUpdateRequest* /*request*/, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse* /*response*/) override {
-      abort();
-      return ::grpc::Status(::grpc::StatusCode::UNIMPLEMENTED, "");
-    }
-    // replace default version of method with streamed unary
-    virtual ::grpc::Status StreamedLazyUpdate(::grpc::ServerContext* context, ::grpc::ServerUnaryStreamer< ::io::deephaven::proto::backplane::grpc::SelectOrUpdateRequest,::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse>* server_unary_streamer) = 0;
-  };
-  template <class BaseClass>
-  class WithStreamedUnaryMethod_View : public BaseClass {
-   private:
-    void BaseClassMustBeDerivedFromService(const Service* /*service*/) {}
-   public:
-    WithStreamedUnaryMethod_View() {
-      ::grpc::Service::MarkMethodStreamed(8,
-        new ::grpc::internal::StreamedUnaryHandler<
-          ::io::deephaven::proto::backplane::grpc::SelectOrUpdateRequest, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse>(
-            [this](::grpc::ServerContext* context,
-                   ::grpc::ServerUnaryStreamer<
-                     ::io::deephaven::proto::backplane::grpc::SelectOrUpdateRequest, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse>* streamer) {
-                       return this->StreamedView(context,
-                         streamer);
-                  }));
-    }
-    ~WithStreamedUnaryMethod_View() override {
-      BaseClassMustBeDerivedFromService(this);
-    }
-    // disable regular version of this method
-    ::grpc::Status View(::grpc::ServerContext* /*context*/, const ::io::deephaven::proto::backplane::grpc::SelectOrUpdateRequest* /*request*/, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse* /*response*/) override {
-      abort();
-      return ::grpc::Status(::grpc::StatusCode::UNIMPLEMENTED, "");
-    }
-    // replace default version of method with streamed unary
-    virtual ::grpc::Status StreamedView(::grpc::ServerContext* context, ::grpc::ServerUnaryStreamer< ::io::deephaven::proto::backplane::grpc::SelectOrUpdateRequest,::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse>* server_unary_streamer) = 0;
-  };
-  template <class BaseClass>
-  class WithStreamedUnaryMethod_UpdateView : public BaseClass {
-   private:
-    void BaseClassMustBeDerivedFromService(const Service* /*service*/) {}
-   public:
-    WithStreamedUnaryMethod_UpdateView() {
-      ::grpc::Service::MarkMethodStreamed(9,
-        new ::grpc::internal::StreamedUnaryHandler<
-          ::io::deephaven::proto::backplane::grpc::SelectOrUpdateRequest, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse>(
-            [this](::grpc::ServerContext* context,
-                   ::grpc::ServerUnaryStreamer<
-                     ::io::deephaven::proto::backplane::grpc::SelectOrUpdateRequest, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse>* streamer) {
-                       return this->StreamedUpdateView(context,
-                         streamer);
-                  }));
-    }
-    ~WithStreamedUnaryMethod_UpdateView() override {
-      BaseClassMustBeDerivedFromService(this);
-    }
-    // disable regular version of this method
-    ::grpc::Status UpdateView(::grpc::ServerContext* /*context*/, const ::io::deephaven::proto::backplane::grpc::SelectOrUpdateRequest* /*request*/, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse* /*response*/) override {
-      abort();
-      return ::grpc::Status(::grpc::StatusCode::UNIMPLEMENTED, "");
-    }
-    // replace default version of method with streamed unary
-    virtual ::grpc::Status StreamedUpdateView(::grpc::ServerContext* context, ::grpc::ServerUnaryStreamer< ::io::deephaven::proto::backplane::grpc::SelectOrUpdateRequest,::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse>* server_unary_streamer) = 0;
-  };
-  template <class BaseClass>
-  class WithStreamedUnaryMethod_Select : public BaseClass {
-   private:
-    void BaseClassMustBeDerivedFromService(const Service* /*service*/) {}
-   public:
-    WithStreamedUnaryMethod_Select() {
-      ::grpc::Service::MarkMethodStreamed(10,
-        new ::grpc::internal::StreamedUnaryHandler<
-          ::io::deephaven::proto::backplane::grpc::SelectOrUpdateRequest, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse>(
-            [this](::grpc::ServerContext* context,
-                   ::grpc::ServerUnaryStreamer<
-                     ::io::deephaven::proto::backplane::grpc::SelectOrUpdateRequest, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse>* streamer) {
-                       return this->StreamedSelect(context,
-                         streamer);
-                  }));
-    }
-    ~WithStreamedUnaryMethod_Select() override {
-      BaseClassMustBeDerivedFromService(this);
-    }
-    // disable regular version of this method
-    ::grpc::Status Select(::grpc::ServerContext* /*context*/, const ::io::deephaven::proto::backplane::grpc::SelectOrUpdateRequest* /*request*/, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse* /*response*/) override {
-      abort();
-      return ::grpc::Status(::grpc::StatusCode::UNIMPLEMENTED, "");
-    }
-    // replace default version of method with streamed unary
-    virtual ::grpc::Status StreamedSelect(::grpc::ServerContext* context, ::grpc::ServerUnaryStreamer< ::io::deephaven::proto::backplane::grpc::SelectOrUpdateRequest,::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse>* server_unary_streamer) = 0;
-  };
-  template <class BaseClass>
-  class WithStreamedUnaryMethod_UpdateBy : public BaseClass {
-   private:
-    void BaseClassMustBeDerivedFromService(const Service* /*service*/) {}
-   public:
-    WithStreamedUnaryMethod_UpdateBy() {
-      ::grpc::Service::MarkMethodStreamed(11,
-        new ::grpc::internal::StreamedUnaryHandler<
-          ::io::deephaven::proto::backplane::grpc::UpdateByRequest, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse>(
-            [this](::grpc::ServerContext* context,
-                   ::grpc::ServerUnaryStreamer<
-                     ::io::deephaven::proto::backplane::grpc::UpdateByRequest, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse>* streamer) {
-                       return this->StreamedUpdateBy(context,
-                         streamer);
-                  }));
-    }
-    ~WithStreamedUnaryMethod_UpdateBy() override {
-      BaseClassMustBeDerivedFromService(this);
-    }
-    // disable regular version of this method
-    ::grpc::Status UpdateBy(::grpc::ServerContext* /*context*/, const ::io::deephaven::proto::backplane::grpc::UpdateByRequest* /*request*/, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse* /*response*/) override {
-      abort();
-      return ::grpc::Status(::grpc::StatusCode::UNIMPLEMENTED, "");
-    }
-    // replace default version of method with streamed unary
-    virtual ::grpc::Status StreamedUpdateBy(::grpc::ServerContext* context, ::grpc::ServerUnaryStreamer< ::io::deephaven::proto::backplane::grpc::UpdateByRequest,::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse>* server_unary_streamer) = 0;
-  };
-  template <class BaseClass>
-  class WithStreamedUnaryMethod_SelectDistinct : public BaseClass {
-   private:
-    void BaseClassMustBeDerivedFromService(const Service* /*service*/) {}
-   public:
-    WithStreamedUnaryMethod_SelectDistinct() {
-      ::grpc::Service::MarkMethodStreamed(12,
-        new ::grpc::internal::StreamedUnaryHandler<
-          ::io::deephaven::proto::backplane::grpc::SelectDistinctRequest, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse>(
-            [this](::grpc::ServerContext* context,
-                   ::grpc::ServerUnaryStreamer<
-                     ::io::deephaven::proto::backplane::grpc::SelectDistinctRequest, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse>* streamer) {
-                       return this->StreamedSelectDistinct(context,
-                         streamer);
-                  }));
-    }
-    ~WithStreamedUnaryMethod_SelectDistinct() override {
-      BaseClassMustBeDerivedFromService(this);
-    }
-    // disable regular version of this method
-    ::grpc::Status SelectDistinct(::grpc::ServerContext* /*context*/, const ::io::deephaven::proto::backplane::grpc::SelectDistinctRequest* /*request*/, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse* /*response*/) override {
-      abort();
-      return ::grpc::Status(::grpc::StatusCode::UNIMPLEMENTED, "");
-    }
-    // replace default version of method with streamed unary
-    virtual ::grpc::Status StreamedSelectDistinct(::grpc::ServerContext* context, ::grpc::ServerUnaryStreamer< ::io::deephaven::proto::backplane::grpc::SelectDistinctRequest,::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse>* server_unary_streamer) = 0;
-  };
-  template <class BaseClass>
-  class WithStreamedUnaryMethod_Filter : public BaseClass {
-   private:
-    void BaseClassMustBeDerivedFromService(const Service* /*service*/) {}
-   public:
-    WithStreamedUnaryMethod_Filter() {
-      ::grpc::Service::MarkMethodStreamed(13,
-        new ::grpc::internal::StreamedUnaryHandler<
-          ::io::deephaven::proto::backplane::grpc::FilterTableRequest, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse>(
-            [this](::grpc::ServerContext* context,
-                   ::grpc::ServerUnaryStreamer<
-                     ::io::deephaven::proto::backplane::grpc::FilterTableRequest, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse>* streamer) {
-                       return this->StreamedFilter(context,
-                         streamer);
-                  }));
-    }
-    ~WithStreamedUnaryMethod_Filter() override {
-      BaseClassMustBeDerivedFromService(this);
-    }
-    // disable regular version of this method
-    ::grpc::Status Filter(::grpc::ServerContext* /*context*/, const ::io::deephaven::proto::backplane::grpc::FilterTableRequest* /*request*/, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse* /*response*/) override {
-      abort();
-      return ::grpc::Status(::grpc::StatusCode::UNIMPLEMENTED, "");
-    }
-    // replace default version of method with streamed unary
-    virtual ::grpc::Status StreamedFilter(::grpc::ServerContext* context, ::grpc::ServerUnaryStreamer< ::io::deephaven::proto::backplane::grpc::FilterTableRequest,::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse>* server_unary_streamer) = 0;
-  };
-  template <class BaseClass>
-  class WithStreamedUnaryMethod_UnstructuredFilter : public BaseClass {
-   private:
-    void BaseClassMustBeDerivedFromService(const Service* /*service*/) {}
-   public:
-    WithStreamedUnaryMethod_UnstructuredFilter() {
-      ::grpc::Service::MarkMethodStreamed(14,
-        new ::grpc::internal::StreamedUnaryHandler<
-          ::io::deephaven::proto::backplane::grpc::UnstructuredFilterTableRequest, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse>(
-            [this](::grpc::ServerContext* context,
-                   ::grpc::ServerUnaryStreamer<
-                     ::io::deephaven::proto::backplane::grpc::UnstructuredFilterTableRequest, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse>* streamer) {
-                       return this->StreamedUnstructuredFilter(context,
-                         streamer);
-                  }));
-    }
-    ~WithStreamedUnaryMethod_UnstructuredFilter() override {
-      BaseClassMustBeDerivedFromService(this);
-    }
-    // disable regular version of this method
-    ::grpc::Status UnstructuredFilter(::grpc::ServerContext* /*context*/, const ::io::deephaven::proto::backplane::grpc::UnstructuredFilterTableRequest* /*request*/, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse* /*response*/) override {
-      abort();
-      return ::grpc::Status(::grpc::StatusCode::UNIMPLEMENTED, "");
-    }
-    // replace default version of method with streamed unary
-    virtual ::grpc::Status StreamedUnstructuredFilter(::grpc::ServerContext* context, ::grpc::ServerUnaryStreamer< ::io::deephaven::proto::backplane::grpc::UnstructuredFilterTableRequest,::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse>* server_unary_streamer) = 0;
-  };
-  template <class BaseClass>
-  class WithStreamedUnaryMethod_Sort : public BaseClass {
-   private:
-    void BaseClassMustBeDerivedFromService(const Service* /*service*/) {}
-   public:
-    WithStreamedUnaryMethod_Sort() {
-      ::grpc::Service::MarkMethodStreamed(15,
-        new ::grpc::internal::StreamedUnaryHandler<
-          ::io::deephaven::proto::backplane::grpc::SortTableRequest, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse>(
-            [this](::grpc::ServerContext* context,
-                   ::grpc::ServerUnaryStreamer<
-                     ::io::deephaven::proto::backplane::grpc::SortTableRequest, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse>* streamer) {
-                       return this->StreamedSort(context,
-                         streamer);
-                  }));
-    }
-    ~WithStreamedUnaryMethod_Sort() override {
-      BaseClassMustBeDerivedFromService(this);
-    }
-    // disable regular version of this method
-    ::grpc::Status Sort(::grpc::ServerContext* /*context*/, const ::io::deephaven::proto::backplane::grpc::SortTableRequest* /*request*/, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse* /*response*/) override {
-      abort();
-      return ::grpc::Status(::grpc::StatusCode::UNIMPLEMENTED, "");
-    }
-    // replace default version of method with streamed unary
-    virtual ::grpc::Status StreamedSort(::grpc::ServerContext* context, ::grpc::ServerUnaryStreamer< ::io::deephaven::proto::backplane::grpc::SortTableRequest,::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse>* server_unary_streamer) = 0;
-  };
-  template <class BaseClass>
-  class WithStreamedUnaryMethod_Head : public BaseClass {
-   private:
-    void BaseClassMustBeDerivedFromService(const Service* /*service*/) {}
-   public:
-    WithStreamedUnaryMethod_Head() {
-      ::grpc::Service::MarkMethodStreamed(16,
-        new ::grpc::internal::StreamedUnaryHandler<
-          ::io::deephaven::proto::backplane::grpc::HeadOrTailRequest, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse>(
-            [this](::grpc::ServerContext* context,
-                   ::grpc::ServerUnaryStreamer<
-                     ::io::deephaven::proto::backplane::grpc::HeadOrTailRequest, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse>* streamer) {
-                       return this->StreamedHead(context,
-                         streamer);
-                  }));
-    }
-    ~WithStreamedUnaryMethod_Head() override {
-      BaseClassMustBeDerivedFromService(this);
-    }
-    // disable regular version of this method
-    ::grpc::Status Head(::grpc::ServerContext* /*context*/, const ::io::deephaven::proto::backplane::grpc::HeadOrTailRequest* /*request*/, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse* /*response*/) override {
-      abort();
-      return ::grpc::Status(::grpc::StatusCode::UNIMPLEMENTED, "");
-    }
-    // replace default version of method with streamed unary
-    virtual ::grpc::Status StreamedHead(::grpc::ServerContext* context, ::grpc::ServerUnaryStreamer< ::io::deephaven::proto::backplane::grpc::HeadOrTailRequest,::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse>* server_unary_streamer) = 0;
-  };
-  template <class BaseClass>
-  class WithStreamedUnaryMethod_Tail : public BaseClass {
-   private:
-    void BaseClassMustBeDerivedFromService(const Service* /*service*/) {}
-   public:
-    WithStreamedUnaryMethod_Tail() {
-      ::grpc::Service::MarkMethodStreamed(17,
-        new ::grpc::internal::StreamedUnaryHandler<
-          ::io::deephaven::proto::backplane::grpc::HeadOrTailRequest, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse>(
-            [this](::grpc::ServerContext* context,
-                   ::grpc::ServerUnaryStreamer<
-                     ::io::deephaven::proto::backplane::grpc::HeadOrTailRequest, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse>* streamer) {
-                       return this->StreamedTail(context,
-                         streamer);
-                  }));
-    }
-    ~WithStreamedUnaryMethod_Tail() override {
-      BaseClassMustBeDerivedFromService(this);
-    }
-    // disable regular version of this method
-    ::grpc::Status Tail(::grpc::ServerContext* /*context*/, const ::io::deephaven::proto::backplane::grpc::HeadOrTailRequest* /*request*/, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse* /*response*/) override {
-      abort();
-      return ::grpc::Status(::grpc::StatusCode::UNIMPLEMENTED, "");
-    }
-    // replace default version of method with streamed unary
-    virtual ::grpc::Status StreamedTail(::grpc::ServerContext* context, ::grpc::ServerUnaryStreamer< ::io::deephaven::proto::backplane::grpc::HeadOrTailRequest,::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse>* server_unary_streamer) = 0;
-  };
-  template <class BaseClass>
-  class WithStreamedUnaryMethod_HeadBy : public BaseClass {
-   private:
-    void BaseClassMustBeDerivedFromService(const Service* /*service*/) {}
-   public:
-    WithStreamedUnaryMethod_HeadBy() {
-      ::grpc::Service::MarkMethodStreamed(18,
-        new ::grpc::internal::StreamedUnaryHandler<
-          ::io::deephaven::proto::backplane::grpc::HeadOrTailByRequest, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse>(
-            [this](::grpc::ServerContext* context,
-                   ::grpc::ServerUnaryStreamer<
-                     ::io::deephaven::proto::backplane::grpc::HeadOrTailByRequest, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse>* streamer) {
-                       return this->StreamedHeadBy(context,
-                         streamer);
-                  }));
-    }
-    ~WithStreamedUnaryMethod_HeadBy() override {
-      BaseClassMustBeDerivedFromService(this);
-    }
-    // disable regular version of this method
-    ::grpc::Status HeadBy(::grpc::ServerContext* /*context*/, const ::io::deephaven::proto::backplane::grpc::HeadOrTailByRequest* /*request*/, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse* /*response*/) override {
-      abort();
-      return ::grpc::Status(::grpc::StatusCode::UNIMPLEMENTED, "");
-    }
-    // replace default version of method with streamed unary
-    virtual ::grpc::Status StreamedHeadBy(::grpc::ServerContext* context, ::grpc::ServerUnaryStreamer< ::io::deephaven::proto::backplane::grpc::HeadOrTailByRequest,::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse>* server_unary_streamer) = 0;
-  };
-  template <class BaseClass>
-  class WithStreamedUnaryMethod_TailBy : public BaseClass {
-   private:
-    void BaseClassMustBeDerivedFromService(const Service* /*service*/) {}
-   public:
-    WithStreamedUnaryMethod_TailBy() {
-      ::grpc::Service::MarkMethodStreamed(19,
-        new ::grpc::internal::StreamedUnaryHandler<
-          ::io::deephaven::proto::backplane::grpc::HeadOrTailByRequest, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse>(
-            [this](::grpc::ServerContext* context,
-                   ::grpc::ServerUnaryStreamer<
-                     ::io::deephaven::proto::backplane::grpc::HeadOrTailByRequest, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse>* streamer) {
-                       return this->StreamedTailBy(context,
-                         streamer);
-                  }));
-    }
-    ~WithStreamedUnaryMethod_TailBy() override {
-      BaseClassMustBeDerivedFromService(this);
-    }
-    // disable regular version of this method
-    ::grpc::Status TailBy(::grpc::ServerContext* /*context*/, const ::io::deephaven::proto::backplane::grpc::HeadOrTailByRequest* /*request*/, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse* /*response*/) override {
-      abort();
-      return ::grpc::Status(::grpc::StatusCode::UNIMPLEMENTED, "");
-    }
-    // replace default version of method with streamed unary
-    virtual ::grpc::Status StreamedTailBy(::grpc::ServerContext* context, ::grpc::ServerUnaryStreamer< ::io::deephaven::proto::backplane::grpc::HeadOrTailByRequest,::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse>* server_unary_streamer) = 0;
-  };
-  template <class BaseClass>
-  class WithStreamedUnaryMethod_Ungroup : public BaseClass {
-   private:
-    void BaseClassMustBeDerivedFromService(const Service* /*service*/) {}
-   public:
-    WithStreamedUnaryMethod_Ungroup() {
-      ::grpc::Service::MarkMethodStreamed(20,
-        new ::grpc::internal::StreamedUnaryHandler<
-          ::io::deephaven::proto::backplane::grpc::UngroupRequest, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse>(
-            [this](::grpc::ServerContext* context,
-                   ::grpc::ServerUnaryStreamer<
-                     ::io::deephaven::proto::backplane::grpc::UngroupRequest, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse>* streamer) {
-                       return this->StreamedUngroup(context,
-                         streamer);
-                  }));
-    }
-    ~WithStreamedUnaryMethod_Ungroup() override {
-      BaseClassMustBeDerivedFromService(this);
-    }
-    // disable regular version of this method
-    ::grpc::Status Ungroup(::grpc::ServerContext* /*context*/, const ::io::deephaven::proto::backplane::grpc::UngroupRequest* /*request*/, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse* /*response*/) override {
-      abort();
-      return ::grpc::Status(::grpc::StatusCode::UNIMPLEMENTED, "");
-    }
-    // replace default version of method with streamed unary
-    virtual ::grpc::Status StreamedUngroup(::grpc::ServerContext* context, ::grpc::ServerUnaryStreamer< ::io::deephaven::proto::backplane::grpc::UngroupRequest,::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse>* server_unary_streamer) = 0;
-  };
-  template <class BaseClass>
-  class WithStreamedUnaryMethod_MergeTables : public BaseClass {
-   private:
-    void BaseClassMustBeDerivedFromService(const Service* /*service*/) {}
-   public:
-    WithStreamedUnaryMethod_MergeTables() {
-      ::grpc::Service::MarkMethodStreamed(21,
-        new ::grpc::internal::StreamedUnaryHandler<
-          ::io::deephaven::proto::backplane::grpc::MergeTablesRequest, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse>(
-            [this](::grpc::ServerContext* context,
-                   ::grpc::ServerUnaryStreamer<
-                     ::io::deephaven::proto::backplane::grpc::MergeTablesRequest, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse>* streamer) {
-                       return this->StreamedMergeTables(context,
-                         streamer);
-                  }));
-    }
-    ~WithStreamedUnaryMethod_MergeTables() override {
-      BaseClassMustBeDerivedFromService(this);
-    }
-    // disable regular version of this method
-    ::grpc::Status MergeTables(::grpc::ServerContext* /*context*/, const ::io::deephaven::proto::backplane::grpc::MergeTablesRequest* /*request*/, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse* /*response*/) override {
-      abort();
-      return ::grpc::Status(::grpc::StatusCode::UNIMPLEMENTED, "");
-    }
-    // replace default version of method with streamed unary
-    virtual ::grpc::Status StreamedMergeTables(::grpc::ServerContext* context, ::grpc::ServerUnaryStreamer< ::io::deephaven::proto::backplane::grpc::MergeTablesRequest,::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse>* server_unary_streamer) = 0;
-  };
-  template <class BaseClass>
-  class WithStreamedUnaryMethod_CrossJoinTables : public BaseClass {
-   private:
-    void BaseClassMustBeDerivedFromService(const Service* /*service*/) {}
-   public:
-    WithStreamedUnaryMethod_CrossJoinTables() {
-      ::grpc::Service::MarkMethodStreamed(22,
-        new ::grpc::internal::StreamedUnaryHandler<
-          ::io::deephaven::proto::backplane::grpc::CrossJoinTablesRequest, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse>(
-            [this](::grpc::ServerContext* context,
-                   ::grpc::ServerUnaryStreamer<
-                     ::io::deephaven::proto::backplane::grpc::CrossJoinTablesRequest, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse>* streamer) {
-                       return this->StreamedCrossJoinTables(context,
-                         streamer);
-                  }));
-    }
-    ~WithStreamedUnaryMethod_CrossJoinTables() override {
-      BaseClassMustBeDerivedFromService(this);
-    }
-    // disable regular version of this method
-    ::grpc::Status CrossJoinTables(::grpc::ServerContext* /*context*/, const ::io::deephaven::proto::backplane::grpc::CrossJoinTablesRequest* /*request*/, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse* /*response*/) override {
-      abort();
-      return ::grpc::Status(::grpc::StatusCode::UNIMPLEMENTED, "");
-    }
-    // replace default version of method with streamed unary
-    virtual ::grpc::Status StreamedCrossJoinTables(::grpc::ServerContext* context, ::grpc::ServerUnaryStreamer< ::io::deephaven::proto::backplane::grpc::CrossJoinTablesRequest,::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse>* server_unary_streamer) = 0;
-  };
-  template <class BaseClass>
-  class WithStreamedUnaryMethod_NaturalJoinTables : public BaseClass {
-   private:
-    void BaseClassMustBeDerivedFromService(const Service* /*service*/) {}
-   public:
-    WithStreamedUnaryMethod_NaturalJoinTables() {
-      ::grpc::Service::MarkMethodStreamed(23,
-        new ::grpc::internal::StreamedUnaryHandler<
-          ::io::deephaven::proto::backplane::grpc::NaturalJoinTablesRequest, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse>(
-            [this](::grpc::ServerContext* context,
-                   ::grpc::ServerUnaryStreamer<
-                     ::io::deephaven::proto::backplane::grpc::NaturalJoinTablesRequest, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse>* streamer) {
-                       return this->StreamedNaturalJoinTables(context,
-                         streamer);
-                  }));
-    }
-    ~WithStreamedUnaryMethod_NaturalJoinTables() override {
-      BaseClassMustBeDerivedFromService(this);
-    }
-    // disable regular version of this method
-    ::grpc::Status NaturalJoinTables(::grpc::ServerContext* /*context*/, const ::io::deephaven::proto::backplane::grpc::NaturalJoinTablesRequest* /*request*/, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse* /*response*/) override {
-      abort();
-      return ::grpc::Status(::grpc::StatusCode::UNIMPLEMENTED, "");
-    }
-    // replace default version of method with streamed unary
-    virtual ::grpc::Status StreamedNaturalJoinTables(::grpc::ServerContext* context, ::grpc::ServerUnaryStreamer< ::io::deephaven::proto::backplane::grpc::NaturalJoinTablesRequest,::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse>* server_unary_streamer) = 0;
-  };
-  template <class BaseClass>
-  class WithStreamedUnaryMethod_ExactJoinTables : public BaseClass {
-   private:
-    void BaseClassMustBeDerivedFromService(const Service* /*service*/) {}
-   public:
-    WithStreamedUnaryMethod_ExactJoinTables() {
-      ::grpc::Service::MarkMethodStreamed(24,
-        new ::grpc::internal::StreamedUnaryHandler<
-          ::io::deephaven::proto::backplane::grpc::ExactJoinTablesRequest, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse>(
-            [this](::grpc::ServerContext* context,
-                   ::grpc::ServerUnaryStreamer<
-                     ::io::deephaven::proto::backplane::grpc::ExactJoinTablesRequest, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse>* streamer) {
-                       return this->StreamedExactJoinTables(context,
-                         streamer);
-                  }));
-    }
-    ~WithStreamedUnaryMethod_ExactJoinTables() override {
-      BaseClassMustBeDerivedFromService(this);
-    }
-    // disable regular version of this method
-    ::grpc::Status ExactJoinTables(::grpc::ServerContext* /*context*/, const ::io::deephaven::proto::backplane::grpc::ExactJoinTablesRequest* /*request*/, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse* /*response*/) override {
-      abort();
-      return ::grpc::Status(::grpc::StatusCode::UNIMPLEMENTED, "");
-    }
-    // replace default version of method with streamed unary
-    virtual ::grpc::Status StreamedExactJoinTables(::grpc::ServerContext* context, ::grpc::ServerUnaryStreamer< ::io::deephaven::proto::backplane::grpc::ExactJoinTablesRequest,::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse>* server_unary_streamer) = 0;
-  };
-  template <class BaseClass>
-  class WithStreamedUnaryMethod_LeftJoinTables : public BaseClass {
-   private:
-    void BaseClassMustBeDerivedFromService(const Service* /*service*/) {}
-   public:
-    WithStreamedUnaryMethod_LeftJoinTables() {
-      ::grpc::Service::MarkMethodStreamed(25,
-        new ::grpc::internal::StreamedUnaryHandler<
-          ::io::deephaven::proto::backplane::grpc::LeftJoinTablesRequest, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse>(
-            [this](::grpc::ServerContext* context,
-                   ::grpc::ServerUnaryStreamer<
-                     ::io::deephaven::proto::backplane::grpc::LeftJoinTablesRequest, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse>* streamer) {
-                       return this->StreamedLeftJoinTables(context,
-                         streamer);
-                  }));
-    }
-    ~WithStreamedUnaryMethod_LeftJoinTables() override {
-      BaseClassMustBeDerivedFromService(this);
-    }
-    // disable regular version of this method
-    ::grpc::Status LeftJoinTables(::grpc::ServerContext* /*context*/, const ::io::deephaven::proto::backplane::grpc::LeftJoinTablesRequest* /*request*/, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse* /*response*/) override {
-      abort();
-      return ::grpc::Status(::grpc::StatusCode::UNIMPLEMENTED, "");
-    }
-    // replace default version of method with streamed unary
-    virtual ::grpc::Status StreamedLeftJoinTables(::grpc::ServerContext* context, ::grpc::ServerUnaryStreamer< ::io::deephaven::proto::backplane::grpc::LeftJoinTablesRequest,::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse>* server_unary_streamer) = 0;
-  };
-  template <class BaseClass>
-  class WithStreamedUnaryMethod_AsOfJoinTables : public BaseClass {
-   private:
-    void BaseClassMustBeDerivedFromService(const Service* /*service*/) {}
-   public:
-    WithStreamedUnaryMethod_AsOfJoinTables() {
-      ::grpc::Service::MarkMethodStreamed(26,
-        new ::grpc::internal::StreamedUnaryHandler<
-          ::io::deephaven::proto::backplane::grpc::AsOfJoinTablesRequest, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse>(
-            [this](::grpc::ServerContext* context,
-                   ::grpc::ServerUnaryStreamer<
-                     ::io::deephaven::proto::backplane::grpc::AsOfJoinTablesRequest, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse>* streamer) {
-                       return this->StreamedAsOfJoinTables(context,
-                         streamer);
-                  }));
-    }
-    ~WithStreamedUnaryMethod_AsOfJoinTables() override {
-      BaseClassMustBeDerivedFromService(this);
-    }
-    // disable regular version of this method
-    ::grpc::Status AsOfJoinTables(::grpc::ServerContext* /*context*/, const ::io::deephaven::proto::backplane::grpc::AsOfJoinTablesRequest* /*request*/, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse* /*response*/) override {
-      abort();
-      return ::grpc::Status(::grpc::StatusCode::UNIMPLEMENTED, "");
-    }
-    // replace default version of method with streamed unary
-    virtual ::grpc::Status StreamedAsOfJoinTables(::grpc::ServerContext* context, ::grpc::ServerUnaryStreamer< ::io::deephaven::proto::backplane::grpc::AsOfJoinTablesRequest,::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse>* server_unary_streamer) = 0;
-  };
-  template <class BaseClass>
-  class WithStreamedUnaryMethod_AjTables : public BaseClass {
-   private:
-    void BaseClassMustBeDerivedFromService(const Service* /*service*/) {}
-   public:
-    WithStreamedUnaryMethod_AjTables() {
-      ::grpc::Service::MarkMethodStreamed(27,
-        new ::grpc::internal::StreamedUnaryHandler<
-          ::io::deephaven::proto::backplane::grpc::AjRajTablesRequest, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse>(
-            [this](::grpc::ServerContext* context,
-                   ::grpc::ServerUnaryStreamer<
-                     ::io::deephaven::proto::backplane::grpc::AjRajTablesRequest, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse>* streamer) {
-                       return this->StreamedAjTables(context,
-                         streamer);
-                  }));
-    }
-    ~WithStreamedUnaryMethod_AjTables() override {
-      BaseClassMustBeDerivedFromService(this);
-    }
-    // disable regular version of this method
-    ::grpc::Status AjTables(::grpc::ServerContext* /*context*/, const ::io::deephaven::proto::backplane::grpc::AjRajTablesRequest* /*request*/, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse* /*response*/) override {
-      abort();
-      return ::grpc::Status(::grpc::StatusCode::UNIMPLEMENTED, "");
-    }
-    // replace default version of method with streamed unary
-    virtual ::grpc::Status StreamedAjTables(::grpc::ServerContext* context, ::grpc::ServerUnaryStreamer< ::io::deephaven::proto::backplane::grpc::AjRajTablesRequest,::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse>* server_unary_streamer) = 0;
-  };
-  template <class BaseClass>
-  class WithStreamedUnaryMethod_RajTables : public BaseClass {
-   private:
-    void BaseClassMustBeDerivedFromService(const Service* /*service*/) {}
-   public:
-    WithStreamedUnaryMethod_RajTables() {
-      ::grpc::Service::MarkMethodStreamed(28,
-        new ::grpc::internal::StreamedUnaryHandler<
-          ::io::deephaven::proto::backplane::grpc::AjRajTablesRequest, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse>(
-            [this](::grpc::ServerContext* context,
-                   ::grpc::ServerUnaryStreamer<
-                     ::io::deephaven::proto::backplane::grpc::AjRajTablesRequest, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse>* streamer) {
-                       return this->StreamedRajTables(context,
-                         streamer);
-                  }));
-    }
-    ~WithStreamedUnaryMethod_RajTables() override {
-      BaseClassMustBeDerivedFromService(this);
-    }
-    // disable regular version of this method
-    ::grpc::Status RajTables(::grpc::ServerContext* /*context*/, const ::io::deephaven::proto::backplane::grpc::AjRajTablesRequest* /*request*/, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse* /*response*/) override {
-      abort();
-      return ::grpc::Status(::grpc::StatusCode::UNIMPLEMENTED, "");
-    }
-    // replace default version of method with streamed unary
-    virtual ::grpc::Status StreamedRajTables(::grpc::ServerContext* context, ::grpc::ServerUnaryStreamer< ::io::deephaven::proto::backplane::grpc::AjRajTablesRequest,::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse>* server_unary_streamer) = 0;
-  };
-  template <class BaseClass>
-  class WithStreamedUnaryMethod_MultiJoinTables : public BaseClass {
-   private:
-    void BaseClassMustBeDerivedFromService(const Service* /*service*/) {}
-   public:
-    WithStreamedUnaryMethod_MultiJoinTables() {
-      ::grpc::Service::MarkMethodStreamed(29,
-        new ::grpc::internal::StreamedUnaryHandler<
-          ::io::deephaven::proto::backplane::grpc::MultiJoinTablesRequest, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse>(
-            [this](::grpc::ServerContext* context,
-                   ::grpc::ServerUnaryStreamer<
-                     ::io::deephaven::proto::backplane::grpc::MultiJoinTablesRequest, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse>* streamer) {
-                       return this->StreamedMultiJoinTables(context,
-                         streamer);
-                  }));
-    }
-    ~WithStreamedUnaryMethod_MultiJoinTables() override {
-      BaseClassMustBeDerivedFromService(this);
-    }
-    // disable regular version of this method
-    ::grpc::Status MultiJoinTables(::grpc::ServerContext* /*context*/, const ::io::deephaven::proto::backplane::grpc::MultiJoinTablesRequest* /*request*/, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse* /*response*/) override {
-      abort();
-      return ::grpc::Status(::grpc::StatusCode::UNIMPLEMENTED, "");
-    }
-    // replace default version of method with streamed unary
-    virtual ::grpc::Status StreamedMultiJoinTables(::grpc::ServerContext* context, ::grpc::ServerUnaryStreamer< ::io::deephaven::proto::backplane::grpc::MultiJoinTablesRequest,::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse>* server_unary_streamer) = 0;
-  };
-  template <class BaseClass>
-  class WithStreamedUnaryMethod_RangeJoinTables : public BaseClass {
-   private:
-    void BaseClassMustBeDerivedFromService(const Service* /*service*/) {}
-   public:
-    WithStreamedUnaryMethod_RangeJoinTables() {
-      ::grpc::Service::MarkMethodStreamed(30,
-        new ::grpc::internal::StreamedUnaryHandler<
-          ::io::deephaven::proto::backplane::grpc::RangeJoinTablesRequest, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse>(
-            [this](::grpc::ServerContext* context,
-                   ::grpc::ServerUnaryStreamer<
-                     ::io::deephaven::proto::backplane::grpc::RangeJoinTablesRequest, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse>* streamer) {
-                       return this->StreamedRangeJoinTables(context,
-                         streamer);
-                  }));
-    }
-    ~WithStreamedUnaryMethod_RangeJoinTables() override {
-      BaseClassMustBeDerivedFromService(this);
-    }
-    // disable regular version of this method
-    ::grpc::Status RangeJoinTables(::grpc::ServerContext* /*context*/, const ::io::deephaven::proto::backplane::grpc::RangeJoinTablesRequest* /*request*/, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse* /*response*/) override {
-      abort();
-      return ::grpc::Status(::grpc::StatusCode::UNIMPLEMENTED, "");
-    }
-    // replace default version of method with streamed unary
-    virtual ::grpc::Status StreamedRangeJoinTables(::grpc::ServerContext* context, ::grpc::ServerUnaryStreamer< ::io::deephaven::proto::backplane::grpc::RangeJoinTablesRequest,::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse>* server_unary_streamer) = 0;
-  };
-  template <class BaseClass>
-  class WithStreamedUnaryMethod_ComboAggregate : public BaseClass {
-   private:
-    void BaseClassMustBeDerivedFromService(const Service* /*service*/) {}
-   public:
-    WithStreamedUnaryMethod_ComboAggregate() {
-      ::grpc::Service::MarkMethodStreamed(31,
-        new ::grpc::internal::StreamedUnaryHandler<
-          ::io::deephaven::proto::backplane::grpc::ComboAggregateRequest, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse>(
-            [this](::grpc::ServerContext* context,
-                   ::grpc::ServerUnaryStreamer<
-                     ::io::deephaven::proto::backplane::grpc::ComboAggregateRequest, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse>* streamer) {
-                       return this->StreamedComboAggregate(context,
-                         streamer);
-                  }));
-    }
-    ~WithStreamedUnaryMethod_ComboAggregate() override {
-      BaseClassMustBeDerivedFromService(this);
-    }
-    // disable regular version of this method
-    ::grpc::Status ComboAggregate(::grpc::ServerContext* /*context*/, const ::io::deephaven::proto::backplane::grpc::ComboAggregateRequest* /*request*/, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse* /*response*/) override {
-      abort();
-      return ::grpc::Status(::grpc::StatusCode::UNIMPLEMENTED, "");
-    }
-    // replace default version of method with streamed unary
-    virtual ::grpc::Status StreamedComboAggregate(::grpc::ServerContext* context, ::grpc::ServerUnaryStreamer< ::io::deephaven::proto::backplane::grpc::ComboAggregateRequest,::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse>* server_unary_streamer) = 0;
-  };
-  template <class BaseClass>
-  class WithStreamedUnaryMethod_AggregateAll : public BaseClass {
-   private:
-    void BaseClassMustBeDerivedFromService(const Service* /*service*/) {}
-   public:
-    WithStreamedUnaryMethod_AggregateAll() {
-      ::grpc::Service::MarkMethodStreamed(32,
-        new ::grpc::internal::StreamedUnaryHandler<
-          ::io::deephaven::proto::backplane::grpc::AggregateAllRequest, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse>(
-            [this](::grpc::ServerContext* context,
-                   ::grpc::ServerUnaryStreamer<
-                     ::io::deephaven::proto::backplane::grpc::AggregateAllRequest, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse>* streamer) {
-                       return this->StreamedAggregateAll(context,
-                         streamer);
-                  }));
-    }
-    ~WithStreamedUnaryMethod_AggregateAll() override {
-      BaseClassMustBeDerivedFromService(this);
-    }
-    // disable regular version of this method
-    ::grpc::Status AggregateAll(::grpc::ServerContext* /*context*/, const ::io::deephaven::proto::backplane::grpc::AggregateAllRequest* /*request*/, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse* /*response*/) override {
-      abort();
-      return ::grpc::Status(::grpc::StatusCode::UNIMPLEMENTED, "");
-    }
-    // replace default version of method with streamed unary
-    virtual ::grpc::Status StreamedAggregateAll(::grpc::ServerContext* context, ::grpc::ServerUnaryStreamer< ::io::deephaven::proto::backplane::grpc::AggregateAllRequest,::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse>* server_unary_streamer) = 0;
-  };
-  template <class BaseClass>
-  class WithStreamedUnaryMethod_Aggregate : public BaseClass {
-   private:
-    void BaseClassMustBeDerivedFromService(const Service* /*service*/) {}
-   public:
-    WithStreamedUnaryMethod_Aggregate() {
-      ::grpc::Service::MarkMethodStreamed(33,
-        new ::grpc::internal::StreamedUnaryHandler<
-          ::io::deephaven::proto::backplane::grpc::AggregateRequest, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse>(
-            [this](::grpc::ServerContext* context,
-                   ::grpc::ServerUnaryStreamer<
-                     ::io::deephaven::proto::backplane::grpc::AggregateRequest, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse>* streamer) {
-                       return this->StreamedAggregate(context,
-                         streamer);
-                  }));
-    }
-    ~WithStreamedUnaryMethod_Aggregate() override {
-      BaseClassMustBeDerivedFromService(this);
-    }
-    // disable regular version of this method
-    ::grpc::Status Aggregate(::grpc::ServerContext* /*context*/, const ::io::deephaven::proto::backplane::grpc::AggregateRequest* /*request*/, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse* /*response*/) override {
-      abort();
-      return ::grpc::Status(::grpc::StatusCode::UNIMPLEMENTED, "");
-    }
-    // replace default version of method with streamed unary
-    virtual ::grpc::Status StreamedAggregate(::grpc::ServerContext* context, ::grpc::ServerUnaryStreamer< ::io::deephaven::proto::backplane::grpc::AggregateRequest,::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse>* server_unary_streamer) = 0;
-  };
-  template <class BaseClass>
-  class WithStreamedUnaryMethod_Snapshot : public BaseClass {
-   private:
-    void BaseClassMustBeDerivedFromService(const Service* /*service*/) {}
-   public:
-    WithStreamedUnaryMethod_Snapshot() {
-      ::grpc::Service::MarkMethodStreamed(34,
-        new ::grpc::internal::StreamedUnaryHandler<
-          ::io::deephaven::proto::backplane::grpc::SnapshotTableRequest, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse>(
-            [this](::grpc::ServerContext* context,
-                   ::grpc::ServerUnaryStreamer<
-                     ::io::deephaven::proto::backplane::grpc::SnapshotTableRequest, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse>* streamer) {
-                       return this->StreamedSnapshot(context,
-                         streamer);
-                  }));
-    }
-    ~WithStreamedUnaryMethod_Snapshot() override {
-      BaseClassMustBeDerivedFromService(this);
-    }
-    // disable regular version of this method
-    ::grpc::Status Snapshot(::grpc::ServerContext* /*context*/, const ::io::deephaven::proto::backplane::grpc::SnapshotTableRequest* /*request*/, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse* /*response*/) override {
-      abort();
-      return ::grpc::Status(::grpc::StatusCode::UNIMPLEMENTED, "");
-    }
-    // replace default version of method with streamed unary
-    virtual ::grpc::Status StreamedSnapshot(::grpc::ServerContext* context, ::grpc::ServerUnaryStreamer< ::io::deephaven::proto::backplane::grpc::SnapshotTableRequest,::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse>* server_unary_streamer) = 0;
-  };
-  template <class BaseClass>
-  class WithStreamedUnaryMethod_SnapshotWhen : public BaseClass {
-   private:
-    void BaseClassMustBeDerivedFromService(const Service* /*service*/) {}
-   public:
-    WithStreamedUnaryMethod_SnapshotWhen() {
-      ::grpc::Service::MarkMethodStreamed(35,
-        new ::grpc::internal::StreamedUnaryHandler<
-          ::io::deephaven::proto::backplane::grpc::SnapshotWhenTableRequest, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse>(
-            [this](::grpc::ServerContext* context,
-                   ::grpc::ServerUnaryStreamer<
-                     ::io::deephaven::proto::backplane::grpc::SnapshotWhenTableRequest, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse>* streamer) {
-                       return this->StreamedSnapshotWhen(context,
-                         streamer);
-                  }));
-    }
-    ~WithStreamedUnaryMethod_SnapshotWhen() override {
-      BaseClassMustBeDerivedFromService(this);
-    }
-    // disable regular version of this method
-    ::grpc::Status SnapshotWhen(::grpc::ServerContext* /*context*/, const ::io::deephaven::proto::backplane::grpc::SnapshotWhenTableRequest* /*request*/, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse* /*response*/) override {
-      abort();
-      return ::grpc::Status(::grpc::StatusCode::UNIMPLEMENTED, "");
-    }
-    // replace default version of method with streamed unary
-    virtual ::grpc::Status StreamedSnapshotWhen(::grpc::ServerContext* context, ::grpc::ServerUnaryStreamer< ::io::deephaven::proto::backplane::grpc::SnapshotWhenTableRequest,::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse>* server_unary_streamer) = 0;
-  };
-  template <class BaseClass>
-  class WithStreamedUnaryMethod_Flatten : public BaseClass {
-   private:
-    void BaseClassMustBeDerivedFromService(const Service* /*service*/) {}
-   public:
-    WithStreamedUnaryMethod_Flatten() {
-      ::grpc::Service::MarkMethodStreamed(36,
-        new ::grpc::internal::StreamedUnaryHandler<
-          ::io::deephaven::proto::backplane::grpc::FlattenRequest, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse>(
-            [this](::grpc::ServerContext* context,
-                   ::grpc::ServerUnaryStreamer<
-                     ::io::deephaven::proto::backplane::grpc::FlattenRequest, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse>* streamer) {
-                       return this->StreamedFlatten(context,
-                         streamer);
-                  }));
-    }
-    ~WithStreamedUnaryMethod_Flatten() override {
-      BaseClassMustBeDerivedFromService(this);
-    }
-    // disable regular version of this method
-    ::grpc::Status Flatten(::grpc::ServerContext* /*context*/, const ::io::deephaven::proto::backplane::grpc::FlattenRequest* /*request*/, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse* /*response*/) override {
-      abort();
-      return ::grpc::Status(::grpc::StatusCode::UNIMPLEMENTED, "");
-    }
-    // replace default version of method with streamed unary
-    virtual ::grpc::Status StreamedFlatten(::grpc::ServerContext* context, ::grpc::ServerUnaryStreamer< ::io::deephaven::proto::backplane::grpc::FlattenRequest,::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse>* server_unary_streamer) = 0;
-  };
-  template <class BaseClass>
-  class WithStreamedUnaryMethod_RunChartDownsample : public BaseClass {
-   private:
-    void BaseClassMustBeDerivedFromService(const Service* /*service*/) {}
-   public:
-    WithStreamedUnaryMethod_RunChartDownsample() {
-      ::grpc::Service::MarkMethodStreamed(37,
-        new ::grpc::internal::StreamedUnaryHandler<
-          ::io::deephaven::proto::backplane::grpc::RunChartDownsampleRequest, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse>(
-            [this](::grpc::ServerContext* context,
-                   ::grpc::ServerUnaryStreamer<
-                     ::io::deephaven::proto::backplane::grpc::RunChartDownsampleRequest, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse>* streamer) {
-                       return this->StreamedRunChartDownsample(context,
-                         streamer);
-                  }));
-    }
-    ~WithStreamedUnaryMethod_RunChartDownsample() override {
-      BaseClassMustBeDerivedFromService(this);
-    }
-    // disable regular version of this method
-    ::grpc::Status RunChartDownsample(::grpc::ServerContext* /*context*/, const ::io::deephaven::proto::backplane::grpc::RunChartDownsampleRequest* /*request*/, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse* /*response*/) override {
-      abort();
-      return ::grpc::Status(::grpc::StatusCode::UNIMPLEMENTED, "");
-    }
-    // replace default version of method with streamed unary
-    virtual ::grpc::Status StreamedRunChartDownsample(::grpc::ServerContext* context, ::grpc::ServerUnaryStreamer< ::io::deephaven::proto::backplane::grpc::RunChartDownsampleRequest,::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse>* server_unary_streamer) = 0;
-  };
-  template <class BaseClass>
-  class WithStreamedUnaryMethod_CreateInputTable : public BaseClass {
-   private:
-    void BaseClassMustBeDerivedFromService(const Service* /*service*/) {}
-   public:
-    WithStreamedUnaryMethod_CreateInputTable() {
-      ::grpc::Service::MarkMethodStreamed(38,
-        new ::grpc::internal::StreamedUnaryHandler<
-          ::io::deephaven::proto::backplane::grpc::CreateInputTableRequest, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse>(
-            [this](::grpc::ServerContext* context,
-                   ::grpc::ServerUnaryStreamer<
-                     ::io::deephaven::proto::backplane::grpc::CreateInputTableRequest, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse>* streamer) {
-                       return this->StreamedCreateInputTable(context,
-                         streamer);
-                  }));
-    }
-    ~WithStreamedUnaryMethod_CreateInputTable() override {
-      BaseClassMustBeDerivedFromService(this);
-    }
-    // disable regular version of this method
-    ::grpc::Status CreateInputTable(::grpc::ServerContext* /*context*/, const ::io::deephaven::proto::backplane::grpc::CreateInputTableRequest* /*request*/, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse* /*response*/) override {
-      abort();
-      return ::grpc::Status(::grpc::StatusCode::UNIMPLEMENTED, "");
-    }
-    // replace default version of method with streamed unary
-    virtual ::grpc::Status StreamedCreateInputTable(::grpc::ServerContext* context, ::grpc::ServerUnaryStreamer< ::io::deephaven::proto::backplane::grpc::CreateInputTableRequest,::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse>* server_unary_streamer) = 0;
-  };
-  template <class BaseClass>
-  class WithStreamedUnaryMethod_WhereIn : public BaseClass {
-   private:
-    void BaseClassMustBeDerivedFromService(const Service* /*service*/) {}
-   public:
-    WithStreamedUnaryMethod_WhereIn() {
-      ::grpc::Service::MarkMethodStreamed(39,
-        new ::grpc::internal::StreamedUnaryHandler<
-          ::io::deephaven::proto::backplane::grpc::WhereInRequest, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse>(
-            [this](::grpc::ServerContext* context,
-                   ::grpc::ServerUnaryStreamer<
-                     ::io::deephaven::proto::backplane::grpc::WhereInRequest, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse>* streamer) {
-                       return this->StreamedWhereIn(context,
-                         streamer);
-                  }));
-    }
-    ~WithStreamedUnaryMethod_WhereIn() override {
-      BaseClassMustBeDerivedFromService(this);
-    }
-    // disable regular version of this method
-    ::grpc::Status WhereIn(::grpc::ServerContext* /*context*/, const ::io::deephaven::proto::backplane::grpc::WhereInRequest* /*request*/, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse* /*response*/) override {
-      abort();
-      return ::grpc::Status(::grpc::StatusCode::UNIMPLEMENTED, "");
-    }
-    // replace default version of method with streamed unary
-    virtual ::grpc::Status StreamedWhereIn(::grpc::ServerContext* context, ::grpc::ServerUnaryStreamer< ::io::deephaven::proto::backplane::grpc::WhereInRequest,::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse>* server_unary_streamer) = 0;
-  };
-  template <class BaseClass>
-  class WithStreamedUnaryMethod_SeekRow : public BaseClass {
-   private:
-    void BaseClassMustBeDerivedFromService(const Service* /*service*/) {}
-   public:
-    WithStreamedUnaryMethod_SeekRow() {
-      ::grpc::Service::MarkMethodStreamed(42,
-        new ::grpc::internal::StreamedUnaryHandler<
-          ::io::deephaven::proto::backplane::grpc::SeekRowRequest, ::io::deephaven::proto::backplane::grpc::SeekRowResponse>(
-            [this](::grpc::ServerContext* context,
-                   ::grpc::ServerUnaryStreamer<
-                     ::io::deephaven::proto::backplane::grpc::SeekRowRequest, ::io::deephaven::proto::backplane::grpc::SeekRowResponse>* streamer) {
-                       return this->StreamedSeekRow(context,
-                         streamer);
-                  }));
-    }
-    ~WithStreamedUnaryMethod_SeekRow() override {
-      BaseClassMustBeDerivedFromService(this);
-    }
-    // disable regular version of this method
-    ::grpc::Status SeekRow(::grpc::ServerContext* /*context*/, const ::io::deephaven::proto::backplane::grpc::SeekRowRequest* /*request*/, ::io::deephaven::proto::backplane::grpc::SeekRowResponse* /*response*/) override {
-      abort();
-      return ::grpc::Status(::grpc::StatusCode::UNIMPLEMENTED, "");
-    }
-    // replace default version of method with streamed unary
-    virtual ::grpc::Status StreamedSeekRow(::grpc::ServerContext* context, ::grpc::ServerUnaryStreamer< ::io::deephaven::proto::backplane::grpc::SeekRowRequest,::io::deephaven::proto::backplane::grpc::SeekRowResponse>* server_unary_streamer) = 0;
-  };
-  template <class BaseClass>
-  class WithStreamedUnaryMethod_MetaTable : public BaseClass {
-   private:
-    void BaseClassMustBeDerivedFromService(const Service* /*service*/) {}
-   public:
-    WithStreamedUnaryMethod_MetaTable() {
-      ::grpc::Service::MarkMethodStreamed(43,
-        new ::grpc::internal::StreamedUnaryHandler<
-          ::io::deephaven::proto::backplane::grpc::MetaTableRequest, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse>(
-            [this](::grpc::ServerContext* context,
-                   ::grpc::ServerUnaryStreamer<
-                     ::io::deephaven::proto::backplane::grpc::MetaTableRequest, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse>* streamer) {
-                       return this->StreamedMetaTable(context,
-                         streamer);
-                  }));
-    }
-    ~WithStreamedUnaryMethod_MetaTable() override {
-      BaseClassMustBeDerivedFromService(this);
-    }
-    // disable regular version of this method
-    ::grpc::Status MetaTable(::grpc::ServerContext* /*context*/, const ::io::deephaven::proto::backplane::grpc::MetaTableRequest* /*request*/, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse* /*response*/) override {
-      abort();
-      return ::grpc::Status(::grpc::StatusCode::UNIMPLEMENTED, "");
-    }
-    // replace default version of method with streamed unary
-    virtual ::grpc::Status StreamedMetaTable(::grpc::ServerContext* context, ::grpc::ServerUnaryStreamer< ::io::deephaven::proto::backplane::grpc::MetaTableRequest,::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse>* server_unary_streamer) = 0;
-  };
-  template <class BaseClass>
-  class WithStreamedUnaryMethod_ComputeColumnStatistics : public BaseClass {
-   private:
-    void BaseClassMustBeDerivedFromService(const Service* /*service*/) {}
-   public:
-    WithStreamedUnaryMethod_ComputeColumnStatistics() {
-      ::grpc::Service::MarkMethodStreamed(44,
-        new ::grpc::internal::StreamedUnaryHandler<
-          ::io::deephaven::proto::backplane::grpc::ColumnStatisticsRequest, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse>(
-            [this](::grpc::ServerContext* context,
-                   ::grpc::ServerUnaryStreamer<
-                     ::io::deephaven::proto::backplane::grpc::ColumnStatisticsRequest, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse>* streamer) {
-                       return this->StreamedComputeColumnStatistics(context,
-                         streamer);
-                  }));
-    }
-    ~WithStreamedUnaryMethod_ComputeColumnStatistics() override {
-      BaseClassMustBeDerivedFromService(this);
-    }
-    // disable regular version of this method
-    ::grpc::Status ComputeColumnStatistics(::grpc::ServerContext* /*context*/, const ::io::deephaven::proto::backplane::grpc::ColumnStatisticsRequest* /*request*/, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse* /*response*/) override {
-      abort();
-      return ::grpc::Status(::grpc::StatusCode::UNIMPLEMENTED, "");
-    }
-    // replace default version of method with streamed unary
-    virtual ::grpc::Status StreamedComputeColumnStatistics(::grpc::ServerContext* context, ::grpc::ServerUnaryStreamer< ::io::deephaven::proto::backplane::grpc::ColumnStatisticsRequest,::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse>* server_unary_streamer) = 0;
-  };
-  typedef WithStreamedUnaryMethod_GetExportedTableCreationResponse<WithStreamedUnaryMethod_FetchTable<WithStreamedUnaryMethod_ApplyPreviewColumns<WithStreamedUnaryMethod_EmptyTable<WithStreamedUnaryMethod_TimeTable<WithStreamedUnaryMethod_DropColumns<WithStreamedUnaryMethod_Update<WithStreamedUnaryMethod_LazyUpdate<WithStreamedUnaryMethod_View<WithStreamedUnaryMethod_UpdateView<WithStreamedUnaryMethod_Select<WithStreamedUnaryMethod_UpdateBy<WithStreamedUnaryMethod_SelectDistinct<WithStreamedUnaryMethod_Filter<WithStreamedUnaryMethod_UnstructuredFilter<WithStreamedUnaryMethod_Sort<WithStreamedUnaryMethod_Head<WithStreamedUnaryMethod_Tail<WithStreamedUnaryMethod_HeadBy<WithStreamedUnaryMethod_TailBy<WithStreamedUnaryMethod_Ungroup<WithStreamedUnaryMethod_MergeTables<WithStreamedUnaryMethod_CrossJoinTables<WithStreamedUnaryMethod_NaturalJoinTables<WithStreamedUnaryMethod_ExactJoinTables<WithStreamedUnaryMethod_LeftJoinTables<WithStreamedUnaryMethod_AsOfJoinTables<WithStreamedUnaryMethod_AjTables<WithStreamedUnaryMethod_RajTables<WithStreamedUnaryMethod_MultiJoinTables<WithStreamedUnaryMethod_RangeJoinTables<WithStreamedUnaryMethod_ComboAggregate<WithStreamedUnaryMethod_AggregateAll<WithStreamedUnaryMethod_Aggregate<WithStreamedUnaryMethod_Snapshot<WithStreamedUnaryMethod_SnapshotWhen<WithStreamedUnaryMethod_Flatten<WithStreamedUnaryMethod_RunChartDownsample<WithStreamedUnaryMethod_CreateInputTable<WithStreamedUnaryMethod_WhereIn<WithStreamedUnaryMethod_SeekRow<WithStreamedUnaryMethod_MetaTable<WithStreamedUnaryMethod_ComputeColumnStatistics<Service > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > StreamedUnaryService;
-  template <class BaseClass>
-  class WithSplitStreamingMethod_Batch : public BaseClass {
-   private:
-    void BaseClassMustBeDerivedFromService(const Service* /*service*/) {}
-   public:
-    WithSplitStreamingMethod_Batch() {
-      ::grpc::Service::MarkMethodStreamed(40,
-        new ::grpc::internal::SplitServerStreamingHandler<
-          ::io::deephaven::proto::backplane::grpc::BatchTableRequest, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse>(
-            [this](::grpc::ServerContext* context,
-                   ::grpc::ServerSplitStreamer<
-                     ::io::deephaven::proto::backplane::grpc::BatchTableRequest, ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse>* streamer) {
-                       return this->StreamedBatch(context,
-                         streamer);
-                  }));
-    }
-    ~WithSplitStreamingMethod_Batch() override {
-      BaseClassMustBeDerivedFromService(this);
-    }
-    // disable regular version of this method
-    ::grpc::Status Batch(::grpc::ServerContext* /*context*/, const ::io::deephaven::proto::backplane::grpc::BatchTableRequest* /*request*/, ::grpc::ServerWriter< ::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse>* /*writer*/) override {
-      abort();
-      return ::grpc::Status(::grpc::StatusCode::UNIMPLEMENTED, "");
-    }
-    // replace default version of method with split streamed
-    virtual ::grpc::Status StreamedBatch(::grpc::ServerContext* context, ::grpc::ServerSplitStreamer< ::io::deephaven::proto::backplane::grpc::BatchTableRequest,::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse>* server_split_streamer) = 0;
-  };
-  template <class BaseClass>
-  class WithSplitStreamingMethod_ExportedTableUpdates : public BaseClass {
-   private:
-    void BaseClassMustBeDerivedFromService(const Service* /*service*/) {}
-   public:
-    WithSplitStreamingMethod_ExportedTableUpdates() {
-      ::grpc::Service::MarkMethodStreamed(41,
-        new ::grpc::internal::SplitServerStreamingHandler<
-          ::io::deephaven::proto::backplane::grpc::ExportedTableUpdatesRequest, ::io::deephaven::proto::backplane::grpc::ExportedTableUpdateMessage>(
-            [this](::grpc::ServerContext* context,
-                   ::grpc::ServerSplitStreamer<
-                     ::io::deephaven::proto::backplane::grpc::ExportedTableUpdatesRequest, ::io::deephaven::proto::backplane::grpc::ExportedTableUpdateMessage>* streamer) {
-                       return this->StreamedExportedTableUpdates(context,
-                         streamer);
-                  }));
-    }
-    ~WithSplitStreamingMethod_ExportedTableUpdates() override {
-      BaseClassMustBeDerivedFromService(this);
-    }
-    // disable regular version of this method
-    ::grpc::Status ExportedTableUpdates(::grpc::ServerContext* /*context*/, const ::io::deephaven::proto::backplane::grpc::ExportedTableUpdatesRequest* /*request*/, ::grpc::ServerWriter< ::io::deephaven::proto::backplane::grpc::ExportedTableUpdateMessage>* /*writer*/) override {
-      abort();
-      return ::grpc::Status(::grpc::StatusCode::UNIMPLEMENTED, "");
-    }
-    // replace default version of method with split streamed
-    virtual ::grpc::Status StreamedExportedTableUpdates(::grpc::ServerContext* context, ::grpc::ServerSplitStreamer< ::io::deephaven::proto::backplane::grpc::ExportedTableUpdatesRequest,::io::deephaven::proto::backplane::grpc::ExportedTableUpdateMessage>* server_split_streamer) = 0;
-  };
-  typedef WithSplitStreamingMethod_Batch<WithSplitStreamingMethod_ExportedTableUpdates<Service > > SplitStreamedService;
-  typedef WithStreamedUnaryMethod_GetExportedTableCreationResponse<WithStreamedUnaryMethod_FetchTable<WithStreamedUnaryMethod_ApplyPreviewColumns<WithStreamedUnaryMethod_EmptyTable<WithStreamedUnaryMethod_TimeTable<WithStreamedUnaryMethod_DropColumns<WithStreamedUnaryMethod_Update<WithStreamedUnaryMethod_LazyUpdate<WithStreamedUnaryMethod_View<WithStreamedUnaryMethod_UpdateView<WithStreamedUnaryMethod_Select<WithStreamedUnaryMethod_UpdateBy<WithStreamedUnaryMethod_SelectDistinct<WithStreamedUnaryMethod_Filter<WithStreamedUnaryMethod_UnstructuredFilter<WithStreamedUnaryMethod_Sort<WithStreamedUnaryMethod_Head<WithStreamedUnaryMethod_Tail<WithStreamedUnaryMethod_HeadBy<WithStreamedUnaryMethod_TailBy<WithStreamedUnaryMethod_Ungroup<WithStreamedUnaryMethod_MergeTables<WithStreamedUnaryMethod_CrossJoinTables<WithStreamedUnaryMethod_NaturalJoinTables<WithStreamedUnaryMethod_ExactJoinTables<WithStreamedUnaryMethod_LeftJoinTables<WithStreamedUnaryMethod_AsOfJoinTables<WithStreamedUnaryMethod_AjTables<WithStreamedUnaryMethod_RajTables<WithStreamedUnaryMethod_MultiJoinTables<WithStreamedUnaryMethod_RangeJoinTables<WithStreamedUnaryMethod_ComboAggregate<WithStreamedUnaryMethod_AggregateAll<WithStreamedUnaryMethod_Aggregate<WithStreamedUnaryMethod_Snapshot<WithStreamedUnaryMethod_SnapshotWhen<WithStreamedUnaryMethod_Flatten<WithStreamedUnaryMethod_RunChartDownsample<WithStreamedUnaryMethod_CreateInputTable<WithStreamedUnaryMethod_WhereIn<WithSplitStreamingMethod_Batch<WithSplitStreamingMethod_ExportedTableUpdates<WithStreamedUnaryMethod_SeekRow<WithStreamedUnaryMethod_MetaTable<WithStreamedUnaryMethod_ComputeColumnStatistics<Service > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > StreamedService;
-};
-
-}  // namespace grpc
-}  // namespace backplane
-}  // namespace proto
-}  // namespace deephaven
-}  // namespace io
-
-
-#endif  // GRPC_deephaven_2fproto_2ftable_2eproto__INCLUDED
diff --git a/cpp-client/deephaven/dhclient/proto/deephaven/proto/table.pb.cc b/cpp-client/deephaven/dhclient/proto/deephaven/proto/table.pb.cc
deleted file mode 100644
index 045459b15f0..00000000000
--- a/cpp-client/deephaven/dhclient/proto/deephaven/proto/table.pb.cc
+++ /dev/null
@@ -1,39872 +0,0 @@
-// Generated by the protocol buffer compiler.  DO NOT EDIT!
-// source: deephaven/proto/table.proto
-
-#include "deephaven/proto/table.pb.h"
-
-#include <algorithm>
-#include "google/protobuf/io/coded_stream.h"
-#include "google/protobuf/extension_set.h"
-#include "google/protobuf/wire_format_lite.h"
-#include "google/protobuf/descriptor.h"
-#include "google/protobuf/generated_message_reflection.h"
-#include "google/protobuf/reflection_ops.h"
-#include "google/protobuf/wire_format.h"
-#include "google/protobuf/generated_message_tctable_impl.h"
-// @@protoc_insertion_point(includes)
-
-// Must be included last.
-#include "google/protobuf/port_def.inc"
-PROTOBUF_PRAGMA_INIT_SEG
-namespace _pb = ::google::protobuf;
-namespace _pbi = ::google::protobuf::internal;
-namespace _fl = ::google::protobuf::internal::field_layout;
-namespace io {
-namespace deephaven {
-namespace proto {
-namespace backplane {
-namespace grpc {
-
-inline constexpr UpdateByWindowScale_UpdateByWindowTime::Impl_::Impl_(
-    ::_pbi::ConstantInitialized) noexcept
-      : column_(
-            &::google::protobuf::internal::fixed_address_empty_string,
-            ::_pbi::ConstantInitialized()),
-        window_{},
-        _cached_size_{0},
-        _oneof_case_{} {}
-
-template <typename>
-PROTOBUF_CONSTEXPR UpdateByWindowScale_UpdateByWindowTime::UpdateByWindowScale_UpdateByWindowTime(::_pbi::ConstantInitialized)
-    : _impl_(::_pbi::ConstantInitialized()) {}
-struct UpdateByWindowScale_UpdateByWindowTimeDefaultTypeInternal {
-  PROTOBUF_CONSTEXPR UpdateByWindowScale_UpdateByWindowTimeDefaultTypeInternal() : _instance(::_pbi::ConstantInitialized{}) {}
-  ~UpdateByWindowScale_UpdateByWindowTimeDefaultTypeInternal() {}
-  union {
-    UpdateByWindowScale_UpdateByWindowTime _instance;
-  };
-};
-
-PROTOBUF_ATTRIBUTE_NO_DESTROY PROTOBUF_CONSTINIT
-    PROTOBUF_ATTRIBUTE_INIT_PRIORITY1 UpdateByWindowScale_UpdateByWindowTimeDefaultTypeInternal _UpdateByWindowScale_UpdateByWindowTime_default_instance_;
-
-inline constexpr UpdateByWindowScale_UpdateByWindowTicks::Impl_::Impl_(
-    ::_pbi::ConstantInitialized) noexcept
-      : ticks_{0},
-        _cached_size_{0} {}
-
-template <typename>
-PROTOBUF_CONSTEXPR UpdateByWindowScale_UpdateByWindowTicks::UpdateByWindowScale_UpdateByWindowTicks(::_pbi::ConstantInitialized)
-    : _impl_(::_pbi::ConstantInitialized()) {}
-struct UpdateByWindowScale_UpdateByWindowTicksDefaultTypeInternal {
-  PROTOBUF_CONSTEXPR UpdateByWindowScale_UpdateByWindowTicksDefaultTypeInternal() : _instance(::_pbi::ConstantInitialized{}) {}
-  ~UpdateByWindowScale_UpdateByWindowTicksDefaultTypeInternal() {}
-  union {
-    UpdateByWindowScale_UpdateByWindowTicks _instance;
-  };
-};
-
-PROTOBUF_ATTRIBUTE_NO_DESTROY PROTOBUF_CONSTINIT
-    PROTOBUF_ATTRIBUTE_INIT_PRIORITY1 UpdateByWindowScale_UpdateByWindowTicksDefaultTypeInternal _UpdateByWindowScale_UpdateByWindowTicks_default_instance_;
-      template <typename>
-PROTOBUF_CONSTEXPR UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByFill::UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByFill(::_pbi::ConstantInitialized) {}
-struct UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByFillDefaultTypeInternal {
-  PROTOBUF_CONSTEXPR UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByFillDefaultTypeInternal() : _instance(::_pbi::ConstantInitialized{}) {}
-  ~UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByFillDefaultTypeInternal() {}
-  union {
-    UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByFill _instance;
-  };
-};
-
-PROTOBUF_ATTRIBUTE_NO_DESTROY PROTOBUF_CONSTINIT
-    PROTOBUF_ATTRIBUTE_INIT_PRIORITY1 UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByFillDefaultTypeInternal _UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByFill_default_instance_;
-      template <typename>
-PROTOBUF_CONSTEXPR UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByCumulativeSum::UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByCumulativeSum(::_pbi::ConstantInitialized) {}
-struct UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByCumulativeSumDefaultTypeInternal {
-  PROTOBUF_CONSTEXPR UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByCumulativeSumDefaultTypeInternal() : _instance(::_pbi::ConstantInitialized{}) {}
-  ~UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByCumulativeSumDefaultTypeInternal() {}
-  union {
-    UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByCumulativeSum _instance;
-  };
-};
-
-PROTOBUF_ATTRIBUTE_NO_DESTROY PROTOBUF_CONSTINIT
-    PROTOBUF_ATTRIBUTE_INIT_PRIORITY1 UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByCumulativeSumDefaultTypeInternal _UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByCumulativeSum_default_instance_;
-      template <typename>
-PROTOBUF_CONSTEXPR UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByCumulativeProduct::UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByCumulativeProduct(::_pbi::ConstantInitialized) {}
-struct UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByCumulativeProductDefaultTypeInternal {
-  PROTOBUF_CONSTEXPR UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByCumulativeProductDefaultTypeInternal() : _instance(::_pbi::ConstantInitialized{}) {}
-  ~UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByCumulativeProductDefaultTypeInternal() {}
-  union {
-    UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByCumulativeProduct _instance;
-  };
-};
-
-PROTOBUF_ATTRIBUTE_NO_DESTROY PROTOBUF_CONSTINIT
-    PROTOBUF_ATTRIBUTE_INIT_PRIORITY1 UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByCumulativeProductDefaultTypeInternal _UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByCumulativeProduct_default_instance_;
-      template <typename>
-PROTOBUF_CONSTEXPR UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByCumulativeMin::UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByCumulativeMin(::_pbi::ConstantInitialized) {}
-struct UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByCumulativeMinDefaultTypeInternal {
-  PROTOBUF_CONSTEXPR UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByCumulativeMinDefaultTypeInternal() : _instance(::_pbi::ConstantInitialized{}) {}
-  ~UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByCumulativeMinDefaultTypeInternal() {}
-  union {
-    UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByCumulativeMin _instance;
-  };
-};
-
-PROTOBUF_ATTRIBUTE_NO_DESTROY PROTOBUF_CONSTINIT
-    PROTOBUF_ATTRIBUTE_INIT_PRIORITY1 UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByCumulativeMinDefaultTypeInternal _UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByCumulativeMin_default_instance_;
-      template <typename>
-PROTOBUF_CONSTEXPR UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByCumulativeMax::UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByCumulativeMax(::_pbi::ConstantInitialized) {}
-struct UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByCumulativeMaxDefaultTypeInternal {
-  PROTOBUF_CONSTEXPR UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByCumulativeMaxDefaultTypeInternal() : _instance(::_pbi::ConstantInitialized{}) {}
-  ~UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByCumulativeMaxDefaultTypeInternal() {}
-  union {
-    UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByCumulativeMax _instance;
-  };
-};
-
-PROTOBUF_ATTRIBUTE_NO_DESTROY PROTOBUF_CONSTINIT
-    PROTOBUF_ATTRIBUTE_INIT_PRIORITY1 UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByCumulativeMaxDefaultTypeInternal _UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByCumulativeMax_default_instance_;
-
-inline constexpr UpdateByDeltaOptions::Impl_::Impl_(
-    ::_pbi::ConstantInitialized) noexcept
-      : null_behavior_{static_cast< ::io::deephaven::proto::backplane::grpc::UpdateByNullBehavior >(0)},
-        _cached_size_{0} {}
-
-template <typename>
-PROTOBUF_CONSTEXPR UpdateByDeltaOptions::UpdateByDeltaOptions(::_pbi::ConstantInitialized)
-    : _impl_(::_pbi::ConstantInitialized()) {}
-struct UpdateByDeltaOptionsDefaultTypeInternal {
-  PROTOBUF_CONSTEXPR UpdateByDeltaOptionsDefaultTypeInternal() : _instance(::_pbi::ConstantInitialized{}) {}
-  ~UpdateByDeltaOptionsDefaultTypeInternal() {}
-  union {
-    UpdateByDeltaOptions _instance;
-  };
-};
-
-PROTOBUF_ATTRIBUTE_NO_DESTROY PROTOBUF_CONSTINIT
-    PROTOBUF_ATTRIBUTE_INIT_PRIORITY1 UpdateByDeltaOptionsDefaultTypeInternal _UpdateByDeltaOptions_default_instance_;
-
-inline constexpr SortDescriptor::Impl_::Impl_(
-    ::_pbi::ConstantInitialized) noexcept
-      : column_name_(
-            &::google::protobuf::internal::fixed_address_empty_string,
-            ::_pbi::ConstantInitialized()),
-        is_absolute_{false},
-        direction_{static_cast< ::io::deephaven::proto::backplane::grpc::SortDescriptor_SortDirection >(0)},
-        _cached_size_{0} {}
-
-template <typename>
-PROTOBUF_CONSTEXPR SortDescriptor::SortDescriptor(::_pbi::ConstantInitialized)
-    : _impl_(::_pbi::ConstantInitialized()) {}
-struct SortDescriptorDefaultTypeInternal {
-  PROTOBUF_CONSTEXPR SortDescriptorDefaultTypeInternal() : _instance(::_pbi::ConstantInitialized{}) {}
-  ~SortDescriptorDefaultTypeInternal() {}
-  union {
-    SortDescriptor _instance;
-  };
-};
-
-PROTOBUF_ATTRIBUTE_NO_DESTROY PROTOBUF_CONSTINIT
-    PROTOBUF_ATTRIBUTE_INIT_PRIORITY1 SortDescriptorDefaultTypeInternal _SortDescriptor_default_instance_;
-
-inline constexpr SeekRowResponse::Impl_::Impl_(
-    ::_pbi::ConstantInitialized) noexcept
-      : result_row_{::int64_t{0}},
-        _cached_size_{0} {}
-
-template <typename>
-PROTOBUF_CONSTEXPR SeekRowResponse::SeekRowResponse(::_pbi::ConstantInitialized)
-    : _impl_(::_pbi::ConstantInitialized()) {}
-struct SeekRowResponseDefaultTypeInternal {
-  PROTOBUF_CONSTEXPR SeekRowResponseDefaultTypeInternal() : _instance(::_pbi::ConstantInitialized{}) {}
-  ~SeekRowResponseDefaultTypeInternal() {}
-  union {
-    SeekRowResponse _instance;
-  };
-};
-
-PROTOBUF_ATTRIBUTE_NO_DESTROY PROTOBUF_CONSTINIT
-    PROTOBUF_ATTRIBUTE_INIT_PRIORITY1 SeekRowResponseDefaultTypeInternal _SeekRowResponse_default_instance_;
-
-inline constexpr RunChartDownsampleRequest_ZoomRange::Impl_::Impl_(
-    ::_pbi::ConstantInitialized) noexcept
-      : _cached_size_{0},
-        min_date_nanos_{::int64_t{0}},
-        max_date_nanos_{::int64_t{0}} {}
-
-template <typename>
-PROTOBUF_CONSTEXPR RunChartDownsampleRequest_ZoomRange::RunChartDownsampleRequest_ZoomRange(::_pbi::ConstantInitialized)
-    : _impl_(::_pbi::ConstantInitialized()) {}
-struct RunChartDownsampleRequest_ZoomRangeDefaultTypeInternal {
-  PROTOBUF_CONSTEXPR RunChartDownsampleRequest_ZoomRangeDefaultTypeInternal() : _instance(::_pbi::ConstantInitialized{}) {}
-  ~RunChartDownsampleRequest_ZoomRangeDefaultTypeInternal() {}
-  union {
-    RunChartDownsampleRequest_ZoomRange _instance;
-  };
-};
-
-PROTOBUF_ATTRIBUTE_NO_DESTROY PROTOBUF_CONSTINIT
-    PROTOBUF_ATTRIBUTE_INIT_PRIORITY1 RunChartDownsampleRequest_ZoomRangeDefaultTypeInternal _RunChartDownsampleRequest_ZoomRange_default_instance_;
-
-inline constexpr Reference::Impl_::Impl_(
-    ::_pbi::ConstantInitialized) noexcept
-      : column_name_(
-            &::google::protobuf::internal::fixed_address_empty_string,
-            ::_pbi::ConstantInitialized()),
-        _cached_size_{0} {}
-
-template <typename>
-PROTOBUF_CONSTEXPR Reference::Reference(::_pbi::ConstantInitialized)
-    : _impl_(::_pbi::ConstantInitialized()) {}
-struct ReferenceDefaultTypeInternal {
-  PROTOBUF_CONSTEXPR ReferenceDefaultTypeInternal() : _instance(::_pbi::ConstantInitialized{}) {}
-  ~ReferenceDefaultTypeInternal() {}
-  union {
-    Reference _instance;
-  };
-};
-
-PROTOBUF_ATTRIBUTE_NO_DESTROY PROTOBUF_CONSTINIT
-    PROTOBUF_ATTRIBUTE_INIT_PRIORITY1 ReferenceDefaultTypeInternal _Reference_default_instance_;
-
-inline constexpr MathContext::Impl_::Impl_(
-    ::_pbi::ConstantInitialized) noexcept
-      : precision_{0},
-        rounding_mode_{static_cast< ::io::deephaven::proto::backplane::grpc::MathContext_RoundingMode >(0)},
-        _cached_size_{0} {}
-
-template <typename>
-PROTOBUF_CONSTEXPR MathContext::MathContext(::_pbi::ConstantInitialized)
-    : _impl_(::_pbi::ConstantInitialized()) {}
-struct MathContextDefaultTypeInternal {
-  PROTOBUF_CONSTEXPR MathContextDefaultTypeInternal() : _instance(::_pbi::ConstantInitialized{}) {}
-  ~MathContextDefaultTypeInternal() {}
-  union {
-    MathContext _instance;
-  };
-};
-
-PROTOBUF_ATTRIBUTE_NO_DESTROY PROTOBUF_CONSTINIT
-    PROTOBUF_ATTRIBUTE_INIT_PRIORITY1 MathContextDefaultTypeInternal _MathContext_default_instance_;
-
-inline constexpr Literal::Impl_::Impl_(
-    ::_pbi::ConstantInitialized) noexcept
-      : value_{},
-        _cached_size_{0},
-        _oneof_case_{} {}
-
-template <typename>
-PROTOBUF_CONSTEXPR Literal::Literal(::_pbi::ConstantInitialized)
-    : _impl_(::_pbi::ConstantInitialized()) {}
-struct LiteralDefaultTypeInternal {
-  PROTOBUF_CONSTEXPR LiteralDefaultTypeInternal() : _instance(::_pbi::ConstantInitialized{}) {}
-  ~LiteralDefaultTypeInternal() {}
-  union {
-    Literal _instance;
-  };
-};
-
-PROTOBUF_ATTRIBUTE_NO_DESTROY PROTOBUF_CONSTINIT
-    PROTOBUF_ATTRIBUTE_INIT_PRIORITY1 LiteralDefaultTypeInternal _Literal_default_instance_;
-      template <typename>
-PROTOBUF_CONSTEXPR ExportedTableUpdatesRequest::ExportedTableUpdatesRequest(::_pbi::ConstantInitialized) {}
-struct ExportedTableUpdatesRequestDefaultTypeInternal {
-  PROTOBUF_CONSTEXPR ExportedTableUpdatesRequestDefaultTypeInternal() : _instance(::_pbi::ConstantInitialized{}) {}
-  ~ExportedTableUpdatesRequestDefaultTypeInternal() {}
-  union {
-    ExportedTableUpdatesRequest _instance;
-  };
-};
-
-PROTOBUF_ATTRIBUTE_NO_DESTROY PROTOBUF_CONSTINIT
-    PROTOBUF_ATTRIBUTE_INIT_PRIORITY1 ExportedTableUpdatesRequestDefaultTypeInternal _ExportedTableUpdatesRequest_default_instance_;
-
-inline constexpr CreateInputTableRequest_InputTableKind_InMemoryKeyBacked::Impl_::Impl_(
-    ::_pbi::ConstantInitialized) noexcept
-      : key_columns_{},
-        _cached_size_{0} {}
-
-template <typename>
-PROTOBUF_CONSTEXPR CreateInputTableRequest_InputTableKind_InMemoryKeyBacked::CreateInputTableRequest_InputTableKind_InMemoryKeyBacked(::_pbi::ConstantInitialized)
-    : _impl_(::_pbi::ConstantInitialized()) {}
-struct CreateInputTableRequest_InputTableKind_InMemoryKeyBackedDefaultTypeInternal {
-  PROTOBUF_CONSTEXPR CreateInputTableRequest_InputTableKind_InMemoryKeyBackedDefaultTypeInternal() : _instance(::_pbi::ConstantInitialized{}) {}
-  ~CreateInputTableRequest_InputTableKind_InMemoryKeyBackedDefaultTypeInternal() {}
-  union {
-    CreateInputTableRequest_InputTableKind_InMemoryKeyBacked _instance;
-  };
-};
-
-PROTOBUF_ATTRIBUTE_NO_DESTROY PROTOBUF_CONSTINIT
-    PROTOBUF_ATTRIBUTE_INIT_PRIORITY1 CreateInputTableRequest_InputTableKind_InMemoryKeyBackedDefaultTypeInternal _CreateInputTableRequest_InputTableKind_InMemoryKeyBacked_default_instance_;
-      template <typename>
-PROTOBUF_CONSTEXPR CreateInputTableRequest_InputTableKind_InMemoryAppendOnly::CreateInputTableRequest_InputTableKind_InMemoryAppendOnly(::_pbi::ConstantInitialized) {}
-struct CreateInputTableRequest_InputTableKind_InMemoryAppendOnlyDefaultTypeInternal {
-  PROTOBUF_CONSTEXPR CreateInputTableRequest_InputTableKind_InMemoryAppendOnlyDefaultTypeInternal() : _instance(::_pbi::ConstantInitialized{}) {}
-  ~CreateInputTableRequest_InputTableKind_InMemoryAppendOnlyDefaultTypeInternal() {}
-  union {
-    CreateInputTableRequest_InputTableKind_InMemoryAppendOnly _instance;
-  };
-};
-
-PROTOBUF_ATTRIBUTE_NO_DESTROY PROTOBUF_CONSTINIT
-    PROTOBUF_ATTRIBUTE_INIT_PRIORITY1 CreateInputTableRequest_InputTableKind_InMemoryAppendOnlyDefaultTypeInternal _CreateInputTableRequest_InputTableKind_InMemoryAppendOnly_default_instance_;
-      template <typename>
-PROTOBUF_CONSTEXPR CreateInputTableRequest_InputTableKind_Blink::CreateInputTableRequest_InputTableKind_Blink(::_pbi::ConstantInitialized) {}
-struct CreateInputTableRequest_InputTableKind_BlinkDefaultTypeInternal {
-  PROTOBUF_CONSTEXPR CreateInputTableRequest_InputTableKind_BlinkDefaultTypeInternal() : _instance(::_pbi::ConstantInitialized{}) {}
-  ~CreateInputTableRequest_InputTableKind_BlinkDefaultTypeInternal() {}
-  union {
-    CreateInputTableRequest_InputTableKind_Blink _instance;
-  };
-};
-
-PROTOBUF_ATTRIBUTE_NO_DESTROY PROTOBUF_CONSTINIT
-    PROTOBUF_ATTRIBUTE_INIT_PRIORITY1 CreateInputTableRequest_InputTableKind_BlinkDefaultTypeInternal _CreateInputTableRequest_InputTableKind_Blink_default_instance_;
-
-inline constexpr ComboAggregateRequest_Aggregate::Impl_::Impl_(
-    ::_pbi::ConstantInitialized) noexcept
-      : match_pairs_{},
-        column_name_(
-            &::google::protobuf::internal::fixed_address_empty_string,
-            ::_pbi::ConstantInitialized()),
-        type_{static_cast< ::io::deephaven::proto::backplane::grpc::ComboAggregateRequest_AggType >(0)},
-        avg_median_{false},
-        percentile_{0},
-        _cached_size_{0} {}
-
-template <typename>
-PROTOBUF_CONSTEXPR ComboAggregateRequest_Aggregate::ComboAggregateRequest_Aggregate(::_pbi::ConstantInitialized)
-    : _impl_(::_pbi::ConstantInitialized()) {}
-struct ComboAggregateRequest_AggregateDefaultTypeInternal {
-  PROTOBUF_CONSTEXPR ComboAggregateRequest_AggregateDefaultTypeInternal() : _instance(::_pbi::ConstantInitialized{}) {}
-  ~ComboAggregateRequest_AggregateDefaultTypeInternal() {}
-  union {
-    ComboAggregateRequest_Aggregate _instance;
-  };
-};
-
-PROTOBUF_ATTRIBUTE_NO_DESTROY PROTOBUF_CONSTINIT
-    PROTOBUF_ATTRIBUTE_INIT_PRIORITY1 ComboAggregateRequest_AggregateDefaultTypeInternal _ComboAggregateRequest_Aggregate_default_instance_;
-
-inline constexpr Aggregation_AggregationRowKey::Impl_::Impl_(
-    ::_pbi::ConstantInitialized) noexcept
-      : column_name_(
-            &::google::protobuf::internal::fixed_address_empty_string,
-            ::_pbi::ConstantInitialized()),
-        _cached_size_{0} {}
-
-template <typename>
-PROTOBUF_CONSTEXPR Aggregation_AggregationRowKey::Aggregation_AggregationRowKey(::_pbi::ConstantInitialized)
-    : _impl_(::_pbi::ConstantInitialized()) {}
-struct Aggregation_AggregationRowKeyDefaultTypeInternal {
-  PROTOBUF_CONSTEXPR Aggregation_AggregationRowKeyDefaultTypeInternal() : _instance(::_pbi::ConstantInitialized{}) {}
-  ~Aggregation_AggregationRowKeyDefaultTypeInternal() {}
-  union {
-    Aggregation_AggregationRowKey _instance;
-  };
-};
-
-PROTOBUF_ATTRIBUTE_NO_DESTROY PROTOBUF_CONSTINIT
-    PROTOBUF_ATTRIBUTE_INIT_PRIORITY1 Aggregation_AggregationRowKeyDefaultTypeInternal _Aggregation_AggregationRowKey_default_instance_;
-
-inline constexpr Aggregation_AggregationPartition::Impl_::Impl_(
-    ::_pbi::ConstantInitialized) noexcept
-      : column_name_(
-            &::google::protobuf::internal::fixed_address_empty_string,
-            ::_pbi::ConstantInitialized()),
-        include_group_by_columns_{false},
-        _cached_size_{0} {}
-
-template <typename>
-PROTOBUF_CONSTEXPR Aggregation_AggregationPartition::Aggregation_AggregationPartition(::_pbi::ConstantInitialized)
-    : _impl_(::_pbi::ConstantInitialized()) {}
-struct Aggregation_AggregationPartitionDefaultTypeInternal {
-  PROTOBUF_CONSTEXPR Aggregation_AggregationPartitionDefaultTypeInternal() : _instance(::_pbi::ConstantInitialized{}) {}
-  ~Aggregation_AggregationPartitionDefaultTypeInternal() {}
-  union {
-    Aggregation_AggregationPartition _instance;
-  };
-};
-
-PROTOBUF_ATTRIBUTE_NO_DESTROY PROTOBUF_CONSTINIT
-    PROTOBUF_ATTRIBUTE_INIT_PRIORITY1 Aggregation_AggregationPartitionDefaultTypeInternal _Aggregation_AggregationPartition_default_instance_;
-
-inline constexpr Aggregation_AggregationCount::Impl_::Impl_(
-    ::_pbi::ConstantInitialized) noexcept
-      : column_name_(
-            &::google::protobuf::internal::fixed_address_empty_string,
-            ::_pbi::ConstantInitialized()),
-        _cached_size_{0} {}
-
-template <typename>
-PROTOBUF_CONSTEXPR Aggregation_AggregationCount::Aggregation_AggregationCount(::_pbi::ConstantInitialized)
-    : _impl_(::_pbi::ConstantInitialized()) {}
-struct Aggregation_AggregationCountDefaultTypeInternal {
-  PROTOBUF_CONSTEXPR Aggregation_AggregationCountDefaultTypeInternal() : _instance(::_pbi::ConstantInitialized{}) {}
-  ~Aggregation_AggregationCountDefaultTypeInternal() {}
-  union {
-    Aggregation_AggregationCount _instance;
-  };
-};
-
-PROTOBUF_ATTRIBUTE_NO_DESTROY PROTOBUF_CONSTINIT
-    PROTOBUF_ATTRIBUTE_INIT_PRIORITY1 Aggregation_AggregationCountDefaultTypeInternal _Aggregation_AggregationCount_default_instance_;
-
-inline constexpr AggSpec_AggSpecWeighted::Impl_::Impl_(
-    ::_pbi::ConstantInitialized) noexcept
-      : weight_column_(
-            &::google::protobuf::internal::fixed_address_empty_string,
-            ::_pbi::ConstantInitialized()),
-        _cached_size_{0} {}
-
-template <typename>
-PROTOBUF_CONSTEXPR AggSpec_AggSpecWeighted::AggSpec_AggSpecWeighted(::_pbi::ConstantInitialized)
-    : _impl_(::_pbi::ConstantInitialized()) {}
-struct AggSpec_AggSpecWeightedDefaultTypeInternal {
-  PROTOBUF_CONSTEXPR AggSpec_AggSpecWeightedDefaultTypeInternal() : _instance(::_pbi::ConstantInitialized{}) {}
-  ~AggSpec_AggSpecWeightedDefaultTypeInternal() {}
-  union {
-    AggSpec_AggSpecWeighted _instance;
-  };
-};
-
-PROTOBUF_ATTRIBUTE_NO_DESTROY PROTOBUF_CONSTINIT
-    PROTOBUF_ATTRIBUTE_INIT_PRIORITY1 AggSpec_AggSpecWeightedDefaultTypeInternal _AggSpec_AggSpecWeighted_default_instance_;
-      template <typename>
-PROTOBUF_CONSTEXPR AggSpec_AggSpecVar::AggSpec_AggSpecVar(::_pbi::ConstantInitialized) {}
-struct AggSpec_AggSpecVarDefaultTypeInternal {
-  PROTOBUF_CONSTEXPR AggSpec_AggSpecVarDefaultTypeInternal() : _instance(::_pbi::ConstantInitialized{}) {}
-  ~AggSpec_AggSpecVarDefaultTypeInternal() {}
-  union {
-    AggSpec_AggSpecVar _instance;
-  };
-};
-
-PROTOBUF_ATTRIBUTE_NO_DESTROY PROTOBUF_CONSTINIT
-    PROTOBUF_ATTRIBUTE_INIT_PRIORITY1 AggSpec_AggSpecVarDefaultTypeInternal _AggSpec_AggSpecVar_default_instance_;
-
-inline constexpr AggSpec_AggSpecTDigest::Impl_::Impl_(
-    ::_pbi::ConstantInitialized) noexcept
-      : _cached_size_{0},
-        compression_{0} {}
-
-template <typename>
-PROTOBUF_CONSTEXPR AggSpec_AggSpecTDigest::AggSpec_AggSpecTDigest(::_pbi::ConstantInitialized)
-    : _impl_(::_pbi::ConstantInitialized()) {}
-struct AggSpec_AggSpecTDigestDefaultTypeInternal {
-  PROTOBUF_CONSTEXPR AggSpec_AggSpecTDigestDefaultTypeInternal() : _instance(::_pbi::ConstantInitialized{}) {}
-  ~AggSpec_AggSpecTDigestDefaultTypeInternal() {}
-  union {
-    AggSpec_AggSpecTDigest _instance;
-  };
-};
-
-PROTOBUF_ATTRIBUTE_NO_DESTROY PROTOBUF_CONSTINIT
-    PROTOBUF_ATTRIBUTE_INIT_PRIORITY1 AggSpec_AggSpecTDigestDefaultTypeInternal _AggSpec_AggSpecTDigest_default_instance_;
-      template <typename>
-PROTOBUF_CONSTEXPR AggSpec_AggSpecSum::AggSpec_AggSpecSum(::_pbi::ConstantInitialized) {}
-struct AggSpec_AggSpecSumDefaultTypeInternal {
-  PROTOBUF_CONSTEXPR AggSpec_AggSpecSumDefaultTypeInternal() : _instance(::_pbi::ConstantInitialized{}) {}
-  ~AggSpec_AggSpecSumDefaultTypeInternal() {}
-  union {
-    AggSpec_AggSpecSum _instance;
-  };
-};
-
-PROTOBUF_ATTRIBUTE_NO_DESTROY PROTOBUF_CONSTINIT
-    PROTOBUF_ATTRIBUTE_INIT_PRIORITY1 AggSpec_AggSpecSumDefaultTypeInternal _AggSpec_AggSpecSum_default_instance_;
-      template <typename>
-PROTOBUF_CONSTEXPR AggSpec_AggSpecStd::AggSpec_AggSpecStd(::_pbi::ConstantInitialized) {}
-struct AggSpec_AggSpecStdDefaultTypeInternal {
-  PROTOBUF_CONSTEXPR AggSpec_AggSpecStdDefaultTypeInternal() : _instance(::_pbi::ConstantInitialized{}) {}
-  ~AggSpec_AggSpecStdDefaultTypeInternal() {}
-  union {
-    AggSpec_AggSpecStd _instance;
-  };
-};
-
-PROTOBUF_ATTRIBUTE_NO_DESTROY PROTOBUF_CONSTINIT
-    PROTOBUF_ATTRIBUTE_INIT_PRIORITY1 AggSpec_AggSpecStdDefaultTypeInternal _AggSpec_AggSpecStd_default_instance_;
-
-inline constexpr AggSpec_AggSpecSortedColumn::Impl_::Impl_(
-    ::_pbi::ConstantInitialized) noexcept
-      : column_name_(
-            &::google::protobuf::internal::fixed_address_empty_string,
-            ::_pbi::ConstantInitialized()),
-        _cached_size_{0} {}
-
-template <typename>
-PROTOBUF_CONSTEXPR AggSpec_AggSpecSortedColumn::AggSpec_AggSpecSortedColumn(::_pbi::ConstantInitialized)
-    : _impl_(::_pbi::ConstantInitialized()) {}
-struct AggSpec_AggSpecSortedColumnDefaultTypeInternal {
-  PROTOBUF_CONSTEXPR AggSpec_AggSpecSortedColumnDefaultTypeInternal() : _instance(::_pbi::ConstantInitialized{}) {}
-  ~AggSpec_AggSpecSortedColumnDefaultTypeInternal() {}
-  union {
-    AggSpec_AggSpecSortedColumn _instance;
-  };
-};
-
-PROTOBUF_ATTRIBUTE_NO_DESTROY PROTOBUF_CONSTINIT
-    PROTOBUF_ATTRIBUTE_INIT_PRIORITY1 AggSpec_AggSpecSortedColumnDefaultTypeInternal _AggSpec_AggSpecSortedColumn_default_instance_;
-
-inline constexpr AggSpec_AggSpecPercentile::Impl_::Impl_(
-    ::_pbi::ConstantInitialized) noexcept
-      : percentile_{0},
-        average_evenly_divided_{false},
-        _cached_size_{0} {}
-
-template <typename>
-PROTOBUF_CONSTEXPR AggSpec_AggSpecPercentile::AggSpec_AggSpecPercentile(::_pbi::ConstantInitialized)
-    : _impl_(::_pbi::ConstantInitialized()) {}
-struct AggSpec_AggSpecPercentileDefaultTypeInternal {
-  PROTOBUF_CONSTEXPR AggSpec_AggSpecPercentileDefaultTypeInternal() : _instance(::_pbi::ConstantInitialized{}) {}
-  ~AggSpec_AggSpecPercentileDefaultTypeInternal() {}
-  union {
-    AggSpec_AggSpecPercentile _instance;
-  };
-};
-
-PROTOBUF_ATTRIBUTE_NO_DESTROY PROTOBUF_CONSTINIT
-    PROTOBUF_ATTRIBUTE_INIT_PRIORITY1 AggSpec_AggSpecPercentileDefaultTypeInternal _AggSpec_AggSpecPercentile_default_instance_;
-
-inline constexpr AggSpec_AggSpecNonUniqueSentinel::Impl_::Impl_(
-    ::_pbi::ConstantInitialized) noexcept
-      : type_{},
-        _cached_size_{0},
-        _oneof_case_{} {}
-
-template <typename>
-PROTOBUF_CONSTEXPR AggSpec_AggSpecNonUniqueSentinel::AggSpec_AggSpecNonUniqueSentinel(::_pbi::ConstantInitialized)
-    : _impl_(::_pbi::ConstantInitialized()) {}
-struct AggSpec_AggSpecNonUniqueSentinelDefaultTypeInternal {
-  PROTOBUF_CONSTEXPR AggSpec_AggSpecNonUniqueSentinelDefaultTypeInternal() : _instance(::_pbi::ConstantInitialized{}) {}
-  ~AggSpec_AggSpecNonUniqueSentinelDefaultTypeInternal() {}
-  union {
-    AggSpec_AggSpecNonUniqueSentinel _instance;
-  };
-};
-
-PROTOBUF_ATTRIBUTE_NO_DESTROY PROTOBUF_CONSTINIT
-    PROTOBUF_ATTRIBUTE_INIT_PRIORITY1 AggSpec_AggSpecNonUniqueSentinelDefaultTypeInternal _AggSpec_AggSpecNonUniqueSentinel_default_instance_;
-      template <typename>
-PROTOBUF_CONSTEXPR AggSpec_AggSpecMin::AggSpec_AggSpecMin(::_pbi::ConstantInitialized) {}
-struct AggSpec_AggSpecMinDefaultTypeInternal {
-  PROTOBUF_CONSTEXPR AggSpec_AggSpecMinDefaultTypeInternal() : _instance(::_pbi::ConstantInitialized{}) {}
-  ~AggSpec_AggSpecMinDefaultTypeInternal() {}
-  union {
-    AggSpec_AggSpecMin _instance;
-  };
-};
-
-PROTOBUF_ATTRIBUTE_NO_DESTROY PROTOBUF_CONSTINIT
-    PROTOBUF_ATTRIBUTE_INIT_PRIORITY1 AggSpec_AggSpecMinDefaultTypeInternal _AggSpec_AggSpecMin_default_instance_;
-
-inline constexpr AggSpec_AggSpecMedian::Impl_::Impl_(
-    ::_pbi::ConstantInitialized) noexcept
-      : average_evenly_divided_{false},
-        _cached_size_{0} {}
-
-template <typename>
-PROTOBUF_CONSTEXPR AggSpec_AggSpecMedian::AggSpec_AggSpecMedian(::_pbi::ConstantInitialized)
-    : _impl_(::_pbi::ConstantInitialized()) {}
-struct AggSpec_AggSpecMedianDefaultTypeInternal {
-  PROTOBUF_CONSTEXPR AggSpec_AggSpecMedianDefaultTypeInternal() : _instance(::_pbi::ConstantInitialized{}) {}
-  ~AggSpec_AggSpecMedianDefaultTypeInternal() {}
-  union {
-    AggSpec_AggSpecMedian _instance;
-  };
-};
-
-PROTOBUF_ATTRIBUTE_NO_DESTROY PROTOBUF_CONSTINIT
-    PROTOBUF_ATTRIBUTE_INIT_PRIORITY1 AggSpec_AggSpecMedianDefaultTypeInternal _AggSpec_AggSpecMedian_default_instance_;
-      template <typename>
-PROTOBUF_CONSTEXPR AggSpec_AggSpecMax::AggSpec_AggSpecMax(::_pbi::ConstantInitialized) {}
-struct AggSpec_AggSpecMaxDefaultTypeInternal {
-  PROTOBUF_CONSTEXPR AggSpec_AggSpecMaxDefaultTypeInternal() : _instance(::_pbi::ConstantInitialized{}) {}
-  ~AggSpec_AggSpecMaxDefaultTypeInternal() {}
-  union {
-    AggSpec_AggSpecMax _instance;
-  };
-};
-
-PROTOBUF_ATTRIBUTE_NO_DESTROY PROTOBUF_CONSTINIT
-    PROTOBUF_ATTRIBUTE_INIT_PRIORITY1 AggSpec_AggSpecMaxDefaultTypeInternal _AggSpec_AggSpecMax_default_instance_;
-      template <typename>
-PROTOBUF_CONSTEXPR AggSpec_AggSpecLast::AggSpec_AggSpecLast(::_pbi::ConstantInitialized) {}
-struct AggSpec_AggSpecLastDefaultTypeInternal {
-  PROTOBUF_CONSTEXPR AggSpec_AggSpecLastDefaultTypeInternal() : _instance(::_pbi::ConstantInitialized{}) {}
-  ~AggSpec_AggSpecLastDefaultTypeInternal() {}
-  union {
-    AggSpec_AggSpecLast _instance;
-  };
-};
-
-PROTOBUF_ATTRIBUTE_NO_DESTROY PROTOBUF_CONSTINIT
-    PROTOBUF_ATTRIBUTE_INIT_PRIORITY1 AggSpec_AggSpecLastDefaultTypeInternal _AggSpec_AggSpecLast_default_instance_;
-      template <typename>
-PROTOBUF_CONSTEXPR AggSpec_AggSpecGroup::AggSpec_AggSpecGroup(::_pbi::ConstantInitialized) {}
-struct AggSpec_AggSpecGroupDefaultTypeInternal {
-  PROTOBUF_CONSTEXPR AggSpec_AggSpecGroupDefaultTypeInternal() : _instance(::_pbi::ConstantInitialized{}) {}
-  ~AggSpec_AggSpecGroupDefaultTypeInternal() {}
-  union {
-    AggSpec_AggSpecGroup _instance;
-  };
-};
-
-PROTOBUF_ATTRIBUTE_NO_DESTROY PROTOBUF_CONSTINIT
-    PROTOBUF_ATTRIBUTE_INIT_PRIORITY1 AggSpec_AggSpecGroupDefaultTypeInternal _AggSpec_AggSpecGroup_default_instance_;
-      template <typename>
-PROTOBUF_CONSTEXPR AggSpec_AggSpecFreeze::AggSpec_AggSpecFreeze(::_pbi::ConstantInitialized) {}
-struct AggSpec_AggSpecFreezeDefaultTypeInternal {
-  PROTOBUF_CONSTEXPR AggSpec_AggSpecFreezeDefaultTypeInternal() : _instance(::_pbi::ConstantInitialized{}) {}
-  ~AggSpec_AggSpecFreezeDefaultTypeInternal() {}
-  union {
-    AggSpec_AggSpecFreeze _instance;
-  };
-};
-
-PROTOBUF_ATTRIBUTE_NO_DESTROY PROTOBUF_CONSTINIT
-    PROTOBUF_ATTRIBUTE_INIT_PRIORITY1 AggSpec_AggSpecFreezeDefaultTypeInternal _AggSpec_AggSpecFreeze_default_instance_;
-
-inline constexpr AggSpec_AggSpecFormula::Impl_::Impl_(
-    ::_pbi::ConstantInitialized) noexcept
-      : formula_(
-            &::google::protobuf::internal::fixed_address_empty_string,
-            ::_pbi::ConstantInitialized()),
-        param_token_(
-            &::google::protobuf::internal::fixed_address_empty_string,
-            ::_pbi::ConstantInitialized()),
-        _cached_size_{0} {}
-
-template <typename>
-PROTOBUF_CONSTEXPR AggSpec_AggSpecFormula::AggSpec_AggSpecFormula(::_pbi::ConstantInitialized)
-    : _impl_(::_pbi::ConstantInitialized()) {}
-struct AggSpec_AggSpecFormulaDefaultTypeInternal {
-  PROTOBUF_CONSTEXPR AggSpec_AggSpecFormulaDefaultTypeInternal() : _instance(::_pbi::ConstantInitialized{}) {}
-  ~AggSpec_AggSpecFormulaDefaultTypeInternal() {}
-  union {
-    AggSpec_AggSpecFormula _instance;
-  };
-};
-
-PROTOBUF_ATTRIBUTE_NO_DESTROY PROTOBUF_CONSTINIT
-    PROTOBUF_ATTRIBUTE_INIT_PRIORITY1 AggSpec_AggSpecFormulaDefaultTypeInternal _AggSpec_AggSpecFormula_default_instance_;
-      template <typename>
-PROTOBUF_CONSTEXPR AggSpec_AggSpecFirst::AggSpec_AggSpecFirst(::_pbi::ConstantInitialized) {}
-struct AggSpec_AggSpecFirstDefaultTypeInternal {
-  PROTOBUF_CONSTEXPR AggSpec_AggSpecFirstDefaultTypeInternal() : _instance(::_pbi::ConstantInitialized{}) {}
-  ~AggSpec_AggSpecFirstDefaultTypeInternal() {}
-  union {
-    AggSpec_AggSpecFirst _instance;
-  };
-};
-
-PROTOBUF_ATTRIBUTE_NO_DESTROY PROTOBUF_CONSTINIT
-    PROTOBUF_ATTRIBUTE_INIT_PRIORITY1 AggSpec_AggSpecFirstDefaultTypeInternal _AggSpec_AggSpecFirst_default_instance_;
-
-inline constexpr AggSpec_AggSpecDistinct::Impl_::Impl_(
-    ::_pbi::ConstantInitialized) noexcept
-      : include_nulls_{false},
-        _cached_size_{0} {}
-
-template <typename>
-PROTOBUF_CONSTEXPR AggSpec_AggSpecDistinct::AggSpec_AggSpecDistinct(::_pbi::ConstantInitialized)
-    : _impl_(::_pbi::ConstantInitialized()) {}
-struct AggSpec_AggSpecDistinctDefaultTypeInternal {
-  PROTOBUF_CONSTEXPR AggSpec_AggSpecDistinctDefaultTypeInternal() : _instance(::_pbi::ConstantInitialized{}) {}
-  ~AggSpec_AggSpecDistinctDefaultTypeInternal() {}
-  union {
-    AggSpec_AggSpecDistinct _instance;
-  };
-};
-
-PROTOBUF_ATTRIBUTE_NO_DESTROY PROTOBUF_CONSTINIT
-    PROTOBUF_ATTRIBUTE_INIT_PRIORITY1 AggSpec_AggSpecDistinctDefaultTypeInternal _AggSpec_AggSpecDistinct_default_instance_;
-
-inline constexpr AggSpec_AggSpecCountDistinct::Impl_::Impl_(
-    ::_pbi::ConstantInitialized) noexcept
-      : count_nulls_{false},
-        _cached_size_{0} {}
-
-template <typename>
-PROTOBUF_CONSTEXPR AggSpec_AggSpecCountDistinct::AggSpec_AggSpecCountDistinct(::_pbi::ConstantInitialized)
-    : _impl_(::_pbi::ConstantInitialized()) {}
-struct AggSpec_AggSpecCountDistinctDefaultTypeInternal {
-  PROTOBUF_CONSTEXPR AggSpec_AggSpecCountDistinctDefaultTypeInternal() : _instance(::_pbi::ConstantInitialized{}) {}
-  ~AggSpec_AggSpecCountDistinctDefaultTypeInternal() {}
-  union {
-    AggSpec_AggSpecCountDistinct _instance;
-  };
-};
-
-PROTOBUF_ATTRIBUTE_NO_DESTROY PROTOBUF_CONSTINIT
-    PROTOBUF_ATTRIBUTE_INIT_PRIORITY1 AggSpec_AggSpecCountDistinctDefaultTypeInternal _AggSpec_AggSpecCountDistinct_default_instance_;
-      template <typename>
-PROTOBUF_CONSTEXPR AggSpec_AggSpecAvg::AggSpec_AggSpecAvg(::_pbi::ConstantInitialized) {}
-struct AggSpec_AggSpecAvgDefaultTypeInternal {
-  PROTOBUF_CONSTEXPR AggSpec_AggSpecAvgDefaultTypeInternal() : _instance(::_pbi::ConstantInitialized{}) {}
-  ~AggSpec_AggSpecAvgDefaultTypeInternal() {}
-  union {
-    AggSpec_AggSpecAvg _instance;
-  };
-};
-
-PROTOBUF_ATTRIBUTE_NO_DESTROY PROTOBUF_CONSTINIT
-    PROTOBUF_ATTRIBUTE_INIT_PRIORITY1 AggSpec_AggSpecAvgDefaultTypeInternal _AggSpec_AggSpecAvg_default_instance_;
-
-inline constexpr AggSpec_AggSpecApproximatePercentile::Impl_::Impl_(
-    ::_pbi::ConstantInitialized) noexcept
-      : _cached_size_{0},
-        percentile_{0},
-        compression_{0} {}
-
-template <typename>
-PROTOBUF_CONSTEXPR AggSpec_AggSpecApproximatePercentile::AggSpec_AggSpecApproximatePercentile(::_pbi::ConstantInitialized)
-    : _impl_(::_pbi::ConstantInitialized()) {}
-struct AggSpec_AggSpecApproximatePercentileDefaultTypeInternal {
-  PROTOBUF_CONSTEXPR AggSpec_AggSpecApproximatePercentileDefaultTypeInternal() : _instance(::_pbi::ConstantInitialized{}) {}
-  ~AggSpec_AggSpecApproximatePercentileDefaultTypeInternal() {}
-  union {
-    AggSpec_AggSpecApproximatePercentile _instance;
-  };
-};
-
-PROTOBUF_ATTRIBUTE_NO_DESTROY PROTOBUF_CONSTINIT
-    PROTOBUF_ATTRIBUTE_INIT_PRIORITY1 AggSpec_AggSpecApproximatePercentileDefaultTypeInternal _AggSpec_AggSpecApproximatePercentile_default_instance_;
-      template <typename>
-PROTOBUF_CONSTEXPR AggSpec_AggSpecAbsSum::AggSpec_AggSpecAbsSum(::_pbi::ConstantInitialized) {}
-struct AggSpec_AggSpecAbsSumDefaultTypeInternal {
-  PROTOBUF_CONSTEXPR AggSpec_AggSpecAbsSumDefaultTypeInternal() : _instance(::_pbi::ConstantInitialized{}) {}
-  ~AggSpec_AggSpecAbsSumDefaultTypeInternal() {}
-  union {
-    AggSpec_AggSpecAbsSum _instance;
-  };
-};
-
-PROTOBUF_ATTRIBUTE_NO_DESTROY PROTOBUF_CONSTINIT
-    PROTOBUF_ATTRIBUTE_INIT_PRIORITY1 AggSpec_AggSpecAbsSumDefaultTypeInternal _AggSpec_AggSpecAbsSum_default_instance_;
-
-inline constexpr Value::Impl_::Impl_(
-    ::_pbi::ConstantInitialized) noexcept
-      : data_{},
-        _cached_size_{0},
-        _oneof_case_{} {}
-
-template <typename>
-PROTOBUF_CONSTEXPR Value::Value(::_pbi::ConstantInitialized)
-    : _impl_(::_pbi::ConstantInitialized()) {}
-struct ValueDefaultTypeInternal {
-  PROTOBUF_CONSTEXPR ValueDefaultTypeInternal() : _instance(::_pbi::ConstantInitialized{}) {}
-  ~ValueDefaultTypeInternal() {}
-  union {
-    Value _instance;
-  };
-};
-
-PROTOBUF_ATTRIBUTE_NO_DESTROY PROTOBUF_CONSTINIT
-    PROTOBUF_ATTRIBUTE_INIT_PRIORITY1 ValueDefaultTypeInternal _Value_default_instance_;
-
-inline constexpr UpdateByWindowScale::Impl_::Impl_(
-    ::_pbi::ConstantInitialized) noexcept
-      : type_{},
-        _cached_size_{0},
-        _oneof_case_{} {}
-
-template <typename>
-PROTOBUF_CONSTEXPR UpdateByWindowScale::UpdateByWindowScale(::_pbi::ConstantInitialized)
-    : _impl_(::_pbi::ConstantInitialized()) {}
-struct UpdateByWindowScaleDefaultTypeInternal {
-  PROTOBUF_CONSTEXPR UpdateByWindowScaleDefaultTypeInternal() : _instance(::_pbi::ConstantInitialized{}) {}
-  ~UpdateByWindowScaleDefaultTypeInternal() {}
-  union {
-    UpdateByWindowScale _instance;
-  };
-};
-
-PROTOBUF_ATTRIBUTE_NO_DESTROY PROTOBUF_CONSTINIT
-    PROTOBUF_ATTRIBUTE_INIT_PRIORITY1 UpdateByWindowScaleDefaultTypeInternal _UpdateByWindowScale_default_instance_;
-
-inline constexpr UpdateByRequest_UpdateByOptions::Impl_::Impl_(
-    ::_pbi::ConstantInitialized) noexcept
-      : _cached_size_{0},
-        math_context_{nullptr},
-        use_redirection_{false},
-        chunk_capacity_{0},
-        max_static_sparse_memory_overhead_{0},
-        maximum_load_factor_{0},
-        target_load_factor_{0},
-        initial_hash_table_size_{0} {}
-
-template <typename>
-PROTOBUF_CONSTEXPR UpdateByRequest_UpdateByOptions::UpdateByRequest_UpdateByOptions(::_pbi::ConstantInitialized)
-    : _impl_(::_pbi::ConstantInitialized()) {}
-struct UpdateByRequest_UpdateByOptionsDefaultTypeInternal {
-  PROTOBUF_CONSTEXPR UpdateByRequest_UpdateByOptionsDefaultTypeInternal() : _instance(::_pbi::ConstantInitialized{}) {}
-  ~UpdateByRequest_UpdateByOptionsDefaultTypeInternal() {}
-  union {
-    UpdateByRequest_UpdateByOptions _instance;
-  };
-};
-
-PROTOBUF_ATTRIBUTE_NO_DESTROY PROTOBUF_CONSTINIT
-    PROTOBUF_ATTRIBUTE_INIT_PRIORITY1 UpdateByRequest_UpdateByOptionsDefaultTypeInternal _UpdateByRequest_UpdateByOptions_default_instance_;
-
-inline constexpr UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByDelta::Impl_::Impl_(
-    ::_pbi::ConstantInitialized) noexcept
-      : _cached_size_{0},
-        options_{nullptr} {}
-
-template <typename>
-PROTOBUF_CONSTEXPR UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByDelta::UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByDelta(::_pbi::ConstantInitialized)
-    : _impl_(::_pbi::ConstantInitialized()) {}
-struct UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByDeltaDefaultTypeInternal {
-  PROTOBUF_CONSTEXPR UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByDeltaDefaultTypeInternal() : _instance(::_pbi::ConstantInitialized{}) {}
-  ~UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByDeltaDefaultTypeInternal() {}
-  union {
-    UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByDelta _instance;
-  };
-};
-
-PROTOBUF_ATTRIBUTE_NO_DESTROY PROTOBUF_CONSTINIT
-    PROTOBUF_ATTRIBUTE_INIT_PRIORITY1 UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByDeltaDefaultTypeInternal _UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByDelta_default_instance_;
-
-inline constexpr UpdateByEmOptions::Impl_::Impl_(
-    ::_pbi::ConstantInitialized) noexcept
-      : _cached_size_{0},
-        big_value_context_{nullptr},
-        on_null_value_{static_cast< ::io::deephaven::proto::backplane::grpc::BadDataBehavior >(0)},
-        on_nan_value_{static_cast< ::io::deephaven::proto::backplane::grpc::BadDataBehavior >(0)},
-        on_null_time_{static_cast< ::io::deephaven::proto::backplane::grpc::BadDataBehavior >(0)},
-        on_negative_delta_time_{static_cast< ::io::deephaven::proto::backplane::grpc::BadDataBehavior >(0)},
-        on_zero_delta_time_{static_cast< ::io::deephaven::proto::backplane::grpc::BadDataBehavior >(0)} {}
-
-template <typename>
-PROTOBUF_CONSTEXPR UpdateByEmOptions::UpdateByEmOptions(::_pbi::ConstantInitialized)
-    : _impl_(::_pbi::ConstantInitialized()) {}
-struct UpdateByEmOptionsDefaultTypeInternal {
-  PROTOBUF_CONSTEXPR UpdateByEmOptionsDefaultTypeInternal() : _instance(::_pbi::ConstantInitialized{}) {}
-  ~UpdateByEmOptionsDefaultTypeInternal() {}
-  union {
-    UpdateByEmOptions _instance;
-  };
-};
-
-PROTOBUF_ATTRIBUTE_NO_DESTROY PROTOBUF_CONSTINIT
-    PROTOBUF_ATTRIBUTE_INIT_PRIORITY1 UpdateByEmOptionsDefaultTypeInternal _UpdateByEmOptions_default_instance_;
-
-inline constexpr TimeTableRequest::Impl_::Impl_(
-    ::_pbi::ConstantInitialized) noexcept
-      : _cached_size_{0},
-        result_id_{nullptr},
-        blink_table_{false},
-        start_time_{},
-        period_{},
-        _oneof_case_{} {}
-
-template <typename>
-PROTOBUF_CONSTEXPR TimeTableRequest::TimeTableRequest(::_pbi::ConstantInitialized)
-    : _impl_(::_pbi::ConstantInitialized()) {}
-struct TimeTableRequestDefaultTypeInternal {
-  PROTOBUF_CONSTEXPR TimeTableRequestDefaultTypeInternal() : _instance(::_pbi::ConstantInitialized{}) {}
-  ~TimeTableRequestDefaultTypeInternal() {}
-  union {
-    TimeTableRequest _instance;
-  };
-};
-
-PROTOBUF_ATTRIBUTE_NO_DESTROY PROTOBUF_CONSTINIT
-    PROTOBUF_ATTRIBUTE_INIT_PRIORITY1 TimeTableRequestDefaultTypeInternal _TimeTableRequest_default_instance_;
-
-inline constexpr TableReference::Impl_::Impl_(
-    ::_pbi::ConstantInitialized) noexcept
-      : ref_{},
-        _cached_size_{0},
-        _oneof_case_{} {}
-
-template <typename>
-PROTOBUF_CONSTEXPR TableReference::TableReference(::_pbi::ConstantInitialized)
-    : _impl_(::_pbi::ConstantInitialized()) {}
-struct TableReferenceDefaultTypeInternal {
-  PROTOBUF_CONSTEXPR TableReferenceDefaultTypeInternal() : _instance(::_pbi::ConstantInitialized{}) {}
-  ~TableReferenceDefaultTypeInternal() {}
-  union {
-    TableReference _instance;
-  };
-};
-
-PROTOBUF_ATTRIBUTE_NO_DESTROY PROTOBUF_CONSTINIT
-    PROTOBUF_ATTRIBUTE_INIT_PRIORITY1 TableReferenceDefaultTypeInternal _TableReference_default_instance_;
-
-inline constexpr SeekRowRequest::Impl_::Impl_(
-    ::_pbi::ConstantInitialized) noexcept
-      : _cached_size_{0},
-        column_name_(
-            &::google::protobuf::internal::fixed_address_empty_string,
-            ::_pbi::ConstantInitialized()),
-        source_id_{nullptr},
-        seek_value_{nullptr},
-        starting_row_{::int64_t{0}},
-        insensitive_{false},
-        contains_{false},
-        is_backward_{false} {}
-
-template <typename>
-PROTOBUF_CONSTEXPR SeekRowRequest::SeekRowRequest(::_pbi::ConstantInitialized)
-    : _impl_(::_pbi::ConstantInitialized()) {}
-struct SeekRowRequestDefaultTypeInternal {
-  PROTOBUF_CONSTEXPR SeekRowRequestDefaultTypeInternal() : _instance(::_pbi::ConstantInitialized{}) {}
-  ~SeekRowRequestDefaultTypeInternal() {}
-  union {
-    SeekRowRequest _instance;
-  };
-};
-
-PROTOBUF_ATTRIBUTE_NO_DESTROY PROTOBUF_CONSTINIT
-    PROTOBUF_ATTRIBUTE_INIT_PRIORITY1 SeekRowRequestDefaultTypeInternal _SeekRowRequest_default_instance_;
-
-inline constexpr SearchCondition::Impl_::Impl_(
-    ::_pbi::ConstantInitialized) noexcept
-      : optional_references_{},
-        search_string_(
-            &::google::protobuf::internal::fixed_address_empty_string,
-            ::_pbi::ConstantInitialized()),
-        _cached_size_{0} {}
-
-template <typename>
-PROTOBUF_CONSTEXPR SearchCondition::SearchCondition(::_pbi::ConstantInitialized)
-    : _impl_(::_pbi::ConstantInitialized()) {}
-struct SearchConditionDefaultTypeInternal {
-  PROTOBUF_CONSTEXPR SearchConditionDefaultTypeInternal() : _instance(::_pbi::ConstantInitialized{}) {}
-  ~SearchConditionDefaultTypeInternal() {}
-  union {
-    SearchCondition _instance;
-  };
-};
-
-PROTOBUF_ATTRIBUTE_NO_DESTROY PROTOBUF_CONSTINIT
-    PROTOBUF_ATTRIBUTE_INIT_PRIORITY1 SearchConditionDefaultTypeInternal _SearchCondition_default_instance_;
-
-inline constexpr MatchesCondition::Impl_::Impl_(
-    ::_pbi::ConstantInitialized) noexcept
-      : _cached_size_{0},
-        regex_(
-            &::google::protobuf::internal::fixed_address_empty_string,
-            ::_pbi::ConstantInitialized()),
-        reference_{nullptr},
-        case_sensitivity_{static_cast< ::io::deephaven::proto::backplane::grpc::CaseSensitivity >(0)},
-        match_type_{static_cast< ::io::deephaven::proto::backplane::grpc::MatchType >(0)} {}
-
-template <typename>
-PROTOBUF_CONSTEXPR MatchesCondition::MatchesCondition(::_pbi::ConstantInitialized)
-    : _impl_(::_pbi::ConstantInitialized()) {}
-struct MatchesConditionDefaultTypeInternal {
-  PROTOBUF_CONSTEXPR MatchesConditionDefaultTypeInternal() : _instance(::_pbi::ConstantInitialized{}) {}
-  ~MatchesConditionDefaultTypeInternal() {}
-  union {
-    MatchesCondition _instance;
-  };
-};
-
-PROTOBUF_ATTRIBUTE_NO_DESTROY PROTOBUF_CONSTINIT
-    PROTOBUF_ATTRIBUTE_INIT_PRIORITY1 MatchesConditionDefaultTypeInternal _MatchesCondition_default_instance_;
-
-inline constexpr IsNullCondition::Impl_::Impl_(
-    ::_pbi::ConstantInitialized) noexcept
-      : _cached_size_{0},
-        reference_{nullptr} {}
-
-template <typename>
-PROTOBUF_CONSTEXPR IsNullCondition::IsNullCondition(::_pbi::ConstantInitialized)
-    : _impl_(::_pbi::ConstantInitialized()) {}
-struct IsNullConditionDefaultTypeInternal {
-  PROTOBUF_CONSTEXPR IsNullConditionDefaultTypeInternal() : _instance(::_pbi::ConstantInitialized{}) {}
-  ~IsNullConditionDefaultTypeInternal() {}
-  union {
-    IsNullCondition _instance;
-  };
-};
-
-PROTOBUF_ATTRIBUTE_NO_DESTROY PROTOBUF_CONSTINIT
-    PROTOBUF_ATTRIBUTE_INIT_PRIORITY1 IsNullConditionDefaultTypeInternal _IsNullCondition_default_instance_;
-
-inline constexpr ExportedTableUpdateMessage::Impl_::Impl_(
-    ::_pbi::ConstantInitialized) noexcept
-      : _cached_size_{0},
-        update_failure_message_(
-            &::google::protobuf::internal::fixed_address_empty_string,
-            ::_pbi::ConstantInitialized()),
-        export_id_{nullptr},
-        size_{::int64_t{0}} {}
-
-template <typename>
-PROTOBUF_CONSTEXPR ExportedTableUpdateMessage::ExportedTableUpdateMessage(::_pbi::ConstantInitialized)
-    : _impl_(::_pbi::ConstantInitialized()) {}
-struct ExportedTableUpdateMessageDefaultTypeInternal {
-  PROTOBUF_CONSTEXPR ExportedTableUpdateMessageDefaultTypeInternal() : _instance(::_pbi::ConstantInitialized{}) {}
-  ~ExportedTableUpdateMessageDefaultTypeInternal() {}
-  union {
-    ExportedTableUpdateMessage _instance;
-  };
-};
-
-PROTOBUF_ATTRIBUTE_NO_DESTROY PROTOBUF_CONSTINIT
-    PROTOBUF_ATTRIBUTE_INIT_PRIORITY1 ExportedTableUpdateMessageDefaultTypeInternal _ExportedTableUpdateMessage_default_instance_;
-
-inline constexpr EmptyTableRequest::Impl_::Impl_(
-    ::_pbi::ConstantInitialized) noexcept
-      : _cached_size_{0},
-        result_id_{nullptr},
-        size_{::int64_t{0}} {}
-
-template <typename>
-PROTOBUF_CONSTEXPR EmptyTableRequest::EmptyTableRequest(::_pbi::ConstantInitialized)
-    : _impl_(::_pbi::ConstantInitialized()) {}
-struct EmptyTableRequestDefaultTypeInternal {
-  PROTOBUF_CONSTEXPR EmptyTableRequestDefaultTypeInternal() : _instance(::_pbi::ConstantInitialized{}) {}
-  ~EmptyTableRequestDefaultTypeInternal() {}
-  union {
-    EmptyTableRequest _instance;
-  };
-};
-
-PROTOBUF_ATTRIBUTE_NO_DESTROY PROTOBUF_CONSTINIT
-    PROTOBUF_ATTRIBUTE_INIT_PRIORITY1 EmptyTableRequestDefaultTypeInternal _EmptyTableRequest_default_instance_;
-
-inline constexpr CreateInputTableRequest_InputTableKind::Impl_::Impl_(
-    ::_pbi::ConstantInitialized) noexcept
-      : kind_{},
-        _cached_size_{0},
-        _oneof_case_{} {}
-
-template <typename>
-PROTOBUF_CONSTEXPR CreateInputTableRequest_InputTableKind::CreateInputTableRequest_InputTableKind(::_pbi::ConstantInitialized)
-    : _impl_(::_pbi::ConstantInitialized()) {}
-struct CreateInputTableRequest_InputTableKindDefaultTypeInternal {
-  PROTOBUF_CONSTEXPR CreateInputTableRequest_InputTableKindDefaultTypeInternal() : _instance(::_pbi::ConstantInitialized{}) {}
-  ~CreateInputTableRequest_InputTableKindDefaultTypeInternal() {}
-  union {
-    CreateInputTableRequest_InputTableKind _instance;
-  };
-};
-
-PROTOBUF_ATTRIBUTE_NO_DESTROY PROTOBUF_CONSTINIT
-    PROTOBUF_ATTRIBUTE_INIT_PRIORITY1 CreateInputTableRequest_InputTableKindDefaultTypeInternal _CreateInputTableRequest_InputTableKind_default_instance_;
-
-inline constexpr ContainsCondition::Impl_::Impl_(
-    ::_pbi::ConstantInitialized) noexcept
-      : _cached_size_{0},
-        search_string_(
-            &::google::protobuf::internal::fixed_address_empty_string,
-            ::_pbi::ConstantInitialized()),
-        reference_{nullptr},
-        case_sensitivity_{static_cast< ::io::deephaven::proto::backplane::grpc::CaseSensitivity >(0)},
-        match_type_{static_cast< ::io::deephaven::proto::backplane::grpc::MatchType >(0)} {}
-
-template <typename>
-PROTOBUF_CONSTEXPR ContainsCondition::ContainsCondition(::_pbi::ConstantInitialized)
-    : _impl_(::_pbi::ConstantInitialized()) {}
-struct ContainsConditionDefaultTypeInternal {
-  PROTOBUF_CONSTEXPR ContainsConditionDefaultTypeInternal() : _instance(::_pbi::ConstantInitialized{}) {}
-  ~ContainsConditionDefaultTypeInternal() {}
-  union {
-    ContainsCondition _instance;
-  };
-};
-
-PROTOBUF_ATTRIBUTE_NO_DESTROY PROTOBUF_CONSTINIT
-    PROTOBUF_ATTRIBUTE_INIT_PRIORITY1 ContainsConditionDefaultTypeInternal _ContainsCondition_default_instance_;
-
-inline constexpr AggSpec_AggSpecUnique::Impl_::Impl_(
-    ::_pbi::ConstantInitialized) noexcept
-      : _cached_size_{0},
-        non_unique_sentinel_{nullptr},
-        include_nulls_{false} {}
-
-template <typename>
-PROTOBUF_CONSTEXPR AggSpec_AggSpecUnique::AggSpec_AggSpecUnique(::_pbi::ConstantInitialized)
-    : _impl_(::_pbi::ConstantInitialized()) {}
-struct AggSpec_AggSpecUniqueDefaultTypeInternal {
-  PROTOBUF_CONSTEXPR AggSpec_AggSpecUniqueDefaultTypeInternal() : _instance(::_pbi::ConstantInitialized{}) {}
-  ~AggSpec_AggSpecUniqueDefaultTypeInternal() {}
-  union {
-    AggSpec_AggSpecUnique _instance;
-  };
-};
-
-PROTOBUF_ATTRIBUTE_NO_DESTROY PROTOBUF_CONSTINIT
-    PROTOBUF_ATTRIBUTE_INIT_PRIORITY1 AggSpec_AggSpecUniqueDefaultTypeInternal _AggSpec_AggSpecUnique_default_instance_;
-
-inline constexpr AggSpec_AggSpecSorted::Impl_::Impl_(
-    ::_pbi::ConstantInitialized) noexcept
-      : columns_{},
-        _cached_size_{0} {}
-
-template <typename>
-PROTOBUF_CONSTEXPR AggSpec_AggSpecSorted::AggSpec_AggSpecSorted(::_pbi::ConstantInitialized)
-    : _impl_(::_pbi::ConstantInitialized()) {}
-struct AggSpec_AggSpecSortedDefaultTypeInternal {
-  PROTOBUF_CONSTEXPR AggSpec_AggSpecSortedDefaultTypeInternal() : _instance(::_pbi::ConstantInitialized{}) {}
-  ~AggSpec_AggSpecSortedDefaultTypeInternal() {}
-  union {
-    AggSpec_AggSpecSorted _instance;
-  };
-};
-
-PROTOBUF_ATTRIBUTE_NO_DESTROY PROTOBUF_CONSTINIT
-    PROTOBUF_ATTRIBUTE_INIT_PRIORITY1 AggSpec_AggSpecSortedDefaultTypeInternal _AggSpec_AggSpecSorted_default_instance_;
-
-inline constexpr WhereInRequest::Impl_::Impl_(
-    ::_pbi::ConstantInitialized) noexcept
-      : _cached_size_{0},
-        columns_to_match_{},
-        result_id_{nullptr},
-        left_id_{nullptr},
-        right_id_{nullptr},
-        inverted_{false} {}
-
-template <typename>
-PROTOBUF_CONSTEXPR WhereInRequest::WhereInRequest(::_pbi::ConstantInitialized)
-    : _impl_(::_pbi::ConstantInitialized()) {}
-struct WhereInRequestDefaultTypeInternal {
-  PROTOBUF_CONSTEXPR WhereInRequestDefaultTypeInternal() : _instance(::_pbi::ConstantInitialized{}) {}
-  ~WhereInRequestDefaultTypeInternal() {}
-  union {
-    WhereInRequest _instance;
-  };
-};
-
-PROTOBUF_ATTRIBUTE_NO_DESTROY PROTOBUF_CONSTINIT
-    PROTOBUF_ATTRIBUTE_INIT_PRIORITY1 WhereInRequestDefaultTypeInternal _WhereInRequest_default_instance_;
-
-inline constexpr UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingWAvg::Impl_::Impl_(
-    ::_pbi::ConstantInitialized) noexcept
-      : _cached_size_{0},
-        weight_column_(
-            &::google::protobuf::internal::fixed_address_empty_string,
-            ::_pbi::ConstantInitialized()),
-        reverse_window_scale_{nullptr},
-        forward_window_scale_{nullptr} {}
-
-template <typename>
-PROTOBUF_CONSTEXPR UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingWAvg::UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingWAvg(::_pbi::ConstantInitialized)
-    : _impl_(::_pbi::ConstantInitialized()) {}
-struct UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingWAvgDefaultTypeInternal {
-  PROTOBUF_CONSTEXPR UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingWAvgDefaultTypeInternal() : _instance(::_pbi::ConstantInitialized{}) {}
-  ~UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingWAvgDefaultTypeInternal() {}
-  union {
-    UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingWAvg _instance;
-  };
-};
-
-PROTOBUF_ATTRIBUTE_NO_DESTROY PROTOBUF_CONSTINIT
-    PROTOBUF_ATTRIBUTE_INIT_PRIORITY1 UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingWAvgDefaultTypeInternal _UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingWAvg_default_instance_;
-
-inline constexpr UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingSum::Impl_::Impl_(
-    ::_pbi::ConstantInitialized) noexcept
-      : _cached_size_{0},
-        reverse_window_scale_{nullptr},
-        forward_window_scale_{nullptr} {}
-
-template <typename>
-PROTOBUF_CONSTEXPR UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingSum::UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingSum(::_pbi::ConstantInitialized)
-    : _impl_(::_pbi::ConstantInitialized()) {}
-struct UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingSumDefaultTypeInternal {
-  PROTOBUF_CONSTEXPR UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingSumDefaultTypeInternal() : _instance(::_pbi::ConstantInitialized{}) {}
-  ~UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingSumDefaultTypeInternal() {}
-  union {
-    UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingSum _instance;
-  };
-};
-
-PROTOBUF_ATTRIBUTE_NO_DESTROY PROTOBUF_CONSTINIT
-    PROTOBUF_ATTRIBUTE_INIT_PRIORITY1 UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingSumDefaultTypeInternal _UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingSum_default_instance_;
-
-inline constexpr UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingStd::Impl_::Impl_(
-    ::_pbi::ConstantInitialized) noexcept
-      : _cached_size_{0},
-        reverse_window_scale_{nullptr},
-        forward_window_scale_{nullptr} {}
-
-template <typename>
-PROTOBUF_CONSTEXPR UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingStd::UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingStd(::_pbi::ConstantInitialized)
-    : _impl_(::_pbi::ConstantInitialized()) {}
-struct UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingStdDefaultTypeInternal {
-  PROTOBUF_CONSTEXPR UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingStdDefaultTypeInternal() : _instance(::_pbi::ConstantInitialized{}) {}
-  ~UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingStdDefaultTypeInternal() {}
-  union {
-    UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingStd _instance;
-  };
-};
-
-PROTOBUF_ATTRIBUTE_NO_DESTROY PROTOBUF_CONSTINIT
-    PROTOBUF_ATTRIBUTE_INIT_PRIORITY1 UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingStdDefaultTypeInternal _UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingStd_default_instance_;
-
-inline constexpr UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingProduct::Impl_::Impl_(
-    ::_pbi::ConstantInitialized) noexcept
-      : _cached_size_{0},
-        reverse_window_scale_{nullptr},
-        forward_window_scale_{nullptr} {}
-
-template <typename>
-PROTOBUF_CONSTEXPR UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingProduct::UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingProduct(::_pbi::ConstantInitialized)
-    : _impl_(::_pbi::ConstantInitialized()) {}
-struct UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingProductDefaultTypeInternal {
-  PROTOBUF_CONSTEXPR UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingProductDefaultTypeInternal() : _instance(::_pbi::ConstantInitialized{}) {}
-  ~UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingProductDefaultTypeInternal() {}
-  union {
-    UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingProduct _instance;
-  };
-};
-
-PROTOBUF_ATTRIBUTE_NO_DESTROY PROTOBUF_CONSTINIT
-    PROTOBUF_ATTRIBUTE_INIT_PRIORITY1 UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingProductDefaultTypeInternal _UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingProduct_default_instance_;
-
-inline constexpr UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingMin::Impl_::Impl_(
-    ::_pbi::ConstantInitialized) noexcept
-      : _cached_size_{0},
-        reverse_window_scale_{nullptr},
-        forward_window_scale_{nullptr} {}
-
-template <typename>
-PROTOBUF_CONSTEXPR UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingMin::UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingMin(::_pbi::ConstantInitialized)
-    : _impl_(::_pbi::ConstantInitialized()) {}
-struct UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingMinDefaultTypeInternal {
-  PROTOBUF_CONSTEXPR UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingMinDefaultTypeInternal() : _instance(::_pbi::ConstantInitialized{}) {}
-  ~UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingMinDefaultTypeInternal() {}
-  union {
-    UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingMin _instance;
-  };
-};
-
-PROTOBUF_ATTRIBUTE_NO_DESTROY PROTOBUF_CONSTINIT
-    PROTOBUF_ATTRIBUTE_INIT_PRIORITY1 UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingMinDefaultTypeInternal _UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingMin_default_instance_;
-
-inline constexpr UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingMax::Impl_::Impl_(
-    ::_pbi::ConstantInitialized) noexcept
-      : _cached_size_{0},
-        reverse_window_scale_{nullptr},
-        forward_window_scale_{nullptr} {}
-
-template <typename>
-PROTOBUF_CONSTEXPR UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingMax::UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingMax(::_pbi::ConstantInitialized)
-    : _impl_(::_pbi::ConstantInitialized()) {}
-struct UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingMaxDefaultTypeInternal {
-  PROTOBUF_CONSTEXPR UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingMaxDefaultTypeInternal() : _instance(::_pbi::ConstantInitialized{}) {}
-  ~UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingMaxDefaultTypeInternal() {}
-  union {
-    UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingMax _instance;
-  };
-};
-
-PROTOBUF_ATTRIBUTE_NO_DESTROY PROTOBUF_CONSTINIT
-    PROTOBUF_ATTRIBUTE_INIT_PRIORITY1 UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingMaxDefaultTypeInternal _UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingMax_default_instance_;
-
-inline constexpr UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingGroup::Impl_::Impl_(
-    ::_pbi::ConstantInitialized) noexcept
-      : _cached_size_{0},
-        reverse_window_scale_{nullptr},
-        forward_window_scale_{nullptr} {}
-
-template <typename>
-PROTOBUF_CONSTEXPR UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingGroup::UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingGroup(::_pbi::ConstantInitialized)
-    : _impl_(::_pbi::ConstantInitialized()) {}
-struct UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingGroupDefaultTypeInternal {
-  PROTOBUF_CONSTEXPR UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingGroupDefaultTypeInternal() : _instance(::_pbi::ConstantInitialized{}) {}
-  ~UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingGroupDefaultTypeInternal() {}
-  union {
-    UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingGroup _instance;
-  };
-};
-
-PROTOBUF_ATTRIBUTE_NO_DESTROY PROTOBUF_CONSTINIT
-    PROTOBUF_ATTRIBUTE_INIT_PRIORITY1 UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingGroupDefaultTypeInternal _UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingGroup_default_instance_;
-
-inline constexpr UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingFormula::Impl_::Impl_(
-    ::_pbi::ConstantInitialized) noexcept
-      : _cached_size_{0},
-        formula_(
-            &::google::protobuf::internal::fixed_address_empty_string,
-            ::_pbi::ConstantInitialized()),
-        param_token_(
-            &::google::protobuf::internal::fixed_address_empty_string,
-            ::_pbi::ConstantInitialized()),
-        reverse_window_scale_{nullptr},
-        forward_window_scale_{nullptr} {}
-
-template <typename>
-PROTOBUF_CONSTEXPR UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingFormula::UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingFormula(::_pbi::ConstantInitialized)
-    : _impl_(::_pbi::ConstantInitialized()) {}
-struct UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingFormulaDefaultTypeInternal {
-  PROTOBUF_CONSTEXPR UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingFormulaDefaultTypeInternal() : _instance(::_pbi::ConstantInitialized{}) {}
-  ~UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingFormulaDefaultTypeInternal() {}
-  union {
-    UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingFormula _instance;
-  };
-};
-
-PROTOBUF_ATTRIBUTE_NO_DESTROY PROTOBUF_CONSTINIT
-    PROTOBUF_ATTRIBUTE_INIT_PRIORITY1 UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingFormulaDefaultTypeInternal _UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingFormula_default_instance_;
-
-inline constexpr UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingCount::Impl_::Impl_(
-    ::_pbi::ConstantInitialized) noexcept
-      : _cached_size_{0},
-        reverse_window_scale_{nullptr},
-        forward_window_scale_{nullptr} {}
-
-template <typename>
-PROTOBUF_CONSTEXPR UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingCount::UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingCount(::_pbi::ConstantInitialized)
-    : _impl_(::_pbi::ConstantInitialized()) {}
-struct UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingCountDefaultTypeInternal {
-  PROTOBUF_CONSTEXPR UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingCountDefaultTypeInternal() : _instance(::_pbi::ConstantInitialized{}) {}
-  ~UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingCountDefaultTypeInternal() {}
-  union {
-    UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingCount _instance;
-  };
-};
-
-PROTOBUF_ATTRIBUTE_NO_DESTROY PROTOBUF_CONSTINIT
-    PROTOBUF_ATTRIBUTE_INIT_PRIORITY1 UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingCountDefaultTypeInternal _UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingCount_default_instance_;
-
-inline constexpr UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingAvg::Impl_::Impl_(
-    ::_pbi::ConstantInitialized) noexcept
-      : _cached_size_{0},
-        reverse_window_scale_{nullptr},
-        forward_window_scale_{nullptr} {}
-
-template <typename>
-PROTOBUF_CONSTEXPR UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingAvg::UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingAvg(::_pbi::ConstantInitialized)
-    : _impl_(::_pbi::ConstantInitialized()) {}
-struct UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingAvgDefaultTypeInternal {
-  PROTOBUF_CONSTEXPR UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingAvgDefaultTypeInternal() : _instance(::_pbi::ConstantInitialized{}) {}
-  ~UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingAvgDefaultTypeInternal() {}
-  union {
-    UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingAvg _instance;
-  };
-};
-
-PROTOBUF_ATTRIBUTE_NO_DESTROY PROTOBUF_CONSTINIT
-    PROTOBUF_ATTRIBUTE_INIT_PRIORITY1 UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingAvgDefaultTypeInternal _UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingAvg_default_instance_;
-
-inline constexpr UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByEms::Impl_::Impl_(
-    ::_pbi::ConstantInitialized) noexcept
-      : _cached_size_{0},
-        options_{nullptr},
-        window_scale_{nullptr} {}
-
-template <typename>
-PROTOBUF_CONSTEXPR UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByEms::UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByEms(::_pbi::ConstantInitialized)
-    : _impl_(::_pbi::ConstantInitialized()) {}
-struct UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByEmsDefaultTypeInternal {
-  PROTOBUF_CONSTEXPR UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByEmsDefaultTypeInternal() : _instance(::_pbi::ConstantInitialized{}) {}
-  ~UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByEmsDefaultTypeInternal() {}
-  union {
-    UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByEms _instance;
-  };
-};
-
-PROTOBUF_ATTRIBUTE_NO_DESTROY PROTOBUF_CONSTINIT
-    PROTOBUF_ATTRIBUTE_INIT_PRIORITY1 UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByEmsDefaultTypeInternal _UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByEms_default_instance_;
-
-inline constexpr UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByEma::Impl_::Impl_(
-    ::_pbi::ConstantInitialized) noexcept
-      : _cached_size_{0},
-        options_{nullptr},
-        window_scale_{nullptr} {}
-
-template <typename>
-PROTOBUF_CONSTEXPR UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByEma::UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByEma(::_pbi::ConstantInitialized)
-    : _impl_(::_pbi::ConstantInitialized()) {}
-struct UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByEmaDefaultTypeInternal {
-  PROTOBUF_CONSTEXPR UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByEmaDefaultTypeInternal() : _instance(::_pbi::ConstantInitialized{}) {}
-  ~UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByEmaDefaultTypeInternal() {}
-  union {
-    UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByEma _instance;
-  };
-};
-
-PROTOBUF_ATTRIBUTE_NO_DESTROY PROTOBUF_CONSTINIT
-    PROTOBUF_ATTRIBUTE_INIT_PRIORITY1 UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByEmaDefaultTypeInternal _UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByEma_default_instance_;
-
-inline constexpr UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByEmStd::Impl_::Impl_(
-    ::_pbi::ConstantInitialized) noexcept
-      : _cached_size_{0},
-        options_{nullptr},
-        window_scale_{nullptr} {}
-
-template <typename>
-PROTOBUF_CONSTEXPR UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByEmStd::UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByEmStd(::_pbi::ConstantInitialized)
-    : _impl_(::_pbi::ConstantInitialized()) {}
-struct UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByEmStdDefaultTypeInternal {
-  PROTOBUF_CONSTEXPR UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByEmStdDefaultTypeInternal() : _instance(::_pbi::ConstantInitialized{}) {}
-  ~UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByEmStdDefaultTypeInternal() {}
-  union {
-    UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByEmStd _instance;
-  };
-};
-
-PROTOBUF_ATTRIBUTE_NO_DESTROY PROTOBUF_CONSTINIT
-    PROTOBUF_ATTRIBUTE_INIT_PRIORITY1 UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByEmStdDefaultTypeInternal _UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByEmStd_default_instance_;
-
-inline constexpr UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByEmMin::Impl_::Impl_(
-    ::_pbi::ConstantInitialized) noexcept
-      : _cached_size_{0},
-        options_{nullptr},
-        window_scale_{nullptr} {}
-
-template <typename>
-PROTOBUF_CONSTEXPR UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByEmMin::UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByEmMin(::_pbi::ConstantInitialized)
-    : _impl_(::_pbi::ConstantInitialized()) {}
-struct UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByEmMinDefaultTypeInternal {
-  PROTOBUF_CONSTEXPR UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByEmMinDefaultTypeInternal() : _instance(::_pbi::ConstantInitialized{}) {}
-  ~UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByEmMinDefaultTypeInternal() {}
-  union {
-    UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByEmMin _instance;
-  };
-};
-
-PROTOBUF_ATTRIBUTE_NO_DESTROY PROTOBUF_CONSTINIT
-    PROTOBUF_ATTRIBUTE_INIT_PRIORITY1 UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByEmMinDefaultTypeInternal _UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByEmMin_default_instance_;
-
-inline constexpr UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByEmMax::Impl_::Impl_(
-    ::_pbi::ConstantInitialized) noexcept
-      : _cached_size_{0},
-        options_{nullptr},
-        window_scale_{nullptr} {}
-
-template <typename>
-PROTOBUF_CONSTEXPR UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByEmMax::UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByEmMax(::_pbi::ConstantInitialized)
-    : _impl_(::_pbi::ConstantInitialized()) {}
-struct UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByEmMaxDefaultTypeInternal {
-  PROTOBUF_CONSTEXPR UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByEmMaxDefaultTypeInternal() : _instance(::_pbi::ConstantInitialized{}) {}
-  ~UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByEmMaxDefaultTypeInternal() {}
-  union {
-    UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByEmMax _instance;
-  };
-};
-
-PROTOBUF_ATTRIBUTE_NO_DESTROY PROTOBUF_CONSTINIT
-    PROTOBUF_ATTRIBUTE_INIT_PRIORITY1 UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByEmMaxDefaultTypeInternal _UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByEmMax_default_instance_;
-
-inline constexpr UnstructuredFilterTableRequest::Impl_::Impl_(
-    ::_pbi::ConstantInitialized) noexcept
-      : _cached_size_{0},
-        filters_{},
-        result_id_{nullptr},
-        source_id_{nullptr} {}
-
-template <typename>
-PROTOBUF_CONSTEXPR UnstructuredFilterTableRequest::UnstructuredFilterTableRequest(::_pbi::ConstantInitialized)
-    : _impl_(::_pbi::ConstantInitialized()) {}
-struct UnstructuredFilterTableRequestDefaultTypeInternal {
-  PROTOBUF_CONSTEXPR UnstructuredFilterTableRequestDefaultTypeInternal() : _instance(::_pbi::ConstantInitialized{}) {}
-  ~UnstructuredFilterTableRequestDefaultTypeInternal() {}
-  union {
-    UnstructuredFilterTableRequest _instance;
-  };
-};
-
-PROTOBUF_ATTRIBUTE_NO_DESTROY PROTOBUF_CONSTINIT
-    PROTOBUF_ATTRIBUTE_INIT_PRIORITY1 UnstructuredFilterTableRequestDefaultTypeInternal _UnstructuredFilterTableRequest_default_instance_;
-
-inline constexpr UngroupRequest::Impl_::Impl_(
-    ::_pbi::ConstantInitialized) noexcept
-      : _cached_size_{0},
-        columns_to_ungroup_{},
-        result_id_{nullptr},
-        source_id_{nullptr},
-        null_fill_{false} {}
-
-template <typename>
-PROTOBUF_CONSTEXPR UngroupRequest::UngroupRequest(::_pbi::ConstantInitialized)
-    : _impl_(::_pbi::ConstantInitialized()) {}
-struct UngroupRequestDefaultTypeInternal {
-  PROTOBUF_CONSTEXPR UngroupRequestDefaultTypeInternal() : _instance(::_pbi::ConstantInitialized{}) {}
-  ~UngroupRequestDefaultTypeInternal() {}
-  union {
-    UngroupRequest _instance;
-  };
-};
-
-PROTOBUF_ATTRIBUTE_NO_DESTROY PROTOBUF_CONSTINIT
-    PROTOBUF_ATTRIBUTE_INIT_PRIORITY1 UngroupRequestDefaultTypeInternal _UngroupRequest_default_instance_;
-
-inline constexpr SortTableRequest::Impl_::Impl_(
-    ::_pbi::ConstantInitialized) noexcept
-      : _cached_size_{0},
-        sorts_{},
-        result_id_{nullptr},
-        source_id_{nullptr} {}
-
-template <typename>
-PROTOBUF_CONSTEXPR SortTableRequest::SortTableRequest(::_pbi::ConstantInitialized)
-    : _impl_(::_pbi::ConstantInitialized()) {}
-struct SortTableRequestDefaultTypeInternal {
-  PROTOBUF_CONSTEXPR SortTableRequestDefaultTypeInternal() : _instance(::_pbi::ConstantInitialized{}) {}
-  ~SortTableRequestDefaultTypeInternal() {}
-  union {
-    SortTableRequest _instance;
-  };
-};
-
-PROTOBUF_ATTRIBUTE_NO_DESTROY PROTOBUF_CONSTINIT
-    PROTOBUF_ATTRIBUTE_INIT_PRIORITY1 SortTableRequestDefaultTypeInternal _SortTableRequest_default_instance_;
-
-inline constexpr SnapshotWhenTableRequest::Impl_::Impl_(
-    ::_pbi::ConstantInitialized) noexcept
-      : _cached_size_{0},
-        stamp_columns_{},
-        result_id_{nullptr},
-        base_id_{nullptr},
-        trigger_id_{nullptr},
-        initial_{false},
-        incremental_{false},
-        history_{false} {}
-
-template <typename>
-PROTOBUF_CONSTEXPR SnapshotWhenTableRequest::SnapshotWhenTableRequest(::_pbi::ConstantInitialized)
-    : _impl_(::_pbi::ConstantInitialized()) {}
-struct SnapshotWhenTableRequestDefaultTypeInternal {
-  PROTOBUF_CONSTEXPR SnapshotWhenTableRequestDefaultTypeInternal() : _instance(::_pbi::ConstantInitialized{}) {}
-  ~SnapshotWhenTableRequestDefaultTypeInternal() {}
-  union {
-    SnapshotWhenTableRequest _instance;
-  };
-};
-
-PROTOBUF_ATTRIBUTE_NO_DESTROY PROTOBUF_CONSTINIT
-    PROTOBUF_ATTRIBUTE_INIT_PRIORITY1 SnapshotWhenTableRequestDefaultTypeInternal _SnapshotWhenTableRequest_default_instance_;
-
-inline constexpr SnapshotTableRequest::Impl_::Impl_(
-    ::_pbi::ConstantInitialized) noexcept
-      : _cached_size_{0},
-        result_id_{nullptr},
-        source_id_{nullptr} {}
-
-template <typename>
-PROTOBUF_CONSTEXPR SnapshotTableRequest::SnapshotTableRequest(::_pbi::ConstantInitialized)
-    : _impl_(::_pbi::ConstantInitialized()) {}
-struct SnapshotTableRequestDefaultTypeInternal {
-  PROTOBUF_CONSTEXPR SnapshotTableRequestDefaultTypeInternal() : _instance(::_pbi::ConstantInitialized{}) {}
-  ~SnapshotTableRequestDefaultTypeInternal() {}
-  union {
-    SnapshotTableRequest _instance;
-  };
-};
-
-PROTOBUF_ATTRIBUTE_NO_DESTROY PROTOBUF_CONSTINIT
-    PROTOBUF_ATTRIBUTE_INIT_PRIORITY1 SnapshotTableRequestDefaultTypeInternal _SnapshotTableRequest_default_instance_;
-
-inline constexpr SelectOrUpdateRequest::Impl_::Impl_(
-    ::_pbi::ConstantInitialized) noexcept
-      : _cached_size_{0},
-        column_specs_{},
-        result_id_{nullptr},
-        source_id_{nullptr} {}
-
-template <typename>
-PROTOBUF_CONSTEXPR SelectOrUpdateRequest::SelectOrUpdateRequest(::_pbi::ConstantInitialized)
-    : _impl_(::_pbi::ConstantInitialized()) {}
-struct SelectOrUpdateRequestDefaultTypeInternal {
-  PROTOBUF_CONSTEXPR SelectOrUpdateRequestDefaultTypeInternal() : _instance(::_pbi::ConstantInitialized{}) {}
-  ~SelectOrUpdateRequestDefaultTypeInternal() {}
-  union {
-    SelectOrUpdateRequest _instance;
-  };
-};
-
-PROTOBUF_ATTRIBUTE_NO_DESTROY PROTOBUF_CONSTINIT
-    PROTOBUF_ATTRIBUTE_INIT_PRIORITY1 SelectOrUpdateRequestDefaultTypeInternal _SelectOrUpdateRequest_default_instance_;
-
-inline constexpr SelectDistinctRequest::Impl_::Impl_(
-    ::_pbi::ConstantInitialized) noexcept
-      : _cached_size_{0},
-        column_names_{},
-        result_id_{nullptr},
-        source_id_{nullptr} {}
-
-template <typename>
-PROTOBUF_CONSTEXPR SelectDistinctRequest::SelectDistinctRequest(::_pbi::ConstantInitialized)
-    : _impl_(::_pbi::ConstantInitialized()) {}
-struct SelectDistinctRequestDefaultTypeInternal {
-  PROTOBUF_CONSTEXPR SelectDistinctRequestDefaultTypeInternal() : _instance(::_pbi::ConstantInitialized{}) {}
-  ~SelectDistinctRequestDefaultTypeInternal() {}
-  union {
-    SelectDistinctRequest _instance;
-  };
-};
-
-PROTOBUF_ATTRIBUTE_NO_DESTROY PROTOBUF_CONSTINIT
-    PROTOBUF_ATTRIBUTE_INIT_PRIORITY1 SelectDistinctRequestDefaultTypeInternal _SelectDistinctRequest_default_instance_;
-
-inline constexpr RunChartDownsampleRequest::Impl_::Impl_(
-    ::_pbi::ConstantInitialized) noexcept
-      : _cached_size_{0},
-        y_column_names_{},
-        x_column_name_(
-            &::google::protobuf::internal::fixed_address_empty_string,
-            ::_pbi::ConstantInitialized()),
-        result_id_{nullptr},
-        source_id_{nullptr},
-        zoom_range_{nullptr},
-        pixel_count_{0} {}
-
-template <typename>
-PROTOBUF_CONSTEXPR RunChartDownsampleRequest::RunChartDownsampleRequest(::_pbi::ConstantInitialized)
-    : _impl_(::_pbi::ConstantInitialized()) {}
-struct RunChartDownsampleRequestDefaultTypeInternal {
-  PROTOBUF_CONSTEXPR RunChartDownsampleRequestDefaultTypeInternal() : _instance(::_pbi::ConstantInitialized{}) {}
-  ~RunChartDownsampleRequestDefaultTypeInternal() {}
-  union {
-    RunChartDownsampleRequest _instance;
-  };
-};
-
-PROTOBUF_ATTRIBUTE_NO_DESTROY PROTOBUF_CONSTINIT
-    PROTOBUF_ATTRIBUTE_INIT_PRIORITY1 RunChartDownsampleRequestDefaultTypeInternal _RunChartDownsampleRequest_default_instance_;
-
-inline constexpr NaturalJoinTablesRequest::Impl_::Impl_(
-    ::_pbi::ConstantInitialized) noexcept
-      : _cached_size_{0},
-        columns_to_match_{},
-        columns_to_add_{},
-        result_id_{nullptr},
-        left_id_{nullptr},
-        right_id_{nullptr} {}
-
-template <typename>
-PROTOBUF_CONSTEXPR NaturalJoinTablesRequest::NaturalJoinTablesRequest(::_pbi::ConstantInitialized)
-    : _impl_(::_pbi::ConstantInitialized()) {}
-struct NaturalJoinTablesRequestDefaultTypeInternal {
-  PROTOBUF_CONSTEXPR NaturalJoinTablesRequestDefaultTypeInternal() : _instance(::_pbi::ConstantInitialized{}) {}
-  ~NaturalJoinTablesRequestDefaultTypeInternal() {}
-  union {
-    NaturalJoinTablesRequest _instance;
-  };
-};
-
-PROTOBUF_ATTRIBUTE_NO_DESTROY PROTOBUF_CONSTINIT
-    PROTOBUF_ATTRIBUTE_INIT_PRIORITY1 NaturalJoinTablesRequestDefaultTypeInternal _NaturalJoinTablesRequest_default_instance_;
-
-inline constexpr MultiJoinInput::Impl_::Impl_(
-    ::_pbi::ConstantInitialized) noexcept
-      : _cached_size_{0},
-        columns_to_match_{},
-        columns_to_add_{},
-        source_id_{nullptr} {}
-
-template <typename>
-PROTOBUF_CONSTEXPR MultiJoinInput::MultiJoinInput(::_pbi::ConstantInitialized)
-    : _impl_(::_pbi::ConstantInitialized()) {}
-struct MultiJoinInputDefaultTypeInternal {
-  PROTOBUF_CONSTEXPR MultiJoinInputDefaultTypeInternal() : _instance(::_pbi::ConstantInitialized{}) {}
-  ~MultiJoinInputDefaultTypeInternal() {}
-  union {
-    MultiJoinInput _instance;
-  };
-};
-
-PROTOBUF_ATTRIBUTE_NO_DESTROY PROTOBUF_CONSTINIT
-    PROTOBUF_ATTRIBUTE_INIT_PRIORITY1 MultiJoinInputDefaultTypeInternal _MultiJoinInput_default_instance_;
-
-inline constexpr MetaTableRequest::Impl_::Impl_(
-    ::_pbi::ConstantInitialized) noexcept
-      : _cached_size_{0},
-        result_id_{nullptr},
-        source_id_{nullptr} {}
-
-template <typename>
-PROTOBUF_CONSTEXPR MetaTableRequest::MetaTableRequest(::_pbi::ConstantInitialized)
-    : _impl_(::_pbi::ConstantInitialized()) {}
-struct MetaTableRequestDefaultTypeInternal {
-  PROTOBUF_CONSTEXPR MetaTableRequestDefaultTypeInternal() : _instance(::_pbi::ConstantInitialized{}) {}
-  ~MetaTableRequestDefaultTypeInternal() {}
-  union {
-    MetaTableRequest _instance;
-  };
-};
-
-PROTOBUF_ATTRIBUTE_NO_DESTROY PROTOBUF_CONSTINIT
-    PROTOBUF_ATTRIBUTE_INIT_PRIORITY1 MetaTableRequestDefaultTypeInternal _MetaTableRequest_default_instance_;
-
-inline constexpr MergeTablesRequest::Impl_::Impl_(
-    ::_pbi::ConstantInitialized) noexcept
-      : _cached_size_{0},
-        source_ids_{},
-        key_column_(
-            &::google::protobuf::internal::fixed_address_empty_string,
-            ::_pbi::ConstantInitialized()),
-        result_id_{nullptr} {}
-
-template <typename>
-PROTOBUF_CONSTEXPR MergeTablesRequest::MergeTablesRequest(::_pbi::ConstantInitialized)
-    : _impl_(::_pbi::ConstantInitialized()) {}
-struct MergeTablesRequestDefaultTypeInternal {
-  PROTOBUF_CONSTEXPR MergeTablesRequestDefaultTypeInternal() : _instance(::_pbi::ConstantInitialized{}) {}
-  ~MergeTablesRequestDefaultTypeInternal() {}
-  union {
-    MergeTablesRequest _instance;
-  };
-};
-
-PROTOBUF_ATTRIBUTE_NO_DESTROY PROTOBUF_CONSTINIT
-    PROTOBUF_ATTRIBUTE_INIT_PRIORITY1 MergeTablesRequestDefaultTypeInternal _MergeTablesRequest_default_instance_;
-
-inline constexpr LeftJoinTablesRequest::Impl_::Impl_(
-    ::_pbi::ConstantInitialized) noexcept
-      : _cached_size_{0},
-        columns_to_match_{},
-        columns_to_add_{},
-        result_id_{nullptr},
-        left_id_{nullptr},
-        right_id_{nullptr} {}
-
-template <typename>
-PROTOBUF_CONSTEXPR LeftJoinTablesRequest::LeftJoinTablesRequest(::_pbi::ConstantInitialized)
-    : _impl_(::_pbi::ConstantInitialized()) {}
-struct LeftJoinTablesRequestDefaultTypeInternal {
-  PROTOBUF_CONSTEXPR LeftJoinTablesRequestDefaultTypeInternal() : _instance(::_pbi::ConstantInitialized{}) {}
-  ~LeftJoinTablesRequestDefaultTypeInternal() {}
-  union {
-    LeftJoinTablesRequest _instance;
-  };
-};
-
-PROTOBUF_ATTRIBUTE_NO_DESTROY PROTOBUF_CONSTINIT
-    PROTOBUF_ATTRIBUTE_INIT_PRIORITY1 LeftJoinTablesRequestDefaultTypeInternal _LeftJoinTablesRequest_default_instance_;
-
-inline constexpr InvokeCondition::Impl_::Impl_(
-    ::_pbi::ConstantInitialized) noexcept
-      : _cached_size_{0},
-        arguments_{},
-        method_(
-            &::google::protobuf::internal::fixed_address_empty_string,
-            ::_pbi::ConstantInitialized()),
-        target_{nullptr} {}
-
-template <typename>
-PROTOBUF_CONSTEXPR InvokeCondition::InvokeCondition(::_pbi::ConstantInitialized)
-    : _impl_(::_pbi::ConstantInitialized()) {}
-struct InvokeConditionDefaultTypeInternal {
-  PROTOBUF_CONSTEXPR InvokeConditionDefaultTypeInternal() : _instance(::_pbi::ConstantInitialized{}) {}
-  ~InvokeConditionDefaultTypeInternal() {}
-  union {
-    InvokeCondition _instance;
-  };
-};
-
-PROTOBUF_ATTRIBUTE_NO_DESTROY PROTOBUF_CONSTINIT
-    PROTOBUF_ATTRIBUTE_INIT_PRIORITY1 InvokeConditionDefaultTypeInternal _InvokeCondition_default_instance_;
-
-inline constexpr InCondition::Impl_::Impl_(
-    ::_pbi::ConstantInitialized) noexcept
-      : _cached_size_{0},
-        candidates_{},
-        target_{nullptr},
-        case_sensitivity_{static_cast< ::io::deephaven::proto::backplane::grpc::CaseSensitivity >(0)},
-        match_type_{static_cast< ::io::deephaven::proto::backplane::grpc::MatchType >(0)} {}
-
-template <typename>
-PROTOBUF_CONSTEXPR InCondition::InCondition(::_pbi::ConstantInitialized)
-    : _impl_(::_pbi::ConstantInitialized()) {}
-struct InConditionDefaultTypeInternal {
-  PROTOBUF_CONSTEXPR InConditionDefaultTypeInternal() : _instance(::_pbi::ConstantInitialized{}) {}
-  ~InConditionDefaultTypeInternal() {}
-  union {
-    InCondition _instance;
-  };
-};
-
-PROTOBUF_ATTRIBUTE_NO_DESTROY PROTOBUF_CONSTINIT
-    PROTOBUF_ATTRIBUTE_INIT_PRIORITY1 InConditionDefaultTypeInternal _InCondition_default_instance_;
-
-inline constexpr HeadOrTailRequest::Impl_::Impl_(
-    ::_pbi::ConstantInitialized) noexcept
-      : _cached_size_{0},
-        result_id_{nullptr},
-        source_id_{nullptr},
-        num_rows_{::int64_t{0}} {}
-
-template <typename>
-PROTOBUF_CONSTEXPR HeadOrTailRequest::HeadOrTailRequest(::_pbi::ConstantInitialized)
-    : _impl_(::_pbi::ConstantInitialized()) {}
-struct HeadOrTailRequestDefaultTypeInternal {
-  PROTOBUF_CONSTEXPR HeadOrTailRequestDefaultTypeInternal() : _instance(::_pbi::ConstantInitialized{}) {}
-  ~HeadOrTailRequestDefaultTypeInternal() {}
-  union {
-    HeadOrTailRequest _instance;
-  };
-};
-
-PROTOBUF_ATTRIBUTE_NO_DESTROY PROTOBUF_CONSTINIT
-    PROTOBUF_ATTRIBUTE_INIT_PRIORITY1 HeadOrTailRequestDefaultTypeInternal _HeadOrTailRequest_default_instance_;
-
-inline constexpr HeadOrTailByRequest::Impl_::Impl_(
-    ::_pbi::ConstantInitialized) noexcept
-      : _cached_size_{0},
-        group_by_column_specs_{},
-        result_id_{nullptr},
-        source_id_{nullptr},
-        num_rows_{::int64_t{0}} {}
-
-template <typename>
-PROTOBUF_CONSTEXPR HeadOrTailByRequest::HeadOrTailByRequest(::_pbi::ConstantInitialized)
-    : _impl_(::_pbi::ConstantInitialized()) {}
-struct HeadOrTailByRequestDefaultTypeInternal {
-  PROTOBUF_CONSTEXPR HeadOrTailByRequestDefaultTypeInternal() : _instance(::_pbi::ConstantInitialized{}) {}
-  ~HeadOrTailByRequestDefaultTypeInternal() {}
-  union {
-    HeadOrTailByRequest _instance;
-  };
-};
-
-PROTOBUF_ATTRIBUTE_NO_DESTROY PROTOBUF_CONSTINIT
-    PROTOBUF_ATTRIBUTE_INIT_PRIORITY1 HeadOrTailByRequestDefaultTypeInternal _HeadOrTailByRequest_default_instance_;
-
-inline constexpr FlattenRequest::Impl_::Impl_(
-    ::_pbi::ConstantInitialized) noexcept
-      : _cached_size_{0},
-        result_id_{nullptr},
-        source_id_{nullptr} {}
-
-template <typename>
-PROTOBUF_CONSTEXPR FlattenRequest::FlattenRequest(::_pbi::ConstantInitialized)
-    : _impl_(::_pbi::ConstantInitialized()) {}
-struct FlattenRequestDefaultTypeInternal {
-  PROTOBUF_CONSTEXPR FlattenRequestDefaultTypeInternal() : _instance(::_pbi::ConstantInitialized{}) {}
-  ~FlattenRequestDefaultTypeInternal() {}
-  union {
-    FlattenRequest _instance;
-  };
-};
-
-PROTOBUF_ATTRIBUTE_NO_DESTROY PROTOBUF_CONSTINIT
-    PROTOBUF_ATTRIBUTE_INIT_PRIORITY1 FlattenRequestDefaultTypeInternal _FlattenRequest_default_instance_;
-
-inline constexpr FetchTableRequest::Impl_::Impl_(
-    ::_pbi::ConstantInitialized) noexcept
-      : _cached_size_{0},
-        source_id_{nullptr},
-        result_id_{nullptr} {}
-
-template <typename>
-PROTOBUF_CONSTEXPR FetchTableRequest::FetchTableRequest(::_pbi::ConstantInitialized)
-    : _impl_(::_pbi::ConstantInitialized()) {}
-struct FetchTableRequestDefaultTypeInternal {
-  PROTOBUF_CONSTEXPR FetchTableRequestDefaultTypeInternal() : _instance(::_pbi::ConstantInitialized{}) {}
-  ~FetchTableRequestDefaultTypeInternal() {}
-  union {
-    FetchTableRequest _instance;
-  };
-};
-
-PROTOBUF_ATTRIBUTE_NO_DESTROY PROTOBUF_CONSTINIT
-    PROTOBUF_ATTRIBUTE_INIT_PRIORITY1 FetchTableRequestDefaultTypeInternal _FetchTableRequest_default_instance_;
-
-inline constexpr ExportedTableCreationResponse::Impl_::Impl_(
-    ::_pbi::ConstantInitialized) noexcept
-      : _cached_size_{0},
-        error_info_(
-            &::google::protobuf::internal::fixed_address_empty_string,
-            ::_pbi::ConstantInitialized()),
-        schema_header_(
-            &::google::protobuf::internal::fixed_address_empty_string,
-            ::_pbi::ConstantInitialized()),
-        result_id_{nullptr},
-        size_{::int64_t{0}},
-        success_{false},
-        is_static_{false} {}
-
-template <typename>
-PROTOBUF_CONSTEXPR ExportedTableCreationResponse::ExportedTableCreationResponse(::_pbi::ConstantInitialized)
-    : _impl_(::_pbi::ConstantInitialized()) {}
-struct ExportedTableCreationResponseDefaultTypeInternal {
-  PROTOBUF_CONSTEXPR ExportedTableCreationResponseDefaultTypeInternal() : _instance(::_pbi::ConstantInitialized{}) {}
-  ~ExportedTableCreationResponseDefaultTypeInternal() {}
-  union {
-    ExportedTableCreationResponse _instance;
-  };
-};
-
-PROTOBUF_ATTRIBUTE_NO_DESTROY PROTOBUF_CONSTINIT
-    PROTOBUF_ATTRIBUTE_INIT_PRIORITY1 ExportedTableCreationResponseDefaultTypeInternal _ExportedTableCreationResponse_default_instance_;
-
-inline constexpr ExactJoinTablesRequest::Impl_::Impl_(
-    ::_pbi::ConstantInitialized) noexcept
-      : _cached_size_{0},
-        columns_to_match_{},
-        columns_to_add_{},
-        result_id_{nullptr},
-        left_id_{nullptr},
-        right_id_{nullptr} {}
-
-template <typename>
-PROTOBUF_CONSTEXPR ExactJoinTablesRequest::ExactJoinTablesRequest(::_pbi::ConstantInitialized)
-    : _impl_(::_pbi::ConstantInitialized()) {}
-struct ExactJoinTablesRequestDefaultTypeInternal {
-  PROTOBUF_CONSTEXPR ExactJoinTablesRequestDefaultTypeInternal() : _instance(::_pbi::ConstantInitialized{}) {}
-  ~ExactJoinTablesRequestDefaultTypeInternal() {}
-  union {
-    ExactJoinTablesRequest _instance;
-  };
-};
-
-PROTOBUF_ATTRIBUTE_NO_DESTROY PROTOBUF_CONSTINIT
-    PROTOBUF_ATTRIBUTE_INIT_PRIORITY1 ExactJoinTablesRequestDefaultTypeInternal _ExactJoinTablesRequest_default_instance_;
-
-inline constexpr DropColumnsRequest::Impl_::Impl_(
-    ::_pbi::ConstantInitialized) noexcept
-      : _cached_size_{0},
-        column_names_{},
-        result_id_{nullptr},
-        source_id_{nullptr} {}
-
-template <typename>
-PROTOBUF_CONSTEXPR DropColumnsRequest::DropColumnsRequest(::_pbi::ConstantInitialized)
-    : _impl_(::_pbi::ConstantInitialized()) {}
-struct DropColumnsRequestDefaultTypeInternal {
-  PROTOBUF_CONSTEXPR DropColumnsRequestDefaultTypeInternal() : _instance(::_pbi::ConstantInitialized{}) {}
-  ~DropColumnsRequestDefaultTypeInternal() {}
-  union {
-    DropColumnsRequest _instance;
-  };
-};
-
-PROTOBUF_ATTRIBUTE_NO_DESTROY PROTOBUF_CONSTINIT
-    PROTOBUF_ATTRIBUTE_INIT_PRIORITY1 DropColumnsRequestDefaultTypeInternal _DropColumnsRequest_default_instance_;
-
-inline constexpr CrossJoinTablesRequest::Impl_::Impl_(
-    ::_pbi::ConstantInitialized) noexcept
-      : _cached_size_{0},
-        columns_to_match_{},
-        columns_to_add_{},
-        result_id_{nullptr},
-        left_id_{nullptr},
-        right_id_{nullptr},
-        reserve_bits_{0} {}
-
-template <typename>
-PROTOBUF_CONSTEXPR CrossJoinTablesRequest::CrossJoinTablesRequest(::_pbi::ConstantInitialized)
-    : _impl_(::_pbi::ConstantInitialized()) {}
-struct CrossJoinTablesRequestDefaultTypeInternal {
-  PROTOBUF_CONSTEXPR CrossJoinTablesRequestDefaultTypeInternal() : _instance(::_pbi::ConstantInitialized{}) {}
-  ~CrossJoinTablesRequestDefaultTypeInternal() {}
-  union {
-    CrossJoinTablesRequest _instance;
-  };
-};
-
-PROTOBUF_ATTRIBUTE_NO_DESTROY PROTOBUF_CONSTINIT
-    PROTOBUF_ATTRIBUTE_INIT_PRIORITY1 CrossJoinTablesRequestDefaultTypeInternal _CrossJoinTablesRequest_default_instance_;
-
-inline constexpr CreateInputTableRequest::Impl_::Impl_(
-    ::_pbi::ConstantInitialized) noexcept
-      : _cached_size_{0},
-        result_id_{nullptr},
-        kind_{nullptr},
-        definition_{},
-        _oneof_case_{} {}
-
-template <typename>
-PROTOBUF_CONSTEXPR CreateInputTableRequest::CreateInputTableRequest(::_pbi::ConstantInitialized)
-    : _impl_(::_pbi::ConstantInitialized()) {}
-struct CreateInputTableRequestDefaultTypeInternal {
-  PROTOBUF_CONSTEXPR CreateInputTableRequestDefaultTypeInternal() : _instance(::_pbi::ConstantInitialized{}) {}
-  ~CreateInputTableRequestDefaultTypeInternal() {}
-  union {
-    CreateInputTableRequest _instance;
-  };
-};
-
-PROTOBUF_ATTRIBUTE_NO_DESTROY PROTOBUF_CONSTINIT
-    PROTOBUF_ATTRIBUTE_INIT_PRIORITY1 CreateInputTableRequestDefaultTypeInternal _CreateInputTableRequest_default_instance_;
-
-inline constexpr CompareCondition::Impl_::Impl_(
-    ::_pbi::ConstantInitialized) noexcept
-      : _cached_size_{0},
-        lhs_{nullptr},
-        rhs_{nullptr},
-        operation_{static_cast< ::io::deephaven::proto::backplane::grpc::CompareCondition_CompareOperation >(0)},
-        case_sensitivity_{static_cast< ::io::deephaven::proto::backplane::grpc::CaseSensitivity >(0)} {}
-
-template <typename>
-PROTOBUF_CONSTEXPR CompareCondition::CompareCondition(::_pbi::ConstantInitialized)
-    : _impl_(::_pbi::ConstantInitialized()) {}
-struct CompareConditionDefaultTypeInternal {
-  PROTOBUF_CONSTEXPR CompareConditionDefaultTypeInternal() : _instance(::_pbi::ConstantInitialized{}) {}
-  ~CompareConditionDefaultTypeInternal() {}
-  union {
-    CompareCondition _instance;
-  };
-};
-
-PROTOBUF_ATTRIBUTE_NO_DESTROY PROTOBUF_CONSTINIT
-    PROTOBUF_ATTRIBUTE_INIT_PRIORITY1 CompareConditionDefaultTypeInternal _CompareCondition_default_instance_;
-
-inline constexpr ComboAggregateRequest::Impl_::Impl_(
-    ::_pbi::ConstantInitialized) noexcept
-      : _cached_size_{0},
-        aggregates_{},
-        group_by_columns_{},
-        result_id_{nullptr},
-        source_id_{nullptr},
-        force_combo_{false} {}
-
-template <typename>
-PROTOBUF_CONSTEXPR ComboAggregateRequest::ComboAggregateRequest(::_pbi::ConstantInitialized)
-    : _impl_(::_pbi::ConstantInitialized()) {}
-struct ComboAggregateRequestDefaultTypeInternal {
-  PROTOBUF_CONSTEXPR ComboAggregateRequestDefaultTypeInternal() : _instance(::_pbi::ConstantInitialized{}) {}
-  ~ComboAggregateRequestDefaultTypeInternal() {}
-  union {
-    ComboAggregateRequest _instance;
-  };
-};
-
-PROTOBUF_ATTRIBUTE_NO_DESTROY PROTOBUF_CONSTINIT
-    PROTOBUF_ATTRIBUTE_INIT_PRIORITY1 ComboAggregateRequestDefaultTypeInternal _ComboAggregateRequest_default_instance_;
-
-inline constexpr ColumnStatisticsRequest::Impl_::Impl_(
-    ::_pbi::ConstantInitialized) noexcept
-      : _cached_size_{0},
-        column_name_(
-            &::google::protobuf::internal::fixed_address_empty_string,
-            ::_pbi::ConstantInitialized()),
-        result_id_{nullptr},
-        source_id_{nullptr},
-        unique_value_limit_{0} {}
-
-template <typename>
-PROTOBUF_CONSTEXPR ColumnStatisticsRequest::ColumnStatisticsRequest(::_pbi::ConstantInitialized)
-    : _impl_(::_pbi::ConstantInitialized()) {}
-struct ColumnStatisticsRequestDefaultTypeInternal {
-  PROTOBUF_CONSTEXPR ColumnStatisticsRequestDefaultTypeInternal() : _instance(::_pbi::ConstantInitialized{}) {}
-  ~ColumnStatisticsRequestDefaultTypeInternal() {}
-  union {
-    ColumnStatisticsRequest _instance;
-  };
-};
-
-PROTOBUF_ATTRIBUTE_NO_DESTROY PROTOBUF_CONSTINIT
-    PROTOBUF_ATTRIBUTE_INIT_PRIORITY1 ColumnStatisticsRequestDefaultTypeInternal _ColumnStatisticsRequest_default_instance_;
-
-inline constexpr AsOfJoinTablesRequest::Impl_::Impl_(
-    ::_pbi::ConstantInitialized) noexcept
-      : _cached_size_{0},
-        columns_to_match_{},
-        columns_to_add_{},
-        result_id_{nullptr},
-        left_id_{nullptr},
-        right_id_{nullptr},
-        as_of_match_rule_{static_cast< ::io::deephaven::proto::backplane::grpc::AsOfJoinTablesRequest_MatchRule >(0)} {}
-
-template <typename>
-PROTOBUF_CONSTEXPR AsOfJoinTablesRequest::AsOfJoinTablesRequest(::_pbi::ConstantInitialized)
-    : _impl_(::_pbi::ConstantInitialized()) {}
-struct AsOfJoinTablesRequestDefaultTypeInternal {
-  PROTOBUF_CONSTEXPR AsOfJoinTablesRequestDefaultTypeInternal() : _instance(::_pbi::ConstantInitialized{}) {}
-  ~AsOfJoinTablesRequestDefaultTypeInternal() {}
-  union {
-    AsOfJoinTablesRequest _instance;
-  };
-};
-
-PROTOBUF_ATTRIBUTE_NO_DESTROY PROTOBUF_CONSTINIT
-    PROTOBUF_ATTRIBUTE_INIT_PRIORITY1 AsOfJoinTablesRequestDefaultTypeInternal _AsOfJoinTablesRequest_default_instance_;
-
-inline constexpr ApplyPreviewColumnsRequest::Impl_::Impl_(
-    ::_pbi::ConstantInitialized) noexcept
-      : _cached_size_{0},
-        source_id_{nullptr},
-        result_id_{nullptr} {}
-
-template <typename>
-PROTOBUF_CONSTEXPR ApplyPreviewColumnsRequest::ApplyPreviewColumnsRequest(::_pbi::ConstantInitialized)
-    : _impl_(::_pbi::ConstantInitialized()) {}
-struct ApplyPreviewColumnsRequestDefaultTypeInternal {
-  PROTOBUF_CONSTEXPR ApplyPreviewColumnsRequestDefaultTypeInternal() : _instance(::_pbi::ConstantInitialized{}) {}
-  ~ApplyPreviewColumnsRequestDefaultTypeInternal() {}
-  union {
-    ApplyPreviewColumnsRequest _instance;
-  };
-};
-
-PROTOBUF_ATTRIBUTE_NO_DESTROY PROTOBUF_CONSTINIT
-    PROTOBUF_ATTRIBUTE_INIT_PRIORITY1 ApplyPreviewColumnsRequestDefaultTypeInternal _ApplyPreviewColumnsRequest_default_instance_;
-
-inline constexpr AjRajTablesRequest::Impl_::Impl_(
-    ::_pbi::ConstantInitialized) noexcept
-      : _cached_size_{0},
-        exact_match_columns_{},
-        columns_to_add_{},
-        as_of_column_(
-            &::google::protobuf::internal::fixed_address_empty_string,
-            ::_pbi::ConstantInitialized()),
-        result_id_{nullptr},
-        left_id_{nullptr},
-        right_id_{nullptr} {}
-
-template <typename>
-PROTOBUF_CONSTEXPR AjRajTablesRequest::AjRajTablesRequest(::_pbi::ConstantInitialized)
-    : _impl_(::_pbi::ConstantInitialized()) {}
-struct AjRajTablesRequestDefaultTypeInternal {
-  PROTOBUF_CONSTEXPR AjRajTablesRequestDefaultTypeInternal() : _instance(::_pbi::ConstantInitialized{}) {}
-  ~AjRajTablesRequestDefaultTypeInternal() {}
-  union {
-    AjRajTablesRequest _instance;
-  };
-};
-
-PROTOBUF_ATTRIBUTE_NO_DESTROY PROTOBUF_CONSTINIT
-    PROTOBUF_ATTRIBUTE_INIT_PRIORITY1 AjRajTablesRequestDefaultTypeInternal _AjRajTablesRequest_default_instance_;
-
-inline constexpr AggSpec::Impl_::Impl_(
-    ::_pbi::ConstantInitialized) noexcept
-      : type_{},
-        _cached_size_{0},
-        _oneof_case_{} {}
-
-template <typename>
-PROTOBUF_CONSTEXPR AggSpec::AggSpec(::_pbi::ConstantInitialized)
-    : _impl_(::_pbi::ConstantInitialized()) {}
-struct AggSpecDefaultTypeInternal {
-  PROTOBUF_CONSTEXPR AggSpecDefaultTypeInternal() : _instance(::_pbi::ConstantInitialized{}) {}
-  ~AggSpecDefaultTypeInternal() {}
-  union {
-    AggSpec _instance;
-  };
-};
-
-PROTOBUF_ATTRIBUTE_NO_DESTROY PROTOBUF_CONSTINIT
-    PROTOBUF_ATTRIBUTE_INIT_PRIORITY1 AggSpecDefaultTypeInternal _AggSpec_default_instance_;
-
-inline constexpr UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec::Impl_::Impl_(
-    ::_pbi::ConstantInitialized) noexcept
-      : type_{},
-        _cached_size_{0},
-        _oneof_case_{} {}
-
-template <typename>
-PROTOBUF_CONSTEXPR UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec::UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec(::_pbi::ConstantInitialized)
-    : _impl_(::_pbi::ConstantInitialized()) {}
-struct UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpecDefaultTypeInternal {
-  PROTOBUF_CONSTEXPR UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpecDefaultTypeInternal() : _instance(::_pbi::ConstantInitialized{}) {}
-  ~UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpecDefaultTypeInternal() {}
-  union {
-    UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec _instance;
-  };
-};
-
-PROTOBUF_ATTRIBUTE_NO_DESTROY PROTOBUF_CONSTINIT
-    PROTOBUF_ATTRIBUTE_INIT_PRIORITY1 UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpecDefaultTypeInternal _UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_default_instance_;
-
-inline constexpr MultiJoinTablesRequest::Impl_::Impl_(
-    ::_pbi::ConstantInitialized) noexcept
-      : _cached_size_{0},
-        multi_join_inputs_{},
-        result_id_{nullptr} {}
-
-template <typename>
-PROTOBUF_CONSTEXPR MultiJoinTablesRequest::MultiJoinTablesRequest(::_pbi::ConstantInitialized)
-    : _impl_(::_pbi::ConstantInitialized()) {}
-struct MultiJoinTablesRequestDefaultTypeInternal {
-  PROTOBUF_CONSTEXPR MultiJoinTablesRequestDefaultTypeInternal() : _instance(::_pbi::ConstantInitialized{}) {}
-  ~MultiJoinTablesRequestDefaultTypeInternal() {}
-  union {
-    MultiJoinTablesRequest _instance;
-  };
-};
-
-PROTOBUF_ATTRIBUTE_NO_DESTROY PROTOBUF_CONSTINIT
-    PROTOBUF_ATTRIBUTE_INIT_PRIORITY1 MultiJoinTablesRequestDefaultTypeInternal _MultiJoinTablesRequest_default_instance_;
-
-inline constexpr AndCondition::Impl_::Impl_(
-    ::_pbi::ConstantInitialized) noexcept
-      : filters_{},
-        _cached_size_{0} {}
-
-template <typename>
-PROTOBUF_CONSTEXPR AndCondition::AndCondition(::_pbi::ConstantInitialized)
-    : _impl_(::_pbi::ConstantInitialized()) {}
-struct AndConditionDefaultTypeInternal {
-  PROTOBUF_CONSTEXPR AndConditionDefaultTypeInternal() : _instance(::_pbi::ConstantInitialized{}) {}
-  ~AndConditionDefaultTypeInternal() {}
-  union {
-    AndCondition _instance;
-  };
-};
-
-PROTOBUF_ATTRIBUTE_NO_DESTROY PROTOBUF_CONSTINIT
-    PROTOBUF_ATTRIBUTE_INIT_PRIORITY1 AndConditionDefaultTypeInternal _AndCondition_default_instance_;
-
-inline constexpr Condition::Impl_::Impl_(
-    ::_pbi::ConstantInitialized) noexcept
-      : data_{},
-        _cached_size_{0},
-        _oneof_case_{} {}
-
-template <typename>
-PROTOBUF_CONSTEXPR Condition::Condition(::_pbi::ConstantInitialized)
-    : _impl_(::_pbi::ConstantInitialized()) {}
-struct ConditionDefaultTypeInternal {
-  PROTOBUF_CONSTEXPR ConditionDefaultTypeInternal() : _instance(::_pbi::ConstantInitialized{}) {}
-  ~ConditionDefaultTypeInternal() {}
-  union {
-    Condition _instance;
-  };
-};
-
-PROTOBUF_ATTRIBUTE_NO_DESTROY PROTOBUF_CONSTINIT
-    PROTOBUF_ATTRIBUTE_INIT_PRIORITY1 ConditionDefaultTypeInternal _Condition_default_instance_;
-
-inline constexpr NotCondition::Impl_::Impl_(
-    ::_pbi::ConstantInitialized) noexcept
-      : _cached_size_{0},
-        filter_{nullptr} {}
-
-template <typename>
-PROTOBUF_CONSTEXPR NotCondition::NotCondition(::_pbi::ConstantInitialized)
-    : _impl_(::_pbi::ConstantInitialized()) {}
-struct NotConditionDefaultTypeInternal {
-  PROTOBUF_CONSTEXPR NotConditionDefaultTypeInternal() : _instance(::_pbi::ConstantInitialized{}) {}
-  ~NotConditionDefaultTypeInternal() {}
-  union {
-    NotCondition _instance;
-  };
-};
-
-PROTOBUF_ATTRIBUTE_NO_DESTROY PROTOBUF_CONSTINIT
-    PROTOBUF_ATTRIBUTE_INIT_PRIORITY1 NotConditionDefaultTypeInternal _NotCondition_default_instance_;
-
-inline constexpr OrCondition::Impl_::Impl_(
-    ::_pbi::ConstantInitialized) noexcept
-      : filters_{},
-        _cached_size_{0} {}
-
-template <typename>
-PROTOBUF_CONSTEXPR OrCondition::OrCondition(::_pbi::ConstantInitialized)
-    : _impl_(::_pbi::ConstantInitialized()) {}
-struct OrConditionDefaultTypeInternal {
-  PROTOBUF_CONSTEXPR OrConditionDefaultTypeInternal() : _instance(::_pbi::ConstantInitialized{}) {}
-  ~OrConditionDefaultTypeInternal() {}
-  union {
-    OrCondition _instance;
-  };
-};
-
-PROTOBUF_ATTRIBUTE_NO_DESTROY PROTOBUF_CONSTINIT
-    PROTOBUF_ATTRIBUTE_INIT_PRIORITY1 OrConditionDefaultTypeInternal _OrCondition_default_instance_;
-
-inline constexpr Aggregation_AggregationColumns::Impl_::Impl_(
-    ::_pbi::ConstantInitialized) noexcept
-      : _cached_size_{0},
-        match_pairs_{},
-        spec_{nullptr} {}
-
-template <typename>
-PROTOBUF_CONSTEXPR Aggregation_AggregationColumns::Aggregation_AggregationColumns(::_pbi::ConstantInitialized)
-    : _impl_(::_pbi::ConstantInitialized()) {}
-struct Aggregation_AggregationColumnsDefaultTypeInternal {
-  PROTOBUF_CONSTEXPR Aggregation_AggregationColumnsDefaultTypeInternal() : _instance(::_pbi::ConstantInitialized{}) {}
-  ~Aggregation_AggregationColumnsDefaultTypeInternal() {}
-  union {
-    Aggregation_AggregationColumns _instance;
-  };
-};
-
-PROTOBUF_ATTRIBUTE_NO_DESTROY PROTOBUF_CONSTINIT
-    PROTOBUF_ATTRIBUTE_INIT_PRIORITY1 Aggregation_AggregationColumnsDefaultTypeInternal _Aggregation_AggregationColumns_default_instance_;
-
-inline constexpr AggregateAllRequest::Impl_::Impl_(
-    ::_pbi::ConstantInitialized) noexcept
-      : _cached_size_{0},
-        group_by_columns_{},
-        result_id_{nullptr},
-        source_id_{nullptr},
-        spec_{nullptr} {}
-
-template <typename>
-PROTOBUF_CONSTEXPR AggregateAllRequest::AggregateAllRequest(::_pbi::ConstantInitialized)
-    : _impl_(::_pbi::ConstantInitialized()) {}
-struct AggregateAllRequestDefaultTypeInternal {
-  PROTOBUF_CONSTEXPR AggregateAllRequestDefaultTypeInternal() : _instance(::_pbi::ConstantInitialized{}) {}
-  ~AggregateAllRequestDefaultTypeInternal() {}
-  union {
-    AggregateAllRequest _instance;
-  };
-};
-
-PROTOBUF_ATTRIBUTE_NO_DESTROY PROTOBUF_CONSTINIT
-    PROTOBUF_ATTRIBUTE_INIT_PRIORITY1 AggregateAllRequestDefaultTypeInternal _AggregateAllRequest_default_instance_;
-
-inline constexpr UpdateByRequest_UpdateByOperation_UpdateByColumn::Impl_::Impl_(
-    ::_pbi::ConstantInitialized) noexcept
-      : _cached_size_{0},
-        match_pairs_{},
-        spec_{nullptr} {}
-
-template <typename>
-PROTOBUF_CONSTEXPR UpdateByRequest_UpdateByOperation_UpdateByColumn::UpdateByRequest_UpdateByOperation_UpdateByColumn(::_pbi::ConstantInitialized)
-    : _impl_(::_pbi::ConstantInitialized()) {}
-struct UpdateByRequest_UpdateByOperation_UpdateByColumnDefaultTypeInternal {
-  PROTOBUF_CONSTEXPR UpdateByRequest_UpdateByOperation_UpdateByColumnDefaultTypeInternal() : _instance(::_pbi::ConstantInitialized{}) {}
-  ~UpdateByRequest_UpdateByOperation_UpdateByColumnDefaultTypeInternal() {}
-  union {
-    UpdateByRequest_UpdateByOperation_UpdateByColumn _instance;
-  };
-};
-
-PROTOBUF_ATTRIBUTE_NO_DESTROY PROTOBUF_CONSTINIT
-    PROTOBUF_ATTRIBUTE_INIT_PRIORITY1 UpdateByRequest_UpdateByOperation_UpdateByColumnDefaultTypeInternal _UpdateByRequest_UpdateByOperation_UpdateByColumn_default_instance_;
-
-inline constexpr FilterTableRequest::Impl_::Impl_(
-    ::_pbi::ConstantInitialized) noexcept
-      : _cached_size_{0},
-        filters_{},
-        result_id_{nullptr},
-        source_id_{nullptr} {}
-
-template <typename>
-PROTOBUF_CONSTEXPR FilterTableRequest::FilterTableRequest(::_pbi::ConstantInitialized)
-    : _impl_(::_pbi::ConstantInitialized()) {}
-struct FilterTableRequestDefaultTypeInternal {
-  PROTOBUF_CONSTEXPR FilterTableRequestDefaultTypeInternal() : _instance(::_pbi::ConstantInitialized{}) {}
-  ~FilterTableRequestDefaultTypeInternal() {}
-  union {
-    FilterTableRequest _instance;
-  };
-};
-
-PROTOBUF_ATTRIBUTE_NO_DESTROY PROTOBUF_CONSTINIT
-    PROTOBUF_ATTRIBUTE_INIT_PRIORITY1 FilterTableRequestDefaultTypeInternal _FilterTableRequest_default_instance_;
-
-inline constexpr Aggregation::Impl_::Impl_(
-    ::_pbi::ConstantInitialized) noexcept
-      : type_{},
-        _cached_size_{0},
-        _oneof_case_{} {}
-
-template <typename>
-PROTOBUF_CONSTEXPR Aggregation::Aggregation(::_pbi::ConstantInitialized)
-    : _impl_(::_pbi::ConstantInitialized()) {}
-struct AggregationDefaultTypeInternal {
-  PROTOBUF_CONSTEXPR AggregationDefaultTypeInternal() : _instance(::_pbi::ConstantInitialized{}) {}
-  ~AggregationDefaultTypeInternal() {}
-  union {
-    Aggregation _instance;
-  };
-};
-
-PROTOBUF_ATTRIBUTE_NO_DESTROY PROTOBUF_CONSTINIT
-    PROTOBUF_ATTRIBUTE_INIT_PRIORITY1 AggregationDefaultTypeInternal _Aggregation_default_instance_;
-
-inline constexpr UpdateByRequest_UpdateByOperation::Impl_::Impl_(
-    ::_pbi::ConstantInitialized) noexcept
-      : type_{},
-        _cached_size_{0},
-        _oneof_case_{} {}
-
-template <typename>
-PROTOBUF_CONSTEXPR UpdateByRequest_UpdateByOperation::UpdateByRequest_UpdateByOperation(::_pbi::ConstantInitialized)
-    : _impl_(::_pbi::ConstantInitialized()) {}
-struct UpdateByRequest_UpdateByOperationDefaultTypeInternal {
-  PROTOBUF_CONSTEXPR UpdateByRequest_UpdateByOperationDefaultTypeInternal() : _instance(::_pbi::ConstantInitialized{}) {}
-  ~UpdateByRequest_UpdateByOperationDefaultTypeInternal() {}
-  union {
-    UpdateByRequest_UpdateByOperation _instance;
-  };
-};
-
-PROTOBUF_ATTRIBUTE_NO_DESTROY PROTOBUF_CONSTINIT
-    PROTOBUF_ATTRIBUTE_INIT_PRIORITY1 UpdateByRequest_UpdateByOperationDefaultTypeInternal _UpdateByRequest_UpdateByOperation_default_instance_;
-
-inline constexpr RangeJoinTablesRequest::Impl_::Impl_(
-    ::_pbi::ConstantInitialized) noexcept
-      : _cached_size_{0},
-        exact_match_columns_{},
-        aggregations_{},
-        left_start_column_(
-            &::google::protobuf::internal::fixed_address_empty_string,
-            ::_pbi::ConstantInitialized()),
-        right_range_column_(
-            &::google::protobuf::internal::fixed_address_empty_string,
-            ::_pbi::ConstantInitialized()),
-        left_end_column_(
-            &::google::protobuf::internal::fixed_address_empty_string,
-            ::_pbi::ConstantInitialized()),
-        range_match_(
-            &::google::protobuf::internal::fixed_address_empty_string,
-            ::_pbi::ConstantInitialized()),
-        result_id_{nullptr},
-        left_id_{nullptr},
-        right_id_{nullptr},
-        range_start_rule_{static_cast< ::io::deephaven::proto::backplane::grpc::RangeJoinTablesRequest_RangeStartRule >(0)},
-        range_end_rule_{static_cast< ::io::deephaven::proto::backplane::grpc::RangeJoinTablesRequest_RangeEndRule >(0)} {}
-
-template <typename>
-PROTOBUF_CONSTEXPR RangeJoinTablesRequest::RangeJoinTablesRequest(::_pbi::ConstantInitialized)
-    : _impl_(::_pbi::ConstantInitialized()) {}
-struct RangeJoinTablesRequestDefaultTypeInternal {
-  PROTOBUF_CONSTEXPR RangeJoinTablesRequestDefaultTypeInternal() : _instance(::_pbi::ConstantInitialized{}) {}
-  ~RangeJoinTablesRequestDefaultTypeInternal() {}
-  union {
-    RangeJoinTablesRequest _instance;
-  };
-};
-
-PROTOBUF_ATTRIBUTE_NO_DESTROY PROTOBUF_CONSTINIT
-    PROTOBUF_ATTRIBUTE_INIT_PRIORITY1 RangeJoinTablesRequestDefaultTypeInternal _RangeJoinTablesRequest_default_instance_;
-
-inline constexpr AggregateRequest::Impl_::Impl_(
-    ::_pbi::ConstantInitialized) noexcept
-      : _cached_size_{0},
-        aggregations_{},
-        group_by_columns_{},
-        result_id_{nullptr},
-        source_id_{nullptr},
-        initial_groups_id_{nullptr},
-        preserve_empty_{false} {}
-
-template <typename>
-PROTOBUF_CONSTEXPR AggregateRequest::AggregateRequest(::_pbi::ConstantInitialized)
-    : _impl_(::_pbi::ConstantInitialized()) {}
-struct AggregateRequestDefaultTypeInternal {
-  PROTOBUF_CONSTEXPR AggregateRequestDefaultTypeInternal() : _instance(::_pbi::ConstantInitialized{}) {}
-  ~AggregateRequestDefaultTypeInternal() {}
-  union {
-    AggregateRequest _instance;
-  };
-};
-
-PROTOBUF_ATTRIBUTE_NO_DESTROY PROTOBUF_CONSTINIT
-    PROTOBUF_ATTRIBUTE_INIT_PRIORITY1 AggregateRequestDefaultTypeInternal _AggregateRequest_default_instance_;
-
-inline constexpr UpdateByRequest::Impl_::Impl_(
-    ::_pbi::ConstantInitialized) noexcept
-      : _cached_size_{0},
-        operations_{},
-        group_by_columns_{},
-        result_id_{nullptr},
-        source_id_{nullptr},
-        options_{nullptr} {}
-
-template <typename>
-PROTOBUF_CONSTEXPR UpdateByRequest::UpdateByRequest(::_pbi::ConstantInitialized)
-    : _impl_(::_pbi::ConstantInitialized()) {}
-struct UpdateByRequestDefaultTypeInternal {
-  PROTOBUF_CONSTEXPR UpdateByRequestDefaultTypeInternal() : _instance(::_pbi::ConstantInitialized{}) {}
-  ~UpdateByRequestDefaultTypeInternal() {}
-  union {
-    UpdateByRequest _instance;
-  };
-};
-
-PROTOBUF_ATTRIBUTE_NO_DESTROY PROTOBUF_CONSTINIT
-    PROTOBUF_ATTRIBUTE_INIT_PRIORITY1 UpdateByRequestDefaultTypeInternal _UpdateByRequest_default_instance_;
-
-inline constexpr BatchTableRequest_Operation::Impl_::Impl_(
-    ::_pbi::ConstantInitialized) noexcept
-      : op_{},
-        _cached_size_{0},
-        _oneof_case_{} {}
-
-template <typename>
-PROTOBUF_CONSTEXPR BatchTableRequest_Operation::BatchTableRequest_Operation(::_pbi::ConstantInitialized)
-    : _impl_(::_pbi::ConstantInitialized()) {}
-struct BatchTableRequest_OperationDefaultTypeInternal {
-  PROTOBUF_CONSTEXPR BatchTableRequest_OperationDefaultTypeInternal() : _instance(::_pbi::ConstantInitialized{}) {}
-  ~BatchTableRequest_OperationDefaultTypeInternal() {}
-  union {
-    BatchTableRequest_Operation _instance;
-  };
-};
-
-PROTOBUF_ATTRIBUTE_NO_DESTROY PROTOBUF_CONSTINIT
-    PROTOBUF_ATTRIBUTE_INIT_PRIORITY1 BatchTableRequest_OperationDefaultTypeInternal _BatchTableRequest_Operation_default_instance_;
-
-inline constexpr BatchTableRequest::Impl_::Impl_(
-    ::_pbi::ConstantInitialized) noexcept
-      : ops_{},
-        _cached_size_{0} {}
-
-template <typename>
-PROTOBUF_CONSTEXPR BatchTableRequest::BatchTableRequest(::_pbi::ConstantInitialized)
-    : _impl_(::_pbi::ConstantInitialized()) {}
-struct BatchTableRequestDefaultTypeInternal {
-  PROTOBUF_CONSTEXPR BatchTableRequestDefaultTypeInternal() : _instance(::_pbi::ConstantInitialized{}) {}
-  ~BatchTableRequestDefaultTypeInternal() {}
-  union {
-    BatchTableRequest _instance;
-  };
-};
-
-PROTOBUF_ATTRIBUTE_NO_DESTROY PROTOBUF_CONSTINIT
-    PROTOBUF_ATTRIBUTE_INIT_PRIORITY1 BatchTableRequestDefaultTypeInternal _BatchTableRequest_default_instance_;
-}  // namespace grpc
-}  // namespace backplane
-}  // namespace proto
-}  // namespace deephaven
-}  // namespace io
-static ::_pb::Metadata file_level_metadata_deephaven_2fproto_2ftable_2eproto[124];
-static const ::_pb::EnumDescriptor* file_level_enum_descriptors_deephaven_2fproto_2ftable_2eproto[12];
-static constexpr const ::_pb::ServiceDescriptor**
-    file_level_service_descriptors_deephaven_2fproto_2ftable_2eproto = nullptr;
-const ::uint32_t TableStruct_deephaven_2fproto_2ftable_2eproto::offsets[] PROTOBUF_SECTION_VARIABLE(
-    protodesc_cold) = {
-    ~0u,  // no _has_bits_
-    PROTOBUF_FIELD_OFFSET(::io::deephaven::proto::backplane::grpc::TableReference, _internal_metadata_),
-    ~0u,  // no _extensions_
-    PROTOBUF_FIELD_OFFSET(::io::deephaven::proto::backplane::grpc::TableReference, _impl_._oneof_case_[0]),
-    ~0u,  // no _weak_field_map_
-    ~0u,  // no _inlined_string_donated_
-    ~0u,  // no _split_
-    ~0u,  // no sizeof(Split)
-    ::_pbi::kInvalidFieldOffsetTag,
-    ::_pbi::kInvalidFieldOffsetTag,
-    PROTOBUF_FIELD_OFFSET(::io::deephaven::proto::backplane::grpc::TableReference, _impl_.ref_),
-    PROTOBUF_FIELD_OFFSET(::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse, _impl_._has_bits_),
-    PROTOBUF_FIELD_OFFSET(::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse, _internal_metadata_),
-    ~0u,  // no _extensions_
-    ~0u,  // no _oneof_case_
-    ~0u,  // no _weak_field_map_
-    ~0u,  // no _inlined_string_donated_
-    ~0u,  // no _split_
-    ~0u,  // no sizeof(Split)
-    PROTOBUF_FIELD_OFFSET(::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse, _impl_.result_id_),
-    PROTOBUF_FIELD_OFFSET(::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse, _impl_.success_),
-    PROTOBUF_FIELD_OFFSET(::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse, _impl_.error_info_),
-    PROTOBUF_FIELD_OFFSET(::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse, _impl_.schema_header_),
-    PROTOBUF_FIELD_OFFSET(::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse, _impl_.is_static_),
-    PROTOBUF_FIELD_OFFSET(::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse, _impl_.size_),
-    0,
-    ~0u,
-    ~0u,
-    ~0u,
-    ~0u,
-    ~0u,
-    PROTOBUF_FIELD_OFFSET(::io::deephaven::proto::backplane::grpc::FetchTableRequest, _impl_._has_bits_),
-    PROTOBUF_FIELD_OFFSET(::io::deephaven::proto::backplane::grpc::FetchTableRequest, _internal_metadata_),
-    ~0u,  // no _extensions_
-    ~0u,  // no _oneof_case_
-    ~0u,  // no _weak_field_map_
-    ~0u,  // no _inlined_string_donated_
-    ~0u,  // no _split_
-    ~0u,  // no sizeof(Split)
-    PROTOBUF_FIELD_OFFSET(::io::deephaven::proto::backplane::grpc::FetchTableRequest, _impl_.source_id_),
-    PROTOBUF_FIELD_OFFSET(::io::deephaven::proto::backplane::grpc::FetchTableRequest, _impl_.result_id_),
-    0,
-    1,
-    PROTOBUF_FIELD_OFFSET(::io::deephaven::proto::backplane::grpc::ApplyPreviewColumnsRequest, _impl_._has_bits_),
-    PROTOBUF_FIELD_OFFSET(::io::deephaven::proto::backplane::grpc::ApplyPreviewColumnsRequest, _internal_metadata_),
-    ~0u,  // no _extensions_
-    ~0u,  // no _oneof_case_
-    ~0u,  // no _weak_field_map_
-    ~0u,  // no _inlined_string_donated_
-    ~0u,  // no _split_
-    ~0u,  // no sizeof(Split)
-    PROTOBUF_FIELD_OFFSET(::io::deephaven::proto::backplane::grpc::ApplyPreviewColumnsRequest, _impl_.source_id_),
-    PROTOBUF_FIELD_OFFSET(::io::deephaven::proto::backplane::grpc::ApplyPreviewColumnsRequest, _impl_.result_id_),
-    0,
-    1,
-    ~0u,  // no _has_bits_
-    PROTOBUF_FIELD_OFFSET(::io::deephaven::proto::backplane::grpc::ExportedTableUpdatesRequest, _internal_metadata_),
-    ~0u,  // no _extensions_
-    ~0u,  // no _oneof_case_
-    ~0u,  // no _weak_field_map_
-    ~0u,  // no _inlined_string_donated_
-    ~0u,  // no _split_
-    ~0u,  // no sizeof(Split)
-    PROTOBUF_FIELD_OFFSET(::io::deephaven::proto::backplane::grpc::ExportedTableUpdateMessage, _impl_._has_bits_),
-    PROTOBUF_FIELD_OFFSET(::io::deephaven::proto::backplane::grpc::ExportedTableUpdateMessage, _internal_metadata_),
-    ~0u,  // no _extensions_
-    ~0u,  // no _oneof_case_
-    ~0u,  // no _weak_field_map_
-    ~0u,  // no _inlined_string_donated_
-    ~0u,  // no _split_
-    ~0u,  // no sizeof(Split)
-    PROTOBUF_FIELD_OFFSET(::io::deephaven::proto::backplane::grpc::ExportedTableUpdateMessage, _impl_.export_id_),
-    PROTOBUF_FIELD_OFFSET(::io::deephaven::proto::backplane::grpc::ExportedTableUpdateMessage, _impl_.size_),
-    PROTOBUF_FIELD_OFFSET(::io::deephaven::proto::backplane::grpc::ExportedTableUpdateMessage, _impl_.update_failure_message_),
-    0,
-    ~0u,
-    ~0u,
-    PROTOBUF_FIELD_OFFSET(::io::deephaven::proto::backplane::grpc::EmptyTableRequest, _impl_._has_bits_),
-    PROTOBUF_FIELD_OFFSET(::io::deephaven::proto::backplane::grpc::EmptyTableRequest, _internal_metadata_),
-    ~0u,  // no _extensions_
-    ~0u,  // no _oneof_case_
-    ~0u,  // no _weak_field_map_
-    ~0u,  // no _inlined_string_donated_
-    ~0u,  // no _split_
-    ~0u,  // no sizeof(Split)
-    PROTOBUF_FIELD_OFFSET(::io::deephaven::proto::backplane::grpc::EmptyTableRequest, _impl_.result_id_),
-    PROTOBUF_FIELD_OFFSET(::io::deephaven::proto::backplane::grpc::EmptyTableRequest, _impl_.size_),
-    0,
-    ~0u,
-    PROTOBUF_FIELD_OFFSET(::io::deephaven::proto::backplane::grpc::TimeTableRequest, _impl_._has_bits_),
-    PROTOBUF_FIELD_OFFSET(::io::deephaven::proto::backplane::grpc::TimeTableRequest, _internal_metadata_),
-    ~0u,  // no _extensions_
-    PROTOBUF_FIELD_OFFSET(::io::deephaven::proto::backplane::grpc::TimeTableRequest, _impl_._oneof_case_[0]),
-    ~0u,  // no _weak_field_map_
-    ~0u,  // no _inlined_string_donated_
-    ~0u,  // no _split_
-    ~0u,  // no sizeof(Split)
-    PROTOBUF_FIELD_OFFSET(::io::deephaven::proto::backplane::grpc::TimeTableRequest, _impl_.result_id_),
-    ::_pbi::kInvalidFieldOffsetTag,
-    ::_pbi::kInvalidFieldOffsetTag,
-    ::_pbi::kInvalidFieldOffsetTag,
-    ::_pbi::kInvalidFieldOffsetTag,
-    PROTOBUF_FIELD_OFFSET(::io::deephaven::proto::backplane::grpc::TimeTableRequest, _impl_.blink_table_),
-    PROTOBUF_FIELD_OFFSET(::io::deephaven::proto::backplane::grpc::TimeTableRequest, _impl_.start_time_),
-    PROTOBUF_FIELD_OFFSET(::io::deephaven::proto::backplane::grpc::TimeTableRequest, _impl_.period_),
-    0,
-    ~0u,
-    ~0u,
-    ~0u,
-    ~0u,
-    ~0u,
-    PROTOBUF_FIELD_OFFSET(::io::deephaven::proto::backplane::grpc::SelectOrUpdateRequest, _impl_._has_bits_),
-    PROTOBUF_FIELD_OFFSET(::io::deephaven::proto::backplane::grpc::SelectOrUpdateRequest, _internal_metadata_),
-    ~0u,  // no _extensions_
-    ~0u,  // no _oneof_case_
-    ~0u,  // no _weak_field_map_
-    ~0u,  // no _inlined_string_donated_
-    ~0u,  // no _split_
-    ~0u,  // no sizeof(Split)
-    PROTOBUF_FIELD_OFFSET(::io::deephaven::proto::backplane::grpc::SelectOrUpdateRequest, _impl_.result_id_),
-    PROTOBUF_FIELD_OFFSET(::io::deephaven::proto::backplane::grpc::SelectOrUpdateRequest, _impl_.source_id_),
-    PROTOBUF_FIELD_OFFSET(::io::deephaven::proto::backplane::grpc::SelectOrUpdateRequest, _impl_.column_specs_),
-    0,
-    1,
-    ~0u,
-    ~0u,  // no _has_bits_
-    PROTOBUF_FIELD_OFFSET(::io::deephaven::proto::backplane::grpc::MathContext, _internal_metadata_),
-    ~0u,  // no _extensions_
-    ~0u,  // no _oneof_case_
-    ~0u,  // no _weak_field_map_
-    ~0u,  // no _inlined_string_donated_
-    ~0u,  // no _split_
-    ~0u,  // no sizeof(Split)
-    PROTOBUF_FIELD_OFFSET(::io::deephaven::proto::backplane::grpc::MathContext, _impl_.precision_),
-    PROTOBUF_FIELD_OFFSET(::io::deephaven::proto::backplane::grpc::MathContext, _impl_.rounding_mode_),
-    ~0u,  // no _has_bits_
-    PROTOBUF_FIELD_OFFSET(::io::deephaven::proto::backplane::grpc::UpdateByWindowScale_UpdateByWindowTicks, _internal_metadata_),
-    ~0u,  // no _extensions_
-    ~0u,  // no _oneof_case_
-    ~0u,  // no _weak_field_map_
-    ~0u,  // no _inlined_string_donated_
-    ~0u,  // no _split_
-    ~0u,  // no sizeof(Split)
-    PROTOBUF_FIELD_OFFSET(::io::deephaven::proto::backplane::grpc::UpdateByWindowScale_UpdateByWindowTicks, _impl_.ticks_),
-    ~0u,  // no _has_bits_
-    PROTOBUF_FIELD_OFFSET(::io::deephaven::proto::backplane::grpc::UpdateByWindowScale_UpdateByWindowTime, _internal_metadata_),
-    ~0u,  // no _extensions_
-    PROTOBUF_FIELD_OFFSET(::io::deephaven::proto::backplane::grpc::UpdateByWindowScale_UpdateByWindowTime, _impl_._oneof_case_[0]),
-    ~0u,  // no _weak_field_map_
-    ~0u,  // no _inlined_string_donated_
-    ~0u,  // no _split_
-    ~0u,  // no sizeof(Split)
-    PROTOBUF_FIELD_OFFSET(::io::deephaven::proto::backplane::grpc::UpdateByWindowScale_UpdateByWindowTime, _impl_.column_),
-    ::_pbi::kInvalidFieldOffsetTag,
-    ::_pbi::kInvalidFieldOffsetTag,
-    PROTOBUF_FIELD_OFFSET(::io::deephaven::proto::backplane::grpc::UpdateByWindowScale_UpdateByWindowTime, _impl_.window_),
-    ~0u,  // no _has_bits_
-    PROTOBUF_FIELD_OFFSET(::io::deephaven::proto::backplane::grpc::UpdateByWindowScale, _internal_metadata_),
-    ~0u,  // no _extensions_
-    PROTOBUF_FIELD_OFFSET(::io::deephaven::proto::backplane::grpc::UpdateByWindowScale, _impl_._oneof_case_[0]),
-    ~0u,  // no _weak_field_map_
-    ~0u,  // no _inlined_string_donated_
-    ~0u,  // no _split_
-    ~0u,  // no sizeof(Split)
-    ::_pbi::kInvalidFieldOffsetTag,
-    ::_pbi::kInvalidFieldOffsetTag,
-    PROTOBUF_FIELD_OFFSET(::io::deephaven::proto::backplane::grpc::UpdateByWindowScale, _impl_.type_),
-    PROTOBUF_FIELD_OFFSET(::io::deephaven::proto::backplane::grpc::UpdateByEmOptions, _impl_._has_bits_),
-    PROTOBUF_FIELD_OFFSET(::io::deephaven::proto::backplane::grpc::UpdateByEmOptions, _internal_metadata_),
-    ~0u,  // no _extensions_
-    ~0u,  // no _oneof_case_
-    ~0u,  // no _weak_field_map_
-    ~0u,  // no _inlined_string_donated_
-    ~0u,  // no _split_
-    ~0u,  // no sizeof(Split)
-    PROTOBUF_FIELD_OFFSET(::io::deephaven::proto::backplane::grpc::UpdateByEmOptions, _impl_.on_null_value_),
-    PROTOBUF_FIELD_OFFSET(::io::deephaven::proto::backplane::grpc::UpdateByEmOptions, _impl_.on_nan_value_),
-    PROTOBUF_FIELD_OFFSET(::io::deephaven::proto::backplane::grpc::UpdateByEmOptions, _impl_.on_null_time_),
-    PROTOBUF_FIELD_OFFSET(::io::deephaven::proto::backplane::grpc::UpdateByEmOptions, _impl_.on_negative_delta_time_),
-    PROTOBUF_FIELD_OFFSET(::io::deephaven::proto::backplane::grpc::UpdateByEmOptions, _impl_.on_zero_delta_time_),
-    PROTOBUF_FIELD_OFFSET(::io::deephaven::proto::backplane::grpc::UpdateByEmOptions, _impl_.big_value_context_),
-    ~0u,
-    ~0u,
-    ~0u,
-    ~0u,
-    ~0u,
-    0,
-    ~0u,  // no _has_bits_
-    PROTOBUF_FIELD_OFFSET(::io::deephaven::proto::backplane::grpc::UpdateByDeltaOptions, _internal_metadata_),
-    ~0u,  // no _extensions_
-    ~0u,  // no _oneof_case_
-    ~0u,  // no _weak_field_map_
-    ~0u,  // no _inlined_string_donated_
-    ~0u,  // no _split_
-    ~0u,  // no sizeof(Split)
-    PROTOBUF_FIELD_OFFSET(::io::deephaven::proto::backplane::grpc::UpdateByDeltaOptions, _impl_.null_behavior_),
-    PROTOBUF_FIELD_OFFSET(::io::deephaven::proto::backplane::grpc::UpdateByRequest_UpdateByOptions, _impl_._has_bits_),
-    PROTOBUF_FIELD_OFFSET(::io::deephaven::proto::backplane::grpc::UpdateByRequest_UpdateByOptions, _internal_metadata_),
-    ~0u,  // no _extensions_
-    ~0u,  // no _oneof_case_
-    ~0u,  // no _weak_field_map_
-    ~0u,  // no _inlined_string_donated_
-    ~0u,  // no _split_
-    ~0u,  // no sizeof(Split)
-    PROTOBUF_FIELD_OFFSET(::io::deephaven::proto::backplane::grpc::UpdateByRequest_UpdateByOptions, _impl_.use_redirection_),
-    PROTOBUF_FIELD_OFFSET(::io::deephaven::proto::backplane::grpc::UpdateByRequest_UpdateByOptions, _impl_.chunk_capacity_),
-    PROTOBUF_FIELD_OFFSET(::io::deephaven::proto::backplane::grpc::UpdateByRequest_UpdateByOptions, _impl_.max_static_sparse_memory_overhead_),
-    PROTOBUF_FIELD_OFFSET(::io::deephaven::proto::backplane::grpc::UpdateByRequest_UpdateByOptions, _impl_.initial_hash_table_size_),
-    PROTOBUF_FIELD_OFFSET(::io::deephaven::proto::backplane::grpc::UpdateByRequest_UpdateByOptions, _impl_.maximum_load_factor_),
-    PROTOBUF_FIELD_OFFSET(::io::deephaven::proto::backplane::grpc::UpdateByRequest_UpdateByOptions, _impl_.target_load_factor_),
-    PROTOBUF_FIELD_OFFSET(::io::deephaven::proto::backplane::grpc::UpdateByRequest_UpdateByOptions, _impl_.math_context_),
-    1,
-    2,
-    3,
-    6,
-    4,
-    5,
-    0,
-    ~0u,  // no _has_bits_
-    PROTOBUF_FIELD_OFFSET(::io::deephaven::proto::backplane::grpc::UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByCumulativeSum, _internal_metadata_),
-    ~0u,  // no _extensions_
-    ~0u,  // no _oneof_case_
-    ~0u,  // no _weak_field_map_
-    ~0u,  // no _inlined_string_donated_
-    ~0u,  // no _split_
-    ~0u,  // no sizeof(Split)
-    ~0u,  // no _has_bits_
-    PROTOBUF_FIELD_OFFSET(::io::deephaven::proto::backplane::grpc::UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByCumulativeMin, _internal_metadata_),
-    ~0u,  // no _extensions_
-    ~0u,  // no _oneof_case_
-    ~0u,  // no _weak_field_map_
-    ~0u,  // no _inlined_string_donated_
-    ~0u,  // no _split_
-    ~0u,  // no sizeof(Split)
-    ~0u,  // no _has_bits_
-    PROTOBUF_FIELD_OFFSET(::io::deephaven::proto::backplane::grpc::UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByCumulativeMax, _internal_metadata_),
-    ~0u,  // no _extensions_
-    ~0u,  // no _oneof_case_
-    ~0u,  // no _weak_field_map_
-    ~0u,  // no _inlined_string_donated_
-    ~0u,  // no _split_
-    ~0u,  // no sizeof(Split)
-    ~0u,  // no _has_bits_
-    PROTOBUF_FIELD_OFFSET(::io::deephaven::proto::backplane::grpc::UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByCumulativeProduct, _internal_metadata_),
-    ~0u,  // no _extensions_
-    ~0u,  // no _oneof_case_
-    ~0u,  // no _weak_field_map_
-    ~0u,  // no _inlined_string_donated_
-    ~0u,  // no _split_
-    ~0u,  // no sizeof(Split)
-    ~0u,  // no _has_bits_
-    PROTOBUF_FIELD_OFFSET(::io::deephaven::proto::backplane::grpc::UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByFill, _internal_metadata_),
-    ~0u,  // no _extensions_
-    ~0u,  // no _oneof_case_
-    ~0u,  // no _weak_field_map_
-    ~0u,  // no _inlined_string_donated_
-    ~0u,  // no _split_
-    ~0u,  // no sizeof(Split)
-    PROTOBUF_FIELD_OFFSET(::io::deephaven::proto::backplane::grpc::UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByEma, _impl_._has_bits_),
-    PROTOBUF_FIELD_OFFSET(::io::deephaven::proto::backplane::grpc::UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByEma, _internal_metadata_),
-    ~0u,  // no _extensions_
-    ~0u,  // no _oneof_case_
-    ~0u,  // no _weak_field_map_
-    ~0u,  // no _inlined_string_donated_
-    ~0u,  // no _split_
-    ~0u,  // no sizeof(Split)
-    PROTOBUF_FIELD_OFFSET(::io::deephaven::proto::backplane::grpc::UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByEma, _impl_.options_),
-    PROTOBUF_FIELD_OFFSET(::io::deephaven::proto::backplane::grpc::UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByEma, _impl_.window_scale_),
-    0,
-    1,
-    PROTOBUF_FIELD_OFFSET(::io::deephaven::proto::backplane::grpc::UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByEms, _impl_._has_bits_),
-    PROTOBUF_FIELD_OFFSET(::io::deephaven::proto::backplane::grpc::UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByEms, _internal_metadata_),
-    ~0u,  // no _extensions_
-    ~0u,  // no _oneof_case_
-    ~0u,  // no _weak_field_map_
-    ~0u,  // no _inlined_string_donated_
-    ~0u,  // no _split_
-    ~0u,  // no sizeof(Split)
-    PROTOBUF_FIELD_OFFSET(::io::deephaven::proto::backplane::grpc::UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByEms, _impl_.options_),
-    PROTOBUF_FIELD_OFFSET(::io::deephaven::proto::backplane::grpc::UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByEms, _impl_.window_scale_),
-    0,
-    1,
-    PROTOBUF_FIELD_OFFSET(::io::deephaven::proto::backplane::grpc::UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByEmMin, _impl_._has_bits_),
-    PROTOBUF_FIELD_OFFSET(::io::deephaven::proto::backplane::grpc::UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByEmMin, _internal_metadata_),
-    ~0u,  // no _extensions_
-    ~0u,  // no _oneof_case_
-    ~0u,  // no _weak_field_map_
-    ~0u,  // no _inlined_string_donated_
-    ~0u,  // no _split_
-    ~0u,  // no sizeof(Split)
-    PROTOBUF_FIELD_OFFSET(::io::deephaven::proto::backplane::grpc::UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByEmMin, _impl_.options_),
-    PROTOBUF_FIELD_OFFSET(::io::deephaven::proto::backplane::grpc::UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByEmMin, _impl_.window_scale_),
-    0,
-    1,
-    PROTOBUF_FIELD_OFFSET(::io::deephaven::proto::backplane::grpc::UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByEmMax, _impl_._has_bits_),
-    PROTOBUF_FIELD_OFFSET(::io::deephaven::proto::backplane::grpc::UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByEmMax, _internal_metadata_),
-    ~0u,  // no _extensions_
-    ~0u,  // no _oneof_case_
-    ~0u,  // no _weak_field_map_
-    ~0u,  // no _inlined_string_donated_
-    ~0u,  // no _split_
-    ~0u,  // no sizeof(Split)
-    PROTOBUF_FIELD_OFFSET(::io::deephaven::proto::backplane::grpc::UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByEmMax, _impl_.options_),
-    PROTOBUF_FIELD_OFFSET(::io::deephaven::proto::backplane::grpc::UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByEmMax, _impl_.window_scale_),
-    0,
-    1,
-    PROTOBUF_FIELD_OFFSET(::io::deephaven::proto::backplane::grpc::UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByEmStd, _impl_._has_bits_),
-    PROTOBUF_FIELD_OFFSET(::io::deephaven::proto::backplane::grpc::UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByEmStd, _internal_metadata_),
-    ~0u,  // no _extensions_
-    ~0u,  // no _oneof_case_
-    ~0u,  // no _weak_field_map_
-    ~0u,  // no _inlined_string_donated_
-    ~0u,  // no _split_
-    ~0u,  // no sizeof(Split)
-    PROTOBUF_FIELD_OFFSET(::io::deephaven::proto::backplane::grpc::UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByEmStd, _impl_.options_),
-    PROTOBUF_FIELD_OFFSET(::io::deephaven::proto::backplane::grpc::UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByEmStd, _impl_.window_scale_),
-    0,
-    1,
-    PROTOBUF_FIELD_OFFSET(::io::deephaven::proto::backplane::grpc::UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByDelta, _impl_._has_bits_),
-    PROTOBUF_FIELD_OFFSET(::io::deephaven::proto::backplane::grpc::UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByDelta, _internal_metadata_),
-    ~0u,  // no _extensions_
-    ~0u,  // no _oneof_case_
-    ~0u,  // no _weak_field_map_
-    ~0u,  // no _inlined_string_donated_
-    ~0u,  // no _split_
-    ~0u,  // no sizeof(Split)
-    PROTOBUF_FIELD_OFFSET(::io::deephaven::proto::backplane::grpc::UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByDelta, _impl_.options_),
-    0,
-    PROTOBUF_FIELD_OFFSET(::io::deephaven::proto::backplane::grpc::UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingSum, _impl_._has_bits_),
-    PROTOBUF_FIELD_OFFSET(::io::deephaven::proto::backplane::grpc::UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingSum, _internal_metadata_),
-    ~0u,  // no _extensions_
-    ~0u,  // no _oneof_case_
-    ~0u,  // no _weak_field_map_
-    ~0u,  // no _inlined_string_donated_
-    ~0u,  // no _split_
-    ~0u,  // no sizeof(Split)
-    PROTOBUF_FIELD_OFFSET(::io::deephaven::proto::backplane::grpc::UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingSum, _impl_.reverse_window_scale_),
-    PROTOBUF_FIELD_OFFSET(::io::deephaven::proto::backplane::grpc::UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingSum, _impl_.forward_window_scale_),
-    0,
-    1,
-    PROTOBUF_FIELD_OFFSET(::io::deephaven::proto::backplane::grpc::UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingGroup, _impl_._has_bits_),
-    PROTOBUF_FIELD_OFFSET(::io::deephaven::proto::backplane::grpc::UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingGroup, _internal_metadata_),
-    ~0u,  // no _extensions_
-    ~0u,  // no _oneof_case_
-    ~0u,  // no _weak_field_map_
-    ~0u,  // no _inlined_string_donated_
-    ~0u,  // no _split_
-    ~0u,  // no sizeof(Split)
-    PROTOBUF_FIELD_OFFSET(::io::deephaven::proto::backplane::grpc::UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingGroup, _impl_.reverse_window_scale_),
-    PROTOBUF_FIELD_OFFSET(::io::deephaven::proto::backplane::grpc::UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingGroup, _impl_.forward_window_scale_),
-    0,
-    1,
-    PROTOBUF_FIELD_OFFSET(::io::deephaven::proto::backplane::grpc::UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingAvg, _impl_._has_bits_),
-    PROTOBUF_FIELD_OFFSET(::io::deephaven::proto::backplane::grpc::UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingAvg, _internal_metadata_),
-    ~0u,  // no _extensions_
-    ~0u,  // no _oneof_case_
-    ~0u,  // no _weak_field_map_
-    ~0u,  // no _inlined_string_donated_
-    ~0u,  // no _split_
-    ~0u,  // no sizeof(Split)
-    PROTOBUF_FIELD_OFFSET(::io::deephaven::proto::backplane::grpc::UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingAvg, _impl_.reverse_window_scale_),
-    PROTOBUF_FIELD_OFFSET(::io::deephaven::proto::backplane::grpc::UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingAvg, _impl_.forward_window_scale_),
-    0,
-    1,
-    PROTOBUF_FIELD_OFFSET(::io::deephaven::proto::backplane::grpc::UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingMin, _impl_._has_bits_),
-    PROTOBUF_FIELD_OFFSET(::io::deephaven::proto::backplane::grpc::UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingMin, _internal_metadata_),
-    ~0u,  // no _extensions_
-    ~0u,  // no _oneof_case_
-    ~0u,  // no _weak_field_map_
-    ~0u,  // no _inlined_string_donated_
-    ~0u,  // no _split_
-    ~0u,  // no sizeof(Split)
-    PROTOBUF_FIELD_OFFSET(::io::deephaven::proto::backplane::grpc::UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingMin, _impl_.reverse_window_scale_),
-    PROTOBUF_FIELD_OFFSET(::io::deephaven::proto::backplane::grpc::UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingMin, _impl_.forward_window_scale_),
-    0,
-    1,
-    PROTOBUF_FIELD_OFFSET(::io::deephaven::proto::backplane::grpc::UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingMax, _impl_._has_bits_),
-    PROTOBUF_FIELD_OFFSET(::io::deephaven::proto::backplane::grpc::UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingMax, _internal_metadata_),
-    ~0u,  // no _extensions_
-    ~0u,  // no _oneof_case_
-    ~0u,  // no _weak_field_map_
-    ~0u,  // no _inlined_string_donated_
-    ~0u,  // no _split_
-    ~0u,  // no sizeof(Split)
-    PROTOBUF_FIELD_OFFSET(::io::deephaven::proto::backplane::grpc::UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingMax, _impl_.reverse_window_scale_),
-    PROTOBUF_FIELD_OFFSET(::io::deephaven::proto::backplane::grpc::UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingMax, _impl_.forward_window_scale_),
-    0,
-    1,
-    PROTOBUF_FIELD_OFFSET(::io::deephaven::proto::backplane::grpc::UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingProduct, _impl_._has_bits_),
-    PROTOBUF_FIELD_OFFSET(::io::deephaven::proto::backplane::grpc::UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingProduct, _internal_metadata_),
-    ~0u,  // no _extensions_
-    ~0u,  // no _oneof_case_
-    ~0u,  // no _weak_field_map_
-    ~0u,  // no _inlined_string_donated_
-    ~0u,  // no _split_
-    ~0u,  // no sizeof(Split)
-    PROTOBUF_FIELD_OFFSET(::io::deephaven::proto::backplane::grpc::UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingProduct, _impl_.reverse_window_scale_),
-    PROTOBUF_FIELD_OFFSET(::io::deephaven::proto::backplane::grpc::UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingProduct, _impl_.forward_window_scale_),
-    0,
-    1,
-    PROTOBUF_FIELD_OFFSET(::io::deephaven::proto::backplane::grpc::UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingCount, _impl_._has_bits_),
-    PROTOBUF_FIELD_OFFSET(::io::deephaven::proto::backplane::grpc::UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingCount, _internal_metadata_),
-    ~0u,  // no _extensions_
-    ~0u,  // no _oneof_case_
-    ~0u,  // no _weak_field_map_
-    ~0u,  // no _inlined_string_donated_
-    ~0u,  // no _split_
-    ~0u,  // no sizeof(Split)
-    PROTOBUF_FIELD_OFFSET(::io::deephaven::proto::backplane::grpc::UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingCount, _impl_.reverse_window_scale_),
-    PROTOBUF_FIELD_OFFSET(::io::deephaven::proto::backplane::grpc::UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingCount, _impl_.forward_window_scale_),
-    0,
-    1,
-    PROTOBUF_FIELD_OFFSET(::io::deephaven::proto::backplane::grpc::UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingStd, _impl_._has_bits_),
-    PROTOBUF_FIELD_OFFSET(::io::deephaven::proto::backplane::grpc::UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingStd, _internal_metadata_),
-    ~0u,  // no _extensions_
-    ~0u,  // no _oneof_case_
-    ~0u,  // no _weak_field_map_
-    ~0u,  // no _inlined_string_donated_
-    ~0u,  // no _split_
-    ~0u,  // no sizeof(Split)
-    PROTOBUF_FIELD_OFFSET(::io::deephaven::proto::backplane::grpc::UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingStd, _impl_.reverse_window_scale_),
-    PROTOBUF_FIELD_OFFSET(::io::deephaven::proto::backplane::grpc::UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingStd, _impl_.forward_window_scale_),
-    0,
-    1,
-    PROTOBUF_FIELD_OFFSET(::io::deephaven::proto::backplane::grpc::UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingWAvg, _impl_._has_bits_),
-    PROTOBUF_FIELD_OFFSET(::io::deephaven::proto::backplane::grpc::UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingWAvg, _internal_metadata_),
-    ~0u,  // no _extensions_
-    ~0u,  // no _oneof_case_
-    ~0u,  // no _weak_field_map_
-    ~0u,  // no _inlined_string_donated_
-    ~0u,  // no _split_
-    ~0u,  // no sizeof(Split)
-    PROTOBUF_FIELD_OFFSET(::io::deephaven::proto::backplane::grpc::UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingWAvg, _impl_.reverse_window_scale_),
-    PROTOBUF_FIELD_OFFSET(::io::deephaven::proto::backplane::grpc::UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingWAvg, _impl_.forward_window_scale_),
-    PROTOBUF_FIELD_OFFSET(::io::deephaven::proto::backplane::grpc::UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingWAvg, _impl_.weight_column_),
-    0,
-    1,
-    ~0u,
-    PROTOBUF_FIELD_OFFSET(::io::deephaven::proto::backplane::grpc::UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingFormula, _impl_._has_bits_),
-    PROTOBUF_FIELD_OFFSET(::io::deephaven::proto::backplane::grpc::UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingFormula, _internal_metadata_),
-    ~0u,  // no _extensions_
-    ~0u,  // no _oneof_case_
-    ~0u,  // no _weak_field_map_
-    ~0u,  // no _inlined_string_donated_
-    ~0u,  // no _split_
-    ~0u,  // no sizeof(Split)
-    PROTOBUF_FIELD_OFFSET(::io::deephaven::proto::backplane::grpc::UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingFormula, _impl_.reverse_window_scale_),
-    PROTOBUF_FIELD_OFFSET(::io::deephaven::proto::backplane::grpc::UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingFormula, _impl_.forward_window_scale_),
-    PROTOBUF_FIELD_OFFSET(::io::deephaven::proto::backplane::grpc::UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingFormula, _impl_.formula_),
-    PROTOBUF_FIELD_OFFSET(::io::deephaven::proto::backplane::grpc::UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingFormula, _impl_.param_token_),
-    0,
-    1,
-    ~0u,
-    ~0u,
-    ~0u,  // no _has_bits_
-    PROTOBUF_FIELD_OFFSET(::io::deephaven::proto::backplane::grpc::UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec, _internal_metadata_),
-    ~0u,  // no _extensions_
-    PROTOBUF_FIELD_OFFSET(::io::deephaven::proto::backplane::grpc::UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec, _impl_._oneof_case_[0]),
-    ~0u,  // no _weak_field_map_
-    ~0u,  // no _inlined_string_donated_
-    ~0u,  // no _split_
-    ~0u,  // no sizeof(Split)
-    ::_pbi::kInvalidFieldOffsetTag,
-    ::_pbi::kInvalidFieldOffsetTag,
-    ::_pbi::kInvalidFieldOffsetTag,
-    ::_pbi::kInvalidFieldOffsetTag,
-    ::_pbi::kInvalidFieldOffsetTag,
-    ::_pbi::kInvalidFieldOffsetTag,
-    ::_pbi::kInvalidFieldOffsetTag,
-    ::_pbi::kInvalidFieldOffsetTag,
-    ::_pbi::kInvalidFieldOffsetTag,
-    ::_pbi::kInvalidFieldOffsetTag,
-    ::_pbi::kInvalidFieldOffsetTag,
-    ::_pbi::kInvalidFieldOffsetTag,
-    ::_pbi::kInvalidFieldOffsetTag,
-    ::_pbi::kInvalidFieldOffsetTag,
-    ::_pbi::kInvalidFieldOffsetTag,
-    ::_pbi::kInvalidFieldOffsetTag,
-    ::_pbi::kInvalidFieldOffsetTag,
-    ::_pbi::kInvalidFieldOffsetTag,
-    ::_pbi::kInvalidFieldOffsetTag,
-    ::_pbi::kInvalidFieldOffsetTag,
-    ::_pbi::kInvalidFieldOffsetTag,
-    PROTOBUF_FIELD_OFFSET(::io::deephaven::proto::backplane::grpc::UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec, _impl_.type_),
-    PROTOBUF_FIELD_OFFSET(::io::deephaven::proto::backplane::grpc::UpdateByRequest_UpdateByOperation_UpdateByColumn, _impl_._has_bits_),
-    PROTOBUF_FIELD_OFFSET(::io::deephaven::proto::backplane::grpc::UpdateByRequest_UpdateByOperation_UpdateByColumn, _internal_metadata_),
-    ~0u,  // no _extensions_
-    ~0u,  // no _oneof_case_
-    ~0u,  // no _weak_field_map_
-    ~0u,  // no _inlined_string_donated_
-    ~0u,  // no _split_
-    ~0u,  // no sizeof(Split)
-    PROTOBUF_FIELD_OFFSET(::io::deephaven::proto::backplane::grpc::UpdateByRequest_UpdateByOperation_UpdateByColumn, _impl_.spec_),
-    PROTOBUF_FIELD_OFFSET(::io::deephaven::proto::backplane::grpc::UpdateByRequest_UpdateByOperation_UpdateByColumn, _impl_.match_pairs_),
-    0,
-    ~0u,
-    ~0u,  // no _has_bits_
-    PROTOBUF_FIELD_OFFSET(::io::deephaven::proto::backplane::grpc::UpdateByRequest_UpdateByOperation, _internal_metadata_),
-    ~0u,  // no _extensions_
-    PROTOBUF_FIELD_OFFSET(::io::deephaven::proto::backplane::grpc::UpdateByRequest_UpdateByOperation, _impl_._oneof_case_[0]),
-    ~0u,  // no _weak_field_map_
-    ~0u,  // no _inlined_string_donated_
-    ~0u,  // no _split_
-    ~0u,  // no sizeof(Split)
-    ::_pbi::kInvalidFieldOffsetTag,
-    PROTOBUF_FIELD_OFFSET(::io::deephaven::proto::backplane::grpc::UpdateByRequest_UpdateByOperation, _impl_.type_),
-    PROTOBUF_FIELD_OFFSET(::io::deephaven::proto::backplane::grpc::UpdateByRequest, _impl_._has_bits_),
-    PROTOBUF_FIELD_OFFSET(::io::deephaven::proto::backplane::grpc::UpdateByRequest, _internal_metadata_),
-    ~0u,  // no _extensions_
-    ~0u,  // no _oneof_case_
-    ~0u,  // no _weak_field_map_
-    ~0u,  // no _inlined_string_donated_
-    ~0u,  // no _split_
-    ~0u,  // no sizeof(Split)
-    PROTOBUF_FIELD_OFFSET(::io::deephaven::proto::backplane::grpc::UpdateByRequest, _impl_.result_id_),
-    PROTOBUF_FIELD_OFFSET(::io::deephaven::proto::backplane::grpc::UpdateByRequest, _impl_.source_id_),
-    PROTOBUF_FIELD_OFFSET(::io::deephaven::proto::backplane::grpc::UpdateByRequest, _impl_.options_),
-    PROTOBUF_FIELD_OFFSET(::io::deephaven::proto::backplane::grpc::UpdateByRequest, _impl_.operations_),
-    PROTOBUF_FIELD_OFFSET(::io::deephaven::proto::backplane::grpc::UpdateByRequest, _impl_.group_by_columns_),
-    0,
-    1,
-    2,
-    ~0u,
-    ~0u,
-    PROTOBUF_FIELD_OFFSET(::io::deephaven::proto::backplane::grpc::SelectDistinctRequest, _impl_._has_bits_),
-    PROTOBUF_FIELD_OFFSET(::io::deephaven::proto::backplane::grpc::SelectDistinctRequest, _internal_metadata_),
-    ~0u,  // no _extensions_
-    ~0u,  // no _oneof_case_
-    ~0u,  // no _weak_field_map_
-    ~0u,  // no _inlined_string_donated_
-    ~0u,  // no _split_
-    ~0u,  // no sizeof(Split)
-    PROTOBUF_FIELD_OFFSET(::io::deephaven::proto::backplane::grpc::SelectDistinctRequest, _impl_.result_id_),
-    PROTOBUF_FIELD_OFFSET(::io::deephaven::proto::backplane::grpc::SelectDistinctRequest, _impl_.source_id_),
-    PROTOBUF_FIELD_OFFSET(::io::deephaven::proto::backplane::grpc::SelectDistinctRequest, _impl_.column_names_),
-    0,
-    1,
-    ~0u,
-    PROTOBUF_FIELD_OFFSET(::io::deephaven::proto::backplane::grpc::DropColumnsRequest, _impl_._has_bits_),
-    PROTOBUF_FIELD_OFFSET(::io::deephaven::proto::backplane::grpc::DropColumnsRequest, _internal_metadata_),
-    ~0u,  // no _extensions_
-    ~0u,  // no _oneof_case_
-    ~0u,  // no _weak_field_map_
-    ~0u,  // no _inlined_string_donated_
-    ~0u,  // no _split_
-    ~0u,  // no sizeof(Split)
-    PROTOBUF_FIELD_OFFSET(::io::deephaven::proto::backplane::grpc::DropColumnsRequest, _impl_.result_id_),
-    PROTOBUF_FIELD_OFFSET(::io::deephaven::proto::backplane::grpc::DropColumnsRequest, _impl_.source_id_),
-    PROTOBUF_FIELD_OFFSET(::io::deephaven::proto::backplane::grpc::DropColumnsRequest, _impl_.column_names_),
-    0,
-    1,
-    ~0u,
-    PROTOBUF_FIELD_OFFSET(::io::deephaven::proto::backplane::grpc::UnstructuredFilterTableRequest, _impl_._has_bits_),
-    PROTOBUF_FIELD_OFFSET(::io::deephaven::proto::backplane::grpc::UnstructuredFilterTableRequest, _internal_metadata_),
-    ~0u,  // no _extensions_
-    ~0u,  // no _oneof_case_
-    ~0u,  // no _weak_field_map_
-    ~0u,  // no _inlined_string_donated_
-    ~0u,  // no _split_
-    ~0u,  // no sizeof(Split)
-    PROTOBUF_FIELD_OFFSET(::io::deephaven::proto::backplane::grpc::UnstructuredFilterTableRequest, _impl_.result_id_),
-    PROTOBUF_FIELD_OFFSET(::io::deephaven::proto::backplane::grpc::UnstructuredFilterTableRequest, _impl_.source_id_),
-    PROTOBUF_FIELD_OFFSET(::io::deephaven::proto::backplane::grpc::UnstructuredFilterTableRequest, _impl_.filters_),
-    0,
-    1,
-    ~0u,
-    PROTOBUF_FIELD_OFFSET(::io::deephaven::proto::backplane::grpc::HeadOrTailRequest, _impl_._has_bits_),
-    PROTOBUF_FIELD_OFFSET(::io::deephaven::proto::backplane::grpc::HeadOrTailRequest, _internal_metadata_),
-    ~0u,  // no _extensions_
-    ~0u,  // no _oneof_case_
-    ~0u,  // no _weak_field_map_
-    ~0u,  // no _inlined_string_donated_
-    ~0u,  // no _split_
-    ~0u,  // no sizeof(Split)
-    PROTOBUF_FIELD_OFFSET(::io::deephaven::proto::backplane::grpc::HeadOrTailRequest, _impl_.result_id_),
-    PROTOBUF_FIELD_OFFSET(::io::deephaven::proto::backplane::grpc::HeadOrTailRequest, _impl_.source_id_),
-    PROTOBUF_FIELD_OFFSET(::io::deephaven::proto::backplane::grpc::HeadOrTailRequest, _impl_.num_rows_),
-    0,
-    1,
-    ~0u,
-    PROTOBUF_FIELD_OFFSET(::io::deephaven::proto::backplane::grpc::HeadOrTailByRequest, _impl_._has_bits_),
-    PROTOBUF_FIELD_OFFSET(::io::deephaven::proto::backplane::grpc::HeadOrTailByRequest, _internal_metadata_),
-    ~0u,  // no _extensions_
-    ~0u,  // no _oneof_case_
-    ~0u,  // no _weak_field_map_
-    ~0u,  // no _inlined_string_donated_
-    ~0u,  // no _split_
-    ~0u,  // no sizeof(Split)
-    PROTOBUF_FIELD_OFFSET(::io::deephaven::proto::backplane::grpc::HeadOrTailByRequest, _impl_.result_id_),
-    PROTOBUF_FIELD_OFFSET(::io::deephaven::proto::backplane::grpc::HeadOrTailByRequest, _impl_.source_id_),
-    PROTOBUF_FIELD_OFFSET(::io::deephaven::proto::backplane::grpc::HeadOrTailByRequest, _impl_.num_rows_),
-    PROTOBUF_FIELD_OFFSET(::io::deephaven::proto::backplane::grpc::HeadOrTailByRequest, _impl_.group_by_column_specs_),
-    0,
-    1,
-    ~0u,
-    ~0u,
-    PROTOBUF_FIELD_OFFSET(::io::deephaven::proto::backplane::grpc::UngroupRequest, _impl_._has_bits_),
-    PROTOBUF_FIELD_OFFSET(::io::deephaven::proto::backplane::grpc::UngroupRequest, _internal_metadata_),
-    ~0u,  // no _extensions_
-    ~0u,  // no _oneof_case_
-    ~0u,  // no _weak_field_map_
-    ~0u,  // no _inlined_string_donated_
-    ~0u,  // no _split_
-    ~0u,  // no sizeof(Split)
-    PROTOBUF_FIELD_OFFSET(::io::deephaven::proto::backplane::grpc::UngroupRequest, _impl_.result_id_),
-    PROTOBUF_FIELD_OFFSET(::io::deephaven::proto::backplane::grpc::UngroupRequest, _impl_.source_id_),
-    PROTOBUF_FIELD_OFFSET(::io::deephaven::proto::backplane::grpc::UngroupRequest, _impl_.null_fill_),
-    PROTOBUF_FIELD_OFFSET(::io::deephaven::proto::backplane::grpc::UngroupRequest, _impl_.columns_to_ungroup_),
-    0,
-    1,
-    ~0u,
-    ~0u,
-    PROTOBUF_FIELD_OFFSET(::io::deephaven::proto::backplane::grpc::MergeTablesRequest, _impl_._has_bits_),
-    PROTOBUF_FIELD_OFFSET(::io::deephaven::proto::backplane::grpc::MergeTablesRequest, _internal_metadata_),
-    ~0u,  // no _extensions_
-    ~0u,  // no _oneof_case_
-    ~0u,  // no _weak_field_map_
-    ~0u,  // no _inlined_string_donated_
-    ~0u,  // no _split_
-    ~0u,  // no sizeof(Split)
-    PROTOBUF_FIELD_OFFSET(::io::deephaven::proto::backplane::grpc::MergeTablesRequest, _impl_.result_id_),
-    PROTOBUF_FIELD_OFFSET(::io::deephaven::proto::backplane::grpc::MergeTablesRequest, _impl_.source_ids_),
-    PROTOBUF_FIELD_OFFSET(::io::deephaven::proto::backplane::grpc::MergeTablesRequest, _impl_.key_column_),
-    0,
-    ~0u,
-    ~0u,
-    PROTOBUF_FIELD_OFFSET(::io::deephaven::proto::backplane::grpc::SnapshotTableRequest, _impl_._has_bits_),
-    PROTOBUF_FIELD_OFFSET(::io::deephaven::proto::backplane::grpc::SnapshotTableRequest, _internal_metadata_),
-    ~0u,  // no _extensions_
-    ~0u,  // no _oneof_case_
-    ~0u,  // no _weak_field_map_
-    ~0u,  // no _inlined_string_donated_
-    ~0u,  // no _split_
-    ~0u,  // no sizeof(Split)
-    PROTOBUF_FIELD_OFFSET(::io::deephaven::proto::backplane::grpc::SnapshotTableRequest, _impl_.result_id_),
-    PROTOBUF_FIELD_OFFSET(::io::deephaven::proto::backplane::grpc::SnapshotTableRequest, _impl_.source_id_),
-    0,
-    1,
-    PROTOBUF_FIELD_OFFSET(::io::deephaven::proto::backplane::grpc::SnapshotWhenTableRequest, _impl_._has_bits_),
-    PROTOBUF_FIELD_OFFSET(::io::deephaven::proto::backplane::grpc::SnapshotWhenTableRequest, _internal_metadata_),
-    ~0u,  // no _extensions_
-    ~0u,  // no _oneof_case_
-    ~0u,  // no _weak_field_map_
-    ~0u,  // no _inlined_string_donated_
-    ~0u,  // no _split_
-    ~0u,  // no sizeof(Split)
-    PROTOBUF_FIELD_OFFSET(::io::deephaven::proto::backplane::grpc::SnapshotWhenTableRequest, _impl_.result_id_),
-    PROTOBUF_FIELD_OFFSET(::io::deephaven::proto::backplane::grpc::SnapshotWhenTableRequest, _impl_.base_id_),
-    PROTOBUF_FIELD_OFFSET(::io::deephaven::proto::backplane::grpc::SnapshotWhenTableRequest, _impl_.trigger_id_),
-    PROTOBUF_FIELD_OFFSET(::io::deephaven::proto::backplane::grpc::SnapshotWhenTableRequest, _impl_.initial_),
-    PROTOBUF_FIELD_OFFSET(::io::deephaven::proto::backplane::grpc::SnapshotWhenTableRequest, _impl_.incremental_),
-    PROTOBUF_FIELD_OFFSET(::io::deephaven::proto::backplane::grpc::SnapshotWhenTableRequest, _impl_.history_),
-    PROTOBUF_FIELD_OFFSET(::io::deephaven::proto::backplane::grpc::SnapshotWhenTableRequest, _impl_.stamp_columns_),
-    0,
-    1,
-    2,
-    ~0u,
-    ~0u,
-    ~0u,
-    ~0u,
-    PROTOBUF_FIELD_OFFSET(::io::deephaven::proto::backplane::grpc::CrossJoinTablesRequest, _impl_._has_bits_),
-    PROTOBUF_FIELD_OFFSET(::io::deephaven::proto::backplane::grpc::CrossJoinTablesRequest, _internal_metadata_),
-    ~0u,  // no _extensions_
-    ~0u,  // no _oneof_case_
-    ~0u,  // no _weak_field_map_
-    ~0u,  // no _inlined_string_donated_
-    ~0u,  // no _split_
-    ~0u,  // no sizeof(Split)
-    PROTOBUF_FIELD_OFFSET(::io::deephaven::proto::backplane::grpc::CrossJoinTablesRequest, _impl_.result_id_),
-    PROTOBUF_FIELD_OFFSET(::io::deephaven::proto::backplane::grpc::CrossJoinTablesRequest, _impl_.left_id_),
-    PROTOBUF_FIELD_OFFSET(::io::deephaven::proto::backplane::grpc::CrossJoinTablesRequest, _impl_.right_id_),
-    PROTOBUF_FIELD_OFFSET(::io::deephaven::proto::backplane::grpc::CrossJoinTablesRequest, _impl_.columns_to_match_),
-    PROTOBUF_FIELD_OFFSET(::io::deephaven::proto::backplane::grpc::CrossJoinTablesRequest, _impl_.columns_to_add_),
-    PROTOBUF_FIELD_OFFSET(::io::deephaven::proto::backplane::grpc::CrossJoinTablesRequest, _impl_.reserve_bits_),
-    0,
-    1,
-    2,
-    ~0u,
-    ~0u,
-    ~0u,
-    PROTOBUF_FIELD_OFFSET(::io::deephaven::proto::backplane::grpc::NaturalJoinTablesRequest, _impl_._has_bits_),
-    PROTOBUF_FIELD_OFFSET(::io::deephaven::proto::backplane::grpc::NaturalJoinTablesRequest, _internal_metadata_),
-    ~0u,  // no _extensions_
-    ~0u,  // no _oneof_case_
-    ~0u,  // no _weak_field_map_
-    ~0u,  // no _inlined_string_donated_
-    ~0u,  // no _split_
-    ~0u,  // no sizeof(Split)
-    PROTOBUF_FIELD_OFFSET(::io::deephaven::proto::backplane::grpc::NaturalJoinTablesRequest, _impl_.result_id_),
-    PROTOBUF_FIELD_OFFSET(::io::deephaven::proto::backplane::grpc::NaturalJoinTablesRequest, _impl_.left_id_),
-    PROTOBUF_FIELD_OFFSET(::io::deephaven::proto::backplane::grpc::NaturalJoinTablesRequest, _impl_.right_id_),
-    PROTOBUF_FIELD_OFFSET(::io::deephaven::proto::backplane::grpc::NaturalJoinTablesRequest, _impl_.columns_to_match_),
-    PROTOBUF_FIELD_OFFSET(::io::deephaven::proto::backplane::grpc::NaturalJoinTablesRequest, _impl_.columns_to_add_),
-    0,
-    1,
-    2,
-    ~0u,
-    ~0u,
-    PROTOBUF_FIELD_OFFSET(::io::deephaven::proto::backplane::grpc::ExactJoinTablesRequest, _impl_._has_bits_),
-    PROTOBUF_FIELD_OFFSET(::io::deephaven::proto::backplane::grpc::ExactJoinTablesRequest, _internal_metadata_),
-    ~0u,  // no _extensions_
-    ~0u,  // no _oneof_case_
-    ~0u,  // no _weak_field_map_
-    ~0u,  // no _inlined_string_donated_
-    ~0u,  // no _split_
-    ~0u,  // no sizeof(Split)
-    PROTOBUF_FIELD_OFFSET(::io::deephaven::proto::backplane::grpc::ExactJoinTablesRequest, _impl_.result_id_),
-    PROTOBUF_FIELD_OFFSET(::io::deephaven::proto::backplane::grpc::ExactJoinTablesRequest, _impl_.left_id_),
-    PROTOBUF_FIELD_OFFSET(::io::deephaven::proto::backplane::grpc::ExactJoinTablesRequest, _impl_.right_id_),
-    PROTOBUF_FIELD_OFFSET(::io::deephaven::proto::backplane::grpc::ExactJoinTablesRequest, _impl_.columns_to_match_),
-    PROTOBUF_FIELD_OFFSET(::io::deephaven::proto::backplane::grpc::ExactJoinTablesRequest, _impl_.columns_to_add_),
-    0,
-    1,
-    2,
-    ~0u,
-    ~0u,
-    PROTOBUF_FIELD_OFFSET(::io::deephaven::proto::backplane::grpc::LeftJoinTablesRequest, _impl_._has_bits_),
-    PROTOBUF_FIELD_OFFSET(::io::deephaven::proto::backplane::grpc::LeftJoinTablesRequest, _internal_metadata_),
-    ~0u,  // no _extensions_
-    ~0u,  // no _oneof_case_
-    ~0u,  // no _weak_field_map_
-    ~0u,  // no _inlined_string_donated_
-    ~0u,  // no _split_
-    ~0u,  // no sizeof(Split)
-    PROTOBUF_FIELD_OFFSET(::io::deephaven::proto::backplane::grpc::LeftJoinTablesRequest, _impl_.result_id_),
-    PROTOBUF_FIELD_OFFSET(::io::deephaven::proto::backplane::grpc::LeftJoinTablesRequest, _impl_.left_id_),
-    PROTOBUF_FIELD_OFFSET(::io::deephaven::proto::backplane::grpc::LeftJoinTablesRequest, _impl_.right_id_),
-    PROTOBUF_FIELD_OFFSET(::io::deephaven::proto::backplane::grpc::LeftJoinTablesRequest, _impl_.columns_to_match_),
-    PROTOBUF_FIELD_OFFSET(::io::deephaven::proto::backplane::grpc::LeftJoinTablesRequest, _impl_.columns_to_add_),
-    0,
-    1,
-    2,
-    ~0u,
-    ~0u,
-    PROTOBUF_FIELD_OFFSET(::io::deephaven::proto::backplane::grpc::AsOfJoinTablesRequest, _impl_._has_bits_),
-    PROTOBUF_FIELD_OFFSET(::io::deephaven::proto::backplane::grpc::AsOfJoinTablesRequest, _internal_metadata_),
-    ~0u,  // no _extensions_
-    ~0u,  // no _oneof_case_
-    ~0u,  // no _weak_field_map_
-    ~0u,  // no _inlined_string_donated_
-    ~0u,  // no _split_
-    ~0u,  // no sizeof(Split)
-    PROTOBUF_FIELD_OFFSET(::io::deephaven::proto::backplane::grpc::AsOfJoinTablesRequest, _impl_.result_id_),
-    PROTOBUF_FIELD_OFFSET(::io::deephaven::proto::backplane::grpc::AsOfJoinTablesRequest, _impl_.left_id_),
-    PROTOBUF_FIELD_OFFSET(::io::deephaven::proto::backplane::grpc::AsOfJoinTablesRequest, _impl_.right_id_),
-    PROTOBUF_FIELD_OFFSET(::io::deephaven::proto::backplane::grpc::AsOfJoinTablesRequest, _impl_.columns_to_match_),
-    PROTOBUF_FIELD_OFFSET(::io::deephaven::proto::backplane::grpc::AsOfJoinTablesRequest, _impl_.columns_to_add_),
-    PROTOBUF_FIELD_OFFSET(::io::deephaven::proto::backplane::grpc::AsOfJoinTablesRequest, _impl_.as_of_match_rule_),
-    0,
-    1,
-    2,
-    ~0u,
-    ~0u,
-    ~0u,
-    PROTOBUF_FIELD_OFFSET(::io::deephaven::proto::backplane::grpc::AjRajTablesRequest, _impl_._has_bits_),
-    PROTOBUF_FIELD_OFFSET(::io::deephaven::proto::backplane::grpc::AjRajTablesRequest, _internal_metadata_),
-    ~0u,  // no _extensions_
-    ~0u,  // no _oneof_case_
-    ~0u,  // no _weak_field_map_
-    ~0u,  // no _inlined_string_donated_
-    ~0u,  // no _split_
-    ~0u,  // no sizeof(Split)
-    PROTOBUF_FIELD_OFFSET(::io::deephaven::proto::backplane::grpc::AjRajTablesRequest, _impl_.result_id_),
-    PROTOBUF_FIELD_OFFSET(::io::deephaven::proto::backplane::grpc::AjRajTablesRequest, _impl_.left_id_),
-    PROTOBUF_FIELD_OFFSET(::io::deephaven::proto::backplane::grpc::AjRajTablesRequest, _impl_.right_id_),
-    PROTOBUF_FIELD_OFFSET(::io::deephaven::proto::backplane::grpc::AjRajTablesRequest, _impl_.exact_match_columns_),
-    PROTOBUF_FIELD_OFFSET(::io::deephaven::proto::backplane::grpc::AjRajTablesRequest, _impl_.as_of_column_),
-    PROTOBUF_FIELD_OFFSET(::io::deephaven::proto::backplane::grpc::AjRajTablesRequest, _impl_.columns_to_add_),
-    0,
-    1,
-    2,
-    ~0u,
-    ~0u,
-    ~0u,
-    PROTOBUF_FIELD_OFFSET(::io::deephaven::proto::backplane::grpc::MultiJoinInput, _impl_._has_bits_),
-    PROTOBUF_FIELD_OFFSET(::io::deephaven::proto::backplane::grpc::MultiJoinInput, _internal_metadata_),
-    ~0u,  // no _extensions_
-    ~0u,  // no _oneof_case_
-    ~0u,  // no _weak_field_map_
-    ~0u,  // no _inlined_string_donated_
-    ~0u,  // no _split_
-    ~0u,  // no sizeof(Split)
-    PROTOBUF_FIELD_OFFSET(::io::deephaven::proto::backplane::grpc::MultiJoinInput, _impl_.source_id_),
-    PROTOBUF_FIELD_OFFSET(::io::deephaven::proto::backplane::grpc::MultiJoinInput, _impl_.columns_to_match_),
-    PROTOBUF_FIELD_OFFSET(::io::deephaven::proto::backplane::grpc::MultiJoinInput, _impl_.columns_to_add_),
-    0,
-    ~0u,
-    ~0u,
-    PROTOBUF_FIELD_OFFSET(::io::deephaven::proto::backplane::grpc::MultiJoinTablesRequest, _impl_._has_bits_),
-    PROTOBUF_FIELD_OFFSET(::io::deephaven::proto::backplane::grpc::MultiJoinTablesRequest, _internal_metadata_),
-    ~0u,  // no _extensions_
-    ~0u,  // no _oneof_case_
-    ~0u,  // no _weak_field_map_
-    ~0u,  // no _inlined_string_donated_
-    ~0u,  // no _split_
-    ~0u,  // no sizeof(Split)
-    PROTOBUF_FIELD_OFFSET(::io::deephaven::proto::backplane::grpc::MultiJoinTablesRequest, _impl_.result_id_),
-    PROTOBUF_FIELD_OFFSET(::io::deephaven::proto::backplane::grpc::MultiJoinTablesRequest, _impl_.multi_join_inputs_),
-    0,
-    ~0u,
-    PROTOBUF_FIELD_OFFSET(::io::deephaven::proto::backplane::grpc::RangeJoinTablesRequest, _impl_._has_bits_),
-    PROTOBUF_FIELD_OFFSET(::io::deephaven::proto::backplane::grpc::RangeJoinTablesRequest, _internal_metadata_),
-    ~0u,  // no _extensions_
-    ~0u,  // no _oneof_case_
-    ~0u,  // no _weak_field_map_
-    ~0u,  // no _inlined_string_donated_
-    ~0u,  // no _split_
-    ~0u,  // no sizeof(Split)
-    PROTOBUF_FIELD_OFFSET(::io::deephaven::proto::backplane::grpc::RangeJoinTablesRequest, _impl_.result_id_),
-    PROTOBUF_FIELD_OFFSET(::io::deephaven::proto::backplane::grpc::RangeJoinTablesRequest, _impl_.left_id_),
-    PROTOBUF_FIELD_OFFSET(::io::deephaven::proto::backplane::grpc::RangeJoinTablesRequest, _impl_.right_id_),
-    PROTOBUF_FIELD_OFFSET(::io::deephaven::proto::backplane::grpc::RangeJoinTablesRequest, _impl_.exact_match_columns_),
-    PROTOBUF_FIELD_OFFSET(::io::deephaven::proto::backplane::grpc::RangeJoinTablesRequest, _impl_.left_start_column_),
-    PROTOBUF_FIELD_OFFSET(::io::deephaven::proto::backplane::grpc::RangeJoinTablesRequest, _impl_.range_start_rule_),
-    PROTOBUF_FIELD_OFFSET(::io::deephaven::proto::backplane::grpc::RangeJoinTablesRequest, _impl_.right_range_column_),
-    PROTOBUF_FIELD_OFFSET(::io::deephaven::proto::backplane::grpc::RangeJoinTablesRequest, _impl_.range_end_rule_),
-    PROTOBUF_FIELD_OFFSET(::io::deephaven::proto::backplane::grpc::RangeJoinTablesRequest, _impl_.left_end_column_),
-    PROTOBUF_FIELD_OFFSET(::io::deephaven::proto::backplane::grpc::RangeJoinTablesRequest, _impl_.aggregations_),
-    PROTOBUF_FIELD_OFFSET(::io::deephaven::proto::backplane::grpc::RangeJoinTablesRequest, _impl_.range_match_),
-    0,
-    1,
-    2,
-    ~0u,
-    ~0u,
-    ~0u,
-    ~0u,
-    ~0u,
-    ~0u,
-    ~0u,
-    ~0u,
-    ~0u,  // no _has_bits_
-    PROTOBUF_FIELD_OFFSET(::io::deephaven::proto::backplane::grpc::ComboAggregateRequest_Aggregate, _internal_metadata_),
-    ~0u,  // no _extensions_
-    ~0u,  // no _oneof_case_
-    ~0u,  // no _weak_field_map_
-    ~0u,  // no _inlined_string_donated_
-    ~0u,  // no _split_
-    ~0u,  // no sizeof(Split)
-    PROTOBUF_FIELD_OFFSET(::io::deephaven::proto::backplane::grpc::ComboAggregateRequest_Aggregate, _impl_.type_),
-    PROTOBUF_FIELD_OFFSET(::io::deephaven::proto::backplane::grpc::ComboAggregateRequest_Aggregate, _impl_.match_pairs_),
-    PROTOBUF_FIELD_OFFSET(::io::deephaven::proto::backplane::grpc::ComboAggregateRequest_Aggregate, _impl_.column_name_),
-    PROTOBUF_FIELD_OFFSET(::io::deephaven::proto::backplane::grpc::ComboAggregateRequest_Aggregate, _impl_.percentile_),
-    PROTOBUF_FIELD_OFFSET(::io::deephaven::proto::backplane::grpc::ComboAggregateRequest_Aggregate, _impl_.avg_median_),
-    PROTOBUF_FIELD_OFFSET(::io::deephaven::proto::backplane::grpc::ComboAggregateRequest, _impl_._has_bits_),
-    PROTOBUF_FIELD_OFFSET(::io::deephaven::proto::backplane::grpc::ComboAggregateRequest, _internal_metadata_),
-    ~0u,  // no _extensions_
-    ~0u,  // no _oneof_case_
-    ~0u,  // no _weak_field_map_
-    ~0u,  // no _inlined_string_donated_
-    ~0u,  // no _split_
-    ~0u,  // no sizeof(Split)
-    PROTOBUF_FIELD_OFFSET(::io::deephaven::proto::backplane::grpc::ComboAggregateRequest, _impl_.result_id_),
-    PROTOBUF_FIELD_OFFSET(::io::deephaven::proto::backplane::grpc::ComboAggregateRequest, _impl_.source_id_),
-    PROTOBUF_FIELD_OFFSET(::io::deephaven::proto::backplane::grpc::ComboAggregateRequest, _impl_.aggregates_),
-    PROTOBUF_FIELD_OFFSET(::io::deephaven::proto::backplane::grpc::ComboAggregateRequest, _impl_.group_by_columns_),
-    PROTOBUF_FIELD_OFFSET(::io::deephaven::proto::backplane::grpc::ComboAggregateRequest, _impl_.force_combo_),
-    0,
-    1,
-    ~0u,
-    ~0u,
-    ~0u,
-    PROTOBUF_FIELD_OFFSET(::io::deephaven::proto::backplane::grpc::AggregateAllRequest, _impl_._has_bits_),
-    PROTOBUF_FIELD_OFFSET(::io::deephaven::proto::backplane::grpc::AggregateAllRequest, _internal_metadata_),
-    ~0u,  // no _extensions_
-    ~0u,  // no _oneof_case_
-    ~0u,  // no _weak_field_map_
-    ~0u,  // no _inlined_string_donated_
-    ~0u,  // no _split_
-    ~0u,  // no sizeof(Split)
-    PROTOBUF_FIELD_OFFSET(::io::deephaven::proto::backplane::grpc::AggregateAllRequest, _impl_.result_id_),
-    PROTOBUF_FIELD_OFFSET(::io::deephaven::proto::backplane::grpc::AggregateAllRequest, _impl_.source_id_),
-    PROTOBUF_FIELD_OFFSET(::io::deephaven::proto::backplane::grpc::AggregateAllRequest, _impl_.spec_),
-    PROTOBUF_FIELD_OFFSET(::io::deephaven::proto::backplane::grpc::AggregateAllRequest, _impl_.group_by_columns_),
-    0,
-    1,
-    2,
-    ~0u,
-    PROTOBUF_FIELD_OFFSET(::io::deephaven::proto::backplane::grpc::AggSpec_AggSpecApproximatePercentile, _impl_._has_bits_),
-    PROTOBUF_FIELD_OFFSET(::io::deephaven::proto::backplane::grpc::AggSpec_AggSpecApproximatePercentile, _internal_metadata_),
-    ~0u,  // no _extensions_
-    ~0u,  // no _oneof_case_
-    ~0u,  // no _weak_field_map_
-    ~0u,  // no _inlined_string_donated_
-    ~0u,  // no _split_
-    ~0u,  // no sizeof(Split)
-    PROTOBUF_FIELD_OFFSET(::io::deephaven::proto::backplane::grpc::AggSpec_AggSpecApproximatePercentile, _impl_.percentile_),
-    PROTOBUF_FIELD_OFFSET(::io::deephaven::proto::backplane::grpc::AggSpec_AggSpecApproximatePercentile, _impl_.compression_),
-    ~0u,
-    0,
-    ~0u,  // no _has_bits_
-    PROTOBUF_FIELD_OFFSET(::io::deephaven::proto::backplane::grpc::AggSpec_AggSpecCountDistinct, _internal_metadata_),
-    ~0u,  // no _extensions_
-    ~0u,  // no _oneof_case_
-    ~0u,  // no _weak_field_map_
-    ~0u,  // no _inlined_string_donated_
-    ~0u,  // no _split_
-    ~0u,  // no sizeof(Split)
-    PROTOBUF_FIELD_OFFSET(::io::deephaven::proto::backplane::grpc::AggSpec_AggSpecCountDistinct, _impl_.count_nulls_),
-    ~0u,  // no _has_bits_
-    PROTOBUF_FIELD_OFFSET(::io::deephaven::proto::backplane::grpc::AggSpec_AggSpecDistinct, _internal_metadata_),
-    ~0u,  // no _extensions_
-    ~0u,  // no _oneof_case_
-    ~0u,  // no _weak_field_map_
-    ~0u,  // no _inlined_string_donated_
-    ~0u,  // no _split_
-    ~0u,  // no sizeof(Split)
-    PROTOBUF_FIELD_OFFSET(::io::deephaven::proto::backplane::grpc::AggSpec_AggSpecDistinct, _impl_.include_nulls_),
-    ~0u,  // no _has_bits_
-    PROTOBUF_FIELD_OFFSET(::io::deephaven::proto::backplane::grpc::AggSpec_AggSpecFormula, _internal_metadata_),
-    ~0u,  // no _extensions_
-    ~0u,  // no _oneof_case_
-    ~0u,  // no _weak_field_map_
-    ~0u,  // no _inlined_string_donated_
-    ~0u,  // no _split_
-    ~0u,  // no sizeof(Split)
-    PROTOBUF_FIELD_OFFSET(::io::deephaven::proto::backplane::grpc::AggSpec_AggSpecFormula, _impl_.formula_),
-    PROTOBUF_FIELD_OFFSET(::io::deephaven::proto::backplane::grpc::AggSpec_AggSpecFormula, _impl_.param_token_),
-    ~0u,  // no _has_bits_
-    PROTOBUF_FIELD_OFFSET(::io::deephaven::proto::backplane::grpc::AggSpec_AggSpecMedian, _internal_metadata_),
-    ~0u,  // no _extensions_
-    ~0u,  // no _oneof_case_
-    ~0u,  // no _weak_field_map_
-    ~0u,  // no _inlined_string_donated_
-    ~0u,  // no _split_
-    ~0u,  // no sizeof(Split)
-    PROTOBUF_FIELD_OFFSET(::io::deephaven::proto::backplane::grpc::AggSpec_AggSpecMedian, _impl_.average_evenly_divided_),
-    ~0u,  // no _has_bits_
-    PROTOBUF_FIELD_OFFSET(::io::deephaven::proto::backplane::grpc::AggSpec_AggSpecPercentile, _internal_metadata_),
-    ~0u,  // no _extensions_
-    ~0u,  // no _oneof_case_
-    ~0u,  // no _weak_field_map_
-    ~0u,  // no _inlined_string_donated_
-    ~0u,  // no _split_
-    ~0u,  // no sizeof(Split)
-    PROTOBUF_FIELD_OFFSET(::io::deephaven::proto::backplane::grpc::AggSpec_AggSpecPercentile, _impl_.percentile_),
-    PROTOBUF_FIELD_OFFSET(::io::deephaven::proto::backplane::grpc::AggSpec_AggSpecPercentile, _impl_.average_evenly_divided_),
-    ~0u,  // no _has_bits_
-    PROTOBUF_FIELD_OFFSET(::io::deephaven::proto::backplane::grpc::AggSpec_AggSpecSorted, _internal_metadata_),
-    ~0u,  // no _extensions_
-    ~0u,  // no _oneof_case_
-    ~0u,  // no _weak_field_map_
-    ~0u,  // no _inlined_string_donated_
-    ~0u,  // no _split_
-    ~0u,  // no sizeof(Split)
-    PROTOBUF_FIELD_OFFSET(::io::deephaven::proto::backplane::grpc::AggSpec_AggSpecSorted, _impl_.columns_),
-    ~0u,  // no _has_bits_
-    PROTOBUF_FIELD_OFFSET(::io::deephaven::proto::backplane::grpc::AggSpec_AggSpecSortedColumn, _internal_metadata_),
-    ~0u,  // no _extensions_
-    ~0u,  // no _oneof_case_
-    ~0u,  // no _weak_field_map_
-    ~0u,  // no _inlined_string_donated_
-    ~0u,  // no _split_
-    ~0u,  // no sizeof(Split)
-    PROTOBUF_FIELD_OFFSET(::io::deephaven::proto::backplane::grpc::AggSpec_AggSpecSortedColumn, _impl_.column_name_),
-    PROTOBUF_FIELD_OFFSET(::io::deephaven::proto::backplane::grpc::AggSpec_AggSpecTDigest, _impl_._has_bits_),
-    PROTOBUF_FIELD_OFFSET(::io::deephaven::proto::backplane::grpc::AggSpec_AggSpecTDigest, _internal_metadata_),
-    ~0u,  // no _extensions_
-    ~0u,  // no _oneof_case_
-    ~0u,  // no _weak_field_map_
-    ~0u,  // no _inlined_string_donated_
-    ~0u,  // no _split_
-    ~0u,  // no sizeof(Split)
-    PROTOBUF_FIELD_OFFSET(::io::deephaven::proto::backplane::grpc::AggSpec_AggSpecTDigest, _impl_.compression_),
-    0,
-    PROTOBUF_FIELD_OFFSET(::io::deephaven::proto::backplane::grpc::AggSpec_AggSpecUnique, _impl_._has_bits_),
-    PROTOBUF_FIELD_OFFSET(::io::deephaven::proto::backplane::grpc::AggSpec_AggSpecUnique, _internal_metadata_),
-    ~0u,  // no _extensions_
-    ~0u,  // no _oneof_case_
-    ~0u,  // no _weak_field_map_
-    ~0u,  // no _inlined_string_donated_
-    ~0u,  // no _split_
-    ~0u,  // no sizeof(Split)
-    PROTOBUF_FIELD_OFFSET(::io::deephaven::proto::backplane::grpc::AggSpec_AggSpecUnique, _impl_.include_nulls_),
-    PROTOBUF_FIELD_OFFSET(::io::deephaven::proto::backplane::grpc::AggSpec_AggSpecUnique, _impl_.non_unique_sentinel_),
-    ~0u,
-    0,
-    ~0u,  // no _has_bits_
-    PROTOBUF_FIELD_OFFSET(::io::deephaven::proto::backplane::grpc::AggSpec_AggSpecNonUniqueSentinel, _internal_metadata_),
-    ~0u,  // no _extensions_
-    PROTOBUF_FIELD_OFFSET(::io::deephaven::proto::backplane::grpc::AggSpec_AggSpecNonUniqueSentinel, _impl_._oneof_case_[0]),
-    ~0u,  // no _weak_field_map_
-    ~0u,  // no _inlined_string_donated_
-    ~0u,  // no _split_
-    ~0u,  // no sizeof(Split)
-    ::_pbi::kInvalidFieldOffsetTag,
-    ::_pbi::kInvalidFieldOffsetTag,
-    ::_pbi::kInvalidFieldOffsetTag,
-    ::_pbi::kInvalidFieldOffsetTag,
-    ::_pbi::kInvalidFieldOffsetTag,
-    ::_pbi::kInvalidFieldOffsetTag,
-    ::_pbi::kInvalidFieldOffsetTag,
-    ::_pbi::kInvalidFieldOffsetTag,
-    ::_pbi::kInvalidFieldOffsetTag,
-    ::_pbi::kInvalidFieldOffsetTag,
-    PROTOBUF_FIELD_OFFSET(::io::deephaven::proto::backplane::grpc::AggSpec_AggSpecNonUniqueSentinel, _impl_.type_),
-    ~0u,  // no _has_bits_
-    PROTOBUF_FIELD_OFFSET(::io::deephaven::proto::backplane::grpc::AggSpec_AggSpecWeighted, _internal_metadata_),
-    ~0u,  // no _extensions_
-    ~0u,  // no _oneof_case_
-    ~0u,  // no _weak_field_map_
-    ~0u,  // no _inlined_string_donated_
-    ~0u,  // no _split_
-    ~0u,  // no sizeof(Split)
-    PROTOBUF_FIELD_OFFSET(::io::deephaven::proto::backplane::grpc::AggSpec_AggSpecWeighted, _impl_.weight_column_),
-    ~0u,  // no _has_bits_
-    PROTOBUF_FIELD_OFFSET(::io::deephaven::proto::backplane::grpc::AggSpec_AggSpecAbsSum, _internal_metadata_),
-    ~0u,  // no _extensions_
-    ~0u,  // no _oneof_case_
-    ~0u,  // no _weak_field_map_
-    ~0u,  // no _inlined_string_donated_
-    ~0u,  // no _split_
-    ~0u,  // no sizeof(Split)
-    ~0u,  // no _has_bits_
-    PROTOBUF_FIELD_OFFSET(::io::deephaven::proto::backplane::grpc::AggSpec_AggSpecAvg, _internal_metadata_),
-    ~0u,  // no _extensions_
-    ~0u,  // no _oneof_case_
-    ~0u,  // no _weak_field_map_
-    ~0u,  // no _inlined_string_donated_
-    ~0u,  // no _split_
-    ~0u,  // no sizeof(Split)
-    ~0u,  // no _has_bits_
-    PROTOBUF_FIELD_OFFSET(::io::deephaven::proto::backplane::grpc::AggSpec_AggSpecFirst, _internal_metadata_),
-    ~0u,  // no _extensions_
-    ~0u,  // no _oneof_case_
-    ~0u,  // no _weak_field_map_
-    ~0u,  // no _inlined_string_donated_
-    ~0u,  // no _split_
-    ~0u,  // no sizeof(Split)
-    ~0u,  // no _has_bits_
-    PROTOBUF_FIELD_OFFSET(::io::deephaven::proto::backplane::grpc::AggSpec_AggSpecFreeze, _internal_metadata_),
-    ~0u,  // no _extensions_
-    ~0u,  // no _oneof_case_
-    ~0u,  // no _weak_field_map_
-    ~0u,  // no _inlined_string_donated_
-    ~0u,  // no _split_
-    ~0u,  // no sizeof(Split)
-    ~0u,  // no _has_bits_
-    PROTOBUF_FIELD_OFFSET(::io::deephaven::proto::backplane::grpc::AggSpec_AggSpecGroup, _internal_metadata_),
-    ~0u,  // no _extensions_
-    ~0u,  // no _oneof_case_
-    ~0u,  // no _weak_field_map_
-    ~0u,  // no _inlined_string_donated_
-    ~0u,  // no _split_
-    ~0u,  // no sizeof(Split)
-    ~0u,  // no _has_bits_
-    PROTOBUF_FIELD_OFFSET(::io::deephaven::proto::backplane::grpc::AggSpec_AggSpecLast, _internal_metadata_),
-    ~0u,  // no _extensions_
-    ~0u,  // no _oneof_case_
-    ~0u,  // no _weak_field_map_
-    ~0u,  // no _inlined_string_donated_
-    ~0u,  // no _split_
-    ~0u,  // no sizeof(Split)
-    ~0u,  // no _has_bits_
-    PROTOBUF_FIELD_OFFSET(::io::deephaven::proto::backplane::grpc::AggSpec_AggSpecMax, _internal_metadata_),
-    ~0u,  // no _extensions_
-    ~0u,  // no _oneof_case_
-    ~0u,  // no _weak_field_map_
-    ~0u,  // no _inlined_string_donated_
-    ~0u,  // no _split_
-    ~0u,  // no sizeof(Split)
-    ~0u,  // no _has_bits_
-    PROTOBUF_FIELD_OFFSET(::io::deephaven::proto::backplane::grpc::AggSpec_AggSpecMin, _internal_metadata_),
-    ~0u,  // no _extensions_
-    ~0u,  // no _oneof_case_
-    ~0u,  // no _weak_field_map_
-    ~0u,  // no _inlined_string_donated_
-    ~0u,  // no _split_
-    ~0u,  // no sizeof(Split)
-    ~0u,  // no _has_bits_
-    PROTOBUF_FIELD_OFFSET(::io::deephaven::proto::backplane::grpc::AggSpec_AggSpecStd, _internal_metadata_),
-    ~0u,  // no _extensions_
-    ~0u,  // no _oneof_case_
-    ~0u,  // no _weak_field_map_
-    ~0u,  // no _inlined_string_donated_
-    ~0u,  // no _split_
-    ~0u,  // no sizeof(Split)
-    ~0u,  // no _has_bits_
-    PROTOBUF_FIELD_OFFSET(::io::deephaven::proto::backplane::grpc::AggSpec_AggSpecSum, _internal_metadata_),
-    ~0u,  // no _extensions_
-    ~0u,  // no _oneof_case_
-    ~0u,  // no _weak_field_map_
-    ~0u,  // no _inlined_string_donated_
-    ~0u,  // no _split_
-    ~0u,  // no sizeof(Split)
-    ~0u,  // no _has_bits_
-    PROTOBUF_FIELD_OFFSET(::io::deephaven::proto::backplane::grpc::AggSpec_AggSpecVar, _internal_metadata_),
-    ~0u,  // no _extensions_
-    ~0u,  // no _oneof_case_
-    ~0u,  // no _weak_field_map_
-    ~0u,  // no _inlined_string_donated_
-    ~0u,  // no _split_
-    ~0u,  // no sizeof(Split)
-    ~0u,  // no _has_bits_
-    PROTOBUF_FIELD_OFFSET(::io::deephaven::proto::backplane::grpc::AggSpec, _internal_metadata_),
-    ~0u,  // no _extensions_
-    PROTOBUF_FIELD_OFFSET(::io::deephaven::proto::backplane::grpc::AggSpec, _impl_._oneof_case_[0]),
-    ~0u,  // no _weak_field_map_
-    ~0u,  // no _inlined_string_donated_
-    ~0u,  // no _split_
-    ~0u,  // no sizeof(Split)
-    ::_pbi::kInvalidFieldOffsetTag,
-    ::_pbi::kInvalidFieldOffsetTag,
-    ::_pbi::kInvalidFieldOffsetTag,
-    ::_pbi::kInvalidFieldOffsetTag,
-    ::_pbi::kInvalidFieldOffsetTag,
-    ::_pbi::kInvalidFieldOffsetTag,
-    ::_pbi::kInvalidFieldOffsetTag,
-    ::_pbi::kInvalidFieldOffsetTag,
-    ::_pbi::kInvalidFieldOffsetTag,
-    ::_pbi::kInvalidFieldOffsetTag,
-    ::_pbi::kInvalidFieldOffsetTag,
-    ::_pbi::kInvalidFieldOffsetTag,
-    ::_pbi::kInvalidFieldOffsetTag,
-    ::_pbi::kInvalidFieldOffsetTag,
-    ::_pbi::kInvalidFieldOffsetTag,
-    ::_pbi::kInvalidFieldOffsetTag,
-    ::_pbi::kInvalidFieldOffsetTag,
-    ::_pbi::kInvalidFieldOffsetTag,
-    ::_pbi::kInvalidFieldOffsetTag,
-    ::_pbi::kInvalidFieldOffsetTag,
-    ::_pbi::kInvalidFieldOffsetTag,
-    ::_pbi::kInvalidFieldOffsetTag,
-    ::_pbi::kInvalidFieldOffsetTag,
-    PROTOBUF_FIELD_OFFSET(::io::deephaven::proto::backplane::grpc::AggSpec, _impl_.type_),
-    PROTOBUF_FIELD_OFFSET(::io::deephaven::proto::backplane::grpc::AggregateRequest, _impl_._has_bits_),
-    PROTOBUF_FIELD_OFFSET(::io::deephaven::proto::backplane::grpc::AggregateRequest, _internal_metadata_),
-    ~0u,  // no _extensions_
-    ~0u,  // no _oneof_case_
-    ~0u,  // no _weak_field_map_
-    ~0u,  // no _inlined_string_donated_
-    ~0u,  // no _split_
-    ~0u,  // no sizeof(Split)
-    PROTOBUF_FIELD_OFFSET(::io::deephaven::proto::backplane::grpc::AggregateRequest, _impl_.result_id_),
-    PROTOBUF_FIELD_OFFSET(::io::deephaven::proto::backplane::grpc::AggregateRequest, _impl_.source_id_),
-    PROTOBUF_FIELD_OFFSET(::io::deephaven::proto::backplane::grpc::AggregateRequest, _impl_.initial_groups_id_),
-    PROTOBUF_FIELD_OFFSET(::io::deephaven::proto::backplane::grpc::AggregateRequest, _impl_.preserve_empty_),
-    PROTOBUF_FIELD_OFFSET(::io::deephaven::proto::backplane::grpc::AggregateRequest, _impl_.aggregations_),
-    PROTOBUF_FIELD_OFFSET(::io::deephaven::proto::backplane::grpc::AggregateRequest, _impl_.group_by_columns_),
-    0,
-    1,
-    2,
-    ~0u,
-    ~0u,
-    ~0u,
-    PROTOBUF_FIELD_OFFSET(::io::deephaven::proto::backplane::grpc::Aggregation_AggregationColumns, _impl_._has_bits_),
-    PROTOBUF_FIELD_OFFSET(::io::deephaven::proto::backplane::grpc::Aggregation_AggregationColumns, _internal_metadata_),
-    ~0u,  // no _extensions_
-    ~0u,  // no _oneof_case_
-    ~0u,  // no _weak_field_map_
-    ~0u,  // no _inlined_string_donated_
-    ~0u,  // no _split_
-    ~0u,  // no sizeof(Split)
-    PROTOBUF_FIELD_OFFSET(::io::deephaven::proto::backplane::grpc::Aggregation_AggregationColumns, _impl_.spec_),
-    PROTOBUF_FIELD_OFFSET(::io::deephaven::proto::backplane::grpc::Aggregation_AggregationColumns, _impl_.match_pairs_),
-    0,
-    ~0u,
-    ~0u,  // no _has_bits_
-    PROTOBUF_FIELD_OFFSET(::io::deephaven::proto::backplane::grpc::Aggregation_AggregationCount, _internal_metadata_),
-    ~0u,  // no _extensions_
-    ~0u,  // no _oneof_case_
-    ~0u,  // no _weak_field_map_
-    ~0u,  // no _inlined_string_donated_
-    ~0u,  // no _split_
-    ~0u,  // no sizeof(Split)
-    PROTOBUF_FIELD_OFFSET(::io::deephaven::proto::backplane::grpc::Aggregation_AggregationCount, _impl_.column_name_),
-    ~0u,  // no _has_bits_
-    PROTOBUF_FIELD_OFFSET(::io::deephaven::proto::backplane::grpc::Aggregation_AggregationRowKey, _internal_metadata_),
-    ~0u,  // no _extensions_
-    ~0u,  // no _oneof_case_
-    ~0u,  // no _weak_field_map_
-    ~0u,  // no _inlined_string_donated_
-    ~0u,  // no _split_
-    ~0u,  // no sizeof(Split)
-    PROTOBUF_FIELD_OFFSET(::io::deephaven::proto::backplane::grpc::Aggregation_AggregationRowKey, _impl_.column_name_),
-    ~0u,  // no _has_bits_
-    PROTOBUF_FIELD_OFFSET(::io::deephaven::proto::backplane::grpc::Aggregation_AggregationPartition, _internal_metadata_),
-    ~0u,  // no _extensions_
-    ~0u,  // no _oneof_case_
-    ~0u,  // no _weak_field_map_
-    ~0u,  // no _inlined_string_donated_
-    ~0u,  // no _split_
-    ~0u,  // no sizeof(Split)
-    PROTOBUF_FIELD_OFFSET(::io::deephaven::proto::backplane::grpc::Aggregation_AggregationPartition, _impl_.column_name_),
-    PROTOBUF_FIELD_OFFSET(::io::deephaven::proto::backplane::grpc::Aggregation_AggregationPartition, _impl_.include_group_by_columns_),
-    ~0u,  // no _has_bits_
-    PROTOBUF_FIELD_OFFSET(::io::deephaven::proto::backplane::grpc::Aggregation, _internal_metadata_),
-    ~0u,  // no _extensions_
-    PROTOBUF_FIELD_OFFSET(::io::deephaven::proto::backplane::grpc::Aggregation, _impl_._oneof_case_[0]),
-    ~0u,  // no _weak_field_map_
-    ~0u,  // no _inlined_string_donated_
-    ~0u,  // no _split_
-    ~0u,  // no sizeof(Split)
-    ::_pbi::kInvalidFieldOffsetTag,
-    ::_pbi::kInvalidFieldOffsetTag,
-    ::_pbi::kInvalidFieldOffsetTag,
-    ::_pbi::kInvalidFieldOffsetTag,
-    ::_pbi::kInvalidFieldOffsetTag,
-    PROTOBUF_FIELD_OFFSET(::io::deephaven::proto::backplane::grpc::Aggregation, _impl_.type_),
-    ~0u,  // no _has_bits_
-    PROTOBUF_FIELD_OFFSET(::io::deephaven::proto::backplane::grpc::SortDescriptor, _internal_metadata_),
-    ~0u,  // no _extensions_
-    ~0u,  // no _oneof_case_
-    ~0u,  // no _weak_field_map_
-    ~0u,  // no _inlined_string_donated_
-    ~0u,  // no _split_
-    ~0u,  // no sizeof(Split)
-    PROTOBUF_FIELD_OFFSET(::io::deephaven::proto::backplane::grpc::SortDescriptor, _impl_.column_name_),
-    PROTOBUF_FIELD_OFFSET(::io::deephaven::proto::backplane::grpc::SortDescriptor, _impl_.is_absolute_),
-    PROTOBUF_FIELD_OFFSET(::io::deephaven::proto::backplane::grpc::SortDescriptor, _impl_.direction_),
-    PROTOBUF_FIELD_OFFSET(::io::deephaven::proto::backplane::grpc::SortTableRequest, _impl_._has_bits_),
-    PROTOBUF_FIELD_OFFSET(::io::deephaven::proto::backplane::grpc::SortTableRequest, _internal_metadata_),
-    ~0u,  // no _extensions_
-    ~0u,  // no _oneof_case_
-    ~0u,  // no _weak_field_map_
-    ~0u,  // no _inlined_string_donated_
-    ~0u,  // no _split_
-    ~0u,  // no sizeof(Split)
-    PROTOBUF_FIELD_OFFSET(::io::deephaven::proto::backplane::grpc::SortTableRequest, _impl_.result_id_),
-    PROTOBUF_FIELD_OFFSET(::io::deephaven::proto::backplane::grpc::SortTableRequest, _impl_.source_id_),
-    PROTOBUF_FIELD_OFFSET(::io::deephaven::proto::backplane::grpc::SortTableRequest, _impl_.sorts_),
-    0,
-    1,
-    ~0u,
-    PROTOBUF_FIELD_OFFSET(::io::deephaven::proto::backplane::grpc::FilterTableRequest, _impl_._has_bits_),
-    PROTOBUF_FIELD_OFFSET(::io::deephaven::proto::backplane::grpc::FilterTableRequest, _internal_metadata_),
-    ~0u,  // no _extensions_
-    ~0u,  // no _oneof_case_
-    ~0u,  // no _weak_field_map_
-    ~0u,  // no _inlined_string_donated_
-    ~0u,  // no _split_
-    ~0u,  // no sizeof(Split)
-    PROTOBUF_FIELD_OFFSET(::io::deephaven::proto::backplane::grpc::FilterTableRequest, _impl_.result_id_),
-    PROTOBUF_FIELD_OFFSET(::io::deephaven::proto::backplane::grpc::FilterTableRequest, _impl_.source_id_),
-    PROTOBUF_FIELD_OFFSET(::io::deephaven::proto::backplane::grpc::FilterTableRequest, _impl_.filters_),
-    0,
-    1,
-    ~0u,
-    PROTOBUF_FIELD_OFFSET(::io::deephaven::proto::backplane::grpc::SeekRowRequest, _impl_._has_bits_),
-    PROTOBUF_FIELD_OFFSET(::io::deephaven::proto::backplane::grpc::SeekRowRequest, _internal_metadata_),
-    ~0u,  // no _extensions_
-    ~0u,  // no _oneof_case_
-    ~0u,  // no _weak_field_map_
-    ~0u,  // no _inlined_string_donated_
-    ~0u,  // no _split_
-    ~0u,  // no sizeof(Split)
-    PROTOBUF_FIELD_OFFSET(::io::deephaven::proto::backplane::grpc::SeekRowRequest, _impl_.source_id_),
-    PROTOBUF_FIELD_OFFSET(::io::deephaven::proto::backplane::grpc::SeekRowRequest, _impl_.starting_row_),
-    PROTOBUF_FIELD_OFFSET(::io::deephaven::proto::backplane::grpc::SeekRowRequest, _impl_.column_name_),
-    PROTOBUF_FIELD_OFFSET(::io::deephaven::proto::backplane::grpc::SeekRowRequest, _impl_.seek_value_),
-    PROTOBUF_FIELD_OFFSET(::io::deephaven::proto::backplane::grpc::SeekRowRequest, _impl_.insensitive_),
-    PROTOBUF_FIELD_OFFSET(::io::deephaven::proto::backplane::grpc::SeekRowRequest, _impl_.contains_),
-    PROTOBUF_FIELD_OFFSET(::io::deephaven::proto::backplane::grpc::SeekRowRequest, _impl_.is_backward_),
-    0,
-    ~0u,
-    ~0u,
-    1,
-    ~0u,
-    ~0u,
-    ~0u,
-    ~0u,  // no _has_bits_
-    PROTOBUF_FIELD_OFFSET(::io::deephaven::proto::backplane::grpc::SeekRowResponse, _internal_metadata_),
-    ~0u,  // no _extensions_
-    ~0u,  // no _oneof_case_
-    ~0u,  // no _weak_field_map_
-    ~0u,  // no _inlined_string_donated_
-    ~0u,  // no _split_
-    ~0u,  // no sizeof(Split)
-    PROTOBUF_FIELD_OFFSET(::io::deephaven::proto::backplane::grpc::SeekRowResponse, _impl_.result_row_),
-    ~0u,  // no _has_bits_
-    PROTOBUF_FIELD_OFFSET(::io::deephaven::proto::backplane::grpc::Reference, _internal_metadata_),
-    ~0u,  // no _extensions_
-    ~0u,  // no _oneof_case_
-    ~0u,  // no _weak_field_map_
-    ~0u,  // no _inlined_string_donated_
-    ~0u,  // no _split_
-    ~0u,  // no sizeof(Split)
-    PROTOBUF_FIELD_OFFSET(::io::deephaven::proto::backplane::grpc::Reference, _impl_.column_name_),
-    ~0u,  // no _has_bits_
-    PROTOBUF_FIELD_OFFSET(::io::deephaven::proto::backplane::grpc::Literal, _internal_metadata_),
-    ~0u,  // no _extensions_
-    PROTOBUF_FIELD_OFFSET(::io::deephaven::proto::backplane::grpc::Literal, _impl_._oneof_case_[0]),
-    ~0u,  // no _weak_field_map_
-    ~0u,  // no _inlined_string_donated_
-    ~0u,  // no _split_
-    ~0u,  // no sizeof(Split)
-    ::_pbi::kInvalidFieldOffsetTag,
-    ::_pbi::kInvalidFieldOffsetTag,
-    ::_pbi::kInvalidFieldOffsetTag,
-    ::_pbi::kInvalidFieldOffsetTag,
-    ::_pbi::kInvalidFieldOffsetTag,
-    PROTOBUF_FIELD_OFFSET(::io::deephaven::proto::backplane::grpc::Literal, _impl_.value_),
-    ~0u,  // no _has_bits_
-    PROTOBUF_FIELD_OFFSET(::io::deephaven::proto::backplane::grpc::Value, _internal_metadata_),
-    ~0u,  // no _extensions_
-    PROTOBUF_FIELD_OFFSET(::io::deephaven::proto::backplane::grpc::Value, _impl_._oneof_case_[0]),
-    ~0u,  // no _weak_field_map_
-    ~0u,  // no _inlined_string_donated_
-    ~0u,  // no _split_
-    ~0u,  // no sizeof(Split)
-    ::_pbi::kInvalidFieldOffsetTag,
-    ::_pbi::kInvalidFieldOffsetTag,
-    PROTOBUF_FIELD_OFFSET(::io::deephaven::proto::backplane::grpc::Value, _impl_.data_),
-    ~0u,  // no _has_bits_
-    PROTOBUF_FIELD_OFFSET(::io::deephaven::proto::backplane::grpc::Condition, _internal_metadata_),
-    ~0u,  // no _extensions_
-    PROTOBUF_FIELD_OFFSET(::io::deephaven::proto::backplane::grpc::Condition, _impl_._oneof_case_[0]),
-    ~0u,  // no _weak_field_map_
-    ~0u,  // no _inlined_string_donated_
-    ~0u,  // no _split_
-    ~0u,  // no sizeof(Split)
-    ::_pbi::kInvalidFieldOffsetTag,
-    ::_pbi::kInvalidFieldOffsetTag,
-    ::_pbi::kInvalidFieldOffsetTag,
-    ::_pbi::kInvalidFieldOffsetTag,
-    ::_pbi::kInvalidFieldOffsetTag,
-    ::_pbi::kInvalidFieldOffsetTag,
-    ::_pbi::kInvalidFieldOffsetTag,
-    ::_pbi::kInvalidFieldOffsetTag,
-    ::_pbi::kInvalidFieldOffsetTag,
-    ::_pbi::kInvalidFieldOffsetTag,
-    PROTOBUF_FIELD_OFFSET(::io::deephaven::proto::backplane::grpc::Condition, _impl_.data_),
-    ~0u,  // no _has_bits_
-    PROTOBUF_FIELD_OFFSET(::io::deephaven::proto::backplane::grpc::AndCondition, _internal_metadata_),
-    ~0u,  // no _extensions_
-    ~0u,  // no _oneof_case_
-    ~0u,  // no _weak_field_map_
-    ~0u,  // no _inlined_string_donated_
-    ~0u,  // no _split_
-    ~0u,  // no sizeof(Split)
-    PROTOBUF_FIELD_OFFSET(::io::deephaven::proto::backplane::grpc::AndCondition, _impl_.filters_),
-    ~0u,  // no _has_bits_
-    PROTOBUF_FIELD_OFFSET(::io::deephaven::proto::backplane::grpc::OrCondition, _internal_metadata_),
-    ~0u,  // no _extensions_
-    ~0u,  // no _oneof_case_
-    ~0u,  // no _weak_field_map_
-    ~0u,  // no _inlined_string_donated_
-    ~0u,  // no _split_
-    ~0u,  // no sizeof(Split)
-    PROTOBUF_FIELD_OFFSET(::io::deephaven::proto::backplane::grpc::OrCondition, _impl_.filters_),
-    PROTOBUF_FIELD_OFFSET(::io::deephaven::proto::backplane::grpc::NotCondition, _impl_._has_bits_),
-    PROTOBUF_FIELD_OFFSET(::io::deephaven::proto::backplane::grpc::NotCondition, _internal_metadata_),
-    ~0u,  // no _extensions_
-    ~0u,  // no _oneof_case_
-    ~0u,  // no _weak_field_map_
-    ~0u,  // no _inlined_string_donated_
-    ~0u,  // no _split_
-    ~0u,  // no sizeof(Split)
-    PROTOBUF_FIELD_OFFSET(::io::deephaven::proto::backplane::grpc::NotCondition, _impl_.filter_),
-    0,
-    PROTOBUF_FIELD_OFFSET(::io::deephaven::proto::backplane::grpc::CompareCondition, _impl_._has_bits_),
-    PROTOBUF_FIELD_OFFSET(::io::deephaven::proto::backplane::grpc::CompareCondition, _internal_metadata_),
-    ~0u,  // no _extensions_
-    ~0u,  // no _oneof_case_
-    ~0u,  // no _weak_field_map_
-    ~0u,  // no _inlined_string_donated_
-    ~0u,  // no _split_
-    ~0u,  // no sizeof(Split)
-    PROTOBUF_FIELD_OFFSET(::io::deephaven::proto::backplane::grpc::CompareCondition, _impl_.operation_),
-    PROTOBUF_FIELD_OFFSET(::io::deephaven::proto::backplane::grpc::CompareCondition, _impl_.case_sensitivity_),
-    PROTOBUF_FIELD_OFFSET(::io::deephaven::proto::backplane::grpc::CompareCondition, _impl_.lhs_),
-    PROTOBUF_FIELD_OFFSET(::io::deephaven::proto::backplane::grpc::CompareCondition, _impl_.rhs_),
-    ~0u,
-    ~0u,
-    0,
-    1,
-    PROTOBUF_FIELD_OFFSET(::io::deephaven::proto::backplane::grpc::InCondition, _impl_._has_bits_),
-    PROTOBUF_FIELD_OFFSET(::io::deephaven::proto::backplane::grpc::InCondition, _internal_metadata_),
-    ~0u,  // no _extensions_
-    ~0u,  // no _oneof_case_
-    ~0u,  // no _weak_field_map_
-    ~0u,  // no _inlined_string_donated_
-    ~0u,  // no _split_
-    ~0u,  // no sizeof(Split)
-    PROTOBUF_FIELD_OFFSET(::io::deephaven::proto::backplane::grpc::InCondition, _impl_.target_),
-    PROTOBUF_FIELD_OFFSET(::io::deephaven::proto::backplane::grpc::InCondition, _impl_.candidates_),
-    PROTOBUF_FIELD_OFFSET(::io::deephaven::proto::backplane::grpc::InCondition, _impl_.case_sensitivity_),
-    PROTOBUF_FIELD_OFFSET(::io::deephaven::proto::backplane::grpc::InCondition, _impl_.match_type_),
-    0,
-    ~0u,
-    ~0u,
-    ~0u,
-    PROTOBUF_FIELD_OFFSET(::io::deephaven::proto::backplane::grpc::InvokeCondition, _impl_._has_bits_),
-    PROTOBUF_FIELD_OFFSET(::io::deephaven::proto::backplane::grpc::InvokeCondition, _internal_metadata_),
-    ~0u,  // no _extensions_
-    ~0u,  // no _oneof_case_
-    ~0u,  // no _weak_field_map_
-    ~0u,  // no _inlined_string_donated_
-    ~0u,  // no _split_
-    ~0u,  // no sizeof(Split)
-    PROTOBUF_FIELD_OFFSET(::io::deephaven::proto::backplane::grpc::InvokeCondition, _impl_.method_),
-    PROTOBUF_FIELD_OFFSET(::io::deephaven::proto::backplane::grpc::InvokeCondition, _impl_.target_),
-    PROTOBUF_FIELD_OFFSET(::io::deephaven::proto::backplane::grpc::InvokeCondition, _impl_.arguments_),
-    ~0u,
-    0,
-    ~0u,
-    PROTOBUF_FIELD_OFFSET(::io::deephaven::proto::backplane::grpc::IsNullCondition, _impl_._has_bits_),
-    PROTOBUF_FIELD_OFFSET(::io::deephaven::proto::backplane::grpc::IsNullCondition, _internal_metadata_),
-    ~0u,  // no _extensions_
-    ~0u,  // no _oneof_case_
-    ~0u,  // no _weak_field_map_
-    ~0u,  // no _inlined_string_donated_
-    ~0u,  // no _split_
-    ~0u,  // no sizeof(Split)
-    PROTOBUF_FIELD_OFFSET(::io::deephaven::proto::backplane::grpc::IsNullCondition, _impl_.reference_),
-    0,
-    PROTOBUF_FIELD_OFFSET(::io::deephaven::proto::backplane::grpc::MatchesCondition, _impl_._has_bits_),
-    PROTOBUF_FIELD_OFFSET(::io::deephaven::proto::backplane::grpc::MatchesCondition, _internal_metadata_),
-    ~0u,  // no _extensions_
-    ~0u,  // no _oneof_case_
-    ~0u,  // no _weak_field_map_
-    ~0u,  // no _inlined_string_donated_
-    ~0u,  // no _split_
-    ~0u,  // no sizeof(Split)
-    PROTOBUF_FIELD_OFFSET(::io::deephaven::proto::backplane::grpc::MatchesCondition, _impl_.reference_),
-    PROTOBUF_FIELD_OFFSET(::io::deephaven::proto::backplane::grpc::MatchesCondition, _impl_.regex_),
-    PROTOBUF_FIELD_OFFSET(::io::deephaven::proto::backplane::grpc::MatchesCondition, _impl_.case_sensitivity_),
-    PROTOBUF_FIELD_OFFSET(::io::deephaven::proto::backplane::grpc::MatchesCondition, _impl_.match_type_),
-    0,
-    ~0u,
-    ~0u,
-    ~0u,
-    PROTOBUF_FIELD_OFFSET(::io::deephaven::proto::backplane::grpc::ContainsCondition, _impl_._has_bits_),
-    PROTOBUF_FIELD_OFFSET(::io::deephaven::proto::backplane::grpc::ContainsCondition, _internal_metadata_),
-    ~0u,  // no _extensions_
-    ~0u,  // no _oneof_case_
-    ~0u,  // no _weak_field_map_
-    ~0u,  // no _inlined_string_donated_
-    ~0u,  // no _split_
-    ~0u,  // no sizeof(Split)
-    PROTOBUF_FIELD_OFFSET(::io::deephaven::proto::backplane::grpc::ContainsCondition, _impl_.reference_),
-    PROTOBUF_FIELD_OFFSET(::io::deephaven::proto::backplane::grpc::ContainsCondition, _impl_.search_string_),
-    PROTOBUF_FIELD_OFFSET(::io::deephaven::proto::backplane::grpc::ContainsCondition, _impl_.case_sensitivity_),
-    PROTOBUF_FIELD_OFFSET(::io::deephaven::proto::backplane::grpc::ContainsCondition, _impl_.match_type_),
-    0,
-    ~0u,
-    ~0u,
-    ~0u,
-    ~0u,  // no _has_bits_
-    PROTOBUF_FIELD_OFFSET(::io::deephaven::proto::backplane::grpc::SearchCondition, _internal_metadata_),
-    ~0u,  // no _extensions_
-    ~0u,  // no _oneof_case_
-    ~0u,  // no _weak_field_map_
-    ~0u,  // no _inlined_string_donated_
-    ~0u,  // no _split_
-    ~0u,  // no sizeof(Split)
-    PROTOBUF_FIELD_OFFSET(::io::deephaven::proto::backplane::grpc::SearchCondition, _impl_.search_string_),
-    PROTOBUF_FIELD_OFFSET(::io::deephaven::proto::backplane::grpc::SearchCondition, _impl_.optional_references_),
-    PROTOBUF_FIELD_OFFSET(::io::deephaven::proto::backplane::grpc::FlattenRequest, _impl_._has_bits_),
-    PROTOBUF_FIELD_OFFSET(::io::deephaven::proto::backplane::grpc::FlattenRequest, _internal_metadata_),
-    ~0u,  // no _extensions_
-    ~0u,  // no _oneof_case_
-    ~0u,  // no _weak_field_map_
-    ~0u,  // no _inlined_string_donated_
-    ~0u,  // no _split_
-    ~0u,  // no sizeof(Split)
-    PROTOBUF_FIELD_OFFSET(::io::deephaven::proto::backplane::grpc::FlattenRequest, _impl_.result_id_),
-    PROTOBUF_FIELD_OFFSET(::io::deephaven::proto::backplane::grpc::FlattenRequest, _impl_.source_id_),
-    0,
-    1,
-    PROTOBUF_FIELD_OFFSET(::io::deephaven::proto::backplane::grpc::MetaTableRequest, _impl_._has_bits_),
-    PROTOBUF_FIELD_OFFSET(::io::deephaven::proto::backplane::grpc::MetaTableRequest, _internal_metadata_),
-    ~0u,  // no _extensions_
-    ~0u,  // no _oneof_case_
-    ~0u,  // no _weak_field_map_
-    ~0u,  // no _inlined_string_donated_
-    ~0u,  // no _split_
-    ~0u,  // no sizeof(Split)
-    PROTOBUF_FIELD_OFFSET(::io::deephaven::proto::backplane::grpc::MetaTableRequest, _impl_.result_id_),
-    PROTOBUF_FIELD_OFFSET(::io::deephaven::proto::backplane::grpc::MetaTableRequest, _impl_.source_id_),
-    0,
-    1,
-    PROTOBUF_FIELD_OFFSET(::io::deephaven::proto::backplane::grpc::RunChartDownsampleRequest_ZoomRange, _impl_._has_bits_),
-    PROTOBUF_FIELD_OFFSET(::io::deephaven::proto::backplane::grpc::RunChartDownsampleRequest_ZoomRange, _internal_metadata_),
-    ~0u,  // no _extensions_
-    ~0u,  // no _oneof_case_
-    ~0u,  // no _weak_field_map_
-    ~0u,  // no _inlined_string_donated_
-    ~0u,  // no _split_
-    ~0u,  // no sizeof(Split)
-    PROTOBUF_FIELD_OFFSET(::io::deephaven::proto::backplane::grpc::RunChartDownsampleRequest_ZoomRange, _impl_.min_date_nanos_),
-    PROTOBUF_FIELD_OFFSET(::io::deephaven::proto::backplane::grpc::RunChartDownsampleRequest_ZoomRange, _impl_.max_date_nanos_),
-    0,
-    1,
-    PROTOBUF_FIELD_OFFSET(::io::deephaven::proto::backplane::grpc::RunChartDownsampleRequest, _impl_._has_bits_),
-    PROTOBUF_FIELD_OFFSET(::io::deephaven::proto::backplane::grpc::RunChartDownsampleRequest, _internal_metadata_),
-    ~0u,  // no _extensions_
-    ~0u,  // no _oneof_case_
-    ~0u,  // no _weak_field_map_
-    ~0u,  // no _inlined_string_donated_
-    ~0u,  // no _split_
-    ~0u,  // no sizeof(Split)
-    PROTOBUF_FIELD_OFFSET(::io::deephaven::proto::backplane::grpc::RunChartDownsampleRequest, _impl_.result_id_),
-    PROTOBUF_FIELD_OFFSET(::io::deephaven::proto::backplane::grpc::RunChartDownsampleRequest, _impl_.source_id_),
-    PROTOBUF_FIELD_OFFSET(::io::deephaven::proto::backplane::grpc::RunChartDownsampleRequest, _impl_.pixel_count_),
-    PROTOBUF_FIELD_OFFSET(::io::deephaven::proto::backplane::grpc::RunChartDownsampleRequest, _impl_.zoom_range_),
-    PROTOBUF_FIELD_OFFSET(::io::deephaven::proto::backplane::grpc::RunChartDownsampleRequest, _impl_.x_column_name_),
-    PROTOBUF_FIELD_OFFSET(::io::deephaven::proto::backplane::grpc::RunChartDownsampleRequest, _impl_.y_column_names_),
-    0,
-    1,
-    ~0u,
-    2,
-    ~0u,
-    ~0u,
-    ~0u,  // no _has_bits_
-    PROTOBUF_FIELD_OFFSET(::io::deephaven::proto::backplane::grpc::CreateInputTableRequest_InputTableKind_InMemoryAppendOnly, _internal_metadata_),
-    ~0u,  // no _extensions_
-    ~0u,  // no _oneof_case_
-    ~0u,  // no _weak_field_map_
-    ~0u,  // no _inlined_string_donated_
-    ~0u,  // no _split_
-    ~0u,  // no sizeof(Split)
-    ~0u,  // no _has_bits_
-    PROTOBUF_FIELD_OFFSET(::io::deephaven::proto::backplane::grpc::CreateInputTableRequest_InputTableKind_InMemoryKeyBacked, _internal_metadata_),
-    ~0u,  // no _extensions_
-    ~0u,  // no _oneof_case_
-    ~0u,  // no _weak_field_map_
-    ~0u,  // no _inlined_string_donated_
-    ~0u,  // no _split_
-    ~0u,  // no sizeof(Split)
-    PROTOBUF_FIELD_OFFSET(::io::deephaven::proto::backplane::grpc::CreateInputTableRequest_InputTableKind_InMemoryKeyBacked, _impl_.key_columns_),
-    ~0u,  // no _has_bits_
-    PROTOBUF_FIELD_OFFSET(::io::deephaven::proto::backplane::grpc::CreateInputTableRequest_InputTableKind_Blink, _internal_metadata_),
-    ~0u,  // no _extensions_
-    ~0u,  // no _oneof_case_
-    ~0u,  // no _weak_field_map_
-    ~0u,  // no _inlined_string_donated_
-    ~0u,  // no _split_
-    ~0u,  // no sizeof(Split)
-    ~0u,  // no _has_bits_
-    PROTOBUF_FIELD_OFFSET(::io::deephaven::proto::backplane::grpc::CreateInputTableRequest_InputTableKind, _internal_metadata_),
-    ~0u,  // no _extensions_
-    PROTOBUF_FIELD_OFFSET(::io::deephaven::proto::backplane::grpc::CreateInputTableRequest_InputTableKind, _impl_._oneof_case_[0]),
-    ~0u,  // no _weak_field_map_
-    ~0u,  // no _inlined_string_donated_
-    ~0u,  // no _split_
-    ~0u,  // no sizeof(Split)
-    ::_pbi::kInvalidFieldOffsetTag,
-    ::_pbi::kInvalidFieldOffsetTag,
-    ::_pbi::kInvalidFieldOffsetTag,
-    PROTOBUF_FIELD_OFFSET(::io::deephaven::proto::backplane::grpc::CreateInputTableRequest_InputTableKind, _impl_.kind_),
-    PROTOBUF_FIELD_OFFSET(::io::deephaven::proto::backplane::grpc::CreateInputTableRequest, _impl_._has_bits_),
-    PROTOBUF_FIELD_OFFSET(::io::deephaven::proto::backplane::grpc::CreateInputTableRequest, _internal_metadata_),
-    ~0u,  // no _extensions_
-    PROTOBUF_FIELD_OFFSET(::io::deephaven::proto::backplane::grpc::CreateInputTableRequest, _impl_._oneof_case_[0]),
-    ~0u,  // no _weak_field_map_
-    ~0u,  // no _inlined_string_donated_
-    ~0u,  // no _split_
-    ~0u,  // no sizeof(Split)
-    PROTOBUF_FIELD_OFFSET(::io::deephaven::proto::backplane::grpc::CreateInputTableRequest, _impl_.result_id_),
-    ::_pbi::kInvalidFieldOffsetTag,
-    ::_pbi::kInvalidFieldOffsetTag,
-    PROTOBUF_FIELD_OFFSET(::io::deephaven::proto::backplane::grpc::CreateInputTableRequest, _impl_.kind_),
-    PROTOBUF_FIELD_OFFSET(::io::deephaven::proto::backplane::grpc::CreateInputTableRequest, _impl_.definition_),
-    0,
-    ~0u,
-    ~0u,
-    1,
-    PROTOBUF_FIELD_OFFSET(::io::deephaven::proto::backplane::grpc::WhereInRequest, _impl_._has_bits_),
-    PROTOBUF_FIELD_OFFSET(::io::deephaven::proto::backplane::grpc::WhereInRequest, _internal_metadata_),
-    ~0u,  // no _extensions_
-    ~0u,  // no _oneof_case_
-    ~0u,  // no _weak_field_map_
-    ~0u,  // no _inlined_string_donated_
-    ~0u,  // no _split_
-    ~0u,  // no sizeof(Split)
-    PROTOBUF_FIELD_OFFSET(::io::deephaven::proto::backplane::grpc::WhereInRequest, _impl_.result_id_),
-    PROTOBUF_FIELD_OFFSET(::io::deephaven::proto::backplane::grpc::WhereInRequest, _impl_.left_id_),
-    PROTOBUF_FIELD_OFFSET(::io::deephaven::proto::backplane::grpc::WhereInRequest, _impl_.right_id_),
-    PROTOBUF_FIELD_OFFSET(::io::deephaven::proto::backplane::grpc::WhereInRequest, _impl_.inverted_),
-    PROTOBUF_FIELD_OFFSET(::io::deephaven::proto::backplane::grpc::WhereInRequest, _impl_.columns_to_match_),
-    0,
-    1,
-    2,
-    ~0u,
-    ~0u,
-    PROTOBUF_FIELD_OFFSET(::io::deephaven::proto::backplane::grpc::ColumnStatisticsRequest, _impl_._has_bits_),
-    PROTOBUF_FIELD_OFFSET(::io::deephaven::proto::backplane::grpc::ColumnStatisticsRequest, _internal_metadata_),
-    ~0u,  // no _extensions_
-    ~0u,  // no _oneof_case_
-    ~0u,  // no _weak_field_map_
-    ~0u,  // no _inlined_string_donated_
-    ~0u,  // no _split_
-    ~0u,  // no sizeof(Split)
-    PROTOBUF_FIELD_OFFSET(::io::deephaven::proto::backplane::grpc::ColumnStatisticsRequest, _impl_.result_id_),
-    PROTOBUF_FIELD_OFFSET(::io::deephaven::proto::backplane::grpc::ColumnStatisticsRequest, _impl_.source_id_),
-    PROTOBUF_FIELD_OFFSET(::io::deephaven::proto::backplane::grpc::ColumnStatisticsRequest, _impl_.column_name_),
-    PROTOBUF_FIELD_OFFSET(::io::deephaven::proto::backplane::grpc::ColumnStatisticsRequest, _impl_.unique_value_limit_),
-    0,
-    1,
-    ~0u,
-    2,
-    ~0u,  // no _has_bits_
-    PROTOBUF_FIELD_OFFSET(::io::deephaven::proto::backplane::grpc::BatchTableRequest_Operation, _internal_metadata_),
-    ~0u,  // no _extensions_
-    PROTOBUF_FIELD_OFFSET(::io::deephaven::proto::backplane::grpc::BatchTableRequest_Operation, _impl_._oneof_case_[0]),
-    ~0u,  // no _weak_field_map_
-    ~0u,  // no _inlined_string_donated_
-    ~0u,  // no _split_
-    ~0u,  // no sizeof(Split)
-    ::_pbi::kInvalidFieldOffsetTag,
-    ::_pbi::kInvalidFieldOffsetTag,
-    ::_pbi::kInvalidFieldOffsetTag,
-    ::_pbi::kInvalidFieldOffsetTag,
-    ::_pbi::kInvalidFieldOffsetTag,
-    ::_pbi::kInvalidFieldOffsetTag,
-    ::_pbi::kInvalidFieldOffsetTag,
-    ::_pbi::kInvalidFieldOffsetTag,
-    ::_pbi::kInvalidFieldOffsetTag,
-    ::_pbi::kInvalidFieldOffsetTag,
-    ::_pbi::kInvalidFieldOffsetTag,
-    ::_pbi::kInvalidFieldOffsetTag,
-    ::_pbi::kInvalidFieldOffsetTag,
-    ::_pbi::kInvalidFieldOffsetTag,
-    ::_pbi::kInvalidFieldOffsetTag,
-    ::_pbi::kInvalidFieldOffsetTag,
-    ::_pbi::kInvalidFieldOffsetTag,
-    ::_pbi::kInvalidFieldOffsetTag,
-    ::_pbi::kInvalidFieldOffsetTag,
-    ::_pbi::kInvalidFieldOffsetTag,
-    ::_pbi::kInvalidFieldOffsetTag,
-    ::_pbi::kInvalidFieldOffsetTag,
-    ::_pbi::kInvalidFieldOffsetTag,
-    ::_pbi::kInvalidFieldOffsetTag,
-    ::_pbi::kInvalidFieldOffsetTag,
-    ::_pbi::kInvalidFieldOffsetTag,
-    ::_pbi::kInvalidFieldOffsetTag,
-    ::_pbi::kInvalidFieldOffsetTag,
-    ::_pbi::kInvalidFieldOffsetTag,
-    ::_pbi::kInvalidFieldOffsetTag,
-    ::_pbi::kInvalidFieldOffsetTag,
-    ::_pbi::kInvalidFieldOffsetTag,
-    ::_pbi::kInvalidFieldOffsetTag,
-    ::_pbi::kInvalidFieldOffsetTag,
-    ::_pbi::kInvalidFieldOffsetTag,
-    ::_pbi::kInvalidFieldOffsetTag,
-    ::_pbi::kInvalidFieldOffsetTag,
-    ::_pbi::kInvalidFieldOffsetTag,
-    ::_pbi::kInvalidFieldOffsetTag,
-    ::_pbi::kInvalidFieldOffsetTag,
-    ::_pbi::kInvalidFieldOffsetTag,
-    PROTOBUF_FIELD_OFFSET(::io::deephaven::proto::backplane::grpc::BatchTableRequest_Operation, _impl_.op_),
-    ~0u,  // no _has_bits_
-    PROTOBUF_FIELD_OFFSET(::io::deephaven::proto::backplane::grpc::BatchTableRequest, _internal_metadata_),
-    ~0u,  // no _extensions_
-    ~0u,  // no _oneof_case_
-    ~0u,  // no _weak_field_map_
-    ~0u,  // no _inlined_string_donated_
-    ~0u,  // no _split_
-    ~0u,  // no sizeof(Split)
-    PROTOBUF_FIELD_OFFSET(::io::deephaven::proto::backplane::grpc::BatchTableRequest, _impl_.ops_),
-};
-
-static const ::_pbi::MigrationSchema
-    schemas[] PROTOBUF_SECTION_VARIABLE(protodesc_cold) = {
-        {0, -1, -1, sizeof(::io::deephaven::proto::backplane::grpc::TableReference)},
-        {11, 25, -1, sizeof(::io::deephaven::proto::backplane::grpc::ExportedTableCreationResponse)},
-        {31, 41, -1, sizeof(::io::deephaven::proto::backplane::grpc::FetchTableRequest)},
-        {43, 53, -1, sizeof(::io::deephaven::proto::backplane::grpc::ApplyPreviewColumnsRequest)},
-        {55, -1, -1, sizeof(::io::deephaven::proto::backplane::grpc::ExportedTableUpdatesRequest)},
-        {63, 74, -1, sizeof(::io::deephaven::proto::backplane::grpc::ExportedTableUpdateMessage)},
-        {77, 87, -1, sizeof(::io::deephaven::proto::backplane::grpc::EmptyTableRequest)},
-        {89, 105, -1, sizeof(::io::deephaven::proto::backplane::grpc::TimeTableRequest)},
-        {111, 122, -1, sizeof(::io::deephaven::proto::backplane::grpc::SelectOrUpdateRequest)},
-        {125, -1, -1, sizeof(::io::deephaven::proto::backplane::grpc::MathContext)},
-        {135, -1, -1, sizeof(::io::deephaven::proto::backplane::grpc::UpdateByWindowScale_UpdateByWindowTicks)},
-        {144, -1, -1, sizeof(::io::deephaven::proto::backplane::grpc::UpdateByWindowScale_UpdateByWindowTime)},
-        {156, -1, -1, sizeof(::io::deephaven::proto::backplane::grpc::UpdateByWindowScale)},
-        {167, 181, -1, sizeof(::io::deephaven::proto::backplane::grpc::UpdateByEmOptions)},
-        {187, -1, -1, sizeof(::io::deephaven::proto::backplane::grpc::UpdateByDeltaOptions)},
-        {196, 211, -1, sizeof(::io::deephaven::proto::backplane::grpc::UpdateByRequest_UpdateByOptions)},
-        {218, -1, -1, sizeof(::io::deephaven::proto::backplane::grpc::UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByCumulativeSum)},
-        {226, -1, -1, sizeof(::io::deephaven::proto::backplane::grpc::UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByCumulativeMin)},
-        {234, -1, -1, sizeof(::io::deephaven::proto::backplane::grpc::UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByCumulativeMax)},
-        {242, -1, -1, sizeof(::io::deephaven::proto::backplane::grpc::UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByCumulativeProduct)},
-        {250, -1, -1, sizeof(::io::deephaven::proto::backplane::grpc::UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByFill)},
-        {258, 268, -1, sizeof(::io::deephaven::proto::backplane::grpc::UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByEma)},
-        {270, 280, -1, sizeof(::io::deephaven::proto::backplane::grpc::UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByEms)},
-        {282, 292, -1, sizeof(::io::deephaven::proto::backplane::grpc::UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByEmMin)},
-        {294, 304, -1, sizeof(::io::deephaven::proto::backplane::grpc::UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByEmMax)},
-        {306, 316, -1, sizeof(::io::deephaven::proto::backplane::grpc::UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByEmStd)},
-        {318, 327, -1, sizeof(::io::deephaven::proto::backplane::grpc::UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByDelta)},
-        {328, 338, -1, sizeof(::io::deephaven::proto::backplane::grpc::UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingSum)},
-        {340, 350, -1, sizeof(::io::deephaven::proto::backplane::grpc::UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingGroup)},
-        {352, 362, -1, sizeof(::io::deephaven::proto::backplane::grpc::UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingAvg)},
-        {364, 374, -1, sizeof(::io::deephaven::proto::backplane::grpc::UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingMin)},
-        {376, 386, -1, sizeof(::io::deephaven::proto::backplane::grpc::UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingMax)},
-        {388, 398, -1, sizeof(::io::deephaven::proto::backplane::grpc::UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingProduct)},
-        {400, 410, -1, sizeof(::io::deephaven::proto::backplane::grpc::UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingCount)},
-        {412, 422, -1, sizeof(::io::deephaven::proto::backplane::grpc::UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingStd)},
-        {424, 435, -1, sizeof(::io::deephaven::proto::backplane::grpc::UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingWAvg)},
-        {438, 450, -1, sizeof(::io::deephaven::proto::backplane::grpc::UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingFormula)},
-        {454, -1, -1, sizeof(::io::deephaven::proto::backplane::grpc::UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec)},
-        {484, 494, -1, sizeof(::io::deephaven::proto::backplane::grpc::UpdateByRequest_UpdateByOperation_UpdateByColumn)},
-        {496, -1, -1, sizeof(::io::deephaven::proto::backplane::grpc::UpdateByRequest_UpdateByOperation)},
-        {506, 519, -1, sizeof(::io::deephaven::proto::backplane::grpc::UpdateByRequest)},
-        {524, 535, -1, sizeof(::io::deephaven::proto::backplane::grpc::SelectDistinctRequest)},
-        {538, 549, -1, sizeof(::io::deephaven::proto::backplane::grpc::DropColumnsRequest)},
-        {552, 563, -1, sizeof(::io::deephaven::proto::backplane::grpc::UnstructuredFilterTableRequest)},
-        {566, 577, -1, sizeof(::io::deephaven::proto::backplane::grpc::HeadOrTailRequest)},
-        {580, 592, -1, sizeof(::io::deephaven::proto::backplane::grpc::HeadOrTailByRequest)},
-        {596, 608, -1, sizeof(::io::deephaven::proto::backplane::grpc::UngroupRequest)},
-        {612, 623, -1, sizeof(::io::deephaven::proto::backplane::grpc::MergeTablesRequest)},
-        {626, 636, -1, sizeof(::io::deephaven::proto::backplane::grpc::SnapshotTableRequest)},
-        {638, 653, -1, sizeof(::io::deephaven::proto::backplane::grpc::SnapshotWhenTableRequest)},
-        {660, 674, -1, sizeof(::io::deephaven::proto::backplane::grpc::CrossJoinTablesRequest)},
-        {680, 693, -1, sizeof(::io::deephaven::proto::backplane::grpc::NaturalJoinTablesRequest)},
-        {698, 711, -1, sizeof(::io::deephaven::proto::backplane::grpc::ExactJoinTablesRequest)},
-        {716, 729, -1, sizeof(::io::deephaven::proto::backplane::grpc::LeftJoinTablesRequest)},
-        {734, 748, -1, sizeof(::io::deephaven::proto::backplane::grpc::AsOfJoinTablesRequest)},
-        {754, 768, -1, sizeof(::io::deephaven::proto::backplane::grpc::AjRajTablesRequest)},
-        {774, 785, -1, sizeof(::io::deephaven::proto::backplane::grpc::MultiJoinInput)},
-        {788, 798, -1, sizeof(::io::deephaven::proto::backplane::grpc::MultiJoinTablesRequest)},
-        {800, 819, -1, sizeof(::io::deephaven::proto::backplane::grpc::RangeJoinTablesRequest)},
-        {830, -1, -1, sizeof(::io::deephaven::proto::backplane::grpc::ComboAggregateRequest_Aggregate)},
-        {843, 856, -1, sizeof(::io::deephaven::proto::backplane::grpc::ComboAggregateRequest)},
-        {861, 873, -1, sizeof(::io::deephaven::proto::backplane::grpc::AggregateAllRequest)},
-        {877, 887, -1, sizeof(::io::deephaven::proto::backplane::grpc::AggSpec_AggSpecApproximatePercentile)},
-        {889, -1, -1, sizeof(::io::deephaven::proto::backplane::grpc::AggSpec_AggSpecCountDistinct)},
-        {898, -1, -1, sizeof(::io::deephaven::proto::backplane::grpc::AggSpec_AggSpecDistinct)},
-        {907, -1, -1, sizeof(::io::deephaven::proto::backplane::grpc::AggSpec_AggSpecFormula)},
-        {917, -1, -1, sizeof(::io::deephaven::proto::backplane::grpc::AggSpec_AggSpecMedian)},
-        {926, -1, -1, sizeof(::io::deephaven::proto::backplane::grpc::AggSpec_AggSpecPercentile)},
-        {936, -1, -1, sizeof(::io::deephaven::proto::backplane::grpc::AggSpec_AggSpecSorted)},
-        {945, -1, -1, sizeof(::io::deephaven::proto::backplane::grpc::AggSpec_AggSpecSortedColumn)},
-        {954, 963, -1, sizeof(::io::deephaven::proto::backplane::grpc::AggSpec_AggSpecTDigest)},
-        {964, 974, -1, sizeof(::io::deephaven::proto::backplane::grpc::AggSpec_AggSpecUnique)},
-        {976, -1, -1, sizeof(::io::deephaven::proto::backplane::grpc::AggSpec_AggSpecNonUniqueSentinel)},
-        {995, -1, -1, sizeof(::io::deephaven::proto::backplane::grpc::AggSpec_AggSpecWeighted)},
-        {1004, -1, -1, sizeof(::io::deephaven::proto::backplane::grpc::AggSpec_AggSpecAbsSum)},
-        {1012, -1, -1, sizeof(::io::deephaven::proto::backplane::grpc::AggSpec_AggSpecAvg)},
-        {1020, -1, -1, sizeof(::io::deephaven::proto::backplane::grpc::AggSpec_AggSpecFirst)},
-        {1028, -1, -1, sizeof(::io::deephaven::proto::backplane::grpc::AggSpec_AggSpecFreeze)},
-        {1036, -1, -1, sizeof(::io::deephaven::proto::backplane::grpc::AggSpec_AggSpecGroup)},
-        {1044, -1, -1, sizeof(::io::deephaven::proto::backplane::grpc::AggSpec_AggSpecLast)},
-        {1052, -1, -1, sizeof(::io::deephaven::proto::backplane::grpc::AggSpec_AggSpecMax)},
-        {1060, -1, -1, sizeof(::io::deephaven::proto::backplane::grpc::AggSpec_AggSpecMin)},
-        {1068, -1, -1, sizeof(::io::deephaven::proto::backplane::grpc::AggSpec_AggSpecStd)},
-        {1076, -1, -1, sizeof(::io::deephaven::proto::backplane::grpc::AggSpec_AggSpecSum)},
-        {1084, -1, -1, sizeof(::io::deephaven::proto::backplane::grpc::AggSpec_AggSpecVar)},
-        {1092, -1, -1, sizeof(::io::deephaven::proto::backplane::grpc::AggSpec)},
-        {1124, 1138, -1, sizeof(::io::deephaven::proto::backplane::grpc::AggregateRequest)},
-        {1144, 1154, -1, sizeof(::io::deephaven::proto::backplane::grpc::Aggregation_AggregationColumns)},
-        {1156, -1, -1, sizeof(::io::deephaven::proto::backplane::grpc::Aggregation_AggregationCount)},
-        {1165, -1, -1, sizeof(::io::deephaven::proto::backplane::grpc::Aggregation_AggregationRowKey)},
-        {1174, -1, -1, sizeof(::io::deephaven::proto::backplane::grpc::Aggregation_AggregationPartition)},
-        {1184, -1, -1, sizeof(::io::deephaven::proto::backplane::grpc::Aggregation)},
-        {1198, -1, -1, sizeof(::io::deephaven::proto::backplane::grpc::SortDescriptor)},
-        {1209, 1220, -1, sizeof(::io::deephaven::proto::backplane::grpc::SortTableRequest)},
-        {1223, 1234, -1, sizeof(::io::deephaven::proto::backplane::grpc::FilterTableRequest)},
-        {1237, 1252, -1, sizeof(::io::deephaven::proto::backplane::grpc::SeekRowRequest)},
-        {1259, -1, -1, sizeof(::io::deephaven::proto::backplane::grpc::SeekRowResponse)},
-        {1268, -1, -1, sizeof(::io::deephaven::proto::backplane::grpc::Reference)},
-        {1277, -1, -1, sizeof(::io::deephaven::proto::backplane::grpc::Literal)},
-        {1291, -1, -1, sizeof(::io::deephaven::proto::backplane::grpc::Value)},
-        {1302, -1, -1, sizeof(::io::deephaven::proto::backplane::grpc::Condition)},
-        {1321, -1, -1, sizeof(::io::deephaven::proto::backplane::grpc::AndCondition)},
-        {1330, -1, -1, sizeof(::io::deephaven::proto::backplane::grpc::OrCondition)},
-        {1339, 1348, -1, sizeof(::io::deephaven::proto::backplane::grpc::NotCondition)},
-        {1349, 1361, -1, sizeof(::io::deephaven::proto::backplane::grpc::CompareCondition)},
-        {1365, 1377, -1, sizeof(::io::deephaven::proto::backplane::grpc::InCondition)},
-        {1381, 1392, -1, sizeof(::io::deephaven::proto::backplane::grpc::InvokeCondition)},
-        {1395, 1404, -1, sizeof(::io::deephaven::proto::backplane::grpc::IsNullCondition)},
-        {1405, 1417, -1, sizeof(::io::deephaven::proto::backplane::grpc::MatchesCondition)},
-        {1421, 1433, -1, sizeof(::io::deephaven::proto::backplane::grpc::ContainsCondition)},
-        {1437, -1, -1, sizeof(::io::deephaven::proto::backplane::grpc::SearchCondition)},
-        {1447, 1457, -1, sizeof(::io::deephaven::proto::backplane::grpc::FlattenRequest)},
-        {1459, 1469, -1, sizeof(::io::deephaven::proto::backplane::grpc::MetaTableRequest)},
-        {1471, 1481, -1, sizeof(::io::deephaven::proto::backplane::grpc::RunChartDownsampleRequest_ZoomRange)},
-        {1483, 1497, -1, sizeof(::io::deephaven::proto::backplane::grpc::RunChartDownsampleRequest)},
-        {1503, -1, -1, sizeof(::io::deephaven::proto::backplane::grpc::CreateInputTableRequest_InputTableKind_InMemoryAppendOnly)},
-        {1511, -1, -1, sizeof(::io::deephaven::proto::backplane::grpc::CreateInputTableRequest_InputTableKind_InMemoryKeyBacked)},
-        {1520, -1, -1, sizeof(::io::deephaven::proto::backplane::grpc::CreateInputTableRequest_InputTableKind_Blink)},
-        {1528, -1, -1, sizeof(::io::deephaven::proto::backplane::grpc::CreateInputTableRequest_InputTableKind)},
-        {1540, 1553, -1, sizeof(::io::deephaven::proto::backplane::grpc::CreateInputTableRequest)},
-        {1557, 1570, -1, sizeof(::io::deephaven::proto::backplane::grpc::WhereInRequest)},
-        {1575, 1587, -1, sizeof(::io::deephaven::proto::backplane::grpc::ColumnStatisticsRequest)},
-        {1591, -1, -1, sizeof(::io::deephaven::proto::backplane::grpc::BatchTableRequest_Operation)},
-        {1641, -1, -1, sizeof(::io::deephaven::proto::backplane::grpc::BatchTableRequest)},
-};
-
-static const ::_pb::Message* const file_default_instances[] = {
-    &::io::deephaven::proto::backplane::grpc::_TableReference_default_instance_._instance,
-    &::io::deephaven::proto::backplane::grpc::_ExportedTableCreationResponse_default_instance_._instance,
-    &::io::deephaven::proto::backplane::grpc::_FetchTableRequest_default_instance_._instance,
-    &::io::deephaven::proto::backplane::grpc::_ApplyPreviewColumnsRequest_default_instance_._instance,
-    &::io::deephaven::proto::backplane::grpc::_ExportedTableUpdatesRequest_default_instance_._instance,
-    &::io::deephaven::proto::backplane::grpc::_ExportedTableUpdateMessage_default_instance_._instance,
-    &::io::deephaven::proto::backplane::grpc::_EmptyTableRequest_default_instance_._instance,
-    &::io::deephaven::proto::backplane::grpc::_TimeTableRequest_default_instance_._instance,
-    &::io::deephaven::proto::backplane::grpc::_SelectOrUpdateRequest_default_instance_._instance,
-    &::io::deephaven::proto::backplane::grpc::_MathContext_default_instance_._instance,
-    &::io::deephaven::proto::backplane::grpc::_UpdateByWindowScale_UpdateByWindowTicks_default_instance_._instance,
-    &::io::deephaven::proto::backplane::grpc::_UpdateByWindowScale_UpdateByWindowTime_default_instance_._instance,
-    &::io::deephaven::proto::backplane::grpc::_UpdateByWindowScale_default_instance_._instance,
-    &::io::deephaven::proto::backplane::grpc::_UpdateByEmOptions_default_instance_._instance,
-    &::io::deephaven::proto::backplane::grpc::_UpdateByDeltaOptions_default_instance_._instance,
-    &::io::deephaven::proto::backplane::grpc::_UpdateByRequest_UpdateByOptions_default_instance_._instance,
-    &::io::deephaven::proto::backplane::grpc::_UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByCumulativeSum_default_instance_._instance,
-    &::io::deephaven::proto::backplane::grpc::_UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByCumulativeMin_default_instance_._instance,
-    &::io::deephaven::proto::backplane::grpc::_UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByCumulativeMax_default_instance_._instance,
-    &::io::deephaven::proto::backplane::grpc::_UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByCumulativeProduct_default_instance_._instance,
-    &::io::deephaven::proto::backplane::grpc::_UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByFill_default_instance_._instance,
-    &::io::deephaven::proto::backplane::grpc::_UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByEma_default_instance_._instance,
-    &::io::deephaven::proto::backplane::grpc::_UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByEms_default_instance_._instance,
-    &::io::deephaven::proto::backplane::grpc::_UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByEmMin_default_instance_._instance,
-    &::io::deephaven::proto::backplane::grpc::_UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByEmMax_default_instance_._instance,
-    &::io::deephaven::proto::backplane::grpc::_UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByEmStd_default_instance_._instance,
-    &::io::deephaven::proto::backplane::grpc::_UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByDelta_default_instance_._instance,
-    &::io::deephaven::proto::backplane::grpc::_UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingSum_default_instance_._instance,
-    &::io::deephaven::proto::backplane::grpc::_UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingGroup_default_instance_._instance,
-    &::io::deephaven::proto::backplane::grpc::_UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingAvg_default_instance_._instance,
-    &::io::deephaven::proto::backplane::grpc::_UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingMin_default_instance_._instance,
-    &::io::deephaven::proto::backplane::grpc::_UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingMax_default_instance_._instance,
-    &::io::deephaven::proto::backplane::grpc::_UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingProduct_default_instance_._instance,
-    &::io::deephaven::proto::backplane::grpc::_UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingCount_default_instance_._instance,
-    &::io::deephaven::proto::backplane::grpc::_UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingStd_default_instance_._instance,
-    &::io::deephaven::proto::backplane::grpc::_UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingWAvg_default_instance_._instance,
-    &::io::deephaven::proto::backplane::grpc::_UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingFormula_default_instance_._instance,
-    &::io::deephaven::proto::backplane::grpc::_UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_default_instance_._instance,
-    &::io::deephaven::proto::backplane::grpc::_UpdateByRequest_UpdateByOperation_UpdateByColumn_default_instance_._instance,
-    &::io::deephaven::proto::backplane::grpc::_UpdateByRequest_UpdateByOperation_default_instance_._instance,
-    &::io::deephaven::proto::backplane::grpc::_UpdateByRequest_default_instance_._instance,
-    &::io::deephaven::proto::backplane::grpc::_SelectDistinctRequest_default_instance_._instance,
-    &::io::deephaven::proto::backplane::grpc::_DropColumnsRequest_default_instance_._instance,
-    &::io::deephaven::proto::backplane::grpc::_UnstructuredFilterTableRequest_default_instance_._instance,
-    &::io::deephaven::proto::backplane::grpc::_HeadOrTailRequest_default_instance_._instance,
-    &::io::deephaven::proto::backplane::grpc::_HeadOrTailByRequest_default_instance_._instance,
-    &::io::deephaven::proto::backplane::grpc::_UngroupRequest_default_instance_._instance,
-    &::io::deephaven::proto::backplane::grpc::_MergeTablesRequest_default_instance_._instance,
-    &::io::deephaven::proto::backplane::grpc::_SnapshotTableRequest_default_instance_._instance,
-    &::io::deephaven::proto::backplane::grpc::_SnapshotWhenTableRequest_default_instance_._instance,
-    &::io::deephaven::proto::backplane::grpc::_CrossJoinTablesRequest_default_instance_._instance,
-    &::io::deephaven::proto::backplane::grpc::_NaturalJoinTablesRequest_default_instance_._instance,
-    &::io::deephaven::proto::backplane::grpc::_ExactJoinTablesRequest_default_instance_._instance,
-    &::io::deephaven::proto::backplane::grpc::_LeftJoinTablesRequest_default_instance_._instance,
-    &::io::deephaven::proto::backplane::grpc::_AsOfJoinTablesRequest_default_instance_._instance,
-    &::io::deephaven::proto::backplane::grpc::_AjRajTablesRequest_default_instance_._instance,
-    &::io::deephaven::proto::backplane::grpc::_MultiJoinInput_default_instance_._instance,
-    &::io::deephaven::proto::backplane::grpc::_MultiJoinTablesRequest_default_instance_._instance,
-    &::io::deephaven::proto::backplane::grpc::_RangeJoinTablesRequest_default_instance_._instance,
-    &::io::deephaven::proto::backplane::grpc::_ComboAggregateRequest_Aggregate_default_instance_._instance,
-    &::io::deephaven::proto::backplane::grpc::_ComboAggregateRequest_default_instance_._instance,
-    &::io::deephaven::proto::backplane::grpc::_AggregateAllRequest_default_instance_._instance,
-    &::io::deephaven::proto::backplane::grpc::_AggSpec_AggSpecApproximatePercentile_default_instance_._instance,
-    &::io::deephaven::proto::backplane::grpc::_AggSpec_AggSpecCountDistinct_default_instance_._instance,
-    &::io::deephaven::proto::backplane::grpc::_AggSpec_AggSpecDistinct_default_instance_._instance,
-    &::io::deephaven::proto::backplane::grpc::_AggSpec_AggSpecFormula_default_instance_._instance,
-    &::io::deephaven::proto::backplane::grpc::_AggSpec_AggSpecMedian_default_instance_._instance,
-    &::io::deephaven::proto::backplane::grpc::_AggSpec_AggSpecPercentile_default_instance_._instance,
-    &::io::deephaven::proto::backplane::grpc::_AggSpec_AggSpecSorted_default_instance_._instance,
-    &::io::deephaven::proto::backplane::grpc::_AggSpec_AggSpecSortedColumn_default_instance_._instance,
-    &::io::deephaven::proto::backplane::grpc::_AggSpec_AggSpecTDigest_default_instance_._instance,
-    &::io::deephaven::proto::backplane::grpc::_AggSpec_AggSpecUnique_default_instance_._instance,
-    &::io::deephaven::proto::backplane::grpc::_AggSpec_AggSpecNonUniqueSentinel_default_instance_._instance,
-    &::io::deephaven::proto::backplane::grpc::_AggSpec_AggSpecWeighted_default_instance_._instance,
-    &::io::deephaven::proto::backplane::grpc::_AggSpec_AggSpecAbsSum_default_instance_._instance,
-    &::io::deephaven::proto::backplane::grpc::_AggSpec_AggSpecAvg_default_instance_._instance,
-    &::io::deephaven::proto::backplane::grpc::_AggSpec_AggSpecFirst_default_instance_._instance,
-    &::io::deephaven::proto::backplane::grpc::_AggSpec_AggSpecFreeze_default_instance_._instance,
-    &::io::deephaven::proto::backplane::grpc::_AggSpec_AggSpecGroup_default_instance_._instance,
-    &::io::deephaven::proto::backplane::grpc::_AggSpec_AggSpecLast_default_instance_._instance,
-    &::io::deephaven::proto::backplane::grpc::_AggSpec_AggSpecMax_default_instance_._instance,
-    &::io::deephaven::proto::backplane::grpc::_AggSpec_AggSpecMin_default_instance_._instance,
-    &::io::deephaven::proto::backplane::grpc::_AggSpec_AggSpecStd_default_instance_._instance,
-    &::io::deephaven::proto::backplane::grpc::_AggSpec_AggSpecSum_default_instance_._instance,
-    &::io::deephaven::proto::backplane::grpc::_AggSpec_AggSpecVar_default_instance_._instance,
-    &::io::deephaven::proto::backplane::grpc::_AggSpec_default_instance_._instance,
-    &::io::deephaven::proto::backplane::grpc::_AggregateRequest_default_instance_._instance,
-    &::io::deephaven::proto::backplane::grpc::_Aggregation_AggregationColumns_default_instance_._instance,
-    &::io::deephaven::proto::backplane::grpc::_Aggregation_AggregationCount_default_instance_._instance,
-    &::io::deephaven::proto::backplane::grpc::_Aggregation_AggregationRowKey_default_instance_._instance,
-    &::io::deephaven::proto::backplane::grpc::_Aggregation_AggregationPartition_default_instance_._instance,
-    &::io::deephaven::proto::backplane::grpc::_Aggregation_default_instance_._instance,
-    &::io::deephaven::proto::backplane::grpc::_SortDescriptor_default_instance_._instance,
-    &::io::deephaven::proto::backplane::grpc::_SortTableRequest_default_instance_._instance,
-    &::io::deephaven::proto::backplane::grpc::_FilterTableRequest_default_instance_._instance,
-    &::io::deephaven::proto::backplane::grpc::_SeekRowRequest_default_instance_._instance,
-    &::io::deephaven::proto::backplane::grpc::_SeekRowResponse_default_instance_._instance,
-    &::io::deephaven::proto::backplane::grpc::_Reference_default_instance_._instance,
-    &::io::deephaven::proto::backplane::grpc::_Literal_default_instance_._instance,
-    &::io::deephaven::proto::backplane::grpc::_Value_default_instance_._instance,
-    &::io::deephaven::proto::backplane::grpc::_Condition_default_instance_._instance,
-    &::io::deephaven::proto::backplane::grpc::_AndCondition_default_instance_._instance,
-    &::io::deephaven::proto::backplane::grpc::_OrCondition_default_instance_._instance,
-    &::io::deephaven::proto::backplane::grpc::_NotCondition_default_instance_._instance,
-    &::io::deephaven::proto::backplane::grpc::_CompareCondition_default_instance_._instance,
-    &::io::deephaven::proto::backplane::grpc::_InCondition_default_instance_._instance,
-    &::io::deephaven::proto::backplane::grpc::_InvokeCondition_default_instance_._instance,
-    &::io::deephaven::proto::backplane::grpc::_IsNullCondition_default_instance_._instance,
-    &::io::deephaven::proto::backplane::grpc::_MatchesCondition_default_instance_._instance,
-    &::io::deephaven::proto::backplane::grpc::_ContainsCondition_default_instance_._instance,
-    &::io::deephaven::proto::backplane::grpc::_SearchCondition_default_instance_._instance,
-    &::io::deephaven::proto::backplane::grpc::_FlattenRequest_default_instance_._instance,
-    &::io::deephaven::proto::backplane::grpc::_MetaTableRequest_default_instance_._instance,
-    &::io::deephaven::proto::backplane::grpc::_RunChartDownsampleRequest_ZoomRange_default_instance_._instance,
-    &::io::deephaven::proto::backplane::grpc::_RunChartDownsampleRequest_default_instance_._instance,
-    &::io::deephaven::proto::backplane::grpc::_CreateInputTableRequest_InputTableKind_InMemoryAppendOnly_default_instance_._instance,
-    &::io::deephaven::proto::backplane::grpc::_CreateInputTableRequest_InputTableKind_InMemoryKeyBacked_default_instance_._instance,
-    &::io::deephaven::proto::backplane::grpc::_CreateInputTableRequest_InputTableKind_Blink_default_instance_._instance,
-    &::io::deephaven::proto::backplane::grpc::_CreateInputTableRequest_InputTableKind_default_instance_._instance,
-    &::io::deephaven::proto::backplane::grpc::_CreateInputTableRequest_default_instance_._instance,
-    &::io::deephaven::proto::backplane::grpc::_WhereInRequest_default_instance_._instance,
-    &::io::deephaven::proto::backplane::grpc::_ColumnStatisticsRequest_default_instance_._instance,
-    &::io::deephaven::proto::backplane::grpc::_BatchTableRequest_Operation_default_instance_._instance,
-    &::io::deephaven::proto::backplane::grpc::_BatchTableRequest_default_instance_._instance,
-};
-const char descriptor_table_protodef_deephaven_2fproto_2ftable_2eproto[] PROTOBUF_SECTION_VARIABLE(protodesc_cold) = {
-    "\n\033deephaven/proto/table.proto\022!io.deepha"
-    "ven.proto.backplane.grpc\032\034deephaven/prot"
-    "o/ticket.proto\"l\n\016TableReference\022;\n\006tick"
-    "et\030\001 \001(\0132).io.deephaven.proto.backplane."
-    "grpc.TicketH\000\022\026\n\014batch_offset\030\002 \001(\021H\000B\005\n"
-    "\003ref\"\306\001\n\035ExportedTableCreationResponse\022D"
-    "\n\tresult_id\030\001 \001(\01321.io.deephaven.proto.b"
-    "ackplane.grpc.TableReference\022\017\n\007success\030"
-    "\002 \001(\010\022\022\n\nerror_info\030\003 \001(\t\022\025\n\rschema_head"
-    "er\030\004 \001(\014\022\021\n\tis_static\030\005 \001(\010\022\020\n\004size\030\006 \001("
-    "\022B\0020\001\"\227\001\n\021FetchTableRequest\022D\n\tsource_id"
-    "\030\001 \001(\01321.io.deephaven.proto.backplane.gr"
-    "pc.TableReference\022<\n\tresult_id\030\002 \001(\0132).i"
-    "o.deephaven.proto.backplane.grpc.Ticket\""
-    "\240\001\n\032ApplyPreviewColumnsRequest\022D\n\tsource"
-    "_id\030\001 \001(\01321.io.deephaven.proto.backplane"
-    ".grpc.TableReference\022<\n\tresult_id\030\002 \001(\0132"
-    ").io.deephaven.proto.backplane.grpc.Tick"
-    "et\"\035\n\033ExportedTableUpdatesRequest\"\214\001\n\032Ex"
-    "portedTableUpdateMessage\022<\n\texport_id\030\001 "
-    "\001(\0132).io.deephaven.proto.backplane.grpc."
-    "Ticket\022\020\n\004size\030\002 \001(\022B\0020\001\022\036\n\026update_failu"
-    "re_message\030\003 \001(\t\"c\n\021EmptyTableRequest\022<\n"
-    "\tresult_id\030\001 \001(\0132).io.deephaven.proto.ba"
-    "ckplane.grpc.Ticket\022\020\n\004size\030\002 \001(\022B\0020\001\"\357\001"
-    "\n\020TimeTableRequest\022<\n\tresult_id\030\001 \001(\0132)."
-    "io.deephaven.proto.backplane.grpc.Ticket"
-    "\022\036\n\020start_time_nanos\030\002 \001(\022B\0020\001H\000\022\033\n\021star"
-    "t_time_string\030\005 \001(\tH\000\022\032\n\014period_nanos\030\003 "
-    "\001(\022B\0020\001H\001\022\027\n\rperiod_string\030\006 \001(\tH\001\022\023\n\013bl"
-    "ink_table\030\004 \001(\010B\014\n\nstart_timeB\010\n\006period\""
-    "\261\001\n\025SelectOrUpdateRequest\022<\n\tresult_id\030\001"
-    " \001(\0132).io.deephaven.proto.backplane.grpc"
-    ".Ticket\022D\n\tsource_id\030\002 \001(\01321.io.deephave"
-    "n.proto.backplane.grpc.TableReference\022\024\n"
-    "\014column_specs\030\003 \003(\t\"\214\002\n\013MathContext\022\021\n\tp"
-    "recision\030\001 \001(\021\022R\n\rrounding_mode\030\002 \001(\0162;."
-    "io.deephaven.proto.backplane.grpc.MathCo"
-    "ntext.RoundingMode\"\225\001\n\014RoundingMode\022\037\n\033R"
-    "OUNDING_MODE_NOT_SPECIFIED\020\000\022\006\n\002UP\020\001\022\010\n\004"
-    "DOWN\020\002\022\013\n\007CEILING\020\003\022\t\n\005FLOOR\020\004\022\013\n\007HALF_U"
-    "P\020\005\022\r\n\tHALF_DOWN\020\006\022\r\n\tHALF_EVEN\020\007\022\017\n\013UNN"
-    "ECESSARY\020\010\"\333\002\n\023UpdateByWindowScale\022[\n\005ti"
-    "cks\030\001 \001(\0132J.io.deephaven.proto.backplane"
-    ".grpc.UpdateByWindowScale.UpdateByWindow"
-    "TicksH\000\022Y\n\004time\030\002 \001(\0132I.io.deephaven.pro"
-    "to.backplane.grpc.UpdateByWindowScale.Up"
-    "dateByWindowTimeH\000\032$\n\023UpdateByWindowTick"
-    "s\022\r\n\005ticks\030\001 \001(\001\032^\n\022UpdateByWindowTime\022\016"
-    "\n\006column\030\001 \001(\t\022\023\n\005nanos\030\002 \001(\022B\0020\001H\000\022\031\n\017d"
-    "uration_string\030\003 \001(\tH\000B\010\n\006windowB\006\n\004type"
-    "\"\341\003\n\021UpdateByEmOptions\022I\n\ron_null_value\030"
-    "\001 \001(\01622.io.deephaven.proto.backplane.grp"
-    "c.BadDataBehavior\022H\n\014on_nan_value\030\002 \001(\0162"
-    "2.io.deephaven.proto.backplane.grpc.BadD"
-    "ataBehavior\022H\n\014on_null_time\030\003 \001(\01622.io.d"
-    "eephaven.proto.backplane.grpc.BadDataBeh"
-    "avior\022R\n\026on_negative_delta_time\030\004 \001(\01622."
-    "io.deephaven.proto.backplane.grpc.BadDat"
-    "aBehavior\022N\n\022on_zero_delta_time\030\005 \001(\01622."
-    "io.deephaven.proto.backplane.grpc.BadDat"
-    "aBehavior\022I\n\021big_value_context\030\006 \001(\0132..i"
-    "o.deephaven.proto.backplane.grpc.MathCon"
-    "text\"f\n\024UpdateByDeltaOptions\022N\n\rnull_beh"
-    "avior\030\001 \001(\01627.io.deephaven.proto.backpla"
-    "ne.grpc.UpdateByNullBehavior\"\2337\n\017UpdateB"
-    "yRequest\022<\n\tresult_id\030\001 \001(\0132).io.deephav"
-    "en.proto.backplane.grpc.Ticket\022D\n\tsource"
-    "_id\030\002 \001(\01321.io.deephaven.proto.backplane"
-    ".grpc.TableReference\022S\n\007options\030\003 \001(\0132B."
-    "io.deephaven.proto.backplane.grpc.Update"
-    "ByRequest.UpdateByOptions\022X\n\noperations\030"
-    "\004 \003(\0132D.io.deephaven.proto.backplane.grp"
-    "c.UpdateByRequest.UpdateByOperation\022\030\n\020g"
-    "roup_by_columns\030\005 \003(\t\032\303\003\n\017UpdateByOption"
-    "s\022\034\n\017use_redirection\030\001 \001(\010H\000\210\001\001\022\033\n\016chunk"
-    "_capacity\030\002 \001(\005H\001\210\001\001\022.\n!max_static_spars"
-    "e_memory_overhead\030\003 \001(\001H\002\210\001\001\022$\n\027initial_"
-    "hash_table_size\030\004 \001(\005H\003\210\001\001\022 \n\023maximum_lo"
-    "ad_factor\030\005 \001(\001H\004\210\001\001\022\037\n\022target_load_fact"
-    "or\030\006 \001(\001H\005\210\001\001\022D\n\014math_context\030\007 \001(\0132..io"
-    ".deephaven.proto.backplane.grpc.MathCont"
-    "extB\022\n\020_use_redirectionB\021\n\017_chunk_capaci"
-    "tyB$\n\"_max_static_sparse_memory_overhead"
-    "B\032\n\030_initial_hash_table_sizeB\026\n\024_maximum"
-    "_load_factorB\025\n\023_target_load_factor\032\3640\n\021"
-    "UpdateByOperation\022e\n\006column\030\001 \001(\0132S.io.d"
-    "eephaven.proto.backplane.grpc.UpdateByRe"
-    "quest.UpdateByOperation.UpdateByColumnH\000"
-    "\032\357/\n\016UpdateByColumn\022n\n\004spec\030\001 \001(\0132`.io.d"
-    "eephaven.proto.backplane.grpc.UpdateByRe"
-    "quest.UpdateByOperation.UpdateByColumn.U"
-    "pdateBySpec\022\023\n\013match_pairs\030\002 \003(\t\032\327.\n\014Upd"
-    "ateBySpec\022\205\001\n\003sum\030\001 \001(\0132v.io.deephaven.p"
-    "roto.backplane.grpc.UpdateByRequest.Upda"
-    "teByOperation.UpdateByColumn.UpdateBySpe"
-    "c.UpdateByCumulativeSumH\000\022\205\001\n\003min\030\002 \001(\0132"
-    "v.io.deephaven.proto.backplane.grpc.Upda"
-    "teByRequest.UpdateByOperation.UpdateByCo"
-    "lumn.UpdateBySpec.UpdateByCumulativeMinH"
-    "\000\022\205\001\n\003max\030\003 \001(\0132v.io.deephaven.proto.bac"
-    "kplane.grpc.UpdateByRequest.UpdateByOper"
-    "ation.UpdateByColumn.UpdateBySpec.Update"
-    "ByCumulativeMaxH\000\022\215\001\n\007product\030\004 \001(\0132z.io"
-    ".deephaven.proto.backplane.grpc.UpdateBy"
-    "Request.UpdateByOperation.UpdateByColumn"
-    ".UpdateBySpec.UpdateByCumulativeProductH"
-    "\000\022}\n\004fill\030\005 \001(\0132m.io.deephaven.proto.bac"
-    "kplane.grpc.UpdateByRequest.UpdateByOper"
-    "ation.UpdateByColumn.UpdateBySpec.Update"
-    "ByFillH\000\022{\n\003ema\030\006 \001(\0132l.io.deephaven.pro"
-    "to.backplane.grpc.UpdateByRequest.Update"
-    "ByOperation.UpdateByColumn.UpdateBySpec."
-    "UpdateByEmaH\000\022\212\001\n\013rolling_sum\030\007 \001(\0132s.io"
-    ".deephaven.proto.backplane.grpc.UpdateBy"
-    "Request.UpdateByOperation.UpdateByColumn"
-    ".UpdateBySpec.UpdateByRollingSumH\000\022\216\001\n\rr"
-    "olling_group\030\010 \001(\0132u.io.deephaven.proto."
-    "backplane.grpc.UpdateByRequest.UpdateByO"
-    "peration.UpdateByColumn.UpdateBySpec.Upd"
-    "ateByRollingGroupH\000\022\212\001\n\013rolling_avg\030\t \001("
-    "\0132s.io.deephaven.proto.backplane.grpc.Up"
-    "dateByRequest.UpdateByOperation.UpdateBy"
-    "Column.UpdateBySpec.UpdateByRollingAvgH\000"
-    "\022\212\001\n\013rolling_min\030\n \001(\0132s.io.deephaven.pr"
-    "oto.backplane.grpc.UpdateByRequest.Updat"
-    "eByOperation.UpdateByColumn.UpdateBySpec"
-    ".UpdateByRollingMinH\000\022\212\001\n\013rolling_max\030\013 "
-    "\001(\0132s.io.deephaven.proto.backplane.grpc."
-    "UpdateByRequest.UpdateByOperation.Update"
-    "ByColumn.UpdateBySpec.UpdateByRollingMax"
-    "H\000\022\222\001\n\017rolling_product\030\014 \001(\0132w.io.deepha"
-    "ven.proto.backplane.grpc.UpdateByRequest"
-    ".UpdateByOperation.UpdateByColumn.Update"
-    "BySpec.UpdateByRollingProductH\000\022\177\n\005delta"
-    "\030\r \001(\0132n.io.deephaven.proto.backplane.gr"
-    "pc.UpdateByRequest.UpdateByOperation.Upd"
-    "ateByColumn.UpdateBySpec.UpdateByDeltaH\000"
-    "\022{\n\003ems\030\016 \001(\0132l.io.deephaven.proto.backp"
-    "lane.grpc.UpdateByRequest.UpdateByOperat"
-    "ion.UpdateByColumn.UpdateBySpec.UpdateBy"
-    "EmsH\000\022\200\001\n\006em_min\030\017 \001(\0132n.io.deephaven.pr"
-    "oto.backplane.grpc.UpdateByRequest.Updat"
-    "eByOperation.UpdateByColumn.UpdateBySpec"
-    ".UpdateByEmMinH\000\022\200\001\n\006em_max\030\020 \001(\0132n.io.d"
-    "eephaven.proto.backplane.grpc.UpdateByRe"
-    "quest.UpdateByOperation.UpdateByColumn.U"
-    "pdateBySpec.UpdateByEmMaxH\000\022\200\001\n\006em_std\030\021"
-    " \001(\0132n.io.deephaven.proto.backplane.grpc"
-    ".UpdateByRequest.UpdateByOperation.Updat"
-    "eByColumn.UpdateBySpec.UpdateByEmStdH\000\022\216"
-    "\001\n\rrolling_count\030\022 \001(\0132u.io.deephaven.pr"
-    "oto.backplane.grpc.UpdateByRequest.Updat"
-    "eByOperation.UpdateByColumn.UpdateBySpec"
-    ".UpdateByRollingCountH\000\022\212\001\n\013rolling_std\030"
-    "\023 \001(\0132s.io.deephaven.proto.backplane.grp"
-    "c.UpdateByRequest.UpdateByOperation.Upda"
-    "teByColumn.UpdateBySpec.UpdateByRollingS"
-    "tdH\000\022\214\001\n\014rolling_wavg\030\024 \001(\0132t.io.deephav"
-    "en.proto.backplane.grpc.UpdateByRequest."
-    "UpdateByOperation.UpdateByColumn.UpdateB"
-    "ySpec.UpdateByRollingWAvgH\000\022\222\001\n\017rolling_"
-    "formula\030\025 \001(\0132w.io.deephaven.proto.backp"
-    "lane.grpc.UpdateByRequest.UpdateByOperat"
-    "ion.UpdateByColumn.UpdateBySpec.UpdateBy"
-    "RollingFormulaH\000\032\027\n\025UpdateByCumulativeSu"
-    "m\032\027\n\025UpdateByCumulativeMin\032\027\n\025UpdateByCu"
-    "mulativeMax\032\033\n\031UpdateByCumulativeProduct"
-    "\032\016\n\014UpdateByFill\032\242\001\n\013UpdateByEma\022E\n\007opti"
-    "ons\030\001 \001(\01324.io.deephaven.proto.backplane"
-    ".grpc.UpdateByEmOptions\022L\n\014window_scale\030"
-    "\002 \001(\01326.io.deephaven.proto.backplane.grp"
-    "c.UpdateByWindowScale\032\242\001\n\013UpdateByEms\022E\n"
-    "\007options\030\001 \001(\01324.io.deephaven.proto.back"
-    "plane.grpc.UpdateByEmOptions\022L\n\014window_s"
-    "cale\030\002 \001(\01326.io.deephaven.proto.backplan"
-    "e.grpc.UpdateByWindowScale\032\244\001\n\rUpdateByE"
-    "mMin\022E\n\007options\030\001 \001(\01324.io.deephaven.pro"
-    "to.backplane.grpc.UpdateByEmOptions\022L\n\014w"
-    "indow_scale\030\002 \001(\01326.io.deephaven.proto.b"
-    "ackplane.grpc.UpdateByWindowScale\032\244\001\n\rUp"
-    "dateByEmMax\022E\n\007options\030\001 \001(\01324.io.deepha"
-    "ven.proto.backplane.grpc.UpdateByEmOptio"
-    "ns\022L\n\014window_scale\030\002 \001(\01326.io.deephaven."
-    "proto.backplane.grpc.UpdateByWindowScale"
-    "\032\244\001\n\rUpdateByEmStd\022E\n\007options\030\001 \001(\01324.io"
-    ".deephaven.proto.backplane.grpc.UpdateBy"
-    "EmOptions\022L\n\014window_scale\030\002 \001(\01326.io.dee"
-    "phaven.proto.backplane.grpc.UpdateByWind"
-    "owScale\032Y\n\rUpdateByDelta\022H\n\007options\030\001 \001("
-    "\01327.io.deephaven.proto.backplane.grpc.Up"
-    "dateByDeltaOptions\032\300\001\n\022UpdateByRollingSu"
-    "m\022T\n\024reverse_window_scale\030\001 \001(\01326.io.dee"
-    "phaven.proto.backplane.grpc.UpdateByWind"
-    "owScale\022T\n\024forward_window_scale\030\002 \001(\01326."
-    "io.deephaven.proto.backplane.grpc.Update"
-    "ByWindowScale\032\302\001\n\024UpdateByRollingGroup\022T"
-    "\n\024reverse_window_scale\030\001 \001(\01326.io.deepha"
-    "ven.proto.backplane.grpc.UpdateByWindowS"
-    "cale\022T\n\024forward_window_scale\030\002 \001(\01326.io."
-    "deephaven.proto.backplane.grpc.UpdateByW"
-    "indowScale\032\300\001\n\022UpdateByRollingAvg\022T\n\024rev"
-    "erse_window_scale\030\001 \001(\01326.io.deephaven.p"
-    "roto.backplane.grpc.UpdateByWindowScale\022"
-    "T\n\024forward_window_scale\030\002 \001(\01326.io.deeph"
-    "aven.proto.backplane.grpc.UpdateByWindow"
-    "Scale\032\300\001\n\022UpdateByRollingMin\022T\n\024reverse_"
-    "window_scale\030\001 \001(\01326.io.deephaven.proto."
-    "backplane.grpc.UpdateByWindowScale\022T\n\024fo"
-    "rward_window_scale\030\002 \001(\01326.io.deephaven."
-    "proto.backplane.grpc.UpdateByWindowScale"
-    "\032\300\001\n\022UpdateByRollingMax\022T\n\024reverse_windo"
-    "w_scale\030\001 \001(\01326.io.deephaven.proto.backp"
-    "lane.grpc.UpdateByWindowScale\022T\n\024forward"
-    "_window_scale\030\002 \001(\01326.io.deephaven.proto"
-    ".backplane.grpc.UpdateByWindowScale\032\304\001\n\026"
-    "UpdateByRollingProduct\022T\n\024reverse_window"
-    "_scale\030\001 \001(\01326.io.deephaven.proto.backpl"
-    "ane.grpc.UpdateByWindowScale\022T\n\024forward_"
-    "window_scale\030\002 \001(\01326.io.deephaven.proto."
-    "backplane.grpc.UpdateByWindowScale\032\302\001\n\024U"
-    "pdateByRollingCount\022T\n\024reverse_window_sc"
-    "ale\030\001 \001(\01326.io.deephaven.proto.backplane"
-    ".grpc.UpdateByWindowScale\022T\n\024forward_win"
-    "dow_scale\030\002 \001(\01326.io.deephaven.proto.bac"
-    "kplane.grpc.UpdateByWindowScale\032\300\001\n\022Upda"
-    "teByRollingStd\022T\n\024reverse_window_scale\030\001"
-    " \001(\01326.io.deephaven.proto.backplane.grpc"
-    ".UpdateByWindowScale\022T\n\024forward_window_s"
-    "cale\030\002 \001(\01326.io.deephaven.proto.backplan"
-    "e.grpc.UpdateByWindowScale\032\330\001\n\023UpdateByR"
-    "ollingWAvg\022T\n\024reverse_window_scale\030\001 \001(\013"
-    "26.io.deephaven.proto.backplane.grpc.Upd"
-    "ateByWindowScale\022T\n\024forward_window_scale"
-    "\030\002 \001(\01326.io.deephaven.proto.backplane.gr"
-    "pc.UpdateByWindowScale\022\025\n\rweight_column\030"
-    "\003 \001(\t\032\352\001\n\026UpdateByRollingFormula\022T\n\024reve"
-    "rse_window_scale\030\001 \001(\01326.io.deephaven.pr"
-    "oto.backplane.grpc.UpdateByWindowScale\022T"
-    "\n\024forward_window_scale\030\002 \001(\01326.io.deepha"
-    "ven.proto.backplane.grpc.UpdateByWindowS"
-    "cale\022\017\n\007formula\030\003 \001(\t\022\023\n\013param_token\030\004 \001"
-    "(\tB\006\n\004typeB\006\n\004type\"\261\001\n\025SelectDistinctReq"
-    "uest\022<\n\tresult_id\030\001 \001(\0132).io.deephaven.p"
-    "roto.backplane.grpc.Ticket\022D\n\tsource_id\030"
-    "\002 \001(\01321.io.deephaven.proto.backplane.grp"
-    "c.TableReference\022\024\n\014column_names\030\003 \003(\t\"\256"
-    "\001\n\022DropColumnsRequest\022<\n\tresult_id\030\001 \001(\013"
-    "2).io.deephaven.proto.backplane.grpc.Tic"
-    "ket\022D\n\tsource_id\030\002 \001(\01321.io.deephaven.pr"
-    "oto.backplane.grpc.TableReference\022\024\n\014col"
-    "umn_names\030\003 \003(\t\"\265\001\n\036UnstructuredFilterTa"
-    "bleRequest\022<\n\tresult_id\030\001 \001(\0132).io.deeph"
-    "aven.proto.backplane.grpc.Ticket\022D\n\tsour"
-    "ce_id\030\002 \001(\01321.io.deephaven.proto.backpla"
-    "ne.grpc.TableReference\022\017\n\007filters\030\003 \003(\t\""
-    "\255\001\n\021HeadOrTailRequest\022<\n\tresult_id\030\001 \001(\013"
-    "2).io.deephaven.proto.backplane.grpc.Tic"
-    "ket\022D\n\tsource_id\030\002 \001(\01321.io.deephaven.pr"
-    "oto.backplane.grpc.TableReference\022\024\n\010num"
-    "_rows\030\003 \001(\022B\0020\001\"\316\001\n\023HeadOrTailByRequest\022"
-    "<\n\tresult_id\030\001 \001(\0132).io.deephaven.proto."
-    "backplane.grpc.Ticket\022D\n\tsource_id\030\002 \001(\013"
-    "21.io.deephaven.proto.backplane.grpc.Tab"
-    "leReference\022\024\n\010num_rows\030\003 \001(\022B\0020\001\022\035\n\025gro"
-    "up_by_column_specs\030\004 \003(\t\"\303\001\n\016UngroupRequ"
-    "est\022<\n\tresult_id\030\001 \001(\0132).io.deephaven.pr"
-    "oto.backplane.grpc.Ticket\022D\n\tsource_id\030\002"
-    " \001(\01321.io.deephaven.proto.backplane.grpc"
-    ".TableReference\022\021\n\tnull_fill\030\003 \001(\010\022\032\n\022co"
-    "lumns_to_ungroup\030\004 \003(\t\"\255\001\n\022MergeTablesRe"
-    "quest\022<\n\tresult_id\030\001 \001(\0132).io.deephaven."
-    "proto.backplane.grpc.Ticket\022E\n\nsource_id"
-    "s\030\002 \003(\01321.io.deephaven.proto.backplane.g"
-    "rpc.TableReference\022\022\n\nkey_column\030\003 \001(\t\"\232"
-    "\001\n\024SnapshotTableRequest\022<\n\tresult_id\030\001 \001"
-    "(\0132).io.deephaven.proto.backplane.grpc.T"
-    "icket\022D\n\tsource_id\030\002 \001(\01321.io.deephaven."
-    "proto.backplane.grpc.TableReference\"\261\002\n\030"
-    "SnapshotWhenTableRequest\022<\n\tresult_id\030\001 "
-    "\001(\0132).io.deephaven.proto.backplane.grpc."
-    "Ticket\022B\n\007base_id\030\002 \001(\01321.io.deephaven.p"
-    "roto.backplane.grpc.TableReference\022E\n\ntr"
-    "igger_id\030\003 \001(\01321.io.deephaven.proto.back"
-    "plane.grpc.TableReference\022\017\n\007initial\030\004 \001"
-    "(\010\022\023\n\013incremental\030\005 \001(\010\022\017\n\007history\030\006 \001(\010"
-    "\022\025\n\rstamp_columns\030\007 \003(\t\"\247\002\n\026CrossJoinTab"
-    "lesRequest\022<\n\tresult_id\030\001 \001(\0132).io.deeph"
-    "aven.proto.backplane.grpc.Ticket\022B\n\007left"
-    "_id\030\002 \001(\01321.io.deephaven.proto.backplane"
-    ".grpc.TableReference\022C\n\010right_id\030\003 \001(\01321"
-    ".io.deephaven.proto.backplane.grpc.Table"
-    "Reference\022\030\n\020columns_to_match\030\004 \003(\t\022\026\n\016c"
-    "olumns_to_add\030\005 \003(\t\022\024\n\014reserve_bits\030\006 \001("
-    "\005\"\223\002\n\030NaturalJoinTablesRequest\022<\n\tresult"
-    "_id\030\001 \001(\0132).io.deephaven.proto.backplane"
-    ".grpc.Ticket\022B\n\007left_id\030\002 \001(\01321.io.deeph"
-    "aven.proto.backplane.grpc.TableReference"
-    "\022C\n\010right_id\030\003 \001(\01321.io.deephaven.proto."
-    "backplane.grpc.TableReference\022\030\n\020columns"
-    "_to_match\030\004 \003(\t\022\026\n\016columns_to_add\030\005 \003(\t\""
-    "\221\002\n\026ExactJoinTablesRequest\022<\n\tresult_id\030"
-    "\001 \001(\0132).io.deephaven.proto.backplane.grp"
-    "c.Ticket\022B\n\007left_id\030\002 \001(\01321.io.deephaven"
-    ".proto.backplane.grpc.TableReference\022C\n\010"
-    "right_id\030\003 \001(\01321.io.deephaven.proto.back"
-    "plane.grpc.TableReference\022\030\n\020columns_to_"
-    "match\030\004 \003(\t\022\026\n\016columns_to_add\030\005 \003(\t\"\220\002\n\025"
-    "LeftJoinTablesRequest\022<\n\tresult_id\030\001 \001(\013"
-    "2).io.deephaven.proto.backplane.grpc.Tic"
-    "ket\022B\n\007left_id\030\002 \001(\01321.io.deephaven.prot"
-    "o.backplane.grpc.TableReference\022C\n\010right"
-    "_id\030\003 \001(\01321.io.deephaven.proto.backplane"
-    ".grpc.TableReference\022\030\n\020columns_to_match"
-    "\030\004 \003(\t\022\026\n\016columns_to_add\030\005 \003(\t\"\321\003\n\025AsOfJ"
-    "oinTablesRequest\022<\n\tresult_id\030\001 \001(\0132).io"
-    ".deephaven.proto.backplane.grpc.Ticket\022B"
-    "\n\007left_id\030\002 \001(\01321.io.deephaven.proto.bac"
-    "kplane.grpc.TableReference\022C\n\010right_id\030\003"
-    " \001(\01321.io.deephaven.proto.backplane.grpc"
-    ".TableReference\022\030\n\020columns_to_match\030\004 \003("
-    "\t\022\026\n\016columns_to_add\030\005 \003(\t\022\\\n\020as_of_match"
-    "_rule\030\007 \001(\0162B.io.deephaven.proto.backpla"
-    "ne.grpc.AsOfJoinTablesRequest.MatchRule\""
-    "]\n\tMatchRule\022\023\n\017LESS_THAN_EQUAL\020\000\022\r\n\tLES"
-    "S_THAN\020\001\022\026\n\022GREATER_THAN_EQUAL\020\002\022\020\n\014GREA"
-    "TER_THAN\020\003\032\002\030\001:\002\030\001\"\246\002\n\022AjRajTablesReques"
-    "t\022<\n\tresult_id\030\001 \001(\0132).io.deephaven.prot"
-    "o.backplane.grpc.Ticket\022B\n\007left_id\030\002 \001(\013"
-    "21.io.deephaven.proto.backplane.grpc.Tab"
-    "leReference\022C\n\010right_id\030\003 \001(\01321.io.deeph"
-    "aven.proto.backplane.grpc.TableReference"
-    "\022\033\n\023exact_match_columns\030\004 \003(\t\022\024\n\014as_of_c"
-    "olumn\030\005 \001(\t\022\026\n\016columns_to_add\030\006 \003(\t\"\210\001\n\016"
-    "MultiJoinInput\022D\n\tsource_id\030\001 \001(\01321.io.d"
-    "eephaven.proto.backplane.grpc.TableRefer"
-    "ence\022\030\n\020columns_to_match\030\002 \003(\t\022\026\n\016column"
-    "s_to_add\030\003 \003(\t\"\244\001\n\026MultiJoinTablesReques"
-    "t\022<\n\tresult_id\030\001 \001(\0132).io.deephaven.prot"
-    "o.backplane.grpc.Ticket\022L\n\021multi_join_in"
-    "puts\030\002 \003(\01321.io.deephaven.proto.backplan"
-    "e.grpc.MultiJoinInput\"\340\006\n\026RangeJoinTable"
-    "sRequest\022<\n\tresult_id\030\001 \001(\0132).io.deephav"
-    "en.proto.backplane.grpc.Ticket\022B\n\007left_i"
-    "d\030\002 \001(\01321.io.deephaven.proto.backplane.g"
-    "rpc.TableReference\022C\n\010right_id\030\003 \001(\01321.i"
-    "o.deephaven.proto.backplane.grpc.TableRe"
-    "ference\022\033\n\023exact_match_columns\030\004 \003(\t\022\031\n\021"
-    "left_start_column\030\005 \001(\t\022b\n\020range_start_r"
-    "ule\030\006 \001(\0162H.io.deephaven.proto.backplane"
-    ".grpc.RangeJoinTablesRequest.RangeStartR"
-    "ule\022\032\n\022right_range_column\030\007 \001(\t\022^\n\016range"
-    "_end_rule\030\010 \001(\0162F.io.deephaven.proto.bac"
-    "kplane.grpc.RangeJoinTablesRequest.Range"
-    "EndRule\022\027\n\017left_end_column\030\t \001(\t\022D\n\014aggr"
-    "egations\030\n \003(\0132..io.deephaven.proto.back"
-    "plane.grpc.Aggregation\022\023\n\013range_match\030\013 "
-    "\001(\t\"v\n\016RangeStartRule\022\025\n\021START_UNSPECIFI"
-    "ED\020\000\022\r\n\tLESS_THAN\020\001\022\026\n\022LESS_THAN_OR_EQUA"
-    "L\020\002\022&\n\"LESS_THAN_OR_EQUAL_ALLOW_PRECEDIN"
-    "G\020\003\"{\n\014RangeEndRule\022\023\n\017END_UNSPECIFIED\020\000"
-    "\022\020\n\014GREATER_THAN\020\001\022\031\n\025GREATER_THAN_OR_EQ"
-    "UAL\020\002\022)\n%GREATER_THAN_OR_EQUAL_ALLOW_FOL"
-    "LOWING\020\003\"\376\004\n\025ComboAggregateRequest\022<\n\tre"
-    "sult_id\030\001 \001(\0132).io.deephaven.proto.backp"
-    "lane.grpc.Ticket\022D\n\tsource_id\030\002 \001(\01321.io"
-    ".deephaven.proto.backplane.grpc.TableRef"
-    "erence\022V\n\naggregates\030\003 \003(\0132B.io.deephave"
-    "n.proto.backplane.grpc.ComboAggregateReq"
-    "uest.Aggregate\022\030\n\020group_by_columns\030\004 \003(\t"
-    "\022\023\n\013force_combo\030\005 \001(\010\032\255\001\n\tAggregate\022N\n\004t"
-    "ype\030\001 \001(\0162@.io.deephaven.proto.backplane"
-    ".grpc.ComboAggregateRequest.AggType\022\023\n\013m"
-    "atch_pairs\030\002 \003(\t\022\023\n\013column_name\030\003 \001(\t\022\022\n"
-    "\npercentile\030\004 \001(\001\022\022\n\navg_median\030\005 \001(\010\"\245\001"
-    "\n\007AggType\022\007\n\003SUM\020\000\022\013\n\007ABS_SUM\020\001\022\t\n\005GROUP"
-    "\020\002\022\007\n\003AVG\020\003\022\t\n\005COUNT\020\004\022\t\n\005FIRST\020\005\022\010\n\004LAS"
-    "T\020\006\022\007\n\003MIN\020\007\022\007\n\003MAX\020\010\022\n\n\006MEDIAN\020\t\022\016\n\nPER"
-    "CENTILE\020\n\022\007\n\003STD\020\013\022\007\n\003VAR\020\014\022\020\n\014WEIGHTED_"
-    "AVG\020\r:\002\030\001\"\355\001\n\023AggregateAllRequest\022<\n\tres"
-    "ult_id\030\001 \001(\0132).io.deephaven.proto.backpl"
-    "ane.grpc.Ticket\022D\n\tsource_id\030\002 \001(\01321.io."
-    "deephaven.proto.backplane.grpc.TableRefe"
-    "rence\0228\n\004spec\030\003 \001(\0132*.io.deephaven.proto"
-    ".backplane.grpc.AggSpec\022\030\n\020group_by_colu"
-    "mns\030\004 \003(\t\"\327\027\n\007AggSpec\022K\n\007abs_sum\030\001 \001(\01328"
-    ".io.deephaven.proto.backplane.grpc.AggSp"
-    "ec.AggSpecAbsSumH\000\022i\n\026approximate_percen"
-    "tile\030\002 \001(\0132G.io.deephaven.proto.backplan"
-    "e.grpc.AggSpec.AggSpecApproximatePercent"
-    "ileH\000\022D\n\003avg\030\003 \001(\01325.io.deephaven.proto."
-    "backplane.grpc.AggSpec.AggSpecAvgH\000\022Y\n\016c"
-    "ount_distinct\030\004 \001(\0132\?.io.deephaven.proto"
-    ".backplane.grpc.AggSpec.AggSpecCountDist"
-    "inctH\000\022N\n\010distinct\030\005 \001(\0132:.io.deephaven."
-    "proto.backplane.grpc.AggSpec.AggSpecDist"
-    "inctH\000\022H\n\005first\030\006 \001(\01327.io.deephaven.pro"
-    "to.backplane.grpc.AggSpec.AggSpecFirstH\000"
-    "\022L\n\007formula\030\007 \001(\01329.io.deephaven.proto.b"
-    "ackplane.grpc.AggSpec.AggSpecFormulaH\000\022J"
-    "\n\006freeze\030\010 \001(\01328.io.deephaven.proto.back"
-    "plane.grpc.AggSpec.AggSpecFreezeH\000\022H\n\005gr"
-    "oup\030\t \001(\01327.io.deephaven.proto.backplane"
-    ".grpc.AggSpec.AggSpecGroupH\000\022F\n\004last\030\n \001"
-    "(\01326.io.deephaven.proto.backplane.grpc.A"
-    "ggSpec.AggSpecLastH\000\022D\n\003max\030\013 \001(\01325.io.d"
-    "eephaven.proto.backplane.grpc.AggSpec.Ag"
-    "gSpecMaxH\000\022J\n\006median\030\014 \001(\01328.io.deephave"
-    "n.proto.backplane.grpc.AggSpec.AggSpecMe"
-    "dianH\000\022D\n\003min\030\r \001(\01325.io.deephaven.proto"
-    ".backplane.grpc.AggSpec.AggSpecMinH\000\022R\n\n"
-    "percentile\030\016 \001(\0132<.io.deephaven.proto.ba"
-    "ckplane.grpc.AggSpec.AggSpecPercentileH\000"
-    "\022P\n\014sorted_first\030\017 \001(\01328.io.deephaven.pr"
-    "oto.backplane.grpc.AggSpec.AggSpecSorted"
-    "H\000\022O\n\013sorted_last\030\020 \001(\01328.io.deephaven.p"
-    "roto.backplane.grpc.AggSpec.AggSpecSorte"
-    "dH\000\022D\n\003std\030\021 \001(\01325.io.deephaven.proto.ba"
-    "ckplane.grpc.AggSpec.AggSpecStdH\000\022D\n\003sum"
-    "\030\022 \001(\01325.io.deephaven.proto.backplane.gr"
-    "pc.AggSpec.AggSpecSumH\000\022M\n\010t_digest\030\023 \001("
-    "\01329.io.deephaven.proto.backplane.grpc.Ag"
-    "gSpec.AggSpecTDigestH\000\022J\n\006unique\030\024 \001(\01328"
-    ".io.deephaven.proto.backplane.grpc.AggSp"
-    "ec.AggSpecUniqueH\000\022R\n\014weighted_avg\030\025 \001(\013"
-    "2:.io.deephaven.proto.backplane.grpc.Agg"
-    "Spec.AggSpecWeightedH\000\022R\n\014weighted_sum\030\026"
-    " \001(\0132:.io.deephaven.proto.backplane.grpc"
-    ".AggSpec.AggSpecWeightedH\000\022D\n\003var\030\027 \001(\0132"
-    "5.io.deephaven.proto.backplane.grpc.AggS"
-    "pec.AggSpecVarH\000\032\\\n\034AggSpecApproximatePe"
-    "rcentile\022\022\n\npercentile\030\001 \001(\001\022\030\n\013compress"
-    "ion\030\002 \001(\001H\000\210\001\001B\016\n\014_compression\032+\n\024AggSpe"
-    "cCountDistinct\022\023\n\013count_nulls\030\001 \001(\010\032(\n\017A"
-    "ggSpecDistinct\022\025\n\rinclude_nulls\030\001 \001(\010\0326\n"
-    "\016AggSpecFormula\022\017\n\007formula\030\001 \001(\t\022\023\n\013para"
-    "m_token\030\002 \001(\t\032/\n\rAggSpecMedian\022\036\n\026averag"
-    "e_evenly_divided\030\001 \001(\010\032G\n\021AggSpecPercent"
-    "ile\022\022\n\npercentile\030\001 \001(\001\022\036\n\026average_evenl"
-    "y_divided\030\002 \001(\010\032`\n\rAggSpecSorted\022O\n\007colu"
-    "mns\030\001 \003(\0132>.io.deephaven.proto.backplane"
-    ".grpc.AggSpec.AggSpecSortedColumn\032*\n\023Agg"
-    "SpecSortedColumn\022\023\n\013column_name\030\001 \001(\t\032:\n"
-    "\016AggSpecTDigest\022\030\n\013compression\030\001 \001(\001H\000\210\001"
-    "\001B\016\n\014_compression\032\210\001\n\rAggSpecUnique\022\025\n\ri"
-    "nclude_nulls\030\001 \001(\010\022`\n\023non_unique_sentine"
-    "l\030\002 \001(\0132C.io.deephaven.proto.backplane.g"
-    "rpc.AggSpec.AggSpecNonUniqueSentinel\032\265\002\n"
-    "\030AggSpecNonUniqueSentinel\022B\n\nnull_value\030"
-    "\001 \001(\0162,.io.deephaven.proto.backplane.grp"
-    "c.NullValueH\000\022\026\n\014string_value\030\002 \001(\tH\000\022\023\n"
-    "\tint_value\030\003 \001(\021H\000\022\030\n\nlong_value\030\004 \001(\022B\002"
-    "0\001H\000\022\025\n\013float_value\030\005 \001(\002H\000\022\026\n\014double_va"
-    "lue\030\006 \001(\001H\000\022\024\n\nbool_value\030\007 \001(\010H\000\022\024\n\nbyt"
-    "e_value\030\010 \001(\021H\000\022\025\n\013short_value\030\t \001(\021H\000\022\024"
-    "\n\nchar_value\030\n \001(\021H\000B\006\n\004type\032(\n\017AggSpecW"
-    "eighted\022\025\n\rweight_column\030\001 \001(\t\032\017\n\rAggSpe"
-    "cAbsSum\032\014\n\nAggSpecAvg\032\016\n\014AggSpecFirst\032\017\n"
-    "\rAggSpecFreeze\032\016\n\014AggSpecGroup\032\r\n\013AggSpe"
-    "cLast\032\014\n\nAggSpecMax\032\014\n\nAggSpecMin\032\014\n\nAgg"
-    "SpecStd\032\014\n\nAggSpecSum\032\014\n\nAggSpecVarB\006\n\004t"
-    "ype\"\334\002\n\020AggregateRequest\022<\n\tresult_id\030\001 "
-    "\001(\0132).io.deephaven.proto.backplane.grpc."
-    "Ticket\022D\n\tsource_id\030\002 \001(\01321.io.deephaven"
-    ".proto.backplane.grpc.TableReference\022L\n\021"
-    "initial_groups_id\030\003 \001(\01321.io.deephaven.p"
-    "roto.backplane.grpc.TableReference\022\026\n\016pr"
-    "eserve_empty\030\004 \001(\010\022D\n\014aggregations\030\005 \003(\013"
-    "2..io.deephaven.proto.backplane.grpc.Agg"
-    "regation\022\030\n\020group_by_columns\030\006 \003(\t\"\323\005\n\013A"
-    "ggregation\022T\n\007columns\030\001 \001(\0132A.io.deephav"
-    "en.proto.backplane.grpc.Aggregation.Aggr"
-    "egationColumnsH\000\022P\n\005count\030\002 \001(\0132\?.io.dee"
-    "phaven.proto.backplane.grpc.Aggregation."
-    "AggregationCountH\000\022Y\n\rfirst_row_key\030\003 \001("
-    "\0132@.io.deephaven.proto.backplane.grpc.Ag"
-    "gregation.AggregationRowKeyH\000\022X\n\014last_ro"
-    "w_key\030\004 \001(\0132@.io.deephaven.proto.backpla"
-    "ne.grpc.Aggregation.AggregationRowKeyH\000\022"
-    "X\n\tpartition\030\005 \001(\0132C.io.deephaven.proto."
-    "backplane.grpc.Aggregation.AggregationPa"
-    "rtitionH\000\032c\n\022AggregationColumns\0228\n\004spec\030"
-    "\001 \001(\0132*.io.deephaven.proto.backplane.grp"
-    "c.AggSpec\022\023\n\013match_pairs\030\002 \003(\t\032\'\n\020Aggreg"
-    "ationCount\022\023\n\013column_name\030\001 \001(\t\032(\n\021Aggre"
-    "gationRowKey\022\023\n\013column_name\030\001 \001(\t\032M\n\024Agg"
-    "regationPartition\022\023\n\013column_name\030\001 \001(\t\022 "
-    "\n\030include_group_by_columns\030\002 \001(\010B\006\n\004type"
-    "\"\341\001\n\016SortDescriptor\022\023\n\013column_name\030\001 \001(\t"
-    "\022\023\n\013is_absolute\030\002 \001(\010\022R\n\tdirection\030\003 \001(\016"
-    "2\?.io.deephaven.proto.backplane.grpc.Sor"
-    "tDescriptor.SortDirection\"Q\n\rSortDirecti"
-    "on\022\013\n\007UNKNOWN\020\000\022\027\n\nDESCENDING\020\377\377\377\377\377\377\377\377\377\001"
-    "\022\r\n\tASCENDING\020\001\022\013\n\007REVERSE\020\002\"\330\001\n\020SortTab"
-    "leRequest\022<\n\tresult_id\030\001 \001(\0132).io.deepha"
-    "ven.proto.backplane.grpc.Ticket\022D\n\tsourc"
-    "e_id\030\002 \001(\01321.io.deephaven.proto.backplan"
-    "e.grpc.TableReference\022@\n\005sorts\030\003 \003(\01321.i"
-    "o.deephaven.proto.backplane.grpc.SortDes"
-    "criptor\"\327\001\n\022FilterTableRequest\022<\n\tresult"
-    "_id\030\001 \001(\0132).io.deephaven.proto.backplane"
-    ".grpc.Ticket\022D\n\tsource_id\030\002 \001(\01321.io.dee"
-    "phaven.proto.backplane.grpc.TableReferen"
-    "ce\022=\n\007filters\030\003 \003(\0132,.io.deephaven.proto"
-    ".backplane.grpc.Condition\"\371\001\n\016SeekRowReq"
-    "uest\022<\n\tsource_id\030\001 \001(\0132).io.deephaven.p"
-    "roto.backplane.grpc.Ticket\022\030\n\014starting_r"
-    "ow\030\002 \001(\022B\0020\001\022\023\n\013column_name\030\003 \001(\t\022>\n\nsee"
-    "k_value\030\004 \001(\0132*.io.deephaven.proto.backp"
-    "lane.grpc.Literal\022\023\n\013insensitive\030\005 \001(\010\022\020"
-    "\n\010contains\030\006 \001(\010\022\023\n\013is_backward\030\007 \001(\010\")\n"
-    "\017SeekRowResponse\022\026\n\nresult_row\030\001 \001(\022B\0020\001"
-    "\" \n\tReference\022\023\n\013column_name\030\001 \001(\t\"\221\001\n\007L"
-    "iteral\022\026\n\014string_value\030\001 \001(\tH\000\022\026\n\014double"
-    "_value\030\002 \001(\001H\000\022\024\n\nbool_value\030\003 \001(\010H\000\022\030\n\n"
-    "long_value\030\004 \001(\022B\0020\001H\000\022\035\n\017nano_time_valu"
-    "e\030\005 \001(\022B\0020\001H\000B\007\n\005value\"\221\001\n\005Value\022A\n\trefe"
-    "rence\030\001 \001(\0132,.io.deephaven.proto.backpla"
-    "ne.grpc.ReferenceH\000\022=\n\007literal\030\002 \001(\0132*.i"
-    "o.deephaven.proto.backplane.grpc.Literal"
-    "H\000B\006\n\004data\"\274\005\n\tCondition\022>\n\003and\030\001 \001(\0132/."
-    "io.deephaven.proto.backplane.grpc.AndCon"
-    "ditionH\000\022<\n\002or\030\002 \001(\0132..io.deephaven.prot"
-    "o.backplane.grpc.OrConditionH\000\022>\n\003not\030\003 "
-    "\001(\0132/.io.deephaven.proto.backplane.grpc."
-    "NotConditionH\000\022F\n\007compare\030\004 \001(\01323.io.dee"
-    "phaven.proto.backplane.grpc.CompareCondi"
-    "tionH\000\022<\n\002in\030\005 \001(\0132..io.deephaven.proto."
-    "backplane.grpc.InConditionH\000\022D\n\006invoke\030\006"
-    " \001(\01322.io.deephaven.proto.backplane.grpc"
-    ".InvokeConditionH\000\022E\n\007is_null\030\007 \001(\01322.io"
-    ".deephaven.proto.backplane.grpc.IsNullCo"
-    "nditionH\000\022F\n\007matches\030\010 \001(\01323.io.deephave"
-    "n.proto.backplane.grpc.MatchesConditionH"
-    "\000\022H\n\010contains\030\t \001(\01324.io.deephaven.proto"
-    ".backplane.grpc.ContainsConditionH\000\022D\n\006s"
-    "earch\030\n \001(\01322.io.deephaven.proto.backpla"
-    "ne.grpc.SearchConditionH\000B\006\n\004data\"M\n\014And"
-    "Condition\022=\n\007filters\030\001 \003(\0132,.io.deephave"
-    "n.proto.backplane.grpc.Condition\"L\n\013OrCo"
-    "ndition\022=\n\007filters\030\001 \003(\0132,.io.deephaven."
-    "proto.backplane.grpc.Condition\"L\n\014NotCon"
-    "dition\022<\n\006filter\030\001 \001(\0132,.io.deephaven.pr"
-    "oto.backplane.grpc.Condition\"\254\003\n\020Compare"
-    "Condition\022W\n\toperation\030\001 \001(\0162D.io.deepha"
-    "ven.proto.backplane.grpc.CompareConditio"
-    "n.CompareOperation\022L\n\020case_sensitivity\030\002"
-    " \001(\01622.io.deephaven.proto.backplane.grpc"
-    ".CaseSensitivity\0225\n\003lhs\030\003 \001(\0132(.io.deeph"
-    "aven.proto.backplane.grpc.Value\0225\n\003rhs\030\004"
-    " \001(\0132(.io.deephaven.proto.backplane.grpc"
-    ".Value\"\202\001\n\020CompareOperation\022\r\n\tLESS_THAN"
-    "\020\000\022\026\n\022LESS_THAN_OR_EQUAL\020\001\022\020\n\014GREATER_TH"
-    "AN\020\002\022\031\n\025GREATER_THAN_OR_EQUAL\020\003\022\n\n\006EQUAL"
-    "S\020\004\022\016\n\nNOT_EQUALS\020\005\"\225\002\n\013InCondition\0228\n\006t"
-    "arget\030\001 \001(\0132(.io.deephaven.proto.backpla"
-    "ne.grpc.Value\022<\n\ncandidates\030\002 \003(\0132(.io.d"
-    "eephaven.proto.backplane.grpc.Value\022L\n\020c"
-    "ase_sensitivity\030\003 \001(\01622.io.deephaven.pro"
-    "to.backplane.grpc.CaseSensitivity\022@\n\nmat"
-    "ch_type\030\004 \001(\0162,.io.deephaven.proto.backp"
-    "lane.grpc.MatchType\"\230\001\n\017InvokeCondition\022"
-    "\016\n\006method\030\001 \001(\t\0228\n\006target\030\002 \001(\0132(.io.dee"
-    "phaven.proto.backplane.grpc.Value\022;\n\targ"
-    "uments\030\003 \003(\0132(.io.deephaven.proto.backpl"
-    "ane.grpc.Value\"R\n\017IsNullCondition\022\?\n\tref"
-    "erence\030\001 \001(\0132,.io.deephaven.proto.backpl"
-    "ane.grpc.Reference\"\362\001\n\020MatchesCondition\022"
-    "\?\n\treference\030\001 \001(\0132,.io.deephaven.proto."
-    "backplane.grpc.Reference\022\r\n\005regex\030\002 \001(\t\022"
-    "L\n\020case_sensitivity\030\003 \001(\01622.io.deephaven"
-    ".proto.backplane.grpc.CaseSensitivity\022@\n"
-    "\nmatch_type\030\004 \001(\0162,.io.deephaven.proto.b"
-    "ackplane.grpc.MatchType\"\373\001\n\021ContainsCond"
-    "ition\022\?\n\treference\030\001 \001(\0132,.io.deephaven."
-    "proto.backplane.grpc.Reference\022\025\n\rsearch"
-    "_string\030\002 \001(\t\022L\n\020case_sensitivity\030\003 \001(\0162"
-    "2.io.deephaven.proto.backplane.grpc.Case"
-    "Sensitivity\022@\n\nmatch_type\030\004 \001(\0162,.io.dee"
-    "phaven.proto.backplane.grpc.MatchType\"s\n"
-    "\017SearchCondition\022\025\n\rsearch_string\030\001 \001(\t\022"
-    "I\n\023optional_references\030\002 \003(\0132,.io.deepha"
-    "ven.proto.backplane.grpc.Reference\"\224\001\n\016F"
-    "lattenRequest\022<\n\tresult_id\030\001 \001(\0132).io.de"
-    "ephaven.proto.backplane.grpc.Ticket\022D\n\ts"
-    "ource_id\030\002 \001(\01321.io.deephaven.proto.back"
-    "plane.grpc.TableReference\"\226\001\n\020MetaTableR"
-    "equest\022<\n\tresult_id\030\001 \001(\0132).io.deephaven"
-    ".proto.backplane.grpc.Ticket\022D\n\tsource_i"
-    "d\030\002 \001(\01321.io.deephaven.proto.backplane.g"
-    "rpc.TableReference\"\264\003\n\031RunChartDownsampl"
-    "eRequest\022<\n\tresult_id\030\001 \001(\0132).io.deephav"
-    "en.proto.backplane.grpc.Ticket\022D\n\tsource"
-    "_id\030\002 \001(\01321.io.deephaven.proto.backplane"
-    ".grpc.TableReference\022\023\n\013pixel_count\030\003 \001("
-    "\005\022Z\n\nzoom_range\030\004 \001(\0132F.io.deephaven.pro"
-    "to.backplane.grpc.RunChartDownsampleRequ"
-    "est.ZoomRange\022\025\n\rx_column_name\030\005 \001(\t\022\026\n\016"
-    "y_column_names\030\006 \003(\t\032s\n\tZoomRange\022\037\n\016min"
-    "_date_nanos\030\001 \001(\003B\0020\001H\000\210\001\001\022\037\n\016max_date_n"
-    "anos\030\002 \001(\003B\0020\001H\001\210\001\001B\021\n\017_min_date_nanosB\021"
-    "\n\017_max_date_nanos\"\340\005\n\027CreateInputTableRe"
-    "quest\022<\n\tresult_id\030\001 \001(\0132).io.deephaven."
-    "proto.backplane.grpc.Ticket\022L\n\017source_ta"
-    "ble_id\030\002 \001(\01321.io.deephaven.proto.backpl"
-    "ane.grpc.TableReferenceH\000\022\020\n\006schema\030\003 \001("
-    "\014H\000\022W\n\004kind\030\004 \001(\0132I.io.deephaven.proto.b"
-    "ackplane.grpc.CreateInputTableRequest.In"
-    "putTableKind\032\277\003\n\016InputTableKind\022}\n\025in_me"
-    "mory_append_only\030\001 \001(\0132\\.io.deephaven.pr"
-    "oto.backplane.grpc.CreateInputTableReque"
-    "st.InputTableKind.InMemoryAppendOnlyH\000\022{"
-    "\n\024in_memory_key_backed\030\002 \001(\0132[.io.deepha"
-    "ven.proto.backplane.grpc.CreateInputTabl"
-    "eRequest.InputTableKind.InMemoryKeyBacke"
-    "dH\000\022`\n\005blink\030\003 \001(\0132O.io.deephaven.proto."
-    "backplane.grpc.CreateInputTableRequest.I"
-    "nputTableKind.BlinkH\000\032\024\n\022InMemoryAppendO"
-    "nly\032(\n\021InMemoryKeyBacked\022\023\n\013key_columns\030"
-    "\001 \003(\t\032\007\n\005BlinkB\006\n\004kindB\014\n\ndefinition\"\203\002\n"
-    "\016WhereInRequest\022<\n\tresult_id\030\001 \001(\0132).io."
-    "deephaven.proto.backplane.grpc.Ticket\022B\n"
-    "\007left_id\030\002 \001(\01321.io.deephaven.proto.back"
-    "plane.grpc.TableReference\022C\n\010right_id\030\003 "
-    "\001(\01321.io.deephaven.proto.backplane.grpc."
-    "TableReference\022\020\n\010inverted\030\004 \001(\010\022\030\n\020colu"
-    "mns_to_match\030\005 \003(\t\"\352\001\n\027ColumnStatisticsR"
-    "equest\022<\n\tresult_id\030\001 \001(\0132).io.deephaven"
-    ".proto.backplane.grpc.Ticket\022D\n\tsource_i"
-    "d\030\002 \001(\01321.io.deephaven.proto.backplane.g"
-    "rpc.TableReference\022\023\n\013column_name\030\003 \001(\t\022"
-    "\037\n\022unique_value_limit\030\004 \001(\005H\000\210\001\001B\025\n\023_uni"
-    "que_value_limit\"\231\032\n\021BatchTableRequest\022K\n"
-    "\003ops\030\001 \003(\0132>.io.deephaven.proto.backplan"
-    "e.grpc.BatchTableRequest.Operation\032\266\031\n\tO"
-    "peration\022K\n\013empty_table\030\001 \001(\01324.io.deeph"
-    "aven.proto.backplane.grpc.EmptyTableRequ"
-    "estH\000\022I\n\ntime_table\030\002 \001(\01323.io.deephaven"
-    ".proto.backplane.grpc.TimeTableRequestH\000"
-    "\022M\n\014drop_columns\030\003 \001(\01325.io.deephaven.pr"
-    "oto.backplane.grpc.DropColumnsRequestH\000\022"
-    "J\n\006update\030\004 \001(\01328.io.deephaven.proto.bac"
-    "kplane.grpc.SelectOrUpdateRequestH\000\022O\n\013l"
-    "azy_update\030\005 \001(\01328.io.deephaven.proto.ba"
-    "ckplane.grpc.SelectOrUpdateRequestH\000\022H\n\004"
-    "view\030\006 \001(\01328.io.deephaven.proto.backplan"
-    "e.grpc.SelectOrUpdateRequestH\000\022O\n\013update"
-    "_view\030\007 \001(\01328.io.deephaven.proto.backpla"
-    "ne.grpc.SelectOrUpdateRequestH\000\022J\n\006selec"
-    "t\030\010 \001(\01328.io.deephaven.proto.backplane.g"
-    "rpc.SelectOrUpdateRequestH\000\022S\n\017select_di"
-    "stinct\030\t \001(\01328.io.deephaven.proto.backpl"
-    "ane.grpc.SelectDistinctRequestH\000\022G\n\006filt"
-    "er\030\n \001(\01325.io.deephaven.proto.backplane."
-    "grpc.FilterTableRequestH\000\022`\n\023unstructure"
-    "d_filter\030\013 \001(\0132A.io.deephaven.proto.back"
-    "plane.grpc.UnstructuredFilterTableReques"
-    "tH\000\022C\n\004sort\030\014 \001(\01323.io.deephaven.proto.b"
-    "ackplane.grpc.SortTableRequestH\000\022D\n\004head"
-    "\030\r \001(\01324.io.deephaven.proto.backplane.gr"
-    "pc.HeadOrTailRequestH\000\022D\n\004tail\030\016 \001(\01324.i"
-    "o.deephaven.proto.backplane.grpc.HeadOrT"
-    "ailRequestH\000\022I\n\007head_by\030\017 \001(\01326.io.deeph"
-    "aven.proto.backplane.grpc.HeadOrTailByRe"
-    "questH\000\022I\n\007tail_by\030\020 \001(\01326.io.deephaven."
-    "proto.backplane.grpc.HeadOrTailByRequest"
-    "H\000\022D\n\007ungroup\030\021 \001(\01321.io.deephaven.proto"
-    ".backplane.grpc.UngroupRequestH\000\022F\n\005merg"
-    "e\030\022 \001(\01325.io.deephaven.proto.backplane.g"
-    "rpc.MergeTablesRequestH\000\022S\n\017combo_aggreg"
-    "ate\030\023 \001(\01328.io.deephaven.proto.backplane"
-    ".grpc.ComboAggregateRequestH\000\022D\n\007flatten"
-    "\030\025 \001(\01321.io.deephaven.proto.backplane.gr"
-    "pc.FlattenRequestH\000\022\\\n\024run_chart_downsam"
-    "ple\030\026 \001(\0132<.io.deephaven.proto.backplane"
-    ".grpc.RunChartDownsampleRequestH\000\022O\n\ncro"
-    "ss_join\030\027 \001(\01329.io.deephaven.proto.backp"
-    "lane.grpc.CrossJoinTablesRequestH\000\022S\n\014na"
-    "tural_join\030\030 \001(\0132;.io.deephaven.proto.ba"
-    "ckplane.grpc.NaturalJoinTablesRequestH\000\022"
-    "O\n\nexact_join\030\031 \001(\01329.io.deephaven.proto"
-    ".backplane.grpc.ExactJoinTablesRequestH\000"
-    "\022M\n\tleft_join\030\032 \001(\01328.io.deephaven.proto"
-    ".backplane.grpc.LeftJoinTablesRequestH\000\022"
-    "R\n\nas_of_join\030\033 \001(\01328.io.deephaven.proto"
-    ".backplane.grpc.AsOfJoinTablesRequestB\002\030"
-    "\001H\000\022K\n\013fetch_table\030\034 \001(\01324.io.deephaven."
-    "proto.backplane.grpc.FetchTableRequestH\000"
-    "\022^\n\025apply_preview_columns\030\036 \001(\0132=.io.dee"
-    "phaven.proto.backplane.grpc.ApplyPreview"
-    "ColumnsRequestH\000\022X\n\022create_input_table\030\037"
-    " \001(\0132:.io.deephaven.proto.backplane.grpc"
-    ".CreateInputTableRequestH\000\022G\n\tupdate_by\030"
-    "  \001(\01322.io.deephaven.proto.backplane.grp"
-    "c.UpdateByRequestH\000\022E\n\010where_in\030! \001(\01321."
-    "io.deephaven.proto.backplane.grpc.WhereI"
-    "nRequestH\000\022O\n\raggregate_all\030\" \001(\01326.io.d"
-    "eephaven.proto.backplane.grpc.AggregateA"
-    "llRequestH\000\022H\n\taggregate\030# \001(\01323.io.deep"
-    "haven.proto.backplane.grpc.AggregateRequ"
-    "estH\000\022K\n\010snapshot\030$ \001(\01327.io.deephaven.p"
-    "roto.backplane.grpc.SnapshotTableRequest"
-    "H\000\022T\n\rsnapshot_when\030% \001(\0132;.io.deephaven"
-    ".proto.backplane.grpc.SnapshotWhenTableR"
-    "equestH\000\022I\n\nmeta_table\030& \001(\01323.io.deepha"
-    "ven.proto.backplane.grpc.MetaTableReques"
-    "tH\000\022O\n\nrange_join\030\' \001(\01329.io.deephaven.p"
-    "roto.backplane.grpc.RangeJoinTablesReque"
-    "stH\000\022C\n\002aj\030( \001(\01325.io.deephaven.proto.ba"
-    "ckplane.grpc.AjRajTablesRequestH\000\022D\n\003raj"
-    "\030) \001(\01325.io.deephaven.proto.backplane.gr"
-    "pc.AjRajTablesRequestH\000\022W\n\021column_statis"
-    "tics\030* \001(\0132:.io.deephaven.proto.backplan"
-    "e.grpc.ColumnStatisticsRequestH\000\022O\n\nmult"
-    "i_join\030+ \001(\01329.io.deephaven.proto.backpl"
-    "ane.grpc.MultiJoinTablesRequestH\000B\004\n\002opJ"
-    "\004\010\024\020\025J\004\010\035\020\036*b\n\017BadDataBehavior\022#\n\037BAD_DA"
-    "TA_BEHAVIOR_NOT_SPECIFIED\020\000\022\t\n\005THROW\020\001\022\t"
-    "\n\005RESET\020\002\022\010\n\004SKIP\020\003\022\n\n\006POISON\020\004*t\n\024Updat"
-    "eByNullBehavior\022\037\n\033NULL_BEHAVIOR_NOT_SPE"
-    "CIFIED\020\000\022\022\n\016NULL_DOMINATES\020\001\022\023\n\017VALUE_DO"
-    "MINATES\020\002\022\022\n\016ZERO_DOMINATES\020\003*\033\n\tNullVal"
-    "ue\022\016\n\nNULL_VALUE\020\000*2\n\017CaseSensitivity\022\016\n"
-    "\nMATCH_CASE\020\000\022\017\n\013IGNORE_CASE\020\001*&\n\tMatchT"
-    "ype\022\013\n\007REGULAR\020\000\022\014\n\010INVERTED\020\0012\2731\n\014Table"
-    "Service\022\221\001\n GetExportedTableCreationResp"
-    "onse\022).io.deephaven.proto.backplane.grpc"
-    ".Ticket\032@.io.deephaven.proto.backplane.g"
-    "rpc.ExportedTableCreationResponse\"\000\022\206\001\n\n"
-    "FetchTable\0224.io.deephaven.proto.backplan"
-    "e.grpc.FetchTableRequest\032@.io.deephaven."
-    "proto.backplane.grpc.ExportedTableCreati"
-    "onResponse\"\000\022\230\001\n\023ApplyPreviewColumns\022=.i"
-    "o.deephaven.proto.backplane.grpc.ApplyPr"
-    "eviewColumnsRequest\032@.io.deephaven.proto"
-    ".backplane.grpc.ExportedTableCreationRes"
-    "ponse\"\000\022\206\001\n\nEmptyTable\0224.io.deephaven.pr"
-    "oto.backplane.grpc.EmptyTableRequest\032@.i"
-    "o.deephaven.proto.backplane.grpc.Exporte"
-    "dTableCreationResponse\"\000\022\204\001\n\tTimeTable\0223"
-    ".io.deephaven.proto.backplane.grpc.TimeT"
-    "ableRequest\032@.io.deephaven.proto.backpla"
-    "ne.grpc.ExportedTableCreationResponse\"\000\022"
-    "\210\001\n\013DropColumns\0225.io.deephaven.proto.bac"
-    "kplane.grpc.DropColumnsRequest\032@.io.deep"
-    "haven.proto.backplane.grpc.ExportedTable"
-    "CreationResponse\"\000\022\206\001\n\006Update\0228.io.deeph"
-    "aven.proto.backplane.grpc.SelectOrUpdate"
-    "Request\032@.io.deephaven.proto.backplane.g"
-    "rpc.ExportedTableCreationResponse\"\000\022\212\001\n\n"
-    "LazyUpdate\0228.io.deephaven.proto.backplan"
-    "e.grpc.SelectOrUpdateRequest\032@.io.deepha"
-    "ven.proto.backplane.grpc.ExportedTableCr"
-    "eationResponse\"\000\022\204\001\n\004View\0228.io.deephaven"
-    ".proto.backplane.grpc.SelectOrUpdateRequ"
-    "est\032@.io.deephaven.proto.backplane.grpc."
-    "ExportedTableCreationResponse\"\000\022\212\001\n\nUpda"
-    "teView\0228.io.deephaven.proto.backplane.gr"
-    "pc.SelectOrUpdateRequest\032@.io.deephaven."
-    "proto.backplane.grpc.ExportedTableCreati"
-    "onResponse\"\000\022\206\001\n\006Select\0228.io.deephaven.p"
-    "roto.backplane.grpc.SelectOrUpdateReques"
-    "t\032@.io.deephaven.proto.backplane.grpc.Ex"
-    "portedTableCreationResponse\"\000\022\202\001\n\010Update"
-    "By\0222.io.deephaven.proto.backplane.grpc.U"
-    "pdateByRequest\032@.io.deephaven.proto.back"
-    "plane.grpc.ExportedTableCreationResponse"
-    "\"\000\022\216\001\n\016SelectDistinct\0228.io.deephaven.pro"
-    "to.backplane.grpc.SelectDistinctRequest\032"
-    "@.io.deephaven.proto.backplane.grpc.Expo"
-    "rtedTableCreationResponse\"\000\022\203\001\n\006Filter\0225"
-    ".io.deephaven.proto.backplane.grpc.Filte"
-    "rTableRequest\032@.io.deephaven.proto.backp"
-    "lane.grpc.ExportedTableCreationResponse\""
-    "\000\022\233\001\n\022UnstructuredFilter\022A.io.deephaven."
-    "proto.backplane.grpc.UnstructuredFilterT"
-    "ableRequest\032@.io.deephaven.proto.backpla"
-    "ne.grpc.ExportedTableCreationResponse\"\000\022"
-    "\177\n\004Sort\0223.io.deephaven.proto.backplane.g"
-    "rpc.SortTableRequest\032@.io.deephaven.prot"
-    "o.backplane.grpc.ExportedTableCreationRe"
-    "sponse\"\000\022\200\001\n\004Head\0224.io.deephaven.proto.b"
-    "ackplane.grpc.HeadOrTailRequest\032@.io.dee"
-    "phaven.proto.backplane.grpc.ExportedTabl"
-    "eCreationResponse\"\000\022\200\001\n\004Tail\0224.io.deepha"
-    "ven.proto.backplane.grpc.HeadOrTailReque"
-    "st\032@.io.deephaven.proto.backplane.grpc.E"
-    "xportedTableCreationResponse\"\000\022\204\001\n\006HeadB"
-    "y\0226.io.deephaven.proto.backplane.grpc.He"
-    "adOrTailByRequest\032@.io.deephaven.proto.b"
-    "ackplane.grpc.ExportedTableCreationRespo"
-    "nse\"\000\022\204\001\n\006TailBy\0226.io.deephaven.proto.ba"
-    "ckplane.grpc.HeadOrTailByRequest\032@.io.de"
-    "ephaven.proto.backplane.grpc.ExportedTab"
-    "leCreationResponse\"\000\022\200\001\n\007Ungroup\0221.io.de"
-    "ephaven.proto.backplane.grpc.UngroupRequ"
-    "est\032@.io.deephaven.proto.backplane.grpc."
-    "ExportedTableCreationResponse\"\000\022\210\001\n\013Merg"
-    "eTables\0225.io.deephaven.proto.backplane.g"
-    "rpc.MergeTablesRequest\032@.io.deephaven.pr"
-    "oto.backplane.grpc.ExportedTableCreation"
-    "Response\"\000\022\220\001\n\017CrossJoinTables\0229.io.deep"
-    "haven.proto.backplane.grpc.CrossJoinTabl"
-    "esRequest\032@.io.deephaven.proto.backplane"
-    ".grpc.ExportedTableCreationResponse\"\000\022\224\001"
-    "\n\021NaturalJoinTables\022;.io.deephaven.proto"
-    ".backplane.grpc.NaturalJoinTablesRequest"
-    "\032@.io.deephaven.proto.backplane.grpc.Exp"
-    "ortedTableCreationResponse\"\000\022\220\001\n\017ExactJo"
-    "inTables\0229.io.deephaven.proto.backplane."
-    "grpc.ExactJoinTablesRequest\032@.io.deephav"
-    "en.proto.backplane.grpc.ExportedTableCre"
-    "ationResponse\"\000\022\216\001\n\016LeftJoinTables\0228.io."
-    "deephaven.proto.backplane.grpc.LeftJoinT"
-    "ablesRequest\032@.io.deephaven.proto.backpl"
-    "ane.grpc.ExportedTableCreationResponse\"\000"
-    "\022\221\001\n\016AsOfJoinTables\0228.io.deephaven.proto"
-    ".backplane.grpc.AsOfJoinTablesRequest\032@."
-    "io.deephaven.proto.backplane.grpc.Export"
-    "edTableCreationResponse\"\003\210\002\001\022\205\001\n\010AjTable"
-    "s\0225.io.deephaven.proto.backplane.grpc.Aj"
-    "RajTablesRequest\032@.io.deephaven.proto.ba"
-    "ckplane.grpc.ExportedTableCreationRespon"
-    "se\"\000\022\206\001\n\tRajTables\0225.io.deephaven.proto."
-    "backplane.grpc.AjRajTablesRequest\032@.io.d"
-    "eephaven.proto.backplane.grpc.ExportedTa"
-    "bleCreationResponse\"\000\022\220\001\n\017MultiJoinTable"
-    "s\0229.io.deephaven.proto.backplane.grpc.Mu"
-    "ltiJoinTablesRequest\032@.io.deephaven.prot"
-    "o.backplane.grpc.ExportedTableCreationRe"
-    "sponse\"\000\022\220\001\n\017RangeJoinTables\0229.io.deepha"
-    "ven.proto.backplane.grpc.RangeJoinTables"
-    "Request\032@.io.deephaven.proto.backplane.g"
-    "rpc.ExportedTableCreationResponse\"\000\022\221\001\n\016"
-    "ComboAggregate\0228.io.deephaven.proto.back"
-    "plane.grpc.ComboAggregateRequest\032@.io.de"
-    "ephaven.proto.backplane.grpc.ExportedTab"
-    "leCreationResponse\"\003\210\002\001\022\212\001\n\014AggregateAll"
-    "\0226.io.deephaven.proto.backplane.grpc.Agg"
-    "regateAllRequest\032@.io.deephaven.proto.ba"
-    "ckplane.grpc.ExportedTableCreationRespon"
-    "se\"\000\022\204\001\n\tAggregate\0223.io.deephaven.proto."
-    "backplane.grpc.AggregateRequest\032@.io.dee"
-    "phaven.proto.backplane.grpc.ExportedTabl"
-    "eCreationResponse\"\000\022\207\001\n\010Snapshot\0227.io.de"
-    "ephaven.proto.backplane.grpc.SnapshotTab"
-    "leRequest\032@.io.deephaven.proto.backplane"
-    ".grpc.ExportedTableCreationResponse\"\000\022\217\001"
-    "\n\014SnapshotWhen\022;.io.deephaven.proto.back"
-    "plane.grpc.SnapshotWhenTableRequest\032@.io"
-    ".deephaven.proto.backplane.grpc.Exported"
-    "TableCreationResponse\"\000\022\200\001\n\007Flatten\0221.io"
-    ".deephaven.proto.backplane.grpc.FlattenR"
-    "equest\032@.io.deephaven.proto.backplane.gr"
-    "pc.ExportedTableCreationResponse\"\000\022\226\001\n\022R"
-    "unChartDownsample\022<.io.deephaven.proto.b"
-    "ackplane.grpc.RunChartDownsampleRequest\032"
-    "@.io.deephaven.proto.backplane.grpc.Expo"
-    "rtedTableCreationResponse\"\000\022\222\001\n\020CreateIn"
-    "putTable\022:.io.deephaven.proto.backplane."
-    "grpc.CreateInputTableRequest\032@.io.deepha"
-    "ven.proto.backplane.grpc.ExportedTableCr"
-    "eationResponse\"\000\022\200\001\n\007WhereIn\0221.io.deepha"
-    "ven.proto.backplane.grpc.WhereInRequest\032"
-    "@.io.deephaven.proto.backplane.grpc.Expo"
-    "rtedTableCreationResponse\"\000\022\203\001\n\005Batch\0224."
-    "io.deephaven.proto.backplane.grpc.BatchT"
-    "ableRequest\032@.io.deephaven.proto.backpla"
-    "ne.grpc.ExportedTableCreationResponse\"\0000"
-    "\001\022\231\001\n\024ExportedTableUpdates\022>.io.deephave"
-    "n.proto.backplane.grpc.ExportedTableUpda"
-    "tesRequest\032=.io.deephaven.proto.backplan"
-    "e.grpc.ExportedTableUpdateMessage\"\0000\001\022r\n"
-    "\007SeekRow\0221.io.deephaven.proto.backplane."
-    "grpc.SeekRowRequest\0322.io.deephaven.proto"
-    ".backplane.grpc.SeekRowResponse\"\000\022\204\001\n\tMe"
-    "taTable\0223.io.deephaven.proto.backplane.g"
-    "rpc.MetaTableRequest\032@.io.deephaven.prot"
-    "o.backplane.grpc.ExportedTableCreationRe"
-    "sponse\"\000\022\231\001\n\027ComputeColumnStatistics\022:.i"
-    "o.deephaven.proto.backplane.grpc.ColumnS"
-    "tatisticsRequest\032@.io.deephaven.proto.ba"
-    "ckplane.grpc.ExportedTableCreationRespon"
-    "se\"\000BAH\001P\001Z;github.com/deephaven/deephav"
-    "en-core/go/internal/proto/tableb\006proto3"
-};
-static const ::_pbi::DescriptorTable* const descriptor_table_deephaven_2fproto_2ftable_2eproto_deps[1] =
-    {
-        &::descriptor_table_deephaven_2fproto_2fticket_2eproto,
-};
-static ::absl::once_flag descriptor_table_deephaven_2fproto_2ftable_2eproto_once;
-const ::_pbi::DescriptorTable descriptor_table_deephaven_2fproto_2ftable_2eproto = {
-    false,
-    false,
-    35399,
-    descriptor_table_protodef_deephaven_2fproto_2ftable_2eproto,
-    "deephaven/proto/table.proto",
-    &descriptor_table_deephaven_2fproto_2ftable_2eproto_once,
-    descriptor_table_deephaven_2fproto_2ftable_2eproto_deps,
-    1,
-    124,
-    schemas,
-    file_default_instances,
-    TableStruct_deephaven_2fproto_2ftable_2eproto::offsets,
-    file_level_metadata_deephaven_2fproto_2ftable_2eproto,
-    file_level_enum_descriptors_deephaven_2fproto_2ftable_2eproto,
-    file_level_service_descriptors_deephaven_2fproto_2ftable_2eproto,
-};
-
-// This function exists to be marked as weak.
-// It can significantly speed up compilation by breaking up LLVM's SCC
-// in the .pb.cc translation units. Large translation units see a
-// reduction of more than 35% of walltime for optimized builds. Without
-// the weak attribute all the messages in the file, including all the
-// vtables and everything they use become part of the same SCC through
-// a cycle like:
-// GetMetadata -> descriptor table -> default instances ->
-//   vtables -> GetMetadata
-// By adding a weak function here we break the connection from the
-// individual vtables back into the descriptor table.
-PROTOBUF_ATTRIBUTE_WEAK const ::_pbi::DescriptorTable* descriptor_table_deephaven_2fproto_2ftable_2eproto_getter() {
-  return &descriptor_table_deephaven_2fproto_2ftable_2eproto;
-}
-// Force running AddDescriptors() at dynamic initialization time.
-PROTOBUF_ATTRIBUTE_INIT_PRIORITY2
-static ::_pbi::AddDescriptorsRunner dynamic_init_dummy_deephaven_2fproto_2ftable_2eproto(&descriptor_table_deephaven_2fproto_2ftable_2eproto);
-namespace io {
-namespace deephaven {
-namespace proto {
-namespace backplane {
-namespace grpc {
-const ::google::protobuf::EnumDescriptor* MathContext_RoundingMode_descriptor() {
-  ::google::protobuf::internal::AssignDescriptors(&descriptor_table_deephaven_2fproto_2ftable_2eproto);
-  return file_level_enum_descriptors_deephaven_2fproto_2ftable_2eproto[0];
-}
-PROTOBUF_CONSTINIT const uint32_t MathContext_RoundingMode_internal_data_[] = {
-    589824u, 0u, };
-bool MathContext_RoundingMode_IsValid(int value) {
-  return 0 <= value && value <= 8;
-}
-#if (__cplusplus < 201703) && \
-  (!defined(_MSC_VER) || (_MSC_VER >= 1900 && _MSC_VER < 1912))
-
-constexpr MathContext_RoundingMode MathContext::ROUNDING_MODE_NOT_SPECIFIED;
-constexpr MathContext_RoundingMode MathContext::UP;
-constexpr MathContext_RoundingMode MathContext::DOWN;
-constexpr MathContext_RoundingMode MathContext::CEILING;
-constexpr MathContext_RoundingMode MathContext::FLOOR;
-constexpr MathContext_RoundingMode MathContext::HALF_UP;
-constexpr MathContext_RoundingMode MathContext::HALF_DOWN;
-constexpr MathContext_RoundingMode MathContext::HALF_EVEN;
-constexpr MathContext_RoundingMode MathContext::UNNECESSARY;
-constexpr MathContext_RoundingMode MathContext::RoundingMode_MIN;
-constexpr MathContext_RoundingMode MathContext::RoundingMode_MAX;
-constexpr int MathContext::RoundingMode_ARRAYSIZE;
-
-#endif  // (__cplusplus < 201703) &&
-        // (!defined(_MSC_VER) || (_MSC_VER >= 1900 && _MSC_VER < 1912))
-const ::google::protobuf::EnumDescriptor* AsOfJoinTablesRequest_MatchRule_descriptor() {
-  ::google::protobuf::internal::AssignDescriptors(&descriptor_table_deephaven_2fproto_2ftable_2eproto);
-  return file_level_enum_descriptors_deephaven_2fproto_2ftable_2eproto[1];
-}
-PROTOBUF_CONSTINIT const uint32_t AsOfJoinTablesRequest_MatchRule_internal_data_[] = {
-    262144u, 0u, };
-bool AsOfJoinTablesRequest_MatchRule_IsValid(int value) {
-  return 0 <= value && value <= 3;
-}
-#if (__cplusplus < 201703) && \
-  (!defined(_MSC_VER) || (_MSC_VER >= 1900 && _MSC_VER < 1912))
-
-constexpr AsOfJoinTablesRequest_MatchRule AsOfJoinTablesRequest::LESS_THAN_EQUAL;
-constexpr AsOfJoinTablesRequest_MatchRule AsOfJoinTablesRequest::LESS_THAN;
-constexpr AsOfJoinTablesRequest_MatchRule AsOfJoinTablesRequest::GREATER_THAN_EQUAL;
-constexpr AsOfJoinTablesRequest_MatchRule AsOfJoinTablesRequest::GREATER_THAN;
-constexpr AsOfJoinTablesRequest_MatchRule AsOfJoinTablesRequest::MatchRule_MIN;
-constexpr AsOfJoinTablesRequest_MatchRule AsOfJoinTablesRequest::MatchRule_MAX;
-constexpr int AsOfJoinTablesRequest::MatchRule_ARRAYSIZE;
-
-#endif  // (__cplusplus < 201703) &&
-        // (!defined(_MSC_VER) || (_MSC_VER >= 1900 && _MSC_VER < 1912))
-const ::google::protobuf::EnumDescriptor* RangeJoinTablesRequest_RangeStartRule_descriptor() {
-  ::google::protobuf::internal::AssignDescriptors(&descriptor_table_deephaven_2fproto_2ftable_2eproto);
-  return file_level_enum_descriptors_deephaven_2fproto_2ftable_2eproto[2];
-}
-PROTOBUF_CONSTINIT const uint32_t RangeJoinTablesRequest_RangeStartRule_internal_data_[] = {
-    262144u, 0u, };
-bool RangeJoinTablesRequest_RangeStartRule_IsValid(int value) {
-  return 0 <= value && value <= 3;
-}
-#if (__cplusplus < 201703) && \
-  (!defined(_MSC_VER) || (_MSC_VER >= 1900 && _MSC_VER < 1912))
-
-constexpr RangeJoinTablesRequest_RangeStartRule RangeJoinTablesRequest::START_UNSPECIFIED;
-constexpr RangeJoinTablesRequest_RangeStartRule RangeJoinTablesRequest::LESS_THAN;
-constexpr RangeJoinTablesRequest_RangeStartRule RangeJoinTablesRequest::LESS_THAN_OR_EQUAL;
-constexpr RangeJoinTablesRequest_RangeStartRule RangeJoinTablesRequest::LESS_THAN_OR_EQUAL_ALLOW_PRECEDING;
-constexpr RangeJoinTablesRequest_RangeStartRule RangeJoinTablesRequest::RangeStartRule_MIN;
-constexpr RangeJoinTablesRequest_RangeStartRule RangeJoinTablesRequest::RangeStartRule_MAX;
-constexpr int RangeJoinTablesRequest::RangeStartRule_ARRAYSIZE;
-
-#endif  // (__cplusplus < 201703) &&
-        // (!defined(_MSC_VER) || (_MSC_VER >= 1900 && _MSC_VER < 1912))
-const ::google::protobuf::EnumDescriptor* RangeJoinTablesRequest_RangeEndRule_descriptor() {
-  ::google::protobuf::internal::AssignDescriptors(&descriptor_table_deephaven_2fproto_2ftable_2eproto);
-  return file_level_enum_descriptors_deephaven_2fproto_2ftable_2eproto[3];
-}
-PROTOBUF_CONSTINIT const uint32_t RangeJoinTablesRequest_RangeEndRule_internal_data_[] = {
-    262144u, 0u, };
-bool RangeJoinTablesRequest_RangeEndRule_IsValid(int value) {
-  return 0 <= value && value <= 3;
-}
-#if (__cplusplus < 201703) && \
-  (!defined(_MSC_VER) || (_MSC_VER >= 1900 && _MSC_VER < 1912))
-
-constexpr RangeJoinTablesRequest_RangeEndRule RangeJoinTablesRequest::END_UNSPECIFIED;
-constexpr RangeJoinTablesRequest_RangeEndRule RangeJoinTablesRequest::GREATER_THAN;
-constexpr RangeJoinTablesRequest_RangeEndRule RangeJoinTablesRequest::GREATER_THAN_OR_EQUAL;
-constexpr RangeJoinTablesRequest_RangeEndRule RangeJoinTablesRequest::GREATER_THAN_OR_EQUAL_ALLOW_FOLLOWING;
-constexpr RangeJoinTablesRequest_RangeEndRule RangeJoinTablesRequest::RangeEndRule_MIN;
-constexpr RangeJoinTablesRequest_RangeEndRule RangeJoinTablesRequest::RangeEndRule_MAX;
-constexpr int RangeJoinTablesRequest::RangeEndRule_ARRAYSIZE;
-
-#endif  // (__cplusplus < 201703) &&
-        // (!defined(_MSC_VER) || (_MSC_VER >= 1900 && _MSC_VER < 1912))
-const ::google::protobuf::EnumDescriptor* ComboAggregateRequest_AggType_descriptor() {
-  ::google::protobuf::internal::AssignDescriptors(&descriptor_table_deephaven_2fproto_2ftable_2eproto);
-  return file_level_enum_descriptors_deephaven_2fproto_2ftable_2eproto[4];
-}
-PROTOBUF_CONSTINIT const uint32_t ComboAggregateRequest_AggType_internal_data_[] = {
-    917504u, 0u, };
-bool ComboAggregateRequest_AggType_IsValid(int value) {
-  return 0 <= value && value <= 13;
-}
-#if (__cplusplus < 201703) && \
-  (!defined(_MSC_VER) || (_MSC_VER >= 1900 && _MSC_VER < 1912))
-
-constexpr ComboAggregateRequest_AggType ComboAggregateRequest::SUM;
-constexpr ComboAggregateRequest_AggType ComboAggregateRequest::ABS_SUM;
-constexpr ComboAggregateRequest_AggType ComboAggregateRequest::GROUP;
-constexpr ComboAggregateRequest_AggType ComboAggregateRequest::AVG;
-constexpr ComboAggregateRequest_AggType ComboAggregateRequest::COUNT;
-constexpr ComboAggregateRequest_AggType ComboAggregateRequest::FIRST;
-constexpr ComboAggregateRequest_AggType ComboAggregateRequest::LAST;
-constexpr ComboAggregateRequest_AggType ComboAggregateRequest::MIN;
-constexpr ComboAggregateRequest_AggType ComboAggregateRequest::MAX;
-constexpr ComboAggregateRequest_AggType ComboAggregateRequest::MEDIAN;
-constexpr ComboAggregateRequest_AggType ComboAggregateRequest::PERCENTILE;
-constexpr ComboAggregateRequest_AggType ComboAggregateRequest::STD;
-constexpr ComboAggregateRequest_AggType ComboAggregateRequest::VAR;
-constexpr ComboAggregateRequest_AggType ComboAggregateRequest::WEIGHTED_AVG;
-constexpr ComboAggregateRequest_AggType ComboAggregateRequest::AggType_MIN;
-constexpr ComboAggregateRequest_AggType ComboAggregateRequest::AggType_MAX;
-constexpr int ComboAggregateRequest::AggType_ARRAYSIZE;
-
-#endif  // (__cplusplus < 201703) &&
-        // (!defined(_MSC_VER) || (_MSC_VER >= 1900 && _MSC_VER < 1912))
-const ::google::protobuf::EnumDescriptor* SortDescriptor_SortDirection_descriptor() {
-  ::google::protobuf::internal::AssignDescriptors(&descriptor_table_deephaven_2fproto_2ftable_2eproto);
-  return file_level_enum_descriptors_deephaven_2fproto_2ftable_2eproto[5];
-}
-PROTOBUF_CONSTINIT const uint32_t SortDescriptor_SortDirection_internal_data_[] = {
-    327679u, 0u, };
-bool SortDescriptor_SortDirection_IsValid(int value) {
-  return -1 <= value && value <= 2;
-}
-#if (__cplusplus < 201703) && \
-  (!defined(_MSC_VER) || (_MSC_VER >= 1900 && _MSC_VER < 1912))
-
-constexpr SortDescriptor_SortDirection SortDescriptor::UNKNOWN;
-constexpr SortDescriptor_SortDirection SortDescriptor::DESCENDING;
-constexpr SortDescriptor_SortDirection SortDescriptor::ASCENDING;
-constexpr SortDescriptor_SortDirection SortDescriptor::REVERSE;
-constexpr SortDescriptor_SortDirection SortDescriptor::SortDirection_MIN;
-constexpr SortDescriptor_SortDirection SortDescriptor::SortDirection_MAX;
-constexpr int SortDescriptor::SortDirection_ARRAYSIZE;
-
-#endif  // (__cplusplus < 201703) &&
-        // (!defined(_MSC_VER) || (_MSC_VER >= 1900 && _MSC_VER < 1912))
-const ::google::protobuf::EnumDescriptor* CompareCondition_CompareOperation_descriptor() {
-  ::google::protobuf::internal::AssignDescriptors(&descriptor_table_deephaven_2fproto_2ftable_2eproto);
-  return file_level_enum_descriptors_deephaven_2fproto_2ftable_2eproto[6];
-}
-PROTOBUF_CONSTINIT const uint32_t CompareCondition_CompareOperation_internal_data_[] = {
-    393216u, 0u, };
-bool CompareCondition_CompareOperation_IsValid(int value) {
-  return 0 <= value && value <= 5;
-}
-#if (__cplusplus < 201703) && \
-  (!defined(_MSC_VER) || (_MSC_VER >= 1900 && _MSC_VER < 1912))
-
-constexpr CompareCondition_CompareOperation CompareCondition::LESS_THAN;
-constexpr CompareCondition_CompareOperation CompareCondition::LESS_THAN_OR_EQUAL;
-constexpr CompareCondition_CompareOperation CompareCondition::GREATER_THAN;
-constexpr CompareCondition_CompareOperation CompareCondition::GREATER_THAN_OR_EQUAL;
-constexpr CompareCondition_CompareOperation CompareCondition::EQUALS;
-constexpr CompareCondition_CompareOperation CompareCondition::NOT_EQUALS;
-constexpr CompareCondition_CompareOperation CompareCondition::CompareOperation_MIN;
-constexpr CompareCondition_CompareOperation CompareCondition::CompareOperation_MAX;
-constexpr int CompareCondition::CompareOperation_ARRAYSIZE;
-
-#endif  // (__cplusplus < 201703) &&
-        // (!defined(_MSC_VER) || (_MSC_VER >= 1900 && _MSC_VER < 1912))
-const ::google::protobuf::EnumDescriptor* BadDataBehavior_descriptor() {
-  ::google::protobuf::internal::AssignDescriptors(&descriptor_table_deephaven_2fproto_2ftable_2eproto);
-  return file_level_enum_descriptors_deephaven_2fproto_2ftable_2eproto[7];
-}
-PROTOBUF_CONSTINIT const uint32_t BadDataBehavior_internal_data_[] = {
-    327680u, 0u, };
-bool BadDataBehavior_IsValid(int value) {
-  return 0 <= value && value <= 4;
-}
-const ::google::protobuf::EnumDescriptor* UpdateByNullBehavior_descriptor() {
-  ::google::protobuf::internal::AssignDescriptors(&descriptor_table_deephaven_2fproto_2ftable_2eproto);
-  return file_level_enum_descriptors_deephaven_2fproto_2ftable_2eproto[8];
-}
-PROTOBUF_CONSTINIT const uint32_t UpdateByNullBehavior_internal_data_[] = {
-    262144u, 0u, };
-bool UpdateByNullBehavior_IsValid(int value) {
-  return 0 <= value && value <= 3;
-}
-const ::google::protobuf::EnumDescriptor* NullValue_descriptor() {
-  ::google::protobuf::internal::AssignDescriptors(&descriptor_table_deephaven_2fproto_2ftable_2eproto);
-  return file_level_enum_descriptors_deephaven_2fproto_2ftable_2eproto[9];
-}
-PROTOBUF_CONSTINIT const uint32_t NullValue_internal_data_[] = {
-    65536u, 0u, };
-bool NullValue_IsValid(int value) {
-  return 0 <= value && value <= 0;
-}
-const ::google::protobuf::EnumDescriptor* CaseSensitivity_descriptor() {
-  ::google::protobuf::internal::AssignDescriptors(&descriptor_table_deephaven_2fproto_2ftable_2eproto);
-  return file_level_enum_descriptors_deephaven_2fproto_2ftable_2eproto[10];
-}
-PROTOBUF_CONSTINIT const uint32_t CaseSensitivity_internal_data_[] = {
-    131072u, 0u, };
-bool CaseSensitivity_IsValid(int value) {
-  return 0 <= value && value <= 1;
-}
-const ::google::protobuf::EnumDescriptor* MatchType_descriptor() {
-  ::google::protobuf::internal::AssignDescriptors(&descriptor_table_deephaven_2fproto_2ftable_2eproto);
-  return file_level_enum_descriptors_deephaven_2fproto_2ftable_2eproto[11];
-}
-PROTOBUF_CONSTINIT const uint32_t MatchType_internal_data_[] = {
-    131072u, 0u, };
-bool MatchType_IsValid(int value) {
-  return 0 <= value && value <= 1;
-}
-// ===================================================================
-
-class TableReference::_Internal {
- public:
-  static constexpr ::int32_t kOneofCaseOffset =
-    PROTOBUF_FIELD_OFFSET(::io::deephaven::proto::backplane::grpc::TableReference, _impl_._oneof_case_);
-  static const ::io::deephaven::proto::backplane::grpc::Ticket& ticket(const TableReference* msg);
-};
-
-const ::io::deephaven::proto::backplane::grpc::Ticket& TableReference::_Internal::ticket(const TableReference* msg) {
-  return *msg->_impl_.ref_.ticket_;
-}
-void TableReference::set_allocated_ticket(::io::deephaven::proto::backplane::grpc::Ticket* ticket) {
-  ::google::protobuf::Arena* message_arena = GetArena();
-  clear_ref();
-  if (ticket) {
-    ::google::protobuf::Arena* submessage_arena = reinterpret_cast<::google::protobuf::MessageLite*>(ticket)->GetArena();
-    if (message_arena != submessage_arena) {
-      ticket = ::google::protobuf::internal::GetOwnedMessage(message_arena, ticket, submessage_arena);
-    }
-    set_has_ticket();
-    _impl_.ref_.ticket_ = ticket;
-  }
-  // @@protoc_insertion_point(field_set_allocated:io.deephaven.proto.backplane.grpc.TableReference.ticket)
-}
-void TableReference::clear_ticket() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  if (ref_case() == kTicket) {
-    if (GetArena() == nullptr) {
-      delete _impl_.ref_.ticket_;
-    }
-    clear_has_ref();
-  }
-}
-TableReference::TableReference(::google::protobuf::Arena* arena)
-    : ::google::protobuf::Message(arena) {
-  SharedCtor(arena);
-  // @@protoc_insertion_point(arena_constructor:io.deephaven.proto.backplane.grpc.TableReference)
-}
-inline PROTOBUF_NDEBUG_INLINE TableReference::Impl_::Impl_(
-    ::google::protobuf::internal::InternalVisibility visibility, ::google::protobuf::Arena* arena,
-    const Impl_& from)
-      : ref_{},
-        _cached_size_{0},
-        _oneof_case_{from._oneof_case_[0]} {}
-
-TableReference::TableReference(
-    ::google::protobuf::Arena* arena,
-    const TableReference& from)
-    : ::google::protobuf::Message(arena) {
-  TableReference* const _this = this;
-  (void)_this;
-  _internal_metadata_.MergeFrom<::google::protobuf::UnknownFieldSet>(
-      from._internal_metadata_);
-  new (&_impl_) Impl_(internal_visibility(), arena, from._impl_);
-  switch (ref_case()) {
-    case REF_NOT_SET:
-      break;
-      case kTicket:
-        _impl_.ref_.ticket_ = CreateMaybeMessage<::io::deephaven::proto::backplane::grpc::Ticket>(arena, *from._impl_.ref_.ticket_);
-        break;
-      case kBatchOffset:
-        _impl_.ref_.batch_offset_ = from._impl_.ref_.batch_offset_;
-        break;
-  }
-
-  // @@protoc_insertion_point(copy_constructor:io.deephaven.proto.backplane.grpc.TableReference)
-}
-inline PROTOBUF_NDEBUG_INLINE TableReference::Impl_::Impl_(
-    ::google::protobuf::internal::InternalVisibility visibility,
-    ::google::protobuf::Arena* arena)
-      : ref_{},
-        _cached_size_{0},
-        _oneof_case_{} {}
-
-inline void TableReference::SharedCtor(::_pb::Arena* arena) {
-  new (&_impl_) Impl_(internal_visibility(), arena);
-}
-TableReference::~TableReference() {
-  // @@protoc_insertion_point(destructor:io.deephaven.proto.backplane.grpc.TableReference)
-  _internal_metadata_.Delete<::google::protobuf::UnknownFieldSet>();
-  SharedDtor();
-}
-inline void TableReference::SharedDtor() {
-  ABSL_DCHECK(GetArena() == nullptr);
-  if (has_ref()) {
-    clear_ref();
-  }
-  _impl_.~Impl_();
-}
-
-void TableReference::clear_ref() {
-// @@protoc_insertion_point(one_of_clear_start:io.deephaven.proto.backplane.grpc.TableReference)
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  switch (ref_case()) {
-    case kTicket: {
-      if (GetArena() == nullptr) {
-        delete _impl_.ref_.ticket_;
-      }
-      break;
-    }
-    case kBatchOffset: {
-      // No need to clear
-      break;
-    }
-    case REF_NOT_SET: {
-      break;
-    }
-  }
-  _impl_._oneof_case_[0] = REF_NOT_SET;
-}
-
-
-PROTOBUF_NOINLINE void TableReference::Clear() {
-// @@protoc_insertion_point(message_clear_start:io.deephaven.proto.backplane.grpc.TableReference)
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  ::uint32_t cached_has_bits = 0;
-  // Prevent compiler warnings about cached_has_bits being unused
-  (void) cached_has_bits;
-
-  clear_ref();
-  _internal_metadata_.Clear<::google::protobuf::UnknownFieldSet>();
-}
-
-const char* TableReference::_InternalParse(
-    const char* ptr, ::_pbi::ParseContext* ctx) {
-  ptr = ::_pbi::TcParser::ParseLoop(this, ptr, ctx, &_table_.header);
-  return ptr;
-}
-
-
-PROTOBUF_CONSTINIT PROTOBUF_ATTRIBUTE_INIT_PRIORITY1
-const ::_pbi::TcParseTable<0, 2, 1, 0, 2> TableReference::_table_ = {
-  {
-    0,  // no _has_bits_
-    0, // no _extensions_
-    2, 0,  // max_field_number, fast_idx_mask
-    offsetof(decltype(_table_), field_lookup_table),
-    4294967292,  // skipmap
-    offsetof(decltype(_table_), field_entries),
-    2,  // num_field_entries
-    1,  // num_aux_entries
-    offsetof(decltype(_table_), aux_entries),
-    &_TableReference_default_instance_._instance,
-    ::_pbi::TcParser::GenericFallback,  // fallback
-  }, {{
-    {::_pbi::TcParser::MiniParse, {}},
-  }}, {{
-    65535, 65535
-  }}, {{
-    // .io.deephaven.proto.backplane.grpc.Ticket ticket = 1;
-    {PROTOBUF_FIELD_OFFSET(TableReference, _impl_.ref_.ticket_), _Internal::kOneofCaseOffset + 0, 0,
-    (0 | ::_fl::kFcOneof | ::_fl::kMessage | ::_fl::kTvTable)},
-    // sint32 batch_offset = 2;
-    {PROTOBUF_FIELD_OFFSET(TableReference, _impl_.ref_.batch_offset_), _Internal::kOneofCaseOffset + 0, 0,
-    (0 | ::_fl::kFcOneof | ::_fl::kSInt32)},
-  }}, {{
-    {::_pbi::TcParser::GetTable<::io::deephaven::proto::backplane::grpc::Ticket>()},
-  }}, {{
-  }},
-};
-
-::uint8_t* TableReference::_InternalSerialize(
-    ::uint8_t* target,
-    ::google::protobuf::io::EpsCopyOutputStream* stream) const {
-  // @@protoc_insertion_point(serialize_to_array_start:io.deephaven.proto.backplane.grpc.TableReference)
-  ::uint32_t cached_has_bits = 0;
-  (void)cached_has_bits;
-
-  switch (ref_case()) {
-    case kTicket: {
-      target = ::google::protobuf::internal::WireFormatLite::InternalWriteMessage(
-          1, _Internal::ticket(this),
-          _Internal::ticket(this).GetCachedSize(), target, stream);
-      break;
-    }
-    case kBatchOffset: {
-      target = stream->EnsureSpace(target);
-      target = ::_pbi::WireFormatLite::WriteSInt32ToArray(
-          2, this->_internal_batch_offset(), target);
-      break;
-    }
-    default:
-      break;
-  }
-  if (PROTOBUF_PREDICT_FALSE(_internal_metadata_.have_unknown_fields())) {
-    target =
-        ::_pbi::WireFormat::InternalSerializeUnknownFieldsToArray(
-            _internal_metadata_.unknown_fields<::google::protobuf::UnknownFieldSet>(::google::protobuf::UnknownFieldSet::default_instance), target, stream);
-  }
-  // @@protoc_insertion_point(serialize_to_array_end:io.deephaven.proto.backplane.grpc.TableReference)
-  return target;
-}
-
-::size_t TableReference::ByteSizeLong() const {
-// @@protoc_insertion_point(message_byte_size_start:io.deephaven.proto.backplane.grpc.TableReference)
-  ::size_t total_size = 0;
-
-  ::uint32_t cached_has_bits = 0;
-  // Prevent compiler warnings about cached_has_bits being unused
-  (void) cached_has_bits;
-
-  switch (ref_case()) {
-    // .io.deephaven.proto.backplane.grpc.Ticket ticket = 1;
-    case kTicket: {
-      total_size +=
-          1 + ::google::protobuf::internal::WireFormatLite::MessageSize(*_impl_.ref_.ticket_);
-      break;
-    }
-    // sint32 batch_offset = 2;
-    case kBatchOffset: {
-      total_size += ::_pbi::WireFormatLite::SInt32SizePlusOne(
-          this->_internal_batch_offset());
-      break;
-    }
-    case REF_NOT_SET: {
-      break;
-    }
-  }
-  return MaybeComputeUnknownFieldsSize(total_size, &_impl_._cached_size_);
-}
-
-const ::google::protobuf::Message::ClassData TableReference::_class_data_ = {
-    TableReference::MergeImpl,
-    nullptr,  // OnDemandRegisterArenaDtor
-};
-const ::google::protobuf::Message::ClassData* TableReference::GetClassData() const {
-  return &_class_data_;
-}
-
-void TableReference::MergeImpl(::google::protobuf::Message& to_msg, const ::google::protobuf::Message& from_msg) {
-  auto* const _this = static_cast<TableReference*>(&to_msg);
-  auto& from = static_cast<const TableReference&>(from_msg);
-  // @@protoc_insertion_point(class_specific_merge_from_start:io.deephaven.proto.backplane.grpc.TableReference)
-  ABSL_DCHECK_NE(&from, _this);
-  ::uint32_t cached_has_bits = 0;
-  (void) cached_has_bits;
-
-  switch (from.ref_case()) {
-    case kTicket: {
-      _this->_internal_mutable_ticket()->::io::deephaven::proto::backplane::grpc::Ticket::MergeFrom(
-          from._internal_ticket());
-      break;
-    }
-    case kBatchOffset: {
-      _this->_internal_set_batch_offset(from._internal_batch_offset());
-      break;
-    }
-    case REF_NOT_SET: {
-      break;
-    }
-  }
-  _this->_internal_metadata_.MergeFrom<::google::protobuf::UnknownFieldSet>(from._internal_metadata_);
-}
-
-void TableReference::CopyFrom(const TableReference& from) {
-// @@protoc_insertion_point(class_specific_copy_from_start:io.deephaven.proto.backplane.grpc.TableReference)
-  if (&from == this) return;
-  Clear();
-  MergeFrom(from);
-}
-
-PROTOBUF_NOINLINE bool TableReference::IsInitialized() const {
-  return true;
-}
-
-::_pbi::CachedSize* TableReference::AccessCachedSize() const {
-  return &_impl_._cached_size_;
-}
-void TableReference::InternalSwap(TableReference* PROTOBUF_RESTRICT other) {
-  using std::swap;
-  _internal_metadata_.InternalSwap(&other->_internal_metadata_);
-  swap(_impl_.ref_, other->_impl_.ref_);
-  swap(_impl_._oneof_case_[0], other->_impl_._oneof_case_[0]);
-}
-
-::google::protobuf::Metadata TableReference::GetMetadata() const {
-  return ::_pbi::AssignDescriptors(
-      &descriptor_table_deephaven_2fproto_2ftable_2eproto_getter, &descriptor_table_deephaven_2fproto_2ftable_2eproto_once,
-      file_level_metadata_deephaven_2fproto_2ftable_2eproto[0]);
-}
-// ===================================================================
-
-class ExportedTableCreationResponse::_Internal {
- public:
-  using HasBits = decltype(std::declval<ExportedTableCreationResponse>()._impl_._has_bits_);
-  static constexpr ::int32_t kHasBitsOffset =
-    8 * PROTOBUF_FIELD_OFFSET(ExportedTableCreationResponse, _impl_._has_bits_);
-  static const ::io::deephaven::proto::backplane::grpc::TableReference& result_id(const ExportedTableCreationResponse* msg);
-  static void set_has_result_id(HasBits* has_bits) {
-    (*has_bits)[0] |= 1u;
-  }
-};
-
-const ::io::deephaven::proto::backplane::grpc::TableReference& ExportedTableCreationResponse::_Internal::result_id(const ExportedTableCreationResponse* msg) {
-  return *msg->_impl_.result_id_;
-}
-ExportedTableCreationResponse::ExportedTableCreationResponse(::google::protobuf::Arena* arena)
-    : ::google::protobuf::Message(arena) {
-  SharedCtor(arena);
-  // @@protoc_insertion_point(arena_constructor:io.deephaven.proto.backplane.grpc.ExportedTableCreationResponse)
-}
-inline PROTOBUF_NDEBUG_INLINE ExportedTableCreationResponse::Impl_::Impl_(
-    ::google::protobuf::internal::InternalVisibility visibility, ::google::protobuf::Arena* arena,
-    const Impl_& from)
-      : _has_bits_{from._has_bits_},
-        _cached_size_{0},
-        error_info_(arena, from.error_info_),
-        schema_header_(arena, from.schema_header_) {}
-
-ExportedTableCreationResponse::ExportedTableCreationResponse(
-    ::google::protobuf::Arena* arena,
-    const ExportedTableCreationResponse& from)
-    : ::google::protobuf::Message(arena) {
-  ExportedTableCreationResponse* const _this = this;
-  (void)_this;
-  _internal_metadata_.MergeFrom<::google::protobuf::UnknownFieldSet>(
-      from._internal_metadata_);
-  new (&_impl_) Impl_(internal_visibility(), arena, from._impl_);
-  ::uint32_t cached_has_bits = _impl_._has_bits_[0];
-  _impl_.result_id_ = (cached_has_bits & 0x00000001u)
-                ? CreateMaybeMessage<::io::deephaven::proto::backplane::grpc::TableReference>(arena, *from._impl_.result_id_)
-                : nullptr;
-  ::memcpy(reinterpret_cast<char *>(&_impl_) +
-               offsetof(Impl_, size_),
-           reinterpret_cast<const char *>(&from._impl_) +
-               offsetof(Impl_, size_),
-           offsetof(Impl_, is_static_) -
-               offsetof(Impl_, size_) +
-               sizeof(Impl_::is_static_));
-
-  // @@protoc_insertion_point(copy_constructor:io.deephaven.proto.backplane.grpc.ExportedTableCreationResponse)
-}
-inline PROTOBUF_NDEBUG_INLINE ExportedTableCreationResponse::Impl_::Impl_(
-    ::google::protobuf::internal::InternalVisibility visibility,
-    ::google::protobuf::Arena* arena)
-      : _cached_size_{0},
-        error_info_(arena),
-        schema_header_(arena) {}
-
-inline void ExportedTableCreationResponse::SharedCtor(::_pb::Arena* arena) {
-  new (&_impl_) Impl_(internal_visibility(), arena);
-  ::memset(reinterpret_cast<char *>(&_impl_) +
-               offsetof(Impl_, result_id_),
-           0,
-           offsetof(Impl_, is_static_) -
-               offsetof(Impl_, result_id_) +
-               sizeof(Impl_::is_static_));
-}
-ExportedTableCreationResponse::~ExportedTableCreationResponse() {
-  // @@protoc_insertion_point(destructor:io.deephaven.proto.backplane.grpc.ExportedTableCreationResponse)
-  _internal_metadata_.Delete<::google::protobuf::UnknownFieldSet>();
-  SharedDtor();
-}
-inline void ExportedTableCreationResponse::SharedDtor() {
-  ABSL_DCHECK(GetArena() == nullptr);
-  _impl_.error_info_.Destroy();
-  _impl_.schema_header_.Destroy();
-  delete _impl_.result_id_;
-  _impl_.~Impl_();
-}
-
-PROTOBUF_NOINLINE void ExportedTableCreationResponse::Clear() {
-// @@protoc_insertion_point(message_clear_start:io.deephaven.proto.backplane.grpc.ExportedTableCreationResponse)
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  ::uint32_t cached_has_bits = 0;
-  // Prevent compiler warnings about cached_has_bits being unused
-  (void) cached_has_bits;
-
-  _impl_.error_info_.ClearToEmpty();
-  _impl_.schema_header_.ClearToEmpty();
-  cached_has_bits = _impl_._has_bits_[0];
-  if (cached_has_bits & 0x00000001u) {
-    ABSL_DCHECK(_impl_.result_id_ != nullptr);
-    _impl_.result_id_->Clear();
-  }
-  ::memset(&_impl_.size_, 0, static_cast<::size_t>(
-      reinterpret_cast<char*>(&_impl_.is_static_) -
-      reinterpret_cast<char*>(&_impl_.size_)) + sizeof(_impl_.is_static_));
-  _impl_._has_bits_.Clear();
-  _internal_metadata_.Clear<::google::protobuf::UnknownFieldSet>();
-}
-
-const char* ExportedTableCreationResponse::_InternalParse(
-    const char* ptr, ::_pbi::ParseContext* ctx) {
-  ptr = ::_pbi::TcParser::ParseLoop(this, ptr, ctx, &_table_.header);
-  return ptr;
-}
-
-
-PROTOBUF_CONSTINIT PROTOBUF_ATTRIBUTE_INIT_PRIORITY1
-const ::_pbi::TcParseTable<3, 6, 1, 82, 2> ExportedTableCreationResponse::_table_ = {
-  {
-    PROTOBUF_FIELD_OFFSET(ExportedTableCreationResponse, _impl_._has_bits_),
-    0, // no _extensions_
-    6, 56,  // max_field_number, fast_idx_mask
-    offsetof(decltype(_table_), field_lookup_table),
-    4294967232,  // skipmap
-    offsetof(decltype(_table_), field_entries),
-    6,  // num_field_entries
-    1,  // num_aux_entries
-    offsetof(decltype(_table_), aux_entries),
-    &_ExportedTableCreationResponse_default_instance_._instance,
-    ::_pbi::TcParser::GenericFallback,  // fallback
-  }, {{
-    {::_pbi::TcParser::MiniParse, {}},
-    // .io.deephaven.proto.backplane.grpc.TableReference result_id = 1;
-    {::_pbi::TcParser::FastMtS1,
-     {10, 0, 0, PROTOBUF_FIELD_OFFSET(ExportedTableCreationResponse, _impl_.result_id_)}},
-    // bool success = 2;
-    {::_pbi::TcParser::SingularVarintNoZag1<bool, offsetof(ExportedTableCreationResponse, _impl_.success_), 63>(),
-     {16, 63, 0, PROTOBUF_FIELD_OFFSET(ExportedTableCreationResponse, _impl_.success_)}},
-    // string error_info = 3;
-    {::_pbi::TcParser::FastUS1,
-     {26, 63, 0, PROTOBUF_FIELD_OFFSET(ExportedTableCreationResponse, _impl_.error_info_)}},
-    // bytes schema_header = 4;
-    {::_pbi::TcParser::FastBS1,
-     {34, 63, 0, PROTOBUF_FIELD_OFFSET(ExportedTableCreationResponse, _impl_.schema_header_)}},
-    // bool is_static = 5;
-    {::_pbi::TcParser::SingularVarintNoZag1<bool, offsetof(ExportedTableCreationResponse, _impl_.is_static_), 63>(),
-     {40, 63, 0, PROTOBUF_FIELD_OFFSET(ExportedTableCreationResponse, _impl_.is_static_)}},
-    // sint64 size = 6 [jstype = JS_STRING];
-    {::_pbi::TcParser::FastZ64S1,
-     {48, 63, 0, PROTOBUF_FIELD_OFFSET(ExportedTableCreationResponse, _impl_.size_)}},
-    {::_pbi::TcParser::MiniParse, {}},
-  }}, {{
-    65535, 65535
-  }}, {{
-    // .io.deephaven.proto.backplane.grpc.TableReference result_id = 1;
-    {PROTOBUF_FIELD_OFFSET(ExportedTableCreationResponse, _impl_.result_id_), _Internal::kHasBitsOffset + 0, 0,
-    (0 | ::_fl::kFcOptional | ::_fl::kMessage | ::_fl::kTvTable)},
-    // bool success = 2;
-    {PROTOBUF_FIELD_OFFSET(ExportedTableCreationResponse, _impl_.success_), -1, 0,
-    (0 | ::_fl::kFcSingular | ::_fl::kBool)},
-    // string error_info = 3;
-    {PROTOBUF_FIELD_OFFSET(ExportedTableCreationResponse, _impl_.error_info_), -1, 0,
-    (0 | ::_fl::kFcSingular | ::_fl::kUtf8String | ::_fl::kRepAString)},
-    // bytes schema_header = 4;
-    {PROTOBUF_FIELD_OFFSET(ExportedTableCreationResponse, _impl_.schema_header_), -1, 0,
-    (0 | ::_fl::kFcSingular | ::_fl::kBytes | ::_fl::kRepAString)},
-    // bool is_static = 5;
-    {PROTOBUF_FIELD_OFFSET(ExportedTableCreationResponse, _impl_.is_static_), -1, 0,
-    (0 | ::_fl::kFcSingular | ::_fl::kBool)},
-    // sint64 size = 6 [jstype = JS_STRING];
-    {PROTOBUF_FIELD_OFFSET(ExportedTableCreationResponse, _impl_.size_), -1, 0,
-    (0 | ::_fl::kFcSingular | ::_fl::kSInt64)},
-  }}, {{
-    {::_pbi::TcParser::GetTable<::io::deephaven::proto::backplane::grpc::TableReference>()},
-  }}, {{
-    "\77\0\0\12\0\0\0\0"
-    "io.deephaven.proto.backplane.grpc.ExportedTableCreationResponse"
-    "error_info"
-  }},
-};
-
-::uint8_t* ExportedTableCreationResponse::_InternalSerialize(
-    ::uint8_t* target,
-    ::google::protobuf::io::EpsCopyOutputStream* stream) const {
-  // @@protoc_insertion_point(serialize_to_array_start:io.deephaven.proto.backplane.grpc.ExportedTableCreationResponse)
-  ::uint32_t cached_has_bits = 0;
-  (void)cached_has_bits;
-
-  cached_has_bits = _impl_._has_bits_[0];
-  // .io.deephaven.proto.backplane.grpc.TableReference result_id = 1;
-  if (cached_has_bits & 0x00000001u) {
-    target = ::google::protobuf::internal::WireFormatLite::InternalWriteMessage(
-        1, _Internal::result_id(this),
-        _Internal::result_id(this).GetCachedSize(), target, stream);
-  }
-
-  // bool success = 2;
-  if (this->_internal_success() != 0) {
-    target = stream->EnsureSpace(target);
-    target = ::_pbi::WireFormatLite::WriteBoolToArray(
-        2, this->_internal_success(), target);
-  }
-
-  // string error_info = 3;
-  if (!this->_internal_error_info().empty()) {
-    const std::string& _s = this->_internal_error_info();
-    ::google::protobuf::internal::WireFormatLite::VerifyUtf8String(
-        _s.data(), static_cast<int>(_s.length()), ::google::protobuf::internal::WireFormatLite::SERIALIZE, "io.deephaven.proto.backplane.grpc.ExportedTableCreationResponse.error_info");
-    target = stream->WriteStringMaybeAliased(3, _s, target);
-  }
-
-  // bytes schema_header = 4;
-  if (!this->_internal_schema_header().empty()) {
-    const std::string& _s = this->_internal_schema_header();
-    target = stream->WriteBytesMaybeAliased(4, _s, target);
-  }
-
-  // bool is_static = 5;
-  if (this->_internal_is_static() != 0) {
-    target = stream->EnsureSpace(target);
-    target = ::_pbi::WireFormatLite::WriteBoolToArray(
-        5, this->_internal_is_static(), target);
-  }
-
-  // sint64 size = 6 [jstype = JS_STRING];
-  if (this->_internal_size() != 0) {
-    target = stream->EnsureSpace(target);
-    target = ::_pbi::WireFormatLite::WriteSInt64ToArray(
-        6, this->_internal_size(), target);
-  }
-
-  if (PROTOBUF_PREDICT_FALSE(_internal_metadata_.have_unknown_fields())) {
-    target =
-        ::_pbi::WireFormat::InternalSerializeUnknownFieldsToArray(
-            _internal_metadata_.unknown_fields<::google::protobuf::UnknownFieldSet>(::google::protobuf::UnknownFieldSet::default_instance), target, stream);
-  }
-  // @@protoc_insertion_point(serialize_to_array_end:io.deephaven.proto.backplane.grpc.ExportedTableCreationResponse)
-  return target;
-}
-
-::size_t ExportedTableCreationResponse::ByteSizeLong() const {
-// @@protoc_insertion_point(message_byte_size_start:io.deephaven.proto.backplane.grpc.ExportedTableCreationResponse)
-  ::size_t total_size = 0;
-
-  ::uint32_t cached_has_bits = 0;
-  // Prevent compiler warnings about cached_has_bits being unused
-  (void) cached_has_bits;
-
-  // string error_info = 3;
-  if (!this->_internal_error_info().empty()) {
-    total_size += 1 + ::google::protobuf::internal::WireFormatLite::StringSize(
-                                    this->_internal_error_info());
-  }
-
-  // bytes schema_header = 4;
-  if (!this->_internal_schema_header().empty()) {
-    total_size += 1 + ::google::protobuf::internal::WireFormatLite::BytesSize(
-                                    this->_internal_schema_header());
-  }
-
-  // .io.deephaven.proto.backplane.grpc.TableReference result_id = 1;
-  cached_has_bits = _impl_._has_bits_[0];
-  if (cached_has_bits & 0x00000001u) {
-    total_size +=
-        1 + ::google::protobuf::internal::WireFormatLite::MessageSize(*_impl_.result_id_);
-  }
-
-  // sint64 size = 6 [jstype = JS_STRING];
-  if (this->_internal_size() != 0) {
-    total_size += ::_pbi::WireFormatLite::SInt64SizePlusOne(
-        this->_internal_size());
-  }
-
-  // bool success = 2;
-  if (this->_internal_success() != 0) {
-    total_size += 2;
-  }
-
-  // bool is_static = 5;
-  if (this->_internal_is_static() != 0) {
-    total_size += 2;
-  }
-
-  return MaybeComputeUnknownFieldsSize(total_size, &_impl_._cached_size_);
-}
-
-const ::google::protobuf::Message::ClassData ExportedTableCreationResponse::_class_data_ = {
-    ExportedTableCreationResponse::MergeImpl,
-    nullptr,  // OnDemandRegisterArenaDtor
-};
-const ::google::protobuf::Message::ClassData* ExportedTableCreationResponse::GetClassData() const {
-  return &_class_data_;
-}
-
-void ExportedTableCreationResponse::MergeImpl(::google::protobuf::Message& to_msg, const ::google::protobuf::Message& from_msg) {
-  auto* const _this = static_cast<ExportedTableCreationResponse*>(&to_msg);
-  auto& from = static_cast<const ExportedTableCreationResponse&>(from_msg);
-  // @@protoc_insertion_point(class_specific_merge_from_start:io.deephaven.proto.backplane.grpc.ExportedTableCreationResponse)
-  ABSL_DCHECK_NE(&from, _this);
-  ::uint32_t cached_has_bits = 0;
-  (void) cached_has_bits;
-
-  if (!from._internal_error_info().empty()) {
-    _this->_internal_set_error_info(from._internal_error_info());
-  }
-  if (!from._internal_schema_header().empty()) {
-    _this->_internal_set_schema_header(from._internal_schema_header());
-  }
-  if ((from._impl_._has_bits_[0] & 0x00000001u) != 0) {
-    _this->_internal_mutable_result_id()->::io::deephaven::proto::backplane::grpc::TableReference::MergeFrom(
-        from._internal_result_id());
-  }
-  if (from._internal_size() != 0) {
-    _this->_internal_set_size(from._internal_size());
-  }
-  if (from._internal_success() != 0) {
-    _this->_internal_set_success(from._internal_success());
-  }
-  if (from._internal_is_static() != 0) {
-    _this->_internal_set_is_static(from._internal_is_static());
-  }
-  _this->_internal_metadata_.MergeFrom<::google::protobuf::UnknownFieldSet>(from._internal_metadata_);
-}
-
-void ExportedTableCreationResponse::CopyFrom(const ExportedTableCreationResponse& from) {
-// @@protoc_insertion_point(class_specific_copy_from_start:io.deephaven.proto.backplane.grpc.ExportedTableCreationResponse)
-  if (&from == this) return;
-  Clear();
-  MergeFrom(from);
-}
-
-PROTOBUF_NOINLINE bool ExportedTableCreationResponse::IsInitialized() const {
-  return true;
-}
-
-::_pbi::CachedSize* ExportedTableCreationResponse::AccessCachedSize() const {
-  return &_impl_._cached_size_;
-}
-void ExportedTableCreationResponse::InternalSwap(ExportedTableCreationResponse* PROTOBUF_RESTRICT other) {
-  using std::swap;
-  auto* arena = GetArena();
-  ABSL_DCHECK_EQ(arena, other->GetArena());
-  _internal_metadata_.InternalSwap(&other->_internal_metadata_);
-  swap(_impl_._has_bits_[0], other->_impl_._has_bits_[0]);
-  ::_pbi::ArenaStringPtr::InternalSwap(&_impl_.error_info_, &other->_impl_.error_info_, arena);
-  ::_pbi::ArenaStringPtr::InternalSwap(&_impl_.schema_header_, &other->_impl_.schema_header_, arena);
-  ::google::protobuf::internal::memswap<
-      PROTOBUF_FIELD_OFFSET(ExportedTableCreationResponse, _impl_.is_static_)
-      + sizeof(ExportedTableCreationResponse::_impl_.is_static_)
-      - PROTOBUF_FIELD_OFFSET(ExportedTableCreationResponse, _impl_.result_id_)>(
-          reinterpret_cast<char*>(&_impl_.result_id_),
-          reinterpret_cast<char*>(&other->_impl_.result_id_));
-}
-
-::google::protobuf::Metadata ExportedTableCreationResponse::GetMetadata() const {
-  return ::_pbi::AssignDescriptors(
-      &descriptor_table_deephaven_2fproto_2ftable_2eproto_getter, &descriptor_table_deephaven_2fproto_2ftable_2eproto_once,
-      file_level_metadata_deephaven_2fproto_2ftable_2eproto[1]);
-}
-// ===================================================================
-
-class FetchTableRequest::_Internal {
- public:
-  using HasBits = decltype(std::declval<FetchTableRequest>()._impl_._has_bits_);
-  static constexpr ::int32_t kHasBitsOffset =
-    8 * PROTOBUF_FIELD_OFFSET(FetchTableRequest, _impl_._has_bits_);
-  static const ::io::deephaven::proto::backplane::grpc::TableReference& source_id(const FetchTableRequest* msg);
-  static void set_has_source_id(HasBits* has_bits) {
-    (*has_bits)[0] |= 1u;
-  }
-  static const ::io::deephaven::proto::backplane::grpc::Ticket& result_id(const FetchTableRequest* msg);
-  static void set_has_result_id(HasBits* has_bits) {
-    (*has_bits)[0] |= 2u;
-  }
-};
-
-const ::io::deephaven::proto::backplane::grpc::TableReference& FetchTableRequest::_Internal::source_id(const FetchTableRequest* msg) {
-  return *msg->_impl_.source_id_;
-}
-const ::io::deephaven::proto::backplane::grpc::Ticket& FetchTableRequest::_Internal::result_id(const FetchTableRequest* msg) {
-  return *msg->_impl_.result_id_;
-}
-void FetchTableRequest::clear_result_id() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  if (_impl_.result_id_ != nullptr) _impl_.result_id_->Clear();
-  _impl_._has_bits_[0] &= ~0x00000002u;
-}
-FetchTableRequest::FetchTableRequest(::google::protobuf::Arena* arena)
-    : ::google::protobuf::Message(arena) {
-  SharedCtor(arena);
-  // @@protoc_insertion_point(arena_constructor:io.deephaven.proto.backplane.grpc.FetchTableRequest)
-}
-inline PROTOBUF_NDEBUG_INLINE FetchTableRequest::Impl_::Impl_(
-    ::google::protobuf::internal::InternalVisibility visibility, ::google::protobuf::Arena* arena,
-    const Impl_& from)
-      : _has_bits_{from._has_bits_},
-        _cached_size_{0} {}
-
-FetchTableRequest::FetchTableRequest(
-    ::google::protobuf::Arena* arena,
-    const FetchTableRequest& from)
-    : ::google::protobuf::Message(arena) {
-  FetchTableRequest* const _this = this;
-  (void)_this;
-  _internal_metadata_.MergeFrom<::google::protobuf::UnknownFieldSet>(
-      from._internal_metadata_);
-  new (&_impl_) Impl_(internal_visibility(), arena, from._impl_);
-  ::uint32_t cached_has_bits = _impl_._has_bits_[0];
-  _impl_.source_id_ = (cached_has_bits & 0x00000001u)
-                ? CreateMaybeMessage<::io::deephaven::proto::backplane::grpc::TableReference>(arena, *from._impl_.source_id_)
-                : nullptr;
-  _impl_.result_id_ = (cached_has_bits & 0x00000002u)
-                ? CreateMaybeMessage<::io::deephaven::proto::backplane::grpc::Ticket>(arena, *from._impl_.result_id_)
-                : nullptr;
-
-  // @@protoc_insertion_point(copy_constructor:io.deephaven.proto.backplane.grpc.FetchTableRequest)
-}
-inline PROTOBUF_NDEBUG_INLINE FetchTableRequest::Impl_::Impl_(
-    ::google::protobuf::internal::InternalVisibility visibility,
-    ::google::protobuf::Arena* arena)
-      : _cached_size_{0} {}
-
-inline void FetchTableRequest::SharedCtor(::_pb::Arena* arena) {
-  new (&_impl_) Impl_(internal_visibility(), arena);
-  ::memset(reinterpret_cast<char *>(&_impl_) +
-               offsetof(Impl_, source_id_),
-           0,
-           offsetof(Impl_, result_id_) -
-               offsetof(Impl_, source_id_) +
-               sizeof(Impl_::result_id_));
-}
-FetchTableRequest::~FetchTableRequest() {
-  // @@protoc_insertion_point(destructor:io.deephaven.proto.backplane.grpc.FetchTableRequest)
-  _internal_metadata_.Delete<::google::protobuf::UnknownFieldSet>();
-  SharedDtor();
-}
-inline void FetchTableRequest::SharedDtor() {
-  ABSL_DCHECK(GetArena() == nullptr);
-  delete _impl_.source_id_;
-  delete _impl_.result_id_;
-  _impl_.~Impl_();
-}
-
-PROTOBUF_NOINLINE void FetchTableRequest::Clear() {
-// @@protoc_insertion_point(message_clear_start:io.deephaven.proto.backplane.grpc.FetchTableRequest)
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  ::uint32_t cached_has_bits = 0;
-  // Prevent compiler warnings about cached_has_bits being unused
-  (void) cached_has_bits;
-
-  cached_has_bits = _impl_._has_bits_[0];
-  if (cached_has_bits & 0x00000003u) {
-    if (cached_has_bits & 0x00000001u) {
-      ABSL_DCHECK(_impl_.source_id_ != nullptr);
-      _impl_.source_id_->Clear();
-    }
-    if (cached_has_bits & 0x00000002u) {
-      ABSL_DCHECK(_impl_.result_id_ != nullptr);
-      _impl_.result_id_->Clear();
-    }
-  }
-  _impl_._has_bits_.Clear();
-  _internal_metadata_.Clear<::google::protobuf::UnknownFieldSet>();
-}
-
-const char* FetchTableRequest::_InternalParse(
-    const char* ptr, ::_pbi::ParseContext* ctx) {
-  ptr = ::_pbi::TcParser::ParseLoop(this, ptr, ctx, &_table_.header);
-  return ptr;
-}
-
-
-PROTOBUF_CONSTINIT PROTOBUF_ATTRIBUTE_INIT_PRIORITY1
-const ::_pbi::TcParseTable<1, 2, 2, 0, 2> FetchTableRequest::_table_ = {
-  {
-    PROTOBUF_FIELD_OFFSET(FetchTableRequest, _impl_._has_bits_),
-    0, // no _extensions_
-    2, 8,  // max_field_number, fast_idx_mask
-    offsetof(decltype(_table_), field_lookup_table),
-    4294967292,  // skipmap
-    offsetof(decltype(_table_), field_entries),
-    2,  // num_field_entries
-    2,  // num_aux_entries
-    offsetof(decltype(_table_), aux_entries),
-    &_FetchTableRequest_default_instance_._instance,
-    ::_pbi::TcParser::GenericFallback,  // fallback
-  }, {{
-    // .io.deephaven.proto.backplane.grpc.Ticket result_id = 2;
-    {::_pbi::TcParser::FastMtS1,
-     {18, 1, 1, PROTOBUF_FIELD_OFFSET(FetchTableRequest, _impl_.result_id_)}},
-    // .io.deephaven.proto.backplane.grpc.TableReference source_id = 1;
-    {::_pbi::TcParser::FastMtS1,
-     {10, 0, 0, PROTOBUF_FIELD_OFFSET(FetchTableRequest, _impl_.source_id_)}},
-  }}, {{
-    65535, 65535
-  }}, {{
-    // .io.deephaven.proto.backplane.grpc.TableReference source_id = 1;
-    {PROTOBUF_FIELD_OFFSET(FetchTableRequest, _impl_.source_id_), _Internal::kHasBitsOffset + 0, 0,
-    (0 | ::_fl::kFcOptional | ::_fl::kMessage | ::_fl::kTvTable)},
-    // .io.deephaven.proto.backplane.grpc.Ticket result_id = 2;
-    {PROTOBUF_FIELD_OFFSET(FetchTableRequest, _impl_.result_id_), _Internal::kHasBitsOffset + 1, 1,
-    (0 | ::_fl::kFcOptional | ::_fl::kMessage | ::_fl::kTvTable)},
-  }}, {{
-    {::_pbi::TcParser::GetTable<::io::deephaven::proto::backplane::grpc::TableReference>()},
-    {::_pbi::TcParser::GetTable<::io::deephaven::proto::backplane::grpc::Ticket>()},
-  }}, {{
-  }},
-};
-
-::uint8_t* FetchTableRequest::_InternalSerialize(
-    ::uint8_t* target,
-    ::google::protobuf::io::EpsCopyOutputStream* stream) const {
-  // @@protoc_insertion_point(serialize_to_array_start:io.deephaven.proto.backplane.grpc.FetchTableRequest)
-  ::uint32_t cached_has_bits = 0;
-  (void)cached_has_bits;
-
-  cached_has_bits = _impl_._has_bits_[0];
-  // .io.deephaven.proto.backplane.grpc.TableReference source_id = 1;
-  if (cached_has_bits & 0x00000001u) {
-    target = ::google::protobuf::internal::WireFormatLite::InternalWriteMessage(
-        1, _Internal::source_id(this),
-        _Internal::source_id(this).GetCachedSize(), target, stream);
-  }
-
-  // .io.deephaven.proto.backplane.grpc.Ticket result_id = 2;
-  if (cached_has_bits & 0x00000002u) {
-    target = ::google::protobuf::internal::WireFormatLite::InternalWriteMessage(
-        2, _Internal::result_id(this),
-        _Internal::result_id(this).GetCachedSize(), target, stream);
-  }
-
-  if (PROTOBUF_PREDICT_FALSE(_internal_metadata_.have_unknown_fields())) {
-    target =
-        ::_pbi::WireFormat::InternalSerializeUnknownFieldsToArray(
-            _internal_metadata_.unknown_fields<::google::protobuf::UnknownFieldSet>(::google::protobuf::UnknownFieldSet::default_instance), target, stream);
-  }
-  // @@protoc_insertion_point(serialize_to_array_end:io.deephaven.proto.backplane.grpc.FetchTableRequest)
-  return target;
-}
-
-::size_t FetchTableRequest::ByteSizeLong() const {
-// @@protoc_insertion_point(message_byte_size_start:io.deephaven.proto.backplane.grpc.FetchTableRequest)
-  ::size_t total_size = 0;
-
-  ::uint32_t cached_has_bits = 0;
-  // Prevent compiler warnings about cached_has_bits being unused
-  (void) cached_has_bits;
-
-  cached_has_bits = _impl_._has_bits_[0];
-  if (cached_has_bits & 0x00000003u) {
-    // .io.deephaven.proto.backplane.grpc.TableReference source_id = 1;
-    if (cached_has_bits & 0x00000001u) {
-      total_size +=
-          1 + ::google::protobuf::internal::WireFormatLite::MessageSize(*_impl_.source_id_);
-    }
-
-    // .io.deephaven.proto.backplane.grpc.Ticket result_id = 2;
-    if (cached_has_bits & 0x00000002u) {
-      total_size +=
-          1 + ::google::protobuf::internal::WireFormatLite::MessageSize(*_impl_.result_id_);
-    }
-
-  }
-  return MaybeComputeUnknownFieldsSize(total_size, &_impl_._cached_size_);
-}
-
-const ::google::protobuf::Message::ClassData FetchTableRequest::_class_data_ = {
-    FetchTableRequest::MergeImpl,
-    nullptr,  // OnDemandRegisterArenaDtor
-};
-const ::google::protobuf::Message::ClassData* FetchTableRequest::GetClassData() const {
-  return &_class_data_;
-}
-
-void FetchTableRequest::MergeImpl(::google::protobuf::Message& to_msg, const ::google::protobuf::Message& from_msg) {
-  auto* const _this = static_cast<FetchTableRequest*>(&to_msg);
-  auto& from = static_cast<const FetchTableRequest&>(from_msg);
-  // @@protoc_insertion_point(class_specific_merge_from_start:io.deephaven.proto.backplane.grpc.FetchTableRequest)
-  ABSL_DCHECK_NE(&from, _this);
-  ::uint32_t cached_has_bits = 0;
-  (void) cached_has_bits;
-
-  cached_has_bits = from._impl_._has_bits_[0];
-  if (cached_has_bits & 0x00000003u) {
-    if (cached_has_bits & 0x00000001u) {
-      _this->_internal_mutable_source_id()->::io::deephaven::proto::backplane::grpc::TableReference::MergeFrom(
-          from._internal_source_id());
-    }
-    if (cached_has_bits & 0x00000002u) {
-      _this->_internal_mutable_result_id()->::io::deephaven::proto::backplane::grpc::Ticket::MergeFrom(
-          from._internal_result_id());
-    }
-  }
-  _this->_internal_metadata_.MergeFrom<::google::protobuf::UnknownFieldSet>(from._internal_metadata_);
-}
-
-void FetchTableRequest::CopyFrom(const FetchTableRequest& from) {
-// @@protoc_insertion_point(class_specific_copy_from_start:io.deephaven.proto.backplane.grpc.FetchTableRequest)
-  if (&from == this) return;
-  Clear();
-  MergeFrom(from);
-}
-
-PROTOBUF_NOINLINE bool FetchTableRequest::IsInitialized() const {
-  return true;
-}
-
-::_pbi::CachedSize* FetchTableRequest::AccessCachedSize() const {
-  return &_impl_._cached_size_;
-}
-void FetchTableRequest::InternalSwap(FetchTableRequest* PROTOBUF_RESTRICT other) {
-  using std::swap;
-  _internal_metadata_.InternalSwap(&other->_internal_metadata_);
-  swap(_impl_._has_bits_[0], other->_impl_._has_bits_[0]);
-  ::google::protobuf::internal::memswap<
-      PROTOBUF_FIELD_OFFSET(FetchTableRequest, _impl_.result_id_)
-      + sizeof(FetchTableRequest::_impl_.result_id_)
-      - PROTOBUF_FIELD_OFFSET(FetchTableRequest, _impl_.source_id_)>(
-          reinterpret_cast<char*>(&_impl_.source_id_),
-          reinterpret_cast<char*>(&other->_impl_.source_id_));
-}
-
-::google::protobuf::Metadata FetchTableRequest::GetMetadata() const {
-  return ::_pbi::AssignDescriptors(
-      &descriptor_table_deephaven_2fproto_2ftable_2eproto_getter, &descriptor_table_deephaven_2fproto_2ftable_2eproto_once,
-      file_level_metadata_deephaven_2fproto_2ftable_2eproto[2]);
-}
-// ===================================================================
-
-class ApplyPreviewColumnsRequest::_Internal {
- public:
-  using HasBits = decltype(std::declval<ApplyPreviewColumnsRequest>()._impl_._has_bits_);
-  static constexpr ::int32_t kHasBitsOffset =
-    8 * PROTOBUF_FIELD_OFFSET(ApplyPreviewColumnsRequest, _impl_._has_bits_);
-  static const ::io::deephaven::proto::backplane::grpc::TableReference& source_id(const ApplyPreviewColumnsRequest* msg);
-  static void set_has_source_id(HasBits* has_bits) {
-    (*has_bits)[0] |= 1u;
-  }
-  static const ::io::deephaven::proto::backplane::grpc::Ticket& result_id(const ApplyPreviewColumnsRequest* msg);
-  static void set_has_result_id(HasBits* has_bits) {
-    (*has_bits)[0] |= 2u;
-  }
-};
-
-const ::io::deephaven::proto::backplane::grpc::TableReference& ApplyPreviewColumnsRequest::_Internal::source_id(const ApplyPreviewColumnsRequest* msg) {
-  return *msg->_impl_.source_id_;
-}
-const ::io::deephaven::proto::backplane::grpc::Ticket& ApplyPreviewColumnsRequest::_Internal::result_id(const ApplyPreviewColumnsRequest* msg) {
-  return *msg->_impl_.result_id_;
-}
-void ApplyPreviewColumnsRequest::clear_result_id() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  if (_impl_.result_id_ != nullptr) _impl_.result_id_->Clear();
-  _impl_._has_bits_[0] &= ~0x00000002u;
-}
-ApplyPreviewColumnsRequest::ApplyPreviewColumnsRequest(::google::protobuf::Arena* arena)
-    : ::google::protobuf::Message(arena) {
-  SharedCtor(arena);
-  // @@protoc_insertion_point(arena_constructor:io.deephaven.proto.backplane.grpc.ApplyPreviewColumnsRequest)
-}
-inline PROTOBUF_NDEBUG_INLINE ApplyPreviewColumnsRequest::Impl_::Impl_(
-    ::google::protobuf::internal::InternalVisibility visibility, ::google::protobuf::Arena* arena,
-    const Impl_& from)
-      : _has_bits_{from._has_bits_},
-        _cached_size_{0} {}
-
-ApplyPreviewColumnsRequest::ApplyPreviewColumnsRequest(
-    ::google::protobuf::Arena* arena,
-    const ApplyPreviewColumnsRequest& from)
-    : ::google::protobuf::Message(arena) {
-  ApplyPreviewColumnsRequest* const _this = this;
-  (void)_this;
-  _internal_metadata_.MergeFrom<::google::protobuf::UnknownFieldSet>(
-      from._internal_metadata_);
-  new (&_impl_) Impl_(internal_visibility(), arena, from._impl_);
-  ::uint32_t cached_has_bits = _impl_._has_bits_[0];
-  _impl_.source_id_ = (cached_has_bits & 0x00000001u)
-                ? CreateMaybeMessage<::io::deephaven::proto::backplane::grpc::TableReference>(arena, *from._impl_.source_id_)
-                : nullptr;
-  _impl_.result_id_ = (cached_has_bits & 0x00000002u)
-                ? CreateMaybeMessage<::io::deephaven::proto::backplane::grpc::Ticket>(arena, *from._impl_.result_id_)
-                : nullptr;
-
-  // @@protoc_insertion_point(copy_constructor:io.deephaven.proto.backplane.grpc.ApplyPreviewColumnsRequest)
-}
-inline PROTOBUF_NDEBUG_INLINE ApplyPreviewColumnsRequest::Impl_::Impl_(
-    ::google::protobuf::internal::InternalVisibility visibility,
-    ::google::protobuf::Arena* arena)
-      : _cached_size_{0} {}
-
-inline void ApplyPreviewColumnsRequest::SharedCtor(::_pb::Arena* arena) {
-  new (&_impl_) Impl_(internal_visibility(), arena);
-  ::memset(reinterpret_cast<char *>(&_impl_) +
-               offsetof(Impl_, source_id_),
-           0,
-           offsetof(Impl_, result_id_) -
-               offsetof(Impl_, source_id_) +
-               sizeof(Impl_::result_id_));
-}
-ApplyPreviewColumnsRequest::~ApplyPreviewColumnsRequest() {
-  // @@protoc_insertion_point(destructor:io.deephaven.proto.backplane.grpc.ApplyPreviewColumnsRequest)
-  _internal_metadata_.Delete<::google::protobuf::UnknownFieldSet>();
-  SharedDtor();
-}
-inline void ApplyPreviewColumnsRequest::SharedDtor() {
-  ABSL_DCHECK(GetArena() == nullptr);
-  delete _impl_.source_id_;
-  delete _impl_.result_id_;
-  _impl_.~Impl_();
-}
-
-PROTOBUF_NOINLINE void ApplyPreviewColumnsRequest::Clear() {
-// @@protoc_insertion_point(message_clear_start:io.deephaven.proto.backplane.grpc.ApplyPreviewColumnsRequest)
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  ::uint32_t cached_has_bits = 0;
-  // Prevent compiler warnings about cached_has_bits being unused
-  (void) cached_has_bits;
-
-  cached_has_bits = _impl_._has_bits_[0];
-  if (cached_has_bits & 0x00000003u) {
-    if (cached_has_bits & 0x00000001u) {
-      ABSL_DCHECK(_impl_.source_id_ != nullptr);
-      _impl_.source_id_->Clear();
-    }
-    if (cached_has_bits & 0x00000002u) {
-      ABSL_DCHECK(_impl_.result_id_ != nullptr);
-      _impl_.result_id_->Clear();
-    }
-  }
-  _impl_._has_bits_.Clear();
-  _internal_metadata_.Clear<::google::protobuf::UnknownFieldSet>();
-}
-
-const char* ApplyPreviewColumnsRequest::_InternalParse(
-    const char* ptr, ::_pbi::ParseContext* ctx) {
-  ptr = ::_pbi::TcParser::ParseLoop(this, ptr, ctx, &_table_.header);
-  return ptr;
-}
-
-
-PROTOBUF_CONSTINIT PROTOBUF_ATTRIBUTE_INIT_PRIORITY1
-const ::_pbi::TcParseTable<1, 2, 2, 0, 2> ApplyPreviewColumnsRequest::_table_ = {
-  {
-    PROTOBUF_FIELD_OFFSET(ApplyPreviewColumnsRequest, _impl_._has_bits_),
-    0, // no _extensions_
-    2, 8,  // max_field_number, fast_idx_mask
-    offsetof(decltype(_table_), field_lookup_table),
-    4294967292,  // skipmap
-    offsetof(decltype(_table_), field_entries),
-    2,  // num_field_entries
-    2,  // num_aux_entries
-    offsetof(decltype(_table_), aux_entries),
-    &_ApplyPreviewColumnsRequest_default_instance_._instance,
-    ::_pbi::TcParser::GenericFallback,  // fallback
-  }, {{
-    // .io.deephaven.proto.backplane.grpc.Ticket result_id = 2;
-    {::_pbi::TcParser::FastMtS1,
-     {18, 1, 1, PROTOBUF_FIELD_OFFSET(ApplyPreviewColumnsRequest, _impl_.result_id_)}},
-    // .io.deephaven.proto.backplane.grpc.TableReference source_id = 1;
-    {::_pbi::TcParser::FastMtS1,
-     {10, 0, 0, PROTOBUF_FIELD_OFFSET(ApplyPreviewColumnsRequest, _impl_.source_id_)}},
-  }}, {{
-    65535, 65535
-  }}, {{
-    // .io.deephaven.proto.backplane.grpc.TableReference source_id = 1;
-    {PROTOBUF_FIELD_OFFSET(ApplyPreviewColumnsRequest, _impl_.source_id_), _Internal::kHasBitsOffset + 0, 0,
-    (0 | ::_fl::kFcOptional | ::_fl::kMessage | ::_fl::kTvTable)},
-    // .io.deephaven.proto.backplane.grpc.Ticket result_id = 2;
-    {PROTOBUF_FIELD_OFFSET(ApplyPreviewColumnsRequest, _impl_.result_id_), _Internal::kHasBitsOffset + 1, 1,
-    (0 | ::_fl::kFcOptional | ::_fl::kMessage | ::_fl::kTvTable)},
-  }}, {{
-    {::_pbi::TcParser::GetTable<::io::deephaven::proto::backplane::grpc::TableReference>()},
-    {::_pbi::TcParser::GetTable<::io::deephaven::proto::backplane::grpc::Ticket>()},
-  }}, {{
-  }},
-};
-
-::uint8_t* ApplyPreviewColumnsRequest::_InternalSerialize(
-    ::uint8_t* target,
-    ::google::protobuf::io::EpsCopyOutputStream* stream) const {
-  // @@protoc_insertion_point(serialize_to_array_start:io.deephaven.proto.backplane.grpc.ApplyPreviewColumnsRequest)
-  ::uint32_t cached_has_bits = 0;
-  (void)cached_has_bits;
-
-  cached_has_bits = _impl_._has_bits_[0];
-  // .io.deephaven.proto.backplane.grpc.TableReference source_id = 1;
-  if (cached_has_bits & 0x00000001u) {
-    target = ::google::protobuf::internal::WireFormatLite::InternalWriteMessage(
-        1, _Internal::source_id(this),
-        _Internal::source_id(this).GetCachedSize(), target, stream);
-  }
-
-  // .io.deephaven.proto.backplane.grpc.Ticket result_id = 2;
-  if (cached_has_bits & 0x00000002u) {
-    target = ::google::protobuf::internal::WireFormatLite::InternalWriteMessage(
-        2, _Internal::result_id(this),
-        _Internal::result_id(this).GetCachedSize(), target, stream);
-  }
-
-  if (PROTOBUF_PREDICT_FALSE(_internal_metadata_.have_unknown_fields())) {
-    target =
-        ::_pbi::WireFormat::InternalSerializeUnknownFieldsToArray(
-            _internal_metadata_.unknown_fields<::google::protobuf::UnknownFieldSet>(::google::protobuf::UnknownFieldSet::default_instance), target, stream);
-  }
-  // @@protoc_insertion_point(serialize_to_array_end:io.deephaven.proto.backplane.grpc.ApplyPreviewColumnsRequest)
-  return target;
-}
-
-::size_t ApplyPreviewColumnsRequest::ByteSizeLong() const {
-// @@protoc_insertion_point(message_byte_size_start:io.deephaven.proto.backplane.grpc.ApplyPreviewColumnsRequest)
-  ::size_t total_size = 0;
-
-  ::uint32_t cached_has_bits = 0;
-  // Prevent compiler warnings about cached_has_bits being unused
-  (void) cached_has_bits;
-
-  cached_has_bits = _impl_._has_bits_[0];
-  if (cached_has_bits & 0x00000003u) {
-    // .io.deephaven.proto.backplane.grpc.TableReference source_id = 1;
-    if (cached_has_bits & 0x00000001u) {
-      total_size +=
-          1 + ::google::protobuf::internal::WireFormatLite::MessageSize(*_impl_.source_id_);
-    }
-
-    // .io.deephaven.proto.backplane.grpc.Ticket result_id = 2;
-    if (cached_has_bits & 0x00000002u) {
-      total_size +=
-          1 + ::google::protobuf::internal::WireFormatLite::MessageSize(*_impl_.result_id_);
-    }
-
-  }
-  return MaybeComputeUnknownFieldsSize(total_size, &_impl_._cached_size_);
-}
-
-const ::google::protobuf::Message::ClassData ApplyPreviewColumnsRequest::_class_data_ = {
-    ApplyPreviewColumnsRequest::MergeImpl,
-    nullptr,  // OnDemandRegisterArenaDtor
-};
-const ::google::protobuf::Message::ClassData* ApplyPreviewColumnsRequest::GetClassData() const {
-  return &_class_data_;
-}
-
-void ApplyPreviewColumnsRequest::MergeImpl(::google::protobuf::Message& to_msg, const ::google::protobuf::Message& from_msg) {
-  auto* const _this = static_cast<ApplyPreviewColumnsRequest*>(&to_msg);
-  auto& from = static_cast<const ApplyPreviewColumnsRequest&>(from_msg);
-  // @@protoc_insertion_point(class_specific_merge_from_start:io.deephaven.proto.backplane.grpc.ApplyPreviewColumnsRequest)
-  ABSL_DCHECK_NE(&from, _this);
-  ::uint32_t cached_has_bits = 0;
-  (void) cached_has_bits;
-
-  cached_has_bits = from._impl_._has_bits_[0];
-  if (cached_has_bits & 0x00000003u) {
-    if (cached_has_bits & 0x00000001u) {
-      _this->_internal_mutable_source_id()->::io::deephaven::proto::backplane::grpc::TableReference::MergeFrom(
-          from._internal_source_id());
-    }
-    if (cached_has_bits & 0x00000002u) {
-      _this->_internal_mutable_result_id()->::io::deephaven::proto::backplane::grpc::Ticket::MergeFrom(
-          from._internal_result_id());
-    }
-  }
-  _this->_internal_metadata_.MergeFrom<::google::protobuf::UnknownFieldSet>(from._internal_metadata_);
-}
-
-void ApplyPreviewColumnsRequest::CopyFrom(const ApplyPreviewColumnsRequest& from) {
-// @@protoc_insertion_point(class_specific_copy_from_start:io.deephaven.proto.backplane.grpc.ApplyPreviewColumnsRequest)
-  if (&from == this) return;
-  Clear();
-  MergeFrom(from);
-}
-
-PROTOBUF_NOINLINE bool ApplyPreviewColumnsRequest::IsInitialized() const {
-  return true;
-}
-
-::_pbi::CachedSize* ApplyPreviewColumnsRequest::AccessCachedSize() const {
-  return &_impl_._cached_size_;
-}
-void ApplyPreviewColumnsRequest::InternalSwap(ApplyPreviewColumnsRequest* PROTOBUF_RESTRICT other) {
-  using std::swap;
-  _internal_metadata_.InternalSwap(&other->_internal_metadata_);
-  swap(_impl_._has_bits_[0], other->_impl_._has_bits_[0]);
-  ::google::protobuf::internal::memswap<
-      PROTOBUF_FIELD_OFFSET(ApplyPreviewColumnsRequest, _impl_.result_id_)
-      + sizeof(ApplyPreviewColumnsRequest::_impl_.result_id_)
-      - PROTOBUF_FIELD_OFFSET(ApplyPreviewColumnsRequest, _impl_.source_id_)>(
-          reinterpret_cast<char*>(&_impl_.source_id_),
-          reinterpret_cast<char*>(&other->_impl_.source_id_));
-}
-
-::google::protobuf::Metadata ApplyPreviewColumnsRequest::GetMetadata() const {
-  return ::_pbi::AssignDescriptors(
-      &descriptor_table_deephaven_2fproto_2ftable_2eproto_getter, &descriptor_table_deephaven_2fproto_2ftable_2eproto_once,
-      file_level_metadata_deephaven_2fproto_2ftable_2eproto[3]);
-}
-// ===================================================================
-
-class ExportedTableUpdatesRequest::_Internal {
- public:
-};
-
-ExportedTableUpdatesRequest::ExportedTableUpdatesRequest(::google::protobuf::Arena* arena)
-    : ::google::protobuf::internal::ZeroFieldsBase(arena) {
-  // @@protoc_insertion_point(arena_constructor:io.deephaven.proto.backplane.grpc.ExportedTableUpdatesRequest)
-}
-ExportedTableUpdatesRequest::ExportedTableUpdatesRequest(
-    ::google::protobuf::Arena* arena,
-    const ExportedTableUpdatesRequest& from)
-    : ::google::protobuf::internal::ZeroFieldsBase(arena) {
-  ExportedTableUpdatesRequest* const _this = this;
-  (void)_this;
-  _internal_metadata_.MergeFrom<::google::protobuf::UnknownFieldSet>(
-      from._internal_metadata_);
-
-  // @@protoc_insertion_point(copy_constructor:io.deephaven.proto.backplane.grpc.ExportedTableUpdatesRequest)
-}
-
-
-
-
-
-
-
-
-
-::google::protobuf::Metadata ExportedTableUpdatesRequest::GetMetadata() const {
-  return ::_pbi::AssignDescriptors(
-      &descriptor_table_deephaven_2fproto_2ftable_2eproto_getter, &descriptor_table_deephaven_2fproto_2ftable_2eproto_once,
-      file_level_metadata_deephaven_2fproto_2ftable_2eproto[4]);
-}
-// ===================================================================
-
-class ExportedTableUpdateMessage::_Internal {
- public:
-  using HasBits = decltype(std::declval<ExportedTableUpdateMessage>()._impl_._has_bits_);
-  static constexpr ::int32_t kHasBitsOffset =
-    8 * PROTOBUF_FIELD_OFFSET(ExportedTableUpdateMessage, _impl_._has_bits_);
-  static const ::io::deephaven::proto::backplane::grpc::Ticket& export_id(const ExportedTableUpdateMessage* msg);
-  static void set_has_export_id(HasBits* has_bits) {
-    (*has_bits)[0] |= 1u;
-  }
-};
-
-const ::io::deephaven::proto::backplane::grpc::Ticket& ExportedTableUpdateMessage::_Internal::export_id(const ExportedTableUpdateMessage* msg) {
-  return *msg->_impl_.export_id_;
-}
-void ExportedTableUpdateMessage::clear_export_id() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  if (_impl_.export_id_ != nullptr) _impl_.export_id_->Clear();
-  _impl_._has_bits_[0] &= ~0x00000001u;
-}
-ExportedTableUpdateMessage::ExportedTableUpdateMessage(::google::protobuf::Arena* arena)
-    : ::google::protobuf::Message(arena) {
-  SharedCtor(arena);
-  // @@protoc_insertion_point(arena_constructor:io.deephaven.proto.backplane.grpc.ExportedTableUpdateMessage)
-}
-inline PROTOBUF_NDEBUG_INLINE ExportedTableUpdateMessage::Impl_::Impl_(
-    ::google::protobuf::internal::InternalVisibility visibility, ::google::protobuf::Arena* arena,
-    const Impl_& from)
-      : _has_bits_{from._has_bits_},
-        _cached_size_{0},
-        update_failure_message_(arena, from.update_failure_message_) {}
-
-ExportedTableUpdateMessage::ExportedTableUpdateMessage(
-    ::google::protobuf::Arena* arena,
-    const ExportedTableUpdateMessage& from)
-    : ::google::protobuf::Message(arena) {
-  ExportedTableUpdateMessage* const _this = this;
-  (void)_this;
-  _internal_metadata_.MergeFrom<::google::protobuf::UnknownFieldSet>(
-      from._internal_metadata_);
-  new (&_impl_) Impl_(internal_visibility(), arena, from._impl_);
-  ::uint32_t cached_has_bits = _impl_._has_bits_[0];
-  _impl_.export_id_ = (cached_has_bits & 0x00000001u)
-                ? CreateMaybeMessage<::io::deephaven::proto::backplane::grpc::Ticket>(arena, *from._impl_.export_id_)
-                : nullptr;
-  _impl_.size_ = from._impl_.size_;
-
-  // @@protoc_insertion_point(copy_constructor:io.deephaven.proto.backplane.grpc.ExportedTableUpdateMessage)
-}
-inline PROTOBUF_NDEBUG_INLINE ExportedTableUpdateMessage::Impl_::Impl_(
-    ::google::protobuf::internal::InternalVisibility visibility,
-    ::google::protobuf::Arena* arena)
-      : _cached_size_{0},
-        update_failure_message_(arena) {}
-
-inline void ExportedTableUpdateMessage::SharedCtor(::_pb::Arena* arena) {
-  new (&_impl_) Impl_(internal_visibility(), arena);
-  ::memset(reinterpret_cast<char *>(&_impl_) +
-               offsetof(Impl_, export_id_),
-           0,
-           offsetof(Impl_, size_) -
-               offsetof(Impl_, export_id_) +
-               sizeof(Impl_::size_));
-}
-ExportedTableUpdateMessage::~ExportedTableUpdateMessage() {
-  // @@protoc_insertion_point(destructor:io.deephaven.proto.backplane.grpc.ExportedTableUpdateMessage)
-  _internal_metadata_.Delete<::google::protobuf::UnknownFieldSet>();
-  SharedDtor();
-}
-inline void ExportedTableUpdateMessage::SharedDtor() {
-  ABSL_DCHECK(GetArena() == nullptr);
-  _impl_.update_failure_message_.Destroy();
-  delete _impl_.export_id_;
-  _impl_.~Impl_();
-}
-
-PROTOBUF_NOINLINE void ExportedTableUpdateMessage::Clear() {
-// @@protoc_insertion_point(message_clear_start:io.deephaven.proto.backplane.grpc.ExportedTableUpdateMessage)
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  ::uint32_t cached_has_bits = 0;
-  // Prevent compiler warnings about cached_has_bits being unused
-  (void) cached_has_bits;
-
-  _impl_.update_failure_message_.ClearToEmpty();
-  cached_has_bits = _impl_._has_bits_[0];
-  if (cached_has_bits & 0x00000001u) {
-    ABSL_DCHECK(_impl_.export_id_ != nullptr);
-    _impl_.export_id_->Clear();
-  }
-  _impl_.size_ = ::int64_t{0};
-  _impl_._has_bits_.Clear();
-  _internal_metadata_.Clear<::google::protobuf::UnknownFieldSet>();
-}
-
-const char* ExportedTableUpdateMessage::_InternalParse(
-    const char* ptr, ::_pbi::ParseContext* ctx) {
-  ptr = ::_pbi::TcParser::ParseLoop(this, ptr, ctx, &_table_.header);
-  return ptr;
-}
-
-
-PROTOBUF_CONSTINIT PROTOBUF_ATTRIBUTE_INIT_PRIORITY1
-const ::_pbi::TcParseTable<2, 3, 1, 91, 2> ExportedTableUpdateMessage::_table_ = {
-  {
-    PROTOBUF_FIELD_OFFSET(ExportedTableUpdateMessage, _impl_._has_bits_),
-    0, // no _extensions_
-    3, 24,  // max_field_number, fast_idx_mask
-    offsetof(decltype(_table_), field_lookup_table),
-    4294967288,  // skipmap
-    offsetof(decltype(_table_), field_entries),
-    3,  // num_field_entries
-    1,  // num_aux_entries
-    offsetof(decltype(_table_), aux_entries),
-    &_ExportedTableUpdateMessage_default_instance_._instance,
-    ::_pbi::TcParser::GenericFallback,  // fallback
-  }, {{
-    {::_pbi::TcParser::MiniParse, {}},
-    // .io.deephaven.proto.backplane.grpc.Ticket export_id = 1;
-    {::_pbi::TcParser::FastMtS1,
-     {10, 0, 0, PROTOBUF_FIELD_OFFSET(ExportedTableUpdateMessage, _impl_.export_id_)}},
-    // sint64 size = 2 [jstype = JS_STRING];
-    {::_pbi::TcParser::FastZ64S1,
-     {16, 63, 0, PROTOBUF_FIELD_OFFSET(ExportedTableUpdateMessage, _impl_.size_)}},
-    // string update_failure_message = 3;
-    {::_pbi::TcParser::FastUS1,
-     {26, 63, 0, PROTOBUF_FIELD_OFFSET(ExportedTableUpdateMessage, _impl_.update_failure_message_)}},
-  }}, {{
-    65535, 65535
-  }}, {{
-    // .io.deephaven.proto.backplane.grpc.Ticket export_id = 1;
-    {PROTOBUF_FIELD_OFFSET(ExportedTableUpdateMessage, _impl_.export_id_), _Internal::kHasBitsOffset + 0, 0,
-    (0 | ::_fl::kFcOptional | ::_fl::kMessage | ::_fl::kTvTable)},
-    // sint64 size = 2 [jstype = JS_STRING];
-    {PROTOBUF_FIELD_OFFSET(ExportedTableUpdateMessage, _impl_.size_), -1, 0,
-    (0 | ::_fl::kFcSingular | ::_fl::kSInt64)},
-    // string update_failure_message = 3;
-    {PROTOBUF_FIELD_OFFSET(ExportedTableUpdateMessage, _impl_.update_failure_message_), -1, 0,
-    (0 | ::_fl::kFcSingular | ::_fl::kUtf8String | ::_fl::kRepAString)},
-  }}, {{
-    {::_pbi::TcParser::GetTable<::io::deephaven::proto::backplane::grpc::Ticket>()},
-  }}, {{
-    "\74\0\0\26\0\0\0\0"
-    "io.deephaven.proto.backplane.grpc.ExportedTableUpdateMessage"
-    "update_failure_message"
-  }},
-};
-
-::uint8_t* ExportedTableUpdateMessage::_InternalSerialize(
-    ::uint8_t* target,
-    ::google::protobuf::io::EpsCopyOutputStream* stream) const {
-  // @@protoc_insertion_point(serialize_to_array_start:io.deephaven.proto.backplane.grpc.ExportedTableUpdateMessage)
-  ::uint32_t cached_has_bits = 0;
-  (void)cached_has_bits;
-
-  cached_has_bits = _impl_._has_bits_[0];
-  // .io.deephaven.proto.backplane.grpc.Ticket export_id = 1;
-  if (cached_has_bits & 0x00000001u) {
-    target = ::google::protobuf::internal::WireFormatLite::InternalWriteMessage(
-        1, _Internal::export_id(this),
-        _Internal::export_id(this).GetCachedSize(), target, stream);
-  }
-
-  // sint64 size = 2 [jstype = JS_STRING];
-  if (this->_internal_size() != 0) {
-    target = stream->EnsureSpace(target);
-    target = ::_pbi::WireFormatLite::WriteSInt64ToArray(
-        2, this->_internal_size(), target);
-  }
-
-  // string update_failure_message = 3;
-  if (!this->_internal_update_failure_message().empty()) {
-    const std::string& _s = this->_internal_update_failure_message();
-    ::google::protobuf::internal::WireFormatLite::VerifyUtf8String(
-        _s.data(), static_cast<int>(_s.length()), ::google::protobuf::internal::WireFormatLite::SERIALIZE, "io.deephaven.proto.backplane.grpc.ExportedTableUpdateMessage.update_failure_message");
-    target = stream->WriteStringMaybeAliased(3, _s, target);
-  }
-
-  if (PROTOBUF_PREDICT_FALSE(_internal_metadata_.have_unknown_fields())) {
-    target =
-        ::_pbi::WireFormat::InternalSerializeUnknownFieldsToArray(
-            _internal_metadata_.unknown_fields<::google::protobuf::UnknownFieldSet>(::google::protobuf::UnknownFieldSet::default_instance), target, stream);
-  }
-  // @@protoc_insertion_point(serialize_to_array_end:io.deephaven.proto.backplane.grpc.ExportedTableUpdateMessage)
-  return target;
-}
-
-::size_t ExportedTableUpdateMessage::ByteSizeLong() const {
-// @@protoc_insertion_point(message_byte_size_start:io.deephaven.proto.backplane.grpc.ExportedTableUpdateMessage)
-  ::size_t total_size = 0;
-
-  ::uint32_t cached_has_bits = 0;
-  // Prevent compiler warnings about cached_has_bits being unused
-  (void) cached_has_bits;
-
-  // string update_failure_message = 3;
-  if (!this->_internal_update_failure_message().empty()) {
-    total_size += 1 + ::google::protobuf::internal::WireFormatLite::StringSize(
-                                    this->_internal_update_failure_message());
-  }
-
-  // .io.deephaven.proto.backplane.grpc.Ticket export_id = 1;
-  cached_has_bits = _impl_._has_bits_[0];
-  if (cached_has_bits & 0x00000001u) {
-    total_size +=
-        1 + ::google::protobuf::internal::WireFormatLite::MessageSize(*_impl_.export_id_);
-  }
-
-  // sint64 size = 2 [jstype = JS_STRING];
-  if (this->_internal_size() != 0) {
-    total_size += ::_pbi::WireFormatLite::SInt64SizePlusOne(
-        this->_internal_size());
-  }
-
-  return MaybeComputeUnknownFieldsSize(total_size, &_impl_._cached_size_);
-}
-
-const ::google::protobuf::Message::ClassData ExportedTableUpdateMessage::_class_data_ = {
-    ExportedTableUpdateMessage::MergeImpl,
-    nullptr,  // OnDemandRegisterArenaDtor
-};
-const ::google::protobuf::Message::ClassData* ExportedTableUpdateMessage::GetClassData() const {
-  return &_class_data_;
-}
-
-void ExportedTableUpdateMessage::MergeImpl(::google::protobuf::Message& to_msg, const ::google::protobuf::Message& from_msg) {
-  auto* const _this = static_cast<ExportedTableUpdateMessage*>(&to_msg);
-  auto& from = static_cast<const ExportedTableUpdateMessage&>(from_msg);
-  // @@protoc_insertion_point(class_specific_merge_from_start:io.deephaven.proto.backplane.grpc.ExportedTableUpdateMessage)
-  ABSL_DCHECK_NE(&from, _this);
-  ::uint32_t cached_has_bits = 0;
-  (void) cached_has_bits;
-
-  if (!from._internal_update_failure_message().empty()) {
-    _this->_internal_set_update_failure_message(from._internal_update_failure_message());
-  }
-  if ((from._impl_._has_bits_[0] & 0x00000001u) != 0) {
-    _this->_internal_mutable_export_id()->::io::deephaven::proto::backplane::grpc::Ticket::MergeFrom(
-        from._internal_export_id());
-  }
-  if (from._internal_size() != 0) {
-    _this->_internal_set_size(from._internal_size());
-  }
-  _this->_internal_metadata_.MergeFrom<::google::protobuf::UnknownFieldSet>(from._internal_metadata_);
-}
-
-void ExportedTableUpdateMessage::CopyFrom(const ExportedTableUpdateMessage& from) {
-// @@protoc_insertion_point(class_specific_copy_from_start:io.deephaven.proto.backplane.grpc.ExportedTableUpdateMessage)
-  if (&from == this) return;
-  Clear();
-  MergeFrom(from);
-}
-
-PROTOBUF_NOINLINE bool ExportedTableUpdateMessage::IsInitialized() const {
-  return true;
-}
-
-::_pbi::CachedSize* ExportedTableUpdateMessage::AccessCachedSize() const {
-  return &_impl_._cached_size_;
-}
-void ExportedTableUpdateMessage::InternalSwap(ExportedTableUpdateMessage* PROTOBUF_RESTRICT other) {
-  using std::swap;
-  auto* arena = GetArena();
-  ABSL_DCHECK_EQ(arena, other->GetArena());
-  _internal_metadata_.InternalSwap(&other->_internal_metadata_);
-  swap(_impl_._has_bits_[0], other->_impl_._has_bits_[0]);
-  ::_pbi::ArenaStringPtr::InternalSwap(&_impl_.update_failure_message_, &other->_impl_.update_failure_message_, arena);
-  ::google::protobuf::internal::memswap<
-      PROTOBUF_FIELD_OFFSET(ExportedTableUpdateMessage, _impl_.size_)
-      + sizeof(ExportedTableUpdateMessage::_impl_.size_)
-      - PROTOBUF_FIELD_OFFSET(ExportedTableUpdateMessage, _impl_.export_id_)>(
-          reinterpret_cast<char*>(&_impl_.export_id_),
-          reinterpret_cast<char*>(&other->_impl_.export_id_));
-}
-
-::google::protobuf::Metadata ExportedTableUpdateMessage::GetMetadata() const {
-  return ::_pbi::AssignDescriptors(
-      &descriptor_table_deephaven_2fproto_2ftable_2eproto_getter, &descriptor_table_deephaven_2fproto_2ftable_2eproto_once,
-      file_level_metadata_deephaven_2fproto_2ftable_2eproto[5]);
-}
-// ===================================================================
-
-class EmptyTableRequest::_Internal {
- public:
-  using HasBits = decltype(std::declval<EmptyTableRequest>()._impl_._has_bits_);
-  static constexpr ::int32_t kHasBitsOffset =
-    8 * PROTOBUF_FIELD_OFFSET(EmptyTableRequest, _impl_._has_bits_);
-  static const ::io::deephaven::proto::backplane::grpc::Ticket& result_id(const EmptyTableRequest* msg);
-  static void set_has_result_id(HasBits* has_bits) {
-    (*has_bits)[0] |= 1u;
-  }
-};
-
-const ::io::deephaven::proto::backplane::grpc::Ticket& EmptyTableRequest::_Internal::result_id(const EmptyTableRequest* msg) {
-  return *msg->_impl_.result_id_;
-}
-void EmptyTableRequest::clear_result_id() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  if (_impl_.result_id_ != nullptr) _impl_.result_id_->Clear();
-  _impl_._has_bits_[0] &= ~0x00000001u;
-}
-EmptyTableRequest::EmptyTableRequest(::google::protobuf::Arena* arena)
-    : ::google::protobuf::Message(arena) {
-  SharedCtor(arena);
-  // @@protoc_insertion_point(arena_constructor:io.deephaven.proto.backplane.grpc.EmptyTableRequest)
-}
-inline PROTOBUF_NDEBUG_INLINE EmptyTableRequest::Impl_::Impl_(
-    ::google::protobuf::internal::InternalVisibility visibility, ::google::protobuf::Arena* arena,
-    const Impl_& from)
-      : _has_bits_{from._has_bits_},
-        _cached_size_{0} {}
-
-EmptyTableRequest::EmptyTableRequest(
-    ::google::protobuf::Arena* arena,
-    const EmptyTableRequest& from)
-    : ::google::protobuf::Message(arena) {
-  EmptyTableRequest* const _this = this;
-  (void)_this;
-  _internal_metadata_.MergeFrom<::google::protobuf::UnknownFieldSet>(
-      from._internal_metadata_);
-  new (&_impl_) Impl_(internal_visibility(), arena, from._impl_);
-  ::uint32_t cached_has_bits = _impl_._has_bits_[0];
-  _impl_.result_id_ = (cached_has_bits & 0x00000001u)
-                ? CreateMaybeMessage<::io::deephaven::proto::backplane::grpc::Ticket>(arena, *from._impl_.result_id_)
-                : nullptr;
-  _impl_.size_ = from._impl_.size_;
-
-  // @@protoc_insertion_point(copy_constructor:io.deephaven.proto.backplane.grpc.EmptyTableRequest)
-}
-inline PROTOBUF_NDEBUG_INLINE EmptyTableRequest::Impl_::Impl_(
-    ::google::protobuf::internal::InternalVisibility visibility,
-    ::google::protobuf::Arena* arena)
-      : _cached_size_{0} {}
-
-inline void EmptyTableRequest::SharedCtor(::_pb::Arena* arena) {
-  new (&_impl_) Impl_(internal_visibility(), arena);
-  ::memset(reinterpret_cast<char *>(&_impl_) +
-               offsetof(Impl_, result_id_),
-           0,
-           offsetof(Impl_, size_) -
-               offsetof(Impl_, result_id_) +
-               sizeof(Impl_::size_));
-}
-EmptyTableRequest::~EmptyTableRequest() {
-  // @@protoc_insertion_point(destructor:io.deephaven.proto.backplane.grpc.EmptyTableRequest)
-  _internal_metadata_.Delete<::google::protobuf::UnknownFieldSet>();
-  SharedDtor();
-}
-inline void EmptyTableRequest::SharedDtor() {
-  ABSL_DCHECK(GetArena() == nullptr);
-  delete _impl_.result_id_;
-  _impl_.~Impl_();
-}
-
-PROTOBUF_NOINLINE void EmptyTableRequest::Clear() {
-// @@protoc_insertion_point(message_clear_start:io.deephaven.proto.backplane.grpc.EmptyTableRequest)
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  ::uint32_t cached_has_bits = 0;
-  // Prevent compiler warnings about cached_has_bits being unused
-  (void) cached_has_bits;
-
-  cached_has_bits = _impl_._has_bits_[0];
-  if (cached_has_bits & 0x00000001u) {
-    ABSL_DCHECK(_impl_.result_id_ != nullptr);
-    _impl_.result_id_->Clear();
-  }
-  _impl_.size_ = ::int64_t{0};
-  _impl_._has_bits_.Clear();
-  _internal_metadata_.Clear<::google::protobuf::UnknownFieldSet>();
-}
-
-const char* EmptyTableRequest::_InternalParse(
-    const char* ptr, ::_pbi::ParseContext* ctx) {
-  ptr = ::_pbi::TcParser::ParseLoop(this, ptr, ctx, &_table_.header);
-  return ptr;
-}
-
-
-PROTOBUF_CONSTINIT PROTOBUF_ATTRIBUTE_INIT_PRIORITY1
-const ::_pbi::TcParseTable<1, 2, 1, 0, 2> EmptyTableRequest::_table_ = {
-  {
-    PROTOBUF_FIELD_OFFSET(EmptyTableRequest, _impl_._has_bits_),
-    0, // no _extensions_
-    2, 8,  // max_field_number, fast_idx_mask
-    offsetof(decltype(_table_), field_lookup_table),
-    4294967292,  // skipmap
-    offsetof(decltype(_table_), field_entries),
-    2,  // num_field_entries
-    1,  // num_aux_entries
-    offsetof(decltype(_table_), aux_entries),
-    &_EmptyTableRequest_default_instance_._instance,
-    ::_pbi::TcParser::GenericFallback,  // fallback
-  }, {{
-    // sint64 size = 2 [jstype = JS_STRING];
-    {::_pbi::TcParser::FastZ64S1,
-     {16, 63, 0, PROTOBUF_FIELD_OFFSET(EmptyTableRequest, _impl_.size_)}},
-    // .io.deephaven.proto.backplane.grpc.Ticket result_id = 1;
-    {::_pbi::TcParser::FastMtS1,
-     {10, 0, 0, PROTOBUF_FIELD_OFFSET(EmptyTableRequest, _impl_.result_id_)}},
-  }}, {{
-    65535, 65535
-  }}, {{
-    // .io.deephaven.proto.backplane.grpc.Ticket result_id = 1;
-    {PROTOBUF_FIELD_OFFSET(EmptyTableRequest, _impl_.result_id_), _Internal::kHasBitsOffset + 0, 0,
-    (0 | ::_fl::kFcOptional | ::_fl::kMessage | ::_fl::kTvTable)},
-    // sint64 size = 2 [jstype = JS_STRING];
-    {PROTOBUF_FIELD_OFFSET(EmptyTableRequest, _impl_.size_), -1, 0,
-    (0 | ::_fl::kFcSingular | ::_fl::kSInt64)},
-  }}, {{
-    {::_pbi::TcParser::GetTable<::io::deephaven::proto::backplane::grpc::Ticket>()},
-  }}, {{
-  }},
-};
-
-::uint8_t* EmptyTableRequest::_InternalSerialize(
-    ::uint8_t* target,
-    ::google::protobuf::io::EpsCopyOutputStream* stream) const {
-  // @@protoc_insertion_point(serialize_to_array_start:io.deephaven.proto.backplane.grpc.EmptyTableRequest)
-  ::uint32_t cached_has_bits = 0;
-  (void)cached_has_bits;
-
-  cached_has_bits = _impl_._has_bits_[0];
-  // .io.deephaven.proto.backplane.grpc.Ticket result_id = 1;
-  if (cached_has_bits & 0x00000001u) {
-    target = ::google::protobuf::internal::WireFormatLite::InternalWriteMessage(
-        1, _Internal::result_id(this),
-        _Internal::result_id(this).GetCachedSize(), target, stream);
-  }
-
-  // sint64 size = 2 [jstype = JS_STRING];
-  if (this->_internal_size() != 0) {
-    target = stream->EnsureSpace(target);
-    target = ::_pbi::WireFormatLite::WriteSInt64ToArray(
-        2, this->_internal_size(), target);
-  }
-
-  if (PROTOBUF_PREDICT_FALSE(_internal_metadata_.have_unknown_fields())) {
-    target =
-        ::_pbi::WireFormat::InternalSerializeUnknownFieldsToArray(
-            _internal_metadata_.unknown_fields<::google::protobuf::UnknownFieldSet>(::google::protobuf::UnknownFieldSet::default_instance), target, stream);
-  }
-  // @@protoc_insertion_point(serialize_to_array_end:io.deephaven.proto.backplane.grpc.EmptyTableRequest)
-  return target;
-}
-
-::size_t EmptyTableRequest::ByteSizeLong() const {
-// @@protoc_insertion_point(message_byte_size_start:io.deephaven.proto.backplane.grpc.EmptyTableRequest)
-  ::size_t total_size = 0;
-
-  ::uint32_t cached_has_bits = 0;
-  // Prevent compiler warnings about cached_has_bits being unused
-  (void) cached_has_bits;
-
-  // .io.deephaven.proto.backplane.grpc.Ticket result_id = 1;
-  cached_has_bits = _impl_._has_bits_[0];
-  if (cached_has_bits & 0x00000001u) {
-    total_size +=
-        1 + ::google::protobuf::internal::WireFormatLite::MessageSize(*_impl_.result_id_);
-  }
-
-  // sint64 size = 2 [jstype = JS_STRING];
-  if (this->_internal_size() != 0) {
-    total_size += ::_pbi::WireFormatLite::SInt64SizePlusOne(
-        this->_internal_size());
-  }
-
-  return MaybeComputeUnknownFieldsSize(total_size, &_impl_._cached_size_);
-}
-
-const ::google::protobuf::Message::ClassData EmptyTableRequest::_class_data_ = {
-    EmptyTableRequest::MergeImpl,
-    nullptr,  // OnDemandRegisterArenaDtor
-};
-const ::google::protobuf::Message::ClassData* EmptyTableRequest::GetClassData() const {
-  return &_class_data_;
-}
-
-void EmptyTableRequest::MergeImpl(::google::protobuf::Message& to_msg, const ::google::protobuf::Message& from_msg) {
-  auto* const _this = static_cast<EmptyTableRequest*>(&to_msg);
-  auto& from = static_cast<const EmptyTableRequest&>(from_msg);
-  // @@protoc_insertion_point(class_specific_merge_from_start:io.deephaven.proto.backplane.grpc.EmptyTableRequest)
-  ABSL_DCHECK_NE(&from, _this);
-  ::uint32_t cached_has_bits = 0;
-  (void) cached_has_bits;
-
-  if ((from._impl_._has_bits_[0] & 0x00000001u) != 0) {
-    _this->_internal_mutable_result_id()->::io::deephaven::proto::backplane::grpc::Ticket::MergeFrom(
-        from._internal_result_id());
-  }
-  if (from._internal_size() != 0) {
-    _this->_internal_set_size(from._internal_size());
-  }
-  _this->_internal_metadata_.MergeFrom<::google::protobuf::UnknownFieldSet>(from._internal_metadata_);
-}
-
-void EmptyTableRequest::CopyFrom(const EmptyTableRequest& from) {
-// @@protoc_insertion_point(class_specific_copy_from_start:io.deephaven.proto.backplane.grpc.EmptyTableRequest)
-  if (&from == this) return;
-  Clear();
-  MergeFrom(from);
-}
-
-PROTOBUF_NOINLINE bool EmptyTableRequest::IsInitialized() const {
-  return true;
-}
-
-::_pbi::CachedSize* EmptyTableRequest::AccessCachedSize() const {
-  return &_impl_._cached_size_;
-}
-void EmptyTableRequest::InternalSwap(EmptyTableRequest* PROTOBUF_RESTRICT other) {
-  using std::swap;
-  _internal_metadata_.InternalSwap(&other->_internal_metadata_);
-  swap(_impl_._has_bits_[0], other->_impl_._has_bits_[0]);
-  ::google::protobuf::internal::memswap<
-      PROTOBUF_FIELD_OFFSET(EmptyTableRequest, _impl_.size_)
-      + sizeof(EmptyTableRequest::_impl_.size_)
-      - PROTOBUF_FIELD_OFFSET(EmptyTableRequest, _impl_.result_id_)>(
-          reinterpret_cast<char*>(&_impl_.result_id_),
-          reinterpret_cast<char*>(&other->_impl_.result_id_));
-}
-
-::google::protobuf::Metadata EmptyTableRequest::GetMetadata() const {
-  return ::_pbi::AssignDescriptors(
-      &descriptor_table_deephaven_2fproto_2ftable_2eproto_getter, &descriptor_table_deephaven_2fproto_2ftable_2eproto_once,
-      file_level_metadata_deephaven_2fproto_2ftable_2eproto[6]);
-}
-// ===================================================================
-
-class TimeTableRequest::_Internal {
- public:
-  using HasBits = decltype(std::declval<TimeTableRequest>()._impl_._has_bits_);
-  static constexpr ::int32_t kHasBitsOffset =
-    8 * PROTOBUF_FIELD_OFFSET(TimeTableRequest, _impl_._has_bits_);
-  static constexpr ::int32_t kOneofCaseOffset =
-    PROTOBUF_FIELD_OFFSET(::io::deephaven::proto::backplane::grpc::TimeTableRequest, _impl_._oneof_case_);
-  static const ::io::deephaven::proto::backplane::grpc::Ticket& result_id(const TimeTableRequest* msg);
-  static void set_has_result_id(HasBits* has_bits) {
-    (*has_bits)[0] |= 1u;
-  }
-};
-
-const ::io::deephaven::proto::backplane::grpc::Ticket& TimeTableRequest::_Internal::result_id(const TimeTableRequest* msg) {
-  return *msg->_impl_.result_id_;
-}
-void TimeTableRequest::clear_result_id() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  if (_impl_.result_id_ != nullptr) _impl_.result_id_->Clear();
-  _impl_._has_bits_[0] &= ~0x00000001u;
-}
-TimeTableRequest::TimeTableRequest(::google::protobuf::Arena* arena)
-    : ::google::protobuf::Message(arena) {
-  SharedCtor(arena);
-  // @@protoc_insertion_point(arena_constructor:io.deephaven.proto.backplane.grpc.TimeTableRequest)
-}
-inline PROTOBUF_NDEBUG_INLINE TimeTableRequest::Impl_::Impl_(
-    ::google::protobuf::internal::InternalVisibility visibility, ::google::protobuf::Arena* arena,
-    const Impl_& from)
-      : _has_bits_{from._has_bits_},
-        _cached_size_{0},
-        start_time_{},
-        period_{},
-        _oneof_case_{from._oneof_case_[0], from._oneof_case_[1]} {}
-
-TimeTableRequest::TimeTableRequest(
-    ::google::protobuf::Arena* arena,
-    const TimeTableRequest& from)
-    : ::google::protobuf::Message(arena) {
-  TimeTableRequest* const _this = this;
-  (void)_this;
-  _internal_metadata_.MergeFrom<::google::protobuf::UnknownFieldSet>(
-      from._internal_metadata_);
-  new (&_impl_) Impl_(internal_visibility(), arena, from._impl_);
-  ::uint32_t cached_has_bits = _impl_._has_bits_[0];
-  _impl_.result_id_ = (cached_has_bits & 0x00000001u)
-                ? CreateMaybeMessage<::io::deephaven::proto::backplane::grpc::Ticket>(arena, *from._impl_.result_id_)
-                : nullptr;
-  _impl_.blink_table_ = from._impl_.blink_table_;
-  switch (start_time_case()) {
-    case START_TIME_NOT_SET:
-      break;
-      case kStartTimeNanos:
-        _impl_.start_time_.start_time_nanos_ = from._impl_.start_time_.start_time_nanos_;
-        break;
-      case kStartTimeString:
-        new (&_impl_.start_time_.start_time_string_) decltype(_impl_.start_time_.start_time_string_){arena, from._impl_.start_time_.start_time_string_};
-        break;
-  }
-  switch (period_case()) {
-    case PERIOD_NOT_SET:
-      break;
-      case kPeriodNanos:
-        _impl_.period_.period_nanos_ = from._impl_.period_.period_nanos_;
-        break;
-      case kPeriodString:
-        new (&_impl_.period_.period_string_) decltype(_impl_.period_.period_string_){arena, from._impl_.period_.period_string_};
-        break;
-  }
-
-  // @@protoc_insertion_point(copy_constructor:io.deephaven.proto.backplane.grpc.TimeTableRequest)
-}
-inline PROTOBUF_NDEBUG_INLINE TimeTableRequest::Impl_::Impl_(
-    ::google::protobuf::internal::InternalVisibility visibility,
-    ::google::protobuf::Arena* arena)
-      : _cached_size_{0},
-        start_time_{},
-        period_{},
-        _oneof_case_{} {}
-
-inline void TimeTableRequest::SharedCtor(::_pb::Arena* arena) {
-  new (&_impl_) Impl_(internal_visibility(), arena);
-  ::memset(reinterpret_cast<char *>(&_impl_) +
-               offsetof(Impl_, result_id_),
-           0,
-           offsetof(Impl_, blink_table_) -
-               offsetof(Impl_, result_id_) +
-               sizeof(Impl_::blink_table_));
-}
-TimeTableRequest::~TimeTableRequest() {
-  // @@protoc_insertion_point(destructor:io.deephaven.proto.backplane.grpc.TimeTableRequest)
-  _internal_metadata_.Delete<::google::protobuf::UnknownFieldSet>();
-  SharedDtor();
-}
-inline void TimeTableRequest::SharedDtor() {
-  ABSL_DCHECK(GetArena() == nullptr);
-  delete _impl_.result_id_;
-  if (has_start_time()) {
-    clear_start_time();
-  }
-  if (has_period()) {
-    clear_period();
-  }
-  _impl_.~Impl_();
-}
-
-void TimeTableRequest::clear_start_time() {
-// @@protoc_insertion_point(one_of_clear_start:io.deephaven.proto.backplane.grpc.TimeTableRequest)
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  switch (start_time_case()) {
-    case kStartTimeNanos: {
-      // No need to clear
-      break;
-    }
-    case kStartTimeString: {
-      _impl_.start_time_.start_time_string_.Destroy();
-      break;
-    }
-    case START_TIME_NOT_SET: {
-      break;
-    }
-  }
-  _impl_._oneof_case_[0] = START_TIME_NOT_SET;
-}
-
-void TimeTableRequest::clear_period() {
-// @@protoc_insertion_point(one_of_clear_start:io.deephaven.proto.backplane.grpc.TimeTableRequest)
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  switch (period_case()) {
-    case kPeriodNanos: {
-      // No need to clear
-      break;
-    }
-    case kPeriodString: {
-      _impl_.period_.period_string_.Destroy();
-      break;
-    }
-    case PERIOD_NOT_SET: {
-      break;
-    }
-  }
-  _impl_._oneof_case_[1] = PERIOD_NOT_SET;
-}
-
-
-PROTOBUF_NOINLINE void TimeTableRequest::Clear() {
-// @@protoc_insertion_point(message_clear_start:io.deephaven.proto.backplane.grpc.TimeTableRequest)
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  ::uint32_t cached_has_bits = 0;
-  // Prevent compiler warnings about cached_has_bits being unused
-  (void) cached_has_bits;
-
-  cached_has_bits = _impl_._has_bits_[0];
-  if (cached_has_bits & 0x00000001u) {
-    ABSL_DCHECK(_impl_.result_id_ != nullptr);
-    _impl_.result_id_->Clear();
-  }
-  _impl_.blink_table_ = false;
-  clear_start_time();
-  clear_period();
-  _impl_._has_bits_.Clear();
-  _internal_metadata_.Clear<::google::protobuf::UnknownFieldSet>();
-}
-
-const char* TimeTableRequest::_InternalParse(
-    const char* ptr, ::_pbi::ParseContext* ctx) {
-  ptr = ::_pbi::TcParser::ParseLoop(this, ptr, ctx, &_table_.header);
-  return ptr;
-}
-
-
-PROTOBUF_CONSTINIT PROTOBUF_ATTRIBUTE_INIT_PRIORITY1
-const ::_pbi::TcParseTable<1, 6, 1, 89, 2> TimeTableRequest::_table_ = {
-  {
-    PROTOBUF_FIELD_OFFSET(TimeTableRequest, _impl_._has_bits_),
-    0, // no _extensions_
-    6, 8,  // max_field_number, fast_idx_mask
-    offsetof(decltype(_table_), field_lookup_table),
-    4294967232,  // skipmap
-    offsetof(decltype(_table_), field_entries),
-    6,  // num_field_entries
-    1,  // num_aux_entries
-    offsetof(decltype(_table_), aux_entries),
-    &_TimeTableRequest_default_instance_._instance,
-    ::_pbi::TcParser::GenericFallback,  // fallback
-  }, {{
-    // bool blink_table = 4;
-    {::_pbi::TcParser::SingularVarintNoZag1<bool, offsetof(TimeTableRequest, _impl_.blink_table_), 63>(),
-     {32, 63, 0, PROTOBUF_FIELD_OFFSET(TimeTableRequest, _impl_.blink_table_)}},
-    // .io.deephaven.proto.backplane.grpc.Ticket result_id = 1;
-    {::_pbi::TcParser::FastMtS1,
-     {10, 0, 0, PROTOBUF_FIELD_OFFSET(TimeTableRequest, _impl_.result_id_)}},
-  }}, {{
-    65535, 65535
-  }}, {{
-    // .io.deephaven.proto.backplane.grpc.Ticket result_id = 1;
-    {PROTOBUF_FIELD_OFFSET(TimeTableRequest, _impl_.result_id_), _Internal::kHasBitsOffset + 0, 0,
-    (0 | ::_fl::kFcOptional | ::_fl::kMessage | ::_fl::kTvTable)},
-    // sint64 start_time_nanos = 2 [jstype = JS_STRING];
-    {PROTOBUF_FIELD_OFFSET(TimeTableRequest, _impl_.start_time_.start_time_nanos_), _Internal::kOneofCaseOffset + 0, 0,
-    (0 | ::_fl::kFcOneof | ::_fl::kSInt64)},
-    // sint64 period_nanos = 3 [jstype = JS_STRING];
-    {PROTOBUF_FIELD_OFFSET(TimeTableRequest, _impl_.period_.period_nanos_), _Internal::kOneofCaseOffset + 4, 0,
-    (0 | ::_fl::kFcOneof | ::_fl::kSInt64)},
-    // bool blink_table = 4;
-    {PROTOBUF_FIELD_OFFSET(TimeTableRequest, _impl_.blink_table_), -1, 0,
-    (0 | ::_fl::kFcSingular | ::_fl::kBool)},
-    // string start_time_string = 5;
-    {PROTOBUF_FIELD_OFFSET(TimeTableRequest, _impl_.start_time_.start_time_string_), _Internal::kOneofCaseOffset + 0, 0,
-    (0 | ::_fl::kFcOneof | ::_fl::kUtf8String | ::_fl::kRepAString)},
-    // string period_string = 6;
-    {PROTOBUF_FIELD_OFFSET(TimeTableRequest, _impl_.period_.period_string_), _Internal::kOneofCaseOffset + 4, 0,
-    (0 | ::_fl::kFcOneof | ::_fl::kUtf8String | ::_fl::kRepAString)},
-  }}, {{
-    {::_pbi::TcParser::GetTable<::io::deephaven::proto::backplane::grpc::Ticket>()},
-  }}, {{
-    "\62\0\0\0\0\21\15\0"
-    "io.deephaven.proto.backplane.grpc.TimeTableRequest"
-    "start_time_string"
-    "period_string"
-  }},
-};
-
-::uint8_t* TimeTableRequest::_InternalSerialize(
-    ::uint8_t* target,
-    ::google::protobuf::io::EpsCopyOutputStream* stream) const {
-  // @@protoc_insertion_point(serialize_to_array_start:io.deephaven.proto.backplane.grpc.TimeTableRequest)
-  ::uint32_t cached_has_bits = 0;
-  (void)cached_has_bits;
-
-  cached_has_bits = _impl_._has_bits_[0];
-  // .io.deephaven.proto.backplane.grpc.Ticket result_id = 1;
-  if (cached_has_bits & 0x00000001u) {
-    target = ::google::protobuf::internal::WireFormatLite::InternalWriteMessage(
-        1, _Internal::result_id(this),
-        _Internal::result_id(this).GetCachedSize(), target, stream);
-  }
-
-  // sint64 start_time_nanos = 2 [jstype = JS_STRING];
-  if (start_time_case() == kStartTimeNanos) {
-    target = stream->EnsureSpace(target);
-    target = ::_pbi::WireFormatLite::WriteSInt64ToArray(
-        2, this->_internal_start_time_nanos(), target);
-  }
-
-  // sint64 period_nanos = 3 [jstype = JS_STRING];
-  if (period_case() == kPeriodNanos) {
-    target = stream->EnsureSpace(target);
-    target = ::_pbi::WireFormatLite::WriteSInt64ToArray(
-        3, this->_internal_period_nanos(), target);
-  }
-
-  // bool blink_table = 4;
-  if (this->_internal_blink_table() != 0) {
-    target = stream->EnsureSpace(target);
-    target = ::_pbi::WireFormatLite::WriteBoolToArray(
-        4, this->_internal_blink_table(), target);
-  }
-
-  // string start_time_string = 5;
-  if (start_time_case() == kStartTimeString) {
-    const std::string& _s = this->_internal_start_time_string();
-    ::google::protobuf::internal::WireFormatLite::VerifyUtf8String(
-        _s.data(), static_cast<int>(_s.length()), ::google::protobuf::internal::WireFormatLite::SERIALIZE, "io.deephaven.proto.backplane.grpc.TimeTableRequest.start_time_string");
-    target = stream->WriteStringMaybeAliased(5, _s, target);
-  }
-
-  // string period_string = 6;
-  if (period_case() == kPeriodString) {
-    const std::string& _s = this->_internal_period_string();
-    ::google::protobuf::internal::WireFormatLite::VerifyUtf8String(
-        _s.data(), static_cast<int>(_s.length()), ::google::protobuf::internal::WireFormatLite::SERIALIZE, "io.deephaven.proto.backplane.grpc.TimeTableRequest.period_string");
-    target = stream->WriteStringMaybeAliased(6, _s, target);
-  }
-
-  if (PROTOBUF_PREDICT_FALSE(_internal_metadata_.have_unknown_fields())) {
-    target =
-        ::_pbi::WireFormat::InternalSerializeUnknownFieldsToArray(
-            _internal_metadata_.unknown_fields<::google::protobuf::UnknownFieldSet>(::google::protobuf::UnknownFieldSet::default_instance), target, stream);
-  }
-  // @@protoc_insertion_point(serialize_to_array_end:io.deephaven.proto.backplane.grpc.TimeTableRequest)
-  return target;
-}
-
-::size_t TimeTableRequest::ByteSizeLong() const {
-// @@protoc_insertion_point(message_byte_size_start:io.deephaven.proto.backplane.grpc.TimeTableRequest)
-  ::size_t total_size = 0;
-
-  ::uint32_t cached_has_bits = 0;
-  // Prevent compiler warnings about cached_has_bits being unused
-  (void) cached_has_bits;
-
-  // .io.deephaven.proto.backplane.grpc.Ticket result_id = 1;
-  cached_has_bits = _impl_._has_bits_[0];
-  if (cached_has_bits & 0x00000001u) {
-    total_size +=
-        1 + ::google::protobuf::internal::WireFormatLite::MessageSize(*_impl_.result_id_);
-  }
-
-  // bool blink_table = 4;
-  if (this->_internal_blink_table() != 0) {
-    total_size += 2;
-  }
-
-  switch (start_time_case()) {
-    // sint64 start_time_nanos = 2 [jstype = JS_STRING];
-    case kStartTimeNanos: {
-      total_size += ::_pbi::WireFormatLite::SInt64SizePlusOne(
-          this->_internal_start_time_nanos());
-      break;
-    }
-    // string start_time_string = 5;
-    case kStartTimeString: {
-      total_size += 1 + ::google::protobuf::internal::WireFormatLite::StringSize(
-                                      this->_internal_start_time_string());
-      break;
-    }
-    case START_TIME_NOT_SET: {
-      break;
-    }
-  }
-  switch (period_case()) {
-    // sint64 period_nanos = 3 [jstype = JS_STRING];
-    case kPeriodNanos: {
-      total_size += ::_pbi::WireFormatLite::SInt64SizePlusOne(
-          this->_internal_period_nanos());
-      break;
-    }
-    // string period_string = 6;
-    case kPeriodString: {
-      total_size += 1 + ::google::protobuf::internal::WireFormatLite::StringSize(
-                                      this->_internal_period_string());
-      break;
-    }
-    case PERIOD_NOT_SET: {
-      break;
-    }
-  }
-  return MaybeComputeUnknownFieldsSize(total_size, &_impl_._cached_size_);
-}
-
-const ::google::protobuf::Message::ClassData TimeTableRequest::_class_data_ = {
-    TimeTableRequest::MergeImpl,
-    nullptr,  // OnDemandRegisterArenaDtor
-};
-const ::google::protobuf::Message::ClassData* TimeTableRequest::GetClassData() const {
-  return &_class_data_;
-}
-
-void TimeTableRequest::MergeImpl(::google::protobuf::Message& to_msg, const ::google::protobuf::Message& from_msg) {
-  auto* const _this = static_cast<TimeTableRequest*>(&to_msg);
-  auto& from = static_cast<const TimeTableRequest&>(from_msg);
-  // @@protoc_insertion_point(class_specific_merge_from_start:io.deephaven.proto.backplane.grpc.TimeTableRequest)
-  ABSL_DCHECK_NE(&from, _this);
-  ::uint32_t cached_has_bits = 0;
-  (void) cached_has_bits;
-
-  if ((from._impl_._has_bits_[0] & 0x00000001u) != 0) {
-    _this->_internal_mutable_result_id()->::io::deephaven::proto::backplane::grpc::Ticket::MergeFrom(
-        from._internal_result_id());
-  }
-  if (from._internal_blink_table() != 0) {
-    _this->_internal_set_blink_table(from._internal_blink_table());
-  }
-  switch (from.start_time_case()) {
-    case kStartTimeNanos: {
-      _this->_internal_set_start_time_nanos(from._internal_start_time_nanos());
-      break;
-    }
-    case kStartTimeString: {
-      _this->_internal_set_start_time_string(from._internal_start_time_string());
-      break;
-    }
-    case START_TIME_NOT_SET: {
-      break;
-    }
-  }
-  switch (from.period_case()) {
-    case kPeriodNanos: {
-      _this->_internal_set_period_nanos(from._internal_period_nanos());
-      break;
-    }
-    case kPeriodString: {
-      _this->_internal_set_period_string(from._internal_period_string());
-      break;
-    }
-    case PERIOD_NOT_SET: {
-      break;
-    }
-  }
-  _this->_internal_metadata_.MergeFrom<::google::protobuf::UnknownFieldSet>(from._internal_metadata_);
-}
-
-void TimeTableRequest::CopyFrom(const TimeTableRequest& from) {
-// @@protoc_insertion_point(class_specific_copy_from_start:io.deephaven.proto.backplane.grpc.TimeTableRequest)
-  if (&from == this) return;
-  Clear();
-  MergeFrom(from);
-}
-
-PROTOBUF_NOINLINE bool TimeTableRequest::IsInitialized() const {
-  return true;
-}
-
-::_pbi::CachedSize* TimeTableRequest::AccessCachedSize() const {
-  return &_impl_._cached_size_;
-}
-void TimeTableRequest::InternalSwap(TimeTableRequest* PROTOBUF_RESTRICT other) {
-  using std::swap;
-  _internal_metadata_.InternalSwap(&other->_internal_metadata_);
-  swap(_impl_._has_bits_[0], other->_impl_._has_bits_[0]);
-  ::google::protobuf::internal::memswap<
-      PROTOBUF_FIELD_OFFSET(TimeTableRequest, _impl_.blink_table_)
-      + sizeof(TimeTableRequest::_impl_.blink_table_)
-      - PROTOBUF_FIELD_OFFSET(TimeTableRequest, _impl_.result_id_)>(
-          reinterpret_cast<char*>(&_impl_.result_id_),
-          reinterpret_cast<char*>(&other->_impl_.result_id_));
-  swap(_impl_.start_time_, other->_impl_.start_time_);
-  swap(_impl_.period_, other->_impl_.period_);
-  swap(_impl_._oneof_case_[0], other->_impl_._oneof_case_[0]);
-  swap(_impl_._oneof_case_[1], other->_impl_._oneof_case_[1]);
-}
-
-::google::protobuf::Metadata TimeTableRequest::GetMetadata() const {
-  return ::_pbi::AssignDescriptors(
-      &descriptor_table_deephaven_2fproto_2ftable_2eproto_getter, &descriptor_table_deephaven_2fproto_2ftable_2eproto_once,
-      file_level_metadata_deephaven_2fproto_2ftable_2eproto[7]);
-}
-// ===================================================================
-
-class SelectOrUpdateRequest::_Internal {
- public:
-  using HasBits = decltype(std::declval<SelectOrUpdateRequest>()._impl_._has_bits_);
-  static constexpr ::int32_t kHasBitsOffset =
-    8 * PROTOBUF_FIELD_OFFSET(SelectOrUpdateRequest, _impl_._has_bits_);
-  static const ::io::deephaven::proto::backplane::grpc::Ticket& result_id(const SelectOrUpdateRequest* msg);
-  static void set_has_result_id(HasBits* has_bits) {
-    (*has_bits)[0] |= 1u;
-  }
-  static const ::io::deephaven::proto::backplane::grpc::TableReference& source_id(const SelectOrUpdateRequest* msg);
-  static void set_has_source_id(HasBits* has_bits) {
-    (*has_bits)[0] |= 2u;
-  }
-};
-
-const ::io::deephaven::proto::backplane::grpc::Ticket& SelectOrUpdateRequest::_Internal::result_id(const SelectOrUpdateRequest* msg) {
-  return *msg->_impl_.result_id_;
-}
-const ::io::deephaven::proto::backplane::grpc::TableReference& SelectOrUpdateRequest::_Internal::source_id(const SelectOrUpdateRequest* msg) {
-  return *msg->_impl_.source_id_;
-}
-void SelectOrUpdateRequest::clear_result_id() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  if (_impl_.result_id_ != nullptr) _impl_.result_id_->Clear();
-  _impl_._has_bits_[0] &= ~0x00000001u;
-}
-SelectOrUpdateRequest::SelectOrUpdateRequest(::google::protobuf::Arena* arena)
-    : ::google::protobuf::Message(arena) {
-  SharedCtor(arena);
-  // @@protoc_insertion_point(arena_constructor:io.deephaven.proto.backplane.grpc.SelectOrUpdateRequest)
-}
-inline PROTOBUF_NDEBUG_INLINE SelectOrUpdateRequest::Impl_::Impl_(
-    ::google::protobuf::internal::InternalVisibility visibility, ::google::protobuf::Arena* arena,
-    const Impl_& from)
-      : _has_bits_{from._has_bits_},
-        _cached_size_{0},
-        column_specs_{visibility, arena, from.column_specs_} {}
-
-SelectOrUpdateRequest::SelectOrUpdateRequest(
-    ::google::protobuf::Arena* arena,
-    const SelectOrUpdateRequest& from)
-    : ::google::protobuf::Message(arena) {
-  SelectOrUpdateRequest* const _this = this;
-  (void)_this;
-  _internal_metadata_.MergeFrom<::google::protobuf::UnknownFieldSet>(
-      from._internal_metadata_);
-  new (&_impl_) Impl_(internal_visibility(), arena, from._impl_);
-  ::uint32_t cached_has_bits = _impl_._has_bits_[0];
-  _impl_.result_id_ = (cached_has_bits & 0x00000001u)
-                ? CreateMaybeMessage<::io::deephaven::proto::backplane::grpc::Ticket>(arena, *from._impl_.result_id_)
-                : nullptr;
-  _impl_.source_id_ = (cached_has_bits & 0x00000002u)
-                ? CreateMaybeMessage<::io::deephaven::proto::backplane::grpc::TableReference>(arena, *from._impl_.source_id_)
-                : nullptr;
-
-  // @@protoc_insertion_point(copy_constructor:io.deephaven.proto.backplane.grpc.SelectOrUpdateRequest)
-}
-inline PROTOBUF_NDEBUG_INLINE SelectOrUpdateRequest::Impl_::Impl_(
-    ::google::protobuf::internal::InternalVisibility visibility,
-    ::google::protobuf::Arena* arena)
-      : _cached_size_{0},
-        column_specs_{visibility, arena} {}
-
-inline void SelectOrUpdateRequest::SharedCtor(::_pb::Arena* arena) {
-  new (&_impl_) Impl_(internal_visibility(), arena);
-  ::memset(reinterpret_cast<char *>(&_impl_) +
-               offsetof(Impl_, result_id_),
-           0,
-           offsetof(Impl_, source_id_) -
-               offsetof(Impl_, result_id_) +
-               sizeof(Impl_::source_id_));
-}
-SelectOrUpdateRequest::~SelectOrUpdateRequest() {
-  // @@protoc_insertion_point(destructor:io.deephaven.proto.backplane.grpc.SelectOrUpdateRequest)
-  _internal_metadata_.Delete<::google::protobuf::UnknownFieldSet>();
-  SharedDtor();
-}
-inline void SelectOrUpdateRequest::SharedDtor() {
-  ABSL_DCHECK(GetArena() == nullptr);
-  delete _impl_.result_id_;
-  delete _impl_.source_id_;
-  _impl_.~Impl_();
-}
-
-PROTOBUF_NOINLINE void SelectOrUpdateRequest::Clear() {
-// @@protoc_insertion_point(message_clear_start:io.deephaven.proto.backplane.grpc.SelectOrUpdateRequest)
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  ::uint32_t cached_has_bits = 0;
-  // Prevent compiler warnings about cached_has_bits being unused
-  (void) cached_has_bits;
-
-  _impl_.column_specs_.Clear();
-  cached_has_bits = _impl_._has_bits_[0];
-  if (cached_has_bits & 0x00000003u) {
-    if (cached_has_bits & 0x00000001u) {
-      ABSL_DCHECK(_impl_.result_id_ != nullptr);
-      _impl_.result_id_->Clear();
-    }
-    if (cached_has_bits & 0x00000002u) {
-      ABSL_DCHECK(_impl_.source_id_ != nullptr);
-      _impl_.source_id_->Clear();
-    }
-  }
-  _impl_._has_bits_.Clear();
-  _internal_metadata_.Clear<::google::protobuf::UnknownFieldSet>();
-}
-
-const char* SelectOrUpdateRequest::_InternalParse(
-    const char* ptr, ::_pbi::ParseContext* ctx) {
-  ptr = ::_pbi::TcParser::ParseLoop(this, ptr, ctx, &_table_.header);
-  return ptr;
-}
-
-
-PROTOBUF_CONSTINIT PROTOBUF_ATTRIBUTE_INIT_PRIORITY1
-const ::_pbi::TcParseTable<2, 3, 2, 76, 2> SelectOrUpdateRequest::_table_ = {
-  {
-    PROTOBUF_FIELD_OFFSET(SelectOrUpdateRequest, _impl_._has_bits_),
-    0, // no _extensions_
-    3, 24,  // max_field_number, fast_idx_mask
-    offsetof(decltype(_table_), field_lookup_table),
-    4294967288,  // skipmap
-    offsetof(decltype(_table_), field_entries),
-    3,  // num_field_entries
-    2,  // num_aux_entries
-    offsetof(decltype(_table_), aux_entries),
-    &_SelectOrUpdateRequest_default_instance_._instance,
-    ::_pbi::TcParser::GenericFallback,  // fallback
-  }, {{
-    {::_pbi::TcParser::MiniParse, {}},
-    // .io.deephaven.proto.backplane.grpc.Ticket result_id = 1;
-    {::_pbi::TcParser::FastMtS1,
-     {10, 0, 0, PROTOBUF_FIELD_OFFSET(SelectOrUpdateRequest, _impl_.result_id_)}},
-    // .io.deephaven.proto.backplane.grpc.TableReference source_id = 2;
-    {::_pbi::TcParser::FastMtS1,
-     {18, 1, 1, PROTOBUF_FIELD_OFFSET(SelectOrUpdateRequest, _impl_.source_id_)}},
-    // repeated string column_specs = 3;
-    {::_pbi::TcParser::FastUR1,
-     {26, 63, 0, PROTOBUF_FIELD_OFFSET(SelectOrUpdateRequest, _impl_.column_specs_)}},
-  }}, {{
-    65535, 65535
-  }}, {{
-    // .io.deephaven.proto.backplane.grpc.Ticket result_id = 1;
-    {PROTOBUF_FIELD_OFFSET(SelectOrUpdateRequest, _impl_.result_id_), _Internal::kHasBitsOffset + 0, 0,
-    (0 | ::_fl::kFcOptional | ::_fl::kMessage | ::_fl::kTvTable)},
-    // .io.deephaven.proto.backplane.grpc.TableReference source_id = 2;
-    {PROTOBUF_FIELD_OFFSET(SelectOrUpdateRequest, _impl_.source_id_), _Internal::kHasBitsOffset + 1, 1,
-    (0 | ::_fl::kFcOptional | ::_fl::kMessage | ::_fl::kTvTable)},
-    // repeated string column_specs = 3;
-    {PROTOBUF_FIELD_OFFSET(SelectOrUpdateRequest, _impl_.column_specs_), -1, 0,
-    (0 | ::_fl::kFcRepeated | ::_fl::kUtf8String | ::_fl::kRepSString)},
-  }}, {{
-    {::_pbi::TcParser::GetTable<::io::deephaven::proto::backplane::grpc::Ticket>()},
-    {::_pbi::TcParser::GetTable<::io::deephaven::proto::backplane::grpc::TableReference>()},
-  }}, {{
-    "\67\0\0\14\0\0\0\0"
-    "io.deephaven.proto.backplane.grpc.SelectOrUpdateRequest"
-    "column_specs"
-  }},
-};
-
-::uint8_t* SelectOrUpdateRequest::_InternalSerialize(
-    ::uint8_t* target,
-    ::google::protobuf::io::EpsCopyOutputStream* stream) const {
-  // @@protoc_insertion_point(serialize_to_array_start:io.deephaven.proto.backplane.grpc.SelectOrUpdateRequest)
-  ::uint32_t cached_has_bits = 0;
-  (void)cached_has_bits;
-
-  cached_has_bits = _impl_._has_bits_[0];
-  // .io.deephaven.proto.backplane.grpc.Ticket result_id = 1;
-  if (cached_has_bits & 0x00000001u) {
-    target = ::google::protobuf::internal::WireFormatLite::InternalWriteMessage(
-        1, _Internal::result_id(this),
-        _Internal::result_id(this).GetCachedSize(), target, stream);
-  }
-
-  // .io.deephaven.proto.backplane.grpc.TableReference source_id = 2;
-  if (cached_has_bits & 0x00000002u) {
-    target = ::google::protobuf::internal::WireFormatLite::InternalWriteMessage(
-        2, _Internal::source_id(this),
-        _Internal::source_id(this).GetCachedSize(), target, stream);
-  }
-
-  // repeated string column_specs = 3;
-  for (int i = 0, n = this->_internal_column_specs_size(); i < n; ++i) {
-    const auto& s = this->_internal_column_specs().Get(i);
-    ::google::protobuf::internal::WireFormatLite::VerifyUtf8String(
-        s.data(), static_cast<int>(s.length()), ::google::protobuf::internal::WireFormatLite::SERIALIZE, "io.deephaven.proto.backplane.grpc.SelectOrUpdateRequest.column_specs");
-    target = stream->WriteString(3, s, target);
-  }
-
-  if (PROTOBUF_PREDICT_FALSE(_internal_metadata_.have_unknown_fields())) {
-    target =
-        ::_pbi::WireFormat::InternalSerializeUnknownFieldsToArray(
-            _internal_metadata_.unknown_fields<::google::protobuf::UnknownFieldSet>(::google::protobuf::UnknownFieldSet::default_instance), target, stream);
-  }
-  // @@protoc_insertion_point(serialize_to_array_end:io.deephaven.proto.backplane.grpc.SelectOrUpdateRequest)
-  return target;
-}
-
-::size_t SelectOrUpdateRequest::ByteSizeLong() const {
-// @@protoc_insertion_point(message_byte_size_start:io.deephaven.proto.backplane.grpc.SelectOrUpdateRequest)
-  ::size_t total_size = 0;
-
-  ::uint32_t cached_has_bits = 0;
-  // Prevent compiler warnings about cached_has_bits being unused
-  (void) cached_has_bits;
-
-  // repeated string column_specs = 3;
-  total_size += 1 * ::google::protobuf::internal::FromIntSize(_internal_column_specs().size());
-  for (int i = 0, n = _internal_column_specs().size(); i < n; ++i) {
-    total_size += ::google::protobuf::internal::WireFormatLite::StringSize(
-        _internal_column_specs().Get(i));
-  }
-  cached_has_bits = _impl_._has_bits_[0];
-  if (cached_has_bits & 0x00000003u) {
-    // .io.deephaven.proto.backplane.grpc.Ticket result_id = 1;
-    if (cached_has_bits & 0x00000001u) {
-      total_size +=
-          1 + ::google::protobuf::internal::WireFormatLite::MessageSize(*_impl_.result_id_);
-    }
-
-    // .io.deephaven.proto.backplane.grpc.TableReference source_id = 2;
-    if (cached_has_bits & 0x00000002u) {
-      total_size +=
-          1 + ::google::protobuf::internal::WireFormatLite::MessageSize(*_impl_.source_id_);
-    }
-
-  }
-  return MaybeComputeUnknownFieldsSize(total_size, &_impl_._cached_size_);
-}
-
-const ::google::protobuf::Message::ClassData SelectOrUpdateRequest::_class_data_ = {
-    SelectOrUpdateRequest::MergeImpl,
-    nullptr,  // OnDemandRegisterArenaDtor
-};
-const ::google::protobuf::Message::ClassData* SelectOrUpdateRequest::GetClassData() const {
-  return &_class_data_;
-}
-
-void SelectOrUpdateRequest::MergeImpl(::google::protobuf::Message& to_msg, const ::google::protobuf::Message& from_msg) {
-  auto* const _this = static_cast<SelectOrUpdateRequest*>(&to_msg);
-  auto& from = static_cast<const SelectOrUpdateRequest&>(from_msg);
-  // @@protoc_insertion_point(class_specific_merge_from_start:io.deephaven.proto.backplane.grpc.SelectOrUpdateRequest)
-  ABSL_DCHECK_NE(&from, _this);
-  ::uint32_t cached_has_bits = 0;
-  (void) cached_has_bits;
-
-  _this->_internal_mutable_column_specs()->MergeFrom(from._internal_column_specs());
-  cached_has_bits = from._impl_._has_bits_[0];
-  if (cached_has_bits & 0x00000003u) {
-    if (cached_has_bits & 0x00000001u) {
-      _this->_internal_mutable_result_id()->::io::deephaven::proto::backplane::grpc::Ticket::MergeFrom(
-          from._internal_result_id());
-    }
-    if (cached_has_bits & 0x00000002u) {
-      _this->_internal_mutable_source_id()->::io::deephaven::proto::backplane::grpc::TableReference::MergeFrom(
-          from._internal_source_id());
-    }
-  }
-  _this->_internal_metadata_.MergeFrom<::google::protobuf::UnknownFieldSet>(from._internal_metadata_);
-}
-
-void SelectOrUpdateRequest::CopyFrom(const SelectOrUpdateRequest& from) {
-// @@protoc_insertion_point(class_specific_copy_from_start:io.deephaven.proto.backplane.grpc.SelectOrUpdateRequest)
-  if (&from == this) return;
-  Clear();
-  MergeFrom(from);
-}
-
-PROTOBUF_NOINLINE bool SelectOrUpdateRequest::IsInitialized() const {
-  return true;
-}
-
-::_pbi::CachedSize* SelectOrUpdateRequest::AccessCachedSize() const {
-  return &_impl_._cached_size_;
-}
-void SelectOrUpdateRequest::InternalSwap(SelectOrUpdateRequest* PROTOBUF_RESTRICT other) {
-  using std::swap;
-  _internal_metadata_.InternalSwap(&other->_internal_metadata_);
-  swap(_impl_._has_bits_[0], other->_impl_._has_bits_[0]);
-  _impl_.column_specs_.InternalSwap(&other->_impl_.column_specs_);
-  ::google::protobuf::internal::memswap<
-      PROTOBUF_FIELD_OFFSET(SelectOrUpdateRequest, _impl_.source_id_)
-      + sizeof(SelectOrUpdateRequest::_impl_.source_id_)
-      - PROTOBUF_FIELD_OFFSET(SelectOrUpdateRequest, _impl_.result_id_)>(
-          reinterpret_cast<char*>(&_impl_.result_id_),
-          reinterpret_cast<char*>(&other->_impl_.result_id_));
-}
-
-::google::protobuf::Metadata SelectOrUpdateRequest::GetMetadata() const {
-  return ::_pbi::AssignDescriptors(
-      &descriptor_table_deephaven_2fproto_2ftable_2eproto_getter, &descriptor_table_deephaven_2fproto_2ftable_2eproto_once,
-      file_level_metadata_deephaven_2fproto_2ftable_2eproto[8]);
-}
-// ===================================================================
-
-class MathContext::_Internal {
- public:
-};
-
-MathContext::MathContext(::google::protobuf::Arena* arena)
-    : ::google::protobuf::Message(arena) {
-  SharedCtor(arena);
-  // @@protoc_insertion_point(arena_constructor:io.deephaven.proto.backplane.grpc.MathContext)
-}
-MathContext::MathContext(
-    ::google::protobuf::Arena* arena, const MathContext& from)
-    : MathContext(arena) {
-  MergeFrom(from);
-}
-inline PROTOBUF_NDEBUG_INLINE MathContext::Impl_::Impl_(
-    ::google::protobuf::internal::InternalVisibility visibility,
-    ::google::protobuf::Arena* arena)
-      : _cached_size_{0} {}
-
-inline void MathContext::SharedCtor(::_pb::Arena* arena) {
-  new (&_impl_) Impl_(internal_visibility(), arena);
-  ::memset(reinterpret_cast<char *>(&_impl_) +
-               offsetof(Impl_, precision_),
-           0,
-           offsetof(Impl_, rounding_mode_) -
-               offsetof(Impl_, precision_) +
-               sizeof(Impl_::rounding_mode_));
-}
-MathContext::~MathContext() {
-  // @@protoc_insertion_point(destructor:io.deephaven.proto.backplane.grpc.MathContext)
-  _internal_metadata_.Delete<::google::protobuf::UnknownFieldSet>();
-  SharedDtor();
-}
-inline void MathContext::SharedDtor() {
-  ABSL_DCHECK(GetArena() == nullptr);
-  _impl_.~Impl_();
-}
-
-PROTOBUF_NOINLINE void MathContext::Clear() {
-// @@protoc_insertion_point(message_clear_start:io.deephaven.proto.backplane.grpc.MathContext)
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  ::uint32_t cached_has_bits = 0;
-  // Prevent compiler warnings about cached_has_bits being unused
-  (void) cached_has_bits;
-
-  ::memset(&_impl_.precision_, 0, static_cast<::size_t>(
-      reinterpret_cast<char*>(&_impl_.rounding_mode_) -
-      reinterpret_cast<char*>(&_impl_.precision_)) + sizeof(_impl_.rounding_mode_));
-  _internal_metadata_.Clear<::google::protobuf::UnknownFieldSet>();
-}
-
-const char* MathContext::_InternalParse(
-    const char* ptr, ::_pbi::ParseContext* ctx) {
-  ptr = ::_pbi::TcParser::ParseLoop(this, ptr, ctx, &_table_.header);
-  return ptr;
-}
-
-
-PROTOBUF_CONSTINIT PROTOBUF_ATTRIBUTE_INIT_PRIORITY1
-const ::_pbi::TcParseTable<1, 2, 0, 0, 2> MathContext::_table_ = {
-  {
-    0,  // no _has_bits_
-    0, // no _extensions_
-    2, 8,  // max_field_number, fast_idx_mask
-    offsetof(decltype(_table_), field_lookup_table),
-    4294967292,  // skipmap
-    offsetof(decltype(_table_), field_entries),
-    2,  // num_field_entries
-    0,  // num_aux_entries
-    offsetof(decltype(_table_), field_names),  // no aux_entries
-    &_MathContext_default_instance_._instance,
-    ::_pbi::TcParser::GenericFallback,  // fallback
-  }, {{
-    // .io.deephaven.proto.backplane.grpc.MathContext.RoundingMode rounding_mode = 2;
-    {::_pbi::TcParser::SingularVarintNoZag1<::uint32_t, offsetof(MathContext, _impl_.rounding_mode_), 63>(),
-     {16, 63, 0, PROTOBUF_FIELD_OFFSET(MathContext, _impl_.rounding_mode_)}},
-    // sint32 precision = 1;
-    {::_pbi::TcParser::FastZ32S1,
-     {8, 63, 0, PROTOBUF_FIELD_OFFSET(MathContext, _impl_.precision_)}},
-  }}, {{
-    65535, 65535
-  }}, {{
-    // sint32 precision = 1;
-    {PROTOBUF_FIELD_OFFSET(MathContext, _impl_.precision_), 0, 0,
-    (0 | ::_fl::kFcSingular | ::_fl::kSInt32)},
-    // .io.deephaven.proto.backplane.grpc.MathContext.RoundingMode rounding_mode = 2;
-    {PROTOBUF_FIELD_OFFSET(MathContext, _impl_.rounding_mode_), 0, 0,
-    (0 | ::_fl::kFcSingular | ::_fl::kOpenEnum)},
-  }},
-  // no aux_entries
-  {{
-  }},
-};
-
-::uint8_t* MathContext::_InternalSerialize(
-    ::uint8_t* target,
-    ::google::protobuf::io::EpsCopyOutputStream* stream) const {
-  // @@protoc_insertion_point(serialize_to_array_start:io.deephaven.proto.backplane.grpc.MathContext)
-  ::uint32_t cached_has_bits = 0;
-  (void)cached_has_bits;
-
-  // sint32 precision = 1;
-  if (this->_internal_precision() != 0) {
-    target = stream->EnsureSpace(target);
-    target = ::_pbi::WireFormatLite::WriteSInt32ToArray(
-        1, this->_internal_precision(), target);
-  }
-
-  // .io.deephaven.proto.backplane.grpc.MathContext.RoundingMode rounding_mode = 2;
-  if (this->_internal_rounding_mode() != 0) {
-    target = stream->EnsureSpace(target);
-    target = ::_pbi::WireFormatLite::WriteEnumToArray(
-        2, this->_internal_rounding_mode(), target);
-  }
-
-  if (PROTOBUF_PREDICT_FALSE(_internal_metadata_.have_unknown_fields())) {
-    target =
-        ::_pbi::WireFormat::InternalSerializeUnknownFieldsToArray(
-            _internal_metadata_.unknown_fields<::google::protobuf::UnknownFieldSet>(::google::protobuf::UnknownFieldSet::default_instance), target, stream);
-  }
-  // @@protoc_insertion_point(serialize_to_array_end:io.deephaven.proto.backplane.grpc.MathContext)
-  return target;
-}
-
-::size_t MathContext::ByteSizeLong() const {
-// @@protoc_insertion_point(message_byte_size_start:io.deephaven.proto.backplane.grpc.MathContext)
-  ::size_t total_size = 0;
-
-  ::uint32_t cached_has_bits = 0;
-  // Prevent compiler warnings about cached_has_bits being unused
-  (void) cached_has_bits;
-
-  // sint32 precision = 1;
-  if (this->_internal_precision() != 0) {
-    total_size += ::_pbi::WireFormatLite::SInt32SizePlusOne(
-        this->_internal_precision());
-  }
-
-  // .io.deephaven.proto.backplane.grpc.MathContext.RoundingMode rounding_mode = 2;
-  if (this->_internal_rounding_mode() != 0) {
-    total_size += 1 +
-                  ::_pbi::WireFormatLite::EnumSize(this->_internal_rounding_mode());
-  }
-
-  return MaybeComputeUnknownFieldsSize(total_size, &_impl_._cached_size_);
-}
-
-const ::google::protobuf::Message::ClassData MathContext::_class_data_ = {
-    MathContext::MergeImpl,
-    nullptr,  // OnDemandRegisterArenaDtor
-};
-const ::google::protobuf::Message::ClassData* MathContext::GetClassData() const {
-  return &_class_data_;
-}
-
-void MathContext::MergeImpl(::google::protobuf::Message& to_msg, const ::google::protobuf::Message& from_msg) {
-  auto* const _this = static_cast<MathContext*>(&to_msg);
-  auto& from = static_cast<const MathContext&>(from_msg);
-  // @@protoc_insertion_point(class_specific_merge_from_start:io.deephaven.proto.backplane.grpc.MathContext)
-  ABSL_DCHECK_NE(&from, _this);
-  ::uint32_t cached_has_bits = 0;
-  (void) cached_has_bits;
-
-  if (from._internal_precision() != 0) {
-    _this->_internal_set_precision(from._internal_precision());
-  }
-  if (from._internal_rounding_mode() != 0) {
-    _this->_internal_set_rounding_mode(from._internal_rounding_mode());
-  }
-  _this->_internal_metadata_.MergeFrom<::google::protobuf::UnknownFieldSet>(from._internal_metadata_);
-}
-
-void MathContext::CopyFrom(const MathContext& from) {
-// @@protoc_insertion_point(class_specific_copy_from_start:io.deephaven.proto.backplane.grpc.MathContext)
-  if (&from == this) return;
-  Clear();
-  MergeFrom(from);
-}
-
-PROTOBUF_NOINLINE bool MathContext::IsInitialized() const {
-  return true;
-}
-
-::_pbi::CachedSize* MathContext::AccessCachedSize() const {
-  return &_impl_._cached_size_;
-}
-void MathContext::InternalSwap(MathContext* PROTOBUF_RESTRICT other) {
-  using std::swap;
-  _internal_metadata_.InternalSwap(&other->_internal_metadata_);
-  ::google::protobuf::internal::memswap<
-      PROTOBUF_FIELD_OFFSET(MathContext, _impl_.rounding_mode_)
-      + sizeof(MathContext::_impl_.rounding_mode_)
-      - PROTOBUF_FIELD_OFFSET(MathContext, _impl_.precision_)>(
-          reinterpret_cast<char*>(&_impl_.precision_),
-          reinterpret_cast<char*>(&other->_impl_.precision_));
-}
-
-::google::protobuf::Metadata MathContext::GetMetadata() const {
-  return ::_pbi::AssignDescriptors(
-      &descriptor_table_deephaven_2fproto_2ftable_2eproto_getter, &descriptor_table_deephaven_2fproto_2ftable_2eproto_once,
-      file_level_metadata_deephaven_2fproto_2ftable_2eproto[9]);
-}
-// ===================================================================
-
-class UpdateByWindowScale_UpdateByWindowTicks::_Internal {
- public:
-};
-
-UpdateByWindowScale_UpdateByWindowTicks::UpdateByWindowScale_UpdateByWindowTicks(::google::protobuf::Arena* arena)
-    : ::google::protobuf::Message(arena) {
-  SharedCtor(arena);
-  // @@protoc_insertion_point(arena_constructor:io.deephaven.proto.backplane.grpc.UpdateByWindowScale.UpdateByWindowTicks)
-}
-UpdateByWindowScale_UpdateByWindowTicks::UpdateByWindowScale_UpdateByWindowTicks(
-    ::google::protobuf::Arena* arena, const UpdateByWindowScale_UpdateByWindowTicks& from)
-    : UpdateByWindowScale_UpdateByWindowTicks(arena) {
-  MergeFrom(from);
-}
-inline PROTOBUF_NDEBUG_INLINE UpdateByWindowScale_UpdateByWindowTicks::Impl_::Impl_(
-    ::google::protobuf::internal::InternalVisibility visibility,
-    ::google::protobuf::Arena* arena)
-      : _cached_size_{0} {}
-
-inline void UpdateByWindowScale_UpdateByWindowTicks::SharedCtor(::_pb::Arena* arena) {
-  new (&_impl_) Impl_(internal_visibility(), arena);
-  _impl_.ticks_ = {};
-}
-UpdateByWindowScale_UpdateByWindowTicks::~UpdateByWindowScale_UpdateByWindowTicks() {
-  // @@protoc_insertion_point(destructor:io.deephaven.proto.backplane.grpc.UpdateByWindowScale.UpdateByWindowTicks)
-  _internal_metadata_.Delete<::google::protobuf::UnknownFieldSet>();
-  SharedDtor();
-}
-inline void UpdateByWindowScale_UpdateByWindowTicks::SharedDtor() {
-  ABSL_DCHECK(GetArena() == nullptr);
-  _impl_.~Impl_();
-}
-
-PROTOBUF_NOINLINE void UpdateByWindowScale_UpdateByWindowTicks::Clear() {
-// @@protoc_insertion_point(message_clear_start:io.deephaven.proto.backplane.grpc.UpdateByWindowScale.UpdateByWindowTicks)
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  ::uint32_t cached_has_bits = 0;
-  // Prevent compiler warnings about cached_has_bits being unused
-  (void) cached_has_bits;
-
-  _impl_.ticks_ = 0;
-  _internal_metadata_.Clear<::google::protobuf::UnknownFieldSet>();
-}
-
-const char* UpdateByWindowScale_UpdateByWindowTicks::_InternalParse(
-    const char* ptr, ::_pbi::ParseContext* ctx) {
-  ptr = ::_pbi::TcParser::ParseLoop(this, ptr, ctx, &_table_.header);
-  return ptr;
-}
-
-
-PROTOBUF_CONSTINIT PROTOBUF_ATTRIBUTE_INIT_PRIORITY1
-const ::_pbi::TcParseTable<0, 1, 0, 0, 2> UpdateByWindowScale_UpdateByWindowTicks::_table_ = {
-  {
-    0,  // no _has_bits_
-    0, // no _extensions_
-    1, 0,  // max_field_number, fast_idx_mask
-    offsetof(decltype(_table_), field_lookup_table),
-    4294967294,  // skipmap
-    offsetof(decltype(_table_), field_entries),
-    1,  // num_field_entries
-    0,  // num_aux_entries
-    offsetof(decltype(_table_), field_names),  // no aux_entries
-    &_UpdateByWindowScale_UpdateByWindowTicks_default_instance_._instance,
-    ::_pbi::TcParser::GenericFallback,  // fallback
-  }, {{
-    // double ticks = 1;
-    {::_pbi::TcParser::FastF64S1,
-     {9, 63, 0, PROTOBUF_FIELD_OFFSET(UpdateByWindowScale_UpdateByWindowTicks, _impl_.ticks_)}},
-  }}, {{
-    65535, 65535
-  }}, {{
-    // double ticks = 1;
-    {PROTOBUF_FIELD_OFFSET(UpdateByWindowScale_UpdateByWindowTicks, _impl_.ticks_), 0, 0,
-    (0 | ::_fl::kFcSingular | ::_fl::kDouble)},
-  }},
-  // no aux_entries
-  {{
-  }},
-};
-
-::uint8_t* UpdateByWindowScale_UpdateByWindowTicks::_InternalSerialize(
-    ::uint8_t* target,
-    ::google::protobuf::io::EpsCopyOutputStream* stream) const {
-  // @@protoc_insertion_point(serialize_to_array_start:io.deephaven.proto.backplane.grpc.UpdateByWindowScale.UpdateByWindowTicks)
-  ::uint32_t cached_has_bits = 0;
-  (void)cached_has_bits;
-
-  // double ticks = 1;
-  static_assert(sizeof(::uint64_t) == sizeof(double),
-                "Code assumes ::uint64_t and double are the same size.");
-  double tmp_ticks = this->_internal_ticks();
-  ::uint64_t raw_ticks;
-  memcpy(&raw_ticks, &tmp_ticks, sizeof(tmp_ticks));
-  if (raw_ticks != 0) {
-    target = stream->EnsureSpace(target);
-    target = ::_pbi::WireFormatLite::WriteDoubleToArray(
-        1, this->_internal_ticks(), target);
-  }
-
-  if (PROTOBUF_PREDICT_FALSE(_internal_metadata_.have_unknown_fields())) {
-    target =
-        ::_pbi::WireFormat::InternalSerializeUnknownFieldsToArray(
-            _internal_metadata_.unknown_fields<::google::protobuf::UnknownFieldSet>(::google::protobuf::UnknownFieldSet::default_instance), target, stream);
-  }
-  // @@protoc_insertion_point(serialize_to_array_end:io.deephaven.proto.backplane.grpc.UpdateByWindowScale.UpdateByWindowTicks)
-  return target;
-}
-
-::size_t UpdateByWindowScale_UpdateByWindowTicks::ByteSizeLong() const {
-// @@protoc_insertion_point(message_byte_size_start:io.deephaven.proto.backplane.grpc.UpdateByWindowScale.UpdateByWindowTicks)
-  ::size_t total_size = 0;
-
-  ::uint32_t cached_has_bits = 0;
-  // Prevent compiler warnings about cached_has_bits being unused
-  (void) cached_has_bits;
-
-  // double ticks = 1;
-  static_assert(sizeof(::uint64_t) == sizeof(double),
-                "Code assumes ::uint64_t and double are the same size.");
-  double tmp_ticks = this->_internal_ticks();
-  ::uint64_t raw_ticks;
-  memcpy(&raw_ticks, &tmp_ticks, sizeof(tmp_ticks));
-  if (raw_ticks != 0) {
-    total_size += 9;
-  }
-
-  return MaybeComputeUnknownFieldsSize(total_size, &_impl_._cached_size_);
-}
-
-const ::google::protobuf::Message::ClassData UpdateByWindowScale_UpdateByWindowTicks::_class_data_ = {
-    UpdateByWindowScale_UpdateByWindowTicks::MergeImpl,
-    nullptr,  // OnDemandRegisterArenaDtor
-};
-const ::google::protobuf::Message::ClassData* UpdateByWindowScale_UpdateByWindowTicks::GetClassData() const {
-  return &_class_data_;
-}
-
-void UpdateByWindowScale_UpdateByWindowTicks::MergeImpl(::google::protobuf::Message& to_msg, const ::google::protobuf::Message& from_msg) {
-  auto* const _this = static_cast<UpdateByWindowScale_UpdateByWindowTicks*>(&to_msg);
-  auto& from = static_cast<const UpdateByWindowScale_UpdateByWindowTicks&>(from_msg);
-  // @@protoc_insertion_point(class_specific_merge_from_start:io.deephaven.proto.backplane.grpc.UpdateByWindowScale.UpdateByWindowTicks)
-  ABSL_DCHECK_NE(&from, _this);
-  ::uint32_t cached_has_bits = 0;
-  (void) cached_has_bits;
-
-  static_assert(sizeof(::uint64_t) == sizeof(double),
-                "Code assumes ::uint64_t and double are the same size.");
-  double tmp_ticks = from._internal_ticks();
-  ::uint64_t raw_ticks;
-  memcpy(&raw_ticks, &tmp_ticks, sizeof(tmp_ticks));
-  if (raw_ticks != 0) {
-    _this->_internal_set_ticks(from._internal_ticks());
-  }
-  _this->_internal_metadata_.MergeFrom<::google::protobuf::UnknownFieldSet>(from._internal_metadata_);
-}
-
-void UpdateByWindowScale_UpdateByWindowTicks::CopyFrom(const UpdateByWindowScale_UpdateByWindowTicks& from) {
-// @@protoc_insertion_point(class_specific_copy_from_start:io.deephaven.proto.backplane.grpc.UpdateByWindowScale.UpdateByWindowTicks)
-  if (&from == this) return;
-  Clear();
-  MergeFrom(from);
-}
-
-PROTOBUF_NOINLINE bool UpdateByWindowScale_UpdateByWindowTicks::IsInitialized() const {
-  return true;
-}
-
-::_pbi::CachedSize* UpdateByWindowScale_UpdateByWindowTicks::AccessCachedSize() const {
-  return &_impl_._cached_size_;
-}
-void UpdateByWindowScale_UpdateByWindowTicks::InternalSwap(UpdateByWindowScale_UpdateByWindowTicks* PROTOBUF_RESTRICT other) {
-  using std::swap;
-  _internal_metadata_.InternalSwap(&other->_internal_metadata_);
-        swap(_impl_.ticks_, other->_impl_.ticks_);
-}
-
-::google::protobuf::Metadata UpdateByWindowScale_UpdateByWindowTicks::GetMetadata() const {
-  return ::_pbi::AssignDescriptors(
-      &descriptor_table_deephaven_2fproto_2ftable_2eproto_getter, &descriptor_table_deephaven_2fproto_2ftable_2eproto_once,
-      file_level_metadata_deephaven_2fproto_2ftable_2eproto[10]);
-}
-// ===================================================================
-
-class UpdateByWindowScale_UpdateByWindowTime::_Internal {
- public:
-  static constexpr ::int32_t kOneofCaseOffset =
-    PROTOBUF_FIELD_OFFSET(::io::deephaven::proto::backplane::grpc::UpdateByWindowScale_UpdateByWindowTime, _impl_._oneof_case_);
-};
-
-UpdateByWindowScale_UpdateByWindowTime::UpdateByWindowScale_UpdateByWindowTime(::google::protobuf::Arena* arena)
-    : ::google::protobuf::Message(arena) {
-  SharedCtor(arena);
-  // @@protoc_insertion_point(arena_constructor:io.deephaven.proto.backplane.grpc.UpdateByWindowScale.UpdateByWindowTime)
-}
-inline PROTOBUF_NDEBUG_INLINE UpdateByWindowScale_UpdateByWindowTime::Impl_::Impl_(
-    ::google::protobuf::internal::InternalVisibility visibility, ::google::protobuf::Arena* arena,
-    const Impl_& from)
-      : column_(arena, from.column_),
-        window_{},
-        _cached_size_{0},
-        _oneof_case_{from._oneof_case_[0]} {}
-
-UpdateByWindowScale_UpdateByWindowTime::UpdateByWindowScale_UpdateByWindowTime(
-    ::google::protobuf::Arena* arena,
-    const UpdateByWindowScale_UpdateByWindowTime& from)
-    : ::google::protobuf::Message(arena) {
-  UpdateByWindowScale_UpdateByWindowTime* const _this = this;
-  (void)_this;
-  _internal_metadata_.MergeFrom<::google::protobuf::UnknownFieldSet>(
-      from._internal_metadata_);
-  new (&_impl_) Impl_(internal_visibility(), arena, from._impl_);
-  switch (window_case()) {
-    case WINDOW_NOT_SET:
-      break;
-      case kNanos:
-        _impl_.window_.nanos_ = from._impl_.window_.nanos_;
-        break;
-      case kDurationString:
-        new (&_impl_.window_.duration_string_) decltype(_impl_.window_.duration_string_){arena, from._impl_.window_.duration_string_};
-        break;
-  }
-
-  // @@protoc_insertion_point(copy_constructor:io.deephaven.proto.backplane.grpc.UpdateByWindowScale.UpdateByWindowTime)
-}
-inline PROTOBUF_NDEBUG_INLINE UpdateByWindowScale_UpdateByWindowTime::Impl_::Impl_(
-    ::google::protobuf::internal::InternalVisibility visibility,
-    ::google::protobuf::Arena* arena)
-      : column_(arena),
-        window_{},
-        _cached_size_{0},
-        _oneof_case_{} {}
-
-inline void UpdateByWindowScale_UpdateByWindowTime::SharedCtor(::_pb::Arena* arena) {
-  new (&_impl_) Impl_(internal_visibility(), arena);
-}
-UpdateByWindowScale_UpdateByWindowTime::~UpdateByWindowScale_UpdateByWindowTime() {
-  // @@protoc_insertion_point(destructor:io.deephaven.proto.backplane.grpc.UpdateByWindowScale.UpdateByWindowTime)
-  _internal_metadata_.Delete<::google::protobuf::UnknownFieldSet>();
-  SharedDtor();
-}
-inline void UpdateByWindowScale_UpdateByWindowTime::SharedDtor() {
-  ABSL_DCHECK(GetArena() == nullptr);
-  _impl_.column_.Destroy();
-  if (has_window()) {
-    clear_window();
-  }
-  _impl_.~Impl_();
-}
-
-void UpdateByWindowScale_UpdateByWindowTime::clear_window() {
-// @@protoc_insertion_point(one_of_clear_start:io.deephaven.proto.backplane.grpc.UpdateByWindowScale.UpdateByWindowTime)
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  switch (window_case()) {
-    case kNanos: {
-      // No need to clear
-      break;
-    }
-    case kDurationString: {
-      _impl_.window_.duration_string_.Destroy();
-      break;
-    }
-    case WINDOW_NOT_SET: {
-      break;
-    }
-  }
-  _impl_._oneof_case_[0] = WINDOW_NOT_SET;
-}
-
-
-PROTOBUF_NOINLINE void UpdateByWindowScale_UpdateByWindowTime::Clear() {
-// @@protoc_insertion_point(message_clear_start:io.deephaven.proto.backplane.grpc.UpdateByWindowScale.UpdateByWindowTime)
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  ::uint32_t cached_has_bits = 0;
-  // Prevent compiler warnings about cached_has_bits being unused
-  (void) cached_has_bits;
-
-  _impl_.column_.ClearToEmpty();
-  clear_window();
-  _internal_metadata_.Clear<::google::protobuf::UnknownFieldSet>();
-}
-
-const char* UpdateByWindowScale_UpdateByWindowTime::_InternalParse(
-    const char* ptr, ::_pbi::ParseContext* ctx) {
-  ptr = ::_pbi::TcParser::ParseLoop(this, ptr, ctx, &_table_.header);
-  return ptr;
-}
-
-
-PROTOBUF_CONSTINIT PROTOBUF_ATTRIBUTE_INIT_PRIORITY1
-const ::_pbi::TcParseTable<0, 3, 0, 102, 2> UpdateByWindowScale_UpdateByWindowTime::_table_ = {
-  {
-    0,  // no _has_bits_
-    0, // no _extensions_
-    3, 0,  // max_field_number, fast_idx_mask
-    offsetof(decltype(_table_), field_lookup_table),
-    4294967288,  // skipmap
-    offsetof(decltype(_table_), field_entries),
-    3,  // num_field_entries
-    0,  // num_aux_entries
-    offsetof(decltype(_table_), field_names),  // no aux_entries
-    &_UpdateByWindowScale_UpdateByWindowTime_default_instance_._instance,
-    ::_pbi::TcParser::GenericFallback,  // fallback
-  }, {{
-    // string column = 1;
-    {::_pbi::TcParser::FastUS1,
-     {10, 63, 0, PROTOBUF_FIELD_OFFSET(UpdateByWindowScale_UpdateByWindowTime, _impl_.column_)}},
-  }}, {{
-    65535, 65535
-  }}, {{
-    // string column = 1;
-    {PROTOBUF_FIELD_OFFSET(UpdateByWindowScale_UpdateByWindowTime, _impl_.column_), 0, 0,
-    (0 | ::_fl::kFcSingular | ::_fl::kUtf8String | ::_fl::kRepAString)},
-    // sint64 nanos = 2 [jstype = JS_STRING];
-    {PROTOBUF_FIELD_OFFSET(UpdateByWindowScale_UpdateByWindowTime, _impl_.window_.nanos_), _Internal::kOneofCaseOffset + 0, 0,
-    (0 | ::_fl::kFcOneof | ::_fl::kSInt64)},
-    // string duration_string = 3;
-    {PROTOBUF_FIELD_OFFSET(UpdateByWindowScale_UpdateByWindowTime, _impl_.window_.duration_string_), _Internal::kOneofCaseOffset + 0, 0,
-    (0 | ::_fl::kFcOneof | ::_fl::kUtf8String | ::_fl::kRepAString)},
-  }},
-  // no aux_entries
-  {{
-    "\110\6\0\17\0\0\0\0"
-    "io.deephaven.proto.backplane.grpc.UpdateByWindowScale.UpdateByWindowTime"
-    "column"
-    "duration_string"
-  }},
-};
-
-::uint8_t* UpdateByWindowScale_UpdateByWindowTime::_InternalSerialize(
-    ::uint8_t* target,
-    ::google::protobuf::io::EpsCopyOutputStream* stream) const {
-  // @@protoc_insertion_point(serialize_to_array_start:io.deephaven.proto.backplane.grpc.UpdateByWindowScale.UpdateByWindowTime)
-  ::uint32_t cached_has_bits = 0;
-  (void)cached_has_bits;
-
-  // string column = 1;
-  if (!this->_internal_column().empty()) {
-    const std::string& _s = this->_internal_column();
-    ::google::protobuf::internal::WireFormatLite::VerifyUtf8String(
-        _s.data(), static_cast<int>(_s.length()), ::google::protobuf::internal::WireFormatLite::SERIALIZE, "io.deephaven.proto.backplane.grpc.UpdateByWindowScale.UpdateByWindowTime.column");
-    target = stream->WriteStringMaybeAliased(1, _s, target);
-  }
-
-  switch (window_case()) {
-    case kNanos: {
-      target = stream->EnsureSpace(target);
-      target = ::_pbi::WireFormatLite::WriteSInt64ToArray(
-          2, this->_internal_nanos(), target);
-      break;
-    }
-    case kDurationString: {
-      const std::string& _s = this->_internal_duration_string();
-      ::google::protobuf::internal::WireFormatLite::VerifyUtf8String(
-          _s.data(), static_cast<int>(_s.length()), ::google::protobuf::internal::WireFormatLite::SERIALIZE, "io.deephaven.proto.backplane.grpc.UpdateByWindowScale.UpdateByWindowTime.duration_string");
-      target = stream->WriteStringMaybeAliased(3, _s, target);
-      break;
-    }
-    default:
-      break;
-  }
-  if (PROTOBUF_PREDICT_FALSE(_internal_metadata_.have_unknown_fields())) {
-    target =
-        ::_pbi::WireFormat::InternalSerializeUnknownFieldsToArray(
-            _internal_metadata_.unknown_fields<::google::protobuf::UnknownFieldSet>(::google::protobuf::UnknownFieldSet::default_instance), target, stream);
-  }
-  // @@protoc_insertion_point(serialize_to_array_end:io.deephaven.proto.backplane.grpc.UpdateByWindowScale.UpdateByWindowTime)
-  return target;
-}
-
-::size_t UpdateByWindowScale_UpdateByWindowTime::ByteSizeLong() const {
-// @@protoc_insertion_point(message_byte_size_start:io.deephaven.proto.backplane.grpc.UpdateByWindowScale.UpdateByWindowTime)
-  ::size_t total_size = 0;
-
-  ::uint32_t cached_has_bits = 0;
-  // Prevent compiler warnings about cached_has_bits being unused
-  (void) cached_has_bits;
-
-  // string column = 1;
-  if (!this->_internal_column().empty()) {
-    total_size += 1 + ::google::protobuf::internal::WireFormatLite::StringSize(
-                                    this->_internal_column());
-  }
-
-  switch (window_case()) {
-    // sint64 nanos = 2 [jstype = JS_STRING];
-    case kNanos: {
-      total_size += ::_pbi::WireFormatLite::SInt64SizePlusOne(
-          this->_internal_nanos());
-      break;
-    }
-    // string duration_string = 3;
-    case kDurationString: {
-      total_size += 1 + ::google::protobuf::internal::WireFormatLite::StringSize(
-                                      this->_internal_duration_string());
-      break;
-    }
-    case WINDOW_NOT_SET: {
-      break;
-    }
-  }
-  return MaybeComputeUnknownFieldsSize(total_size, &_impl_._cached_size_);
-}
-
-const ::google::protobuf::Message::ClassData UpdateByWindowScale_UpdateByWindowTime::_class_data_ = {
-    UpdateByWindowScale_UpdateByWindowTime::MergeImpl,
-    nullptr,  // OnDemandRegisterArenaDtor
-};
-const ::google::protobuf::Message::ClassData* UpdateByWindowScale_UpdateByWindowTime::GetClassData() const {
-  return &_class_data_;
-}
-
-void UpdateByWindowScale_UpdateByWindowTime::MergeImpl(::google::protobuf::Message& to_msg, const ::google::protobuf::Message& from_msg) {
-  auto* const _this = static_cast<UpdateByWindowScale_UpdateByWindowTime*>(&to_msg);
-  auto& from = static_cast<const UpdateByWindowScale_UpdateByWindowTime&>(from_msg);
-  // @@protoc_insertion_point(class_specific_merge_from_start:io.deephaven.proto.backplane.grpc.UpdateByWindowScale.UpdateByWindowTime)
-  ABSL_DCHECK_NE(&from, _this);
-  ::uint32_t cached_has_bits = 0;
-  (void) cached_has_bits;
-
-  if (!from._internal_column().empty()) {
-    _this->_internal_set_column(from._internal_column());
-  }
-  switch (from.window_case()) {
-    case kNanos: {
-      _this->_internal_set_nanos(from._internal_nanos());
-      break;
-    }
-    case kDurationString: {
-      _this->_internal_set_duration_string(from._internal_duration_string());
-      break;
-    }
-    case WINDOW_NOT_SET: {
-      break;
-    }
-  }
-  _this->_internal_metadata_.MergeFrom<::google::protobuf::UnknownFieldSet>(from._internal_metadata_);
-}
-
-void UpdateByWindowScale_UpdateByWindowTime::CopyFrom(const UpdateByWindowScale_UpdateByWindowTime& from) {
-// @@protoc_insertion_point(class_specific_copy_from_start:io.deephaven.proto.backplane.grpc.UpdateByWindowScale.UpdateByWindowTime)
-  if (&from == this) return;
-  Clear();
-  MergeFrom(from);
-}
-
-PROTOBUF_NOINLINE bool UpdateByWindowScale_UpdateByWindowTime::IsInitialized() const {
-  return true;
-}
-
-::_pbi::CachedSize* UpdateByWindowScale_UpdateByWindowTime::AccessCachedSize() const {
-  return &_impl_._cached_size_;
-}
-void UpdateByWindowScale_UpdateByWindowTime::InternalSwap(UpdateByWindowScale_UpdateByWindowTime* PROTOBUF_RESTRICT other) {
-  using std::swap;
-  auto* arena = GetArena();
-  ABSL_DCHECK_EQ(arena, other->GetArena());
-  _internal_metadata_.InternalSwap(&other->_internal_metadata_);
-  ::_pbi::ArenaStringPtr::InternalSwap(&_impl_.column_, &other->_impl_.column_, arena);
-  swap(_impl_.window_, other->_impl_.window_);
-  swap(_impl_._oneof_case_[0], other->_impl_._oneof_case_[0]);
-}
-
-::google::protobuf::Metadata UpdateByWindowScale_UpdateByWindowTime::GetMetadata() const {
-  return ::_pbi::AssignDescriptors(
-      &descriptor_table_deephaven_2fproto_2ftable_2eproto_getter, &descriptor_table_deephaven_2fproto_2ftable_2eproto_once,
-      file_level_metadata_deephaven_2fproto_2ftable_2eproto[11]);
-}
-// ===================================================================
-
-class UpdateByWindowScale::_Internal {
- public:
-  static constexpr ::int32_t kOneofCaseOffset =
-    PROTOBUF_FIELD_OFFSET(::io::deephaven::proto::backplane::grpc::UpdateByWindowScale, _impl_._oneof_case_);
-  static const ::io::deephaven::proto::backplane::grpc::UpdateByWindowScale_UpdateByWindowTicks& ticks(const UpdateByWindowScale* msg);
-  static const ::io::deephaven::proto::backplane::grpc::UpdateByWindowScale_UpdateByWindowTime& time(const UpdateByWindowScale* msg);
-};
-
-const ::io::deephaven::proto::backplane::grpc::UpdateByWindowScale_UpdateByWindowTicks& UpdateByWindowScale::_Internal::ticks(const UpdateByWindowScale* msg) {
-  return *msg->_impl_.type_.ticks_;
-}
-const ::io::deephaven::proto::backplane::grpc::UpdateByWindowScale_UpdateByWindowTime& UpdateByWindowScale::_Internal::time(const UpdateByWindowScale* msg) {
-  return *msg->_impl_.type_.time_;
-}
-void UpdateByWindowScale::set_allocated_ticks(::io::deephaven::proto::backplane::grpc::UpdateByWindowScale_UpdateByWindowTicks* ticks) {
-  ::google::protobuf::Arena* message_arena = GetArena();
-  clear_type();
-  if (ticks) {
-    ::google::protobuf::Arena* submessage_arena = ticks->GetArena();
-    if (message_arena != submessage_arena) {
-      ticks = ::google::protobuf::internal::GetOwnedMessage(message_arena, ticks, submessage_arena);
-    }
-    set_has_ticks();
-    _impl_.type_.ticks_ = ticks;
-  }
-  // @@protoc_insertion_point(field_set_allocated:io.deephaven.proto.backplane.grpc.UpdateByWindowScale.ticks)
-}
-void UpdateByWindowScale::set_allocated_time(::io::deephaven::proto::backplane::grpc::UpdateByWindowScale_UpdateByWindowTime* time) {
-  ::google::protobuf::Arena* message_arena = GetArena();
-  clear_type();
-  if (time) {
-    ::google::protobuf::Arena* submessage_arena = time->GetArena();
-    if (message_arena != submessage_arena) {
-      time = ::google::protobuf::internal::GetOwnedMessage(message_arena, time, submessage_arena);
-    }
-    set_has_time();
-    _impl_.type_.time_ = time;
-  }
-  // @@protoc_insertion_point(field_set_allocated:io.deephaven.proto.backplane.grpc.UpdateByWindowScale.time)
-}
-UpdateByWindowScale::UpdateByWindowScale(::google::protobuf::Arena* arena)
-    : ::google::protobuf::Message(arena) {
-  SharedCtor(arena);
-  // @@protoc_insertion_point(arena_constructor:io.deephaven.proto.backplane.grpc.UpdateByWindowScale)
-}
-inline PROTOBUF_NDEBUG_INLINE UpdateByWindowScale::Impl_::Impl_(
-    ::google::protobuf::internal::InternalVisibility visibility, ::google::protobuf::Arena* arena,
-    const Impl_& from)
-      : type_{},
-        _cached_size_{0},
-        _oneof_case_{from._oneof_case_[0]} {}
-
-UpdateByWindowScale::UpdateByWindowScale(
-    ::google::protobuf::Arena* arena,
-    const UpdateByWindowScale& from)
-    : ::google::protobuf::Message(arena) {
-  UpdateByWindowScale* const _this = this;
-  (void)_this;
-  _internal_metadata_.MergeFrom<::google::protobuf::UnknownFieldSet>(
-      from._internal_metadata_);
-  new (&_impl_) Impl_(internal_visibility(), arena, from._impl_);
-  switch (type_case()) {
-    case TYPE_NOT_SET:
-      break;
-      case kTicks:
-        _impl_.type_.ticks_ = CreateMaybeMessage<::io::deephaven::proto::backplane::grpc::UpdateByWindowScale_UpdateByWindowTicks>(arena, *from._impl_.type_.ticks_);
-        break;
-      case kTime:
-        _impl_.type_.time_ = CreateMaybeMessage<::io::deephaven::proto::backplane::grpc::UpdateByWindowScale_UpdateByWindowTime>(arena, *from._impl_.type_.time_);
-        break;
-  }
-
-  // @@protoc_insertion_point(copy_constructor:io.deephaven.proto.backplane.grpc.UpdateByWindowScale)
-}
-inline PROTOBUF_NDEBUG_INLINE UpdateByWindowScale::Impl_::Impl_(
-    ::google::protobuf::internal::InternalVisibility visibility,
-    ::google::protobuf::Arena* arena)
-      : type_{},
-        _cached_size_{0},
-        _oneof_case_{} {}
-
-inline void UpdateByWindowScale::SharedCtor(::_pb::Arena* arena) {
-  new (&_impl_) Impl_(internal_visibility(), arena);
-}
-UpdateByWindowScale::~UpdateByWindowScale() {
-  // @@protoc_insertion_point(destructor:io.deephaven.proto.backplane.grpc.UpdateByWindowScale)
-  _internal_metadata_.Delete<::google::protobuf::UnknownFieldSet>();
-  SharedDtor();
-}
-inline void UpdateByWindowScale::SharedDtor() {
-  ABSL_DCHECK(GetArena() == nullptr);
-  if (has_type()) {
-    clear_type();
-  }
-  _impl_.~Impl_();
-}
-
-void UpdateByWindowScale::clear_type() {
-// @@protoc_insertion_point(one_of_clear_start:io.deephaven.proto.backplane.grpc.UpdateByWindowScale)
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  switch (type_case()) {
-    case kTicks: {
-      if (GetArena() == nullptr) {
-        delete _impl_.type_.ticks_;
-      }
-      break;
-    }
-    case kTime: {
-      if (GetArena() == nullptr) {
-        delete _impl_.type_.time_;
-      }
-      break;
-    }
-    case TYPE_NOT_SET: {
-      break;
-    }
-  }
-  _impl_._oneof_case_[0] = TYPE_NOT_SET;
-}
-
-
-PROTOBUF_NOINLINE void UpdateByWindowScale::Clear() {
-// @@protoc_insertion_point(message_clear_start:io.deephaven.proto.backplane.grpc.UpdateByWindowScale)
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  ::uint32_t cached_has_bits = 0;
-  // Prevent compiler warnings about cached_has_bits being unused
-  (void) cached_has_bits;
-
-  clear_type();
-  _internal_metadata_.Clear<::google::protobuf::UnknownFieldSet>();
-}
-
-const char* UpdateByWindowScale::_InternalParse(
-    const char* ptr, ::_pbi::ParseContext* ctx) {
-  ptr = ::_pbi::TcParser::ParseLoop(this, ptr, ctx, &_table_.header);
-  return ptr;
-}
-
-
-PROTOBUF_CONSTINIT PROTOBUF_ATTRIBUTE_INIT_PRIORITY1
-const ::_pbi::TcParseTable<0, 2, 2, 0, 2> UpdateByWindowScale::_table_ = {
-  {
-    0,  // no _has_bits_
-    0, // no _extensions_
-    2, 0,  // max_field_number, fast_idx_mask
-    offsetof(decltype(_table_), field_lookup_table),
-    4294967292,  // skipmap
-    offsetof(decltype(_table_), field_entries),
-    2,  // num_field_entries
-    2,  // num_aux_entries
-    offsetof(decltype(_table_), aux_entries),
-    &_UpdateByWindowScale_default_instance_._instance,
-    ::_pbi::TcParser::GenericFallback,  // fallback
-  }, {{
-    {::_pbi::TcParser::MiniParse, {}},
-  }}, {{
-    65535, 65535
-  }}, {{
-    // .io.deephaven.proto.backplane.grpc.UpdateByWindowScale.UpdateByWindowTicks ticks = 1;
-    {PROTOBUF_FIELD_OFFSET(UpdateByWindowScale, _impl_.type_.ticks_), _Internal::kOneofCaseOffset + 0, 0,
-    (0 | ::_fl::kFcOneof | ::_fl::kMessage | ::_fl::kTvTable)},
-    // .io.deephaven.proto.backplane.grpc.UpdateByWindowScale.UpdateByWindowTime time = 2;
-    {PROTOBUF_FIELD_OFFSET(UpdateByWindowScale, _impl_.type_.time_), _Internal::kOneofCaseOffset + 0, 1,
-    (0 | ::_fl::kFcOneof | ::_fl::kMessage | ::_fl::kTvTable)},
-  }}, {{
-    {::_pbi::TcParser::GetTable<::io::deephaven::proto::backplane::grpc::UpdateByWindowScale_UpdateByWindowTicks>()},
-    {::_pbi::TcParser::GetTable<::io::deephaven::proto::backplane::grpc::UpdateByWindowScale_UpdateByWindowTime>()},
-  }}, {{
-  }},
-};
-
-::uint8_t* UpdateByWindowScale::_InternalSerialize(
-    ::uint8_t* target,
-    ::google::protobuf::io::EpsCopyOutputStream* stream) const {
-  // @@protoc_insertion_point(serialize_to_array_start:io.deephaven.proto.backplane.grpc.UpdateByWindowScale)
-  ::uint32_t cached_has_bits = 0;
-  (void)cached_has_bits;
-
-  switch (type_case()) {
-    case kTicks: {
-      target = ::google::protobuf::internal::WireFormatLite::InternalWriteMessage(
-          1, _Internal::ticks(this),
-          _Internal::ticks(this).GetCachedSize(), target, stream);
-      break;
-    }
-    case kTime: {
-      target = ::google::protobuf::internal::WireFormatLite::InternalWriteMessage(
-          2, _Internal::time(this),
-          _Internal::time(this).GetCachedSize(), target, stream);
-      break;
-    }
-    default:
-      break;
-  }
-  if (PROTOBUF_PREDICT_FALSE(_internal_metadata_.have_unknown_fields())) {
-    target =
-        ::_pbi::WireFormat::InternalSerializeUnknownFieldsToArray(
-            _internal_metadata_.unknown_fields<::google::protobuf::UnknownFieldSet>(::google::protobuf::UnknownFieldSet::default_instance), target, stream);
-  }
-  // @@protoc_insertion_point(serialize_to_array_end:io.deephaven.proto.backplane.grpc.UpdateByWindowScale)
-  return target;
-}
-
-::size_t UpdateByWindowScale::ByteSizeLong() const {
-// @@protoc_insertion_point(message_byte_size_start:io.deephaven.proto.backplane.grpc.UpdateByWindowScale)
-  ::size_t total_size = 0;
-
-  ::uint32_t cached_has_bits = 0;
-  // Prevent compiler warnings about cached_has_bits being unused
-  (void) cached_has_bits;
-
-  switch (type_case()) {
-    // .io.deephaven.proto.backplane.grpc.UpdateByWindowScale.UpdateByWindowTicks ticks = 1;
-    case kTicks: {
-      total_size +=
-          1 + ::google::protobuf::internal::WireFormatLite::MessageSize(*_impl_.type_.ticks_);
-      break;
-    }
-    // .io.deephaven.proto.backplane.grpc.UpdateByWindowScale.UpdateByWindowTime time = 2;
-    case kTime: {
-      total_size +=
-          1 + ::google::protobuf::internal::WireFormatLite::MessageSize(*_impl_.type_.time_);
-      break;
-    }
-    case TYPE_NOT_SET: {
-      break;
-    }
-  }
-  return MaybeComputeUnknownFieldsSize(total_size, &_impl_._cached_size_);
-}
-
-const ::google::protobuf::Message::ClassData UpdateByWindowScale::_class_data_ = {
-    UpdateByWindowScale::MergeImpl,
-    nullptr,  // OnDemandRegisterArenaDtor
-};
-const ::google::protobuf::Message::ClassData* UpdateByWindowScale::GetClassData() const {
-  return &_class_data_;
-}
-
-void UpdateByWindowScale::MergeImpl(::google::protobuf::Message& to_msg, const ::google::protobuf::Message& from_msg) {
-  auto* const _this = static_cast<UpdateByWindowScale*>(&to_msg);
-  auto& from = static_cast<const UpdateByWindowScale&>(from_msg);
-  // @@protoc_insertion_point(class_specific_merge_from_start:io.deephaven.proto.backplane.grpc.UpdateByWindowScale)
-  ABSL_DCHECK_NE(&from, _this);
-  ::uint32_t cached_has_bits = 0;
-  (void) cached_has_bits;
-
-  switch (from.type_case()) {
-    case kTicks: {
-      _this->_internal_mutable_ticks()->::io::deephaven::proto::backplane::grpc::UpdateByWindowScale_UpdateByWindowTicks::MergeFrom(
-          from._internal_ticks());
-      break;
-    }
-    case kTime: {
-      _this->_internal_mutable_time()->::io::deephaven::proto::backplane::grpc::UpdateByWindowScale_UpdateByWindowTime::MergeFrom(
-          from._internal_time());
-      break;
-    }
-    case TYPE_NOT_SET: {
-      break;
-    }
-  }
-  _this->_internal_metadata_.MergeFrom<::google::protobuf::UnknownFieldSet>(from._internal_metadata_);
-}
-
-void UpdateByWindowScale::CopyFrom(const UpdateByWindowScale& from) {
-// @@protoc_insertion_point(class_specific_copy_from_start:io.deephaven.proto.backplane.grpc.UpdateByWindowScale)
-  if (&from == this) return;
-  Clear();
-  MergeFrom(from);
-}
-
-PROTOBUF_NOINLINE bool UpdateByWindowScale::IsInitialized() const {
-  return true;
-}
-
-::_pbi::CachedSize* UpdateByWindowScale::AccessCachedSize() const {
-  return &_impl_._cached_size_;
-}
-void UpdateByWindowScale::InternalSwap(UpdateByWindowScale* PROTOBUF_RESTRICT other) {
-  using std::swap;
-  _internal_metadata_.InternalSwap(&other->_internal_metadata_);
-  swap(_impl_.type_, other->_impl_.type_);
-  swap(_impl_._oneof_case_[0], other->_impl_._oneof_case_[0]);
-}
-
-::google::protobuf::Metadata UpdateByWindowScale::GetMetadata() const {
-  return ::_pbi::AssignDescriptors(
-      &descriptor_table_deephaven_2fproto_2ftable_2eproto_getter, &descriptor_table_deephaven_2fproto_2ftable_2eproto_once,
-      file_level_metadata_deephaven_2fproto_2ftable_2eproto[12]);
-}
-// ===================================================================
-
-class UpdateByEmOptions::_Internal {
- public:
-  using HasBits = decltype(std::declval<UpdateByEmOptions>()._impl_._has_bits_);
-  static constexpr ::int32_t kHasBitsOffset =
-    8 * PROTOBUF_FIELD_OFFSET(UpdateByEmOptions, _impl_._has_bits_);
-  static const ::io::deephaven::proto::backplane::grpc::MathContext& big_value_context(const UpdateByEmOptions* msg);
-  static void set_has_big_value_context(HasBits* has_bits) {
-    (*has_bits)[0] |= 1u;
-  }
-};
-
-const ::io::deephaven::proto::backplane::grpc::MathContext& UpdateByEmOptions::_Internal::big_value_context(const UpdateByEmOptions* msg) {
-  return *msg->_impl_.big_value_context_;
-}
-UpdateByEmOptions::UpdateByEmOptions(::google::protobuf::Arena* arena)
-    : ::google::protobuf::Message(arena) {
-  SharedCtor(arena);
-  // @@protoc_insertion_point(arena_constructor:io.deephaven.proto.backplane.grpc.UpdateByEmOptions)
-}
-inline PROTOBUF_NDEBUG_INLINE UpdateByEmOptions::Impl_::Impl_(
-    ::google::protobuf::internal::InternalVisibility visibility, ::google::protobuf::Arena* arena,
-    const Impl_& from)
-      : _has_bits_{from._has_bits_},
-        _cached_size_{0} {}
-
-UpdateByEmOptions::UpdateByEmOptions(
-    ::google::protobuf::Arena* arena,
-    const UpdateByEmOptions& from)
-    : ::google::protobuf::Message(arena) {
-  UpdateByEmOptions* const _this = this;
-  (void)_this;
-  _internal_metadata_.MergeFrom<::google::protobuf::UnknownFieldSet>(
-      from._internal_metadata_);
-  new (&_impl_) Impl_(internal_visibility(), arena, from._impl_);
-  ::uint32_t cached_has_bits = _impl_._has_bits_[0];
-  _impl_.big_value_context_ = (cached_has_bits & 0x00000001u)
-                ? CreateMaybeMessage<::io::deephaven::proto::backplane::grpc::MathContext>(arena, *from._impl_.big_value_context_)
-                : nullptr;
-  ::memcpy(reinterpret_cast<char *>(&_impl_) +
-               offsetof(Impl_, on_null_value_),
-           reinterpret_cast<const char *>(&from._impl_) +
-               offsetof(Impl_, on_null_value_),
-           offsetof(Impl_, on_zero_delta_time_) -
-               offsetof(Impl_, on_null_value_) +
-               sizeof(Impl_::on_zero_delta_time_));
-
-  // @@protoc_insertion_point(copy_constructor:io.deephaven.proto.backplane.grpc.UpdateByEmOptions)
-}
-inline PROTOBUF_NDEBUG_INLINE UpdateByEmOptions::Impl_::Impl_(
-    ::google::protobuf::internal::InternalVisibility visibility,
-    ::google::protobuf::Arena* arena)
-      : _cached_size_{0} {}
-
-inline void UpdateByEmOptions::SharedCtor(::_pb::Arena* arena) {
-  new (&_impl_) Impl_(internal_visibility(), arena);
-  ::memset(reinterpret_cast<char *>(&_impl_) +
-               offsetof(Impl_, big_value_context_),
-           0,
-           offsetof(Impl_, on_zero_delta_time_) -
-               offsetof(Impl_, big_value_context_) +
-               sizeof(Impl_::on_zero_delta_time_));
-}
-UpdateByEmOptions::~UpdateByEmOptions() {
-  // @@protoc_insertion_point(destructor:io.deephaven.proto.backplane.grpc.UpdateByEmOptions)
-  _internal_metadata_.Delete<::google::protobuf::UnknownFieldSet>();
-  SharedDtor();
-}
-inline void UpdateByEmOptions::SharedDtor() {
-  ABSL_DCHECK(GetArena() == nullptr);
-  delete _impl_.big_value_context_;
-  _impl_.~Impl_();
-}
-
-PROTOBUF_NOINLINE void UpdateByEmOptions::Clear() {
-// @@protoc_insertion_point(message_clear_start:io.deephaven.proto.backplane.grpc.UpdateByEmOptions)
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  ::uint32_t cached_has_bits = 0;
-  // Prevent compiler warnings about cached_has_bits being unused
-  (void) cached_has_bits;
-
-  cached_has_bits = _impl_._has_bits_[0];
-  if (cached_has_bits & 0x00000001u) {
-    ABSL_DCHECK(_impl_.big_value_context_ != nullptr);
-    _impl_.big_value_context_->Clear();
-  }
-  ::memset(&_impl_.on_null_value_, 0, static_cast<::size_t>(
-      reinterpret_cast<char*>(&_impl_.on_zero_delta_time_) -
-      reinterpret_cast<char*>(&_impl_.on_null_value_)) + sizeof(_impl_.on_zero_delta_time_));
-  _impl_._has_bits_.Clear();
-  _internal_metadata_.Clear<::google::protobuf::UnknownFieldSet>();
-}
-
-const char* UpdateByEmOptions::_InternalParse(
-    const char* ptr, ::_pbi::ParseContext* ctx) {
-  ptr = ::_pbi::TcParser::ParseLoop(this, ptr, ctx, &_table_.header);
-  return ptr;
-}
-
-
-PROTOBUF_CONSTINIT PROTOBUF_ATTRIBUTE_INIT_PRIORITY1
-const ::_pbi::TcParseTable<3, 6, 1, 0, 2> UpdateByEmOptions::_table_ = {
-  {
-    PROTOBUF_FIELD_OFFSET(UpdateByEmOptions, _impl_._has_bits_),
-    0, // no _extensions_
-    6, 56,  // max_field_number, fast_idx_mask
-    offsetof(decltype(_table_), field_lookup_table),
-    4294967232,  // skipmap
-    offsetof(decltype(_table_), field_entries),
-    6,  // num_field_entries
-    1,  // num_aux_entries
-    offsetof(decltype(_table_), aux_entries),
-    &_UpdateByEmOptions_default_instance_._instance,
-    ::_pbi::TcParser::GenericFallback,  // fallback
-  }, {{
-    {::_pbi::TcParser::MiniParse, {}},
-    // .io.deephaven.proto.backplane.grpc.BadDataBehavior on_null_value = 1;
-    {::_pbi::TcParser::SingularVarintNoZag1<::uint32_t, offsetof(UpdateByEmOptions, _impl_.on_null_value_), 63>(),
-     {8, 63, 0, PROTOBUF_FIELD_OFFSET(UpdateByEmOptions, _impl_.on_null_value_)}},
-    // .io.deephaven.proto.backplane.grpc.BadDataBehavior on_nan_value = 2;
-    {::_pbi::TcParser::SingularVarintNoZag1<::uint32_t, offsetof(UpdateByEmOptions, _impl_.on_nan_value_), 63>(),
-     {16, 63, 0, PROTOBUF_FIELD_OFFSET(UpdateByEmOptions, _impl_.on_nan_value_)}},
-    // .io.deephaven.proto.backplane.grpc.BadDataBehavior on_null_time = 3;
-    {::_pbi::TcParser::SingularVarintNoZag1<::uint32_t, offsetof(UpdateByEmOptions, _impl_.on_null_time_), 63>(),
-     {24, 63, 0, PROTOBUF_FIELD_OFFSET(UpdateByEmOptions, _impl_.on_null_time_)}},
-    // .io.deephaven.proto.backplane.grpc.BadDataBehavior on_negative_delta_time = 4;
-    {::_pbi::TcParser::SingularVarintNoZag1<::uint32_t, offsetof(UpdateByEmOptions, _impl_.on_negative_delta_time_), 63>(),
-     {32, 63, 0, PROTOBUF_FIELD_OFFSET(UpdateByEmOptions, _impl_.on_negative_delta_time_)}},
-    // .io.deephaven.proto.backplane.grpc.BadDataBehavior on_zero_delta_time = 5;
-    {::_pbi::TcParser::SingularVarintNoZag1<::uint32_t, offsetof(UpdateByEmOptions, _impl_.on_zero_delta_time_), 63>(),
-     {40, 63, 0, PROTOBUF_FIELD_OFFSET(UpdateByEmOptions, _impl_.on_zero_delta_time_)}},
-    // .io.deephaven.proto.backplane.grpc.MathContext big_value_context = 6;
-    {::_pbi::TcParser::FastMtS1,
-     {50, 0, 0, PROTOBUF_FIELD_OFFSET(UpdateByEmOptions, _impl_.big_value_context_)}},
-    {::_pbi::TcParser::MiniParse, {}},
-  }}, {{
-    65535, 65535
-  }}, {{
-    // .io.deephaven.proto.backplane.grpc.BadDataBehavior on_null_value = 1;
-    {PROTOBUF_FIELD_OFFSET(UpdateByEmOptions, _impl_.on_null_value_), -1, 0,
-    (0 | ::_fl::kFcSingular | ::_fl::kOpenEnum)},
-    // .io.deephaven.proto.backplane.grpc.BadDataBehavior on_nan_value = 2;
-    {PROTOBUF_FIELD_OFFSET(UpdateByEmOptions, _impl_.on_nan_value_), -1, 0,
-    (0 | ::_fl::kFcSingular | ::_fl::kOpenEnum)},
-    // .io.deephaven.proto.backplane.grpc.BadDataBehavior on_null_time = 3;
-    {PROTOBUF_FIELD_OFFSET(UpdateByEmOptions, _impl_.on_null_time_), -1, 0,
-    (0 | ::_fl::kFcSingular | ::_fl::kOpenEnum)},
-    // .io.deephaven.proto.backplane.grpc.BadDataBehavior on_negative_delta_time = 4;
-    {PROTOBUF_FIELD_OFFSET(UpdateByEmOptions, _impl_.on_negative_delta_time_), -1, 0,
-    (0 | ::_fl::kFcSingular | ::_fl::kOpenEnum)},
-    // .io.deephaven.proto.backplane.grpc.BadDataBehavior on_zero_delta_time = 5;
-    {PROTOBUF_FIELD_OFFSET(UpdateByEmOptions, _impl_.on_zero_delta_time_), -1, 0,
-    (0 | ::_fl::kFcSingular | ::_fl::kOpenEnum)},
-    // .io.deephaven.proto.backplane.grpc.MathContext big_value_context = 6;
-    {PROTOBUF_FIELD_OFFSET(UpdateByEmOptions, _impl_.big_value_context_), _Internal::kHasBitsOffset + 0, 0,
-    (0 | ::_fl::kFcOptional | ::_fl::kMessage | ::_fl::kTvTable)},
-  }}, {{
-    {::_pbi::TcParser::GetTable<::io::deephaven::proto::backplane::grpc::MathContext>()},
-  }}, {{
-  }},
-};
-
-::uint8_t* UpdateByEmOptions::_InternalSerialize(
-    ::uint8_t* target,
-    ::google::protobuf::io::EpsCopyOutputStream* stream) const {
-  // @@protoc_insertion_point(serialize_to_array_start:io.deephaven.proto.backplane.grpc.UpdateByEmOptions)
-  ::uint32_t cached_has_bits = 0;
-  (void)cached_has_bits;
-
-  // .io.deephaven.proto.backplane.grpc.BadDataBehavior on_null_value = 1;
-  if (this->_internal_on_null_value() != 0) {
-    target = stream->EnsureSpace(target);
-    target = ::_pbi::WireFormatLite::WriteEnumToArray(
-        1, this->_internal_on_null_value(), target);
-  }
-
-  // .io.deephaven.proto.backplane.grpc.BadDataBehavior on_nan_value = 2;
-  if (this->_internal_on_nan_value() != 0) {
-    target = stream->EnsureSpace(target);
-    target = ::_pbi::WireFormatLite::WriteEnumToArray(
-        2, this->_internal_on_nan_value(), target);
-  }
-
-  // .io.deephaven.proto.backplane.grpc.BadDataBehavior on_null_time = 3;
-  if (this->_internal_on_null_time() != 0) {
-    target = stream->EnsureSpace(target);
-    target = ::_pbi::WireFormatLite::WriteEnumToArray(
-        3, this->_internal_on_null_time(), target);
-  }
-
-  // .io.deephaven.proto.backplane.grpc.BadDataBehavior on_negative_delta_time = 4;
-  if (this->_internal_on_negative_delta_time() != 0) {
-    target = stream->EnsureSpace(target);
-    target = ::_pbi::WireFormatLite::WriteEnumToArray(
-        4, this->_internal_on_negative_delta_time(), target);
-  }
-
-  // .io.deephaven.proto.backplane.grpc.BadDataBehavior on_zero_delta_time = 5;
-  if (this->_internal_on_zero_delta_time() != 0) {
-    target = stream->EnsureSpace(target);
-    target = ::_pbi::WireFormatLite::WriteEnumToArray(
-        5, this->_internal_on_zero_delta_time(), target);
-  }
-
-  cached_has_bits = _impl_._has_bits_[0];
-  // .io.deephaven.proto.backplane.grpc.MathContext big_value_context = 6;
-  if (cached_has_bits & 0x00000001u) {
-    target = ::google::protobuf::internal::WireFormatLite::InternalWriteMessage(
-        6, _Internal::big_value_context(this),
-        _Internal::big_value_context(this).GetCachedSize(), target, stream);
-  }
-
-  if (PROTOBUF_PREDICT_FALSE(_internal_metadata_.have_unknown_fields())) {
-    target =
-        ::_pbi::WireFormat::InternalSerializeUnknownFieldsToArray(
-            _internal_metadata_.unknown_fields<::google::protobuf::UnknownFieldSet>(::google::protobuf::UnknownFieldSet::default_instance), target, stream);
-  }
-  // @@protoc_insertion_point(serialize_to_array_end:io.deephaven.proto.backplane.grpc.UpdateByEmOptions)
-  return target;
-}
-
-::size_t UpdateByEmOptions::ByteSizeLong() const {
-// @@protoc_insertion_point(message_byte_size_start:io.deephaven.proto.backplane.grpc.UpdateByEmOptions)
-  ::size_t total_size = 0;
-
-  ::uint32_t cached_has_bits = 0;
-  // Prevent compiler warnings about cached_has_bits being unused
-  (void) cached_has_bits;
-
-  // .io.deephaven.proto.backplane.grpc.MathContext big_value_context = 6;
-  cached_has_bits = _impl_._has_bits_[0];
-  if (cached_has_bits & 0x00000001u) {
-    total_size +=
-        1 + ::google::protobuf::internal::WireFormatLite::MessageSize(*_impl_.big_value_context_);
-  }
-
-  // .io.deephaven.proto.backplane.grpc.BadDataBehavior on_null_value = 1;
-  if (this->_internal_on_null_value() != 0) {
-    total_size += 1 +
-                  ::_pbi::WireFormatLite::EnumSize(this->_internal_on_null_value());
-  }
-
-  // .io.deephaven.proto.backplane.grpc.BadDataBehavior on_nan_value = 2;
-  if (this->_internal_on_nan_value() != 0) {
-    total_size += 1 +
-                  ::_pbi::WireFormatLite::EnumSize(this->_internal_on_nan_value());
-  }
-
-  // .io.deephaven.proto.backplane.grpc.BadDataBehavior on_null_time = 3;
-  if (this->_internal_on_null_time() != 0) {
-    total_size += 1 +
-                  ::_pbi::WireFormatLite::EnumSize(this->_internal_on_null_time());
-  }
-
-  // .io.deephaven.proto.backplane.grpc.BadDataBehavior on_negative_delta_time = 4;
-  if (this->_internal_on_negative_delta_time() != 0) {
-    total_size += 1 +
-                  ::_pbi::WireFormatLite::EnumSize(this->_internal_on_negative_delta_time());
-  }
-
-  // .io.deephaven.proto.backplane.grpc.BadDataBehavior on_zero_delta_time = 5;
-  if (this->_internal_on_zero_delta_time() != 0) {
-    total_size += 1 +
-                  ::_pbi::WireFormatLite::EnumSize(this->_internal_on_zero_delta_time());
-  }
-
-  return MaybeComputeUnknownFieldsSize(total_size, &_impl_._cached_size_);
-}
-
-const ::google::protobuf::Message::ClassData UpdateByEmOptions::_class_data_ = {
-    UpdateByEmOptions::MergeImpl,
-    nullptr,  // OnDemandRegisterArenaDtor
-};
-const ::google::protobuf::Message::ClassData* UpdateByEmOptions::GetClassData() const {
-  return &_class_data_;
-}
-
-void UpdateByEmOptions::MergeImpl(::google::protobuf::Message& to_msg, const ::google::protobuf::Message& from_msg) {
-  auto* const _this = static_cast<UpdateByEmOptions*>(&to_msg);
-  auto& from = static_cast<const UpdateByEmOptions&>(from_msg);
-  // @@protoc_insertion_point(class_specific_merge_from_start:io.deephaven.proto.backplane.grpc.UpdateByEmOptions)
-  ABSL_DCHECK_NE(&from, _this);
-  ::uint32_t cached_has_bits = 0;
-  (void) cached_has_bits;
-
-  if ((from._impl_._has_bits_[0] & 0x00000001u) != 0) {
-    _this->_internal_mutable_big_value_context()->::io::deephaven::proto::backplane::grpc::MathContext::MergeFrom(
-        from._internal_big_value_context());
-  }
-  if (from._internal_on_null_value() != 0) {
-    _this->_internal_set_on_null_value(from._internal_on_null_value());
-  }
-  if (from._internal_on_nan_value() != 0) {
-    _this->_internal_set_on_nan_value(from._internal_on_nan_value());
-  }
-  if (from._internal_on_null_time() != 0) {
-    _this->_internal_set_on_null_time(from._internal_on_null_time());
-  }
-  if (from._internal_on_negative_delta_time() != 0) {
-    _this->_internal_set_on_negative_delta_time(from._internal_on_negative_delta_time());
-  }
-  if (from._internal_on_zero_delta_time() != 0) {
-    _this->_internal_set_on_zero_delta_time(from._internal_on_zero_delta_time());
-  }
-  _this->_internal_metadata_.MergeFrom<::google::protobuf::UnknownFieldSet>(from._internal_metadata_);
-}
-
-void UpdateByEmOptions::CopyFrom(const UpdateByEmOptions& from) {
-// @@protoc_insertion_point(class_specific_copy_from_start:io.deephaven.proto.backplane.grpc.UpdateByEmOptions)
-  if (&from == this) return;
-  Clear();
-  MergeFrom(from);
-}
-
-PROTOBUF_NOINLINE bool UpdateByEmOptions::IsInitialized() const {
-  return true;
-}
-
-::_pbi::CachedSize* UpdateByEmOptions::AccessCachedSize() const {
-  return &_impl_._cached_size_;
-}
-void UpdateByEmOptions::InternalSwap(UpdateByEmOptions* PROTOBUF_RESTRICT other) {
-  using std::swap;
-  _internal_metadata_.InternalSwap(&other->_internal_metadata_);
-  swap(_impl_._has_bits_[0], other->_impl_._has_bits_[0]);
-  ::google::protobuf::internal::memswap<
-      PROTOBUF_FIELD_OFFSET(UpdateByEmOptions, _impl_.on_zero_delta_time_)
-      + sizeof(UpdateByEmOptions::_impl_.on_zero_delta_time_)
-      - PROTOBUF_FIELD_OFFSET(UpdateByEmOptions, _impl_.big_value_context_)>(
-          reinterpret_cast<char*>(&_impl_.big_value_context_),
-          reinterpret_cast<char*>(&other->_impl_.big_value_context_));
-}
-
-::google::protobuf::Metadata UpdateByEmOptions::GetMetadata() const {
-  return ::_pbi::AssignDescriptors(
-      &descriptor_table_deephaven_2fproto_2ftable_2eproto_getter, &descriptor_table_deephaven_2fproto_2ftable_2eproto_once,
-      file_level_metadata_deephaven_2fproto_2ftable_2eproto[13]);
-}
-// ===================================================================
-
-class UpdateByDeltaOptions::_Internal {
- public:
-};
-
-UpdateByDeltaOptions::UpdateByDeltaOptions(::google::protobuf::Arena* arena)
-    : ::google::protobuf::Message(arena) {
-  SharedCtor(arena);
-  // @@protoc_insertion_point(arena_constructor:io.deephaven.proto.backplane.grpc.UpdateByDeltaOptions)
-}
-UpdateByDeltaOptions::UpdateByDeltaOptions(
-    ::google::protobuf::Arena* arena, const UpdateByDeltaOptions& from)
-    : UpdateByDeltaOptions(arena) {
-  MergeFrom(from);
-}
-inline PROTOBUF_NDEBUG_INLINE UpdateByDeltaOptions::Impl_::Impl_(
-    ::google::protobuf::internal::InternalVisibility visibility,
-    ::google::protobuf::Arena* arena)
-      : _cached_size_{0} {}
-
-inline void UpdateByDeltaOptions::SharedCtor(::_pb::Arena* arena) {
-  new (&_impl_) Impl_(internal_visibility(), arena);
-  _impl_.null_behavior_ = {};
-}
-UpdateByDeltaOptions::~UpdateByDeltaOptions() {
-  // @@protoc_insertion_point(destructor:io.deephaven.proto.backplane.grpc.UpdateByDeltaOptions)
-  _internal_metadata_.Delete<::google::protobuf::UnknownFieldSet>();
-  SharedDtor();
-}
-inline void UpdateByDeltaOptions::SharedDtor() {
-  ABSL_DCHECK(GetArena() == nullptr);
-  _impl_.~Impl_();
-}
-
-PROTOBUF_NOINLINE void UpdateByDeltaOptions::Clear() {
-// @@protoc_insertion_point(message_clear_start:io.deephaven.proto.backplane.grpc.UpdateByDeltaOptions)
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  ::uint32_t cached_has_bits = 0;
-  // Prevent compiler warnings about cached_has_bits being unused
-  (void) cached_has_bits;
-
-  _impl_.null_behavior_ = 0;
-  _internal_metadata_.Clear<::google::protobuf::UnknownFieldSet>();
-}
-
-const char* UpdateByDeltaOptions::_InternalParse(
-    const char* ptr, ::_pbi::ParseContext* ctx) {
-  ptr = ::_pbi::TcParser::ParseLoop(this, ptr, ctx, &_table_.header);
-  return ptr;
-}
-
-
-PROTOBUF_CONSTINIT PROTOBUF_ATTRIBUTE_INIT_PRIORITY1
-const ::_pbi::TcParseTable<0, 1, 0, 0, 2> UpdateByDeltaOptions::_table_ = {
-  {
-    0,  // no _has_bits_
-    0, // no _extensions_
-    1, 0,  // max_field_number, fast_idx_mask
-    offsetof(decltype(_table_), field_lookup_table),
-    4294967294,  // skipmap
-    offsetof(decltype(_table_), field_entries),
-    1,  // num_field_entries
-    0,  // num_aux_entries
-    offsetof(decltype(_table_), field_names),  // no aux_entries
-    &_UpdateByDeltaOptions_default_instance_._instance,
-    ::_pbi::TcParser::GenericFallback,  // fallback
-  }, {{
-    // .io.deephaven.proto.backplane.grpc.UpdateByNullBehavior null_behavior = 1;
-    {::_pbi::TcParser::SingularVarintNoZag1<::uint32_t, offsetof(UpdateByDeltaOptions, _impl_.null_behavior_), 63>(),
-     {8, 63, 0, PROTOBUF_FIELD_OFFSET(UpdateByDeltaOptions, _impl_.null_behavior_)}},
-  }}, {{
-    65535, 65535
-  }}, {{
-    // .io.deephaven.proto.backplane.grpc.UpdateByNullBehavior null_behavior = 1;
-    {PROTOBUF_FIELD_OFFSET(UpdateByDeltaOptions, _impl_.null_behavior_), 0, 0,
-    (0 | ::_fl::kFcSingular | ::_fl::kOpenEnum)},
-  }},
-  // no aux_entries
-  {{
-  }},
-};
-
-::uint8_t* UpdateByDeltaOptions::_InternalSerialize(
-    ::uint8_t* target,
-    ::google::protobuf::io::EpsCopyOutputStream* stream) const {
-  // @@protoc_insertion_point(serialize_to_array_start:io.deephaven.proto.backplane.grpc.UpdateByDeltaOptions)
-  ::uint32_t cached_has_bits = 0;
-  (void)cached_has_bits;
-
-  // .io.deephaven.proto.backplane.grpc.UpdateByNullBehavior null_behavior = 1;
-  if (this->_internal_null_behavior() != 0) {
-    target = stream->EnsureSpace(target);
-    target = ::_pbi::WireFormatLite::WriteEnumToArray(
-        1, this->_internal_null_behavior(), target);
-  }
-
-  if (PROTOBUF_PREDICT_FALSE(_internal_metadata_.have_unknown_fields())) {
-    target =
-        ::_pbi::WireFormat::InternalSerializeUnknownFieldsToArray(
-            _internal_metadata_.unknown_fields<::google::protobuf::UnknownFieldSet>(::google::protobuf::UnknownFieldSet::default_instance), target, stream);
-  }
-  // @@protoc_insertion_point(serialize_to_array_end:io.deephaven.proto.backplane.grpc.UpdateByDeltaOptions)
-  return target;
-}
-
-::size_t UpdateByDeltaOptions::ByteSizeLong() const {
-// @@protoc_insertion_point(message_byte_size_start:io.deephaven.proto.backplane.grpc.UpdateByDeltaOptions)
-  ::size_t total_size = 0;
-
-  ::uint32_t cached_has_bits = 0;
-  // Prevent compiler warnings about cached_has_bits being unused
-  (void) cached_has_bits;
-
-  // .io.deephaven.proto.backplane.grpc.UpdateByNullBehavior null_behavior = 1;
-  if (this->_internal_null_behavior() != 0) {
-    total_size += 1 +
-                  ::_pbi::WireFormatLite::EnumSize(this->_internal_null_behavior());
-  }
-
-  return MaybeComputeUnknownFieldsSize(total_size, &_impl_._cached_size_);
-}
-
-const ::google::protobuf::Message::ClassData UpdateByDeltaOptions::_class_data_ = {
-    UpdateByDeltaOptions::MergeImpl,
-    nullptr,  // OnDemandRegisterArenaDtor
-};
-const ::google::protobuf::Message::ClassData* UpdateByDeltaOptions::GetClassData() const {
-  return &_class_data_;
-}
-
-void UpdateByDeltaOptions::MergeImpl(::google::protobuf::Message& to_msg, const ::google::protobuf::Message& from_msg) {
-  auto* const _this = static_cast<UpdateByDeltaOptions*>(&to_msg);
-  auto& from = static_cast<const UpdateByDeltaOptions&>(from_msg);
-  // @@protoc_insertion_point(class_specific_merge_from_start:io.deephaven.proto.backplane.grpc.UpdateByDeltaOptions)
-  ABSL_DCHECK_NE(&from, _this);
-  ::uint32_t cached_has_bits = 0;
-  (void) cached_has_bits;
-
-  if (from._internal_null_behavior() != 0) {
-    _this->_internal_set_null_behavior(from._internal_null_behavior());
-  }
-  _this->_internal_metadata_.MergeFrom<::google::protobuf::UnknownFieldSet>(from._internal_metadata_);
-}
-
-void UpdateByDeltaOptions::CopyFrom(const UpdateByDeltaOptions& from) {
-// @@protoc_insertion_point(class_specific_copy_from_start:io.deephaven.proto.backplane.grpc.UpdateByDeltaOptions)
-  if (&from == this) return;
-  Clear();
-  MergeFrom(from);
-}
-
-PROTOBUF_NOINLINE bool UpdateByDeltaOptions::IsInitialized() const {
-  return true;
-}
-
-::_pbi::CachedSize* UpdateByDeltaOptions::AccessCachedSize() const {
-  return &_impl_._cached_size_;
-}
-void UpdateByDeltaOptions::InternalSwap(UpdateByDeltaOptions* PROTOBUF_RESTRICT other) {
-  using std::swap;
-  _internal_metadata_.InternalSwap(&other->_internal_metadata_);
-  swap(_impl_.null_behavior_, other->_impl_.null_behavior_);
-}
-
-::google::protobuf::Metadata UpdateByDeltaOptions::GetMetadata() const {
-  return ::_pbi::AssignDescriptors(
-      &descriptor_table_deephaven_2fproto_2ftable_2eproto_getter, &descriptor_table_deephaven_2fproto_2ftable_2eproto_once,
-      file_level_metadata_deephaven_2fproto_2ftable_2eproto[14]);
-}
-// ===================================================================
-
-class UpdateByRequest_UpdateByOptions::_Internal {
- public:
-  using HasBits = decltype(std::declval<UpdateByRequest_UpdateByOptions>()._impl_._has_bits_);
-  static constexpr ::int32_t kHasBitsOffset =
-    8 * PROTOBUF_FIELD_OFFSET(UpdateByRequest_UpdateByOptions, _impl_._has_bits_);
-  static void set_has_use_redirection(HasBits* has_bits) {
-    (*has_bits)[0] |= 2u;
-  }
-  static void set_has_chunk_capacity(HasBits* has_bits) {
-    (*has_bits)[0] |= 4u;
-  }
-  static void set_has_max_static_sparse_memory_overhead(HasBits* has_bits) {
-    (*has_bits)[0] |= 8u;
-  }
-  static void set_has_initial_hash_table_size(HasBits* has_bits) {
-    (*has_bits)[0] |= 64u;
-  }
-  static void set_has_maximum_load_factor(HasBits* has_bits) {
-    (*has_bits)[0] |= 16u;
-  }
-  static void set_has_target_load_factor(HasBits* has_bits) {
-    (*has_bits)[0] |= 32u;
-  }
-  static const ::io::deephaven::proto::backplane::grpc::MathContext& math_context(const UpdateByRequest_UpdateByOptions* msg);
-  static void set_has_math_context(HasBits* has_bits) {
-    (*has_bits)[0] |= 1u;
-  }
-};
-
-const ::io::deephaven::proto::backplane::grpc::MathContext& UpdateByRequest_UpdateByOptions::_Internal::math_context(const UpdateByRequest_UpdateByOptions* msg) {
-  return *msg->_impl_.math_context_;
-}
-UpdateByRequest_UpdateByOptions::UpdateByRequest_UpdateByOptions(::google::protobuf::Arena* arena)
-    : ::google::protobuf::Message(arena) {
-  SharedCtor(arena);
-  // @@protoc_insertion_point(arena_constructor:io.deephaven.proto.backplane.grpc.UpdateByRequest.UpdateByOptions)
-}
-inline PROTOBUF_NDEBUG_INLINE UpdateByRequest_UpdateByOptions::Impl_::Impl_(
-    ::google::protobuf::internal::InternalVisibility visibility, ::google::protobuf::Arena* arena,
-    const Impl_& from)
-      : _has_bits_{from._has_bits_},
-        _cached_size_{0} {}
-
-UpdateByRequest_UpdateByOptions::UpdateByRequest_UpdateByOptions(
-    ::google::protobuf::Arena* arena,
-    const UpdateByRequest_UpdateByOptions& from)
-    : ::google::protobuf::Message(arena) {
-  UpdateByRequest_UpdateByOptions* const _this = this;
-  (void)_this;
-  _internal_metadata_.MergeFrom<::google::protobuf::UnknownFieldSet>(
-      from._internal_metadata_);
-  new (&_impl_) Impl_(internal_visibility(), arena, from._impl_);
-  ::uint32_t cached_has_bits = _impl_._has_bits_[0];
-  _impl_.math_context_ = (cached_has_bits & 0x00000001u)
-                ? CreateMaybeMessage<::io::deephaven::proto::backplane::grpc::MathContext>(arena, *from._impl_.math_context_)
-                : nullptr;
-  ::memcpy(reinterpret_cast<char *>(&_impl_) +
-               offsetof(Impl_, use_redirection_),
-           reinterpret_cast<const char *>(&from._impl_) +
-               offsetof(Impl_, use_redirection_),
-           offsetof(Impl_, initial_hash_table_size_) -
-               offsetof(Impl_, use_redirection_) +
-               sizeof(Impl_::initial_hash_table_size_));
-
-  // @@protoc_insertion_point(copy_constructor:io.deephaven.proto.backplane.grpc.UpdateByRequest.UpdateByOptions)
-}
-inline PROTOBUF_NDEBUG_INLINE UpdateByRequest_UpdateByOptions::Impl_::Impl_(
-    ::google::protobuf::internal::InternalVisibility visibility,
-    ::google::protobuf::Arena* arena)
-      : _cached_size_{0} {}
-
-inline void UpdateByRequest_UpdateByOptions::SharedCtor(::_pb::Arena* arena) {
-  new (&_impl_) Impl_(internal_visibility(), arena);
-  ::memset(reinterpret_cast<char *>(&_impl_) +
-               offsetof(Impl_, math_context_),
-           0,
-           offsetof(Impl_, initial_hash_table_size_) -
-               offsetof(Impl_, math_context_) +
-               sizeof(Impl_::initial_hash_table_size_));
-}
-UpdateByRequest_UpdateByOptions::~UpdateByRequest_UpdateByOptions() {
-  // @@protoc_insertion_point(destructor:io.deephaven.proto.backplane.grpc.UpdateByRequest.UpdateByOptions)
-  _internal_metadata_.Delete<::google::protobuf::UnknownFieldSet>();
-  SharedDtor();
-}
-inline void UpdateByRequest_UpdateByOptions::SharedDtor() {
-  ABSL_DCHECK(GetArena() == nullptr);
-  delete _impl_.math_context_;
-  _impl_.~Impl_();
-}
-
-PROTOBUF_NOINLINE void UpdateByRequest_UpdateByOptions::Clear() {
-// @@protoc_insertion_point(message_clear_start:io.deephaven.proto.backplane.grpc.UpdateByRequest.UpdateByOptions)
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  ::uint32_t cached_has_bits = 0;
-  // Prevent compiler warnings about cached_has_bits being unused
-  (void) cached_has_bits;
-
-  cached_has_bits = _impl_._has_bits_[0];
-  if (cached_has_bits & 0x00000001u) {
-    ABSL_DCHECK(_impl_.math_context_ != nullptr);
-    _impl_.math_context_->Clear();
-  }
-  if (cached_has_bits & 0x0000007eu) {
-    ::memset(&_impl_.use_redirection_, 0, static_cast<::size_t>(
-        reinterpret_cast<char*>(&_impl_.initial_hash_table_size_) -
-        reinterpret_cast<char*>(&_impl_.use_redirection_)) + sizeof(_impl_.initial_hash_table_size_));
-  }
-  _impl_._has_bits_.Clear();
-  _internal_metadata_.Clear<::google::protobuf::UnknownFieldSet>();
-}
-
-const char* UpdateByRequest_UpdateByOptions::_InternalParse(
-    const char* ptr, ::_pbi::ParseContext* ctx) {
-  ptr = ::_pbi::TcParser::ParseLoop(this, ptr, ctx, &_table_.header);
-  return ptr;
-}
-
-
-PROTOBUF_CONSTINIT PROTOBUF_ATTRIBUTE_INIT_PRIORITY1
-const ::_pbi::TcParseTable<3, 7, 1, 0, 2> UpdateByRequest_UpdateByOptions::_table_ = {
-  {
-    PROTOBUF_FIELD_OFFSET(UpdateByRequest_UpdateByOptions, _impl_._has_bits_),
-    0, // no _extensions_
-    7, 56,  // max_field_number, fast_idx_mask
-    offsetof(decltype(_table_), field_lookup_table),
-    4294967168,  // skipmap
-    offsetof(decltype(_table_), field_entries),
-    7,  // num_field_entries
-    1,  // num_aux_entries
-    offsetof(decltype(_table_), aux_entries),
-    &_UpdateByRequest_UpdateByOptions_default_instance_._instance,
-    ::_pbi::TcParser::GenericFallback,  // fallback
-  }, {{
-    {::_pbi::TcParser::MiniParse, {}},
-    // optional bool use_redirection = 1;
-    {::_pbi::TcParser::SingularVarintNoZag1<bool, offsetof(UpdateByRequest_UpdateByOptions, _impl_.use_redirection_), 1>(),
-     {8, 1, 0, PROTOBUF_FIELD_OFFSET(UpdateByRequest_UpdateByOptions, _impl_.use_redirection_)}},
-    // optional int32 chunk_capacity = 2;
-    {::_pbi::TcParser::SingularVarintNoZag1<::uint32_t, offsetof(UpdateByRequest_UpdateByOptions, _impl_.chunk_capacity_), 2>(),
-     {16, 2, 0, PROTOBUF_FIELD_OFFSET(UpdateByRequest_UpdateByOptions, _impl_.chunk_capacity_)}},
-    // optional double max_static_sparse_memory_overhead = 3;
-    {::_pbi::TcParser::FastF64S1,
-     {25, 3, 0, PROTOBUF_FIELD_OFFSET(UpdateByRequest_UpdateByOptions, _impl_.max_static_sparse_memory_overhead_)}},
-    // optional int32 initial_hash_table_size = 4;
-    {::_pbi::TcParser::SingularVarintNoZag1<::uint32_t, offsetof(UpdateByRequest_UpdateByOptions, _impl_.initial_hash_table_size_), 6>(),
-     {32, 6, 0, PROTOBUF_FIELD_OFFSET(UpdateByRequest_UpdateByOptions, _impl_.initial_hash_table_size_)}},
-    // optional double maximum_load_factor = 5;
-    {::_pbi::TcParser::FastF64S1,
-     {41, 4, 0, PROTOBUF_FIELD_OFFSET(UpdateByRequest_UpdateByOptions, _impl_.maximum_load_factor_)}},
-    // optional double target_load_factor = 6;
-    {::_pbi::TcParser::FastF64S1,
-     {49, 5, 0, PROTOBUF_FIELD_OFFSET(UpdateByRequest_UpdateByOptions, _impl_.target_load_factor_)}},
-    // .io.deephaven.proto.backplane.grpc.MathContext math_context = 7;
-    {::_pbi::TcParser::FastMtS1,
-     {58, 0, 0, PROTOBUF_FIELD_OFFSET(UpdateByRequest_UpdateByOptions, _impl_.math_context_)}},
-  }}, {{
-    65535, 65535
-  }}, {{
-    // optional bool use_redirection = 1;
-    {PROTOBUF_FIELD_OFFSET(UpdateByRequest_UpdateByOptions, _impl_.use_redirection_), _Internal::kHasBitsOffset + 1, 0,
-    (0 | ::_fl::kFcOptional | ::_fl::kBool)},
-    // optional int32 chunk_capacity = 2;
-    {PROTOBUF_FIELD_OFFSET(UpdateByRequest_UpdateByOptions, _impl_.chunk_capacity_), _Internal::kHasBitsOffset + 2, 0,
-    (0 | ::_fl::kFcOptional | ::_fl::kInt32)},
-    // optional double max_static_sparse_memory_overhead = 3;
-    {PROTOBUF_FIELD_OFFSET(UpdateByRequest_UpdateByOptions, _impl_.max_static_sparse_memory_overhead_), _Internal::kHasBitsOffset + 3, 0,
-    (0 | ::_fl::kFcOptional | ::_fl::kDouble)},
-    // optional int32 initial_hash_table_size = 4;
-    {PROTOBUF_FIELD_OFFSET(UpdateByRequest_UpdateByOptions, _impl_.initial_hash_table_size_), _Internal::kHasBitsOffset + 6, 0,
-    (0 | ::_fl::kFcOptional | ::_fl::kInt32)},
-    // optional double maximum_load_factor = 5;
-    {PROTOBUF_FIELD_OFFSET(UpdateByRequest_UpdateByOptions, _impl_.maximum_load_factor_), _Internal::kHasBitsOffset + 4, 0,
-    (0 | ::_fl::kFcOptional | ::_fl::kDouble)},
-    // optional double target_load_factor = 6;
-    {PROTOBUF_FIELD_OFFSET(UpdateByRequest_UpdateByOptions, _impl_.target_load_factor_), _Internal::kHasBitsOffset + 5, 0,
-    (0 | ::_fl::kFcOptional | ::_fl::kDouble)},
-    // .io.deephaven.proto.backplane.grpc.MathContext math_context = 7;
-    {PROTOBUF_FIELD_OFFSET(UpdateByRequest_UpdateByOptions, _impl_.math_context_), _Internal::kHasBitsOffset + 0, 0,
-    (0 | ::_fl::kFcOptional | ::_fl::kMessage | ::_fl::kTvTable)},
-  }}, {{
-    {::_pbi::TcParser::GetTable<::io::deephaven::proto::backplane::grpc::MathContext>()},
-  }}, {{
-  }},
-};
-
-::uint8_t* UpdateByRequest_UpdateByOptions::_InternalSerialize(
-    ::uint8_t* target,
-    ::google::protobuf::io::EpsCopyOutputStream* stream) const {
-  // @@protoc_insertion_point(serialize_to_array_start:io.deephaven.proto.backplane.grpc.UpdateByRequest.UpdateByOptions)
-  ::uint32_t cached_has_bits = 0;
-  (void)cached_has_bits;
-
-  cached_has_bits = _impl_._has_bits_[0];
-  // optional bool use_redirection = 1;
-  if (cached_has_bits & 0x00000002u) {
-    target = stream->EnsureSpace(target);
-    target = ::_pbi::WireFormatLite::WriteBoolToArray(
-        1, this->_internal_use_redirection(), target);
-  }
-
-  // optional int32 chunk_capacity = 2;
-  if (cached_has_bits & 0x00000004u) {
-    target = ::google::protobuf::internal::WireFormatLite::
-        WriteInt32ToArrayWithField<2>(
-            stream, this->_internal_chunk_capacity(), target);
-  }
-
-  // optional double max_static_sparse_memory_overhead = 3;
-  if (cached_has_bits & 0x00000008u) {
-    target = stream->EnsureSpace(target);
-    target = ::_pbi::WireFormatLite::WriteDoubleToArray(
-        3, this->_internal_max_static_sparse_memory_overhead(), target);
-  }
-
-  // optional int32 initial_hash_table_size = 4;
-  if (cached_has_bits & 0x00000040u) {
-    target = ::google::protobuf::internal::WireFormatLite::
-        WriteInt32ToArrayWithField<4>(
-            stream, this->_internal_initial_hash_table_size(), target);
-  }
-
-  // optional double maximum_load_factor = 5;
-  if (cached_has_bits & 0x00000010u) {
-    target = stream->EnsureSpace(target);
-    target = ::_pbi::WireFormatLite::WriteDoubleToArray(
-        5, this->_internal_maximum_load_factor(), target);
-  }
-
-  // optional double target_load_factor = 6;
-  if (cached_has_bits & 0x00000020u) {
-    target = stream->EnsureSpace(target);
-    target = ::_pbi::WireFormatLite::WriteDoubleToArray(
-        6, this->_internal_target_load_factor(), target);
-  }
-
-  // .io.deephaven.proto.backplane.grpc.MathContext math_context = 7;
-  if (cached_has_bits & 0x00000001u) {
-    target = ::google::protobuf::internal::WireFormatLite::InternalWriteMessage(
-        7, _Internal::math_context(this),
-        _Internal::math_context(this).GetCachedSize(), target, stream);
-  }
-
-  if (PROTOBUF_PREDICT_FALSE(_internal_metadata_.have_unknown_fields())) {
-    target =
-        ::_pbi::WireFormat::InternalSerializeUnknownFieldsToArray(
-            _internal_metadata_.unknown_fields<::google::protobuf::UnknownFieldSet>(::google::protobuf::UnknownFieldSet::default_instance), target, stream);
-  }
-  // @@protoc_insertion_point(serialize_to_array_end:io.deephaven.proto.backplane.grpc.UpdateByRequest.UpdateByOptions)
-  return target;
-}
-
-::size_t UpdateByRequest_UpdateByOptions::ByteSizeLong() const {
-// @@protoc_insertion_point(message_byte_size_start:io.deephaven.proto.backplane.grpc.UpdateByRequest.UpdateByOptions)
-  ::size_t total_size = 0;
-
-  ::uint32_t cached_has_bits = 0;
-  // Prevent compiler warnings about cached_has_bits being unused
-  (void) cached_has_bits;
-
-  cached_has_bits = _impl_._has_bits_[0];
-  if (cached_has_bits & 0x0000007fu) {
-    // .io.deephaven.proto.backplane.grpc.MathContext math_context = 7;
-    if (cached_has_bits & 0x00000001u) {
-      total_size +=
-          1 + ::google::protobuf::internal::WireFormatLite::MessageSize(*_impl_.math_context_);
-    }
-
-    // optional bool use_redirection = 1;
-    if (cached_has_bits & 0x00000002u) {
-      total_size += 2;
-    }
-
-    // optional int32 chunk_capacity = 2;
-    if (cached_has_bits & 0x00000004u) {
-      total_size += ::_pbi::WireFormatLite::Int32SizePlusOne(
-          this->_internal_chunk_capacity());
-    }
-
-    // optional double max_static_sparse_memory_overhead = 3;
-    if (cached_has_bits & 0x00000008u) {
-      total_size += 9;
-    }
-
-    // optional double maximum_load_factor = 5;
-    if (cached_has_bits & 0x00000010u) {
-      total_size += 9;
-    }
-
-    // optional double target_load_factor = 6;
-    if (cached_has_bits & 0x00000020u) {
-      total_size += 9;
-    }
-
-    // optional int32 initial_hash_table_size = 4;
-    if (cached_has_bits & 0x00000040u) {
-      total_size += ::_pbi::WireFormatLite::Int32SizePlusOne(
-          this->_internal_initial_hash_table_size());
-    }
-
-  }
-  return MaybeComputeUnknownFieldsSize(total_size, &_impl_._cached_size_);
-}
-
-const ::google::protobuf::Message::ClassData UpdateByRequest_UpdateByOptions::_class_data_ = {
-    UpdateByRequest_UpdateByOptions::MergeImpl,
-    nullptr,  // OnDemandRegisterArenaDtor
-};
-const ::google::protobuf::Message::ClassData* UpdateByRequest_UpdateByOptions::GetClassData() const {
-  return &_class_data_;
-}
-
-void UpdateByRequest_UpdateByOptions::MergeImpl(::google::protobuf::Message& to_msg, const ::google::protobuf::Message& from_msg) {
-  auto* const _this = static_cast<UpdateByRequest_UpdateByOptions*>(&to_msg);
-  auto& from = static_cast<const UpdateByRequest_UpdateByOptions&>(from_msg);
-  // @@protoc_insertion_point(class_specific_merge_from_start:io.deephaven.proto.backplane.grpc.UpdateByRequest.UpdateByOptions)
-  ABSL_DCHECK_NE(&from, _this);
-  ::uint32_t cached_has_bits = 0;
-  (void) cached_has_bits;
-
-  cached_has_bits = from._impl_._has_bits_[0];
-  if (cached_has_bits & 0x0000007fu) {
-    if (cached_has_bits & 0x00000001u) {
-      _this->_internal_mutable_math_context()->::io::deephaven::proto::backplane::grpc::MathContext::MergeFrom(
-          from._internal_math_context());
-    }
-    if (cached_has_bits & 0x00000002u) {
-      _this->_impl_.use_redirection_ = from._impl_.use_redirection_;
-    }
-    if (cached_has_bits & 0x00000004u) {
-      _this->_impl_.chunk_capacity_ = from._impl_.chunk_capacity_;
-    }
-    if (cached_has_bits & 0x00000008u) {
-      _this->_impl_.max_static_sparse_memory_overhead_ = from._impl_.max_static_sparse_memory_overhead_;
-    }
-    if (cached_has_bits & 0x00000010u) {
-      _this->_impl_.maximum_load_factor_ = from._impl_.maximum_load_factor_;
-    }
-    if (cached_has_bits & 0x00000020u) {
-      _this->_impl_.target_load_factor_ = from._impl_.target_load_factor_;
-    }
-    if (cached_has_bits & 0x00000040u) {
-      _this->_impl_.initial_hash_table_size_ = from._impl_.initial_hash_table_size_;
-    }
-    _this->_impl_._has_bits_[0] |= cached_has_bits;
-  }
-  _this->_internal_metadata_.MergeFrom<::google::protobuf::UnknownFieldSet>(from._internal_metadata_);
-}
-
-void UpdateByRequest_UpdateByOptions::CopyFrom(const UpdateByRequest_UpdateByOptions& from) {
-// @@protoc_insertion_point(class_specific_copy_from_start:io.deephaven.proto.backplane.grpc.UpdateByRequest.UpdateByOptions)
-  if (&from == this) return;
-  Clear();
-  MergeFrom(from);
-}
-
-PROTOBUF_NOINLINE bool UpdateByRequest_UpdateByOptions::IsInitialized() const {
-  return true;
-}
-
-::_pbi::CachedSize* UpdateByRequest_UpdateByOptions::AccessCachedSize() const {
-  return &_impl_._cached_size_;
-}
-void UpdateByRequest_UpdateByOptions::InternalSwap(UpdateByRequest_UpdateByOptions* PROTOBUF_RESTRICT other) {
-  using std::swap;
-  _internal_metadata_.InternalSwap(&other->_internal_metadata_);
-  swap(_impl_._has_bits_[0], other->_impl_._has_bits_[0]);
-  ::google::protobuf::internal::memswap<
-      PROTOBUF_FIELD_OFFSET(UpdateByRequest_UpdateByOptions, _impl_.initial_hash_table_size_)
-      + sizeof(UpdateByRequest_UpdateByOptions::_impl_.initial_hash_table_size_)
-      - PROTOBUF_FIELD_OFFSET(UpdateByRequest_UpdateByOptions, _impl_.math_context_)>(
-          reinterpret_cast<char*>(&_impl_.math_context_),
-          reinterpret_cast<char*>(&other->_impl_.math_context_));
-}
-
-::google::protobuf::Metadata UpdateByRequest_UpdateByOptions::GetMetadata() const {
-  return ::_pbi::AssignDescriptors(
-      &descriptor_table_deephaven_2fproto_2ftable_2eproto_getter, &descriptor_table_deephaven_2fproto_2ftable_2eproto_once,
-      file_level_metadata_deephaven_2fproto_2ftable_2eproto[15]);
-}
-// ===================================================================
-
-class UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByCumulativeSum::_Internal {
- public:
-};
-
-UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByCumulativeSum::UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByCumulativeSum(::google::protobuf::Arena* arena)
-    : ::google::protobuf::internal::ZeroFieldsBase(arena) {
-  // @@protoc_insertion_point(arena_constructor:io.deephaven.proto.backplane.grpc.UpdateByRequest.UpdateByOperation.UpdateByColumn.UpdateBySpec.UpdateByCumulativeSum)
-}
-UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByCumulativeSum::UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByCumulativeSum(
-    ::google::protobuf::Arena* arena,
-    const UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByCumulativeSum& from)
-    : ::google::protobuf::internal::ZeroFieldsBase(arena) {
-  UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByCumulativeSum* const _this = this;
-  (void)_this;
-  _internal_metadata_.MergeFrom<::google::protobuf::UnknownFieldSet>(
-      from._internal_metadata_);
-
-  // @@protoc_insertion_point(copy_constructor:io.deephaven.proto.backplane.grpc.UpdateByRequest.UpdateByOperation.UpdateByColumn.UpdateBySpec.UpdateByCumulativeSum)
-}
-
-
-
-
-
-
-
-
-
-::google::protobuf::Metadata UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByCumulativeSum::GetMetadata() const {
-  return ::_pbi::AssignDescriptors(
-      &descriptor_table_deephaven_2fproto_2ftable_2eproto_getter, &descriptor_table_deephaven_2fproto_2ftable_2eproto_once,
-      file_level_metadata_deephaven_2fproto_2ftable_2eproto[16]);
-}
-// ===================================================================
-
-class UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByCumulativeMin::_Internal {
- public:
-};
-
-UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByCumulativeMin::UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByCumulativeMin(::google::protobuf::Arena* arena)
-    : ::google::protobuf::internal::ZeroFieldsBase(arena) {
-  // @@protoc_insertion_point(arena_constructor:io.deephaven.proto.backplane.grpc.UpdateByRequest.UpdateByOperation.UpdateByColumn.UpdateBySpec.UpdateByCumulativeMin)
-}
-UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByCumulativeMin::UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByCumulativeMin(
-    ::google::protobuf::Arena* arena,
-    const UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByCumulativeMin& from)
-    : ::google::protobuf::internal::ZeroFieldsBase(arena) {
-  UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByCumulativeMin* const _this = this;
-  (void)_this;
-  _internal_metadata_.MergeFrom<::google::protobuf::UnknownFieldSet>(
-      from._internal_metadata_);
-
-  // @@protoc_insertion_point(copy_constructor:io.deephaven.proto.backplane.grpc.UpdateByRequest.UpdateByOperation.UpdateByColumn.UpdateBySpec.UpdateByCumulativeMin)
-}
-
-
-
-
-
-
-
-
-
-::google::protobuf::Metadata UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByCumulativeMin::GetMetadata() const {
-  return ::_pbi::AssignDescriptors(
-      &descriptor_table_deephaven_2fproto_2ftable_2eproto_getter, &descriptor_table_deephaven_2fproto_2ftable_2eproto_once,
-      file_level_metadata_deephaven_2fproto_2ftable_2eproto[17]);
-}
-// ===================================================================
-
-class UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByCumulativeMax::_Internal {
- public:
-};
-
-UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByCumulativeMax::UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByCumulativeMax(::google::protobuf::Arena* arena)
-    : ::google::protobuf::internal::ZeroFieldsBase(arena) {
-  // @@protoc_insertion_point(arena_constructor:io.deephaven.proto.backplane.grpc.UpdateByRequest.UpdateByOperation.UpdateByColumn.UpdateBySpec.UpdateByCumulativeMax)
-}
-UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByCumulativeMax::UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByCumulativeMax(
-    ::google::protobuf::Arena* arena,
-    const UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByCumulativeMax& from)
-    : ::google::protobuf::internal::ZeroFieldsBase(arena) {
-  UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByCumulativeMax* const _this = this;
-  (void)_this;
-  _internal_metadata_.MergeFrom<::google::protobuf::UnknownFieldSet>(
-      from._internal_metadata_);
-
-  // @@protoc_insertion_point(copy_constructor:io.deephaven.proto.backplane.grpc.UpdateByRequest.UpdateByOperation.UpdateByColumn.UpdateBySpec.UpdateByCumulativeMax)
-}
-
-
-
-
-
-
-
-
-
-::google::protobuf::Metadata UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByCumulativeMax::GetMetadata() const {
-  return ::_pbi::AssignDescriptors(
-      &descriptor_table_deephaven_2fproto_2ftable_2eproto_getter, &descriptor_table_deephaven_2fproto_2ftable_2eproto_once,
-      file_level_metadata_deephaven_2fproto_2ftable_2eproto[18]);
-}
-// ===================================================================
-
-class UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByCumulativeProduct::_Internal {
- public:
-};
-
-UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByCumulativeProduct::UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByCumulativeProduct(::google::protobuf::Arena* arena)
-    : ::google::protobuf::internal::ZeroFieldsBase(arena) {
-  // @@protoc_insertion_point(arena_constructor:io.deephaven.proto.backplane.grpc.UpdateByRequest.UpdateByOperation.UpdateByColumn.UpdateBySpec.UpdateByCumulativeProduct)
-}
-UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByCumulativeProduct::UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByCumulativeProduct(
-    ::google::protobuf::Arena* arena,
-    const UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByCumulativeProduct& from)
-    : ::google::protobuf::internal::ZeroFieldsBase(arena) {
-  UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByCumulativeProduct* const _this = this;
-  (void)_this;
-  _internal_metadata_.MergeFrom<::google::protobuf::UnknownFieldSet>(
-      from._internal_metadata_);
-
-  // @@protoc_insertion_point(copy_constructor:io.deephaven.proto.backplane.grpc.UpdateByRequest.UpdateByOperation.UpdateByColumn.UpdateBySpec.UpdateByCumulativeProduct)
-}
-
-
-
-
-
-
-
-
-
-::google::protobuf::Metadata UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByCumulativeProduct::GetMetadata() const {
-  return ::_pbi::AssignDescriptors(
-      &descriptor_table_deephaven_2fproto_2ftable_2eproto_getter, &descriptor_table_deephaven_2fproto_2ftable_2eproto_once,
-      file_level_metadata_deephaven_2fproto_2ftable_2eproto[19]);
-}
-// ===================================================================
-
-class UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByFill::_Internal {
- public:
-};
-
-UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByFill::UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByFill(::google::protobuf::Arena* arena)
-    : ::google::protobuf::internal::ZeroFieldsBase(arena) {
-  // @@protoc_insertion_point(arena_constructor:io.deephaven.proto.backplane.grpc.UpdateByRequest.UpdateByOperation.UpdateByColumn.UpdateBySpec.UpdateByFill)
-}
-UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByFill::UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByFill(
-    ::google::protobuf::Arena* arena,
-    const UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByFill& from)
-    : ::google::protobuf::internal::ZeroFieldsBase(arena) {
-  UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByFill* const _this = this;
-  (void)_this;
-  _internal_metadata_.MergeFrom<::google::protobuf::UnknownFieldSet>(
-      from._internal_metadata_);
-
-  // @@protoc_insertion_point(copy_constructor:io.deephaven.proto.backplane.grpc.UpdateByRequest.UpdateByOperation.UpdateByColumn.UpdateBySpec.UpdateByFill)
-}
-
-
-
-
-
-
-
-
-
-::google::protobuf::Metadata UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByFill::GetMetadata() const {
-  return ::_pbi::AssignDescriptors(
-      &descriptor_table_deephaven_2fproto_2ftable_2eproto_getter, &descriptor_table_deephaven_2fproto_2ftable_2eproto_once,
-      file_level_metadata_deephaven_2fproto_2ftable_2eproto[20]);
-}
-// ===================================================================
-
-class UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByEma::_Internal {
- public:
-  using HasBits = decltype(std::declval<UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByEma>()._impl_._has_bits_);
-  static constexpr ::int32_t kHasBitsOffset =
-    8 * PROTOBUF_FIELD_OFFSET(UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByEma, _impl_._has_bits_);
-  static const ::io::deephaven::proto::backplane::grpc::UpdateByEmOptions& options(const UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByEma* msg);
-  static void set_has_options(HasBits* has_bits) {
-    (*has_bits)[0] |= 1u;
-  }
-  static const ::io::deephaven::proto::backplane::grpc::UpdateByWindowScale& window_scale(const UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByEma* msg);
-  static void set_has_window_scale(HasBits* has_bits) {
-    (*has_bits)[0] |= 2u;
-  }
-};
-
-const ::io::deephaven::proto::backplane::grpc::UpdateByEmOptions& UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByEma::_Internal::options(const UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByEma* msg) {
-  return *msg->_impl_.options_;
-}
-const ::io::deephaven::proto::backplane::grpc::UpdateByWindowScale& UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByEma::_Internal::window_scale(const UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByEma* msg) {
-  return *msg->_impl_.window_scale_;
-}
-UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByEma::UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByEma(::google::protobuf::Arena* arena)
-    : ::google::protobuf::Message(arena) {
-  SharedCtor(arena);
-  // @@protoc_insertion_point(arena_constructor:io.deephaven.proto.backplane.grpc.UpdateByRequest.UpdateByOperation.UpdateByColumn.UpdateBySpec.UpdateByEma)
-}
-inline PROTOBUF_NDEBUG_INLINE UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByEma::Impl_::Impl_(
-    ::google::protobuf::internal::InternalVisibility visibility, ::google::protobuf::Arena* arena,
-    const Impl_& from)
-      : _has_bits_{from._has_bits_},
-        _cached_size_{0} {}
-
-UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByEma::UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByEma(
-    ::google::protobuf::Arena* arena,
-    const UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByEma& from)
-    : ::google::protobuf::Message(arena) {
-  UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByEma* const _this = this;
-  (void)_this;
-  _internal_metadata_.MergeFrom<::google::protobuf::UnknownFieldSet>(
-      from._internal_metadata_);
-  new (&_impl_) Impl_(internal_visibility(), arena, from._impl_);
-  ::uint32_t cached_has_bits = _impl_._has_bits_[0];
-  _impl_.options_ = (cached_has_bits & 0x00000001u)
-                ? CreateMaybeMessage<::io::deephaven::proto::backplane::grpc::UpdateByEmOptions>(arena, *from._impl_.options_)
-                : nullptr;
-  _impl_.window_scale_ = (cached_has_bits & 0x00000002u)
-                ? CreateMaybeMessage<::io::deephaven::proto::backplane::grpc::UpdateByWindowScale>(arena, *from._impl_.window_scale_)
-                : nullptr;
-
-  // @@protoc_insertion_point(copy_constructor:io.deephaven.proto.backplane.grpc.UpdateByRequest.UpdateByOperation.UpdateByColumn.UpdateBySpec.UpdateByEma)
-}
-inline PROTOBUF_NDEBUG_INLINE UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByEma::Impl_::Impl_(
-    ::google::protobuf::internal::InternalVisibility visibility,
-    ::google::protobuf::Arena* arena)
-      : _cached_size_{0} {}
-
-inline void UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByEma::SharedCtor(::_pb::Arena* arena) {
-  new (&_impl_) Impl_(internal_visibility(), arena);
-  ::memset(reinterpret_cast<char *>(&_impl_) +
-               offsetof(Impl_, options_),
-           0,
-           offsetof(Impl_, window_scale_) -
-               offsetof(Impl_, options_) +
-               sizeof(Impl_::window_scale_));
-}
-UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByEma::~UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByEma() {
-  // @@protoc_insertion_point(destructor:io.deephaven.proto.backplane.grpc.UpdateByRequest.UpdateByOperation.UpdateByColumn.UpdateBySpec.UpdateByEma)
-  _internal_metadata_.Delete<::google::protobuf::UnknownFieldSet>();
-  SharedDtor();
-}
-inline void UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByEma::SharedDtor() {
-  ABSL_DCHECK(GetArena() == nullptr);
-  delete _impl_.options_;
-  delete _impl_.window_scale_;
-  _impl_.~Impl_();
-}
-
-PROTOBUF_NOINLINE void UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByEma::Clear() {
-// @@protoc_insertion_point(message_clear_start:io.deephaven.proto.backplane.grpc.UpdateByRequest.UpdateByOperation.UpdateByColumn.UpdateBySpec.UpdateByEma)
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  ::uint32_t cached_has_bits = 0;
-  // Prevent compiler warnings about cached_has_bits being unused
-  (void) cached_has_bits;
-
-  cached_has_bits = _impl_._has_bits_[0];
-  if (cached_has_bits & 0x00000003u) {
-    if (cached_has_bits & 0x00000001u) {
-      ABSL_DCHECK(_impl_.options_ != nullptr);
-      _impl_.options_->Clear();
-    }
-    if (cached_has_bits & 0x00000002u) {
-      ABSL_DCHECK(_impl_.window_scale_ != nullptr);
-      _impl_.window_scale_->Clear();
-    }
-  }
-  _impl_._has_bits_.Clear();
-  _internal_metadata_.Clear<::google::protobuf::UnknownFieldSet>();
-}
-
-const char* UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByEma::_InternalParse(
-    const char* ptr, ::_pbi::ParseContext* ctx) {
-  ptr = ::_pbi::TcParser::ParseLoop(this, ptr, ctx, &_table_.header);
-  return ptr;
-}
-
-
-PROTOBUF_CONSTINIT PROTOBUF_ATTRIBUTE_INIT_PRIORITY1
-const ::_pbi::TcParseTable<1, 2, 2, 0, 2> UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByEma::_table_ = {
-  {
-    PROTOBUF_FIELD_OFFSET(UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByEma, _impl_._has_bits_),
-    0, // no _extensions_
-    2, 8,  // max_field_number, fast_idx_mask
-    offsetof(decltype(_table_), field_lookup_table),
-    4294967292,  // skipmap
-    offsetof(decltype(_table_), field_entries),
-    2,  // num_field_entries
-    2,  // num_aux_entries
-    offsetof(decltype(_table_), aux_entries),
-    &_UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByEma_default_instance_._instance,
-    ::_pbi::TcParser::GenericFallback,  // fallback
-  }, {{
-    // .io.deephaven.proto.backplane.grpc.UpdateByWindowScale window_scale = 2;
-    {::_pbi::TcParser::FastMtS1,
-     {18, 1, 1, PROTOBUF_FIELD_OFFSET(UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByEma, _impl_.window_scale_)}},
-    // .io.deephaven.proto.backplane.grpc.UpdateByEmOptions options = 1;
-    {::_pbi::TcParser::FastMtS1,
-     {10, 0, 0, PROTOBUF_FIELD_OFFSET(UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByEma, _impl_.options_)}},
-  }}, {{
-    65535, 65535
-  }}, {{
-    // .io.deephaven.proto.backplane.grpc.UpdateByEmOptions options = 1;
-    {PROTOBUF_FIELD_OFFSET(UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByEma, _impl_.options_), _Internal::kHasBitsOffset + 0, 0,
-    (0 | ::_fl::kFcOptional | ::_fl::kMessage | ::_fl::kTvTable)},
-    // .io.deephaven.proto.backplane.grpc.UpdateByWindowScale window_scale = 2;
-    {PROTOBUF_FIELD_OFFSET(UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByEma, _impl_.window_scale_), _Internal::kHasBitsOffset + 1, 1,
-    (0 | ::_fl::kFcOptional | ::_fl::kMessage | ::_fl::kTvTable)},
-  }}, {{
-    {::_pbi::TcParser::GetTable<::io::deephaven::proto::backplane::grpc::UpdateByEmOptions>()},
-    {::_pbi::TcParser::GetTable<::io::deephaven::proto::backplane::grpc::UpdateByWindowScale>()},
-  }}, {{
-  }},
-};
-
-::uint8_t* UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByEma::_InternalSerialize(
-    ::uint8_t* target,
-    ::google::protobuf::io::EpsCopyOutputStream* stream) const {
-  // @@protoc_insertion_point(serialize_to_array_start:io.deephaven.proto.backplane.grpc.UpdateByRequest.UpdateByOperation.UpdateByColumn.UpdateBySpec.UpdateByEma)
-  ::uint32_t cached_has_bits = 0;
-  (void)cached_has_bits;
-
-  cached_has_bits = _impl_._has_bits_[0];
-  // .io.deephaven.proto.backplane.grpc.UpdateByEmOptions options = 1;
-  if (cached_has_bits & 0x00000001u) {
-    target = ::google::protobuf::internal::WireFormatLite::InternalWriteMessage(
-        1, _Internal::options(this),
-        _Internal::options(this).GetCachedSize(), target, stream);
-  }
-
-  // .io.deephaven.proto.backplane.grpc.UpdateByWindowScale window_scale = 2;
-  if (cached_has_bits & 0x00000002u) {
-    target = ::google::protobuf::internal::WireFormatLite::InternalWriteMessage(
-        2, _Internal::window_scale(this),
-        _Internal::window_scale(this).GetCachedSize(), target, stream);
-  }
-
-  if (PROTOBUF_PREDICT_FALSE(_internal_metadata_.have_unknown_fields())) {
-    target =
-        ::_pbi::WireFormat::InternalSerializeUnknownFieldsToArray(
-            _internal_metadata_.unknown_fields<::google::protobuf::UnknownFieldSet>(::google::protobuf::UnknownFieldSet::default_instance), target, stream);
-  }
-  // @@protoc_insertion_point(serialize_to_array_end:io.deephaven.proto.backplane.grpc.UpdateByRequest.UpdateByOperation.UpdateByColumn.UpdateBySpec.UpdateByEma)
-  return target;
-}
-
-::size_t UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByEma::ByteSizeLong() const {
-// @@protoc_insertion_point(message_byte_size_start:io.deephaven.proto.backplane.grpc.UpdateByRequest.UpdateByOperation.UpdateByColumn.UpdateBySpec.UpdateByEma)
-  ::size_t total_size = 0;
-
-  ::uint32_t cached_has_bits = 0;
-  // Prevent compiler warnings about cached_has_bits being unused
-  (void) cached_has_bits;
-
-  cached_has_bits = _impl_._has_bits_[0];
-  if (cached_has_bits & 0x00000003u) {
-    // .io.deephaven.proto.backplane.grpc.UpdateByEmOptions options = 1;
-    if (cached_has_bits & 0x00000001u) {
-      total_size +=
-          1 + ::google::protobuf::internal::WireFormatLite::MessageSize(*_impl_.options_);
-    }
-
-    // .io.deephaven.proto.backplane.grpc.UpdateByWindowScale window_scale = 2;
-    if (cached_has_bits & 0x00000002u) {
-      total_size +=
-          1 + ::google::protobuf::internal::WireFormatLite::MessageSize(*_impl_.window_scale_);
-    }
-
-  }
-  return MaybeComputeUnknownFieldsSize(total_size, &_impl_._cached_size_);
-}
-
-const ::google::protobuf::Message::ClassData UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByEma::_class_data_ = {
-    UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByEma::MergeImpl,
-    nullptr,  // OnDemandRegisterArenaDtor
-};
-const ::google::protobuf::Message::ClassData* UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByEma::GetClassData() const {
-  return &_class_data_;
-}
-
-void UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByEma::MergeImpl(::google::protobuf::Message& to_msg, const ::google::protobuf::Message& from_msg) {
-  auto* const _this = static_cast<UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByEma*>(&to_msg);
-  auto& from = static_cast<const UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByEma&>(from_msg);
-  // @@protoc_insertion_point(class_specific_merge_from_start:io.deephaven.proto.backplane.grpc.UpdateByRequest.UpdateByOperation.UpdateByColumn.UpdateBySpec.UpdateByEma)
-  ABSL_DCHECK_NE(&from, _this);
-  ::uint32_t cached_has_bits = 0;
-  (void) cached_has_bits;
-
-  cached_has_bits = from._impl_._has_bits_[0];
-  if (cached_has_bits & 0x00000003u) {
-    if (cached_has_bits & 0x00000001u) {
-      _this->_internal_mutable_options()->::io::deephaven::proto::backplane::grpc::UpdateByEmOptions::MergeFrom(
-          from._internal_options());
-    }
-    if (cached_has_bits & 0x00000002u) {
-      _this->_internal_mutable_window_scale()->::io::deephaven::proto::backplane::grpc::UpdateByWindowScale::MergeFrom(
-          from._internal_window_scale());
-    }
-  }
-  _this->_internal_metadata_.MergeFrom<::google::protobuf::UnknownFieldSet>(from._internal_metadata_);
-}
-
-void UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByEma::CopyFrom(const UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByEma& from) {
-// @@protoc_insertion_point(class_specific_copy_from_start:io.deephaven.proto.backplane.grpc.UpdateByRequest.UpdateByOperation.UpdateByColumn.UpdateBySpec.UpdateByEma)
-  if (&from == this) return;
-  Clear();
-  MergeFrom(from);
-}
-
-PROTOBUF_NOINLINE bool UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByEma::IsInitialized() const {
-  return true;
-}
-
-::_pbi::CachedSize* UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByEma::AccessCachedSize() const {
-  return &_impl_._cached_size_;
-}
-void UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByEma::InternalSwap(UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByEma* PROTOBUF_RESTRICT other) {
-  using std::swap;
-  _internal_metadata_.InternalSwap(&other->_internal_metadata_);
-  swap(_impl_._has_bits_[0], other->_impl_._has_bits_[0]);
-  ::google::protobuf::internal::memswap<
-      PROTOBUF_FIELD_OFFSET(UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByEma, _impl_.window_scale_)
-      + sizeof(UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByEma::_impl_.window_scale_)
-      - PROTOBUF_FIELD_OFFSET(UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByEma, _impl_.options_)>(
-          reinterpret_cast<char*>(&_impl_.options_),
-          reinterpret_cast<char*>(&other->_impl_.options_));
-}
-
-::google::protobuf::Metadata UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByEma::GetMetadata() const {
-  return ::_pbi::AssignDescriptors(
-      &descriptor_table_deephaven_2fproto_2ftable_2eproto_getter, &descriptor_table_deephaven_2fproto_2ftable_2eproto_once,
-      file_level_metadata_deephaven_2fproto_2ftable_2eproto[21]);
-}
-// ===================================================================
-
-class UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByEms::_Internal {
- public:
-  using HasBits = decltype(std::declval<UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByEms>()._impl_._has_bits_);
-  static constexpr ::int32_t kHasBitsOffset =
-    8 * PROTOBUF_FIELD_OFFSET(UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByEms, _impl_._has_bits_);
-  static const ::io::deephaven::proto::backplane::grpc::UpdateByEmOptions& options(const UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByEms* msg);
-  static void set_has_options(HasBits* has_bits) {
-    (*has_bits)[0] |= 1u;
-  }
-  static const ::io::deephaven::proto::backplane::grpc::UpdateByWindowScale& window_scale(const UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByEms* msg);
-  static void set_has_window_scale(HasBits* has_bits) {
-    (*has_bits)[0] |= 2u;
-  }
-};
-
-const ::io::deephaven::proto::backplane::grpc::UpdateByEmOptions& UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByEms::_Internal::options(const UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByEms* msg) {
-  return *msg->_impl_.options_;
-}
-const ::io::deephaven::proto::backplane::grpc::UpdateByWindowScale& UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByEms::_Internal::window_scale(const UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByEms* msg) {
-  return *msg->_impl_.window_scale_;
-}
-UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByEms::UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByEms(::google::protobuf::Arena* arena)
-    : ::google::protobuf::Message(arena) {
-  SharedCtor(arena);
-  // @@protoc_insertion_point(arena_constructor:io.deephaven.proto.backplane.grpc.UpdateByRequest.UpdateByOperation.UpdateByColumn.UpdateBySpec.UpdateByEms)
-}
-inline PROTOBUF_NDEBUG_INLINE UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByEms::Impl_::Impl_(
-    ::google::protobuf::internal::InternalVisibility visibility, ::google::protobuf::Arena* arena,
-    const Impl_& from)
-      : _has_bits_{from._has_bits_},
-        _cached_size_{0} {}
-
-UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByEms::UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByEms(
-    ::google::protobuf::Arena* arena,
-    const UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByEms& from)
-    : ::google::protobuf::Message(arena) {
-  UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByEms* const _this = this;
-  (void)_this;
-  _internal_metadata_.MergeFrom<::google::protobuf::UnknownFieldSet>(
-      from._internal_metadata_);
-  new (&_impl_) Impl_(internal_visibility(), arena, from._impl_);
-  ::uint32_t cached_has_bits = _impl_._has_bits_[0];
-  _impl_.options_ = (cached_has_bits & 0x00000001u)
-                ? CreateMaybeMessage<::io::deephaven::proto::backplane::grpc::UpdateByEmOptions>(arena, *from._impl_.options_)
-                : nullptr;
-  _impl_.window_scale_ = (cached_has_bits & 0x00000002u)
-                ? CreateMaybeMessage<::io::deephaven::proto::backplane::grpc::UpdateByWindowScale>(arena, *from._impl_.window_scale_)
-                : nullptr;
-
-  // @@protoc_insertion_point(copy_constructor:io.deephaven.proto.backplane.grpc.UpdateByRequest.UpdateByOperation.UpdateByColumn.UpdateBySpec.UpdateByEms)
-}
-inline PROTOBUF_NDEBUG_INLINE UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByEms::Impl_::Impl_(
-    ::google::protobuf::internal::InternalVisibility visibility,
-    ::google::protobuf::Arena* arena)
-      : _cached_size_{0} {}
-
-inline void UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByEms::SharedCtor(::_pb::Arena* arena) {
-  new (&_impl_) Impl_(internal_visibility(), arena);
-  ::memset(reinterpret_cast<char *>(&_impl_) +
-               offsetof(Impl_, options_),
-           0,
-           offsetof(Impl_, window_scale_) -
-               offsetof(Impl_, options_) +
-               sizeof(Impl_::window_scale_));
-}
-UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByEms::~UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByEms() {
-  // @@protoc_insertion_point(destructor:io.deephaven.proto.backplane.grpc.UpdateByRequest.UpdateByOperation.UpdateByColumn.UpdateBySpec.UpdateByEms)
-  _internal_metadata_.Delete<::google::protobuf::UnknownFieldSet>();
-  SharedDtor();
-}
-inline void UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByEms::SharedDtor() {
-  ABSL_DCHECK(GetArena() == nullptr);
-  delete _impl_.options_;
-  delete _impl_.window_scale_;
-  _impl_.~Impl_();
-}
-
-PROTOBUF_NOINLINE void UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByEms::Clear() {
-// @@protoc_insertion_point(message_clear_start:io.deephaven.proto.backplane.grpc.UpdateByRequest.UpdateByOperation.UpdateByColumn.UpdateBySpec.UpdateByEms)
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  ::uint32_t cached_has_bits = 0;
-  // Prevent compiler warnings about cached_has_bits being unused
-  (void) cached_has_bits;
-
-  cached_has_bits = _impl_._has_bits_[0];
-  if (cached_has_bits & 0x00000003u) {
-    if (cached_has_bits & 0x00000001u) {
-      ABSL_DCHECK(_impl_.options_ != nullptr);
-      _impl_.options_->Clear();
-    }
-    if (cached_has_bits & 0x00000002u) {
-      ABSL_DCHECK(_impl_.window_scale_ != nullptr);
-      _impl_.window_scale_->Clear();
-    }
-  }
-  _impl_._has_bits_.Clear();
-  _internal_metadata_.Clear<::google::protobuf::UnknownFieldSet>();
-}
-
-const char* UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByEms::_InternalParse(
-    const char* ptr, ::_pbi::ParseContext* ctx) {
-  ptr = ::_pbi::TcParser::ParseLoop(this, ptr, ctx, &_table_.header);
-  return ptr;
-}
-
-
-PROTOBUF_CONSTINIT PROTOBUF_ATTRIBUTE_INIT_PRIORITY1
-const ::_pbi::TcParseTable<1, 2, 2, 0, 2> UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByEms::_table_ = {
-  {
-    PROTOBUF_FIELD_OFFSET(UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByEms, _impl_._has_bits_),
-    0, // no _extensions_
-    2, 8,  // max_field_number, fast_idx_mask
-    offsetof(decltype(_table_), field_lookup_table),
-    4294967292,  // skipmap
-    offsetof(decltype(_table_), field_entries),
-    2,  // num_field_entries
-    2,  // num_aux_entries
-    offsetof(decltype(_table_), aux_entries),
-    &_UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByEms_default_instance_._instance,
-    ::_pbi::TcParser::GenericFallback,  // fallback
-  }, {{
-    // .io.deephaven.proto.backplane.grpc.UpdateByWindowScale window_scale = 2;
-    {::_pbi::TcParser::FastMtS1,
-     {18, 1, 1, PROTOBUF_FIELD_OFFSET(UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByEms, _impl_.window_scale_)}},
-    // .io.deephaven.proto.backplane.grpc.UpdateByEmOptions options = 1;
-    {::_pbi::TcParser::FastMtS1,
-     {10, 0, 0, PROTOBUF_FIELD_OFFSET(UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByEms, _impl_.options_)}},
-  }}, {{
-    65535, 65535
-  }}, {{
-    // .io.deephaven.proto.backplane.grpc.UpdateByEmOptions options = 1;
-    {PROTOBUF_FIELD_OFFSET(UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByEms, _impl_.options_), _Internal::kHasBitsOffset + 0, 0,
-    (0 | ::_fl::kFcOptional | ::_fl::kMessage | ::_fl::kTvTable)},
-    // .io.deephaven.proto.backplane.grpc.UpdateByWindowScale window_scale = 2;
-    {PROTOBUF_FIELD_OFFSET(UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByEms, _impl_.window_scale_), _Internal::kHasBitsOffset + 1, 1,
-    (0 | ::_fl::kFcOptional | ::_fl::kMessage | ::_fl::kTvTable)},
-  }}, {{
-    {::_pbi::TcParser::GetTable<::io::deephaven::proto::backplane::grpc::UpdateByEmOptions>()},
-    {::_pbi::TcParser::GetTable<::io::deephaven::proto::backplane::grpc::UpdateByWindowScale>()},
-  }}, {{
-  }},
-};
-
-::uint8_t* UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByEms::_InternalSerialize(
-    ::uint8_t* target,
-    ::google::protobuf::io::EpsCopyOutputStream* stream) const {
-  // @@protoc_insertion_point(serialize_to_array_start:io.deephaven.proto.backplane.grpc.UpdateByRequest.UpdateByOperation.UpdateByColumn.UpdateBySpec.UpdateByEms)
-  ::uint32_t cached_has_bits = 0;
-  (void)cached_has_bits;
-
-  cached_has_bits = _impl_._has_bits_[0];
-  // .io.deephaven.proto.backplane.grpc.UpdateByEmOptions options = 1;
-  if (cached_has_bits & 0x00000001u) {
-    target = ::google::protobuf::internal::WireFormatLite::InternalWriteMessage(
-        1, _Internal::options(this),
-        _Internal::options(this).GetCachedSize(), target, stream);
-  }
-
-  // .io.deephaven.proto.backplane.grpc.UpdateByWindowScale window_scale = 2;
-  if (cached_has_bits & 0x00000002u) {
-    target = ::google::protobuf::internal::WireFormatLite::InternalWriteMessage(
-        2, _Internal::window_scale(this),
-        _Internal::window_scale(this).GetCachedSize(), target, stream);
-  }
-
-  if (PROTOBUF_PREDICT_FALSE(_internal_metadata_.have_unknown_fields())) {
-    target =
-        ::_pbi::WireFormat::InternalSerializeUnknownFieldsToArray(
-            _internal_metadata_.unknown_fields<::google::protobuf::UnknownFieldSet>(::google::protobuf::UnknownFieldSet::default_instance), target, stream);
-  }
-  // @@protoc_insertion_point(serialize_to_array_end:io.deephaven.proto.backplane.grpc.UpdateByRequest.UpdateByOperation.UpdateByColumn.UpdateBySpec.UpdateByEms)
-  return target;
-}
-
-::size_t UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByEms::ByteSizeLong() const {
-// @@protoc_insertion_point(message_byte_size_start:io.deephaven.proto.backplane.grpc.UpdateByRequest.UpdateByOperation.UpdateByColumn.UpdateBySpec.UpdateByEms)
-  ::size_t total_size = 0;
-
-  ::uint32_t cached_has_bits = 0;
-  // Prevent compiler warnings about cached_has_bits being unused
-  (void) cached_has_bits;
-
-  cached_has_bits = _impl_._has_bits_[0];
-  if (cached_has_bits & 0x00000003u) {
-    // .io.deephaven.proto.backplane.grpc.UpdateByEmOptions options = 1;
-    if (cached_has_bits & 0x00000001u) {
-      total_size +=
-          1 + ::google::protobuf::internal::WireFormatLite::MessageSize(*_impl_.options_);
-    }
-
-    // .io.deephaven.proto.backplane.grpc.UpdateByWindowScale window_scale = 2;
-    if (cached_has_bits & 0x00000002u) {
-      total_size +=
-          1 + ::google::protobuf::internal::WireFormatLite::MessageSize(*_impl_.window_scale_);
-    }
-
-  }
-  return MaybeComputeUnknownFieldsSize(total_size, &_impl_._cached_size_);
-}
-
-const ::google::protobuf::Message::ClassData UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByEms::_class_data_ = {
-    UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByEms::MergeImpl,
-    nullptr,  // OnDemandRegisterArenaDtor
-};
-const ::google::protobuf::Message::ClassData* UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByEms::GetClassData() const {
-  return &_class_data_;
-}
-
-void UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByEms::MergeImpl(::google::protobuf::Message& to_msg, const ::google::protobuf::Message& from_msg) {
-  auto* const _this = static_cast<UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByEms*>(&to_msg);
-  auto& from = static_cast<const UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByEms&>(from_msg);
-  // @@protoc_insertion_point(class_specific_merge_from_start:io.deephaven.proto.backplane.grpc.UpdateByRequest.UpdateByOperation.UpdateByColumn.UpdateBySpec.UpdateByEms)
-  ABSL_DCHECK_NE(&from, _this);
-  ::uint32_t cached_has_bits = 0;
-  (void) cached_has_bits;
-
-  cached_has_bits = from._impl_._has_bits_[0];
-  if (cached_has_bits & 0x00000003u) {
-    if (cached_has_bits & 0x00000001u) {
-      _this->_internal_mutable_options()->::io::deephaven::proto::backplane::grpc::UpdateByEmOptions::MergeFrom(
-          from._internal_options());
-    }
-    if (cached_has_bits & 0x00000002u) {
-      _this->_internal_mutable_window_scale()->::io::deephaven::proto::backplane::grpc::UpdateByWindowScale::MergeFrom(
-          from._internal_window_scale());
-    }
-  }
-  _this->_internal_metadata_.MergeFrom<::google::protobuf::UnknownFieldSet>(from._internal_metadata_);
-}
-
-void UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByEms::CopyFrom(const UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByEms& from) {
-// @@protoc_insertion_point(class_specific_copy_from_start:io.deephaven.proto.backplane.grpc.UpdateByRequest.UpdateByOperation.UpdateByColumn.UpdateBySpec.UpdateByEms)
-  if (&from == this) return;
-  Clear();
-  MergeFrom(from);
-}
-
-PROTOBUF_NOINLINE bool UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByEms::IsInitialized() const {
-  return true;
-}
-
-::_pbi::CachedSize* UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByEms::AccessCachedSize() const {
-  return &_impl_._cached_size_;
-}
-void UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByEms::InternalSwap(UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByEms* PROTOBUF_RESTRICT other) {
-  using std::swap;
-  _internal_metadata_.InternalSwap(&other->_internal_metadata_);
-  swap(_impl_._has_bits_[0], other->_impl_._has_bits_[0]);
-  ::google::protobuf::internal::memswap<
-      PROTOBUF_FIELD_OFFSET(UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByEms, _impl_.window_scale_)
-      + sizeof(UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByEms::_impl_.window_scale_)
-      - PROTOBUF_FIELD_OFFSET(UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByEms, _impl_.options_)>(
-          reinterpret_cast<char*>(&_impl_.options_),
-          reinterpret_cast<char*>(&other->_impl_.options_));
-}
-
-::google::protobuf::Metadata UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByEms::GetMetadata() const {
-  return ::_pbi::AssignDescriptors(
-      &descriptor_table_deephaven_2fproto_2ftable_2eproto_getter, &descriptor_table_deephaven_2fproto_2ftable_2eproto_once,
-      file_level_metadata_deephaven_2fproto_2ftable_2eproto[22]);
-}
-// ===================================================================
-
-class UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByEmMin::_Internal {
- public:
-  using HasBits = decltype(std::declval<UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByEmMin>()._impl_._has_bits_);
-  static constexpr ::int32_t kHasBitsOffset =
-    8 * PROTOBUF_FIELD_OFFSET(UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByEmMin, _impl_._has_bits_);
-  static const ::io::deephaven::proto::backplane::grpc::UpdateByEmOptions& options(const UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByEmMin* msg);
-  static void set_has_options(HasBits* has_bits) {
-    (*has_bits)[0] |= 1u;
-  }
-  static const ::io::deephaven::proto::backplane::grpc::UpdateByWindowScale& window_scale(const UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByEmMin* msg);
-  static void set_has_window_scale(HasBits* has_bits) {
-    (*has_bits)[0] |= 2u;
-  }
-};
-
-const ::io::deephaven::proto::backplane::grpc::UpdateByEmOptions& UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByEmMin::_Internal::options(const UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByEmMin* msg) {
-  return *msg->_impl_.options_;
-}
-const ::io::deephaven::proto::backplane::grpc::UpdateByWindowScale& UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByEmMin::_Internal::window_scale(const UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByEmMin* msg) {
-  return *msg->_impl_.window_scale_;
-}
-UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByEmMin::UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByEmMin(::google::protobuf::Arena* arena)
-    : ::google::protobuf::Message(arena) {
-  SharedCtor(arena);
-  // @@protoc_insertion_point(arena_constructor:io.deephaven.proto.backplane.grpc.UpdateByRequest.UpdateByOperation.UpdateByColumn.UpdateBySpec.UpdateByEmMin)
-}
-inline PROTOBUF_NDEBUG_INLINE UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByEmMin::Impl_::Impl_(
-    ::google::protobuf::internal::InternalVisibility visibility, ::google::protobuf::Arena* arena,
-    const Impl_& from)
-      : _has_bits_{from._has_bits_},
-        _cached_size_{0} {}
-
-UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByEmMin::UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByEmMin(
-    ::google::protobuf::Arena* arena,
-    const UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByEmMin& from)
-    : ::google::protobuf::Message(arena) {
-  UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByEmMin* const _this = this;
-  (void)_this;
-  _internal_metadata_.MergeFrom<::google::protobuf::UnknownFieldSet>(
-      from._internal_metadata_);
-  new (&_impl_) Impl_(internal_visibility(), arena, from._impl_);
-  ::uint32_t cached_has_bits = _impl_._has_bits_[0];
-  _impl_.options_ = (cached_has_bits & 0x00000001u)
-                ? CreateMaybeMessage<::io::deephaven::proto::backplane::grpc::UpdateByEmOptions>(arena, *from._impl_.options_)
-                : nullptr;
-  _impl_.window_scale_ = (cached_has_bits & 0x00000002u)
-                ? CreateMaybeMessage<::io::deephaven::proto::backplane::grpc::UpdateByWindowScale>(arena, *from._impl_.window_scale_)
-                : nullptr;
-
-  // @@protoc_insertion_point(copy_constructor:io.deephaven.proto.backplane.grpc.UpdateByRequest.UpdateByOperation.UpdateByColumn.UpdateBySpec.UpdateByEmMin)
-}
-inline PROTOBUF_NDEBUG_INLINE UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByEmMin::Impl_::Impl_(
-    ::google::protobuf::internal::InternalVisibility visibility,
-    ::google::protobuf::Arena* arena)
-      : _cached_size_{0} {}
-
-inline void UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByEmMin::SharedCtor(::_pb::Arena* arena) {
-  new (&_impl_) Impl_(internal_visibility(), arena);
-  ::memset(reinterpret_cast<char *>(&_impl_) +
-               offsetof(Impl_, options_),
-           0,
-           offsetof(Impl_, window_scale_) -
-               offsetof(Impl_, options_) +
-               sizeof(Impl_::window_scale_));
-}
-UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByEmMin::~UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByEmMin() {
-  // @@protoc_insertion_point(destructor:io.deephaven.proto.backplane.grpc.UpdateByRequest.UpdateByOperation.UpdateByColumn.UpdateBySpec.UpdateByEmMin)
-  _internal_metadata_.Delete<::google::protobuf::UnknownFieldSet>();
-  SharedDtor();
-}
-inline void UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByEmMin::SharedDtor() {
-  ABSL_DCHECK(GetArena() == nullptr);
-  delete _impl_.options_;
-  delete _impl_.window_scale_;
-  _impl_.~Impl_();
-}
-
-PROTOBUF_NOINLINE void UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByEmMin::Clear() {
-// @@protoc_insertion_point(message_clear_start:io.deephaven.proto.backplane.grpc.UpdateByRequest.UpdateByOperation.UpdateByColumn.UpdateBySpec.UpdateByEmMin)
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  ::uint32_t cached_has_bits = 0;
-  // Prevent compiler warnings about cached_has_bits being unused
-  (void) cached_has_bits;
-
-  cached_has_bits = _impl_._has_bits_[0];
-  if (cached_has_bits & 0x00000003u) {
-    if (cached_has_bits & 0x00000001u) {
-      ABSL_DCHECK(_impl_.options_ != nullptr);
-      _impl_.options_->Clear();
-    }
-    if (cached_has_bits & 0x00000002u) {
-      ABSL_DCHECK(_impl_.window_scale_ != nullptr);
-      _impl_.window_scale_->Clear();
-    }
-  }
-  _impl_._has_bits_.Clear();
-  _internal_metadata_.Clear<::google::protobuf::UnknownFieldSet>();
-}
-
-const char* UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByEmMin::_InternalParse(
-    const char* ptr, ::_pbi::ParseContext* ctx) {
-  ptr = ::_pbi::TcParser::ParseLoop(this, ptr, ctx, &_table_.header);
-  return ptr;
-}
-
-
-PROTOBUF_CONSTINIT PROTOBUF_ATTRIBUTE_INIT_PRIORITY1
-const ::_pbi::TcParseTable<1, 2, 2, 0, 2> UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByEmMin::_table_ = {
-  {
-    PROTOBUF_FIELD_OFFSET(UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByEmMin, _impl_._has_bits_),
-    0, // no _extensions_
-    2, 8,  // max_field_number, fast_idx_mask
-    offsetof(decltype(_table_), field_lookup_table),
-    4294967292,  // skipmap
-    offsetof(decltype(_table_), field_entries),
-    2,  // num_field_entries
-    2,  // num_aux_entries
-    offsetof(decltype(_table_), aux_entries),
-    &_UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByEmMin_default_instance_._instance,
-    ::_pbi::TcParser::GenericFallback,  // fallback
-  }, {{
-    // .io.deephaven.proto.backplane.grpc.UpdateByWindowScale window_scale = 2;
-    {::_pbi::TcParser::FastMtS1,
-     {18, 1, 1, PROTOBUF_FIELD_OFFSET(UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByEmMin, _impl_.window_scale_)}},
-    // .io.deephaven.proto.backplane.grpc.UpdateByEmOptions options = 1;
-    {::_pbi::TcParser::FastMtS1,
-     {10, 0, 0, PROTOBUF_FIELD_OFFSET(UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByEmMin, _impl_.options_)}},
-  }}, {{
-    65535, 65535
-  }}, {{
-    // .io.deephaven.proto.backplane.grpc.UpdateByEmOptions options = 1;
-    {PROTOBUF_FIELD_OFFSET(UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByEmMin, _impl_.options_), _Internal::kHasBitsOffset + 0, 0,
-    (0 | ::_fl::kFcOptional | ::_fl::kMessage | ::_fl::kTvTable)},
-    // .io.deephaven.proto.backplane.grpc.UpdateByWindowScale window_scale = 2;
-    {PROTOBUF_FIELD_OFFSET(UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByEmMin, _impl_.window_scale_), _Internal::kHasBitsOffset + 1, 1,
-    (0 | ::_fl::kFcOptional | ::_fl::kMessage | ::_fl::kTvTable)},
-  }}, {{
-    {::_pbi::TcParser::GetTable<::io::deephaven::proto::backplane::grpc::UpdateByEmOptions>()},
-    {::_pbi::TcParser::GetTable<::io::deephaven::proto::backplane::grpc::UpdateByWindowScale>()},
-  }}, {{
-  }},
-};
-
-::uint8_t* UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByEmMin::_InternalSerialize(
-    ::uint8_t* target,
-    ::google::protobuf::io::EpsCopyOutputStream* stream) const {
-  // @@protoc_insertion_point(serialize_to_array_start:io.deephaven.proto.backplane.grpc.UpdateByRequest.UpdateByOperation.UpdateByColumn.UpdateBySpec.UpdateByEmMin)
-  ::uint32_t cached_has_bits = 0;
-  (void)cached_has_bits;
-
-  cached_has_bits = _impl_._has_bits_[0];
-  // .io.deephaven.proto.backplane.grpc.UpdateByEmOptions options = 1;
-  if (cached_has_bits & 0x00000001u) {
-    target = ::google::protobuf::internal::WireFormatLite::InternalWriteMessage(
-        1, _Internal::options(this),
-        _Internal::options(this).GetCachedSize(), target, stream);
-  }
-
-  // .io.deephaven.proto.backplane.grpc.UpdateByWindowScale window_scale = 2;
-  if (cached_has_bits & 0x00000002u) {
-    target = ::google::protobuf::internal::WireFormatLite::InternalWriteMessage(
-        2, _Internal::window_scale(this),
-        _Internal::window_scale(this).GetCachedSize(), target, stream);
-  }
-
-  if (PROTOBUF_PREDICT_FALSE(_internal_metadata_.have_unknown_fields())) {
-    target =
-        ::_pbi::WireFormat::InternalSerializeUnknownFieldsToArray(
-            _internal_metadata_.unknown_fields<::google::protobuf::UnknownFieldSet>(::google::protobuf::UnknownFieldSet::default_instance), target, stream);
-  }
-  // @@protoc_insertion_point(serialize_to_array_end:io.deephaven.proto.backplane.grpc.UpdateByRequest.UpdateByOperation.UpdateByColumn.UpdateBySpec.UpdateByEmMin)
-  return target;
-}
-
-::size_t UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByEmMin::ByteSizeLong() const {
-// @@protoc_insertion_point(message_byte_size_start:io.deephaven.proto.backplane.grpc.UpdateByRequest.UpdateByOperation.UpdateByColumn.UpdateBySpec.UpdateByEmMin)
-  ::size_t total_size = 0;
-
-  ::uint32_t cached_has_bits = 0;
-  // Prevent compiler warnings about cached_has_bits being unused
-  (void) cached_has_bits;
-
-  cached_has_bits = _impl_._has_bits_[0];
-  if (cached_has_bits & 0x00000003u) {
-    // .io.deephaven.proto.backplane.grpc.UpdateByEmOptions options = 1;
-    if (cached_has_bits & 0x00000001u) {
-      total_size +=
-          1 + ::google::protobuf::internal::WireFormatLite::MessageSize(*_impl_.options_);
-    }
-
-    // .io.deephaven.proto.backplane.grpc.UpdateByWindowScale window_scale = 2;
-    if (cached_has_bits & 0x00000002u) {
-      total_size +=
-          1 + ::google::protobuf::internal::WireFormatLite::MessageSize(*_impl_.window_scale_);
-    }
-
-  }
-  return MaybeComputeUnknownFieldsSize(total_size, &_impl_._cached_size_);
-}
-
-const ::google::protobuf::Message::ClassData UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByEmMin::_class_data_ = {
-    UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByEmMin::MergeImpl,
-    nullptr,  // OnDemandRegisterArenaDtor
-};
-const ::google::protobuf::Message::ClassData* UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByEmMin::GetClassData() const {
-  return &_class_data_;
-}
-
-void UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByEmMin::MergeImpl(::google::protobuf::Message& to_msg, const ::google::protobuf::Message& from_msg) {
-  auto* const _this = static_cast<UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByEmMin*>(&to_msg);
-  auto& from = static_cast<const UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByEmMin&>(from_msg);
-  // @@protoc_insertion_point(class_specific_merge_from_start:io.deephaven.proto.backplane.grpc.UpdateByRequest.UpdateByOperation.UpdateByColumn.UpdateBySpec.UpdateByEmMin)
-  ABSL_DCHECK_NE(&from, _this);
-  ::uint32_t cached_has_bits = 0;
-  (void) cached_has_bits;
-
-  cached_has_bits = from._impl_._has_bits_[0];
-  if (cached_has_bits & 0x00000003u) {
-    if (cached_has_bits & 0x00000001u) {
-      _this->_internal_mutable_options()->::io::deephaven::proto::backplane::grpc::UpdateByEmOptions::MergeFrom(
-          from._internal_options());
-    }
-    if (cached_has_bits & 0x00000002u) {
-      _this->_internal_mutable_window_scale()->::io::deephaven::proto::backplane::grpc::UpdateByWindowScale::MergeFrom(
-          from._internal_window_scale());
-    }
-  }
-  _this->_internal_metadata_.MergeFrom<::google::protobuf::UnknownFieldSet>(from._internal_metadata_);
-}
-
-void UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByEmMin::CopyFrom(const UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByEmMin& from) {
-// @@protoc_insertion_point(class_specific_copy_from_start:io.deephaven.proto.backplane.grpc.UpdateByRequest.UpdateByOperation.UpdateByColumn.UpdateBySpec.UpdateByEmMin)
-  if (&from == this) return;
-  Clear();
-  MergeFrom(from);
-}
-
-PROTOBUF_NOINLINE bool UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByEmMin::IsInitialized() const {
-  return true;
-}
-
-::_pbi::CachedSize* UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByEmMin::AccessCachedSize() const {
-  return &_impl_._cached_size_;
-}
-void UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByEmMin::InternalSwap(UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByEmMin* PROTOBUF_RESTRICT other) {
-  using std::swap;
-  _internal_metadata_.InternalSwap(&other->_internal_metadata_);
-  swap(_impl_._has_bits_[0], other->_impl_._has_bits_[0]);
-  ::google::protobuf::internal::memswap<
-      PROTOBUF_FIELD_OFFSET(UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByEmMin, _impl_.window_scale_)
-      + sizeof(UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByEmMin::_impl_.window_scale_)
-      - PROTOBUF_FIELD_OFFSET(UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByEmMin, _impl_.options_)>(
-          reinterpret_cast<char*>(&_impl_.options_),
-          reinterpret_cast<char*>(&other->_impl_.options_));
-}
-
-::google::protobuf::Metadata UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByEmMin::GetMetadata() const {
-  return ::_pbi::AssignDescriptors(
-      &descriptor_table_deephaven_2fproto_2ftable_2eproto_getter, &descriptor_table_deephaven_2fproto_2ftable_2eproto_once,
-      file_level_metadata_deephaven_2fproto_2ftable_2eproto[23]);
-}
-// ===================================================================
-
-class UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByEmMax::_Internal {
- public:
-  using HasBits = decltype(std::declval<UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByEmMax>()._impl_._has_bits_);
-  static constexpr ::int32_t kHasBitsOffset =
-    8 * PROTOBUF_FIELD_OFFSET(UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByEmMax, _impl_._has_bits_);
-  static const ::io::deephaven::proto::backplane::grpc::UpdateByEmOptions& options(const UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByEmMax* msg);
-  static void set_has_options(HasBits* has_bits) {
-    (*has_bits)[0] |= 1u;
-  }
-  static const ::io::deephaven::proto::backplane::grpc::UpdateByWindowScale& window_scale(const UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByEmMax* msg);
-  static void set_has_window_scale(HasBits* has_bits) {
-    (*has_bits)[0] |= 2u;
-  }
-};
-
-const ::io::deephaven::proto::backplane::grpc::UpdateByEmOptions& UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByEmMax::_Internal::options(const UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByEmMax* msg) {
-  return *msg->_impl_.options_;
-}
-const ::io::deephaven::proto::backplane::grpc::UpdateByWindowScale& UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByEmMax::_Internal::window_scale(const UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByEmMax* msg) {
-  return *msg->_impl_.window_scale_;
-}
-UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByEmMax::UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByEmMax(::google::protobuf::Arena* arena)
-    : ::google::protobuf::Message(arena) {
-  SharedCtor(arena);
-  // @@protoc_insertion_point(arena_constructor:io.deephaven.proto.backplane.grpc.UpdateByRequest.UpdateByOperation.UpdateByColumn.UpdateBySpec.UpdateByEmMax)
-}
-inline PROTOBUF_NDEBUG_INLINE UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByEmMax::Impl_::Impl_(
-    ::google::protobuf::internal::InternalVisibility visibility, ::google::protobuf::Arena* arena,
-    const Impl_& from)
-      : _has_bits_{from._has_bits_},
-        _cached_size_{0} {}
-
-UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByEmMax::UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByEmMax(
-    ::google::protobuf::Arena* arena,
-    const UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByEmMax& from)
-    : ::google::protobuf::Message(arena) {
-  UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByEmMax* const _this = this;
-  (void)_this;
-  _internal_metadata_.MergeFrom<::google::protobuf::UnknownFieldSet>(
-      from._internal_metadata_);
-  new (&_impl_) Impl_(internal_visibility(), arena, from._impl_);
-  ::uint32_t cached_has_bits = _impl_._has_bits_[0];
-  _impl_.options_ = (cached_has_bits & 0x00000001u)
-                ? CreateMaybeMessage<::io::deephaven::proto::backplane::grpc::UpdateByEmOptions>(arena, *from._impl_.options_)
-                : nullptr;
-  _impl_.window_scale_ = (cached_has_bits & 0x00000002u)
-                ? CreateMaybeMessage<::io::deephaven::proto::backplane::grpc::UpdateByWindowScale>(arena, *from._impl_.window_scale_)
-                : nullptr;
-
-  // @@protoc_insertion_point(copy_constructor:io.deephaven.proto.backplane.grpc.UpdateByRequest.UpdateByOperation.UpdateByColumn.UpdateBySpec.UpdateByEmMax)
-}
-inline PROTOBUF_NDEBUG_INLINE UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByEmMax::Impl_::Impl_(
-    ::google::protobuf::internal::InternalVisibility visibility,
-    ::google::protobuf::Arena* arena)
-      : _cached_size_{0} {}
-
-inline void UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByEmMax::SharedCtor(::_pb::Arena* arena) {
-  new (&_impl_) Impl_(internal_visibility(), arena);
-  ::memset(reinterpret_cast<char *>(&_impl_) +
-               offsetof(Impl_, options_),
-           0,
-           offsetof(Impl_, window_scale_) -
-               offsetof(Impl_, options_) +
-               sizeof(Impl_::window_scale_));
-}
-UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByEmMax::~UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByEmMax() {
-  // @@protoc_insertion_point(destructor:io.deephaven.proto.backplane.grpc.UpdateByRequest.UpdateByOperation.UpdateByColumn.UpdateBySpec.UpdateByEmMax)
-  _internal_metadata_.Delete<::google::protobuf::UnknownFieldSet>();
-  SharedDtor();
-}
-inline void UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByEmMax::SharedDtor() {
-  ABSL_DCHECK(GetArena() == nullptr);
-  delete _impl_.options_;
-  delete _impl_.window_scale_;
-  _impl_.~Impl_();
-}
-
-PROTOBUF_NOINLINE void UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByEmMax::Clear() {
-// @@protoc_insertion_point(message_clear_start:io.deephaven.proto.backplane.grpc.UpdateByRequest.UpdateByOperation.UpdateByColumn.UpdateBySpec.UpdateByEmMax)
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  ::uint32_t cached_has_bits = 0;
-  // Prevent compiler warnings about cached_has_bits being unused
-  (void) cached_has_bits;
-
-  cached_has_bits = _impl_._has_bits_[0];
-  if (cached_has_bits & 0x00000003u) {
-    if (cached_has_bits & 0x00000001u) {
-      ABSL_DCHECK(_impl_.options_ != nullptr);
-      _impl_.options_->Clear();
-    }
-    if (cached_has_bits & 0x00000002u) {
-      ABSL_DCHECK(_impl_.window_scale_ != nullptr);
-      _impl_.window_scale_->Clear();
-    }
-  }
-  _impl_._has_bits_.Clear();
-  _internal_metadata_.Clear<::google::protobuf::UnknownFieldSet>();
-}
-
-const char* UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByEmMax::_InternalParse(
-    const char* ptr, ::_pbi::ParseContext* ctx) {
-  ptr = ::_pbi::TcParser::ParseLoop(this, ptr, ctx, &_table_.header);
-  return ptr;
-}
-
-
-PROTOBUF_CONSTINIT PROTOBUF_ATTRIBUTE_INIT_PRIORITY1
-const ::_pbi::TcParseTable<1, 2, 2, 0, 2> UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByEmMax::_table_ = {
-  {
-    PROTOBUF_FIELD_OFFSET(UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByEmMax, _impl_._has_bits_),
-    0, // no _extensions_
-    2, 8,  // max_field_number, fast_idx_mask
-    offsetof(decltype(_table_), field_lookup_table),
-    4294967292,  // skipmap
-    offsetof(decltype(_table_), field_entries),
-    2,  // num_field_entries
-    2,  // num_aux_entries
-    offsetof(decltype(_table_), aux_entries),
-    &_UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByEmMax_default_instance_._instance,
-    ::_pbi::TcParser::GenericFallback,  // fallback
-  }, {{
-    // .io.deephaven.proto.backplane.grpc.UpdateByWindowScale window_scale = 2;
-    {::_pbi::TcParser::FastMtS1,
-     {18, 1, 1, PROTOBUF_FIELD_OFFSET(UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByEmMax, _impl_.window_scale_)}},
-    // .io.deephaven.proto.backplane.grpc.UpdateByEmOptions options = 1;
-    {::_pbi::TcParser::FastMtS1,
-     {10, 0, 0, PROTOBUF_FIELD_OFFSET(UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByEmMax, _impl_.options_)}},
-  }}, {{
-    65535, 65535
-  }}, {{
-    // .io.deephaven.proto.backplane.grpc.UpdateByEmOptions options = 1;
-    {PROTOBUF_FIELD_OFFSET(UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByEmMax, _impl_.options_), _Internal::kHasBitsOffset + 0, 0,
-    (0 | ::_fl::kFcOptional | ::_fl::kMessage | ::_fl::kTvTable)},
-    // .io.deephaven.proto.backplane.grpc.UpdateByWindowScale window_scale = 2;
-    {PROTOBUF_FIELD_OFFSET(UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByEmMax, _impl_.window_scale_), _Internal::kHasBitsOffset + 1, 1,
-    (0 | ::_fl::kFcOptional | ::_fl::kMessage | ::_fl::kTvTable)},
-  }}, {{
-    {::_pbi::TcParser::GetTable<::io::deephaven::proto::backplane::grpc::UpdateByEmOptions>()},
-    {::_pbi::TcParser::GetTable<::io::deephaven::proto::backplane::grpc::UpdateByWindowScale>()},
-  }}, {{
-  }},
-};
-
-::uint8_t* UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByEmMax::_InternalSerialize(
-    ::uint8_t* target,
-    ::google::protobuf::io::EpsCopyOutputStream* stream) const {
-  // @@protoc_insertion_point(serialize_to_array_start:io.deephaven.proto.backplane.grpc.UpdateByRequest.UpdateByOperation.UpdateByColumn.UpdateBySpec.UpdateByEmMax)
-  ::uint32_t cached_has_bits = 0;
-  (void)cached_has_bits;
-
-  cached_has_bits = _impl_._has_bits_[0];
-  // .io.deephaven.proto.backplane.grpc.UpdateByEmOptions options = 1;
-  if (cached_has_bits & 0x00000001u) {
-    target = ::google::protobuf::internal::WireFormatLite::InternalWriteMessage(
-        1, _Internal::options(this),
-        _Internal::options(this).GetCachedSize(), target, stream);
-  }
-
-  // .io.deephaven.proto.backplane.grpc.UpdateByWindowScale window_scale = 2;
-  if (cached_has_bits & 0x00000002u) {
-    target = ::google::protobuf::internal::WireFormatLite::InternalWriteMessage(
-        2, _Internal::window_scale(this),
-        _Internal::window_scale(this).GetCachedSize(), target, stream);
-  }
-
-  if (PROTOBUF_PREDICT_FALSE(_internal_metadata_.have_unknown_fields())) {
-    target =
-        ::_pbi::WireFormat::InternalSerializeUnknownFieldsToArray(
-            _internal_metadata_.unknown_fields<::google::protobuf::UnknownFieldSet>(::google::protobuf::UnknownFieldSet::default_instance), target, stream);
-  }
-  // @@protoc_insertion_point(serialize_to_array_end:io.deephaven.proto.backplane.grpc.UpdateByRequest.UpdateByOperation.UpdateByColumn.UpdateBySpec.UpdateByEmMax)
-  return target;
-}
-
-::size_t UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByEmMax::ByteSizeLong() const {
-// @@protoc_insertion_point(message_byte_size_start:io.deephaven.proto.backplane.grpc.UpdateByRequest.UpdateByOperation.UpdateByColumn.UpdateBySpec.UpdateByEmMax)
-  ::size_t total_size = 0;
-
-  ::uint32_t cached_has_bits = 0;
-  // Prevent compiler warnings about cached_has_bits being unused
-  (void) cached_has_bits;
-
-  cached_has_bits = _impl_._has_bits_[0];
-  if (cached_has_bits & 0x00000003u) {
-    // .io.deephaven.proto.backplane.grpc.UpdateByEmOptions options = 1;
-    if (cached_has_bits & 0x00000001u) {
-      total_size +=
-          1 + ::google::protobuf::internal::WireFormatLite::MessageSize(*_impl_.options_);
-    }
-
-    // .io.deephaven.proto.backplane.grpc.UpdateByWindowScale window_scale = 2;
-    if (cached_has_bits & 0x00000002u) {
-      total_size +=
-          1 + ::google::protobuf::internal::WireFormatLite::MessageSize(*_impl_.window_scale_);
-    }
-
-  }
-  return MaybeComputeUnknownFieldsSize(total_size, &_impl_._cached_size_);
-}
-
-const ::google::protobuf::Message::ClassData UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByEmMax::_class_data_ = {
-    UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByEmMax::MergeImpl,
-    nullptr,  // OnDemandRegisterArenaDtor
-};
-const ::google::protobuf::Message::ClassData* UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByEmMax::GetClassData() const {
-  return &_class_data_;
-}
-
-void UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByEmMax::MergeImpl(::google::protobuf::Message& to_msg, const ::google::protobuf::Message& from_msg) {
-  auto* const _this = static_cast<UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByEmMax*>(&to_msg);
-  auto& from = static_cast<const UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByEmMax&>(from_msg);
-  // @@protoc_insertion_point(class_specific_merge_from_start:io.deephaven.proto.backplane.grpc.UpdateByRequest.UpdateByOperation.UpdateByColumn.UpdateBySpec.UpdateByEmMax)
-  ABSL_DCHECK_NE(&from, _this);
-  ::uint32_t cached_has_bits = 0;
-  (void) cached_has_bits;
-
-  cached_has_bits = from._impl_._has_bits_[0];
-  if (cached_has_bits & 0x00000003u) {
-    if (cached_has_bits & 0x00000001u) {
-      _this->_internal_mutable_options()->::io::deephaven::proto::backplane::grpc::UpdateByEmOptions::MergeFrom(
-          from._internal_options());
-    }
-    if (cached_has_bits & 0x00000002u) {
-      _this->_internal_mutable_window_scale()->::io::deephaven::proto::backplane::grpc::UpdateByWindowScale::MergeFrom(
-          from._internal_window_scale());
-    }
-  }
-  _this->_internal_metadata_.MergeFrom<::google::protobuf::UnknownFieldSet>(from._internal_metadata_);
-}
-
-void UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByEmMax::CopyFrom(const UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByEmMax& from) {
-// @@protoc_insertion_point(class_specific_copy_from_start:io.deephaven.proto.backplane.grpc.UpdateByRequest.UpdateByOperation.UpdateByColumn.UpdateBySpec.UpdateByEmMax)
-  if (&from == this) return;
-  Clear();
-  MergeFrom(from);
-}
-
-PROTOBUF_NOINLINE bool UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByEmMax::IsInitialized() const {
-  return true;
-}
-
-::_pbi::CachedSize* UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByEmMax::AccessCachedSize() const {
-  return &_impl_._cached_size_;
-}
-void UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByEmMax::InternalSwap(UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByEmMax* PROTOBUF_RESTRICT other) {
-  using std::swap;
-  _internal_metadata_.InternalSwap(&other->_internal_metadata_);
-  swap(_impl_._has_bits_[0], other->_impl_._has_bits_[0]);
-  ::google::protobuf::internal::memswap<
-      PROTOBUF_FIELD_OFFSET(UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByEmMax, _impl_.window_scale_)
-      + sizeof(UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByEmMax::_impl_.window_scale_)
-      - PROTOBUF_FIELD_OFFSET(UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByEmMax, _impl_.options_)>(
-          reinterpret_cast<char*>(&_impl_.options_),
-          reinterpret_cast<char*>(&other->_impl_.options_));
-}
-
-::google::protobuf::Metadata UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByEmMax::GetMetadata() const {
-  return ::_pbi::AssignDescriptors(
-      &descriptor_table_deephaven_2fproto_2ftable_2eproto_getter, &descriptor_table_deephaven_2fproto_2ftable_2eproto_once,
-      file_level_metadata_deephaven_2fproto_2ftable_2eproto[24]);
-}
-// ===================================================================
-
-class UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByEmStd::_Internal {
- public:
-  using HasBits = decltype(std::declval<UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByEmStd>()._impl_._has_bits_);
-  static constexpr ::int32_t kHasBitsOffset =
-    8 * PROTOBUF_FIELD_OFFSET(UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByEmStd, _impl_._has_bits_);
-  static const ::io::deephaven::proto::backplane::grpc::UpdateByEmOptions& options(const UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByEmStd* msg);
-  static void set_has_options(HasBits* has_bits) {
-    (*has_bits)[0] |= 1u;
-  }
-  static const ::io::deephaven::proto::backplane::grpc::UpdateByWindowScale& window_scale(const UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByEmStd* msg);
-  static void set_has_window_scale(HasBits* has_bits) {
-    (*has_bits)[0] |= 2u;
-  }
-};
-
-const ::io::deephaven::proto::backplane::grpc::UpdateByEmOptions& UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByEmStd::_Internal::options(const UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByEmStd* msg) {
-  return *msg->_impl_.options_;
-}
-const ::io::deephaven::proto::backplane::grpc::UpdateByWindowScale& UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByEmStd::_Internal::window_scale(const UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByEmStd* msg) {
-  return *msg->_impl_.window_scale_;
-}
-UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByEmStd::UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByEmStd(::google::protobuf::Arena* arena)
-    : ::google::protobuf::Message(arena) {
-  SharedCtor(arena);
-  // @@protoc_insertion_point(arena_constructor:io.deephaven.proto.backplane.grpc.UpdateByRequest.UpdateByOperation.UpdateByColumn.UpdateBySpec.UpdateByEmStd)
-}
-inline PROTOBUF_NDEBUG_INLINE UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByEmStd::Impl_::Impl_(
-    ::google::protobuf::internal::InternalVisibility visibility, ::google::protobuf::Arena* arena,
-    const Impl_& from)
-      : _has_bits_{from._has_bits_},
-        _cached_size_{0} {}
-
-UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByEmStd::UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByEmStd(
-    ::google::protobuf::Arena* arena,
-    const UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByEmStd& from)
-    : ::google::protobuf::Message(arena) {
-  UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByEmStd* const _this = this;
-  (void)_this;
-  _internal_metadata_.MergeFrom<::google::protobuf::UnknownFieldSet>(
-      from._internal_metadata_);
-  new (&_impl_) Impl_(internal_visibility(), arena, from._impl_);
-  ::uint32_t cached_has_bits = _impl_._has_bits_[0];
-  _impl_.options_ = (cached_has_bits & 0x00000001u)
-                ? CreateMaybeMessage<::io::deephaven::proto::backplane::grpc::UpdateByEmOptions>(arena, *from._impl_.options_)
-                : nullptr;
-  _impl_.window_scale_ = (cached_has_bits & 0x00000002u)
-                ? CreateMaybeMessage<::io::deephaven::proto::backplane::grpc::UpdateByWindowScale>(arena, *from._impl_.window_scale_)
-                : nullptr;
-
-  // @@protoc_insertion_point(copy_constructor:io.deephaven.proto.backplane.grpc.UpdateByRequest.UpdateByOperation.UpdateByColumn.UpdateBySpec.UpdateByEmStd)
-}
-inline PROTOBUF_NDEBUG_INLINE UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByEmStd::Impl_::Impl_(
-    ::google::protobuf::internal::InternalVisibility visibility,
-    ::google::protobuf::Arena* arena)
-      : _cached_size_{0} {}
-
-inline void UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByEmStd::SharedCtor(::_pb::Arena* arena) {
-  new (&_impl_) Impl_(internal_visibility(), arena);
-  ::memset(reinterpret_cast<char *>(&_impl_) +
-               offsetof(Impl_, options_),
-           0,
-           offsetof(Impl_, window_scale_) -
-               offsetof(Impl_, options_) +
-               sizeof(Impl_::window_scale_));
-}
-UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByEmStd::~UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByEmStd() {
-  // @@protoc_insertion_point(destructor:io.deephaven.proto.backplane.grpc.UpdateByRequest.UpdateByOperation.UpdateByColumn.UpdateBySpec.UpdateByEmStd)
-  _internal_metadata_.Delete<::google::protobuf::UnknownFieldSet>();
-  SharedDtor();
-}
-inline void UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByEmStd::SharedDtor() {
-  ABSL_DCHECK(GetArena() == nullptr);
-  delete _impl_.options_;
-  delete _impl_.window_scale_;
-  _impl_.~Impl_();
-}
-
-PROTOBUF_NOINLINE void UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByEmStd::Clear() {
-// @@protoc_insertion_point(message_clear_start:io.deephaven.proto.backplane.grpc.UpdateByRequest.UpdateByOperation.UpdateByColumn.UpdateBySpec.UpdateByEmStd)
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  ::uint32_t cached_has_bits = 0;
-  // Prevent compiler warnings about cached_has_bits being unused
-  (void) cached_has_bits;
-
-  cached_has_bits = _impl_._has_bits_[0];
-  if (cached_has_bits & 0x00000003u) {
-    if (cached_has_bits & 0x00000001u) {
-      ABSL_DCHECK(_impl_.options_ != nullptr);
-      _impl_.options_->Clear();
-    }
-    if (cached_has_bits & 0x00000002u) {
-      ABSL_DCHECK(_impl_.window_scale_ != nullptr);
-      _impl_.window_scale_->Clear();
-    }
-  }
-  _impl_._has_bits_.Clear();
-  _internal_metadata_.Clear<::google::protobuf::UnknownFieldSet>();
-}
-
-const char* UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByEmStd::_InternalParse(
-    const char* ptr, ::_pbi::ParseContext* ctx) {
-  ptr = ::_pbi::TcParser::ParseLoop(this, ptr, ctx, &_table_.header);
-  return ptr;
-}
-
-
-PROTOBUF_CONSTINIT PROTOBUF_ATTRIBUTE_INIT_PRIORITY1
-const ::_pbi::TcParseTable<1, 2, 2, 0, 2> UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByEmStd::_table_ = {
-  {
-    PROTOBUF_FIELD_OFFSET(UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByEmStd, _impl_._has_bits_),
-    0, // no _extensions_
-    2, 8,  // max_field_number, fast_idx_mask
-    offsetof(decltype(_table_), field_lookup_table),
-    4294967292,  // skipmap
-    offsetof(decltype(_table_), field_entries),
-    2,  // num_field_entries
-    2,  // num_aux_entries
-    offsetof(decltype(_table_), aux_entries),
-    &_UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByEmStd_default_instance_._instance,
-    ::_pbi::TcParser::GenericFallback,  // fallback
-  }, {{
-    // .io.deephaven.proto.backplane.grpc.UpdateByWindowScale window_scale = 2;
-    {::_pbi::TcParser::FastMtS1,
-     {18, 1, 1, PROTOBUF_FIELD_OFFSET(UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByEmStd, _impl_.window_scale_)}},
-    // .io.deephaven.proto.backplane.grpc.UpdateByEmOptions options = 1;
-    {::_pbi::TcParser::FastMtS1,
-     {10, 0, 0, PROTOBUF_FIELD_OFFSET(UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByEmStd, _impl_.options_)}},
-  }}, {{
-    65535, 65535
-  }}, {{
-    // .io.deephaven.proto.backplane.grpc.UpdateByEmOptions options = 1;
-    {PROTOBUF_FIELD_OFFSET(UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByEmStd, _impl_.options_), _Internal::kHasBitsOffset + 0, 0,
-    (0 | ::_fl::kFcOptional | ::_fl::kMessage | ::_fl::kTvTable)},
-    // .io.deephaven.proto.backplane.grpc.UpdateByWindowScale window_scale = 2;
-    {PROTOBUF_FIELD_OFFSET(UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByEmStd, _impl_.window_scale_), _Internal::kHasBitsOffset + 1, 1,
-    (0 | ::_fl::kFcOptional | ::_fl::kMessage | ::_fl::kTvTable)},
-  }}, {{
-    {::_pbi::TcParser::GetTable<::io::deephaven::proto::backplane::grpc::UpdateByEmOptions>()},
-    {::_pbi::TcParser::GetTable<::io::deephaven::proto::backplane::grpc::UpdateByWindowScale>()},
-  }}, {{
-  }},
-};
-
-::uint8_t* UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByEmStd::_InternalSerialize(
-    ::uint8_t* target,
-    ::google::protobuf::io::EpsCopyOutputStream* stream) const {
-  // @@protoc_insertion_point(serialize_to_array_start:io.deephaven.proto.backplane.grpc.UpdateByRequest.UpdateByOperation.UpdateByColumn.UpdateBySpec.UpdateByEmStd)
-  ::uint32_t cached_has_bits = 0;
-  (void)cached_has_bits;
-
-  cached_has_bits = _impl_._has_bits_[0];
-  // .io.deephaven.proto.backplane.grpc.UpdateByEmOptions options = 1;
-  if (cached_has_bits & 0x00000001u) {
-    target = ::google::protobuf::internal::WireFormatLite::InternalWriteMessage(
-        1, _Internal::options(this),
-        _Internal::options(this).GetCachedSize(), target, stream);
-  }
-
-  // .io.deephaven.proto.backplane.grpc.UpdateByWindowScale window_scale = 2;
-  if (cached_has_bits & 0x00000002u) {
-    target = ::google::protobuf::internal::WireFormatLite::InternalWriteMessage(
-        2, _Internal::window_scale(this),
-        _Internal::window_scale(this).GetCachedSize(), target, stream);
-  }
-
-  if (PROTOBUF_PREDICT_FALSE(_internal_metadata_.have_unknown_fields())) {
-    target =
-        ::_pbi::WireFormat::InternalSerializeUnknownFieldsToArray(
-            _internal_metadata_.unknown_fields<::google::protobuf::UnknownFieldSet>(::google::protobuf::UnknownFieldSet::default_instance), target, stream);
-  }
-  // @@protoc_insertion_point(serialize_to_array_end:io.deephaven.proto.backplane.grpc.UpdateByRequest.UpdateByOperation.UpdateByColumn.UpdateBySpec.UpdateByEmStd)
-  return target;
-}
-
-::size_t UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByEmStd::ByteSizeLong() const {
-// @@protoc_insertion_point(message_byte_size_start:io.deephaven.proto.backplane.grpc.UpdateByRequest.UpdateByOperation.UpdateByColumn.UpdateBySpec.UpdateByEmStd)
-  ::size_t total_size = 0;
-
-  ::uint32_t cached_has_bits = 0;
-  // Prevent compiler warnings about cached_has_bits being unused
-  (void) cached_has_bits;
-
-  cached_has_bits = _impl_._has_bits_[0];
-  if (cached_has_bits & 0x00000003u) {
-    // .io.deephaven.proto.backplane.grpc.UpdateByEmOptions options = 1;
-    if (cached_has_bits & 0x00000001u) {
-      total_size +=
-          1 + ::google::protobuf::internal::WireFormatLite::MessageSize(*_impl_.options_);
-    }
-
-    // .io.deephaven.proto.backplane.grpc.UpdateByWindowScale window_scale = 2;
-    if (cached_has_bits & 0x00000002u) {
-      total_size +=
-          1 + ::google::protobuf::internal::WireFormatLite::MessageSize(*_impl_.window_scale_);
-    }
-
-  }
-  return MaybeComputeUnknownFieldsSize(total_size, &_impl_._cached_size_);
-}
-
-const ::google::protobuf::Message::ClassData UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByEmStd::_class_data_ = {
-    UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByEmStd::MergeImpl,
-    nullptr,  // OnDemandRegisterArenaDtor
-};
-const ::google::protobuf::Message::ClassData* UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByEmStd::GetClassData() const {
-  return &_class_data_;
-}
-
-void UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByEmStd::MergeImpl(::google::protobuf::Message& to_msg, const ::google::protobuf::Message& from_msg) {
-  auto* const _this = static_cast<UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByEmStd*>(&to_msg);
-  auto& from = static_cast<const UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByEmStd&>(from_msg);
-  // @@protoc_insertion_point(class_specific_merge_from_start:io.deephaven.proto.backplane.grpc.UpdateByRequest.UpdateByOperation.UpdateByColumn.UpdateBySpec.UpdateByEmStd)
-  ABSL_DCHECK_NE(&from, _this);
-  ::uint32_t cached_has_bits = 0;
-  (void) cached_has_bits;
-
-  cached_has_bits = from._impl_._has_bits_[0];
-  if (cached_has_bits & 0x00000003u) {
-    if (cached_has_bits & 0x00000001u) {
-      _this->_internal_mutable_options()->::io::deephaven::proto::backplane::grpc::UpdateByEmOptions::MergeFrom(
-          from._internal_options());
-    }
-    if (cached_has_bits & 0x00000002u) {
-      _this->_internal_mutable_window_scale()->::io::deephaven::proto::backplane::grpc::UpdateByWindowScale::MergeFrom(
-          from._internal_window_scale());
-    }
-  }
-  _this->_internal_metadata_.MergeFrom<::google::protobuf::UnknownFieldSet>(from._internal_metadata_);
-}
-
-void UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByEmStd::CopyFrom(const UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByEmStd& from) {
-// @@protoc_insertion_point(class_specific_copy_from_start:io.deephaven.proto.backplane.grpc.UpdateByRequest.UpdateByOperation.UpdateByColumn.UpdateBySpec.UpdateByEmStd)
-  if (&from == this) return;
-  Clear();
-  MergeFrom(from);
-}
-
-PROTOBUF_NOINLINE bool UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByEmStd::IsInitialized() const {
-  return true;
-}
-
-::_pbi::CachedSize* UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByEmStd::AccessCachedSize() const {
-  return &_impl_._cached_size_;
-}
-void UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByEmStd::InternalSwap(UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByEmStd* PROTOBUF_RESTRICT other) {
-  using std::swap;
-  _internal_metadata_.InternalSwap(&other->_internal_metadata_);
-  swap(_impl_._has_bits_[0], other->_impl_._has_bits_[0]);
-  ::google::protobuf::internal::memswap<
-      PROTOBUF_FIELD_OFFSET(UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByEmStd, _impl_.window_scale_)
-      + sizeof(UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByEmStd::_impl_.window_scale_)
-      - PROTOBUF_FIELD_OFFSET(UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByEmStd, _impl_.options_)>(
-          reinterpret_cast<char*>(&_impl_.options_),
-          reinterpret_cast<char*>(&other->_impl_.options_));
-}
-
-::google::protobuf::Metadata UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByEmStd::GetMetadata() const {
-  return ::_pbi::AssignDescriptors(
-      &descriptor_table_deephaven_2fproto_2ftable_2eproto_getter, &descriptor_table_deephaven_2fproto_2ftable_2eproto_once,
-      file_level_metadata_deephaven_2fproto_2ftable_2eproto[25]);
-}
-// ===================================================================
-
-class UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByDelta::_Internal {
- public:
-  using HasBits = decltype(std::declval<UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByDelta>()._impl_._has_bits_);
-  static constexpr ::int32_t kHasBitsOffset =
-    8 * PROTOBUF_FIELD_OFFSET(UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByDelta, _impl_._has_bits_);
-  static const ::io::deephaven::proto::backplane::grpc::UpdateByDeltaOptions& options(const UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByDelta* msg);
-  static void set_has_options(HasBits* has_bits) {
-    (*has_bits)[0] |= 1u;
-  }
-};
-
-const ::io::deephaven::proto::backplane::grpc::UpdateByDeltaOptions& UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByDelta::_Internal::options(const UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByDelta* msg) {
-  return *msg->_impl_.options_;
-}
-UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByDelta::UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByDelta(::google::protobuf::Arena* arena)
-    : ::google::protobuf::Message(arena) {
-  SharedCtor(arena);
-  // @@protoc_insertion_point(arena_constructor:io.deephaven.proto.backplane.grpc.UpdateByRequest.UpdateByOperation.UpdateByColumn.UpdateBySpec.UpdateByDelta)
-}
-inline PROTOBUF_NDEBUG_INLINE UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByDelta::Impl_::Impl_(
-    ::google::protobuf::internal::InternalVisibility visibility, ::google::protobuf::Arena* arena,
-    const Impl_& from)
-      : _has_bits_{from._has_bits_},
-        _cached_size_{0} {}
-
-UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByDelta::UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByDelta(
-    ::google::protobuf::Arena* arena,
-    const UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByDelta& from)
-    : ::google::protobuf::Message(arena) {
-  UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByDelta* const _this = this;
-  (void)_this;
-  _internal_metadata_.MergeFrom<::google::protobuf::UnknownFieldSet>(
-      from._internal_metadata_);
-  new (&_impl_) Impl_(internal_visibility(), arena, from._impl_);
-  ::uint32_t cached_has_bits = _impl_._has_bits_[0];
-  _impl_.options_ = (cached_has_bits & 0x00000001u)
-                ? CreateMaybeMessage<::io::deephaven::proto::backplane::grpc::UpdateByDeltaOptions>(arena, *from._impl_.options_)
-                : nullptr;
-
-  // @@protoc_insertion_point(copy_constructor:io.deephaven.proto.backplane.grpc.UpdateByRequest.UpdateByOperation.UpdateByColumn.UpdateBySpec.UpdateByDelta)
-}
-inline PROTOBUF_NDEBUG_INLINE UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByDelta::Impl_::Impl_(
-    ::google::protobuf::internal::InternalVisibility visibility,
-    ::google::protobuf::Arena* arena)
-      : _cached_size_{0} {}
-
-inline void UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByDelta::SharedCtor(::_pb::Arena* arena) {
-  new (&_impl_) Impl_(internal_visibility(), arena);
-  _impl_.options_ = {};
-}
-UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByDelta::~UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByDelta() {
-  // @@protoc_insertion_point(destructor:io.deephaven.proto.backplane.grpc.UpdateByRequest.UpdateByOperation.UpdateByColumn.UpdateBySpec.UpdateByDelta)
-  _internal_metadata_.Delete<::google::protobuf::UnknownFieldSet>();
-  SharedDtor();
-}
-inline void UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByDelta::SharedDtor() {
-  ABSL_DCHECK(GetArena() == nullptr);
-  delete _impl_.options_;
-  _impl_.~Impl_();
-}
-
-PROTOBUF_NOINLINE void UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByDelta::Clear() {
-// @@protoc_insertion_point(message_clear_start:io.deephaven.proto.backplane.grpc.UpdateByRequest.UpdateByOperation.UpdateByColumn.UpdateBySpec.UpdateByDelta)
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  ::uint32_t cached_has_bits = 0;
-  // Prevent compiler warnings about cached_has_bits being unused
-  (void) cached_has_bits;
-
-  cached_has_bits = _impl_._has_bits_[0];
-  if (cached_has_bits & 0x00000001u) {
-    ABSL_DCHECK(_impl_.options_ != nullptr);
-    _impl_.options_->Clear();
-  }
-  _impl_._has_bits_.Clear();
-  _internal_metadata_.Clear<::google::protobuf::UnknownFieldSet>();
-}
-
-const char* UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByDelta::_InternalParse(
-    const char* ptr, ::_pbi::ParseContext* ctx) {
-  ptr = ::_pbi::TcParser::ParseLoop(this, ptr, ctx, &_table_.header);
-  return ptr;
-}
-
-
-PROTOBUF_CONSTINIT PROTOBUF_ATTRIBUTE_INIT_PRIORITY1
-const ::_pbi::TcParseTable<0, 1, 1, 0, 2> UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByDelta::_table_ = {
-  {
-    PROTOBUF_FIELD_OFFSET(UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByDelta, _impl_._has_bits_),
-    0, // no _extensions_
-    1, 0,  // max_field_number, fast_idx_mask
-    offsetof(decltype(_table_), field_lookup_table),
-    4294967294,  // skipmap
-    offsetof(decltype(_table_), field_entries),
-    1,  // num_field_entries
-    1,  // num_aux_entries
-    offsetof(decltype(_table_), aux_entries),
-    &_UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByDelta_default_instance_._instance,
-    ::_pbi::TcParser::GenericFallback,  // fallback
-  }, {{
-    // .io.deephaven.proto.backplane.grpc.UpdateByDeltaOptions options = 1;
-    {::_pbi::TcParser::FastMtS1,
-     {10, 0, 0, PROTOBUF_FIELD_OFFSET(UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByDelta, _impl_.options_)}},
-  }}, {{
-    65535, 65535
-  }}, {{
-    // .io.deephaven.proto.backplane.grpc.UpdateByDeltaOptions options = 1;
-    {PROTOBUF_FIELD_OFFSET(UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByDelta, _impl_.options_), _Internal::kHasBitsOffset + 0, 0,
-    (0 | ::_fl::kFcOptional | ::_fl::kMessage | ::_fl::kTvTable)},
-  }}, {{
-    {::_pbi::TcParser::GetTable<::io::deephaven::proto::backplane::grpc::UpdateByDeltaOptions>()},
-  }}, {{
-  }},
-};
-
-::uint8_t* UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByDelta::_InternalSerialize(
-    ::uint8_t* target,
-    ::google::protobuf::io::EpsCopyOutputStream* stream) const {
-  // @@protoc_insertion_point(serialize_to_array_start:io.deephaven.proto.backplane.grpc.UpdateByRequest.UpdateByOperation.UpdateByColumn.UpdateBySpec.UpdateByDelta)
-  ::uint32_t cached_has_bits = 0;
-  (void)cached_has_bits;
-
-  cached_has_bits = _impl_._has_bits_[0];
-  // .io.deephaven.proto.backplane.grpc.UpdateByDeltaOptions options = 1;
-  if (cached_has_bits & 0x00000001u) {
-    target = ::google::protobuf::internal::WireFormatLite::InternalWriteMessage(
-        1, _Internal::options(this),
-        _Internal::options(this).GetCachedSize(), target, stream);
-  }
-
-  if (PROTOBUF_PREDICT_FALSE(_internal_metadata_.have_unknown_fields())) {
-    target =
-        ::_pbi::WireFormat::InternalSerializeUnknownFieldsToArray(
-            _internal_metadata_.unknown_fields<::google::protobuf::UnknownFieldSet>(::google::protobuf::UnknownFieldSet::default_instance), target, stream);
-  }
-  // @@protoc_insertion_point(serialize_to_array_end:io.deephaven.proto.backplane.grpc.UpdateByRequest.UpdateByOperation.UpdateByColumn.UpdateBySpec.UpdateByDelta)
-  return target;
-}
-
-::size_t UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByDelta::ByteSizeLong() const {
-// @@protoc_insertion_point(message_byte_size_start:io.deephaven.proto.backplane.grpc.UpdateByRequest.UpdateByOperation.UpdateByColumn.UpdateBySpec.UpdateByDelta)
-  ::size_t total_size = 0;
-
-  ::uint32_t cached_has_bits = 0;
-  // Prevent compiler warnings about cached_has_bits being unused
-  (void) cached_has_bits;
-
-  // .io.deephaven.proto.backplane.grpc.UpdateByDeltaOptions options = 1;
-  cached_has_bits = _impl_._has_bits_[0];
-  if (cached_has_bits & 0x00000001u) {
-    total_size +=
-        1 + ::google::protobuf::internal::WireFormatLite::MessageSize(*_impl_.options_);
-  }
-
-  return MaybeComputeUnknownFieldsSize(total_size, &_impl_._cached_size_);
-}
-
-const ::google::protobuf::Message::ClassData UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByDelta::_class_data_ = {
-    UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByDelta::MergeImpl,
-    nullptr,  // OnDemandRegisterArenaDtor
-};
-const ::google::protobuf::Message::ClassData* UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByDelta::GetClassData() const {
-  return &_class_data_;
-}
-
-void UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByDelta::MergeImpl(::google::protobuf::Message& to_msg, const ::google::protobuf::Message& from_msg) {
-  auto* const _this = static_cast<UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByDelta*>(&to_msg);
-  auto& from = static_cast<const UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByDelta&>(from_msg);
-  // @@protoc_insertion_point(class_specific_merge_from_start:io.deephaven.proto.backplane.grpc.UpdateByRequest.UpdateByOperation.UpdateByColumn.UpdateBySpec.UpdateByDelta)
-  ABSL_DCHECK_NE(&from, _this);
-  ::uint32_t cached_has_bits = 0;
-  (void) cached_has_bits;
-
-  if ((from._impl_._has_bits_[0] & 0x00000001u) != 0) {
-    _this->_internal_mutable_options()->::io::deephaven::proto::backplane::grpc::UpdateByDeltaOptions::MergeFrom(
-        from._internal_options());
-  }
-  _this->_internal_metadata_.MergeFrom<::google::protobuf::UnknownFieldSet>(from._internal_metadata_);
-}
-
-void UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByDelta::CopyFrom(const UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByDelta& from) {
-// @@protoc_insertion_point(class_specific_copy_from_start:io.deephaven.proto.backplane.grpc.UpdateByRequest.UpdateByOperation.UpdateByColumn.UpdateBySpec.UpdateByDelta)
-  if (&from == this) return;
-  Clear();
-  MergeFrom(from);
-}
-
-PROTOBUF_NOINLINE bool UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByDelta::IsInitialized() const {
-  return true;
-}
-
-::_pbi::CachedSize* UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByDelta::AccessCachedSize() const {
-  return &_impl_._cached_size_;
-}
-void UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByDelta::InternalSwap(UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByDelta* PROTOBUF_RESTRICT other) {
-  using std::swap;
-  _internal_metadata_.InternalSwap(&other->_internal_metadata_);
-  swap(_impl_._has_bits_[0], other->_impl_._has_bits_[0]);
-  swap(_impl_.options_, other->_impl_.options_);
-}
-
-::google::protobuf::Metadata UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByDelta::GetMetadata() const {
-  return ::_pbi::AssignDescriptors(
-      &descriptor_table_deephaven_2fproto_2ftable_2eproto_getter, &descriptor_table_deephaven_2fproto_2ftable_2eproto_once,
-      file_level_metadata_deephaven_2fproto_2ftable_2eproto[26]);
-}
-// ===================================================================
-
-class UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingSum::_Internal {
- public:
-  using HasBits = decltype(std::declval<UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingSum>()._impl_._has_bits_);
-  static constexpr ::int32_t kHasBitsOffset =
-    8 * PROTOBUF_FIELD_OFFSET(UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingSum, _impl_._has_bits_);
-  static const ::io::deephaven::proto::backplane::grpc::UpdateByWindowScale& reverse_window_scale(const UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingSum* msg);
-  static void set_has_reverse_window_scale(HasBits* has_bits) {
-    (*has_bits)[0] |= 1u;
-  }
-  static const ::io::deephaven::proto::backplane::grpc::UpdateByWindowScale& forward_window_scale(const UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingSum* msg);
-  static void set_has_forward_window_scale(HasBits* has_bits) {
-    (*has_bits)[0] |= 2u;
-  }
-};
-
-const ::io::deephaven::proto::backplane::grpc::UpdateByWindowScale& UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingSum::_Internal::reverse_window_scale(const UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingSum* msg) {
-  return *msg->_impl_.reverse_window_scale_;
-}
-const ::io::deephaven::proto::backplane::grpc::UpdateByWindowScale& UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingSum::_Internal::forward_window_scale(const UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingSum* msg) {
-  return *msg->_impl_.forward_window_scale_;
-}
-UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingSum::UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingSum(::google::protobuf::Arena* arena)
-    : ::google::protobuf::Message(arena) {
-  SharedCtor(arena);
-  // @@protoc_insertion_point(arena_constructor:io.deephaven.proto.backplane.grpc.UpdateByRequest.UpdateByOperation.UpdateByColumn.UpdateBySpec.UpdateByRollingSum)
-}
-inline PROTOBUF_NDEBUG_INLINE UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingSum::Impl_::Impl_(
-    ::google::protobuf::internal::InternalVisibility visibility, ::google::protobuf::Arena* arena,
-    const Impl_& from)
-      : _has_bits_{from._has_bits_},
-        _cached_size_{0} {}
-
-UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingSum::UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingSum(
-    ::google::protobuf::Arena* arena,
-    const UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingSum& from)
-    : ::google::protobuf::Message(arena) {
-  UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingSum* const _this = this;
-  (void)_this;
-  _internal_metadata_.MergeFrom<::google::protobuf::UnknownFieldSet>(
-      from._internal_metadata_);
-  new (&_impl_) Impl_(internal_visibility(), arena, from._impl_);
-  ::uint32_t cached_has_bits = _impl_._has_bits_[0];
-  _impl_.reverse_window_scale_ = (cached_has_bits & 0x00000001u)
-                ? CreateMaybeMessage<::io::deephaven::proto::backplane::grpc::UpdateByWindowScale>(arena, *from._impl_.reverse_window_scale_)
-                : nullptr;
-  _impl_.forward_window_scale_ = (cached_has_bits & 0x00000002u)
-                ? CreateMaybeMessage<::io::deephaven::proto::backplane::grpc::UpdateByWindowScale>(arena, *from._impl_.forward_window_scale_)
-                : nullptr;
-
-  // @@protoc_insertion_point(copy_constructor:io.deephaven.proto.backplane.grpc.UpdateByRequest.UpdateByOperation.UpdateByColumn.UpdateBySpec.UpdateByRollingSum)
-}
-inline PROTOBUF_NDEBUG_INLINE UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingSum::Impl_::Impl_(
-    ::google::protobuf::internal::InternalVisibility visibility,
-    ::google::protobuf::Arena* arena)
-      : _cached_size_{0} {}
-
-inline void UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingSum::SharedCtor(::_pb::Arena* arena) {
-  new (&_impl_) Impl_(internal_visibility(), arena);
-  ::memset(reinterpret_cast<char *>(&_impl_) +
-               offsetof(Impl_, reverse_window_scale_),
-           0,
-           offsetof(Impl_, forward_window_scale_) -
-               offsetof(Impl_, reverse_window_scale_) +
-               sizeof(Impl_::forward_window_scale_));
-}
-UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingSum::~UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingSum() {
-  // @@protoc_insertion_point(destructor:io.deephaven.proto.backplane.grpc.UpdateByRequest.UpdateByOperation.UpdateByColumn.UpdateBySpec.UpdateByRollingSum)
-  _internal_metadata_.Delete<::google::protobuf::UnknownFieldSet>();
-  SharedDtor();
-}
-inline void UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingSum::SharedDtor() {
-  ABSL_DCHECK(GetArena() == nullptr);
-  delete _impl_.reverse_window_scale_;
-  delete _impl_.forward_window_scale_;
-  _impl_.~Impl_();
-}
-
-PROTOBUF_NOINLINE void UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingSum::Clear() {
-// @@protoc_insertion_point(message_clear_start:io.deephaven.proto.backplane.grpc.UpdateByRequest.UpdateByOperation.UpdateByColumn.UpdateBySpec.UpdateByRollingSum)
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  ::uint32_t cached_has_bits = 0;
-  // Prevent compiler warnings about cached_has_bits being unused
-  (void) cached_has_bits;
-
-  cached_has_bits = _impl_._has_bits_[0];
-  if (cached_has_bits & 0x00000003u) {
-    if (cached_has_bits & 0x00000001u) {
-      ABSL_DCHECK(_impl_.reverse_window_scale_ != nullptr);
-      _impl_.reverse_window_scale_->Clear();
-    }
-    if (cached_has_bits & 0x00000002u) {
-      ABSL_DCHECK(_impl_.forward_window_scale_ != nullptr);
-      _impl_.forward_window_scale_->Clear();
-    }
-  }
-  _impl_._has_bits_.Clear();
-  _internal_metadata_.Clear<::google::protobuf::UnknownFieldSet>();
-}
-
-const char* UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingSum::_InternalParse(
-    const char* ptr, ::_pbi::ParseContext* ctx) {
-  ptr = ::_pbi::TcParser::ParseLoop(this, ptr, ctx, &_table_.header);
-  return ptr;
-}
-
-
-PROTOBUF_CONSTINIT PROTOBUF_ATTRIBUTE_INIT_PRIORITY1
-const ::_pbi::TcParseTable<1, 2, 2, 0, 2> UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingSum::_table_ = {
-  {
-    PROTOBUF_FIELD_OFFSET(UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingSum, _impl_._has_bits_),
-    0, // no _extensions_
-    2, 8,  // max_field_number, fast_idx_mask
-    offsetof(decltype(_table_), field_lookup_table),
-    4294967292,  // skipmap
-    offsetof(decltype(_table_), field_entries),
-    2,  // num_field_entries
-    2,  // num_aux_entries
-    offsetof(decltype(_table_), aux_entries),
-    &_UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingSum_default_instance_._instance,
-    ::_pbi::TcParser::GenericFallback,  // fallback
-  }, {{
-    // .io.deephaven.proto.backplane.grpc.UpdateByWindowScale forward_window_scale = 2;
-    {::_pbi::TcParser::FastMtS1,
-     {18, 1, 1, PROTOBUF_FIELD_OFFSET(UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingSum, _impl_.forward_window_scale_)}},
-    // .io.deephaven.proto.backplane.grpc.UpdateByWindowScale reverse_window_scale = 1;
-    {::_pbi::TcParser::FastMtS1,
-     {10, 0, 0, PROTOBUF_FIELD_OFFSET(UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingSum, _impl_.reverse_window_scale_)}},
-  }}, {{
-    65535, 65535
-  }}, {{
-    // .io.deephaven.proto.backplane.grpc.UpdateByWindowScale reverse_window_scale = 1;
-    {PROTOBUF_FIELD_OFFSET(UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingSum, _impl_.reverse_window_scale_), _Internal::kHasBitsOffset + 0, 0,
-    (0 | ::_fl::kFcOptional | ::_fl::kMessage | ::_fl::kTvTable)},
-    // .io.deephaven.proto.backplane.grpc.UpdateByWindowScale forward_window_scale = 2;
-    {PROTOBUF_FIELD_OFFSET(UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingSum, _impl_.forward_window_scale_), _Internal::kHasBitsOffset + 1, 1,
-    (0 | ::_fl::kFcOptional | ::_fl::kMessage | ::_fl::kTvTable)},
-  }}, {{
-    {::_pbi::TcParser::GetTable<::io::deephaven::proto::backplane::grpc::UpdateByWindowScale>()},
-    {::_pbi::TcParser::GetTable<::io::deephaven::proto::backplane::grpc::UpdateByWindowScale>()},
-  }}, {{
-  }},
-};
-
-::uint8_t* UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingSum::_InternalSerialize(
-    ::uint8_t* target,
-    ::google::protobuf::io::EpsCopyOutputStream* stream) const {
-  // @@protoc_insertion_point(serialize_to_array_start:io.deephaven.proto.backplane.grpc.UpdateByRequest.UpdateByOperation.UpdateByColumn.UpdateBySpec.UpdateByRollingSum)
-  ::uint32_t cached_has_bits = 0;
-  (void)cached_has_bits;
-
-  cached_has_bits = _impl_._has_bits_[0];
-  // .io.deephaven.proto.backplane.grpc.UpdateByWindowScale reverse_window_scale = 1;
-  if (cached_has_bits & 0x00000001u) {
-    target = ::google::protobuf::internal::WireFormatLite::InternalWriteMessage(
-        1, _Internal::reverse_window_scale(this),
-        _Internal::reverse_window_scale(this).GetCachedSize(), target, stream);
-  }
-
-  // .io.deephaven.proto.backplane.grpc.UpdateByWindowScale forward_window_scale = 2;
-  if (cached_has_bits & 0x00000002u) {
-    target = ::google::protobuf::internal::WireFormatLite::InternalWriteMessage(
-        2, _Internal::forward_window_scale(this),
-        _Internal::forward_window_scale(this).GetCachedSize(), target, stream);
-  }
-
-  if (PROTOBUF_PREDICT_FALSE(_internal_metadata_.have_unknown_fields())) {
-    target =
-        ::_pbi::WireFormat::InternalSerializeUnknownFieldsToArray(
-            _internal_metadata_.unknown_fields<::google::protobuf::UnknownFieldSet>(::google::protobuf::UnknownFieldSet::default_instance), target, stream);
-  }
-  // @@protoc_insertion_point(serialize_to_array_end:io.deephaven.proto.backplane.grpc.UpdateByRequest.UpdateByOperation.UpdateByColumn.UpdateBySpec.UpdateByRollingSum)
-  return target;
-}
-
-::size_t UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingSum::ByteSizeLong() const {
-// @@protoc_insertion_point(message_byte_size_start:io.deephaven.proto.backplane.grpc.UpdateByRequest.UpdateByOperation.UpdateByColumn.UpdateBySpec.UpdateByRollingSum)
-  ::size_t total_size = 0;
-
-  ::uint32_t cached_has_bits = 0;
-  // Prevent compiler warnings about cached_has_bits being unused
-  (void) cached_has_bits;
-
-  cached_has_bits = _impl_._has_bits_[0];
-  if (cached_has_bits & 0x00000003u) {
-    // .io.deephaven.proto.backplane.grpc.UpdateByWindowScale reverse_window_scale = 1;
-    if (cached_has_bits & 0x00000001u) {
-      total_size +=
-          1 + ::google::protobuf::internal::WireFormatLite::MessageSize(*_impl_.reverse_window_scale_);
-    }
-
-    // .io.deephaven.proto.backplane.grpc.UpdateByWindowScale forward_window_scale = 2;
-    if (cached_has_bits & 0x00000002u) {
-      total_size +=
-          1 + ::google::protobuf::internal::WireFormatLite::MessageSize(*_impl_.forward_window_scale_);
-    }
-
-  }
-  return MaybeComputeUnknownFieldsSize(total_size, &_impl_._cached_size_);
-}
-
-const ::google::protobuf::Message::ClassData UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingSum::_class_data_ = {
-    UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingSum::MergeImpl,
-    nullptr,  // OnDemandRegisterArenaDtor
-};
-const ::google::protobuf::Message::ClassData* UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingSum::GetClassData() const {
-  return &_class_data_;
-}
-
-void UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingSum::MergeImpl(::google::protobuf::Message& to_msg, const ::google::protobuf::Message& from_msg) {
-  auto* const _this = static_cast<UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingSum*>(&to_msg);
-  auto& from = static_cast<const UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingSum&>(from_msg);
-  // @@protoc_insertion_point(class_specific_merge_from_start:io.deephaven.proto.backplane.grpc.UpdateByRequest.UpdateByOperation.UpdateByColumn.UpdateBySpec.UpdateByRollingSum)
-  ABSL_DCHECK_NE(&from, _this);
-  ::uint32_t cached_has_bits = 0;
-  (void) cached_has_bits;
-
-  cached_has_bits = from._impl_._has_bits_[0];
-  if (cached_has_bits & 0x00000003u) {
-    if (cached_has_bits & 0x00000001u) {
-      _this->_internal_mutable_reverse_window_scale()->::io::deephaven::proto::backplane::grpc::UpdateByWindowScale::MergeFrom(
-          from._internal_reverse_window_scale());
-    }
-    if (cached_has_bits & 0x00000002u) {
-      _this->_internal_mutable_forward_window_scale()->::io::deephaven::proto::backplane::grpc::UpdateByWindowScale::MergeFrom(
-          from._internal_forward_window_scale());
-    }
-  }
-  _this->_internal_metadata_.MergeFrom<::google::protobuf::UnknownFieldSet>(from._internal_metadata_);
-}
-
-void UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingSum::CopyFrom(const UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingSum& from) {
-// @@protoc_insertion_point(class_specific_copy_from_start:io.deephaven.proto.backplane.grpc.UpdateByRequest.UpdateByOperation.UpdateByColumn.UpdateBySpec.UpdateByRollingSum)
-  if (&from == this) return;
-  Clear();
-  MergeFrom(from);
-}
-
-PROTOBUF_NOINLINE bool UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingSum::IsInitialized() const {
-  return true;
-}
-
-::_pbi::CachedSize* UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingSum::AccessCachedSize() const {
-  return &_impl_._cached_size_;
-}
-void UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingSum::InternalSwap(UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingSum* PROTOBUF_RESTRICT other) {
-  using std::swap;
-  _internal_metadata_.InternalSwap(&other->_internal_metadata_);
-  swap(_impl_._has_bits_[0], other->_impl_._has_bits_[0]);
-  ::google::protobuf::internal::memswap<
-      PROTOBUF_FIELD_OFFSET(UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingSum, _impl_.forward_window_scale_)
-      + sizeof(UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingSum::_impl_.forward_window_scale_)
-      - PROTOBUF_FIELD_OFFSET(UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingSum, _impl_.reverse_window_scale_)>(
-          reinterpret_cast<char*>(&_impl_.reverse_window_scale_),
-          reinterpret_cast<char*>(&other->_impl_.reverse_window_scale_));
-}
-
-::google::protobuf::Metadata UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingSum::GetMetadata() const {
-  return ::_pbi::AssignDescriptors(
-      &descriptor_table_deephaven_2fproto_2ftable_2eproto_getter, &descriptor_table_deephaven_2fproto_2ftable_2eproto_once,
-      file_level_metadata_deephaven_2fproto_2ftable_2eproto[27]);
-}
-// ===================================================================
-
-class UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingGroup::_Internal {
- public:
-  using HasBits = decltype(std::declval<UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingGroup>()._impl_._has_bits_);
-  static constexpr ::int32_t kHasBitsOffset =
-    8 * PROTOBUF_FIELD_OFFSET(UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingGroup, _impl_._has_bits_);
-  static const ::io::deephaven::proto::backplane::grpc::UpdateByWindowScale& reverse_window_scale(const UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingGroup* msg);
-  static void set_has_reverse_window_scale(HasBits* has_bits) {
-    (*has_bits)[0] |= 1u;
-  }
-  static const ::io::deephaven::proto::backplane::grpc::UpdateByWindowScale& forward_window_scale(const UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingGroup* msg);
-  static void set_has_forward_window_scale(HasBits* has_bits) {
-    (*has_bits)[0] |= 2u;
-  }
-};
-
-const ::io::deephaven::proto::backplane::grpc::UpdateByWindowScale& UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingGroup::_Internal::reverse_window_scale(const UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingGroup* msg) {
-  return *msg->_impl_.reverse_window_scale_;
-}
-const ::io::deephaven::proto::backplane::grpc::UpdateByWindowScale& UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingGroup::_Internal::forward_window_scale(const UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingGroup* msg) {
-  return *msg->_impl_.forward_window_scale_;
-}
-UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingGroup::UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingGroup(::google::protobuf::Arena* arena)
-    : ::google::protobuf::Message(arena) {
-  SharedCtor(arena);
-  // @@protoc_insertion_point(arena_constructor:io.deephaven.proto.backplane.grpc.UpdateByRequest.UpdateByOperation.UpdateByColumn.UpdateBySpec.UpdateByRollingGroup)
-}
-inline PROTOBUF_NDEBUG_INLINE UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingGroup::Impl_::Impl_(
-    ::google::protobuf::internal::InternalVisibility visibility, ::google::protobuf::Arena* arena,
-    const Impl_& from)
-      : _has_bits_{from._has_bits_},
-        _cached_size_{0} {}
-
-UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingGroup::UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingGroup(
-    ::google::protobuf::Arena* arena,
-    const UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingGroup& from)
-    : ::google::protobuf::Message(arena) {
-  UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingGroup* const _this = this;
-  (void)_this;
-  _internal_metadata_.MergeFrom<::google::protobuf::UnknownFieldSet>(
-      from._internal_metadata_);
-  new (&_impl_) Impl_(internal_visibility(), arena, from._impl_);
-  ::uint32_t cached_has_bits = _impl_._has_bits_[0];
-  _impl_.reverse_window_scale_ = (cached_has_bits & 0x00000001u)
-                ? CreateMaybeMessage<::io::deephaven::proto::backplane::grpc::UpdateByWindowScale>(arena, *from._impl_.reverse_window_scale_)
-                : nullptr;
-  _impl_.forward_window_scale_ = (cached_has_bits & 0x00000002u)
-                ? CreateMaybeMessage<::io::deephaven::proto::backplane::grpc::UpdateByWindowScale>(arena, *from._impl_.forward_window_scale_)
-                : nullptr;
-
-  // @@protoc_insertion_point(copy_constructor:io.deephaven.proto.backplane.grpc.UpdateByRequest.UpdateByOperation.UpdateByColumn.UpdateBySpec.UpdateByRollingGroup)
-}
-inline PROTOBUF_NDEBUG_INLINE UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingGroup::Impl_::Impl_(
-    ::google::protobuf::internal::InternalVisibility visibility,
-    ::google::protobuf::Arena* arena)
-      : _cached_size_{0} {}
-
-inline void UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingGroup::SharedCtor(::_pb::Arena* arena) {
-  new (&_impl_) Impl_(internal_visibility(), arena);
-  ::memset(reinterpret_cast<char *>(&_impl_) +
-               offsetof(Impl_, reverse_window_scale_),
-           0,
-           offsetof(Impl_, forward_window_scale_) -
-               offsetof(Impl_, reverse_window_scale_) +
-               sizeof(Impl_::forward_window_scale_));
-}
-UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingGroup::~UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingGroup() {
-  // @@protoc_insertion_point(destructor:io.deephaven.proto.backplane.grpc.UpdateByRequest.UpdateByOperation.UpdateByColumn.UpdateBySpec.UpdateByRollingGroup)
-  _internal_metadata_.Delete<::google::protobuf::UnknownFieldSet>();
-  SharedDtor();
-}
-inline void UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingGroup::SharedDtor() {
-  ABSL_DCHECK(GetArena() == nullptr);
-  delete _impl_.reverse_window_scale_;
-  delete _impl_.forward_window_scale_;
-  _impl_.~Impl_();
-}
-
-PROTOBUF_NOINLINE void UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingGroup::Clear() {
-// @@protoc_insertion_point(message_clear_start:io.deephaven.proto.backplane.grpc.UpdateByRequest.UpdateByOperation.UpdateByColumn.UpdateBySpec.UpdateByRollingGroup)
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  ::uint32_t cached_has_bits = 0;
-  // Prevent compiler warnings about cached_has_bits being unused
-  (void) cached_has_bits;
-
-  cached_has_bits = _impl_._has_bits_[0];
-  if (cached_has_bits & 0x00000003u) {
-    if (cached_has_bits & 0x00000001u) {
-      ABSL_DCHECK(_impl_.reverse_window_scale_ != nullptr);
-      _impl_.reverse_window_scale_->Clear();
-    }
-    if (cached_has_bits & 0x00000002u) {
-      ABSL_DCHECK(_impl_.forward_window_scale_ != nullptr);
-      _impl_.forward_window_scale_->Clear();
-    }
-  }
-  _impl_._has_bits_.Clear();
-  _internal_metadata_.Clear<::google::protobuf::UnknownFieldSet>();
-}
-
-const char* UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingGroup::_InternalParse(
-    const char* ptr, ::_pbi::ParseContext* ctx) {
-  ptr = ::_pbi::TcParser::ParseLoop(this, ptr, ctx, &_table_.header);
-  return ptr;
-}
-
-
-PROTOBUF_CONSTINIT PROTOBUF_ATTRIBUTE_INIT_PRIORITY1
-const ::_pbi::TcParseTable<1, 2, 2, 0, 2> UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingGroup::_table_ = {
-  {
-    PROTOBUF_FIELD_OFFSET(UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingGroup, _impl_._has_bits_),
-    0, // no _extensions_
-    2, 8,  // max_field_number, fast_idx_mask
-    offsetof(decltype(_table_), field_lookup_table),
-    4294967292,  // skipmap
-    offsetof(decltype(_table_), field_entries),
-    2,  // num_field_entries
-    2,  // num_aux_entries
-    offsetof(decltype(_table_), aux_entries),
-    &_UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingGroup_default_instance_._instance,
-    ::_pbi::TcParser::GenericFallback,  // fallback
-  }, {{
-    // .io.deephaven.proto.backplane.grpc.UpdateByWindowScale forward_window_scale = 2;
-    {::_pbi::TcParser::FastMtS1,
-     {18, 1, 1, PROTOBUF_FIELD_OFFSET(UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingGroup, _impl_.forward_window_scale_)}},
-    // .io.deephaven.proto.backplane.grpc.UpdateByWindowScale reverse_window_scale = 1;
-    {::_pbi::TcParser::FastMtS1,
-     {10, 0, 0, PROTOBUF_FIELD_OFFSET(UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingGroup, _impl_.reverse_window_scale_)}},
-  }}, {{
-    65535, 65535
-  }}, {{
-    // .io.deephaven.proto.backplane.grpc.UpdateByWindowScale reverse_window_scale = 1;
-    {PROTOBUF_FIELD_OFFSET(UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingGroup, _impl_.reverse_window_scale_), _Internal::kHasBitsOffset + 0, 0,
-    (0 | ::_fl::kFcOptional | ::_fl::kMessage | ::_fl::kTvTable)},
-    // .io.deephaven.proto.backplane.grpc.UpdateByWindowScale forward_window_scale = 2;
-    {PROTOBUF_FIELD_OFFSET(UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingGroup, _impl_.forward_window_scale_), _Internal::kHasBitsOffset + 1, 1,
-    (0 | ::_fl::kFcOptional | ::_fl::kMessage | ::_fl::kTvTable)},
-  }}, {{
-    {::_pbi::TcParser::GetTable<::io::deephaven::proto::backplane::grpc::UpdateByWindowScale>()},
-    {::_pbi::TcParser::GetTable<::io::deephaven::proto::backplane::grpc::UpdateByWindowScale>()},
-  }}, {{
-  }},
-};
-
-::uint8_t* UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingGroup::_InternalSerialize(
-    ::uint8_t* target,
-    ::google::protobuf::io::EpsCopyOutputStream* stream) const {
-  // @@protoc_insertion_point(serialize_to_array_start:io.deephaven.proto.backplane.grpc.UpdateByRequest.UpdateByOperation.UpdateByColumn.UpdateBySpec.UpdateByRollingGroup)
-  ::uint32_t cached_has_bits = 0;
-  (void)cached_has_bits;
-
-  cached_has_bits = _impl_._has_bits_[0];
-  // .io.deephaven.proto.backplane.grpc.UpdateByWindowScale reverse_window_scale = 1;
-  if (cached_has_bits & 0x00000001u) {
-    target = ::google::protobuf::internal::WireFormatLite::InternalWriteMessage(
-        1, _Internal::reverse_window_scale(this),
-        _Internal::reverse_window_scale(this).GetCachedSize(), target, stream);
-  }
-
-  // .io.deephaven.proto.backplane.grpc.UpdateByWindowScale forward_window_scale = 2;
-  if (cached_has_bits & 0x00000002u) {
-    target = ::google::protobuf::internal::WireFormatLite::InternalWriteMessage(
-        2, _Internal::forward_window_scale(this),
-        _Internal::forward_window_scale(this).GetCachedSize(), target, stream);
-  }
-
-  if (PROTOBUF_PREDICT_FALSE(_internal_metadata_.have_unknown_fields())) {
-    target =
-        ::_pbi::WireFormat::InternalSerializeUnknownFieldsToArray(
-            _internal_metadata_.unknown_fields<::google::protobuf::UnknownFieldSet>(::google::protobuf::UnknownFieldSet::default_instance), target, stream);
-  }
-  // @@protoc_insertion_point(serialize_to_array_end:io.deephaven.proto.backplane.grpc.UpdateByRequest.UpdateByOperation.UpdateByColumn.UpdateBySpec.UpdateByRollingGroup)
-  return target;
-}
-
-::size_t UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingGroup::ByteSizeLong() const {
-// @@protoc_insertion_point(message_byte_size_start:io.deephaven.proto.backplane.grpc.UpdateByRequest.UpdateByOperation.UpdateByColumn.UpdateBySpec.UpdateByRollingGroup)
-  ::size_t total_size = 0;
-
-  ::uint32_t cached_has_bits = 0;
-  // Prevent compiler warnings about cached_has_bits being unused
-  (void) cached_has_bits;
-
-  cached_has_bits = _impl_._has_bits_[0];
-  if (cached_has_bits & 0x00000003u) {
-    // .io.deephaven.proto.backplane.grpc.UpdateByWindowScale reverse_window_scale = 1;
-    if (cached_has_bits & 0x00000001u) {
-      total_size +=
-          1 + ::google::protobuf::internal::WireFormatLite::MessageSize(*_impl_.reverse_window_scale_);
-    }
-
-    // .io.deephaven.proto.backplane.grpc.UpdateByWindowScale forward_window_scale = 2;
-    if (cached_has_bits & 0x00000002u) {
-      total_size +=
-          1 + ::google::protobuf::internal::WireFormatLite::MessageSize(*_impl_.forward_window_scale_);
-    }
-
-  }
-  return MaybeComputeUnknownFieldsSize(total_size, &_impl_._cached_size_);
-}
-
-const ::google::protobuf::Message::ClassData UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingGroup::_class_data_ = {
-    UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingGroup::MergeImpl,
-    nullptr,  // OnDemandRegisterArenaDtor
-};
-const ::google::protobuf::Message::ClassData* UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingGroup::GetClassData() const {
-  return &_class_data_;
-}
-
-void UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingGroup::MergeImpl(::google::protobuf::Message& to_msg, const ::google::protobuf::Message& from_msg) {
-  auto* const _this = static_cast<UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingGroup*>(&to_msg);
-  auto& from = static_cast<const UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingGroup&>(from_msg);
-  // @@protoc_insertion_point(class_specific_merge_from_start:io.deephaven.proto.backplane.grpc.UpdateByRequest.UpdateByOperation.UpdateByColumn.UpdateBySpec.UpdateByRollingGroup)
-  ABSL_DCHECK_NE(&from, _this);
-  ::uint32_t cached_has_bits = 0;
-  (void) cached_has_bits;
-
-  cached_has_bits = from._impl_._has_bits_[0];
-  if (cached_has_bits & 0x00000003u) {
-    if (cached_has_bits & 0x00000001u) {
-      _this->_internal_mutable_reverse_window_scale()->::io::deephaven::proto::backplane::grpc::UpdateByWindowScale::MergeFrom(
-          from._internal_reverse_window_scale());
-    }
-    if (cached_has_bits & 0x00000002u) {
-      _this->_internal_mutable_forward_window_scale()->::io::deephaven::proto::backplane::grpc::UpdateByWindowScale::MergeFrom(
-          from._internal_forward_window_scale());
-    }
-  }
-  _this->_internal_metadata_.MergeFrom<::google::protobuf::UnknownFieldSet>(from._internal_metadata_);
-}
-
-void UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingGroup::CopyFrom(const UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingGroup& from) {
-// @@protoc_insertion_point(class_specific_copy_from_start:io.deephaven.proto.backplane.grpc.UpdateByRequest.UpdateByOperation.UpdateByColumn.UpdateBySpec.UpdateByRollingGroup)
-  if (&from == this) return;
-  Clear();
-  MergeFrom(from);
-}
-
-PROTOBUF_NOINLINE bool UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingGroup::IsInitialized() const {
-  return true;
-}
-
-::_pbi::CachedSize* UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingGroup::AccessCachedSize() const {
-  return &_impl_._cached_size_;
-}
-void UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingGroup::InternalSwap(UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingGroup* PROTOBUF_RESTRICT other) {
-  using std::swap;
-  _internal_metadata_.InternalSwap(&other->_internal_metadata_);
-  swap(_impl_._has_bits_[0], other->_impl_._has_bits_[0]);
-  ::google::protobuf::internal::memswap<
-      PROTOBUF_FIELD_OFFSET(UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingGroup, _impl_.forward_window_scale_)
-      + sizeof(UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingGroup::_impl_.forward_window_scale_)
-      - PROTOBUF_FIELD_OFFSET(UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingGroup, _impl_.reverse_window_scale_)>(
-          reinterpret_cast<char*>(&_impl_.reverse_window_scale_),
-          reinterpret_cast<char*>(&other->_impl_.reverse_window_scale_));
-}
-
-::google::protobuf::Metadata UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingGroup::GetMetadata() const {
-  return ::_pbi::AssignDescriptors(
-      &descriptor_table_deephaven_2fproto_2ftable_2eproto_getter, &descriptor_table_deephaven_2fproto_2ftable_2eproto_once,
-      file_level_metadata_deephaven_2fproto_2ftable_2eproto[28]);
-}
-// ===================================================================
-
-class UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingAvg::_Internal {
- public:
-  using HasBits = decltype(std::declval<UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingAvg>()._impl_._has_bits_);
-  static constexpr ::int32_t kHasBitsOffset =
-    8 * PROTOBUF_FIELD_OFFSET(UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingAvg, _impl_._has_bits_);
-  static const ::io::deephaven::proto::backplane::grpc::UpdateByWindowScale& reverse_window_scale(const UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingAvg* msg);
-  static void set_has_reverse_window_scale(HasBits* has_bits) {
-    (*has_bits)[0] |= 1u;
-  }
-  static const ::io::deephaven::proto::backplane::grpc::UpdateByWindowScale& forward_window_scale(const UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingAvg* msg);
-  static void set_has_forward_window_scale(HasBits* has_bits) {
-    (*has_bits)[0] |= 2u;
-  }
-};
-
-const ::io::deephaven::proto::backplane::grpc::UpdateByWindowScale& UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingAvg::_Internal::reverse_window_scale(const UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingAvg* msg) {
-  return *msg->_impl_.reverse_window_scale_;
-}
-const ::io::deephaven::proto::backplane::grpc::UpdateByWindowScale& UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingAvg::_Internal::forward_window_scale(const UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingAvg* msg) {
-  return *msg->_impl_.forward_window_scale_;
-}
-UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingAvg::UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingAvg(::google::protobuf::Arena* arena)
-    : ::google::protobuf::Message(arena) {
-  SharedCtor(arena);
-  // @@protoc_insertion_point(arena_constructor:io.deephaven.proto.backplane.grpc.UpdateByRequest.UpdateByOperation.UpdateByColumn.UpdateBySpec.UpdateByRollingAvg)
-}
-inline PROTOBUF_NDEBUG_INLINE UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingAvg::Impl_::Impl_(
-    ::google::protobuf::internal::InternalVisibility visibility, ::google::protobuf::Arena* arena,
-    const Impl_& from)
-      : _has_bits_{from._has_bits_},
-        _cached_size_{0} {}
-
-UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingAvg::UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingAvg(
-    ::google::protobuf::Arena* arena,
-    const UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingAvg& from)
-    : ::google::protobuf::Message(arena) {
-  UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingAvg* const _this = this;
-  (void)_this;
-  _internal_metadata_.MergeFrom<::google::protobuf::UnknownFieldSet>(
-      from._internal_metadata_);
-  new (&_impl_) Impl_(internal_visibility(), arena, from._impl_);
-  ::uint32_t cached_has_bits = _impl_._has_bits_[0];
-  _impl_.reverse_window_scale_ = (cached_has_bits & 0x00000001u)
-                ? CreateMaybeMessage<::io::deephaven::proto::backplane::grpc::UpdateByWindowScale>(arena, *from._impl_.reverse_window_scale_)
-                : nullptr;
-  _impl_.forward_window_scale_ = (cached_has_bits & 0x00000002u)
-                ? CreateMaybeMessage<::io::deephaven::proto::backplane::grpc::UpdateByWindowScale>(arena, *from._impl_.forward_window_scale_)
-                : nullptr;
-
-  // @@protoc_insertion_point(copy_constructor:io.deephaven.proto.backplane.grpc.UpdateByRequest.UpdateByOperation.UpdateByColumn.UpdateBySpec.UpdateByRollingAvg)
-}
-inline PROTOBUF_NDEBUG_INLINE UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingAvg::Impl_::Impl_(
-    ::google::protobuf::internal::InternalVisibility visibility,
-    ::google::protobuf::Arena* arena)
-      : _cached_size_{0} {}
-
-inline void UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingAvg::SharedCtor(::_pb::Arena* arena) {
-  new (&_impl_) Impl_(internal_visibility(), arena);
-  ::memset(reinterpret_cast<char *>(&_impl_) +
-               offsetof(Impl_, reverse_window_scale_),
-           0,
-           offsetof(Impl_, forward_window_scale_) -
-               offsetof(Impl_, reverse_window_scale_) +
-               sizeof(Impl_::forward_window_scale_));
-}
-UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingAvg::~UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingAvg() {
-  // @@protoc_insertion_point(destructor:io.deephaven.proto.backplane.grpc.UpdateByRequest.UpdateByOperation.UpdateByColumn.UpdateBySpec.UpdateByRollingAvg)
-  _internal_metadata_.Delete<::google::protobuf::UnknownFieldSet>();
-  SharedDtor();
-}
-inline void UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingAvg::SharedDtor() {
-  ABSL_DCHECK(GetArena() == nullptr);
-  delete _impl_.reverse_window_scale_;
-  delete _impl_.forward_window_scale_;
-  _impl_.~Impl_();
-}
-
-PROTOBUF_NOINLINE void UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingAvg::Clear() {
-// @@protoc_insertion_point(message_clear_start:io.deephaven.proto.backplane.grpc.UpdateByRequest.UpdateByOperation.UpdateByColumn.UpdateBySpec.UpdateByRollingAvg)
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  ::uint32_t cached_has_bits = 0;
-  // Prevent compiler warnings about cached_has_bits being unused
-  (void) cached_has_bits;
-
-  cached_has_bits = _impl_._has_bits_[0];
-  if (cached_has_bits & 0x00000003u) {
-    if (cached_has_bits & 0x00000001u) {
-      ABSL_DCHECK(_impl_.reverse_window_scale_ != nullptr);
-      _impl_.reverse_window_scale_->Clear();
-    }
-    if (cached_has_bits & 0x00000002u) {
-      ABSL_DCHECK(_impl_.forward_window_scale_ != nullptr);
-      _impl_.forward_window_scale_->Clear();
-    }
-  }
-  _impl_._has_bits_.Clear();
-  _internal_metadata_.Clear<::google::protobuf::UnknownFieldSet>();
-}
-
-const char* UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingAvg::_InternalParse(
-    const char* ptr, ::_pbi::ParseContext* ctx) {
-  ptr = ::_pbi::TcParser::ParseLoop(this, ptr, ctx, &_table_.header);
-  return ptr;
-}
-
-
-PROTOBUF_CONSTINIT PROTOBUF_ATTRIBUTE_INIT_PRIORITY1
-const ::_pbi::TcParseTable<1, 2, 2, 0, 2> UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingAvg::_table_ = {
-  {
-    PROTOBUF_FIELD_OFFSET(UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingAvg, _impl_._has_bits_),
-    0, // no _extensions_
-    2, 8,  // max_field_number, fast_idx_mask
-    offsetof(decltype(_table_), field_lookup_table),
-    4294967292,  // skipmap
-    offsetof(decltype(_table_), field_entries),
-    2,  // num_field_entries
-    2,  // num_aux_entries
-    offsetof(decltype(_table_), aux_entries),
-    &_UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingAvg_default_instance_._instance,
-    ::_pbi::TcParser::GenericFallback,  // fallback
-  }, {{
-    // .io.deephaven.proto.backplane.grpc.UpdateByWindowScale forward_window_scale = 2;
-    {::_pbi::TcParser::FastMtS1,
-     {18, 1, 1, PROTOBUF_FIELD_OFFSET(UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingAvg, _impl_.forward_window_scale_)}},
-    // .io.deephaven.proto.backplane.grpc.UpdateByWindowScale reverse_window_scale = 1;
-    {::_pbi::TcParser::FastMtS1,
-     {10, 0, 0, PROTOBUF_FIELD_OFFSET(UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingAvg, _impl_.reverse_window_scale_)}},
-  }}, {{
-    65535, 65535
-  }}, {{
-    // .io.deephaven.proto.backplane.grpc.UpdateByWindowScale reverse_window_scale = 1;
-    {PROTOBUF_FIELD_OFFSET(UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingAvg, _impl_.reverse_window_scale_), _Internal::kHasBitsOffset + 0, 0,
-    (0 | ::_fl::kFcOptional | ::_fl::kMessage | ::_fl::kTvTable)},
-    // .io.deephaven.proto.backplane.grpc.UpdateByWindowScale forward_window_scale = 2;
-    {PROTOBUF_FIELD_OFFSET(UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingAvg, _impl_.forward_window_scale_), _Internal::kHasBitsOffset + 1, 1,
-    (0 | ::_fl::kFcOptional | ::_fl::kMessage | ::_fl::kTvTable)},
-  }}, {{
-    {::_pbi::TcParser::GetTable<::io::deephaven::proto::backplane::grpc::UpdateByWindowScale>()},
-    {::_pbi::TcParser::GetTable<::io::deephaven::proto::backplane::grpc::UpdateByWindowScale>()},
-  }}, {{
-  }},
-};
-
-::uint8_t* UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingAvg::_InternalSerialize(
-    ::uint8_t* target,
-    ::google::protobuf::io::EpsCopyOutputStream* stream) const {
-  // @@protoc_insertion_point(serialize_to_array_start:io.deephaven.proto.backplane.grpc.UpdateByRequest.UpdateByOperation.UpdateByColumn.UpdateBySpec.UpdateByRollingAvg)
-  ::uint32_t cached_has_bits = 0;
-  (void)cached_has_bits;
-
-  cached_has_bits = _impl_._has_bits_[0];
-  // .io.deephaven.proto.backplane.grpc.UpdateByWindowScale reverse_window_scale = 1;
-  if (cached_has_bits & 0x00000001u) {
-    target = ::google::protobuf::internal::WireFormatLite::InternalWriteMessage(
-        1, _Internal::reverse_window_scale(this),
-        _Internal::reverse_window_scale(this).GetCachedSize(), target, stream);
-  }
-
-  // .io.deephaven.proto.backplane.grpc.UpdateByWindowScale forward_window_scale = 2;
-  if (cached_has_bits & 0x00000002u) {
-    target = ::google::protobuf::internal::WireFormatLite::InternalWriteMessage(
-        2, _Internal::forward_window_scale(this),
-        _Internal::forward_window_scale(this).GetCachedSize(), target, stream);
-  }
-
-  if (PROTOBUF_PREDICT_FALSE(_internal_metadata_.have_unknown_fields())) {
-    target =
-        ::_pbi::WireFormat::InternalSerializeUnknownFieldsToArray(
-            _internal_metadata_.unknown_fields<::google::protobuf::UnknownFieldSet>(::google::protobuf::UnknownFieldSet::default_instance), target, stream);
-  }
-  // @@protoc_insertion_point(serialize_to_array_end:io.deephaven.proto.backplane.grpc.UpdateByRequest.UpdateByOperation.UpdateByColumn.UpdateBySpec.UpdateByRollingAvg)
-  return target;
-}
-
-::size_t UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingAvg::ByteSizeLong() const {
-// @@protoc_insertion_point(message_byte_size_start:io.deephaven.proto.backplane.grpc.UpdateByRequest.UpdateByOperation.UpdateByColumn.UpdateBySpec.UpdateByRollingAvg)
-  ::size_t total_size = 0;
-
-  ::uint32_t cached_has_bits = 0;
-  // Prevent compiler warnings about cached_has_bits being unused
-  (void) cached_has_bits;
-
-  cached_has_bits = _impl_._has_bits_[0];
-  if (cached_has_bits & 0x00000003u) {
-    // .io.deephaven.proto.backplane.grpc.UpdateByWindowScale reverse_window_scale = 1;
-    if (cached_has_bits & 0x00000001u) {
-      total_size +=
-          1 + ::google::protobuf::internal::WireFormatLite::MessageSize(*_impl_.reverse_window_scale_);
-    }
-
-    // .io.deephaven.proto.backplane.grpc.UpdateByWindowScale forward_window_scale = 2;
-    if (cached_has_bits & 0x00000002u) {
-      total_size +=
-          1 + ::google::protobuf::internal::WireFormatLite::MessageSize(*_impl_.forward_window_scale_);
-    }
-
-  }
-  return MaybeComputeUnknownFieldsSize(total_size, &_impl_._cached_size_);
-}
-
-const ::google::protobuf::Message::ClassData UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingAvg::_class_data_ = {
-    UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingAvg::MergeImpl,
-    nullptr,  // OnDemandRegisterArenaDtor
-};
-const ::google::protobuf::Message::ClassData* UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingAvg::GetClassData() const {
-  return &_class_data_;
-}
-
-void UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingAvg::MergeImpl(::google::protobuf::Message& to_msg, const ::google::protobuf::Message& from_msg) {
-  auto* const _this = static_cast<UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingAvg*>(&to_msg);
-  auto& from = static_cast<const UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingAvg&>(from_msg);
-  // @@protoc_insertion_point(class_specific_merge_from_start:io.deephaven.proto.backplane.grpc.UpdateByRequest.UpdateByOperation.UpdateByColumn.UpdateBySpec.UpdateByRollingAvg)
-  ABSL_DCHECK_NE(&from, _this);
-  ::uint32_t cached_has_bits = 0;
-  (void) cached_has_bits;
-
-  cached_has_bits = from._impl_._has_bits_[0];
-  if (cached_has_bits & 0x00000003u) {
-    if (cached_has_bits & 0x00000001u) {
-      _this->_internal_mutable_reverse_window_scale()->::io::deephaven::proto::backplane::grpc::UpdateByWindowScale::MergeFrom(
-          from._internal_reverse_window_scale());
-    }
-    if (cached_has_bits & 0x00000002u) {
-      _this->_internal_mutable_forward_window_scale()->::io::deephaven::proto::backplane::grpc::UpdateByWindowScale::MergeFrom(
-          from._internal_forward_window_scale());
-    }
-  }
-  _this->_internal_metadata_.MergeFrom<::google::protobuf::UnknownFieldSet>(from._internal_metadata_);
-}
-
-void UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingAvg::CopyFrom(const UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingAvg& from) {
-// @@protoc_insertion_point(class_specific_copy_from_start:io.deephaven.proto.backplane.grpc.UpdateByRequest.UpdateByOperation.UpdateByColumn.UpdateBySpec.UpdateByRollingAvg)
-  if (&from == this) return;
-  Clear();
-  MergeFrom(from);
-}
-
-PROTOBUF_NOINLINE bool UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingAvg::IsInitialized() const {
-  return true;
-}
-
-::_pbi::CachedSize* UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingAvg::AccessCachedSize() const {
-  return &_impl_._cached_size_;
-}
-void UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingAvg::InternalSwap(UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingAvg* PROTOBUF_RESTRICT other) {
-  using std::swap;
-  _internal_metadata_.InternalSwap(&other->_internal_metadata_);
-  swap(_impl_._has_bits_[0], other->_impl_._has_bits_[0]);
-  ::google::protobuf::internal::memswap<
-      PROTOBUF_FIELD_OFFSET(UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingAvg, _impl_.forward_window_scale_)
-      + sizeof(UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingAvg::_impl_.forward_window_scale_)
-      - PROTOBUF_FIELD_OFFSET(UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingAvg, _impl_.reverse_window_scale_)>(
-          reinterpret_cast<char*>(&_impl_.reverse_window_scale_),
-          reinterpret_cast<char*>(&other->_impl_.reverse_window_scale_));
-}
-
-::google::protobuf::Metadata UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingAvg::GetMetadata() const {
-  return ::_pbi::AssignDescriptors(
-      &descriptor_table_deephaven_2fproto_2ftable_2eproto_getter, &descriptor_table_deephaven_2fproto_2ftable_2eproto_once,
-      file_level_metadata_deephaven_2fproto_2ftable_2eproto[29]);
-}
-// ===================================================================
-
-class UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingMin::_Internal {
- public:
-  using HasBits = decltype(std::declval<UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingMin>()._impl_._has_bits_);
-  static constexpr ::int32_t kHasBitsOffset =
-    8 * PROTOBUF_FIELD_OFFSET(UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingMin, _impl_._has_bits_);
-  static const ::io::deephaven::proto::backplane::grpc::UpdateByWindowScale& reverse_window_scale(const UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingMin* msg);
-  static void set_has_reverse_window_scale(HasBits* has_bits) {
-    (*has_bits)[0] |= 1u;
-  }
-  static const ::io::deephaven::proto::backplane::grpc::UpdateByWindowScale& forward_window_scale(const UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingMin* msg);
-  static void set_has_forward_window_scale(HasBits* has_bits) {
-    (*has_bits)[0] |= 2u;
-  }
-};
-
-const ::io::deephaven::proto::backplane::grpc::UpdateByWindowScale& UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingMin::_Internal::reverse_window_scale(const UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingMin* msg) {
-  return *msg->_impl_.reverse_window_scale_;
-}
-const ::io::deephaven::proto::backplane::grpc::UpdateByWindowScale& UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingMin::_Internal::forward_window_scale(const UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingMin* msg) {
-  return *msg->_impl_.forward_window_scale_;
-}
-UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingMin::UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingMin(::google::protobuf::Arena* arena)
-    : ::google::protobuf::Message(arena) {
-  SharedCtor(arena);
-  // @@protoc_insertion_point(arena_constructor:io.deephaven.proto.backplane.grpc.UpdateByRequest.UpdateByOperation.UpdateByColumn.UpdateBySpec.UpdateByRollingMin)
-}
-inline PROTOBUF_NDEBUG_INLINE UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingMin::Impl_::Impl_(
-    ::google::protobuf::internal::InternalVisibility visibility, ::google::protobuf::Arena* arena,
-    const Impl_& from)
-      : _has_bits_{from._has_bits_},
-        _cached_size_{0} {}
-
-UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingMin::UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingMin(
-    ::google::protobuf::Arena* arena,
-    const UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingMin& from)
-    : ::google::protobuf::Message(arena) {
-  UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingMin* const _this = this;
-  (void)_this;
-  _internal_metadata_.MergeFrom<::google::protobuf::UnknownFieldSet>(
-      from._internal_metadata_);
-  new (&_impl_) Impl_(internal_visibility(), arena, from._impl_);
-  ::uint32_t cached_has_bits = _impl_._has_bits_[0];
-  _impl_.reverse_window_scale_ = (cached_has_bits & 0x00000001u)
-                ? CreateMaybeMessage<::io::deephaven::proto::backplane::grpc::UpdateByWindowScale>(arena, *from._impl_.reverse_window_scale_)
-                : nullptr;
-  _impl_.forward_window_scale_ = (cached_has_bits & 0x00000002u)
-                ? CreateMaybeMessage<::io::deephaven::proto::backplane::grpc::UpdateByWindowScale>(arena, *from._impl_.forward_window_scale_)
-                : nullptr;
-
-  // @@protoc_insertion_point(copy_constructor:io.deephaven.proto.backplane.grpc.UpdateByRequest.UpdateByOperation.UpdateByColumn.UpdateBySpec.UpdateByRollingMin)
-}
-inline PROTOBUF_NDEBUG_INLINE UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingMin::Impl_::Impl_(
-    ::google::protobuf::internal::InternalVisibility visibility,
-    ::google::protobuf::Arena* arena)
-      : _cached_size_{0} {}
-
-inline void UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingMin::SharedCtor(::_pb::Arena* arena) {
-  new (&_impl_) Impl_(internal_visibility(), arena);
-  ::memset(reinterpret_cast<char *>(&_impl_) +
-               offsetof(Impl_, reverse_window_scale_),
-           0,
-           offsetof(Impl_, forward_window_scale_) -
-               offsetof(Impl_, reverse_window_scale_) +
-               sizeof(Impl_::forward_window_scale_));
-}
-UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingMin::~UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingMin() {
-  // @@protoc_insertion_point(destructor:io.deephaven.proto.backplane.grpc.UpdateByRequest.UpdateByOperation.UpdateByColumn.UpdateBySpec.UpdateByRollingMin)
-  _internal_metadata_.Delete<::google::protobuf::UnknownFieldSet>();
-  SharedDtor();
-}
-inline void UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingMin::SharedDtor() {
-  ABSL_DCHECK(GetArena() == nullptr);
-  delete _impl_.reverse_window_scale_;
-  delete _impl_.forward_window_scale_;
-  _impl_.~Impl_();
-}
-
-PROTOBUF_NOINLINE void UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingMin::Clear() {
-// @@protoc_insertion_point(message_clear_start:io.deephaven.proto.backplane.grpc.UpdateByRequest.UpdateByOperation.UpdateByColumn.UpdateBySpec.UpdateByRollingMin)
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  ::uint32_t cached_has_bits = 0;
-  // Prevent compiler warnings about cached_has_bits being unused
-  (void) cached_has_bits;
-
-  cached_has_bits = _impl_._has_bits_[0];
-  if (cached_has_bits & 0x00000003u) {
-    if (cached_has_bits & 0x00000001u) {
-      ABSL_DCHECK(_impl_.reverse_window_scale_ != nullptr);
-      _impl_.reverse_window_scale_->Clear();
-    }
-    if (cached_has_bits & 0x00000002u) {
-      ABSL_DCHECK(_impl_.forward_window_scale_ != nullptr);
-      _impl_.forward_window_scale_->Clear();
-    }
-  }
-  _impl_._has_bits_.Clear();
-  _internal_metadata_.Clear<::google::protobuf::UnknownFieldSet>();
-}
-
-const char* UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingMin::_InternalParse(
-    const char* ptr, ::_pbi::ParseContext* ctx) {
-  ptr = ::_pbi::TcParser::ParseLoop(this, ptr, ctx, &_table_.header);
-  return ptr;
-}
-
-
-PROTOBUF_CONSTINIT PROTOBUF_ATTRIBUTE_INIT_PRIORITY1
-const ::_pbi::TcParseTable<1, 2, 2, 0, 2> UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingMin::_table_ = {
-  {
-    PROTOBUF_FIELD_OFFSET(UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingMin, _impl_._has_bits_),
-    0, // no _extensions_
-    2, 8,  // max_field_number, fast_idx_mask
-    offsetof(decltype(_table_), field_lookup_table),
-    4294967292,  // skipmap
-    offsetof(decltype(_table_), field_entries),
-    2,  // num_field_entries
-    2,  // num_aux_entries
-    offsetof(decltype(_table_), aux_entries),
-    &_UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingMin_default_instance_._instance,
-    ::_pbi::TcParser::GenericFallback,  // fallback
-  }, {{
-    // .io.deephaven.proto.backplane.grpc.UpdateByWindowScale forward_window_scale = 2;
-    {::_pbi::TcParser::FastMtS1,
-     {18, 1, 1, PROTOBUF_FIELD_OFFSET(UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingMin, _impl_.forward_window_scale_)}},
-    // .io.deephaven.proto.backplane.grpc.UpdateByWindowScale reverse_window_scale = 1;
-    {::_pbi::TcParser::FastMtS1,
-     {10, 0, 0, PROTOBUF_FIELD_OFFSET(UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingMin, _impl_.reverse_window_scale_)}},
-  }}, {{
-    65535, 65535
-  }}, {{
-    // .io.deephaven.proto.backplane.grpc.UpdateByWindowScale reverse_window_scale = 1;
-    {PROTOBUF_FIELD_OFFSET(UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingMin, _impl_.reverse_window_scale_), _Internal::kHasBitsOffset + 0, 0,
-    (0 | ::_fl::kFcOptional | ::_fl::kMessage | ::_fl::kTvTable)},
-    // .io.deephaven.proto.backplane.grpc.UpdateByWindowScale forward_window_scale = 2;
-    {PROTOBUF_FIELD_OFFSET(UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingMin, _impl_.forward_window_scale_), _Internal::kHasBitsOffset + 1, 1,
-    (0 | ::_fl::kFcOptional | ::_fl::kMessage | ::_fl::kTvTable)},
-  }}, {{
-    {::_pbi::TcParser::GetTable<::io::deephaven::proto::backplane::grpc::UpdateByWindowScale>()},
-    {::_pbi::TcParser::GetTable<::io::deephaven::proto::backplane::grpc::UpdateByWindowScale>()},
-  }}, {{
-  }},
-};
-
-::uint8_t* UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingMin::_InternalSerialize(
-    ::uint8_t* target,
-    ::google::protobuf::io::EpsCopyOutputStream* stream) const {
-  // @@protoc_insertion_point(serialize_to_array_start:io.deephaven.proto.backplane.grpc.UpdateByRequest.UpdateByOperation.UpdateByColumn.UpdateBySpec.UpdateByRollingMin)
-  ::uint32_t cached_has_bits = 0;
-  (void)cached_has_bits;
-
-  cached_has_bits = _impl_._has_bits_[0];
-  // .io.deephaven.proto.backplane.grpc.UpdateByWindowScale reverse_window_scale = 1;
-  if (cached_has_bits & 0x00000001u) {
-    target = ::google::protobuf::internal::WireFormatLite::InternalWriteMessage(
-        1, _Internal::reverse_window_scale(this),
-        _Internal::reverse_window_scale(this).GetCachedSize(), target, stream);
-  }
-
-  // .io.deephaven.proto.backplane.grpc.UpdateByWindowScale forward_window_scale = 2;
-  if (cached_has_bits & 0x00000002u) {
-    target = ::google::protobuf::internal::WireFormatLite::InternalWriteMessage(
-        2, _Internal::forward_window_scale(this),
-        _Internal::forward_window_scale(this).GetCachedSize(), target, stream);
-  }
-
-  if (PROTOBUF_PREDICT_FALSE(_internal_metadata_.have_unknown_fields())) {
-    target =
-        ::_pbi::WireFormat::InternalSerializeUnknownFieldsToArray(
-            _internal_metadata_.unknown_fields<::google::protobuf::UnknownFieldSet>(::google::protobuf::UnknownFieldSet::default_instance), target, stream);
-  }
-  // @@protoc_insertion_point(serialize_to_array_end:io.deephaven.proto.backplane.grpc.UpdateByRequest.UpdateByOperation.UpdateByColumn.UpdateBySpec.UpdateByRollingMin)
-  return target;
-}
-
-::size_t UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingMin::ByteSizeLong() const {
-// @@protoc_insertion_point(message_byte_size_start:io.deephaven.proto.backplane.grpc.UpdateByRequest.UpdateByOperation.UpdateByColumn.UpdateBySpec.UpdateByRollingMin)
-  ::size_t total_size = 0;
-
-  ::uint32_t cached_has_bits = 0;
-  // Prevent compiler warnings about cached_has_bits being unused
-  (void) cached_has_bits;
-
-  cached_has_bits = _impl_._has_bits_[0];
-  if (cached_has_bits & 0x00000003u) {
-    // .io.deephaven.proto.backplane.grpc.UpdateByWindowScale reverse_window_scale = 1;
-    if (cached_has_bits & 0x00000001u) {
-      total_size +=
-          1 + ::google::protobuf::internal::WireFormatLite::MessageSize(*_impl_.reverse_window_scale_);
-    }
-
-    // .io.deephaven.proto.backplane.grpc.UpdateByWindowScale forward_window_scale = 2;
-    if (cached_has_bits & 0x00000002u) {
-      total_size +=
-          1 + ::google::protobuf::internal::WireFormatLite::MessageSize(*_impl_.forward_window_scale_);
-    }
-
-  }
-  return MaybeComputeUnknownFieldsSize(total_size, &_impl_._cached_size_);
-}
-
-const ::google::protobuf::Message::ClassData UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingMin::_class_data_ = {
-    UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingMin::MergeImpl,
-    nullptr,  // OnDemandRegisterArenaDtor
-};
-const ::google::protobuf::Message::ClassData* UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingMin::GetClassData() const {
-  return &_class_data_;
-}
-
-void UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingMin::MergeImpl(::google::protobuf::Message& to_msg, const ::google::protobuf::Message& from_msg) {
-  auto* const _this = static_cast<UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingMin*>(&to_msg);
-  auto& from = static_cast<const UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingMin&>(from_msg);
-  // @@protoc_insertion_point(class_specific_merge_from_start:io.deephaven.proto.backplane.grpc.UpdateByRequest.UpdateByOperation.UpdateByColumn.UpdateBySpec.UpdateByRollingMin)
-  ABSL_DCHECK_NE(&from, _this);
-  ::uint32_t cached_has_bits = 0;
-  (void) cached_has_bits;
-
-  cached_has_bits = from._impl_._has_bits_[0];
-  if (cached_has_bits & 0x00000003u) {
-    if (cached_has_bits & 0x00000001u) {
-      _this->_internal_mutable_reverse_window_scale()->::io::deephaven::proto::backplane::grpc::UpdateByWindowScale::MergeFrom(
-          from._internal_reverse_window_scale());
-    }
-    if (cached_has_bits & 0x00000002u) {
-      _this->_internal_mutable_forward_window_scale()->::io::deephaven::proto::backplane::grpc::UpdateByWindowScale::MergeFrom(
-          from._internal_forward_window_scale());
-    }
-  }
-  _this->_internal_metadata_.MergeFrom<::google::protobuf::UnknownFieldSet>(from._internal_metadata_);
-}
-
-void UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingMin::CopyFrom(const UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingMin& from) {
-// @@protoc_insertion_point(class_specific_copy_from_start:io.deephaven.proto.backplane.grpc.UpdateByRequest.UpdateByOperation.UpdateByColumn.UpdateBySpec.UpdateByRollingMin)
-  if (&from == this) return;
-  Clear();
-  MergeFrom(from);
-}
-
-PROTOBUF_NOINLINE bool UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingMin::IsInitialized() const {
-  return true;
-}
-
-::_pbi::CachedSize* UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingMin::AccessCachedSize() const {
-  return &_impl_._cached_size_;
-}
-void UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingMin::InternalSwap(UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingMin* PROTOBUF_RESTRICT other) {
-  using std::swap;
-  _internal_metadata_.InternalSwap(&other->_internal_metadata_);
-  swap(_impl_._has_bits_[0], other->_impl_._has_bits_[0]);
-  ::google::protobuf::internal::memswap<
-      PROTOBUF_FIELD_OFFSET(UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingMin, _impl_.forward_window_scale_)
-      + sizeof(UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingMin::_impl_.forward_window_scale_)
-      - PROTOBUF_FIELD_OFFSET(UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingMin, _impl_.reverse_window_scale_)>(
-          reinterpret_cast<char*>(&_impl_.reverse_window_scale_),
-          reinterpret_cast<char*>(&other->_impl_.reverse_window_scale_));
-}
-
-::google::protobuf::Metadata UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingMin::GetMetadata() const {
-  return ::_pbi::AssignDescriptors(
-      &descriptor_table_deephaven_2fproto_2ftable_2eproto_getter, &descriptor_table_deephaven_2fproto_2ftable_2eproto_once,
-      file_level_metadata_deephaven_2fproto_2ftable_2eproto[30]);
-}
-// ===================================================================
-
-class UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingMax::_Internal {
- public:
-  using HasBits = decltype(std::declval<UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingMax>()._impl_._has_bits_);
-  static constexpr ::int32_t kHasBitsOffset =
-    8 * PROTOBUF_FIELD_OFFSET(UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingMax, _impl_._has_bits_);
-  static const ::io::deephaven::proto::backplane::grpc::UpdateByWindowScale& reverse_window_scale(const UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingMax* msg);
-  static void set_has_reverse_window_scale(HasBits* has_bits) {
-    (*has_bits)[0] |= 1u;
-  }
-  static const ::io::deephaven::proto::backplane::grpc::UpdateByWindowScale& forward_window_scale(const UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingMax* msg);
-  static void set_has_forward_window_scale(HasBits* has_bits) {
-    (*has_bits)[0] |= 2u;
-  }
-};
-
-const ::io::deephaven::proto::backplane::grpc::UpdateByWindowScale& UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingMax::_Internal::reverse_window_scale(const UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingMax* msg) {
-  return *msg->_impl_.reverse_window_scale_;
-}
-const ::io::deephaven::proto::backplane::grpc::UpdateByWindowScale& UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingMax::_Internal::forward_window_scale(const UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingMax* msg) {
-  return *msg->_impl_.forward_window_scale_;
-}
-UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingMax::UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingMax(::google::protobuf::Arena* arena)
-    : ::google::protobuf::Message(arena) {
-  SharedCtor(arena);
-  // @@protoc_insertion_point(arena_constructor:io.deephaven.proto.backplane.grpc.UpdateByRequest.UpdateByOperation.UpdateByColumn.UpdateBySpec.UpdateByRollingMax)
-}
-inline PROTOBUF_NDEBUG_INLINE UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingMax::Impl_::Impl_(
-    ::google::protobuf::internal::InternalVisibility visibility, ::google::protobuf::Arena* arena,
-    const Impl_& from)
-      : _has_bits_{from._has_bits_},
-        _cached_size_{0} {}
-
-UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingMax::UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingMax(
-    ::google::protobuf::Arena* arena,
-    const UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingMax& from)
-    : ::google::protobuf::Message(arena) {
-  UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingMax* const _this = this;
-  (void)_this;
-  _internal_metadata_.MergeFrom<::google::protobuf::UnknownFieldSet>(
-      from._internal_metadata_);
-  new (&_impl_) Impl_(internal_visibility(), arena, from._impl_);
-  ::uint32_t cached_has_bits = _impl_._has_bits_[0];
-  _impl_.reverse_window_scale_ = (cached_has_bits & 0x00000001u)
-                ? CreateMaybeMessage<::io::deephaven::proto::backplane::grpc::UpdateByWindowScale>(arena, *from._impl_.reverse_window_scale_)
-                : nullptr;
-  _impl_.forward_window_scale_ = (cached_has_bits & 0x00000002u)
-                ? CreateMaybeMessage<::io::deephaven::proto::backplane::grpc::UpdateByWindowScale>(arena, *from._impl_.forward_window_scale_)
-                : nullptr;
-
-  // @@protoc_insertion_point(copy_constructor:io.deephaven.proto.backplane.grpc.UpdateByRequest.UpdateByOperation.UpdateByColumn.UpdateBySpec.UpdateByRollingMax)
-}
-inline PROTOBUF_NDEBUG_INLINE UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingMax::Impl_::Impl_(
-    ::google::protobuf::internal::InternalVisibility visibility,
-    ::google::protobuf::Arena* arena)
-      : _cached_size_{0} {}
-
-inline void UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingMax::SharedCtor(::_pb::Arena* arena) {
-  new (&_impl_) Impl_(internal_visibility(), arena);
-  ::memset(reinterpret_cast<char *>(&_impl_) +
-               offsetof(Impl_, reverse_window_scale_),
-           0,
-           offsetof(Impl_, forward_window_scale_) -
-               offsetof(Impl_, reverse_window_scale_) +
-               sizeof(Impl_::forward_window_scale_));
-}
-UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingMax::~UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingMax() {
-  // @@protoc_insertion_point(destructor:io.deephaven.proto.backplane.grpc.UpdateByRequest.UpdateByOperation.UpdateByColumn.UpdateBySpec.UpdateByRollingMax)
-  _internal_metadata_.Delete<::google::protobuf::UnknownFieldSet>();
-  SharedDtor();
-}
-inline void UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingMax::SharedDtor() {
-  ABSL_DCHECK(GetArena() == nullptr);
-  delete _impl_.reverse_window_scale_;
-  delete _impl_.forward_window_scale_;
-  _impl_.~Impl_();
-}
-
-PROTOBUF_NOINLINE void UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingMax::Clear() {
-// @@protoc_insertion_point(message_clear_start:io.deephaven.proto.backplane.grpc.UpdateByRequest.UpdateByOperation.UpdateByColumn.UpdateBySpec.UpdateByRollingMax)
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  ::uint32_t cached_has_bits = 0;
-  // Prevent compiler warnings about cached_has_bits being unused
-  (void) cached_has_bits;
-
-  cached_has_bits = _impl_._has_bits_[0];
-  if (cached_has_bits & 0x00000003u) {
-    if (cached_has_bits & 0x00000001u) {
-      ABSL_DCHECK(_impl_.reverse_window_scale_ != nullptr);
-      _impl_.reverse_window_scale_->Clear();
-    }
-    if (cached_has_bits & 0x00000002u) {
-      ABSL_DCHECK(_impl_.forward_window_scale_ != nullptr);
-      _impl_.forward_window_scale_->Clear();
-    }
-  }
-  _impl_._has_bits_.Clear();
-  _internal_metadata_.Clear<::google::protobuf::UnknownFieldSet>();
-}
-
-const char* UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingMax::_InternalParse(
-    const char* ptr, ::_pbi::ParseContext* ctx) {
-  ptr = ::_pbi::TcParser::ParseLoop(this, ptr, ctx, &_table_.header);
-  return ptr;
-}
-
-
-PROTOBUF_CONSTINIT PROTOBUF_ATTRIBUTE_INIT_PRIORITY1
-const ::_pbi::TcParseTable<1, 2, 2, 0, 2> UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingMax::_table_ = {
-  {
-    PROTOBUF_FIELD_OFFSET(UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingMax, _impl_._has_bits_),
-    0, // no _extensions_
-    2, 8,  // max_field_number, fast_idx_mask
-    offsetof(decltype(_table_), field_lookup_table),
-    4294967292,  // skipmap
-    offsetof(decltype(_table_), field_entries),
-    2,  // num_field_entries
-    2,  // num_aux_entries
-    offsetof(decltype(_table_), aux_entries),
-    &_UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingMax_default_instance_._instance,
-    ::_pbi::TcParser::GenericFallback,  // fallback
-  }, {{
-    // .io.deephaven.proto.backplane.grpc.UpdateByWindowScale forward_window_scale = 2;
-    {::_pbi::TcParser::FastMtS1,
-     {18, 1, 1, PROTOBUF_FIELD_OFFSET(UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingMax, _impl_.forward_window_scale_)}},
-    // .io.deephaven.proto.backplane.grpc.UpdateByWindowScale reverse_window_scale = 1;
-    {::_pbi::TcParser::FastMtS1,
-     {10, 0, 0, PROTOBUF_FIELD_OFFSET(UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingMax, _impl_.reverse_window_scale_)}},
-  }}, {{
-    65535, 65535
-  }}, {{
-    // .io.deephaven.proto.backplane.grpc.UpdateByWindowScale reverse_window_scale = 1;
-    {PROTOBUF_FIELD_OFFSET(UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingMax, _impl_.reverse_window_scale_), _Internal::kHasBitsOffset + 0, 0,
-    (0 | ::_fl::kFcOptional | ::_fl::kMessage | ::_fl::kTvTable)},
-    // .io.deephaven.proto.backplane.grpc.UpdateByWindowScale forward_window_scale = 2;
-    {PROTOBUF_FIELD_OFFSET(UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingMax, _impl_.forward_window_scale_), _Internal::kHasBitsOffset + 1, 1,
-    (0 | ::_fl::kFcOptional | ::_fl::kMessage | ::_fl::kTvTable)},
-  }}, {{
-    {::_pbi::TcParser::GetTable<::io::deephaven::proto::backplane::grpc::UpdateByWindowScale>()},
-    {::_pbi::TcParser::GetTable<::io::deephaven::proto::backplane::grpc::UpdateByWindowScale>()},
-  }}, {{
-  }},
-};
-
-::uint8_t* UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingMax::_InternalSerialize(
-    ::uint8_t* target,
-    ::google::protobuf::io::EpsCopyOutputStream* stream) const {
-  // @@protoc_insertion_point(serialize_to_array_start:io.deephaven.proto.backplane.grpc.UpdateByRequest.UpdateByOperation.UpdateByColumn.UpdateBySpec.UpdateByRollingMax)
-  ::uint32_t cached_has_bits = 0;
-  (void)cached_has_bits;
-
-  cached_has_bits = _impl_._has_bits_[0];
-  // .io.deephaven.proto.backplane.grpc.UpdateByWindowScale reverse_window_scale = 1;
-  if (cached_has_bits & 0x00000001u) {
-    target = ::google::protobuf::internal::WireFormatLite::InternalWriteMessage(
-        1, _Internal::reverse_window_scale(this),
-        _Internal::reverse_window_scale(this).GetCachedSize(), target, stream);
-  }
-
-  // .io.deephaven.proto.backplane.grpc.UpdateByWindowScale forward_window_scale = 2;
-  if (cached_has_bits & 0x00000002u) {
-    target = ::google::protobuf::internal::WireFormatLite::InternalWriteMessage(
-        2, _Internal::forward_window_scale(this),
-        _Internal::forward_window_scale(this).GetCachedSize(), target, stream);
-  }
-
-  if (PROTOBUF_PREDICT_FALSE(_internal_metadata_.have_unknown_fields())) {
-    target =
-        ::_pbi::WireFormat::InternalSerializeUnknownFieldsToArray(
-            _internal_metadata_.unknown_fields<::google::protobuf::UnknownFieldSet>(::google::protobuf::UnknownFieldSet::default_instance), target, stream);
-  }
-  // @@protoc_insertion_point(serialize_to_array_end:io.deephaven.proto.backplane.grpc.UpdateByRequest.UpdateByOperation.UpdateByColumn.UpdateBySpec.UpdateByRollingMax)
-  return target;
-}
-
-::size_t UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingMax::ByteSizeLong() const {
-// @@protoc_insertion_point(message_byte_size_start:io.deephaven.proto.backplane.grpc.UpdateByRequest.UpdateByOperation.UpdateByColumn.UpdateBySpec.UpdateByRollingMax)
-  ::size_t total_size = 0;
-
-  ::uint32_t cached_has_bits = 0;
-  // Prevent compiler warnings about cached_has_bits being unused
-  (void) cached_has_bits;
-
-  cached_has_bits = _impl_._has_bits_[0];
-  if (cached_has_bits & 0x00000003u) {
-    // .io.deephaven.proto.backplane.grpc.UpdateByWindowScale reverse_window_scale = 1;
-    if (cached_has_bits & 0x00000001u) {
-      total_size +=
-          1 + ::google::protobuf::internal::WireFormatLite::MessageSize(*_impl_.reverse_window_scale_);
-    }
-
-    // .io.deephaven.proto.backplane.grpc.UpdateByWindowScale forward_window_scale = 2;
-    if (cached_has_bits & 0x00000002u) {
-      total_size +=
-          1 + ::google::protobuf::internal::WireFormatLite::MessageSize(*_impl_.forward_window_scale_);
-    }
-
-  }
-  return MaybeComputeUnknownFieldsSize(total_size, &_impl_._cached_size_);
-}
-
-const ::google::protobuf::Message::ClassData UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingMax::_class_data_ = {
-    UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingMax::MergeImpl,
-    nullptr,  // OnDemandRegisterArenaDtor
-};
-const ::google::protobuf::Message::ClassData* UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingMax::GetClassData() const {
-  return &_class_data_;
-}
-
-void UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingMax::MergeImpl(::google::protobuf::Message& to_msg, const ::google::protobuf::Message& from_msg) {
-  auto* const _this = static_cast<UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingMax*>(&to_msg);
-  auto& from = static_cast<const UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingMax&>(from_msg);
-  // @@protoc_insertion_point(class_specific_merge_from_start:io.deephaven.proto.backplane.grpc.UpdateByRequest.UpdateByOperation.UpdateByColumn.UpdateBySpec.UpdateByRollingMax)
-  ABSL_DCHECK_NE(&from, _this);
-  ::uint32_t cached_has_bits = 0;
-  (void) cached_has_bits;
-
-  cached_has_bits = from._impl_._has_bits_[0];
-  if (cached_has_bits & 0x00000003u) {
-    if (cached_has_bits & 0x00000001u) {
-      _this->_internal_mutable_reverse_window_scale()->::io::deephaven::proto::backplane::grpc::UpdateByWindowScale::MergeFrom(
-          from._internal_reverse_window_scale());
-    }
-    if (cached_has_bits & 0x00000002u) {
-      _this->_internal_mutable_forward_window_scale()->::io::deephaven::proto::backplane::grpc::UpdateByWindowScale::MergeFrom(
-          from._internal_forward_window_scale());
-    }
-  }
-  _this->_internal_metadata_.MergeFrom<::google::protobuf::UnknownFieldSet>(from._internal_metadata_);
-}
-
-void UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingMax::CopyFrom(const UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingMax& from) {
-// @@protoc_insertion_point(class_specific_copy_from_start:io.deephaven.proto.backplane.grpc.UpdateByRequest.UpdateByOperation.UpdateByColumn.UpdateBySpec.UpdateByRollingMax)
-  if (&from == this) return;
-  Clear();
-  MergeFrom(from);
-}
-
-PROTOBUF_NOINLINE bool UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingMax::IsInitialized() const {
-  return true;
-}
-
-::_pbi::CachedSize* UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingMax::AccessCachedSize() const {
-  return &_impl_._cached_size_;
-}
-void UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingMax::InternalSwap(UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingMax* PROTOBUF_RESTRICT other) {
-  using std::swap;
-  _internal_metadata_.InternalSwap(&other->_internal_metadata_);
-  swap(_impl_._has_bits_[0], other->_impl_._has_bits_[0]);
-  ::google::protobuf::internal::memswap<
-      PROTOBUF_FIELD_OFFSET(UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingMax, _impl_.forward_window_scale_)
-      + sizeof(UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingMax::_impl_.forward_window_scale_)
-      - PROTOBUF_FIELD_OFFSET(UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingMax, _impl_.reverse_window_scale_)>(
-          reinterpret_cast<char*>(&_impl_.reverse_window_scale_),
-          reinterpret_cast<char*>(&other->_impl_.reverse_window_scale_));
-}
-
-::google::protobuf::Metadata UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingMax::GetMetadata() const {
-  return ::_pbi::AssignDescriptors(
-      &descriptor_table_deephaven_2fproto_2ftable_2eproto_getter, &descriptor_table_deephaven_2fproto_2ftable_2eproto_once,
-      file_level_metadata_deephaven_2fproto_2ftable_2eproto[31]);
-}
-// ===================================================================
-
-class UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingProduct::_Internal {
- public:
-  using HasBits = decltype(std::declval<UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingProduct>()._impl_._has_bits_);
-  static constexpr ::int32_t kHasBitsOffset =
-    8 * PROTOBUF_FIELD_OFFSET(UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingProduct, _impl_._has_bits_);
-  static const ::io::deephaven::proto::backplane::grpc::UpdateByWindowScale& reverse_window_scale(const UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingProduct* msg);
-  static void set_has_reverse_window_scale(HasBits* has_bits) {
-    (*has_bits)[0] |= 1u;
-  }
-  static const ::io::deephaven::proto::backplane::grpc::UpdateByWindowScale& forward_window_scale(const UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingProduct* msg);
-  static void set_has_forward_window_scale(HasBits* has_bits) {
-    (*has_bits)[0] |= 2u;
-  }
-};
-
-const ::io::deephaven::proto::backplane::grpc::UpdateByWindowScale& UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingProduct::_Internal::reverse_window_scale(const UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingProduct* msg) {
-  return *msg->_impl_.reverse_window_scale_;
-}
-const ::io::deephaven::proto::backplane::grpc::UpdateByWindowScale& UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingProduct::_Internal::forward_window_scale(const UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingProduct* msg) {
-  return *msg->_impl_.forward_window_scale_;
-}
-UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingProduct::UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingProduct(::google::protobuf::Arena* arena)
-    : ::google::protobuf::Message(arena) {
-  SharedCtor(arena);
-  // @@protoc_insertion_point(arena_constructor:io.deephaven.proto.backplane.grpc.UpdateByRequest.UpdateByOperation.UpdateByColumn.UpdateBySpec.UpdateByRollingProduct)
-}
-inline PROTOBUF_NDEBUG_INLINE UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingProduct::Impl_::Impl_(
-    ::google::protobuf::internal::InternalVisibility visibility, ::google::protobuf::Arena* arena,
-    const Impl_& from)
-      : _has_bits_{from._has_bits_},
-        _cached_size_{0} {}
-
-UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingProduct::UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingProduct(
-    ::google::protobuf::Arena* arena,
-    const UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingProduct& from)
-    : ::google::protobuf::Message(arena) {
-  UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingProduct* const _this = this;
-  (void)_this;
-  _internal_metadata_.MergeFrom<::google::protobuf::UnknownFieldSet>(
-      from._internal_metadata_);
-  new (&_impl_) Impl_(internal_visibility(), arena, from._impl_);
-  ::uint32_t cached_has_bits = _impl_._has_bits_[0];
-  _impl_.reverse_window_scale_ = (cached_has_bits & 0x00000001u)
-                ? CreateMaybeMessage<::io::deephaven::proto::backplane::grpc::UpdateByWindowScale>(arena, *from._impl_.reverse_window_scale_)
-                : nullptr;
-  _impl_.forward_window_scale_ = (cached_has_bits & 0x00000002u)
-                ? CreateMaybeMessage<::io::deephaven::proto::backplane::grpc::UpdateByWindowScale>(arena, *from._impl_.forward_window_scale_)
-                : nullptr;
-
-  // @@protoc_insertion_point(copy_constructor:io.deephaven.proto.backplane.grpc.UpdateByRequest.UpdateByOperation.UpdateByColumn.UpdateBySpec.UpdateByRollingProduct)
-}
-inline PROTOBUF_NDEBUG_INLINE UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingProduct::Impl_::Impl_(
-    ::google::protobuf::internal::InternalVisibility visibility,
-    ::google::protobuf::Arena* arena)
-      : _cached_size_{0} {}
-
-inline void UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingProduct::SharedCtor(::_pb::Arena* arena) {
-  new (&_impl_) Impl_(internal_visibility(), arena);
-  ::memset(reinterpret_cast<char *>(&_impl_) +
-               offsetof(Impl_, reverse_window_scale_),
-           0,
-           offsetof(Impl_, forward_window_scale_) -
-               offsetof(Impl_, reverse_window_scale_) +
-               sizeof(Impl_::forward_window_scale_));
-}
-UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingProduct::~UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingProduct() {
-  // @@protoc_insertion_point(destructor:io.deephaven.proto.backplane.grpc.UpdateByRequest.UpdateByOperation.UpdateByColumn.UpdateBySpec.UpdateByRollingProduct)
-  _internal_metadata_.Delete<::google::protobuf::UnknownFieldSet>();
-  SharedDtor();
-}
-inline void UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingProduct::SharedDtor() {
-  ABSL_DCHECK(GetArena() == nullptr);
-  delete _impl_.reverse_window_scale_;
-  delete _impl_.forward_window_scale_;
-  _impl_.~Impl_();
-}
-
-PROTOBUF_NOINLINE void UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingProduct::Clear() {
-// @@protoc_insertion_point(message_clear_start:io.deephaven.proto.backplane.grpc.UpdateByRequest.UpdateByOperation.UpdateByColumn.UpdateBySpec.UpdateByRollingProduct)
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  ::uint32_t cached_has_bits = 0;
-  // Prevent compiler warnings about cached_has_bits being unused
-  (void) cached_has_bits;
-
-  cached_has_bits = _impl_._has_bits_[0];
-  if (cached_has_bits & 0x00000003u) {
-    if (cached_has_bits & 0x00000001u) {
-      ABSL_DCHECK(_impl_.reverse_window_scale_ != nullptr);
-      _impl_.reverse_window_scale_->Clear();
-    }
-    if (cached_has_bits & 0x00000002u) {
-      ABSL_DCHECK(_impl_.forward_window_scale_ != nullptr);
-      _impl_.forward_window_scale_->Clear();
-    }
-  }
-  _impl_._has_bits_.Clear();
-  _internal_metadata_.Clear<::google::protobuf::UnknownFieldSet>();
-}
-
-const char* UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingProduct::_InternalParse(
-    const char* ptr, ::_pbi::ParseContext* ctx) {
-  ptr = ::_pbi::TcParser::ParseLoop(this, ptr, ctx, &_table_.header);
-  return ptr;
-}
-
-
-PROTOBUF_CONSTINIT PROTOBUF_ATTRIBUTE_INIT_PRIORITY1
-const ::_pbi::TcParseTable<1, 2, 2, 0, 2> UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingProduct::_table_ = {
-  {
-    PROTOBUF_FIELD_OFFSET(UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingProduct, _impl_._has_bits_),
-    0, // no _extensions_
-    2, 8,  // max_field_number, fast_idx_mask
-    offsetof(decltype(_table_), field_lookup_table),
-    4294967292,  // skipmap
-    offsetof(decltype(_table_), field_entries),
-    2,  // num_field_entries
-    2,  // num_aux_entries
-    offsetof(decltype(_table_), aux_entries),
-    &_UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingProduct_default_instance_._instance,
-    ::_pbi::TcParser::GenericFallback,  // fallback
-  }, {{
-    // .io.deephaven.proto.backplane.grpc.UpdateByWindowScale forward_window_scale = 2;
-    {::_pbi::TcParser::FastMtS1,
-     {18, 1, 1, PROTOBUF_FIELD_OFFSET(UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingProduct, _impl_.forward_window_scale_)}},
-    // .io.deephaven.proto.backplane.grpc.UpdateByWindowScale reverse_window_scale = 1;
-    {::_pbi::TcParser::FastMtS1,
-     {10, 0, 0, PROTOBUF_FIELD_OFFSET(UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingProduct, _impl_.reverse_window_scale_)}},
-  }}, {{
-    65535, 65535
-  }}, {{
-    // .io.deephaven.proto.backplane.grpc.UpdateByWindowScale reverse_window_scale = 1;
-    {PROTOBUF_FIELD_OFFSET(UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingProduct, _impl_.reverse_window_scale_), _Internal::kHasBitsOffset + 0, 0,
-    (0 | ::_fl::kFcOptional | ::_fl::kMessage | ::_fl::kTvTable)},
-    // .io.deephaven.proto.backplane.grpc.UpdateByWindowScale forward_window_scale = 2;
-    {PROTOBUF_FIELD_OFFSET(UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingProduct, _impl_.forward_window_scale_), _Internal::kHasBitsOffset + 1, 1,
-    (0 | ::_fl::kFcOptional | ::_fl::kMessage | ::_fl::kTvTable)},
-  }}, {{
-    {::_pbi::TcParser::GetTable<::io::deephaven::proto::backplane::grpc::UpdateByWindowScale>()},
-    {::_pbi::TcParser::GetTable<::io::deephaven::proto::backplane::grpc::UpdateByWindowScale>()},
-  }}, {{
-  }},
-};
-
-::uint8_t* UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingProduct::_InternalSerialize(
-    ::uint8_t* target,
-    ::google::protobuf::io::EpsCopyOutputStream* stream) const {
-  // @@protoc_insertion_point(serialize_to_array_start:io.deephaven.proto.backplane.grpc.UpdateByRequest.UpdateByOperation.UpdateByColumn.UpdateBySpec.UpdateByRollingProduct)
-  ::uint32_t cached_has_bits = 0;
-  (void)cached_has_bits;
-
-  cached_has_bits = _impl_._has_bits_[0];
-  // .io.deephaven.proto.backplane.grpc.UpdateByWindowScale reverse_window_scale = 1;
-  if (cached_has_bits & 0x00000001u) {
-    target = ::google::protobuf::internal::WireFormatLite::InternalWriteMessage(
-        1, _Internal::reverse_window_scale(this),
-        _Internal::reverse_window_scale(this).GetCachedSize(), target, stream);
-  }
-
-  // .io.deephaven.proto.backplane.grpc.UpdateByWindowScale forward_window_scale = 2;
-  if (cached_has_bits & 0x00000002u) {
-    target = ::google::protobuf::internal::WireFormatLite::InternalWriteMessage(
-        2, _Internal::forward_window_scale(this),
-        _Internal::forward_window_scale(this).GetCachedSize(), target, stream);
-  }
-
-  if (PROTOBUF_PREDICT_FALSE(_internal_metadata_.have_unknown_fields())) {
-    target =
-        ::_pbi::WireFormat::InternalSerializeUnknownFieldsToArray(
-            _internal_metadata_.unknown_fields<::google::protobuf::UnknownFieldSet>(::google::protobuf::UnknownFieldSet::default_instance), target, stream);
-  }
-  // @@protoc_insertion_point(serialize_to_array_end:io.deephaven.proto.backplane.grpc.UpdateByRequest.UpdateByOperation.UpdateByColumn.UpdateBySpec.UpdateByRollingProduct)
-  return target;
-}
-
-::size_t UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingProduct::ByteSizeLong() const {
-// @@protoc_insertion_point(message_byte_size_start:io.deephaven.proto.backplane.grpc.UpdateByRequest.UpdateByOperation.UpdateByColumn.UpdateBySpec.UpdateByRollingProduct)
-  ::size_t total_size = 0;
-
-  ::uint32_t cached_has_bits = 0;
-  // Prevent compiler warnings about cached_has_bits being unused
-  (void) cached_has_bits;
-
-  cached_has_bits = _impl_._has_bits_[0];
-  if (cached_has_bits & 0x00000003u) {
-    // .io.deephaven.proto.backplane.grpc.UpdateByWindowScale reverse_window_scale = 1;
-    if (cached_has_bits & 0x00000001u) {
-      total_size +=
-          1 + ::google::protobuf::internal::WireFormatLite::MessageSize(*_impl_.reverse_window_scale_);
-    }
-
-    // .io.deephaven.proto.backplane.grpc.UpdateByWindowScale forward_window_scale = 2;
-    if (cached_has_bits & 0x00000002u) {
-      total_size +=
-          1 + ::google::protobuf::internal::WireFormatLite::MessageSize(*_impl_.forward_window_scale_);
-    }
-
-  }
-  return MaybeComputeUnknownFieldsSize(total_size, &_impl_._cached_size_);
-}
-
-const ::google::protobuf::Message::ClassData UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingProduct::_class_data_ = {
-    UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingProduct::MergeImpl,
-    nullptr,  // OnDemandRegisterArenaDtor
-};
-const ::google::protobuf::Message::ClassData* UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingProduct::GetClassData() const {
-  return &_class_data_;
-}
-
-void UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingProduct::MergeImpl(::google::protobuf::Message& to_msg, const ::google::protobuf::Message& from_msg) {
-  auto* const _this = static_cast<UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingProduct*>(&to_msg);
-  auto& from = static_cast<const UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingProduct&>(from_msg);
-  // @@protoc_insertion_point(class_specific_merge_from_start:io.deephaven.proto.backplane.grpc.UpdateByRequest.UpdateByOperation.UpdateByColumn.UpdateBySpec.UpdateByRollingProduct)
-  ABSL_DCHECK_NE(&from, _this);
-  ::uint32_t cached_has_bits = 0;
-  (void) cached_has_bits;
-
-  cached_has_bits = from._impl_._has_bits_[0];
-  if (cached_has_bits & 0x00000003u) {
-    if (cached_has_bits & 0x00000001u) {
-      _this->_internal_mutable_reverse_window_scale()->::io::deephaven::proto::backplane::grpc::UpdateByWindowScale::MergeFrom(
-          from._internal_reverse_window_scale());
-    }
-    if (cached_has_bits & 0x00000002u) {
-      _this->_internal_mutable_forward_window_scale()->::io::deephaven::proto::backplane::grpc::UpdateByWindowScale::MergeFrom(
-          from._internal_forward_window_scale());
-    }
-  }
-  _this->_internal_metadata_.MergeFrom<::google::protobuf::UnknownFieldSet>(from._internal_metadata_);
-}
-
-void UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingProduct::CopyFrom(const UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingProduct& from) {
-// @@protoc_insertion_point(class_specific_copy_from_start:io.deephaven.proto.backplane.grpc.UpdateByRequest.UpdateByOperation.UpdateByColumn.UpdateBySpec.UpdateByRollingProduct)
-  if (&from == this) return;
-  Clear();
-  MergeFrom(from);
-}
-
-PROTOBUF_NOINLINE bool UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingProduct::IsInitialized() const {
-  return true;
-}
-
-::_pbi::CachedSize* UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingProduct::AccessCachedSize() const {
-  return &_impl_._cached_size_;
-}
-void UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingProduct::InternalSwap(UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingProduct* PROTOBUF_RESTRICT other) {
-  using std::swap;
-  _internal_metadata_.InternalSwap(&other->_internal_metadata_);
-  swap(_impl_._has_bits_[0], other->_impl_._has_bits_[0]);
-  ::google::protobuf::internal::memswap<
-      PROTOBUF_FIELD_OFFSET(UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingProduct, _impl_.forward_window_scale_)
-      + sizeof(UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingProduct::_impl_.forward_window_scale_)
-      - PROTOBUF_FIELD_OFFSET(UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingProduct, _impl_.reverse_window_scale_)>(
-          reinterpret_cast<char*>(&_impl_.reverse_window_scale_),
-          reinterpret_cast<char*>(&other->_impl_.reverse_window_scale_));
-}
-
-::google::protobuf::Metadata UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingProduct::GetMetadata() const {
-  return ::_pbi::AssignDescriptors(
-      &descriptor_table_deephaven_2fproto_2ftable_2eproto_getter, &descriptor_table_deephaven_2fproto_2ftable_2eproto_once,
-      file_level_metadata_deephaven_2fproto_2ftable_2eproto[32]);
-}
-// ===================================================================
-
-class UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingCount::_Internal {
- public:
-  using HasBits = decltype(std::declval<UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingCount>()._impl_._has_bits_);
-  static constexpr ::int32_t kHasBitsOffset =
-    8 * PROTOBUF_FIELD_OFFSET(UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingCount, _impl_._has_bits_);
-  static const ::io::deephaven::proto::backplane::grpc::UpdateByWindowScale& reverse_window_scale(const UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingCount* msg);
-  static void set_has_reverse_window_scale(HasBits* has_bits) {
-    (*has_bits)[0] |= 1u;
-  }
-  static const ::io::deephaven::proto::backplane::grpc::UpdateByWindowScale& forward_window_scale(const UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingCount* msg);
-  static void set_has_forward_window_scale(HasBits* has_bits) {
-    (*has_bits)[0] |= 2u;
-  }
-};
-
-const ::io::deephaven::proto::backplane::grpc::UpdateByWindowScale& UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingCount::_Internal::reverse_window_scale(const UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingCount* msg) {
-  return *msg->_impl_.reverse_window_scale_;
-}
-const ::io::deephaven::proto::backplane::grpc::UpdateByWindowScale& UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingCount::_Internal::forward_window_scale(const UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingCount* msg) {
-  return *msg->_impl_.forward_window_scale_;
-}
-UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingCount::UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingCount(::google::protobuf::Arena* arena)
-    : ::google::protobuf::Message(arena) {
-  SharedCtor(arena);
-  // @@protoc_insertion_point(arena_constructor:io.deephaven.proto.backplane.grpc.UpdateByRequest.UpdateByOperation.UpdateByColumn.UpdateBySpec.UpdateByRollingCount)
-}
-inline PROTOBUF_NDEBUG_INLINE UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingCount::Impl_::Impl_(
-    ::google::protobuf::internal::InternalVisibility visibility, ::google::protobuf::Arena* arena,
-    const Impl_& from)
-      : _has_bits_{from._has_bits_},
-        _cached_size_{0} {}
-
-UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingCount::UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingCount(
-    ::google::protobuf::Arena* arena,
-    const UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingCount& from)
-    : ::google::protobuf::Message(arena) {
-  UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingCount* const _this = this;
-  (void)_this;
-  _internal_metadata_.MergeFrom<::google::protobuf::UnknownFieldSet>(
-      from._internal_metadata_);
-  new (&_impl_) Impl_(internal_visibility(), arena, from._impl_);
-  ::uint32_t cached_has_bits = _impl_._has_bits_[0];
-  _impl_.reverse_window_scale_ = (cached_has_bits & 0x00000001u)
-                ? CreateMaybeMessage<::io::deephaven::proto::backplane::grpc::UpdateByWindowScale>(arena, *from._impl_.reverse_window_scale_)
-                : nullptr;
-  _impl_.forward_window_scale_ = (cached_has_bits & 0x00000002u)
-                ? CreateMaybeMessage<::io::deephaven::proto::backplane::grpc::UpdateByWindowScale>(arena, *from._impl_.forward_window_scale_)
-                : nullptr;
-
-  // @@protoc_insertion_point(copy_constructor:io.deephaven.proto.backplane.grpc.UpdateByRequest.UpdateByOperation.UpdateByColumn.UpdateBySpec.UpdateByRollingCount)
-}
-inline PROTOBUF_NDEBUG_INLINE UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingCount::Impl_::Impl_(
-    ::google::protobuf::internal::InternalVisibility visibility,
-    ::google::protobuf::Arena* arena)
-      : _cached_size_{0} {}
-
-inline void UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingCount::SharedCtor(::_pb::Arena* arena) {
-  new (&_impl_) Impl_(internal_visibility(), arena);
-  ::memset(reinterpret_cast<char *>(&_impl_) +
-               offsetof(Impl_, reverse_window_scale_),
-           0,
-           offsetof(Impl_, forward_window_scale_) -
-               offsetof(Impl_, reverse_window_scale_) +
-               sizeof(Impl_::forward_window_scale_));
-}
-UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingCount::~UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingCount() {
-  // @@protoc_insertion_point(destructor:io.deephaven.proto.backplane.grpc.UpdateByRequest.UpdateByOperation.UpdateByColumn.UpdateBySpec.UpdateByRollingCount)
-  _internal_metadata_.Delete<::google::protobuf::UnknownFieldSet>();
-  SharedDtor();
-}
-inline void UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingCount::SharedDtor() {
-  ABSL_DCHECK(GetArena() == nullptr);
-  delete _impl_.reverse_window_scale_;
-  delete _impl_.forward_window_scale_;
-  _impl_.~Impl_();
-}
-
-PROTOBUF_NOINLINE void UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingCount::Clear() {
-// @@protoc_insertion_point(message_clear_start:io.deephaven.proto.backplane.grpc.UpdateByRequest.UpdateByOperation.UpdateByColumn.UpdateBySpec.UpdateByRollingCount)
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  ::uint32_t cached_has_bits = 0;
-  // Prevent compiler warnings about cached_has_bits being unused
-  (void) cached_has_bits;
-
-  cached_has_bits = _impl_._has_bits_[0];
-  if (cached_has_bits & 0x00000003u) {
-    if (cached_has_bits & 0x00000001u) {
-      ABSL_DCHECK(_impl_.reverse_window_scale_ != nullptr);
-      _impl_.reverse_window_scale_->Clear();
-    }
-    if (cached_has_bits & 0x00000002u) {
-      ABSL_DCHECK(_impl_.forward_window_scale_ != nullptr);
-      _impl_.forward_window_scale_->Clear();
-    }
-  }
-  _impl_._has_bits_.Clear();
-  _internal_metadata_.Clear<::google::protobuf::UnknownFieldSet>();
-}
-
-const char* UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingCount::_InternalParse(
-    const char* ptr, ::_pbi::ParseContext* ctx) {
-  ptr = ::_pbi::TcParser::ParseLoop(this, ptr, ctx, &_table_.header);
-  return ptr;
-}
-
-
-PROTOBUF_CONSTINIT PROTOBUF_ATTRIBUTE_INIT_PRIORITY1
-const ::_pbi::TcParseTable<1, 2, 2, 0, 2> UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingCount::_table_ = {
-  {
-    PROTOBUF_FIELD_OFFSET(UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingCount, _impl_._has_bits_),
-    0, // no _extensions_
-    2, 8,  // max_field_number, fast_idx_mask
-    offsetof(decltype(_table_), field_lookup_table),
-    4294967292,  // skipmap
-    offsetof(decltype(_table_), field_entries),
-    2,  // num_field_entries
-    2,  // num_aux_entries
-    offsetof(decltype(_table_), aux_entries),
-    &_UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingCount_default_instance_._instance,
-    ::_pbi::TcParser::GenericFallback,  // fallback
-  }, {{
-    // .io.deephaven.proto.backplane.grpc.UpdateByWindowScale forward_window_scale = 2;
-    {::_pbi::TcParser::FastMtS1,
-     {18, 1, 1, PROTOBUF_FIELD_OFFSET(UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingCount, _impl_.forward_window_scale_)}},
-    // .io.deephaven.proto.backplane.grpc.UpdateByWindowScale reverse_window_scale = 1;
-    {::_pbi::TcParser::FastMtS1,
-     {10, 0, 0, PROTOBUF_FIELD_OFFSET(UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingCount, _impl_.reverse_window_scale_)}},
-  }}, {{
-    65535, 65535
-  }}, {{
-    // .io.deephaven.proto.backplane.grpc.UpdateByWindowScale reverse_window_scale = 1;
-    {PROTOBUF_FIELD_OFFSET(UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingCount, _impl_.reverse_window_scale_), _Internal::kHasBitsOffset + 0, 0,
-    (0 | ::_fl::kFcOptional | ::_fl::kMessage | ::_fl::kTvTable)},
-    // .io.deephaven.proto.backplane.grpc.UpdateByWindowScale forward_window_scale = 2;
-    {PROTOBUF_FIELD_OFFSET(UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingCount, _impl_.forward_window_scale_), _Internal::kHasBitsOffset + 1, 1,
-    (0 | ::_fl::kFcOptional | ::_fl::kMessage | ::_fl::kTvTable)},
-  }}, {{
-    {::_pbi::TcParser::GetTable<::io::deephaven::proto::backplane::grpc::UpdateByWindowScale>()},
-    {::_pbi::TcParser::GetTable<::io::deephaven::proto::backplane::grpc::UpdateByWindowScale>()},
-  }}, {{
-  }},
-};
-
-::uint8_t* UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingCount::_InternalSerialize(
-    ::uint8_t* target,
-    ::google::protobuf::io::EpsCopyOutputStream* stream) const {
-  // @@protoc_insertion_point(serialize_to_array_start:io.deephaven.proto.backplane.grpc.UpdateByRequest.UpdateByOperation.UpdateByColumn.UpdateBySpec.UpdateByRollingCount)
-  ::uint32_t cached_has_bits = 0;
-  (void)cached_has_bits;
-
-  cached_has_bits = _impl_._has_bits_[0];
-  // .io.deephaven.proto.backplane.grpc.UpdateByWindowScale reverse_window_scale = 1;
-  if (cached_has_bits & 0x00000001u) {
-    target = ::google::protobuf::internal::WireFormatLite::InternalWriteMessage(
-        1, _Internal::reverse_window_scale(this),
-        _Internal::reverse_window_scale(this).GetCachedSize(), target, stream);
-  }
-
-  // .io.deephaven.proto.backplane.grpc.UpdateByWindowScale forward_window_scale = 2;
-  if (cached_has_bits & 0x00000002u) {
-    target = ::google::protobuf::internal::WireFormatLite::InternalWriteMessage(
-        2, _Internal::forward_window_scale(this),
-        _Internal::forward_window_scale(this).GetCachedSize(), target, stream);
-  }
-
-  if (PROTOBUF_PREDICT_FALSE(_internal_metadata_.have_unknown_fields())) {
-    target =
-        ::_pbi::WireFormat::InternalSerializeUnknownFieldsToArray(
-            _internal_metadata_.unknown_fields<::google::protobuf::UnknownFieldSet>(::google::protobuf::UnknownFieldSet::default_instance), target, stream);
-  }
-  // @@protoc_insertion_point(serialize_to_array_end:io.deephaven.proto.backplane.grpc.UpdateByRequest.UpdateByOperation.UpdateByColumn.UpdateBySpec.UpdateByRollingCount)
-  return target;
-}
-
-::size_t UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingCount::ByteSizeLong() const {
-// @@protoc_insertion_point(message_byte_size_start:io.deephaven.proto.backplane.grpc.UpdateByRequest.UpdateByOperation.UpdateByColumn.UpdateBySpec.UpdateByRollingCount)
-  ::size_t total_size = 0;
-
-  ::uint32_t cached_has_bits = 0;
-  // Prevent compiler warnings about cached_has_bits being unused
-  (void) cached_has_bits;
-
-  cached_has_bits = _impl_._has_bits_[0];
-  if (cached_has_bits & 0x00000003u) {
-    // .io.deephaven.proto.backplane.grpc.UpdateByWindowScale reverse_window_scale = 1;
-    if (cached_has_bits & 0x00000001u) {
-      total_size +=
-          1 + ::google::protobuf::internal::WireFormatLite::MessageSize(*_impl_.reverse_window_scale_);
-    }
-
-    // .io.deephaven.proto.backplane.grpc.UpdateByWindowScale forward_window_scale = 2;
-    if (cached_has_bits & 0x00000002u) {
-      total_size +=
-          1 + ::google::protobuf::internal::WireFormatLite::MessageSize(*_impl_.forward_window_scale_);
-    }
-
-  }
-  return MaybeComputeUnknownFieldsSize(total_size, &_impl_._cached_size_);
-}
-
-const ::google::protobuf::Message::ClassData UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingCount::_class_data_ = {
-    UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingCount::MergeImpl,
-    nullptr,  // OnDemandRegisterArenaDtor
-};
-const ::google::protobuf::Message::ClassData* UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingCount::GetClassData() const {
-  return &_class_data_;
-}
-
-void UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingCount::MergeImpl(::google::protobuf::Message& to_msg, const ::google::protobuf::Message& from_msg) {
-  auto* const _this = static_cast<UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingCount*>(&to_msg);
-  auto& from = static_cast<const UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingCount&>(from_msg);
-  // @@protoc_insertion_point(class_specific_merge_from_start:io.deephaven.proto.backplane.grpc.UpdateByRequest.UpdateByOperation.UpdateByColumn.UpdateBySpec.UpdateByRollingCount)
-  ABSL_DCHECK_NE(&from, _this);
-  ::uint32_t cached_has_bits = 0;
-  (void) cached_has_bits;
-
-  cached_has_bits = from._impl_._has_bits_[0];
-  if (cached_has_bits & 0x00000003u) {
-    if (cached_has_bits & 0x00000001u) {
-      _this->_internal_mutable_reverse_window_scale()->::io::deephaven::proto::backplane::grpc::UpdateByWindowScale::MergeFrom(
-          from._internal_reverse_window_scale());
-    }
-    if (cached_has_bits & 0x00000002u) {
-      _this->_internal_mutable_forward_window_scale()->::io::deephaven::proto::backplane::grpc::UpdateByWindowScale::MergeFrom(
-          from._internal_forward_window_scale());
-    }
-  }
-  _this->_internal_metadata_.MergeFrom<::google::protobuf::UnknownFieldSet>(from._internal_metadata_);
-}
-
-void UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingCount::CopyFrom(const UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingCount& from) {
-// @@protoc_insertion_point(class_specific_copy_from_start:io.deephaven.proto.backplane.grpc.UpdateByRequest.UpdateByOperation.UpdateByColumn.UpdateBySpec.UpdateByRollingCount)
-  if (&from == this) return;
-  Clear();
-  MergeFrom(from);
-}
-
-PROTOBUF_NOINLINE bool UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingCount::IsInitialized() const {
-  return true;
-}
-
-::_pbi::CachedSize* UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingCount::AccessCachedSize() const {
-  return &_impl_._cached_size_;
-}
-void UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingCount::InternalSwap(UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingCount* PROTOBUF_RESTRICT other) {
-  using std::swap;
-  _internal_metadata_.InternalSwap(&other->_internal_metadata_);
-  swap(_impl_._has_bits_[0], other->_impl_._has_bits_[0]);
-  ::google::protobuf::internal::memswap<
-      PROTOBUF_FIELD_OFFSET(UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingCount, _impl_.forward_window_scale_)
-      + sizeof(UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingCount::_impl_.forward_window_scale_)
-      - PROTOBUF_FIELD_OFFSET(UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingCount, _impl_.reverse_window_scale_)>(
-          reinterpret_cast<char*>(&_impl_.reverse_window_scale_),
-          reinterpret_cast<char*>(&other->_impl_.reverse_window_scale_));
-}
-
-::google::protobuf::Metadata UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingCount::GetMetadata() const {
-  return ::_pbi::AssignDescriptors(
-      &descriptor_table_deephaven_2fproto_2ftable_2eproto_getter, &descriptor_table_deephaven_2fproto_2ftable_2eproto_once,
-      file_level_metadata_deephaven_2fproto_2ftable_2eproto[33]);
-}
-// ===================================================================
-
-class UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingStd::_Internal {
- public:
-  using HasBits = decltype(std::declval<UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingStd>()._impl_._has_bits_);
-  static constexpr ::int32_t kHasBitsOffset =
-    8 * PROTOBUF_FIELD_OFFSET(UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingStd, _impl_._has_bits_);
-  static const ::io::deephaven::proto::backplane::grpc::UpdateByWindowScale& reverse_window_scale(const UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingStd* msg);
-  static void set_has_reverse_window_scale(HasBits* has_bits) {
-    (*has_bits)[0] |= 1u;
-  }
-  static const ::io::deephaven::proto::backplane::grpc::UpdateByWindowScale& forward_window_scale(const UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingStd* msg);
-  static void set_has_forward_window_scale(HasBits* has_bits) {
-    (*has_bits)[0] |= 2u;
-  }
-};
-
-const ::io::deephaven::proto::backplane::grpc::UpdateByWindowScale& UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingStd::_Internal::reverse_window_scale(const UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingStd* msg) {
-  return *msg->_impl_.reverse_window_scale_;
-}
-const ::io::deephaven::proto::backplane::grpc::UpdateByWindowScale& UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingStd::_Internal::forward_window_scale(const UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingStd* msg) {
-  return *msg->_impl_.forward_window_scale_;
-}
-UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingStd::UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingStd(::google::protobuf::Arena* arena)
-    : ::google::protobuf::Message(arena) {
-  SharedCtor(arena);
-  // @@protoc_insertion_point(arena_constructor:io.deephaven.proto.backplane.grpc.UpdateByRequest.UpdateByOperation.UpdateByColumn.UpdateBySpec.UpdateByRollingStd)
-}
-inline PROTOBUF_NDEBUG_INLINE UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingStd::Impl_::Impl_(
-    ::google::protobuf::internal::InternalVisibility visibility, ::google::protobuf::Arena* arena,
-    const Impl_& from)
-      : _has_bits_{from._has_bits_},
-        _cached_size_{0} {}
-
-UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingStd::UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingStd(
-    ::google::protobuf::Arena* arena,
-    const UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingStd& from)
-    : ::google::protobuf::Message(arena) {
-  UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingStd* const _this = this;
-  (void)_this;
-  _internal_metadata_.MergeFrom<::google::protobuf::UnknownFieldSet>(
-      from._internal_metadata_);
-  new (&_impl_) Impl_(internal_visibility(), arena, from._impl_);
-  ::uint32_t cached_has_bits = _impl_._has_bits_[0];
-  _impl_.reverse_window_scale_ = (cached_has_bits & 0x00000001u)
-                ? CreateMaybeMessage<::io::deephaven::proto::backplane::grpc::UpdateByWindowScale>(arena, *from._impl_.reverse_window_scale_)
-                : nullptr;
-  _impl_.forward_window_scale_ = (cached_has_bits & 0x00000002u)
-                ? CreateMaybeMessage<::io::deephaven::proto::backplane::grpc::UpdateByWindowScale>(arena, *from._impl_.forward_window_scale_)
-                : nullptr;
-
-  // @@protoc_insertion_point(copy_constructor:io.deephaven.proto.backplane.grpc.UpdateByRequest.UpdateByOperation.UpdateByColumn.UpdateBySpec.UpdateByRollingStd)
-}
-inline PROTOBUF_NDEBUG_INLINE UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingStd::Impl_::Impl_(
-    ::google::protobuf::internal::InternalVisibility visibility,
-    ::google::protobuf::Arena* arena)
-      : _cached_size_{0} {}
-
-inline void UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingStd::SharedCtor(::_pb::Arena* arena) {
-  new (&_impl_) Impl_(internal_visibility(), arena);
-  ::memset(reinterpret_cast<char *>(&_impl_) +
-               offsetof(Impl_, reverse_window_scale_),
-           0,
-           offsetof(Impl_, forward_window_scale_) -
-               offsetof(Impl_, reverse_window_scale_) +
-               sizeof(Impl_::forward_window_scale_));
-}
-UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingStd::~UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingStd() {
-  // @@protoc_insertion_point(destructor:io.deephaven.proto.backplane.grpc.UpdateByRequest.UpdateByOperation.UpdateByColumn.UpdateBySpec.UpdateByRollingStd)
-  _internal_metadata_.Delete<::google::protobuf::UnknownFieldSet>();
-  SharedDtor();
-}
-inline void UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingStd::SharedDtor() {
-  ABSL_DCHECK(GetArena() == nullptr);
-  delete _impl_.reverse_window_scale_;
-  delete _impl_.forward_window_scale_;
-  _impl_.~Impl_();
-}
-
-PROTOBUF_NOINLINE void UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingStd::Clear() {
-// @@protoc_insertion_point(message_clear_start:io.deephaven.proto.backplane.grpc.UpdateByRequest.UpdateByOperation.UpdateByColumn.UpdateBySpec.UpdateByRollingStd)
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  ::uint32_t cached_has_bits = 0;
-  // Prevent compiler warnings about cached_has_bits being unused
-  (void) cached_has_bits;
-
-  cached_has_bits = _impl_._has_bits_[0];
-  if (cached_has_bits & 0x00000003u) {
-    if (cached_has_bits & 0x00000001u) {
-      ABSL_DCHECK(_impl_.reverse_window_scale_ != nullptr);
-      _impl_.reverse_window_scale_->Clear();
-    }
-    if (cached_has_bits & 0x00000002u) {
-      ABSL_DCHECK(_impl_.forward_window_scale_ != nullptr);
-      _impl_.forward_window_scale_->Clear();
-    }
-  }
-  _impl_._has_bits_.Clear();
-  _internal_metadata_.Clear<::google::protobuf::UnknownFieldSet>();
-}
-
-const char* UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingStd::_InternalParse(
-    const char* ptr, ::_pbi::ParseContext* ctx) {
-  ptr = ::_pbi::TcParser::ParseLoop(this, ptr, ctx, &_table_.header);
-  return ptr;
-}
-
-
-PROTOBUF_CONSTINIT PROTOBUF_ATTRIBUTE_INIT_PRIORITY1
-const ::_pbi::TcParseTable<1, 2, 2, 0, 2> UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingStd::_table_ = {
-  {
-    PROTOBUF_FIELD_OFFSET(UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingStd, _impl_._has_bits_),
-    0, // no _extensions_
-    2, 8,  // max_field_number, fast_idx_mask
-    offsetof(decltype(_table_), field_lookup_table),
-    4294967292,  // skipmap
-    offsetof(decltype(_table_), field_entries),
-    2,  // num_field_entries
-    2,  // num_aux_entries
-    offsetof(decltype(_table_), aux_entries),
-    &_UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingStd_default_instance_._instance,
-    ::_pbi::TcParser::GenericFallback,  // fallback
-  }, {{
-    // .io.deephaven.proto.backplane.grpc.UpdateByWindowScale forward_window_scale = 2;
-    {::_pbi::TcParser::FastMtS1,
-     {18, 1, 1, PROTOBUF_FIELD_OFFSET(UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingStd, _impl_.forward_window_scale_)}},
-    // .io.deephaven.proto.backplane.grpc.UpdateByWindowScale reverse_window_scale = 1;
-    {::_pbi::TcParser::FastMtS1,
-     {10, 0, 0, PROTOBUF_FIELD_OFFSET(UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingStd, _impl_.reverse_window_scale_)}},
-  }}, {{
-    65535, 65535
-  }}, {{
-    // .io.deephaven.proto.backplane.grpc.UpdateByWindowScale reverse_window_scale = 1;
-    {PROTOBUF_FIELD_OFFSET(UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingStd, _impl_.reverse_window_scale_), _Internal::kHasBitsOffset + 0, 0,
-    (0 | ::_fl::kFcOptional | ::_fl::kMessage | ::_fl::kTvTable)},
-    // .io.deephaven.proto.backplane.grpc.UpdateByWindowScale forward_window_scale = 2;
-    {PROTOBUF_FIELD_OFFSET(UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingStd, _impl_.forward_window_scale_), _Internal::kHasBitsOffset + 1, 1,
-    (0 | ::_fl::kFcOptional | ::_fl::kMessage | ::_fl::kTvTable)},
-  }}, {{
-    {::_pbi::TcParser::GetTable<::io::deephaven::proto::backplane::grpc::UpdateByWindowScale>()},
-    {::_pbi::TcParser::GetTable<::io::deephaven::proto::backplane::grpc::UpdateByWindowScale>()},
-  }}, {{
-  }},
-};
-
-::uint8_t* UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingStd::_InternalSerialize(
-    ::uint8_t* target,
-    ::google::protobuf::io::EpsCopyOutputStream* stream) const {
-  // @@protoc_insertion_point(serialize_to_array_start:io.deephaven.proto.backplane.grpc.UpdateByRequest.UpdateByOperation.UpdateByColumn.UpdateBySpec.UpdateByRollingStd)
-  ::uint32_t cached_has_bits = 0;
-  (void)cached_has_bits;
-
-  cached_has_bits = _impl_._has_bits_[0];
-  // .io.deephaven.proto.backplane.grpc.UpdateByWindowScale reverse_window_scale = 1;
-  if (cached_has_bits & 0x00000001u) {
-    target = ::google::protobuf::internal::WireFormatLite::InternalWriteMessage(
-        1, _Internal::reverse_window_scale(this),
-        _Internal::reverse_window_scale(this).GetCachedSize(), target, stream);
-  }
-
-  // .io.deephaven.proto.backplane.grpc.UpdateByWindowScale forward_window_scale = 2;
-  if (cached_has_bits & 0x00000002u) {
-    target = ::google::protobuf::internal::WireFormatLite::InternalWriteMessage(
-        2, _Internal::forward_window_scale(this),
-        _Internal::forward_window_scale(this).GetCachedSize(), target, stream);
-  }
-
-  if (PROTOBUF_PREDICT_FALSE(_internal_metadata_.have_unknown_fields())) {
-    target =
-        ::_pbi::WireFormat::InternalSerializeUnknownFieldsToArray(
-            _internal_metadata_.unknown_fields<::google::protobuf::UnknownFieldSet>(::google::protobuf::UnknownFieldSet::default_instance), target, stream);
-  }
-  // @@protoc_insertion_point(serialize_to_array_end:io.deephaven.proto.backplane.grpc.UpdateByRequest.UpdateByOperation.UpdateByColumn.UpdateBySpec.UpdateByRollingStd)
-  return target;
-}
-
-::size_t UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingStd::ByteSizeLong() const {
-// @@protoc_insertion_point(message_byte_size_start:io.deephaven.proto.backplane.grpc.UpdateByRequest.UpdateByOperation.UpdateByColumn.UpdateBySpec.UpdateByRollingStd)
-  ::size_t total_size = 0;
-
-  ::uint32_t cached_has_bits = 0;
-  // Prevent compiler warnings about cached_has_bits being unused
-  (void) cached_has_bits;
-
-  cached_has_bits = _impl_._has_bits_[0];
-  if (cached_has_bits & 0x00000003u) {
-    // .io.deephaven.proto.backplane.grpc.UpdateByWindowScale reverse_window_scale = 1;
-    if (cached_has_bits & 0x00000001u) {
-      total_size +=
-          1 + ::google::protobuf::internal::WireFormatLite::MessageSize(*_impl_.reverse_window_scale_);
-    }
-
-    // .io.deephaven.proto.backplane.grpc.UpdateByWindowScale forward_window_scale = 2;
-    if (cached_has_bits & 0x00000002u) {
-      total_size +=
-          1 + ::google::protobuf::internal::WireFormatLite::MessageSize(*_impl_.forward_window_scale_);
-    }
-
-  }
-  return MaybeComputeUnknownFieldsSize(total_size, &_impl_._cached_size_);
-}
-
-const ::google::protobuf::Message::ClassData UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingStd::_class_data_ = {
-    UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingStd::MergeImpl,
-    nullptr,  // OnDemandRegisterArenaDtor
-};
-const ::google::protobuf::Message::ClassData* UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingStd::GetClassData() const {
-  return &_class_data_;
-}
-
-void UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingStd::MergeImpl(::google::protobuf::Message& to_msg, const ::google::protobuf::Message& from_msg) {
-  auto* const _this = static_cast<UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingStd*>(&to_msg);
-  auto& from = static_cast<const UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingStd&>(from_msg);
-  // @@protoc_insertion_point(class_specific_merge_from_start:io.deephaven.proto.backplane.grpc.UpdateByRequest.UpdateByOperation.UpdateByColumn.UpdateBySpec.UpdateByRollingStd)
-  ABSL_DCHECK_NE(&from, _this);
-  ::uint32_t cached_has_bits = 0;
-  (void) cached_has_bits;
-
-  cached_has_bits = from._impl_._has_bits_[0];
-  if (cached_has_bits & 0x00000003u) {
-    if (cached_has_bits & 0x00000001u) {
-      _this->_internal_mutable_reverse_window_scale()->::io::deephaven::proto::backplane::grpc::UpdateByWindowScale::MergeFrom(
-          from._internal_reverse_window_scale());
-    }
-    if (cached_has_bits & 0x00000002u) {
-      _this->_internal_mutable_forward_window_scale()->::io::deephaven::proto::backplane::grpc::UpdateByWindowScale::MergeFrom(
-          from._internal_forward_window_scale());
-    }
-  }
-  _this->_internal_metadata_.MergeFrom<::google::protobuf::UnknownFieldSet>(from._internal_metadata_);
-}
-
-void UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingStd::CopyFrom(const UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingStd& from) {
-// @@protoc_insertion_point(class_specific_copy_from_start:io.deephaven.proto.backplane.grpc.UpdateByRequest.UpdateByOperation.UpdateByColumn.UpdateBySpec.UpdateByRollingStd)
-  if (&from == this) return;
-  Clear();
-  MergeFrom(from);
-}
-
-PROTOBUF_NOINLINE bool UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingStd::IsInitialized() const {
-  return true;
-}
-
-::_pbi::CachedSize* UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingStd::AccessCachedSize() const {
-  return &_impl_._cached_size_;
-}
-void UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingStd::InternalSwap(UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingStd* PROTOBUF_RESTRICT other) {
-  using std::swap;
-  _internal_metadata_.InternalSwap(&other->_internal_metadata_);
-  swap(_impl_._has_bits_[0], other->_impl_._has_bits_[0]);
-  ::google::protobuf::internal::memswap<
-      PROTOBUF_FIELD_OFFSET(UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingStd, _impl_.forward_window_scale_)
-      + sizeof(UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingStd::_impl_.forward_window_scale_)
-      - PROTOBUF_FIELD_OFFSET(UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingStd, _impl_.reverse_window_scale_)>(
-          reinterpret_cast<char*>(&_impl_.reverse_window_scale_),
-          reinterpret_cast<char*>(&other->_impl_.reverse_window_scale_));
-}
-
-::google::protobuf::Metadata UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingStd::GetMetadata() const {
-  return ::_pbi::AssignDescriptors(
-      &descriptor_table_deephaven_2fproto_2ftable_2eproto_getter, &descriptor_table_deephaven_2fproto_2ftable_2eproto_once,
-      file_level_metadata_deephaven_2fproto_2ftable_2eproto[34]);
-}
-// ===================================================================
-
-class UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingWAvg::_Internal {
- public:
-  using HasBits = decltype(std::declval<UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingWAvg>()._impl_._has_bits_);
-  static constexpr ::int32_t kHasBitsOffset =
-    8 * PROTOBUF_FIELD_OFFSET(UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingWAvg, _impl_._has_bits_);
-  static const ::io::deephaven::proto::backplane::grpc::UpdateByWindowScale& reverse_window_scale(const UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingWAvg* msg);
-  static void set_has_reverse_window_scale(HasBits* has_bits) {
-    (*has_bits)[0] |= 1u;
-  }
-  static const ::io::deephaven::proto::backplane::grpc::UpdateByWindowScale& forward_window_scale(const UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingWAvg* msg);
-  static void set_has_forward_window_scale(HasBits* has_bits) {
-    (*has_bits)[0] |= 2u;
-  }
-};
-
-const ::io::deephaven::proto::backplane::grpc::UpdateByWindowScale& UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingWAvg::_Internal::reverse_window_scale(const UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingWAvg* msg) {
-  return *msg->_impl_.reverse_window_scale_;
-}
-const ::io::deephaven::proto::backplane::grpc::UpdateByWindowScale& UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingWAvg::_Internal::forward_window_scale(const UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingWAvg* msg) {
-  return *msg->_impl_.forward_window_scale_;
-}
-UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingWAvg::UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingWAvg(::google::protobuf::Arena* arena)
-    : ::google::protobuf::Message(arena) {
-  SharedCtor(arena);
-  // @@protoc_insertion_point(arena_constructor:io.deephaven.proto.backplane.grpc.UpdateByRequest.UpdateByOperation.UpdateByColumn.UpdateBySpec.UpdateByRollingWAvg)
-}
-inline PROTOBUF_NDEBUG_INLINE UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingWAvg::Impl_::Impl_(
-    ::google::protobuf::internal::InternalVisibility visibility, ::google::protobuf::Arena* arena,
-    const Impl_& from)
-      : _has_bits_{from._has_bits_},
-        _cached_size_{0},
-        weight_column_(arena, from.weight_column_) {}
-
-UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingWAvg::UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingWAvg(
-    ::google::protobuf::Arena* arena,
-    const UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingWAvg& from)
-    : ::google::protobuf::Message(arena) {
-  UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingWAvg* const _this = this;
-  (void)_this;
-  _internal_metadata_.MergeFrom<::google::protobuf::UnknownFieldSet>(
-      from._internal_metadata_);
-  new (&_impl_) Impl_(internal_visibility(), arena, from._impl_);
-  ::uint32_t cached_has_bits = _impl_._has_bits_[0];
-  _impl_.reverse_window_scale_ = (cached_has_bits & 0x00000001u)
-                ? CreateMaybeMessage<::io::deephaven::proto::backplane::grpc::UpdateByWindowScale>(arena, *from._impl_.reverse_window_scale_)
-                : nullptr;
-  _impl_.forward_window_scale_ = (cached_has_bits & 0x00000002u)
-                ? CreateMaybeMessage<::io::deephaven::proto::backplane::grpc::UpdateByWindowScale>(arena, *from._impl_.forward_window_scale_)
-                : nullptr;
-
-  // @@protoc_insertion_point(copy_constructor:io.deephaven.proto.backplane.grpc.UpdateByRequest.UpdateByOperation.UpdateByColumn.UpdateBySpec.UpdateByRollingWAvg)
-}
-inline PROTOBUF_NDEBUG_INLINE UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingWAvg::Impl_::Impl_(
-    ::google::protobuf::internal::InternalVisibility visibility,
-    ::google::protobuf::Arena* arena)
-      : _cached_size_{0},
-        weight_column_(arena) {}
-
-inline void UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingWAvg::SharedCtor(::_pb::Arena* arena) {
-  new (&_impl_) Impl_(internal_visibility(), arena);
-  ::memset(reinterpret_cast<char *>(&_impl_) +
-               offsetof(Impl_, reverse_window_scale_),
-           0,
-           offsetof(Impl_, forward_window_scale_) -
-               offsetof(Impl_, reverse_window_scale_) +
-               sizeof(Impl_::forward_window_scale_));
-}
-UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingWAvg::~UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingWAvg() {
-  // @@protoc_insertion_point(destructor:io.deephaven.proto.backplane.grpc.UpdateByRequest.UpdateByOperation.UpdateByColumn.UpdateBySpec.UpdateByRollingWAvg)
-  _internal_metadata_.Delete<::google::protobuf::UnknownFieldSet>();
-  SharedDtor();
-}
-inline void UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingWAvg::SharedDtor() {
-  ABSL_DCHECK(GetArena() == nullptr);
-  _impl_.weight_column_.Destroy();
-  delete _impl_.reverse_window_scale_;
-  delete _impl_.forward_window_scale_;
-  _impl_.~Impl_();
-}
-
-PROTOBUF_NOINLINE void UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingWAvg::Clear() {
-// @@protoc_insertion_point(message_clear_start:io.deephaven.proto.backplane.grpc.UpdateByRequest.UpdateByOperation.UpdateByColumn.UpdateBySpec.UpdateByRollingWAvg)
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  ::uint32_t cached_has_bits = 0;
-  // Prevent compiler warnings about cached_has_bits being unused
-  (void) cached_has_bits;
-
-  _impl_.weight_column_.ClearToEmpty();
-  cached_has_bits = _impl_._has_bits_[0];
-  if (cached_has_bits & 0x00000003u) {
-    if (cached_has_bits & 0x00000001u) {
-      ABSL_DCHECK(_impl_.reverse_window_scale_ != nullptr);
-      _impl_.reverse_window_scale_->Clear();
-    }
-    if (cached_has_bits & 0x00000002u) {
-      ABSL_DCHECK(_impl_.forward_window_scale_ != nullptr);
-      _impl_.forward_window_scale_->Clear();
-    }
-  }
-  _impl_._has_bits_.Clear();
-  _internal_metadata_.Clear<::google::protobuf::UnknownFieldSet>();
-}
-
-const char* UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingWAvg::_InternalParse(
-    const char* ptr, ::_pbi::ParseContext* ctx) {
-  ptr = ::_pbi::TcParser::ParseLoop(this, ptr, ctx, &_table_.header);
-  return ptr;
-}
-
-
-PROTOBUF_CONSTINIT PROTOBUF_ATTRIBUTE_INIT_PRIORITY1
-const ::_pbi::TcParseTable<2, 3, 2, 137, 2> UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingWAvg::_table_ = {
-  {
-    PROTOBUF_FIELD_OFFSET(UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingWAvg, _impl_._has_bits_),
-    0, // no _extensions_
-    3, 24,  // max_field_number, fast_idx_mask
-    offsetof(decltype(_table_), field_lookup_table),
-    4294967288,  // skipmap
-    offsetof(decltype(_table_), field_entries),
-    3,  // num_field_entries
-    2,  // num_aux_entries
-    offsetof(decltype(_table_), aux_entries),
-    &_UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingWAvg_default_instance_._instance,
-    ::_pbi::TcParser::GenericFallback,  // fallback
-  }, {{
-    {::_pbi::TcParser::MiniParse, {}},
-    // .io.deephaven.proto.backplane.grpc.UpdateByWindowScale reverse_window_scale = 1;
-    {::_pbi::TcParser::FastMtS1,
-     {10, 0, 0, PROTOBUF_FIELD_OFFSET(UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingWAvg, _impl_.reverse_window_scale_)}},
-    // .io.deephaven.proto.backplane.grpc.UpdateByWindowScale forward_window_scale = 2;
-    {::_pbi::TcParser::FastMtS1,
-     {18, 1, 1, PROTOBUF_FIELD_OFFSET(UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingWAvg, _impl_.forward_window_scale_)}},
-    // string weight_column = 3;
-    {::_pbi::TcParser::FastUS1,
-     {26, 63, 0, PROTOBUF_FIELD_OFFSET(UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingWAvg, _impl_.weight_column_)}},
-  }}, {{
-    65535, 65535
-  }}, {{
-    // .io.deephaven.proto.backplane.grpc.UpdateByWindowScale reverse_window_scale = 1;
-    {PROTOBUF_FIELD_OFFSET(UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingWAvg, _impl_.reverse_window_scale_), _Internal::kHasBitsOffset + 0, 0,
-    (0 | ::_fl::kFcOptional | ::_fl::kMessage | ::_fl::kTvTable)},
-    // .io.deephaven.proto.backplane.grpc.UpdateByWindowScale forward_window_scale = 2;
-    {PROTOBUF_FIELD_OFFSET(UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingWAvg, _impl_.forward_window_scale_), _Internal::kHasBitsOffset + 1, 1,
-    (0 | ::_fl::kFcOptional | ::_fl::kMessage | ::_fl::kTvTable)},
-    // string weight_column = 3;
-    {PROTOBUF_FIELD_OFFSET(UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingWAvg, _impl_.weight_column_), -1, 0,
-    (0 | ::_fl::kFcSingular | ::_fl::kUtf8String | ::_fl::kRepAString)},
-  }}, {{
-    {::_pbi::TcParser::GetTable<::io::deephaven::proto::backplane::grpc::UpdateByWindowScale>()},
-    {::_pbi::TcParser::GetTable<::io::deephaven::proto::backplane::grpc::UpdateByWindowScale>()},
-  }}, {{
-    "\163\0\0\15\0\0\0\0"
-    "io.deephaven.proto.backplane.grpc.UpdateByRequest.UpdateByOperation.UpdateByColumn.UpdateBySpec.UpdateByRollingWAvg"
-    "weight_column"
-  }},
-};
-
-::uint8_t* UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingWAvg::_InternalSerialize(
-    ::uint8_t* target,
-    ::google::protobuf::io::EpsCopyOutputStream* stream) const {
-  // @@protoc_insertion_point(serialize_to_array_start:io.deephaven.proto.backplane.grpc.UpdateByRequest.UpdateByOperation.UpdateByColumn.UpdateBySpec.UpdateByRollingWAvg)
-  ::uint32_t cached_has_bits = 0;
-  (void)cached_has_bits;
-
-  cached_has_bits = _impl_._has_bits_[0];
-  // .io.deephaven.proto.backplane.grpc.UpdateByWindowScale reverse_window_scale = 1;
-  if (cached_has_bits & 0x00000001u) {
-    target = ::google::protobuf::internal::WireFormatLite::InternalWriteMessage(
-        1, _Internal::reverse_window_scale(this),
-        _Internal::reverse_window_scale(this).GetCachedSize(), target, stream);
-  }
-
-  // .io.deephaven.proto.backplane.grpc.UpdateByWindowScale forward_window_scale = 2;
-  if (cached_has_bits & 0x00000002u) {
-    target = ::google::protobuf::internal::WireFormatLite::InternalWriteMessage(
-        2, _Internal::forward_window_scale(this),
-        _Internal::forward_window_scale(this).GetCachedSize(), target, stream);
-  }
-
-  // string weight_column = 3;
-  if (!this->_internal_weight_column().empty()) {
-    const std::string& _s = this->_internal_weight_column();
-    ::google::protobuf::internal::WireFormatLite::VerifyUtf8String(
-        _s.data(), static_cast<int>(_s.length()), ::google::protobuf::internal::WireFormatLite::SERIALIZE, "io.deephaven.proto.backplane.grpc.UpdateByRequest.UpdateByOperation.UpdateByColumn.UpdateBySpec.UpdateByRollingWAvg.weight_column");
-    target = stream->WriteStringMaybeAliased(3, _s, target);
-  }
-
-  if (PROTOBUF_PREDICT_FALSE(_internal_metadata_.have_unknown_fields())) {
-    target =
-        ::_pbi::WireFormat::InternalSerializeUnknownFieldsToArray(
-            _internal_metadata_.unknown_fields<::google::protobuf::UnknownFieldSet>(::google::protobuf::UnknownFieldSet::default_instance), target, stream);
-  }
-  // @@protoc_insertion_point(serialize_to_array_end:io.deephaven.proto.backplane.grpc.UpdateByRequest.UpdateByOperation.UpdateByColumn.UpdateBySpec.UpdateByRollingWAvg)
-  return target;
-}
-
-::size_t UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingWAvg::ByteSizeLong() const {
-// @@protoc_insertion_point(message_byte_size_start:io.deephaven.proto.backplane.grpc.UpdateByRequest.UpdateByOperation.UpdateByColumn.UpdateBySpec.UpdateByRollingWAvg)
-  ::size_t total_size = 0;
-
-  ::uint32_t cached_has_bits = 0;
-  // Prevent compiler warnings about cached_has_bits being unused
-  (void) cached_has_bits;
-
-  // string weight_column = 3;
-  if (!this->_internal_weight_column().empty()) {
-    total_size += 1 + ::google::protobuf::internal::WireFormatLite::StringSize(
-                                    this->_internal_weight_column());
-  }
-
-  cached_has_bits = _impl_._has_bits_[0];
-  if (cached_has_bits & 0x00000003u) {
-    // .io.deephaven.proto.backplane.grpc.UpdateByWindowScale reverse_window_scale = 1;
-    if (cached_has_bits & 0x00000001u) {
-      total_size +=
-          1 + ::google::protobuf::internal::WireFormatLite::MessageSize(*_impl_.reverse_window_scale_);
-    }
-
-    // .io.deephaven.proto.backplane.grpc.UpdateByWindowScale forward_window_scale = 2;
-    if (cached_has_bits & 0x00000002u) {
-      total_size +=
-          1 + ::google::protobuf::internal::WireFormatLite::MessageSize(*_impl_.forward_window_scale_);
-    }
-
-  }
-  return MaybeComputeUnknownFieldsSize(total_size, &_impl_._cached_size_);
-}
-
-const ::google::protobuf::Message::ClassData UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingWAvg::_class_data_ = {
-    UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingWAvg::MergeImpl,
-    nullptr,  // OnDemandRegisterArenaDtor
-};
-const ::google::protobuf::Message::ClassData* UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingWAvg::GetClassData() const {
-  return &_class_data_;
-}
-
-void UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingWAvg::MergeImpl(::google::protobuf::Message& to_msg, const ::google::protobuf::Message& from_msg) {
-  auto* const _this = static_cast<UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingWAvg*>(&to_msg);
-  auto& from = static_cast<const UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingWAvg&>(from_msg);
-  // @@protoc_insertion_point(class_specific_merge_from_start:io.deephaven.proto.backplane.grpc.UpdateByRequest.UpdateByOperation.UpdateByColumn.UpdateBySpec.UpdateByRollingWAvg)
-  ABSL_DCHECK_NE(&from, _this);
-  ::uint32_t cached_has_bits = 0;
-  (void) cached_has_bits;
-
-  if (!from._internal_weight_column().empty()) {
-    _this->_internal_set_weight_column(from._internal_weight_column());
-  }
-  cached_has_bits = from._impl_._has_bits_[0];
-  if (cached_has_bits & 0x00000003u) {
-    if (cached_has_bits & 0x00000001u) {
-      _this->_internal_mutable_reverse_window_scale()->::io::deephaven::proto::backplane::grpc::UpdateByWindowScale::MergeFrom(
-          from._internal_reverse_window_scale());
-    }
-    if (cached_has_bits & 0x00000002u) {
-      _this->_internal_mutable_forward_window_scale()->::io::deephaven::proto::backplane::grpc::UpdateByWindowScale::MergeFrom(
-          from._internal_forward_window_scale());
-    }
-  }
-  _this->_internal_metadata_.MergeFrom<::google::protobuf::UnknownFieldSet>(from._internal_metadata_);
-}
-
-void UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingWAvg::CopyFrom(const UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingWAvg& from) {
-// @@protoc_insertion_point(class_specific_copy_from_start:io.deephaven.proto.backplane.grpc.UpdateByRequest.UpdateByOperation.UpdateByColumn.UpdateBySpec.UpdateByRollingWAvg)
-  if (&from == this) return;
-  Clear();
-  MergeFrom(from);
-}
-
-PROTOBUF_NOINLINE bool UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingWAvg::IsInitialized() const {
-  return true;
-}
-
-::_pbi::CachedSize* UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingWAvg::AccessCachedSize() const {
-  return &_impl_._cached_size_;
-}
-void UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingWAvg::InternalSwap(UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingWAvg* PROTOBUF_RESTRICT other) {
-  using std::swap;
-  auto* arena = GetArena();
-  ABSL_DCHECK_EQ(arena, other->GetArena());
-  _internal_metadata_.InternalSwap(&other->_internal_metadata_);
-  swap(_impl_._has_bits_[0], other->_impl_._has_bits_[0]);
-  ::_pbi::ArenaStringPtr::InternalSwap(&_impl_.weight_column_, &other->_impl_.weight_column_, arena);
-  ::google::protobuf::internal::memswap<
-      PROTOBUF_FIELD_OFFSET(UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingWAvg, _impl_.forward_window_scale_)
-      + sizeof(UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingWAvg::_impl_.forward_window_scale_)
-      - PROTOBUF_FIELD_OFFSET(UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingWAvg, _impl_.reverse_window_scale_)>(
-          reinterpret_cast<char*>(&_impl_.reverse_window_scale_),
-          reinterpret_cast<char*>(&other->_impl_.reverse_window_scale_));
-}
-
-::google::protobuf::Metadata UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingWAvg::GetMetadata() const {
-  return ::_pbi::AssignDescriptors(
-      &descriptor_table_deephaven_2fproto_2ftable_2eproto_getter, &descriptor_table_deephaven_2fproto_2ftable_2eproto_once,
-      file_level_metadata_deephaven_2fproto_2ftable_2eproto[35]);
-}
-// ===================================================================
-
-class UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingFormula::_Internal {
- public:
-  using HasBits = decltype(std::declval<UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingFormula>()._impl_._has_bits_);
-  static constexpr ::int32_t kHasBitsOffset =
-    8 * PROTOBUF_FIELD_OFFSET(UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingFormula, _impl_._has_bits_);
-  static const ::io::deephaven::proto::backplane::grpc::UpdateByWindowScale& reverse_window_scale(const UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingFormula* msg);
-  static void set_has_reverse_window_scale(HasBits* has_bits) {
-    (*has_bits)[0] |= 1u;
-  }
-  static const ::io::deephaven::proto::backplane::grpc::UpdateByWindowScale& forward_window_scale(const UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingFormula* msg);
-  static void set_has_forward_window_scale(HasBits* has_bits) {
-    (*has_bits)[0] |= 2u;
-  }
-};
-
-const ::io::deephaven::proto::backplane::grpc::UpdateByWindowScale& UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingFormula::_Internal::reverse_window_scale(const UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingFormula* msg) {
-  return *msg->_impl_.reverse_window_scale_;
-}
-const ::io::deephaven::proto::backplane::grpc::UpdateByWindowScale& UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingFormula::_Internal::forward_window_scale(const UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingFormula* msg) {
-  return *msg->_impl_.forward_window_scale_;
-}
-UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingFormula::UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingFormula(::google::protobuf::Arena* arena)
-    : ::google::protobuf::Message(arena) {
-  SharedCtor(arena);
-  // @@protoc_insertion_point(arena_constructor:io.deephaven.proto.backplane.grpc.UpdateByRequest.UpdateByOperation.UpdateByColumn.UpdateBySpec.UpdateByRollingFormula)
-}
-inline PROTOBUF_NDEBUG_INLINE UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingFormula::Impl_::Impl_(
-    ::google::protobuf::internal::InternalVisibility visibility, ::google::protobuf::Arena* arena,
-    const Impl_& from)
-      : _has_bits_{from._has_bits_},
-        _cached_size_{0},
-        formula_(arena, from.formula_),
-        param_token_(arena, from.param_token_) {}
-
-UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingFormula::UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingFormula(
-    ::google::protobuf::Arena* arena,
-    const UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingFormula& from)
-    : ::google::protobuf::Message(arena) {
-  UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingFormula* const _this = this;
-  (void)_this;
-  _internal_metadata_.MergeFrom<::google::protobuf::UnknownFieldSet>(
-      from._internal_metadata_);
-  new (&_impl_) Impl_(internal_visibility(), arena, from._impl_);
-  ::uint32_t cached_has_bits = _impl_._has_bits_[0];
-  _impl_.reverse_window_scale_ = (cached_has_bits & 0x00000001u)
-                ? CreateMaybeMessage<::io::deephaven::proto::backplane::grpc::UpdateByWindowScale>(arena, *from._impl_.reverse_window_scale_)
-                : nullptr;
-  _impl_.forward_window_scale_ = (cached_has_bits & 0x00000002u)
-                ? CreateMaybeMessage<::io::deephaven::proto::backplane::grpc::UpdateByWindowScale>(arena, *from._impl_.forward_window_scale_)
-                : nullptr;
-
-  // @@protoc_insertion_point(copy_constructor:io.deephaven.proto.backplane.grpc.UpdateByRequest.UpdateByOperation.UpdateByColumn.UpdateBySpec.UpdateByRollingFormula)
-}
-inline PROTOBUF_NDEBUG_INLINE UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingFormula::Impl_::Impl_(
-    ::google::protobuf::internal::InternalVisibility visibility,
-    ::google::protobuf::Arena* arena)
-      : _cached_size_{0},
-        formula_(arena),
-        param_token_(arena) {}
-
-inline void UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingFormula::SharedCtor(::_pb::Arena* arena) {
-  new (&_impl_) Impl_(internal_visibility(), arena);
-  ::memset(reinterpret_cast<char *>(&_impl_) +
-               offsetof(Impl_, reverse_window_scale_),
-           0,
-           offsetof(Impl_, forward_window_scale_) -
-               offsetof(Impl_, reverse_window_scale_) +
-               sizeof(Impl_::forward_window_scale_));
-}
-UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingFormula::~UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingFormula() {
-  // @@protoc_insertion_point(destructor:io.deephaven.proto.backplane.grpc.UpdateByRequest.UpdateByOperation.UpdateByColumn.UpdateBySpec.UpdateByRollingFormula)
-  _internal_metadata_.Delete<::google::protobuf::UnknownFieldSet>();
-  SharedDtor();
-}
-inline void UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingFormula::SharedDtor() {
-  ABSL_DCHECK(GetArena() == nullptr);
-  _impl_.formula_.Destroy();
-  _impl_.param_token_.Destroy();
-  delete _impl_.reverse_window_scale_;
-  delete _impl_.forward_window_scale_;
-  _impl_.~Impl_();
-}
-
-PROTOBUF_NOINLINE void UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingFormula::Clear() {
-// @@protoc_insertion_point(message_clear_start:io.deephaven.proto.backplane.grpc.UpdateByRequest.UpdateByOperation.UpdateByColumn.UpdateBySpec.UpdateByRollingFormula)
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  ::uint32_t cached_has_bits = 0;
-  // Prevent compiler warnings about cached_has_bits being unused
-  (void) cached_has_bits;
-
-  _impl_.formula_.ClearToEmpty();
-  _impl_.param_token_.ClearToEmpty();
-  cached_has_bits = _impl_._has_bits_[0];
-  if (cached_has_bits & 0x00000003u) {
-    if (cached_has_bits & 0x00000001u) {
-      ABSL_DCHECK(_impl_.reverse_window_scale_ != nullptr);
-      _impl_.reverse_window_scale_->Clear();
-    }
-    if (cached_has_bits & 0x00000002u) {
-      ABSL_DCHECK(_impl_.forward_window_scale_ != nullptr);
-      _impl_.forward_window_scale_->Clear();
-    }
-  }
-  _impl_._has_bits_.Clear();
-  _internal_metadata_.Clear<::google::protobuf::UnknownFieldSet>();
-}
-
-const char* UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingFormula::_InternalParse(
-    const char* ptr, ::_pbi::ParseContext* ctx) {
-  ptr = ::_pbi::TcParser::ParseLoop(this, ptr, ctx, &_table_.header);
-  return ptr;
-}
-
-
-PROTOBUF_CONSTINIT PROTOBUF_ATTRIBUTE_INIT_PRIORITY1
-const ::_pbi::TcParseTable<2, 4, 2, 145, 2> UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingFormula::_table_ = {
-  {
-    PROTOBUF_FIELD_OFFSET(UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingFormula, _impl_._has_bits_),
-    0, // no _extensions_
-    4, 24,  // max_field_number, fast_idx_mask
-    offsetof(decltype(_table_), field_lookup_table),
-    4294967280,  // skipmap
-    offsetof(decltype(_table_), field_entries),
-    4,  // num_field_entries
-    2,  // num_aux_entries
-    offsetof(decltype(_table_), aux_entries),
-    &_UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingFormula_default_instance_._instance,
-    ::_pbi::TcParser::GenericFallback,  // fallback
-  }, {{
-    // string param_token = 4;
-    {::_pbi::TcParser::FastUS1,
-     {34, 63, 0, PROTOBUF_FIELD_OFFSET(UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingFormula, _impl_.param_token_)}},
-    // .io.deephaven.proto.backplane.grpc.UpdateByWindowScale reverse_window_scale = 1;
-    {::_pbi::TcParser::FastMtS1,
-     {10, 0, 0, PROTOBUF_FIELD_OFFSET(UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingFormula, _impl_.reverse_window_scale_)}},
-    // .io.deephaven.proto.backplane.grpc.UpdateByWindowScale forward_window_scale = 2;
-    {::_pbi::TcParser::FastMtS1,
-     {18, 1, 1, PROTOBUF_FIELD_OFFSET(UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingFormula, _impl_.forward_window_scale_)}},
-    // string formula = 3;
-    {::_pbi::TcParser::FastUS1,
-     {26, 63, 0, PROTOBUF_FIELD_OFFSET(UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingFormula, _impl_.formula_)}},
-  }}, {{
-    65535, 65535
-  }}, {{
-    // .io.deephaven.proto.backplane.grpc.UpdateByWindowScale reverse_window_scale = 1;
-    {PROTOBUF_FIELD_OFFSET(UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingFormula, _impl_.reverse_window_scale_), _Internal::kHasBitsOffset + 0, 0,
-    (0 | ::_fl::kFcOptional | ::_fl::kMessage | ::_fl::kTvTable)},
-    // .io.deephaven.proto.backplane.grpc.UpdateByWindowScale forward_window_scale = 2;
-    {PROTOBUF_FIELD_OFFSET(UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingFormula, _impl_.forward_window_scale_), _Internal::kHasBitsOffset + 1, 1,
-    (0 | ::_fl::kFcOptional | ::_fl::kMessage | ::_fl::kTvTable)},
-    // string formula = 3;
-    {PROTOBUF_FIELD_OFFSET(UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingFormula, _impl_.formula_), -1, 0,
-    (0 | ::_fl::kFcSingular | ::_fl::kUtf8String | ::_fl::kRepAString)},
-    // string param_token = 4;
-    {PROTOBUF_FIELD_OFFSET(UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingFormula, _impl_.param_token_), -1, 0,
-    (0 | ::_fl::kFcSingular | ::_fl::kUtf8String | ::_fl::kRepAString)},
-  }}, {{
-    {::_pbi::TcParser::GetTable<::io::deephaven::proto::backplane::grpc::UpdateByWindowScale>()},
-    {::_pbi::TcParser::GetTable<::io::deephaven::proto::backplane::grpc::UpdateByWindowScale>()},
-  }}, {{
-    "\166\0\0\7\13\0\0\0"
-    "io.deephaven.proto.backplane.grpc.UpdateByRequest.UpdateByOperation.UpdateByColumn.UpdateBySpec.UpdateByRollingFormula"
-    "formula"
-    "param_token"
-  }},
-};
-
-::uint8_t* UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingFormula::_InternalSerialize(
-    ::uint8_t* target,
-    ::google::protobuf::io::EpsCopyOutputStream* stream) const {
-  // @@protoc_insertion_point(serialize_to_array_start:io.deephaven.proto.backplane.grpc.UpdateByRequest.UpdateByOperation.UpdateByColumn.UpdateBySpec.UpdateByRollingFormula)
-  ::uint32_t cached_has_bits = 0;
-  (void)cached_has_bits;
-
-  cached_has_bits = _impl_._has_bits_[0];
-  // .io.deephaven.proto.backplane.grpc.UpdateByWindowScale reverse_window_scale = 1;
-  if (cached_has_bits & 0x00000001u) {
-    target = ::google::protobuf::internal::WireFormatLite::InternalWriteMessage(
-        1, _Internal::reverse_window_scale(this),
-        _Internal::reverse_window_scale(this).GetCachedSize(), target, stream);
-  }
-
-  // .io.deephaven.proto.backplane.grpc.UpdateByWindowScale forward_window_scale = 2;
-  if (cached_has_bits & 0x00000002u) {
-    target = ::google::protobuf::internal::WireFormatLite::InternalWriteMessage(
-        2, _Internal::forward_window_scale(this),
-        _Internal::forward_window_scale(this).GetCachedSize(), target, stream);
-  }
-
-  // string formula = 3;
-  if (!this->_internal_formula().empty()) {
-    const std::string& _s = this->_internal_formula();
-    ::google::protobuf::internal::WireFormatLite::VerifyUtf8String(
-        _s.data(), static_cast<int>(_s.length()), ::google::protobuf::internal::WireFormatLite::SERIALIZE, "io.deephaven.proto.backplane.grpc.UpdateByRequest.UpdateByOperation.UpdateByColumn.UpdateBySpec.UpdateByRollingFormula.formula");
-    target = stream->WriteStringMaybeAliased(3, _s, target);
-  }
-
-  // string param_token = 4;
-  if (!this->_internal_param_token().empty()) {
-    const std::string& _s = this->_internal_param_token();
-    ::google::protobuf::internal::WireFormatLite::VerifyUtf8String(
-        _s.data(), static_cast<int>(_s.length()), ::google::protobuf::internal::WireFormatLite::SERIALIZE, "io.deephaven.proto.backplane.grpc.UpdateByRequest.UpdateByOperation.UpdateByColumn.UpdateBySpec.UpdateByRollingFormula.param_token");
-    target = stream->WriteStringMaybeAliased(4, _s, target);
-  }
-
-  if (PROTOBUF_PREDICT_FALSE(_internal_metadata_.have_unknown_fields())) {
-    target =
-        ::_pbi::WireFormat::InternalSerializeUnknownFieldsToArray(
-            _internal_metadata_.unknown_fields<::google::protobuf::UnknownFieldSet>(::google::protobuf::UnknownFieldSet::default_instance), target, stream);
-  }
-  // @@protoc_insertion_point(serialize_to_array_end:io.deephaven.proto.backplane.grpc.UpdateByRequest.UpdateByOperation.UpdateByColumn.UpdateBySpec.UpdateByRollingFormula)
-  return target;
-}
-
-::size_t UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingFormula::ByteSizeLong() const {
-// @@protoc_insertion_point(message_byte_size_start:io.deephaven.proto.backplane.grpc.UpdateByRequest.UpdateByOperation.UpdateByColumn.UpdateBySpec.UpdateByRollingFormula)
-  ::size_t total_size = 0;
-
-  ::uint32_t cached_has_bits = 0;
-  // Prevent compiler warnings about cached_has_bits being unused
-  (void) cached_has_bits;
-
-  // string formula = 3;
-  if (!this->_internal_formula().empty()) {
-    total_size += 1 + ::google::protobuf::internal::WireFormatLite::StringSize(
-                                    this->_internal_formula());
-  }
-
-  // string param_token = 4;
-  if (!this->_internal_param_token().empty()) {
-    total_size += 1 + ::google::protobuf::internal::WireFormatLite::StringSize(
-                                    this->_internal_param_token());
-  }
-
-  cached_has_bits = _impl_._has_bits_[0];
-  if (cached_has_bits & 0x00000003u) {
-    // .io.deephaven.proto.backplane.grpc.UpdateByWindowScale reverse_window_scale = 1;
-    if (cached_has_bits & 0x00000001u) {
-      total_size +=
-          1 + ::google::protobuf::internal::WireFormatLite::MessageSize(*_impl_.reverse_window_scale_);
-    }
-
-    // .io.deephaven.proto.backplane.grpc.UpdateByWindowScale forward_window_scale = 2;
-    if (cached_has_bits & 0x00000002u) {
-      total_size +=
-          1 + ::google::protobuf::internal::WireFormatLite::MessageSize(*_impl_.forward_window_scale_);
-    }
-
-  }
-  return MaybeComputeUnknownFieldsSize(total_size, &_impl_._cached_size_);
-}
-
-const ::google::protobuf::Message::ClassData UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingFormula::_class_data_ = {
-    UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingFormula::MergeImpl,
-    nullptr,  // OnDemandRegisterArenaDtor
-};
-const ::google::protobuf::Message::ClassData* UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingFormula::GetClassData() const {
-  return &_class_data_;
-}
-
-void UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingFormula::MergeImpl(::google::protobuf::Message& to_msg, const ::google::protobuf::Message& from_msg) {
-  auto* const _this = static_cast<UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingFormula*>(&to_msg);
-  auto& from = static_cast<const UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingFormula&>(from_msg);
-  // @@protoc_insertion_point(class_specific_merge_from_start:io.deephaven.proto.backplane.grpc.UpdateByRequest.UpdateByOperation.UpdateByColumn.UpdateBySpec.UpdateByRollingFormula)
-  ABSL_DCHECK_NE(&from, _this);
-  ::uint32_t cached_has_bits = 0;
-  (void) cached_has_bits;
-
-  if (!from._internal_formula().empty()) {
-    _this->_internal_set_formula(from._internal_formula());
-  }
-  if (!from._internal_param_token().empty()) {
-    _this->_internal_set_param_token(from._internal_param_token());
-  }
-  cached_has_bits = from._impl_._has_bits_[0];
-  if (cached_has_bits & 0x00000003u) {
-    if (cached_has_bits & 0x00000001u) {
-      _this->_internal_mutable_reverse_window_scale()->::io::deephaven::proto::backplane::grpc::UpdateByWindowScale::MergeFrom(
-          from._internal_reverse_window_scale());
-    }
-    if (cached_has_bits & 0x00000002u) {
-      _this->_internal_mutable_forward_window_scale()->::io::deephaven::proto::backplane::grpc::UpdateByWindowScale::MergeFrom(
-          from._internal_forward_window_scale());
-    }
-  }
-  _this->_internal_metadata_.MergeFrom<::google::protobuf::UnknownFieldSet>(from._internal_metadata_);
-}
-
-void UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingFormula::CopyFrom(const UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingFormula& from) {
-// @@protoc_insertion_point(class_specific_copy_from_start:io.deephaven.proto.backplane.grpc.UpdateByRequest.UpdateByOperation.UpdateByColumn.UpdateBySpec.UpdateByRollingFormula)
-  if (&from == this) return;
-  Clear();
-  MergeFrom(from);
-}
-
-PROTOBUF_NOINLINE bool UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingFormula::IsInitialized() const {
-  return true;
-}
-
-::_pbi::CachedSize* UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingFormula::AccessCachedSize() const {
-  return &_impl_._cached_size_;
-}
-void UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingFormula::InternalSwap(UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingFormula* PROTOBUF_RESTRICT other) {
-  using std::swap;
-  auto* arena = GetArena();
-  ABSL_DCHECK_EQ(arena, other->GetArena());
-  _internal_metadata_.InternalSwap(&other->_internal_metadata_);
-  swap(_impl_._has_bits_[0], other->_impl_._has_bits_[0]);
-  ::_pbi::ArenaStringPtr::InternalSwap(&_impl_.formula_, &other->_impl_.formula_, arena);
-  ::_pbi::ArenaStringPtr::InternalSwap(&_impl_.param_token_, &other->_impl_.param_token_, arena);
-  ::google::protobuf::internal::memswap<
-      PROTOBUF_FIELD_OFFSET(UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingFormula, _impl_.forward_window_scale_)
-      + sizeof(UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingFormula::_impl_.forward_window_scale_)
-      - PROTOBUF_FIELD_OFFSET(UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingFormula, _impl_.reverse_window_scale_)>(
-          reinterpret_cast<char*>(&_impl_.reverse_window_scale_),
-          reinterpret_cast<char*>(&other->_impl_.reverse_window_scale_));
-}
-
-::google::protobuf::Metadata UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingFormula::GetMetadata() const {
-  return ::_pbi::AssignDescriptors(
-      &descriptor_table_deephaven_2fproto_2ftable_2eproto_getter, &descriptor_table_deephaven_2fproto_2ftable_2eproto_once,
-      file_level_metadata_deephaven_2fproto_2ftable_2eproto[36]);
-}
-// ===================================================================
-
-class UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec::_Internal {
- public:
-  static constexpr ::int32_t kOneofCaseOffset =
-    PROTOBUF_FIELD_OFFSET(::io::deephaven::proto::backplane::grpc::UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec, _impl_._oneof_case_);
-  static const ::io::deephaven::proto::backplane::grpc::UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByCumulativeSum& sum(const UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec* msg);
-  static const ::io::deephaven::proto::backplane::grpc::UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByCumulativeMin& min(const UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec* msg);
-  static const ::io::deephaven::proto::backplane::grpc::UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByCumulativeMax& max(const UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec* msg);
-  static const ::io::deephaven::proto::backplane::grpc::UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByCumulativeProduct& product(const UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec* msg);
-  static const ::io::deephaven::proto::backplane::grpc::UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByFill& fill(const UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec* msg);
-  static const ::io::deephaven::proto::backplane::grpc::UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByEma& ema(const UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec* msg);
-  static const ::io::deephaven::proto::backplane::grpc::UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingSum& rolling_sum(const UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec* msg);
-  static const ::io::deephaven::proto::backplane::grpc::UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingGroup& rolling_group(const UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec* msg);
-  static const ::io::deephaven::proto::backplane::grpc::UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingAvg& rolling_avg(const UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec* msg);
-  static const ::io::deephaven::proto::backplane::grpc::UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingMin& rolling_min(const UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec* msg);
-  static const ::io::deephaven::proto::backplane::grpc::UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingMax& rolling_max(const UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec* msg);
-  static const ::io::deephaven::proto::backplane::grpc::UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingProduct& rolling_product(const UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec* msg);
-  static const ::io::deephaven::proto::backplane::grpc::UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByDelta& delta(const UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec* msg);
-  static const ::io::deephaven::proto::backplane::grpc::UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByEms& ems(const UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec* msg);
-  static const ::io::deephaven::proto::backplane::grpc::UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByEmMin& em_min(const UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec* msg);
-  static const ::io::deephaven::proto::backplane::grpc::UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByEmMax& em_max(const UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec* msg);
-  static const ::io::deephaven::proto::backplane::grpc::UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByEmStd& em_std(const UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec* msg);
-  static const ::io::deephaven::proto::backplane::grpc::UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingCount& rolling_count(const UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec* msg);
-  static const ::io::deephaven::proto::backplane::grpc::UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingStd& rolling_std(const UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec* msg);
-  static const ::io::deephaven::proto::backplane::grpc::UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingWAvg& rolling_wavg(const UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec* msg);
-  static const ::io::deephaven::proto::backplane::grpc::UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingFormula& rolling_formula(const UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec* msg);
-};
-
-const ::io::deephaven::proto::backplane::grpc::UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByCumulativeSum& UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec::_Internal::sum(const UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec* msg) {
-  return *msg->_impl_.type_.sum_;
-}
-const ::io::deephaven::proto::backplane::grpc::UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByCumulativeMin& UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec::_Internal::min(const UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec* msg) {
-  return *msg->_impl_.type_.min_;
-}
-const ::io::deephaven::proto::backplane::grpc::UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByCumulativeMax& UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec::_Internal::max(const UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec* msg) {
-  return *msg->_impl_.type_.max_;
-}
-const ::io::deephaven::proto::backplane::grpc::UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByCumulativeProduct& UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec::_Internal::product(const UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec* msg) {
-  return *msg->_impl_.type_.product_;
-}
-const ::io::deephaven::proto::backplane::grpc::UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByFill& UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec::_Internal::fill(const UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec* msg) {
-  return *msg->_impl_.type_.fill_;
-}
-const ::io::deephaven::proto::backplane::grpc::UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByEma& UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec::_Internal::ema(const UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec* msg) {
-  return *msg->_impl_.type_.ema_;
-}
-const ::io::deephaven::proto::backplane::grpc::UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingSum& UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec::_Internal::rolling_sum(const UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec* msg) {
-  return *msg->_impl_.type_.rolling_sum_;
-}
-const ::io::deephaven::proto::backplane::grpc::UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingGroup& UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec::_Internal::rolling_group(const UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec* msg) {
-  return *msg->_impl_.type_.rolling_group_;
-}
-const ::io::deephaven::proto::backplane::grpc::UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingAvg& UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec::_Internal::rolling_avg(const UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec* msg) {
-  return *msg->_impl_.type_.rolling_avg_;
-}
-const ::io::deephaven::proto::backplane::grpc::UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingMin& UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec::_Internal::rolling_min(const UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec* msg) {
-  return *msg->_impl_.type_.rolling_min_;
-}
-const ::io::deephaven::proto::backplane::grpc::UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingMax& UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec::_Internal::rolling_max(const UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec* msg) {
-  return *msg->_impl_.type_.rolling_max_;
-}
-const ::io::deephaven::proto::backplane::grpc::UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingProduct& UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec::_Internal::rolling_product(const UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec* msg) {
-  return *msg->_impl_.type_.rolling_product_;
-}
-const ::io::deephaven::proto::backplane::grpc::UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByDelta& UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec::_Internal::delta(const UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec* msg) {
-  return *msg->_impl_.type_.delta_;
-}
-const ::io::deephaven::proto::backplane::grpc::UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByEms& UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec::_Internal::ems(const UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec* msg) {
-  return *msg->_impl_.type_.ems_;
-}
-const ::io::deephaven::proto::backplane::grpc::UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByEmMin& UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec::_Internal::em_min(const UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec* msg) {
-  return *msg->_impl_.type_.em_min_;
-}
-const ::io::deephaven::proto::backplane::grpc::UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByEmMax& UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec::_Internal::em_max(const UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec* msg) {
-  return *msg->_impl_.type_.em_max_;
-}
-const ::io::deephaven::proto::backplane::grpc::UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByEmStd& UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec::_Internal::em_std(const UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec* msg) {
-  return *msg->_impl_.type_.em_std_;
-}
-const ::io::deephaven::proto::backplane::grpc::UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingCount& UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec::_Internal::rolling_count(const UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec* msg) {
-  return *msg->_impl_.type_.rolling_count_;
-}
-const ::io::deephaven::proto::backplane::grpc::UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingStd& UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec::_Internal::rolling_std(const UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec* msg) {
-  return *msg->_impl_.type_.rolling_std_;
-}
-const ::io::deephaven::proto::backplane::grpc::UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingWAvg& UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec::_Internal::rolling_wavg(const UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec* msg) {
-  return *msg->_impl_.type_.rolling_wavg_;
-}
-const ::io::deephaven::proto::backplane::grpc::UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingFormula& UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec::_Internal::rolling_formula(const UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec* msg) {
-  return *msg->_impl_.type_.rolling_formula_;
-}
-void UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec::set_allocated_sum(::io::deephaven::proto::backplane::grpc::UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByCumulativeSum* sum) {
-  ::google::protobuf::Arena* message_arena = GetArena();
-  clear_type();
-  if (sum) {
-    ::google::protobuf::Arena* submessage_arena = sum->GetArena();
-    if (message_arena != submessage_arena) {
-      sum = ::google::protobuf::internal::GetOwnedMessage(message_arena, sum, submessage_arena);
-    }
-    set_has_sum();
-    _impl_.type_.sum_ = sum;
-  }
-  // @@protoc_insertion_point(field_set_allocated:io.deephaven.proto.backplane.grpc.UpdateByRequest.UpdateByOperation.UpdateByColumn.UpdateBySpec.sum)
-}
-void UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec::set_allocated_min(::io::deephaven::proto::backplane::grpc::UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByCumulativeMin* min) {
-  ::google::protobuf::Arena* message_arena = GetArena();
-  clear_type();
-  if (min) {
-    ::google::protobuf::Arena* submessage_arena = min->GetArena();
-    if (message_arena != submessage_arena) {
-      min = ::google::protobuf::internal::GetOwnedMessage(message_arena, min, submessage_arena);
-    }
-    set_has_min();
-    _impl_.type_.min_ = min;
-  }
-  // @@protoc_insertion_point(field_set_allocated:io.deephaven.proto.backplane.grpc.UpdateByRequest.UpdateByOperation.UpdateByColumn.UpdateBySpec.min)
-}
-void UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec::set_allocated_max(::io::deephaven::proto::backplane::grpc::UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByCumulativeMax* max) {
-  ::google::protobuf::Arena* message_arena = GetArena();
-  clear_type();
-  if (max) {
-    ::google::protobuf::Arena* submessage_arena = max->GetArena();
-    if (message_arena != submessage_arena) {
-      max = ::google::protobuf::internal::GetOwnedMessage(message_arena, max, submessage_arena);
-    }
-    set_has_max();
-    _impl_.type_.max_ = max;
-  }
-  // @@protoc_insertion_point(field_set_allocated:io.deephaven.proto.backplane.grpc.UpdateByRequest.UpdateByOperation.UpdateByColumn.UpdateBySpec.max)
-}
-void UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec::set_allocated_product(::io::deephaven::proto::backplane::grpc::UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByCumulativeProduct* product) {
-  ::google::protobuf::Arena* message_arena = GetArena();
-  clear_type();
-  if (product) {
-    ::google::protobuf::Arena* submessage_arena = product->GetArena();
-    if (message_arena != submessage_arena) {
-      product = ::google::protobuf::internal::GetOwnedMessage(message_arena, product, submessage_arena);
-    }
-    set_has_product();
-    _impl_.type_.product_ = product;
-  }
-  // @@protoc_insertion_point(field_set_allocated:io.deephaven.proto.backplane.grpc.UpdateByRequest.UpdateByOperation.UpdateByColumn.UpdateBySpec.product)
-}
-void UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec::set_allocated_fill(::io::deephaven::proto::backplane::grpc::UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByFill* fill) {
-  ::google::protobuf::Arena* message_arena = GetArena();
-  clear_type();
-  if (fill) {
-    ::google::protobuf::Arena* submessage_arena = fill->GetArena();
-    if (message_arena != submessage_arena) {
-      fill = ::google::protobuf::internal::GetOwnedMessage(message_arena, fill, submessage_arena);
-    }
-    set_has_fill();
-    _impl_.type_.fill_ = fill;
-  }
-  // @@protoc_insertion_point(field_set_allocated:io.deephaven.proto.backplane.grpc.UpdateByRequest.UpdateByOperation.UpdateByColumn.UpdateBySpec.fill)
-}
-void UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec::set_allocated_ema(::io::deephaven::proto::backplane::grpc::UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByEma* ema) {
-  ::google::protobuf::Arena* message_arena = GetArena();
-  clear_type();
-  if (ema) {
-    ::google::protobuf::Arena* submessage_arena = ema->GetArena();
-    if (message_arena != submessage_arena) {
-      ema = ::google::protobuf::internal::GetOwnedMessage(message_arena, ema, submessage_arena);
-    }
-    set_has_ema();
-    _impl_.type_.ema_ = ema;
-  }
-  // @@protoc_insertion_point(field_set_allocated:io.deephaven.proto.backplane.grpc.UpdateByRequest.UpdateByOperation.UpdateByColumn.UpdateBySpec.ema)
-}
-void UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec::set_allocated_rolling_sum(::io::deephaven::proto::backplane::grpc::UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingSum* rolling_sum) {
-  ::google::protobuf::Arena* message_arena = GetArena();
-  clear_type();
-  if (rolling_sum) {
-    ::google::protobuf::Arena* submessage_arena = rolling_sum->GetArena();
-    if (message_arena != submessage_arena) {
-      rolling_sum = ::google::protobuf::internal::GetOwnedMessage(message_arena, rolling_sum, submessage_arena);
-    }
-    set_has_rolling_sum();
-    _impl_.type_.rolling_sum_ = rolling_sum;
-  }
-  // @@protoc_insertion_point(field_set_allocated:io.deephaven.proto.backplane.grpc.UpdateByRequest.UpdateByOperation.UpdateByColumn.UpdateBySpec.rolling_sum)
-}
-void UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec::set_allocated_rolling_group(::io::deephaven::proto::backplane::grpc::UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingGroup* rolling_group) {
-  ::google::protobuf::Arena* message_arena = GetArena();
-  clear_type();
-  if (rolling_group) {
-    ::google::protobuf::Arena* submessage_arena = rolling_group->GetArena();
-    if (message_arena != submessage_arena) {
-      rolling_group = ::google::protobuf::internal::GetOwnedMessage(message_arena, rolling_group, submessage_arena);
-    }
-    set_has_rolling_group();
-    _impl_.type_.rolling_group_ = rolling_group;
-  }
-  // @@protoc_insertion_point(field_set_allocated:io.deephaven.proto.backplane.grpc.UpdateByRequest.UpdateByOperation.UpdateByColumn.UpdateBySpec.rolling_group)
-}
-void UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec::set_allocated_rolling_avg(::io::deephaven::proto::backplane::grpc::UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingAvg* rolling_avg) {
-  ::google::protobuf::Arena* message_arena = GetArena();
-  clear_type();
-  if (rolling_avg) {
-    ::google::protobuf::Arena* submessage_arena = rolling_avg->GetArena();
-    if (message_arena != submessage_arena) {
-      rolling_avg = ::google::protobuf::internal::GetOwnedMessage(message_arena, rolling_avg, submessage_arena);
-    }
-    set_has_rolling_avg();
-    _impl_.type_.rolling_avg_ = rolling_avg;
-  }
-  // @@protoc_insertion_point(field_set_allocated:io.deephaven.proto.backplane.grpc.UpdateByRequest.UpdateByOperation.UpdateByColumn.UpdateBySpec.rolling_avg)
-}
-void UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec::set_allocated_rolling_min(::io::deephaven::proto::backplane::grpc::UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingMin* rolling_min) {
-  ::google::protobuf::Arena* message_arena = GetArena();
-  clear_type();
-  if (rolling_min) {
-    ::google::protobuf::Arena* submessage_arena = rolling_min->GetArena();
-    if (message_arena != submessage_arena) {
-      rolling_min = ::google::protobuf::internal::GetOwnedMessage(message_arena, rolling_min, submessage_arena);
-    }
-    set_has_rolling_min();
-    _impl_.type_.rolling_min_ = rolling_min;
-  }
-  // @@protoc_insertion_point(field_set_allocated:io.deephaven.proto.backplane.grpc.UpdateByRequest.UpdateByOperation.UpdateByColumn.UpdateBySpec.rolling_min)
-}
-void UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec::set_allocated_rolling_max(::io::deephaven::proto::backplane::grpc::UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingMax* rolling_max) {
-  ::google::protobuf::Arena* message_arena = GetArena();
-  clear_type();
-  if (rolling_max) {
-    ::google::protobuf::Arena* submessage_arena = rolling_max->GetArena();
-    if (message_arena != submessage_arena) {
-      rolling_max = ::google::protobuf::internal::GetOwnedMessage(message_arena, rolling_max, submessage_arena);
-    }
-    set_has_rolling_max();
-    _impl_.type_.rolling_max_ = rolling_max;
-  }
-  // @@protoc_insertion_point(field_set_allocated:io.deephaven.proto.backplane.grpc.UpdateByRequest.UpdateByOperation.UpdateByColumn.UpdateBySpec.rolling_max)
-}
-void UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec::set_allocated_rolling_product(::io::deephaven::proto::backplane::grpc::UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingProduct* rolling_product) {
-  ::google::protobuf::Arena* message_arena = GetArena();
-  clear_type();
-  if (rolling_product) {
-    ::google::protobuf::Arena* submessage_arena = rolling_product->GetArena();
-    if (message_arena != submessage_arena) {
-      rolling_product = ::google::protobuf::internal::GetOwnedMessage(message_arena, rolling_product, submessage_arena);
-    }
-    set_has_rolling_product();
-    _impl_.type_.rolling_product_ = rolling_product;
-  }
-  // @@protoc_insertion_point(field_set_allocated:io.deephaven.proto.backplane.grpc.UpdateByRequest.UpdateByOperation.UpdateByColumn.UpdateBySpec.rolling_product)
-}
-void UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec::set_allocated_delta(::io::deephaven::proto::backplane::grpc::UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByDelta* delta) {
-  ::google::protobuf::Arena* message_arena = GetArena();
-  clear_type();
-  if (delta) {
-    ::google::protobuf::Arena* submessage_arena = delta->GetArena();
-    if (message_arena != submessage_arena) {
-      delta = ::google::protobuf::internal::GetOwnedMessage(message_arena, delta, submessage_arena);
-    }
-    set_has_delta();
-    _impl_.type_.delta_ = delta;
-  }
-  // @@protoc_insertion_point(field_set_allocated:io.deephaven.proto.backplane.grpc.UpdateByRequest.UpdateByOperation.UpdateByColumn.UpdateBySpec.delta)
-}
-void UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec::set_allocated_ems(::io::deephaven::proto::backplane::grpc::UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByEms* ems) {
-  ::google::protobuf::Arena* message_arena = GetArena();
-  clear_type();
-  if (ems) {
-    ::google::protobuf::Arena* submessage_arena = ems->GetArena();
-    if (message_arena != submessage_arena) {
-      ems = ::google::protobuf::internal::GetOwnedMessage(message_arena, ems, submessage_arena);
-    }
-    set_has_ems();
-    _impl_.type_.ems_ = ems;
-  }
-  // @@protoc_insertion_point(field_set_allocated:io.deephaven.proto.backplane.grpc.UpdateByRequest.UpdateByOperation.UpdateByColumn.UpdateBySpec.ems)
-}
-void UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec::set_allocated_em_min(::io::deephaven::proto::backplane::grpc::UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByEmMin* em_min) {
-  ::google::protobuf::Arena* message_arena = GetArena();
-  clear_type();
-  if (em_min) {
-    ::google::protobuf::Arena* submessage_arena = em_min->GetArena();
-    if (message_arena != submessage_arena) {
-      em_min = ::google::protobuf::internal::GetOwnedMessage(message_arena, em_min, submessage_arena);
-    }
-    set_has_em_min();
-    _impl_.type_.em_min_ = em_min;
-  }
-  // @@protoc_insertion_point(field_set_allocated:io.deephaven.proto.backplane.grpc.UpdateByRequest.UpdateByOperation.UpdateByColumn.UpdateBySpec.em_min)
-}
-void UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec::set_allocated_em_max(::io::deephaven::proto::backplane::grpc::UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByEmMax* em_max) {
-  ::google::protobuf::Arena* message_arena = GetArena();
-  clear_type();
-  if (em_max) {
-    ::google::protobuf::Arena* submessage_arena = em_max->GetArena();
-    if (message_arena != submessage_arena) {
-      em_max = ::google::protobuf::internal::GetOwnedMessage(message_arena, em_max, submessage_arena);
-    }
-    set_has_em_max();
-    _impl_.type_.em_max_ = em_max;
-  }
-  // @@protoc_insertion_point(field_set_allocated:io.deephaven.proto.backplane.grpc.UpdateByRequest.UpdateByOperation.UpdateByColumn.UpdateBySpec.em_max)
-}
-void UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec::set_allocated_em_std(::io::deephaven::proto::backplane::grpc::UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByEmStd* em_std) {
-  ::google::protobuf::Arena* message_arena = GetArena();
-  clear_type();
-  if (em_std) {
-    ::google::protobuf::Arena* submessage_arena = em_std->GetArena();
-    if (message_arena != submessage_arena) {
-      em_std = ::google::protobuf::internal::GetOwnedMessage(message_arena, em_std, submessage_arena);
-    }
-    set_has_em_std();
-    _impl_.type_.em_std_ = em_std;
-  }
-  // @@protoc_insertion_point(field_set_allocated:io.deephaven.proto.backplane.grpc.UpdateByRequest.UpdateByOperation.UpdateByColumn.UpdateBySpec.em_std)
-}
-void UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec::set_allocated_rolling_count(::io::deephaven::proto::backplane::grpc::UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingCount* rolling_count) {
-  ::google::protobuf::Arena* message_arena = GetArena();
-  clear_type();
-  if (rolling_count) {
-    ::google::protobuf::Arena* submessage_arena = rolling_count->GetArena();
-    if (message_arena != submessage_arena) {
-      rolling_count = ::google::protobuf::internal::GetOwnedMessage(message_arena, rolling_count, submessage_arena);
-    }
-    set_has_rolling_count();
-    _impl_.type_.rolling_count_ = rolling_count;
-  }
-  // @@protoc_insertion_point(field_set_allocated:io.deephaven.proto.backplane.grpc.UpdateByRequest.UpdateByOperation.UpdateByColumn.UpdateBySpec.rolling_count)
-}
-void UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec::set_allocated_rolling_std(::io::deephaven::proto::backplane::grpc::UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingStd* rolling_std) {
-  ::google::protobuf::Arena* message_arena = GetArena();
-  clear_type();
-  if (rolling_std) {
-    ::google::protobuf::Arena* submessage_arena = rolling_std->GetArena();
-    if (message_arena != submessage_arena) {
-      rolling_std = ::google::protobuf::internal::GetOwnedMessage(message_arena, rolling_std, submessage_arena);
-    }
-    set_has_rolling_std();
-    _impl_.type_.rolling_std_ = rolling_std;
-  }
-  // @@protoc_insertion_point(field_set_allocated:io.deephaven.proto.backplane.grpc.UpdateByRequest.UpdateByOperation.UpdateByColumn.UpdateBySpec.rolling_std)
-}
-void UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec::set_allocated_rolling_wavg(::io::deephaven::proto::backplane::grpc::UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingWAvg* rolling_wavg) {
-  ::google::protobuf::Arena* message_arena = GetArena();
-  clear_type();
-  if (rolling_wavg) {
-    ::google::protobuf::Arena* submessage_arena = rolling_wavg->GetArena();
-    if (message_arena != submessage_arena) {
-      rolling_wavg = ::google::protobuf::internal::GetOwnedMessage(message_arena, rolling_wavg, submessage_arena);
-    }
-    set_has_rolling_wavg();
-    _impl_.type_.rolling_wavg_ = rolling_wavg;
-  }
-  // @@protoc_insertion_point(field_set_allocated:io.deephaven.proto.backplane.grpc.UpdateByRequest.UpdateByOperation.UpdateByColumn.UpdateBySpec.rolling_wavg)
-}
-void UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec::set_allocated_rolling_formula(::io::deephaven::proto::backplane::grpc::UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingFormula* rolling_formula) {
-  ::google::protobuf::Arena* message_arena = GetArena();
-  clear_type();
-  if (rolling_formula) {
-    ::google::protobuf::Arena* submessage_arena = rolling_formula->GetArena();
-    if (message_arena != submessage_arena) {
-      rolling_formula = ::google::protobuf::internal::GetOwnedMessage(message_arena, rolling_formula, submessage_arena);
-    }
-    set_has_rolling_formula();
-    _impl_.type_.rolling_formula_ = rolling_formula;
-  }
-  // @@protoc_insertion_point(field_set_allocated:io.deephaven.proto.backplane.grpc.UpdateByRequest.UpdateByOperation.UpdateByColumn.UpdateBySpec.rolling_formula)
-}
-UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec::UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec(::google::protobuf::Arena* arena)
-    : ::google::protobuf::Message(arena) {
-  SharedCtor(arena);
-  // @@protoc_insertion_point(arena_constructor:io.deephaven.proto.backplane.grpc.UpdateByRequest.UpdateByOperation.UpdateByColumn.UpdateBySpec)
-}
-inline PROTOBUF_NDEBUG_INLINE UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec::Impl_::Impl_(
-    ::google::protobuf::internal::InternalVisibility visibility, ::google::protobuf::Arena* arena,
-    const Impl_& from)
-      : type_{},
-        _cached_size_{0},
-        _oneof_case_{from._oneof_case_[0]} {}
-
-UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec::UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec(
-    ::google::protobuf::Arena* arena,
-    const UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec& from)
-    : ::google::protobuf::Message(arena) {
-  UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec* const _this = this;
-  (void)_this;
-  _internal_metadata_.MergeFrom<::google::protobuf::UnknownFieldSet>(
-      from._internal_metadata_);
-  new (&_impl_) Impl_(internal_visibility(), arena, from._impl_);
-  switch (type_case()) {
-    case TYPE_NOT_SET:
-      break;
-      case kSum:
-        _impl_.type_.sum_ = CreateMaybeMessage<::io::deephaven::proto::backplane::grpc::UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByCumulativeSum>(arena, *from._impl_.type_.sum_);
-        break;
-      case kMin:
-        _impl_.type_.min_ = CreateMaybeMessage<::io::deephaven::proto::backplane::grpc::UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByCumulativeMin>(arena, *from._impl_.type_.min_);
-        break;
-      case kMax:
-        _impl_.type_.max_ = CreateMaybeMessage<::io::deephaven::proto::backplane::grpc::UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByCumulativeMax>(arena, *from._impl_.type_.max_);
-        break;
-      case kProduct:
-        _impl_.type_.product_ = CreateMaybeMessage<::io::deephaven::proto::backplane::grpc::UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByCumulativeProduct>(arena, *from._impl_.type_.product_);
-        break;
-      case kFill:
-        _impl_.type_.fill_ = CreateMaybeMessage<::io::deephaven::proto::backplane::grpc::UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByFill>(arena, *from._impl_.type_.fill_);
-        break;
-      case kEma:
-        _impl_.type_.ema_ = CreateMaybeMessage<::io::deephaven::proto::backplane::grpc::UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByEma>(arena, *from._impl_.type_.ema_);
-        break;
-      case kRollingSum:
-        _impl_.type_.rolling_sum_ = CreateMaybeMessage<::io::deephaven::proto::backplane::grpc::UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingSum>(arena, *from._impl_.type_.rolling_sum_);
-        break;
-      case kRollingGroup:
-        _impl_.type_.rolling_group_ = CreateMaybeMessage<::io::deephaven::proto::backplane::grpc::UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingGroup>(arena, *from._impl_.type_.rolling_group_);
-        break;
-      case kRollingAvg:
-        _impl_.type_.rolling_avg_ = CreateMaybeMessage<::io::deephaven::proto::backplane::grpc::UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingAvg>(arena, *from._impl_.type_.rolling_avg_);
-        break;
-      case kRollingMin:
-        _impl_.type_.rolling_min_ = CreateMaybeMessage<::io::deephaven::proto::backplane::grpc::UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingMin>(arena, *from._impl_.type_.rolling_min_);
-        break;
-      case kRollingMax:
-        _impl_.type_.rolling_max_ = CreateMaybeMessage<::io::deephaven::proto::backplane::grpc::UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingMax>(arena, *from._impl_.type_.rolling_max_);
-        break;
-      case kRollingProduct:
-        _impl_.type_.rolling_product_ = CreateMaybeMessage<::io::deephaven::proto::backplane::grpc::UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingProduct>(arena, *from._impl_.type_.rolling_product_);
-        break;
-      case kDelta:
-        _impl_.type_.delta_ = CreateMaybeMessage<::io::deephaven::proto::backplane::grpc::UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByDelta>(arena, *from._impl_.type_.delta_);
-        break;
-      case kEms:
-        _impl_.type_.ems_ = CreateMaybeMessage<::io::deephaven::proto::backplane::grpc::UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByEms>(arena, *from._impl_.type_.ems_);
-        break;
-      case kEmMin:
-        _impl_.type_.em_min_ = CreateMaybeMessage<::io::deephaven::proto::backplane::grpc::UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByEmMin>(arena, *from._impl_.type_.em_min_);
-        break;
-      case kEmMax:
-        _impl_.type_.em_max_ = CreateMaybeMessage<::io::deephaven::proto::backplane::grpc::UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByEmMax>(arena, *from._impl_.type_.em_max_);
-        break;
-      case kEmStd:
-        _impl_.type_.em_std_ = CreateMaybeMessage<::io::deephaven::proto::backplane::grpc::UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByEmStd>(arena, *from._impl_.type_.em_std_);
-        break;
-      case kRollingCount:
-        _impl_.type_.rolling_count_ = CreateMaybeMessage<::io::deephaven::proto::backplane::grpc::UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingCount>(arena, *from._impl_.type_.rolling_count_);
-        break;
-      case kRollingStd:
-        _impl_.type_.rolling_std_ = CreateMaybeMessage<::io::deephaven::proto::backplane::grpc::UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingStd>(arena, *from._impl_.type_.rolling_std_);
-        break;
-      case kRollingWavg:
-        _impl_.type_.rolling_wavg_ = CreateMaybeMessage<::io::deephaven::proto::backplane::grpc::UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingWAvg>(arena, *from._impl_.type_.rolling_wavg_);
-        break;
-      case kRollingFormula:
-        _impl_.type_.rolling_formula_ = CreateMaybeMessage<::io::deephaven::proto::backplane::grpc::UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingFormula>(arena, *from._impl_.type_.rolling_formula_);
-        break;
-  }
-
-  // @@protoc_insertion_point(copy_constructor:io.deephaven.proto.backplane.grpc.UpdateByRequest.UpdateByOperation.UpdateByColumn.UpdateBySpec)
-}
-inline PROTOBUF_NDEBUG_INLINE UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec::Impl_::Impl_(
-    ::google::protobuf::internal::InternalVisibility visibility,
-    ::google::protobuf::Arena* arena)
-      : type_{},
-        _cached_size_{0},
-        _oneof_case_{} {}
-
-inline void UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec::SharedCtor(::_pb::Arena* arena) {
-  new (&_impl_) Impl_(internal_visibility(), arena);
-}
-UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec::~UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec() {
-  // @@protoc_insertion_point(destructor:io.deephaven.proto.backplane.grpc.UpdateByRequest.UpdateByOperation.UpdateByColumn.UpdateBySpec)
-  _internal_metadata_.Delete<::google::protobuf::UnknownFieldSet>();
-  SharedDtor();
-}
-inline void UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec::SharedDtor() {
-  ABSL_DCHECK(GetArena() == nullptr);
-  if (has_type()) {
-    clear_type();
-  }
-  _impl_.~Impl_();
-}
-
-void UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec::clear_type() {
-// @@protoc_insertion_point(one_of_clear_start:io.deephaven.proto.backplane.grpc.UpdateByRequest.UpdateByOperation.UpdateByColumn.UpdateBySpec)
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  switch (type_case()) {
-    case kSum: {
-      if (GetArena() == nullptr) {
-        delete _impl_.type_.sum_;
-      }
-      break;
-    }
-    case kMin: {
-      if (GetArena() == nullptr) {
-        delete _impl_.type_.min_;
-      }
-      break;
-    }
-    case kMax: {
-      if (GetArena() == nullptr) {
-        delete _impl_.type_.max_;
-      }
-      break;
-    }
-    case kProduct: {
-      if (GetArena() == nullptr) {
-        delete _impl_.type_.product_;
-      }
-      break;
-    }
-    case kFill: {
-      if (GetArena() == nullptr) {
-        delete _impl_.type_.fill_;
-      }
-      break;
-    }
-    case kEma: {
-      if (GetArena() == nullptr) {
-        delete _impl_.type_.ema_;
-      }
-      break;
-    }
-    case kRollingSum: {
-      if (GetArena() == nullptr) {
-        delete _impl_.type_.rolling_sum_;
-      }
-      break;
-    }
-    case kRollingGroup: {
-      if (GetArena() == nullptr) {
-        delete _impl_.type_.rolling_group_;
-      }
-      break;
-    }
-    case kRollingAvg: {
-      if (GetArena() == nullptr) {
-        delete _impl_.type_.rolling_avg_;
-      }
-      break;
-    }
-    case kRollingMin: {
-      if (GetArena() == nullptr) {
-        delete _impl_.type_.rolling_min_;
-      }
-      break;
-    }
-    case kRollingMax: {
-      if (GetArena() == nullptr) {
-        delete _impl_.type_.rolling_max_;
-      }
-      break;
-    }
-    case kRollingProduct: {
-      if (GetArena() == nullptr) {
-        delete _impl_.type_.rolling_product_;
-      }
-      break;
-    }
-    case kDelta: {
-      if (GetArena() == nullptr) {
-        delete _impl_.type_.delta_;
-      }
-      break;
-    }
-    case kEms: {
-      if (GetArena() == nullptr) {
-        delete _impl_.type_.ems_;
-      }
-      break;
-    }
-    case kEmMin: {
-      if (GetArena() == nullptr) {
-        delete _impl_.type_.em_min_;
-      }
-      break;
-    }
-    case kEmMax: {
-      if (GetArena() == nullptr) {
-        delete _impl_.type_.em_max_;
-      }
-      break;
-    }
-    case kEmStd: {
-      if (GetArena() == nullptr) {
-        delete _impl_.type_.em_std_;
-      }
-      break;
-    }
-    case kRollingCount: {
-      if (GetArena() == nullptr) {
-        delete _impl_.type_.rolling_count_;
-      }
-      break;
-    }
-    case kRollingStd: {
-      if (GetArena() == nullptr) {
-        delete _impl_.type_.rolling_std_;
-      }
-      break;
-    }
-    case kRollingWavg: {
-      if (GetArena() == nullptr) {
-        delete _impl_.type_.rolling_wavg_;
-      }
-      break;
-    }
-    case kRollingFormula: {
-      if (GetArena() == nullptr) {
-        delete _impl_.type_.rolling_formula_;
-      }
-      break;
-    }
-    case TYPE_NOT_SET: {
-      break;
-    }
-  }
-  _impl_._oneof_case_[0] = TYPE_NOT_SET;
-}
-
-
-PROTOBUF_NOINLINE void UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec::Clear() {
-// @@protoc_insertion_point(message_clear_start:io.deephaven.proto.backplane.grpc.UpdateByRequest.UpdateByOperation.UpdateByColumn.UpdateBySpec)
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  ::uint32_t cached_has_bits = 0;
-  // Prevent compiler warnings about cached_has_bits being unused
-  (void) cached_has_bits;
-
-  clear_type();
-  _internal_metadata_.Clear<::google::protobuf::UnknownFieldSet>();
-}
-
-const char* UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec::_InternalParse(
-    const char* ptr, ::_pbi::ParseContext* ctx) {
-  ptr = ::_pbi::TcParser::ParseLoop(this, ptr, ctx, &_table_.header);
-  return ptr;
-}
-
-
-PROTOBUF_CONSTINIT PROTOBUF_ATTRIBUTE_INIT_PRIORITY1
-const ::_pbi::TcParseTable<0, 21, 21, 0, 2> UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec::_table_ = {
-  {
-    0,  // no _has_bits_
-    0, // no _extensions_
-    21, 0,  // max_field_number, fast_idx_mask
-    offsetof(decltype(_table_), field_lookup_table),
-    4292870144,  // skipmap
-    offsetof(decltype(_table_), field_entries),
-    21,  // num_field_entries
-    21,  // num_aux_entries
-    offsetof(decltype(_table_), aux_entries),
-    &_UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_default_instance_._instance,
-    ::_pbi::TcParser::GenericFallback,  // fallback
-  }, {{
-    {::_pbi::TcParser::MiniParse, {}},
-  }}, {{
-    65535, 65535
-  }}, {{
-    // .io.deephaven.proto.backplane.grpc.UpdateByRequest.UpdateByOperation.UpdateByColumn.UpdateBySpec.UpdateByCumulativeSum sum = 1;
-    {PROTOBUF_FIELD_OFFSET(UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec, _impl_.type_.sum_), _Internal::kOneofCaseOffset + 0, 0,
-    (0 | ::_fl::kFcOneof | ::_fl::kMessage | ::_fl::kTvDefault)},
-    // .io.deephaven.proto.backplane.grpc.UpdateByRequest.UpdateByOperation.UpdateByColumn.UpdateBySpec.UpdateByCumulativeMin min = 2;
-    {PROTOBUF_FIELD_OFFSET(UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec, _impl_.type_.min_), _Internal::kOneofCaseOffset + 0, 1,
-    (0 | ::_fl::kFcOneof | ::_fl::kMessage | ::_fl::kTvDefault)},
-    // .io.deephaven.proto.backplane.grpc.UpdateByRequest.UpdateByOperation.UpdateByColumn.UpdateBySpec.UpdateByCumulativeMax max = 3;
-    {PROTOBUF_FIELD_OFFSET(UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec, _impl_.type_.max_), _Internal::kOneofCaseOffset + 0, 2,
-    (0 | ::_fl::kFcOneof | ::_fl::kMessage | ::_fl::kTvDefault)},
-    // .io.deephaven.proto.backplane.grpc.UpdateByRequest.UpdateByOperation.UpdateByColumn.UpdateBySpec.UpdateByCumulativeProduct product = 4;
-    {PROTOBUF_FIELD_OFFSET(UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec, _impl_.type_.product_), _Internal::kOneofCaseOffset + 0, 3,
-    (0 | ::_fl::kFcOneof | ::_fl::kMessage | ::_fl::kTvDefault)},
-    // .io.deephaven.proto.backplane.grpc.UpdateByRequest.UpdateByOperation.UpdateByColumn.UpdateBySpec.UpdateByFill fill = 5;
-    {PROTOBUF_FIELD_OFFSET(UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec, _impl_.type_.fill_), _Internal::kOneofCaseOffset + 0, 4,
-    (0 | ::_fl::kFcOneof | ::_fl::kMessage | ::_fl::kTvDefault)},
-    // .io.deephaven.proto.backplane.grpc.UpdateByRequest.UpdateByOperation.UpdateByColumn.UpdateBySpec.UpdateByEma ema = 6;
-    {PROTOBUF_FIELD_OFFSET(UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec, _impl_.type_.ema_), _Internal::kOneofCaseOffset + 0, 5,
-    (0 | ::_fl::kFcOneof | ::_fl::kMessage | ::_fl::kTvTable)},
-    // .io.deephaven.proto.backplane.grpc.UpdateByRequest.UpdateByOperation.UpdateByColumn.UpdateBySpec.UpdateByRollingSum rolling_sum = 7;
-    {PROTOBUF_FIELD_OFFSET(UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec, _impl_.type_.rolling_sum_), _Internal::kOneofCaseOffset + 0, 6,
-    (0 | ::_fl::kFcOneof | ::_fl::kMessage | ::_fl::kTvTable)},
-    // .io.deephaven.proto.backplane.grpc.UpdateByRequest.UpdateByOperation.UpdateByColumn.UpdateBySpec.UpdateByRollingGroup rolling_group = 8;
-    {PROTOBUF_FIELD_OFFSET(UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec, _impl_.type_.rolling_group_), _Internal::kOneofCaseOffset + 0, 7,
-    (0 | ::_fl::kFcOneof | ::_fl::kMessage | ::_fl::kTvTable)},
-    // .io.deephaven.proto.backplane.grpc.UpdateByRequest.UpdateByOperation.UpdateByColumn.UpdateBySpec.UpdateByRollingAvg rolling_avg = 9;
-    {PROTOBUF_FIELD_OFFSET(UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec, _impl_.type_.rolling_avg_), _Internal::kOneofCaseOffset + 0, 8,
-    (0 | ::_fl::kFcOneof | ::_fl::kMessage | ::_fl::kTvTable)},
-    // .io.deephaven.proto.backplane.grpc.UpdateByRequest.UpdateByOperation.UpdateByColumn.UpdateBySpec.UpdateByRollingMin rolling_min = 10;
-    {PROTOBUF_FIELD_OFFSET(UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec, _impl_.type_.rolling_min_), _Internal::kOneofCaseOffset + 0, 9,
-    (0 | ::_fl::kFcOneof | ::_fl::kMessage | ::_fl::kTvTable)},
-    // .io.deephaven.proto.backplane.grpc.UpdateByRequest.UpdateByOperation.UpdateByColumn.UpdateBySpec.UpdateByRollingMax rolling_max = 11;
-    {PROTOBUF_FIELD_OFFSET(UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec, _impl_.type_.rolling_max_), _Internal::kOneofCaseOffset + 0, 10,
-    (0 | ::_fl::kFcOneof | ::_fl::kMessage | ::_fl::kTvTable)},
-    // .io.deephaven.proto.backplane.grpc.UpdateByRequest.UpdateByOperation.UpdateByColumn.UpdateBySpec.UpdateByRollingProduct rolling_product = 12;
-    {PROTOBUF_FIELD_OFFSET(UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec, _impl_.type_.rolling_product_), _Internal::kOneofCaseOffset + 0, 11,
-    (0 | ::_fl::kFcOneof | ::_fl::kMessage | ::_fl::kTvTable)},
-    // .io.deephaven.proto.backplane.grpc.UpdateByRequest.UpdateByOperation.UpdateByColumn.UpdateBySpec.UpdateByDelta delta = 13;
-    {PROTOBUF_FIELD_OFFSET(UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec, _impl_.type_.delta_), _Internal::kOneofCaseOffset + 0, 12,
-    (0 | ::_fl::kFcOneof | ::_fl::kMessage | ::_fl::kTvTable)},
-    // .io.deephaven.proto.backplane.grpc.UpdateByRequest.UpdateByOperation.UpdateByColumn.UpdateBySpec.UpdateByEms ems = 14;
-    {PROTOBUF_FIELD_OFFSET(UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec, _impl_.type_.ems_), _Internal::kOneofCaseOffset + 0, 13,
-    (0 | ::_fl::kFcOneof | ::_fl::kMessage | ::_fl::kTvTable)},
-    // .io.deephaven.proto.backplane.grpc.UpdateByRequest.UpdateByOperation.UpdateByColumn.UpdateBySpec.UpdateByEmMin em_min = 15;
-    {PROTOBUF_FIELD_OFFSET(UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec, _impl_.type_.em_min_), _Internal::kOneofCaseOffset + 0, 14,
-    (0 | ::_fl::kFcOneof | ::_fl::kMessage | ::_fl::kTvTable)},
-    // .io.deephaven.proto.backplane.grpc.UpdateByRequest.UpdateByOperation.UpdateByColumn.UpdateBySpec.UpdateByEmMax em_max = 16;
-    {PROTOBUF_FIELD_OFFSET(UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec, _impl_.type_.em_max_), _Internal::kOneofCaseOffset + 0, 15,
-    (0 | ::_fl::kFcOneof | ::_fl::kMessage | ::_fl::kTvTable)},
-    // .io.deephaven.proto.backplane.grpc.UpdateByRequest.UpdateByOperation.UpdateByColumn.UpdateBySpec.UpdateByEmStd em_std = 17;
-    {PROTOBUF_FIELD_OFFSET(UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec, _impl_.type_.em_std_), _Internal::kOneofCaseOffset + 0, 16,
-    (0 | ::_fl::kFcOneof | ::_fl::kMessage | ::_fl::kTvTable)},
-    // .io.deephaven.proto.backplane.grpc.UpdateByRequest.UpdateByOperation.UpdateByColumn.UpdateBySpec.UpdateByRollingCount rolling_count = 18;
-    {PROTOBUF_FIELD_OFFSET(UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec, _impl_.type_.rolling_count_), _Internal::kOneofCaseOffset + 0, 17,
-    (0 | ::_fl::kFcOneof | ::_fl::kMessage | ::_fl::kTvTable)},
-    // .io.deephaven.proto.backplane.grpc.UpdateByRequest.UpdateByOperation.UpdateByColumn.UpdateBySpec.UpdateByRollingStd rolling_std = 19;
-    {PROTOBUF_FIELD_OFFSET(UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec, _impl_.type_.rolling_std_), _Internal::kOneofCaseOffset + 0, 18,
-    (0 | ::_fl::kFcOneof | ::_fl::kMessage | ::_fl::kTvTable)},
-    // .io.deephaven.proto.backplane.grpc.UpdateByRequest.UpdateByOperation.UpdateByColumn.UpdateBySpec.UpdateByRollingWAvg rolling_wavg = 20;
-    {PROTOBUF_FIELD_OFFSET(UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec, _impl_.type_.rolling_wavg_), _Internal::kOneofCaseOffset + 0, 19,
-    (0 | ::_fl::kFcOneof | ::_fl::kMessage | ::_fl::kTvTable)},
-    // .io.deephaven.proto.backplane.grpc.UpdateByRequest.UpdateByOperation.UpdateByColumn.UpdateBySpec.UpdateByRollingFormula rolling_formula = 21;
-    {PROTOBUF_FIELD_OFFSET(UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec, _impl_.type_.rolling_formula_), _Internal::kOneofCaseOffset + 0, 20,
-    (0 | ::_fl::kFcOneof | ::_fl::kMessage | ::_fl::kTvTable)},
-  }}, {{
-    {::_pbi::FieldAuxDefaultMessage{}, &::io::deephaven::proto::backplane::grpc::_UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByCumulativeSum_default_instance_},
-    {::_pbi::FieldAuxDefaultMessage{}, &::io::deephaven::proto::backplane::grpc::_UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByCumulativeMin_default_instance_},
-    {::_pbi::FieldAuxDefaultMessage{}, &::io::deephaven::proto::backplane::grpc::_UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByCumulativeMax_default_instance_},
-    {::_pbi::FieldAuxDefaultMessage{}, &::io::deephaven::proto::backplane::grpc::_UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByCumulativeProduct_default_instance_},
-    {::_pbi::FieldAuxDefaultMessage{}, &::io::deephaven::proto::backplane::grpc::_UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByFill_default_instance_},
-    {::_pbi::TcParser::GetTable<::io::deephaven::proto::backplane::grpc::UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByEma>()},
-    {::_pbi::TcParser::GetTable<::io::deephaven::proto::backplane::grpc::UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingSum>()},
-    {::_pbi::TcParser::GetTable<::io::deephaven::proto::backplane::grpc::UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingGroup>()},
-    {::_pbi::TcParser::GetTable<::io::deephaven::proto::backplane::grpc::UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingAvg>()},
-    {::_pbi::TcParser::GetTable<::io::deephaven::proto::backplane::grpc::UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingMin>()},
-    {::_pbi::TcParser::GetTable<::io::deephaven::proto::backplane::grpc::UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingMax>()},
-    {::_pbi::TcParser::GetTable<::io::deephaven::proto::backplane::grpc::UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingProduct>()},
-    {::_pbi::TcParser::GetTable<::io::deephaven::proto::backplane::grpc::UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByDelta>()},
-    {::_pbi::TcParser::GetTable<::io::deephaven::proto::backplane::grpc::UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByEms>()},
-    {::_pbi::TcParser::GetTable<::io::deephaven::proto::backplane::grpc::UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByEmMin>()},
-    {::_pbi::TcParser::GetTable<::io::deephaven::proto::backplane::grpc::UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByEmMax>()},
-    {::_pbi::TcParser::GetTable<::io::deephaven::proto::backplane::grpc::UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByEmStd>()},
-    {::_pbi::TcParser::GetTable<::io::deephaven::proto::backplane::grpc::UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingCount>()},
-    {::_pbi::TcParser::GetTable<::io::deephaven::proto::backplane::grpc::UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingStd>()},
-    {::_pbi::TcParser::GetTable<::io::deephaven::proto::backplane::grpc::UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingWAvg>()},
-    {::_pbi::TcParser::GetTable<::io::deephaven::proto::backplane::grpc::UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingFormula>()},
-  }}, {{
-  }},
-};
-
-::uint8_t* UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec::_InternalSerialize(
-    ::uint8_t* target,
-    ::google::protobuf::io::EpsCopyOutputStream* stream) const {
-  // @@protoc_insertion_point(serialize_to_array_start:io.deephaven.proto.backplane.grpc.UpdateByRequest.UpdateByOperation.UpdateByColumn.UpdateBySpec)
-  ::uint32_t cached_has_bits = 0;
-  (void)cached_has_bits;
-
-  switch (type_case()) {
-    case kSum: {
-      target = ::google::protobuf::internal::WireFormatLite::InternalWriteMessage(
-          1, _Internal::sum(this),
-          _Internal::sum(this).GetCachedSize(), target, stream);
-      break;
-    }
-    case kMin: {
-      target = ::google::protobuf::internal::WireFormatLite::InternalWriteMessage(
-          2, _Internal::min(this),
-          _Internal::min(this).GetCachedSize(), target, stream);
-      break;
-    }
-    case kMax: {
-      target = ::google::protobuf::internal::WireFormatLite::InternalWriteMessage(
-          3, _Internal::max(this),
-          _Internal::max(this).GetCachedSize(), target, stream);
-      break;
-    }
-    case kProduct: {
-      target = ::google::protobuf::internal::WireFormatLite::InternalWriteMessage(
-          4, _Internal::product(this),
-          _Internal::product(this).GetCachedSize(), target, stream);
-      break;
-    }
-    case kFill: {
-      target = ::google::protobuf::internal::WireFormatLite::InternalWriteMessage(
-          5, _Internal::fill(this),
-          _Internal::fill(this).GetCachedSize(), target, stream);
-      break;
-    }
-    case kEma: {
-      target = ::google::protobuf::internal::WireFormatLite::InternalWriteMessage(
-          6, _Internal::ema(this),
-          _Internal::ema(this).GetCachedSize(), target, stream);
-      break;
-    }
-    case kRollingSum: {
-      target = ::google::protobuf::internal::WireFormatLite::InternalWriteMessage(
-          7, _Internal::rolling_sum(this),
-          _Internal::rolling_sum(this).GetCachedSize(), target, stream);
-      break;
-    }
-    case kRollingGroup: {
-      target = ::google::protobuf::internal::WireFormatLite::InternalWriteMessage(
-          8, _Internal::rolling_group(this),
-          _Internal::rolling_group(this).GetCachedSize(), target, stream);
-      break;
-    }
-    case kRollingAvg: {
-      target = ::google::protobuf::internal::WireFormatLite::InternalWriteMessage(
-          9, _Internal::rolling_avg(this),
-          _Internal::rolling_avg(this).GetCachedSize(), target, stream);
-      break;
-    }
-    case kRollingMin: {
-      target = ::google::protobuf::internal::WireFormatLite::InternalWriteMessage(
-          10, _Internal::rolling_min(this),
-          _Internal::rolling_min(this).GetCachedSize(), target, stream);
-      break;
-    }
-    case kRollingMax: {
-      target = ::google::protobuf::internal::WireFormatLite::InternalWriteMessage(
-          11, _Internal::rolling_max(this),
-          _Internal::rolling_max(this).GetCachedSize(), target, stream);
-      break;
-    }
-    case kRollingProduct: {
-      target = ::google::protobuf::internal::WireFormatLite::InternalWriteMessage(
-          12, _Internal::rolling_product(this),
-          _Internal::rolling_product(this).GetCachedSize(), target, stream);
-      break;
-    }
-    case kDelta: {
-      target = ::google::protobuf::internal::WireFormatLite::InternalWriteMessage(
-          13, _Internal::delta(this),
-          _Internal::delta(this).GetCachedSize(), target, stream);
-      break;
-    }
-    case kEms: {
-      target = ::google::protobuf::internal::WireFormatLite::InternalWriteMessage(
-          14, _Internal::ems(this),
-          _Internal::ems(this).GetCachedSize(), target, stream);
-      break;
-    }
-    case kEmMin: {
-      target = ::google::protobuf::internal::WireFormatLite::InternalWriteMessage(
-          15, _Internal::em_min(this),
-          _Internal::em_min(this).GetCachedSize(), target, stream);
-      break;
-    }
-    case kEmMax: {
-      target = ::google::protobuf::internal::WireFormatLite::InternalWriteMessage(
-          16, _Internal::em_max(this),
-          _Internal::em_max(this).GetCachedSize(), target, stream);
-      break;
-    }
-    case kEmStd: {
-      target = ::google::protobuf::internal::WireFormatLite::InternalWriteMessage(
-          17, _Internal::em_std(this),
-          _Internal::em_std(this).GetCachedSize(), target, stream);
-      break;
-    }
-    case kRollingCount: {
-      target = ::google::protobuf::internal::WireFormatLite::InternalWriteMessage(
-          18, _Internal::rolling_count(this),
-          _Internal::rolling_count(this).GetCachedSize(), target, stream);
-      break;
-    }
-    case kRollingStd: {
-      target = ::google::protobuf::internal::WireFormatLite::InternalWriteMessage(
-          19, _Internal::rolling_std(this),
-          _Internal::rolling_std(this).GetCachedSize(), target, stream);
-      break;
-    }
-    case kRollingWavg: {
-      target = ::google::protobuf::internal::WireFormatLite::InternalWriteMessage(
-          20, _Internal::rolling_wavg(this),
-          _Internal::rolling_wavg(this).GetCachedSize(), target, stream);
-      break;
-    }
-    case kRollingFormula: {
-      target = ::google::protobuf::internal::WireFormatLite::InternalWriteMessage(
-          21, _Internal::rolling_formula(this),
-          _Internal::rolling_formula(this).GetCachedSize(), target, stream);
-      break;
-    }
-    default:
-      break;
-  }
-  if (PROTOBUF_PREDICT_FALSE(_internal_metadata_.have_unknown_fields())) {
-    target =
-        ::_pbi::WireFormat::InternalSerializeUnknownFieldsToArray(
-            _internal_metadata_.unknown_fields<::google::protobuf::UnknownFieldSet>(::google::protobuf::UnknownFieldSet::default_instance), target, stream);
-  }
-  // @@protoc_insertion_point(serialize_to_array_end:io.deephaven.proto.backplane.grpc.UpdateByRequest.UpdateByOperation.UpdateByColumn.UpdateBySpec)
-  return target;
-}
-
-::size_t UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec::ByteSizeLong() const {
-// @@protoc_insertion_point(message_byte_size_start:io.deephaven.proto.backplane.grpc.UpdateByRequest.UpdateByOperation.UpdateByColumn.UpdateBySpec)
-  ::size_t total_size = 0;
-
-  ::uint32_t cached_has_bits = 0;
-  // Prevent compiler warnings about cached_has_bits being unused
-  (void) cached_has_bits;
-
-  switch (type_case()) {
-    // .io.deephaven.proto.backplane.grpc.UpdateByRequest.UpdateByOperation.UpdateByColumn.UpdateBySpec.UpdateByCumulativeSum sum = 1;
-    case kSum: {
-      total_size +=
-          1 + ::google::protobuf::internal::WireFormatLite::MessageSize(*_impl_.type_.sum_);
-      break;
-    }
-    // .io.deephaven.proto.backplane.grpc.UpdateByRequest.UpdateByOperation.UpdateByColumn.UpdateBySpec.UpdateByCumulativeMin min = 2;
-    case kMin: {
-      total_size +=
-          1 + ::google::protobuf::internal::WireFormatLite::MessageSize(*_impl_.type_.min_);
-      break;
-    }
-    // .io.deephaven.proto.backplane.grpc.UpdateByRequest.UpdateByOperation.UpdateByColumn.UpdateBySpec.UpdateByCumulativeMax max = 3;
-    case kMax: {
-      total_size +=
-          1 + ::google::protobuf::internal::WireFormatLite::MessageSize(*_impl_.type_.max_);
-      break;
-    }
-    // .io.deephaven.proto.backplane.grpc.UpdateByRequest.UpdateByOperation.UpdateByColumn.UpdateBySpec.UpdateByCumulativeProduct product = 4;
-    case kProduct: {
-      total_size +=
-          1 + ::google::protobuf::internal::WireFormatLite::MessageSize(*_impl_.type_.product_);
-      break;
-    }
-    // .io.deephaven.proto.backplane.grpc.UpdateByRequest.UpdateByOperation.UpdateByColumn.UpdateBySpec.UpdateByFill fill = 5;
-    case kFill: {
-      total_size +=
-          1 + ::google::protobuf::internal::WireFormatLite::MessageSize(*_impl_.type_.fill_);
-      break;
-    }
-    // .io.deephaven.proto.backplane.grpc.UpdateByRequest.UpdateByOperation.UpdateByColumn.UpdateBySpec.UpdateByEma ema = 6;
-    case kEma: {
-      total_size +=
-          1 + ::google::protobuf::internal::WireFormatLite::MessageSize(*_impl_.type_.ema_);
-      break;
-    }
-    // .io.deephaven.proto.backplane.grpc.UpdateByRequest.UpdateByOperation.UpdateByColumn.UpdateBySpec.UpdateByRollingSum rolling_sum = 7;
-    case kRollingSum: {
-      total_size +=
-          1 + ::google::protobuf::internal::WireFormatLite::MessageSize(*_impl_.type_.rolling_sum_);
-      break;
-    }
-    // .io.deephaven.proto.backplane.grpc.UpdateByRequest.UpdateByOperation.UpdateByColumn.UpdateBySpec.UpdateByRollingGroup rolling_group = 8;
-    case kRollingGroup: {
-      total_size +=
-          1 + ::google::protobuf::internal::WireFormatLite::MessageSize(*_impl_.type_.rolling_group_);
-      break;
-    }
-    // .io.deephaven.proto.backplane.grpc.UpdateByRequest.UpdateByOperation.UpdateByColumn.UpdateBySpec.UpdateByRollingAvg rolling_avg = 9;
-    case kRollingAvg: {
-      total_size +=
-          1 + ::google::protobuf::internal::WireFormatLite::MessageSize(*_impl_.type_.rolling_avg_);
-      break;
-    }
-    // .io.deephaven.proto.backplane.grpc.UpdateByRequest.UpdateByOperation.UpdateByColumn.UpdateBySpec.UpdateByRollingMin rolling_min = 10;
-    case kRollingMin: {
-      total_size +=
-          1 + ::google::protobuf::internal::WireFormatLite::MessageSize(*_impl_.type_.rolling_min_);
-      break;
-    }
-    // .io.deephaven.proto.backplane.grpc.UpdateByRequest.UpdateByOperation.UpdateByColumn.UpdateBySpec.UpdateByRollingMax rolling_max = 11;
-    case kRollingMax: {
-      total_size +=
-          1 + ::google::protobuf::internal::WireFormatLite::MessageSize(*_impl_.type_.rolling_max_);
-      break;
-    }
-    // .io.deephaven.proto.backplane.grpc.UpdateByRequest.UpdateByOperation.UpdateByColumn.UpdateBySpec.UpdateByRollingProduct rolling_product = 12;
-    case kRollingProduct: {
-      total_size +=
-          1 + ::google::protobuf::internal::WireFormatLite::MessageSize(*_impl_.type_.rolling_product_);
-      break;
-    }
-    // .io.deephaven.proto.backplane.grpc.UpdateByRequest.UpdateByOperation.UpdateByColumn.UpdateBySpec.UpdateByDelta delta = 13;
-    case kDelta: {
-      total_size +=
-          1 + ::google::protobuf::internal::WireFormatLite::MessageSize(*_impl_.type_.delta_);
-      break;
-    }
-    // .io.deephaven.proto.backplane.grpc.UpdateByRequest.UpdateByOperation.UpdateByColumn.UpdateBySpec.UpdateByEms ems = 14;
-    case kEms: {
-      total_size +=
-          1 + ::google::protobuf::internal::WireFormatLite::MessageSize(*_impl_.type_.ems_);
-      break;
-    }
-    // .io.deephaven.proto.backplane.grpc.UpdateByRequest.UpdateByOperation.UpdateByColumn.UpdateBySpec.UpdateByEmMin em_min = 15;
-    case kEmMin: {
-      total_size +=
-          1 + ::google::protobuf::internal::WireFormatLite::MessageSize(*_impl_.type_.em_min_);
-      break;
-    }
-    // .io.deephaven.proto.backplane.grpc.UpdateByRequest.UpdateByOperation.UpdateByColumn.UpdateBySpec.UpdateByEmMax em_max = 16;
-    case kEmMax: {
-      total_size +=
-          2 + ::google::protobuf::internal::WireFormatLite::MessageSize(*_impl_.type_.em_max_);
-      break;
-    }
-    // .io.deephaven.proto.backplane.grpc.UpdateByRequest.UpdateByOperation.UpdateByColumn.UpdateBySpec.UpdateByEmStd em_std = 17;
-    case kEmStd: {
-      total_size +=
-          2 + ::google::protobuf::internal::WireFormatLite::MessageSize(*_impl_.type_.em_std_);
-      break;
-    }
-    // .io.deephaven.proto.backplane.grpc.UpdateByRequest.UpdateByOperation.UpdateByColumn.UpdateBySpec.UpdateByRollingCount rolling_count = 18;
-    case kRollingCount: {
-      total_size +=
-          2 + ::google::protobuf::internal::WireFormatLite::MessageSize(*_impl_.type_.rolling_count_);
-      break;
-    }
-    // .io.deephaven.proto.backplane.grpc.UpdateByRequest.UpdateByOperation.UpdateByColumn.UpdateBySpec.UpdateByRollingStd rolling_std = 19;
-    case kRollingStd: {
-      total_size +=
-          2 + ::google::protobuf::internal::WireFormatLite::MessageSize(*_impl_.type_.rolling_std_);
-      break;
-    }
-    // .io.deephaven.proto.backplane.grpc.UpdateByRequest.UpdateByOperation.UpdateByColumn.UpdateBySpec.UpdateByRollingWAvg rolling_wavg = 20;
-    case kRollingWavg: {
-      total_size +=
-          2 + ::google::protobuf::internal::WireFormatLite::MessageSize(*_impl_.type_.rolling_wavg_);
-      break;
-    }
-    // .io.deephaven.proto.backplane.grpc.UpdateByRequest.UpdateByOperation.UpdateByColumn.UpdateBySpec.UpdateByRollingFormula rolling_formula = 21;
-    case kRollingFormula: {
-      total_size +=
-          2 + ::google::protobuf::internal::WireFormatLite::MessageSize(*_impl_.type_.rolling_formula_);
-      break;
-    }
-    case TYPE_NOT_SET: {
-      break;
-    }
-  }
-  return MaybeComputeUnknownFieldsSize(total_size, &_impl_._cached_size_);
-}
-
-const ::google::protobuf::Message::ClassData UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec::_class_data_ = {
-    UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec::MergeImpl,
-    nullptr,  // OnDemandRegisterArenaDtor
-};
-const ::google::protobuf::Message::ClassData* UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec::GetClassData() const {
-  return &_class_data_;
-}
-
-void UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec::MergeImpl(::google::protobuf::Message& to_msg, const ::google::protobuf::Message& from_msg) {
-  auto* const _this = static_cast<UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec*>(&to_msg);
-  auto& from = static_cast<const UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec&>(from_msg);
-  // @@protoc_insertion_point(class_specific_merge_from_start:io.deephaven.proto.backplane.grpc.UpdateByRequest.UpdateByOperation.UpdateByColumn.UpdateBySpec)
-  ABSL_DCHECK_NE(&from, _this);
-  ::uint32_t cached_has_bits = 0;
-  (void) cached_has_bits;
-
-  switch (from.type_case()) {
-    case kSum: {
-      _this->_internal_mutable_sum()->::io::deephaven::proto::backplane::grpc::UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByCumulativeSum::MergeFrom(
-          from._internal_sum());
-      break;
-    }
-    case kMin: {
-      _this->_internal_mutable_min()->::io::deephaven::proto::backplane::grpc::UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByCumulativeMin::MergeFrom(
-          from._internal_min());
-      break;
-    }
-    case kMax: {
-      _this->_internal_mutable_max()->::io::deephaven::proto::backplane::grpc::UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByCumulativeMax::MergeFrom(
-          from._internal_max());
-      break;
-    }
-    case kProduct: {
-      _this->_internal_mutable_product()->::io::deephaven::proto::backplane::grpc::UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByCumulativeProduct::MergeFrom(
-          from._internal_product());
-      break;
-    }
-    case kFill: {
-      _this->_internal_mutable_fill()->::io::deephaven::proto::backplane::grpc::UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByFill::MergeFrom(
-          from._internal_fill());
-      break;
-    }
-    case kEma: {
-      _this->_internal_mutable_ema()->::io::deephaven::proto::backplane::grpc::UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByEma::MergeFrom(
-          from._internal_ema());
-      break;
-    }
-    case kRollingSum: {
-      _this->_internal_mutable_rolling_sum()->::io::deephaven::proto::backplane::grpc::UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingSum::MergeFrom(
-          from._internal_rolling_sum());
-      break;
-    }
-    case kRollingGroup: {
-      _this->_internal_mutable_rolling_group()->::io::deephaven::proto::backplane::grpc::UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingGroup::MergeFrom(
-          from._internal_rolling_group());
-      break;
-    }
-    case kRollingAvg: {
-      _this->_internal_mutable_rolling_avg()->::io::deephaven::proto::backplane::grpc::UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingAvg::MergeFrom(
-          from._internal_rolling_avg());
-      break;
-    }
-    case kRollingMin: {
-      _this->_internal_mutable_rolling_min()->::io::deephaven::proto::backplane::grpc::UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingMin::MergeFrom(
-          from._internal_rolling_min());
-      break;
-    }
-    case kRollingMax: {
-      _this->_internal_mutable_rolling_max()->::io::deephaven::proto::backplane::grpc::UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingMax::MergeFrom(
-          from._internal_rolling_max());
-      break;
-    }
-    case kRollingProduct: {
-      _this->_internal_mutable_rolling_product()->::io::deephaven::proto::backplane::grpc::UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingProduct::MergeFrom(
-          from._internal_rolling_product());
-      break;
-    }
-    case kDelta: {
-      _this->_internal_mutable_delta()->::io::deephaven::proto::backplane::grpc::UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByDelta::MergeFrom(
-          from._internal_delta());
-      break;
-    }
-    case kEms: {
-      _this->_internal_mutable_ems()->::io::deephaven::proto::backplane::grpc::UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByEms::MergeFrom(
-          from._internal_ems());
-      break;
-    }
-    case kEmMin: {
-      _this->_internal_mutable_em_min()->::io::deephaven::proto::backplane::grpc::UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByEmMin::MergeFrom(
-          from._internal_em_min());
-      break;
-    }
-    case kEmMax: {
-      _this->_internal_mutable_em_max()->::io::deephaven::proto::backplane::grpc::UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByEmMax::MergeFrom(
-          from._internal_em_max());
-      break;
-    }
-    case kEmStd: {
-      _this->_internal_mutable_em_std()->::io::deephaven::proto::backplane::grpc::UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByEmStd::MergeFrom(
-          from._internal_em_std());
-      break;
-    }
-    case kRollingCount: {
-      _this->_internal_mutable_rolling_count()->::io::deephaven::proto::backplane::grpc::UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingCount::MergeFrom(
-          from._internal_rolling_count());
-      break;
-    }
-    case kRollingStd: {
-      _this->_internal_mutable_rolling_std()->::io::deephaven::proto::backplane::grpc::UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingStd::MergeFrom(
-          from._internal_rolling_std());
-      break;
-    }
-    case kRollingWavg: {
-      _this->_internal_mutable_rolling_wavg()->::io::deephaven::proto::backplane::grpc::UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingWAvg::MergeFrom(
-          from._internal_rolling_wavg());
-      break;
-    }
-    case kRollingFormula: {
-      _this->_internal_mutable_rolling_formula()->::io::deephaven::proto::backplane::grpc::UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingFormula::MergeFrom(
-          from._internal_rolling_formula());
-      break;
-    }
-    case TYPE_NOT_SET: {
-      break;
-    }
-  }
-  _this->_internal_metadata_.MergeFrom<::google::protobuf::UnknownFieldSet>(from._internal_metadata_);
-}
-
-void UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec::CopyFrom(const UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec& from) {
-// @@protoc_insertion_point(class_specific_copy_from_start:io.deephaven.proto.backplane.grpc.UpdateByRequest.UpdateByOperation.UpdateByColumn.UpdateBySpec)
-  if (&from == this) return;
-  Clear();
-  MergeFrom(from);
-}
-
-PROTOBUF_NOINLINE bool UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec::IsInitialized() const {
-  return true;
-}
-
-::_pbi::CachedSize* UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec::AccessCachedSize() const {
-  return &_impl_._cached_size_;
-}
-void UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec::InternalSwap(UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec* PROTOBUF_RESTRICT other) {
-  using std::swap;
-  _internal_metadata_.InternalSwap(&other->_internal_metadata_);
-  swap(_impl_.type_, other->_impl_.type_);
-  swap(_impl_._oneof_case_[0], other->_impl_._oneof_case_[0]);
-}
-
-::google::protobuf::Metadata UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec::GetMetadata() const {
-  return ::_pbi::AssignDescriptors(
-      &descriptor_table_deephaven_2fproto_2ftable_2eproto_getter, &descriptor_table_deephaven_2fproto_2ftable_2eproto_once,
-      file_level_metadata_deephaven_2fproto_2ftable_2eproto[37]);
-}
-// ===================================================================
-
-class UpdateByRequest_UpdateByOperation_UpdateByColumn::_Internal {
- public:
-  using HasBits = decltype(std::declval<UpdateByRequest_UpdateByOperation_UpdateByColumn>()._impl_._has_bits_);
-  static constexpr ::int32_t kHasBitsOffset =
-    8 * PROTOBUF_FIELD_OFFSET(UpdateByRequest_UpdateByOperation_UpdateByColumn, _impl_._has_bits_);
-  static const ::io::deephaven::proto::backplane::grpc::UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec& spec(const UpdateByRequest_UpdateByOperation_UpdateByColumn* msg);
-  static void set_has_spec(HasBits* has_bits) {
-    (*has_bits)[0] |= 1u;
-  }
-};
-
-const ::io::deephaven::proto::backplane::grpc::UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec& UpdateByRequest_UpdateByOperation_UpdateByColumn::_Internal::spec(const UpdateByRequest_UpdateByOperation_UpdateByColumn* msg) {
-  return *msg->_impl_.spec_;
-}
-UpdateByRequest_UpdateByOperation_UpdateByColumn::UpdateByRequest_UpdateByOperation_UpdateByColumn(::google::protobuf::Arena* arena)
-    : ::google::protobuf::Message(arena) {
-  SharedCtor(arena);
-  // @@protoc_insertion_point(arena_constructor:io.deephaven.proto.backplane.grpc.UpdateByRequest.UpdateByOperation.UpdateByColumn)
-}
-inline PROTOBUF_NDEBUG_INLINE UpdateByRequest_UpdateByOperation_UpdateByColumn::Impl_::Impl_(
-    ::google::protobuf::internal::InternalVisibility visibility, ::google::protobuf::Arena* arena,
-    const Impl_& from)
-      : _has_bits_{from._has_bits_},
-        _cached_size_{0},
-        match_pairs_{visibility, arena, from.match_pairs_} {}
-
-UpdateByRequest_UpdateByOperation_UpdateByColumn::UpdateByRequest_UpdateByOperation_UpdateByColumn(
-    ::google::protobuf::Arena* arena,
-    const UpdateByRequest_UpdateByOperation_UpdateByColumn& from)
-    : ::google::protobuf::Message(arena) {
-  UpdateByRequest_UpdateByOperation_UpdateByColumn* const _this = this;
-  (void)_this;
-  _internal_metadata_.MergeFrom<::google::protobuf::UnknownFieldSet>(
-      from._internal_metadata_);
-  new (&_impl_) Impl_(internal_visibility(), arena, from._impl_);
-  ::uint32_t cached_has_bits = _impl_._has_bits_[0];
-  _impl_.spec_ = (cached_has_bits & 0x00000001u)
-                ? CreateMaybeMessage<::io::deephaven::proto::backplane::grpc::UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec>(arena, *from._impl_.spec_)
-                : nullptr;
-
-  // @@protoc_insertion_point(copy_constructor:io.deephaven.proto.backplane.grpc.UpdateByRequest.UpdateByOperation.UpdateByColumn)
-}
-inline PROTOBUF_NDEBUG_INLINE UpdateByRequest_UpdateByOperation_UpdateByColumn::Impl_::Impl_(
-    ::google::protobuf::internal::InternalVisibility visibility,
-    ::google::protobuf::Arena* arena)
-      : _cached_size_{0},
-        match_pairs_{visibility, arena} {}
-
-inline void UpdateByRequest_UpdateByOperation_UpdateByColumn::SharedCtor(::_pb::Arena* arena) {
-  new (&_impl_) Impl_(internal_visibility(), arena);
-  _impl_.spec_ = {};
-}
-UpdateByRequest_UpdateByOperation_UpdateByColumn::~UpdateByRequest_UpdateByOperation_UpdateByColumn() {
-  // @@protoc_insertion_point(destructor:io.deephaven.proto.backplane.grpc.UpdateByRequest.UpdateByOperation.UpdateByColumn)
-  _internal_metadata_.Delete<::google::protobuf::UnknownFieldSet>();
-  SharedDtor();
-}
-inline void UpdateByRequest_UpdateByOperation_UpdateByColumn::SharedDtor() {
-  ABSL_DCHECK(GetArena() == nullptr);
-  delete _impl_.spec_;
-  _impl_.~Impl_();
-}
-
-PROTOBUF_NOINLINE void UpdateByRequest_UpdateByOperation_UpdateByColumn::Clear() {
-// @@protoc_insertion_point(message_clear_start:io.deephaven.proto.backplane.grpc.UpdateByRequest.UpdateByOperation.UpdateByColumn)
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  ::uint32_t cached_has_bits = 0;
-  // Prevent compiler warnings about cached_has_bits being unused
-  (void) cached_has_bits;
-
-  _impl_.match_pairs_.Clear();
-  cached_has_bits = _impl_._has_bits_[0];
-  if (cached_has_bits & 0x00000001u) {
-    ABSL_DCHECK(_impl_.spec_ != nullptr);
-    _impl_.spec_->Clear();
-  }
-  _impl_._has_bits_.Clear();
-  _internal_metadata_.Clear<::google::protobuf::UnknownFieldSet>();
-}
-
-const char* UpdateByRequest_UpdateByOperation_UpdateByColumn::_InternalParse(
-    const char* ptr, ::_pbi::ParseContext* ctx) {
-  ptr = ::_pbi::TcParser::ParseLoop(this, ptr, ctx, &_table_.header);
-  return ptr;
-}
-
-
-PROTOBUF_CONSTINIT PROTOBUF_ATTRIBUTE_INIT_PRIORITY1
-const ::_pbi::TcParseTable<1, 2, 1, 102, 2> UpdateByRequest_UpdateByOperation_UpdateByColumn::_table_ = {
-  {
-    PROTOBUF_FIELD_OFFSET(UpdateByRequest_UpdateByOperation_UpdateByColumn, _impl_._has_bits_),
-    0, // no _extensions_
-    2, 8,  // max_field_number, fast_idx_mask
-    offsetof(decltype(_table_), field_lookup_table),
-    4294967292,  // skipmap
-    offsetof(decltype(_table_), field_entries),
-    2,  // num_field_entries
-    1,  // num_aux_entries
-    offsetof(decltype(_table_), aux_entries),
-    &_UpdateByRequest_UpdateByOperation_UpdateByColumn_default_instance_._instance,
-    ::_pbi::TcParser::GenericFallback,  // fallback
-  }, {{
-    // repeated string match_pairs = 2;
-    {::_pbi::TcParser::FastUR1,
-     {18, 63, 0, PROTOBUF_FIELD_OFFSET(UpdateByRequest_UpdateByOperation_UpdateByColumn, _impl_.match_pairs_)}},
-    // .io.deephaven.proto.backplane.grpc.UpdateByRequest.UpdateByOperation.UpdateByColumn.UpdateBySpec spec = 1;
-    {::_pbi::TcParser::FastMtS1,
-     {10, 0, 0, PROTOBUF_FIELD_OFFSET(UpdateByRequest_UpdateByOperation_UpdateByColumn, _impl_.spec_)}},
-  }}, {{
-    65535, 65535
-  }}, {{
-    // .io.deephaven.proto.backplane.grpc.UpdateByRequest.UpdateByOperation.UpdateByColumn.UpdateBySpec spec = 1;
-    {PROTOBUF_FIELD_OFFSET(UpdateByRequest_UpdateByOperation_UpdateByColumn, _impl_.spec_), _Internal::kHasBitsOffset + 0, 0,
-    (0 | ::_fl::kFcOptional | ::_fl::kMessage | ::_fl::kTvTable)},
-    // repeated string match_pairs = 2;
-    {PROTOBUF_FIELD_OFFSET(UpdateByRequest_UpdateByOperation_UpdateByColumn, _impl_.match_pairs_), -1, 0,
-    (0 | ::_fl::kFcRepeated | ::_fl::kUtf8String | ::_fl::kRepSString)},
-  }}, {{
-    {::_pbi::TcParser::GetTable<::io::deephaven::proto::backplane::grpc::UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec>()},
-  }}, {{
-    "\122\0\13\0\0\0\0\0"
-    "io.deephaven.proto.backplane.grpc.UpdateByRequest.UpdateByOperation.UpdateByColumn"
-    "match_pairs"
-  }},
-};
-
-::uint8_t* UpdateByRequest_UpdateByOperation_UpdateByColumn::_InternalSerialize(
-    ::uint8_t* target,
-    ::google::protobuf::io::EpsCopyOutputStream* stream) const {
-  // @@protoc_insertion_point(serialize_to_array_start:io.deephaven.proto.backplane.grpc.UpdateByRequest.UpdateByOperation.UpdateByColumn)
-  ::uint32_t cached_has_bits = 0;
-  (void)cached_has_bits;
-
-  cached_has_bits = _impl_._has_bits_[0];
-  // .io.deephaven.proto.backplane.grpc.UpdateByRequest.UpdateByOperation.UpdateByColumn.UpdateBySpec spec = 1;
-  if (cached_has_bits & 0x00000001u) {
-    target = ::google::protobuf::internal::WireFormatLite::InternalWriteMessage(
-        1, _Internal::spec(this),
-        _Internal::spec(this).GetCachedSize(), target, stream);
-  }
-
-  // repeated string match_pairs = 2;
-  for (int i = 0, n = this->_internal_match_pairs_size(); i < n; ++i) {
-    const auto& s = this->_internal_match_pairs().Get(i);
-    ::google::protobuf::internal::WireFormatLite::VerifyUtf8String(
-        s.data(), static_cast<int>(s.length()), ::google::protobuf::internal::WireFormatLite::SERIALIZE, "io.deephaven.proto.backplane.grpc.UpdateByRequest.UpdateByOperation.UpdateByColumn.match_pairs");
-    target = stream->WriteString(2, s, target);
-  }
-
-  if (PROTOBUF_PREDICT_FALSE(_internal_metadata_.have_unknown_fields())) {
-    target =
-        ::_pbi::WireFormat::InternalSerializeUnknownFieldsToArray(
-            _internal_metadata_.unknown_fields<::google::protobuf::UnknownFieldSet>(::google::protobuf::UnknownFieldSet::default_instance), target, stream);
-  }
-  // @@protoc_insertion_point(serialize_to_array_end:io.deephaven.proto.backplane.grpc.UpdateByRequest.UpdateByOperation.UpdateByColumn)
-  return target;
-}
-
-::size_t UpdateByRequest_UpdateByOperation_UpdateByColumn::ByteSizeLong() const {
-// @@protoc_insertion_point(message_byte_size_start:io.deephaven.proto.backplane.grpc.UpdateByRequest.UpdateByOperation.UpdateByColumn)
-  ::size_t total_size = 0;
-
-  ::uint32_t cached_has_bits = 0;
-  // Prevent compiler warnings about cached_has_bits being unused
-  (void) cached_has_bits;
-
-  // repeated string match_pairs = 2;
-  total_size += 1 * ::google::protobuf::internal::FromIntSize(_internal_match_pairs().size());
-  for (int i = 0, n = _internal_match_pairs().size(); i < n; ++i) {
-    total_size += ::google::protobuf::internal::WireFormatLite::StringSize(
-        _internal_match_pairs().Get(i));
-  }
-  // .io.deephaven.proto.backplane.grpc.UpdateByRequest.UpdateByOperation.UpdateByColumn.UpdateBySpec spec = 1;
-  cached_has_bits = _impl_._has_bits_[0];
-  if (cached_has_bits & 0x00000001u) {
-    total_size +=
-        1 + ::google::protobuf::internal::WireFormatLite::MessageSize(*_impl_.spec_);
-  }
-
-  return MaybeComputeUnknownFieldsSize(total_size, &_impl_._cached_size_);
-}
-
-const ::google::protobuf::Message::ClassData UpdateByRequest_UpdateByOperation_UpdateByColumn::_class_data_ = {
-    UpdateByRequest_UpdateByOperation_UpdateByColumn::MergeImpl,
-    nullptr,  // OnDemandRegisterArenaDtor
-};
-const ::google::protobuf::Message::ClassData* UpdateByRequest_UpdateByOperation_UpdateByColumn::GetClassData() const {
-  return &_class_data_;
-}
-
-void UpdateByRequest_UpdateByOperation_UpdateByColumn::MergeImpl(::google::protobuf::Message& to_msg, const ::google::protobuf::Message& from_msg) {
-  auto* const _this = static_cast<UpdateByRequest_UpdateByOperation_UpdateByColumn*>(&to_msg);
-  auto& from = static_cast<const UpdateByRequest_UpdateByOperation_UpdateByColumn&>(from_msg);
-  // @@protoc_insertion_point(class_specific_merge_from_start:io.deephaven.proto.backplane.grpc.UpdateByRequest.UpdateByOperation.UpdateByColumn)
-  ABSL_DCHECK_NE(&from, _this);
-  ::uint32_t cached_has_bits = 0;
-  (void) cached_has_bits;
-
-  _this->_internal_mutable_match_pairs()->MergeFrom(from._internal_match_pairs());
-  if ((from._impl_._has_bits_[0] & 0x00000001u) != 0) {
-    _this->_internal_mutable_spec()->::io::deephaven::proto::backplane::grpc::UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec::MergeFrom(
-        from._internal_spec());
-  }
-  _this->_internal_metadata_.MergeFrom<::google::protobuf::UnknownFieldSet>(from._internal_metadata_);
-}
-
-void UpdateByRequest_UpdateByOperation_UpdateByColumn::CopyFrom(const UpdateByRequest_UpdateByOperation_UpdateByColumn& from) {
-// @@protoc_insertion_point(class_specific_copy_from_start:io.deephaven.proto.backplane.grpc.UpdateByRequest.UpdateByOperation.UpdateByColumn)
-  if (&from == this) return;
-  Clear();
-  MergeFrom(from);
-}
-
-PROTOBUF_NOINLINE bool UpdateByRequest_UpdateByOperation_UpdateByColumn::IsInitialized() const {
-  return true;
-}
-
-::_pbi::CachedSize* UpdateByRequest_UpdateByOperation_UpdateByColumn::AccessCachedSize() const {
-  return &_impl_._cached_size_;
-}
-void UpdateByRequest_UpdateByOperation_UpdateByColumn::InternalSwap(UpdateByRequest_UpdateByOperation_UpdateByColumn* PROTOBUF_RESTRICT other) {
-  using std::swap;
-  _internal_metadata_.InternalSwap(&other->_internal_metadata_);
-  swap(_impl_._has_bits_[0], other->_impl_._has_bits_[0]);
-  _impl_.match_pairs_.InternalSwap(&other->_impl_.match_pairs_);
-  swap(_impl_.spec_, other->_impl_.spec_);
-}
-
-::google::protobuf::Metadata UpdateByRequest_UpdateByOperation_UpdateByColumn::GetMetadata() const {
-  return ::_pbi::AssignDescriptors(
-      &descriptor_table_deephaven_2fproto_2ftable_2eproto_getter, &descriptor_table_deephaven_2fproto_2ftable_2eproto_once,
-      file_level_metadata_deephaven_2fproto_2ftable_2eproto[38]);
-}
-// ===================================================================
-
-class UpdateByRequest_UpdateByOperation::_Internal {
- public:
-  static constexpr ::int32_t kOneofCaseOffset =
-    PROTOBUF_FIELD_OFFSET(::io::deephaven::proto::backplane::grpc::UpdateByRequest_UpdateByOperation, _impl_._oneof_case_);
-  static const ::io::deephaven::proto::backplane::grpc::UpdateByRequest_UpdateByOperation_UpdateByColumn& column(const UpdateByRequest_UpdateByOperation* msg);
-};
-
-const ::io::deephaven::proto::backplane::grpc::UpdateByRequest_UpdateByOperation_UpdateByColumn& UpdateByRequest_UpdateByOperation::_Internal::column(const UpdateByRequest_UpdateByOperation* msg) {
-  return *msg->_impl_.type_.column_;
-}
-void UpdateByRequest_UpdateByOperation::set_allocated_column(::io::deephaven::proto::backplane::grpc::UpdateByRequest_UpdateByOperation_UpdateByColumn* column) {
-  ::google::protobuf::Arena* message_arena = GetArena();
-  clear_type();
-  if (column) {
-    ::google::protobuf::Arena* submessage_arena = column->GetArena();
-    if (message_arena != submessage_arena) {
-      column = ::google::protobuf::internal::GetOwnedMessage(message_arena, column, submessage_arena);
-    }
-    set_has_column();
-    _impl_.type_.column_ = column;
-  }
-  // @@protoc_insertion_point(field_set_allocated:io.deephaven.proto.backplane.grpc.UpdateByRequest.UpdateByOperation.column)
-}
-UpdateByRequest_UpdateByOperation::UpdateByRequest_UpdateByOperation(::google::protobuf::Arena* arena)
-    : ::google::protobuf::Message(arena) {
-  SharedCtor(arena);
-  // @@protoc_insertion_point(arena_constructor:io.deephaven.proto.backplane.grpc.UpdateByRequest.UpdateByOperation)
-}
-inline PROTOBUF_NDEBUG_INLINE UpdateByRequest_UpdateByOperation::Impl_::Impl_(
-    ::google::protobuf::internal::InternalVisibility visibility, ::google::protobuf::Arena* arena,
-    const Impl_& from)
-      : type_{},
-        _cached_size_{0},
-        _oneof_case_{from._oneof_case_[0]} {}
-
-UpdateByRequest_UpdateByOperation::UpdateByRequest_UpdateByOperation(
-    ::google::protobuf::Arena* arena,
-    const UpdateByRequest_UpdateByOperation& from)
-    : ::google::protobuf::Message(arena) {
-  UpdateByRequest_UpdateByOperation* const _this = this;
-  (void)_this;
-  _internal_metadata_.MergeFrom<::google::protobuf::UnknownFieldSet>(
-      from._internal_metadata_);
-  new (&_impl_) Impl_(internal_visibility(), arena, from._impl_);
-  switch (type_case()) {
-    case TYPE_NOT_SET:
-      break;
-      case kColumn:
-        _impl_.type_.column_ = CreateMaybeMessage<::io::deephaven::proto::backplane::grpc::UpdateByRequest_UpdateByOperation_UpdateByColumn>(arena, *from._impl_.type_.column_);
-        break;
-  }
-
-  // @@protoc_insertion_point(copy_constructor:io.deephaven.proto.backplane.grpc.UpdateByRequest.UpdateByOperation)
-}
-inline PROTOBUF_NDEBUG_INLINE UpdateByRequest_UpdateByOperation::Impl_::Impl_(
-    ::google::protobuf::internal::InternalVisibility visibility,
-    ::google::protobuf::Arena* arena)
-      : type_{},
-        _cached_size_{0},
-        _oneof_case_{} {}
-
-inline void UpdateByRequest_UpdateByOperation::SharedCtor(::_pb::Arena* arena) {
-  new (&_impl_) Impl_(internal_visibility(), arena);
-}
-UpdateByRequest_UpdateByOperation::~UpdateByRequest_UpdateByOperation() {
-  // @@protoc_insertion_point(destructor:io.deephaven.proto.backplane.grpc.UpdateByRequest.UpdateByOperation)
-  _internal_metadata_.Delete<::google::protobuf::UnknownFieldSet>();
-  SharedDtor();
-}
-inline void UpdateByRequest_UpdateByOperation::SharedDtor() {
-  ABSL_DCHECK(GetArena() == nullptr);
-  if (has_type()) {
-    clear_type();
-  }
-  _impl_.~Impl_();
-}
-
-void UpdateByRequest_UpdateByOperation::clear_type() {
-// @@protoc_insertion_point(one_of_clear_start:io.deephaven.proto.backplane.grpc.UpdateByRequest.UpdateByOperation)
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  switch (type_case()) {
-    case kColumn: {
-      if (GetArena() == nullptr) {
-        delete _impl_.type_.column_;
-      }
-      break;
-    }
-    case TYPE_NOT_SET: {
-      break;
-    }
-  }
-  _impl_._oneof_case_[0] = TYPE_NOT_SET;
-}
-
-
-PROTOBUF_NOINLINE void UpdateByRequest_UpdateByOperation::Clear() {
-// @@protoc_insertion_point(message_clear_start:io.deephaven.proto.backplane.grpc.UpdateByRequest.UpdateByOperation)
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  ::uint32_t cached_has_bits = 0;
-  // Prevent compiler warnings about cached_has_bits being unused
-  (void) cached_has_bits;
-
-  clear_type();
-  _internal_metadata_.Clear<::google::protobuf::UnknownFieldSet>();
-}
-
-const char* UpdateByRequest_UpdateByOperation::_InternalParse(
-    const char* ptr, ::_pbi::ParseContext* ctx) {
-  ptr = ::_pbi::TcParser::ParseLoop(this, ptr, ctx, &_table_.header);
-  return ptr;
-}
-
-
-PROTOBUF_CONSTINIT PROTOBUF_ATTRIBUTE_INIT_PRIORITY1
-const ::_pbi::TcParseTable<0, 1, 1, 0, 2> UpdateByRequest_UpdateByOperation::_table_ = {
-  {
-    0,  // no _has_bits_
-    0, // no _extensions_
-    1, 0,  // max_field_number, fast_idx_mask
-    offsetof(decltype(_table_), field_lookup_table),
-    4294967294,  // skipmap
-    offsetof(decltype(_table_), field_entries),
-    1,  // num_field_entries
-    1,  // num_aux_entries
-    offsetof(decltype(_table_), aux_entries),
-    &_UpdateByRequest_UpdateByOperation_default_instance_._instance,
-    ::_pbi::TcParser::GenericFallback,  // fallback
-  }, {{
-    {::_pbi::TcParser::MiniParse, {}},
-  }}, {{
-    65535, 65535
-  }}, {{
-    // .io.deephaven.proto.backplane.grpc.UpdateByRequest.UpdateByOperation.UpdateByColumn column = 1;
-    {PROTOBUF_FIELD_OFFSET(UpdateByRequest_UpdateByOperation, _impl_.type_.column_), _Internal::kOneofCaseOffset + 0, 0,
-    (0 | ::_fl::kFcOneof | ::_fl::kMessage | ::_fl::kTvTable)},
-  }}, {{
-    {::_pbi::TcParser::GetTable<::io::deephaven::proto::backplane::grpc::UpdateByRequest_UpdateByOperation_UpdateByColumn>()},
-  }}, {{
-  }},
-};
-
-::uint8_t* UpdateByRequest_UpdateByOperation::_InternalSerialize(
-    ::uint8_t* target,
-    ::google::protobuf::io::EpsCopyOutputStream* stream) const {
-  // @@protoc_insertion_point(serialize_to_array_start:io.deephaven.proto.backplane.grpc.UpdateByRequest.UpdateByOperation)
-  ::uint32_t cached_has_bits = 0;
-  (void)cached_has_bits;
-
-  // .io.deephaven.proto.backplane.grpc.UpdateByRequest.UpdateByOperation.UpdateByColumn column = 1;
-  if (type_case() == kColumn) {
-    target = ::google::protobuf::internal::WireFormatLite::InternalWriteMessage(
-        1, _Internal::column(this),
-        _Internal::column(this).GetCachedSize(), target, stream);
-  }
-
-  if (PROTOBUF_PREDICT_FALSE(_internal_metadata_.have_unknown_fields())) {
-    target =
-        ::_pbi::WireFormat::InternalSerializeUnknownFieldsToArray(
-            _internal_metadata_.unknown_fields<::google::protobuf::UnknownFieldSet>(::google::protobuf::UnknownFieldSet::default_instance), target, stream);
-  }
-  // @@protoc_insertion_point(serialize_to_array_end:io.deephaven.proto.backplane.grpc.UpdateByRequest.UpdateByOperation)
-  return target;
-}
-
-::size_t UpdateByRequest_UpdateByOperation::ByteSizeLong() const {
-// @@protoc_insertion_point(message_byte_size_start:io.deephaven.proto.backplane.grpc.UpdateByRequest.UpdateByOperation)
-  ::size_t total_size = 0;
-
-  ::uint32_t cached_has_bits = 0;
-  // Prevent compiler warnings about cached_has_bits being unused
-  (void) cached_has_bits;
-
-  switch (type_case()) {
-    // .io.deephaven.proto.backplane.grpc.UpdateByRequest.UpdateByOperation.UpdateByColumn column = 1;
-    case kColumn: {
-      total_size +=
-          1 + ::google::protobuf::internal::WireFormatLite::MessageSize(*_impl_.type_.column_);
-      break;
-    }
-    case TYPE_NOT_SET: {
-      break;
-    }
-  }
-  return MaybeComputeUnknownFieldsSize(total_size, &_impl_._cached_size_);
-}
-
-const ::google::protobuf::Message::ClassData UpdateByRequest_UpdateByOperation::_class_data_ = {
-    UpdateByRequest_UpdateByOperation::MergeImpl,
-    nullptr,  // OnDemandRegisterArenaDtor
-};
-const ::google::protobuf::Message::ClassData* UpdateByRequest_UpdateByOperation::GetClassData() const {
-  return &_class_data_;
-}
-
-void UpdateByRequest_UpdateByOperation::MergeImpl(::google::protobuf::Message& to_msg, const ::google::protobuf::Message& from_msg) {
-  auto* const _this = static_cast<UpdateByRequest_UpdateByOperation*>(&to_msg);
-  auto& from = static_cast<const UpdateByRequest_UpdateByOperation&>(from_msg);
-  // @@protoc_insertion_point(class_specific_merge_from_start:io.deephaven.proto.backplane.grpc.UpdateByRequest.UpdateByOperation)
-  ABSL_DCHECK_NE(&from, _this);
-  ::uint32_t cached_has_bits = 0;
-  (void) cached_has_bits;
-
-  switch (from.type_case()) {
-    case kColumn: {
-      _this->_internal_mutable_column()->::io::deephaven::proto::backplane::grpc::UpdateByRequest_UpdateByOperation_UpdateByColumn::MergeFrom(
-          from._internal_column());
-      break;
-    }
-    case TYPE_NOT_SET: {
-      break;
-    }
-  }
-  _this->_internal_metadata_.MergeFrom<::google::protobuf::UnknownFieldSet>(from._internal_metadata_);
-}
-
-void UpdateByRequest_UpdateByOperation::CopyFrom(const UpdateByRequest_UpdateByOperation& from) {
-// @@protoc_insertion_point(class_specific_copy_from_start:io.deephaven.proto.backplane.grpc.UpdateByRequest.UpdateByOperation)
-  if (&from == this) return;
-  Clear();
-  MergeFrom(from);
-}
-
-PROTOBUF_NOINLINE bool UpdateByRequest_UpdateByOperation::IsInitialized() const {
-  return true;
-}
-
-::_pbi::CachedSize* UpdateByRequest_UpdateByOperation::AccessCachedSize() const {
-  return &_impl_._cached_size_;
-}
-void UpdateByRequest_UpdateByOperation::InternalSwap(UpdateByRequest_UpdateByOperation* PROTOBUF_RESTRICT other) {
-  using std::swap;
-  _internal_metadata_.InternalSwap(&other->_internal_metadata_);
-  swap(_impl_.type_, other->_impl_.type_);
-  swap(_impl_._oneof_case_[0], other->_impl_._oneof_case_[0]);
-}
-
-::google::protobuf::Metadata UpdateByRequest_UpdateByOperation::GetMetadata() const {
-  return ::_pbi::AssignDescriptors(
-      &descriptor_table_deephaven_2fproto_2ftable_2eproto_getter, &descriptor_table_deephaven_2fproto_2ftable_2eproto_once,
-      file_level_metadata_deephaven_2fproto_2ftable_2eproto[39]);
-}
-// ===================================================================
-
-class UpdateByRequest::_Internal {
- public:
-  using HasBits = decltype(std::declval<UpdateByRequest>()._impl_._has_bits_);
-  static constexpr ::int32_t kHasBitsOffset =
-    8 * PROTOBUF_FIELD_OFFSET(UpdateByRequest, _impl_._has_bits_);
-  static const ::io::deephaven::proto::backplane::grpc::Ticket& result_id(const UpdateByRequest* msg);
-  static void set_has_result_id(HasBits* has_bits) {
-    (*has_bits)[0] |= 1u;
-  }
-  static const ::io::deephaven::proto::backplane::grpc::TableReference& source_id(const UpdateByRequest* msg);
-  static void set_has_source_id(HasBits* has_bits) {
-    (*has_bits)[0] |= 2u;
-  }
-  static const ::io::deephaven::proto::backplane::grpc::UpdateByRequest_UpdateByOptions& options(const UpdateByRequest* msg);
-  static void set_has_options(HasBits* has_bits) {
-    (*has_bits)[0] |= 4u;
-  }
-};
-
-const ::io::deephaven::proto::backplane::grpc::Ticket& UpdateByRequest::_Internal::result_id(const UpdateByRequest* msg) {
-  return *msg->_impl_.result_id_;
-}
-const ::io::deephaven::proto::backplane::grpc::TableReference& UpdateByRequest::_Internal::source_id(const UpdateByRequest* msg) {
-  return *msg->_impl_.source_id_;
-}
-const ::io::deephaven::proto::backplane::grpc::UpdateByRequest_UpdateByOptions& UpdateByRequest::_Internal::options(const UpdateByRequest* msg) {
-  return *msg->_impl_.options_;
-}
-void UpdateByRequest::clear_result_id() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  if (_impl_.result_id_ != nullptr) _impl_.result_id_->Clear();
-  _impl_._has_bits_[0] &= ~0x00000001u;
-}
-UpdateByRequest::UpdateByRequest(::google::protobuf::Arena* arena)
-    : ::google::protobuf::Message(arena) {
-  SharedCtor(arena);
-  // @@protoc_insertion_point(arena_constructor:io.deephaven.proto.backplane.grpc.UpdateByRequest)
-}
-inline PROTOBUF_NDEBUG_INLINE UpdateByRequest::Impl_::Impl_(
-    ::google::protobuf::internal::InternalVisibility visibility, ::google::protobuf::Arena* arena,
-    const Impl_& from)
-      : _has_bits_{from._has_bits_},
-        _cached_size_{0},
-        operations_{visibility, arena, from.operations_},
-        group_by_columns_{visibility, arena, from.group_by_columns_} {}
-
-UpdateByRequest::UpdateByRequest(
-    ::google::protobuf::Arena* arena,
-    const UpdateByRequest& from)
-    : ::google::protobuf::Message(arena) {
-  UpdateByRequest* const _this = this;
-  (void)_this;
-  _internal_metadata_.MergeFrom<::google::protobuf::UnknownFieldSet>(
-      from._internal_metadata_);
-  new (&_impl_) Impl_(internal_visibility(), arena, from._impl_);
-  ::uint32_t cached_has_bits = _impl_._has_bits_[0];
-  _impl_.result_id_ = (cached_has_bits & 0x00000001u)
-                ? CreateMaybeMessage<::io::deephaven::proto::backplane::grpc::Ticket>(arena, *from._impl_.result_id_)
-                : nullptr;
-  _impl_.source_id_ = (cached_has_bits & 0x00000002u)
-                ? CreateMaybeMessage<::io::deephaven::proto::backplane::grpc::TableReference>(arena, *from._impl_.source_id_)
-                : nullptr;
-  _impl_.options_ = (cached_has_bits & 0x00000004u)
-                ? CreateMaybeMessage<::io::deephaven::proto::backplane::grpc::UpdateByRequest_UpdateByOptions>(arena, *from._impl_.options_)
-                : nullptr;
-
-  // @@protoc_insertion_point(copy_constructor:io.deephaven.proto.backplane.grpc.UpdateByRequest)
-}
-inline PROTOBUF_NDEBUG_INLINE UpdateByRequest::Impl_::Impl_(
-    ::google::protobuf::internal::InternalVisibility visibility,
-    ::google::protobuf::Arena* arena)
-      : _cached_size_{0},
-        operations_{visibility, arena},
-        group_by_columns_{visibility, arena} {}
-
-inline void UpdateByRequest::SharedCtor(::_pb::Arena* arena) {
-  new (&_impl_) Impl_(internal_visibility(), arena);
-  ::memset(reinterpret_cast<char *>(&_impl_) +
-               offsetof(Impl_, result_id_),
-           0,
-           offsetof(Impl_, options_) -
-               offsetof(Impl_, result_id_) +
-               sizeof(Impl_::options_));
-}
-UpdateByRequest::~UpdateByRequest() {
-  // @@protoc_insertion_point(destructor:io.deephaven.proto.backplane.grpc.UpdateByRequest)
-  _internal_metadata_.Delete<::google::protobuf::UnknownFieldSet>();
-  SharedDtor();
-}
-inline void UpdateByRequest::SharedDtor() {
-  ABSL_DCHECK(GetArena() == nullptr);
-  delete _impl_.result_id_;
-  delete _impl_.source_id_;
-  delete _impl_.options_;
-  _impl_.~Impl_();
-}
-
-PROTOBUF_NOINLINE void UpdateByRequest::Clear() {
-// @@protoc_insertion_point(message_clear_start:io.deephaven.proto.backplane.grpc.UpdateByRequest)
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  ::uint32_t cached_has_bits = 0;
-  // Prevent compiler warnings about cached_has_bits being unused
-  (void) cached_has_bits;
-
-  _impl_.operations_.Clear();
-  _impl_.group_by_columns_.Clear();
-  cached_has_bits = _impl_._has_bits_[0];
-  if (cached_has_bits & 0x00000007u) {
-    if (cached_has_bits & 0x00000001u) {
-      ABSL_DCHECK(_impl_.result_id_ != nullptr);
-      _impl_.result_id_->Clear();
-    }
-    if (cached_has_bits & 0x00000002u) {
-      ABSL_DCHECK(_impl_.source_id_ != nullptr);
-      _impl_.source_id_->Clear();
-    }
-    if (cached_has_bits & 0x00000004u) {
-      ABSL_DCHECK(_impl_.options_ != nullptr);
-      _impl_.options_->Clear();
-    }
-  }
-  _impl_._has_bits_.Clear();
-  _internal_metadata_.Clear<::google::protobuf::UnknownFieldSet>();
-}
-
-const char* UpdateByRequest::_InternalParse(
-    const char* ptr, ::_pbi::ParseContext* ctx) {
-  ptr = ::_pbi::TcParser::ParseLoop(this, ptr, ctx, &_table_.header);
-  return ptr;
-}
-
-
-PROTOBUF_CONSTINIT PROTOBUF_ATTRIBUTE_INIT_PRIORITY1
-const ::_pbi::TcParseTable<3, 5, 4, 74, 2> UpdateByRequest::_table_ = {
-  {
-    PROTOBUF_FIELD_OFFSET(UpdateByRequest, _impl_._has_bits_),
-    0, // no _extensions_
-    5, 56,  // max_field_number, fast_idx_mask
-    offsetof(decltype(_table_), field_lookup_table),
-    4294967264,  // skipmap
-    offsetof(decltype(_table_), field_entries),
-    5,  // num_field_entries
-    4,  // num_aux_entries
-    offsetof(decltype(_table_), aux_entries),
-    &_UpdateByRequest_default_instance_._instance,
-    ::_pbi::TcParser::GenericFallback,  // fallback
-  }, {{
-    {::_pbi::TcParser::MiniParse, {}},
-    // .io.deephaven.proto.backplane.grpc.Ticket result_id = 1;
-    {::_pbi::TcParser::FastMtS1,
-     {10, 0, 0, PROTOBUF_FIELD_OFFSET(UpdateByRequest, _impl_.result_id_)}},
-    // .io.deephaven.proto.backplane.grpc.TableReference source_id = 2;
-    {::_pbi::TcParser::FastMtS1,
-     {18, 1, 1, PROTOBUF_FIELD_OFFSET(UpdateByRequest, _impl_.source_id_)}},
-    // .io.deephaven.proto.backplane.grpc.UpdateByRequest.UpdateByOptions options = 3;
-    {::_pbi::TcParser::FastMtS1,
-     {26, 2, 2, PROTOBUF_FIELD_OFFSET(UpdateByRequest, _impl_.options_)}},
-    // repeated .io.deephaven.proto.backplane.grpc.UpdateByRequest.UpdateByOperation operations = 4;
-    {::_pbi::TcParser::FastMtR1,
-     {34, 63, 3, PROTOBUF_FIELD_OFFSET(UpdateByRequest, _impl_.operations_)}},
-    // repeated string group_by_columns = 5;
-    {::_pbi::TcParser::FastUR1,
-     {42, 63, 0, PROTOBUF_FIELD_OFFSET(UpdateByRequest, _impl_.group_by_columns_)}},
-    {::_pbi::TcParser::MiniParse, {}},
-    {::_pbi::TcParser::MiniParse, {}},
-  }}, {{
-    65535, 65535
-  }}, {{
-    // .io.deephaven.proto.backplane.grpc.Ticket result_id = 1;
-    {PROTOBUF_FIELD_OFFSET(UpdateByRequest, _impl_.result_id_), _Internal::kHasBitsOffset + 0, 0,
-    (0 | ::_fl::kFcOptional | ::_fl::kMessage | ::_fl::kTvTable)},
-    // .io.deephaven.proto.backplane.grpc.TableReference source_id = 2;
-    {PROTOBUF_FIELD_OFFSET(UpdateByRequest, _impl_.source_id_), _Internal::kHasBitsOffset + 1, 1,
-    (0 | ::_fl::kFcOptional | ::_fl::kMessage | ::_fl::kTvTable)},
-    // .io.deephaven.proto.backplane.grpc.UpdateByRequest.UpdateByOptions options = 3;
-    {PROTOBUF_FIELD_OFFSET(UpdateByRequest, _impl_.options_), _Internal::kHasBitsOffset + 2, 2,
-    (0 | ::_fl::kFcOptional | ::_fl::kMessage | ::_fl::kTvTable)},
-    // repeated .io.deephaven.proto.backplane.grpc.UpdateByRequest.UpdateByOperation operations = 4;
-    {PROTOBUF_FIELD_OFFSET(UpdateByRequest, _impl_.operations_), -1, 3,
-    (0 | ::_fl::kFcRepeated | ::_fl::kMessage | ::_fl::kTvTable)},
-    // repeated string group_by_columns = 5;
-    {PROTOBUF_FIELD_OFFSET(UpdateByRequest, _impl_.group_by_columns_), -1, 0,
-    (0 | ::_fl::kFcRepeated | ::_fl::kUtf8String | ::_fl::kRepSString)},
-  }}, {{
-    {::_pbi::TcParser::GetTable<::io::deephaven::proto::backplane::grpc::Ticket>()},
-    {::_pbi::TcParser::GetTable<::io::deephaven::proto::backplane::grpc::TableReference>()},
-    {::_pbi::TcParser::GetTable<::io::deephaven::proto::backplane::grpc::UpdateByRequest_UpdateByOptions>()},
-    {::_pbi::TcParser::GetTable<::io::deephaven::proto::backplane::grpc::UpdateByRequest_UpdateByOperation>()},
-  }}, {{
-    "\61\0\0\0\0\20\0\0"
-    "io.deephaven.proto.backplane.grpc.UpdateByRequest"
-    "group_by_columns"
-  }},
-};
-
-::uint8_t* UpdateByRequest::_InternalSerialize(
-    ::uint8_t* target,
-    ::google::protobuf::io::EpsCopyOutputStream* stream) const {
-  // @@protoc_insertion_point(serialize_to_array_start:io.deephaven.proto.backplane.grpc.UpdateByRequest)
-  ::uint32_t cached_has_bits = 0;
-  (void)cached_has_bits;
-
-  cached_has_bits = _impl_._has_bits_[0];
-  // .io.deephaven.proto.backplane.grpc.Ticket result_id = 1;
-  if (cached_has_bits & 0x00000001u) {
-    target = ::google::protobuf::internal::WireFormatLite::InternalWriteMessage(
-        1, _Internal::result_id(this),
-        _Internal::result_id(this).GetCachedSize(), target, stream);
-  }
-
-  // .io.deephaven.proto.backplane.grpc.TableReference source_id = 2;
-  if (cached_has_bits & 0x00000002u) {
-    target = ::google::protobuf::internal::WireFormatLite::InternalWriteMessage(
-        2, _Internal::source_id(this),
-        _Internal::source_id(this).GetCachedSize(), target, stream);
-  }
-
-  // .io.deephaven.proto.backplane.grpc.UpdateByRequest.UpdateByOptions options = 3;
-  if (cached_has_bits & 0x00000004u) {
-    target = ::google::protobuf::internal::WireFormatLite::InternalWriteMessage(
-        3, _Internal::options(this),
-        _Internal::options(this).GetCachedSize(), target, stream);
-  }
-
-  // repeated .io.deephaven.proto.backplane.grpc.UpdateByRequest.UpdateByOperation operations = 4;
-  for (unsigned i = 0,
-      n = static_cast<unsigned>(this->_internal_operations_size()); i < n; i++) {
-    const auto& repfield = this->_internal_operations().Get(i);
-    target = ::google::protobuf::internal::WireFormatLite::
-        InternalWriteMessage(4, repfield, repfield.GetCachedSize(), target, stream);
-  }
-
-  // repeated string group_by_columns = 5;
-  for (int i = 0, n = this->_internal_group_by_columns_size(); i < n; ++i) {
-    const auto& s = this->_internal_group_by_columns().Get(i);
-    ::google::protobuf::internal::WireFormatLite::VerifyUtf8String(
-        s.data(), static_cast<int>(s.length()), ::google::protobuf::internal::WireFormatLite::SERIALIZE, "io.deephaven.proto.backplane.grpc.UpdateByRequest.group_by_columns");
-    target = stream->WriteString(5, s, target);
-  }
-
-  if (PROTOBUF_PREDICT_FALSE(_internal_metadata_.have_unknown_fields())) {
-    target =
-        ::_pbi::WireFormat::InternalSerializeUnknownFieldsToArray(
-            _internal_metadata_.unknown_fields<::google::protobuf::UnknownFieldSet>(::google::protobuf::UnknownFieldSet::default_instance), target, stream);
-  }
-  // @@protoc_insertion_point(serialize_to_array_end:io.deephaven.proto.backplane.grpc.UpdateByRequest)
-  return target;
-}
-
-::size_t UpdateByRequest::ByteSizeLong() const {
-// @@protoc_insertion_point(message_byte_size_start:io.deephaven.proto.backplane.grpc.UpdateByRequest)
-  ::size_t total_size = 0;
-
-  ::uint32_t cached_has_bits = 0;
-  // Prevent compiler warnings about cached_has_bits being unused
-  (void) cached_has_bits;
-
-  // repeated .io.deephaven.proto.backplane.grpc.UpdateByRequest.UpdateByOperation operations = 4;
-  total_size += 1UL * this->_internal_operations_size();
-  for (const auto& msg : this->_internal_operations()) {
-    total_size +=
-      ::google::protobuf::internal::WireFormatLite::MessageSize(msg);
-  }
-  // repeated string group_by_columns = 5;
-  total_size += 1 * ::google::protobuf::internal::FromIntSize(_internal_group_by_columns().size());
-  for (int i = 0, n = _internal_group_by_columns().size(); i < n; ++i) {
-    total_size += ::google::protobuf::internal::WireFormatLite::StringSize(
-        _internal_group_by_columns().Get(i));
-  }
-  cached_has_bits = _impl_._has_bits_[0];
-  if (cached_has_bits & 0x00000007u) {
-    // .io.deephaven.proto.backplane.grpc.Ticket result_id = 1;
-    if (cached_has_bits & 0x00000001u) {
-      total_size +=
-          1 + ::google::protobuf::internal::WireFormatLite::MessageSize(*_impl_.result_id_);
-    }
-
-    // .io.deephaven.proto.backplane.grpc.TableReference source_id = 2;
-    if (cached_has_bits & 0x00000002u) {
-      total_size +=
-          1 + ::google::protobuf::internal::WireFormatLite::MessageSize(*_impl_.source_id_);
-    }
-
-    // .io.deephaven.proto.backplane.grpc.UpdateByRequest.UpdateByOptions options = 3;
-    if (cached_has_bits & 0x00000004u) {
-      total_size +=
-          1 + ::google::protobuf::internal::WireFormatLite::MessageSize(*_impl_.options_);
-    }
-
-  }
-  return MaybeComputeUnknownFieldsSize(total_size, &_impl_._cached_size_);
-}
-
-const ::google::protobuf::Message::ClassData UpdateByRequest::_class_data_ = {
-    UpdateByRequest::MergeImpl,
-    nullptr,  // OnDemandRegisterArenaDtor
-};
-const ::google::protobuf::Message::ClassData* UpdateByRequest::GetClassData() const {
-  return &_class_data_;
-}
-
-void UpdateByRequest::MergeImpl(::google::protobuf::Message& to_msg, const ::google::protobuf::Message& from_msg) {
-  auto* const _this = static_cast<UpdateByRequest*>(&to_msg);
-  auto& from = static_cast<const UpdateByRequest&>(from_msg);
-  // @@protoc_insertion_point(class_specific_merge_from_start:io.deephaven.proto.backplane.grpc.UpdateByRequest)
-  ABSL_DCHECK_NE(&from, _this);
-  ::uint32_t cached_has_bits = 0;
-  (void) cached_has_bits;
-
-  _this->_internal_mutable_operations()->MergeFrom(
-      from._internal_operations());
-  _this->_internal_mutable_group_by_columns()->MergeFrom(from._internal_group_by_columns());
-  cached_has_bits = from._impl_._has_bits_[0];
-  if (cached_has_bits & 0x00000007u) {
-    if (cached_has_bits & 0x00000001u) {
-      _this->_internal_mutable_result_id()->::io::deephaven::proto::backplane::grpc::Ticket::MergeFrom(
-          from._internal_result_id());
-    }
-    if (cached_has_bits & 0x00000002u) {
-      _this->_internal_mutable_source_id()->::io::deephaven::proto::backplane::grpc::TableReference::MergeFrom(
-          from._internal_source_id());
-    }
-    if (cached_has_bits & 0x00000004u) {
-      _this->_internal_mutable_options()->::io::deephaven::proto::backplane::grpc::UpdateByRequest_UpdateByOptions::MergeFrom(
-          from._internal_options());
-    }
-  }
-  _this->_internal_metadata_.MergeFrom<::google::protobuf::UnknownFieldSet>(from._internal_metadata_);
-}
-
-void UpdateByRequest::CopyFrom(const UpdateByRequest& from) {
-// @@protoc_insertion_point(class_specific_copy_from_start:io.deephaven.proto.backplane.grpc.UpdateByRequest)
-  if (&from == this) return;
-  Clear();
-  MergeFrom(from);
-}
-
-PROTOBUF_NOINLINE bool UpdateByRequest::IsInitialized() const {
-  return true;
-}
-
-::_pbi::CachedSize* UpdateByRequest::AccessCachedSize() const {
-  return &_impl_._cached_size_;
-}
-void UpdateByRequest::InternalSwap(UpdateByRequest* PROTOBUF_RESTRICT other) {
-  using std::swap;
-  _internal_metadata_.InternalSwap(&other->_internal_metadata_);
-  swap(_impl_._has_bits_[0], other->_impl_._has_bits_[0]);
-  _impl_.operations_.InternalSwap(&other->_impl_.operations_);
-  _impl_.group_by_columns_.InternalSwap(&other->_impl_.group_by_columns_);
-  ::google::protobuf::internal::memswap<
-      PROTOBUF_FIELD_OFFSET(UpdateByRequest, _impl_.options_)
-      + sizeof(UpdateByRequest::_impl_.options_)
-      - PROTOBUF_FIELD_OFFSET(UpdateByRequest, _impl_.result_id_)>(
-          reinterpret_cast<char*>(&_impl_.result_id_),
-          reinterpret_cast<char*>(&other->_impl_.result_id_));
-}
-
-::google::protobuf::Metadata UpdateByRequest::GetMetadata() const {
-  return ::_pbi::AssignDescriptors(
-      &descriptor_table_deephaven_2fproto_2ftable_2eproto_getter, &descriptor_table_deephaven_2fproto_2ftable_2eproto_once,
-      file_level_metadata_deephaven_2fproto_2ftable_2eproto[40]);
-}
-// ===================================================================
-
-class SelectDistinctRequest::_Internal {
- public:
-  using HasBits = decltype(std::declval<SelectDistinctRequest>()._impl_._has_bits_);
-  static constexpr ::int32_t kHasBitsOffset =
-    8 * PROTOBUF_FIELD_OFFSET(SelectDistinctRequest, _impl_._has_bits_);
-  static const ::io::deephaven::proto::backplane::grpc::Ticket& result_id(const SelectDistinctRequest* msg);
-  static void set_has_result_id(HasBits* has_bits) {
-    (*has_bits)[0] |= 1u;
-  }
-  static const ::io::deephaven::proto::backplane::grpc::TableReference& source_id(const SelectDistinctRequest* msg);
-  static void set_has_source_id(HasBits* has_bits) {
-    (*has_bits)[0] |= 2u;
-  }
-};
-
-const ::io::deephaven::proto::backplane::grpc::Ticket& SelectDistinctRequest::_Internal::result_id(const SelectDistinctRequest* msg) {
-  return *msg->_impl_.result_id_;
-}
-const ::io::deephaven::proto::backplane::grpc::TableReference& SelectDistinctRequest::_Internal::source_id(const SelectDistinctRequest* msg) {
-  return *msg->_impl_.source_id_;
-}
-void SelectDistinctRequest::clear_result_id() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  if (_impl_.result_id_ != nullptr) _impl_.result_id_->Clear();
-  _impl_._has_bits_[0] &= ~0x00000001u;
-}
-SelectDistinctRequest::SelectDistinctRequest(::google::protobuf::Arena* arena)
-    : ::google::protobuf::Message(arena) {
-  SharedCtor(arena);
-  // @@protoc_insertion_point(arena_constructor:io.deephaven.proto.backplane.grpc.SelectDistinctRequest)
-}
-inline PROTOBUF_NDEBUG_INLINE SelectDistinctRequest::Impl_::Impl_(
-    ::google::protobuf::internal::InternalVisibility visibility, ::google::protobuf::Arena* arena,
-    const Impl_& from)
-      : _has_bits_{from._has_bits_},
-        _cached_size_{0},
-        column_names_{visibility, arena, from.column_names_} {}
-
-SelectDistinctRequest::SelectDistinctRequest(
-    ::google::protobuf::Arena* arena,
-    const SelectDistinctRequest& from)
-    : ::google::protobuf::Message(arena) {
-  SelectDistinctRequest* const _this = this;
-  (void)_this;
-  _internal_metadata_.MergeFrom<::google::protobuf::UnknownFieldSet>(
-      from._internal_metadata_);
-  new (&_impl_) Impl_(internal_visibility(), arena, from._impl_);
-  ::uint32_t cached_has_bits = _impl_._has_bits_[0];
-  _impl_.result_id_ = (cached_has_bits & 0x00000001u)
-                ? CreateMaybeMessage<::io::deephaven::proto::backplane::grpc::Ticket>(arena, *from._impl_.result_id_)
-                : nullptr;
-  _impl_.source_id_ = (cached_has_bits & 0x00000002u)
-                ? CreateMaybeMessage<::io::deephaven::proto::backplane::grpc::TableReference>(arena, *from._impl_.source_id_)
-                : nullptr;
-
-  // @@protoc_insertion_point(copy_constructor:io.deephaven.proto.backplane.grpc.SelectDistinctRequest)
-}
-inline PROTOBUF_NDEBUG_INLINE SelectDistinctRequest::Impl_::Impl_(
-    ::google::protobuf::internal::InternalVisibility visibility,
-    ::google::protobuf::Arena* arena)
-      : _cached_size_{0},
-        column_names_{visibility, arena} {}
-
-inline void SelectDistinctRequest::SharedCtor(::_pb::Arena* arena) {
-  new (&_impl_) Impl_(internal_visibility(), arena);
-  ::memset(reinterpret_cast<char *>(&_impl_) +
-               offsetof(Impl_, result_id_),
-           0,
-           offsetof(Impl_, source_id_) -
-               offsetof(Impl_, result_id_) +
-               sizeof(Impl_::source_id_));
-}
-SelectDistinctRequest::~SelectDistinctRequest() {
-  // @@protoc_insertion_point(destructor:io.deephaven.proto.backplane.grpc.SelectDistinctRequest)
-  _internal_metadata_.Delete<::google::protobuf::UnknownFieldSet>();
-  SharedDtor();
-}
-inline void SelectDistinctRequest::SharedDtor() {
-  ABSL_DCHECK(GetArena() == nullptr);
-  delete _impl_.result_id_;
-  delete _impl_.source_id_;
-  _impl_.~Impl_();
-}
-
-PROTOBUF_NOINLINE void SelectDistinctRequest::Clear() {
-// @@protoc_insertion_point(message_clear_start:io.deephaven.proto.backplane.grpc.SelectDistinctRequest)
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  ::uint32_t cached_has_bits = 0;
-  // Prevent compiler warnings about cached_has_bits being unused
-  (void) cached_has_bits;
-
-  _impl_.column_names_.Clear();
-  cached_has_bits = _impl_._has_bits_[0];
-  if (cached_has_bits & 0x00000003u) {
-    if (cached_has_bits & 0x00000001u) {
-      ABSL_DCHECK(_impl_.result_id_ != nullptr);
-      _impl_.result_id_->Clear();
-    }
-    if (cached_has_bits & 0x00000002u) {
-      ABSL_DCHECK(_impl_.source_id_ != nullptr);
-      _impl_.source_id_->Clear();
-    }
-  }
-  _impl_._has_bits_.Clear();
-  _internal_metadata_.Clear<::google::protobuf::UnknownFieldSet>();
-}
-
-const char* SelectDistinctRequest::_InternalParse(
-    const char* ptr, ::_pbi::ParseContext* ctx) {
-  ptr = ::_pbi::TcParser::ParseLoop(this, ptr, ctx, &_table_.header);
-  return ptr;
-}
-
-
-PROTOBUF_CONSTINIT PROTOBUF_ATTRIBUTE_INIT_PRIORITY1
-const ::_pbi::TcParseTable<2, 3, 2, 76, 2> SelectDistinctRequest::_table_ = {
-  {
-    PROTOBUF_FIELD_OFFSET(SelectDistinctRequest, _impl_._has_bits_),
-    0, // no _extensions_
-    3, 24,  // max_field_number, fast_idx_mask
-    offsetof(decltype(_table_), field_lookup_table),
-    4294967288,  // skipmap
-    offsetof(decltype(_table_), field_entries),
-    3,  // num_field_entries
-    2,  // num_aux_entries
-    offsetof(decltype(_table_), aux_entries),
-    &_SelectDistinctRequest_default_instance_._instance,
-    ::_pbi::TcParser::GenericFallback,  // fallback
-  }, {{
-    {::_pbi::TcParser::MiniParse, {}},
-    // .io.deephaven.proto.backplane.grpc.Ticket result_id = 1;
-    {::_pbi::TcParser::FastMtS1,
-     {10, 0, 0, PROTOBUF_FIELD_OFFSET(SelectDistinctRequest, _impl_.result_id_)}},
-    // .io.deephaven.proto.backplane.grpc.TableReference source_id = 2;
-    {::_pbi::TcParser::FastMtS1,
-     {18, 1, 1, PROTOBUF_FIELD_OFFSET(SelectDistinctRequest, _impl_.source_id_)}},
-    // repeated string column_names = 3;
-    {::_pbi::TcParser::FastUR1,
-     {26, 63, 0, PROTOBUF_FIELD_OFFSET(SelectDistinctRequest, _impl_.column_names_)}},
-  }}, {{
-    65535, 65535
-  }}, {{
-    // .io.deephaven.proto.backplane.grpc.Ticket result_id = 1;
-    {PROTOBUF_FIELD_OFFSET(SelectDistinctRequest, _impl_.result_id_), _Internal::kHasBitsOffset + 0, 0,
-    (0 | ::_fl::kFcOptional | ::_fl::kMessage | ::_fl::kTvTable)},
-    // .io.deephaven.proto.backplane.grpc.TableReference source_id = 2;
-    {PROTOBUF_FIELD_OFFSET(SelectDistinctRequest, _impl_.source_id_), _Internal::kHasBitsOffset + 1, 1,
-    (0 | ::_fl::kFcOptional | ::_fl::kMessage | ::_fl::kTvTable)},
-    // repeated string column_names = 3;
-    {PROTOBUF_FIELD_OFFSET(SelectDistinctRequest, _impl_.column_names_), -1, 0,
-    (0 | ::_fl::kFcRepeated | ::_fl::kUtf8String | ::_fl::kRepSString)},
-  }}, {{
-    {::_pbi::TcParser::GetTable<::io::deephaven::proto::backplane::grpc::Ticket>()},
-    {::_pbi::TcParser::GetTable<::io::deephaven::proto::backplane::grpc::TableReference>()},
-  }}, {{
-    "\67\0\0\14\0\0\0\0"
-    "io.deephaven.proto.backplane.grpc.SelectDistinctRequest"
-    "column_names"
-  }},
-};
-
-::uint8_t* SelectDistinctRequest::_InternalSerialize(
-    ::uint8_t* target,
-    ::google::protobuf::io::EpsCopyOutputStream* stream) const {
-  // @@protoc_insertion_point(serialize_to_array_start:io.deephaven.proto.backplane.grpc.SelectDistinctRequest)
-  ::uint32_t cached_has_bits = 0;
-  (void)cached_has_bits;
-
-  cached_has_bits = _impl_._has_bits_[0];
-  // .io.deephaven.proto.backplane.grpc.Ticket result_id = 1;
-  if (cached_has_bits & 0x00000001u) {
-    target = ::google::protobuf::internal::WireFormatLite::InternalWriteMessage(
-        1, _Internal::result_id(this),
-        _Internal::result_id(this).GetCachedSize(), target, stream);
-  }
-
-  // .io.deephaven.proto.backplane.grpc.TableReference source_id = 2;
-  if (cached_has_bits & 0x00000002u) {
-    target = ::google::protobuf::internal::WireFormatLite::InternalWriteMessage(
-        2, _Internal::source_id(this),
-        _Internal::source_id(this).GetCachedSize(), target, stream);
-  }
-
-  // repeated string column_names = 3;
-  for (int i = 0, n = this->_internal_column_names_size(); i < n; ++i) {
-    const auto& s = this->_internal_column_names().Get(i);
-    ::google::protobuf::internal::WireFormatLite::VerifyUtf8String(
-        s.data(), static_cast<int>(s.length()), ::google::protobuf::internal::WireFormatLite::SERIALIZE, "io.deephaven.proto.backplane.grpc.SelectDistinctRequest.column_names");
-    target = stream->WriteString(3, s, target);
-  }
-
-  if (PROTOBUF_PREDICT_FALSE(_internal_metadata_.have_unknown_fields())) {
-    target =
-        ::_pbi::WireFormat::InternalSerializeUnknownFieldsToArray(
-            _internal_metadata_.unknown_fields<::google::protobuf::UnknownFieldSet>(::google::protobuf::UnknownFieldSet::default_instance), target, stream);
-  }
-  // @@protoc_insertion_point(serialize_to_array_end:io.deephaven.proto.backplane.grpc.SelectDistinctRequest)
-  return target;
-}
-
-::size_t SelectDistinctRequest::ByteSizeLong() const {
-// @@protoc_insertion_point(message_byte_size_start:io.deephaven.proto.backplane.grpc.SelectDistinctRequest)
-  ::size_t total_size = 0;
-
-  ::uint32_t cached_has_bits = 0;
-  // Prevent compiler warnings about cached_has_bits being unused
-  (void) cached_has_bits;
-
-  // repeated string column_names = 3;
-  total_size += 1 * ::google::protobuf::internal::FromIntSize(_internal_column_names().size());
-  for (int i = 0, n = _internal_column_names().size(); i < n; ++i) {
-    total_size += ::google::protobuf::internal::WireFormatLite::StringSize(
-        _internal_column_names().Get(i));
-  }
-  cached_has_bits = _impl_._has_bits_[0];
-  if (cached_has_bits & 0x00000003u) {
-    // .io.deephaven.proto.backplane.grpc.Ticket result_id = 1;
-    if (cached_has_bits & 0x00000001u) {
-      total_size +=
-          1 + ::google::protobuf::internal::WireFormatLite::MessageSize(*_impl_.result_id_);
-    }
-
-    // .io.deephaven.proto.backplane.grpc.TableReference source_id = 2;
-    if (cached_has_bits & 0x00000002u) {
-      total_size +=
-          1 + ::google::protobuf::internal::WireFormatLite::MessageSize(*_impl_.source_id_);
-    }
-
-  }
-  return MaybeComputeUnknownFieldsSize(total_size, &_impl_._cached_size_);
-}
-
-const ::google::protobuf::Message::ClassData SelectDistinctRequest::_class_data_ = {
-    SelectDistinctRequest::MergeImpl,
-    nullptr,  // OnDemandRegisterArenaDtor
-};
-const ::google::protobuf::Message::ClassData* SelectDistinctRequest::GetClassData() const {
-  return &_class_data_;
-}
-
-void SelectDistinctRequest::MergeImpl(::google::protobuf::Message& to_msg, const ::google::protobuf::Message& from_msg) {
-  auto* const _this = static_cast<SelectDistinctRequest*>(&to_msg);
-  auto& from = static_cast<const SelectDistinctRequest&>(from_msg);
-  // @@protoc_insertion_point(class_specific_merge_from_start:io.deephaven.proto.backplane.grpc.SelectDistinctRequest)
-  ABSL_DCHECK_NE(&from, _this);
-  ::uint32_t cached_has_bits = 0;
-  (void) cached_has_bits;
-
-  _this->_internal_mutable_column_names()->MergeFrom(from._internal_column_names());
-  cached_has_bits = from._impl_._has_bits_[0];
-  if (cached_has_bits & 0x00000003u) {
-    if (cached_has_bits & 0x00000001u) {
-      _this->_internal_mutable_result_id()->::io::deephaven::proto::backplane::grpc::Ticket::MergeFrom(
-          from._internal_result_id());
-    }
-    if (cached_has_bits & 0x00000002u) {
-      _this->_internal_mutable_source_id()->::io::deephaven::proto::backplane::grpc::TableReference::MergeFrom(
-          from._internal_source_id());
-    }
-  }
-  _this->_internal_metadata_.MergeFrom<::google::protobuf::UnknownFieldSet>(from._internal_metadata_);
-}
-
-void SelectDistinctRequest::CopyFrom(const SelectDistinctRequest& from) {
-// @@protoc_insertion_point(class_specific_copy_from_start:io.deephaven.proto.backplane.grpc.SelectDistinctRequest)
-  if (&from == this) return;
-  Clear();
-  MergeFrom(from);
-}
-
-PROTOBUF_NOINLINE bool SelectDistinctRequest::IsInitialized() const {
-  return true;
-}
-
-::_pbi::CachedSize* SelectDistinctRequest::AccessCachedSize() const {
-  return &_impl_._cached_size_;
-}
-void SelectDistinctRequest::InternalSwap(SelectDistinctRequest* PROTOBUF_RESTRICT other) {
-  using std::swap;
-  _internal_metadata_.InternalSwap(&other->_internal_metadata_);
-  swap(_impl_._has_bits_[0], other->_impl_._has_bits_[0]);
-  _impl_.column_names_.InternalSwap(&other->_impl_.column_names_);
-  ::google::protobuf::internal::memswap<
-      PROTOBUF_FIELD_OFFSET(SelectDistinctRequest, _impl_.source_id_)
-      + sizeof(SelectDistinctRequest::_impl_.source_id_)
-      - PROTOBUF_FIELD_OFFSET(SelectDistinctRequest, _impl_.result_id_)>(
-          reinterpret_cast<char*>(&_impl_.result_id_),
-          reinterpret_cast<char*>(&other->_impl_.result_id_));
-}
-
-::google::protobuf::Metadata SelectDistinctRequest::GetMetadata() const {
-  return ::_pbi::AssignDescriptors(
-      &descriptor_table_deephaven_2fproto_2ftable_2eproto_getter, &descriptor_table_deephaven_2fproto_2ftable_2eproto_once,
-      file_level_metadata_deephaven_2fproto_2ftable_2eproto[41]);
-}
-// ===================================================================
-
-class DropColumnsRequest::_Internal {
- public:
-  using HasBits = decltype(std::declval<DropColumnsRequest>()._impl_._has_bits_);
-  static constexpr ::int32_t kHasBitsOffset =
-    8 * PROTOBUF_FIELD_OFFSET(DropColumnsRequest, _impl_._has_bits_);
-  static const ::io::deephaven::proto::backplane::grpc::Ticket& result_id(const DropColumnsRequest* msg);
-  static void set_has_result_id(HasBits* has_bits) {
-    (*has_bits)[0] |= 1u;
-  }
-  static const ::io::deephaven::proto::backplane::grpc::TableReference& source_id(const DropColumnsRequest* msg);
-  static void set_has_source_id(HasBits* has_bits) {
-    (*has_bits)[0] |= 2u;
-  }
-};
-
-const ::io::deephaven::proto::backplane::grpc::Ticket& DropColumnsRequest::_Internal::result_id(const DropColumnsRequest* msg) {
-  return *msg->_impl_.result_id_;
-}
-const ::io::deephaven::proto::backplane::grpc::TableReference& DropColumnsRequest::_Internal::source_id(const DropColumnsRequest* msg) {
-  return *msg->_impl_.source_id_;
-}
-void DropColumnsRequest::clear_result_id() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  if (_impl_.result_id_ != nullptr) _impl_.result_id_->Clear();
-  _impl_._has_bits_[0] &= ~0x00000001u;
-}
-DropColumnsRequest::DropColumnsRequest(::google::protobuf::Arena* arena)
-    : ::google::protobuf::Message(arena) {
-  SharedCtor(arena);
-  // @@protoc_insertion_point(arena_constructor:io.deephaven.proto.backplane.grpc.DropColumnsRequest)
-}
-inline PROTOBUF_NDEBUG_INLINE DropColumnsRequest::Impl_::Impl_(
-    ::google::protobuf::internal::InternalVisibility visibility, ::google::protobuf::Arena* arena,
-    const Impl_& from)
-      : _has_bits_{from._has_bits_},
-        _cached_size_{0},
-        column_names_{visibility, arena, from.column_names_} {}
-
-DropColumnsRequest::DropColumnsRequest(
-    ::google::protobuf::Arena* arena,
-    const DropColumnsRequest& from)
-    : ::google::protobuf::Message(arena) {
-  DropColumnsRequest* const _this = this;
-  (void)_this;
-  _internal_metadata_.MergeFrom<::google::protobuf::UnknownFieldSet>(
-      from._internal_metadata_);
-  new (&_impl_) Impl_(internal_visibility(), arena, from._impl_);
-  ::uint32_t cached_has_bits = _impl_._has_bits_[0];
-  _impl_.result_id_ = (cached_has_bits & 0x00000001u)
-                ? CreateMaybeMessage<::io::deephaven::proto::backplane::grpc::Ticket>(arena, *from._impl_.result_id_)
-                : nullptr;
-  _impl_.source_id_ = (cached_has_bits & 0x00000002u)
-                ? CreateMaybeMessage<::io::deephaven::proto::backplane::grpc::TableReference>(arena, *from._impl_.source_id_)
-                : nullptr;
-
-  // @@protoc_insertion_point(copy_constructor:io.deephaven.proto.backplane.grpc.DropColumnsRequest)
-}
-inline PROTOBUF_NDEBUG_INLINE DropColumnsRequest::Impl_::Impl_(
-    ::google::protobuf::internal::InternalVisibility visibility,
-    ::google::protobuf::Arena* arena)
-      : _cached_size_{0},
-        column_names_{visibility, arena} {}
-
-inline void DropColumnsRequest::SharedCtor(::_pb::Arena* arena) {
-  new (&_impl_) Impl_(internal_visibility(), arena);
-  ::memset(reinterpret_cast<char *>(&_impl_) +
-               offsetof(Impl_, result_id_),
-           0,
-           offsetof(Impl_, source_id_) -
-               offsetof(Impl_, result_id_) +
-               sizeof(Impl_::source_id_));
-}
-DropColumnsRequest::~DropColumnsRequest() {
-  // @@protoc_insertion_point(destructor:io.deephaven.proto.backplane.grpc.DropColumnsRequest)
-  _internal_metadata_.Delete<::google::protobuf::UnknownFieldSet>();
-  SharedDtor();
-}
-inline void DropColumnsRequest::SharedDtor() {
-  ABSL_DCHECK(GetArena() == nullptr);
-  delete _impl_.result_id_;
-  delete _impl_.source_id_;
-  _impl_.~Impl_();
-}
-
-PROTOBUF_NOINLINE void DropColumnsRequest::Clear() {
-// @@protoc_insertion_point(message_clear_start:io.deephaven.proto.backplane.grpc.DropColumnsRequest)
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  ::uint32_t cached_has_bits = 0;
-  // Prevent compiler warnings about cached_has_bits being unused
-  (void) cached_has_bits;
-
-  _impl_.column_names_.Clear();
-  cached_has_bits = _impl_._has_bits_[0];
-  if (cached_has_bits & 0x00000003u) {
-    if (cached_has_bits & 0x00000001u) {
-      ABSL_DCHECK(_impl_.result_id_ != nullptr);
-      _impl_.result_id_->Clear();
-    }
-    if (cached_has_bits & 0x00000002u) {
-      ABSL_DCHECK(_impl_.source_id_ != nullptr);
-      _impl_.source_id_->Clear();
-    }
-  }
-  _impl_._has_bits_.Clear();
-  _internal_metadata_.Clear<::google::protobuf::UnknownFieldSet>();
-}
-
-const char* DropColumnsRequest::_InternalParse(
-    const char* ptr, ::_pbi::ParseContext* ctx) {
-  ptr = ::_pbi::TcParser::ParseLoop(this, ptr, ctx, &_table_.header);
-  return ptr;
-}
-
-
-PROTOBUF_CONSTINIT PROTOBUF_ATTRIBUTE_INIT_PRIORITY1
-const ::_pbi::TcParseTable<2, 3, 2, 73, 2> DropColumnsRequest::_table_ = {
-  {
-    PROTOBUF_FIELD_OFFSET(DropColumnsRequest, _impl_._has_bits_),
-    0, // no _extensions_
-    3, 24,  // max_field_number, fast_idx_mask
-    offsetof(decltype(_table_), field_lookup_table),
-    4294967288,  // skipmap
-    offsetof(decltype(_table_), field_entries),
-    3,  // num_field_entries
-    2,  // num_aux_entries
-    offsetof(decltype(_table_), aux_entries),
-    &_DropColumnsRequest_default_instance_._instance,
-    ::_pbi::TcParser::GenericFallback,  // fallback
-  }, {{
-    {::_pbi::TcParser::MiniParse, {}},
-    // .io.deephaven.proto.backplane.grpc.Ticket result_id = 1;
-    {::_pbi::TcParser::FastMtS1,
-     {10, 0, 0, PROTOBUF_FIELD_OFFSET(DropColumnsRequest, _impl_.result_id_)}},
-    // .io.deephaven.proto.backplane.grpc.TableReference source_id = 2;
-    {::_pbi::TcParser::FastMtS1,
-     {18, 1, 1, PROTOBUF_FIELD_OFFSET(DropColumnsRequest, _impl_.source_id_)}},
-    // repeated string column_names = 3;
-    {::_pbi::TcParser::FastUR1,
-     {26, 63, 0, PROTOBUF_FIELD_OFFSET(DropColumnsRequest, _impl_.column_names_)}},
-  }}, {{
-    65535, 65535
-  }}, {{
-    // .io.deephaven.proto.backplane.grpc.Ticket result_id = 1;
-    {PROTOBUF_FIELD_OFFSET(DropColumnsRequest, _impl_.result_id_), _Internal::kHasBitsOffset + 0, 0,
-    (0 | ::_fl::kFcOptional | ::_fl::kMessage | ::_fl::kTvTable)},
-    // .io.deephaven.proto.backplane.grpc.TableReference source_id = 2;
-    {PROTOBUF_FIELD_OFFSET(DropColumnsRequest, _impl_.source_id_), _Internal::kHasBitsOffset + 1, 1,
-    (0 | ::_fl::kFcOptional | ::_fl::kMessage | ::_fl::kTvTable)},
-    // repeated string column_names = 3;
-    {PROTOBUF_FIELD_OFFSET(DropColumnsRequest, _impl_.column_names_), -1, 0,
-    (0 | ::_fl::kFcRepeated | ::_fl::kUtf8String | ::_fl::kRepSString)},
-  }}, {{
-    {::_pbi::TcParser::GetTable<::io::deephaven::proto::backplane::grpc::Ticket>()},
-    {::_pbi::TcParser::GetTable<::io::deephaven::proto::backplane::grpc::TableReference>()},
-  }}, {{
-    "\64\0\0\14\0\0\0\0"
-    "io.deephaven.proto.backplane.grpc.DropColumnsRequest"
-    "column_names"
-  }},
-};
-
-::uint8_t* DropColumnsRequest::_InternalSerialize(
-    ::uint8_t* target,
-    ::google::protobuf::io::EpsCopyOutputStream* stream) const {
-  // @@protoc_insertion_point(serialize_to_array_start:io.deephaven.proto.backplane.grpc.DropColumnsRequest)
-  ::uint32_t cached_has_bits = 0;
-  (void)cached_has_bits;
-
-  cached_has_bits = _impl_._has_bits_[0];
-  // .io.deephaven.proto.backplane.grpc.Ticket result_id = 1;
-  if (cached_has_bits & 0x00000001u) {
-    target = ::google::protobuf::internal::WireFormatLite::InternalWriteMessage(
-        1, _Internal::result_id(this),
-        _Internal::result_id(this).GetCachedSize(), target, stream);
-  }
-
-  // .io.deephaven.proto.backplane.grpc.TableReference source_id = 2;
-  if (cached_has_bits & 0x00000002u) {
-    target = ::google::protobuf::internal::WireFormatLite::InternalWriteMessage(
-        2, _Internal::source_id(this),
-        _Internal::source_id(this).GetCachedSize(), target, stream);
-  }
-
-  // repeated string column_names = 3;
-  for (int i = 0, n = this->_internal_column_names_size(); i < n; ++i) {
-    const auto& s = this->_internal_column_names().Get(i);
-    ::google::protobuf::internal::WireFormatLite::VerifyUtf8String(
-        s.data(), static_cast<int>(s.length()), ::google::protobuf::internal::WireFormatLite::SERIALIZE, "io.deephaven.proto.backplane.grpc.DropColumnsRequest.column_names");
-    target = stream->WriteString(3, s, target);
-  }
-
-  if (PROTOBUF_PREDICT_FALSE(_internal_metadata_.have_unknown_fields())) {
-    target =
-        ::_pbi::WireFormat::InternalSerializeUnknownFieldsToArray(
-            _internal_metadata_.unknown_fields<::google::protobuf::UnknownFieldSet>(::google::protobuf::UnknownFieldSet::default_instance), target, stream);
-  }
-  // @@protoc_insertion_point(serialize_to_array_end:io.deephaven.proto.backplane.grpc.DropColumnsRequest)
-  return target;
-}
-
-::size_t DropColumnsRequest::ByteSizeLong() const {
-// @@protoc_insertion_point(message_byte_size_start:io.deephaven.proto.backplane.grpc.DropColumnsRequest)
-  ::size_t total_size = 0;
-
-  ::uint32_t cached_has_bits = 0;
-  // Prevent compiler warnings about cached_has_bits being unused
-  (void) cached_has_bits;
-
-  // repeated string column_names = 3;
-  total_size += 1 * ::google::protobuf::internal::FromIntSize(_internal_column_names().size());
-  for (int i = 0, n = _internal_column_names().size(); i < n; ++i) {
-    total_size += ::google::protobuf::internal::WireFormatLite::StringSize(
-        _internal_column_names().Get(i));
-  }
-  cached_has_bits = _impl_._has_bits_[0];
-  if (cached_has_bits & 0x00000003u) {
-    // .io.deephaven.proto.backplane.grpc.Ticket result_id = 1;
-    if (cached_has_bits & 0x00000001u) {
-      total_size +=
-          1 + ::google::protobuf::internal::WireFormatLite::MessageSize(*_impl_.result_id_);
-    }
-
-    // .io.deephaven.proto.backplane.grpc.TableReference source_id = 2;
-    if (cached_has_bits & 0x00000002u) {
-      total_size +=
-          1 + ::google::protobuf::internal::WireFormatLite::MessageSize(*_impl_.source_id_);
-    }
-
-  }
-  return MaybeComputeUnknownFieldsSize(total_size, &_impl_._cached_size_);
-}
-
-const ::google::protobuf::Message::ClassData DropColumnsRequest::_class_data_ = {
-    DropColumnsRequest::MergeImpl,
-    nullptr,  // OnDemandRegisterArenaDtor
-};
-const ::google::protobuf::Message::ClassData* DropColumnsRequest::GetClassData() const {
-  return &_class_data_;
-}
-
-void DropColumnsRequest::MergeImpl(::google::protobuf::Message& to_msg, const ::google::protobuf::Message& from_msg) {
-  auto* const _this = static_cast<DropColumnsRequest*>(&to_msg);
-  auto& from = static_cast<const DropColumnsRequest&>(from_msg);
-  // @@protoc_insertion_point(class_specific_merge_from_start:io.deephaven.proto.backplane.grpc.DropColumnsRequest)
-  ABSL_DCHECK_NE(&from, _this);
-  ::uint32_t cached_has_bits = 0;
-  (void) cached_has_bits;
-
-  _this->_internal_mutable_column_names()->MergeFrom(from._internal_column_names());
-  cached_has_bits = from._impl_._has_bits_[0];
-  if (cached_has_bits & 0x00000003u) {
-    if (cached_has_bits & 0x00000001u) {
-      _this->_internal_mutable_result_id()->::io::deephaven::proto::backplane::grpc::Ticket::MergeFrom(
-          from._internal_result_id());
-    }
-    if (cached_has_bits & 0x00000002u) {
-      _this->_internal_mutable_source_id()->::io::deephaven::proto::backplane::grpc::TableReference::MergeFrom(
-          from._internal_source_id());
-    }
-  }
-  _this->_internal_metadata_.MergeFrom<::google::protobuf::UnknownFieldSet>(from._internal_metadata_);
-}
-
-void DropColumnsRequest::CopyFrom(const DropColumnsRequest& from) {
-// @@protoc_insertion_point(class_specific_copy_from_start:io.deephaven.proto.backplane.grpc.DropColumnsRequest)
-  if (&from == this) return;
-  Clear();
-  MergeFrom(from);
-}
-
-PROTOBUF_NOINLINE bool DropColumnsRequest::IsInitialized() const {
-  return true;
-}
-
-::_pbi::CachedSize* DropColumnsRequest::AccessCachedSize() const {
-  return &_impl_._cached_size_;
-}
-void DropColumnsRequest::InternalSwap(DropColumnsRequest* PROTOBUF_RESTRICT other) {
-  using std::swap;
-  _internal_metadata_.InternalSwap(&other->_internal_metadata_);
-  swap(_impl_._has_bits_[0], other->_impl_._has_bits_[0]);
-  _impl_.column_names_.InternalSwap(&other->_impl_.column_names_);
-  ::google::protobuf::internal::memswap<
-      PROTOBUF_FIELD_OFFSET(DropColumnsRequest, _impl_.source_id_)
-      + sizeof(DropColumnsRequest::_impl_.source_id_)
-      - PROTOBUF_FIELD_OFFSET(DropColumnsRequest, _impl_.result_id_)>(
-          reinterpret_cast<char*>(&_impl_.result_id_),
-          reinterpret_cast<char*>(&other->_impl_.result_id_));
-}
-
-::google::protobuf::Metadata DropColumnsRequest::GetMetadata() const {
-  return ::_pbi::AssignDescriptors(
-      &descriptor_table_deephaven_2fproto_2ftable_2eproto_getter, &descriptor_table_deephaven_2fproto_2ftable_2eproto_once,
-      file_level_metadata_deephaven_2fproto_2ftable_2eproto[42]);
-}
-// ===================================================================
-
-class UnstructuredFilterTableRequest::_Internal {
- public:
-  using HasBits = decltype(std::declval<UnstructuredFilterTableRequest>()._impl_._has_bits_);
-  static constexpr ::int32_t kHasBitsOffset =
-    8 * PROTOBUF_FIELD_OFFSET(UnstructuredFilterTableRequest, _impl_._has_bits_);
-  static const ::io::deephaven::proto::backplane::grpc::Ticket& result_id(const UnstructuredFilterTableRequest* msg);
-  static void set_has_result_id(HasBits* has_bits) {
-    (*has_bits)[0] |= 1u;
-  }
-  static const ::io::deephaven::proto::backplane::grpc::TableReference& source_id(const UnstructuredFilterTableRequest* msg);
-  static void set_has_source_id(HasBits* has_bits) {
-    (*has_bits)[0] |= 2u;
-  }
-};
-
-const ::io::deephaven::proto::backplane::grpc::Ticket& UnstructuredFilterTableRequest::_Internal::result_id(const UnstructuredFilterTableRequest* msg) {
-  return *msg->_impl_.result_id_;
-}
-const ::io::deephaven::proto::backplane::grpc::TableReference& UnstructuredFilterTableRequest::_Internal::source_id(const UnstructuredFilterTableRequest* msg) {
-  return *msg->_impl_.source_id_;
-}
-void UnstructuredFilterTableRequest::clear_result_id() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  if (_impl_.result_id_ != nullptr) _impl_.result_id_->Clear();
-  _impl_._has_bits_[0] &= ~0x00000001u;
-}
-UnstructuredFilterTableRequest::UnstructuredFilterTableRequest(::google::protobuf::Arena* arena)
-    : ::google::protobuf::Message(arena) {
-  SharedCtor(arena);
-  // @@protoc_insertion_point(arena_constructor:io.deephaven.proto.backplane.grpc.UnstructuredFilterTableRequest)
-}
-inline PROTOBUF_NDEBUG_INLINE UnstructuredFilterTableRequest::Impl_::Impl_(
-    ::google::protobuf::internal::InternalVisibility visibility, ::google::protobuf::Arena* arena,
-    const Impl_& from)
-      : _has_bits_{from._has_bits_},
-        _cached_size_{0},
-        filters_{visibility, arena, from.filters_} {}
-
-UnstructuredFilterTableRequest::UnstructuredFilterTableRequest(
-    ::google::protobuf::Arena* arena,
-    const UnstructuredFilterTableRequest& from)
-    : ::google::protobuf::Message(arena) {
-  UnstructuredFilterTableRequest* const _this = this;
-  (void)_this;
-  _internal_metadata_.MergeFrom<::google::protobuf::UnknownFieldSet>(
-      from._internal_metadata_);
-  new (&_impl_) Impl_(internal_visibility(), arena, from._impl_);
-  ::uint32_t cached_has_bits = _impl_._has_bits_[0];
-  _impl_.result_id_ = (cached_has_bits & 0x00000001u)
-                ? CreateMaybeMessage<::io::deephaven::proto::backplane::grpc::Ticket>(arena, *from._impl_.result_id_)
-                : nullptr;
-  _impl_.source_id_ = (cached_has_bits & 0x00000002u)
-                ? CreateMaybeMessage<::io::deephaven::proto::backplane::grpc::TableReference>(arena, *from._impl_.source_id_)
-                : nullptr;
-
-  // @@protoc_insertion_point(copy_constructor:io.deephaven.proto.backplane.grpc.UnstructuredFilterTableRequest)
-}
-inline PROTOBUF_NDEBUG_INLINE UnstructuredFilterTableRequest::Impl_::Impl_(
-    ::google::protobuf::internal::InternalVisibility visibility,
-    ::google::protobuf::Arena* arena)
-      : _cached_size_{0},
-        filters_{visibility, arena} {}
-
-inline void UnstructuredFilterTableRequest::SharedCtor(::_pb::Arena* arena) {
-  new (&_impl_) Impl_(internal_visibility(), arena);
-  ::memset(reinterpret_cast<char *>(&_impl_) +
-               offsetof(Impl_, result_id_),
-           0,
-           offsetof(Impl_, source_id_) -
-               offsetof(Impl_, result_id_) +
-               sizeof(Impl_::source_id_));
-}
-UnstructuredFilterTableRequest::~UnstructuredFilterTableRequest() {
-  // @@protoc_insertion_point(destructor:io.deephaven.proto.backplane.grpc.UnstructuredFilterTableRequest)
-  _internal_metadata_.Delete<::google::protobuf::UnknownFieldSet>();
-  SharedDtor();
-}
-inline void UnstructuredFilterTableRequest::SharedDtor() {
-  ABSL_DCHECK(GetArena() == nullptr);
-  delete _impl_.result_id_;
-  delete _impl_.source_id_;
-  _impl_.~Impl_();
-}
-
-PROTOBUF_NOINLINE void UnstructuredFilterTableRequest::Clear() {
-// @@protoc_insertion_point(message_clear_start:io.deephaven.proto.backplane.grpc.UnstructuredFilterTableRequest)
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  ::uint32_t cached_has_bits = 0;
-  // Prevent compiler warnings about cached_has_bits being unused
-  (void) cached_has_bits;
-
-  _impl_.filters_.Clear();
-  cached_has_bits = _impl_._has_bits_[0];
-  if (cached_has_bits & 0x00000003u) {
-    if (cached_has_bits & 0x00000001u) {
-      ABSL_DCHECK(_impl_.result_id_ != nullptr);
-      _impl_.result_id_->Clear();
-    }
-    if (cached_has_bits & 0x00000002u) {
-      ABSL_DCHECK(_impl_.source_id_ != nullptr);
-      _impl_.source_id_->Clear();
-    }
-  }
-  _impl_._has_bits_.Clear();
-  _internal_metadata_.Clear<::google::protobuf::UnknownFieldSet>();
-}
-
-const char* UnstructuredFilterTableRequest::_InternalParse(
-    const char* ptr, ::_pbi::ParseContext* ctx) {
-  ptr = ::_pbi::TcParser::ParseLoop(this, ptr, ctx, &_table_.header);
-  return ptr;
-}
-
-
-PROTOBUF_CONSTINIT PROTOBUF_ATTRIBUTE_INIT_PRIORITY1
-const ::_pbi::TcParseTable<2, 3, 2, 80, 2> UnstructuredFilterTableRequest::_table_ = {
-  {
-    PROTOBUF_FIELD_OFFSET(UnstructuredFilterTableRequest, _impl_._has_bits_),
-    0, // no _extensions_
-    3, 24,  // max_field_number, fast_idx_mask
-    offsetof(decltype(_table_), field_lookup_table),
-    4294967288,  // skipmap
-    offsetof(decltype(_table_), field_entries),
-    3,  // num_field_entries
-    2,  // num_aux_entries
-    offsetof(decltype(_table_), aux_entries),
-    &_UnstructuredFilterTableRequest_default_instance_._instance,
-    ::_pbi::TcParser::GenericFallback,  // fallback
-  }, {{
-    {::_pbi::TcParser::MiniParse, {}},
-    // .io.deephaven.proto.backplane.grpc.Ticket result_id = 1;
-    {::_pbi::TcParser::FastMtS1,
-     {10, 0, 0, PROTOBUF_FIELD_OFFSET(UnstructuredFilterTableRequest, _impl_.result_id_)}},
-    // .io.deephaven.proto.backplane.grpc.TableReference source_id = 2;
-    {::_pbi::TcParser::FastMtS1,
-     {18, 1, 1, PROTOBUF_FIELD_OFFSET(UnstructuredFilterTableRequest, _impl_.source_id_)}},
-    // repeated string filters = 3;
-    {::_pbi::TcParser::FastUR1,
-     {26, 63, 0, PROTOBUF_FIELD_OFFSET(UnstructuredFilterTableRequest, _impl_.filters_)}},
-  }}, {{
-    65535, 65535
-  }}, {{
-    // .io.deephaven.proto.backplane.grpc.Ticket result_id = 1;
-    {PROTOBUF_FIELD_OFFSET(UnstructuredFilterTableRequest, _impl_.result_id_), _Internal::kHasBitsOffset + 0, 0,
-    (0 | ::_fl::kFcOptional | ::_fl::kMessage | ::_fl::kTvTable)},
-    // .io.deephaven.proto.backplane.grpc.TableReference source_id = 2;
-    {PROTOBUF_FIELD_OFFSET(UnstructuredFilterTableRequest, _impl_.source_id_), _Internal::kHasBitsOffset + 1, 1,
-    (0 | ::_fl::kFcOptional | ::_fl::kMessage | ::_fl::kTvTable)},
-    // repeated string filters = 3;
-    {PROTOBUF_FIELD_OFFSET(UnstructuredFilterTableRequest, _impl_.filters_), -1, 0,
-    (0 | ::_fl::kFcRepeated | ::_fl::kUtf8String | ::_fl::kRepSString)},
-  }}, {{
-    {::_pbi::TcParser::GetTable<::io::deephaven::proto::backplane::grpc::Ticket>()},
-    {::_pbi::TcParser::GetTable<::io::deephaven::proto::backplane::grpc::TableReference>()},
-  }}, {{
-    "\100\0\0\7\0\0\0\0"
-    "io.deephaven.proto.backplane.grpc.UnstructuredFilterTableRequest"
-    "filters"
-  }},
-};
-
-::uint8_t* UnstructuredFilterTableRequest::_InternalSerialize(
-    ::uint8_t* target,
-    ::google::protobuf::io::EpsCopyOutputStream* stream) const {
-  // @@protoc_insertion_point(serialize_to_array_start:io.deephaven.proto.backplane.grpc.UnstructuredFilterTableRequest)
-  ::uint32_t cached_has_bits = 0;
-  (void)cached_has_bits;
-
-  cached_has_bits = _impl_._has_bits_[0];
-  // .io.deephaven.proto.backplane.grpc.Ticket result_id = 1;
-  if (cached_has_bits & 0x00000001u) {
-    target = ::google::protobuf::internal::WireFormatLite::InternalWriteMessage(
-        1, _Internal::result_id(this),
-        _Internal::result_id(this).GetCachedSize(), target, stream);
-  }
-
-  // .io.deephaven.proto.backplane.grpc.TableReference source_id = 2;
-  if (cached_has_bits & 0x00000002u) {
-    target = ::google::protobuf::internal::WireFormatLite::InternalWriteMessage(
-        2, _Internal::source_id(this),
-        _Internal::source_id(this).GetCachedSize(), target, stream);
-  }
-
-  // repeated string filters = 3;
-  for (int i = 0, n = this->_internal_filters_size(); i < n; ++i) {
-    const auto& s = this->_internal_filters().Get(i);
-    ::google::protobuf::internal::WireFormatLite::VerifyUtf8String(
-        s.data(), static_cast<int>(s.length()), ::google::protobuf::internal::WireFormatLite::SERIALIZE, "io.deephaven.proto.backplane.grpc.UnstructuredFilterTableRequest.filters");
-    target = stream->WriteString(3, s, target);
-  }
-
-  if (PROTOBUF_PREDICT_FALSE(_internal_metadata_.have_unknown_fields())) {
-    target =
-        ::_pbi::WireFormat::InternalSerializeUnknownFieldsToArray(
-            _internal_metadata_.unknown_fields<::google::protobuf::UnknownFieldSet>(::google::protobuf::UnknownFieldSet::default_instance), target, stream);
-  }
-  // @@protoc_insertion_point(serialize_to_array_end:io.deephaven.proto.backplane.grpc.UnstructuredFilterTableRequest)
-  return target;
-}
-
-::size_t UnstructuredFilterTableRequest::ByteSizeLong() const {
-// @@protoc_insertion_point(message_byte_size_start:io.deephaven.proto.backplane.grpc.UnstructuredFilterTableRequest)
-  ::size_t total_size = 0;
-
-  ::uint32_t cached_has_bits = 0;
-  // Prevent compiler warnings about cached_has_bits being unused
-  (void) cached_has_bits;
-
-  // repeated string filters = 3;
-  total_size += 1 * ::google::protobuf::internal::FromIntSize(_internal_filters().size());
-  for (int i = 0, n = _internal_filters().size(); i < n; ++i) {
-    total_size += ::google::protobuf::internal::WireFormatLite::StringSize(
-        _internal_filters().Get(i));
-  }
-  cached_has_bits = _impl_._has_bits_[0];
-  if (cached_has_bits & 0x00000003u) {
-    // .io.deephaven.proto.backplane.grpc.Ticket result_id = 1;
-    if (cached_has_bits & 0x00000001u) {
-      total_size +=
-          1 + ::google::protobuf::internal::WireFormatLite::MessageSize(*_impl_.result_id_);
-    }
-
-    // .io.deephaven.proto.backplane.grpc.TableReference source_id = 2;
-    if (cached_has_bits & 0x00000002u) {
-      total_size +=
-          1 + ::google::protobuf::internal::WireFormatLite::MessageSize(*_impl_.source_id_);
-    }
-
-  }
-  return MaybeComputeUnknownFieldsSize(total_size, &_impl_._cached_size_);
-}
-
-const ::google::protobuf::Message::ClassData UnstructuredFilterTableRequest::_class_data_ = {
-    UnstructuredFilterTableRequest::MergeImpl,
-    nullptr,  // OnDemandRegisterArenaDtor
-};
-const ::google::protobuf::Message::ClassData* UnstructuredFilterTableRequest::GetClassData() const {
-  return &_class_data_;
-}
-
-void UnstructuredFilterTableRequest::MergeImpl(::google::protobuf::Message& to_msg, const ::google::protobuf::Message& from_msg) {
-  auto* const _this = static_cast<UnstructuredFilterTableRequest*>(&to_msg);
-  auto& from = static_cast<const UnstructuredFilterTableRequest&>(from_msg);
-  // @@protoc_insertion_point(class_specific_merge_from_start:io.deephaven.proto.backplane.grpc.UnstructuredFilterTableRequest)
-  ABSL_DCHECK_NE(&from, _this);
-  ::uint32_t cached_has_bits = 0;
-  (void) cached_has_bits;
-
-  _this->_internal_mutable_filters()->MergeFrom(from._internal_filters());
-  cached_has_bits = from._impl_._has_bits_[0];
-  if (cached_has_bits & 0x00000003u) {
-    if (cached_has_bits & 0x00000001u) {
-      _this->_internal_mutable_result_id()->::io::deephaven::proto::backplane::grpc::Ticket::MergeFrom(
-          from._internal_result_id());
-    }
-    if (cached_has_bits & 0x00000002u) {
-      _this->_internal_mutable_source_id()->::io::deephaven::proto::backplane::grpc::TableReference::MergeFrom(
-          from._internal_source_id());
-    }
-  }
-  _this->_internal_metadata_.MergeFrom<::google::protobuf::UnknownFieldSet>(from._internal_metadata_);
-}
-
-void UnstructuredFilterTableRequest::CopyFrom(const UnstructuredFilterTableRequest& from) {
-// @@protoc_insertion_point(class_specific_copy_from_start:io.deephaven.proto.backplane.grpc.UnstructuredFilterTableRequest)
-  if (&from == this) return;
-  Clear();
-  MergeFrom(from);
-}
-
-PROTOBUF_NOINLINE bool UnstructuredFilterTableRequest::IsInitialized() const {
-  return true;
-}
-
-::_pbi::CachedSize* UnstructuredFilterTableRequest::AccessCachedSize() const {
-  return &_impl_._cached_size_;
-}
-void UnstructuredFilterTableRequest::InternalSwap(UnstructuredFilterTableRequest* PROTOBUF_RESTRICT other) {
-  using std::swap;
-  _internal_metadata_.InternalSwap(&other->_internal_metadata_);
-  swap(_impl_._has_bits_[0], other->_impl_._has_bits_[0]);
-  _impl_.filters_.InternalSwap(&other->_impl_.filters_);
-  ::google::protobuf::internal::memswap<
-      PROTOBUF_FIELD_OFFSET(UnstructuredFilterTableRequest, _impl_.source_id_)
-      + sizeof(UnstructuredFilterTableRequest::_impl_.source_id_)
-      - PROTOBUF_FIELD_OFFSET(UnstructuredFilterTableRequest, _impl_.result_id_)>(
-          reinterpret_cast<char*>(&_impl_.result_id_),
-          reinterpret_cast<char*>(&other->_impl_.result_id_));
-}
-
-::google::protobuf::Metadata UnstructuredFilterTableRequest::GetMetadata() const {
-  return ::_pbi::AssignDescriptors(
-      &descriptor_table_deephaven_2fproto_2ftable_2eproto_getter, &descriptor_table_deephaven_2fproto_2ftable_2eproto_once,
-      file_level_metadata_deephaven_2fproto_2ftable_2eproto[43]);
-}
-// ===================================================================
-
-class HeadOrTailRequest::_Internal {
- public:
-  using HasBits = decltype(std::declval<HeadOrTailRequest>()._impl_._has_bits_);
-  static constexpr ::int32_t kHasBitsOffset =
-    8 * PROTOBUF_FIELD_OFFSET(HeadOrTailRequest, _impl_._has_bits_);
-  static const ::io::deephaven::proto::backplane::grpc::Ticket& result_id(const HeadOrTailRequest* msg);
-  static void set_has_result_id(HasBits* has_bits) {
-    (*has_bits)[0] |= 1u;
-  }
-  static const ::io::deephaven::proto::backplane::grpc::TableReference& source_id(const HeadOrTailRequest* msg);
-  static void set_has_source_id(HasBits* has_bits) {
-    (*has_bits)[0] |= 2u;
-  }
-};
-
-const ::io::deephaven::proto::backplane::grpc::Ticket& HeadOrTailRequest::_Internal::result_id(const HeadOrTailRequest* msg) {
-  return *msg->_impl_.result_id_;
-}
-const ::io::deephaven::proto::backplane::grpc::TableReference& HeadOrTailRequest::_Internal::source_id(const HeadOrTailRequest* msg) {
-  return *msg->_impl_.source_id_;
-}
-void HeadOrTailRequest::clear_result_id() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  if (_impl_.result_id_ != nullptr) _impl_.result_id_->Clear();
-  _impl_._has_bits_[0] &= ~0x00000001u;
-}
-HeadOrTailRequest::HeadOrTailRequest(::google::protobuf::Arena* arena)
-    : ::google::protobuf::Message(arena) {
-  SharedCtor(arena);
-  // @@protoc_insertion_point(arena_constructor:io.deephaven.proto.backplane.grpc.HeadOrTailRequest)
-}
-inline PROTOBUF_NDEBUG_INLINE HeadOrTailRequest::Impl_::Impl_(
-    ::google::protobuf::internal::InternalVisibility visibility, ::google::protobuf::Arena* arena,
-    const Impl_& from)
-      : _has_bits_{from._has_bits_},
-        _cached_size_{0} {}
-
-HeadOrTailRequest::HeadOrTailRequest(
-    ::google::protobuf::Arena* arena,
-    const HeadOrTailRequest& from)
-    : ::google::protobuf::Message(arena) {
-  HeadOrTailRequest* const _this = this;
-  (void)_this;
-  _internal_metadata_.MergeFrom<::google::protobuf::UnknownFieldSet>(
-      from._internal_metadata_);
-  new (&_impl_) Impl_(internal_visibility(), arena, from._impl_);
-  ::uint32_t cached_has_bits = _impl_._has_bits_[0];
-  _impl_.result_id_ = (cached_has_bits & 0x00000001u)
-                ? CreateMaybeMessage<::io::deephaven::proto::backplane::grpc::Ticket>(arena, *from._impl_.result_id_)
-                : nullptr;
-  _impl_.source_id_ = (cached_has_bits & 0x00000002u)
-                ? CreateMaybeMessage<::io::deephaven::proto::backplane::grpc::TableReference>(arena, *from._impl_.source_id_)
-                : nullptr;
-  _impl_.num_rows_ = from._impl_.num_rows_;
-
-  // @@protoc_insertion_point(copy_constructor:io.deephaven.proto.backplane.grpc.HeadOrTailRequest)
-}
-inline PROTOBUF_NDEBUG_INLINE HeadOrTailRequest::Impl_::Impl_(
-    ::google::protobuf::internal::InternalVisibility visibility,
-    ::google::protobuf::Arena* arena)
-      : _cached_size_{0} {}
-
-inline void HeadOrTailRequest::SharedCtor(::_pb::Arena* arena) {
-  new (&_impl_) Impl_(internal_visibility(), arena);
-  ::memset(reinterpret_cast<char *>(&_impl_) +
-               offsetof(Impl_, result_id_),
-           0,
-           offsetof(Impl_, num_rows_) -
-               offsetof(Impl_, result_id_) +
-               sizeof(Impl_::num_rows_));
-}
-HeadOrTailRequest::~HeadOrTailRequest() {
-  // @@protoc_insertion_point(destructor:io.deephaven.proto.backplane.grpc.HeadOrTailRequest)
-  _internal_metadata_.Delete<::google::protobuf::UnknownFieldSet>();
-  SharedDtor();
-}
-inline void HeadOrTailRequest::SharedDtor() {
-  ABSL_DCHECK(GetArena() == nullptr);
-  delete _impl_.result_id_;
-  delete _impl_.source_id_;
-  _impl_.~Impl_();
-}
-
-PROTOBUF_NOINLINE void HeadOrTailRequest::Clear() {
-// @@protoc_insertion_point(message_clear_start:io.deephaven.proto.backplane.grpc.HeadOrTailRequest)
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  ::uint32_t cached_has_bits = 0;
-  // Prevent compiler warnings about cached_has_bits being unused
-  (void) cached_has_bits;
-
-  cached_has_bits = _impl_._has_bits_[0];
-  if (cached_has_bits & 0x00000003u) {
-    if (cached_has_bits & 0x00000001u) {
-      ABSL_DCHECK(_impl_.result_id_ != nullptr);
-      _impl_.result_id_->Clear();
-    }
-    if (cached_has_bits & 0x00000002u) {
-      ABSL_DCHECK(_impl_.source_id_ != nullptr);
-      _impl_.source_id_->Clear();
-    }
-  }
-  _impl_.num_rows_ = ::int64_t{0};
-  _impl_._has_bits_.Clear();
-  _internal_metadata_.Clear<::google::protobuf::UnknownFieldSet>();
-}
-
-const char* HeadOrTailRequest::_InternalParse(
-    const char* ptr, ::_pbi::ParseContext* ctx) {
-  ptr = ::_pbi::TcParser::ParseLoop(this, ptr, ctx, &_table_.header);
-  return ptr;
-}
-
-
-PROTOBUF_CONSTINIT PROTOBUF_ATTRIBUTE_INIT_PRIORITY1
-const ::_pbi::TcParseTable<2, 3, 2, 0, 2> HeadOrTailRequest::_table_ = {
-  {
-    PROTOBUF_FIELD_OFFSET(HeadOrTailRequest, _impl_._has_bits_),
-    0, // no _extensions_
-    3, 24,  // max_field_number, fast_idx_mask
-    offsetof(decltype(_table_), field_lookup_table),
-    4294967288,  // skipmap
-    offsetof(decltype(_table_), field_entries),
-    3,  // num_field_entries
-    2,  // num_aux_entries
-    offsetof(decltype(_table_), aux_entries),
-    &_HeadOrTailRequest_default_instance_._instance,
-    ::_pbi::TcParser::GenericFallback,  // fallback
-  }, {{
-    {::_pbi::TcParser::MiniParse, {}},
-    // .io.deephaven.proto.backplane.grpc.Ticket result_id = 1;
-    {::_pbi::TcParser::FastMtS1,
-     {10, 0, 0, PROTOBUF_FIELD_OFFSET(HeadOrTailRequest, _impl_.result_id_)}},
-    // .io.deephaven.proto.backplane.grpc.TableReference source_id = 2;
-    {::_pbi::TcParser::FastMtS1,
-     {18, 1, 1, PROTOBUF_FIELD_OFFSET(HeadOrTailRequest, _impl_.source_id_)}},
-    // sint64 num_rows = 3 [jstype = JS_STRING];
-    {::_pbi::TcParser::FastZ64S1,
-     {24, 63, 0, PROTOBUF_FIELD_OFFSET(HeadOrTailRequest, _impl_.num_rows_)}},
-  }}, {{
-    65535, 65535
-  }}, {{
-    // .io.deephaven.proto.backplane.grpc.Ticket result_id = 1;
-    {PROTOBUF_FIELD_OFFSET(HeadOrTailRequest, _impl_.result_id_), _Internal::kHasBitsOffset + 0, 0,
-    (0 | ::_fl::kFcOptional | ::_fl::kMessage | ::_fl::kTvTable)},
-    // .io.deephaven.proto.backplane.grpc.TableReference source_id = 2;
-    {PROTOBUF_FIELD_OFFSET(HeadOrTailRequest, _impl_.source_id_), _Internal::kHasBitsOffset + 1, 1,
-    (0 | ::_fl::kFcOptional | ::_fl::kMessage | ::_fl::kTvTable)},
-    // sint64 num_rows = 3 [jstype = JS_STRING];
-    {PROTOBUF_FIELD_OFFSET(HeadOrTailRequest, _impl_.num_rows_), -1, 0,
-    (0 | ::_fl::kFcSingular | ::_fl::kSInt64)},
-  }}, {{
-    {::_pbi::TcParser::GetTable<::io::deephaven::proto::backplane::grpc::Ticket>()},
-    {::_pbi::TcParser::GetTable<::io::deephaven::proto::backplane::grpc::TableReference>()},
-  }}, {{
-  }},
-};
-
-::uint8_t* HeadOrTailRequest::_InternalSerialize(
-    ::uint8_t* target,
-    ::google::protobuf::io::EpsCopyOutputStream* stream) const {
-  // @@protoc_insertion_point(serialize_to_array_start:io.deephaven.proto.backplane.grpc.HeadOrTailRequest)
-  ::uint32_t cached_has_bits = 0;
-  (void)cached_has_bits;
-
-  cached_has_bits = _impl_._has_bits_[0];
-  // .io.deephaven.proto.backplane.grpc.Ticket result_id = 1;
-  if (cached_has_bits & 0x00000001u) {
-    target = ::google::protobuf::internal::WireFormatLite::InternalWriteMessage(
-        1, _Internal::result_id(this),
-        _Internal::result_id(this).GetCachedSize(), target, stream);
-  }
-
-  // .io.deephaven.proto.backplane.grpc.TableReference source_id = 2;
-  if (cached_has_bits & 0x00000002u) {
-    target = ::google::protobuf::internal::WireFormatLite::InternalWriteMessage(
-        2, _Internal::source_id(this),
-        _Internal::source_id(this).GetCachedSize(), target, stream);
-  }
-
-  // sint64 num_rows = 3 [jstype = JS_STRING];
-  if (this->_internal_num_rows() != 0) {
-    target = stream->EnsureSpace(target);
-    target = ::_pbi::WireFormatLite::WriteSInt64ToArray(
-        3, this->_internal_num_rows(), target);
-  }
-
-  if (PROTOBUF_PREDICT_FALSE(_internal_metadata_.have_unknown_fields())) {
-    target =
-        ::_pbi::WireFormat::InternalSerializeUnknownFieldsToArray(
-            _internal_metadata_.unknown_fields<::google::protobuf::UnknownFieldSet>(::google::protobuf::UnknownFieldSet::default_instance), target, stream);
-  }
-  // @@protoc_insertion_point(serialize_to_array_end:io.deephaven.proto.backplane.grpc.HeadOrTailRequest)
-  return target;
-}
-
-::size_t HeadOrTailRequest::ByteSizeLong() const {
-// @@protoc_insertion_point(message_byte_size_start:io.deephaven.proto.backplane.grpc.HeadOrTailRequest)
-  ::size_t total_size = 0;
-
-  ::uint32_t cached_has_bits = 0;
-  // Prevent compiler warnings about cached_has_bits being unused
-  (void) cached_has_bits;
-
-  cached_has_bits = _impl_._has_bits_[0];
-  if (cached_has_bits & 0x00000003u) {
-    // .io.deephaven.proto.backplane.grpc.Ticket result_id = 1;
-    if (cached_has_bits & 0x00000001u) {
-      total_size +=
-          1 + ::google::protobuf::internal::WireFormatLite::MessageSize(*_impl_.result_id_);
-    }
-
-    // .io.deephaven.proto.backplane.grpc.TableReference source_id = 2;
-    if (cached_has_bits & 0x00000002u) {
-      total_size +=
-          1 + ::google::protobuf::internal::WireFormatLite::MessageSize(*_impl_.source_id_);
-    }
-
-  }
-  // sint64 num_rows = 3 [jstype = JS_STRING];
-  if (this->_internal_num_rows() != 0) {
-    total_size += ::_pbi::WireFormatLite::SInt64SizePlusOne(
-        this->_internal_num_rows());
-  }
-
-  return MaybeComputeUnknownFieldsSize(total_size, &_impl_._cached_size_);
-}
-
-const ::google::protobuf::Message::ClassData HeadOrTailRequest::_class_data_ = {
-    HeadOrTailRequest::MergeImpl,
-    nullptr,  // OnDemandRegisterArenaDtor
-};
-const ::google::protobuf::Message::ClassData* HeadOrTailRequest::GetClassData() const {
-  return &_class_data_;
-}
-
-void HeadOrTailRequest::MergeImpl(::google::protobuf::Message& to_msg, const ::google::protobuf::Message& from_msg) {
-  auto* const _this = static_cast<HeadOrTailRequest*>(&to_msg);
-  auto& from = static_cast<const HeadOrTailRequest&>(from_msg);
-  // @@protoc_insertion_point(class_specific_merge_from_start:io.deephaven.proto.backplane.grpc.HeadOrTailRequest)
-  ABSL_DCHECK_NE(&from, _this);
-  ::uint32_t cached_has_bits = 0;
-  (void) cached_has_bits;
-
-  cached_has_bits = from._impl_._has_bits_[0];
-  if (cached_has_bits & 0x00000003u) {
-    if (cached_has_bits & 0x00000001u) {
-      _this->_internal_mutable_result_id()->::io::deephaven::proto::backplane::grpc::Ticket::MergeFrom(
-          from._internal_result_id());
-    }
-    if (cached_has_bits & 0x00000002u) {
-      _this->_internal_mutable_source_id()->::io::deephaven::proto::backplane::grpc::TableReference::MergeFrom(
-          from._internal_source_id());
-    }
-  }
-  if (from._internal_num_rows() != 0) {
-    _this->_internal_set_num_rows(from._internal_num_rows());
-  }
-  _this->_internal_metadata_.MergeFrom<::google::protobuf::UnknownFieldSet>(from._internal_metadata_);
-}
-
-void HeadOrTailRequest::CopyFrom(const HeadOrTailRequest& from) {
-// @@protoc_insertion_point(class_specific_copy_from_start:io.deephaven.proto.backplane.grpc.HeadOrTailRequest)
-  if (&from == this) return;
-  Clear();
-  MergeFrom(from);
-}
-
-PROTOBUF_NOINLINE bool HeadOrTailRequest::IsInitialized() const {
-  return true;
-}
-
-::_pbi::CachedSize* HeadOrTailRequest::AccessCachedSize() const {
-  return &_impl_._cached_size_;
-}
-void HeadOrTailRequest::InternalSwap(HeadOrTailRequest* PROTOBUF_RESTRICT other) {
-  using std::swap;
-  _internal_metadata_.InternalSwap(&other->_internal_metadata_);
-  swap(_impl_._has_bits_[0], other->_impl_._has_bits_[0]);
-  ::google::protobuf::internal::memswap<
-      PROTOBUF_FIELD_OFFSET(HeadOrTailRequest, _impl_.num_rows_)
-      + sizeof(HeadOrTailRequest::_impl_.num_rows_)
-      - PROTOBUF_FIELD_OFFSET(HeadOrTailRequest, _impl_.result_id_)>(
-          reinterpret_cast<char*>(&_impl_.result_id_),
-          reinterpret_cast<char*>(&other->_impl_.result_id_));
-}
-
-::google::protobuf::Metadata HeadOrTailRequest::GetMetadata() const {
-  return ::_pbi::AssignDescriptors(
-      &descriptor_table_deephaven_2fproto_2ftable_2eproto_getter, &descriptor_table_deephaven_2fproto_2ftable_2eproto_once,
-      file_level_metadata_deephaven_2fproto_2ftable_2eproto[44]);
-}
-// ===================================================================
-
-class HeadOrTailByRequest::_Internal {
- public:
-  using HasBits = decltype(std::declval<HeadOrTailByRequest>()._impl_._has_bits_);
-  static constexpr ::int32_t kHasBitsOffset =
-    8 * PROTOBUF_FIELD_OFFSET(HeadOrTailByRequest, _impl_._has_bits_);
-  static const ::io::deephaven::proto::backplane::grpc::Ticket& result_id(const HeadOrTailByRequest* msg);
-  static void set_has_result_id(HasBits* has_bits) {
-    (*has_bits)[0] |= 1u;
-  }
-  static const ::io::deephaven::proto::backplane::grpc::TableReference& source_id(const HeadOrTailByRequest* msg);
-  static void set_has_source_id(HasBits* has_bits) {
-    (*has_bits)[0] |= 2u;
-  }
-};
-
-const ::io::deephaven::proto::backplane::grpc::Ticket& HeadOrTailByRequest::_Internal::result_id(const HeadOrTailByRequest* msg) {
-  return *msg->_impl_.result_id_;
-}
-const ::io::deephaven::proto::backplane::grpc::TableReference& HeadOrTailByRequest::_Internal::source_id(const HeadOrTailByRequest* msg) {
-  return *msg->_impl_.source_id_;
-}
-void HeadOrTailByRequest::clear_result_id() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  if (_impl_.result_id_ != nullptr) _impl_.result_id_->Clear();
-  _impl_._has_bits_[0] &= ~0x00000001u;
-}
-HeadOrTailByRequest::HeadOrTailByRequest(::google::protobuf::Arena* arena)
-    : ::google::protobuf::Message(arena) {
-  SharedCtor(arena);
-  // @@protoc_insertion_point(arena_constructor:io.deephaven.proto.backplane.grpc.HeadOrTailByRequest)
-}
-inline PROTOBUF_NDEBUG_INLINE HeadOrTailByRequest::Impl_::Impl_(
-    ::google::protobuf::internal::InternalVisibility visibility, ::google::protobuf::Arena* arena,
-    const Impl_& from)
-      : _has_bits_{from._has_bits_},
-        _cached_size_{0},
-        group_by_column_specs_{visibility, arena, from.group_by_column_specs_} {}
-
-HeadOrTailByRequest::HeadOrTailByRequest(
-    ::google::protobuf::Arena* arena,
-    const HeadOrTailByRequest& from)
-    : ::google::protobuf::Message(arena) {
-  HeadOrTailByRequest* const _this = this;
-  (void)_this;
-  _internal_metadata_.MergeFrom<::google::protobuf::UnknownFieldSet>(
-      from._internal_metadata_);
-  new (&_impl_) Impl_(internal_visibility(), arena, from._impl_);
-  ::uint32_t cached_has_bits = _impl_._has_bits_[0];
-  _impl_.result_id_ = (cached_has_bits & 0x00000001u)
-                ? CreateMaybeMessage<::io::deephaven::proto::backplane::grpc::Ticket>(arena, *from._impl_.result_id_)
-                : nullptr;
-  _impl_.source_id_ = (cached_has_bits & 0x00000002u)
-                ? CreateMaybeMessage<::io::deephaven::proto::backplane::grpc::TableReference>(arena, *from._impl_.source_id_)
-                : nullptr;
-  _impl_.num_rows_ = from._impl_.num_rows_;
-
-  // @@protoc_insertion_point(copy_constructor:io.deephaven.proto.backplane.grpc.HeadOrTailByRequest)
-}
-inline PROTOBUF_NDEBUG_INLINE HeadOrTailByRequest::Impl_::Impl_(
-    ::google::protobuf::internal::InternalVisibility visibility,
-    ::google::protobuf::Arena* arena)
-      : _cached_size_{0},
-        group_by_column_specs_{visibility, arena} {}
-
-inline void HeadOrTailByRequest::SharedCtor(::_pb::Arena* arena) {
-  new (&_impl_) Impl_(internal_visibility(), arena);
-  ::memset(reinterpret_cast<char *>(&_impl_) +
-               offsetof(Impl_, result_id_),
-           0,
-           offsetof(Impl_, num_rows_) -
-               offsetof(Impl_, result_id_) +
-               sizeof(Impl_::num_rows_));
-}
-HeadOrTailByRequest::~HeadOrTailByRequest() {
-  // @@protoc_insertion_point(destructor:io.deephaven.proto.backplane.grpc.HeadOrTailByRequest)
-  _internal_metadata_.Delete<::google::protobuf::UnknownFieldSet>();
-  SharedDtor();
-}
-inline void HeadOrTailByRequest::SharedDtor() {
-  ABSL_DCHECK(GetArena() == nullptr);
-  delete _impl_.result_id_;
-  delete _impl_.source_id_;
-  _impl_.~Impl_();
-}
-
-PROTOBUF_NOINLINE void HeadOrTailByRequest::Clear() {
-// @@protoc_insertion_point(message_clear_start:io.deephaven.proto.backplane.grpc.HeadOrTailByRequest)
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  ::uint32_t cached_has_bits = 0;
-  // Prevent compiler warnings about cached_has_bits being unused
-  (void) cached_has_bits;
-
-  _impl_.group_by_column_specs_.Clear();
-  cached_has_bits = _impl_._has_bits_[0];
-  if (cached_has_bits & 0x00000003u) {
-    if (cached_has_bits & 0x00000001u) {
-      ABSL_DCHECK(_impl_.result_id_ != nullptr);
-      _impl_.result_id_->Clear();
-    }
-    if (cached_has_bits & 0x00000002u) {
-      ABSL_DCHECK(_impl_.source_id_ != nullptr);
-      _impl_.source_id_->Clear();
-    }
-  }
-  _impl_.num_rows_ = ::int64_t{0};
-  _impl_._has_bits_.Clear();
-  _internal_metadata_.Clear<::google::protobuf::UnknownFieldSet>();
-}
-
-const char* HeadOrTailByRequest::_InternalParse(
-    const char* ptr, ::_pbi::ParseContext* ctx) {
-  ptr = ::_pbi::TcParser::ParseLoop(this, ptr, ctx, &_table_.header);
-  return ptr;
-}
-
-
-PROTOBUF_CONSTINIT PROTOBUF_ATTRIBUTE_INIT_PRIORITY1
-const ::_pbi::TcParseTable<2, 4, 2, 83, 2> HeadOrTailByRequest::_table_ = {
-  {
-    PROTOBUF_FIELD_OFFSET(HeadOrTailByRequest, _impl_._has_bits_),
-    0, // no _extensions_
-    4, 24,  // max_field_number, fast_idx_mask
-    offsetof(decltype(_table_), field_lookup_table),
-    4294967280,  // skipmap
-    offsetof(decltype(_table_), field_entries),
-    4,  // num_field_entries
-    2,  // num_aux_entries
-    offsetof(decltype(_table_), aux_entries),
-    &_HeadOrTailByRequest_default_instance_._instance,
-    ::_pbi::TcParser::GenericFallback,  // fallback
-  }, {{
-    // repeated string group_by_column_specs = 4;
-    {::_pbi::TcParser::FastUR1,
-     {34, 63, 0, PROTOBUF_FIELD_OFFSET(HeadOrTailByRequest, _impl_.group_by_column_specs_)}},
-    // .io.deephaven.proto.backplane.grpc.Ticket result_id = 1;
-    {::_pbi::TcParser::FastMtS1,
-     {10, 0, 0, PROTOBUF_FIELD_OFFSET(HeadOrTailByRequest, _impl_.result_id_)}},
-    // .io.deephaven.proto.backplane.grpc.TableReference source_id = 2;
-    {::_pbi::TcParser::FastMtS1,
-     {18, 1, 1, PROTOBUF_FIELD_OFFSET(HeadOrTailByRequest, _impl_.source_id_)}},
-    // sint64 num_rows = 3 [jstype = JS_STRING];
-    {::_pbi::TcParser::FastZ64S1,
-     {24, 63, 0, PROTOBUF_FIELD_OFFSET(HeadOrTailByRequest, _impl_.num_rows_)}},
-  }}, {{
-    65535, 65535
-  }}, {{
-    // .io.deephaven.proto.backplane.grpc.Ticket result_id = 1;
-    {PROTOBUF_FIELD_OFFSET(HeadOrTailByRequest, _impl_.result_id_), _Internal::kHasBitsOffset + 0, 0,
-    (0 | ::_fl::kFcOptional | ::_fl::kMessage | ::_fl::kTvTable)},
-    // .io.deephaven.proto.backplane.grpc.TableReference source_id = 2;
-    {PROTOBUF_FIELD_OFFSET(HeadOrTailByRequest, _impl_.source_id_), _Internal::kHasBitsOffset + 1, 1,
-    (0 | ::_fl::kFcOptional | ::_fl::kMessage | ::_fl::kTvTable)},
-    // sint64 num_rows = 3 [jstype = JS_STRING];
-    {PROTOBUF_FIELD_OFFSET(HeadOrTailByRequest, _impl_.num_rows_), -1, 0,
-    (0 | ::_fl::kFcSingular | ::_fl::kSInt64)},
-    // repeated string group_by_column_specs = 4;
-    {PROTOBUF_FIELD_OFFSET(HeadOrTailByRequest, _impl_.group_by_column_specs_), -1, 0,
-    (0 | ::_fl::kFcRepeated | ::_fl::kUtf8String | ::_fl::kRepSString)},
-  }}, {{
-    {::_pbi::TcParser::GetTable<::io::deephaven::proto::backplane::grpc::Ticket>()},
-    {::_pbi::TcParser::GetTable<::io::deephaven::proto::backplane::grpc::TableReference>()},
-  }}, {{
-    "\65\0\0\0\25\0\0\0"
-    "io.deephaven.proto.backplane.grpc.HeadOrTailByRequest"
-    "group_by_column_specs"
-  }},
-};
-
-::uint8_t* HeadOrTailByRequest::_InternalSerialize(
-    ::uint8_t* target,
-    ::google::protobuf::io::EpsCopyOutputStream* stream) const {
-  // @@protoc_insertion_point(serialize_to_array_start:io.deephaven.proto.backplane.grpc.HeadOrTailByRequest)
-  ::uint32_t cached_has_bits = 0;
-  (void)cached_has_bits;
-
-  cached_has_bits = _impl_._has_bits_[0];
-  // .io.deephaven.proto.backplane.grpc.Ticket result_id = 1;
-  if (cached_has_bits & 0x00000001u) {
-    target = ::google::protobuf::internal::WireFormatLite::InternalWriteMessage(
-        1, _Internal::result_id(this),
-        _Internal::result_id(this).GetCachedSize(), target, stream);
-  }
-
-  // .io.deephaven.proto.backplane.grpc.TableReference source_id = 2;
-  if (cached_has_bits & 0x00000002u) {
-    target = ::google::protobuf::internal::WireFormatLite::InternalWriteMessage(
-        2, _Internal::source_id(this),
-        _Internal::source_id(this).GetCachedSize(), target, stream);
-  }
-
-  // sint64 num_rows = 3 [jstype = JS_STRING];
-  if (this->_internal_num_rows() != 0) {
-    target = stream->EnsureSpace(target);
-    target = ::_pbi::WireFormatLite::WriteSInt64ToArray(
-        3, this->_internal_num_rows(), target);
-  }
-
-  // repeated string group_by_column_specs = 4;
-  for (int i = 0, n = this->_internal_group_by_column_specs_size(); i < n; ++i) {
-    const auto& s = this->_internal_group_by_column_specs().Get(i);
-    ::google::protobuf::internal::WireFormatLite::VerifyUtf8String(
-        s.data(), static_cast<int>(s.length()), ::google::protobuf::internal::WireFormatLite::SERIALIZE, "io.deephaven.proto.backplane.grpc.HeadOrTailByRequest.group_by_column_specs");
-    target = stream->WriteString(4, s, target);
-  }
-
-  if (PROTOBUF_PREDICT_FALSE(_internal_metadata_.have_unknown_fields())) {
-    target =
-        ::_pbi::WireFormat::InternalSerializeUnknownFieldsToArray(
-            _internal_metadata_.unknown_fields<::google::protobuf::UnknownFieldSet>(::google::protobuf::UnknownFieldSet::default_instance), target, stream);
-  }
-  // @@protoc_insertion_point(serialize_to_array_end:io.deephaven.proto.backplane.grpc.HeadOrTailByRequest)
-  return target;
-}
-
-::size_t HeadOrTailByRequest::ByteSizeLong() const {
-// @@protoc_insertion_point(message_byte_size_start:io.deephaven.proto.backplane.grpc.HeadOrTailByRequest)
-  ::size_t total_size = 0;
-
-  ::uint32_t cached_has_bits = 0;
-  // Prevent compiler warnings about cached_has_bits being unused
-  (void) cached_has_bits;
-
-  // repeated string group_by_column_specs = 4;
-  total_size += 1 * ::google::protobuf::internal::FromIntSize(_internal_group_by_column_specs().size());
-  for (int i = 0, n = _internal_group_by_column_specs().size(); i < n; ++i) {
-    total_size += ::google::protobuf::internal::WireFormatLite::StringSize(
-        _internal_group_by_column_specs().Get(i));
-  }
-  cached_has_bits = _impl_._has_bits_[0];
-  if (cached_has_bits & 0x00000003u) {
-    // .io.deephaven.proto.backplane.grpc.Ticket result_id = 1;
-    if (cached_has_bits & 0x00000001u) {
-      total_size +=
-          1 + ::google::protobuf::internal::WireFormatLite::MessageSize(*_impl_.result_id_);
-    }
-
-    // .io.deephaven.proto.backplane.grpc.TableReference source_id = 2;
-    if (cached_has_bits & 0x00000002u) {
-      total_size +=
-          1 + ::google::protobuf::internal::WireFormatLite::MessageSize(*_impl_.source_id_);
-    }
-
-  }
-  // sint64 num_rows = 3 [jstype = JS_STRING];
-  if (this->_internal_num_rows() != 0) {
-    total_size += ::_pbi::WireFormatLite::SInt64SizePlusOne(
-        this->_internal_num_rows());
-  }
-
-  return MaybeComputeUnknownFieldsSize(total_size, &_impl_._cached_size_);
-}
-
-const ::google::protobuf::Message::ClassData HeadOrTailByRequest::_class_data_ = {
-    HeadOrTailByRequest::MergeImpl,
-    nullptr,  // OnDemandRegisterArenaDtor
-};
-const ::google::protobuf::Message::ClassData* HeadOrTailByRequest::GetClassData() const {
-  return &_class_data_;
-}
-
-void HeadOrTailByRequest::MergeImpl(::google::protobuf::Message& to_msg, const ::google::protobuf::Message& from_msg) {
-  auto* const _this = static_cast<HeadOrTailByRequest*>(&to_msg);
-  auto& from = static_cast<const HeadOrTailByRequest&>(from_msg);
-  // @@protoc_insertion_point(class_specific_merge_from_start:io.deephaven.proto.backplane.grpc.HeadOrTailByRequest)
-  ABSL_DCHECK_NE(&from, _this);
-  ::uint32_t cached_has_bits = 0;
-  (void) cached_has_bits;
-
-  _this->_internal_mutable_group_by_column_specs()->MergeFrom(from._internal_group_by_column_specs());
-  cached_has_bits = from._impl_._has_bits_[0];
-  if (cached_has_bits & 0x00000003u) {
-    if (cached_has_bits & 0x00000001u) {
-      _this->_internal_mutable_result_id()->::io::deephaven::proto::backplane::grpc::Ticket::MergeFrom(
-          from._internal_result_id());
-    }
-    if (cached_has_bits & 0x00000002u) {
-      _this->_internal_mutable_source_id()->::io::deephaven::proto::backplane::grpc::TableReference::MergeFrom(
-          from._internal_source_id());
-    }
-  }
-  if (from._internal_num_rows() != 0) {
-    _this->_internal_set_num_rows(from._internal_num_rows());
-  }
-  _this->_internal_metadata_.MergeFrom<::google::protobuf::UnknownFieldSet>(from._internal_metadata_);
-}
-
-void HeadOrTailByRequest::CopyFrom(const HeadOrTailByRequest& from) {
-// @@protoc_insertion_point(class_specific_copy_from_start:io.deephaven.proto.backplane.grpc.HeadOrTailByRequest)
-  if (&from == this) return;
-  Clear();
-  MergeFrom(from);
-}
-
-PROTOBUF_NOINLINE bool HeadOrTailByRequest::IsInitialized() const {
-  return true;
-}
-
-::_pbi::CachedSize* HeadOrTailByRequest::AccessCachedSize() const {
-  return &_impl_._cached_size_;
-}
-void HeadOrTailByRequest::InternalSwap(HeadOrTailByRequest* PROTOBUF_RESTRICT other) {
-  using std::swap;
-  _internal_metadata_.InternalSwap(&other->_internal_metadata_);
-  swap(_impl_._has_bits_[0], other->_impl_._has_bits_[0]);
-  _impl_.group_by_column_specs_.InternalSwap(&other->_impl_.group_by_column_specs_);
-  ::google::protobuf::internal::memswap<
-      PROTOBUF_FIELD_OFFSET(HeadOrTailByRequest, _impl_.num_rows_)
-      + sizeof(HeadOrTailByRequest::_impl_.num_rows_)
-      - PROTOBUF_FIELD_OFFSET(HeadOrTailByRequest, _impl_.result_id_)>(
-          reinterpret_cast<char*>(&_impl_.result_id_),
-          reinterpret_cast<char*>(&other->_impl_.result_id_));
-}
-
-::google::protobuf::Metadata HeadOrTailByRequest::GetMetadata() const {
-  return ::_pbi::AssignDescriptors(
-      &descriptor_table_deephaven_2fproto_2ftable_2eproto_getter, &descriptor_table_deephaven_2fproto_2ftable_2eproto_once,
-      file_level_metadata_deephaven_2fproto_2ftable_2eproto[45]);
-}
-// ===================================================================
-
-class UngroupRequest::_Internal {
- public:
-  using HasBits = decltype(std::declval<UngroupRequest>()._impl_._has_bits_);
-  static constexpr ::int32_t kHasBitsOffset =
-    8 * PROTOBUF_FIELD_OFFSET(UngroupRequest, _impl_._has_bits_);
-  static const ::io::deephaven::proto::backplane::grpc::Ticket& result_id(const UngroupRequest* msg);
-  static void set_has_result_id(HasBits* has_bits) {
-    (*has_bits)[0] |= 1u;
-  }
-  static const ::io::deephaven::proto::backplane::grpc::TableReference& source_id(const UngroupRequest* msg);
-  static void set_has_source_id(HasBits* has_bits) {
-    (*has_bits)[0] |= 2u;
-  }
-};
-
-const ::io::deephaven::proto::backplane::grpc::Ticket& UngroupRequest::_Internal::result_id(const UngroupRequest* msg) {
-  return *msg->_impl_.result_id_;
-}
-const ::io::deephaven::proto::backplane::grpc::TableReference& UngroupRequest::_Internal::source_id(const UngroupRequest* msg) {
-  return *msg->_impl_.source_id_;
-}
-void UngroupRequest::clear_result_id() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  if (_impl_.result_id_ != nullptr) _impl_.result_id_->Clear();
-  _impl_._has_bits_[0] &= ~0x00000001u;
-}
-UngroupRequest::UngroupRequest(::google::protobuf::Arena* arena)
-    : ::google::protobuf::Message(arena) {
-  SharedCtor(arena);
-  // @@protoc_insertion_point(arena_constructor:io.deephaven.proto.backplane.grpc.UngroupRequest)
-}
-inline PROTOBUF_NDEBUG_INLINE UngroupRequest::Impl_::Impl_(
-    ::google::protobuf::internal::InternalVisibility visibility, ::google::protobuf::Arena* arena,
-    const Impl_& from)
-      : _has_bits_{from._has_bits_},
-        _cached_size_{0},
-        columns_to_ungroup_{visibility, arena, from.columns_to_ungroup_} {}
-
-UngroupRequest::UngroupRequest(
-    ::google::protobuf::Arena* arena,
-    const UngroupRequest& from)
-    : ::google::protobuf::Message(arena) {
-  UngroupRequest* const _this = this;
-  (void)_this;
-  _internal_metadata_.MergeFrom<::google::protobuf::UnknownFieldSet>(
-      from._internal_metadata_);
-  new (&_impl_) Impl_(internal_visibility(), arena, from._impl_);
-  ::uint32_t cached_has_bits = _impl_._has_bits_[0];
-  _impl_.result_id_ = (cached_has_bits & 0x00000001u)
-                ? CreateMaybeMessage<::io::deephaven::proto::backplane::grpc::Ticket>(arena, *from._impl_.result_id_)
-                : nullptr;
-  _impl_.source_id_ = (cached_has_bits & 0x00000002u)
-                ? CreateMaybeMessage<::io::deephaven::proto::backplane::grpc::TableReference>(arena, *from._impl_.source_id_)
-                : nullptr;
-  _impl_.null_fill_ = from._impl_.null_fill_;
-
-  // @@protoc_insertion_point(copy_constructor:io.deephaven.proto.backplane.grpc.UngroupRequest)
-}
-inline PROTOBUF_NDEBUG_INLINE UngroupRequest::Impl_::Impl_(
-    ::google::protobuf::internal::InternalVisibility visibility,
-    ::google::protobuf::Arena* arena)
-      : _cached_size_{0},
-        columns_to_ungroup_{visibility, arena} {}
-
-inline void UngroupRequest::SharedCtor(::_pb::Arena* arena) {
-  new (&_impl_) Impl_(internal_visibility(), arena);
-  ::memset(reinterpret_cast<char *>(&_impl_) +
-               offsetof(Impl_, result_id_),
-           0,
-           offsetof(Impl_, null_fill_) -
-               offsetof(Impl_, result_id_) +
-               sizeof(Impl_::null_fill_));
-}
-UngroupRequest::~UngroupRequest() {
-  // @@protoc_insertion_point(destructor:io.deephaven.proto.backplane.grpc.UngroupRequest)
-  _internal_metadata_.Delete<::google::protobuf::UnknownFieldSet>();
-  SharedDtor();
-}
-inline void UngroupRequest::SharedDtor() {
-  ABSL_DCHECK(GetArena() == nullptr);
-  delete _impl_.result_id_;
-  delete _impl_.source_id_;
-  _impl_.~Impl_();
-}
-
-PROTOBUF_NOINLINE void UngroupRequest::Clear() {
-// @@protoc_insertion_point(message_clear_start:io.deephaven.proto.backplane.grpc.UngroupRequest)
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  ::uint32_t cached_has_bits = 0;
-  // Prevent compiler warnings about cached_has_bits being unused
-  (void) cached_has_bits;
-
-  _impl_.columns_to_ungroup_.Clear();
-  cached_has_bits = _impl_._has_bits_[0];
-  if (cached_has_bits & 0x00000003u) {
-    if (cached_has_bits & 0x00000001u) {
-      ABSL_DCHECK(_impl_.result_id_ != nullptr);
-      _impl_.result_id_->Clear();
-    }
-    if (cached_has_bits & 0x00000002u) {
-      ABSL_DCHECK(_impl_.source_id_ != nullptr);
-      _impl_.source_id_->Clear();
-    }
-  }
-  _impl_.null_fill_ = false;
-  _impl_._has_bits_.Clear();
-  _internal_metadata_.Clear<::google::protobuf::UnknownFieldSet>();
-}
-
-const char* UngroupRequest::_InternalParse(
-    const char* ptr, ::_pbi::ParseContext* ctx) {
-  ptr = ::_pbi::TcParser::ParseLoop(this, ptr, ctx, &_table_.header);
-  return ptr;
-}
-
-
-PROTOBUF_CONSTINIT PROTOBUF_ATTRIBUTE_INIT_PRIORITY1
-const ::_pbi::TcParseTable<2, 4, 2, 75, 2> UngroupRequest::_table_ = {
-  {
-    PROTOBUF_FIELD_OFFSET(UngroupRequest, _impl_._has_bits_),
-    0, // no _extensions_
-    4, 24,  // max_field_number, fast_idx_mask
-    offsetof(decltype(_table_), field_lookup_table),
-    4294967280,  // skipmap
-    offsetof(decltype(_table_), field_entries),
-    4,  // num_field_entries
-    2,  // num_aux_entries
-    offsetof(decltype(_table_), aux_entries),
-    &_UngroupRequest_default_instance_._instance,
-    ::_pbi::TcParser::GenericFallback,  // fallback
-  }, {{
-    // repeated string columns_to_ungroup = 4;
-    {::_pbi::TcParser::FastUR1,
-     {34, 63, 0, PROTOBUF_FIELD_OFFSET(UngroupRequest, _impl_.columns_to_ungroup_)}},
-    // .io.deephaven.proto.backplane.grpc.Ticket result_id = 1;
-    {::_pbi::TcParser::FastMtS1,
-     {10, 0, 0, PROTOBUF_FIELD_OFFSET(UngroupRequest, _impl_.result_id_)}},
-    // .io.deephaven.proto.backplane.grpc.TableReference source_id = 2;
-    {::_pbi::TcParser::FastMtS1,
-     {18, 1, 1, PROTOBUF_FIELD_OFFSET(UngroupRequest, _impl_.source_id_)}},
-    // bool null_fill = 3;
-    {::_pbi::TcParser::SingularVarintNoZag1<bool, offsetof(UngroupRequest, _impl_.null_fill_), 63>(),
-     {24, 63, 0, PROTOBUF_FIELD_OFFSET(UngroupRequest, _impl_.null_fill_)}},
-  }}, {{
-    65535, 65535
-  }}, {{
-    // .io.deephaven.proto.backplane.grpc.Ticket result_id = 1;
-    {PROTOBUF_FIELD_OFFSET(UngroupRequest, _impl_.result_id_), _Internal::kHasBitsOffset + 0, 0,
-    (0 | ::_fl::kFcOptional | ::_fl::kMessage | ::_fl::kTvTable)},
-    // .io.deephaven.proto.backplane.grpc.TableReference source_id = 2;
-    {PROTOBUF_FIELD_OFFSET(UngroupRequest, _impl_.source_id_), _Internal::kHasBitsOffset + 1, 1,
-    (0 | ::_fl::kFcOptional | ::_fl::kMessage | ::_fl::kTvTable)},
-    // bool null_fill = 3;
-    {PROTOBUF_FIELD_OFFSET(UngroupRequest, _impl_.null_fill_), -1, 0,
-    (0 | ::_fl::kFcSingular | ::_fl::kBool)},
-    // repeated string columns_to_ungroup = 4;
-    {PROTOBUF_FIELD_OFFSET(UngroupRequest, _impl_.columns_to_ungroup_), -1, 0,
-    (0 | ::_fl::kFcRepeated | ::_fl::kUtf8String | ::_fl::kRepSString)},
-  }}, {{
-    {::_pbi::TcParser::GetTable<::io::deephaven::proto::backplane::grpc::Ticket>()},
-    {::_pbi::TcParser::GetTable<::io::deephaven::proto::backplane::grpc::TableReference>()},
-  }}, {{
-    "\60\0\0\0\22\0\0\0"
-    "io.deephaven.proto.backplane.grpc.UngroupRequest"
-    "columns_to_ungroup"
-  }},
-};
-
-::uint8_t* UngroupRequest::_InternalSerialize(
-    ::uint8_t* target,
-    ::google::protobuf::io::EpsCopyOutputStream* stream) const {
-  // @@protoc_insertion_point(serialize_to_array_start:io.deephaven.proto.backplane.grpc.UngroupRequest)
-  ::uint32_t cached_has_bits = 0;
-  (void)cached_has_bits;
-
-  cached_has_bits = _impl_._has_bits_[0];
-  // .io.deephaven.proto.backplane.grpc.Ticket result_id = 1;
-  if (cached_has_bits & 0x00000001u) {
-    target = ::google::protobuf::internal::WireFormatLite::InternalWriteMessage(
-        1, _Internal::result_id(this),
-        _Internal::result_id(this).GetCachedSize(), target, stream);
-  }
-
-  // .io.deephaven.proto.backplane.grpc.TableReference source_id = 2;
-  if (cached_has_bits & 0x00000002u) {
-    target = ::google::protobuf::internal::WireFormatLite::InternalWriteMessage(
-        2, _Internal::source_id(this),
-        _Internal::source_id(this).GetCachedSize(), target, stream);
-  }
-
-  // bool null_fill = 3;
-  if (this->_internal_null_fill() != 0) {
-    target = stream->EnsureSpace(target);
-    target = ::_pbi::WireFormatLite::WriteBoolToArray(
-        3, this->_internal_null_fill(), target);
-  }
-
-  // repeated string columns_to_ungroup = 4;
-  for (int i = 0, n = this->_internal_columns_to_ungroup_size(); i < n; ++i) {
-    const auto& s = this->_internal_columns_to_ungroup().Get(i);
-    ::google::protobuf::internal::WireFormatLite::VerifyUtf8String(
-        s.data(), static_cast<int>(s.length()), ::google::protobuf::internal::WireFormatLite::SERIALIZE, "io.deephaven.proto.backplane.grpc.UngroupRequest.columns_to_ungroup");
-    target = stream->WriteString(4, s, target);
-  }
-
-  if (PROTOBUF_PREDICT_FALSE(_internal_metadata_.have_unknown_fields())) {
-    target =
-        ::_pbi::WireFormat::InternalSerializeUnknownFieldsToArray(
-            _internal_metadata_.unknown_fields<::google::protobuf::UnknownFieldSet>(::google::protobuf::UnknownFieldSet::default_instance), target, stream);
-  }
-  // @@protoc_insertion_point(serialize_to_array_end:io.deephaven.proto.backplane.grpc.UngroupRequest)
-  return target;
-}
-
-::size_t UngroupRequest::ByteSizeLong() const {
-// @@protoc_insertion_point(message_byte_size_start:io.deephaven.proto.backplane.grpc.UngroupRequest)
-  ::size_t total_size = 0;
-
-  ::uint32_t cached_has_bits = 0;
-  // Prevent compiler warnings about cached_has_bits being unused
-  (void) cached_has_bits;
-
-  // repeated string columns_to_ungroup = 4;
-  total_size += 1 * ::google::protobuf::internal::FromIntSize(_internal_columns_to_ungroup().size());
-  for (int i = 0, n = _internal_columns_to_ungroup().size(); i < n; ++i) {
-    total_size += ::google::protobuf::internal::WireFormatLite::StringSize(
-        _internal_columns_to_ungroup().Get(i));
-  }
-  cached_has_bits = _impl_._has_bits_[0];
-  if (cached_has_bits & 0x00000003u) {
-    // .io.deephaven.proto.backplane.grpc.Ticket result_id = 1;
-    if (cached_has_bits & 0x00000001u) {
-      total_size +=
-          1 + ::google::protobuf::internal::WireFormatLite::MessageSize(*_impl_.result_id_);
-    }
-
-    // .io.deephaven.proto.backplane.grpc.TableReference source_id = 2;
-    if (cached_has_bits & 0x00000002u) {
-      total_size +=
-          1 + ::google::protobuf::internal::WireFormatLite::MessageSize(*_impl_.source_id_);
-    }
-
-  }
-  // bool null_fill = 3;
-  if (this->_internal_null_fill() != 0) {
-    total_size += 2;
-  }
-
-  return MaybeComputeUnknownFieldsSize(total_size, &_impl_._cached_size_);
-}
-
-const ::google::protobuf::Message::ClassData UngroupRequest::_class_data_ = {
-    UngroupRequest::MergeImpl,
-    nullptr,  // OnDemandRegisterArenaDtor
-};
-const ::google::protobuf::Message::ClassData* UngroupRequest::GetClassData() const {
-  return &_class_data_;
-}
-
-void UngroupRequest::MergeImpl(::google::protobuf::Message& to_msg, const ::google::protobuf::Message& from_msg) {
-  auto* const _this = static_cast<UngroupRequest*>(&to_msg);
-  auto& from = static_cast<const UngroupRequest&>(from_msg);
-  // @@protoc_insertion_point(class_specific_merge_from_start:io.deephaven.proto.backplane.grpc.UngroupRequest)
-  ABSL_DCHECK_NE(&from, _this);
-  ::uint32_t cached_has_bits = 0;
-  (void) cached_has_bits;
-
-  _this->_internal_mutable_columns_to_ungroup()->MergeFrom(from._internal_columns_to_ungroup());
-  cached_has_bits = from._impl_._has_bits_[0];
-  if (cached_has_bits & 0x00000003u) {
-    if (cached_has_bits & 0x00000001u) {
-      _this->_internal_mutable_result_id()->::io::deephaven::proto::backplane::grpc::Ticket::MergeFrom(
-          from._internal_result_id());
-    }
-    if (cached_has_bits & 0x00000002u) {
-      _this->_internal_mutable_source_id()->::io::deephaven::proto::backplane::grpc::TableReference::MergeFrom(
-          from._internal_source_id());
-    }
-  }
-  if (from._internal_null_fill() != 0) {
-    _this->_internal_set_null_fill(from._internal_null_fill());
-  }
-  _this->_internal_metadata_.MergeFrom<::google::protobuf::UnknownFieldSet>(from._internal_metadata_);
-}
-
-void UngroupRequest::CopyFrom(const UngroupRequest& from) {
-// @@protoc_insertion_point(class_specific_copy_from_start:io.deephaven.proto.backplane.grpc.UngroupRequest)
-  if (&from == this) return;
-  Clear();
-  MergeFrom(from);
-}
-
-PROTOBUF_NOINLINE bool UngroupRequest::IsInitialized() const {
-  return true;
-}
-
-::_pbi::CachedSize* UngroupRequest::AccessCachedSize() const {
-  return &_impl_._cached_size_;
-}
-void UngroupRequest::InternalSwap(UngroupRequest* PROTOBUF_RESTRICT other) {
-  using std::swap;
-  _internal_metadata_.InternalSwap(&other->_internal_metadata_);
-  swap(_impl_._has_bits_[0], other->_impl_._has_bits_[0]);
-  _impl_.columns_to_ungroup_.InternalSwap(&other->_impl_.columns_to_ungroup_);
-  ::google::protobuf::internal::memswap<
-      PROTOBUF_FIELD_OFFSET(UngroupRequest, _impl_.null_fill_)
-      + sizeof(UngroupRequest::_impl_.null_fill_)
-      - PROTOBUF_FIELD_OFFSET(UngroupRequest, _impl_.result_id_)>(
-          reinterpret_cast<char*>(&_impl_.result_id_),
-          reinterpret_cast<char*>(&other->_impl_.result_id_));
-}
-
-::google::protobuf::Metadata UngroupRequest::GetMetadata() const {
-  return ::_pbi::AssignDescriptors(
-      &descriptor_table_deephaven_2fproto_2ftable_2eproto_getter, &descriptor_table_deephaven_2fproto_2ftable_2eproto_once,
-      file_level_metadata_deephaven_2fproto_2ftable_2eproto[46]);
-}
-// ===================================================================
-
-class MergeTablesRequest::_Internal {
- public:
-  using HasBits = decltype(std::declval<MergeTablesRequest>()._impl_._has_bits_);
-  static constexpr ::int32_t kHasBitsOffset =
-    8 * PROTOBUF_FIELD_OFFSET(MergeTablesRequest, _impl_._has_bits_);
-  static const ::io::deephaven::proto::backplane::grpc::Ticket& result_id(const MergeTablesRequest* msg);
-  static void set_has_result_id(HasBits* has_bits) {
-    (*has_bits)[0] |= 1u;
-  }
-};
-
-const ::io::deephaven::proto::backplane::grpc::Ticket& MergeTablesRequest::_Internal::result_id(const MergeTablesRequest* msg) {
-  return *msg->_impl_.result_id_;
-}
-void MergeTablesRequest::clear_result_id() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  if (_impl_.result_id_ != nullptr) _impl_.result_id_->Clear();
-  _impl_._has_bits_[0] &= ~0x00000001u;
-}
-MergeTablesRequest::MergeTablesRequest(::google::protobuf::Arena* arena)
-    : ::google::protobuf::Message(arena) {
-  SharedCtor(arena);
-  // @@protoc_insertion_point(arena_constructor:io.deephaven.proto.backplane.grpc.MergeTablesRequest)
-}
-inline PROTOBUF_NDEBUG_INLINE MergeTablesRequest::Impl_::Impl_(
-    ::google::protobuf::internal::InternalVisibility visibility, ::google::protobuf::Arena* arena,
-    const Impl_& from)
-      : _has_bits_{from._has_bits_},
-        _cached_size_{0},
-        source_ids_{visibility, arena, from.source_ids_},
-        key_column_(arena, from.key_column_) {}
-
-MergeTablesRequest::MergeTablesRequest(
-    ::google::protobuf::Arena* arena,
-    const MergeTablesRequest& from)
-    : ::google::protobuf::Message(arena) {
-  MergeTablesRequest* const _this = this;
-  (void)_this;
-  _internal_metadata_.MergeFrom<::google::protobuf::UnknownFieldSet>(
-      from._internal_metadata_);
-  new (&_impl_) Impl_(internal_visibility(), arena, from._impl_);
-  ::uint32_t cached_has_bits = _impl_._has_bits_[0];
-  _impl_.result_id_ = (cached_has_bits & 0x00000001u)
-                ? CreateMaybeMessage<::io::deephaven::proto::backplane::grpc::Ticket>(arena, *from._impl_.result_id_)
-                : nullptr;
-
-  // @@protoc_insertion_point(copy_constructor:io.deephaven.proto.backplane.grpc.MergeTablesRequest)
-}
-inline PROTOBUF_NDEBUG_INLINE MergeTablesRequest::Impl_::Impl_(
-    ::google::protobuf::internal::InternalVisibility visibility,
-    ::google::protobuf::Arena* arena)
-      : _cached_size_{0},
-        source_ids_{visibility, arena},
-        key_column_(arena) {}
-
-inline void MergeTablesRequest::SharedCtor(::_pb::Arena* arena) {
-  new (&_impl_) Impl_(internal_visibility(), arena);
-  _impl_.result_id_ = {};
-}
-MergeTablesRequest::~MergeTablesRequest() {
-  // @@protoc_insertion_point(destructor:io.deephaven.proto.backplane.grpc.MergeTablesRequest)
-  _internal_metadata_.Delete<::google::protobuf::UnknownFieldSet>();
-  SharedDtor();
-}
-inline void MergeTablesRequest::SharedDtor() {
-  ABSL_DCHECK(GetArena() == nullptr);
-  _impl_.key_column_.Destroy();
-  delete _impl_.result_id_;
-  _impl_.~Impl_();
-}
-
-PROTOBUF_NOINLINE void MergeTablesRequest::Clear() {
-// @@protoc_insertion_point(message_clear_start:io.deephaven.proto.backplane.grpc.MergeTablesRequest)
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  ::uint32_t cached_has_bits = 0;
-  // Prevent compiler warnings about cached_has_bits being unused
-  (void) cached_has_bits;
-
-  _impl_.source_ids_.Clear();
-  _impl_.key_column_.ClearToEmpty();
-  cached_has_bits = _impl_._has_bits_[0];
-  if (cached_has_bits & 0x00000001u) {
-    ABSL_DCHECK(_impl_.result_id_ != nullptr);
-    _impl_.result_id_->Clear();
-  }
-  _impl_._has_bits_.Clear();
-  _internal_metadata_.Clear<::google::protobuf::UnknownFieldSet>();
-}
-
-const char* MergeTablesRequest::_InternalParse(
-    const char* ptr, ::_pbi::ParseContext* ctx) {
-  ptr = ::_pbi::TcParser::ParseLoop(this, ptr, ctx, &_table_.header);
-  return ptr;
-}
-
-
-PROTOBUF_CONSTINIT PROTOBUF_ATTRIBUTE_INIT_PRIORITY1
-const ::_pbi::TcParseTable<2, 3, 2, 71, 2> MergeTablesRequest::_table_ = {
-  {
-    PROTOBUF_FIELD_OFFSET(MergeTablesRequest, _impl_._has_bits_),
-    0, // no _extensions_
-    3, 24,  // max_field_number, fast_idx_mask
-    offsetof(decltype(_table_), field_lookup_table),
-    4294967288,  // skipmap
-    offsetof(decltype(_table_), field_entries),
-    3,  // num_field_entries
-    2,  // num_aux_entries
-    offsetof(decltype(_table_), aux_entries),
-    &_MergeTablesRequest_default_instance_._instance,
-    ::_pbi::TcParser::GenericFallback,  // fallback
-  }, {{
-    {::_pbi::TcParser::MiniParse, {}},
-    // .io.deephaven.proto.backplane.grpc.Ticket result_id = 1;
-    {::_pbi::TcParser::FastMtS1,
-     {10, 0, 0, PROTOBUF_FIELD_OFFSET(MergeTablesRequest, _impl_.result_id_)}},
-    // repeated .io.deephaven.proto.backplane.grpc.TableReference source_ids = 2;
-    {::_pbi::TcParser::FastMtR1,
-     {18, 63, 1, PROTOBUF_FIELD_OFFSET(MergeTablesRequest, _impl_.source_ids_)}},
-    // string key_column = 3;
-    {::_pbi::TcParser::FastUS1,
-     {26, 63, 0, PROTOBUF_FIELD_OFFSET(MergeTablesRequest, _impl_.key_column_)}},
-  }}, {{
-    65535, 65535
-  }}, {{
-    // .io.deephaven.proto.backplane.grpc.Ticket result_id = 1;
-    {PROTOBUF_FIELD_OFFSET(MergeTablesRequest, _impl_.result_id_), _Internal::kHasBitsOffset + 0, 0,
-    (0 | ::_fl::kFcOptional | ::_fl::kMessage | ::_fl::kTvTable)},
-    // repeated .io.deephaven.proto.backplane.grpc.TableReference source_ids = 2;
-    {PROTOBUF_FIELD_OFFSET(MergeTablesRequest, _impl_.source_ids_), -1, 1,
-    (0 | ::_fl::kFcRepeated | ::_fl::kMessage | ::_fl::kTvTable)},
-    // string key_column = 3;
-    {PROTOBUF_FIELD_OFFSET(MergeTablesRequest, _impl_.key_column_), -1, 0,
-    (0 | ::_fl::kFcSingular | ::_fl::kUtf8String | ::_fl::kRepAString)},
-  }}, {{
-    {::_pbi::TcParser::GetTable<::io::deephaven::proto::backplane::grpc::Ticket>()},
-    {::_pbi::TcParser::GetTable<::io::deephaven::proto::backplane::grpc::TableReference>()},
-  }}, {{
-    "\64\0\0\12\0\0\0\0"
-    "io.deephaven.proto.backplane.grpc.MergeTablesRequest"
-    "key_column"
-  }},
-};
-
-::uint8_t* MergeTablesRequest::_InternalSerialize(
-    ::uint8_t* target,
-    ::google::protobuf::io::EpsCopyOutputStream* stream) const {
-  // @@protoc_insertion_point(serialize_to_array_start:io.deephaven.proto.backplane.grpc.MergeTablesRequest)
-  ::uint32_t cached_has_bits = 0;
-  (void)cached_has_bits;
-
-  cached_has_bits = _impl_._has_bits_[0];
-  // .io.deephaven.proto.backplane.grpc.Ticket result_id = 1;
-  if (cached_has_bits & 0x00000001u) {
-    target = ::google::protobuf::internal::WireFormatLite::InternalWriteMessage(
-        1, _Internal::result_id(this),
-        _Internal::result_id(this).GetCachedSize(), target, stream);
-  }
-
-  // repeated .io.deephaven.proto.backplane.grpc.TableReference source_ids = 2;
-  for (unsigned i = 0,
-      n = static_cast<unsigned>(this->_internal_source_ids_size()); i < n; i++) {
-    const auto& repfield = this->_internal_source_ids().Get(i);
-    target = ::google::protobuf::internal::WireFormatLite::
-        InternalWriteMessage(2, repfield, repfield.GetCachedSize(), target, stream);
-  }
-
-  // string key_column = 3;
-  if (!this->_internal_key_column().empty()) {
-    const std::string& _s = this->_internal_key_column();
-    ::google::protobuf::internal::WireFormatLite::VerifyUtf8String(
-        _s.data(), static_cast<int>(_s.length()), ::google::protobuf::internal::WireFormatLite::SERIALIZE, "io.deephaven.proto.backplane.grpc.MergeTablesRequest.key_column");
-    target = stream->WriteStringMaybeAliased(3, _s, target);
-  }
-
-  if (PROTOBUF_PREDICT_FALSE(_internal_metadata_.have_unknown_fields())) {
-    target =
-        ::_pbi::WireFormat::InternalSerializeUnknownFieldsToArray(
-            _internal_metadata_.unknown_fields<::google::protobuf::UnknownFieldSet>(::google::protobuf::UnknownFieldSet::default_instance), target, stream);
-  }
-  // @@protoc_insertion_point(serialize_to_array_end:io.deephaven.proto.backplane.grpc.MergeTablesRequest)
-  return target;
-}
-
-::size_t MergeTablesRequest::ByteSizeLong() const {
-// @@protoc_insertion_point(message_byte_size_start:io.deephaven.proto.backplane.grpc.MergeTablesRequest)
-  ::size_t total_size = 0;
-
-  ::uint32_t cached_has_bits = 0;
-  // Prevent compiler warnings about cached_has_bits being unused
-  (void) cached_has_bits;
-
-  // repeated .io.deephaven.proto.backplane.grpc.TableReference source_ids = 2;
-  total_size += 1UL * this->_internal_source_ids_size();
-  for (const auto& msg : this->_internal_source_ids()) {
-    total_size +=
-      ::google::protobuf::internal::WireFormatLite::MessageSize(msg);
-  }
-  // string key_column = 3;
-  if (!this->_internal_key_column().empty()) {
-    total_size += 1 + ::google::protobuf::internal::WireFormatLite::StringSize(
-                                    this->_internal_key_column());
-  }
-
-  // .io.deephaven.proto.backplane.grpc.Ticket result_id = 1;
-  cached_has_bits = _impl_._has_bits_[0];
-  if (cached_has_bits & 0x00000001u) {
-    total_size +=
-        1 + ::google::protobuf::internal::WireFormatLite::MessageSize(*_impl_.result_id_);
-  }
-
-  return MaybeComputeUnknownFieldsSize(total_size, &_impl_._cached_size_);
-}
-
-const ::google::protobuf::Message::ClassData MergeTablesRequest::_class_data_ = {
-    MergeTablesRequest::MergeImpl,
-    nullptr,  // OnDemandRegisterArenaDtor
-};
-const ::google::protobuf::Message::ClassData* MergeTablesRequest::GetClassData() const {
-  return &_class_data_;
-}
-
-void MergeTablesRequest::MergeImpl(::google::protobuf::Message& to_msg, const ::google::protobuf::Message& from_msg) {
-  auto* const _this = static_cast<MergeTablesRequest*>(&to_msg);
-  auto& from = static_cast<const MergeTablesRequest&>(from_msg);
-  // @@protoc_insertion_point(class_specific_merge_from_start:io.deephaven.proto.backplane.grpc.MergeTablesRequest)
-  ABSL_DCHECK_NE(&from, _this);
-  ::uint32_t cached_has_bits = 0;
-  (void) cached_has_bits;
-
-  _this->_internal_mutable_source_ids()->MergeFrom(
-      from._internal_source_ids());
-  if (!from._internal_key_column().empty()) {
-    _this->_internal_set_key_column(from._internal_key_column());
-  }
-  if ((from._impl_._has_bits_[0] & 0x00000001u) != 0) {
-    _this->_internal_mutable_result_id()->::io::deephaven::proto::backplane::grpc::Ticket::MergeFrom(
-        from._internal_result_id());
-  }
-  _this->_internal_metadata_.MergeFrom<::google::protobuf::UnknownFieldSet>(from._internal_metadata_);
-}
-
-void MergeTablesRequest::CopyFrom(const MergeTablesRequest& from) {
-// @@protoc_insertion_point(class_specific_copy_from_start:io.deephaven.proto.backplane.grpc.MergeTablesRequest)
-  if (&from == this) return;
-  Clear();
-  MergeFrom(from);
-}
-
-PROTOBUF_NOINLINE bool MergeTablesRequest::IsInitialized() const {
-  return true;
-}
-
-::_pbi::CachedSize* MergeTablesRequest::AccessCachedSize() const {
-  return &_impl_._cached_size_;
-}
-void MergeTablesRequest::InternalSwap(MergeTablesRequest* PROTOBUF_RESTRICT other) {
-  using std::swap;
-  auto* arena = GetArena();
-  ABSL_DCHECK_EQ(arena, other->GetArena());
-  _internal_metadata_.InternalSwap(&other->_internal_metadata_);
-  swap(_impl_._has_bits_[0], other->_impl_._has_bits_[0]);
-  _impl_.source_ids_.InternalSwap(&other->_impl_.source_ids_);
-  ::_pbi::ArenaStringPtr::InternalSwap(&_impl_.key_column_, &other->_impl_.key_column_, arena);
-  swap(_impl_.result_id_, other->_impl_.result_id_);
-}
-
-::google::protobuf::Metadata MergeTablesRequest::GetMetadata() const {
-  return ::_pbi::AssignDescriptors(
-      &descriptor_table_deephaven_2fproto_2ftable_2eproto_getter, &descriptor_table_deephaven_2fproto_2ftable_2eproto_once,
-      file_level_metadata_deephaven_2fproto_2ftable_2eproto[47]);
-}
-// ===================================================================
-
-class SnapshotTableRequest::_Internal {
- public:
-  using HasBits = decltype(std::declval<SnapshotTableRequest>()._impl_._has_bits_);
-  static constexpr ::int32_t kHasBitsOffset =
-    8 * PROTOBUF_FIELD_OFFSET(SnapshotTableRequest, _impl_._has_bits_);
-  static const ::io::deephaven::proto::backplane::grpc::Ticket& result_id(const SnapshotTableRequest* msg);
-  static void set_has_result_id(HasBits* has_bits) {
-    (*has_bits)[0] |= 1u;
-  }
-  static const ::io::deephaven::proto::backplane::grpc::TableReference& source_id(const SnapshotTableRequest* msg);
-  static void set_has_source_id(HasBits* has_bits) {
-    (*has_bits)[0] |= 2u;
-  }
-};
-
-const ::io::deephaven::proto::backplane::grpc::Ticket& SnapshotTableRequest::_Internal::result_id(const SnapshotTableRequest* msg) {
-  return *msg->_impl_.result_id_;
-}
-const ::io::deephaven::proto::backplane::grpc::TableReference& SnapshotTableRequest::_Internal::source_id(const SnapshotTableRequest* msg) {
-  return *msg->_impl_.source_id_;
-}
-void SnapshotTableRequest::clear_result_id() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  if (_impl_.result_id_ != nullptr) _impl_.result_id_->Clear();
-  _impl_._has_bits_[0] &= ~0x00000001u;
-}
-SnapshotTableRequest::SnapshotTableRequest(::google::protobuf::Arena* arena)
-    : ::google::protobuf::Message(arena) {
-  SharedCtor(arena);
-  // @@protoc_insertion_point(arena_constructor:io.deephaven.proto.backplane.grpc.SnapshotTableRequest)
-}
-inline PROTOBUF_NDEBUG_INLINE SnapshotTableRequest::Impl_::Impl_(
-    ::google::protobuf::internal::InternalVisibility visibility, ::google::protobuf::Arena* arena,
-    const Impl_& from)
-      : _has_bits_{from._has_bits_},
-        _cached_size_{0} {}
-
-SnapshotTableRequest::SnapshotTableRequest(
-    ::google::protobuf::Arena* arena,
-    const SnapshotTableRequest& from)
-    : ::google::protobuf::Message(arena) {
-  SnapshotTableRequest* const _this = this;
-  (void)_this;
-  _internal_metadata_.MergeFrom<::google::protobuf::UnknownFieldSet>(
-      from._internal_metadata_);
-  new (&_impl_) Impl_(internal_visibility(), arena, from._impl_);
-  ::uint32_t cached_has_bits = _impl_._has_bits_[0];
-  _impl_.result_id_ = (cached_has_bits & 0x00000001u)
-                ? CreateMaybeMessage<::io::deephaven::proto::backplane::grpc::Ticket>(arena, *from._impl_.result_id_)
-                : nullptr;
-  _impl_.source_id_ = (cached_has_bits & 0x00000002u)
-                ? CreateMaybeMessage<::io::deephaven::proto::backplane::grpc::TableReference>(arena, *from._impl_.source_id_)
-                : nullptr;
-
-  // @@protoc_insertion_point(copy_constructor:io.deephaven.proto.backplane.grpc.SnapshotTableRequest)
-}
-inline PROTOBUF_NDEBUG_INLINE SnapshotTableRequest::Impl_::Impl_(
-    ::google::protobuf::internal::InternalVisibility visibility,
-    ::google::protobuf::Arena* arena)
-      : _cached_size_{0} {}
-
-inline void SnapshotTableRequest::SharedCtor(::_pb::Arena* arena) {
-  new (&_impl_) Impl_(internal_visibility(), arena);
-  ::memset(reinterpret_cast<char *>(&_impl_) +
-               offsetof(Impl_, result_id_),
-           0,
-           offsetof(Impl_, source_id_) -
-               offsetof(Impl_, result_id_) +
-               sizeof(Impl_::source_id_));
-}
-SnapshotTableRequest::~SnapshotTableRequest() {
-  // @@protoc_insertion_point(destructor:io.deephaven.proto.backplane.grpc.SnapshotTableRequest)
-  _internal_metadata_.Delete<::google::protobuf::UnknownFieldSet>();
-  SharedDtor();
-}
-inline void SnapshotTableRequest::SharedDtor() {
-  ABSL_DCHECK(GetArena() == nullptr);
-  delete _impl_.result_id_;
-  delete _impl_.source_id_;
-  _impl_.~Impl_();
-}
-
-PROTOBUF_NOINLINE void SnapshotTableRequest::Clear() {
-// @@protoc_insertion_point(message_clear_start:io.deephaven.proto.backplane.grpc.SnapshotTableRequest)
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  ::uint32_t cached_has_bits = 0;
-  // Prevent compiler warnings about cached_has_bits being unused
-  (void) cached_has_bits;
-
-  cached_has_bits = _impl_._has_bits_[0];
-  if (cached_has_bits & 0x00000003u) {
-    if (cached_has_bits & 0x00000001u) {
-      ABSL_DCHECK(_impl_.result_id_ != nullptr);
-      _impl_.result_id_->Clear();
-    }
-    if (cached_has_bits & 0x00000002u) {
-      ABSL_DCHECK(_impl_.source_id_ != nullptr);
-      _impl_.source_id_->Clear();
-    }
-  }
-  _impl_._has_bits_.Clear();
-  _internal_metadata_.Clear<::google::protobuf::UnknownFieldSet>();
-}
-
-const char* SnapshotTableRequest::_InternalParse(
-    const char* ptr, ::_pbi::ParseContext* ctx) {
-  ptr = ::_pbi::TcParser::ParseLoop(this, ptr, ctx, &_table_.header);
-  return ptr;
-}
-
-
-PROTOBUF_CONSTINIT PROTOBUF_ATTRIBUTE_INIT_PRIORITY1
-const ::_pbi::TcParseTable<1, 2, 2, 0, 2> SnapshotTableRequest::_table_ = {
-  {
-    PROTOBUF_FIELD_OFFSET(SnapshotTableRequest, _impl_._has_bits_),
-    0, // no _extensions_
-    2, 8,  // max_field_number, fast_idx_mask
-    offsetof(decltype(_table_), field_lookup_table),
-    4294967292,  // skipmap
-    offsetof(decltype(_table_), field_entries),
-    2,  // num_field_entries
-    2,  // num_aux_entries
-    offsetof(decltype(_table_), aux_entries),
-    &_SnapshotTableRequest_default_instance_._instance,
-    ::_pbi::TcParser::GenericFallback,  // fallback
-  }, {{
-    // .io.deephaven.proto.backplane.grpc.TableReference source_id = 2;
-    {::_pbi::TcParser::FastMtS1,
-     {18, 1, 1, PROTOBUF_FIELD_OFFSET(SnapshotTableRequest, _impl_.source_id_)}},
-    // .io.deephaven.proto.backplane.grpc.Ticket result_id = 1;
-    {::_pbi::TcParser::FastMtS1,
-     {10, 0, 0, PROTOBUF_FIELD_OFFSET(SnapshotTableRequest, _impl_.result_id_)}},
-  }}, {{
-    65535, 65535
-  }}, {{
-    // .io.deephaven.proto.backplane.grpc.Ticket result_id = 1;
-    {PROTOBUF_FIELD_OFFSET(SnapshotTableRequest, _impl_.result_id_), _Internal::kHasBitsOffset + 0, 0,
-    (0 | ::_fl::kFcOptional | ::_fl::kMessage | ::_fl::kTvTable)},
-    // .io.deephaven.proto.backplane.grpc.TableReference source_id = 2;
-    {PROTOBUF_FIELD_OFFSET(SnapshotTableRequest, _impl_.source_id_), _Internal::kHasBitsOffset + 1, 1,
-    (0 | ::_fl::kFcOptional | ::_fl::kMessage | ::_fl::kTvTable)},
-  }}, {{
-    {::_pbi::TcParser::GetTable<::io::deephaven::proto::backplane::grpc::Ticket>()},
-    {::_pbi::TcParser::GetTable<::io::deephaven::proto::backplane::grpc::TableReference>()},
-  }}, {{
-  }},
-};
-
-::uint8_t* SnapshotTableRequest::_InternalSerialize(
-    ::uint8_t* target,
-    ::google::protobuf::io::EpsCopyOutputStream* stream) const {
-  // @@protoc_insertion_point(serialize_to_array_start:io.deephaven.proto.backplane.grpc.SnapshotTableRequest)
-  ::uint32_t cached_has_bits = 0;
-  (void)cached_has_bits;
-
-  cached_has_bits = _impl_._has_bits_[0];
-  // .io.deephaven.proto.backplane.grpc.Ticket result_id = 1;
-  if (cached_has_bits & 0x00000001u) {
-    target = ::google::protobuf::internal::WireFormatLite::InternalWriteMessage(
-        1, _Internal::result_id(this),
-        _Internal::result_id(this).GetCachedSize(), target, stream);
-  }
-
-  // .io.deephaven.proto.backplane.grpc.TableReference source_id = 2;
-  if (cached_has_bits & 0x00000002u) {
-    target = ::google::protobuf::internal::WireFormatLite::InternalWriteMessage(
-        2, _Internal::source_id(this),
-        _Internal::source_id(this).GetCachedSize(), target, stream);
-  }
-
-  if (PROTOBUF_PREDICT_FALSE(_internal_metadata_.have_unknown_fields())) {
-    target =
-        ::_pbi::WireFormat::InternalSerializeUnknownFieldsToArray(
-            _internal_metadata_.unknown_fields<::google::protobuf::UnknownFieldSet>(::google::protobuf::UnknownFieldSet::default_instance), target, stream);
-  }
-  // @@protoc_insertion_point(serialize_to_array_end:io.deephaven.proto.backplane.grpc.SnapshotTableRequest)
-  return target;
-}
-
-::size_t SnapshotTableRequest::ByteSizeLong() const {
-// @@protoc_insertion_point(message_byte_size_start:io.deephaven.proto.backplane.grpc.SnapshotTableRequest)
-  ::size_t total_size = 0;
-
-  ::uint32_t cached_has_bits = 0;
-  // Prevent compiler warnings about cached_has_bits being unused
-  (void) cached_has_bits;
-
-  cached_has_bits = _impl_._has_bits_[0];
-  if (cached_has_bits & 0x00000003u) {
-    // .io.deephaven.proto.backplane.grpc.Ticket result_id = 1;
-    if (cached_has_bits & 0x00000001u) {
-      total_size +=
-          1 + ::google::protobuf::internal::WireFormatLite::MessageSize(*_impl_.result_id_);
-    }
-
-    // .io.deephaven.proto.backplane.grpc.TableReference source_id = 2;
-    if (cached_has_bits & 0x00000002u) {
-      total_size +=
-          1 + ::google::protobuf::internal::WireFormatLite::MessageSize(*_impl_.source_id_);
-    }
-
-  }
-  return MaybeComputeUnknownFieldsSize(total_size, &_impl_._cached_size_);
-}
-
-const ::google::protobuf::Message::ClassData SnapshotTableRequest::_class_data_ = {
-    SnapshotTableRequest::MergeImpl,
-    nullptr,  // OnDemandRegisterArenaDtor
-};
-const ::google::protobuf::Message::ClassData* SnapshotTableRequest::GetClassData() const {
-  return &_class_data_;
-}
-
-void SnapshotTableRequest::MergeImpl(::google::protobuf::Message& to_msg, const ::google::protobuf::Message& from_msg) {
-  auto* const _this = static_cast<SnapshotTableRequest*>(&to_msg);
-  auto& from = static_cast<const SnapshotTableRequest&>(from_msg);
-  // @@protoc_insertion_point(class_specific_merge_from_start:io.deephaven.proto.backplane.grpc.SnapshotTableRequest)
-  ABSL_DCHECK_NE(&from, _this);
-  ::uint32_t cached_has_bits = 0;
-  (void) cached_has_bits;
-
-  cached_has_bits = from._impl_._has_bits_[0];
-  if (cached_has_bits & 0x00000003u) {
-    if (cached_has_bits & 0x00000001u) {
-      _this->_internal_mutable_result_id()->::io::deephaven::proto::backplane::grpc::Ticket::MergeFrom(
-          from._internal_result_id());
-    }
-    if (cached_has_bits & 0x00000002u) {
-      _this->_internal_mutable_source_id()->::io::deephaven::proto::backplane::grpc::TableReference::MergeFrom(
-          from._internal_source_id());
-    }
-  }
-  _this->_internal_metadata_.MergeFrom<::google::protobuf::UnknownFieldSet>(from._internal_metadata_);
-}
-
-void SnapshotTableRequest::CopyFrom(const SnapshotTableRequest& from) {
-// @@protoc_insertion_point(class_specific_copy_from_start:io.deephaven.proto.backplane.grpc.SnapshotTableRequest)
-  if (&from == this) return;
-  Clear();
-  MergeFrom(from);
-}
-
-PROTOBUF_NOINLINE bool SnapshotTableRequest::IsInitialized() const {
-  return true;
-}
-
-::_pbi::CachedSize* SnapshotTableRequest::AccessCachedSize() const {
-  return &_impl_._cached_size_;
-}
-void SnapshotTableRequest::InternalSwap(SnapshotTableRequest* PROTOBUF_RESTRICT other) {
-  using std::swap;
-  _internal_metadata_.InternalSwap(&other->_internal_metadata_);
-  swap(_impl_._has_bits_[0], other->_impl_._has_bits_[0]);
-  ::google::protobuf::internal::memswap<
-      PROTOBUF_FIELD_OFFSET(SnapshotTableRequest, _impl_.source_id_)
-      + sizeof(SnapshotTableRequest::_impl_.source_id_)
-      - PROTOBUF_FIELD_OFFSET(SnapshotTableRequest, _impl_.result_id_)>(
-          reinterpret_cast<char*>(&_impl_.result_id_),
-          reinterpret_cast<char*>(&other->_impl_.result_id_));
-}
-
-::google::protobuf::Metadata SnapshotTableRequest::GetMetadata() const {
-  return ::_pbi::AssignDescriptors(
-      &descriptor_table_deephaven_2fproto_2ftable_2eproto_getter, &descriptor_table_deephaven_2fproto_2ftable_2eproto_once,
-      file_level_metadata_deephaven_2fproto_2ftable_2eproto[48]);
-}
-// ===================================================================
-
-class SnapshotWhenTableRequest::_Internal {
- public:
-  using HasBits = decltype(std::declval<SnapshotWhenTableRequest>()._impl_._has_bits_);
-  static constexpr ::int32_t kHasBitsOffset =
-    8 * PROTOBUF_FIELD_OFFSET(SnapshotWhenTableRequest, _impl_._has_bits_);
-  static const ::io::deephaven::proto::backplane::grpc::Ticket& result_id(const SnapshotWhenTableRequest* msg);
-  static void set_has_result_id(HasBits* has_bits) {
-    (*has_bits)[0] |= 1u;
-  }
-  static const ::io::deephaven::proto::backplane::grpc::TableReference& base_id(const SnapshotWhenTableRequest* msg);
-  static void set_has_base_id(HasBits* has_bits) {
-    (*has_bits)[0] |= 2u;
-  }
-  static const ::io::deephaven::proto::backplane::grpc::TableReference& trigger_id(const SnapshotWhenTableRequest* msg);
-  static void set_has_trigger_id(HasBits* has_bits) {
-    (*has_bits)[0] |= 4u;
-  }
-};
-
-const ::io::deephaven::proto::backplane::grpc::Ticket& SnapshotWhenTableRequest::_Internal::result_id(const SnapshotWhenTableRequest* msg) {
-  return *msg->_impl_.result_id_;
-}
-const ::io::deephaven::proto::backplane::grpc::TableReference& SnapshotWhenTableRequest::_Internal::base_id(const SnapshotWhenTableRequest* msg) {
-  return *msg->_impl_.base_id_;
-}
-const ::io::deephaven::proto::backplane::grpc::TableReference& SnapshotWhenTableRequest::_Internal::trigger_id(const SnapshotWhenTableRequest* msg) {
-  return *msg->_impl_.trigger_id_;
-}
-void SnapshotWhenTableRequest::clear_result_id() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  if (_impl_.result_id_ != nullptr) _impl_.result_id_->Clear();
-  _impl_._has_bits_[0] &= ~0x00000001u;
-}
-SnapshotWhenTableRequest::SnapshotWhenTableRequest(::google::protobuf::Arena* arena)
-    : ::google::protobuf::Message(arena) {
-  SharedCtor(arena);
-  // @@protoc_insertion_point(arena_constructor:io.deephaven.proto.backplane.grpc.SnapshotWhenTableRequest)
-}
-inline PROTOBUF_NDEBUG_INLINE SnapshotWhenTableRequest::Impl_::Impl_(
-    ::google::protobuf::internal::InternalVisibility visibility, ::google::protobuf::Arena* arena,
-    const Impl_& from)
-      : _has_bits_{from._has_bits_},
-        _cached_size_{0},
-        stamp_columns_{visibility, arena, from.stamp_columns_} {}
-
-SnapshotWhenTableRequest::SnapshotWhenTableRequest(
-    ::google::protobuf::Arena* arena,
-    const SnapshotWhenTableRequest& from)
-    : ::google::protobuf::Message(arena) {
-  SnapshotWhenTableRequest* const _this = this;
-  (void)_this;
-  _internal_metadata_.MergeFrom<::google::protobuf::UnknownFieldSet>(
-      from._internal_metadata_);
-  new (&_impl_) Impl_(internal_visibility(), arena, from._impl_);
-  ::uint32_t cached_has_bits = _impl_._has_bits_[0];
-  _impl_.result_id_ = (cached_has_bits & 0x00000001u)
-                ? CreateMaybeMessage<::io::deephaven::proto::backplane::grpc::Ticket>(arena, *from._impl_.result_id_)
-                : nullptr;
-  _impl_.base_id_ = (cached_has_bits & 0x00000002u)
-                ? CreateMaybeMessage<::io::deephaven::proto::backplane::grpc::TableReference>(arena, *from._impl_.base_id_)
-                : nullptr;
-  _impl_.trigger_id_ = (cached_has_bits & 0x00000004u)
-                ? CreateMaybeMessage<::io::deephaven::proto::backplane::grpc::TableReference>(arena, *from._impl_.trigger_id_)
-                : nullptr;
-  ::memcpy(reinterpret_cast<char *>(&_impl_) +
-               offsetof(Impl_, initial_),
-           reinterpret_cast<const char *>(&from._impl_) +
-               offsetof(Impl_, initial_),
-           offsetof(Impl_, history_) -
-               offsetof(Impl_, initial_) +
-               sizeof(Impl_::history_));
-
-  // @@protoc_insertion_point(copy_constructor:io.deephaven.proto.backplane.grpc.SnapshotWhenTableRequest)
-}
-inline PROTOBUF_NDEBUG_INLINE SnapshotWhenTableRequest::Impl_::Impl_(
-    ::google::protobuf::internal::InternalVisibility visibility,
-    ::google::protobuf::Arena* arena)
-      : _cached_size_{0},
-        stamp_columns_{visibility, arena} {}
-
-inline void SnapshotWhenTableRequest::SharedCtor(::_pb::Arena* arena) {
-  new (&_impl_) Impl_(internal_visibility(), arena);
-  ::memset(reinterpret_cast<char *>(&_impl_) +
-               offsetof(Impl_, result_id_),
-           0,
-           offsetof(Impl_, history_) -
-               offsetof(Impl_, result_id_) +
-               sizeof(Impl_::history_));
-}
-SnapshotWhenTableRequest::~SnapshotWhenTableRequest() {
-  // @@protoc_insertion_point(destructor:io.deephaven.proto.backplane.grpc.SnapshotWhenTableRequest)
-  _internal_metadata_.Delete<::google::protobuf::UnknownFieldSet>();
-  SharedDtor();
-}
-inline void SnapshotWhenTableRequest::SharedDtor() {
-  ABSL_DCHECK(GetArena() == nullptr);
-  delete _impl_.result_id_;
-  delete _impl_.base_id_;
-  delete _impl_.trigger_id_;
-  _impl_.~Impl_();
-}
-
-PROTOBUF_NOINLINE void SnapshotWhenTableRequest::Clear() {
-// @@protoc_insertion_point(message_clear_start:io.deephaven.proto.backplane.grpc.SnapshotWhenTableRequest)
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  ::uint32_t cached_has_bits = 0;
-  // Prevent compiler warnings about cached_has_bits being unused
-  (void) cached_has_bits;
-
-  _impl_.stamp_columns_.Clear();
-  cached_has_bits = _impl_._has_bits_[0];
-  if (cached_has_bits & 0x00000007u) {
-    if (cached_has_bits & 0x00000001u) {
-      ABSL_DCHECK(_impl_.result_id_ != nullptr);
-      _impl_.result_id_->Clear();
-    }
-    if (cached_has_bits & 0x00000002u) {
-      ABSL_DCHECK(_impl_.base_id_ != nullptr);
-      _impl_.base_id_->Clear();
-    }
-    if (cached_has_bits & 0x00000004u) {
-      ABSL_DCHECK(_impl_.trigger_id_ != nullptr);
-      _impl_.trigger_id_->Clear();
-    }
-  }
-  ::memset(&_impl_.initial_, 0, static_cast<::size_t>(
-      reinterpret_cast<char*>(&_impl_.history_) -
-      reinterpret_cast<char*>(&_impl_.initial_)) + sizeof(_impl_.history_));
-  _impl_._has_bits_.Clear();
-  _internal_metadata_.Clear<::google::protobuf::UnknownFieldSet>();
-}
-
-const char* SnapshotWhenTableRequest::_InternalParse(
-    const char* ptr, ::_pbi::ParseContext* ctx) {
-  ptr = ::_pbi::TcParser::ParseLoop(this, ptr, ctx, &_table_.header);
-  return ptr;
-}
-
-
-PROTOBUF_CONSTINIT PROTOBUF_ATTRIBUTE_INIT_PRIORITY1
-const ::_pbi::TcParseTable<3, 7, 3, 80, 2> SnapshotWhenTableRequest::_table_ = {
-  {
-    PROTOBUF_FIELD_OFFSET(SnapshotWhenTableRequest, _impl_._has_bits_),
-    0, // no _extensions_
-    7, 56,  // max_field_number, fast_idx_mask
-    offsetof(decltype(_table_), field_lookup_table),
-    4294967168,  // skipmap
-    offsetof(decltype(_table_), field_entries),
-    7,  // num_field_entries
-    3,  // num_aux_entries
-    offsetof(decltype(_table_), aux_entries),
-    &_SnapshotWhenTableRequest_default_instance_._instance,
-    ::_pbi::TcParser::GenericFallback,  // fallback
-  }, {{
-    {::_pbi::TcParser::MiniParse, {}},
-    // .io.deephaven.proto.backplane.grpc.Ticket result_id = 1;
-    {::_pbi::TcParser::FastMtS1,
-     {10, 0, 0, PROTOBUF_FIELD_OFFSET(SnapshotWhenTableRequest, _impl_.result_id_)}},
-    // .io.deephaven.proto.backplane.grpc.TableReference base_id = 2;
-    {::_pbi::TcParser::FastMtS1,
-     {18, 1, 1, PROTOBUF_FIELD_OFFSET(SnapshotWhenTableRequest, _impl_.base_id_)}},
-    // .io.deephaven.proto.backplane.grpc.TableReference trigger_id = 3;
-    {::_pbi::TcParser::FastMtS1,
-     {26, 2, 2, PROTOBUF_FIELD_OFFSET(SnapshotWhenTableRequest, _impl_.trigger_id_)}},
-    // bool initial = 4;
-    {::_pbi::TcParser::SingularVarintNoZag1<bool, offsetof(SnapshotWhenTableRequest, _impl_.initial_), 63>(),
-     {32, 63, 0, PROTOBUF_FIELD_OFFSET(SnapshotWhenTableRequest, _impl_.initial_)}},
-    // bool incremental = 5;
-    {::_pbi::TcParser::SingularVarintNoZag1<bool, offsetof(SnapshotWhenTableRequest, _impl_.incremental_), 63>(),
-     {40, 63, 0, PROTOBUF_FIELD_OFFSET(SnapshotWhenTableRequest, _impl_.incremental_)}},
-    // bool history = 6;
-    {::_pbi::TcParser::SingularVarintNoZag1<bool, offsetof(SnapshotWhenTableRequest, _impl_.history_), 63>(),
-     {48, 63, 0, PROTOBUF_FIELD_OFFSET(SnapshotWhenTableRequest, _impl_.history_)}},
-    // repeated string stamp_columns = 7;
-    {::_pbi::TcParser::FastUR1,
-     {58, 63, 0, PROTOBUF_FIELD_OFFSET(SnapshotWhenTableRequest, _impl_.stamp_columns_)}},
-  }}, {{
-    65535, 65535
-  }}, {{
-    // .io.deephaven.proto.backplane.grpc.Ticket result_id = 1;
-    {PROTOBUF_FIELD_OFFSET(SnapshotWhenTableRequest, _impl_.result_id_), _Internal::kHasBitsOffset + 0, 0,
-    (0 | ::_fl::kFcOptional | ::_fl::kMessage | ::_fl::kTvTable)},
-    // .io.deephaven.proto.backplane.grpc.TableReference base_id = 2;
-    {PROTOBUF_FIELD_OFFSET(SnapshotWhenTableRequest, _impl_.base_id_), _Internal::kHasBitsOffset + 1, 1,
-    (0 | ::_fl::kFcOptional | ::_fl::kMessage | ::_fl::kTvTable)},
-    // .io.deephaven.proto.backplane.grpc.TableReference trigger_id = 3;
-    {PROTOBUF_FIELD_OFFSET(SnapshotWhenTableRequest, _impl_.trigger_id_), _Internal::kHasBitsOffset + 2, 2,
-    (0 | ::_fl::kFcOptional | ::_fl::kMessage | ::_fl::kTvTable)},
-    // bool initial = 4;
-    {PROTOBUF_FIELD_OFFSET(SnapshotWhenTableRequest, _impl_.initial_), -1, 0,
-    (0 | ::_fl::kFcSingular | ::_fl::kBool)},
-    // bool incremental = 5;
-    {PROTOBUF_FIELD_OFFSET(SnapshotWhenTableRequest, _impl_.incremental_), -1, 0,
-    (0 | ::_fl::kFcSingular | ::_fl::kBool)},
-    // bool history = 6;
-    {PROTOBUF_FIELD_OFFSET(SnapshotWhenTableRequest, _impl_.history_), -1, 0,
-    (0 | ::_fl::kFcSingular | ::_fl::kBool)},
-    // repeated string stamp_columns = 7;
-    {PROTOBUF_FIELD_OFFSET(SnapshotWhenTableRequest, _impl_.stamp_columns_), -1, 0,
-    (0 | ::_fl::kFcRepeated | ::_fl::kUtf8String | ::_fl::kRepSString)},
-  }}, {{
-    {::_pbi::TcParser::GetTable<::io::deephaven::proto::backplane::grpc::Ticket>()},
-    {::_pbi::TcParser::GetTable<::io::deephaven::proto::backplane::grpc::TableReference>()},
-    {::_pbi::TcParser::GetTable<::io::deephaven::proto::backplane::grpc::TableReference>()},
-  }}, {{
-    "\72\0\0\0\0\0\0\15"
-    "io.deephaven.proto.backplane.grpc.SnapshotWhenTableRequest"
-    "stamp_columns"
-  }},
-};
-
-::uint8_t* SnapshotWhenTableRequest::_InternalSerialize(
-    ::uint8_t* target,
-    ::google::protobuf::io::EpsCopyOutputStream* stream) const {
-  // @@protoc_insertion_point(serialize_to_array_start:io.deephaven.proto.backplane.grpc.SnapshotWhenTableRequest)
-  ::uint32_t cached_has_bits = 0;
-  (void)cached_has_bits;
-
-  cached_has_bits = _impl_._has_bits_[0];
-  // .io.deephaven.proto.backplane.grpc.Ticket result_id = 1;
-  if (cached_has_bits & 0x00000001u) {
-    target = ::google::protobuf::internal::WireFormatLite::InternalWriteMessage(
-        1, _Internal::result_id(this),
-        _Internal::result_id(this).GetCachedSize(), target, stream);
-  }
-
-  // .io.deephaven.proto.backplane.grpc.TableReference base_id = 2;
-  if (cached_has_bits & 0x00000002u) {
-    target = ::google::protobuf::internal::WireFormatLite::InternalWriteMessage(
-        2, _Internal::base_id(this),
-        _Internal::base_id(this).GetCachedSize(), target, stream);
-  }
-
-  // .io.deephaven.proto.backplane.grpc.TableReference trigger_id = 3;
-  if (cached_has_bits & 0x00000004u) {
-    target = ::google::protobuf::internal::WireFormatLite::InternalWriteMessage(
-        3, _Internal::trigger_id(this),
-        _Internal::trigger_id(this).GetCachedSize(), target, stream);
-  }
-
-  // bool initial = 4;
-  if (this->_internal_initial() != 0) {
-    target = stream->EnsureSpace(target);
-    target = ::_pbi::WireFormatLite::WriteBoolToArray(
-        4, this->_internal_initial(), target);
-  }
-
-  // bool incremental = 5;
-  if (this->_internal_incremental() != 0) {
-    target = stream->EnsureSpace(target);
-    target = ::_pbi::WireFormatLite::WriteBoolToArray(
-        5, this->_internal_incremental(), target);
-  }
-
-  // bool history = 6;
-  if (this->_internal_history() != 0) {
-    target = stream->EnsureSpace(target);
-    target = ::_pbi::WireFormatLite::WriteBoolToArray(
-        6, this->_internal_history(), target);
-  }
-
-  // repeated string stamp_columns = 7;
-  for (int i = 0, n = this->_internal_stamp_columns_size(); i < n; ++i) {
-    const auto& s = this->_internal_stamp_columns().Get(i);
-    ::google::protobuf::internal::WireFormatLite::VerifyUtf8String(
-        s.data(), static_cast<int>(s.length()), ::google::protobuf::internal::WireFormatLite::SERIALIZE, "io.deephaven.proto.backplane.grpc.SnapshotWhenTableRequest.stamp_columns");
-    target = stream->WriteString(7, s, target);
-  }
-
-  if (PROTOBUF_PREDICT_FALSE(_internal_metadata_.have_unknown_fields())) {
-    target =
-        ::_pbi::WireFormat::InternalSerializeUnknownFieldsToArray(
-            _internal_metadata_.unknown_fields<::google::protobuf::UnknownFieldSet>(::google::protobuf::UnknownFieldSet::default_instance), target, stream);
-  }
-  // @@protoc_insertion_point(serialize_to_array_end:io.deephaven.proto.backplane.grpc.SnapshotWhenTableRequest)
-  return target;
-}
-
-::size_t SnapshotWhenTableRequest::ByteSizeLong() const {
-// @@protoc_insertion_point(message_byte_size_start:io.deephaven.proto.backplane.grpc.SnapshotWhenTableRequest)
-  ::size_t total_size = 0;
-
-  ::uint32_t cached_has_bits = 0;
-  // Prevent compiler warnings about cached_has_bits being unused
-  (void) cached_has_bits;
-
-  // repeated string stamp_columns = 7;
-  total_size += 1 * ::google::protobuf::internal::FromIntSize(_internal_stamp_columns().size());
-  for (int i = 0, n = _internal_stamp_columns().size(); i < n; ++i) {
-    total_size += ::google::protobuf::internal::WireFormatLite::StringSize(
-        _internal_stamp_columns().Get(i));
-  }
-  cached_has_bits = _impl_._has_bits_[0];
-  if (cached_has_bits & 0x00000007u) {
-    // .io.deephaven.proto.backplane.grpc.Ticket result_id = 1;
-    if (cached_has_bits & 0x00000001u) {
-      total_size +=
-          1 + ::google::protobuf::internal::WireFormatLite::MessageSize(*_impl_.result_id_);
-    }
-
-    // .io.deephaven.proto.backplane.grpc.TableReference base_id = 2;
-    if (cached_has_bits & 0x00000002u) {
-      total_size +=
-          1 + ::google::protobuf::internal::WireFormatLite::MessageSize(*_impl_.base_id_);
-    }
-
-    // .io.deephaven.proto.backplane.grpc.TableReference trigger_id = 3;
-    if (cached_has_bits & 0x00000004u) {
-      total_size +=
-          1 + ::google::protobuf::internal::WireFormatLite::MessageSize(*_impl_.trigger_id_);
-    }
-
-  }
-  // bool initial = 4;
-  if (this->_internal_initial() != 0) {
-    total_size += 2;
-  }
-
-  // bool incremental = 5;
-  if (this->_internal_incremental() != 0) {
-    total_size += 2;
-  }
-
-  // bool history = 6;
-  if (this->_internal_history() != 0) {
-    total_size += 2;
-  }
-
-  return MaybeComputeUnknownFieldsSize(total_size, &_impl_._cached_size_);
-}
-
-const ::google::protobuf::Message::ClassData SnapshotWhenTableRequest::_class_data_ = {
-    SnapshotWhenTableRequest::MergeImpl,
-    nullptr,  // OnDemandRegisterArenaDtor
-};
-const ::google::protobuf::Message::ClassData* SnapshotWhenTableRequest::GetClassData() const {
-  return &_class_data_;
-}
-
-void SnapshotWhenTableRequest::MergeImpl(::google::protobuf::Message& to_msg, const ::google::protobuf::Message& from_msg) {
-  auto* const _this = static_cast<SnapshotWhenTableRequest*>(&to_msg);
-  auto& from = static_cast<const SnapshotWhenTableRequest&>(from_msg);
-  // @@protoc_insertion_point(class_specific_merge_from_start:io.deephaven.proto.backplane.grpc.SnapshotWhenTableRequest)
-  ABSL_DCHECK_NE(&from, _this);
-  ::uint32_t cached_has_bits = 0;
-  (void) cached_has_bits;
-
-  _this->_internal_mutable_stamp_columns()->MergeFrom(from._internal_stamp_columns());
-  cached_has_bits = from._impl_._has_bits_[0];
-  if (cached_has_bits & 0x00000007u) {
-    if (cached_has_bits & 0x00000001u) {
-      _this->_internal_mutable_result_id()->::io::deephaven::proto::backplane::grpc::Ticket::MergeFrom(
-          from._internal_result_id());
-    }
-    if (cached_has_bits & 0x00000002u) {
-      _this->_internal_mutable_base_id()->::io::deephaven::proto::backplane::grpc::TableReference::MergeFrom(
-          from._internal_base_id());
-    }
-    if (cached_has_bits & 0x00000004u) {
-      _this->_internal_mutable_trigger_id()->::io::deephaven::proto::backplane::grpc::TableReference::MergeFrom(
-          from._internal_trigger_id());
-    }
-  }
-  if (from._internal_initial() != 0) {
-    _this->_internal_set_initial(from._internal_initial());
-  }
-  if (from._internal_incremental() != 0) {
-    _this->_internal_set_incremental(from._internal_incremental());
-  }
-  if (from._internal_history() != 0) {
-    _this->_internal_set_history(from._internal_history());
-  }
-  _this->_internal_metadata_.MergeFrom<::google::protobuf::UnknownFieldSet>(from._internal_metadata_);
-}
-
-void SnapshotWhenTableRequest::CopyFrom(const SnapshotWhenTableRequest& from) {
-// @@protoc_insertion_point(class_specific_copy_from_start:io.deephaven.proto.backplane.grpc.SnapshotWhenTableRequest)
-  if (&from == this) return;
-  Clear();
-  MergeFrom(from);
-}
-
-PROTOBUF_NOINLINE bool SnapshotWhenTableRequest::IsInitialized() const {
-  return true;
-}
-
-::_pbi::CachedSize* SnapshotWhenTableRequest::AccessCachedSize() const {
-  return &_impl_._cached_size_;
-}
-void SnapshotWhenTableRequest::InternalSwap(SnapshotWhenTableRequest* PROTOBUF_RESTRICT other) {
-  using std::swap;
-  _internal_metadata_.InternalSwap(&other->_internal_metadata_);
-  swap(_impl_._has_bits_[0], other->_impl_._has_bits_[0]);
-  _impl_.stamp_columns_.InternalSwap(&other->_impl_.stamp_columns_);
-  ::google::protobuf::internal::memswap<
-      PROTOBUF_FIELD_OFFSET(SnapshotWhenTableRequest, _impl_.history_)
-      + sizeof(SnapshotWhenTableRequest::_impl_.history_)
-      - PROTOBUF_FIELD_OFFSET(SnapshotWhenTableRequest, _impl_.result_id_)>(
-          reinterpret_cast<char*>(&_impl_.result_id_),
-          reinterpret_cast<char*>(&other->_impl_.result_id_));
-}
-
-::google::protobuf::Metadata SnapshotWhenTableRequest::GetMetadata() const {
-  return ::_pbi::AssignDescriptors(
-      &descriptor_table_deephaven_2fproto_2ftable_2eproto_getter, &descriptor_table_deephaven_2fproto_2ftable_2eproto_once,
-      file_level_metadata_deephaven_2fproto_2ftable_2eproto[49]);
-}
-// ===================================================================
-
-class CrossJoinTablesRequest::_Internal {
- public:
-  using HasBits = decltype(std::declval<CrossJoinTablesRequest>()._impl_._has_bits_);
-  static constexpr ::int32_t kHasBitsOffset =
-    8 * PROTOBUF_FIELD_OFFSET(CrossJoinTablesRequest, _impl_._has_bits_);
-  static const ::io::deephaven::proto::backplane::grpc::Ticket& result_id(const CrossJoinTablesRequest* msg);
-  static void set_has_result_id(HasBits* has_bits) {
-    (*has_bits)[0] |= 1u;
-  }
-  static const ::io::deephaven::proto::backplane::grpc::TableReference& left_id(const CrossJoinTablesRequest* msg);
-  static void set_has_left_id(HasBits* has_bits) {
-    (*has_bits)[0] |= 2u;
-  }
-  static const ::io::deephaven::proto::backplane::grpc::TableReference& right_id(const CrossJoinTablesRequest* msg);
-  static void set_has_right_id(HasBits* has_bits) {
-    (*has_bits)[0] |= 4u;
-  }
-};
-
-const ::io::deephaven::proto::backplane::grpc::Ticket& CrossJoinTablesRequest::_Internal::result_id(const CrossJoinTablesRequest* msg) {
-  return *msg->_impl_.result_id_;
-}
-const ::io::deephaven::proto::backplane::grpc::TableReference& CrossJoinTablesRequest::_Internal::left_id(const CrossJoinTablesRequest* msg) {
-  return *msg->_impl_.left_id_;
-}
-const ::io::deephaven::proto::backplane::grpc::TableReference& CrossJoinTablesRequest::_Internal::right_id(const CrossJoinTablesRequest* msg) {
-  return *msg->_impl_.right_id_;
-}
-void CrossJoinTablesRequest::clear_result_id() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  if (_impl_.result_id_ != nullptr) _impl_.result_id_->Clear();
-  _impl_._has_bits_[0] &= ~0x00000001u;
-}
-CrossJoinTablesRequest::CrossJoinTablesRequest(::google::protobuf::Arena* arena)
-    : ::google::protobuf::Message(arena) {
-  SharedCtor(arena);
-  // @@protoc_insertion_point(arena_constructor:io.deephaven.proto.backplane.grpc.CrossJoinTablesRequest)
-}
-inline PROTOBUF_NDEBUG_INLINE CrossJoinTablesRequest::Impl_::Impl_(
-    ::google::protobuf::internal::InternalVisibility visibility, ::google::protobuf::Arena* arena,
-    const Impl_& from)
-      : _has_bits_{from._has_bits_},
-        _cached_size_{0},
-        columns_to_match_{visibility, arena, from.columns_to_match_},
-        columns_to_add_{visibility, arena, from.columns_to_add_} {}
-
-CrossJoinTablesRequest::CrossJoinTablesRequest(
-    ::google::protobuf::Arena* arena,
-    const CrossJoinTablesRequest& from)
-    : ::google::protobuf::Message(arena) {
-  CrossJoinTablesRequest* const _this = this;
-  (void)_this;
-  _internal_metadata_.MergeFrom<::google::protobuf::UnknownFieldSet>(
-      from._internal_metadata_);
-  new (&_impl_) Impl_(internal_visibility(), arena, from._impl_);
-  ::uint32_t cached_has_bits = _impl_._has_bits_[0];
-  _impl_.result_id_ = (cached_has_bits & 0x00000001u)
-                ? CreateMaybeMessage<::io::deephaven::proto::backplane::grpc::Ticket>(arena, *from._impl_.result_id_)
-                : nullptr;
-  _impl_.left_id_ = (cached_has_bits & 0x00000002u)
-                ? CreateMaybeMessage<::io::deephaven::proto::backplane::grpc::TableReference>(arena, *from._impl_.left_id_)
-                : nullptr;
-  _impl_.right_id_ = (cached_has_bits & 0x00000004u)
-                ? CreateMaybeMessage<::io::deephaven::proto::backplane::grpc::TableReference>(arena, *from._impl_.right_id_)
-                : nullptr;
-  _impl_.reserve_bits_ = from._impl_.reserve_bits_;
-
-  // @@protoc_insertion_point(copy_constructor:io.deephaven.proto.backplane.grpc.CrossJoinTablesRequest)
-}
-inline PROTOBUF_NDEBUG_INLINE CrossJoinTablesRequest::Impl_::Impl_(
-    ::google::protobuf::internal::InternalVisibility visibility,
-    ::google::protobuf::Arena* arena)
-      : _cached_size_{0},
-        columns_to_match_{visibility, arena},
-        columns_to_add_{visibility, arena} {}
-
-inline void CrossJoinTablesRequest::SharedCtor(::_pb::Arena* arena) {
-  new (&_impl_) Impl_(internal_visibility(), arena);
-  ::memset(reinterpret_cast<char *>(&_impl_) +
-               offsetof(Impl_, result_id_),
-           0,
-           offsetof(Impl_, reserve_bits_) -
-               offsetof(Impl_, result_id_) +
-               sizeof(Impl_::reserve_bits_));
-}
-CrossJoinTablesRequest::~CrossJoinTablesRequest() {
-  // @@protoc_insertion_point(destructor:io.deephaven.proto.backplane.grpc.CrossJoinTablesRequest)
-  _internal_metadata_.Delete<::google::protobuf::UnknownFieldSet>();
-  SharedDtor();
-}
-inline void CrossJoinTablesRequest::SharedDtor() {
-  ABSL_DCHECK(GetArena() == nullptr);
-  delete _impl_.result_id_;
-  delete _impl_.left_id_;
-  delete _impl_.right_id_;
-  _impl_.~Impl_();
-}
-
-PROTOBUF_NOINLINE void CrossJoinTablesRequest::Clear() {
-// @@protoc_insertion_point(message_clear_start:io.deephaven.proto.backplane.grpc.CrossJoinTablesRequest)
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  ::uint32_t cached_has_bits = 0;
-  // Prevent compiler warnings about cached_has_bits being unused
-  (void) cached_has_bits;
-
-  _impl_.columns_to_match_.Clear();
-  _impl_.columns_to_add_.Clear();
-  cached_has_bits = _impl_._has_bits_[0];
-  if (cached_has_bits & 0x00000007u) {
-    if (cached_has_bits & 0x00000001u) {
-      ABSL_DCHECK(_impl_.result_id_ != nullptr);
-      _impl_.result_id_->Clear();
-    }
-    if (cached_has_bits & 0x00000002u) {
-      ABSL_DCHECK(_impl_.left_id_ != nullptr);
-      _impl_.left_id_->Clear();
-    }
-    if (cached_has_bits & 0x00000004u) {
-      ABSL_DCHECK(_impl_.right_id_ != nullptr);
-      _impl_.right_id_->Clear();
-    }
-  }
-  _impl_.reserve_bits_ = 0;
-  _impl_._has_bits_.Clear();
-  _internal_metadata_.Clear<::google::protobuf::UnknownFieldSet>();
-}
-
-const char* CrossJoinTablesRequest::_InternalParse(
-    const char* ptr, ::_pbi::ParseContext* ctx) {
-  ptr = ::_pbi::TcParser::ParseLoop(this, ptr, ctx, &_table_.header);
-  return ptr;
-}
-
-
-PROTOBUF_CONSTINIT PROTOBUF_ATTRIBUTE_INIT_PRIORITY1
-const ::_pbi::TcParseTable<3, 6, 3, 95, 2> CrossJoinTablesRequest::_table_ = {
-  {
-    PROTOBUF_FIELD_OFFSET(CrossJoinTablesRequest, _impl_._has_bits_),
-    0, // no _extensions_
-    6, 56,  // max_field_number, fast_idx_mask
-    offsetof(decltype(_table_), field_lookup_table),
-    4294967232,  // skipmap
-    offsetof(decltype(_table_), field_entries),
-    6,  // num_field_entries
-    3,  // num_aux_entries
-    offsetof(decltype(_table_), aux_entries),
-    &_CrossJoinTablesRequest_default_instance_._instance,
-    ::_pbi::TcParser::GenericFallback,  // fallback
-  }, {{
-    {::_pbi::TcParser::MiniParse, {}},
-    // .io.deephaven.proto.backplane.grpc.Ticket result_id = 1;
-    {::_pbi::TcParser::FastMtS1,
-     {10, 0, 0, PROTOBUF_FIELD_OFFSET(CrossJoinTablesRequest, _impl_.result_id_)}},
-    // .io.deephaven.proto.backplane.grpc.TableReference left_id = 2;
-    {::_pbi::TcParser::FastMtS1,
-     {18, 1, 1, PROTOBUF_FIELD_OFFSET(CrossJoinTablesRequest, _impl_.left_id_)}},
-    // .io.deephaven.proto.backplane.grpc.TableReference right_id = 3;
-    {::_pbi::TcParser::FastMtS1,
-     {26, 2, 2, PROTOBUF_FIELD_OFFSET(CrossJoinTablesRequest, _impl_.right_id_)}},
-    // repeated string columns_to_match = 4;
-    {::_pbi::TcParser::FastUR1,
-     {34, 63, 0, PROTOBUF_FIELD_OFFSET(CrossJoinTablesRequest, _impl_.columns_to_match_)}},
-    // repeated string columns_to_add = 5;
-    {::_pbi::TcParser::FastUR1,
-     {42, 63, 0, PROTOBUF_FIELD_OFFSET(CrossJoinTablesRequest, _impl_.columns_to_add_)}},
-    // int32 reserve_bits = 6;
-    {::_pbi::TcParser::SingularVarintNoZag1<::uint32_t, offsetof(CrossJoinTablesRequest, _impl_.reserve_bits_), 63>(),
-     {48, 63, 0, PROTOBUF_FIELD_OFFSET(CrossJoinTablesRequest, _impl_.reserve_bits_)}},
-    {::_pbi::TcParser::MiniParse, {}},
-  }}, {{
-    65535, 65535
-  }}, {{
-    // .io.deephaven.proto.backplane.grpc.Ticket result_id = 1;
-    {PROTOBUF_FIELD_OFFSET(CrossJoinTablesRequest, _impl_.result_id_), _Internal::kHasBitsOffset + 0, 0,
-    (0 | ::_fl::kFcOptional | ::_fl::kMessage | ::_fl::kTvTable)},
-    // .io.deephaven.proto.backplane.grpc.TableReference left_id = 2;
-    {PROTOBUF_FIELD_OFFSET(CrossJoinTablesRequest, _impl_.left_id_), _Internal::kHasBitsOffset + 1, 1,
-    (0 | ::_fl::kFcOptional | ::_fl::kMessage | ::_fl::kTvTable)},
-    // .io.deephaven.proto.backplane.grpc.TableReference right_id = 3;
-    {PROTOBUF_FIELD_OFFSET(CrossJoinTablesRequest, _impl_.right_id_), _Internal::kHasBitsOffset + 2, 2,
-    (0 | ::_fl::kFcOptional | ::_fl::kMessage | ::_fl::kTvTable)},
-    // repeated string columns_to_match = 4;
-    {PROTOBUF_FIELD_OFFSET(CrossJoinTablesRequest, _impl_.columns_to_match_), -1, 0,
-    (0 | ::_fl::kFcRepeated | ::_fl::kUtf8String | ::_fl::kRepSString)},
-    // repeated string columns_to_add = 5;
-    {PROTOBUF_FIELD_OFFSET(CrossJoinTablesRequest, _impl_.columns_to_add_), -1, 0,
-    (0 | ::_fl::kFcRepeated | ::_fl::kUtf8String | ::_fl::kRepSString)},
-    // int32 reserve_bits = 6;
-    {PROTOBUF_FIELD_OFFSET(CrossJoinTablesRequest, _impl_.reserve_bits_), -1, 0,
-    (0 | ::_fl::kFcSingular | ::_fl::kInt32)},
-  }}, {{
-    {::_pbi::TcParser::GetTable<::io::deephaven::proto::backplane::grpc::Ticket>()},
-    {::_pbi::TcParser::GetTable<::io::deephaven::proto::backplane::grpc::TableReference>()},
-    {::_pbi::TcParser::GetTable<::io::deephaven::proto::backplane::grpc::TableReference>()},
-  }}, {{
-    "\70\0\0\0\20\16\0\0"
-    "io.deephaven.proto.backplane.grpc.CrossJoinTablesRequest"
-    "columns_to_match"
-    "columns_to_add"
-  }},
-};
-
-::uint8_t* CrossJoinTablesRequest::_InternalSerialize(
-    ::uint8_t* target,
-    ::google::protobuf::io::EpsCopyOutputStream* stream) const {
-  // @@protoc_insertion_point(serialize_to_array_start:io.deephaven.proto.backplane.grpc.CrossJoinTablesRequest)
-  ::uint32_t cached_has_bits = 0;
-  (void)cached_has_bits;
-
-  cached_has_bits = _impl_._has_bits_[0];
-  // .io.deephaven.proto.backplane.grpc.Ticket result_id = 1;
-  if (cached_has_bits & 0x00000001u) {
-    target = ::google::protobuf::internal::WireFormatLite::InternalWriteMessage(
-        1, _Internal::result_id(this),
-        _Internal::result_id(this).GetCachedSize(), target, stream);
-  }
-
-  // .io.deephaven.proto.backplane.grpc.TableReference left_id = 2;
-  if (cached_has_bits & 0x00000002u) {
-    target = ::google::protobuf::internal::WireFormatLite::InternalWriteMessage(
-        2, _Internal::left_id(this),
-        _Internal::left_id(this).GetCachedSize(), target, stream);
-  }
-
-  // .io.deephaven.proto.backplane.grpc.TableReference right_id = 3;
-  if (cached_has_bits & 0x00000004u) {
-    target = ::google::protobuf::internal::WireFormatLite::InternalWriteMessage(
-        3, _Internal::right_id(this),
-        _Internal::right_id(this).GetCachedSize(), target, stream);
-  }
-
-  // repeated string columns_to_match = 4;
-  for (int i = 0, n = this->_internal_columns_to_match_size(); i < n; ++i) {
-    const auto& s = this->_internal_columns_to_match().Get(i);
-    ::google::protobuf::internal::WireFormatLite::VerifyUtf8String(
-        s.data(), static_cast<int>(s.length()), ::google::protobuf::internal::WireFormatLite::SERIALIZE, "io.deephaven.proto.backplane.grpc.CrossJoinTablesRequest.columns_to_match");
-    target = stream->WriteString(4, s, target);
-  }
-
-  // repeated string columns_to_add = 5;
-  for (int i = 0, n = this->_internal_columns_to_add_size(); i < n; ++i) {
-    const auto& s = this->_internal_columns_to_add().Get(i);
-    ::google::protobuf::internal::WireFormatLite::VerifyUtf8String(
-        s.data(), static_cast<int>(s.length()), ::google::protobuf::internal::WireFormatLite::SERIALIZE, "io.deephaven.proto.backplane.grpc.CrossJoinTablesRequest.columns_to_add");
-    target = stream->WriteString(5, s, target);
-  }
-
-  // int32 reserve_bits = 6;
-  if (this->_internal_reserve_bits() != 0) {
-    target = ::google::protobuf::internal::WireFormatLite::
-        WriteInt32ToArrayWithField<6>(
-            stream, this->_internal_reserve_bits(), target);
-  }
-
-  if (PROTOBUF_PREDICT_FALSE(_internal_metadata_.have_unknown_fields())) {
-    target =
-        ::_pbi::WireFormat::InternalSerializeUnknownFieldsToArray(
-            _internal_metadata_.unknown_fields<::google::protobuf::UnknownFieldSet>(::google::protobuf::UnknownFieldSet::default_instance), target, stream);
-  }
-  // @@protoc_insertion_point(serialize_to_array_end:io.deephaven.proto.backplane.grpc.CrossJoinTablesRequest)
-  return target;
-}
-
-::size_t CrossJoinTablesRequest::ByteSizeLong() const {
-// @@protoc_insertion_point(message_byte_size_start:io.deephaven.proto.backplane.grpc.CrossJoinTablesRequest)
-  ::size_t total_size = 0;
-
-  ::uint32_t cached_has_bits = 0;
-  // Prevent compiler warnings about cached_has_bits being unused
-  (void) cached_has_bits;
-
-  // repeated string columns_to_match = 4;
-  total_size += 1 * ::google::protobuf::internal::FromIntSize(_internal_columns_to_match().size());
-  for (int i = 0, n = _internal_columns_to_match().size(); i < n; ++i) {
-    total_size += ::google::protobuf::internal::WireFormatLite::StringSize(
-        _internal_columns_to_match().Get(i));
-  }
-  // repeated string columns_to_add = 5;
-  total_size += 1 * ::google::protobuf::internal::FromIntSize(_internal_columns_to_add().size());
-  for (int i = 0, n = _internal_columns_to_add().size(); i < n; ++i) {
-    total_size += ::google::protobuf::internal::WireFormatLite::StringSize(
-        _internal_columns_to_add().Get(i));
-  }
-  cached_has_bits = _impl_._has_bits_[0];
-  if (cached_has_bits & 0x00000007u) {
-    // .io.deephaven.proto.backplane.grpc.Ticket result_id = 1;
-    if (cached_has_bits & 0x00000001u) {
-      total_size +=
-          1 + ::google::protobuf::internal::WireFormatLite::MessageSize(*_impl_.result_id_);
-    }
-
-    // .io.deephaven.proto.backplane.grpc.TableReference left_id = 2;
-    if (cached_has_bits & 0x00000002u) {
-      total_size +=
-          1 + ::google::protobuf::internal::WireFormatLite::MessageSize(*_impl_.left_id_);
-    }
-
-    // .io.deephaven.proto.backplane.grpc.TableReference right_id = 3;
-    if (cached_has_bits & 0x00000004u) {
-      total_size +=
-          1 + ::google::protobuf::internal::WireFormatLite::MessageSize(*_impl_.right_id_);
-    }
-
-  }
-  // int32 reserve_bits = 6;
-  if (this->_internal_reserve_bits() != 0) {
-    total_size += ::_pbi::WireFormatLite::Int32SizePlusOne(
-        this->_internal_reserve_bits());
-  }
-
-  return MaybeComputeUnknownFieldsSize(total_size, &_impl_._cached_size_);
-}
-
-const ::google::protobuf::Message::ClassData CrossJoinTablesRequest::_class_data_ = {
-    CrossJoinTablesRequest::MergeImpl,
-    nullptr,  // OnDemandRegisterArenaDtor
-};
-const ::google::protobuf::Message::ClassData* CrossJoinTablesRequest::GetClassData() const {
-  return &_class_data_;
-}
-
-void CrossJoinTablesRequest::MergeImpl(::google::protobuf::Message& to_msg, const ::google::protobuf::Message& from_msg) {
-  auto* const _this = static_cast<CrossJoinTablesRequest*>(&to_msg);
-  auto& from = static_cast<const CrossJoinTablesRequest&>(from_msg);
-  // @@protoc_insertion_point(class_specific_merge_from_start:io.deephaven.proto.backplane.grpc.CrossJoinTablesRequest)
-  ABSL_DCHECK_NE(&from, _this);
-  ::uint32_t cached_has_bits = 0;
-  (void) cached_has_bits;
-
-  _this->_internal_mutable_columns_to_match()->MergeFrom(from._internal_columns_to_match());
-  _this->_internal_mutable_columns_to_add()->MergeFrom(from._internal_columns_to_add());
-  cached_has_bits = from._impl_._has_bits_[0];
-  if (cached_has_bits & 0x00000007u) {
-    if (cached_has_bits & 0x00000001u) {
-      _this->_internal_mutable_result_id()->::io::deephaven::proto::backplane::grpc::Ticket::MergeFrom(
-          from._internal_result_id());
-    }
-    if (cached_has_bits & 0x00000002u) {
-      _this->_internal_mutable_left_id()->::io::deephaven::proto::backplane::grpc::TableReference::MergeFrom(
-          from._internal_left_id());
-    }
-    if (cached_has_bits & 0x00000004u) {
-      _this->_internal_mutable_right_id()->::io::deephaven::proto::backplane::grpc::TableReference::MergeFrom(
-          from._internal_right_id());
-    }
-  }
-  if (from._internal_reserve_bits() != 0) {
-    _this->_internal_set_reserve_bits(from._internal_reserve_bits());
-  }
-  _this->_internal_metadata_.MergeFrom<::google::protobuf::UnknownFieldSet>(from._internal_metadata_);
-}
-
-void CrossJoinTablesRequest::CopyFrom(const CrossJoinTablesRequest& from) {
-// @@protoc_insertion_point(class_specific_copy_from_start:io.deephaven.proto.backplane.grpc.CrossJoinTablesRequest)
-  if (&from == this) return;
-  Clear();
-  MergeFrom(from);
-}
-
-PROTOBUF_NOINLINE bool CrossJoinTablesRequest::IsInitialized() const {
-  return true;
-}
-
-::_pbi::CachedSize* CrossJoinTablesRequest::AccessCachedSize() const {
-  return &_impl_._cached_size_;
-}
-void CrossJoinTablesRequest::InternalSwap(CrossJoinTablesRequest* PROTOBUF_RESTRICT other) {
-  using std::swap;
-  _internal_metadata_.InternalSwap(&other->_internal_metadata_);
-  swap(_impl_._has_bits_[0], other->_impl_._has_bits_[0]);
-  _impl_.columns_to_match_.InternalSwap(&other->_impl_.columns_to_match_);
-  _impl_.columns_to_add_.InternalSwap(&other->_impl_.columns_to_add_);
-  ::google::protobuf::internal::memswap<
-      PROTOBUF_FIELD_OFFSET(CrossJoinTablesRequest, _impl_.reserve_bits_)
-      + sizeof(CrossJoinTablesRequest::_impl_.reserve_bits_)
-      - PROTOBUF_FIELD_OFFSET(CrossJoinTablesRequest, _impl_.result_id_)>(
-          reinterpret_cast<char*>(&_impl_.result_id_),
-          reinterpret_cast<char*>(&other->_impl_.result_id_));
-}
-
-::google::protobuf::Metadata CrossJoinTablesRequest::GetMetadata() const {
-  return ::_pbi::AssignDescriptors(
-      &descriptor_table_deephaven_2fproto_2ftable_2eproto_getter, &descriptor_table_deephaven_2fproto_2ftable_2eproto_once,
-      file_level_metadata_deephaven_2fproto_2ftable_2eproto[50]);
-}
-// ===================================================================
-
-class NaturalJoinTablesRequest::_Internal {
- public:
-  using HasBits = decltype(std::declval<NaturalJoinTablesRequest>()._impl_._has_bits_);
-  static constexpr ::int32_t kHasBitsOffset =
-    8 * PROTOBUF_FIELD_OFFSET(NaturalJoinTablesRequest, _impl_._has_bits_);
-  static const ::io::deephaven::proto::backplane::grpc::Ticket& result_id(const NaturalJoinTablesRequest* msg);
-  static void set_has_result_id(HasBits* has_bits) {
-    (*has_bits)[0] |= 1u;
-  }
-  static const ::io::deephaven::proto::backplane::grpc::TableReference& left_id(const NaturalJoinTablesRequest* msg);
-  static void set_has_left_id(HasBits* has_bits) {
-    (*has_bits)[0] |= 2u;
-  }
-  static const ::io::deephaven::proto::backplane::grpc::TableReference& right_id(const NaturalJoinTablesRequest* msg);
-  static void set_has_right_id(HasBits* has_bits) {
-    (*has_bits)[0] |= 4u;
-  }
-};
-
-const ::io::deephaven::proto::backplane::grpc::Ticket& NaturalJoinTablesRequest::_Internal::result_id(const NaturalJoinTablesRequest* msg) {
-  return *msg->_impl_.result_id_;
-}
-const ::io::deephaven::proto::backplane::grpc::TableReference& NaturalJoinTablesRequest::_Internal::left_id(const NaturalJoinTablesRequest* msg) {
-  return *msg->_impl_.left_id_;
-}
-const ::io::deephaven::proto::backplane::grpc::TableReference& NaturalJoinTablesRequest::_Internal::right_id(const NaturalJoinTablesRequest* msg) {
-  return *msg->_impl_.right_id_;
-}
-void NaturalJoinTablesRequest::clear_result_id() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  if (_impl_.result_id_ != nullptr) _impl_.result_id_->Clear();
-  _impl_._has_bits_[0] &= ~0x00000001u;
-}
-NaturalJoinTablesRequest::NaturalJoinTablesRequest(::google::protobuf::Arena* arena)
-    : ::google::protobuf::Message(arena) {
-  SharedCtor(arena);
-  // @@protoc_insertion_point(arena_constructor:io.deephaven.proto.backplane.grpc.NaturalJoinTablesRequest)
-}
-inline PROTOBUF_NDEBUG_INLINE NaturalJoinTablesRequest::Impl_::Impl_(
-    ::google::protobuf::internal::InternalVisibility visibility, ::google::protobuf::Arena* arena,
-    const Impl_& from)
-      : _has_bits_{from._has_bits_},
-        _cached_size_{0},
-        columns_to_match_{visibility, arena, from.columns_to_match_},
-        columns_to_add_{visibility, arena, from.columns_to_add_} {}
-
-NaturalJoinTablesRequest::NaturalJoinTablesRequest(
-    ::google::protobuf::Arena* arena,
-    const NaturalJoinTablesRequest& from)
-    : ::google::protobuf::Message(arena) {
-  NaturalJoinTablesRequest* const _this = this;
-  (void)_this;
-  _internal_metadata_.MergeFrom<::google::protobuf::UnknownFieldSet>(
-      from._internal_metadata_);
-  new (&_impl_) Impl_(internal_visibility(), arena, from._impl_);
-  ::uint32_t cached_has_bits = _impl_._has_bits_[0];
-  _impl_.result_id_ = (cached_has_bits & 0x00000001u)
-                ? CreateMaybeMessage<::io::deephaven::proto::backplane::grpc::Ticket>(arena, *from._impl_.result_id_)
-                : nullptr;
-  _impl_.left_id_ = (cached_has_bits & 0x00000002u)
-                ? CreateMaybeMessage<::io::deephaven::proto::backplane::grpc::TableReference>(arena, *from._impl_.left_id_)
-                : nullptr;
-  _impl_.right_id_ = (cached_has_bits & 0x00000004u)
-                ? CreateMaybeMessage<::io::deephaven::proto::backplane::grpc::TableReference>(arena, *from._impl_.right_id_)
-                : nullptr;
-
-  // @@protoc_insertion_point(copy_constructor:io.deephaven.proto.backplane.grpc.NaturalJoinTablesRequest)
-}
-inline PROTOBUF_NDEBUG_INLINE NaturalJoinTablesRequest::Impl_::Impl_(
-    ::google::protobuf::internal::InternalVisibility visibility,
-    ::google::protobuf::Arena* arena)
-      : _cached_size_{0},
-        columns_to_match_{visibility, arena},
-        columns_to_add_{visibility, arena} {}
-
-inline void NaturalJoinTablesRequest::SharedCtor(::_pb::Arena* arena) {
-  new (&_impl_) Impl_(internal_visibility(), arena);
-  ::memset(reinterpret_cast<char *>(&_impl_) +
-               offsetof(Impl_, result_id_),
-           0,
-           offsetof(Impl_, right_id_) -
-               offsetof(Impl_, result_id_) +
-               sizeof(Impl_::right_id_));
-}
-NaturalJoinTablesRequest::~NaturalJoinTablesRequest() {
-  // @@protoc_insertion_point(destructor:io.deephaven.proto.backplane.grpc.NaturalJoinTablesRequest)
-  _internal_metadata_.Delete<::google::protobuf::UnknownFieldSet>();
-  SharedDtor();
-}
-inline void NaturalJoinTablesRequest::SharedDtor() {
-  ABSL_DCHECK(GetArena() == nullptr);
-  delete _impl_.result_id_;
-  delete _impl_.left_id_;
-  delete _impl_.right_id_;
-  _impl_.~Impl_();
-}
-
-PROTOBUF_NOINLINE void NaturalJoinTablesRequest::Clear() {
-// @@protoc_insertion_point(message_clear_start:io.deephaven.proto.backplane.grpc.NaturalJoinTablesRequest)
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  ::uint32_t cached_has_bits = 0;
-  // Prevent compiler warnings about cached_has_bits being unused
-  (void) cached_has_bits;
-
-  _impl_.columns_to_match_.Clear();
-  _impl_.columns_to_add_.Clear();
-  cached_has_bits = _impl_._has_bits_[0];
-  if (cached_has_bits & 0x00000007u) {
-    if (cached_has_bits & 0x00000001u) {
-      ABSL_DCHECK(_impl_.result_id_ != nullptr);
-      _impl_.result_id_->Clear();
-    }
-    if (cached_has_bits & 0x00000002u) {
-      ABSL_DCHECK(_impl_.left_id_ != nullptr);
-      _impl_.left_id_->Clear();
-    }
-    if (cached_has_bits & 0x00000004u) {
-      ABSL_DCHECK(_impl_.right_id_ != nullptr);
-      _impl_.right_id_->Clear();
-    }
-  }
-  _impl_._has_bits_.Clear();
-  _internal_metadata_.Clear<::google::protobuf::UnknownFieldSet>();
-}
-
-const char* NaturalJoinTablesRequest::_InternalParse(
-    const char* ptr, ::_pbi::ParseContext* ctx) {
-  ptr = ::_pbi::TcParser::ParseLoop(this, ptr, ctx, &_table_.header);
-  return ptr;
-}
-
-
-PROTOBUF_CONSTINIT PROTOBUF_ATTRIBUTE_INIT_PRIORITY1
-const ::_pbi::TcParseTable<3, 5, 3, 97, 2> NaturalJoinTablesRequest::_table_ = {
-  {
-    PROTOBUF_FIELD_OFFSET(NaturalJoinTablesRequest, _impl_._has_bits_),
-    0, // no _extensions_
-    5, 56,  // max_field_number, fast_idx_mask
-    offsetof(decltype(_table_), field_lookup_table),
-    4294967264,  // skipmap
-    offsetof(decltype(_table_), field_entries),
-    5,  // num_field_entries
-    3,  // num_aux_entries
-    offsetof(decltype(_table_), aux_entries),
-    &_NaturalJoinTablesRequest_default_instance_._instance,
-    ::_pbi::TcParser::GenericFallback,  // fallback
-  }, {{
-    {::_pbi::TcParser::MiniParse, {}},
-    // .io.deephaven.proto.backplane.grpc.Ticket result_id = 1;
-    {::_pbi::TcParser::FastMtS1,
-     {10, 0, 0, PROTOBUF_FIELD_OFFSET(NaturalJoinTablesRequest, _impl_.result_id_)}},
-    // .io.deephaven.proto.backplane.grpc.TableReference left_id = 2;
-    {::_pbi::TcParser::FastMtS1,
-     {18, 1, 1, PROTOBUF_FIELD_OFFSET(NaturalJoinTablesRequest, _impl_.left_id_)}},
-    // .io.deephaven.proto.backplane.grpc.TableReference right_id = 3;
-    {::_pbi::TcParser::FastMtS1,
-     {26, 2, 2, PROTOBUF_FIELD_OFFSET(NaturalJoinTablesRequest, _impl_.right_id_)}},
-    // repeated string columns_to_match = 4;
-    {::_pbi::TcParser::FastUR1,
-     {34, 63, 0, PROTOBUF_FIELD_OFFSET(NaturalJoinTablesRequest, _impl_.columns_to_match_)}},
-    // repeated string columns_to_add = 5;
-    {::_pbi::TcParser::FastUR1,
-     {42, 63, 0, PROTOBUF_FIELD_OFFSET(NaturalJoinTablesRequest, _impl_.columns_to_add_)}},
-    {::_pbi::TcParser::MiniParse, {}},
-    {::_pbi::TcParser::MiniParse, {}},
-  }}, {{
-    65535, 65535
-  }}, {{
-    // .io.deephaven.proto.backplane.grpc.Ticket result_id = 1;
-    {PROTOBUF_FIELD_OFFSET(NaturalJoinTablesRequest, _impl_.result_id_), _Internal::kHasBitsOffset + 0, 0,
-    (0 | ::_fl::kFcOptional | ::_fl::kMessage | ::_fl::kTvTable)},
-    // .io.deephaven.proto.backplane.grpc.TableReference left_id = 2;
-    {PROTOBUF_FIELD_OFFSET(NaturalJoinTablesRequest, _impl_.left_id_), _Internal::kHasBitsOffset + 1, 1,
-    (0 | ::_fl::kFcOptional | ::_fl::kMessage | ::_fl::kTvTable)},
-    // .io.deephaven.proto.backplane.grpc.TableReference right_id = 3;
-    {PROTOBUF_FIELD_OFFSET(NaturalJoinTablesRequest, _impl_.right_id_), _Internal::kHasBitsOffset + 2, 2,
-    (0 | ::_fl::kFcOptional | ::_fl::kMessage | ::_fl::kTvTable)},
-    // repeated string columns_to_match = 4;
-    {PROTOBUF_FIELD_OFFSET(NaturalJoinTablesRequest, _impl_.columns_to_match_), -1, 0,
-    (0 | ::_fl::kFcRepeated | ::_fl::kUtf8String | ::_fl::kRepSString)},
-    // repeated string columns_to_add = 5;
-    {PROTOBUF_FIELD_OFFSET(NaturalJoinTablesRequest, _impl_.columns_to_add_), -1, 0,
-    (0 | ::_fl::kFcRepeated | ::_fl::kUtf8String | ::_fl::kRepSString)},
-  }}, {{
-    {::_pbi::TcParser::GetTable<::io::deephaven::proto::backplane::grpc::Ticket>()},
-    {::_pbi::TcParser::GetTable<::io::deephaven::proto::backplane::grpc::TableReference>()},
-    {::_pbi::TcParser::GetTable<::io::deephaven::proto::backplane::grpc::TableReference>()},
-  }}, {{
-    "\72\0\0\0\20\16\0\0"
-    "io.deephaven.proto.backplane.grpc.NaturalJoinTablesRequest"
-    "columns_to_match"
-    "columns_to_add"
-  }},
-};
-
-::uint8_t* NaturalJoinTablesRequest::_InternalSerialize(
-    ::uint8_t* target,
-    ::google::protobuf::io::EpsCopyOutputStream* stream) const {
-  // @@protoc_insertion_point(serialize_to_array_start:io.deephaven.proto.backplane.grpc.NaturalJoinTablesRequest)
-  ::uint32_t cached_has_bits = 0;
-  (void)cached_has_bits;
-
-  cached_has_bits = _impl_._has_bits_[0];
-  // .io.deephaven.proto.backplane.grpc.Ticket result_id = 1;
-  if (cached_has_bits & 0x00000001u) {
-    target = ::google::protobuf::internal::WireFormatLite::InternalWriteMessage(
-        1, _Internal::result_id(this),
-        _Internal::result_id(this).GetCachedSize(), target, stream);
-  }
-
-  // .io.deephaven.proto.backplane.grpc.TableReference left_id = 2;
-  if (cached_has_bits & 0x00000002u) {
-    target = ::google::protobuf::internal::WireFormatLite::InternalWriteMessage(
-        2, _Internal::left_id(this),
-        _Internal::left_id(this).GetCachedSize(), target, stream);
-  }
-
-  // .io.deephaven.proto.backplane.grpc.TableReference right_id = 3;
-  if (cached_has_bits & 0x00000004u) {
-    target = ::google::protobuf::internal::WireFormatLite::InternalWriteMessage(
-        3, _Internal::right_id(this),
-        _Internal::right_id(this).GetCachedSize(), target, stream);
-  }
-
-  // repeated string columns_to_match = 4;
-  for (int i = 0, n = this->_internal_columns_to_match_size(); i < n; ++i) {
-    const auto& s = this->_internal_columns_to_match().Get(i);
-    ::google::protobuf::internal::WireFormatLite::VerifyUtf8String(
-        s.data(), static_cast<int>(s.length()), ::google::protobuf::internal::WireFormatLite::SERIALIZE, "io.deephaven.proto.backplane.grpc.NaturalJoinTablesRequest.columns_to_match");
-    target = stream->WriteString(4, s, target);
-  }
-
-  // repeated string columns_to_add = 5;
-  for (int i = 0, n = this->_internal_columns_to_add_size(); i < n; ++i) {
-    const auto& s = this->_internal_columns_to_add().Get(i);
-    ::google::protobuf::internal::WireFormatLite::VerifyUtf8String(
-        s.data(), static_cast<int>(s.length()), ::google::protobuf::internal::WireFormatLite::SERIALIZE, "io.deephaven.proto.backplane.grpc.NaturalJoinTablesRequest.columns_to_add");
-    target = stream->WriteString(5, s, target);
-  }
-
-  if (PROTOBUF_PREDICT_FALSE(_internal_metadata_.have_unknown_fields())) {
-    target =
-        ::_pbi::WireFormat::InternalSerializeUnknownFieldsToArray(
-            _internal_metadata_.unknown_fields<::google::protobuf::UnknownFieldSet>(::google::protobuf::UnknownFieldSet::default_instance), target, stream);
-  }
-  // @@protoc_insertion_point(serialize_to_array_end:io.deephaven.proto.backplane.grpc.NaturalJoinTablesRequest)
-  return target;
-}
-
-::size_t NaturalJoinTablesRequest::ByteSizeLong() const {
-// @@protoc_insertion_point(message_byte_size_start:io.deephaven.proto.backplane.grpc.NaturalJoinTablesRequest)
-  ::size_t total_size = 0;
-
-  ::uint32_t cached_has_bits = 0;
-  // Prevent compiler warnings about cached_has_bits being unused
-  (void) cached_has_bits;
-
-  // repeated string columns_to_match = 4;
-  total_size += 1 * ::google::protobuf::internal::FromIntSize(_internal_columns_to_match().size());
-  for (int i = 0, n = _internal_columns_to_match().size(); i < n; ++i) {
-    total_size += ::google::protobuf::internal::WireFormatLite::StringSize(
-        _internal_columns_to_match().Get(i));
-  }
-  // repeated string columns_to_add = 5;
-  total_size += 1 * ::google::protobuf::internal::FromIntSize(_internal_columns_to_add().size());
-  for (int i = 0, n = _internal_columns_to_add().size(); i < n; ++i) {
-    total_size += ::google::protobuf::internal::WireFormatLite::StringSize(
-        _internal_columns_to_add().Get(i));
-  }
-  cached_has_bits = _impl_._has_bits_[0];
-  if (cached_has_bits & 0x00000007u) {
-    // .io.deephaven.proto.backplane.grpc.Ticket result_id = 1;
-    if (cached_has_bits & 0x00000001u) {
-      total_size +=
-          1 + ::google::protobuf::internal::WireFormatLite::MessageSize(*_impl_.result_id_);
-    }
-
-    // .io.deephaven.proto.backplane.grpc.TableReference left_id = 2;
-    if (cached_has_bits & 0x00000002u) {
-      total_size +=
-          1 + ::google::protobuf::internal::WireFormatLite::MessageSize(*_impl_.left_id_);
-    }
-
-    // .io.deephaven.proto.backplane.grpc.TableReference right_id = 3;
-    if (cached_has_bits & 0x00000004u) {
-      total_size +=
-          1 + ::google::protobuf::internal::WireFormatLite::MessageSize(*_impl_.right_id_);
-    }
-
-  }
-  return MaybeComputeUnknownFieldsSize(total_size, &_impl_._cached_size_);
-}
-
-const ::google::protobuf::Message::ClassData NaturalJoinTablesRequest::_class_data_ = {
-    NaturalJoinTablesRequest::MergeImpl,
-    nullptr,  // OnDemandRegisterArenaDtor
-};
-const ::google::protobuf::Message::ClassData* NaturalJoinTablesRequest::GetClassData() const {
-  return &_class_data_;
-}
-
-void NaturalJoinTablesRequest::MergeImpl(::google::protobuf::Message& to_msg, const ::google::protobuf::Message& from_msg) {
-  auto* const _this = static_cast<NaturalJoinTablesRequest*>(&to_msg);
-  auto& from = static_cast<const NaturalJoinTablesRequest&>(from_msg);
-  // @@protoc_insertion_point(class_specific_merge_from_start:io.deephaven.proto.backplane.grpc.NaturalJoinTablesRequest)
-  ABSL_DCHECK_NE(&from, _this);
-  ::uint32_t cached_has_bits = 0;
-  (void) cached_has_bits;
-
-  _this->_internal_mutable_columns_to_match()->MergeFrom(from._internal_columns_to_match());
-  _this->_internal_mutable_columns_to_add()->MergeFrom(from._internal_columns_to_add());
-  cached_has_bits = from._impl_._has_bits_[0];
-  if (cached_has_bits & 0x00000007u) {
-    if (cached_has_bits & 0x00000001u) {
-      _this->_internal_mutable_result_id()->::io::deephaven::proto::backplane::grpc::Ticket::MergeFrom(
-          from._internal_result_id());
-    }
-    if (cached_has_bits & 0x00000002u) {
-      _this->_internal_mutable_left_id()->::io::deephaven::proto::backplane::grpc::TableReference::MergeFrom(
-          from._internal_left_id());
-    }
-    if (cached_has_bits & 0x00000004u) {
-      _this->_internal_mutable_right_id()->::io::deephaven::proto::backplane::grpc::TableReference::MergeFrom(
-          from._internal_right_id());
-    }
-  }
-  _this->_internal_metadata_.MergeFrom<::google::protobuf::UnknownFieldSet>(from._internal_metadata_);
-}
-
-void NaturalJoinTablesRequest::CopyFrom(const NaturalJoinTablesRequest& from) {
-// @@protoc_insertion_point(class_specific_copy_from_start:io.deephaven.proto.backplane.grpc.NaturalJoinTablesRequest)
-  if (&from == this) return;
-  Clear();
-  MergeFrom(from);
-}
-
-PROTOBUF_NOINLINE bool NaturalJoinTablesRequest::IsInitialized() const {
-  return true;
-}
-
-::_pbi::CachedSize* NaturalJoinTablesRequest::AccessCachedSize() const {
-  return &_impl_._cached_size_;
-}
-void NaturalJoinTablesRequest::InternalSwap(NaturalJoinTablesRequest* PROTOBUF_RESTRICT other) {
-  using std::swap;
-  _internal_metadata_.InternalSwap(&other->_internal_metadata_);
-  swap(_impl_._has_bits_[0], other->_impl_._has_bits_[0]);
-  _impl_.columns_to_match_.InternalSwap(&other->_impl_.columns_to_match_);
-  _impl_.columns_to_add_.InternalSwap(&other->_impl_.columns_to_add_);
-  ::google::protobuf::internal::memswap<
-      PROTOBUF_FIELD_OFFSET(NaturalJoinTablesRequest, _impl_.right_id_)
-      + sizeof(NaturalJoinTablesRequest::_impl_.right_id_)
-      - PROTOBUF_FIELD_OFFSET(NaturalJoinTablesRequest, _impl_.result_id_)>(
-          reinterpret_cast<char*>(&_impl_.result_id_),
-          reinterpret_cast<char*>(&other->_impl_.result_id_));
-}
-
-::google::protobuf::Metadata NaturalJoinTablesRequest::GetMetadata() const {
-  return ::_pbi::AssignDescriptors(
-      &descriptor_table_deephaven_2fproto_2ftable_2eproto_getter, &descriptor_table_deephaven_2fproto_2ftable_2eproto_once,
-      file_level_metadata_deephaven_2fproto_2ftable_2eproto[51]);
-}
-// ===================================================================
-
-class ExactJoinTablesRequest::_Internal {
- public:
-  using HasBits = decltype(std::declval<ExactJoinTablesRequest>()._impl_._has_bits_);
-  static constexpr ::int32_t kHasBitsOffset =
-    8 * PROTOBUF_FIELD_OFFSET(ExactJoinTablesRequest, _impl_._has_bits_);
-  static const ::io::deephaven::proto::backplane::grpc::Ticket& result_id(const ExactJoinTablesRequest* msg);
-  static void set_has_result_id(HasBits* has_bits) {
-    (*has_bits)[0] |= 1u;
-  }
-  static const ::io::deephaven::proto::backplane::grpc::TableReference& left_id(const ExactJoinTablesRequest* msg);
-  static void set_has_left_id(HasBits* has_bits) {
-    (*has_bits)[0] |= 2u;
-  }
-  static const ::io::deephaven::proto::backplane::grpc::TableReference& right_id(const ExactJoinTablesRequest* msg);
-  static void set_has_right_id(HasBits* has_bits) {
-    (*has_bits)[0] |= 4u;
-  }
-};
-
-const ::io::deephaven::proto::backplane::grpc::Ticket& ExactJoinTablesRequest::_Internal::result_id(const ExactJoinTablesRequest* msg) {
-  return *msg->_impl_.result_id_;
-}
-const ::io::deephaven::proto::backplane::grpc::TableReference& ExactJoinTablesRequest::_Internal::left_id(const ExactJoinTablesRequest* msg) {
-  return *msg->_impl_.left_id_;
-}
-const ::io::deephaven::proto::backplane::grpc::TableReference& ExactJoinTablesRequest::_Internal::right_id(const ExactJoinTablesRequest* msg) {
-  return *msg->_impl_.right_id_;
-}
-void ExactJoinTablesRequest::clear_result_id() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  if (_impl_.result_id_ != nullptr) _impl_.result_id_->Clear();
-  _impl_._has_bits_[0] &= ~0x00000001u;
-}
-ExactJoinTablesRequest::ExactJoinTablesRequest(::google::protobuf::Arena* arena)
-    : ::google::protobuf::Message(arena) {
-  SharedCtor(arena);
-  // @@protoc_insertion_point(arena_constructor:io.deephaven.proto.backplane.grpc.ExactJoinTablesRequest)
-}
-inline PROTOBUF_NDEBUG_INLINE ExactJoinTablesRequest::Impl_::Impl_(
-    ::google::protobuf::internal::InternalVisibility visibility, ::google::protobuf::Arena* arena,
-    const Impl_& from)
-      : _has_bits_{from._has_bits_},
-        _cached_size_{0},
-        columns_to_match_{visibility, arena, from.columns_to_match_},
-        columns_to_add_{visibility, arena, from.columns_to_add_} {}
-
-ExactJoinTablesRequest::ExactJoinTablesRequest(
-    ::google::protobuf::Arena* arena,
-    const ExactJoinTablesRequest& from)
-    : ::google::protobuf::Message(arena) {
-  ExactJoinTablesRequest* const _this = this;
-  (void)_this;
-  _internal_metadata_.MergeFrom<::google::protobuf::UnknownFieldSet>(
-      from._internal_metadata_);
-  new (&_impl_) Impl_(internal_visibility(), arena, from._impl_);
-  ::uint32_t cached_has_bits = _impl_._has_bits_[0];
-  _impl_.result_id_ = (cached_has_bits & 0x00000001u)
-                ? CreateMaybeMessage<::io::deephaven::proto::backplane::grpc::Ticket>(arena, *from._impl_.result_id_)
-                : nullptr;
-  _impl_.left_id_ = (cached_has_bits & 0x00000002u)
-                ? CreateMaybeMessage<::io::deephaven::proto::backplane::grpc::TableReference>(arena, *from._impl_.left_id_)
-                : nullptr;
-  _impl_.right_id_ = (cached_has_bits & 0x00000004u)
-                ? CreateMaybeMessage<::io::deephaven::proto::backplane::grpc::TableReference>(arena, *from._impl_.right_id_)
-                : nullptr;
-
-  // @@protoc_insertion_point(copy_constructor:io.deephaven.proto.backplane.grpc.ExactJoinTablesRequest)
-}
-inline PROTOBUF_NDEBUG_INLINE ExactJoinTablesRequest::Impl_::Impl_(
-    ::google::protobuf::internal::InternalVisibility visibility,
-    ::google::protobuf::Arena* arena)
-      : _cached_size_{0},
-        columns_to_match_{visibility, arena},
-        columns_to_add_{visibility, arena} {}
-
-inline void ExactJoinTablesRequest::SharedCtor(::_pb::Arena* arena) {
-  new (&_impl_) Impl_(internal_visibility(), arena);
-  ::memset(reinterpret_cast<char *>(&_impl_) +
-               offsetof(Impl_, result_id_),
-           0,
-           offsetof(Impl_, right_id_) -
-               offsetof(Impl_, result_id_) +
-               sizeof(Impl_::right_id_));
-}
-ExactJoinTablesRequest::~ExactJoinTablesRequest() {
-  // @@protoc_insertion_point(destructor:io.deephaven.proto.backplane.grpc.ExactJoinTablesRequest)
-  _internal_metadata_.Delete<::google::protobuf::UnknownFieldSet>();
-  SharedDtor();
-}
-inline void ExactJoinTablesRequest::SharedDtor() {
-  ABSL_DCHECK(GetArena() == nullptr);
-  delete _impl_.result_id_;
-  delete _impl_.left_id_;
-  delete _impl_.right_id_;
-  _impl_.~Impl_();
-}
-
-PROTOBUF_NOINLINE void ExactJoinTablesRequest::Clear() {
-// @@protoc_insertion_point(message_clear_start:io.deephaven.proto.backplane.grpc.ExactJoinTablesRequest)
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  ::uint32_t cached_has_bits = 0;
-  // Prevent compiler warnings about cached_has_bits being unused
-  (void) cached_has_bits;
-
-  _impl_.columns_to_match_.Clear();
-  _impl_.columns_to_add_.Clear();
-  cached_has_bits = _impl_._has_bits_[0];
-  if (cached_has_bits & 0x00000007u) {
-    if (cached_has_bits & 0x00000001u) {
-      ABSL_DCHECK(_impl_.result_id_ != nullptr);
-      _impl_.result_id_->Clear();
-    }
-    if (cached_has_bits & 0x00000002u) {
-      ABSL_DCHECK(_impl_.left_id_ != nullptr);
-      _impl_.left_id_->Clear();
-    }
-    if (cached_has_bits & 0x00000004u) {
-      ABSL_DCHECK(_impl_.right_id_ != nullptr);
-      _impl_.right_id_->Clear();
-    }
-  }
-  _impl_._has_bits_.Clear();
-  _internal_metadata_.Clear<::google::protobuf::UnknownFieldSet>();
-}
-
-const char* ExactJoinTablesRequest::_InternalParse(
-    const char* ptr, ::_pbi::ParseContext* ctx) {
-  ptr = ::_pbi::TcParser::ParseLoop(this, ptr, ctx, &_table_.header);
-  return ptr;
-}
-
-
-PROTOBUF_CONSTINIT PROTOBUF_ATTRIBUTE_INIT_PRIORITY1
-const ::_pbi::TcParseTable<3, 5, 3, 95, 2> ExactJoinTablesRequest::_table_ = {
-  {
-    PROTOBUF_FIELD_OFFSET(ExactJoinTablesRequest, _impl_._has_bits_),
-    0, // no _extensions_
-    5, 56,  // max_field_number, fast_idx_mask
-    offsetof(decltype(_table_), field_lookup_table),
-    4294967264,  // skipmap
-    offsetof(decltype(_table_), field_entries),
-    5,  // num_field_entries
-    3,  // num_aux_entries
-    offsetof(decltype(_table_), aux_entries),
-    &_ExactJoinTablesRequest_default_instance_._instance,
-    ::_pbi::TcParser::GenericFallback,  // fallback
-  }, {{
-    {::_pbi::TcParser::MiniParse, {}},
-    // .io.deephaven.proto.backplane.grpc.Ticket result_id = 1;
-    {::_pbi::TcParser::FastMtS1,
-     {10, 0, 0, PROTOBUF_FIELD_OFFSET(ExactJoinTablesRequest, _impl_.result_id_)}},
-    // .io.deephaven.proto.backplane.grpc.TableReference left_id = 2;
-    {::_pbi::TcParser::FastMtS1,
-     {18, 1, 1, PROTOBUF_FIELD_OFFSET(ExactJoinTablesRequest, _impl_.left_id_)}},
-    // .io.deephaven.proto.backplane.grpc.TableReference right_id = 3;
-    {::_pbi::TcParser::FastMtS1,
-     {26, 2, 2, PROTOBUF_FIELD_OFFSET(ExactJoinTablesRequest, _impl_.right_id_)}},
-    // repeated string columns_to_match = 4;
-    {::_pbi::TcParser::FastUR1,
-     {34, 63, 0, PROTOBUF_FIELD_OFFSET(ExactJoinTablesRequest, _impl_.columns_to_match_)}},
-    // repeated string columns_to_add = 5;
-    {::_pbi::TcParser::FastUR1,
-     {42, 63, 0, PROTOBUF_FIELD_OFFSET(ExactJoinTablesRequest, _impl_.columns_to_add_)}},
-    {::_pbi::TcParser::MiniParse, {}},
-    {::_pbi::TcParser::MiniParse, {}},
-  }}, {{
-    65535, 65535
-  }}, {{
-    // .io.deephaven.proto.backplane.grpc.Ticket result_id = 1;
-    {PROTOBUF_FIELD_OFFSET(ExactJoinTablesRequest, _impl_.result_id_), _Internal::kHasBitsOffset + 0, 0,
-    (0 | ::_fl::kFcOptional | ::_fl::kMessage | ::_fl::kTvTable)},
-    // .io.deephaven.proto.backplane.grpc.TableReference left_id = 2;
-    {PROTOBUF_FIELD_OFFSET(ExactJoinTablesRequest, _impl_.left_id_), _Internal::kHasBitsOffset + 1, 1,
-    (0 | ::_fl::kFcOptional | ::_fl::kMessage | ::_fl::kTvTable)},
-    // .io.deephaven.proto.backplane.grpc.TableReference right_id = 3;
-    {PROTOBUF_FIELD_OFFSET(ExactJoinTablesRequest, _impl_.right_id_), _Internal::kHasBitsOffset + 2, 2,
-    (0 | ::_fl::kFcOptional | ::_fl::kMessage | ::_fl::kTvTable)},
-    // repeated string columns_to_match = 4;
-    {PROTOBUF_FIELD_OFFSET(ExactJoinTablesRequest, _impl_.columns_to_match_), -1, 0,
-    (0 | ::_fl::kFcRepeated | ::_fl::kUtf8String | ::_fl::kRepSString)},
-    // repeated string columns_to_add = 5;
-    {PROTOBUF_FIELD_OFFSET(ExactJoinTablesRequest, _impl_.columns_to_add_), -1, 0,
-    (0 | ::_fl::kFcRepeated | ::_fl::kUtf8String | ::_fl::kRepSString)},
-  }}, {{
-    {::_pbi::TcParser::GetTable<::io::deephaven::proto::backplane::grpc::Ticket>()},
-    {::_pbi::TcParser::GetTable<::io::deephaven::proto::backplane::grpc::TableReference>()},
-    {::_pbi::TcParser::GetTable<::io::deephaven::proto::backplane::grpc::TableReference>()},
-  }}, {{
-    "\70\0\0\0\20\16\0\0"
-    "io.deephaven.proto.backplane.grpc.ExactJoinTablesRequest"
-    "columns_to_match"
-    "columns_to_add"
-  }},
-};
-
-::uint8_t* ExactJoinTablesRequest::_InternalSerialize(
-    ::uint8_t* target,
-    ::google::protobuf::io::EpsCopyOutputStream* stream) const {
-  // @@protoc_insertion_point(serialize_to_array_start:io.deephaven.proto.backplane.grpc.ExactJoinTablesRequest)
-  ::uint32_t cached_has_bits = 0;
-  (void)cached_has_bits;
-
-  cached_has_bits = _impl_._has_bits_[0];
-  // .io.deephaven.proto.backplane.grpc.Ticket result_id = 1;
-  if (cached_has_bits & 0x00000001u) {
-    target = ::google::protobuf::internal::WireFormatLite::InternalWriteMessage(
-        1, _Internal::result_id(this),
-        _Internal::result_id(this).GetCachedSize(), target, stream);
-  }
-
-  // .io.deephaven.proto.backplane.grpc.TableReference left_id = 2;
-  if (cached_has_bits & 0x00000002u) {
-    target = ::google::protobuf::internal::WireFormatLite::InternalWriteMessage(
-        2, _Internal::left_id(this),
-        _Internal::left_id(this).GetCachedSize(), target, stream);
-  }
-
-  // .io.deephaven.proto.backplane.grpc.TableReference right_id = 3;
-  if (cached_has_bits & 0x00000004u) {
-    target = ::google::protobuf::internal::WireFormatLite::InternalWriteMessage(
-        3, _Internal::right_id(this),
-        _Internal::right_id(this).GetCachedSize(), target, stream);
-  }
-
-  // repeated string columns_to_match = 4;
-  for (int i = 0, n = this->_internal_columns_to_match_size(); i < n; ++i) {
-    const auto& s = this->_internal_columns_to_match().Get(i);
-    ::google::protobuf::internal::WireFormatLite::VerifyUtf8String(
-        s.data(), static_cast<int>(s.length()), ::google::protobuf::internal::WireFormatLite::SERIALIZE, "io.deephaven.proto.backplane.grpc.ExactJoinTablesRequest.columns_to_match");
-    target = stream->WriteString(4, s, target);
-  }
-
-  // repeated string columns_to_add = 5;
-  for (int i = 0, n = this->_internal_columns_to_add_size(); i < n; ++i) {
-    const auto& s = this->_internal_columns_to_add().Get(i);
-    ::google::protobuf::internal::WireFormatLite::VerifyUtf8String(
-        s.data(), static_cast<int>(s.length()), ::google::protobuf::internal::WireFormatLite::SERIALIZE, "io.deephaven.proto.backplane.grpc.ExactJoinTablesRequest.columns_to_add");
-    target = stream->WriteString(5, s, target);
-  }
-
-  if (PROTOBUF_PREDICT_FALSE(_internal_metadata_.have_unknown_fields())) {
-    target =
-        ::_pbi::WireFormat::InternalSerializeUnknownFieldsToArray(
-            _internal_metadata_.unknown_fields<::google::protobuf::UnknownFieldSet>(::google::protobuf::UnknownFieldSet::default_instance), target, stream);
-  }
-  // @@protoc_insertion_point(serialize_to_array_end:io.deephaven.proto.backplane.grpc.ExactJoinTablesRequest)
-  return target;
-}
-
-::size_t ExactJoinTablesRequest::ByteSizeLong() const {
-// @@protoc_insertion_point(message_byte_size_start:io.deephaven.proto.backplane.grpc.ExactJoinTablesRequest)
-  ::size_t total_size = 0;
-
-  ::uint32_t cached_has_bits = 0;
-  // Prevent compiler warnings about cached_has_bits being unused
-  (void) cached_has_bits;
-
-  // repeated string columns_to_match = 4;
-  total_size += 1 * ::google::protobuf::internal::FromIntSize(_internal_columns_to_match().size());
-  for (int i = 0, n = _internal_columns_to_match().size(); i < n; ++i) {
-    total_size += ::google::protobuf::internal::WireFormatLite::StringSize(
-        _internal_columns_to_match().Get(i));
-  }
-  // repeated string columns_to_add = 5;
-  total_size += 1 * ::google::protobuf::internal::FromIntSize(_internal_columns_to_add().size());
-  for (int i = 0, n = _internal_columns_to_add().size(); i < n; ++i) {
-    total_size += ::google::protobuf::internal::WireFormatLite::StringSize(
-        _internal_columns_to_add().Get(i));
-  }
-  cached_has_bits = _impl_._has_bits_[0];
-  if (cached_has_bits & 0x00000007u) {
-    // .io.deephaven.proto.backplane.grpc.Ticket result_id = 1;
-    if (cached_has_bits & 0x00000001u) {
-      total_size +=
-          1 + ::google::protobuf::internal::WireFormatLite::MessageSize(*_impl_.result_id_);
-    }
-
-    // .io.deephaven.proto.backplane.grpc.TableReference left_id = 2;
-    if (cached_has_bits & 0x00000002u) {
-      total_size +=
-          1 + ::google::protobuf::internal::WireFormatLite::MessageSize(*_impl_.left_id_);
-    }
-
-    // .io.deephaven.proto.backplane.grpc.TableReference right_id = 3;
-    if (cached_has_bits & 0x00000004u) {
-      total_size +=
-          1 + ::google::protobuf::internal::WireFormatLite::MessageSize(*_impl_.right_id_);
-    }
-
-  }
-  return MaybeComputeUnknownFieldsSize(total_size, &_impl_._cached_size_);
-}
-
-const ::google::protobuf::Message::ClassData ExactJoinTablesRequest::_class_data_ = {
-    ExactJoinTablesRequest::MergeImpl,
-    nullptr,  // OnDemandRegisterArenaDtor
-};
-const ::google::protobuf::Message::ClassData* ExactJoinTablesRequest::GetClassData() const {
-  return &_class_data_;
-}
-
-void ExactJoinTablesRequest::MergeImpl(::google::protobuf::Message& to_msg, const ::google::protobuf::Message& from_msg) {
-  auto* const _this = static_cast<ExactJoinTablesRequest*>(&to_msg);
-  auto& from = static_cast<const ExactJoinTablesRequest&>(from_msg);
-  // @@protoc_insertion_point(class_specific_merge_from_start:io.deephaven.proto.backplane.grpc.ExactJoinTablesRequest)
-  ABSL_DCHECK_NE(&from, _this);
-  ::uint32_t cached_has_bits = 0;
-  (void) cached_has_bits;
-
-  _this->_internal_mutable_columns_to_match()->MergeFrom(from._internal_columns_to_match());
-  _this->_internal_mutable_columns_to_add()->MergeFrom(from._internal_columns_to_add());
-  cached_has_bits = from._impl_._has_bits_[0];
-  if (cached_has_bits & 0x00000007u) {
-    if (cached_has_bits & 0x00000001u) {
-      _this->_internal_mutable_result_id()->::io::deephaven::proto::backplane::grpc::Ticket::MergeFrom(
-          from._internal_result_id());
-    }
-    if (cached_has_bits & 0x00000002u) {
-      _this->_internal_mutable_left_id()->::io::deephaven::proto::backplane::grpc::TableReference::MergeFrom(
-          from._internal_left_id());
-    }
-    if (cached_has_bits & 0x00000004u) {
-      _this->_internal_mutable_right_id()->::io::deephaven::proto::backplane::grpc::TableReference::MergeFrom(
-          from._internal_right_id());
-    }
-  }
-  _this->_internal_metadata_.MergeFrom<::google::protobuf::UnknownFieldSet>(from._internal_metadata_);
-}
-
-void ExactJoinTablesRequest::CopyFrom(const ExactJoinTablesRequest& from) {
-// @@protoc_insertion_point(class_specific_copy_from_start:io.deephaven.proto.backplane.grpc.ExactJoinTablesRequest)
-  if (&from == this) return;
-  Clear();
-  MergeFrom(from);
-}
-
-PROTOBUF_NOINLINE bool ExactJoinTablesRequest::IsInitialized() const {
-  return true;
-}
-
-::_pbi::CachedSize* ExactJoinTablesRequest::AccessCachedSize() const {
-  return &_impl_._cached_size_;
-}
-void ExactJoinTablesRequest::InternalSwap(ExactJoinTablesRequest* PROTOBUF_RESTRICT other) {
-  using std::swap;
-  _internal_metadata_.InternalSwap(&other->_internal_metadata_);
-  swap(_impl_._has_bits_[0], other->_impl_._has_bits_[0]);
-  _impl_.columns_to_match_.InternalSwap(&other->_impl_.columns_to_match_);
-  _impl_.columns_to_add_.InternalSwap(&other->_impl_.columns_to_add_);
-  ::google::protobuf::internal::memswap<
-      PROTOBUF_FIELD_OFFSET(ExactJoinTablesRequest, _impl_.right_id_)
-      + sizeof(ExactJoinTablesRequest::_impl_.right_id_)
-      - PROTOBUF_FIELD_OFFSET(ExactJoinTablesRequest, _impl_.result_id_)>(
-          reinterpret_cast<char*>(&_impl_.result_id_),
-          reinterpret_cast<char*>(&other->_impl_.result_id_));
-}
-
-::google::protobuf::Metadata ExactJoinTablesRequest::GetMetadata() const {
-  return ::_pbi::AssignDescriptors(
-      &descriptor_table_deephaven_2fproto_2ftable_2eproto_getter, &descriptor_table_deephaven_2fproto_2ftable_2eproto_once,
-      file_level_metadata_deephaven_2fproto_2ftable_2eproto[52]);
-}
-// ===================================================================
-
-class LeftJoinTablesRequest::_Internal {
- public:
-  using HasBits = decltype(std::declval<LeftJoinTablesRequest>()._impl_._has_bits_);
-  static constexpr ::int32_t kHasBitsOffset =
-    8 * PROTOBUF_FIELD_OFFSET(LeftJoinTablesRequest, _impl_._has_bits_);
-  static const ::io::deephaven::proto::backplane::grpc::Ticket& result_id(const LeftJoinTablesRequest* msg);
-  static void set_has_result_id(HasBits* has_bits) {
-    (*has_bits)[0] |= 1u;
-  }
-  static const ::io::deephaven::proto::backplane::grpc::TableReference& left_id(const LeftJoinTablesRequest* msg);
-  static void set_has_left_id(HasBits* has_bits) {
-    (*has_bits)[0] |= 2u;
-  }
-  static const ::io::deephaven::proto::backplane::grpc::TableReference& right_id(const LeftJoinTablesRequest* msg);
-  static void set_has_right_id(HasBits* has_bits) {
-    (*has_bits)[0] |= 4u;
-  }
-};
-
-const ::io::deephaven::proto::backplane::grpc::Ticket& LeftJoinTablesRequest::_Internal::result_id(const LeftJoinTablesRequest* msg) {
-  return *msg->_impl_.result_id_;
-}
-const ::io::deephaven::proto::backplane::grpc::TableReference& LeftJoinTablesRequest::_Internal::left_id(const LeftJoinTablesRequest* msg) {
-  return *msg->_impl_.left_id_;
-}
-const ::io::deephaven::proto::backplane::grpc::TableReference& LeftJoinTablesRequest::_Internal::right_id(const LeftJoinTablesRequest* msg) {
-  return *msg->_impl_.right_id_;
-}
-void LeftJoinTablesRequest::clear_result_id() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  if (_impl_.result_id_ != nullptr) _impl_.result_id_->Clear();
-  _impl_._has_bits_[0] &= ~0x00000001u;
-}
-LeftJoinTablesRequest::LeftJoinTablesRequest(::google::protobuf::Arena* arena)
-    : ::google::protobuf::Message(arena) {
-  SharedCtor(arena);
-  // @@protoc_insertion_point(arena_constructor:io.deephaven.proto.backplane.grpc.LeftJoinTablesRequest)
-}
-inline PROTOBUF_NDEBUG_INLINE LeftJoinTablesRequest::Impl_::Impl_(
-    ::google::protobuf::internal::InternalVisibility visibility, ::google::protobuf::Arena* arena,
-    const Impl_& from)
-      : _has_bits_{from._has_bits_},
-        _cached_size_{0},
-        columns_to_match_{visibility, arena, from.columns_to_match_},
-        columns_to_add_{visibility, arena, from.columns_to_add_} {}
-
-LeftJoinTablesRequest::LeftJoinTablesRequest(
-    ::google::protobuf::Arena* arena,
-    const LeftJoinTablesRequest& from)
-    : ::google::protobuf::Message(arena) {
-  LeftJoinTablesRequest* const _this = this;
-  (void)_this;
-  _internal_metadata_.MergeFrom<::google::protobuf::UnknownFieldSet>(
-      from._internal_metadata_);
-  new (&_impl_) Impl_(internal_visibility(), arena, from._impl_);
-  ::uint32_t cached_has_bits = _impl_._has_bits_[0];
-  _impl_.result_id_ = (cached_has_bits & 0x00000001u)
-                ? CreateMaybeMessage<::io::deephaven::proto::backplane::grpc::Ticket>(arena, *from._impl_.result_id_)
-                : nullptr;
-  _impl_.left_id_ = (cached_has_bits & 0x00000002u)
-                ? CreateMaybeMessage<::io::deephaven::proto::backplane::grpc::TableReference>(arena, *from._impl_.left_id_)
-                : nullptr;
-  _impl_.right_id_ = (cached_has_bits & 0x00000004u)
-                ? CreateMaybeMessage<::io::deephaven::proto::backplane::grpc::TableReference>(arena, *from._impl_.right_id_)
-                : nullptr;
-
-  // @@protoc_insertion_point(copy_constructor:io.deephaven.proto.backplane.grpc.LeftJoinTablesRequest)
-}
-inline PROTOBUF_NDEBUG_INLINE LeftJoinTablesRequest::Impl_::Impl_(
-    ::google::protobuf::internal::InternalVisibility visibility,
-    ::google::protobuf::Arena* arena)
-      : _cached_size_{0},
-        columns_to_match_{visibility, arena},
-        columns_to_add_{visibility, arena} {}
-
-inline void LeftJoinTablesRequest::SharedCtor(::_pb::Arena* arena) {
-  new (&_impl_) Impl_(internal_visibility(), arena);
-  ::memset(reinterpret_cast<char *>(&_impl_) +
-               offsetof(Impl_, result_id_),
-           0,
-           offsetof(Impl_, right_id_) -
-               offsetof(Impl_, result_id_) +
-               sizeof(Impl_::right_id_));
-}
-LeftJoinTablesRequest::~LeftJoinTablesRequest() {
-  // @@protoc_insertion_point(destructor:io.deephaven.proto.backplane.grpc.LeftJoinTablesRequest)
-  _internal_metadata_.Delete<::google::protobuf::UnknownFieldSet>();
-  SharedDtor();
-}
-inline void LeftJoinTablesRequest::SharedDtor() {
-  ABSL_DCHECK(GetArena() == nullptr);
-  delete _impl_.result_id_;
-  delete _impl_.left_id_;
-  delete _impl_.right_id_;
-  _impl_.~Impl_();
-}
-
-PROTOBUF_NOINLINE void LeftJoinTablesRequest::Clear() {
-// @@protoc_insertion_point(message_clear_start:io.deephaven.proto.backplane.grpc.LeftJoinTablesRequest)
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  ::uint32_t cached_has_bits = 0;
-  // Prevent compiler warnings about cached_has_bits being unused
-  (void) cached_has_bits;
-
-  _impl_.columns_to_match_.Clear();
-  _impl_.columns_to_add_.Clear();
-  cached_has_bits = _impl_._has_bits_[0];
-  if (cached_has_bits & 0x00000007u) {
-    if (cached_has_bits & 0x00000001u) {
-      ABSL_DCHECK(_impl_.result_id_ != nullptr);
-      _impl_.result_id_->Clear();
-    }
-    if (cached_has_bits & 0x00000002u) {
-      ABSL_DCHECK(_impl_.left_id_ != nullptr);
-      _impl_.left_id_->Clear();
-    }
-    if (cached_has_bits & 0x00000004u) {
-      ABSL_DCHECK(_impl_.right_id_ != nullptr);
-      _impl_.right_id_->Clear();
-    }
-  }
-  _impl_._has_bits_.Clear();
-  _internal_metadata_.Clear<::google::protobuf::UnknownFieldSet>();
-}
-
-const char* LeftJoinTablesRequest::_InternalParse(
-    const char* ptr, ::_pbi::ParseContext* ctx) {
-  ptr = ::_pbi::TcParser::ParseLoop(this, ptr, ctx, &_table_.header);
-  return ptr;
-}
-
-
-PROTOBUF_CONSTINIT PROTOBUF_ATTRIBUTE_INIT_PRIORITY1
-const ::_pbi::TcParseTable<3, 5, 3, 94, 2> LeftJoinTablesRequest::_table_ = {
-  {
-    PROTOBUF_FIELD_OFFSET(LeftJoinTablesRequest, _impl_._has_bits_),
-    0, // no _extensions_
-    5, 56,  // max_field_number, fast_idx_mask
-    offsetof(decltype(_table_), field_lookup_table),
-    4294967264,  // skipmap
-    offsetof(decltype(_table_), field_entries),
-    5,  // num_field_entries
-    3,  // num_aux_entries
-    offsetof(decltype(_table_), aux_entries),
-    &_LeftJoinTablesRequest_default_instance_._instance,
-    ::_pbi::TcParser::GenericFallback,  // fallback
-  }, {{
-    {::_pbi::TcParser::MiniParse, {}},
-    // .io.deephaven.proto.backplane.grpc.Ticket result_id = 1;
-    {::_pbi::TcParser::FastMtS1,
-     {10, 0, 0, PROTOBUF_FIELD_OFFSET(LeftJoinTablesRequest, _impl_.result_id_)}},
-    // .io.deephaven.proto.backplane.grpc.TableReference left_id = 2;
-    {::_pbi::TcParser::FastMtS1,
-     {18, 1, 1, PROTOBUF_FIELD_OFFSET(LeftJoinTablesRequest, _impl_.left_id_)}},
-    // .io.deephaven.proto.backplane.grpc.TableReference right_id = 3;
-    {::_pbi::TcParser::FastMtS1,
-     {26, 2, 2, PROTOBUF_FIELD_OFFSET(LeftJoinTablesRequest, _impl_.right_id_)}},
-    // repeated string columns_to_match = 4;
-    {::_pbi::TcParser::FastUR1,
-     {34, 63, 0, PROTOBUF_FIELD_OFFSET(LeftJoinTablesRequest, _impl_.columns_to_match_)}},
-    // repeated string columns_to_add = 5;
-    {::_pbi::TcParser::FastUR1,
-     {42, 63, 0, PROTOBUF_FIELD_OFFSET(LeftJoinTablesRequest, _impl_.columns_to_add_)}},
-    {::_pbi::TcParser::MiniParse, {}},
-    {::_pbi::TcParser::MiniParse, {}},
-  }}, {{
-    65535, 65535
-  }}, {{
-    // .io.deephaven.proto.backplane.grpc.Ticket result_id = 1;
-    {PROTOBUF_FIELD_OFFSET(LeftJoinTablesRequest, _impl_.result_id_), _Internal::kHasBitsOffset + 0, 0,
-    (0 | ::_fl::kFcOptional | ::_fl::kMessage | ::_fl::kTvTable)},
-    // .io.deephaven.proto.backplane.grpc.TableReference left_id = 2;
-    {PROTOBUF_FIELD_OFFSET(LeftJoinTablesRequest, _impl_.left_id_), _Internal::kHasBitsOffset + 1, 1,
-    (0 | ::_fl::kFcOptional | ::_fl::kMessage | ::_fl::kTvTable)},
-    // .io.deephaven.proto.backplane.grpc.TableReference right_id = 3;
-    {PROTOBUF_FIELD_OFFSET(LeftJoinTablesRequest, _impl_.right_id_), _Internal::kHasBitsOffset + 2, 2,
-    (0 | ::_fl::kFcOptional | ::_fl::kMessage | ::_fl::kTvTable)},
-    // repeated string columns_to_match = 4;
-    {PROTOBUF_FIELD_OFFSET(LeftJoinTablesRequest, _impl_.columns_to_match_), -1, 0,
-    (0 | ::_fl::kFcRepeated | ::_fl::kUtf8String | ::_fl::kRepSString)},
-    // repeated string columns_to_add = 5;
-    {PROTOBUF_FIELD_OFFSET(LeftJoinTablesRequest, _impl_.columns_to_add_), -1, 0,
-    (0 | ::_fl::kFcRepeated | ::_fl::kUtf8String | ::_fl::kRepSString)},
-  }}, {{
-    {::_pbi::TcParser::GetTable<::io::deephaven::proto::backplane::grpc::Ticket>()},
-    {::_pbi::TcParser::GetTable<::io::deephaven::proto::backplane::grpc::TableReference>()},
-    {::_pbi::TcParser::GetTable<::io::deephaven::proto::backplane::grpc::TableReference>()},
-  }}, {{
-    "\67\0\0\0\20\16\0\0"
-    "io.deephaven.proto.backplane.grpc.LeftJoinTablesRequest"
-    "columns_to_match"
-    "columns_to_add"
-  }},
-};
-
-::uint8_t* LeftJoinTablesRequest::_InternalSerialize(
-    ::uint8_t* target,
-    ::google::protobuf::io::EpsCopyOutputStream* stream) const {
-  // @@protoc_insertion_point(serialize_to_array_start:io.deephaven.proto.backplane.grpc.LeftJoinTablesRequest)
-  ::uint32_t cached_has_bits = 0;
-  (void)cached_has_bits;
-
-  cached_has_bits = _impl_._has_bits_[0];
-  // .io.deephaven.proto.backplane.grpc.Ticket result_id = 1;
-  if (cached_has_bits & 0x00000001u) {
-    target = ::google::protobuf::internal::WireFormatLite::InternalWriteMessage(
-        1, _Internal::result_id(this),
-        _Internal::result_id(this).GetCachedSize(), target, stream);
-  }
-
-  // .io.deephaven.proto.backplane.grpc.TableReference left_id = 2;
-  if (cached_has_bits & 0x00000002u) {
-    target = ::google::protobuf::internal::WireFormatLite::InternalWriteMessage(
-        2, _Internal::left_id(this),
-        _Internal::left_id(this).GetCachedSize(), target, stream);
-  }
-
-  // .io.deephaven.proto.backplane.grpc.TableReference right_id = 3;
-  if (cached_has_bits & 0x00000004u) {
-    target = ::google::protobuf::internal::WireFormatLite::InternalWriteMessage(
-        3, _Internal::right_id(this),
-        _Internal::right_id(this).GetCachedSize(), target, stream);
-  }
-
-  // repeated string columns_to_match = 4;
-  for (int i = 0, n = this->_internal_columns_to_match_size(); i < n; ++i) {
-    const auto& s = this->_internal_columns_to_match().Get(i);
-    ::google::protobuf::internal::WireFormatLite::VerifyUtf8String(
-        s.data(), static_cast<int>(s.length()), ::google::protobuf::internal::WireFormatLite::SERIALIZE, "io.deephaven.proto.backplane.grpc.LeftJoinTablesRequest.columns_to_match");
-    target = stream->WriteString(4, s, target);
-  }
-
-  // repeated string columns_to_add = 5;
-  for (int i = 0, n = this->_internal_columns_to_add_size(); i < n; ++i) {
-    const auto& s = this->_internal_columns_to_add().Get(i);
-    ::google::protobuf::internal::WireFormatLite::VerifyUtf8String(
-        s.data(), static_cast<int>(s.length()), ::google::protobuf::internal::WireFormatLite::SERIALIZE, "io.deephaven.proto.backplane.grpc.LeftJoinTablesRequest.columns_to_add");
-    target = stream->WriteString(5, s, target);
-  }
-
-  if (PROTOBUF_PREDICT_FALSE(_internal_metadata_.have_unknown_fields())) {
-    target =
-        ::_pbi::WireFormat::InternalSerializeUnknownFieldsToArray(
-            _internal_metadata_.unknown_fields<::google::protobuf::UnknownFieldSet>(::google::protobuf::UnknownFieldSet::default_instance), target, stream);
-  }
-  // @@protoc_insertion_point(serialize_to_array_end:io.deephaven.proto.backplane.grpc.LeftJoinTablesRequest)
-  return target;
-}
-
-::size_t LeftJoinTablesRequest::ByteSizeLong() const {
-// @@protoc_insertion_point(message_byte_size_start:io.deephaven.proto.backplane.grpc.LeftJoinTablesRequest)
-  ::size_t total_size = 0;
-
-  ::uint32_t cached_has_bits = 0;
-  // Prevent compiler warnings about cached_has_bits being unused
-  (void) cached_has_bits;
-
-  // repeated string columns_to_match = 4;
-  total_size += 1 * ::google::protobuf::internal::FromIntSize(_internal_columns_to_match().size());
-  for (int i = 0, n = _internal_columns_to_match().size(); i < n; ++i) {
-    total_size += ::google::protobuf::internal::WireFormatLite::StringSize(
-        _internal_columns_to_match().Get(i));
-  }
-  // repeated string columns_to_add = 5;
-  total_size += 1 * ::google::protobuf::internal::FromIntSize(_internal_columns_to_add().size());
-  for (int i = 0, n = _internal_columns_to_add().size(); i < n; ++i) {
-    total_size += ::google::protobuf::internal::WireFormatLite::StringSize(
-        _internal_columns_to_add().Get(i));
-  }
-  cached_has_bits = _impl_._has_bits_[0];
-  if (cached_has_bits & 0x00000007u) {
-    // .io.deephaven.proto.backplane.grpc.Ticket result_id = 1;
-    if (cached_has_bits & 0x00000001u) {
-      total_size +=
-          1 + ::google::protobuf::internal::WireFormatLite::MessageSize(*_impl_.result_id_);
-    }
-
-    // .io.deephaven.proto.backplane.grpc.TableReference left_id = 2;
-    if (cached_has_bits & 0x00000002u) {
-      total_size +=
-          1 + ::google::protobuf::internal::WireFormatLite::MessageSize(*_impl_.left_id_);
-    }
-
-    // .io.deephaven.proto.backplane.grpc.TableReference right_id = 3;
-    if (cached_has_bits & 0x00000004u) {
-      total_size +=
-          1 + ::google::protobuf::internal::WireFormatLite::MessageSize(*_impl_.right_id_);
-    }
-
-  }
-  return MaybeComputeUnknownFieldsSize(total_size, &_impl_._cached_size_);
-}
-
-const ::google::protobuf::Message::ClassData LeftJoinTablesRequest::_class_data_ = {
-    LeftJoinTablesRequest::MergeImpl,
-    nullptr,  // OnDemandRegisterArenaDtor
-};
-const ::google::protobuf::Message::ClassData* LeftJoinTablesRequest::GetClassData() const {
-  return &_class_data_;
-}
-
-void LeftJoinTablesRequest::MergeImpl(::google::protobuf::Message& to_msg, const ::google::protobuf::Message& from_msg) {
-  auto* const _this = static_cast<LeftJoinTablesRequest*>(&to_msg);
-  auto& from = static_cast<const LeftJoinTablesRequest&>(from_msg);
-  // @@protoc_insertion_point(class_specific_merge_from_start:io.deephaven.proto.backplane.grpc.LeftJoinTablesRequest)
-  ABSL_DCHECK_NE(&from, _this);
-  ::uint32_t cached_has_bits = 0;
-  (void) cached_has_bits;
-
-  _this->_internal_mutable_columns_to_match()->MergeFrom(from._internal_columns_to_match());
-  _this->_internal_mutable_columns_to_add()->MergeFrom(from._internal_columns_to_add());
-  cached_has_bits = from._impl_._has_bits_[0];
-  if (cached_has_bits & 0x00000007u) {
-    if (cached_has_bits & 0x00000001u) {
-      _this->_internal_mutable_result_id()->::io::deephaven::proto::backplane::grpc::Ticket::MergeFrom(
-          from._internal_result_id());
-    }
-    if (cached_has_bits & 0x00000002u) {
-      _this->_internal_mutable_left_id()->::io::deephaven::proto::backplane::grpc::TableReference::MergeFrom(
-          from._internal_left_id());
-    }
-    if (cached_has_bits & 0x00000004u) {
-      _this->_internal_mutable_right_id()->::io::deephaven::proto::backplane::grpc::TableReference::MergeFrom(
-          from._internal_right_id());
-    }
-  }
-  _this->_internal_metadata_.MergeFrom<::google::protobuf::UnknownFieldSet>(from._internal_metadata_);
-}
-
-void LeftJoinTablesRequest::CopyFrom(const LeftJoinTablesRequest& from) {
-// @@protoc_insertion_point(class_specific_copy_from_start:io.deephaven.proto.backplane.grpc.LeftJoinTablesRequest)
-  if (&from == this) return;
-  Clear();
-  MergeFrom(from);
-}
-
-PROTOBUF_NOINLINE bool LeftJoinTablesRequest::IsInitialized() const {
-  return true;
-}
-
-::_pbi::CachedSize* LeftJoinTablesRequest::AccessCachedSize() const {
-  return &_impl_._cached_size_;
-}
-void LeftJoinTablesRequest::InternalSwap(LeftJoinTablesRequest* PROTOBUF_RESTRICT other) {
-  using std::swap;
-  _internal_metadata_.InternalSwap(&other->_internal_metadata_);
-  swap(_impl_._has_bits_[0], other->_impl_._has_bits_[0]);
-  _impl_.columns_to_match_.InternalSwap(&other->_impl_.columns_to_match_);
-  _impl_.columns_to_add_.InternalSwap(&other->_impl_.columns_to_add_);
-  ::google::protobuf::internal::memswap<
-      PROTOBUF_FIELD_OFFSET(LeftJoinTablesRequest, _impl_.right_id_)
-      + sizeof(LeftJoinTablesRequest::_impl_.right_id_)
-      - PROTOBUF_FIELD_OFFSET(LeftJoinTablesRequest, _impl_.result_id_)>(
-          reinterpret_cast<char*>(&_impl_.result_id_),
-          reinterpret_cast<char*>(&other->_impl_.result_id_));
-}
-
-::google::protobuf::Metadata LeftJoinTablesRequest::GetMetadata() const {
-  return ::_pbi::AssignDescriptors(
-      &descriptor_table_deephaven_2fproto_2ftable_2eproto_getter, &descriptor_table_deephaven_2fproto_2ftable_2eproto_once,
-      file_level_metadata_deephaven_2fproto_2ftable_2eproto[53]);
-}
-// ===================================================================
-
-class AsOfJoinTablesRequest::_Internal {
- public:
-  using HasBits = decltype(std::declval<AsOfJoinTablesRequest>()._impl_._has_bits_);
-  static constexpr ::int32_t kHasBitsOffset =
-    8 * PROTOBUF_FIELD_OFFSET(AsOfJoinTablesRequest, _impl_._has_bits_);
-  static const ::io::deephaven::proto::backplane::grpc::Ticket& result_id(const AsOfJoinTablesRequest* msg);
-  static void set_has_result_id(HasBits* has_bits) {
-    (*has_bits)[0] |= 1u;
-  }
-  static const ::io::deephaven::proto::backplane::grpc::TableReference& left_id(const AsOfJoinTablesRequest* msg);
-  static void set_has_left_id(HasBits* has_bits) {
-    (*has_bits)[0] |= 2u;
-  }
-  static const ::io::deephaven::proto::backplane::grpc::TableReference& right_id(const AsOfJoinTablesRequest* msg);
-  static void set_has_right_id(HasBits* has_bits) {
-    (*has_bits)[0] |= 4u;
-  }
-};
-
-const ::io::deephaven::proto::backplane::grpc::Ticket& AsOfJoinTablesRequest::_Internal::result_id(const AsOfJoinTablesRequest* msg) {
-  return *msg->_impl_.result_id_;
-}
-const ::io::deephaven::proto::backplane::grpc::TableReference& AsOfJoinTablesRequest::_Internal::left_id(const AsOfJoinTablesRequest* msg) {
-  return *msg->_impl_.left_id_;
-}
-const ::io::deephaven::proto::backplane::grpc::TableReference& AsOfJoinTablesRequest::_Internal::right_id(const AsOfJoinTablesRequest* msg) {
-  return *msg->_impl_.right_id_;
-}
-void AsOfJoinTablesRequest::clear_result_id() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  if (_impl_.result_id_ != nullptr) _impl_.result_id_->Clear();
-  _impl_._has_bits_[0] &= ~0x00000001u;
-}
-AsOfJoinTablesRequest::AsOfJoinTablesRequest(::google::protobuf::Arena* arena)
-    : ::google::protobuf::Message(arena) {
-  SharedCtor(arena);
-  // @@protoc_insertion_point(arena_constructor:io.deephaven.proto.backplane.grpc.AsOfJoinTablesRequest)
-}
-inline PROTOBUF_NDEBUG_INLINE AsOfJoinTablesRequest::Impl_::Impl_(
-    ::google::protobuf::internal::InternalVisibility visibility, ::google::protobuf::Arena* arena,
-    const Impl_& from)
-      : _has_bits_{from._has_bits_},
-        _cached_size_{0},
-        columns_to_match_{visibility, arena, from.columns_to_match_},
-        columns_to_add_{visibility, arena, from.columns_to_add_} {}
-
-AsOfJoinTablesRequest::AsOfJoinTablesRequest(
-    ::google::protobuf::Arena* arena,
-    const AsOfJoinTablesRequest& from)
-    : ::google::protobuf::Message(arena) {
-  AsOfJoinTablesRequest* const _this = this;
-  (void)_this;
-  _internal_metadata_.MergeFrom<::google::protobuf::UnknownFieldSet>(
-      from._internal_metadata_);
-  new (&_impl_) Impl_(internal_visibility(), arena, from._impl_);
-  ::uint32_t cached_has_bits = _impl_._has_bits_[0];
-  _impl_.result_id_ = (cached_has_bits & 0x00000001u)
-                ? CreateMaybeMessage<::io::deephaven::proto::backplane::grpc::Ticket>(arena, *from._impl_.result_id_)
-                : nullptr;
-  _impl_.left_id_ = (cached_has_bits & 0x00000002u)
-                ? CreateMaybeMessage<::io::deephaven::proto::backplane::grpc::TableReference>(arena, *from._impl_.left_id_)
-                : nullptr;
-  _impl_.right_id_ = (cached_has_bits & 0x00000004u)
-                ? CreateMaybeMessage<::io::deephaven::proto::backplane::grpc::TableReference>(arena, *from._impl_.right_id_)
-                : nullptr;
-  _impl_.as_of_match_rule_ = from._impl_.as_of_match_rule_;
-
-  // @@protoc_insertion_point(copy_constructor:io.deephaven.proto.backplane.grpc.AsOfJoinTablesRequest)
-}
-inline PROTOBUF_NDEBUG_INLINE AsOfJoinTablesRequest::Impl_::Impl_(
-    ::google::protobuf::internal::InternalVisibility visibility,
-    ::google::protobuf::Arena* arena)
-      : _cached_size_{0},
-        columns_to_match_{visibility, arena},
-        columns_to_add_{visibility, arena} {}
-
-inline void AsOfJoinTablesRequest::SharedCtor(::_pb::Arena* arena) {
-  new (&_impl_) Impl_(internal_visibility(), arena);
-  ::memset(reinterpret_cast<char *>(&_impl_) +
-               offsetof(Impl_, result_id_),
-           0,
-           offsetof(Impl_, as_of_match_rule_) -
-               offsetof(Impl_, result_id_) +
-               sizeof(Impl_::as_of_match_rule_));
-}
-AsOfJoinTablesRequest::~AsOfJoinTablesRequest() {
-  // @@protoc_insertion_point(destructor:io.deephaven.proto.backplane.grpc.AsOfJoinTablesRequest)
-  _internal_metadata_.Delete<::google::protobuf::UnknownFieldSet>();
-  SharedDtor();
-}
-inline void AsOfJoinTablesRequest::SharedDtor() {
-  ABSL_DCHECK(GetArena() == nullptr);
-  delete _impl_.result_id_;
-  delete _impl_.left_id_;
-  delete _impl_.right_id_;
-  _impl_.~Impl_();
-}
-
-PROTOBUF_NOINLINE void AsOfJoinTablesRequest::Clear() {
-// @@protoc_insertion_point(message_clear_start:io.deephaven.proto.backplane.grpc.AsOfJoinTablesRequest)
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  ::uint32_t cached_has_bits = 0;
-  // Prevent compiler warnings about cached_has_bits being unused
-  (void) cached_has_bits;
-
-  _impl_.columns_to_match_.Clear();
-  _impl_.columns_to_add_.Clear();
-  cached_has_bits = _impl_._has_bits_[0];
-  if (cached_has_bits & 0x00000007u) {
-    if (cached_has_bits & 0x00000001u) {
-      ABSL_DCHECK(_impl_.result_id_ != nullptr);
-      _impl_.result_id_->Clear();
-    }
-    if (cached_has_bits & 0x00000002u) {
-      ABSL_DCHECK(_impl_.left_id_ != nullptr);
-      _impl_.left_id_->Clear();
-    }
-    if (cached_has_bits & 0x00000004u) {
-      ABSL_DCHECK(_impl_.right_id_ != nullptr);
-      _impl_.right_id_->Clear();
-    }
-  }
-  _impl_.as_of_match_rule_ = 0;
-  _impl_._has_bits_.Clear();
-  _internal_metadata_.Clear<::google::protobuf::UnknownFieldSet>();
-}
-
-const char* AsOfJoinTablesRequest::_InternalParse(
-    const char* ptr, ::_pbi::ParseContext* ctx) {
-  ptr = ::_pbi::TcParser::ParseLoop(this, ptr, ctx, &_table_.header);
-  return ptr;
-}
-
-
-PROTOBUF_CONSTINIT PROTOBUF_ATTRIBUTE_INIT_PRIORITY1
-const ::_pbi::TcParseTable<3, 6, 3, 94, 2> AsOfJoinTablesRequest::_table_ = {
-  {
-    PROTOBUF_FIELD_OFFSET(AsOfJoinTablesRequest, _impl_._has_bits_),
-    0, // no _extensions_
-    7, 56,  // max_field_number, fast_idx_mask
-    offsetof(decltype(_table_), field_lookup_table),
-    4294967200,  // skipmap
-    offsetof(decltype(_table_), field_entries),
-    6,  // num_field_entries
-    3,  // num_aux_entries
-    offsetof(decltype(_table_), aux_entries),
-    &_AsOfJoinTablesRequest_default_instance_._instance,
-    ::_pbi::TcParser::GenericFallback,  // fallback
-  }, {{
-    {::_pbi::TcParser::MiniParse, {}},
-    // .io.deephaven.proto.backplane.grpc.Ticket result_id = 1;
-    {::_pbi::TcParser::FastMtS1,
-     {10, 0, 0, PROTOBUF_FIELD_OFFSET(AsOfJoinTablesRequest, _impl_.result_id_)}},
-    // .io.deephaven.proto.backplane.grpc.TableReference left_id = 2;
-    {::_pbi::TcParser::FastMtS1,
-     {18, 1, 1, PROTOBUF_FIELD_OFFSET(AsOfJoinTablesRequest, _impl_.left_id_)}},
-    // .io.deephaven.proto.backplane.grpc.TableReference right_id = 3;
-    {::_pbi::TcParser::FastMtS1,
-     {26, 2, 2, PROTOBUF_FIELD_OFFSET(AsOfJoinTablesRequest, _impl_.right_id_)}},
-    // repeated string columns_to_match = 4;
-    {::_pbi::TcParser::FastUR1,
-     {34, 63, 0, PROTOBUF_FIELD_OFFSET(AsOfJoinTablesRequest, _impl_.columns_to_match_)}},
-    // repeated string columns_to_add = 5;
-    {::_pbi::TcParser::FastUR1,
-     {42, 63, 0, PROTOBUF_FIELD_OFFSET(AsOfJoinTablesRequest, _impl_.columns_to_add_)}},
-    {::_pbi::TcParser::MiniParse, {}},
-    // .io.deephaven.proto.backplane.grpc.AsOfJoinTablesRequest.MatchRule as_of_match_rule = 7;
-    {::_pbi::TcParser::SingularVarintNoZag1<::uint32_t, offsetof(AsOfJoinTablesRequest, _impl_.as_of_match_rule_), 63>(),
-     {56, 63, 0, PROTOBUF_FIELD_OFFSET(AsOfJoinTablesRequest, _impl_.as_of_match_rule_)}},
-  }}, {{
-    65535, 65535
-  }}, {{
-    // .io.deephaven.proto.backplane.grpc.Ticket result_id = 1;
-    {PROTOBUF_FIELD_OFFSET(AsOfJoinTablesRequest, _impl_.result_id_), _Internal::kHasBitsOffset + 0, 0,
-    (0 | ::_fl::kFcOptional | ::_fl::kMessage | ::_fl::kTvTable)},
-    // .io.deephaven.proto.backplane.grpc.TableReference left_id = 2;
-    {PROTOBUF_FIELD_OFFSET(AsOfJoinTablesRequest, _impl_.left_id_), _Internal::kHasBitsOffset + 1, 1,
-    (0 | ::_fl::kFcOptional | ::_fl::kMessage | ::_fl::kTvTable)},
-    // .io.deephaven.proto.backplane.grpc.TableReference right_id = 3;
-    {PROTOBUF_FIELD_OFFSET(AsOfJoinTablesRequest, _impl_.right_id_), _Internal::kHasBitsOffset + 2, 2,
-    (0 | ::_fl::kFcOptional | ::_fl::kMessage | ::_fl::kTvTable)},
-    // repeated string columns_to_match = 4;
-    {PROTOBUF_FIELD_OFFSET(AsOfJoinTablesRequest, _impl_.columns_to_match_), -1, 0,
-    (0 | ::_fl::kFcRepeated | ::_fl::kUtf8String | ::_fl::kRepSString)},
-    // repeated string columns_to_add = 5;
-    {PROTOBUF_FIELD_OFFSET(AsOfJoinTablesRequest, _impl_.columns_to_add_), -1, 0,
-    (0 | ::_fl::kFcRepeated | ::_fl::kUtf8String | ::_fl::kRepSString)},
-    // .io.deephaven.proto.backplane.grpc.AsOfJoinTablesRequest.MatchRule as_of_match_rule = 7;
-    {PROTOBUF_FIELD_OFFSET(AsOfJoinTablesRequest, _impl_.as_of_match_rule_), -1, 0,
-    (0 | ::_fl::kFcSingular | ::_fl::kOpenEnum)},
-  }}, {{
-    {::_pbi::TcParser::GetTable<::io::deephaven::proto::backplane::grpc::Ticket>()},
-    {::_pbi::TcParser::GetTable<::io::deephaven::proto::backplane::grpc::TableReference>()},
-    {::_pbi::TcParser::GetTable<::io::deephaven::proto::backplane::grpc::TableReference>()},
-  }}, {{
-    "\67\0\0\0\20\16\0\0"
-    "io.deephaven.proto.backplane.grpc.AsOfJoinTablesRequest"
-    "columns_to_match"
-    "columns_to_add"
-  }},
-};
-
-::uint8_t* AsOfJoinTablesRequest::_InternalSerialize(
-    ::uint8_t* target,
-    ::google::protobuf::io::EpsCopyOutputStream* stream) const {
-  // @@protoc_insertion_point(serialize_to_array_start:io.deephaven.proto.backplane.grpc.AsOfJoinTablesRequest)
-  ::uint32_t cached_has_bits = 0;
-  (void)cached_has_bits;
-
-  cached_has_bits = _impl_._has_bits_[0];
-  // .io.deephaven.proto.backplane.grpc.Ticket result_id = 1;
-  if (cached_has_bits & 0x00000001u) {
-    target = ::google::protobuf::internal::WireFormatLite::InternalWriteMessage(
-        1, _Internal::result_id(this),
-        _Internal::result_id(this).GetCachedSize(), target, stream);
-  }
-
-  // .io.deephaven.proto.backplane.grpc.TableReference left_id = 2;
-  if (cached_has_bits & 0x00000002u) {
-    target = ::google::protobuf::internal::WireFormatLite::InternalWriteMessage(
-        2, _Internal::left_id(this),
-        _Internal::left_id(this).GetCachedSize(), target, stream);
-  }
-
-  // .io.deephaven.proto.backplane.grpc.TableReference right_id = 3;
-  if (cached_has_bits & 0x00000004u) {
-    target = ::google::protobuf::internal::WireFormatLite::InternalWriteMessage(
-        3, _Internal::right_id(this),
-        _Internal::right_id(this).GetCachedSize(), target, stream);
-  }
-
-  // repeated string columns_to_match = 4;
-  for (int i = 0, n = this->_internal_columns_to_match_size(); i < n; ++i) {
-    const auto& s = this->_internal_columns_to_match().Get(i);
-    ::google::protobuf::internal::WireFormatLite::VerifyUtf8String(
-        s.data(), static_cast<int>(s.length()), ::google::protobuf::internal::WireFormatLite::SERIALIZE, "io.deephaven.proto.backplane.grpc.AsOfJoinTablesRequest.columns_to_match");
-    target = stream->WriteString(4, s, target);
-  }
-
-  // repeated string columns_to_add = 5;
-  for (int i = 0, n = this->_internal_columns_to_add_size(); i < n; ++i) {
-    const auto& s = this->_internal_columns_to_add().Get(i);
-    ::google::protobuf::internal::WireFormatLite::VerifyUtf8String(
-        s.data(), static_cast<int>(s.length()), ::google::protobuf::internal::WireFormatLite::SERIALIZE, "io.deephaven.proto.backplane.grpc.AsOfJoinTablesRequest.columns_to_add");
-    target = stream->WriteString(5, s, target);
-  }
-
-  // .io.deephaven.proto.backplane.grpc.AsOfJoinTablesRequest.MatchRule as_of_match_rule = 7;
-  if (this->_internal_as_of_match_rule() != 0) {
-    target = stream->EnsureSpace(target);
-    target = ::_pbi::WireFormatLite::WriteEnumToArray(
-        7, this->_internal_as_of_match_rule(), target);
-  }
-
-  if (PROTOBUF_PREDICT_FALSE(_internal_metadata_.have_unknown_fields())) {
-    target =
-        ::_pbi::WireFormat::InternalSerializeUnknownFieldsToArray(
-            _internal_metadata_.unknown_fields<::google::protobuf::UnknownFieldSet>(::google::protobuf::UnknownFieldSet::default_instance), target, stream);
-  }
-  // @@protoc_insertion_point(serialize_to_array_end:io.deephaven.proto.backplane.grpc.AsOfJoinTablesRequest)
-  return target;
-}
-
-::size_t AsOfJoinTablesRequest::ByteSizeLong() const {
-// @@protoc_insertion_point(message_byte_size_start:io.deephaven.proto.backplane.grpc.AsOfJoinTablesRequest)
-  ::size_t total_size = 0;
-
-  ::uint32_t cached_has_bits = 0;
-  // Prevent compiler warnings about cached_has_bits being unused
-  (void) cached_has_bits;
-
-  // repeated string columns_to_match = 4;
-  total_size += 1 * ::google::protobuf::internal::FromIntSize(_internal_columns_to_match().size());
-  for (int i = 0, n = _internal_columns_to_match().size(); i < n; ++i) {
-    total_size += ::google::protobuf::internal::WireFormatLite::StringSize(
-        _internal_columns_to_match().Get(i));
-  }
-  // repeated string columns_to_add = 5;
-  total_size += 1 * ::google::protobuf::internal::FromIntSize(_internal_columns_to_add().size());
-  for (int i = 0, n = _internal_columns_to_add().size(); i < n; ++i) {
-    total_size += ::google::protobuf::internal::WireFormatLite::StringSize(
-        _internal_columns_to_add().Get(i));
-  }
-  cached_has_bits = _impl_._has_bits_[0];
-  if (cached_has_bits & 0x00000007u) {
-    // .io.deephaven.proto.backplane.grpc.Ticket result_id = 1;
-    if (cached_has_bits & 0x00000001u) {
-      total_size +=
-          1 + ::google::protobuf::internal::WireFormatLite::MessageSize(*_impl_.result_id_);
-    }
-
-    // .io.deephaven.proto.backplane.grpc.TableReference left_id = 2;
-    if (cached_has_bits & 0x00000002u) {
-      total_size +=
-          1 + ::google::protobuf::internal::WireFormatLite::MessageSize(*_impl_.left_id_);
-    }
-
-    // .io.deephaven.proto.backplane.grpc.TableReference right_id = 3;
-    if (cached_has_bits & 0x00000004u) {
-      total_size +=
-          1 + ::google::protobuf::internal::WireFormatLite::MessageSize(*_impl_.right_id_);
-    }
-
-  }
-  // .io.deephaven.proto.backplane.grpc.AsOfJoinTablesRequest.MatchRule as_of_match_rule = 7;
-  if (this->_internal_as_of_match_rule() != 0) {
-    total_size += 1 +
-                  ::_pbi::WireFormatLite::EnumSize(this->_internal_as_of_match_rule());
-  }
-
-  return MaybeComputeUnknownFieldsSize(total_size, &_impl_._cached_size_);
-}
-
-const ::google::protobuf::Message::ClassData AsOfJoinTablesRequest::_class_data_ = {
-    AsOfJoinTablesRequest::MergeImpl,
-    nullptr,  // OnDemandRegisterArenaDtor
-};
-const ::google::protobuf::Message::ClassData* AsOfJoinTablesRequest::GetClassData() const {
-  return &_class_data_;
-}
-
-void AsOfJoinTablesRequest::MergeImpl(::google::protobuf::Message& to_msg, const ::google::protobuf::Message& from_msg) {
-  auto* const _this = static_cast<AsOfJoinTablesRequest*>(&to_msg);
-  auto& from = static_cast<const AsOfJoinTablesRequest&>(from_msg);
-  // @@protoc_insertion_point(class_specific_merge_from_start:io.deephaven.proto.backplane.grpc.AsOfJoinTablesRequest)
-  ABSL_DCHECK_NE(&from, _this);
-  ::uint32_t cached_has_bits = 0;
-  (void) cached_has_bits;
-
-  _this->_internal_mutable_columns_to_match()->MergeFrom(from._internal_columns_to_match());
-  _this->_internal_mutable_columns_to_add()->MergeFrom(from._internal_columns_to_add());
-  cached_has_bits = from._impl_._has_bits_[0];
-  if (cached_has_bits & 0x00000007u) {
-    if (cached_has_bits & 0x00000001u) {
-      _this->_internal_mutable_result_id()->::io::deephaven::proto::backplane::grpc::Ticket::MergeFrom(
-          from._internal_result_id());
-    }
-    if (cached_has_bits & 0x00000002u) {
-      _this->_internal_mutable_left_id()->::io::deephaven::proto::backplane::grpc::TableReference::MergeFrom(
-          from._internal_left_id());
-    }
-    if (cached_has_bits & 0x00000004u) {
-      _this->_internal_mutable_right_id()->::io::deephaven::proto::backplane::grpc::TableReference::MergeFrom(
-          from._internal_right_id());
-    }
-  }
-  if (from._internal_as_of_match_rule() != 0) {
-    _this->_internal_set_as_of_match_rule(from._internal_as_of_match_rule());
-  }
-  _this->_internal_metadata_.MergeFrom<::google::protobuf::UnknownFieldSet>(from._internal_metadata_);
-}
-
-void AsOfJoinTablesRequest::CopyFrom(const AsOfJoinTablesRequest& from) {
-// @@protoc_insertion_point(class_specific_copy_from_start:io.deephaven.proto.backplane.grpc.AsOfJoinTablesRequest)
-  if (&from == this) return;
-  Clear();
-  MergeFrom(from);
-}
-
-PROTOBUF_NOINLINE bool AsOfJoinTablesRequest::IsInitialized() const {
-  return true;
-}
-
-::_pbi::CachedSize* AsOfJoinTablesRequest::AccessCachedSize() const {
-  return &_impl_._cached_size_;
-}
-void AsOfJoinTablesRequest::InternalSwap(AsOfJoinTablesRequest* PROTOBUF_RESTRICT other) {
-  using std::swap;
-  _internal_metadata_.InternalSwap(&other->_internal_metadata_);
-  swap(_impl_._has_bits_[0], other->_impl_._has_bits_[0]);
-  _impl_.columns_to_match_.InternalSwap(&other->_impl_.columns_to_match_);
-  _impl_.columns_to_add_.InternalSwap(&other->_impl_.columns_to_add_);
-  ::google::protobuf::internal::memswap<
-      PROTOBUF_FIELD_OFFSET(AsOfJoinTablesRequest, _impl_.as_of_match_rule_)
-      + sizeof(AsOfJoinTablesRequest::_impl_.as_of_match_rule_)
-      - PROTOBUF_FIELD_OFFSET(AsOfJoinTablesRequest, _impl_.result_id_)>(
-          reinterpret_cast<char*>(&_impl_.result_id_),
-          reinterpret_cast<char*>(&other->_impl_.result_id_));
-}
-
-::google::protobuf::Metadata AsOfJoinTablesRequest::GetMetadata() const {
-  return ::_pbi::AssignDescriptors(
-      &descriptor_table_deephaven_2fproto_2ftable_2eproto_getter, &descriptor_table_deephaven_2fproto_2ftable_2eproto_once,
-      file_level_metadata_deephaven_2fproto_2ftable_2eproto[54]);
-}
-// ===================================================================
-
-class AjRajTablesRequest::_Internal {
- public:
-  using HasBits = decltype(std::declval<AjRajTablesRequest>()._impl_._has_bits_);
-  static constexpr ::int32_t kHasBitsOffset =
-    8 * PROTOBUF_FIELD_OFFSET(AjRajTablesRequest, _impl_._has_bits_);
-  static const ::io::deephaven::proto::backplane::grpc::Ticket& result_id(const AjRajTablesRequest* msg);
-  static void set_has_result_id(HasBits* has_bits) {
-    (*has_bits)[0] |= 1u;
-  }
-  static const ::io::deephaven::proto::backplane::grpc::TableReference& left_id(const AjRajTablesRequest* msg);
-  static void set_has_left_id(HasBits* has_bits) {
-    (*has_bits)[0] |= 2u;
-  }
-  static const ::io::deephaven::proto::backplane::grpc::TableReference& right_id(const AjRajTablesRequest* msg);
-  static void set_has_right_id(HasBits* has_bits) {
-    (*has_bits)[0] |= 4u;
-  }
-};
-
-const ::io::deephaven::proto::backplane::grpc::Ticket& AjRajTablesRequest::_Internal::result_id(const AjRajTablesRequest* msg) {
-  return *msg->_impl_.result_id_;
-}
-const ::io::deephaven::proto::backplane::grpc::TableReference& AjRajTablesRequest::_Internal::left_id(const AjRajTablesRequest* msg) {
-  return *msg->_impl_.left_id_;
-}
-const ::io::deephaven::proto::backplane::grpc::TableReference& AjRajTablesRequest::_Internal::right_id(const AjRajTablesRequest* msg) {
-  return *msg->_impl_.right_id_;
-}
-void AjRajTablesRequest::clear_result_id() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  if (_impl_.result_id_ != nullptr) _impl_.result_id_->Clear();
-  _impl_._has_bits_[0] &= ~0x00000001u;
-}
-AjRajTablesRequest::AjRajTablesRequest(::google::protobuf::Arena* arena)
-    : ::google::protobuf::Message(arena) {
-  SharedCtor(arena);
-  // @@protoc_insertion_point(arena_constructor:io.deephaven.proto.backplane.grpc.AjRajTablesRequest)
-}
-inline PROTOBUF_NDEBUG_INLINE AjRajTablesRequest::Impl_::Impl_(
-    ::google::protobuf::internal::InternalVisibility visibility, ::google::protobuf::Arena* arena,
-    const Impl_& from)
-      : _has_bits_{from._has_bits_},
-        _cached_size_{0},
-        exact_match_columns_{visibility, arena, from.exact_match_columns_},
-        columns_to_add_{visibility, arena, from.columns_to_add_},
-        as_of_column_(arena, from.as_of_column_) {}
-
-AjRajTablesRequest::AjRajTablesRequest(
-    ::google::protobuf::Arena* arena,
-    const AjRajTablesRequest& from)
-    : ::google::protobuf::Message(arena) {
-  AjRajTablesRequest* const _this = this;
-  (void)_this;
-  _internal_metadata_.MergeFrom<::google::protobuf::UnknownFieldSet>(
-      from._internal_metadata_);
-  new (&_impl_) Impl_(internal_visibility(), arena, from._impl_);
-  ::uint32_t cached_has_bits = _impl_._has_bits_[0];
-  _impl_.result_id_ = (cached_has_bits & 0x00000001u)
-                ? CreateMaybeMessage<::io::deephaven::proto::backplane::grpc::Ticket>(arena, *from._impl_.result_id_)
-                : nullptr;
-  _impl_.left_id_ = (cached_has_bits & 0x00000002u)
-                ? CreateMaybeMessage<::io::deephaven::proto::backplane::grpc::TableReference>(arena, *from._impl_.left_id_)
-                : nullptr;
-  _impl_.right_id_ = (cached_has_bits & 0x00000004u)
-                ? CreateMaybeMessage<::io::deephaven::proto::backplane::grpc::TableReference>(arena, *from._impl_.right_id_)
-                : nullptr;
-
-  // @@protoc_insertion_point(copy_constructor:io.deephaven.proto.backplane.grpc.AjRajTablesRequest)
-}
-inline PROTOBUF_NDEBUG_INLINE AjRajTablesRequest::Impl_::Impl_(
-    ::google::protobuf::internal::InternalVisibility visibility,
-    ::google::protobuf::Arena* arena)
-      : _cached_size_{0},
-        exact_match_columns_{visibility, arena},
-        columns_to_add_{visibility, arena},
-        as_of_column_(arena) {}
-
-inline void AjRajTablesRequest::SharedCtor(::_pb::Arena* arena) {
-  new (&_impl_) Impl_(internal_visibility(), arena);
-  ::memset(reinterpret_cast<char *>(&_impl_) +
-               offsetof(Impl_, result_id_),
-           0,
-           offsetof(Impl_, right_id_) -
-               offsetof(Impl_, result_id_) +
-               sizeof(Impl_::right_id_));
-}
-AjRajTablesRequest::~AjRajTablesRequest() {
-  // @@protoc_insertion_point(destructor:io.deephaven.proto.backplane.grpc.AjRajTablesRequest)
-  _internal_metadata_.Delete<::google::protobuf::UnknownFieldSet>();
-  SharedDtor();
-}
-inline void AjRajTablesRequest::SharedDtor() {
-  ABSL_DCHECK(GetArena() == nullptr);
-  _impl_.as_of_column_.Destroy();
-  delete _impl_.result_id_;
-  delete _impl_.left_id_;
-  delete _impl_.right_id_;
-  _impl_.~Impl_();
-}
-
-PROTOBUF_NOINLINE void AjRajTablesRequest::Clear() {
-// @@protoc_insertion_point(message_clear_start:io.deephaven.proto.backplane.grpc.AjRajTablesRequest)
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  ::uint32_t cached_has_bits = 0;
-  // Prevent compiler warnings about cached_has_bits being unused
-  (void) cached_has_bits;
-
-  _impl_.exact_match_columns_.Clear();
-  _impl_.columns_to_add_.Clear();
-  _impl_.as_of_column_.ClearToEmpty();
-  cached_has_bits = _impl_._has_bits_[0];
-  if (cached_has_bits & 0x00000007u) {
-    if (cached_has_bits & 0x00000001u) {
-      ABSL_DCHECK(_impl_.result_id_ != nullptr);
-      _impl_.result_id_->Clear();
-    }
-    if (cached_has_bits & 0x00000002u) {
-      ABSL_DCHECK(_impl_.left_id_ != nullptr);
-      _impl_.left_id_->Clear();
-    }
-    if (cached_has_bits & 0x00000004u) {
-      ABSL_DCHECK(_impl_.right_id_ != nullptr);
-      _impl_.right_id_->Clear();
-    }
-  }
-  _impl_._has_bits_.Clear();
-  _internal_metadata_.Clear<::google::protobuf::UnknownFieldSet>();
-}
-
-const char* AjRajTablesRequest::_InternalParse(
-    const char* ptr, ::_pbi::ParseContext* ctx) {
-  ptr = ::_pbi::TcParser::ParseLoop(this, ptr, ctx, &_table_.header);
-  return ptr;
-}
-
-
-PROTOBUF_CONSTINIT PROTOBUF_ATTRIBUTE_INIT_PRIORITY1
-const ::_pbi::TcParseTable<3, 6, 3, 106, 2> AjRajTablesRequest::_table_ = {
-  {
-    PROTOBUF_FIELD_OFFSET(AjRajTablesRequest, _impl_._has_bits_),
-    0, // no _extensions_
-    6, 56,  // max_field_number, fast_idx_mask
-    offsetof(decltype(_table_), field_lookup_table),
-    4294967232,  // skipmap
-    offsetof(decltype(_table_), field_entries),
-    6,  // num_field_entries
-    3,  // num_aux_entries
-    offsetof(decltype(_table_), aux_entries),
-    &_AjRajTablesRequest_default_instance_._instance,
-    ::_pbi::TcParser::GenericFallback,  // fallback
-  }, {{
-    {::_pbi::TcParser::MiniParse, {}},
-    // .io.deephaven.proto.backplane.grpc.Ticket result_id = 1;
-    {::_pbi::TcParser::FastMtS1,
-     {10, 0, 0, PROTOBUF_FIELD_OFFSET(AjRajTablesRequest, _impl_.result_id_)}},
-    // .io.deephaven.proto.backplane.grpc.TableReference left_id = 2;
-    {::_pbi::TcParser::FastMtS1,
-     {18, 1, 1, PROTOBUF_FIELD_OFFSET(AjRajTablesRequest, _impl_.left_id_)}},
-    // .io.deephaven.proto.backplane.grpc.TableReference right_id = 3;
-    {::_pbi::TcParser::FastMtS1,
-     {26, 2, 2, PROTOBUF_FIELD_OFFSET(AjRajTablesRequest, _impl_.right_id_)}},
-    // repeated string exact_match_columns = 4;
-    {::_pbi::TcParser::FastUR1,
-     {34, 63, 0, PROTOBUF_FIELD_OFFSET(AjRajTablesRequest, _impl_.exact_match_columns_)}},
-    // string as_of_column = 5;
-    {::_pbi::TcParser::FastUS1,
-     {42, 63, 0, PROTOBUF_FIELD_OFFSET(AjRajTablesRequest, _impl_.as_of_column_)}},
-    // repeated string columns_to_add = 6;
-    {::_pbi::TcParser::FastUR1,
-     {50, 63, 0, PROTOBUF_FIELD_OFFSET(AjRajTablesRequest, _impl_.columns_to_add_)}},
-    {::_pbi::TcParser::MiniParse, {}},
-  }}, {{
-    65535, 65535
-  }}, {{
-    // .io.deephaven.proto.backplane.grpc.Ticket result_id = 1;
-    {PROTOBUF_FIELD_OFFSET(AjRajTablesRequest, _impl_.result_id_), _Internal::kHasBitsOffset + 0, 0,
-    (0 | ::_fl::kFcOptional | ::_fl::kMessage | ::_fl::kTvTable)},
-    // .io.deephaven.proto.backplane.grpc.TableReference left_id = 2;
-    {PROTOBUF_FIELD_OFFSET(AjRajTablesRequest, _impl_.left_id_), _Internal::kHasBitsOffset + 1, 1,
-    (0 | ::_fl::kFcOptional | ::_fl::kMessage | ::_fl::kTvTable)},
-    // .io.deephaven.proto.backplane.grpc.TableReference right_id = 3;
-    {PROTOBUF_FIELD_OFFSET(AjRajTablesRequest, _impl_.right_id_), _Internal::kHasBitsOffset + 2, 2,
-    (0 | ::_fl::kFcOptional | ::_fl::kMessage | ::_fl::kTvTable)},
-    // repeated string exact_match_columns = 4;
-    {PROTOBUF_FIELD_OFFSET(AjRajTablesRequest, _impl_.exact_match_columns_), -1, 0,
-    (0 | ::_fl::kFcRepeated | ::_fl::kUtf8String | ::_fl::kRepSString)},
-    // string as_of_column = 5;
-    {PROTOBUF_FIELD_OFFSET(AjRajTablesRequest, _impl_.as_of_column_), -1, 0,
-    (0 | ::_fl::kFcSingular | ::_fl::kUtf8String | ::_fl::kRepAString)},
-    // repeated string columns_to_add = 6;
-    {PROTOBUF_FIELD_OFFSET(AjRajTablesRequest, _impl_.columns_to_add_), -1, 0,
-    (0 | ::_fl::kFcRepeated | ::_fl::kUtf8String | ::_fl::kRepSString)},
-  }}, {{
-    {::_pbi::TcParser::GetTable<::io::deephaven::proto::backplane::grpc::Ticket>()},
-    {::_pbi::TcParser::GetTable<::io::deephaven::proto::backplane::grpc::TableReference>()},
-    {::_pbi::TcParser::GetTable<::io::deephaven::proto::backplane::grpc::TableReference>()},
-  }}, {{
-    "\64\0\0\0\23\14\16\0"
-    "io.deephaven.proto.backplane.grpc.AjRajTablesRequest"
-    "exact_match_columns"
-    "as_of_column"
-    "columns_to_add"
-  }},
-};
-
-::uint8_t* AjRajTablesRequest::_InternalSerialize(
-    ::uint8_t* target,
-    ::google::protobuf::io::EpsCopyOutputStream* stream) const {
-  // @@protoc_insertion_point(serialize_to_array_start:io.deephaven.proto.backplane.grpc.AjRajTablesRequest)
-  ::uint32_t cached_has_bits = 0;
-  (void)cached_has_bits;
-
-  cached_has_bits = _impl_._has_bits_[0];
-  // .io.deephaven.proto.backplane.grpc.Ticket result_id = 1;
-  if (cached_has_bits & 0x00000001u) {
-    target = ::google::protobuf::internal::WireFormatLite::InternalWriteMessage(
-        1, _Internal::result_id(this),
-        _Internal::result_id(this).GetCachedSize(), target, stream);
-  }
-
-  // .io.deephaven.proto.backplane.grpc.TableReference left_id = 2;
-  if (cached_has_bits & 0x00000002u) {
-    target = ::google::protobuf::internal::WireFormatLite::InternalWriteMessage(
-        2, _Internal::left_id(this),
-        _Internal::left_id(this).GetCachedSize(), target, stream);
-  }
-
-  // .io.deephaven.proto.backplane.grpc.TableReference right_id = 3;
-  if (cached_has_bits & 0x00000004u) {
-    target = ::google::protobuf::internal::WireFormatLite::InternalWriteMessage(
-        3, _Internal::right_id(this),
-        _Internal::right_id(this).GetCachedSize(), target, stream);
-  }
-
-  // repeated string exact_match_columns = 4;
-  for (int i = 0, n = this->_internal_exact_match_columns_size(); i < n; ++i) {
-    const auto& s = this->_internal_exact_match_columns().Get(i);
-    ::google::protobuf::internal::WireFormatLite::VerifyUtf8String(
-        s.data(), static_cast<int>(s.length()), ::google::protobuf::internal::WireFormatLite::SERIALIZE, "io.deephaven.proto.backplane.grpc.AjRajTablesRequest.exact_match_columns");
-    target = stream->WriteString(4, s, target);
-  }
-
-  // string as_of_column = 5;
-  if (!this->_internal_as_of_column().empty()) {
-    const std::string& _s = this->_internal_as_of_column();
-    ::google::protobuf::internal::WireFormatLite::VerifyUtf8String(
-        _s.data(), static_cast<int>(_s.length()), ::google::protobuf::internal::WireFormatLite::SERIALIZE, "io.deephaven.proto.backplane.grpc.AjRajTablesRequest.as_of_column");
-    target = stream->WriteStringMaybeAliased(5, _s, target);
-  }
-
-  // repeated string columns_to_add = 6;
-  for (int i = 0, n = this->_internal_columns_to_add_size(); i < n; ++i) {
-    const auto& s = this->_internal_columns_to_add().Get(i);
-    ::google::protobuf::internal::WireFormatLite::VerifyUtf8String(
-        s.data(), static_cast<int>(s.length()), ::google::protobuf::internal::WireFormatLite::SERIALIZE, "io.deephaven.proto.backplane.grpc.AjRajTablesRequest.columns_to_add");
-    target = stream->WriteString(6, s, target);
-  }
-
-  if (PROTOBUF_PREDICT_FALSE(_internal_metadata_.have_unknown_fields())) {
-    target =
-        ::_pbi::WireFormat::InternalSerializeUnknownFieldsToArray(
-            _internal_metadata_.unknown_fields<::google::protobuf::UnknownFieldSet>(::google::protobuf::UnknownFieldSet::default_instance), target, stream);
-  }
-  // @@protoc_insertion_point(serialize_to_array_end:io.deephaven.proto.backplane.grpc.AjRajTablesRequest)
-  return target;
-}
-
-::size_t AjRajTablesRequest::ByteSizeLong() const {
-// @@protoc_insertion_point(message_byte_size_start:io.deephaven.proto.backplane.grpc.AjRajTablesRequest)
-  ::size_t total_size = 0;
-
-  ::uint32_t cached_has_bits = 0;
-  // Prevent compiler warnings about cached_has_bits being unused
-  (void) cached_has_bits;
-
-  // repeated string exact_match_columns = 4;
-  total_size += 1 * ::google::protobuf::internal::FromIntSize(_internal_exact_match_columns().size());
-  for (int i = 0, n = _internal_exact_match_columns().size(); i < n; ++i) {
-    total_size += ::google::protobuf::internal::WireFormatLite::StringSize(
-        _internal_exact_match_columns().Get(i));
-  }
-  // repeated string columns_to_add = 6;
-  total_size += 1 * ::google::protobuf::internal::FromIntSize(_internal_columns_to_add().size());
-  for (int i = 0, n = _internal_columns_to_add().size(); i < n; ++i) {
-    total_size += ::google::protobuf::internal::WireFormatLite::StringSize(
-        _internal_columns_to_add().Get(i));
-  }
-  // string as_of_column = 5;
-  if (!this->_internal_as_of_column().empty()) {
-    total_size += 1 + ::google::protobuf::internal::WireFormatLite::StringSize(
-                                    this->_internal_as_of_column());
-  }
-
-  cached_has_bits = _impl_._has_bits_[0];
-  if (cached_has_bits & 0x00000007u) {
-    // .io.deephaven.proto.backplane.grpc.Ticket result_id = 1;
-    if (cached_has_bits & 0x00000001u) {
-      total_size +=
-          1 + ::google::protobuf::internal::WireFormatLite::MessageSize(*_impl_.result_id_);
-    }
-
-    // .io.deephaven.proto.backplane.grpc.TableReference left_id = 2;
-    if (cached_has_bits & 0x00000002u) {
-      total_size +=
-          1 + ::google::protobuf::internal::WireFormatLite::MessageSize(*_impl_.left_id_);
-    }
-
-    // .io.deephaven.proto.backplane.grpc.TableReference right_id = 3;
-    if (cached_has_bits & 0x00000004u) {
-      total_size +=
-          1 + ::google::protobuf::internal::WireFormatLite::MessageSize(*_impl_.right_id_);
-    }
-
-  }
-  return MaybeComputeUnknownFieldsSize(total_size, &_impl_._cached_size_);
-}
-
-const ::google::protobuf::Message::ClassData AjRajTablesRequest::_class_data_ = {
-    AjRajTablesRequest::MergeImpl,
-    nullptr,  // OnDemandRegisterArenaDtor
-};
-const ::google::protobuf::Message::ClassData* AjRajTablesRequest::GetClassData() const {
-  return &_class_data_;
-}
-
-void AjRajTablesRequest::MergeImpl(::google::protobuf::Message& to_msg, const ::google::protobuf::Message& from_msg) {
-  auto* const _this = static_cast<AjRajTablesRequest*>(&to_msg);
-  auto& from = static_cast<const AjRajTablesRequest&>(from_msg);
-  // @@protoc_insertion_point(class_specific_merge_from_start:io.deephaven.proto.backplane.grpc.AjRajTablesRequest)
-  ABSL_DCHECK_NE(&from, _this);
-  ::uint32_t cached_has_bits = 0;
-  (void) cached_has_bits;
-
-  _this->_internal_mutable_exact_match_columns()->MergeFrom(from._internal_exact_match_columns());
-  _this->_internal_mutable_columns_to_add()->MergeFrom(from._internal_columns_to_add());
-  if (!from._internal_as_of_column().empty()) {
-    _this->_internal_set_as_of_column(from._internal_as_of_column());
-  }
-  cached_has_bits = from._impl_._has_bits_[0];
-  if (cached_has_bits & 0x00000007u) {
-    if (cached_has_bits & 0x00000001u) {
-      _this->_internal_mutable_result_id()->::io::deephaven::proto::backplane::grpc::Ticket::MergeFrom(
-          from._internal_result_id());
-    }
-    if (cached_has_bits & 0x00000002u) {
-      _this->_internal_mutable_left_id()->::io::deephaven::proto::backplane::grpc::TableReference::MergeFrom(
-          from._internal_left_id());
-    }
-    if (cached_has_bits & 0x00000004u) {
-      _this->_internal_mutable_right_id()->::io::deephaven::proto::backplane::grpc::TableReference::MergeFrom(
-          from._internal_right_id());
-    }
-  }
-  _this->_internal_metadata_.MergeFrom<::google::protobuf::UnknownFieldSet>(from._internal_metadata_);
-}
-
-void AjRajTablesRequest::CopyFrom(const AjRajTablesRequest& from) {
-// @@protoc_insertion_point(class_specific_copy_from_start:io.deephaven.proto.backplane.grpc.AjRajTablesRequest)
-  if (&from == this) return;
-  Clear();
-  MergeFrom(from);
-}
-
-PROTOBUF_NOINLINE bool AjRajTablesRequest::IsInitialized() const {
-  return true;
-}
-
-::_pbi::CachedSize* AjRajTablesRequest::AccessCachedSize() const {
-  return &_impl_._cached_size_;
-}
-void AjRajTablesRequest::InternalSwap(AjRajTablesRequest* PROTOBUF_RESTRICT other) {
-  using std::swap;
-  auto* arena = GetArena();
-  ABSL_DCHECK_EQ(arena, other->GetArena());
-  _internal_metadata_.InternalSwap(&other->_internal_metadata_);
-  swap(_impl_._has_bits_[0], other->_impl_._has_bits_[0]);
-  _impl_.exact_match_columns_.InternalSwap(&other->_impl_.exact_match_columns_);
-  _impl_.columns_to_add_.InternalSwap(&other->_impl_.columns_to_add_);
-  ::_pbi::ArenaStringPtr::InternalSwap(&_impl_.as_of_column_, &other->_impl_.as_of_column_, arena);
-  ::google::protobuf::internal::memswap<
-      PROTOBUF_FIELD_OFFSET(AjRajTablesRequest, _impl_.right_id_)
-      + sizeof(AjRajTablesRequest::_impl_.right_id_)
-      - PROTOBUF_FIELD_OFFSET(AjRajTablesRequest, _impl_.result_id_)>(
-          reinterpret_cast<char*>(&_impl_.result_id_),
-          reinterpret_cast<char*>(&other->_impl_.result_id_));
-}
-
-::google::protobuf::Metadata AjRajTablesRequest::GetMetadata() const {
-  return ::_pbi::AssignDescriptors(
-      &descriptor_table_deephaven_2fproto_2ftable_2eproto_getter, &descriptor_table_deephaven_2fproto_2ftable_2eproto_once,
-      file_level_metadata_deephaven_2fproto_2ftable_2eproto[55]);
-}
-// ===================================================================
-
-class MultiJoinInput::_Internal {
- public:
-  using HasBits = decltype(std::declval<MultiJoinInput>()._impl_._has_bits_);
-  static constexpr ::int32_t kHasBitsOffset =
-    8 * PROTOBUF_FIELD_OFFSET(MultiJoinInput, _impl_._has_bits_);
-  static const ::io::deephaven::proto::backplane::grpc::TableReference& source_id(const MultiJoinInput* msg);
-  static void set_has_source_id(HasBits* has_bits) {
-    (*has_bits)[0] |= 1u;
-  }
-};
-
-const ::io::deephaven::proto::backplane::grpc::TableReference& MultiJoinInput::_Internal::source_id(const MultiJoinInput* msg) {
-  return *msg->_impl_.source_id_;
-}
-MultiJoinInput::MultiJoinInput(::google::protobuf::Arena* arena)
-    : ::google::protobuf::Message(arena) {
-  SharedCtor(arena);
-  // @@protoc_insertion_point(arena_constructor:io.deephaven.proto.backplane.grpc.MultiJoinInput)
-}
-inline PROTOBUF_NDEBUG_INLINE MultiJoinInput::Impl_::Impl_(
-    ::google::protobuf::internal::InternalVisibility visibility, ::google::protobuf::Arena* arena,
-    const Impl_& from)
-      : _has_bits_{from._has_bits_},
-        _cached_size_{0},
-        columns_to_match_{visibility, arena, from.columns_to_match_},
-        columns_to_add_{visibility, arena, from.columns_to_add_} {}
-
-MultiJoinInput::MultiJoinInput(
-    ::google::protobuf::Arena* arena,
-    const MultiJoinInput& from)
-    : ::google::protobuf::Message(arena) {
-  MultiJoinInput* const _this = this;
-  (void)_this;
-  _internal_metadata_.MergeFrom<::google::protobuf::UnknownFieldSet>(
-      from._internal_metadata_);
-  new (&_impl_) Impl_(internal_visibility(), arena, from._impl_);
-  ::uint32_t cached_has_bits = _impl_._has_bits_[0];
-  _impl_.source_id_ = (cached_has_bits & 0x00000001u)
-                ? CreateMaybeMessage<::io::deephaven::proto::backplane::grpc::TableReference>(arena, *from._impl_.source_id_)
-                : nullptr;
-
-  // @@protoc_insertion_point(copy_constructor:io.deephaven.proto.backplane.grpc.MultiJoinInput)
-}
-inline PROTOBUF_NDEBUG_INLINE MultiJoinInput::Impl_::Impl_(
-    ::google::protobuf::internal::InternalVisibility visibility,
-    ::google::protobuf::Arena* arena)
-      : _cached_size_{0},
-        columns_to_match_{visibility, arena},
-        columns_to_add_{visibility, arena} {}
-
-inline void MultiJoinInput::SharedCtor(::_pb::Arena* arena) {
-  new (&_impl_) Impl_(internal_visibility(), arena);
-  _impl_.source_id_ = {};
-}
-MultiJoinInput::~MultiJoinInput() {
-  // @@protoc_insertion_point(destructor:io.deephaven.proto.backplane.grpc.MultiJoinInput)
-  _internal_metadata_.Delete<::google::protobuf::UnknownFieldSet>();
-  SharedDtor();
-}
-inline void MultiJoinInput::SharedDtor() {
-  ABSL_DCHECK(GetArena() == nullptr);
-  delete _impl_.source_id_;
-  _impl_.~Impl_();
-}
-
-PROTOBUF_NOINLINE void MultiJoinInput::Clear() {
-// @@protoc_insertion_point(message_clear_start:io.deephaven.proto.backplane.grpc.MultiJoinInput)
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  ::uint32_t cached_has_bits = 0;
-  // Prevent compiler warnings about cached_has_bits being unused
-  (void) cached_has_bits;
-
-  _impl_.columns_to_match_.Clear();
-  _impl_.columns_to_add_.Clear();
-  cached_has_bits = _impl_._has_bits_[0];
-  if (cached_has_bits & 0x00000001u) {
-    ABSL_DCHECK(_impl_.source_id_ != nullptr);
-    _impl_.source_id_->Clear();
-  }
-  _impl_._has_bits_.Clear();
-  _internal_metadata_.Clear<::google::protobuf::UnknownFieldSet>();
-}
-
-const char* MultiJoinInput::_InternalParse(
-    const char* ptr, ::_pbi::ParseContext* ctx) {
-  ptr = ::_pbi::TcParser::ParseLoop(this, ptr, ctx, &_table_.header);
-  return ptr;
-}
-
-
-PROTOBUF_CONSTINIT PROTOBUF_ATTRIBUTE_INIT_PRIORITY1
-const ::_pbi::TcParseTable<2, 3, 1, 87, 2> MultiJoinInput::_table_ = {
-  {
-    PROTOBUF_FIELD_OFFSET(MultiJoinInput, _impl_._has_bits_),
-    0, // no _extensions_
-    3, 24,  // max_field_number, fast_idx_mask
-    offsetof(decltype(_table_), field_lookup_table),
-    4294967288,  // skipmap
-    offsetof(decltype(_table_), field_entries),
-    3,  // num_field_entries
-    1,  // num_aux_entries
-    offsetof(decltype(_table_), aux_entries),
-    &_MultiJoinInput_default_instance_._instance,
-    ::_pbi::TcParser::GenericFallback,  // fallback
-  }, {{
-    {::_pbi::TcParser::MiniParse, {}},
-    // .io.deephaven.proto.backplane.grpc.TableReference source_id = 1;
-    {::_pbi::TcParser::FastMtS1,
-     {10, 0, 0, PROTOBUF_FIELD_OFFSET(MultiJoinInput, _impl_.source_id_)}},
-    // repeated string columns_to_match = 2;
-    {::_pbi::TcParser::FastUR1,
-     {18, 63, 0, PROTOBUF_FIELD_OFFSET(MultiJoinInput, _impl_.columns_to_match_)}},
-    // repeated string columns_to_add = 3;
-    {::_pbi::TcParser::FastUR1,
-     {26, 63, 0, PROTOBUF_FIELD_OFFSET(MultiJoinInput, _impl_.columns_to_add_)}},
-  }}, {{
-    65535, 65535
-  }}, {{
-    // .io.deephaven.proto.backplane.grpc.TableReference source_id = 1;
-    {PROTOBUF_FIELD_OFFSET(MultiJoinInput, _impl_.source_id_), _Internal::kHasBitsOffset + 0, 0,
-    (0 | ::_fl::kFcOptional | ::_fl::kMessage | ::_fl::kTvTable)},
-    // repeated string columns_to_match = 2;
-    {PROTOBUF_FIELD_OFFSET(MultiJoinInput, _impl_.columns_to_match_), -1, 0,
-    (0 | ::_fl::kFcRepeated | ::_fl::kUtf8String | ::_fl::kRepSString)},
-    // repeated string columns_to_add = 3;
-    {PROTOBUF_FIELD_OFFSET(MultiJoinInput, _impl_.columns_to_add_), -1, 0,
-    (0 | ::_fl::kFcRepeated | ::_fl::kUtf8String | ::_fl::kRepSString)},
-  }}, {{
-    {::_pbi::TcParser::GetTable<::io::deephaven::proto::backplane::grpc::TableReference>()},
-  }}, {{
-    "\60\0\20\16\0\0\0\0"
-    "io.deephaven.proto.backplane.grpc.MultiJoinInput"
-    "columns_to_match"
-    "columns_to_add"
-  }},
-};
-
-::uint8_t* MultiJoinInput::_InternalSerialize(
-    ::uint8_t* target,
-    ::google::protobuf::io::EpsCopyOutputStream* stream) const {
-  // @@protoc_insertion_point(serialize_to_array_start:io.deephaven.proto.backplane.grpc.MultiJoinInput)
-  ::uint32_t cached_has_bits = 0;
-  (void)cached_has_bits;
-
-  cached_has_bits = _impl_._has_bits_[0];
-  // .io.deephaven.proto.backplane.grpc.TableReference source_id = 1;
-  if (cached_has_bits & 0x00000001u) {
-    target = ::google::protobuf::internal::WireFormatLite::InternalWriteMessage(
-        1, _Internal::source_id(this),
-        _Internal::source_id(this).GetCachedSize(), target, stream);
-  }
-
-  // repeated string columns_to_match = 2;
-  for (int i = 0, n = this->_internal_columns_to_match_size(); i < n; ++i) {
-    const auto& s = this->_internal_columns_to_match().Get(i);
-    ::google::protobuf::internal::WireFormatLite::VerifyUtf8String(
-        s.data(), static_cast<int>(s.length()), ::google::protobuf::internal::WireFormatLite::SERIALIZE, "io.deephaven.proto.backplane.grpc.MultiJoinInput.columns_to_match");
-    target = stream->WriteString(2, s, target);
-  }
-
-  // repeated string columns_to_add = 3;
-  for (int i = 0, n = this->_internal_columns_to_add_size(); i < n; ++i) {
-    const auto& s = this->_internal_columns_to_add().Get(i);
-    ::google::protobuf::internal::WireFormatLite::VerifyUtf8String(
-        s.data(), static_cast<int>(s.length()), ::google::protobuf::internal::WireFormatLite::SERIALIZE, "io.deephaven.proto.backplane.grpc.MultiJoinInput.columns_to_add");
-    target = stream->WriteString(3, s, target);
-  }
-
-  if (PROTOBUF_PREDICT_FALSE(_internal_metadata_.have_unknown_fields())) {
-    target =
-        ::_pbi::WireFormat::InternalSerializeUnknownFieldsToArray(
-            _internal_metadata_.unknown_fields<::google::protobuf::UnknownFieldSet>(::google::protobuf::UnknownFieldSet::default_instance), target, stream);
-  }
-  // @@protoc_insertion_point(serialize_to_array_end:io.deephaven.proto.backplane.grpc.MultiJoinInput)
-  return target;
-}
-
-::size_t MultiJoinInput::ByteSizeLong() const {
-// @@protoc_insertion_point(message_byte_size_start:io.deephaven.proto.backplane.grpc.MultiJoinInput)
-  ::size_t total_size = 0;
-
-  ::uint32_t cached_has_bits = 0;
-  // Prevent compiler warnings about cached_has_bits being unused
-  (void) cached_has_bits;
-
-  // repeated string columns_to_match = 2;
-  total_size += 1 * ::google::protobuf::internal::FromIntSize(_internal_columns_to_match().size());
-  for (int i = 0, n = _internal_columns_to_match().size(); i < n; ++i) {
-    total_size += ::google::protobuf::internal::WireFormatLite::StringSize(
-        _internal_columns_to_match().Get(i));
-  }
-  // repeated string columns_to_add = 3;
-  total_size += 1 * ::google::protobuf::internal::FromIntSize(_internal_columns_to_add().size());
-  for (int i = 0, n = _internal_columns_to_add().size(); i < n; ++i) {
-    total_size += ::google::protobuf::internal::WireFormatLite::StringSize(
-        _internal_columns_to_add().Get(i));
-  }
-  // .io.deephaven.proto.backplane.grpc.TableReference source_id = 1;
-  cached_has_bits = _impl_._has_bits_[0];
-  if (cached_has_bits & 0x00000001u) {
-    total_size +=
-        1 + ::google::protobuf::internal::WireFormatLite::MessageSize(*_impl_.source_id_);
-  }
-
-  return MaybeComputeUnknownFieldsSize(total_size, &_impl_._cached_size_);
-}
-
-const ::google::protobuf::Message::ClassData MultiJoinInput::_class_data_ = {
-    MultiJoinInput::MergeImpl,
-    nullptr,  // OnDemandRegisterArenaDtor
-};
-const ::google::protobuf::Message::ClassData* MultiJoinInput::GetClassData() const {
-  return &_class_data_;
-}
-
-void MultiJoinInput::MergeImpl(::google::protobuf::Message& to_msg, const ::google::protobuf::Message& from_msg) {
-  auto* const _this = static_cast<MultiJoinInput*>(&to_msg);
-  auto& from = static_cast<const MultiJoinInput&>(from_msg);
-  // @@protoc_insertion_point(class_specific_merge_from_start:io.deephaven.proto.backplane.grpc.MultiJoinInput)
-  ABSL_DCHECK_NE(&from, _this);
-  ::uint32_t cached_has_bits = 0;
-  (void) cached_has_bits;
-
-  _this->_internal_mutable_columns_to_match()->MergeFrom(from._internal_columns_to_match());
-  _this->_internal_mutable_columns_to_add()->MergeFrom(from._internal_columns_to_add());
-  if ((from._impl_._has_bits_[0] & 0x00000001u) != 0) {
-    _this->_internal_mutable_source_id()->::io::deephaven::proto::backplane::grpc::TableReference::MergeFrom(
-        from._internal_source_id());
-  }
-  _this->_internal_metadata_.MergeFrom<::google::protobuf::UnknownFieldSet>(from._internal_metadata_);
-}
-
-void MultiJoinInput::CopyFrom(const MultiJoinInput& from) {
-// @@protoc_insertion_point(class_specific_copy_from_start:io.deephaven.proto.backplane.grpc.MultiJoinInput)
-  if (&from == this) return;
-  Clear();
-  MergeFrom(from);
-}
-
-PROTOBUF_NOINLINE bool MultiJoinInput::IsInitialized() const {
-  return true;
-}
-
-::_pbi::CachedSize* MultiJoinInput::AccessCachedSize() const {
-  return &_impl_._cached_size_;
-}
-void MultiJoinInput::InternalSwap(MultiJoinInput* PROTOBUF_RESTRICT other) {
-  using std::swap;
-  _internal_metadata_.InternalSwap(&other->_internal_metadata_);
-  swap(_impl_._has_bits_[0], other->_impl_._has_bits_[0]);
-  _impl_.columns_to_match_.InternalSwap(&other->_impl_.columns_to_match_);
-  _impl_.columns_to_add_.InternalSwap(&other->_impl_.columns_to_add_);
-  swap(_impl_.source_id_, other->_impl_.source_id_);
-}
-
-::google::protobuf::Metadata MultiJoinInput::GetMetadata() const {
-  return ::_pbi::AssignDescriptors(
-      &descriptor_table_deephaven_2fproto_2ftable_2eproto_getter, &descriptor_table_deephaven_2fproto_2ftable_2eproto_once,
-      file_level_metadata_deephaven_2fproto_2ftable_2eproto[56]);
-}
-// ===================================================================
-
-class MultiJoinTablesRequest::_Internal {
- public:
-  using HasBits = decltype(std::declval<MultiJoinTablesRequest>()._impl_._has_bits_);
-  static constexpr ::int32_t kHasBitsOffset =
-    8 * PROTOBUF_FIELD_OFFSET(MultiJoinTablesRequest, _impl_._has_bits_);
-  static const ::io::deephaven::proto::backplane::grpc::Ticket& result_id(const MultiJoinTablesRequest* msg);
-  static void set_has_result_id(HasBits* has_bits) {
-    (*has_bits)[0] |= 1u;
-  }
-};
-
-const ::io::deephaven::proto::backplane::grpc::Ticket& MultiJoinTablesRequest::_Internal::result_id(const MultiJoinTablesRequest* msg) {
-  return *msg->_impl_.result_id_;
-}
-void MultiJoinTablesRequest::clear_result_id() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  if (_impl_.result_id_ != nullptr) _impl_.result_id_->Clear();
-  _impl_._has_bits_[0] &= ~0x00000001u;
-}
-MultiJoinTablesRequest::MultiJoinTablesRequest(::google::protobuf::Arena* arena)
-    : ::google::protobuf::Message(arena) {
-  SharedCtor(arena);
-  // @@protoc_insertion_point(arena_constructor:io.deephaven.proto.backplane.grpc.MultiJoinTablesRequest)
-}
-inline PROTOBUF_NDEBUG_INLINE MultiJoinTablesRequest::Impl_::Impl_(
-    ::google::protobuf::internal::InternalVisibility visibility, ::google::protobuf::Arena* arena,
-    const Impl_& from)
-      : _has_bits_{from._has_bits_},
-        _cached_size_{0},
-        multi_join_inputs_{visibility, arena, from.multi_join_inputs_} {}
-
-MultiJoinTablesRequest::MultiJoinTablesRequest(
-    ::google::protobuf::Arena* arena,
-    const MultiJoinTablesRequest& from)
-    : ::google::protobuf::Message(arena) {
-  MultiJoinTablesRequest* const _this = this;
-  (void)_this;
-  _internal_metadata_.MergeFrom<::google::protobuf::UnknownFieldSet>(
-      from._internal_metadata_);
-  new (&_impl_) Impl_(internal_visibility(), arena, from._impl_);
-  ::uint32_t cached_has_bits = _impl_._has_bits_[0];
-  _impl_.result_id_ = (cached_has_bits & 0x00000001u)
-                ? CreateMaybeMessage<::io::deephaven::proto::backplane::grpc::Ticket>(arena, *from._impl_.result_id_)
-                : nullptr;
-
-  // @@protoc_insertion_point(copy_constructor:io.deephaven.proto.backplane.grpc.MultiJoinTablesRequest)
-}
-inline PROTOBUF_NDEBUG_INLINE MultiJoinTablesRequest::Impl_::Impl_(
-    ::google::protobuf::internal::InternalVisibility visibility,
-    ::google::protobuf::Arena* arena)
-      : _cached_size_{0},
-        multi_join_inputs_{visibility, arena} {}
-
-inline void MultiJoinTablesRequest::SharedCtor(::_pb::Arena* arena) {
-  new (&_impl_) Impl_(internal_visibility(), arena);
-  _impl_.result_id_ = {};
-}
-MultiJoinTablesRequest::~MultiJoinTablesRequest() {
-  // @@protoc_insertion_point(destructor:io.deephaven.proto.backplane.grpc.MultiJoinTablesRequest)
-  _internal_metadata_.Delete<::google::protobuf::UnknownFieldSet>();
-  SharedDtor();
-}
-inline void MultiJoinTablesRequest::SharedDtor() {
-  ABSL_DCHECK(GetArena() == nullptr);
-  delete _impl_.result_id_;
-  _impl_.~Impl_();
-}
-
-PROTOBUF_NOINLINE void MultiJoinTablesRequest::Clear() {
-// @@protoc_insertion_point(message_clear_start:io.deephaven.proto.backplane.grpc.MultiJoinTablesRequest)
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  ::uint32_t cached_has_bits = 0;
-  // Prevent compiler warnings about cached_has_bits being unused
-  (void) cached_has_bits;
-
-  _impl_.multi_join_inputs_.Clear();
-  cached_has_bits = _impl_._has_bits_[0];
-  if (cached_has_bits & 0x00000001u) {
-    ABSL_DCHECK(_impl_.result_id_ != nullptr);
-    _impl_.result_id_->Clear();
-  }
-  _impl_._has_bits_.Clear();
-  _internal_metadata_.Clear<::google::protobuf::UnknownFieldSet>();
-}
-
-const char* MultiJoinTablesRequest::_InternalParse(
-    const char* ptr, ::_pbi::ParseContext* ctx) {
-  ptr = ::_pbi::TcParser::ParseLoop(this, ptr, ctx, &_table_.header);
-  return ptr;
-}
-
-
-PROTOBUF_CONSTINIT PROTOBUF_ATTRIBUTE_INIT_PRIORITY1
-const ::_pbi::TcParseTable<1, 2, 2, 0, 2> MultiJoinTablesRequest::_table_ = {
-  {
-    PROTOBUF_FIELD_OFFSET(MultiJoinTablesRequest, _impl_._has_bits_),
-    0, // no _extensions_
-    2, 8,  // max_field_number, fast_idx_mask
-    offsetof(decltype(_table_), field_lookup_table),
-    4294967292,  // skipmap
-    offsetof(decltype(_table_), field_entries),
-    2,  // num_field_entries
-    2,  // num_aux_entries
-    offsetof(decltype(_table_), aux_entries),
-    &_MultiJoinTablesRequest_default_instance_._instance,
-    ::_pbi::TcParser::GenericFallback,  // fallback
-  }, {{
-    // repeated .io.deephaven.proto.backplane.grpc.MultiJoinInput multi_join_inputs = 2;
-    {::_pbi::TcParser::FastMtR1,
-     {18, 63, 1, PROTOBUF_FIELD_OFFSET(MultiJoinTablesRequest, _impl_.multi_join_inputs_)}},
-    // .io.deephaven.proto.backplane.grpc.Ticket result_id = 1;
-    {::_pbi::TcParser::FastMtS1,
-     {10, 0, 0, PROTOBUF_FIELD_OFFSET(MultiJoinTablesRequest, _impl_.result_id_)}},
-  }}, {{
-    65535, 65535
-  }}, {{
-    // .io.deephaven.proto.backplane.grpc.Ticket result_id = 1;
-    {PROTOBUF_FIELD_OFFSET(MultiJoinTablesRequest, _impl_.result_id_), _Internal::kHasBitsOffset + 0, 0,
-    (0 | ::_fl::kFcOptional | ::_fl::kMessage | ::_fl::kTvTable)},
-    // repeated .io.deephaven.proto.backplane.grpc.MultiJoinInput multi_join_inputs = 2;
-    {PROTOBUF_FIELD_OFFSET(MultiJoinTablesRequest, _impl_.multi_join_inputs_), -1, 1,
-    (0 | ::_fl::kFcRepeated | ::_fl::kMessage | ::_fl::kTvTable)},
-  }}, {{
-    {::_pbi::TcParser::GetTable<::io::deephaven::proto::backplane::grpc::Ticket>()},
-    {::_pbi::TcParser::GetTable<::io::deephaven::proto::backplane::grpc::MultiJoinInput>()},
-  }}, {{
-  }},
-};
-
-::uint8_t* MultiJoinTablesRequest::_InternalSerialize(
-    ::uint8_t* target,
-    ::google::protobuf::io::EpsCopyOutputStream* stream) const {
-  // @@protoc_insertion_point(serialize_to_array_start:io.deephaven.proto.backplane.grpc.MultiJoinTablesRequest)
-  ::uint32_t cached_has_bits = 0;
-  (void)cached_has_bits;
-
-  cached_has_bits = _impl_._has_bits_[0];
-  // .io.deephaven.proto.backplane.grpc.Ticket result_id = 1;
-  if (cached_has_bits & 0x00000001u) {
-    target = ::google::protobuf::internal::WireFormatLite::InternalWriteMessage(
-        1, _Internal::result_id(this),
-        _Internal::result_id(this).GetCachedSize(), target, stream);
-  }
-
-  // repeated .io.deephaven.proto.backplane.grpc.MultiJoinInput multi_join_inputs = 2;
-  for (unsigned i = 0,
-      n = static_cast<unsigned>(this->_internal_multi_join_inputs_size()); i < n; i++) {
-    const auto& repfield = this->_internal_multi_join_inputs().Get(i);
-    target = ::google::protobuf::internal::WireFormatLite::
-        InternalWriteMessage(2, repfield, repfield.GetCachedSize(), target, stream);
-  }
-
-  if (PROTOBUF_PREDICT_FALSE(_internal_metadata_.have_unknown_fields())) {
-    target =
-        ::_pbi::WireFormat::InternalSerializeUnknownFieldsToArray(
-            _internal_metadata_.unknown_fields<::google::protobuf::UnknownFieldSet>(::google::protobuf::UnknownFieldSet::default_instance), target, stream);
-  }
-  // @@protoc_insertion_point(serialize_to_array_end:io.deephaven.proto.backplane.grpc.MultiJoinTablesRequest)
-  return target;
-}
-
-::size_t MultiJoinTablesRequest::ByteSizeLong() const {
-// @@protoc_insertion_point(message_byte_size_start:io.deephaven.proto.backplane.grpc.MultiJoinTablesRequest)
-  ::size_t total_size = 0;
-
-  ::uint32_t cached_has_bits = 0;
-  // Prevent compiler warnings about cached_has_bits being unused
-  (void) cached_has_bits;
-
-  // repeated .io.deephaven.proto.backplane.grpc.MultiJoinInput multi_join_inputs = 2;
-  total_size += 1UL * this->_internal_multi_join_inputs_size();
-  for (const auto& msg : this->_internal_multi_join_inputs()) {
-    total_size +=
-      ::google::protobuf::internal::WireFormatLite::MessageSize(msg);
-  }
-  // .io.deephaven.proto.backplane.grpc.Ticket result_id = 1;
-  cached_has_bits = _impl_._has_bits_[0];
-  if (cached_has_bits & 0x00000001u) {
-    total_size +=
-        1 + ::google::protobuf::internal::WireFormatLite::MessageSize(*_impl_.result_id_);
-  }
-
-  return MaybeComputeUnknownFieldsSize(total_size, &_impl_._cached_size_);
-}
-
-const ::google::protobuf::Message::ClassData MultiJoinTablesRequest::_class_data_ = {
-    MultiJoinTablesRequest::MergeImpl,
-    nullptr,  // OnDemandRegisterArenaDtor
-};
-const ::google::protobuf::Message::ClassData* MultiJoinTablesRequest::GetClassData() const {
-  return &_class_data_;
-}
-
-void MultiJoinTablesRequest::MergeImpl(::google::protobuf::Message& to_msg, const ::google::protobuf::Message& from_msg) {
-  auto* const _this = static_cast<MultiJoinTablesRequest*>(&to_msg);
-  auto& from = static_cast<const MultiJoinTablesRequest&>(from_msg);
-  // @@protoc_insertion_point(class_specific_merge_from_start:io.deephaven.proto.backplane.grpc.MultiJoinTablesRequest)
-  ABSL_DCHECK_NE(&from, _this);
-  ::uint32_t cached_has_bits = 0;
-  (void) cached_has_bits;
-
-  _this->_internal_mutable_multi_join_inputs()->MergeFrom(
-      from._internal_multi_join_inputs());
-  if ((from._impl_._has_bits_[0] & 0x00000001u) != 0) {
-    _this->_internal_mutable_result_id()->::io::deephaven::proto::backplane::grpc::Ticket::MergeFrom(
-        from._internal_result_id());
-  }
-  _this->_internal_metadata_.MergeFrom<::google::protobuf::UnknownFieldSet>(from._internal_metadata_);
-}
-
-void MultiJoinTablesRequest::CopyFrom(const MultiJoinTablesRequest& from) {
-// @@protoc_insertion_point(class_specific_copy_from_start:io.deephaven.proto.backplane.grpc.MultiJoinTablesRequest)
-  if (&from == this) return;
-  Clear();
-  MergeFrom(from);
-}
-
-PROTOBUF_NOINLINE bool MultiJoinTablesRequest::IsInitialized() const {
-  return true;
-}
-
-::_pbi::CachedSize* MultiJoinTablesRequest::AccessCachedSize() const {
-  return &_impl_._cached_size_;
-}
-void MultiJoinTablesRequest::InternalSwap(MultiJoinTablesRequest* PROTOBUF_RESTRICT other) {
-  using std::swap;
-  _internal_metadata_.InternalSwap(&other->_internal_metadata_);
-  swap(_impl_._has_bits_[0], other->_impl_._has_bits_[0]);
-  _impl_.multi_join_inputs_.InternalSwap(&other->_impl_.multi_join_inputs_);
-  swap(_impl_.result_id_, other->_impl_.result_id_);
-}
-
-::google::protobuf::Metadata MultiJoinTablesRequest::GetMetadata() const {
-  return ::_pbi::AssignDescriptors(
-      &descriptor_table_deephaven_2fproto_2ftable_2eproto_getter, &descriptor_table_deephaven_2fproto_2ftable_2eproto_once,
-      file_level_metadata_deephaven_2fproto_2ftable_2eproto[57]);
-}
-// ===================================================================
-
-class RangeJoinTablesRequest::_Internal {
- public:
-  using HasBits = decltype(std::declval<RangeJoinTablesRequest>()._impl_._has_bits_);
-  static constexpr ::int32_t kHasBitsOffset =
-    8 * PROTOBUF_FIELD_OFFSET(RangeJoinTablesRequest, _impl_._has_bits_);
-  static const ::io::deephaven::proto::backplane::grpc::Ticket& result_id(const RangeJoinTablesRequest* msg);
-  static void set_has_result_id(HasBits* has_bits) {
-    (*has_bits)[0] |= 1u;
-  }
-  static const ::io::deephaven::proto::backplane::grpc::TableReference& left_id(const RangeJoinTablesRequest* msg);
-  static void set_has_left_id(HasBits* has_bits) {
-    (*has_bits)[0] |= 2u;
-  }
-  static const ::io::deephaven::proto::backplane::grpc::TableReference& right_id(const RangeJoinTablesRequest* msg);
-  static void set_has_right_id(HasBits* has_bits) {
-    (*has_bits)[0] |= 4u;
-  }
-};
-
-const ::io::deephaven::proto::backplane::grpc::Ticket& RangeJoinTablesRequest::_Internal::result_id(const RangeJoinTablesRequest* msg) {
-  return *msg->_impl_.result_id_;
-}
-const ::io::deephaven::proto::backplane::grpc::TableReference& RangeJoinTablesRequest::_Internal::left_id(const RangeJoinTablesRequest* msg) {
-  return *msg->_impl_.left_id_;
-}
-const ::io::deephaven::proto::backplane::grpc::TableReference& RangeJoinTablesRequest::_Internal::right_id(const RangeJoinTablesRequest* msg) {
-  return *msg->_impl_.right_id_;
-}
-void RangeJoinTablesRequest::clear_result_id() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  if (_impl_.result_id_ != nullptr) _impl_.result_id_->Clear();
-  _impl_._has_bits_[0] &= ~0x00000001u;
-}
-RangeJoinTablesRequest::RangeJoinTablesRequest(::google::protobuf::Arena* arena)
-    : ::google::protobuf::Message(arena) {
-  SharedCtor(arena);
-  // @@protoc_insertion_point(arena_constructor:io.deephaven.proto.backplane.grpc.RangeJoinTablesRequest)
-}
-inline PROTOBUF_NDEBUG_INLINE RangeJoinTablesRequest::Impl_::Impl_(
-    ::google::protobuf::internal::InternalVisibility visibility, ::google::protobuf::Arena* arena,
-    const Impl_& from)
-      : _has_bits_{from._has_bits_},
-        _cached_size_{0},
-        exact_match_columns_{visibility, arena, from.exact_match_columns_},
-        aggregations_{visibility, arena, from.aggregations_},
-        left_start_column_(arena, from.left_start_column_),
-        right_range_column_(arena, from.right_range_column_),
-        left_end_column_(arena, from.left_end_column_),
-        range_match_(arena, from.range_match_) {}
-
-RangeJoinTablesRequest::RangeJoinTablesRequest(
-    ::google::protobuf::Arena* arena,
-    const RangeJoinTablesRequest& from)
-    : ::google::protobuf::Message(arena) {
-  RangeJoinTablesRequest* const _this = this;
-  (void)_this;
-  _internal_metadata_.MergeFrom<::google::protobuf::UnknownFieldSet>(
-      from._internal_metadata_);
-  new (&_impl_) Impl_(internal_visibility(), arena, from._impl_);
-  ::uint32_t cached_has_bits = _impl_._has_bits_[0];
-  _impl_.result_id_ = (cached_has_bits & 0x00000001u)
-                ? CreateMaybeMessage<::io::deephaven::proto::backplane::grpc::Ticket>(arena, *from._impl_.result_id_)
-                : nullptr;
-  _impl_.left_id_ = (cached_has_bits & 0x00000002u)
-                ? CreateMaybeMessage<::io::deephaven::proto::backplane::grpc::TableReference>(arena, *from._impl_.left_id_)
-                : nullptr;
-  _impl_.right_id_ = (cached_has_bits & 0x00000004u)
-                ? CreateMaybeMessage<::io::deephaven::proto::backplane::grpc::TableReference>(arena, *from._impl_.right_id_)
-                : nullptr;
-  ::memcpy(reinterpret_cast<char *>(&_impl_) +
-               offsetof(Impl_, range_start_rule_),
-           reinterpret_cast<const char *>(&from._impl_) +
-               offsetof(Impl_, range_start_rule_),
-           offsetof(Impl_, range_end_rule_) -
-               offsetof(Impl_, range_start_rule_) +
-               sizeof(Impl_::range_end_rule_));
-
-  // @@protoc_insertion_point(copy_constructor:io.deephaven.proto.backplane.grpc.RangeJoinTablesRequest)
-}
-inline PROTOBUF_NDEBUG_INLINE RangeJoinTablesRequest::Impl_::Impl_(
-    ::google::protobuf::internal::InternalVisibility visibility,
-    ::google::protobuf::Arena* arena)
-      : _cached_size_{0},
-        exact_match_columns_{visibility, arena},
-        aggregations_{visibility, arena},
-        left_start_column_(arena),
-        right_range_column_(arena),
-        left_end_column_(arena),
-        range_match_(arena) {}
-
-inline void RangeJoinTablesRequest::SharedCtor(::_pb::Arena* arena) {
-  new (&_impl_) Impl_(internal_visibility(), arena);
-  ::memset(reinterpret_cast<char *>(&_impl_) +
-               offsetof(Impl_, result_id_),
-           0,
-           offsetof(Impl_, range_end_rule_) -
-               offsetof(Impl_, result_id_) +
-               sizeof(Impl_::range_end_rule_));
-}
-RangeJoinTablesRequest::~RangeJoinTablesRequest() {
-  // @@protoc_insertion_point(destructor:io.deephaven.proto.backplane.grpc.RangeJoinTablesRequest)
-  _internal_metadata_.Delete<::google::protobuf::UnknownFieldSet>();
-  SharedDtor();
-}
-inline void RangeJoinTablesRequest::SharedDtor() {
-  ABSL_DCHECK(GetArena() == nullptr);
-  _impl_.left_start_column_.Destroy();
-  _impl_.right_range_column_.Destroy();
-  _impl_.left_end_column_.Destroy();
-  _impl_.range_match_.Destroy();
-  delete _impl_.result_id_;
-  delete _impl_.left_id_;
-  delete _impl_.right_id_;
-  _impl_.~Impl_();
-}
-
-PROTOBUF_NOINLINE void RangeJoinTablesRequest::Clear() {
-// @@protoc_insertion_point(message_clear_start:io.deephaven.proto.backplane.grpc.RangeJoinTablesRequest)
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  ::uint32_t cached_has_bits = 0;
-  // Prevent compiler warnings about cached_has_bits being unused
-  (void) cached_has_bits;
-
-  _impl_.exact_match_columns_.Clear();
-  _impl_.aggregations_.Clear();
-  _impl_.left_start_column_.ClearToEmpty();
-  _impl_.right_range_column_.ClearToEmpty();
-  _impl_.left_end_column_.ClearToEmpty();
-  _impl_.range_match_.ClearToEmpty();
-  cached_has_bits = _impl_._has_bits_[0];
-  if (cached_has_bits & 0x00000007u) {
-    if (cached_has_bits & 0x00000001u) {
-      ABSL_DCHECK(_impl_.result_id_ != nullptr);
-      _impl_.result_id_->Clear();
-    }
-    if (cached_has_bits & 0x00000002u) {
-      ABSL_DCHECK(_impl_.left_id_ != nullptr);
-      _impl_.left_id_->Clear();
-    }
-    if (cached_has_bits & 0x00000004u) {
-      ABSL_DCHECK(_impl_.right_id_ != nullptr);
-      _impl_.right_id_->Clear();
-    }
-  }
-  ::memset(&_impl_.range_start_rule_, 0, static_cast<::size_t>(
-      reinterpret_cast<char*>(&_impl_.range_end_rule_) -
-      reinterpret_cast<char*>(&_impl_.range_start_rule_)) + sizeof(_impl_.range_end_rule_));
-  _impl_._has_bits_.Clear();
-  _internal_metadata_.Clear<::google::protobuf::UnknownFieldSet>();
-}
-
-const char* RangeJoinTablesRequest::_InternalParse(
-    const char* ptr, ::_pbi::ParseContext* ctx) {
-  ptr = ::_pbi::TcParser::ParseLoop(this, ptr, ctx, &_table_.header);
-  return ptr;
-}
-
-
-PROTOBUF_CONSTINIT PROTOBUF_ATTRIBUTE_INIT_PRIORITY1
-const ::_pbi::TcParseTable<4, 11, 4, 153, 2> RangeJoinTablesRequest::_table_ = {
-  {
-    PROTOBUF_FIELD_OFFSET(RangeJoinTablesRequest, _impl_._has_bits_),
-    0, // no _extensions_
-    11, 120,  // max_field_number, fast_idx_mask
-    offsetof(decltype(_table_), field_lookup_table),
-    4294965248,  // skipmap
-    offsetof(decltype(_table_), field_entries),
-    11,  // num_field_entries
-    4,  // num_aux_entries
-    offsetof(decltype(_table_), aux_entries),
-    &_RangeJoinTablesRequest_default_instance_._instance,
-    ::_pbi::TcParser::GenericFallback,  // fallback
-  }, {{
-    {::_pbi::TcParser::MiniParse, {}},
-    // .io.deephaven.proto.backplane.grpc.Ticket result_id = 1;
-    {::_pbi::TcParser::FastMtS1,
-     {10, 0, 0, PROTOBUF_FIELD_OFFSET(RangeJoinTablesRequest, _impl_.result_id_)}},
-    // .io.deephaven.proto.backplane.grpc.TableReference left_id = 2;
-    {::_pbi::TcParser::FastMtS1,
-     {18, 1, 1, PROTOBUF_FIELD_OFFSET(RangeJoinTablesRequest, _impl_.left_id_)}},
-    // .io.deephaven.proto.backplane.grpc.TableReference right_id = 3;
-    {::_pbi::TcParser::FastMtS1,
-     {26, 2, 2, PROTOBUF_FIELD_OFFSET(RangeJoinTablesRequest, _impl_.right_id_)}},
-    // repeated string exact_match_columns = 4;
-    {::_pbi::TcParser::FastUR1,
-     {34, 63, 0, PROTOBUF_FIELD_OFFSET(RangeJoinTablesRequest, _impl_.exact_match_columns_)}},
-    // string left_start_column = 5;
-    {::_pbi::TcParser::FastUS1,
-     {42, 63, 0, PROTOBUF_FIELD_OFFSET(RangeJoinTablesRequest, _impl_.left_start_column_)}},
-    // .io.deephaven.proto.backplane.grpc.RangeJoinTablesRequest.RangeStartRule range_start_rule = 6;
-    {::_pbi::TcParser::SingularVarintNoZag1<::uint32_t, offsetof(RangeJoinTablesRequest, _impl_.range_start_rule_), 63>(),
-     {48, 63, 0, PROTOBUF_FIELD_OFFSET(RangeJoinTablesRequest, _impl_.range_start_rule_)}},
-    // string right_range_column = 7;
-    {::_pbi::TcParser::FastUS1,
-     {58, 63, 0, PROTOBUF_FIELD_OFFSET(RangeJoinTablesRequest, _impl_.right_range_column_)}},
-    // .io.deephaven.proto.backplane.grpc.RangeJoinTablesRequest.RangeEndRule range_end_rule = 8;
-    {::_pbi::TcParser::SingularVarintNoZag1<::uint32_t, offsetof(RangeJoinTablesRequest, _impl_.range_end_rule_), 63>(),
-     {64, 63, 0, PROTOBUF_FIELD_OFFSET(RangeJoinTablesRequest, _impl_.range_end_rule_)}},
-    // string left_end_column = 9;
-    {::_pbi::TcParser::FastUS1,
-     {74, 63, 0, PROTOBUF_FIELD_OFFSET(RangeJoinTablesRequest, _impl_.left_end_column_)}},
-    // repeated .io.deephaven.proto.backplane.grpc.Aggregation aggregations = 10;
-    {::_pbi::TcParser::FastMtR1,
-     {82, 63, 3, PROTOBUF_FIELD_OFFSET(RangeJoinTablesRequest, _impl_.aggregations_)}},
-    // string range_match = 11;
-    {::_pbi::TcParser::FastUS1,
-     {90, 63, 0, PROTOBUF_FIELD_OFFSET(RangeJoinTablesRequest, _impl_.range_match_)}},
-    {::_pbi::TcParser::MiniParse, {}},
-    {::_pbi::TcParser::MiniParse, {}},
-    {::_pbi::TcParser::MiniParse, {}},
-    {::_pbi::TcParser::MiniParse, {}},
-  }}, {{
-    65535, 65535
-  }}, {{
-    // .io.deephaven.proto.backplane.grpc.Ticket result_id = 1;
-    {PROTOBUF_FIELD_OFFSET(RangeJoinTablesRequest, _impl_.result_id_), _Internal::kHasBitsOffset + 0, 0,
-    (0 | ::_fl::kFcOptional | ::_fl::kMessage | ::_fl::kTvTable)},
-    // .io.deephaven.proto.backplane.grpc.TableReference left_id = 2;
-    {PROTOBUF_FIELD_OFFSET(RangeJoinTablesRequest, _impl_.left_id_), _Internal::kHasBitsOffset + 1, 1,
-    (0 | ::_fl::kFcOptional | ::_fl::kMessage | ::_fl::kTvTable)},
-    // .io.deephaven.proto.backplane.grpc.TableReference right_id = 3;
-    {PROTOBUF_FIELD_OFFSET(RangeJoinTablesRequest, _impl_.right_id_), _Internal::kHasBitsOffset + 2, 2,
-    (0 | ::_fl::kFcOptional | ::_fl::kMessage | ::_fl::kTvTable)},
-    // repeated string exact_match_columns = 4;
-    {PROTOBUF_FIELD_OFFSET(RangeJoinTablesRequest, _impl_.exact_match_columns_), -1, 0,
-    (0 | ::_fl::kFcRepeated | ::_fl::kUtf8String | ::_fl::kRepSString)},
-    // string left_start_column = 5;
-    {PROTOBUF_FIELD_OFFSET(RangeJoinTablesRequest, _impl_.left_start_column_), -1, 0,
-    (0 | ::_fl::kFcSingular | ::_fl::kUtf8String | ::_fl::kRepAString)},
-    // .io.deephaven.proto.backplane.grpc.RangeJoinTablesRequest.RangeStartRule range_start_rule = 6;
-    {PROTOBUF_FIELD_OFFSET(RangeJoinTablesRequest, _impl_.range_start_rule_), -1, 0,
-    (0 | ::_fl::kFcSingular | ::_fl::kOpenEnum)},
-    // string right_range_column = 7;
-    {PROTOBUF_FIELD_OFFSET(RangeJoinTablesRequest, _impl_.right_range_column_), -1, 0,
-    (0 | ::_fl::kFcSingular | ::_fl::kUtf8String | ::_fl::kRepAString)},
-    // .io.deephaven.proto.backplane.grpc.RangeJoinTablesRequest.RangeEndRule range_end_rule = 8;
-    {PROTOBUF_FIELD_OFFSET(RangeJoinTablesRequest, _impl_.range_end_rule_), -1, 0,
-    (0 | ::_fl::kFcSingular | ::_fl::kOpenEnum)},
-    // string left_end_column = 9;
-    {PROTOBUF_FIELD_OFFSET(RangeJoinTablesRequest, _impl_.left_end_column_), -1, 0,
-    (0 | ::_fl::kFcSingular | ::_fl::kUtf8String | ::_fl::kRepAString)},
-    // repeated .io.deephaven.proto.backplane.grpc.Aggregation aggregations = 10;
-    {PROTOBUF_FIELD_OFFSET(RangeJoinTablesRequest, _impl_.aggregations_), -1, 3,
-    (0 | ::_fl::kFcRepeated | ::_fl::kMessage | ::_fl::kTvTable)},
-    // string range_match = 11;
-    {PROTOBUF_FIELD_OFFSET(RangeJoinTablesRequest, _impl_.range_match_), -1, 0,
-    (0 | ::_fl::kFcSingular | ::_fl::kUtf8String | ::_fl::kRepAString)},
-  }}, {{
-    {::_pbi::TcParser::GetTable<::io::deephaven::proto::backplane::grpc::Ticket>()},
-    {::_pbi::TcParser::GetTable<::io::deephaven::proto::backplane::grpc::TableReference>()},
-    {::_pbi::TcParser::GetTable<::io::deephaven::proto::backplane::grpc::TableReference>()},
-    {::_pbi::TcParser::GetTable<::io::deephaven::proto::backplane::grpc::Aggregation>()},
-  }}, {{
-    "\70\0\0\0\23\21\0\22\0\17\0\13\0\0\0\0"
-    "io.deephaven.proto.backplane.grpc.RangeJoinTablesRequest"
-    "exact_match_columns"
-    "left_start_column"
-    "right_range_column"
-    "left_end_column"
-    "range_match"
-  }},
-};
-
-::uint8_t* RangeJoinTablesRequest::_InternalSerialize(
-    ::uint8_t* target,
-    ::google::protobuf::io::EpsCopyOutputStream* stream) const {
-  // @@protoc_insertion_point(serialize_to_array_start:io.deephaven.proto.backplane.grpc.RangeJoinTablesRequest)
-  ::uint32_t cached_has_bits = 0;
-  (void)cached_has_bits;
-
-  cached_has_bits = _impl_._has_bits_[0];
-  // .io.deephaven.proto.backplane.grpc.Ticket result_id = 1;
-  if (cached_has_bits & 0x00000001u) {
-    target = ::google::protobuf::internal::WireFormatLite::InternalWriteMessage(
-        1, _Internal::result_id(this),
-        _Internal::result_id(this).GetCachedSize(), target, stream);
-  }
-
-  // .io.deephaven.proto.backplane.grpc.TableReference left_id = 2;
-  if (cached_has_bits & 0x00000002u) {
-    target = ::google::protobuf::internal::WireFormatLite::InternalWriteMessage(
-        2, _Internal::left_id(this),
-        _Internal::left_id(this).GetCachedSize(), target, stream);
-  }
-
-  // .io.deephaven.proto.backplane.grpc.TableReference right_id = 3;
-  if (cached_has_bits & 0x00000004u) {
-    target = ::google::protobuf::internal::WireFormatLite::InternalWriteMessage(
-        3, _Internal::right_id(this),
-        _Internal::right_id(this).GetCachedSize(), target, stream);
-  }
-
-  // repeated string exact_match_columns = 4;
-  for (int i = 0, n = this->_internal_exact_match_columns_size(); i < n; ++i) {
-    const auto& s = this->_internal_exact_match_columns().Get(i);
-    ::google::protobuf::internal::WireFormatLite::VerifyUtf8String(
-        s.data(), static_cast<int>(s.length()), ::google::protobuf::internal::WireFormatLite::SERIALIZE, "io.deephaven.proto.backplane.grpc.RangeJoinTablesRequest.exact_match_columns");
-    target = stream->WriteString(4, s, target);
-  }
-
-  // string left_start_column = 5;
-  if (!this->_internal_left_start_column().empty()) {
-    const std::string& _s = this->_internal_left_start_column();
-    ::google::protobuf::internal::WireFormatLite::VerifyUtf8String(
-        _s.data(), static_cast<int>(_s.length()), ::google::protobuf::internal::WireFormatLite::SERIALIZE, "io.deephaven.proto.backplane.grpc.RangeJoinTablesRequest.left_start_column");
-    target = stream->WriteStringMaybeAliased(5, _s, target);
-  }
-
-  // .io.deephaven.proto.backplane.grpc.RangeJoinTablesRequest.RangeStartRule range_start_rule = 6;
-  if (this->_internal_range_start_rule() != 0) {
-    target = stream->EnsureSpace(target);
-    target = ::_pbi::WireFormatLite::WriteEnumToArray(
-        6, this->_internal_range_start_rule(), target);
-  }
-
-  // string right_range_column = 7;
-  if (!this->_internal_right_range_column().empty()) {
-    const std::string& _s = this->_internal_right_range_column();
-    ::google::protobuf::internal::WireFormatLite::VerifyUtf8String(
-        _s.data(), static_cast<int>(_s.length()), ::google::protobuf::internal::WireFormatLite::SERIALIZE, "io.deephaven.proto.backplane.grpc.RangeJoinTablesRequest.right_range_column");
-    target = stream->WriteStringMaybeAliased(7, _s, target);
-  }
-
-  // .io.deephaven.proto.backplane.grpc.RangeJoinTablesRequest.RangeEndRule range_end_rule = 8;
-  if (this->_internal_range_end_rule() != 0) {
-    target = stream->EnsureSpace(target);
-    target = ::_pbi::WireFormatLite::WriteEnumToArray(
-        8, this->_internal_range_end_rule(), target);
-  }
-
-  // string left_end_column = 9;
-  if (!this->_internal_left_end_column().empty()) {
-    const std::string& _s = this->_internal_left_end_column();
-    ::google::protobuf::internal::WireFormatLite::VerifyUtf8String(
-        _s.data(), static_cast<int>(_s.length()), ::google::protobuf::internal::WireFormatLite::SERIALIZE, "io.deephaven.proto.backplane.grpc.RangeJoinTablesRequest.left_end_column");
-    target = stream->WriteStringMaybeAliased(9, _s, target);
-  }
-
-  // repeated .io.deephaven.proto.backplane.grpc.Aggregation aggregations = 10;
-  for (unsigned i = 0,
-      n = static_cast<unsigned>(this->_internal_aggregations_size()); i < n; i++) {
-    const auto& repfield = this->_internal_aggregations().Get(i);
-    target = ::google::protobuf::internal::WireFormatLite::
-        InternalWriteMessage(10, repfield, repfield.GetCachedSize(), target, stream);
-  }
-
-  // string range_match = 11;
-  if (!this->_internal_range_match().empty()) {
-    const std::string& _s = this->_internal_range_match();
-    ::google::protobuf::internal::WireFormatLite::VerifyUtf8String(
-        _s.data(), static_cast<int>(_s.length()), ::google::protobuf::internal::WireFormatLite::SERIALIZE, "io.deephaven.proto.backplane.grpc.RangeJoinTablesRequest.range_match");
-    target = stream->WriteStringMaybeAliased(11, _s, target);
-  }
-
-  if (PROTOBUF_PREDICT_FALSE(_internal_metadata_.have_unknown_fields())) {
-    target =
-        ::_pbi::WireFormat::InternalSerializeUnknownFieldsToArray(
-            _internal_metadata_.unknown_fields<::google::protobuf::UnknownFieldSet>(::google::protobuf::UnknownFieldSet::default_instance), target, stream);
-  }
-  // @@protoc_insertion_point(serialize_to_array_end:io.deephaven.proto.backplane.grpc.RangeJoinTablesRequest)
-  return target;
-}
-
-::size_t RangeJoinTablesRequest::ByteSizeLong() const {
-// @@protoc_insertion_point(message_byte_size_start:io.deephaven.proto.backplane.grpc.RangeJoinTablesRequest)
-  ::size_t total_size = 0;
-
-  ::uint32_t cached_has_bits = 0;
-  // Prevent compiler warnings about cached_has_bits being unused
-  (void) cached_has_bits;
-
-  // repeated string exact_match_columns = 4;
-  total_size += 1 * ::google::protobuf::internal::FromIntSize(_internal_exact_match_columns().size());
-  for (int i = 0, n = _internal_exact_match_columns().size(); i < n; ++i) {
-    total_size += ::google::protobuf::internal::WireFormatLite::StringSize(
-        _internal_exact_match_columns().Get(i));
-  }
-  // repeated .io.deephaven.proto.backplane.grpc.Aggregation aggregations = 10;
-  total_size += 1UL * this->_internal_aggregations_size();
-  for (const auto& msg : this->_internal_aggregations()) {
-    total_size +=
-      ::google::protobuf::internal::WireFormatLite::MessageSize(msg);
-  }
-  // string left_start_column = 5;
-  if (!this->_internal_left_start_column().empty()) {
-    total_size += 1 + ::google::protobuf::internal::WireFormatLite::StringSize(
-                                    this->_internal_left_start_column());
-  }
-
-  // string right_range_column = 7;
-  if (!this->_internal_right_range_column().empty()) {
-    total_size += 1 + ::google::protobuf::internal::WireFormatLite::StringSize(
-                                    this->_internal_right_range_column());
-  }
-
-  // string left_end_column = 9;
-  if (!this->_internal_left_end_column().empty()) {
-    total_size += 1 + ::google::protobuf::internal::WireFormatLite::StringSize(
-                                    this->_internal_left_end_column());
-  }
-
-  // string range_match = 11;
-  if (!this->_internal_range_match().empty()) {
-    total_size += 1 + ::google::protobuf::internal::WireFormatLite::StringSize(
-                                    this->_internal_range_match());
-  }
-
-  cached_has_bits = _impl_._has_bits_[0];
-  if (cached_has_bits & 0x00000007u) {
-    // .io.deephaven.proto.backplane.grpc.Ticket result_id = 1;
-    if (cached_has_bits & 0x00000001u) {
-      total_size +=
-          1 + ::google::protobuf::internal::WireFormatLite::MessageSize(*_impl_.result_id_);
-    }
-
-    // .io.deephaven.proto.backplane.grpc.TableReference left_id = 2;
-    if (cached_has_bits & 0x00000002u) {
-      total_size +=
-          1 + ::google::protobuf::internal::WireFormatLite::MessageSize(*_impl_.left_id_);
-    }
-
-    // .io.deephaven.proto.backplane.grpc.TableReference right_id = 3;
-    if (cached_has_bits & 0x00000004u) {
-      total_size +=
-          1 + ::google::protobuf::internal::WireFormatLite::MessageSize(*_impl_.right_id_);
-    }
-
-  }
-  // .io.deephaven.proto.backplane.grpc.RangeJoinTablesRequest.RangeStartRule range_start_rule = 6;
-  if (this->_internal_range_start_rule() != 0) {
-    total_size += 1 +
-                  ::_pbi::WireFormatLite::EnumSize(this->_internal_range_start_rule());
-  }
-
-  // .io.deephaven.proto.backplane.grpc.RangeJoinTablesRequest.RangeEndRule range_end_rule = 8;
-  if (this->_internal_range_end_rule() != 0) {
-    total_size += 1 +
-                  ::_pbi::WireFormatLite::EnumSize(this->_internal_range_end_rule());
-  }
-
-  return MaybeComputeUnknownFieldsSize(total_size, &_impl_._cached_size_);
-}
-
-const ::google::protobuf::Message::ClassData RangeJoinTablesRequest::_class_data_ = {
-    RangeJoinTablesRequest::MergeImpl,
-    nullptr,  // OnDemandRegisterArenaDtor
-};
-const ::google::protobuf::Message::ClassData* RangeJoinTablesRequest::GetClassData() const {
-  return &_class_data_;
-}
-
-void RangeJoinTablesRequest::MergeImpl(::google::protobuf::Message& to_msg, const ::google::protobuf::Message& from_msg) {
-  auto* const _this = static_cast<RangeJoinTablesRequest*>(&to_msg);
-  auto& from = static_cast<const RangeJoinTablesRequest&>(from_msg);
-  // @@protoc_insertion_point(class_specific_merge_from_start:io.deephaven.proto.backplane.grpc.RangeJoinTablesRequest)
-  ABSL_DCHECK_NE(&from, _this);
-  ::uint32_t cached_has_bits = 0;
-  (void) cached_has_bits;
-
-  _this->_internal_mutable_exact_match_columns()->MergeFrom(from._internal_exact_match_columns());
-  _this->_internal_mutable_aggregations()->MergeFrom(
-      from._internal_aggregations());
-  if (!from._internal_left_start_column().empty()) {
-    _this->_internal_set_left_start_column(from._internal_left_start_column());
-  }
-  if (!from._internal_right_range_column().empty()) {
-    _this->_internal_set_right_range_column(from._internal_right_range_column());
-  }
-  if (!from._internal_left_end_column().empty()) {
-    _this->_internal_set_left_end_column(from._internal_left_end_column());
-  }
-  if (!from._internal_range_match().empty()) {
-    _this->_internal_set_range_match(from._internal_range_match());
-  }
-  cached_has_bits = from._impl_._has_bits_[0];
-  if (cached_has_bits & 0x00000007u) {
-    if (cached_has_bits & 0x00000001u) {
-      _this->_internal_mutable_result_id()->::io::deephaven::proto::backplane::grpc::Ticket::MergeFrom(
-          from._internal_result_id());
-    }
-    if (cached_has_bits & 0x00000002u) {
-      _this->_internal_mutable_left_id()->::io::deephaven::proto::backplane::grpc::TableReference::MergeFrom(
-          from._internal_left_id());
-    }
-    if (cached_has_bits & 0x00000004u) {
-      _this->_internal_mutable_right_id()->::io::deephaven::proto::backplane::grpc::TableReference::MergeFrom(
-          from._internal_right_id());
-    }
-  }
-  if (from._internal_range_start_rule() != 0) {
-    _this->_internal_set_range_start_rule(from._internal_range_start_rule());
-  }
-  if (from._internal_range_end_rule() != 0) {
-    _this->_internal_set_range_end_rule(from._internal_range_end_rule());
-  }
-  _this->_internal_metadata_.MergeFrom<::google::protobuf::UnknownFieldSet>(from._internal_metadata_);
-}
-
-void RangeJoinTablesRequest::CopyFrom(const RangeJoinTablesRequest& from) {
-// @@protoc_insertion_point(class_specific_copy_from_start:io.deephaven.proto.backplane.grpc.RangeJoinTablesRequest)
-  if (&from == this) return;
-  Clear();
-  MergeFrom(from);
-}
-
-PROTOBUF_NOINLINE bool RangeJoinTablesRequest::IsInitialized() const {
-  return true;
-}
-
-::_pbi::CachedSize* RangeJoinTablesRequest::AccessCachedSize() const {
-  return &_impl_._cached_size_;
-}
-void RangeJoinTablesRequest::InternalSwap(RangeJoinTablesRequest* PROTOBUF_RESTRICT other) {
-  using std::swap;
-  auto* arena = GetArena();
-  ABSL_DCHECK_EQ(arena, other->GetArena());
-  _internal_metadata_.InternalSwap(&other->_internal_metadata_);
-  swap(_impl_._has_bits_[0], other->_impl_._has_bits_[0]);
-  _impl_.exact_match_columns_.InternalSwap(&other->_impl_.exact_match_columns_);
-  _impl_.aggregations_.InternalSwap(&other->_impl_.aggregations_);
-  ::_pbi::ArenaStringPtr::InternalSwap(&_impl_.left_start_column_, &other->_impl_.left_start_column_, arena);
-  ::_pbi::ArenaStringPtr::InternalSwap(&_impl_.right_range_column_, &other->_impl_.right_range_column_, arena);
-  ::_pbi::ArenaStringPtr::InternalSwap(&_impl_.left_end_column_, &other->_impl_.left_end_column_, arena);
-  ::_pbi::ArenaStringPtr::InternalSwap(&_impl_.range_match_, &other->_impl_.range_match_, arena);
-  ::google::protobuf::internal::memswap<
-      PROTOBUF_FIELD_OFFSET(RangeJoinTablesRequest, _impl_.range_end_rule_)
-      + sizeof(RangeJoinTablesRequest::_impl_.range_end_rule_)
-      - PROTOBUF_FIELD_OFFSET(RangeJoinTablesRequest, _impl_.result_id_)>(
-          reinterpret_cast<char*>(&_impl_.result_id_),
-          reinterpret_cast<char*>(&other->_impl_.result_id_));
-}
-
-::google::protobuf::Metadata RangeJoinTablesRequest::GetMetadata() const {
-  return ::_pbi::AssignDescriptors(
-      &descriptor_table_deephaven_2fproto_2ftable_2eproto_getter, &descriptor_table_deephaven_2fproto_2ftable_2eproto_once,
-      file_level_metadata_deephaven_2fproto_2ftable_2eproto[58]);
-}
-// ===================================================================
-
-class ComboAggregateRequest_Aggregate::_Internal {
- public:
-};
-
-ComboAggregateRequest_Aggregate::ComboAggregateRequest_Aggregate(::google::protobuf::Arena* arena)
-    : ::google::protobuf::Message(arena) {
-  SharedCtor(arena);
-  // @@protoc_insertion_point(arena_constructor:io.deephaven.proto.backplane.grpc.ComboAggregateRequest.Aggregate)
-}
-inline PROTOBUF_NDEBUG_INLINE ComboAggregateRequest_Aggregate::Impl_::Impl_(
-    ::google::protobuf::internal::InternalVisibility visibility, ::google::protobuf::Arena* arena,
-    const Impl_& from)
-      : match_pairs_{visibility, arena, from.match_pairs_},
-        column_name_(arena, from.column_name_),
-        _cached_size_{0} {}
-
-ComboAggregateRequest_Aggregate::ComboAggregateRequest_Aggregate(
-    ::google::protobuf::Arena* arena,
-    const ComboAggregateRequest_Aggregate& from)
-    : ::google::protobuf::Message(arena) {
-  ComboAggregateRequest_Aggregate* const _this = this;
-  (void)_this;
-  _internal_metadata_.MergeFrom<::google::protobuf::UnknownFieldSet>(
-      from._internal_metadata_);
-  new (&_impl_) Impl_(internal_visibility(), arena, from._impl_);
-  ::memcpy(reinterpret_cast<char *>(&_impl_) +
-               offsetof(Impl_, type_),
-           reinterpret_cast<const char *>(&from._impl_) +
-               offsetof(Impl_, type_),
-           offsetof(Impl_, percentile_) -
-               offsetof(Impl_, type_) +
-               sizeof(Impl_::percentile_));
-
-  // @@protoc_insertion_point(copy_constructor:io.deephaven.proto.backplane.grpc.ComboAggregateRequest.Aggregate)
-}
-inline PROTOBUF_NDEBUG_INLINE ComboAggregateRequest_Aggregate::Impl_::Impl_(
-    ::google::protobuf::internal::InternalVisibility visibility,
-    ::google::protobuf::Arena* arena)
-      : match_pairs_{visibility, arena},
-        column_name_(arena),
-        _cached_size_{0} {}
-
-inline void ComboAggregateRequest_Aggregate::SharedCtor(::_pb::Arena* arena) {
-  new (&_impl_) Impl_(internal_visibility(), arena);
-  ::memset(reinterpret_cast<char *>(&_impl_) +
-               offsetof(Impl_, type_),
-           0,
-           offsetof(Impl_, percentile_) -
-               offsetof(Impl_, type_) +
-               sizeof(Impl_::percentile_));
-}
-ComboAggregateRequest_Aggregate::~ComboAggregateRequest_Aggregate() {
-  // @@protoc_insertion_point(destructor:io.deephaven.proto.backplane.grpc.ComboAggregateRequest.Aggregate)
-  _internal_metadata_.Delete<::google::protobuf::UnknownFieldSet>();
-  SharedDtor();
-}
-inline void ComboAggregateRequest_Aggregate::SharedDtor() {
-  ABSL_DCHECK(GetArena() == nullptr);
-  _impl_.column_name_.Destroy();
-  _impl_.~Impl_();
-}
-
-PROTOBUF_NOINLINE void ComboAggregateRequest_Aggregate::Clear() {
-// @@protoc_insertion_point(message_clear_start:io.deephaven.proto.backplane.grpc.ComboAggregateRequest.Aggregate)
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  ::uint32_t cached_has_bits = 0;
-  // Prevent compiler warnings about cached_has_bits being unused
-  (void) cached_has_bits;
-
-  _impl_.match_pairs_.Clear();
-  _impl_.column_name_.ClearToEmpty();
-  ::memset(&_impl_.type_, 0, static_cast<::size_t>(
-      reinterpret_cast<char*>(&_impl_.percentile_) -
-      reinterpret_cast<char*>(&_impl_.type_)) + sizeof(_impl_.percentile_));
-  _internal_metadata_.Clear<::google::protobuf::UnknownFieldSet>();
-}
-
-const char* ComboAggregateRequest_Aggregate::_InternalParse(
-    const char* ptr, ::_pbi::ParseContext* ctx) {
-  ptr = ::_pbi::TcParser::ParseLoop(this, ptr, ctx, &_table_.header);
-  return ptr;
-}
-
-
-PROTOBUF_CONSTINIT PROTOBUF_ATTRIBUTE_INIT_PRIORITY1
-const ::_pbi::TcParseTable<3, 5, 0, 96, 2> ComboAggregateRequest_Aggregate::_table_ = {
-  {
-    0,  // no _has_bits_
-    0, // no _extensions_
-    5, 56,  // max_field_number, fast_idx_mask
-    offsetof(decltype(_table_), field_lookup_table),
-    4294967264,  // skipmap
-    offsetof(decltype(_table_), field_entries),
-    5,  // num_field_entries
-    0,  // num_aux_entries
-    offsetof(decltype(_table_), field_names),  // no aux_entries
-    &_ComboAggregateRequest_Aggregate_default_instance_._instance,
-    ::_pbi::TcParser::GenericFallback,  // fallback
-  }, {{
-    {::_pbi::TcParser::MiniParse, {}},
-    // .io.deephaven.proto.backplane.grpc.ComboAggregateRequest.AggType type = 1;
-    {::_pbi::TcParser::SingularVarintNoZag1<::uint32_t, offsetof(ComboAggregateRequest_Aggregate, _impl_.type_), 63>(),
-     {8, 63, 0, PROTOBUF_FIELD_OFFSET(ComboAggregateRequest_Aggregate, _impl_.type_)}},
-    // repeated string match_pairs = 2;
-    {::_pbi::TcParser::FastUR1,
-     {18, 63, 0, PROTOBUF_FIELD_OFFSET(ComboAggregateRequest_Aggregate, _impl_.match_pairs_)}},
-    // string column_name = 3;
-    {::_pbi::TcParser::FastUS1,
-     {26, 63, 0, PROTOBUF_FIELD_OFFSET(ComboAggregateRequest_Aggregate, _impl_.column_name_)}},
-    // double percentile = 4;
-    {::_pbi::TcParser::FastF64S1,
-     {33, 63, 0, PROTOBUF_FIELD_OFFSET(ComboAggregateRequest_Aggregate, _impl_.percentile_)}},
-    // bool avg_median = 5;
-    {::_pbi::TcParser::SingularVarintNoZag1<bool, offsetof(ComboAggregateRequest_Aggregate, _impl_.avg_median_), 63>(),
-     {40, 63, 0, PROTOBUF_FIELD_OFFSET(ComboAggregateRequest_Aggregate, _impl_.avg_median_)}},
-    {::_pbi::TcParser::MiniParse, {}},
-    {::_pbi::TcParser::MiniParse, {}},
-  }}, {{
-    65535, 65535
-  }}, {{
-    // .io.deephaven.proto.backplane.grpc.ComboAggregateRequest.AggType type = 1;
-    {PROTOBUF_FIELD_OFFSET(ComboAggregateRequest_Aggregate, _impl_.type_), 0, 0,
-    (0 | ::_fl::kFcSingular | ::_fl::kOpenEnum)},
-    // repeated string match_pairs = 2;
-    {PROTOBUF_FIELD_OFFSET(ComboAggregateRequest_Aggregate, _impl_.match_pairs_), 0, 0,
-    (0 | ::_fl::kFcRepeated | ::_fl::kUtf8String | ::_fl::kRepSString)},
-    // string column_name = 3;
-    {PROTOBUF_FIELD_OFFSET(ComboAggregateRequest_Aggregate, _impl_.column_name_), 0, 0,
-    (0 | ::_fl::kFcSingular | ::_fl::kUtf8String | ::_fl::kRepAString)},
-    // double percentile = 4;
-    {PROTOBUF_FIELD_OFFSET(ComboAggregateRequest_Aggregate, _impl_.percentile_), 0, 0,
-    (0 | ::_fl::kFcSingular | ::_fl::kDouble)},
-    // bool avg_median = 5;
-    {PROTOBUF_FIELD_OFFSET(ComboAggregateRequest_Aggregate, _impl_.avg_median_), 0, 0,
-    (0 | ::_fl::kFcSingular | ::_fl::kBool)},
-  }},
-  // no aux_entries
-  {{
-    "\101\0\13\13\0\0\0\0"
-    "io.deephaven.proto.backplane.grpc.ComboAggregateRequest.Aggregate"
-    "match_pairs"
-    "column_name"
-  }},
-};
-
-::uint8_t* ComboAggregateRequest_Aggregate::_InternalSerialize(
-    ::uint8_t* target,
-    ::google::protobuf::io::EpsCopyOutputStream* stream) const {
-  // @@protoc_insertion_point(serialize_to_array_start:io.deephaven.proto.backplane.grpc.ComboAggregateRequest.Aggregate)
-  ::uint32_t cached_has_bits = 0;
-  (void)cached_has_bits;
-
-  // .io.deephaven.proto.backplane.grpc.ComboAggregateRequest.AggType type = 1;
-  if (this->_internal_type() != 0) {
-    target = stream->EnsureSpace(target);
-    target = ::_pbi::WireFormatLite::WriteEnumToArray(
-        1, this->_internal_type(), target);
-  }
-
-  // repeated string match_pairs = 2;
-  for (int i = 0, n = this->_internal_match_pairs_size(); i < n; ++i) {
-    const auto& s = this->_internal_match_pairs().Get(i);
-    ::google::protobuf::internal::WireFormatLite::VerifyUtf8String(
-        s.data(), static_cast<int>(s.length()), ::google::protobuf::internal::WireFormatLite::SERIALIZE, "io.deephaven.proto.backplane.grpc.ComboAggregateRequest.Aggregate.match_pairs");
-    target = stream->WriteString(2, s, target);
-  }
-
-  // string column_name = 3;
-  if (!this->_internal_column_name().empty()) {
-    const std::string& _s = this->_internal_column_name();
-    ::google::protobuf::internal::WireFormatLite::VerifyUtf8String(
-        _s.data(), static_cast<int>(_s.length()), ::google::protobuf::internal::WireFormatLite::SERIALIZE, "io.deephaven.proto.backplane.grpc.ComboAggregateRequest.Aggregate.column_name");
-    target = stream->WriteStringMaybeAliased(3, _s, target);
-  }
-
-  // double percentile = 4;
-  static_assert(sizeof(::uint64_t) == sizeof(double),
-                "Code assumes ::uint64_t and double are the same size.");
-  double tmp_percentile = this->_internal_percentile();
-  ::uint64_t raw_percentile;
-  memcpy(&raw_percentile, &tmp_percentile, sizeof(tmp_percentile));
-  if (raw_percentile != 0) {
-    target = stream->EnsureSpace(target);
-    target = ::_pbi::WireFormatLite::WriteDoubleToArray(
-        4, this->_internal_percentile(), target);
-  }
-
-  // bool avg_median = 5;
-  if (this->_internal_avg_median() != 0) {
-    target = stream->EnsureSpace(target);
-    target = ::_pbi::WireFormatLite::WriteBoolToArray(
-        5, this->_internal_avg_median(), target);
-  }
-
-  if (PROTOBUF_PREDICT_FALSE(_internal_metadata_.have_unknown_fields())) {
-    target =
-        ::_pbi::WireFormat::InternalSerializeUnknownFieldsToArray(
-            _internal_metadata_.unknown_fields<::google::protobuf::UnknownFieldSet>(::google::protobuf::UnknownFieldSet::default_instance), target, stream);
-  }
-  // @@protoc_insertion_point(serialize_to_array_end:io.deephaven.proto.backplane.grpc.ComboAggregateRequest.Aggregate)
-  return target;
-}
-
-::size_t ComboAggregateRequest_Aggregate::ByteSizeLong() const {
-// @@protoc_insertion_point(message_byte_size_start:io.deephaven.proto.backplane.grpc.ComboAggregateRequest.Aggregate)
-  ::size_t total_size = 0;
-
-  ::uint32_t cached_has_bits = 0;
-  // Prevent compiler warnings about cached_has_bits being unused
-  (void) cached_has_bits;
-
-  // repeated string match_pairs = 2;
-  total_size += 1 * ::google::protobuf::internal::FromIntSize(_internal_match_pairs().size());
-  for (int i = 0, n = _internal_match_pairs().size(); i < n; ++i) {
-    total_size += ::google::protobuf::internal::WireFormatLite::StringSize(
-        _internal_match_pairs().Get(i));
-  }
-  // string column_name = 3;
-  if (!this->_internal_column_name().empty()) {
-    total_size += 1 + ::google::protobuf::internal::WireFormatLite::StringSize(
-                                    this->_internal_column_name());
-  }
-
-  // .io.deephaven.proto.backplane.grpc.ComboAggregateRequest.AggType type = 1;
-  if (this->_internal_type() != 0) {
-    total_size += 1 +
-                  ::_pbi::WireFormatLite::EnumSize(this->_internal_type());
-  }
-
-  // bool avg_median = 5;
-  if (this->_internal_avg_median() != 0) {
-    total_size += 2;
-  }
-
-  // double percentile = 4;
-  static_assert(sizeof(::uint64_t) == sizeof(double),
-                "Code assumes ::uint64_t and double are the same size.");
-  double tmp_percentile = this->_internal_percentile();
-  ::uint64_t raw_percentile;
-  memcpy(&raw_percentile, &tmp_percentile, sizeof(tmp_percentile));
-  if (raw_percentile != 0) {
-    total_size += 9;
-  }
-
-  return MaybeComputeUnknownFieldsSize(total_size, &_impl_._cached_size_);
-}
-
-const ::google::protobuf::Message::ClassData ComboAggregateRequest_Aggregate::_class_data_ = {
-    ComboAggregateRequest_Aggregate::MergeImpl,
-    nullptr,  // OnDemandRegisterArenaDtor
-};
-const ::google::protobuf::Message::ClassData* ComboAggregateRequest_Aggregate::GetClassData() const {
-  return &_class_data_;
-}
-
-void ComboAggregateRequest_Aggregate::MergeImpl(::google::protobuf::Message& to_msg, const ::google::protobuf::Message& from_msg) {
-  auto* const _this = static_cast<ComboAggregateRequest_Aggregate*>(&to_msg);
-  auto& from = static_cast<const ComboAggregateRequest_Aggregate&>(from_msg);
-  // @@protoc_insertion_point(class_specific_merge_from_start:io.deephaven.proto.backplane.grpc.ComboAggregateRequest.Aggregate)
-  ABSL_DCHECK_NE(&from, _this);
-  ::uint32_t cached_has_bits = 0;
-  (void) cached_has_bits;
-
-  _this->_internal_mutable_match_pairs()->MergeFrom(from._internal_match_pairs());
-  if (!from._internal_column_name().empty()) {
-    _this->_internal_set_column_name(from._internal_column_name());
-  }
-  if (from._internal_type() != 0) {
-    _this->_internal_set_type(from._internal_type());
-  }
-  if (from._internal_avg_median() != 0) {
-    _this->_internal_set_avg_median(from._internal_avg_median());
-  }
-  static_assert(sizeof(::uint64_t) == sizeof(double),
-                "Code assumes ::uint64_t and double are the same size.");
-  double tmp_percentile = from._internal_percentile();
-  ::uint64_t raw_percentile;
-  memcpy(&raw_percentile, &tmp_percentile, sizeof(tmp_percentile));
-  if (raw_percentile != 0) {
-    _this->_internal_set_percentile(from._internal_percentile());
-  }
-  _this->_internal_metadata_.MergeFrom<::google::protobuf::UnknownFieldSet>(from._internal_metadata_);
-}
-
-void ComboAggregateRequest_Aggregate::CopyFrom(const ComboAggregateRequest_Aggregate& from) {
-// @@protoc_insertion_point(class_specific_copy_from_start:io.deephaven.proto.backplane.grpc.ComboAggregateRequest.Aggregate)
-  if (&from == this) return;
-  Clear();
-  MergeFrom(from);
-}
-
-PROTOBUF_NOINLINE bool ComboAggregateRequest_Aggregate::IsInitialized() const {
-  return true;
-}
-
-::_pbi::CachedSize* ComboAggregateRequest_Aggregate::AccessCachedSize() const {
-  return &_impl_._cached_size_;
-}
-void ComboAggregateRequest_Aggregate::InternalSwap(ComboAggregateRequest_Aggregate* PROTOBUF_RESTRICT other) {
-  using std::swap;
-  auto* arena = GetArena();
-  ABSL_DCHECK_EQ(arena, other->GetArena());
-  _internal_metadata_.InternalSwap(&other->_internal_metadata_);
-  _impl_.match_pairs_.InternalSwap(&other->_impl_.match_pairs_);
-  ::_pbi::ArenaStringPtr::InternalSwap(&_impl_.column_name_, &other->_impl_.column_name_, arena);
-  ::google::protobuf::internal::memswap<
-      PROTOBUF_FIELD_OFFSET(ComboAggregateRequest_Aggregate, _impl_.percentile_)
-      + sizeof(ComboAggregateRequest_Aggregate::_impl_.percentile_)
-      - PROTOBUF_FIELD_OFFSET(ComboAggregateRequest_Aggregate, _impl_.type_)>(
-          reinterpret_cast<char*>(&_impl_.type_),
-          reinterpret_cast<char*>(&other->_impl_.type_));
-}
-
-::google::protobuf::Metadata ComboAggregateRequest_Aggregate::GetMetadata() const {
-  return ::_pbi::AssignDescriptors(
-      &descriptor_table_deephaven_2fproto_2ftable_2eproto_getter, &descriptor_table_deephaven_2fproto_2ftable_2eproto_once,
-      file_level_metadata_deephaven_2fproto_2ftable_2eproto[59]);
-}
-// ===================================================================
-
-class ComboAggregateRequest::_Internal {
- public:
-  using HasBits = decltype(std::declval<ComboAggregateRequest>()._impl_._has_bits_);
-  static constexpr ::int32_t kHasBitsOffset =
-    8 * PROTOBUF_FIELD_OFFSET(ComboAggregateRequest, _impl_._has_bits_);
-  static const ::io::deephaven::proto::backplane::grpc::Ticket& result_id(const ComboAggregateRequest* msg);
-  static void set_has_result_id(HasBits* has_bits) {
-    (*has_bits)[0] |= 1u;
-  }
-  static const ::io::deephaven::proto::backplane::grpc::TableReference& source_id(const ComboAggregateRequest* msg);
-  static void set_has_source_id(HasBits* has_bits) {
-    (*has_bits)[0] |= 2u;
-  }
-};
-
-const ::io::deephaven::proto::backplane::grpc::Ticket& ComboAggregateRequest::_Internal::result_id(const ComboAggregateRequest* msg) {
-  return *msg->_impl_.result_id_;
-}
-const ::io::deephaven::proto::backplane::grpc::TableReference& ComboAggregateRequest::_Internal::source_id(const ComboAggregateRequest* msg) {
-  return *msg->_impl_.source_id_;
-}
-void ComboAggregateRequest::clear_result_id() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  if (_impl_.result_id_ != nullptr) _impl_.result_id_->Clear();
-  _impl_._has_bits_[0] &= ~0x00000001u;
-}
-ComboAggregateRequest::ComboAggregateRequest(::google::protobuf::Arena* arena)
-    : ::google::protobuf::Message(arena) {
-  SharedCtor(arena);
-  // @@protoc_insertion_point(arena_constructor:io.deephaven.proto.backplane.grpc.ComboAggregateRequest)
-}
-inline PROTOBUF_NDEBUG_INLINE ComboAggregateRequest::Impl_::Impl_(
-    ::google::protobuf::internal::InternalVisibility visibility, ::google::protobuf::Arena* arena,
-    const Impl_& from)
-      : _has_bits_{from._has_bits_},
-        _cached_size_{0},
-        aggregates_{visibility, arena, from.aggregates_},
-        group_by_columns_{visibility, arena, from.group_by_columns_} {}
-
-ComboAggregateRequest::ComboAggregateRequest(
-    ::google::protobuf::Arena* arena,
-    const ComboAggregateRequest& from)
-    : ::google::protobuf::Message(arena) {
-  ComboAggregateRequest* const _this = this;
-  (void)_this;
-  _internal_metadata_.MergeFrom<::google::protobuf::UnknownFieldSet>(
-      from._internal_metadata_);
-  new (&_impl_) Impl_(internal_visibility(), arena, from._impl_);
-  ::uint32_t cached_has_bits = _impl_._has_bits_[0];
-  _impl_.result_id_ = (cached_has_bits & 0x00000001u)
-                ? CreateMaybeMessage<::io::deephaven::proto::backplane::grpc::Ticket>(arena, *from._impl_.result_id_)
-                : nullptr;
-  _impl_.source_id_ = (cached_has_bits & 0x00000002u)
-                ? CreateMaybeMessage<::io::deephaven::proto::backplane::grpc::TableReference>(arena, *from._impl_.source_id_)
-                : nullptr;
-  _impl_.force_combo_ = from._impl_.force_combo_;
-
-  // @@protoc_insertion_point(copy_constructor:io.deephaven.proto.backplane.grpc.ComboAggregateRequest)
-}
-inline PROTOBUF_NDEBUG_INLINE ComboAggregateRequest::Impl_::Impl_(
-    ::google::protobuf::internal::InternalVisibility visibility,
-    ::google::protobuf::Arena* arena)
-      : _cached_size_{0},
-        aggregates_{visibility, arena},
-        group_by_columns_{visibility, arena} {}
-
-inline void ComboAggregateRequest::SharedCtor(::_pb::Arena* arena) {
-  new (&_impl_) Impl_(internal_visibility(), arena);
-  ::memset(reinterpret_cast<char *>(&_impl_) +
-               offsetof(Impl_, result_id_),
-           0,
-           offsetof(Impl_, force_combo_) -
-               offsetof(Impl_, result_id_) +
-               sizeof(Impl_::force_combo_));
-}
-ComboAggregateRequest::~ComboAggregateRequest() {
-  // @@protoc_insertion_point(destructor:io.deephaven.proto.backplane.grpc.ComboAggregateRequest)
-  _internal_metadata_.Delete<::google::protobuf::UnknownFieldSet>();
-  SharedDtor();
-}
-inline void ComboAggregateRequest::SharedDtor() {
-  ABSL_DCHECK(GetArena() == nullptr);
-  delete _impl_.result_id_;
-  delete _impl_.source_id_;
-  _impl_.~Impl_();
-}
-
-PROTOBUF_NOINLINE void ComboAggregateRequest::Clear() {
-// @@protoc_insertion_point(message_clear_start:io.deephaven.proto.backplane.grpc.ComboAggregateRequest)
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  ::uint32_t cached_has_bits = 0;
-  // Prevent compiler warnings about cached_has_bits being unused
-  (void) cached_has_bits;
-
-  _impl_.aggregates_.Clear();
-  _impl_.group_by_columns_.Clear();
-  cached_has_bits = _impl_._has_bits_[0];
-  if (cached_has_bits & 0x00000003u) {
-    if (cached_has_bits & 0x00000001u) {
-      ABSL_DCHECK(_impl_.result_id_ != nullptr);
-      _impl_.result_id_->Clear();
-    }
-    if (cached_has_bits & 0x00000002u) {
-      ABSL_DCHECK(_impl_.source_id_ != nullptr);
-      _impl_.source_id_->Clear();
-    }
-  }
-  _impl_.force_combo_ = false;
-  _impl_._has_bits_.Clear();
-  _internal_metadata_.Clear<::google::protobuf::UnknownFieldSet>();
-}
-
-const char* ComboAggregateRequest::_InternalParse(
-    const char* ptr, ::_pbi::ParseContext* ctx) {
-  ptr = ::_pbi::TcParser::ParseLoop(this, ptr, ctx, &_table_.header);
-  return ptr;
-}
-
-
-PROTOBUF_CONSTINIT PROTOBUF_ATTRIBUTE_INIT_PRIORITY1
-const ::_pbi::TcParseTable<3, 5, 3, 80, 2> ComboAggregateRequest::_table_ = {
-  {
-    PROTOBUF_FIELD_OFFSET(ComboAggregateRequest, _impl_._has_bits_),
-    0, // no _extensions_
-    5, 56,  // max_field_number, fast_idx_mask
-    offsetof(decltype(_table_), field_lookup_table),
-    4294967264,  // skipmap
-    offsetof(decltype(_table_), field_entries),
-    5,  // num_field_entries
-    3,  // num_aux_entries
-    offsetof(decltype(_table_), aux_entries),
-    &_ComboAggregateRequest_default_instance_._instance,
-    ::_pbi::TcParser::GenericFallback,  // fallback
-  }, {{
-    {::_pbi::TcParser::MiniParse, {}},
-    // .io.deephaven.proto.backplane.grpc.Ticket result_id = 1;
-    {::_pbi::TcParser::FastMtS1,
-     {10, 0, 0, PROTOBUF_FIELD_OFFSET(ComboAggregateRequest, _impl_.result_id_)}},
-    // .io.deephaven.proto.backplane.grpc.TableReference source_id = 2;
-    {::_pbi::TcParser::FastMtS1,
-     {18, 1, 1, PROTOBUF_FIELD_OFFSET(ComboAggregateRequest, _impl_.source_id_)}},
-    // repeated .io.deephaven.proto.backplane.grpc.ComboAggregateRequest.Aggregate aggregates = 3;
-    {::_pbi::TcParser::FastMtR1,
-     {26, 63, 2, PROTOBUF_FIELD_OFFSET(ComboAggregateRequest, _impl_.aggregates_)}},
-    // repeated string group_by_columns = 4;
-    {::_pbi::TcParser::FastUR1,
-     {34, 63, 0, PROTOBUF_FIELD_OFFSET(ComboAggregateRequest, _impl_.group_by_columns_)}},
-    // bool force_combo = 5;
-    {::_pbi::TcParser::SingularVarintNoZag1<bool, offsetof(ComboAggregateRequest, _impl_.force_combo_), 63>(),
-     {40, 63, 0, PROTOBUF_FIELD_OFFSET(ComboAggregateRequest, _impl_.force_combo_)}},
-    {::_pbi::TcParser::MiniParse, {}},
-    {::_pbi::TcParser::MiniParse, {}},
-  }}, {{
-    65535, 65535
-  }}, {{
-    // .io.deephaven.proto.backplane.grpc.Ticket result_id = 1;
-    {PROTOBUF_FIELD_OFFSET(ComboAggregateRequest, _impl_.result_id_), _Internal::kHasBitsOffset + 0, 0,
-    (0 | ::_fl::kFcOptional | ::_fl::kMessage | ::_fl::kTvTable)},
-    // .io.deephaven.proto.backplane.grpc.TableReference source_id = 2;
-    {PROTOBUF_FIELD_OFFSET(ComboAggregateRequest, _impl_.source_id_), _Internal::kHasBitsOffset + 1, 1,
-    (0 | ::_fl::kFcOptional | ::_fl::kMessage | ::_fl::kTvTable)},
-    // repeated .io.deephaven.proto.backplane.grpc.ComboAggregateRequest.Aggregate aggregates = 3;
-    {PROTOBUF_FIELD_OFFSET(ComboAggregateRequest, _impl_.aggregates_), -1, 2,
-    (0 | ::_fl::kFcRepeated | ::_fl::kMessage | ::_fl::kTvTable)},
-    // repeated string group_by_columns = 4;
-    {PROTOBUF_FIELD_OFFSET(ComboAggregateRequest, _impl_.group_by_columns_), -1, 0,
-    (0 | ::_fl::kFcRepeated | ::_fl::kUtf8String | ::_fl::kRepSString)},
-    // bool force_combo = 5;
-    {PROTOBUF_FIELD_OFFSET(ComboAggregateRequest, _impl_.force_combo_), -1, 0,
-    (0 | ::_fl::kFcSingular | ::_fl::kBool)},
-  }}, {{
-    {::_pbi::TcParser::GetTable<::io::deephaven::proto::backplane::grpc::Ticket>()},
-    {::_pbi::TcParser::GetTable<::io::deephaven::proto::backplane::grpc::TableReference>()},
-    {::_pbi::TcParser::GetTable<::io::deephaven::proto::backplane::grpc::ComboAggregateRequest_Aggregate>()},
-  }}, {{
-    "\67\0\0\0\20\0\0\0"
-    "io.deephaven.proto.backplane.grpc.ComboAggregateRequest"
-    "group_by_columns"
-  }},
-};
-
-::uint8_t* ComboAggregateRequest::_InternalSerialize(
-    ::uint8_t* target,
-    ::google::protobuf::io::EpsCopyOutputStream* stream) const {
-  // @@protoc_insertion_point(serialize_to_array_start:io.deephaven.proto.backplane.grpc.ComboAggregateRequest)
-  ::uint32_t cached_has_bits = 0;
-  (void)cached_has_bits;
-
-  cached_has_bits = _impl_._has_bits_[0];
-  // .io.deephaven.proto.backplane.grpc.Ticket result_id = 1;
-  if (cached_has_bits & 0x00000001u) {
-    target = ::google::protobuf::internal::WireFormatLite::InternalWriteMessage(
-        1, _Internal::result_id(this),
-        _Internal::result_id(this).GetCachedSize(), target, stream);
-  }
-
-  // .io.deephaven.proto.backplane.grpc.TableReference source_id = 2;
-  if (cached_has_bits & 0x00000002u) {
-    target = ::google::protobuf::internal::WireFormatLite::InternalWriteMessage(
-        2, _Internal::source_id(this),
-        _Internal::source_id(this).GetCachedSize(), target, stream);
-  }
-
-  // repeated .io.deephaven.proto.backplane.grpc.ComboAggregateRequest.Aggregate aggregates = 3;
-  for (unsigned i = 0,
-      n = static_cast<unsigned>(this->_internal_aggregates_size()); i < n; i++) {
-    const auto& repfield = this->_internal_aggregates().Get(i);
-    target = ::google::protobuf::internal::WireFormatLite::
-        InternalWriteMessage(3, repfield, repfield.GetCachedSize(), target, stream);
-  }
-
-  // repeated string group_by_columns = 4;
-  for (int i = 0, n = this->_internal_group_by_columns_size(); i < n; ++i) {
-    const auto& s = this->_internal_group_by_columns().Get(i);
-    ::google::protobuf::internal::WireFormatLite::VerifyUtf8String(
-        s.data(), static_cast<int>(s.length()), ::google::protobuf::internal::WireFormatLite::SERIALIZE, "io.deephaven.proto.backplane.grpc.ComboAggregateRequest.group_by_columns");
-    target = stream->WriteString(4, s, target);
-  }
-
-  // bool force_combo = 5;
-  if (this->_internal_force_combo() != 0) {
-    target = stream->EnsureSpace(target);
-    target = ::_pbi::WireFormatLite::WriteBoolToArray(
-        5, this->_internal_force_combo(), target);
-  }
-
-  if (PROTOBUF_PREDICT_FALSE(_internal_metadata_.have_unknown_fields())) {
-    target =
-        ::_pbi::WireFormat::InternalSerializeUnknownFieldsToArray(
-            _internal_metadata_.unknown_fields<::google::protobuf::UnknownFieldSet>(::google::protobuf::UnknownFieldSet::default_instance), target, stream);
-  }
-  // @@protoc_insertion_point(serialize_to_array_end:io.deephaven.proto.backplane.grpc.ComboAggregateRequest)
-  return target;
-}
-
-::size_t ComboAggregateRequest::ByteSizeLong() const {
-// @@protoc_insertion_point(message_byte_size_start:io.deephaven.proto.backplane.grpc.ComboAggregateRequest)
-  ::size_t total_size = 0;
-
-  ::uint32_t cached_has_bits = 0;
-  // Prevent compiler warnings about cached_has_bits being unused
-  (void) cached_has_bits;
-
-  // repeated .io.deephaven.proto.backplane.grpc.ComboAggregateRequest.Aggregate aggregates = 3;
-  total_size += 1UL * this->_internal_aggregates_size();
-  for (const auto& msg : this->_internal_aggregates()) {
-    total_size +=
-      ::google::protobuf::internal::WireFormatLite::MessageSize(msg);
-  }
-  // repeated string group_by_columns = 4;
-  total_size += 1 * ::google::protobuf::internal::FromIntSize(_internal_group_by_columns().size());
-  for (int i = 0, n = _internal_group_by_columns().size(); i < n; ++i) {
-    total_size += ::google::protobuf::internal::WireFormatLite::StringSize(
-        _internal_group_by_columns().Get(i));
-  }
-  cached_has_bits = _impl_._has_bits_[0];
-  if (cached_has_bits & 0x00000003u) {
-    // .io.deephaven.proto.backplane.grpc.Ticket result_id = 1;
-    if (cached_has_bits & 0x00000001u) {
-      total_size +=
-          1 + ::google::protobuf::internal::WireFormatLite::MessageSize(*_impl_.result_id_);
-    }
-
-    // .io.deephaven.proto.backplane.grpc.TableReference source_id = 2;
-    if (cached_has_bits & 0x00000002u) {
-      total_size +=
-          1 + ::google::protobuf::internal::WireFormatLite::MessageSize(*_impl_.source_id_);
-    }
-
-  }
-  // bool force_combo = 5;
-  if (this->_internal_force_combo() != 0) {
-    total_size += 2;
-  }
-
-  return MaybeComputeUnknownFieldsSize(total_size, &_impl_._cached_size_);
-}
-
-const ::google::protobuf::Message::ClassData ComboAggregateRequest::_class_data_ = {
-    ComboAggregateRequest::MergeImpl,
-    nullptr,  // OnDemandRegisterArenaDtor
-};
-const ::google::protobuf::Message::ClassData* ComboAggregateRequest::GetClassData() const {
-  return &_class_data_;
-}
-
-void ComboAggregateRequest::MergeImpl(::google::protobuf::Message& to_msg, const ::google::protobuf::Message& from_msg) {
-  auto* const _this = static_cast<ComboAggregateRequest*>(&to_msg);
-  auto& from = static_cast<const ComboAggregateRequest&>(from_msg);
-  // @@protoc_insertion_point(class_specific_merge_from_start:io.deephaven.proto.backplane.grpc.ComboAggregateRequest)
-  ABSL_DCHECK_NE(&from, _this);
-  ::uint32_t cached_has_bits = 0;
-  (void) cached_has_bits;
-
-  _this->_internal_mutable_aggregates()->MergeFrom(
-      from._internal_aggregates());
-  _this->_internal_mutable_group_by_columns()->MergeFrom(from._internal_group_by_columns());
-  cached_has_bits = from._impl_._has_bits_[0];
-  if (cached_has_bits & 0x00000003u) {
-    if (cached_has_bits & 0x00000001u) {
-      _this->_internal_mutable_result_id()->::io::deephaven::proto::backplane::grpc::Ticket::MergeFrom(
-          from._internal_result_id());
-    }
-    if (cached_has_bits & 0x00000002u) {
-      _this->_internal_mutable_source_id()->::io::deephaven::proto::backplane::grpc::TableReference::MergeFrom(
-          from._internal_source_id());
-    }
-  }
-  if (from._internal_force_combo() != 0) {
-    _this->_internal_set_force_combo(from._internal_force_combo());
-  }
-  _this->_internal_metadata_.MergeFrom<::google::protobuf::UnknownFieldSet>(from._internal_metadata_);
-}
-
-void ComboAggregateRequest::CopyFrom(const ComboAggregateRequest& from) {
-// @@protoc_insertion_point(class_specific_copy_from_start:io.deephaven.proto.backplane.grpc.ComboAggregateRequest)
-  if (&from == this) return;
-  Clear();
-  MergeFrom(from);
-}
-
-PROTOBUF_NOINLINE bool ComboAggregateRequest::IsInitialized() const {
-  return true;
-}
-
-::_pbi::CachedSize* ComboAggregateRequest::AccessCachedSize() const {
-  return &_impl_._cached_size_;
-}
-void ComboAggregateRequest::InternalSwap(ComboAggregateRequest* PROTOBUF_RESTRICT other) {
-  using std::swap;
-  _internal_metadata_.InternalSwap(&other->_internal_metadata_);
-  swap(_impl_._has_bits_[0], other->_impl_._has_bits_[0]);
-  _impl_.aggregates_.InternalSwap(&other->_impl_.aggregates_);
-  _impl_.group_by_columns_.InternalSwap(&other->_impl_.group_by_columns_);
-  ::google::protobuf::internal::memswap<
-      PROTOBUF_FIELD_OFFSET(ComboAggregateRequest, _impl_.force_combo_)
-      + sizeof(ComboAggregateRequest::_impl_.force_combo_)
-      - PROTOBUF_FIELD_OFFSET(ComboAggregateRequest, _impl_.result_id_)>(
-          reinterpret_cast<char*>(&_impl_.result_id_),
-          reinterpret_cast<char*>(&other->_impl_.result_id_));
-}
-
-::google::protobuf::Metadata ComboAggregateRequest::GetMetadata() const {
-  return ::_pbi::AssignDescriptors(
-      &descriptor_table_deephaven_2fproto_2ftable_2eproto_getter, &descriptor_table_deephaven_2fproto_2ftable_2eproto_once,
-      file_level_metadata_deephaven_2fproto_2ftable_2eproto[60]);
-}
-// ===================================================================
-
-class AggregateAllRequest::_Internal {
- public:
-  using HasBits = decltype(std::declval<AggregateAllRequest>()._impl_._has_bits_);
-  static constexpr ::int32_t kHasBitsOffset =
-    8 * PROTOBUF_FIELD_OFFSET(AggregateAllRequest, _impl_._has_bits_);
-  static const ::io::deephaven::proto::backplane::grpc::Ticket& result_id(const AggregateAllRequest* msg);
-  static void set_has_result_id(HasBits* has_bits) {
-    (*has_bits)[0] |= 1u;
-  }
-  static const ::io::deephaven::proto::backplane::grpc::TableReference& source_id(const AggregateAllRequest* msg);
-  static void set_has_source_id(HasBits* has_bits) {
-    (*has_bits)[0] |= 2u;
-  }
-  static const ::io::deephaven::proto::backplane::grpc::AggSpec& spec(const AggregateAllRequest* msg);
-  static void set_has_spec(HasBits* has_bits) {
-    (*has_bits)[0] |= 4u;
-  }
-};
-
-const ::io::deephaven::proto::backplane::grpc::Ticket& AggregateAllRequest::_Internal::result_id(const AggregateAllRequest* msg) {
-  return *msg->_impl_.result_id_;
-}
-const ::io::deephaven::proto::backplane::grpc::TableReference& AggregateAllRequest::_Internal::source_id(const AggregateAllRequest* msg) {
-  return *msg->_impl_.source_id_;
-}
-const ::io::deephaven::proto::backplane::grpc::AggSpec& AggregateAllRequest::_Internal::spec(const AggregateAllRequest* msg) {
-  return *msg->_impl_.spec_;
-}
-void AggregateAllRequest::clear_result_id() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  if (_impl_.result_id_ != nullptr) _impl_.result_id_->Clear();
-  _impl_._has_bits_[0] &= ~0x00000001u;
-}
-AggregateAllRequest::AggregateAllRequest(::google::protobuf::Arena* arena)
-    : ::google::protobuf::Message(arena) {
-  SharedCtor(arena);
-  // @@protoc_insertion_point(arena_constructor:io.deephaven.proto.backplane.grpc.AggregateAllRequest)
-}
-inline PROTOBUF_NDEBUG_INLINE AggregateAllRequest::Impl_::Impl_(
-    ::google::protobuf::internal::InternalVisibility visibility, ::google::protobuf::Arena* arena,
-    const Impl_& from)
-      : _has_bits_{from._has_bits_},
-        _cached_size_{0},
-        group_by_columns_{visibility, arena, from.group_by_columns_} {}
-
-AggregateAllRequest::AggregateAllRequest(
-    ::google::protobuf::Arena* arena,
-    const AggregateAllRequest& from)
-    : ::google::protobuf::Message(arena) {
-  AggregateAllRequest* const _this = this;
-  (void)_this;
-  _internal_metadata_.MergeFrom<::google::protobuf::UnknownFieldSet>(
-      from._internal_metadata_);
-  new (&_impl_) Impl_(internal_visibility(), arena, from._impl_);
-  ::uint32_t cached_has_bits = _impl_._has_bits_[0];
-  _impl_.result_id_ = (cached_has_bits & 0x00000001u)
-                ? CreateMaybeMessage<::io::deephaven::proto::backplane::grpc::Ticket>(arena, *from._impl_.result_id_)
-                : nullptr;
-  _impl_.source_id_ = (cached_has_bits & 0x00000002u)
-                ? CreateMaybeMessage<::io::deephaven::proto::backplane::grpc::TableReference>(arena, *from._impl_.source_id_)
-                : nullptr;
-  _impl_.spec_ = (cached_has_bits & 0x00000004u)
-                ? CreateMaybeMessage<::io::deephaven::proto::backplane::grpc::AggSpec>(arena, *from._impl_.spec_)
-                : nullptr;
-
-  // @@protoc_insertion_point(copy_constructor:io.deephaven.proto.backplane.grpc.AggregateAllRequest)
-}
-inline PROTOBUF_NDEBUG_INLINE AggregateAllRequest::Impl_::Impl_(
-    ::google::protobuf::internal::InternalVisibility visibility,
-    ::google::protobuf::Arena* arena)
-      : _cached_size_{0},
-        group_by_columns_{visibility, arena} {}
-
-inline void AggregateAllRequest::SharedCtor(::_pb::Arena* arena) {
-  new (&_impl_) Impl_(internal_visibility(), arena);
-  ::memset(reinterpret_cast<char *>(&_impl_) +
-               offsetof(Impl_, result_id_),
-           0,
-           offsetof(Impl_, spec_) -
-               offsetof(Impl_, result_id_) +
-               sizeof(Impl_::spec_));
-}
-AggregateAllRequest::~AggregateAllRequest() {
-  // @@protoc_insertion_point(destructor:io.deephaven.proto.backplane.grpc.AggregateAllRequest)
-  _internal_metadata_.Delete<::google::protobuf::UnknownFieldSet>();
-  SharedDtor();
-}
-inline void AggregateAllRequest::SharedDtor() {
-  ABSL_DCHECK(GetArena() == nullptr);
-  delete _impl_.result_id_;
-  delete _impl_.source_id_;
-  delete _impl_.spec_;
-  _impl_.~Impl_();
-}
-
-PROTOBUF_NOINLINE void AggregateAllRequest::Clear() {
-// @@protoc_insertion_point(message_clear_start:io.deephaven.proto.backplane.grpc.AggregateAllRequest)
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  ::uint32_t cached_has_bits = 0;
-  // Prevent compiler warnings about cached_has_bits being unused
-  (void) cached_has_bits;
-
-  _impl_.group_by_columns_.Clear();
-  cached_has_bits = _impl_._has_bits_[0];
-  if (cached_has_bits & 0x00000007u) {
-    if (cached_has_bits & 0x00000001u) {
-      ABSL_DCHECK(_impl_.result_id_ != nullptr);
-      _impl_.result_id_->Clear();
-    }
-    if (cached_has_bits & 0x00000002u) {
-      ABSL_DCHECK(_impl_.source_id_ != nullptr);
-      _impl_.source_id_->Clear();
-    }
-    if (cached_has_bits & 0x00000004u) {
-      ABSL_DCHECK(_impl_.spec_ != nullptr);
-      _impl_.spec_->Clear();
-    }
-  }
-  _impl_._has_bits_.Clear();
-  _internal_metadata_.Clear<::google::protobuf::UnknownFieldSet>();
-}
-
-const char* AggregateAllRequest::_InternalParse(
-    const char* ptr, ::_pbi::ParseContext* ctx) {
-  ptr = ::_pbi::TcParser::ParseLoop(this, ptr, ctx, &_table_.header);
-  return ptr;
-}
-
-
-PROTOBUF_CONSTINIT PROTOBUF_ATTRIBUTE_INIT_PRIORITY1
-const ::_pbi::TcParseTable<2, 4, 3, 78, 2> AggregateAllRequest::_table_ = {
-  {
-    PROTOBUF_FIELD_OFFSET(AggregateAllRequest, _impl_._has_bits_),
-    0, // no _extensions_
-    4, 24,  // max_field_number, fast_idx_mask
-    offsetof(decltype(_table_), field_lookup_table),
-    4294967280,  // skipmap
-    offsetof(decltype(_table_), field_entries),
-    4,  // num_field_entries
-    3,  // num_aux_entries
-    offsetof(decltype(_table_), aux_entries),
-    &_AggregateAllRequest_default_instance_._instance,
-    ::_pbi::TcParser::GenericFallback,  // fallback
-  }, {{
-    // repeated string group_by_columns = 4;
-    {::_pbi::TcParser::FastUR1,
-     {34, 63, 0, PROTOBUF_FIELD_OFFSET(AggregateAllRequest, _impl_.group_by_columns_)}},
-    // .io.deephaven.proto.backplane.grpc.Ticket result_id = 1;
-    {::_pbi::TcParser::FastMtS1,
-     {10, 0, 0, PROTOBUF_FIELD_OFFSET(AggregateAllRequest, _impl_.result_id_)}},
-    // .io.deephaven.proto.backplane.grpc.TableReference source_id = 2;
-    {::_pbi::TcParser::FastMtS1,
-     {18, 1, 1, PROTOBUF_FIELD_OFFSET(AggregateAllRequest, _impl_.source_id_)}},
-    // .io.deephaven.proto.backplane.grpc.AggSpec spec = 3;
-    {::_pbi::TcParser::FastMtS1,
-     {26, 2, 2, PROTOBUF_FIELD_OFFSET(AggregateAllRequest, _impl_.spec_)}},
-  }}, {{
-    65535, 65535
-  }}, {{
-    // .io.deephaven.proto.backplane.grpc.Ticket result_id = 1;
-    {PROTOBUF_FIELD_OFFSET(AggregateAllRequest, _impl_.result_id_), _Internal::kHasBitsOffset + 0, 0,
-    (0 | ::_fl::kFcOptional | ::_fl::kMessage | ::_fl::kTvTable)},
-    // .io.deephaven.proto.backplane.grpc.TableReference source_id = 2;
-    {PROTOBUF_FIELD_OFFSET(AggregateAllRequest, _impl_.source_id_), _Internal::kHasBitsOffset + 1, 1,
-    (0 | ::_fl::kFcOptional | ::_fl::kMessage | ::_fl::kTvTable)},
-    // .io.deephaven.proto.backplane.grpc.AggSpec spec = 3;
-    {PROTOBUF_FIELD_OFFSET(AggregateAllRequest, _impl_.spec_), _Internal::kHasBitsOffset + 2, 2,
-    (0 | ::_fl::kFcOptional | ::_fl::kMessage | ::_fl::kTvTable)},
-    // repeated string group_by_columns = 4;
-    {PROTOBUF_FIELD_OFFSET(AggregateAllRequest, _impl_.group_by_columns_), -1, 0,
-    (0 | ::_fl::kFcRepeated | ::_fl::kUtf8String | ::_fl::kRepSString)},
-  }}, {{
-    {::_pbi::TcParser::GetTable<::io::deephaven::proto::backplane::grpc::Ticket>()},
-    {::_pbi::TcParser::GetTable<::io::deephaven::proto::backplane::grpc::TableReference>()},
-    {::_pbi::TcParser::GetTable<::io::deephaven::proto::backplane::grpc::AggSpec>()},
-  }}, {{
-    "\65\0\0\0\20\0\0\0"
-    "io.deephaven.proto.backplane.grpc.AggregateAllRequest"
-    "group_by_columns"
-  }},
-};
-
-::uint8_t* AggregateAllRequest::_InternalSerialize(
-    ::uint8_t* target,
-    ::google::protobuf::io::EpsCopyOutputStream* stream) const {
-  // @@protoc_insertion_point(serialize_to_array_start:io.deephaven.proto.backplane.grpc.AggregateAllRequest)
-  ::uint32_t cached_has_bits = 0;
-  (void)cached_has_bits;
-
-  cached_has_bits = _impl_._has_bits_[0];
-  // .io.deephaven.proto.backplane.grpc.Ticket result_id = 1;
-  if (cached_has_bits & 0x00000001u) {
-    target = ::google::protobuf::internal::WireFormatLite::InternalWriteMessage(
-        1, _Internal::result_id(this),
-        _Internal::result_id(this).GetCachedSize(), target, stream);
-  }
-
-  // .io.deephaven.proto.backplane.grpc.TableReference source_id = 2;
-  if (cached_has_bits & 0x00000002u) {
-    target = ::google::protobuf::internal::WireFormatLite::InternalWriteMessage(
-        2, _Internal::source_id(this),
-        _Internal::source_id(this).GetCachedSize(), target, stream);
-  }
-
-  // .io.deephaven.proto.backplane.grpc.AggSpec spec = 3;
-  if (cached_has_bits & 0x00000004u) {
-    target = ::google::protobuf::internal::WireFormatLite::InternalWriteMessage(
-        3, _Internal::spec(this),
-        _Internal::spec(this).GetCachedSize(), target, stream);
-  }
-
-  // repeated string group_by_columns = 4;
-  for (int i = 0, n = this->_internal_group_by_columns_size(); i < n; ++i) {
-    const auto& s = this->_internal_group_by_columns().Get(i);
-    ::google::protobuf::internal::WireFormatLite::VerifyUtf8String(
-        s.data(), static_cast<int>(s.length()), ::google::protobuf::internal::WireFormatLite::SERIALIZE, "io.deephaven.proto.backplane.grpc.AggregateAllRequest.group_by_columns");
-    target = stream->WriteString(4, s, target);
-  }
-
-  if (PROTOBUF_PREDICT_FALSE(_internal_metadata_.have_unknown_fields())) {
-    target =
-        ::_pbi::WireFormat::InternalSerializeUnknownFieldsToArray(
-            _internal_metadata_.unknown_fields<::google::protobuf::UnknownFieldSet>(::google::protobuf::UnknownFieldSet::default_instance), target, stream);
-  }
-  // @@protoc_insertion_point(serialize_to_array_end:io.deephaven.proto.backplane.grpc.AggregateAllRequest)
-  return target;
-}
-
-::size_t AggregateAllRequest::ByteSizeLong() const {
-// @@protoc_insertion_point(message_byte_size_start:io.deephaven.proto.backplane.grpc.AggregateAllRequest)
-  ::size_t total_size = 0;
-
-  ::uint32_t cached_has_bits = 0;
-  // Prevent compiler warnings about cached_has_bits being unused
-  (void) cached_has_bits;
-
-  // repeated string group_by_columns = 4;
-  total_size += 1 * ::google::protobuf::internal::FromIntSize(_internal_group_by_columns().size());
-  for (int i = 0, n = _internal_group_by_columns().size(); i < n; ++i) {
-    total_size += ::google::protobuf::internal::WireFormatLite::StringSize(
-        _internal_group_by_columns().Get(i));
-  }
-  cached_has_bits = _impl_._has_bits_[0];
-  if (cached_has_bits & 0x00000007u) {
-    // .io.deephaven.proto.backplane.grpc.Ticket result_id = 1;
-    if (cached_has_bits & 0x00000001u) {
-      total_size +=
-          1 + ::google::protobuf::internal::WireFormatLite::MessageSize(*_impl_.result_id_);
-    }
-
-    // .io.deephaven.proto.backplane.grpc.TableReference source_id = 2;
-    if (cached_has_bits & 0x00000002u) {
-      total_size +=
-          1 + ::google::protobuf::internal::WireFormatLite::MessageSize(*_impl_.source_id_);
-    }
-
-    // .io.deephaven.proto.backplane.grpc.AggSpec spec = 3;
-    if (cached_has_bits & 0x00000004u) {
-      total_size +=
-          1 + ::google::protobuf::internal::WireFormatLite::MessageSize(*_impl_.spec_);
-    }
-
-  }
-  return MaybeComputeUnknownFieldsSize(total_size, &_impl_._cached_size_);
-}
-
-const ::google::protobuf::Message::ClassData AggregateAllRequest::_class_data_ = {
-    AggregateAllRequest::MergeImpl,
-    nullptr,  // OnDemandRegisterArenaDtor
-};
-const ::google::protobuf::Message::ClassData* AggregateAllRequest::GetClassData() const {
-  return &_class_data_;
-}
-
-void AggregateAllRequest::MergeImpl(::google::protobuf::Message& to_msg, const ::google::protobuf::Message& from_msg) {
-  auto* const _this = static_cast<AggregateAllRequest*>(&to_msg);
-  auto& from = static_cast<const AggregateAllRequest&>(from_msg);
-  // @@protoc_insertion_point(class_specific_merge_from_start:io.deephaven.proto.backplane.grpc.AggregateAllRequest)
-  ABSL_DCHECK_NE(&from, _this);
-  ::uint32_t cached_has_bits = 0;
-  (void) cached_has_bits;
-
-  _this->_internal_mutable_group_by_columns()->MergeFrom(from._internal_group_by_columns());
-  cached_has_bits = from._impl_._has_bits_[0];
-  if (cached_has_bits & 0x00000007u) {
-    if (cached_has_bits & 0x00000001u) {
-      _this->_internal_mutable_result_id()->::io::deephaven::proto::backplane::grpc::Ticket::MergeFrom(
-          from._internal_result_id());
-    }
-    if (cached_has_bits & 0x00000002u) {
-      _this->_internal_mutable_source_id()->::io::deephaven::proto::backplane::grpc::TableReference::MergeFrom(
-          from._internal_source_id());
-    }
-    if (cached_has_bits & 0x00000004u) {
-      _this->_internal_mutable_spec()->::io::deephaven::proto::backplane::grpc::AggSpec::MergeFrom(
-          from._internal_spec());
-    }
-  }
-  _this->_internal_metadata_.MergeFrom<::google::protobuf::UnknownFieldSet>(from._internal_metadata_);
-}
-
-void AggregateAllRequest::CopyFrom(const AggregateAllRequest& from) {
-// @@protoc_insertion_point(class_specific_copy_from_start:io.deephaven.proto.backplane.grpc.AggregateAllRequest)
-  if (&from == this) return;
-  Clear();
-  MergeFrom(from);
-}
-
-PROTOBUF_NOINLINE bool AggregateAllRequest::IsInitialized() const {
-  return true;
-}
-
-::_pbi::CachedSize* AggregateAllRequest::AccessCachedSize() const {
-  return &_impl_._cached_size_;
-}
-void AggregateAllRequest::InternalSwap(AggregateAllRequest* PROTOBUF_RESTRICT other) {
-  using std::swap;
-  _internal_metadata_.InternalSwap(&other->_internal_metadata_);
-  swap(_impl_._has_bits_[0], other->_impl_._has_bits_[0]);
-  _impl_.group_by_columns_.InternalSwap(&other->_impl_.group_by_columns_);
-  ::google::protobuf::internal::memswap<
-      PROTOBUF_FIELD_OFFSET(AggregateAllRequest, _impl_.spec_)
-      + sizeof(AggregateAllRequest::_impl_.spec_)
-      - PROTOBUF_FIELD_OFFSET(AggregateAllRequest, _impl_.result_id_)>(
-          reinterpret_cast<char*>(&_impl_.result_id_),
-          reinterpret_cast<char*>(&other->_impl_.result_id_));
-}
-
-::google::protobuf::Metadata AggregateAllRequest::GetMetadata() const {
-  return ::_pbi::AssignDescriptors(
-      &descriptor_table_deephaven_2fproto_2ftable_2eproto_getter, &descriptor_table_deephaven_2fproto_2ftable_2eproto_once,
-      file_level_metadata_deephaven_2fproto_2ftable_2eproto[61]);
-}
-// ===================================================================
-
-class AggSpec_AggSpecApproximatePercentile::_Internal {
- public:
-  using HasBits = decltype(std::declval<AggSpec_AggSpecApproximatePercentile>()._impl_._has_bits_);
-  static constexpr ::int32_t kHasBitsOffset =
-    8 * PROTOBUF_FIELD_OFFSET(AggSpec_AggSpecApproximatePercentile, _impl_._has_bits_);
-  static void set_has_compression(HasBits* has_bits) {
-    (*has_bits)[0] |= 1u;
-  }
-};
-
-AggSpec_AggSpecApproximatePercentile::AggSpec_AggSpecApproximatePercentile(::google::protobuf::Arena* arena)
-    : ::google::protobuf::Message(arena) {
-  SharedCtor(arena);
-  // @@protoc_insertion_point(arena_constructor:io.deephaven.proto.backplane.grpc.AggSpec.AggSpecApproximatePercentile)
-}
-AggSpec_AggSpecApproximatePercentile::AggSpec_AggSpecApproximatePercentile(
-    ::google::protobuf::Arena* arena, const AggSpec_AggSpecApproximatePercentile& from)
-    : AggSpec_AggSpecApproximatePercentile(arena) {
-  MergeFrom(from);
-}
-inline PROTOBUF_NDEBUG_INLINE AggSpec_AggSpecApproximatePercentile::Impl_::Impl_(
-    ::google::protobuf::internal::InternalVisibility visibility,
-    ::google::protobuf::Arena* arena)
-      : _cached_size_{0} {}
-
-inline void AggSpec_AggSpecApproximatePercentile::SharedCtor(::_pb::Arena* arena) {
-  new (&_impl_) Impl_(internal_visibility(), arena);
-  ::memset(reinterpret_cast<char *>(&_impl_) +
-               offsetof(Impl_, percentile_),
-           0,
-           offsetof(Impl_, compression_) -
-               offsetof(Impl_, percentile_) +
-               sizeof(Impl_::compression_));
-}
-AggSpec_AggSpecApproximatePercentile::~AggSpec_AggSpecApproximatePercentile() {
-  // @@protoc_insertion_point(destructor:io.deephaven.proto.backplane.grpc.AggSpec.AggSpecApproximatePercentile)
-  _internal_metadata_.Delete<::google::protobuf::UnknownFieldSet>();
-  SharedDtor();
-}
-inline void AggSpec_AggSpecApproximatePercentile::SharedDtor() {
-  ABSL_DCHECK(GetArena() == nullptr);
-  _impl_.~Impl_();
-}
-
-PROTOBUF_NOINLINE void AggSpec_AggSpecApproximatePercentile::Clear() {
-// @@protoc_insertion_point(message_clear_start:io.deephaven.proto.backplane.grpc.AggSpec.AggSpecApproximatePercentile)
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  ::uint32_t cached_has_bits = 0;
-  // Prevent compiler warnings about cached_has_bits being unused
-  (void) cached_has_bits;
-
-  _impl_.percentile_ = 0;
-  _impl_.compression_ = 0;
-  _impl_._has_bits_.Clear();
-  _internal_metadata_.Clear<::google::protobuf::UnknownFieldSet>();
-}
-
-const char* AggSpec_AggSpecApproximatePercentile::_InternalParse(
-    const char* ptr, ::_pbi::ParseContext* ctx) {
-  ptr = ::_pbi::TcParser::ParseLoop(this, ptr, ctx, &_table_.header);
-  return ptr;
-}
-
-
-PROTOBUF_CONSTINIT PROTOBUF_ATTRIBUTE_INIT_PRIORITY1
-const ::_pbi::TcParseTable<1, 2, 0, 0, 2> AggSpec_AggSpecApproximatePercentile::_table_ = {
-  {
-    PROTOBUF_FIELD_OFFSET(AggSpec_AggSpecApproximatePercentile, _impl_._has_bits_),
-    0, // no _extensions_
-    2, 8,  // max_field_number, fast_idx_mask
-    offsetof(decltype(_table_), field_lookup_table),
-    4294967292,  // skipmap
-    offsetof(decltype(_table_), field_entries),
-    2,  // num_field_entries
-    0,  // num_aux_entries
-    offsetof(decltype(_table_), field_names),  // no aux_entries
-    &_AggSpec_AggSpecApproximatePercentile_default_instance_._instance,
-    ::_pbi::TcParser::GenericFallback,  // fallback
-  }, {{
-    // optional double compression = 2;
-    {::_pbi::TcParser::FastF64S1,
-     {17, 0, 0, PROTOBUF_FIELD_OFFSET(AggSpec_AggSpecApproximatePercentile, _impl_.compression_)}},
-    // double percentile = 1;
-    {::_pbi::TcParser::FastF64S1,
-     {9, 63, 0, PROTOBUF_FIELD_OFFSET(AggSpec_AggSpecApproximatePercentile, _impl_.percentile_)}},
-  }}, {{
-    65535, 65535
-  }}, {{
-    // double percentile = 1;
-    {PROTOBUF_FIELD_OFFSET(AggSpec_AggSpecApproximatePercentile, _impl_.percentile_), -1, 0,
-    (0 | ::_fl::kFcSingular | ::_fl::kDouble)},
-    // optional double compression = 2;
-    {PROTOBUF_FIELD_OFFSET(AggSpec_AggSpecApproximatePercentile, _impl_.compression_), _Internal::kHasBitsOffset + 0, 0,
-    (0 | ::_fl::kFcOptional | ::_fl::kDouble)},
-  }},
-  // no aux_entries
-  {{
-  }},
-};
-
-::uint8_t* AggSpec_AggSpecApproximatePercentile::_InternalSerialize(
-    ::uint8_t* target,
-    ::google::protobuf::io::EpsCopyOutputStream* stream) const {
-  // @@protoc_insertion_point(serialize_to_array_start:io.deephaven.proto.backplane.grpc.AggSpec.AggSpecApproximatePercentile)
-  ::uint32_t cached_has_bits = 0;
-  (void)cached_has_bits;
-
-  // double percentile = 1;
-  static_assert(sizeof(::uint64_t) == sizeof(double),
-                "Code assumes ::uint64_t and double are the same size.");
-  double tmp_percentile = this->_internal_percentile();
-  ::uint64_t raw_percentile;
-  memcpy(&raw_percentile, &tmp_percentile, sizeof(tmp_percentile));
-  if (raw_percentile != 0) {
-    target = stream->EnsureSpace(target);
-    target = ::_pbi::WireFormatLite::WriteDoubleToArray(
-        1, this->_internal_percentile(), target);
-  }
-
-  cached_has_bits = _impl_._has_bits_[0];
-  // optional double compression = 2;
-  if (cached_has_bits & 0x00000001u) {
-    target = stream->EnsureSpace(target);
-    target = ::_pbi::WireFormatLite::WriteDoubleToArray(
-        2, this->_internal_compression(), target);
-  }
-
-  if (PROTOBUF_PREDICT_FALSE(_internal_metadata_.have_unknown_fields())) {
-    target =
-        ::_pbi::WireFormat::InternalSerializeUnknownFieldsToArray(
-            _internal_metadata_.unknown_fields<::google::protobuf::UnknownFieldSet>(::google::protobuf::UnknownFieldSet::default_instance), target, stream);
-  }
-  // @@protoc_insertion_point(serialize_to_array_end:io.deephaven.proto.backplane.grpc.AggSpec.AggSpecApproximatePercentile)
-  return target;
-}
-
-::size_t AggSpec_AggSpecApproximatePercentile::ByteSizeLong() const {
-// @@protoc_insertion_point(message_byte_size_start:io.deephaven.proto.backplane.grpc.AggSpec.AggSpecApproximatePercentile)
-  ::size_t total_size = 0;
-
-  ::uint32_t cached_has_bits = 0;
-  // Prevent compiler warnings about cached_has_bits being unused
-  (void) cached_has_bits;
-
-  // double percentile = 1;
-  static_assert(sizeof(::uint64_t) == sizeof(double),
-                "Code assumes ::uint64_t and double are the same size.");
-  double tmp_percentile = this->_internal_percentile();
-  ::uint64_t raw_percentile;
-  memcpy(&raw_percentile, &tmp_percentile, sizeof(tmp_percentile));
-  if (raw_percentile != 0) {
-    total_size += 9;
-  }
-
-  // optional double compression = 2;
-  cached_has_bits = _impl_._has_bits_[0];
-  if (cached_has_bits & 0x00000001u) {
-    total_size += 9;
-  }
-
-  return MaybeComputeUnknownFieldsSize(total_size, &_impl_._cached_size_);
-}
-
-const ::google::protobuf::Message::ClassData AggSpec_AggSpecApproximatePercentile::_class_data_ = {
-    AggSpec_AggSpecApproximatePercentile::MergeImpl,
-    nullptr,  // OnDemandRegisterArenaDtor
-};
-const ::google::protobuf::Message::ClassData* AggSpec_AggSpecApproximatePercentile::GetClassData() const {
-  return &_class_data_;
-}
-
-void AggSpec_AggSpecApproximatePercentile::MergeImpl(::google::protobuf::Message& to_msg, const ::google::protobuf::Message& from_msg) {
-  auto* const _this = static_cast<AggSpec_AggSpecApproximatePercentile*>(&to_msg);
-  auto& from = static_cast<const AggSpec_AggSpecApproximatePercentile&>(from_msg);
-  // @@protoc_insertion_point(class_specific_merge_from_start:io.deephaven.proto.backplane.grpc.AggSpec.AggSpecApproximatePercentile)
-  ABSL_DCHECK_NE(&from, _this);
-  ::uint32_t cached_has_bits = 0;
-  (void) cached_has_bits;
-
-  static_assert(sizeof(::uint64_t) == sizeof(double),
-                "Code assumes ::uint64_t and double are the same size.");
-  double tmp_percentile = from._internal_percentile();
-  ::uint64_t raw_percentile;
-  memcpy(&raw_percentile, &tmp_percentile, sizeof(tmp_percentile));
-  if (raw_percentile != 0) {
-    _this->_internal_set_percentile(from._internal_percentile());
-  }
-  if ((from._impl_._has_bits_[0] & 0x00000001u) != 0) {
-    _this->_internal_set_compression(from._internal_compression());
-  }
-  _this->_internal_metadata_.MergeFrom<::google::protobuf::UnknownFieldSet>(from._internal_metadata_);
-}
-
-void AggSpec_AggSpecApproximatePercentile::CopyFrom(const AggSpec_AggSpecApproximatePercentile& from) {
-// @@protoc_insertion_point(class_specific_copy_from_start:io.deephaven.proto.backplane.grpc.AggSpec.AggSpecApproximatePercentile)
-  if (&from == this) return;
-  Clear();
-  MergeFrom(from);
-}
-
-PROTOBUF_NOINLINE bool AggSpec_AggSpecApproximatePercentile::IsInitialized() const {
-  return true;
-}
-
-::_pbi::CachedSize* AggSpec_AggSpecApproximatePercentile::AccessCachedSize() const {
-  return &_impl_._cached_size_;
-}
-void AggSpec_AggSpecApproximatePercentile::InternalSwap(AggSpec_AggSpecApproximatePercentile* PROTOBUF_RESTRICT other) {
-  using std::swap;
-  _internal_metadata_.InternalSwap(&other->_internal_metadata_);
-  swap(_impl_._has_bits_[0], other->_impl_._has_bits_[0]);
-  ::google::protobuf::internal::memswap<
-      PROTOBUF_FIELD_OFFSET(AggSpec_AggSpecApproximatePercentile, _impl_.compression_)
-      + sizeof(AggSpec_AggSpecApproximatePercentile::_impl_.compression_)
-      - PROTOBUF_FIELD_OFFSET(AggSpec_AggSpecApproximatePercentile, _impl_.percentile_)>(
-          reinterpret_cast<char*>(&_impl_.percentile_),
-          reinterpret_cast<char*>(&other->_impl_.percentile_));
-}
-
-::google::protobuf::Metadata AggSpec_AggSpecApproximatePercentile::GetMetadata() const {
-  return ::_pbi::AssignDescriptors(
-      &descriptor_table_deephaven_2fproto_2ftable_2eproto_getter, &descriptor_table_deephaven_2fproto_2ftable_2eproto_once,
-      file_level_metadata_deephaven_2fproto_2ftable_2eproto[62]);
-}
-// ===================================================================
-
-class AggSpec_AggSpecCountDistinct::_Internal {
- public:
-};
-
-AggSpec_AggSpecCountDistinct::AggSpec_AggSpecCountDistinct(::google::protobuf::Arena* arena)
-    : ::google::protobuf::Message(arena) {
-  SharedCtor(arena);
-  // @@protoc_insertion_point(arena_constructor:io.deephaven.proto.backplane.grpc.AggSpec.AggSpecCountDistinct)
-}
-AggSpec_AggSpecCountDistinct::AggSpec_AggSpecCountDistinct(
-    ::google::protobuf::Arena* arena, const AggSpec_AggSpecCountDistinct& from)
-    : AggSpec_AggSpecCountDistinct(arena) {
-  MergeFrom(from);
-}
-inline PROTOBUF_NDEBUG_INLINE AggSpec_AggSpecCountDistinct::Impl_::Impl_(
-    ::google::protobuf::internal::InternalVisibility visibility,
-    ::google::protobuf::Arena* arena)
-      : _cached_size_{0} {}
-
-inline void AggSpec_AggSpecCountDistinct::SharedCtor(::_pb::Arena* arena) {
-  new (&_impl_) Impl_(internal_visibility(), arena);
-  _impl_.count_nulls_ = {};
-}
-AggSpec_AggSpecCountDistinct::~AggSpec_AggSpecCountDistinct() {
-  // @@protoc_insertion_point(destructor:io.deephaven.proto.backplane.grpc.AggSpec.AggSpecCountDistinct)
-  _internal_metadata_.Delete<::google::protobuf::UnknownFieldSet>();
-  SharedDtor();
-}
-inline void AggSpec_AggSpecCountDistinct::SharedDtor() {
-  ABSL_DCHECK(GetArena() == nullptr);
-  _impl_.~Impl_();
-}
-
-PROTOBUF_NOINLINE void AggSpec_AggSpecCountDistinct::Clear() {
-// @@protoc_insertion_point(message_clear_start:io.deephaven.proto.backplane.grpc.AggSpec.AggSpecCountDistinct)
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  ::uint32_t cached_has_bits = 0;
-  // Prevent compiler warnings about cached_has_bits being unused
-  (void) cached_has_bits;
-
-  _impl_.count_nulls_ = false;
-  _internal_metadata_.Clear<::google::protobuf::UnknownFieldSet>();
-}
-
-const char* AggSpec_AggSpecCountDistinct::_InternalParse(
-    const char* ptr, ::_pbi::ParseContext* ctx) {
-  ptr = ::_pbi::TcParser::ParseLoop(this, ptr, ctx, &_table_.header);
-  return ptr;
-}
-
-
-PROTOBUF_CONSTINIT PROTOBUF_ATTRIBUTE_INIT_PRIORITY1
-const ::_pbi::TcParseTable<0, 1, 0, 0, 2> AggSpec_AggSpecCountDistinct::_table_ = {
-  {
-    0,  // no _has_bits_
-    0, // no _extensions_
-    1, 0,  // max_field_number, fast_idx_mask
-    offsetof(decltype(_table_), field_lookup_table),
-    4294967294,  // skipmap
-    offsetof(decltype(_table_), field_entries),
-    1,  // num_field_entries
-    0,  // num_aux_entries
-    offsetof(decltype(_table_), field_names),  // no aux_entries
-    &_AggSpec_AggSpecCountDistinct_default_instance_._instance,
-    ::_pbi::TcParser::GenericFallback,  // fallback
-  }, {{
-    // bool count_nulls = 1;
-    {::_pbi::TcParser::SingularVarintNoZag1<bool, offsetof(AggSpec_AggSpecCountDistinct, _impl_.count_nulls_), 63>(),
-     {8, 63, 0, PROTOBUF_FIELD_OFFSET(AggSpec_AggSpecCountDistinct, _impl_.count_nulls_)}},
-  }}, {{
-    65535, 65535
-  }}, {{
-    // bool count_nulls = 1;
-    {PROTOBUF_FIELD_OFFSET(AggSpec_AggSpecCountDistinct, _impl_.count_nulls_), 0, 0,
-    (0 | ::_fl::kFcSingular | ::_fl::kBool)},
-  }},
-  // no aux_entries
-  {{
-  }},
-};
-
-::uint8_t* AggSpec_AggSpecCountDistinct::_InternalSerialize(
-    ::uint8_t* target,
-    ::google::protobuf::io::EpsCopyOutputStream* stream) const {
-  // @@protoc_insertion_point(serialize_to_array_start:io.deephaven.proto.backplane.grpc.AggSpec.AggSpecCountDistinct)
-  ::uint32_t cached_has_bits = 0;
-  (void)cached_has_bits;
-
-  // bool count_nulls = 1;
-  if (this->_internal_count_nulls() != 0) {
-    target = stream->EnsureSpace(target);
-    target = ::_pbi::WireFormatLite::WriteBoolToArray(
-        1, this->_internal_count_nulls(), target);
-  }
-
-  if (PROTOBUF_PREDICT_FALSE(_internal_metadata_.have_unknown_fields())) {
-    target =
-        ::_pbi::WireFormat::InternalSerializeUnknownFieldsToArray(
-            _internal_metadata_.unknown_fields<::google::protobuf::UnknownFieldSet>(::google::protobuf::UnknownFieldSet::default_instance), target, stream);
-  }
-  // @@protoc_insertion_point(serialize_to_array_end:io.deephaven.proto.backplane.grpc.AggSpec.AggSpecCountDistinct)
-  return target;
-}
-
-::size_t AggSpec_AggSpecCountDistinct::ByteSizeLong() const {
-// @@protoc_insertion_point(message_byte_size_start:io.deephaven.proto.backplane.grpc.AggSpec.AggSpecCountDistinct)
-  ::size_t total_size = 0;
-
-  ::uint32_t cached_has_bits = 0;
-  // Prevent compiler warnings about cached_has_bits being unused
-  (void) cached_has_bits;
-
-  // bool count_nulls = 1;
-  if (this->_internal_count_nulls() != 0) {
-    total_size += 2;
-  }
-
-  return MaybeComputeUnknownFieldsSize(total_size, &_impl_._cached_size_);
-}
-
-const ::google::protobuf::Message::ClassData AggSpec_AggSpecCountDistinct::_class_data_ = {
-    AggSpec_AggSpecCountDistinct::MergeImpl,
-    nullptr,  // OnDemandRegisterArenaDtor
-};
-const ::google::protobuf::Message::ClassData* AggSpec_AggSpecCountDistinct::GetClassData() const {
-  return &_class_data_;
-}
-
-void AggSpec_AggSpecCountDistinct::MergeImpl(::google::protobuf::Message& to_msg, const ::google::protobuf::Message& from_msg) {
-  auto* const _this = static_cast<AggSpec_AggSpecCountDistinct*>(&to_msg);
-  auto& from = static_cast<const AggSpec_AggSpecCountDistinct&>(from_msg);
-  // @@protoc_insertion_point(class_specific_merge_from_start:io.deephaven.proto.backplane.grpc.AggSpec.AggSpecCountDistinct)
-  ABSL_DCHECK_NE(&from, _this);
-  ::uint32_t cached_has_bits = 0;
-  (void) cached_has_bits;
-
-  if (from._internal_count_nulls() != 0) {
-    _this->_internal_set_count_nulls(from._internal_count_nulls());
-  }
-  _this->_internal_metadata_.MergeFrom<::google::protobuf::UnknownFieldSet>(from._internal_metadata_);
-}
-
-void AggSpec_AggSpecCountDistinct::CopyFrom(const AggSpec_AggSpecCountDistinct& from) {
-// @@protoc_insertion_point(class_specific_copy_from_start:io.deephaven.proto.backplane.grpc.AggSpec.AggSpecCountDistinct)
-  if (&from == this) return;
-  Clear();
-  MergeFrom(from);
-}
-
-PROTOBUF_NOINLINE bool AggSpec_AggSpecCountDistinct::IsInitialized() const {
-  return true;
-}
-
-::_pbi::CachedSize* AggSpec_AggSpecCountDistinct::AccessCachedSize() const {
-  return &_impl_._cached_size_;
-}
-void AggSpec_AggSpecCountDistinct::InternalSwap(AggSpec_AggSpecCountDistinct* PROTOBUF_RESTRICT other) {
-  using std::swap;
-  _internal_metadata_.InternalSwap(&other->_internal_metadata_);
-        swap(_impl_.count_nulls_, other->_impl_.count_nulls_);
-}
-
-::google::protobuf::Metadata AggSpec_AggSpecCountDistinct::GetMetadata() const {
-  return ::_pbi::AssignDescriptors(
-      &descriptor_table_deephaven_2fproto_2ftable_2eproto_getter, &descriptor_table_deephaven_2fproto_2ftable_2eproto_once,
-      file_level_metadata_deephaven_2fproto_2ftable_2eproto[63]);
-}
-// ===================================================================
-
-class AggSpec_AggSpecDistinct::_Internal {
- public:
-};
-
-AggSpec_AggSpecDistinct::AggSpec_AggSpecDistinct(::google::protobuf::Arena* arena)
-    : ::google::protobuf::Message(arena) {
-  SharedCtor(arena);
-  // @@protoc_insertion_point(arena_constructor:io.deephaven.proto.backplane.grpc.AggSpec.AggSpecDistinct)
-}
-AggSpec_AggSpecDistinct::AggSpec_AggSpecDistinct(
-    ::google::protobuf::Arena* arena, const AggSpec_AggSpecDistinct& from)
-    : AggSpec_AggSpecDistinct(arena) {
-  MergeFrom(from);
-}
-inline PROTOBUF_NDEBUG_INLINE AggSpec_AggSpecDistinct::Impl_::Impl_(
-    ::google::protobuf::internal::InternalVisibility visibility,
-    ::google::protobuf::Arena* arena)
-      : _cached_size_{0} {}
-
-inline void AggSpec_AggSpecDistinct::SharedCtor(::_pb::Arena* arena) {
-  new (&_impl_) Impl_(internal_visibility(), arena);
-  _impl_.include_nulls_ = {};
-}
-AggSpec_AggSpecDistinct::~AggSpec_AggSpecDistinct() {
-  // @@protoc_insertion_point(destructor:io.deephaven.proto.backplane.grpc.AggSpec.AggSpecDistinct)
-  _internal_metadata_.Delete<::google::protobuf::UnknownFieldSet>();
-  SharedDtor();
-}
-inline void AggSpec_AggSpecDistinct::SharedDtor() {
-  ABSL_DCHECK(GetArena() == nullptr);
-  _impl_.~Impl_();
-}
-
-PROTOBUF_NOINLINE void AggSpec_AggSpecDistinct::Clear() {
-// @@protoc_insertion_point(message_clear_start:io.deephaven.proto.backplane.grpc.AggSpec.AggSpecDistinct)
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  ::uint32_t cached_has_bits = 0;
-  // Prevent compiler warnings about cached_has_bits being unused
-  (void) cached_has_bits;
-
-  _impl_.include_nulls_ = false;
-  _internal_metadata_.Clear<::google::protobuf::UnknownFieldSet>();
-}
-
-const char* AggSpec_AggSpecDistinct::_InternalParse(
-    const char* ptr, ::_pbi::ParseContext* ctx) {
-  ptr = ::_pbi::TcParser::ParseLoop(this, ptr, ctx, &_table_.header);
-  return ptr;
-}
-
-
-PROTOBUF_CONSTINIT PROTOBUF_ATTRIBUTE_INIT_PRIORITY1
-const ::_pbi::TcParseTable<0, 1, 0, 0, 2> AggSpec_AggSpecDistinct::_table_ = {
-  {
-    0,  // no _has_bits_
-    0, // no _extensions_
-    1, 0,  // max_field_number, fast_idx_mask
-    offsetof(decltype(_table_), field_lookup_table),
-    4294967294,  // skipmap
-    offsetof(decltype(_table_), field_entries),
-    1,  // num_field_entries
-    0,  // num_aux_entries
-    offsetof(decltype(_table_), field_names),  // no aux_entries
-    &_AggSpec_AggSpecDistinct_default_instance_._instance,
-    ::_pbi::TcParser::GenericFallback,  // fallback
-  }, {{
-    // bool include_nulls = 1;
-    {::_pbi::TcParser::SingularVarintNoZag1<bool, offsetof(AggSpec_AggSpecDistinct, _impl_.include_nulls_), 63>(),
-     {8, 63, 0, PROTOBUF_FIELD_OFFSET(AggSpec_AggSpecDistinct, _impl_.include_nulls_)}},
-  }}, {{
-    65535, 65535
-  }}, {{
-    // bool include_nulls = 1;
-    {PROTOBUF_FIELD_OFFSET(AggSpec_AggSpecDistinct, _impl_.include_nulls_), 0, 0,
-    (0 | ::_fl::kFcSingular | ::_fl::kBool)},
-  }},
-  // no aux_entries
-  {{
-  }},
-};
-
-::uint8_t* AggSpec_AggSpecDistinct::_InternalSerialize(
-    ::uint8_t* target,
-    ::google::protobuf::io::EpsCopyOutputStream* stream) const {
-  // @@protoc_insertion_point(serialize_to_array_start:io.deephaven.proto.backplane.grpc.AggSpec.AggSpecDistinct)
-  ::uint32_t cached_has_bits = 0;
-  (void)cached_has_bits;
-
-  // bool include_nulls = 1;
-  if (this->_internal_include_nulls() != 0) {
-    target = stream->EnsureSpace(target);
-    target = ::_pbi::WireFormatLite::WriteBoolToArray(
-        1, this->_internal_include_nulls(), target);
-  }
-
-  if (PROTOBUF_PREDICT_FALSE(_internal_metadata_.have_unknown_fields())) {
-    target =
-        ::_pbi::WireFormat::InternalSerializeUnknownFieldsToArray(
-            _internal_metadata_.unknown_fields<::google::protobuf::UnknownFieldSet>(::google::protobuf::UnknownFieldSet::default_instance), target, stream);
-  }
-  // @@protoc_insertion_point(serialize_to_array_end:io.deephaven.proto.backplane.grpc.AggSpec.AggSpecDistinct)
-  return target;
-}
-
-::size_t AggSpec_AggSpecDistinct::ByteSizeLong() const {
-// @@protoc_insertion_point(message_byte_size_start:io.deephaven.proto.backplane.grpc.AggSpec.AggSpecDistinct)
-  ::size_t total_size = 0;
-
-  ::uint32_t cached_has_bits = 0;
-  // Prevent compiler warnings about cached_has_bits being unused
-  (void) cached_has_bits;
-
-  // bool include_nulls = 1;
-  if (this->_internal_include_nulls() != 0) {
-    total_size += 2;
-  }
-
-  return MaybeComputeUnknownFieldsSize(total_size, &_impl_._cached_size_);
-}
-
-const ::google::protobuf::Message::ClassData AggSpec_AggSpecDistinct::_class_data_ = {
-    AggSpec_AggSpecDistinct::MergeImpl,
-    nullptr,  // OnDemandRegisterArenaDtor
-};
-const ::google::protobuf::Message::ClassData* AggSpec_AggSpecDistinct::GetClassData() const {
-  return &_class_data_;
-}
-
-void AggSpec_AggSpecDistinct::MergeImpl(::google::protobuf::Message& to_msg, const ::google::protobuf::Message& from_msg) {
-  auto* const _this = static_cast<AggSpec_AggSpecDistinct*>(&to_msg);
-  auto& from = static_cast<const AggSpec_AggSpecDistinct&>(from_msg);
-  // @@protoc_insertion_point(class_specific_merge_from_start:io.deephaven.proto.backplane.grpc.AggSpec.AggSpecDistinct)
-  ABSL_DCHECK_NE(&from, _this);
-  ::uint32_t cached_has_bits = 0;
-  (void) cached_has_bits;
-
-  if (from._internal_include_nulls() != 0) {
-    _this->_internal_set_include_nulls(from._internal_include_nulls());
-  }
-  _this->_internal_metadata_.MergeFrom<::google::protobuf::UnknownFieldSet>(from._internal_metadata_);
-}
-
-void AggSpec_AggSpecDistinct::CopyFrom(const AggSpec_AggSpecDistinct& from) {
-// @@protoc_insertion_point(class_specific_copy_from_start:io.deephaven.proto.backplane.grpc.AggSpec.AggSpecDistinct)
-  if (&from == this) return;
-  Clear();
-  MergeFrom(from);
-}
-
-PROTOBUF_NOINLINE bool AggSpec_AggSpecDistinct::IsInitialized() const {
-  return true;
-}
-
-::_pbi::CachedSize* AggSpec_AggSpecDistinct::AccessCachedSize() const {
-  return &_impl_._cached_size_;
-}
-void AggSpec_AggSpecDistinct::InternalSwap(AggSpec_AggSpecDistinct* PROTOBUF_RESTRICT other) {
-  using std::swap;
-  _internal_metadata_.InternalSwap(&other->_internal_metadata_);
-        swap(_impl_.include_nulls_, other->_impl_.include_nulls_);
-}
-
-::google::protobuf::Metadata AggSpec_AggSpecDistinct::GetMetadata() const {
-  return ::_pbi::AssignDescriptors(
-      &descriptor_table_deephaven_2fproto_2ftable_2eproto_getter, &descriptor_table_deephaven_2fproto_2ftable_2eproto_once,
-      file_level_metadata_deephaven_2fproto_2ftable_2eproto[64]);
-}
-// ===================================================================
-
-class AggSpec_AggSpecFormula::_Internal {
- public:
-};
-
-AggSpec_AggSpecFormula::AggSpec_AggSpecFormula(::google::protobuf::Arena* arena)
-    : ::google::protobuf::Message(arena) {
-  SharedCtor(arena);
-  // @@protoc_insertion_point(arena_constructor:io.deephaven.proto.backplane.grpc.AggSpec.AggSpecFormula)
-}
-inline PROTOBUF_NDEBUG_INLINE AggSpec_AggSpecFormula::Impl_::Impl_(
-    ::google::protobuf::internal::InternalVisibility visibility, ::google::protobuf::Arena* arena,
-    const Impl_& from)
-      : formula_(arena, from.formula_),
-        param_token_(arena, from.param_token_),
-        _cached_size_{0} {}
-
-AggSpec_AggSpecFormula::AggSpec_AggSpecFormula(
-    ::google::protobuf::Arena* arena,
-    const AggSpec_AggSpecFormula& from)
-    : ::google::protobuf::Message(arena) {
-  AggSpec_AggSpecFormula* const _this = this;
-  (void)_this;
-  _internal_metadata_.MergeFrom<::google::protobuf::UnknownFieldSet>(
-      from._internal_metadata_);
-  new (&_impl_) Impl_(internal_visibility(), arena, from._impl_);
-
-  // @@protoc_insertion_point(copy_constructor:io.deephaven.proto.backplane.grpc.AggSpec.AggSpecFormula)
-}
-inline PROTOBUF_NDEBUG_INLINE AggSpec_AggSpecFormula::Impl_::Impl_(
-    ::google::protobuf::internal::InternalVisibility visibility,
-    ::google::protobuf::Arena* arena)
-      : formula_(arena),
-        param_token_(arena),
-        _cached_size_{0} {}
-
-inline void AggSpec_AggSpecFormula::SharedCtor(::_pb::Arena* arena) {
-  new (&_impl_) Impl_(internal_visibility(), arena);
-}
-AggSpec_AggSpecFormula::~AggSpec_AggSpecFormula() {
-  // @@protoc_insertion_point(destructor:io.deephaven.proto.backplane.grpc.AggSpec.AggSpecFormula)
-  _internal_metadata_.Delete<::google::protobuf::UnknownFieldSet>();
-  SharedDtor();
-}
-inline void AggSpec_AggSpecFormula::SharedDtor() {
-  ABSL_DCHECK(GetArena() == nullptr);
-  _impl_.formula_.Destroy();
-  _impl_.param_token_.Destroy();
-  _impl_.~Impl_();
-}
-
-PROTOBUF_NOINLINE void AggSpec_AggSpecFormula::Clear() {
-// @@protoc_insertion_point(message_clear_start:io.deephaven.proto.backplane.grpc.AggSpec.AggSpecFormula)
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  ::uint32_t cached_has_bits = 0;
-  // Prevent compiler warnings about cached_has_bits being unused
-  (void) cached_has_bits;
-
-  _impl_.formula_.ClearToEmpty();
-  _impl_.param_token_.ClearToEmpty();
-  _internal_metadata_.Clear<::google::protobuf::UnknownFieldSet>();
-}
-
-const char* AggSpec_AggSpecFormula::_InternalParse(
-    const char* ptr, ::_pbi::ParseContext* ctx) {
-  ptr = ::_pbi::TcParser::ParseLoop(this, ptr, ctx, &_table_.header);
-  return ptr;
-}
-
-
-PROTOBUF_CONSTINIT PROTOBUF_ATTRIBUTE_INIT_PRIORITY1
-const ::_pbi::TcParseTable<1, 2, 0, 83, 2> AggSpec_AggSpecFormula::_table_ = {
-  {
-    0,  // no _has_bits_
-    0, // no _extensions_
-    2, 8,  // max_field_number, fast_idx_mask
-    offsetof(decltype(_table_), field_lookup_table),
-    4294967292,  // skipmap
-    offsetof(decltype(_table_), field_entries),
-    2,  // num_field_entries
-    0,  // num_aux_entries
-    offsetof(decltype(_table_), field_names),  // no aux_entries
-    &_AggSpec_AggSpecFormula_default_instance_._instance,
-    ::_pbi::TcParser::GenericFallback,  // fallback
-  }, {{
-    // string param_token = 2;
-    {::_pbi::TcParser::FastUS1,
-     {18, 63, 0, PROTOBUF_FIELD_OFFSET(AggSpec_AggSpecFormula, _impl_.param_token_)}},
-    // string formula = 1;
-    {::_pbi::TcParser::FastUS1,
-     {10, 63, 0, PROTOBUF_FIELD_OFFSET(AggSpec_AggSpecFormula, _impl_.formula_)}},
-  }}, {{
-    65535, 65535
-  }}, {{
-    // string formula = 1;
-    {PROTOBUF_FIELD_OFFSET(AggSpec_AggSpecFormula, _impl_.formula_), 0, 0,
-    (0 | ::_fl::kFcSingular | ::_fl::kUtf8String | ::_fl::kRepAString)},
-    // string param_token = 2;
-    {PROTOBUF_FIELD_OFFSET(AggSpec_AggSpecFormula, _impl_.param_token_), 0, 0,
-    (0 | ::_fl::kFcSingular | ::_fl::kUtf8String | ::_fl::kRepAString)},
-  }},
-  // no aux_entries
-  {{
-    "\70\7\13\0\0\0\0\0"
-    "io.deephaven.proto.backplane.grpc.AggSpec.AggSpecFormula"
-    "formula"
-    "param_token"
-  }},
-};
-
-::uint8_t* AggSpec_AggSpecFormula::_InternalSerialize(
-    ::uint8_t* target,
-    ::google::protobuf::io::EpsCopyOutputStream* stream) const {
-  // @@protoc_insertion_point(serialize_to_array_start:io.deephaven.proto.backplane.grpc.AggSpec.AggSpecFormula)
-  ::uint32_t cached_has_bits = 0;
-  (void)cached_has_bits;
-
-  // string formula = 1;
-  if (!this->_internal_formula().empty()) {
-    const std::string& _s = this->_internal_formula();
-    ::google::protobuf::internal::WireFormatLite::VerifyUtf8String(
-        _s.data(), static_cast<int>(_s.length()), ::google::protobuf::internal::WireFormatLite::SERIALIZE, "io.deephaven.proto.backplane.grpc.AggSpec.AggSpecFormula.formula");
-    target = stream->WriteStringMaybeAliased(1, _s, target);
-  }
-
-  // string param_token = 2;
-  if (!this->_internal_param_token().empty()) {
-    const std::string& _s = this->_internal_param_token();
-    ::google::protobuf::internal::WireFormatLite::VerifyUtf8String(
-        _s.data(), static_cast<int>(_s.length()), ::google::protobuf::internal::WireFormatLite::SERIALIZE, "io.deephaven.proto.backplane.grpc.AggSpec.AggSpecFormula.param_token");
-    target = stream->WriteStringMaybeAliased(2, _s, target);
-  }
-
-  if (PROTOBUF_PREDICT_FALSE(_internal_metadata_.have_unknown_fields())) {
-    target =
-        ::_pbi::WireFormat::InternalSerializeUnknownFieldsToArray(
-            _internal_metadata_.unknown_fields<::google::protobuf::UnknownFieldSet>(::google::protobuf::UnknownFieldSet::default_instance), target, stream);
-  }
-  // @@protoc_insertion_point(serialize_to_array_end:io.deephaven.proto.backplane.grpc.AggSpec.AggSpecFormula)
-  return target;
-}
-
-::size_t AggSpec_AggSpecFormula::ByteSizeLong() const {
-// @@protoc_insertion_point(message_byte_size_start:io.deephaven.proto.backplane.grpc.AggSpec.AggSpecFormula)
-  ::size_t total_size = 0;
-
-  ::uint32_t cached_has_bits = 0;
-  // Prevent compiler warnings about cached_has_bits being unused
-  (void) cached_has_bits;
-
-  // string formula = 1;
-  if (!this->_internal_formula().empty()) {
-    total_size += 1 + ::google::protobuf::internal::WireFormatLite::StringSize(
-                                    this->_internal_formula());
-  }
-
-  // string param_token = 2;
-  if (!this->_internal_param_token().empty()) {
-    total_size += 1 + ::google::protobuf::internal::WireFormatLite::StringSize(
-                                    this->_internal_param_token());
-  }
-
-  return MaybeComputeUnknownFieldsSize(total_size, &_impl_._cached_size_);
-}
-
-const ::google::protobuf::Message::ClassData AggSpec_AggSpecFormula::_class_data_ = {
-    AggSpec_AggSpecFormula::MergeImpl,
-    nullptr,  // OnDemandRegisterArenaDtor
-};
-const ::google::protobuf::Message::ClassData* AggSpec_AggSpecFormula::GetClassData() const {
-  return &_class_data_;
-}
-
-void AggSpec_AggSpecFormula::MergeImpl(::google::protobuf::Message& to_msg, const ::google::protobuf::Message& from_msg) {
-  auto* const _this = static_cast<AggSpec_AggSpecFormula*>(&to_msg);
-  auto& from = static_cast<const AggSpec_AggSpecFormula&>(from_msg);
-  // @@protoc_insertion_point(class_specific_merge_from_start:io.deephaven.proto.backplane.grpc.AggSpec.AggSpecFormula)
-  ABSL_DCHECK_NE(&from, _this);
-  ::uint32_t cached_has_bits = 0;
-  (void) cached_has_bits;
-
-  if (!from._internal_formula().empty()) {
-    _this->_internal_set_formula(from._internal_formula());
-  }
-  if (!from._internal_param_token().empty()) {
-    _this->_internal_set_param_token(from._internal_param_token());
-  }
-  _this->_internal_metadata_.MergeFrom<::google::protobuf::UnknownFieldSet>(from._internal_metadata_);
-}
-
-void AggSpec_AggSpecFormula::CopyFrom(const AggSpec_AggSpecFormula& from) {
-// @@protoc_insertion_point(class_specific_copy_from_start:io.deephaven.proto.backplane.grpc.AggSpec.AggSpecFormula)
-  if (&from == this) return;
-  Clear();
-  MergeFrom(from);
-}
-
-PROTOBUF_NOINLINE bool AggSpec_AggSpecFormula::IsInitialized() const {
-  return true;
-}
-
-::_pbi::CachedSize* AggSpec_AggSpecFormula::AccessCachedSize() const {
-  return &_impl_._cached_size_;
-}
-void AggSpec_AggSpecFormula::InternalSwap(AggSpec_AggSpecFormula* PROTOBUF_RESTRICT other) {
-  using std::swap;
-  auto* arena = GetArena();
-  ABSL_DCHECK_EQ(arena, other->GetArena());
-  _internal_metadata_.InternalSwap(&other->_internal_metadata_);
-  ::_pbi::ArenaStringPtr::InternalSwap(&_impl_.formula_, &other->_impl_.formula_, arena);
-  ::_pbi::ArenaStringPtr::InternalSwap(&_impl_.param_token_, &other->_impl_.param_token_, arena);
-}
-
-::google::protobuf::Metadata AggSpec_AggSpecFormula::GetMetadata() const {
-  return ::_pbi::AssignDescriptors(
-      &descriptor_table_deephaven_2fproto_2ftable_2eproto_getter, &descriptor_table_deephaven_2fproto_2ftable_2eproto_once,
-      file_level_metadata_deephaven_2fproto_2ftable_2eproto[65]);
-}
-// ===================================================================
-
-class AggSpec_AggSpecMedian::_Internal {
- public:
-};
-
-AggSpec_AggSpecMedian::AggSpec_AggSpecMedian(::google::protobuf::Arena* arena)
-    : ::google::protobuf::Message(arena) {
-  SharedCtor(arena);
-  // @@protoc_insertion_point(arena_constructor:io.deephaven.proto.backplane.grpc.AggSpec.AggSpecMedian)
-}
-AggSpec_AggSpecMedian::AggSpec_AggSpecMedian(
-    ::google::protobuf::Arena* arena, const AggSpec_AggSpecMedian& from)
-    : AggSpec_AggSpecMedian(arena) {
-  MergeFrom(from);
-}
-inline PROTOBUF_NDEBUG_INLINE AggSpec_AggSpecMedian::Impl_::Impl_(
-    ::google::protobuf::internal::InternalVisibility visibility,
-    ::google::protobuf::Arena* arena)
-      : _cached_size_{0} {}
-
-inline void AggSpec_AggSpecMedian::SharedCtor(::_pb::Arena* arena) {
-  new (&_impl_) Impl_(internal_visibility(), arena);
-  _impl_.average_evenly_divided_ = {};
-}
-AggSpec_AggSpecMedian::~AggSpec_AggSpecMedian() {
-  // @@protoc_insertion_point(destructor:io.deephaven.proto.backplane.grpc.AggSpec.AggSpecMedian)
-  _internal_metadata_.Delete<::google::protobuf::UnknownFieldSet>();
-  SharedDtor();
-}
-inline void AggSpec_AggSpecMedian::SharedDtor() {
-  ABSL_DCHECK(GetArena() == nullptr);
-  _impl_.~Impl_();
-}
-
-PROTOBUF_NOINLINE void AggSpec_AggSpecMedian::Clear() {
-// @@protoc_insertion_point(message_clear_start:io.deephaven.proto.backplane.grpc.AggSpec.AggSpecMedian)
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  ::uint32_t cached_has_bits = 0;
-  // Prevent compiler warnings about cached_has_bits being unused
-  (void) cached_has_bits;
-
-  _impl_.average_evenly_divided_ = false;
-  _internal_metadata_.Clear<::google::protobuf::UnknownFieldSet>();
-}
-
-const char* AggSpec_AggSpecMedian::_InternalParse(
-    const char* ptr, ::_pbi::ParseContext* ctx) {
-  ptr = ::_pbi::TcParser::ParseLoop(this, ptr, ctx, &_table_.header);
-  return ptr;
-}
-
-
-PROTOBUF_CONSTINIT PROTOBUF_ATTRIBUTE_INIT_PRIORITY1
-const ::_pbi::TcParseTable<0, 1, 0, 0, 2> AggSpec_AggSpecMedian::_table_ = {
-  {
-    0,  // no _has_bits_
-    0, // no _extensions_
-    1, 0,  // max_field_number, fast_idx_mask
-    offsetof(decltype(_table_), field_lookup_table),
-    4294967294,  // skipmap
-    offsetof(decltype(_table_), field_entries),
-    1,  // num_field_entries
-    0,  // num_aux_entries
-    offsetof(decltype(_table_), field_names),  // no aux_entries
-    &_AggSpec_AggSpecMedian_default_instance_._instance,
-    ::_pbi::TcParser::GenericFallback,  // fallback
-  }, {{
-    // bool average_evenly_divided = 1;
-    {::_pbi::TcParser::SingularVarintNoZag1<bool, offsetof(AggSpec_AggSpecMedian, _impl_.average_evenly_divided_), 63>(),
-     {8, 63, 0, PROTOBUF_FIELD_OFFSET(AggSpec_AggSpecMedian, _impl_.average_evenly_divided_)}},
-  }}, {{
-    65535, 65535
-  }}, {{
-    // bool average_evenly_divided = 1;
-    {PROTOBUF_FIELD_OFFSET(AggSpec_AggSpecMedian, _impl_.average_evenly_divided_), 0, 0,
-    (0 | ::_fl::kFcSingular | ::_fl::kBool)},
-  }},
-  // no aux_entries
-  {{
-  }},
-};
-
-::uint8_t* AggSpec_AggSpecMedian::_InternalSerialize(
-    ::uint8_t* target,
-    ::google::protobuf::io::EpsCopyOutputStream* stream) const {
-  // @@protoc_insertion_point(serialize_to_array_start:io.deephaven.proto.backplane.grpc.AggSpec.AggSpecMedian)
-  ::uint32_t cached_has_bits = 0;
-  (void)cached_has_bits;
-
-  // bool average_evenly_divided = 1;
-  if (this->_internal_average_evenly_divided() != 0) {
-    target = stream->EnsureSpace(target);
-    target = ::_pbi::WireFormatLite::WriteBoolToArray(
-        1, this->_internal_average_evenly_divided(), target);
-  }
-
-  if (PROTOBUF_PREDICT_FALSE(_internal_metadata_.have_unknown_fields())) {
-    target =
-        ::_pbi::WireFormat::InternalSerializeUnknownFieldsToArray(
-            _internal_metadata_.unknown_fields<::google::protobuf::UnknownFieldSet>(::google::protobuf::UnknownFieldSet::default_instance), target, stream);
-  }
-  // @@protoc_insertion_point(serialize_to_array_end:io.deephaven.proto.backplane.grpc.AggSpec.AggSpecMedian)
-  return target;
-}
-
-::size_t AggSpec_AggSpecMedian::ByteSizeLong() const {
-// @@protoc_insertion_point(message_byte_size_start:io.deephaven.proto.backplane.grpc.AggSpec.AggSpecMedian)
-  ::size_t total_size = 0;
-
-  ::uint32_t cached_has_bits = 0;
-  // Prevent compiler warnings about cached_has_bits being unused
-  (void) cached_has_bits;
-
-  // bool average_evenly_divided = 1;
-  if (this->_internal_average_evenly_divided() != 0) {
-    total_size += 2;
-  }
-
-  return MaybeComputeUnknownFieldsSize(total_size, &_impl_._cached_size_);
-}
-
-const ::google::protobuf::Message::ClassData AggSpec_AggSpecMedian::_class_data_ = {
-    AggSpec_AggSpecMedian::MergeImpl,
-    nullptr,  // OnDemandRegisterArenaDtor
-};
-const ::google::protobuf::Message::ClassData* AggSpec_AggSpecMedian::GetClassData() const {
-  return &_class_data_;
-}
-
-void AggSpec_AggSpecMedian::MergeImpl(::google::protobuf::Message& to_msg, const ::google::protobuf::Message& from_msg) {
-  auto* const _this = static_cast<AggSpec_AggSpecMedian*>(&to_msg);
-  auto& from = static_cast<const AggSpec_AggSpecMedian&>(from_msg);
-  // @@protoc_insertion_point(class_specific_merge_from_start:io.deephaven.proto.backplane.grpc.AggSpec.AggSpecMedian)
-  ABSL_DCHECK_NE(&from, _this);
-  ::uint32_t cached_has_bits = 0;
-  (void) cached_has_bits;
-
-  if (from._internal_average_evenly_divided() != 0) {
-    _this->_internal_set_average_evenly_divided(from._internal_average_evenly_divided());
-  }
-  _this->_internal_metadata_.MergeFrom<::google::protobuf::UnknownFieldSet>(from._internal_metadata_);
-}
-
-void AggSpec_AggSpecMedian::CopyFrom(const AggSpec_AggSpecMedian& from) {
-// @@protoc_insertion_point(class_specific_copy_from_start:io.deephaven.proto.backplane.grpc.AggSpec.AggSpecMedian)
-  if (&from == this) return;
-  Clear();
-  MergeFrom(from);
-}
-
-PROTOBUF_NOINLINE bool AggSpec_AggSpecMedian::IsInitialized() const {
-  return true;
-}
-
-::_pbi::CachedSize* AggSpec_AggSpecMedian::AccessCachedSize() const {
-  return &_impl_._cached_size_;
-}
-void AggSpec_AggSpecMedian::InternalSwap(AggSpec_AggSpecMedian* PROTOBUF_RESTRICT other) {
-  using std::swap;
-  _internal_metadata_.InternalSwap(&other->_internal_metadata_);
-        swap(_impl_.average_evenly_divided_, other->_impl_.average_evenly_divided_);
-}
-
-::google::protobuf::Metadata AggSpec_AggSpecMedian::GetMetadata() const {
-  return ::_pbi::AssignDescriptors(
-      &descriptor_table_deephaven_2fproto_2ftable_2eproto_getter, &descriptor_table_deephaven_2fproto_2ftable_2eproto_once,
-      file_level_metadata_deephaven_2fproto_2ftable_2eproto[66]);
-}
-// ===================================================================
-
-class AggSpec_AggSpecPercentile::_Internal {
- public:
-};
-
-AggSpec_AggSpecPercentile::AggSpec_AggSpecPercentile(::google::protobuf::Arena* arena)
-    : ::google::protobuf::Message(arena) {
-  SharedCtor(arena);
-  // @@protoc_insertion_point(arena_constructor:io.deephaven.proto.backplane.grpc.AggSpec.AggSpecPercentile)
-}
-AggSpec_AggSpecPercentile::AggSpec_AggSpecPercentile(
-    ::google::protobuf::Arena* arena, const AggSpec_AggSpecPercentile& from)
-    : AggSpec_AggSpecPercentile(arena) {
-  MergeFrom(from);
-}
-inline PROTOBUF_NDEBUG_INLINE AggSpec_AggSpecPercentile::Impl_::Impl_(
-    ::google::protobuf::internal::InternalVisibility visibility,
-    ::google::protobuf::Arena* arena)
-      : _cached_size_{0} {}
-
-inline void AggSpec_AggSpecPercentile::SharedCtor(::_pb::Arena* arena) {
-  new (&_impl_) Impl_(internal_visibility(), arena);
-  ::memset(reinterpret_cast<char *>(&_impl_) +
-               offsetof(Impl_, percentile_),
-           0,
-           offsetof(Impl_, average_evenly_divided_) -
-               offsetof(Impl_, percentile_) +
-               sizeof(Impl_::average_evenly_divided_));
-}
-AggSpec_AggSpecPercentile::~AggSpec_AggSpecPercentile() {
-  // @@protoc_insertion_point(destructor:io.deephaven.proto.backplane.grpc.AggSpec.AggSpecPercentile)
-  _internal_metadata_.Delete<::google::protobuf::UnknownFieldSet>();
-  SharedDtor();
-}
-inline void AggSpec_AggSpecPercentile::SharedDtor() {
-  ABSL_DCHECK(GetArena() == nullptr);
-  _impl_.~Impl_();
-}
-
-PROTOBUF_NOINLINE void AggSpec_AggSpecPercentile::Clear() {
-// @@protoc_insertion_point(message_clear_start:io.deephaven.proto.backplane.grpc.AggSpec.AggSpecPercentile)
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  ::uint32_t cached_has_bits = 0;
-  // Prevent compiler warnings about cached_has_bits being unused
-  (void) cached_has_bits;
-
-  ::memset(&_impl_.percentile_, 0, static_cast<::size_t>(
-      reinterpret_cast<char*>(&_impl_.average_evenly_divided_) -
-      reinterpret_cast<char*>(&_impl_.percentile_)) + sizeof(_impl_.average_evenly_divided_));
-  _internal_metadata_.Clear<::google::protobuf::UnknownFieldSet>();
-}
-
-const char* AggSpec_AggSpecPercentile::_InternalParse(
-    const char* ptr, ::_pbi::ParseContext* ctx) {
-  ptr = ::_pbi::TcParser::ParseLoop(this, ptr, ctx, &_table_.header);
-  return ptr;
-}
-
-
-PROTOBUF_CONSTINIT PROTOBUF_ATTRIBUTE_INIT_PRIORITY1
-const ::_pbi::TcParseTable<1, 2, 0, 0, 2> AggSpec_AggSpecPercentile::_table_ = {
-  {
-    0,  // no _has_bits_
-    0, // no _extensions_
-    2, 8,  // max_field_number, fast_idx_mask
-    offsetof(decltype(_table_), field_lookup_table),
-    4294967292,  // skipmap
-    offsetof(decltype(_table_), field_entries),
-    2,  // num_field_entries
-    0,  // num_aux_entries
-    offsetof(decltype(_table_), field_names),  // no aux_entries
-    &_AggSpec_AggSpecPercentile_default_instance_._instance,
-    ::_pbi::TcParser::GenericFallback,  // fallback
-  }, {{
-    // bool average_evenly_divided = 2;
-    {::_pbi::TcParser::SingularVarintNoZag1<bool, offsetof(AggSpec_AggSpecPercentile, _impl_.average_evenly_divided_), 63>(),
-     {16, 63, 0, PROTOBUF_FIELD_OFFSET(AggSpec_AggSpecPercentile, _impl_.average_evenly_divided_)}},
-    // double percentile = 1;
-    {::_pbi::TcParser::FastF64S1,
-     {9, 63, 0, PROTOBUF_FIELD_OFFSET(AggSpec_AggSpecPercentile, _impl_.percentile_)}},
-  }}, {{
-    65535, 65535
-  }}, {{
-    // double percentile = 1;
-    {PROTOBUF_FIELD_OFFSET(AggSpec_AggSpecPercentile, _impl_.percentile_), 0, 0,
-    (0 | ::_fl::kFcSingular | ::_fl::kDouble)},
-    // bool average_evenly_divided = 2;
-    {PROTOBUF_FIELD_OFFSET(AggSpec_AggSpecPercentile, _impl_.average_evenly_divided_), 0, 0,
-    (0 | ::_fl::kFcSingular | ::_fl::kBool)},
-  }},
-  // no aux_entries
-  {{
-  }},
-};
-
-::uint8_t* AggSpec_AggSpecPercentile::_InternalSerialize(
-    ::uint8_t* target,
-    ::google::protobuf::io::EpsCopyOutputStream* stream) const {
-  // @@protoc_insertion_point(serialize_to_array_start:io.deephaven.proto.backplane.grpc.AggSpec.AggSpecPercentile)
-  ::uint32_t cached_has_bits = 0;
-  (void)cached_has_bits;
-
-  // double percentile = 1;
-  static_assert(sizeof(::uint64_t) == sizeof(double),
-                "Code assumes ::uint64_t and double are the same size.");
-  double tmp_percentile = this->_internal_percentile();
-  ::uint64_t raw_percentile;
-  memcpy(&raw_percentile, &tmp_percentile, sizeof(tmp_percentile));
-  if (raw_percentile != 0) {
-    target = stream->EnsureSpace(target);
-    target = ::_pbi::WireFormatLite::WriteDoubleToArray(
-        1, this->_internal_percentile(), target);
-  }
-
-  // bool average_evenly_divided = 2;
-  if (this->_internal_average_evenly_divided() != 0) {
-    target = stream->EnsureSpace(target);
-    target = ::_pbi::WireFormatLite::WriteBoolToArray(
-        2, this->_internal_average_evenly_divided(), target);
-  }
-
-  if (PROTOBUF_PREDICT_FALSE(_internal_metadata_.have_unknown_fields())) {
-    target =
-        ::_pbi::WireFormat::InternalSerializeUnknownFieldsToArray(
-            _internal_metadata_.unknown_fields<::google::protobuf::UnknownFieldSet>(::google::protobuf::UnknownFieldSet::default_instance), target, stream);
-  }
-  // @@protoc_insertion_point(serialize_to_array_end:io.deephaven.proto.backplane.grpc.AggSpec.AggSpecPercentile)
-  return target;
-}
-
-::size_t AggSpec_AggSpecPercentile::ByteSizeLong() const {
-// @@protoc_insertion_point(message_byte_size_start:io.deephaven.proto.backplane.grpc.AggSpec.AggSpecPercentile)
-  ::size_t total_size = 0;
-
-  ::uint32_t cached_has_bits = 0;
-  // Prevent compiler warnings about cached_has_bits being unused
-  (void) cached_has_bits;
-
-  // double percentile = 1;
-  static_assert(sizeof(::uint64_t) == sizeof(double),
-                "Code assumes ::uint64_t and double are the same size.");
-  double tmp_percentile = this->_internal_percentile();
-  ::uint64_t raw_percentile;
-  memcpy(&raw_percentile, &tmp_percentile, sizeof(tmp_percentile));
-  if (raw_percentile != 0) {
-    total_size += 9;
-  }
-
-  // bool average_evenly_divided = 2;
-  if (this->_internal_average_evenly_divided() != 0) {
-    total_size += 2;
-  }
-
-  return MaybeComputeUnknownFieldsSize(total_size, &_impl_._cached_size_);
-}
-
-const ::google::protobuf::Message::ClassData AggSpec_AggSpecPercentile::_class_data_ = {
-    AggSpec_AggSpecPercentile::MergeImpl,
-    nullptr,  // OnDemandRegisterArenaDtor
-};
-const ::google::protobuf::Message::ClassData* AggSpec_AggSpecPercentile::GetClassData() const {
-  return &_class_data_;
-}
-
-void AggSpec_AggSpecPercentile::MergeImpl(::google::protobuf::Message& to_msg, const ::google::protobuf::Message& from_msg) {
-  auto* const _this = static_cast<AggSpec_AggSpecPercentile*>(&to_msg);
-  auto& from = static_cast<const AggSpec_AggSpecPercentile&>(from_msg);
-  // @@protoc_insertion_point(class_specific_merge_from_start:io.deephaven.proto.backplane.grpc.AggSpec.AggSpecPercentile)
-  ABSL_DCHECK_NE(&from, _this);
-  ::uint32_t cached_has_bits = 0;
-  (void) cached_has_bits;
-
-  static_assert(sizeof(::uint64_t) == sizeof(double),
-                "Code assumes ::uint64_t and double are the same size.");
-  double tmp_percentile = from._internal_percentile();
-  ::uint64_t raw_percentile;
-  memcpy(&raw_percentile, &tmp_percentile, sizeof(tmp_percentile));
-  if (raw_percentile != 0) {
-    _this->_internal_set_percentile(from._internal_percentile());
-  }
-  if (from._internal_average_evenly_divided() != 0) {
-    _this->_internal_set_average_evenly_divided(from._internal_average_evenly_divided());
-  }
-  _this->_internal_metadata_.MergeFrom<::google::protobuf::UnknownFieldSet>(from._internal_metadata_);
-}
-
-void AggSpec_AggSpecPercentile::CopyFrom(const AggSpec_AggSpecPercentile& from) {
-// @@protoc_insertion_point(class_specific_copy_from_start:io.deephaven.proto.backplane.grpc.AggSpec.AggSpecPercentile)
-  if (&from == this) return;
-  Clear();
-  MergeFrom(from);
-}
-
-PROTOBUF_NOINLINE bool AggSpec_AggSpecPercentile::IsInitialized() const {
-  return true;
-}
-
-::_pbi::CachedSize* AggSpec_AggSpecPercentile::AccessCachedSize() const {
-  return &_impl_._cached_size_;
-}
-void AggSpec_AggSpecPercentile::InternalSwap(AggSpec_AggSpecPercentile* PROTOBUF_RESTRICT other) {
-  using std::swap;
-  _internal_metadata_.InternalSwap(&other->_internal_metadata_);
-  ::google::protobuf::internal::memswap<
-      PROTOBUF_FIELD_OFFSET(AggSpec_AggSpecPercentile, _impl_.average_evenly_divided_)
-      + sizeof(AggSpec_AggSpecPercentile::_impl_.average_evenly_divided_)
-      - PROTOBUF_FIELD_OFFSET(AggSpec_AggSpecPercentile, _impl_.percentile_)>(
-          reinterpret_cast<char*>(&_impl_.percentile_),
-          reinterpret_cast<char*>(&other->_impl_.percentile_));
-}
-
-::google::protobuf::Metadata AggSpec_AggSpecPercentile::GetMetadata() const {
-  return ::_pbi::AssignDescriptors(
-      &descriptor_table_deephaven_2fproto_2ftable_2eproto_getter, &descriptor_table_deephaven_2fproto_2ftable_2eproto_once,
-      file_level_metadata_deephaven_2fproto_2ftable_2eproto[67]);
-}
-// ===================================================================
-
-class AggSpec_AggSpecSorted::_Internal {
- public:
-};
-
-AggSpec_AggSpecSorted::AggSpec_AggSpecSorted(::google::protobuf::Arena* arena)
-    : ::google::protobuf::Message(arena) {
-  SharedCtor(arena);
-  // @@protoc_insertion_point(arena_constructor:io.deephaven.proto.backplane.grpc.AggSpec.AggSpecSorted)
-}
-inline PROTOBUF_NDEBUG_INLINE AggSpec_AggSpecSorted::Impl_::Impl_(
-    ::google::protobuf::internal::InternalVisibility visibility, ::google::protobuf::Arena* arena,
-    const Impl_& from)
-      : columns_{visibility, arena, from.columns_},
-        _cached_size_{0} {}
-
-AggSpec_AggSpecSorted::AggSpec_AggSpecSorted(
-    ::google::protobuf::Arena* arena,
-    const AggSpec_AggSpecSorted& from)
-    : ::google::protobuf::Message(arena) {
-  AggSpec_AggSpecSorted* const _this = this;
-  (void)_this;
-  _internal_metadata_.MergeFrom<::google::protobuf::UnknownFieldSet>(
-      from._internal_metadata_);
-  new (&_impl_) Impl_(internal_visibility(), arena, from._impl_);
-
-  // @@protoc_insertion_point(copy_constructor:io.deephaven.proto.backplane.grpc.AggSpec.AggSpecSorted)
-}
-inline PROTOBUF_NDEBUG_INLINE AggSpec_AggSpecSorted::Impl_::Impl_(
-    ::google::protobuf::internal::InternalVisibility visibility,
-    ::google::protobuf::Arena* arena)
-      : columns_{visibility, arena},
-        _cached_size_{0} {}
-
-inline void AggSpec_AggSpecSorted::SharedCtor(::_pb::Arena* arena) {
-  new (&_impl_) Impl_(internal_visibility(), arena);
-}
-AggSpec_AggSpecSorted::~AggSpec_AggSpecSorted() {
-  // @@protoc_insertion_point(destructor:io.deephaven.proto.backplane.grpc.AggSpec.AggSpecSorted)
-  _internal_metadata_.Delete<::google::protobuf::UnknownFieldSet>();
-  SharedDtor();
-}
-inline void AggSpec_AggSpecSorted::SharedDtor() {
-  ABSL_DCHECK(GetArena() == nullptr);
-  _impl_.~Impl_();
-}
-
-PROTOBUF_NOINLINE void AggSpec_AggSpecSorted::Clear() {
-// @@protoc_insertion_point(message_clear_start:io.deephaven.proto.backplane.grpc.AggSpec.AggSpecSorted)
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  ::uint32_t cached_has_bits = 0;
-  // Prevent compiler warnings about cached_has_bits being unused
-  (void) cached_has_bits;
-
-  _impl_.columns_.Clear();
-  _internal_metadata_.Clear<::google::protobuf::UnknownFieldSet>();
-}
-
-const char* AggSpec_AggSpecSorted::_InternalParse(
-    const char* ptr, ::_pbi::ParseContext* ctx) {
-  ptr = ::_pbi::TcParser::ParseLoop(this, ptr, ctx, &_table_.header);
-  return ptr;
-}
-
-
-PROTOBUF_CONSTINIT PROTOBUF_ATTRIBUTE_INIT_PRIORITY1
-const ::_pbi::TcParseTable<0, 1, 1, 0, 2> AggSpec_AggSpecSorted::_table_ = {
-  {
-    0,  // no _has_bits_
-    0, // no _extensions_
-    1, 0,  // max_field_number, fast_idx_mask
-    offsetof(decltype(_table_), field_lookup_table),
-    4294967294,  // skipmap
-    offsetof(decltype(_table_), field_entries),
-    1,  // num_field_entries
-    1,  // num_aux_entries
-    offsetof(decltype(_table_), aux_entries),
-    &_AggSpec_AggSpecSorted_default_instance_._instance,
-    ::_pbi::TcParser::GenericFallback,  // fallback
-  }, {{
-    // repeated .io.deephaven.proto.backplane.grpc.AggSpec.AggSpecSortedColumn columns = 1;
-    {::_pbi::TcParser::FastMtR1,
-     {10, 63, 0, PROTOBUF_FIELD_OFFSET(AggSpec_AggSpecSorted, _impl_.columns_)}},
-  }}, {{
-    65535, 65535
-  }}, {{
-    // repeated .io.deephaven.proto.backplane.grpc.AggSpec.AggSpecSortedColumn columns = 1;
-    {PROTOBUF_FIELD_OFFSET(AggSpec_AggSpecSorted, _impl_.columns_), 0, 0,
-    (0 | ::_fl::kFcRepeated | ::_fl::kMessage | ::_fl::kTvTable)},
-  }}, {{
-    {::_pbi::TcParser::GetTable<::io::deephaven::proto::backplane::grpc::AggSpec_AggSpecSortedColumn>()},
-  }}, {{
-  }},
-};
-
-::uint8_t* AggSpec_AggSpecSorted::_InternalSerialize(
-    ::uint8_t* target,
-    ::google::protobuf::io::EpsCopyOutputStream* stream) const {
-  // @@protoc_insertion_point(serialize_to_array_start:io.deephaven.proto.backplane.grpc.AggSpec.AggSpecSorted)
-  ::uint32_t cached_has_bits = 0;
-  (void)cached_has_bits;
-
-  // repeated .io.deephaven.proto.backplane.grpc.AggSpec.AggSpecSortedColumn columns = 1;
-  for (unsigned i = 0,
-      n = static_cast<unsigned>(this->_internal_columns_size()); i < n; i++) {
-    const auto& repfield = this->_internal_columns().Get(i);
-    target = ::google::protobuf::internal::WireFormatLite::
-        InternalWriteMessage(1, repfield, repfield.GetCachedSize(), target, stream);
-  }
-
-  if (PROTOBUF_PREDICT_FALSE(_internal_metadata_.have_unknown_fields())) {
-    target =
-        ::_pbi::WireFormat::InternalSerializeUnknownFieldsToArray(
-            _internal_metadata_.unknown_fields<::google::protobuf::UnknownFieldSet>(::google::protobuf::UnknownFieldSet::default_instance), target, stream);
-  }
-  // @@protoc_insertion_point(serialize_to_array_end:io.deephaven.proto.backplane.grpc.AggSpec.AggSpecSorted)
-  return target;
-}
-
-::size_t AggSpec_AggSpecSorted::ByteSizeLong() const {
-// @@protoc_insertion_point(message_byte_size_start:io.deephaven.proto.backplane.grpc.AggSpec.AggSpecSorted)
-  ::size_t total_size = 0;
-
-  ::uint32_t cached_has_bits = 0;
-  // Prevent compiler warnings about cached_has_bits being unused
-  (void) cached_has_bits;
-
-  // repeated .io.deephaven.proto.backplane.grpc.AggSpec.AggSpecSortedColumn columns = 1;
-  total_size += 1UL * this->_internal_columns_size();
-  for (const auto& msg : this->_internal_columns()) {
-    total_size +=
-      ::google::protobuf::internal::WireFormatLite::MessageSize(msg);
-  }
-  return MaybeComputeUnknownFieldsSize(total_size, &_impl_._cached_size_);
-}
-
-const ::google::protobuf::Message::ClassData AggSpec_AggSpecSorted::_class_data_ = {
-    AggSpec_AggSpecSorted::MergeImpl,
-    nullptr,  // OnDemandRegisterArenaDtor
-};
-const ::google::protobuf::Message::ClassData* AggSpec_AggSpecSorted::GetClassData() const {
-  return &_class_data_;
-}
-
-void AggSpec_AggSpecSorted::MergeImpl(::google::protobuf::Message& to_msg, const ::google::protobuf::Message& from_msg) {
-  auto* const _this = static_cast<AggSpec_AggSpecSorted*>(&to_msg);
-  auto& from = static_cast<const AggSpec_AggSpecSorted&>(from_msg);
-  // @@protoc_insertion_point(class_specific_merge_from_start:io.deephaven.proto.backplane.grpc.AggSpec.AggSpecSorted)
-  ABSL_DCHECK_NE(&from, _this);
-  ::uint32_t cached_has_bits = 0;
-  (void) cached_has_bits;
-
-  _this->_internal_mutable_columns()->MergeFrom(
-      from._internal_columns());
-  _this->_internal_metadata_.MergeFrom<::google::protobuf::UnknownFieldSet>(from._internal_metadata_);
-}
-
-void AggSpec_AggSpecSorted::CopyFrom(const AggSpec_AggSpecSorted& from) {
-// @@protoc_insertion_point(class_specific_copy_from_start:io.deephaven.proto.backplane.grpc.AggSpec.AggSpecSorted)
-  if (&from == this) return;
-  Clear();
-  MergeFrom(from);
-}
-
-PROTOBUF_NOINLINE bool AggSpec_AggSpecSorted::IsInitialized() const {
-  return true;
-}
-
-::_pbi::CachedSize* AggSpec_AggSpecSorted::AccessCachedSize() const {
-  return &_impl_._cached_size_;
-}
-void AggSpec_AggSpecSorted::InternalSwap(AggSpec_AggSpecSorted* PROTOBUF_RESTRICT other) {
-  using std::swap;
-  _internal_metadata_.InternalSwap(&other->_internal_metadata_);
-  _impl_.columns_.InternalSwap(&other->_impl_.columns_);
-}
-
-::google::protobuf::Metadata AggSpec_AggSpecSorted::GetMetadata() const {
-  return ::_pbi::AssignDescriptors(
-      &descriptor_table_deephaven_2fproto_2ftable_2eproto_getter, &descriptor_table_deephaven_2fproto_2ftable_2eproto_once,
-      file_level_metadata_deephaven_2fproto_2ftable_2eproto[68]);
-}
-// ===================================================================
-
-class AggSpec_AggSpecSortedColumn::_Internal {
- public:
-};
-
-AggSpec_AggSpecSortedColumn::AggSpec_AggSpecSortedColumn(::google::protobuf::Arena* arena)
-    : ::google::protobuf::Message(arena) {
-  SharedCtor(arena);
-  // @@protoc_insertion_point(arena_constructor:io.deephaven.proto.backplane.grpc.AggSpec.AggSpecSortedColumn)
-}
-inline PROTOBUF_NDEBUG_INLINE AggSpec_AggSpecSortedColumn::Impl_::Impl_(
-    ::google::protobuf::internal::InternalVisibility visibility, ::google::protobuf::Arena* arena,
-    const Impl_& from)
-      : column_name_(arena, from.column_name_),
-        _cached_size_{0} {}
-
-AggSpec_AggSpecSortedColumn::AggSpec_AggSpecSortedColumn(
-    ::google::protobuf::Arena* arena,
-    const AggSpec_AggSpecSortedColumn& from)
-    : ::google::protobuf::Message(arena) {
-  AggSpec_AggSpecSortedColumn* const _this = this;
-  (void)_this;
-  _internal_metadata_.MergeFrom<::google::protobuf::UnknownFieldSet>(
-      from._internal_metadata_);
-  new (&_impl_) Impl_(internal_visibility(), arena, from._impl_);
-
-  // @@protoc_insertion_point(copy_constructor:io.deephaven.proto.backplane.grpc.AggSpec.AggSpecSortedColumn)
-}
-inline PROTOBUF_NDEBUG_INLINE AggSpec_AggSpecSortedColumn::Impl_::Impl_(
-    ::google::protobuf::internal::InternalVisibility visibility,
-    ::google::protobuf::Arena* arena)
-      : column_name_(arena),
-        _cached_size_{0} {}
-
-inline void AggSpec_AggSpecSortedColumn::SharedCtor(::_pb::Arena* arena) {
-  new (&_impl_) Impl_(internal_visibility(), arena);
-}
-AggSpec_AggSpecSortedColumn::~AggSpec_AggSpecSortedColumn() {
-  // @@protoc_insertion_point(destructor:io.deephaven.proto.backplane.grpc.AggSpec.AggSpecSortedColumn)
-  _internal_metadata_.Delete<::google::protobuf::UnknownFieldSet>();
-  SharedDtor();
-}
-inline void AggSpec_AggSpecSortedColumn::SharedDtor() {
-  ABSL_DCHECK(GetArena() == nullptr);
-  _impl_.column_name_.Destroy();
-  _impl_.~Impl_();
-}
-
-PROTOBUF_NOINLINE void AggSpec_AggSpecSortedColumn::Clear() {
-// @@protoc_insertion_point(message_clear_start:io.deephaven.proto.backplane.grpc.AggSpec.AggSpecSortedColumn)
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  ::uint32_t cached_has_bits = 0;
-  // Prevent compiler warnings about cached_has_bits being unused
-  (void) cached_has_bits;
-
-  _impl_.column_name_.ClearToEmpty();
-  _internal_metadata_.Clear<::google::protobuf::UnknownFieldSet>();
-}
-
-const char* AggSpec_AggSpecSortedColumn::_InternalParse(
-    const char* ptr, ::_pbi::ParseContext* ctx) {
-  ptr = ::_pbi::TcParser::ParseLoop(this, ptr, ctx, &_table_.header);
-  return ptr;
-}
-
-
-PROTOBUF_CONSTINIT PROTOBUF_ATTRIBUTE_INIT_PRIORITY1
-const ::_pbi::TcParseTable<0, 1, 0, 81, 2> AggSpec_AggSpecSortedColumn::_table_ = {
-  {
-    0,  // no _has_bits_
-    0, // no _extensions_
-    1, 0,  // max_field_number, fast_idx_mask
-    offsetof(decltype(_table_), field_lookup_table),
-    4294967294,  // skipmap
-    offsetof(decltype(_table_), field_entries),
-    1,  // num_field_entries
-    0,  // num_aux_entries
-    offsetof(decltype(_table_), field_names),  // no aux_entries
-    &_AggSpec_AggSpecSortedColumn_default_instance_._instance,
-    ::_pbi::TcParser::GenericFallback,  // fallback
-  }, {{
-    // string column_name = 1;
-    {::_pbi::TcParser::FastUS1,
-     {10, 63, 0, PROTOBUF_FIELD_OFFSET(AggSpec_AggSpecSortedColumn, _impl_.column_name_)}},
-  }}, {{
-    65535, 65535
-  }}, {{
-    // string column_name = 1;
-    {PROTOBUF_FIELD_OFFSET(AggSpec_AggSpecSortedColumn, _impl_.column_name_), 0, 0,
-    (0 | ::_fl::kFcSingular | ::_fl::kUtf8String | ::_fl::kRepAString)},
-  }},
-  // no aux_entries
-  {{
-    "\75\13\0\0\0\0\0\0"
-    "io.deephaven.proto.backplane.grpc.AggSpec.AggSpecSortedColumn"
-    "column_name"
-  }},
-};
-
-::uint8_t* AggSpec_AggSpecSortedColumn::_InternalSerialize(
-    ::uint8_t* target,
-    ::google::protobuf::io::EpsCopyOutputStream* stream) const {
-  // @@protoc_insertion_point(serialize_to_array_start:io.deephaven.proto.backplane.grpc.AggSpec.AggSpecSortedColumn)
-  ::uint32_t cached_has_bits = 0;
-  (void)cached_has_bits;
-
-  // string column_name = 1;
-  if (!this->_internal_column_name().empty()) {
-    const std::string& _s = this->_internal_column_name();
-    ::google::protobuf::internal::WireFormatLite::VerifyUtf8String(
-        _s.data(), static_cast<int>(_s.length()), ::google::protobuf::internal::WireFormatLite::SERIALIZE, "io.deephaven.proto.backplane.grpc.AggSpec.AggSpecSortedColumn.column_name");
-    target = stream->WriteStringMaybeAliased(1, _s, target);
-  }
-
-  if (PROTOBUF_PREDICT_FALSE(_internal_metadata_.have_unknown_fields())) {
-    target =
-        ::_pbi::WireFormat::InternalSerializeUnknownFieldsToArray(
-            _internal_metadata_.unknown_fields<::google::protobuf::UnknownFieldSet>(::google::protobuf::UnknownFieldSet::default_instance), target, stream);
-  }
-  // @@protoc_insertion_point(serialize_to_array_end:io.deephaven.proto.backplane.grpc.AggSpec.AggSpecSortedColumn)
-  return target;
-}
-
-::size_t AggSpec_AggSpecSortedColumn::ByteSizeLong() const {
-// @@protoc_insertion_point(message_byte_size_start:io.deephaven.proto.backplane.grpc.AggSpec.AggSpecSortedColumn)
-  ::size_t total_size = 0;
-
-  ::uint32_t cached_has_bits = 0;
-  // Prevent compiler warnings about cached_has_bits being unused
-  (void) cached_has_bits;
-
-  // string column_name = 1;
-  if (!this->_internal_column_name().empty()) {
-    total_size += 1 + ::google::protobuf::internal::WireFormatLite::StringSize(
-                                    this->_internal_column_name());
-  }
-
-  return MaybeComputeUnknownFieldsSize(total_size, &_impl_._cached_size_);
-}
-
-const ::google::protobuf::Message::ClassData AggSpec_AggSpecSortedColumn::_class_data_ = {
-    AggSpec_AggSpecSortedColumn::MergeImpl,
-    nullptr,  // OnDemandRegisterArenaDtor
-};
-const ::google::protobuf::Message::ClassData* AggSpec_AggSpecSortedColumn::GetClassData() const {
-  return &_class_data_;
-}
-
-void AggSpec_AggSpecSortedColumn::MergeImpl(::google::protobuf::Message& to_msg, const ::google::protobuf::Message& from_msg) {
-  auto* const _this = static_cast<AggSpec_AggSpecSortedColumn*>(&to_msg);
-  auto& from = static_cast<const AggSpec_AggSpecSortedColumn&>(from_msg);
-  // @@protoc_insertion_point(class_specific_merge_from_start:io.deephaven.proto.backplane.grpc.AggSpec.AggSpecSortedColumn)
-  ABSL_DCHECK_NE(&from, _this);
-  ::uint32_t cached_has_bits = 0;
-  (void) cached_has_bits;
-
-  if (!from._internal_column_name().empty()) {
-    _this->_internal_set_column_name(from._internal_column_name());
-  }
-  _this->_internal_metadata_.MergeFrom<::google::protobuf::UnknownFieldSet>(from._internal_metadata_);
-}
-
-void AggSpec_AggSpecSortedColumn::CopyFrom(const AggSpec_AggSpecSortedColumn& from) {
-// @@protoc_insertion_point(class_specific_copy_from_start:io.deephaven.proto.backplane.grpc.AggSpec.AggSpecSortedColumn)
-  if (&from == this) return;
-  Clear();
-  MergeFrom(from);
-}
-
-PROTOBUF_NOINLINE bool AggSpec_AggSpecSortedColumn::IsInitialized() const {
-  return true;
-}
-
-::_pbi::CachedSize* AggSpec_AggSpecSortedColumn::AccessCachedSize() const {
-  return &_impl_._cached_size_;
-}
-void AggSpec_AggSpecSortedColumn::InternalSwap(AggSpec_AggSpecSortedColumn* PROTOBUF_RESTRICT other) {
-  using std::swap;
-  auto* arena = GetArena();
-  ABSL_DCHECK_EQ(arena, other->GetArena());
-  _internal_metadata_.InternalSwap(&other->_internal_metadata_);
-  ::_pbi::ArenaStringPtr::InternalSwap(&_impl_.column_name_, &other->_impl_.column_name_, arena);
-}
-
-::google::protobuf::Metadata AggSpec_AggSpecSortedColumn::GetMetadata() const {
-  return ::_pbi::AssignDescriptors(
-      &descriptor_table_deephaven_2fproto_2ftable_2eproto_getter, &descriptor_table_deephaven_2fproto_2ftable_2eproto_once,
-      file_level_metadata_deephaven_2fproto_2ftable_2eproto[69]);
-}
-// ===================================================================
-
-class AggSpec_AggSpecTDigest::_Internal {
- public:
-  using HasBits = decltype(std::declval<AggSpec_AggSpecTDigest>()._impl_._has_bits_);
-  static constexpr ::int32_t kHasBitsOffset =
-    8 * PROTOBUF_FIELD_OFFSET(AggSpec_AggSpecTDigest, _impl_._has_bits_);
-  static void set_has_compression(HasBits* has_bits) {
-    (*has_bits)[0] |= 1u;
-  }
-};
-
-AggSpec_AggSpecTDigest::AggSpec_AggSpecTDigest(::google::protobuf::Arena* arena)
-    : ::google::protobuf::Message(arena) {
-  SharedCtor(arena);
-  // @@protoc_insertion_point(arena_constructor:io.deephaven.proto.backplane.grpc.AggSpec.AggSpecTDigest)
-}
-AggSpec_AggSpecTDigest::AggSpec_AggSpecTDigest(
-    ::google::protobuf::Arena* arena, const AggSpec_AggSpecTDigest& from)
-    : AggSpec_AggSpecTDigest(arena) {
-  MergeFrom(from);
-}
-inline PROTOBUF_NDEBUG_INLINE AggSpec_AggSpecTDigest::Impl_::Impl_(
-    ::google::protobuf::internal::InternalVisibility visibility,
-    ::google::protobuf::Arena* arena)
-      : _cached_size_{0} {}
-
-inline void AggSpec_AggSpecTDigest::SharedCtor(::_pb::Arena* arena) {
-  new (&_impl_) Impl_(internal_visibility(), arena);
-  _impl_.compression_ = {};
-}
-AggSpec_AggSpecTDigest::~AggSpec_AggSpecTDigest() {
-  // @@protoc_insertion_point(destructor:io.deephaven.proto.backplane.grpc.AggSpec.AggSpecTDigest)
-  _internal_metadata_.Delete<::google::protobuf::UnknownFieldSet>();
-  SharedDtor();
-}
-inline void AggSpec_AggSpecTDigest::SharedDtor() {
-  ABSL_DCHECK(GetArena() == nullptr);
-  _impl_.~Impl_();
-}
-
-PROTOBUF_NOINLINE void AggSpec_AggSpecTDigest::Clear() {
-// @@protoc_insertion_point(message_clear_start:io.deephaven.proto.backplane.grpc.AggSpec.AggSpecTDigest)
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  ::uint32_t cached_has_bits = 0;
-  // Prevent compiler warnings about cached_has_bits being unused
-  (void) cached_has_bits;
-
-  _impl_.compression_ = 0;
-  _impl_._has_bits_.Clear();
-  _internal_metadata_.Clear<::google::protobuf::UnknownFieldSet>();
-}
-
-const char* AggSpec_AggSpecTDigest::_InternalParse(
-    const char* ptr, ::_pbi::ParseContext* ctx) {
-  ptr = ::_pbi::TcParser::ParseLoop(this, ptr, ctx, &_table_.header);
-  return ptr;
-}
-
-
-PROTOBUF_CONSTINIT PROTOBUF_ATTRIBUTE_INIT_PRIORITY1
-const ::_pbi::TcParseTable<0, 1, 0, 0, 2> AggSpec_AggSpecTDigest::_table_ = {
-  {
-    PROTOBUF_FIELD_OFFSET(AggSpec_AggSpecTDigest, _impl_._has_bits_),
-    0, // no _extensions_
-    1, 0,  // max_field_number, fast_idx_mask
-    offsetof(decltype(_table_), field_lookup_table),
-    4294967294,  // skipmap
-    offsetof(decltype(_table_), field_entries),
-    1,  // num_field_entries
-    0,  // num_aux_entries
-    offsetof(decltype(_table_), field_names),  // no aux_entries
-    &_AggSpec_AggSpecTDigest_default_instance_._instance,
-    ::_pbi::TcParser::GenericFallback,  // fallback
-  }, {{
-    // optional double compression = 1;
-    {::_pbi::TcParser::FastF64S1,
-     {9, 0, 0, PROTOBUF_FIELD_OFFSET(AggSpec_AggSpecTDigest, _impl_.compression_)}},
-  }}, {{
-    65535, 65535
-  }}, {{
-    // optional double compression = 1;
-    {PROTOBUF_FIELD_OFFSET(AggSpec_AggSpecTDigest, _impl_.compression_), _Internal::kHasBitsOffset + 0, 0,
-    (0 | ::_fl::kFcOptional | ::_fl::kDouble)},
-  }},
-  // no aux_entries
-  {{
-  }},
-};
-
-::uint8_t* AggSpec_AggSpecTDigest::_InternalSerialize(
-    ::uint8_t* target,
-    ::google::protobuf::io::EpsCopyOutputStream* stream) const {
-  // @@protoc_insertion_point(serialize_to_array_start:io.deephaven.proto.backplane.grpc.AggSpec.AggSpecTDigest)
-  ::uint32_t cached_has_bits = 0;
-  (void)cached_has_bits;
-
-  cached_has_bits = _impl_._has_bits_[0];
-  // optional double compression = 1;
-  if (cached_has_bits & 0x00000001u) {
-    target = stream->EnsureSpace(target);
-    target = ::_pbi::WireFormatLite::WriteDoubleToArray(
-        1, this->_internal_compression(), target);
-  }
-
-  if (PROTOBUF_PREDICT_FALSE(_internal_metadata_.have_unknown_fields())) {
-    target =
-        ::_pbi::WireFormat::InternalSerializeUnknownFieldsToArray(
-            _internal_metadata_.unknown_fields<::google::protobuf::UnknownFieldSet>(::google::protobuf::UnknownFieldSet::default_instance), target, stream);
-  }
-  // @@protoc_insertion_point(serialize_to_array_end:io.deephaven.proto.backplane.grpc.AggSpec.AggSpecTDigest)
-  return target;
-}
-
-::size_t AggSpec_AggSpecTDigest::ByteSizeLong() const {
-// @@protoc_insertion_point(message_byte_size_start:io.deephaven.proto.backplane.grpc.AggSpec.AggSpecTDigest)
-  ::size_t total_size = 0;
-
-  ::uint32_t cached_has_bits = 0;
-  // Prevent compiler warnings about cached_has_bits being unused
-  (void) cached_has_bits;
-
-  // optional double compression = 1;
-  cached_has_bits = _impl_._has_bits_[0];
-  if (cached_has_bits & 0x00000001u) {
-    total_size += 9;
-  }
-
-  return MaybeComputeUnknownFieldsSize(total_size, &_impl_._cached_size_);
-}
-
-const ::google::protobuf::Message::ClassData AggSpec_AggSpecTDigest::_class_data_ = {
-    AggSpec_AggSpecTDigest::MergeImpl,
-    nullptr,  // OnDemandRegisterArenaDtor
-};
-const ::google::protobuf::Message::ClassData* AggSpec_AggSpecTDigest::GetClassData() const {
-  return &_class_data_;
-}
-
-void AggSpec_AggSpecTDigest::MergeImpl(::google::protobuf::Message& to_msg, const ::google::protobuf::Message& from_msg) {
-  auto* const _this = static_cast<AggSpec_AggSpecTDigest*>(&to_msg);
-  auto& from = static_cast<const AggSpec_AggSpecTDigest&>(from_msg);
-  // @@protoc_insertion_point(class_specific_merge_from_start:io.deephaven.proto.backplane.grpc.AggSpec.AggSpecTDigest)
-  ABSL_DCHECK_NE(&from, _this);
-  ::uint32_t cached_has_bits = 0;
-  (void) cached_has_bits;
-
-  if ((from._impl_._has_bits_[0] & 0x00000001u) != 0) {
-    _this->_internal_set_compression(from._internal_compression());
-  }
-  _this->_internal_metadata_.MergeFrom<::google::protobuf::UnknownFieldSet>(from._internal_metadata_);
-}
-
-void AggSpec_AggSpecTDigest::CopyFrom(const AggSpec_AggSpecTDigest& from) {
-// @@protoc_insertion_point(class_specific_copy_from_start:io.deephaven.proto.backplane.grpc.AggSpec.AggSpecTDigest)
-  if (&from == this) return;
-  Clear();
-  MergeFrom(from);
-}
-
-PROTOBUF_NOINLINE bool AggSpec_AggSpecTDigest::IsInitialized() const {
-  return true;
-}
-
-::_pbi::CachedSize* AggSpec_AggSpecTDigest::AccessCachedSize() const {
-  return &_impl_._cached_size_;
-}
-void AggSpec_AggSpecTDigest::InternalSwap(AggSpec_AggSpecTDigest* PROTOBUF_RESTRICT other) {
-  using std::swap;
-  _internal_metadata_.InternalSwap(&other->_internal_metadata_);
-  swap(_impl_._has_bits_[0], other->_impl_._has_bits_[0]);
-        swap(_impl_.compression_, other->_impl_.compression_);
-}
-
-::google::protobuf::Metadata AggSpec_AggSpecTDigest::GetMetadata() const {
-  return ::_pbi::AssignDescriptors(
-      &descriptor_table_deephaven_2fproto_2ftable_2eproto_getter, &descriptor_table_deephaven_2fproto_2ftable_2eproto_once,
-      file_level_metadata_deephaven_2fproto_2ftable_2eproto[70]);
-}
-// ===================================================================
-
-class AggSpec_AggSpecUnique::_Internal {
- public:
-  using HasBits = decltype(std::declval<AggSpec_AggSpecUnique>()._impl_._has_bits_);
-  static constexpr ::int32_t kHasBitsOffset =
-    8 * PROTOBUF_FIELD_OFFSET(AggSpec_AggSpecUnique, _impl_._has_bits_);
-  static const ::io::deephaven::proto::backplane::grpc::AggSpec_AggSpecNonUniqueSentinel& non_unique_sentinel(const AggSpec_AggSpecUnique* msg);
-  static void set_has_non_unique_sentinel(HasBits* has_bits) {
-    (*has_bits)[0] |= 1u;
-  }
-};
-
-const ::io::deephaven::proto::backplane::grpc::AggSpec_AggSpecNonUniqueSentinel& AggSpec_AggSpecUnique::_Internal::non_unique_sentinel(const AggSpec_AggSpecUnique* msg) {
-  return *msg->_impl_.non_unique_sentinel_;
-}
-AggSpec_AggSpecUnique::AggSpec_AggSpecUnique(::google::protobuf::Arena* arena)
-    : ::google::protobuf::Message(arena) {
-  SharedCtor(arena);
-  // @@protoc_insertion_point(arena_constructor:io.deephaven.proto.backplane.grpc.AggSpec.AggSpecUnique)
-}
-inline PROTOBUF_NDEBUG_INLINE AggSpec_AggSpecUnique::Impl_::Impl_(
-    ::google::protobuf::internal::InternalVisibility visibility, ::google::protobuf::Arena* arena,
-    const Impl_& from)
-      : _has_bits_{from._has_bits_},
-        _cached_size_{0} {}
-
-AggSpec_AggSpecUnique::AggSpec_AggSpecUnique(
-    ::google::protobuf::Arena* arena,
-    const AggSpec_AggSpecUnique& from)
-    : ::google::protobuf::Message(arena) {
-  AggSpec_AggSpecUnique* const _this = this;
-  (void)_this;
-  _internal_metadata_.MergeFrom<::google::protobuf::UnknownFieldSet>(
-      from._internal_metadata_);
-  new (&_impl_) Impl_(internal_visibility(), arena, from._impl_);
-  ::uint32_t cached_has_bits = _impl_._has_bits_[0];
-  _impl_.non_unique_sentinel_ = (cached_has_bits & 0x00000001u)
-                ? CreateMaybeMessage<::io::deephaven::proto::backplane::grpc::AggSpec_AggSpecNonUniqueSentinel>(arena, *from._impl_.non_unique_sentinel_)
-                : nullptr;
-  _impl_.include_nulls_ = from._impl_.include_nulls_;
-
-  // @@protoc_insertion_point(copy_constructor:io.deephaven.proto.backplane.grpc.AggSpec.AggSpecUnique)
-}
-inline PROTOBUF_NDEBUG_INLINE AggSpec_AggSpecUnique::Impl_::Impl_(
-    ::google::protobuf::internal::InternalVisibility visibility,
-    ::google::protobuf::Arena* arena)
-      : _cached_size_{0} {}
-
-inline void AggSpec_AggSpecUnique::SharedCtor(::_pb::Arena* arena) {
-  new (&_impl_) Impl_(internal_visibility(), arena);
-  ::memset(reinterpret_cast<char *>(&_impl_) +
-               offsetof(Impl_, non_unique_sentinel_),
-           0,
-           offsetof(Impl_, include_nulls_) -
-               offsetof(Impl_, non_unique_sentinel_) +
-               sizeof(Impl_::include_nulls_));
-}
-AggSpec_AggSpecUnique::~AggSpec_AggSpecUnique() {
-  // @@protoc_insertion_point(destructor:io.deephaven.proto.backplane.grpc.AggSpec.AggSpecUnique)
-  _internal_metadata_.Delete<::google::protobuf::UnknownFieldSet>();
-  SharedDtor();
-}
-inline void AggSpec_AggSpecUnique::SharedDtor() {
-  ABSL_DCHECK(GetArena() == nullptr);
-  delete _impl_.non_unique_sentinel_;
-  _impl_.~Impl_();
-}
-
-PROTOBUF_NOINLINE void AggSpec_AggSpecUnique::Clear() {
-// @@protoc_insertion_point(message_clear_start:io.deephaven.proto.backplane.grpc.AggSpec.AggSpecUnique)
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  ::uint32_t cached_has_bits = 0;
-  // Prevent compiler warnings about cached_has_bits being unused
-  (void) cached_has_bits;
-
-  cached_has_bits = _impl_._has_bits_[0];
-  if (cached_has_bits & 0x00000001u) {
-    ABSL_DCHECK(_impl_.non_unique_sentinel_ != nullptr);
-    _impl_.non_unique_sentinel_->Clear();
-  }
-  _impl_.include_nulls_ = false;
-  _impl_._has_bits_.Clear();
-  _internal_metadata_.Clear<::google::protobuf::UnknownFieldSet>();
-}
-
-const char* AggSpec_AggSpecUnique::_InternalParse(
-    const char* ptr, ::_pbi::ParseContext* ctx) {
-  ptr = ::_pbi::TcParser::ParseLoop(this, ptr, ctx, &_table_.header);
-  return ptr;
-}
-
-
-PROTOBUF_CONSTINIT PROTOBUF_ATTRIBUTE_INIT_PRIORITY1
-const ::_pbi::TcParseTable<1, 2, 1, 0, 2> AggSpec_AggSpecUnique::_table_ = {
-  {
-    PROTOBUF_FIELD_OFFSET(AggSpec_AggSpecUnique, _impl_._has_bits_),
-    0, // no _extensions_
-    2, 8,  // max_field_number, fast_idx_mask
-    offsetof(decltype(_table_), field_lookup_table),
-    4294967292,  // skipmap
-    offsetof(decltype(_table_), field_entries),
-    2,  // num_field_entries
-    1,  // num_aux_entries
-    offsetof(decltype(_table_), aux_entries),
-    &_AggSpec_AggSpecUnique_default_instance_._instance,
-    ::_pbi::TcParser::GenericFallback,  // fallback
-  }, {{
-    // .io.deephaven.proto.backplane.grpc.AggSpec.AggSpecNonUniqueSentinel non_unique_sentinel = 2;
-    {::_pbi::TcParser::FastMtS1,
-     {18, 0, 0, PROTOBUF_FIELD_OFFSET(AggSpec_AggSpecUnique, _impl_.non_unique_sentinel_)}},
-    // bool include_nulls = 1;
-    {::_pbi::TcParser::SingularVarintNoZag1<bool, offsetof(AggSpec_AggSpecUnique, _impl_.include_nulls_), 63>(),
-     {8, 63, 0, PROTOBUF_FIELD_OFFSET(AggSpec_AggSpecUnique, _impl_.include_nulls_)}},
-  }}, {{
-    65535, 65535
-  }}, {{
-    // bool include_nulls = 1;
-    {PROTOBUF_FIELD_OFFSET(AggSpec_AggSpecUnique, _impl_.include_nulls_), -1, 0,
-    (0 | ::_fl::kFcSingular | ::_fl::kBool)},
-    // .io.deephaven.proto.backplane.grpc.AggSpec.AggSpecNonUniqueSentinel non_unique_sentinel = 2;
-    {PROTOBUF_FIELD_OFFSET(AggSpec_AggSpecUnique, _impl_.non_unique_sentinel_), _Internal::kHasBitsOffset + 0, 0,
-    (0 | ::_fl::kFcOptional | ::_fl::kMessage | ::_fl::kTvTable)},
-  }}, {{
-    {::_pbi::TcParser::GetTable<::io::deephaven::proto::backplane::grpc::AggSpec_AggSpecNonUniqueSentinel>()},
-  }}, {{
-  }},
-};
-
-::uint8_t* AggSpec_AggSpecUnique::_InternalSerialize(
-    ::uint8_t* target,
-    ::google::protobuf::io::EpsCopyOutputStream* stream) const {
-  // @@protoc_insertion_point(serialize_to_array_start:io.deephaven.proto.backplane.grpc.AggSpec.AggSpecUnique)
-  ::uint32_t cached_has_bits = 0;
-  (void)cached_has_bits;
-
-  // bool include_nulls = 1;
-  if (this->_internal_include_nulls() != 0) {
-    target = stream->EnsureSpace(target);
-    target = ::_pbi::WireFormatLite::WriteBoolToArray(
-        1, this->_internal_include_nulls(), target);
-  }
-
-  cached_has_bits = _impl_._has_bits_[0];
-  // .io.deephaven.proto.backplane.grpc.AggSpec.AggSpecNonUniqueSentinel non_unique_sentinel = 2;
-  if (cached_has_bits & 0x00000001u) {
-    target = ::google::protobuf::internal::WireFormatLite::InternalWriteMessage(
-        2, _Internal::non_unique_sentinel(this),
-        _Internal::non_unique_sentinel(this).GetCachedSize(), target, stream);
-  }
-
-  if (PROTOBUF_PREDICT_FALSE(_internal_metadata_.have_unknown_fields())) {
-    target =
-        ::_pbi::WireFormat::InternalSerializeUnknownFieldsToArray(
-            _internal_metadata_.unknown_fields<::google::protobuf::UnknownFieldSet>(::google::protobuf::UnknownFieldSet::default_instance), target, stream);
-  }
-  // @@protoc_insertion_point(serialize_to_array_end:io.deephaven.proto.backplane.grpc.AggSpec.AggSpecUnique)
-  return target;
-}
-
-::size_t AggSpec_AggSpecUnique::ByteSizeLong() const {
-// @@protoc_insertion_point(message_byte_size_start:io.deephaven.proto.backplane.grpc.AggSpec.AggSpecUnique)
-  ::size_t total_size = 0;
-
-  ::uint32_t cached_has_bits = 0;
-  // Prevent compiler warnings about cached_has_bits being unused
-  (void) cached_has_bits;
-
-  // .io.deephaven.proto.backplane.grpc.AggSpec.AggSpecNonUniqueSentinel non_unique_sentinel = 2;
-  cached_has_bits = _impl_._has_bits_[0];
-  if (cached_has_bits & 0x00000001u) {
-    total_size +=
-        1 + ::google::protobuf::internal::WireFormatLite::MessageSize(*_impl_.non_unique_sentinel_);
-  }
-
-  // bool include_nulls = 1;
-  if (this->_internal_include_nulls() != 0) {
-    total_size += 2;
-  }
-
-  return MaybeComputeUnknownFieldsSize(total_size, &_impl_._cached_size_);
-}
-
-const ::google::protobuf::Message::ClassData AggSpec_AggSpecUnique::_class_data_ = {
-    AggSpec_AggSpecUnique::MergeImpl,
-    nullptr,  // OnDemandRegisterArenaDtor
-};
-const ::google::protobuf::Message::ClassData* AggSpec_AggSpecUnique::GetClassData() const {
-  return &_class_data_;
-}
-
-void AggSpec_AggSpecUnique::MergeImpl(::google::protobuf::Message& to_msg, const ::google::protobuf::Message& from_msg) {
-  auto* const _this = static_cast<AggSpec_AggSpecUnique*>(&to_msg);
-  auto& from = static_cast<const AggSpec_AggSpecUnique&>(from_msg);
-  // @@protoc_insertion_point(class_specific_merge_from_start:io.deephaven.proto.backplane.grpc.AggSpec.AggSpecUnique)
-  ABSL_DCHECK_NE(&from, _this);
-  ::uint32_t cached_has_bits = 0;
-  (void) cached_has_bits;
-
-  if ((from._impl_._has_bits_[0] & 0x00000001u) != 0) {
-    _this->_internal_mutable_non_unique_sentinel()->::io::deephaven::proto::backplane::grpc::AggSpec_AggSpecNonUniqueSentinel::MergeFrom(
-        from._internal_non_unique_sentinel());
-  }
-  if (from._internal_include_nulls() != 0) {
-    _this->_internal_set_include_nulls(from._internal_include_nulls());
-  }
-  _this->_internal_metadata_.MergeFrom<::google::protobuf::UnknownFieldSet>(from._internal_metadata_);
-}
-
-void AggSpec_AggSpecUnique::CopyFrom(const AggSpec_AggSpecUnique& from) {
-// @@protoc_insertion_point(class_specific_copy_from_start:io.deephaven.proto.backplane.grpc.AggSpec.AggSpecUnique)
-  if (&from == this) return;
-  Clear();
-  MergeFrom(from);
-}
-
-PROTOBUF_NOINLINE bool AggSpec_AggSpecUnique::IsInitialized() const {
-  return true;
-}
-
-::_pbi::CachedSize* AggSpec_AggSpecUnique::AccessCachedSize() const {
-  return &_impl_._cached_size_;
-}
-void AggSpec_AggSpecUnique::InternalSwap(AggSpec_AggSpecUnique* PROTOBUF_RESTRICT other) {
-  using std::swap;
-  _internal_metadata_.InternalSwap(&other->_internal_metadata_);
-  swap(_impl_._has_bits_[0], other->_impl_._has_bits_[0]);
-  ::google::protobuf::internal::memswap<
-      PROTOBUF_FIELD_OFFSET(AggSpec_AggSpecUnique, _impl_.include_nulls_)
-      + sizeof(AggSpec_AggSpecUnique::_impl_.include_nulls_)
-      - PROTOBUF_FIELD_OFFSET(AggSpec_AggSpecUnique, _impl_.non_unique_sentinel_)>(
-          reinterpret_cast<char*>(&_impl_.non_unique_sentinel_),
-          reinterpret_cast<char*>(&other->_impl_.non_unique_sentinel_));
-}
-
-::google::protobuf::Metadata AggSpec_AggSpecUnique::GetMetadata() const {
-  return ::_pbi::AssignDescriptors(
-      &descriptor_table_deephaven_2fproto_2ftable_2eproto_getter, &descriptor_table_deephaven_2fproto_2ftable_2eproto_once,
-      file_level_metadata_deephaven_2fproto_2ftable_2eproto[71]);
-}
-// ===================================================================
-
-class AggSpec_AggSpecNonUniqueSentinel::_Internal {
- public:
-  static constexpr ::int32_t kOneofCaseOffset =
-    PROTOBUF_FIELD_OFFSET(::io::deephaven::proto::backplane::grpc::AggSpec_AggSpecNonUniqueSentinel, _impl_._oneof_case_);
-};
-
-AggSpec_AggSpecNonUniqueSentinel::AggSpec_AggSpecNonUniqueSentinel(::google::protobuf::Arena* arena)
-    : ::google::protobuf::Message(arena) {
-  SharedCtor(arena);
-  // @@protoc_insertion_point(arena_constructor:io.deephaven.proto.backplane.grpc.AggSpec.AggSpecNonUniqueSentinel)
-}
-inline PROTOBUF_NDEBUG_INLINE AggSpec_AggSpecNonUniqueSentinel::Impl_::Impl_(
-    ::google::protobuf::internal::InternalVisibility visibility, ::google::protobuf::Arena* arena,
-    const Impl_& from)
-      : type_{},
-        _cached_size_{0},
-        _oneof_case_{from._oneof_case_[0]} {}
-
-AggSpec_AggSpecNonUniqueSentinel::AggSpec_AggSpecNonUniqueSentinel(
-    ::google::protobuf::Arena* arena,
-    const AggSpec_AggSpecNonUniqueSentinel& from)
-    : ::google::protobuf::Message(arena) {
-  AggSpec_AggSpecNonUniqueSentinel* const _this = this;
-  (void)_this;
-  _internal_metadata_.MergeFrom<::google::protobuf::UnknownFieldSet>(
-      from._internal_metadata_);
-  new (&_impl_) Impl_(internal_visibility(), arena, from._impl_);
-  switch (type_case()) {
-    case TYPE_NOT_SET:
-      break;
-      case kNullValue:
-        _impl_.type_.null_value_ = from._impl_.type_.null_value_;
-        break;
-      case kStringValue:
-        new (&_impl_.type_.string_value_) decltype(_impl_.type_.string_value_){arena, from._impl_.type_.string_value_};
-        break;
-      case kIntValue:
-        _impl_.type_.int_value_ = from._impl_.type_.int_value_;
-        break;
-      case kLongValue:
-        _impl_.type_.long_value_ = from._impl_.type_.long_value_;
-        break;
-      case kFloatValue:
-        _impl_.type_.float_value_ = from._impl_.type_.float_value_;
-        break;
-      case kDoubleValue:
-        _impl_.type_.double_value_ = from._impl_.type_.double_value_;
-        break;
-      case kBoolValue:
-        _impl_.type_.bool_value_ = from._impl_.type_.bool_value_;
-        break;
-      case kByteValue:
-        _impl_.type_.byte_value_ = from._impl_.type_.byte_value_;
-        break;
-      case kShortValue:
-        _impl_.type_.short_value_ = from._impl_.type_.short_value_;
-        break;
-      case kCharValue:
-        _impl_.type_.char_value_ = from._impl_.type_.char_value_;
-        break;
-  }
-
-  // @@protoc_insertion_point(copy_constructor:io.deephaven.proto.backplane.grpc.AggSpec.AggSpecNonUniqueSentinel)
-}
-inline PROTOBUF_NDEBUG_INLINE AggSpec_AggSpecNonUniqueSentinel::Impl_::Impl_(
-    ::google::protobuf::internal::InternalVisibility visibility,
-    ::google::protobuf::Arena* arena)
-      : type_{},
-        _cached_size_{0},
-        _oneof_case_{} {}
-
-inline void AggSpec_AggSpecNonUniqueSentinel::SharedCtor(::_pb::Arena* arena) {
-  new (&_impl_) Impl_(internal_visibility(), arena);
-}
-AggSpec_AggSpecNonUniqueSentinel::~AggSpec_AggSpecNonUniqueSentinel() {
-  // @@protoc_insertion_point(destructor:io.deephaven.proto.backplane.grpc.AggSpec.AggSpecNonUniqueSentinel)
-  _internal_metadata_.Delete<::google::protobuf::UnknownFieldSet>();
-  SharedDtor();
-}
-inline void AggSpec_AggSpecNonUniqueSentinel::SharedDtor() {
-  ABSL_DCHECK(GetArena() == nullptr);
-  if (has_type()) {
-    clear_type();
-  }
-  _impl_.~Impl_();
-}
-
-void AggSpec_AggSpecNonUniqueSentinel::clear_type() {
-// @@protoc_insertion_point(one_of_clear_start:io.deephaven.proto.backplane.grpc.AggSpec.AggSpecNonUniqueSentinel)
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  switch (type_case()) {
-    case kNullValue: {
-      // No need to clear
-      break;
-    }
-    case kStringValue: {
-      _impl_.type_.string_value_.Destroy();
-      break;
-    }
-    case kIntValue: {
-      // No need to clear
-      break;
-    }
-    case kLongValue: {
-      // No need to clear
-      break;
-    }
-    case kFloatValue: {
-      // No need to clear
-      break;
-    }
-    case kDoubleValue: {
-      // No need to clear
-      break;
-    }
-    case kBoolValue: {
-      // No need to clear
-      break;
-    }
-    case kByteValue: {
-      // No need to clear
-      break;
-    }
-    case kShortValue: {
-      // No need to clear
-      break;
-    }
-    case kCharValue: {
-      // No need to clear
-      break;
-    }
-    case TYPE_NOT_SET: {
-      break;
-    }
-  }
-  _impl_._oneof_case_[0] = TYPE_NOT_SET;
-}
-
-
-PROTOBUF_NOINLINE void AggSpec_AggSpecNonUniqueSentinel::Clear() {
-// @@protoc_insertion_point(message_clear_start:io.deephaven.proto.backplane.grpc.AggSpec.AggSpecNonUniqueSentinel)
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  ::uint32_t cached_has_bits = 0;
-  // Prevent compiler warnings about cached_has_bits being unused
-  (void) cached_has_bits;
-
-  clear_type();
-  _internal_metadata_.Clear<::google::protobuf::UnknownFieldSet>();
-}
-
-const char* AggSpec_AggSpecNonUniqueSentinel::_InternalParse(
-    const char* ptr, ::_pbi::ParseContext* ctx) {
-  ptr = ::_pbi::TcParser::ParseLoop(this, ptr, ctx, &_table_.header);
-  return ptr;
-}
-
-
-PROTOBUF_CONSTINIT PROTOBUF_ATTRIBUTE_INIT_PRIORITY1
-const ::_pbi::TcParseTable<0, 10, 0, 95, 2> AggSpec_AggSpecNonUniqueSentinel::_table_ = {
-  {
-    0,  // no _has_bits_
-    0, // no _extensions_
-    10, 0,  // max_field_number, fast_idx_mask
-    offsetof(decltype(_table_), field_lookup_table),
-    4294966272,  // skipmap
-    offsetof(decltype(_table_), field_entries),
-    10,  // num_field_entries
-    0,  // num_aux_entries
-    offsetof(decltype(_table_), field_names),  // no aux_entries
-    &_AggSpec_AggSpecNonUniqueSentinel_default_instance_._instance,
-    ::_pbi::TcParser::GenericFallback,  // fallback
-  }, {{
-    {::_pbi::TcParser::MiniParse, {}},
-  }}, {{
-    65535, 65535
-  }}, {{
-    // .io.deephaven.proto.backplane.grpc.NullValue null_value = 1;
-    {PROTOBUF_FIELD_OFFSET(AggSpec_AggSpecNonUniqueSentinel, _impl_.type_.null_value_), _Internal::kOneofCaseOffset + 0, 0,
-    (0 | ::_fl::kFcOneof | ::_fl::kOpenEnum)},
-    // string string_value = 2;
-    {PROTOBUF_FIELD_OFFSET(AggSpec_AggSpecNonUniqueSentinel, _impl_.type_.string_value_), _Internal::kOneofCaseOffset + 0, 0,
-    (0 | ::_fl::kFcOneof | ::_fl::kUtf8String | ::_fl::kRepAString)},
-    // sint32 int_value = 3;
-    {PROTOBUF_FIELD_OFFSET(AggSpec_AggSpecNonUniqueSentinel, _impl_.type_.int_value_), _Internal::kOneofCaseOffset + 0, 0,
-    (0 | ::_fl::kFcOneof | ::_fl::kSInt32)},
-    // sint64 long_value = 4 [jstype = JS_STRING];
-    {PROTOBUF_FIELD_OFFSET(AggSpec_AggSpecNonUniqueSentinel, _impl_.type_.long_value_), _Internal::kOneofCaseOffset + 0, 0,
-    (0 | ::_fl::kFcOneof | ::_fl::kSInt64)},
-    // float float_value = 5;
-    {PROTOBUF_FIELD_OFFSET(AggSpec_AggSpecNonUniqueSentinel, _impl_.type_.float_value_), _Internal::kOneofCaseOffset + 0, 0,
-    (0 | ::_fl::kFcOneof | ::_fl::kFloat)},
-    // double double_value = 6;
-    {PROTOBUF_FIELD_OFFSET(AggSpec_AggSpecNonUniqueSentinel, _impl_.type_.double_value_), _Internal::kOneofCaseOffset + 0, 0,
-    (0 | ::_fl::kFcOneof | ::_fl::kDouble)},
-    // bool bool_value = 7;
-    {PROTOBUF_FIELD_OFFSET(AggSpec_AggSpecNonUniqueSentinel, _impl_.type_.bool_value_), _Internal::kOneofCaseOffset + 0, 0,
-    (0 | ::_fl::kFcOneof | ::_fl::kBool)},
-    // sint32 byte_value = 8;
-    {PROTOBUF_FIELD_OFFSET(AggSpec_AggSpecNonUniqueSentinel, _impl_.type_.byte_value_), _Internal::kOneofCaseOffset + 0, 0,
-    (0 | ::_fl::kFcOneof | ::_fl::kSInt32)},
-    // sint32 short_value = 9;
-    {PROTOBUF_FIELD_OFFSET(AggSpec_AggSpecNonUniqueSentinel, _impl_.type_.short_value_), _Internal::kOneofCaseOffset + 0, 0,
-    (0 | ::_fl::kFcOneof | ::_fl::kSInt32)},
-    // sint32 char_value = 10;
-    {PROTOBUF_FIELD_OFFSET(AggSpec_AggSpecNonUniqueSentinel, _impl_.type_.char_value_), _Internal::kOneofCaseOffset + 0, 0,
-    (0 | ::_fl::kFcOneof | ::_fl::kSInt32)},
-  }},
-  // no aux_entries
-  {{
-    "\102\0\14\0\0\0\0\0\0\0\0\0\0\0\0\0"
-    "io.deephaven.proto.backplane.grpc.AggSpec.AggSpecNonUniqueSentinel"
-    "string_value"
-  }},
-};
-
-::uint8_t* AggSpec_AggSpecNonUniqueSentinel::_InternalSerialize(
-    ::uint8_t* target,
-    ::google::protobuf::io::EpsCopyOutputStream* stream) const {
-  // @@protoc_insertion_point(serialize_to_array_start:io.deephaven.proto.backplane.grpc.AggSpec.AggSpecNonUniqueSentinel)
-  ::uint32_t cached_has_bits = 0;
-  (void)cached_has_bits;
-
-  switch (type_case()) {
-    case kNullValue: {
-      target = stream->EnsureSpace(target);
-      target = ::_pbi::WireFormatLite::WriteEnumToArray(
-          1, this->_internal_null_value(), target);
-      break;
-    }
-    case kStringValue: {
-      const std::string& _s = this->_internal_string_value();
-      ::google::protobuf::internal::WireFormatLite::VerifyUtf8String(
-          _s.data(), static_cast<int>(_s.length()), ::google::protobuf::internal::WireFormatLite::SERIALIZE, "io.deephaven.proto.backplane.grpc.AggSpec.AggSpecNonUniqueSentinel.string_value");
-      target = stream->WriteStringMaybeAliased(2, _s, target);
-      break;
-    }
-    case kIntValue: {
-      target = stream->EnsureSpace(target);
-      target = ::_pbi::WireFormatLite::WriteSInt32ToArray(
-          3, this->_internal_int_value(), target);
-      break;
-    }
-    case kLongValue: {
-      target = stream->EnsureSpace(target);
-      target = ::_pbi::WireFormatLite::WriteSInt64ToArray(
-          4, this->_internal_long_value(), target);
-      break;
-    }
-    case kFloatValue: {
-      target = stream->EnsureSpace(target);
-      target = ::_pbi::WireFormatLite::WriteFloatToArray(
-          5, this->_internal_float_value(), target);
-      break;
-    }
-    case kDoubleValue: {
-      target = stream->EnsureSpace(target);
-      target = ::_pbi::WireFormatLite::WriteDoubleToArray(
-          6, this->_internal_double_value(), target);
-      break;
-    }
-    case kBoolValue: {
-      target = stream->EnsureSpace(target);
-      target = ::_pbi::WireFormatLite::WriteBoolToArray(
-          7, this->_internal_bool_value(), target);
-      break;
-    }
-    case kByteValue: {
-      target = stream->EnsureSpace(target);
-      target = ::_pbi::WireFormatLite::WriteSInt32ToArray(
-          8, this->_internal_byte_value(), target);
-      break;
-    }
-    case kShortValue: {
-      target = stream->EnsureSpace(target);
-      target = ::_pbi::WireFormatLite::WriteSInt32ToArray(
-          9, this->_internal_short_value(), target);
-      break;
-    }
-    case kCharValue: {
-      target = stream->EnsureSpace(target);
-      target = ::_pbi::WireFormatLite::WriteSInt32ToArray(
-          10, this->_internal_char_value(), target);
-      break;
-    }
-    default:
-      break;
-  }
-  if (PROTOBUF_PREDICT_FALSE(_internal_metadata_.have_unknown_fields())) {
-    target =
-        ::_pbi::WireFormat::InternalSerializeUnknownFieldsToArray(
-            _internal_metadata_.unknown_fields<::google::protobuf::UnknownFieldSet>(::google::protobuf::UnknownFieldSet::default_instance), target, stream);
-  }
-  // @@protoc_insertion_point(serialize_to_array_end:io.deephaven.proto.backplane.grpc.AggSpec.AggSpecNonUniqueSentinel)
-  return target;
-}
-
-::size_t AggSpec_AggSpecNonUniqueSentinel::ByteSizeLong() const {
-// @@protoc_insertion_point(message_byte_size_start:io.deephaven.proto.backplane.grpc.AggSpec.AggSpecNonUniqueSentinel)
-  ::size_t total_size = 0;
-
-  ::uint32_t cached_has_bits = 0;
-  // Prevent compiler warnings about cached_has_bits being unused
-  (void) cached_has_bits;
-
-  switch (type_case()) {
-    // .io.deephaven.proto.backplane.grpc.NullValue null_value = 1;
-    case kNullValue: {
-      total_size += 1 +
-                    ::_pbi::WireFormatLite::EnumSize(this->_internal_null_value());
-      break;
-    }
-    // string string_value = 2;
-    case kStringValue: {
-      total_size += 1 + ::google::protobuf::internal::WireFormatLite::StringSize(
-                                      this->_internal_string_value());
-      break;
-    }
-    // sint32 int_value = 3;
-    case kIntValue: {
-      total_size += ::_pbi::WireFormatLite::SInt32SizePlusOne(
-          this->_internal_int_value());
-      break;
-    }
-    // sint64 long_value = 4 [jstype = JS_STRING];
-    case kLongValue: {
-      total_size += ::_pbi::WireFormatLite::SInt64SizePlusOne(
-          this->_internal_long_value());
-      break;
-    }
-    // float float_value = 5;
-    case kFloatValue: {
-      total_size += 5;
-      break;
-    }
-    // double double_value = 6;
-    case kDoubleValue: {
-      total_size += 9;
-      break;
-    }
-    // bool bool_value = 7;
-    case kBoolValue: {
-      total_size += 2;
-      break;
-    }
-    // sint32 byte_value = 8;
-    case kByteValue: {
-      total_size += ::_pbi::WireFormatLite::SInt32SizePlusOne(
-          this->_internal_byte_value());
-      break;
-    }
-    // sint32 short_value = 9;
-    case kShortValue: {
-      total_size += ::_pbi::WireFormatLite::SInt32SizePlusOne(
-          this->_internal_short_value());
-      break;
-    }
-    // sint32 char_value = 10;
-    case kCharValue: {
-      total_size += ::_pbi::WireFormatLite::SInt32SizePlusOne(
-          this->_internal_char_value());
-      break;
-    }
-    case TYPE_NOT_SET: {
-      break;
-    }
-  }
-  return MaybeComputeUnknownFieldsSize(total_size, &_impl_._cached_size_);
-}
-
-const ::google::protobuf::Message::ClassData AggSpec_AggSpecNonUniqueSentinel::_class_data_ = {
-    AggSpec_AggSpecNonUniqueSentinel::MergeImpl,
-    nullptr,  // OnDemandRegisterArenaDtor
-};
-const ::google::protobuf::Message::ClassData* AggSpec_AggSpecNonUniqueSentinel::GetClassData() const {
-  return &_class_data_;
-}
-
-void AggSpec_AggSpecNonUniqueSentinel::MergeImpl(::google::protobuf::Message& to_msg, const ::google::protobuf::Message& from_msg) {
-  auto* const _this = static_cast<AggSpec_AggSpecNonUniqueSentinel*>(&to_msg);
-  auto& from = static_cast<const AggSpec_AggSpecNonUniqueSentinel&>(from_msg);
-  // @@protoc_insertion_point(class_specific_merge_from_start:io.deephaven.proto.backplane.grpc.AggSpec.AggSpecNonUniqueSentinel)
-  ABSL_DCHECK_NE(&from, _this);
-  ::uint32_t cached_has_bits = 0;
-  (void) cached_has_bits;
-
-  switch (from.type_case()) {
-    case kNullValue: {
-      _this->_internal_set_null_value(from._internal_null_value());
-      break;
-    }
-    case kStringValue: {
-      _this->_internal_set_string_value(from._internal_string_value());
-      break;
-    }
-    case kIntValue: {
-      _this->_internal_set_int_value(from._internal_int_value());
-      break;
-    }
-    case kLongValue: {
-      _this->_internal_set_long_value(from._internal_long_value());
-      break;
-    }
-    case kFloatValue: {
-      _this->_internal_set_float_value(from._internal_float_value());
-      break;
-    }
-    case kDoubleValue: {
-      _this->_internal_set_double_value(from._internal_double_value());
-      break;
-    }
-    case kBoolValue: {
-      _this->_internal_set_bool_value(from._internal_bool_value());
-      break;
-    }
-    case kByteValue: {
-      _this->_internal_set_byte_value(from._internal_byte_value());
-      break;
-    }
-    case kShortValue: {
-      _this->_internal_set_short_value(from._internal_short_value());
-      break;
-    }
-    case kCharValue: {
-      _this->_internal_set_char_value(from._internal_char_value());
-      break;
-    }
-    case TYPE_NOT_SET: {
-      break;
-    }
-  }
-  _this->_internal_metadata_.MergeFrom<::google::protobuf::UnknownFieldSet>(from._internal_metadata_);
-}
-
-void AggSpec_AggSpecNonUniqueSentinel::CopyFrom(const AggSpec_AggSpecNonUniqueSentinel& from) {
-// @@protoc_insertion_point(class_specific_copy_from_start:io.deephaven.proto.backplane.grpc.AggSpec.AggSpecNonUniqueSentinel)
-  if (&from == this) return;
-  Clear();
-  MergeFrom(from);
-}
-
-PROTOBUF_NOINLINE bool AggSpec_AggSpecNonUniqueSentinel::IsInitialized() const {
-  return true;
-}
-
-::_pbi::CachedSize* AggSpec_AggSpecNonUniqueSentinel::AccessCachedSize() const {
-  return &_impl_._cached_size_;
-}
-void AggSpec_AggSpecNonUniqueSentinel::InternalSwap(AggSpec_AggSpecNonUniqueSentinel* PROTOBUF_RESTRICT other) {
-  using std::swap;
-  _internal_metadata_.InternalSwap(&other->_internal_metadata_);
-  swap(_impl_.type_, other->_impl_.type_);
-  swap(_impl_._oneof_case_[0], other->_impl_._oneof_case_[0]);
-}
-
-::google::protobuf::Metadata AggSpec_AggSpecNonUniqueSentinel::GetMetadata() const {
-  return ::_pbi::AssignDescriptors(
-      &descriptor_table_deephaven_2fproto_2ftable_2eproto_getter, &descriptor_table_deephaven_2fproto_2ftable_2eproto_once,
-      file_level_metadata_deephaven_2fproto_2ftable_2eproto[72]);
-}
-// ===================================================================
-
-class AggSpec_AggSpecWeighted::_Internal {
- public:
-};
-
-AggSpec_AggSpecWeighted::AggSpec_AggSpecWeighted(::google::protobuf::Arena* arena)
-    : ::google::protobuf::Message(arena) {
-  SharedCtor(arena);
-  // @@protoc_insertion_point(arena_constructor:io.deephaven.proto.backplane.grpc.AggSpec.AggSpecWeighted)
-}
-inline PROTOBUF_NDEBUG_INLINE AggSpec_AggSpecWeighted::Impl_::Impl_(
-    ::google::protobuf::internal::InternalVisibility visibility, ::google::protobuf::Arena* arena,
-    const Impl_& from)
-      : weight_column_(arena, from.weight_column_),
-        _cached_size_{0} {}
-
-AggSpec_AggSpecWeighted::AggSpec_AggSpecWeighted(
-    ::google::protobuf::Arena* arena,
-    const AggSpec_AggSpecWeighted& from)
-    : ::google::protobuf::Message(arena) {
-  AggSpec_AggSpecWeighted* const _this = this;
-  (void)_this;
-  _internal_metadata_.MergeFrom<::google::protobuf::UnknownFieldSet>(
-      from._internal_metadata_);
-  new (&_impl_) Impl_(internal_visibility(), arena, from._impl_);
-
-  // @@protoc_insertion_point(copy_constructor:io.deephaven.proto.backplane.grpc.AggSpec.AggSpecWeighted)
-}
-inline PROTOBUF_NDEBUG_INLINE AggSpec_AggSpecWeighted::Impl_::Impl_(
-    ::google::protobuf::internal::InternalVisibility visibility,
-    ::google::protobuf::Arena* arena)
-      : weight_column_(arena),
-        _cached_size_{0} {}
-
-inline void AggSpec_AggSpecWeighted::SharedCtor(::_pb::Arena* arena) {
-  new (&_impl_) Impl_(internal_visibility(), arena);
-}
-AggSpec_AggSpecWeighted::~AggSpec_AggSpecWeighted() {
-  // @@protoc_insertion_point(destructor:io.deephaven.proto.backplane.grpc.AggSpec.AggSpecWeighted)
-  _internal_metadata_.Delete<::google::protobuf::UnknownFieldSet>();
-  SharedDtor();
-}
-inline void AggSpec_AggSpecWeighted::SharedDtor() {
-  ABSL_DCHECK(GetArena() == nullptr);
-  _impl_.weight_column_.Destroy();
-  _impl_.~Impl_();
-}
-
-PROTOBUF_NOINLINE void AggSpec_AggSpecWeighted::Clear() {
-// @@protoc_insertion_point(message_clear_start:io.deephaven.proto.backplane.grpc.AggSpec.AggSpecWeighted)
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  ::uint32_t cached_has_bits = 0;
-  // Prevent compiler warnings about cached_has_bits being unused
-  (void) cached_has_bits;
-
-  _impl_.weight_column_.ClearToEmpty();
-  _internal_metadata_.Clear<::google::protobuf::UnknownFieldSet>();
-}
-
-const char* AggSpec_AggSpecWeighted::_InternalParse(
-    const char* ptr, ::_pbi::ParseContext* ctx) {
-  ptr = ::_pbi::TcParser::ParseLoop(this, ptr, ctx, &_table_.header);
-  return ptr;
-}
-
-
-PROTOBUF_CONSTINIT PROTOBUF_ATTRIBUTE_INIT_PRIORITY1
-const ::_pbi::TcParseTable<0, 1, 0, 79, 2> AggSpec_AggSpecWeighted::_table_ = {
-  {
-    0,  // no _has_bits_
-    0, // no _extensions_
-    1, 0,  // max_field_number, fast_idx_mask
-    offsetof(decltype(_table_), field_lookup_table),
-    4294967294,  // skipmap
-    offsetof(decltype(_table_), field_entries),
-    1,  // num_field_entries
-    0,  // num_aux_entries
-    offsetof(decltype(_table_), field_names),  // no aux_entries
-    &_AggSpec_AggSpecWeighted_default_instance_._instance,
-    ::_pbi::TcParser::GenericFallback,  // fallback
-  }, {{
-    // string weight_column = 1;
-    {::_pbi::TcParser::FastUS1,
-     {10, 63, 0, PROTOBUF_FIELD_OFFSET(AggSpec_AggSpecWeighted, _impl_.weight_column_)}},
-  }}, {{
-    65535, 65535
-  }}, {{
-    // string weight_column = 1;
-    {PROTOBUF_FIELD_OFFSET(AggSpec_AggSpecWeighted, _impl_.weight_column_), 0, 0,
-    (0 | ::_fl::kFcSingular | ::_fl::kUtf8String | ::_fl::kRepAString)},
-  }},
-  // no aux_entries
-  {{
-    "\71\15\0\0\0\0\0\0"
-    "io.deephaven.proto.backplane.grpc.AggSpec.AggSpecWeighted"
-    "weight_column"
-  }},
-};
-
-::uint8_t* AggSpec_AggSpecWeighted::_InternalSerialize(
-    ::uint8_t* target,
-    ::google::protobuf::io::EpsCopyOutputStream* stream) const {
-  // @@protoc_insertion_point(serialize_to_array_start:io.deephaven.proto.backplane.grpc.AggSpec.AggSpecWeighted)
-  ::uint32_t cached_has_bits = 0;
-  (void)cached_has_bits;
-
-  // string weight_column = 1;
-  if (!this->_internal_weight_column().empty()) {
-    const std::string& _s = this->_internal_weight_column();
-    ::google::protobuf::internal::WireFormatLite::VerifyUtf8String(
-        _s.data(), static_cast<int>(_s.length()), ::google::protobuf::internal::WireFormatLite::SERIALIZE, "io.deephaven.proto.backplane.grpc.AggSpec.AggSpecWeighted.weight_column");
-    target = stream->WriteStringMaybeAliased(1, _s, target);
-  }
-
-  if (PROTOBUF_PREDICT_FALSE(_internal_metadata_.have_unknown_fields())) {
-    target =
-        ::_pbi::WireFormat::InternalSerializeUnknownFieldsToArray(
-            _internal_metadata_.unknown_fields<::google::protobuf::UnknownFieldSet>(::google::protobuf::UnknownFieldSet::default_instance), target, stream);
-  }
-  // @@protoc_insertion_point(serialize_to_array_end:io.deephaven.proto.backplane.grpc.AggSpec.AggSpecWeighted)
-  return target;
-}
-
-::size_t AggSpec_AggSpecWeighted::ByteSizeLong() const {
-// @@protoc_insertion_point(message_byte_size_start:io.deephaven.proto.backplane.grpc.AggSpec.AggSpecWeighted)
-  ::size_t total_size = 0;
-
-  ::uint32_t cached_has_bits = 0;
-  // Prevent compiler warnings about cached_has_bits being unused
-  (void) cached_has_bits;
-
-  // string weight_column = 1;
-  if (!this->_internal_weight_column().empty()) {
-    total_size += 1 + ::google::protobuf::internal::WireFormatLite::StringSize(
-                                    this->_internal_weight_column());
-  }
-
-  return MaybeComputeUnknownFieldsSize(total_size, &_impl_._cached_size_);
-}
-
-const ::google::protobuf::Message::ClassData AggSpec_AggSpecWeighted::_class_data_ = {
-    AggSpec_AggSpecWeighted::MergeImpl,
-    nullptr,  // OnDemandRegisterArenaDtor
-};
-const ::google::protobuf::Message::ClassData* AggSpec_AggSpecWeighted::GetClassData() const {
-  return &_class_data_;
-}
-
-void AggSpec_AggSpecWeighted::MergeImpl(::google::protobuf::Message& to_msg, const ::google::protobuf::Message& from_msg) {
-  auto* const _this = static_cast<AggSpec_AggSpecWeighted*>(&to_msg);
-  auto& from = static_cast<const AggSpec_AggSpecWeighted&>(from_msg);
-  // @@protoc_insertion_point(class_specific_merge_from_start:io.deephaven.proto.backplane.grpc.AggSpec.AggSpecWeighted)
-  ABSL_DCHECK_NE(&from, _this);
-  ::uint32_t cached_has_bits = 0;
-  (void) cached_has_bits;
-
-  if (!from._internal_weight_column().empty()) {
-    _this->_internal_set_weight_column(from._internal_weight_column());
-  }
-  _this->_internal_metadata_.MergeFrom<::google::protobuf::UnknownFieldSet>(from._internal_metadata_);
-}
-
-void AggSpec_AggSpecWeighted::CopyFrom(const AggSpec_AggSpecWeighted& from) {
-// @@protoc_insertion_point(class_specific_copy_from_start:io.deephaven.proto.backplane.grpc.AggSpec.AggSpecWeighted)
-  if (&from == this) return;
-  Clear();
-  MergeFrom(from);
-}
-
-PROTOBUF_NOINLINE bool AggSpec_AggSpecWeighted::IsInitialized() const {
-  return true;
-}
-
-::_pbi::CachedSize* AggSpec_AggSpecWeighted::AccessCachedSize() const {
-  return &_impl_._cached_size_;
-}
-void AggSpec_AggSpecWeighted::InternalSwap(AggSpec_AggSpecWeighted* PROTOBUF_RESTRICT other) {
-  using std::swap;
-  auto* arena = GetArena();
-  ABSL_DCHECK_EQ(arena, other->GetArena());
-  _internal_metadata_.InternalSwap(&other->_internal_metadata_);
-  ::_pbi::ArenaStringPtr::InternalSwap(&_impl_.weight_column_, &other->_impl_.weight_column_, arena);
-}
-
-::google::protobuf::Metadata AggSpec_AggSpecWeighted::GetMetadata() const {
-  return ::_pbi::AssignDescriptors(
-      &descriptor_table_deephaven_2fproto_2ftable_2eproto_getter, &descriptor_table_deephaven_2fproto_2ftable_2eproto_once,
-      file_level_metadata_deephaven_2fproto_2ftable_2eproto[73]);
-}
-// ===================================================================
-
-class AggSpec_AggSpecAbsSum::_Internal {
- public:
-};
-
-AggSpec_AggSpecAbsSum::AggSpec_AggSpecAbsSum(::google::protobuf::Arena* arena)
-    : ::google::protobuf::internal::ZeroFieldsBase(arena) {
-  // @@protoc_insertion_point(arena_constructor:io.deephaven.proto.backplane.grpc.AggSpec.AggSpecAbsSum)
-}
-AggSpec_AggSpecAbsSum::AggSpec_AggSpecAbsSum(
-    ::google::protobuf::Arena* arena,
-    const AggSpec_AggSpecAbsSum& from)
-    : ::google::protobuf::internal::ZeroFieldsBase(arena) {
-  AggSpec_AggSpecAbsSum* const _this = this;
-  (void)_this;
-  _internal_metadata_.MergeFrom<::google::protobuf::UnknownFieldSet>(
-      from._internal_metadata_);
-
-  // @@protoc_insertion_point(copy_constructor:io.deephaven.proto.backplane.grpc.AggSpec.AggSpecAbsSum)
-}
-
-
-
-
-
-
-
-
-
-::google::protobuf::Metadata AggSpec_AggSpecAbsSum::GetMetadata() const {
-  return ::_pbi::AssignDescriptors(
-      &descriptor_table_deephaven_2fproto_2ftable_2eproto_getter, &descriptor_table_deephaven_2fproto_2ftable_2eproto_once,
-      file_level_metadata_deephaven_2fproto_2ftable_2eproto[74]);
-}
-// ===================================================================
-
-class AggSpec_AggSpecAvg::_Internal {
- public:
-};
-
-AggSpec_AggSpecAvg::AggSpec_AggSpecAvg(::google::protobuf::Arena* arena)
-    : ::google::protobuf::internal::ZeroFieldsBase(arena) {
-  // @@protoc_insertion_point(arena_constructor:io.deephaven.proto.backplane.grpc.AggSpec.AggSpecAvg)
-}
-AggSpec_AggSpecAvg::AggSpec_AggSpecAvg(
-    ::google::protobuf::Arena* arena,
-    const AggSpec_AggSpecAvg& from)
-    : ::google::protobuf::internal::ZeroFieldsBase(arena) {
-  AggSpec_AggSpecAvg* const _this = this;
-  (void)_this;
-  _internal_metadata_.MergeFrom<::google::protobuf::UnknownFieldSet>(
-      from._internal_metadata_);
-
-  // @@protoc_insertion_point(copy_constructor:io.deephaven.proto.backplane.grpc.AggSpec.AggSpecAvg)
-}
-
-
-
-
-
-
-
-
-
-::google::protobuf::Metadata AggSpec_AggSpecAvg::GetMetadata() const {
-  return ::_pbi::AssignDescriptors(
-      &descriptor_table_deephaven_2fproto_2ftable_2eproto_getter, &descriptor_table_deephaven_2fproto_2ftable_2eproto_once,
-      file_level_metadata_deephaven_2fproto_2ftable_2eproto[75]);
-}
-// ===================================================================
-
-class AggSpec_AggSpecFirst::_Internal {
- public:
-};
-
-AggSpec_AggSpecFirst::AggSpec_AggSpecFirst(::google::protobuf::Arena* arena)
-    : ::google::protobuf::internal::ZeroFieldsBase(arena) {
-  // @@protoc_insertion_point(arena_constructor:io.deephaven.proto.backplane.grpc.AggSpec.AggSpecFirst)
-}
-AggSpec_AggSpecFirst::AggSpec_AggSpecFirst(
-    ::google::protobuf::Arena* arena,
-    const AggSpec_AggSpecFirst& from)
-    : ::google::protobuf::internal::ZeroFieldsBase(arena) {
-  AggSpec_AggSpecFirst* const _this = this;
-  (void)_this;
-  _internal_metadata_.MergeFrom<::google::protobuf::UnknownFieldSet>(
-      from._internal_metadata_);
-
-  // @@protoc_insertion_point(copy_constructor:io.deephaven.proto.backplane.grpc.AggSpec.AggSpecFirst)
-}
-
-
-
-
-
-
-
-
-
-::google::protobuf::Metadata AggSpec_AggSpecFirst::GetMetadata() const {
-  return ::_pbi::AssignDescriptors(
-      &descriptor_table_deephaven_2fproto_2ftable_2eproto_getter, &descriptor_table_deephaven_2fproto_2ftable_2eproto_once,
-      file_level_metadata_deephaven_2fproto_2ftable_2eproto[76]);
-}
-// ===================================================================
-
-class AggSpec_AggSpecFreeze::_Internal {
- public:
-};
-
-AggSpec_AggSpecFreeze::AggSpec_AggSpecFreeze(::google::protobuf::Arena* arena)
-    : ::google::protobuf::internal::ZeroFieldsBase(arena) {
-  // @@protoc_insertion_point(arena_constructor:io.deephaven.proto.backplane.grpc.AggSpec.AggSpecFreeze)
-}
-AggSpec_AggSpecFreeze::AggSpec_AggSpecFreeze(
-    ::google::protobuf::Arena* arena,
-    const AggSpec_AggSpecFreeze& from)
-    : ::google::protobuf::internal::ZeroFieldsBase(arena) {
-  AggSpec_AggSpecFreeze* const _this = this;
-  (void)_this;
-  _internal_metadata_.MergeFrom<::google::protobuf::UnknownFieldSet>(
-      from._internal_metadata_);
-
-  // @@protoc_insertion_point(copy_constructor:io.deephaven.proto.backplane.grpc.AggSpec.AggSpecFreeze)
-}
-
-
-
-
-
-
-
-
-
-::google::protobuf::Metadata AggSpec_AggSpecFreeze::GetMetadata() const {
-  return ::_pbi::AssignDescriptors(
-      &descriptor_table_deephaven_2fproto_2ftable_2eproto_getter, &descriptor_table_deephaven_2fproto_2ftable_2eproto_once,
-      file_level_metadata_deephaven_2fproto_2ftable_2eproto[77]);
-}
-// ===================================================================
-
-class AggSpec_AggSpecGroup::_Internal {
- public:
-};
-
-AggSpec_AggSpecGroup::AggSpec_AggSpecGroup(::google::protobuf::Arena* arena)
-    : ::google::protobuf::internal::ZeroFieldsBase(arena) {
-  // @@protoc_insertion_point(arena_constructor:io.deephaven.proto.backplane.grpc.AggSpec.AggSpecGroup)
-}
-AggSpec_AggSpecGroup::AggSpec_AggSpecGroup(
-    ::google::protobuf::Arena* arena,
-    const AggSpec_AggSpecGroup& from)
-    : ::google::protobuf::internal::ZeroFieldsBase(arena) {
-  AggSpec_AggSpecGroup* const _this = this;
-  (void)_this;
-  _internal_metadata_.MergeFrom<::google::protobuf::UnknownFieldSet>(
-      from._internal_metadata_);
-
-  // @@protoc_insertion_point(copy_constructor:io.deephaven.proto.backplane.grpc.AggSpec.AggSpecGroup)
-}
-
-
-
-
-
-
-
-
-
-::google::protobuf::Metadata AggSpec_AggSpecGroup::GetMetadata() const {
-  return ::_pbi::AssignDescriptors(
-      &descriptor_table_deephaven_2fproto_2ftable_2eproto_getter, &descriptor_table_deephaven_2fproto_2ftable_2eproto_once,
-      file_level_metadata_deephaven_2fproto_2ftable_2eproto[78]);
-}
-// ===================================================================
-
-class AggSpec_AggSpecLast::_Internal {
- public:
-};
-
-AggSpec_AggSpecLast::AggSpec_AggSpecLast(::google::protobuf::Arena* arena)
-    : ::google::protobuf::internal::ZeroFieldsBase(arena) {
-  // @@protoc_insertion_point(arena_constructor:io.deephaven.proto.backplane.grpc.AggSpec.AggSpecLast)
-}
-AggSpec_AggSpecLast::AggSpec_AggSpecLast(
-    ::google::protobuf::Arena* arena,
-    const AggSpec_AggSpecLast& from)
-    : ::google::protobuf::internal::ZeroFieldsBase(arena) {
-  AggSpec_AggSpecLast* const _this = this;
-  (void)_this;
-  _internal_metadata_.MergeFrom<::google::protobuf::UnknownFieldSet>(
-      from._internal_metadata_);
-
-  // @@protoc_insertion_point(copy_constructor:io.deephaven.proto.backplane.grpc.AggSpec.AggSpecLast)
-}
-
-
-
-
-
-
-
-
-
-::google::protobuf::Metadata AggSpec_AggSpecLast::GetMetadata() const {
-  return ::_pbi::AssignDescriptors(
-      &descriptor_table_deephaven_2fproto_2ftable_2eproto_getter, &descriptor_table_deephaven_2fproto_2ftable_2eproto_once,
-      file_level_metadata_deephaven_2fproto_2ftable_2eproto[79]);
-}
-// ===================================================================
-
-class AggSpec_AggSpecMax::_Internal {
- public:
-};
-
-AggSpec_AggSpecMax::AggSpec_AggSpecMax(::google::protobuf::Arena* arena)
-    : ::google::protobuf::internal::ZeroFieldsBase(arena) {
-  // @@protoc_insertion_point(arena_constructor:io.deephaven.proto.backplane.grpc.AggSpec.AggSpecMax)
-}
-AggSpec_AggSpecMax::AggSpec_AggSpecMax(
-    ::google::protobuf::Arena* arena,
-    const AggSpec_AggSpecMax& from)
-    : ::google::protobuf::internal::ZeroFieldsBase(arena) {
-  AggSpec_AggSpecMax* const _this = this;
-  (void)_this;
-  _internal_metadata_.MergeFrom<::google::protobuf::UnknownFieldSet>(
-      from._internal_metadata_);
-
-  // @@protoc_insertion_point(copy_constructor:io.deephaven.proto.backplane.grpc.AggSpec.AggSpecMax)
-}
-
-
-
-
-
-
-
-
-
-::google::protobuf::Metadata AggSpec_AggSpecMax::GetMetadata() const {
-  return ::_pbi::AssignDescriptors(
-      &descriptor_table_deephaven_2fproto_2ftable_2eproto_getter, &descriptor_table_deephaven_2fproto_2ftable_2eproto_once,
-      file_level_metadata_deephaven_2fproto_2ftable_2eproto[80]);
-}
-// ===================================================================
-
-class AggSpec_AggSpecMin::_Internal {
- public:
-};
-
-AggSpec_AggSpecMin::AggSpec_AggSpecMin(::google::protobuf::Arena* arena)
-    : ::google::protobuf::internal::ZeroFieldsBase(arena) {
-  // @@protoc_insertion_point(arena_constructor:io.deephaven.proto.backplane.grpc.AggSpec.AggSpecMin)
-}
-AggSpec_AggSpecMin::AggSpec_AggSpecMin(
-    ::google::protobuf::Arena* arena,
-    const AggSpec_AggSpecMin& from)
-    : ::google::protobuf::internal::ZeroFieldsBase(arena) {
-  AggSpec_AggSpecMin* const _this = this;
-  (void)_this;
-  _internal_metadata_.MergeFrom<::google::protobuf::UnknownFieldSet>(
-      from._internal_metadata_);
-
-  // @@protoc_insertion_point(copy_constructor:io.deephaven.proto.backplane.grpc.AggSpec.AggSpecMin)
-}
-
-
-
-
-
-
-
-
-
-::google::protobuf::Metadata AggSpec_AggSpecMin::GetMetadata() const {
-  return ::_pbi::AssignDescriptors(
-      &descriptor_table_deephaven_2fproto_2ftable_2eproto_getter, &descriptor_table_deephaven_2fproto_2ftable_2eproto_once,
-      file_level_metadata_deephaven_2fproto_2ftable_2eproto[81]);
-}
-// ===================================================================
-
-class AggSpec_AggSpecStd::_Internal {
- public:
-};
-
-AggSpec_AggSpecStd::AggSpec_AggSpecStd(::google::protobuf::Arena* arena)
-    : ::google::protobuf::internal::ZeroFieldsBase(arena) {
-  // @@protoc_insertion_point(arena_constructor:io.deephaven.proto.backplane.grpc.AggSpec.AggSpecStd)
-}
-AggSpec_AggSpecStd::AggSpec_AggSpecStd(
-    ::google::protobuf::Arena* arena,
-    const AggSpec_AggSpecStd& from)
-    : ::google::protobuf::internal::ZeroFieldsBase(arena) {
-  AggSpec_AggSpecStd* const _this = this;
-  (void)_this;
-  _internal_metadata_.MergeFrom<::google::protobuf::UnknownFieldSet>(
-      from._internal_metadata_);
-
-  // @@protoc_insertion_point(copy_constructor:io.deephaven.proto.backplane.grpc.AggSpec.AggSpecStd)
-}
-
-
-
-
-
-
-
-
-
-::google::protobuf::Metadata AggSpec_AggSpecStd::GetMetadata() const {
-  return ::_pbi::AssignDescriptors(
-      &descriptor_table_deephaven_2fproto_2ftable_2eproto_getter, &descriptor_table_deephaven_2fproto_2ftable_2eproto_once,
-      file_level_metadata_deephaven_2fproto_2ftable_2eproto[82]);
-}
-// ===================================================================
-
-class AggSpec_AggSpecSum::_Internal {
- public:
-};
-
-AggSpec_AggSpecSum::AggSpec_AggSpecSum(::google::protobuf::Arena* arena)
-    : ::google::protobuf::internal::ZeroFieldsBase(arena) {
-  // @@protoc_insertion_point(arena_constructor:io.deephaven.proto.backplane.grpc.AggSpec.AggSpecSum)
-}
-AggSpec_AggSpecSum::AggSpec_AggSpecSum(
-    ::google::protobuf::Arena* arena,
-    const AggSpec_AggSpecSum& from)
-    : ::google::protobuf::internal::ZeroFieldsBase(arena) {
-  AggSpec_AggSpecSum* const _this = this;
-  (void)_this;
-  _internal_metadata_.MergeFrom<::google::protobuf::UnknownFieldSet>(
-      from._internal_metadata_);
-
-  // @@protoc_insertion_point(copy_constructor:io.deephaven.proto.backplane.grpc.AggSpec.AggSpecSum)
-}
-
-
-
-
-
-
-
-
-
-::google::protobuf::Metadata AggSpec_AggSpecSum::GetMetadata() const {
-  return ::_pbi::AssignDescriptors(
-      &descriptor_table_deephaven_2fproto_2ftable_2eproto_getter, &descriptor_table_deephaven_2fproto_2ftable_2eproto_once,
-      file_level_metadata_deephaven_2fproto_2ftable_2eproto[83]);
-}
-// ===================================================================
-
-class AggSpec_AggSpecVar::_Internal {
- public:
-};
-
-AggSpec_AggSpecVar::AggSpec_AggSpecVar(::google::protobuf::Arena* arena)
-    : ::google::protobuf::internal::ZeroFieldsBase(arena) {
-  // @@protoc_insertion_point(arena_constructor:io.deephaven.proto.backplane.grpc.AggSpec.AggSpecVar)
-}
-AggSpec_AggSpecVar::AggSpec_AggSpecVar(
-    ::google::protobuf::Arena* arena,
-    const AggSpec_AggSpecVar& from)
-    : ::google::protobuf::internal::ZeroFieldsBase(arena) {
-  AggSpec_AggSpecVar* const _this = this;
-  (void)_this;
-  _internal_metadata_.MergeFrom<::google::protobuf::UnknownFieldSet>(
-      from._internal_metadata_);
-
-  // @@protoc_insertion_point(copy_constructor:io.deephaven.proto.backplane.grpc.AggSpec.AggSpecVar)
-}
-
-
-
-
-
-
-
-
-
-::google::protobuf::Metadata AggSpec_AggSpecVar::GetMetadata() const {
-  return ::_pbi::AssignDescriptors(
-      &descriptor_table_deephaven_2fproto_2ftable_2eproto_getter, &descriptor_table_deephaven_2fproto_2ftable_2eproto_once,
-      file_level_metadata_deephaven_2fproto_2ftable_2eproto[84]);
-}
-// ===================================================================
-
-class AggSpec::_Internal {
- public:
-  static constexpr ::int32_t kOneofCaseOffset =
-    PROTOBUF_FIELD_OFFSET(::io::deephaven::proto::backplane::grpc::AggSpec, _impl_._oneof_case_);
-  static const ::io::deephaven::proto::backplane::grpc::AggSpec_AggSpecAbsSum& abs_sum(const AggSpec* msg);
-  static const ::io::deephaven::proto::backplane::grpc::AggSpec_AggSpecApproximatePercentile& approximate_percentile(const AggSpec* msg);
-  static const ::io::deephaven::proto::backplane::grpc::AggSpec_AggSpecAvg& avg(const AggSpec* msg);
-  static const ::io::deephaven::proto::backplane::grpc::AggSpec_AggSpecCountDistinct& count_distinct(const AggSpec* msg);
-  static const ::io::deephaven::proto::backplane::grpc::AggSpec_AggSpecDistinct& distinct(const AggSpec* msg);
-  static const ::io::deephaven::proto::backplane::grpc::AggSpec_AggSpecFirst& first(const AggSpec* msg);
-  static const ::io::deephaven::proto::backplane::grpc::AggSpec_AggSpecFormula& formula(const AggSpec* msg);
-  static const ::io::deephaven::proto::backplane::grpc::AggSpec_AggSpecFreeze& freeze(const AggSpec* msg);
-  static const ::io::deephaven::proto::backplane::grpc::AggSpec_AggSpecGroup& group(const AggSpec* msg);
-  static const ::io::deephaven::proto::backplane::grpc::AggSpec_AggSpecLast& last(const AggSpec* msg);
-  static const ::io::deephaven::proto::backplane::grpc::AggSpec_AggSpecMax& max(const AggSpec* msg);
-  static const ::io::deephaven::proto::backplane::grpc::AggSpec_AggSpecMedian& median(const AggSpec* msg);
-  static const ::io::deephaven::proto::backplane::grpc::AggSpec_AggSpecMin& min(const AggSpec* msg);
-  static const ::io::deephaven::proto::backplane::grpc::AggSpec_AggSpecPercentile& percentile(const AggSpec* msg);
-  static const ::io::deephaven::proto::backplane::grpc::AggSpec_AggSpecSorted& sorted_first(const AggSpec* msg);
-  static const ::io::deephaven::proto::backplane::grpc::AggSpec_AggSpecSorted& sorted_last(const AggSpec* msg);
-  static const ::io::deephaven::proto::backplane::grpc::AggSpec_AggSpecStd& std(const AggSpec* msg);
-  static const ::io::deephaven::proto::backplane::grpc::AggSpec_AggSpecSum& sum(const AggSpec* msg);
-  static const ::io::deephaven::proto::backplane::grpc::AggSpec_AggSpecTDigest& t_digest(const AggSpec* msg);
-  static const ::io::deephaven::proto::backplane::grpc::AggSpec_AggSpecUnique& unique(const AggSpec* msg);
-  static const ::io::deephaven::proto::backplane::grpc::AggSpec_AggSpecWeighted& weighted_avg(const AggSpec* msg);
-  static const ::io::deephaven::proto::backplane::grpc::AggSpec_AggSpecWeighted& weighted_sum(const AggSpec* msg);
-  static const ::io::deephaven::proto::backplane::grpc::AggSpec_AggSpecVar& var(const AggSpec* msg);
-};
-
-const ::io::deephaven::proto::backplane::grpc::AggSpec_AggSpecAbsSum& AggSpec::_Internal::abs_sum(const AggSpec* msg) {
-  return *msg->_impl_.type_.abs_sum_;
-}
-const ::io::deephaven::proto::backplane::grpc::AggSpec_AggSpecApproximatePercentile& AggSpec::_Internal::approximate_percentile(const AggSpec* msg) {
-  return *msg->_impl_.type_.approximate_percentile_;
-}
-const ::io::deephaven::proto::backplane::grpc::AggSpec_AggSpecAvg& AggSpec::_Internal::avg(const AggSpec* msg) {
-  return *msg->_impl_.type_.avg_;
-}
-const ::io::deephaven::proto::backplane::grpc::AggSpec_AggSpecCountDistinct& AggSpec::_Internal::count_distinct(const AggSpec* msg) {
-  return *msg->_impl_.type_.count_distinct_;
-}
-const ::io::deephaven::proto::backplane::grpc::AggSpec_AggSpecDistinct& AggSpec::_Internal::distinct(const AggSpec* msg) {
-  return *msg->_impl_.type_.distinct_;
-}
-const ::io::deephaven::proto::backplane::grpc::AggSpec_AggSpecFirst& AggSpec::_Internal::first(const AggSpec* msg) {
-  return *msg->_impl_.type_.first_;
-}
-const ::io::deephaven::proto::backplane::grpc::AggSpec_AggSpecFormula& AggSpec::_Internal::formula(const AggSpec* msg) {
-  return *msg->_impl_.type_.formula_;
-}
-const ::io::deephaven::proto::backplane::grpc::AggSpec_AggSpecFreeze& AggSpec::_Internal::freeze(const AggSpec* msg) {
-  return *msg->_impl_.type_.freeze_;
-}
-const ::io::deephaven::proto::backplane::grpc::AggSpec_AggSpecGroup& AggSpec::_Internal::group(const AggSpec* msg) {
-  return *msg->_impl_.type_.group_;
-}
-const ::io::deephaven::proto::backplane::grpc::AggSpec_AggSpecLast& AggSpec::_Internal::last(const AggSpec* msg) {
-  return *msg->_impl_.type_.last_;
-}
-const ::io::deephaven::proto::backplane::grpc::AggSpec_AggSpecMax& AggSpec::_Internal::max(const AggSpec* msg) {
-  return *msg->_impl_.type_.max_;
-}
-const ::io::deephaven::proto::backplane::grpc::AggSpec_AggSpecMedian& AggSpec::_Internal::median(const AggSpec* msg) {
-  return *msg->_impl_.type_.median_;
-}
-const ::io::deephaven::proto::backplane::grpc::AggSpec_AggSpecMin& AggSpec::_Internal::min(const AggSpec* msg) {
-  return *msg->_impl_.type_.min_;
-}
-const ::io::deephaven::proto::backplane::grpc::AggSpec_AggSpecPercentile& AggSpec::_Internal::percentile(const AggSpec* msg) {
-  return *msg->_impl_.type_.percentile_;
-}
-const ::io::deephaven::proto::backplane::grpc::AggSpec_AggSpecSorted& AggSpec::_Internal::sorted_first(const AggSpec* msg) {
-  return *msg->_impl_.type_.sorted_first_;
-}
-const ::io::deephaven::proto::backplane::grpc::AggSpec_AggSpecSorted& AggSpec::_Internal::sorted_last(const AggSpec* msg) {
-  return *msg->_impl_.type_.sorted_last_;
-}
-const ::io::deephaven::proto::backplane::grpc::AggSpec_AggSpecStd& AggSpec::_Internal::std(const AggSpec* msg) {
-  return *msg->_impl_.type_.std_;
-}
-const ::io::deephaven::proto::backplane::grpc::AggSpec_AggSpecSum& AggSpec::_Internal::sum(const AggSpec* msg) {
-  return *msg->_impl_.type_.sum_;
-}
-const ::io::deephaven::proto::backplane::grpc::AggSpec_AggSpecTDigest& AggSpec::_Internal::t_digest(const AggSpec* msg) {
-  return *msg->_impl_.type_.t_digest_;
-}
-const ::io::deephaven::proto::backplane::grpc::AggSpec_AggSpecUnique& AggSpec::_Internal::unique(const AggSpec* msg) {
-  return *msg->_impl_.type_.unique_;
-}
-const ::io::deephaven::proto::backplane::grpc::AggSpec_AggSpecWeighted& AggSpec::_Internal::weighted_avg(const AggSpec* msg) {
-  return *msg->_impl_.type_.weighted_avg_;
-}
-const ::io::deephaven::proto::backplane::grpc::AggSpec_AggSpecWeighted& AggSpec::_Internal::weighted_sum(const AggSpec* msg) {
-  return *msg->_impl_.type_.weighted_sum_;
-}
-const ::io::deephaven::proto::backplane::grpc::AggSpec_AggSpecVar& AggSpec::_Internal::var(const AggSpec* msg) {
-  return *msg->_impl_.type_.var_;
-}
-void AggSpec::set_allocated_abs_sum(::io::deephaven::proto::backplane::grpc::AggSpec_AggSpecAbsSum* abs_sum) {
-  ::google::protobuf::Arena* message_arena = GetArena();
-  clear_type();
-  if (abs_sum) {
-    ::google::protobuf::Arena* submessage_arena = abs_sum->GetArena();
-    if (message_arena != submessage_arena) {
-      abs_sum = ::google::protobuf::internal::GetOwnedMessage(message_arena, abs_sum, submessage_arena);
-    }
-    set_has_abs_sum();
-    _impl_.type_.abs_sum_ = abs_sum;
-  }
-  // @@protoc_insertion_point(field_set_allocated:io.deephaven.proto.backplane.grpc.AggSpec.abs_sum)
-}
-void AggSpec::set_allocated_approximate_percentile(::io::deephaven::proto::backplane::grpc::AggSpec_AggSpecApproximatePercentile* approximate_percentile) {
-  ::google::protobuf::Arena* message_arena = GetArena();
-  clear_type();
-  if (approximate_percentile) {
-    ::google::protobuf::Arena* submessage_arena = approximate_percentile->GetArena();
-    if (message_arena != submessage_arena) {
-      approximate_percentile = ::google::protobuf::internal::GetOwnedMessage(message_arena, approximate_percentile, submessage_arena);
-    }
-    set_has_approximate_percentile();
-    _impl_.type_.approximate_percentile_ = approximate_percentile;
-  }
-  // @@protoc_insertion_point(field_set_allocated:io.deephaven.proto.backplane.grpc.AggSpec.approximate_percentile)
-}
-void AggSpec::set_allocated_avg(::io::deephaven::proto::backplane::grpc::AggSpec_AggSpecAvg* avg) {
-  ::google::protobuf::Arena* message_arena = GetArena();
-  clear_type();
-  if (avg) {
-    ::google::protobuf::Arena* submessage_arena = avg->GetArena();
-    if (message_arena != submessage_arena) {
-      avg = ::google::protobuf::internal::GetOwnedMessage(message_arena, avg, submessage_arena);
-    }
-    set_has_avg();
-    _impl_.type_.avg_ = avg;
-  }
-  // @@protoc_insertion_point(field_set_allocated:io.deephaven.proto.backplane.grpc.AggSpec.avg)
-}
-void AggSpec::set_allocated_count_distinct(::io::deephaven::proto::backplane::grpc::AggSpec_AggSpecCountDistinct* count_distinct) {
-  ::google::protobuf::Arena* message_arena = GetArena();
-  clear_type();
-  if (count_distinct) {
-    ::google::protobuf::Arena* submessage_arena = count_distinct->GetArena();
-    if (message_arena != submessage_arena) {
-      count_distinct = ::google::protobuf::internal::GetOwnedMessage(message_arena, count_distinct, submessage_arena);
-    }
-    set_has_count_distinct();
-    _impl_.type_.count_distinct_ = count_distinct;
-  }
-  // @@protoc_insertion_point(field_set_allocated:io.deephaven.proto.backplane.grpc.AggSpec.count_distinct)
-}
-void AggSpec::set_allocated_distinct(::io::deephaven::proto::backplane::grpc::AggSpec_AggSpecDistinct* distinct) {
-  ::google::protobuf::Arena* message_arena = GetArena();
-  clear_type();
-  if (distinct) {
-    ::google::protobuf::Arena* submessage_arena = distinct->GetArena();
-    if (message_arena != submessage_arena) {
-      distinct = ::google::protobuf::internal::GetOwnedMessage(message_arena, distinct, submessage_arena);
-    }
-    set_has_distinct();
-    _impl_.type_.distinct_ = distinct;
-  }
-  // @@protoc_insertion_point(field_set_allocated:io.deephaven.proto.backplane.grpc.AggSpec.distinct)
-}
-void AggSpec::set_allocated_first(::io::deephaven::proto::backplane::grpc::AggSpec_AggSpecFirst* first) {
-  ::google::protobuf::Arena* message_arena = GetArena();
-  clear_type();
-  if (first) {
-    ::google::protobuf::Arena* submessage_arena = first->GetArena();
-    if (message_arena != submessage_arena) {
-      first = ::google::protobuf::internal::GetOwnedMessage(message_arena, first, submessage_arena);
-    }
-    set_has_first();
-    _impl_.type_.first_ = first;
-  }
-  // @@protoc_insertion_point(field_set_allocated:io.deephaven.proto.backplane.grpc.AggSpec.first)
-}
-void AggSpec::set_allocated_formula(::io::deephaven::proto::backplane::grpc::AggSpec_AggSpecFormula* formula) {
-  ::google::protobuf::Arena* message_arena = GetArena();
-  clear_type();
-  if (formula) {
-    ::google::protobuf::Arena* submessage_arena = formula->GetArena();
-    if (message_arena != submessage_arena) {
-      formula = ::google::protobuf::internal::GetOwnedMessage(message_arena, formula, submessage_arena);
-    }
-    set_has_formula();
-    _impl_.type_.formula_ = formula;
-  }
-  // @@protoc_insertion_point(field_set_allocated:io.deephaven.proto.backplane.grpc.AggSpec.formula)
-}
-void AggSpec::set_allocated_freeze(::io::deephaven::proto::backplane::grpc::AggSpec_AggSpecFreeze* freeze) {
-  ::google::protobuf::Arena* message_arena = GetArena();
-  clear_type();
-  if (freeze) {
-    ::google::protobuf::Arena* submessage_arena = freeze->GetArena();
-    if (message_arena != submessage_arena) {
-      freeze = ::google::protobuf::internal::GetOwnedMessage(message_arena, freeze, submessage_arena);
-    }
-    set_has_freeze();
-    _impl_.type_.freeze_ = freeze;
-  }
-  // @@protoc_insertion_point(field_set_allocated:io.deephaven.proto.backplane.grpc.AggSpec.freeze)
-}
-void AggSpec::set_allocated_group(::io::deephaven::proto::backplane::grpc::AggSpec_AggSpecGroup* group) {
-  ::google::protobuf::Arena* message_arena = GetArena();
-  clear_type();
-  if (group) {
-    ::google::protobuf::Arena* submessage_arena = group->GetArena();
-    if (message_arena != submessage_arena) {
-      group = ::google::protobuf::internal::GetOwnedMessage(message_arena, group, submessage_arena);
-    }
-    set_has_group();
-    _impl_.type_.group_ = group;
-  }
-  // @@protoc_insertion_point(field_set_allocated:io.deephaven.proto.backplane.grpc.AggSpec.group)
-}
-void AggSpec::set_allocated_last(::io::deephaven::proto::backplane::grpc::AggSpec_AggSpecLast* last) {
-  ::google::protobuf::Arena* message_arena = GetArena();
-  clear_type();
-  if (last) {
-    ::google::protobuf::Arena* submessage_arena = last->GetArena();
-    if (message_arena != submessage_arena) {
-      last = ::google::protobuf::internal::GetOwnedMessage(message_arena, last, submessage_arena);
-    }
-    set_has_last();
-    _impl_.type_.last_ = last;
-  }
-  // @@protoc_insertion_point(field_set_allocated:io.deephaven.proto.backplane.grpc.AggSpec.last)
-}
-void AggSpec::set_allocated_max(::io::deephaven::proto::backplane::grpc::AggSpec_AggSpecMax* max) {
-  ::google::protobuf::Arena* message_arena = GetArena();
-  clear_type();
-  if (max) {
-    ::google::protobuf::Arena* submessage_arena = max->GetArena();
-    if (message_arena != submessage_arena) {
-      max = ::google::protobuf::internal::GetOwnedMessage(message_arena, max, submessage_arena);
-    }
-    set_has_max();
-    _impl_.type_.max_ = max;
-  }
-  // @@protoc_insertion_point(field_set_allocated:io.deephaven.proto.backplane.grpc.AggSpec.max)
-}
-void AggSpec::set_allocated_median(::io::deephaven::proto::backplane::grpc::AggSpec_AggSpecMedian* median) {
-  ::google::protobuf::Arena* message_arena = GetArena();
-  clear_type();
-  if (median) {
-    ::google::protobuf::Arena* submessage_arena = median->GetArena();
-    if (message_arena != submessage_arena) {
-      median = ::google::protobuf::internal::GetOwnedMessage(message_arena, median, submessage_arena);
-    }
-    set_has_median();
-    _impl_.type_.median_ = median;
-  }
-  // @@protoc_insertion_point(field_set_allocated:io.deephaven.proto.backplane.grpc.AggSpec.median)
-}
-void AggSpec::set_allocated_min(::io::deephaven::proto::backplane::grpc::AggSpec_AggSpecMin* min) {
-  ::google::protobuf::Arena* message_arena = GetArena();
-  clear_type();
-  if (min) {
-    ::google::protobuf::Arena* submessage_arena = min->GetArena();
-    if (message_arena != submessage_arena) {
-      min = ::google::protobuf::internal::GetOwnedMessage(message_arena, min, submessage_arena);
-    }
-    set_has_min();
-    _impl_.type_.min_ = min;
-  }
-  // @@protoc_insertion_point(field_set_allocated:io.deephaven.proto.backplane.grpc.AggSpec.min)
-}
-void AggSpec::set_allocated_percentile(::io::deephaven::proto::backplane::grpc::AggSpec_AggSpecPercentile* percentile) {
-  ::google::protobuf::Arena* message_arena = GetArena();
-  clear_type();
-  if (percentile) {
-    ::google::protobuf::Arena* submessage_arena = percentile->GetArena();
-    if (message_arena != submessage_arena) {
-      percentile = ::google::protobuf::internal::GetOwnedMessage(message_arena, percentile, submessage_arena);
-    }
-    set_has_percentile();
-    _impl_.type_.percentile_ = percentile;
-  }
-  // @@protoc_insertion_point(field_set_allocated:io.deephaven.proto.backplane.grpc.AggSpec.percentile)
-}
-void AggSpec::set_allocated_sorted_first(::io::deephaven::proto::backplane::grpc::AggSpec_AggSpecSorted* sorted_first) {
-  ::google::protobuf::Arena* message_arena = GetArena();
-  clear_type();
-  if (sorted_first) {
-    ::google::protobuf::Arena* submessage_arena = sorted_first->GetArena();
-    if (message_arena != submessage_arena) {
-      sorted_first = ::google::protobuf::internal::GetOwnedMessage(message_arena, sorted_first, submessage_arena);
-    }
-    set_has_sorted_first();
-    _impl_.type_.sorted_first_ = sorted_first;
-  }
-  // @@protoc_insertion_point(field_set_allocated:io.deephaven.proto.backplane.grpc.AggSpec.sorted_first)
-}
-void AggSpec::set_allocated_sorted_last(::io::deephaven::proto::backplane::grpc::AggSpec_AggSpecSorted* sorted_last) {
-  ::google::protobuf::Arena* message_arena = GetArena();
-  clear_type();
-  if (sorted_last) {
-    ::google::protobuf::Arena* submessage_arena = sorted_last->GetArena();
-    if (message_arena != submessage_arena) {
-      sorted_last = ::google::protobuf::internal::GetOwnedMessage(message_arena, sorted_last, submessage_arena);
-    }
-    set_has_sorted_last();
-    _impl_.type_.sorted_last_ = sorted_last;
-  }
-  // @@protoc_insertion_point(field_set_allocated:io.deephaven.proto.backplane.grpc.AggSpec.sorted_last)
-}
-void AggSpec::set_allocated_std(::io::deephaven::proto::backplane::grpc::AggSpec_AggSpecStd* std) {
-  ::google::protobuf::Arena* message_arena = GetArena();
-  clear_type();
-  if (std) {
-    ::google::protobuf::Arena* submessage_arena = std->GetArena();
-    if (message_arena != submessage_arena) {
-      std = ::google::protobuf::internal::GetOwnedMessage(message_arena, std, submessage_arena);
-    }
-    set_has_std();
-    _impl_.type_.std_ = std;
-  }
-  // @@protoc_insertion_point(field_set_allocated:io.deephaven.proto.backplane.grpc.AggSpec.std)
-}
-void AggSpec::set_allocated_sum(::io::deephaven::proto::backplane::grpc::AggSpec_AggSpecSum* sum) {
-  ::google::protobuf::Arena* message_arena = GetArena();
-  clear_type();
-  if (sum) {
-    ::google::protobuf::Arena* submessage_arena = sum->GetArena();
-    if (message_arena != submessage_arena) {
-      sum = ::google::protobuf::internal::GetOwnedMessage(message_arena, sum, submessage_arena);
-    }
-    set_has_sum();
-    _impl_.type_.sum_ = sum;
-  }
-  // @@protoc_insertion_point(field_set_allocated:io.deephaven.proto.backplane.grpc.AggSpec.sum)
-}
-void AggSpec::set_allocated_t_digest(::io::deephaven::proto::backplane::grpc::AggSpec_AggSpecTDigest* t_digest) {
-  ::google::protobuf::Arena* message_arena = GetArena();
-  clear_type();
-  if (t_digest) {
-    ::google::protobuf::Arena* submessage_arena = t_digest->GetArena();
-    if (message_arena != submessage_arena) {
-      t_digest = ::google::protobuf::internal::GetOwnedMessage(message_arena, t_digest, submessage_arena);
-    }
-    set_has_t_digest();
-    _impl_.type_.t_digest_ = t_digest;
-  }
-  // @@protoc_insertion_point(field_set_allocated:io.deephaven.proto.backplane.grpc.AggSpec.t_digest)
-}
-void AggSpec::set_allocated_unique(::io::deephaven::proto::backplane::grpc::AggSpec_AggSpecUnique* unique) {
-  ::google::protobuf::Arena* message_arena = GetArena();
-  clear_type();
-  if (unique) {
-    ::google::protobuf::Arena* submessage_arena = unique->GetArena();
-    if (message_arena != submessage_arena) {
-      unique = ::google::protobuf::internal::GetOwnedMessage(message_arena, unique, submessage_arena);
-    }
-    set_has_unique();
-    _impl_.type_.unique_ = unique;
-  }
-  // @@protoc_insertion_point(field_set_allocated:io.deephaven.proto.backplane.grpc.AggSpec.unique)
-}
-void AggSpec::set_allocated_weighted_avg(::io::deephaven::proto::backplane::grpc::AggSpec_AggSpecWeighted* weighted_avg) {
-  ::google::protobuf::Arena* message_arena = GetArena();
-  clear_type();
-  if (weighted_avg) {
-    ::google::protobuf::Arena* submessage_arena = weighted_avg->GetArena();
-    if (message_arena != submessage_arena) {
-      weighted_avg = ::google::protobuf::internal::GetOwnedMessage(message_arena, weighted_avg, submessage_arena);
-    }
-    set_has_weighted_avg();
-    _impl_.type_.weighted_avg_ = weighted_avg;
-  }
-  // @@protoc_insertion_point(field_set_allocated:io.deephaven.proto.backplane.grpc.AggSpec.weighted_avg)
-}
-void AggSpec::set_allocated_weighted_sum(::io::deephaven::proto::backplane::grpc::AggSpec_AggSpecWeighted* weighted_sum) {
-  ::google::protobuf::Arena* message_arena = GetArena();
-  clear_type();
-  if (weighted_sum) {
-    ::google::protobuf::Arena* submessage_arena = weighted_sum->GetArena();
-    if (message_arena != submessage_arena) {
-      weighted_sum = ::google::protobuf::internal::GetOwnedMessage(message_arena, weighted_sum, submessage_arena);
-    }
-    set_has_weighted_sum();
-    _impl_.type_.weighted_sum_ = weighted_sum;
-  }
-  // @@protoc_insertion_point(field_set_allocated:io.deephaven.proto.backplane.grpc.AggSpec.weighted_sum)
-}
-void AggSpec::set_allocated_var(::io::deephaven::proto::backplane::grpc::AggSpec_AggSpecVar* var) {
-  ::google::protobuf::Arena* message_arena = GetArena();
-  clear_type();
-  if (var) {
-    ::google::protobuf::Arena* submessage_arena = var->GetArena();
-    if (message_arena != submessage_arena) {
-      var = ::google::protobuf::internal::GetOwnedMessage(message_arena, var, submessage_arena);
-    }
-    set_has_var();
-    _impl_.type_.var_ = var;
-  }
-  // @@protoc_insertion_point(field_set_allocated:io.deephaven.proto.backplane.grpc.AggSpec.var)
-}
-AggSpec::AggSpec(::google::protobuf::Arena* arena)
-    : ::google::protobuf::Message(arena) {
-  SharedCtor(arena);
-  // @@protoc_insertion_point(arena_constructor:io.deephaven.proto.backplane.grpc.AggSpec)
-}
-inline PROTOBUF_NDEBUG_INLINE AggSpec::Impl_::Impl_(
-    ::google::protobuf::internal::InternalVisibility visibility, ::google::protobuf::Arena* arena,
-    const Impl_& from)
-      : type_{},
-        _cached_size_{0},
-        _oneof_case_{from._oneof_case_[0]} {}
-
-AggSpec::AggSpec(
-    ::google::protobuf::Arena* arena,
-    const AggSpec& from)
-    : ::google::protobuf::Message(arena) {
-  AggSpec* const _this = this;
-  (void)_this;
-  _internal_metadata_.MergeFrom<::google::protobuf::UnknownFieldSet>(
-      from._internal_metadata_);
-  new (&_impl_) Impl_(internal_visibility(), arena, from._impl_);
-  switch (type_case()) {
-    case TYPE_NOT_SET:
-      break;
-      case kAbsSum:
-        _impl_.type_.abs_sum_ = CreateMaybeMessage<::io::deephaven::proto::backplane::grpc::AggSpec_AggSpecAbsSum>(arena, *from._impl_.type_.abs_sum_);
-        break;
-      case kApproximatePercentile:
-        _impl_.type_.approximate_percentile_ = CreateMaybeMessage<::io::deephaven::proto::backplane::grpc::AggSpec_AggSpecApproximatePercentile>(arena, *from._impl_.type_.approximate_percentile_);
-        break;
-      case kAvg:
-        _impl_.type_.avg_ = CreateMaybeMessage<::io::deephaven::proto::backplane::grpc::AggSpec_AggSpecAvg>(arena, *from._impl_.type_.avg_);
-        break;
-      case kCountDistinct:
-        _impl_.type_.count_distinct_ = CreateMaybeMessage<::io::deephaven::proto::backplane::grpc::AggSpec_AggSpecCountDistinct>(arena, *from._impl_.type_.count_distinct_);
-        break;
-      case kDistinct:
-        _impl_.type_.distinct_ = CreateMaybeMessage<::io::deephaven::proto::backplane::grpc::AggSpec_AggSpecDistinct>(arena, *from._impl_.type_.distinct_);
-        break;
-      case kFirst:
-        _impl_.type_.first_ = CreateMaybeMessage<::io::deephaven::proto::backplane::grpc::AggSpec_AggSpecFirst>(arena, *from._impl_.type_.first_);
-        break;
-      case kFormula:
-        _impl_.type_.formula_ = CreateMaybeMessage<::io::deephaven::proto::backplane::grpc::AggSpec_AggSpecFormula>(arena, *from._impl_.type_.formula_);
-        break;
-      case kFreeze:
-        _impl_.type_.freeze_ = CreateMaybeMessage<::io::deephaven::proto::backplane::grpc::AggSpec_AggSpecFreeze>(arena, *from._impl_.type_.freeze_);
-        break;
-      case kGroup:
-        _impl_.type_.group_ = CreateMaybeMessage<::io::deephaven::proto::backplane::grpc::AggSpec_AggSpecGroup>(arena, *from._impl_.type_.group_);
-        break;
-      case kLast:
-        _impl_.type_.last_ = CreateMaybeMessage<::io::deephaven::proto::backplane::grpc::AggSpec_AggSpecLast>(arena, *from._impl_.type_.last_);
-        break;
-      case kMax:
-        _impl_.type_.max_ = CreateMaybeMessage<::io::deephaven::proto::backplane::grpc::AggSpec_AggSpecMax>(arena, *from._impl_.type_.max_);
-        break;
-      case kMedian:
-        _impl_.type_.median_ = CreateMaybeMessage<::io::deephaven::proto::backplane::grpc::AggSpec_AggSpecMedian>(arena, *from._impl_.type_.median_);
-        break;
-      case kMin:
-        _impl_.type_.min_ = CreateMaybeMessage<::io::deephaven::proto::backplane::grpc::AggSpec_AggSpecMin>(arena, *from._impl_.type_.min_);
-        break;
-      case kPercentile:
-        _impl_.type_.percentile_ = CreateMaybeMessage<::io::deephaven::proto::backplane::grpc::AggSpec_AggSpecPercentile>(arena, *from._impl_.type_.percentile_);
-        break;
-      case kSortedFirst:
-        _impl_.type_.sorted_first_ = CreateMaybeMessage<::io::deephaven::proto::backplane::grpc::AggSpec_AggSpecSorted>(arena, *from._impl_.type_.sorted_first_);
-        break;
-      case kSortedLast:
-        _impl_.type_.sorted_last_ = CreateMaybeMessage<::io::deephaven::proto::backplane::grpc::AggSpec_AggSpecSorted>(arena, *from._impl_.type_.sorted_last_);
-        break;
-      case kStd:
-        _impl_.type_.std_ = CreateMaybeMessage<::io::deephaven::proto::backplane::grpc::AggSpec_AggSpecStd>(arena, *from._impl_.type_.std_);
-        break;
-      case kSum:
-        _impl_.type_.sum_ = CreateMaybeMessage<::io::deephaven::proto::backplane::grpc::AggSpec_AggSpecSum>(arena, *from._impl_.type_.sum_);
-        break;
-      case kTDigest:
-        _impl_.type_.t_digest_ = CreateMaybeMessage<::io::deephaven::proto::backplane::grpc::AggSpec_AggSpecTDigest>(arena, *from._impl_.type_.t_digest_);
-        break;
-      case kUnique:
-        _impl_.type_.unique_ = CreateMaybeMessage<::io::deephaven::proto::backplane::grpc::AggSpec_AggSpecUnique>(arena, *from._impl_.type_.unique_);
-        break;
-      case kWeightedAvg:
-        _impl_.type_.weighted_avg_ = CreateMaybeMessage<::io::deephaven::proto::backplane::grpc::AggSpec_AggSpecWeighted>(arena, *from._impl_.type_.weighted_avg_);
-        break;
-      case kWeightedSum:
-        _impl_.type_.weighted_sum_ = CreateMaybeMessage<::io::deephaven::proto::backplane::grpc::AggSpec_AggSpecWeighted>(arena, *from._impl_.type_.weighted_sum_);
-        break;
-      case kVar:
-        _impl_.type_.var_ = CreateMaybeMessage<::io::deephaven::proto::backplane::grpc::AggSpec_AggSpecVar>(arena, *from._impl_.type_.var_);
-        break;
-  }
-
-  // @@protoc_insertion_point(copy_constructor:io.deephaven.proto.backplane.grpc.AggSpec)
-}
-inline PROTOBUF_NDEBUG_INLINE AggSpec::Impl_::Impl_(
-    ::google::protobuf::internal::InternalVisibility visibility,
-    ::google::protobuf::Arena* arena)
-      : type_{},
-        _cached_size_{0},
-        _oneof_case_{} {}
-
-inline void AggSpec::SharedCtor(::_pb::Arena* arena) {
-  new (&_impl_) Impl_(internal_visibility(), arena);
-}
-AggSpec::~AggSpec() {
-  // @@protoc_insertion_point(destructor:io.deephaven.proto.backplane.grpc.AggSpec)
-  _internal_metadata_.Delete<::google::protobuf::UnknownFieldSet>();
-  SharedDtor();
-}
-inline void AggSpec::SharedDtor() {
-  ABSL_DCHECK(GetArena() == nullptr);
-  if (has_type()) {
-    clear_type();
-  }
-  _impl_.~Impl_();
-}
-
-void AggSpec::clear_type() {
-// @@protoc_insertion_point(one_of_clear_start:io.deephaven.proto.backplane.grpc.AggSpec)
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  switch (type_case()) {
-    case kAbsSum: {
-      if (GetArena() == nullptr) {
-        delete _impl_.type_.abs_sum_;
-      }
-      break;
-    }
-    case kApproximatePercentile: {
-      if (GetArena() == nullptr) {
-        delete _impl_.type_.approximate_percentile_;
-      }
-      break;
-    }
-    case kAvg: {
-      if (GetArena() == nullptr) {
-        delete _impl_.type_.avg_;
-      }
-      break;
-    }
-    case kCountDistinct: {
-      if (GetArena() == nullptr) {
-        delete _impl_.type_.count_distinct_;
-      }
-      break;
-    }
-    case kDistinct: {
-      if (GetArena() == nullptr) {
-        delete _impl_.type_.distinct_;
-      }
-      break;
-    }
-    case kFirst: {
-      if (GetArena() == nullptr) {
-        delete _impl_.type_.first_;
-      }
-      break;
-    }
-    case kFormula: {
-      if (GetArena() == nullptr) {
-        delete _impl_.type_.formula_;
-      }
-      break;
-    }
-    case kFreeze: {
-      if (GetArena() == nullptr) {
-        delete _impl_.type_.freeze_;
-      }
-      break;
-    }
-    case kGroup: {
-      if (GetArena() == nullptr) {
-        delete _impl_.type_.group_;
-      }
-      break;
-    }
-    case kLast: {
-      if (GetArena() == nullptr) {
-        delete _impl_.type_.last_;
-      }
-      break;
-    }
-    case kMax: {
-      if (GetArena() == nullptr) {
-        delete _impl_.type_.max_;
-      }
-      break;
-    }
-    case kMedian: {
-      if (GetArena() == nullptr) {
-        delete _impl_.type_.median_;
-      }
-      break;
-    }
-    case kMin: {
-      if (GetArena() == nullptr) {
-        delete _impl_.type_.min_;
-      }
-      break;
-    }
-    case kPercentile: {
-      if (GetArena() == nullptr) {
-        delete _impl_.type_.percentile_;
-      }
-      break;
-    }
-    case kSortedFirst: {
-      if (GetArena() == nullptr) {
-        delete _impl_.type_.sorted_first_;
-      }
-      break;
-    }
-    case kSortedLast: {
-      if (GetArena() == nullptr) {
-        delete _impl_.type_.sorted_last_;
-      }
-      break;
-    }
-    case kStd: {
-      if (GetArena() == nullptr) {
-        delete _impl_.type_.std_;
-      }
-      break;
-    }
-    case kSum: {
-      if (GetArena() == nullptr) {
-        delete _impl_.type_.sum_;
-      }
-      break;
-    }
-    case kTDigest: {
-      if (GetArena() == nullptr) {
-        delete _impl_.type_.t_digest_;
-      }
-      break;
-    }
-    case kUnique: {
-      if (GetArena() == nullptr) {
-        delete _impl_.type_.unique_;
-      }
-      break;
-    }
-    case kWeightedAvg: {
-      if (GetArena() == nullptr) {
-        delete _impl_.type_.weighted_avg_;
-      }
-      break;
-    }
-    case kWeightedSum: {
-      if (GetArena() == nullptr) {
-        delete _impl_.type_.weighted_sum_;
-      }
-      break;
-    }
-    case kVar: {
-      if (GetArena() == nullptr) {
-        delete _impl_.type_.var_;
-      }
-      break;
-    }
-    case TYPE_NOT_SET: {
-      break;
-    }
-  }
-  _impl_._oneof_case_[0] = TYPE_NOT_SET;
-}
-
-
-PROTOBUF_NOINLINE void AggSpec::Clear() {
-// @@protoc_insertion_point(message_clear_start:io.deephaven.proto.backplane.grpc.AggSpec)
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  ::uint32_t cached_has_bits = 0;
-  // Prevent compiler warnings about cached_has_bits being unused
-  (void) cached_has_bits;
-
-  clear_type();
-  _internal_metadata_.Clear<::google::protobuf::UnknownFieldSet>();
-}
-
-const char* AggSpec::_InternalParse(
-    const char* ptr, ::_pbi::ParseContext* ctx) {
-  ptr = ::_pbi::TcParser::ParseLoop(this, ptr, ctx, &_table_.header);
-  return ptr;
-}
-
-
-PROTOBUF_CONSTINIT PROTOBUF_ATTRIBUTE_INIT_PRIORITY1
-const ::_pbi::TcParseTable<0, 23, 23, 0, 2> AggSpec::_table_ = {
-  {
-    0,  // no _has_bits_
-    0, // no _extensions_
-    23, 0,  // max_field_number, fast_idx_mask
-    offsetof(decltype(_table_), field_lookup_table),
-    4286578688,  // skipmap
-    offsetof(decltype(_table_), field_entries),
-    23,  // num_field_entries
-    23,  // num_aux_entries
-    offsetof(decltype(_table_), aux_entries),
-    &_AggSpec_default_instance_._instance,
-    ::_pbi::TcParser::GenericFallback,  // fallback
-  }, {{
-    {::_pbi::TcParser::MiniParse, {}},
-  }}, {{
-    65535, 65535
-  }}, {{
-    // .io.deephaven.proto.backplane.grpc.AggSpec.AggSpecAbsSum abs_sum = 1;
-    {PROTOBUF_FIELD_OFFSET(AggSpec, _impl_.type_.abs_sum_), _Internal::kOneofCaseOffset + 0, 0,
-    (0 | ::_fl::kFcOneof | ::_fl::kMessage | ::_fl::kTvDefault)},
-    // .io.deephaven.proto.backplane.grpc.AggSpec.AggSpecApproximatePercentile approximate_percentile = 2;
-    {PROTOBUF_FIELD_OFFSET(AggSpec, _impl_.type_.approximate_percentile_), _Internal::kOneofCaseOffset + 0, 1,
-    (0 | ::_fl::kFcOneof | ::_fl::kMessage | ::_fl::kTvTable)},
-    // .io.deephaven.proto.backplane.grpc.AggSpec.AggSpecAvg avg = 3;
-    {PROTOBUF_FIELD_OFFSET(AggSpec, _impl_.type_.avg_), _Internal::kOneofCaseOffset + 0, 2,
-    (0 | ::_fl::kFcOneof | ::_fl::kMessage | ::_fl::kTvDefault)},
-    // .io.deephaven.proto.backplane.grpc.AggSpec.AggSpecCountDistinct count_distinct = 4;
-    {PROTOBUF_FIELD_OFFSET(AggSpec, _impl_.type_.count_distinct_), _Internal::kOneofCaseOffset + 0, 3,
-    (0 | ::_fl::kFcOneof | ::_fl::kMessage | ::_fl::kTvTable)},
-    // .io.deephaven.proto.backplane.grpc.AggSpec.AggSpecDistinct distinct = 5;
-    {PROTOBUF_FIELD_OFFSET(AggSpec, _impl_.type_.distinct_), _Internal::kOneofCaseOffset + 0, 4,
-    (0 | ::_fl::kFcOneof | ::_fl::kMessage | ::_fl::kTvTable)},
-    // .io.deephaven.proto.backplane.grpc.AggSpec.AggSpecFirst first = 6;
-    {PROTOBUF_FIELD_OFFSET(AggSpec, _impl_.type_.first_), _Internal::kOneofCaseOffset + 0, 5,
-    (0 | ::_fl::kFcOneof | ::_fl::kMessage | ::_fl::kTvDefault)},
-    // .io.deephaven.proto.backplane.grpc.AggSpec.AggSpecFormula formula = 7;
-    {PROTOBUF_FIELD_OFFSET(AggSpec, _impl_.type_.formula_), _Internal::kOneofCaseOffset + 0, 6,
-    (0 | ::_fl::kFcOneof | ::_fl::kMessage | ::_fl::kTvTable)},
-    // .io.deephaven.proto.backplane.grpc.AggSpec.AggSpecFreeze freeze = 8;
-    {PROTOBUF_FIELD_OFFSET(AggSpec, _impl_.type_.freeze_), _Internal::kOneofCaseOffset + 0, 7,
-    (0 | ::_fl::kFcOneof | ::_fl::kMessage | ::_fl::kTvDefault)},
-    // .io.deephaven.proto.backplane.grpc.AggSpec.AggSpecGroup group = 9;
-    {PROTOBUF_FIELD_OFFSET(AggSpec, _impl_.type_.group_), _Internal::kOneofCaseOffset + 0, 8,
-    (0 | ::_fl::kFcOneof | ::_fl::kMessage | ::_fl::kTvDefault)},
-    // .io.deephaven.proto.backplane.grpc.AggSpec.AggSpecLast last = 10;
-    {PROTOBUF_FIELD_OFFSET(AggSpec, _impl_.type_.last_), _Internal::kOneofCaseOffset + 0, 9,
-    (0 | ::_fl::kFcOneof | ::_fl::kMessage | ::_fl::kTvDefault)},
-    // .io.deephaven.proto.backplane.grpc.AggSpec.AggSpecMax max = 11;
-    {PROTOBUF_FIELD_OFFSET(AggSpec, _impl_.type_.max_), _Internal::kOneofCaseOffset + 0, 10,
-    (0 | ::_fl::kFcOneof | ::_fl::kMessage | ::_fl::kTvDefault)},
-    // .io.deephaven.proto.backplane.grpc.AggSpec.AggSpecMedian median = 12;
-    {PROTOBUF_FIELD_OFFSET(AggSpec, _impl_.type_.median_), _Internal::kOneofCaseOffset + 0, 11,
-    (0 | ::_fl::kFcOneof | ::_fl::kMessage | ::_fl::kTvTable)},
-    // .io.deephaven.proto.backplane.grpc.AggSpec.AggSpecMin min = 13;
-    {PROTOBUF_FIELD_OFFSET(AggSpec, _impl_.type_.min_), _Internal::kOneofCaseOffset + 0, 12,
-    (0 | ::_fl::kFcOneof | ::_fl::kMessage | ::_fl::kTvDefault)},
-    // .io.deephaven.proto.backplane.grpc.AggSpec.AggSpecPercentile percentile = 14;
-    {PROTOBUF_FIELD_OFFSET(AggSpec, _impl_.type_.percentile_), _Internal::kOneofCaseOffset + 0, 13,
-    (0 | ::_fl::kFcOneof | ::_fl::kMessage | ::_fl::kTvTable)},
-    // .io.deephaven.proto.backplane.grpc.AggSpec.AggSpecSorted sorted_first = 15;
-    {PROTOBUF_FIELD_OFFSET(AggSpec, _impl_.type_.sorted_first_), _Internal::kOneofCaseOffset + 0, 14,
-    (0 | ::_fl::kFcOneof | ::_fl::kMessage | ::_fl::kTvTable)},
-    // .io.deephaven.proto.backplane.grpc.AggSpec.AggSpecSorted sorted_last = 16;
-    {PROTOBUF_FIELD_OFFSET(AggSpec, _impl_.type_.sorted_last_), _Internal::kOneofCaseOffset + 0, 15,
-    (0 | ::_fl::kFcOneof | ::_fl::kMessage | ::_fl::kTvTable)},
-    // .io.deephaven.proto.backplane.grpc.AggSpec.AggSpecStd std = 17;
-    {PROTOBUF_FIELD_OFFSET(AggSpec, _impl_.type_.std_), _Internal::kOneofCaseOffset + 0, 16,
-    (0 | ::_fl::kFcOneof | ::_fl::kMessage | ::_fl::kTvDefault)},
-    // .io.deephaven.proto.backplane.grpc.AggSpec.AggSpecSum sum = 18;
-    {PROTOBUF_FIELD_OFFSET(AggSpec, _impl_.type_.sum_), _Internal::kOneofCaseOffset + 0, 17,
-    (0 | ::_fl::kFcOneof | ::_fl::kMessage | ::_fl::kTvDefault)},
-    // .io.deephaven.proto.backplane.grpc.AggSpec.AggSpecTDigest t_digest = 19;
-    {PROTOBUF_FIELD_OFFSET(AggSpec, _impl_.type_.t_digest_), _Internal::kOneofCaseOffset + 0, 18,
-    (0 | ::_fl::kFcOneof | ::_fl::kMessage | ::_fl::kTvTable)},
-    // .io.deephaven.proto.backplane.grpc.AggSpec.AggSpecUnique unique = 20;
-    {PROTOBUF_FIELD_OFFSET(AggSpec, _impl_.type_.unique_), _Internal::kOneofCaseOffset + 0, 19,
-    (0 | ::_fl::kFcOneof | ::_fl::kMessage | ::_fl::kTvTable)},
-    // .io.deephaven.proto.backplane.grpc.AggSpec.AggSpecWeighted weighted_avg = 21;
-    {PROTOBUF_FIELD_OFFSET(AggSpec, _impl_.type_.weighted_avg_), _Internal::kOneofCaseOffset + 0, 20,
-    (0 | ::_fl::kFcOneof | ::_fl::kMessage | ::_fl::kTvTable)},
-    // .io.deephaven.proto.backplane.grpc.AggSpec.AggSpecWeighted weighted_sum = 22;
-    {PROTOBUF_FIELD_OFFSET(AggSpec, _impl_.type_.weighted_sum_), _Internal::kOneofCaseOffset + 0, 21,
-    (0 | ::_fl::kFcOneof | ::_fl::kMessage | ::_fl::kTvTable)},
-    // .io.deephaven.proto.backplane.grpc.AggSpec.AggSpecVar var = 23;
-    {PROTOBUF_FIELD_OFFSET(AggSpec, _impl_.type_.var_), _Internal::kOneofCaseOffset + 0, 22,
-    (0 | ::_fl::kFcOneof | ::_fl::kMessage | ::_fl::kTvDefault)},
-  }}, {{
-    {::_pbi::FieldAuxDefaultMessage{}, &::io::deephaven::proto::backplane::grpc::_AggSpec_AggSpecAbsSum_default_instance_},
-    {::_pbi::TcParser::GetTable<::io::deephaven::proto::backplane::grpc::AggSpec_AggSpecApproximatePercentile>()},
-    {::_pbi::FieldAuxDefaultMessage{}, &::io::deephaven::proto::backplane::grpc::_AggSpec_AggSpecAvg_default_instance_},
-    {::_pbi::TcParser::GetTable<::io::deephaven::proto::backplane::grpc::AggSpec_AggSpecCountDistinct>()},
-    {::_pbi::TcParser::GetTable<::io::deephaven::proto::backplane::grpc::AggSpec_AggSpecDistinct>()},
-    {::_pbi::FieldAuxDefaultMessage{}, &::io::deephaven::proto::backplane::grpc::_AggSpec_AggSpecFirst_default_instance_},
-    {::_pbi::TcParser::GetTable<::io::deephaven::proto::backplane::grpc::AggSpec_AggSpecFormula>()},
-    {::_pbi::FieldAuxDefaultMessage{}, &::io::deephaven::proto::backplane::grpc::_AggSpec_AggSpecFreeze_default_instance_},
-    {::_pbi::FieldAuxDefaultMessage{}, &::io::deephaven::proto::backplane::grpc::_AggSpec_AggSpecGroup_default_instance_},
-    {::_pbi::FieldAuxDefaultMessage{}, &::io::deephaven::proto::backplane::grpc::_AggSpec_AggSpecLast_default_instance_},
-    {::_pbi::FieldAuxDefaultMessage{}, &::io::deephaven::proto::backplane::grpc::_AggSpec_AggSpecMax_default_instance_},
-    {::_pbi::TcParser::GetTable<::io::deephaven::proto::backplane::grpc::AggSpec_AggSpecMedian>()},
-    {::_pbi::FieldAuxDefaultMessage{}, &::io::deephaven::proto::backplane::grpc::_AggSpec_AggSpecMin_default_instance_},
-    {::_pbi::TcParser::GetTable<::io::deephaven::proto::backplane::grpc::AggSpec_AggSpecPercentile>()},
-    {::_pbi::TcParser::GetTable<::io::deephaven::proto::backplane::grpc::AggSpec_AggSpecSorted>()},
-    {::_pbi::TcParser::GetTable<::io::deephaven::proto::backplane::grpc::AggSpec_AggSpecSorted>()},
-    {::_pbi::FieldAuxDefaultMessage{}, &::io::deephaven::proto::backplane::grpc::_AggSpec_AggSpecStd_default_instance_},
-    {::_pbi::FieldAuxDefaultMessage{}, &::io::deephaven::proto::backplane::grpc::_AggSpec_AggSpecSum_default_instance_},
-    {::_pbi::TcParser::GetTable<::io::deephaven::proto::backplane::grpc::AggSpec_AggSpecTDigest>()},
-    {::_pbi::TcParser::GetTable<::io::deephaven::proto::backplane::grpc::AggSpec_AggSpecUnique>()},
-    {::_pbi::TcParser::GetTable<::io::deephaven::proto::backplane::grpc::AggSpec_AggSpecWeighted>()},
-    {::_pbi::TcParser::GetTable<::io::deephaven::proto::backplane::grpc::AggSpec_AggSpecWeighted>()},
-    {::_pbi::FieldAuxDefaultMessage{}, &::io::deephaven::proto::backplane::grpc::_AggSpec_AggSpecVar_default_instance_},
-  }}, {{
-  }},
-};
-
-::uint8_t* AggSpec::_InternalSerialize(
-    ::uint8_t* target,
-    ::google::protobuf::io::EpsCopyOutputStream* stream) const {
-  // @@protoc_insertion_point(serialize_to_array_start:io.deephaven.proto.backplane.grpc.AggSpec)
-  ::uint32_t cached_has_bits = 0;
-  (void)cached_has_bits;
-
-  switch (type_case()) {
-    case kAbsSum: {
-      target = ::google::protobuf::internal::WireFormatLite::InternalWriteMessage(
-          1, _Internal::abs_sum(this),
-          _Internal::abs_sum(this).GetCachedSize(), target, stream);
-      break;
-    }
-    case kApproximatePercentile: {
-      target = ::google::protobuf::internal::WireFormatLite::InternalWriteMessage(
-          2, _Internal::approximate_percentile(this),
-          _Internal::approximate_percentile(this).GetCachedSize(), target, stream);
-      break;
-    }
-    case kAvg: {
-      target = ::google::protobuf::internal::WireFormatLite::InternalWriteMessage(
-          3, _Internal::avg(this),
-          _Internal::avg(this).GetCachedSize(), target, stream);
-      break;
-    }
-    case kCountDistinct: {
-      target = ::google::protobuf::internal::WireFormatLite::InternalWriteMessage(
-          4, _Internal::count_distinct(this),
-          _Internal::count_distinct(this).GetCachedSize(), target, stream);
-      break;
-    }
-    case kDistinct: {
-      target = ::google::protobuf::internal::WireFormatLite::InternalWriteMessage(
-          5, _Internal::distinct(this),
-          _Internal::distinct(this).GetCachedSize(), target, stream);
-      break;
-    }
-    case kFirst: {
-      target = ::google::protobuf::internal::WireFormatLite::InternalWriteMessage(
-          6, _Internal::first(this),
-          _Internal::first(this).GetCachedSize(), target, stream);
-      break;
-    }
-    case kFormula: {
-      target = ::google::protobuf::internal::WireFormatLite::InternalWriteMessage(
-          7, _Internal::formula(this),
-          _Internal::formula(this).GetCachedSize(), target, stream);
-      break;
-    }
-    case kFreeze: {
-      target = ::google::protobuf::internal::WireFormatLite::InternalWriteMessage(
-          8, _Internal::freeze(this),
-          _Internal::freeze(this).GetCachedSize(), target, stream);
-      break;
-    }
-    case kGroup: {
-      target = ::google::protobuf::internal::WireFormatLite::InternalWriteMessage(
-          9, _Internal::group(this),
-          _Internal::group(this).GetCachedSize(), target, stream);
-      break;
-    }
-    case kLast: {
-      target = ::google::protobuf::internal::WireFormatLite::InternalWriteMessage(
-          10, _Internal::last(this),
-          _Internal::last(this).GetCachedSize(), target, stream);
-      break;
-    }
-    case kMax: {
-      target = ::google::protobuf::internal::WireFormatLite::InternalWriteMessage(
-          11, _Internal::max(this),
-          _Internal::max(this).GetCachedSize(), target, stream);
-      break;
-    }
-    case kMedian: {
-      target = ::google::protobuf::internal::WireFormatLite::InternalWriteMessage(
-          12, _Internal::median(this),
-          _Internal::median(this).GetCachedSize(), target, stream);
-      break;
-    }
-    case kMin: {
-      target = ::google::protobuf::internal::WireFormatLite::InternalWriteMessage(
-          13, _Internal::min(this),
-          _Internal::min(this).GetCachedSize(), target, stream);
-      break;
-    }
-    case kPercentile: {
-      target = ::google::protobuf::internal::WireFormatLite::InternalWriteMessage(
-          14, _Internal::percentile(this),
-          _Internal::percentile(this).GetCachedSize(), target, stream);
-      break;
-    }
-    case kSortedFirst: {
-      target = ::google::protobuf::internal::WireFormatLite::InternalWriteMessage(
-          15, _Internal::sorted_first(this),
-          _Internal::sorted_first(this).GetCachedSize(), target, stream);
-      break;
-    }
-    case kSortedLast: {
-      target = ::google::protobuf::internal::WireFormatLite::InternalWriteMessage(
-          16, _Internal::sorted_last(this),
-          _Internal::sorted_last(this).GetCachedSize(), target, stream);
-      break;
-    }
-    case kStd: {
-      target = ::google::protobuf::internal::WireFormatLite::InternalWriteMessage(
-          17, _Internal::std(this),
-          _Internal::std(this).GetCachedSize(), target, stream);
-      break;
-    }
-    case kSum: {
-      target = ::google::protobuf::internal::WireFormatLite::InternalWriteMessage(
-          18, _Internal::sum(this),
-          _Internal::sum(this).GetCachedSize(), target, stream);
-      break;
-    }
-    case kTDigest: {
-      target = ::google::protobuf::internal::WireFormatLite::InternalWriteMessage(
-          19, _Internal::t_digest(this),
-          _Internal::t_digest(this).GetCachedSize(), target, stream);
-      break;
-    }
-    case kUnique: {
-      target = ::google::protobuf::internal::WireFormatLite::InternalWriteMessage(
-          20, _Internal::unique(this),
-          _Internal::unique(this).GetCachedSize(), target, stream);
-      break;
-    }
-    case kWeightedAvg: {
-      target = ::google::protobuf::internal::WireFormatLite::InternalWriteMessage(
-          21, _Internal::weighted_avg(this),
-          _Internal::weighted_avg(this).GetCachedSize(), target, stream);
-      break;
-    }
-    case kWeightedSum: {
-      target = ::google::protobuf::internal::WireFormatLite::InternalWriteMessage(
-          22, _Internal::weighted_sum(this),
-          _Internal::weighted_sum(this).GetCachedSize(), target, stream);
-      break;
-    }
-    case kVar: {
-      target = ::google::protobuf::internal::WireFormatLite::InternalWriteMessage(
-          23, _Internal::var(this),
-          _Internal::var(this).GetCachedSize(), target, stream);
-      break;
-    }
-    default:
-      break;
-  }
-  if (PROTOBUF_PREDICT_FALSE(_internal_metadata_.have_unknown_fields())) {
-    target =
-        ::_pbi::WireFormat::InternalSerializeUnknownFieldsToArray(
-            _internal_metadata_.unknown_fields<::google::protobuf::UnknownFieldSet>(::google::protobuf::UnknownFieldSet::default_instance), target, stream);
-  }
-  // @@protoc_insertion_point(serialize_to_array_end:io.deephaven.proto.backplane.grpc.AggSpec)
-  return target;
-}
-
-::size_t AggSpec::ByteSizeLong() const {
-// @@protoc_insertion_point(message_byte_size_start:io.deephaven.proto.backplane.grpc.AggSpec)
-  ::size_t total_size = 0;
-
-  ::uint32_t cached_has_bits = 0;
-  // Prevent compiler warnings about cached_has_bits being unused
-  (void) cached_has_bits;
-
-  switch (type_case()) {
-    // .io.deephaven.proto.backplane.grpc.AggSpec.AggSpecAbsSum abs_sum = 1;
-    case kAbsSum: {
-      total_size +=
-          1 + ::google::protobuf::internal::WireFormatLite::MessageSize(*_impl_.type_.abs_sum_);
-      break;
-    }
-    // .io.deephaven.proto.backplane.grpc.AggSpec.AggSpecApproximatePercentile approximate_percentile = 2;
-    case kApproximatePercentile: {
-      total_size +=
-          1 + ::google::protobuf::internal::WireFormatLite::MessageSize(*_impl_.type_.approximate_percentile_);
-      break;
-    }
-    // .io.deephaven.proto.backplane.grpc.AggSpec.AggSpecAvg avg = 3;
-    case kAvg: {
-      total_size +=
-          1 + ::google::protobuf::internal::WireFormatLite::MessageSize(*_impl_.type_.avg_);
-      break;
-    }
-    // .io.deephaven.proto.backplane.grpc.AggSpec.AggSpecCountDistinct count_distinct = 4;
-    case kCountDistinct: {
-      total_size +=
-          1 + ::google::protobuf::internal::WireFormatLite::MessageSize(*_impl_.type_.count_distinct_);
-      break;
-    }
-    // .io.deephaven.proto.backplane.grpc.AggSpec.AggSpecDistinct distinct = 5;
-    case kDistinct: {
-      total_size +=
-          1 + ::google::protobuf::internal::WireFormatLite::MessageSize(*_impl_.type_.distinct_);
-      break;
-    }
-    // .io.deephaven.proto.backplane.grpc.AggSpec.AggSpecFirst first = 6;
-    case kFirst: {
-      total_size +=
-          1 + ::google::protobuf::internal::WireFormatLite::MessageSize(*_impl_.type_.first_);
-      break;
-    }
-    // .io.deephaven.proto.backplane.grpc.AggSpec.AggSpecFormula formula = 7;
-    case kFormula: {
-      total_size +=
-          1 + ::google::protobuf::internal::WireFormatLite::MessageSize(*_impl_.type_.formula_);
-      break;
-    }
-    // .io.deephaven.proto.backplane.grpc.AggSpec.AggSpecFreeze freeze = 8;
-    case kFreeze: {
-      total_size +=
-          1 + ::google::protobuf::internal::WireFormatLite::MessageSize(*_impl_.type_.freeze_);
-      break;
-    }
-    // .io.deephaven.proto.backplane.grpc.AggSpec.AggSpecGroup group = 9;
-    case kGroup: {
-      total_size +=
-          1 + ::google::protobuf::internal::WireFormatLite::MessageSize(*_impl_.type_.group_);
-      break;
-    }
-    // .io.deephaven.proto.backplane.grpc.AggSpec.AggSpecLast last = 10;
-    case kLast: {
-      total_size +=
-          1 + ::google::protobuf::internal::WireFormatLite::MessageSize(*_impl_.type_.last_);
-      break;
-    }
-    // .io.deephaven.proto.backplane.grpc.AggSpec.AggSpecMax max = 11;
-    case kMax: {
-      total_size +=
-          1 + ::google::protobuf::internal::WireFormatLite::MessageSize(*_impl_.type_.max_);
-      break;
-    }
-    // .io.deephaven.proto.backplane.grpc.AggSpec.AggSpecMedian median = 12;
-    case kMedian: {
-      total_size +=
-          1 + ::google::protobuf::internal::WireFormatLite::MessageSize(*_impl_.type_.median_);
-      break;
-    }
-    // .io.deephaven.proto.backplane.grpc.AggSpec.AggSpecMin min = 13;
-    case kMin: {
-      total_size +=
-          1 + ::google::protobuf::internal::WireFormatLite::MessageSize(*_impl_.type_.min_);
-      break;
-    }
-    // .io.deephaven.proto.backplane.grpc.AggSpec.AggSpecPercentile percentile = 14;
-    case kPercentile: {
-      total_size +=
-          1 + ::google::protobuf::internal::WireFormatLite::MessageSize(*_impl_.type_.percentile_);
-      break;
-    }
-    // .io.deephaven.proto.backplane.grpc.AggSpec.AggSpecSorted sorted_first = 15;
-    case kSortedFirst: {
-      total_size +=
-          1 + ::google::protobuf::internal::WireFormatLite::MessageSize(*_impl_.type_.sorted_first_);
-      break;
-    }
-    // .io.deephaven.proto.backplane.grpc.AggSpec.AggSpecSorted sorted_last = 16;
-    case kSortedLast: {
-      total_size +=
-          2 + ::google::protobuf::internal::WireFormatLite::MessageSize(*_impl_.type_.sorted_last_);
-      break;
-    }
-    // .io.deephaven.proto.backplane.grpc.AggSpec.AggSpecStd std = 17;
-    case kStd: {
-      total_size +=
-          2 + ::google::protobuf::internal::WireFormatLite::MessageSize(*_impl_.type_.std_);
-      break;
-    }
-    // .io.deephaven.proto.backplane.grpc.AggSpec.AggSpecSum sum = 18;
-    case kSum: {
-      total_size +=
-          2 + ::google::protobuf::internal::WireFormatLite::MessageSize(*_impl_.type_.sum_);
-      break;
-    }
-    // .io.deephaven.proto.backplane.grpc.AggSpec.AggSpecTDigest t_digest = 19;
-    case kTDigest: {
-      total_size +=
-          2 + ::google::protobuf::internal::WireFormatLite::MessageSize(*_impl_.type_.t_digest_);
-      break;
-    }
-    // .io.deephaven.proto.backplane.grpc.AggSpec.AggSpecUnique unique = 20;
-    case kUnique: {
-      total_size +=
-          2 + ::google::protobuf::internal::WireFormatLite::MessageSize(*_impl_.type_.unique_);
-      break;
-    }
-    // .io.deephaven.proto.backplane.grpc.AggSpec.AggSpecWeighted weighted_avg = 21;
-    case kWeightedAvg: {
-      total_size +=
-          2 + ::google::protobuf::internal::WireFormatLite::MessageSize(*_impl_.type_.weighted_avg_);
-      break;
-    }
-    // .io.deephaven.proto.backplane.grpc.AggSpec.AggSpecWeighted weighted_sum = 22;
-    case kWeightedSum: {
-      total_size +=
-          2 + ::google::protobuf::internal::WireFormatLite::MessageSize(*_impl_.type_.weighted_sum_);
-      break;
-    }
-    // .io.deephaven.proto.backplane.grpc.AggSpec.AggSpecVar var = 23;
-    case kVar: {
-      total_size +=
-          2 + ::google::protobuf::internal::WireFormatLite::MessageSize(*_impl_.type_.var_);
-      break;
-    }
-    case TYPE_NOT_SET: {
-      break;
-    }
-  }
-  return MaybeComputeUnknownFieldsSize(total_size, &_impl_._cached_size_);
-}
-
-const ::google::protobuf::Message::ClassData AggSpec::_class_data_ = {
-    AggSpec::MergeImpl,
-    nullptr,  // OnDemandRegisterArenaDtor
-};
-const ::google::protobuf::Message::ClassData* AggSpec::GetClassData() const {
-  return &_class_data_;
-}
-
-void AggSpec::MergeImpl(::google::protobuf::Message& to_msg, const ::google::protobuf::Message& from_msg) {
-  auto* const _this = static_cast<AggSpec*>(&to_msg);
-  auto& from = static_cast<const AggSpec&>(from_msg);
-  // @@protoc_insertion_point(class_specific_merge_from_start:io.deephaven.proto.backplane.grpc.AggSpec)
-  ABSL_DCHECK_NE(&from, _this);
-  ::uint32_t cached_has_bits = 0;
-  (void) cached_has_bits;
-
-  switch (from.type_case()) {
-    case kAbsSum: {
-      _this->_internal_mutable_abs_sum()->::io::deephaven::proto::backplane::grpc::AggSpec_AggSpecAbsSum::MergeFrom(
-          from._internal_abs_sum());
-      break;
-    }
-    case kApproximatePercentile: {
-      _this->_internal_mutable_approximate_percentile()->::io::deephaven::proto::backplane::grpc::AggSpec_AggSpecApproximatePercentile::MergeFrom(
-          from._internal_approximate_percentile());
-      break;
-    }
-    case kAvg: {
-      _this->_internal_mutable_avg()->::io::deephaven::proto::backplane::grpc::AggSpec_AggSpecAvg::MergeFrom(
-          from._internal_avg());
-      break;
-    }
-    case kCountDistinct: {
-      _this->_internal_mutable_count_distinct()->::io::deephaven::proto::backplane::grpc::AggSpec_AggSpecCountDistinct::MergeFrom(
-          from._internal_count_distinct());
-      break;
-    }
-    case kDistinct: {
-      _this->_internal_mutable_distinct()->::io::deephaven::proto::backplane::grpc::AggSpec_AggSpecDistinct::MergeFrom(
-          from._internal_distinct());
-      break;
-    }
-    case kFirst: {
-      _this->_internal_mutable_first()->::io::deephaven::proto::backplane::grpc::AggSpec_AggSpecFirst::MergeFrom(
-          from._internal_first());
-      break;
-    }
-    case kFormula: {
-      _this->_internal_mutable_formula()->::io::deephaven::proto::backplane::grpc::AggSpec_AggSpecFormula::MergeFrom(
-          from._internal_formula());
-      break;
-    }
-    case kFreeze: {
-      _this->_internal_mutable_freeze()->::io::deephaven::proto::backplane::grpc::AggSpec_AggSpecFreeze::MergeFrom(
-          from._internal_freeze());
-      break;
-    }
-    case kGroup: {
-      _this->_internal_mutable_group()->::io::deephaven::proto::backplane::grpc::AggSpec_AggSpecGroup::MergeFrom(
-          from._internal_group());
-      break;
-    }
-    case kLast: {
-      _this->_internal_mutable_last()->::io::deephaven::proto::backplane::grpc::AggSpec_AggSpecLast::MergeFrom(
-          from._internal_last());
-      break;
-    }
-    case kMax: {
-      _this->_internal_mutable_max()->::io::deephaven::proto::backplane::grpc::AggSpec_AggSpecMax::MergeFrom(
-          from._internal_max());
-      break;
-    }
-    case kMedian: {
-      _this->_internal_mutable_median()->::io::deephaven::proto::backplane::grpc::AggSpec_AggSpecMedian::MergeFrom(
-          from._internal_median());
-      break;
-    }
-    case kMin: {
-      _this->_internal_mutable_min()->::io::deephaven::proto::backplane::grpc::AggSpec_AggSpecMin::MergeFrom(
-          from._internal_min());
-      break;
-    }
-    case kPercentile: {
-      _this->_internal_mutable_percentile()->::io::deephaven::proto::backplane::grpc::AggSpec_AggSpecPercentile::MergeFrom(
-          from._internal_percentile());
-      break;
-    }
-    case kSortedFirst: {
-      _this->_internal_mutable_sorted_first()->::io::deephaven::proto::backplane::grpc::AggSpec_AggSpecSorted::MergeFrom(
-          from._internal_sorted_first());
-      break;
-    }
-    case kSortedLast: {
-      _this->_internal_mutable_sorted_last()->::io::deephaven::proto::backplane::grpc::AggSpec_AggSpecSorted::MergeFrom(
-          from._internal_sorted_last());
-      break;
-    }
-    case kStd: {
-      _this->_internal_mutable_std()->::io::deephaven::proto::backplane::grpc::AggSpec_AggSpecStd::MergeFrom(
-          from._internal_std());
-      break;
-    }
-    case kSum: {
-      _this->_internal_mutable_sum()->::io::deephaven::proto::backplane::grpc::AggSpec_AggSpecSum::MergeFrom(
-          from._internal_sum());
-      break;
-    }
-    case kTDigest: {
-      _this->_internal_mutable_t_digest()->::io::deephaven::proto::backplane::grpc::AggSpec_AggSpecTDigest::MergeFrom(
-          from._internal_t_digest());
-      break;
-    }
-    case kUnique: {
-      _this->_internal_mutable_unique()->::io::deephaven::proto::backplane::grpc::AggSpec_AggSpecUnique::MergeFrom(
-          from._internal_unique());
-      break;
-    }
-    case kWeightedAvg: {
-      _this->_internal_mutable_weighted_avg()->::io::deephaven::proto::backplane::grpc::AggSpec_AggSpecWeighted::MergeFrom(
-          from._internal_weighted_avg());
-      break;
-    }
-    case kWeightedSum: {
-      _this->_internal_mutable_weighted_sum()->::io::deephaven::proto::backplane::grpc::AggSpec_AggSpecWeighted::MergeFrom(
-          from._internal_weighted_sum());
-      break;
-    }
-    case kVar: {
-      _this->_internal_mutable_var()->::io::deephaven::proto::backplane::grpc::AggSpec_AggSpecVar::MergeFrom(
-          from._internal_var());
-      break;
-    }
-    case TYPE_NOT_SET: {
-      break;
-    }
-  }
-  _this->_internal_metadata_.MergeFrom<::google::protobuf::UnknownFieldSet>(from._internal_metadata_);
-}
-
-void AggSpec::CopyFrom(const AggSpec& from) {
-// @@protoc_insertion_point(class_specific_copy_from_start:io.deephaven.proto.backplane.grpc.AggSpec)
-  if (&from == this) return;
-  Clear();
-  MergeFrom(from);
-}
-
-PROTOBUF_NOINLINE bool AggSpec::IsInitialized() const {
-  return true;
-}
-
-::_pbi::CachedSize* AggSpec::AccessCachedSize() const {
-  return &_impl_._cached_size_;
-}
-void AggSpec::InternalSwap(AggSpec* PROTOBUF_RESTRICT other) {
-  using std::swap;
-  _internal_metadata_.InternalSwap(&other->_internal_metadata_);
-  swap(_impl_.type_, other->_impl_.type_);
-  swap(_impl_._oneof_case_[0], other->_impl_._oneof_case_[0]);
-}
-
-::google::protobuf::Metadata AggSpec::GetMetadata() const {
-  return ::_pbi::AssignDescriptors(
-      &descriptor_table_deephaven_2fproto_2ftable_2eproto_getter, &descriptor_table_deephaven_2fproto_2ftable_2eproto_once,
-      file_level_metadata_deephaven_2fproto_2ftable_2eproto[85]);
-}
-// ===================================================================
-
-class AggregateRequest::_Internal {
- public:
-  using HasBits = decltype(std::declval<AggregateRequest>()._impl_._has_bits_);
-  static constexpr ::int32_t kHasBitsOffset =
-    8 * PROTOBUF_FIELD_OFFSET(AggregateRequest, _impl_._has_bits_);
-  static const ::io::deephaven::proto::backplane::grpc::Ticket& result_id(const AggregateRequest* msg);
-  static void set_has_result_id(HasBits* has_bits) {
-    (*has_bits)[0] |= 1u;
-  }
-  static const ::io::deephaven::proto::backplane::grpc::TableReference& source_id(const AggregateRequest* msg);
-  static void set_has_source_id(HasBits* has_bits) {
-    (*has_bits)[0] |= 2u;
-  }
-  static const ::io::deephaven::proto::backplane::grpc::TableReference& initial_groups_id(const AggregateRequest* msg);
-  static void set_has_initial_groups_id(HasBits* has_bits) {
-    (*has_bits)[0] |= 4u;
-  }
-};
-
-const ::io::deephaven::proto::backplane::grpc::Ticket& AggregateRequest::_Internal::result_id(const AggregateRequest* msg) {
-  return *msg->_impl_.result_id_;
-}
-const ::io::deephaven::proto::backplane::grpc::TableReference& AggregateRequest::_Internal::source_id(const AggregateRequest* msg) {
-  return *msg->_impl_.source_id_;
-}
-const ::io::deephaven::proto::backplane::grpc::TableReference& AggregateRequest::_Internal::initial_groups_id(const AggregateRequest* msg) {
-  return *msg->_impl_.initial_groups_id_;
-}
-void AggregateRequest::clear_result_id() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  if (_impl_.result_id_ != nullptr) _impl_.result_id_->Clear();
-  _impl_._has_bits_[0] &= ~0x00000001u;
-}
-AggregateRequest::AggregateRequest(::google::protobuf::Arena* arena)
-    : ::google::protobuf::Message(arena) {
-  SharedCtor(arena);
-  // @@protoc_insertion_point(arena_constructor:io.deephaven.proto.backplane.grpc.AggregateRequest)
-}
-inline PROTOBUF_NDEBUG_INLINE AggregateRequest::Impl_::Impl_(
-    ::google::protobuf::internal::InternalVisibility visibility, ::google::protobuf::Arena* arena,
-    const Impl_& from)
-      : _has_bits_{from._has_bits_},
-        _cached_size_{0},
-        aggregations_{visibility, arena, from.aggregations_},
-        group_by_columns_{visibility, arena, from.group_by_columns_} {}
-
-AggregateRequest::AggregateRequest(
-    ::google::protobuf::Arena* arena,
-    const AggregateRequest& from)
-    : ::google::protobuf::Message(arena) {
-  AggregateRequest* const _this = this;
-  (void)_this;
-  _internal_metadata_.MergeFrom<::google::protobuf::UnknownFieldSet>(
-      from._internal_metadata_);
-  new (&_impl_) Impl_(internal_visibility(), arena, from._impl_);
-  ::uint32_t cached_has_bits = _impl_._has_bits_[0];
-  _impl_.result_id_ = (cached_has_bits & 0x00000001u)
-                ? CreateMaybeMessage<::io::deephaven::proto::backplane::grpc::Ticket>(arena, *from._impl_.result_id_)
-                : nullptr;
-  _impl_.source_id_ = (cached_has_bits & 0x00000002u)
-                ? CreateMaybeMessage<::io::deephaven::proto::backplane::grpc::TableReference>(arena, *from._impl_.source_id_)
-                : nullptr;
-  _impl_.initial_groups_id_ = (cached_has_bits & 0x00000004u)
-                ? CreateMaybeMessage<::io::deephaven::proto::backplane::grpc::TableReference>(arena, *from._impl_.initial_groups_id_)
-                : nullptr;
-  _impl_.preserve_empty_ = from._impl_.preserve_empty_;
-
-  // @@protoc_insertion_point(copy_constructor:io.deephaven.proto.backplane.grpc.AggregateRequest)
-}
-inline PROTOBUF_NDEBUG_INLINE AggregateRequest::Impl_::Impl_(
-    ::google::protobuf::internal::InternalVisibility visibility,
-    ::google::protobuf::Arena* arena)
-      : _cached_size_{0},
-        aggregations_{visibility, arena},
-        group_by_columns_{visibility, arena} {}
-
-inline void AggregateRequest::SharedCtor(::_pb::Arena* arena) {
-  new (&_impl_) Impl_(internal_visibility(), arena);
-  ::memset(reinterpret_cast<char *>(&_impl_) +
-               offsetof(Impl_, result_id_),
-           0,
-           offsetof(Impl_, preserve_empty_) -
-               offsetof(Impl_, result_id_) +
-               sizeof(Impl_::preserve_empty_));
-}
-AggregateRequest::~AggregateRequest() {
-  // @@protoc_insertion_point(destructor:io.deephaven.proto.backplane.grpc.AggregateRequest)
-  _internal_metadata_.Delete<::google::protobuf::UnknownFieldSet>();
-  SharedDtor();
-}
-inline void AggregateRequest::SharedDtor() {
-  ABSL_DCHECK(GetArena() == nullptr);
-  delete _impl_.result_id_;
-  delete _impl_.source_id_;
-  delete _impl_.initial_groups_id_;
-  _impl_.~Impl_();
-}
-
-PROTOBUF_NOINLINE void AggregateRequest::Clear() {
-// @@protoc_insertion_point(message_clear_start:io.deephaven.proto.backplane.grpc.AggregateRequest)
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  ::uint32_t cached_has_bits = 0;
-  // Prevent compiler warnings about cached_has_bits being unused
-  (void) cached_has_bits;
-
-  _impl_.aggregations_.Clear();
-  _impl_.group_by_columns_.Clear();
-  cached_has_bits = _impl_._has_bits_[0];
-  if (cached_has_bits & 0x00000007u) {
-    if (cached_has_bits & 0x00000001u) {
-      ABSL_DCHECK(_impl_.result_id_ != nullptr);
-      _impl_.result_id_->Clear();
-    }
-    if (cached_has_bits & 0x00000002u) {
-      ABSL_DCHECK(_impl_.source_id_ != nullptr);
-      _impl_.source_id_->Clear();
-    }
-    if (cached_has_bits & 0x00000004u) {
-      ABSL_DCHECK(_impl_.initial_groups_id_ != nullptr);
-      _impl_.initial_groups_id_->Clear();
-    }
-  }
-  _impl_.preserve_empty_ = false;
-  _impl_._has_bits_.Clear();
-  _internal_metadata_.Clear<::google::protobuf::UnknownFieldSet>();
-}
-
-const char* AggregateRequest::_InternalParse(
-    const char* ptr, ::_pbi::ParseContext* ctx) {
-  ptr = ::_pbi::TcParser::ParseLoop(this, ptr, ctx, &_table_.header);
-  return ptr;
-}
-
-
-PROTOBUF_CONSTINIT PROTOBUF_ATTRIBUTE_INIT_PRIORITY1
-const ::_pbi::TcParseTable<3, 6, 4, 75, 2> AggregateRequest::_table_ = {
-  {
-    PROTOBUF_FIELD_OFFSET(AggregateRequest, _impl_._has_bits_),
-    0, // no _extensions_
-    6, 56,  // max_field_number, fast_idx_mask
-    offsetof(decltype(_table_), field_lookup_table),
-    4294967232,  // skipmap
-    offsetof(decltype(_table_), field_entries),
-    6,  // num_field_entries
-    4,  // num_aux_entries
-    offsetof(decltype(_table_), aux_entries),
-    &_AggregateRequest_default_instance_._instance,
-    ::_pbi::TcParser::GenericFallback,  // fallback
-  }, {{
-    {::_pbi::TcParser::MiniParse, {}},
-    // .io.deephaven.proto.backplane.grpc.Ticket result_id = 1;
-    {::_pbi::TcParser::FastMtS1,
-     {10, 0, 0, PROTOBUF_FIELD_OFFSET(AggregateRequest, _impl_.result_id_)}},
-    // .io.deephaven.proto.backplane.grpc.TableReference source_id = 2;
-    {::_pbi::TcParser::FastMtS1,
-     {18, 1, 1, PROTOBUF_FIELD_OFFSET(AggregateRequest, _impl_.source_id_)}},
-    // .io.deephaven.proto.backplane.grpc.TableReference initial_groups_id = 3;
-    {::_pbi::TcParser::FastMtS1,
-     {26, 2, 2, PROTOBUF_FIELD_OFFSET(AggregateRequest, _impl_.initial_groups_id_)}},
-    // bool preserve_empty = 4;
-    {::_pbi::TcParser::SingularVarintNoZag1<bool, offsetof(AggregateRequest, _impl_.preserve_empty_), 63>(),
-     {32, 63, 0, PROTOBUF_FIELD_OFFSET(AggregateRequest, _impl_.preserve_empty_)}},
-    // repeated .io.deephaven.proto.backplane.grpc.Aggregation aggregations = 5;
-    {::_pbi::TcParser::FastMtR1,
-     {42, 63, 3, PROTOBUF_FIELD_OFFSET(AggregateRequest, _impl_.aggregations_)}},
-    // repeated string group_by_columns = 6;
-    {::_pbi::TcParser::FastUR1,
-     {50, 63, 0, PROTOBUF_FIELD_OFFSET(AggregateRequest, _impl_.group_by_columns_)}},
-    {::_pbi::TcParser::MiniParse, {}},
-  }}, {{
-    65535, 65535
-  }}, {{
-    // .io.deephaven.proto.backplane.grpc.Ticket result_id = 1;
-    {PROTOBUF_FIELD_OFFSET(AggregateRequest, _impl_.result_id_), _Internal::kHasBitsOffset + 0, 0,
-    (0 | ::_fl::kFcOptional | ::_fl::kMessage | ::_fl::kTvTable)},
-    // .io.deephaven.proto.backplane.grpc.TableReference source_id = 2;
-    {PROTOBUF_FIELD_OFFSET(AggregateRequest, _impl_.source_id_), _Internal::kHasBitsOffset + 1, 1,
-    (0 | ::_fl::kFcOptional | ::_fl::kMessage | ::_fl::kTvTable)},
-    // .io.deephaven.proto.backplane.grpc.TableReference initial_groups_id = 3;
-    {PROTOBUF_FIELD_OFFSET(AggregateRequest, _impl_.initial_groups_id_), _Internal::kHasBitsOffset + 2, 2,
-    (0 | ::_fl::kFcOptional | ::_fl::kMessage | ::_fl::kTvTable)},
-    // bool preserve_empty = 4;
-    {PROTOBUF_FIELD_OFFSET(AggregateRequest, _impl_.preserve_empty_), -1, 0,
-    (0 | ::_fl::kFcSingular | ::_fl::kBool)},
-    // repeated .io.deephaven.proto.backplane.grpc.Aggregation aggregations = 5;
-    {PROTOBUF_FIELD_OFFSET(AggregateRequest, _impl_.aggregations_), -1, 3,
-    (0 | ::_fl::kFcRepeated | ::_fl::kMessage | ::_fl::kTvTable)},
-    // repeated string group_by_columns = 6;
-    {PROTOBUF_FIELD_OFFSET(AggregateRequest, _impl_.group_by_columns_), -1, 0,
-    (0 | ::_fl::kFcRepeated | ::_fl::kUtf8String | ::_fl::kRepSString)},
-  }}, {{
-    {::_pbi::TcParser::GetTable<::io::deephaven::proto::backplane::grpc::Ticket>()},
-    {::_pbi::TcParser::GetTable<::io::deephaven::proto::backplane::grpc::TableReference>()},
-    {::_pbi::TcParser::GetTable<::io::deephaven::proto::backplane::grpc::TableReference>()},
-    {::_pbi::TcParser::GetTable<::io::deephaven::proto::backplane::grpc::Aggregation>()},
-  }}, {{
-    "\62\0\0\0\0\0\20\0"
-    "io.deephaven.proto.backplane.grpc.AggregateRequest"
-    "group_by_columns"
-  }},
-};
-
-::uint8_t* AggregateRequest::_InternalSerialize(
-    ::uint8_t* target,
-    ::google::protobuf::io::EpsCopyOutputStream* stream) const {
-  // @@protoc_insertion_point(serialize_to_array_start:io.deephaven.proto.backplane.grpc.AggregateRequest)
-  ::uint32_t cached_has_bits = 0;
-  (void)cached_has_bits;
-
-  cached_has_bits = _impl_._has_bits_[0];
-  // .io.deephaven.proto.backplane.grpc.Ticket result_id = 1;
-  if (cached_has_bits & 0x00000001u) {
-    target = ::google::protobuf::internal::WireFormatLite::InternalWriteMessage(
-        1, _Internal::result_id(this),
-        _Internal::result_id(this).GetCachedSize(), target, stream);
-  }
-
-  // .io.deephaven.proto.backplane.grpc.TableReference source_id = 2;
-  if (cached_has_bits & 0x00000002u) {
-    target = ::google::protobuf::internal::WireFormatLite::InternalWriteMessage(
-        2, _Internal::source_id(this),
-        _Internal::source_id(this).GetCachedSize(), target, stream);
-  }
-
-  // .io.deephaven.proto.backplane.grpc.TableReference initial_groups_id = 3;
-  if (cached_has_bits & 0x00000004u) {
-    target = ::google::protobuf::internal::WireFormatLite::InternalWriteMessage(
-        3, _Internal::initial_groups_id(this),
-        _Internal::initial_groups_id(this).GetCachedSize(), target, stream);
-  }
-
-  // bool preserve_empty = 4;
-  if (this->_internal_preserve_empty() != 0) {
-    target = stream->EnsureSpace(target);
-    target = ::_pbi::WireFormatLite::WriteBoolToArray(
-        4, this->_internal_preserve_empty(), target);
-  }
-
-  // repeated .io.deephaven.proto.backplane.grpc.Aggregation aggregations = 5;
-  for (unsigned i = 0,
-      n = static_cast<unsigned>(this->_internal_aggregations_size()); i < n; i++) {
-    const auto& repfield = this->_internal_aggregations().Get(i);
-    target = ::google::protobuf::internal::WireFormatLite::
-        InternalWriteMessage(5, repfield, repfield.GetCachedSize(), target, stream);
-  }
-
-  // repeated string group_by_columns = 6;
-  for (int i = 0, n = this->_internal_group_by_columns_size(); i < n; ++i) {
-    const auto& s = this->_internal_group_by_columns().Get(i);
-    ::google::protobuf::internal::WireFormatLite::VerifyUtf8String(
-        s.data(), static_cast<int>(s.length()), ::google::protobuf::internal::WireFormatLite::SERIALIZE, "io.deephaven.proto.backplane.grpc.AggregateRequest.group_by_columns");
-    target = stream->WriteString(6, s, target);
-  }
-
-  if (PROTOBUF_PREDICT_FALSE(_internal_metadata_.have_unknown_fields())) {
-    target =
-        ::_pbi::WireFormat::InternalSerializeUnknownFieldsToArray(
-            _internal_metadata_.unknown_fields<::google::protobuf::UnknownFieldSet>(::google::protobuf::UnknownFieldSet::default_instance), target, stream);
-  }
-  // @@protoc_insertion_point(serialize_to_array_end:io.deephaven.proto.backplane.grpc.AggregateRequest)
-  return target;
-}
-
-::size_t AggregateRequest::ByteSizeLong() const {
-// @@protoc_insertion_point(message_byte_size_start:io.deephaven.proto.backplane.grpc.AggregateRequest)
-  ::size_t total_size = 0;
-
-  ::uint32_t cached_has_bits = 0;
-  // Prevent compiler warnings about cached_has_bits being unused
-  (void) cached_has_bits;
-
-  // repeated .io.deephaven.proto.backplane.grpc.Aggregation aggregations = 5;
-  total_size += 1UL * this->_internal_aggregations_size();
-  for (const auto& msg : this->_internal_aggregations()) {
-    total_size +=
-      ::google::protobuf::internal::WireFormatLite::MessageSize(msg);
-  }
-  // repeated string group_by_columns = 6;
-  total_size += 1 * ::google::protobuf::internal::FromIntSize(_internal_group_by_columns().size());
-  for (int i = 0, n = _internal_group_by_columns().size(); i < n; ++i) {
-    total_size += ::google::protobuf::internal::WireFormatLite::StringSize(
-        _internal_group_by_columns().Get(i));
-  }
-  cached_has_bits = _impl_._has_bits_[0];
-  if (cached_has_bits & 0x00000007u) {
-    // .io.deephaven.proto.backplane.grpc.Ticket result_id = 1;
-    if (cached_has_bits & 0x00000001u) {
-      total_size +=
-          1 + ::google::protobuf::internal::WireFormatLite::MessageSize(*_impl_.result_id_);
-    }
-
-    // .io.deephaven.proto.backplane.grpc.TableReference source_id = 2;
-    if (cached_has_bits & 0x00000002u) {
-      total_size +=
-          1 + ::google::protobuf::internal::WireFormatLite::MessageSize(*_impl_.source_id_);
-    }
-
-    // .io.deephaven.proto.backplane.grpc.TableReference initial_groups_id = 3;
-    if (cached_has_bits & 0x00000004u) {
-      total_size +=
-          1 + ::google::protobuf::internal::WireFormatLite::MessageSize(*_impl_.initial_groups_id_);
-    }
-
-  }
-  // bool preserve_empty = 4;
-  if (this->_internal_preserve_empty() != 0) {
-    total_size += 2;
-  }
-
-  return MaybeComputeUnknownFieldsSize(total_size, &_impl_._cached_size_);
-}
-
-const ::google::protobuf::Message::ClassData AggregateRequest::_class_data_ = {
-    AggregateRequest::MergeImpl,
-    nullptr,  // OnDemandRegisterArenaDtor
-};
-const ::google::protobuf::Message::ClassData* AggregateRequest::GetClassData() const {
-  return &_class_data_;
-}
-
-void AggregateRequest::MergeImpl(::google::protobuf::Message& to_msg, const ::google::protobuf::Message& from_msg) {
-  auto* const _this = static_cast<AggregateRequest*>(&to_msg);
-  auto& from = static_cast<const AggregateRequest&>(from_msg);
-  // @@protoc_insertion_point(class_specific_merge_from_start:io.deephaven.proto.backplane.grpc.AggregateRequest)
-  ABSL_DCHECK_NE(&from, _this);
-  ::uint32_t cached_has_bits = 0;
-  (void) cached_has_bits;
-
-  _this->_internal_mutable_aggregations()->MergeFrom(
-      from._internal_aggregations());
-  _this->_internal_mutable_group_by_columns()->MergeFrom(from._internal_group_by_columns());
-  cached_has_bits = from._impl_._has_bits_[0];
-  if (cached_has_bits & 0x00000007u) {
-    if (cached_has_bits & 0x00000001u) {
-      _this->_internal_mutable_result_id()->::io::deephaven::proto::backplane::grpc::Ticket::MergeFrom(
-          from._internal_result_id());
-    }
-    if (cached_has_bits & 0x00000002u) {
-      _this->_internal_mutable_source_id()->::io::deephaven::proto::backplane::grpc::TableReference::MergeFrom(
-          from._internal_source_id());
-    }
-    if (cached_has_bits & 0x00000004u) {
-      _this->_internal_mutable_initial_groups_id()->::io::deephaven::proto::backplane::grpc::TableReference::MergeFrom(
-          from._internal_initial_groups_id());
-    }
-  }
-  if (from._internal_preserve_empty() != 0) {
-    _this->_internal_set_preserve_empty(from._internal_preserve_empty());
-  }
-  _this->_internal_metadata_.MergeFrom<::google::protobuf::UnknownFieldSet>(from._internal_metadata_);
-}
-
-void AggregateRequest::CopyFrom(const AggregateRequest& from) {
-// @@protoc_insertion_point(class_specific_copy_from_start:io.deephaven.proto.backplane.grpc.AggregateRequest)
-  if (&from == this) return;
-  Clear();
-  MergeFrom(from);
-}
-
-PROTOBUF_NOINLINE bool AggregateRequest::IsInitialized() const {
-  return true;
-}
-
-::_pbi::CachedSize* AggregateRequest::AccessCachedSize() const {
-  return &_impl_._cached_size_;
-}
-void AggregateRequest::InternalSwap(AggregateRequest* PROTOBUF_RESTRICT other) {
-  using std::swap;
-  _internal_metadata_.InternalSwap(&other->_internal_metadata_);
-  swap(_impl_._has_bits_[0], other->_impl_._has_bits_[0]);
-  _impl_.aggregations_.InternalSwap(&other->_impl_.aggregations_);
-  _impl_.group_by_columns_.InternalSwap(&other->_impl_.group_by_columns_);
-  ::google::protobuf::internal::memswap<
-      PROTOBUF_FIELD_OFFSET(AggregateRequest, _impl_.preserve_empty_)
-      + sizeof(AggregateRequest::_impl_.preserve_empty_)
-      - PROTOBUF_FIELD_OFFSET(AggregateRequest, _impl_.result_id_)>(
-          reinterpret_cast<char*>(&_impl_.result_id_),
-          reinterpret_cast<char*>(&other->_impl_.result_id_));
-}
-
-::google::protobuf::Metadata AggregateRequest::GetMetadata() const {
-  return ::_pbi::AssignDescriptors(
-      &descriptor_table_deephaven_2fproto_2ftable_2eproto_getter, &descriptor_table_deephaven_2fproto_2ftable_2eproto_once,
-      file_level_metadata_deephaven_2fproto_2ftable_2eproto[86]);
-}
-// ===================================================================
-
-class Aggregation_AggregationColumns::_Internal {
- public:
-  using HasBits = decltype(std::declval<Aggregation_AggregationColumns>()._impl_._has_bits_);
-  static constexpr ::int32_t kHasBitsOffset =
-    8 * PROTOBUF_FIELD_OFFSET(Aggregation_AggregationColumns, _impl_._has_bits_);
-  static const ::io::deephaven::proto::backplane::grpc::AggSpec& spec(const Aggregation_AggregationColumns* msg);
-  static void set_has_spec(HasBits* has_bits) {
-    (*has_bits)[0] |= 1u;
-  }
-};
-
-const ::io::deephaven::proto::backplane::grpc::AggSpec& Aggregation_AggregationColumns::_Internal::spec(const Aggregation_AggregationColumns* msg) {
-  return *msg->_impl_.spec_;
-}
-Aggregation_AggregationColumns::Aggregation_AggregationColumns(::google::protobuf::Arena* arena)
-    : ::google::protobuf::Message(arena) {
-  SharedCtor(arena);
-  // @@protoc_insertion_point(arena_constructor:io.deephaven.proto.backplane.grpc.Aggregation.AggregationColumns)
-}
-inline PROTOBUF_NDEBUG_INLINE Aggregation_AggregationColumns::Impl_::Impl_(
-    ::google::protobuf::internal::InternalVisibility visibility, ::google::protobuf::Arena* arena,
-    const Impl_& from)
-      : _has_bits_{from._has_bits_},
-        _cached_size_{0},
-        match_pairs_{visibility, arena, from.match_pairs_} {}
-
-Aggregation_AggregationColumns::Aggregation_AggregationColumns(
-    ::google::protobuf::Arena* arena,
-    const Aggregation_AggregationColumns& from)
-    : ::google::protobuf::Message(arena) {
-  Aggregation_AggregationColumns* const _this = this;
-  (void)_this;
-  _internal_metadata_.MergeFrom<::google::protobuf::UnknownFieldSet>(
-      from._internal_metadata_);
-  new (&_impl_) Impl_(internal_visibility(), arena, from._impl_);
-  ::uint32_t cached_has_bits = _impl_._has_bits_[0];
-  _impl_.spec_ = (cached_has_bits & 0x00000001u)
-                ? CreateMaybeMessage<::io::deephaven::proto::backplane::grpc::AggSpec>(arena, *from._impl_.spec_)
-                : nullptr;
-
-  // @@protoc_insertion_point(copy_constructor:io.deephaven.proto.backplane.grpc.Aggregation.AggregationColumns)
-}
-inline PROTOBUF_NDEBUG_INLINE Aggregation_AggregationColumns::Impl_::Impl_(
-    ::google::protobuf::internal::InternalVisibility visibility,
-    ::google::protobuf::Arena* arena)
-      : _cached_size_{0},
-        match_pairs_{visibility, arena} {}
-
-inline void Aggregation_AggregationColumns::SharedCtor(::_pb::Arena* arena) {
-  new (&_impl_) Impl_(internal_visibility(), arena);
-  _impl_.spec_ = {};
-}
-Aggregation_AggregationColumns::~Aggregation_AggregationColumns() {
-  // @@protoc_insertion_point(destructor:io.deephaven.proto.backplane.grpc.Aggregation.AggregationColumns)
-  _internal_metadata_.Delete<::google::protobuf::UnknownFieldSet>();
-  SharedDtor();
-}
-inline void Aggregation_AggregationColumns::SharedDtor() {
-  ABSL_DCHECK(GetArena() == nullptr);
-  delete _impl_.spec_;
-  _impl_.~Impl_();
-}
-
-PROTOBUF_NOINLINE void Aggregation_AggregationColumns::Clear() {
-// @@protoc_insertion_point(message_clear_start:io.deephaven.proto.backplane.grpc.Aggregation.AggregationColumns)
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  ::uint32_t cached_has_bits = 0;
-  // Prevent compiler warnings about cached_has_bits being unused
-  (void) cached_has_bits;
-
-  _impl_.match_pairs_.Clear();
-  cached_has_bits = _impl_._has_bits_[0];
-  if (cached_has_bits & 0x00000001u) {
-    ABSL_DCHECK(_impl_.spec_ != nullptr);
-    _impl_.spec_->Clear();
-  }
-  _impl_._has_bits_.Clear();
-  _internal_metadata_.Clear<::google::protobuf::UnknownFieldSet>();
-}
-
-const char* Aggregation_AggregationColumns::_InternalParse(
-    const char* ptr, ::_pbi::ParseContext* ctx) {
-  ptr = ::_pbi::TcParser::ParseLoop(this, ptr, ctx, &_table_.header);
-  return ptr;
-}
-
-
-PROTOBUF_CONSTINIT PROTOBUF_ATTRIBUTE_INIT_PRIORITY1
-const ::_pbi::TcParseTable<1, 2, 1, 84, 2> Aggregation_AggregationColumns::_table_ = {
-  {
-    PROTOBUF_FIELD_OFFSET(Aggregation_AggregationColumns, _impl_._has_bits_),
-    0, // no _extensions_
-    2, 8,  // max_field_number, fast_idx_mask
-    offsetof(decltype(_table_), field_lookup_table),
-    4294967292,  // skipmap
-    offsetof(decltype(_table_), field_entries),
-    2,  // num_field_entries
-    1,  // num_aux_entries
-    offsetof(decltype(_table_), aux_entries),
-    &_Aggregation_AggregationColumns_default_instance_._instance,
-    ::_pbi::TcParser::GenericFallback,  // fallback
-  }, {{
-    // repeated string match_pairs = 2;
-    {::_pbi::TcParser::FastUR1,
-     {18, 63, 0, PROTOBUF_FIELD_OFFSET(Aggregation_AggregationColumns, _impl_.match_pairs_)}},
-    // .io.deephaven.proto.backplane.grpc.AggSpec spec = 1;
-    {::_pbi::TcParser::FastMtS1,
-     {10, 0, 0, PROTOBUF_FIELD_OFFSET(Aggregation_AggregationColumns, _impl_.spec_)}},
-  }}, {{
-    65535, 65535
-  }}, {{
-    // .io.deephaven.proto.backplane.grpc.AggSpec spec = 1;
-    {PROTOBUF_FIELD_OFFSET(Aggregation_AggregationColumns, _impl_.spec_), _Internal::kHasBitsOffset + 0, 0,
-    (0 | ::_fl::kFcOptional | ::_fl::kMessage | ::_fl::kTvTable)},
-    // repeated string match_pairs = 2;
-    {PROTOBUF_FIELD_OFFSET(Aggregation_AggregationColumns, _impl_.match_pairs_), -1, 0,
-    (0 | ::_fl::kFcRepeated | ::_fl::kUtf8String | ::_fl::kRepSString)},
-  }}, {{
-    {::_pbi::TcParser::GetTable<::io::deephaven::proto::backplane::grpc::AggSpec>()},
-  }}, {{
-    "\100\0\13\0\0\0\0\0"
-    "io.deephaven.proto.backplane.grpc.Aggregation.AggregationColumns"
-    "match_pairs"
-  }},
-};
-
-::uint8_t* Aggregation_AggregationColumns::_InternalSerialize(
-    ::uint8_t* target,
-    ::google::protobuf::io::EpsCopyOutputStream* stream) const {
-  // @@protoc_insertion_point(serialize_to_array_start:io.deephaven.proto.backplane.grpc.Aggregation.AggregationColumns)
-  ::uint32_t cached_has_bits = 0;
-  (void)cached_has_bits;
-
-  cached_has_bits = _impl_._has_bits_[0];
-  // .io.deephaven.proto.backplane.grpc.AggSpec spec = 1;
-  if (cached_has_bits & 0x00000001u) {
-    target = ::google::protobuf::internal::WireFormatLite::InternalWriteMessage(
-        1, _Internal::spec(this),
-        _Internal::spec(this).GetCachedSize(), target, stream);
-  }
-
-  // repeated string match_pairs = 2;
-  for (int i = 0, n = this->_internal_match_pairs_size(); i < n; ++i) {
-    const auto& s = this->_internal_match_pairs().Get(i);
-    ::google::protobuf::internal::WireFormatLite::VerifyUtf8String(
-        s.data(), static_cast<int>(s.length()), ::google::protobuf::internal::WireFormatLite::SERIALIZE, "io.deephaven.proto.backplane.grpc.Aggregation.AggregationColumns.match_pairs");
-    target = stream->WriteString(2, s, target);
-  }
-
-  if (PROTOBUF_PREDICT_FALSE(_internal_metadata_.have_unknown_fields())) {
-    target =
-        ::_pbi::WireFormat::InternalSerializeUnknownFieldsToArray(
-            _internal_metadata_.unknown_fields<::google::protobuf::UnknownFieldSet>(::google::protobuf::UnknownFieldSet::default_instance), target, stream);
-  }
-  // @@protoc_insertion_point(serialize_to_array_end:io.deephaven.proto.backplane.grpc.Aggregation.AggregationColumns)
-  return target;
-}
-
-::size_t Aggregation_AggregationColumns::ByteSizeLong() const {
-// @@protoc_insertion_point(message_byte_size_start:io.deephaven.proto.backplane.grpc.Aggregation.AggregationColumns)
-  ::size_t total_size = 0;
-
-  ::uint32_t cached_has_bits = 0;
-  // Prevent compiler warnings about cached_has_bits being unused
-  (void) cached_has_bits;
-
-  // repeated string match_pairs = 2;
-  total_size += 1 * ::google::protobuf::internal::FromIntSize(_internal_match_pairs().size());
-  for (int i = 0, n = _internal_match_pairs().size(); i < n; ++i) {
-    total_size += ::google::protobuf::internal::WireFormatLite::StringSize(
-        _internal_match_pairs().Get(i));
-  }
-  // .io.deephaven.proto.backplane.grpc.AggSpec spec = 1;
-  cached_has_bits = _impl_._has_bits_[0];
-  if (cached_has_bits & 0x00000001u) {
-    total_size +=
-        1 + ::google::protobuf::internal::WireFormatLite::MessageSize(*_impl_.spec_);
-  }
-
-  return MaybeComputeUnknownFieldsSize(total_size, &_impl_._cached_size_);
-}
-
-const ::google::protobuf::Message::ClassData Aggregation_AggregationColumns::_class_data_ = {
-    Aggregation_AggregationColumns::MergeImpl,
-    nullptr,  // OnDemandRegisterArenaDtor
-};
-const ::google::protobuf::Message::ClassData* Aggregation_AggregationColumns::GetClassData() const {
-  return &_class_data_;
-}
-
-void Aggregation_AggregationColumns::MergeImpl(::google::protobuf::Message& to_msg, const ::google::protobuf::Message& from_msg) {
-  auto* const _this = static_cast<Aggregation_AggregationColumns*>(&to_msg);
-  auto& from = static_cast<const Aggregation_AggregationColumns&>(from_msg);
-  // @@protoc_insertion_point(class_specific_merge_from_start:io.deephaven.proto.backplane.grpc.Aggregation.AggregationColumns)
-  ABSL_DCHECK_NE(&from, _this);
-  ::uint32_t cached_has_bits = 0;
-  (void) cached_has_bits;
-
-  _this->_internal_mutable_match_pairs()->MergeFrom(from._internal_match_pairs());
-  if ((from._impl_._has_bits_[0] & 0x00000001u) != 0) {
-    _this->_internal_mutable_spec()->::io::deephaven::proto::backplane::grpc::AggSpec::MergeFrom(
-        from._internal_spec());
-  }
-  _this->_internal_metadata_.MergeFrom<::google::protobuf::UnknownFieldSet>(from._internal_metadata_);
-}
-
-void Aggregation_AggregationColumns::CopyFrom(const Aggregation_AggregationColumns& from) {
-// @@protoc_insertion_point(class_specific_copy_from_start:io.deephaven.proto.backplane.grpc.Aggregation.AggregationColumns)
-  if (&from == this) return;
-  Clear();
-  MergeFrom(from);
-}
-
-PROTOBUF_NOINLINE bool Aggregation_AggregationColumns::IsInitialized() const {
-  return true;
-}
-
-::_pbi::CachedSize* Aggregation_AggregationColumns::AccessCachedSize() const {
-  return &_impl_._cached_size_;
-}
-void Aggregation_AggregationColumns::InternalSwap(Aggregation_AggregationColumns* PROTOBUF_RESTRICT other) {
-  using std::swap;
-  _internal_metadata_.InternalSwap(&other->_internal_metadata_);
-  swap(_impl_._has_bits_[0], other->_impl_._has_bits_[0]);
-  _impl_.match_pairs_.InternalSwap(&other->_impl_.match_pairs_);
-  swap(_impl_.spec_, other->_impl_.spec_);
-}
-
-::google::protobuf::Metadata Aggregation_AggregationColumns::GetMetadata() const {
-  return ::_pbi::AssignDescriptors(
-      &descriptor_table_deephaven_2fproto_2ftable_2eproto_getter, &descriptor_table_deephaven_2fproto_2ftable_2eproto_once,
-      file_level_metadata_deephaven_2fproto_2ftable_2eproto[87]);
-}
-// ===================================================================
-
-class Aggregation_AggregationCount::_Internal {
- public:
-};
-
-Aggregation_AggregationCount::Aggregation_AggregationCount(::google::protobuf::Arena* arena)
-    : ::google::protobuf::Message(arena) {
-  SharedCtor(arena);
-  // @@protoc_insertion_point(arena_constructor:io.deephaven.proto.backplane.grpc.Aggregation.AggregationCount)
-}
-inline PROTOBUF_NDEBUG_INLINE Aggregation_AggregationCount::Impl_::Impl_(
-    ::google::protobuf::internal::InternalVisibility visibility, ::google::protobuf::Arena* arena,
-    const Impl_& from)
-      : column_name_(arena, from.column_name_),
-        _cached_size_{0} {}
-
-Aggregation_AggregationCount::Aggregation_AggregationCount(
-    ::google::protobuf::Arena* arena,
-    const Aggregation_AggregationCount& from)
-    : ::google::protobuf::Message(arena) {
-  Aggregation_AggregationCount* const _this = this;
-  (void)_this;
-  _internal_metadata_.MergeFrom<::google::protobuf::UnknownFieldSet>(
-      from._internal_metadata_);
-  new (&_impl_) Impl_(internal_visibility(), arena, from._impl_);
-
-  // @@protoc_insertion_point(copy_constructor:io.deephaven.proto.backplane.grpc.Aggregation.AggregationCount)
-}
-inline PROTOBUF_NDEBUG_INLINE Aggregation_AggregationCount::Impl_::Impl_(
-    ::google::protobuf::internal::InternalVisibility visibility,
-    ::google::protobuf::Arena* arena)
-      : column_name_(arena),
-        _cached_size_{0} {}
-
-inline void Aggregation_AggregationCount::SharedCtor(::_pb::Arena* arena) {
-  new (&_impl_) Impl_(internal_visibility(), arena);
-}
-Aggregation_AggregationCount::~Aggregation_AggregationCount() {
-  // @@protoc_insertion_point(destructor:io.deephaven.proto.backplane.grpc.Aggregation.AggregationCount)
-  _internal_metadata_.Delete<::google::protobuf::UnknownFieldSet>();
-  SharedDtor();
-}
-inline void Aggregation_AggregationCount::SharedDtor() {
-  ABSL_DCHECK(GetArena() == nullptr);
-  _impl_.column_name_.Destroy();
-  _impl_.~Impl_();
-}
-
-PROTOBUF_NOINLINE void Aggregation_AggregationCount::Clear() {
-// @@protoc_insertion_point(message_clear_start:io.deephaven.proto.backplane.grpc.Aggregation.AggregationCount)
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  ::uint32_t cached_has_bits = 0;
-  // Prevent compiler warnings about cached_has_bits being unused
-  (void) cached_has_bits;
-
-  _impl_.column_name_.ClearToEmpty();
-  _internal_metadata_.Clear<::google::protobuf::UnknownFieldSet>();
-}
-
-const char* Aggregation_AggregationCount::_InternalParse(
-    const char* ptr, ::_pbi::ParseContext* ctx) {
-  ptr = ::_pbi::TcParser::ParseLoop(this, ptr, ctx, &_table_.header);
-  return ptr;
-}
-
-
-PROTOBUF_CONSTINIT PROTOBUF_ATTRIBUTE_INIT_PRIORITY1
-const ::_pbi::TcParseTable<0, 1, 0, 82, 2> Aggregation_AggregationCount::_table_ = {
-  {
-    0,  // no _has_bits_
-    0, // no _extensions_
-    1, 0,  // max_field_number, fast_idx_mask
-    offsetof(decltype(_table_), field_lookup_table),
-    4294967294,  // skipmap
-    offsetof(decltype(_table_), field_entries),
-    1,  // num_field_entries
-    0,  // num_aux_entries
-    offsetof(decltype(_table_), field_names),  // no aux_entries
-    &_Aggregation_AggregationCount_default_instance_._instance,
-    ::_pbi::TcParser::GenericFallback,  // fallback
-  }, {{
-    // string column_name = 1;
-    {::_pbi::TcParser::FastUS1,
-     {10, 63, 0, PROTOBUF_FIELD_OFFSET(Aggregation_AggregationCount, _impl_.column_name_)}},
-  }}, {{
-    65535, 65535
-  }}, {{
-    // string column_name = 1;
-    {PROTOBUF_FIELD_OFFSET(Aggregation_AggregationCount, _impl_.column_name_), 0, 0,
-    (0 | ::_fl::kFcSingular | ::_fl::kUtf8String | ::_fl::kRepAString)},
-  }},
-  // no aux_entries
-  {{
-    "\76\13\0\0\0\0\0\0"
-    "io.deephaven.proto.backplane.grpc.Aggregation.AggregationCount"
-    "column_name"
-  }},
-};
-
-::uint8_t* Aggregation_AggregationCount::_InternalSerialize(
-    ::uint8_t* target,
-    ::google::protobuf::io::EpsCopyOutputStream* stream) const {
-  // @@protoc_insertion_point(serialize_to_array_start:io.deephaven.proto.backplane.grpc.Aggregation.AggregationCount)
-  ::uint32_t cached_has_bits = 0;
-  (void)cached_has_bits;
-
-  // string column_name = 1;
-  if (!this->_internal_column_name().empty()) {
-    const std::string& _s = this->_internal_column_name();
-    ::google::protobuf::internal::WireFormatLite::VerifyUtf8String(
-        _s.data(), static_cast<int>(_s.length()), ::google::protobuf::internal::WireFormatLite::SERIALIZE, "io.deephaven.proto.backplane.grpc.Aggregation.AggregationCount.column_name");
-    target = stream->WriteStringMaybeAliased(1, _s, target);
-  }
-
-  if (PROTOBUF_PREDICT_FALSE(_internal_metadata_.have_unknown_fields())) {
-    target =
-        ::_pbi::WireFormat::InternalSerializeUnknownFieldsToArray(
-            _internal_metadata_.unknown_fields<::google::protobuf::UnknownFieldSet>(::google::protobuf::UnknownFieldSet::default_instance), target, stream);
-  }
-  // @@protoc_insertion_point(serialize_to_array_end:io.deephaven.proto.backplane.grpc.Aggregation.AggregationCount)
-  return target;
-}
-
-::size_t Aggregation_AggregationCount::ByteSizeLong() const {
-// @@protoc_insertion_point(message_byte_size_start:io.deephaven.proto.backplane.grpc.Aggregation.AggregationCount)
-  ::size_t total_size = 0;
-
-  ::uint32_t cached_has_bits = 0;
-  // Prevent compiler warnings about cached_has_bits being unused
-  (void) cached_has_bits;
-
-  // string column_name = 1;
-  if (!this->_internal_column_name().empty()) {
-    total_size += 1 + ::google::protobuf::internal::WireFormatLite::StringSize(
-                                    this->_internal_column_name());
-  }
-
-  return MaybeComputeUnknownFieldsSize(total_size, &_impl_._cached_size_);
-}
-
-const ::google::protobuf::Message::ClassData Aggregation_AggregationCount::_class_data_ = {
-    Aggregation_AggregationCount::MergeImpl,
-    nullptr,  // OnDemandRegisterArenaDtor
-};
-const ::google::protobuf::Message::ClassData* Aggregation_AggregationCount::GetClassData() const {
-  return &_class_data_;
-}
-
-void Aggregation_AggregationCount::MergeImpl(::google::protobuf::Message& to_msg, const ::google::protobuf::Message& from_msg) {
-  auto* const _this = static_cast<Aggregation_AggregationCount*>(&to_msg);
-  auto& from = static_cast<const Aggregation_AggregationCount&>(from_msg);
-  // @@protoc_insertion_point(class_specific_merge_from_start:io.deephaven.proto.backplane.grpc.Aggregation.AggregationCount)
-  ABSL_DCHECK_NE(&from, _this);
-  ::uint32_t cached_has_bits = 0;
-  (void) cached_has_bits;
-
-  if (!from._internal_column_name().empty()) {
-    _this->_internal_set_column_name(from._internal_column_name());
-  }
-  _this->_internal_metadata_.MergeFrom<::google::protobuf::UnknownFieldSet>(from._internal_metadata_);
-}
-
-void Aggregation_AggregationCount::CopyFrom(const Aggregation_AggregationCount& from) {
-// @@protoc_insertion_point(class_specific_copy_from_start:io.deephaven.proto.backplane.grpc.Aggregation.AggregationCount)
-  if (&from == this) return;
-  Clear();
-  MergeFrom(from);
-}
-
-PROTOBUF_NOINLINE bool Aggregation_AggregationCount::IsInitialized() const {
-  return true;
-}
-
-::_pbi::CachedSize* Aggregation_AggregationCount::AccessCachedSize() const {
-  return &_impl_._cached_size_;
-}
-void Aggregation_AggregationCount::InternalSwap(Aggregation_AggregationCount* PROTOBUF_RESTRICT other) {
-  using std::swap;
-  auto* arena = GetArena();
-  ABSL_DCHECK_EQ(arena, other->GetArena());
-  _internal_metadata_.InternalSwap(&other->_internal_metadata_);
-  ::_pbi::ArenaStringPtr::InternalSwap(&_impl_.column_name_, &other->_impl_.column_name_, arena);
-}
-
-::google::protobuf::Metadata Aggregation_AggregationCount::GetMetadata() const {
-  return ::_pbi::AssignDescriptors(
-      &descriptor_table_deephaven_2fproto_2ftable_2eproto_getter, &descriptor_table_deephaven_2fproto_2ftable_2eproto_once,
-      file_level_metadata_deephaven_2fproto_2ftable_2eproto[88]);
-}
-// ===================================================================
-
-class Aggregation_AggregationRowKey::_Internal {
- public:
-};
-
-Aggregation_AggregationRowKey::Aggregation_AggregationRowKey(::google::protobuf::Arena* arena)
-    : ::google::protobuf::Message(arena) {
-  SharedCtor(arena);
-  // @@protoc_insertion_point(arena_constructor:io.deephaven.proto.backplane.grpc.Aggregation.AggregationRowKey)
-}
-inline PROTOBUF_NDEBUG_INLINE Aggregation_AggregationRowKey::Impl_::Impl_(
-    ::google::protobuf::internal::InternalVisibility visibility, ::google::protobuf::Arena* arena,
-    const Impl_& from)
-      : column_name_(arena, from.column_name_),
-        _cached_size_{0} {}
-
-Aggregation_AggregationRowKey::Aggregation_AggregationRowKey(
-    ::google::protobuf::Arena* arena,
-    const Aggregation_AggregationRowKey& from)
-    : ::google::protobuf::Message(arena) {
-  Aggregation_AggregationRowKey* const _this = this;
-  (void)_this;
-  _internal_metadata_.MergeFrom<::google::protobuf::UnknownFieldSet>(
-      from._internal_metadata_);
-  new (&_impl_) Impl_(internal_visibility(), arena, from._impl_);
-
-  // @@protoc_insertion_point(copy_constructor:io.deephaven.proto.backplane.grpc.Aggregation.AggregationRowKey)
-}
-inline PROTOBUF_NDEBUG_INLINE Aggregation_AggregationRowKey::Impl_::Impl_(
-    ::google::protobuf::internal::InternalVisibility visibility,
-    ::google::protobuf::Arena* arena)
-      : column_name_(arena),
-        _cached_size_{0} {}
-
-inline void Aggregation_AggregationRowKey::SharedCtor(::_pb::Arena* arena) {
-  new (&_impl_) Impl_(internal_visibility(), arena);
-}
-Aggregation_AggregationRowKey::~Aggregation_AggregationRowKey() {
-  // @@protoc_insertion_point(destructor:io.deephaven.proto.backplane.grpc.Aggregation.AggregationRowKey)
-  _internal_metadata_.Delete<::google::protobuf::UnknownFieldSet>();
-  SharedDtor();
-}
-inline void Aggregation_AggregationRowKey::SharedDtor() {
-  ABSL_DCHECK(GetArena() == nullptr);
-  _impl_.column_name_.Destroy();
-  _impl_.~Impl_();
-}
-
-PROTOBUF_NOINLINE void Aggregation_AggregationRowKey::Clear() {
-// @@protoc_insertion_point(message_clear_start:io.deephaven.proto.backplane.grpc.Aggregation.AggregationRowKey)
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  ::uint32_t cached_has_bits = 0;
-  // Prevent compiler warnings about cached_has_bits being unused
-  (void) cached_has_bits;
-
-  _impl_.column_name_.ClearToEmpty();
-  _internal_metadata_.Clear<::google::protobuf::UnknownFieldSet>();
-}
-
-const char* Aggregation_AggregationRowKey::_InternalParse(
-    const char* ptr, ::_pbi::ParseContext* ctx) {
-  ptr = ::_pbi::TcParser::ParseLoop(this, ptr, ctx, &_table_.header);
-  return ptr;
-}
-
-
-PROTOBUF_CONSTINIT PROTOBUF_ATTRIBUTE_INIT_PRIORITY1
-const ::_pbi::TcParseTable<0, 1, 0, 83, 2> Aggregation_AggregationRowKey::_table_ = {
-  {
-    0,  // no _has_bits_
-    0, // no _extensions_
-    1, 0,  // max_field_number, fast_idx_mask
-    offsetof(decltype(_table_), field_lookup_table),
-    4294967294,  // skipmap
-    offsetof(decltype(_table_), field_entries),
-    1,  // num_field_entries
-    0,  // num_aux_entries
-    offsetof(decltype(_table_), field_names),  // no aux_entries
-    &_Aggregation_AggregationRowKey_default_instance_._instance,
-    ::_pbi::TcParser::GenericFallback,  // fallback
-  }, {{
-    // string column_name = 1;
-    {::_pbi::TcParser::FastUS1,
-     {10, 63, 0, PROTOBUF_FIELD_OFFSET(Aggregation_AggregationRowKey, _impl_.column_name_)}},
-  }}, {{
-    65535, 65535
-  }}, {{
-    // string column_name = 1;
-    {PROTOBUF_FIELD_OFFSET(Aggregation_AggregationRowKey, _impl_.column_name_), 0, 0,
-    (0 | ::_fl::kFcSingular | ::_fl::kUtf8String | ::_fl::kRepAString)},
-  }},
-  // no aux_entries
-  {{
-    "\77\13\0\0\0\0\0\0"
-    "io.deephaven.proto.backplane.grpc.Aggregation.AggregationRowKey"
-    "column_name"
-  }},
-};
-
-::uint8_t* Aggregation_AggregationRowKey::_InternalSerialize(
-    ::uint8_t* target,
-    ::google::protobuf::io::EpsCopyOutputStream* stream) const {
-  // @@protoc_insertion_point(serialize_to_array_start:io.deephaven.proto.backplane.grpc.Aggregation.AggregationRowKey)
-  ::uint32_t cached_has_bits = 0;
-  (void)cached_has_bits;
-
-  // string column_name = 1;
-  if (!this->_internal_column_name().empty()) {
-    const std::string& _s = this->_internal_column_name();
-    ::google::protobuf::internal::WireFormatLite::VerifyUtf8String(
-        _s.data(), static_cast<int>(_s.length()), ::google::protobuf::internal::WireFormatLite::SERIALIZE, "io.deephaven.proto.backplane.grpc.Aggregation.AggregationRowKey.column_name");
-    target = stream->WriteStringMaybeAliased(1, _s, target);
-  }
-
-  if (PROTOBUF_PREDICT_FALSE(_internal_metadata_.have_unknown_fields())) {
-    target =
-        ::_pbi::WireFormat::InternalSerializeUnknownFieldsToArray(
-            _internal_metadata_.unknown_fields<::google::protobuf::UnknownFieldSet>(::google::protobuf::UnknownFieldSet::default_instance), target, stream);
-  }
-  // @@protoc_insertion_point(serialize_to_array_end:io.deephaven.proto.backplane.grpc.Aggregation.AggregationRowKey)
-  return target;
-}
-
-::size_t Aggregation_AggregationRowKey::ByteSizeLong() const {
-// @@protoc_insertion_point(message_byte_size_start:io.deephaven.proto.backplane.grpc.Aggregation.AggregationRowKey)
-  ::size_t total_size = 0;
-
-  ::uint32_t cached_has_bits = 0;
-  // Prevent compiler warnings about cached_has_bits being unused
-  (void) cached_has_bits;
-
-  // string column_name = 1;
-  if (!this->_internal_column_name().empty()) {
-    total_size += 1 + ::google::protobuf::internal::WireFormatLite::StringSize(
-                                    this->_internal_column_name());
-  }
-
-  return MaybeComputeUnknownFieldsSize(total_size, &_impl_._cached_size_);
-}
-
-const ::google::protobuf::Message::ClassData Aggregation_AggregationRowKey::_class_data_ = {
-    Aggregation_AggregationRowKey::MergeImpl,
-    nullptr,  // OnDemandRegisterArenaDtor
-};
-const ::google::protobuf::Message::ClassData* Aggregation_AggregationRowKey::GetClassData() const {
-  return &_class_data_;
-}
-
-void Aggregation_AggregationRowKey::MergeImpl(::google::protobuf::Message& to_msg, const ::google::protobuf::Message& from_msg) {
-  auto* const _this = static_cast<Aggregation_AggregationRowKey*>(&to_msg);
-  auto& from = static_cast<const Aggregation_AggregationRowKey&>(from_msg);
-  // @@protoc_insertion_point(class_specific_merge_from_start:io.deephaven.proto.backplane.grpc.Aggregation.AggregationRowKey)
-  ABSL_DCHECK_NE(&from, _this);
-  ::uint32_t cached_has_bits = 0;
-  (void) cached_has_bits;
-
-  if (!from._internal_column_name().empty()) {
-    _this->_internal_set_column_name(from._internal_column_name());
-  }
-  _this->_internal_metadata_.MergeFrom<::google::protobuf::UnknownFieldSet>(from._internal_metadata_);
-}
-
-void Aggregation_AggregationRowKey::CopyFrom(const Aggregation_AggregationRowKey& from) {
-// @@protoc_insertion_point(class_specific_copy_from_start:io.deephaven.proto.backplane.grpc.Aggregation.AggregationRowKey)
-  if (&from == this) return;
-  Clear();
-  MergeFrom(from);
-}
-
-PROTOBUF_NOINLINE bool Aggregation_AggregationRowKey::IsInitialized() const {
-  return true;
-}
-
-::_pbi::CachedSize* Aggregation_AggregationRowKey::AccessCachedSize() const {
-  return &_impl_._cached_size_;
-}
-void Aggregation_AggregationRowKey::InternalSwap(Aggregation_AggregationRowKey* PROTOBUF_RESTRICT other) {
-  using std::swap;
-  auto* arena = GetArena();
-  ABSL_DCHECK_EQ(arena, other->GetArena());
-  _internal_metadata_.InternalSwap(&other->_internal_metadata_);
-  ::_pbi::ArenaStringPtr::InternalSwap(&_impl_.column_name_, &other->_impl_.column_name_, arena);
-}
-
-::google::protobuf::Metadata Aggregation_AggregationRowKey::GetMetadata() const {
-  return ::_pbi::AssignDescriptors(
-      &descriptor_table_deephaven_2fproto_2ftable_2eproto_getter, &descriptor_table_deephaven_2fproto_2ftable_2eproto_once,
-      file_level_metadata_deephaven_2fproto_2ftable_2eproto[89]);
-}
-// ===================================================================
-
-class Aggregation_AggregationPartition::_Internal {
- public:
-};
-
-Aggregation_AggregationPartition::Aggregation_AggregationPartition(::google::protobuf::Arena* arena)
-    : ::google::protobuf::Message(arena) {
-  SharedCtor(arena);
-  // @@protoc_insertion_point(arena_constructor:io.deephaven.proto.backplane.grpc.Aggregation.AggregationPartition)
-}
-inline PROTOBUF_NDEBUG_INLINE Aggregation_AggregationPartition::Impl_::Impl_(
-    ::google::protobuf::internal::InternalVisibility visibility, ::google::protobuf::Arena* arena,
-    const Impl_& from)
-      : column_name_(arena, from.column_name_),
-        _cached_size_{0} {}
-
-Aggregation_AggregationPartition::Aggregation_AggregationPartition(
-    ::google::protobuf::Arena* arena,
-    const Aggregation_AggregationPartition& from)
-    : ::google::protobuf::Message(arena) {
-  Aggregation_AggregationPartition* const _this = this;
-  (void)_this;
-  _internal_metadata_.MergeFrom<::google::protobuf::UnknownFieldSet>(
-      from._internal_metadata_);
-  new (&_impl_) Impl_(internal_visibility(), arena, from._impl_);
-  _impl_.include_group_by_columns_ = from._impl_.include_group_by_columns_;
-
-  // @@protoc_insertion_point(copy_constructor:io.deephaven.proto.backplane.grpc.Aggregation.AggregationPartition)
-}
-inline PROTOBUF_NDEBUG_INLINE Aggregation_AggregationPartition::Impl_::Impl_(
-    ::google::protobuf::internal::InternalVisibility visibility,
-    ::google::protobuf::Arena* arena)
-      : column_name_(arena),
-        _cached_size_{0} {}
-
-inline void Aggregation_AggregationPartition::SharedCtor(::_pb::Arena* arena) {
-  new (&_impl_) Impl_(internal_visibility(), arena);
-  _impl_.include_group_by_columns_ = {};
-}
-Aggregation_AggregationPartition::~Aggregation_AggregationPartition() {
-  // @@protoc_insertion_point(destructor:io.deephaven.proto.backplane.grpc.Aggregation.AggregationPartition)
-  _internal_metadata_.Delete<::google::protobuf::UnknownFieldSet>();
-  SharedDtor();
-}
-inline void Aggregation_AggregationPartition::SharedDtor() {
-  ABSL_DCHECK(GetArena() == nullptr);
-  _impl_.column_name_.Destroy();
-  _impl_.~Impl_();
-}
-
-PROTOBUF_NOINLINE void Aggregation_AggregationPartition::Clear() {
-// @@protoc_insertion_point(message_clear_start:io.deephaven.proto.backplane.grpc.Aggregation.AggregationPartition)
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  ::uint32_t cached_has_bits = 0;
-  // Prevent compiler warnings about cached_has_bits being unused
-  (void) cached_has_bits;
-
-  _impl_.column_name_.ClearToEmpty();
-  _impl_.include_group_by_columns_ = false;
-  _internal_metadata_.Clear<::google::protobuf::UnknownFieldSet>();
-}
-
-const char* Aggregation_AggregationPartition::_InternalParse(
-    const char* ptr, ::_pbi::ParseContext* ctx) {
-  ptr = ::_pbi::TcParser::ParseLoop(this, ptr, ctx, &_table_.header);
-  return ptr;
-}
-
-
-PROTOBUF_CONSTINIT PROTOBUF_ATTRIBUTE_INIT_PRIORITY1
-const ::_pbi::TcParseTable<1, 2, 0, 86, 2> Aggregation_AggregationPartition::_table_ = {
-  {
-    0,  // no _has_bits_
-    0, // no _extensions_
-    2, 8,  // max_field_number, fast_idx_mask
-    offsetof(decltype(_table_), field_lookup_table),
-    4294967292,  // skipmap
-    offsetof(decltype(_table_), field_entries),
-    2,  // num_field_entries
-    0,  // num_aux_entries
-    offsetof(decltype(_table_), field_names),  // no aux_entries
-    &_Aggregation_AggregationPartition_default_instance_._instance,
-    ::_pbi::TcParser::GenericFallback,  // fallback
-  }, {{
-    // bool include_group_by_columns = 2;
-    {::_pbi::TcParser::SingularVarintNoZag1<bool, offsetof(Aggregation_AggregationPartition, _impl_.include_group_by_columns_), 63>(),
-     {16, 63, 0, PROTOBUF_FIELD_OFFSET(Aggregation_AggregationPartition, _impl_.include_group_by_columns_)}},
-    // string column_name = 1;
-    {::_pbi::TcParser::FastUS1,
-     {10, 63, 0, PROTOBUF_FIELD_OFFSET(Aggregation_AggregationPartition, _impl_.column_name_)}},
-  }}, {{
-    65535, 65535
-  }}, {{
-    // string column_name = 1;
-    {PROTOBUF_FIELD_OFFSET(Aggregation_AggregationPartition, _impl_.column_name_), 0, 0,
-    (0 | ::_fl::kFcSingular | ::_fl::kUtf8String | ::_fl::kRepAString)},
-    // bool include_group_by_columns = 2;
-    {PROTOBUF_FIELD_OFFSET(Aggregation_AggregationPartition, _impl_.include_group_by_columns_), 0, 0,
-    (0 | ::_fl::kFcSingular | ::_fl::kBool)},
-  }},
-  // no aux_entries
-  {{
-    "\102\13\0\0\0\0\0\0"
-    "io.deephaven.proto.backplane.grpc.Aggregation.AggregationPartition"
-    "column_name"
-  }},
-};
-
-::uint8_t* Aggregation_AggregationPartition::_InternalSerialize(
-    ::uint8_t* target,
-    ::google::protobuf::io::EpsCopyOutputStream* stream) const {
-  // @@protoc_insertion_point(serialize_to_array_start:io.deephaven.proto.backplane.grpc.Aggregation.AggregationPartition)
-  ::uint32_t cached_has_bits = 0;
-  (void)cached_has_bits;
-
-  // string column_name = 1;
-  if (!this->_internal_column_name().empty()) {
-    const std::string& _s = this->_internal_column_name();
-    ::google::protobuf::internal::WireFormatLite::VerifyUtf8String(
-        _s.data(), static_cast<int>(_s.length()), ::google::protobuf::internal::WireFormatLite::SERIALIZE, "io.deephaven.proto.backplane.grpc.Aggregation.AggregationPartition.column_name");
-    target = stream->WriteStringMaybeAliased(1, _s, target);
-  }
-
-  // bool include_group_by_columns = 2;
-  if (this->_internal_include_group_by_columns() != 0) {
-    target = stream->EnsureSpace(target);
-    target = ::_pbi::WireFormatLite::WriteBoolToArray(
-        2, this->_internal_include_group_by_columns(), target);
-  }
-
-  if (PROTOBUF_PREDICT_FALSE(_internal_metadata_.have_unknown_fields())) {
-    target =
-        ::_pbi::WireFormat::InternalSerializeUnknownFieldsToArray(
-            _internal_metadata_.unknown_fields<::google::protobuf::UnknownFieldSet>(::google::protobuf::UnknownFieldSet::default_instance), target, stream);
-  }
-  // @@protoc_insertion_point(serialize_to_array_end:io.deephaven.proto.backplane.grpc.Aggregation.AggregationPartition)
-  return target;
-}
-
-::size_t Aggregation_AggregationPartition::ByteSizeLong() const {
-// @@protoc_insertion_point(message_byte_size_start:io.deephaven.proto.backplane.grpc.Aggregation.AggregationPartition)
-  ::size_t total_size = 0;
-
-  ::uint32_t cached_has_bits = 0;
-  // Prevent compiler warnings about cached_has_bits being unused
-  (void) cached_has_bits;
-
-  // string column_name = 1;
-  if (!this->_internal_column_name().empty()) {
-    total_size += 1 + ::google::protobuf::internal::WireFormatLite::StringSize(
-                                    this->_internal_column_name());
-  }
-
-  // bool include_group_by_columns = 2;
-  if (this->_internal_include_group_by_columns() != 0) {
-    total_size += 2;
-  }
-
-  return MaybeComputeUnknownFieldsSize(total_size, &_impl_._cached_size_);
-}
-
-const ::google::protobuf::Message::ClassData Aggregation_AggregationPartition::_class_data_ = {
-    Aggregation_AggregationPartition::MergeImpl,
-    nullptr,  // OnDemandRegisterArenaDtor
-};
-const ::google::protobuf::Message::ClassData* Aggregation_AggregationPartition::GetClassData() const {
-  return &_class_data_;
-}
-
-void Aggregation_AggregationPartition::MergeImpl(::google::protobuf::Message& to_msg, const ::google::protobuf::Message& from_msg) {
-  auto* const _this = static_cast<Aggregation_AggregationPartition*>(&to_msg);
-  auto& from = static_cast<const Aggregation_AggregationPartition&>(from_msg);
-  // @@protoc_insertion_point(class_specific_merge_from_start:io.deephaven.proto.backplane.grpc.Aggregation.AggregationPartition)
-  ABSL_DCHECK_NE(&from, _this);
-  ::uint32_t cached_has_bits = 0;
-  (void) cached_has_bits;
-
-  if (!from._internal_column_name().empty()) {
-    _this->_internal_set_column_name(from._internal_column_name());
-  }
-  if (from._internal_include_group_by_columns() != 0) {
-    _this->_internal_set_include_group_by_columns(from._internal_include_group_by_columns());
-  }
-  _this->_internal_metadata_.MergeFrom<::google::protobuf::UnknownFieldSet>(from._internal_metadata_);
-}
-
-void Aggregation_AggregationPartition::CopyFrom(const Aggregation_AggregationPartition& from) {
-// @@protoc_insertion_point(class_specific_copy_from_start:io.deephaven.proto.backplane.grpc.Aggregation.AggregationPartition)
-  if (&from == this) return;
-  Clear();
-  MergeFrom(from);
-}
-
-PROTOBUF_NOINLINE bool Aggregation_AggregationPartition::IsInitialized() const {
-  return true;
-}
-
-::_pbi::CachedSize* Aggregation_AggregationPartition::AccessCachedSize() const {
-  return &_impl_._cached_size_;
-}
-void Aggregation_AggregationPartition::InternalSwap(Aggregation_AggregationPartition* PROTOBUF_RESTRICT other) {
-  using std::swap;
-  auto* arena = GetArena();
-  ABSL_DCHECK_EQ(arena, other->GetArena());
-  _internal_metadata_.InternalSwap(&other->_internal_metadata_);
-  ::_pbi::ArenaStringPtr::InternalSwap(&_impl_.column_name_, &other->_impl_.column_name_, arena);
-        swap(_impl_.include_group_by_columns_, other->_impl_.include_group_by_columns_);
-}
-
-::google::protobuf::Metadata Aggregation_AggregationPartition::GetMetadata() const {
-  return ::_pbi::AssignDescriptors(
-      &descriptor_table_deephaven_2fproto_2ftable_2eproto_getter, &descriptor_table_deephaven_2fproto_2ftable_2eproto_once,
-      file_level_metadata_deephaven_2fproto_2ftable_2eproto[90]);
-}
-// ===================================================================
-
-class Aggregation::_Internal {
- public:
-  static constexpr ::int32_t kOneofCaseOffset =
-    PROTOBUF_FIELD_OFFSET(::io::deephaven::proto::backplane::grpc::Aggregation, _impl_._oneof_case_);
-  static const ::io::deephaven::proto::backplane::grpc::Aggregation_AggregationColumns& columns(const Aggregation* msg);
-  static const ::io::deephaven::proto::backplane::grpc::Aggregation_AggregationCount& count(const Aggregation* msg);
-  static const ::io::deephaven::proto::backplane::grpc::Aggregation_AggregationRowKey& first_row_key(const Aggregation* msg);
-  static const ::io::deephaven::proto::backplane::grpc::Aggregation_AggregationRowKey& last_row_key(const Aggregation* msg);
-  static const ::io::deephaven::proto::backplane::grpc::Aggregation_AggregationPartition& partition(const Aggregation* msg);
-};
-
-const ::io::deephaven::proto::backplane::grpc::Aggregation_AggregationColumns& Aggregation::_Internal::columns(const Aggregation* msg) {
-  return *msg->_impl_.type_.columns_;
-}
-const ::io::deephaven::proto::backplane::grpc::Aggregation_AggregationCount& Aggregation::_Internal::count(const Aggregation* msg) {
-  return *msg->_impl_.type_.count_;
-}
-const ::io::deephaven::proto::backplane::grpc::Aggregation_AggregationRowKey& Aggregation::_Internal::first_row_key(const Aggregation* msg) {
-  return *msg->_impl_.type_.first_row_key_;
-}
-const ::io::deephaven::proto::backplane::grpc::Aggregation_AggregationRowKey& Aggregation::_Internal::last_row_key(const Aggregation* msg) {
-  return *msg->_impl_.type_.last_row_key_;
-}
-const ::io::deephaven::proto::backplane::grpc::Aggregation_AggregationPartition& Aggregation::_Internal::partition(const Aggregation* msg) {
-  return *msg->_impl_.type_.partition_;
-}
-void Aggregation::set_allocated_columns(::io::deephaven::proto::backplane::grpc::Aggregation_AggregationColumns* columns) {
-  ::google::protobuf::Arena* message_arena = GetArena();
-  clear_type();
-  if (columns) {
-    ::google::protobuf::Arena* submessage_arena = columns->GetArena();
-    if (message_arena != submessage_arena) {
-      columns = ::google::protobuf::internal::GetOwnedMessage(message_arena, columns, submessage_arena);
-    }
-    set_has_columns();
-    _impl_.type_.columns_ = columns;
-  }
-  // @@protoc_insertion_point(field_set_allocated:io.deephaven.proto.backplane.grpc.Aggregation.columns)
-}
-void Aggregation::set_allocated_count(::io::deephaven::proto::backplane::grpc::Aggregation_AggregationCount* count) {
-  ::google::protobuf::Arena* message_arena = GetArena();
-  clear_type();
-  if (count) {
-    ::google::protobuf::Arena* submessage_arena = count->GetArena();
-    if (message_arena != submessage_arena) {
-      count = ::google::protobuf::internal::GetOwnedMessage(message_arena, count, submessage_arena);
-    }
-    set_has_count();
-    _impl_.type_.count_ = count;
-  }
-  // @@protoc_insertion_point(field_set_allocated:io.deephaven.proto.backplane.grpc.Aggregation.count)
-}
-void Aggregation::set_allocated_first_row_key(::io::deephaven::proto::backplane::grpc::Aggregation_AggregationRowKey* first_row_key) {
-  ::google::protobuf::Arena* message_arena = GetArena();
-  clear_type();
-  if (first_row_key) {
-    ::google::protobuf::Arena* submessage_arena = first_row_key->GetArena();
-    if (message_arena != submessage_arena) {
-      first_row_key = ::google::protobuf::internal::GetOwnedMessage(message_arena, first_row_key, submessage_arena);
-    }
-    set_has_first_row_key();
-    _impl_.type_.first_row_key_ = first_row_key;
-  }
-  // @@protoc_insertion_point(field_set_allocated:io.deephaven.proto.backplane.grpc.Aggregation.first_row_key)
-}
-void Aggregation::set_allocated_last_row_key(::io::deephaven::proto::backplane::grpc::Aggregation_AggregationRowKey* last_row_key) {
-  ::google::protobuf::Arena* message_arena = GetArena();
-  clear_type();
-  if (last_row_key) {
-    ::google::protobuf::Arena* submessage_arena = last_row_key->GetArena();
-    if (message_arena != submessage_arena) {
-      last_row_key = ::google::protobuf::internal::GetOwnedMessage(message_arena, last_row_key, submessage_arena);
-    }
-    set_has_last_row_key();
-    _impl_.type_.last_row_key_ = last_row_key;
-  }
-  // @@protoc_insertion_point(field_set_allocated:io.deephaven.proto.backplane.grpc.Aggregation.last_row_key)
-}
-void Aggregation::set_allocated_partition(::io::deephaven::proto::backplane::grpc::Aggregation_AggregationPartition* partition) {
-  ::google::protobuf::Arena* message_arena = GetArena();
-  clear_type();
-  if (partition) {
-    ::google::protobuf::Arena* submessage_arena = partition->GetArena();
-    if (message_arena != submessage_arena) {
-      partition = ::google::protobuf::internal::GetOwnedMessage(message_arena, partition, submessage_arena);
-    }
-    set_has_partition();
-    _impl_.type_.partition_ = partition;
-  }
-  // @@protoc_insertion_point(field_set_allocated:io.deephaven.proto.backplane.grpc.Aggregation.partition)
-}
-Aggregation::Aggregation(::google::protobuf::Arena* arena)
-    : ::google::protobuf::Message(arena) {
-  SharedCtor(arena);
-  // @@protoc_insertion_point(arena_constructor:io.deephaven.proto.backplane.grpc.Aggregation)
-}
-inline PROTOBUF_NDEBUG_INLINE Aggregation::Impl_::Impl_(
-    ::google::protobuf::internal::InternalVisibility visibility, ::google::protobuf::Arena* arena,
-    const Impl_& from)
-      : type_{},
-        _cached_size_{0},
-        _oneof_case_{from._oneof_case_[0]} {}
-
-Aggregation::Aggregation(
-    ::google::protobuf::Arena* arena,
-    const Aggregation& from)
-    : ::google::protobuf::Message(arena) {
-  Aggregation* const _this = this;
-  (void)_this;
-  _internal_metadata_.MergeFrom<::google::protobuf::UnknownFieldSet>(
-      from._internal_metadata_);
-  new (&_impl_) Impl_(internal_visibility(), arena, from._impl_);
-  switch (type_case()) {
-    case TYPE_NOT_SET:
-      break;
-      case kColumns:
-        _impl_.type_.columns_ = CreateMaybeMessage<::io::deephaven::proto::backplane::grpc::Aggregation_AggregationColumns>(arena, *from._impl_.type_.columns_);
-        break;
-      case kCount:
-        _impl_.type_.count_ = CreateMaybeMessage<::io::deephaven::proto::backplane::grpc::Aggregation_AggregationCount>(arena, *from._impl_.type_.count_);
-        break;
-      case kFirstRowKey:
-        _impl_.type_.first_row_key_ = CreateMaybeMessage<::io::deephaven::proto::backplane::grpc::Aggregation_AggregationRowKey>(arena, *from._impl_.type_.first_row_key_);
-        break;
-      case kLastRowKey:
-        _impl_.type_.last_row_key_ = CreateMaybeMessage<::io::deephaven::proto::backplane::grpc::Aggregation_AggregationRowKey>(arena, *from._impl_.type_.last_row_key_);
-        break;
-      case kPartition:
-        _impl_.type_.partition_ = CreateMaybeMessage<::io::deephaven::proto::backplane::grpc::Aggregation_AggregationPartition>(arena, *from._impl_.type_.partition_);
-        break;
-  }
-
-  // @@protoc_insertion_point(copy_constructor:io.deephaven.proto.backplane.grpc.Aggregation)
-}
-inline PROTOBUF_NDEBUG_INLINE Aggregation::Impl_::Impl_(
-    ::google::protobuf::internal::InternalVisibility visibility,
-    ::google::protobuf::Arena* arena)
-      : type_{},
-        _cached_size_{0},
-        _oneof_case_{} {}
-
-inline void Aggregation::SharedCtor(::_pb::Arena* arena) {
-  new (&_impl_) Impl_(internal_visibility(), arena);
-}
-Aggregation::~Aggregation() {
-  // @@protoc_insertion_point(destructor:io.deephaven.proto.backplane.grpc.Aggregation)
-  _internal_metadata_.Delete<::google::protobuf::UnknownFieldSet>();
-  SharedDtor();
-}
-inline void Aggregation::SharedDtor() {
-  ABSL_DCHECK(GetArena() == nullptr);
-  if (has_type()) {
-    clear_type();
-  }
-  _impl_.~Impl_();
-}
-
-void Aggregation::clear_type() {
-// @@protoc_insertion_point(one_of_clear_start:io.deephaven.proto.backplane.grpc.Aggregation)
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  switch (type_case()) {
-    case kColumns: {
-      if (GetArena() == nullptr) {
-        delete _impl_.type_.columns_;
-      }
-      break;
-    }
-    case kCount: {
-      if (GetArena() == nullptr) {
-        delete _impl_.type_.count_;
-      }
-      break;
-    }
-    case kFirstRowKey: {
-      if (GetArena() == nullptr) {
-        delete _impl_.type_.first_row_key_;
-      }
-      break;
-    }
-    case kLastRowKey: {
-      if (GetArena() == nullptr) {
-        delete _impl_.type_.last_row_key_;
-      }
-      break;
-    }
-    case kPartition: {
-      if (GetArena() == nullptr) {
-        delete _impl_.type_.partition_;
-      }
-      break;
-    }
-    case TYPE_NOT_SET: {
-      break;
-    }
-  }
-  _impl_._oneof_case_[0] = TYPE_NOT_SET;
-}
-
-
-PROTOBUF_NOINLINE void Aggregation::Clear() {
-// @@protoc_insertion_point(message_clear_start:io.deephaven.proto.backplane.grpc.Aggregation)
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  ::uint32_t cached_has_bits = 0;
-  // Prevent compiler warnings about cached_has_bits being unused
-  (void) cached_has_bits;
-
-  clear_type();
-  _internal_metadata_.Clear<::google::protobuf::UnknownFieldSet>();
-}
-
-const char* Aggregation::_InternalParse(
-    const char* ptr, ::_pbi::ParseContext* ctx) {
-  ptr = ::_pbi::TcParser::ParseLoop(this, ptr, ctx, &_table_.header);
-  return ptr;
-}
-
-
-PROTOBUF_CONSTINIT PROTOBUF_ATTRIBUTE_INIT_PRIORITY1
-const ::_pbi::TcParseTable<0, 5, 5, 0, 2> Aggregation::_table_ = {
-  {
-    0,  // no _has_bits_
-    0, // no _extensions_
-    5, 0,  // max_field_number, fast_idx_mask
-    offsetof(decltype(_table_), field_lookup_table),
-    4294967264,  // skipmap
-    offsetof(decltype(_table_), field_entries),
-    5,  // num_field_entries
-    5,  // num_aux_entries
-    offsetof(decltype(_table_), aux_entries),
-    &_Aggregation_default_instance_._instance,
-    ::_pbi::TcParser::GenericFallback,  // fallback
-  }, {{
-    {::_pbi::TcParser::MiniParse, {}},
-  }}, {{
-    65535, 65535
-  }}, {{
-    // .io.deephaven.proto.backplane.grpc.Aggregation.AggregationColumns columns = 1;
-    {PROTOBUF_FIELD_OFFSET(Aggregation, _impl_.type_.columns_), _Internal::kOneofCaseOffset + 0, 0,
-    (0 | ::_fl::kFcOneof | ::_fl::kMessage | ::_fl::kTvTable)},
-    // .io.deephaven.proto.backplane.grpc.Aggregation.AggregationCount count = 2;
-    {PROTOBUF_FIELD_OFFSET(Aggregation, _impl_.type_.count_), _Internal::kOneofCaseOffset + 0, 1,
-    (0 | ::_fl::kFcOneof | ::_fl::kMessage | ::_fl::kTvTable)},
-    // .io.deephaven.proto.backplane.grpc.Aggregation.AggregationRowKey first_row_key = 3;
-    {PROTOBUF_FIELD_OFFSET(Aggregation, _impl_.type_.first_row_key_), _Internal::kOneofCaseOffset + 0, 2,
-    (0 | ::_fl::kFcOneof | ::_fl::kMessage | ::_fl::kTvTable)},
-    // .io.deephaven.proto.backplane.grpc.Aggregation.AggregationRowKey last_row_key = 4;
-    {PROTOBUF_FIELD_OFFSET(Aggregation, _impl_.type_.last_row_key_), _Internal::kOneofCaseOffset + 0, 3,
-    (0 | ::_fl::kFcOneof | ::_fl::kMessage | ::_fl::kTvTable)},
-    // .io.deephaven.proto.backplane.grpc.Aggregation.AggregationPartition partition = 5;
-    {PROTOBUF_FIELD_OFFSET(Aggregation, _impl_.type_.partition_), _Internal::kOneofCaseOffset + 0, 4,
-    (0 | ::_fl::kFcOneof | ::_fl::kMessage | ::_fl::kTvTable)},
-  }}, {{
-    {::_pbi::TcParser::GetTable<::io::deephaven::proto::backplane::grpc::Aggregation_AggregationColumns>()},
-    {::_pbi::TcParser::GetTable<::io::deephaven::proto::backplane::grpc::Aggregation_AggregationCount>()},
-    {::_pbi::TcParser::GetTable<::io::deephaven::proto::backplane::grpc::Aggregation_AggregationRowKey>()},
-    {::_pbi::TcParser::GetTable<::io::deephaven::proto::backplane::grpc::Aggregation_AggregationRowKey>()},
-    {::_pbi::TcParser::GetTable<::io::deephaven::proto::backplane::grpc::Aggregation_AggregationPartition>()},
-  }}, {{
-  }},
-};
-
-::uint8_t* Aggregation::_InternalSerialize(
-    ::uint8_t* target,
-    ::google::protobuf::io::EpsCopyOutputStream* stream) const {
-  // @@protoc_insertion_point(serialize_to_array_start:io.deephaven.proto.backplane.grpc.Aggregation)
-  ::uint32_t cached_has_bits = 0;
-  (void)cached_has_bits;
-
-  switch (type_case()) {
-    case kColumns: {
-      target = ::google::protobuf::internal::WireFormatLite::InternalWriteMessage(
-          1, _Internal::columns(this),
-          _Internal::columns(this).GetCachedSize(), target, stream);
-      break;
-    }
-    case kCount: {
-      target = ::google::protobuf::internal::WireFormatLite::InternalWriteMessage(
-          2, _Internal::count(this),
-          _Internal::count(this).GetCachedSize(), target, stream);
-      break;
-    }
-    case kFirstRowKey: {
-      target = ::google::protobuf::internal::WireFormatLite::InternalWriteMessage(
-          3, _Internal::first_row_key(this),
-          _Internal::first_row_key(this).GetCachedSize(), target, stream);
-      break;
-    }
-    case kLastRowKey: {
-      target = ::google::protobuf::internal::WireFormatLite::InternalWriteMessage(
-          4, _Internal::last_row_key(this),
-          _Internal::last_row_key(this).GetCachedSize(), target, stream);
-      break;
-    }
-    case kPartition: {
-      target = ::google::protobuf::internal::WireFormatLite::InternalWriteMessage(
-          5, _Internal::partition(this),
-          _Internal::partition(this).GetCachedSize(), target, stream);
-      break;
-    }
-    default:
-      break;
-  }
-  if (PROTOBUF_PREDICT_FALSE(_internal_metadata_.have_unknown_fields())) {
-    target =
-        ::_pbi::WireFormat::InternalSerializeUnknownFieldsToArray(
-            _internal_metadata_.unknown_fields<::google::protobuf::UnknownFieldSet>(::google::protobuf::UnknownFieldSet::default_instance), target, stream);
-  }
-  // @@protoc_insertion_point(serialize_to_array_end:io.deephaven.proto.backplane.grpc.Aggregation)
-  return target;
-}
-
-::size_t Aggregation::ByteSizeLong() const {
-// @@protoc_insertion_point(message_byte_size_start:io.deephaven.proto.backplane.grpc.Aggregation)
-  ::size_t total_size = 0;
-
-  ::uint32_t cached_has_bits = 0;
-  // Prevent compiler warnings about cached_has_bits being unused
-  (void) cached_has_bits;
-
-  switch (type_case()) {
-    // .io.deephaven.proto.backplane.grpc.Aggregation.AggregationColumns columns = 1;
-    case kColumns: {
-      total_size +=
-          1 + ::google::protobuf::internal::WireFormatLite::MessageSize(*_impl_.type_.columns_);
-      break;
-    }
-    // .io.deephaven.proto.backplane.grpc.Aggregation.AggregationCount count = 2;
-    case kCount: {
-      total_size +=
-          1 + ::google::protobuf::internal::WireFormatLite::MessageSize(*_impl_.type_.count_);
-      break;
-    }
-    // .io.deephaven.proto.backplane.grpc.Aggregation.AggregationRowKey first_row_key = 3;
-    case kFirstRowKey: {
-      total_size +=
-          1 + ::google::protobuf::internal::WireFormatLite::MessageSize(*_impl_.type_.first_row_key_);
-      break;
-    }
-    // .io.deephaven.proto.backplane.grpc.Aggregation.AggregationRowKey last_row_key = 4;
-    case kLastRowKey: {
-      total_size +=
-          1 + ::google::protobuf::internal::WireFormatLite::MessageSize(*_impl_.type_.last_row_key_);
-      break;
-    }
-    // .io.deephaven.proto.backplane.grpc.Aggregation.AggregationPartition partition = 5;
-    case kPartition: {
-      total_size +=
-          1 + ::google::protobuf::internal::WireFormatLite::MessageSize(*_impl_.type_.partition_);
-      break;
-    }
-    case TYPE_NOT_SET: {
-      break;
-    }
-  }
-  return MaybeComputeUnknownFieldsSize(total_size, &_impl_._cached_size_);
-}
-
-const ::google::protobuf::Message::ClassData Aggregation::_class_data_ = {
-    Aggregation::MergeImpl,
-    nullptr,  // OnDemandRegisterArenaDtor
-};
-const ::google::protobuf::Message::ClassData* Aggregation::GetClassData() const {
-  return &_class_data_;
-}
-
-void Aggregation::MergeImpl(::google::protobuf::Message& to_msg, const ::google::protobuf::Message& from_msg) {
-  auto* const _this = static_cast<Aggregation*>(&to_msg);
-  auto& from = static_cast<const Aggregation&>(from_msg);
-  // @@protoc_insertion_point(class_specific_merge_from_start:io.deephaven.proto.backplane.grpc.Aggregation)
-  ABSL_DCHECK_NE(&from, _this);
-  ::uint32_t cached_has_bits = 0;
-  (void) cached_has_bits;
-
-  switch (from.type_case()) {
-    case kColumns: {
-      _this->_internal_mutable_columns()->::io::deephaven::proto::backplane::grpc::Aggregation_AggregationColumns::MergeFrom(
-          from._internal_columns());
-      break;
-    }
-    case kCount: {
-      _this->_internal_mutable_count()->::io::deephaven::proto::backplane::grpc::Aggregation_AggregationCount::MergeFrom(
-          from._internal_count());
-      break;
-    }
-    case kFirstRowKey: {
-      _this->_internal_mutable_first_row_key()->::io::deephaven::proto::backplane::grpc::Aggregation_AggregationRowKey::MergeFrom(
-          from._internal_first_row_key());
-      break;
-    }
-    case kLastRowKey: {
-      _this->_internal_mutable_last_row_key()->::io::deephaven::proto::backplane::grpc::Aggregation_AggregationRowKey::MergeFrom(
-          from._internal_last_row_key());
-      break;
-    }
-    case kPartition: {
-      _this->_internal_mutable_partition()->::io::deephaven::proto::backplane::grpc::Aggregation_AggregationPartition::MergeFrom(
-          from._internal_partition());
-      break;
-    }
-    case TYPE_NOT_SET: {
-      break;
-    }
-  }
-  _this->_internal_metadata_.MergeFrom<::google::protobuf::UnknownFieldSet>(from._internal_metadata_);
-}
-
-void Aggregation::CopyFrom(const Aggregation& from) {
-// @@protoc_insertion_point(class_specific_copy_from_start:io.deephaven.proto.backplane.grpc.Aggregation)
-  if (&from == this) return;
-  Clear();
-  MergeFrom(from);
-}
-
-PROTOBUF_NOINLINE bool Aggregation::IsInitialized() const {
-  return true;
-}
-
-::_pbi::CachedSize* Aggregation::AccessCachedSize() const {
-  return &_impl_._cached_size_;
-}
-void Aggregation::InternalSwap(Aggregation* PROTOBUF_RESTRICT other) {
-  using std::swap;
-  _internal_metadata_.InternalSwap(&other->_internal_metadata_);
-  swap(_impl_.type_, other->_impl_.type_);
-  swap(_impl_._oneof_case_[0], other->_impl_._oneof_case_[0]);
-}
-
-::google::protobuf::Metadata Aggregation::GetMetadata() const {
-  return ::_pbi::AssignDescriptors(
-      &descriptor_table_deephaven_2fproto_2ftable_2eproto_getter, &descriptor_table_deephaven_2fproto_2ftable_2eproto_once,
-      file_level_metadata_deephaven_2fproto_2ftable_2eproto[91]);
-}
-// ===================================================================
-
-class SortDescriptor::_Internal {
- public:
-};
-
-SortDescriptor::SortDescriptor(::google::protobuf::Arena* arena)
-    : ::google::protobuf::Message(arena) {
-  SharedCtor(arena);
-  // @@protoc_insertion_point(arena_constructor:io.deephaven.proto.backplane.grpc.SortDescriptor)
-}
-inline PROTOBUF_NDEBUG_INLINE SortDescriptor::Impl_::Impl_(
-    ::google::protobuf::internal::InternalVisibility visibility, ::google::protobuf::Arena* arena,
-    const Impl_& from)
-      : column_name_(arena, from.column_name_),
-        _cached_size_{0} {}
-
-SortDescriptor::SortDescriptor(
-    ::google::protobuf::Arena* arena,
-    const SortDescriptor& from)
-    : ::google::protobuf::Message(arena) {
-  SortDescriptor* const _this = this;
-  (void)_this;
-  _internal_metadata_.MergeFrom<::google::protobuf::UnknownFieldSet>(
-      from._internal_metadata_);
-  new (&_impl_) Impl_(internal_visibility(), arena, from._impl_);
-  ::memcpy(reinterpret_cast<char *>(&_impl_) +
-               offsetof(Impl_, is_absolute_),
-           reinterpret_cast<const char *>(&from._impl_) +
-               offsetof(Impl_, is_absolute_),
-           offsetof(Impl_, direction_) -
-               offsetof(Impl_, is_absolute_) +
-               sizeof(Impl_::direction_));
-
-  // @@protoc_insertion_point(copy_constructor:io.deephaven.proto.backplane.grpc.SortDescriptor)
-}
-inline PROTOBUF_NDEBUG_INLINE SortDescriptor::Impl_::Impl_(
-    ::google::protobuf::internal::InternalVisibility visibility,
-    ::google::protobuf::Arena* arena)
-      : column_name_(arena),
-        _cached_size_{0} {}
-
-inline void SortDescriptor::SharedCtor(::_pb::Arena* arena) {
-  new (&_impl_) Impl_(internal_visibility(), arena);
-  ::memset(reinterpret_cast<char *>(&_impl_) +
-               offsetof(Impl_, is_absolute_),
-           0,
-           offsetof(Impl_, direction_) -
-               offsetof(Impl_, is_absolute_) +
-               sizeof(Impl_::direction_));
-}
-SortDescriptor::~SortDescriptor() {
-  // @@protoc_insertion_point(destructor:io.deephaven.proto.backplane.grpc.SortDescriptor)
-  _internal_metadata_.Delete<::google::protobuf::UnknownFieldSet>();
-  SharedDtor();
-}
-inline void SortDescriptor::SharedDtor() {
-  ABSL_DCHECK(GetArena() == nullptr);
-  _impl_.column_name_.Destroy();
-  _impl_.~Impl_();
-}
-
-PROTOBUF_NOINLINE void SortDescriptor::Clear() {
-// @@protoc_insertion_point(message_clear_start:io.deephaven.proto.backplane.grpc.SortDescriptor)
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  ::uint32_t cached_has_bits = 0;
-  // Prevent compiler warnings about cached_has_bits being unused
-  (void) cached_has_bits;
-
-  _impl_.column_name_.ClearToEmpty();
-  ::memset(&_impl_.is_absolute_, 0, static_cast<::size_t>(
-      reinterpret_cast<char*>(&_impl_.direction_) -
-      reinterpret_cast<char*>(&_impl_.is_absolute_)) + sizeof(_impl_.direction_));
-  _internal_metadata_.Clear<::google::protobuf::UnknownFieldSet>();
-}
-
-const char* SortDescriptor::_InternalParse(
-    const char* ptr, ::_pbi::ParseContext* ctx) {
-  ptr = ::_pbi::TcParser::ParseLoop(this, ptr, ctx, &_table_.header);
-  return ptr;
-}
-
-
-PROTOBUF_CONSTINIT PROTOBUF_ATTRIBUTE_INIT_PRIORITY1
-const ::_pbi::TcParseTable<2, 3, 0, 68, 2> SortDescriptor::_table_ = {
-  {
-    0,  // no _has_bits_
-    0, // no _extensions_
-    3, 24,  // max_field_number, fast_idx_mask
-    offsetof(decltype(_table_), field_lookup_table),
-    4294967288,  // skipmap
-    offsetof(decltype(_table_), field_entries),
-    3,  // num_field_entries
-    0,  // num_aux_entries
-    offsetof(decltype(_table_), field_names),  // no aux_entries
-    &_SortDescriptor_default_instance_._instance,
-    ::_pbi::TcParser::GenericFallback,  // fallback
-  }, {{
-    {::_pbi::TcParser::MiniParse, {}},
-    // string column_name = 1;
-    {::_pbi::TcParser::FastUS1,
-     {10, 63, 0, PROTOBUF_FIELD_OFFSET(SortDescriptor, _impl_.column_name_)}},
-    // bool is_absolute = 2;
-    {::_pbi::TcParser::SingularVarintNoZag1<bool, offsetof(SortDescriptor, _impl_.is_absolute_), 63>(),
-     {16, 63, 0, PROTOBUF_FIELD_OFFSET(SortDescriptor, _impl_.is_absolute_)}},
-    // .io.deephaven.proto.backplane.grpc.SortDescriptor.SortDirection direction = 3;
-    {::_pbi::TcParser::SingularVarintNoZag1<::uint32_t, offsetof(SortDescriptor, _impl_.direction_), 63>(),
-     {24, 63, 0, PROTOBUF_FIELD_OFFSET(SortDescriptor, _impl_.direction_)}},
-  }}, {{
-    65535, 65535
-  }}, {{
-    // string column_name = 1;
-    {PROTOBUF_FIELD_OFFSET(SortDescriptor, _impl_.column_name_), 0, 0,
-    (0 | ::_fl::kFcSingular | ::_fl::kUtf8String | ::_fl::kRepAString)},
-    // bool is_absolute = 2;
-    {PROTOBUF_FIELD_OFFSET(SortDescriptor, _impl_.is_absolute_), 0, 0,
-    (0 | ::_fl::kFcSingular | ::_fl::kBool)},
-    // .io.deephaven.proto.backplane.grpc.SortDescriptor.SortDirection direction = 3;
-    {PROTOBUF_FIELD_OFFSET(SortDescriptor, _impl_.direction_), 0, 0,
-    (0 | ::_fl::kFcSingular | ::_fl::kOpenEnum)},
-  }},
-  // no aux_entries
-  {{
-    "\60\13\0\0\0\0\0\0"
-    "io.deephaven.proto.backplane.grpc.SortDescriptor"
-    "column_name"
-  }},
-};
-
-::uint8_t* SortDescriptor::_InternalSerialize(
-    ::uint8_t* target,
-    ::google::protobuf::io::EpsCopyOutputStream* stream) const {
-  // @@protoc_insertion_point(serialize_to_array_start:io.deephaven.proto.backplane.grpc.SortDescriptor)
-  ::uint32_t cached_has_bits = 0;
-  (void)cached_has_bits;
-
-  // string column_name = 1;
-  if (!this->_internal_column_name().empty()) {
-    const std::string& _s = this->_internal_column_name();
-    ::google::protobuf::internal::WireFormatLite::VerifyUtf8String(
-        _s.data(), static_cast<int>(_s.length()), ::google::protobuf::internal::WireFormatLite::SERIALIZE, "io.deephaven.proto.backplane.grpc.SortDescriptor.column_name");
-    target = stream->WriteStringMaybeAliased(1, _s, target);
-  }
-
-  // bool is_absolute = 2;
-  if (this->_internal_is_absolute() != 0) {
-    target = stream->EnsureSpace(target);
-    target = ::_pbi::WireFormatLite::WriteBoolToArray(
-        2, this->_internal_is_absolute(), target);
-  }
-
-  // .io.deephaven.proto.backplane.grpc.SortDescriptor.SortDirection direction = 3;
-  if (this->_internal_direction() != 0) {
-    target = stream->EnsureSpace(target);
-    target = ::_pbi::WireFormatLite::WriteEnumToArray(
-        3, this->_internal_direction(), target);
-  }
-
-  if (PROTOBUF_PREDICT_FALSE(_internal_metadata_.have_unknown_fields())) {
-    target =
-        ::_pbi::WireFormat::InternalSerializeUnknownFieldsToArray(
-            _internal_metadata_.unknown_fields<::google::protobuf::UnknownFieldSet>(::google::protobuf::UnknownFieldSet::default_instance), target, stream);
-  }
-  // @@protoc_insertion_point(serialize_to_array_end:io.deephaven.proto.backplane.grpc.SortDescriptor)
-  return target;
-}
-
-::size_t SortDescriptor::ByteSizeLong() const {
-// @@protoc_insertion_point(message_byte_size_start:io.deephaven.proto.backplane.grpc.SortDescriptor)
-  ::size_t total_size = 0;
-
-  ::uint32_t cached_has_bits = 0;
-  // Prevent compiler warnings about cached_has_bits being unused
-  (void) cached_has_bits;
-
-  // string column_name = 1;
-  if (!this->_internal_column_name().empty()) {
-    total_size += 1 + ::google::protobuf::internal::WireFormatLite::StringSize(
-                                    this->_internal_column_name());
-  }
-
-  // bool is_absolute = 2;
-  if (this->_internal_is_absolute() != 0) {
-    total_size += 2;
-  }
-
-  // .io.deephaven.proto.backplane.grpc.SortDescriptor.SortDirection direction = 3;
-  if (this->_internal_direction() != 0) {
-    total_size += 1 +
-                  ::_pbi::WireFormatLite::EnumSize(this->_internal_direction());
-  }
-
-  return MaybeComputeUnknownFieldsSize(total_size, &_impl_._cached_size_);
-}
-
-const ::google::protobuf::Message::ClassData SortDescriptor::_class_data_ = {
-    SortDescriptor::MergeImpl,
-    nullptr,  // OnDemandRegisterArenaDtor
-};
-const ::google::protobuf::Message::ClassData* SortDescriptor::GetClassData() const {
-  return &_class_data_;
-}
-
-void SortDescriptor::MergeImpl(::google::protobuf::Message& to_msg, const ::google::protobuf::Message& from_msg) {
-  auto* const _this = static_cast<SortDescriptor*>(&to_msg);
-  auto& from = static_cast<const SortDescriptor&>(from_msg);
-  // @@protoc_insertion_point(class_specific_merge_from_start:io.deephaven.proto.backplane.grpc.SortDescriptor)
-  ABSL_DCHECK_NE(&from, _this);
-  ::uint32_t cached_has_bits = 0;
-  (void) cached_has_bits;
-
-  if (!from._internal_column_name().empty()) {
-    _this->_internal_set_column_name(from._internal_column_name());
-  }
-  if (from._internal_is_absolute() != 0) {
-    _this->_internal_set_is_absolute(from._internal_is_absolute());
-  }
-  if (from._internal_direction() != 0) {
-    _this->_internal_set_direction(from._internal_direction());
-  }
-  _this->_internal_metadata_.MergeFrom<::google::protobuf::UnknownFieldSet>(from._internal_metadata_);
-}
-
-void SortDescriptor::CopyFrom(const SortDescriptor& from) {
-// @@protoc_insertion_point(class_specific_copy_from_start:io.deephaven.proto.backplane.grpc.SortDescriptor)
-  if (&from == this) return;
-  Clear();
-  MergeFrom(from);
-}
-
-PROTOBUF_NOINLINE bool SortDescriptor::IsInitialized() const {
-  return true;
-}
-
-::_pbi::CachedSize* SortDescriptor::AccessCachedSize() const {
-  return &_impl_._cached_size_;
-}
-void SortDescriptor::InternalSwap(SortDescriptor* PROTOBUF_RESTRICT other) {
-  using std::swap;
-  auto* arena = GetArena();
-  ABSL_DCHECK_EQ(arena, other->GetArena());
-  _internal_metadata_.InternalSwap(&other->_internal_metadata_);
-  ::_pbi::ArenaStringPtr::InternalSwap(&_impl_.column_name_, &other->_impl_.column_name_, arena);
-  ::google::protobuf::internal::memswap<
-      PROTOBUF_FIELD_OFFSET(SortDescriptor, _impl_.direction_)
-      + sizeof(SortDescriptor::_impl_.direction_)
-      - PROTOBUF_FIELD_OFFSET(SortDescriptor, _impl_.is_absolute_)>(
-          reinterpret_cast<char*>(&_impl_.is_absolute_),
-          reinterpret_cast<char*>(&other->_impl_.is_absolute_));
-}
-
-::google::protobuf::Metadata SortDescriptor::GetMetadata() const {
-  return ::_pbi::AssignDescriptors(
-      &descriptor_table_deephaven_2fproto_2ftable_2eproto_getter, &descriptor_table_deephaven_2fproto_2ftable_2eproto_once,
-      file_level_metadata_deephaven_2fproto_2ftable_2eproto[92]);
-}
-// ===================================================================
-
-class SortTableRequest::_Internal {
- public:
-  using HasBits = decltype(std::declval<SortTableRequest>()._impl_._has_bits_);
-  static constexpr ::int32_t kHasBitsOffset =
-    8 * PROTOBUF_FIELD_OFFSET(SortTableRequest, _impl_._has_bits_);
-  static const ::io::deephaven::proto::backplane::grpc::Ticket& result_id(const SortTableRequest* msg);
-  static void set_has_result_id(HasBits* has_bits) {
-    (*has_bits)[0] |= 1u;
-  }
-  static const ::io::deephaven::proto::backplane::grpc::TableReference& source_id(const SortTableRequest* msg);
-  static void set_has_source_id(HasBits* has_bits) {
-    (*has_bits)[0] |= 2u;
-  }
-};
-
-const ::io::deephaven::proto::backplane::grpc::Ticket& SortTableRequest::_Internal::result_id(const SortTableRequest* msg) {
-  return *msg->_impl_.result_id_;
-}
-const ::io::deephaven::proto::backplane::grpc::TableReference& SortTableRequest::_Internal::source_id(const SortTableRequest* msg) {
-  return *msg->_impl_.source_id_;
-}
-void SortTableRequest::clear_result_id() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  if (_impl_.result_id_ != nullptr) _impl_.result_id_->Clear();
-  _impl_._has_bits_[0] &= ~0x00000001u;
-}
-SortTableRequest::SortTableRequest(::google::protobuf::Arena* arena)
-    : ::google::protobuf::Message(arena) {
-  SharedCtor(arena);
-  // @@protoc_insertion_point(arena_constructor:io.deephaven.proto.backplane.grpc.SortTableRequest)
-}
-inline PROTOBUF_NDEBUG_INLINE SortTableRequest::Impl_::Impl_(
-    ::google::protobuf::internal::InternalVisibility visibility, ::google::protobuf::Arena* arena,
-    const Impl_& from)
-      : _has_bits_{from._has_bits_},
-        _cached_size_{0},
-        sorts_{visibility, arena, from.sorts_} {}
-
-SortTableRequest::SortTableRequest(
-    ::google::protobuf::Arena* arena,
-    const SortTableRequest& from)
-    : ::google::protobuf::Message(arena) {
-  SortTableRequest* const _this = this;
-  (void)_this;
-  _internal_metadata_.MergeFrom<::google::protobuf::UnknownFieldSet>(
-      from._internal_metadata_);
-  new (&_impl_) Impl_(internal_visibility(), arena, from._impl_);
-  ::uint32_t cached_has_bits = _impl_._has_bits_[0];
-  _impl_.result_id_ = (cached_has_bits & 0x00000001u)
-                ? CreateMaybeMessage<::io::deephaven::proto::backplane::grpc::Ticket>(arena, *from._impl_.result_id_)
-                : nullptr;
-  _impl_.source_id_ = (cached_has_bits & 0x00000002u)
-                ? CreateMaybeMessage<::io::deephaven::proto::backplane::grpc::TableReference>(arena, *from._impl_.source_id_)
-                : nullptr;
-
-  // @@protoc_insertion_point(copy_constructor:io.deephaven.proto.backplane.grpc.SortTableRequest)
-}
-inline PROTOBUF_NDEBUG_INLINE SortTableRequest::Impl_::Impl_(
-    ::google::protobuf::internal::InternalVisibility visibility,
-    ::google::protobuf::Arena* arena)
-      : _cached_size_{0},
-        sorts_{visibility, arena} {}
-
-inline void SortTableRequest::SharedCtor(::_pb::Arena* arena) {
-  new (&_impl_) Impl_(internal_visibility(), arena);
-  ::memset(reinterpret_cast<char *>(&_impl_) +
-               offsetof(Impl_, result_id_),
-           0,
-           offsetof(Impl_, source_id_) -
-               offsetof(Impl_, result_id_) +
-               sizeof(Impl_::source_id_));
-}
-SortTableRequest::~SortTableRequest() {
-  // @@protoc_insertion_point(destructor:io.deephaven.proto.backplane.grpc.SortTableRequest)
-  _internal_metadata_.Delete<::google::protobuf::UnknownFieldSet>();
-  SharedDtor();
-}
-inline void SortTableRequest::SharedDtor() {
-  ABSL_DCHECK(GetArena() == nullptr);
-  delete _impl_.result_id_;
-  delete _impl_.source_id_;
-  _impl_.~Impl_();
-}
-
-PROTOBUF_NOINLINE void SortTableRequest::Clear() {
-// @@protoc_insertion_point(message_clear_start:io.deephaven.proto.backplane.grpc.SortTableRequest)
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  ::uint32_t cached_has_bits = 0;
-  // Prevent compiler warnings about cached_has_bits being unused
-  (void) cached_has_bits;
-
-  _impl_.sorts_.Clear();
-  cached_has_bits = _impl_._has_bits_[0];
-  if (cached_has_bits & 0x00000003u) {
-    if (cached_has_bits & 0x00000001u) {
-      ABSL_DCHECK(_impl_.result_id_ != nullptr);
-      _impl_.result_id_->Clear();
-    }
-    if (cached_has_bits & 0x00000002u) {
-      ABSL_DCHECK(_impl_.source_id_ != nullptr);
-      _impl_.source_id_->Clear();
-    }
-  }
-  _impl_._has_bits_.Clear();
-  _internal_metadata_.Clear<::google::protobuf::UnknownFieldSet>();
-}
-
-const char* SortTableRequest::_InternalParse(
-    const char* ptr, ::_pbi::ParseContext* ctx) {
-  ptr = ::_pbi::TcParser::ParseLoop(this, ptr, ctx, &_table_.header);
-  return ptr;
-}
-
-
-PROTOBUF_CONSTINIT PROTOBUF_ATTRIBUTE_INIT_PRIORITY1
-const ::_pbi::TcParseTable<2, 3, 3, 0, 2> SortTableRequest::_table_ = {
-  {
-    PROTOBUF_FIELD_OFFSET(SortTableRequest, _impl_._has_bits_),
-    0, // no _extensions_
-    3, 24,  // max_field_number, fast_idx_mask
-    offsetof(decltype(_table_), field_lookup_table),
-    4294967288,  // skipmap
-    offsetof(decltype(_table_), field_entries),
-    3,  // num_field_entries
-    3,  // num_aux_entries
-    offsetof(decltype(_table_), aux_entries),
-    &_SortTableRequest_default_instance_._instance,
-    ::_pbi::TcParser::GenericFallback,  // fallback
-  }, {{
-    {::_pbi::TcParser::MiniParse, {}},
-    // .io.deephaven.proto.backplane.grpc.Ticket result_id = 1;
-    {::_pbi::TcParser::FastMtS1,
-     {10, 0, 0, PROTOBUF_FIELD_OFFSET(SortTableRequest, _impl_.result_id_)}},
-    // .io.deephaven.proto.backplane.grpc.TableReference source_id = 2;
-    {::_pbi::TcParser::FastMtS1,
-     {18, 1, 1, PROTOBUF_FIELD_OFFSET(SortTableRequest, _impl_.source_id_)}},
-    // repeated .io.deephaven.proto.backplane.grpc.SortDescriptor sorts = 3;
-    {::_pbi::TcParser::FastMtR1,
-     {26, 63, 2, PROTOBUF_FIELD_OFFSET(SortTableRequest, _impl_.sorts_)}},
-  }}, {{
-    65535, 65535
-  }}, {{
-    // .io.deephaven.proto.backplane.grpc.Ticket result_id = 1;
-    {PROTOBUF_FIELD_OFFSET(SortTableRequest, _impl_.result_id_), _Internal::kHasBitsOffset + 0, 0,
-    (0 | ::_fl::kFcOptional | ::_fl::kMessage | ::_fl::kTvTable)},
-    // .io.deephaven.proto.backplane.grpc.TableReference source_id = 2;
-    {PROTOBUF_FIELD_OFFSET(SortTableRequest, _impl_.source_id_), _Internal::kHasBitsOffset + 1, 1,
-    (0 | ::_fl::kFcOptional | ::_fl::kMessage | ::_fl::kTvTable)},
-    // repeated .io.deephaven.proto.backplane.grpc.SortDescriptor sorts = 3;
-    {PROTOBUF_FIELD_OFFSET(SortTableRequest, _impl_.sorts_), -1, 2,
-    (0 | ::_fl::kFcRepeated | ::_fl::kMessage | ::_fl::kTvTable)},
-  }}, {{
-    {::_pbi::TcParser::GetTable<::io::deephaven::proto::backplane::grpc::Ticket>()},
-    {::_pbi::TcParser::GetTable<::io::deephaven::proto::backplane::grpc::TableReference>()},
-    {::_pbi::TcParser::GetTable<::io::deephaven::proto::backplane::grpc::SortDescriptor>()},
-  }}, {{
-  }},
-};
-
-::uint8_t* SortTableRequest::_InternalSerialize(
-    ::uint8_t* target,
-    ::google::protobuf::io::EpsCopyOutputStream* stream) const {
-  // @@protoc_insertion_point(serialize_to_array_start:io.deephaven.proto.backplane.grpc.SortTableRequest)
-  ::uint32_t cached_has_bits = 0;
-  (void)cached_has_bits;
-
-  cached_has_bits = _impl_._has_bits_[0];
-  // .io.deephaven.proto.backplane.grpc.Ticket result_id = 1;
-  if (cached_has_bits & 0x00000001u) {
-    target = ::google::protobuf::internal::WireFormatLite::InternalWriteMessage(
-        1, _Internal::result_id(this),
-        _Internal::result_id(this).GetCachedSize(), target, stream);
-  }
-
-  // .io.deephaven.proto.backplane.grpc.TableReference source_id = 2;
-  if (cached_has_bits & 0x00000002u) {
-    target = ::google::protobuf::internal::WireFormatLite::InternalWriteMessage(
-        2, _Internal::source_id(this),
-        _Internal::source_id(this).GetCachedSize(), target, stream);
-  }
-
-  // repeated .io.deephaven.proto.backplane.grpc.SortDescriptor sorts = 3;
-  for (unsigned i = 0,
-      n = static_cast<unsigned>(this->_internal_sorts_size()); i < n; i++) {
-    const auto& repfield = this->_internal_sorts().Get(i);
-    target = ::google::protobuf::internal::WireFormatLite::
-        InternalWriteMessage(3, repfield, repfield.GetCachedSize(), target, stream);
-  }
-
-  if (PROTOBUF_PREDICT_FALSE(_internal_metadata_.have_unknown_fields())) {
-    target =
-        ::_pbi::WireFormat::InternalSerializeUnknownFieldsToArray(
-            _internal_metadata_.unknown_fields<::google::protobuf::UnknownFieldSet>(::google::protobuf::UnknownFieldSet::default_instance), target, stream);
-  }
-  // @@protoc_insertion_point(serialize_to_array_end:io.deephaven.proto.backplane.grpc.SortTableRequest)
-  return target;
-}
-
-::size_t SortTableRequest::ByteSizeLong() const {
-// @@protoc_insertion_point(message_byte_size_start:io.deephaven.proto.backplane.grpc.SortTableRequest)
-  ::size_t total_size = 0;
-
-  ::uint32_t cached_has_bits = 0;
-  // Prevent compiler warnings about cached_has_bits being unused
-  (void) cached_has_bits;
-
-  // repeated .io.deephaven.proto.backplane.grpc.SortDescriptor sorts = 3;
-  total_size += 1UL * this->_internal_sorts_size();
-  for (const auto& msg : this->_internal_sorts()) {
-    total_size +=
-      ::google::protobuf::internal::WireFormatLite::MessageSize(msg);
-  }
-  cached_has_bits = _impl_._has_bits_[0];
-  if (cached_has_bits & 0x00000003u) {
-    // .io.deephaven.proto.backplane.grpc.Ticket result_id = 1;
-    if (cached_has_bits & 0x00000001u) {
-      total_size +=
-          1 + ::google::protobuf::internal::WireFormatLite::MessageSize(*_impl_.result_id_);
-    }
-
-    // .io.deephaven.proto.backplane.grpc.TableReference source_id = 2;
-    if (cached_has_bits & 0x00000002u) {
-      total_size +=
-          1 + ::google::protobuf::internal::WireFormatLite::MessageSize(*_impl_.source_id_);
-    }
-
-  }
-  return MaybeComputeUnknownFieldsSize(total_size, &_impl_._cached_size_);
-}
-
-const ::google::protobuf::Message::ClassData SortTableRequest::_class_data_ = {
-    SortTableRequest::MergeImpl,
-    nullptr,  // OnDemandRegisterArenaDtor
-};
-const ::google::protobuf::Message::ClassData* SortTableRequest::GetClassData() const {
-  return &_class_data_;
-}
-
-void SortTableRequest::MergeImpl(::google::protobuf::Message& to_msg, const ::google::protobuf::Message& from_msg) {
-  auto* const _this = static_cast<SortTableRequest*>(&to_msg);
-  auto& from = static_cast<const SortTableRequest&>(from_msg);
-  // @@protoc_insertion_point(class_specific_merge_from_start:io.deephaven.proto.backplane.grpc.SortTableRequest)
-  ABSL_DCHECK_NE(&from, _this);
-  ::uint32_t cached_has_bits = 0;
-  (void) cached_has_bits;
-
-  _this->_internal_mutable_sorts()->MergeFrom(
-      from._internal_sorts());
-  cached_has_bits = from._impl_._has_bits_[0];
-  if (cached_has_bits & 0x00000003u) {
-    if (cached_has_bits & 0x00000001u) {
-      _this->_internal_mutable_result_id()->::io::deephaven::proto::backplane::grpc::Ticket::MergeFrom(
-          from._internal_result_id());
-    }
-    if (cached_has_bits & 0x00000002u) {
-      _this->_internal_mutable_source_id()->::io::deephaven::proto::backplane::grpc::TableReference::MergeFrom(
-          from._internal_source_id());
-    }
-  }
-  _this->_internal_metadata_.MergeFrom<::google::protobuf::UnknownFieldSet>(from._internal_metadata_);
-}
-
-void SortTableRequest::CopyFrom(const SortTableRequest& from) {
-// @@protoc_insertion_point(class_specific_copy_from_start:io.deephaven.proto.backplane.grpc.SortTableRequest)
-  if (&from == this) return;
-  Clear();
-  MergeFrom(from);
-}
-
-PROTOBUF_NOINLINE bool SortTableRequest::IsInitialized() const {
-  return true;
-}
-
-::_pbi::CachedSize* SortTableRequest::AccessCachedSize() const {
-  return &_impl_._cached_size_;
-}
-void SortTableRequest::InternalSwap(SortTableRequest* PROTOBUF_RESTRICT other) {
-  using std::swap;
-  _internal_metadata_.InternalSwap(&other->_internal_metadata_);
-  swap(_impl_._has_bits_[0], other->_impl_._has_bits_[0]);
-  _impl_.sorts_.InternalSwap(&other->_impl_.sorts_);
-  ::google::protobuf::internal::memswap<
-      PROTOBUF_FIELD_OFFSET(SortTableRequest, _impl_.source_id_)
-      + sizeof(SortTableRequest::_impl_.source_id_)
-      - PROTOBUF_FIELD_OFFSET(SortTableRequest, _impl_.result_id_)>(
-          reinterpret_cast<char*>(&_impl_.result_id_),
-          reinterpret_cast<char*>(&other->_impl_.result_id_));
-}
-
-::google::protobuf::Metadata SortTableRequest::GetMetadata() const {
-  return ::_pbi::AssignDescriptors(
-      &descriptor_table_deephaven_2fproto_2ftable_2eproto_getter, &descriptor_table_deephaven_2fproto_2ftable_2eproto_once,
-      file_level_metadata_deephaven_2fproto_2ftable_2eproto[93]);
-}
-// ===================================================================
-
-class FilterTableRequest::_Internal {
- public:
-  using HasBits = decltype(std::declval<FilterTableRequest>()._impl_._has_bits_);
-  static constexpr ::int32_t kHasBitsOffset =
-    8 * PROTOBUF_FIELD_OFFSET(FilterTableRequest, _impl_._has_bits_);
-  static const ::io::deephaven::proto::backplane::grpc::Ticket& result_id(const FilterTableRequest* msg);
-  static void set_has_result_id(HasBits* has_bits) {
-    (*has_bits)[0] |= 1u;
-  }
-  static const ::io::deephaven::proto::backplane::grpc::TableReference& source_id(const FilterTableRequest* msg);
-  static void set_has_source_id(HasBits* has_bits) {
-    (*has_bits)[0] |= 2u;
-  }
-};
-
-const ::io::deephaven::proto::backplane::grpc::Ticket& FilterTableRequest::_Internal::result_id(const FilterTableRequest* msg) {
-  return *msg->_impl_.result_id_;
-}
-const ::io::deephaven::proto::backplane::grpc::TableReference& FilterTableRequest::_Internal::source_id(const FilterTableRequest* msg) {
-  return *msg->_impl_.source_id_;
-}
-void FilterTableRequest::clear_result_id() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  if (_impl_.result_id_ != nullptr) _impl_.result_id_->Clear();
-  _impl_._has_bits_[0] &= ~0x00000001u;
-}
-FilterTableRequest::FilterTableRequest(::google::protobuf::Arena* arena)
-    : ::google::protobuf::Message(arena) {
-  SharedCtor(arena);
-  // @@protoc_insertion_point(arena_constructor:io.deephaven.proto.backplane.grpc.FilterTableRequest)
-}
-inline PROTOBUF_NDEBUG_INLINE FilterTableRequest::Impl_::Impl_(
-    ::google::protobuf::internal::InternalVisibility visibility, ::google::protobuf::Arena* arena,
-    const Impl_& from)
-      : _has_bits_{from._has_bits_},
-        _cached_size_{0},
-        filters_{visibility, arena, from.filters_} {}
-
-FilterTableRequest::FilterTableRequest(
-    ::google::protobuf::Arena* arena,
-    const FilterTableRequest& from)
-    : ::google::protobuf::Message(arena) {
-  FilterTableRequest* const _this = this;
-  (void)_this;
-  _internal_metadata_.MergeFrom<::google::protobuf::UnknownFieldSet>(
-      from._internal_metadata_);
-  new (&_impl_) Impl_(internal_visibility(), arena, from._impl_);
-  ::uint32_t cached_has_bits = _impl_._has_bits_[0];
-  _impl_.result_id_ = (cached_has_bits & 0x00000001u)
-                ? CreateMaybeMessage<::io::deephaven::proto::backplane::grpc::Ticket>(arena, *from._impl_.result_id_)
-                : nullptr;
-  _impl_.source_id_ = (cached_has_bits & 0x00000002u)
-                ? CreateMaybeMessage<::io::deephaven::proto::backplane::grpc::TableReference>(arena, *from._impl_.source_id_)
-                : nullptr;
-
-  // @@protoc_insertion_point(copy_constructor:io.deephaven.proto.backplane.grpc.FilterTableRequest)
-}
-inline PROTOBUF_NDEBUG_INLINE FilterTableRequest::Impl_::Impl_(
-    ::google::protobuf::internal::InternalVisibility visibility,
-    ::google::protobuf::Arena* arena)
-      : _cached_size_{0},
-        filters_{visibility, arena} {}
-
-inline void FilterTableRequest::SharedCtor(::_pb::Arena* arena) {
-  new (&_impl_) Impl_(internal_visibility(), arena);
-  ::memset(reinterpret_cast<char *>(&_impl_) +
-               offsetof(Impl_, result_id_),
-           0,
-           offsetof(Impl_, source_id_) -
-               offsetof(Impl_, result_id_) +
-               sizeof(Impl_::source_id_));
-}
-FilterTableRequest::~FilterTableRequest() {
-  // @@protoc_insertion_point(destructor:io.deephaven.proto.backplane.grpc.FilterTableRequest)
-  _internal_metadata_.Delete<::google::protobuf::UnknownFieldSet>();
-  SharedDtor();
-}
-inline void FilterTableRequest::SharedDtor() {
-  ABSL_DCHECK(GetArena() == nullptr);
-  delete _impl_.result_id_;
-  delete _impl_.source_id_;
-  _impl_.~Impl_();
-}
-
-PROTOBUF_NOINLINE void FilterTableRequest::Clear() {
-// @@protoc_insertion_point(message_clear_start:io.deephaven.proto.backplane.grpc.FilterTableRequest)
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  ::uint32_t cached_has_bits = 0;
-  // Prevent compiler warnings about cached_has_bits being unused
-  (void) cached_has_bits;
-
-  _impl_.filters_.Clear();
-  cached_has_bits = _impl_._has_bits_[0];
-  if (cached_has_bits & 0x00000003u) {
-    if (cached_has_bits & 0x00000001u) {
-      ABSL_DCHECK(_impl_.result_id_ != nullptr);
-      _impl_.result_id_->Clear();
-    }
-    if (cached_has_bits & 0x00000002u) {
-      ABSL_DCHECK(_impl_.source_id_ != nullptr);
-      _impl_.source_id_->Clear();
-    }
-  }
-  _impl_._has_bits_.Clear();
-  _internal_metadata_.Clear<::google::protobuf::UnknownFieldSet>();
-}
-
-const char* FilterTableRequest::_InternalParse(
-    const char* ptr, ::_pbi::ParseContext* ctx) {
-  ptr = ::_pbi::TcParser::ParseLoop(this, ptr, ctx, &_table_.header);
-  return ptr;
-}
-
-
-PROTOBUF_CONSTINIT PROTOBUF_ATTRIBUTE_INIT_PRIORITY1
-const ::_pbi::TcParseTable<2, 3, 3, 0, 2> FilterTableRequest::_table_ = {
-  {
-    PROTOBUF_FIELD_OFFSET(FilterTableRequest, _impl_._has_bits_),
-    0, // no _extensions_
-    3, 24,  // max_field_number, fast_idx_mask
-    offsetof(decltype(_table_), field_lookup_table),
-    4294967288,  // skipmap
-    offsetof(decltype(_table_), field_entries),
-    3,  // num_field_entries
-    3,  // num_aux_entries
-    offsetof(decltype(_table_), aux_entries),
-    &_FilterTableRequest_default_instance_._instance,
-    ::_pbi::TcParser::GenericFallback,  // fallback
-  }, {{
-    {::_pbi::TcParser::MiniParse, {}},
-    // .io.deephaven.proto.backplane.grpc.Ticket result_id = 1;
-    {::_pbi::TcParser::FastMtS1,
-     {10, 0, 0, PROTOBUF_FIELD_OFFSET(FilterTableRequest, _impl_.result_id_)}},
-    // .io.deephaven.proto.backplane.grpc.TableReference source_id = 2;
-    {::_pbi::TcParser::FastMtS1,
-     {18, 1, 1, PROTOBUF_FIELD_OFFSET(FilterTableRequest, _impl_.source_id_)}},
-    // repeated .io.deephaven.proto.backplane.grpc.Condition filters = 3;
-    {::_pbi::TcParser::FastMtR1,
-     {26, 63, 2, PROTOBUF_FIELD_OFFSET(FilterTableRequest, _impl_.filters_)}},
-  }}, {{
-    65535, 65535
-  }}, {{
-    // .io.deephaven.proto.backplane.grpc.Ticket result_id = 1;
-    {PROTOBUF_FIELD_OFFSET(FilterTableRequest, _impl_.result_id_), _Internal::kHasBitsOffset + 0, 0,
-    (0 | ::_fl::kFcOptional | ::_fl::kMessage | ::_fl::kTvTable)},
-    // .io.deephaven.proto.backplane.grpc.TableReference source_id = 2;
-    {PROTOBUF_FIELD_OFFSET(FilterTableRequest, _impl_.source_id_), _Internal::kHasBitsOffset + 1, 1,
-    (0 | ::_fl::kFcOptional | ::_fl::kMessage | ::_fl::kTvTable)},
-    // repeated .io.deephaven.proto.backplane.grpc.Condition filters = 3;
-    {PROTOBUF_FIELD_OFFSET(FilterTableRequest, _impl_.filters_), -1, 2,
-    (0 | ::_fl::kFcRepeated | ::_fl::kMessage | ::_fl::kTvTable)},
-  }}, {{
-    {::_pbi::TcParser::GetTable<::io::deephaven::proto::backplane::grpc::Ticket>()},
-    {::_pbi::TcParser::GetTable<::io::deephaven::proto::backplane::grpc::TableReference>()},
-    {::_pbi::TcParser::GetTable<::io::deephaven::proto::backplane::grpc::Condition>()},
-  }}, {{
-  }},
-};
-
-::uint8_t* FilterTableRequest::_InternalSerialize(
-    ::uint8_t* target,
-    ::google::protobuf::io::EpsCopyOutputStream* stream) const {
-  // @@protoc_insertion_point(serialize_to_array_start:io.deephaven.proto.backplane.grpc.FilterTableRequest)
-  ::uint32_t cached_has_bits = 0;
-  (void)cached_has_bits;
-
-  cached_has_bits = _impl_._has_bits_[0];
-  // .io.deephaven.proto.backplane.grpc.Ticket result_id = 1;
-  if (cached_has_bits & 0x00000001u) {
-    target = ::google::protobuf::internal::WireFormatLite::InternalWriteMessage(
-        1, _Internal::result_id(this),
-        _Internal::result_id(this).GetCachedSize(), target, stream);
-  }
-
-  // .io.deephaven.proto.backplane.grpc.TableReference source_id = 2;
-  if (cached_has_bits & 0x00000002u) {
-    target = ::google::protobuf::internal::WireFormatLite::InternalWriteMessage(
-        2, _Internal::source_id(this),
-        _Internal::source_id(this).GetCachedSize(), target, stream);
-  }
-
-  // repeated .io.deephaven.proto.backplane.grpc.Condition filters = 3;
-  for (unsigned i = 0,
-      n = static_cast<unsigned>(this->_internal_filters_size()); i < n; i++) {
-    const auto& repfield = this->_internal_filters().Get(i);
-    target = ::google::protobuf::internal::WireFormatLite::
-        InternalWriteMessage(3, repfield, repfield.GetCachedSize(), target, stream);
-  }
-
-  if (PROTOBUF_PREDICT_FALSE(_internal_metadata_.have_unknown_fields())) {
-    target =
-        ::_pbi::WireFormat::InternalSerializeUnknownFieldsToArray(
-            _internal_metadata_.unknown_fields<::google::protobuf::UnknownFieldSet>(::google::protobuf::UnknownFieldSet::default_instance), target, stream);
-  }
-  // @@protoc_insertion_point(serialize_to_array_end:io.deephaven.proto.backplane.grpc.FilterTableRequest)
-  return target;
-}
-
-::size_t FilterTableRequest::ByteSizeLong() const {
-// @@protoc_insertion_point(message_byte_size_start:io.deephaven.proto.backplane.grpc.FilterTableRequest)
-  ::size_t total_size = 0;
-
-  ::uint32_t cached_has_bits = 0;
-  // Prevent compiler warnings about cached_has_bits being unused
-  (void) cached_has_bits;
-
-  // repeated .io.deephaven.proto.backplane.grpc.Condition filters = 3;
-  total_size += 1UL * this->_internal_filters_size();
-  for (const auto& msg : this->_internal_filters()) {
-    total_size +=
-      ::google::protobuf::internal::WireFormatLite::MessageSize(msg);
-  }
-  cached_has_bits = _impl_._has_bits_[0];
-  if (cached_has_bits & 0x00000003u) {
-    // .io.deephaven.proto.backplane.grpc.Ticket result_id = 1;
-    if (cached_has_bits & 0x00000001u) {
-      total_size +=
-          1 + ::google::protobuf::internal::WireFormatLite::MessageSize(*_impl_.result_id_);
-    }
-
-    // .io.deephaven.proto.backplane.grpc.TableReference source_id = 2;
-    if (cached_has_bits & 0x00000002u) {
-      total_size +=
-          1 + ::google::protobuf::internal::WireFormatLite::MessageSize(*_impl_.source_id_);
-    }
-
-  }
-  return MaybeComputeUnknownFieldsSize(total_size, &_impl_._cached_size_);
-}
-
-const ::google::protobuf::Message::ClassData FilterTableRequest::_class_data_ = {
-    FilterTableRequest::MergeImpl,
-    nullptr,  // OnDemandRegisterArenaDtor
-};
-const ::google::protobuf::Message::ClassData* FilterTableRequest::GetClassData() const {
-  return &_class_data_;
-}
-
-void FilterTableRequest::MergeImpl(::google::protobuf::Message& to_msg, const ::google::protobuf::Message& from_msg) {
-  auto* const _this = static_cast<FilterTableRequest*>(&to_msg);
-  auto& from = static_cast<const FilterTableRequest&>(from_msg);
-  // @@protoc_insertion_point(class_specific_merge_from_start:io.deephaven.proto.backplane.grpc.FilterTableRequest)
-  ABSL_DCHECK_NE(&from, _this);
-  ::uint32_t cached_has_bits = 0;
-  (void) cached_has_bits;
-
-  _this->_internal_mutable_filters()->MergeFrom(
-      from._internal_filters());
-  cached_has_bits = from._impl_._has_bits_[0];
-  if (cached_has_bits & 0x00000003u) {
-    if (cached_has_bits & 0x00000001u) {
-      _this->_internal_mutable_result_id()->::io::deephaven::proto::backplane::grpc::Ticket::MergeFrom(
-          from._internal_result_id());
-    }
-    if (cached_has_bits & 0x00000002u) {
-      _this->_internal_mutable_source_id()->::io::deephaven::proto::backplane::grpc::TableReference::MergeFrom(
-          from._internal_source_id());
-    }
-  }
-  _this->_internal_metadata_.MergeFrom<::google::protobuf::UnknownFieldSet>(from._internal_metadata_);
-}
-
-void FilterTableRequest::CopyFrom(const FilterTableRequest& from) {
-// @@protoc_insertion_point(class_specific_copy_from_start:io.deephaven.proto.backplane.grpc.FilterTableRequest)
-  if (&from == this) return;
-  Clear();
-  MergeFrom(from);
-}
-
-PROTOBUF_NOINLINE bool FilterTableRequest::IsInitialized() const {
-  return true;
-}
-
-::_pbi::CachedSize* FilterTableRequest::AccessCachedSize() const {
-  return &_impl_._cached_size_;
-}
-void FilterTableRequest::InternalSwap(FilterTableRequest* PROTOBUF_RESTRICT other) {
-  using std::swap;
-  _internal_metadata_.InternalSwap(&other->_internal_metadata_);
-  swap(_impl_._has_bits_[0], other->_impl_._has_bits_[0]);
-  _impl_.filters_.InternalSwap(&other->_impl_.filters_);
-  ::google::protobuf::internal::memswap<
-      PROTOBUF_FIELD_OFFSET(FilterTableRequest, _impl_.source_id_)
-      + sizeof(FilterTableRequest::_impl_.source_id_)
-      - PROTOBUF_FIELD_OFFSET(FilterTableRequest, _impl_.result_id_)>(
-          reinterpret_cast<char*>(&_impl_.result_id_),
-          reinterpret_cast<char*>(&other->_impl_.result_id_));
-}
-
-::google::protobuf::Metadata FilterTableRequest::GetMetadata() const {
-  return ::_pbi::AssignDescriptors(
-      &descriptor_table_deephaven_2fproto_2ftable_2eproto_getter, &descriptor_table_deephaven_2fproto_2ftable_2eproto_once,
-      file_level_metadata_deephaven_2fproto_2ftable_2eproto[94]);
-}
-// ===================================================================
-
-class SeekRowRequest::_Internal {
- public:
-  using HasBits = decltype(std::declval<SeekRowRequest>()._impl_._has_bits_);
-  static constexpr ::int32_t kHasBitsOffset =
-    8 * PROTOBUF_FIELD_OFFSET(SeekRowRequest, _impl_._has_bits_);
-  static const ::io::deephaven::proto::backplane::grpc::Ticket& source_id(const SeekRowRequest* msg);
-  static void set_has_source_id(HasBits* has_bits) {
-    (*has_bits)[0] |= 1u;
-  }
-  static const ::io::deephaven::proto::backplane::grpc::Literal& seek_value(const SeekRowRequest* msg);
-  static void set_has_seek_value(HasBits* has_bits) {
-    (*has_bits)[0] |= 2u;
-  }
-};
-
-const ::io::deephaven::proto::backplane::grpc::Ticket& SeekRowRequest::_Internal::source_id(const SeekRowRequest* msg) {
-  return *msg->_impl_.source_id_;
-}
-const ::io::deephaven::proto::backplane::grpc::Literal& SeekRowRequest::_Internal::seek_value(const SeekRowRequest* msg) {
-  return *msg->_impl_.seek_value_;
-}
-void SeekRowRequest::clear_source_id() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  if (_impl_.source_id_ != nullptr) _impl_.source_id_->Clear();
-  _impl_._has_bits_[0] &= ~0x00000001u;
-}
-SeekRowRequest::SeekRowRequest(::google::protobuf::Arena* arena)
-    : ::google::protobuf::Message(arena) {
-  SharedCtor(arena);
-  // @@protoc_insertion_point(arena_constructor:io.deephaven.proto.backplane.grpc.SeekRowRequest)
-}
-inline PROTOBUF_NDEBUG_INLINE SeekRowRequest::Impl_::Impl_(
-    ::google::protobuf::internal::InternalVisibility visibility, ::google::protobuf::Arena* arena,
-    const Impl_& from)
-      : _has_bits_{from._has_bits_},
-        _cached_size_{0},
-        column_name_(arena, from.column_name_) {}
-
-SeekRowRequest::SeekRowRequest(
-    ::google::protobuf::Arena* arena,
-    const SeekRowRequest& from)
-    : ::google::protobuf::Message(arena) {
-  SeekRowRequest* const _this = this;
-  (void)_this;
-  _internal_metadata_.MergeFrom<::google::protobuf::UnknownFieldSet>(
-      from._internal_metadata_);
-  new (&_impl_) Impl_(internal_visibility(), arena, from._impl_);
-  ::uint32_t cached_has_bits = _impl_._has_bits_[0];
-  _impl_.source_id_ = (cached_has_bits & 0x00000001u)
-                ? CreateMaybeMessage<::io::deephaven::proto::backplane::grpc::Ticket>(arena, *from._impl_.source_id_)
-                : nullptr;
-  _impl_.seek_value_ = (cached_has_bits & 0x00000002u)
-                ? CreateMaybeMessage<::io::deephaven::proto::backplane::grpc::Literal>(arena, *from._impl_.seek_value_)
-                : nullptr;
-  ::memcpy(reinterpret_cast<char *>(&_impl_) +
-               offsetof(Impl_, starting_row_),
-           reinterpret_cast<const char *>(&from._impl_) +
-               offsetof(Impl_, starting_row_),
-           offsetof(Impl_, is_backward_) -
-               offsetof(Impl_, starting_row_) +
-               sizeof(Impl_::is_backward_));
-
-  // @@protoc_insertion_point(copy_constructor:io.deephaven.proto.backplane.grpc.SeekRowRequest)
-}
-inline PROTOBUF_NDEBUG_INLINE SeekRowRequest::Impl_::Impl_(
-    ::google::protobuf::internal::InternalVisibility visibility,
-    ::google::protobuf::Arena* arena)
-      : _cached_size_{0},
-        column_name_(arena) {}
-
-inline void SeekRowRequest::SharedCtor(::_pb::Arena* arena) {
-  new (&_impl_) Impl_(internal_visibility(), arena);
-  ::memset(reinterpret_cast<char *>(&_impl_) +
-               offsetof(Impl_, source_id_),
-           0,
-           offsetof(Impl_, is_backward_) -
-               offsetof(Impl_, source_id_) +
-               sizeof(Impl_::is_backward_));
-}
-SeekRowRequest::~SeekRowRequest() {
-  // @@protoc_insertion_point(destructor:io.deephaven.proto.backplane.grpc.SeekRowRequest)
-  _internal_metadata_.Delete<::google::protobuf::UnknownFieldSet>();
-  SharedDtor();
-}
-inline void SeekRowRequest::SharedDtor() {
-  ABSL_DCHECK(GetArena() == nullptr);
-  _impl_.column_name_.Destroy();
-  delete _impl_.source_id_;
-  delete _impl_.seek_value_;
-  _impl_.~Impl_();
-}
-
-PROTOBUF_NOINLINE void SeekRowRequest::Clear() {
-// @@protoc_insertion_point(message_clear_start:io.deephaven.proto.backplane.grpc.SeekRowRequest)
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  ::uint32_t cached_has_bits = 0;
-  // Prevent compiler warnings about cached_has_bits being unused
-  (void) cached_has_bits;
-
-  _impl_.column_name_.ClearToEmpty();
-  cached_has_bits = _impl_._has_bits_[0];
-  if (cached_has_bits & 0x00000003u) {
-    if (cached_has_bits & 0x00000001u) {
-      ABSL_DCHECK(_impl_.source_id_ != nullptr);
-      _impl_.source_id_->Clear();
-    }
-    if (cached_has_bits & 0x00000002u) {
-      ABSL_DCHECK(_impl_.seek_value_ != nullptr);
-      _impl_.seek_value_->Clear();
-    }
-  }
-  ::memset(&_impl_.starting_row_, 0, static_cast<::size_t>(
-      reinterpret_cast<char*>(&_impl_.is_backward_) -
-      reinterpret_cast<char*>(&_impl_.starting_row_)) + sizeof(_impl_.is_backward_));
-  _impl_._has_bits_.Clear();
-  _internal_metadata_.Clear<::google::protobuf::UnknownFieldSet>();
-}
-
-const char* SeekRowRequest::_InternalParse(
-    const char* ptr, ::_pbi::ParseContext* ctx) {
-  ptr = ::_pbi::TcParser::ParseLoop(this, ptr, ctx, &_table_.header);
-  return ptr;
-}
-
-
-PROTOBUF_CONSTINIT PROTOBUF_ATTRIBUTE_INIT_PRIORITY1
-const ::_pbi::TcParseTable<3, 7, 2, 68, 2> SeekRowRequest::_table_ = {
-  {
-    PROTOBUF_FIELD_OFFSET(SeekRowRequest, _impl_._has_bits_),
-    0, // no _extensions_
-    7, 56,  // max_field_number, fast_idx_mask
-    offsetof(decltype(_table_), field_lookup_table),
-    4294967168,  // skipmap
-    offsetof(decltype(_table_), field_entries),
-    7,  // num_field_entries
-    2,  // num_aux_entries
-    offsetof(decltype(_table_), aux_entries),
-    &_SeekRowRequest_default_instance_._instance,
-    ::_pbi::TcParser::GenericFallback,  // fallback
-  }, {{
-    {::_pbi::TcParser::MiniParse, {}},
-    // .io.deephaven.proto.backplane.grpc.Ticket source_id = 1;
-    {::_pbi::TcParser::FastMtS1,
-     {10, 0, 0, PROTOBUF_FIELD_OFFSET(SeekRowRequest, _impl_.source_id_)}},
-    // sint64 starting_row = 2 [jstype = JS_STRING];
-    {::_pbi::TcParser::FastZ64S1,
-     {16, 63, 0, PROTOBUF_FIELD_OFFSET(SeekRowRequest, _impl_.starting_row_)}},
-    // string column_name = 3;
-    {::_pbi::TcParser::FastUS1,
-     {26, 63, 0, PROTOBUF_FIELD_OFFSET(SeekRowRequest, _impl_.column_name_)}},
-    // .io.deephaven.proto.backplane.grpc.Literal seek_value = 4;
-    {::_pbi::TcParser::FastMtS1,
-     {34, 1, 1, PROTOBUF_FIELD_OFFSET(SeekRowRequest, _impl_.seek_value_)}},
-    // bool insensitive = 5;
-    {::_pbi::TcParser::SingularVarintNoZag1<bool, offsetof(SeekRowRequest, _impl_.insensitive_), 63>(),
-     {40, 63, 0, PROTOBUF_FIELD_OFFSET(SeekRowRequest, _impl_.insensitive_)}},
-    // bool contains = 6;
-    {::_pbi::TcParser::SingularVarintNoZag1<bool, offsetof(SeekRowRequest, _impl_.contains_), 63>(),
-     {48, 63, 0, PROTOBUF_FIELD_OFFSET(SeekRowRequest, _impl_.contains_)}},
-    // bool is_backward = 7;
-    {::_pbi::TcParser::SingularVarintNoZag1<bool, offsetof(SeekRowRequest, _impl_.is_backward_), 63>(),
-     {56, 63, 0, PROTOBUF_FIELD_OFFSET(SeekRowRequest, _impl_.is_backward_)}},
-  }}, {{
-    65535, 65535
-  }}, {{
-    // .io.deephaven.proto.backplane.grpc.Ticket source_id = 1;
-    {PROTOBUF_FIELD_OFFSET(SeekRowRequest, _impl_.source_id_), _Internal::kHasBitsOffset + 0, 0,
-    (0 | ::_fl::kFcOptional | ::_fl::kMessage | ::_fl::kTvTable)},
-    // sint64 starting_row = 2 [jstype = JS_STRING];
-    {PROTOBUF_FIELD_OFFSET(SeekRowRequest, _impl_.starting_row_), -1, 0,
-    (0 | ::_fl::kFcSingular | ::_fl::kSInt64)},
-    // string column_name = 3;
-    {PROTOBUF_FIELD_OFFSET(SeekRowRequest, _impl_.column_name_), -1, 0,
-    (0 | ::_fl::kFcSingular | ::_fl::kUtf8String | ::_fl::kRepAString)},
-    // .io.deephaven.proto.backplane.grpc.Literal seek_value = 4;
-    {PROTOBUF_FIELD_OFFSET(SeekRowRequest, _impl_.seek_value_), _Internal::kHasBitsOffset + 1, 1,
-    (0 | ::_fl::kFcOptional | ::_fl::kMessage | ::_fl::kTvTable)},
-    // bool insensitive = 5;
-    {PROTOBUF_FIELD_OFFSET(SeekRowRequest, _impl_.insensitive_), -1, 0,
-    (0 | ::_fl::kFcSingular | ::_fl::kBool)},
-    // bool contains = 6;
-    {PROTOBUF_FIELD_OFFSET(SeekRowRequest, _impl_.contains_), -1, 0,
-    (0 | ::_fl::kFcSingular | ::_fl::kBool)},
-    // bool is_backward = 7;
-    {PROTOBUF_FIELD_OFFSET(SeekRowRequest, _impl_.is_backward_), -1, 0,
-    (0 | ::_fl::kFcSingular | ::_fl::kBool)},
-  }}, {{
-    {::_pbi::TcParser::GetTable<::io::deephaven::proto::backplane::grpc::Ticket>()},
-    {::_pbi::TcParser::GetTable<::io::deephaven::proto::backplane::grpc::Literal>()},
-  }}, {{
-    "\60\0\0\13\0\0\0\0"
-    "io.deephaven.proto.backplane.grpc.SeekRowRequest"
-    "column_name"
-  }},
-};
-
-::uint8_t* SeekRowRequest::_InternalSerialize(
-    ::uint8_t* target,
-    ::google::protobuf::io::EpsCopyOutputStream* stream) const {
-  // @@protoc_insertion_point(serialize_to_array_start:io.deephaven.proto.backplane.grpc.SeekRowRequest)
-  ::uint32_t cached_has_bits = 0;
-  (void)cached_has_bits;
-
-  cached_has_bits = _impl_._has_bits_[0];
-  // .io.deephaven.proto.backplane.grpc.Ticket source_id = 1;
-  if (cached_has_bits & 0x00000001u) {
-    target = ::google::protobuf::internal::WireFormatLite::InternalWriteMessage(
-        1, _Internal::source_id(this),
-        _Internal::source_id(this).GetCachedSize(), target, stream);
-  }
-
-  // sint64 starting_row = 2 [jstype = JS_STRING];
-  if (this->_internal_starting_row() != 0) {
-    target = stream->EnsureSpace(target);
-    target = ::_pbi::WireFormatLite::WriteSInt64ToArray(
-        2, this->_internal_starting_row(), target);
-  }
-
-  // string column_name = 3;
-  if (!this->_internal_column_name().empty()) {
-    const std::string& _s = this->_internal_column_name();
-    ::google::protobuf::internal::WireFormatLite::VerifyUtf8String(
-        _s.data(), static_cast<int>(_s.length()), ::google::protobuf::internal::WireFormatLite::SERIALIZE, "io.deephaven.proto.backplane.grpc.SeekRowRequest.column_name");
-    target = stream->WriteStringMaybeAliased(3, _s, target);
-  }
-
-  // .io.deephaven.proto.backplane.grpc.Literal seek_value = 4;
-  if (cached_has_bits & 0x00000002u) {
-    target = ::google::protobuf::internal::WireFormatLite::InternalWriteMessage(
-        4, _Internal::seek_value(this),
-        _Internal::seek_value(this).GetCachedSize(), target, stream);
-  }
-
-  // bool insensitive = 5;
-  if (this->_internal_insensitive() != 0) {
-    target = stream->EnsureSpace(target);
-    target = ::_pbi::WireFormatLite::WriteBoolToArray(
-        5, this->_internal_insensitive(), target);
-  }
-
-  // bool contains = 6;
-  if (this->_internal_contains() != 0) {
-    target = stream->EnsureSpace(target);
-    target = ::_pbi::WireFormatLite::WriteBoolToArray(
-        6, this->_internal_contains(), target);
-  }
-
-  // bool is_backward = 7;
-  if (this->_internal_is_backward() != 0) {
-    target = stream->EnsureSpace(target);
-    target = ::_pbi::WireFormatLite::WriteBoolToArray(
-        7, this->_internal_is_backward(), target);
-  }
-
-  if (PROTOBUF_PREDICT_FALSE(_internal_metadata_.have_unknown_fields())) {
-    target =
-        ::_pbi::WireFormat::InternalSerializeUnknownFieldsToArray(
-            _internal_metadata_.unknown_fields<::google::protobuf::UnknownFieldSet>(::google::protobuf::UnknownFieldSet::default_instance), target, stream);
-  }
-  // @@protoc_insertion_point(serialize_to_array_end:io.deephaven.proto.backplane.grpc.SeekRowRequest)
-  return target;
-}
-
-::size_t SeekRowRequest::ByteSizeLong() const {
-// @@protoc_insertion_point(message_byte_size_start:io.deephaven.proto.backplane.grpc.SeekRowRequest)
-  ::size_t total_size = 0;
-
-  ::uint32_t cached_has_bits = 0;
-  // Prevent compiler warnings about cached_has_bits being unused
-  (void) cached_has_bits;
-
-  // string column_name = 3;
-  if (!this->_internal_column_name().empty()) {
-    total_size += 1 + ::google::protobuf::internal::WireFormatLite::StringSize(
-                                    this->_internal_column_name());
-  }
-
-  cached_has_bits = _impl_._has_bits_[0];
-  if (cached_has_bits & 0x00000003u) {
-    // .io.deephaven.proto.backplane.grpc.Ticket source_id = 1;
-    if (cached_has_bits & 0x00000001u) {
-      total_size +=
-          1 + ::google::protobuf::internal::WireFormatLite::MessageSize(*_impl_.source_id_);
-    }
-
-    // .io.deephaven.proto.backplane.grpc.Literal seek_value = 4;
-    if (cached_has_bits & 0x00000002u) {
-      total_size +=
-          1 + ::google::protobuf::internal::WireFormatLite::MessageSize(*_impl_.seek_value_);
-    }
-
-  }
-  // sint64 starting_row = 2 [jstype = JS_STRING];
-  if (this->_internal_starting_row() != 0) {
-    total_size += ::_pbi::WireFormatLite::SInt64SizePlusOne(
-        this->_internal_starting_row());
-  }
-
-  // bool insensitive = 5;
-  if (this->_internal_insensitive() != 0) {
-    total_size += 2;
-  }
-
-  // bool contains = 6;
-  if (this->_internal_contains() != 0) {
-    total_size += 2;
-  }
-
-  // bool is_backward = 7;
-  if (this->_internal_is_backward() != 0) {
-    total_size += 2;
-  }
-
-  return MaybeComputeUnknownFieldsSize(total_size, &_impl_._cached_size_);
-}
-
-const ::google::protobuf::Message::ClassData SeekRowRequest::_class_data_ = {
-    SeekRowRequest::MergeImpl,
-    nullptr,  // OnDemandRegisterArenaDtor
-};
-const ::google::protobuf::Message::ClassData* SeekRowRequest::GetClassData() const {
-  return &_class_data_;
-}
-
-void SeekRowRequest::MergeImpl(::google::protobuf::Message& to_msg, const ::google::protobuf::Message& from_msg) {
-  auto* const _this = static_cast<SeekRowRequest*>(&to_msg);
-  auto& from = static_cast<const SeekRowRequest&>(from_msg);
-  // @@protoc_insertion_point(class_specific_merge_from_start:io.deephaven.proto.backplane.grpc.SeekRowRequest)
-  ABSL_DCHECK_NE(&from, _this);
-  ::uint32_t cached_has_bits = 0;
-  (void) cached_has_bits;
-
-  if (!from._internal_column_name().empty()) {
-    _this->_internal_set_column_name(from._internal_column_name());
-  }
-  cached_has_bits = from._impl_._has_bits_[0];
-  if (cached_has_bits & 0x00000003u) {
-    if (cached_has_bits & 0x00000001u) {
-      _this->_internal_mutable_source_id()->::io::deephaven::proto::backplane::grpc::Ticket::MergeFrom(
-          from._internal_source_id());
-    }
-    if (cached_has_bits & 0x00000002u) {
-      _this->_internal_mutable_seek_value()->::io::deephaven::proto::backplane::grpc::Literal::MergeFrom(
-          from._internal_seek_value());
-    }
-  }
-  if (from._internal_starting_row() != 0) {
-    _this->_internal_set_starting_row(from._internal_starting_row());
-  }
-  if (from._internal_insensitive() != 0) {
-    _this->_internal_set_insensitive(from._internal_insensitive());
-  }
-  if (from._internal_contains() != 0) {
-    _this->_internal_set_contains(from._internal_contains());
-  }
-  if (from._internal_is_backward() != 0) {
-    _this->_internal_set_is_backward(from._internal_is_backward());
-  }
-  _this->_internal_metadata_.MergeFrom<::google::protobuf::UnknownFieldSet>(from._internal_metadata_);
-}
-
-void SeekRowRequest::CopyFrom(const SeekRowRequest& from) {
-// @@protoc_insertion_point(class_specific_copy_from_start:io.deephaven.proto.backplane.grpc.SeekRowRequest)
-  if (&from == this) return;
-  Clear();
-  MergeFrom(from);
-}
-
-PROTOBUF_NOINLINE bool SeekRowRequest::IsInitialized() const {
-  return true;
-}
-
-::_pbi::CachedSize* SeekRowRequest::AccessCachedSize() const {
-  return &_impl_._cached_size_;
-}
-void SeekRowRequest::InternalSwap(SeekRowRequest* PROTOBUF_RESTRICT other) {
-  using std::swap;
-  auto* arena = GetArena();
-  ABSL_DCHECK_EQ(arena, other->GetArena());
-  _internal_metadata_.InternalSwap(&other->_internal_metadata_);
-  swap(_impl_._has_bits_[0], other->_impl_._has_bits_[0]);
-  ::_pbi::ArenaStringPtr::InternalSwap(&_impl_.column_name_, &other->_impl_.column_name_, arena);
-  ::google::protobuf::internal::memswap<
-      PROTOBUF_FIELD_OFFSET(SeekRowRequest, _impl_.is_backward_)
-      + sizeof(SeekRowRequest::_impl_.is_backward_)
-      - PROTOBUF_FIELD_OFFSET(SeekRowRequest, _impl_.source_id_)>(
-          reinterpret_cast<char*>(&_impl_.source_id_),
-          reinterpret_cast<char*>(&other->_impl_.source_id_));
-}
-
-::google::protobuf::Metadata SeekRowRequest::GetMetadata() const {
-  return ::_pbi::AssignDescriptors(
-      &descriptor_table_deephaven_2fproto_2ftable_2eproto_getter, &descriptor_table_deephaven_2fproto_2ftable_2eproto_once,
-      file_level_metadata_deephaven_2fproto_2ftable_2eproto[95]);
-}
-// ===================================================================
-
-class SeekRowResponse::_Internal {
- public:
-};
-
-SeekRowResponse::SeekRowResponse(::google::protobuf::Arena* arena)
-    : ::google::protobuf::Message(arena) {
-  SharedCtor(arena);
-  // @@protoc_insertion_point(arena_constructor:io.deephaven.proto.backplane.grpc.SeekRowResponse)
-}
-SeekRowResponse::SeekRowResponse(
-    ::google::protobuf::Arena* arena, const SeekRowResponse& from)
-    : SeekRowResponse(arena) {
-  MergeFrom(from);
-}
-inline PROTOBUF_NDEBUG_INLINE SeekRowResponse::Impl_::Impl_(
-    ::google::protobuf::internal::InternalVisibility visibility,
-    ::google::protobuf::Arena* arena)
-      : _cached_size_{0} {}
-
-inline void SeekRowResponse::SharedCtor(::_pb::Arena* arena) {
-  new (&_impl_) Impl_(internal_visibility(), arena);
-  _impl_.result_row_ = {};
-}
-SeekRowResponse::~SeekRowResponse() {
-  // @@protoc_insertion_point(destructor:io.deephaven.proto.backplane.grpc.SeekRowResponse)
-  _internal_metadata_.Delete<::google::protobuf::UnknownFieldSet>();
-  SharedDtor();
-}
-inline void SeekRowResponse::SharedDtor() {
-  ABSL_DCHECK(GetArena() == nullptr);
-  _impl_.~Impl_();
-}
-
-PROTOBUF_NOINLINE void SeekRowResponse::Clear() {
-// @@protoc_insertion_point(message_clear_start:io.deephaven.proto.backplane.grpc.SeekRowResponse)
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  ::uint32_t cached_has_bits = 0;
-  // Prevent compiler warnings about cached_has_bits being unused
-  (void) cached_has_bits;
-
-  _impl_.result_row_ = ::int64_t{0};
-  _internal_metadata_.Clear<::google::protobuf::UnknownFieldSet>();
-}
-
-const char* SeekRowResponse::_InternalParse(
-    const char* ptr, ::_pbi::ParseContext* ctx) {
-  ptr = ::_pbi::TcParser::ParseLoop(this, ptr, ctx, &_table_.header);
-  return ptr;
-}
-
-
-PROTOBUF_CONSTINIT PROTOBUF_ATTRIBUTE_INIT_PRIORITY1
-const ::_pbi::TcParseTable<0, 1, 0, 0, 2> SeekRowResponse::_table_ = {
-  {
-    0,  // no _has_bits_
-    0, // no _extensions_
-    1, 0,  // max_field_number, fast_idx_mask
-    offsetof(decltype(_table_), field_lookup_table),
-    4294967294,  // skipmap
-    offsetof(decltype(_table_), field_entries),
-    1,  // num_field_entries
-    0,  // num_aux_entries
-    offsetof(decltype(_table_), field_names),  // no aux_entries
-    &_SeekRowResponse_default_instance_._instance,
-    ::_pbi::TcParser::GenericFallback,  // fallback
-  }, {{
-    // sint64 result_row = 1 [jstype = JS_STRING];
-    {::_pbi::TcParser::FastZ64S1,
-     {8, 63, 0, PROTOBUF_FIELD_OFFSET(SeekRowResponse, _impl_.result_row_)}},
-  }}, {{
-    65535, 65535
-  }}, {{
-    // sint64 result_row = 1 [jstype = JS_STRING];
-    {PROTOBUF_FIELD_OFFSET(SeekRowResponse, _impl_.result_row_), 0, 0,
-    (0 | ::_fl::kFcSingular | ::_fl::kSInt64)},
-  }},
-  // no aux_entries
-  {{
-  }},
-};
-
-::uint8_t* SeekRowResponse::_InternalSerialize(
-    ::uint8_t* target,
-    ::google::protobuf::io::EpsCopyOutputStream* stream) const {
-  // @@protoc_insertion_point(serialize_to_array_start:io.deephaven.proto.backplane.grpc.SeekRowResponse)
-  ::uint32_t cached_has_bits = 0;
-  (void)cached_has_bits;
-
-  // sint64 result_row = 1 [jstype = JS_STRING];
-  if (this->_internal_result_row() != 0) {
-    target = stream->EnsureSpace(target);
-    target = ::_pbi::WireFormatLite::WriteSInt64ToArray(
-        1, this->_internal_result_row(), target);
-  }
-
-  if (PROTOBUF_PREDICT_FALSE(_internal_metadata_.have_unknown_fields())) {
-    target =
-        ::_pbi::WireFormat::InternalSerializeUnknownFieldsToArray(
-            _internal_metadata_.unknown_fields<::google::protobuf::UnknownFieldSet>(::google::protobuf::UnknownFieldSet::default_instance), target, stream);
-  }
-  // @@protoc_insertion_point(serialize_to_array_end:io.deephaven.proto.backplane.grpc.SeekRowResponse)
-  return target;
-}
-
-::size_t SeekRowResponse::ByteSizeLong() const {
-// @@protoc_insertion_point(message_byte_size_start:io.deephaven.proto.backplane.grpc.SeekRowResponse)
-  ::size_t total_size = 0;
-
-  ::uint32_t cached_has_bits = 0;
-  // Prevent compiler warnings about cached_has_bits being unused
-  (void) cached_has_bits;
-
-  // sint64 result_row = 1 [jstype = JS_STRING];
-  if (this->_internal_result_row() != 0) {
-    total_size += ::_pbi::WireFormatLite::SInt64SizePlusOne(
-        this->_internal_result_row());
-  }
-
-  return MaybeComputeUnknownFieldsSize(total_size, &_impl_._cached_size_);
-}
-
-const ::google::protobuf::Message::ClassData SeekRowResponse::_class_data_ = {
-    SeekRowResponse::MergeImpl,
-    nullptr,  // OnDemandRegisterArenaDtor
-};
-const ::google::protobuf::Message::ClassData* SeekRowResponse::GetClassData() const {
-  return &_class_data_;
-}
-
-void SeekRowResponse::MergeImpl(::google::protobuf::Message& to_msg, const ::google::protobuf::Message& from_msg) {
-  auto* const _this = static_cast<SeekRowResponse*>(&to_msg);
-  auto& from = static_cast<const SeekRowResponse&>(from_msg);
-  // @@protoc_insertion_point(class_specific_merge_from_start:io.deephaven.proto.backplane.grpc.SeekRowResponse)
-  ABSL_DCHECK_NE(&from, _this);
-  ::uint32_t cached_has_bits = 0;
-  (void) cached_has_bits;
-
-  if (from._internal_result_row() != 0) {
-    _this->_internal_set_result_row(from._internal_result_row());
-  }
-  _this->_internal_metadata_.MergeFrom<::google::protobuf::UnknownFieldSet>(from._internal_metadata_);
-}
-
-void SeekRowResponse::CopyFrom(const SeekRowResponse& from) {
-// @@protoc_insertion_point(class_specific_copy_from_start:io.deephaven.proto.backplane.grpc.SeekRowResponse)
-  if (&from == this) return;
-  Clear();
-  MergeFrom(from);
-}
-
-PROTOBUF_NOINLINE bool SeekRowResponse::IsInitialized() const {
-  return true;
-}
-
-::_pbi::CachedSize* SeekRowResponse::AccessCachedSize() const {
-  return &_impl_._cached_size_;
-}
-void SeekRowResponse::InternalSwap(SeekRowResponse* PROTOBUF_RESTRICT other) {
-  using std::swap;
-  _internal_metadata_.InternalSwap(&other->_internal_metadata_);
-        swap(_impl_.result_row_, other->_impl_.result_row_);
-}
-
-::google::protobuf::Metadata SeekRowResponse::GetMetadata() const {
-  return ::_pbi::AssignDescriptors(
-      &descriptor_table_deephaven_2fproto_2ftable_2eproto_getter, &descriptor_table_deephaven_2fproto_2ftable_2eproto_once,
-      file_level_metadata_deephaven_2fproto_2ftable_2eproto[96]);
-}
-// ===================================================================
-
-class Reference::_Internal {
- public:
-};
-
-Reference::Reference(::google::protobuf::Arena* arena)
-    : ::google::protobuf::Message(arena) {
-  SharedCtor(arena);
-  // @@protoc_insertion_point(arena_constructor:io.deephaven.proto.backplane.grpc.Reference)
-}
-inline PROTOBUF_NDEBUG_INLINE Reference::Impl_::Impl_(
-    ::google::protobuf::internal::InternalVisibility visibility, ::google::protobuf::Arena* arena,
-    const Impl_& from)
-      : column_name_(arena, from.column_name_),
-        _cached_size_{0} {}
-
-Reference::Reference(
-    ::google::protobuf::Arena* arena,
-    const Reference& from)
-    : ::google::protobuf::Message(arena) {
-  Reference* const _this = this;
-  (void)_this;
-  _internal_metadata_.MergeFrom<::google::protobuf::UnknownFieldSet>(
-      from._internal_metadata_);
-  new (&_impl_) Impl_(internal_visibility(), arena, from._impl_);
-
-  // @@protoc_insertion_point(copy_constructor:io.deephaven.proto.backplane.grpc.Reference)
-}
-inline PROTOBUF_NDEBUG_INLINE Reference::Impl_::Impl_(
-    ::google::protobuf::internal::InternalVisibility visibility,
-    ::google::protobuf::Arena* arena)
-      : column_name_(arena),
-        _cached_size_{0} {}
-
-inline void Reference::SharedCtor(::_pb::Arena* arena) {
-  new (&_impl_) Impl_(internal_visibility(), arena);
-}
-Reference::~Reference() {
-  // @@protoc_insertion_point(destructor:io.deephaven.proto.backplane.grpc.Reference)
-  _internal_metadata_.Delete<::google::protobuf::UnknownFieldSet>();
-  SharedDtor();
-}
-inline void Reference::SharedDtor() {
-  ABSL_DCHECK(GetArena() == nullptr);
-  _impl_.column_name_.Destroy();
-  _impl_.~Impl_();
-}
-
-PROTOBUF_NOINLINE void Reference::Clear() {
-// @@protoc_insertion_point(message_clear_start:io.deephaven.proto.backplane.grpc.Reference)
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  ::uint32_t cached_has_bits = 0;
-  // Prevent compiler warnings about cached_has_bits being unused
-  (void) cached_has_bits;
-
-  _impl_.column_name_.ClearToEmpty();
-  _internal_metadata_.Clear<::google::protobuf::UnknownFieldSet>();
-}
-
-const char* Reference::_InternalParse(
-    const char* ptr, ::_pbi::ParseContext* ctx) {
-  ptr = ::_pbi::TcParser::ParseLoop(this, ptr, ctx, &_table_.header);
-  return ptr;
-}
-
-
-PROTOBUF_CONSTINIT PROTOBUF_ATTRIBUTE_INIT_PRIORITY1
-const ::_pbi::TcParseTable<0, 1, 0, 63, 2> Reference::_table_ = {
-  {
-    0,  // no _has_bits_
-    0, // no _extensions_
-    1, 0,  // max_field_number, fast_idx_mask
-    offsetof(decltype(_table_), field_lookup_table),
-    4294967294,  // skipmap
-    offsetof(decltype(_table_), field_entries),
-    1,  // num_field_entries
-    0,  // num_aux_entries
-    offsetof(decltype(_table_), field_names),  // no aux_entries
-    &_Reference_default_instance_._instance,
-    ::_pbi::TcParser::GenericFallback,  // fallback
-  }, {{
-    // string column_name = 1;
-    {::_pbi::TcParser::FastUS1,
-     {10, 63, 0, PROTOBUF_FIELD_OFFSET(Reference, _impl_.column_name_)}},
-  }}, {{
-    65535, 65535
-  }}, {{
-    // string column_name = 1;
-    {PROTOBUF_FIELD_OFFSET(Reference, _impl_.column_name_), 0, 0,
-    (0 | ::_fl::kFcSingular | ::_fl::kUtf8String | ::_fl::kRepAString)},
-  }},
-  // no aux_entries
-  {{
-    "\53\13\0\0\0\0\0\0"
-    "io.deephaven.proto.backplane.grpc.Reference"
-    "column_name"
-  }},
-};
-
-::uint8_t* Reference::_InternalSerialize(
-    ::uint8_t* target,
-    ::google::protobuf::io::EpsCopyOutputStream* stream) const {
-  // @@protoc_insertion_point(serialize_to_array_start:io.deephaven.proto.backplane.grpc.Reference)
-  ::uint32_t cached_has_bits = 0;
-  (void)cached_has_bits;
-
-  // string column_name = 1;
-  if (!this->_internal_column_name().empty()) {
-    const std::string& _s = this->_internal_column_name();
-    ::google::protobuf::internal::WireFormatLite::VerifyUtf8String(
-        _s.data(), static_cast<int>(_s.length()), ::google::protobuf::internal::WireFormatLite::SERIALIZE, "io.deephaven.proto.backplane.grpc.Reference.column_name");
-    target = stream->WriteStringMaybeAliased(1, _s, target);
-  }
-
-  if (PROTOBUF_PREDICT_FALSE(_internal_metadata_.have_unknown_fields())) {
-    target =
-        ::_pbi::WireFormat::InternalSerializeUnknownFieldsToArray(
-            _internal_metadata_.unknown_fields<::google::protobuf::UnknownFieldSet>(::google::protobuf::UnknownFieldSet::default_instance), target, stream);
-  }
-  // @@protoc_insertion_point(serialize_to_array_end:io.deephaven.proto.backplane.grpc.Reference)
-  return target;
-}
-
-::size_t Reference::ByteSizeLong() const {
-// @@protoc_insertion_point(message_byte_size_start:io.deephaven.proto.backplane.grpc.Reference)
-  ::size_t total_size = 0;
-
-  ::uint32_t cached_has_bits = 0;
-  // Prevent compiler warnings about cached_has_bits being unused
-  (void) cached_has_bits;
-
-  // string column_name = 1;
-  if (!this->_internal_column_name().empty()) {
-    total_size += 1 + ::google::protobuf::internal::WireFormatLite::StringSize(
-                                    this->_internal_column_name());
-  }
-
-  return MaybeComputeUnknownFieldsSize(total_size, &_impl_._cached_size_);
-}
-
-const ::google::protobuf::Message::ClassData Reference::_class_data_ = {
-    Reference::MergeImpl,
-    nullptr,  // OnDemandRegisterArenaDtor
-};
-const ::google::protobuf::Message::ClassData* Reference::GetClassData() const {
-  return &_class_data_;
-}
-
-void Reference::MergeImpl(::google::protobuf::Message& to_msg, const ::google::protobuf::Message& from_msg) {
-  auto* const _this = static_cast<Reference*>(&to_msg);
-  auto& from = static_cast<const Reference&>(from_msg);
-  // @@protoc_insertion_point(class_specific_merge_from_start:io.deephaven.proto.backplane.grpc.Reference)
-  ABSL_DCHECK_NE(&from, _this);
-  ::uint32_t cached_has_bits = 0;
-  (void) cached_has_bits;
-
-  if (!from._internal_column_name().empty()) {
-    _this->_internal_set_column_name(from._internal_column_name());
-  }
-  _this->_internal_metadata_.MergeFrom<::google::protobuf::UnknownFieldSet>(from._internal_metadata_);
-}
-
-void Reference::CopyFrom(const Reference& from) {
-// @@protoc_insertion_point(class_specific_copy_from_start:io.deephaven.proto.backplane.grpc.Reference)
-  if (&from == this) return;
-  Clear();
-  MergeFrom(from);
-}
-
-PROTOBUF_NOINLINE bool Reference::IsInitialized() const {
-  return true;
-}
-
-::_pbi::CachedSize* Reference::AccessCachedSize() const {
-  return &_impl_._cached_size_;
-}
-void Reference::InternalSwap(Reference* PROTOBUF_RESTRICT other) {
-  using std::swap;
-  auto* arena = GetArena();
-  ABSL_DCHECK_EQ(arena, other->GetArena());
-  _internal_metadata_.InternalSwap(&other->_internal_metadata_);
-  ::_pbi::ArenaStringPtr::InternalSwap(&_impl_.column_name_, &other->_impl_.column_name_, arena);
-}
-
-::google::protobuf::Metadata Reference::GetMetadata() const {
-  return ::_pbi::AssignDescriptors(
-      &descriptor_table_deephaven_2fproto_2ftable_2eproto_getter, &descriptor_table_deephaven_2fproto_2ftable_2eproto_once,
-      file_level_metadata_deephaven_2fproto_2ftable_2eproto[97]);
-}
-// ===================================================================
-
-class Literal::_Internal {
- public:
-  static constexpr ::int32_t kOneofCaseOffset =
-    PROTOBUF_FIELD_OFFSET(::io::deephaven::proto::backplane::grpc::Literal, _impl_._oneof_case_);
-};
-
-Literal::Literal(::google::protobuf::Arena* arena)
-    : ::google::protobuf::Message(arena) {
-  SharedCtor(arena);
-  // @@protoc_insertion_point(arena_constructor:io.deephaven.proto.backplane.grpc.Literal)
-}
-inline PROTOBUF_NDEBUG_INLINE Literal::Impl_::Impl_(
-    ::google::protobuf::internal::InternalVisibility visibility, ::google::protobuf::Arena* arena,
-    const Impl_& from)
-      : value_{},
-        _cached_size_{0},
-        _oneof_case_{from._oneof_case_[0]} {}
-
-Literal::Literal(
-    ::google::protobuf::Arena* arena,
-    const Literal& from)
-    : ::google::protobuf::Message(arena) {
-  Literal* const _this = this;
-  (void)_this;
-  _internal_metadata_.MergeFrom<::google::protobuf::UnknownFieldSet>(
-      from._internal_metadata_);
-  new (&_impl_) Impl_(internal_visibility(), arena, from._impl_);
-  switch (value_case()) {
-    case VALUE_NOT_SET:
-      break;
-      case kStringValue:
-        new (&_impl_.value_.string_value_) decltype(_impl_.value_.string_value_){arena, from._impl_.value_.string_value_};
-        break;
-      case kDoubleValue:
-        _impl_.value_.double_value_ = from._impl_.value_.double_value_;
-        break;
-      case kBoolValue:
-        _impl_.value_.bool_value_ = from._impl_.value_.bool_value_;
-        break;
-      case kLongValue:
-        _impl_.value_.long_value_ = from._impl_.value_.long_value_;
-        break;
-      case kNanoTimeValue:
-        _impl_.value_.nano_time_value_ = from._impl_.value_.nano_time_value_;
-        break;
-  }
-
-  // @@protoc_insertion_point(copy_constructor:io.deephaven.proto.backplane.grpc.Literal)
-}
-inline PROTOBUF_NDEBUG_INLINE Literal::Impl_::Impl_(
-    ::google::protobuf::internal::InternalVisibility visibility,
-    ::google::protobuf::Arena* arena)
-      : value_{},
-        _cached_size_{0},
-        _oneof_case_{} {}
-
-inline void Literal::SharedCtor(::_pb::Arena* arena) {
-  new (&_impl_) Impl_(internal_visibility(), arena);
-}
-Literal::~Literal() {
-  // @@protoc_insertion_point(destructor:io.deephaven.proto.backplane.grpc.Literal)
-  _internal_metadata_.Delete<::google::protobuf::UnknownFieldSet>();
-  SharedDtor();
-}
-inline void Literal::SharedDtor() {
-  ABSL_DCHECK(GetArena() == nullptr);
-  if (has_value()) {
-    clear_value();
-  }
-  _impl_.~Impl_();
-}
-
-void Literal::clear_value() {
-// @@protoc_insertion_point(one_of_clear_start:io.deephaven.proto.backplane.grpc.Literal)
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  switch (value_case()) {
-    case kStringValue: {
-      _impl_.value_.string_value_.Destroy();
-      break;
-    }
-    case kDoubleValue: {
-      // No need to clear
-      break;
-    }
-    case kBoolValue: {
-      // No need to clear
-      break;
-    }
-    case kLongValue: {
-      // No need to clear
-      break;
-    }
-    case kNanoTimeValue: {
-      // No need to clear
-      break;
-    }
-    case VALUE_NOT_SET: {
-      break;
-    }
-  }
-  _impl_._oneof_case_[0] = VALUE_NOT_SET;
-}
-
-
-PROTOBUF_NOINLINE void Literal::Clear() {
-// @@protoc_insertion_point(message_clear_start:io.deephaven.proto.backplane.grpc.Literal)
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  ::uint32_t cached_has_bits = 0;
-  // Prevent compiler warnings about cached_has_bits being unused
-  (void) cached_has_bits;
-
-  clear_value();
-  _internal_metadata_.Clear<::google::protobuf::UnknownFieldSet>();
-}
-
-const char* Literal::_InternalParse(
-    const char* ptr, ::_pbi::ParseContext* ctx) {
-  ptr = ::_pbi::TcParser::ParseLoop(this, ptr, ctx, &_table_.header);
-  return ptr;
-}
-
-
-PROTOBUF_CONSTINIT PROTOBUF_ATTRIBUTE_INIT_PRIORITY1
-const ::_pbi::TcParseTable<0, 5, 0, 62, 2> Literal::_table_ = {
-  {
-    0,  // no _has_bits_
-    0, // no _extensions_
-    5, 0,  // max_field_number, fast_idx_mask
-    offsetof(decltype(_table_), field_lookup_table),
-    4294967264,  // skipmap
-    offsetof(decltype(_table_), field_entries),
-    5,  // num_field_entries
-    0,  // num_aux_entries
-    offsetof(decltype(_table_), field_names),  // no aux_entries
-    &_Literal_default_instance_._instance,
-    ::_pbi::TcParser::GenericFallback,  // fallback
-  }, {{
-    {::_pbi::TcParser::MiniParse, {}},
-  }}, {{
-    65535, 65535
-  }}, {{
-    // string string_value = 1;
-    {PROTOBUF_FIELD_OFFSET(Literal, _impl_.value_.string_value_), _Internal::kOneofCaseOffset + 0, 0,
-    (0 | ::_fl::kFcOneof | ::_fl::kUtf8String | ::_fl::kRepAString)},
-    // double double_value = 2;
-    {PROTOBUF_FIELD_OFFSET(Literal, _impl_.value_.double_value_), _Internal::kOneofCaseOffset + 0, 0,
-    (0 | ::_fl::kFcOneof | ::_fl::kDouble)},
-    // bool bool_value = 3;
-    {PROTOBUF_FIELD_OFFSET(Literal, _impl_.value_.bool_value_), _Internal::kOneofCaseOffset + 0, 0,
-    (0 | ::_fl::kFcOneof | ::_fl::kBool)},
-    // sint64 long_value = 4 [jstype = JS_STRING];
-    {PROTOBUF_FIELD_OFFSET(Literal, _impl_.value_.long_value_), _Internal::kOneofCaseOffset + 0, 0,
-    (0 | ::_fl::kFcOneof | ::_fl::kSInt64)},
-    // sint64 nano_time_value = 5 [jstype = JS_STRING];
-    {PROTOBUF_FIELD_OFFSET(Literal, _impl_.value_.nano_time_value_), _Internal::kOneofCaseOffset + 0, 0,
-    (0 | ::_fl::kFcOneof | ::_fl::kSInt64)},
-  }},
-  // no aux_entries
-  {{
-    "\51\14\0\0\0\0\0\0"
-    "io.deephaven.proto.backplane.grpc.Literal"
-    "string_value"
-  }},
-};
-
-::uint8_t* Literal::_InternalSerialize(
-    ::uint8_t* target,
-    ::google::protobuf::io::EpsCopyOutputStream* stream) const {
-  // @@protoc_insertion_point(serialize_to_array_start:io.deephaven.proto.backplane.grpc.Literal)
-  ::uint32_t cached_has_bits = 0;
-  (void)cached_has_bits;
-
-  switch (value_case()) {
-    case kStringValue: {
-      const std::string& _s = this->_internal_string_value();
-      ::google::protobuf::internal::WireFormatLite::VerifyUtf8String(
-          _s.data(), static_cast<int>(_s.length()), ::google::protobuf::internal::WireFormatLite::SERIALIZE, "io.deephaven.proto.backplane.grpc.Literal.string_value");
-      target = stream->WriteStringMaybeAliased(1, _s, target);
-      break;
-    }
-    case kDoubleValue: {
-      target = stream->EnsureSpace(target);
-      target = ::_pbi::WireFormatLite::WriteDoubleToArray(
-          2, this->_internal_double_value(), target);
-      break;
-    }
-    case kBoolValue: {
-      target = stream->EnsureSpace(target);
-      target = ::_pbi::WireFormatLite::WriteBoolToArray(
-          3, this->_internal_bool_value(), target);
-      break;
-    }
-    case kLongValue: {
-      target = stream->EnsureSpace(target);
-      target = ::_pbi::WireFormatLite::WriteSInt64ToArray(
-          4, this->_internal_long_value(), target);
-      break;
-    }
-    case kNanoTimeValue: {
-      target = stream->EnsureSpace(target);
-      target = ::_pbi::WireFormatLite::WriteSInt64ToArray(
-          5, this->_internal_nano_time_value(), target);
-      break;
-    }
-    default:
-      break;
-  }
-  if (PROTOBUF_PREDICT_FALSE(_internal_metadata_.have_unknown_fields())) {
-    target =
-        ::_pbi::WireFormat::InternalSerializeUnknownFieldsToArray(
-            _internal_metadata_.unknown_fields<::google::protobuf::UnknownFieldSet>(::google::protobuf::UnknownFieldSet::default_instance), target, stream);
-  }
-  // @@protoc_insertion_point(serialize_to_array_end:io.deephaven.proto.backplane.grpc.Literal)
-  return target;
-}
-
-::size_t Literal::ByteSizeLong() const {
-// @@protoc_insertion_point(message_byte_size_start:io.deephaven.proto.backplane.grpc.Literal)
-  ::size_t total_size = 0;
-
-  ::uint32_t cached_has_bits = 0;
-  // Prevent compiler warnings about cached_has_bits being unused
-  (void) cached_has_bits;
-
-  switch (value_case()) {
-    // string string_value = 1;
-    case kStringValue: {
-      total_size += 1 + ::google::protobuf::internal::WireFormatLite::StringSize(
-                                      this->_internal_string_value());
-      break;
-    }
-    // double double_value = 2;
-    case kDoubleValue: {
-      total_size += 9;
-      break;
-    }
-    // bool bool_value = 3;
-    case kBoolValue: {
-      total_size += 2;
-      break;
-    }
-    // sint64 long_value = 4 [jstype = JS_STRING];
-    case kLongValue: {
-      total_size += ::_pbi::WireFormatLite::SInt64SizePlusOne(
-          this->_internal_long_value());
-      break;
-    }
-    // sint64 nano_time_value = 5 [jstype = JS_STRING];
-    case kNanoTimeValue: {
-      total_size += ::_pbi::WireFormatLite::SInt64SizePlusOne(
-          this->_internal_nano_time_value());
-      break;
-    }
-    case VALUE_NOT_SET: {
-      break;
-    }
-  }
-  return MaybeComputeUnknownFieldsSize(total_size, &_impl_._cached_size_);
-}
-
-const ::google::protobuf::Message::ClassData Literal::_class_data_ = {
-    Literal::MergeImpl,
-    nullptr,  // OnDemandRegisterArenaDtor
-};
-const ::google::protobuf::Message::ClassData* Literal::GetClassData() const {
-  return &_class_data_;
-}
-
-void Literal::MergeImpl(::google::protobuf::Message& to_msg, const ::google::protobuf::Message& from_msg) {
-  auto* const _this = static_cast<Literal*>(&to_msg);
-  auto& from = static_cast<const Literal&>(from_msg);
-  // @@protoc_insertion_point(class_specific_merge_from_start:io.deephaven.proto.backplane.grpc.Literal)
-  ABSL_DCHECK_NE(&from, _this);
-  ::uint32_t cached_has_bits = 0;
-  (void) cached_has_bits;
-
-  switch (from.value_case()) {
-    case kStringValue: {
-      _this->_internal_set_string_value(from._internal_string_value());
-      break;
-    }
-    case kDoubleValue: {
-      _this->_internal_set_double_value(from._internal_double_value());
-      break;
-    }
-    case kBoolValue: {
-      _this->_internal_set_bool_value(from._internal_bool_value());
-      break;
-    }
-    case kLongValue: {
-      _this->_internal_set_long_value(from._internal_long_value());
-      break;
-    }
-    case kNanoTimeValue: {
-      _this->_internal_set_nano_time_value(from._internal_nano_time_value());
-      break;
-    }
-    case VALUE_NOT_SET: {
-      break;
-    }
-  }
-  _this->_internal_metadata_.MergeFrom<::google::protobuf::UnknownFieldSet>(from._internal_metadata_);
-}
-
-void Literal::CopyFrom(const Literal& from) {
-// @@protoc_insertion_point(class_specific_copy_from_start:io.deephaven.proto.backplane.grpc.Literal)
-  if (&from == this) return;
-  Clear();
-  MergeFrom(from);
-}
-
-PROTOBUF_NOINLINE bool Literal::IsInitialized() const {
-  return true;
-}
-
-::_pbi::CachedSize* Literal::AccessCachedSize() const {
-  return &_impl_._cached_size_;
-}
-void Literal::InternalSwap(Literal* PROTOBUF_RESTRICT other) {
-  using std::swap;
-  _internal_metadata_.InternalSwap(&other->_internal_metadata_);
-  swap(_impl_.value_, other->_impl_.value_);
-  swap(_impl_._oneof_case_[0], other->_impl_._oneof_case_[0]);
-}
-
-::google::protobuf::Metadata Literal::GetMetadata() const {
-  return ::_pbi::AssignDescriptors(
-      &descriptor_table_deephaven_2fproto_2ftable_2eproto_getter, &descriptor_table_deephaven_2fproto_2ftable_2eproto_once,
-      file_level_metadata_deephaven_2fproto_2ftable_2eproto[98]);
-}
-// ===================================================================
-
-class Value::_Internal {
- public:
-  static constexpr ::int32_t kOneofCaseOffset =
-    PROTOBUF_FIELD_OFFSET(::io::deephaven::proto::backplane::grpc::Value, _impl_._oneof_case_);
-  static const ::io::deephaven::proto::backplane::grpc::Reference& reference(const Value* msg);
-  static const ::io::deephaven::proto::backplane::grpc::Literal& literal(const Value* msg);
-};
-
-const ::io::deephaven::proto::backplane::grpc::Reference& Value::_Internal::reference(const Value* msg) {
-  return *msg->_impl_.data_.reference_;
-}
-const ::io::deephaven::proto::backplane::grpc::Literal& Value::_Internal::literal(const Value* msg) {
-  return *msg->_impl_.data_.literal_;
-}
-void Value::set_allocated_reference(::io::deephaven::proto::backplane::grpc::Reference* reference) {
-  ::google::protobuf::Arena* message_arena = GetArena();
-  clear_data();
-  if (reference) {
-    ::google::protobuf::Arena* submessage_arena = reference->GetArena();
-    if (message_arena != submessage_arena) {
-      reference = ::google::protobuf::internal::GetOwnedMessage(message_arena, reference, submessage_arena);
-    }
-    set_has_reference();
-    _impl_.data_.reference_ = reference;
-  }
-  // @@protoc_insertion_point(field_set_allocated:io.deephaven.proto.backplane.grpc.Value.reference)
-}
-void Value::set_allocated_literal(::io::deephaven::proto::backplane::grpc::Literal* literal) {
-  ::google::protobuf::Arena* message_arena = GetArena();
-  clear_data();
-  if (literal) {
-    ::google::protobuf::Arena* submessage_arena = literal->GetArena();
-    if (message_arena != submessage_arena) {
-      literal = ::google::protobuf::internal::GetOwnedMessage(message_arena, literal, submessage_arena);
-    }
-    set_has_literal();
-    _impl_.data_.literal_ = literal;
-  }
-  // @@protoc_insertion_point(field_set_allocated:io.deephaven.proto.backplane.grpc.Value.literal)
-}
-Value::Value(::google::protobuf::Arena* arena)
-    : ::google::protobuf::Message(arena) {
-  SharedCtor(arena);
-  // @@protoc_insertion_point(arena_constructor:io.deephaven.proto.backplane.grpc.Value)
-}
-inline PROTOBUF_NDEBUG_INLINE Value::Impl_::Impl_(
-    ::google::protobuf::internal::InternalVisibility visibility, ::google::protobuf::Arena* arena,
-    const Impl_& from)
-      : data_{},
-        _cached_size_{0},
-        _oneof_case_{from._oneof_case_[0]} {}
-
-Value::Value(
-    ::google::protobuf::Arena* arena,
-    const Value& from)
-    : ::google::protobuf::Message(arena) {
-  Value* const _this = this;
-  (void)_this;
-  _internal_metadata_.MergeFrom<::google::protobuf::UnknownFieldSet>(
-      from._internal_metadata_);
-  new (&_impl_) Impl_(internal_visibility(), arena, from._impl_);
-  switch (data_case()) {
-    case DATA_NOT_SET:
-      break;
-      case kReference:
-        _impl_.data_.reference_ = CreateMaybeMessage<::io::deephaven::proto::backplane::grpc::Reference>(arena, *from._impl_.data_.reference_);
-        break;
-      case kLiteral:
-        _impl_.data_.literal_ = CreateMaybeMessage<::io::deephaven::proto::backplane::grpc::Literal>(arena, *from._impl_.data_.literal_);
-        break;
-  }
-
-  // @@protoc_insertion_point(copy_constructor:io.deephaven.proto.backplane.grpc.Value)
-}
-inline PROTOBUF_NDEBUG_INLINE Value::Impl_::Impl_(
-    ::google::protobuf::internal::InternalVisibility visibility,
-    ::google::protobuf::Arena* arena)
-      : data_{},
-        _cached_size_{0},
-        _oneof_case_{} {}
-
-inline void Value::SharedCtor(::_pb::Arena* arena) {
-  new (&_impl_) Impl_(internal_visibility(), arena);
-}
-Value::~Value() {
-  // @@protoc_insertion_point(destructor:io.deephaven.proto.backplane.grpc.Value)
-  _internal_metadata_.Delete<::google::protobuf::UnknownFieldSet>();
-  SharedDtor();
-}
-inline void Value::SharedDtor() {
-  ABSL_DCHECK(GetArena() == nullptr);
-  if (has_data()) {
-    clear_data();
-  }
-  _impl_.~Impl_();
-}
-
-void Value::clear_data() {
-// @@protoc_insertion_point(one_of_clear_start:io.deephaven.proto.backplane.grpc.Value)
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  switch (data_case()) {
-    case kReference: {
-      if (GetArena() == nullptr) {
-        delete _impl_.data_.reference_;
-      }
-      break;
-    }
-    case kLiteral: {
-      if (GetArena() == nullptr) {
-        delete _impl_.data_.literal_;
-      }
-      break;
-    }
-    case DATA_NOT_SET: {
-      break;
-    }
-  }
-  _impl_._oneof_case_[0] = DATA_NOT_SET;
-}
-
-
-PROTOBUF_NOINLINE void Value::Clear() {
-// @@protoc_insertion_point(message_clear_start:io.deephaven.proto.backplane.grpc.Value)
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  ::uint32_t cached_has_bits = 0;
-  // Prevent compiler warnings about cached_has_bits being unused
-  (void) cached_has_bits;
-
-  clear_data();
-  _internal_metadata_.Clear<::google::protobuf::UnknownFieldSet>();
-}
-
-const char* Value::_InternalParse(
-    const char* ptr, ::_pbi::ParseContext* ctx) {
-  ptr = ::_pbi::TcParser::ParseLoop(this, ptr, ctx, &_table_.header);
-  return ptr;
-}
-
-
-PROTOBUF_CONSTINIT PROTOBUF_ATTRIBUTE_INIT_PRIORITY1
-const ::_pbi::TcParseTable<0, 2, 2, 0, 2> Value::_table_ = {
-  {
-    0,  // no _has_bits_
-    0, // no _extensions_
-    2, 0,  // max_field_number, fast_idx_mask
-    offsetof(decltype(_table_), field_lookup_table),
-    4294967292,  // skipmap
-    offsetof(decltype(_table_), field_entries),
-    2,  // num_field_entries
-    2,  // num_aux_entries
-    offsetof(decltype(_table_), aux_entries),
-    &_Value_default_instance_._instance,
-    ::_pbi::TcParser::GenericFallback,  // fallback
-  }, {{
-    {::_pbi::TcParser::MiniParse, {}},
-  }}, {{
-    65535, 65535
-  }}, {{
-    // .io.deephaven.proto.backplane.grpc.Reference reference = 1;
-    {PROTOBUF_FIELD_OFFSET(Value, _impl_.data_.reference_), _Internal::kOneofCaseOffset + 0, 0,
-    (0 | ::_fl::kFcOneof | ::_fl::kMessage | ::_fl::kTvTable)},
-    // .io.deephaven.proto.backplane.grpc.Literal literal = 2;
-    {PROTOBUF_FIELD_OFFSET(Value, _impl_.data_.literal_), _Internal::kOneofCaseOffset + 0, 1,
-    (0 | ::_fl::kFcOneof | ::_fl::kMessage | ::_fl::kTvTable)},
-  }}, {{
-    {::_pbi::TcParser::GetTable<::io::deephaven::proto::backplane::grpc::Reference>()},
-    {::_pbi::TcParser::GetTable<::io::deephaven::proto::backplane::grpc::Literal>()},
-  }}, {{
-  }},
-};
-
-::uint8_t* Value::_InternalSerialize(
-    ::uint8_t* target,
-    ::google::protobuf::io::EpsCopyOutputStream* stream) const {
-  // @@protoc_insertion_point(serialize_to_array_start:io.deephaven.proto.backplane.grpc.Value)
-  ::uint32_t cached_has_bits = 0;
-  (void)cached_has_bits;
-
-  switch (data_case()) {
-    case kReference: {
-      target = ::google::protobuf::internal::WireFormatLite::InternalWriteMessage(
-          1, _Internal::reference(this),
-          _Internal::reference(this).GetCachedSize(), target, stream);
-      break;
-    }
-    case kLiteral: {
-      target = ::google::protobuf::internal::WireFormatLite::InternalWriteMessage(
-          2, _Internal::literal(this),
-          _Internal::literal(this).GetCachedSize(), target, stream);
-      break;
-    }
-    default:
-      break;
-  }
-  if (PROTOBUF_PREDICT_FALSE(_internal_metadata_.have_unknown_fields())) {
-    target =
-        ::_pbi::WireFormat::InternalSerializeUnknownFieldsToArray(
-            _internal_metadata_.unknown_fields<::google::protobuf::UnknownFieldSet>(::google::protobuf::UnknownFieldSet::default_instance), target, stream);
-  }
-  // @@protoc_insertion_point(serialize_to_array_end:io.deephaven.proto.backplane.grpc.Value)
-  return target;
-}
-
-::size_t Value::ByteSizeLong() const {
-// @@protoc_insertion_point(message_byte_size_start:io.deephaven.proto.backplane.grpc.Value)
-  ::size_t total_size = 0;
-
-  ::uint32_t cached_has_bits = 0;
-  // Prevent compiler warnings about cached_has_bits being unused
-  (void) cached_has_bits;
-
-  switch (data_case()) {
-    // .io.deephaven.proto.backplane.grpc.Reference reference = 1;
-    case kReference: {
-      total_size +=
-          1 + ::google::protobuf::internal::WireFormatLite::MessageSize(*_impl_.data_.reference_);
-      break;
-    }
-    // .io.deephaven.proto.backplane.grpc.Literal literal = 2;
-    case kLiteral: {
-      total_size +=
-          1 + ::google::protobuf::internal::WireFormatLite::MessageSize(*_impl_.data_.literal_);
-      break;
-    }
-    case DATA_NOT_SET: {
-      break;
-    }
-  }
-  return MaybeComputeUnknownFieldsSize(total_size, &_impl_._cached_size_);
-}
-
-const ::google::protobuf::Message::ClassData Value::_class_data_ = {
-    Value::MergeImpl,
-    nullptr,  // OnDemandRegisterArenaDtor
-};
-const ::google::protobuf::Message::ClassData* Value::GetClassData() const {
-  return &_class_data_;
-}
-
-void Value::MergeImpl(::google::protobuf::Message& to_msg, const ::google::protobuf::Message& from_msg) {
-  auto* const _this = static_cast<Value*>(&to_msg);
-  auto& from = static_cast<const Value&>(from_msg);
-  // @@protoc_insertion_point(class_specific_merge_from_start:io.deephaven.proto.backplane.grpc.Value)
-  ABSL_DCHECK_NE(&from, _this);
-  ::uint32_t cached_has_bits = 0;
-  (void) cached_has_bits;
-
-  switch (from.data_case()) {
-    case kReference: {
-      _this->_internal_mutable_reference()->::io::deephaven::proto::backplane::grpc::Reference::MergeFrom(
-          from._internal_reference());
-      break;
-    }
-    case kLiteral: {
-      _this->_internal_mutable_literal()->::io::deephaven::proto::backplane::grpc::Literal::MergeFrom(
-          from._internal_literal());
-      break;
-    }
-    case DATA_NOT_SET: {
-      break;
-    }
-  }
-  _this->_internal_metadata_.MergeFrom<::google::protobuf::UnknownFieldSet>(from._internal_metadata_);
-}
-
-void Value::CopyFrom(const Value& from) {
-// @@protoc_insertion_point(class_specific_copy_from_start:io.deephaven.proto.backplane.grpc.Value)
-  if (&from == this) return;
-  Clear();
-  MergeFrom(from);
-}
-
-PROTOBUF_NOINLINE bool Value::IsInitialized() const {
-  return true;
-}
-
-::_pbi::CachedSize* Value::AccessCachedSize() const {
-  return &_impl_._cached_size_;
-}
-void Value::InternalSwap(Value* PROTOBUF_RESTRICT other) {
-  using std::swap;
-  _internal_metadata_.InternalSwap(&other->_internal_metadata_);
-  swap(_impl_.data_, other->_impl_.data_);
-  swap(_impl_._oneof_case_[0], other->_impl_._oneof_case_[0]);
-}
-
-::google::protobuf::Metadata Value::GetMetadata() const {
-  return ::_pbi::AssignDescriptors(
-      &descriptor_table_deephaven_2fproto_2ftable_2eproto_getter, &descriptor_table_deephaven_2fproto_2ftable_2eproto_once,
-      file_level_metadata_deephaven_2fproto_2ftable_2eproto[99]);
-}
-// ===================================================================
-
-class Condition::_Internal {
- public:
-  static constexpr ::int32_t kOneofCaseOffset =
-    PROTOBUF_FIELD_OFFSET(::io::deephaven::proto::backplane::grpc::Condition, _impl_._oneof_case_);
-  static const ::io::deephaven::proto::backplane::grpc::AndCondition& and_(const Condition* msg);
-  static const ::io::deephaven::proto::backplane::grpc::OrCondition& or_(const Condition* msg);
-  static const ::io::deephaven::proto::backplane::grpc::NotCondition& not_(const Condition* msg);
-  static const ::io::deephaven::proto::backplane::grpc::CompareCondition& compare(const Condition* msg);
-  static const ::io::deephaven::proto::backplane::grpc::InCondition& in(const Condition* msg);
-  static const ::io::deephaven::proto::backplane::grpc::InvokeCondition& invoke(const Condition* msg);
-  static const ::io::deephaven::proto::backplane::grpc::IsNullCondition& is_null(const Condition* msg);
-  static const ::io::deephaven::proto::backplane::grpc::MatchesCondition& matches(const Condition* msg);
-  static const ::io::deephaven::proto::backplane::grpc::ContainsCondition& contains(const Condition* msg);
-  static const ::io::deephaven::proto::backplane::grpc::SearchCondition& search(const Condition* msg);
-};
-
-const ::io::deephaven::proto::backplane::grpc::AndCondition& Condition::_Internal::and_(const Condition* msg) {
-  return *msg->_impl_.data_.and__;
-}
-const ::io::deephaven::proto::backplane::grpc::OrCondition& Condition::_Internal::or_(const Condition* msg) {
-  return *msg->_impl_.data_.or__;
-}
-const ::io::deephaven::proto::backplane::grpc::NotCondition& Condition::_Internal::not_(const Condition* msg) {
-  return *msg->_impl_.data_.not__;
-}
-const ::io::deephaven::proto::backplane::grpc::CompareCondition& Condition::_Internal::compare(const Condition* msg) {
-  return *msg->_impl_.data_.compare_;
-}
-const ::io::deephaven::proto::backplane::grpc::InCondition& Condition::_Internal::in(const Condition* msg) {
-  return *msg->_impl_.data_.in_;
-}
-const ::io::deephaven::proto::backplane::grpc::InvokeCondition& Condition::_Internal::invoke(const Condition* msg) {
-  return *msg->_impl_.data_.invoke_;
-}
-const ::io::deephaven::proto::backplane::grpc::IsNullCondition& Condition::_Internal::is_null(const Condition* msg) {
-  return *msg->_impl_.data_.is_null_;
-}
-const ::io::deephaven::proto::backplane::grpc::MatchesCondition& Condition::_Internal::matches(const Condition* msg) {
-  return *msg->_impl_.data_.matches_;
-}
-const ::io::deephaven::proto::backplane::grpc::ContainsCondition& Condition::_Internal::contains(const Condition* msg) {
-  return *msg->_impl_.data_.contains_;
-}
-const ::io::deephaven::proto::backplane::grpc::SearchCondition& Condition::_Internal::search(const Condition* msg) {
-  return *msg->_impl_.data_.search_;
-}
-void Condition::set_allocated_and_(::io::deephaven::proto::backplane::grpc::AndCondition* and_) {
-  ::google::protobuf::Arena* message_arena = GetArena();
-  clear_data();
-  if (and_) {
-    ::google::protobuf::Arena* submessage_arena = and_->GetArena();
-    if (message_arena != submessage_arena) {
-      and_ = ::google::protobuf::internal::GetOwnedMessage(message_arena, and_, submessage_arena);
-    }
-    set_has_and_();
-    _impl_.data_.and__ = and_;
-  }
-  // @@protoc_insertion_point(field_set_allocated:io.deephaven.proto.backplane.grpc.Condition.and)
-}
-void Condition::set_allocated_or_(::io::deephaven::proto::backplane::grpc::OrCondition* or_) {
-  ::google::protobuf::Arena* message_arena = GetArena();
-  clear_data();
-  if (or_) {
-    ::google::protobuf::Arena* submessage_arena = or_->GetArena();
-    if (message_arena != submessage_arena) {
-      or_ = ::google::protobuf::internal::GetOwnedMessage(message_arena, or_, submessage_arena);
-    }
-    set_has_or_();
-    _impl_.data_.or__ = or_;
-  }
-  // @@protoc_insertion_point(field_set_allocated:io.deephaven.proto.backplane.grpc.Condition.or)
-}
-void Condition::set_allocated_not_(::io::deephaven::proto::backplane::grpc::NotCondition* not_) {
-  ::google::protobuf::Arena* message_arena = GetArena();
-  clear_data();
-  if (not_) {
-    ::google::protobuf::Arena* submessage_arena = not_->GetArena();
-    if (message_arena != submessage_arena) {
-      not_ = ::google::protobuf::internal::GetOwnedMessage(message_arena, not_, submessage_arena);
-    }
-    set_has_not_();
-    _impl_.data_.not__ = not_;
-  }
-  // @@protoc_insertion_point(field_set_allocated:io.deephaven.proto.backplane.grpc.Condition.not)
-}
-void Condition::set_allocated_compare(::io::deephaven::proto::backplane::grpc::CompareCondition* compare) {
-  ::google::protobuf::Arena* message_arena = GetArena();
-  clear_data();
-  if (compare) {
-    ::google::protobuf::Arena* submessage_arena = compare->GetArena();
-    if (message_arena != submessage_arena) {
-      compare = ::google::protobuf::internal::GetOwnedMessage(message_arena, compare, submessage_arena);
-    }
-    set_has_compare();
-    _impl_.data_.compare_ = compare;
-  }
-  // @@protoc_insertion_point(field_set_allocated:io.deephaven.proto.backplane.grpc.Condition.compare)
-}
-void Condition::set_allocated_in(::io::deephaven::proto::backplane::grpc::InCondition* in) {
-  ::google::protobuf::Arena* message_arena = GetArena();
-  clear_data();
-  if (in) {
-    ::google::protobuf::Arena* submessage_arena = in->GetArena();
-    if (message_arena != submessage_arena) {
-      in = ::google::protobuf::internal::GetOwnedMessage(message_arena, in, submessage_arena);
-    }
-    set_has_in();
-    _impl_.data_.in_ = in;
-  }
-  // @@protoc_insertion_point(field_set_allocated:io.deephaven.proto.backplane.grpc.Condition.in)
-}
-void Condition::set_allocated_invoke(::io::deephaven::proto::backplane::grpc::InvokeCondition* invoke) {
-  ::google::protobuf::Arena* message_arena = GetArena();
-  clear_data();
-  if (invoke) {
-    ::google::protobuf::Arena* submessage_arena = invoke->GetArena();
-    if (message_arena != submessage_arena) {
-      invoke = ::google::protobuf::internal::GetOwnedMessage(message_arena, invoke, submessage_arena);
-    }
-    set_has_invoke();
-    _impl_.data_.invoke_ = invoke;
-  }
-  // @@protoc_insertion_point(field_set_allocated:io.deephaven.proto.backplane.grpc.Condition.invoke)
-}
-void Condition::set_allocated_is_null(::io::deephaven::proto::backplane::grpc::IsNullCondition* is_null) {
-  ::google::protobuf::Arena* message_arena = GetArena();
-  clear_data();
-  if (is_null) {
-    ::google::protobuf::Arena* submessage_arena = is_null->GetArena();
-    if (message_arena != submessage_arena) {
-      is_null = ::google::protobuf::internal::GetOwnedMessage(message_arena, is_null, submessage_arena);
-    }
-    set_has_is_null();
-    _impl_.data_.is_null_ = is_null;
-  }
-  // @@protoc_insertion_point(field_set_allocated:io.deephaven.proto.backplane.grpc.Condition.is_null)
-}
-void Condition::set_allocated_matches(::io::deephaven::proto::backplane::grpc::MatchesCondition* matches) {
-  ::google::protobuf::Arena* message_arena = GetArena();
-  clear_data();
-  if (matches) {
-    ::google::protobuf::Arena* submessage_arena = matches->GetArena();
-    if (message_arena != submessage_arena) {
-      matches = ::google::protobuf::internal::GetOwnedMessage(message_arena, matches, submessage_arena);
-    }
-    set_has_matches();
-    _impl_.data_.matches_ = matches;
-  }
-  // @@protoc_insertion_point(field_set_allocated:io.deephaven.proto.backplane.grpc.Condition.matches)
-}
-void Condition::set_allocated_contains(::io::deephaven::proto::backplane::grpc::ContainsCondition* contains) {
-  ::google::protobuf::Arena* message_arena = GetArena();
-  clear_data();
-  if (contains) {
-    ::google::protobuf::Arena* submessage_arena = contains->GetArena();
-    if (message_arena != submessage_arena) {
-      contains = ::google::protobuf::internal::GetOwnedMessage(message_arena, contains, submessage_arena);
-    }
-    set_has_contains();
-    _impl_.data_.contains_ = contains;
-  }
-  // @@protoc_insertion_point(field_set_allocated:io.deephaven.proto.backplane.grpc.Condition.contains)
-}
-void Condition::set_allocated_search(::io::deephaven::proto::backplane::grpc::SearchCondition* search) {
-  ::google::protobuf::Arena* message_arena = GetArena();
-  clear_data();
-  if (search) {
-    ::google::protobuf::Arena* submessage_arena = search->GetArena();
-    if (message_arena != submessage_arena) {
-      search = ::google::protobuf::internal::GetOwnedMessage(message_arena, search, submessage_arena);
-    }
-    set_has_search();
-    _impl_.data_.search_ = search;
-  }
-  // @@protoc_insertion_point(field_set_allocated:io.deephaven.proto.backplane.grpc.Condition.search)
-}
-Condition::Condition(::google::protobuf::Arena* arena)
-    : ::google::protobuf::Message(arena) {
-  SharedCtor(arena);
-  // @@protoc_insertion_point(arena_constructor:io.deephaven.proto.backplane.grpc.Condition)
-}
-inline PROTOBUF_NDEBUG_INLINE Condition::Impl_::Impl_(
-    ::google::protobuf::internal::InternalVisibility visibility, ::google::protobuf::Arena* arena,
-    const Impl_& from)
-      : data_{},
-        _cached_size_{0},
-        _oneof_case_{from._oneof_case_[0]} {}
-
-Condition::Condition(
-    ::google::protobuf::Arena* arena,
-    const Condition& from)
-    : ::google::protobuf::Message(arena) {
-  Condition* const _this = this;
-  (void)_this;
-  _internal_metadata_.MergeFrom<::google::protobuf::UnknownFieldSet>(
-      from._internal_metadata_);
-  new (&_impl_) Impl_(internal_visibility(), arena, from._impl_);
-  switch (data_case()) {
-    case DATA_NOT_SET:
-      break;
-      case kAnd:
-        _impl_.data_.and__ = CreateMaybeMessage<::io::deephaven::proto::backplane::grpc::AndCondition>(arena, *from._impl_.data_.and__);
-        break;
-      case kOr:
-        _impl_.data_.or__ = CreateMaybeMessage<::io::deephaven::proto::backplane::grpc::OrCondition>(arena, *from._impl_.data_.or__);
-        break;
-      case kNot:
-        _impl_.data_.not__ = CreateMaybeMessage<::io::deephaven::proto::backplane::grpc::NotCondition>(arena, *from._impl_.data_.not__);
-        break;
-      case kCompare:
-        _impl_.data_.compare_ = CreateMaybeMessage<::io::deephaven::proto::backplane::grpc::CompareCondition>(arena, *from._impl_.data_.compare_);
-        break;
-      case kIn:
-        _impl_.data_.in_ = CreateMaybeMessage<::io::deephaven::proto::backplane::grpc::InCondition>(arena, *from._impl_.data_.in_);
-        break;
-      case kInvoke:
-        _impl_.data_.invoke_ = CreateMaybeMessage<::io::deephaven::proto::backplane::grpc::InvokeCondition>(arena, *from._impl_.data_.invoke_);
-        break;
-      case kIsNull:
-        _impl_.data_.is_null_ = CreateMaybeMessage<::io::deephaven::proto::backplane::grpc::IsNullCondition>(arena, *from._impl_.data_.is_null_);
-        break;
-      case kMatches:
-        _impl_.data_.matches_ = CreateMaybeMessage<::io::deephaven::proto::backplane::grpc::MatchesCondition>(arena, *from._impl_.data_.matches_);
-        break;
-      case kContains:
-        _impl_.data_.contains_ = CreateMaybeMessage<::io::deephaven::proto::backplane::grpc::ContainsCondition>(arena, *from._impl_.data_.contains_);
-        break;
-      case kSearch:
-        _impl_.data_.search_ = CreateMaybeMessage<::io::deephaven::proto::backplane::grpc::SearchCondition>(arena, *from._impl_.data_.search_);
-        break;
-  }
-
-  // @@protoc_insertion_point(copy_constructor:io.deephaven.proto.backplane.grpc.Condition)
-}
-inline PROTOBUF_NDEBUG_INLINE Condition::Impl_::Impl_(
-    ::google::protobuf::internal::InternalVisibility visibility,
-    ::google::protobuf::Arena* arena)
-      : data_{},
-        _cached_size_{0},
-        _oneof_case_{} {}
-
-inline void Condition::SharedCtor(::_pb::Arena* arena) {
-  new (&_impl_) Impl_(internal_visibility(), arena);
-}
-Condition::~Condition() {
-  // @@protoc_insertion_point(destructor:io.deephaven.proto.backplane.grpc.Condition)
-  _internal_metadata_.Delete<::google::protobuf::UnknownFieldSet>();
-  SharedDtor();
-}
-inline void Condition::SharedDtor() {
-  ABSL_DCHECK(GetArena() == nullptr);
-  if (has_data()) {
-    clear_data();
-  }
-  _impl_.~Impl_();
-}
-
-void Condition::clear_data() {
-// @@protoc_insertion_point(one_of_clear_start:io.deephaven.proto.backplane.grpc.Condition)
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  switch (data_case()) {
-    case kAnd: {
-      if (GetArena() == nullptr) {
-        delete _impl_.data_.and__;
-      }
-      break;
-    }
-    case kOr: {
-      if (GetArena() == nullptr) {
-        delete _impl_.data_.or__;
-      }
-      break;
-    }
-    case kNot: {
-      if (GetArena() == nullptr) {
-        delete _impl_.data_.not__;
-      }
-      break;
-    }
-    case kCompare: {
-      if (GetArena() == nullptr) {
-        delete _impl_.data_.compare_;
-      }
-      break;
-    }
-    case kIn: {
-      if (GetArena() == nullptr) {
-        delete _impl_.data_.in_;
-      }
-      break;
-    }
-    case kInvoke: {
-      if (GetArena() == nullptr) {
-        delete _impl_.data_.invoke_;
-      }
-      break;
-    }
-    case kIsNull: {
-      if (GetArena() == nullptr) {
-        delete _impl_.data_.is_null_;
-      }
-      break;
-    }
-    case kMatches: {
-      if (GetArena() == nullptr) {
-        delete _impl_.data_.matches_;
-      }
-      break;
-    }
-    case kContains: {
-      if (GetArena() == nullptr) {
-        delete _impl_.data_.contains_;
-      }
-      break;
-    }
-    case kSearch: {
-      if (GetArena() == nullptr) {
-        delete _impl_.data_.search_;
-      }
-      break;
-    }
-    case DATA_NOT_SET: {
-      break;
-    }
-  }
-  _impl_._oneof_case_[0] = DATA_NOT_SET;
-}
-
-
-PROTOBUF_NOINLINE void Condition::Clear() {
-// @@protoc_insertion_point(message_clear_start:io.deephaven.proto.backplane.grpc.Condition)
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  ::uint32_t cached_has_bits = 0;
-  // Prevent compiler warnings about cached_has_bits being unused
-  (void) cached_has_bits;
-
-  clear_data();
-  _internal_metadata_.Clear<::google::protobuf::UnknownFieldSet>();
-}
-
-const char* Condition::_InternalParse(
-    const char* ptr, ::_pbi::ParseContext* ctx) {
-  ptr = ::_pbi::TcParser::ParseLoop(this, ptr, ctx, &_table_.header);
-  return ptr;
-}
-
-
-PROTOBUF_CONSTINIT PROTOBUF_ATTRIBUTE_INIT_PRIORITY1
-const ::_pbi::TcParseTable<0, 10, 10, 0, 2> Condition::_table_ = {
-  {
-    0,  // no _has_bits_
-    0, // no _extensions_
-    10, 0,  // max_field_number, fast_idx_mask
-    offsetof(decltype(_table_), field_lookup_table),
-    4294966272,  // skipmap
-    offsetof(decltype(_table_), field_entries),
-    10,  // num_field_entries
-    10,  // num_aux_entries
-    offsetof(decltype(_table_), aux_entries),
-    &_Condition_default_instance_._instance,
-    ::_pbi::TcParser::GenericFallback,  // fallback
-  }, {{
-    {::_pbi::TcParser::MiniParse, {}},
-  }}, {{
-    65535, 65535
-  }}, {{
-    // .io.deephaven.proto.backplane.grpc.AndCondition and = 1;
-    {PROTOBUF_FIELD_OFFSET(Condition, _impl_.data_.and__), _Internal::kOneofCaseOffset + 0, 0,
-    (0 | ::_fl::kFcOneof | ::_fl::kMessage | ::_fl::kTvTable)},
-    // .io.deephaven.proto.backplane.grpc.OrCondition or = 2;
-    {PROTOBUF_FIELD_OFFSET(Condition, _impl_.data_.or__), _Internal::kOneofCaseOffset + 0, 1,
-    (0 | ::_fl::kFcOneof | ::_fl::kMessage | ::_fl::kTvTable)},
-    // .io.deephaven.proto.backplane.grpc.NotCondition not = 3;
-    {PROTOBUF_FIELD_OFFSET(Condition, _impl_.data_.not__), _Internal::kOneofCaseOffset + 0, 2,
-    (0 | ::_fl::kFcOneof | ::_fl::kMessage | ::_fl::kTvTable)},
-    // .io.deephaven.proto.backplane.grpc.CompareCondition compare = 4;
-    {PROTOBUF_FIELD_OFFSET(Condition, _impl_.data_.compare_), _Internal::kOneofCaseOffset + 0, 3,
-    (0 | ::_fl::kFcOneof | ::_fl::kMessage | ::_fl::kTvTable)},
-    // .io.deephaven.proto.backplane.grpc.InCondition in = 5;
-    {PROTOBUF_FIELD_OFFSET(Condition, _impl_.data_.in_), _Internal::kOneofCaseOffset + 0, 4,
-    (0 | ::_fl::kFcOneof | ::_fl::kMessage | ::_fl::kTvTable)},
-    // .io.deephaven.proto.backplane.grpc.InvokeCondition invoke = 6;
-    {PROTOBUF_FIELD_OFFSET(Condition, _impl_.data_.invoke_), _Internal::kOneofCaseOffset + 0, 5,
-    (0 | ::_fl::kFcOneof | ::_fl::kMessage | ::_fl::kTvTable)},
-    // .io.deephaven.proto.backplane.grpc.IsNullCondition is_null = 7;
-    {PROTOBUF_FIELD_OFFSET(Condition, _impl_.data_.is_null_), _Internal::kOneofCaseOffset + 0, 6,
-    (0 | ::_fl::kFcOneof | ::_fl::kMessage | ::_fl::kTvTable)},
-    // .io.deephaven.proto.backplane.grpc.MatchesCondition matches = 8;
-    {PROTOBUF_FIELD_OFFSET(Condition, _impl_.data_.matches_), _Internal::kOneofCaseOffset + 0, 7,
-    (0 | ::_fl::kFcOneof | ::_fl::kMessage | ::_fl::kTvTable)},
-    // .io.deephaven.proto.backplane.grpc.ContainsCondition contains = 9;
-    {PROTOBUF_FIELD_OFFSET(Condition, _impl_.data_.contains_), _Internal::kOneofCaseOffset + 0, 8,
-    (0 | ::_fl::kFcOneof | ::_fl::kMessage | ::_fl::kTvTable)},
-    // .io.deephaven.proto.backplane.grpc.SearchCondition search = 10;
-    {PROTOBUF_FIELD_OFFSET(Condition, _impl_.data_.search_), _Internal::kOneofCaseOffset + 0, 9,
-    (0 | ::_fl::kFcOneof | ::_fl::kMessage | ::_fl::kTvTable)},
-  }}, {{
-    {::_pbi::TcParser::GetTable<::io::deephaven::proto::backplane::grpc::AndCondition>()},
-    {::_pbi::TcParser::GetTable<::io::deephaven::proto::backplane::grpc::OrCondition>()},
-    {::_pbi::TcParser::GetTable<::io::deephaven::proto::backplane::grpc::NotCondition>()},
-    {::_pbi::TcParser::GetTable<::io::deephaven::proto::backplane::grpc::CompareCondition>()},
-    {::_pbi::TcParser::GetTable<::io::deephaven::proto::backplane::grpc::InCondition>()},
-    {::_pbi::TcParser::GetTable<::io::deephaven::proto::backplane::grpc::InvokeCondition>()},
-    {::_pbi::TcParser::GetTable<::io::deephaven::proto::backplane::grpc::IsNullCondition>()},
-    {::_pbi::TcParser::GetTable<::io::deephaven::proto::backplane::grpc::MatchesCondition>()},
-    {::_pbi::TcParser::GetTable<::io::deephaven::proto::backplane::grpc::ContainsCondition>()},
-    {::_pbi::TcParser::GetTable<::io::deephaven::proto::backplane::grpc::SearchCondition>()},
-  }}, {{
-  }},
-};
-
-::uint8_t* Condition::_InternalSerialize(
-    ::uint8_t* target,
-    ::google::protobuf::io::EpsCopyOutputStream* stream) const {
-  // @@protoc_insertion_point(serialize_to_array_start:io.deephaven.proto.backplane.grpc.Condition)
-  ::uint32_t cached_has_bits = 0;
-  (void)cached_has_bits;
-
-  switch (data_case()) {
-    case kAnd: {
-      target = ::google::protobuf::internal::WireFormatLite::InternalWriteMessage(
-          1, _Internal::and_(this),
-          _Internal::and_(this).GetCachedSize(), target, stream);
-      break;
-    }
-    case kOr: {
-      target = ::google::protobuf::internal::WireFormatLite::InternalWriteMessage(
-          2, _Internal::or_(this),
-          _Internal::or_(this).GetCachedSize(), target, stream);
-      break;
-    }
-    case kNot: {
-      target = ::google::protobuf::internal::WireFormatLite::InternalWriteMessage(
-          3, _Internal::not_(this),
-          _Internal::not_(this).GetCachedSize(), target, stream);
-      break;
-    }
-    case kCompare: {
-      target = ::google::protobuf::internal::WireFormatLite::InternalWriteMessage(
-          4, _Internal::compare(this),
-          _Internal::compare(this).GetCachedSize(), target, stream);
-      break;
-    }
-    case kIn: {
-      target = ::google::protobuf::internal::WireFormatLite::InternalWriteMessage(
-          5, _Internal::in(this),
-          _Internal::in(this).GetCachedSize(), target, stream);
-      break;
-    }
-    case kInvoke: {
-      target = ::google::protobuf::internal::WireFormatLite::InternalWriteMessage(
-          6, _Internal::invoke(this),
-          _Internal::invoke(this).GetCachedSize(), target, stream);
-      break;
-    }
-    case kIsNull: {
-      target = ::google::protobuf::internal::WireFormatLite::InternalWriteMessage(
-          7, _Internal::is_null(this),
-          _Internal::is_null(this).GetCachedSize(), target, stream);
-      break;
-    }
-    case kMatches: {
-      target = ::google::protobuf::internal::WireFormatLite::InternalWriteMessage(
-          8, _Internal::matches(this),
-          _Internal::matches(this).GetCachedSize(), target, stream);
-      break;
-    }
-    case kContains: {
-      target = ::google::protobuf::internal::WireFormatLite::InternalWriteMessage(
-          9, _Internal::contains(this),
-          _Internal::contains(this).GetCachedSize(), target, stream);
-      break;
-    }
-    case kSearch: {
-      target = ::google::protobuf::internal::WireFormatLite::InternalWriteMessage(
-          10, _Internal::search(this),
-          _Internal::search(this).GetCachedSize(), target, stream);
-      break;
-    }
-    default:
-      break;
-  }
-  if (PROTOBUF_PREDICT_FALSE(_internal_metadata_.have_unknown_fields())) {
-    target =
-        ::_pbi::WireFormat::InternalSerializeUnknownFieldsToArray(
-            _internal_metadata_.unknown_fields<::google::protobuf::UnknownFieldSet>(::google::protobuf::UnknownFieldSet::default_instance), target, stream);
-  }
-  // @@protoc_insertion_point(serialize_to_array_end:io.deephaven.proto.backplane.grpc.Condition)
-  return target;
-}
-
-::size_t Condition::ByteSizeLong() const {
-// @@protoc_insertion_point(message_byte_size_start:io.deephaven.proto.backplane.grpc.Condition)
-  ::size_t total_size = 0;
-
-  ::uint32_t cached_has_bits = 0;
-  // Prevent compiler warnings about cached_has_bits being unused
-  (void) cached_has_bits;
-
-  switch (data_case()) {
-    // .io.deephaven.proto.backplane.grpc.AndCondition and = 1;
-    case kAnd: {
-      total_size +=
-          1 + ::google::protobuf::internal::WireFormatLite::MessageSize(*_impl_.data_.and__);
-      break;
-    }
-    // .io.deephaven.proto.backplane.grpc.OrCondition or = 2;
-    case kOr: {
-      total_size +=
-          1 + ::google::protobuf::internal::WireFormatLite::MessageSize(*_impl_.data_.or__);
-      break;
-    }
-    // .io.deephaven.proto.backplane.grpc.NotCondition not = 3;
-    case kNot: {
-      total_size +=
-          1 + ::google::protobuf::internal::WireFormatLite::MessageSize(*_impl_.data_.not__);
-      break;
-    }
-    // .io.deephaven.proto.backplane.grpc.CompareCondition compare = 4;
-    case kCompare: {
-      total_size +=
-          1 + ::google::protobuf::internal::WireFormatLite::MessageSize(*_impl_.data_.compare_);
-      break;
-    }
-    // .io.deephaven.proto.backplane.grpc.InCondition in = 5;
-    case kIn: {
-      total_size +=
-          1 + ::google::protobuf::internal::WireFormatLite::MessageSize(*_impl_.data_.in_);
-      break;
-    }
-    // .io.deephaven.proto.backplane.grpc.InvokeCondition invoke = 6;
-    case kInvoke: {
-      total_size +=
-          1 + ::google::protobuf::internal::WireFormatLite::MessageSize(*_impl_.data_.invoke_);
-      break;
-    }
-    // .io.deephaven.proto.backplane.grpc.IsNullCondition is_null = 7;
-    case kIsNull: {
-      total_size +=
-          1 + ::google::protobuf::internal::WireFormatLite::MessageSize(*_impl_.data_.is_null_);
-      break;
-    }
-    // .io.deephaven.proto.backplane.grpc.MatchesCondition matches = 8;
-    case kMatches: {
-      total_size +=
-          1 + ::google::protobuf::internal::WireFormatLite::MessageSize(*_impl_.data_.matches_);
-      break;
-    }
-    // .io.deephaven.proto.backplane.grpc.ContainsCondition contains = 9;
-    case kContains: {
-      total_size +=
-          1 + ::google::protobuf::internal::WireFormatLite::MessageSize(*_impl_.data_.contains_);
-      break;
-    }
-    // .io.deephaven.proto.backplane.grpc.SearchCondition search = 10;
-    case kSearch: {
-      total_size +=
-          1 + ::google::protobuf::internal::WireFormatLite::MessageSize(*_impl_.data_.search_);
-      break;
-    }
-    case DATA_NOT_SET: {
-      break;
-    }
-  }
-  return MaybeComputeUnknownFieldsSize(total_size, &_impl_._cached_size_);
-}
-
-const ::google::protobuf::Message::ClassData Condition::_class_data_ = {
-    Condition::MergeImpl,
-    nullptr,  // OnDemandRegisterArenaDtor
-};
-const ::google::protobuf::Message::ClassData* Condition::GetClassData() const {
-  return &_class_data_;
-}
-
-void Condition::MergeImpl(::google::protobuf::Message& to_msg, const ::google::protobuf::Message& from_msg) {
-  auto* const _this = static_cast<Condition*>(&to_msg);
-  auto& from = static_cast<const Condition&>(from_msg);
-  // @@protoc_insertion_point(class_specific_merge_from_start:io.deephaven.proto.backplane.grpc.Condition)
-  ABSL_DCHECK_NE(&from, _this);
-  ::uint32_t cached_has_bits = 0;
-  (void) cached_has_bits;
-
-  switch (from.data_case()) {
-    case kAnd: {
-      _this->_internal_mutable_and_()->::io::deephaven::proto::backplane::grpc::AndCondition::MergeFrom(
-          from._internal_and_());
-      break;
-    }
-    case kOr: {
-      _this->_internal_mutable_or_()->::io::deephaven::proto::backplane::grpc::OrCondition::MergeFrom(
-          from._internal_or_());
-      break;
-    }
-    case kNot: {
-      _this->_internal_mutable_not_()->::io::deephaven::proto::backplane::grpc::NotCondition::MergeFrom(
-          from._internal_not_());
-      break;
-    }
-    case kCompare: {
-      _this->_internal_mutable_compare()->::io::deephaven::proto::backplane::grpc::CompareCondition::MergeFrom(
-          from._internal_compare());
-      break;
-    }
-    case kIn: {
-      _this->_internal_mutable_in()->::io::deephaven::proto::backplane::grpc::InCondition::MergeFrom(
-          from._internal_in());
-      break;
-    }
-    case kInvoke: {
-      _this->_internal_mutable_invoke()->::io::deephaven::proto::backplane::grpc::InvokeCondition::MergeFrom(
-          from._internal_invoke());
-      break;
-    }
-    case kIsNull: {
-      _this->_internal_mutable_is_null()->::io::deephaven::proto::backplane::grpc::IsNullCondition::MergeFrom(
-          from._internal_is_null());
-      break;
-    }
-    case kMatches: {
-      _this->_internal_mutable_matches()->::io::deephaven::proto::backplane::grpc::MatchesCondition::MergeFrom(
-          from._internal_matches());
-      break;
-    }
-    case kContains: {
-      _this->_internal_mutable_contains()->::io::deephaven::proto::backplane::grpc::ContainsCondition::MergeFrom(
-          from._internal_contains());
-      break;
-    }
-    case kSearch: {
-      _this->_internal_mutable_search()->::io::deephaven::proto::backplane::grpc::SearchCondition::MergeFrom(
-          from._internal_search());
-      break;
-    }
-    case DATA_NOT_SET: {
-      break;
-    }
-  }
-  _this->_internal_metadata_.MergeFrom<::google::protobuf::UnknownFieldSet>(from._internal_metadata_);
-}
-
-void Condition::CopyFrom(const Condition& from) {
-// @@protoc_insertion_point(class_specific_copy_from_start:io.deephaven.proto.backplane.grpc.Condition)
-  if (&from == this) return;
-  Clear();
-  MergeFrom(from);
-}
-
-PROTOBUF_NOINLINE bool Condition::IsInitialized() const {
-  return true;
-}
-
-::_pbi::CachedSize* Condition::AccessCachedSize() const {
-  return &_impl_._cached_size_;
-}
-void Condition::InternalSwap(Condition* PROTOBUF_RESTRICT other) {
-  using std::swap;
-  _internal_metadata_.InternalSwap(&other->_internal_metadata_);
-  swap(_impl_.data_, other->_impl_.data_);
-  swap(_impl_._oneof_case_[0], other->_impl_._oneof_case_[0]);
-}
-
-::google::protobuf::Metadata Condition::GetMetadata() const {
-  return ::_pbi::AssignDescriptors(
-      &descriptor_table_deephaven_2fproto_2ftable_2eproto_getter, &descriptor_table_deephaven_2fproto_2ftable_2eproto_once,
-      file_level_metadata_deephaven_2fproto_2ftable_2eproto[100]);
-}
-// ===================================================================
-
-class AndCondition::_Internal {
- public:
-};
-
-AndCondition::AndCondition(::google::protobuf::Arena* arena)
-    : ::google::protobuf::Message(arena) {
-  SharedCtor(arena);
-  // @@protoc_insertion_point(arena_constructor:io.deephaven.proto.backplane.grpc.AndCondition)
-}
-inline PROTOBUF_NDEBUG_INLINE AndCondition::Impl_::Impl_(
-    ::google::protobuf::internal::InternalVisibility visibility, ::google::protobuf::Arena* arena,
-    const Impl_& from)
-      : filters_{visibility, arena, from.filters_},
-        _cached_size_{0} {}
-
-AndCondition::AndCondition(
-    ::google::protobuf::Arena* arena,
-    const AndCondition& from)
-    : ::google::protobuf::Message(arena) {
-  AndCondition* const _this = this;
-  (void)_this;
-  _internal_metadata_.MergeFrom<::google::protobuf::UnknownFieldSet>(
-      from._internal_metadata_);
-  new (&_impl_) Impl_(internal_visibility(), arena, from._impl_);
-
-  // @@protoc_insertion_point(copy_constructor:io.deephaven.proto.backplane.grpc.AndCondition)
-}
-inline PROTOBUF_NDEBUG_INLINE AndCondition::Impl_::Impl_(
-    ::google::protobuf::internal::InternalVisibility visibility,
-    ::google::protobuf::Arena* arena)
-      : filters_{visibility, arena},
-        _cached_size_{0} {}
-
-inline void AndCondition::SharedCtor(::_pb::Arena* arena) {
-  new (&_impl_) Impl_(internal_visibility(), arena);
-}
-AndCondition::~AndCondition() {
-  // @@protoc_insertion_point(destructor:io.deephaven.proto.backplane.grpc.AndCondition)
-  _internal_metadata_.Delete<::google::protobuf::UnknownFieldSet>();
-  SharedDtor();
-}
-inline void AndCondition::SharedDtor() {
-  ABSL_DCHECK(GetArena() == nullptr);
-  _impl_.~Impl_();
-}
-
-PROTOBUF_NOINLINE void AndCondition::Clear() {
-// @@protoc_insertion_point(message_clear_start:io.deephaven.proto.backplane.grpc.AndCondition)
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  ::uint32_t cached_has_bits = 0;
-  // Prevent compiler warnings about cached_has_bits being unused
-  (void) cached_has_bits;
-
-  _impl_.filters_.Clear();
-  _internal_metadata_.Clear<::google::protobuf::UnknownFieldSet>();
-}
-
-const char* AndCondition::_InternalParse(
-    const char* ptr, ::_pbi::ParseContext* ctx) {
-  ptr = ::_pbi::TcParser::ParseLoop(this, ptr, ctx, &_table_.header);
-  return ptr;
-}
-
-
-PROTOBUF_CONSTINIT PROTOBUF_ATTRIBUTE_INIT_PRIORITY1
-const ::_pbi::TcParseTable<0, 1, 1, 0, 2> AndCondition::_table_ = {
-  {
-    0,  // no _has_bits_
-    0, // no _extensions_
-    1, 0,  // max_field_number, fast_idx_mask
-    offsetof(decltype(_table_), field_lookup_table),
-    4294967294,  // skipmap
-    offsetof(decltype(_table_), field_entries),
-    1,  // num_field_entries
-    1,  // num_aux_entries
-    offsetof(decltype(_table_), aux_entries),
-    &_AndCondition_default_instance_._instance,
-    ::_pbi::TcParser::GenericFallback,  // fallback
-  }, {{
-    // repeated .io.deephaven.proto.backplane.grpc.Condition filters = 1;
-    {::_pbi::TcParser::FastMtR1,
-     {10, 63, 0, PROTOBUF_FIELD_OFFSET(AndCondition, _impl_.filters_)}},
-  }}, {{
-    65535, 65535
-  }}, {{
-    // repeated .io.deephaven.proto.backplane.grpc.Condition filters = 1;
-    {PROTOBUF_FIELD_OFFSET(AndCondition, _impl_.filters_), 0, 0,
-    (0 | ::_fl::kFcRepeated | ::_fl::kMessage | ::_fl::kTvTable)},
-  }}, {{
-    {::_pbi::TcParser::GetTable<::io::deephaven::proto::backplane::grpc::Condition>()},
-  }}, {{
-  }},
-};
-
-::uint8_t* AndCondition::_InternalSerialize(
-    ::uint8_t* target,
-    ::google::protobuf::io::EpsCopyOutputStream* stream) const {
-  // @@protoc_insertion_point(serialize_to_array_start:io.deephaven.proto.backplane.grpc.AndCondition)
-  ::uint32_t cached_has_bits = 0;
-  (void)cached_has_bits;
-
-  // repeated .io.deephaven.proto.backplane.grpc.Condition filters = 1;
-  for (unsigned i = 0,
-      n = static_cast<unsigned>(this->_internal_filters_size()); i < n; i++) {
-    const auto& repfield = this->_internal_filters().Get(i);
-    target = ::google::protobuf::internal::WireFormatLite::
-        InternalWriteMessage(1, repfield, repfield.GetCachedSize(), target, stream);
-  }
-
-  if (PROTOBUF_PREDICT_FALSE(_internal_metadata_.have_unknown_fields())) {
-    target =
-        ::_pbi::WireFormat::InternalSerializeUnknownFieldsToArray(
-            _internal_metadata_.unknown_fields<::google::protobuf::UnknownFieldSet>(::google::protobuf::UnknownFieldSet::default_instance), target, stream);
-  }
-  // @@protoc_insertion_point(serialize_to_array_end:io.deephaven.proto.backplane.grpc.AndCondition)
-  return target;
-}
-
-::size_t AndCondition::ByteSizeLong() const {
-// @@protoc_insertion_point(message_byte_size_start:io.deephaven.proto.backplane.grpc.AndCondition)
-  ::size_t total_size = 0;
-
-  ::uint32_t cached_has_bits = 0;
-  // Prevent compiler warnings about cached_has_bits being unused
-  (void) cached_has_bits;
-
-  // repeated .io.deephaven.proto.backplane.grpc.Condition filters = 1;
-  total_size += 1UL * this->_internal_filters_size();
-  for (const auto& msg : this->_internal_filters()) {
-    total_size +=
-      ::google::protobuf::internal::WireFormatLite::MessageSize(msg);
-  }
-  return MaybeComputeUnknownFieldsSize(total_size, &_impl_._cached_size_);
-}
-
-const ::google::protobuf::Message::ClassData AndCondition::_class_data_ = {
-    AndCondition::MergeImpl,
-    nullptr,  // OnDemandRegisterArenaDtor
-};
-const ::google::protobuf::Message::ClassData* AndCondition::GetClassData() const {
-  return &_class_data_;
-}
-
-void AndCondition::MergeImpl(::google::protobuf::Message& to_msg, const ::google::protobuf::Message& from_msg) {
-  auto* const _this = static_cast<AndCondition*>(&to_msg);
-  auto& from = static_cast<const AndCondition&>(from_msg);
-  // @@protoc_insertion_point(class_specific_merge_from_start:io.deephaven.proto.backplane.grpc.AndCondition)
-  ABSL_DCHECK_NE(&from, _this);
-  ::uint32_t cached_has_bits = 0;
-  (void) cached_has_bits;
-
-  _this->_internal_mutable_filters()->MergeFrom(
-      from._internal_filters());
-  _this->_internal_metadata_.MergeFrom<::google::protobuf::UnknownFieldSet>(from._internal_metadata_);
-}
-
-void AndCondition::CopyFrom(const AndCondition& from) {
-// @@protoc_insertion_point(class_specific_copy_from_start:io.deephaven.proto.backplane.grpc.AndCondition)
-  if (&from == this) return;
-  Clear();
-  MergeFrom(from);
-}
-
-PROTOBUF_NOINLINE bool AndCondition::IsInitialized() const {
-  return true;
-}
-
-::_pbi::CachedSize* AndCondition::AccessCachedSize() const {
-  return &_impl_._cached_size_;
-}
-void AndCondition::InternalSwap(AndCondition* PROTOBUF_RESTRICT other) {
-  using std::swap;
-  _internal_metadata_.InternalSwap(&other->_internal_metadata_);
-  _impl_.filters_.InternalSwap(&other->_impl_.filters_);
-}
-
-::google::protobuf::Metadata AndCondition::GetMetadata() const {
-  return ::_pbi::AssignDescriptors(
-      &descriptor_table_deephaven_2fproto_2ftable_2eproto_getter, &descriptor_table_deephaven_2fproto_2ftable_2eproto_once,
-      file_level_metadata_deephaven_2fproto_2ftable_2eproto[101]);
-}
-// ===================================================================
-
-class OrCondition::_Internal {
- public:
-};
-
-OrCondition::OrCondition(::google::protobuf::Arena* arena)
-    : ::google::protobuf::Message(arena) {
-  SharedCtor(arena);
-  // @@protoc_insertion_point(arena_constructor:io.deephaven.proto.backplane.grpc.OrCondition)
-}
-inline PROTOBUF_NDEBUG_INLINE OrCondition::Impl_::Impl_(
-    ::google::protobuf::internal::InternalVisibility visibility, ::google::protobuf::Arena* arena,
-    const Impl_& from)
-      : filters_{visibility, arena, from.filters_},
-        _cached_size_{0} {}
-
-OrCondition::OrCondition(
-    ::google::protobuf::Arena* arena,
-    const OrCondition& from)
-    : ::google::protobuf::Message(arena) {
-  OrCondition* const _this = this;
-  (void)_this;
-  _internal_metadata_.MergeFrom<::google::protobuf::UnknownFieldSet>(
-      from._internal_metadata_);
-  new (&_impl_) Impl_(internal_visibility(), arena, from._impl_);
-
-  // @@protoc_insertion_point(copy_constructor:io.deephaven.proto.backplane.grpc.OrCondition)
-}
-inline PROTOBUF_NDEBUG_INLINE OrCondition::Impl_::Impl_(
-    ::google::protobuf::internal::InternalVisibility visibility,
-    ::google::protobuf::Arena* arena)
-      : filters_{visibility, arena},
-        _cached_size_{0} {}
-
-inline void OrCondition::SharedCtor(::_pb::Arena* arena) {
-  new (&_impl_) Impl_(internal_visibility(), arena);
-}
-OrCondition::~OrCondition() {
-  // @@protoc_insertion_point(destructor:io.deephaven.proto.backplane.grpc.OrCondition)
-  _internal_metadata_.Delete<::google::protobuf::UnknownFieldSet>();
-  SharedDtor();
-}
-inline void OrCondition::SharedDtor() {
-  ABSL_DCHECK(GetArena() == nullptr);
-  _impl_.~Impl_();
-}
-
-PROTOBUF_NOINLINE void OrCondition::Clear() {
-// @@protoc_insertion_point(message_clear_start:io.deephaven.proto.backplane.grpc.OrCondition)
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  ::uint32_t cached_has_bits = 0;
-  // Prevent compiler warnings about cached_has_bits being unused
-  (void) cached_has_bits;
-
-  _impl_.filters_.Clear();
-  _internal_metadata_.Clear<::google::protobuf::UnknownFieldSet>();
-}
-
-const char* OrCondition::_InternalParse(
-    const char* ptr, ::_pbi::ParseContext* ctx) {
-  ptr = ::_pbi::TcParser::ParseLoop(this, ptr, ctx, &_table_.header);
-  return ptr;
-}
-
-
-PROTOBUF_CONSTINIT PROTOBUF_ATTRIBUTE_INIT_PRIORITY1
-const ::_pbi::TcParseTable<0, 1, 1, 0, 2> OrCondition::_table_ = {
-  {
-    0,  // no _has_bits_
-    0, // no _extensions_
-    1, 0,  // max_field_number, fast_idx_mask
-    offsetof(decltype(_table_), field_lookup_table),
-    4294967294,  // skipmap
-    offsetof(decltype(_table_), field_entries),
-    1,  // num_field_entries
-    1,  // num_aux_entries
-    offsetof(decltype(_table_), aux_entries),
-    &_OrCondition_default_instance_._instance,
-    ::_pbi::TcParser::GenericFallback,  // fallback
-  }, {{
-    // repeated .io.deephaven.proto.backplane.grpc.Condition filters = 1;
-    {::_pbi::TcParser::FastMtR1,
-     {10, 63, 0, PROTOBUF_FIELD_OFFSET(OrCondition, _impl_.filters_)}},
-  }}, {{
-    65535, 65535
-  }}, {{
-    // repeated .io.deephaven.proto.backplane.grpc.Condition filters = 1;
-    {PROTOBUF_FIELD_OFFSET(OrCondition, _impl_.filters_), 0, 0,
-    (0 | ::_fl::kFcRepeated | ::_fl::kMessage | ::_fl::kTvTable)},
-  }}, {{
-    {::_pbi::TcParser::GetTable<::io::deephaven::proto::backplane::grpc::Condition>()},
-  }}, {{
-  }},
-};
-
-::uint8_t* OrCondition::_InternalSerialize(
-    ::uint8_t* target,
-    ::google::protobuf::io::EpsCopyOutputStream* stream) const {
-  // @@protoc_insertion_point(serialize_to_array_start:io.deephaven.proto.backplane.grpc.OrCondition)
-  ::uint32_t cached_has_bits = 0;
-  (void)cached_has_bits;
-
-  // repeated .io.deephaven.proto.backplane.grpc.Condition filters = 1;
-  for (unsigned i = 0,
-      n = static_cast<unsigned>(this->_internal_filters_size()); i < n; i++) {
-    const auto& repfield = this->_internal_filters().Get(i);
-    target = ::google::protobuf::internal::WireFormatLite::
-        InternalWriteMessage(1, repfield, repfield.GetCachedSize(), target, stream);
-  }
-
-  if (PROTOBUF_PREDICT_FALSE(_internal_metadata_.have_unknown_fields())) {
-    target =
-        ::_pbi::WireFormat::InternalSerializeUnknownFieldsToArray(
-            _internal_metadata_.unknown_fields<::google::protobuf::UnknownFieldSet>(::google::protobuf::UnknownFieldSet::default_instance), target, stream);
-  }
-  // @@protoc_insertion_point(serialize_to_array_end:io.deephaven.proto.backplane.grpc.OrCondition)
-  return target;
-}
-
-::size_t OrCondition::ByteSizeLong() const {
-// @@protoc_insertion_point(message_byte_size_start:io.deephaven.proto.backplane.grpc.OrCondition)
-  ::size_t total_size = 0;
-
-  ::uint32_t cached_has_bits = 0;
-  // Prevent compiler warnings about cached_has_bits being unused
-  (void) cached_has_bits;
-
-  // repeated .io.deephaven.proto.backplane.grpc.Condition filters = 1;
-  total_size += 1UL * this->_internal_filters_size();
-  for (const auto& msg : this->_internal_filters()) {
-    total_size +=
-      ::google::protobuf::internal::WireFormatLite::MessageSize(msg);
-  }
-  return MaybeComputeUnknownFieldsSize(total_size, &_impl_._cached_size_);
-}
-
-const ::google::protobuf::Message::ClassData OrCondition::_class_data_ = {
-    OrCondition::MergeImpl,
-    nullptr,  // OnDemandRegisterArenaDtor
-};
-const ::google::protobuf::Message::ClassData* OrCondition::GetClassData() const {
-  return &_class_data_;
-}
-
-void OrCondition::MergeImpl(::google::protobuf::Message& to_msg, const ::google::protobuf::Message& from_msg) {
-  auto* const _this = static_cast<OrCondition*>(&to_msg);
-  auto& from = static_cast<const OrCondition&>(from_msg);
-  // @@protoc_insertion_point(class_specific_merge_from_start:io.deephaven.proto.backplane.grpc.OrCondition)
-  ABSL_DCHECK_NE(&from, _this);
-  ::uint32_t cached_has_bits = 0;
-  (void) cached_has_bits;
-
-  _this->_internal_mutable_filters()->MergeFrom(
-      from._internal_filters());
-  _this->_internal_metadata_.MergeFrom<::google::protobuf::UnknownFieldSet>(from._internal_metadata_);
-}
-
-void OrCondition::CopyFrom(const OrCondition& from) {
-// @@protoc_insertion_point(class_specific_copy_from_start:io.deephaven.proto.backplane.grpc.OrCondition)
-  if (&from == this) return;
-  Clear();
-  MergeFrom(from);
-}
-
-PROTOBUF_NOINLINE bool OrCondition::IsInitialized() const {
-  return true;
-}
-
-::_pbi::CachedSize* OrCondition::AccessCachedSize() const {
-  return &_impl_._cached_size_;
-}
-void OrCondition::InternalSwap(OrCondition* PROTOBUF_RESTRICT other) {
-  using std::swap;
-  _internal_metadata_.InternalSwap(&other->_internal_metadata_);
-  _impl_.filters_.InternalSwap(&other->_impl_.filters_);
-}
-
-::google::protobuf::Metadata OrCondition::GetMetadata() const {
-  return ::_pbi::AssignDescriptors(
-      &descriptor_table_deephaven_2fproto_2ftable_2eproto_getter, &descriptor_table_deephaven_2fproto_2ftable_2eproto_once,
-      file_level_metadata_deephaven_2fproto_2ftable_2eproto[102]);
-}
-// ===================================================================
-
-class NotCondition::_Internal {
- public:
-  using HasBits = decltype(std::declval<NotCondition>()._impl_._has_bits_);
-  static constexpr ::int32_t kHasBitsOffset =
-    8 * PROTOBUF_FIELD_OFFSET(NotCondition, _impl_._has_bits_);
-  static const ::io::deephaven::proto::backplane::grpc::Condition& filter(const NotCondition* msg);
-  static void set_has_filter(HasBits* has_bits) {
-    (*has_bits)[0] |= 1u;
-  }
-};
-
-const ::io::deephaven::proto::backplane::grpc::Condition& NotCondition::_Internal::filter(const NotCondition* msg) {
-  return *msg->_impl_.filter_;
-}
-NotCondition::NotCondition(::google::protobuf::Arena* arena)
-    : ::google::protobuf::Message(arena) {
-  SharedCtor(arena);
-  // @@protoc_insertion_point(arena_constructor:io.deephaven.proto.backplane.grpc.NotCondition)
-}
-inline PROTOBUF_NDEBUG_INLINE NotCondition::Impl_::Impl_(
-    ::google::protobuf::internal::InternalVisibility visibility, ::google::protobuf::Arena* arena,
-    const Impl_& from)
-      : _has_bits_{from._has_bits_},
-        _cached_size_{0} {}
-
-NotCondition::NotCondition(
-    ::google::protobuf::Arena* arena,
-    const NotCondition& from)
-    : ::google::protobuf::Message(arena) {
-  NotCondition* const _this = this;
-  (void)_this;
-  _internal_metadata_.MergeFrom<::google::protobuf::UnknownFieldSet>(
-      from._internal_metadata_);
-  new (&_impl_) Impl_(internal_visibility(), arena, from._impl_);
-  ::uint32_t cached_has_bits = _impl_._has_bits_[0];
-  _impl_.filter_ = (cached_has_bits & 0x00000001u)
-                ? CreateMaybeMessage<::io::deephaven::proto::backplane::grpc::Condition>(arena, *from._impl_.filter_)
-                : nullptr;
-
-  // @@protoc_insertion_point(copy_constructor:io.deephaven.proto.backplane.grpc.NotCondition)
-}
-inline PROTOBUF_NDEBUG_INLINE NotCondition::Impl_::Impl_(
-    ::google::protobuf::internal::InternalVisibility visibility,
-    ::google::protobuf::Arena* arena)
-      : _cached_size_{0} {}
-
-inline void NotCondition::SharedCtor(::_pb::Arena* arena) {
-  new (&_impl_) Impl_(internal_visibility(), arena);
-  _impl_.filter_ = {};
-}
-NotCondition::~NotCondition() {
-  // @@protoc_insertion_point(destructor:io.deephaven.proto.backplane.grpc.NotCondition)
-  _internal_metadata_.Delete<::google::protobuf::UnknownFieldSet>();
-  SharedDtor();
-}
-inline void NotCondition::SharedDtor() {
-  ABSL_DCHECK(GetArena() == nullptr);
-  delete _impl_.filter_;
-  _impl_.~Impl_();
-}
-
-PROTOBUF_NOINLINE void NotCondition::Clear() {
-// @@protoc_insertion_point(message_clear_start:io.deephaven.proto.backplane.grpc.NotCondition)
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  ::uint32_t cached_has_bits = 0;
-  // Prevent compiler warnings about cached_has_bits being unused
-  (void) cached_has_bits;
-
-  cached_has_bits = _impl_._has_bits_[0];
-  if (cached_has_bits & 0x00000001u) {
-    ABSL_DCHECK(_impl_.filter_ != nullptr);
-    _impl_.filter_->Clear();
-  }
-  _impl_._has_bits_.Clear();
-  _internal_metadata_.Clear<::google::protobuf::UnknownFieldSet>();
-}
-
-const char* NotCondition::_InternalParse(
-    const char* ptr, ::_pbi::ParseContext* ctx) {
-  ptr = ::_pbi::TcParser::ParseLoop(this, ptr, ctx, &_table_.header);
-  return ptr;
-}
-
-
-PROTOBUF_CONSTINIT PROTOBUF_ATTRIBUTE_INIT_PRIORITY1
-const ::_pbi::TcParseTable<0, 1, 1, 0, 2> NotCondition::_table_ = {
-  {
-    PROTOBUF_FIELD_OFFSET(NotCondition, _impl_._has_bits_),
-    0, // no _extensions_
-    1, 0,  // max_field_number, fast_idx_mask
-    offsetof(decltype(_table_), field_lookup_table),
-    4294967294,  // skipmap
-    offsetof(decltype(_table_), field_entries),
-    1,  // num_field_entries
-    1,  // num_aux_entries
-    offsetof(decltype(_table_), aux_entries),
-    &_NotCondition_default_instance_._instance,
-    ::_pbi::TcParser::GenericFallback,  // fallback
-  }, {{
-    // .io.deephaven.proto.backplane.grpc.Condition filter = 1;
-    {::_pbi::TcParser::FastMtS1,
-     {10, 0, 0, PROTOBUF_FIELD_OFFSET(NotCondition, _impl_.filter_)}},
-  }}, {{
-    65535, 65535
-  }}, {{
-    // .io.deephaven.proto.backplane.grpc.Condition filter = 1;
-    {PROTOBUF_FIELD_OFFSET(NotCondition, _impl_.filter_), _Internal::kHasBitsOffset + 0, 0,
-    (0 | ::_fl::kFcOptional | ::_fl::kMessage | ::_fl::kTvTable)},
-  }}, {{
-    {::_pbi::TcParser::GetTable<::io::deephaven::proto::backplane::grpc::Condition>()},
-  }}, {{
-  }},
-};
-
-::uint8_t* NotCondition::_InternalSerialize(
-    ::uint8_t* target,
-    ::google::protobuf::io::EpsCopyOutputStream* stream) const {
-  // @@protoc_insertion_point(serialize_to_array_start:io.deephaven.proto.backplane.grpc.NotCondition)
-  ::uint32_t cached_has_bits = 0;
-  (void)cached_has_bits;
-
-  cached_has_bits = _impl_._has_bits_[0];
-  // .io.deephaven.proto.backplane.grpc.Condition filter = 1;
-  if (cached_has_bits & 0x00000001u) {
-    target = ::google::protobuf::internal::WireFormatLite::InternalWriteMessage(
-        1, _Internal::filter(this),
-        _Internal::filter(this).GetCachedSize(), target, stream);
-  }
-
-  if (PROTOBUF_PREDICT_FALSE(_internal_metadata_.have_unknown_fields())) {
-    target =
-        ::_pbi::WireFormat::InternalSerializeUnknownFieldsToArray(
-            _internal_metadata_.unknown_fields<::google::protobuf::UnknownFieldSet>(::google::protobuf::UnknownFieldSet::default_instance), target, stream);
-  }
-  // @@protoc_insertion_point(serialize_to_array_end:io.deephaven.proto.backplane.grpc.NotCondition)
-  return target;
-}
-
-::size_t NotCondition::ByteSizeLong() const {
-// @@protoc_insertion_point(message_byte_size_start:io.deephaven.proto.backplane.grpc.NotCondition)
-  ::size_t total_size = 0;
-
-  ::uint32_t cached_has_bits = 0;
-  // Prevent compiler warnings about cached_has_bits being unused
-  (void) cached_has_bits;
-
-  // .io.deephaven.proto.backplane.grpc.Condition filter = 1;
-  cached_has_bits = _impl_._has_bits_[0];
-  if (cached_has_bits & 0x00000001u) {
-    total_size +=
-        1 + ::google::protobuf::internal::WireFormatLite::MessageSize(*_impl_.filter_);
-  }
-
-  return MaybeComputeUnknownFieldsSize(total_size, &_impl_._cached_size_);
-}
-
-const ::google::protobuf::Message::ClassData NotCondition::_class_data_ = {
-    NotCondition::MergeImpl,
-    nullptr,  // OnDemandRegisterArenaDtor
-};
-const ::google::protobuf::Message::ClassData* NotCondition::GetClassData() const {
-  return &_class_data_;
-}
-
-void NotCondition::MergeImpl(::google::protobuf::Message& to_msg, const ::google::protobuf::Message& from_msg) {
-  auto* const _this = static_cast<NotCondition*>(&to_msg);
-  auto& from = static_cast<const NotCondition&>(from_msg);
-  // @@protoc_insertion_point(class_specific_merge_from_start:io.deephaven.proto.backplane.grpc.NotCondition)
-  ABSL_DCHECK_NE(&from, _this);
-  ::uint32_t cached_has_bits = 0;
-  (void) cached_has_bits;
-
-  if ((from._impl_._has_bits_[0] & 0x00000001u) != 0) {
-    _this->_internal_mutable_filter()->::io::deephaven::proto::backplane::grpc::Condition::MergeFrom(
-        from._internal_filter());
-  }
-  _this->_internal_metadata_.MergeFrom<::google::protobuf::UnknownFieldSet>(from._internal_metadata_);
-}
-
-void NotCondition::CopyFrom(const NotCondition& from) {
-// @@protoc_insertion_point(class_specific_copy_from_start:io.deephaven.proto.backplane.grpc.NotCondition)
-  if (&from == this) return;
-  Clear();
-  MergeFrom(from);
-}
-
-PROTOBUF_NOINLINE bool NotCondition::IsInitialized() const {
-  return true;
-}
-
-::_pbi::CachedSize* NotCondition::AccessCachedSize() const {
-  return &_impl_._cached_size_;
-}
-void NotCondition::InternalSwap(NotCondition* PROTOBUF_RESTRICT other) {
-  using std::swap;
-  _internal_metadata_.InternalSwap(&other->_internal_metadata_);
-  swap(_impl_._has_bits_[0], other->_impl_._has_bits_[0]);
-  swap(_impl_.filter_, other->_impl_.filter_);
-}
-
-::google::protobuf::Metadata NotCondition::GetMetadata() const {
-  return ::_pbi::AssignDescriptors(
-      &descriptor_table_deephaven_2fproto_2ftable_2eproto_getter, &descriptor_table_deephaven_2fproto_2ftable_2eproto_once,
-      file_level_metadata_deephaven_2fproto_2ftable_2eproto[103]);
-}
-// ===================================================================
-
-class CompareCondition::_Internal {
- public:
-  using HasBits = decltype(std::declval<CompareCondition>()._impl_._has_bits_);
-  static constexpr ::int32_t kHasBitsOffset =
-    8 * PROTOBUF_FIELD_OFFSET(CompareCondition, _impl_._has_bits_);
-  static const ::io::deephaven::proto::backplane::grpc::Value& lhs(const CompareCondition* msg);
-  static void set_has_lhs(HasBits* has_bits) {
-    (*has_bits)[0] |= 1u;
-  }
-  static const ::io::deephaven::proto::backplane::grpc::Value& rhs(const CompareCondition* msg);
-  static void set_has_rhs(HasBits* has_bits) {
-    (*has_bits)[0] |= 2u;
-  }
-};
-
-const ::io::deephaven::proto::backplane::grpc::Value& CompareCondition::_Internal::lhs(const CompareCondition* msg) {
-  return *msg->_impl_.lhs_;
-}
-const ::io::deephaven::proto::backplane::grpc::Value& CompareCondition::_Internal::rhs(const CompareCondition* msg) {
-  return *msg->_impl_.rhs_;
-}
-CompareCondition::CompareCondition(::google::protobuf::Arena* arena)
-    : ::google::protobuf::Message(arena) {
-  SharedCtor(arena);
-  // @@protoc_insertion_point(arena_constructor:io.deephaven.proto.backplane.grpc.CompareCondition)
-}
-inline PROTOBUF_NDEBUG_INLINE CompareCondition::Impl_::Impl_(
-    ::google::protobuf::internal::InternalVisibility visibility, ::google::protobuf::Arena* arena,
-    const Impl_& from)
-      : _has_bits_{from._has_bits_},
-        _cached_size_{0} {}
-
-CompareCondition::CompareCondition(
-    ::google::protobuf::Arena* arena,
-    const CompareCondition& from)
-    : ::google::protobuf::Message(arena) {
-  CompareCondition* const _this = this;
-  (void)_this;
-  _internal_metadata_.MergeFrom<::google::protobuf::UnknownFieldSet>(
-      from._internal_metadata_);
-  new (&_impl_) Impl_(internal_visibility(), arena, from._impl_);
-  ::uint32_t cached_has_bits = _impl_._has_bits_[0];
-  _impl_.lhs_ = (cached_has_bits & 0x00000001u)
-                ? CreateMaybeMessage<::io::deephaven::proto::backplane::grpc::Value>(arena, *from._impl_.lhs_)
-                : nullptr;
-  _impl_.rhs_ = (cached_has_bits & 0x00000002u)
-                ? CreateMaybeMessage<::io::deephaven::proto::backplane::grpc::Value>(arena, *from._impl_.rhs_)
-                : nullptr;
-  ::memcpy(reinterpret_cast<char *>(&_impl_) +
-               offsetof(Impl_, operation_),
-           reinterpret_cast<const char *>(&from._impl_) +
-               offsetof(Impl_, operation_),
-           offsetof(Impl_, case_sensitivity_) -
-               offsetof(Impl_, operation_) +
-               sizeof(Impl_::case_sensitivity_));
-
-  // @@protoc_insertion_point(copy_constructor:io.deephaven.proto.backplane.grpc.CompareCondition)
-}
-inline PROTOBUF_NDEBUG_INLINE CompareCondition::Impl_::Impl_(
-    ::google::protobuf::internal::InternalVisibility visibility,
-    ::google::protobuf::Arena* arena)
-      : _cached_size_{0} {}
-
-inline void CompareCondition::SharedCtor(::_pb::Arena* arena) {
-  new (&_impl_) Impl_(internal_visibility(), arena);
-  ::memset(reinterpret_cast<char *>(&_impl_) +
-               offsetof(Impl_, lhs_),
-           0,
-           offsetof(Impl_, case_sensitivity_) -
-               offsetof(Impl_, lhs_) +
-               sizeof(Impl_::case_sensitivity_));
-}
-CompareCondition::~CompareCondition() {
-  // @@protoc_insertion_point(destructor:io.deephaven.proto.backplane.grpc.CompareCondition)
-  _internal_metadata_.Delete<::google::protobuf::UnknownFieldSet>();
-  SharedDtor();
-}
-inline void CompareCondition::SharedDtor() {
-  ABSL_DCHECK(GetArena() == nullptr);
-  delete _impl_.lhs_;
-  delete _impl_.rhs_;
-  _impl_.~Impl_();
-}
-
-PROTOBUF_NOINLINE void CompareCondition::Clear() {
-// @@protoc_insertion_point(message_clear_start:io.deephaven.proto.backplane.grpc.CompareCondition)
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  ::uint32_t cached_has_bits = 0;
-  // Prevent compiler warnings about cached_has_bits being unused
-  (void) cached_has_bits;
-
-  cached_has_bits = _impl_._has_bits_[0];
-  if (cached_has_bits & 0x00000003u) {
-    if (cached_has_bits & 0x00000001u) {
-      ABSL_DCHECK(_impl_.lhs_ != nullptr);
-      _impl_.lhs_->Clear();
-    }
-    if (cached_has_bits & 0x00000002u) {
-      ABSL_DCHECK(_impl_.rhs_ != nullptr);
-      _impl_.rhs_->Clear();
-    }
-  }
-  ::memset(&_impl_.operation_, 0, static_cast<::size_t>(
-      reinterpret_cast<char*>(&_impl_.case_sensitivity_) -
-      reinterpret_cast<char*>(&_impl_.operation_)) + sizeof(_impl_.case_sensitivity_));
-  _impl_._has_bits_.Clear();
-  _internal_metadata_.Clear<::google::protobuf::UnknownFieldSet>();
-}
-
-const char* CompareCondition::_InternalParse(
-    const char* ptr, ::_pbi::ParseContext* ctx) {
-  ptr = ::_pbi::TcParser::ParseLoop(this, ptr, ctx, &_table_.header);
-  return ptr;
-}
-
-
-PROTOBUF_CONSTINIT PROTOBUF_ATTRIBUTE_INIT_PRIORITY1
-const ::_pbi::TcParseTable<2, 4, 2, 0, 2> CompareCondition::_table_ = {
-  {
-    PROTOBUF_FIELD_OFFSET(CompareCondition, _impl_._has_bits_),
-    0, // no _extensions_
-    4, 24,  // max_field_number, fast_idx_mask
-    offsetof(decltype(_table_), field_lookup_table),
-    4294967280,  // skipmap
-    offsetof(decltype(_table_), field_entries),
-    4,  // num_field_entries
-    2,  // num_aux_entries
-    offsetof(decltype(_table_), aux_entries),
-    &_CompareCondition_default_instance_._instance,
-    ::_pbi::TcParser::GenericFallback,  // fallback
-  }, {{
-    // .io.deephaven.proto.backplane.grpc.Value rhs = 4;
-    {::_pbi::TcParser::FastMtS1,
-     {34, 1, 1, PROTOBUF_FIELD_OFFSET(CompareCondition, _impl_.rhs_)}},
-    // .io.deephaven.proto.backplane.grpc.CompareCondition.CompareOperation operation = 1;
-    {::_pbi::TcParser::SingularVarintNoZag1<::uint32_t, offsetof(CompareCondition, _impl_.operation_), 63>(),
-     {8, 63, 0, PROTOBUF_FIELD_OFFSET(CompareCondition, _impl_.operation_)}},
-    // .io.deephaven.proto.backplane.grpc.CaseSensitivity case_sensitivity = 2;
-    {::_pbi::TcParser::SingularVarintNoZag1<::uint32_t, offsetof(CompareCondition, _impl_.case_sensitivity_), 63>(),
-     {16, 63, 0, PROTOBUF_FIELD_OFFSET(CompareCondition, _impl_.case_sensitivity_)}},
-    // .io.deephaven.proto.backplane.grpc.Value lhs = 3;
-    {::_pbi::TcParser::FastMtS1,
-     {26, 0, 0, PROTOBUF_FIELD_OFFSET(CompareCondition, _impl_.lhs_)}},
-  }}, {{
-    65535, 65535
-  }}, {{
-    // .io.deephaven.proto.backplane.grpc.CompareCondition.CompareOperation operation = 1;
-    {PROTOBUF_FIELD_OFFSET(CompareCondition, _impl_.operation_), -1, 0,
-    (0 | ::_fl::kFcSingular | ::_fl::kOpenEnum)},
-    // .io.deephaven.proto.backplane.grpc.CaseSensitivity case_sensitivity = 2;
-    {PROTOBUF_FIELD_OFFSET(CompareCondition, _impl_.case_sensitivity_), -1, 0,
-    (0 | ::_fl::kFcSingular | ::_fl::kOpenEnum)},
-    // .io.deephaven.proto.backplane.grpc.Value lhs = 3;
-    {PROTOBUF_FIELD_OFFSET(CompareCondition, _impl_.lhs_), _Internal::kHasBitsOffset + 0, 0,
-    (0 | ::_fl::kFcOptional | ::_fl::kMessage | ::_fl::kTvTable)},
-    // .io.deephaven.proto.backplane.grpc.Value rhs = 4;
-    {PROTOBUF_FIELD_OFFSET(CompareCondition, _impl_.rhs_), _Internal::kHasBitsOffset + 1, 1,
-    (0 | ::_fl::kFcOptional | ::_fl::kMessage | ::_fl::kTvTable)},
-  }}, {{
-    {::_pbi::TcParser::GetTable<::io::deephaven::proto::backplane::grpc::Value>()},
-    {::_pbi::TcParser::GetTable<::io::deephaven::proto::backplane::grpc::Value>()},
-  }}, {{
-  }},
-};
-
-::uint8_t* CompareCondition::_InternalSerialize(
-    ::uint8_t* target,
-    ::google::protobuf::io::EpsCopyOutputStream* stream) const {
-  // @@protoc_insertion_point(serialize_to_array_start:io.deephaven.proto.backplane.grpc.CompareCondition)
-  ::uint32_t cached_has_bits = 0;
-  (void)cached_has_bits;
-
-  // .io.deephaven.proto.backplane.grpc.CompareCondition.CompareOperation operation = 1;
-  if (this->_internal_operation() != 0) {
-    target = stream->EnsureSpace(target);
-    target = ::_pbi::WireFormatLite::WriteEnumToArray(
-        1, this->_internal_operation(), target);
-  }
-
-  // .io.deephaven.proto.backplane.grpc.CaseSensitivity case_sensitivity = 2;
-  if (this->_internal_case_sensitivity() != 0) {
-    target = stream->EnsureSpace(target);
-    target = ::_pbi::WireFormatLite::WriteEnumToArray(
-        2, this->_internal_case_sensitivity(), target);
-  }
-
-  cached_has_bits = _impl_._has_bits_[0];
-  // .io.deephaven.proto.backplane.grpc.Value lhs = 3;
-  if (cached_has_bits & 0x00000001u) {
-    target = ::google::protobuf::internal::WireFormatLite::InternalWriteMessage(
-        3, _Internal::lhs(this),
-        _Internal::lhs(this).GetCachedSize(), target, stream);
-  }
-
-  // .io.deephaven.proto.backplane.grpc.Value rhs = 4;
-  if (cached_has_bits & 0x00000002u) {
-    target = ::google::protobuf::internal::WireFormatLite::InternalWriteMessage(
-        4, _Internal::rhs(this),
-        _Internal::rhs(this).GetCachedSize(), target, stream);
-  }
-
-  if (PROTOBUF_PREDICT_FALSE(_internal_metadata_.have_unknown_fields())) {
-    target =
-        ::_pbi::WireFormat::InternalSerializeUnknownFieldsToArray(
-            _internal_metadata_.unknown_fields<::google::protobuf::UnknownFieldSet>(::google::protobuf::UnknownFieldSet::default_instance), target, stream);
-  }
-  // @@protoc_insertion_point(serialize_to_array_end:io.deephaven.proto.backplane.grpc.CompareCondition)
-  return target;
-}
-
-::size_t CompareCondition::ByteSizeLong() const {
-// @@protoc_insertion_point(message_byte_size_start:io.deephaven.proto.backplane.grpc.CompareCondition)
-  ::size_t total_size = 0;
-
-  ::uint32_t cached_has_bits = 0;
-  // Prevent compiler warnings about cached_has_bits being unused
-  (void) cached_has_bits;
-
-  cached_has_bits = _impl_._has_bits_[0];
-  if (cached_has_bits & 0x00000003u) {
-    // .io.deephaven.proto.backplane.grpc.Value lhs = 3;
-    if (cached_has_bits & 0x00000001u) {
-      total_size +=
-          1 + ::google::protobuf::internal::WireFormatLite::MessageSize(*_impl_.lhs_);
-    }
-
-    // .io.deephaven.proto.backplane.grpc.Value rhs = 4;
-    if (cached_has_bits & 0x00000002u) {
-      total_size +=
-          1 + ::google::protobuf::internal::WireFormatLite::MessageSize(*_impl_.rhs_);
-    }
-
-  }
-  // .io.deephaven.proto.backplane.grpc.CompareCondition.CompareOperation operation = 1;
-  if (this->_internal_operation() != 0) {
-    total_size += 1 +
-                  ::_pbi::WireFormatLite::EnumSize(this->_internal_operation());
-  }
-
-  // .io.deephaven.proto.backplane.grpc.CaseSensitivity case_sensitivity = 2;
-  if (this->_internal_case_sensitivity() != 0) {
-    total_size += 1 +
-                  ::_pbi::WireFormatLite::EnumSize(this->_internal_case_sensitivity());
-  }
-
-  return MaybeComputeUnknownFieldsSize(total_size, &_impl_._cached_size_);
-}
-
-const ::google::protobuf::Message::ClassData CompareCondition::_class_data_ = {
-    CompareCondition::MergeImpl,
-    nullptr,  // OnDemandRegisterArenaDtor
-};
-const ::google::protobuf::Message::ClassData* CompareCondition::GetClassData() const {
-  return &_class_data_;
-}
-
-void CompareCondition::MergeImpl(::google::protobuf::Message& to_msg, const ::google::protobuf::Message& from_msg) {
-  auto* const _this = static_cast<CompareCondition*>(&to_msg);
-  auto& from = static_cast<const CompareCondition&>(from_msg);
-  // @@protoc_insertion_point(class_specific_merge_from_start:io.deephaven.proto.backplane.grpc.CompareCondition)
-  ABSL_DCHECK_NE(&from, _this);
-  ::uint32_t cached_has_bits = 0;
-  (void) cached_has_bits;
-
-  cached_has_bits = from._impl_._has_bits_[0];
-  if (cached_has_bits & 0x00000003u) {
-    if (cached_has_bits & 0x00000001u) {
-      _this->_internal_mutable_lhs()->::io::deephaven::proto::backplane::grpc::Value::MergeFrom(
-          from._internal_lhs());
-    }
-    if (cached_has_bits & 0x00000002u) {
-      _this->_internal_mutable_rhs()->::io::deephaven::proto::backplane::grpc::Value::MergeFrom(
-          from._internal_rhs());
-    }
-  }
-  if (from._internal_operation() != 0) {
-    _this->_internal_set_operation(from._internal_operation());
-  }
-  if (from._internal_case_sensitivity() != 0) {
-    _this->_internal_set_case_sensitivity(from._internal_case_sensitivity());
-  }
-  _this->_internal_metadata_.MergeFrom<::google::protobuf::UnknownFieldSet>(from._internal_metadata_);
-}
-
-void CompareCondition::CopyFrom(const CompareCondition& from) {
-// @@protoc_insertion_point(class_specific_copy_from_start:io.deephaven.proto.backplane.grpc.CompareCondition)
-  if (&from == this) return;
-  Clear();
-  MergeFrom(from);
-}
-
-PROTOBUF_NOINLINE bool CompareCondition::IsInitialized() const {
-  return true;
-}
-
-::_pbi::CachedSize* CompareCondition::AccessCachedSize() const {
-  return &_impl_._cached_size_;
-}
-void CompareCondition::InternalSwap(CompareCondition* PROTOBUF_RESTRICT other) {
-  using std::swap;
-  _internal_metadata_.InternalSwap(&other->_internal_metadata_);
-  swap(_impl_._has_bits_[0], other->_impl_._has_bits_[0]);
-  ::google::protobuf::internal::memswap<
-      PROTOBUF_FIELD_OFFSET(CompareCondition, _impl_.case_sensitivity_)
-      + sizeof(CompareCondition::_impl_.case_sensitivity_)
-      - PROTOBUF_FIELD_OFFSET(CompareCondition, _impl_.lhs_)>(
-          reinterpret_cast<char*>(&_impl_.lhs_),
-          reinterpret_cast<char*>(&other->_impl_.lhs_));
-}
-
-::google::protobuf::Metadata CompareCondition::GetMetadata() const {
-  return ::_pbi::AssignDescriptors(
-      &descriptor_table_deephaven_2fproto_2ftable_2eproto_getter, &descriptor_table_deephaven_2fproto_2ftable_2eproto_once,
-      file_level_metadata_deephaven_2fproto_2ftable_2eproto[104]);
-}
-// ===================================================================
-
-class InCondition::_Internal {
- public:
-  using HasBits = decltype(std::declval<InCondition>()._impl_._has_bits_);
-  static constexpr ::int32_t kHasBitsOffset =
-    8 * PROTOBUF_FIELD_OFFSET(InCondition, _impl_._has_bits_);
-  static const ::io::deephaven::proto::backplane::grpc::Value& target(const InCondition* msg);
-  static void set_has_target(HasBits* has_bits) {
-    (*has_bits)[0] |= 1u;
-  }
-};
-
-const ::io::deephaven::proto::backplane::grpc::Value& InCondition::_Internal::target(const InCondition* msg) {
-  return *msg->_impl_.target_;
-}
-InCondition::InCondition(::google::protobuf::Arena* arena)
-    : ::google::protobuf::Message(arena) {
-  SharedCtor(arena);
-  // @@protoc_insertion_point(arena_constructor:io.deephaven.proto.backplane.grpc.InCondition)
-}
-inline PROTOBUF_NDEBUG_INLINE InCondition::Impl_::Impl_(
-    ::google::protobuf::internal::InternalVisibility visibility, ::google::protobuf::Arena* arena,
-    const Impl_& from)
-      : _has_bits_{from._has_bits_},
-        _cached_size_{0},
-        candidates_{visibility, arena, from.candidates_} {}
-
-InCondition::InCondition(
-    ::google::protobuf::Arena* arena,
-    const InCondition& from)
-    : ::google::protobuf::Message(arena) {
-  InCondition* const _this = this;
-  (void)_this;
-  _internal_metadata_.MergeFrom<::google::protobuf::UnknownFieldSet>(
-      from._internal_metadata_);
-  new (&_impl_) Impl_(internal_visibility(), arena, from._impl_);
-  ::uint32_t cached_has_bits = _impl_._has_bits_[0];
-  _impl_.target_ = (cached_has_bits & 0x00000001u)
-                ? CreateMaybeMessage<::io::deephaven::proto::backplane::grpc::Value>(arena, *from._impl_.target_)
-                : nullptr;
-  ::memcpy(reinterpret_cast<char *>(&_impl_) +
-               offsetof(Impl_, case_sensitivity_),
-           reinterpret_cast<const char *>(&from._impl_) +
-               offsetof(Impl_, case_sensitivity_),
-           offsetof(Impl_, match_type_) -
-               offsetof(Impl_, case_sensitivity_) +
-               sizeof(Impl_::match_type_));
-
-  // @@protoc_insertion_point(copy_constructor:io.deephaven.proto.backplane.grpc.InCondition)
-}
-inline PROTOBUF_NDEBUG_INLINE InCondition::Impl_::Impl_(
-    ::google::protobuf::internal::InternalVisibility visibility,
-    ::google::protobuf::Arena* arena)
-      : _cached_size_{0},
-        candidates_{visibility, arena} {}
-
-inline void InCondition::SharedCtor(::_pb::Arena* arena) {
-  new (&_impl_) Impl_(internal_visibility(), arena);
-  ::memset(reinterpret_cast<char *>(&_impl_) +
-               offsetof(Impl_, target_),
-           0,
-           offsetof(Impl_, match_type_) -
-               offsetof(Impl_, target_) +
-               sizeof(Impl_::match_type_));
-}
-InCondition::~InCondition() {
-  // @@protoc_insertion_point(destructor:io.deephaven.proto.backplane.grpc.InCondition)
-  _internal_metadata_.Delete<::google::protobuf::UnknownFieldSet>();
-  SharedDtor();
-}
-inline void InCondition::SharedDtor() {
-  ABSL_DCHECK(GetArena() == nullptr);
-  delete _impl_.target_;
-  _impl_.~Impl_();
-}
-
-PROTOBUF_NOINLINE void InCondition::Clear() {
-// @@protoc_insertion_point(message_clear_start:io.deephaven.proto.backplane.grpc.InCondition)
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  ::uint32_t cached_has_bits = 0;
-  // Prevent compiler warnings about cached_has_bits being unused
-  (void) cached_has_bits;
-
-  _impl_.candidates_.Clear();
-  cached_has_bits = _impl_._has_bits_[0];
-  if (cached_has_bits & 0x00000001u) {
-    ABSL_DCHECK(_impl_.target_ != nullptr);
-    _impl_.target_->Clear();
-  }
-  ::memset(&_impl_.case_sensitivity_, 0, static_cast<::size_t>(
-      reinterpret_cast<char*>(&_impl_.match_type_) -
-      reinterpret_cast<char*>(&_impl_.case_sensitivity_)) + sizeof(_impl_.match_type_));
-  _impl_._has_bits_.Clear();
-  _internal_metadata_.Clear<::google::protobuf::UnknownFieldSet>();
-}
-
-const char* InCondition::_InternalParse(
-    const char* ptr, ::_pbi::ParseContext* ctx) {
-  ptr = ::_pbi::TcParser::ParseLoop(this, ptr, ctx, &_table_.header);
-  return ptr;
-}
-
-
-PROTOBUF_CONSTINIT PROTOBUF_ATTRIBUTE_INIT_PRIORITY1
-const ::_pbi::TcParseTable<2, 4, 2, 0, 2> InCondition::_table_ = {
-  {
-    PROTOBUF_FIELD_OFFSET(InCondition, _impl_._has_bits_),
-    0, // no _extensions_
-    4, 24,  // max_field_number, fast_idx_mask
-    offsetof(decltype(_table_), field_lookup_table),
-    4294967280,  // skipmap
-    offsetof(decltype(_table_), field_entries),
-    4,  // num_field_entries
-    2,  // num_aux_entries
-    offsetof(decltype(_table_), aux_entries),
-    &_InCondition_default_instance_._instance,
-    ::_pbi::TcParser::GenericFallback,  // fallback
-  }, {{
-    // .io.deephaven.proto.backplane.grpc.MatchType match_type = 4;
-    {::_pbi::TcParser::SingularVarintNoZag1<::uint32_t, offsetof(InCondition, _impl_.match_type_), 63>(),
-     {32, 63, 0, PROTOBUF_FIELD_OFFSET(InCondition, _impl_.match_type_)}},
-    // .io.deephaven.proto.backplane.grpc.Value target = 1;
-    {::_pbi::TcParser::FastMtS1,
-     {10, 0, 0, PROTOBUF_FIELD_OFFSET(InCondition, _impl_.target_)}},
-    // repeated .io.deephaven.proto.backplane.grpc.Value candidates = 2;
-    {::_pbi::TcParser::FastMtR1,
-     {18, 63, 1, PROTOBUF_FIELD_OFFSET(InCondition, _impl_.candidates_)}},
-    // .io.deephaven.proto.backplane.grpc.CaseSensitivity case_sensitivity = 3;
-    {::_pbi::TcParser::SingularVarintNoZag1<::uint32_t, offsetof(InCondition, _impl_.case_sensitivity_), 63>(),
-     {24, 63, 0, PROTOBUF_FIELD_OFFSET(InCondition, _impl_.case_sensitivity_)}},
-  }}, {{
-    65535, 65535
-  }}, {{
-    // .io.deephaven.proto.backplane.grpc.Value target = 1;
-    {PROTOBUF_FIELD_OFFSET(InCondition, _impl_.target_), _Internal::kHasBitsOffset + 0, 0,
-    (0 | ::_fl::kFcOptional | ::_fl::kMessage | ::_fl::kTvTable)},
-    // repeated .io.deephaven.proto.backplane.grpc.Value candidates = 2;
-    {PROTOBUF_FIELD_OFFSET(InCondition, _impl_.candidates_), -1, 1,
-    (0 | ::_fl::kFcRepeated | ::_fl::kMessage | ::_fl::kTvTable)},
-    // .io.deephaven.proto.backplane.grpc.CaseSensitivity case_sensitivity = 3;
-    {PROTOBUF_FIELD_OFFSET(InCondition, _impl_.case_sensitivity_), -1, 0,
-    (0 | ::_fl::kFcSingular | ::_fl::kOpenEnum)},
-    // .io.deephaven.proto.backplane.grpc.MatchType match_type = 4;
-    {PROTOBUF_FIELD_OFFSET(InCondition, _impl_.match_type_), -1, 0,
-    (0 | ::_fl::kFcSingular | ::_fl::kOpenEnum)},
-  }}, {{
-    {::_pbi::TcParser::GetTable<::io::deephaven::proto::backplane::grpc::Value>()},
-    {::_pbi::TcParser::GetTable<::io::deephaven::proto::backplane::grpc::Value>()},
-  }}, {{
-  }},
-};
-
-::uint8_t* InCondition::_InternalSerialize(
-    ::uint8_t* target,
-    ::google::protobuf::io::EpsCopyOutputStream* stream) const {
-  // @@protoc_insertion_point(serialize_to_array_start:io.deephaven.proto.backplane.grpc.InCondition)
-  ::uint32_t cached_has_bits = 0;
-  (void)cached_has_bits;
-
-  cached_has_bits = _impl_._has_bits_[0];
-  // .io.deephaven.proto.backplane.grpc.Value target = 1;
-  if (cached_has_bits & 0x00000001u) {
-    target = ::google::protobuf::internal::WireFormatLite::InternalWriteMessage(
-        1, _Internal::target(this),
-        _Internal::target(this).GetCachedSize(), target, stream);
-  }
-
-  // repeated .io.deephaven.proto.backplane.grpc.Value candidates = 2;
-  for (unsigned i = 0,
-      n = static_cast<unsigned>(this->_internal_candidates_size()); i < n; i++) {
-    const auto& repfield = this->_internal_candidates().Get(i);
-    target = ::google::protobuf::internal::WireFormatLite::
-        InternalWriteMessage(2, repfield, repfield.GetCachedSize(), target, stream);
-  }
-
-  // .io.deephaven.proto.backplane.grpc.CaseSensitivity case_sensitivity = 3;
-  if (this->_internal_case_sensitivity() != 0) {
-    target = stream->EnsureSpace(target);
-    target = ::_pbi::WireFormatLite::WriteEnumToArray(
-        3, this->_internal_case_sensitivity(), target);
-  }
-
-  // .io.deephaven.proto.backplane.grpc.MatchType match_type = 4;
-  if (this->_internal_match_type() != 0) {
-    target = stream->EnsureSpace(target);
-    target = ::_pbi::WireFormatLite::WriteEnumToArray(
-        4, this->_internal_match_type(), target);
-  }
-
-  if (PROTOBUF_PREDICT_FALSE(_internal_metadata_.have_unknown_fields())) {
-    target =
-        ::_pbi::WireFormat::InternalSerializeUnknownFieldsToArray(
-            _internal_metadata_.unknown_fields<::google::protobuf::UnknownFieldSet>(::google::protobuf::UnknownFieldSet::default_instance), target, stream);
-  }
-  // @@protoc_insertion_point(serialize_to_array_end:io.deephaven.proto.backplane.grpc.InCondition)
-  return target;
-}
-
-::size_t InCondition::ByteSizeLong() const {
-// @@protoc_insertion_point(message_byte_size_start:io.deephaven.proto.backplane.grpc.InCondition)
-  ::size_t total_size = 0;
-
-  ::uint32_t cached_has_bits = 0;
-  // Prevent compiler warnings about cached_has_bits being unused
-  (void) cached_has_bits;
-
-  // repeated .io.deephaven.proto.backplane.grpc.Value candidates = 2;
-  total_size += 1UL * this->_internal_candidates_size();
-  for (const auto& msg : this->_internal_candidates()) {
-    total_size +=
-      ::google::protobuf::internal::WireFormatLite::MessageSize(msg);
-  }
-  // .io.deephaven.proto.backplane.grpc.Value target = 1;
-  cached_has_bits = _impl_._has_bits_[0];
-  if (cached_has_bits & 0x00000001u) {
-    total_size +=
-        1 + ::google::protobuf::internal::WireFormatLite::MessageSize(*_impl_.target_);
-  }
-
-  // .io.deephaven.proto.backplane.grpc.CaseSensitivity case_sensitivity = 3;
-  if (this->_internal_case_sensitivity() != 0) {
-    total_size += 1 +
-                  ::_pbi::WireFormatLite::EnumSize(this->_internal_case_sensitivity());
-  }
-
-  // .io.deephaven.proto.backplane.grpc.MatchType match_type = 4;
-  if (this->_internal_match_type() != 0) {
-    total_size += 1 +
-                  ::_pbi::WireFormatLite::EnumSize(this->_internal_match_type());
-  }
-
-  return MaybeComputeUnknownFieldsSize(total_size, &_impl_._cached_size_);
-}
-
-const ::google::protobuf::Message::ClassData InCondition::_class_data_ = {
-    InCondition::MergeImpl,
-    nullptr,  // OnDemandRegisterArenaDtor
-};
-const ::google::protobuf::Message::ClassData* InCondition::GetClassData() const {
-  return &_class_data_;
-}
-
-void InCondition::MergeImpl(::google::protobuf::Message& to_msg, const ::google::protobuf::Message& from_msg) {
-  auto* const _this = static_cast<InCondition*>(&to_msg);
-  auto& from = static_cast<const InCondition&>(from_msg);
-  // @@protoc_insertion_point(class_specific_merge_from_start:io.deephaven.proto.backplane.grpc.InCondition)
-  ABSL_DCHECK_NE(&from, _this);
-  ::uint32_t cached_has_bits = 0;
-  (void) cached_has_bits;
-
-  _this->_internal_mutable_candidates()->MergeFrom(
-      from._internal_candidates());
-  if ((from._impl_._has_bits_[0] & 0x00000001u) != 0) {
-    _this->_internal_mutable_target()->::io::deephaven::proto::backplane::grpc::Value::MergeFrom(
-        from._internal_target());
-  }
-  if (from._internal_case_sensitivity() != 0) {
-    _this->_internal_set_case_sensitivity(from._internal_case_sensitivity());
-  }
-  if (from._internal_match_type() != 0) {
-    _this->_internal_set_match_type(from._internal_match_type());
-  }
-  _this->_internal_metadata_.MergeFrom<::google::protobuf::UnknownFieldSet>(from._internal_metadata_);
-}
-
-void InCondition::CopyFrom(const InCondition& from) {
-// @@protoc_insertion_point(class_specific_copy_from_start:io.deephaven.proto.backplane.grpc.InCondition)
-  if (&from == this) return;
-  Clear();
-  MergeFrom(from);
-}
-
-PROTOBUF_NOINLINE bool InCondition::IsInitialized() const {
-  return true;
-}
-
-::_pbi::CachedSize* InCondition::AccessCachedSize() const {
-  return &_impl_._cached_size_;
-}
-void InCondition::InternalSwap(InCondition* PROTOBUF_RESTRICT other) {
-  using std::swap;
-  _internal_metadata_.InternalSwap(&other->_internal_metadata_);
-  swap(_impl_._has_bits_[0], other->_impl_._has_bits_[0]);
-  _impl_.candidates_.InternalSwap(&other->_impl_.candidates_);
-  ::google::protobuf::internal::memswap<
-      PROTOBUF_FIELD_OFFSET(InCondition, _impl_.match_type_)
-      + sizeof(InCondition::_impl_.match_type_)
-      - PROTOBUF_FIELD_OFFSET(InCondition, _impl_.target_)>(
-          reinterpret_cast<char*>(&_impl_.target_),
-          reinterpret_cast<char*>(&other->_impl_.target_));
-}
-
-::google::protobuf::Metadata InCondition::GetMetadata() const {
-  return ::_pbi::AssignDescriptors(
-      &descriptor_table_deephaven_2fproto_2ftable_2eproto_getter, &descriptor_table_deephaven_2fproto_2ftable_2eproto_once,
-      file_level_metadata_deephaven_2fproto_2ftable_2eproto[105]);
-}
-// ===================================================================
-
-class InvokeCondition::_Internal {
- public:
-  using HasBits = decltype(std::declval<InvokeCondition>()._impl_._has_bits_);
-  static constexpr ::int32_t kHasBitsOffset =
-    8 * PROTOBUF_FIELD_OFFSET(InvokeCondition, _impl_._has_bits_);
-  static const ::io::deephaven::proto::backplane::grpc::Value& target(const InvokeCondition* msg);
-  static void set_has_target(HasBits* has_bits) {
-    (*has_bits)[0] |= 1u;
-  }
-};
-
-const ::io::deephaven::proto::backplane::grpc::Value& InvokeCondition::_Internal::target(const InvokeCondition* msg) {
-  return *msg->_impl_.target_;
-}
-InvokeCondition::InvokeCondition(::google::protobuf::Arena* arena)
-    : ::google::protobuf::Message(arena) {
-  SharedCtor(arena);
-  // @@protoc_insertion_point(arena_constructor:io.deephaven.proto.backplane.grpc.InvokeCondition)
-}
-inline PROTOBUF_NDEBUG_INLINE InvokeCondition::Impl_::Impl_(
-    ::google::protobuf::internal::InternalVisibility visibility, ::google::protobuf::Arena* arena,
-    const Impl_& from)
-      : _has_bits_{from._has_bits_},
-        _cached_size_{0},
-        arguments_{visibility, arena, from.arguments_},
-        method_(arena, from.method_) {}
-
-InvokeCondition::InvokeCondition(
-    ::google::protobuf::Arena* arena,
-    const InvokeCondition& from)
-    : ::google::protobuf::Message(arena) {
-  InvokeCondition* const _this = this;
-  (void)_this;
-  _internal_metadata_.MergeFrom<::google::protobuf::UnknownFieldSet>(
-      from._internal_metadata_);
-  new (&_impl_) Impl_(internal_visibility(), arena, from._impl_);
-  ::uint32_t cached_has_bits = _impl_._has_bits_[0];
-  _impl_.target_ = (cached_has_bits & 0x00000001u)
-                ? CreateMaybeMessage<::io::deephaven::proto::backplane::grpc::Value>(arena, *from._impl_.target_)
-                : nullptr;
-
-  // @@protoc_insertion_point(copy_constructor:io.deephaven.proto.backplane.grpc.InvokeCondition)
-}
-inline PROTOBUF_NDEBUG_INLINE InvokeCondition::Impl_::Impl_(
-    ::google::protobuf::internal::InternalVisibility visibility,
-    ::google::protobuf::Arena* arena)
-      : _cached_size_{0},
-        arguments_{visibility, arena},
-        method_(arena) {}
-
-inline void InvokeCondition::SharedCtor(::_pb::Arena* arena) {
-  new (&_impl_) Impl_(internal_visibility(), arena);
-  _impl_.target_ = {};
-}
-InvokeCondition::~InvokeCondition() {
-  // @@protoc_insertion_point(destructor:io.deephaven.proto.backplane.grpc.InvokeCondition)
-  _internal_metadata_.Delete<::google::protobuf::UnknownFieldSet>();
-  SharedDtor();
-}
-inline void InvokeCondition::SharedDtor() {
-  ABSL_DCHECK(GetArena() == nullptr);
-  _impl_.method_.Destroy();
-  delete _impl_.target_;
-  _impl_.~Impl_();
-}
-
-PROTOBUF_NOINLINE void InvokeCondition::Clear() {
-// @@protoc_insertion_point(message_clear_start:io.deephaven.proto.backplane.grpc.InvokeCondition)
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  ::uint32_t cached_has_bits = 0;
-  // Prevent compiler warnings about cached_has_bits being unused
-  (void) cached_has_bits;
-
-  _impl_.arguments_.Clear();
-  _impl_.method_.ClearToEmpty();
-  cached_has_bits = _impl_._has_bits_[0];
-  if (cached_has_bits & 0x00000001u) {
-    ABSL_DCHECK(_impl_.target_ != nullptr);
-    _impl_.target_->Clear();
-  }
-  _impl_._has_bits_.Clear();
-  _internal_metadata_.Clear<::google::protobuf::UnknownFieldSet>();
-}
-
-const char* InvokeCondition::_InternalParse(
-    const char* ptr, ::_pbi::ParseContext* ctx) {
-  ptr = ::_pbi::TcParser::ParseLoop(this, ptr, ctx, &_table_.header);
-  return ptr;
-}
-
-
-PROTOBUF_CONSTINIT PROTOBUF_ATTRIBUTE_INIT_PRIORITY1
-const ::_pbi::TcParseTable<2, 3, 2, 64, 2> InvokeCondition::_table_ = {
-  {
-    PROTOBUF_FIELD_OFFSET(InvokeCondition, _impl_._has_bits_),
-    0, // no _extensions_
-    3, 24,  // max_field_number, fast_idx_mask
-    offsetof(decltype(_table_), field_lookup_table),
-    4294967288,  // skipmap
-    offsetof(decltype(_table_), field_entries),
-    3,  // num_field_entries
-    2,  // num_aux_entries
-    offsetof(decltype(_table_), aux_entries),
-    &_InvokeCondition_default_instance_._instance,
-    ::_pbi::TcParser::GenericFallback,  // fallback
-  }, {{
-    {::_pbi::TcParser::MiniParse, {}},
-    // string method = 1;
-    {::_pbi::TcParser::FastUS1,
-     {10, 63, 0, PROTOBUF_FIELD_OFFSET(InvokeCondition, _impl_.method_)}},
-    // .io.deephaven.proto.backplane.grpc.Value target = 2;
-    {::_pbi::TcParser::FastMtS1,
-     {18, 0, 0, PROTOBUF_FIELD_OFFSET(InvokeCondition, _impl_.target_)}},
-    // repeated .io.deephaven.proto.backplane.grpc.Value arguments = 3;
-    {::_pbi::TcParser::FastMtR1,
-     {26, 63, 1, PROTOBUF_FIELD_OFFSET(InvokeCondition, _impl_.arguments_)}},
-  }}, {{
-    65535, 65535
-  }}, {{
-    // string method = 1;
-    {PROTOBUF_FIELD_OFFSET(InvokeCondition, _impl_.method_), -1, 0,
-    (0 | ::_fl::kFcSingular | ::_fl::kUtf8String | ::_fl::kRepAString)},
-    // .io.deephaven.proto.backplane.grpc.Value target = 2;
-    {PROTOBUF_FIELD_OFFSET(InvokeCondition, _impl_.target_), _Internal::kHasBitsOffset + 0, 0,
-    (0 | ::_fl::kFcOptional | ::_fl::kMessage | ::_fl::kTvTable)},
-    // repeated .io.deephaven.proto.backplane.grpc.Value arguments = 3;
-    {PROTOBUF_FIELD_OFFSET(InvokeCondition, _impl_.arguments_), -1, 1,
-    (0 | ::_fl::kFcRepeated | ::_fl::kMessage | ::_fl::kTvTable)},
-  }}, {{
-    {::_pbi::TcParser::GetTable<::io::deephaven::proto::backplane::grpc::Value>()},
-    {::_pbi::TcParser::GetTable<::io::deephaven::proto::backplane::grpc::Value>()},
-  }}, {{
-    "\61\6\0\0\0\0\0\0"
-    "io.deephaven.proto.backplane.grpc.InvokeCondition"
-    "method"
-  }},
-};
-
-::uint8_t* InvokeCondition::_InternalSerialize(
-    ::uint8_t* target,
-    ::google::protobuf::io::EpsCopyOutputStream* stream) const {
-  // @@protoc_insertion_point(serialize_to_array_start:io.deephaven.proto.backplane.grpc.InvokeCondition)
-  ::uint32_t cached_has_bits = 0;
-  (void)cached_has_bits;
-
-  // string method = 1;
-  if (!this->_internal_method().empty()) {
-    const std::string& _s = this->_internal_method();
-    ::google::protobuf::internal::WireFormatLite::VerifyUtf8String(
-        _s.data(), static_cast<int>(_s.length()), ::google::protobuf::internal::WireFormatLite::SERIALIZE, "io.deephaven.proto.backplane.grpc.InvokeCondition.method");
-    target = stream->WriteStringMaybeAliased(1, _s, target);
-  }
-
-  cached_has_bits = _impl_._has_bits_[0];
-  // .io.deephaven.proto.backplane.grpc.Value target = 2;
-  if (cached_has_bits & 0x00000001u) {
-    target = ::google::protobuf::internal::WireFormatLite::InternalWriteMessage(
-        2, _Internal::target(this),
-        _Internal::target(this).GetCachedSize(), target, stream);
-  }
-
-  // repeated .io.deephaven.proto.backplane.grpc.Value arguments = 3;
-  for (unsigned i = 0,
-      n = static_cast<unsigned>(this->_internal_arguments_size()); i < n; i++) {
-    const auto& repfield = this->_internal_arguments().Get(i);
-    target = ::google::protobuf::internal::WireFormatLite::
-        InternalWriteMessage(3, repfield, repfield.GetCachedSize(), target, stream);
-  }
-
-  if (PROTOBUF_PREDICT_FALSE(_internal_metadata_.have_unknown_fields())) {
-    target =
-        ::_pbi::WireFormat::InternalSerializeUnknownFieldsToArray(
-            _internal_metadata_.unknown_fields<::google::protobuf::UnknownFieldSet>(::google::protobuf::UnknownFieldSet::default_instance), target, stream);
-  }
-  // @@protoc_insertion_point(serialize_to_array_end:io.deephaven.proto.backplane.grpc.InvokeCondition)
-  return target;
-}
-
-::size_t InvokeCondition::ByteSizeLong() const {
-// @@protoc_insertion_point(message_byte_size_start:io.deephaven.proto.backplane.grpc.InvokeCondition)
-  ::size_t total_size = 0;
-
-  ::uint32_t cached_has_bits = 0;
-  // Prevent compiler warnings about cached_has_bits being unused
-  (void) cached_has_bits;
-
-  // repeated .io.deephaven.proto.backplane.grpc.Value arguments = 3;
-  total_size += 1UL * this->_internal_arguments_size();
-  for (const auto& msg : this->_internal_arguments()) {
-    total_size +=
-      ::google::protobuf::internal::WireFormatLite::MessageSize(msg);
-  }
-  // string method = 1;
-  if (!this->_internal_method().empty()) {
-    total_size += 1 + ::google::protobuf::internal::WireFormatLite::StringSize(
-                                    this->_internal_method());
-  }
-
-  // .io.deephaven.proto.backplane.grpc.Value target = 2;
-  cached_has_bits = _impl_._has_bits_[0];
-  if (cached_has_bits & 0x00000001u) {
-    total_size +=
-        1 + ::google::protobuf::internal::WireFormatLite::MessageSize(*_impl_.target_);
-  }
-
-  return MaybeComputeUnknownFieldsSize(total_size, &_impl_._cached_size_);
-}
-
-const ::google::protobuf::Message::ClassData InvokeCondition::_class_data_ = {
-    InvokeCondition::MergeImpl,
-    nullptr,  // OnDemandRegisterArenaDtor
-};
-const ::google::protobuf::Message::ClassData* InvokeCondition::GetClassData() const {
-  return &_class_data_;
-}
-
-void InvokeCondition::MergeImpl(::google::protobuf::Message& to_msg, const ::google::protobuf::Message& from_msg) {
-  auto* const _this = static_cast<InvokeCondition*>(&to_msg);
-  auto& from = static_cast<const InvokeCondition&>(from_msg);
-  // @@protoc_insertion_point(class_specific_merge_from_start:io.deephaven.proto.backplane.grpc.InvokeCondition)
-  ABSL_DCHECK_NE(&from, _this);
-  ::uint32_t cached_has_bits = 0;
-  (void) cached_has_bits;
-
-  _this->_internal_mutable_arguments()->MergeFrom(
-      from._internal_arguments());
-  if (!from._internal_method().empty()) {
-    _this->_internal_set_method(from._internal_method());
-  }
-  if ((from._impl_._has_bits_[0] & 0x00000001u) != 0) {
-    _this->_internal_mutable_target()->::io::deephaven::proto::backplane::grpc::Value::MergeFrom(
-        from._internal_target());
-  }
-  _this->_internal_metadata_.MergeFrom<::google::protobuf::UnknownFieldSet>(from._internal_metadata_);
-}
-
-void InvokeCondition::CopyFrom(const InvokeCondition& from) {
-// @@protoc_insertion_point(class_specific_copy_from_start:io.deephaven.proto.backplane.grpc.InvokeCondition)
-  if (&from == this) return;
-  Clear();
-  MergeFrom(from);
-}
-
-PROTOBUF_NOINLINE bool InvokeCondition::IsInitialized() const {
-  return true;
-}
-
-::_pbi::CachedSize* InvokeCondition::AccessCachedSize() const {
-  return &_impl_._cached_size_;
-}
-void InvokeCondition::InternalSwap(InvokeCondition* PROTOBUF_RESTRICT other) {
-  using std::swap;
-  auto* arena = GetArena();
-  ABSL_DCHECK_EQ(arena, other->GetArena());
-  _internal_metadata_.InternalSwap(&other->_internal_metadata_);
-  swap(_impl_._has_bits_[0], other->_impl_._has_bits_[0]);
-  _impl_.arguments_.InternalSwap(&other->_impl_.arguments_);
-  ::_pbi::ArenaStringPtr::InternalSwap(&_impl_.method_, &other->_impl_.method_, arena);
-  swap(_impl_.target_, other->_impl_.target_);
-}
-
-::google::protobuf::Metadata InvokeCondition::GetMetadata() const {
-  return ::_pbi::AssignDescriptors(
-      &descriptor_table_deephaven_2fproto_2ftable_2eproto_getter, &descriptor_table_deephaven_2fproto_2ftable_2eproto_once,
-      file_level_metadata_deephaven_2fproto_2ftable_2eproto[106]);
-}
-// ===================================================================
-
-class IsNullCondition::_Internal {
- public:
-  using HasBits = decltype(std::declval<IsNullCondition>()._impl_._has_bits_);
-  static constexpr ::int32_t kHasBitsOffset =
-    8 * PROTOBUF_FIELD_OFFSET(IsNullCondition, _impl_._has_bits_);
-  static const ::io::deephaven::proto::backplane::grpc::Reference& reference(const IsNullCondition* msg);
-  static void set_has_reference(HasBits* has_bits) {
-    (*has_bits)[0] |= 1u;
-  }
-};
-
-const ::io::deephaven::proto::backplane::grpc::Reference& IsNullCondition::_Internal::reference(const IsNullCondition* msg) {
-  return *msg->_impl_.reference_;
-}
-IsNullCondition::IsNullCondition(::google::protobuf::Arena* arena)
-    : ::google::protobuf::Message(arena) {
-  SharedCtor(arena);
-  // @@protoc_insertion_point(arena_constructor:io.deephaven.proto.backplane.grpc.IsNullCondition)
-}
-inline PROTOBUF_NDEBUG_INLINE IsNullCondition::Impl_::Impl_(
-    ::google::protobuf::internal::InternalVisibility visibility, ::google::protobuf::Arena* arena,
-    const Impl_& from)
-      : _has_bits_{from._has_bits_},
-        _cached_size_{0} {}
-
-IsNullCondition::IsNullCondition(
-    ::google::protobuf::Arena* arena,
-    const IsNullCondition& from)
-    : ::google::protobuf::Message(arena) {
-  IsNullCondition* const _this = this;
-  (void)_this;
-  _internal_metadata_.MergeFrom<::google::protobuf::UnknownFieldSet>(
-      from._internal_metadata_);
-  new (&_impl_) Impl_(internal_visibility(), arena, from._impl_);
-  ::uint32_t cached_has_bits = _impl_._has_bits_[0];
-  _impl_.reference_ = (cached_has_bits & 0x00000001u)
-                ? CreateMaybeMessage<::io::deephaven::proto::backplane::grpc::Reference>(arena, *from._impl_.reference_)
-                : nullptr;
-
-  // @@protoc_insertion_point(copy_constructor:io.deephaven.proto.backplane.grpc.IsNullCondition)
-}
-inline PROTOBUF_NDEBUG_INLINE IsNullCondition::Impl_::Impl_(
-    ::google::protobuf::internal::InternalVisibility visibility,
-    ::google::protobuf::Arena* arena)
-      : _cached_size_{0} {}
-
-inline void IsNullCondition::SharedCtor(::_pb::Arena* arena) {
-  new (&_impl_) Impl_(internal_visibility(), arena);
-  _impl_.reference_ = {};
-}
-IsNullCondition::~IsNullCondition() {
-  // @@protoc_insertion_point(destructor:io.deephaven.proto.backplane.grpc.IsNullCondition)
-  _internal_metadata_.Delete<::google::protobuf::UnknownFieldSet>();
-  SharedDtor();
-}
-inline void IsNullCondition::SharedDtor() {
-  ABSL_DCHECK(GetArena() == nullptr);
-  delete _impl_.reference_;
-  _impl_.~Impl_();
-}
-
-PROTOBUF_NOINLINE void IsNullCondition::Clear() {
-// @@protoc_insertion_point(message_clear_start:io.deephaven.proto.backplane.grpc.IsNullCondition)
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  ::uint32_t cached_has_bits = 0;
-  // Prevent compiler warnings about cached_has_bits being unused
-  (void) cached_has_bits;
-
-  cached_has_bits = _impl_._has_bits_[0];
-  if (cached_has_bits & 0x00000001u) {
-    ABSL_DCHECK(_impl_.reference_ != nullptr);
-    _impl_.reference_->Clear();
-  }
-  _impl_._has_bits_.Clear();
-  _internal_metadata_.Clear<::google::protobuf::UnknownFieldSet>();
-}
-
-const char* IsNullCondition::_InternalParse(
-    const char* ptr, ::_pbi::ParseContext* ctx) {
-  ptr = ::_pbi::TcParser::ParseLoop(this, ptr, ctx, &_table_.header);
-  return ptr;
-}
-
-
-PROTOBUF_CONSTINIT PROTOBUF_ATTRIBUTE_INIT_PRIORITY1
-const ::_pbi::TcParseTable<0, 1, 1, 0, 2> IsNullCondition::_table_ = {
-  {
-    PROTOBUF_FIELD_OFFSET(IsNullCondition, _impl_._has_bits_),
-    0, // no _extensions_
-    1, 0,  // max_field_number, fast_idx_mask
-    offsetof(decltype(_table_), field_lookup_table),
-    4294967294,  // skipmap
-    offsetof(decltype(_table_), field_entries),
-    1,  // num_field_entries
-    1,  // num_aux_entries
-    offsetof(decltype(_table_), aux_entries),
-    &_IsNullCondition_default_instance_._instance,
-    ::_pbi::TcParser::GenericFallback,  // fallback
-  }, {{
-    // .io.deephaven.proto.backplane.grpc.Reference reference = 1;
-    {::_pbi::TcParser::FastMtS1,
-     {10, 0, 0, PROTOBUF_FIELD_OFFSET(IsNullCondition, _impl_.reference_)}},
-  }}, {{
-    65535, 65535
-  }}, {{
-    // .io.deephaven.proto.backplane.grpc.Reference reference = 1;
-    {PROTOBUF_FIELD_OFFSET(IsNullCondition, _impl_.reference_), _Internal::kHasBitsOffset + 0, 0,
-    (0 | ::_fl::kFcOptional | ::_fl::kMessage | ::_fl::kTvTable)},
-  }}, {{
-    {::_pbi::TcParser::GetTable<::io::deephaven::proto::backplane::grpc::Reference>()},
-  }}, {{
-  }},
-};
-
-::uint8_t* IsNullCondition::_InternalSerialize(
-    ::uint8_t* target,
-    ::google::protobuf::io::EpsCopyOutputStream* stream) const {
-  // @@protoc_insertion_point(serialize_to_array_start:io.deephaven.proto.backplane.grpc.IsNullCondition)
-  ::uint32_t cached_has_bits = 0;
-  (void)cached_has_bits;
-
-  cached_has_bits = _impl_._has_bits_[0];
-  // .io.deephaven.proto.backplane.grpc.Reference reference = 1;
-  if (cached_has_bits & 0x00000001u) {
-    target = ::google::protobuf::internal::WireFormatLite::InternalWriteMessage(
-        1, _Internal::reference(this),
-        _Internal::reference(this).GetCachedSize(), target, stream);
-  }
-
-  if (PROTOBUF_PREDICT_FALSE(_internal_metadata_.have_unknown_fields())) {
-    target =
-        ::_pbi::WireFormat::InternalSerializeUnknownFieldsToArray(
-            _internal_metadata_.unknown_fields<::google::protobuf::UnknownFieldSet>(::google::protobuf::UnknownFieldSet::default_instance), target, stream);
-  }
-  // @@protoc_insertion_point(serialize_to_array_end:io.deephaven.proto.backplane.grpc.IsNullCondition)
-  return target;
-}
-
-::size_t IsNullCondition::ByteSizeLong() const {
-// @@protoc_insertion_point(message_byte_size_start:io.deephaven.proto.backplane.grpc.IsNullCondition)
-  ::size_t total_size = 0;
-
-  ::uint32_t cached_has_bits = 0;
-  // Prevent compiler warnings about cached_has_bits being unused
-  (void) cached_has_bits;
-
-  // .io.deephaven.proto.backplane.grpc.Reference reference = 1;
-  cached_has_bits = _impl_._has_bits_[0];
-  if (cached_has_bits & 0x00000001u) {
-    total_size +=
-        1 + ::google::protobuf::internal::WireFormatLite::MessageSize(*_impl_.reference_);
-  }
-
-  return MaybeComputeUnknownFieldsSize(total_size, &_impl_._cached_size_);
-}
-
-const ::google::protobuf::Message::ClassData IsNullCondition::_class_data_ = {
-    IsNullCondition::MergeImpl,
-    nullptr,  // OnDemandRegisterArenaDtor
-};
-const ::google::protobuf::Message::ClassData* IsNullCondition::GetClassData() const {
-  return &_class_data_;
-}
-
-void IsNullCondition::MergeImpl(::google::protobuf::Message& to_msg, const ::google::protobuf::Message& from_msg) {
-  auto* const _this = static_cast<IsNullCondition*>(&to_msg);
-  auto& from = static_cast<const IsNullCondition&>(from_msg);
-  // @@protoc_insertion_point(class_specific_merge_from_start:io.deephaven.proto.backplane.grpc.IsNullCondition)
-  ABSL_DCHECK_NE(&from, _this);
-  ::uint32_t cached_has_bits = 0;
-  (void) cached_has_bits;
-
-  if ((from._impl_._has_bits_[0] & 0x00000001u) != 0) {
-    _this->_internal_mutable_reference()->::io::deephaven::proto::backplane::grpc::Reference::MergeFrom(
-        from._internal_reference());
-  }
-  _this->_internal_metadata_.MergeFrom<::google::protobuf::UnknownFieldSet>(from._internal_metadata_);
-}
-
-void IsNullCondition::CopyFrom(const IsNullCondition& from) {
-// @@protoc_insertion_point(class_specific_copy_from_start:io.deephaven.proto.backplane.grpc.IsNullCondition)
-  if (&from == this) return;
-  Clear();
-  MergeFrom(from);
-}
-
-PROTOBUF_NOINLINE bool IsNullCondition::IsInitialized() const {
-  return true;
-}
-
-::_pbi::CachedSize* IsNullCondition::AccessCachedSize() const {
-  return &_impl_._cached_size_;
-}
-void IsNullCondition::InternalSwap(IsNullCondition* PROTOBUF_RESTRICT other) {
-  using std::swap;
-  _internal_metadata_.InternalSwap(&other->_internal_metadata_);
-  swap(_impl_._has_bits_[0], other->_impl_._has_bits_[0]);
-  swap(_impl_.reference_, other->_impl_.reference_);
-}
-
-::google::protobuf::Metadata IsNullCondition::GetMetadata() const {
-  return ::_pbi::AssignDescriptors(
-      &descriptor_table_deephaven_2fproto_2ftable_2eproto_getter, &descriptor_table_deephaven_2fproto_2ftable_2eproto_once,
-      file_level_metadata_deephaven_2fproto_2ftable_2eproto[107]);
-}
-// ===================================================================
-
-class MatchesCondition::_Internal {
- public:
-  using HasBits = decltype(std::declval<MatchesCondition>()._impl_._has_bits_);
-  static constexpr ::int32_t kHasBitsOffset =
-    8 * PROTOBUF_FIELD_OFFSET(MatchesCondition, _impl_._has_bits_);
-  static const ::io::deephaven::proto::backplane::grpc::Reference& reference(const MatchesCondition* msg);
-  static void set_has_reference(HasBits* has_bits) {
-    (*has_bits)[0] |= 1u;
-  }
-};
-
-const ::io::deephaven::proto::backplane::grpc::Reference& MatchesCondition::_Internal::reference(const MatchesCondition* msg) {
-  return *msg->_impl_.reference_;
-}
-MatchesCondition::MatchesCondition(::google::protobuf::Arena* arena)
-    : ::google::protobuf::Message(arena) {
-  SharedCtor(arena);
-  // @@protoc_insertion_point(arena_constructor:io.deephaven.proto.backplane.grpc.MatchesCondition)
-}
-inline PROTOBUF_NDEBUG_INLINE MatchesCondition::Impl_::Impl_(
-    ::google::protobuf::internal::InternalVisibility visibility, ::google::protobuf::Arena* arena,
-    const Impl_& from)
-      : _has_bits_{from._has_bits_},
-        _cached_size_{0},
-        regex_(arena, from.regex_) {}
-
-MatchesCondition::MatchesCondition(
-    ::google::protobuf::Arena* arena,
-    const MatchesCondition& from)
-    : ::google::protobuf::Message(arena) {
-  MatchesCondition* const _this = this;
-  (void)_this;
-  _internal_metadata_.MergeFrom<::google::protobuf::UnknownFieldSet>(
-      from._internal_metadata_);
-  new (&_impl_) Impl_(internal_visibility(), arena, from._impl_);
-  ::uint32_t cached_has_bits = _impl_._has_bits_[0];
-  _impl_.reference_ = (cached_has_bits & 0x00000001u)
-                ? CreateMaybeMessage<::io::deephaven::proto::backplane::grpc::Reference>(arena, *from._impl_.reference_)
-                : nullptr;
-  ::memcpy(reinterpret_cast<char *>(&_impl_) +
-               offsetof(Impl_, case_sensitivity_),
-           reinterpret_cast<const char *>(&from._impl_) +
-               offsetof(Impl_, case_sensitivity_),
-           offsetof(Impl_, match_type_) -
-               offsetof(Impl_, case_sensitivity_) +
-               sizeof(Impl_::match_type_));
-
-  // @@protoc_insertion_point(copy_constructor:io.deephaven.proto.backplane.grpc.MatchesCondition)
-}
-inline PROTOBUF_NDEBUG_INLINE MatchesCondition::Impl_::Impl_(
-    ::google::protobuf::internal::InternalVisibility visibility,
-    ::google::protobuf::Arena* arena)
-      : _cached_size_{0},
-        regex_(arena) {}
-
-inline void MatchesCondition::SharedCtor(::_pb::Arena* arena) {
-  new (&_impl_) Impl_(internal_visibility(), arena);
-  ::memset(reinterpret_cast<char *>(&_impl_) +
-               offsetof(Impl_, reference_),
-           0,
-           offsetof(Impl_, match_type_) -
-               offsetof(Impl_, reference_) +
-               sizeof(Impl_::match_type_));
-}
-MatchesCondition::~MatchesCondition() {
-  // @@protoc_insertion_point(destructor:io.deephaven.proto.backplane.grpc.MatchesCondition)
-  _internal_metadata_.Delete<::google::protobuf::UnknownFieldSet>();
-  SharedDtor();
-}
-inline void MatchesCondition::SharedDtor() {
-  ABSL_DCHECK(GetArena() == nullptr);
-  _impl_.regex_.Destroy();
-  delete _impl_.reference_;
-  _impl_.~Impl_();
-}
-
-PROTOBUF_NOINLINE void MatchesCondition::Clear() {
-// @@protoc_insertion_point(message_clear_start:io.deephaven.proto.backplane.grpc.MatchesCondition)
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  ::uint32_t cached_has_bits = 0;
-  // Prevent compiler warnings about cached_has_bits being unused
-  (void) cached_has_bits;
-
-  _impl_.regex_.ClearToEmpty();
-  cached_has_bits = _impl_._has_bits_[0];
-  if (cached_has_bits & 0x00000001u) {
-    ABSL_DCHECK(_impl_.reference_ != nullptr);
-    _impl_.reference_->Clear();
-  }
-  ::memset(&_impl_.case_sensitivity_, 0, static_cast<::size_t>(
-      reinterpret_cast<char*>(&_impl_.match_type_) -
-      reinterpret_cast<char*>(&_impl_.case_sensitivity_)) + sizeof(_impl_.match_type_));
-  _impl_._has_bits_.Clear();
-  _internal_metadata_.Clear<::google::protobuf::UnknownFieldSet>();
-}
-
-const char* MatchesCondition::_InternalParse(
-    const char* ptr, ::_pbi::ParseContext* ctx) {
-  ptr = ::_pbi::TcParser::ParseLoop(this, ptr, ctx, &_table_.header);
-  return ptr;
-}
-
-
-PROTOBUF_CONSTINIT PROTOBUF_ATTRIBUTE_INIT_PRIORITY1
-const ::_pbi::TcParseTable<2, 4, 1, 64, 2> MatchesCondition::_table_ = {
-  {
-    PROTOBUF_FIELD_OFFSET(MatchesCondition, _impl_._has_bits_),
-    0, // no _extensions_
-    4, 24,  // max_field_number, fast_idx_mask
-    offsetof(decltype(_table_), field_lookup_table),
-    4294967280,  // skipmap
-    offsetof(decltype(_table_), field_entries),
-    4,  // num_field_entries
-    1,  // num_aux_entries
-    offsetof(decltype(_table_), aux_entries),
-    &_MatchesCondition_default_instance_._instance,
-    ::_pbi::TcParser::GenericFallback,  // fallback
-  }, {{
-    // .io.deephaven.proto.backplane.grpc.MatchType match_type = 4;
-    {::_pbi::TcParser::SingularVarintNoZag1<::uint32_t, offsetof(MatchesCondition, _impl_.match_type_), 63>(),
-     {32, 63, 0, PROTOBUF_FIELD_OFFSET(MatchesCondition, _impl_.match_type_)}},
-    // .io.deephaven.proto.backplane.grpc.Reference reference = 1;
-    {::_pbi::TcParser::FastMtS1,
-     {10, 0, 0, PROTOBUF_FIELD_OFFSET(MatchesCondition, _impl_.reference_)}},
-    // string regex = 2;
-    {::_pbi::TcParser::FastUS1,
-     {18, 63, 0, PROTOBUF_FIELD_OFFSET(MatchesCondition, _impl_.regex_)}},
-    // .io.deephaven.proto.backplane.grpc.CaseSensitivity case_sensitivity = 3;
-    {::_pbi::TcParser::SingularVarintNoZag1<::uint32_t, offsetof(MatchesCondition, _impl_.case_sensitivity_), 63>(),
-     {24, 63, 0, PROTOBUF_FIELD_OFFSET(MatchesCondition, _impl_.case_sensitivity_)}},
-  }}, {{
-    65535, 65535
-  }}, {{
-    // .io.deephaven.proto.backplane.grpc.Reference reference = 1;
-    {PROTOBUF_FIELD_OFFSET(MatchesCondition, _impl_.reference_), _Internal::kHasBitsOffset + 0, 0,
-    (0 | ::_fl::kFcOptional | ::_fl::kMessage | ::_fl::kTvTable)},
-    // string regex = 2;
-    {PROTOBUF_FIELD_OFFSET(MatchesCondition, _impl_.regex_), -1, 0,
-    (0 | ::_fl::kFcSingular | ::_fl::kUtf8String | ::_fl::kRepAString)},
-    // .io.deephaven.proto.backplane.grpc.CaseSensitivity case_sensitivity = 3;
-    {PROTOBUF_FIELD_OFFSET(MatchesCondition, _impl_.case_sensitivity_), -1, 0,
-    (0 | ::_fl::kFcSingular | ::_fl::kOpenEnum)},
-    // .io.deephaven.proto.backplane.grpc.MatchType match_type = 4;
-    {PROTOBUF_FIELD_OFFSET(MatchesCondition, _impl_.match_type_), -1, 0,
-    (0 | ::_fl::kFcSingular | ::_fl::kOpenEnum)},
-  }}, {{
-    {::_pbi::TcParser::GetTable<::io::deephaven::proto::backplane::grpc::Reference>()},
-  }}, {{
-    "\62\0\5\0\0\0\0\0"
-    "io.deephaven.proto.backplane.grpc.MatchesCondition"
-    "regex"
-  }},
-};
-
-::uint8_t* MatchesCondition::_InternalSerialize(
-    ::uint8_t* target,
-    ::google::protobuf::io::EpsCopyOutputStream* stream) const {
-  // @@protoc_insertion_point(serialize_to_array_start:io.deephaven.proto.backplane.grpc.MatchesCondition)
-  ::uint32_t cached_has_bits = 0;
-  (void)cached_has_bits;
-
-  cached_has_bits = _impl_._has_bits_[0];
-  // .io.deephaven.proto.backplane.grpc.Reference reference = 1;
-  if (cached_has_bits & 0x00000001u) {
-    target = ::google::protobuf::internal::WireFormatLite::InternalWriteMessage(
-        1, _Internal::reference(this),
-        _Internal::reference(this).GetCachedSize(), target, stream);
-  }
-
-  // string regex = 2;
-  if (!this->_internal_regex().empty()) {
-    const std::string& _s = this->_internal_regex();
-    ::google::protobuf::internal::WireFormatLite::VerifyUtf8String(
-        _s.data(), static_cast<int>(_s.length()), ::google::protobuf::internal::WireFormatLite::SERIALIZE, "io.deephaven.proto.backplane.grpc.MatchesCondition.regex");
-    target = stream->WriteStringMaybeAliased(2, _s, target);
-  }
-
-  // .io.deephaven.proto.backplane.grpc.CaseSensitivity case_sensitivity = 3;
-  if (this->_internal_case_sensitivity() != 0) {
-    target = stream->EnsureSpace(target);
-    target = ::_pbi::WireFormatLite::WriteEnumToArray(
-        3, this->_internal_case_sensitivity(), target);
-  }
-
-  // .io.deephaven.proto.backplane.grpc.MatchType match_type = 4;
-  if (this->_internal_match_type() != 0) {
-    target = stream->EnsureSpace(target);
-    target = ::_pbi::WireFormatLite::WriteEnumToArray(
-        4, this->_internal_match_type(), target);
-  }
-
-  if (PROTOBUF_PREDICT_FALSE(_internal_metadata_.have_unknown_fields())) {
-    target =
-        ::_pbi::WireFormat::InternalSerializeUnknownFieldsToArray(
-            _internal_metadata_.unknown_fields<::google::protobuf::UnknownFieldSet>(::google::protobuf::UnknownFieldSet::default_instance), target, stream);
-  }
-  // @@protoc_insertion_point(serialize_to_array_end:io.deephaven.proto.backplane.grpc.MatchesCondition)
-  return target;
-}
-
-::size_t MatchesCondition::ByteSizeLong() const {
-// @@protoc_insertion_point(message_byte_size_start:io.deephaven.proto.backplane.grpc.MatchesCondition)
-  ::size_t total_size = 0;
-
-  ::uint32_t cached_has_bits = 0;
-  // Prevent compiler warnings about cached_has_bits being unused
-  (void) cached_has_bits;
-
-  // string regex = 2;
-  if (!this->_internal_regex().empty()) {
-    total_size += 1 + ::google::protobuf::internal::WireFormatLite::StringSize(
-                                    this->_internal_regex());
-  }
-
-  // .io.deephaven.proto.backplane.grpc.Reference reference = 1;
-  cached_has_bits = _impl_._has_bits_[0];
-  if (cached_has_bits & 0x00000001u) {
-    total_size +=
-        1 + ::google::protobuf::internal::WireFormatLite::MessageSize(*_impl_.reference_);
-  }
-
-  // .io.deephaven.proto.backplane.grpc.CaseSensitivity case_sensitivity = 3;
-  if (this->_internal_case_sensitivity() != 0) {
-    total_size += 1 +
-                  ::_pbi::WireFormatLite::EnumSize(this->_internal_case_sensitivity());
-  }
-
-  // .io.deephaven.proto.backplane.grpc.MatchType match_type = 4;
-  if (this->_internal_match_type() != 0) {
-    total_size += 1 +
-                  ::_pbi::WireFormatLite::EnumSize(this->_internal_match_type());
-  }
-
-  return MaybeComputeUnknownFieldsSize(total_size, &_impl_._cached_size_);
-}
-
-const ::google::protobuf::Message::ClassData MatchesCondition::_class_data_ = {
-    MatchesCondition::MergeImpl,
-    nullptr,  // OnDemandRegisterArenaDtor
-};
-const ::google::protobuf::Message::ClassData* MatchesCondition::GetClassData() const {
-  return &_class_data_;
-}
-
-void MatchesCondition::MergeImpl(::google::protobuf::Message& to_msg, const ::google::protobuf::Message& from_msg) {
-  auto* const _this = static_cast<MatchesCondition*>(&to_msg);
-  auto& from = static_cast<const MatchesCondition&>(from_msg);
-  // @@protoc_insertion_point(class_specific_merge_from_start:io.deephaven.proto.backplane.grpc.MatchesCondition)
-  ABSL_DCHECK_NE(&from, _this);
-  ::uint32_t cached_has_bits = 0;
-  (void) cached_has_bits;
-
-  if (!from._internal_regex().empty()) {
-    _this->_internal_set_regex(from._internal_regex());
-  }
-  if ((from._impl_._has_bits_[0] & 0x00000001u) != 0) {
-    _this->_internal_mutable_reference()->::io::deephaven::proto::backplane::grpc::Reference::MergeFrom(
-        from._internal_reference());
-  }
-  if (from._internal_case_sensitivity() != 0) {
-    _this->_internal_set_case_sensitivity(from._internal_case_sensitivity());
-  }
-  if (from._internal_match_type() != 0) {
-    _this->_internal_set_match_type(from._internal_match_type());
-  }
-  _this->_internal_metadata_.MergeFrom<::google::protobuf::UnknownFieldSet>(from._internal_metadata_);
-}
-
-void MatchesCondition::CopyFrom(const MatchesCondition& from) {
-// @@protoc_insertion_point(class_specific_copy_from_start:io.deephaven.proto.backplane.grpc.MatchesCondition)
-  if (&from == this) return;
-  Clear();
-  MergeFrom(from);
-}
-
-PROTOBUF_NOINLINE bool MatchesCondition::IsInitialized() const {
-  return true;
-}
-
-::_pbi::CachedSize* MatchesCondition::AccessCachedSize() const {
-  return &_impl_._cached_size_;
-}
-void MatchesCondition::InternalSwap(MatchesCondition* PROTOBUF_RESTRICT other) {
-  using std::swap;
-  auto* arena = GetArena();
-  ABSL_DCHECK_EQ(arena, other->GetArena());
-  _internal_metadata_.InternalSwap(&other->_internal_metadata_);
-  swap(_impl_._has_bits_[0], other->_impl_._has_bits_[0]);
-  ::_pbi::ArenaStringPtr::InternalSwap(&_impl_.regex_, &other->_impl_.regex_, arena);
-  ::google::protobuf::internal::memswap<
-      PROTOBUF_FIELD_OFFSET(MatchesCondition, _impl_.match_type_)
-      + sizeof(MatchesCondition::_impl_.match_type_)
-      - PROTOBUF_FIELD_OFFSET(MatchesCondition, _impl_.reference_)>(
-          reinterpret_cast<char*>(&_impl_.reference_),
-          reinterpret_cast<char*>(&other->_impl_.reference_));
-}
-
-::google::protobuf::Metadata MatchesCondition::GetMetadata() const {
-  return ::_pbi::AssignDescriptors(
-      &descriptor_table_deephaven_2fproto_2ftable_2eproto_getter, &descriptor_table_deephaven_2fproto_2ftable_2eproto_once,
-      file_level_metadata_deephaven_2fproto_2ftable_2eproto[108]);
-}
-// ===================================================================
-
-class ContainsCondition::_Internal {
- public:
-  using HasBits = decltype(std::declval<ContainsCondition>()._impl_._has_bits_);
-  static constexpr ::int32_t kHasBitsOffset =
-    8 * PROTOBUF_FIELD_OFFSET(ContainsCondition, _impl_._has_bits_);
-  static const ::io::deephaven::proto::backplane::grpc::Reference& reference(const ContainsCondition* msg);
-  static void set_has_reference(HasBits* has_bits) {
-    (*has_bits)[0] |= 1u;
-  }
-};
-
-const ::io::deephaven::proto::backplane::grpc::Reference& ContainsCondition::_Internal::reference(const ContainsCondition* msg) {
-  return *msg->_impl_.reference_;
-}
-ContainsCondition::ContainsCondition(::google::protobuf::Arena* arena)
-    : ::google::protobuf::Message(arena) {
-  SharedCtor(arena);
-  // @@protoc_insertion_point(arena_constructor:io.deephaven.proto.backplane.grpc.ContainsCondition)
-}
-inline PROTOBUF_NDEBUG_INLINE ContainsCondition::Impl_::Impl_(
-    ::google::protobuf::internal::InternalVisibility visibility, ::google::protobuf::Arena* arena,
-    const Impl_& from)
-      : _has_bits_{from._has_bits_},
-        _cached_size_{0},
-        search_string_(arena, from.search_string_) {}
-
-ContainsCondition::ContainsCondition(
-    ::google::protobuf::Arena* arena,
-    const ContainsCondition& from)
-    : ::google::protobuf::Message(arena) {
-  ContainsCondition* const _this = this;
-  (void)_this;
-  _internal_metadata_.MergeFrom<::google::protobuf::UnknownFieldSet>(
-      from._internal_metadata_);
-  new (&_impl_) Impl_(internal_visibility(), arena, from._impl_);
-  ::uint32_t cached_has_bits = _impl_._has_bits_[0];
-  _impl_.reference_ = (cached_has_bits & 0x00000001u)
-                ? CreateMaybeMessage<::io::deephaven::proto::backplane::grpc::Reference>(arena, *from._impl_.reference_)
-                : nullptr;
-  ::memcpy(reinterpret_cast<char *>(&_impl_) +
-               offsetof(Impl_, case_sensitivity_),
-           reinterpret_cast<const char *>(&from._impl_) +
-               offsetof(Impl_, case_sensitivity_),
-           offsetof(Impl_, match_type_) -
-               offsetof(Impl_, case_sensitivity_) +
-               sizeof(Impl_::match_type_));
-
-  // @@protoc_insertion_point(copy_constructor:io.deephaven.proto.backplane.grpc.ContainsCondition)
-}
-inline PROTOBUF_NDEBUG_INLINE ContainsCondition::Impl_::Impl_(
-    ::google::protobuf::internal::InternalVisibility visibility,
-    ::google::protobuf::Arena* arena)
-      : _cached_size_{0},
-        search_string_(arena) {}
-
-inline void ContainsCondition::SharedCtor(::_pb::Arena* arena) {
-  new (&_impl_) Impl_(internal_visibility(), arena);
-  ::memset(reinterpret_cast<char *>(&_impl_) +
-               offsetof(Impl_, reference_),
-           0,
-           offsetof(Impl_, match_type_) -
-               offsetof(Impl_, reference_) +
-               sizeof(Impl_::match_type_));
-}
-ContainsCondition::~ContainsCondition() {
-  // @@protoc_insertion_point(destructor:io.deephaven.proto.backplane.grpc.ContainsCondition)
-  _internal_metadata_.Delete<::google::protobuf::UnknownFieldSet>();
-  SharedDtor();
-}
-inline void ContainsCondition::SharedDtor() {
-  ABSL_DCHECK(GetArena() == nullptr);
-  _impl_.search_string_.Destroy();
-  delete _impl_.reference_;
-  _impl_.~Impl_();
-}
-
-PROTOBUF_NOINLINE void ContainsCondition::Clear() {
-// @@protoc_insertion_point(message_clear_start:io.deephaven.proto.backplane.grpc.ContainsCondition)
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  ::uint32_t cached_has_bits = 0;
-  // Prevent compiler warnings about cached_has_bits being unused
-  (void) cached_has_bits;
-
-  _impl_.search_string_.ClearToEmpty();
-  cached_has_bits = _impl_._has_bits_[0];
-  if (cached_has_bits & 0x00000001u) {
-    ABSL_DCHECK(_impl_.reference_ != nullptr);
-    _impl_.reference_->Clear();
-  }
-  ::memset(&_impl_.case_sensitivity_, 0, static_cast<::size_t>(
-      reinterpret_cast<char*>(&_impl_.match_type_) -
-      reinterpret_cast<char*>(&_impl_.case_sensitivity_)) + sizeof(_impl_.match_type_));
-  _impl_._has_bits_.Clear();
-  _internal_metadata_.Clear<::google::protobuf::UnknownFieldSet>();
-}
-
-const char* ContainsCondition::_InternalParse(
-    const char* ptr, ::_pbi::ParseContext* ctx) {
-  ptr = ::_pbi::TcParser::ParseLoop(this, ptr, ctx, &_table_.header);
-  return ptr;
-}
-
-
-PROTOBUF_CONSTINIT PROTOBUF_ATTRIBUTE_INIT_PRIORITY1
-const ::_pbi::TcParseTable<2, 4, 1, 73, 2> ContainsCondition::_table_ = {
-  {
-    PROTOBUF_FIELD_OFFSET(ContainsCondition, _impl_._has_bits_),
-    0, // no _extensions_
-    4, 24,  // max_field_number, fast_idx_mask
-    offsetof(decltype(_table_), field_lookup_table),
-    4294967280,  // skipmap
-    offsetof(decltype(_table_), field_entries),
-    4,  // num_field_entries
-    1,  // num_aux_entries
-    offsetof(decltype(_table_), aux_entries),
-    &_ContainsCondition_default_instance_._instance,
-    ::_pbi::TcParser::GenericFallback,  // fallback
-  }, {{
-    // .io.deephaven.proto.backplane.grpc.MatchType match_type = 4;
-    {::_pbi::TcParser::SingularVarintNoZag1<::uint32_t, offsetof(ContainsCondition, _impl_.match_type_), 63>(),
-     {32, 63, 0, PROTOBUF_FIELD_OFFSET(ContainsCondition, _impl_.match_type_)}},
-    // .io.deephaven.proto.backplane.grpc.Reference reference = 1;
-    {::_pbi::TcParser::FastMtS1,
-     {10, 0, 0, PROTOBUF_FIELD_OFFSET(ContainsCondition, _impl_.reference_)}},
-    // string search_string = 2;
-    {::_pbi::TcParser::FastUS1,
-     {18, 63, 0, PROTOBUF_FIELD_OFFSET(ContainsCondition, _impl_.search_string_)}},
-    // .io.deephaven.proto.backplane.grpc.CaseSensitivity case_sensitivity = 3;
-    {::_pbi::TcParser::SingularVarintNoZag1<::uint32_t, offsetof(ContainsCondition, _impl_.case_sensitivity_), 63>(),
-     {24, 63, 0, PROTOBUF_FIELD_OFFSET(ContainsCondition, _impl_.case_sensitivity_)}},
-  }}, {{
-    65535, 65535
-  }}, {{
-    // .io.deephaven.proto.backplane.grpc.Reference reference = 1;
-    {PROTOBUF_FIELD_OFFSET(ContainsCondition, _impl_.reference_), _Internal::kHasBitsOffset + 0, 0,
-    (0 | ::_fl::kFcOptional | ::_fl::kMessage | ::_fl::kTvTable)},
-    // string search_string = 2;
-    {PROTOBUF_FIELD_OFFSET(ContainsCondition, _impl_.search_string_), -1, 0,
-    (0 | ::_fl::kFcSingular | ::_fl::kUtf8String | ::_fl::kRepAString)},
-    // .io.deephaven.proto.backplane.grpc.CaseSensitivity case_sensitivity = 3;
-    {PROTOBUF_FIELD_OFFSET(ContainsCondition, _impl_.case_sensitivity_), -1, 0,
-    (0 | ::_fl::kFcSingular | ::_fl::kOpenEnum)},
-    // .io.deephaven.proto.backplane.grpc.MatchType match_type = 4;
-    {PROTOBUF_FIELD_OFFSET(ContainsCondition, _impl_.match_type_), -1, 0,
-    (0 | ::_fl::kFcSingular | ::_fl::kOpenEnum)},
-  }}, {{
-    {::_pbi::TcParser::GetTable<::io::deephaven::proto::backplane::grpc::Reference>()},
-  }}, {{
-    "\63\0\15\0\0\0\0\0"
-    "io.deephaven.proto.backplane.grpc.ContainsCondition"
-    "search_string"
-  }},
-};
-
-::uint8_t* ContainsCondition::_InternalSerialize(
-    ::uint8_t* target,
-    ::google::protobuf::io::EpsCopyOutputStream* stream) const {
-  // @@protoc_insertion_point(serialize_to_array_start:io.deephaven.proto.backplane.grpc.ContainsCondition)
-  ::uint32_t cached_has_bits = 0;
-  (void)cached_has_bits;
-
-  cached_has_bits = _impl_._has_bits_[0];
-  // .io.deephaven.proto.backplane.grpc.Reference reference = 1;
-  if (cached_has_bits & 0x00000001u) {
-    target = ::google::protobuf::internal::WireFormatLite::InternalWriteMessage(
-        1, _Internal::reference(this),
-        _Internal::reference(this).GetCachedSize(), target, stream);
-  }
-
-  // string search_string = 2;
-  if (!this->_internal_search_string().empty()) {
-    const std::string& _s = this->_internal_search_string();
-    ::google::protobuf::internal::WireFormatLite::VerifyUtf8String(
-        _s.data(), static_cast<int>(_s.length()), ::google::protobuf::internal::WireFormatLite::SERIALIZE, "io.deephaven.proto.backplane.grpc.ContainsCondition.search_string");
-    target = stream->WriteStringMaybeAliased(2, _s, target);
-  }
-
-  // .io.deephaven.proto.backplane.grpc.CaseSensitivity case_sensitivity = 3;
-  if (this->_internal_case_sensitivity() != 0) {
-    target = stream->EnsureSpace(target);
-    target = ::_pbi::WireFormatLite::WriteEnumToArray(
-        3, this->_internal_case_sensitivity(), target);
-  }
-
-  // .io.deephaven.proto.backplane.grpc.MatchType match_type = 4;
-  if (this->_internal_match_type() != 0) {
-    target = stream->EnsureSpace(target);
-    target = ::_pbi::WireFormatLite::WriteEnumToArray(
-        4, this->_internal_match_type(), target);
-  }
-
-  if (PROTOBUF_PREDICT_FALSE(_internal_metadata_.have_unknown_fields())) {
-    target =
-        ::_pbi::WireFormat::InternalSerializeUnknownFieldsToArray(
-            _internal_metadata_.unknown_fields<::google::protobuf::UnknownFieldSet>(::google::protobuf::UnknownFieldSet::default_instance), target, stream);
-  }
-  // @@protoc_insertion_point(serialize_to_array_end:io.deephaven.proto.backplane.grpc.ContainsCondition)
-  return target;
-}
-
-::size_t ContainsCondition::ByteSizeLong() const {
-// @@protoc_insertion_point(message_byte_size_start:io.deephaven.proto.backplane.grpc.ContainsCondition)
-  ::size_t total_size = 0;
-
-  ::uint32_t cached_has_bits = 0;
-  // Prevent compiler warnings about cached_has_bits being unused
-  (void) cached_has_bits;
-
-  // string search_string = 2;
-  if (!this->_internal_search_string().empty()) {
-    total_size += 1 + ::google::protobuf::internal::WireFormatLite::StringSize(
-                                    this->_internal_search_string());
-  }
-
-  // .io.deephaven.proto.backplane.grpc.Reference reference = 1;
-  cached_has_bits = _impl_._has_bits_[0];
-  if (cached_has_bits & 0x00000001u) {
-    total_size +=
-        1 + ::google::protobuf::internal::WireFormatLite::MessageSize(*_impl_.reference_);
-  }
-
-  // .io.deephaven.proto.backplane.grpc.CaseSensitivity case_sensitivity = 3;
-  if (this->_internal_case_sensitivity() != 0) {
-    total_size += 1 +
-                  ::_pbi::WireFormatLite::EnumSize(this->_internal_case_sensitivity());
-  }
-
-  // .io.deephaven.proto.backplane.grpc.MatchType match_type = 4;
-  if (this->_internal_match_type() != 0) {
-    total_size += 1 +
-                  ::_pbi::WireFormatLite::EnumSize(this->_internal_match_type());
-  }
-
-  return MaybeComputeUnknownFieldsSize(total_size, &_impl_._cached_size_);
-}
-
-const ::google::protobuf::Message::ClassData ContainsCondition::_class_data_ = {
-    ContainsCondition::MergeImpl,
-    nullptr,  // OnDemandRegisterArenaDtor
-};
-const ::google::protobuf::Message::ClassData* ContainsCondition::GetClassData() const {
-  return &_class_data_;
-}
-
-void ContainsCondition::MergeImpl(::google::protobuf::Message& to_msg, const ::google::protobuf::Message& from_msg) {
-  auto* const _this = static_cast<ContainsCondition*>(&to_msg);
-  auto& from = static_cast<const ContainsCondition&>(from_msg);
-  // @@protoc_insertion_point(class_specific_merge_from_start:io.deephaven.proto.backplane.grpc.ContainsCondition)
-  ABSL_DCHECK_NE(&from, _this);
-  ::uint32_t cached_has_bits = 0;
-  (void) cached_has_bits;
-
-  if (!from._internal_search_string().empty()) {
-    _this->_internal_set_search_string(from._internal_search_string());
-  }
-  if ((from._impl_._has_bits_[0] & 0x00000001u) != 0) {
-    _this->_internal_mutable_reference()->::io::deephaven::proto::backplane::grpc::Reference::MergeFrom(
-        from._internal_reference());
-  }
-  if (from._internal_case_sensitivity() != 0) {
-    _this->_internal_set_case_sensitivity(from._internal_case_sensitivity());
-  }
-  if (from._internal_match_type() != 0) {
-    _this->_internal_set_match_type(from._internal_match_type());
-  }
-  _this->_internal_metadata_.MergeFrom<::google::protobuf::UnknownFieldSet>(from._internal_metadata_);
-}
-
-void ContainsCondition::CopyFrom(const ContainsCondition& from) {
-// @@protoc_insertion_point(class_specific_copy_from_start:io.deephaven.proto.backplane.grpc.ContainsCondition)
-  if (&from == this) return;
-  Clear();
-  MergeFrom(from);
-}
-
-PROTOBUF_NOINLINE bool ContainsCondition::IsInitialized() const {
-  return true;
-}
-
-::_pbi::CachedSize* ContainsCondition::AccessCachedSize() const {
-  return &_impl_._cached_size_;
-}
-void ContainsCondition::InternalSwap(ContainsCondition* PROTOBUF_RESTRICT other) {
-  using std::swap;
-  auto* arena = GetArena();
-  ABSL_DCHECK_EQ(arena, other->GetArena());
-  _internal_metadata_.InternalSwap(&other->_internal_metadata_);
-  swap(_impl_._has_bits_[0], other->_impl_._has_bits_[0]);
-  ::_pbi::ArenaStringPtr::InternalSwap(&_impl_.search_string_, &other->_impl_.search_string_, arena);
-  ::google::protobuf::internal::memswap<
-      PROTOBUF_FIELD_OFFSET(ContainsCondition, _impl_.match_type_)
-      + sizeof(ContainsCondition::_impl_.match_type_)
-      - PROTOBUF_FIELD_OFFSET(ContainsCondition, _impl_.reference_)>(
-          reinterpret_cast<char*>(&_impl_.reference_),
-          reinterpret_cast<char*>(&other->_impl_.reference_));
-}
-
-::google::protobuf::Metadata ContainsCondition::GetMetadata() const {
-  return ::_pbi::AssignDescriptors(
-      &descriptor_table_deephaven_2fproto_2ftable_2eproto_getter, &descriptor_table_deephaven_2fproto_2ftable_2eproto_once,
-      file_level_metadata_deephaven_2fproto_2ftable_2eproto[109]);
-}
-// ===================================================================
-
-class SearchCondition::_Internal {
- public:
-};
-
-SearchCondition::SearchCondition(::google::protobuf::Arena* arena)
-    : ::google::protobuf::Message(arena) {
-  SharedCtor(arena);
-  // @@protoc_insertion_point(arena_constructor:io.deephaven.proto.backplane.grpc.SearchCondition)
-}
-inline PROTOBUF_NDEBUG_INLINE SearchCondition::Impl_::Impl_(
-    ::google::protobuf::internal::InternalVisibility visibility, ::google::protobuf::Arena* arena,
-    const Impl_& from)
-      : optional_references_{visibility, arena, from.optional_references_},
-        search_string_(arena, from.search_string_),
-        _cached_size_{0} {}
-
-SearchCondition::SearchCondition(
-    ::google::protobuf::Arena* arena,
-    const SearchCondition& from)
-    : ::google::protobuf::Message(arena) {
-  SearchCondition* const _this = this;
-  (void)_this;
-  _internal_metadata_.MergeFrom<::google::protobuf::UnknownFieldSet>(
-      from._internal_metadata_);
-  new (&_impl_) Impl_(internal_visibility(), arena, from._impl_);
-
-  // @@protoc_insertion_point(copy_constructor:io.deephaven.proto.backplane.grpc.SearchCondition)
-}
-inline PROTOBUF_NDEBUG_INLINE SearchCondition::Impl_::Impl_(
-    ::google::protobuf::internal::InternalVisibility visibility,
-    ::google::protobuf::Arena* arena)
-      : optional_references_{visibility, arena},
-        search_string_(arena),
-        _cached_size_{0} {}
-
-inline void SearchCondition::SharedCtor(::_pb::Arena* arena) {
-  new (&_impl_) Impl_(internal_visibility(), arena);
-}
-SearchCondition::~SearchCondition() {
-  // @@protoc_insertion_point(destructor:io.deephaven.proto.backplane.grpc.SearchCondition)
-  _internal_metadata_.Delete<::google::protobuf::UnknownFieldSet>();
-  SharedDtor();
-}
-inline void SearchCondition::SharedDtor() {
-  ABSL_DCHECK(GetArena() == nullptr);
-  _impl_.search_string_.Destroy();
-  _impl_.~Impl_();
-}
-
-PROTOBUF_NOINLINE void SearchCondition::Clear() {
-// @@protoc_insertion_point(message_clear_start:io.deephaven.proto.backplane.grpc.SearchCondition)
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  ::uint32_t cached_has_bits = 0;
-  // Prevent compiler warnings about cached_has_bits being unused
-  (void) cached_has_bits;
-
-  _impl_.optional_references_.Clear();
-  _impl_.search_string_.ClearToEmpty();
-  _internal_metadata_.Clear<::google::protobuf::UnknownFieldSet>();
-}
-
-const char* SearchCondition::_InternalParse(
-    const char* ptr, ::_pbi::ParseContext* ctx) {
-  ptr = ::_pbi::TcParser::ParseLoop(this, ptr, ctx, &_table_.header);
-  return ptr;
-}
-
-
-PROTOBUF_CONSTINIT PROTOBUF_ATTRIBUTE_INIT_PRIORITY1
-const ::_pbi::TcParseTable<1, 2, 1, 71, 2> SearchCondition::_table_ = {
-  {
-    0,  // no _has_bits_
-    0, // no _extensions_
-    2, 8,  // max_field_number, fast_idx_mask
-    offsetof(decltype(_table_), field_lookup_table),
-    4294967292,  // skipmap
-    offsetof(decltype(_table_), field_entries),
-    2,  // num_field_entries
-    1,  // num_aux_entries
-    offsetof(decltype(_table_), aux_entries),
-    &_SearchCondition_default_instance_._instance,
-    ::_pbi::TcParser::GenericFallback,  // fallback
-  }, {{
-    // repeated .io.deephaven.proto.backplane.grpc.Reference optional_references = 2;
-    {::_pbi::TcParser::FastMtR1,
-     {18, 63, 0, PROTOBUF_FIELD_OFFSET(SearchCondition, _impl_.optional_references_)}},
-    // string search_string = 1;
-    {::_pbi::TcParser::FastUS1,
-     {10, 63, 0, PROTOBUF_FIELD_OFFSET(SearchCondition, _impl_.search_string_)}},
-  }}, {{
-    65535, 65535
-  }}, {{
-    // string search_string = 1;
-    {PROTOBUF_FIELD_OFFSET(SearchCondition, _impl_.search_string_), 0, 0,
-    (0 | ::_fl::kFcSingular | ::_fl::kUtf8String | ::_fl::kRepAString)},
-    // repeated .io.deephaven.proto.backplane.grpc.Reference optional_references = 2;
-    {PROTOBUF_FIELD_OFFSET(SearchCondition, _impl_.optional_references_), 0, 0,
-    (0 | ::_fl::kFcRepeated | ::_fl::kMessage | ::_fl::kTvTable)},
-  }}, {{
-    {::_pbi::TcParser::GetTable<::io::deephaven::proto::backplane::grpc::Reference>()},
-  }}, {{
-    "\61\15\0\0\0\0\0\0"
-    "io.deephaven.proto.backplane.grpc.SearchCondition"
-    "search_string"
-  }},
-};
-
-::uint8_t* SearchCondition::_InternalSerialize(
-    ::uint8_t* target,
-    ::google::protobuf::io::EpsCopyOutputStream* stream) const {
-  // @@protoc_insertion_point(serialize_to_array_start:io.deephaven.proto.backplane.grpc.SearchCondition)
-  ::uint32_t cached_has_bits = 0;
-  (void)cached_has_bits;
-
-  // string search_string = 1;
-  if (!this->_internal_search_string().empty()) {
-    const std::string& _s = this->_internal_search_string();
-    ::google::protobuf::internal::WireFormatLite::VerifyUtf8String(
-        _s.data(), static_cast<int>(_s.length()), ::google::protobuf::internal::WireFormatLite::SERIALIZE, "io.deephaven.proto.backplane.grpc.SearchCondition.search_string");
-    target = stream->WriteStringMaybeAliased(1, _s, target);
-  }
-
-  // repeated .io.deephaven.proto.backplane.grpc.Reference optional_references = 2;
-  for (unsigned i = 0,
-      n = static_cast<unsigned>(this->_internal_optional_references_size()); i < n; i++) {
-    const auto& repfield = this->_internal_optional_references().Get(i);
-    target = ::google::protobuf::internal::WireFormatLite::
-        InternalWriteMessage(2, repfield, repfield.GetCachedSize(), target, stream);
-  }
-
-  if (PROTOBUF_PREDICT_FALSE(_internal_metadata_.have_unknown_fields())) {
-    target =
-        ::_pbi::WireFormat::InternalSerializeUnknownFieldsToArray(
-            _internal_metadata_.unknown_fields<::google::protobuf::UnknownFieldSet>(::google::protobuf::UnknownFieldSet::default_instance), target, stream);
-  }
-  // @@protoc_insertion_point(serialize_to_array_end:io.deephaven.proto.backplane.grpc.SearchCondition)
-  return target;
-}
-
-::size_t SearchCondition::ByteSizeLong() const {
-// @@protoc_insertion_point(message_byte_size_start:io.deephaven.proto.backplane.grpc.SearchCondition)
-  ::size_t total_size = 0;
-
-  ::uint32_t cached_has_bits = 0;
-  // Prevent compiler warnings about cached_has_bits being unused
-  (void) cached_has_bits;
-
-  // repeated .io.deephaven.proto.backplane.grpc.Reference optional_references = 2;
-  total_size += 1UL * this->_internal_optional_references_size();
-  for (const auto& msg : this->_internal_optional_references()) {
-    total_size +=
-      ::google::protobuf::internal::WireFormatLite::MessageSize(msg);
-  }
-  // string search_string = 1;
-  if (!this->_internal_search_string().empty()) {
-    total_size += 1 + ::google::protobuf::internal::WireFormatLite::StringSize(
-                                    this->_internal_search_string());
-  }
-
-  return MaybeComputeUnknownFieldsSize(total_size, &_impl_._cached_size_);
-}
-
-const ::google::protobuf::Message::ClassData SearchCondition::_class_data_ = {
-    SearchCondition::MergeImpl,
-    nullptr,  // OnDemandRegisterArenaDtor
-};
-const ::google::protobuf::Message::ClassData* SearchCondition::GetClassData() const {
-  return &_class_data_;
-}
-
-void SearchCondition::MergeImpl(::google::protobuf::Message& to_msg, const ::google::protobuf::Message& from_msg) {
-  auto* const _this = static_cast<SearchCondition*>(&to_msg);
-  auto& from = static_cast<const SearchCondition&>(from_msg);
-  // @@protoc_insertion_point(class_specific_merge_from_start:io.deephaven.proto.backplane.grpc.SearchCondition)
-  ABSL_DCHECK_NE(&from, _this);
-  ::uint32_t cached_has_bits = 0;
-  (void) cached_has_bits;
-
-  _this->_internal_mutable_optional_references()->MergeFrom(
-      from._internal_optional_references());
-  if (!from._internal_search_string().empty()) {
-    _this->_internal_set_search_string(from._internal_search_string());
-  }
-  _this->_internal_metadata_.MergeFrom<::google::protobuf::UnknownFieldSet>(from._internal_metadata_);
-}
-
-void SearchCondition::CopyFrom(const SearchCondition& from) {
-// @@protoc_insertion_point(class_specific_copy_from_start:io.deephaven.proto.backplane.grpc.SearchCondition)
-  if (&from == this) return;
-  Clear();
-  MergeFrom(from);
-}
-
-PROTOBUF_NOINLINE bool SearchCondition::IsInitialized() const {
-  return true;
-}
-
-::_pbi::CachedSize* SearchCondition::AccessCachedSize() const {
-  return &_impl_._cached_size_;
-}
-void SearchCondition::InternalSwap(SearchCondition* PROTOBUF_RESTRICT other) {
-  using std::swap;
-  auto* arena = GetArena();
-  ABSL_DCHECK_EQ(arena, other->GetArena());
-  _internal_metadata_.InternalSwap(&other->_internal_metadata_);
-  _impl_.optional_references_.InternalSwap(&other->_impl_.optional_references_);
-  ::_pbi::ArenaStringPtr::InternalSwap(&_impl_.search_string_, &other->_impl_.search_string_, arena);
-}
-
-::google::protobuf::Metadata SearchCondition::GetMetadata() const {
-  return ::_pbi::AssignDescriptors(
-      &descriptor_table_deephaven_2fproto_2ftable_2eproto_getter, &descriptor_table_deephaven_2fproto_2ftable_2eproto_once,
-      file_level_metadata_deephaven_2fproto_2ftable_2eproto[110]);
-}
-// ===================================================================
-
-class FlattenRequest::_Internal {
- public:
-  using HasBits = decltype(std::declval<FlattenRequest>()._impl_._has_bits_);
-  static constexpr ::int32_t kHasBitsOffset =
-    8 * PROTOBUF_FIELD_OFFSET(FlattenRequest, _impl_._has_bits_);
-  static const ::io::deephaven::proto::backplane::grpc::Ticket& result_id(const FlattenRequest* msg);
-  static void set_has_result_id(HasBits* has_bits) {
-    (*has_bits)[0] |= 1u;
-  }
-  static const ::io::deephaven::proto::backplane::grpc::TableReference& source_id(const FlattenRequest* msg);
-  static void set_has_source_id(HasBits* has_bits) {
-    (*has_bits)[0] |= 2u;
-  }
-};
-
-const ::io::deephaven::proto::backplane::grpc::Ticket& FlattenRequest::_Internal::result_id(const FlattenRequest* msg) {
-  return *msg->_impl_.result_id_;
-}
-const ::io::deephaven::proto::backplane::grpc::TableReference& FlattenRequest::_Internal::source_id(const FlattenRequest* msg) {
-  return *msg->_impl_.source_id_;
-}
-void FlattenRequest::clear_result_id() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  if (_impl_.result_id_ != nullptr) _impl_.result_id_->Clear();
-  _impl_._has_bits_[0] &= ~0x00000001u;
-}
-FlattenRequest::FlattenRequest(::google::protobuf::Arena* arena)
-    : ::google::protobuf::Message(arena) {
-  SharedCtor(arena);
-  // @@protoc_insertion_point(arena_constructor:io.deephaven.proto.backplane.grpc.FlattenRequest)
-}
-inline PROTOBUF_NDEBUG_INLINE FlattenRequest::Impl_::Impl_(
-    ::google::protobuf::internal::InternalVisibility visibility, ::google::protobuf::Arena* arena,
-    const Impl_& from)
-      : _has_bits_{from._has_bits_},
-        _cached_size_{0} {}
-
-FlattenRequest::FlattenRequest(
-    ::google::protobuf::Arena* arena,
-    const FlattenRequest& from)
-    : ::google::protobuf::Message(arena) {
-  FlattenRequest* const _this = this;
-  (void)_this;
-  _internal_metadata_.MergeFrom<::google::protobuf::UnknownFieldSet>(
-      from._internal_metadata_);
-  new (&_impl_) Impl_(internal_visibility(), arena, from._impl_);
-  ::uint32_t cached_has_bits = _impl_._has_bits_[0];
-  _impl_.result_id_ = (cached_has_bits & 0x00000001u)
-                ? CreateMaybeMessage<::io::deephaven::proto::backplane::grpc::Ticket>(arena, *from._impl_.result_id_)
-                : nullptr;
-  _impl_.source_id_ = (cached_has_bits & 0x00000002u)
-                ? CreateMaybeMessage<::io::deephaven::proto::backplane::grpc::TableReference>(arena, *from._impl_.source_id_)
-                : nullptr;
-
-  // @@protoc_insertion_point(copy_constructor:io.deephaven.proto.backplane.grpc.FlattenRequest)
-}
-inline PROTOBUF_NDEBUG_INLINE FlattenRequest::Impl_::Impl_(
-    ::google::protobuf::internal::InternalVisibility visibility,
-    ::google::protobuf::Arena* arena)
-      : _cached_size_{0} {}
-
-inline void FlattenRequest::SharedCtor(::_pb::Arena* arena) {
-  new (&_impl_) Impl_(internal_visibility(), arena);
-  ::memset(reinterpret_cast<char *>(&_impl_) +
-               offsetof(Impl_, result_id_),
-           0,
-           offsetof(Impl_, source_id_) -
-               offsetof(Impl_, result_id_) +
-               sizeof(Impl_::source_id_));
-}
-FlattenRequest::~FlattenRequest() {
-  // @@protoc_insertion_point(destructor:io.deephaven.proto.backplane.grpc.FlattenRequest)
-  _internal_metadata_.Delete<::google::protobuf::UnknownFieldSet>();
-  SharedDtor();
-}
-inline void FlattenRequest::SharedDtor() {
-  ABSL_DCHECK(GetArena() == nullptr);
-  delete _impl_.result_id_;
-  delete _impl_.source_id_;
-  _impl_.~Impl_();
-}
-
-PROTOBUF_NOINLINE void FlattenRequest::Clear() {
-// @@protoc_insertion_point(message_clear_start:io.deephaven.proto.backplane.grpc.FlattenRequest)
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  ::uint32_t cached_has_bits = 0;
-  // Prevent compiler warnings about cached_has_bits being unused
-  (void) cached_has_bits;
-
-  cached_has_bits = _impl_._has_bits_[0];
-  if (cached_has_bits & 0x00000003u) {
-    if (cached_has_bits & 0x00000001u) {
-      ABSL_DCHECK(_impl_.result_id_ != nullptr);
-      _impl_.result_id_->Clear();
-    }
-    if (cached_has_bits & 0x00000002u) {
-      ABSL_DCHECK(_impl_.source_id_ != nullptr);
-      _impl_.source_id_->Clear();
-    }
-  }
-  _impl_._has_bits_.Clear();
-  _internal_metadata_.Clear<::google::protobuf::UnknownFieldSet>();
-}
-
-const char* FlattenRequest::_InternalParse(
-    const char* ptr, ::_pbi::ParseContext* ctx) {
-  ptr = ::_pbi::TcParser::ParseLoop(this, ptr, ctx, &_table_.header);
-  return ptr;
-}
-
-
-PROTOBUF_CONSTINIT PROTOBUF_ATTRIBUTE_INIT_PRIORITY1
-const ::_pbi::TcParseTable<1, 2, 2, 0, 2> FlattenRequest::_table_ = {
-  {
-    PROTOBUF_FIELD_OFFSET(FlattenRequest, _impl_._has_bits_),
-    0, // no _extensions_
-    2, 8,  // max_field_number, fast_idx_mask
-    offsetof(decltype(_table_), field_lookup_table),
-    4294967292,  // skipmap
-    offsetof(decltype(_table_), field_entries),
-    2,  // num_field_entries
-    2,  // num_aux_entries
-    offsetof(decltype(_table_), aux_entries),
-    &_FlattenRequest_default_instance_._instance,
-    ::_pbi::TcParser::GenericFallback,  // fallback
-  }, {{
-    // .io.deephaven.proto.backplane.grpc.TableReference source_id = 2;
-    {::_pbi::TcParser::FastMtS1,
-     {18, 1, 1, PROTOBUF_FIELD_OFFSET(FlattenRequest, _impl_.source_id_)}},
-    // .io.deephaven.proto.backplane.grpc.Ticket result_id = 1;
-    {::_pbi::TcParser::FastMtS1,
-     {10, 0, 0, PROTOBUF_FIELD_OFFSET(FlattenRequest, _impl_.result_id_)}},
-  }}, {{
-    65535, 65535
-  }}, {{
-    // .io.deephaven.proto.backplane.grpc.Ticket result_id = 1;
-    {PROTOBUF_FIELD_OFFSET(FlattenRequest, _impl_.result_id_), _Internal::kHasBitsOffset + 0, 0,
-    (0 | ::_fl::kFcOptional | ::_fl::kMessage | ::_fl::kTvTable)},
-    // .io.deephaven.proto.backplane.grpc.TableReference source_id = 2;
-    {PROTOBUF_FIELD_OFFSET(FlattenRequest, _impl_.source_id_), _Internal::kHasBitsOffset + 1, 1,
-    (0 | ::_fl::kFcOptional | ::_fl::kMessage | ::_fl::kTvTable)},
-  }}, {{
-    {::_pbi::TcParser::GetTable<::io::deephaven::proto::backplane::grpc::Ticket>()},
-    {::_pbi::TcParser::GetTable<::io::deephaven::proto::backplane::grpc::TableReference>()},
-  }}, {{
-  }},
-};
-
-::uint8_t* FlattenRequest::_InternalSerialize(
-    ::uint8_t* target,
-    ::google::protobuf::io::EpsCopyOutputStream* stream) const {
-  // @@protoc_insertion_point(serialize_to_array_start:io.deephaven.proto.backplane.grpc.FlattenRequest)
-  ::uint32_t cached_has_bits = 0;
-  (void)cached_has_bits;
-
-  cached_has_bits = _impl_._has_bits_[0];
-  // .io.deephaven.proto.backplane.grpc.Ticket result_id = 1;
-  if (cached_has_bits & 0x00000001u) {
-    target = ::google::protobuf::internal::WireFormatLite::InternalWriteMessage(
-        1, _Internal::result_id(this),
-        _Internal::result_id(this).GetCachedSize(), target, stream);
-  }
-
-  // .io.deephaven.proto.backplane.grpc.TableReference source_id = 2;
-  if (cached_has_bits & 0x00000002u) {
-    target = ::google::protobuf::internal::WireFormatLite::InternalWriteMessage(
-        2, _Internal::source_id(this),
-        _Internal::source_id(this).GetCachedSize(), target, stream);
-  }
-
-  if (PROTOBUF_PREDICT_FALSE(_internal_metadata_.have_unknown_fields())) {
-    target =
-        ::_pbi::WireFormat::InternalSerializeUnknownFieldsToArray(
-            _internal_metadata_.unknown_fields<::google::protobuf::UnknownFieldSet>(::google::protobuf::UnknownFieldSet::default_instance), target, stream);
-  }
-  // @@protoc_insertion_point(serialize_to_array_end:io.deephaven.proto.backplane.grpc.FlattenRequest)
-  return target;
-}
-
-::size_t FlattenRequest::ByteSizeLong() const {
-// @@protoc_insertion_point(message_byte_size_start:io.deephaven.proto.backplane.grpc.FlattenRequest)
-  ::size_t total_size = 0;
-
-  ::uint32_t cached_has_bits = 0;
-  // Prevent compiler warnings about cached_has_bits being unused
-  (void) cached_has_bits;
-
-  cached_has_bits = _impl_._has_bits_[0];
-  if (cached_has_bits & 0x00000003u) {
-    // .io.deephaven.proto.backplane.grpc.Ticket result_id = 1;
-    if (cached_has_bits & 0x00000001u) {
-      total_size +=
-          1 + ::google::protobuf::internal::WireFormatLite::MessageSize(*_impl_.result_id_);
-    }
-
-    // .io.deephaven.proto.backplane.grpc.TableReference source_id = 2;
-    if (cached_has_bits & 0x00000002u) {
-      total_size +=
-          1 + ::google::protobuf::internal::WireFormatLite::MessageSize(*_impl_.source_id_);
-    }
-
-  }
-  return MaybeComputeUnknownFieldsSize(total_size, &_impl_._cached_size_);
-}
-
-const ::google::protobuf::Message::ClassData FlattenRequest::_class_data_ = {
-    FlattenRequest::MergeImpl,
-    nullptr,  // OnDemandRegisterArenaDtor
-};
-const ::google::protobuf::Message::ClassData* FlattenRequest::GetClassData() const {
-  return &_class_data_;
-}
-
-void FlattenRequest::MergeImpl(::google::protobuf::Message& to_msg, const ::google::protobuf::Message& from_msg) {
-  auto* const _this = static_cast<FlattenRequest*>(&to_msg);
-  auto& from = static_cast<const FlattenRequest&>(from_msg);
-  // @@protoc_insertion_point(class_specific_merge_from_start:io.deephaven.proto.backplane.grpc.FlattenRequest)
-  ABSL_DCHECK_NE(&from, _this);
-  ::uint32_t cached_has_bits = 0;
-  (void) cached_has_bits;
-
-  cached_has_bits = from._impl_._has_bits_[0];
-  if (cached_has_bits & 0x00000003u) {
-    if (cached_has_bits & 0x00000001u) {
-      _this->_internal_mutable_result_id()->::io::deephaven::proto::backplane::grpc::Ticket::MergeFrom(
-          from._internal_result_id());
-    }
-    if (cached_has_bits & 0x00000002u) {
-      _this->_internal_mutable_source_id()->::io::deephaven::proto::backplane::grpc::TableReference::MergeFrom(
-          from._internal_source_id());
-    }
-  }
-  _this->_internal_metadata_.MergeFrom<::google::protobuf::UnknownFieldSet>(from._internal_metadata_);
-}
-
-void FlattenRequest::CopyFrom(const FlattenRequest& from) {
-// @@protoc_insertion_point(class_specific_copy_from_start:io.deephaven.proto.backplane.grpc.FlattenRequest)
-  if (&from == this) return;
-  Clear();
-  MergeFrom(from);
-}
-
-PROTOBUF_NOINLINE bool FlattenRequest::IsInitialized() const {
-  return true;
-}
-
-::_pbi::CachedSize* FlattenRequest::AccessCachedSize() const {
-  return &_impl_._cached_size_;
-}
-void FlattenRequest::InternalSwap(FlattenRequest* PROTOBUF_RESTRICT other) {
-  using std::swap;
-  _internal_metadata_.InternalSwap(&other->_internal_metadata_);
-  swap(_impl_._has_bits_[0], other->_impl_._has_bits_[0]);
-  ::google::protobuf::internal::memswap<
-      PROTOBUF_FIELD_OFFSET(FlattenRequest, _impl_.source_id_)
-      + sizeof(FlattenRequest::_impl_.source_id_)
-      - PROTOBUF_FIELD_OFFSET(FlattenRequest, _impl_.result_id_)>(
-          reinterpret_cast<char*>(&_impl_.result_id_),
-          reinterpret_cast<char*>(&other->_impl_.result_id_));
-}
-
-::google::protobuf::Metadata FlattenRequest::GetMetadata() const {
-  return ::_pbi::AssignDescriptors(
-      &descriptor_table_deephaven_2fproto_2ftable_2eproto_getter, &descriptor_table_deephaven_2fproto_2ftable_2eproto_once,
-      file_level_metadata_deephaven_2fproto_2ftable_2eproto[111]);
-}
-// ===================================================================
-
-class MetaTableRequest::_Internal {
- public:
-  using HasBits = decltype(std::declval<MetaTableRequest>()._impl_._has_bits_);
-  static constexpr ::int32_t kHasBitsOffset =
-    8 * PROTOBUF_FIELD_OFFSET(MetaTableRequest, _impl_._has_bits_);
-  static const ::io::deephaven::proto::backplane::grpc::Ticket& result_id(const MetaTableRequest* msg);
-  static void set_has_result_id(HasBits* has_bits) {
-    (*has_bits)[0] |= 1u;
-  }
-  static const ::io::deephaven::proto::backplane::grpc::TableReference& source_id(const MetaTableRequest* msg);
-  static void set_has_source_id(HasBits* has_bits) {
-    (*has_bits)[0] |= 2u;
-  }
-};
-
-const ::io::deephaven::proto::backplane::grpc::Ticket& MetaTableRequest::_Internal::result_id(const MetaTableRequest* msg) {
-  return *msg->_impl_.result_id_;
-}
-const ::io::deephaven::proto::backplane::grpc::TableReference& MetaTableRequest::_Internal::source_id(const MetaTableRequest* msg) {
-  return *msg->_impl_.source_id_;
-}
-void MetaTableRequest::clear_result_id() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  if (_impl_.result_id_ != nullptr) _impl_.result_id_->Clear();
-  _impl_._has_bits_[0] &= ~0x00000001u;
-}
-MetaTableRequest::MetaTableRequest(::google::protobuf::Arena* arena)
-    : ::google::protobuf::Message(arena) {
-  SharedCtor(arena);
-  // @@protoc_insertion_point(arena_constructor:io.deephaven.proto.backplane.grpc.MetaTableRequest)
-}
-inline PROTOBUF_NDEBUG_INLINE MetaTableRequest::Impl_::Impl_(
-    ::google::protobuf::internal::InternalVisibility visibility, ::google::protobuf::Arena* arena,
-    const Impl_& from)
-      : _has_bits_{from._has_bits_},
-        _cached_size_{0} {}
-
-MetaTableRequest::MetaTableRequest(
-    ::google::protobuf::Arena* arena,
-    const MetaTableRequest& from)
-    : ::google::protobuf::Message(arena) {
-  MetaTableRequest* const _this = this;
-  (void)_this;
-  _internal_metadata_.MergeFrom<::google::protobuf::UnknownFieldSet>(
-      from._internal_metadata_);
-  new (&_impl_) Impl_(internal_visibility(), arena, from._impl_);
-  ::uint32_t cached_has_bits = _impl_._has_bits_[0];
-  _impl_.result_id_ = (cached_has_bits & 0x00000001u)
-                ? CreateMaybeMessage<::io::deephaven::proto::backplane::grpc::Ticket>(arena, *from._impl_.result_id_)
-                : nullptr;
-  _impl_.source_id_ = (cached_has_bits & 0x00000002u)
-                ? CreateMaybeMessage<::io::deephaven::proto::backplane::grpc::TableReference>(arena, *from._impl_.source_id_)
-                : nullptr;
-
-  // @@protoc_insertion_point(copy_constructor:io.deephaven.proto.backplane.grpc.MetaTableRequest)
-}
-inline PROTOBUF_NDEBUG_INLINE MetaTableRequest::Impl_::Impl_(
-    ::google::protobuf::internal::InternalVisibility visibility,
-    ::google::protobuf::Arena* arena)
-      : _cached_size_{0} {}
-
-inline void MetaTableRequest::SharedCtor(::_pb::Arena* arena) {
-  new (&_impl_) Impl_(internal_visibility(), arena);
-  ::memset(reinterpret_cast<char *>(&_impl_) +
-               offsetof(Impl_, result_id_),
-           0,
-           offsetof(Impl_, source_id_) -
-               offsetof(Impl_, result_id_) +
-               sizeof(Impl_::source_id_));
-}
-MetaTableRequest::~MetaTableRequest() {
-  // @@protoc_insertion_point(destructor:io.deephaven.proto.backplane.grpc.MetaTableRequest)
-  _internal_metadata_.Delete<::google::protobuf::UnknownFieldSet>();
-  SharedDtor();
-}
-inline void MetaTableRequest::SharedDtor() {
-  ABSL_DCHECK(GetArena() == nullptr);
-  delete _impl_.result_id_;
-  delete _impl_.source_id_;
-  _impl_.~Impl_();
-}
-
-PROTOBUF_NOINLINE void MetaTableRequest::Clear() {
-// @@protoc_insertion_point(message_clear_start:io.deephaven.proto.backplane.grpc.MetaTableRequest)
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  ::uint32_t cached_has_bits = 0;
-  // Prevent compiler warnings about cached_has_bits being unused
-  (void) cached_has_bits;
-
-  cached_has_bits = _impl_._has_bits_[0];
-  if (cached_has_bits & 0x00000003u) {
-    if (cached_has_bits & 0x00000001u) {
-      ABSL_DCHECK(_impl_.result_id_ != nullptr);
-      _impl_.result_id_->Clear();
-    }
-    if (cached_has_bits & 0x00000002u) {
-      ABSL_DCHECK(_impl_.source_id_ != nullptr);
-      _impl_.source_id_->Clear();
-    }
-  }
-  _impl_._has_bits_.Clear();
-  _internal_metadata_.Clear<::google::protobuf::UnknownFieldSet>();
-}
-
-const char* MetaTableRequest::_InternalParse(
-    const char* ptr, ::_pbi::ParseContext* ctx) {
-  ptr = ::_pbi::TcParser::ParseLoop(this, ptr, ctx, &_table_.header);
-  return ptr;
-}
-
-
-PROTOBUF_CONSTINIT PROTOBUF_ATTRIBUTE_INIT_PRIORITY1
-const ::_pbi::TcParseTable<1, 2, 2, 0, 2> MetaTableRequest::_table_ = {
-  {
-    PROTOBUF_FIELD_OFFSET(MetaTableRequest, _impl_._has_bits_),
-    0, // no _extensions_
-    2, 8,  // max_field_number, fast_idx_mask
-    offsetof(decltype(_table_), field_lookup_table),
-    4294967292,  // skipmap
-    offsetof(decltype(_table_), field_entries),
-    2,  // num_field_entries
-    2,  // num_aux_entries
-    offsetof(decltype(_table_), aux_entries),
-    &_MetaTableRequest_default_instance_._instance,
-    ::_pbi::TcParser::GenericFallback,  // fallback
-  }, {{
-    // .io.deephaven.proto.backplane.grpc.TableReference source_id = 2;
-    {::_pbi::TcParser::FastMtS1,
-     {18, 1, 1, PROTOBUF_FIELD_OFFSET(MetaTableRequest, _impl_.source_id_)}},
-    // .io.deephaven.proto.backplane.grpc.Ticket result_id = 1;
-    {::_pbi::TcParser::FastMtS1,
-     {10, 0, 0, PROTOBUF_FIELD_OFFSET(MetaTableRequest, _impl_.result_id_)}},
-  }}, {{
-    65535, 65535
-  }}, {{
-    // .io.deephaven.proto.backplane.grpc.Ticket result_id = 1;
-    {PROTOBUF_FIELD_OFFSET(MetaTableRequest, _impl_.result_id_), _Internal::kHasBitsOffset + 0, 0,
-    (0 | ::_fl::kFcOptional | ::_fl::kMessage | ::_fl::kTvTable)},
-    // .io.deephaven.proto.backplane.grpc.TableReference source_id = 2;
-    {PROTOBUF_FIELD_OFFSET(MetaTableRequest, _impl_.source_id_), _Internal::kHasBitsOffset + 1, 1,
-    (0 | ::_fl::kFcOptional | ::_fl::kMessage | ::_fl::kTvTable)},
-  }}, {{
-    {::_pbi::TcParser::GetTable<::io::deephaven::proto::backplane::grpc::Ticket>()},
-    {::_pbi::TcParser::GetTable<::io::deephaven::proto::backplane::grpc::TableReference>()},
-  }}, {{
-  }},
-};
-
-::uint8_t* MetaTableRequest::_InternalSerialize(
-    ::uint8_t* target,
-    ::google::protobuf::io::EpsCopyOutputStream* stream) const {
-  // @@protoc_insertion_point(serialize_to_array_start:io.deephaven.proto.backplane.grpc.MetaTableRequest)
-  ::uint32_t cached_has_bits = 0;
-  (void)cached_has_bits;
-
-  cached_has_bits = _impl_._has_bits_[0];
-  // .io.deephaven.proto.backplane.grpc.Ticket result_id = 1;
-  if (cached_has_bits & 0x00000001u) {
-    target = ::google::protobuf::internal::WireFormatLite::InternalWriteMessage(
-        1, _Internal::result_id(this),
-        _Internal::result_id(this).GetCachedSize(), target, stream);
-  }
-
-  // .io.deephaven.proto.backplane.grpc.TableReference source_id = 2;
-  if (cached_has_bits & 0x00000002u) {
-    target = ::google::protobuf::internal::WireFormatLite::InternalWriteMessage(
-        2, _Internal::source_id(this),
-        _Internal::source_id(this).GetCachedSize(), target, stream);
-  }
-
-  if (PROTOBUF_PREDICT_FALSE(_internal_metadata_.have_unknown_fields())) {
-    target =
-        ::_pbi::WireFormat::InternalSerializeUnknownFieldsToArray(
-            _internal_metadata_.unknown_fields<::google::protobuf::UnknownFieldSet>(::google::protobuf::UnknownFieldSet::default_instance), target, stream);
-  }
-  // @@protoc_insertion_point(serialize_to_array_end:io.deephaven.proto.backplane.grpc.MetaTableRequest)
-  return target;
-}
-
-::size_t MetaTableRequest::ByteSizeLong() const {
-// @@protoc_insertion_point(message_byte_size_start:io.deephaven.proto.backplane.grpc.MetaTableRequest)
-  ::size_t total_size = 0;
-
-  ::uint32_t cached_has_bits = 0;
-  // Prevent compiler warnings about cached_has_bits being unused
-  (void) cached_has_bits;
-
-  cached_has_bits = _impl_._has_bits_[0];
-  if (cached_has_bits & 0x00000003u) {
-    // .io.deephaven.proto.backplane.grpc.Ticket result_id = 1;
-    if (cached_has_bits & 0x00000001u) {
-      total_size +=
-          1 + ::google::protobuf::internal::WireFormatLite::MessageSize(*_impl_.result_id_);
-    }
-
-    // .io.deephaven.proto.backplane.grpc.TableReference source_id = 2;
-    if (cached_has_bits & 0x00000002u) {
-      total_size +=
-          1 + ::google::protobuf::internal::WireFormatLite::MessageSize(*_impl_.source_id_);
-    }
-
-  }
-  return MaybeComputeUnknownFieldsSize(total_size, &_impl_._cached_size_);
-}
-
-const ::google::protobuf::Message::ClassData MetaTableRequest::_class_data_ = {
-    MetaTableRequest::MergeImpl,
-    nullptr,  // OnDemandRegisterArenaDtor
-};
-const ::google::protobuf::Message::ClassData* MetaTableRequest::GetClassData() const {
-  return &_class_data_;
-}
-
-void MetaTableRequest::MergeImpl(::google::protobuf::Message& to_msg, const ::google::protobuf::Message& from_msg) {
-  auto* const _this = static_cast<MetaTableRequest*>(&to_msg);
-  auto& from = static_cast<const MetaTableRequest&>(from_msg);
-  // @@protoc_insertion_point(class_specific_merge_from_start:io.deephaven.proto.backplane.grpc.MetaTableRequest)
-  ABSL_DCHECK_NE(&from, _this);
-  ::uint32_t cached_has_bits = 0;
-  (void) cached_has_bits;
-
-  cached_has_bits = from._impl_._has_bits_[0];
-  if (cached_has_bits & 0x00000003u) {
-    if (cached_has_bits & 0x00000001u) {
-      _this->_internal_mutable_result_id()->::io::deephaven::proto::backplane::grpc::Ticket::MergeFrom(
-          from._internal_result_id());
-    }
-    if (cached_has_bits & 0x00000002u) {
-      _this->_internal_mutable_source_id()->::io::deephaven::proto::backplane::grpc::TableReference::MergeFrom(
-          from._internal_source_id());
-    }
-  }
-  _this->_internal_metadata_.MergeFrom<::google::protobuf::UnknownFieldSet>(from._internal_metadata_);
-}
-
-void MetaTableRequest::CopyFrom(const MetaTableRequest& from) {
-// @@protoc_insertion_point(class_specific_copy_from_start:io.deephaven.proto.backplane.grpc.MetaTableRequest)
-  if (&from == this) return;
-  Clear();
-  MergeFrom(from);
-}
-
-PROTOBUF_NOINLINE bool MetaTableRequest::IsInitialized() const {
-  return true;
-}
-
-::_pbi::CachedSize* MetaTableRequest::AccessCachedSize() const {
-  return &_impl_._cached_size_;
-}
-void MetaTableRequest::InternalSwap(MetaTableRequest* PROTOBUF_RESTRICT other) {
-  using std::swap;
-  _internal_metadata_.InternalSwap(&other->_internal_metadata_);
-  swap(_impl_._has_bits_[0], other->_impl_._has_bits_[0]);
-  ::google::protobuf::internal::memswap<
-      PROTOBUF_FIELD_OFFSET(MetaTableRequest, _impl_.source_id_)
-      + sizeof(MetaTableRequest::_impl_.source_id_)
-      - PROTOBUF_FIELD_OFFSET(MetaTableRequest, _impl_.result_id_)>(
-          reinterpret_cast<char*>(&_impl_.result_id_),
-          reinterpret_cast<char*>(&other->_impl_.result_id_));
-}
-
-::google::protobuf::Metadata MetaTableRequest::GetMetadata() const {
-  return ::_pbi::AssignDescriptors(
-      &descriptor_table_deephaven_2fproto_2ftable_2eproto_getter, &descriptor_table_deephaven_2fproto_2ftable_2eproto_once,
-      file_level_metadata_deephaven_2fproto_2ftable_2eproto[112]);
-}
-// ===================================================================
-
-class RunChartDownsampleRequest_ZoomRange::_Internal {
- public:
-  using HasBits = decltype(std::declval<RunChartDownsampleRequest_ZoomRange>()._impl_._has_bits_);
-  static constexpr ::int32_t kHasBitsOffset =
-    8 * PROTOBUF_FIELD_OFFSET(RunChartDownsampleRequest_ZoomRange, _impl_._has_bits_);
-  static void set_has_min_date_nanos(HasBits* has_bits) {
-    (*has_bits)[0] |= 1u;
-  }
-  static void set_has_max_date_nanos(HasBits* has_bits) {
-    (*has_bits)[0] |= 2u;
-  }
-};
-
-RunChartDownsampleRequest_ZoomRange::RunChartDownsampleRequest_ZoomRange(::google::protobuf::Arena* arena)
-    : ::google::protobuf::Message(arena) {
-  SharedCtor(arena);
-  // @@protoc_insertion_point(arena_constructor:io.deephaven.proto.backplane.grpc.RunChartDownsampleRequest.ZoomRange)
-}
-RunChartDownsampleRequest_ZoomRange::RunChartDownsampleRequest_ZoomRange(
-    ::google::protobuf::Arena* arena, const RunChartDownsampleRequest_ZoomRange& from)
-    : RunChartDownsampleRequest_ZoomRange(arena) {
-  MergeFrom(from);
-}
-inline PROTOBUF_NDEBUG_INLINE RunChartDownsampleRequest_ZoomRange::Impl_::Impl_(
-    ::google::protobuf::internal::InternalVisibility visibility,
-    ::google::protobuf::Arena* arena)
-      : _cached_size_{0} {}
-
-inline void RunChartDownsampleRequest_ZoomRange::SharedCtor(::_pb::Arena* arena) {
-  new (&_impl_) Impl_(internal_visibility(), arena);
-  ::memset(reinterpret_cast<char *>(&_impl_) +
-               offsetof(Impl_, min_date_nanos_),
-           0,
-           offsetof(Impl_, max_date_nanos_) -
-               offsetof(Impl_, min_date_nanos_) +
-               sizeof(Impl_::max_date_nanos_));
-}
-RunChartDownsampleRequest_ZoomRange::~RunChartDownsampleRequest_ZoomRange() {
-  // @@protoc_insertion_point(destructor:io.deephaven.proto.backplane.grpc.RunChartDownsampleRequest.ZoomRange)
-  _internal_metadata_.Delete<::google::protobuf::UnknownFieldSet>();
-  SharedDtor();
-}
-inline void RunChartDownsampleRequest_ZoomRange::SharedDtor() {
-  ABSL_DCHECK(GetArena() == nullptr);
-  _impl_.~Impl_();
-}
-
-PROTOBUF_NOINLINE void RunChartDownsampleRequest_ZoomRange::Clear() {
-// @@protoc_insertion_point(message_clear_start:io.deephaven.proto.backplane.grpc.RunChartDownsampleRequest.ZoomRange)
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  ::uint32_t cached_has_bits = 0;
-  // Prevent compiler warnings about cached_has_bits being unused
-  (void) cached_has_bits;
-
-  cached_has_bits = _impl_._has_bits_[0];
-  if (cached_has_bits & 0x00000003u) {
-    ::memset(&_impl_.min_date_nanos_, 0, static_cast<::size_t>(
-        reinterpret_cast<char*>(&_impl_.max_date_nanos_) -
-        reinterpret_cast<char*>(&_impl_.min_date_nanos_)) + sizeof(_impl_.max_date_nanos_));
-  }
-  _impl_._has_bits_.Clear();
-  _internal_metadata_.Clear<::google::protobuf::UnknownFieldSet>();
-}
-
-const char* RunChartDownsampleRequest_ZoomRange::_InternalParse(
-    const char* ptr, ::_pbi::ParseContext* ctx) {
-  ptr = ::_pbi::TcParser::ParseLoop(this, ptr, ctx, &_table_.header);
-  return ptr;
-}
-
-
-PROTOBUF_CONSTINIT PROTOBUF_ATTRIBUTE_INIT_PRIORITY1
-const ::_pbi::TcParseTable<1, 2, 0, 0, 2> RunChartDownsampleRequest_ZoomRange::_table_ = {
-  {
-    PROTOBUF_FIELD_OFFSET(RunChartDownsampleRequest_ZoomRange, _impl_._has_bits_),
-    0, // no _extensions_
-    2, 8,  // max_field_number, fast_idx_mask
-    offsetof(decltype(_table_), field_lookup_table),
-    4294967292,  // skipmap
-    offsetof(decltype(_table_), field_entries),
-    2,  // num_field_entries
-    0,  // num_aux_entries
-    offsetof(decltype(_table_), field_names),  // no aux_entries
-    &_RunChartDownsampleRequest_ZoomRange_default_instance_._instance,
-    ::_pbi::TcParser::GenericFallback,  // fallback
-  }, {{
-    // optional int64 max_date_nanos = 2 [jstype = JS_STRING];
-    {::_pbi::TcParser::SingularVarintNoZag1<::uint64_t, offsetof(RunChartDownsampleRequest_ZoomRange, _impl_.max_date_nanos_), 1>(),
-     {16, 1, 0, PROTOBUF_FIELD_OFFSET(RunChartDownsampleRequest_ZoomRange, _impl_.max_date_nanos_)}},
-    // optional int64 min_date_nanos = 1 [jstype = JS_STRING];
-    {::_pbi::TcParser::SingularVarintNoZag1<::uint64_t, offsetof(RunChartDownsampleRequest_ZoomRange, _impl_.min_date_nanos_), 0>(),
-     {8, 0, 0, PROTOBUF_FIELD_OFFSET(RunChartDownsampleRequest_ZoomRange, _impl_.min_date_nanos_)}},
-  }}, {{
-    65535, 65535
-  }}, {{
-    // optional int64 min_date_nanos = 1 [jstype = JS_STRING];
-    {PROTOBUF_FIELD_OFFSET(RunChartDownsampleRequest_ZoomRange, _impl_.min_date_nanos_), _Internal::kHasBitsOffset + 0, 0,
-    (0 | ::_fl::kFcOptional | ::_fl::kInt64)},
-    // optional int64 max_date_nanos = 2 [jstype = JS_STRING];
-    {PROTOBUF_FIELD_OFFSET(RunChartDownsampleRequest_ZoomRange, _impl_.max_date_nanos_), _Internal::kHasBitsOffset + 1, 0,
-    (0 | ::_fl::kFcOptional | ::_fl::kInt64)},
-  }},
-  // no aux_entries
-  {{
-  }},
-};
-
-::uint8_t* RunChartDownsampleRequest_ZoomRange::_InternalSerialize(
-    ::uint8_t* target,
-    ::google::protobuf::io::EpsCopyOutputStream* stream) const {
-  // @@protoc_insertion_point(serialize_to_array_start:io.deephaven.proto.backplane.grpc.RunChartDownsampleRequest.ZoomRange)
-  ::uint32_t cached_has_bits = 0;
-  (void)cached_has_bits;
-
-  cached_has_bits = _impl_._has_bits_[0];
-  // optional int64 min_date_nanos = 1 [jstype = JS_STRING];
-  if (cached_has_bits & 0x00000001u) {
-    target = ::google::protobuf::internal::WireFormatLite::
-        WriteInt64ToArrayWithField<1>(
-            stream, this->_internal_min_date_nanos(), target);
-  }
-
-  // optional int64 max_date_nanos = 2 [jstype = JS_STRING];
-  if (cached_has_bits & 0x00000002u) {
-    target = ::google::protobuf::internal::WireFormatLite::
-        WriteInt64ToArrayWithField<2>(
-            stream, this->_internal_max_date_nanos(), target);
-  }
-
-  if (PROTOBUF_PREDICT_FALSE(_internal_metadata_.have_unknown_fields())) {
-    target =
-        ::_pbi::WireFormat::InternalSerializeUnknownFieldsToArray(
-            _internal_metadata_.unknown_fields<::google::protobuf::UnknownFieldSet>(::google::protobuf::UnknownFieldSet::default_instance), target, stream);
-  }
-  // @@protoc_insertion_point(serialize_to_array_end:io.deephaven.proto.backplane.grpc.RunChartDownsampleRequest.ZoomRange)
-  return target;
-}
-
-::size_t RunChartDownsampleRequest_ZoomRange::ByteSizeLong() const {
-// @@protoc_insertion_point(message_byte_size_start:io.deephaven.proto.backplane.grpc.RunChartDownsampleRequest.ZoomRange)
-  ::size_t total_size = 0;
-
-  ::uint32_t cached_has_bits = 0;
-  // Prevent compiler warnings about cached_has_bits being unused
-  (void) cached_has_bits;
-
-  cached_has_bits = _impl_._has_bits_[0];
-  if (cached_has_bits & 0x00000003u) {
-    // optional int64 min_date_nanos = 1 [jstype = JS_STRING];
-    if (cached_has_bits & 0x00000001u) {
-      total_size += ::_pbi::WireFormatLite::Int64SizePlusOne(
-          this->_internal_min_date_nanos());
-    }
-
-    // optional int64 max_date_nanos = 2 [jstype = JS_STRING];
-    if (cached_has_bits & 0x00000002u) {
-      total_size += ::_pbi::WireFormatLite::Int64SizePlusOne(
-          this->_internal_max_date_nanos());
-    }
-
-  }
-  return MaybeComputeUnknownFieldsSize(total_size, &_impl_._cached_size_);
-}
-
-const ::google::protobuf::Message::ClassData RunChartDownsampleRequest_ZoomRange::_class_data_ = {
-    RunChartDownsampleRequest_ZoomRange::MergeImpl,
-    nullptr,  // OnDemandRegisterArenaDtor
-};
-const ::google::protobuf::Message::ClassData* RunChartDownsampleRequest_ZoomRange::GetClassData() const {
-  return &_class_data_;
-}
-
-void RunChartDownsampleRequest_ZoomRange::MergeImpl(::google::protobuf::Message& to_msg, const ::google::protobuf::Message& from_msg) {
-  auto* const _this = static_cast<RunChartDownsampleRequest_ZoomRange*>(&to_msg);
-  auto& from = static_cast<const RunChartDownsampleRequest_ZoomRange&>(from_msg);
-  // @@protoc_insertion_point(class_specific_merge_from_start:io.deephaven.proto.backplane.grpc.RunChartDownsampleRequest.ZoomRange)
-  ABSL_DCHECK_NE(&from, _this);
-  ::uint32_t cached_has_bits = 0;
-  (void) cached_has_bits;
-
-  cached_has_bits = from._impl_._has_bits_[0];
-  if (cached_has_bits & 0x00000003u) {
-    if (cached_has_bits & 0x00000001u) {
-      _this->_impl_.min_date_nanos_ = from._impl_.min_date_nanos_;
-    }
-    if (cached_has_bits & 0x00000002u) {
-      _this->_impl_.max_date_nanos_ = from._impl_.max_date_nanos_;
-    }
-    _this->_impl_._has_bits_[0] |= cached_has_bits;
-  }
-  _this->_internal_metadata_.MergeFrom<::google::protobuf::UnknownFieldSet>(from._internal_metadata_);
-}
-
-void RunChartDownsampleRequest_ZoomRange::CopyFrom(const RunChartDownsampleRequest_ZoomRange& from) {
-// @@protoc_insertion_point(class_specific_copy_from_start:io.deephaven.proto.backplane.grpc.RunChartDownsampleRequest.ZoomRange)
-  if (&from == this) return;
-  Clear();
-  MergeFrom(from);
-}
-
-PROTOBUF_NOINLINE bool RunChartDownsampleRequest_ZoomRange::IsInitialized() const {
-  return true;
-}
-
-::_pbi::CachedSize* RunChartDownsampleRequest_ZoomRange::AccessCachedSize() const {
-  return &_impl_._cached_size_;
-}
-void RunChartDownsampleRequest_ZoomRange::InternalSwap(RunChartDownsampleRequest_ZoomRange* PROTOBUF_RESTRICT other) {
-  using std::swap;
-  _internal_metadata_.InternalSwap(&other->_internal_metadata_);
-  swap(_impl_._has_bits_[0], other->_impl_._has_bits_[0]);
-  ::google::protobuf::internal::memswap<
-      PROTOBUF_FIELD_OFFSET(RunChartDownsampleRequest_ZoomRange, _impl_.max_date_nanos_)
-      + sizeof(RunChartDownsampleRequest_ZoomRange::_impl_.max_date_nanos_)
-      - PROTOBUF_FIELD_OFFSET(RunChartDownsampleRequest_ZoomRange, _impl_.min_date_nanos_)>(
-          reinterpret_cast<char*>(&_impl_.min_date_nanos_),
-          reinterpret_cast<char*>(&other->_impl_.min_date_nanos_));
-}
-
-::google::protobuf::Metadata RunChartDownsampleRequest_ZoomRange::GetMetadata() const {
-  return ::_pbi::AssignDescriptors(
-      &descriptor_table_deephaven_2fproto_2ftable_2eproto_getter, &descriptor_table_deephaven_2fproto_2ftable_2eproto_once,
-      file_level_metadata_deephaven_2fproto_2ftable_2eproto[113]);
-}
-// ===================================================================
-
-class RunChartDownsampleRequest::_Internal {
- public:
-  using HasBits = decltype(std::declval<RunChartDownsampleRequest>()._impl_._has_bits_);
-  static constexpr ::int32_t kHasBitsOffset =
-    8 * PROTOBUF_FIELD_OFFSET(RunChartDownsampleRequest, _impl_._has_bits_);
-  static const ::io::deephaven::proto::backplane::grpc::Ticket& result_id(const RunChartDownsampleRequest* msg);
-  static void set_has_result_id(HasBits* has_bits) {
-    (*has_bits)[0] |= 1u;
-  }
-  static const ::io::deephaven::proto::backplane::grpc::TableReference& source_id(const RunChartDownsampleRequest* msg);
-  static void set_has_source_id(HasBits* has_bits) {
-    (*has_bits)[0] |= 2u;
-  }
-  static const ::io::deephaven::proto::backplane::grpc::RunChartDownsampleRequest_ZoomRange& zoom_range(const RunChartDownsampleRequest* msg);
-  static void set_has_zoom_range(HasBits* has_bits) {
-    (*has_bits)[0] |= 4u;
-  }
-};
-
-const ::io::deephaven::proto::backplane::grpc::Ticket& RunChartDownsampleRequest::_Internal::result_id(const RunChartDownsampleRequest* msg) {
-  return *msg->_impl_.result_id_;
-}
-const ::io::deephaven::proto::backplane::grpc::TableReference& RunChartDownsampleRequest::_Internal::source_id(const RunChartDownsampleRequest* msg) {
-  return *msg->_impl_.source_id_;
-}
-const ::io::deephaven::proto::backplane::grpc::RunChartDownsampleRequest_ZoomRange& RunChartDownsampleRequest::_Internal::zoom_range(const RunChartDownsampleRequest* msg) {
-  return *msg->_impl_.zoom_range_;
-}
-void RunChartDownsampleRequest::clear_result_id() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  if (_impl_.result_id_ != nullptr) _impl_.result_id_->Clear();
-  _impl_._has_bits_[0] &= ~0x00000001u;
-}
-RunChartDownsampleRequest::RunChartDownsampleRequest(::google::protobuf::Arena* arena)
-    : ::google::protobuf::Message(arena) {
-  SharedCtor(arena);
-  // @@protoc_insertion_point(arena_constructor:io.deephaven.proto.backplane.grpc.RunChartDownsampleRequest)
-}
-inline PROTOBUF_NDEBUG_INLINE RunChartDownsampleRequest::Impl_::Impl_(
-    ::google::protobuf::internal::InternalVisibility visibility, ::google::protobuf::Arena* arena,
-    const Impl_& from)
-      : _has_bits_{from._has_bits_},
-        _cached_size_{0},
-        y_column_names_{visibility, arena, from.y_column_names_},
-        x_column_name_(arena, from.x_column_name_) {}
-
-RunChartDownsampleRequest::RunChartDownsampleRequest(
-    ::google::protobuf::Arena* arena,
-    const RunChartDownsampleRequest& from)
-    : ::google::protobuf::Message(arena) {
-  RunChartDownsampleRequest* const _this = this;
-  (void)_this;
-  _internal_metadata_.MergeFrom<::google::protobuf::UnknownFieldSet>(
-      from._internal_metadata_);
-  new (&_impl_) Impl_(internal_visibility(), arena, from._impl_);
-  ::uint32_t cached_has_bits = _impl_._has_bits_[0];
-  _impl_.result_id_ = (cached_has_bits & 0x00000001u)
-                ? CreateMaybeMessage<::io::deephaven::proto::backplane::grpc::Ticket>(arena, *from._impl_.result_id_)
-                : nullptr;
-  _impl_.source_id_ = (cached_has_bits & 0x00000002u)
-                ? CreateMaybeMessage<::io::deephaven::proto::backplane::grpc::TableReference>(arena, *from._impl_.source_id_)
-                : nullptr;
-  _impl_.zoom_range_ = (cached_has_bits & 0x00000004u)
-                ? CreateMaybeMessage<::io::deephaven::proto::backplane::grpc::RunChartDownsampleRequest_ZoomRange>(arena, *from._impl_.zoom_range_)
-                : nullptr;
-  _impl_.pixel_count_ = from._impl_.pixel_count_;
-
-  // @@protoc_insertion_point(copy_constructor:io.deephaven.proto.backplane.grpc.RunChartDownsampleRequest)
-}
-inline PROTOBUF_NDEBUG_INLINE RunChartDownsampleRequest::Impl_::Impl_(
-    ::google::protobuf::internal::InternalVisibility visibility,
-    ::google::protobuf::Arena* arena)
-      : _cached_size_{0},
-        y_column_names_{visibility, arena},
-        x_column_name_(arena) {}
-
-inline void RunChartDownsampleRequest::SharedCtor(::_pb::Arena* arena) {
-  new (&_impl_) Impl_(internal_visibility(), arena);
-  ::memset(reinterpret_cast<char *>(&_impl_) +
-               offsetof(Impl_, result_id_),
-           0,
-           offsetof(Impl_, pixel_count_) -
-               offsetof(Impl_, result_id_) +
-               sizeof(Impl_::pixel_count_));
-}
-RunChartDownsampleRequest::~RunChartDownsampleRequest() {
-  // @@protoc_insertion_point(destructor:io.deephaven.proto.backplane.grpc.RunChartDownsampleRequest)
-  _internal_metadata_.Delete<::google::protobuf::UnknownFieldSet>();
-  SharedDtor();
-}
-inline void RunChartDownsampleRequest::SharedDtor() {
-  ABSL_DCHECK(GetArena() == nullptr);
-  _impl_.x_column_name_.Destroy();
-  delete _impl_.result_id_;
-  delete _impl_.source_id_;
-  delete _impl_.zoom_range_;
-  _impl_.~Impl_();
-}
-
-PROTOBUF_NOINLINE void RunChartDownsampleRequest::Clear() {
-// @@protoc_insertion_point(message_clear_start:io.deephaven.proto.backplane.grpc.RunChartDownsampleRequest)
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  ::uint32_t cached_has_bits = 0;
-  // Prevent compiler warnings about cached_has_bits being unused
-  (void) cached_has_bits;
-
-  _impl_.y_column_names_.Clear();
-  _impl_.x_column_name_.ClearToEmpty();
-  cached_has_bits = _impl_._has_bits_[0];
-  if (cached_has_bits & 0x00000007u) {
-    if (cached_has_bits & 0x00000001u) {
-      ABSL_DCHECK(_impl_.result_id_ != nullptr);
-      _impl_.result_id_->Clear();
-    }
-    if (cached_has_bits & 0x00000002u) {
-      ABSL_DCHECK(_impl_.source_id_ != nullptr);
-      _impl_.source_id_->Clear();
-    }
-    if (cached_has_bits & 0x00000004u) {
-      ABSL_DCHECK(_impl_.zoom_range_ != nullptr);
-      _impl_.zoom_range_->Clear();
-    }
-  }
-  _impl_.pixel_count_ = 0;
-  _impl_._has_bits_.Clear();
-  _internal_metadata_.Clear<::google::protobuf::UnknownFieldSet>();
-}
-
-const char* RunChartDownsampleRequest::_InternalParse(
-    const char* ptr, ::_pbi::ParseContext* ctx) {
-  ptr = ::_pbi::TcParser::ParseLoop(this, ptr, ctx, &_table_.header);
-  return ptr;
-}
-
-
-PROTOBUF_CONSTINIT PROTOBUF_ATTRIBUTE_INIT_PRIORITY1
-const ::_pbi::TcParseTable<3, 6, 3, 95, 2> RunChartDownsampleRequest::_table_ = {
-  {
-    PROTOBUF_FIELD_OFFSET(RunChartDownsampleRequest, _impl_._has_bits_),
-    0, // no _extensions_
-    6, 56,  // max_field_number, fast_idx_mask
-    offsetof(decltype(_table_), field_lookup_table),
-    4294967232,  // skipmap
-    offsetof(decltype(_table_), field_entries),
-    6,  // num_field_entries
-    3,  // num_aux_entries
-    offsetof(decltype(_table_), aux_entries),
-    &_RunChartDownsampleRequest_default_instance_._instance,
-    ::_pbi::TcParser::GenericFallback,  // fallback
-  }, {{
-    {::_pbi::TcParser::MiniParse, {}},
-    // .io.deephaven.proto.backplane.grpc.Ticket result_id = 1;
-    {::_pbi::TcParser::FastMtS1,
-     {10, 0, 0, PROTOBUF_FIELD_OFFSET(RunChartDownsampleRequest, _impl_.result_id_)}},
-    // .io.deephaven.proto.backplane.grpc.TableReference source_id = 2;
-    {::_pbi::TcParser::FastMtS1,
-     {18, 1, 1, PROTOBUF_FIELD_OFFSET(RunChartDownsampleRequest, _impl_.source_id_)}},
-    // int32 pixel_count = 3;
-    {::_pbi::TcParser::SingularVarintNoZag1<::uint32_t, offsetof(RunChartDownsampleRequest, _impl_.pixel_count_), 63>(),
-     {24, 63, 0, PROTOBUF_FIELD_OFFSET(RunChartDownsampleRequest, _impl_.pixel_count_)}},
-    // .io.deephaven.proto.backplane.grpc.RunChartDownsampleRequest.ZoomRange zoom_range = 4;
-    {::_pbi::TcParser::FastMtS1,
-     {34, 2, 2, PROTOBUF_FIELD_OFFSET(RunChartDownsampleRequest, _impl_.zoom_range_)}},
-    // string x_column_name = 5;
-    {::_pbi::TcParser::FastUS1,
-     {42, 63, 0, PROTOBUF_FIELD_OFFSET(RunChartDownsampleRequest, _impl_.x_column_name_)}},
-    // repeated string y_column_names = 6;
-    {::_pbi::TcParser::FastUR1,
-     {50, 63, 0, PROTOBUF_FIELD_OFFSET(RunChartDownsampleRequest, _impl_.y_column_names_)}},
-    {::_pbi::TcParser::MiniParse, {}},
-  }}, {{
-    65535, 65535
-  }}, {{
-    // .io.deephaven.proto.backplane.grpc.Ticket result_id = 1;
-    {PROTOBUF_FIELD_OFFSET(RunChartDownsampleRequest, _impl_.result_id_), _Internal::kHasBitsOffset + 0, 0,
-    (0 | ::_fl::kFcOptional | ::_fl::kMessage | ::_fl::kTvTable)},
-    // .io.deephaven.proto.backplane.grpc.TableReference source_id = 2;
-    {PROTOBUF_FIELD_OFFSET(RunChartDownsampleRequest, _impl_.source_id_), _Internal::kHasBitsOffset + 1, 1,
-    (0 | ::_fl::kFcOptional | ::_fl::kMessage | ::_fl::kTvTable)},
-    // int32 pixel_count = 3;
-    {PROTOBUF_FIELD_OFFSET(RunChartDownsampleRequest, _impl_.pixel_count_), -1, 0,
-    (0 | ::_fl::kFcSingular | ::_fl::kInt32)},
-    // .io.deephaven.proto.backplane.grpc.RunChartDownsampleRequest.ZoomRange zoom_range = 4;
-    {PROTOBUF_FIELD_OFFSET(RunChartDownsampleRequest, _impl_.zoom_range_), _Internal::kHasBitsOffset + 2, 2,
-    (0 | ::_fl::kFcOptional | ::_fl::kMessage | ::_fl::kTvTable)},
-    // string x_column_name = 5;
-    {PROTOBUF_FIELD_OFFSET(RunChartDownsampleRequest, _impl_.x_column_name_), -1, 0,
-    (0 | ::_fl::kFcSingular | ::_fl::kUtf8String | ::_fl::kRepAString)},
-    // repeated string y_column_names = 6;
-    {PROTOBUF_FIELD_OFFSET(RunChartDownsampleRequest, _impl_.y_column_names_), -1, 0,
-    (0 | ::_fl::kFcRepeated | ::_fl::kUtf8String | ::_fl::kRepSString)},
-  }}, {{
-    {::_pbi::TcParser::GetTable<::io::deephaven::proto::backplane::grpc::Ticket>()},
-    {::_pbi::TcParser::GetTable<::io::deephaven::proto::backplane::grpc::TableReference>()},
-    {::_pbi::TcParser::GetTable<::io::deephaven::proto::backplane::grpc::RunChartDownsampleRequest_ZoomRange>()},
-  }}, {{
-    "\73\0\0\0\0\15\16\0"
-    "io.deephaven.proto.backplane.grpc.RunChartDownsampleRequest"
-    "x_column_name"
-    "y_column_names"
-  }},
-};
-
-::uint8_t* RunChartDownsampleRequest::_InternalSerialize(
-    ::uint8_t* target,
-    ::google::protobuf::io::EpsCopyOutputStream* stream) const {
-  // @@protoc_insertion_point(serialize_to_array_start:io.deephaven.proto.backplane.grpc.RunChartDownsampleRequest)
-  ::uint32_t cached_has_bits = 0;
-  (void)cached_has_bits;
-
-  cached_has_bits = _impl_._has_bits_[0];
-  // .io.deephaven.proto.backplane.grpc.Ticket result_id = 1;
-  if (cached_has_bits & 0x00000001u) {
-    target = ::google::protobuf::internal::WireFormatLite::InternalWriteMessage(
-        1, _Internal::result_id(this),
-        _Internal::result_id(this).GetCachedSize(), target, stream);
-  }
-
-  // .io.deephaven.proto.backplane.grpc.TableReference source_id = 2;
-  if (cached_has_bits & 0x00000002u) {
-    target = ::google::protobuf::internal::WireFormatLite::InternalWriteMessage(
-        2, _Internal::source_id(this),
-        _Internal::source_id(this).GetCachedSize(), target, stream);
-  }
-
-  // int32 pixel_count = 3;
-  if (this->_internal_pixel_count() != 0) {
-    target = ::google::protobuf::internal::WireFormatLite::
-        WriteInt32ToArrayWithField<3>(
-            stream, this->_internal_pixel_count(), target);
-  }
-
-  // .io.deephaven.proto.backplane.grpc.RunChartDownsampleRequest.ZoomRange zoom_range = 4;
-  if (cached_has_bits & 0x00000004u) {
-    target = ::google::protobuf::internal::WireFormatLite::InternalWriteMessage(
-        4, _Internal::zoom_range(this),
-        _Internal::zoom_range(this).GetCachedSize(), target, stream);
-  }
-
-  // string x_column_name = 5;
-  if (!this->_internal_x_column_name().empty()) {
-    const std::string& _s = this->_internal_x_column_name();
-    ::google::protobuf::internal::WireFormatLite::VerifyUtf8String(
-        _s.data(), static_cast<int>(_s.length()), ::google::protobuf::internal::WireFormatLite::SERIALIZE, "io.deephaven.proto.backplane.grpc.RunChartDownsampleRequest.x_column_name");
-    target = stream->WriteStringMaybeAliased(5, _s, target);
-  }
-
-  // repeated string y_column_names = 6;
-  for (int i = 0, n = this->_internal_y_column_names_size(); i < n; ++i) {
-    const auto& s = this->_internal_y_column_names().Get(i);
-    ::google::protobuf::internal::WireFormatLite::VerifyUtf8String(
-        s.data(), static_cast<int>(s.length()), ::google::protobuf::internal::WireFormatLite::SERIALIZE, "io.deephaven.proto.backplane.grpc.RunChartDownsampleRequest.y_column_names");
-    target = stream->WriteString(6, s, target);
-  }
-
-  if (PROTOBUF_PREDICT_FALSE(_internal_metadata_.have_unknown_fields())) {
-    target =
-        ::_pbi::WireFormat::InternalSerializeUnknownFieldsToArray(
-            _internal_metadata_.unknown_fields<::google::protobuf::UnknownFieldSet>(::google::protobuf::UnknownFieldSet::default_instance), target, stream);
-  }
-  // @@protoc_insertion_point(serialize_to_array_end:io.deephaven.proto.backplane.grpc.RunChartDownsampleRequest)
-  return target;
-}
-
-::size_t RunChartDownsampleRequest::ByteSizeLong() const {
-// @@protoc_insertion_point(message_byte_size_start:io.deephaven.proto.backplane.grpc.RunChartDownsampleRequest)
-  ::size_t total_size = 0;
-
-  ::uint32_t cached_has_bits = 0;
-  // Prevent compiler warnings about cached_has_bits being unused
-  (void) cached_has_bits;
-
-  // repeated string y_column_names = 6;
-  total_size += 1 * ::google::protobuf::internal::FromIntSize(_internal_y_column_names().size());
-  for (int i = 0, n = _internal_y_column_names().size(); i < n; ++i) {
-    total_size += ::google::protobuf::internal::WireFormatLite::StringSize(
-        _internal_y_column_names().Get(i));
-  }
-  // string x_column_name = 5;
-  if (!this->_internal_x_column_name().empty()) {
-    total_size += 1 + ::google::protobuf::internal::WireFormatLite::StringSize(
-                                    this->_internal_x_column_name());
-  }
-
-  cached_has_bits = _impl_._has_bits_[0];
-  if (cached_has_bits & 0x00000007u) {
-    // .io.deephaven.proto.backplane.grpc.Ticket result_id = 1;
-    if (cached_has_bits & 0x00000001u) {
-      total_size +=
-          1 + ::google::protobuf::internal::WireFormatLite::MessageSize(*_impl_.result_id_);
-    }
-
-    // .io.deephaven.proto.backplane.grpc.TableReference source_id = 2;
-    if (cached_has_bits & 0x00000002u) {
-      total_size +=
-          1 + ::google::protobuf::internal::WireFormatLite::MessageSize(*_impl_.source_id_);
-    }
-
-    // .io.deephaven.proto.backplane.grpc.RunChartDownsampleRequest.ZoomRange zoom_range = 4;
-    if (cached_has_bits & 0x00000004u) {
-      total_size +=
-          1 + ::google::protobuf::internal::WireFormatLite::MessageSize(*_impl_.zoom_range_);
-    }
-
-  }
-  // int32 pixel_count = 3;
-  if (this->_internal_pixel_count() != 0) {
-    total_size += ::_pbi::WireFormatLite::Int32SizePlusOne(
-        this->_internal_pixel_count());
-  }
-
-  return MaybeComputeUnknownFieldsSize(total_size, &_impl_._cached_size_);
-}
-
-const ::google::protobuf::Message::ClassData RunChartDownsampleRequest::_class_data_ = {
-    RunChartDownsampleRequest::MergeImpl,
-    nullptr,  // OnDemandRegisterArenaDtor
-};
-const ::google::protobuf::Message::ClassData* RunChartDownsampleRequest::GetClassData() const {
-  return &_class_data_;
-}
-
-void RunChartDownsampleRequest::MergeImpl(::google::protobuf::Message& to_msg, const ::google::protobuf::Message& from_msg) {
-  auto* const _this = static_cast<RunChartDownsampleRequest*>(&to_msg);
-  auto& from = static_cast<const RunChartDownsampleRequest&>(from_msg);
-  // @@protoc_insertion_point(class_specific_merge_from_start:io.deephaven.proto.backplane.grpc.RunChartDownsampleRequest)
-  ABSL_DCHECK_NE(&from, _this);
-  ::uint32_t cached_has_bits = 0;
-  (void) cached_has_bits;
-
-  _this->_internal_mutable_y_column_names()->MergeFrom(from._internal_y_column_names());
-  if (!from._internal_x_column_name().empty()) {
-    _this->_internal_set_x_column_name(from._internal_x_column_name());
-  }
-  cached_has_bits = from._impl_._has_bits_[0];
-  if (cached_has_bits & 0x00000007u) {
-    if (cached_has_bits & 0x00000001u) {
-      _this->_internal_mutable_result_id()->::io::deephaven::proto::backplane::grpc::Ticket::MergeFrom(
-          from._internal_result_id());
-    }
-    if (cached_has_bits & 0x00000002u) {
-      _this->_internal_mutable_source_id()->::io::deephaven::proto::backplane::grpc::TableReference::MergeFrom(
-          from._internal_source_id());
-    }
-    if (cached_has_bits & 0x00000004u) {
-      _this->_internal_mutable_zoom_range()->::io::deephaven::proto::backplane::grpc::RunChartDownsampleRequest_ZoomRange::MergeFrom(
-          from._internal_zoom_range());
-    }
-  }
-  if (from._internal_pixel_count() != 0) {
-    _this->_internal_set_pixel_count(from._internal_pixel_count());
-  }
-  _this->_internal_metadata_.MergeFrom<::google::protobuf::UnknownFieldSet>(from._internal_metadata_);
-}
-
-void RunChartDownsampleRequest::CopyFrom(const RunChartDownsampleRequest& from) {
-// @@protoc_insertion_point(class_specific_copy_from_start:io.deephaven.proto.backplane.grpc.RunChartDownsampleRequest)
-  if (&from == this) return;
-  Clear();
-  MergeFrom(from);
-}
-
-PROTOBUF_NOINLINE bool RunChartDownsampleRequest::IsInitialized() const {
-  return true;
-}
-
-::_pbi::CachedSize* RunChartDownsampleRequest::AccessCachedSize() const {
-  return &_impl_._cached_size_;
-}
-void RunChartDownsampleRequest::InternalSwap(RunChartDownsampleRequest* PROTOBUF_RESTRICT other) {
-  using std::swap;
-  auto* arena = GetArena();
-  ABSL_DCHECK_EQ(arena, other->GetArena());
-  _internal_metadata_.InternalSwap(&other->_internal_metadata_);
-  swap(_impl_._has_bits_[0], other->_impl_._has_bits_[0]);
-  _impl_.y_column_names_.InternalSwap(&other->_impl_.y_column_names_);
-  ::_pbi::ArenaStringPtr::InternalSwap(&_impl_.x_column_name_, &other->_impl_.x_column_name_, arena);
-  ::google::protobuf::internal::memswap<
-      PROTOBUF_FIELD_OFFSET(RunChartDownsampleRequest, _impl_.pixel_count_)
-      + sizeof(RunChartDownsampleRequest::_impl_.pixel_count_)
-      - PROTOBUF_FIELD_OFFSET(RunChartDownsampleRequest, _impl_.result_id_)>(
-          reinterpret_cast<char*>(&_impl_.result_id_),
-          reinterpret_cast<char*>(&other->_impl_.result_id_));
-}
-
-::google::protobuf::Metadata RunChartDownsampleRequest::GetMetadata() const {
-  return ::_pbi::AssignDescriptors(
-      &descriptor_table_deephaven_2fproto_2ftable_2eproto_getter, &descriptor_table_deephaven_2fproto_2ftable_2eproto_once,
-      file_level_metadata_deephaven_2fproto_2ftable_2eproto[114]);
-}
-// ===================================================================
-
-class CreateInputTableRequest_InputTableKind_InMemoryAppendOnly::_Internal {
- public:
-};
-
-CreateInputTableRequest_InputTableKind_InMemoryAppendOnly::CreateInputTableRequest_InputTableKind_InMemoryAppendOnly(::google::protobuf::Arena* arena)
-    : ::google::protobuf::internal::ZeroFieldsBase(arena) {
-  // @@protoc_insertion_point(arena_constructor:io.deephaven.proto.backplane.grpc.CreateInputTableRequest.InputTableKind.InMemoryAppendOnly)
-}
-CreateInputTableRequest_InputTableKind_InMemoryAppendOnly::CreateInputTableRequest_InputTableKind_InMemoryAppendOnly(
-    ::google::protobuf::Arena* arena,
-    const CreateInputTableRequest_InputTableKind_InMemoryAppendOnly& from)
-    : ::google::protobuf::internal::ZeroFieldsBase(arena) {
-  CreateInputTableRequest_InputTableKind_InMemoryAppendOnly* const _this = this;
-  (void)_this;
-  _internal_metadata_.MergeFrom<::google::protobuf::UnknownFieldSet>(
-      from._internal_metadata_);
-
-  // @@protoc_insertion_point(copy_constructor:io.deephaven.proto.backplane.grpc.CreateInputTableRequest.InputTableKind.InMemoryAppendOnly)
-}
-
-
-
-
-
-
-
-
-
-::google::protobuf::Metadata CreateInputTableRequest_InputTableKind_InMemoryAppendOnly::GetMetadata() const {
-  return ::_pbi::AssignDescriptors(
-      &descriptor_table_deephaven_2fproto_2ftable_2eproto_getter, &descriptor_table_deephaven_2fproto_2ftable_2eproto_once,
-      file_level_metadata_deephaven_2fproto_2ftable_2eproto[115]);
-}
-// ===================================================================
-
-class CreateInputTableRequest_InputTableKind_InMemoryKeyBacked::_Internal {
- public:
-};
-
-CreateInputTableRequest_InputTableKind_InMemoryKeyBacked::CreateInputTableRequest_InputTableKind_InMemoryKeyBacked(::google::protobuf::Arena* arena)
-    : ::google::protobuf::Message(arena) {
-  SharedCtor(arena);
-  // @@protoc_insertion_point(arena_constructor:io.deephaven.proto.backplane.grpc.CreateInputTableRequest.InputTableKind.InMemoryKeyBacked)
-}
-inline PROTOBUF_NDEBUG_INLINE CreateInputTableRequest_InputTableKind_InMemoryKeyBacked::Impl_::Impl_(
-    ::google::protobuf::internal::InternalVisibility visibility, ::google::protobuf::Arena* arena,
-    const Impl_& from)
-      : key_columns_{visibility, arena, from.key_columns_},
-        _cached_size_{0} {}
-
-CreateInputTableRequest_InputTableKind_InMemoryKeyBacked::CreateInputTableRequest_InputTableKind_InMemoryKeyBacked(
-    ::google::protobuf::Arena* arena,
-    const CreateInputTableRequest_InputTableKind_InMemoryKeyBacked& from)
-    : ::google::protobuf::Message(arena) {
-  CreateInputTableRequest_InputTableKind_InMemoryKeyBacked* const _this = this;
-  (void)_this;
-  _internal_metadata_.MergeFrom<::google::protobuf::UnknownFieldSet>(
-      from._internal_metadata_);
-  new (&_impl_) Impl_(internal_visibility(), arena, from._impl_);
-
-  // @@protoc_insertion_point(copy_constructor:io.deephaven.proto.backplane.grpc.CreateInputTableRequest.InputTableKind.InMemoryKeyBacked)
-}
-inline PROTOBUF_NDEBUG_INLINE CreateInputTableRequest_InputTableKind_InMemoryKeyBacked::Impl_::Impl_(
-    ::google::protobuf::internal::InternalVisibility visibility,
-    ::google::protobuf::Arena* arena)
-      : key_columns_{visibility, arena},
-        _cached_size_{0} {}
-
-inline void CreateInputTableRequest_InputTableKind_InMemoryKeyBacked::SharedCtor(::_pb::Arena* arena) {
-  new (&_impl_) Impl_(internal_visibility(), arena);
-}
-CreateInputTableRequest_InputTableKind_InMemoryKeyBacked::~CreateInputTableRequest_InputTableKind_InMemoryKeyBacked() {
-  // @@protoc_insertion_point(destructor:io.deephaven.proto.backplane.grpc.CreateInputTableRequest.InputTableKind.InMemoryKeyBacked)
-  _internal_metadata_.Delete<::google::protobuf::UnknownFieldSet>();
-  SharedDtor();
-}
-inline void CreateInputTableRequest_InputTableKind_InMemoryKeyBacked::SharedDtor() {
-  ABSL_DCHECK(GetArena() == nullptr);
-  _impl_.~Impl_();
-}
-
-PROTOBUF_NOINLINE void CreateInputTableRequest_InputTableKind_InMemoryKeyBacked::Clear() {
-// @@protoc_insertion_point(message_clear_start:io.deephaven.proto.backplane.grpc.CreateInputTableRequest.InputTableKind.InMemoryKeyBacked)
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  ::uint32_t cached_has_bits = 0;
-  // Prevent compiler warnings about cached_has_bits being unused
-  (void) cached_has_bits;
-
-  _impl_.key_columns_.Clear();
-  _internal_metadata_.Clear<::google::protobuf::UnknownFieldSet>();
-}
-
-const char* CreateInputTableRequest_InputTableKind_InMemoryKeyBacked::_InternalParse(
-    const char* ptr, ::_pbi::ParseContext* ctx) {
-  ptr = ::_pbi::TcParser::ParseLoop(this, ptr, ctx, &_table_.header);
-  return ptr;
-}
-
-
-PROTOBUF_CONSTINIT PROTOBUF_ATTRIBUTE_INIT_PRIORITY1
-const ::_pbi::TcParseTable<0, 1, 0, 110, 2> CreateInputTableRequest_InputTableKind_InMemoryKeyBacked::_table_ = {
-  {
-    0,  // no _has_bits_
-    0, // no _extensions_
-    1, 0,  // max_field_number, fast_idx_mask
-    offsetof(decltype(_table_), field_lookup_table),
-    4294967294,  // skipmap
-    offsetof(decltype(_table_), field_entries),
-    1,  // num_field_entries
-    0,  // num_aux_entries
-    offsetof(decltype(_table_), field_names),  // no aux_entries
-    &_CreateInputTableRequest_InputTableKind_InMemoryKeyBacked_default_instance_._instance,
-    ::_pbi::TcParser::GenericFallback,  // fallback
-  }, {{
-    // repeated string key_columns = 1;
-    {::_pbi::TcParser::FastUR1,
-     {10, 63, 0, PROTOBUF_FIELD_OFFSET(CreateInputTableRequest_InputTableKind_InMemoryKeyBacked, _impl_.key_columns_)}},
-  }}, {{
-    65535, 65535
-  }}, {{
-    // repeated string key_columns = 1;
-    {PROTOBUF_FIELD_OFFSET(CreateInputTableRequest_InputTableKind_InMemoryKeyBacked, _impl_.key_columns_), 0, 0,
-    (0 | ::_fl::kFcRepeated | ::_fl::kUtf8String | ::_fl::kRepSString)},
-  }},
-  // no aux_entries
-  {{
-    "\132\13\0\0\0\0\0\0"
-    "io.deephaven.proto.backplane.grpc.CreateInputTableRequest.InputTableKind.InMemoryKeyBacked"
-    "key_columns"
-  }},
-};
-
-::uint8_t* CreateInputTableRequest_InputTableKind_InMemoryKeyBacked::_InternalSerialize(
-    ::uint8_t* target,
-    ::google::protobuf::io::EpsCopyOutputStream* stream) const {
-  // @@protoc_insertion_point(serialize_to_array_start:io.deephaven.proto.backplane.grpc.CreateInputTableRequest.InputTableKind.InMemoryKeyBacked)
-  ::uint32_t cached_has_bits = 0;
-  (void)cached_has_bits;
-
-  // repeated string key_columns = 1;
-  for (int i = 0, n = this->_internal_key_columns_size(); i < n; ++i) {
-    const auto& s = this->_internal_key_columns().Get(i);
-    ::google::protobuf::internal::WireFormatLite::VerifyUtf8String(
-        s.data(), static_cast<int>(s.length()), ::google::protobuf::internal::WireFormatLite::SERIALIZE, "io.deephaven.proto.backplane.grpc.CreateInputTableRequest.InputTableKind.InMemoryKeyBacked.key_columns");
-    target = stream->WriteString(1, s, target);
-  }
-
-  if (PROTOBUF_PREDICT_FALSE(_internal_metadata_.have_unknown_fields())) {
-    target =
-        ::_pbi::WireFormat::InternalSerializeUnknownFieldsToArray(
-            _internal_metadata_.unknown_fields<::google::protobuf::UnknownFieldSet>(::google::protobuf::UnknownFieldSet::default_instance), target, stream);
-  }
-  // @@protoc_insertion_point(serialize_to_array_end:io.deephaven.proto.backplane.grpc.CreateInputTableRequest.InputTableKind.InMemoryKeyBacked)
-  return target;
-}
-
-::size_t CreateInputTableRequest_InputTableKind_InMemoryKeyBacked::ByteSizeLong() const {
-// @@protoc_insertion_point(message_byte_size_start:io.deephaven.proto.backplane.grpc.CreateInputTableRequest.InputTableKind.InMemoryKeyBacked)
-  ::size_t total_size = 0;
-
-  ::uint32_t cached_has_bits = 0;
-  // Prevent compiler warnings about cached_has_bits being unused
-  (void) cached_has_bits;
-
-  // repeated string key_columns = 1;
-  total_size += 1 * ::google::protobuf::internal::FromIntSize(_internal_key_columns().size());
-  for (int i = 0, n = _internal_key_columns().size(); i < n; ++i) {
-    total_size += ::google::protobuf::internal::WireFormatLite::StringSize(
-        _internal_key_columns().Get(i));
-  }
-  return MaybeComputeUnknownFieldsSize(total_size, &_impl_._cached_size_);
-}
-
-const ::google::protobuf::Message::ClassData CreateInputTableRequest_InputTableKind_InMemoryKeyBacked::_class_data_ = {
-    CreateInputTableRequest_InputTableKind_InMemoryKeyBacked::MergeImpl,
-    nullptr,  // OnDemandRegisterArenaDtor
-};
-const ::google::protobuf::Message::ClassData* CreateInputTableRequest_InputTableKind_InMemoryKeyBacked::GetClassData() const {
-  return &_class_data_;
-}
-
-void CreateInputTableRequest_InputTableKind_InMemoryKeyBacked::MergeImpl(::google::protobuf::Message& to_msg, const ::google::protobuf::Message& from_msg) {
-  auto* const _this = static_cast<CreateInputTableRequest_InputTableKind_InMemoryKeyBacked*>(&to_msg);
-  auto& from = static_cast<const CreateInputTableRequest_InputTableKind_InMemoryKeyBacked&>(from_msg);
-  // @@protoc_insertion_point(class_specific_merge_from_start:io.deephaven.proto.backplane.grpc.CreateInputTableRequest.InputTableKind.InMemoryKeyBacked)
-  ABSL_DCHECK_NE(&from, _this);
-  ::uint32_t cached_has_bits = 0;
-  (void) cached_has_bits;
-
-  _this->_internal_mutable_key_columns()->MergeFrom(from._internal_key_columns());
-  _this->_internal_metadata_.MergeFrom<::google::protobuf::UnknownFieldSet>(from._internal_metadata_);
-}
-
-void CreateInputTableRequest_InputTableKind_InMemoryKeyBacked::CopyFrom(const CreateInputTableRequest_InputTableKind_InMemoryKeyBacked& from) {
-// @@protoc_insertion_point(class_specific_copy_from_start:io.deephaven.proto.backplane.grpc.CreateInputTableRequest.InputTableKind.InMemoryKeyBacked)
-  if (&from == this) return;
-  Clear();
-  MergeFrom(from);
-}
-
-PROTOBUF_NOINLINE bool CreateInputTableRequest_InputTableKind_InMemoryKeyBacked::IsInitialized() const {
-  return true;
-}
-
-::_pbi::CachedSize* CreateInputTableRequest_InputTableKind_InMemoryKeyBacked::AccessCachedSize() const {
-  return &_impl_._cached_size_;
-}
-void CreateInputTableRequest_InputTableKind_InMemoryKeyBacked::InternalSwap(CreateInputTableRequest_InputTableKind_InMemoryKeyBacked* PROTOBUF_RESTRICT other) {
-  using std::swap;
-  _internal_metadata_.InternalSwap(&other->_internal_metadata_);
-  _impl_.key_columns_.InternalSwap(&other->_impl_.key_columns_);
-}
-
-::google::protobuf::Metadata CreateInputTableRequest_InputTableKind_InMemoryKeyBacked::GetMetadata() const {
-  return ::_pbi::AssignDescriptors(
-      &descriptor_table_deephaven_2fproto_2ftable_2eproto_getter, &descriptor_table_deephaven_2fproto_2ftable_2eproto_once,
-      file_level_metadata_deephaven_2fproto_2ftable_2eproto[116]);
-}
-// ===================================================================
-
-class CreateInputTableRequest_InputTableKind_Blink::_Internal {
- public:
-};
-
-CreateInputTableRequest_InputTableKind_Blink::CreateInputTableRequest_InputTableKind_Blink(::google::protobuf::Arena* arena)
-    : ::google::protobuf::internal::ZeroFieldsBase(arena) {
-  // @@protoc_insertion_point(arena_constructor:io.deephaven.proto.backplane.grpc.CreateInputTableRequest.InputTableKind.Blink)
-}
-CreateInputTableRequest_InputTableKind_Blink::CreateInputTableRequest_InputTableKind_Blink(
-    ::google::protobuf::Arena* arena,
-    const CreateInputTableRequest_InputTableKind_Blink& from)
-    : ::google::protobuf::internal::ZeroFieldsBase(arena) {
-  CreateInputTableRequest_InputTableKind_Blink* const _this = this;
-  (void)_this;
-  _internal_metadata_.MergeFrom<::google::protobuf::UnknownFieldSet>(
-      from._internal_metadata_);
-
-  // @@protoc_insertion_point(copy_constructor:io.deephaven.proto.backplane.grpc.CreateInputTableRequest.InputTableKind.Blink)
-}
-
-
-
-
-
-
-
-
-
-::google::protobuf::Metadata CreateInputTableRequest_InputTableKind_Blink::GetMetadata() const {
-  return ::_pbi::AssignDescriptors(
-      &descriptor_table_deephaven_2fproto_2ftable_2eproto_getter, &descriptor_table_deephaven_2fproto_2ftable_2eproto_once,
-      file_level_metadata_deephaven_2fproto_2ftable_2eproto[117]);
-}
-// ===================================================================
-
-class CreateInputTableRequest_InputTableKind::_Internal {
- public:
-  static constexpr ::int32_t kOneofCaseOffset =
-    PROTOBUF_FIELD_OFFSET(::io::deephaven::proto::backplane::grpc::CreateInputTableRequest_InputTableKind, _impl_._oneof_case_);
-  static const ::io::deephaven::proto::backplane::grpc::CreateInputTableRequest_InputTableKind_InMemoryAppendOnly& in_memory_append_only(const CreateInputTableRequest_InputTableKind* msg);
-  static const ::io::deephaven::proto::backplane::grpc::CreateInputTableRequest_InputTableKind_InMemoryKeyBacked& in_memory_key_backed(const CreateInputTableRequest_InputTableKind* msg);
-  static const ::io::deephaven::proto::backplane::grpc::CreateInputTableRequest_InputTableKind_Blink& blink(const CreateInputTableRequest_InputTableKind* msg);
-};
-
-const ::io::deephaven::proto::backplane::grpc::CreateInputTableRequest_InputTableKind_InMemoryAppendOnly& CreateInputTableRequest_InputTableKind::_Internal::in_memory_append_only(const CreateInputTableRequest_InputTableKind* msg) {
-  return *msg->_impl_.kind_.in_memory_append_only_;
-}
-const ::io::deephaven::proto::backplane::grpc::CreateInputTableRequest_InputTableKind_InMemoryKeyBacked& CreateInputTableRequest_InputTableKind::_Internal::in_memory_key_backed(const CreateInputTableRequest_InputTableKind* msg) {
-  return *msg->_impl_.kind_.in_memory_key_backed_;
-}
-const ::io::deephaven::proto::backplane::grpc::CreateInputTableRequest_InputTableKind_Blink& CreateInputTableRequest_InputTableKind::_Internal::blink(const CreateInputTableRequest_InputTableKind* msg) {
-  return *msg->_impl_.kind_.blink_;
-}
-void CreateInputTableRequest_InputTableKind::set_allocated_in_memory_append_only(::io::deephaven::proto::backplane::grpc::CreateInputTableRequest_InputTableKind_InMemoryAppendOnly* in_memory_append_only) {
-  ::google::protobuf::Arena* message_arena = GetArena();
-  clear_kind();
-  if (in_memory_append_only) {
-    ::google::protobuf::Arena* submessage_arena = in_memory_append_only->GetArena();
-    if (message_arena != submessage_arena) {
-      in_memory_append_only = ::google::protobuf::internal::GetOwnedMessage(message_arena, in_memory_append_only, submessage_arena);
-    }
-    set_has_in_memory_append_only();
-    _impl_.kind_.in_memory_append_only_ = in_memory_append_only;
-  }
-  // @@protoc_insertion_point(field_set_allocated:io.deephaven.proto.backplane.grpc.CreateInputTableRequest.InputTableKind.in_memory_append_only)
-}
-void CreateInputTableRequest_InputTableKind::set_allocated_in_memory_key_backed(::io::deephaven::proto::backplane::grpc::CreateInputTableRequest_InputTableKind_InMemoryKeyBacked* in_memory_key_backed) {
-  ::google::protobuf::Arena* message_arena = GetArena();
-  clear_kind();
-  if (in_memory_key_backed) {
-    ::google::protobuf::Arena* submessage_arena = in_memory_key_backed->GetArena();
-    if (message_arena != submessage_arena) {
-      in_memory_key_backed = ::google::protobuf::internal::GetOwnedMessage(message_arena, in_memory_key_backed, submessage_arena);
-    }
-    set_has_in_memory_key_backed();
-    _impl_.kind_.in_memory_key_backed_ = in_memory_key_backed;
-  }
-  // @@protoc_insertion_point(field_set_allocated:io.deephaven.proto.backplane.grpc.CreateInputTableRequest.InputTableKind.in_memory_key_backed)
-}
-void CreateInputTableRequest_InputTableKind::set_allocated_blink(::io::deephaven::proto::backplane::grpc::CreateInputTableRequest_InputTableKind_Blink* blink) {
-  ::google::protobuf::Arena* message_arena = GetArena();
-  clear_kind();
-  if (blink) {
-    ::google::protobuf::Arena* submessage_arena = blink->GetArena();
-    if (message_arena != submessage_arena) {
-      blink = ::google::protobuf::internal::GetOwnedMessage(message_arena, blink, submessage_arena);
-    }
-    set_has_blink();
-    _impl_.kind_.blink_ = blink;
-  }
-  // @@protoc_insertion_point(field_set_allocated:io.deephaven.proto.backplane.grpc.CreateInputTableRequest.InputTableKind.blink)
-}
-CreateInputTableRequest_InputTableKind::CreateInputTableRequest_InputTableKind(::google::protobuf::Arena* arena)
-    : ::google::protobuf::Message(arena) {
-  SharedCtor(arena);
-  // @@protoc_insertion_point(arena_constructor:io.deephaven.proto.backplane.grpc.CreateInputTableRequest.InputTableKind)
-}
-inline PROTOBUF_NDEBUG_INLINE CreateInputTableRequest_InputTableKind::Impl_::Impl_(
-    ::google::protobuf::internal::InternalVisibility visibility, ::google::protobuf::Arena* arena,
-    const Impl_& from)
-      : kind_{},
-        _cached_size_{0},
-        _oneof_case_{from._oneof_case_[0]} {}
-
-CreateInputTableRequest_InputTableKind::CreateInputTableRequest_InputTableKind(
-    ::google::protobuf::Arena* arena,
-    const CreateInputTableRequest_InputTableKind& from)
-    : ::google::protobuf::Message(arena) {
-  CreateInputTableRequest_InputTableKind* const _this = this;
-  (void)_this;
-  _internal_metadata_.MergeFrom<::google::protobuf::UnknownFieldSet>(
-      from._internal_metadata_);
-  new (&_impl_) Impl_(internal_visibility(), arena, from._impl_);
-  switch (kind_case()) {
-    case KIND_NOT_SET:
-      break;
-      case kInMemoryAppendOnly:
-        _impl_.kind_.in_memory_append_only_ = CreateMaybeMessage<::io::deephaven::proto::backplane::grpc::CreateInputTableRequest_InputTableKind_InMemoryAppendOnly>(arena, *from._impl_.kind_.in_memory_append_only_);
-        break;
-      case kInMemoryKeyBacked:
-        _impl_.kind_.in_memory_key_backed_ = CreateMaybeMessage<::io::deephaven::proto::backplane::grpc::CreateInputTableRequest_InputTableKind_InMemoryKeyBacked>(arena, *from._impl_.kind_.in_memory_key_backed_);
-        break;
-      case kBlink:
-        _impl_.kind_.blink_ = CreateMaybeMessage<::io::deephaven::proto::backplane::grpc::CreateInputTableRequest_InputTableKind_Blink>(arena, *from._impl_.kind_.blink_);
-        break;
-  }
-
-  // @@protoc_insertion_point(copy_constructor:io.deephaven.proto.backplane.grpc.CreateInputTableRequest.InputTableKind)
-}
-inline PROTOBUF_NDEBUG_INLINE CreateInputTableRequest_InputTableKind::Impl_::Impl_(
-    ::google::protobuf::internal::InternalVisibility visibility,
-    ::google::protobuf::Arena* arena)
-      : kind_{},
-        _cached_size_{0},
-        _oneof_case_{} {}
-
-inline void CreateInputTableRequest_InputTableKind::SharedCtor(::_pb::Arena* arena) {
-  new (&_impl_) Impl_(internal_visibility(), arena);
-}
-CreateInputTableRequest_InputTableKind::~CreateInputTableRequest_InputTableKind() {
-  // @@protoc_insertion_point(destructor:io.deephaven.proto.backplane.grpc.CreateInputTableRequest.InputTableKind)
-  _internal_metadata_.Delete<::google::protobuf::UnknownFieldSet>();
-  SharedDtor();
-}
-inline void CreateInputTableRequest_InputTableKind::SharedDtor() {
-  ABSL_DCHECK(GetArena() == nullptr);
-  if (has_kind()) {
-    clear_kind();
-  }
-  _impl_.~Impl_();
-}
-
-void CreateInputTableRequest_InputTableKind::clear_kind() {
-// @@protoc_insertion_point(one_of_clear_start:io.deephaven.proto.backplane.grpc.CreateInputTableRequest.InputTableKind)
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  switch (kind_case()) {
-    case kInMemoryAppendOnly: {
-      if (GetArena() == nullptr) {
-        delete _impl_.kind_.in_memory_append_only_;
-      }
-      break;
-    }
-    case kInMemoryKeyBacked: {
-      if (GetArena() == nullptr) {
-        delete _impl_.kind_.in_memory_key_backed_;
-      }
-      break;
-    }
-    case kBlink: {
-      if (GetArena() == nullptr) {
-        delete _impl_.kind_.blink_;
-      }
-      break;
-    }
-    case KIND_NOT_SET: {
-      break;
-    }
-  }
-  _impl_._oneof_case_[0] = KIND_NOT_SET;
-}
-
-
-PROTOBUF_NOINLINE void CreateInputTableRequest_InputTableKind::Clear() {
-// @@protoc_insertion_point(message_clear_start:io.deephaven.proto.backplane.grpc.CreateInputTableRequest.InputTableKind)
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  ::uint32_t cached_has_bits = 0;
-  // Prevent compiler warnings about cached_has_bits being unused
-  (void) cached_has_bits;
-
-  clear_kind();
-  _internal_metadata_.Clear<::google::protobuf::UnknownFieldSet>();
-}
-
-const char* CreateInputTableRequest_InputTableKind::_InternalParse(
-    const char* ptr, ::_pbi::ParseContext* ctx) {
-  ptr = ::_pbi::TcParser::ParseLoop(this, ptr, ctx, &_table_.header);
-  return ptr;
-}
-
-
-PROTOBUF_CONSTINIT PROTOBUF_ATTRIBUTE_INIT_PRIORITY1
-const ::_pbi::TcParseTable<0, 3, 3, 0, 2> CreateInputTableRequest_InputTableKind::_table_ = {
-  {
-    0,  // no _has_bits_
-    0, // no _extensions_
-    3, 0,  // max_field_number, fast_idx_mask
-    offsetof(decltype(_table_), field_lookup_table),
-    4294967288,  // skipmap
-    offsetof(decltype(_table_), field_entries),
-    3,  // num_field_entries
-    3,  // num_aux_entries
-    offsetof(decltype(_table_), aux_entries),
-    &_CreateInputTableRequest_InputTableKind_default_instance_._instance,
-    ::_pbi::TcParser::GenericFallback,  // fallback
-  }, {{
-    {::_pbi::TcParser::MiniParse, {}},
-  }}, {{
-    65535, 65535
-  }}, {{
-    // .io.deephaven.proto.backplane.grpc.CreateInputTableRequest.InputTableKind.InMemoryAppendOnly in_memory_append_only = 1;
-    {PROTOBUF_FIELD_OFFSET(CreateInputTableRequest_InputTableKind, _impl_.kind_.in_memory_append_only_), _Internal::kOneofCaseOffset + 0, 0,
-    (0 | ::_fl::kFcOneof | ::_fl::kMessage | ::_fl::kTvDefault)},
-    // .io.deephaven.proto.backplane.grpc.CreateInputTableRequest.InputTableKind.InMemoryKeyBacked in_memory_key_backed = 2;
-    {PROTOBUF_FIELD_OFFSET(CreateInputTableRequest_InputTableKind, _impl_.kind_.in_memory_key_backed_), _Internal::kOneofCaseOffset + 0, 1,
-    (0 | ::_fl::kFcOneof | ::_fl::kMessage | ::_fl::kTvTable)},
-    // .io.deephaven.proto.backplane.grpc.CreateInputTableRequest.InputTableKind.Blink blink = 3;
-    {PROTOBUF_FIELD_OFFSET(CreateInputTableRequest_InputTableKind, _impl_.kind_.blink_), _Internal::kOneofCaseOffset + 0, 2,
-    (0 | ::_fl::kFcOneof | ::_fl::kMessage | ::_fl::kTvDefault)},
-  }}, {{
-    {::_pbi::FieldAuxDefaultMessage{}, &::io::deephaven::proto::backplane::grpc::_CreateInputTableRequest_InputTableKind_InMemoryAppendOnly_default_instance_},
-    {::_pbi::TcParser::GetTable<::io::deephaven::proto::backplane::grpc::CreateInputTableRequest_InputTableKind_InMemoryKeyBacked>()},
-    {::_pbi::FieldAuxDefaultMessage{}, &::io::deephaven::proto::backplane::grpc::_CreateInputTableRequest_InputTableKind_Blink_default_instance_},
-  }}, {{
-  }},
-};
-
-::uint8_t* CreateInputTableRequest_InputTableKind::_InternalSerialize(
-    ::uint8_t* target,
-    ::google::protobuf::io::EpsCopyOutputStream* stream) const {
-  // @@protoc_insertion_point(serialize_to_array_start:io.deephaven.proto.backplane.grpc.CreateInputTableRequest.InputTableKind)
-  ::uint32_t cached_has_bits = 0;
-  (void)cached_has_bits;
-
-  switch (kind_case()) {
-    case kInMemoryAppendOnly: {
-      target = ::google::protobuf::internal::WireFormatLite::InternalWriteMessage(
-          1, _Internal::in_memory_append_only(this),
-          _Internal::in_memory_append_only(this).GetCachedSize(), target, stream);
-      break;
-    }
-    case kInMemoryKeyBacked: {
-      target = ::google::protobuf::internal::WireFormatLite::InternalWriteMessage(
-          2, _Internal::in_memory_key_backed(this),
-          _Internal::in_memory_key_backed(this).GetCachedSize(), target, stream);
-      break;
-    }
-    case kBlink: {
-      target = ::google::protobuf::internal::WireFormatLite::InternalWriteMessage(
-          3, _Internal::blink(this),
-          _Internal::blink(this).GetCachedSize(), target, stream);
-      break;
-    }
-    default:
-      break;
-  }
-  if (PROTOBUF_PREDICT_FALSE(_internal_metadata_.have_unknown_fields())) {
-    target =
-        ::_pbi::WireFormat::InternalSerializeUnknownFieldsToArray(
-            _internal_metadata_.unknown_fields<::google::protobuf::UnknownFieldSet>(::google::protobuf::UnknownFieldSet::default_instance), target, stream);
-  }
-  // @@protoc_insertion_point(serialize_to_array_end:io.deephaven.proto.backplane.grpc.CreateInputTableRequest.InputTableKind)
-  return target;
-}
-
-::size_t CreateInputTableRequest_InputTableKind::ByteSizeLong() const {
-// @@protoc_insertion_point(message_byte_size_start:io.deephaven.proto.backplane.grpc.CreateInputTableRequest.InputTableKind)
-  ::size_t total_size = 0;
-
-  ::uint32_t cached_has_bits = 0;
-  // Prevent compiler warnings about cached_has_bits being unused
-  (void) cached_has_bits;
-
-  switch (kind_case()) {
-    // .io.deephaven.proto.backplane.grpc.CreateInputTableRequest.InputTableKind.InMemoryAppendOnly in_memory_append_only = 1;
-    case kInMemoryAppendOnly: {
-      total_size +=
-          1 + ::google::protobuf::internal::WireFormatLite::MessageSize(*_impl_.kind_.in_memory_append_only_);
-      break;
-    }
-    // .io.deephaven.proto.backplane.grpc.CreateInputTableRequest.InputTableKind.InMemoryKeyBacked in_memory_key_backed = 2;
-    case kInMemoryKeyBacked: {
-      total_size +=
-          1 + ::google::protobuf::internal::WireFormatLite::MessageSize(*_impl_.kind_.in_memory_key_backed_);
-      break;
-    }
-    // .io.deephaven.proto.backplane.grpc.CreateInputTableRequest.InputTableKind.Blink blink = 3;
-    case kBlink: {
-      total_size +=
-          1 + ::google::protobuf::internal::WireFormatLite::MessageSize(*_impl_.kind_.blink_);
-      break;
-    }
-    case KIND_NOT_SET: {
-      break;
-    }
-  }
-  return MaybeComputeUnknownFieldsSize(total_size, &_impl_._cached_size_);
-}
-
-const ::google::protobuf::Message::ClassData CreateInputTableRequest_InputTableKind::_class_data_ = {
-    CreateInputTableRequest_InputTableKind::MergeImpl,
-    nullptr,  // OnDemandRegisterArenaDtor
-};
-const ::google::protobuf::Message::ClassData* CreateInputTableRequest_InputTableKind::GetClassData() const {
-  return &_class_data_;
-}
-
-void CreateInputTableRequest_InputTableKind::MergeImpl(::google::protobuf::Message& to_msg, const ::google::protobuf::Message& from_msg) {
-  auto* const _this = static_cast<CreateInputTableRequest_InputTableKind*>(&to_msg);
-  auto& from = static_cast<const CreateInputTableRequest_InputTableKind&>(from_msg);
-  // @@protoc_insertion_point(class_specific_merge_from_start:io.deephaven.proto.backplane.grpc.CreateInputTableRequest.InputTableKind)
-  ABSL_DCHECK_NE(&from, _this);
-  ::uint32_t cached_has_bits = 0;
-  (void) cached_has_bits;
-
-  switch (from.kind_case()) {
-    case kInMemoryAppendOnly: {
-      _this->_internal_mutable_in_memory_append_only()->::io::deephaven::proto::backplane::grpc::CreateInputTableRequest_InputTableKind_InMemoryAppendOnly::MergeFrom(
-          from._internal_in_memory_append_only());
-      break;
-    }
-    case kInMemoryKeyBacked: {
-      _this->_internal_mutable_in_memory_key_backed()->::io::deephaven::proto::backplane::grpc::CreateInputTableRequest_InputTableKind_InMemoryKeyBacked::MergeFrom(
-          from._internal_in_memory_key_backed());
-      break;
-    }
-    case kBlink: {
-      _this->_internal_mutable_blink()->::io::deephaven::proto::backplane::grpc::CreateInputTableRequest_InputTableKind_Blink::MergeFrom(
-          from._internal_blink());
-      break;
-    }
-    case KIND_NOT_SET: {
-      break;
-    }
-  }
-  _this->_internal_metadata_.MergeFrom<::google::protobuf::UnknownFieldSet>(from._internal_metadata_);
-}
-
-void CreateInputTableRequest_InputTableKind::CopyFrom(const CreateInputTableRequest_InputTableKind& from) {
-// @@protoc_insertion_point(class_specific_copy_from_start:io.deephaven.proto.backplane.grpc.CreateInputTableRequest.InputTableKind)
-  if (&from == this) return;
-  Clear();
-  MergeFrom(from);
-}
-
-PROTOBUF_NOINLINE bool CreateInputTableRequest_InputTableKind::IsInitialized() const {
-  return true;
-}
-
-::_pbi::CachedSize* CreateInputTableRequest_InputTableKind::AccessCachedSize() const {
-  return &_impl_._cached_size_;
-}
-void CreateInputTableRequest_InputTableKind::InternalSwap(CreateInputTableRequest_InputTableKind* PROTOBUF_RESTRICT other) {
-  using std::swap;
-  _internal_metadata_.InternalSwap(&other->_internal_metadata_);
-  swap(_impl_.kind_, other->_impl_.kind_);
-  swap(_impl_._oneof_case_[0], other->_impl_._oneof_case_[0]);
-}
-
-::google::protobuf::Metadata CreateInputTableRequest_InputTableKind::GetMetadata() const {
-  return ::_pbi::AssignDescriptors(
-      &descriptor_table_deephaven_2fproto_2ftable_2eproto_getter, &descriptor_table_deephaven_2fproto_2ftable_2eproto_once,
-      file_level_metadata_deephaven_2fproto_2ftable_2eproto[118]);
-}
-// ===================================================================
-
-class CreateInputTableRequest::_Internal {
- public:
-  using HasBits = decltype(std::declval<CreateInputTableRequest>()._impl_._has_bits_);
-  static constexpr ::int32_t kHasBitsOffset =
-    8 * PROTOBUF_FIELD_OFFSET(CreateInputTableRequest, _impl_._has_bits_);
-  static constexpr ::int32_t kOneofCaseOffset =
-    PROTOBUF_FIELD_OFFSET(::io::deephaven::proto::backplane::grpc::CreateInputTableRequest, _impl_._oneof_case_);
-  static const ::io::deephaven::proto::backplane::grpc::Ticket& result_id(const CreateInputTableRequest* msg);
-  static void set_has_result_id(HasBits* has_bits) {
-    (*has_bits)[0] |= 1u;
-  }
-  static const ::io::deephaven::proto::backplane::grpc::TableReference& source_table_id(const CreateInputTableRequest* msg);
-  static const ::io::deephaven::proto::backplane::grpc::CreateInputTableRequest_InputTableKind& kind(const CreateInputTableRequest* msg);
-  static void set_has_kind(HasBits* has_bits) {
-    (*has_bits)[0] |= 2u;
-  }
-};
-
-const ::io::deephaven::proto::backplane::grpc::Ticket& CreateInputTableRequest::_Internal::result_id(const CreateInputTableRequest* msg) {
-  return *msg->_impl_.result_id_;
-}
-const ::io::deephaven::proto::backplane::grpc::TableReference& CreateInputTableRequest::_Internal::source_table_id(const CreateInputTableRequest* msg) {
-  return *msg->_impl_.definition_.source_table_id_;
-}
-const ::io::deephaven::proto::backplane::grpc::CreateInputTableRequest_InputTableKind& CreateInputTableRequest::_Internal::kind(const CreateInputTableRequest* msg) {
-  return *msg->_impl_.kind_;
-}
-void CreateInputTableRequest::clear_result_id() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  if (_impl_.result_id_ != nullptr) _impl_.result_id_->Clear();
-  _impl_._has_bits_[0] &= ~0x00000001u;
-}
-void CreateInputTableRequest::set_allocated_source_table_id(::io::deephaven::proto::backplane::grpc::TableReference* source_table_id) {
-  ::google::protobuf::Arena* message_arena = GetArena();
-  clear_definition();
-  if (source_table_id) {
-    ::google::protobuf::Arena* submessage_arena = source_table_id->GetArena();
-    if (message_arena != submessage_arena) {
-      source_table_id = ::google::protobuf::internal::GetOwnedMessage(message_arena, source_table_id, submessage_arena);
-    }
-    set_has_source_table_id();
-    _impl_.definition_.source_table_id_ = source_table_id;
-  }
-  // @@protoc_insertion_point(field_set_allocated:io.deephaven.proto.backplane.grpc.CreateInputTableRequest.source_table_id)
-}
-CreateInputTableRequest::CreateInputTableRequest(::google::protobuf::Arena* arena)
-    : ::google::protobuf::Message(arena) {
-  SharedCtor(arena);
-  // @@protoc_insertion_point(arena_constructor:io.deephaven.proto.backplane.grpc.CreateInputTableRequest)
-}
-inline PROTOBUF_NDEBUG_INLINE CreateInputTableRequest::Impl_::Impl_(
-    ::google::protobuf::internal::InternalVisibility visibility, ::google::protobuf::Arena* arena,
-    const Impl_& from)
-      : _has_bits_{from._has_bits_},
-        _cached_size_{0},
-        definition_{},
-        _oneof_case_{from._oneof_case_[0]} {}
-
-CreateInputTableRequest::CreateInputTableRequest(
-    ::google::protobuf::Arena* arena,
-    const CreateInputTableRequest& from)
-    : ::google::protobuf::Message(arena) {
-  CreateInputTableRequest* const _this = this;
-  (void)_this;
-  _internal_metadata_.MergeFrom<::google::protobuf::UnknownFieldSet>(
-      from._internal_metadata_);
-  new (&_impl_) Impl_(internal_visibility(), arena, from._impl_);
-  ::uint32_t cached_has_bits = _impl_._has_bits_[0];
-  _impl_.result_id_ = (cached_has_bits & 0x00000001u)
-                ? CreateMaybeMessage<::io::deephaven::proto::backplane::grpc::Ticket>(arena, *from._impl_.result_id_)
-                : nullptr;
-  _impl_.kind_ = (cached_has_bits & 0x00000002u)
-                ? CreateMaybeMessage<::io::deephaven::proto::backplane::grpc::CreateInputTableRequest_InputTableKind>(arena, *from._impl_.kind_)
-                : nullptr;
-  switch (definition_case()) {
-    case DEFINITION_NOT_SET:
-      break;
-      case kSourceTableId:
-        _impl_.definition_.source_table_id_ = CreateMaybeMessage<::io::deephaven::proto::backplane::grpc::TableReference>(arena, *from._impl_.definition_.source_table_id_);
-        break;
-      case kSchema:
-        new (&_impl_.definition_.schema_) decltype(_impl_.definition_.schema_){arena, from._impl_.definition_.schema_};
-        break;
-  }
-
-  // @@protoc_insertion_point(copy_constructor:io.deephaven.proto.backplane.grpc.CreateInputTableRequest)
-}
-inline PROTOBUF_NDEBUG_INLINE CreateInputTableRequest::Impl_::Impl_(
-    ::google::protobuf::internal::InternalVisibility visibility,
-    ::google::protobuf::Arena* arena)
-      : _cached_size_{0},
-        definition_{},
-        _oneof_case_{} {}
-
-inline void CreateInputTableRequest::SharedCtor(::_pb::Arena* arena) {
-  new (&_impl_) Impl_(internal_visibility(), arena);
-  ::memset(reinterpret_cast<char *>(&_impl_) +
-               offsetof(Impl_, result_id_),
-           0,
-           offsetof(Impl_, kind_) -
-               offsetof(Impl_, result_id_) +
-               sizeof(Impl_::kind_));
-}
-CreateInputTableRequest::~CreateInputTableRequest() {
-  // @@protoc_insertion_point(destructor:io.deephaven.proto.backplane.grpc.CreateInputTableRequest)
-  _internal_metadata_.Delete<::google::protobuf::UnknownFieldSet>();
-  SharedDtor();
-}
-inline void CreateInputTableRequest::SharedDtor() {
-  ABSL_DCHECK(GetArena() == nullptr);
-  delete _impl_.result_id_;
-  delete _impl_.kind_;
-  if (has_definition()) {
-    clear_definition();
-  }
-  _impl_.~Impl_();
-}
-
-void CreateInputTableRequest::clear_definition() {
-// @@protoc_insertion_point(one_of_clear_start:io.deephaven.proto.backplane.grpc.CreateInputTableRequest)
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  switch (definition_case()) {
-    case kSourceTableId: {
-      if (GetArena() == nullptr) {
-        delete _impl_.definition_.source_table_id_;
-      }
-      break;
-    }
-    case kSchema: {
-      _impl_.definition_.schema_.Destroy();
-      break;
-    }
-    case DEFINITION_NOT_SET: {
-      break;
-    }
-  }
-  _impl_._oneof_case_[0] = DEFINITION_NOT_SET;
-}
-
-
-PROTOBUF_NOINLINE void CreateInputTableRequest::Clear() {
-// @@protoc_insertion_point(message_clear_start:io.deephaven.proto.backplane.grpc.CreateInputTableRequest)
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  ::uint32_t cached_has_bits = 0;
-  // Prevent compiler warnings about cached_has_bits being unused
-  (void) cached_has_bits;
-
-  cached_has_bits = _impl_._has_bits_[0];
-  if (cached_has_bits & 0x00000003u) {
-    if (cached_has_bits & 0x00000001u) {
-      ABSL_DCHECK(_impl_.result_id_ != nullptr);
-      _impl_.result_id_->Clear();
-    }
-    if (cached_has_bits & 0x00000002u) {
-      ABSL_DCHECK(_impl_.kind_ != nullptr);
-      _impl_.kind_->Clear();
-    }
-  }
-  clear_definition();
-  _impl_._has_bits_.Clear();
-  _internal_metadata_.Clear<::google::protobuf::UnknownFieldSet>();
-}
-
-const char* CreateInputTableRequest::_InternalParse(
-    const char* ptr, ::_pbi::ParseContext* ctx) {
-  ptr = ::_pbi::TcParser::ParseLoop(this, ptr, ctx, &_table_.header);
-  return ptr;
-}
-
-
-PROTOBUF_CONSTINIT PROTOBUF_ATTRIBUTE_INIT_PRIORITY1
-const ::_pbi::TcParseTable<1, 4, 3, 0, 2> CreateInputTableRequest::_table_ = {
-  {
-    PROTOBUF_FIELD_OFFSET(CreateInputTableRequest, _impl_._has_bits_),
-    0, // no _extensions_
-    4, 8,  // max_field_number, fast_idx_mask
-    offsetof(decltype(_table_), field_lookup_table),
-    4294967280,  // skipmap
-    offsetof(decltype(_table_), field_entries),
-    4,  // num_field_entries
-    3,  // num_aux_entries
-    offsetof(decltype(_table_), aux_entries),
-    &_CreateInputTableRequest_default_instance_._instance,
-    ::_pbi::TcParser::GenericFallback,  // fallback
-  }, {{
-    // .io.deephaven.proto.backplane.grpc.CreateInputTableRequest.InputTableKind kind = 4;
-    {::_pbi::TcParser::FastMtS1,
-     {34, 1, 2, PROTOBUF_FIELD_OFFSET(CreateInputTableRequest, _impl_.kind_)}},
-    // .io.deephaven.proto.backplane.grpc.Ticket result_id = 1;
-    {::_pbi::TcParser::FastMtS1,
-     {10, 0, 0, PROTOBUF_FIELD_OFFSET(CreateInputTableRequest, _impl_.result_id_)}},
-  }}, {{
-    65535, 65535
-  }}, {{
-    // .io.deephaven.proto.backplane.grpc.Ticket result_id = 1;
-    {PROTOBUF_FIELD_OFFSET(CreateInputTableRequest, _impl_.result_id_), _Internal::kHasBitsOffset + 0, 0,
-    (0 | ::_fl::kFcOptional | ::_fl::kMessage | ::_fl::kTvTable)},
-    // .io.deephaven.proto.backplane.grpc.TableReference source_table_id = 2;
-    {PROTOBUF_FIELD_OFFSET(CreateInputTableRequest, _impl_.definition_.source_table_id_), _Internal::kOneofCaseOffset + 0, 1,
-    (0 | ::_fl::kFcOneof | ::_fl::kMessage | ::_fl::kTvTable)},
-    // bytes schema = 3;
-    {PROTOBUF_FIELD_OFFSET(CreateInputTableRequest, _impl_.definition_.schema_), _Internal::kOneofCaseOffset + 0, 0,
-    (0 | ::_fl::kFcOneof | ::_fl::kBytes | ::_fl::kRepAString)},
-    // .io.deephaven.proto.backplane.grpc.CreateInputTableRequest.InputTableKind kind = 4;
-    {PROTOBUF_FIELD_OFFSET(CreateInputTableRequest, _impl_.kind_), _Internal::kHasBitsOffset + 1, 2,
-    (0 | ::_fl::kFcOptional | ::_fl::kMessage | ::_fl::kTvTable)},
-  }}, {{
-    {::_pbi::TcParser::GetTable<::io::deephaven::proto::backplane::grpc::Ticket>()},
-    {::_pbi::TcParser::GetTable<::io::deephaven::proto::backplane::grpc::TableReference>()},
-    {::_pbi::TcParser::GetTable<::io::deephaven::proto::backplane::grpc::CreateInputTableRequest_InputTableKind>()},
-  }}, {{
-  }},
-};
-
-::uint8_t* CreateInputTableRequest::_InternalSerialize(
-    ::uint8_t* target,
-    ::google::protobuf::io::EpsCopyOutputStream* stream) const {
-  // @@protoc_insertion_point(serialize_to_array_start:io.deephaven.proto.backplane.grpc.CreateInputTableRequest)
-  ::uint32_t cached_has_bits = 0;
-  (void)cached_has_bits;
-
-  cached_has_bits = _impl_._has_bits_[0];
-  // .io.deephaven.proto.backplane.grpc.Ticket result_id = 1;
-  if (cached_has_bits & 0x00000001u) {
-    target = ::google::protobuf::internal::WireFormatLite::InternalWriteMessage(
-        1, _Internal::result_id(this),
-        _Internal::result_id(this).GetCachedSize(), target, stream);
-  }
-
-  switch (definition_case()) {
-    case kSourceTableId: {
-      target = ::google::protobuf::internal::WireFormatLite::InternalWriteMessage(
-          2, _Internal::source_table_id(this),
-          _Internal::source_table_id(this).GetCachedSize(), target, stream);
-      break;
-    }
-    case kSchema: {
-      const std::string& _s = this->_internal_schema();
-      target = stream->WriteBytesMaybeAliased(3, _s, target);
-      break;
-    }
-    default:
-      break;
-  }
-  // .io.deephaven.proto.backplane.grpc.CreateInputTableRequest.InputTableKind kind = 4;
-  if (cached_has_bits & 0x00000002u) {
-    target = ::google::protobuf::internal::WireFormatLite::InternalWriteMessage(
-        4, _Internal::kind(this),
-        _Internal::kind(this).GetCachedSize(), target, stream);
-  }
-
-  if (PROTOBUF_PREDICT_FALSE(_internal_metadata_.have_unknown_fields())) {
-    target =
-        ::_pbi::WireFormat::InternalSerializeUnknownFieldsToArray(
-            _internal_metadata_.unknown_fields<::google::protobuf::UnknownFieldSet>(::google::protobuf::UnknownFieldSet::default_instance), target, stream);
-  }
-  // @@protoc_insertion_point(serialize_to_array_end:io.deephaven.proto.backplane.grpc.CreateInputTableRequest)
-  return target;
-}
-
-::size_t CreateInputTableRequest::ByteSizeLong() const {
-// @@protoc_insertion_point(message_byte_size_start:io.deephaven.proto.backplane.grpc.CreateInputTableRequest)
-  ::size_t total_size = 0;
-
-  ::uint32_t cached_has_bits = 0;
-  // Prevent compiler warnings about cached_has_bits being unused
-  (void) cached_has_bits;
-
-  cached_has_bits = _impl_._has_bits_[0];
-  if (cached_has_bits & 0x00000003u) {
-    // .io.deephaven.proto.backplane.grpc.Ticket result_id = 1;
-    if (cached_has_bits & 0x00000001u) {
-      total_size +=
-          1 + ::google::protobuf::internal::WireFormatLite::MessageSize(*_impl_.result_id_);
-    }
-
-    // .io.deephaven.proto.backplane.grpc.CreateInputTableRequest.InputTableKind kind = 4;
-    if (cached_has_bits & 0x00000002u) {
-      total_size +=
-          1 + ::google::protobuf::internal::WireFormatLite::MessageSize(*_impl_.kind_);
-    }
-
-  }
-  switch (definition_case()) {
-    // .io.deephaven.proto.backplane.grpc.TableReference source_table_id = 2;
-    case kSourceTableId: {
-      total_size +=
-          1 + ::google::protobuf::internal::WireFormatLite::MessageSize(*_impl_.definition_.source_table_id_);
-      break;
-    }
-    // bytes schema = 3;
-    case kSchema: {
-      total_size += 1 + ::google::protobuf::internal::WireFormatLite::BytesSize(
-                                      this->_internal_schema());
-      break;
-    }
-    case DEFINITION_NOT_SET: {
-      break;
-    }
-  }
-  return MaybeComputeUnknownFieldsSize(total_size, &_impl_._cached_size_);
-}
-
-const ::google::protobuf::Message::ClassData CreateInputTableRequest::_class_data_ = {
-    CreateInputTableRequest::MergeImpl,
-    nullptr,  // OnDemandRegisterArenaDtor
-};
-const ::google::protobuf::Message::ClassData* CreateInputTableRequest::GetClassData() const {
-  return &_class_data_;
-}
-
-void CreateInputTableRequest::MergeImpl(::google::protobuf::Message& to_msg, const ::google::protobuf::Message& from_msg) {
-  auto* const _this = static_cast<CreateInputTableRequest*>(&to_msg);
-  auto& from = static_cast<const CreateInputTableRequest&>(from_msg);
-  // @@protoc_insertion_point(class_specific_merge_from_start:io.deephaven.proto.backplane.grpc.CreateInputTableRequest)
-  ABSL_DCHECK_NE(&from, _this);
-  ::uint32_t cached_has_bits = 0;
-  (void) cached_has_bits;
-
-  cached_has_bits = from._impl_._has_bits_[0];
-  if (cached_has_bits & 0x00000003u) {
-    if (cached_has_bits & 0x00000001u) {
-      _this->_internal_mutable_result_id()->::io::deephaven::proto::backplane::grpc::Ticket::MergeFrom(
-          from._internal_result_id());
-    }
-    if (cached_has_bits & 0x00000002u) {
-      _this->_internal_mutable_kind()->::io::deephaven::proto::backplane::grpc::CreateInputTableRequest_InputTableKind::MergeFrom(
-          from._internal_kind());
-    }
-  }
-  switch (from.definition_case()) {
-    case kSourceTableId: {
-      _this->_internal_mutable_source_table_id()->::io::deephaven::proto::backplane::grpc::TableReference::MergeFrom(
-          from._internal_source_table_id());
-      break;
-    }
-    case kSchema: {
-      _this->_internal_set_schema(from._internal_schema());
-      break;
-    }
-    case DEFINITION_NOT_SET: {
-      break;
-    }
-  }
-  _this->_internal_metadata_.MergeFrom<::google::protobuf::UnknownFieldSet>(from._internal_metadata_);
-}
-
-void CreateInputTableRequest::CopyFrom(const CreateInputTableRequest& from) {
-// @@protoc_insertion_point(class_specific_copy_from_start:io.deephaven.proto.backplane.grpc.CreateInputTableRequest)
-  if (&from == this) return;
-  Clear();
-  MergeFrom(from);
-}
-
-PROTOBUF_NOINLINE bool CreateInputTableRequest::IsInitialized() const {
-  return true;
-}
-
-::_pbi::CachedSize* CreateInputTableRequest::AccessCachedSize() const {
-  return &_impl_._cached_size_;
-}
-void CreateInputTableRequest::InternalSwap(CreateInputTableRequest* PROTOBUF_RESTRICT other) {
-  using std::swap;
-  _internal_metadata_.InternalSwap(&other->_internal_metadata_);
-  swap(_impl_._has_bits_[0], other->_impl_._has_bits_[0]);
-  ::google::protobuf::internal::memswap<
-      PROTOBUF_FIELD_OFFSET(CreateInputTableRequest, _impl_.kind_)
-      + sizeof(CreateInputTableRequest::_impl_.kind_)
-      - PROTOBUF_FIELD_OFFSET(CreateInputTableRequest, _impl_.result_id_)>(
-          reinterpret_cast<char*>(&_impl_.result_id_),
-          reinterpret_cast<char*>(&other->_impl_.result_id_));
-  swap(_impl_.definition_, other->_impl_.definition_);
-  swap(_impl_._oneof_case_[0], other->_impl_._oneof_case_[0]);
-}
-
-::google::protobuf::Metadata CreateInputTableRequest::GetMetadata() const {
-  return ::_pbi::AssignDescriptors(
-      &descriptor_table_deephaven_2fproto_2ftable_2eproto_getter, &descriptor_table_deephaven_2fproto_2ftable_2eproto_once,
-      file_level_metadata_deephaven_2fproto_2ftable_2eproto[119]);
-}
-// ===================================================================
-
-class WhereInRequest::_Internal {
- public:
-  using HasBits = decltype(std::declval<WhereInRequest>()._impl_._has_bits_);
-  static constexpr ::int32_t kHasBitsOffset =
-    8 * PROTOBUF_FIELD_OFFSET(WhereInRequest, _impl_._has_bits_);
-  static const ::io::deephaven::proto::backplane::grpc::Ticket& result_id(const WhereInRequest* msg);
-  static void set_has_result_id(HasBits* has_bits) {
-    (*has_bits)[0] |= 1u;
-  }
-  static const ::io::deephaven::proto::backplane::grpc::TableReference& left_id(const WhereInRequest* msg);
-  static void set_has_left_id(HasBits* has_bits) {
-    (*has_bits)[0] |= 2u;
-  }
-  static const ::io::deephaven::proto::backplane::grpc::TableReference& right_id(const WhereInRequest* msg);
-  static void set_has_right_id(HasBits* has_bits) {
-    (*has_bits)[0] |= 4u;
-  }
-};
-
-const ::io::deephaven::proto::backplane::grpc::Ticket& WhereInRequest::_Internal::result_id(const WhereInRequest* msg) {
-  return *msg->_impl_.result_id_;
-}
-const ::io::deephaven::proto::backplane::grpc::TableReference& WhereInRequest::_Internal::left_id(const WhereInRequest* msg) {
-  return *msg->_impl_.left_id_;
-}
-const ::io::deephaven::proto::backplane::grpc::TableReference& WhereInRequest::_Internal::right_id(const WhereInRequest* msg) {
-  return *msg->_impl_.right_id_;
-}
-void WhereInRequest::clear_result_id() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  if (_impl_.result_id_ != nullptr) _impl_.result_id_->Clear();
-  _impl_._has_bits_[0] &= ~0x00000001u;
-}
-WhereInRequest::WhereInRequest(::google::protobuf::Arena* arena)
-    : ::google::protobuf::Message(arena) {
-  SharedCtor(arena);
-  // @@protoc_insertion_point(arena_constructor:io.deephaven.proto.backplane.grpc.WhereInRequest)
-}
-inline PROTOBUF_NDEBUG_INLINE WhereInRequest::Impl_::Impl_(
-    ::google::protobuf::internal::InternalVisibility visibility, ::google::protobuf::Arena* arena,
-    const Impl_& from)
-      : _has_bits_{from._has_bits_},
-        _cached_size_{0},
-        columns_to_match_{visibility, arena, from.columns_to_match_} {}
-
-WhereInRequest::WhereInRequest(
-    ::google::protobuf::Arena* arena,
-    const WhereInRequest& from)
-    : ::google::protobuf::Message(arena) {
-  WhereInRequest* const _this = this;
-  (void)_this;
-  _internal_metadata_.MergeFrom<::google::protobuf::UnknownFieldSet>(
-      from._internal_metadata_);
-  new (&_impl_) Impl_(internal_visibility(), arena, from._impl_);
-  ::uint32_t cached_has_bits = _impl_._has_bits_[0];
-  _impl_.result_id_ = (cached_has_bits & 0x00000001u)
-                ? CreateMaybeMessage<::io::deephaven::proto::backplane::grpc::Ticket>(arena, *from._impl_.result_id_)
-                : nullptr;
-  _impl_.left_id_ = (cached_has_bits & 0x00000002u)
-                ? CreateMaybeMessage<::io::deephaven::proto::backplane::grpc::TableReference>(arena, *from._impl_.left_id_)
-                : nullptr;
-  _impl_.right_id_ = (cached_has_bits & 0x00000004u)
-                ? CreateMaybeMessage<::io::deephaven::proto::backplane::grpc::TableReference>(arena, *from._impl_.right_id_)
-                : nullptr;
-  _impl_.inverted_ = from._impl_.inverted_;
-
-  // @@protoc_insertion_point(copy_constructor:io.deephaven.proto.backplane.grpc.WhereInRequest)
-}
-inline PROTOBUF_NDEBUG_INLINE WhereInRequest::Impl_::Impl_(
-    ::google::protobuf::internal::InternalVisibility visibility,
-    ::google::protobuf::Arena* arena)
-      : _cached_size_{0},
-        columns_to_match_{visibility, arena} {}
-
-inline void WhereInRequest::SharedCtor(::_pb::Arena* arena) {
-  new (&_impl_) Impl_(internal_visibility(), arena);
-  ::memset(reinterpret_cast<char *>(&_impl_) +
-               offsetof(Impl_, result_id_),
-           0,
-           offsetof(Impl_, inverted_) -
-               offsetof(Impl_, result_id_) +
-               sizeof(Impl_::inverted_));
-}
-WhereInRequest::~WhereInRequest() {
-  // @@protoc_insertion_point(destructor:io.deephaven.proto.backplane.grpc.WhereInRequest)
-  _internal_metadata_.Delete<::google::protobuf::UnknownFieldSet>();
-  SharedDtor();
-}
-inline void WhereInRequest::SharedDtor() {
-  ABSL_DCHECK(GetArena() == nullptr);
-  delete _impl_.result_id_;
-  delete _impl_.left_id_;
-  delete _impl_.right_id_;
-  _impl_.~Impl_();
-}
-
-PROTOBUF_NOINLINE void WhereInRequest::Clear() {
-// @@protoc_insertion_point(message_clear_start:io.deephaven.proto.backplane.grpc.WhereInRequest)
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  ::uint32_t cached_has_bits = 0;
-  // Prevent compiler warnings about cached_has_bits being unused
-  (void) cached_has_bits;
-
-  _impl_.columns_to_match_.Clear();
-  cached_has_bits = _impl_._has_bits_[0];
-  if (cached_has_bits & 0x00000007u) {
-    if (cached_has_bits & 0x00000001u) {
-      ABSL_DCHECK(_impl_.result_id_ != nullptr);
-      _impl_.result_id_->Clear();
-    }
-    if (cached_has_bits & 0x00000002u) {
-      ABSL_DCHECK(_impl_.left_id_ != nullptr);
-      _impl_.left_id_->Clear();
-    }
-    if (cached_has_bits & 0x00000004u) {
-      ABSL_DCHECK(_impl_.right_id_ != nullptr);
-      _impl_.right_id_->Clear();
-    }
-  }
-  _impl_.inverted_ = false;
-  _impl_._has_bits_.Clear();
-  _internal_metadata_.Clear<::google::protobuf::UnknownFieldSet>();
-}
-
-const char* WhereInRequest::_InternalParse(
-    const char* ptr, ::_pbi::ParseContext* ctx) {
-  ptr = ::_pbi::TcParser::ParseLoop(this, ptr, ctx, &_table_.header);
-  return ptr;
-}
-
-
-PROTOBUF_CONSTINIT PROTOBUF_ATTRIBUTE_INIT_PRIORITY1
-const ::_pbi::TcParseTable<3, 5, 3, 73, 2> WhereInRequest::_table_ = {
-  {
-    PROTOBUF_FIELD_OFFSET(WhereInRequest, _impl_._has_bits_),
-    0, // no _extensions_
-    5, 56,  // max_field_number, fast_idx_mask
-    offsetof(decltype(_table_), field_lookup_table),
-    4294967264,  // skipmap
-    offsetof(decltype(_table_), field_entries),
-    5,  // num_field_entries
-    3,  // num_aux_entries
-    offsetof(decltype(_table_), aux_entries),
-    &_WhereInRequest_default_instance_._instance,
-    ::_pbi::TcParser::GenericFallback,  // fallback
-  }, {{
-    {::_pbi::TcParser::MiniParse, {}},
-    // .io.deephaven.proto.backplane.grpc.Ticket result_id = 1;
-    {::_pbi::TcParser::FastMtS1,
-     {10, 0, 0, PROTOBUF_FIELD_OFFSET(WhereInRequest, _impl_.result_id_)}},
-    // .io.deephaven.proto.backplane.grpc.TableReference left_id = 2;
-    {::_pbi::TcParser::FastMtS1,
-     {18, 1, 1, PROTOBUF_FIELD_OFFSET(WhereInRequest, _impl_.left_id_)}},
-    // .io.deephaven.proto.backplane.grpc.TableReference right_id = 3;
-    {::_pbi::TcParser::FastMtS1,
-     {26, 2, 2, PROTOBUF_FIELD_OFFSET(WhereInRequest, _impl_.right_id_)}},
-    // bool inverted = 4;
-    {::_pbi::TcParser::SingularVarintNoZag1<bool, offsetof(WhereInRequest, _impl_.inverted_), 63>(),
-     {32, 63, 0, PROTOBUF_FIELD_OFFSET(WhereInRequest, _impl_.inverted_)}},
-    // repeated string columns_to_match = 5;
-    {::_pbi::TcParser::FastUR1,
-     {42, 63, 0, PROTOBUF_FIELD_OFFSET(WhereInRequest, _impl_.columns_to_match_)}},
-    {::_pbi::TcParser::MiniParse, {}},
-    {::_pbi::TcParser::MiniParse, {}},
-  }}, {{
-    65535, 65535
-  }}, {{
-    // .io.deephaven.proto.backplane.grpc.Ticket result_id = 1;
-    {PROTOBUF_FIELD_OFFSET(WhereInRequest, _impl_.result_id_), _Internal::kHasBitsOffset + 0, 0,
-    (0 | ::_fl::kFcOptional | ::_fl::kMessage | ::_fl::kTvTable)},
-    // .io.deephaven.proto.backplane.grpc.TableReference left_id = 2;
-    {PROTOBUF_FIELD_OFFSET(WhereInRequest, _impl_.left_id_), _Internal::kHasBitsOffset + 1, 1,
-    (0 | ::_fl::kFcOptional | ::_fl::kMessage | ::_fl::kTvTable)},
-    // .io.deephaven.proto.backplane.grpc.TableReference right_id = 3;
-    {PROTOBUF_FIELD_OFFSET(WhereInRequest, _impl_.right_id_), _Internal::kHasBitsOffset + 2, 2,
-    (0 | ::_fl::kFcOptional | ::_fl::kMessage | ::_fl::kTvTable)},
-    // bool inverted = 4;
-    {PROTOBUF_FIELD_OFFSET(WhereInRequest, _impl_.inverted_), -1, 0,
-    (0 | ::_fl::kFcSingular | ::_fl::kBool)},
-    // repeated string columns_to_match = 5;
-    {PROTOBUF_FIELD_OFFSET(WhereInRequest, _impl_.columns_to_match_), -1, 0,
-    (0 | ::_fl::kFcRepeated | ::_fl::kUtf8String | ::_fl::kRepSString)},
-  }}, {{
-    {::_pbi::TcParser::GetTable<::io::deephaven::proto::backplane::grpc::Ticket>()},
-    {::_pbi::TcParser::GetTable<::io::deephaven::proto::backplane::grpc::TableReference>()},
-    {::_pbi::TcParser::GetTable<::io::deephaven::proto::backplane::grpc::TableReference>()},
-  }}, {{
-    "\60\0\0\0\0\20\0\0"
-    "io.deephaven.proto.backplane.grpc.WhereInRequest"
-    "columns_to_match"
-  }},
-};
-
-::uint8_t* WhereInRequest::_InternalSerialize(
-    ::uint8_t* target,
-    ::google::protobuf::io::EpsCopyOutputStream* stream) const {
-  // @@protoc_insertion_point(serialize_to_array_start:io.deephaven.proto.backplane.grpc.WhereInRequest)
-  ::uint32_t cached_has_bits = 0;
-  (void)cached_has_bits;
-
-  cached_has_bits = _impl_._has_bits_[0];
-  // .io.deephaven.proto.backplane.grpc.Ticket result_id = 1;
-  if (cached_has_bits & 0x00000001u) {
-    target = ::google::protobuf::internal::WireFormatLite::InternalWriteMessage(
-        1, _Internal::result_id(this),
-        _Internal::result_id(this).GetCachedSize(), target, stream);
-  }
-
-  // .io.deephaven.proto.backplane.grpc.TableReference left_id = 2;
-  if (cached_has_bits & 0x00000002u) {
-    target = ::google::protobuf::internal::WireFormatLite::InternalWriteMessage(
-        2, _Internal::left_id(this),
-        _Internal::left_id(this).GetCachedSize(), target, stream);
-  }
-
-  // .io.deephaven.proto.backplane.grpc.TableReference right_id = 3;
-  if (cached_has_bits & 0x00000004u) {
-    target = ::google::protobuf::internal::WireFormatLite::InternalWriteMessage(
-        3, _Internal::right_id(this),
-        _Internal::right_id(this).GetCachedSize(), target, stream);
-  }
-
-  // bool inverted = 4;
-  if (this->_internal_inverted() != 0) {
-    target = stream->EnsureSpace(target);
-    target = ::_pbi::WireFormatLite::WriteBoolToArray(
-        4, this->_internal_inverted(), target);
-  }
-
-  // repeated string columns_to_match = 5;
-  for (int i = 0, n = this->_internal_columns_to_match_size(); i < n; ++i) {
-    const auto& s = this->_internal_columns_to_match().Get(i);
-    ::google::protobuf::internal::WireFormatLite::VerifyUtf8String(
-        s.data(), static_cast<int>(s.length()), ::google::protobuf::internal::WireFormatLite::SERIALIZE, "io.deephaven.proto.backplane.grpc.WhereInRequest.columns_to_match");
-    target = stream->WriteString(5, s, target);
-  }
-
-  if (PROTOBUF_PREDICT_FALSE(_internal_metadata_.have_unknown_fields())) {
-    target =
-        ::_pbi::WireFormat::InternalSerializeUnknownFieldsToArray(
-            _internal_metadata_.unknown_fields<::google::protobuf::UnknownFieldSet>(::google::protobuf::UnknownFieldSet::default_instance), target, stream);
-  }
-  // @@protoc_insertion_point(serialize_to_array_end:io.deephaven.proto.backplane.grpc.WhereInRequest)
-  return target;
-}
-
-::size_t WhereInRequest::ByteSizeLong() const {
-// @@protoc_insertion_point(message_byte_size_start:io.deephaven.proto.backplane.grpc.WhereInRequest)
-  ::size_t total_size = 0;
-
-  ::uint32_t cached_has_bits = 0;
-  // Prevent compiler warnings about cached_has_bits being unused
-  (void) cached_has_bits;
-
-  // repeated string columns_to_match = 5;
-  total_size += 1 * ::google::protobuf::internal::FromIntSize(_internal_columns_to_match().size());
-  for (int i = 0, n = _internal_columns_to_match().size(); i < n; ++i) {
-    total_size += ::google::protobuf::internal::WireFormatLite::StringSize(
-        _internal_columns_to_match().Get(i));
-  }
-  cached_has_bits = _impl_._has_bits_[0];
-  if (cached_has_bits & 0x00000007u) {
-    // .io.deephaven.proto.backplane.grpc.Ticket result_id = 1;
-    if (cached_has_bits & 0x00000001u) {
-      total_size +=
-          1 + ::google::protobuf::internal::WireFormatLite::MessageSize(*_impl_.result_id_);
-    }
-
-    // .io.deephaven.proto.backplane.grpc.TableReference left_id = 2;
-    if (cached_has_bits & 0x00000002u) {
-      total_size +=
-          1 + ::google::protobuf::internal::WireFormatLite::MessageSize(*_impl_.left_id_);
-    }
-
-    // .io.deephaven.proto.backplane.grpc.TableReference right_id = 3;
-    if (cached_has_bits & 0x00000004u) {
-      total_size +=
-          1 + ::google::protobuf::internal::WireFormatLite::MessageSize(*_impl_.right_id_);
-    }
-
-  }
-  // bool inverted = 4;
-  if (this->_internal_inverted() != 0) {
-    total_size += 2;
-  }
-
-  return MaybeComputeUnknownFieldsSize(total_size, &_impl_._cached_size_);
-}
-
-const ::google::protobuf::Message::ClassData WhereInRequest::_class_data_ = {
-    WhereInRequest::MergeImpl,
-    nullptr,  // OnDemandRegisterArenaDtor
-};
-const ::google::protobuf::Message::ClassData* WhereInRequest::GetClassData() const {
-  return &_class_data_;
-}
-
-void WhereInRequest::MergeImpl(::google::protobuf::Message& to_msg, const ::google::protobuf::Message& from_msg) {
-  auto* const _this = static_cast<WhereInRequest*>(&to_msg);
-  auto& from = static_cast<const WhereInRequest&>(from_msg);
-  // @@protoc_insertion_point(class_specific_merge_from_start:io.deephaven.proto.backplane.grpc.WhereInRequest)
-  ABSL_DCHECK_NE(&from, _this);
-  ::uint32_t cached_has_bits = 0;
-  (void) cached_has_bits;
-
-  _this->_internal_mutable_columns_to_match()->MergeFrom(from._internal_columns_to_match());
-  cached_has_bits = from._impl_._has_bits_[0];
-  if (cached_has_bits & 0x00000007u) {
-    if (cached_has_bits & 0x00000001u) {
-      _this->_internal_mutable_result_id()->::io::deephaven::proto::backplane::grpc::Ticket::MergeFrom(
-          from._internal_result_id());
-    }
-    if (cached_has_bits & 0x00000002u) {
-      _this->_internal_mutable_left_id()->::io::deephaven::proto::backplane::grpc::TableReference::MergeFrom(
-          from._internal_left_id());
-    }
-    if (cached_has_bits & 0x00000004u) {
-      _this->_internal_mutable_right_id()->::io::deephaven::proto::backplane::grpc::TableReference::MergeFrom(
-          from._internal_right_id());
-    }
-  }
-  if (from._internal_inverted() != 0) {
-    _this->_internal_set_inverted(from._internal_inverted());
-  }
-  _this->_internal_metadata_.MergeFrom<::google::protobuf::UnknownFieldSet>(from._internal_metadata_);
-}
-
-void WhereInRequest::CopyFrom(const WhereInRequest& from) {
-// @@protoc_insertion_point(class_specific_copy_from_start:io.deephaven.proto.backplane.grpc.WhereInRequest)
-  if (&from == this) return;
-  Clear();
-  MergeFrom(from);
-}
-
-PROTOBUF_NOINLINE bool WhereInRequest::IsInitialized() const {
-  return true;
-}
-
-::_pbi::CachedSize* WhereInRequest::AccessCachedSize() const {
-  return &_impl_._cached_size_;
-}
-void WhereInRequest::InternalSwap(WhereInRequest* PROTOBUF_RESTRICT other) {
-  using std::swap;
-  _internal_metadata_.InternalSwap(&other->_internal_metadata_);
-  swap(_impl_._has_bits_[0], other->_impl_._has_bits_[0]);
-  _impl_.columns_to_match_.InternalSwap(&other->_impl_.columns_to_match_);
-  ::google::protobuf::internal::memswap<
-      PROTOBUF_FIELD_OFFSET(WhereInRequest, _impl_.inverted_)
-      + sizeof(WhereInRequest::_impl_.inverted_)
-      - PROTOBUF_FIELD_OFFSET(WhereInRequest, _impl_.result_id_)>(
-          reinterpret_cast<char*>(&_impl_.result_id_),
-          reinterpret_cast<char*>(&other->_impl_.result_id_));
-}
-
-::google::protobuf::Metadata WhereInRequest::GetMetadata() const {
-  return ::_pbi::AssignDescriptors(
-      &descriptor_table_deephaven_2fproto_2ftable_2eproto_getter, &descriptor_table_deephaven_2fproto_2ftable_2eproto_once,
-      file_level_metadata_deephaven_2fproto_2ftable_2eproto[120]);
-}
-// ===================================================================
-
-class ColumnStatisticsRequest::_Internal {
- public:
-  using HasBits = decltype(std::declval<ColumnStatisticsRequest>()._impl_._has_bits_);
-  static constexpr ::int32_t kHasBitsOffset =
-    8 * PROTOBUF_FIELD_OFFSET(ColumnStatisticsRequest, _impl_._has_bits_);
-  static const ::io::deephaven::proto::backplane::grpc::Ticket& result_id(const ColumnStatisticsRequest* msg);
-  static void set_has_result_id(HasBits* has_bits) {
-    (*has_bits)[0] |= 1u;
-  }
-  static const ::io::deephaven::proto::backplane::grpc::TableReference& source_id(const ColumnStatisticsRequest* msg);
-  static void set_has_source_id(HasBits* has_bits) {
-    (*has_bits)[0] |= 2u;
-  }
-  static void set_has_unique_value_limit(HasBits* has_bits) {
-    (*has_bits)[0] |= 4u;
-  }
-};
-
-const ::io::deephaven::proto::backplane::grpc::Ticket& ColumnStatisticsRequest::_Internal::result_id(const ColumnStatisticsRequest* msg) {
-  return *msg->_impl_.result_id_;
-}
-const ::io::deephaven::proto::backplane::grpc::TableReference& ColumnStatisticsRequest::_Internal::source_id(const ColumnStatisticsRequest* msg) {
-  return *msg->_impl_.source_id_;
-}
-void ColumnStatisticsRequest::clear_result_id() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  if (_impl_.result_id_ != nullptr) _impl_.result_id_->Clear();
-  _impl_._has_bits_[0] &= ~0x00000001u;
-}
-ColumnStatisticsRequest::ColumnStatisticsRequest(::google::protobuf::Arena* arena)
-    : ::google::protobuf::Message(arena) {
-  SharedCtor(arena);
-  // @@protoc_insertion_point(arena_constructor:io.deephaven.proto.backplane.grpc.ColumnStatisticsRequest)
-}
-inline PROTOBUF_NDEBUG_INLINE ColumnStatisticsRequest::Impl_::Impl_(
-    ::google::protobuf::internal::InternalVisibility visibility, ::google::protobuf::Arena* arena,
-    const Impl_& from)
-      : _has_bits_{from._has_bits_},
-        _cached_size_{0},
-        column_name_(arena, from.column_name_) {}
-
-ColumnStatisticsRequest::ColumnStatisticsRequest(
-    ::google::protobuf::Arena* arena,
-    const ColumnStatisticsRequest& from)
-    : ::google::protobuf::Message(arena) {
-  ColumnStatisticsRequest* const _this = this;
-  (void)_this;
-  _internal_metadata_.MergeFrom<::google::protobuf::UnknownFieldSet>(
-      from._internal_metadata_);
-  new (&_impl_) Impl_(internal_visibility(), arena, from._impl_);
-  ::uint32_t cached_has_bits = _impl_._has_bits_[0];
-  _impl_.result_id_ = (cached_has_bits & 0x00000001u)
-                ? CreateMaybeMessage<::io::deephaven::proto::backplane::grpc::Ticket>(arena, *from._impl_.result_id_)
-                : nullptr;
-  _impl_.source_id_ = (cached_has_bits & 0x00000002u)
-                ? CreateMaybeMessage<::io::deephaven::proto::backplane::grpc::TableReference>(arena, *from._impl_.source_id_)
-                : nullptr;
-  _impl_.unique_value_limit_ = from._impl_.unique_value_limit_;
-
-  // @@protoc_insertion_point(copy_constructor:io.deephaven.proto.backplane.grpc.ColumnStatisticsRequest)
-}
-inline PROTOBUF_NDEBUG_INLINE ColumnStatisticsRequest::Impl_::Impl_(
-    ::google::protobuf::internal::InternalVisibility visibility,
-    ::google::protobuf::Arena* arena)
-      : _cached_size_{0},
-        column_name_(arena) {}
-
-inline void ColumnStatisticsRequest::SharedCtor(::_pb::Arena* arena) {
-  new (&_impl_) Impl_(internal_visibility(), arena);
-  ::memset(reinterpret_cast<char *>(&_impl_) +
-               offsetof(Impl_, result_id_),
-           0,
-           offsetof(Impl_, unique_value_limit_) -
-               offsetof(Impl_, result_id_) +
-               sizeof(Impl_::unique_value_limit_));
-}
-ColumnStatisticsRequest::~ColumnStatisticsRequest() {
-  // @@protoc_insertion_point(destructor:io.deephaven.proto.backplane.grpc.ColumnStatisticsRequest)
-  _internal_metadata_.Delete<::google::protobuf::UnknownFieldSet>();
-  SharedDtor();
-}
-inline void ColumnStatisticsRequest::SharedDtor() {
-  ABSL_DCHECK(GetArena() == nullptr);
-  _impl_.column_name_.Destroy();
-  delete _impl_.result_id_;
-  delete _impl_.source_id_;
-  _impl_.~Impl_();
-}
-
-PROTOBUF_NOINLINE void ColumnStatisticsRequest::Clear() {
-// @@protoc_insertion_point(message_clear_start:io.deephaven.proto.backplane.grpc.ColumnStatisticsRequest)
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  ::uint32_t cached_has_bits = 0;
-  // Prevent compiler warnings about cached_has_bits being unused
-  (void) cached_has_bits;
-
-  _impl_.column_name_.ClearToEmpty();
-  cached_has_bits = _impl_._has_bits_[0];
-  if (cached_has_bits & 0x00000003u) {
-    if (cached_has_bits & 0x00000001u) {
-      ABSL_DCHECK(_impl_.result_id_ != nullptr);
-      _impl_.result_id_->Clear();
-    }
-    if (cached_has_bits & 0x00000002u) {
-      ABSL_DCHECK(_impl_.source_id_ != nullptr);
-      _impl_.source_id_->Clear();
-    }
-  }
-  _impl_.unique_value_limit_ = 0;
-  _impl_._has_bits_.Clear();
-  _internal_metadata_.Clear<::google::protobuf::UnknownFieldSet>();
-}
-
-const char* ColumnStatisticsRequest::_InternalParse(
-    const char* ptr, ::_pbi::ParseContext* ctx) {
-  ptr = ::_pbi::TcParser::ParseLoop(this, ptr, ctx, &_table_.header);
-  return ptr;
-}
-
-
-PROTOBUF_CONSTINIT PROTOBUF_ATTRIBUTE_INIT_PRIORITY1
-const ::_pbi::TcParseTable<2, 4, 2, 77, 2> ColumnStatisticsRequest::_table_ = {
-  {
-    PROTOBUF_FIELD_OFFSET(ColumnStatisticsRequest, _impl_._has_bits_),
-    0, // no _extensions_
-    4, 24,  // max_field_number, fast_idx_mask
-    offsetof(decltype(_table_), field_lookup_table),
-    4294967280,  // skipmap
-    offsetof(decltype(_table_), field_entries),
-    4,  // num_field_entries
-    2,  // num_aux_entries
-    offsetof(decltype(_table_), aux_entries),
-    &_ColumnStatisticsRequest_default_instance_._instance,
-    ::_pbi::TcParser::GenericFallback,  // fallback
-  }, {{
-    // optional int32 unique_value_limit = 4;
-    {::_pbi::TcParser::SingularVarintNoZag1<::uint32_t, offsetof(ColumnStatisticsRequest, _impl_.unique_value_limit_), 2>(),
-     {32, 2, 0, PROTOBUF_FIELD_OFFSET(ColumnStatisticsRequest, _impl_.unique_value_limit_)}},
-    // .io.deephaven.proto.backplane.grpc.Ticket result_id = 1;
-    {::_pbi::TcParser::FastMtS1,
-     {10, 0, 0, PROTOBUF_FIELD_OFFSET(ColumnStatisticsRequest, _impl_.result_id_)}},
-    // .io.deephaven.proto.backplane.grpc.TableReference source_id = 2;
-    {::_pbi::TcParser::FastMtS1,
-     {18, 1, 1, PROTOBUF_FIELD_OFFSET(ColumnStatisticsRequest, _impl_.source_id_)}},
-    // string column_name = 3;
-    {::_pbi::TcParser::FastUS1,
-     {26, 63, 0, PROTOBUF_FIELD_OFFSET(ColumnStatisticsRequest, _impl_.column_name_)}},
-  }}, {{
-    65535, 65535
-  }}, {{
-    // .io.deephaven.proto.backplane.grpc.Ticket result_id = 1;
-    {PROTOBUF_FIELD_OFFSET(ColumnStatisticsRequest, _impl_.result_id_), _Internal::kHasBitsOffset + 0, 0,
-    (0 | ::_fl::kFcOptional | ::_fl::kMessage | ::_fl::kTvTable)},
-    // .io.deephaven.proto.backplane.grpc.TableReference source_id = 2;
-    {PROTOBUF_FIELD_OFFSET(ColumnStatisticsRequest, _impl_.source_id_), _Internal::kHasBitsOffset + 1, 1,
-    (0 | ::_fl::kFcOptional | ::_fl::kMessage | ::_fl::kTvTable)},
-    // string column_name = 3;
-    {PROTOBUF_FIELD_OFFSET(ColumnStatisticsRequest, _impl_.column_name_), -1, 0,
-    (0 | ::_fl::kFcSingular | ::_fl::kUtf8String | ::_fl::kRepAString)},
-    // optional int32 unique_value_limit = 4;
-    {PROTOBUF_FIELD_OFFSET(ColumnStatisticsRequest, _impl_.unique_value_limit_), _Internal::kHasBitsOffset + 2, 0,
-    (0 | ::_fl::kFcOptional | ::_fl::kInt32)},
-  }}, {{
-    {::_pbi::TcParser::GetTable<::io::deephaven::proto::backplane::grpc::Ticket>()},
-    {::_pbi::TcParser::GetTable<::io::deephaven::proto::backplane::grpc::TableReference>()},
-  }}, {{
-    "\71\0\0\13\0\0\0\0"
-    "io.deephaven.proto.backplane.grpc.ColumnStatisticsRequest"
-    "column_name"
-  }},
-};
-
-::uint8_t* ColumnStatisticsRequest::_InternalSerialize(
-    ::uint8_t* target,
-    ::google::protobuf::io::EpsCopyOutputStream* stream) const {
-  // @@protoc_insertion_point(serialize_to_array_start:io.deephaven.proto.backplane.grpc.ColumnStatisticsRequest)
-  ::uint32_t cached_has_bits = 0;
-  (void)cached_has_bits;
-
-  cached_has_bits = _impl_._has_bits_[0];
-  // .io.deephaven.proto.backplane.grpc.Ticket result_id = 1;
-  if (cached_has_bits & 0x00000001u) {
-    target = ::google::protobuf::internal::WireFormatLite::InternalWriteMessage(
-        1, _Internal::result_id(this),
-        _Internal::result_id(this).GetCachedSize(), target, stream);
-  }
-
-  // .io.deephaven.proto.backplane.grpc.TableReference source_id = 2;
-  if (cached_has_bits & 0x00000002u) {
-    target = ::google::protobuf::internal::WireFormatLite::InternalWriteMessage(
-        2, _Internal::source_id(this),
-        _Internal::source_id(this).GetCachedSize(), target, stream);
-  }
-
-  // string column_name = 3;
-  if (!this->_internal_column_name().empty()) {
-    const std::string& _s = this->_internal_column_name();
-    ::google::protobuf::internal::WireFormatLite::VerifyUtf8String(
-        _s.data(), static_cast<int>(_s.length()), ::google::protobuf::internal::WireFormatLite::SERIALIZE, "io.deephaven.proto.backplane.grpc.ColumnStatisticsRequest.column_name");
-    target = stream->WriteStringMaybeAliased(3, _s, target);
-  }
-
-  // optional int32 unique_value_limit = 4;
-  if (cached_has_bits & 0x00000004u) {
-    target = ::google::protobuf::internal::WireFormatLite::
-        WriteInt32ToArrayWithField<4>(
-            stream, this->_internal_unique_value_limit(), target);
-  }
-
-  if (PROTOBUF_PREDICT_FALSE(_internal_metadata_.have_unknown_fields())) {
-    target =
-        ::_pbi::WireFormat::InternalSerializeUnknownFieldsToArray(
-            _internal_metadata_.unknown_fields<::google::protobuf::UnknownFieldSet>(::google::protobuf::UnknownFieldSet::default_instance), target, stream);
-  }
-  // @@protoc_insertion_point(serialize_to_array_end:io.deephaven.proto.backplane.grpc.ColumnStatisticsRequest)
-  return target;
-}
-
-::size_t ColumnStatisticsRequest::ByteSizeLong() const {
-// @@protoc_insertion_point(message_byte_size_start:io.deephaven.proto.backplane.grpc.ColumnStatisticsRequest)
-  ::size_t total_size = 0;
-
-  ::uint32_t cached_has_bits = 0;
-  // Prevent compiler warnings about cached_has_bits being unused
-  (void) cached_has_bits;
-
-  // string column_name = 3;
-  if (!this->_internal_column_name().empty()) {
-    total_size += 1 + ::google::protobuf::internal::WireFormatLite::StringSize(
-                                    this->_internal_column_name());
-  }
-
-  cached_has_bits = _impl_._has_bits_[0];
-  if (cached_has_bits & 0x00000007u) {
-    // .io.deephaven.proto.backplane.grpc.Ticket result_id = 1;
-    if (cached_has_bits & 0x00000001u) {
-      total_size +=
-          1 + ::google::protobuf::internal::WireFormatLite::MessageSize(*_impl_.result_id_);
-    }
-
-    // .io.deephaven.proto.backplane.grpc.TableReference source_id = 2;
-    if (cached_has_bits & 0x00000002u) {
-      total_size +=
-          1 + ::google::protobuf::internal::WireFormatLite::MessageSize(*_impl_.source_id_);
-    }
-
-    // optional int32 unique_value_limit = 4;
-    if (cached_has_bits & 0x00000004u) {
-      total_size += ::_pbi::WireFormatLite::Int32SizePlusOne(
-          this->_internal_unique_value_limit());
-    }
-
-  }
-  return MaybeComputeUnknownFieldsSize(total_size, &_impl_._cached_size_);
-}
-
-const ::google::protobuf::Message::ClassData ColumnStatisticsRequest::_class_data_ = {
-    ColumnStatisticsRequest::MergeImpl,
-    nullptr,  // OnDemandRegisterArenaDtor
-};
-const ::google::protobuf::Message::ClassData* ColumnStatisticsRequest::GetClassData() const {
-  return &_class_data_;
-}
-
-void ColumnStatisticsRequest::MergeImpl(::google::protobuf::Message& to_msg, const ::google::protobuf::Message& from_msg) {
-  auto* const _this = static_cast<ColumnStatisticsRequest*>(&to_msg);
-  auto& from = static_cast<const ColumnStatisticsRequest&>(from_msg);
-  // @@protoc_insertion_point(class_specific_merge_from_start:io.deephaven.proto.backplane.grpc.ColumnStatisticsRequest)
-  ABSL_DCHECK_NE(&from, _this);
-  ::uint32_t cached_has_bits = 0;
-  (void) cached_has_bits;
-
-  if (!from._internal_column_name().empty()) {
-    _this->_internal_set_column_name(from._internal_column_name());
-  }
-  cached_has_bits = from._impl_._has_bits_[0];
-  if (cached_has_bits & 0x00000007u) {
-    if (cached_has_bits & 0x00000001u) {
-      _this->_internal_mutable_result_id()->::io::deephaven::proto::backplane::grpc::Ticket::MergeFrom(
-          from._internal_result_id());
-    }
-    if (cached_has_bits & 0x00000002u) {
-      _this->_internal_mutable_source_id()->::io::deephaven::proto::backplane::grpc::TableReference::MergeFrom(
-          from._internal_source_id());
-    }
-    if (cached_has_bits & 0x00000004u) {
-      _this->_impl_.unique_value_limit_ = from._impl_.unique_value_limit_;
-    }
-    _this->_impl_._has_bits_[0] |= cached_has_bits;
-  }
-  _this->_internal_metadata_.MergeFrom<::google::protobuf::UnknownFieldSet>(from._internal_metadata_);
-}
-
-void ColumnStatisticsRequest::CopyFrom(const ColumnStatisticsRequest& from) {
-// @@protoc_insertion_point(class_specific_copy_from_start:io.deephaven.proto.backplane.grpc.ColumnStatisticsRequest)
-  if (&from == this) return;
-  Clear();
-  MergeFrom(from);
-}
-
-PROTOBUF_NOINLINE bool ColumnStatisticsRequest::IsInitialized() const {
-  return true;
-}
-
-::_pbi::CachedSize* ColumnStatisticsRequest::AccessCachedSize() const {
-  return &_impl_._cached_size_;
-}
-void ColumnStatisticsRequest::InternalSwap(ColumnStatisticsRequest* PROTOBUF_RESTRICT other) {
-  using std::swap;
-  auto* arena = GetArena();
-  ABSL_DCHECK_EQ(arena, other->GetArena());
-  _internal_metadata_.InternalSwap(&other->_internal_metadata_);
-  swap(_impl_._has_bits_[0], other->_impl_._has_bits_[0]);
-  ::_pbi::ArenaStringPtr::InternalSwap(&_impl_.column_name_, &other->_impl_.column_name_, arena);
-  ::google::protobuf::internal::memswap<
-      PROTOBUF_FIELD_OFFSET(ColumnStatisticsRequest, _impl_.unique_value_limit_)
-      + sizeof(ColumnStatisticsRequest::_impl_.unique_value_limit_)
-      - PROTOBUF_FIELD_OFFSET(ColumnStatisticsRequest, _impl_.result_id_)>(
-          reinterpret_cast<char*>(&_impl_.result_id_),
-          reinterpret_cast<char*>(&other->_impl_.result_id_));
-}
-
-::google::protobuf::Metadata ColumnStatisticsRequest::GetMetadata() const {
-  return ::_pbi::AssignDescriptors(
-      &descriptor_table_deephaven_2fproto_2ftable_2eproto_getter, &descriptor_table_deephaven_2fproto_2ftable_2eproto_once,
-      file_level_metadata_deephaven_2fproto_2ftable_2eproto[121]);
-}
-// ===================================================================
-
-class BatchTableRequest_Operation::_Internal {
- public:
-  static constexpr ::int32_t kOneofCaseOffset =
-    PROTOBUF_FIELD_OFFSET(::io::deephaven::proto::backplane::grpc::BatchTableRequest_Operation, _impl_._oneof_case_);
-  static const ::io::deephaven::proto::backplane::grpc::EmptyTableRequest& empty_table(const BatchTableRequest_Operation* msg);
-  static const ::io::deephaven::proto::backplane::grpc::TimeTableRequest& time_table(const BatchTableRequest_Operation* msg);
-  static const ::io::deephaven::proto::backplane::grpc::DropColumnsRequest& drop_columns(const BatchTableRequest_Operation* msg);
-  static const ::io::deephaven::proto::backplane::grpc::SelectOrUpdateRequest& update(const BatchTableRequest_Operation* msg);
-  static const ::io::deephaven::proto::backplane::grpc::SelectOrUpdateRequest& lazy_update(const BatchTableRequest_Operation* msg);
-  static const ::io::deephaven::proto::backplane::grpc::SelectOrUpdateRequest& view(const BatchTableRequest_Operation* msg);
-  static const ::io::deephaven::proto::backplane::grpc::SelectOrUpdateRequest& update_view(const BatchTableRequest_Operation* msg);
-  static const ::io::deephaven::proto::backplane::grpc::SelectOrUpdateRequest& select(const BatchTableRequest_Operation* msg);
-  static const ::io::deephaven::proto::backplane::grpc::SelectDistinctRequest& select_distinct(const BatchTableRequest_Operation* msg);
-  static const ::io::deephaven::proto::backplane::grpc::FilterTableRequest& filter(const BatchTableRequest_Operation* msg);
-  static const ::io::deephaven::proto::backplane::grpc::UnstructuredFilterTableRequest& unstructured_filter(const BatchTableRequest_Operation* msg);
-  static const ::io::deephaven::proto::backplane::grpc::SortTableRequest& sort(const BatchTableRequest_Operation* msg);
-  static const ::io::deephaven::proto::backplane::grpc::HeadOrTailRequest& head(const BatchTableRequest_Operation* msg);
-  static const ::io::deephaven::proto::backplane::grpc::HeadOrTailRequest& tail(const BatchTableRequest_Operation* msg);
-  static const ::io::deephaven::proto::backplane::grpc::HeadOrTailByRequest& head_by(const BatchTableRequest_Operation* msg);
-  static const ::io::deephaven::proto::backplane::grpc::HeadOrTailByRequest& tail_by(const BatchTableRequest_Operation* msg);
-  static const ::io::deephaven::proto::backplane::grpc::UngroupRequest& ungroup(const BatchTableRequest_Operation* msg);
-  static const ::io::deephaven::proto::backplane::grpc::MergeTablesRequest& merge(const BatchTableRequest_Operation* msg);
-  static const ::io::deephaven::proto::backplane::grpc::ComboAggregateRequest& combo_aggregate(const BatchTableRequest_Operation* msg);
-  static const ::io::deephaven::proto::backplane::grpc::FlattenRequest& flatten(const BatchTableRequest_Operation* msg);
-  static const ::io::deephaven::proto::backplane::grpc::RunChartDownsampleRequest& run_chart_downsample(const BatchTableRequest_Operation* msg);
-  static const ::io::deephaven::proto::backplane::grpc::CrossJoinTablesRequest& cross_join(const BatchTableRequest_Operation* msg);
-  static const ::io::deephaven::proto::backplane::grpc::NaturalJoinTablesRequest& natural_join(const BatchTableRequest_Operation* msg);
-  static const ::io::deephaven::proto::backplane::grpc::ExactJoinTablesRequest& exact_join(const BatchTableRequest_Operation* msg);
-  static const ::io::deephaven::proto::backplane::grpc::LeftJoinTablesRequest& left_join(const BatchTableRequest_Operation* msg);
-  static const ::io::deephaven::proto::backplane::grpc::AsOfJoinTablesRequest& as_of_join(const BatchTableRequest_Operation* msg);
-  static const ::io::deephaven::proto::backplane::grpc::FetchTableRequest& fetch_table(const BatchTableRequest_Operation* msg);
-  static const ::io::deephaven::proto::backplane::grpc::ApplyPreviewColumnsRequest& apply_preview_columns(const BatchTableRequest_Operation* msg);
-  static const ::io::deephaven::proto::backplane::grpc::CreateInputTableRequest& create_input_table(const BatchTableRequest_Operation* msg);
-  static const ::io::deephaven::proto::backplane::grpc::UpdateByRequest& update_by(const BatchTableRequest_Operation* msg);
-  static const ::io::deephaven::proto::backplane::grpc::WhereInRequest& where_in(const BatchTableRequest_Operation* msg);
-  static const ::io::deephaven::proto::backplane::grpc::AggregateAllRequest& aggregate_all(const BatchTableRequest_Operation* msg);
-  static const ::io::deephaven::proto::backplane::grpc::AggregateRequest& aggregate(const BatchTableRequest_Operation* msg);
-  static const ::io::deephaven::proto::backplane::grpc::SnapshotTableRequest& snapshot(const BatchTableRequest_Operation* msg);
-  static const ::io::deephaven::proto::backplane::grpc::SnapshotWhenTableRequest& snapshot_when(const BatchTableRequest_Operation* msg);
-  static const ::io::deephaven::proto::backplane::grpc::MetaTableRequest& meta_table(const BatchTableRequest_Operation* msg);
-  static const ::io::deephaven::proto::backplane::grpc::RangeJoinTablesRequest& range_join(const BatchTableRequest_Operation* msg);
-  static const ::io::deephaven::proto::backplane::grpc::AjRajTablesRequest& aj(const BatchTableRequest_Operation* msg);
-  static const ::io::deephaven::proto::backplane::grpc::AjRajTablesRequest& raj(const BatchTableRequest_Operation* msg);
-  static const ::io::deephaven::proto::backplane::grpc::ColumnStatisticsRequest& column_statistics(const BatchTableRequest_Operation* msg);
-  static const ::io::deephaven::proto::backplane::grpc::MultiJoinTablesRequest& multi_join(const BatchTableRequest_Operation* msg);
-};
-
-const ::io::deephaven::proto::backplane::grpc::EmptyTableRequest& BatchTableRequest_Operation::_Internal::empty_table(const BatchTableRequest_Operation* msg) {
-  return *msg->_impl_.op_.empty_table_;
-}
-const ::io::deephaven::proto::backplane::grpc::TimeTableRequest& BatchTableRequest_Operation::_Internal::time_table(const BatchTableRequest_Operation* msg) {
-  return *msg->_impl_.op_.time_table_;
-}
-const ::io::deephaven::proto::backplane::grpc::DropColumnsRequest& BatchTableRequest_Operation::_Internal::drop_columns(const BatchTableRequest_Operation* msg) {
-  return *msg->_impl_.op_.drop_columns_;
-}
-const ::io::deephaven::proto::backplane::grpc::SelectOrUpdateRequest& BatchTableRequest_Operation::_Internal::update(const BatchTableRequest_Operation* msg) {
-  return *msg->_impl_.op_.update_;
-}
-const ::io::deephaven::proto::backplane::grpc::SelectOrUpdateRequest& BatchTableRequest_Operation::_Internal::lazy_update(const BatchTableRequest_Operation* msg) {
-  return *msg->_impl_.op_.lazy_update_;
-}
-const ::io::deephaven::proto::backplane::grpc::SelectOrUpdateRequest& BatchTableRequest_Operation::_Internal::view(const BatchTableRequest_Operation* msg) {
-  return *msg->_impl_.op_.view_;
-}
-const ::io::deephaven::proto::backplane::grpc::SelectOrUpdateRequest& BatchTableRequest_Operation::_Internal::update_view(const BatchTableRequest_Operation* msg) {
-  return *msg->_impl_.op_.update_view_;
-}
-const ::io::deephaven::proto::backplane::grpc::SelectOrUpdateRequest& BatchTableRequest_Operation::_Internal::select(const BatchTableRequest_Operation* msg) {
-  return *msg->_impl_.op_.select_;
-}
-const ::io::deephaven::proto::backplane::grpc::SelectDistinctRequest& BatchTableRequest_Operation::_Internal::select_distinct(const BatchTableRequest_Operation* msg) {
-  return *msg->_impl_.op_.select_distinct_;
-}
-const ::io::deephaven::proto::backplane::grpc::FilterTableRequest& BatchTableRequest_Operation::_Internal::filter(const BatchTableRequest_Operation* msg) {
-  return *msg->_impl_.op_.filter_;
-}
-const ::io::deephaven::proto::backplane::grpc::UnstructuredFilterTableRequest& BatchTableRequest_Operation::_Internal::unstructured_filter(const BatchTableRequest_Operation* msg) {
-  return *msg->_impl_.op_.unstructured_filter_;
-}
-const ::io::deephaven::proto::backplane::grpc::SortTableRequest& BatchTableRequest_Operation::_Internal::sort(const BatchTableRequest_Operation* msg) {
-  return *msg->_impl_.op_.sort_;
-}
-const ::io::deephaven::proto::backplane::grpc::HeadOrTailRequest& BatchTableRequest_Operation::_Internal::head(const BatchTableRequest_Operation* msg) {
-  return *msg->_impl_.op_.head_;
-}
-const ::io::deephaven::proto::backplane::grpc::HeadOrTailRequest& BatchTableRequest_Operation::_Internal::tail(const BatchTableRequest_Operation* msg) {
-  return *msg->_impl_.op_.tail_;
-}
-const ::io::deephaven::proto::backplane::grpc::HeadOrTailByRequest& BatchTableRequest_Operation::_Internal::head_by(const BatchTableRequest_Operation* msg) {
-  return *msg->_impl_.op_.head_by_;
-}
-const ::io::deephaven::proto::backplane::grpc::HeadOrTailByRequest& BatchTableRequest_Operation::_Internal::tail_by(const BatchTableRequest_Operation* msg) {
-  return *msg->_impl_.op_.tail_by_;
-}
-const ::io::deephaven::proto::backplane::grpc::UngroupRequest& BatchTableRequest_Operation::_Internal::ungroup(const BatchTableRequest_Operation* msg) {
-  return *msg->_impl_.op_.ungroup_;
-}
-const ::io::deephaven::proto::backplane::grpc::MergeTablesRequest& BatchTableRequest_Operation::_Internal::merge(const BatchTableRequest_Operation* msg) {
-  return *msg->_impl_.op_.merge_;
-}
-const ::io::deephaven::proto::backplane::grpc::ComboAggregateRequest& BatchTableRequest_Operation::_Internal::combo_aggregate(const BatchTableRequest_Operation* msg) {
-  return *msg->_impl_.op_.combo_aggregate_;
-}
-const ::io::deephaven::proto::backplane::grpc::FlattenRequest& BatchTableRequest_Operation::_Internal::flatten(const BatchTableRequest_Operation* msg) {
-  return *msg->_impl_.op_.flatten_;
-}
-const ::io::deephaven::proto::backplane::grpc::RunChartDownsampleRequest& BatchTableRequest_Operation::_Internal::run_chart_downsample(const BatchTableRequest_Operation* msg) {
-  return *msg->_impl_.op_.run_chart_downsample_;
-}
-const ::io::deephaven::proto::backplane::grpc::CrossJoinTablesRequest& BatchTableRequest_Operation::_Internal::cross_join(const BatchTableRequest_Operation* msg) {
-  return *msg->_impl_.op_.cross_join_;
-}
-const ::io::deephaven::proto::backplane::grpc::NaturalJoinTablesRequest& BatchTableRequest_Operation::_Internal::natural_join(const BatchTableRequest_Operation* msg) {
-  return *msg->_impl_.op_.natural_join_;
-}
-const ::io::deephaven::proto::backplane::grpc::ExactJoinTablesRequest& BatchTableRequest_Operation::_Internal::exact_join(const BatchTableRequest_Operation* msg) {
-  return *msg->_impl_.op_.exact_join_;
-}
-const ::io::deephaven::proto::backplane::grpc::LeftJoinTablesRequest& BatchTableRequest_Operation::_Internal::left_join(const BatchTableRequest_Operation* msg) {
-  return *msg->_impl_.op_.left_join_;
-}
-const ::io::deephaven::proto::backplane::grpc::AsOfJoinTablesRequest& BatchTableRequest_Operation::_Internal::as_of_join(const BatchTableRequest_Operation* msg) {
-  return *msg->_impl_.op_.as_of_join_;
-}
-const ::io::deephaven::proto::backplane::grpc::FetchTableRequest& BatchTableRequest_Operation::_Internal::fetch_table(const BatchTableRequest_Operation* msg) {
-  return *msg->_impl_.op_.fetch_table_;
-}
-const ::io::deephaven::proto::backplane::grpc::ApplyPreviewColumnsRequest& BatchTableRequest_Operation::_Internal::apply_preview_columns(const BatchTableRequest_Operation* msg) {
-  return *msg->_impl_.op_.apply_preview_columns_;
-}
-const ::io::deephaven::proto::backplane::grpc::CreateInputTableRequest& BatchTableRequest_Operation::_Internal::create_input_table(const BatchTableRequest_Operation* msg) {
-  return *msg->_impl_.op_.create_input_table_;
-}
-const ::io::deephaven::proto::backplane::grpc::UpdateByRequest& BatchTableRequest_Operation::_Internal::update_by(const BatchTableRequest_Operation* msg) {
-  return *msg->_impl_.op_.update_by_;
-}
-const ::io::deephaven::proto::backplane::grpc::WhereInRequest& BatchTableRequest_Operation::_Internal::where_in(const BatchTableRequest_Operation* msg) {
-  return *msg->_impl_.op_.where_in_;
-}
-const ::io::deephaven::proto::backplane::grpc::AggregateAllRequest& BatchTableRequest_Operation::_Internal::aggregate_all(const BatchTableRequest_Operation* msg) {
-  return *msg->_impl_.op_.aggregate_all_;
-}
-const ::io::deephaven::proto::backplane::grpc::AggregateRequest& BatchTableRequest_Operation::_Internal::aggregate(const BatchTableRequest_Operation* msg) {
-  return *msg->_impl_.op_.aggregate_;
-}
-const ::io::deephaven::proto::backplane::grpc::SnapshotTableRequest& BatchTableRequest_Operation::_Internal::snapshot(const BatchTableRequest_Operation* msg) {
-  return *msg->_impl_.op_.snapshot_;
-}
-const ::io::deephaven::proto::backplane::grpc::SnapshotWhenTableRequest& BatchTableRequest_Operation::_Internal::snapshot_when(const BatchTableRequest_Operation* msg) {
-  return *msg->_impl_.op_.snapshot_when_;
-}
-const ::io::deephaven::proto::backplane::grpc::MetaTableRequest& BatchTableRequest_Operation::_Internal::meta_table(const BatchTableRequest_Operation* msg) {
-  return *msg->_impl_.op_.meta_table_;
-}
-const ::io::deephaven::proto::backplane::grpc::RangeJoinTablesRequest& BatchTableRequest_Operation::_Internal::range_join(const BatchTableRequest_Operation* msg) {
-  return *msg->_impl_.op_.range_join_;
-}
-const ::io::deephaven::proto::backplane::grpc::AjRajTablesRequest& BatchTableRequest_Operation::_Internal::aj(const BatchTableRequest_Operation* msg) {
-  return *msg->_impl_.op_.aj_;
-}
-const ::io::deephaven::proto::backplane::grpc::AjRajTablesRequest& BatchTableRequest_Operation::_Internal::raj(const BatchTableRequest_Operation* msg) {
-  return *msg->_impl_.op_.raj_;
-}
-const ::io::deephaven::proto::backplane::grpc::ColumnStatisticsRequest& BatchTableRequest_Operation::_Internal::column_statistics(const BatchTableRequest_Operation* msg) {
-  return *msg->_impl_.op_.column_statistics_;
-}
-const ::io::deephaven::proto::backplane::grpc::MultiJoinTablesRequest& BatchTableRequest_Operation::_Internal::multi_join(const BatchTableRequest_Operation* msg) {
-  return *msg->_impl_.op_.multi_join_;
-}
-void BatchTableRequest_Operation::set_allocated_empty_table(::io::deephaven::proto::backplane::grpc::EmptyTableRequest* empty_table) {
-  ::google::protobuf::Arena* message_arena = GetArena();
-  clear_op();
-  if (empty_table) {
-    ::google::protobuf::Arena* submessage_arena = empty_table->GetArena();
-    if (message_arena != submessage_arena) {
-      empty_table = ::google::protobuf::internal::GetOwnedMessage(message_arena, empty_table, submessage_arena);
-    }
-    set_has_empty_table();
-    _impl_.op_.empty_table_ = empty_table;
-  }
-  // @@protoc_insertion_point(field_set_allocated:io.deephaven.proto.backplane.grpc.BatchTableRequest.Operation.empty_table)
-}
-void BatchTableRequest_Operation::set_allocated_time_table(::io::deephaven::proto::backplane::grpc::TimeTableRequest* time_table) {
-  ::google::protobuf::Arena* message_arena = GetArena();
-  clear_op();
-  if (time_table) {
-    ::google::protobuf::Arena* submessage_arena = time_table->GetArena();
-    if (message_arena != submessage_arena) {
-      time_table = ::google::protobuf::internal::GetOwnedMessage(message_arena, time_table, submessage_arena);
-    }
-    set_has_time_table();
-    _impl_.op_.time_table_ = time_table;
-  }
-  // @@protoc_insertion_point(field_set_allocated:io.deephaven.proto.backplane.grpc.BatchTableRequest.Operation.time_table)
-}
-void BatchTableRequest_Operation::set_allocated_drop_columns(::io::deephaven::proto::backplane::grpc::DropColumnsRequest* drop_columns) {
-  ::google::protobuf::Arena* message_arena = GetArena();
-  clear_op();
-  if (drop_columns) {
-    ::google::protobuf::Arena* submessage_arena = drop_columns->GetArena();
-    if (message_arena != submessage_arena) {
-      drop_columns = ::google::protobuf::internal::GetOwnedMessage(message_arena, drop_columns, submessage_arena);
-    }
-    set_has_drop_columns();
-    _impl_.op_.drop_columns_ = drop_columns;
-  }
-  // @@protoc_insertion_point(field_set_allocated:io.deephaven.proto.backplane.grpc.BatchTableRequest.Operation.drop_columns)
-}
-void BatchTableRequest_Operation::set_allocated_update(::io::deephaven::proto::backplane::grpc::SelectOrUpdateRequest* update) {
-  ::google::protobuf::Arena* message_arena = GetArena();
-  clear_op();
-  if (update) {
-    ::google::protobuf::Arena* submessage_arena = update->GetArena();
-    if (message_arena != submessage_arena) {
-      update = ::google::protobuf::internal::GetOwnedMessage(message_arena, update, submessage_arena);
-    }
-    set_has_update();
-    _impl_.op_.update_ = update;
-  }
-  // @@protoc_insertion_point(field_set_allocated:io.deephaven.proto.backplane.grpc.BatchTableRequest.Operation.update)
-}
-void BatchTableRequest_Operation::set_allocated_lazy_update(::io::deephaven::proto::backplane::grpc::SelectOrUpdateRequest* lazy_update) {
-  ::google::protobuf::Arena* message_arena = GetArena();
-  clear_op();
-  if (lazy_update) {
-    ::google::protobuf::Arena* submessage_arena = lazy_update->GetArena();
-    if (message_arena != submessage_arena) {
-      lazy_update = ::google::protobuf::internal::GetOwnedMessage(message_arena, lazy_update, submessage_arena);
-    }
-    set_has_lazy_update();
-    _impl_.op_.lazy_update_ = lazy_update;
-  }
-  // @@protoc_insertion_point(field_set_allocated:io.deephaven.proto.backplane.grpc.BatchTableRequest.Operation.lazy_update)
-}
-void BatchTableRequest_Operation::set_allocated_view(::io::deephaven::proto::backplane::grpc::SelectOrUpdateRequest* view) {
-  ::google::protobuf::Arena* message_arena = GetArena();
-  clear_op();
-  if (view) {
-    ::google::protobuf::Arena* submessage_arena = view->GetArena();
-    if (message_arena != submessage_arena) {
-      view = ::google::protobuf::internal::GetOwnedMessage(message_arena, view, submessage_arena);
-    }
-    set_has_view();
-    _impl_.op_.view_ = view;
-  }
-  // @@protoc_insertion_point(field_set_allocated:io.deephaven.proto.backplane.grpc.BatchTableRequest.Operation.view)
-}
-void BatchTableRequest_Operation::set_allocated_update_view(::io::deephaven::proto::backplane::grpc::SelectOrUpdateRequest* update_view) {
-  ::google::protobuf::Arena* message_arena = GetArena();
-  clear_op();
-  if (update_view) {
-    ::google::protobuf::Arena* submessage_arena = update_view->GetArena();
-    if (message_arena != submessage_arena) {
-      update_view = ::google::protobuf::internal::GetOwnedMessage(message_arena, update_view, submessage_arena);
-    }
-    set_has_update_view();
-    _impl_.op_.update_view_ = update_view;
-  }
-  // @@protoc_insertion_point(field_set_allocated:io.deephaven.proto.backplane.grpc.BatchTableRequest.Operation.update_view)
-}
-void BatchTableRequest_Operation::set_allocated_select(::io::deephaven::proto::backplane::grpc::SelectOrUpdateRequest* select) {
-  ::google::protobuf::Arena* message_arena = GetArena();
-  clear_op();
-  if (select) {
-    ::google::protobuf::Arena* submessage_arena = select->GetArena();
-    if (message_arena != submessage_arena) {
-      select = ::google::protobuf::internal::GetOwnedMessage(message_arena, select, submessage_arena);
-    }
-    set_has_select();
-    _impl_.op_.select_ = select;
-  }
-  // @@protoc_insertion_point(field_set_allocated:io.deephaven.proto.backplane.grpc.BatchTableRequest.Operation.select)
-}
-void BatchTableRequest_Operation::set_allocated_select_distinct(::io::deephaven::proto::backplane::grpc::SelectDistinctRequest* select_distinct) {
-  ::google::protobuf::Arena* message_arena = GetArena();
-  clear_op();
-  if (select_distinct) {
-    ::google::protobuf::Arena* submessage_arena = select_distinct->GetArena();
-    if (message_arena != submessage_arena) {
-      select_distinct = ::google::protobuf::internal::GetOwnedMessage(message_arena, select_distinct, submessage_arena);
-    }
-    set_has_select_distinct();
-    _impl_.op_.select_distinct_ = select_distinct;
-  }
-  // @@protoc_insertion_point(field_set_allocated:io.deephaven.proto.backplane.grpc.BatchTableRequest.Operation.select_distinct)
-}
-void BatchTableRequest_Operation::set_allocated_filter(::io::deephaven::proto::backplane::grpc::FilterTableRequest* filter) {
-  ::google::protobuf::Arena* message_arena = GetArena();
-  clear_op();
-  if (filter) {
-    ::google::protobuf::Arena* submessage_arena = filter->GetArena();
-    if (message_arena != submessage_arena) {
-      filter = ::google::protobuf::internal::GetOwnedMessage(message_arena, filter, submessage_arena);
-    }
-    set_has_filter();
-    _impl_.op_.filter_ = filter;
-  }
-  // @@protoc_insertion_point(field_set_allocated:io.deephaven.proto.backplane.grpc.BatchTableRequest.Operation.filter)
-}
-void BatchTableRequest_Operation::set_allocated_unstructured_filter(::io::deephaven::proto::backplane::grpc::UnstructuredFilterTableRequest* unstructured_filter) {
-  ::google::protobuf::Arena* message_arena = GetArena();
-  clear_op();
-  if (unstructured_filter) {
-    ::google::protobuf::Arena* submessage_arena = unstructured_filter->GetArena();
-    if (message_arena != submessage_arena) {
-      unstructured_filter = ::google::protobuf::internal::GetOwnedMessage(message_arena, unstructured_filter, submessage_arena);
-    }
-    set_has_unstructured_filter();
-    _impl_.op_.unstructured_filter_ = unstructured_filter;
-  }
-  // @@protoc_insertion_point(field_set_allocated:io.deephaven.proto.backplane.grpc.BatchTableRequest.Operation.unstructured_filter)
-}
-void BatchTableRequest_Operation::set_allocated_sort(::io::deephaven::proto::backplane::grpc::SortTableRequest* sort) {
-  ::google::protobuf::Arena* message_arena = GetArena();
-  clear_op();
-  if (sort) {
-    ::google::protobuf::Arena* submessage_arena = sort->GetArena();
-    if (message_arena != submessage_arena) {
-      sort = ::google::protobuf::internal::GetOwnedMessage(message_arena, sort, submessage_arena);
-    }
-    set_has_sort();
-    _impl_.op_.sort_ = sort;
-  }
-  // @@protoc_insertion_point(field_set_allocated:io.deephaven.proto.backplane.grpc.BatchTableRequest.Operation.sort)
-}
-void BatchTableRequest_Operation::set_allocated_head(::io::deephaven::proto::backplane::grpc::HeadOrTailRequest* head) {
-  ::google::protobuf::Arena* message_arena = GetArena();
-  clear_op();
-  if (head) {
-    ::google::protobuf::Arena* submessage_arena = head->GetArena();
-    if (message_arena != submessage_arena) {
-      head = ::google::protobuf::internal::GetOwnedMessage(message_arena, head, submessage_arena);
-    }
-    set_has_head();
-    _impl_.op_.head_ = head;
-  }
-  // @@protoc_insertion_point(field_set_allocated:io.deephaven.proto.backplane.grpc.BatchTableRequest.Operation.head)
-}
-void BatchTableRequest_Operation::set_allocated_tail(::io::deephaven::proto::backplane::grpc::HeadOrTailRequest* tail) {
-  ::google::protobuf::Arena* message_arena = GetArena();
-  clear_op();
-  if (tail) {
-    ::google::protobuf::Arena* submessage_arena = tail->GetArena();
-    if (message_arena != submessage_arena) {
-      tail = ::google::protobuf::internal::GetOwnedMessage(message_arena, tail, submessage_arena);
-    }
-    set_has_tail();
-    _impl_.op_.tail_ = tail;
-  }
-  // @@protoc_insertion_point(field_set_allocated:io.deephaven.proto.backplane.grpc.BatchTableRequest.Operation.tail)
-}
-void BatchTableRequest_Operation::set_allocated_head_by(::io::deephaven::proto::backplane::grpc::HeadOrTailByRequest* head_by) {
-  ::google::protobuf::Arena* message_arena = GetArena();
-  clear_op();
-  if (head_by) {
-    ::google::protobuf::Arena* submessage_arena = head_by->GetArena();
-    if (message_arena != submessage_arena) {
-      head_by = ::google::protobuf::internal::GetOwnedMessage(message_arena, head_by, submessage_arena);
-    }
-    set_has_head_by();
-    _impl_.op_.head_by_ = head_by;
-  }
-  // @@protoc_insertion_point(field_set_allocated:io.deephaven.proto.backplane.grpc.BatchTableRequest.Operation.head_by)
-}
-void BatchTableRequest_Operation::set_allocated_tail_by(::io::deephaven::proto::backplane::grpc::HeadOrTailByRequest* tail_by) {
-  ::google::protobuf::Arena* message_arena = GetArena();
-  clear_op();
-  if (tail_by) {
-    ::google::protobuf::Arena* submessage_arena = tail_by->GetArena();
-    if (message_arena != submessage_arena) {
-      tail_by = ::google::protobuf::internal::GetOwnedMessage(message_arena, tail_by, submessage_arena);
-    }
-    set_has_tail_by();
-    _impl_.op_.tail_by_ = tail_by;
-  }
-  // @@protoc_insertion_point(field_set_allocated:io.deephaven.proto.backplane.grpc.BatchTableRequest.Operation.tail_by)
-}
-void BatchTableRequest_Operation::set_allocated_ungroup(::io::deephaven::proto::backplane::grpc::UngroupRequest* ungroup) {
-  ::google::protobuf::Arena* message_arena = GetArena();
-  clear_op();
-  if (ungroup) {
-    ::google::protobuf::Arena* submessage_arena = ungroup->GetArena();
-    if (message_arena != submessage_arena) {
-      ungroup = ::google::protobuf::internal::GetOwnedMessage(message_arena, ungroup, submessage_arena);
-    }
-    set_has_ungroup();
-    _impl_.op_.ungroup_ = ungroup;
-  }
-  // @@protoc_insertion_point(field_set_allocated:io.deephaven.proto.backplane.grpc.BatchTableRequest.Operation.ungroup)
-}
-void BatchTableRequest_Operation::set_allocated_merge(::io::deephaven::proto::backplane::grpc::MergeTablesRequest* merge) {
-  ::google::protobuf::Arena* message_arena = GetArena();
-  clear_op();
-  if (merge) {
-    ::google::protobuf::Arena* submessage_arena = merge->GetArena();
-    if (message_arena != submessage_arena) {
-      merge = ::google::protobuf::internal::GetOwnedMessage(message_arena, merge, submessage_arena);
-    }
-    set_has_merge();
-    _impl_.op_.merge_ = merge;
-  }
-  // @@protoc_insertion_point(field_set_allocated:io.deephaven.proto.backplane.grpc.BatchTableRequest.Operation.merge)
-}
-void BatchTableRequest_Operation::set_allocated_combo_aggregate(::io::deephaven::proto::backplane::grpc::ComboAggregateRequest* combo_aggregate) {
-  ::google::protobuf::Arena* message_arena = GetArena();
-  clear_op();
-  if (combo_aggregate) {
-    ::google::protobuf::Arena* submessage_arena = combo_aggregate->GetArena();
-    if (message_arena != submessage_arena) {
-      combo_aggregate = ::google::protobuf::internal::GetOwnedMessage(message_arena, combo_aggregate, submessage_arena);
-    }
-    set_has_combo_aggregate();
-    _impl_.op_.combo_aggregate_ = combo_aggregate;
-  }
-  // @@protoc_insertion_point(field_set_allocated:io.deephaven.proto.backplane.grpc.BatchTableRequest.Operation.combo_aggregate)
-}
-void BatchTableRequest_Operation::set_allocated_flatten(::io::deephaven::proto::backplane::grpc::FlattenRequest* flatten) {
-  ::google::protobuf::Arena* message_arena = GetArena();
-  clear_op();
-  if (flatten) {
-    ::google::protobuf::Arena* submessage_arena = flatten->GetArena();
-    if (message_arena != submessage_arena) {
-      flatten = ::google::protobuf::internal::GetOwnedMessage(message_arena, flatten, submessage_arena);
-    }
-    set_has_flatten();
-    _impl_.op_.flatten_ = flatten;
-  }
-  // @@protoc_insertion_point(field_set_allocated:io.deephaven.proto.backplane.grpc.BatchTableRequest.Operation.flatten)
-}
-void BatchTableRequest_Operation::set_allocated_run_chart_downsample(::io::deephaven::proto::backplane::grpc::RunChartDownsampleRequest* run_chart_downsample) {
-  ::google::protobuf::Arena* message_arena = GetArena();
-  clear_op();
-  if (run_chart_downsample) {
-    ::google::protobuf::Arena* submessage_arena = run_chart_downsample->GetArena();
-    if (message_arena != submessage_arena) {
-      run_chart_downsample = ::google::protobuf::internal::GetOwnedMessage(message_arena, run_chart_downsample, submessage_arena);
-    }
-    set_has_run_chart_downsample();
-    _impl_.op_.run_chart_downsample_ = run_chart_downsample;
-  }
-  // @@protoc_insertion_point(field_set_allocated:io.deephaven.proto.backplane.grpc.BatchTableRequest.Operation.run_chart_downsample)
-}
-void BatchTableRequest_Operation::set_allocated_cross_join(::io::deephaven::proto::backplane::grpc::CrossJoinTablesRequest* cross_join) {
-  ::google::protobuf::Arena* message_arena = GetArena();
-  clear_op();
-  if (cross_join) {
-    ::google::protobuf::Arena* submessage_arena = cross_join->GetArena();
-    if (message_arena != submessage_arena) {
-      cross_join = ::google::protobuf::internal::GetOwnedMessage(message_arena, cross_join, submessage_arena);
-    }
-    set_has_cross_join();
-    _impl_.op_.cross_join_ = cross_join;
-  }
-  // @@protoc_insertion_point(field_set_allocated:io.deephaven.proto.backplane.grpc.BatchTableRequest.Operation.cross_join)
-}
-void BatchTableRequest_Operation::set_allocated_natural_join(::io::deephaven::proto::backplane::grpc::NaturalJoinTablesRequest* natural_join) {
-  ::google::protobuf::Arena* message_arena = GetArena();
-  clear_op();
-  if (natural_join) {
-    ::google::protobuf::Arena* submessage_arena = natural_join->GetArena();
-    if (message_arena != submessage_arena) {
-      natural_join = ::google::protobuf::internal::GetOwnedMessage(message_arena, natural_join, submessage_arena);
-    }
-    set_has_natural_join();
-    _impl_.op_.natural_join_ = natural_join;
-  }
-  // @@protoc_insertion_point(field_set_allocated:io.deephaven.proto.backplane.grpc.BatchTableRequest.Operation.natural_join)
-}
-void BatchTableRequest_Operation::set_allocated_exact_join(::io::deephaven::proto::backplane::grpc::ExactJoinTablesRequest* exact_join) {
-  ::google::protobuf::Arena* message_arena = GetArena();
-  clear_op();
-  if (exact_join) {
-    ::google::protobuf::Arena* submessage_arena = exact_join->GetArena();
-    if (message_arena != submessage_arena) {
-      exact_join = ::google::protobuf::internal::GetOwnedMessage(message_arena, exact_join, submessage_arena);
-    }
-    set_has_exact_join();
-    _impl_.op_.exact_join_ = exact_join;
-  }
-  // @@protoc_insertion_point(field_set_allocated:io.deephaven.proto.backplane.grpc.BatchTableRequest.Operation.exact_join)
-}
-void BatchTableRequest_Operation::set_allocated_left_join(::io::deephaven::proto::backplane::grpc::LeftJoinTablesRequest* left_join) {
-  ::google::protobuf::Arena* message_arena = GetArena();
-  clear_op();
-  if (left_join) {
-    ::google::protobuf::Arena* submessage_arena = left_join->GetArena();
-    if (message_arena != submessage_arena) {
-      left_join = ::google::protobuf::internal::GetOwnedMessage(message_arena, left_join, submessage_arena);
-    }
-    set_has_left_join();
-    _impl_.op_.left_join_ = left_join;
-  }
-  // @@protoc_insertion_point(field_set_allocated:io.deephaven.proto.backplane.grpc.BatchTableRequest.Operation.left_join)
-}
-void BatchTableRequest_Operation::set_allocated_as_of_join(::io::deephaven::proto::backplane::grpc::AsOfJoinTablesRequest* as_of_join) {
-  ::google::protobuf::Arena* message_arena = GetArena();
-  clear_op();
-  if (as_of_join) {
-    ::google::protobuf::Arena* submessage_arena = as_of_join->GetArena();
-    if (message_arena != submessage_arena) {
-      as_of_join = ::google::protobuf::internal::GetOwnedMessage(message_arena, as_of_join, submessage_arena);
-    }
-    set_has_as_of_join();
-    _impl_.op_.as_of_join_ = as_of_join;
-  }
-  // @@protoc_insertion_point(field_set_allocated:io.deephaven.proto.backplane.grpc.BatchTableRequest.Operation.as_of_join)
-}
-void BatchTableRequest_Operation::set_allocated_fetch_table(::io::deephaven::proto::backplane::grpc::FetchTableRequest* fetch_table) {
-  ::google::protobuf::Arena* message_arena = GetArena();
-  clear_op();
-  if (fetch_table) {
-    ::google::protobuf::Arena* submessage_arena = fetch_table->GetArena();
-    if (message_arena != submessage_arena) {
-      fetch_table = ::google::protobuf::internal::GetOwnedMessage(message_arena, fetch_table, submessage_arena);
-    }
-    set_has_fetch_table();
-    _impl_.op_.fetch_table_ = fetch_table;
-  }
-  // @@protoc_insertion_point(field_set_allocated:io.deephaven.proto.backplane.grpc.BatchTableRequest.Operation.fetch_table)
-}
-void BatchTableRequest_Operation::set_allocated_apply_preview_columns(::io::deephaven::proto::backplane::grpc::ApplyPreviewColumnsRequest* apply_preview_columns) {
-  ::google::protobuf::Arena* message_arena = GetArena();
-  clear_op();
-  if (apply_preview_columns) {
-    ::google::protobuf::Arena* submessage_arena = apply_preview_columns->GetArena();
-    if (message_arena != submessage_arena) {
-      apply_preview_columns = ::google::protobuf::internal::GetOwnedMessage(message_arena, apply_preview_columns, submessage_arena);
-    }
-    set_has_apply_preview_columns();
-    _impl_.op_.apply_preview_columns_ = apply_preview_columns;
-  }
-  // @@protoc_insertion_point(field_set_allocated:io.deephaven.proto.backplane.grpc.BatchTableRequest.Operation.apply_preview_columns)
-}
-void BatchTableRequest_Operation::set_allocated_create_input_table(::io::deephaven::proto::backplane::grpc::CreateInputTableRequest* create_input_table) {
-  ::google::protobuf::Arena* message_arena = GetArena();
-  clear_op();
-  if (create_input_table) {
-    ::google::protobuf::Arena* submessage_arena = create_input_table->GetArena();
-    if (message_arena != submessage_arena) {
-      create_input_table = ::google::protobuf::internal::GetOwnedMessage(message_arena, create_input_table, submessage_arena);
-    }
-    set_has_create_input_table();
-    _impl_.op_.create_input_table_ = create_input_table;
-  }
-  // @@protoc_insertion_point(field_set_allocated:io.deephaven.proto.backplane.grpc.BatchTableRequest.Operation.create_input_table)
-}
-void BatchTableRequest_Operation::set_allocated_update_by(::io::deephaven::proto::backplane::grpc::UpdateByRequest* update_by) {
-  ::google::protobuf::Arena* message_arena = GetArena();
-  clear_op();
-  if (update_by) {
-    ::google::protobuf::Arena* submessage_arena = update_by->GetArena();
-    if (message_arena != submessage_arena) {
-      update_by = ::google::protobuf::internal::GetOwnedMessage(message_arena, update_by, submessage_arena);
-    }
-    set_has_update_by();
-    _impl_.op_.update_by_ = update_by;
-  }
-  // @@protoc_insertion_point(field_set_allocated:io.deephaven.proto.backplane.grpc.BatchTableRequest.Operation.update_by)
-}
-void BatchTableRequest_Operation::set_allocated_where_in(::io::deephaven::proto::backplane::grpc::WhereInRequest* where_in) {
-  ::google::protobuf::Arena* message_arena = GetArena();
-  clear_op();
-  if (where_in) {
-    ::google::protobuf::Arena* submessage_arena = where_in->GetArena();
-    if (message_arena != submessage_arena) {
-      where_in = ::google::protobuf::internal::GetOwnedMessage(message_arena, where_in, submessage_arena);
-    }
-    set_has_where_in();
-    _impl_.op_.where_in_ = where_in;
-  }
-  // @@protoc_insertion_point(field_set_allocated:io.deephaven.proto.backplane.grpc.BatchTableRequest.Operation.where_in)
-}
-void BatchTableRequest_Operation::set_allocated_aggregate_all(::io::deephaven::proto::backplane::grpc::AggregateAllRequest* aggregate_all) {
-  ::google::protobuf::Arena* message_arena = GetArena();
-  clear_op();
-  if (aggregate_all) {
-    ::google::protobuf::Arena* submessage_arena = aggregate_all->GetArena();
-    if (message_arena != submessage_arena) {
-      aggregate_all = ::google::protobuf::internal::GetOwnedMessage(message_arena, aggregate_all, submessage_arena);
-    }
-    set_has_aggregate_all();
-    _impl_.op_.aggregate_all_ = aggregate_all;
-  }
-  // @@protoc_insertion_point(field_set_allocated:io.deephaven.proto.backplane.grpc.BatchTableRequest.Operation.aggregate_all)
-}
-void BatchTableRequest_Operation::set_allocated_aggregate(::io::deephaven::proto::backplane::grpc::AggregateRequest* aggregate) {
-  ::google::protobuf::Arena* message_arena = GetArena();
-  clear_op();
-  if (aggregate) {
-    ::google::protobuf::Arena* submessage_arena = aggregate->GetArena();
-    if (message_arena != submessage_arena) {
-      aggregate = ::google::protobuf::internal::GetOwnedMessage(message_arena, aggregate, submessage_arena);
-    }
-    set_has_aggregate();
-    _impl_.op_.aggregate_ = aggregate;
-  }
-  // @@protoc_insertion_point(field_set_allocated:io.deephaven.proto.backplane.grpc.BatchTableRequest.Operation.aggregate)
-}
-void BatchTableRequest_Operation::set_allocated_snapshot(::io::deephaven::proto::backplane::grpc::SnapshotTableRequest* snapshot) {
-  ::google::protobuf::Arena* message_arena = GetArena();
-  clear_op();
-  if (snapshot) {
-    ::google::protobuf::Arena* submessage_arena = snapshot->GetArena();
-    if (message_arena != submessage_arena) {
-      snapshot = ::google::protobuf::internal::GetOwnedMessage(message_arena, snapshot, submessage_arena);
-    }
-    set_has_snapshot();
-    _impl_.op_.snapshot_ = snapshot;
-  }
-  // @@protoc_insertion_point(field_set_allocated:io.deephaven.proto.backplane.grpc.BatchTableRequest.Operation.snapshot)
-}
-void BatchTableRequest_Operation::set_allocated_snapshot_when(::io::deephaven::proto::backplane::grpc::SnapshotWhenTableRequest* snapshot_when) {
-  ::google::protobuf::Arena* message_arena = GetArena();
-  clear_op();
-  if (snapshot_when) {
-    ::google::protobuf::Arena* submessage_arena = snapshot_when->GetArena();
-    if (message_arena != submessage_arena) {
-      snapshot_when = ::google::protobuf::internal::GetOwnedMessage(message_arena, snapshot_when, submessage_arena);
-    }
-    set_has_snapshot_when();
-    _impl_.op_.snapshot_when_ = snapshot_when;
-  }
-  // @@protoc_insertion_point(field_set_allocated:io.deephaven.proto.backplane.grpc.BatchTableRequest.Operation.snapshot_when)
-}
-void BatchTableRequest_Operation::set_allocated_meta_table(::io::deephaven::proto::backplane::grpc::MetaTableRequest* meta_table) {
-  ::google::protobuf::Arena* message_arena = GetArena();
-  clear_op();
-  if (meta_table) {
-    ::google::protobuf::Arena* submessage_arena = meta_table->GetArena();
-    if (message_arena != submessage_arena) {
-      meta_table = ::google::protobuf::internal::GetOwnedMessage(message_arena, meta_table, submessage_arena);
-    }
-    set_has_meta_table();
-    _impl_.op_.meta_table_ = meta_table;
-  }
-  // @@protoc_insertion_point(field_set_allocated:io.deephaven.proto.backplane.grpc.BatchTableRequest.Operation.meta_table)
-}
-void BatchTableRequest_Operation::set_allocated_range_join(::io::deephaven::proto::backplane::grpc::RangeJoinTablesRequest* range_join) {
-  ::google::protobuf::Arena* message_arena = GetArena();
-  clear_op();
-  if (range_join) {
-    ::google::protobuf::Arena* submessage_arena = range_join->GetArena();
-    if (message_arena != submessage_arena) {
-      range_join = ::google::protobuf::internal::GetOwnedMessage(message_arena, range_join, submessage_arena);
-    }
-    set_has_range_join();
-    _impl_.op_.range_join_ = range_join;
-  }
-  // @@protoc_insertion_point(field_set_allocated:io.deephaven.proto.backplane.grpc.BatchTableRequest.Operation.range_join)
-}
-void BatchTableRequest_Operation::set_allocated_aj(::io::deephaven::proto::backplane::grpc::AjRajTablesRequest* aj) {
-  ::google::protobuf::Arena* message_arena = GetArena();
-  clear_op();
-  if (aj) {
-    ::google::protobuf::Arena* submessage_arena = aj->GetArena();
-    if (message_arena != submessage_arena) {
-      aj = ::google::protobuf::internal::GetOwnedMessage(message_arena, aj, submessage_arena);
-    }
-    set_has_aj();
-    _impl_.op_.aj_ = aj;
-  }
-  // @@protoc_insertion_point(field_set_allocated:io.deephaven.proto.backplane.grpc.BatchTableRequest.Operation.aj)
-}
-void BatchTableRequest_Operation::set_allocated_raj(::io::deephaven::proto::backplane::grpc::AjRajTablesRequest* raj) {
-  ::google::protobuf::Arena* message_arena = GetArena();
-  clear_op();
-  if (raj) {
-    ::google::protobuf::Arena* submessage_arena = raj->GetArena();
-    if (message_arena != submessage_arena) {
-      raj = ::google::protobuf::internal::GetOwnedMessage(message_arena, raj, submessage_arena);
-    }
-    set_has_raj();
-    _impl_.op_.raj_ = raj;
-  }
-  // @@protoc_insertion_point(field_set_allocated:io.deephaven.proto.backplane.grpc.BatchTableRequest.Operation.raj)
-}
-void BatchTableRequest_Operation::set_allocated_column_statistics(::io::deephaven::proto::backplane::grpc::ColumnStatisticsRequest* column_statistics) {
-  ::google::protobuf::Arena* message_arena = GetArena();
-  clear_op();
-  if (column_statistics) {
-    ::google::protobuf::Arena* submessage_arena = column_statistics->GetArena();
-    if (message_arena != submessage_arena) {
-      column_statistics = ::google::protobuf::internal::GetOwnedMessage(message_arena, column_statistics, submessage_arena);
-    }
-    set_has_column_statistics();
-    _impl_.op_.column_statistics_ = column_statistics;
-  }
-  // @@protoc_insertion_point(field_set_allocated:io.deephaven.proto.backplane.grpc.BatchTableRequest.Operation.column_statistics)
-}
-void BatchTableRequest_Operation::set_allocated_multi_join(::io::deephaven::proto::backplane::grpc::MultiJoinTablesRequest* multi_join) {
-  ::google::protobuf::Arena* message_arena = GetArena();
-  clear_op();
-  if (multi_join) {
-    ::google::protobuf::Arena* submessage_arena = multi_join->GetArena();
-    if (message_arena != submessage_arena) {
-      multi_join = ::google::protobuf::internal::GetOwnedMessage(message_arena, multi_join, submessage_arena);
-    }
-    set_has_multi_join();
-    _impl_.op_.multi_join_ = multi_join;
-  }
-  // @@protoc_insertion_point(field_set_allocated:io.deephaven.proto.backplane.grpc.BatchTableRequest.Operation.multi_join)
-}
-BatchTableRequest_Operation::BatchTableRequest_Operation(::google::protobuf::Arena* arena)
-    : ::google::protobuf::Message(arena) {
-  SharedCtor(arena);
-  // @@protoc_insertion_point(arena_constructor:io.deephaven.proto.backplane.grpc.BatchTableRequest.Operation)
-}
-inline PROTOBUF_NDEBUG_INLINE BatchTableRequest_Operation::Impl_::Impl_(
-    ::google::protobuf::internal::InternalVisibility visibility, ::google::protobuf::Arena* arena,
-    const Impl_& from)
-      : op_{},
-        _cached_size_{0},
-        _oneof_case_{from._oneof_case_[0]} {}
-
-BatchTableRequest_Operation::BatchTableRequest_Operation(
-    ::google::protobuf::Arena* arena,
-    const BatchTableRequest_Operation& from)
-    : ::google::protobuf::Message(arena) {
-  BatchTableRequest_Operation* const _this = this;
-  (void)_this;
-  _internal_metadata_.MergeFrom<::google::protobuf::UnknownFieldSet>(
-      from._internal_metadata_);
-  new (&_impl_) Impl_(internal_visibility(), arena, from._impl_);
-  switch (op_case()) {
-    case OP_NOT_SET:
-      break;
-      case kEmptyTable:
-        _impl_.op_.empty_table_ = CreateMaybeMessage<::io::deephaven::proto::backplane::grpc::EmptyTableRequest>(arena, *from._impl_.op_.empty_table_);
-        break;
-      case kTimeTable:
-        _impl_.op_.time_table_ = CreateMaybeMessage<::io::deephaven::proto::backplane::grpc::TimeTableRequest>(arena, *from._impl_.op_.time_table_);
-        break;
-      case kDropColumns:
-        _impl_.op_.drop_columns_ = CreateMaybeMessage<::io::deephaven::proto::backplane::grpc::DropColumnsRequest>(arena, *from._impl_.op_.drop_columns_);
-        break;
-      case kUpdate:
-        _impl_.op_.update_ = CreateMaybeMessage<::io::deephaven::proto::backplane::grpc::SelectOrUpdateRequest>(arena, *from._impl_.op_.update_);
-        break;
-      case kLazyUpdate:
-        _impl_.op_.lazy_update_ = CreateMaybeMessage<::io::deephaven::proto::backplane::grpc::SelectOrUpdateRequest>(arena, *from._impl_.op_.lazy_update_);
-        break;
-      case kView:
-        _impl_.op_.view_ = CreateMaybeMessage<::io::deephaven::proto::backplane::grpc::SelectOrUpdateRequest>(arena, *from._impl_.op_.view_);
-        break;
-      case kUpdateView:
-        _impl_.op_.update_view_ = CreateMaybeMessage<::io::deephaven::proto::backplane::grpc::SelectOrUpdateRequest>(arena, *from._impl_.op_.update_view_);
-        break;
-      case kSelect:
-        _impl_.op_.select_ = CreateMaybeMessage<::io::deephaven::proto::backplane::grpc::SelectOrUpdateRequest>(arena, *from._impl_.op_.select_);
-        break;
-      case kSelectDistinct:
-        _impl_.op_.select_distinct_ = CreateMaybeMessage<::io::deephaven::proto::backplane::grpc::SelectDistinctRequest>(arena, *from._impl_.op_.select_distinct_);
-        break;
-      case kFilter:
-        _impl_.op_.filter_ = CreateMaybeMessage<::io::deephaven::proto::backplane::grpc::FilterTableRequest>(arena, *from._impl_.op_.filter_);
-        break;
-      case kUnstructuredFilter:
-        _impl_.op_.unstructured_filter_ = CreateMaybeMessage<::io::deephaven::proto::backplane::grpc::UnstructuredFilterTableRequest>(arena, *from._impl_.op_.unstructured_filter_);
-        break;
-      case kSort:
-        _impl_.op_.sort_ = CreateMaybeMessage<::io::deephaven::proto::backplane::grpc::SortTableRequest>(arena, *from._impl_.op_.sort_);
-        break;
-      case kHead:
-        _impl_.op_.head_ = CreateMaybeMessage<::io::deephaven::proto::backplane::grpc::HeadOrTailRequest>(arena, *from._impl_.op_.head_);
-        break;
-      case kTail:
-        _impl_.op_.tail_ = CreateMaybeMessage<::io::deephaven::proto::backplane::grpc::HeadOrTailRequest>(arena, *from._impl_.op_.tail_);
-        break;
-      case kHeadBy:
-        _impl_.op_.head_by_ = CreateMaybeMessage<::io::deephaven::proto::backplane::grpc::HeadOrTailByRequest>(arena, *from._impl_.op_.head_by_);
-        break;
-      case kTailBy:
-        _impl_.op_.tail_by_ = CreateMaybeMessage<::io::deephaven::proto::backplane::grpc::HeadOrTailByRequest>(arena, *from._impl_.op_.tail_by_);
-        break;
-      case kUngroup:
-        _impl_.op_.ungroup_ = CreateMaybeMessage<::io::deephaven::proto::backplane::grpc::UngroupRequest>(arena, *from._impl_.op_.ungroup_);
-        break;
-      case kMerge:
-        _impl_.op_.merge_ = CreateMaybeMessage<::io::deephaven::proto::backplane::grpc::MergeTablesRequest>(arena, *from._impl_.op_.merge_);
-        break;
-      case kComboAggregate:
-        _impl_.op_.combo_aggregate_ = CreateMaybeMessage<::io::deephaven::proto::backplane::grpc::ComboAggregateRequest>(arena, *from._impl_.op_.combo_aggregate_);
-        break;
-      case kFlatten:
-        _impl_.op_.flatten_ = CreateMaybeMessage<::io::deephaven::proto::backplane::grpc::FlattenRequest>(arena, *from._impl_.op_.flatten_);
-        break;
-      case kRunChartDownsample:
-        _impl_.op_.run_chart_downsample_ = CreateMaybeMessage<::io::deephaven::proto::backplane::grpc::RunChartDownsampleRequest>(arena, *from._impl_.op_.run_chart_downsample_);
-        break;
-      case kCrossJoin:
-        _impl_.op_.cross_join_ = CreateMaybeMessage<::io::deephaven::proto::backplane::grpc::CrossJoinTablesRequest>(arena, *from._impl_.op_.cross_join_);
-        break;
-      case kNaturalJoin:
-        _impl_.op_.natural_join_ = CreateMaybeMessage<::io::deephaven::proto::backplane::grpc::NaturalJoinTablesRequest>(arena, *from._impl_.op_.natural_join_);
-        break;
-      case kExactJoin:
-        _impl_.op_.exact_join_ = CreateMaybeMessage<::io::deephaven::proto::backplane::grpc::ExactJoinTablesRequest>(arena, *from._impl_.op_.exact_join_);
-        break;
-      case kLeftJoin:
-        _impl_.op_.left_join_ = CreateMaybeMessage<::io::deephaven::proto::backplane::grpc::LeftJoinTablesRequest>(arena, *from._impl_.op_.left_join_);
-        break;
-      case kAsOfJoin:
-        _impl_.op_.as_of_join_ = CreateMaybeMessage<::io::deephaven::proto::backplane::grpc::AsOfJoinTablesRequest>(arena, *from._impl_.op_.as_of_join_);
-        break;
-      case kFetchTable:
-        _impl_.op_.fetch_table_ = CreateMaybeMessage<::io::deephaven::proto::backplane::grpc::FetchTableRequest>(arena, *from._impl_.op_.fetch_table_);
-        break;
-      case kApplyPreviewColumns:
-        _impl_.op_.apply_preview_columns_ = CreateMaybeMessage<::io::deephaven::proto::backplane::grpc::ApplyPreviewColumnsRequest>(arena, *from._impl_.op_.apply_preview_columns_);
-        break;
-      case kCreateInputTable:
-        _impl_.op_.create_input_table_ = CreateMaybeMessage<::io::deephaven::proto::backplane::grpc::CreateInputTableRequest>(arena, *from._impl_.op_.create_input_table_);
-        break;
-      case kUpdateBy:
-        _impl_.op_.update_by_ = CreateMaybeMessage<::io::deephaven::proto::backplane::grpc::UpdateByRequest>(arena, *from._impl_.op_.update_by_);
-        break;
-      case kWhereIn:
-        _impl_.op_.where_in_ = CreateMaybeMessage<::io::deephaven::proto::backplane::grpc::WhereInRequest>(arena, *from._impl_.op_.where_in_);
-        break;
-      case kAggregateAll:
-        _impl_.op_.aggregate_all_ = CreateMaybeMessage<::io::deephaven::proto::backplane::grpc::AggregateAllRequest>(arena, *from._impl_.op_.aggregate_all_);
-        break;
-      case kAggregate:
-        _impl_.op_.aggregate_ = CreateMaybeMessage<::io::deephaven::proto::backplane::grpc::AggregateRequest>(arena, *from._impl_.op_.aggregate_);
-        break;
-      case kSnapshot:
-        _impl_.op_.snapshot_ = CreateMaybeMessage<::io::deephaven::proto::backplane::grpc::SnapshotTableRequest>(arena, *from._impl_.op_.snapshot_);
-        break;
-      case kSnapshotWhen:
-        _impl_.op_.snapshot_when_ = CreateMaybeMessage<::io::deephaven::proto::backplane::grpc::SnapshotWhenTableRequest>(arena, *from._impl_.op_.snapshot_when_);
-        break;
-      case kMetaTable:
-        _impl_.op_.meta_table_ = CreateMaybeMessage<::io::deephaven::proto::backplane::grpc::MetaTableRequest>(arena, *from._impl_.op_.meta_table_);
-        break;
-      case kRangeJoin:
-        _impl_.op_.range_join_ = CreateMaybeMessage<::io::deephaven::proto::backplane::grpc::RangeJoinTablesRequest>(arena, *from._impl_.op_.range_join_);
-        break;
-      case kAj:
-        _impl_.op_.aj_ = CreateMaybeMessage<::io::deephaven::proto::backplane::grpc::AjRajTablesRequest>(arena, *from._impl_.op_.aj_);
-        break;
-      case kRaj:
-        _impl_.op_.raj_ = CreateMaybeMessage<::io::deephaven::proto::backplane::grpc::AjRajTablesRequest>(arena, *from._impl_.op_.raj_);
-        break;
-      case kColumnStatistics:
-        _impl_.op_.column_statistics_ = CreateMaybeMessage<::io::deephaven::proto::backplane::grpc::ColumnStatisticsRequest>(arena, *from._impl_.op_.column_statistics_);
-        break;
-      case kMultiJoin:
-        _impl_.op_.multi_join_ = CreateMaybeMessage<::io::deephaven::proto::backplane::grpc::MultiJoinTablesRequest>(arena, *from._impl_.op_.multi_join_);
-        break;
-  }
-
-  // @@protoc_insertion_point(copy_constructor:io.deephaven.proto.backplane.grpc.BatchTableRequest.Operation)
-}
-inline PROTOBUF_NDEBUG_INLINE BatchTableRequest_Operation::Impl_::Impl_(
-    ::google::protobuf::internal::InternalVisibility visibility,
-    ::google::protobuf::Arena* arena)
-      : op_{},
-        _cached_size_{0},
-        _oneof_case_{} {}
-
-inline void BatchTableRequest_Operation::SharedCtor(::_pb::Arena* arena) {
-  new (&_impl_) Impl_(internal_visibility(), arena);
-}
-BatchTableRequest_Operation::~BatchTableRequest_Operation() {
-  // @@protoc_insertion_point(destructor:io.deephaven.proto.backplane.grpc.BatchTableRequest.Operation)
-  _internal_metadata_.Delete<::google::protobuf::UnknownFieldSet>();
-  SharedDtor();
-}
-inline void BatchTableRequest_Operation::SharedDtor() {
-  ABSL_DCHECK(GetArena() == nullptr);
-  if (has_op()) {
-    clear_op();
-  }
-  _impl_.~Impl_();
-}
-
-void BatchTableRequest_Operation::clear_op() {
-// @@protoc_insertion_point(one_of_clear_start:io.deephaven.proto.backplane.grpc.BatchTableRequest.Operation)
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  switch (op_case()) {
-    case kEmptyTable: {
-      if (GetArena() == nullptr) {
-        delete _impl_.op_.empty_table_;
-      }
-      break;
-    }
-    case kTimeTable: {
-      if (GetArena() == nullptr) {
-        delete _impl_.op_.time_table_;
-      }
-      break;
-    }
-    case kDropColumns: {
-      if (GetArena() == nullptr) {
-        delete _impl_.op_.drop_columns_;
-      }
-      break;
-    }
-    case kUpdate: {
-      if (GetArena() == nullptr) {
-        delete _impl_.op_.update_;
-      }
-      break;
-    }
-    case kLazyUpdate: {
-      if (GetArena() == nullptr) {
-        delete _impl_.op_.lazy_update_;
-      }
-      break;
-    }
-    case kView: {
-      if (GetArena() == nullptr) {
-        delete _impl_.op_.view_;
-      }
-      break;
-    }
-    case kUpdateView: {
-      if (GetArena() == nullptr) {
-        delete _impl_.op_.update_view_;
-      }
-      break;
-    }
-    case kSelect: {
-      if (GetArena() == nullptr) {
-        delete _impl_.op_.select_;
-      }
-      break;
-    }
-    case kSelectDistinct: {
-      if (GetArena() == nullptr) {
-        delete _impl_.op_.select_distinct_;
-      }
-      break;
-    }
-    case kFilter: {
-      if (GetArena() == nullptr) {
-        delete _impl_.op_.filter_;
-      }
-      break;
-    }
-    case kUnstructuredFilter: {
-      if (GetArena() == nullptr) {
-        delete _impl_.op_.unstructured_filter_;
-      }
-      break;
-    }
-    case kSort: {
-      if (GetArena() == nullptr) {
-        delete _impl_.op_.sort_;
-      }
-      break;
-    }
-    case kHead: {
-      if (GetArena() == nullptr) {
-        delete _impl_.op_.head_;
-      }
-      break;
-    }
-    case kTail: {
-      if (GetArena() == nullptr) {
-        delete _impl_.op_.tail_;
-      }
-      break;
-    }
-    case kHeadBy: {
-      if (GetArena() == nullptr) {
-        delete _impl_.op_.head_by_;
-      }
-      break;
-    }
-    case kTailBy: {
-      if (GetArena() == nullptr) {
-        delete _impl_.op_.tail_by_;
-      }
-      break;
-    }
-    case kUngroup: {
-      if (GetArena() == nullptr) {
-        delete _impl_.op_.ungroup_;
-      }
-      break;
-    }
-    case kMerge: {
-      if (GetArena() == nullptr) {
-        delete _impl_.op_.merge_;
-      }
-      break;
-    }
-    case kComboAggregate: {
-      if (GetArena() == nullptr) {
-        delete _impl_.op_.combo_aggregate_;
-      }
-      break;
-    }
-    case kFlatten: {
-      if (GetArena() == nullptr) {
-        delete _impl_.op_.flatten_;
-      }
-      break;
-    }
-    case kRunChartDownsample: {
-      if (GetArena() == nullptr) {
-        delete _impl_.op_.run_chart_downsample_;
-      }
-      break;
-    }
-    case kCrossJoin: {
-      if (GetArena() == nullptr) {
-        delete _impl_.op_.cross_join_;
-      }
-      break;
-    }
-    case kNaturalJoin: {
-      if (GetArena() == nullptr) {
-        delete _impl_.op_.natural_join_;
-      }
-      break;
-    }
-    case kExactJoin: {
-      if (GetArena() == nullptr) {
-        delete _impl_.op_.exact_join_;
-      }
-      break;
-    }
-    case kLeftJoin: {
-      if (GetArena() == nullptr) {
-        delete _impl_.op_.left_join_;
-      }
-      break;
-    }
-    case kAsOfJoin: {
-      if (GetArena() == nullptr) {
-        delete _impl_.op_.as_of_join_;
-      }
-      break;
-    }
-    case kFetchTable: {
-      if (GetArena() == nullptr) {
-        delete _impl_.op_.fetch_table_;
-      }
-      break;
-    }
-    case kApplyPreviewColumns: {
-      if (GetArena() == nullptr) {
-        delete _impl_.op_.apply_preview_columns_;
-      }
-      break;
-    }
-    case kCreateInputTable: {
-      if (GetArena() == nullptr) {
-        delete _impl_.op_.create_input_table_;
-      }
-      break;
-    }
-    case kUpdateBy: {
-      if (GetArena() == nullptr) {
-        delete _impl_.op_.update_by_;
-      }
-      break;
-    }
-    case kWhereIn: {
-      if (GetArena() == nullptr) {
-        delete _impl_.op_.where_in_;
-      }
-      break;
-    }
-    case kAggregateAll: {
-      if (GetArena() == nullptr) {
-        delete _impl_.op_.aggregate_all_;
-      }
-      break;
-    }
-    case kAggregate: {
-      if (GetArena() == nullptr) {
-        delete _impl_.op_.aggregate_;
-      }
-      break;
-    }
-    case kSnapshot: {
-      if (GetArena() == nullptr) {
-        delete _impl_.op_.snapshot_;
-      }
-      break;
-    }
-    case kSnapshotWhen: {
-      if (GetArena() == nullptr) {
-        delete _impl_.op_.snapshot_when_;
-      }
-      break;
-    }
-    case kMetaTable: {
-      if (GetArena() == nullptr) {
-        delete _impl_.op_.meta_table_;
-      }
-      break;
-    }
-    case kRangeJoin: {
-      if (GetArena() == nullptr) {
-        delete _impl_.op_.range_join_;
-      }
-      break;
-    }
-    case kAj: {
-      if (GetArena() == nullptr) {
-        delete _impl_.op_.aj_;
-      }
-      break;
-    }
-    case kRaj: {
-      if (GetArena() == nullptr) {
-        delete _impl_.op_.raj_;
-      }
-      break;
-    }
-    case kColumnStatistics: {
-      if (GetArena() == nullptr) {
-        delete _impl_.op_.column_statistics_;
-      }
-      break;
-    }
-    case kMultiJoin: {
-      if (GetArena() == nullptr) {
-        delete _impl_.op_.multi_join_;
-      }
-      break;
-    }
-    case OP_NOT_SET: {
-      break;
-    }
-  }
-  _impl_._oneof_case_[0] = OP_NOT_SET;
-}
-
-
-PROTOBUF_NOINLINE void BatchTableRequest_Operation::Clear() {
-// @@protoc_insertion_point(message_clear_start:io.deephaven.proto.backplane.grpc.BatchTableRequest.Operation)
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  ::uint32_t cached_has_bits = 0;
-  // Prevent compiler warnings about cached_has_bits being unused
-  (void) cached_has_bits;
-
-  clear_op();
-  _internal_metadata_.Clear<::google::protobuf::UnknownFieldSet>();
-}
-
-const char* BatchTableRequest_Operation::_InternalParse(
-    const char* ptr, ::_pbi::ParseContext* ctx) {
-  ptr = ::_pbi::TcParser::ParseLoop(this, ptr, ctx, &_table_.header);
-  return ptr;
-}
-
-
-PROTOBUF_CONSTINIT PROTOBUF_ATTRIBUTE_INIT_PRIORITY1
-const ::_pbi::TcParseTable<0, 41, 41, 0, 7> BatchTableRequest_Operation::_table_ = {
-  {
-    0,  // no _has_bits_
-    0, // no _extensions_
-    43, 0,  // max_field_number, fast_idx_mask
-    offsetof(decltype(_table_), field_lookup_table),
-    268959744,  // skipmap
-    offsetof(decltype(_table_), field_entries),
-    41,  // num_field_entries
-    41,  // num_aux_entries
-    offsetof(decltype(_table_), aux_entries),
-    &_BatchTableRequest_Operation_default_instance_._instance,
-    ::_pbi::TcParser::GenericFallback,  // fallback
-  }, {{
-    {::_pbi::TcParser::MiniParse, {}},
-  }}, {{
-    33, 0, 1,
-    63488, 30,
-    65535, 65535
-  }}, {{
-    // .io.deephaven.proto.backplane.grpc.EmptyTableRequest empty_table = 1;
-    {PROTOBUF_FIELD_OFFSET(BatchTableRequest_Operation, _impl_.op_.empty_table_), _Internal::kOneofCaseOffset + 0, 0,
-    (0 | ::_fl::kFcOneof | ::_fl::kMessage | ::_fl::kTvTable)},
-    // .io.deephaven.proto.backplane.grpc.TimeTableRequest time_table = 2;
-    {PROTOBUF_FIELD_OFFSET(BatchTableRequest_Operation, _impl_.op_.time_table_), _Internal::kOneofCaseOffset + 0, 1,
-    (0 | ::_fl::kFcOneof | ::_fl::kMessage | ::_fl::kTvTable)},
-    // .io.deephaven.proto.backplane.grpc.DropColumnsRequest drop_columns = 3;
-    {PROTOBUF_FIELD_OFFSET(BatchTableRequest_Operation, _impl_.op_.drop_columns_), _Internal::kOneofCaseOffset + 0, 2,
-    (0 | ::_fl::kFcOneof | ::_fl::kMessage | ::_fl::kTvTable)},
-    // .io.deephaven.proto.backplane.grpc.SelectOrUpdateRequest update = 4;
-    {PROTOBUF_FIELD_OFFSET(BatchTableRequest_Operation, _impl_.op_.update_), _Internal::kOneofCaseOffset + 0, 3,
-    (0 | ::_fl::kFcOneof | ::_fl::kMessage | ::_fl::kTvTable)},
-    // .io.deephaven.proto.backplane.grpc.SelectOrUpdateRequest lazy_update = 5;
-    {PROTOBUF_FIELD_OFFSET(BatchTableRequest_Operation, _impl_.op_.lazy_update_), _Internal::kOneofCaseOffset + 0, 4,
-    (0 | ::_fl::kFcOneof | ::_fl::kMessage | ::_fl::kTvTable)},
-    // .io.deephaven.proto.backplane.grpc.SelectOrUpdateRequest view = 6;
-    {PROTOBUF_FIELD_OFFSET(BatchTableRequest_Operation, _impl_.op_.view_), _Internal::kOneofCaseOffset + 0, 5,
-    (0 | ::_fl::kFcOneof | ::_fl::kMessage | ::_fl::kTvTable)},
-    // .io.deephaven.proto.backplane.grpc.SelectOrUpdateRequest update_view = 7;
-    {PROTOBUF_FIELD_OFFSET(BatchTableRequest_Operation, _impl_.op_.update_view_), _Internal::kOneofCaseOffset + 0, 6,
-    (0 | ::_fl::kFcOneof | ::_fl::kMessage | ::_fl::kTvTable)},
-    // .io.deephaven.proto.backplane.grpc.SelectOrUpdateRequest select = 8;
-    {PROTOBUF_FIELD_OFFSET(BatchTableRequest_Operation, _impl_.op_.select_), _Internal::kOneofCaseOffset + 0, 7,
-    (0 | ::_fl::kFcOneof | ::_fl::kMessage | ::_fl::kTvTable)},
-    // .io.deephaven.proto.backplane.grpc.SelectDistinctRequest select_distinct = 9;
-    {PROTOBUF_FIELD_OFFSET(BatchTableRequest_Operation, _impl_.op_.select_distinct_), _Internal::kOneofCaseOffset + 0, 8,
-    (0 | ::_fl::kFcOneof | ::_fl::kMessage | ::_fl::kTvTable)},
-    // .io.deephaven.proto.backplane.grpc.FilterTableRequest filter = 10;
-    {PROTOBUF_FIELD_OFFSET(BatchTableRequest_Operation, _impl_.op_.filter_), _Internal::kOneofCaseOffset + 0, 9,
-    (0 | ::_fl::kFcOneof | ::_fl::kMessage | ::_fl::kTvTable)},
-    // .io.deephaven.proto.backplane.grpc.UnstructuredFilterTableRequest unstructured_filter = 11;
-    {PROTOBUF_FIELD_OFFSET(BatchTableRequest_Operation, _impl_.op_.unstructured_filter_), _Internal::kOneofCaseOffset + 0, 10,
-    (0 | ::_fl::kFcOneof | ::_fl::kMessage | ::_fl::kTvTable)},
-    // .io.deephaven.proto.backplane.grpc.SortTableRequest sort = 12;
-    {PROTOBUF_FIELD_OFFSET(BatchTableRequest_Operation, _impl_.op_.sort_), _Internal::kOneofCaseOffset + 0, 11,
-    (0 | ::_fl::kFcOneof | ::_fl::kMessage | ::_fl::kTvTable)},
-    // .io.deephaven.proto.backplane.grpc.HeadOrTailRequest head = 13;
-    {PROTOBUF_FIELD_OFFSET(BatchTableRequest_Operation, _impl_.op_.head_), _Internal::kOneofCaseOffset + 0, 12,
-    (0 | ::_fl::kFcOneof | ::_fl::kMessage | ::_fl::kTvTable)},
-    // .io.deephaven.proto.backplane.grpc.HeadOrTailRequest tail = 14;
-    {PROTOBUF_FIELD_OFFSET(BatchTableRequest_Operation, _impl_.op_.tail_), _Internal::kOneofCaseOffset + 0, 13,
-    (0 | ::_fl::kFcOneof | ::_fl::kMessage | ::_fl::kTvTable)},
-    // .io.deephaven.proto.backplane.grpc.HeadOrTailByRequest head_by = 15;
-    {PROTOBUF_FIELD_OFFSET(BatchTableRequest_Operation, _impl_.op_.head_by_), _Internal::kOneofCaseOffset + 0, 14,
-    (0 | ::_fl::kFcOneof | ::_fl::kMessage | ::_fl::kTvTable)},
-    // .io.deephaven.proto.backplane.grpc.HeadOrTailByRequest tail_by = 16;
-    {PROTOBUF_FIELD_OFFSET(BatchTableRequest_Operation, _impl_.op_.tail_by_), _Internal::kOneofCaseOffset + 0, 15,
-    (0 | ::_fl::kFcOneof | ::_fl::kMessage | ::_fl::kTvTable)},
-    // .io.deephaven.proto.backplane.grpc.UngroupRequest ungroup = 17;
-    {PROTOBUF_FIELD_OFFSET(BatchTableRequest_Operation, _impl_.op_.ungroup_), _Internal::kOneofCaseOffset + 0, 16,
-    (0 | ::_fl::kFcOneof | ::_fl::kMessage | ::_fl::kTvTable)},
-    // .io.deephaven.proto.backplane.grpc.MergeTablesRequest merge = 18;
-    {PROTOBUF_FIELD_OFFSET(BatchTableRequest_Operation, _impl_.op_.merge_), _Internal::kOneofCaseOffset + 0, 17,
-    (0 | ::_fl::kFcOneof | ::_fl::kMessage | ::_fl::kTvTable)},
-    // .io.deephaven.proto.backplane.grpc.ComboAggregateRequest combo_aggregate = 19;
-    {PROTOBUF_FIELD_OFFSET(BatchTableRequest_Operation, _impl_.op_.combo_aggregate_), _Internal::kOneofCaseOffset + 0, 18,
-    (0 | ::_fl::kFcOneof | ::_fl::kMessage | ::_fl::kTvTable)},
-    // .io.deephaven.proto.backplane.grpc.FlattenRequest flatten = 21;
-    {PROTOBUF_FIELD_OFFSET(BatchTableRequest_Operation, _impl_.op_.flatten_), _Internal::kOneofCaseOffset + 0, 19,
-    (0 | ::_fl::kFcOneof | ::_fl::kMessage | ::_fl::kTvTable)},
-    // .io.deephaven.proto.backplane.grpc.RunChartDownsampleRequest run_chart_downsample = 22;
-    {PROTOBUF_FIELD_OFFSET(BatchTableRequest_Operation, _impl_.op_.run_chart_downsample_), _Internal::kOneofCaseOffset + 0, 20,
-    (0 | ::_fl::kFcOneof | ::_fl::kMessage | ::_fl::kTvTable)},
-    // .io.deephaven.proto.backplane.grpc.CrossJoinTablesRequest cross_join = 23;
-    {PROTOBUF_FIELD_OFFSET(BatchTableRequest_Operation, _impl_.op_.cross_join_), _Internal::kOneofCaseOffset + 0, 21,
-    (0 | ::_fl::kFcOneof | ::_fl::kMessage | ::_fl::kTvTable)},
-    // .io.deephaven.proto.backplane.grpc.NaturalJoinTablesRequest natural_join = 24;
-    {PROTOBUF_FIELD_OFFSET(BatchTableRequest_Operation, _impl_.op_.natural_join_), _Internal::kOneofCaseOffset + 0, 22,
-    (0 | ::_fl::kFcOneof | ::_fl::kMessage | ::_fl::kTvTable)},
-    // .io.deephaven.proto.backplane.grpc.ExactJoinTablesRequest exact_join = 25;
-    {PROTOBUF_FIELD_OFFSET(BatchTableRequest_Operation, _impl_.op_.exact_join_), _Internal::kOneofCaseOffset + 0, 23,
-    (0 | ::_fl::kFcOneof | ::_fl::kMessage | ::_fl::kTvTable)},
-    // .io.deephaven.proto.backplane.grpc.LeftJoinTablesRequest left_join = 26;
-    {PROTOBUF_FIELD_OFFSET(BatchTableRequest_Operation, _impl_.op_.left_join_), _Internal::kOneofCaseOffset + 0, 24,
-    (0 | ::_fl::kFcOneof | ::_fl::kMessage | ::_fl::kTvTable)},
-    // .io.deephaven.proto.backplane.grpc.AsOfJoinTablesRequest as_of_join = 27 [deprecated = true];
-    {PROTOBUF_FIELD_OFFSET(BatchTableRequest_Operation, _impl_.op_.as_of_join_), _Internal::kOneofCaseOffset + 0, 25,
-    (0 | ::_fl::kFcOneof | ::_fl::kMessage | ::_fl::kTvTable)},
-    // .io.deephaven.proto.backplane.grpc.FetchTableRequest fetch_table = 28;
-    {PROTOBUF_FIELD_OFFSET(BatchTableRequest_Operation, _impl_.op_.fetch_table_), _Internal::kOneofCaseOffset + 0, 26,
-    (0 | ::_fl::kFcOneof | ::_fl::kMessage | ::_fl::kTvTable)},
-    // .io.deephaven.proto.backplane.grpc.ApplyPreviewColumnsRequest apply_preview_columns = 30;
-    {PROTOBUF_FIELD_OFFSET(BatchTableRequest_Operation, _impl_.op_.apply_preview_columns_), _Internal::kOneofCaseOffset + 0, 27,
-    (0 | ::_fl::kFcOneof | ::_fl::kMessage | ::_fl::kTvTable)},
-    // .io.deephaven.proto.backplane.grpc.CreateInputTableRequest create_input_table = 31;
-    {PROTOBUF_FIELD_OFFSET(BatchTableRequest_Operation, _impl_.op_.create_input_table_), _Internal::kOneofCaseOffset + 0, 28,
-    (0 | ::_fl::kFcOneof | ::_fl::kMessage | ::_fl::kTvTable)},
-    // .io.deephaven.proto.backplane.grpc.UpdateByRequest update_by = 32;
-    {PROTOBUF_FIELD_OFFSET(BatchTableRequest_Operation, _impl_.op_.update_by_), _Internal::kOneofCaseOffset + 0, 29,
-    (0 | ::_fl::kFcOneof | ::_fl::kMessage | ::_fl::kTvTable)},
-    // .io.deephaven.proto.backplane.grpc.WhereInRequest where_in = 33;
-    {PROTOBUF_FIELD_OFFSET(BatchTableRequest_Operation, _impl_.op_.where_in_), _Internal::kOneofCaseOffset + 0, 30,
-    (0 | ::_fl::kFcOneof | ::_fl::kMessage | ::_fl::kTvTable)},
-    // .io.deephaven.proto.backplane.grpc.AggregateAllRequest aggregate_all = 34;
-    {PROTOBUF_FIELD_OFFSET(BatchTableRequest_Operation, _impl_.op_.aggregate_all_), _Internal::kOneofCaseOffset + 0, 31,
-    (0 | ::_fl::kFcOneof | ::_fl::kMessage | ::_fl::kTvTable)},
-    // .io.deephaven.proto.backplane.grpc.AggregateRequest aggregate = 35;
-    {PROTOBUF_FIELD_OFFSET(BatchTableRequest_Operation, _impl_.op_.aggregate_), _Internal::kOneofCaseOffset + 0, 32,
-    (0 | ::_fl::kFcOneof | ::_fl::kMessage | ::_fl::kTvTable)},
-    // .io.deephaven.proto.backplane.grpc.SnapshotTableRequest snapshot = 36;
-    {PROTOBUF_FIELD_OFFSET(BatchTableRequest_Operation, _impl_.op_.snapshot_), _Internal::kOneofCaseOffset + 0, 33,
-    (0 | ::_fl::kFcOneof | ::_fl::kMessage | ::_fl::kTvTable)},
-    // .io.deephaven.proto.backplane.grpc.SnapshotWhenTableRequest snapshot_when = 37;
-    {PROTOBUF_FIELD_OFFSET(BatchTableRequest_Operation, _impl_.op_.snapshot_when_), _Internal::kOneofCaseOffset + 0, 34,
-    (0 | ::_fl::kFcOneof | ::_fl::kMessage | ::_fl::kTvTable)},
-    // .io.deephaven.proto.backplane.grpc.MetaTableRequest meta_table = 38;
-    {PROTOBUF_FIELD_OFFSET(BatchTableRequest_Operation, _impl_.op_.meta_table_), _Internal::kOneofCaseOffset + 0, 35,
-    (0 | ::_fl::kFcOneof | ::_fl::kMessage | ::_fl::kTvTable)},
-    // .io.deephaven.proto.backplane.grpc.RangeJoinTablesRequest range_join = 39;
-    {PROTOBUF_FIELD_OFFSET(BatchTableRequest_Operation, _impl_.op_.range_join_), _Internal::kOneofCaseOffset + 0, 36,
-    (0 | ::_fl::kFcOneof | ::_fl::kMessage | ::_fl::kTvTable)},
-    // .io.deephaven.proto.backplane.grpc.AjRajTablesRequest aj = 40;
-    {PROTOBUF_FIELD_OFFSET(BatchTableRequest_Operation, _impl_.op_.aj_), _Internal::kOneofCaseOffset + 0, 37,
-    (0 | ::_fl::kFcOneof | ::_fl::kMessage | ::_fl::kTvTable)},
-    // .io.deephaven.proto.backplane.grpc.AjRajTablesRequest raj = 41;
-    {PROTOBUF_FIELD_OFFSET(BatchTableRequest_Operation, _impl_.op_.raj_), _Internal::kOneofCaseOffset + 0, 38,
-    (0 | ::_fl::kFcOneof | ::_fl::kMessage | ::_fl::kTvTable)},
-    // .io.deephaven.proto.backplane.grpc.ColumnStatisticsRequest column_statistics = 42;
-    {PROTOBUF_FIELD_OFFSET(BatchTableRequest_Operation, _impl_.op_.column_statistics_), _Internal::kOneofCaseOffset + 0, 39,
-    (0 | ::_fl::kFcOneof | ::_fl::kMessage | ::_fl::kTvTable)},
-    // .io.deephaven.proto.backplane.grpc.MultiJoinTablesRequest multi_join = 43;
-    {PROTOBUF_FIELD_OFFSET(BatchTableRequest_Operation, _impl_.op_.multi_join_), _Internal::kOneofCaseOffset + 0, 40,
-    (0 | ::_fl::kFcOneof | ::_fl::kMessage | ::_fl::kTvTable)},
-  }}, {{
-    {::_pbi::TcParser::GetTable<::io::deephaven::proto::backplane::grpc::EmptyTableRequest>()},
-    {::_pbi::TcParser::GetTable<::io::deephaven::proto::backplane::grpc::TimeTableRequest>()},
-    {::_pbi::TcParser::GetTable<::io::deephaven::proto::backplane::grpc::DropColumnsRequest>()},
-    {::_pbi::TcParser::GetTable<::io::deephaven::proto::backplane::grpc::SelectOrUpdateRequest>()},
-    {::_pbi::TcParser::GetTable<::io::deephaven::proto::backplane::grpc::SelectOrUpdateRequest>()},
-    {::_pbi::TcParser::GetTable<::io::deephaven::proto::backplane::grpc::SelectOrUpdateRequest>()},
-    {::_pbi::TcParser::GetTable<::io::deephaven::proto::backplane::grpc::SelectOrUpdateRequest>()},
-    {::_pbi::TcParser::GetTable<::io::deephaven::proto::backplane::grpc::SelectOrUpdateRequest>()},
-    {::_pbi::TcParser::GetTable<::io::deephaven::proto::backplane::grpc::SelectDistinctRequest>()},
-    {::_pbi::TcParser::GetTable<::io::deephaven::proto::backplane::grpc::FilterTableRequest>()},
-    {::_pbi::TcParser::GetTable<::io::deephaven::proto::backplane::grpc::UnstructuredFilterTableRequest>()},
-    {::_pbi::TcParser::GetTable<::io::deephaven::proto::backplane::grpc::SortTableRequest>()},
-    {::_pbi::TcParser::GetTable<::io::deephaven::proto::backplane::grpc::HeadOrTailRequest>()},
-    {::_pbi::TcParser::GetTable<::io::deephaven::proto::backplane::grpc::HeadOrTailRequest>()},
-    {::_pbi::TcParser::GetTable<::io::deephaven::proto::backplane::grpc::HeadOrTailByRequest>()},
-    {::_pbi::TcParser::GetTable<::io::deephaven::proto::backplane::grpc::HeadOrTailByRequest>()},
-    {::_pbi::TcParser::GetTable<::io::deephaven::proto::backplane::grpc::UngroupRequest>()},
-    {::_pbi::TcParser::GetTable<::io::deephaven::proto::backplane::grpc::MergeTablesRequest>()},
-    {::_pbi::TcParser::GetTable<::io::deephaven::proto::backplane::grpc::ComboAggregateRequest>()},
-    {::_pbi::TcParser::GetTable<::io::deephaven::proto::backplane::grpc::FlattenRequest>()},
-    {::_pbi::TcParser::GetTable<::io::deephaven::proto::backplane::grpc::RunChartDownsampleRequest>()},
-    {::_pbi::TcParser::GetTable<::io::deephaven::proto::backplane::grpc::CrossJoinTablesRequest>()},
-    {::_pbi::TcParser::GetTable<::io::deephaven::proto::backplane::grpc::NaturalJoinTablesRequest>()},
-    {::_pbi::TcParser::GetTable<::io::deephaven::proto::backplane::grpc::ExactJoinTablesRequest>()},
-    {::_pbi::TcParser::GetTable<::io::deephaven::proto::backplane::grpc::LeftJoinTablesRequest>()},
-    {::_pbi::TcParser::GetTable<::io::deephaven::proto::backplane::grpc::AsOfJoinTablesRequest>()},
-    {::_pbi::TcParser::GetTable<::io::deephaven::proto::backplane::grpc::FetchTableRequest>()},
-    {::_pbi::TcParser::GetTable<::io::deephaven::proto::backplane::grpc::ApplyPreviewColumnsRequest>()},
-    {::_pbi::TcParser::GetTable<::io::deephaven::proto::backplane::grpc::CreateInputTableRequest>()},
-    {::_pbi::TcParser::GetTable<::io::deephaven::proto::backplane::grpc::UpdateByRequest>()},
-    {::_pbi::TcParser::GetTable<::io::deephaven::proto::backplane::grpc::WhereInRequest>()},
-    {::_pbi::TcParser::GetTable<::io::deephaven::proto::backplane::grpc::AggregateAllRequest>()},
-    {::_pbi::TcParser::GetTable<::io::deephaven::proto::backplane::grpc::AggregateRequest>()},
-    {::_pbi::TcParser::GetTable<::io::deephaven::proto::backplane::grpc::SnapshotTableRequest>()},
-    {::_pbi::TcParser::GetTable<::io::deephaven::proto::backplane::grpc::SnapshotWhenTableRequest>()},
-    {::_pbi::TcParser::GetTable<::io::deephaven::proto::backplane::grpc::MetaTableRequest>()},
-    {::_pbi::TcParser::GetTable<::io::deephaven::proto::backplane::grpc::RangeJoinTablesRequest>()},
-    {::_pbi::TcParser::GetTable<::io::deephaven::proto::backplane::grpc::AjRajTablesRequest>()},
-    {::_pbi::TcParser::GetTable<::io::deephaven::proto::backplane::grpc::AjRajTablesRequest>()},
-    {::_pbi::TcParser::GetTable<::io::deephaven::proto::backplane::grpc::ColumnStatisticsRequest>()},
-    {::_pbi::TcParser::GetTable<::io::deephaven::proto::backplane::grpc::MultiJoinTablesRequest>()},
-  }}, {{
-  }},
-};
-
-::uint8_t* BatchTableRequest_Operation::_InternalSerialize(
-    ::uint8_t* target,
-    ::google::protobuf::io::EpsCopyOutputStream* stream) const {
-  // @@protoc_insertion_point(serialize_to_array_start:io.deephaven.proto.backplane.grpc.BatchTableRequest.Operation)
-  ::uint32_t cached_has_bits = 0;
-  (void)cached_has_bits;
-
-  switch (op_case()) {
-    case kEmptyTable: {
-      target = ::google::protobuf::internal::WireFormatLite::InternalWriteMessage(
-          1, _Internal::empty_table(this),
-          _Internal::empty_table(this).GetCachedSize(), target, stream);
-      break;
-    }
-    case kTimeTable: {
-      target = ::google::protobuf::internal::WireFormatLite::InternalWriteMessage(
-          2, _Internal::time_table(this),
-          _Internal::time_table(this).GetCachedSize(), target, stream);
-      break;
-    }
-    case kDropColumns: {
-      target = ::google::protobuf::internal::WireFormatLite::InternalWriteMessage(
-          3, _Internal::drop_columns(this),
-          _Internal::drop_columns(this).GetCachedSize(), target, stream);
-      break;
-    }
-    case kUpdate: {
-      target = ::google::protobuf::internal::WireFormatLite::InternalWriteMessage(
-          4, _Internal::update(this),
-          _Internal::update(this).GetCachedSize(), target, stream);
-      break;
-    }
-    case kLazyUpdate: {
-      target = ::google::protobuf::internal::WireFormatLite::InternalWriteMessage(
-          5, _Internal::lazy_update(this),
-          _Internal::lazy_update(this).GetCachedSize(), target, stream);
-      break;
-    }
-    case kView: {
-      target = ::google::protobuf::internal::WireFormatLite::InternalWriteMessage(
-          6, _Internal::view(this),
-          _Internal::view(this).GetCachedSize(), target, stream);
-      break;
-    }
-    case kUpdateView: {
-      target = ::google::protobuf::internal::WireFormatLite::InternalWriteMessage(
-          7, _Internal::update_view(this),
-          _Internal::update_view(this).GetCachedSize(), target, stream);
-      break;
-    }
-    case kSelect: {
-      target = ::google::protobuf::internal::WireFormatLite::InternalWriteMessage(
-          8, _Internal::select(this),
-          _Internal::select(this).GetCachedSize(), target, stream);
-      break;
-    }
-    case kSelectDistinct: {
-      target = ::google::protobuf::internal::WireFormatLite::InternalWriteMessage(
-          9, _Internal::select_distinct(this),
-          _Internal::select_distinct(this).GetCachedSize(), target, stream);
-      break;
-    }
-    case kFilter: {
-      target = ::google::protobuf::internal::WireFormatLite::InternalWriteMessage(
-          10, _Internal::filter(this),
-          _Internal::filter(this).GetCachedSize(), target, stream);
-      break;
-    }
-    case kUnstructuredFilter: {
-      target = ::google::protobuf::internal::WireFormatLite::InternalWriteMessage(
-          11, _Internal::unstructured_filter(this),
-          _Internal::unstructured_filter(this).GetCachedSize(), target, stream);
-      break;
-    }
-    case kSort: {
-      target = ::google::protobuf::internal::WireFormatLite::InternalWriteMessage(
-          12, _Internal::sort(this),
-          _Internal::sort(this).GetCachedSize(), target, stream);
-      break;
-    }
-    case kHead: {
-      target = ::google::protobuf::internal::WireFormatLite::InternalWriteMessage(
-          13, _Internal::head(this),
-          _Internal::head(this).GetCachedSize(), target, stream);
-      break;
-    }
-    case kTail: {
-      target = ::google::protobuf::internal::WireFormatLite::InternalWriteMessage(
-          14, _Internal::tail(this),
-          _Internal::tail(this).GetCachedSize(), target, stream);
-      break;
-    }
-    case kHeadBy: {
-      target = ::google::protobuf::internal::WireFormatLite::InternalWriteMessage(
-          15, _Internal::head_by(this),
-          _Internal::head_by(this).GetCachedSize(), target, stream);
-      break;
-    }
-    case kTailBy: {
-      target = ::google::protobuf::internal::WireFormatLite::InternalWriteMessage(
-          16, _Internal::tail_by(this),
-          _Internal::tail_by(this).GetCachedSize(), target, stream);
-      break;
-    }
-    case kUngroup: {
-      target = ::google::protobuf::internal::WireFormatLite::InternalWriteMessage(
-          17, _Internal::ungroup(this),
-          _Internal::ungroup(this).GetCachedSize(), target, stream);
-      break;
-    }
-    case kMerge: {
-      target = ::google::protobuf::internal::WireFormatLite::InternalWriteMessage(
-          18, _Internal::merge(this),
-          _Internal::merge(this).GetCachedSize(), target, stream);
-      break;
-    }
-    case kComboAggregate: {
-      target = ::google::protobuf::internal::WireFormatLite::InternalWriteMessage(
-          19, _Internal::combo_aggregate(this),
-          _Internal::combo_aggregate(this).GetCachedSize(), target, stream);
-      break;
-    }
-    case kFlatten: {
-      target = ::google::protobuf::internal::WireFormatLite::InternalWriteMessage(
-          21, _Internal::flatten(this),
-          _Internal::flatten(this).GetCachedSize(), target, stream);
-      break;
-    }
-    case kRunChartDownsample: {
-      target = ::google::protobuf::internal::WireFormatLite::InternalWriteMessage(
-          22, _Internal::run_chart_downsample(this),
-          _Internal::run_chart_downsample(this).GetCachedSize(), target, stream);
-      break;
-    }
-    case kCrossJoin: {
-      target = ::google::protobuf::internal::WireFormatLite::InternalWriteMessage(
-          23, _Internal::cross_join(this),
-          _Internal::cross_join(this).GetCachedSize(), target, stream);
-      break;
-    }
-    case kNaturalJoin: {
-      target = ::google::protobuf::internal::WireFormatLite::InternalWriteMessage(
-          24, _Internal::natural_join(this),
-          _Internal::natural_join(this).GetCachedSize(), target, stream);
-      break;
-    }
-    case kExactJoin: {
-      target = ::google::protobuf::internal::WireFormatLite::InternalWriteMessage(
-          25, _Internal::exact_join(this),
-          _Internal::exact_join(this).GetCachedSize(), target, stream);
-      break;
-    }
-    case kLeftJoin: {
-      target = ::google::protobuf::internal::WireFormatLite::InternalWriteMessage(
-          26, _Internal::left_join(this),
-          _Internal::left_join(this).GetCachedSize(), target, stream);
-      break;
-    }
-    case kAsOfJoin: {
-      target = ::google::protobuf::internal::WireFormatLite::InternalWriteMessage(
-          27, _Internal::as_of_join(this),
-          _Internal::as_of_join(this).GetCachedSize(), target, stream);
-      break;
-    }
-    case kFetchTable: {
-      target = ::google::protobuf::internal::WireFormatLite::InternalWriteMessage(
-          28, _Internal::fetch_table(this),
-          _Internal::fetch_table(this).GetCachedSize(), target, stream);
-      break;
-    }
-    case kApplyPreviewColumns: {
-      target = ::google::protobuf::internal::WireFormatLite::InternalWriteMessage(
-          30, _Internal::apply_preview_columns(this),
-          _Internal::apply_preview_columns(this).GetCachedSize(), target, stream);
-      break;
-    }
-    case kCreateInputTable: {
-      target = ::google::protobuf::internal::WireFormatLite::InternalWriteMessage(
-          31, _Internal::create_input_table(this),
-          _Internal::create_input_table(this).GetCachedSize(), target, stream);
-      break;
-    }
-    case kUpdateBy: {
-      target = ::google::protobuf::internal::WireFormatLite::InternalWriteMessage(
-          32, _Internal::update_by(this),
-          _Internal::update_by(this).GetCachedSize(), target, stream);
-      break;
-    }
-    case kWhereIn: {
-      target = ::google::protobuf::internal::WireFormatLite::InternalWriteMessage(
-          33, _Internal::where_in(this),
-          _Internal::where_in(this).GetCachedSize(), target, stream);
-      break;
-    }
-    case kAggregateAll: {
-      target = ::google::protobuf::internal::WireFormatLite::InternalWriteMessage(
-          34, _Internal::aggregate_all(this),
-          _Internal::aggregate_all(this).GetCachedSize(), target, stream);
-      break;
-    }
-    case kAggregate: {
-      target = ::google::protobuf::internal::WireFormatLite::InternalWriteMessage(
-          35, _Internal::aggregate(this),
-          _Internal::aggregate(this).GetCachedSize(), target, stream);
-      break;
-    }
-    case kSnapshot: {
-      target = ::google::protobuf::internal::WireFormatLite::InternalWriteMessage(
-          36, _Internal::snapshot(this),
-          _Internal::snapshot(this).GetCachedSize(), target, stream);
-      break;
-    }
-    case kSnapshotWhen: {
-      target = ::google::protobuf::internal::WireFormatLite::InternalWriteMessage(
-          37, _Internal::snapshot_when(this),
-          _Internal::snapshot_when(this).GetCachedSize(), target, stream);
-      break;
-    }
-    case kMetaTable: {
-      target = ::google::protobuf::internal::WireFormatLite::InternalWriteMessage(
-          38, _Internal::meta_table(this),
-          _Internal::meta_table(this).GetCachedSize(), target, stream);
-      break;
-    }
-    case kRangeJoin: {
-      target = ::google::protobuf::internal::WireFormatLite::InternalWriteMessage(
-          39, _Internal::range_join(this),
-          _Internal::range_join(this).GetCachedSize(), target, stream);
-      break;
-    }
-    case kAj: {
-      target = ::google::protobuf::internal::WireFormatLite::InternalWriteMessage(
-          40, _Internal::aj(this),
-          _Internal::aj(this).GetCachedSize(), target, stream);
-      break;
-    }
-    case kRaj: {
-      target = ::google::protobuf::internal::WireFormatLite::InternalWriteMessage(
-          41, _Internal::raj(this),
-          _Internal::raj(this).GetCachedSize(), target, stream);
-      break;
-    }
-    case kColumnStatistics: {
-      target = ::google::protobuf::internal::WireFormatLite::InternalWriteMessage(
-          42, _Internal::column_statistics(this),
-          _Internal::column_statistics(this).GetCachedSize(), target, stream);
-      break;
-    }
-    case kMultiJoin: {
-      target = ::google::protobuf::internal::WireFormatLite::InternalWriteMessage(
-          43, _Internal::multi_join(this),
-          _Internal::multi_join(this).GetCachedSize(), target, stream);
-      break;
-    }
-    default:
-      break;
-  }
-  if (PROTOBUF_PREDICT_FALSE(_internal_metadata_.have_unknown_fields())) {
-    target =
-        ::_pbi::WireFormat::InternalSerializeUnknownFieldsToArray(
-            _internal_metadata_.unknown_fields<::google::protobuf::UnknownFieldSet>(::google::protobuf::UnknownFieldSet::default_instance), target, stream);
-  }
-  // @@protoc_insertion_point(serialize_to_array_end:io.deephaven.proto.backplane.grpc.BatchTableRequest.Operation)
-  return target;
-}
-
-::size_t BatchTableRequest_Operation::ByteSizeLong() const {
-// @@protoc_insertion_point(message_byte_size_start:io.deephaven.proto.backplane.grpc.BatchTableRequest.Operation)
-  ::size_t total_size = 0;
-
-  ::uint32_t cached_has_bits = 0;
-  // Prevent compiler warnings about cached_has_bits being unused
-  (void) cached_has_bits;
-
-  switch (op_case()) {
-    // .io.deephaven.proto.backplane.grpc.EmptyTableRequest empty_table = 1;
-    case kEmptyTable: {
-      total_size +=
-          1 + ::google::protobuf::internal::WireFormatLite::MessageSize(*_impl_.op_.empty_table_);
-      break;
-    }
-    // .io.deephaven.proto.backplane.grpc.TimeTableRequest time_table = 2;
-    case kTimeTable: {
-      total_size +=
-          1 + ::google::protobuf::internal::WireFormatLite::MessageSize(*_impl_.op_.time_table_);
-      break;
-    }
-    // .io.deephaven.proto.backplane.grpc.DropColumnsRequest drop_columns = 3;
-    case kDropColumns: {
-      total_size +=
-          1 + ::google::protobuf::internal::WireFormatLite::MessageSize(*_impl_.op_.drop_columns_);
-      break;
-    }
-    // .io.deephaven.proto.backplane.grpc.SelectOrUpdateRequest update = 4;
-    case kUpdate: {
-      total_size +=
-          1 + ::google::protobuf::internal::WireFormatLite::MessageSize(*_impl_.op_.update_);
-      break;
-    }
-    // .io.deephaven.proto.backplane.grpc.SelectOrUpdateRequest lazy_update = 5;
-    case kLazyUpdate: {
-      total_size +=
-          1 + ::google::protobuf::internal::WireFormatLite::MessageSize(*_impl_.op_.lazy_update_);
-      break;
-    }
-    // .io.deephaven.proto.backplane.grpc.SelectOrUpdateRequest view = 6;
-    case kView: {
-      total_size +=
-          1 + ::google::protobuf::internal::WireFormatLite::MessageSize(*_impl_.op_.view_);
-      break;
-    }
-    // .io.deephaven.proto.backplane.grpc.SelectOrUpdateRequest update_view = 7;
-    case kUpdateView: {
-      total_size +=
-          1 + ::google::protobuf::internal::WireFormatLite::MessageSize(*_impl_.op_.update_view_);
-      break;
-    }
-    // .io.deephaven.proto.backplane.grpc.SelectOrUpdateRequest select = 8;
-    case kSelect: {
-      total_size +=
-          1 + ::google::protobuf::internal::WireFormatLite::MessageSize(*_impl_.op_.select_);
-      break;
-    }
-    // .io.deephaven.proto.backplane.grpc.SelectDistinctRequest select_distinct = 9;
-    case kSelectDistinct: {
-      total_size +=
-          1 + ::google::protobuf::internal::WireFormatLite::MessageSize(*_impl_.op_.select_distinct_);
-      break;
-    }
-    // .io.deephaven.proto.backplane.grpc.FilterTableRequest filter = 10;
-    case kFilter: {
-      total_size +=
-          1 + ::google::protobuf::internal::WireFormatLite::MessageSize(*_impl_.op_.filter_);
-      break;
-    }
-    // .io.deephaven.proto.backplane.grpc.UnstructuredFilterTableRequest unstructured_filter = 11;
-    case kUnstructuredFilter: {
-      total_size +=
-          1 + ::google::protobuf::internal::WireFormatLite::MessageSize(*_impl_.op_.unstructured_filter_);
-      break;
-    }
-    // .io.deephaven.proto.backplane.grpc.SortTableRequest sort = 12;
-    case kSort: {
-      total_size +=
-          1 + ::google::protobuf::internal::WireFormatLite::MessageSize(*_impl_.op_.sort_);
-      break;
-    }
-    // .io.deephaven.proto.backplane.grpc.HeadOrTailRequest head = 13;
-    case kHead: {
-      total_size +=
-          1 + ::google::protobuf::internal::WireFormatLite::MessageSize(*_impl_.op_.head_);
-      break;
-    }
-    // .io.deephaven.proto.backplane.grpc.HeadOrTailRequest tail = 14;
-    case kTail: {
-      total_size +=
-          1 + ::google::protobuf::internal::WireFormatLite::MessageSize(*_impl_.op_.tail_);
-      break;
-    }
-    // .io.deephaven.proto.backplane.grpc.HeadOrTailByRequest head_by = 15;
-    case kHeadBy: {
-      total_size +=
-          1 + ::google::protobuf::internal::WireFormatLite::MessageSize(*_impl_.op_.head_by_);
-      break;
-    }
-    // .io.deephaven.proto.backplane.grpc.HeadOrTailByRequest tail_by = 16;
-    case kTailBy: {
-      total_size +=
-          2 + ::google::protobuf::internal::WireFormatLite::MessageSize(*_impl_.op_.tail_by_);
-      break;
-    }
-    // .io.deephaven.proto.backplane.grpc.UngroupRequest ungroup = 17;
-    case kUngroup: {
-      total_size +=
-          2 + ::google::protobuf::internal::WireFormatLite::MessageSize(*_impl_.op_.ungroup_);
-      break;
-    }
-    // .io.deephaven.proto.backplane.grpc.MergeTablesRequest merge = 18;
-    case kMerge: {
-      total_size +=
-          2 + ::google::protobuf::internal::WireFormatLite::MessageSize(*_impl_.op_.merge_);
-      break;
-    }
-    // .io.deephaven.proto.backplane.grpc.ComboAggregateRequest combo_aggregate = 19;
-    case kComboAggregate: {
-      total_size +=
-          2 + ::google::protobuf::internal::WireFormatLite::MessageSize(*_impl_.op_.combo_aggregate_);
-      break;
-    }
-    // .io.deephaven.proto.backplane.grpc.FlattenRequest flatten = 21;
-    case kFlatten: {
-      total_size +=
-          2 + ::google::protobuf::internal::WireFormatLite::MessageSize(*_impl_.op_.flatten_);
-      break;
-    }
-    // .io.deephaven.proto.backplane.grpc.RunChartDownsampleRequest run_chart_downsample = 22;
-    case kRunChartDownsample: {
-      total_size +=
-          2 + ::google::protobuf::internal::WireFormatLite::MessageSize(*_impl_.op_.run_chart_downsample_);
-      break;
-    }
-    // .io.deephaven.proto.backplane.grpc.CrossJoinTablesRequest cross_join = 23;
-    case kCrossJoin: {
-      total_size +=
-          2 + ::google::protobuf::internal::WireFormatLite::MessageSize(*_impl_.op_.cross_join_);
-      break;
-    }
-    // .io.deephaven.proto.backplane.grpc.NaturalJoinTablesRequest natural_join = 24;
-    case kNaturalJoin: {
-      total_size +=
-          2 + ::google::protobuf::internal::WireFormatLite::MessageSize(*_impl_.op_.natural_join_);
-      break;
-    }
-    // .io.deephaven.proto.backplane.grpc.ExactJoinTablesRequest exact_join = 25;
-    case kExactJoin: {
-      total_size +=
-          2 + ::google::protobuf::internal::WireFormatLite::MessageSize(*_impl_.op_.exact_join_);
-      break;
-    }
-    // .io.deephaven.proto.backplane.grpc.LeftJoinTablesRequest left_join = 26;
-    case kLeftJoin: {
-      total_size +=
-          2 + ::google::protobuf::internal::WireFormatLite::MessageSize(*_impl_.op_.left_join_);
-      break;
-    }
-    // .io.deephaven.proto.backplane.grpc.AsOfJoinTablesRequest as_of_join = 27 [deprecated = true];
-    case kAsOfJoin: {
-      total_size +=
-          2 + ::google::protobuf::internal::WireFormatLite::MessageSize(*_impl_.op_.as_of_join_);
-      break;
-    }
-    // .io.deephaven.proto.backplane.grpc.FetchTableRequest fetch_table = 28;
-    case kFetchTable: {
-      total_size +=
-          2 + ::google::protobuf::internal::WireFormatLite::MessageSize(*_impl_.op_.fetch_table_);
-      break;
-    }
-    // .io.deephaven.proto.backplane.grpc.ApplyPreviewColumnsRequest apply_preview_columns = 30;
-    case kApplyPreviewColumns: {
-      total_size +=
-          2 + ::google::protobuf::internal::WireFormatLite::MessageSize(*_impl_.op_.apply_preview_columns_);
-      break;
-    }
-    // .io.deephaven.proto.backplane.grpc.CreateInputTableRequest create_input_table = 31;
-    case kCreateInputTable: {
-      total_size +=
-          2 + ::google::protobuf::internal::WireFormatLite::MessageSize(*_impl_.op_.create_input_table_);
-      break;
-    }
-    // .io.deephaven.proto.backplane.grpc.UpdateByRequest update_by = 32;
-    case kUpdateBy: {
-      total_size +=
-          2 + ::google::protobuf::internal::WireFormatLite::MessageSize(*_impl_.op_.update_by_);
-      break;
-    }
-    // .io.deephaven.proto.backplane.grpc.WhereInRequest where_in = 33;
-    case kWhereIn: {
-      total_size +=
-          2 + ::google::protobuf::internal::WireFormatLite::MessageSize(*_impl_.op_.where_in_);
-      break;
-    }
-    // .io.deephaven.proto.backplane.grpc.AggregateAllRequest aggregate_all = 34;
-    case kAggregateAll: {
-      total_size +=
-          2 + ::google::protobuf::internal::WireFormatLite::MessageSize(*_impl_.op_.aggregate_all_);
-      break;
-    }
-    // .io.deephaven.proto.backplane.grpc.AggregateRequest aggregate = 35;
-    case kAggregate: {
-      total_size +=
-          2 + ::google::protobuf::internal::WireFormatLite::MessageSize(*_impl_.op_.aggregate_);
-      break;
-    }
-    // .io.deephaven.proto.backplane.grpc.SnapshotTableRequest snapshot = 36;
-    case kSnapshot: {
-      total_size +=
-          2 + ::google::protobuf::internal::WireFormatLite::MessageSize(*_impl_.op_.snapshot_);
-      break;
-    }
-    // .io.deephaven.proto.backplane.grpc.SnapshotWhenTableRequest snapshot_when = 37;
-    case kSnapshotWhen: {
-      total_size +=
-          2 + ::google::protobuf::internal::WireFormatLite::MessageSize(*_impl_.op_.snapshot_when_);
-      break;
-    }
-    // .io.deephaven.proto.backplane.grpc.MetaTableRequest meta_table = 38;
-    case kMetaTable: {
-      total_size +=
-          2 + ::google::protobuf::internal::WireFormatLite::MessageSize(*_impl_.op_.meta_table_);
-      break;
-    }
-    // .io.deephaven.proto.backplane.grpc.RangeJoinTablesRequest range_join = 39;
-    case kRangeJoin: {
-      total_size +=
-          2 + ::google::protobuf::internal::WireFormatLite::MessageSize(*_impl_.op_.range_join_);
-      break;
-    }
-    // .io.deephaven.proto.backplane.grpc.AjRajTablesRequest aj = 40;
-    case kAj: {
-      total_size +=
-          2 + ::google::protobuf::internal::WireFormatLite::MessageSize(*_impl_.op_.aj_);
-      break;
-    }
-    // .io.deephaven.proto.backplane.grpc.AjRajTablesRequest raj = 41;
-    case kRaj: {
-      total_size +=
-          2 + ::google::protobuf::internal::WireFormatLite::MessageSize(*_impl_.op_.raj_);
-      break;
-    }
-    // .io.deephaven.proto.backplane.grpc.ColumnStatisticsRequest column_statistics = 42;
-    case kColumnStatistics: {
-      total_size +=
-          2 + ::google::protobuf::internal::WireFormatLite::MessageSize(*_impl_.op_.column_statistics_);
-      break;
-    }
-    // .io.deephaven.proto.backplane.grpc.MultiJoinTablesRequest multi_join = 43;
-    case kMultiJoin: {
-      total_size +=
-          2 + ::google::protobuf::internal::WireFormatLite::MessageSize(*_impl_.op_.multi_join_);
-      break;
-    }
-    case OP_NOT_SET: {
-      break;
-    }
-  }
-  return MaybeComputeUnknownFieldsSize(total_size, &_impl_._cached_size_);
-}
-
-const ::google::protobuf::Message::ClassData BatchTableRequest_Operation::_class_data_ = {
-    BatchTableRequest_Operation::MergeImpl,
-    nullptr,  // OnDemandRegisterArenaDtor
-};
-const ::google::protobuf::Message::ClassData* BatchTableRequest_Operation::GetClassData() const {
-  return &_class_data_;
-}
-
-void BatchTableRequest_Operation::MergeImpl(::google::protobuf::Message& to_msg, const ::google::protobuf::Message& from_msg) {
-  auto* const _this = static_cast<BatchTableRequest_Operation*>(&to_msg);
-  auto& from = static_cast<const BatchTableRequest_Operation&>(from_msg);
-  // @@protoc_insertion_point(class_specific_merge_from_start:io.deephaven.proto.backplane.grpc.BatchTableRequest.Operation)
-  ABSL_DCHECK_NE(&from, _this);
-  ::uint32_t cached_has_bits = 0;
-  (void) cached_has_bits;
-
-  switch (from.op_case()) {
-    case kEmptyTable: {
-      _this->_internal_mutable_empty_table()->::io::deephaven::proto::backplane::grpc::EmptyTableRequest::MergeFrom(
-          from._internal_empty_table());
-      break;
-    }
-    case kTimeTable: {
-      _this->_internal_mutable_time_table()->::io::deephaven::proto::backplane::grpc::TimeTableRequest::MergeFrom(
-          from._internal_time_table());
-      break;
-    }
-    case kDropColumns: {
-      _this->_internal_mutable_drop_columns()->::io::deephaven::proto::backplane::grpc::DropColumnsRequest::MergeFrom(
-          from._internal_drop_columns());
-      break;
-    }
-    case kUpdate: {
-      _this->_internal_mutable_update()->::io::deephaven::proto::backplane::grpc::SelectOrUpdateRequest::MergeFrom(
-          from._internal_update());
-      break;
-    }
-    case kLazyUpdate: {
-      _this->_internal_mutable_lazy_update()->::io::deephaven::proto::backplane::grpc::SelectOrUpdateRequest::MergeFrom(
-          from._internal_lazy_update());
-      break;
-    }
-    case kView: {
-      _this->_internal_mutable_view()->::io::deephaven::proto::backplane::grpc::SelectOrUpdateRequest::MergeFrom(
-          from._internal_view());
-      break;
-    }
-    case kUpdateView: {
-      _this->_internal_mutable_update_view()->::io::deephaven::proto::backplane::grpc::SelectOrUpdateRequest::MergeFrom(
-          from._internal_update_view());
-      break;
-    }
-    case kSelect: {
-      _this->_internal_mutable_select()->::io::deephaven::proto::backplane::grpc::SelectOrUpdateRequest::MergeFrom(
-          from._internal_select());
-      break;
-    }
-    case kSelectDistinct: {
-      _this->_internal_mutable_select_distinct()->::io::deephaven::proto::backplane::grpc::SelectDistinctRequest::MergeFrom(
-          from._internal_select_distinct());
-      break;
-    }
-    case kFilter: {
-      _this->_internal_mutable_filter()->::io::deephaven::proto::backplane::grpc::FilterTableRequest::MergeFrom(
-          from._internal_filter());
-      break;
-    }
-    case kUnstructuredFilter: {
-      _this->_internal_mutable_unstructured_filter()->::io::deephaven::proto::backplane::grpc::UnstructuredFilterTableRequest::MergeFrom(
-          from._internal_unstructured_filter());
-      break;
-    }
-    case kSort: {
-      _this->_internal_mutable_sort()->::io::deephaven::proto::backplane::grpc::SortTableRequest::MergeFrom(
-          from._internal_sort());
-      break;
-    }
-    case kHead: {
-      _this->_internal_mutable_head()->::io::deephaven::proto::backplane::grpc::HeadOrTailRequest::MergeFrom(
-          from._internal_head());
-      break;
-    }
-    case kTail: {
-      _this->_internal_mutable_tail()->::io::deephaven::proto::backplane::grpc::HeadOrTailRequest::MergeFrom(
-          from._internal_tail());
-      break;
-    }
-    case kHeadBy: {
-      _this->_internal_mutable_head_by()->::io::deephaven::proto::backplane::grpc::HeadOrTailByRequest::MergeFrom(
-          from._internal_head_by());
-      break;
-    }
-    case kTailBy: {
-      _this->_internal_mutable_tail_by()->::io::deephaven::proto::backplane::grpc::HeadOrTailByRequest::MergeFrom(
-          from._internal_tail_by());
-      break;
-    }
-    case kUngroup: {
-      _this->_internal_mutable_ungroup()->::io::deephaven::proto::backplane::grpc::UngroupRequest::MergeFrom(
-          from._internal_ungroup());
-      break;
-    }
-    case kMerge: {
-      _this->_internal_mutable_merge()->::io::deephaven::proto::backplane::grpc::MergeTablesRequest::MergeFrom(
-          from._internal_merge());
-      break;
-    }
-    case kComboAggregate: {
-      _this->_internal_mutable_combo_aggregate()->::io::deephaven::proto::backplane::grpc::ComboAggregateRequest::MergeFrom(
-          from._internal_combo_aggregate());
-      break;
-    }
-    case kFlatten: {
-      _this->_internal_mutable_flatten()->::io::deephaven::proto::backplane::grpc::FlattenRequest::MergeFrom(
-          from._internal_flatten());
-      break;
-    }
-    case kRunChartDownsample: {
-      _this->_internal_mutable_run_chart_downsample()->::io::deephaven::proto::backplane::grpc::RunChartDownsampleRequest::MergeFrom(
-          from._internal_run_chart_downsample());
-      break;
-    }
-    case kCrossJoin: {
-      _this->_internal_mutable_cross_join()->::io::deephaven::proto::backplane::grpc::CrossJoinTablesRequest::MergeFrom(
-          from._internal_cross_join());
-      break;
-    }
-    case kNaturalJoin: {
-      _this->_internal_mutable_natural_join()->::io::deephaven::proto::backplane::grpc::NaturalJoinTablesRequest::MergeFrom(
-          from._internal_natural_join());
-      break;
-    }
-    case kExactJoin: {
-      _this->_internal_mutable_exact_join()->::io::deephaven::proto::backplane::grpc::ExactJoinTablesRequest::MergeFrom(
-          from._internal_exact_join());
-      break;
-    }
-    case kLeftJoin: {
-      _this->_internal_mutable_left_join()->::io::deephaven::proto::backplane::grpc::LeftJoinTablesRequest::MergeFrom(
-          from._internal_left_join());
-      break;
-    }
-    case kAsOfJoin: {
-      _this->_internal_mutable_as_of_join()->::io::deephaven::proto::backplane::grpc::AsOfJoinTablesRequest::MergeFrom(
-          from._internal_as_of_join());
-      break;
-    }
-    case kFetchTable: {
-      _this->_internal_mutable_fetch_table()->::io::deephaven::proto::backplane::grpc::FetchTableRequest::MergeFrom(
-          from._internal_fetch_table());
-      break;
-    }
-    case kApplyPreviewColumns: {
-      _this->_internal_mutable_apply_preview_columns()->::io::deephaven::proto::backplane::grpc::ApplyPreviewColumnsRequest::MergeFrom(
-          from._internal_apply_preview_columns());
-      break;
-    }
-    case kCreateInputTable: {
-      _this->_internal_mutable_create_input_table()->::io::deephaven::proto::backplane::grpc::CreateInputTableRequest::MergeFrom(
-          from._internal_create_input_table());
-      break;
-    }
-    case kUpdateBy: {
-      _this->_internal_mutable_update_by()->::io::deephaven::proto::backplane::grpc::UpdateByRequest::MergeFrom(
-          from._internal_update_by());
-      break;
-    }
-    case kWhereIn: {
-      _this->_internal_mutable_where_in()->::io::deephaven::proto::backplane::grpc::WhereInRequest::MergeFrom(
-          from._internal_where_in());
-      break;
-    }
-    case kAggregateAll: {
-      _this->_internal_mutable_aggregate_all()->::io::deephaven::proto::backplane::grpc::AggregateAllRequest::MergeFrom(
-          from._internal_aggregate_all());
-      break;
-    }
-    case kAggregate: {
-      _this->_internal_mutable_aggregate()->::io::deephaven::proto::backplane::grpc::AggregateRequest::MergeFrom(
-          from._internal_aggregate());
-      break;
-    }
-    case kSnapshot: {
-      _this->_internal_mutable_snapshot()->::io::deephaven::proto::backplane::grpc::SnapshotTableRequest::MergeFrom(
-          from._internal_snapshot());
-      break;
-    }
-    case kSnapshotWhen: {
-      _this->_internal_mutable_snapshot_when()->::io::deephaven::proto::backplane::grpc::SnapshotWhenTableRequest::MergeFrom(
-          from._internal_snapshot_when());
-      break;
-    }
-    case kMetaTable: {
-      _this->_internal_mutable_meta_table()->::io::deephaven::proto::backplane::grpc::MetaTableRequest::MergeFrom(
-          from._internal_meta_table());
-      break;
-    }
-    case kRangeJoin: {
-      _this->_internal_mutable_range_join()->::io::deephaven::proto::backplane::grpc::RangeJoinTablesRequest::MergeFrom(
-          from._internal_range_join());
-      break;
-    }
-    case kAj: {
-      _this->_internal_mutable_aj()->::io::deephaven::proto::backplane::grpc::AjRajTablesRequest::MergeFrom(
-          from._internal_aj());
-      break;
-    }
-    case kRaj: {
-      _this->_internal_mutable_raj()->::io::deephaven::proto::backplane::grpc::AjRajTablesRequest::MergeFrom(
-          from._internal_raj());
-      break;
-    }
-    case kColumnStatistics: {
-      _this->_internal_mutable_column_statistics()->::io::deephaven::proto::backplane::grpc::ColumnStatisticsRequest::MergeFrom(
-          from._internal_column_statistics());
-      break;
-    }
-    case kMultiJoin: {
-      _this->_internal_mutable_multi_join()->::io::deephaven::proto::backplane::grpc::MultiJoinTablesRequest::MergeFrom(
-          from._internal_multi_join());
-      break;
-    }
-    case OP_NOT_SET: {
-      break;
-    }
-  }
-  _this->_internal_metadata_.MergeFrom<::google::protobuf::UnknownFieldSet>(from._internal_metadata_);
-}
-
-void BatchTableRequest_Operation::CopyFrom(const BatchTableRequest_Operation& from) {
-// @@protoc_insertion_point(class_specific_copy_from_start:io.deephaven.proto.backplane.grpc.BatchTableRequest.Operation)
-  if (&from == this) return;
-  Clear();
-  MergeFrom(from);
-}
-
-PROTOBUF_NOINLINE bool BatchTableRequest_Operation::IsInitialized() const {
-  return true;
-}
-
-::_pbi::CachedSize* BatchTableRequest_Operation::AccessCachedSize() const {
-  return &_impl_._cached_size_;
-}
-void BatchTableRequest_Operation::InternalSwap(BatchTableRequest_Operation* PROTOBUF_RESTRICT other) {
-  using std::swap;
-  _internal_metadata_.InternalSwap(&other->_internal_metadata_);
-  swap(_impl_.op_, other->_impl_.op_);
-  swap(_impl_._oneof_case_[0], other->_impl_._oneof_case_[0]);
-}
-
-::google::protobuf::Metadata BatchTableRequest_Operation::GetMetadata() const {
-  return ::_pbi::AssignDescriptors(
-      &descriptor_table_deephaven_2fproto_2ftable_2eproto_getter, &descriptor_table_deephaven_2fproto_2ftable_2eproto_once,
-      file_level_metadata_deephaven_2fproto_2ftable_2eproto[122]);
-}
-// ===================================================================
-
-class BatchTableRequest::_Internal {
- public:
-};
-
-BatchTableRequest::BatchTableRequest(::google::protobuf::Arena* arena)
-    : ::google::protobuf::Message(arena) {
-  SharedCtor(arena);
-  // @@protoc_insertion_point(arena_constructor:io.deephaven.proto.backplane.grpc.BatchTableRequest)
-}
-inline PROTOBUF_NDEBUG_INLINE BatchTableRequest::Impl_::Impl_(
-    ::google::protobuf::internal::InternalVisibility visibility, ::google::protobuf::Arena* arena,
-    const Impl_& from)
-      : ops_{visibility, arena, from.ops_},
-        _cached_size_{0} {}
-
-BatchTableRequest::BatchTableRequest(
-    ::google::protobuf::Arena* arena,
-    const BatchTableRequest& from)
-    : ::google::protobuf::Message(arena) {
-  BatchTableRequest* const _this = this;
-  (void)_this;
-  _internal_metadata_.MergeFrom<::google::protobuf::UnknownFieldSet>(
-      from._internal_metadata_);
-  new (&_impl_) Impl_(internal_visibility(), arena, from._impl_);
-
-  // @@protoc_insertion_point(copy_constructor:io.deephaven.proto.backplane.grpc.BatchTableRequest)
-}
-inline PROTOBUF_NDEBUG_INLINE BatchTableRequest::Impl_::Impl_(
-    ::google::protobuf::internal::InternalVisibility visibility,
-    ::google::protobuf::Arena* arena)
-      : ops_{visibility, arena},
-        _cached_size_{0} {}
-
-inline void BatchTableRequest::SharedCtor(::_pb::Arena* arena) {
-  new (&_impl_) Impl_(internal_visibility(), arena);
-}
-BatchTableRequest::~BatchTableRequest() {
-  // @@protoc_insertion_point(destructor:io.deephaven.proto.backplane.grpc.BatchTableRequest)
-  _internal_metadata_.Delete<::google::protobuf::UnknownFieldSet>();
-  SharedDtor();
-}
-inline void BatchTableRequest::SharedDtor() {
-  ABSL_DCHECK(GetArena() == nullptr);
-  _impl_.~Impl_();
-}
-
-PROTOBUF_NOINLINE void BatchTableRequest::Clear() {
-// @@protoc_insertion_point(message_clear_start:io.deephaven.proto.backplane.grpc.BatchTableRequest)
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  ::uint32_t cached_has_bits = 0;
-  // Prevent compiler warnings about cached_has_bits being unused
-  (void) cached_has_bits;
-
-  _impl_.ops_.Clear();
-  _internal_metadata_.Clear<::google::protobuf::UnknownFieldSet>();
-}
-
-const char* BatchTableRequest::_InternalParse(
-    const char* ptr, ::_pbi::ParseContext* ctx) {
-  ptr = ::_pbi::TcParser::ParseLoop(this, ptr, ctx, &_table_.header);
-  return ptr;
-}
-
-
-PROTOBUF_CONSTINIT PROTOBUF_ATTRIBUTE_INIT_PRIORITY1
-const ::_pbi::TcParseTable<0, 1, 1, 0, 2> BatchTableRequest::_table_ = {
-  {
-    0,  // no _has_bits_
-    0, // no _extensions_
-    1, 0,  // max_field_number, fast_idx_mask
-    offsetof(decltype(_table_), field_lookup_table),
-    4294967294,  // skipmap
-    offsetof(decltype(_table_), field_entries),
-    1,  // num_field_entries
-    1,  // num_aux_entries
-    offsetof(decltype(_table_), aux_entries),
-    &_BatchTableRequest_default_instance_._instance,
-    ::_pbi::TcParser::GenericFallback,  // fallback
-  }, {{
-    // repeated .io.deephaven.proto.backplane.grpc.BatchTableRequest.Operation ops = 1;
-    {::_pbi::TcParser::FastMtR1,
-     {10, 63, 0, PROTOBUF_FIELD_OFFSET(BatchTableRequest, _impl_.ops_)}},
-  }}, {{
-    65535, 65535
-  }}, {{
-    // repeated .io.deephaven.proto.backplane.grpc.BatchTableRequest.Operation ops = 1;
-    {PROTOBUF_FIELD_OFFSET(BatchTableRequest, _impl_.ops_), 0, 0,
-    (0 | ::_fl::kFcRepeated | ::_fl::kMessage | ::_fl::kTvTable)},
-  }}, {{
-    {::_pbi::TcParser::GetTable<::io::deephaven::proto::backplane::grpc::BatchTableRequest_Operation>()},
-  }}, {{
-  }},
-};
-
-::uint8_t* BatchTableRequest::_InternalSerialize(
-    ::uint8_t* target,
-    ::google::protobuf::io::EpsCopyOutputStream* stream) const {
-  // @@protoc_insertion_point(serialize_to_array_start:io.deephaven.proto.backplane.grpc.BatchTableRequest)
-  ::uint32_t cached_has_bits = 0;
-  (void)cached_has_bits;
-
-  // repeated .io.deephaven.proto.backplane.grpc.BatchTableRequest.Operation ops = 1;
-  for (unsigned i = 0,
-      n = static_cast<unsigned>(this->_internal_ops_size()); i < n; i++) {
-    const auto& repfield = this->_internal_ops().Get(i);
-    target = ::google::protobuf::internal::WireFormatLite::
-        InternalWriteMessage(1, repfield, repfield.GetCachedSize(), target, stream);
-  }
-
-  if (PROTOBUF_PREDICT_FALSE(_internal_metadata_.have_unknown_fields())) {
-    target =
-        ::_pbi::WireFormat::InternalSerializeUnknownFieldsToArray(
-            _internal_metadata_.unknown_fields<::google::protobuf::UnknownFieldSet>(::google::protobuf::UnknownFieldSet::default_instance), target, stream);
-  }
-  // @@protoc_insertion_point(serialize_to_array_end:io.deephaven.proto.backplane.grpc.BatchTableRequest)
-  return target;
-}
-
-::size_t BatchTableRequest::ByteSizeLong() const {
-// @@protoc_insertion_point(message_byte_size_start:io.deephaven.proto.backplane.grpc.BatchTableRequest)
-  ::size_t total_size = 0;
-
-  ::uint32_t cached_has_bits = 0;
-  // Prevent compiler warnings about cached_has_bits being unused
-  (void) cached_has_bits;
-
-  // repeated .io.deephaven.proto.backplane.grpc.BatchTableRequest.Operation ops = 1;
-  total_size += 1UL * this->_internal_ops_size();
-  for (const auto& msg : this->_internal_ops()) {
-    total_size +=
-      ::google::protobuf::internal::WireFormatLite::MessageSize(msg);
-  }
-  return MaybeComputeUnknownFieldsSize(total_size, &_impl_._cached_size_);
-}
-
-const ::google::protobuf::Message::ClassData BatchTableRequest::_class_data_ = {
-    BatchTableRequest::MergeImpl,
-    nullptr,  // OnDemandRegisterArenaDtor
-};
-const ::google::protobuf::Message::ClassData* BatchTableRequest::GetClassData() const {
-  return &_class_data_;
-}
-
-void BatchTableRequest::MergeImpl(::google::protobuf::Message& to_msg, const ::google::protobuf::Message& from_msg) {
-  auto* const _this = static_cast<BatchTableRequest*>(&to_msg);
-  auto& from = static_cast<const BatchTableRequest&>(from_msg);
-  // @@protoc_insertion_point(class_specific_merge_from_start:io.deephaven.proto.backplane.grpc.BatchTableRequest)
-  ABSL_DCHECK_NE(&from, _this);
-  ::uint32_t cached_has_bits = 0;
-  (void) cached_has_bits;
-
-  _this->_internal_mutable_ops()->MergeFrom(
-      from._internal_ops());
-  _this->_internal_metadata_.MergeFrom<::google::protobuf::UnknownFieldSet>(from._internal_metadata_);
-}
-
-void BatchTableRequest::CopyFrom(const BatchTableRequest& from) {
-// @@protoc_insertion_point(class_specific_copy_from_start:io.deephaven.proto.backplane.grpc.BatchTableRequest)
-  if (&from == this) return;
-  Clear();
-  MergeFrom(from);
-}
-
-PROTOBUF_NOINLINE bool BatchTableRequest::IsInitialized() const {
-  return true;
-}
-
-::_pbi::CachedSize* BatchTableRequest::AccessCachedSize() const {
-  return &_impl_._cached_size_;
-}
-void BatchTableRequest::InternalSwap(BatchTableRequest* PROTOBUF_RESTRICT other) {
-  using std::swap;
-  _internal_metadata_.InternalSwap(&other->_internal_metadata_);
-  _impl_.ops_.InternalSwap(&other->_impl_.ops_);
-}
-
-::google::protobuf::Metadata BatchTableRequest::GetMetadata() const {
-  return ::_pbi::AssignDescriptors(
-      &descriptor_table_deephaven_2fproto_2ftable_2eproto_getter, &descriptor_table_deephaven_2fproto_2ftable_2eproto_once,
-      file_level_metadata_deephaven_2fproto_2ftable_2eproto[123]);
-}
-// @@protoc_insertion_point(namespace_scope)
-}  // namespace grpc
-}  // namespace backplane
-}  // namespace proto
-}  // namespace deephaven
-}  // namespace io
-namespace google {
-namespace protobuf {
-}  // namespace protobuf
-}  // namespace google
-// @@protoc_insertion_point(global_scope)
-#include "google/protobuf/port_undef.inc"
diff --git a/cpp-client/deephaven/dhclient/proto/deephaven/proto/table.pb.h b/cpp-client/deephaven/dhclient/proto/deephaven/proto/table.pb.h
deleted file mode 100644
index 93c065ab85c..00000000000
--- a/cpp-client/deephaven/dhclient/proto/deephaven/proto/table.pb.h
+++ /dev/null
@@ -1,58062 +0,0 @@
-// Generated by the protocol buffer compiler.  DO NOT EDIT!
-// source: deephaven/proto/table.proto
-// Protobuf C++ Version: 4.25.3
-
-#ifndef GOOGLE_PROTOBUF_INCLUDED_deephaven_2fproto_2ftable_2eproto_2epb_2eh
-#define GOOGLE_PROTOBUF_INCLUDED_deephaven_2fproto_2ftable_2eproto_2epb_2eh
-
-#include <limits>
-#include <string>
-#include <type_traits>
-#include <utility>
-
-#include "google/protobuf/port_def.inc"
-#if PROTOBUF_VERSION < 4025000
-#error "This file was generated by a newer version of protoc which is"
-#error "incompatible with your Protocol Buffer headers. Please update"
-#error "your headers."
-#endif  // PROTOBUF_VERSION
-
-#if 4025003 < PROTOBUF_MIN_PROTOC_VERSION
-#error "This file was generated by an older version of protoc which is"
-#error "incompatible with your Protocol Buffer headers. Please"
-#error "regenerate this file with a newer version of protoc."
-#endif  // PROTOBUF_MIN_PROTOC_VERSION
-#include "google/protobuf/port_undef.inc"
-#include "google/protobuf/io/coded_stream.h"
-#include "google/protobuf/arena.h"
-#include "google/protobuf/arenastring.h"
-#include "google/protobuf/generated_message_bases.h"
-#include "google/protobuf/generated_message_tctable_decl.h"
-#include "google/protobuf/generated_message_util.h"
-#include "google/protobuf/metadata_lite.h"
-#include "google/protobuf/generated_message_reflection.h"
-#include "google/protobuf/message.h"
-#include "google/protobuf/repeated_field.h"  // IWYU pragma: export
-#include "google/protobuf/extension_set.h"  // IWYU pragma: export
-#include "google/protobuf/generated_enum_reflection.h"
-#include "google/protobuf/unknown_field_set.h"
-#include "deephaven/proto/ticket.pb.h"
-// @@protoc_insertion_point(includes)
-
-// Must be included last.
-#include "google/protobuf/port_def.inc"
-
-#define PROTOBUF_INTERNAL_EXPORT_deephaven_2fproto_2ftable_2eproto
-
-namespace google {
-namespace protobuf {
-namespace internal {
-class AnyMetadata;
-}  // namespace internal
-}  // namespace protobuf
-}  // namespace google
-
-// Internal implementation detail -- do not use these members.
-struct TableStruct_deephaven_2fproto_2ftable_2eproto {
-  static const ::uint32_t offsets[];
-};
-extern const ::google::protobuf::internal::DescriptorTable
-    descriptor_table_deephaven_2fproto_2ftable_2eproto;
-namespace io {
-namespace deephaven {
-namespace proto {
-namespace backplane {
-namespace grpc {
-class AggSpec;
-struct AggSpecDefaultTypeInternal;
-extern AggSpecDefaultTypeInternal _AggSpec_default_instance_;
-class AggSpec_AggSpecAbsSum;
-struct AggSpec_AggSpecAbsSumDefaultTypeInternal;
-extern AggSpec_AggSpecAbsSumDefaultTypeInternal _AggSpec_AggSpecAbsSum_default_instance_;
-class AggSpec_AggSpecApproximatePercentile;
-struct AggSpec_AggSpecApproximatePercentileDefaultTypeInternal;
-extern AggSpec_AggSpecApproximatePercentileDefaultTypeInternal _AggSpec_AggSpecApproximatePercentile_default_instance_;
-class AggSpec_AggSpecAvg;
-struct AggSpec_AggSpecAvgDefaultTypeInternal;
-extern AggSpec_AggSpecAvgDefaultTypeInternal _AggSpec_AggSpecAvg_default_instance_;
-class AggSpec_AggSpecCountDistinct;
-struct AggSpec_AggSpecCountDistinctDefaultTypeInternal;
-extern AggSpec_AggSpecCountDistinctDefaultTypeInternal _AggSpec_AggSpecCountDistinct_default_instance_;
-class AggSpec_AggSpecDistinct;
-struct AggSpec_AggSpecDistinctDefaultTypeInternal;
-extern AggSpec_AggSpecDistinctDefaultTypeInternal _AggSpec_AggSpecDistinct_default_instance_;
-class AggSpec_AggSpecFirst;
-struct AggSpec_AggSpecFirstDefaultTypeInternal;
-extern AggSpec_AggSpecFirstDefaultTypeInternal _AggSpec_AggSpecFirst_default_instance_;
-class AggSpec_AggSpecFormula;
-struct AggSpec_AggSpecFormulaDefaultTypeInternal;
-extern AggSpec_AggSpecFormulaDefaultTypeInternal _AggSpec_AggSpecFormula_default_instance_;
-class AggSpec_AggSpecFreeze;
-struct AggSpec_AggSpecFreezeDefaultTypeInternal;
-extern AggSpec_AggSpecFreezeDefaultTypeInternal _AggSpec_AggSpecFreeze_default_instance_;
-class AggSpec_AggSpecGroup;
-struct AggSpec_AggSpecGroupDefaultTypeInternal;
-extern AggSpec_AggSpecGroupDefaultTypeInternal _AggSpec_AggSpecGroup_default_instance_;
-class AggSpec_AggSpecLast;
-struct AggSpec_AggSpecLastDefaultTypeInternal;
-extern AggSpec_AggSpecLastDefaultTypeInternal _AggSpec_AggSpecLast_default_instance_;
-class AggSpec_AggSpecMax;
-struct AggSpec_AggSpecMaxDefaultTypeInternal;
-extern AggSpec_AggSpecMaxDefaultTypeInternal _AggSpec_AggSpecMax_default_instance_;
-class AggSpec_AggSpecMedian;
-struct AggSpec_AggSpecMedianDefaultTypeInternal;
-extern AggSpec_AggSpecMedianDefaultTypeInternal _AggSpec_AggSpecMedian_default_instance_;
-class AggSpec_AggSpecMin;
-struct AggSpec_AggSpecMinDefaultTypeInternal;
-extern AggSpec_AggSpecMinDefaultTypeInternal _AggSpec_AggSpecMin_default_instance_;
-class AggSpec_AggSpecNonUniqueSentinel;
-struct AggSpec_AggSpecNonUniqueSentinelDefaultTypeInternal;
-extern AggSpec_AggSpecNonUniqueSentinelDefaultTypeInternal _AggSpec_AggSpecNonUniqueSentinel_default_instance_;
-class AggSpec_AggSpecPercentile;
-struct AggSpec_AggSpecPercentileDefaultTypeInternal;
-extern AggSpec_AggSpecPercentileDefaultTypeInternal _AggSpec_AggSpecPercentile_default_instance_;
-class AggSpec_AggSpecSorted;
-struct AggSpec_AggSpecSortedDefaultTypeInternal;
-extern AggSpec_AggSpecSortedDefaultTypeInternal _AggSpec_AggSpecSorted_default_instance_;
-class AggSpec_AggSpecSortedColumn;
-struct AggSpec_AggSpecSortedColumnDefaultTypeInternal;
-extern AggSpec_AggSpecSortedColumnDefaultTypeInternal _AggSpec_AggSpecSortedColumn_default_instance_;
-class AggSpec_AggSpecStd;
-struct AggSpec_AggSpecStdDefaultTypeInternal;
-extern AggSpec_AggSpecStdDefaultTypeInternal _AggSpec_AggSpecStd_default_instance_;
-class AggSpec_AggSpecSum;
-struct AggSpec_AggSpecSumDefaultTypeInternal;
-extern AggSpec_AggSpecSumDefaultTypeInternal _AggSpec_AggSpecSum_default_instance_;
-class AggSpec_AggSpecTDigest;
-struct AggSpec_AggSpecTDigestDefaultTypeInternal;
-extern AggSpec_AggSpecTDigestDefaultTypeInternal _AggSpec_AggSpecTDigest_default_instance_;
-class AggSpec_AggSpecUnique;
-struct AggSpec_AggSpecUniqueDefaultTypeInternal;
-extern AggSpec_AggSpecUniqueDefaultTypeInternal _AggSpec_AggSpecUnique_default_instance_;
-class AggSpec_AggSpecVar;
-struct AggSpec_AggSpecVarDefaultTypeInternal;
-extern AggSpec_AggSpecVarDefaultTypeInternal _AggSpec_AggSpecVar_default_instance_;
-class AggSpec_AggSpecWeighted;
-struct AggSpec_AggSpecWeightedDefaultTypeInternal;
-extern AggSpec_AggSpecWeightedDefaultTypeInternal _AggSpec_AggSpecWeighted_default_instance_;
-class AggregateAllRequest;
-struct AggregateAllRequestDefaultTypeInternal;
-extern AggregateAllRequestDefaultTypeInternal _AggregateAllRequest_default_instance_;
-class AggregateRequest;
-struct AggregateRequestDefaultTypeInternal;
-extern AggregateRequestDefaultTypeInternal _AggregateRequest_default_instance_;
-class Aggregation;
-struct AggregationDefaultTypeInternal;
-extern AggregationDefaultTypeInternal _Aggregation_default_instance_;
-class Aggregation_AggregationColumns;
-struct Aggregation_AggregationColumnsDefaultTypeInternal;
-extern Aggregation_AggregationColumnsDefaultTypeInternal _Aggregation_AggregationColumns_default_instance_;
-class Aggregation_AggregationCount;
-struct Aggregation_AggregationCountDefaultTypeInternal;
-extern Aggregation_AggregationCountDefaultTypeInternal _Aggregation_AggregationCount_default_instance_;
-class Aggregation_AggregationPartition;
-struct Aggregation_AggregationPartitionDefaultTypeInternal;
-extern Aggregation_AggregationPartitionDefaultTypeInternal _Aggregation_AggregationPartition_default_instance_;
-class Aggregation_AggregationRowKey;
-struct Aggregation_AggregationRowKeyDefaultTypeInternal;
-extern Aggregation_AggregationRowKeyDefaultTypeInternal _Aggregation_AggregationRowKey_default_instance_;
-class AjRajTablesRequest;
-struct AjRajTablesRequestDefaultTypeInternal;
-extern AjRajTablesRequestDefaultTypeInternal _AjRajTablesRequest_default_instance_;
-class AndCondition;
-struct AndConditionDefaultTypeInternal;
-extern AndConditionDefaultTypeInternal _AndCondition_default_instance_;
-class ApplyPreviewColumnsRequest;
-struct ApplyPreviewColumnsRequestDefaultTypeInternal;
-extern ApplyPreviewColumnsRequestDefaultTypeInternal _ApplyPreviewColumnsRequest_default_instance_;
-class AsOfJoinTablesRequest;
-struct AsOfJoinTablesRequestDefaultTypeInternal;
-extern AsOfJoinTablesRequestDefaultTypeInternal _AsOfJoinTablesRequest_default_instance_;
-class BatchTableRequest;
-struct BatchTableRequestDefaultTypeInternal;
-extern BatchTableRequestDefaultTypeInternal _BatchTableRequest_default_instance_;
-class BatchTableRequest_Operation;
-struct BatchTableRequest_OperationDefaultTypeInternal;
-extern BatchTableRequest_OperationDefaultTypeInternal _BatchTableRequest_Operation_default_instance_;
-class ColumnStatisticsRequest;
-struct ColumnStatisticsRequestDefaultTypeInternal;
-extern ColumnStatisticsRequestDefaultTypeInternal _ColumnStatisticsRequest_default_instance_;
-class ComboAggregateRequest;
-struct ComboAggregateRequestDefaultTypeInternal;
-extern ComboAggregateRequestDefaultTypeInternal _ComboAggregateRequest_default_instance_;
-class ComboAggregateRequest_Aggregate;
-struct ComboAggregateRequest_AggregateDefaultTypeInternal;
-extern ComboAggregateRequest_AggregateDefaultTypeInternal _ComboAggregateRequest_Aggregate_default_instance_;
-class CompareCondition;
-struct CompareConditionDefaultTypeInternal;
-extern CompareConditionDefaultTypeInternal _CompareCondition_default_instance_;
-class Condition;
-struct ConditionDefaultTypeInternal;
-extern ConditionDefaultTypeInternal _Condition_default_instance_;
-class ContainsCondition;
-struct ContainsConditionDefaultTypeInternal;
-extern ContainsConditionDefaultTypeInternal _ContainsCondition_default_instance_;
-class CreateInputTableRequest;
-struct CreateInputTableRequestDefaultTypeInternal;
-extern CreateInputTableRequestDefaultTypeInternal _CreateInputTableRequest_default_instance_;
-class CreateInputTableRequest_InputTableKind;
-struct CreateInputTableRequest_InputTableKindDefaultTypeInternal;
-extern CreateInputTableRequest_InputTableKindDefaultTypeInternal _CreateInputTableRequest_InputTableKind_default_instance_;
-class CreateInputTableRequest_InputTableKind_Blink;
-struct CreateInputTableRequest_InputTableKind_BlinkDefaultTypeInternal;
-extern CreateInputTableRequest_InputTableKind_BlinkDefaultTypeInternal _CreateInputTableRequest_InputTableKind_Blink_default_instance_;
-class CreateInputTableRequest_InputTableKind_InMemoryAppendOnly;
-struct CreateInputTableRequest_InputTableKind_InMemoryAppendOnlyDefaultTypeInternal;
-extern CreateInputTableRequest_InputTableKind_InMemoryAppendOnlyDefaultTypeInternal _CreateInputTableRequest_InputTableKind_InMemoryAppendOnly_default_instance_;
-class CreateInputTableRequest_InputTableKind_InMemoryKeyBacked;
-struct CreateInputTableRequest_InputTableKind_InMemoryKeyBackedDefaultTypeInternal;
-extern CreateInputTableRequest_InputTableKind_InMemoryKeyBackedDefaultTypeInternal _CreateInputTableRequest_InputTableKind_InMemoryKeyBacked_default_instance_;
-class CrossJoinTablesRequest;
-struct CrossJoinTablesRequestDefaultTypeInternal;
-extern CrossJoinTablesRequestDefaultTypeInternal _CrossJoinTablesRequest_default_instance_;
-class DropColumnsRequest;
-struct DropColumnsRequestDefaultTypeInternal;
-extern DropColumnsRequestDefaultTypeInternal _DropColumnsRequest_default_instance_;
-class EmptyTableRequest;
-struct EmptyTableRequestDefaultTypeInternal;
-extern EmptyTableRequestDefaultTypeInternal _EmptyTableRequest_default_instance_;
-class ExactJoinTablesRequest;
-struct ExactJoinTablesRequestDefaultTypeInternal;
-extern ExactJoinTablesRequestDefaultTypeInternal _ExactJoinTablesRequest_default_instance_;
-class ExportedTableCreationResponse;
-struct ExportedTableCreationResponseDefaultTypeInternal;
-extern ExportedTableCreationResponseDefaultTypeInternal _ExportedTableCreationResponse_default_instance_;
-class ExportedTableUpdateMessage;
-struct ExportedTableUpdateMessageDefaultTypeInternal;
-extern ExportedTableUpdateMessageDefaultTypeInternal _ExportedTableUpdateMessage_default_instance_;
-class ExportedTableUpdatesRequest;
-struct ExportedTableUpdatesRequestDefaultTypeInternal;
-extern ExportedTableUpdatesRequestDefaultTypeInternal _ExportedTableUpdatesRequest_default_instance_;
-class FetchTableRequest;
-struct FetchTableRequestDefaultTypeInternal;
-extern FetchTableRequestDefaultTypeInternal _FetchTableRequest_default_instance_;
-class FilterTableRequest;
-struct FilterTableRequestDefaultTypeInternal;
-extern FilterTableRequestDefaultTypeInternal _FilterTableRequest_default_instance_;
-class FlattenRequest;
-struct FlattenRequestDefaultTypeInternal;
-extern FlattenRequestDefaultTypeInternal _FlattenRequest_default_instance_;
-class HeadOrTailByRequest;
-struct HeadOrTailByRequestDefaultTypeInternal;
-extern HeadOrTailByRequestDefaultTypeInternal _HeadOrTailByRequest_default_instance_;
-class HeadOrTailRequest;
-struct HeadOrTailRequestDefaultTypeInternal;
-extern HeadOrTailRequestDefaultTypeInternal _HeadOrTailRequest_default_instance_;
-class InCondition;
-struct InConditionDefaultTypeInternal;
-extern InConditionDefaultTypeInternal _InCondition_default_instance_;
-class InvokeCondition;
-struct InvokeConditionDefaultTypeInternal;
-extern InvokeConditionDefaultTypeInternal _InvokeCondition_default_instance_;
-class IsNullCondition;
-struct IsNullConditionDefaultTypeInternal;
-extern IsNullConditionDefaultTypeInternal _IsNullCondition_default_instance_;
-class LeftJoinTablesRequest;
-struct LeftJoinTablesRequestDefaultTypeInternal;
-extern LeftJoinTablesRequestDefaultTypeInternal _LeftJoinTablesRequest_default_instance_;
-class Literal;
-struct LiteralDefaultTypeInternal;
-extern LiteralDefaultTypeInternal _Literal_default_instance_;
-class MatchesCondition;
-struct MatchesConditionDefaultTypeInternal;
-extern MatchesConditionDefaultTypeInternal _MatchesCondition_default_instance_;
-class MathContext;
-struct MathContextDefaultTypeInternal;
-extern MathContextDefaultTypeInternal _MathContext_default_instance_;
-class MergeTablesRequest;
-struct MergeTablesRequestDefaultTypeInternal;
-extern MergeTablesRequestDefaultTypeInternal _MergeTablesRequest_default_instance_;
-class MetaTableRequest;
-struct MetaTableRequestDefaultTypeInternal;
-extern MetaTableRequestDefaultTypeInternal _MetaTableRequest_default_instance_;
-class MultiJoinInput;
-struct MultiJoinInputDefaultTypeInternal;
-extern MultiJoinInputDefaultTypeInternal _MultiJoinInput_default_instance_;
-class MultiJoinTablesRequest;
-struct MultiJoinTablesRequestDefaultTypeInternal;
-extern MultiJoinTablesRequestDefaultTypeInternal _MultiJoinTablesRequest_default_instance_;
-class NaturalJoinTablesRequest;
-struct NaturalJoinTablesRequestDefaultTypeInternal;
-extern NaturalJoinTablesRequestDefaultTypeInternal _NaturalJoinTablesRequest_default_instance_;
-class NotCondition;
-struct NotConditionDefaultTypeInternal;
-extern NotConditionDefaultTypeInternal _NotCondition_default_instance_;
-class OrCondition;
-struct OrConditionDefaultTypeInternal;
-extern OrConditionDefaultTypeInternal _OrCondition_default_instance_;
-class RangeJoinTablesRequest;
-struct RangeJoinTablesRequestDefaultTypeInternal;
-extern RangeJoinTablesRequestDefaultTypeInternal _RangeJoinTablesRequest_default_instance_;
-class Reference;
-struct ReferenceDefaultTypeInternal;
-extern ReferenceDefaultTypeInternal _Reference_default_instance_;
-class RunChartDownsampleRequest;
-struct RunChartDownsampleRequestDefaultTypeInternal;
-extern RunChartDownsampleRequestDefaultTypeInternal _RunChartDownsampleRequest_default_instance_;
-class RunChartDownsampleRequest_ZoomRange;
-struct RunChartDownsampleRequest_ZoomRangeDefaultTypeInternal;
-extern RunChartDownsampleRequest_ZoomRangeDefaultTypeInternal _RunChartDownsampleRequest_ZoomRange_default_instance_;
-class SearchCondition;
-struct SearchConditionDefaultTypeInternal;
-extern SearchConditionDefaultTypeInternal _SearchCondition_default_instance_;
-class SeekRowRequest;
-struct SeekRowRequestDefaultTypeInternal;
-extern SeekRowRequestDefaultTypeInternal _SeekRowRequest_default_instance_;
-class SeekRowResponse;
-struct SeekRowResponseDefaultTypeInternal;
-extern SeekRowResponseDefaultTypeInternal _SeekRowResponse_default_instance_;
-class SelectDistinctRequest;
-struct SelectDistinctRequestDefaultTypeInternal;
-extern SelectDistinctRequestDefaultTypeInternal _SelectDistinctRequest_default_instance_;
-class SelectOrUpdateRequest;
-struct SelectOrUpdateRequestDefaultTypeInternal;
-extern SelectOrUpdateRequestDefaultTypeInternal _SelectOrUpdateRequest_default_instance_;
-class SnapshotTableRequest;
-struct SnapshotTableRequestDefaultTypeInternal;
-extern SnapshotTableRequestDefaultTypeInternal _SnapshotTableRequest_default_instance_;
-class SnapshotWhenTableRequest;
-struct SnapshotWhenTableRequestDefaultTypeInternal;
-extern SnapshotWhenTableRequestDefaultTypeInternal _SnapshotWhenTableRequest_default_instance_;
-class SortDescriptor;
-struct SortDescriptorDefaultTypeInternal;
-extern SortDescriptorDefaultTypeInternal _SortDescriptor_default_instance_;
-class SortTableRequest;
-struct SortTableRequestDefaultTypeInternal;
-extern SortTableRequestDefaultTypeInternal _SortTableRequest_default_instance_;
-class TableReference;
-struct TableReferenceDefaultTypeInternal;
-extern TableReferenceDefaultTypeInternal _TableReference_default_instance_;
-class TimeTableRequest;
-struct TimeTableRequestDefaultTypeInternal;
-extern TimeTableRequestDefaultTypeInternal _TimeTableRequest_default_instance_;
-class UngroupRequest;
-struct UngroupRequestDefaultTypeInternal;
-extern UngroupRequestDefaultTypeInternal _UngroupRequest_default_instance_;
-class UnstructuredFilterTableRequest;
-struct UnstructuredFilterTableRequestDefaultTypeInternal;
-extern UnstructuredFilterTableRequestDefaultTypeInternal _UnstructuredFilterTableRequest_default_instance_;
-class UpdateByDeltaOptions;
-struct UpdateByDeltaOptionsDefaultTypeInternal;
-extern UpdateByDeltaOptionsDefaultTypeInternal _UpdateByDeltaOptions_default_instance_;
-class UpdateByEmOptions;
-struct UpdateByEmOptionsDefaultTypeInternal;
-extern UpdateByEmOptionsDefaultTypeInternal _UpdateByEmOptions_default_instance_;
-class UpdateByRequest;
-struct UpdateByRequestDefaultTypeInternal;
-extern UpdateByRequestDefaultTypeInternal _UpdateByRequest_default_instance_;
-class UpdateByRequest_UpdateByOperation;
-struct UpdateByRequest_UpdateByOperationDefaultTypeInternal;
-extern UpdateByRequest_UpdateByOperationDefaultTypeInternal _UpdateByRequest_UpdateByOperation_default_instance_;
-class UpdateByRequest_UpdateByOperation_UpdateByColumn;
-struct UpdateByRequest_UpdateByOperation_UpdateByColumnDefaultTypeInternal;
-extern UpdateByRequest_UpdateByOperation_UpdateByColumnDefaultTypeInternal _UpdateByRequest_UpdateByOperation_UpdateByColumn_default_instance_;
-class UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec;
-struct UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpecDefaultTypeInternal;
-extern UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpecDefaultTypeInternal _UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_default_instance_;
-class UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByCumulativeMax;
-struct UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByCumulativeMaxDefaultTypeInternal;
-extern UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByCumulativeMaxDefaultTypeInternal _UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByCumulativeMax_default_instance_;
-class UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByCumulativeMin;
-struct UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByCumulativeMinDefaultTypeInternal;
-extern UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByCumulativeMinDefaultTypeInternal _UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByCumulativeMin_default_instance_;
-class UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByCumulativeProduct;
-struct UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByCumulativeProductDefaultTypeInternal;
-extern UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByCumulativeProductDefaultTypeInternal _UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByCumulativeProduct_default_instance_;
-class UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByCumulativeSum;
-struct UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByCumulativeSumDefaultTypeInternal;
-extern UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByCumulativeSumDefaultTypeInternal _UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByCumulativeSum_default_instance_;
-class UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByDelta;
-struct UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByDeltaDefaultTypeInternal;
-extern UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByDeltaDefaultTypeInternal _UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByDelta_default_instance_;
-class UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByEmMax;
-struct UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByEmMaxDefaultTypeInternal;
-extern UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByEmMaxDefaultTypeInternal _UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByEmMax_default_instance_;
-class UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByEmMin;
-struct UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByEmMinDefaultTypeInternal;
-extern UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByEmMinDefaultTypeInternal _UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByEmMin_default_instance_;
-class UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByEmStd;
-struct UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByEmStdDefaultTypeInternal;
-extern UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByEmStdDefaultTypeInternal _UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByEmStd_default_instance_;
-class UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByEma;
-struct UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByEmaDefaultTypeInternal;
-extern UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByEmaDefaultTypeInternal _UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByEma_default_instance_;
-class UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByEms;
-struct UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByEmsDefaultTypeInternal;
-extern UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByEmsDefaultTypeInternal _UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByEms_default_instance_;
-class UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByFill;
-struct UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByFillDefaultTypeInternal;
-extern UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByFillDefaultTypeInternal _UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByFill_default_instance_;
-class UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingAvg;
-struct UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingAvgDefaultTypeInternal;
-extern UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingAvgDefaultTypeInternal _UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingAvg_default_instance_;
-class UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingCount;
-struct UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingCountDefaultTypeInternal;
-extern UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingCountDefaultTypeInternal _UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingCount_default_instance_;
-class UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingFormula;
-struct UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingFormulaDefaultTypeInternal;
-extern UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingFormulaDefaultTypeInternal _UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingFormula_default_instance_;
-class UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingGroup;
-struct UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingGroupDefaultTypeInternal;
-extern UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingGroupDefaultTypeInternal _UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingGroup_default_instance_;
-class UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingMax;
-struct UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingMaxDefaultTypeInternal;
-extern UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingMaxDefaultTypeInternal _UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingMax_default_instance_;
-class UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingMin;
-struct UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingMinDefaultTypeInternal;
-extern UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingMinDefaultTypeInternal _UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingMin_default_instance_;
-class UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingProduct;
-struct UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingProductDefaultTypeInternal;
-extern UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingProductDefaultTypeInternal _UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingProduct_default_instance_;
-class UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingStd;
-struct UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingStdDefaultTypeInternal;
-extern UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingStdDefaultTypeInternal _UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingStd_default_instance_;
-class UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingSum;
-struct UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingSumDefaultTypeInternal;
-extern UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingSumDefaultTypeInternal _UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingSum_default_instance_;
-class UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingWAvg;
-struct UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingWAvgDefaultTypeInternal;
-extern UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingWAvgDefaultTypeInternal _UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingWAvg_default_instance_;
-class UpdateByRequest_UpdateByOptions;
-struct UpdateByRequest_UpdateByOptionsDefaultTypeInternal;
-extern UpdateByRequest_UpdateByOptionsDefaultTypeInternal _UpdateByRequest_UpdateByOptions_default_instance_;
-class UpdateByWindowScale;
-struct UpdateByWindowScaleDefaultTypeInternal;
-extern UpdateByWindowScaleDefaultTypeInternal _UpdateByWindowScale_default_instance_;
-class UpdateByWindowScale_UpdateByWindowTicks;
-struct UpdateByWindowScale_UpdateByWindowTicksDefaultTypeInternal;
-extern UpdateByWindowScale_UpdateByWindowTicksDefaultTypeInternal _UpdateByWindowScale_UpdateByWindowTicks_default_instance_;
-class UpdateByWindowScale_UpdateByWindowTime;
-struct UpdateByWindowScale_UpdateByWindowTimeDefaultTypeInternal;
-extern UpdateByWindowScale_UpdateByWindowTimeDefaultTypeInternal _UpdateByWindowScale_UpdateByWindowTime_default_instance_;
-class Value;
-struct ValueDefaultTypeInternal;
-extern ValueDefaultTypeInternal _Value_default_instance_;
-class WhereInRequest;
-struct WhereInRequestDefaultTypeInternal;
-extern WhereInRequestDefaultTypeInternal _WhereInRequest_default_instance_;
-}  // namespace grpc
-}  // namespace backplane
-}  // namespace proto
-}  // namespace deephaven
-}  // namespace io
-namespace google {
-namespace protobuf {
-}  // namespace protobuf
-}  // namespace google
-
-namespace io {
-namespace deephaven {
-namespace proto {
-namespace backplane {
-namespace grpc {
-enum MathContext_RoundingMode : int {
-  MathContext_RoundingMode_ROUNDING_MODE_NOT_SPECIFIED = 0,
-  MathContext_RoundingMode_UP = 1,
-  MathContext_RoundingMode_DOWN = 2,
-  MathContext_RoundingMode_CEILING = 3,
-  MathContext_RoundingMode_FLOOR = 4,
-  MathContext_RoundingMode_HALF_UP = 5,
-  MathContext_RoundingMode_HALF_DOWN = 6,
-  MathContext_RoundingMode_HALF_EVEN = 7,
-  MathContext_RoundingMode_UNNECESSARY = 8,
-  MathContext_RoundingMode_MathContext_RoundingMode_INT_MIN_SENTINEL_DO_NOT_USE_ =
-      std::numeric_limits<::int32_t>::min(),
-  MathContext_RoundingMode_MathContext_RoundingMode_INT_MAX_SENTINEL_DO_NOT_USE_ =
-      std::numeric_limits<::int32_t>::max(),
-};
-
-bool MathContext_RoundingMode_IsValid(int value);
-extern const uint32_t MathContext_RoundingMode_internal_data_[];
-constexpr MathContext_RoundingMode MathContext_RoundingMode_RoundingMode_MIN = static_cast<MathContext_RoundingMode>(0);
-constexpr MathContext_RoundingMode MathContext_RoundingMode_RoundingMode_MAX = static_cast<MathContext_RoundingMode>(8);
-constexpr int MathContext_RoundingMode_RoundingMode_ARRAYSIZE = 8 + 1;
-const ::google::protobuf::EnumDescriptor*
-MathContext_RoundingMode_descriptor();
-template <typename T>
-const std::string& MathContext_RoundingMode_Name(T value) {
-  static_assert(std::is_same<T, MathContext_RoundingMode>::value ||
-                    std::is_integral<T>::value,
-                "Incorrect type passed to RoundingMode_Name().");
-  return MathContext_RoundingMode_Name(static_cast<MathContext_RoundingMode>(value));
-}
-template <>
-inline const std::string& MathContext_RoundingMode_Name(MathContext_RoundingMode value) {
-  return ::google::protobuf::internal::NameOfDenseEnum<MathContext_RoundingMode_descriptor,
-                                                 0, 8>(
-      static_cast<int>(value));
-}
-inline bool MathContext_RoundingMode_Parse(absl::string_view name, MathContext_RoundingMode* value) {
-  return ::google::protobuf::internal::ParseNamedEnum<MathContext_RoundingMode>(
-      MathContext_RoundingMode_descriptor(), name, value);
-}
-enum AsOfJoinTablesRequest_MatchRule : int {
-  AsOfJoinTablesRequest_MatchRule_LESS_THAN_EQUAL = 0,
-  AsOfJoinTablesRequest_MatchRule_LESS_THAN = 1,
-  AsOfJoinTablesRequest_MatchRule_GREATER_THAN_EQUAL = 2,
-  AsOfJoinTablesRequest_MatchRule_GREATER_THAN = 3,
-  AsOfJoinTablesRequest_MatchRule_AsOfJoinTablesRequest_MatchRule_INT_MIN_SENTINEL_DO_NOT_USE_ =
-      std::numeric_limits<::int32_t>::min(),
-  AsOfJoinTablesRequest_MatchRule_AsOfJoinTablesRequest_MatchRule_INT_MAX_SENTINEL_DO_NOT_USE_ =
-      std::numeric_limits<::int32_t>::max(),
-};
-
-bool AsOfJoinTablesRequest_MatchRule_IsValid(int value);
-extern const uint32_t AsOfJoinTablesRequest_MatchRule_internal_data_[];
-constexpr AsOfJoinTablesRequest_MatchRule AsOfJoinTablesRequest_MatchRule_MatchRule_MIN = static_cast<AsOfJoinTablesRequest_MatchRule>(0);
-constexpr AsOfJoinTablesRequest_MatchRule AsOfJoinTablesRequest_MatchRule_MatchRule_MAX = static_cast<AsOfJoinTablesRequest_MatchRule>(3);
-constexpr int AsOfJoinTablesRequest_MatchRule_MatchRule_ARRAYSIZE = 3 + 1;
-const ::google::protobuf::EnumDescriptor*
-AsOfJoinTablesRequest_MatchRule_descriptor();
-template <typename T>
-const std::string& AsOfJoinTablesRequest_MatchRule_Name(T value) {
-  static_assert(std::is_same<T, AsOfJoinTablesRequest_MatchRule>::value ||
-                    std::is_integral<T>::value,
-                "Incorrect type passed to MatchRule_Name().");
-  return AsOfJoinTablesRequest_MatchRule_Name(static_cast<AsOfJoinTablesRequest_MatchRule>(value));
-}
-template <>
-inline const std::string& AsOfJoinTablesRequest_MatchRule_Name(AsOfJoinTablesRequest_MatchRule value) {
-  return ::google::protobuf::internal::NameOfDenseEnum<AsOfJoinTablesRequest_MatchRule_descriptor,
-                                                 0, 3>(
-      static_cast<int>(value));
-}
-inline bool AsOfJoinTablesRequest_MatchRule_Parse(absl::string_view name, AsOfJoinTablesRequest_MatchRule* value) {
-  return ::google::protobuf::internal::ParseNamedEnum<AsOfJoinTablesRequest_MatchRule>(
-      AsOfJoinTablesRequest_MatchRule_descriptor(), name, value);
-}
-enum RangeJoinTablesRequest_RangeStartRule : int {
-  RangeJoinTablesRequest_RangeStartRule_START_UNSPECIFIED = 0,
-  RangeJoinTablesRequest_RangeStartRule_LESS_THAN = 1,
-  RangeJoinTablesRequest_RangeStartRule_LESS_THAN_OR_EQUAL = 2,
-  RangeJoinTablesRequest_RangeStartRule_LESS_THAN_OR_EQUAL_ALLOW_PRECEDING = 3,
-  RangeJoinTablesRequest_RangeStartRule_RangeJoinTablesRequest_RangeStartRule_INT_MIN_SENTINEL_DO_NOT_USE_ =
-      std::numeric_limits<::int32_t>::min(),
-  RangeJoinTablesRequest_RangeStartRule_RangeJoinTablesRequest_RangeStartRule_INT_MAX_SENTINEL_DO_NOT_USE_ =
-      std::numeric_limits<::int32_t>::max(),
-};
-
-bool RangeJoinTablesRequest_RangeStartRule_IsValid(int value);
-extern const uint32_t RangeJoinTablesRequest_RangeStartRule_internal_data_[];
-constexpr RangeJoinTablesRequest_RangeStartRule RangeJoinTablesRequest_RangeStartRule_RangeStartRule_MIN = static_cast<RangeJoinTablesRequest_RangeStartRule>(0);
-constexpr RangeJoinTablesRequest_RangeStartRule RangeJoinTablesRequest_RangeStartRule_RangeStartRule_MAX = static_cast<RangeJoinTablesRequest_RangeStartRule>(3);
-constexpr int RangeJoinTablesRequest_RangeStartRule_RangeStartRule_ARRAYSIZE = 3 + 1;
-const ::google::protobuf::EnumDescriptor*
-RangeJoinTablesRequest_RangeStartRule_descriptor();
-template <typename T>
-const std::string& RangeJoinTablesRequest_RangeStartRule_Name(T value) {
-  static_assert(std::is_same<T, RangeJoinTablesRequest_RangeStartRule>::value ||
-                    std::is_integral<T>::value,
-                "Incorrect type passed to RangeStartRule_Name().");
-  return RangeJoinTablesRequest_RangeStartRule_Name(static_cast<RangeJoinTablesRequest_RangeStartRule>(value));
-}
-template <>
-inline const std::string& RangeJoinTablesRequest_RangeStartRule_Name(RangeJoinTablesRequest_RangeStartRule value) {
-  return ::google::protobuf::internal::NameOfDenseEnum<RangeJoinTablesRequest_RangeStartRule_descriptor,
-                                                 0, 3>(
-      static_cast<int>(value));
-}
-inline bool RangeJoinTablesRequest_RangeStartRule_Parse(absl::string_view name, RangeJoinTablesRequest_RangeStartRule* value) {
-  return ::google::protobuf::internal::ParseNamedEnum<RangeJoinTablesRequest_RangeStartRule>(
-      RangeJoinTablesRequest_RangeStartRule_descriptor(), name, value);
-}
-enum RangeJoinTablesRequest_RangeEndRule : int {
-  RangeJoinTablesRequest_RangeEndRule_END_UNSPECIFIED = 0,
-  RangeJoinTablesRequest_RangeEndRule_GREATER_THAN = 1,
-  RangeJoinTablesRequest_RangeEndRule_GREATER_THAN_OR_EQUAL = 2,
-  RangeJoinTablesRequest_RangeEndRule_GREATER_THAN_OR_EQUAL_ALLOW_FOLLOWING = 3,
-  RangeJoinTablesRequest_RangeEndRule_RangeJoinTablesRequest_RangeEndRule_INT_MIN_SENTINEL_DO_NOT_USE_ =
-      std::numeric_limits<::int32_t>::min(),
-  RangeJoinTablesRequest_RangeEndRule_RangeJoinTablesRequest_RangeEndRule_INT_MAX_SENTINEL_DO_NOT_USE_ =
-      std::numeric_limits<::int32_t>::max(),
-};
-
-bool RangeJoinTablesRequest_RangeEndRule_IsValid(int value);
-extern const uint32_t RangeJoinTablesRequest_RangeEndRule_internal_data_[];
-constexpr RangeJoinTablesRequest_RangeEndRule RangeJoinTablesRequest_RangeEndRule_RangeEndRule_MIN = static_cast<RangeJoinTablesRequest_RangeEndRule>(0);
-constexpr RangeJoinTablesRequest_RangeEndRule RangeJoinTablesRequest_RangeEndRule_RangeEndRule_MAX = static_cast<RangeJoinTablesRequest_RangeEndRule>(3);
-constexpr int RangeJoinTablesRequest_RangeEndRule_RangeEndRule_ARRAYSIZE = 3 + 1;
-const ::google::protobuf::EnumDescriptor*
-RangeJoinTablesRequest_RangeEndRule_descriptor();
-template <typename T>
-const std::string& RangeJoinTablesRequest_RangeEndRule_Name(T value) {
-  static_assert(std::is_same<T, RangeJoinTablesRequest_RangeEndRule>::value ||
-                    std::is_integral<T>::value,
-                "Incorrect type passed to RangeEndRule_Name().");
-  return RangeJoinTablesRequest_RangeEndRule_Name(static_cast<RangeJoinTablesRequest_RangeEndRule>(value));
-}
-template <>
-inline const std::string& RangeJoinTablesRequest_RangeEndRule_Name(RangeJoinTablesRequest_RangeEndRule value) {
-  return ::google::protobuf::internal::NameOfDenseEnum<RangeJoinTablesRequest_RangeEndRule_descriptor,
-                                                 0, 3>(
-      static_cast<int>(value));
-}
-inline bool RangeJoinTablesRequest_RangeEndRule_Parse(absl::string_view name, RangeJoinTablesRequest_RangeEndRule* value) {
-  return ::google::protobuf::internal::ParseNamedEnum<RangeJoinTablesRequest_RangeEndRule>(
-      RangeJoinTablesRequest_RangeEndRule_descriptor(), name, value);
-}
-enum ComboAggregateRequest_AggType : int {
-  ComboAggregateRequest_AggType_SUM = 0,
-  ComboAggregateRequest_AggType_ABS_SUM = 1,
-  ComboAggregateRequest_AggType_GROUP = 2,
-  ComboAggregateRequest_AggType_AVG = 3,
-  ComboAggregateRequest_AggType_COUNT = 4,
-  ComboAggregateRequest_AggType_FIRST = 5,
-  ComboAggregateRequest_AggType_LAST = 6,
-  ComboAggregateRequest_AggType_MIN = 7,
-  ComboAggregateRequest_AggType_MAX = 8,
-  ComboAggregateRequest_AggType_MEDIAN = 9,
-  ComboAggregateRequest_AggType_PERCENTILE = 10,
-  ComboAggregateRequest_AggType_STD = 11,
-  ComboAggregateRequest_AggType_VAR = 12,
-  ComboAggregateRequest_AggType_WEIGHTED_AVG = 13,
-  ComboAggregateRequest_AggType_ComboAggregateRequest_AggType_INT_MIN_SENTINEL_DO_NOT_USE_ =
-      std::numeric_limits<::int32_t>::min(),
-  ComboAggregateRequest_AggType_ComboAggregateRequest_AggType_INT_MAX_SENTINEL_DO_NOT_USE_ =
-      std::numeric_limits<::int32_t>::max(),
-};
-
-bool ComboAggregateRequest_AggType_IsValid(int value);
-extern const uint32_t ComboAggregateRequest_AggType_internal_data_[];
-constexpr ComboAggregateRequest_AggType ComboAggregateRequest_AggType_AggType_MIN = static_cast<ComboAggregateRequest_AggType>(0);
-constexpr ComboAggregateRequest_AggType ComboAggregateRequest_AggType_AggType_MAX = static_cast<ComboAggregateRequest_AggType>(13);
-constexpr int ComboAggregateRequest_AggType_AggType_ARRAYSIZE = 13 + 1;
-const ::google::protobuf::EnumDescriptor*
-ComboAggregateRequest_AggType_descriptor();
-template <typename T>
-const std::string& ComboAggregateRequest_AggType_Name(T value) {
-  static_assert(std::is_same<T, ComboAggregateRequest_AggType>::value ||
-                    std::is_integral<T>::value,
-                "Incorrect type passed to AggType_Name().");
-  return ComboAggregateRequest_AggType_Name(static_cast<ComboAggregateRequest_AggType>(value));
-}
-template <>
-inline const std::string& ComboAggregateRequest_AggType_Name(ComboAggregateRequest_AggType value) {
-  return ::google::protobuf::internal::NameOfDenseEnum<ComboAggregateRequest_AggType_descriptor,
-                                                 0, 13>(
-      static_cast<int>(value));
-}
-inline bool ComboAggregateRequest_AggType_Parse(absl::string_view name, ComboAggregateRequest_AggType* value) {
-  return ::google::protobuf::internal::ParseNamedEnum<ComboAggregateRequest_AggType>(
-      ComboAggregateRequest_AggType_descriptor(), name, value);
-}
-enum SortDescriptor_SortDirection : int {
-  SortDescriptor_SortDirection_UNKNOWN = 0,
-  SortDescriptor_SortDirection_DESCENDING = -1,
-  SortDescriptor_SortDirection_ASCENDING = 1,
-  SortDescriptor_SortDirection_REVERSE = 2,
-  SortDescriptor_SortDirection_SortDescriptor_SortDirection_INT_MIN_SENTINEL_DO_NOT_USE_ =
-      std::numeric_limits<::int32_t>::min(),
-  SortDescriptor_SortDirection_SortDescriptor_SortDirection_INT_MAX_SENTINEL_DO_NOT_USE_ =
-      std::numeric_limits<::int32_t>::max(),
-};
-
-bool SortDescriptor_SortDirection_IsValid(int value);
-extern const uint32_t SortDescriptor_SortDirection_internal_data_[];
-constexpr SortDescriptor_SortDirection SortDescriptor_SortDirection_SortDirection_MIN = static_cast<SortDescriptor_SortDirection>(-1);
-constexpr SortDescriptor_SortDirection SortDescriptor_SortDirection_SortDirection_MAX = static_cast<SortDescriptor_SortDirection>(2);
-constexpr int SortDescriptor_SortDirection_SortDirection_ARRAYSIZE = 2 + 1;
-const ::google::protobuf::EnumDescriptor*
-SortDescriptor_SortDirection_descriptor();
-template <typename T>
-const std::string& SortDescriptor_SortDirection_Name(T value) {
-  static_assert(std::is_same<T, SortDescriptor_SortDirection>::value ||
-                    std::is_integral<T>::value,
-                "Incorrect type passed to SortDirection_Name().");
-  return SortDescriptor_SortDirection_Name(static_cast<SortDescriptor_SortDirection>(value));
-}
-template <>
-inline const std::string& SortDescriptor_SortDirection_Name(SortDescriptor_SortDirection value) {
-  return ::google::protobuf::internal::NameOfDenseEnum<SortDescriptor_SortDirection_descriptor,
-                                                 -1, 2>(
-      static_cast<int>(value));
-}
-inline bool SortDescriptor_SortDirection_Parse(absl::string_view name, SortDescriptor_SortDirection* value) {
-  return ::google::protobuf::internal::ParseNamedEnum<SortDescriptor_SortDirection>(
-      SortDescriptor_SortDirection_descriptor(), name, value);
-}
-enum CompareCondition_CompareOperation : int {
-  CompareCondition_CompareOperation_LESS_THAN = 0,
-  CompareCondition_CompareOperation_LESS_THAN_OR_EQUAL = 1,
-  CompareCondition_CompareOperation_GREATER_THAN = 2,
-  CompareCondition_CompareOperation_GREATER_THAN_OR_EQUAL = 3,
-  CompareCondition_CompareOperation_EQUALS = 4,
-  CompareCondition_CompareOperation_NOT_EQUALS = 5,
-  CompareCondition_CompareOperation_CompareCondition_CompareOperation_INT_MIN_SENTINEL_DO_NOT_USE_ =
-      std::numeric_limits<::int32_t>::min(),
-  CompareCondition_CompareOperation_CompareCondition_CompareOperation_INT_MAX_SENTINEL_DO_NOT_USE_ =
-      std::numeric_limits<::int32_t>::max(),
-};
-
-bool CompareCondition_CompareOperation_IsValid(int value);
-extern const uint32_t CompareCondition_CompareOperation_internal_data_[];
-constexpr CompareCondition_CompareOperation CompareCondition_CompareOperation_CompareOperation_MIN = static_cast<CompareCondition_CompareOperation>(0);
-constexpr CompareCondition_CompareOperation CompareCondition_CompareOperation_CompareOperation_MAX = static_cast<CompareCondition_CompareOperation>(5);
-constexpr int CompareCondition_CompareOperation_CompareOperation_ARRAYSIZE = 5 + 1;
-const ::google::protobuf::EnumDescriptor*
-CompareCondition_CompareOperation_descriptor();
-template <typename T>
-const std::string& CompareCondition_CompareOperation_Name(T value) {
-  static_assert(std::is_same<T, CompareCondition_CompareOperation>::value ||
-                    std::is_integral<T>::value,
-                "Incorrect type passed to CompareOperation_Name().");
-  return CompareCondition_CompareOperation_Name(static_cast<CompareCondition_CompareOperation>(value));
-}
-template <>
-inline const std::string& CompareCondition_CompareOperation_Name(CompareCondition_CompareOperation value) {
-  return ::google::protobuf::internal::NameOfDenseEnum<CompareCondition_CompareOperation_descriptor,
-                                                 0, 5>(
-      static_cast<int>(value));
-}
-inline bool CompareCondition_CompareOperation_Parse(absl::string_view name, CompareCondition_CompareOperation* value) {
-  return ::google::protobuf::internal::ParseNamedEnum<CompareCondition_CompareOperation>(
-      CompareCondition_CompareOperation_descriptor(), name, value);
-}
-enum BadDataBehavior : int {
-  BAD_DATA_BEHAVIOR_NOT_SPECIFIED = 0,
-  THROW = 1,
-  RESET = 2,
-  SKIP = 3,
-  POISON = 4,
-  BadDataBehavior_INT_MIN_SENTINEL_DO_NOT_USE_ =
-      std::numeric_limits<::int32_t>::min(),
-  BadDataBehavior_INT_MAX_SENTINEL_DO_NOT_USE_ =
-      std::numeric_limits<::int32_t>::max(),
-};
-
-bool BadDataBehavior_IsValid(int value);
-extern const uint32_t BadDataBehavior_internal_data_[];
-constexpr BadDataBehavior BadDataBehavior_MIN = static_cast<BadDataBehavior>(0);
-constexpr BadDataBehavior BadDataBehavior_MAX = static_cast<BadDataBehavior>(4);
-constexpr int BadDataBehavior_ARRAYSIZE = 4 + 1;
-const ::google::protobuf::EnumDescriptor*
-BadDataBehavior_descriptor();
-template <typename T>
-const std::string& BadDataBehavior_Name(T value) {
-  static_assert(std::is_same<T, BadDataBehavior>::value ||
-                    std::is_integral<T>::value,
-                "Incorrect type passed to BadDataBehavior_Name().");
-  return BadDataBehavior_Name(static_cast<BadDataBehavior>(value));
-}
-template <>
-inline const std::string& BadDataBehavior_Name(BadDataBehavior value) {
-  return ::google::protobuf::internal::NameOfDenseEnum<BadDataBehavior_descriptor,
-                                                 0, 4>(
-      static_cast<int>(value));
-}
-inline bool BadDataBehavior_Parse(absl::string_view name, BadDataBehavior* value) {
-  return ::google::protobuf::internal::ParseNamedEnum<BadDataBehavior>(
-      BadDataBehavior_descriptor(), name, value);
-}
-enum UpdateByNullBehavior : int {
-  NULL_BEHAVIOR_NOT_SPECIFIED = 0,
-  NULL_DOMINATES = 1,
-  VALUE_DOMINATES = 2,
-  ZERO_DOMINATES = 3,
-  UpdateByNullBehavior_INT_MIN_SENTINEL_DO_NOT_USE_ =
-      std::numeric_limits<::int32_t>::min(),
-  UpdateByNullBehavior_INT_MAX_SENTINEL_DO_NOT_USE_ =
-      std::numeric_limits<::int32_t>::max(),
-};
-
-bool UpdateByNullBehavior_IsValid(int value);
-extern const uint32_t UpdateByNullBehavior_internal_data_[];
-constexpr UpdateByNullBehavior UpdateByNullBehavior_MIN = static_cast<UpdateByNullBehavior>(0);
-constexpr UpdateByNullBehavior UpdateByNullBehavior_MAX = static_cast<UpdateByNullBehavior>(3);
-constexpr int UpdateByNullBehavior_ARRAYSIZE = 3 + 1;
-const ::google::protobuf::EnumDescriptor*
-UpdateByNullBehavior_descriptor();
-template <typename T>
-const std::string& UpdateByNullBehavior_Name(T value) {
-  static_assert(std::is_same<T, UpdateByNullBehavior>::value ||
-                    std::is_integral<T>::value,
-                "Incorrect type passed to UpdateByNullBehavior_Name().");
-  return UpdateByNullBehavior_Name(static_cast<UpdateByNullBehavior>(value));
-}
-template <>
-inline const std::string& UpdateByNullBehavior_Name(UpdateByNullBehavior value) {
-  return ::google::protobuf::internal::NameOfDenseEnum<UpdateByNullBehavior_descriptor,
-                                                 0, 3>(
-      static_cast<int>(value));
-}
-inline bool UpdateByNullBehavior_Parse(absl::string_view name, UpdateByNullBehavior* value) {
-  return ::google::protobuf::internal::ParseNamedEnum<UpdateByNullBehavior>(
-      UpdateByNullBehavior_descriptor(), name, value);
-}
-enum NullValue : int {
-  NULL_VALUE = 0,
-  NullValue_INT_MIN_SENTINEL_DO_NOT_USE_ =
-      std::numeric_limits<::int32_t>::min(),
-  NullValue_INT_MAX_SENTINEL_DO_NOT_USE_ =
-      std::numeric_limits<::int32_t>::max(),
-};
-
-bool NullValue_IsValid(int value);
-extern const uint32_t NullValue_internal_data_[];
-constexpr NullValue NullValue_MIN = static_cast<NullValue>(0);
-constexpr NullValue NullValue_MAX = static_cast<NullValue>(0);
-constexpr int NullValue_ARRAYSIZE = 0 + 1;
-const ::google::protobuf::EnumDescriptor*
-NullValue_descriptor();
-template <typename T>
-const std::string& NullValue_Name(T value) {
-  static_assert(std::is_same<T, NullValue>::value ||
-                    std::is_integral<T>::value,
-                "Incorrect type passed to NullValue_Name().");
-  return NullValue_Name(static_cast<NullValue>(value));
-}
-template <>
-inline const std::string& NullValue_Name(NullValue value) {
-  return ::google::protobuf::internal::NameOfDenseEnum<NullValue_descriptor,
-                                                 0, 0>(
-      static_cast<int>(value));
-}
-inline bool NullValue_Parse(absl::string_view name, NullValue* value) {
-  return ::google::protobuf::internal::ParseNamedEnum<NullValue>(
-      NullValue_descriptor(), name, value);
-}
-enum CaseSensitivity : int {
-  MATCH_CASE = 0,
-  IGNORE_CASE = 1,
-  CaseSensitivity_INT_MIN_SENTINEL_DO_NOT_USE_ =
-      std::numeric_limits<::int32_t>::min(),
-  CaseSensitivity_INT_MAX_SENTINEL_DO_NOT_USE_ =
-      std::numeric_limits<::int32_t>::max(),
-};
-
-bool CaseSensitivity_IsValid(int value);
-extern const uint32_t CaseSensitivity_internal_data_[];
-constexpr CaseSensitivity CaseSensitivity_MIN = static_cast<CaseSensitivity>(0);
-constexpr CaseSensitivity CaseSensitivity_MAX = static_cast<CaseSensitivity>(1);
-constexpr int CaseSensitivity_ARRAYSIZE = 1 + 1;
-const ::google::protobuf::EnumDescriptor*
-CaseSensitivity_descriptor();
-template <typename T>
-const std::string& CaseSensitivity_Name(T value) {
-  static_assert(std::is_same<T, CaseSensitivity>::value ||
-                    std::is_integral<T>::value,
-                "Incorrect type passed to CaseSensitivity_Name().");
-  return CaseSensitivity_Name(static_cast<CaseSensitivity>(value));
-}
-template <>
-inline const std::string& CaseSensitivity_Name(CaseSensitivity value) {
-  return ::google::protobuf::internal::NameOfDenseEnum<CaseSensitivity_descriptor,
-                                                 0, 1>(
-      static_cast<int>(value));
-}
-inline bool CaseSensitivity_Parse(absl::string_view name, CaseSensitivity* value) {
-  return ::google::protobuf::internal::ParseNamedEnum<CaseSensitivity>(
-      CaseSensitivity_descriptor(), name, value);
-}
-enum MatchType : int {
-  REGULAR = 0,
-  INVERTED = 1,
-  MatchType_INT_MIN_SENTINEL_DO_NOT_USE_ =
-      std::numeric_limits<::int32_t>::min(),
-  MatchType_INT_MAX_SENTINEL_DO_NOT_USE_ =
-      std::numeric_limits<::int32_t>::max(),
-};
-
-bool MatchType_IsValid(int value);
-extern const uint32_t MatchType_internal_data_[];
-constexpr MatchType MatchType_MIN = static_cast<MatchType>(0);
-constexpr MatchType MatchType_MAX = static_cast<MatchType>(1);
-constexpr int MatchType_ARRAYSIZE = 1 + 1;
-const ::google::protobuf::EnumDescriptor*
-MatchType_descriptor();
-template <typename T>
-const std::string& MatchType_Name(T value) {
-  static_assert(std::is_same<T, MatchType>::value ||
-                    std::is_integral<T>::value,
-                "Incorrect type passed to MatchType_Name().");
-  return MatchType_Name(static_cast<MatchType>(value));
-}
-template <>
-inline const std::string& MatchType_Name(MatchType value) {
-  return ::google::protobuf::internal::NameOfDenseEnum<MatchType_descriptor,
-                                                 0, 1>(
-      static_cast<int>(value));
-}
-inline bool MatchType_Parse(absl::string_view name, MatchType* value) {
-  return ::google::protobuf::internal::ParseNamedEnum<MatchType>(
-      MatchType_descriptor(), name, value);
-}
-
-// ===================================================================
-
-
-// -------------------------------------------------------------------
-
-class UpdateByWindowScale_UpdateByWindowTime final :
-    public ::google::protobuf::Message /* @@protoc_insertion_point(class_definition:io.deephaven.proto.backplane.grpc.UpdateByWindowScale.UpdateByWindowTime) */ {
- public:
-  inline UpdateByWindowScale_UpdateByWindowTime() : UpdateByWindowScale_UpdateByWindowTime(nullptr) {}
-  ~UpdateByWindowScale_UpdateByWindowTime() override;
-  template<typename = void>
-  explicit PROTOBUF_CONSTEXPR UpdateByWindowScale_UpdateByWindowTime(::google::protobuf::internal::ConstantInitialized);
-
-  inline UpdateByWindowScale_UpdateByWindowTime(const UpdateByWindowScale_UpdateByWindowTime& from)
-      : UpdateByWindowScale_UpdateByWindowTime(nullptr, from) {}
-  UpdateByWindowScale_UpdateByWindowTime(UpdateByWindowScale_UpdateByWindowTime&& from) noexcept
-    : UpdateByWindowScale_UpdateByWindowTime() {
-    *this = ::std::move(from);
-  }
-
-  inline UpdateByWindowScale_UpdateByWindowTime& operator=(const UpdateByWindowScale_UpdateByWindowTime& from) {
-    CopyFrom(from);
-    return *this;
-  }
-  inline UpdateByWindowScale_UpdateByWindowTime& operator=(UpdateByWindowScale_UpdateByWindowTime&& from) noexcept {
-    if (this == &from) return *this;
-    if (GetArena() == from.GetArena()
-  #ifdef PROTOBUF_FORCE_COPY_IN_MOVE
-        && GetArena() != nullptr
-  #endif  // !PROTOBUF_FORCE_COPY_IN_MOVE
-    ) {
-      InternalSwap(&from);
-    } else {
-      CopyFrom(from);
-    }
-    return *this;
-  }
-
-  inline const ::google::protobuf::UnknownFieldSet& unknown_fields() const
-      ABSL_ATTRIBUTE_LIFETIME_BOUND {
-    return _internal_metadata_.unknown_fields<::google::protobuf::UnknownFieldSet>(::google::protobuf::UnknownFieldSet::default_instance);
-  }
-  inline ::google::protobuf::UnknownFieldSet* mutable_unknown_fields()
-      ABSL_ATTRIBUTE_LIFETIME_BOUND {
-    return _internal_metadata_.mutable_unknown_fields<::google::protobuf::UnknownFieldSet>();
-  }
-
-  static const ::google::protobuf::Descriptor* descriptor() {
-    return GetDescriptor();
-  }
-  static const ::google::protobuf::Descriptor* GetDescriptor() {
-    return default_instance().GetMetadata().descriptor;
-  }
-  static const ::google::protobuf::Reflection* GetReflection() {
-    return default_instance().GetMetadata().reflection;
-  }
-  static const UpdateByWindowScale_UpdateByWindowTime& default_instance() {
-    return *internal_default_instance();
-  }
-  enum WindowCase {
-    kNanos = 2,
-    kDurationString = 3,
-    WINDOW_NOT_SET = 0,
-  };
-
-  static inline const UpdateByWindowScale_UpdateByWindowTime* internal_default_instance() {
-    return reinterpret_cast<const UpdateByWindowScale_UpdateByWindowTime*>(
-               &_UpdateByWindowScale_UpdateByWindowTime_default_instance_);
-  }
-  static constexpr int kIndexInFileMessages =
-    11;
-
-  friend void swap(UpdateByWindowScale_UpdateByWindowTime& a, UpdateByWindowScale_UpdateByWindowTime& b) {
-    a.Swap(&b);
-  }
-  inline void Swap(UpdateByWindowScale_UpdateByWindowTime* other) {
-    if (other == this) return;
-  #ifdef PROTOBUF_FORCE_COPY_IN_SWAP
-    if (GetArena() != nullptr &&
-        GetArena() == other->GetArena()) {
-   #else  // PROTOBUF_FORCE_COPY_IN_SWAP
-    if (GetArena() == other->GetArena()) {
-  #endif  // !PROTOBUF_FORCE_COPY_IN_SWAP
-      InternalSwap(other);
-    } else {
-      ::google::protobuf::internal::GenericSwap(this, other);
-    }
-  }
-  void UnsafeArenaSwap(UpdateByWindowScale_UpdateByWindowTime* other) {
-    if (other == this) return;
-    ABSL_DCHECK(GetArena() == other->GetArena());
-    InternalSwap(other);
-  }
-
-  // implements Message ----------------------------------------------
-
-  UpdateByWindowScale_UpdateByWindowTime* New(::google::protobuf::Arena* arena = nullptr) const final {
-    return CreateMaybeMessage<UpdateByWindowScale_UpdateByWindowTime>(arena);
-  }
-  using ::google::protobuf::Message::CopyFrom;
-  void CopyFrom(const UpdateByWindowScale_UpdateByWindowTime& from);
-  using ::google::protobuf::Message::MergeFrom;
-  void MergeFrom( const UpdateByWindowScale_UpdateByWindowTime& from) {
-    UpdateByWindowScale_UpdateByWindowTime::MergeImpl(*this, from);
-  }
-  private:
-  static void MergeImpl(::google::protobuf::Message& to_msg, const ::google::protobuf::Message& from_msg);
-  public:
-  PROTOBUF_ATTRIBUTE_REINITIALIZES void Clear() final;
-  bool IsInitialized() const final;
-
-  ::size_t ByteSizeLong() const final;
-  const char* _InternalParse(const char* ptr, ::google::protobuf::internal::ParseContext* ctx) final;
-  ::uint8_t* _InternalSerialize(
-      ::uint8_t* target, ::google::protobuf::io::EpsCopyOutputStream* stream) const final;
-  int GetCachedSize() const { return _impl_._cached_size_.Get(); }
-
-  private:
-  ::google::protobuf::internal::CachedSize* AccessCachedSize() const final;
-  void SharedCtor(::google::protobuf::Arena* arena);
-  void SharedDtor();
-  void InternalSwap(UpdateByWindowScale_UpdateByWindowTime* other);
-
-  private:
-  friend class ::google::protobuf::internal::AnyMetadata;
-  static ::absl::string_view FullMessageName() {
-    return "io.deephaven.proto.backplane.grpc.UpdateByWindowScale.UpdateByWindowTime";
-  }
-  protected:
-  explicit UpdateByWindowScale_UpdateByWindowTime(::google::protobuf::Arena* arena);
-  UpdateByWindowScale_UpdateByWindowTime(::google::protobuf::Arena* arena, const UpdateByWindowScale_UpdateByWindowTime& from);
-  public:
-
-  static const ClassData _class_data_;
-  const ::google::protobuf::Message::ClassData*GetClassData() const final;
-
-  ::google::protobuf::Metadata GetMetadata() const final;
-
-  // nested types ----------------------------------------------------
-
-  // accessors -------------------------------------------------------
-
-  enum : int {
-    kColumnFieldNumber = 1,
-    kNanosFieldNumber = 2,
-    kDurationStringFieldNumber = 3,
-  };
-  // string column = 1;
-  void clear_column() ;
-  const std::string& column() const;
-  template <typename Arg_ = const std::string&, typename... Args_>
-  void set_column(Arg_&& arg, Args_... args);
-  std::string* mutable_column();
-  PROTOBUF_NODISCARD std::string* release_column();
-  void set_allocated_column(std::string* value);
-
-  private:
-  const std::string& _internal_column() const;
-  inline PROTOBUF_ALWAYS_INLINE void _internal_set_column(
-      const std::string& value);
-  std::string* _internal_mutable_column();
-
-  public:
-  // sint64 nanos = 2 [jstype = JS_STRING];
-  bool has_nanos() const;
-  void clear_nanos() ;
-  ::int64_t nanos() const;
-  void set_nanos(::int64_t value);
-
-  private:
-  ::int64_t _internal_nanos() const;
-  void _internal_set_nanos(::int64_t value);
-
-  public:
-  // string duration_string = 3;
-  bool has_duration_string() const;
-  void clear_duration_string() ;
-  const std::string& duration_string() const;
-  template <typename Arg_ = const std::string&, typename... Args_>
-  void set_duration_string(Arg_&& arg, Args_... args);
-  std::string* mutable_duration_string();
-  PROTOBUF_NODISCARD std::string* release_duration_string();
-  void set_allocated_duration_string(std::string* value);
-
-  private:
-  const std::string& _internal_duration_string() const;
-  inline PROTOBUF_ALWAYS_INLINE void _internal_set_duration_string(
-      const std::string& value);
-  std::string* _internal_mutable_duration_string();
-
-  public:
-  void clear_window();
-  WindowCase window_case() const;
-  // @@protoc_insertion_point(class_scope:io.deephaven.proto.backplane.grpc.UpdateByWindowScale.UpdateByWindowTime)
- private:
-  class _Internal;
-  void set_has_nanos();
-  void set_has_duration_string();
-
-  inline bool has_window() const;
-  inline void clear_has_window();
-
-  friend class ::google::protobuf::internal::TcParser;
-  static const ::google::protobuf::internal::TcParseTable<
-      0, 3, 0,
-      102, 2>
-      _table_;
-  friend class ::google::protobuf::MessageLite;
-  friend class ::google::protobuf::Arena;
-  template <typename T>
-  friend class ::google::protobuf::Arena::InternalHelper;
-  using InternalArenaConstructable_ = void;
-  using DestructorSkippable_ = void;
-  struct Impl_ {
-
-        inline explicit constexpr Impl_(
-            ::google::protobuf::internal::ConstantInitialized) noexcept;
-        inline explicit Impl_(::google::protobuf::internal::InternalVisibility visibility,
-                              ::google::protobuf::Arena* arena);
-        inline explicit Impl_(::google::protobuf::internal::InternalVisibility visibility,
-                              ::google::protobuf::Arena* arena, const Impl_& from);
-    ::google::protobuf::internal::ArenaStringPtr column_;
-    union WindowUnion {
-      constexpr WindowUnion() : _constinit_{} {}
-        ::google::protobuf::internal::ConstantInitialized _constinit_;
-      ::int64_t nanos_;
-      ::google::protobuf::internal::ArenaStringPtr duration_string_;
-    } window_;
-    mutable ::google::protobuf::internal::CachedSize _cached_size_;
-    ::uint32_t _oneof_case_[1];
-
-    PROTOBUF_TSAN_DECLARE_MEMBER
-  };
-  union { Impl_ _impl_; };
-  friend struct ::TableStruct_deephaven_2fproto_2ftable_2eproto;
-};// -------------------------------------------------------------------
-
-class UpdateByWindowScale_UpdateByWindowTicks final :
-    public ::google::protobuf::Message /* @@protoc_insertion_point(class_definition:io.deephaven.proto.backplane.grpc.UpdateByWindowScale.UpdateByWindowTicks) */ {
- public:
-  inline UpdateByWindowScale_UpdateByWindowTicks() : UpdateByWindowScale_UpdateByWindowTicks(nullptr) {}
-  ~UpdateByWindowScale_UpdateByWindowTicks() override;
-  template<typename = void>
-  explicit PROTOBUF_CONSTEXPR UpdateByWindowScale_UpdateByWindowTicks(::google::protobuf::internal::ConstantInitialized);
-
-  inline UpdateByWindowScale_UpdateByWindowTicks(const UpdateByWindowScale_UpdateByWindowTicks& from)
-      : UpdateByWindowScale_UpdateByWindowTicks(nullptr, from) {}
-  UpdateByWindowScale_UpdateByWindowTicks(UpdateByWindowScale_UpdateByWindowTicks&& from) noexcept
-    : UpdateByWindowScale_UpdateByWindowTicks() {
-    *this = ::std::move(from);
-  }
-
-  inline UpdateByWindowScale_UpdateByWindowTicks& operator=(const UpdateByWindowScale_UpdateByWindowTicks& from) {
-    CopyFrom(from);
-    return *this;
-  }
-  inline UpdateByWindowScale_UpdateByWindowTicks& operator=(UpdateByWindowScale_UpdateByWindowTicks&& from) noexcept {
-    if (this == &from) return *this;
-    if (GetArena() == from.GetArena()
-  #ifdef PROTOBUF_FORCE_COPY_IN_MOVE
-        && GetArena() != nullptr
-  #endif  // !PROTOBUF_FORCE_COPY_IN_MOVE
-    ) {
-      InternalSwap(&from);
-    } else {
-      CopyFrom(from);
-    }
-    return *this;
-  }
-
-  inline const ::google::protobuf::UnknownFieldSet& unknown_fields() const
-      ABSL_ATTRIBUTE_LIFETIME_BOUND {
-    return _internal_metadata_.unknown_fields<::google::protobuf::UnknownFieldSet>(::google::protobuf::UnknownFieldSet::default_instance);
-  }
-  inline ::google::protobuf::UnknownFieldSet* mutable_unknown_fields()
-      ABSL_ATTRIBUTE_LIFETIME_BOUND {
-    return _internal_metadata_.mutable_unknown_fields<::google::protobuf::UnknownFieldSet>();
-  }
-
-  static const ::google::protobuf::Descriptor* descriptor() {
-    return GetDescriptor();
-  }
-  static const ::google::protobuf::Descriptor* GetDescriptor() {
-    return default_instance().GetMetadata().descriptor;
-  }
-  static const ::google::protobuf::Reflection* GetReflection() {
-    return default_instance().GetMetadata().reflection;
-  }
-  static const UpdateByWindowScale_UpdateByWindowTicks& default_instance() {
-    return *internal_default_instance();
-  }
-  static inline const UpdateByWindowScale_UpdateByWindowTicks* internal_default_instance() {
-    return reinterpret_cast<const UpdateByWindowScale_UpdateByWindowTicks*>(
-               &_UpdateByWindowScale_UpdateByWindowTicks_default_instance_);
-  }
-  static constexpr int kIndexInFileMessages =
-    10;
-
-  friend void swap(UpdateByWindowScale_UpdateByWindowTicks& a, UpdateByWindowScale_UpdateByWindowTicks& b) {
-    a.Swap(&b);
-  }
-  inline void Swap(UpdateByWindowScale_UpdateByWindowTicks* other) {
-    if (other == this) return;
-  #ifdef PROTOBUF_FORCE_COPY_IN_SWAP
-    if (GetArena() != nullptr &&
-        GetArena() == other->GetArena()) {
-   #else  // PROTOBUF_FORCE_COPY_IN_SWAP
-    if (GetArena() == other->GetArena()) {
-  #endif  // !PROTOBUF_FORCE_COPY_IN_SWAP
-      InternalSwap(other);
-    } else {
-      ::google::protobuf::internal::GenericSwap(this, other);
-    }
-  }
-  void UnsafeArenaSwap(UpdateByWindowScale_UpdateByWindowTicks* other) {
-    if (other == this) return;
-    ABSL_DCHECK(GetArena() == other->GetArena());
-    InternalSwap(other);
-  }
-
-  // implements Message ----------------------------------------------
-
-  UpdateByWindowScale_UpdateByWindowTicks* New(::google::protobuf::Arena* arena = nullptr) const final {
-    return CreateMaybeMessage<UpdateByWindowScale_UpdateByWindowTicks>(arena);
-  }
-  using ::google::protobuf::Message::CopyFrom;
-  void CopyFrom(const UpdateByWindowScale_UpdateByWindowTicks& from);
-  using ::google::protobuf::Message::MergeFrom;
-  void MergeFrom( const UpdateByWindowScale_UpdateByWindowTicks& from) {
-    UpdateByWindowScale_UpdateByWindowTicks::MergeImpl(*this, from);
-  }
-  private:
-  static void MergeImpl(::google::protobuf::Message& to_msg, const ::google::protobuf::Message& from_msg);
-  public:
-  PROTOBUF_ATTRIBUTE_REINITIALIZES void Clear() final;
-  bool IsInitialized() const final;
-
-  ::size_t ByteSizeLong() const final;
-  const char* _InternalParse(const char* ptr, ::google::protobuf::internal::ParseContext* ctx) final;
-  ::uint8_t* _InternalSerialize(
-      ::uint8_t* target, ::google::protobuf::io::EpsCopyOutputStream* stream) const final;
-  int GetCachedSize() const { return _impl_._cached_size_.Get(); }
-
-  private:
-  ::google::protobuf::internal::CachedSize* AccessCachedSize() const final;
-  void SharedCtor(::google::protobuf::Arena* arena);
-  void SharedDtor();
-  void InternalSwap(UpdateByWindowScale_UpdateByWindowTicks* other);
-
-  private:
-  friend class ::google::protobuf::internal::AnyMetadata;
-  static ::absl::string_view FullMessageName() {
-    return "io.deephaven.proto.backplane.grpc.UpdateByWindowScale.UpdateByWindowTicks";
-  }
-  protected:
-  explicit UpdateByWindowScale_UpdateByWindowTicks(::google::protobuf::Arena* arena);
-  UpdateByWindowScale_UpdateByWindowTicks(::google::protobuf::Arena* arena, const UpdateByWindowScale_UpdateByWindowTicks& from);
-  public:
-
-  static const ClassData _class_data_;
-  const ::google::protobuf::Message::ClassData*GetClassData() const final;
-
-  ::google::protobuf::Metadata GetMetadata() const final;
-
-  // nested types ----------------------------------------------------
-
-  // accessors -------------------------------------------------------
-
-  enum : int {
-    kTicksFieldNumber = 1,
-  };
-  // double ticks = 1;
-  void clear_ticks() ;
-  double ticks() const;
-  void set_ticks(double value);
-
-  private:
-  double _internal_ticks() const;
-  void _internal_set_ticks(double value);
-
-  public:
-  // @@protoc_insertion_point(class_scope:io.deephaven.proto.backplane.grpc.UpdateByWindowScale.UpdateByWindowTicks)
- private:
-  class _Internal;
-
-  friend class ::google::protobuf::internal::TcParser;
-  static const ::google::protobuf::internal::TcParseTable<
-      0, 1, 0,
-      0, 2>
-      _table_;
-  friend class ::google::protobuf::MessageLite;
-  friend class ::google::protobuf::Arena;
-  template <typename T>
-  friend class ::google::protobuf::Arena::InternalHelper;
-  using InternalArenaConstructable_ = void;
-  using DestructorSkippable_ = void;
-  struct Impl_ {
-
-        inline explicit constexpr Impl_(
-            ::google::protobuf::internal::ConstantInitialized) noexcept;
-        inline explicit Impl_(::google::protobuf::internal::InternalVisibility visibility,
-                              ::google::protobuf::Arena* arena);
-        inline explicit Impl_(::google::protobuf::internal::InternalVisibility visibility,
-                              ::google::protobuf::Arena* arena, const Impl_& from);
-    double ticks_;
-    mutable ::google::protobuf::internal::CachedSize _cached_size_;
-    PROTOBUF_TSAN_DECLARE_MEMBER
-  };
-  union { Impl_ _impl_; };
-  friend struct ::TableStruct_deephaven_2fproto_2ftable_2eproto;
-};// -------------------------------------------------------------------
-
-class UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByFill final :
-    public ::google::protobuf::internal::ZeroFieldsBase /* @@protoc_insertion_point(class_definition:io.deephaven.proto.backplane.grpc.UpdateByRequest.UpdateByOperation.UpdateByColumn.UpdateBySpec.UpdateByFill) */ {
- public:
-  inline UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByFill() : UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByFill(nullptr) {}
-  template<typename = void>
-  explicit PROTOBUF_CONSTEXPR UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByFill(::google::protobuf::internal::ConstantInitialized);
-
-  inline UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByFill(const UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByFill& from)
-      : UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByFill(nullptr, from) {}
-  UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByFill(UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByFill&& from) noexcept
-    : UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByFill() {
-    *this = ::std::move(from);
-  }
-
-  inline UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByFill& operator=(const UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByFill& from) {
-    CopyFrom(from);
-    return *this;
-  }
-  inline UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByFill& operator=(UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByFill&& from) noexcept {
-    if (this == &from) return *this;
-    if (GetArena() == from.GetArena()
-  #ifdef PROTOBUF_FORCE_COPY_IN_MOVE
-        && GetArena() != nullptr
-  #endif  // !PROTOBUF_FORCE_COPY_IN_MOVE
-    ) {
-      InternalSwap(&from);
-    } else {
-      CopyFrom(from);
-    }
-    return *this;
-  }
-
-  inline const ::google::protobuf::UnknownFieldSet& unknown_fields() const
-      ABSL_ATTRIBUTE_LIFETIME_BOUND {
-    return _internal_metadata_.unknown_fields<::google::protobuf::UnknownFieldSet>(::google::protobuf::UnknownFieldSet::default_instance);
-  }
-  inline ::google::protobuf::UnknownFieldSet* mutable_unknown_fields()
-      ABSL_ATTRIBUTE_LIFETIME_BOUND {
-    return _internal_metadata_.mutable_unknown_fields<::google::protobuf::UnknownFieldSet>();
-  }
-
-  static const ::google::protobuf::Descriptor* descriptor() {
-    return GetDescriptor();
-  }
-  static const ::google::protobuf::Descriptor* GetDescriptor() {
-    return default_instance().GetMetadata().descriptor;
-  }
-  static const ::google::protobuf::Reflection* GetReflection() {
-    return default_instance().GetMetadata().reflection;
-  }
-  static const UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByFill& default_instance() {
-    return *internal_default_instance();
-  }
-  static inline const UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByFill* internal_default_instance() {
-    return reinterpret_cast<const UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByFill*>(
-               &_UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByFill_default_instance_);
-  }
-  static constexpr int kIndexInFileMessages =
-    20;
-
-  friend void swap(UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByFill& a, UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByFill& b) {
-    a.Swap(&b);
-  }
-  inline void Swap(UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByFill* other) {
-    if (other == this) return;
-  #ifdef PROTOBUF_FORCE_COPY_IN_SWAP
-    if (GetArena() != nullptr &&
-        GetArena() == other->GetArena()) {
-   #else  // PROTOBUF_FORCE_COPY_IN_SWAP
-    if (GetArena() == other->GetArena()) {
-  #endif  // !PROTOBUF_FORCE_COPY_IN_SWAP
-      InternalSwap(other);
-    } else {
-      ::google::protobuf::internal::GenericSwap(this, other);
-    }
-  }
-  void UnsafeArenaSwap(UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByFill* other) {
-    if (other == this) return;
-    ABSL_DCHECK(GetArena() == other->GetArena());
-    InternalSwap(other);
-  }
-
-  // implements Message ----------------------------------------------
-
-  UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByFill* New(::google::protobuf::Arena* arena = nullptr) const final {
-    return CreateMaybeMessage<UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByFill>(arena);
-  }
-  using ::google::protobuf::internal::ZeroFieldsBase::CopyFrom;
-  inline void CopyFrom(const UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByFill& from) {
-    ::google::protobuf::internal::ZeroFieldsBase::CopyImpl(*this, from);
-  }
-  using ::google::protobuf::internal::ZeroFieldsBase::MergeFrom;
-  void MergeFrom(const UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByFill& from) {
-    ::google::protobuf::internal::ZeroFieldsBase::MergeImpl(*this, from);
-  }
-  public:
-
-  private:
-  friend class ::google::protobuf::internal::AnyMetadata;
-  static ::absl::string_view FullMessageName() {
-    return "io.deephaven.proto.backplane.grpc.UpdateByRequest.UpdateByOperation.UpdateByColumn.UpdateBySpec.UpdateByFill";
-  }
-  protected:
-  explicit UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByFill(::google::protobuf::Arena* arena);
-  UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByFill(::google::protobuf::Arena* arena, const UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByFill& from);
-  public:
-
-  ::google::protobuf::Metadata GetMetadata() const final;
-
-  // nested types ----------------------------------------------------
-
-  // accessors -------------------------------------------------------
-
-  // @@protoc_insertion_point(class_scope:io.deephaven.proto.backplane.grpc.UpdateByRequest.UpdateByOperation.UpdateByColumn.UpdateBySpec.UpdateByFill)
- private:
-  class _Internal;
-
-  friend class ::google::protobuf::MessageLite;
-  friend class ::google::protobuf::Arena;
-  template <typename T>
-  friend class ::google::protobuf::Arena::InternalHelper;
-  using InternalArenaConstructable_ = void;
-  using DestructorSkippable_ = void;
-  struct Impl_ {
-
-        inline explicit constexpr Impl_(
-            ::google::protobuf::internal::ConstantInitialized) noexcept;
-        inline explicit Impl_(::google::protobuf::internal::InternalVisibility visibility,
-                              ::google::protobuf::Arena* arena);
-        inline explicit Impl_(::google::protobuf::internal::InternalVisibility visibility,
-                              ::google::protobuf::Arena* arena, const Impl_& from);
-    PROTOBUF_TSAN_DECLARE_MEMBER
-  };
-  friend struct ::TableStruct_deephaven_2fproto_2ftable_2eproto;
-};// -------------------------------------------------------------------
-
-class UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByCumulativeSum final :
-    public ::google::protobuf::internal::ZeroFieldsBase /* @@protoc_insertion_point(class_definition:io.deephaven.proto.backplane.grpc.UpdateByRequest.UpdateByOperation.UpdateByColumn.UpdateBySpec.UpdateByCumulativeSum) */ {
- public:
-  inline UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByCumulativeSum() : UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByCumulativeSum(nullptr) {}
-  template<typename = void>
-  explicit PROTOBUF_CONSTEXPR UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByCumulativeSum(::google::protobuf::internal::ConstantInitialized);
-
-  inline UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByCumulativeSum(const UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByCumulativeSum& from)
-      : UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByCumulativeSum(nullptr, from) {}
-  UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByCumulativeSum(UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByCumulativeSum&& from) noexcept
-    : UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByCumulativeSum() {
-    *this = ::std::move(from);
-  }
-
-  inline UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByCumulativeSum& operator=(const UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByCumulativeSum& from) {
-    CopyFrom(from);
-    return *this;
-  }
-  inline UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByCumulativeSum& operator=(UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByCumulativeSum&& from) noexcept {
-    if (this == &from) return *this;
-    if (GetArena() == from.GetArena()
-  #ifdef PROTOBUF_FORCE_COPY_IN_MOVE
-        && GetArena() != nullptr
-  #endif  // !PROTOBUF_FORCE_COPY_IN_MOVE
-    ) {
-      InternalSwap(&from);
-    } else {
-      CopyFrom(from);
-    }
-    return *this;
-  }
-
-  inline const ::google::protobuf::UnknownFieldSet& unknown_fields() const
-      ABSL_ATTRIBUTE_LIFETIME_BOUND {
-    return _internal_metadata_.unknown_fields<::google::protobuf::UnknownFieldSet>(::google::protobuf::UnknownFieldSet::default_instance);
-  }
-  inline ::google::protobuf::UnknownFieldSet* mutable_unknown_fields()
-      ABSL_ATTRIBUTE_LIFETIME_BOUND {
-    return _internal_metadata_.mutable_unknown_fields<::google::protobuf::UnknownFieldSet>();
-  }
-
-  static const ::google::protobuf::Descriptor* descriptor() {
-    return GetDescriptor();
-  }
-  static const ::google::protobuf::Descriptor* GetDescriptor() {
-    return default_instance().GetMetadata().descriptor;
-  }
-  static const ::google::protobuf::Reflection* GetReflection() {
-    return default_instance().GetMetadata().reflection;
-  }
-  static const UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByCumulativeSum& default_instance() {
-    return *internal_default_instance();
-  }
-  static inline const UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByCumulativeSum* internal_default_instance() {
-    return reinterpret_cast<const UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByCumulativeSum*>(
-               &_UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByCumulativeSum_default_instance_);
-  }
-  static constexpr int kIndexInFileMessages =
-    16;
-
-  friend void swap(UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByCumulativeSum& a, UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByCumulativeSum& b) {
-    a.Swap(&b);
-  }
-  inline void Swap(UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByCumulativeSum* other) {
-    if (other == this) return;
-  #ifdef PROTOBUF_FORCE_COPY_IN_SWAP
-    if (GetArena() != nullptr &&
-        GetArena() == other->GetArena()) {
-   #else  // PROTOBUF_FORCE_COPY_IN_SWAP
-    if (GetArena() == other->GetArena()) {
-  #endif  // !PROTOBUF_FORCE_COPY_IN_SWAP
-      InternalSwap(other);
-    } else {
-      ::google::protobuf::internal::GenericSwap(this, other);
-    }
-  }
-  void UnsafeArenaSwap(UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByCumulativeSum* other) {
-    if (other == this) return;
-    ABSL_DCHECK(GetArena() == other->GetArena());
-    InternalSwap(other);
-  }
-
-  // implements Message ----------------------------------------------
-
-  UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByCumulativeSum* New(::google::protobuf::Arena* arena = nullptr) const final {
-    return CreateMaybeMessage<UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByCumulativeSum>(arena);
-  }
-  using ::google::protobuf::internal::ZeroFieldsBase::CopyFrom;
-  inline void CopyFrom(const UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByCumulativeSum& from) {
-    ::google::protobuf::internal::ZeroFieldsBase::CopyImpl(*this, from);
-  }
-  using ::google::protobuf::internal::ZeroFieldsBase::MergeFrom;
-  void MergeFrom(const UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByCumulativeSum& from) {
-    ::google::protobuf::internal::ZeroFieldsBase::MergeImpl(*this, from);
-  }
-  public:
-
-  private:
-  friend class ::google::protobuf::internal::AnyMetadata;
-  static ::absl::string_view FullMessageName() {
-    return "io.deephaven.proto.backplane.grpc.UpdateByRequest.UpdateByOperation.UpdateByColumn.UpdateBySpec.UpdateByCumulativeSum";
-  }
-  protected:
-  explicit UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByCumulativeSum(::google::protobuf::Arena* arena);
-  UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByCumulativeSum(::google::protobuf::Arena* arena, const UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByCumulativeSum& from);
-  public:
-
-  ::google::protobuf::Metadata GetMetadata() const final;
-
-  // nested types ----------------------------------------------------
-
-  // accessors -------------------------------------------------------
-
-  // @@protoc_insertion_point(class_scope:io.deephaven.proto.backplane.grpc.UpdateByRequest.UpdateByOperation.UpdateByColumn.UpdateBySpec.UpdateByCumulativeSum)
- private:
-  class _Internal;
-
-  friend class ::google::protobuf::MessageLite;
-  friend class ::google::protobuf::Arena;
-  template <typename T>
-  friend class ::google::protobuf::Arena::InternalHelper;
-  using InternalArenaConstructable_ = void;
-  using DestructorSkippable_ = void;
-  struct Impl_ {
-
-        inline explicit constexpr Impl_(
-            ::google::protobuf::internal::ConstantInitialized) noexcept;
-        inline explicit Impl_(::google::protobuf::internal::InternalVisibility visibility,
-                              ::google::protobuf::Arena* arena);
-        inline explicit Impl_(::google::protobuf::internal::InternalVisibility visibility,
-                              ::google::protobuf::Arena* arena, const Impl_& from);
-    PROTOBUF_TSAN_DECLARE_MEMBER
-  };
-  friend struct ::TableStruct_deephaven_2fproto_2ftable_2eproto;
-};// -------------------------------------------------------------------
-
-class UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByCumulativeProduct final :
-    public ::google::protobuf::internal::ZeroFieldsBase /* @@protoc_insertion_point(class_definition:io.deephaven.proto.backplane.grpc.UpdateByRequest.UpdateByOperation.UpdateByColumn.UpdateBySpec.UpdateByCumulativeProduct) */ {
- public:
-  inline UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByCumulativeProduct() : UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByCumulativeProduct(nullptr) {}
-  template<typename = void>
-  explicit PROTOBUF_CONSTEXPR UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByCumulativeProduct(::google::protobuf::internal::ConstantInitialized);
-
-  inline UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByCumulativeProduct(const UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByCumulativeProduct& from)
-      : UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByCumulativeProduct(nullptr, from) {}
-  UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByCumulativeProduct(UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByCumulativeProduct&& from) noexcept
-    : UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByCumulativeProduct() {
-    *this = ::std::move(from);
-  }
-
-  inline UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByCumulativeProduct& operator=(const UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByCumulativeProduct& from) {
-    CopyFrom(from);
-    return *this;
-  }
-  inline UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByCumulativeProduct& operator=(UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByCumulativeProduct&& from) noexcept {
-    if (this == &from) return *this;
-    if (GetArena() == from.GetArena()
-  #ifdef PROTOBUF_FORCE_COPY_IN_MOVE
-        && GetArena() != nullptr
-  #endif  // !PROTOBUF_FORCE_COPY_IN_MOVE
-    ) {
-      InternalSwap(&from);
-    } else {
-      CopyFrom(from);
-    }
-    return *this;
-  }
-
-  inline const ::google::protobuf::UnknownFieldSet& unknown_fields() const
-      ABSL_ATTRIBUTE_LIFETIME_BOUND {
-    return _internal_metadata_.unknown_fields<::google::protobuf::UnknownFieldSet>(::google::protobuf::UnknownFieldSet::default_instance);
-  }
-  inline ::google::protobuf::UnknownFieldSet* mutable_unknown_fields()
-      ABSL_ATTRIBUTE_LIFETIME_BOUND {
-    return _internal_metadata_.mutable_unknown_fields<::google::protobuf::UnknownFieldSet>();
-  }
-
-  static const ::google::protobuf::Descriptor* descriptor() {
-    return GetDescriptor();
-  }
-  static const ::google::protobuf::Descriptor* GetDescriptor() {
-    return default_instance().GetMetadata().descriptor;
-  }
-  static const ::google::protobuf::Reflection* GetReflection() {
-    return default_instance().GetMetadata().reflection;
-  }
-  static const UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByCumulativeProduct& default_instance() {
-    return *internal_default_instance();
-  }
-  static inline const UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByCumulativeProduct* internal_default_instance() {
-    return reinterpret_cast<const UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByCumulativeProduct*>(
-               &_UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByCumulativeProduct_default_instance_);
-  }
-  static constexpr int kIndexInFileMessages =
-    19;
-
-  friend void swap(UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByCumulativeProduct& a, UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByCumulativeProduct& b) {
-    a.Swap(&b);
-  }
-  inline void Swap(UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByCumulativeProduct* other) {
-    if (other == this) return;
-  #ifdef PROTOBUF_FORCE_COPY_IN_SWAP
-    if (GetArena() != nullptr &&
-        GetArena() == other->GetArena()) {
-   #else  // PROTOBUF_FORCE_COPY_IN_SWAP
-    if (GetArena() == other->GetArena()) {
-  #endif  // !PROTOBUF_FORCE_COPY_IN_SWAP
-      InternalSwap(other);
-    } else {
-      ::google::protobuf::internal::GenericSwap(this, other);
-    }
-  }
-  void UnsafeArenaSwap(UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByCumulativeProduct* other) {
-    if (other == this) return;
-    ABSL_DCHECK(GetArena() == other->GetArena());
-    InternalSwap(other);
-  }
-
-  // implements Message ----------------------------------------------
-
-  UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByCumulativeProduct* New(::google::protobuf::Arena* arena = nullptr) const final {
-    return CreateMaybeMessage<UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByCumulativeProduct>(arena);
-  }
-  using ::google::protobuf::internal::ZeroFieldsBase::CopyFrom;
-  inline void CopyFrom(const UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByCumulativeProduct& from) {
-    ::google::protobuf::internal::ZeroFieldsBase::CopyImpl(*this, from);
-  }
-  using ::google::protobuf::internal::ZeroFieldsBase::MergeFrom;
-  void MergeFrom(const UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByCumulativeProduct& from) {
-    ::google::protobuf::internal::ZeroFieldsBase::MergeImpl(*this, from);
-  }
-  public:
-
-  private:
-  friend class ::google::protobuf::internal::AnyMetadata;
-  static ::absl::string_view FullMessageName() {
-    return "io.deephaven.proto.backplane.grpc.UpdateByRequest.UpdateByOperation.UpdateByColumn.UpdateBySpec.UpdateByCumulativeProduct";
-  }
-  protected:
-  explicit UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByCumulativeProduct(::google::protobuf::Arena* arena);
-  UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByCumulativeProduct(::google::protobuf::Arena* arena, const UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByCumulativeProduct& from);
-  public:
-
-  ::google::protobuf::Metadata GetMetadata() const final;
-
-  // nested types ----------------------------------------------------
-
-  // accessors -------------------------------------------------------
-
-  // @@protoc_insertion_point(class_scope:io.deephaven.proto.backplane.grpc.UpdateByRequest.UpdateByOperation.UpdateByColumn.UpdateBySpec.UpdateByCumulativeProduct)
- private:
-  class _Internal;
-
-  friend class ::google::protobuf::MessageLite;
-  friend class ::google::protobuf::Arena;
-  template <typename T>
-  friend class ::google::protobuf::Arena::InternalHelper;
-  using InternalArenaConstructable_ = void;
-  using DestructorSkippable_ = void;
-  struct Impl_ {
-
-        inline explicit constexpr Impl_(
-            ::google::protobuf::internal::ConstantInitialized) noexcept;
-        inline explicit Impl_(::google::protobuf::internal::InternalVisibility visibility,
-                              ::google::protobuf::Arena* arena);
-        inline explicit Impl_(::google::protobuf::internal::InternalVisibility visibility,
-                              ::google::protobuf::Arena* arena, const Impl_& from);
-    PROTOBUF_TSAN_DECLARE_MEMBER
-  };
-  friend struct ::TableStruct_deephaven_2fproto_2ftable_2eproto;
-};// -------------------------------------------------------------------
-
-class UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByCumulativeMin final :
-    public ::google::protobuf::internal::ZeroFieldsBase /* @@protoc_insertion_point(class_definition:io.deephaven.proto.backplane.grpc.UpdateByRequest.UpdateByOperation.UpdateByColumn.UpdateBySpec.UpdateByCumulativeMin) */ {
- public:
-  inline UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByCumulativeMin() : UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByCumulativeMin(nullptr) {}
-  template<typename = void>
-  explicit PROTOBUF_CONSTEXPR UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByCumulativeMin(::google::protobuf::internal::ConstantInitialized);
-
-  inline UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByCumulativeMin(const UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByCumulativeMin& from)
-      : UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByCumulativeMin(nullptr, from) {}
-  UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByCumulativeMin(UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByCumulativeMin&& from) noexcept
-    : UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByCumulativeMin() {
-    *this = ::std::move(from);
-  }
-
-  inline UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByCumulativeMin& operator=(const UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByCumulativeMin& from) {
-    CopyFrom(from);
-    return *this;
-  }
-  inline UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByCumulativeMin& operator=(UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByCumulativeMin&& from) noexcept {
-    if (this == &from) return *this;
-    if (GetArena() == from.GetArena()
-  #ifdef PROTOBUF_FORCE_COPY_IN_MOVE
-        && GetArena() != nullptr
-  #endif  // !PROTOBUF_FORCE_COPY_IN_MOVE
-    ) {
-      InternalSwap(&from);
-    } else {
-      CopyFrom(from);
-    }
-    return *this;
-  }
-
-  inline const ::google::protobuf::UnknownFieldSet& unknown_fields() const
-      ABSL_ATTRIBUTE_LIFETIME_BOUND {
-    return _internal_metadata_.unknown_fields<::google::protobuf::UnknownFieldSet>(::google::protobuf::UnknownFieldSet::default_instance);
-  }
-  inline ::google::protobuf::UnknownFieldSet* mutable_unknown_fields()
-      ABSL_ATTRIBUTE_LIFETIME_BOUND {
-    return _internal_metadata_.mutable_unknown_fields<::google::protobuf::UnknownFieldSet>();
-  }
-
-  static const ::google::protobuf::Descriptor* descriptor() {
-    return GetDescriptor();
-  }
-  static const ::google::protobuf::Descriptor* GetDescriptor() {
-    return default_instance().GetMetadata().descriptor;
-  }
-  static const ::google::protobuf::Reflection* GetReflection() {
-    return default_instance().GetMetadata().reflection;
-  }
-  static const UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByCumulativeMin& default_instance() {
-    return *internal_default_instance();
-  }
-  static inline const UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByCumulativeMin* internal_default_instance() {
-    return reinterpret_cast<const UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByCumulativeMin*>(
-               &_UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByCumulativeMin_default_instance_);
-  }
-  static constexpr int kIndexInFileMessages =
-    17;
-
-  friend void swap(UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByCumulativeMin& a, UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByCumulativeMin& b) {
-    a.Swap(&b);
-  }
-  inline void Swap(UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByCumulativeMin* other) {
-    if (other == this) return;
-  #ifdef PROTOBUF_FORCE_COPY_IN_SWAP
-    if (GetArena() != nullptr &&
-        GetArena() == other->GetArena()) {
-   #else  // PROTOBUF_FORCE_COPY_IN_SWAP
-    if (GetArena() == other->GetArena()) {
-  #endif  // !PROTOBUF_FORCE_COPY_IN_SWAP
-      InternalSwap(other);
-    } else {
-      ::google::protobuf::internal::GenericSwap(this, other);
-    }
-  }
-  void UnsafeArenaSwap(UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByCumulativeMin* other) {
-    if (other == this) return;
-    ABSL_DCHECK(GetArena() == other->GetArena());
-    InternalSwap(other);
-  }
-
-  // implements Message ----------------------------------------------
-
-  UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByCumulativeMin* New(::google::protobuf::Arena* arena = nullptr) const final {
-    return CreateMaybeMessage<UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByCumulativeMin>(arena);
-  }
-  using ::google::protobuf::internal::ZeroFieldsBase::CopyFrom;
-  inline void CopyFrom(const UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByCumulativeMin& from) {
-    ::google::protobuf::internal::ZeroFieldsBase::CopyImpl(*this, from);
-  }
-  using ::google::protobuf::internal::ZeroFieldsBase::MergeFrom;
-  void MergeFrom(const UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByCumulativeMin& from) {
-    ::google::protobuf::internal::ZeroFieldsBase::MergeImpl(*this, from);
-  }
-  public:
-
-  private:
-  friend class ::google::protobuf::internal::AnyMetadata;
-  static ::absl::string_view FullMessageName() {
-    return "io.deephaven.proto.backplane.grpc.UpdateByRequest.UpdateByOperation.UpdateByColumn.UpdateBySpec.UpdateByCumulativeMin";
-  }
-  protected:
-  explicit UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByCumulativeMin(::google::protobuf::Arena* arena);
-  UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByCumulativeMin(::google::protobuf::Arena* arena, const UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByCumulativeMin& from);
-  public:
-
-  ::google::protobuf::Metadata GetMetadata() const final;
-
-  // nested types ----------------------------------------------------
-
-  // accessors -------------------------------------------------------
-
-  // @@protoc_insertion_point(class_scope:io.deephaven.proto.backplane.grpc.UpdateByRequest.UpdateByOperation.UpdateByColumn.UpdateBySpec.UpdateByCumulativeMin)
- private:
-  class _Internal;
-
-  friend class ::google::protobuf::MessageLite;
-  friend class ::google::protobuf::Arena;
-  template <typename T>
-  friend class ::google::protobuf::Arena::InternalHelper;
-  using InternalArenaConstructable_ = void;
-  using DestructorSkippable_ = void;
-  struct Impl_ {
-
-        inline explicit constexpr Impl_(
-            ::google::protobuf::internal::ConstantInitialized) noexcept;
-        inline explicit Impl_(::google::protobuf::internal::InternalVisibility visibility,
-                              ::google::protobuf::Arena* arena);
-        inline explicit Impl_(::google::protobuf::internal::InternalVisibility visibility,
-                              ::google::protobuf::Arena* arena, const Impl_& from);
-    PROTOBUF_TSAN_DECLARE_MEMBER
-  };
-  friend struct ::TableStruct_deephaven_2fproto_2ftable_2eproto;
-};// -------------------------------------------------------------------
-
-class UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByCumulativeMax final :
-    public ::google::protobuf::internal::ZeroFieldsBase /* @@protoc_insertion_point(class_definition:io.deephaven.proto.backplane.grpc.UpdateByRequest.UpdateByOperation.UpdateByColumn.UpdateBySpec.UpdateByCumulativeMax) */ {
- public:
-  inline UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByCumulativeMax() : UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByCumulativeMax(nullptr) {}
-  template<typename = void>
-  explicit PROTOBUF_CONSTEXPR UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByCumulativeMax(::google::protobuf::internal::ConstantInitialized);
-
-  inline UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByCumulativeMax(const UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByCumulativeMax& from)
-      : UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByCumulativeMax(nullptr, from) {}
-  UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByCumulativeMax(UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByCumulativeMax&& from) noexcept
-    : UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByCumulativeMax() {
-    *this = ::std::move(from);
-  }
-
-  inline UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByCumulativeMax& operator=(const UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByCumulativeMax& from) {
-    CopyFrom(from);
-    return *this;
-  }
-  inline UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByCumulativeMax& operator=(UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByCumulativeMax&& from) noexcept {
-    if (this == &from) return *this;
-    if (GetArena() == from.GetArena()
-  #ifdef PROTOBUF_FORCE_COPY_IN_MOVE
-        && GetArena() != nullptr
-  #endif  // !PROTOBUF_FORCE_COPY_IN_MOVE
-    ) {
-      InternalSwap(&from);
-    } else {
-      CopyFrom(from);
-    }
-    return *this;
-  }
-
-  inline const ::google::protobuf::UnknownFieldSet& unknown_fields() const
-      ABSL_ATTRIBUTE_LIFETIME_BOUND {
-    return _internal_metadata_.unknown_fields<::google::protobuf::UnknownFieldSet>(::google::protobuf::UnknownFieldSet::default_instance);
-  }
-  inline ::google::protobuf::UnknownFieldSet* mutable_unknown_fields()
-      ABSL_ATTRIBUTE_LIFETIME_BOUND {
-    return _internal_metadata_.mutable_unknown_fields<::google::protobuf::UnknownFieldSet>();
-  }
-
-  static const ::google::protobuf::Descriptor* descriptor() {
-    return GetDescriptor();
-  }
-  static const ::google::protobuf::Descriptor* GetDescriptor() {
-    return default_instance().GetMetadata().descriptor;
-  }
-  static const ::google::protobuf::Reflection* GetReflection() {
-    return default_instance().GetMetadata().reflection;
-  }
-  static const UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByCumulativeMax& default_instance() {
-    return *internal_default_instance();
-  }
-  static inline const UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByCumulativeMax* internal_default_instance() {
-    return reinterpret_cast<const UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByCumulativeMax*>(
-               &_UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByCumulativeMax_default_instance_);
-  }
-  static constexpr int kIndexInFileMessages =
-    18;
-
-  friend void swap(UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByCumulativeMax& a, UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByCumulativeMax& b) {
-    a.Swap(&b);
-  }
-  inline void Swap(UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByCumulativeMax* other) {
-    if (other == this) return;
-  #ifdef PROTOBUF_FORCE_COPY_IN_SWAP
-    if (GetArena() != nullptr &&
-        GetArena() == other->GetArena()) {
-   #else  // PROTOBUF_FORCE_COPY_IN_SWAP
-    if (GetArena() == other->GetArena()) {
-  #endif  // !PROTOBUF_FORCE_COPY_IN_SWAP
-      InternalSwap(other);
-    } else {
-      ::google::protobuf::internal::GenericSwap(this, other);
-    }
-  }
-  void UnsafeArenaSwap(UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByCumulativeMax* other) {
-    if (other == this) return;
-    ABSL_DCHECK(GetArena() == other->GetArena());
-    InternalSwap(other);
-  }
-
-  // implements Message ----------------------------------------------
-
-  UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByCumulativeMax* New(::google::protobuf::Arena* arena = nullptr) const final {
-    return CreateMaybeMessage<UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByCumulativeMax>(arena);
-  }
-  using ::google::protobuf::internal::ZeroFieldsBase::CopyFrom;
-  inline void CopyFrom(const UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByCumulativeMax& from) {
-    ::google::protobuf::internal::ZeroFieldsBase::CopyImpl(*this, from);
-  }
-  using ::google::protobuf::internal::ZeroFieldsBase::MergeFrom;
-  void MergeFrom(const UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByCumulativeMax& from) {
-    ::google::protobuf::internal::ZeroFieldsBase::MergeImpl(*this, from);
-  }
-  public:
-
-  private:
-  friend class ::google::protobuf::internal::AnyMetadata;
-  static ::absl::string_view FullMessageName() {
-    return "io.deephaven.proto.backplane.grpc.UpdateByRequest.UpdateByOperation.UpdateByColumn.UpdateBySpec.UpdateByCumulativeMax";
-  }
-  protected:
-  explicit UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByCumulativeMax(::google::protobuf::Arena* arena);
-  UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByCumulativeMax(::google::protobuf::Arena* arena, const UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByCumulativeMax& from);
-  public:
-
-  ::google::protobuf::Metadata GetMetadata() const final;
-
-  // nested types ----------------------------------------------------
-
-  // accessors -------------------------------------------------------
-
-  // @@protoc_insertion_point(class_scope:io.deephaven.proto.backplane.grpc.UpdateByRequest.UpdateByOperation.UpdateByColumn.UpdateBySpec.UpdateByCumulativeMax)
- private:
-  class _Internal;
-
-  friend class ::google::protobuf::MessageLite;
-  friend class ::google::protobuf::Arena;
-  template <typename T>
-  friend class ::google::protobuf::Arena::InternalHelper;
-  using InternalArenaConstructable_ = void;
-  using DestructorSkippable_ = void;
-  struct Impl_ {
-
-        inline explicit constexpr Impl_(
-            ::google::protobuf::internal::ConstantInitialized) noexcept;
-        inline explicit Impl_(::google::protobuf::internal::InternalVisibility visibility,
-                              ::google::protobuf::Arena* arena);
-        inline explicit Impl_(::google::protobuf::internal::InternalVisibility visibility,
-                              ::google::protobuf::Arena* arena, const Impl_& from);
-    PROTOBUF_TSAN_DECLARE_MEMBER
-  };
-  friend struct ::TableStruct_deephaven_2fproto_2ftable_2eproto;
-};// -------------------------------------------------------------------
-
-class UpdateByDeltaOptions final :
-    public ::google::protobuf::Message /* @@protoc_insertion_point(class_definition:io.deephaven.proto.backplane.grpc.UpdateByDeltaOptions) */ {
- public:
-  inline UpdateByDeltaOptions() : UpdateByDeltaOptions(nullptr) {}
-  ~UpdateByDeltaOptions() override;
-  template<typename = void>
-  explicit PROTOBUF_CONSTEXPR UpdateByDeltaOptions(::google::protobuf::internal::ConstantInitialized);
-
-  inline UpdateByDeltaOptions(const UpdateByDeltaOptions& from)
-      : UpdateByDeltaOptions(nullptr, from) {}
-  UpdateByDeltaOptions(UpdateByDeltaOptions&& from) noexcept
-    : UpdateByDeltaOptions() {
-    *this = ::std::move(from);
-  }
-
-  inline UpdateByDeltaOptions& operator=(const UpdateByDeltaOptions& from) {
-    CopyFrom(from);
-    return *this;
-  }
-  inline UpdateByDeltaOptions& operator=(UpdateByDeltaOptions&& from) noexcept {
-    if (this == &from) return *this;
-    if (GetArena() == from.GetArena()
-  #ifdef PROTOBUF_FORCE_COPY_IN_MOVE
-        && GetArena() != nullptr
-  #endif  // !PROTOBUF_FORCE_COPY_IN_MOVE
-    ) {
-      InternalSwap(&from);
-    } else {
-      CopyFrom(from);
-    }
-    return *this;
-  }
-
-  inline const ::google::protobuf::UnknownFieldSet& unknown_fields() const
-      ABSL_ATTRIBUTE_LIFETIME_BOUND {
-    return _internal_metadata_.unknown_fields<::google::protobuf::UnknownFieldSet>(::google::protobuf::UnknownFieldSet::default_instance);
-  }
-  inline ::google::protobuf::UnknownFieldSet* mutable_unknown_fields()
-      ABSL_ATTRIBUTE_LIFETIME_BOUND {
-    return _internal_metadata_.mutable_unknown_fields<::google::protobuf::UnknownFieldSet>();
-  }
-
-  static const ::google::protobuf::Descriptor* descriptor() {
-    return GetDescriptor();
-  }
-  static const ::google::protobuf::Descriptor* GetDescriptor() {
-    return default_instance().GetMetadata().descriptor;
-  }
-  static const ::google::protobuf::Reflection* GetReflection() {
-    return default_instance().GetMetadata().reflection;
-  }
-  static const UpdateByDeltaOptions& default_instance() {
-    return *internal_default_instance();
-  }
-  static inline const UpdateByDeltaOptions* internal_default_instance() {
-    return reinterpret_cast<const UpdateByDeltaOptions*>(
-               &_UpdateByDeltaOptions_default_instance_);
-  }
-  static constexpr int kIndexInFileMessages =
-    14;
-
-  friend void swap(UpdateByDeltaOptions& a, UpdateByDeltaOptions& b) {
-    a.Swap(&b);
-  }
-  inline void Swap(UpdateByDeltaOptions* other) {
-    if (other == this) return;
-  #ifdef PROTOBUF_FORCE_COPY_IN_SWAP
-    if (GetArena() != nullptr &&
-        GetArena() == other->GetArena()) {
-   #else  // PROTOBUF_FORCE_COPY_IN_SWAP
-    if (GetArena() == other->GetArena()) {
-  #endif  // !PROTOBUF_FORCE_COPY_IN_SWAP
-      InternalSwap(other);
-    } else {
-      ::google::protobuf::internal::GenericSwap(this, other);
-    }
-  }
-  void UnsafeArenaSwap(UpdateByDeltaOptions* other) {
-    if (other == this) return;
-    ABSL_DCHECK(GetArena() == other->GetArena());
-    InternalSwap(other);
-  }
-
-  // implements Message ----------------------------------------------
-
-  UpdateByDeltaOptions* New(::google::protobuf::Arena* arena = nullptr) const final {
-    return CreateMaybeMessage<UpdateByDeltaOptions>(arena);
-  }
-  using ::google::protobuf::Message::CopyFrom;
-  void CopyFrom(const UpdateByDeltaOptions& from);
-  using ::google::protobuf::Message::MergeFrom;
-  void MergeFrom( const UpdateByDeltaOptions& from) {
-    UpdateByDeltaOptions::MergeImpl(*this, from);
-  }
-  private:
-  static void MergeImpl(::google::protobuf::Message& to_msg, const ::google::protobuf::Message& from_msg);
-  public:
-  PROTOBUF_ATTRIBUTE_REINITIALIZES void Clear() final;
-  bool IsInitialized() const final;
-
-  ::size_t ByteSizeLong() const final;
-  const char* _InternalParse(const char* ptr, ::google::protobuf::internal::ParseContext* ctx) final;
-  ::uint8_t* _InternalSerialize(
-      ::uint8_t* target, ::google::protobuf::io::EpsCopyOutputStream* stream) const final;
-  int GetCachedSize() const { return _impl_._cached_size_.Get(); }
-
-  private:
-  ::google::protobuf::internal::CachedSize* AccessCachedSize() const final;
-  void SharedCtor(::google::protobuf::Arena* arena);
-  void SharedDtor();
-  void InternalSwap(UpdateByDeltaOptions* other);
-
-  private:
-  friend class ::google::protobuf::internal::AnyMetadata;
-  static ::absl::string_view FullMessageName() {
-    return "io.deephaven.proto.backplane.grpc.UpdateByDeltaOptions";
-  }
-  protected:
-  explicit UpdateByDeltaOptions(::google::protobuf::Arena* arena);
-  UpdateByDeltaOptions(::google::protobuf::Arena* arena, const UpdateByDeltaOptions& from);
-  public:
-
-  static const ClassData _class_data_;
-  const ::google::protobuf::Message::ClassData*GetClassData() const final;
-
-  ::google::protobuf::Metadata GetMetadata() const final;
-
-  // nested types ----------------------------------------------------
-
-  // accessors -------------------------------------------------------
-
-  enum : int {
-    kNullBehaviorFieldNumber = 1,
-  };
-  // .io.deephaven.proto.backplane.grpc.UpdateByNullBehavior null_behavior = 1;
-  void clear_null_behavior() ;
-  ::io::deephaven::proto::backplane::grpc::UpdateByNullBehavior null_behavior() const;
-  void set_null_behavior(::io::deephaven::proto::backplane::grpc::UpdateByNullBehavior value);
-
-  private:
-  ::io::deephaven::proto::backplane::grpc::UpdateByNullBehavior _internal_null_behavior() const;
-  void _internal_set_null_behavior(::io::deephaven::proto::backplane::grpc::UpdateByNullBehavior value);
-
-  public:
-  // @@protoc_insertion_point(class_scope:io.deephaven.proto.backplane.grpc.UpdateByDeltaOptions)
- private:
-  class _Internal;
-
-  friend class ::google::protobuf::internal::TcParser;
-  static const ::google::protobuf::internal::TcParseTable<
-      0, 1, 0,
-      0, 2>
-      _table_;
-  friend class ::google::protobuf::MessageLite;
-  friend class ::google::protobuf::Arena;
-  template <typename T>
-  friend class ::google::protobuf::Arena::InternalHelper;
-  using InternalArenaConstructable_ = void;
-  using DestructorSkippable_ = void;
-  struct Impl_ {
-
-        inline explicit constexpr Impl_(
-            ::google::protobuf::internal::ConstantInitialized) noexcept;
-        inline explicit Impl_(::google::protobuf::internal::InternalVisibility visibility,
-                              ::google::protobuf::Arena* arena);
-        inline explicit Impl_(::google::protobuf::internal::InternalVisibility visibility,
-                              ::google::protobuf::Arena* arena, const Impl_& from);
-    int null_behavior_;
-    mutable ::google::protobuf::internal::CachedSize _cached_size_;
-    PROTOBUF_TSAN_DECLARE_MEMBER
-  };
-  union { Impl_ _impl_; };
-  friend struct ::TableStruct_deephaven_2fproto_2ftable_2eproto;
-};// -------------------------------------------------------------------
-
-class SortDescriptor final :
-    public ::google::protobuf::Message /* @@protoc_insertion_point(class_definition:io.deephaven.proto.backplane.grpc.SortDescriptor) */ {
- public:
-  inline SortDescriptor() : SortDescriptor(nullptr) {}
-  ~SortDescriptor() override;
-  template<typename = void>
-  explicit PROTOBUF_CONSTEXPR SortDescriptor(::google::protobuf::internal::ConstantInitialized);
-
-  inline SortDescriptor(const SortDescriptor& from)
-      : SortDescriptor(nullptr, from) {}
-  SortDescriptor(SortDescriptor&& from) noexcept
-    : SortDescriptor() {
-    *this = ::std::move(from);
-  }
-
-  inline SortDescriptor& operator=(const SortDescriptor& from) {
-    CopyFrom(from);
-    return *this;
-  }
-  inline SortDescriptor& operator=(SortDescriptor&& from) noexcept {
-    if (this == &from) return *this;
-    if (GetArena() == from.GetArena()
-  #ifdef PROTOBUF_FORCE_COPY_IN_MOVE
-        && GetArena() != nullptr
-  #endif  // !PROTOBUF_FORCE_COPY_IN_MOVE
-    ) {
-      InternalSwap(&from);
-    } else {
-      CopyFrom(from);
-    }
-    return *this;
-  }
-
-  inline const ::google::protobuf::UnknownFieldSet& unknown_fields() const
-      ABSL_ATTRIBUTE_LIFETIME_BOUND {
-    return _internal_metadata_.unknown_fields<::google::protobuf::UnknownFieldSet>(::google::protobuf::UnknownFieldSet::default_instance);
-  }
-  inline ::google::protobuf::UnknownFieldSet* mutable_unknown_fields()
-      ABSL_ATTRIBUTE_LIFETIME_BOUND {
-    return _internal_metadata_.mutable_unknown_fields<::google::protobuf::UnknownFieldSet>();
-  }
-
-  static const ::google::protobuf::Descriptor* descriptor() {
-    return GetDescriptor();
-  }
-  static const ::google::protobuf::Descriptor* GetDescriptor() {
-    return default_instance().GetMetadata().descriptor;
-  }
-  static const ::google::protobuf::Reflection* GetReflection() {
-    return default_instance().GetMetadata().reflection;
-  }
-  static const SortDescriptor& default_instance() {
-    return *internal_default_instance();
-  }
-  static inline const SortDescriptor* internal_default_instance() {
-    return reinterpret_cast<const SortDescriptor*>(
-               &_SortDescriptor_default_instance_);
-  }
-  static constexpr int kIndexInFileMessages =
-    92;
-
-  friend void swap(SortDescriptor& a, SortDescriptor& b) {
-    a.Swap(&b);
-  }
-  inline void Swap(SortDescriptor* other) {
-    if (other == this) return;
-  #ifdef PROTOBUF_FORCE_COPY_IN_SWAP
-    if (GetArena() != nullptr &&
-        GetArena() == other->GetArena()) {
-   #else  // PROTOBUF_FORCE_COPY_IN_SWAP
-    if (GetArena() == other->GetArena()) {
-  #endif  // !PROTOBUF_FORCE_COPY_IN_SWAP
-      InternalSwap(other);
-    } else {
-      ::google::protobuf::internal::GenericSwap(this, other);
-    }
-  }
-  void UnsafeArenaSwap(SortDescriptor* other) {
-    if (other == this) return;
-    ABSL_DCHECK(GetArena() == other->GetArena());
-    InternalSwap(other);
-  }
-
-  // implements Message ----------------------------------------------
-
-  SortDescriptor* New(::google::protobuf::Arena* arena = nullptr) const final {
-    return CreateMaybeMessage<SortDescriptor>(arena);
-  }
-  using ::google::protobuf::Message::CopyFrom;
-  void CopyFrom(const SortDescriptor& from);
-  using ::google::protobuf::Message::MergeFrom;
-  void MergeFrom( const SortDescriptor& from) {
-    SortDescriptor::MergeImpl(*this, from);
-  }
-  private:
-  static void MergeImpl(::google::protobuf::Message& to_msg, const ::google::protobuf::Message& from_msg);
-  public:
-  PROTOBUF_ATTRIBUTE_REINITIALIZES void Clear() final;
-  bool IsInitialized() const final;
-
-  ::size_t ByteSizeLong() const final;
-  const char* _InternalParse(const char* ptr, ::google::protobuf::internal::ParseContext* ctx) final;
-  ::uint8_t* _InternalSerialize(
-      ::uint8_t* target, ::google::protobuf::io::EpsCopyOutputStream* stream) const final;
-  int GetCachedSize() const { return _impl_._cached_size_.Get(); }
-
-  private:
-  ::google::protobuf::internal::CachedSize* AccessCachedSize() const final;
-  void SharedCtor(::google::protobuf::Arena* arena);
-  void SharedDtor();
-  void InternalSwap(SortDescriptor* other);
-
-  private:
-  friend class ::google::protobuf::internal::AnyMetadata;
-  static ::absl::string_view FullMessageName() {
-    return "io.deephaven.proto.backplane.grpc.SortDescriptor";
-  }
-  protected:
-  explicit SortDescriptor(::google::protobuf::Arena* arena);
-  SortDescriptor(::google::protobuf::Arena* arena, const SortDescriptor& from);
-  public:
-
-  static const ClassData _class_data_;
-  const ::google::protobuf::Message::ClassData*GetClassData() const final;
-
-  ::google::protobuf::Metadata GetMetadata() const final;
-
-  // nested types ----------------------------------------------------
-
-  using SortDirection = SortDescriptor_SortDirection;
-  static constexpr SortDirection UNKNOWN = SortDescriptor_SortDirection_UNKNOWN;
-  static constexpr SortDirection DESCENDING = SortDescriptor_SortDirection_DESCENDING;
-  static constexpr SortDirection ASCENDING = SortDescriptor_SortDirection_ASCENDING;
-  static constexpr SortDirection REVERSE = SortDescriptor_SortDirection_REVERSE;
-  static inline bool SortDirection_IsValid(int value) {
-    return SortDescriptor_SortDirection_IsValid(value);
-  }
-  static constexpr SortDirection SortDirection_MIN = SortDescriptor_SortDirection_SortDirection_MIN;
-  static constexpr SortDirection SortDirection_MAX = SortDescriptor_SortDirection_SortDirection_MAX;
-  static constexpr int SortDirection_ARRAYSIZE = SortDescriptor_SortDirection_SortDirection_ARRAYSIZE;
-  static inline const ::google::protobuf::EnumDescriptor* SortDirection_descriptor() {
-    return SortDescriptor_SortDirection_descriptor();
-  }
-  template <typename T>
-  static inline const std::string& SortDirection_Name(T value) {
-    return SortDescriptor_SortDirection_Name(value);
-  }
-  static inline bool SortDirection_Parse(absl::string_view name, SortDirection* value) {
-    return SortDescriptor_SortDirection_Parse(name, value);
-  }
-
-  // accessors -------------------------------------------------------
-
-  enum : int {
-    kColumnNameFieldNumber = 1,
-    kIsAbsoluteFieldNumber = 2,
-    kDirectionFieldNumber = 3,
-  };
-  // string column_name = 1;
-  void clear_column_name() ;
-  const std::string& column_name() const;
-  template <typename Arg_ = const std::string&, typename... Args_>
-  void set_column_name(Arg_&& arg, Args_... args);
-  std::string* mutable_column_name();
-  PROTOBUF_NODISCARD std::string* release_column_name();
-  void set_allocated_column_name(std::string* value);
-
-  private:
-  const std::string& _internal_column_name() const;
-  inline PROTOBUF_ALWAYS_INLINE void _internal_set_column_name(
-      const std::string& value);
-  std::string* _internal_mutable_column_name();
-
-  public:
-  // bool is_absolute = 2;
-  void clear_is_absolute() ;
-  bool is_absolute() const;
-  void set_is_absolute(bool value);
-
-  private:
-  bool _internal_is_absolute() const;
-  void _internal_set_is_absolute(bool value);
-
-  public:
-  // .io.deephaven.proto.backplane.grpc.SortDescriptor.SortDirection direction = 3;
-  void clear_direction() ;
-  ::io::deephaven::proto::backplane::grpc::SortDescriptor_SortDirection direction() const;
-  void set_direction(::io::deephaven::proto::backplane::grpc::SortDescriptor_SortDirection value);
-
-  private:
-  ::io::deephaven::proto::backplane::grpc::SortDescriptor_SortDirection _internal_direction() const;
-  void _internal_set_direction(::io::deephaven::proto::backplane::grpc::SortDescriptor_SortDirection value);
-
-  public:
-  // @@protoc_insertion_point(class_scope:io.deephaven.proto.backplane.grpc.SortDescriptor)
- private:
-  class _Internal;
-
-  friend class ::google::protobuf::internal::TcParser;
-  static const ::google::protobuf::internal::TcParseTable<
-      2, 3, 0,
-      68, 2>
-      _table_;
-  friend class ::google::protobuf::MessageLite;
-  friend class ::google::protobuf::Arena;
-  template <typename T>
-  friend class ::google::protobuf::Arena::InternalHelper;
-  using InternalArenaConstructable_ = void;
-  using DestructorSkippable_ = void;
-  struct Impl_ {
-
-        inline explicit constexpr Impl_(
-            ::google::protobuf::internal::ConstantInitialized) noexcept;
-        inline explicit Impl_(::google::protobuf::internal::InternalVisibility visibility,
-                              ::google::protobuf::Arena* arena);
-        inline explicit Impl_(::google::protobuf::internal::InternalVisibility visibility,
-                              ::google::protobuf::Arena* arena, const Impl_& from);
-    ::google::protobuf::internal::ArenaStringPtr column_name_;
-    bool is_absolute_;
-    int direction_;
-    mutable ::google::protobuf::internal::CachedSize _cached_size_;
-    PROTOBUF_TSAN_DECLARE_MEMBER
-  };
-  union { Impl_ _impl_; };
-  friend struct ::TableStruct_deephaven_2fproto_2ftable_2eproto;
-};// -------------------------------------------------------------------
-
-class SeekRowResponse final :
-    public ::google::protobuf::Message /* @@protoc_insertion_point(class_definition:io.deephaven.proto.backplane.grpc.SeekRowResponse) */ {
- public:
-  inline SeekRowResponse() : SeekRowResponse(nullptr) {}
-  ~SeekRowResponse() override;
-  template<typename = void>
-  explicit PROTOBUF_CONSTEXPR SeekRowResponse(::google::protobuf::internal::ConstantInitialized);
-
-  inline SeekRowResponse(const SeekRowResponse& from)
-      : SeekRowResponse(nullptr, from) {}
-  SeekRowResponse(SeekRowResponse&& from) noexcept
-    : SeekRowResponse() {
-    *this = ::std::move(from);
-  }
-
-  inline SeekRowResponse& operator=(const SeekRowResponse& from) {
-    CopyFrom(from);
-    return *this;
-  }
-  inline SeekRowResponse& operator=(SeekRowResponse&& from) noexcept {
-    if (this == &from) return *this;
-    if (GetArena() == from.GetArena()
-  #ifdef PROTOBUF_FORCE_COPY_IN_MOVE
-        && GetArena() != nullptr
-  #endif  // !PROTOBUF_FORCE_COPY_IN_MOVE
-    ) {
-      InternalSwap(&from);
-    } else {
-      CopyFrom(from);
-    }
-    return *this;
-  }
-
-  inline const ::google::protobuf::UnknownFieldSet& unknown_fields() const
-      ABSL_ATTRIBUTE_LIFETIME_BOUND {
-    return _internal_metadata_.unknown_fields<::google::protobuf::UnknownFieldSet>(::google::protobuf::UnknownFieldSet::default_instance);
-  }
-  inline ::google::protobuf::UnknownFieldSet* mutable_unknown_fields()
-      ABSL_ATTRIBUTE_LIFETIME_BOUND {
-    return _internal_metadata_.mutable_unknown_fields<::google::protobuf::UnknownFieldSet>();
-  }
-
-  static const ::google::protobuf::Descriptor* descriptor() {
-    return GetDescriptor();
-  }
-  static const ::google::protobuf::Descriptor* GetDescriptor() {
-    return default_instance().GetMetadata().descriptor;
-  }
-  static const ::google::protobuf::Reflection* GetReflection() {
-    return default_instance().GetMetadata().reflection;
-  }
-  static const SeekRowResponse& default_instance() {
-    return *internal_default_instance();
-  }
-  static inline const SeekRowResponse* internal_default_instance() {
-    return reinterpret_cast<const SeekRowResponse*>(
-               &_SeekRowResponse_default_instance_);
-  }
-  static constexpr int kIndexInFileMessages =
-    96;
-
-  friend void swap(SeekRowResponse& a, SeekRowResponse& b) {
-    a.Swap(&b);
-  }
-  inline void Swap(SeekRowResponse* other) {
-    if (other == this) return;
-  #ifdef PROTOBUF_FORCE_COPY_IN_SWAP
-    if (GetArena() != nullptr &&
-        GetArena() == other->GetArena()) {
-   #else  // PROTOBUF_FORCE_COPY_IN_SWAP
-    if (GetArena() == other->GetArena()) {
-  #endif  // !PROTOBUF_FORCE_COPY_IN_SWAP
-      InternalSwap(other);
-    } else {
-      ::google::protobuf::internal::GenericSwap(this, other);
-    }
-  }
-  void UnsafeArenaSwap(SeekRowResponse* other) {
-    if (other == this) return;
-    ABSL_DCHECK(GetArena() == other->GetArena());
-    InternalSwap(other);
-  }
-
-  // implements Message ----------------------------------------------
-
-  SeekRowResponse* New(::google::protobuf::Arena* arena = nullptr) const final {
-    return CreateMaybeMessage<SeekRowResponse>(arena);
-  }
-  using ::google::protobuf::Message::CopyFrom;
-  void CopyFrom(const SeekRowResponse& from);
-  using ::google::protobuf::Message::MergeFrom;
-  void MergeFrom( const SeekRowResponse& from) {
-    SeekRowResponse::MergeImpl(*this, from);
-  }
-  private:
-  static void MergeImpl(::google::protobuf::Message& to_msg, const ::google::protobuf::Message& from_msg);
-  public:
-  PROTOBUF_ATTRIBUTE_REINITIALIZES void Clear() final;
-  bool IsInitialized() const final;
-
-  ::size_t ByteSizeLong() const final;
-  const char* _InternalParse(const char* ptr, ::google::protobuf::internal::ParseContext* ctx) final;
-  ::uint8_t* _InternalSerialize(
-      ::uint8_t* target, ::google::protobuf::io::EpsCopyOutputStream* stream) const final;
-  int GetCachedSize() const { return _impl_._cached_size_.Get(); }
-
-  private:
-  ::google::protobuf::internal::CachedSize* AccessCachedSize() const final;
-  void SharedCtor(::google::protobuf::Arena* arena);
-  void SharedDtor();
-  void InternalSwap(SeekRowResponse* other);
-
-  private:
-  friend class ::google::protobuf::internal::AnyMetadata;
-  static ::absl::string_view FullMessageName() {
-    return "io.deephaven.proto.backplane.grpc.SeekRowResponse";
-  }
-  protected:
-  explicit SeekRowResponse(::google::protobuf::Arena* arena);
-  SeekRowResponse(::google::protobuf::Arena* arena, const SeekRowResponse& from);
-  public:
-
-  static const ClassData _class_data_;
-  const ::google::protobuf::Message::ClassData*GetClassData() const final;
-
-  ::google::protobuf::Metadata GetMetadata() const final;
-
-  // nested types ----------------------------------------------------
-
-  // accessors -------------------------------------------------------
-
-  enum : int {
-    kResultRowFieldNumber = 1,
-  };
-  // sint64 result_row = 1 [jstype = JS_STRING];
-  void clear_result_row() ;
-  ::int64_t result_row() const;
-  void set_result_row(::int64_t value);
-
-  private:
-  ::int64_t _internal_result_row() const;
-  void _internal_set_result_row(::int64_t value);
-
-  public:
-  // @@protoc_insertion_point(class_scope:io.deephaven.proto.backplane.grpc.SeekRowResponse)
- private:
-  class _Internal;
-
-  friend class ::google::protobuf::internal::TcParser;
-  static const ::google::protobuf::internal::TcParseTable<
-      0, 1, 0,
-      0, 2>
-      _table_;
-  friend class ::google::protobuf::MessageLite;
-  friend class ::google::protobuf::Arena;
-  template <typename T>
-  friend class ::google::protobuf::Arena::InternalHelper;
-  using InternalArenaConstructable_ = void;
-  using DestructorSkippable_ = void;
-  struct Impl_ {
-
-        inline explicit constexpr Impl_(
-            ::google::protobuf::internal::ConstantInitialized) noexcept;
-        inline explicit Impl_(::google::protobuf::internal::InternalVisibility visibility,
-                              ::google::protobuf::Arena* arena);
-        inline explicit Impl_(::google::protobuf::internal::InternalVisibility visibility,
-                              ::google::protobuf::Arena* arena, const Impl_& from);
-    ::int64_t result_row_;
-    mutable ::google::protobuf::internal::CachedSize _cached_size_;
-    PROTOBUF_TSAN_DECLARE_MEMBER
-  };
-  union { Impl_ _impl_; };
-  friend struct ::TableStruct_deephaven_2fproto_2ftable_2eproto;
-};// -------------------------------------------------------------------
-
-class RunChartDownsampleRequest_ZoomRange final :
-    public ::google::protobuf::Message /* @@protoc_insertion_point(class_definition:io.deephaven.proto.backplane.grpc.RunChartDownsampleRequest.ZoomRange) */ {
- public:
-  inline RunChartDownsampleRequest_ZoomRange() : RunChartDownsampleRequest_ZoomRange(nullptr) {}
-  ~RunChartDownsampleRequest_ZoomRange() override;
-  template<typename = void>
-  explicit PROTOBUF_CONSTEXPR RunChartDownsampleRequest_ZoomRange(::google::protobuf::internal::ConstantInitialized);
-
-  inline RunChartDownsampleRequest_ZoomRange(const RunChartDownsampleRequest_ZoomRange& from)
-      : RunChartDownsampleRequest_ZoomRange(nullptr, from) {}
-  RunChartDownsampleRequest_ZoomRange(RunChartDownsampleRequest_ZoomRange&& from) noexcept
-    : RunChartDownsampleRequest_ZoomRange() {
-    *this = ::std::move(from);
-  }
-
-  inline RunChartDownsampleRequest_ZoomRange& operator=(const RunChartDownsampleRequest_ZoomRange& from) {
-    CopyFrom(from);
-    return *this;
-  }
-  inline RunChartDownsampleRequest_ZoomRange& operator=(RunChartDownsampleRequest_ZoomRange&& from) noexcept {
-    if (this == &from) return *this;
-    if (GetArena() == from.GetArena()
-  #ifdef PROTOBUF_FORCE_COPY_IN_MOVE
-        && GetArena() != nullptr
-  #endif  // !PROTOBUF_FORCE_COPY_IN_MOVE
-    ) {
-      InternalSwap(&from);
-    } else {
-      CopyFrom(from);
-    }
-    return *this;
-  }
-
-  inline const ::google::protobuf::UnknownFieldSet& unknown_fields() const
-      ABSL_ATTRIBUTE_LIFETIME_BOUND {
-    return _internal_metadata_.unknown_fields<::google::protobuf::UnknownFieldSet>(::google::protobuf::UnknownFieldSet::default_instance);
-  }
-  inline ::google::protobuf::UnknownFieldSet* mutable_unknown_fields()
-      ABSL_ATTRIBUTE_LIFETIME_BOUND {
-    return _internal_metadata_.mutable_unknown_fields<::google::protobuf::UnknownFieldSet>();
-  }
-
-  static const ::google::protobuf::Descriptor* descriptor() {
-    return GetDescriptor();
-  }
-  static const ::google::protobuf::Descriptor* GetDescriptor() {
-    return default_instance().GetMetadata().descriptor;
-  }
-  static const ::google::protobuf::Reflection* GetReflection() {
-    return default_instance().GetMetadata().reflection;
-  }
-  static const RunChartDownsampleRequest_ZoomRange& default_instance() {
-    return *internal_default_instance();
-  }
-  static inline const RunChartDownsampleRequest_ZoomRange* internal_default_instance() {
-    return reinterpret_cast<const RunChartDownsampleRequest_ZoomRange*>(
-               &_RunChartDownsampleRequest_ZoomRange_default_instance_);
-  }
-  static constexpr int kIndexInFileMessages =
-    113;
-
-  friend void swap(RunChartDownsampleRequest_ZoomRange& a, RunChartDownsampleRequest_ZoomRange& b) {
-    a.Swap(&b);
-  }
-  inline void Swap(RunChartDownsampleRequest_ZoomRange* other) {
-    if (other == this) return;
-  #ifdef PROTOBUF_FORCE_COPY_IN_SWAP
-    if (GetArena() != nullptr &&
-        GetArena() == other->GetArena()) {
-   #else  // PROTOBUF_FORCE_COPY_IN_SWAP
-    if (GetArena() == other->GetArena()) {
-  #endif  // !PROTOBUF_FORCE_COPY_IN_SWAP
-      InternalSwap(other);
-    } else {
-      ::google::protobuf::internal::GenericSwap(this, other);
-    }
-  }
-  void UnsafeArenaSwap(RunChartDownsampleRequest_ZoomRange* other) {
-    if (other == this) return;
-    ABSL_DCHECK(GetArena() == other->GetArena());
-    InternalSwap(other);
-  }
-
-  // implements Message ----------------------------------------------
-
-  RunChartDownsampleRequest_ZoomRange* New(::google::protobuf::Arena* arena = nullptr) const final {
-    return CreateMaybeMessage<RunChartDownsampleRequest_ZoomRange>(arena);
-  }
-  using ::google::protobuf::Message::CopyFrom;
-  void CopyFrom(const RunChartDownsampleRequest_ZoomRange& from);
-  using ::google::protobuf::Message::MergeFrom;
-  void MergeFrom( const RunChartDownsampleRequest_ZoomRange& from) {
-    RunChartDownsampleRequest_ZoomRange::MergeImpl(*this, from);
-  }
-  private:
-  static void MergeImpl(::google::protobuf::Message& to_msg, const ::google::protobuf::Message& from_msg);
-  public:
-  PROTOBUF_ATTRIBUTE_REINITIALIZES void Clear() final;
-  bool IsInitialized() const final;
-
-  ::size_t ByteSizeLong() const final;
-  const char* _InternalParse(const char* ptr, ::google::protobuf::internal::ParseContext* ctx) final;
-  ::uint8_t* _InternalSerialize(
-      ::uint8_t* target, ::google::protobuf::io::EpsCopyOutputStream* stream) const final;
-  int GetCachedSize() const { return _impl_._cached_size_.Get(); }
-
-  private:
-  ::google::protobuf::internal::CachedSize* AccessCachedSize() const final;
-  void SharedCtor(::google::protobuf::Arena* arena);
-  void SharedDtor();
-  void InternalSwap(RunChartDownsampleRequest_ZoomRange* other);
-
-  private:
-  friend class ::google::protobuf::internal::AnyMetadata;
-  static ::absl::string_view FullMessageName() {
-    return "io.deephaven.proto.backplane.grpc.RunChartDownsampleRequest.ZoomRange";
-  }
-  protected:
-  explicit RunChartDownsampleRequest_ZoomRange(::google::protobuf::Arena* arena);
-  RunChartDownsampleRequest_ZoomRange(::google::protobuf::Arena* arena, const RunChartDownsampleRequest_ZoomRange& from);
-  public:
-
-  static const ClassData _class_data_;
-  const ::google::protobuf::Message::ClassData*GetClassData() const final;
-
-  ::google::protobuf::Metadata GetMetadata() const final;
-
-  // nested types ----------------------------------------------------
-
-  // accessors -------------------------------------------------------
-
-  enum : int {
-    kMinDateNanosFieldNumber = 1,
-    kMaxDateNanosFieldNumber = 2,
-  };
-  // optional int64 min_date_nanos = 1 [jstype = JS_STRING];
-  bool has_min_date_nanos() const;
-  void clear_min_date_nanos() ;
-  ::int64_t min_date_nanos() const;
-  void set_min_date_nanos(::int64_t value);
-
-  private:
-  ::int64_t _internal_min_date_nanos() const;
-  void _internal_set_min_date_nanos(::int64_t value);
-
-  public:
-  // optional int64 max_date_nanos = 2 [jstype = JS_STRING];
-  bool has_max_date_nanos() const;
-  void clear_max_date_nanos() ;
-  ::int64_t max_date_nanos() const;
-  void set_max_date_nanos(::int64_t value);
-
-  private:
-  ::int64_t _internal_max_date_nanos() const;
-  void _internal_set_max_date_nanos(::int64_t value);
-
-  public:
-  // @@protoc_insertion_point(class_scope:io.deephaven.proto.backplane.grpc.RunChartDownsampleRequest.ZoomRange)
- private:
-  class _Internal;
-
-  friend class ::google::protobuf::internal::TcParser;
-  static const ::google::protobuf::internal::TcParseTable<
-      1, 2, 0,
-      0, 2>
-      _table_;
-  friend class ::google::protobuf::MessageLite;
-  friend class ::google::protobuf::Arena;
-  template <typename T>
-  friend class ::google::protobuf::Arena::InternalHelper;
-  using InternalArenaConstructable_ = void;
-  using DestructorSkippable_ = void;
-  struct Impl_ {
-
-        inline explicit constexpr Impl_(
-            ::google::protobuf::internal::ConstantInitialized) noexcept;
-        inline explicit Impl_(::google::protobuf::internal::InternalVisibility visibility,
-                              ::google::protobuf::Arena* arena);
-        inline explicit Impl_(::google::protobuf::internal::InternalVisibility visibility,
-                              ::google::protobuf::Arena* arena, const Impl_& from);
-    ::google::protobuf::internal::HasBits<1> _has_bits_;
-    mutable ::google::protobuf::internal::CachedSize _cached_size_;
-    ::int64_t min_date_nanos_;
-    ::int64_t max_date_nanos_;
-    PROTOBUF_TSAN_DECLARE_MEMBER
-  };
-  union { Impl_ _impl_; };
-  friend struct ::TableStruct_deephaven_2fproto_2ftable_2eproto;
-};// -------------------------------------------------------------------
-
-class Reference final :
-    public ::google::protobuf::Message /* @@protoc_insertion_point(class_definition:io.deephaven.proto.backplane.grpc.Reference) */ {
- public:
-  inline Reference() : Reference(nullptr) {}
-  ~Reference() override;
-  template<typename = void>
-  explicit PROTOBUF_CONSTEXPR Reference(::google::protobuf::internal::ConstantInitialized);
-
-  inline Reference(const Reference& from)
-      : Reference(nullptr, from) {}
-  Reference(Reference&& from) noexcept
-    : Reference() {
-    *this = ::std::move(from);
-  }
-
-  inline Reference& operator=(const Reference& from) {
-    CopyFrom(from);
-    return *this;
-  }
-  inline Reference& operator=(Reference&& from) noexcept {
-    if (this == &from) return *this;
-    if (GetArena() == from.GetArena()
-  #ifdef PROTOBUF_FORCE_COPY_IN_MOVE
-        && GetArena() != nullptr
-  #endif  // !PROTOBUF_FORCE_COPY_IN_MOVE
-    ) {
-      InternalSwap(&from);
-    } else {
-      CopyFrom(from);
-    }
-    return *this;
-  }
-
-  inline const ::google::protobuf::UnknownFieldSet& unknown_fields() const
-      ABSL_ATTRIBUTE_LIFETIME_BOUND {
-    return _internal_metadata_.unknown_fields<::google::protobuf::UnknownFieldSet>(::google::protobuf::UnknownFieldSet::default_instance);
-  }
-  inline ::google::protobuf::UnknownFieldSet* mutable_unknown_fields()
-      ABSL_ATTRIBUTE_LIFETIME_BOUND {
-    return _internal_metadata_.mutable_unknown_fields<::google::protobuf::UnknownFieldSet>();
-  }
-
-  static const ::google::protobuf::Descriptor* descriptor() {
-    return GetDescriptor();
-  }
-  static const ::google::protobuf::Descriptor* GetDescriptor() {
-    return default_instance().GetMetadata().descriptor;
-  }
-  static const ::google::protobuf::Reflection* GetReflection() {
-    return default_instance().GetMetadata().reflection;
-  }
-  static const Reference& default_instance() {
-    return *internal_default_instance();
-  }
-  static inline const Reference* internal_default_instance() {
-    return reinterpret_cast<const Reference*>(
-               &_Reference_default_instance_);
-  }
-  static constexpr int kIndexInFileMessages =
-    97;
-
-  friend void swap(Reference& a, Reference& b) {
-    a.Swap(&b);
-  }
-  inline void Swap(Reference* other) {
-    if (other == this) return;
-  #ifdef PROTOBUF_FORCE_COPY_IN_SWAP
-    if (GetArena() != nullptr &&
-        GetArena() == other->GetArena()) {
-   #else  // PROTOBUF_FORCE_COPY_IN_SWAP
-    if (GetArena() == other->GetArena()) {
-  #endif  // !PROTOBUF_FORCE_COPY_IN_SWAP
-      InternalSwap(other);
-    } else {
-      ::google::protobuf::internal::GenericSwap(this, other);
-    }
-  }
-  void UnsafeArenaSwap(Reference* other) {
-    if (other == this) return;
-    ABSL_DCHECK(GetArena() == other->GetArena());
-    InternalSwap(other);
-  }
-
-  // implements Message ----------------------------------------------
-
-  Reference* New(::google::protobuf::Arena* arena = nullptr) const final {
-    return CreateMaybeMessage<Reference>(arena);
-  }
-  using ::google::protobuf::Message::CopyFrom;
-  void CopyFrom(const Reference& from);
-  using ::google::protobuf::Message::MergeFrom;
-  void MergeFrom( const Reference& from) {
-    Reference::MergeImpl(*this, from);
-  }
-  private:
-  static void MergeImpl(::google::protobuf::Message& to_msg, const ::google::protobuf::Message& from_msg);
-  public:
-  PROTOBUF_ATTRIBUTE_REINITIALIZES void Clear() final;
-  bool IsInitialized() const final;
-
-  ::size_t ByteSizeLong() const final;
-  const char* _InternalParse(const char* ptr, ::google::protobuf::internal::ParseContext* ctx) final;
-  ::uint8_t* _InternalSerialize(
-      ::uint8_t* target, ::google::protobuf::io::EpsCopyOutputStream* stream) const final;
-  int GetCachedSize() const { return _impl_._cached_size_.Get(); }
-
-  private:
-  ::google::protobuf::internal::CachedSize* AccessCachedSize() const final;
-  void SharedCtor(::google::protobuf::Arena* arena);
-  void SharedDtor();
-  void InternalSwap(Reference* other);
-
-  private:
-  friend class ::google::protobuf::internal::AnyMetadata;
-  static ::absl::string_view FullMessageName() {
-    return "io.deephaven.proto.backplane.grpc.Reference";
-  }
-  protected:
-  explicit Reference(::google::protobuf::Arena* arena);
-  Reference(::google::protobuf::Arena* arena, const Reference& from);
-  public:
-
-  static const ClassData _class_data_;
-  const ::google::protobuf::Message::ClassData*GetClassData() const final;
-
-  ::google::protobuf::Metadata GetMetadata() const final;
-
-  // nested types ----------------------------------------------------
-
-  // accessors -------------------------------------------------------
-
-  enum : int {
-    kColumnNameFieldNumber = 1,
-  };
-  // string column_name = 1;
-  void clear_column_name() ;
-  const std::string& column_name() const;
-  template <typename Arg_ = const std::string&, typename... Args_>
-  void set_column_name(Arg_&& arg, Args_... args);
-  std::string* mutable_column_name();
-  PROTOBUF_NODISCARD std::string* release_column_name();
-  void set_allocated_column_name(std::string* value);
-
-  private:
-  const std::string& _internal_column_name() const;
-  inline PROTOBUF_ALWAYS_INLINE void _internal_set_column_name(
-      const std::string& value);
-  std::string* _internal_mutable_column_name();
-
-  public:
-  // @@protoc_insertion_point(class_scope:io.deephaven.proto.backplane.grpc.Reference)
- private:
-  class _Internal;
-
-  friend class ::google::protobuf::internal::TcParser;
-  static const ::google::protobuf::internal::TcParseTable<
-      0, 1, 0,
-      63, 2>
-      _table_;
-  friend class ::google::protobuf::MessageLite;
-  friend class ::google::protobuf::Arena;
-  template <typename T>
-  friend class ::google::protobuf::Arena::InternalHelper;
-  using InternalArenaConstructable_ = void;
-  using DestructorSkippable_ = void;
-  struct Impl_ {
-
-        inline explicit constexpr Impl_(
-            ::google::protobuf::internal::ConstantInitialized) noexcept;
-        inline explicit Impl_(::google::protobuf::internal::InternalVisibility visibility,
-                              ::google::protobuf::Arena* arena);
-        inline explicit Impl_(::google::protobuf::internal::InternalVisibility visibility,
-                              ::google::protobuf::Arena* arena, const Impl_& from);
-    ::google::protobuf::internal::ArenaStringPtr column_name_;
-    mutable ::google::protobuf::internal::CachedSize _cached_size_;
-    PROTOBUF_TSAN_DECLARE_MEMBER
-  };
-  union { Impl_ _impl_; };
-  friend struct ::TableStruct_deephaven_2fproto_2ftable_2eproto;
-};// -------------------------------------------------------------------
-
-class MathContext final :
-    public ::google::protobuf::Message /* @@protoc_insertion_point(class_definition:io.deephaven.proto.backplane.grpc.MathContext) */ {
- public:
-  inline MathContext() : MathContext(nullptr) {}
-  ~MathContext() override;
-  template<typename = void>
-  explicit PROTOBUF_CONSTEXPR MathContext(::google::protobuf::internal::ConstantInitialized);
-
-  inline MathContext(const MathContext& from)
-      : MathContext(nullptr, from) {}
-  MathContext(MathContext&& from) noexcept
-    : MathContext() {
-    *this = ::std::move(from);
-  }
-
-  inline MathContext& operator=(const MathContext& from) {
-    CopyFrom(from);
-    return *this;
-  }
-  inline MathContext& operator=(MathContext&& from) noexcept {
-    if (this == &from) return *this;
-    if (GetArena() == from.GetArena()
-  #ifdef PROTOBUF_FORCE_COPY_IN_MOVE
-        && GetArena() != nullptr
-  #endif  // !PROTOBUF_FORCE_COPY_IN_MOVE
-    ) {
-      InternalSwap(&from);
-    } else {
-      CopyFrom(from);
-    }
-    return *this;
-  }
-
-  inline const ::google::protobuf::UnknownFieldSet& unknown_fields() const
-      ABSL_ATTRIBUTE_LIFETIME_BOUND {
-    return _internal_metadata_.unknown_fields<::google::protobuf::UnknownFieldSet>(::google::protobuf::UnknownFieldSet::default_instance);
-  }
-  inline ::google::protobuf::UnknownFieldSet* mutable_unknown_fields()
-      ABSL_ATTRIBUTE_LIFETIME_BOUND {
-    return _internal_metadata_.mutable_unknown_fields<::google::protobuf::UnknownFieldSet>();
-  }
-
-  static const ::google::protobuf::Descriptor* descriptor() {
-    return GetDescriptor();
-  }
-  static const ::google::protobuf::Descriptor* GetDescriptor() {
-    return default_instance().GetMetadata().descriptor;
-  }
-  static const ::google::protobuf::Reflection* GetReflection() {
-    return default_instance().GetMetadata().reflection;
-  }
-  static const MathContext& default_instance() {
-    return *internal_default_instance();
-  }
-  static inline const MathContext* internal_default_instance() {
-    return reinterpret_cast<const MathContext*>(
-               &_MathContext_default_instance_);
-  }
-  static constexpr int kIndexInFileMessages =
-    9;
-
-  friend void swap(MathContext& a, MathContext& b) {
-    a.Swap(&b);
-  }
-  inline void Swap(MathContext* other) {
-    if (other == this) return;
-  #ifdef PROTOBUF_FORCE_COPY_IN_SWAP
-    if (GetArena() != nullptr &&
-        GetArena() == other->GetArena()) {
-   #else  // PROTOBUF_FORCE_COPY_IN_SWAP
-    if (GetArena() == other->GetArena()) {
-  #endif  // !PROTOBUF_FORCE_COPY_IN_SWAP
-      InternalSwap(other);
-    } else {
-      ::google::protobuf::internal::GenericSwap(this, other);
-    }
-  }
-  void UnsafeArenaSwap(MathContext* other) {
-    if (other == this) return;
-    ABSL_DCHECK(GetArena() == other->GetArena());
-    InternalSwap(other);
-  }
-
-  // implements Message ----------------------------------------------
-
-  MathContext* New(::google::protobuf::Arena* arena = nullptr) const final {
-    return CreateMaybeMessage<MathContext>(arena);
-  }
-  using ::google::protobuf::Message::CopyFrom;
-  void CopyFrom(const MathContext& from);
-  using ::google::protobuf::Message::MergeFrom;
-  void MergeFrom( const MathContext& from) {
-    MathContext::MergeImpl(*this, from);
-  }
-  private:
-  static void MergeImpl(::google::protobuf::Message& to_msg, const ::google::protobuf::Message& from_msg);
-  public:
-  PROTOBUF_ATTRIBUTE_REINITIALIZES void Clear() final;
-  bool IsInitialized() const final;
-
-  ::size_t ByteSizeLong() const final;
-  const char* _InternalParse(const char* ptr, ::google::protobuf::internal::ParseContext* ctx) final;
-  ::uint8_t* _InternalSerialize(
-      ::uint8_t* target, ::google::protobuf::io::EpsCopyOutputStream* stream) const final;
-  int GetCachedSize() const { return _impl_._cached_size_.Get(); }
-
-  private:
-  ::google::protobuf::internal::CachedSize* AccessCachedSize() const final;
-  void SharedCtor(::google::protobuf::Arena* arena);
-  void SharedDtor();
-  void InternalSwap(MathContext* other);
-
-  private:
-  friend class ::google::protobuf::internal::AnyMetadata;
-  static ::absl::string_view FullMessageName() {
-    return "io.deephaven.proto.backplane.grpc.MathContext";
-  }
-  protected:
-  explicit MathContext(::google::protobuf::Arena* arena);
-  MathContext(::google::protobuf::Arena* arena, const MathContext& from);
-  public:
-
-  static const ClassData _class_data_;
-  const ::google::protobuf::Message::ClassData*GetClassData() const final;
-
-  ::google::protobuf::Metadata GetMetadata() const final;
-
-  // nested types ----------------------------------------------------
-
-  using RoundingMode = MathContext_RoundingMode;
-  static constexpr RoundingMode ROUNDING_MODE_NOT_SPECIFIED = MathContext_RoundingMode_ROUNDING_MODE_NOT_SPECIFIED;
-  static constexpr RoundingMode UP = MathContext_RoundingMode_UP;
-  static constexpr RoundingMode DOWN = MathContext_RoundingMode_DOWN;
-  static constexpr RoundingMode CEILING = MathContext_RoundingMode_CEILING;
-  static constexpr RoundingMode FLOOR = MathContext_RoundingMode_FLOOR;
-  static constexpr RoundingMode HALF_UP = MathContext_RoundingMode_HALF_UP;
-  static constexpr RoundingMode HALF_DOWN = MathContext_RoundingMode_HALF_DOWN;
-  static constexpr RoundingMode HALF_EVEN = MathContext_RoundingMode_HALF_EVEN;
-  static constexpr RoundingMode UNNECESSARY = MathContext_RoundingMode_UNNECESSARY;
-  static inline bool RoundingMode_IsValid(int value) {
-    return MathContext_RoundingMode_IsValid(value);
-  }
-  static constexpr RoundingMode RoundingMode_MIN = MathContext_RoundingMode_RoundingMode_MIN;
-  static constexpr RoundingMode RoundingMode_MAX = MathContext_RoundingMode_RoundingMode_MAX;
-  static constexpr int RoundingMode_ARRAYSIZE = MathContext_RoundingMode_RoundingMode_ARRAYSIZE;
-  static inline const ::google::protobuf::EnumDescriptor* RoundingMode_descriptor() {
-    return MathContext_RoundingMode_descriptor();
-  }
-  template <typename T>
-  static inline const std::string& RoundingMode_Name(T value) {
-    return MathContext_RoundingMode_Name(value);
-  }
-  static inline bool RoundingMode_Parse(absl::string_view name, RoundingMode* value) {
-    return MathContext_RoundingMode_Parse(name, value);
-  }
-
-  // accessors -------------------------------------------------------
-
-  enum : int {
-    kPrecisionFieldNumber = 1,
-    kRoundingModeFieldNumber = 2,
-  };
-  // sint32 precision = 1;
-  void clear_precision() ;
-  ::int32_t precision() const;
-  void set_precision(::int32_t value);
-
-  private:
-  ::int32_t _internal_precision() const;
-  void _internal_set_precision(::int32_t value);
-
-  public:
-  // .io.deephaven.proto.backplane.grpc.MathContext.RoundingMode rounding_mode = 2;
-  void clear_rounding_mode() ;
-  ::io::deephaven::proto::backplane::grpc::MathContext_RoundingMode rounding_mode() const;
-  void set_rounding_mode(::io::deephaven::proto::backplane::grpc::MathContext_RoundingMode value);
-
-  private:
-  ::io::deephaven::proto::backplane::grpc::MathContext_RoundingMode _internal_rounding_mode() const;
-  void _internal_set_rounding_mode(::io::deephaven::proto::backplane::grpc::MathContext_RoundingMode value);
-
-  public:
-  // @@protoc_insertion_point(class_scope:io.deephaven.proto.backplane.grpc.MathContext)
- private:
-  class _Internal;
-
-  friend class ::google::protobuf::internal::TcParser;
-  static const ::google::protobuf::internal::TcParseTable<
-      1, 2, 0,
-      0, 2>
-      _table_;
-  friend class ::google::protobuf::MessageLite;
-  friend class ::google::protobuf::Arena;
-  template <typename T>
-  friend class ::google::protobuf::Arena::InternalHelper;
-  using InternalArenaConstructable_ = void;
-  using DestructorSkippable_ = void;
-  struct Impl_ {
-
-        inline explicit constexpr Impl_(
-            ::google::protobuf::internal::ConstantInitialized) noexcept;
-        inline explicit Impl_(::google::protobuf::internal::InternalVisibility visibility,
-                              ::google::protobuf::Arena* arena);
-        inline explicit Impl_(::google::protobuf::internal::InternalVisibility visibility,
-                              ::google::protobuf::Arena* arena, const Impl_& from);
-    ::int32_t precision_;
-    int rounding_mode_;
-    mutable ::google::protobuf::internal::CachedSize _cached_size_;
-    PROTOBUF_TSAN_DECLARE_MEMBER
-  };
-  union { Impl_ _impl_; };
-  friend struct ::TableStruct_deephaven_2fproto_2ftable_2eproto;
-};// -------------------------------------------------------------------
-
-class Literal final :
-    public ::google::protobuf::Message /* @@protoc_insertion_point(class_definition:io.deephaven.proto.backplane.grpc.Literal) */ {
- public:
-  inline Literal() : Literal(nullptr) {}
-  ~Literal() override;
-  template<typename = void>
-  explicit PROTOBUF_CONSTEXPR Literal(::google::protobuf::internal::ConstantInitialized);
-
-  inline Literal(const Literal& from)
-      : Literal(nullptr, from) {}
-  Literal(Literal&& from) noexcept
-    : Literal() {
-    *this = ::std::move(from);
-  }
-
-  inline Literal& operator=(const Literal& from) {
-    CopyFrom(from);
-    return *this;
-  }
-  inline Literal& operator=(Literal&& from) noexcept {
-    if (this == &from) return *this;
-    if (GetArena() == from.GetArena()
-  #ifdef PROTOBUF_FORCE_COPY_IN_MOVE
-        && GetArena() != nullptr
-  #endif  // !PROTOBUF_FORCE_COPY_IN_MOVE
-    ) {
-      InternalSwap(&from);
-    } else {
-      CopyFrom(from);
-    }
-    return *this;
-  }
-
-  inline const ::google::protobuf::UnknownFieldSet& unknown_fields() const
-      ABSL_ATTRIBUTE_LIFETIME_BOUND {
-    return _internal_metadata_.unknown_fields<::google::protobuf::UnknownFieldSet>(::google::protobuf::UnknownFieldSet::default_instance);
-  }
-  inline ::google::protobuf::UnknownFieldSet* mutable_unknown_fields()
-      ABSL_ATTRIBUTE_LIFETIME_BOUND {
-    return _internal_metadata_.mutable_unknown_fields<::google::protobuf::UnknownFieldSet>();
-  }
-
-  static const ::google::protobuf::Descriptor* descriptor() {
-    return GetDescriptor();
-  }
-  static const ::google::protobuf::Descriptor* GetDescriptor() {
-    return default_instance().GetMetadata().descriptor;
-  }
-  static const ::google::protobuf::Reflection* GetReflection() {
-    return default_instance().GetMetadata().reflection;
-  }
-  static const Literal& default_instance() {
-    return *internal_default_instance();
-  }
-  enum ValueCase {
-    kStringValue = 1,
-    kDoubleValue = 2,
-    kBoolValue = 3,
-    kLongValue = 4,
-    kNanoTimeValue = 5,
-    VALUE_NOT_SET = 0,
-  };
-
-  static inline const Literal* internal_default_instance() {
-    return reinterpret_cast<const Literal*>(
-               &_Literal_default_instance_);
-  }
-  static constexpr int kIndexInFileMessages =
-    98;
-
-  friend void swap(Literal& a, Literal& b) {
-    a.Swap(&b);
-  }
-  inline void Swap(Literal* other) {
-    if (other == this) return;
-  #ifdef PROTOBUF_FORCE_COPY_IN_SWAP
-    if (GetArena() != nullptr &&
-        GetArena() == other->GetArena()) {
-   #else  // PROTOBUF_FORCE_COPY_IN_SWAP
-    if (GetArena() == other->GetArena()) {
-  #endif  // !PROTOBUF_FORCE_COPY_IN_SWAP
-      InternalSwap(other);
-    } else {
-      ::google::protobuf::internal::GenericSwap(this, other);
-    }
-  }
-  void UnsafeArenaSwap(Literal* other) {
-    if (other == this) return;
-    ABSL_DCHECK(GetArena() == other->GetArena());
-    InternalSwap(other);
-  }
-
-  // implements Message ----------------------------------------------
-
-  Literal* New(::google::protobuf::Arena* arena = nullptr) const final {
-    return CreateMaybeMessage<Literal>(arena);
-  }
-  using ::google::protobuf::Message::CopyFrom;
-  void CopyFrom(const Literal& from);
-  using ::google::protobuf::Message::MergeFrom;
-  void MergeFrom( const Literal& from) {
-    Literal::MergeImpl(*this, from);
-  }
-  private:
-  static void MergeImpl(::google::protobuf::Message& to_msg, const ::google::protobuf::Message& from_msg);
-  public:
-  PROTOBUF_ATTRIBUTE_REINITIALIZES void Clear() final;
-  bool IsInitialized() const final;
-
-  ::size_t ByteSizeLong() const final;
-  const char* _InternalParse(const char* ptr, ::google::protobuf::internal::ParseContext* ctx) final;
-  ::uint8_t* _InternalSerialize(
-      ::uint8_t* target, ::google::protobuf::io::EpsCopyOutputStream* stream) const final;
-  int GetCachedSize() const { return _impl_._cached_size_.Get(); }
-
-  private:
-  ::google::protobuf::internal::CachedSize* AccessCachedSize() const final;
-  void SharedCtor(::google::protobuf::Arena* arena);
-  void SharedDtor();
-  void InternalSwap(Literal* other);
-
-  private:
-  friend class ::google::protobuf::internal::AnyMetadata;
-  static ::absl::string_view FullMessageName() {
-    return "io.deephaven.proto.backplane.grpc.Literal";
-  }
-  protected:
-  explicit Literal(::google::protobuf::Arena* arena);
-  Literal(::google::protobuf::Arena* arena, const Literal& from);
-  public:
-
-  static const ClassData _class_data_;
-  const ::google::protobuf::Message::ClassData*GetClassData() const final;
-
-  ::google::protobuf::Metadata GetMetadata() const final;
-
-  // nested types ----------------------------------------------------
-
-  // accessors -------------------------------------------------------
-
-  enum : int {
-    kStringValueFieldNumber = 1,
-    kDoubleValueFieldNumber = 2,
-    kBoolValueFieldNumber = 3,
-    kLongValueFieldNumber = 4,
-    kNanoTimeValueFieldNumber = 5,
-  };
-  // string string_value = 1;
-  bool has_string_value() const;
-  void clear_string_value() ;
-  const std::string& string_value() const;
-  template <typename Arg_ = const std::string&, typename... Args_>
-  void set_string_value(Arg_&& arg, Args_... args);
-  std::string* mutable_string_value();
-  PROTOBUF_NODISCARD std::string* release_string_value();
-  void set_allocated_string_value(std::string* value);
-
-  private:
-  const std::string& _internal_string_value() const;
-  inline PROTOBUF_ALWAYS_INLINE void _internal_set_string_value(
-      const std::string& value);
-  std::string* _internal_mutable_string_value();
-
-  public:
-  // double double_value = 2;
-  bool has_double_value() const;
-  void clear_double_value() ;
-  double double_value() const;
-  void set_double_value(double value);
-
-  private:
-  double _internal_double_value() const;
-  void _internal_set_double_value(double value);
-
-  public:
-  // bool bool_value = 3;
-  bool has_bool_value() const;
-  void clear_bool_value() ;
-  bool bool_value() const;
-  void set_bool_value(bool value);
-
-  private:
-  bool _internal_bool_value() const;
-  void _internal_set_bool_value(bool value);
-
-  public:
-  // sint64 long_value = 4 [jstype = JS_STRING];
-  bool has_long_value() const;
-  void clear_long_value() ;
-  ::int64_t long_value() const;
-  void set_long_value(::int64_t value);
-
-  private:
-  ::int64_t _internal_long_value() const;
-  void _internal_set_long_value(::int64_t value);
-
-  public:
-  // sint64 nano_time_value = 5 [jstype = JS_STRING];
-  bool has_nano_time_value() const;
-  void clear_nano_time_value() ;
-  ::int64_t nano_time_value() const;
-  void set_nano_time_value(::int64_t value);
-
-  private:
-  ::int64_t _internal_nano_time_value() const;
-  void _internal_set_nano_time_value(::int64_t value);
-
-  public:
-  void clear_value();
-  ValueCase value_case() const;
-  // @@protoc_insertion_point(class_scope:io.deephaven.proto.backplane.grpc.Literal)
- private:
-  class _Internal;
-  void set_has_string_value();
-  void set_has_double_value();
-  void set_has_bool_value();
-  void set_has_long_value();
-  void set_has_nano_time_value();
-
-  inline bool has_value() const;
-  inline void clear_has_value();
-
-  friend class ::google::protobuf::internal::TcParser;
-  static const ::google::protobuf::internal::TcParseTable<
-      0, 5, 0,
-      62, 2>
-      _table_;
-  friend class ::google::protobuf::MessageLite;
-  friend class ::google::protobuf::Arena;
-  template <typename T>
-  friend class ::google::protobuf::Arena::InternalHelper;
-  using InternalArenaConstructable_ = void;
-  using DestructorSkippable_ = void;
-  struct Impl_ {
-
-        inline explicit constexpr Impl_(
-            ::google::protobuf::internal::ConstantInitialized) noexcept;
-        inline explicit Impl_(::google::protobuf::internal::InternalVisibility visibility,
-                              ::google::protobuf::Arena* arena);
-        inline explicit Impl_(::google::protobuf::internal::InternalVisibility visibility,
-                              ::google::protobuf::Arena* arena, const Impl_& from);
-    union ValueUnion {
-      constexpr ValueUnion() : _constinit_{} {}
-        ::google::protobuf::internal::ConstantInitialized _constinit_;
-      ::google::protobuf::internal::ArenaStringPtr string_value_;
-      double double_value_;
-      bool bool_value_;
-      ::int64_t long_value_;
-      ::int64_t nano_time_value_;
-    } value_;
-    mutable ::google::protobuf::internal::CachedSize _cached_size_;
-    ::uint32_t _oneof_case_[1];
-
-    PROTOBUF_TSAN_DECLARE_MEMBER
-  };
-  union { Impl_ _impl_; };
-  friend struct ::TableStruct_deephaven_2fproto_2ftable_2eproto;
-};// -------------------------------------------------------------------
-
-class ExportedTableUpdatesRequest final :
-    public ::google::protobuf::internal::ZeroFieldsBase /* @@protoc_insertion_point(class_definition:io.deephaven.proto.backplane.grpc.ExportedTableUpdatesRequest) */ {
- public:
-  inline ExportedTableUpdatesRequest() : ExportedTableUpdatesRequest(nullptr) {}
-  template<typename = void>
-  explicit PROTOBUF_CONSTEXPR ExportedTableUpdatesRequest(::google::protobuf::internal::ConstantInitialized);
-
-  inline ExportedTableUpdatesRequest(const ExportedTableUpdatesRequest& from)
-      : ExportedTableUpdatesRequest(nullptr, from) {}
-  ExportedTableUpdatesRequest(ExportedTableUpdatesRequest&& from) noexcept
-    : ExportedTableUpdatesRequest() {
-    *this = ::std::move(from);
-  }
-
-  inline ExportedTableUpdatesRequest& operator=(const ExportedTableUpdatesRequest& from) {
-    CopyFrom(from);
-    return *this;
-  }
-  inline ExportedTableUpdatesRequest& operator=(ExportedTableUpdatesRequest&& from) noexcept {
-    if (this == &from) return *this;
-    if (GetArena() == from.GetArena()
-  #ifdef PROTOBUF_FORCE_COPY_IN_MOVE
-        && GetArena() != nullptr
-  #endif  // !PROTOBUF_FORCE_COPY_IN_MOVE
-    ) {
-      InternalSwap(&from);
-    } else {
-      CopyFrom(from);
-    }
-    return *this;
-  }
-
-  inline const ::google::protobuf::UnknownFieldSet& unknown_fields() const
-      ABSL_ATTRIBUTE_LIFETIME_BOUND {
-    return _internal_metadata_.unknown_fields<::google::protobuf::UnknownFieldSet>(::google::protobuf::UnknownFieldSet::default_instance);
-  }
-  inline ::google::protobuf::UnknownFieldSet* mutable_unknown_fields()
-      ABSL_ATTRIBUTE_LIFETIME_BOUND {
-    return _internal_metadata_.mutable_unknown_fields<::google::protobuf::UnknownFieldSet>();
-  }
-
-  static const ::google::protobuf::Descriptor* descriptor() {
-    return GetDescriptor();
-  }
-  static const ::google::protobuf::Descriptor* GetDescriptor() {
-    return default_instance().GetMetadata().descriptor;
-  }
-  static const ::google::protobuf::Reflection* GetReflection() {
-    return default_instance().GetMetadata().reflection;
-  }
-  static const ExportedTableUpdatesRequest& default_instance() {
-    return *internal_default_instance();
-  }
-  static inline const ExportedTableUpdatesRequest* internal_default_instance() {
-    return reinterpret_cast<const ExportedTableUpdatesRequest*>(
-               &_ExportedTableUpdatesRequest_default_instance_);
-  }
-  static constexpr int kIndexInFileMessages =
-    4;
-
-  friend void swap(ExportedTableUpdatesRequest& a, ExportedTableUpdatesRequest& b) {
-    a.Swap(&b);
-  }
-  inline void Swap(ExportedTableUpdatesRequest* other) {
-    if (other == this) return;
-  #ifdef PROTOBUF_FORCE_COPY_IN_SWAP
-    if (GetArena() != nullptr &&
-        GetArena() == other->GetArena()) {
-   #else  // PROTOBUF_FORCE_COPY_IN_SWAP
-    if (GetArena() == other->GetArena()) {
-  #endif  // !PROTOBUF_FORCE_COPY_IN_SWAP
-      InternalSwap(other);
-    } else {
-      ::google::protobuf::internal::GenericSwap(this, other);
-    }
-  }
-  void UnsafeArenaSwap(ExportedTableUpdatesRequest* other) {
-    if (other == this) return;
-    ABSL_DCHECK(GetArena() == other->GetArena());
-    InternalSwap(other);
-  }
-
-  // implements Message ----------------------------------------------
-
-  ExportedTableUpdatesRequest* New(::google::protobuf::Arena* arena = nullptr) const final {
-    return CreateMaybeMessage<ExportedTableUpdatesRequest>(arena);
-  }
-  using ::google::protobuf::internal::ZeroFieldsBase::CopyFrom;
-  inline void CopyFrom(const ExportedTableUpdatesRequest& from) {
-    ::google::protobuf::internal::ZeroFieldsBase::CopyImpl(*this, from);
-  }
-  using ::google::protobuf::internal::ZeroFieldsBase::MergeFrom;
-  void MergeFrom(const ExportedTableUpdatesRequest& from) {
-    ::google::protobuf::internal::ZeroFieldsBase::MergeImpl(*this, from);
-  }
-  public:
-
-  private:
-  friend class ::google::protobuf::internal::AnyMetadata;
-  static ::absl::string_view FullMessageName() {
-    return "io.deephaven.proto.backplane.grpc.ExportedTableUpdatesRequest";
-  }
-  protected:
-  explicit ExportedTableUpdatesRequest(::google::protobuf::Arena* arena);
-  ExportedTableUpdatesRequest(::google::protobuf::Arena* arena, const ExportedTableUpdatesRequest& from);
-  public:
-
-  ::google::protobuf::Metadata GetMetadata() const final;
-
-  // nested types ----------------------------------------------------
-
-  // accessors -------------------------------------------------------
-
-  // @@protoc_insertion_point(class_scope:io.deephaven.proto.backplane.grpc.ExportedTableUpdatesRequest)
- private:
-  class _Internal;
-
-  friend class ::google::protobuf::MessageLite;
-  friend class ::google::protobuf::Arena;
-  template <typename T>
-  friend class ::google::protobuf::Arena::InternalHelper;
-  using InternalArenaConstructable_ = void;
-  using DestructorSkippable_ = void;
-  struct Impl_ {
-
-        inline explicit constexpr Impl_(
-            ::google::protobuf::internal::ConstantInitialized) noexcept;
-        inline explicit Impl_(::google::protobuf::internal::InternalVisibility visibility,
-                              ::google::protobuf::Arena* arena);
-        inline explicit Impl_(::google::protobuf::internal::InternalVisibility visibility,
-                              ::google::protobuf::Arena* arena, const Impl_& from);
-    PROTOBUF_TSAN_DECLARE_MEMBER
-  };
-  friend struct ::TableStruct_deephaven_2fproto_2ftable_2eproto;
-};// -------------------------------------------------------------------
-
-class CreateInputTableRequest_InputTableKind_InMemoryKeyBacked final :
-    public ::google::protobuf::Message /* @@protoc_insertion_point(class_definition:io.deephaven.proto.backplane.grpc.CreateInputTableRequest.InputTableKind.InMemoryKeyBacked) */ {
- public:
-  inline CreateInputTableRequest_InputTableKind_InMemoryKeyBacked() : CreateInputTableRequest_InputTableKind_InMemoryKeyBacked(nullptr) {}
-  ~CreateInputTableRequest_InputTableKind_InMemoryKeyBacked() override;
-  template<typename = void>
-  explicit PROTOBUF_CONSTEXPR CreateInputTableRequest_InputTableKind_InMemoryKeyBacked(::google::protobuf::internal::ConstantInitialized);
-
-  inline CreateInputTableRequest_InputTableKind_InMemoryKeyBacked(const CreateInputTableRequest_InputTableKind_InMemoryKeyBacked& from)
-      : CreateInputTableRequest_InputTableKind_InMemoryKeyBacked(nullptr, from) {}
-  CreateInputTableRequest_InputTableKind_InMemoryKeyBacked(CreateInputTableRequest_InputTableKind_InMemoryKeyBacked&& from) noexcept
-    : CreateInputTableRequest_InputTableKind_InMemoryKeyBacked() {
-    *this = ::std::move(from);
-  }
-
-  inline CreateInputTableRequest_InputTableKind_InMemoryKeyBacked& operator=(const CreateInputTableRequest_InputTableKind_InMemoryKeyBacked& from) {
-    CopyFrom(from);
-    return *this;
-  }
-  inline CreateInputTableRequest_InputTableKind_InMemoryKeyBacked& operator=(CreateInputTableRequest_InputTableKind_InMemoryKeyBacked&& from) noexcept {
-    if (this == &from) return *this;
-    if (GetArena() == from.GetArena()
-  #ifdef PROTOBUF_FORCE_COPY_IN_MOVE
-        && GetArena() != nullptr
-  #endif  // !PROTOBUF_FORCE_COPY_IN_MOVE
-    ) {
-      InternalSwap(&from);
-    } else {
-      CopyFrom(from);
-    }
-    return *this;
-  }
-
-  inline const ::google::protobuf::UnknownFieldSet& unknown_fields() const
-      ABSL_ATTRIBUTE_LIFETIME_BOUND {
-    return _internal_metadata_.unknown_fields<::google::protobuf::UnknownFieldSet>(::google::protobuf::UnknownFieldSet::default_instance);
-  }
-  inline ::google::protobuf::UnknownFieldSet* mutable_unknown_fields()
-      ABSL_ATTRIBUTE_LIFETIME_BOUND {
-    return _internal_metadata_.mutable_unknown_fields<::google::protobuf::UnknownFieldSet>();
-  }
-
-  static const ::google::protobuf::Descriptor* descriptor() {
-    return GetDescriptor();
-  }
-  static const ::google::protobuf::Descriptor* GetDescriptor() {
-    return default_instance().GetMetadata().descriptor;
-  }
-  static const ::google::protobuf::Reflection* GetReflection() {
-    return default_instance().GetMetadata().reflection;
-  }
-  static const CreateInputTableRequest_InputTableKind_InMemoryKeyBacked& default_instance() {
-    return *internal_default_instance();
-  }
-  static inline const CreateInputTableRequest_InputTableKind_InMemoryKeyBacked* internal_default_instance() {
-    return reinterpret_cast<const CreateInputTableRequest_InputTableKind_InMemoryKeyBacked*>(
-               &_CreateInputTableRequest_InputTableKind_InMemoryKeyBacked_default_instance_);
-  }
-  static constexpr int kIndexInFileMessages =
-    116;
-
-  friend void swap(CreateInputTableRequest_InputTableKind_InMemoryKeyBacked& a, CreateInputTableRequest_InputTableKind_InMemoryKeyBacked& b) {
-    a.Swap(&b);
-  }
-  inline void Swap(CreateInputTableRequest_InputTableKind_InMemoryKeyBacked* other) {
-    if (other == this) return;
-  #ifdef PROTOBUF_FORCE_COPY_IN_SWAP
-    if (GetArena() != nullptr &&
-        GetArena() == other->GetArena()) {
-   #else  // PROTOBUF_FORCE_COPY_IN_SWAP
-    if (GetArena() == other->GetArena()) {
-  #endif  // !PROTOBUF_FORCE_COPY_IN_SWAP
-      InternalSwap(other);
-    } else {
-      ::google::protobuf::internal::GenericSwap(this, other);
-    }
-  }
-  void UnsafeArenaSwap(CreateInputTableRequest_InputTableKind_InMemoryKeyBacked* other) {
-    if (other == this) return;
-    ABSL_DCHECK(GetArena() == other->GetArena());
-    InternalSwap(other);
-  }
-
-  // implements Message ----------------------------------------------
-
-  CreateInputTableRequest_InputTableKind_InMemoryKeyBacked* New(::google::protobuf::Arena* arena = nullptr) const final {
-    return CreateMaybeMessage<CreateInputTableRequest_InputTableKind_InMemoryKeyBacked>(arena);
-  }
-  using ::google::protobuf::Message::CopyFrom;
-  void CopyFrom(const CreateInputTableRequest_InputTableKind_InMemoryKeyBacked& from);
-  using ::google::protobuf::Message::MergeFrom;
-  void MergeFrom( const CreateInputTableRequest_InputTableKind_InMemoryKeyBacked& from) {
-    CreateInputTableRequest_InputTableKind_InMemoryKeyBacked::MergeImpl(*this, from);
-  }
-  private:
-  static void MergeImpl(::google::protobuf::Message& to_msg, const ::google::protobuf::Message& from_msg);
-  public:
-  PROTOBUF_ATTRIBUTE_REINITIALIZES void Clear() final;
-  bool IsInitialized() const final;
-
-  ::size_t ByteSizeLong() const final;
-  const char* _InternalParse(const char* ptr, ::google::protobuf::internal::ParseContext* ctx) final;
-  ::uint8_t* _InternalSerialize(
-      ::uint8_t* target, ::google::protobuf::io::EpsCopyOutputStream* stream) const final;
-  int GetCachedSize() const { return _impl_._cached_size_.Get(); }
-
-  private:
-  ::google::protobuf::internal::CachedSize* AccessCachedSize() const final;
-  void SharedCtor(::google::protobuf::Arena* arena);
-  void SharedDtor();
-  void InternalSwap(CreateInputTableRequest_InputTableKind_InMemoryKeyBacked* other);
-
-  private:
-  friend class ::google::protobuf::internal::AnyMetadata;
-  static ::absl::string_view FullMessageName() {
-    return "io.deephaven.proto.backplane.grpc.CreateInputTableRequest.InputTableKind.InMemoryKeyBacked";
-  }
-  protected:
-  explicit CreateInputTableRequest_InputTableKind_InMemoryKeyBacked(::google::protobuf::Arena* arena);
-  CreateInputTableRequest_InputTableKind_InMemoryKeyBacked(::google::protobuf::Arena* arena, const CreateInputTableRequest_InputTableKind_InMemoryKeyBacked& from);
-  public:
-
-  static const ClassData _class_data_;
-  const ::google::protobuf::Message::ClassData*GetClassData() const final;
-
-  ::google::protobuf::Metadata GetMetadata() const final;
-
-  // nested types ----------------------------------------------------
-
-  // accessors -------------------------------------------------------
-
-  enum : int {
-    kKeyColumnsFieldNumber = 1,
-  };
-  // repeated string key_columns = 1;
-  int key_columns_size() const;
-  private:
-  int _internal_key_columns_size() const;
-
-  public:
-  void clear_key_columns() ;
-  const std::string& key_columns(int index) const;
-  std::string* mutable_key_columns(int index);
-  void set_key_columns(int index, const std::string& value);
-  void set_key_columns(int index, std::string&& value);
-  void set_key_columns(int index, const char* value);
-  void set_key_columns(int index, const char* value, std::size_t size);
-  void set_key_columns(int index, absl::string_view value);
-  std::string* add_key_columns();
-  void add_key_columns(const std::string& value);
-  void add_key_columns(std::string&& value);
-  void add_key_columns(const char* value);
-  void add_key_columns(const char* value, std::size_t size);
-  void add_key_columns(absl::string_view value);
-  const ::google::protobuf::RepeatedPtrField<std::string>& key_columns() const;
-  ::google::protobuf::RepeatedPtrField<std::string>* mutable_key_columns();
-
-  private:
-  const ::google::protobuf::RepeatedPtrField<std::string>& _internal_key_columns() const;
-  ::google::protobuf::RepeatedPtrField<std::string>* _internal_mutable_key_columns();
-
-  public:
-  // @@protoc_insertion_point(class_scope:io.deephaven.proto.backplane.grpc.CreateInputTableRequest.InputTableKind.InMemoryKeyBacked)
- private:
-  class _Internal;
-
-  friend class ::google::protobuf::internal::TcParser;
-  static const ::google::protobuf::internal::TcParseTable<
-      0, 1, 0,
-      110, 2>
-      _table_;
-  friend class ::google::protobuf::MessageLite;
-  friend class ::google::protobuf::Arena;
-  template <typename T>
-  friend class ::google::protobuf::Arena::InternalHelper;
-  using InternalArenaConstructable_ = void;
-  using DestructorSkippable_ = void;
-  struct Impl_ {
-
-        inline explicit constexpr Impl_(
-            ::google::protobuf::internal::ConstantInitialized) noexcept;
-        inline explicit Impl_(::google::protobuf::internal::InternalVisibility visibility,
-                              ::google::protobuf::Arena* arena);
-        inline explicit Impl_(::google::protobuf::internal::InternalVisibility visibility,
-                              ::google::protobuf::Arena* arena, const Impl_& from);
-    ::google::protobuf::RepeatedPtrField<std::string> key_columns_;
-    mutable ::google::protobuf::internal::CachedSize _cached_size_;
-    PROTOBUF_TSAN_DECLARE_MEMBER
-  };
-  union { Impl_ _impl_; };
-  friend struct ::TableStruct_deephaven_2fproto_2ftable_2eproto;
-};// -------------------------------------------------------------------
-
-class CreateInputTableRequest_InputTableKind_InMemoryAppendOnly final :
-    public ::google::protobuf::internal::ZeroFieldsBase /* @@protoc_insertion_point(class_definition:io.deephaven.proto.backplane.grpc.CreateInputTableRequest.InputTableKind.InMemoryAppendOnly) */ {
- public:
-  inline CreateInputTableRequest_InputTableKind_InMemoryAppendOnly() : CreateInputTableRequest_InputTableKind_InMemoryAppendOnly(nullptr) {}
-  template<typename = void>
-  explicit PROTOBUF_CONSTEXPR CreateInputTableRequest_InputTableKind_InMemoryAppendOnly(::google::protobuf::internal::ConstantInitialized);
-
-  inline CreateInputTableRequest_InputTableKind_InMemoryAppendOnly(const CreateInputTableRequest_InputTableKind_InMemoryAppendOnly& from)
-      : CreateInputTableRequest_InputTableKind_InMemoryAppendOnly(nullptr, from) {}
-  CreateInputTableRequest_InputTableKind_InMemoryAppendOnly(CreateInputTableRequest_InputTableKind_InMemoryAppendOnly&& from) noexcept
-    : CreateInputTableRequest_InputTableKind_InMemoryAppendOnly() {
-    *this = ::std::move(from);
-  }
-
-  inline CreateInputTableRequest_InputTableKind_InMemoryAppendOnly& operator=(const CreateInputTableRequest_InputTableKind_InMemoryAppendOnly& from) {
-    CopyFrom(from);
-    return *this;
-  }
-  inline CreateInputTableRequest_InputTableKind_InMemoryAppendOnly& operator=(CreateInputTableRequest_InputTableKind_InMemoryAppendOnly&& from) noexcept {
-    if (this == &from) return *this;
-    if (GetArena() == from.GetArena()
-  #ifdef PROTOBUF_FORCE_COPY_IN_MOVE
-        && GetArena() != nullptr
-  #endif  // !PROTOBUF_FORCE_COPY_IN_MOVE
-    ) {
-      InternalSwap(&from);
-    } else {
-      CopyFrom(from);
-    }
-    return *this;
-  }
-
-  inline const ::google::protobuf::UnknownFieldSet& unknown_fields() const
-      ABSL_ATTRIBUTE_LIFETIME_BOUND {
-    return _internal_metadata_.unknown_fields<::google::protobuf::UnknownFieldSet>(::google::protobuf::UnknownFieldSet::default_instance);
-  }
-  inline ::google::protobuf::UnknownFieldSet* mutable_unknown_fields()
-      ABSL_ATTRIBUTE_LIFETIME_BOUND {
-    return _internal_metadata_.mutable_unknown_fields<::google::protobuf::UnknownFieldSet>();
-  }
-
-  static const ::google::protobuf::Descriptor* descriptor() {
-    return GetDescriptor();
-  }
-  static const ::google::protobuf::Descriptor* GetDescriptor() {
-    return default_instance().GetMetadata().descriptor;
-  }
-  static const ::google::protobuf::Reflection* GetReflection() {
-    return default_instance().GetMetadata().reflection;
-  }
-  static const CreateInputTableRequest_InputTableKind_InMemoryAppendOnly& default_instance() {
-    return *internal_default_instance();
-  }
-  static inline const CreateInputTableRequest_InputTableKind_InMemoryAppendOnly* internal_default_instance() {
-    return reinterpret_cast<const CreateInputTableRequest_InputTableKind_InMemoryAppendOnly*>(
-               &_CreateInputTableRequest_InputTableKind_InMemoryAppendOnly_default_instance_);
-  }
-  static constexpr int kIndexInFileMessages =
-    115;
-
-  friend void swap(CreateInputTableRequest_InputTableKind_InMemoryAppendOnly& a, CreateInputTableRequest_InputTableKind_InMemoryAppendOnly& b) {
-    a.Swap(&b);
-  }
-  inline void Swap(CreateInputTableRequest_InputTableKind_InMemoryAppendOnly* other) {
-    if (other == this) return;
-  #ifdef PROTOBUF_FORCE_COPY_IN_SWAP
-    if (GetArena() != nullptr &&
-        GetArena() == other->GetArena()) {
-   #else  // PROTOBUF_FORCE_COPY_IN_SWAP
-    if (GetArena() == other->GetArena()) {
-  #endif  // !PROTOBUF_FORCE_COPY_IN_SWAP
-      InternalSwap(other);
-    } else {
-      ::google::protobuf::internal::GenericSwap(this, other);
-    }
-  }
-  void UnsafeArenaSwap(CreateInputTableRequest_InputTableKind_InMemoryAppendOnly* other) {
-    if (other == this) return;
-    ABSL_DCHECK(GetArena() == other->GetArena());
-    InternalSwap(other);
-  }
-
-  // implements Message ----------------------------------------------
-
-  CreateInputTableRequest_InputTableKind_InMemoryAppendOnly* New(::google::protobuf::Arena* arena = nullptr) const final {
-    return CreateMaybeMessage<CreateInputTableRequest_InputTableKind_InMemoryAppendOnly>(arena);
-  }
-  using ::google::protobuf::internal::ZeroFieldsBase::CopyFrom;
-  inline void CopyFrom(const CreateInputTableRequest_InputTableKind_InMemoryAppendOnly& from) {
-    ::google::protobuf::internal::ZeroFieldsBase::CopyImpl(*this, from);
-  }
-  using ::google::protobuf::internal::ZeroFieldsBase::MergeFrom;
-  void MergeFrom(const CreateInputTableRequest_InputTableKind_InMemoryAppendOnly& from) {
-    ::google::protobuf::internal::ZeroFieldsBase::MergeImpl(*this, from);
-  }
-  public:
-
-  private:
-  friend class ::google::protobuf::internal::AnyMetadata;
-  static ::absl::string_view FullMessageName() {
-    return "io.deephaven.proto.backplane.grpc.CreateInputTableRequest.InputTableKind.InMemoryAppendOnly";
-  }
-  protected:
-  explicit CreateInputTableRequest_InputTableKind_InMemoryAppendOnly(::google::protobuf::Arena* arena);
-  CreateInputTableRequest_InputTableKind_InMemoryAppendOnly(::google::protobuf::Arena* arena, const CreateInputTableRequest_InputTableKind_InMemoryAppendOnly& from);
-  public:
-
-  ::google::protobuf::Metadata GetMetadata() const final;
-
-  // nested types ----------------------------------------------------
-
-  // accessors -------------------------------------------------------
-
-  // @@protoc_insertion_point(class_scope:io.deephaven.proto.backplane.grpc.CreateInputTableRequest.InputTableKind.InMemoryAppendOnly)
- private:
-  class _Internal;
-
-  friend class ::google::protobuf::MessageLite;
-  friend class ::google::protobuf::Arena;
-  template <typename T>
-  friend class ::google::protobuf::Arena::InternalHelper;
-  using InternalArenaConstructable_ = void;
-  using DestructorSkippable_ = void;
-  struct Impl_ {
-
-        inline explicit constexpr Impl_(
-            ::google::protobuf::internal::ConstantInitialized) noexcept;
-        inline explicit Impl_(::google::protobuf::internal::InternalVisibility visibility,
-                              ::google::protobuf::Arena* arena);
-        inline explicit Impl_(::google::protobuf::internal::InternalVisibility visibility,
-                              ::google::protobuf::Arena* arena, const Impl_& from);
-    PROTOBUF_TSAN_DECLARE_MEMBER
-  };
-  friend struct ::TableStruct_deephaven_2fproto_2ftable_2eproto;
-};// -------------------------------------------------------------------
-
-class CreateInputTableRequest_InputTableKind_Blink final :
-    public ::google::protobuf::internal::ZeroFieldsBase /* @@protoc_insertion_point(class_definition:io.deephaven.proto.backplane.grpc.CreateInputTableRequest.InputTableKind.Blink) */ {
- public:
-  inline CreateInputTableRequest_InputTableKind_Blink() : CreateInputTableRequest_InputTableKind_Blink(nullptr) {}
-  template<typename = void>
-  explicit PROTOBUF_CONSTEXPR CreateInputTableRequest_InputTableKind_Blink(::google::protobuf::internal::ConstantInitialized);
-
-  inline CreateInputTableRequest_InputTableKind_Blink(const CreateInputTableRequest_InputTableKind_Blink& from)
-      : CreateInputTableRequest_InputTableKind_Blink(nullptr, from) {}
-  CreateInputTableRequest_InputTableKind_Blink(CreateInputTableRequest_InputTableKind_Blink&& from) noexcept
-    : CreateInputTableRequest_InputTableKind_Blink() {
-    *this = ::std::move(from);
-  }
-
-  inline CreateInputTableRequest_InputTableKind_Blink& operator=(const CreateInputTableRequest_InputTableKind_Blink& from) {
-    CopyFrom(from);
-    return *this;
-  }
-  inline CreateInputTableRequest_InputTableKind_Blink& operator=(CreateInputTableRequest_InputTableKind_Blink&& from) noexcept {
-    if (this == &from) return *this;
-    if (GetArena() == from.GetArena()
-  #ifdef PROTOBUF_FORCE_COPY_IN_MOVE
-        && GetArena() != nullptr
-  #endif  // !PROTOBUF_FORCE_COPY_IN_MOVE
-    ) {
-      InternalSwap(&from);
-    } else {
-      CopyFrom(from);
-    }
-    return *this;
-  }
-
-  inline const ::google::protobuf::UnknownFieldSet& unknown_fields() const
-      ABSL_ATTRIBUTE_LIFETIME_BOUND {
-    return _internal_metadata_.unknown_fields<::google::protobuf::UnknownFieldSet>(::google::protobuf::UnknownFieldSet::default_instance);
-  }
-  inline ::google::protobuf::UnknownFieldSet* mutable_unknown_fields()
-      ABSL_ATTRIBUTE_LIFETIME_BOUND {
-    return _internal_metadata_.mutable_unknown_fields<::google::protobuf::UnknownFieldSet>();
-  }
-
-  static const ::google::protobuf::Descriptor* descriptor() {
-    return GetDescriptor();
-  }
-  static const ::google::protobuf::Descriptor* GetDescriptor() {
-    return default_instance().GetMetadata().descriptor;
-  }
-  static const ::google::protobuf::Reflection* GetReflection() {
-    return default_instance().GetMetadata().reflection;
-  }
-  static const CreateInputTableRequest_InputTableKind_Blink& default_instance() {
-    return *internal_default_instance();
-  }
-  static inline const CreateInputTableRequest_InputTableKind_Blink* internal_default_instance() {
-    return reinterpret_cast<const CreateInputTableRequest_InputTableKind_Blink*>(
-               &_CreateInputTableRequest_InputTableKind_Blink_default_instance_);
-  }
-  static constexpr int kIndexInFileMessages =
-    117;
-
-  friend void swap(CreateInputTableRequest_InputTableKind_Blink& a, CreateInputTableRequest_InputTableKind_Blink& b) {
-    a.Swap(&b);
-  }
-  inline void Swap(CreateInputTableRequest_InputTableKind_Blink* other) {
-    if (other == this) return;
-  #ifdef PROTOBUF_FORCE_COPY_IN_SWAP
-    if (GetArena() != nullptr &&
-        GetArena() == other->GetArena()) {
-   #else  // PROTOBUF_FORCE_COPY_IN_SWAP
-    if (GetArena() == other->GetArena()) {
-  #endif  // !PROTOBUF_FORCE_COPY_IN_SWAP
-      InternalSwap(other);
-    } else {
-      ::google::protobuf::internal::GenericSwap(this, other);
-    }
-  }
-  void UnsafeArenaSwap(CreateInputTableRequest_InputTableKind_Blink* other) {
-    if (other == this) return;
-    ABSL_DCHECK(GetArena() == other->GetArena());
-    InternalSwap(other);
-  }
-
-  // implements Message ----------------------------------------------
-
-  CreateInputTableRequest_InputTableKind_Blink* New(::google::protobuf::Arena* arena = nullptr) const final {
-    return CreateMaybeMessage<CreateInputTableRequest_InputTableKind_Blink>(arena);
-  }
-  using ::google::protobuf::internal::ZeroFieldsBase::CopyFrom;
-  inline void CopyFrom(const CreateInputTableRequest_InputTableKind_Blink& from) {
-    ::google::protobuf::internal::ZeroFieldsBase::CopyImpl(*this, from);
-  }
-  using ::google::protobuf::internal::ZeroFieldsBase::MergeFrom;
-  void MergeFrom(const CreateInputTableRequest_InputTableKind_Blink& from) {
-    ::google::protobuf::internal::ZeroFieldsBase::MergeImpl(*this, from);
-  }
-  public:
-
-  private:
-  friend class ::google::protobuf::internal::AnyMetadata;
-  static ::absl::string_view FullMessageName() {
-    return "io.deephaven.proto.backplane.grpc.CreateInputTableRequest.InputTableKind.Blink";
-  }
-  protected:
-  explicit CreateInputTableRequest_InputTableKind_Blink(::google::protobuf::Arena* arena);
-  CreateInputTableRequest_InputTableKind_Blink(::google::protobuf::Arena* arena, const CreateInputTableRequest_InputTableKind_Blink& from);
-  public:
-
-  ::google::protobuf::Metadata GetMetadata() const final;
-
-  // nested types ----------------------------------------------------
-
-  // accessors -------------------------------------------------------
-
-  // @@protoc_insertion_point(class_scope:io.deephaven.proto.backplane.grpc.CreateInputTableRequest.InputTableKind.Blink)
- private:
-  class _Internal;
-
-  friend class ::google::protobuf::MessageLite;
-  friend class ::google::protobuf::Arena;
-  template <typename T>
-  friend class ::google::protobuf::Arena::InternalHelper;
-  using InternalArenaConstructable_ = void;
-  using DestructorSkippable_ = void;
-  struct Impl_ {
-
-        inline explicit constexpr Impl_(
-            ::google::protobuf::internal::ConstantInitialized) noexcept;
-        inline explicit Impl_(::google::protobuf::internal::InternalVisibility visibility,
-                              ::google::protobuf::Arena* arena);
-        inline explicit Impl_(::google::protobuf::internal::InternalVisibility visibility,
-                              ::google::protobuf::Arena* arena, const Impl_& from);
-    PROTOBUF_TSAN_DECLARE_MEMBER
-  };
-  friend struct ::TableStruct_deephaven_2fproto_2ftable_2eproto;
-};// -------------------------------------------------------------------
-
-class ComboAggregateRequest_Aggregate final :
-    public ::google::protobuf::Message /* @@protoc_insertion_point(class_definition:io.deephaven.proto.backplane.grpc.ComboAggregateRequest.Aggregate) */ {
- public:
-  inline ComboAggregateRequest_Aggregate() : ComboAggregateRequest_Aggregate(nullptr) {}
-  ~ComboAggregateRequest_Aggregate() override;
-  template<typename = void>
-  explicit PROTOBUF_CONSTEXPR ComboAggregateRequest_Aggregate(::google::protobuf::internal::ConstantInitialized);
-
-  inline ComboAggregateRequest_Aggregate(const ComboAggregateRequest_Aggregate& from)
-      : ComboAggregateRequest_Aggregate(nullptr, from) {}
-  ComboAggregateRequest_Aggregate(ComboAggregateRequest_Aggregate&& from) noexcept
-    : ComboAggregateRequest_Aggregate() {
-    *this = ::std::move(from);
-  }
-
-  inline ComboAggregateRequest_Aggregate& operator=(const ComboAggregateRequest_Aggregate& from) {
-    CopyFrom(from);
-    return *this;
-  }
-  inline ComboAggregateRequest_Aggregate& operator=(ComboAggregateRequest_Aggregate&& from) noexcept {
-    if (this == &from) return *this;
-    if (GetArena() == from.GetArena()
-  #ifdef PROTOBUF_FORCE_COPY_IN_MOVE
-        && GetArena() != nullptr
-  #endif  // !PROTOBUF_FORCE_COPY_IN_MOVE
-    ) {
-      InternalSwap(&from);
-    } else {
-      CopyFrom(from);
-    }
-    return *this;
-  }
-
-  inline const ::google::protobuf::UnknownFieldSet& unknown_fields() const
-      ABSL_ATTRIBUTE_LIFETIME_BOUND {
-    return _internal_metadata_.unknown_fields<::google::protobuf::UnknownFieldSet>(::google::protobuf::UnknownFieldSet::default_instance);
-  }
-  inline ::google::protobuf::UnknownFieldSet* mutable_unknown_fields()
-      ABSL_ATTRIBUTE_LIFETIME_BOUND {
-    return _internal_metadata_.mutable_unknown_fields<::google::protobuf::UnknownFieldSet>();
-  }
-
-  static const ::google::protobuf::Descriptor* descriptor() {
-    return GetDescriptor();
-  }
-  static const ::google::protobuf::Descriptor* GetDescriptor() {
-    return default_instance().GetMetadata().descriptor;
-  }
-  static const ::google::protobuf::Reflection* GetReflection() {
-    return default_instance().GetMetadata().reflection;
-  }
-  static const ComboAggregateRequest_Aggregate& default_instance() {
-    return *internal_default_instance();
-  }
-  static inline const ComboAggregateRequest_Aggregate* internal_default_instance() {
-    return reinterpret_cast<const ComboAggregateRequest_Aggregate*>(
-               &_ComboAggregateRequest_Aggregate_default_instance_);
-  }
-  static constexpr int kIndexInFileMessages =
-    59;
-
-  friend void swap(ComboAggregateRequest_Aggregate& a, ComboAggregateRequest_Aggregate& b) {
-    a.Swap(&b);
-  }
-  inline void Swap(ComboAggregateRequest_Aggregate* other) {
-    if (other == this) return;
-  #ifdef PROTOBUF_FORCE_COPY_IN_SWAP
-    if (GetArena() != nullptr &&
-        GetArena() == other->GetArena()) {
-   #else  // PROTOBUF_FORCE_COPY_IN_SWAP
-    if (GetArena() == other->GetArena()) {
-  #endif  // !PROTOBUF_FORCE_COPY_IN_SWAP
-      InternalSwap(other);
-    } else {
-      ::google::protobuf::internal::GenericSwap(this, other);
-    }
-  }
-  void UnsafeArenaSwap(ComboAggregateRequest_Aggregate* other) {
-    if (other == this) return;
-    ABSL_DCHECK(GetArena() == other->GetArena());
-    InternalSwap(other);
-  }
-
-  // implements Message ----------------------------------------------
-
-  ComboAggregateRequest_Aggregate* New(::google::protobuf::Arena* arena = nullptr) const final {
-    return CreateMaybeMessage<ComboAggregateRequest_Aggregate>(arena);
-  }
-  using ::google::protobuf::Message::CopyFrom;
-  void CopyFrom(const ComboAggregateRequest_Aggregate& from);
-  using ::google::protobuf::Message::MergeFrom;
-  void MergeFrom( const ComboAggregateRequest_Aggregate& from) {
-    ComboAggregateRequest_Aggregate::MergeImpl(*this, from);
-  }
-  private:
-  static void MergeImpl(::google::protobuf::Message& to_msg, const ::google::protobuf::Message& from_msg);
-  public:
-  PROTOBUF_ATTRIBUTE_REINITIALIZES void Clear() final;
-  bool IsInitialized() const final;
-
-  ::size_t ByteSizeLong() const final;
-  const char* _InternalParse(const char* ptr, ::google::protobuf::internal::ParseContext* ctx) final;
-  ::uint8_t* _InternalSerialize(
-      ::uint8_t* target, ::google::protobuf::io::EpsCopyOutputStream* stream) const final;
-  int GetCachedSize() const { return _impl_._cached_size_.Get(); }
-
-  private:
-  ::google::protobuf::internal::CachedSize* AccessCachedSize() const final;
-  void SharedCtor(::google::protobuf::Arena* arena);
-  void SharedDtor();
-  void InternalSwap(ComboAggregateRequest_Aggregate* other);
-
-  private:
-  friend class ::google::protobuf::internal::AnyMetadata;
-  static ::absl::string_view FullMessageName() {
-    return "io.deephaven.proto.backplane.grpc.ComboAggregateRequest.Aggregate";
-  }
-  protected:
-  explicit ComboAggregateRequest_Aggregate(::google::protobuf::Arena* arena);
-  ComboAggregateRequest_Aggregate(::google::protobuf::Arena* arena, const ComboAggregateRequest_Aggregate& from);
-  public:
-
-  static const ClassData _class_data_;
-  const ::google::protobuf::Message::ClassData*GetClassData() const final;
-
-  ::google::protobuf::Metadata GetMetadata() const final;
-
-  // nested types ----------------------------------------------------
-
-  // accessors -------------------------------------------------------
-
-  enum : int {
-    kMatchPairsFieldNumber = 2,
-    kColumnNameFieldNumber = 3,
-    kTypeFieldNumber = 1,
-    kAvgMedianFieldNumber = 5,
-    kPercentileFieldNumber = 4,
-  };
-  // repeated string match_pairs = 2;
-  int match_pairs_size() const;
-  private:
-  int _internal_match_pairs_size() const;
-
-  public:
-  void clear_match_pairs() ;
-  const std::string& match_pairs(int index) const;
-  std::string* mutable_match_pairs(int index);
-  void set_match_pairs(int index, const std::string& value);
-  void set_match_pairs(int index, std::string&& value);
-  void set_match_pairs(int index, const char* value);
-  void set_match_pairs(int index, const char* value, std::size_t size);
-  void set_match_pairs(int index, absl::string_view value);
-  std::string* add_match_pairs();
-  void add_match_pairs(const std::string& value);
-  void add_match_pairs(std::string&& value);
-  void add_match_pairs(const char* value);
-  void add_match_pairs(const char* value, std::size_t size);
-  void add_match_pairs(absl::string_view value);
-  const ::google::protobuf::RepeatedPtrField<std::string>& match_pairs() const;
-  ::google::protobuf::RepeatedPtrField<std::string>* mutable_match_pairs();
-
-  private:
-  const ::google::protobuf::RepeatedPtrField<std::string>& _internal_match_pairs() const;
-  ::google::protobuf::RepeatedPtrField<std::string>* _internal_mutable_match_pairs();
-
-  public:
-  // string column_name = 3;
-  void clear_column_name() ;
-  const std::string& column_name() const;
-  template <typename Arg_ = const std::string&, typename... Args_>
-  void set_column_name(Arg_&& arg, Args_... args);
-  std::string* mutable_column_name();
-  PROTOBUF_NODISCARD std::string* release_column_name();
-  void set_allocated_column_name(std::string* value);
-
-  private:
-  const std::string& _internal_column_name() const;
-  inline PROTOBUF_ALWAYS_INLINE void _internal_set_column_name(
-      const std::string& value);
-  std::string* _internal_mutable_column_name();
-
-  public:
-  // .io.deephaven.proto.backplane.grpc.ComboAggregateRequest.AggType type = 1;
-  void clear_type() ;
-  ::io::deephaven::proto::backplane::grpc::ComboAggregateRequest_AggType type() const;
-  void set_type(::io::deephaven::proto::backplane::grpc::ComboAggregateRequest_AggType value);
-
-  private:
-  ::io::deephaven::proto::backplane::grpc::ComboAggregateRequest_AggType _internal_type() const;
-  void _internal_set_type(::io::deephaven::proto::backplane::grpc::ComboAggregateRequest_AggType value);
-
-  public:
-  // bool avg_median = 5;
-  void clear_avg_median() ;
-  bool avg_median() const;
-  void set_avg_median(bool value);
-
-  private:
-  bool _internal_avg_median() const;
-  void _internal_set_avg_median(bool value);
-
-  public:
-  // double percentile = 4;
-  void clear_percentile() ;
-  double percentile() const;
-  void set_percentile(double value);
-
-  private:
-  double _internal_percentile() const;
-  void _internal_set_percentile(double value);
-
-  public:
-  // @@protoc_insertion_point(class_scope:io.deephaven.proto.backplane.grpc.ComboAggregateRequest.Aggregate)
- private:
-  class _Internal;
-
-  friend class ::google::protobuf::internal::TcParser;
-  static const ::google::protobuf::internal::TcParseTable<
-      3, 5, 0,
-      96, 2>
-      _table_;
-  friend class ::google::protobuf::MessageLite;
-  friend class ::google::protobuf::Arena;
-  template <typename T>
-  friend class ::google::protobuf::Arena::InternalHelper;
-  using InternalArenaConstructable_ = void;
-  using DestructorSkippable_ = void;
-  struct Impl_ {
-
-        inline explicit constexpr Impl_(
-            ::google::protobuf::internal::ConstantInitialized) noexcept;
-        inline explicit Impl_(::google::protobuf::internal::InternalVisibility visibility,
-                              ::google::protobuf::Arena* arena);
-        inline explicit Impl_(::google::protobuf::internal::InternalVisibility visibility,
-                              ::google::protobuf::Arena* arena, const Impl_& from);
-    ::google::protobuf::RepeatedPtrField<std::string> match_pairs_;
-    ::google::protobuf::internal::ArenaStringPtr column_name_;
-    int type_;
-    bool avg_median_;
-    double percentile_;
-    mutable ::google::protobuf::internal::CachedSize _cached_size_;
-    PROTOBUF_TSAN_DECLARE_MEMBER
-  };
-  union { Impl_ _impl_; };
-  friend struct ::TableStruct_deephaven_2fproto_2ftable_2eproto;
-};// -------------------------------------------------------------------
-
-class Aggregation_AggregationRowKey final :
-    public ::google::protobuf::Message /* @@protoc_insertion_point(class_definition:io.deephaven.proto.backplane.grpc.Aggregation.AggregationRowKey) */ {
- public:
-  inline Aggregation_AggregationRowKey() : Aggregation_AggregationRowKey(nullptr) {}
-  ~Aggregation_AggregationRowKey() override;
-  template<typename = void>
-  explicit PROTOBUF_CONSTEXPR Aggregation_AggregationRowKey(::google::protobuf::internal::ConstantInitialized);
-
-  inline Aggregation_AggregationRowKey(const Aggregation_AggregationRowKey& from)
-      : Aggregation_AggregationRowKey(nullptr, from) {}
-  Aggregation_AggregationRowKey(Aggregation_AggregationRowKey&& from) noexcept
-    : Aggregation_AggregationRowKey() {
-    *this = ::std::move(from);
-  }
-
-  inline Aggregation_AggregationRowKey& operator=(const Aggregation_AggregationRowKey& from) {
-    CopyFrom(from);
-    return *this;
-  }
-  inline Aggregation_AggregationRowKey& operator=(Aggregation_AggregationRowKey&& from) noexcept {
-    if (this == &from) return *this;
-    if (GetArena() == from.GetArena()
-  #ifdef PROTOBUF_FORCE_COPY_IN_MOVE
-        && GetArena() != nullptr
-  #endif  // !PROTOBUF_FORCE_COPY_IN_MOVE
-    ) {
-      InternalSwap(&from);
-    } else {
-      CopyFrom(from);
-    }
-    return *this;
-  }
-
-  inline const ::google::protobuf::UnknownFieldSet& unknown_fields() const
-      ABSL_ATTRIBUTE_LIFETIME_BOUND {
-    return _internal_metadata_.unknown_fields<::google::protobuf::UnknownFieldSet>(::google::protobuf::UnknownFieldSet::default_instance);
-  }
-  inline ::google::protobuf::UnknownFieldSet* mutable_unknown_fields()
-      ABSL_ATTRIBUTE_LIFETIME_BOUND {
-    return _internal_metadata_.mutable_unknown_fields<::google::protobuf::UnknownFieldSet>();
-  }
-
-  static const ::google::protobuf::Descriptor* descriptor() {
-    return GetDescriptor();
-  }
-  static const ::google::protobuf::Descriptor* GetDescriptor() {
-    return default_instance().GetMetadata().descriptor;
-  }
-  static const ::google::protobuf::Reflection* GetReflection() {
-    return default_instance().GetMetadata().reflection;
-  }
-  static const Aggregation_AggregationRowKey& default_instance() {
-    return *internal_default_instance();
-  }
-  static inline const Aggregation_AggregationRowKey* internal_default_instance() {
-    return reinterpret_cast<const Aggregation_AggregationRowKey*>(
-               &_Aggregation_AggregationRowKey_default_instance_);
-  }
-  static constexpr int kIndexInFileMessages =
-    89;
-
-  friend void swap(Aggregation_AggregationRowKey& a, Aggregation_AggregationRowKey& b) {
-    a.Swap(&b);
-  }
-  inline void Swap(Aggregation_AggregationRowKey* other) {
-    if (other == this) return;
-  #ifdef PROTOBUF_FORCE_COPY_IN_SWAP
-    if (GetArena() != nullptr &&
-        GetArena() == other->GetArena()) {
-   #else  // PROTOBUF_FORCE_COPY_IN_SWAP
-    if (GetArena() == other->GetArena()) {
-  #endif  // !PROTOBUF_FORCE_COPY_IN_SWAP
-      InternalSwap(other);
-    } else {
-      ::google::protobuf::internal::GenericSwap(this, other);
-    }
-  }
-  void UnsafeArenaSwap(Aggregation_AggregationRowKey* other) {
-    if (other == this) return;
-    ABSL_DCHECK(GetArena() == other->GetArena());
-    InternalSwap(other);
-  }
-
-  // implements Message ----------------------------------------------
-
-  Aggregation_AggregationRowKey* New(::google::protobuf::Arena* arena = nullptr) const final {
-    return CreateMaybeMessage<Aggregation_AggregationRowKey>(arena);
-  }
-  using ::google::protobuf::Message::CopyFrom;
-  void CopyFrom(const Aggregation_AggregationRowKey& from);
-  using ::google::protobuf::Message::MergeFrom;
-  void MergeFrom( const Aggregation_AggregationRowKey& from) {
-    Aggregation_AggregationRowKey::MergeImpl(*this, from);
-  }
-  private:
-  static void MergeImpl(::google::protobuf::Message& to_msg, const ::google::protobuf::Message& from_msg);
-  public:
-  PROTOBUF_ATTRIBUTE_REINITIALIZES void Clear() final;
-  bool IsInitialized() const final;
-
-  ::size_t ByteSizeLong() const final;
-  const char* _InternalParse(const char* ptr, ::google::protobuf::internal::ParseContext* ctx) final;
-  ::uint8_t* _InternalSerialize(
-      ::uint8_t* target, ::google::protobuf::io::EpsCopyOutputStream* stream) const final;
-  int GetCachedSize() const { return _impl_._cached_size_.Get(); }
-
-  private:
-  ::google::protobuf::internal::CachedSize* AccessCachedSize() const final;
-  void SharedCtor(::google::protobuf::Arena* arena);
-  void SharedDtor();
-  void InternalSwap(Aggregation_AggregationRowKey* other);
-
-  private:
-  friend class ::google::protobuf::internal::AnyMetadata;
-  static ::absl::string_view FullMessageName() {
-    return "io.deephaven.proto.backplane.grpc.Aggregation.AggregationRowKey";
-  }
-  protected:
-  explicit Aggregation_AggregationRowKey(::google::protobuf::Arena* arena);
-  Aggregation_AggregationRowKey(::google::protobuf::Arena* arena, const Aggregation_AggregationRowKey& from);
-  public:
-
-  static const ClassData _class_data_;
-  const ::google::protobuf::Message::ClassData*GetClassData() const final;
-
-  ::google::protobuf::Metadata GetMetadata() const final;
-
-  // nested types ----------------------------------------------------
-
-  // accessors -------------------------------------------------------
-
-  enum : int {
-    kColumnNameFieldNumber = 1,
-  };
-  // string column_name = 1;
-  void clear_column_name() ;
-  const std::string& column_name() const;
-  template <typename Arg_ = const std::string&, typename... Args_>
-  void set_column_name(Arg_&& arg, Args_... args);
-  std::string* mutable_column_name();
-  PROTOBUF_NODISCARD std::string* release_column_name();
-  void set_allocated_column_name(std::string* value);
-
-  private:
-  const std::string& _internal_column_name() const;
-  inline PROTOBUF_ALWAYS_INLINE void _internal_set_column_name(
-      const std::string& value);
-  std::string* _internal_mutable_column_name();
-
-  public:
-  // @@protoc_insertion_point(class_scope:io.deephaven.proto.backplane.grpc.Aggregation.AggregationRowKey)
- private:
-  class _Internal;
-
-  friend class ::google::protobuf::internal::TcParser;
-  static const ::google::protobuf::internal::TcParseTable<
-      0, 1, 0,
-      83, 2>
-      _table_;
-  friend class ::google::protobuf::MessageLite;
-  friend class ::google::protobuf::Arena;
-  template <typename T>
-  friend class ::google::protobuf::Arena::InternalHelper;
-  using InternalArenaConstructable_ = void;
-  using DestructorSkippable_ = void;
-  struct Impl_ {
-
-        inline explicit constexpr Impl_(
-            ::google::protobuf::internal::ConstantInitialized) noexcept;
-        inline explicit Impl_(::google::protobuf::internal::InternalVisibility visibility,
-                              ::google::protobuf::Arena* arena);
-        inline explicit Impl_(::google::protobuf::internal::InternalVisibility visibility,
-                              ::google::protobuf::Arena* arena, const Impl_& from);
-    ::google::protobuf::internal::ArenaStringPtr column_name_;
-    mutable ::google::protobuf::internal::CachedSize _cached_size_;
-    PROTOBUF_TSAN_DECLARE_MEMBER
-  };
-  union { Impl_ _impl_; };
-  friend struct ::TableStruct_deephaven_2fproto_2ftable_2eproto;
-};// -------------------------------------------------------------------
-
-class Aggregation_AggregationPartition final :
-    public ::google::protobuf::Message /* @@protoc_insertion_point(class_definition:io.deephaven.proto.backplane.grpc.Aggregation.AggregationPartition) */ {
- public:
-  inline Aggregation_AggregationPartition() : Aggregation_AggregationPartition(nullptr) {}
-  ~Aggregation_AggregationPartition() override;
-  template<typename = void>
-  explicit PROTOBUF_CONSTEXPR Aggregation_AggregationPartition(::google::protobuf::internal::ConstantInitialized);
-
-  inline Aggregation_AggregationPartition(const Aggregation_AggregationPartition& from)
-      : Aggregation_AggregationPartition(nullptr, from) {}
-  Aggregation_AggregationPartition(Aggregation_AggregationPartition&& from) noexcept
-    : Aggregation_AggregationPartition() {
-    *this = ::std::move(from);
-  }
-
-  inline Aggregation_AggregationPartition& operator=(const Aggregation_AggregationPartition& from) {
-    CopyFrom(from);
-    return *this;
-  }
-  inline Aggregation_AggregationPartition& operator=(Aggregation_AggregationPartition&& from) noexcept {
-    if (this == &from) return *this;
-    if (GetArena() == from.GetArena()
-  #ifdef PROTOBUF_FORCE_COPY_IN_MOVE
-        && GetArena() != nullptr
-  #endif  // !PROTOBUF_FORCE_COPY_IN_MOVE
-    ) {
-      InternalSwap(&from);
-    } else {
-      CopyFrom(from);
-    }
-    return *this;
-  }
-
-  inline const ::google::protobuf::UnknownFieldSet& unknown_fields() const
-      ABSL_ATTRIBUTE_LIFETIME_BOUND {
-    return _internal_metadata_.unknown_fields<::google::protobuf::UnknownFieldSet>(::google::protobuf::UnknownFieldSet::default_instance);
-  }
-  inline ::google::protobuf::UnknownFieldSet* mutable_unknown_fields()
-      ABSL_ATTRIBUTE_LIFETIME_BOUND {
-    return _internal_metadata_.mutable_unknown_fields<::google::protobuf::UnknownFieldSet>();
-  }
-
-  static const ::google::protobuf::Descriptor* descriptor() {
-    return GetDescriptor();
-  }
-  static const ::google::protobuf::Descriptor* GetDescriptor() {
-    return default_instance().GetMetadata().descriptor;
-  }
-  static const ::google::protobuf::Reflection* GetReflection() {
-    return default_instance().GetMetadata().reflection;
-  }
-  static const Aggregation_AggregationPartition& default_instance() {
-    return *internal_default_instance();
-  }
-  static inline const Aggregation_AggregationPartition* internal_default_instance() {
-    return reinterpret_cast<const Aggregation_AggregationPartition*>(
-               &_Aggregation_AggregationPartition_default_instance_);
-  }
-  static constexpr int kIndexInFileMessages =
-    90;
-
-  friend void swap(Aggregation_AggregationPartition& a, Aggregation_AggregationPartition& b) {
-    a.Swap(&b);
-  }
-  inline void Swap(Aggregation_AggregationPartition* other) {
-    if (other == this) return;
-  #ifdef PROTOBUF_FORCE_COPY_IN_SWAP
-    if (GetArena() != nullptr &&
-        GetArena() == other->GetArena()) {
-   #else  // PROTOBUF_FORCE_COPY_IN_SWAP
-    if (GetArena() == other->GetArena()) {
-  #endif  // !PROTOBUF_FORCE_COPY_IN_SWAP
-      InternalSwap(other);
-    } else {
-      ::google::protobuf::internal::GenericSwap(this, other);
-    }
-  }
-  void UnsafeArenaSwap(Aggregation_AggregationPartition* other) {
-    if (other == this) return;
-    ABSL_DCHECK(GetArena() == other->GetArena());
-    InternalSwap(other);
-  }
-
-  // implements Message ----------------------------------------------
-
-  Aggregation_AggregationPartition* New(::google::protobuf::Arena* arena = nullptr) const final {
-    return CreateMaybeMessage<Aggregation_AggregationPartition>(arena);
-  }
-  using ::google::protobuf::Message::CopyFrom;
-  void CopyFrom(const Aggregation_AggregationPartition& from);
-  using ::google::protobuf::Message::MergeFrom;
-  void MergeFrom( const Aggregation_AggregationPartition& from) {
-    Aggregation_AggregationPartition::MergeImpl(*this, from);
-  }
-  private:
-  static void MergeImpl(::google::protobuf::Message& to_msg, const ::google::protobuf::Message& from_msg);
-  public:
-  PROTOBUF_ATTRIBUTE_REINITIALIZES void Clear() final;
-  bool IsInitialized() const final;
-
-  ::size_t ByteSizeLong() const final;
-  const char* _InternalParse(const char* ptr, ::google::protobuf::internal::ParseContext* ctx) final;
-  ::uint8_t* _InternalSerialize(
-      ::uint8_t* target, ::google::protobuf::io::EpsCopyOutputStream* stream) const final;
-  int GetCachedSize() const { return _impl_._cached_size_.Get(); }
-
-  private:
-  ::google::protobuf::internal::CachedSize* AccessCachedSize() const final;
-  void SharedCtor(::google::protobuf::Arena* arena);
-  void SharedDtor();
-  void InternalSwap(Aggregation_AggregationPartition* other);
-
-  private:
-  friend class ::google::protobuf::internal::AnyMetadata;
-  static ::absl::string_view FullMessageName() {
-    return "io.deephaven.proto.backplane.grpc.Aggregation.AggregationPartition";
-  }
-  protected:
-  explicit Aggregation_AggregationPartition(::google::protobuf::Arena* arena);
-  Aggregation_AggregationPartition(::google::protobuf::Arena* arena, const Aggregation_AggregationPartition& from);
-  public:
-
-  static const ClassData _class_data_;
-  const ::google::protobuf::Message::ClassData*GetClassData() const final;
-
-  ::google::protobuf::Metadata GetMetadata() const final;
-
-  // nested types ----------------------------------------------------
-
-  // accessors -------------------------------------------------------
-
-  enum : int {
-    kColumnNameFieldNumber = 1,
-    kIncludeGroupByColumnsFieldNumber = 2,
-  };
-  // string column_name = 1;
-  void clear_column_name() ;
-  const std::string& column_name() const;
-  template <typename Arg_ = const std::string&, typename... Args_>
-  void set_column_name(Arg_&& arg, Args_... args);
-  std::string* mutable_column_name();
-  PROTOBUF_NODISCARD std::string* release_column_name();
-  void set_allocated_column_name(std::string* value);
-
-  private:
-  const std::string& _internal_column_name() const;
-  inline PROTOBUF_ALWAYS_INLINE void _internal_set_column_name(
-      const std::string& value);
-  std::string* _internal_mutable_column_name();
-
-  public:
-  // bool include_group_by_columns = 2;
-  void clear_include_group_by_columns() ;
-  bool include_group_by_columns() const;
-  void set_include_group_by_columns(bool value);
-
-  private:
-  bool _internal_include_group_by_columns() const;
-  void _internal_set_include_group_by_columns(bool value);
-
-  public:
-  // @@protoc_insertion_point(class_scope:io.deephaven.proto.backplane.grpc.Aggregation.AggregationPartition)
- private:
-  class _Internal;
-
-  friend class ::google::protobuf::internal::TcParser;
-  static const ::google::protobuf::internal::TcParseTable<
-      1, 2, 0,
-      86, 2>
-      _table_;
-  friend class ::google::protobuf::MessageLite;
-  friend class ::google::protobuf::Arena;
-  template <typename T>
-  friend class ::google::protobuf::Arena::InternalHelper;
-  using InternalArenaConstructable_ = void;
-  using DestructorSkippable_ = void;
-  struct Impl_ {
-
-        inline explicit constexpr Impl_(
-            ::google::protobuf::internal::ConstantInitialized) noexcept;
-        inline explicit Impl_(::google::protobuf::internal::InternalVisibility visibility,
-                              ::google::protobuf::Arena* arena);
-        inline explicit Impl_(::google::protobuf::internal::InternalVisibility visibility,
-                              ::google::protobuf::Arena* arena, const Impl_& from);
-    ::google::protobuf::internal::ArenaStringPtr column_name_;
-    bool include_group_by_columns_;
-    mutable ::google::protobuf::internal::CachedSize _cached_size_;
-    PROTOBUF_TSAN_DECLARE_MEMBER
-  };
-  union { Impl_ _impl_; };
-  friend struct ::TableStruct_deephaven_2fproto_2ftable_2eproto;
-};// -------------------------------------------------------------------
-
-class Aggregation_AggregationCount final :
-    public ::google::protobuf::Message /* @@protoc_insertion_point(class_definition:io.deephaven.proto.backplane.grpc.Aggregation.AggregationCount) */ {
- public:
-  inline Aggregation_AggregationCount() : Aggregation_AggregationCount(nullptr) {}
-  ~Aggregation_AggregationCount() override;
-  template<typename = void>
-  explicit PROTOBUF_CONSTEXPR Aggregation_AggregationCount(::google::protobuf::internal::ConstantInitialized);
-
-  inline Aggregation_AggregationCount(const Aggregation_AggregationCount& from)
-      : Aggregation_AggregationCount(nullptr, from) {}
-  Aggregation_AggregationCount(Aggregation_AggregationCount&& from) noexcept
-    : Aggregation_AggregationCount() {
-    *this = ::std::move(from);
-  }
-
-  inline Aggregation_AggregationCount& operator=(const Aggregation_AggregationCount& from) {
-    CopyFrom(from);
-    return *this;
-  }
-  inline Aggregation_AggregationCount& operator=(Aggregation_AggregationCount&& from) noexcept {
-    if (this == &from) return *this;
-    if (GetArena() == from.GetArena()
-  #ifdef PROTOBUF_FORCE_COPY_IN_MOVE
-        && GetArena() != nullptr
-  #endif  // !PROTOBUF_FORCE_COPY_IN_MOVE
-    ) {
-      InternalSwap(&from);
-    } else {
-      CopyFrom(from);
-    }
-    return *this;
-  }
-
-  inline const ::google::protobuf::UnknownFieldSet& unknown_fields() const
-      ABSL_ATTRIBUTE_LIFETIME_BOUND {
-    return _internal_metadata_.unknown_fields<::google::protobuf::UnknownFieldSet>(::google::protobuf::UnknownFieldSet::default_instance);
-  }
-  inline ::google::protobuf::UnknownFieldSet* mutable_unknown_fields()
-      ABSL_ATTRIBUTE_LIFETIME_BOUND {
-    return _internal_metadata_.mutable_unknown_fields<::google::protobuf::UnknownFieldSet>();
-  }
-
-  static const ::google::protobuf::Descriptor* descriptor() {
-    return GetDescriptor();
-  }
-  static const ::google::protobuf::Descriptor* GetDescriptor() {
-    return default_instance().GetMetadata().descriptor;
-  }
-  static const ::google::protobuf::Reflection* GetReflection() {
-    return default_instance().GetMetadata().reflection;
-  }
-  static const Aggregation_AggregationCount& default_instance() {
-    return *internal_default_instance();
-  }
-  static inline const Aggregation_AggregationCount* internal_default_instance() {
-    return reinterpret_cast<const Aggregation_AggregationCount*>(
-               &_Aggregation_AggregationCount_default_instance_);
-  }
-  static constexpr int kIndexInFileMessages =
-    88;
-
-  friend void swap(Aggregation_AggregationCount& a, Aggregation_AggregationCount& b) {
-    a.Swap(&b);
-  }
-  inline void Swap(Aggregation_AggregationCount* other) {
-    if (other == this) return;
-  #ifdef PROTOBUF_FORCE_COPY_IN_SWAP
-    if (GetArena() != nullptr &&
-        GetArena() == other->GetArena()) {
-   #else  // PROTOBUF_FORCE_COPY_IN_SWAP
-    if (GetArena() == other->GetArena()) {
-  #endif  // !PROTOBUF_FORCE_COPY_IN_SWAP
-      InternalSwap(other);
-    } else {
-      ::google::protobuf::internal::GenericSwap(this, other);
-    }
-  }
-  void UnsafeArenaSwap(Aggregation_AggregationCount* other) {
-    if (other == this) return;
-    ABSL_DCHECK(GetArena() == other->GetArena());
-    InternalSwap(other);
-  }
-
-  // implements Message ----------------------------------------------
-
-  Aggregation_AggregationCount* New(::google::protobuf::Arena* arena = nullptr) const final {
-    return CreateMaybeMessage<Aggregation_AggregationCount>(arena);
-  }
-  using ::google::protobuf::Message::CopyFrom;
-  void CopyFrom(const Aggregation_AggregationCount& from);
-  using ::google::protobuf::Message::MergeFrom;
-  void MergeFrom( const Aggregation_AggregationCount& from) {
-    Aggregation_AggregationCount::MergeImpl(*this, from);
-  }
-  private:
-  static void MergeImpl(::google::protobuf::Message& to_msg, const ::google::protobuf::Message& from_msg);
-  public:
-  PROTOBUF_ATTRIBUTE_REINITIALIZES void Clear() final;
-  bool IsInitialized() const final;
-
-  ::size_t ByteSizeLong() const final;
-  const char* _InternalParse(const char* ptr, ::google::protobuf::internal::ParseContext* ctx) final;
-  ::uint8_t* _InternalSerialize(
-      ::uint8_t* target, ::google::protobuf::io::EpsCopyOutputStream* stream) const final;
-  int GetCachedSize() const { return _impl_._cached_size_.Get(); }
-
-  private:
-  ::google::protobuf::internal::CachedSize* AccessCachedSize() const final;
-  void SharedCtor(::google::protobuf::Arena* arena);
-  void SharedDtor();
-  void InternalSwap(Aggregation_AggregationCount* other);
-
-  private:
-  friend class ::google::protobuf::internal::AnyMetadata;
-  static ::absl::string_view FullMessageName() {
-    return "io.deephaven.proto.backplane.grpc.Aggregation.AggregationCount";
-  }
-  protected:
-  explicit Aggregation_AggregationCount(::google::protobuf::Arena* arena);
-  Aggregation_AggregationCount(::google::protobuf::Arena* arena, const Aggregation_AggregationCount& from);
-  public:
-
-  static const ClassData _class_data_;
-  const ::google::protobuf::Message::ClassData*GetClassData() const final;
-
-  ::google::protobuf::Metadata GetMetadata() const final;
-
-  // nested types ----------------------------------------------------
-
-  // accessors -------------------------------------------------------
-
-  enum : int {
-    kColumnNameFieldNumber = 1,
-  };
-  // string column_name = 1;
-  void clear_column_name() ;
-  const std::string& column_name() const;
-  template <typename Arg_ = const std::string&, typename... Args_>
-  void set_column_name(Arg_&& arg, Args_... args);
-  std::string* mutable_column_name();
-  PROTOBUF_NODISCARD std::string* release_column_name();
-  void set_allocated_column_name(std::string* value);
-
-  private:
-  const std::string& _internal_column_name() const;
-  inline PROTOBUF_ALWAYS_INLINE void _internal_set_column_name(
-      const std::string& value);
-  std::string* _internal_mutable_column_name();
-
-  public:
-  // @@protoc_insertion_point(class_scope:io.deephaven.proto.backplane.grpc.Aggregation.AggregationCount)
- private:
-  class _Internal;
-
-  friend class ::google::protobuf::internal::TcParser;
-  static const ::google::protobuf::internal::TcParseTable<
-      0, 1, 0,
-      82, 2>
-      _table_;
-  friend class ::google::protobuf::MessageLite;
-  friend class ::google::protobuf::Arena;
-  template <typename T>
-  friend class ::google::protobuf::Arena::InternalHelper;
-  using InternalArenaConstructable_ = void;
-  using DestructorSkippable_ = void;
-  struct Impl_ {
-
-        inline explicit constexpr Impl_(
-            ::google::protobuf::internal::ConstantInitialized) noexcept;
-        inline explicit Impl_(::google::protobuf::internal::InternalVisibility visibility,
-                              ::google::protobuf::Arena* arena);
-        inline explicit Impl_(::google::protobuf::internal::InternalVisibility visibility,
-                              ::google::protobuf::Arena* arena, const Impl_& from);
-    ::google::protobuf::internal::ArenaStringPtr column_name_;
-    mutable ::google::protobuf::internal::CachedSize _cached_size_;
-    PROTOBUF_TSAN_DECLARE_MEMBER
-  };
-  union { Impl_ _impl_; };
-  friend struct ::TableStruct_deephaven_2fproto_2ftable_2eproto;
-};// -------------------------------------------------------------------
-
-class AggSpec_AggSpecWeighted final :
-    public ::google::protobuf::Message /* @@protoc_insertion_point(class_definition:io.deephaven.proto.backplane.grpc.AggSpec.AggSpecWeighted) */ {
- public:
-  inline AggSpec_AggSpecWeighted() : AggSpec_AggSpecWeighted(nullptr) {}
-  ~AggSpec_AggSpecWeighted() override;
-  template<typename = void>
-  explicit PROTOBUF_CONSTEXPR AggSpec_AggSpecWeighted(::google::protobuf::internal::ConstantInitialized);
-
-  inline AggSpec_AggSpecWeighted(const AggSpec_AggSpecWeighted& from)
-      : AggSpec_AggSpecWeighted(nullptr, from) {}
-  AggSpec_AggSpecWeighted(AggSpec_AggSpecWeighted&& from) noexcept
-    : AggSpec_AggSpecWeighted() {
-    *this = ::std::move(from);
-  }
-
-  inline AggSpec_AggSpecWeighted& operator=(const AggSpec_AggSpecWeighted& from) {
-    CopyFrom(from);
-    return *this;
-  }
-  inline AggSpec_AggSpecWeighted& operator=(AggSpec_AggSpecWeighted&& from) noexcept {
-    if (this == &from) return *this;
-    if (GetArena() == from.GetArena()
-  #ifdef PROTOBUF_FORCE_COPY_IN_MOVE
-        && GetArena() != nullptr
-  #endif  // !PROTOBUF_FORCE_COPY_IN_MOVE
-    ) {
-      InternalSwap(&from);
-    } else {
-      CopyFrom(from);
-    }
-    return *this;
-  }
-
-  inline const ::google::protobuf::UnknownFieldSet& unknown_fields() const
-      ABSL_ATTRIBUTE_LIFETIME_BOUND {
-    return _internal_metadata_.unknown_fields<::google::protobuf::UnknownFieldSet>(::google::protobuf::UnknownFieldSet::default_instance);
-  }
-  inline ::google::protobuf::UnknownFieldSet* mutable_unknown_fields()
-      ABSL_ATTRIBUTE_LIFETIME_BOUND {
-    return _internal_metadata_.mutable_unknown_fields<::google::protobuf::UnknownFieldSet>();
-  }
-
-  static const ::google::protobuf::Descriptor* descriptor() {
-    return GetDescriptor();
-  }
-  static const ::google::protobuf::Descriptor* GetDescriptor() {
-    return default_instance().GetMetadata().descriptor;
-  }
-  static const ::google::protobuf::Reflection* GetReflection() {
-    return default_instance().GetMetadata().reflection;
-  }
-  static const AggSpec_AggSpecWeighted& default_instance() {
-    return *internal_default_instance();
-  }
-  static inline const AggSpec_AggSpecWeighted* internal_default_instance() {
-    return reinterpret_cast<const AggSpec_AggSpecWeighted*>(
-               &_AggSpec_AggSpecWeighted_default_instance_);
-  }
-  static constexpr int kIndexInFileMessages =
-    73;
-
-  friend void swap(AggSpec_AggSpecWeighted& a, AggSpec_AggSpecWeighted& b) {
-    a.Swap(&b);
-  }
-  inline void Swap(AggSpec_AggSpecWeighted* other) {
-    if (other == this) return;
-  #ifdef PROTOBUF_FORCE_COPY_IN_SWAP
-    if (GetArena() != nullptr &&
-        GetArena() == other->GetArena()) {
-   #else  // PROTOBUF_FORCE_COPY_IN_SWAP
-    if (GetArena() == other->GetArena()) {
-  #endif  // !PROTOBUF_FORCE_COPY_IN_SWAP
-      InternalSwap(other);
-    } else {
-      ::google::protobuf::internal::GenericSwap(this, other);
-    }
-  }
-  void UnsafeArenaSwap(AggSpec_AggSpecWeighted* other) {
-    if (other == this) return;
-    ABSL_DCHECK(GetArena() == other->GetArena());
-    InternalSwap(other);
-  }
-
-  // implements Message ----------------------------------------------
-
-  AggSpec_AggSpecWeighted* New(::google::protobuf::Arena* arena = nullptr) const final {
-    return CreateMaybeMessage<AggSpec_AggSpecWeighted>(arena);
-  }
-  using ::google::protobuf::Message::CopyFrom;
-  void CopyFrom(const AggSpec_AggSpecWeighted& from);
-  using ::google::protobuf::Message::MergeFrom;
-  void MergeFrom( const AggSpec_AggSpecWeighted& from) {
-    AggSpec_AggSpecWeighted::MergeImpl(*this, from);
-  }
-  private:
-  static void MergeImpl(::google::protobuf::Message& to_msg, const ::google::protobuf::Message& from_msg);
-  public:
-  PROTOBUF_ATTRIBUTE_REINITIALIZES void Clear() final;
-  bool IsInitialized() const final;
-
-  ::size_t ByteSizeLong() const final;
-  const char* _InternalParse(const char* ptr, ::google::protobuf::internal::ParseContext* ctx) final;
-  ::uint8_t* _InternalSerialize(
-      ::uint8_t* target, ::google::protobuf::io::EpsCopyOutputStream* stream) const final;
-  int GetCachedSize() const { return _impl_._cached_size_.Get(); }
-
-  private:
-  ::google::protobuf::internal::CachedSize* AccessCachedSize() const final;
-  void SharedCtor(::google::protobuf::Arena* arena);
-  void SharedDtor();
-  void InternalSwap(AggSpec_AggSpecWeighted* other);
-
-  private:
-  friend class ::google::protobuf::internal::AnyMetadata;
-  static ::absl::string_view FullMessageName() {
-    return "io.deephaven.proto.backplane.grpc.AggSpec.AggSpecWeighted";
-  }
-  protected:
-  explicit AggSpec_AggSpecWeighted(::google::protobuf::Arena* arena);
-  AggSpec_AggSpecWeighted(::google::protobuf::Arena* arena, const AggSpec_AggSpecWeighted& from);
-  public:
-
-  static const ClassData _class_data_;
-  const ::google::protobuf::Message::ClassData*GetClassData() const final;
-
-  ::google::protobuf::Metadata GetMetadata() const final;
-
-  // nested types ----------------------------------------------------
-
-  // accessors -------------------------------------------------------
-
-  enum : int {
-    kWeightColumnFieldNumber = 1,
-  };
-  // string weight_column = 1;
-  void clear_weight_column() ;
-  const std::string& weight_column() const;
-  template <typename Arg_ = const std::string&, typename... Args_>
-  void set_weight_column(Arg_&& arg, Args_... args);
-  std::string* mutable_weight_column();
-  PROTOBUF_NODISCARD std::string* release_weight_column();
-  void set_allocated_weight_column(std::string* value);
-
-  private:
-  const std::string& _internal_weight_column() const;
-  inline PROTOBUF_ALWAYS_INLINE void _internal_set_weight_column(
-      const std::string& value);
-  std::string* _internal_mutable_weight_column();
-
-  public:
-  // @@protoc_insertion_point(class_scope:io.deephaven.proto.backplane.grpc.AggSpec.AggSpecWeighted)
- private:
-  class _Internal;
-
-  friend class ::google::protobuf::internal::TcParser;
-  static const ::google::protobuf::internal::TcParseTable<
-      0, 1, 0,
-      79, 2>
-      _table_;
-  friend class ::google::protobuf::MessageLite;
-  friend class ::google::protobuf::Arena;
-  template <typename T>
-  friend class ::google::protobuf::Arena::InternalHelper;
-  using InternalArenaConstructable_ = void;
-  using DestructorSkippable_ = void;
-  struct Impl_ {
-
-        inline explicit constexpr Impl_(
-            ::google::protobuf::internal::ConstantInitialized) noexcept;
-        inline explicit Impl_(::google::protobuf::internal::InternalVisibility visibility,
-                              ::google::protobuf::Arena* arena);
-        inline explicit Impl_(::google::protobuf::internal::InternalVisibility visibility,
-                              ::google::protobuf::Arena* arena, const Impl_& from);
-    ::google::protobuf::internal::ArenaStringPtr weight_column_;
-    mutable ::google::protobuf::internal::CachedSize _cached_size_;
-    PROTOBUF_TSAN_DECLARE_MEMBER
-  };
-  union { Impl_ _impl_; };
-  friend struct ::TableStruct_deephaven_2fproto_2ftable_2eproto;
-};// -------------------------------------------------------------------
-
-class AggSpec_AggSpecVar final :
-    public ::google::protobuf::internal::ZeroFieldsBase /* @@protoc_insertion_point(class_definition:io.deephaven.proto.backplane.grpc.AggSpec.AggSpecVar) */ {
- public:
-  inline AggSpec_AggSpecVar() : AggSpec_AggSpecVar(nullptr) {}
-  template<typename = void>
-  explicit PROTOBUF_CONSTEXPR AggSpec_AggSpecVar(::google::protobuf::internal::ConstantInitialized);
-
-  inline AggSpec_AggSpecVar(const AggSpec_AggSpecVar& from)
-      : AggSpec_AggSpecVar(nullptr, from) {}
-  AggSpec_AggSpecVar(AggSpec_AggSpecVar&& from) noexcept
-    : AggSpec_AggSpecVar() {
-    *this = ::std::move(from);
-  }
-
-  inline AggSpec_AggSpecVar& operator=(const AggSpec_AggSpecVar& from) {
-    CopyFrom(from);
-    return *this;
-  }
-  inline AggSpec_AggSpecVar& operator=(AggSpec_AggSpecVar&& from) noexcept {
-    if (this == &from) return *this;
-    if (GetArena() == from.GetArena()
-  #ifdef PROTOBUF_FORCE_COPY_IN_MOVE
-        && GetArena() != nullptr
-  #endif  // !PROTOBUF_FORCE_COPY_IN_MOVE
-    ) {
-      InternalSwap(&from);
-    } else {
-      CopyFrom(from);
-    }
-    return *this;
-  }
-
-  inline const ::google::protobuf::UnknownFieldSet& unknown_fields() const
-      ABSL_ATTRIBUTE_LIFETIME_BOUND {
-    return _internal_metadata_.unknown_fields<::google::protobuf::UnknownFieldSet>(::google::protobuf::UnknownFieldSet::default_instance);
-  }
-  inline ::google::protobuf::UnknownFieldSet* mutable_unknown_fields()
-      ABSL_ATTRIBUTE_LIFETIME_BOUND {
-    return _internal_metadata_.mutable_unknown_fields<::google::protobuf::UnknownFieldSet>();
-  }
-
-  static const ::google::protobuf::Descriptor* descriptor() {
-    return GetDescriptor();
-  }
-  static const ::google::protobuf::Descriptor* GetDescriptor() {
-    return default_instance().GetMetadata().descriptor;
-  }
-  static const ::google::protobuf::Reflection* GetReflection() {
-    return default_instance().GetMetadata().reflection;
-  }
-  static const AggSpec_AggSpecVar& default_instance() {
-    return *internal_default_instance();
-  }
-  static inline const AggSpec_AggSpecVar* internal_default_instance() {
-    return reinterpret_cast<const AggSpec_AggSpecVar*>(
-               &_AggSpec_AggSpecVar_default_instance_);
-  }
-  static constexpr int kIndexInFileMessages =
-    84;
-
-  friend void swap(AggSpec_AggSpecVar& a, AggSpec_AggSpecVar& b) {
-    a.Swap(&b);
-  }
-  inline void Swap(AggSpec_AggSpecVar* other) {
-    if (other == this) return;
-  #ifdef PROTOBUF_FORCE_COPY_IN_SWAP
-    if (GetArena() != nullptr &&
-        GetArena() == other->GetArena()) {
-   #else  // PROTOBUF_FORCE_COPY_IN_SWAP
-    if (GetArena() == other->GetArena()) {
-  #endif  // !PROTOBUF_FORCE_COPY_IN_SWAP
-      InternalSwap(other);
-    } else {
-      ::google::protobuf::internal::GenericSwap(this, other);
-    }
-  }
-  void UnsafeArenaSwap(AggSpec_AggSpecVar* other) {
-    if (other == this) return;
-    ABSL_DCHECK(GetArena() == other->GetArena());
-    InternalSwap(other);
-  }
-
-  // implements Message ----------------------------------------------
-
-  AggSpec_AggSpecVar* New(::google::protobuf::Arena* arena = nullptr) const final {
-    return CreateMaybeMessage<AggSpec_AggSpecVar>(arena);
-  }
-  using ::google::protobuf::internal::ZeroFieldsBase::CopyFrom;
-  inline void CopyFrom(const AggSpec_AggSpecVar& from) {
-    ::google::protobuf::internal::ZeroFieldsBase::CopyImpl(*this, from);
-  }
-  using ::google::protobuf::internal::ZeroFieldsBase::MergeFrom;
-  void MergeFrom(const AggSpec_AggSpecVar& from) {
-    ::google::protobuf::internal::ZeroFieldsBase::MergeImpl(*this, from);
-  }
-  public:
-
-  private:
-  friend class ::google::protobuf::internal::AnyMetadata;
-  static ::absl::string_view FullMessageName() {
-    return "io.deephaven.proto.backplane.grpc.AggSpec.AggSpecVar";
-  }
-  protected:
-  explicit AggSpec_AggSpecVar(::google::protobuf::Arena* arena);
-  AggSpec_AggSpecVar(::google::protobuf::Arena* arena, const AggSpec_AggSpecVar& from);
-  public:
-
-  ::google::protobuf::Metadata GetMetadata() const final;
-
-  // nested types ----------------------------------------------------
-
-  // accessors -------------------------------------------------------
-
-  // @@protoc_insertion_point(class_scope:io.deephaven.proto.backplane.grpc.AggSpec.AggSpecVar)
- private:
-  class _Internal;
-
-  friend class ::google::protobuf::MessageLite;
-  friend class ::google::protobuf::Arena;
-  template <typename T>
-  friend class ::google::protobuf::Arena::InternalHelper;
-  using InternalArenaConstructable_ = void;
-  using DestructorSkippable_ = void;
-  struct Impl_ {
-
-        inline explicit constexpr Impl_(
-            ::google::protobuf::internal::ConstantInitialized) noexcept;
-        inline explicit Impl_(::google::protobuf::internal::InternalVisibility visibility,
-                              ::google::protobuf::Arena* arena);
-        inline explicit Impl_(::google::protobuf::internal::InternalVisibility visibility,
-                              ::google::protobuf::Arena* arena, const Impl_& from);
-    PROTOBUF_TSAN_DECLARE_MEMBER
-  };
-  friend struct ::TableStruct_deephaven_2fproto_2ftable_2eproto;
-};// -------------------------------------------------------------------
-
-class AggSpec_AggSpecTDigest final :
-    public ::google::protobuf::Message /* @@protoc_insertion_point(class_definition:io.deephaven.proto.backplane.grpc.AggSpec.AggSpecTDigest) */ {
- public:
-  inline AggSpec_AggSpecTDigest() : AggSpec_AggSpecTDigest(nullptr) {}
-  ~AggSpec_AggSpecTDigest() override;
-  template<typename = void>
-  explicit PROTOBUF_CONSTEXPR AggSpec_AggSpecTDigest(::google::protobuf::internal::ConstantInitialized);
-
-  inline AggSpec_AggSpecTDigest(const AggSpec_AggSpecTDigest& from)
-      : AggSpec_AggSpecTDigest(nullptr, from) {}
-  AggSpec_AggSpecTDigest(AggSpec_AggSpecTDigest&& from) noexcept
-    : AggSpec_AggSpecTDigest() {
-    *this = ::std::move(from);
-  }
-
-  inline AggSpec_AggSpecTDigest& operator=(const AggSpec_AggSpecTDigest& from) {
-    CopyFrom(from);
-    return *this;
-  }
-  inline AggSpec_AggSpecTDigest& operator=(AggSpec_AggSpecTDigest&& from) noexcept {
-    if (this == &from) return *this;
-    if (GetArena() == from.GetArena()
-  #ifdef PROTOBUF_FORCE_COPY_IN_MOVE
-        && GetArena() != nullptr
-  #endif  // !PROTOBUF_FORCE_COPY_IN_MOVE
-    ) {
-      InternalSwap(&from);
-    } else {
-      CopyFrom(from);
-    }
-    return *this;
-  }
-
-  inline const ::google::protobuf::UnknownFieldSet& unknown_fields() const
-      ABSL_ATTRIBUTE_LIFETIME_BOUND {
-    return _internal_metadata_.unknown_fields<::google::protobuf::UnknownFieldSet>(::google::protobuf::UnknownFieldSet::default_instance);
-  }
-  inline ::google::protobuf::UnknownFieldSet* mutable_unknown_fields()
-      ABSL_ATTRIBUTE_LIFETIME_BOUND {
-    return _internal_metadata_.mutable_unknown_fields<::google::protobuf::UnknownFieldSet>();
-  }
-
-  static const ::google::protobuf::Descriptor* descriptor() {
-    return GetDescriptor();
-  }
-  static const ::google::protobuf::Descriptor* GetDescriptor() {
-    return default_instance().GetMetadata().descriptor;
-  }
-  static const ::google::protobuf::Reflection* GetReflection() {
-    return default_instance().GetMetadata().reflection;
-  }
-  static const AggSpec_AggSpecTDigest& default_instance() {
-    return *internal_default_instance();
-  }
-  static inline const AggSpec_AggSpecTDigest* internal_default_instance() {
-    return reinterpret_cast<const AggSpec_AggSpecTDigest*>(
-               &_AggSpec_AggSpecTDigest_default_instance_);
-  }
-  static constexpr int kIndexInFileMessages =
-    70;
-
-  friend void swap(AggSpec_AggSpecTDigest& a, AggSpec_AggSpecTDigest& b) {
-    a.Swap(&b);
-  }
-  inline void Swap(AggSpec_AggSpecTDigest* other) {
-    if (other == this) return;
-  #ifdef PROTOBUF_FORCE_COPY_IN_SWAP
-    if (GetArena() != nullptr &&
-        GetArena() == other->GetArena()) {
-   #else  // PROTOBUF_FORCE_COPY_IN_SWAP
-    if (GetArena() == other->GetArena()) {
-  #endif  // !PROTOBUF_FORCE_COPY_IN_SWAP
-      InternalSwap(other);
-    } else {
-      ::google::protobuf::internal::GenericSwap(this, other);
-    }
-  }
-  void UnsafeArenaSwap(AggSpec_AggSpecTDigest* other) {
-    if (other == this) return;
-    ABSL_DCHECK(GetArena() == other->GetArena());
-    InternalSwap(other);
-  }
-
-  // implements Message ----------------------------------------------
-
-  AggSpec_AggSpecTDigest* New(::google::protobuf::Arena* arena = nullptr) const final {
-    return CreateMaybeMessage<AggSpec_AggSpecTDigest>(arena);
-  }
-  using ::google::protobuf::Message::CopyFrom;
-  void CopyFrom(const AggSpec_AggSpecTDigest& from);
-  using ::google::protobuf::Message::MergeFrom;
-  void MergeFrom( const AggSpec_AggSpecTDigest& from) {
-    AggSpec_AggSpecTDigest::MergeImpl(*this, from);
-  }
-  private:
-  static void MergeImpl(::google::protobuf::Message& to_msg, const ::google::protobuf::Message& from_msg);
-  public:
-  PROTOBUF_ATTRIBUTE_REINITIALIZES void Clear() final;
-  bool IsInitialized() const final;
-
-  ::size_t ByteSizeLong() const final;
-  const char* _InternalParse(const char* ptr, ::google::protobuf::internal::ParseContext* ctx) final;
-  ::uint8_t* _InternalSerialize(
-      ::uint8_t* target, ::google::protobuf::io::EpsCopyOutputStream* stream) const final;
-  int GetCachedSize() const { return _impl_._cached_size_.Get(); }
-
-  private:
-  ::google::protobuf::internal::CachedSize* AccessCachedSize() const final;
-  void SharedCtor(::google::protobuf::Arena* arena);
-  void SharedDtor();
-  void InternalSwap(AggSpec_AggSpecTDigest* other);
-
-  private:
-  friend class ::google::protobuf::internal::AnyMetadata;
-  static ::absl::string_view FullMessageName() {
-    return "io.deephaven.proto.backplane.grpc.AggSpec.AggSpecTDigest";
-  }
-  protected:
-  explicit AggSpec_AggSpecTDigest(::google::protobuf::Arena* arena);
-  AggSpec_AggSpecTDigest(::google::protobuf::Arena* arena, const AggSpec_AggSpecTDigest& from);
-  public:
-
-  static const ClassData _class_data_;
-  const ::google::protobuf::Message::ClassData*GetClassData() const final;
-
-  ::google::protobuf::Metadata GetMetadata() const final;
-
-  // nested types ----------------------------------------------------
-
-  // accessors -------------------------------------------------------
-
-  enum : int {
-    kCompressionFieldNumber = 1,
-  };
-  // optional double compression = 1;
-  bool has_compression() const;
-  void clear_compression() ;
-  double compression() const;
-  void set_compression(double value);
-
-  private:
-  double _internal_compression() const;
-  void _internal_set_compression(double value);
-
-  public:
-  // @@protoc_insertion_point(class_scope:io.deephaven.proto.backplane.grpc.AggSpec.AggSpecTDigest)
- private:
-  class _Internal;
-
-  friend class ::google::protobuf::internal::TcParser;
-  static const ::google::protobuf::internal::TcParseTable<
-      0, 1, 0,
-      0, 2>
-      _table_;
-  friend class ::google::protobuf::MessageLite;
-  friend class ::google::protobuf::Arena;
-  template <typename T>
-  friend class ::google::protobuf::Arena::InternalHelper;
-  using InternalArenaConstructable_ = void;
-  using DestructorSkippable_ = void;
-  struct Impl_ {
-
-        inline explicit constexpr Impl_(
-            ::google::protobuf::internal::ConstantInitialized) noexcept;
-        inline explicit Impl_(::google::protobuf::internal::InternalVisibility visibility,
-                              ::google::protobuf::Arena* arena);
-        inline explicit Impl_(::google::protobuf::internal::InternalVisibility visibility,
-                              ::google::protobuf::Arena* arena, const Impl_& from);
-    ::google::protobuf::internal::HasBits<1> _has_bits_;
-    mutable ::google::protobuf::internal::CachedSize _cached_size_;
-    double compression_;
-    PROTOBUF_TSAN_DECLARE_MEMBER
-  };
-  union { Impl_ _impl_; };
-  friend struct ::TableStruct_deephaven_2fproto_2ftable_2eproto;
-};// -------------------------------------------------------------------
-
-class AggSpec_AggSpecSum final :
-    public ::google::protobuf::internal::ZeroFieldsBase /* @@protoc_insertion_point(class_definition:io.deephaven.proto.backplane.grpc.AggSpec.AggSpecSum) */ {
- public:
-  inline AggSpec_AggSpecSum() : AggSpec_AggSpecSum(nullptr) {}
-  template<typename = void>
-  explicit PROTOBUF_CONSTEXPR AggSpec_AggSpecSum(::google::protobuf::internal::ConstantInitialized);
-
-  inline AggSpec_AggSpecSum(const AggSpec_AggSpecSum& from)
-      : AggSpec_AggSpecSum(nullptr, from) {}
-  AggSpec_AggSpecSum(AggSpec_AggSpecSum&& from) noexcept
-    : AggSpec_AggSpecSum() {
-    *this = ::std::move(from);
-  }
-
-  inline AggSpec_AggSpecSum& operator=(const AggSpec_AggSpecSum& from) {
-    CopyFrom(from);
-    return *this;
-  }
-  inline AggSpec_AggSpecSum& operator=(AggSpec_AggSpecSum&& from) noexcept {
-    if (this == &from) return *this;
-    if (GetArena() == from.GetArena()
-  #ifdef PROTOBUF_FORCE_COPY_IN_MOVE
-        && GetArena() != nullptr
-  #endif  // !PROTOBUF_FORCE_COPY_IN_MOVE
-    ) {
-      InternalSwap(&from);
-    } else {
-      CopyFrom(from);
-    }
-    return *this;
-  }
-
-  inline const ::google::protobuf::UnknownFieldSet& unknown_fields() const
-      ABSL_ATTRIBUTE_LIFETIME_BOUND {
-    return _internal_metadata_.unknown_fields<::google::protobuf::UnknownFieldSet>(::google::protobuf::UnknownFieldSet::default_instance);
-  }
-  inline ::google::protobuf::UnknownFieldSet* mutable_unknown_fields()
-      ABSL_ATTRIBUTE_LIFETIME_BOUND {
-    return _internal_metadata_.mutable_unknown_fields<::google::protobuf::UnknownFieldSet>();
-  }
-
-  static const ::google::protobuf::Descriptor* descriptor() {
-    return GetDescriptor();
-  }
-  static const ::google::protobuf::Descriptor* GetDescriptor() {
-    return default_instance().GetMetadata().descriptor;
-  }
-  static const ::google::protobuf::Reflection* GetReflection() {
-    return default_instance().GetMetadata().reflection;
-  }
-  static const AggSpec_AggSpecSum& default_instance() {
-    return *internal_default_instance();
-  }
-  static inline const AggSpec_AggSpecSum* internal_default_instance() {
-    return reinterpret_cast<const AggSpec_AggSpecSum*>(
-               &_AggSpec_AggSpecSum_default_instance_);
-  }
-  static constexpr int kIndexInFileMessages =
-    83;
-
-  friend void swap(AggSpec_AggSpecSum& a, AggSpec_AggSpecSum& b) {
-    a.Swap(&b);
-  }
-  inline void Swap(AggSpec_AggSpecSum* other) {
-    if (other == this) return;
-  #ifdef PROTOBUF_FORCE_COPY_IN_SWAP
-    if (GetArena() != nullptr &&
-        GetArena() == other->GetArena()) {
-   #else  // PROTOBUF_FORCE_COPY_IN_SWAP
-    if (GetArena() == other->GetArena()) {
-  #endif  // !PROTOBUF_FORCE_COPY_IN_SWAP
-      InternalSwap(other);
-    } else {
-      ::google::protobuf::internal::GenericSwap(this, other);
-    }
-  }
-  void UnsafeArenaSwap(AggSpec_AggSpecSum* other) {
-    if (other == this) return;
-    ABSL_DCHECK(GetArena() == other->GetArena());
-    InternalSwap(other);
-  }
-
-  // implements Message ----------------------------------------------
-
-  AggSpec_AggSpecSum* New(::google::protobuf::Arena* arena = nullptr) const final {
-    return CreateMaybeMessage<AggSpec_AggSpecSum>(arena);
-  }
-  using ::google::protobuf::internal::ZeroFieldsBase::CopyFrom;
-  inline void CopyFrom(const AggSpec_AggSpecSum& from) {
-    ::google::protobuf::internal::ZeroFieldsBase::CopyImpl(*this, from);
-  }
-  using ::google::protobuf::internal::ZeroFieldsBase::MergeFrom;
-  void MergeFrom(const AggSpec_AggSpecSum& from) {
-    ::google::protobuf::internal::ZeroFieldsBase::MergeImpl(*this, from);
-  }
-  public:
-
-  private:
-  friend class ::google::protobuf::internal::AnyMetadata;
-  static ::absl::string_view FullMessageName() {
-    return "io.deephaven.proto.backplane.grpc.AggSpec.AggSpecSum";
-  }
-  protected:
-  explicit AggSpec_AggSpecSum(::google::protobuf::Arena* arena);
-  AggSpec_AggSpecSum(::google::protobuf::Arena* arena, const AggSpec_AggSpecSum& from);
-  public:
-
-  ::google::protobuf::Metadata GetMetadata() const final;
-
-  // nested types ----------------------------------------------------
-
-  // accessors -------------------------------------------------------
-
-  // @@protoc_insertion_point(class_scope:io.deephaven.proto.backplane.grpc.AggSpec.AggSpecSum)
- private:
-  class _Internal;
-
-  friend class ::google::protobuf::MessageLite;
-  friend class ::google::protobuf::Arena;
-  template <typename T>
-  friend class ::google::protobuf::Arena::InternalHelper;
-  using InternalArenaConstructable_ = void;
-  using DestructorSkippable_ = void;
-  struct Impl_ {
-
-        inline explicit constexpr Impl_(
-            ::google::protobuf::internal::ConstantInitialized) noexcept;
-        inline explicit Impl_(::google::protobuf::internal::InternalVisibility visibility,
-                              ::google::protobuf::Arena* arena);
-        inline explicit Impl_(::google::protobuf::internal::InternalVisibility visibility,
-                              ::google::protobuf::Arena* arena, const Impl_& from);
-    PROTOBUF_TSAN_DECLARE_MEMBER
-  };
-  friend struct ::TableStruct_deephaven_2fproto_2ftable_2eproto;
-};// -------------------------------------------------------------------
-
-class AggSpec_AggSpecStd final :
-    public ::google::protobuf::internal::ZeroFieldsBase /* @@protoc_insertion_point(class_definition:io.deephaven.proto.backplane.grpc.AggSpec.AggSpecStd) */ {
- public:
-  inline AggSpec_AggSpecStd() : AggSpec_AggSpecStd(nullptr) {}
-  template<typename = void>
-  explicit PROTOBUF_CONSTEXPR AggSpec_AggSpecStd(::google::protobuf::internal::ConstantInitialized);
-
-  inline AggSpec_AggSpecStd(const AggSpec_AggSpecStd& from)
-      : AggSpec_AggSpecStd(nullptr, from) {}
-  AggSpec_AggSpecStd(AggSpec_AggSpecStd&& from) noexcept
-    : AggSpec_AggSpecStd() {
-    *this = ::std::move(from);
-  }
-
-  inline AggSpec_AggSpecStd& operator=(const AggSpec_AggSpecStd& from) {
-    CopyFrom(from);
-    return *this;
-  }
-  inline AggSpec_AggSpecStd& operator=(AggSpec_AggSpecStd&& from) noexcept {
-    if (this == &from) return *this;
-    if (GetArena() == from.GetArena()
-  #ifdef PROTOBUF_FORCE_COPY_IN_MOVE
-        && GetArena() != nullptr
-  #endif  // !PROTOBUF_FORCE_COPY_IN_MOVE
-    ) {
-      InternalSwap(&from);
-    } else {
-      CopyFrom(from);
-    }
-    return *this;
-  }
-
-  inline const ::google::protobuf::UnknownFieldSet& unknown_fields() const
-      ABSL_ATTRIBUTE_LIFETIME_BOUND {
-    return _internal_metadata_.unknown_fields<::google::protobuf::UnknownFieldSet>(::google::protobuf::UnknownFieldSet::default_instance);
-  }
-  inline ::google::protobuf::UnknownFieldSet* mutable_unknown_fields()
-      ABSL_ATTRIBUTE_LIFETIME_BOUND {
-    return _internal_metadata_.mutable_unknown_fields<::google::protobuf::UnknownFieldSet>();
-  }
-
-  static const ::google::protobuf::Descriptor* descriptor() {
-    return GetDescriptor();
-  }
-  static const ::google::protobuf::Descriptor* GetDescriptor() {
-    return default_instance().GetMetadata().descriptor;
-  }
-  static const ::google::protobuf::Reflection* GetReflection() {
-    return default_instance().GetMetadata().reflection;
-  }
-  static const AggSpec_AggSpecStd& default_instance() {
-    return *internal_default_instance();
-  }
-  static inline const AggSpec_AggSpecStd* internal_default_instance() {
-    return reinterpret_cast<const AggSpec_AggSpecStd*>(
-               &_AggSpec_AggSpecStd_default_instance_);
-  }
-  static constexpr int kIndexInFileMessages =
-    82;
-
-  friend void swap(AggSpec_AggSpecStd& a, AggSpec_AggSpecStd& b) {
-    a.Swap(&b);
-  }
-  inline void Swap(AggSpec_AggSpecStd* other) {
-    if (other == this) return;
-  #ifdef PROTOBUF_FORCE_COPY_IN_SWAP
-    if (GetArena() != nullptr &&
-        GetArena() == other->GetArena()) {
-   #else  // PROTOBUF_FORCE_COPY_IN_SWAP
-    if (GetArena() == other->GetArena()) {
-  #endif  // !PROTOBUF_FORCE_COPY_IN_SWAP
-      InternalSwap(other);
-    } else {
-      ::google::protobuf::internal::GenericSwap(this, other);
-    }
-  }
-  void UnsafeArenaSwap(AggSpec_AggSpecStd* other) {
-    if (other == this) return;
-    ABSL_DCHECK(GetArena() == other->GetArena());
-    InternalSwap(other);
-  }
-
-  // implements Message ----------------------------------------------
-
-  AggSpec_AggSpecStd* New(::google::protobuf::Arena* arena = nullptr) const final {
-    return CreateMaybeMessage<AggSpec_AggSpecStd>(arena);
-  }
-  using ::google::protobuf::internal::ZeroFieldsBase::CopyFrom;
-  inline void CopyFrom(const AggSpec_AggSpecStd& from) {
-    ::google::protobuf::internal::ZeroFieldsBase::CopyImpl(*this, from);
-  }
-  using ::google::protobuf::internal::ZeroFieldsBase::MergeFrom;
-  void MergeFrom(const AggSpec_AggSpecStd& from) {
-    ::google::protobuf::internal::ZeroFieldsBase::MergeImpl(*this, from);
-  }
-  public:
-
-  private:
-  friend class ::google::protobuf::internal::AnyMetadata;
-  static ::absl::string_view FullMessageName() {
-    return "io.deephaven.proto.backplane.grpc.AggSpec.AggSpecStd";
-  }
-  protected:
-  explicit AggSpec_AggSpecStd(::google::protobuf::Arena* arena);
-  AggSpec_AggSpecStd(::google::protobuf::Arena* arena, const AggSpec_AggSpecStd& from);
-  public:
-
-  ::google::protobuf::Metadata GetMetadata() const final;
-
-  // nested types ----------------------------------------------------
-
-  // accessors -------------------------------------------------------
-
-  // @@protoc_insertion_point(class_scope:io.deephaven.proto.backplane.grpc.AggSpec.AggSpecStd)
- private:
-  class _Internal;
-
-  friend class ::google::protobuf::MessageLite;
-  friend class ::google::protobuf::Arena;
-  template <typename T>
-  friend class ::google::protobuf::Arena::InternalHelper;
-  using InternalArenaConstructable_ = void;
-  using DestructorSkippable_ = void;
-  struct Impl_ {
-
-        inline explicit constexpr Impl_(
-            ::google::protobuf::internal::ConstantInitialized) noexcept;
-        inline explicit Impl_(::google::protobuf::internal::InternalVisibility visibility,
-                              ::google::protobuf::Arena* arena);
-        inline explicit Impl_(::google::protobuf::internal::InternalVisibility visibility,
-                              ::google::protobuf::Arena* arena, const Impl_& from);
-    PROTOBUF_TSAN_DECLARE_MEMBER
-  };
-  friend struct ::TableStruct_deephaven_2fproto_2ftable_2eproto;
-};// -------------------------------------------------------------------
-
-class AggSpec_AggSpecSortedColumn final :
-    public ::google::protobuf::Message /* @@protoc_insertion_point(class_definition:io.deephaven.proto.backplane.grpc.AggSpec.AggSpecSortedColumn) */ {
- public:
-  inline AggSpec_AggSpecSortedColumn() : AggSpec_AggSpecSortedColumn(nullptr) {}
-  ~AggSpec_AggSpecSortedColumn() override;
-  template<typename = void>
-  explicit PROTOBUF_CONSTEXPR AggSpec_AggSpecSortedColumn(::google::protobuf::internal::ConstantInitialized);
-
-  inline AggSpec_AggSpecSortedColumn(const AggSpec_AggSpecSortedColumn& from)
-      : AggSpec_AggSpecSortedColumn(nullptr, from) {}
-  AggSpec_AggSpecSortedColumn(AggSpec_AggSpecSortedColumn&& from) noexcept
-    : AggSpec_AggSpecSortedColumn() {
-    *this = ::std::move(from);
-  }
-
-  inline AggSpec_AggSpecSortedColumn& operator=(const AggSpec_AggSpecSortedColumn& from) {
-    CopyFrom(from);
-    return *this;
-  }
-  inline AggSpec_AggSpecSortedColumn& operator=(AggSpec_AggSpecSortedColumn&& from) noexcept {
-    if (this == &from) return *this;
-    if (GetArena() == from.GetArena()
-  #ifdef PROTOBUF_FORCE_COPY_IN_MOVE
-        && GetArena() != nullptr
-  #endif  // !PROTOBUF_FORCE_COPY_IN_MOVE
-    ) {
-      InternalSwap(&from);
-    } else {
-      CopyFrom(from);
-    }
-    return *this;
-  }
-
-  inline const ::google::protobuf::UnknownFieldSet& unknown_fields() const
-      ABSL_ATTRIBUTE_LIFETIME_BOUND {
-    return _internal_metadata_.unknown_fields<::google::protobuf::UnknownFieldSet>(::google::protobuf::UnknownFieldSet::default_instance);
-  }
-  inline ::google::protobuf::UnknownFieldSet* mutable_unknown_fields()
-      ABSL_ATTRIBUTE_LIFETIME_BOUND {
-    return _internal_metadata_.mutable_unknown_fields<::google::protobuf::UnknownFieldSet>();
-  }
-
-  static const ::google::protobuf::Descriptor* descriptor() {
-    return GetDescriptor();
-  }
-  static const ::google::protobuf::Descriptor* GetDescriptor() {
-    return default_instance().GetMetadata().descriptor;
-  }
-  static const ::google::protobuf::Reflection* GetReflection() {
-    return default_instance().GetMetadata().reflection;
-  }
-  static const AggSpec_AggSpecSortedColumn& default_instance() {
-    return *internal_default_instance();
-  }
-  static inline const AggSpec_AggSpecSortedColumn* internal_default_instance() {
-    return reinterpret_cast<const AggSpec_AggSpecSortedColumn*>(
-               &_AggSpec_AggSpecSortedColumn_default_instance_);
-  }
-  static constexpr int kIndexInFileMessages =
-    69;
-
-  friend void swap(AggSpec_AggSpecSortedColumn& a, AggSpec_AggSpecSortedColumn& b) {
-    a.Swap(&b);
-  }
-  inline void Swap(AggSpec_AggSpecSortedColumn* other) {
-    if (other == this) return;
-  #ifdef PROTOBUF_FORCE_COPY_IN_SWAP
-    if (GetArena() != nullptr &&
-        GetArena() == other->GetArena()) {
-   #else  // PROTOBUF_FORCE_COPY_IN_SWAP
-    if (GetArena() == other->GetArena()) {
-  #endif  // !PROTOBUF_FORCE_COPY_IN_SWAP
-      InternalSwap(other);
-    } else {
-      ::google::protobuf::internal::GenericSwap(this, other);
-    }
-  }
-  void UnsafeArenaSwap(AggSpec_AggSpecSortedColumn* other) {
-    if (other == this) return;
-    ABSL_DCHECK(GetArena() == other->GetArena());
-    InternalSwap(other);
-  }
-
-  // implements Message ----------------------------------------------
-
-  AggSpec_AggSpecSortedColumn* New(::google::protobuf::Arena* arena = nullptr) const final {
-    return CreateMaybeMessage<AggSpec_AggSpecSortedColumn>(arena);
-  }
-  using ::google::protobuf::Message::CopyFrom;
-  void CopyFrom(const AggSpec_AggSpecSortedColumn& from);
-  using ::google::protobuf::Message::MergeFrom;
-  void MergeFrom( const AggSpec_AggSpecSortedColumn& from) {
-    AggSpec_AggSpecSortedColumn::MergeImpl(*this, from);
-  }
-  private:
-  static void MergeImpl(::google::protobuf::Message& to_msg, const ::google::protobuf::Message& from_msg);
-  public:
-  PROTOBUF_ATTRIBUTE_REINITIALIZES void Clear() final;
-  bool IsInitialized() const final;
-
-  ::size_t ByteSizeLong() const final;
-  const char* _InternalParse(const char* ptr, ::google::protobuf::internal::ParseContext* ctx) final;
-  ::uint8_t* _InternalSerialize(
-      ::uint8_t* target, ::google::protobuf::io::EpsCopyOutputStream* stream) const final;
-  int GetCachedSize() const { return _impl_._cached_size_.Get(); }
-
-  private:
-  ::google::protobuf::internal::CachedSize* AccessCachedSize() const final;
-  void SharedCtor(::google::protobuf::Arena* arena);
-  void SharedDtor();
-  void InternalSwap(AggSpec_AggSpecSortedColumn* other);
-
-  private:
-  friend class ::google::protobuf::internal::AnyMetadata;
-  static ::absl::string_view FullMessageName() {
-    return "io.deephaven.proto.backplane.grpc.AggSpec.AggSpecSortedColumn";
-  }
-  protected:
-  explicit AggSpec_AggSpecSortedColumn(::google::protobuf::Arena* arena);
-  AggSpec_AggSpecSortedColumn(::google::protobuf::Arena* arena, const AggSpec_AggSpecSortedColumn& from);
-  public:
-
-  static const ClassData _class_data_;
-  const ::google::protobuf::Message::ClassData*GetClassData() const final;
-
-  ::google::protobuf::Metadata GetMetadata() const final;
-
-  // nested types ----------------------------------------------------
-
-  // accessors -------------------------------------------------------
-
-  enum : int {
-    kColumnNameFieldNumber = 1,
-  };
-  // string column_name = 1;
-  void clear_column_name() ;
-  const std::string& column_name() const;
-  template <typename Arg_ = const std::string&, typename... Args_>
-  void set_column_name(Arg_&& arg, Args_... args);
-  std::string* mutable_column_name();
-  PROTOBUF_NODISCARD std::string* release_column_name();
-  void set_allocated_column_name(std::string* value);
-
-  private:
-  const std::string& _internal_column_name() const;
-  inline PROTOBUF_ALWAYS_INLINE void _internal_set_column_name(
-      const std::string& value);
-  std::string* _internal_mutable_column_name();
-
-  public:
-  // @@protoc_insertion_point(class_scope:io.deephaven.proto.backplane.grpc.AggSpec.AggSpecSortedColumn)
- private:
-  class _Internal;
-
-  friend class ::google::protobuf::internal::TcParser;
-  static const ::google::protobuf::internal::TcParseTable<
-      0, 1, 0,
-      81, 2>
-      _table_;
-  friend class ::google::protobuf::MessageLite;
-  friend class ::google::protobuf::Arena;
-  template <typename T>
-  friend class ::google::protobuf::Arena::InternalHelper;
-  using InternalArenaConstructable_ = void;
-  using DestructorSkippable_ = void;
-  struct Impl_ {
-
-        inline explicit constexpr Impl_(
-            ::google::protobuf::internal::ConstantInitialized) noexcept;
-        inline explicit Impl_(::google::protobuf::internal::InternalVisibility visibility,
-                              ::google::protobuf::Arena* arena);
-        inline explicit Impl_(::google::protobuf::internal::InternalVisibility visibility,
-                              ::google::protobuf::Arena* arena, const Impl_& from);
-    ::google::protobuf::internal::ArenaStringPtr column_name_;
-    mutable ::google::protobuf::internal::CachedSize _cached_size_;
-    PROTOBUF_TSAN_DECLARE_MEMBER
-  };
-  union { Impl_ _impl_; };
-  friend struct ::TableStruct_deephaven_2fproto_2ftable_2eproto;
-};// -------------------------------------------------------------------
-
-class AggSpec_AggSpecPercentile final :
-    public ::google::protobuf::Message /* @@protoc_insertion_point(class_definition:io.deephaven.proto.backplane.grpc.AggSpec.AggSpecPercentile) */ {
- public:
-  inline AggSpec_AggSpecPercentile() : AggSpec_AggSpecPercentile(nullptr) {}
-  ~AggSpec_AggSpecPercentile() override;
-  template<typename = void>
-  explicit PROTOBUF_CONSTEXPR AggSpec_AggSpecPercentile(::google::protobuf::internal::ConstantInitialized);
-
-  inline AggSpec_AggSpecPercentile(const AggSpec_AggSpecPercentile& from)
-      : AggSpec_AggSpecPercentile(nullptr, from) {}
-  AggSpec_AggSpecPercentile(AggSpec_AggSpecPercentile&& from) noexcept
-    : AggSpec_AggSpecPercentile() {
-    *this = ::std::move(from);
-  }
-
-  inline AggSpec_AggSpecPercentile& operator=(const AggSpec_AggSpecPercentile& from) {
-    CopyFrom(from);
-    return *this;
-  }
-  inline AggSpec_AggSpecPercentile& operator=(AggSpec_AggSpecPercentile&& from) noexcept {
-    if (this == &from) return *this;
-    if (GetArena() == from.GetArena()
-  #ifdef PROTOBUF_FORCE_COPY_IN_MOVE
-        && GetArena() != nullptr
-  #endif  // !PROTOBUF_FORCE_COPY_IN_MOVE
-    ) {
-      InternalSwap(&from);
-    } else {
-      CopyFrom(from);
-    }
-    return *this;
-  }
-
-  inline const ::google::protobuf::UnknownFieldSet& unknown_fields() const
-      ABSL_ATTRIBUTE_LIFETIME_BOUND {
-    return _internal_metadata_.unknown_fields<::google::protobuf::UnknownFieldSet>(::google::protobuf::UnknownFieldSet::default_instance);
-  }
-  inline ::google::protobuf::UnknownFieldSet* mutable_unknown_fields()
-      ABSL_ATTRIBUTE_LIFETIME_BOUND {
-    return _internal_metadata_.mutable_unknown_fields<::google::protobuf::UnknownFieldSet>();
-  }
-
-  static const ::google::protobuf::Descriptor* descriptor() {
-    return GetDescriptor();
-  }
-  static const ::google::protobuf::Descriptor* GetDescriptor() {
-    return default_instance().GetMetadata().descriptor;
-  }
-  static const ::google::protobuf::Reflection* GetReflection() {
-    return default_instance().GetMetadata().reflection;
-  }
-  static const AggSpec_AggSpecPercentile& default_instance() {
-    return *internal_default_instance();
-  }
-  static inline const AggSpec_AggSpecPercentile* internal_default_instance() {
-    return reinterpret_cast<const AggSpec_AggSpecPercentile*>(
-               &_AggSpec_AggSpecPercentile_default_instance_);
-  }
-  static constexpr int kIndexInFileMessages =
-    67;
-
-  friend void swap(AggSpec_AggSpecPercentile& a, AggSpec_AggSpecPercentile& b) {
-    a.Swap(&b);
-  }
-  inline void Swap(AggSpec_AggSpecPercentile* other) {
-    if (other == this) return;
-  #ifdef PROTOBUF_FORCE_COPY_IN_SWAP
-    if (GetArena() != nullptr &&
-        GetArena() == other->GetArena()) {
-   #else  // PROTOBUF_FORCE_COPY_IN_SWAP
-    if (GetArena() == other->GetArena()) {
-  #endif  // !PROTOBUF_FORCE_COPY_IN_SWAP
-      InternalSwap(other);
-    } else {
-      ::google::protobuf::internal::GenericSwap(this, other);
-    }
-  }
-  void UnsafeArenaSwap(AggSpec_AggSpecPercentile* other) {
-    if (other == this) return;
-    ABSL_DCHECK(GetArena() == other->GetArena());
-    InternalSwap(other);
-  }
-
-  // implements Message ----------------------------------------------
-
-  AggSpec_AggSpecPercentile* New(::google::protobuf::Arena* arena = nullptr) const final {
-    return CreateMaybeMessage<AggSpec_AggSpecPercentile>(arena);
-  }
-  using ::google::protobuf::Message::CopyFrom;
-  void CopyFrom(const AggSpec_AggSpecPercentile& from);
-  using ::google::protobuf::Message::MergeFrom;
-  void MergeFrom( const AggSpec_AggSpecPercentile& from) {
-    AggSpec_AggSpecPercentile::MergeImpl(*this, from);
-  }
-  private:
-  static void MergeImpl(::google::protobuf::Message& to_msg, const ::google::protobuf::Message& from_msg);
-  public:
-  PROTOBUF_ATTRIBUTE_REINITIALIZES void Clear() final;
-  bool IsInitialized() const final;
-
-  ::size_t ByteSizeLong() const final;
-  const char* _InternalParse(const char* ptr, ::google::protobuf::internal::ParseContext* ctx) final;
-  ::uint8_t* _InternalSerialize(
-      ::uint8_t* target, ::google::protobuf::io::EpsCopyOutputStream* stream) const final;
-  int GetCachedSize() const { return _impl_._cached_size_.Get(); }
-
-  private:
-  ::google::protobuf::internal::CachedSize* AccessCachedSize() const final;
-  void SharedCtor(::google::protobuf::Arena* arena);
-  void SharedDtor();
-  void InternalSwap(AggSpec_AggSpecPercentile* other);
-
-  private:
-  friend class ::google::protobuf::internal::AnyMetadata;
-  static ::absl::string_view FullMessageName() {
-    return "io.deephaven.proto.backplane.grpc.AggSpec.AggSpecPercentile";
-  }
-  protected:
-  explicit AggSpec_AggSpecPercentile(::google::protobuf::Arena* arena);
-  AggSpec_AggSpecPercentile(::google::protobuf::Arena* arena, const AggSpec_AggSpecPercentile& from);
-  public:
-
-  static const ClassData _class_data_;
-  const ::google::protobuf::Message::ClassData*GetClassData() const final;
-
-  ::google::protobuf::Metadata GetMetadata() const final;
-
-  // nested types ----------------------------------------------------
-
-  // accessors -------------------------------------------------------
-
-  enum : int {
-    kPercentileFieldNumber = 1,
-    kAverageEvenlyDividedFieldNumber = 2,
-  };
-  // double percentile = 1;
-  void clear_percentile() ;
-  double percentile() const;
-  void set_percentile(double value);
-
-  private:
-  double _internal_percentile() const;
-  void _internal_set_percentile(double value);
-
-  public:
-  // bool average_evenly_divided = 2;
-  void clear_average_evenly_divided() ;
-  bool average_evenly_divided() const;
-  void set_average_evenly_divided(bool value);
-
-  private:
-  bool _internal_average_evenly_divided() const;
-  void _internal_set_average_evenly_divided(bool value);
-
-  public:
-  // @@protoc_insertion_point(class_scope:io.deephaven.proto.backplane.grpc.AggSpec.AggSpecPercentile)
- private:
-  class _Internal;
-
-  friend class ::google::protobuf::internal::TcParser;
-  static const ::google::protobuf::internal::TcParseTable<
-      1, 2, 0,
-      0, 2>
-      _table_;
-  friend class ::google::protobuf::MessageLite;
-  friend class ::google::protobuf::Arena;
-  template <typename T>
-  friend class ::google::protobuf::Arena::InternalHelper;
-  using InternalArenaConstructable_ = void;
-  using DestructorSkippable_ = void;
-  struct Impl_ {
-
-        inline explicit constexpr Impl_(
-            ::google::protobuf::internal::ConstantInitialized) noexcept;
-        inline explicit Impl_(::google::protobuf::internal::InternalVisibility visibility,
-                              ::google::protobuf::Arena* arena);
-        inline explicit Impl_(::google::protobuf::internal::InternalVisibility visibility,
-                              ::google::protobuf::Arena* arena, const Impl_& from);
-    double percentile_;
-    bool average_evenly_divided_;
-    mutable ::google::protobuf::internal::CachedSize _cached_size_;
-    PROTOBUF_TSAN_DECLARE_MEMBER
-  };
-  union { Impl_ _impl_; };
-  friend struct ::TableStruct_deephaven_2fproto_2ftable_2eproto;
-};// -------------------------------------------------------------------
-
-class AggSpec_AggSpecNonUniqueSentinel final :
-    public ::google::protobuf::Message /* @@protoc_insertion_point(class_definition:io.deephaven.proto.backplane.grpc.AggSpec.AggSpecNonUniqueSentinel) */ {
- public:
-  inline AggSpec_AggSpecNonUniqueSentinel() : AggSpec_AggSpecNonUniqueSentinel(nullptr) {}
-  ~AggSpec_AggSpecNonUniqueSentinel() override;
-  template<typename = void>
-  explicit PROTOBUF_CONSTEXPR AggSpec_AggSpecNonUniqueSentinel(::google::protobuf::internal::ConstantInitialized);
-
-  inline AggSpec_AggSpecNonUniqueSentinel(const AggSpec_AggSpecNonUniqueSentinel& from)
-      : AggSpec_AggSpecNonUniqueSentinel(nullptr, from) {}
-  AggSpec_AggSpecNonUniqueSentinel(AggSpec_AggSpecNonUniqueSentinel&& from) noexcept
-    : AggSpec_AggSpecNonUniqueSentinel() {
-    *this = ::std::move(from);
-  }
-
-  inline AggSpec_AggSpecNonUniqueSentinel& operator=(const AggSpec_AggSpecNonUniqueSentinel& from) {
-    CopyFrom(from);
-    return *this;
-  }
-  inline AggSpec_AggSpecNonUniqueSentinel& operator=(AggSpec_AggSpecNonUniqueSentinel&& from) noexcept {
-    if (this == &from) return *this;
-    if (GetArena() == from.GetArena()
-  #ifdef PROTOBUF_FORCE_COPY_IN_MOVE
-        && GetArena() != nullptr
-  #endif  // !PROTOBUF_FORCE_COPY_IN_MOVE
-    ) {
-      InternalSwap(&from);
-    } else {
-      CopyFrom(from);
-    }
-    return *this;
-  }
-
-  inline const ::google::protobuf::UnknownFieldSet& unknown_fields() const
-      ABSL_ATTRIBUTE_LIFETIME_BOUND {
-    return _internal_metadata_.unknown_fields<::google::protobuf::UnknownFieldSet>(::google::protobuf::UnknownFieldSet::default_instance);
-  }
-  inline ::google::protobuf::UnknownFieldSet* mutable_unknown_fields()
-      ABSL_ATTRIBUTE_LIFETIME_BOUND {
-    return _internal_metadata_.mutable_unknown_fields<::google::protobuf::UnknownFieldSet>();
-  }
-
-  static const ::google::protobuf::Descriptor* descriptor() {
-    return GetDescriptor();
-  }
-  static const ::google::protobuf::Descriptor* GetDescriptor() {
-    return default_instance().GetMetadata().descriptor;
-  }
-  static const ::google::protobuf::Reflection* GetReflection() {
-    return default_instance().GetMetadata().reflection;
-  }
-  static const AggSpec_AggSpecNonUniqueSentinel& default_instance() {
-    return *internal_default_instance();
-  }
-  enum TypeCase {
-    kNullValue = 1,
-    kStringValue = 2,
-    kIntValue = 3,
-    kLongValue = 4,
-    kFloatValue = 5,
-    kDoubleValue = 6,
-    kBoolValue = 7,
-    kByteValue = 8,
-    kShortValue = 9,
-    kCharValue = 10,
-    TYPE_NOT_SET = 0,
-  };
-
-  static inline const AggSpec_AggSpecNonUniqueSentinel* internal_default_instance() {
-    return reinterpret_cast<const AggSpec_AggSpecNonUniqueSentinel*>(
-               &_AggSpec_AggSpecNonUniqueSentinel_default_instance_);
-  }
-  static constexpr int kIndexInFileMessages =
-    72;
-
-  friend void swap(AggSpec_AggSpecNonUniqueSentinel& a, AggSpec_AggSpecNonUniqueSentinel& b) {
-    a.Swap(&b);
-  }
-  inline void Swap(AggSpec_AggSpecNonUniqueSentinel* other) {
-    if (other == this) return;
-  #ifdef PROTOBUF_FORCE_COPY_IN_SWAP
-    if (GetArena() != nullptr &&
-        GetArena() == other->GetArena()) {
-   #else  // PROTOBUF_FORCE_COPY_IN_SWAP
-    if (GetArena() == other->GetArena()) {
-  #endif  // !PROTOBUF_FORCE_COPY_IN_SWAP
-      InternalSwap(other);
-    } else {
-      ::google::protobuf::internal::GenericSwap(this, other);
-    }
-  }
-  void UnsafeArenaSwap(AggSpec_AggSpecNonUniqueSentinel* other) {
-    if (other == this) return;
-    ABSL_DCHECK(GetArena() == other->GetArena());
-    InternalSwap(other);
-  }
-
-  // implements Message ----------------------------------------------
-
-  AggSpec_AggSpecNonUniqueSentinel* New(::google::protobuf::Arena* arena = nullptr) const final {
-    return CreateMaybeMessage<AggSpec_AggSpecNonUniqueSentinel>(arena);
-  }
-  using ::google::protobuf::Message::CopyFrom;
-  void CopyFrom(const AggSpec_AggSpecNonUniqueSentinel& from);
-  using ::google::protobuf::Message::MergeFrom;
-  void MergeFrom( const AggSpec_AggSpecNonUniqueSentinel& from) {
-    AggSpec_AggSpecNonUniqueSentinel::MergeImpl(*this, from);
-  }
-  private:
-  static void MergeImpl(::google::protobuf::Message& to_msg, const ::google::protobuf::Message& from_msg);
-  public:
-  PROTOBUF_ATTRIBUTE_REINITIALIZES void Clear() final;
-  bool IsInitialized() const final;
-
-  ::size_t ByteSizeLong() const final;
-  const char* _InternalParse(const char* ptr, ::google::protobuf::internal::ParseContext* ctx) final;
-  ::uint8_t* _InternalSerialize(
-      ::uint8_t* target, ::google::protobuf::io::EpsCopyOutputStream* stream) const final;
-  int GetCachedSize() const { return _impl_._cached_size_.Get(); }
-
-  private:
-  ::google::protobuf::internal::CachedSize* AccessCachedSize() const final;
-  void SharedCtor(::google::protobuf::Arena* arena);
-  void SharedDtor();
-  void InternalSwap(AggSpec_AggSpecNonUniqueSentinel* other);
-
-  private:
-  friend class ::google::protobuf::internal::AnyMetadata;
-  static ::absl::string_view FullMessageName() {
-    return "io.deephaven.proto.backplane.grpc.AggSpec.AggSpecNonUniqueSentinel";
-  }
-  protected:
-  explicit AggSpec_AggSpecNonUniqueSentinel(::google::protobuf::Arena* arena);
-  AggSpec_AggSpecNonUniqueSentinel(::google::protobuf::Arena* arena, const AggSpec_AggSpecNonUniqueSentinel& from);
-  public:
-
-  static const ClassData _class_data_;
-  const ::google::protobuf::Message::ClassData*GetClassData() const final;
-
-  ::google::protobuf::Metadata GetMetadata() const final;
-
-  // nested types ----------------------------------------------------
-
-  // accessors -------------------------------------------------------
-
-  enum : int {
-    kNullValueFieldNumber = 1,
-    kStringValueFieldNumber = 2,
-    kIntValueFieldNumber = 3,
-    kLongValueFieldNumber = 4,
-    kFloatValueFieldNumber = 5,
-    kDoubleValueFieldNumber = 6,
-    kBoolValueFieldNumber = 7,
-    kByteValueFieldNumber = 8,
-    kShortValueFieldNumber = 9,
-    kCharValueFieldNumber = 10,
-  };
-  // .io.deephaven.proto.backplane.grpc.NullValue null_value = 1;
-  bool has_null_value() const;
-  void clear_null_value() ;
-  ::io::deephaven::proto::backplane::grpc::NullValue null_value() const;
-  void set_null_value(::io::deephaven::proto::backplane::grpc::NullValue value);
-
-  private:
-  ::io::deephaven::proto::backplane::grpc::NullValue _internal_null_value() const;
-  void _internal_set_null_value(::io::deephaven::proto::backplane::grpc::NullValue value);
-
-  public:
-  // string string_value = 2;
-  bool has_string_value() const;
-  void clear_string_value() ;
-  const std::string& string_value() const;
-  template <typename Arg_ = const std::string&, typename... Args_>
-  void set_string_value(Arg_&& arg, Args_... args);
-  std::string* mutable_string_value();
-  PROTOBUF_NODISCARD std::string* release_string_value();
-  void set_allocated_string_value(std::string* value);
-
-  private:
-  const std::string& _internal_string_value() const;
-  inline PROTOBUF_ALWAYS_INLINE void _internal_set_string_value(
-      const std::string& value);
-  std::string* _internal_mutable_string_value();
-
-  public:
-  // sint32 int_value = 3;
-  bool has_int_value() const;
-  void clear_int_value() ;
-  ::int32_t int_value() const;
-  void set_int_value(::int32_t value);
-
-  private:
-  ::int32_t _internal_int_value() const;
-  void _internal_set_int_value(::int32_t value);
-
-  public:
-  // sint64 long_value = 4 [jstype = JS_STRING];
-  bool has_long_value() const;
-  void clear_long_value() ;
-  ::int64_t long_value() const;
-  void set_long_value(::int64_t value);
-
-  private:
-  ::int64_t _internal_long_value() const;
-  void _internal_set_long_value(::int64_t value);
-
-  public:
-  // float float_value = 5;
-  bool has_float_value() const;
-  void clear_float_value() ;
-  float float_value() const;
-  void set_float_value(float value);
-
-  private:
-  float _internal_float_value() const;
-  void _internal_set_float_value(float value);
-
-  public:
-  // double double_value = 6;
-  bool has_double_value() const;
-  void clear_double_value() ;
-  double double_value() const;
-  void set_double_value(double value);
-
-  private:
-  double _internal_double_value() const;
-  void _internal_set_double_value(double value);
-
-  public:
-  // bool bool_value = 7;
-  bool has_bool_value() const;
-  void clear_bool_value() ;
-  bool bool_value() const;
-  void set_bool_value(bool value);
-
-  private:
-  bool _internal_bool_value() const;
-  void _internal_set_bool_value(bool value);
-
-  public:
-  // sint32 byte_value = 8;
-  bool has_byte_value() const;
-  void clear_byte_value() ;
-  ::int32_t byte_value() const;
-  void set_byte_value(::int32_t value);
-
-  private:
-  ::int32_t _internal_byte_value() const;
-  void _internal_set_byte_value(::int32_t value);
-
-  public:
-  // sint32 short_value = 9;
-  bool has_short_value() const;
-  void clear_short_value() ;
-  ::int32_t short_value() const;
-  void set_short_value(::int32_t value);
-
-  private:
-  ::int32_t _internal_short_value() const;
-  void _internal_set_short_value(::int32_t value);
-
-  public:
-  // sint32 char_value = 10;
-  bool has_char_value() const;
-  void clear_char_value() ;
-  ::int32_t char_value() const;
-  void set_char_value(::int32_t value);
-
-  private:
-  ::int32_t _internal_char_value() const;
-  void _internal_set_char_value(::int32_t value);
-
-  public:
-  void clear_type();
-  TypeCase type_case() const;
-  // @@protoc_insertion_point(class_scope:io.deephaven.proto.backplane.grpc.AggSpec.AggSpecNonUniqueSentinel)
- private:
-  class _Internal;
-  void set_has_null_value();
-  void set_has_string_value();
-  void set_has_int_value();
-  void set_has_long_value();
-  void set_has_float_value();
-  void set_has_double_value();
-  void set_has_bool_value();
-  void set_has_byte_value();
-  void set_has_short_value();
-  void set_has_char_value();
-
-  inline bool has_type() const;
-  inline void clear_has_type();
-
-  friend class ::google::protobuf::internal::TcParser;
-  static const ::google::protobuf::internal::TcParseTable<
-      0, 10, 0,
-      95, 2>
-      _table_;
-  friend class ::google::protobuf::MessageLite;
-  friend class ::google::protobuf::Arena;
-  template <typename T>
-  friend class ::google::protobuf::Arena::InternalHelper;
-  using InternalArenaConstructable_ = void;
-  using DestructorSkippable_ = void;
-  struct Impl_ {
-
-        inline explicit constexpr Impl_(
-            ::google::protobuf::internal::ConstantInitialized) noexcept;
-        inline explicit Impl_(::google::protobuf::internal::InternalVisibility visibility,
-                              ::google::protobuf::Arena* arena);
-        inline explicit Impl_(::google::protobuf::internal::InternalVisibility visibility,
-                              ::google::protobuf::Arena* arena, const Impl_& from);
-    union TypeUnion {
-      constexpr TypeUnion() : _constinit_{} {}
-        ::google::protobuf::internal::ConstantInitialized _constinit_;
-      int null_value_;
-      ::google::protobuf::internal::ArenaStringPtr string_value_;
-      ::int32_t int_value_;
-      ::int64_t long_value_;
-      float float_value_;
-      double double_value_;
-      bool bool_value_;
-      ::int32_t byte_value_;
-      ::int32_t short_value_;
-      ::int32_t char_value_;
-    } type_;
-    mutable ::google::protobuf::internal::CachedSize _cached_size_;
-    ::uint32_t _oneof_case_[1];
-
-    PROTOBUF_TSAN_DECLARE_MEMBER
-  };
-  union { Impl_ _impl_; };
-  friend struct ::TableStruct_deephaven_2fproto_2ftable_2eproto;
-};// -------------------------------------------------------------------
-
-class AggSpec_AggSpecMin final :
-    public ::google::protobuf::internal::ZeroFieldsBase /* @@protoc_insertion_point(class_definition:io.deephaven.proto.backplane.grpc.AggSpec.AggSpecMin) */ {
- public:
-  inline AggSpec_AggSpecMin() : AggSpec_AggSpecMin(nullptr) {}
-  template<typename = void>
-  explicit PROTOBUF_CONSTEXPR AggSpec_AggSpecMin(::google::protobuf::internal::ConstantInitialized);
-
-  inline AggSpec_AggSpecMin(const AggSpec_AggSpecMin& from)
-      : AggSpec_AggSpecMin(nullptr, from) {}
-  AggSpec_AggSpecMin(AggSpec_AggSpecMin&& from) noexcept
-    : AggSpec_AggSpecMin() {
-    *this = ::std::move(from);
-  }
-
-  inline AggSpec_AggSpecMin& operator=(const AggSpec_AggSpecMin& from) {
-    CopyFrom(from);
-    return *this;
-  }
-  inline AggSpec_AggSpecMin& operator=(AggSpec_AggSpecMin&& from) noexcept {
-    if (this == &from) return *this;
-    if (GetArena() == from.GetArena()
-  #ifdef PROTOBUF_FORCE_COPY_IN_MOVE
-        && GetArena() != nullptr
-  #endif  // !PROTOBUF_FORCE_COPY_IN_MOVE
-    ) {
-      InternalSwap(&from);
-    } else {
-      CopyFrom(from);
-    }
-    return *this;
-  }
-
-  inline const ::google::protobuf::UnknownFieldSet& unknown_fields() const
-      ABSL_ATTRIBUTE_LIFETIME_BOUND {
-    return _internal_metadata_.unknown_fields<::google::protobuf::UnknownFieldSet>(::google::protobuf::UnknownFieldSet::default_instance);
-  }
-  inline ::google::protobuf::UnknownFieldSet* mutable_unknown_fields()
-      ABSL_ATTRIBUTE_LIFETIME_BOUND {
-    return _internal_metadata_.mutable_unknown_fields<::google::protobuf::UnknownFieldSet>();
-  }
-
-  static const ::google::protobuf::Descriptor* descriptor() {
-    return GetDescriptor();
-  }
-  static const ::google::protobuf::Descriptor* GetDescriptor() {
-    return default_instance().GetMetadata().descriptor;
-  }
-  static const ::google::protobuf::Reflection* GetReflection() {
-    return default_instance().GetMetadata().reflection;
-  }
-  static const AggSpec_AggSpecMin& default_instance() {
-    return *internal_default_instance();
-  }
-  static inline const AggSpec_AggSpecMin* internal_default_instance() {
-    return reinterpret_cast<const AggSpec_AggSpecMin*>(
-               &_AggSpec_AggSpecMin_default_instance_);
-  }
-  static constexpr int kIndexInFileMessages =
-    81;
-
-  friend void swap(AggSpec_AggSpecMin& a, AggSpec_AggSpecMin& b) {
-    a.Swap(&b);
-  }
-  inline void Swap(AggSpec_AggSpecMin* other) {
-    if (other == this) return;
-  #ifdef PROTOBUF_FORCE_COPY_IN_SWAP
-    if (GetArena() != nullptr &&
-        GetArena() == other->GetArena()) {
-   #else  // PROTOBUF_FORCE_COPY_IN_SWAP
-    if (GetArena() == other->GetArena()) {
-  #endif  // !PROTOBUF_FORCE_COPY_IN_SWAP
-      InternalSwap(other);
-    } else {
-      ::google::protobuf::internal::GenericSwap(this, other);
-    }
-  }
-  void UnsafeArenaSwap(AggSpec_AggSpecMin* other) {
-    if (other == this) return;
-    ABSL_DCHECK(GetArena() == other->GetArena());
-    InternalSwap(other);
-  }
-
-  // implements Message ----------------------------------------------
-
-  AggSpec_AggSpecMin* New(::google::protobuf::Arena* arena = nullptr) const final {
-    return CreateMaybeMessage<AggSpec_AggSpecMin>(arena);
-  }
-  using ::google::protobuf::internal::ZeroFieldsBase::CopyFrom;
-  inline void CopyFrom(const AggSpec_AggSpecMin& from) {
-    ::google::protobuf::internal::ZeroFieldsBase::CopyImpl(*this, from);
-  }
-  using ::google::protobuf::internal::ZeroFieldsBase::MergeFrom;
-  void MergeFrom(const AggSpec_AggSpecMin& from) {
-    ::google::protobuf::internal::ZeroFieldsBase::MergeImpl(*this, from);
-  }
-  public:
-
-  private:
-  friend class ::google::protobuf::internal::AnyMetadata;
-  static ::absl::string_view FullMessageName() {
-    return "io.deephaven.proto.backplane.grpc.AggSpec.AggSpecMin";
-  }
-  protected:
-  explicit AggSpec_AggSpecMin(::google::protobuf::Arena* arena);
-  AggSpec_AggSpecMin(::google::protobuf::Arena* arena, const AggSpec_AggSpecMin& from);
-  public:
-
-  ::google::protobuf::Metadata GetMetadata() const final;
-
-  // nested types ----------------------------------------------------
-
-  // accessors -------------------------------------------------------
-
-  // @@protoc_insertion_point(class_scope:io.deephaven.proto.backplane.grpc.AggSpec.AggSpecMin)
- private:
-  class _Internal;
-
-  friend class ::google::protobuf::MessageLite;
-  friend class ::google::protobuf::Arena;
-  template <typename T>
-  friend class ::google::protobuf::Arena::InternalHelper;
-  using InternalArenaConstructable_ = void;
-  using DestructorSkippable_ = void;
-  struct Impl_ {
-
-        inline explicit constexpr Impl_(
-            ::google::protobuf::internal::ConstantInitialized) noexcept;
-        inline explicit Impl_(::google::protobuf::internal::InternalVisibility visibility,
-                              ::google::protobuf::Arena* arena);
-        inline explicit Impl_(::google::protobuf::internal::InternalVisibility visibility,
-                              ::google::protobuf::Arena* arena, const Impl_& from);
-    PROTOBUF_TSAN_DECLARE_MEMBER
-  };
-  friend struct ::TableStruct_deephaven_2fproto_2ftable_2eproto;
-};// -------------------------------------------------------------------
-
-class AggSpec_AggSpecMedian final :
-    public ::google::protobuf::Message /* @@protoc_insertion_point(class_definition:io.deephaven.proto.backplane.grpc.AggSpec.AggSpecMedian) */ {
- public:
-  inline AggSpec_AggSpecMedian() : AggSpec_AggSpecMedian(nullptr) {}
-  ~AggSpec_AggSpecMedian() override;
-  template<typename = void>
-  explicit PROTOBUF_CONSTEXPR AggSpec_AggSpecMedian(::google::protobuf::internal::ConstantInitialized);
-
-  inline AggSpec_AggSpecMedian(const AggSpec_AggSpecMedian& from)
-      : AggSpec_AggSpecMedian(nullptr, from) {}
-  AggSpec_AggSpecMedian(AggSpec_AggSpecMedian&& from) noexcept
-    : AggSpec_AggSpecMedian() {
-    *this = ::std::move(from);
-  }
-
-  inline AggSpec_AggSpecMedian& operator=(const AggSpec_AggSpecMedian& from) {
-    CopyFrom(from);
-    return *this;
-  }
-  inline AggSpec_AggSpecMedian& operator=(AggSpec_AggSpecMedian&& from) noexcept {
-    if (this == &from) return *this;
-    if (GetArena() == from.GetArena()
-  #ifdef PROTOBUF_FORCE_COPY_IN_MOVE
-        && GetArena() != nullptr
-  #endif  // !PROTOBUF_FORCE_COPY_IN_MOVE
-    ) {
-      InternalSwap(&from);
-    } else {
-      CopyFrom(from);
-    }
-    return *this;
-  }
-
-  inline const ::google::protobuf::UnknownFieldSet& unknown_fields() const
-      ABSL_ATTRIBUTE_LIFETIME_BOUND {
-    return _internal_metadata_.unknown_fields<::google::protobuf::UnknownFieldSet>(::google::protobuf::UnknownFieldSet::default_instance);
-  }
-  inline ::google::protobuf::UnknownFieldSet* mutable_unknown_fields()
-      ABSL_ATTRIBUTE_LIFETIME_BOUND {
-    return _internal_metadata_.mutable_unknown_fields<::google::protobuf::UnknownFieldSet>();
-  }
-
-  static const ::google::protobuf::Descriptor* descriptor() {
-    return GetDescriptor();
-  }
-  static const ::google::protobuf::Descriptor* GetDescriptor() {
-    return default_instance().GetMetadata().descriptor;
-  }
-  static const ::google::protobuf::Reflection* GetReflection() {
-    return default_instance().GetMetadata().reflection;
-  }
-  static const AggSpec_AggSpecMedian& default_instance() {
-    return *internal_default_instance();
-  }
-  static inline const AggSpec_AggSpecMedian* internal_default_instance() {
-    return reinterpret_cast<const AggSpec_AggSpecMedian*>(
-               &_AggSpec_AggSpecMedian_default_instance_);
-  }
-  static constexpr int kIndexInFileMessages =
-    66;
-
-  friend void swap(AggSpec_AggSpecMedian& a, AggSpec_AggSpecMedian& b) {
-    a.Swap(&b);
-  }
-  inline void Swap(AggSpec_AggSpecMedian* other) {
-    if (other == this) return;
-  #ifdef PROTOBUF_FORCE_COPY_IN_SWAP
-    if (GetArena() != nullptr &&
-        GetArena() == other->GetArena()) {
-   #else  // PROTOBUF_FORCE_COPY_IN_SWAP
-    if (GetArena() == other->GetArena()) {
-  #endif  // !PROTOBUF_FORCE_COPY_IN_SWAP
-      InternalSwap(other);
-    } else {
-      ::google::protobuf::internal::GenericSwap(this, other);
-    }
-  }
-  void UnsafeArenaSwap(AggSpec_AggSpecMedian* other) {
-    if (other == this) return;
-    ABSL_DCHECK(GetArena() == other->GetArena());
-    InternalSwap(other);
-  }
-
-  // implements Message ----------------------------------------------
-
-  AggSpec_AggSpecMedian* New(::google::protobuf::Arena* arena = nullptr) const final {
-    return CreateMaybeMessage<AggSpec_AggSpecMedian>(arena);
-  }
-  using ::google::protobuf::Message::CopyFrom;
-  void CopyFrom(const AggSpec_AggSpecMedian& from);
-  using ::google::protobuf::Message::MergeFrom;
-  void MergeFrom( const AggSpec_AggSpecMedian& from) {
-    AggSpec_AggSpecMedian::MergeImpl(*this, from);
-  }
-  private:
-  static void MergeImpl(::google::protobuf::Message& to_msg, const ::google::protobuf::Message& from_msg);
-  public:
-  PROTOBUF_ATTRIBUTE_REINITIALIZES void Clear() final;
-  bool IsInitialized() const final;
-
-  ::size_t ByteSizeLong() const final;
-  const char* _InternalParse(const char* ptr, ::google::protobuf::internal::ParseContext* ctx) final;
-  ::uint8_t* _InternalSerialize(
-      ::uint8_t* target, ::google::protobuf::io::EpsCopyOutputStream* stream) const final;
-  int GetCachedSize() const { return _impl_._cached_size_.Get(); }
-
-  private:
-  ::google::protobuf::internal::CachedSize* AccessCachedSize() const final;
-  void SharedCtor(::google::protobuf::Arena* arena);
-  void SharedDtor();
-  void InternalSwap(AggSpec_AggSpecMedian* other);
-
-  private:
-  friend class ::google::protobuf::internal::AnyMetadata;
-  static ::absl::string_view FullMessageName() {
-    return "io.deephaven.proto.backplane.grpc.AggSpec.AggSpecMedian";
-  }
-  protected:
-  explicit AggSpec_AggSpecMedian(::google::protobuf::Arena* arena);
-  AggSpec_AggSpecMedian(::google::protobuf::Arena* arena, const AggSpec_AggSpecMedian& from);
-  public:
-
-  static const ClassData _class_data_;
-  const ::google::protobuf::Message::ClassData*GetClassData() const final;
-
-  ::google::protobuf::Metadata GetMetadata() const final;
-
-  // nested types ----------------------------------------------------
-
-  // accessors -------------------------------------------------------
-
-  enum : int {
-    kAverageEvenlyDividedFieldNumber = 1,
-  };
-  // bool average_evenly_divided = 1;
-  void clear_average_evenly_divided() ;
-  bool average_evenly_divided() const;
-  void set_average_evenly_divided(bool value);
-
-  private:
-  bool _internal_average_evenly_divided() const;
-  void _internal_set_average_evenly_divided(bool value);
-
-  public:
-  // @@protoc_insertion_point(class_scope:io.deephaven.proto.backplane.grpc.AggSpec.AggSpecMedian)
- private:
-  class _Internal;
-
-  friend class ::google::protobuf::internal::TcParser;
-  static const ::google::protobuf::internal::TcParseTable<
-      0, 1, 0,
-      0, 2>
-      _table_;
-  friend class ::google::protobuf::MessageLite;
-  friend class ::google::protobuf::Arena;
-  template <typename T>
-  friend class ::google::protobuf::Arena::InternalHelper;
-  using InternalArenaConstructable_ = void;
-  using DestructorSkippable_ = void;
-  struct Impl_ {
-
-        inline explicit constexpr Impl_(
-            ::google::protobuf::internal::ConstantInitialized) noexcept;
-        inline explicit Impl_(::google::protobuf::internal::InternalVisibility visibility,
-                              ::google::protobuf::Arena* arena);
-        inline explicit Impl_(::google::protobuf::internal::InternalVisibility visibility,
-                              ::google::protobuf::Arena* arena, const Impl_& from);
-    bool average_evenly_divided_;
-    mutable ::google::protobuf::internal::CachedSize _cached_size_;
-    PROTOBUF_TSAN_DECLARE_MEMBER
-  };
-  union { Impl_ _impl_; };
-  friend struct ::TableStruct_deephaven_2fproto_2ftable_2eproto;
-};// -------------------------------------------------------------------
-
-class AggSpec_AggSpecMax final :
-    public ::google::protobuf::internal::ZeroFieldsBase /* @@protoc_insertion_point(class_definition:io.deephaven.proto.backplane.grpc.AggSpec.AggSpecMax) */ {
- public:
-  inline AggSpec_AggSpecMax() : AggSpec_AggSpecMax(nullptr) {}
-  template<typename = void>
-  explicit PROTOBUF_CONSTEXPR AggSpec_AggSpecMax(::google::protobuf::internal::ConstantInitialized);
-
-  inline AggSpec_AggSpecMax(const AggSpec_AggSpecMax& from)
-      : AggSpec_AggSpecMax(nullptr, from) {}
-  AggSpec_AggSpecMax(AggSpec_AggSpecMax&& from) noexcept
-    : AggSpec_AggSpecMax() {
-    *this = ::std::move(from);
-  }
-
-  inline AggSpec_AggSpecMax& operator=(const AggSpec_AggSpecMax& from) {
-    CopyFrom(from);
-    return *this;
-  }
-  inline AggSpec_AggSpecMax& operator=(AggSpec_AggSpecMax&& from) noexcept {
-    if (this == &from) return *this;
-    if (GetArena() == from.GetArena()
-  #ifdef PROTOBUF_FORCE_COPY_IN_MOVE
-        && GetArena() != nullptr
-  #endif  // !PROTOBUF_FORCE_COPY_IN_MOVE
-    ) {
-      InternalSwap(&from);
-    } else {
-      CopyFrom(from);
-    }
-    return *this;
-  }
-
-  inline const ::google::protobuf::UnknownFieldSet& unknown_fields() const
-      ABSL_ATTRIBUTE_LIFETIME_BOUND {
-    return _internal_metadata_.unknown_fields<::google::protobuf::UnknownFieldSet>(::google::protobuf::UnknownFieldSet::default_instance);
-  }
-  inline ::google::protobuf::UnknownFieldSet* mutable_unknown_fields()
-      ABSL_ATTRIBUTE_LIFETIME_BOUND {
-    return _internal_metadata_.mutable_unknown_fields<::google::protobuf::UnknownFieldSet>();
-  }
-
-  static const ::google::protobuf::Descriptor* descriptor() {
-    return GetDescriptor();
-  }
-  static const ::google::protobuf::Descriptor* GetDescriptor() {
-    return default_instance().GetMetadata().descriptor;
-  }
-  static const ::google::protobuf::Reflection* GetReflection() {
-    return default_instance().GetMetadata().reflection;
-  }
-  static const AggSpec_AggSpecMax& default_instance() {
-    return *internal_default_instance();
-  }
-  static inline const AggSpec_AggSpecMax* internal_default_instance() {
-    return reinterpret_cast<const AggSpec_AggSpecMax*>(
-               &_AggSpec_AggSpecMax_default_instance_);
-  }
-  static constexpr int kIndexInFileMessages =
-    80;
-
-  friend void swap(AggSpec_AggSpecMax& a, AggSpec_AggSpecMax& b) {
-    a.Swap(&b);
-  }
-  inline void Swap(AggSpec_AggSpecMax* other) {
-    if (other == this) return;
-  #ifdef PROTOBUF_FORCE_COPY_IN_SWAP
-    if (GetArena() != nullptr &&
-        GetArena() == other->GetArena()) {
-   #else  // PROTOBUF_FORCE_COPY_IN_SWAP
-    if (GetArena() == other->GetArena()) {
-  #endif  // !PROTOBUF_FORCE_COPY_IN_SWAP
-      InternalSwap(other);
-    } else {
-      ::google::protobuf::internal::GenericSwap(this, other);
-    }
-  }
-  void UnsafeArenaSwap(AggSpec_AggSpecMax* other) {
-    if (other == this) return;
-    ABSL_DCHECK(GetArena() == other->GetArena());
-    InternalSwap(other);
-  }
-
-  // implements Message ----------------------------------------------
-
-  AggSpec_AggSpecMax* New(::google::protobuf::Arena* arena = nullptr) const final {
-    return CreateMaybeMessage<AggSpec_AggSpecMax>(arena);
-  }
-  using ::google::protobuf::internal::ZeroFieldsBase::CopyFrom;
-  inline void CopyFrom(const AggSpec_AggSpecMax& from) {
-    ::google::protobuf::internal::ZeroFieldsBase::CopyImpl(*this, from);
-  }
-  using ::google::protobuf::internal::ZeroFieldsBase::MergeFrom;
-  void MergeFrom(const AggSpec_AggSpecMax& from) {
-    ::google::protobuf::internal::ZeroFieldsBase::MergeImpl(*this, from);
-  }
-  public:
-
-  private:
-  friend class ::google::protobuf::internal::AnyMetadata;
-  static ::absl::string_view FullMessageName() {
-    return "io.deephaven.proto.backplane.grpc.AggSpec.AggSpecMax";
-  }
-  protected:
-  explicit AggSpec_AggSpecMax(::google::protobuf::Arena* arena);
-  AggSpec_AggSpecMax(::google::protobuf::Arena* arena, const AggSpec_AggSpecMax& from);
-  public:
-
-  ::google::protobuf::Metadata GetMetadata() const final;
-
-  // nested types ----------------------------------------------------
-
-  // accessors -------------------------------------------------------
-
-  // @@protoc_insertion_point(class_scope:io.deephaven.proto.backplane.grpc.AggSpec.AggSpecMax)
- private:
-  class _Internal;
-
-  friend class ::google::protobuf::MessageLite;
-  friend class ::google::protobuf::Arena;
-  template <typename T>
-  friend class ::google::protobuf::Arena::InternalHelper;
-  using InternalArenaConstructable_ = void;
-  using DestructorSkippable_ = void;
-  struct Impl_ {
-
-        inline explicit constexpr Impl_(
-            ::google::protobuf::internal::ConstantInitialized) noexcept;
-        inline explicit Impl_(::google::protobuf::internal::InternalVisibility visibility,
-                              ::google::protobuf::Arena* arena);
-        inline explicit Impl_(::google::protobuf::internal::InternalVisibility visibility,
-                              ::google::protobuf::Arena* arena, const Impl_& from);
-    PROTOBUF_TSAN_DECLARE_MEMBER
-  };
-  friend struct ::TableStruct_deephaven_2fproto_2ftable_2eproto;
-};// -------------------------------------------------------------------
-
-class AggSpec_AggSpecLast final :
-    public ::google::protobuf::internal::ZeroFieldsBase /* @@protoc_insertion_point(class_definition:io.deephaven.proto.backplane.grpc.AggSpec.AggSpecLast) */ {
- public:
-  inline AggSpec_AggSpecLast() : AggSpec_AggSpecLast(nullptr) {}
-  template<typename = void>
-  explicit PROTOBUF_CONSTEXPR AggSpec_AggSpecLast(::google::protobuf::internal::ConstantInitialized);
-
-  inline AggSpec_AggSpecLast(const AggSpec_AggSpecLast& from)
-      : AggSpec_AggSpecLast(nullptr, from) {}
-  AggSpec_AggSpecLast(AggSpec_AggSpecLast&& from) noexcept
-    : AggSpec_AggSpecLast() {
-    *this = ::std::move(from);
-  }
-
-  inline AggSpec_AggSpecLast& operator=(const AggSpec_AggSpecLast& from) {
-    CopyFrom(from);
-    return *this;
-  }
-  inline AggSpec_AggSpecLast& operator=(AggSpec_AggSpecLast&& from) noexcept {
-    if (this == &from) return *this;
-    if (GetArena() == from.GetArena()
-  #ifdef PROTOBUF_FORCE_COPY_IN_MOVE
-        && GetArena() != nullptr
-  #endif  // !PROTOBUF_FORCE_COPY_IN_MOVE
-    ) {
-      InternalSwap(&from);
-    } else {
-      CopyFrom(from);
-    }
-    return *this;
-  }
-
-  inline const ::google::protobuf::UnknownFieldSet& unknown_fields() const
-      ABSL_ATTRIBUTE_LIFETIME_BOUND {
-    return _internal_metadata_.unknown_fields<::google::protobuf::UnknownFieldSet>(::google::protobuf::UnknownFieldSet::default_instance);
-  }
-  inline ::google::protobuf::UnknownFieldSet* mutable_unknown_fields()
-      ABSL_ATTRIBUTE_LIFETIME_BOUND {
-    return _internal_metadata_.mutable_unknown_fields<::google::protobuf::UnknownFieldSet>();
-  }
-
-  static const ::google::protobuf::Descriptor* descriptor() {
-    return GetDescriptor();
-  }
-  static const ::google::protobuf::Descriptor* GetDescriptor() {
-    return default_instance().GetMetadata().descriptor;
-  }
-  static const ::google::protobuf::Reflection* GetReflection() {
-    return default_instance().GetMetadata().reflection;
-  }
-  static const AggSpec_AggSpecLast& default_instance() {
-    return *internal_default_instance();
-  }
-  static inline const AggSpec_AggSpecLast* internal_default_instance() {
-    return reinterpret_cast<const AggSpec_AggSpecLast*>(
-               &_AggSpec_AggSpecLast_default_instance_);
-  }
-  static constexpr int kIndexInFileMessages =
-    79;
-
-  friend void swap(AggSpec_AggSpecLast& a, AggSpec_AggSpecLast& b) {
-    a.Swap(&b);
-  }
-  inline void Swap(AggSpec_AggSpecLast* other) {
-    if (other == this) return;
-  #ifdef PROTOBUF_FORCE_COPY_IN_SWAP
-    if (GetArena() != nullptr &&
-        GetArena() == other->GetArena()) {
-   #else  // PROTOBUF_FORCE_COPY_IN_SWAP
-    if (GetArena() == other->GetArena()) {
-  #endif  // !PROTOBUF_FORCE_COPY_IN_SWAP
-      InternalSwap(other);
-    } else {
-      ::google::protobuf::internal::GenericSwap(this, other);
-    }
-  }
-  void UnsafeArenaSwap(AggSpec_AggSpecLast* other) {
-    if (other == this) return;
-    ABSL_DCHECK(GetArena() == other->GetArena());
-    InternalSwap(other);
-  }
-
-  // implements Message ----------------------------------------------
-
-  AggSpec_AggSpecLast* New(::google::protobuf::Arena* arena = nullptr) const final {
-    return CreateMaybeMessage<AggSpec_AggSpecLast>(arena);
-  }
-  using ::google::protobuf::internal::ZeroFieldsBase::CopyFrom;
-  inline void CopyFrom(const AggSpec_AggSpecLast& from) {
-    ::google::protobuf::internal::ZeroFieldsBase::CopyImpl(*this, from);
-  }
-  using ::google::protobuf::internal::ZeroFieldsBase::MergeFrom;
-  void MergeFrom(const AggSpec_AggSpecLast& from) {
-    ::google::protobuf::internal::ZeroFieldsBase::MergeImpl(*this, from);
-  }
-  public:
-
-  private:
-  friend class ::google::protobuf::internal::AnyMetadata;
-  static ::absl::string_view FullMessageName() {
-    return "io.deephaven.proto.backplane.grpc.AggSpec.AggSpecLast";
-  }
-  protected:
-  explicit AggSpec_AggSpecLast(::google::protobuf::Arena* arena);
-  AggSpec_AggSpecLast(::google::protobuf::Arena* arena, const AggSpec_AggSpecLast& from);
-  public:
-
-  ::google::protobuf::Metadata GetMetadata() const final;
-
-  // nested types ----------------------------------------------------
-
-  // accessors -------------------------------------------------------
-
-  // @@protoc_insertion_point(class_scope:io.deephaven.proto.backplane.grpc.AggSpec.AggSpecLast)
- private:
-  class _Internal;
-
-  friend class ::google::protobuf::MessageLite;
-  friend class ::google::protobuf::Arena;
-  template <typename T>
-  friend class ::google::protobuf::Arena::InternalHelper;
-  using InternalArenaConstructable_ = void;
-  using DestructorSkippable_ = void;
-  struct Impl_ {
-
-        inline explicit constexpr Impl_(
-            ::google::protobuf::internal::ConstantInitialized) noexcept;
-        inline explicit Impl_(::google::protobuf::internal::InternalVisibility visibility,
-                              ::google::protobuf::Arena* arena);
-        inline explicit Impl_(::google::protobuf::internal::InternalVisibility visibility,
-                              ::google::protobuf::Arena* arena, const Impl_& from);
-    PROTOBUF_TSAN_DECLARE_MEMBER
-  };
-  friend struct ::TableStruct_deephaven_2fproto_2ftable_2eproto;
-};// -------------------------------------------------------------------
-
-class AggSpec_AggSpecGroup final :
-    public ::google::protobuf::internal::ZeroFieldsBase /* @@protoc_insertion_point(class_definition:io.deephaven.proto.backplane.grpc.AggSpec.AggSpecGroup) */ {
- public:
-  inline AggSpec_AggSpecGroup() : AggSpec_AggSpecGroup(nullptr) {}
-  template<typename = void>
-  explicit PROTOBUF_CONSTEXPR AggSpec_AggSpecGroup(::google::protobuf::internal::ConstantInitialized);
-
-  inline AggSpec_AggSpecGroup(const AggSpec_AggSpecGroup& from)
-      : AggSpec_AggSpecGroup(nullptr, from) {}
-  AggSpec_AggSpecGroup(AggSpec_AggSpecGroup&& from) noexcept
-    : AggSpec_AggSpecGroup() {
-    *this = ::std::move(from);
-  }
-
-  inline AggSpec_AggSpecGroup& operator=(const AggSpec_AggSpecGroup& from) {
-    CopyFrom(from);
-    return *this;
-  }
-  inline AggSpec_AggSpecGroup& operator=(AggSpec_AggSpecGroup&& from) noexcept {
-    if (this == &from) return *this;
-    if (GetArena() == from.GetArena()
-  #ifdef PROTOBUF_FORCE_COPY_IN_MOVE
-        && GetArena() != nullptr
-  #endif  // !PROTOBUF_FORCE_COPY_IN_MOVE
-    ) {
-      InternalSwap(&from);
-    } else {
-      CopyFrom(from);
-    }
-    return *this;
-  }
-
-  inline const ::google::protobuf::UnknownFieldSet& unknown_fields() const
-      ABSL_ATTRIBUTE_LIFETIME_BOUND {
-    return _internal_metadata_.unknown_fields<::google::protobuf::UnknownFieldSet>(::google::protobuf::UnknownFieldSet::default_instance);
-  }
-  inline ::google::protobuf::UnknownFieldSet* mutable_unknown_fields()
-      ABSL_ATTRIBUTE_LIFETIME_BOUND {
-    return _internal_metadata_.mutable_unknown_fields<::google::protobuf::UnknownFieldSet>();
-  }
-
-  static const ::google::protobuf::Descriptor* descriptor() {
-    return GetDescriptor();
-  }
-  static const ::google::protobuf::Descriptor* GetDescriptor() {
-    return default_instance().GetMetadata().descriptor;
-  }
-  static const ::google::protobuf::Reflection* GetReflection() {
-    return default_instance().GetMetadata().reflection;
-  }
-  static const AggSpec_AggSpecGroup& default_instance() {
-    return *internal_default_instance();
-  }
-  static inline const AggSpec_AggSpecGroup* internal_default_instance() {
-    return reinterpret_cast<const AggSpec_AggSpecGroup*>(
-               &_AggSpec_AggSpecGroup_default_instance_);
-  }
-  static constexpr int kIndexInFileMessages =
-    78;
-
-  friend void swap(AggSpec_AggSpecGroup& a, AggSpec_AggSpecGroup& b) {
-    a.Swap(&b);
-  }
-  inline void Swap(AggSpec_AggSpecGroup* other) {
-    if (other == this) return;
-  #ifdef PROTOBUF_FORCE_COPY_IN_SWAP
-    if (GetArena() != nullptr &&
-        GetArena() == other->GetArena()) {
-   #else  // PROTOBUF_FORCE_COPY_IN_SWAP
-    if (GetArena() == other->GetArena()) {
-  #endif  // !PROTOBUF_FORCE_COPY_IN_SWAP
-      InternalSwap(other);
-    } else {
-      ::google::protobuf::internal::GenericSwap(this, other);
-    }
-  }
-  void UnsafeArenaSwap(AggSpec_AggSpecGroup* other) {
-    if (other == this) return;
-    ABSL_DCHECK(GetArena() == other->GetArena());
-    InternalSwap(other);
-  }
-
-  // implements Message ----------------------------------------------
-
-  AggSpec_AggSpecGroup* New(::google::protobuf::Arena* arena = nullptr) const final {
-    return CreateMaybeMessage<AggSpec_AggSpecGroup>(arena);
-  }
-  using ::google::protobuf::internal::ZeroFieldsBase::CopyFrom;
-  inline void CopyFrom(const AggSpec_AggSpecGroup& from) {
-    ::google::protobuf::internal::ZeroFieldsBase::CopyImpl(*this, from);
-  }
-  using ::google::protobuf::internal::ZeroFieldsBase::MergeFrom;
-  void MergeFrom(const AggSpec_AggSpecGroup& from) {
-    ::google::protobuf::internal::ZeroFieldsBase::MergeImpl(*this, from);
-  }
-  public:
-
-  private:
-  friend class ::google::protobuf::internal::AnyMetadata;
-  static ::absl::string_view FullMessageName() {
-    return "io.deephaven.proto.backplane.grpc.AggSpec.AggSpecGroup";
-  }
-  protected:
-  explicit AggSpec_AggSpecGroup(::google::protobuf::Arena* arena);
-  AggSpec_AggSpecGroup(::google::protobuf::Arena* arena, const AggSpec_AggSpecGroup& from);
-  public:
-
-  ::google::protobuf::Metadata GetMetadata() const final;
-
-  // nested types ----------------------------------------------------
-
-  // accessors -------------------------------------------------------
-
-  // @@protoc_insertion_point(class_scope:io.deephaven.proto.backplane.grpc.AggSpec.AggSpecGroup)
- private:
-  class _Internal;
-
-  friend class ::google::protobuf::MessageLite;
-  friend class ::google::protobuf::Arena;
-  template <typename T>
-  friend class ::google::protobuf::Arena::InternalHelper;
-  using InternalArenaConstructable_ = void;
-  using DestructorSkippable_ = void;
-  struct Impl_ {
-
-        inline explicit constexpr Impl_(
-            ::google::protobuf::internal::ConstantInitialized) noexcept;
-        inline explicit Impl_(::google::protobuf::internal::InternalVisibility visibility,
-                              ::google::protobuf::Arena* arena);
-        inline explicit Impl_(::google::protobuf::internal::InternalVisibility visibility,
-                              ::google::protobuf::Arena* arena, const Impl_& from);
-    PROTOBUF_TSAN_DECLARE_MEMBER
-  };
-  friend struct ::TableStruct_deephaven_2fproto_2ftable_2eproto;
-};// -------------------------------------------------------------------
-
-class AggSpec_AggSpecFreeze final :
-    public ::google::protobuf::internal::ZeroFieldsBase /* @@protoc_insertion_point(class_definition:io.deephaven.proto.backplane.grpc.AggSpec.AggSpecFreeze) */ {
- public:
-  inline AggSpec_AggSpecFreeze() : AggSpec_AggSpecFreeze(nullptr) {}
-  template<typename = void>
-  explicit PROTOBUF_CONSTEXPR AggSpec_AggSpecFreeze(::google::protobuf::internal::ConstantInitialized);
-
-  inline AggSpec_AggSpecFreeze(const AggSpec_AggSpecFreeze& from)
-      : AggSpec_AggSpecFreeze(nullptr, from) {}
-  AggSpec_AggSpecFreeze(AggSpec_AggSpecFreeze&& from) noexcept
-    : AggSpec_AggSpecFreeze() {
-    *this = ::std::move(from);
-  }
-
-  inline AggSpec_AggSpecFreeze& operator=(const AggSpec_AggSpecFreeze& from) {
-    CopyFrom(from);
-    return *this;
-  }
-  inline AggSpec_AggSpecFreeze& operator=(AggSpec_AggSpecFreeze&& from) noexcept {
-    if (this == &from) return *this;
-    if (GetArena() == from.GetArena()
-  #ifdef PROTOBUF_FORCE_COPY_IN_MOVE
-        && GetArena() != nullptr
-  #endif  // !PROTOBUF_FORCE_COPY_IN_MOVE
-    ) {
-      InternalSwap(&from);
-    } else {
-      CopyFrom(from);
-    }
-    return *this;
-  }
-
-  inline const ::google::protobuf::UnknownFieldSet& unknown_fields() const
-      ABSL_ATTRIBUTE_LIFETIME_BOUND {
-    return _internal_metadata_.unknown_fields<::google::protobuf::UnknownFieldSet>(::google::protobuf::UnknownFieldSet::default_instance);
-  }
-  inline ::google::protobuf::UnknownFieldSet* mutable_unknown_fields()
-      ABSL_ATTRIBUTE_LIFETIME_BOUND {
-    return _internal_metadata_.mutable_unknown_fields<::google::protobuf::UnknownFieldSet>();
-  }
-
-  static const ::google::protobuf::Descriptor* descriptor() {
-    return GetDescriptor();
-  }
-  static const ::google::protobuf::Descriptor* GetDescriptor() {
-    return default_instance().GetMetadata().descriptor;
-  }
-  static const ::google::protobuf::Reflection* GetReflection() {
-    return default_instance().GetMetadata().reflection;
-  }
-  static const AggSpec_AggSpecFreeze& default_instance() {
-    return *internal_default_instance();
-  }
-  static inline const AggSpec_AggSpecFreeze* internal_default_instance() {
-    return reinterpret_cast<const AggSpec_AggSpecFreeze*>(
-               &_AggSpec_AggSpecFreeze_default_instance_);
-  }
-  static constexpr int kIndexInFileMessages =
-    77;
-
-  friend void swap(AggSpec_AggSpecFreeze& a, AggSpec_AggSpecFreeze& b) {
-    a.Swap(&b);
-  }
-  inline void Swap(AggSpec_AggSpecFreeze* other) {
-    if (other == this) return;
-  #ifdef PROTOBUF_FORCE_COPY_IN_SWAP
-    if (GetArena() != nullptr &&
-        GetArena() == other->GetArena()) {
-   #else  // PROTOBUF_FORCE_COPY_IN_SWAP
-    if (GetArena() == other->GetArena()) {
-  #endif  // !PROTOBUF_FORCE_COPY_IN_SWAP
-      InternalSwap(other);
-    } else {
-      ::google::protobuf::internal::GenericSwap(this, other);
-    }
-  }
-  void UnsafeArenaSwap(AggSpec_AggSpecFreeze* other) {
-    if (other == this) return;
-    ABSL_DCHECK(GetArena() == other->GetArena());
-    InternalSwap(other);
-  }
-
-  // implements Message ----------------------------------------------
-
-  AggSpec_AggSpecFreeze* New(::google::protobuf::Arena* arena = nullptr) const final {
-    return CreateMaybeMessage<AggSpec_AggSpecFreeze>(arena);
-  }
-  using ::google::protobuf::internal::ZeroFieldsBase::CopyFrom;
-  inline void CopyFrom(const AggSpec_AggSpecFreeze& from) {
-    ::google::protobuf::internal::ZeroFieldsBase::CopyImpl(*this, from);
-  }
-  using ::google::protobuf::internal::ZeroFieldsBase::MergeFrom;
-  void MergeFrom(const AggSpec_AggSpecFreeze& from) {
-    ::google::protobuf::internal::ZeroFieldsBase::MergeImpl(*this, from);
-  }
-  public:
-
-  private:
-  friend class ::google::protobuf::internal::AnyMetadata;
-  static ::absl::string_view FullMessageName() {
-    return "io.deephaven.proto.backplane.grpc.AggSpec.AggSpecFreeze";
-  }
-  protected:
-  explicit AggSpec_AggSpecFreeze(::google::protobuf::Arena* arena);
-  AggSpec_AggSpecFreeze(::google::protobuf::Arena* arena, const AggSpec_AggSpecFreeze& from);
-  public:
-
-  ::google::protobuf::Metadata GetMetadata() const final;
-
-  // nested types ----------------------------------------------------
-
-  // accessors -------------------------------------------------------
-
-  // @@protoc_insertion_point(class_scope:io.deephaven.proto.backplane.grpc.AggSpec.AggSpecFreeze)
- private:
-  class _Internal;
-
-  friend class ::google::protobuf::MessageLite;
-  friend class ::google::protobuf::Arena;
-  template <typename T>
-  friend class ::google::protobuf::Arena::InternalHelper;
-  using InternalArenaConstructable_ = void;
-  using DestructorSkippable_ = void;
-  struct Impl_ {
-
-        inline explicit constexpr Impl_(
-            ::google::protobuf::internal::ConstantInitialized) noexcept;
-        inline explicit Impl_(::google::protobuf::internal::InternalVisibility visibility,
-                              ::google::protobuf::Arena* arena);
-        inline explicit Impl_(::google::protobuf::internal::InternalVisibility visibility,
-                              ::google::protobuf::Arena* arena, const Impl_& from);
-    PROTOBUF_TSAN_DECLARE_MEMBER
-  };
-  friend struct ::TableStruct_deephaven_2fproto_2ftable_2eproto;
-};// -------------------------------------------------------------------
-
-class AggSpec_AggSpecFormula final :
-    public ::google::protobuf::Message /* @@protoc_insertion_point(class_definition:io.deephaven.proto.backplane.grpc.AggSpec.AggSpecFormula) */ {
- public:
-  inline AggSpec_AggSpecFormula() : AggSpec_AggSpecFormula(nullptr) {}
-  ~AggSpec_AggSpecFormula() override;
-  template<typename = void>
-  explicit PROTOBUF_CONSTEXPR AggSpec_AggSpecFormula(::google::protobuf::internal::ConstantInitialized);
-
-  inline AggSpec_AggSpecFormula(const AggSpec_AggSpecFormula& from)
-      : AggSpec_AggSpecFormula(nullptr, from) {}
-  AggSpec_AggSpecFormula(AggSpec_AggSpecFormula&& from) noexcept
-    : AggSpec_AggSpecFormula() {
-    *this = ::std::move(from);
-  }
-
-  inline AggSpec_AggSpecFormula& operator=(const AggSpec_AggSpecFormula& from) {
-    CopyFrom(from);
-    return *this;
-  }
-  inline AggSpec_AggSpecFormula& operator=(AggSpec_AggSpecFormula&& from) noexcept {
-    if (this == &from) return *this;
-    if (GetArena() == from.GetArena()
-  #ifdef PROTOBUF_FORCE_COPY_IN_MOVE
-        && GetArena() != nullptr
-  #endif  // !PROTOBUF_FORCE_COPY_IN_MOVE
-    ) {
-      InternalSwap(&from);
-    } else {
-      CopyFrom(from);
-    }
-    return *this;
-  }
-
-  inline const ::google::protobuf::UnknownFieldSet& unknown_fields() const
-      ABSL_ATTRIBUTE_LIFETIME_BOUND {
-    return _internal_metadata_.unknown_fields<::google::protobuf::UnknownFieldSet>(::google::protobuf::UnknownFieldSet::default_instance);
-  }
-  inline ::google::protobuf::UnknownFieldSet* mutable_unknown_fields()
-      ABSL_ATTRIBUTE_LIFETIME_BOUND {
-    return _internal_metadata_.mutable_unknown_fields<::google::protobuf::UnknownFieldSet>();
-  }
-
-  static const ::google::protobuf::Descriptor* descriptor() {
-    return GetDescriptor();
-  }
-  static const ::google::protobuf::Descriptor* GetDescriptor() {
-    return default_instance().GetMetadata().descriptor;
-  }
-  static const ::google::protobuf::Reflection* GetReflection() {
-    return default_instance().GetMetadata().reflection;
-  }
-  static const AggSpec_AggSpecFormula& default_instance() {
-    return *internal_default_instance();
-  }
-  static inline const AggSpec_AggSpecFormula* internal_default_instance() {
-    return reinterpret_cast<const AggSpec_AggSpecFormula*>(
-               &_AggSpec_AggSpecFormula_default_instance_);
-  }
-  static constexpr int kIndexInFileMessages =
-    65;
-
-  friend void swap(AggSpec_AggSpecFormula& a, AggSpec_AggSpecFormula& b) {
-    a.Swap(&b);
-  }
-  inline void Swap(AggSpec_AggSpecFormula* other) {
-    if (other == this) return;
-  #ifdef PROTOBUF_FORCE_COPY_IN_SWAP
-    if (GetArena() != nullptr &&
-        GetArena() == other->GetArena()) {
-   #else  // PROTOBUF_FORCE_COPY_IN_SWAP
-    if (GetArena() == other->GetArena()) {
-  #endif  // !PROTOBUF_FORCE_COPY_IN_SWAP
-      InternalSwap(other);
-    } else {
-      ::google::protobuf::internal::GenericSwap(this, other);
-    }
-  }
-  void UnsafeArenaSwap(AggSpec_AggSpecFormula* other) {
-    if (other == this) return;
-    ABSL_DCHECK(GetArena() == other->GetArena());
-    InternalSwap(other);
-  }
-
-  // implements Message ----------------------------------------------
-
-  AggSpec_AggSpecFormula* New(::google::protobuf::Arena* arena = nullptr) const final {
-    return CreateMaybeMessage<AggSpec_AggSpecFormula>(arena);
-  }
-  using ::google::protobuf::Message::CopyFrom;
-  void CopyFrom(const AggSpec_AggSpecFormula& from);
-  using ::google::protobuf::Message::MergeFrom;
-  void MergeFrom( const AggSpec_AggSpecFormula& from) {
-    AggSpec_AggSpecFormula::MergeImpl(*this, from);
-  }
-  private:
-  static void MergeImpl(::google::protobuf::Message& to_msg, const ::google::protobuf::Message& from_msg);
-  public:
-  PROTOBUF_ATTRIBUTE_REINITIALIZES void Clear() final;
-  bool IsInitialized() const final;
-
-  ::size_t ByteSizeLong() const final;
-  const char* _InternalParse(const char* ptr, ::google::protobuf::internal::ParseContext* ctx) final;
-  ::uint8_t* _InternalSerialize(
-      ::uint8_t* target, ::google::protobuf::io::EpsCopyOutputStream* stream) const final;
-  int GetCachedSize() const { return _impl_._cached_size_.Get(); }
-
-  private:
-  ::google::protobuf::internal::CachedSize* AccessCachedSize() const final;
-  void SharedCtor(::google::protobuf::Arena* arena);
-  void SharedDtor();
-  void InternalSwap(AggSpec_AggSpecFormula* other);
-
-  private:
-  friend class ::google::protobuf::internal::AnyMetadata;
-  static ::absl::string_view FullMessageName() {
-    return "io.deephaven.proto.backplane.grpc.AggSpec.AggSpecFormula";
-  }
-  protected:
-  explicit AggSpec_AggSpecFormula(::google::protobuf::Arena* arena);
-  AggSpec_AggSpecFormula(::google::protobuf::Arena* arena, const AggSpec_AggSpecFormula& from);
-  public:
-
-  static const ClassData _class_data_;
-  const ::google::protobuf::Message::ClassData*GetClassData() const final;
-
-  ::google::protobuf::Metadata GetMetadata() const final;
-
-  // nested types ----------------------------------------------------
-
-  // accessors -------------------------------------------------------
-
-  enum : int {
-    kFormulaFieldNumber = 1,
-    kParamTokenFieldNumber = 2,
-  };
-  // string formula = 1;
-  void clear_formula() ;
-  const std::string& formula() const;
-  template <typename Arg_ = const std::string&, typename... Args_>
-  void set_formula(Arg_&& arg, Args_... args);
-  std::string* mutable_formula();
-  PROTOBUF_NODISCARD std::string* release_formula();
-  void set_allocated_formula(std::string* value);
-
-  private:
-  const std::string& _internal_formula() const;
-  inline PROTOBUF_ALWAYS_INLINE void _internal_set_formula(
-      const std::string& value);
-  std::string* _internal_mutable_formula();
-
-  public:
-  // string param_token = 2;
-  void clear_param_token() ;
-  const std::string& param_token() const;
-  template <typename Arg_ = const std::string&, typename... Args_>
-  void set_param_token(Arg_&& arg, Args_... args);
-  std::string* mutable_param_token();
-  PROTOBUF_NODISCARD std::string* release_param_token();
-  void set_allocated_param_token(std::string* value);
-
-  private:
-  const std::string& _internal_param_token() const;
-  inline PROTOBUF_ALWAYS_INLINE void _internal_set_param_token(
-      const std::string& value);
-  std::string* _internal_mutable_param_token();
-
-  public:
-  // @@protoc_insertion_point(class_scope:io.deephaven.proto.backplane.grpc.AggSpec.AggSpecFormula)
- private:
-  class _Internal;
-
-  friend class ::google::protobuf::internal::TcParser;
-  static const ::google::protobuf::internal::TcParseTable<
-      1, 2, 0,
-      83, 2>
-      _table_;
-  friend class ::google::protobuf::MessageLite;
-  friend class ::google::protobuf::Arena;
-  template <typename T>
-  friend class ::google::protobuf::Arena::InternalHelper;
-  using InternalArenaConstructable_ = void;
-  using DestructorSkippable_ = void;
-  struct Impl_ {
-
-        inline explicit constexpr Impl_(
-            ::google::protobuf::internal::ConstantInitialized) noexcept;
-        inline explicit Impl_(::google::protobuf::internal::InternalVisibility visibility,
-                              ::google::protobuf::Arena* arena);
-        inline explicit Impl_(::google::protobuf::internal::InternalVisibility visibility,
-                              ::google::protobuf::Arena* arena, const Impl_& from);
-    ::google::protobuf::internal::ArenaStringPtr formula_;
-    ::google::protobuf::internal::ArenaStringPtr param_token_;
-    mutable ::google::protobuf::internal::CachedSize _cached_size_;
-    PROTOBUF_TSAN_DECLARE_MEMBER
-  };
-  union { Impl_ _impl_; };
-  friend struct ::TableStruct_deephaven_2fproto_2ftable_2eproto;
-};// -------------------------------------------------------------------
-
-class AggSpec_AggSpecFirst final :
-    public ::google::protobuf::internal::ZeroFieldsBase /* @@protoc_insertion_point(class_definition:io.deephaven.proto.backplane.grpc.AggSpec.AggSpecFirst) */ {
- public:
-  inline AggSpec_AggSpecFirst() : AggSpec_AggSpecFirst(nullptr) {}
-  template<typename = void>
-  explicit PROTOBUF_CONSTEXPR AggSpec_AggSpecFirst(::google::protobuf::internal::ConstantInitialized);
-
-  inline AggSpec_AggSpecFirst(const AggSpec_AggSpecFirst& from)
-      : AggSpec_AggSpecFirst(nullptr, from) {}
-  AggSpec_AggSpecFirst(AggSpec_AggSpecFirst&& from) noexcept
-    : AggSpec_AggSpecFirst() {
-    *this = ::std::move(from);
-  }
-
-  inline AggSpec_AggSpecFirst& operator=(const AggSpec_AggSpecFirst& from) {
-    CopyFrom(from);
-    return *this;
-  }
-  inline AggSpec_AggSpecFirst& operator=(AggSpec_AggSpecFirst&& from) noexcept {
-    if (this == &from) return *this;
-    if (GetArena() == from.GetArena()
-  #ifdef PROTOBUF_FORCE_COPY_IN_MOVE
-        && GetArena() != nullptr
-  #endif  // !PROTOBUF_FORCE_COPY_IN_MOVE
-    ) {
-      InternalSwap(&from);
-    } else {
-      CopyFrom(from);
-    }
-    return *this;
-  }
-
-  inline const ::google::protobuf::UnknownFieldSet& unknown_fields() const
-      ABSL_ATTRIBUTE_LIFETIME_BOUND {
-    return _internal_metadata_.unknown_fields<::google::protobuf::UnknownFieldSet>(::google::protobuf::UnknownFieldSet::default_instance);
-  }
-  inline ::google::protobuf::UnknownFieldSet* mutable_unknown_fields()
-      ABSL_ATTRIBUTE_LIFETIME_BOUND {
-    return _internal_metadata_.mutable_unknown_fields<::google::protobuf::UnknownFieldSet>();
-  }
-
-  static const ::google::protobuf::Descriptor* descriptor() {
-    return GetDescriptor();
-  }
-  static const ::google::protobuf::Descriptor* GetDescriptor() {
-    return default_instance().GetMetadata().descriptor;
-  }
-  static const ::google::protobuf::Reflection* GetReflection() {
-    return default_instance().GetMetadata().reflection;
-  }
-  static const AggSpec_AggSpecFirst& default_instance() {
-    return *internal_default_instance();
-  }
-  static inline const AggSpec_AggSpecFirst* internal_default_instance() {
-    return reinterpret_cast<const AggSpec_AggSpecFirst*>(
-               &_AggSpec_AggSpecFirst_default_instance_);
-  }
-  static constexpr int kIndexInFileMessages =
-    76;
-
-  friend void swap(AggSpec_AggSpecFirst& a, AggSpec_AggSpecFirst& b) {
-    a.Swap(&b);
-  }
-  inline void Swap(AggSpec_AggSpecFirst* other) {
-    if (other == this) return;
-  #ifdef PROTOBUF_FORCE_COPY_IN_SWAP
-    if (GetArena() != nullptr &&
-        GetArena() == other->GetArena()) {
-   #else  // PROTOBUF_FORCE_COPY_IN_SWAP
-    if (GetArena() == other->GetArena()) {
-  #endif  // !PROTOBUF_FORCE_COPY_IN_SWAP
-      InternalSwap(other);
-    } else {
-      ::google::protobuf::internal::GenericSwap(this, other);
-    }
-  }
-  void UnsafeArenaSwap(AggSpec_AggSpecFirst* other) {
-    if (other == this) return;
-    ABSL_DCHECK(GetArena() == other->GetArena());
-    InternalSwap(other);
-  }
-
-  // implements Message ----------------------------------------------
-
-  AggSpec_AggSpecFirst* New(::google::protobuf::Arena* arena = nullptr) const final {
-    return CreateMaybeMessage<AggSpec_AggSpecFirst>(arena);
-  }
-  using ::google::protobuf::internal::ZeroFieldsBase::CopyFrom;
-  inline void CopyFrom(const AggSpec_AggSpecFirst& from) {
-    ::google::protobuf::internal::ZeroFieldsBase::CopyImpl(*this, from);
-  }
-  using ::google::protobuf::internal::ZeroFieldsBase::MergeFrom;
-  void MergeFrom(const AggSpec_AggSpecFirst& from) {
-    ::google::protobuf::internal::ZeroFieldsBase::MergeImpl(*this, from);
-  }
-  public:
-
-  private:
-  friend class ::google::protobuf::internal::AnyMetadata;
-  static ::absl::string_view FullMessageName() {
-    return "io.deephaven.proto.backplane.grpc.AggSpec.AggSpecFirst";
-  }
-  protected:
-  explicit AggSpec_AggSpecFirst(::google::protobuf::Arena* arena);
-  AggSpec_AggSpecFirst(::google::protobuf::Arena* arena, const AggSpec_AggSpecFirst& from);
-  public:
-
-  ::google::protobuf::Metadata GetMetadata() const final;
-
-  // nested types ----------------------------------------------------
-
-  // accessors -------------------------------------------------------
-
-  // @@protoc_insertion_point(class_scope:io.deephaven.proto.backplane.grpc.AggSpec.AggSpecFirst)
- private:
-  class _Internal;
-
-  friend class ::google::protobuf::MessageLite;
-  friend class ::google::protobuf::Arena;
-  template <typename T>
-  friend class ::google::protobuf::Arena::InternalHelper;
-  using InternalArenaConstructable_ = void;
-  using DestructorSkippable_ = void;
-  struct Impl_ {
-
-        inline explicit constexpr Impl_(
-            ::google::protobuf::internal::ConstantInitialized) noexcept;
-        inline explicit Impl_(::google::protobuf::internal::InternalVisibility visibility,
-                              ::google::protobuf::Arena* arena);
-        inline explicit Impl_(::google::protobuf::internal::InternalVisibility visibility,
-                              ::google::protobuf::Arena* arena, const Impl_& from);
-    PROTOBUF_TSAN_DECLARE_MEMBER
-  };
-  friend struct ::TableStruct_deephaven_2fproto_2ftable_2eproto;
-};// -------------------------------------------------------------------
-
-class AggSpec_AggSpecDistinct final :
-    public ::google::protobuf::Message /* @@protoc_insertion_point(class_definition:io.deephaven.proto.backplane.grpc.AggSpec.AggSpecDistinct) */ {
- public:
-  inline AggSpec_AggSpecDistinct() : AggSpec_AggSpecDistinct(nullptr) {}
-  ~AggSpec_AggSpecDistinct() override;
-  template<typename = void>
-  explicit PROTOBUF_CONSTEXPR AggSpec_AggSpecDistinct(::google::protobuf::internal::ConstantInitialized);
-
-  inline AggSpec_AggSpecDistinct(const AggSpec_AggSpecDistinct& from)
-      : AggSpec_AggSpecDistinct(nullptr, from) {}
-  AggSpec_AggSpecDistinct(AggSpec_AggSpecDistinct&& from) noexcept
-    : AggSpec_AggSpecDistinct() {
-    *this = ::std::move(from);
-  }
-
-  inline AggSpec_AggSpecDistinct& operator=(const AggSpec_AggSpecDistinct& from) {
-    CopyFrom(from);
-    return *this;
-  }
-  inline AggSpec_AggSpecDistinct& operator=(AggSpec_AggSpecDistinct&& from) noexcept {
-    if (this == &from) return *this;
-    if (GetArena() == from.GetArena()
-  #ifdef PROTOBUF_FORCE_COPY_IN_MOVE
-        && GetArena() != nullptr
-  #endif  // !PROTOBUF_FORCE_COPY_IN_MOVE
-    ) {
-      InternalSwap(&from);
-    } else {
-      CopyFrom(from);
-    }
-    return *this;
-  }
-
-  inline const ::google::protobuf::UnknownFieldSet& unknown_fields() const
-      ABSL_ATTRIBUTE_LIFETIME_BOUND {
-    return _internal_metadata_.unknown_fields<::google::protobuf::UnknownFieldSet>(::google::protobuf::UnknownFieldSet::default_instance);
-  }
-  inline ::google::protobuf::UnknownFieldSet* mutable_unknown_fields()
-      ABSL_ATTRIBUTE_LIFETIME_BOUND {
-    return _internal_metadata_.mutable_unknown_fields<::google::protobuf::UnknownFieldSet>();
-  }
-
-  static const ::google::protobuf::Descriptor* descriptor() {
-    return GetDescriptor();
-  }
-  static const ::google::protobuf::Descriptor* GetDescriptor() {
-    return default_instance().GetMetadata().descriptor;
-  }
-  static const ::google::protobuf::Reflection* GetReflection() {
-    return default_instance().GetMetadata().reflection;
-  }
-  static const AggSpec_AggSpecDistinct& default_instance() {
-    return *internal_default_instance();
-  }
-  static inline const AggSpec_AggSpecDistinct* internal_default_instance() {
-    return reinterpret_cast<const AggSpec_AggSpecDistinct*>(
-               &_AggSpec_AggSpecDistinct_default_instance_);
-  }
-  static constexpr int kIndexInFileMessages =
-    64;
-
-  friend void swap(AggSpec_AggSpecDistinct& a, AggSpec_AggSpecDistinct& b) {
-    a.Swap(&b);
-  }
-  inline void Swap(AggSpec_AggSpecDistinct* other) {
-    if (other == this) return;
-  #ifdef PROTOBUF_FORCE_COPY_IN_SWAP
-    if (GetArena() != nullptr &&
-        GetArena() == other->GetArena()) {
-   #else  // PROTOBUF_FORCE_COPY_IN_SWAP
-    if (GetArena() == other->GetArena()) {
-  #endif  // !PROTOBUF_FORCE_COPY_IN_SWAP
-      InternalSwap(other);
-    } else {
-      ::google::protobuf::internal::GenericSwap(this, other);
-    }
-  }
-  void UnsafeArenaSwap(AggSpec_AggSpecDistinct* other) {
-    if (other == this) return;
-    ABSL_DCHECK(GetArena() == other->GetArena());
-    InternalSwap(other);
-  }
-
-  // implements Message ----------------------------------------------
-
-  AggSpec_AggSpecDistinct* New(::google::protobuf::Arena* arena = nullptr) const final {
-    return CreateMaybeMessage<AggSpec_AggSpecDistinct>(arena);
-  }
-  using ::google::protobuf::Message::CopyFrom;
-  void CopyFrom(const AggSpec_AggSpecDistinct& from);
-  using ::google::protobuf::Message::MergeFrom;
-  void MergeFrom( const AggSpec_AggSpecDistinct& from) {
-    AggSpec_AggSpecDistinct::MergeImpl(*this, from);
-  }
-  private:
-  static void MergeImpl(::google::protobuf::Message& to_msg, const ::google::protobuf::Message& from_msg);
-  public:
-  PROTOBUF_ATTRIBUTE_REINITIALIZES void Clear() final;
-  bool IsInitialized() const final;
-
-  ::size_t ByteSizeLong() const final;
-  const char* _InternalParse(const char* ptr, ::google::protobuf::internal::ParseContext* ctx) final;
-  ::uint8_t* _InternalSerialize(
-      ::uint8_t* target, ::google::protobuf::io::EpsCopyOutputStream* stream) const final;
-  int GetCachedSize() const { return _impl_._cached_size_.Get(); }
-
-  private:
-  ::google::protobuf::internal::CachedSize* AccessCachedSize() const final;
-  void SharedCtor(::google::protobuf::Arena* arena);
-  void SharedDtor();
-  void InternalSwap(AggSpec_AggSpecDistinct* other);
-
-  private:
-  friend class ::google::protobuf::internal::AnyMetadata;
-  static ::absl::string_view FullMessageName() {
-    return "io.deephaven.proto.backplane.grpc.AggSpec.AggSpecDistinct";
-  }
-  protected:
-  explicit AggSpec_AggSpecDistinct(::google::protobuf::Arena* arena);
-  AggSpec_AggSpecDistinct(::google::protobuf::Arena* arena, const AggSpec_AggSpecDistinct& from);
-  public:
-
-  static const ClassData _class_data_;
-  const ::google::protobuf::Message::ClassData*GetClassData() const final;
-
-  ::google::protobuf::Metadata GetMetadata() const final;
-
-  // nested types ----------------------------------------------------
-
-  // accessors -------------------------------------------------------
-
-  enum : int {
-    kIncludeNullsFieldNumber = 1,
-  };
-  // bool include_nulls = 1;
-  void clear_include_nulls() ;
-  bool include_nulls() const;
-  void set_include_nulls(bool value);
-
-  private:
-  bool _internal_include_nulls() const;
-  void _internal_set_include_nulls(bool value);
-
-  public:
-  // @@protoc_insertion_point(class_scope:io.deephaven.proto.backplane.grpc.AggSpec.AggSpecDistinct)
- private:
-  class _Internal;
-
-  friend class ::google::protobuf::internal::TcParser;
-  static const ::google::protobuf::internal::TcParseTable<
-      0, 1, 0,
-      0, 2>
-      _table_;
-  friend class ::google::protobuf::MessageLite;
-  friend class ::google::protobuf::Arena;
-  template <typename T>
-  friend class ::google::protobuf::Arena::InternalHelper;
-  using InternalArenaConstructable_ = void;
-  using DestructorSkippable_ = void;
-  struct Impl_ {
-
-        inline explicit constexpr Impl_(
-            ::google::protobuf::internal::ConstantInitialized) noexcept;
-        inline explicit Impl_(::google::protobuf::internal::InternalVisibility visibility,
-                              ::google::protobuf::Arena* arena);
-        inline explicit Impl_(::google::protobuf::internal::InternalVisibility visibility,
-                              ::google::protobuf::Arena* arena, const Impl_& from);
-    bool include_nulls_;
-    mutable ::google::protobuf::internal::CachedSize _cached_size_;
-    PROTOBUF_TSAN_DECLARE_MEMBER
-  };
-  union { Impl_ _impl_; };
-  friend struct ::TableStruct_deephaven_2fproto_2ftable_2eproto;
-};// -------------------------------------------------------------------
-
-class AggSpec_AggSpecCountDistinct final :
-    public ::google::protobuf::Message /* @@protoc_insertion_point(class_definition:io.deephaven.proto.backplane.grpc.AggSpec.AggSpecCountDistinct) */ {
- public:
-  inline AggSpec_AggSpecCountDistinct() : AggSpec_AggSpecCountDistinct(nullptr) {}
-  ~AggSpec_AggSpecCountDistinct() override;
-  template<typename = void>
-  explicit PROTOBUF_CONSTEXPR AggSpec_AggSpecCountDistinct(::google::protobuf::internal::ConstantInitialized);
-
-  inline AggSpec_AggSpecCountDistinct(const AggSpec_AggSpecCountDistinct& from)
-      : AggSpec_AggSpecCountDistinct(nullptr, from) {}
-  AggSpec_AggSpecCountDistinct(AggSpec_AggSpecCountDistinct&& from) noexcept
-    : AggSpec_AggSpecCountDistinct() {
-    *this = ::std::move(from);
-  }
-
-  inline AggSpec_AggSpecCountDistinct& operator=(const AggSpec_AggSpecCountDistinct& from) {
-    CopyFrom(from);
-    return *this;
-  }
-  inline AggSpec_AggSpecCountDistinct& operator=(AggSpec_AggSpecCountDistinct&& from) noexcept {
-    if (this == &from) return *this;
-    if (GetArena() == from.GetArena()
-  #ifdef PROTOBUF_FORCE_COPY_IN_MOVE
-        && GetArena() != nullptr
-  #endif  // !PROTOBUF_FORCE_COPY_IN_MOVE
-    ) {
-      InternalSwap(&from);
-    } else {
-      CopyFrom(from);
-    }
-    return *this;
-  }
-
-  inline const ::google::protobuf::UnknownFieldSet& unknown_fields() const
-      ABSL_ATTRIBUTE_LIFETIME_BOUND {
-    return _internal_metadata_.unknown_fields<::google::protobuf::UnknownFieldSet>(::google::protobuf::UnknownFieldSet::default_instance);
-  }
-  inline ::google::protobuf::UnknownFieldSet* mutable_unknown_fields()
-      ABSL_ATTRIBUTE_LIFETIME_BOUND {
-    return _internal_metadata_.mutable_unknown_fields<::google::protobuf::UnknownFieldSet>();
-  }
-
-  static const ::google::protobuf::Descriptor* descriptor() {
-    return GetDescriptor();
-  }
-  static const ::google::protobuf::Descriptor* GetDescriptor() {
-    return default_instance().GetMetadata().descriptor;
-  }
-  static const ::google::protobuf::Reflection* GetReflection() {
-    return default_instance().GetMetadata().reflection;
-  }
-  static const AggSpec_AggSpecCountDistinct& default_instance() {
-    return *internal_default_instance();
-  }
-  static inline const AggSpec_AggSpecCountDistinct* internal_default_instance() {
-    return reinterpret_cast<const AggSpec_AggSpecCountDistinct*>(
-               &_AggSpec_AggSpecCountDistinct_default_instance_);
-  }
-  static constexpr int kIndexInFileMessages =
-    63;
-
-  friend void swap(AggSpec_AggSpecCountDistinct& a, AggSpec_AggSpecCountDistinct& b) {
-    a.Swap(&b);
-  }
-  inline void Swap(AggSpec_AggSpecCountDistinct* other) {
-    if (other == this) return;
-  #ifdef PROTOBUF_FORCE_COPY_IN_SWAP
-    if (GetArena() != nullptr &&
-        GetArena() == other->GetArena()) {
-   #else  // PROTOBUF_FORCE_COPY_IN_SWAP
-    if (GetArena() == other->GetArena()) {
-  #endif  // !PROTOBUF_FORCE_COPY_IN_SWAP
-      InternalSwap(other);
-    } else {
-      ::google::protobuf::internal::GenericSwap(this, other);
-    }
-  }
-  void UnsafeArenaSwap(AggSpec_AggSpecCountDistinct* other) {
-    if (other == this) return;
-    ABSL_DCHECK(GetArena() == other->GetArena());
-    InternalSwap(other);
-  }
-
-  // implements Message ----------------------------------------------
-
-  AggSpec_AggSpecCountDistinct* New(::google::protobuf::Arena* arena = nullptr) const final {
-    return CreateMaybeMessage<AggSpec_AggSpecCountDistinct>(arena);
-  }
-  using ::google::protobuf::Message::CopyFrom;
-  void CopyFrom(const AggSpec_AggSpecCountDistinct& from);
-  using ::google::protobuf::Message::MergeFrom;
-  void MergeFrom( const AggSpec_AggSpecCountDistinct& from) {
-    AggSpec_AggSpecCountDistinct::MergeImpl(*this, from);
-  }
-  private:
-  static void MergeImpl(::google::protobuf::Message& to_msg, const ::google::protobuf::Message& from_msg);
-  public:
-  PROTOBUF_ATTRIBUTE_REINITIALIZES void Clear() final;
-  bool IsInitialized() const final;
-
-  ::size_t ByteSizeLong() const final;
-  const char* _InternalParse(const char* ptr, ::google::protobuf::internal::ParseContext* ctx) final;
-  ::uint8_t* _InternalSerialize(
-      ::uint8_t* target, ::google::protobuf::io::EpsCopyOutputStream* stream) const final;
-  int GetCachedSize() const { return _impl_._cached_size_.Get(); }
-
-  private:
-  ::google::protobuf::internal::CachedSize* AccessCachedSize() const final;
-  void SharedCtor(::google::protobuf::Arena* arena);
-  void SharedDtor();
-  void InternalSwap(AggSpec_AggSpecCountDistinct* other);
-
-  private:
-  friend class ::google::protobuf::internal::AnyMetadata;
-  static ::absl::string_view FullMessageName() {
-    return "io.deephaven.proto.backplane.grpc.AggSpec.AggSpecCountDistinct";
-  }
-  protected:
-  explicit AggSpec_AggSpecCountDistinct(::google::protobuf::Arena* arena);
-  AggSpec_AggSpecCountDistinct(::google::protobuf::Arena* arena, const AggSpec_AggSpecCountDistinct& from);
-  public:
-
-  static const ClassData _class_data_;
-  const ::google::protobuf::Message::ClassData*GetClassData() const final;
-
-  ::google::protobuf::Metadata GetMetadata() const final;
-
-  // nested types ----------------------------------------------------
-
-  // accessors -------------------------------------------------------
-
-  enum : int {
-    kCountNullsFieldNumber = 1,
-  };
-  // bool count_nulls = 1;
-  void clear_count_nulls() ;
-  bool count_nulls() const;
-  void set_count_nulls(bool value);
-
-  private:
-  bool _internal_count_nulls() const;
-  void _internal_set_count_nulls(bool value);
-
-  public:
-  // @@protoc_insertion_point(class_scope:io.deephaven.proto.backplane.grpc.AggSpec.AggSpecCountDistinct)
- private:
-  class _Internal;
-
-  friend class ::google::protobuf::internal::TcParser;
-  static const ::google::protobuf::internal::TcParseTable<
-      0, 1, 0,
-      0, 2>
-      _table_;
-  friend class ::google::protobuf::MessageLite;
-  friend class ::google::protobuf::Arena;
-  template <typename T>
-  friend class ::google::protobuf::Arena::InternalHelper;
-  using InternalArenaConstructable_ = void;
-  using DestructorSkippable_ = void;
-  struct Impl_ {
-
-        inline explicit constexpr Impl_(
-            ::google::protobuf::internal::ConstantInitialized) noexcept;
-        inline explicit Impl_(::google::protobuf::internal::InternalVisibility visibility,
-                              ::google::protobuf::Arena* arena);
-        inline explicit Impl_(::google::protobuf::internal::InternalVisibility visibility,
-                              ::google::protobuf::Arena* arena, const Impl_& from);
-    bool count_nulls_;
-    mutable ::google::protobuf::internal::CachedSize _cached_size_;
-    PROTOBUF_TSAN_DECLARE_MEMBER
-  };
-  union { Impl_ _impl_; };
-  friend struct ::TableStruct_deephaven_2fproto_2ftable_2eproto;
-};// -------------------------------------------------------------------
-
-class AggSpec_AggSpecAvg final :
-    public ::google::protobuf::internal::ZeroFieldsBase /* @@protoc_insertion_point(class_definition:io.deephaven.proto.backplane.grpc.AggSpec.AggSpecAvg) */ {
- public:
-  inline AggSpec_AggSpecAvg() : AggSpec_AggSpecAvg(nullptr) {}
-  template<typename = void>
-  explicit PROTOBUF_CONSTEXPR AggSpec_AggSpecAvg(::google::protobuf::internal::ConstantInitialized);
-
-  inline AggSpec_AggSpecAvg(const AggSpec_AggSpecAvg& from)
-      : AggSpec_AggSpecAvg(nullptr, from) {}
-  AggSpec_AggSpecAvg(AggSpec_AggSpecAvg&& from) noexcept
-    : AggSpec_AggSpecAvg() {
-    *this = ::std::move(from);
-  }
-
-  inline AggSpec_AggSpecAvg& operator=(const AggSpec_AggSpecAvg& from) {
-    CopyFrom(from);
-    return *this;
-  }
-  inline AggSpec_AggSpecAvg& operator=(AggSpec_AggSpecAvg&& from) noexcept {
-    if (this == &from) return *this;
-    if (GetArena() == from.GetArena()
-  #ifdef PROTOBUF_FORCE_COPY_IN_MOVE
-        && GetArena() != nullptr
-  #endif  // !PROTOBUF_FORCE_COPY_IN_MOVE
-    ) {
-      InternalSwap(&from);
-    } else {
-      CopyFrom(from);
-    }
-    return *this;
-  }
-
-  inline const ::google::protobuf::UnknownFieldSet& unknown_fields() const
-      ABSL_ATTRIBUTE_LIFETIME_BOUND {
-    return _internal_metadata_.unknown_fields<::google::protobuf::UnknownFieldSet>(::google::protobuf::UnknownFieldSet::default_instance);
-  }
-  inline ::google::protobuf::UnknownFieldSet* mutable_unknown_fields()
-      ABSL_ATTRIBUTE_LIFETIME_BOUND {
-    return _internal_metadata_.mutable_unknown_fields<::google::protobuf::UnknownFieldSet>();
-  }
-
-  static const ::google::protobuf::Descriptor* descriptor() {
-    return GetDescriptor();
-  }
-  static const ::google::protobuf::Descriptor* GetDescriptor() {
-    return default_instance().GetMetadata().descriptor;
-  }
-  static const ::google::protobuf::Reflection* GetReflection() {
-    return default_instance().GetMetadata().reflection;
-  }
-  static const AggSpec_AggSpecAvg& default_instance() {
-    return *internal_default_instance();
-  }
-  static inline const AggSpec_AggSpecAvg* internal_default_instance() {
-    return reinterpret_cast<const AggSpec_AggSpecAvg*>(
-               &_AggSpec_AggSpecAvg_default_instance_);
-  }
-  static constexpr int kIndexInFileMessages =
-    75;
-
-  friend void swap(AggSpec_AggSpecAvg& a, AggSpec_AggSpecAvg& b) {
-    a.Swap(&b);
-  }
-  inline void Swap(AggSpec_AggSpecAvg* other) {
-    if (other == this) return;
-  #ifdef PROTOBUF_FORCE_COPY_IN_SWAP
-    if (GetArena() != nullptr &&
-        GetArena() == other->GetArena()) {
-   #else  // PROTOBUF_FORCE_COPY_IN_SWAP
-    if (GetArena() == other->GetArena()) {
-  #endif  // !PROTOBUF_FORCE_COPY_IN_SWAP
-      InternalSwap(other);
-    } else {
-      ::google::protobuf::internal::GenericSwap(this, other);
-    }
-  }
-  void UnsafeArenaSwap(AggSpec_AggSpecAvg* other) {
-    if (other == this) return;
-    ABSL_DCHECK(GetArena() == other->GetArena());
-    InternalSwap(other);
-  }
-
-  // implements Message ----------------------------------------------
-
-  AggSpec_AggSpecAvg* New(::google::protobuf::Arena* arena = nullptr) const final {
-    return CreateMaybeMessage<AggSpec_AggSpecAvg>(arena);
-  }
-  using ::google::protobuf::internal::ZeroFieldsBase::CopyFrom;
-  inline void CopyFrom(const AggSpec_AggSpecAvg& from) {
-    ::google::protobuf::internal::ZeroFieldsBase::CopyImpl(*this, from);
-  }
-  using ::google::protobuf::internal::ZeroFieldsBase::MergeFrom;
-  void MergeFrom(const AggSpec_AggSpecAvg& from) {
-    ::google::protobuf::internal::ZeroFieldsBase::MergeImpl(*this, from);
-  }
-  public:
-
-  private:
-  friend class ::google::protobuf::internal::AnyMetadata;
-  static ::absl::string_view FullMessageName() {
-    return "io.deephaven.proto.backplane.grpc.AggSpec.AggSpecAvg";
-  }
-  protected:
-  explicit AggSpec_AggSpecAvg(::google::protobuf::Arena* arena);
-  AggSpec_AggSpecAvg(::google::protobuf::Arena* arena, const AggSpec_AggSpecAvg& from);
-  public:
-
-  ::google::protobuf::Metadata GetMetadata() const final;
-
-  // nested types ----------------------------------------------------
-
-  // accessors -------------------------------------------------------
-
-  // @@protoc_insertion_point(class_scope:io.deephaven.proto.backplane.grpc.AggSpec.AggSpecAvg)
- private:
-  class _Internal;
-
-  friend class ::google::protobuf::MessageLite;
-  friend class ::google::protobuf::Arena;
-  template <typename T>
-  friend class ::google::protobuf::Arena::InternalHelper;
-  using InternalArenaConstructable_ = void;
-  using DestructorSkippable_ = void;
-  struct Impl_ {
-
-        inline explicit constexpr Impl_(
-            ::google::protobuf::internal::ConstantInitialized) noexcept;
-        inline explicit Impl_(::google::protobuf::internal::InternalVisibility visibility,
-                              ::google::protobuf::Arena* arena);
-        inline explicit Impl_(::google::protobuf::internal::InternalVisibility visibility,
-                              ::google::protobuf::Arena* arena, const Impl_& from);
-    PROTOBUF_TSAN_DECLARE_MEMBER
-  };
-  friend struct ::TableStruct_deephaven_2fproto_2ftable_2eproto;
-};// -------------------------------------------------------------------
-
-class AggSpec_AggSpecApproximatePercentile final :
-    public ::google::protobuf::Message /* @@protoc_insertion_point(class_definition:io.deephaven.proto.backplane.grpc.AggSpec.AggSpecApproximatePercentile) */ {
- public:
-  inline AggSpec_AggSpecApproximatePercentile() : AggSpec_AggSpecApproximatePercentile(nullptr) {}
-  ~AggSpec_AggSpecApproximatePercentile() override;
-  template<typename = void>
-  explicit PROTOBUF_CONSTEXPR AggSpec_AggSpecApproximatePercentile(::google::protobuf::internal::ConstantInitialized);
-
-  inline AggSpec_AggSpecApproximatePercentile(const AggSpec_AggSpecApproximatePercentile& from)
-      : AggSpec_AggSpecApproximatePercentile(nullptr, from) {}
-  AggSpec_AggSpecApproximatePercentile(AggSpec_AggSpecApproximatePercentile&& from) noexcept
-    : AggSpec_AggSpecApproximatePercentile() {
-    *this = ::std::move(from);
-  }
-
-  inline AggSpec_AggSpecApproximatePercentile& operator=(const AggSpec_AggSpecApproximatePercentile& from) {
-    CopyFrom(from);
-    return *this;
-  }
-  inline AggSpec_AggSpecApproximatePercentile& operator=(AggSpec_AggSpecApproximatePercentile&& from) noexcept {
-    if (this == &from) return *this;
-    if (GetArena() == from.GetArena()
-  #ifdef PROTOBUF_FORCE_COPY_IN_MOVE
-        && GetArena() != nullptr
-  #endif  // !PROTOBUF_FORCE_COPY_IN_MOVE
-    ) {
-      InternalSwap(&from);
-    } else {
-      CopyFrom(from);
-    }
-    return *this;
-  }
-
-  inline const ::google::protobuf::UnknownFieldSet& unknown_fields() const
-      ABSL_ATTRIBUTE_LIFETIME_BOUND {
-    return _internal_metadata_.unknown_fields<::google::protobuf::UnknownFieldSet>(::google::protobuf::UnknownFieldSet::default_instance);
-  }
-  inline ::google::protobuf::UnknownFieldSet* mutable_unknown_fields()
-      ABSL_ATTRIBUTE_LIFETIME_BOUND {
-    return _internal_metadata_.mutable_unknown_fields<::google::protobuf::UnknownFieldSet>();
-  }
-
-  static const ::google::protobuf::Descriptor* descriptor() {
-    return GetDescriptor();
-  }
-  static const ::google::protobuf::Descriptor* GetDescriptor() {
-    return default_instance().GetMetadata().descriptor;
-  }
-  static const ::google::protobuf::Reflection* GetReflection() {
-    return default_instance().GetMetadata().reflection;
-  }
-  static const AggSpec_AggSpecApproximatePercentile& default_instance() {
-    return *internal_default_instance();
-  }
-  static inline const AggSpec_AggSpecApproximatePercentile* internal_default_instance() {
-    return reinterpret_cast<const AggSpec_AggSpecApproximatePercentile*>(
-               &_AggSpec_AggSpecApproximatePercentile_default_instance_);
-  }
-  static constexpr int kIndexInFileMessages =
-    62;
-
-  friend void swap(AggSpec_AggSpecApproximatePercentile& a, AggSpec_AggSpecApproximatePercentile& b) {
-    a.Swap(&b);
-  }
-  inline void Swap(AggSpec_AggSpecApproximatePercentile* other) {
-    if (other == this) return;
-  #ifdef PROTOBUF_FORCE_COPY_IN_SWAP
-    if (GetArena() != nullptr &&
-        GetArena() == other->GetArena()) {
-   #else  // PROTOBUF_FORCE_COPY_IN_SWAP
-    if (GetArena() == other->GetArena()) {
-  #endif  // !PROTOBUF_FORCE_COPY_IN_SWAP
-      InternalSwap(other);
-    } else {
-      ::google::protobuf::internal::GenericSwap(this, other);
-    }
-  }
-  void UnsafeArenaSwap(AggSpec_AggSpecApproximatePercentile* other) {
-    if (other == this) return;
-    ABSL_DCHECK(GetArena() == other->GetArena());
-    InternalSwap(other);
-  }
-
-  // implements Message ----------------------------------------------
-
-  AggSpec_AggSpecApproximatePercentile* New(::google::protobuf::Arena* arena = nullptr) const final {
-    return CreateMaybeMessage<AggSpec_AggSpecApproximatePercentile>(arena);
-  }
-  using ::google::protobuf::Message::CopyFrom;
-  void CopyFrom(const AggSpec_AggSpecApproximatePercentile& from);
-  using ::google::protobuf::Message::MergeFrom;
-  void MergeFrom( const AggSpec_AggSpecApproximatePercentile& from) {
-    AggSpec_AggSpecApproximatePercentile::MergeImpl(*this, from);
-  }
-  private:
-  static void MergeImpl(::google::protobuf::Message& to_msg, const ::google::protobuf::Message& from_msg);
-  public:
-  PROTOBUF_ATTRIBUTE_REINITIALIZES void Clear() final;
-  bool IsInitialized() const final;
-
-  ::size_t ByteSizeLong() const final;
-  const char* _InternalParse(const char* ptr, ::google::protobuf::internal::ParseContext* ctx) final;
-  ::uint8_t* _InternalSerialize(
-      ::uint8_t* target, ::google::protobuf::io::EpsCopyOutputStream* stream) const final;
-  int GetCachedSize() const { return _impl_._cached_size_.Get(); }
-
-  private:
-  ::google::protobuf::internal::CachedSize* AccessCachedSize() const final;
-  void SharedCtor(::google::protobuf::Arena* arena);
-  void SharedDtor();
-  void InternalSwap(AggSpec_AggSpecApproximatePercentile* other);
-
-  private:
-  friend class ::google::protobuf::internal::AnyMetadata;
-  static ::absl::string_view FullMessageName() {
-    return "io.deephaven.proto.backplane.grpc.AggSpec.AggSpecApproximatePercentile";
-  }
-  protected:
-  explicit AggSpec_AggSpecApproximatePercentile(::google::protobuf::Arena* arena);
-  AggSpec_AggSpecApproximatePercentile(::google::protobuf::Arena* arena, const AggSpec_AggSpecApproximatePercentile& from);
-  public:
-
-  static const ClassData _class_data_;
-  const ::google::protobuf::Message::ClassData*GetClassData() const final;
-
-  ::google::protobuf::Metadata GetMetadata() const final;
-
-  // nested types ----------------------------------------------------
-
-  // accessors -------------------------------------------------------
-
-  enum : int {
-    kPercentileFieldNumber = 1,
-    kCompressionFieldNumber = 2,
-  };
-  // double percentile = 1;
-  void clear_percentile() ;
-  double percentile() const;
-  void set_percentile(double value);
-
-  private:
-  double _internal_percentile() const;
-  void _internal_set_percentile(double value);
-
-  public:
-  // optional double compression = 2;
-  bool has_compression() const;
-  void clear_compression() ;
-  double compression() const;
-  void set_compression(double value);
-
-  private:
-  double _internal_compression() const;
-  void _internal_set_compression(double value);
-
-  public:
-  // @@protoc_insertion_point(class_scope:io.deephaven.proto.backplane.grpc.AggSpec.AggSpecApproximatePercentile)
- private:
-  class _Internal;
-
-  friend class ::google::protobuf::internal::TcParser;
-  static const ::google::protobuf::internal::TcParseTable<
-      1, 2, 0,
-      0, 2>
-      _table_;
-  friend class ::google::protobuf::MessageLite;
-  friend class ::google::protobuf::Arena;
-  template <typename T>
-  friend class ::google::protobuf::Arena::InternalHelper;
-  using InternalArenaConstructable_ = void;
-  using DestructorSkippable_ = void;
-  struct Impl_ {
-
-        inline explicit constexpr Impl_(
-            ::google::protobuf::internal::ConstantInitialized) noexcept;
-        inline explicit Impl_(::google::protobuf::internal::InternalVisibility visibility,
-                              ::google::protobuf::Arena* arena);
-        inline explicit Impl_(::google::protobuf::internal::InternalVisibility visibility,
-                              ::google::protobuf::Arena* arena, const Impl_& from);
-    ::google::protobuf::internal::HasBits<1> _has_bits_;
-    mutable ::google::protobuf::internal::CachedSize _cached_size_;
-    double percentile_;
-    double compression_;
-    PROTOBUF_TSAN_DECLARE_MEMBER
-  };
-  union { Impl_ _impl_; };
-  friend struct ::TableStruct_deephaven_2fproto_2ftable_2eproto;
-};// -------------------------------------------------------------------
-
-class AggSpec_AggSpecAbsSum final :
-    public ::google::protobuf::internal::ZeroFieldsBase /* @@protoc_insertion_point(class_definition:io.deephaven.proto.backplane.grpc.AggSpec.AggSpecAbsSum) */ {
- public:
-  inline AggSpec_AggSpecAbsSum() : AggSpec_AggSpecAbsSum(nullptr) {}
-  template<typename = void>
-  explicit PROTOBUF_CONSTEXPR AggSpec_AggSpecAbsSum(::google::protobuf::internal::ConstantInitialized);
-
-  inline AggSpec_AggSpecAbsSum(const AggSpec_AggSpecAbsSum& from)
-      : AggSpec_AggSpecAbsSum(nullptr, from) {}
-  AggSpec_AggSpecAbsSum(AggSpec_AggSpecAbsSum&& from) noexcept
-    : AggSpec_AggSpecAbsSum() {
-    *this = ::std::move(from);
-  }
-
-  inline AggSpec_AggSpecAbsSum& operator=(const AggSpec_AggSpecAbsSum& from) {
-    CopyFrom(from);
-    return *this;
-  }
-  inline AggSpec_AggSpecAbsSum& operator=(AggSpec_AggSpecAbsSum&& from) noexcept {
-    if (this == &from) return *this;
-    if (GetArena() == from.GetArena()
-  #ifdef PROTOBUF_FORCE_COPY_IN_MOVE
-        && GetArena() != nullptr
-  #endif  // !PROTOBUF_FORCE_COPY_IN_MOVE
-    ) {
-      InternalSwap(&from);
-    } else {
-      CopyFrom(from);
-    }
-    return *this;
-  }
-
-  inline const ::google::protobuf::UnknownFieldSet& unknown_fields() const
-      ABSL_ATTRIBUTE_LIFETIME_BOUND {
-    return _internal_metadata_.unknown_fields<::google::protobuf::UnknownFieldSet>(::google::protobuf::UnknownFieldSet::default_instance);
-  }
-  inline ::google::protobuf::UnknownFieldSet* mutable_unknown_fields()
-      ABSL_ATTRIBUTE_LIFETIME_BOUND {
-    return _internal_metadata_.mutable_unknown_fields<::google::protobuf::UnknownFieldSet>();
-  }
-
-  static const ::google::protobuf::Descriptor* descriptor() {
-    return GetDescriptor();
-  }
-  static const ::google::protobuf::Descriptor* GetDescriptor() {
-    return default_instance().GetMetadata().descriptor;
-  }
-  static const ::google::protobuf::Reflection* GetReflection() {
-    return default_instance().GetMetadata().reflection;
-  }
-  static const AggSpec_AggSpecAbsSum& default_instance() {
-    return *internal_default_instance();
-  }
-  static inline const AggSpec_AggSpecAbsSum* internal_default_instance() {
-    return reinterpret_cast<const AggSpec_AggSpecAbsSum*>(
-               &_AggSpec_AggSpecAbsSum_default_instance_);
-  }
-  static constexpr int kIndexInFileMessages =
-    74;
-
-  friend void swap(AggSpec_AggSpecAbsSum& a, AggSpec_AggSpecAbsSum& b) {
-    a.Swap(&b);
-  }
-  inline void Swap(AggSpec_AggSpecAbsSum* other) {
-    if (other == this) return;
-  #ifdef PROTOBUF_FORCE_COPY_IN_SWAP
-    if (GetArena() != nullptr &&
-        GetArena() == other->GetArena()) {
-   #else  // PROTOBUF_FORCE_COPY_IN_SWAP
-    if (GetArena() == other->GetArena()) {
-  #endif  // !PROTOBUF_FORCE_COPY_IN_SWAP
-      InternalSwap(other);
-    } else {
-      ::google::protobuf::internal::GenericSwap(this, other);
-    }
-  }
-  void UnsafeArenaSwap(AggSpec_AggSpecAbsSum* other) {
-    if (other == this) return;
-    ABSL_DCHECK(GetArena() == other->GetArena());
-    InternalSwap(other);
-  }
-
-  // implements Message ----------------------------------------------
-
-  AggSpec_AggSpecAbsSum* New(::google::protobuf::Arena* arena = nullptr) const final {
-    return CreateMaybeMessage<AggSpec_AggSpecAbsSum>(arena);
-  }
-  using ::google::protobuf::internal::ZeroFieldsBase::CopyFrom;
-  inline void CopyFrom(const AggSpec_AggSpecAbsSum& from) {
-    ::google::protobuf::internal::ZeroFieldsBase::CopyImpl(*this, from);
-  }
-  using ::google::protobuf::internal::ZeroFieldsBase::MergeFrom;
-  void MergeFrom(const AggSpec_AggSpecAbsSum& from) {
-    ::google::protobuf::internal::ZeroFieldsBase::MergeImpl(*this, from);
-  }
-  public:
-
-  private:
-  friend class ::google::protobuf::internal::AnyMetadata;
-  static ::absl::string_view FullMessageName() {
-    return "io.deephaven.proto.backplane.grpc.AggSpec.AggSpecAbsSum";
-  }
-  protected:
-  explicit AggSpec_AggSpecAbsSum(::google::protobuf::Arena* arena);
-  AggSpec_AggSpecAbsSum(::google::protobuf::Arena* arena, const AggSpec_AggSpecAbsSum& from);
-  public:
-
-  ::google::protobuf::Metadata GetMetadata() const final;
-
-  // nested types ----------------------------------------------------
-
-  // accessors -------------------------------------------------------
-
-  // @@protoc_insertion_point(class_scope:io.deephaven.proto.backplane.grpc.AggSpec.AggSpecAbsSum)
- private:
-  class _Internal;
-
-  friend class ::google::protobuf::MessageLite;
-  friend class ::google::protobuf::Arena;
-  template <typename T>
-  friend class ::google::protobuf::Arena::InternalHelper;
-  using InternalArenaConstructable_ = void;
-  using DestructorSkippable_ = void;
-  struct Impl_ {
-
-        inline explicit constexpr Impl_(
-            ::google::protobuf::internal::ConstantInitialized) noexcept;
-        inline explicit Impl_(::google::protobuf::internal::InternalVisibility visibility,
-                              ::google::protobuf::Arena* arena);
-        inline explicit Impl_(::google::protobuf::internal::InternalVisibility visibility,
-                              ::google::protobuf::Arena* arena, const Impl_& from);
-    PROTOBUF_TSAN_DECLARE_MEMBER
-  };
-  friend struct ::TableStruct_deephaven_2fproto_2ftable_2eproto;
-};// -------------------------------------------------------------------
-
-class Value final :
-    public ::google::protobuf::Message /* @@protoc_insertion_point(class_definition:io.deephaven.proto.backplane.grpc.Value) */ {
- public:
-  inline Value() : Value(nullptr) {}
-  ~Value() override;
-  template<typename = void>
-  explicit PROTOBUF_CONSTEXPR Value(::google::protobuf::internal::ConstantInitialized);
-
-  inline Value(const Value& from)
-      : Value(nullptr, from) {}
-  Value(Value&& from) noexcept
-    : Value() {
-    *this = ::std::move(from);
-  }
-
-  inline Value& operator=(const Value& from) {
-    CopyFrom(from);
-    return *this;
-  }
-  inline Value& operator=(Value&& from) noexcept {
-    if (this == &from) return *this;
-    if (GetArena() == from.GetArena()
-  #ifdef PROTOBUF_FORCE_COPY_IN_MOVE
-        && GetArena() != nullptr
-  #endif  // !PROTOBUF_FORCE_COPY_IN_MOVE
-    ) {
-      InternalSwap(&from);
-    } else {
-      CopyFrom(from);
-    }
-    return *this;
-  }
-
-  inline const ::google::protobuf::UnknownFieldSet& unknown_fields() const
-      ABSL_ATTRIBUTE_LIFETIME_BOUND {
-    return _internal_metadata_.unknown_fields<::google::protobuf::UnknownFieldSet>(::google::protobuf::UnknownFieldSet::default_instance);
-  }
-  inline ::google::protobuf::UnknownFieldSet* mutable_unknown_fields()
-      ABSL_ATTRIBUTE_LIFETIME_BOUND {
-    return _internal_metadata_.mutable_unknown_fields<::google::protobuf::UnknownFieldSet>();
-  }
-
-  static const ::google::protobuf::Descriptor* descriptor() {
-    return GetDescriptor();
-  }
-  static const ::google::protobuf::Descriptor* GetDescriptor() {
-    return default_instance().GetMetadata().descriptor;
-  }
-  static const ::google::protobuf::Reflection* GetReflection() {
-    return default_instance().GetMetadata().reflection;
-  }
-  static const Value& default_instance() {
-    return *internal_default_instance();
-  }
-  enum DataCase {
-    kReference = 1,
-    kLiteral = 2,
-    DATA_NOT_SET = 0,
-  };
-
-  static inline const Value* internal_default_instance() {
-    return reinterpret_cast<const Value*>(
-               &_Value_default_instance_);
-  }
-  static constexpr int kIndexInFileMessages =
-    99;
-
-  friend void swap(Value& a, Value& b) {
-    a.Swap(&b);
-  }
-  inline void Swap(Value* other) {
-    if (other == this) return;
-  #ifdef PROTOBUF_FORCE_COPY_IN_SWAP
-    if (GetArena() != nullptr &&
-        GetArena() == other->GetArena()) {
-   #else  // PROTOBUF_FORCE_COPY_IN_SWAP
-    if (GetArena() == other->GetArena()) {
-  #endif  // !PROTOBUF_FORCE_COPY_IN_SWAP
-      InternalSwap(other);
-    } else {
-      ::google::protobuf::internal::GenericSwap(this, other);
-    }
-  }
-  void UnsafeArenaSwap(Value* other) {
-    if (other == this) return;
-    ABSL_DCHECK(GetArena() == other->GetArena());
-    InternalSwap(other);
-  }
-
-  // implements Message ----------------------------------------------
-
-  Value* New(::google::protobuf::Arena* arena = nullptr) const final {
-    return CreateMaybeMessage<Value>(arena);
-  }
-  using ::google::protobuf::Message::CopyFrom;
-  void CopyFrom(const Value& from);
-  using ::google::protobuf::Message::MergeFrom;
-  void MergeFrom( const Value& from) {
-    Value::MergeImpl(*this, from);
-  }
-  private:
-  static void MergeImpl(::google::protobuf::Message& to_msg, const ::google::protobuf::Message& from_msg);
-  public:
-  PROTOBUF_ATTRIBUTE_REINITIALIZES void Clear() final;
-  bool IsInitialized() const final;
-
-  ::size_t ByteSizeLong() const final;
-  const char* _InternalParse(const char* ptr, ::google::protobuf::internal::ParseContext* ctx) final;
-  ::uint8_t* _InternalSerialize(
-      ::uint8_t* target, ::google::protobuf::io::EpsCopyOutputStream* stream) const final;
-  int GetCachedSize() const { return _impl_._cached_size_.Get(); }
-
-  private:
-  ::google::protobuf::internal::CachedSize* AccessCachedSize() const final;
-  void SharedCtor(::google::protobuf::Arena* arena);
-  void SharedDtor();
-  void InternalSwap(Value* other);
-
-  private:
-  friend class ::google::protobuf::internal::AnyMetadata;
-  static ::absl::string_view FullMessageName() {
-    return "io.deephaven.proto.backplane.grpc.Value";
-  }
-  protected:
-  explicit Value(::google::protobuf::Arena* arena);
-  Value(::google::protobuf::Arena* arena, const Value& from);
-  public:
-
-  static const ClassData _class_data_;
-  const ::google::protobuf::Message::ClassData*GetClassData() const final;
-
-  ::google::protobuf::Metadata GetMetadata() const final;
-
-  // nested types ----------------------------------------------------
-
-  // accessors -------------------------------------------------------
-
-  enum : int {
-    kReferenceFieldNumber = 1,
-    kLiteralFieldNumber = 2,
-  };
-  // .io.deephaven.proto.backplane.grpc.Reference reference = 1;
-  bool has_reference() const;
-  private:
-  bool _internal_has_reference() const;
-
-  public:
-  void clear_reference() ;
-  const ::io::deephaven::proto::backplane::grpc::Reference& reference() const;
-  PROTOBUF_NODISCARD ::io::deephaven::proto::backplane::grpc::Reference* release_reference();
-  ::io::deephaven::proto::backplane::grpc::Reference* mutable_reference();
-  void set_allocated_reference(::io::deephaven::proto::backplane::grpc::Reference* value);
-  void unsafe_arena_set_allocated_reference(::io::deephaven::proto::backplane::grpc::Reference* value);
-  ::io::deephaven::proto::backplane::grpc::Reference* unsafe_arena_release_reference();
-
-  private:
-  const ::io::deephaven::proto::backplane::grpc::Reference& _internal_reference() const;
-  ::io::deephaven::proto::backplane::grpc::Reference* _internal_mutable_reference();
-
-  public:
-  // .io.deephaven.proto.backplane.grpc.Literal literal = 2;
-  bool has_literal() const;
-  private:
-  bool _internal_has_literal() const;
-
-  public:
-  void clear_literal() ;
-  const ::io::deephaven::proto::backplane::grpc::Literal& literal() const;
-  PROTOBUF_NODISCARD ::io::deephaven::proto::backplane::grpc::Literal* release_literal();
-  ::io::deephaven::proto::backplane::grpc::Literal* mutable_literal();
-  void set_allocated_literal(::io::deephaven::proto::backplane::grpc::Literal* value);
-  void unsafe_arena_set_allocated_literal(::io::deephaven::proto::backplane::grpc::Literal* value);
-  ::io::deephaven::proto::backplane::grpc::Literal* unsafe_arena_release_literal();
-
-  private:
-  const ::io::deephaven::proto::backplane::grpc::Literal& _internal_literal() const;
-  ::io::deephaven::proto::backplane::grpc::Literal* _internal_mutable_literal();
-
-  public:
-  void clear_data();
-  DataCase data_case() const;
-  // @@protoc_insertion_point(class_scope:io.deephaven.proto.backplane.grpc.Value)
- private:
-  class _Internal;
-  void set_has_reference();
-  void set_has_literal();
-
-  inline bool has_data() const;
-  inline void clear_has_data();
-
-  friend class ::google::protobuf::internal::TcParser;
-  static const ::google::protobuf::internal::TcParseTable<
-      0, 2, 2,
-      0, 2>
-      _table_;
-  friend class ::google::protobuf::MessageLite;
-  friend class ::google::protobuf::Arena;
-  template <typename T>
-  friend class ::google::protobuf::Arena::InternalHelper;
-  using InternalArenaConstructable_ = void;
-  using DestructorSkippable_ = void;
-  struct Impl_ {
-
-        inline explicit constexpr Impl_(
-            ::google::protobuf::internal::ConstantInitialized) noexcept;
-        inline explicit Impl_(::google::protobuf::internal::InternalVisibility visibility,
-                              ::google::protobuf::Arena* arena);
-        inline explicit Impl_(::google::protobuf::internal::InternalVisibility visibility,
-                              ::google::protobuf::Arena* arena, const Impl_& from);
-    union DataUnion {
-      constexpr DataUnion() : _constinit_{} {}
-        ::google::protobuf::internal::ConstantInitialized _constinit_;
-      ::io::deephaven::proto::backplane::grpc::Reference* reference_;
-      ::io::deephaven::proto::backplane::grpc::Literal* literal_;
-    } data_;
-    mutable ::google::protobuf::internal::CachedSize _cached_size_;
-    ::uint32_t _oneof_case_[1];
-
-    PROTOBUF_TSAN_DECLARE_MEMBER
-  };
-  union { Impl_ _impl_; };
-  friend struct ::TableStruct_deephaven_2fproto_2ftable_2eproto;
-};// -------------------------------------------------------------------
-
-class UpdateByWindowScale final :
-    public ::google::protobuf::Message /* @@protoc_insertion_point(class_definition:io.deephaven.proto.backplane.grpc.UpdateByWindowScale) */ {
- public:
-  inline UpdateByWindowScale() : UpdateByWindowScale(nullptr) {}
-  ~UpdateByWindowScale() override;
-  template<typename = void>
-  explicit PROTOBUF_CONSTEXPR UpdateByWindowScale(::google::protobuf::internal::ConstantInitialized);
-
-  inline UpdateByWindowScale(const UpdateByWindowScale& from)
-      : UpdateByWindowScale(nullptr, from) {}
-  UpdateByWindowScale(UpdateByWindowScale&& from) noexcept
-    : UpdateByWindowScale() {
-    *this = ::std::move(from);
-  }
-
-  inline UpdateByWindowScale& operator=(const UpdateByWindowScale& from) {
-    CopyFrom(from);
-    return *this;
-  }
-  inline UpdateByWindowScale& operator=(UpdateByWindowScale&& from) noexcept {
-    if (this == &from) return *this;
-    if (GetArena() == from.GetArena()
-  #ifdef PROTOBUF_FORCE_COPY_IN_MOVE
-        && GetArena() != nullptr
-  #endif  // !PROTOBUF_FORCE_COPY_IN_MOVE
-    ) {
-      InternalSwap(&from);
-    } else {
-      CopyFrom(from);
-    }
-    return *this;
-  }
-
-  inline const ::google::protobuf::UnknownFieldSet& unknown_fields() const
-      ABSL_ATTRIBUTE_LIFETIME_BOUND {
-    return _internal_metadata_.unknown_fields<::google::protobuf::UnknownFieldSet>(::google::protobuf::UnknownFieldSet::default_instance);
-  }
-  inline ::google::protobuf::UnknownFieldSet* mutable_unknown_fields()
-      ABSL_ATTRIBUTE_LIFETIME_BOUND {
-    return _internal_metadata_.mutable_unknown_fields<::google::protobuf::UnknownFieldSet>();
-  }
-
-  static const ::google::protobuf::Descriptor* descriptor() {
-    return GetDescriptor();
-  }
-  static const ::google::protobuf::Descriptor* GetDescriptor() {
-    return default_instance().GetMetadata().descriptor;
-  }
-  static const ::google::protobuf::Reflection* GetReflection() {
-    return default_instance().GetMetadata().reflection;
-  }
-  static const UpdateByWindowScale& default_instance() {
-    return *internal_default_instance();
-  }
-  enum TypeCase {
-    kTicks = 1,
-    kTime = 2,
-    TYPE_NOT_SET = 0,
-  };
-
-  static inline const UpdateByWindowScale* internal_default_instance() {
-    return reinterpret_cast<const UpdateByWindowScale*>(
-               &_UpdateByWindowScale_default_instance_);
-  }
-  static constexpr int kIndexInFileMessages =
-    12;
-
-  friend void swap(UpdateByWindowScale& a, UpdateByWindowScale& b) {
-    a.Swap(&b);
-  }
-  inline void Swap(UpdateByWindowScale* other) {
-    if (other == this) return;
-  #ifdef PROTOBUF_FORCE_COPY_IN_SWAP
-    if (GetArena() != nullptr &&
-        GetArena() == other->GetArena()) {
-   #else  // PROTOBUF_FORCE_COPY_IN_SWAP
-    if (GetArena() == other->GetArena()) {
-  #endif  // !PROTOBUF_FORCE_COPY_IN_SWAP
-      InternalSwap(other);
-    } else {
-      ::google::protobuf::internal::GenericSwap(this, other);
-    }
-  }
-  void UnsafeArenaSwap(UpdateByWindowScale* other) {
-    if (other == this) return;
-    ABSL_DCHECK(GetArena() == other->GetArena());
-    InternalSwap(other);
-  }
-
-  // implements Message ----------------------------------------------
-
-  UpdateByWindowScale* New(::google::protobuf::Arena* arena = nullptr) const final {
-    return CreateMaybeMessage<UpdateByWindowScale>(arena);
-  }
-  using ::google::protobuf::Message::CopyFrom;
-  void CopyFrom(const UpdateByWindowScale& from);
-  using ::google::protobuf::Message::MergeFrom;
-  void MergeFrom( const UpdateByWindowScale& from) {
-    UpdateByWindowScale::MergeImpl(*this, from);
-  }
-  private:
-  static void MergeImpl(::google::protobuf::Message& to_msg, const ::google::protobuf::Message& from_msg);
-  public:
-  PROTOBUF_ATTRIBUTE_REINITIALIZES void Clear() final;
-  bool IsInitialized() const final;
-
-  ::size_t ByteSizeLong() const final;
-  const char* _InternalParse(const char* ptr, ::google::protobuf::internal::ParseContext* ctx) final;
-  ::uint8_t* _InternalSerialize(
-      ::uint8_t* target, ::google::protobuf::io::EpsCopyOutputStream* stream) const final;
-  int GetCachedSize() const { return _impl_._cached_size_.Get(); }
-
-  private:
-  ::google::protobuf::internal::CachedSize* AccessCachedSize() const final;
-  void SharedCtor(::google::protobuf::Arena* arena);
-  void SharedDtor();
-  void InternalSwap(UpdateByWindowScale* other);
-
-  private:
-  friend class ::google::protobuf::internal::AnyMetadata;
-  static ::absl::string_view FullMessageName() {
-    return "io.deephaven.proto.backplane.grpc.UpdateByWindowScale";
-  }
-  protected:
-  explicit UpdateByWindowScale(::google::protobuf::Arena* arena);
-  UpdateByWindowScale(::google::protobuf::Arena* arena, const UpdateByWindowScale& from);
-  public:
-
-  static const ClassData _class_data_;
-  const ::google::protobuf::Message::ClassData*GetClassData() const final;
-
-  ::google::protobuf::Metadata GetMetadata() const final;
-
-  // nested types ----------------------------------------------------
-
-  using UpdateByWindowTicks = UpdateByWindowScale_UpdateByWindowTicks;
-  using UpdateByWindowTime = UpdateByWindowScale_UpdateByWindowTime;
-
-  // accessors -------------------------------------------------------
-
-  enum : int {
-    kTicksFieldNumber = 1,
-    kTimeFieldNumber = 2,
-  };
-  // .io.deephaven.proto.backplane.grpc.UpdateByWindowScale.UpdateByWindowTicks ticks = 1;
-  bool has_ticks() const;
-  private:
-  bool _internal_has_ticks() const;
-
-  public:
-  void clear_ticks() ;
-  const ::io::deephaven::proto::backplane::grpc::UpdateByWindowScale_UpdateByWindowTicks& ticks() const;
-  PROTOBUF_NODISCARD ::io::deephaven::proto::backplane::grpc::UpdateByWindowScale_UpdateByWindowTicks* release_ticks();
-  ::io::deephaven::proto::backplane::grpc::UpdateByWindowScale_UpdateByWindowTicks* mutable_ticks();
-  void set_allocated_ticks(::io::deephaven::proto::backplane::grpc::UpdateByWindowScale_UpdateByWindowTicks* value);
-  void unsafe_arena_set_allocated_ticks(::io::deephaven::proto::backplane::grpc::UpdateByWindowScale_UpdateByWindowTicks* value);
-  ::io::deephaven::proto::backplane::grpc::UpdateByWindowScale_UpdateByWindowTicks* unsafe_arena_release_ticks();
-
-  private:
-  const ::io::deephaven::proto::backplane::grpc::UpdateByWindowScale_UpdateByWindowTicks& _internal_ticks() const;
-  ::io::deephaven::proto::backplane::grpc::UpdateByWindowScale_UpdateByWindowTicks* _internal_mutable_ticks();
-
-  public:
-  // .io.deephaven.proto.backplane.grpc.UpdateByWindowScale.UpdateByWindowTime time = 2;
-  bool has_time() const;
-  private:
-  bool _internal_has_time() const;
-
-  public:
-  void clear_time() ;
-  const ::io::deephaven::proto::backplane::grpc::UpdateByWindowScale_UpdateByWindowTime& time() const;
-  PROTOBUF_NODISCARD ::io::deephaven::proto::backplane::grpc::UpdateByWindowScale_UpdateByWindowTime* release_time();
-  ::io::deephaven::proto::backplane::grpc::UpdateByWindowScale_UpdateByWindowTime* mutable_time();
-  void set_allocated_time(::io::deephaven::proto::backplane::grpc::UpdateByWindowScale_UpdateByWindowTime* value);
-  void unsafe_arena_set_allocated_time(::io::deephaven::proto::backplane::grpc::UpdateByWindowScale_UpdateByWindowTime* value);
-  ::io::deephaven::proto::backplane::grpc::UpdateByWindowScale_UpdateByWindowTime* unsafe_arena_release_time();
-
-  private:
-  const ::io::deephaven::proto::backplane::grpc::UpdateByWindowScale_UpdateByWindowTime& _internal_time() const;
-  ::io::deephaven::proto::backplane::grpc::UpdateByWindowScale_UpdateByWindowTime* _internal_mutable_time();
-
-  public:
-  void clear_type();
-  TypeCase type_case() const;
-  // @@protoc_insertion_point(class_scope:io.deephaven.proto.backplane.grpc.UpdateByWindowScale)
- private:
-  class _Internal;
-  void set_has_ticks();
-  void set_has_time();
-
-  inline bool has_type() const;
-  inline void clear_has_type();
-
-  friend class ::google::protobuf::internal::TcParser;
-  static const ::google::protobuf::internal::TcParseTable<
-      0, 2, 2,
-      0, 2>
-      _table_;
-  friend class ::google::protobuf::MessageLite;
-  friend class ::google::protobuf::Arena;
-  template <typename T>
-  friend class ::google::protobuf::Arena::InternalHelper;
-  using InternalArenaConstructable_ = void;
-  using DestructorSkippable_ = void;
-  struct Impl_ {
-
-        inline explicit constexpr Impl_(
-            ::google::protobuf::internal::ConstantInitialized) noexcept;
-        inline explicit Impl_(::google::protobuf::internal::InternalVisibility visibility,
-                              ::google::protobuf::Arena* arena);
-        inline explicit Impl_(::google::protobuf::internal::InternalVisibility visibility,
-                              ::google::protobuf::Arena* arena, const Impl_& from);
-    union TypeUnion {
-      constexpr TypeUnion() : _constinit_{} {}
-        ::google::protobuf::internal::ConstantInitialized _constinit_;
-      ::io::deephaven::proto::backplane::grpc::UpdateByWindowScale_UpdateByWindowTicks* ticks_;
-      ::io::deephaven::proto::backplane::grpc::UpdateByWindowScale_UpdateByWindowTime* time_;
-    } type_;
-    mutable ::google::protobuf::internal::CachedSize _cached_size_;
-    ::uint32_t _oneof_case_[1];
-
-    PROTOBUF_TSAN_DECLARE_MEMBER
-  };
-  union { Impl_ _impl_; };
-  friend struct ::TableStruct_deephaven_2fproto_2ftable_2eproto;
-};// -------------------------------------------------------------------
-
-class UpdateByRequest_UpdateByOptions final :
-    public ::google::protobuf::Message /* @@protoc_insertion_point(class_definition:io.deephaven.proto.backplane.grpc.UpdateByRequest.UpdateByOptions) */ {
- public:
-  inline UpdateByRequest_UpdateByOptions() : UpdateByRequest_UpdateByOptions(nullptr) {}
-  ~UpdateByRequest_UpdateByOptions() override;
-  template<typename = void>
-  explicit PROTOBUF_CONSTEXPR UpdateByRequest_UpdateByOptions(::google::protobuf::internal::ConstantInitialized);
-
-  inline UpdateByRequest_UpdateByOptions(const UpdateByRequest_UpdateByOptions& from)
-      : UpdateByRequest_UpdateByOptions(nullptr, from) {}
-  UpdateByRequest_UpdateByOptions(UpdateByRequest_UpdateByOptions&& from) noexcept
-    : UpdateByRequest_UpdateByOptions() {
-    *this = ::std::move(from);
-  }
-
-  inline UpdateByRequest_UpdateByOptions& operator=(const UpdateByRequest_UpdateByOptions& from) {
-    CopyFrom(from);
-    return *this;
-  }
-  inline UpdateByRequest_UpdateByOptions& operator=(UpdateByRequest_UpdateByOptions&& from) noexcept {
-    if (this == &from) return *this;
-    if (GetArena() == from.GetArena()
-  #ifdef PROTOBUF_FORCE_COPY_IN_MOVE
-        && GetArena() != nullptr
-  #endif  // !PROTOBUF_FORCE_COPY_IN_MOVE
-    ) {
-      InternalSwap(&from);
-    } else {
-      CopyFrom(from);
-    }
-    return *this;
-  }
-
-  inline const ::google::protobuf::UnknownFieldSet& unknown_fields() const
-      ABSL_ATTRIBUTE_LIFETIME_BOUND {
-    return _internal_metadata_.unknown_fields<::google::protobuf::UnknownFieldSet>(::google::protobuf::UnknownFieldSet::default_instance);
-  }
-  inline ::google::protobuf::UnknownFieldSet* mutable_unknown_fields()
-      ABSL_ATTRIBUTE_LIFETIME_BOUND {
-    return _internal_metadata_.mutable_unknown_fields<::google::protobuf::UnknownFieldSet>();
-  }
-
-  static const ::google::protobuf::Descriptor* descriptor() {
-    return GetDescriptor();
-  }
-  static const ::google::protobuf::Descriptor* GetDescriptor() {
-    return default_instance().GetMetadata().descriptor;
-  }
-  static const ::google::protobuf::Reflection* GetReflection() {
-    return default_instance().GetMetadata().reflection;
-  }
-  static const UpdateByRequest_UpdateByOptions& default_instance() {
-    return *internal_default_instance();
-  }
-  static inline const UpdateByRequest_UpdateByOptions* internal_default_instance() {
-    return reinterpret_cast<const UpdateByRequest_UpdateByOptions*>(
-               &_UpdateByRequest_UpdateByOptions_default_instance_);
-  }
-  static constexpr int kIndexInFileMessages =
-    15;
-
-  friend void swap(UpdateByRequest_UpdateByOptions& a, UpdateByRequest_UpdateByOptions& b) {
-    a.Swap(&b);
-  }
-  inline void Swap(UpdateByRequest_UpdateByOptions* other) {
-    if (other == this) return;
-  #ifdef PROTOBUF_FORCE_COPY_IN_SWAP
-    if (GetArena() != nullptr &&
-        GetArena() == other->GetArena()) {
-   #else  // PROTOBUF_FORCE_COPY_IN_SWAP
-    if (GetArena() == other->GetArena()) {
-  #endif  // !PROTOBUF_FORCE_COPY_IN_SWAP
-      InternalSwap(other);
-    } else {
-      ::google::protobuf::internal::GenericSwap(this, other);
-    }
-  }
-  void UnsafeArenaSwap(UpdateByRequest_UpdateByOptions* other) {
-    if (other == this) return;
-    ABSL_DCHECK(GetArena() == other->GetArena());
-    InternalSwap(other);
-  }
-
-  // implements Message ----------------------------------------------
-
-  UpdateByRequest_UpdateByOptions* New(::google::protobuf::Arena* arena = nullptr) const final {
-    return CreateMaybeMessage<UpdateByRequest_UpdateByOptions>(arena);
-  }
-  using ::google::protobuf::Message::CopyFrom;
-  void CopyFrom(const UpdateByRequest_UpdateByOptions& from);
-  using ::google::protobuf::Message::MergeFrom;
-  void MergeFrom( const UpdateByRequest_UpdateByOptions& from) {
-    UpdateByRequest_UpdateByOptions::MergeImpl(*this, from);
-  }
-  private:
-  static void MergeImpl(::google::protobuf::Message& to_msg, const ::google::protobuf::Message& from_msg);
-  public:
-  PROTOBUF_ATTRIBUTE_REINITIALIZES void Clear() final;
-  bool IsInitialized() const final;
-
-  ::size_t ByteSizeLong() const final;
-  const char* _InternalParse(const char* ptr, ::google::protobuf::internal::ParseContext* ctx) final;
-  ::uint8_t* _InternalSerialize(
-      ::uint8_t* target, ::google::protobuf::io::EpsCopyOutputStream* stream) const final;
-  int GetCachedSize() const { return _impl_._cached_size_.Get(); }
-
-  private:
-  ::google::protobuf::internal::CachedSize* AccessCachedSize() const final;
-  void SharedCtor(::google::protobuf::Arena* arena);
-  void SharedDtor();
-  void InternalSwap(UpdateByRequest_UpdateByOptions* other);
-
-  private:
-  friend class ::google::protobuf::internal::AnyMetadata;
-  static ::absl::string_view FullMessageName() {
-    return "io.deephaven.proto.backplane.grpc.UpdateByRequest.UpdateByOptions";
-  }
-  protected:
-  explicit UpdateByRequest_UpdateByOptions(::google::protobuf::Arena* arena);
-  UpdateByRequest_UpdateByOptions(::google::protobuf::Arena* arena, const UpdateByRequest_UpdateByOptions& from);
-  public:
-
-  static const ClassData _class_data_;
-  const ::google::protobuf::Message::ClassData*GetClassData() const final;
-
-  ::google::protobuf::Metadata GetMetadata() const final;
-
-  // nested types ----------------------------------------------------
-
-  // accessors -------------------------------------------------------
-
-  enum : int {
-    kMathContextFieldNumber = 7,
-    kUseRedirectionFieldNumber = 1,
-    kChunkCapacityFieldNumber = 2,
-    kMaxStaticSparseMemoryOverheadFieldNumber = 3,
-    kMaximumLoadFactorFieldNumber = 5,
-    kTargetLoadFactorFieldNumber = 6,
-    kInitialHashTableSizeFieldNumber = 4,
-  };
-  // .io.deephaven.proto.backplane.grpc.MathContext math_context = 7;
-  bool has_math_context() const;
-  void clear_math_context() ;
-  const ::io::deephaven::proto::backplane::grpc::MathContext& math_context() const;
-  PROTOBUF_NODISCARD ::io::deephaven::proto::backplane::grpc::MathContext* release_math_context();
-  ::io::deephaven::proto::backplane::grpc::MathContext* mutable_math_context();
-  void set_allocated_math_context(::io::deephaven::proto::backplane::grpc::MathContext* value);
-  void unsafe_arena_set_allocated_math_context(::io::deephaven::proto::backplane::grpc::MathContext* value);
-  ::io::deephaven::proto::backplane::grpc::MathContext* unsafe_arena_release_math_context();
-
-  private:
-  const ::io::deephaven::proto::backplane::grpc::MathContext& _internal_math_context() const;
-  ::io::deephaven::proto::backplane::grpc::MathContext* _internal_mutable_math_context();
-
-  public:
-  // optional bool use_redirection = 1;
-  bool has_use_redirection() const;
-  void clear_use_redirection() ;
-  bool use_redirection() const;
-  void set_use_redirection(bool value);
-
-  private:
-  bool _internal_use_redirection() const;
-  void _internal_set_use_redirection(bool value);
-
-  public:
-  // optional int32 chunk_capacity = 2;
-  bool has_chunk_capacity() const;
-  void clear_chunk_capacity() ;
-  ::int32_t chunk_capacity() const;
-  void set_chunk_capacity(::int32_t value);
-
-  private:
-  ::int32_t _internal_chunk_capacity() const;
-  void _internal_set_chunk_capacity(::int32_t value);
-
-  public:
-  // optional double max_static_sparse_memory_overhead = 3;
-  bool has_max_static_sparse_memory_overhead() const;
-  void clear_max_static_sparse_memory_overhead() ;
-  double max_static_sparse_memory_overhead() const;
-  void set_max_static_sparse_memory_overhead(double value);
-
-  private:
-  double _internal_max_static_sparse_memory_overhead() const;
-  void _internal_set_max_static_sparse_memory_overhead(double value);
-
-  public:
-  // optional double maximum_load_factor = 5;
-  bool has_maximum_load_factor() const;
-  void clear_maximum_load_factor() ;
-  double maximum_load_factor() const;
-  void set_maximum_load_factor(double value);
-
-  private:
-  double _internal_maximum_load_factor() const;
-  void _internal_set_maximum_load_factor(double value);
-
-  public:
-  // optional double target_load_factor = 6;
-  bool has_target_load_factor() const;
-  void clear_target_load_factor() ;
-  double target_load_factor() const;
-  void set_target_load_factor(double value);
-
-  private:
-  double _internal_target_load_factor() const;
-  void _internal_set_target_load_factor(double value);
-
-  public:
-  // optional int32 initial_hash_table_size = 4;
-  bool has_initial_hash_table_size() const;
-  void clear_initial_hash_table_size() ;
-  ::int32_t initial_hash_table_size() const;
-  void set_initial_hash_table_size(::int32_t value);
-
-  private:
-  ::int32_t _internal_initial_hash_table_size() const;
-  void _internal_set_initial_hash_table_size(::int32_t value);
-
-  public:
-  // @@protoc_insertion_point(class_scope:io.deephaven.proto.backplane.grpc.UpdateByRequest.UpdateByOptions)
- private:
-  class _Internal;
-
-  friend class ::google::protobuf::internal::TcParser;
-  static const ::google::protobuf::internal::TcParseTable<
-      3, 7, 1,
-      0, 2>
-      _table_;
-  friend class ::google::protobuf::MessageLite;
-  friend class ::google::protobuf::Arena;
-  template <typename T>
-  friend class ::google::protobuf::Arena::InternalHelper;
-  using InternalArenaConstructable_ = void;
-  using DestructorSkippable_ = void;
-  struct Impl_ {
-
-        inline explicit constexpr Impl_(
-            ::google::protobuf::internal::ConstantInitialized) noexcept;
-        inline explicit Impl_(::google::protobuf::internal::InternalVisibility visibility,
-                              ::google::protobuf::Arena* arena);
-        inline explicit Impl_(::google::protobuf::internal::InternalVisibility visibility,
-                              ::google::protobuf::Arena* arena, const Impl_& from);
-    ::google::protobuf::internal::HasBits<1> _has_bits_;
-    mutable ::google::protobuf::internal::CachedSize _cached_size_;
-    ::io::deephaven::proto::backplane::grpc::MathContext* math_context_;
-    bool use_redirection_;
-    ::int32_t chunk_capacity_;
-    double max_static_sparse_memory_overhead_;
-    double maximum_load_factor_;
-    double target_load_factor_;
-    ::int32_t initial_hash_table_size_;
-    PROTOBUF_TSAN_DECLARE_MEMBER
-  };
-  union { Impl_ _impl_; };
-  friend struct ::TableStruct_deephaven_2fproto_2ftable_2eproto;
-};// -------------------------------------------------------------------
-
-class UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByDelta final :
-    public ::google::protobuf::Message /* @@protoc_insertion_point(class_definition:io.deephaven.proto.backplane.grpc.UpdateByRequest.UpdateByOperation.UpdateByColumn.UpdateBySpec.UpdateByDelta) */ {
- public:
-  inline UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByDelta() : UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByDelta(nullptr) {}
-  ~UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByDelta() override;
-  template<typename = void>
-  explicit PROTOBUF_CONSTEXPR UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByDelta(::google::protobuf::internal::ConstantInitialized);
-
-  inline UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByDelta(const UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByDelta& from)
-      : UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByDelta(nullptr, from) {}
-  UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByDelta(UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByDelta&& from) noexcept
-    : UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByDelta() {
-    *this = ::std::move(from);
-  }
-
-  inline UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByDelta& operator=(const UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByDelta& from) {
-    CopyFrom(from);
-    return *this;
-  }
-  inline UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByDelta& operator=(UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByDelta&& from) noexcept {
-    if (this == &from) return *this;
-    if (GetArena() == from.GetArena()
-  #ifdef PROTOBUF_FORCE_COPY_IN_MOVE
-        && GetArena() != nullptr
-  #endif  // !PROTOBUF_FORCE_COPY_IN_MOVE
-    ) {
-      InternalSwap(&from);
-    } else {
-      CopyFrom(from);
-    }
-    return *this;
-  }
-
-  inline const ::google::protobuf::UnknownFieldSet& unknown_fields() const
-      ABSL_ATTRIBUTE_LIFETIME_BOUND {
-    return _internal_metadata_.unknown_fields<::google::protobuf::UnknownFieldSet>(::google::protobuf::UnknownFieldSet::default_instance);
-  }
-  inline ::google::protobuf::UnknownFieldSet* mutable_unknown_fields()
-      ABSL_ATTRIBUTE_LIFETIME_BOUND {
-    return _internal_metadata_.mutable_unknown_fields<::google::protobuf::UnknownFieldSet>();
-  }
-
-  static const ::google::protobuf::Descriptor* descriptor() {
-    return GetDescriptor();
-  }
-  static const ::google::protobuf::Descriptor* GetDescriptor() {
-    return default_instance().GetMetadata().descriptor;
-  }
-  static const ::google::protobuf::Reflection* GetReflection() {
-    return default_instance().GetMetadata().reflection;
-  }
-  static const UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByDelta& default_instance() {
-    return *internal_default_instance();
-  }
-  static inline const UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByDelta* internal_default_instance() {
-    return reinterpret_cast<const UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByDelta*>(
-               &_UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByDelta_default_instance_);
-  }
-  static constexpr int kIndexInFileMessages =
-    26;
-
-  friend void swap(UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByDelta& a, UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByDelta& b) {
-    a.Swap(&b);
-  }
-  inline void Swap(UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByDelta* other) {
-    if (other == this) return;
-  #ifdef PROTOBUF_FORCE_COPY_IN_SWAP
-    if (GetArena() != nullptr &&
-        GetArena() == other->GetArena()) {
-   #else  // PROTOBUF_FORCE_COPY_IN_SWAP
-    if (GetArena() == other->GetArena()) {
-  #endif  // !PROTOBUF_FORCE_COPY_IN_SWAP
-      InternalSwap(other);
-    } else {
-      ::google::protobuf::internal::GenericSwap(this, other);
-    }
-  }
-  void UnsafeArenaSwap(UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByDelta* other) {
-    if (other == this) return;
-    ABSL_DCHECK(GetArena() == other->GetArena());
-    InternalSwap(other);
-  }
-
-  // implements Message ----------------------------------------------
-
-  UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByDelta* New(::google::protobuf::Arena* arena = nullptr) const final {
-    return CreateMaybeMessage<UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByDelta>(arena);
-  }
-  using ::google::protobuf::Message::CopyFrom;
-  void CopyFrom(const UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByDelta& from);
-  using ::google::protobuf::Message::MergeFrom;
-  void MergeFrom( const UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByDelta& from) {
-    UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByDelta::MergeImpl(*this, from);
-  }
-  private:
-  static void MergeImpl(::google::protobuf::Message& to_msg, const ::google::protobuf::Message& from_msg);
-  public:
-  PROTOBUF_ATTRIBUTE_REINITIALIZES void Clear() final;
-  bool IsInitialized() const final;
-
-  ::size_t ByteSizeLong() const final;
-  const char* _InternalParse(const char* ptr, ::google::protobuf::internal::ParseContext* ctx) final;
-  ::uint8_t* _InternalSerialize(
-      ::uint8_t* target, ::google::protobuf::io::EpsCopyOutputStream* stream) const final;
-  int GetCachedSize() const { return _impl_._cached_size_.Get(); }
-
-  private:
-  ::google::protobuf::internal::CachedSize* AccessCachedSize() const final;
-  void SharedCtor(::google::protobuf::Arena* arena);
-  void SharedDtor();
-  void InternalSwap(UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByDelta* other);
-
-  private:
-  friend class ::google::protobuf::internal::AnyMetadata;
-  static ::absl::string_view FullMessageName() {
-    return "io.deephaven.proto.backplane.grpc.UpdateByRequest.UpdateByOperation.UpdateByColumn.UpdateBySpec.UpdateByDelta";
-  }
-  protected:
-  explicit UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByDelta(::google::protobuf::Arena* arena);
-  UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByDelta(::google::protobuf::Arena* arena, const UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByDelta& from);
-  public:
-
-  static const ClassData _class_data_;
-  const ::google::protobuf::Message::ClassData*GetClassData() const final;
-
-  ::google::protobuf::Metadata GetMetadata() const final;
-
-  // nested types ----------------------------------------------------
-
-  // accessors -------------------------------------------------------
-
-  enum : int {
-    kOptionsFieldNumber = 1,
-  };
-  // .io.deephaven.proto.backplane.grpc.UpdateByDeltaOptions options = 1;
-  bool has_options() const;
-  void clear_options() ;
-  const ::io::deephaven::proto::backplane::grpc::UpdateByDeltaOptions& options() const;
-  PROTOBUF_NODISCARD ::io::deephaven::proto::backplane::grpc::UpdateByDeltaOptions* release_options();
-  ::io::deephaven::proto::backplane::grpc::UpdateByDeltaOptions* mutable_options();
-  void set_allocated_options(::io::deephaven::proto::backplane::grpc::UpdateByDeltaOptions* value);
-  void unsafe_arena_set_allocated_options(::io::deephaven::proto::backplane::grpc::UpdateByDeltaOptions* value);
-  ::io::deephaven::proto::backplane::grpc::UpdateByDeltaOptions* unsafe_arena_release_options();
-
-  private:
-  const ::io::deephaven::proto::backplane::grpc::UpdateByDeltaOptions& _internal_options() const;
-  ::io::deephaven::proto::backplane::grpc::UpdateByDeltaOptions* _internal_mutable_options();
-
-  public:
-  // @@protoc_insertion_point(class_scope:io.deephaven.proto.backplane.grpc.UpdateByRequest.UpdateByOperation.UpdateByColumn.UpdateBySpec.UpdateByDelta)
- private:
-  class _Internal;
-
-  friend class ::google::protobuf::internal::TcParser;
-  static const ::google::protobuf::internal::TcParseTable<
-      0, 1, 1,
-      0, 2>
-      _table_;
-  friend class ::google::protobuf::MessageLite;
-  friend class ::google::protobuf::Arena;
-  template <typename T>
-  friend class ::google::protobuf::Arena::InternalHelper;
-  using InternalArenaConstructable_ = void;
-  using DestructorSkippable_ = void;
-  struct Impl_ {
-
-        inline explicit constexpr Impl_(
-            ::google::protobuf::internal::ConstantInitialized) noexcept;
-        inline explicit Impl_(::google::protobuf::internal::InternalVisibility visibility,
-                              ::google::protobuf::Arena* arena);
-        inline explicit Impl_(::google::protobuf::internal::InternalVisibility visibility,
-                              ::google::protobuf::Arena* arena, const Impl_& from);
-    ::google::protobuf::internal::HasBits<1> _has_bits_;
-    mutable ::google::protobuf::internal::CachedSize _cached_size_;
-    ::io::deephaven::proto::backplane::grpc::UpdateByDeltaOptions* options_;
-    PROTOBUF_TSAN_DECLARE_MEMBER
-  };
-  union { Impl_ _impl_; };
-  friend struct ::TableStruct_deephaven_2fproto_2ftable_2eproto;
-};// -------------------------------------------------------------------
-
-class UpdateByEmOptions final :
-    public ::google::protobuf::Message /* @@protoc_insertion_point(class_definition:io.deephaven.proto.backplane.grpc.UpdateByEmOptions) */ {
- public:
-  inline UpdateByEmOptions() : UpdateByEmOptions(nullptr) {}
-  ~UpdateByEmOptions() override;
-  template<typename = void>
-  explicit PROTOBUF_CONSTEXPR UpdateByEmOptions(::google::protobuf::internal::ConstantInitialized);
-
-  inline UpdateByEmOptions(const UpdateByEmOptions& from)
-      : UpdateByEmOptions(nullptr, from) {}
-  UpdateByEmOptions(UpdateByEmOptions&& from) noexcept
-    : UpdateByEmOptions() {
-    *this = ::std::move(from);
-  }
-
-  inline UpdateByEmOptions& operator=(const UpdateByEmOptions& from) {
-    CopyFrom(from);
-    return *this;
-  }
-  inline UpdateByEmOptions& operator=(UpdateByEmOptions&& from) noexcept {
-    if (this == &from) return *this;
-    if (GetArena() == from.GetArena()
-  #ifdef PROTOBUF_FORCE_COPY_IN_MOVE
-        && GetArena() != nullptr
-  #endif  // !PROTOBUF_FORCE_COPY_IN_MOVE
-    ) {
-      InternalSwap(&from);
-    } else {
-      CopyFrom(from);
-    }
-    return *this;
-  }
-
-  inline const ::google::protobuf::UnknownFieldSet& unknown_fields() const
-      ABSL_ATTRIBUTE_LIFETIME_BOUND {
-    return _internal_metadata_.unknown_fields<::google::protobuf::UnknownFieldSet>(::google::protobuf::UnknownFieldSet::default_instance);
-  }
-  inline ::google::protobuf::UnknownFieldSet* mutable_unknown_fields()
-      ABSL_ATTRIBUTE_LIFETIME_BOUND {
-    return _internal_metadata_.mutable_unknown_fields<::google::protobuf::UnknownFieldSet>();
-  }
-
-  static const ::google::protobuf::Descriptor* descriptor() {
-    return GetDescriptor();
-  }
-  static const ::google::protobuf::Descriptor* GetDescriptor() {
-    return default_instance().GetMetadata().descriptor;
-  }
-  static const ::google::protobuf::Reflection* GetReflection() {
-    return default_instance().GetMetadata().reflection;
-  }
-  static const UpdateByEmOptions& default_instance() {
-    return *internal_default_instance();
-  }
-  static inline const UpdateByEmOptions* internal_default_instance() {
-    return reinterpret_cast<const UpdateByEmOptions*>(
-               &_UpdateByEmOptions_default_instance_);
-  }
-  static constexpr int kIndexInFileMessages =
-    13;
-
-  friend void swap(UpdateByEmOptions& a, UpdateByEmOptions& b) {
-    a.Swap(&b);
-  }
-  inline void Swap(UpdateByEmOptions* other) {
-    if (other == this) return;
-  #ifdef PROTOBUF_FORCE_COPY_IN_SWAP
-    if (GetArena() != nullptr &&
-        GetArena() == other->GetArena()) {
-   #else  // PROTOBUF_FORCE_COPY_IN_SWAP
-    if (GetArena() == other->GetArena()) {
-  #endif  // !PROTOBUF_FORCE_COPY_IN_SWAP
-      InternalSwap(other);
-    } else {
-      ::google::protobuf::internal::GenericSwap(this, other);
-    }
-  }
-  void UnsafeArenaSwap(UpdateByEmOptions* other) {
-    if (other == this) return;
-    ABSL_DCHECK(GetArena() == other->GetArena());
-    InternalSwap(other);
-  }
-
-  // implements Message ----------------------------------------------
-
-  UpdateByEmOptions* New(::google::protobuf::Arena* arena = nullptr) const final {
-    return CreateMaybeMessage<UpdateByEmOptions>(arena);
-  }
-  using ::google::protobuf::Message::CopyFrom;
-  void CopyFrom(const UpdateByEmOptions& from);
-  using ::google::protobuf::Message::MergeFrom;
-  void MergeFrom( const UpdateByEmOptions& from) {
-    UpdateByEmOptions::MergeImpl(*this, from);
-  }
-  private:
-  static void MergeImpl(::google::protobuf::Message& to_msg, const ::google::protobuf::Message& from_msg);
-  public:
-  PROTOBUF_ATTRIBUTE_REINITIALIZES void Clear() final;
-  bool IsInitialized() const final;
-
-  ::size_t ByteSizeLong() const final;
-  const char* _InternalParse(const char* ptr, ::google::protobuf::internal::ParseContext* ctx) final;
-  ::uint8_t* _InternalSerialize(
-      ::uint8_t* target, ::google::protobuf::io::EpsCopyOutputStream* stream) const final;
-  int GetCachedSize() const { return _impl_._cached_size_.Get(); }
-
-  private:
-  ::google::protobuf::internal::CachedSize* AccessCachedSize() const final;
-  void SharedCtor(::google::protobuf::Arena* arena);
-  void SharedDtor();
-  void InternalSwap(UpdateByEmOptions* other);
-
-  private:
-  friend class ::google::protobuf::internal::AnyMetadata;
-  static ::absl::string_view FullMessageName() {
-    return "io.deephaven.proto.backplane.grpc.UpdateByEmOptions";
-  }
-  protected:
-  explicit UpdateByEmOptions(::google::protobuf::Arena* arena);
-  UpdateByEmOptions(::google::protobuf::Arena* arena, const UpdateByEmOptions& from);
-  public:
-
-  static const ClassData _class_data_;
-  const ::google::protobuf::Message::ClassData*GetClassData() const final;
-
-  ::google::protobuf::Metadata GetMetadata() const final;
-
-  // nested types ----------------------------------------------------
-
-  // accessors -------------------------------------------------------
-
-  enum : int {
-    kBigValueContextFieldNumber = 6,
-    kOnNullValueFieldNumber = 1,
-    kOnNanValueFieldNumber = 2,
-    kOnNullTimeFieldNumber = 3,
-    kOnNegativeDeltaTimeFieldNumber = 4,
-    kOnZeroDeltaTimeFieldNumber = 5,
-  };
-  // .io.deephaven.proto.backplane.grpc.MathContext big_value_context = 6;
-  bool has_big_value_context() const;
-  void clear_big_value_context() ;
-  const ::io::deephaven::proto::backplane::grpc::MathContext& big_value_context() const;
-  PROTOBUF_NODISCARD ::io::deephaven::proto::backplane::grpc::MathContext* release_big_value_context();
-  ::io::deephaven::proto::backplane::grpc::MathContext* mutable_big_value_context();
-  void set_allocated_big_value_context(::io::deephaven::proto::backplane::grpc::MathContext* value);
-  void unsafe_arena_set_allocated_big_value_context(::io::deephaven::proto::backplane::grpc::MathContext* value);
-  ::io::deephaven::proto::backplane::grpc::MathContext* unsafe_arena_release_big_value_context();
-
-  private:
-  const ::io::deephaven::proto::backplane::grpc::MathContext& _internal_big_value_context() const;
-  ::io::deephaven::proto::backplane::grpc::MathContext* _internal_mutable_big_value_context();
-
-  public:
-  // .io.deephaven.proto.backplane.grpc.BadDataBehavior on_null_value = 1;
-  void clear_on_null_value() ;
-  ::io::deephaven::proto::backplane::grpc::BadDataBehavior on_null_value() const;
-  void set_on_null_value(::io::deephaven::proto::backplane::grpc::BadDataBehavior value);
-
-  private:
-  ::io::deephaven::proto::backplane::grpc::BadDataBehavior _internal_on_null_value() const;
-  void _internal_set_on_null_value(::io::deephaven::proto::backplane::grpc::BadDataBehavior value);
-
-  public:
-  // .io.deephaven.proto.backplane.grpc.BadDataBehavior on_nan_value = 2;
-  void clear_on_nan_value() ;
-  ::io::deephaven::proto::backplane::grpc::BadDataBehavior on_nan_value() const;
-  void set_on_nan_value(::io::deephaven::proto::backplane::grpc::BadDataBehavior value);
-
-  private:
-  ::io::deephaven::proto::backplane::grpc::BadDataBehavior _internal_on_nan_value() const;
-  void _internal_set_on_nan_value(::io::deephaven::proto::backplane::grpc::BadDataBehavior value);
-
-  public:
-  // .io.deephaven.proto.backplane.grpc.BadDataBehavior on_null_time = 3;
-  void clear_on_null_time() ;
-  ::io::deephaven::proto::backplane::grpc::BadDataBehavior on_null_time() const;
-  void set_on_null_time(::io::deephaven::proto::backplane::grpc::BadDataBehavior value);
-
-  private:
-  ::io::deephaven::proto::backplane::grpc::BadDataBehavior _internal_on_null_time() const;
-  void _internal_set_on_null_time(::io::deephaven::proto::backplane::grpc::BadDataBehavior value);
-
-  public:
-  // .io.deephaven.proto.backplane.grpc.BadDataBehavior on_negative_delta_time = 4;
-  void clear_on_negative_delta_time() ;
-  ::io::deephaven::proto::backplane::grpc::BadDataBehavior on_negative_delta_time() const;
-  void set_on_negative_delta_time(::io::deephaven::proto::backplane::grpc::BadDataBehavior value);
-
-  private:
-  ::io::deephaven::proto::backplane::grpc::BadDataBehavior _internal_on_negative_delta_time() const;
-  void _internal_set_on_negative_delta_time(::io::deephaven::proto::backplane::grpc::BadDataBehavior value);
-
-  public:
-  // .io.deephaven.proto.backplane.grpc.BadDataBehavior on_zero_delta_time = 5;
-  void clear_on_zero_delta_time() ;
-  ::io::deephaven::proto::backplane::grpc::BadDataBehavior on_zero_delta_time() const;
-  void set_on_zero_delta_time(::io::deephaven::proto::backplane::grpc::BadDataBehavior value);
-
-  private:
-  ::io::deephaven::proto::backplane::grpc::BadDataBehavior _internal_on_zero_delta_time() const;
-  void _internal_set_on_zero_delta_time(::io::deephaven::proto::backplane::grpc::BadDataBehavior value);
-
-  public:
-  // @@protoc_insertion_point(class_scope:io.deephaven.proto.backplane.grpc.UpdateByEmOptions)
- private:
-  class _Internal;
-
-  friend class ::google::protobuf::internal::TcParser;
-  static const ::google::protobuf::internal::TcParseTable<
-      3, 6, 1,
-      0, 2>
-      _table_;
-  friend class ::google::protobuf::MessageLite;
-  friend class ::google::protobuf::Arena;
-  template <typename T>
-  friend class ::google::protobuf::Arena::InternalHelper;
-  using InternalArenaConstructable_ = void;
-  using DestructorSkippable_ = void;
-  struct Impl_ {
-
-        inline explicit constexpr Impl_(
-            ::google::protobuf::internal::ConstantInitialized) noexcept;
-        inline explicit Impl_(::google::protobuf::internal::InternalVisibility visibility,
-                              ::google::protobuf::Arena* arena);
-        inline explicit Impl_(::google::protobuf::internal::InternalVisibility visibility,
-                              ::google::protobuf::Arena* arena, const Impl_& from);
-    ::google::protobuf::internal::HasBits<1> _has_bits_;
-    mutable ::google::protobuf::internal::CachedSize _cached_size_;
-    ::io::deephaven::proto::backplane::grpc::MathContext* big_value_context_;
-    int on_null_value_;
-    int on_nan_value_;
-    int on_null_time_;
-    int on_negative_delta_time_;
-    int on_zero_delta_time_;
-    PROTOBUF_TSAN_DECLARE_MEMBER
-  };
-  union { Impl_ _impl_; };
-  friend struct ::TableStruct_deephaven_2fproto_2ftable_2eproto;
-};// -------------------------------------------------------------------
-
-class TimeTableRequest final :
-    public ::google::protobuf::Message /* @@protoc_insertion_point(class_definition:io.deephaven.proto.backplane.grpc.TimeTableRequest) */ {
- public:
-  inline TimeTableRequest() : TimeTableRequest(nullptr) {}
-  ~TimeTableRequest() override;
-  template<typename = void>
-  explicit PROTOBUF_CONSTEXPR TimeTableRequest(::google::protobuf::internal::ConstantInitialized);
-
-  inline TimeTableRequest(const TimeTableRequest& from)
-      : TimeTableRequest(nullptr, from) {}
-  TimeTableRequest(TimeTableRequest&& from) noexcept
-    : TimeTableRequest() {
-    *this = ::std::move(from);
-  }
-
-  inline TimeTableRequest& operator=(const TimeTableRequest& from) {
-    CopyFrom(from);
-    return *this;
-  }
-  inline TimeTableRequest& operator=(TimeTableRequest&& from) noexcept {
-    if (this == &from) return *this;
-    if (GetArena() == from.GetArena()
-  #ifdef PROTOBUF_FORCE_COPY_IN_MOVE
-        && GetArena() != nullptr
-  #endif  // !PROTOBUF_FORCE_COPY_IN_MOVE
-    ) {
-      InternalSwap(&from);
-    } else {
-      CopyFrom(from);
-    }
-    return *this;
-  }
-
-  inline const ::google::protobuf::UnknownFieldSet& unknown_fields() const
-      ABSL_ATTRIBUTE_LIFETIME_BOUND {
-    return _internal_metadata_.unknown_fields<::google::protobuf::UnknownFieldSet>(::google::protobuf::UnknownFieldSet::default_instance);
-  }
-  inline ::google::protobuf::UnknownFieldSet* mutable_unknown_fields()
-      ABSL_ATTRIBUTE_LIFETIME_BOUND {
-    return _internal_metadata_.mutable_unknown_fields<::google::protobuf::UnknownFieldSet>();
-  }
-
-  static const ::google::protobuf::Descriptor* descriptor() {
-    return GetDescriptor();
-  }
-  static const ::google::protobuf::Descriptor* GetDescriptor() {
-    return default_instance().GetMetadata().descriptor;
-  }
-  static const ::google::protobuf::Reflection* GetReflection() {
-    return default_instance().GetMetadata().reflection;
-  }
-  static const TimeTableRequest& default_instance() {
-    return *internal_default_instance();
-  }
-  enum StartTimeCase {
-    kStartTimeNanos = 2,
-    kStartTimeString = 5,
-    START_TIME_NOT_SET = 0,
-  };
-
-  enum PeriodCase {
-    kPeriodNanos = 3,
-    kPeriodString = 6,
-    PERIOD_NOT_SET = 0,
-  };
-
-  static inline const TimeTableRequest* internal_default_instance() {
-    return reinterpret_cast<const TimeTableRequest*>(
-               &_TimeTableRequest_default_instance_);
-  }
-  static constexpr int kIndexInFileMessages =
-    7;
-
-  friend void swap(TimeTableRequest& a, TimeTableRequest& b) {
-    a.Swap(&b);
-  }
-  inline void Swap(TimeTableRequest* other) {
-    if (other == this) return;
-  #ifdef PROTOBUF_FORCE_COPY_IN_SWAP
-    if (GetArena() != nullptr &&
-        GetArena() == other->GetArena()) {
-   #else  // PROTOBUF_FORCE_COPY_IN_SWAP
-    if (GetArena() == other->GetArena()) {
-  #endif  // !PROTOBUF_FORCE_COPY_IN_SWAP
-      InternalSwap(other);
-    } else {
-      ::google::protobuf::internal::GenericSwap(this, other);
-    }
-  }
-  void UnsafeArenaSwap(TimeTableRequest* other) {
-    if (other == this) return;
-    ABSL_DCHECK(GetArena() == other->GetArena());
-    InternalSwap(other);
-  }
-
-  // implements Message ----------------------------------------------
-
-  TimeTableRequest* New(::google::protobuf::Arena* arena = nullptr) const final {
-    return CreateMaybeMessage<TimeTableRequest>(arena);
-  }
-  using ::google::protobuf::Message::CopyFrom;
-  void CopyFrom(const TimeTableRequest& from);
-  using ::google::protobuf::Message::MergeFrom;
-  void MergeFrom( const TimeTableRequest& from) {
-    TimeTableRequest::MergeImpl(*this, from);
-  }
-  private:
-  static void MergeImpl(::google::protobuf::Message& to_msg, const ::google::protobuf::Message& from_msg);
-  public:
-  PROTOBUF_ATTRIBUTE_REINITIALIZES void Clear() final;
-  bool IsInitialized() const final;
-
-  ::size_t ByteSizeLong() const final;
-  const char* _InternalParse(const char* ptr, ::google::protobuf::internal::ParseContext* ctx) final;
-  ::uint8_t* _InternalSerialize(
-      ::uint8_t* target, ::google::protobuf::io::EpsCopyOutputStream* stream) const final;
-  int GetCachedSize() const { return _impl_._cached_size_.Get(); }
-
-  private:
-  ::google::protobuf::internal::CachedSize* AccessCachedSize() const final;
-  void SharedCtor(::google::protobuf::Arena* arena);
-  void SharedDtor();
-  void InternalSwap(TimeTableRequest* other);
-
-  private:
-  friend class ::google::protobuf::internal::AnyMetadata;
-  static ::absl::string_view FullMessageName() {
-    return "io.deephaven.proto.backplane.grpc.TimeTableRequest";
-  }
-  protected:
-  explicit TimeTableRequest(::google::protobuf::Arena* arena);
-  TimeTableRequest(::google::protobuf::Arena* arena, const TimeTableRequest& from);
-  public:
-
-  static const ClassData _class_data_;
-  const ::google::protobuf::Message::ClassData*GetClassData() const final;
-
-  ::google::protobuf::Metadata GetMetadata() const final;
-
-  // nested types ----------------------------------------------------
-
-  // accessors -------------------------------------------------------
-
-  enum : int {
-    kResultIdFieldNumber = 1,
-    kBlinkTableFieldNumber = 4,
-    kStartTimeNanosFieldNumber = 2,
-    kStartTimeStringFieldNumber = 5,
-    kPeriodNanosFieldNumber = 3,
-    kPeriodStringFieldNumber = 6,
-  };
-  // .io.deephaven.proto.backplane.grpc.Ticket result_id = 1;
-  bool has_result_id() const;
-  void clear_result_id() ;
-  const ::io::deephaven::proto::backplane::grpc::Ticket& result_id() const;
-  PROTOBUF_NODISCARD ::io::deephaven::proto::backplane::grpc::Ticket* release_result_id();
-  ::io::deephaven::proto::backplane::grpc::Ticket* mutable_result_id();
-  void set_allocated_result_id(::io::deephaven::proto::backplane::grpc::Ticket* value);
-  void unsafe_arena_set_allocated_result_id(::io::deephaven::proto::backplane::grpc::Ticket* value);
-  ::io::deephaven::proto::backplane::grpc::Ticket* unsafe_arena_release_result_id();
-
-  private:
-  const ::io::deephaven::proto::backplane::grpc::Ticket& _internal_result_id() const;
-  ::io::deephaven::proto::backplane::grpc::Ticket* _internal_mutable_result_id();
-
-  public:
-  // bool blink_table = 4;
-  void clear_blink_table() ;
-  bool blink_table() const;
-  void set_blink_table(bool value);
-
-  private:
-  bool _internal_blink_table() const;
-  void _internal_set_blink_table(bool value);
-
-  public:
-  // sint64 start_time_nanos = 2 [jstype = JS_STRING];
-  bool has_start_time_nanos() const;
-  void clear_start_time_nanos() ;
-  ::int64_t start_time_nanos() const;
-  void set_start_time_nanos(::int64_t value);
-
-  private:
-  ::int64_t _internal_start_time_nanos() const;
-  void _internal_set_start_time_nanos(::int64_t value);
-
-  public:
-  // string start_time_string = 5;
-  bool has_start_time_string() const;
-  void clear_start_time_string() ;
-  const std::string& start_time_string() const;
-  template <typename Arg_ = const std::string&, typename... Args_>
-  void set_start_time_string(Arg_&& arg, Args_... args);
-  std::string* mutable_start_time_string();
-  PROTOBUF_NODISCARD std::string* release_start_time_string();
-  void set_allocated_start_time_string(std::string* value);
-
-  private:
-  const std::string& _internal_start_time_string() const;
-  inline PROTOBUF_ALWAYS_INLINE void _internal_set_start_time_string(
-      const std::string& value);
-  std::string* _internal_mutable_start_time_string();
-
-  public:
-  // sint64 period_nanos = 3 [jstype = JS_STRING];
-  bool has_period_nanos() const;
-  void clear_period_nanos() ;
-  ::int64_t period_nanos() const;
-  void set_period_nanos(::int64_t value);
-
-  private:
-  ::int64_t _internal_period_nanos() const;
-  void _internal_set_period_nanos(::int64_t value);
-
-  public:
-  // string period_string = 6;
-  bool has_period_string() const;
-  void clear_period_string() ;
-  const std::string& period_string() const;
-  template <typename Arg_ = const std::string&, typename... Args_>
-  void set_period_string(Arg_&& arg, Args_... args);
-  std::string* mutable_period_string();
-  PROTOBUF_NODISCARD std::string* release_period_string();
-  void set_allocated_period_string(std::string* value);
-
-  private:
-  const std::string& _internal_period_string() const;
-  inline PROTOBUF_ALWAYS_INLINE void _internal_set_period_string(
-      const std::string& value);
-  std::string* _internal_mutable_period_string();
-
-  public:
-  void clear_start_time();
-  StartTimeCase start_time_case() const;
-  void clear_period();
-  PeriodCase period_case() const;
-  // @@protoc_insertion_point(class_scope:io.deephaven.proto.backplane.grpc.TimeTableRequest)
- private:
-  class _Internal;
-  void set_has_start_time_nanos();
-  void set_has_start_time_string();
-  void set_has_period_nanos();
-  void set_has_period_string();
-
-  inline bool has_start_time() const;
-  inline void clear_has_start_time();
-
-  inline bool has_period() const;
-  inline void clear_has_period();
-
-  friend class ::google::protobuf::internal::TcParser;
-  static const ::google::protobuf::internal::TcParseTable<
-      1, 6, 1,
-      89, 2>
-      _table_;
-  friend class ::google::protobuf::MessageLite;
-  friend class ::google::protobuf::Arena;
-  template <typename T>
-  friend class ::google::protobuf::Arena::InternalHelper;
-  using InternalArenaConstructable_ = void;
-  using DestructorSkippable_ = void;
-  struct Impl_ {
-
-        inline explicit constexpr Impl_(
-            ::google::protobuf::internal::ConstantInitialized) noexcept;
-        inline explicit Impl_(::google::protobuf::internal::InternalVisibility visibility,
-                              ::google::protobuf::Arena* arena);
-        inline explicit Impl_(::google::protobuf::internal::InternalVisibility visibility,
-                              ::google::protobuf::Arena* arena, const Impl_& from);
-    ::google::protobuf::internal::HasBits<1> _has_bits_;
-    mutable ::google::protobuf::internal::CachedSize _cached_size_;
-    ::io::deephaven::proto::backplane::grpc::Ticket* result_id_;
-    bool blink_table_;
-    union StartTimeUnion {
-      constexpr StartTimeUnion() : _constinit_{} {}
-        ::google::protobuf::internal::ConstantInitialized _constinit_;
-      ::int64_t start_time_nanos_;
-      ::google::protobuf::internal::ArenaStringPtr start_time_string_;
-    } start_time_;
-    union PeriodUnion {
-      constexpr PeriodUnion() : _constinit_{} {}
-        ::google::protobuf::internal::ConstantInitialized _constinit_;
-      ::int64_t period_nanos_;
-      ::google::protobuf::internal::ArenaStringPtr period_string_;
-    } period_;
-    ::uint32_t _oneof_case_[2];
-
-    PROTOBUF_TSAN_DECLARE_MEMBER
-  };
-  union { Impl_ _impl_; };
-  friend struct ::TableStruct_deephaven_2fproto_2ftable_2eproto;
-};// -------------------------------------------------------------------
-
-class TableReference final :
-    public ::google::protobuf::Message /* @@protoc_insertion_point(class_definition:io.deephaven.proto.backplane.grpc.TableReference) */ {
- public:
-  inline TableReference() : TableReference(nullptr) {}
-  ~TableReference() override;
-  template<typename = void>
-  explicit PROTOBUF_CONSTEXPR TableReference(::google::protobuf::internal::ConstantInitialized);
-
-  inline TableReference(const TableReference& from)
-      : TableReference(nullptr, from) {}
-  TableReference(TableReference&& from) noexcept
-    : TableReference() {
-    *this = ::std::move(from);
-  }
-
-  inline TableReference& operator=(const TableReference& from) {
-    CopyFrom(from);
-    return *this;
-  }
-  inline TableReference& operator=(TableReference&& from) noexcept {
-    if (this == &from) return *this;
-    if (GetArena() == from.GetArena()
-  #ifdef PROTOBUF_FORCE_COPY_IN_MOVE
-        && GetArena() != nullptr
-  #endif  // !PROTOBUF_FORCE_COPY_IN_MOVE
-    ) {
-      InternalSwap(&from);
-    } else {
-      CopyFrom(from);
-    }
-    return *this;
-  }
-
-  inline const ::google::protobuf::UnknownFieldSet& unknown_fields() const
-      ABSL_ATTRIBUTE_LIFETIME_BOUND {
-    return _internal_metadata_.unknown_fields<::google::protobuf::UnknownFieldSet>(::google::protobuf::UnknownFieldSet::default_instance);
-  }
-  inline ::google::protobuf::UnknownFieldSet* mutable_unknown_fields()
-      ABSL_ATTRIBUTE_LIFETIME_BOUND {
-    return _internal_metadata_.mutable_unknown_fields<::google::protobuf::UnknownFieldSet>();
-  }
-
-  static const ::google::protobuf::Descriptor* descriptor() {
-    return GetDescriptor();
-  }
-  static const ::google::protobuf::Descriptor* GetDescriptor() {
-    return default_instance().GetMetadata().descriptor;
-  }
-  static const ::google::protobuf::Reflection* GetReflection() {
-    return default_instance().GetMetadata().reflection;
-  }
-  static const TableReference& default_instance() {
-    return *internal_default_instance();
-  }
-  enum RefCase {
-    kTicket = 1,
-    kBatchOffset = 2,
-    REF_NOT_SET = 0,
-  };
-
-  static inline const TableReference* internal_default_instance() {
-    return reinterpret_cast<const TableReference*>(
-               &_TableReference_default_instance_);
-  }
-  static constexpr int kIndexInFileMessages =
-    0;
-
-  friend void swap(TableReference& a, TableReference& b) {
-    a.Swap(&b);
-  }
-  inline void Swap(TableReference* other) {
-    if (other == this) return;
-  #ifdef PROTOBUF_FORCE_COPY_IN_SWAP
-    if (GetArena() != nullptr &&
-        GetArena() == other->GetArena()) {
-   #else  // PROTOBUF_FORCE_COPY_IN_SWAP
-    if (GetArena() == other->GetArena()) {
-  #endif  // !PROTOBUF_FORCE_COPY_IN_SWAP
-      InternalSwap(other);
-    } else {
-      ::google::protobuf::internal::GenericSwap(this, other);
-    }
-  }
-  void UnsafeArenaSwap(TableReference* other) {
-    if (other == this) return;
-    ABSL_DCHECK(GetArena() == other->GetArena());
-    InternalSwap(other);
-  }
-
-  // implements Message ----------------------------------------------
-
-  TableReference* New(::google::protobuf::Arena* arena = nullptr) const final {
-    return CreateMaybeMessage<TableReference>(arena);
-  }
-  using ::google::protobuf::Message::CopyFrom;
-  void CopyFrom(const TableReference& from);
-  using ::google::protobuf::Message::MergeFrom;
-  void MergeFrom( const TableReference& from) {
-    TableReference::MergeImpl(*this, from);
-  }
-  private:
-  static void MergeImpl(::google::protobuf::Message& to_msg, const ::google::protobuf::Message& from_msg);
-  public:
-  PROTOBUF_ATTRIBUTE_REINITIALIZES void Clear() final;
-  bool IsInitialized() const final;
-
-  ::size_t ByteSizeLong() const final;
-  const char* _InternalParse(const char* ptr, ::google::protobuf::internal::ParseContext* ctx) final;
-  ::uint8_t* _InternalSerialize(
-      ::uint8_t* target, ::google::protobuf::io::EpsCopyOutputStream* stream) const final;
-  int GetCachedSize() const { return _impl_._cached_size_.Get(); }
-
-  private:
-  ::google::protobuf::internal::CachedSize* AccessCachedSize() const final;
-  void SharedCtor(::google::protobuf::Arena* arena);
-  void SharedDtor();
-  void InternalSwap(TableReference* other);
-
-  private:
-  friend class ::google::protobuf::internal::AnyMetadata;
-  static ::absl::string_view FullMessageName() {
-    return "io.deephaven.proto.backplane.grpc.TableReference";
-  }
-  protected:
-  explicit TableReference(::google::protobuf::Arena* arena);
-  TableReference(::google::protobuf::Arena* arena, const TableReference& from);
-  public:
-
-  static const ClassData _class_data_;
-  const ::google::protobuf::Message::ClassData*GetClassData() const final;
-
-  ::google::protobuf::Metadata GetMetadata() const final;
-
-  // nested types ----------------------------------------------------
-
-  // accessors -------------------------------------------------------
-
-  enum : int {
-    kTicketFieldNumber = 1,
-    kBatchOffsetFieldNumber = 2,
-  };
-  // .io.deephaven.proto.backplane.grpc.Ticket ticket = 1;
-  bool has_ticket() const;
-  private:
-  bool _internal_has_ticket() const;
-
-  public:
-  void clear_ticket() ;
-  const ::io::deephaven::proto::backplane::grpc::Ticket& ticket() const;
-  PROTOBUF_NODISCARD ::io::deephaven::proto::backplane::grpc::Ticket* release_ticket();
-  ::io::deephaven::proto::backplane::grpc::Ticket* mutable_ticket();
-  void set_allocated_ticket(::io::deephaven::proto::backplane::grpc::Ticket* value);
-  void unsafe_arena_set_allocated_ticket(::io::deephaven::proto::backplane::grpc::Ticket* value);
-  ::io::deephaven::proto::backplane::grpc::Ticket* unsafe_arena_release_ticket();
-
-  private:
-  const ::io::deephaven::proto::backplane::grpc::Ticket& _internal_ticket() const;
-  ::io::deephaven::proto::backplane::grpc::Ticket* _internal_mutable_ticket();
-
-  public:
-  // sint32 batch_offset = 2;
-  bool has_batch_offset() const;
-  void clear_batch_offset() ;
-  ::int32_t batch_offset() const;
-  void set_batch_offset(::int32_t value);
-
-  private:
-  ::int32_t _internal_batch_offset() const;
-  void _internal_set_batch_offset(::int32_t value);
-
-  public:
-  void clear_ref();
-  RefCase ref_case() const;
-  // @@protoc_insertion_point(class_scope:io.deephaven.proto.backplane.grpc.TableReference)
- private:
-  class _Internal;
-  void set_has_ticket();
-  void set_has_batch_offset();
-
-  inline bool has_ref() const;
-  inline void clear_has_ref();
-
-  friend class ::google::protobuf::internal::TcParser;
-  static const ::google::protobuf::internal::TcParseTable<
-      0, 2, 1,
-      0, 2>
-      _table_;
-  friend class ::google::protobuf::MessageLite;
-  friend class ::google::protobuf::Arena;
-  template <typename T>
-  friend class ::google::protobuf::Arena::InternalHelper;
-  using InternalArenaConstructable_ = void;
-  using DestructorSkippable_ = void;
-  struct Impl_ {
-
-        inline explicit constexpr Impl_(
-            ::google::protobuf::internal::ConstantInitialized) noexcept;
-        inline explicit Impl_(::google::protobuf::internal::InternalVisibility visibility,
-                              ::google::protobuf::Arena* arena);
-        inline explicit Impl_(::google::protobuf::internal::InternalVisibility visibility,
-                              ::google::protobuf::Arena* arena, const Impl_& from);
-    union RefUnion {
-      constexpr RefUnion() : _constinit_{} {}
-        ::google::protobuf::internal::ConstantInitialized _constinit_;
-      ::io::deephaven::proto::backplane::grpc::Ticket* ticket_;
-      ::int32_t batch_offset_;
-    } ref_;
-    mutable ::google::protobuf::internal::CachedSize _cached_size_;
-    ::uint32_t _oneof_case_[1];
-
-    PROTOBUF_TSAN_DECLARE_MEMBER
-  };
-  union { Impl_ _impl_; };
-  friend struct ::TableStruct_deephaven_2fproto_2ftable_2eproto;
-};// -------------------------------------------------------------------
-
-class SeekRowRequest final :
-    public ::google::protobuf::Message /* @@protoc_insertion_point(class_definition:io.deephaven.proto.backplane.grpc.SeekRowRequest) */ {
- public:
-  inline SeekRowRequest() : SeekRowRequest(nullptr) {}
-  ~SeekRowRequest() override;
-  template<typename = void>
-  explicit PROTOBUF_CONSTEXPR SeekRowRequest(::google::protobuf::internal::ConstantInitialized);
-
-  inline SeekRowRequest(const SeekRowRequest& from)
-      : SeekRowRequest(nullptr, from) {}
-  SeekRowRequest(SeekRowRequest&& from) noexcept
-    : SeekRowRequest() {
-    *this = ::std::move(from);
-  }
-
-  inline SeekRowRequest& operator=(const SeekRowRequest& from) {
-    CopyFrom(from);
-    return *this;
-  }
-  inline SeekRowRequest& operator=(SeekRowRequest&& from) noexcept {
-    if (this == &from) return *this;
-    if (GetArena() == from.GetArena()
-  #ifdef PROTOBUF_FORCE_COPY_IN_MOVE
-        && GetArena() != nullptr
-  #endif  // !PROTOBUF_FORCE_COPY_IN_MOVE
-    ) {
-      InternalSwap(&from);
-    } else {
-      CopyFrom(from);
-    }
-    return *this;
-  }
-
-  inline const ::google::protobuf::UnknownFieldSet& unknown_fields() const
-      ABSL_ATTRIBUTE_LIFETIME_BOUND {
-    return _internal_metadata_.unknown_fields<::google::protobuf::UnknownFieldSet>(::google::protobuf::UnknownFieldSet::default_instance);
-  }
-  inline ::google::protobuf::UnknownFieldSet* mutable_unknown_fields()
-      ABSL_ATTRIBUTE_LIFETIME_BOUND {
-    return _internal_metadata_.mutable_unknown_fields<::google::protobuf::UnknownFieldSet>();
-  }
-
-  static const ::google::protobuf::Descriptor* descriptor() {
-    return GetDescriptor();
-  }
-  static const ::google::protobuf::Descriptor* GetDescriptor() {
-    return default_instance().GetMetadata().descriptor;
-  }
-  static const ::google::protobuf::Reflection* GetReflection() {
-    return default_instance().GetMetadata().reflection;
-  }
-  static const SeekRowRequest& default_instance() {
-    return *internal_default_instance();
-  }
-  static inline const SeekRowRequest* internal_default_instance() {
-    return reinterpret_cast<const SeekRowRequest*>(
-               &_SeekRowRequest_default_instance_);
-  }
-  static constexpr int kIndexInFileMessages =
-    95;
-
-  friend void swap(SeekRowRequest& a, SeekRowRequest& b) {
-    a.Swap(&b);
-  }
-  inline void Swap(SeekRowRequest* other) {
-    if (other == this) return;
-  #ifdef PROTOBUF_FORCE_COPY_IN_SWAP
-    if (GetArena() != nullptr &&
-        GetArena() == other->GetArena()) {
-   #else  // PROTOBUF_FORCE_COPY_IN_SWAP
-    if (GetArena() == other->GetArena()) {
-  #endif  // !PROTOBUF_FORCE_COPY_IN_SWAP
-      InternalSwap(other);
-    } else {
-      ::google::protobuf::internal::GenericSwap(this, other);
-    }
-  }
-  void UnsafeArenaSwap(SeekRowRequest* other) {
-    if (other == this) return;
-    ABSL_DCHECK(GetArena() == other->GetArena());
-    InternalSwap(other);
-  }
-
-  // implements Message ----------------------------------------------
-
-  SeekRowRequest* New(::google::protobuf::Arena* arena = nullptr) const final {
-    return CreateMaybeMessage<SeekRowRequest>(arena);
-  }
-  using ::google::protobuf::Message::CopyFrom;
-  void CopyFrom(const SeekRowRequest& from);
-  using ::google::protobuf::Message::MergeFrom;
-  void MergeFrom( const SeekRowRequest& from) {
-    SeekRowRequest::MergeImpl(*this, from);
-  }
-  private:
-  static void MergeImpl(::google::protobuf::Message& to_msg, const ::google::protobuf::Message& from_msg);
-  public:
-  PROTOBUF_ATTRIBUTE_REINITIALIZES void Clear() final;
-  bool IsInitialized() const final;
-
-  ::size_t ByteSizeLong() const final;
-  const char* _InternalParse(const char* ptr, ::google::protobuf::internal::ParseContext* ctx) final;
-  ::uint8_t* _InternalSerialize(
-      ::uint8_t* target, ::google::protobuf::io::EpsCopyOutputStream* stream) const final;
-  int GetCachedSize() const { return _impl_._cached_size_.Get(); }
-
-  private:
-  ::google::protobuf::internal::CachedSize* AccessCachedSize() const final;
-  void SharedCtor(::google::protobuf::Arena* arena);
-  void SharedDtor();
-  void InternalSwap(SeekRowRequest* other);
-
-  private:
-  friend class ::google::protobuf::internal::AnyMetadata;
-  static ::absl::string_view FullMessageName() {
-    return "io.deephaven.proto.backplane.grpc.SeekRowRequest";
-  }
-  protected:
-  explicit SeekRowRequest(::google::protobuf::Arena* arena);
-  SeekRowRequest(::google::protobuf::Arena* arena, const SeekRowRequest& from);
-  public:
-
-  static const ClassData _class_data_;
-  const ::google::protobuf::Message::ClassData*GetClassData() const final;
-
-  ::google::protobuf::Metadata GetMetadata() const final;
-
-  // nested types ----------------------------------------------------
-
-  // accessors -------------------------------------------------------
-
-  enum : int {
-    kColumnNameFieldNumber = 3,
-    kSourceIdFieldNumber = 1,
-    kSeekValueFieldNumber = 4,
-    kStartingRowFieldNumber = 2,
-    kInsensitiveFieldNumber = 5,
-    kContainsFieldNumber = 6,
-    kIsBackwardFieldNumber = 7,
-  };
-  // string column_name = 3;
-  void clear_column_name() ;
-  const std::string& column_name() const;
-  template <typename Arg_ = const std::string&, typename... Args_>
-  void set_column_name(Arg_&& arg, Args_... args);
-  std::string* mutable_column_name();
-  PROTOBUF_NODISCARD std::string* release_column_name();
-  void set_allocated_column_name(std::string* value);
-
-  private:
-  const std::string& _internal_column_name() const;
-  inline PROTOBUF_ALWAYS_INLINE void _internal_set_column_name(
-      const std::string& value);
-  std::string* _internal_mutable_column_name();
-
-  public:
-  // .io.deephaven.proto.backplane.grpc.Ticket source_id = 1;
-  bool has_source_id() const;
-  void clear_source_id() ;
-  const ::io::deephaven::proto::backplane::grpc::Ticket& source_id() const;
-  PROTOBUF_NODISCARD ::io::deephaven::proto::backplane::grpc::Ticket* release_source_id();
-  ::io::deephaven::proto::backplane::grpc::Ticket* mutable_source_id();
-  void set_allocated_source_id(::io::deephaven::proto::backplane::grpc::Ticket* value);
-  void unsafe_arena_set_allocated_source_id(::io::deephaven::proto::backplane::grpc::Ticket* value);
-  ::io::deephaven::proto::backplane::grpc::Ticket* unsafe_arena_release_source_id();
-
-  private:
-  const ::io::deephaven::proto::backplane::grpc::Ticket& _internal_source_id() const;
-  ::io::deephaven::proto::backplane::grpc::Ticket* _internal_mutable_source_id();
-
-  public:
-  // .io.deephaven.proto.backplane.grpc.Literal seek_value = 4;
-  bool has_seek_value() const;
-  void clear_seek_value() ;
-  const ::io::deephaven::proto::backplane::grpc::Literal& seek_value() const;
-  PROTOBUF_NODISCARD ::io::deephaven::proto::backplane::grpc::Literal* release_seek_value();
-  ::io::deephaven::proto::backplane::grpc::Literal* mutable_seek_value();
-  void set_allocated_seek_value(::io::deephaven::proto::backplane::grpc::Literal* value);
-  void unsafe_arena_set_allocated_seek_value(::io::deephaven::proto::backplane::grpc::Literal* value);
-  ::io::deephaven::proto::backplane::grpc::Literal* unsafe_arena_release_seek_value();
-
-  private:
-  const ::io::deephaven::proto::backplane::grpc::Literal& _internal_seek_value() const;
-  ::io::deephaven::proto::backplane::grpc::Literal* _internal_mutable_seek_value();
-
-  public:
-  // sint64 starting_row = 2 [jstype = JS_STRING];
-  void clear_starting_row() ;
-  ::int64_t starting_row() const;
-  void set_starting_row(::int64_t value);
-
-  private:
-  ::int64_t _internal_starting_row() const;
-  void _internal_set_starting_row(::int64_t value);
-
-  public:
-  // bool insensitive = 5;
-  void clear_insensitive() ;
-  bool insensitive() const;
-  void set_insensitive(bool value);
-
-  private:
-  bool _internal_insensitive() const;
-  void _internal_set_insensitive(bool value);
-
-  public:
-  // bool contains = 6;
-  void clear_contains() ;
-  bool contains() const;
-  void set_contains(bool value);
-
-  private:
-  bool _internal_contains() const;
-  void _internal_set_contains(bool value);
-
-  public:
-  // bool is_backward = 7;
-  void clear_is_backward() ;
-  bool is_backward() const;
-  void set_is_backward(bool value);
-
-  private:
-  bool _internal_is_backward() const;
-  void _internal_set_is_backward(bool value);
-
-  public:
-  // @@protoc_insertion_point(class_scope:io.deephaven.proto.backplane.grpc.SeekRowRequest)
- private:
-  class _Internal;
-
-  friend class ::google::protobuf::internal::TcParser;
-  static const ::google::protobuf::internal::TcParseTable<
-      3, 7, 2,
-      68, 2>
-      _table_;
-  friend class ::google::protobuf::MessageLite;
-  friend class ::google::protobuf::Arena;
-  template <typename T>
-  friend class ::google::protobuf::Arena::InternalHelper;
-  using InternalArenaConstructable_ = void;
-  using DestructorSkippable_ = void;
-  struct Impl_ {
-
-        inline explicit constexpr Impl_(
-            ::google::protobuf::internal::ConstantInitialized) noexcept;
-        inline explicit Impl_(::google::protobuf::internal::InternalVisibility visibility,
-                              ::google::protobuf::Arena* arena);
-        inline explicit Impl_(::google::protobuf::internal::InternalVisibility visibility,
-                              ::google::protobuf::Arena* arena, const Impl_& from);
-    ::google::protobuf::internal::HasBits<1> _has_bits_;
-    mutable ::google::protobuf::internal::CachedSize _cached_size_;
-    ::google::protobuf::internal::ArenaStringPtr column_name_;
-    ::io::deephaven::proto::backplane::grpc::Ticket* source_id_;
-    ::io::deephaven::proto::backplane::grpc::Literal* seek_value_;
-    ::int64_t starting_row_;
-    bool insensitive_;
-    bool contains_;
-    bool is_backward_;
-    PROTOBUF_TSAN_DECLARE_MEMBER
-  };
-  union { Impl_ _impl_; };
-  friend struct ::TableStruct_deephaven_2fproto_2ftable_2eproto;
-};// -------------------------------------------------------------------
-
-class SearchCondition final :
-    public ::google::protobuf::Message /* @@protoc_insertion_point(class_definition:io.deephaven.proto.backplane.grpc.SearchCondition) */ {
- public:
-  inline SearchCondition() : SearchCondition(nullptr) {}
-  ~SearchCondition() override;
-  template<typename = void>
-  explicit PROTOBUF_CONSTEXPR SearchCondition(::google::protobuf::internal::ConstantInitialized);
-
-  inline SearchCondition(const SearchCondition& from)
-      : SearchCondition(nullptr, from) {}
-  SearchCondition(SearchCondition&& from) noexcept
-    : SearchCondition() {
-    *this = ::std::move(from);
-  }
-
-  inline SearchCondition& operator=(const SearchCondition& from) {
-    CopyFrom(from);
-    return *this;
-  }
-  inline SearchCondition& operator=(SearchCondition&& from) noexcept {
-    if (this == &from) return *this;
-    if (GetArena() == from.GetArena()
-  #ifdef PROTOBUF_FORCE_COPY_IN_MOVE
-        && GetArena() != nullptr
-  #endif  // !PROTOBUF_FORCE_COPY_IN_MOVE
-    ) {
-      InternalSwap(&from);
-    } else {
-      CopyFrom(from);
-    }
-    return *this;
-  }
-
-  inline const ::google::protobuf::UnknownFieldSet& unknown_fields() const
-      ABSL_ATTRIBUTE_LIFETIME_BOUND {
-    return _internal_metadata_.unknown_fields<::google::protobuf::UnknownFieldSet>(::google::protobuf::UnknownFieldSet::default_instance);
-  }
-  inline ::google::protobuf::UnknownFieldSet* mutable_unknown_fields()
-      ABSL_ATTRIBUTE_LIFETIME_BOUND {
-    return _internal_metadata_.mutable_unknown_fields<::google::protobuf::UnknownFieldSet>();
-  }
-
-  static const ::google::protobuf::Descriptor* descriptor() {
-    return GetDescriptor();
-  }
-  static const ::google::protobuf::Descriptor* GetDescriptor() {
-    return default_instance().GetMetadata().descriptor;
-  }
-  static const ::google::protobuf::Reflection* GetReflection() {
-    return default_instance().GetMetadata().reflection;
-  }
-  static const SearchCondition& default_instance() {
-    return *internal_default_instance();
-  }
-  static inline const SearchCondition* internal_default_instance() {
-    return reinterpret_cast<const SearchCondition*>(
-               &_SearchCondition_default_instance_);
-  }
-  static constexpr int kIndexInFileMessages =
-    110;
-
-  friend void swap(SearchCondition& a, SearchCondition& b) {
-    a.Swap(&b);
-  }
-  inline void Swap(SearchCondition* other) {
-    if (other == this) return;
-  #ifdef PROTOBUF_FORCE_COPY_IN_SWAP
-    if (GetArena() != nullptr &&
-        GetArena() == other->GetArena()) {
-   #else  // PROTOBUF_FORCE_COPY_IN_SWAP
-    if (GetArena() == other->GetArena()) {
-  #endif  // !PROTOBUF_FORCE_COPY_IN_SWAP
-      InternalSwap(other);
-    } else {
-      ::google::protobuf::internal::GenericSwap(this, other);
-    }
-  }
-  void UnsafeArenaSwap(SearchCondition* other) {
-    if (other == this) return;
-    ABSL_DCHECK(GetArena() == other->GetArena());
-    InternalSwap(other);
-  }
-
-  // implements Message ----------------------------------------------
-
-  SearchCondition* New(::google::protobuf::Arena* arena = nullptr) const final {
-    return CreateMaybeMessage<SearchCondition>(arena);
-  }
-  using ::google::protobuf::Message::CopyFrom;
-  void CopyFrom(const SearchCondition& from);
-  using ::google::protobuf::Message::MergeFrom;
-  void MergeFrom( const SearchCondition& from) {
-    SearchCondition::MergeImpl(*this, from);
-  }
-  private:
-  static void MergeImpl(::google::protobuf::Message& to_msg, const ::google::protobuf::Message& from_msg);
-  public:
-  PROTOBUF_ATTRIBUTE_REINITIALIZES void Clear() final;
-  bool IsInitialized() const final;
-
-  ::size_t ByteSizeLong() const final;
-  const char* _InternalParse(const char* ptr, ::google::protobuf::internal::ParseContext* ctx) final;
-  ::uint8_t* _InternalSerialize(
-      ::uint8_t* target, ::google::protobuf::io::EpsCopyOutputStream* stream) const final;
-  int GetCachedSize() const { return _impl_._cached_size_.Get(); }
-
-  private:
-  ::google::protobuf::internal::CachedSize* AccessCachedSize() const final;
-  void SharedCtor(::google::protobuf::Arena* arena);
-  void SharedDtor();
-  void InternalSwap(SearchCondition* other);
-
-  private:
-  friend class ::google::protobuf::internal::AnyMetadata;
-  static ::absl::string_view FullMessageName() {
-    return "io.deephaven.proto.backplane.grpc.SearchCondition";
-  }
-  protected:
-  explicit SearchCondition(::google::protobuf::Arena* arena);
-  SearchCondition(::google::protobuf::Arena* arena, const SearchCondition& from);
-  public:
-
-  static const ClassData _class_data_;
-  const ::google::protobuf::Message::ClassData*GetClassData() const final;
-
-  ::google::protobuf::Metadata GetMetadata() const final;
-
-  // nested types ----------------------------------------------------
-
-  // accessors -------------------------------------------------------
-
-  enum : int {
-    kOptionalReferencesFieldNumber = 2,
-    kSearchStringFieldNumber = 1,
-  };
-  // repeated .io.deephaven.proto.backplane.grpc.Reference optional_references = 2;
-  int optional_references_size() const;
-  private:
-  int _internal_optional_references_size() const;
-
-  public:
-  void clear_optional_references() ;
-  ::io::deephaven::proto::backplane::grpc::Reference* mutable_optional_references(int index);
-  ::google::protobuf::RepeatedPtrField< ::io::deephaven::proto::backplane::grpc::Reference >*
-      mutable_optional_references();
-  private:
-  const ::google::protobuf::RepeatedPtrField<::io::deephaven::proto::backplane::grpc::Reference>& _internal_optional_references() const;
-  ::google::protobuf::RepeatedPtrField<::io::deephaven::proto::backplane::grpc::Reference>* _internal_mutable_optional_references();
-  public:
-  const ::io::deephaven::proto::backplane::grpc::Reference& optional_references(int index) const;
-  ::io::deephaven::proto::backplane::grpc::Reference* add_optional_references();
-  const ::google::protobuf::RepeatedPtrField< ::io::deephaven::proto::backplane::grpc::Reference >&
-      optional_references() const;
-  // string search_string = 1;
-  void clear_search_string() ;
-  const std::string& search_string() const;
-  template <typename Arg_ = const std::string&, typename... Args_>
-  void set_search_string(Arg_&& arg, Args_... args);
-  std::string* mutable_search_string();
-  PROTOBUF_NODISCARD std::string* release_search_string();
-  void set_allocated_search_string(std::string* value);
-
-  private:
-  const std::string& _internal_search_string() const;
-  inline PROTOBUF_ALWAYS_INLINE void _internal_set_search_string(
-      const std::string& value);
-  std::string* _internal_mutable_search_string();
-
-  public:
-  // @@protoc_insertion_point(class_scope:io.deephaven.proto.backplane.grpc.SearchCondition)
- private:
-  class _Internal;
-
-  friend class ::google::protobuf::internal::TcParser;
-  static const ::google::protobuf::internal::TcParseTable<
-      1, 2, 1,
-      71, 2>
-      _table_;
-  friend class ::google::protobuf::MessageLite;
-  friend class ::google::protobuf::Arena;
-  template <typename T>
-  friend class ::google::protobuf::Arena::InternalHelper;
-  using InternalArenaConstructable_ = void;
-  using DestructorSkippable_ = void;
-  struct Impl_ {
-
-        inline explicit constexpr Impl_(
-            ::google::protobuf::internal::ConstantInitialized) noexcept;
-        inline explicit Impl_(::google::protobuf::internal::InternalVisibility visibility,
-                              ::google::protobuf::Arena* arena);
-        inline explicit Impl_(::google::protobuf::internal::InternalVisibility visibility,
-                              ::google::protobuf::Arena* arena, const Impl_& from);
-    ::google::protobuf::RepeatedPtrField< ::io::deephaven::proto::backplane::grpc::Reference > optional_references_;
-    ::google::protobuf::internal::ArenaStringPtr search_string_;
-    mutable ::google::protobuf::internal::CachedSize _cached_size_;
-    PROTOBUF_TSAN_DECLARE_MEMBER
-  };
-  union { Impl_ _impl_; };
-  friend struct ::TableStruct_deephaven_2fproto_2ftable_2eproto;
-};// -------------------------------------------------------------------
-
-class MatchesCondition final :
-    public ::google::protobuf::Message /* @@protoc_insertion_point(class_definition:io.deephaven.proto.backplane.grpc.MatchesCondition) */ {
- public:
-  inline MatchesCondition() : MatchesCondition(nullptr) {}
-  ~MatchesCondition() override;
-  template<typename = void>
-  explicit PROTOBUF_CONSTEXPR MatchesCondition(::google::protobuf::internal::ConstantInitialized);
-
-  inline MatchesCondition(const MatchesCondition& from)
-      : MatchesCondition(nullptr, from) {}
-  MatchesCondition(MatchesCondition&& from) noexcept
-    : MatchesCondition() {
-    *this = ::std::move(from);
-  }
-
-  inline MatchesCondition& operator=(const MatchesCondition& from) {
-    CopyFrom(from);
-    return *this;
-  }
-  inline MatchesCondition& operator=(MatchesCondition&& from) noexcept {
-    if (this == &from) return *this;
-    if (GetArena() == from.GetArena()
-  #ifdef PROTOBUF_FORCE_COPY_IN_MOVE
-        && GetArena() != nullptr
-  #endif  // !PROTOBUF_FORCE_COPY_IN_MOVE
-    ) {
-      InternalSwap(&from);
-    } else {
-      CopyFrom(from);
-    }
-    return *this;
-  }
-
-  inline const ::google::protobuf::UnknownFieldSet& unknown_fields() const
-      ABSL_ATTRIBUTE_LIFETIME_BOUND {
-    return _internal_metadata_.unknown_fields<::google::protobuf::UnknownFieldSet>(::google::protobuf::UnknownFieldSet::default_instance);
-  }
-  inline ::google::protobuf::UnknownFieldSet* mutable_unknown_fields()
-      ABSL_ATTRIBUTE_LIFETIME_BOUND {
-    return _internal_metadata_.mutable_unknown_fields<::google::protobuf::UnknownFieldSet>();
-  }
-
-  static const ::google::protobuf::Descriptor* descriptor() {
-    return GetDescriptor();
-  }
-  static const ::google::protobuf::Descriptor* GetDescriptor() {
-    return default_instance().GetMetadata().descriptor;
-  }
-  static const ::google::protobuf::Reflection* GetReflection() {
-    return default_instance().GetMetadata().reflection;
-  }
-  static const MatchesCondition& default_instance() {
-    return *internal_default_instance();
-  }
-  static inline const MatchesCondition* internal_default_instance() {
-    return reinterpret_cast<const MatchesCondition*>(
-               &_MatchesCondition_default_instance_);
-  }
-  static constexpr int kIndexInFileMessages =
-    108;
-
-  friend void swap(MatchesCondition& a, MatchesCondition& b) {
-    a.Swap(&b);
-  }
-  inline void Swap(MatchesCondition* other) {
-    if (other == this) return;
-  #ifdef PROTOBUF_FORCE_COPY_IN_SWAP
-    if (GetArena() != nullptr &&
-        GetArena() == other->GetArena()) {
-   #else  // PROTOBUF_FORCE_COPY_IN_SWAP
-    if (GetArena() == other->GetArena()) {
-  #endif  // !PROTOBUF_FORCE_COPY_IN_SWAP
-      InternalSwap(other);
-    } else {
-      ::google::protobuf::internal::GenericSwap(this, other);
-    }
-  }
-  void UnsafeArenaSwap(MatchesCondition* other) {
-    if (other == this) return;
-    ABSL_DCHECK(GetArena() == other->GetArena());
-    InternalSwap(other);
-  }
-
-  // implements Message ----------------------------------------------
-
-  MatchesCondition* New(::google::protobuf::Arena* arena = nullptr) const final {
-    return CreateMaybeMessage<MatchesCondition>(arena);
-  }
-  using ::google::protobuf::Message::CopyFrom;
-  void CopyFrom(const MatchesCondition& from);
-  using ::google::protobuf::Message::MergeFrom;
-  void MergeFrom( const MatchesCondition& from) {
-    MatchesCondition::MergeImpl(*this, from);
-  }
-  private:
-  static void MergeImpl(::google::protobuf::Message& to_msg, const ::google::protobuf::Message& from_msg);
-  public:
-  PROTOBUF_ATTRIBUTE_REINITIALIZES void Clear() final;
-  bool IsInitialized() const final;
-
-  ::size_t ByteSizeLong() const final;
-  const char* _InternalParse(const char* ptr, ::google::protobuf::internal::ParseContext* ctx) final;
-  ::uint8_t* _InternalSerialize(
-      ::uint8_t* target, ::google::protobuf::io::EpsCopyOutputStream* stream) const final;
-  int GetCachedSize() const { return _impl_._cached_size_.Get(); }
-
-  private:
-  ::google::protobuf::internal::CachedSize* AccessCachedSize() const final;
-  void SharedCtor(::google::protobuf::Arena* arena);
-  void SharedDtor();
-  void InternalSwap(MatchesCondition* other);
-
-  private:
-  friend class ::google::protobuf::internal::AnyMetadata;
-  static ::absl::string_view FullMessageName() {
-    return "io.deephaven.proto.backplane.grpc.MatchesCondition";
-  }
-  protected:
-  explicit MatchesCondition(::google::protobuf::Arena* arena);
-  MatchesCondition(::google::protobuf::Arena* arena, const MatchesCondition& from);
-  public:
-
-  static const ClassData _class_data_;
-  const ::google::protobuf::Message::ClassData*GetClassData() const final;
-
-  ::google::protobuf::Metadata GetMetadata() const final;
-
-  // nested types ----------------------------------------------------
-
-  // accessors -------------------------------------------------------
-
-  enum : int {
-    kRegexFieldNumber = 2,
-    kReferenceFieldNumber = 1,
-    kCaseSensitivityFieldNumber = 3,
-    kMatchTypeFieldNumber = 4,
-  };
-  // string regex = 2;
-  void clear_regex() ;
-  const std::string& regex() const;
-  template <typename Arg_ = const std::string&, typename... Args_>
-  void set_regex(Arg_&& arg, Args_... args);
-  std::string* mutable_regex();
-  PROTOBUF_NODISCARD std::string* release_regex();
-  void set_allocated_regex(std::string* value);
-
-  private:
-  const std::string& _internal_regex() const;
-  inline PROTOBUF_ALWAYS_INLINE void _internal_set_regex(
-      const std::string& value);
-  std::string* _internal_mutable_regex();
-
-  public:
-  // .io.deephaven.proto.backplane.grpc.Reference reference = 1;
-  bool has_reference() const;
-  void clear_reference() ;
-  const ::io::deephaven::proto::backplane::grpc::Reference& reference() const;
-  PROTOBUF_NODISCARD ::io::deephaven::proto::backplane::grpc::Reference* release_reference();
-  ::io::deephaven::proto::backplane::grpc::Reference* mutable_reference();
-  void set_allocated_reference(::io::deephaven::proto::backplane::grpc::Reference* value);
-  void unsafe_arena_set_allocated_reference(::io::deephaven::proto::backplane::grpc::Reference* value);
-  ::io::deephaven::proto::backplane::grpc::Reference* unsafe_arena_release_reference();
-
-  private:
-  const ::io::deephaven::proto::backplane::grpc::Reference& _internal_reference() const;
-  ::io::deephaven::proto::backplane::grpc::Reference* _internal_mutable_reference();
-
-  public:
-  // .io.deephaven.proto.backplane.grpc.CaseSensitivity case_sensitivity = 3;
-  void clear_case_sensitivity() ;
-  ::io::deephaven::proto::backplane::grpc::CaseSensitivity case_sensitivity() const;
-  void set_case_sensitivity(::io::deephaven::proto::backplane::grpc::CaseSensitivity value);
-
-  private:
-  ::io::deephaven::proto::backplane::grpc::CaseSensitivity _internal_case_sensitivity() const;
-  void _internal_set_case_sensitivity(::io::deephaven::proto::backplane::grpc::CaseSensitivity value);
-
-  public:
-  // .io.deephaven.proto.backplane.grpc.MatchType match_type = 4;
-  void clear_match_type() ;
-  ::io::deephaven::proto::backplane::grpc::MatchType match_type() const;
-  void set_match_type(::io::deephaven::proto::backplane::grpc::MatchType value);
-
-  private:
-  ::io::deephaven::proto::backplane::grpc::MatchType _internal_match_type() const;
-  void _internal_set_match_type(::io::deephaven::proto::backplane::grpc::MatchType value);
-
-  public:
-  // @@protoc_insertion_point(class_scope:io.deephaven.proto.backplane.grpc.MatchesCondition)
- private:
-  class _Internal;
-
-  friend class ::google::protobuf::internal::TcParser;
-  static const ::google::protobuf::internal::TcParseTable<
-      2, 4, 1,
-      64, 2>
-      _table_;
-  friend class ::google::protobuf::MessageLite;
-  friend class ::google::protobuf::Arena;
-  template <typename T>
-  friend class ::google::protobuf::Arena::InternalHelper;
-  using InternalArenaConstructable_ = void;
-  using DestructorSkippable_ = void;
-  struct Impl_ {
-
-        inline explicit constexpr Impl_(
-            ::google::protobuf::internal::ConstantInitialized) noexcept;
-        inline explicit Impl_(::google::protobuf::internal::InternalVisibility visibility,
-                              ::google::protobuf::Arena* arena);
-        inline explicit Impl_(::google::protobuf::internal::InternalVisibility visibility,
-                              ::google::protobuf::Arena* arena, const Impl_& from);
-    ::google::protobuf::internal::HasBits<1> _has_bits_;
-    mutable ::google::protobuf::internal::CachedSize _cached_size_;
-    ::google::protobuf::internal::ArenaStringPtr regex_;
-    ::io::deephaven::proto::backplane::grpc::Reference* reference_;
-    int case_sensitivity_;
-    int match_type_;
-    PROTOBUF_TSAN_DECLARE_MEMBER
-  };
-  union { Impl_ _impl_; };
-  friend struct ::TableStruct_deephaven_2fproto_2ftable_2eproto;
-};// -------------------------------------------------------------------
-
-class IsNullCondition final :
-    public ::google::protobuf::Message /* @@protoc_insertion_point(class_definition:io.deephaven.proto.backplane.grpc.IsNullCondition) */ {
- public:
-  inline IsNullCondition() : IsNullCondition(nullptr) {}
-  ~IsNullCondition() override;
-  template<typename = void>
-  explicit PROTOBUF_CONSTEXPR IsNullCondition(::google::protobuf::internal::ConstantInitialized);
-
-  inline IsNullCondition(const IsNullCondition& from)
-      : IsNullCondition(nullptr, from) {}
-  IsNullCondition(IsNullCondition&& from) noexcept
-    : IsNullCondition() {
-    *this = ::std::move(from);
-  }
-
-  inline IsNullCondition& operator=(const IsNullCondition& from) {
-    CopyFrom(from);
-    return *this;
-  }
-  inline IsNullCondition& operator=(IsNullCondition&& from) noexcept {
-    if (this == &from) return *this;
-    if (GetArena() == from.GetArena()
-  #ifdef PROTOBUF_FORCE_COPY_IN_MOVE
-        && GetArena() != nullptr
-  #endif  // !PROTOBUF_FORCE_COPY_IN_MOVE
-    ) {
-      InternalSwap(&from);
-    } else {
-      CopyFrom(from);
-    }
-    return *this;
-  }
-
-  inline const ::google::protobuf::UnknownFieldSet& unknown_fields() const
-      ABSL_ATTRIBUTE_LIFETIME_BOUND {
-    return _internal_metadata_.unknown_fields<::google::protobuf::UnknownFieldSet>(::google::protobuf::UnknownFieldSet::default_instance);
-  }
-  inline ::google::protobuf::UnknownFieldSet* mutable_unknown_fields()
-      ABSL_ATTRIBUTE_LIFETIME_BOUND {
-    return _internal_metadata_.mutable_unknown_fields<::google::protobuf::UnknownFieldSet>();
-  }
-
-  static const ::google::protobuf::Descriptor* descriptor() {
-    return GetDescriptor();
-  }
-  static const ::google::protobuf::Descriptor* GetDescriptor() {
-    return default_instance().GetMetadata().descriptor;
-  }
-  static const ::google::protobuf::Reflection* GetReflection() {
-    return default_instance().GetMetadata().reflection;
-  }
-  static const IsNullCondition& default_instance() {
-    return *internal_default_instance();
-  }
-  static inline const IsNullCondition* internal_default_instance() {
-    return reinterpret_cast<const IsNullCondition*>(
-               &_IsNullCondition_default_instance_);
-  }
-  static constexpr int kIndexInFileMessages =
-    107;
-
-  friend void swap(IsNullCondition& a, IsNullCondition& b) {
-    a.Swap(&b);
-  }
-  inline void Swap(IsNullCondition* other) {
-    if (other == this) return;
-  #ifdef PROTOBUF_FORCE_COPY_IN_SWAP
-    if (GetArena() != nullptr &&
-        GetArena() == other->GetArena()) {
-   #else  // PROTOBUF_FORCE_COPY_IN_SWAP
-    if (GetArena() == other->GetArena()) {
-  #endif  // !PROTOBUF_FORCE_COPY_IN_SWAP
-      InternalSwap(other);
-    } else {
-      ::google::protobuf::internal::GenericSwap(this, other);
-    }
-  }
-  void UnsafeArenaSwap(IsNullCondition* other) {
-    if (other == this) return;
-    ABSL_DCHECK(GetArena() == other->GetArena());
-    InternalSwap(other);
-  }
-
-  // implements Message ----------------------------------------------
-
-  IsNullCondition* New(::google::protobuf::Arena* arena = nullptr) const final {
-    return CreateMaybeMessage<IsNullCondition>(arena);
-  }
-  using ::google::protobuf::Message::CopyFrom;
-  void CopyFrom(const IsNullCondition& from);
-  using ::google::protobuf::Message::MergeFrom;
-  void MergeFrom( const IsNullCondition& from) {
-    IsNullCondition::MergeImpl(*this, from);
-  }
-  private:
-  static void MergeImpl(::google::protobuf::Message& to_msg, const ::google::protobuf::Message& from_msg);
-  public:
-  PROTOBUF_ATTRIBUTE_REINITIALIZES void Clear() final;
-  bool IsInitialized() const final;
-
-  ::size_t ByteSizeLong() const final;
-  const char* _InternalParse(const char* ptr, ::google::protobuf::internal::ParseContext* ctx) final;
-  ::uint8_t* _InternalSerialize(
-      ::uint8_t* target, ::google::protobuf::io::EpsCopyOutputStream* stream) const final;
-  int GetCachedSize() const { return _impl_._cached_size_.Get(); }
-
-  private:
-  ::google::protobuf::internal::CachedSize* AccessCachedSize() const final;
-  void SharedCtor(::google::protobuf::Arena* arena);
-  void SharedDtor();
-  void InternalSwap(IsNullCondition* other);
-
-  private:
-  friend class ::google::protobuf::internal::AnyMetadata;
-  static ::absl::string_view FullMessageName() {
-    return "io.deephaven.proto.backplane.grpc.IsNullCondition";
-  }
-  protected:
-  explicit IsNullCondition(::google::protobuf::Arena* arena);
-  IsNullCondition(::google::protobuf::Arena* arena, const IsNullCondition& from);
-  public:
-
-  static const ClassData _class_data_;
-  const ::google::protobuf::Message::ClassData*GetClassData() const final;
-
-  ::google::protobuf::Metadata GetMetadata() const final;
-
-  // nested types ----------------------------------------------------
-
-  // accessors -------------------------------------------------------
-
-  enum : int {
-    kReferenceFieldNumber = 1,
-  };
-  // .io.deephaven.proto.backplane.grpc.Reference reference = 1;
-  bool has_reference() const;
-  void clear_reference() ;
-  const ::io::deephaven::proto::backplane::grpc::Reference& reference() const;
-  PROTOBUF_NODISCARD ::io::deephaven::proto::backplane::grpc::Reference* release_reference();
-  ::io::deephaven::proto::backplane::grpc::Reference* mutable_reference();
-  void set_allocated_reference(::io::deephaven::proto::backplane::grpc::Reference* value);
-  void unsafe_arena_set_allocated_reference(::io::deephaven::proto::backplane::grpc::Reference* value);
-  ::io::deephaven::proto::backplane::grpc::Reference* unsafe_arena_release_reference();
-
-  private:
-  const ::io::deephaven::proto::backplane::grpc::Reference& _internal_reference() const;
-  ::io::deephaven::proto::backplane::grpc::Reference* _internal_mutable_reference();
-
-  public:
-  // @@protoc_insertion_point(class_scope:io.deephaven.proto.backplane.grpc.IsNullCondition)
- private:
-  class _Internal;
-
-  friend class ::google::protobuf::internal::TcParser;
-  static const ::google::protobuf::internal::TcParseTable<
-      0, 1, 1,
-      0, 2>
-      _table_;
-  friend class ::google::protobuf::MessageLite;
-  friend class ::google::protobuf::Arena;
-  template <typename T>
-  friend class ::google::protobuf::Arena::InternalHelper;
-  using InternalArenaConstructable_ = void;
-  using DestructorSkippable_ = void;
-  struct Impl_ {
-
-        inline explicit constexpr Impl_(
-            ::google::protobuf::internal::ConstantInitialized) noexcept;
-        inline explicit Impl_(::google::protobuf::internal::InternalVisibility visibility,
-                              ::google::protobuf::Arena* arena);
-        inline explicit Impl_(::google::protobuf::internal::InternalVisibility visibility,
-                              ::google::protobuf::Arena* arena, const Impl_& from);
-    ::google::protobuf::internal::HasBits<1> _has_bits_;
-    mutable ::google::protobuf::internal::CachedSize _cached_size_;
-    ::io::deephaven::proto::backplane::grpc::Reference* reference_;
-    PROTOBUF_TSAN_DECLARE_MEMBER
-  };
-  union { Impl_ _impl_; };
-  friend struct ::TableStruct_deephaven_2fproto_2ftable_2eproto;
-};// -------------------------------------------------------------------
-
-class ExportedTableUpdateMessage final :
-    public ::google::protobuf::Message /* @@protoc_insertion_point(class_definition:io.deephaven.proto.backplane.grpc.ExportedTableUpdateMessage) */ {
- public:
-  inline ExportedTableUpdateMessage() : ExportedTableUpdateMessage(nullptr) {}
-  ~ExportedTableUpdateMessage() override;
-  template<typename = void>
-  explicit PROTOBUF_CONSTEXPR ExportedTableUpdateMessage(::google::protobuf::internal::ConstantInitialized);
-
-  inline ExportedTableUpdateMessage(const ExportedTableUpdateMessage& from)
-      : ExportedTableUpdateMessage(nullptr, from) {}
-  ExportedTableUpdateMessage(ExportedTableUpdateMessage&& from) noexcept
-    : ExportedTableUpdateMessage() {
-    *this = ::std::move(from);
-  }
-
-  inline ExportedTableUpdateMessage& operator=(const ExportedTableUpdateMessage& from) {
-    CopyFrom(from);
-    return *this;
-  }
-  inline ExportedTableUpdateMessage& operator=(ExportedTableUpdateMessage&& from) noexcept {
-    if (this == &from) return *this;
-    if (GetArena() == from.GetArena()
-  #ifdef PROTOBUF_FORCE_COPY_IN_MOVE
-        && GetArena() != nullptr
-  #endif  // !PROTOBUF_FORCE_COPY_IN_MOVE
-    ) {
-      InternalSwap(&from);
-    } else {
-      CopyFrom(from);
-    }
-    return *this;
-  }
-
-  inline const ::google::protobuf::UnknownFieldSet& unknown_fields() const
-      ABSL_ATTRIBUTE_LIFETIME_BOUND {
-    return _internal_metadata_.unknown_fields<::google::protobuf::UnknownFieldSet>(::google::protobuf::UnknownFieldSet::default_instance);
-  }
-  inline ::google::protobuf::UnknownFieldSet* mutable_unknown_fields()
-      ABSL_ATTRIBUTE_LIFETIME_BOUND {
-    return _internal_metadata_.mutable_unknown_fields<::google::protobuf::UnknownFieldSet>();
-  }
-
-  static const ::google::protobuf::Descriptor* descriptor() {
-    return GetDescriptor();
-  }
-  static const ::google::protobuf::Descriptor* GetDescriptor() {
-    return default_instance().GetMetadata().descriptor;
-  }
-  static const ::google::protobuf::Reflection* GetReflection() {
-    return default_instance().GetMetadata().reflection;
-  }
-  static const ExportedTableUpdateMessage& default_instance() {
-    return *internal_default_instance();
-  }
-  static inline const ExportedTableUpdateMessage* internal_default_instance() {
-    return reinterpret_cast<const ExportedTableUpdateMessage*>(
-               &_ExportedTableUpdateMessage_default_instance_);
-  }
-  static constexpr int kIndexInFileMessages =
-    5;
-
-  friend void swap(ExportedTableUpdateMessage& a, ExportedTableUpdateMessage& b) {
-    a.Swap(&b);
-  }
-  inline void Swap(ExportedTableUpdateMessage* other) {
-    if (other == this) return;
-  #ifdef PROTOBUF_FORCE_COPY_IN_SWAP
-    if (GetArena() != nullptr &&
-        GetArena() == other->GetArena()) {
-   #else  // PROTOBUF_FORCE_COPY_IN_SWAP
-    if (GetArena() == other->GetArena()) {
-  #endif  // !PROTOBUF_FORCE_COPY_IN_SWAP
-      InternalSwap(other);
-    } else {
-      ::google::protobuf::internal::GenericSwap(this, other);
-    }
-  }
-  void UnsafeArenaSwap(ExportedTableUpdateMessage* other) {
-    if (other == this) return;
-    ABSL_DCHECK(GetArena() == other->GetArena());
-    InternalSwap(other);
-  }
-
-  // implements Message ----------------------------------------------
-
-  ExportedTableUpdateMessage* New(::google::protobuf::Arena* arena = nullptr) const final {
-    return CreateMaybeMessage<ExportedTableUpdateMessage>(arena);
-  }
-  using ::google::protobuf::Message::CopyFrom;
-  void CopyFrom(const ExportedTableUpdateMessage& from);
-  using ::google::protobuf::Message::MergeFrom;
-  void MergeFrom( const ExportedTableUpdateMessage& from) {
-    ExportedTableUpdateMessage::MergeImpl(*this, from);
-  }
-  private:
-  static void MergeImpl(::google::protobuf::Message& to_msg, const ::google::protobuf::Message& from_msg);
-  public:
-  PROTOBUF_ATTRIBUTE_REINITIALIZES void Clear() final;
-  bool IsInitialized() const final;
-
-  ::size_t ByteSizeLong() const final;
-  const char* _InternalParse(const char* ptr, ::google::protobuf::internal::ParseContext* ctx) final;
-  ::uint8_t* _InternalSerialize(
-      ::uint8_t* target, ::google::protobuf::io::EpsCopyOutputStream* stream) const final;
-  int GetCachedSize() const { return _impl_._cached_size_.Get(); }
-
-  private:
-  ::google::protobuf::internal::CachedSize* AccessCachedSize() const final;
-  void SharedCtor(::google::protobuf::Arena* arena);
-  void SharedDtor();
-  void InternalSwap(ExportedTableUpdateMessage* other);
-
-  private:
-  friend class ::google::protobuf::internal::AnyMetadata;
-  static ::absl::string_view FullMessageName() {
-    return "io.deephaven.proto.backplane.grpc.ExportedTableUpdateMessage";
-  }
-  protected:
-  explicit ExportedTableUpdateMessage(::google::protobuf::Arena* arena);
-  ExportedTableUpdateMessage(::google::protobuf::Arena* arena, const ExportedTableUpdateMessage& from);
-  public:
-
-  static const ClassData _class_data_;
-  const ::google::protobuf::Message::ClassData*GetClassData() const final;
-
-  ::google::protobuf::Metadata GetMetadata() const final;
-
-  // nested types ----------------------------------------------------
-
-  // accessors -------------------------------------------------------
-
-  enum : int {
-    kUpdateFailureMessageFieldNumber = 3,
-    kExportIdFieldNumber = 1,
-    kSizeFieldNumber = 2,
-  };
-  // string update_failure_message = 3;
-  void clear_update_failure_message() ;
-  const std::string& update_failure_message() const;
-  template <typename Arg_ = const std::string&, typename... Args_>
-  void set_update_failure_message(Arg_&& arg, Args_... args);
-  std::string* mutable_update_failure_message();
-  PROTOBUF_NODISCARD std::string* release_update_failure_message();
-  void set_allocated_update_failure_message(std::string* value);
-
-  private:
-  const std::string& _internal_update_failure_message() const;
-  inline PROTOBUF_ALWAYS_INLINE void _internal_set_update_failure_message(
-      const std::string& value);
-  std::string* _internal_mutable_update_failure_message();
-
-  public:
-  // .io.deephaven.proto.backplane.grpc.Ticket export_id = 1;
-  bool has_export_id() const;
-  void clear_export_id() ;
-  const ::io::deephaven::proto::backplane::grpc::Ticket& export_id() const;
-  PROTOBUF_NODISCARD ::io::deephaven::proto::backplane::grpc::Ticket* release_export_id();
-  ::io::deephaven::proto::backplane::grpc::Ticket* mutable_export_id();
-  void set_allocated_export_id(::io::deephaven::proto::backplane::grpc::Ticket* value);
-  void unsafe_arena_set_allocated_export_id(::io::deephaven::proto::backplane::grpc::Ticket* value);
-  ::io::deephaven::proto::backplane::grpc::Ticket* unsafe_arena_release_export_id();
-
-  private:
-  const ::io::deephaven::proto::backplane::grpc::Ticket& _internal_export_id() const;
-  ::io::deephaven::proto::backplane::grpc::Ticket* _internal_mutable_export_id();
-
-  public:
-  // sint64 size = 2 [jstype = JS_STRING];
-  void clear_size() ;
-  ::int64_t size() const;
-  void set_size(::int64_t value);
-
-  private:
-  ::int64_t _internal_size() const;
-  void _internal_set_size(::int64_t value);
-
-  public:
-  // @@protoc_insertion_point(class_scope:io.deephaven.proto.backplane.grpc.ExportedTableUpdateMessage)
- private:
-  class _Internal;
-
-  friend class ::google::protobuf::internal::TcParser;
-  static const ::google::protobuf::internal::TcParseTable<
-      2, 3, 1,
-      91, 2>
-      _table_;
-  friend class ::google::protobuf::MessageLite;
-  friend class ::google::protobuf::Arena;
-  template <typename T>
-  friend class ::google::protobuf::Arena::InternalHelper;
-  using InternalArenaConstructable_ = void;
-  using DestructorSkippable_ = void;
-  struct Impl_ {
-
-        inline explicit constexpr Impl_(
-            ::google::protobuf::internal::ConstantInitialized) noexcept;
-        inline explicit Impl_(::google::protobuf::internal::InternalVisibility visibility,
-                              ::google::protobuf::Arena* arena);
-        inline explicit Impl_(::google::protobuf::internal::InternalVisibility visibility,
-                              ::google::protobuf::Arena* arena, const Impl_& from);
-    ::google::protobuf::internal::HasBits<1> _has_bits_;
-    mutable ::google::protobuf::internal::CachedSize _cached_size_;
-    ::google::protobuf::internal::ArenaStringPtr update_failure_message_;
-    ::io::deephaven::proto::backplane::grpc::Ticket* export_id_;
-    ::int64_t size_;
-    PROTOBUF_TSAN_DECLARE_MEMBER
-  };
-  union { Impl_ _impl_; };
-  friend struct ::TableStruct_deephaven_2fproto_2ftable_2eproto;
-};// -------------------------------------------------------------------
-
-class EmptyTableRequest final :
-    public ::google::protobuf::Message /* @@protoc_insertion_point(class_definition:io.deephaven.proto.backplane.grpc.EmptyTableRequest) */ {
- public:
-  inline EmptyTableRequest() : EmptyTableRequest(nullptr) {}
-  ~EmptyTableRequest() override;
-  template<typename = void>
-  explicit PROTOBUF_CONSTEXPR EmptyTableRequest(::google::protobuf::internal::ConstantInitialized);
-
-  inline EmptyTableRequest(const EmptyTableRequest& from)
-      : EmptyTableRequest(nullptr, from) {}
-  EmptyTableRequest(EmptyTableRequest&& from) noexcept
-    : EmptyTableRequest() {
-    *this = ::std::move(from);
-  }
-
-  inline EmptyTableRequest& operator=(const EmptyTableRequest& from) {
-    CopyFrom(from);
-    return *this;
-  }
-  inline EmptyTableRequest& operator=(EmptyTableRequest&& from) noexcept {
-    if (this == &from) return *this;
-    if (GetArena() == from.GetArena()
-  #ifdef PROTOBUF_FORCE_COPY_IN_MOVE
-        && GetArena() != nullptr
-  #endif  // !PROTOBUF_FORCE_COPY_IN_MOVE
-    ) {
-      InternalSwap(&from);
-    } else {
-      CopyFrom(from);
-    }
-    return *this;
-  }
-
-  inline const ::google::protobuf::UnknownFieldSet& unknown_fields() const
-      ABSL_ATTRIBUTE_LIFETIME_BOUND {
-    return _internal_metadata_.unknown_fields<::google::protobuf::UnknownFieldSet>(::google::protobuf::UnknownFieldSet::default_instance);
-  }
-  inline ::google::protobuf::UnknownFieldSet* mutable_unknown_fields()
-      ABSL_ATTRIBUTE_LIFETIME_BOUND {
-    return _internal_metadata_.mutable_unknown_fields<::google::protobuf::UnknownFieldSet>();
-  }
-
-  static const ::google::protobuf::Descriptor* descriptor() {
-    return GetDescriptor();
-  }
-  static const ::google::protobuf::Descriptor* GetDescriptor() {
-    return default_instance().GetMetadata().descriptor;
-  }
-  static const ::google::protobuf::Reflection* GetReflection() {
-    return default_instance().GetMetadata().reflection;
-  }
-  static const EmptyTableRequest& default_instance() {
-    return *internal_default_instance();
-  }
-  static inline const EmptyTableRequest* internal_default_instance() {
-    return reinterpret_cast<const EmptyTableRequest*>(
-               &_EmptyTableRequest_default_instance_);
-  }
-  static constexpr int kIndexInFileMessages =
-    6;
-
-  friend void swap(EmptyTableRequest& a, EmptyTableRequest& b) {
-    a.Swap(&b);
-  }
-  inline void Swap(EmptyTableRequest* other) {
-    if (other == this) return;
-  #ifdef PROTOBUF_FORCE_COPY_IN_SWAP
-    if (GetArena() != nullptr &&
-        GetArena() == other->GetArena()) {
-   #else  // PROTOBUF_FORCE_COPY_IN_SWAP
-    if (GetArena() == other->GetArena()) {
-  #endif  // !PROTOBUF_FORCE_COPY_IN_SWAP
-      InternalSwap(other);
-    } else {
-      ::google::protobuf::internal::GenericSwap(this, other);
-    }
-  }
-  void UnsafeArenaSwap(EmptyTableRequest* other) {
-    if (other == this) return;
-    ABSL_DCHECK(GetArena() == other->GetArena());
-    InternalSwap(other);
-  }
-
-  // implements Message ----------------------------------------------
-
-  EmptyTableRequest* New(::google::protobuf::Arena* arena = nullptr) const final {
-    return CreateMaybeMessage<EmptyTableRequest>(arena);
-  }
-  using ::google::protobuf::Message::CopyFrom;
-  void CopyFrom(const EmptyTableRequest& from);
-  using ::google::protobuf::Message::MergeFrom;
-  void MergeFrom( const EmptyTableRequest& from) {
-    EmptyTableRequest::MergeImpl(*this, from);
-  }
-  private:
-  static void MergeImpl(::google::protobuf::Message& to_msg, const ::google::protobuf::Message& from_msg);
-  public:
-  PROTOBUF_ATTRIBUTE_REINITIALIZES void Clear() final;
-  bool IsInitialized() const final;
-
-  ::size_t ByteSizeLong() const final;
-  const char* _InternalParse(const char* ptr, ::google::protobuf::internal::ParseContext* ctx) final;
-  ::uint8_t* _InternalSerialize(
-      ::uint8_t* target, ::google::protobuf::io::EpsCopyOutputStream* stream) const final;
-  int GetCachedSize() const { return _impl_._cached_size_.Get(); }
-
-  private:
-  ::google::protobuf::internal::CachedSize* AccessCachedSize() const final;
-  void SharedCtor(::google::protobuf::Arena* arena);
-  void SharedDtor();
-  void InternalSwap(EmptyTableRequest* other);
-
-  private:
-  friend class ::google::protobuf::internal::AnyMetadata;
-  static ::absl::string_view FullMessageName() {
-    return "io.deephaven.proto.backplane.grpc.EmptyTableRequest";
-  }
-  protected:
-  explicit EmptyTableRequest(::google::protobuf::Arena* arena);
-  EmptyTableRequest(::google::protobuf::Arena* arena, const EmptyTableRequest& from);
-  public:
-
-  static const ClassData _class_data_;
-  const ::google::protobuf::Message::ClassData*GetClassData() const final;
-
-  ::google::protobuf::Metadata GetMetadata() const final;
-
-  // nested types ----------------------------------------------------
-
-  // accessors -------------------------------------------------------
-
-  enum : int {
-    kResultIdFieldNumber = 1,
-    kSizeFieldNumber = 2,
-  };
-  // .io.deephaven.proto.backplane.grpc.Ticket result_id = 1;
-  bool has_result_id() const;
-  void clear_result_id() ;
-  const ::io::deephaven::proto::backplane::grpc::Ticket& result_id() const;
-  PROTOBUF_NODISCARD ::io::deephaven::proto::backplane::grpc::Ticket* release_result_id();
-  ::io::deephaven::proto::backplane::grpc::Ticket* mutable_result_id();
-  void set_allocated_result_id(::io::deephaven::proto::backplane::grpc::Ticket* value);
-  void unsafe_arena_set_allocated_result_id(::io::deephaven::proto::backplane::grpc::Ticket* value);
-  ::io::deephaven::proto::backplane::grpc::Ticket* unsafe_arena_release_result_id();
-
-  private:
-  const ::io::deephaven::proto::backplane::grpc::Ticket& _internal_result_id() const;
-  ::io::deephaven::proto::backplane::grpc::Ticket* _internal_mutable_result_id();
-
-  public:
-  // sint64 size = 2 [jstype = JS_STRING];
-  void clear_size() ;
-  ::int64_t size() const;
-  void set_size(::int64_t value);
-
-  private:
-  ::int64_t _internal_size() const;
-  void _internal_set_size(::int64_t value);
-
-  public:
-  // @@protoc_insertion_point(class_scope:io.deephaven.proto.backplane.grpc.EmptyTableRequest)
- private:
-  class _Internal;
-
-  friend class ::google::protobuf::internal::TcParser;
-  static const ::google::protobuf::internal::TcParseTable<
-      1, 2, 1,
-      0, 2>
-      _table_;
-  friend class ::google::protobuf::MessageLite;
-  friend class ::google::protobuf::Arena;
-  template <typename T>
-  friend class ::google::protobuf::Arena::InternalHelper;
-  using InternalArenaConstructable_ = void;
-  using DestructorSkippable_ = void;
-  struct Impl_ {
-
-        inline explicit constexpr Impl_(
-            ::google::protobuf::internal::ConstantInitialized) noexcept;
-        inline explicit Impl_(::google::protobuf::internal::InternalVisibility visibility,
-                              ::google::protobuf::Arena* arena);
-        inline explicit Impl_(::google::protobuf::internal::InternalVisibility visibility,
-                              ::google::protobuf::Arena* arena, const Impl_& from);
-    ::google::protobuf::internal::HasBits<1> _has_bits_;
-    mutable ::google::protobuf::internal::CachedSize _cached_size_;
-    ::io::deephaven::proto::backplane::grpc::Ticket* result_id_;
-    ::int64_t size_;
-    PROTOBUF_TSAN_DECLARE_MEMBER
-  };
-  union { Impl_ _impl_; };
-  friend struct ::TableStruct_deephaven_2fproto_2ftable_2eproto;
-};// -------------------------------------------------------------------
-
-class CreateInputTableRequest_InputTableKind final :
-    public ::google::protobuf::Message /* @@protoc_insertion_point(class_definition:io.deephaven.proto.backplane.grpc.CreateInputTableRequest.InputTableKind) */ {
- public:
-  inline CreateInputTableRequest_InputTableKind() : CreateInputTableRequest_InputTableKind(nullptr) {}
-  ~CreateInputTableRequest_InputTableKind() override;
-  template<typename = void>
-  explicit PROTOBUF_CONSTEXPR CreateInputTableRequest_InputTableKind(::google::protobuf::internal::ConstantInitialized);
-
-  inline CreateInputTableRequest_InputTableKind(const CreateInputTableRequest_InputTableKind& from)
-      : CreateInputTableRequest_InputTableKind(nullptr, from) {}
-  CreateInputTableRequest_InputTableKind(CreateInputTableRequest_InputTableKind&& from) noexcept
-    : CreateInputTableRequest_InputTableKind() {
-    *this = ::std::move(from);
-  }
-
-  inline CreateInputTableRequest_InputTableKind& operator=(const CreateInputTableRequest_InputTableKind& from) {
-    CopyFrom(from);
-    return *this;
-  }
-  inline CreateInputTableRequest_InputTableKind& operator=(CreateInputTableRequest_InputTableKind&& from) noexcept {
-    if (this == &from) return *this;
-    if (GetArena() == from.GetArena()
-  #ifdef PROTOBUF_FORCE_COPY_IN_MOVE
-        && GetArena() != nullptr
-  #endif  // !PROTOBUF_FORCE_COPY_IN_MOVE
-    ) {
-      InternalSwap(&from);
-    } else {
-      CopyFrom(from);
-    }
-    return *this;
-  }
-
-  inline const ::google::protobuf::UnknownFieldSet& unknown_fields() const
-      ABSL_ATTRIBUTE_LIFETIME_BOUND {
-    return _internal_metadata_.unknown_fields<::google::protobuf::UnknownFieldSet>(::google::protobuf::UnknownFieldSet::default_instance);
-  }
-  inline ::google::protobuf::UnknownFieldSet* mutable_unknown_fields()
-      ABSL_ATTRIBUTE_LIFETIME_BOUND {
-    return _internal_metadata_.mutable_unknown_fields<::google::protobuf::UnknownFieldSet>();
-  }
-
-  static const ::google::protobuf::Descriptor* descriptor() {
-    return GetDescriptor();
-  }
-  static const ::google::protobuf::Descriptor* GetDescriptor() {
-    return default_instance().GetMetadata().descriptor;
-  }
-  static const ::google::protobuf::Reflection* GetReflection() {
-    return default_instance().GetMetadata().reflection;
-  }
-  static const CreateInputTableRequest_InputTableKind& default_instance() {
-    return *internal_default_instance();
-  }
-  enum KindCase {
-    kInMemoryAppendOnly = 1,
-    kInMemoryKeyBacked = 2,
-    kBlink = 3,
-    KIND_NOT_SET = 0,
-  };
-
-  static inline const CreateInputTableRequest_InputTableKind* internal_default_instance() {
-    return reinterpret_cast<const CreateInputTableRequest_InputTableKind*>(
-               &_CreateInputTableRequest_InputTableKind_default_instance_);
-  }
-  static constexpr int kIndexInFileMessages =
-    118;
-
-  friend void swap(CreateInputTableRequest_InputTableKind& a, CreateInputTableRequest_InputTableKind& b) {
-    a.Swap(&b);
-  }
-  inline void Swap(CreateInputTableRequest_InputTableKind* other) {
-    if (other == this) return;
-  #ifdef PROTOBUF_FORCE_COPY_IN_SWAP
-    if (GetArena() != nullptr &&
-        GetArena() == other->GetArena()) {
-   #else  // PROTOBUF_FORCE_COPY_IN_SWAP
-    if (GetArena() == other->GetArena()) {
-  #endif  // !PROTOBUF_FORCE_COPY_IN_SWAP
-      InternalSwap(other);
-    } else {
-      ::google::protobuf::internal::GenericSwap(this, other);
-    }
-  }
-  void UnsafeArenaSwap(CreateInputTableRequest_InputTableKind* other) {
-    if (other == this) return;
-    ABSL_DCHECK(GetArena() == other->GetArena());
-    InternalSwap(other);
-  }
-
-  // implements Message ----------------------------------------------
-
-  CreateInputTableRequest_InputTableKind* New(::google::protobuf::Arena* arena = nullptr) const final {
-    return CreateMaybeMessage<CreateInputTableRequest_InputTableKind>(arena);
-  }
-  using ::google::protobuf::Message::CopyFrom;
-  void CopyFrom(const CreateInputTableRequest_InputTableKind& from);
-  using ::google::protobuf::Message::MergeFrom;
-  void MergeFrom( const CreateInputTableRequest_InputTableKind& from) {
-    CreateInputTableRequest_InputTableKind::MergeImpl(*this, from);
-  }
-  private:
-  static void MergeImpl(::google::protobuf::Message& to_msg, const ::google::protobuf::Message& from_msg);
-  public:
-  PROTOBUF_ATTRIBUTE_REINITIALIZES void Clear() final;
-  bool IsInitialized() const final;
-
-  ::size_t ByteSizeLong() const final;
-  const char* _InternalParse(const char* ptr, ::google::protobuf::internal::ParseContext* ctx) final;
-  ::uint8_t* _InternalSerialize(
-      ::uint8_t* target, ::google::protobuf::io::EpsCopyOutputStream* stream) const final;
-  int GetCachedSize() const { return _impl_._cached_size_.Get(); }
-
-  private:
-  ::google::protobuf::internal::CachedSize* AccessCachedSize() const final;
-  void SharedCtor(::google::protobuf::Arena* arena);
-  void SharedDtor();
-  void InternalSwap(CreateInputTableRequest_InputTableKind* other);
-
-  private:
-  friend class ::google::protobuf::internal::AnyMetadata;
-  static ::absl::string_view FullMessageName() {
-    return "io.deephaven.proto.backplane.grpc.CreateInputTableRequest.InputTableKind";
-  }
-  protected:
-  explicit CreateInputTableRequest_InputTableKind(::google::protobuf::Arena* arena);
-  CreateInputTableRequest_InputTableKind(::google::protobuf::Arena* arena, const CreateInputTableRequest_InputTableKind& from);
-  public:
-
-  static const ClassData _class_data_;
-  const ::google::protobuf::Message::ClassData*GetClassData() const final;
-
-  ::google::protobuf::Metadata GetMetadata() const final;
-
-  // nested types ----------------------------------------------------
-
-  using InMemoryAppendOnly = CreateInputTableRequest_InputTableKind_InMemoryAppendOnly;
-  using InMemoryKeyBacked = CreateInputTableRequest_InputTableKind_InMemoryKeyBacked;
-  using Blink = CreateInputTableRequest_InputTableKind_Blink;
-
-  // accessors -------------------------------------------------------
-
-  enum : int {
-    kInMemoryAppendOnlyFieldNumber = 1,
-    kInMemoryKeyBackedFieldNumber = 2,
-    kBlinkFieldNumber = 3,
-  };
-  // .io.deephaven.proto.backplane.grpc.CreateInputTableRequest.InputTableKind.InMemoryAppendOnly in_memory_append_only = 1;
-  bool has_in_memory_append_only() const;
-  private:
-  bool _internal_has_in_memory_append_only() const;
-
-  public:
-  void clear_in_memory_append_only() ;
-  const ::io::deephaven::proto::backplane::grpc::CreateInputTableRequest_InputTableKind_InMemoryAppendOnly& in_memory_append_only() const;
-  PROTOBUF_NODISCARD ::io::deephaven::proto::backplane::grpc::CreateInputTableRequest_InputTableKind_InMemoryAppendOnly* release_in_memory_append_only();
-  ::io::deephaven::proto::backplane::grpc::CreateInputTableRequest_InputTableKind_InMemoryAppendOnly* mutable_in_memory_append_only();
-  void set_allocated_in_memory_append_only(::io::deephaven::proto::backplane::grpc::CreateInputTableRequest_InputTableKind_InMemoryAppendOnly* value);
-  void unsafe_arena_set_allocated_in_memory_append_only(::io::deephaven::proto::backplane::grpc::CreateInputTableRequest_InputTableKind_InMemoryAppendOnly* value);
-  ::io::deephaven::proto::backplane::grpc::CreateInputTableRequest_InputTableKind_InMemoryAppendOnly* unsafe_arena_release_in_memory_append_only();
-
-  private:
-  const ::io::deephaven::proto::backplane::grpc::CreateInputTableRequest_InputTableKind_InMemoryAppendOnly& _internal_in_memory_append_only() const;
-  ::io::deephaven::proto::backplane::grpc::CreateInputTableRequest_InputTableKind_InMemoryAppendOnly* _internal_mutable_in_memory_append_only();
-
-  public:
-  // .io.deephaven.proto.backplane.grpc.CreateInputTableRequest.InputTableKind.InMemoryKeyBacked in_memory_key_backed = 2;
-  bool has_in_memory_key_backed() const;
-  private:
-  bool _internal_has_in_memory_key_backed() const;
-
-  public:
-  void clear_in_memory_key_backed() ;
-  const ::io::deephaven::proto::backplane::grpc::CreateInputTableRequest_InputTableKind_InMemoryKeyBacked& in_memory_key_backed() const;
-  PROTOBUF_NODISCARD ::io::deephaven::proto::backplane::grpc::CreateInputTableRequest_InputTableKind_InMemoryKeyBacked* release_in_memory_key_backed();
-  ::io::deephaven::proto::backplane::grpc::CreateInputTableRequest_InputTableKind_InMemoryKeyBacked* mutable_in_memory_key_backed();
-  void set_allocated_in_memory_key_backed(::io::deephaven::proto::backplane::grpc::CreateInputTableRequest_InputTableKind_InMemoryKeyBacked* value);
-  void unsafe_arena_set_allocated_in_memory_key_backed(::io::deephaven::proto::backplane::grpc::CreateInputTableRequest_InputTableKind_InMemoryKeyBacked* value);
-  ::io::deephaven::proto::backplane::grpc::CreateInputTableRequest_InputTableKind_InMemoryKeyBacked* unsafe_arena_release_in_memory_key_backed();
-
-  private:
-  const ::io::deephaven::proto::backplane::grpc::CreateInputTableRequest_InputTableKind_InMemoryKeyBacked& _internal_in_memory_key_backed() const;
-  ::io::deephaven::proto::backplane::grpc::CreateInputTableRequest_InputTableKind_InMemoryKeyBacked* _internal_mutable_in_memory_key_backed();
-
-  public:
-  // .io.deephaven.proto.backplane.grpc.CreateInputTableRequest.InputTableKind.Blink blink = 3;
-  bool has_blink() const;
-  private:
-  bool _internal_has_blink() const;
-
-  public:
-  void clear_blink() ;
-  const ::io::deephaven::proto::backplane::grpc::CreateInputTableRequest_InputTableKind_Blink& blink() const;
-  PROTOBUF_NODISCARD ::io::deephaven::proto::backplane::grpc::CreateInputTableRequest_InputTableKind_Blink* release_blink();
-  ::io::deephaven::proto::backplane::grpc::CreateInputTableRequest_InputTableKind_Blink* mutable_blink();
-  void set_allocated_blink(::io::deephaven::proto::backplane::grpc::CreateInputTableRequest_InputTableKind_Blink* value);
-  void unsafe_arena_set_allocated_blink(::io::deephaven::proto::backplane::grpc::CreateInputTableRequest_InputTableKind_Blink* value);
-  ::io::deephaven::proto::backplane::grpc::CreateInputTableRequest_InputTableKind_Blink* unsafe_arena_release_blink();
-
-  private:
-  const ::io::deephaven::proto::backplane::grpc::CreateInputTableRequest_InputTableKind_Blink& _internal_blink() const;
-  ::io::deephaven::proto::backplane::grpc::CreateInputTableRequest_InputTableKind_Blink* _internal_mutable_blink();
-
-  public:
-  void clear_kind();
-  KindCase kind_case() const;
-  // @@protoc_insertion_point(class_scope:io.deephaven.proto.backplane.grpc.CreateInputTableRequest.InputTableKind)
- private:
-  class _Internal;
-  void set_has_in_memory_append_only();
-  void set_has_in_memory_key_backed();
-  void set_has_blink();
-
-  inline bool has_kind() const;
-  inline void clear_has_kind();
-
-  friend class ::google::protobuf::internal::TcParser;
-  static const ::google::protobuf::internal::TcParseTable<
-      0, 3, 3,
-      0, 2>
-      _table_;
-  friend class ::google::protobuf::MessageLite;
-  friend class ::google::protobuf::Arena;
-  template <typename T>
-  friend class ::google::protobuf::Arena::InternalHelper;
-  using InternalArenaConstructable_ = void;
-  using DestructorSkippable_ = void;
-  struct Impl_ {
-
-        inline explicit constexpr Impl_(
-            ::google::protobuf::internal::ConstantInitialized) noexcept;
-        inline explicit Impl_(::google::protobuf::internal::InternalVisibility visibility,
-                              ::google::protobuf::Arena* arena);
-        inline explicit Impl_(::google::protobuf::internal::InternalVisibility visibility,
-                              ::google::protobuf::Arena* arena, const Impl_& from);
-    union KindUnion {
-      constexpr KindUnion() : _constinit_{} {}
-        ::google::protobuf::internal::ConstantInitialized _constinit_;
-      ::io::deephaven::proto::backplane::grpc::CreateInputTableRequest_InputTableKind_InMemoryAppendOnly* in_memory_append_only_;
-      ::io::deephaven::proto::backplane::grpc::CreateInputTableRequest_InputTableKind_InMemoryKeyBacked* in_memory_key_backed_;
-      ::io::deephaven::proto::backplane::grpc::CreateInputTableRequest_InputTableKind_Blink* blink_;
-    } kind_;
-    mutable ::google::protobuf::internal::CachedSize _cached_size_;
-    ::uint32_t _oneof_case_[1];
-
-    PROTOBUF_TSAN_DECLARE_MEMBER
-  };
-  union { Impl_ _impl_; };
-  friend struct ::TableStruct_deephaven_2fproto_2ftable_2eproto;
-};// -------------------------------------------------------------------
-
-class ContainsCondition final :
-    public ::google::protobuf::Message /* @@protoc_insertion_point(class_definition:io.deephaven.proto.backplane.grpc.ContainsCondition) */ {
- public:
-  inline ContainsCondition() : ContainsCondition(nullptr) {}
-  ~ContainsCondition() override;
-  template<typename = void>
-  explicit PROTOBUF_CONSTEXPR ContainsCondition(::google::protobuf::internal::ConstantInitialized);
-
-  inline ContainsCondition(const ContainsCondition& from)
-      : ContainsCondition(nullptr, from) {}
-  ContainsCondition(ContainsCondition&& from) noexcept
-    : ContainsCondition() {
-    *this = ::std::move(from);
-  }
-
-  inline ContainsCondition& operator=(const ContainsCondition& from) {
-    CopyFrom(from);
-    return *this;
-  }
-  inline ContainsCondition& operator=(ContainsCondition&& from) noexcept {
-    if (this == &from) return *this;
-    if (GetArena() == from.GetArena()
-  #ifdef PROTOBUF_FORCE_COPY_IN_MOVE
-        && GetArena() != nullptr
-  #endif  // !PROTOBUF_FORCE_COPY_IN_MOVE
-    ) {
-      InternalSwap(&from);
-    } else {
-      CopyFrom(from);
-    }
-    return *this;
-  }
-
-  inline const ::google::protobuf::UnknownFieldSet& unknown_fields() const
-      ABSL_ATTRIBUTE_LIFETIME_BOUND {
-    return _internal_metadata_.unknown_fields<::google::protobuf::UnknownFieldSet>(::google::protobuf::UnknownFieldSet::default_instance);
-  }
-  inline ::google::protobuf::UnknownFieldSet* mutable_unknown_fields()
-      ABSL_ATTRIBUTE_LIFETIME_BOUND {
-    return _internal_metadata_.mutable_unknown_fields<::google::protobuf::UnknownFieldSet>();
-  }
-
-  static const ::google::protobuf::Descriptor* descriptor() {
-    return GetDescriptor();
-  }
-  static const ::google::protobuf::Descriptor* GetDescriptor() {
-    return default_instance().GetMetadata().descriptor;
-  }
-  static const ::google::protobuf::Reflection* GetReflection() {
-    return default_instance().GetMetadata().reflection;
-  }
-  static const ContainsCondition& default_instance() {
-    return *internal_default_instance();
-  }
-  static inline const ContainsCondition* internal_default_instance() {
-    return reinterpret_cast<const ContainsCondition*>(
-               &_ContainsCondition_default_instance_);
-  }
-  static constexpr int kIndexInFileMessages =
-    109;
-
-  friend void swap(ContainsCondition& a, ContainsCondition& b) {
-    a.Swap(&b);
-  }
-  inline void Swap(ContainsCondition* other) {
-    if (other == this) return;
-  #ifdef PROTOBUF_FORCE_COPY_IN_SWAP
-    if (GetArena() != nullptr &&
-        GetArena() == other->GetArena()) {
-   #else  // PROTOBUF_FORCE_COPY_IN_SWAP
-    if (GetArena() == other->GetArena()) {
-  #endif  // !PROTOBUF_FORCE_COPY_IN_SWAP
-      InternalSwap(other);
-    } else {
-      ::google::protobuf::internal::GenericSwap(this, other);
-    }
-  }
-  void UnsafeArenaSwap(ContainsCondition* other) {
-    if (other == this) return;
-    ABSL_DCHECK(GetArena() == other->GetArena());
-    InternalSwap(other);
-  }
-
-  // implements Message ----------------------------------------------
-
-  ContainsCondition* New(::google::protobuf::Arena* arena = nullptr) const final {
-    return CreateMaybeMessage<ContainsCondition>(arena);
-  }
-  using ::google::protobuf::Message::CopyFrom;
-  void CopyFrom(const ContainsCondition& from);
-  using ::google::protobuf::Message::MergeFrom;
-  void MergeFrom( const ContainsCondition& from) {
-    ContainsCondition::MergeImpl(*this, from);
-  }
-  private:
-  static void MergeImpl(::google::protobuf::Message& to_msg, const ::google::protobuf::Message& from_msg);
-  public:
-  PROTOBUF_ATTRIBUTE_REINITIALIZES void Clear() final;
-  bool IsInitialized() const final;
-
-  ::size_t ByteSizeLong() const final;
-  const char* _InternalParse(const char* ptr, ::google::protobuf::internal::ParseContext* ctx) final;
-  ::uint8_t* _InternalSerialize(
-      ::uint8_t* target, ::google::protobuf::io::EpsCopyOutputStream* stream) const final;
-  int GetCachedSize() const { return _impl_._cached_size_.Get(); }
-
-  private:
-  ::google::protobuf::internal::CachedSize* AccessCachedSize() const final;
-  void SharedCtor(::google::protobuf::Arena* arena);
-  void SharedDtor();
-  void InternalSwap(ContainsCondition* other);
-
-  private:
-  friend class ::google::protobuf::internal::AnyMetadata;
-  static ::absl::string_view FullMessageName() {
-    return "io.deephaven.proto.backplane.grpc.ContainsCondition";
-  }
-  protected:
-  explicit ContainsCondition(::google::protobuf::Arena* arena);
-  ContainsCondition(::google::protobuf::Arena* arena, const ContainsCondition& from);
-  public:
-
-  static const ClassData _class_data_;
-  const ::google::protobuf::Message::ClassData*GetClassData() const final;
-
-  ::google::protobuf::Metadata GetMetadata() const final;
-
-  // nested types ----------------------------------------------------
-
-  // accessors -------------------------------------------------------
-
-  enum : int {
-    kSearchStringFieldNumber = 2,
-    kReferenceFieldNumber = 1,
-    kCaseSensitivityFieldNumber = 3,
-    kMatchTypeFieldNumber = 4,
-  };
-  // string search_string = 2;
-  void clear_search_string() ;
-  const std::string& search_string() const;
-  template <typename Arg_ = const std::string&, typename... Args_>
-  void set_search_string(Arg_&& arg, Args_... args);
-  std::string* mutable_search_string();
-  PROTOBUF_NODISCARD std::string* release_search_string();
-  void set_allocated_search_string(std::string* value);
-
-  private:
-  const std::string& _internal_search_string() const;
-  inline PROTOBUF_ALWAYS_INLINE void _internal_set_search_string(
-      const std::string& value);
-  std::string* _internal_mutable_search_string();
-
-  public:
-  // .io.deephaven.proto.backplane.grpc.Reference reference = 1;
-  bool has_reference() const;
-  void clear_reference() ;
-  const ::io::deephaven::proto::backplane::grpc::Reference& reference() const;
-  PROTOBUF_NODISCARD ::io::deephaven::proto::backplane::grpc::Reference* release_reference();
-  ::io::deephaven::proto::backplane::grpc::Reference* mutable_reference();
-  void set_allocated_reference(::io::deephaven::proto::backplane::grpc::Reference* value);
-  void unsafe_arena_set_allocated_reference(::io::deephaven::proto::backplane::grpc::Reference* value);
-  ::io::deephaven::proto::backplane::grpc::Reference* unsafe_arena_release_reference();
-
-  private:
-  const ::io::deephaven::proto::backplane::grpc::Reference& _internal_reference() const;
-  ::io::deephaven::proto::backplane::grpc::Reference* _internal_mutable_reference();
-
-  public:
-  // .io.deephaven.proto.backplane.grpc.CaseSensitivity case_sensitivity = 3;
-  void clear_case_sensitivity() ;
-  ::io::deephaven::proto::backplane::grpc::CaseSensitivity case_sensitivity() const;
-  void set_case_sensitivity(::io::deephaven::proto::backplane::grpc::CaseSensitivity value);
-
-  private:
-  ::io::deephaven::proto::backplane::grpc::CaseSensitivity _internal_case_sensitivity() const;
-  void _internal_set_case_sensitivity(::io::deephaven::proto::backplane::grpc::CaseSensitivity value);
-
-  public:
-  // .io.deephaven.proto.backplane.grpc.MatchType match_type = 4;
-  void clear_match_type() ;
-  ::io::deephaven::proto::backplane::grpc::MatchType match_type() const;
-  void set_match_type(::io::deephaven::proto::backplane::grpc::MatchType value);
-
-  private:
-  ::io::deephaven::proto::backplane::grpc::MatchType _internal_match_type() const;
-  void _internal_set_match_type(::io::deephaven::proto::backplane::grpc::MatchType value);
-
-  public:
-  // @@protoc_insertion_point(class_scope:io.deephaven.proto.backplane.grpc.ContainsCondition)
- private:
-  class _Internal;
-
-  friend class ::google::protobuf::internal::TcParser;
-  static const ::google::protobuf::internal::TcParseTable<
-      2, 4, 1,
-      73, 2>
-      _table_;
-  friend class ::google::protobuf::MessageLite;
-  friend class ::google::protobuf::Arena;
-  template <typename T>
-  friend class ::google::protobuf::Arena::InternalHelper;
-  using InternalArenaConstructable_ = void;
-  using DestructorSkippable_ = void;
-  struct Impl_ {
-
-        inline explicit constexpr Impl_(
-            ::google::protobuf::internal::ConstantInitialized) noexcept;
-        inline explicit Impl_(::google::protobuf::internal::InternalVisibility visibility,
-                              ::google::protobuf::Arena* arena);
-        inline explicit Impl_(::google::protobuf::internal::InternalVisibility visibility,
-                              ::google::protobuf::Arena* arena, const Impl_& from);
-    ::google::protobuf::internal::HasBits<1> _has_bits_;
-    mutable ::google::protobuf::internal::CachedSize _cached_size_;
-    ::google::protobuf::internal::ArenaStringPtr search_string_;
-    ::io::deephaven::proto::backplane::grpc::Reference* reference_;
-    int case_sensitivity_;
-    int match_type_;
-    PROTOBUF_TSAN_DECLARE_MEMBER
-  };
-  union { Impl_ _impl_; };
-  friend struct ::TableStruct_deephaven_2fproto_2ftable_2eproto;
-};// -------------------------------------------------------------------
-
-class AggSpec_AggSpecUnique final :
-    public ::google::protobuf::Message /* @@protoc_insertion_point(class_definition:io.deephaven.proto.backplane.grpc.AggSpec.AggSpecUnique) */ {
- public:
-  inline AggSpec_AggSpecUnique() : AggSpec_AggSpecUnique(nullptr) {}
-  ~AggSpec_AggSpecUnique() override;
-  template<typename = void>
-  explicit PROTOBUF_CONSTEXPR AggSpec_AggSpecUnique(::google::protobuf::internal::ConstantInitialized);
-
-  inline AggSpec_AggSpecUnique(const AggSpec_AggSpecUnique& from)
-      : AggSpec_AggSpecUnique(nullptr, from) {}
-  AggSpec_AggSpecUnique(AggSpec_AggSpecUnique&& from) noexcept
-    : AggSpec_AggSpecUnique() {
-    *this = ::std::move(from);
-  }
-
-  inline AggSpec_AggSpecUnique& operator=(const AggSpec_AggSpecUnique& from) {
-    CopyFrom(from);
-    return *this;
-  }
-  inline AggSpec_AggSpecUnique& operator=(AggSpec_AggSpecUnique&& from) noexcept {
-    if (this == &from) return *this;
-    if (GetArena() == from.GetArena()
-  #ifdef PROTOBUF_FORCE_COPY_IN_MOVE
-        && GetArena() != nullptr
-  #endif  // !PROTOBUF_FORCE_COPY_IN_MOVE
-    ) {
-      InternalSwap(&from);
-    } else {
-      CopyFrom(from);
-    }
-    return *this;
-  }
-
-  inline const ::google::protobuf::UnknownFieldSet& unknown_fields() const
-      ABSL_ATTRIBUTE_LIFETIME_BOUND {
-    return _internal_metadata_.unknown_fields<::google::protobuf::UnknownFieldSet>(::google::protobuf::UnknownFieldSet::default_instance);
-  }
-  inline ::google::protobuf::UnknownFieldSet* mutable_unknown_fields()
-      ABSL_ATTRIBUTE_LIFETIME_BOUND {
-    return _internal_metadata_.mutable_unknown_fields<::google::protobuf::UnknownFieldSet>();
-  }
-
-  static const ::google::protobuf::Descriptor* descriptor() {
-    return GetDescriptor();
-  }
-  static const ::google::protobuf::Descriptor* GetDescriptor() {
-    return default_instance().GetMetadata().descriptor;
-  }
-  static const ::google::protobuf::Reflection* GetReflection() {
-    return default_instance().GetMetadata().reflection;
-  }
-  static const AggSpec_AggSpecUnique& default_instance() {
-    return *internal_default_instance();
-  }
-  static inline const AggSpec_AggSpecUnique* internal_default_instance() {
-    return reinterpret_cast<const AggSpec_AggSpecUnique*>(
-               &_AggSpec_AggSpecUnique_default_instance_);
-  }
-  static constexpr int kIndexInFileMessages =
-    71;
-
-  friend void swap(AggSpec_AggSpecUnique& a, AggSpec_AggSpecUnique& b) {
-    a.Swap(&b);
-  }
-  inline void Swap(AggSpec_AggSpecUnique* other) {
-    if (other == this) return;
-  #ifdef PROTOBUF_FORCE_COPY_IN_SWAP
-    if (GetArena() != nullptr &&
-        GetArena() == other->GetArena()) {
-   #else  // PROTOBUF_FORCE_COPY_IN_SWAP
-    if (GetArena() == other->GetArena()) {
-  #endif  // !PROTOBUF_FORCE_COPY_IN_SWAP
-      InternalSwap(other);
-    } else {
-      ::google::protobuf::internal::GenericSwap(this, other);
-    }
-  }
-  void UnsafeArenaSwap(AggSpec_AggSpecUnique* other) {
-    if (other == this) return;
-    ABSL_DCHECK(GetArena() == other->GetArena());
-    InternalSwap(other);
-  }
-
-  // implements Message ----------------------------------------------
-
-  AggSpec_AggSpecUnique* New(::google::protobuf::Arena* arena = nullptr) const final {
-    return CreateMaybeMessage<AggSpec_AggSpecUnique>(arena);
-  }
-  using ::google::protobuf::Message::CopyFrom;
-  void CopyFrom(const AggSpec_AggSpecUnique& from);
-  using ::google::protobuf::Message::MergeFrom;
-  void MergeFrom( const AggSpec_AggSpecUnique& from) {
-    AggSpec_AggSpecUnique::MergeImpl(*this, from);
-  }
-  private:
-  static void MergeImpl(::google::protobuf::Message& to_msg, const ::google::protobuf::Message& from_msg);
-  public:
-  PROTOBUF_ATTRIBUTE_REINITIALIZES void Clear() final;
-  bool IsInitialized() const final;
-
-  ::size_t ByteSizeLong() const final;
-  const char* _InternalParse(const char* ptr, ::google::protobuf::internal::ParseContext* ctx) final;
-  ::uint8_t* _InternalSerialize(
-      ::uint8_t* target, ::google::protobuf::io::EpsCopyOutputStream* stream) const final;
-  int GetCachedSize() const { return _impl_._cached_size_.Get(); }
-
-  private:
-  ::google::protobuf::internal::CachedSize* AccessCachedSize() const final;
-  void SharedCtor(::google::protobuf::Arena* arena);
-  void SharedDtor();
-  void InternalSwap(AggSpec_AggSpecUnique* other);
-
-  private:
-  friend class ::google::protobuf::internal::AnyMetadata;
-  static ::absl::string_view FullMessageName() {
-    return "io.deephaven.proto.backplane.grpc.AggSpec.AggSpecUnique";
-  }
-  protected:
-  explicit AggSpec_AggSpecUnique(::google::protobuf::Arena* arena);
-  AggSpec_AggSpecUnique(::google::protobuf::Arena* arena, const AggSpec_AggSpecUnique& from);
-  public:
-
-  static const ClassData _class_data_;
-  const ::google::protobuf::Message::ClassData*GetClassData() const final;
-
-  ::google::protobuf::Metadata GetMetadata() const final;
-
-  // nested types ----------------------------------------------------
-
-  // accessors -------------------------------------------------------
-
-  enum : int {
-    kNonUniqueSentinelFieldNumber = 2,
-    kIncludeNullsFieldNumber = 1,
-  };
-  // .io.deephaven.proto.backplane.grpc.AggSpec.AggSpecNonUniqueSentinel non_unique_sentinel = 2;
-  bool has_non_unique_sentinel() const;
-  void clear_non_unique_sentinel() ;
-  const ::io::deephaven::proto::backplane::grpc::AggSpec_AggSpecNonUniqueSentinel& non_unique_sentinel() const;
-  PROTOBUF_NODISCARD ::io::deephaven::proto::backplane::grpc::AggSpec_AggSpecNonUniqueSentinel* release_non_unique_sentinel();
-  ::io::deephaven::proto::backplane::grpc::AggSpec_AggSpecNonUniqueSentinel* mutable_non_unique_sentinel();
-  void set_allocated_non_unique_sentinel(::io::deephaven::proto::backplane::grpc::AggSpec_AggSpecNonUniqueSentinel* value);
-  void unsafe_arena_set_allocated_non_unique_sentinel(::io::deephaven::proto::backplane::grpc::AggSpec_AggSpecNonUniqueSentinel* value);
-  ::io::deephaven::proto::backplane::grpc::AggSpec_AggSpecNonUniqueSentinel* unsafe_arena_release_non_unique_sentinel();
-
-  private:
-  const ::io::deephaven::proto::backplane::grpc::AggSpec_AggSpecNonUniqueSentinel& _internal_non_unique_sentinel() const;
-  ::io::deephaven::proto::backplane::grpc::AggSpec_AggSpecNonUniqueSentinel* _internal_mutable_non_unique_sentinel();
-
-  public:
-  // bool include_nulls = 1;
-  void clear_include_nulls() ;
-  bool include_nulls() const;
-  void set_include_nulls(bool value);
-
-  private:
-  bool _internal_include_nulls() const;
-  void _internal_set_include_nulls(bool value);
-
-  public:
-  // @@protoc_insertion_point(class_scope:io.deephaven.proto.backplane.grpc.AggSpec.AggSpecUnique)
- private:
-  class _Internal;
-
-  friend class ::google::protobuf::internal::TcParser;
-  static const ::google::protobuf::internal::TcParseTable<
-      1, 2, 1,
-      0, 2>
-      _table_;
-  friend class ::google::protobuf::MessageLite;
-  friend class ::google::protobuf::Arena;
-  template <typename T>
-  friend class ::google::protobuf::Arena::InternalHelper;
-  using InternalArenaConstructable_ = void;
-  using DestructorSkippable_ = void;
-  struct Impl_ {
-
-        inline explicit constexpr Impl_(
-            ::google::protobuf::internal::ConstantInitialized) noexcept;
-        inline explicit Impl_(::google::protobuf::internal::InternalVisibility visibility,
-                              ::google::protobuf::Arena* arena);
-        inline explicit Impl_(::google::protobuf::internal::InternalVisibility visibility,
-                              ::google::protobuf::Arena* arena, const Impl_& from);
-    ::google::protobuf::internal::HasBits<1> _has_bits_;
-    mutable ::google::protobuf::internal::CachedSize _cached_size_;
-    ::io::deephaven::proto::backplane::grpc::AggSpec_AggSpecNonUniqueSentinel* non_unique_sentinel_;
-    bool include_nulls_;
-    PROTOBUF_TSAN_DECLARE_MEMBER
-  };
-  union { Impl_ _impl_; };
-  friend struct ::TableStruct_deephaven_2fproto_2ftable_2eproto;
-};// -------------------------------------------------------------------
-
-class AggSpec_AggSpecSorted final :
-    public ::google::protobuf::Message /* @@protoc_insertion_point(class_definition:io.deephaven.proto.backplane.grpc.AggSpec.AggSpecSorted) */ {
- public:
-  inline AggSpec_AggSpecSorted() : AggSpec_AggSpecSorted(nullptr) {}
-  ~AggSpec_AggSpecSorted() override;
-  template<typename = void>
-  explicit PROTOBUF_CONSTEXPR AggSpec_AggSpecSorted(::google::protobuf::internal::ConstantInitialized);
-
-  inline AggSpec_AggSpecSorted(const AggSpec_AggSpecSorted& from)
-      : AggSpec_AggSpecSorted(nullptr, from) {}
-  AggSpec_AggSpecSorted(AggSpec_AggSpecSorted&& from) noexcept
-    : AggSpec_AggSpecSorted() {
-    *this = ::std::move(from);
-  }
-
-  inline AggSpec_AggSpecSorted& operator=(const AggSpec_AggSpecSorted& from) {
-    CopyFrom(from);
-    return *this;
-  }
-  inline AggSpec_AggSpecSorted& operator=(AggSpec_AggSpecSorted&& from) noexcept {
-    if (this == &from) return *this;
-    if (GetArena() == from.GetArena()
-  #ifdef PROTOBUF_FORCE_COPY_IN_MOVE
-        && GetArena() != nullptr
-  #endif  // !PROTOBUF_FORCE_COPY_IN_MOVE
-    ) {
-      InternalSwap(&from);
-    } else {
-      CopyFrom(from);
-    }
-    return *this;
-  }
-
-  inline const ::google::protobuf::UnknownFieldSet& unknown_fields() const
-      ABSL_ATTRIBUTE_LIFETIME_BOUND {
-    return _internal_metadata_.unknown_fields<::google::protobuf::UnknownFieldSet>(::google::protobuf::UnknownFieldSet::default_instance);
-  }
-  inline ::google::protobuf::UnknownFieldSet* mutable_unknown_fields()
-      ABSL_ATTRIBUTE_LIFETIME_BOUND {
-    return _internal_metadata_.mutable_unknown_fields<::google::protobuf::UnknownFieldSet>();
-  }
-
-  static const ::google::protobuf::Descriptor* descriptor() {
-    return GetDescriptor();
-  }
-  static const ::google::protobuf::Descriptor* GetDescriptor() {
-    return default_instance().GetMetadata().descriptor;
-  }
-  static const ::google::protobuf::Reflection* GetReflection() {
-    return default_instance().GetMetadata().reflection;
-  }
-  static const AggSpec_AggSpecSorted& default_instance() {
-    return *internal_default_instance();
-  }
-  static inline const AggSpec_AggSpecSorted* internal_default_instance() {
-    return reinterpret_cast<const AggSpec_AggSpecSorted*>(
-               &_AggSpec_AggSpecSorted_default_instance_);
-  }
-  static constexpr int kIndexInFileMessages =
-    68;
-
-  friend void swap(AggSpec_AggSpecSorted& a, AggSpec_AggSpecSorted& b) {
-    a.Swap(&b);
-  }
-  inline void Swap(AggSpec_AggSpecSorted* other) {
-    if (other == this) return;
-  #ifdef PROTOBUF_FORCE_COPY_IN_SWAP
-    if (GetArena() != nullptr &&
-        GetArena() == other->GetArena()) {
-   #else  // PROTOBUF_FORCE_COPY_IN_SWAP
-    if (GetArena() == other->GetArena()) {
-  #endif  // !PROTOBUF_FORCE_COPY_IN_SWAP
-      InternalSwap(other);
-    } else {
-      ::google::protobuf::internal::GenericSwap(this, other);
-    }
-  }
-  void UnsafeArenaSwap(AggSpec_AggSpecSorted* other) {
-    if (other == this) return;
-    ABSL_DCHECK(GetArena() == other->GetArena());
-    InternalSwap(other);
-  }
-
-  // implements Message ----------------------------------------------
-
-  AggSpec_AggSpecSorted* New(::google::protobuf::Arena* arena = nullptr) const final {
-    return CreateMaybeMessage<AggSpec_AggSpecSorted>(arena);
-  }
-  using ::google::protobuf::Message::CopyFrom;
-  void CopyFrom(const AggSpec_AggSpecSorted& from);
-  using ::google::protobuf::Message::MergeFrom;
-  void MergeFrom( const AggSpec_AggSpecSorted& from) {
-    AggSpec_AggSpecSorted::MergeImpl(*this, from);
-  }
-  private:
-  static void MergeImpl(::google::protobuf::Message& to_msg, const ::google::protobuf::Message& from_msg);
-  public:
-  PROTOBUF_ATTRIBUTE_REINITIALIZES void Clear() final;
-  bool IsInitialized() const final;
-
-  ::size_t ByteSizeLong() const final;
-  const char* _InternalParse(const char* ptr, ::google::protobuf::internal::ParseContext* ctx) final;
-  ::uint8_t* _InternalSerialize(
-      ::uint8_t* target, ::google::protobuf::io::EpsCopyOutputStream* stream) const final;
-  int GetCachedSize() const { return _impl_._cached_size_.Get(); }
-
-  private:
-  ::google::protobuf::internal::CachedSize* AccessCachedSize() const final;
-  void SharedCtor(::google::protobuf::Arena* arena);
-  void SharedDtor();
-  void InternalSwap(AggSpec_AggSpecSorted* other);
-
-  private:
-  friend class ::google::protobuf::internal::AnyMetadata;
-  static ::absl::string_view FullMessageName() {
-    return "io.deephaven.proto.backplane.grpc.AggSpec.AggSpecSorted";
-  }
-  protected:
-  explicit AggSpec_AggSpecSorted(::google::protobuf::Arena* arena);
-  AggSpec_AggSpecSorted(::google::protobuf::Arena* arena, const AggSpec_AggSpecSorted& from);
-  public:
-
-  static const ClassData _class_data_;
-  const ::google::protobuf::Message::ClassData*GetClassData() const final;
-
-  ::google::protobuf::Metadata GetMetadata() const final;
-
-  // nested types ----------------------------------------------------
-
-  // accessors -------------------------------------------------------
-
-  enum : int {
-    kColumnsFieldNumber = 1,
-  };
-  // repeated .io.deephaven.proto.backplane.grpc.AggSpec.AggSpecSortedColumn columns = 1;
-  int columns_size() const;
-  private:
-  int _internal_columns_size() const;
-
-  public:
-  void clear_columns() ;
-  ::io::deephaven::proto::backplane::grpc::AggSpec_AggSpecSortedColumn* mutable_columns(int index);
-  ::google::protobuf::RepeatedPtrField< ::io::deephaven::proto::backplane::grpc::AggSpec_AggSpecSortedColumn >*
-      mutable_columns();
-  private:
-  const ::google::protobuf::RepeatedPtrField<::io::deephaven::proto::backplane::grpc::AggSpec_AggSpecSortedColumn>& _internal_columns() const;
-  ::google::protobuf::RepeatedPtrField<::io::deephaven::proto::backplane::grpc::AggSpec_AggSpecSortedColumn>* _internal_mutable_columns();
-  public:
-  const ::io::deephaven::proto::backplane::grpc::AggSpec_AggSpecSortedColumn& columns(int index) const;
-  ::io::deephaven::proto::backplane::grpc::AggSpec_AggSpecSortedColumn* add_columns();
-  const ::google::protobuf::RepeatedPtrField< ::io::deephaven::proto::backplane::grpc::AggSpec_AggSpecSortedColumn >&
-      columns() const;
-  // @@protoc_insertion_point(class_scope:io.deephaven.proto.backplane.grpc.AggSpec.AggSpecSorted)
- private:
-  class _Internal;
-
-  friend class ::google::protobuf::internal::TcParser;
-  static const ::google::protobuf::internal::TcParseTable<
-      0, 1, 1,
-      0, 2>
-      _table_;
-  friend class ::google::protobuf::MessageLite;
-  friend class ::google::protobuf::Arena;
-  template <typename T>
-  friend class ::google::protobuf::Arena::InternalHelper;
-  using InternalArenaConstructable_ = void;
-  using DestructorSkippable_ = void;
-  struct Impl_ {
-
-        inline explicit constexpr Impl_(
-            ::google::protobuf::internal::ConstantInitialized) noexcept;
-        inline explicit Impl_(::google::protobuf::internal::InternalVisibility visibility,
-                              ::google::protobuf::Arena* arena);
-        inline explicit Impl_(::google::protobuf::internal::InternalVisibility visibility,
-                              ::google::protobuf::Arena* arena, const Impl_& from);
-    ::google::protobuf::RepeatedPtrField< ::io::deephaven::proto::backplane::grpc::AggSpec_AggSpecSortedColumn > columns_;
-    mutable ::google::protobuf::internal::CachedSize _cached_size_;
-    PROTOBUF_TSAN_DECLARE_MEMBER
-  };
-  union { Impl_ _impl_; };
-  friend struct ::TableStruct_deephaven_2fproto_2ftable_2eproto;
-};// -------------------------------------------------------------------
-
-class WhereInRequest final :
-    public ::google::protobuf::Message /* @@protoc_insertion_point(class_definition:io.deephaven.proto.backplane.grpc.WhereInRequest) */ {
- public:
-  inline WhereInRequest() : WhereInRequest(nullptr) {}
-  ~WhereInRequest() override;
-  template<typename = void>
-  explicit PROTOBUF_CONSTEXPR WhereInRequest(::google::protobuf::internal::ConstantInitialized);
-
-  inline WhereInRequest(const WhereInRequest& from)
-      : WhereInRequest(nullptr, from) {}
-  WhereInRequest(WhereInRequest&& from) noexcept
-    : WhereInRequest() {
-    *this = ::std::move(from);
-  }
-
-  inline WhereInRequest& operator=(const WhereInRequest& from) {
-    CopyFrom(from);
-    return *this;
-  }
-  inline WhereInRequest& operator=(WhereInRequest&& from) noexcept {
-    if (this == &from) return *this;
-    if (GetArena() == from.GetArena()
-  #ifdef PROTOBUF_FORCE_COPY_IN_MOVE
-        && GetArena() != nullptr
-  #endif  // !PROTOBUF_FORCE_COPY_IN_MOVE
-    ) {
-      InternalSwap(&from);
-    } else {
-      CopyFrom(from);
-    }
-    return *this;
-  }
-
-  inline const ::google::protobuf::UnknownFieldSet& unknown_fields() const
-      ABSL_ATTRIBUTE_LIFETIME_BOUND {
-    return _internal_metadata_.unknown_fields<::google::protobuf::UnknownFieldSet>(::google::protobuf::UnknownFieldSet::default_instance);
-  }
-  inline ::google::protobuf::UnknownFieldSet* mutable_unknown_fields()
-      ABSL_ATTRIBUTE_LIFETIME_BOUND {
-    return _internal_metadata_.mutable_unknown_fields<::google::protobuf::UnknownFieldSet>();
-  }
-
-  static const ::google::protobuf::Descriptor* descriptor() {
-    return GetDescriptor();
-  }
-  static const ::google::protobuf::Descriptor* GetDescriptor() {
-    return default_instance().GetMetadata().descriptor;
-  }
-  static const ::google::protobuf::Reflection* GetReflection() {
-    return default_instance().GetMetadata().reflection;
-  }
-  static const WhereInRequest& default_instance() {
-    return *internal_default_instance();
-  }
-  static inline const WhereInRequest* internal_default_instance() {
-    return reinterpret_cast<const WhereInRequest*>(
-               &_WhereInRequest_default_instance_);
-  }
-  static constexpr int kIndexInFileMessages =
-    120;
-
-  friend void swap(WhereInRequest& a, WhereInRequest& b) {
-    a.Swap(&b);
-  }
-  inline void Swap(WhereInRequest* other) {
-    if (other == this) return;
-  #ifdef PROTOBUF_FORCE_COPY_IN_SWAP
-    if (GetArena() != nullptr &&
-        GetArena() == other->GetArena()) {
-   #else  // PROTOBUF_FORCE_COPY_IN_SWAP
-    if (GetArena() == other->GetArena()) {
-  #endif  // !PROTOBUF_FORCE_COPY_IN_SWAP
-      InternalSwap(other);
-    } else {
-      ::google::protobuf::internal::GenericSwap(this, other);
-    }
-  }
-  void UnsafeArenaSwap(WhereInRequest* other) {
-    if (other == this) return;
-    ABSL_DCHECK(GetArena() == other->GetArena());
-    InternalSwap(other);
-  }
-
-  // implements Message ----------------------------------------------
-
-  WhereInRequest* New(::google::protobuf::Arena* arena = nullptr) const final {
-    return CreateMaybeMessage<WhereInRequest>(arena);
-  }
-  using ::google::protobuf::Message::CopyFrom;
-  void CopyFrom(const WhereInRequest& from);
-  using ::google::protobuf::Message::MergeFrom;
-  void MergeFrom( const WhereInRequest& from) {
-    WhereInRequest::MergeImpl(*this, from);
-  }
-  private:
-  static void MergeImpl(::google::protobuf::Message& to_msg, const ::google::protobuf::Message& from_msg);
-  public:
-  PROTOBUF_ATTRIBUTE_REINITIALIZES void Clear() final;
-  bool IsInitialized() const final;
-
-  ::size_t ByteSizeLong() const final;
-  const char* _InternalParse(const char* ptr, ::google::protobuf::internal::ParseContext* ctx) final;
-  ::uint8_t* _InternalSerialize(
-      ::uint8_t* target, ::google::protobuf::io::EpsCopyOutputStream* stream) const final;
-  int GetCachedSize() const { return _impl_._cached_size_.Get(); }
-
-  private:
-  ::google::protobuf::internal::CachedSize* AccessCachedSize() const final;
-  void SharedCtor(::google::protobuf::Arena* arena);
-  void SharedDtor();
-  void InternalSwap(WhereInRequest* other);
-
-  private:
-  friend class ::google::protobuf::internal::AnyMetadata;
-  static ::absl::string_view FullMessageName() {
-    return "io.deephaven.proto.backplane.grpc.WhereInRequest";
-  }
-  protected:
-  explicit WhereInRequest(::google::protobuf::Arena* arena);
-  WhereInRequest(::google::protobuf::Arena* arena, const WhereInRequest& from);
-  public:
-
-  static const ClassData _class_data_;
-  const ::google::protobuf::Message::ClassData*GetClassData() const final;
-
-  ::google::protobuf::Metadata GetMetadata() const final;
-
-  // nested types ----------------------------------------------------
-
-  // accessors -------------------------------------------------------
-
-  enum : int {
-    kColumnsToMatchFieldNumber = 5,
-    kResultIdFieldNumber = 1,
-    kLeftIdFieldNumber = 2,
-    kRightIdFieldNumber = 3,
-    kInvertedFieldNumber = 4,
-  };
-  // repeated string columns_to_match = 5;
-  int columns_to_match_size() const;
-  private:
-  int _internal_columns_to_match_size() const;
-
-  public:
-  void clear_columns_to_match() ;
-  const std::string& columns_to_match(int index) const;
-  std::string* mutable_columns_to_match(int index);
-  void set_columns_to_match(int index, const std::string& value);
-  void set_columns_to_match(int index, std::string&& value);
-  void set_columns_to_match(int index, const char* value);
-  void set_columns_to_match(int index, const char* value, std::size_t size);
-  void set_columns_to_match(int index, absl::string_view value);
-  std::string* add_columns_to_match();
-  void add_columns_to_match(const std::string& value);
-  void add_columns_to_match(std::string&& value);
-  void add_columns_to_match(const char* value);
-  void add_columns_to_match(const char* value, std::size_t size);
-  void add_columns_to_match(absl::string_view value);
-  const ::google::protobuf::RepeatedPtrField<std::string>& columns_to_match() const;
-  ::google::protobuf::RepeatedPtrField<std::string>* mutable_columns_to_match();
-
-  private:
-  const ::google::protobuf::RepeatedPtrField<std::string>& _internal_columns_to_match() const;
-  ::google::protobuf::RepeatedPtrField<std::string>* _internal_mutable_columns_to_match();
-
-  public:
-  // .io.deephaven.proto.backplane.grpc.Ticket result_id = 1;
-  bool has_result_id() const;
-  void clear_result_id() ;
-  const ::io::deephaven::proto::backplane::grpc::Ticket& result_id() const;
-  PROTOBUF_NODISCARD ::io::deephaven::proto::backplane::grpc::Ticket* release_result_id();
-  ::io::deephaven::proto::backplane::grpc::Ticket* mutable_result_id();
-  void set_allocated_result_id(::io::deephaven::proto::backplane::grpc::Ticket* value);
-  void unsafe_arena_set_allocated_result_id(::io::deephaven::proto::backplane::grpc::Ticket* value);
-  ::io::deephaven::proto::backplane::grpc::Ticket* unsafe_arena_release_result_id();
-
-  private:
-  const ::io::deephaven::proto::backplane::grpc::Ticket& _internal_result_id() const;
-  ::io::deephaven::proto::backplane::grpc::Ticket* _internal_mutable_result_id();
-
-  public:
-  // .io.deephaven.proto.backplane.grpc.TableReference left_id = 2;
-  bool has_left_id() const;
-  void clear_left_id() ;
-  const ::io::deephaven::proto::backplane::grpc::TableReference& left_id() const;
-  PROTOBUF_NODISCARD ::io::deephaven::proto::backplane::grpc::TableReference* release_left_id();
-  ::io::deephaven::proto::backplane::grpc::TableReference* mutable_left_id();
-  void set_allocated_left_id(::io::deephaven::proto::backplane::grpc::TableReference* value);
-  void unsafe_arena_set_allocated_left_id(::io::deephaven::proto::backplane::grpc::TableReference* value);
-  ::io::deephaven::proto::backplane::grpc::TableReference* unsafe_arena_release_left_id();
-
-  private:
-  const ::io::deephaven::proto::backplane::grpc::TableReference& _internal_left_id() const;
-  ::io::deephaven::proto::backplane::grpc::TableReference* _internal_mutable_left_id();
-
-  public:
-  // .io.deephaven.proto.backplane.grpc.TableReference right_id = 3;
-  bool has_right_id() const;
-  void clear_right_id() ;
-  const ::io::deephaven::proto::backplane::grpc::TableReference& right_id() const;
-  PROTOBUF_NODISCARD ::io::deephaven::proto::backplane::grpc::TableReference* release_right_id();
-  ::io::deephaven::proto::backplane::grpc::TableReference* mutable_right_id();
-  void set_allocated_right_id(::io::deephaven::proto::backplane::grpc::TableReference* value);
-  void unsafe_arena_set_allocated_right_id(::io::deephaven::proto::backplane::grpc::TableReference* value);
-  ::io::deephaven::proto::backplane::grpc::TableReference* unsafe_arena_release_right_id();
-
-  private:
-  const ::io::deephaven::proto::backplane::grpc::TableReference& _internal_right_id() const;
-  ::io::deephaven::proto::backplane::grpc::TableReference* _internal_mutable_right_id();
-
-  public:
-  // bool inverted = 4;
-  void clear_inverted() ;
-  bool inverted() const;
-  void set_inverted(bool value);
-
-  private:
-  bool _internal_inverted() const;
-  void _internal_set_inverted(bool value);
-
-  public:
-  // @@protoc_insertion_point(class_scope:io.deephaven.proto.backplane.grpc.WhereInRequest)
- private:
-  class _Internal;
-
-  friend class ::google::protobuf::internal::TcParser;
-  static const ::google::protobuf::internal::TcParseTable<
-      3, 5, 3,
-      73, 2>
-      _table_;
-  friend class ::google::protobuf::MessageLite;
-  friend class ::google::protobuf::Arena;
-  template <typename T>
-  friend class ::google::protobuf::Arena::InternalHelper;
-  using InternalArenaConstructable_ = void;
-  using DestructorSkippable_ = void;
-  struct Impl_ {
-
-        inline explicit constexpr Impl_(
-            ::google::protobuf::internal::ConstantInitialized) noexcept;
-        inline explicit Impl_(::google::protobuf::internal::InternalVisibility visibility,
-                              ::google::protobuf::Arena* arena);
-        inline explicit Impl_(::google::protobuf::internal::InternalVisibility visibility,
-                              ::google::protobuf::Arena* arena, const Impl_& from);
-    ::google::protobuf::internal::HasBits<1> _has_bits_;
-    mutable ::google::protobuf::internal::CachedSize _cached_size_;
-    ::google::protobuf::RepeatedPtrField<std::string> columns_to_match_;
-    ::io::deephaven::proto::backplane::grpc::Ticket* result_id_;
-    ::io::deephaven::proto::backplane::grpc::TableReference* left_id_;
-    ::io::deephaven::proto::backplane::grpc::TableReference* right_id_;
-    bool inverted_;
-    PROTOBUF_TSAN_DECLARE_MEMBER
-  };
-  union { Impl_ _impl_; };
-  friend struct ::TableStruct_deephaven_2fproto_2ftable_2eproto;
-};// -------------------------------------------------------------------
-
-class UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingWAvg final :
-    public ::google::protobuf::Message /* @@protoc_insertion_point(class_definition:io.deephaven.proto.backplane.grpc.UpdateByRequest.UpdateByOperation.UpdateByColumn.UpdateBySpec.UpdateByRollingWAvg) */ {
- public:
-  inline UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingWAvg() : UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingWAvg(nullptr) {}
-  ~UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingWAvg() override;
-  template<typename = void>
-  explicit PROTOBUF_CONSTEXPR UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingWAvg(::google::protobuf::internal::ConstantInitialized);
-
-  inline UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingWAvg(const UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingWAvg& from)
-      : UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingWAvg(nullptr, from) {}
-  UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingWAvg(UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingWAvg&& from) noexcept
-    : UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingWAvg() {
-    *this = ::std::move(from);
-  }
-
-  inline UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingWAvg& operator=(const UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingWAvg& from) {
-    CopyFrom(from);
-    return *this;
-  }
-  inline UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingWAvg& operator=(UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingWAvg&& from) noexcept {
-    if (this == &from) return *this;
-    if (GetArena() == from.GetArena()
-  #ifdef PROTOBUF_FORCE_COPY_IN_MOVE
-        && GetArena() != nullptr
-  #endif  // !PROTOBUF_FORCE_COPY_IN_MOVE
-    ) {
-      InternalSwap(&from);
-    } else {
-      CopyFrom(from);
-    }
-    return *this;
-  }
-
-  inline const ::google::protobuf::UnknownFieldSet& unknown_fields() const
-      ABSL_ATTRIBUTE_LIFETIME_BOUND {
-    return _internal_metadata_.unknown_fields<::google::protobuf::UnknownFieldSet>(::google::protobuf::UnknownFieldSet::default_instance);
-  }
-  inline ::google::protobuf::UnknownFieldSet* mutable_unknown_fields()
-      ABSL_ATTRIBUTE_LIFETIME_BOUND {
-    return _internal_metadata_.mutable_unknown_fields<::google::protobuf::UnknownFieldSet>();
-  }
-
-  static const ::google::protobuf::Descriptor* descriptor() {
-    return GetDescriptor();
-  }
-  static const ::google::protobuf::Descriptor* GetDescriptor() {
-    return default_instance().GetMetadata().descriptor;
-  }
-  static const ::google::protobuf::Reflection* GetReflection() {
-    return default_instance().GetMetadata().reflection;
-  }
-  static const UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingWAvg& default_instance() {
-    return *internal_default_instance();
-  }
-  static inline const UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingWAvg* internal_default_instance() {
-    return reinterpret_cast<const UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingWAvg*>(
-               &_UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingWAvg_default_instance_);
-  }
-  static constexpr int kIndexInFileMessages =
-    35;
-
-  friend void swap(UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingWAvg& a, UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingWAvg& b) {
-    a.Swap(&b);
-  }
-  inline void Swap(UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingWAvg* other) {
-    if (other == this) return;
-  #ifdef PROTOBUF_FORCE_COPY_IN_SWAP
-    if (GetArena() != nullptr &&
-        GetArena() == other->GetArena()) {
-   #else  // PROTOBUF_FORCE_COPY_IN_SWAP
-    if (GetArena() == other->GetArena()) {
-  #endif  // !PROTOBUF_FORCE_COPY_IN_SWAP
-      InternalSwap(other);
-    } else {
-      ::google::protobuf::internal::GenericSwap(this, other);
-    }
-  }
-  void UnsafeArenaSwap(UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingWAvg* other) {
-    if (other == this) return;
-    ABSL_DCHECK(GetArena() == other->GetArena());
-    InternalSwap(other);
-  }
-
-  // implements Message ----------------------------------------------
-
-  UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingWAvg* New(::google::protobuf::Arena* arena = nullptr) const final {
-    return CreateMaybeMessage<UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingWAvg>(arena);
-  }
-  using ::google::protobuf::Message::CopyFrom;
-  void CopyFrom(const UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingWAvg& from);
-  using ::google::protobuf::Message::MergeFrom;
-  void MergeFrom( const UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingWAvg& from) {
-    UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingWAvg::MergeImpl(*this, from);
-  }
-  private:
-  static void MergeImpl(::google::protobuf::Message& to_msg, const ::google::protobuf::Message& from_msg);
-  public:
-  PROTOBUF_ATTRIBUTE_REINITIALIZES void Clear() final;
-  bool IsInitialized() const final;
-
-  ::size_t ByteSizeLong() const final;
-  const char* _InternalParse(const char* ptr, ::google::protobuf::internal::ParseContext* ctx) final;
-  ::uint8_t* _InternalSerialize(
-      ::uint8_t* target, ::google::protobuf::io::EpsCopyOutputStream* stream) const final;
-  int GetCachedSize() const { return _impl_._cached_size_.Get(); }
-
-  private:
-  ::google::protobuf::internal::CachedSize* AccessCachedSize() const final;
-  void SharedCtor(::google::protobuf::Arena* arena);
-  void SharedDtor();
-  void InternalSwap(UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingWAvg* other);
-
-  private:
-  friend class ::google::protobuf::internal::AnyMetadata;
-  static ::absl::string_view FullMessageName() {
-    return "io.deephaven.proto.backplane.grpc.UpdateByRequest.UpdateByOperation.UpdateByColumn.UpdateBySpec.UpdateByRollingWAvg";
-  }
-  protected:
-  explicit UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingWAvg(::google::protobuf::Arena* arena);
-  UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingWAvg(::google::protobuf::Arena* arena, const UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingWAvg& from);
-  public:
-
-  static const ClassData _class_data_;
-  const ::google::protobuf::Message::ClassData*GetClassData() const final;
-
-  ::google::protobuf::Metadata GetMetadata() const final;
-
-  // nested types ----------------------------------------------------
-
-  // accessors -------------------------------------------------------
-
-  enum : int {
-    kWeightColumnFieldNumber = 3,
-    kReverseWindowScaleFieldNumber = 1,
-    kForwardWindowScaleFieldNumber = 2,
-  };
-  // string weight_column = 3;
-  void clear_weight_column() ;
-  const std::string& weight_column() const;
-  template <typename Arg_ = const std::string&, typename... Args_>
-  void set_weight_column(Arg_&& arg, Args_... args);
-  std::string* mutable_weight_column();
-  PROTOBUF_NODISCARD std::string* release_weight_column();
-  void set_allocated_weight_column(std::string* value);
-
-  private:
-  const std::string& _internal_weight_column() const;
-  inline PROTOBUF_ALWAYS_INLINE void _internal_set_weight_column(
-      const std::string& value);
-  std::string* _internal_mutable_weight_column();
-
-  public:
-  // .io.deephaven.proto.backplane.grpc.UpdateByWindowScale reverse_window_scale = 1;
-  bool has_reverse_window_scale() const;
-  void clear_reverse_window_scale() ;
-  const ::io::deephaven::proto::backplane::grpc::UpdateByWindowScale& reverse_window_scale() const;
-  PROTOBUF_NODISCARD ::io::deephaven::proto::backplane::grpc::UpdateByWindowScale* release_reverse_window_scale();
-  ::io::deephaven::proto::backplane::grpc::UpdateByWindowScale* mutable_reverse_window_scale();
-  void set_allocated_reverse_window_scale(::io::deephaven::proto::backplane::grpc::UpdateByWindowScale* value);
-  void unsafe_arena_set_allocated_reverse_window_scale(::io::deephaven::proto::backplane::grpc::UpdateByWindowScale* value);
-  ::io::deephaven::proto::backplane::grpc::UpdateByWindowScale* unsafe_arena_release_reverse_window_scale();
-
-  private:
-  const ::io::deephaven::proto::backplane::grpc::UpdateByWindowScale& _internal_reverse_window_scale() const;
-  ::io::deephaven::proto::backplane::grpc::UpdateByWindowScale* _internal_mutable_reverse_window_scale();
-
-  public:
-  // .io.deephaven.proto.backplane.grpc.UpdateByWindowScale forward_window_scale = 2;
-  bool has_forward_window_scale() const;
-  void clear_forward_window_scale() ;
-  const ::io::deephaven::proto::backplane::grpc::UpdateByWindowScale& forward_window_scale() const;
-  PROTOBUF_NODISCARD ::io::deephaven::proto::backplane::grpc::UpdateByWindowScale* release_forward_window_scale();
-  ::io::deephaven::proto::backplane::grpc::UpdateByWindowScale* mutable_forward_window_scale();
-  void set_allocated_forward_window_scale(::io::deephaven::proto::backplane::grpc::UpdateByWindowScale* value);
-  void unsafe_arena_set_allocated_forward_window_scale(::io::deephaven::proto::backplane::grpc::UpdateByWindowScale* value);
-  ::io::deephaven::proto::backplane::grpc::UpdateByWindowScale* unsafe_arena_release_forward_window_scale();
-
-  private:
-  const ::io::deephaven::proto::backplane::grpc::UpdateByWindowScale& _internal_forward_window_scale() const;
-  ::io::deephaven::proto::backplane::grpc::UpdateByWindowScale* _internal_mutable_forward_window_scale();
-
-  public:
-  // @@protoc_insertion_point(class_scope:io.deephaven.proto.backplane.grpc.UpdateByRequest.UpdateByOperation.UpdateByColumn.UpdateBySpec.UpdateByRollingWAvg)
- private:
-  class _Internal;
-
-  friend class ::google::protobuf::internal::TcParser;
-  static const ::google::protobuf::internal::TcParseTable<
-      2, 3, 2,
-      137, 2>
-      _table_;
-  friend class ::google::protobuf::MessageLite;
-  friend class ::google::protobuf::Arena;
-  template <typename T>
-  friend class ::google::protobuf::Arena::InternalHelper;
-  using InternalArenaConstructable_ = void;
-  using DestructorSkippable_ = void;
-  struct Impl_ {
-
-        inline explicit constexpr Impl_(
-            ::google::protobuf::internal::ConstantInitialized) noexcept;
-        inline explicit Impl_(::google::protobuf::internal::InternalVisibility visibility,
-                              ::google::protobuf::Arena* arena);
-        inline explicit Impl_(::google::protobuf::internal::InternalVisibility visibility,
-                              ::google::protobuf::Arena* arena, const Impl_& from);
-    ::google::protobuf::internal::HasBits<1> _has_bits_;
-    mutable ::google::protobuf::internal::CachedSize _cached_size_;
-    ::google::protobuf::internal::ArenaStringPtr weight_column_;
-    ::io::deephaven::proto::backplane::grpc::UpdateByWindowScale* reverse_window_scale_;
-    ::io::deephaven::proto::backplane::grpc::UpdateByWindowScale* forward_window_scale_;
-    PROTOBUF_TSAN_DECLARE_MEMBER
-  };
-  union { Impl_ _impl_; };
-  friend struct ::TableStruct_deephaven_2fproto_2ftable_2eproto;
-};// -------------------------------------------------------------------
-
-class UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingSum final :
-    public ::google::protobuf::Message /* @@protoc_insertion_point(class_definition:io.deephaven.proto.backplane.grpc.UpdateByRequest.UpdateByOperation.UpdateByColumn.UpdateBySpec.UpdateByRollingSum) */ {
- public:
-  inline UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingSum() : UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingSum(nullptr) {}
-  ~UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingSum() override;
-  template<typename = void>
-  explicit PROTOBUF_CONSTEXPR UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingSum(::google::protobuf::internal::ConstantInitialized);
-
-  inline UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingSum(const UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingSum& from)
-      : UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingSum(nullptr, from) {}
-  UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingSum(UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingSum&& from) noexcept
-    : UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingSum() {
-    *this = ::std::move(from);
-  }
-
-  inline UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingSum& operator=(const UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingSum& from) {
-    CopyFrom(from);
-    return *this;
-  }
-  inline UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingSum& operator=(UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingSum&& from) noexcept {
-    if (this == &from) return *this;
-    if (GetArena() == from.GetArena()
-  #ifdef PROTOBUF_FORCE_COPY_IN_MOVE
-        && GetArena() != nullptr
-  #endif  // !PROTOBUF_FORCE_COPY_IN_MOVE
-    ) {
-      InternalSwap(&from);
-    } else {
-      CopyFrom(from);
-    }
-    return *this;
-  }
-
-  inline const ::google::protobuf::UnknownFieldSet& unknown_fields() const
-      ABSL_ATTRIBUTE_LIFETIME_BOUND {
-    return _internal_metadata_.unknown_fields<::google::protobuf::UnknownFieldSet>(::google::protobuf::UnknownFieldSet::default_instance);
-  }
-  inline ::google::protobuf::UnknownFieldSet* mutable_unknown_fields()
-      ABSL_ATTRIBUTE_LIFETIME_BOUND {
-    return _internal_metadata_.mutable_unknown_fields<::google::protobuf::UnknownFieldSet>();
-  }
-
-  static const ::google::protobuf::Descriptor* descriptor() {
-    return GetDescriptor();
-  }
-  static const ::google::protobuf::Descriptor* GetDescriptor() {
-    return default_instance().GetMetadata().descriptor;
-  }
-  static const ::google::protobuf::Reflection* GetReflection() {
-    return default_instance().GetMetadata().reflection;
-  }
-  static const UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingSum& default_instance() {
-    return *internal_default_instance();
-  }
-  static inline const UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingSum* internal_default_instance() {
-    return reinterpret_cast<const UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingSum*>(
-               &_UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingSum_default_instance_);
-  }
-  static constexpr int kIndexInFileMessages =
-    27;
-
-  friend void swap(UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingSum& a, UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingSum& b) {
-    a.Swap(&b);
-  }
-  inline void Swap(UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingSum* other) {
-    if (other == this) return;
-  #ifdef PROTOBUF_FORCE_COPY_IN_SWAP
-    if (GetArena() != nullptr &&
-        GetArena() == other->GetArena()) {
-   #else  // PROTOBUF_FORCE_COPY_IN_SWAP
-    if (GetArena() == other->GetArena()) {
-  #endif  // !PROTOBUF_FORCE_COPY_IN_SWAP
-      InternalSwap(other);
-    } else {
-      ::google::protobuf::internal::GenericSwap(this, other);
-    }
-  }
-  void UnsafeArenaSwap(UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingSum* other) {
-    if (other == this) return;
-    ABSL_DCHECK(GetArena() == other->GetArena());
-    InternalSwap(other);
-  }
-
-  // implements Message ----------------------------------------------
-
-  UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingSum* New(::google::protobuf::Arena* arena = nullptr) const final {
-    return CreateMaybeMessage<UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingSum>(arena);
-  }
-  using ::google::protobuf::Message::CopyFrom;
-  void CopyFrom(const UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingSum& from);
-  using ::google::protobuf::Message::MergeFrom;
-  void MergeFrom( const UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingSum& from) {
-    UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingSum::MergeImpl(*this, from);
-  }
-  private:
-  static void MergeImpl(::google::protobuf::Message& to_msg, const ::google::protobuf::Message& from_msg);
-  public:
-  PROTOBUF_ATTRIBUTE_REINITIALIZES void Clear() final;
-  bool IsInitialized() const final;
-
-  ::size_t ByteSizeLong() const final;
-  const char* _InternalParse(const char* ptr, ::google::protobuf::internal::ParseContext* ctx) final;
-  ::uint8_t* _InternalSerialize(
-      ::uint8_t* target, ::google::protobuf::io::EpsCopyOutputStream* stream) const final;
-  int GetCachedSize() const { return _impl_._cached_size_.Get(); }
-
-  private:
-  ::google::protobuf::internal::CachedSize* AccessCachedSize() const final;
-  void SharedCtor(::google::protobuf::Arena* arena);
-  void SharedDtor();
-  void InternalSwap(UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingSum* other);
-
-  private:
-  friend class ::google::protobuf::internal::AnyMetadata;
-  static ::absl::string_view FullMessageName() {
-    return "io.deephaven.proto.backplane.grpc.UpdateByRequest.UpdateByOperation.UpdateByColumn.UpdateBySpec.UpdateByRollingSum";
-  }
-  protected:
-  explicit UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingSum(::google::protobuf::Arena* arena);
-  UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingSum(::google::protobuf::Arena* arena, const UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingSum& from);
-  public:
-
-  static const ClassData _class_data_;
-  const ::google::protobuf::Message::ClassData*GetClassData() const final;
-
-  ::google::protobuf::Metadata GetMetadata() const final;
-
-  // nested types ----------------------------------------------------
-
-  // accessors -------------------------------------------------------
-
-  enum : int {
-    kReverseWindowScaleFieldNumber = 1,
-    kForwardWindowScaleFieldNumber = 2,
-  };
-  // .io.deephaven.proto.backplane.grpc.UpdateByWindowScale reverse_window_scale = 1;
-  bool has_reverse_window_scale() const;
-  void clear_reverse_window_scale() ;
-  const ::io::deephaven::proto::backplane::grpc::UpdateByWindowScale& reverse_window_scale() const;
-  PROTOBUF_NODISCARD ::io::deephaven::proto::backplane::grpc::UpdateByWindowScale* release_reverse_window_scale();
-  ::io::deephaven::proto::backplane::grpc::UpdateByWindowScale* mutable_reverse_window_scale();
-  void set_allocated_reverse_window_scale(::io::deephaven::proto::backplane::grpc::UpdateByWindowScale* value);
-  void unsafe_arena_set_allocated_reverse_window_scale(::io::deephaven::proto::backplane::grpc::UpdateByWindowScale* value);
-  ::io::deephaven::proto::backplane::grpc::UpdateByWindowScale* unsafe_arena_release_reverse_window_scale();
-
-  private:
-  const ::io::deephaven::proto::backplane::grpc::UpdateByWindowScale& _internal_reverse_window_scale() const;
-  ::io::deephaven::proto::backplane::grpc::UpdateByWindowScale* _internal_mutable_reverse_window_scale();
-
-  public:
-  // .io.deephaven.proto.backplane.grpc.UpdateByWindowScale forward_window_scale = 2;
-  bool has_forward_window_scale() const;
-  void clear_forward_window_scale() ;
-  const ::io::deephaven::proto::backplane::grpc::UpdateByWindowScale& forward_window_scale() const;
-  PROTOBUF_NODISCARD ::io::deephaven::proto::backplane::grpc::UpdateByWindowScale* release_forward_window_scale();
-  ::io::deephaven::proto::backplane::grpc::UpdateByWindowScale* mutable_forward_window_scale();
-  void set_allocated_forward_window_scale(::io::deephaven::proto::backplane::grpc::UpdateByWindowScale* value);
-  void unsafe_arena_set_allocated_forward_window_scale(::io::deephaven::proto::backplane::grpc::UpdateByWindowScale* value);
-  ::io::deephaven::proto::backplane::grpc::UpdateByWindowScale* unsafe_arena_release_forward_window_scale();
-
-  private:
-  const ::io::deephaven::proto::backplane::grpc::UpdateByWindowScale& _internal_forward_window_scale() const;
-  ::io::deephaven::proto::backplane::grpc::UpdateByWindowScale* _internal_mutable_forward_window_scale();
-
-  public:
-  // @@protoc_insertion_point(class_scope:io.deephaven.proto.backplane.grpc.UpdateByRequest.UpdateByOperation.UpdateByColumn.UpdateBySpec.UpdateByRollingSum)
- private:
-  class _Internal;
-
-  friend class ::google::protobuf::internal::TcParser;
-  static const ::google::protobuf::internal::TcParseTable<
-      1, 2, 2,
-      0, 2>
-      _table_;
-  friend class ::google::protobuf::MessageLite;
-  friend class ::google::protobuf::Arena;
-  template <typename T>
-  friend class ::google::protobuf::Arena::InternalHelper;
-  using InternalArenaConstructable_ = void;
-  using DestructorSkippable_ = void;
-  struct Impl_ {
-
-        inline explicit constexpr Impl_(
-            ::google::protobuf::internal::ConstantInitialized) noexcept;
-        inline explicit Impl_(::google::protobuf::internal::InternalVisibility visibility,
-                              ::google::protobuf::Arena* arena);
-        inline explicit Impl_(::google::protobuf::internal::InternalVisibility visibility,
-                              ::google::protobuf::Arena* arena, const Impl_& from);
-    ::google::protobuf::internal::HasBits<1> _has_bits_;
-    mutable ::google::protobuf::internal::CachedSize _cached_size_;
-    ::io::deephaven::proto::backplane::grpc::UpdateByWindowScale* reverse_window_scale_;
-    ::io::deephaven::proto::backplane::grpc::UpdateByWindowScale* forward_window_scale_;
-    PROTOBUF_TSAN_DECLARE_MEMBER
-  };
-  union { Impl_ _impl_; };
-  friend struct ::TableStruct_deephaven_2fproto_2ftable_2eproto;
-};// -------------------------------------------------------------------
-
-class UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingStd final :
-    public ::google::protobuf::Message /* @@protoc_insertion_point(class_definition:io.deephaven.proto.backplane.grpc.UpdateByRequest.UpdateByOperation.UpdateByColumn.UpdateBySpec.UpdateByRollingStd) */ {
- public:
-  inline UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingStd() : UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingStd(nullptr) {}
-  ~UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingStd() override;
-  template<typename = void>
-  explicit PROTOBUF_CONSTEXPR UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingStd(::google::protobuf::internal::ConstantInitialized);
-
-  inline UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingStd(const UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingStd& from)
-      : UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingStd(nullptr, from) {}
-  UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingStd(UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingStd&& from) noexcept
-    : UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingStd() {
-    *this = ::std::move(from);
-  }
-
-  inline UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingStd& operator=(const UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingStd& from) {
-    CopyFrom(from);
-    return *this;
-  }
-  inline UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingStd& operator=(UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingStd&& from) noexcept {
-    if (this == &from) return *this;
-    if (GetArena() == from.GetArena()
-  #ifdef PROTOBUF_FORCE_COPY_IN_MOVE
-        && GetArena() != nullptr
-  #endif  // !PROTOBUF_FORCE_COPY_IN_MOVE
-    ) {
-      InternalSwap(&from);
-    } else {
-      CopyFrom(from);
-    }
-    return *this;
-  }
-
-  inline const ::google::protobuf::UnknownFieldSet& unknown_fields() const
-      ABSL_ATTRIBUTE_LIFETIME_BOUND {
-    return _internal_metadata_.unknown_fields<::google::protobuf::UnknownFieldSet>(::google::protobuf::UnknownFieldSet::default_instance);
-  }
-  inline ::google::protobuf::UnknownFieldSet* mutable_unknown_fields()
-      ABSL_ATTRIBUTE_LIFETIME_BOUND {
-    return _internal_metadata_.mutable_unknown_fields<::google::protobuf::UnknownFieldSet>();
-  }
-
-  static const ::google::protobuf::Descriptor* descriptor() {
-    return GetDescriptor();
-  }
-  static const ::google::protobuf::Descriptor* GetDescriptor() {
-    return default_instance().GetMetadata().descriptor;
-  }
-  static const ::google::protobuf::Reflection* GetReflection() {
-    return default_instance().GetMetadata().reflection;
-  }
-  static const UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingStd& default_instance() {
-    return *internal_default_instance();
-  }
-  static inline const UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingStd* internal_default_instance() {
-    return reinterpret_cast<const UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingStd*>(
-               &_UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingStd_default_instance_);
-  }
-  static constexpr int kIndexInFileMessages =
-    34;
-
-  friend void swap(UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingStd& a, UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingStd& b) {
-    a.Swap(&b);
-  }
-  inline void Swap(UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingStd* other) {
-    if (other == this) return;
-  #ifdef PROTOBUF_FORCE_COPY_IN_SWAP
-    if (GetArena() != nullptr &&
-        GetArena() == other->GetArena()) {
-   #else  // PROTOBUF_FORCE_COPY_IN_SWAP
-    if (GetArena() == other->GetArena()) {
-  #endif  // !PROTOBUF_FORCE_COPY_IN_SWAP
-      InternalSwap(other);
-    } else {
-      ::google::protobuf::internal::GenericSwap(this, other);
-    }
-  }
-  void UnsafeArenaSwap(UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingStd* other) {
-    if (other == this) return;
-    ABSL_DCHECK(GetArena() == other->GetArena());
-    InternalSwap(other);
-  }
-
-  // implements Message ----------------------------------------------
-
-  UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingStd* New(::google::protobuf::Arena* arena = nullptr) const final {
-    return CreateMaybeMessage<UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingStd>(arena);
-  }
-  using ::google::protobuf::Message::CopyFrom;
-  void CopyFrom(const UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingStd& from);
-  using ::google::protobuf::Message::MergeFrom;
-  void MergeFrom( const UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingStd& from) {
-    UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingStd::MergeImpl(*this, from);
-  }
-  private:
-  static void MergeImpl(::google::protobuf::Message& to_msg, const ::google::protobuf::Message& from_msg);
-  public:
-  PROTOBUF_ATTRIBUTE_REINITIALIZES void Clear() final;
-  bool IsInitialized() const final;
-
-  ::size_t ByteSizeLong() const final;
-  const char* _InternalParse(const char* ptr, ::google::protobuf::internal::ParseContext* ctx) final;
-  ::uint8_t* _InternalSerialize(
-      ::uint8_t* target, ::google::protobuf::io::EpsCopyOutputStream* stream) const final;
-  int GetCachedSize() const { return _impl_._cached_size_.Get(); }
-
-  private:
-  ::google::protobuf::internal::CachedSize* AccessCachedSize() const final;
-  void SharedCtor(::google::protobuf::Arena* arena);
-  void SharedDtor();
-  void InternalSwap(UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingStd* other);
-
-  private:
-  friend class ::google::protobuf::internal::AnyMetadata;
-  static ::absl::string_view FullMessageName() {
-    return "io.deephaven.proto.backplane.grpc.UpdateByRequest.UpdateByOperation.UpdateByColumn.UpdateBySpec.UpdateByRollingStd";
-  }
-  protected:
-  explicit UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingStd(::google::protobuf::Arena* arena);
-  UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingStd(::google::protobuf::Arena* arena, const UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingStd& from);
-  public:
-
-  static const ClassData _class_data_;
-  const ::google::protobuf::Message::ClassData*GetClassData() const final;
-
-  ::google::protobuf::Metadata GetMetadata() const final;
-
-  // nested types ----------------------------------------------------
-
-  // accessors -------------------------------------------------------
-
-  enum : int {
-    kReverseWindowScaleFieldNumber = 1,
-    kForwardWindowScaleFieldNumber = 2,
-  };
-  // .io.deephaven.proto.backplane.grpc.UpdateByWindowScale reverse_window_scale = 1;
-  bool has_reverse_window_scale() const;
-  void clear_reverse_window_scale() ;
-  const ::io::deephaven::proto::backplane::grpc::UpdateByWindowScale& reverse_window_scale() const;
-  PROTOBUF_NODISCARD ::io::deephaven::proto::backplane::grpc::UpdateByWindowScale* release_reverse_window_scale();
-  ::io::deephaven::proto::backplane::grpc::UpdateByWindowScale* mutable_reverse_window_scale();
-  void set_allocated_reverse_window_scale(::io::deephaven::proto::backplane::grpc::UpdateByWindowScale* value);
-  void unsafe_arena_set_allocated_reverse_window_scale(::io::deephaven::proto::backplane::grpc::UpdateByWindowScale* value);
-  ::io::deephaven::proto::backplane::grpc::UpdateByWindowScale* unsafe_arena_release_reverse_window_scale();
-
-  private:
-  const ::io::deephaven::proto::backplane::grpc::UpdateByWindowScale& _internal_reverse_window_scale() const;
-  ::io::deephaven::proto::backplane::grpc::UpdateByWindowScale* _internal_mutable_reverse_window_scale();
-
-  public:
-  // .io.deephaven.proto.backplane.grpc.UpdateByWindowScale forward_window_scale = 2;
-  bool has_forward_window_scale() const;
-  void clear_forward_window_scale() ;
-  const ::io::deephaven::proto::backplane::grpc::UpdateByWindowScale& forward_window_scale() const;
-  PROTOBUF_NODISCARD ::io::deephaven::proto::backplane::grpc::UpdateByWindowScale* release_forward_window_scale();
-  ::io::deephaven::proto::backplane::grpc::UpdateByWindowScale* mutable_forward_window_scale();
-  void set_allocated_forward_window_scale(::io::deephaven::proto::backplane::grpc::UpdateByWindowScale* value);
-  void unsafe_arena_set_allocated_forward_window_scale(::io::deephaven::proto::backplane::grpc::UpdateByWindowScale* value);
-  ::io::deephaven::proto::backplane::grpc::UpdateByWindowScale* unsafe_arena_release_forward_window_scale();
-
-  private:
-  const ::io::deephaven::proto::backplane::grpc::UpdateByWindowScale& _internal_forward_window_scale() const;
-  ::io::deephaven::proto::backplane::grpc::UpdateByWindowScale* _internal_mutable_forward_window_scale();
-
-  public:
-  // @@protoc_insertion_point(class_scope:io.deephaven.proto.backplane.grpc.UpdateByRequest.UpdateByOperation.UpdateByColumn.UpdateBySpec.UpdateByRollingStd)
- private:
-  class _Internal;
-
-  friend class ::google::protobuf::internal::TcParser;
-  static const ::google::protobuf::internal::TcParseTable<
-      1, 2, 2,
-      0, 2>
-      _table_;
-  friend class ::google::protobuf::MessageLite;
-  friend class ::google::protobuf::Arena;
-  template <typename T>
-  friend class ::google::protobuf::Arena::InternalHelper;
-  using InternalArenaConstructable_ = void;
-  using DestructorSkippable_ = void;
-  struct Impl_ {
-
-        inline explicit constexpr Impl_(
-            ::google::protobuf::internal::ConstantInitialized) noexcept;
-        inline explicit Impl_(::google::protobuf::internal::InternalVisibility visibility,
-                              ::google::protobuf::Arena* arena);
-        inline explicit Impl_(::google::protobuf::internal::InternalVisibility visibility,
-                              ::google::protobuf::Arena* arena, const Impl_& from);
-    ::google::protobuf::internal::HasBits<1> _has_bits_;
-    mutable ::google::protobuf::internal::CachedSize _cached_size_;
-    ::io::deephaven::proto::backplane::grpc::UpdateByWindowScale* reverse_window_scale_;
-    ::io::deephaven::proto::backplane::grpc::UpdateByWindowScale* forward_window_scale_;
-    PROTOBUF_TSAN_DECLARE_MEMBER
-  };
-  union { Impl_ _impl_; };
-  friend struct ::TableStruct_deephaven_2fproto_2ftable_2eproto;
-};// -------------------------------------------------------------------
-
-class UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingProduct final :
-    public ::google::protobuf::Message /* @@protoc_insertion_point(class_definition:io.deephaven.proto.backplane.grpc.UpdateByRequest.UpdateByOperation.UpdateByColumn.UpdateBySpec.UpdateByRollingProduct) */ {
- public:
-  inline UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingProduct() : UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingProduct(nullptr) {}
-  ~UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingProduct() override;
-  template<typename = void>
-  explicit PROTOBUF_CONSTEXPR UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingProduct(::google::protobuf::internal::ConstantInitialized);
-
-  inline UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingProduct(const UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingProduct& from)
-      : UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingProduct(nullptr, from) {}
-  UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingProduct(UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingProduct&& from) noexcept
-    : UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingProduct() {
-    *this = ::std::move(from);
-  }
-
-  inline UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingProduct& operator=(const UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingProduct& from) {
-    CopyFrom(from);
-    return *this;
-  }
-  inline UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingProduct& operator=(UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingProduct&& from) noexcept {
-    if (this == &from) return *this;
-    if (GetArena() == from.GetArena()
-  #ifdef PROTOBUF_FORCE_COPY_IN_MOVE
-        && GetArena() != nullptr
-  #endif  // !PROTOBUF_FORCE_COPY_IN_MOVE
-    ) {
-      InternalSwap(&from);
-    } else {
-      CopyFrom(from);
-    }
-    return *this;
-  }
-
-  inline const ::google::protobuf::UnknownFieldSet& unknown_fields() const
-      ABSL_ATTRIBUTE_LIFETIME_BOUND {
-    return _internal_metadata_.unknown_fields<::google::protobuf::UnknownFieldSet>(::google::protobuf::UnknownFieldSet::default_instance);
-  }
-  inline ::google::protobuf::UnknownFieldSet* mutable_unknown_fields()
-      ABSL_ATTRIBUTE_LIFETIME_BOUND {
-    return _internal_metadata_.mutable_unknown_fields<::google::protobuf::UnknownFieldSet>();
-  }
-
-  static const ::google::protobuf::Descriptor* descriptor() {
-    return GetDescriptor();
-  }
-  static const ::google::protobuf::Descriptor* GetDescriptor() {
-    return default_instance().GetMetadata().descriptor;
-  }
-  static const ::google::protobuf::Reflection* GetReflection() {
-    return default_instance().GetMetadata().reflection;
-  }
-  static const UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingProduct& default_instance() {
-    return *internal_default_instance();
-  }
-  static inline const UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingProduct* internal_default_instance() {
-    return reinterpret_cast<const UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingProduct*>(
-               &_UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingProduct_default_instance_);
-  }
-  static constexpr int kIndexInFileMessages =
-    32;
-
-  friend void swap(UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingProduct& a, UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingProduct& b) {
-    a.Swap(&b);
-  }
-  inline void Swap(UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingProduct* other) {
-    if (other == this) return;
-  #ifdef PROTOBUF_FORCE_COPY_IN_SWAP
-    if (GetArena() != nullptr &&
-        GetArena() == other->GetArena()) {
-   #else  // PROTOBUF_FORCE_COPY_IN_SWAP
-    if (GetArena() == other->GetArena()) {
-  #endif  // !PROTOBUF_FORCE_COPY_IN_SWAP
-      InternalSwap(other);
-    } else {
-      ::google::protobuf::internal::GenericSwap(this, other);
-    }
-  }
-  void UnsafeArenaSwap(UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingProduct* other) {
-    if (other == this) return;
-    ABSL_DCHECK(GetArena() == other->GetArena());
-    InternalSwap(other);
-  }
-
-  // implements Message ----------------------------------------------
-
-  UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingProduct* New(::google::protobuf::Arena* arena = nullptr) const final {
-    return CreateMaybeMessage<UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingProduct>(arena);
-  }
-  using ::google::protobuf::Message::CopyFrom;
-  void CopyFrom(const UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingProduct& from);
-  using ::google::protobuf::Message::MergeFrom;
-  void MergeFrom( const UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingProduct& from) {
-    UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingProduct::MergeImpl(*this, from);
-  }
-  private:
-  static void MergeImpl(::google::protobuf::Message& to_msg, const ::google::protobuf::Message& from_msg);
-  public:
-  PROTOBUF_ATTRIBUTE_REINITIALIZES void Clear() final;
-  bool IsInitialized() const final;
-
-  ::size_t ByteSizeLong() const final;
-  const char* _InternalParse(const char* ptr, ::google::protobuf::internal::ParseContext* ctx) final;
-  ::uint8_t* _InternalSerialize(
-      ::uint8_t* target, ::google::protobuf::io::EpsCopyOutputStream* stream) const final;
-  int GetCachedSize() const { return _impl_._cached_size_.Get(); }
-
-  private:
-  ::google::protobuf::internal::CachedSize* AccessCachedSize() const final;
-  void SharedCtor(::google::protobuf::Arena* arena);
-  void SharedDtor();
-  void InternalSwap(UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingProduct* other);
-
-  private:
-  friend class ::google::protobuf::internal::AnyMetadata;
-  static ::absl::string_view FullMessageName() {
-    return "io.deephaven.proto.backplane.grpc.UpdateByRequest.UpdateByOperation.UpdateByColumn.UpdateBySpec.UpdateByRollingProduct";
-  }
-  protected:
-  explicit UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingProduct(::google::protobuf::Arena* arena);
-  UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingProduct(::google::protobuf::Arena* arena, const UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingProduct& from);
-  public:
-
-  static const ClassData _class_data_;
-  const ::google::protobuf::Message::ClassData*GetClassData() const final;
-
-  ::google::protobuf::Metadata GetMetadata() const final;
-
-  // nested types ----------------------------------------------------
-
-  // accessors -------------------------------------------------------
-
-  enum : int {
-    kReverseWindowScaleFieldNumber = 1,
-    kForwardWindowScaleFieldNumber = 2,
-  };
-  // .io.deephaven.proto.backplane.grpc.UpdateByWindowScale reverse_window_scale = 1;
-  bool has_reverse_window_scale() const;
-  void clear_reverse_window_scale() ;
-  const ::io::deephaven::proto::backplane::grpc::UpdateByWindowScale& reverse_window_scale() const;
-  PROTOBUF_NODISCARD ::io::deephaven::proto::backplane::grpc::UpdateByWindowScale* release_reverse_window_scale();
-  ::io::deephaven::proto::backplane::grpc::UpdateByWindowScale* mutable_reverse_window_scale();
-  void set_allocated_reverse_window_scale(::io::deephaven::proto::backplane::grpc::UpdateByWindowScale* value);
-  void unsafe_arena_set_allocated_reverse_window_scale(::io::deephaven::proto::backplane::grpc::UpdateByWindowScale* value);
-  ::io::deephaven::proto::backplane::grpc::UpdateByWindowScale* unsafe_arena_release_reverse_window_scale();
-
-  private:
-  const ::io::deephaven::proto::backplane::grpc::UpdateByWindowScale& _internal_reverse_window_scale() const;
-  ::io::deephaven::proto::backplane::grpc::UpdateByWindowScale* _internal_mutable_reverse_window_scale();
-
-  public:
-  // .io.deephaven.proto.backplane.grpc.UpdateByWindowScale forward_window_scale = 2;
-  bool has_forward_window_scale() const;
-  void clear_forward_window_scale() ;
-  const ::io::deephaven::proto::backplane::grpc::UpdateByWindowScale& forward_window_scale() const;
-  PROTOBUF_NODISCARD ::io::deephaven::proto::backplane::grpc::UpdateByWindowScale* release_forward_window_scale();
-  ::io::deephaven::proto::backplane::grpc::UpdateByWindowScale* mutable_forward_window_scale();
-  void set_allocated_forward_window_scale(::io::deephaven::proto::backplane::grpc::UpdateByWindowScale* value);
-  void unsafe_arena_set_allocated_forward_window_scale(::io::deephaven::proto::backplane::grpc::UpdateByWindowScale* value);
-  ::io::deephaven::proto::backplane::grpc::UpdateByWindowScale* unsafe_arena_release_forward_window_scale();
-
-  private:
-  const ::io::deephaven::proto::backplane::grpc::UpdateByWindowScale& _internal_forward_window_scale() const;
-  ::io::deephaven::proto::backplane::grpc::UpdateByWindowScale* _internal_mutable_forward_window_scale();
-
-  public:
-  // @@protoc_insertion_point(class_scope:io.deephaven.proto.backplane.grpc.UpdateByRequest.UpdateByOperation.UpdateByColumn.UpdateBySpec.UpdateByRollingProduct)
- private:
-  class _Internal;
-
-  friend class ::google::protobuf::internal::TcParser;
-  static const ::google::protobuf::internal::TcParseTable<
-      1, 2, 2,
-      0, 2>
-      _table_;
-  friend class ::google::protobuf::MessageLite;
-  friend class ::google::protobuf::Arena;
-  template <typename T>
-  friend class ::google::protobuf::Arena::InternalHelper;
-  using InternalArenaConstructable_ = void;
-  using DestructorSkippable_ = void;
-  struct Impl_ {
-
-        inline explicit constexpr Impl_(
-            ::google::protobuf::internal::ConstantInitialized) noexcept;
-        inline explicit Impl_(::google::protobuf::internal::InternalVisibility visibility,
-                              ::google::protobuf::Arena* arena);
-        inline explicit Impl_(::google::protobuf::internal::InternalVisibility visibility,
-                              ::google::protobuf::Arena* arena, const Impl_& from);
-    ::google::protobuf::internal::HasBits<1> _has_bits_;
-    mutable ::google::protobuf::internal::CachedSize _cached_size_;
-    ::io::deephaven::proto::backplane::grpc::UpdateByWindowScale* reverse_window_scale_;
-    ::io::deephaven::proto::backplane::grpc::UpdateByWindowScale* forward_window_scale_;
-    PROTOBUF_TSAN_DECLARE_MEMBER
-  };
-  union { Impl_ _impl_; };
-  friend struct ::TableStruct_deephaven_2fproto_2ftable_2eproto;
-};// -------------------------------------------------------------------
-
-class UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingMin final :
-    public ::google::protobuf::Message /* @@protoc_insertion_point(class_definition:io.deephaven.proto.backplane.grpc.UpdateByRequest.UpdateByOperation.UpdateByColumn.UpdateBySpec.UpdateByRollingMin) */ {
- public:
-  inline UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingMin() : UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingMin(nullptr) {}
-  ~UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingMin() override;
-  template<typename = void>
-  explicit PROTOBUF_CONSTEXPR UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingMin(::google::protobuf::internal::ConstantInitialized);
-
-  inline UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingMin(const UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingMin& from)
-      : UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingMin(nullptr, from) {}
-  UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingMin(UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingMin&& from) noexcept
-    : UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingMin() {
-    *this = ::std::move(from);
-  }
-
-  inline UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingMin& operator=(const UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingMin& from) {
-    CopyFrom(from);
-    return *this;
-  }
-  inline UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingMin& operator=(UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingMin&& from) noexcept {
-    if (this == &from) return *this;
-    if (GetArena() == from.GetArena()
-  #ifdef PROTOBUF_FORCE_COPY_IN_MOVE
-        && GetArena() != nullptr
-  #endif  // !PROTOBUF_FORCE_COPY_IN_MOVE
-    ) {
-      InternalSwap(&from);
-    } else {
-      CopyFrom(from);
-    }
-    return *this;
-  }
-
-  inline const ::google::protobuf::UnknownFieldSet& unknown_fields() const
-      ABSL_ATTRIBUTE_LIFETIME_BOUND {
-    return _internal_metadata_.unknown_fields<::google::protobuf::UnknownFieldSet>(::google::protobuf::UnknownFieldSet::default_instance);
-  }
-  inline ::google::protobuf::UnknownFieldSet* mutable_unknown_fields()
-      ABSL_ATTRIBUTE_LIFETIME_BOUND {
-    return _internal_metadata_.mutable_unknown_fields<::google::protobuf::UnknownFieldSet>();
-  }
-
-  static const ::google::protobuf::Descriptor* descriptor() {
-    return GetDescriptor();
-  }
-  static const ::google::protobuf::Descriptor* GetDescriptor() {
-    return default_instance().GetMetadata().descriptor;
-  }
-  static const ::google::protobuf::Reflection* GetReflection() {
-    return default_instance().GetMetadata().reflection;
-  }
-  static const UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingMin& default_instance() {
-    return *internal_default_instance();
-  }
-  static inline const UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingMin* internal_default_instance() {
-    return reinterpret_cast<const UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingMin*>(
-               &_UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingMin_default_instance_);
-  }
-  static constexpr int kIndexInFileMessages =
-    30;
-
-  friend void swap(UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingMin& a, UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingMin& b) {
-    a.Swap(&b);
-  }
-  inline void Swap(UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingMin* other) {
-    if (other == this) return;
-  #ifdef PROTOBUF_FORCE_COPY_IN_SWAP
-    if (GetArena() != nullptr &&
-        GetArena() == other->GetArena()) {
-   #else  // PROTOBUF_FORCE_COPY_IN_SWAP
-    if (GetArena() == other->GetArena()) {
-  #endif  // !PROTOBUF_FORCE_COPY_IN_SWAP
-      InternalSwap(other);
-    } else {
-      ::google::protobuf::internal::GenericSwap(this, other);
-    }
-  }
-  void UnsafeArenaSwap(UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingMin* other) {
-    if (other == this) return;
-    ABSL_DCHECK(GetArena() == other->GetArena());
-    InternalSwap(other);
-  }
-
-  // implements Message ----------------------------------------------
-
-  UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingMin* New(::google::protobuf::Arena* arena = nullptr) const final {
-    return CreateMaybeMessage<UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingMin>(arena);
-  }
-  using ::google::protobuf::Message::CopyFrom;
-  void CopyFrom(const UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingMin& from);
-  using ::google::protobuf::Message::MergeFrom;
-  void MergeFrom( const UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingMin& from) {
-    UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingMin::MergeImpl(*this, from);
-  }
-  private:
-  static void MergeImpl(::google::protobuf::Message& to_msg, const ::google::protobuf::Message& from_msg);
-  public:
-  PROTOBUF_ATTRIBUTE_REINITIALIZES void Clear() final;
-  bool IsInitialized() const final;
-
-  ::size_t ByteSizeLong() const final;
-  const char* _InternalParse(const char* ptr, ::google::protobuf::internal::ParseContext* ctx) final;
-  ::uint8_t* _InternalSerialize(
-      ::uint8_t* target, ::google::protobuf::io::EpsCopyOutputStream* stream) const final;
-  int GetCachedSize() const { return _impl_._cached_size_.Get(); }
-
-  private:
-  ::google::protobuf::internal::CachedSize* AccessCachedSize() const final;
-  void SharedCtor(::google::protobuf::Arena* arena);
-  void SharedDtor();
-  void InternalSwap(UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingMin* other);
-
-  private:
-  friend class ::google::protobuf::internal::AnyMetadata;
-  static ::absl::string_view FullMessageName() {
-    return "io.deephaven.proto.backplane.grpc.UpdateByRequest.UpdateByOperation.UpdateByColumn.UpdateBySpec.UpdateByRollingMin";
-  }
-  protected:
-  explicit UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingMin(::google::protobuf::Arena* arena);
-  UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingMin(::google::protobuf::Arena* arena, const UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingMin& from);
-  public:
-
-  static const ClassData _class_data_;
-  const ::google::protobuf::Message::ClassData*GetClassData() const final;
-
-  ::google::protobuf::Metadata GetMetadata() const final;
-
-  // nested types ----------------------------------------------------
-
-  // accessors -------------------------------------------------------
-
-  enum : int {
-    kReverseWindowScaleFieldNumber = 1,
-    kForwardWindowScaleFieldNumber = 2,
-  };
-  // .io.deephaven.proto.backplane.grpc.UpdateByWindowScale reverse_window_scale = 1;
-  bool has_reverse_window_scale() const;
-  void clear_reverse_window_scale() ;
-  const ::io::deephaven::proto::backplane::grpc::UpdateByWindowScale& reverse_window_scale() const;
-  PROTOBUF_NODISCARD ::io::deephaven::proto::backplane::grpc::UpdateByWindowScale* release_reverse_window_scale();
-  ::io::deephaven::proto::backplane::grpc::UpdateByWindowScale* mutable_reverse_window_scale();
-  void set_allocated_reverse_window_scale(::io::deephaven::proto::backplane::grpc::UpdateByWindowScale* value);
-  void unsafe_arena_set_allocated_reverse_window_scale(::io::deephaven::proto::backplane::grpc::UpdateByWindowScale* value);
-  ::io::deephaven::proto::backplane::grpc::UpdateByWindowScale* unsafe_arena_release_reverse_window_scale();
-
-  private:
-  const ::io::deephaven::proto::backplane::grpc::UpdateByWindowScale& _internal_reverse_window_scale() const;
-  ::io::deephaven::proto::backplane::grpc::UpdateByWindowScale* _internal_mutable_reverse_window_scale();
-
-  public:
-  // .io.deephaven.proto.backplane.grpc.UpdateByWindowScale forward_window_scale = 2;
-  bool has_forward_window_scale() const;
-  void clear_forward_window_scale() ;
-  const ::io::deephaven::proto::backplane::grpc::UpdateByWindowScale& forward_window_scale() const;
-  PROTOBUF_NODISCARD ::io::deephaven::proto::backplane::grpc::UpdateByWindowScale* release_forward_window_scale();
-  ::io::deephaven::proto::backplane::grpc::UpdateByWindowScale* mutable_forward_window_scale();
-  void set_allocated_forward_window_scale(::io::deephaven::proto::backplane::grpc::UpdateByWindowScale* value);
-  void unsafe_arena_set_allocated_forward_window_scale(::io::deephaven::proto::backplane::grpc::UpdateByWindowScale* value);
-  ::io::deephaven::proto::backplane::grpc::UpdateByWindowScale* unsafe_arena_release_forward_window_scale();
-
-  private:
-  const ::io::deephaven::proto::backplane::grpc::UpdateByWindowScale& _internal_forward_window_scale() const;
-  ::io::deephaven::proto::backplane::grpc::UpdateByWindowScale* _internal_mutable_forward_window_scale();
-
-  public:
-  // @@protoc_insertion_point(class_scope:io.deephaven.proto.backplane.grpc.UpdateByRequest.UpdateByOperation.UpdateByColumn.UpdateBySpec.UpdateByRollingMin)
- private:
-  class _Internal;
-
-  friend class ::google::protobuf::internal::TcParser;
-  static const ::google::protobuf::internal::TcParseTable<
-      1, 2, 2,
-      0, 2>
-      _table_;
-  friend class ::google::protobuf::MessageLite;
-  friend class ::google::protobuf::Arena;
-  template <typename T>
-  friend class ::google::protobuf::Arena::InternalHelper;
-  using InternalArenaConstructable_ = void;
-  using DestructorSkippable_ = void;
-  struct Impl_ {
-
-        inline explicit constexpr Impl_(
-            ::google::protobuf::internal::ConstantInitialized) noexcept;
-        inline explicit Impl_(::google::protobuf::internal::InternalVisibility visibility,
-                              ::google::protobuf::Arena* arena);
-        inline explicit Impl_(::google::protobuf::internal::InternalVisibility visibility,
-                              ::google::protobuf::Arena* arena, const Impl_& from);
-    ::google::protobuf::internal::HasBits<1> _has_bits_;
-    mutable ::google::protobuf::internal::CachedSize _cached_size_;
-    ::io::deephaven::proto::backplane::grpc::UpdateByWindowScale* reverse_window_scale_;
-    ::io::deephaven::proto::backplane::grpc::UpdateByWindowScale* forward_window_scale_;
-    PROTOBUF_TSAN_DECLARE_MEMBER
-  };
-  union { Impl_ _impl_; };
-  friend struct ::TableStruct_deephaven_2fproto_2ftable_2eproto;
-};// -------------------------------------------------------------------
-
-class UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingMax final :
-    public ::google::protobuf::Message /* @@protoc_insertion_point(class_definition:io.deephaven.proto.backplane.grpc.UpdateByRequest.UpdateByOperation.UpdateByColumn.UpdateBySpec.UpdateByRollingMax) */ {
- public:
-  inline UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingMax() : UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingMax(nullptr) {}
-  ~UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingMax() override;
-  template<typename = void>
-  explicit PROTOBUF_CONSTEXPR UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingMax(::google::protobuf::internal::ConstantInitialized);
-
-  inline UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingMax(const UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingMax& from)
-      : UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingMax(nullptr, from) {}
-  UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingMax(UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingMax&& from) noexcept
-    : UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingMax() {
-    *this = ::std::move(from);
-  }
-
-  inline UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingMax& operator=(const UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingMax& from) {
-    CopyFrom(from);
-    return *this;
-  }
-  inline UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingMax& operator=(UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingMax&& from) noexcept {
-    if (this == &from) return *this;
-    if (GetArena() == from.GetArena()
-  #ifdef PROTOBUF_FORCE_COPY_IN_MOVE
-        && GetArena() != nullptr
-  #endif  // !PROTOBUF_FORCE_COPY_IN_MOVE
-    ) {
-      InternalSwap(&from);
-    } else {
-      CopyFrom(from);
-    }
-    return *this;
-  }
-
-  inline const ::google::protobuf::UnknownFieldSet& unknown_fields() const
-      ABSL_ATTRIBUTE_LIFETIME_BOUND {
-    return _internal_metadata_.unknown_fields<::google::protobuf::UnknownFieldSet>(::google::protobuf::UnknownFieldSet::default_instance);
-  }
-  inline ::google::protobuf::UnknownFieldSet* mutable_unknown_fields()
-      ABSL_ATTRIBUTE_LIFETIME_BOUND {
-    return _internal_metadata_.mutable_unknown_fields<::google::protobuf::UnknownFieldSet>();
-  }
-
-  static const ::google::protobuf::Descriptor* descriptor() {
-    return GetDescriptor();
-  }
-  static const ::google::protobuf::Descriptor* GetDescriptor() {
-    return default_instance().GetMetadata().descriptor;
-  }
-  static const ::google::protobuf::Reflection* GetReflection() {
-    return default_instance().GetMetadata().reflection;
-  }
-  static const UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingMax& default_instance() {
-    return *internal_default_instance();
-  }
-  static inline const UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingMax* internal_default_instance() {
-    return reinterpret_cast<const UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingMax*>(
-               &_UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingMax_default_instance_);
-  }
-  static constexpr int kIndexInFileMessages =
-    31;
-
-  friend void swap(UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingMax& a, UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingMax& b) {
-    a.Swap(&b);
-  }
-  inline void Swap(UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingMax* other) {
-    if (other == this) return;
-  #ifdef PROTOBUF_FORCE_COPY_IN_SWAP
-    if (GetArena() != nullptr &&
-        GetArena() == other->GetArena()) {
-   #else  // PROTOBUF_FORCE_COPY_IN_SWAP
-    if (GetArena() == other->GetArena()) {
-  #endif  // !PROTOBUF_FORCE_COPY_IN_SWAP
-      InternalSwap(other);
-    } else {
-      ::google::protobuf::internal::GenericSwap(this, other);
-    }
-  }
-  void UnsafeArenaSwap(UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingMax* other) {
-    if (other == this) return;
-    ABSL_DCHECK(GetArena() == other->GetArena());
-    InternalSwap(other);
-  }
-
-  // implements Message ----------------------------------------------
-
-  UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingMax* New(::google::protobuf::Arena* arena = nullptr) const final {
-    return CreateMaybeMessage<UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingMax>(arena);
-  }
-  using ::google::protobuf::Message::CopyFrom;
-  void CopyFrom(const UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingMax& from);
-  using ::google::protobuf::Message::MergeFrom;
-  void MergeFrom( const UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingMax& from) {
-    UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingMax::MergeImpl(*this, from);
-  }
-  private:
-  static void MergeImpl(::google::protobuf::Message& to_msg, const ::google::protobuf::Message& from_msg);
-  public:
-  PROTOBUF_ATTRIBUTE_REINITIALIZES void Clear() final;
-  bool IsInitialized() const final;
-
-  ::size_t ByteSizeLong() const final;
-  const char* _InternalParse(const char* ptr, ::google::protobuf::internal::ParseContext* ctx) final;
-  ::uint8_t* _InternalSerialize(
-      ::uint8_t* target, ::google::protobuf::io::EpsCopyOutputStream* stream) const final;
-  int GetCachedSize() const { return _impl_._cached_size_.Get(); }
-
-  private:
-  ::google::protobuf::internal::CachedSize* AccessCachedSize() const final;
-  void SharedCtor(::google::protobuf::Arena* arena);
-  void SharedDtor();
-  void InternalSwap(UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingMax* other);
-
-  private:
-  friend class ::google::protobuf::internal::AnyMetadata;
-  static ::absl::string_view FullMessageName() {
-    return "io.deephaven.proto.backplane.grpc.UpdateByRequest.UpdateByOperation.UpdateByColumn.UpdateBySpec.UpdateByRollingMax";
-  }
-  protected:
-  explicit UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingMax(::google::protobuf::Arena* arena);
-  UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingMax(::google::protobuf::Arena* arena, const UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingMax& from);
-  public:
-
-  static const ClassData _class_data_;
-  const ::google::protobuf::Message::ClassData*GetClassData() const final;
-
-  ::google::protobuf::Metadata GetMetadata() const final;
-
-  // nested types ----------------------------------------------------
-
-  // accessors -------------------------------------------------------
-
-  enum : int {
-    kReverseWindowScaleFieldNumber = 1,
-    kForwardWindowScaleFieldNumber = 2,
-  };
-  // .io.deephaven.proto.backplane.grpc.UpdateByWindowScale reverse_window_scale = 1;
-  bool has_reverse_window_scale() const;
-  void clear_reverse_window_scale() ;
-  const ::io::deephaven::proto::backplane::grpc::UpdateByWindowScale& reverse_window_scale() const;
-  PROTOBUF_NODISCARD ::io::deephaven::proto::backplane::grpc::UpdateByWindowScale* release_reverse_window_scale();
-  ::io::deephaven::proto::backplane::grpc::UpdateByWindowScale* mutable_reverse_window_scale();
-  void set_allocated_reverse_window_scale(::io::deephaven::proto::backplane::grpc::UpdateByWindowScale* value);
-  void unsafe_arena_set_allocated_reverse_window_scale(::io::deephaven::proto::backplane::grpc::UpdateByWindowScale* value);
-  ::io::deephaven::proto::backplane::grpc::UpdateByWindowScale* unsafe_arena_release_reverse_window_scale();
-
-  private:
-  const ::io::deephaven::proto::backplane::grpc::UpdateByWindowScale& _internal_reverse_window_scale() const;
-  ::io::deephaven::proto::backplane::grpc::UpdateByWindowScale* _internal_mutable_reverse_window_scale();
-
-  public:
-  // .io.deephaven.proto.backplane.grpc.UpdateByWindowScale forward_window_scale = 2;
-  bool has_forward_window_scale() const;
-  void clear_forward_window_scale() ;
-  const ::io::deephaven::proto::backplane::grpc::UpdateByWindowScale& forward_window_scale() const;
-  PROTOBUF_NODISCARD ::io::deephaven::proto::backplane::grpc::UpdateByWindowScale* release_forward_window_scale();
-  ::io::deephaven::proto::backplane::grpc::UpdateByWindowScale* mutable_forward_window_scale();
-  void set_allocated_forward_window_scale(::io::deephaven::proto::backplane::grpc::UpdateByWindowScale* value);
-  void unsafe_arena_set_allocated_forward_window_scale(::io::deephaven::proto::backplane::grpc::UpdateByWindowScale* value);
-  ::io::deephaven::proto::backplane::grpc::UpdateByWindowScale* unsafe_arena_release_forward_window_scale();
-
-  private:
-  const ::io::deephaven::proto::backplane::grpc::UpdateByWindowScale& _internal_forward_window_scale() const;
-  ::io::deephaven::proto::backplane::grpc::UpdateByWindowScale* _internal_mutable_forward_window_scale();
-
-  public:
-  // @@protoc_insertion_point(class_scope:io.deephaven.proto.backplane.grpc.UpdateByRequest.UpdateByOperation.UpdateByColumn.UpdateBySpec.UpdateByRollingMax)
- private:
-  class _Internal;
-
-  friend class ::google::protobuf::internal::TcParser;
-  static const ::google::protobuf::internal::TcParseTable<
-      1, 2, 2,
-      0, 2>
-      _table_;
-  friend class ::google::protobuf::MessageLite;
-  friend class ::google::protobuf::Arena;
-  template <typename T>
-  friend class ::google::protobuf::Arena::InternalHelper;
-  using InternalArenaConstructable_ = void;
-  using DestructorSkippable_ = void;
-  struct Impl_ {
-
-        inline explicit constexpr Impl_(
-            ::google::protobuf::internal::ConstantInitialized) noexcept;
-        inline explicit Impl_(::google::protobuf::internal::InternalVisibility visibility,
-                              ::google::protobuf::Arena* arena);
-        inline explicit Impl_(::google::protobuf::internal::InternalVisibility visibility,
-                              ::google::protobuf::Arena* arena, const Impl_& from);
-    ::google::protobuf::internal::HasBits<1> _has_bits_;
-    mutable ::google::protobuf::internal::CachedSize _cached_size_;
-    ::io::deephaven::proto::backplane::grpc::UpdateByWindowScale* reverse_window_scale_;
-    ::io::deephaven::proto::backplane::grpc::UpdateByWindowScale* forward_window_scale_;
-    PROTOBUF_TSAN_DECLARE_MEMBER
-  };
-  union { Impl_ _impl_; };
-  friend struct ::TableStruct_deephaven_2fproto_2ftable_2eproto;
-};// -------------------------------------------------------------------
-
-class UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingGroup final :
-    public ::google::protobuf::Message /* @@protoc_insertion_point(class_definition:io.deephaven.proto.backplane.grpc.UpdateByRequest.UpdateByOperation.UpdateByColumn.UpdateBySpec.UpdateByRollingGroup) */ {
- public:
-  inline UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingGroup() : UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingGroup(nullptr) {}
-  ~UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingGroup() override;
-  template<typename = void>
-  explicit PROTOBUF_CONSTEXPR UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingGroup(::google::protobuf::internal::ConstantInitialized);
-
-  inline UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingGroup(const UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingGroup& from)
-      : UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingGroup(nullptr, from) {}
-  UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingGroup(UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingGroup&& from) noexcept
-    : UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingGroup() {
-    *this = ::std::move(from);
-  }
-
-  inline UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingGroup& operator=(const UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingGroup& from) {
-    CopyFrom(from);
-    return *this;
-  }
-  inline UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingGroup& operator=(UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingGroup&& from) noexcept {
-    if (this == &from) return *this;
-    if (GetArena() == from.GetArena()
-  #ifdef PROTOBUF_FORCE_COPY_IN_MOVE
-        && GetArena() != nullptr
-  #endif  // !PROTOBUF_FORCE_COPY_IN_MOVE
-    ) {
-      InternalSwap(&from);
-    } else {
-      CopyFrom(from);
-    }
-    return *this;
-  }
-
-  inline const ::google::protobuf::UnknownFieldSet& unknown_fields() const
-      ABSL_ATTRIBUTE_LIFETIME_BOUND {
-    return _internal_metadata_.unknown_fields<::google::protobuf::UnknownFieldSet>(::google::protobuf::UnknownFieldSet::default_instance);
-  }
-  inline ::google::protobuf::UnknownFieldSet* mutable_unknown_fields()
-      ABSL_ATTRIBUTE_LIFETIME_BOUND {
-    return _internal_metadata_.mutable_unknown_fields<::google::protobuf::UnknownFieldSet>();
-  }
-
-  static const ::google::protobuf::Descriptor* descriptor() {
-    return GetDescriptor();
-  }
-  static const ::google::protobuf::Descriptor* GetDescriptor() {
-    return default_instance().GetMetadata().descriptor;
-  }
-  static const ::google::protobuf::Reflection* GetReflection() {
-    return default_instance().GetMetadata().reflection;
-  }
-  static const UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingGroup& default_instance() {
-    return *internal_default_instance();
-  }
-  static inline const UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingGroup* internal_default_instance() {
-    return reinterpret_cast<const UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingGroup*>(
-               &_UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingGroup_default_instance_);
-  }
-  static constexpr int kIndexInFileMessages =
-    28;
-
-  friend void swap(UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingGroup& a, UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingGroup& b) {
-    a.Swap(&b);
-  }
-  inline void Swap(UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingGroup* other) {
-    if (other == this) return;
-  #ifdef PROTOBUF_FORCE_COPY_IN_SWAP
-    if (GetArena() != nullptr &&
-        GetArena() == other->GetArena()) {
-   #else  // PROTOBUF_FORCE_COPY_IN_SWAP
-    if (GetArena() == other->GetArena()) {
-  #endif  // !PROTOBUF_FORCE_COPY_IN_SWAP
-      InternalSwap(other);
-    } else {
-      ::google::protobuf::internal::GenericSwap(this, other);
-    }
-  }
-  void UnsafeArenaSwap(UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingGroup* other) {
-    if (other == this) return;
-    ABSL_DCHECK(GetArena() == other->GetArena());
-    InternalSwap(other);
-  }
-
-  // implements Message ----------------------------------------------
-
-  UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingGroup* New(::google::protobuf::Arena* arena = nullptr) const final {
-    return CreateMaybeMessage<UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingGroup>(arena);
-  }
-  using ::google::protobuf::Message::CopyFrom;
-  void CopyFrom(const UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingGroup& from);
-  using ::google::protobuf::Message::MergeFrom;
-  void MergeFrom( const UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingGroup& from) {
-    UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingGroup::MergeImpl(*this, from);
-  }
-  private:
-  static void MergeImpl(::google::protobuf::Message& to_msg, const ::google::protobuf::Message& from_msg);
-  public:
-  PROTOBUF_ATTRIBUTE_REINITIALIZES void Clear() final;
-  bool IsInitialized() const final;
-
-  ::size_t ByteSizeLong() const final;
-  const char* _InternalParse(const char* ptr, ::google::protobuf::internal::ParseContext* ctx) final;
-  ::uint8_t* _InternalSerialize(
-      ::uint8_t* target, ::google::protobuf::io::EpsCopyOutputStream* stream) const final;
-  int GetCachedSize() const { return _impl_._cached_size_.Get(); }
-
-  private:
-  ::google::protobuf::internal::CachedSize* AccessCachedSize() const final;
-  void SharedCtor(::google::protobuf::Arena* arena);
-  void SharedDtor();
-  void InternalSwap(UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingGroup* other);
-
-  private:
-  friend class ::google::protobuf::internal::AnyMetadata;
-  static ::absl::string_view FullMessageName() {
-    return "io.deephaven.proto.backplane.grpc.UpdateByRequest.UpdateByOperation.UpdateByColumn.UpdateBySpec.UpdateByRollingGroup";
-  }
-  protected:
-  explicit UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingGroup(::google::protobuf::Arena* arena);
-  UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingGroup(::google::protobuf::Arena* arena, const UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingGroup& from);
-  public:
-
-  static const ClassData _class_data_;
-  const ::google::protobuf::Message::ClassData*GetClassData() const final;
-
-  ::google::protobuf::Metadata GetMetadata() const final;
-
-  // nested types ----------------------------------------------------
-
-  // accessors -------------------------------------------------------
-
-  enum : int {
-    kReverseWindowScaleFieldNumber = 1,
-    kForwardWindowScaleFieldNumber = 2,
-  };
-  // .io.deephaven.proto.backplane.grpc.UpdateByWindowScale reverse_window_scale = 1;
-  bool has_reverse_window_scale() const;
-  void clear_reverse_window_scale() ;
-  const ::io::deephaven::proto::backplane::grpc::UpdateByWindowScale& reverse_window_scale() const;
-  PROTOBUF_NODISCARD ::io::deephaven::proto::backplane::grpc::UpdateByWindowScale* release_reverse_window_scale();
-  ::io::deephaven::proto::backplane::grpc::UpdateByWindowScale* mutable_reverse_window_scale();
-  void set_allocated_reverse_window_scale(::io::deephaven::proto::backplane::grpc::UpdateByWindowScale* value);
-  void unsafe_arena_set_allocated_reverse_window_scale(::io::deephaven::proto::backplane::grpc::UpdateByWindowScale* value);
-  ::io::deephaven::proto::backplane::grpc::UpdateByWindowScale* unsafe_arena_release_reverse_window_scale();
-
-  private:
-  const ::io::deephaven::proto::backplane::grpc::UpdateByWindowScale& _internal_reverse_window_scale() const;
-  ::io::deephaven::proto::backplane::grpc::UpdateByWindowScale* _internal_mutable_reverse_window_scale();
-
-  public:
-  // .io.deephaven.proto.backplane.grpc.UpdateByWindowScale forward_window_scale = 2;
-  bool has_forward_window_scale() const;
-  void clear_forward_window_scale() ;
-  const ::io::deephaven::proto::backplane::grpc::UpdateByWindowScale& forward_window_scale() const;
-  PROTOBUF_NODISCARD ::io::deephaven::proto::backplane::grpc::UpdateByWindowScale* release_forward_window_scale();
-  ::io::deephaven::proto::backplane::grpc::UpdateByWindowScale* mutable_forward_window_scale();
-  void set_allocated_forward_window_scale(::io::deephaven::proto::backplane::grpc::UpdateByWindowScale* value);
-  void unsafe_arena_set_allocated_forward_window_scale(::io::deephaven::proto::backplane::grpc::UpdateByWindowScale* value);
-  ::io::deephaven::proto::backplane::grpc::UpdateByWindowScale* unsafe_arena_release_forward_window_scale();
-
-  private:
-  const ::io::deephaven::proto::backplane::grpc::UpdateByWindowScale& _internal_forward_window_scale() const;
-  ::io::deephaven::proto::backplane::grpc::UpdateByWindowScale* _internal_mutable_forward_window_scale();
-
-  public:
-  // @@protoc_insertion_point(class_scope:io.deephaven.proto.backplane.grpc.UpdateByRequest.UpdateByOperation.UpdateByColumn.UpdateBySpec.UpdateByRollingGroup)
- private:
-  class _Internal;
-
-  friend class ::google::protobuf::internal::TcParser;
-  static const ::google::protobuf::internal::TcParseTable<
-      1, 2, 2,
-      0, 2>
-      _table_;
-  friend class ::google::protobuf::MessageLite;
-  friend class ::google::protobuf::Arena;
-  template <typename T>
-  friend class ::google::protobuf::Arena::InternalHelper;
-  using InternalArenaConstructable_ = void;
-  using DestructorSkippable_ = void;
-  struct Impl_ {
-
-        inline explicit constexpr Impl_(
-            ::google::protobuf::internal::ConstantInitialized) noexcept;
-        inline explicit Impl_(::google::protobuf::internal::InternalVisibility visibility,
-                              ::google::protobuf::Arena* arena);
-        inline explicit Impl_(::google::protobuf::internal::InternalVisibility visibility,
-                              ::google::protobuf::Arena* arena, const Impl_& from);
-    ::google::protobuf::internal::HasBits<1> _has_bits_;
-    mutable ::google::protobuf::internal::CachedSize _cached_size_;
-    ::io::deephaven::proto::backplane::grpc::UpdateByWindowScale* reverse_window_scale_;
-    ::io::deephaven::proto::backplane::grpc::UpdateByWindowScale* forward_window_scale_;
-    PROTOBUF_TSAN_DECLARE_MEMBER
-  };
-  union { Impl_ _impl_; };
-  friend struct ::TableStruct_deephaven_2fproto_2ftable_2eproto;
-};// -------------------------------------------------------------------
-
-class UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingFormula final :
-    public ::google::protobuf::Message /* @@protoc_insertion_point(class_definition:io.deephaven.proto.backplane.grpc.UpdateByRequest.UpdateByOperation.UpdateByColumn.UpdateBySpec.UpdateByRollingFormula) */ {
- public:
-  inline UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingFormula() : UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingFormula(nullptr) {}
-  ~UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingFormula() override;
-  template<typename = void>
-  explicit PROTOBUF_CONSTEXPR UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingFormula(::google::protobuf::internal::ConstantInitialized);
-
-  inline UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingFormula(const UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingFormula& from)
-      : UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingFormula(nullptr, from) {}
-  UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingFormula(UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingFormula&& from) noexcept
-    : UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingFormula() {
-    *this = ::std::move(from);
-  }
-
-  inline UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingFormula& operator=(const UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingFormula& from) {
-    CopyFrom(from);
-    return *this;
-  }
-  inline UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingFormula& operator=(UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingFormula&& from) noexcept {
-    if (this == &from) return *this;
-    if (GetArena() == from.GetArena()
-  #ifdef PROTOBUF_FORCE_COPY_IN_MOVE
-        && GetArena() != nullptr
-  #endif  // !PROTOBUF_FORCE_COPY_IN_MOVE
-    ) {
-      InternalSwap(&from);
-    } else {
-      CopyFrom(from);
-    }
-    return *this;
-  }
-
-  inline const ::google::protobuf::UnknownFieldSet& unknown_fields() const
-      ABSL_ATTRIBUTE_LIFETIME_BOUND {
-    return _internal_metadata_.unknown_fields<::google::protobuf::UnknownFieldSet>(::google::protobuf::UnknownFieldSet::default_instance);
-  }
-  inline ::google::protobuf::UnknownFieldSet* mutable_unknown_fields()
-      ABSL_ATTRIBUTE_LIFETIME_BOUND {
-    return _internal_metadata_.mutable_unknown_fields<::google::protobuf::UnknownFieldSet>();
-  }
-
-  static const ::google::protobuf::Descriptor* descriptor() {
-    return GetDescriptor();
-  }
-  static const ::google::protobuf::Descriptor* GetDescriptor() {
-    return default_instance().GetMetadata().descriptor;
-  }
-  static const ::google::protobuf::Reflection* GetReflection() {
-    return default_instance().GetMetadata().reflection;
-  }
-  static const UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingFormula& default_instance() {
-    return *internal_default_instance();
-  }
-  static inline const UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingFormula* internal_default_instance() {
-    return reinterpret_cast<const UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingFormula*>(
-               &_UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingFormula_default_instance_);
-  }
-  static constexpr int kIndexInFileMessages =
-    36;
-
-  friend void swap(UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingFormula& a, UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingFormula& b) {
-    a.Swap(&b);
-  }
-  inline void Swap(UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingFormula* other) {
-    if (other == this) return;
-  #ifdef PROTOBUF_FORCE_COPY_IN_SWAP
-    if (GetArena() != nullptr &&
-        GetArena() == other->GetArena()) {
-   #else  // PROTOBUF_FORCE_COPY_IN_SWAP
-    if (GetArena() == other->GetArena()) {
-  #endif  // !PROTOBUF_FORCE_COPY_IN_SWAP
-      InternalSwap(other);
-    } else {
-      ::google::protobuf::internal::GenericSwap(this, other);
-    }
-  }
-  void UnsafeArenaSwap(UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingFormula* other) {
-    if (other == this) return;
-    ABSL_DCHECK(GetArena() == other->GetArena());
-    InternalSwap(other);
-  }
-
-  // implements Message ----------------------------------------------
-
-  UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingFormula* New(::google::protobuf::Arena* arena = nullptr) const final {
-    return CreateMaybeMessage<UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingFormula>(arena);
-  }
-  using ::google::protobuf::Message::CopyFrom;
-  void CopyFrom(const UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingFormula& from);
-  using ::google::protobuf::Message::MergeFrom;
-  void MergeFrom( const UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingFormula& from) {
-    UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingFormula::MergeImpl(*this, from);
-  }
-  private:
-  static void MergeImpl(::google::protobuf::Message& to_msg, const ::google::protobuf::Message& from_msg);
-  public:
-  PROTOBUF_ATTRIBUTE_REINITIALIZES void Clear() final;
-  bool IsInitialized() const final;
-
-  ::size_t ByteSizeLong() const final;
-  const char* _InternalParse(const char* ptr, ::google::protobuf::internal::ParseContext* ctx) final;
-  ::uint8_t* _InternalSerialize(
-      ::uint8_t* target, ::google::protobuf::io::EpsCopyOutputStream* stream) const final;
-  int GetCachedSize() const { return _impl_._cached_size_.Get(); }
-
-  private:
-  ::google::protobuf::internal::CachedSize* AccessCachedSize() const final;
-  void SharedCtor(::google::protobuf::Arena* arena);
-  void SharedDtor();
-  void InternalSwap(UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingFormula* other);
-
-  private:
-  friend class ::google::protobuf::internal::AnyMetadata;
-  static ::absl::string_view FullMessageName() {
-    return "io.deephaven.proto.backplane.grpc.UpdateByRequest.UpdateByOperation.UpdateByColumn.UpdateBySpec.UpdateByRollingFormula";
-  }
-  protected:
-  explicit UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingFormula(::google::protobuf::Arena* arena);
-  UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingFormula(::google::protobuf::Arena* arena, const UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingFormula& from);
-  public:
-
-  static const ClassData _class_data_;
-  const ::google::protobuf::Message::ClassData*GetClassData() const final;
-
-  ::google::protobuf::Metadata GetMetadata() const final;
-
-  // nested types ----------------------------------------------------
-
-  // accessors -------------------------------------------------------
-
-  enum : int {
-    kFormulaFieldNumber = 3,
-    kParamTokenFieldNumber = 4,
-    kReverseWindowScaleFieldNumber = 1,
-    kForwardWindowScaleFieldNumber = 2,
-  };
-  // string formula = 3;
-  void clear_formula() ;
-  const std::string& formula() const;
-  template <typename Arg_ = const std::string&, typename... Args_>
-  void set_formula(Arg_&& arg, Args_... args);
-  std::string* mutable_formula();
-  PROTOBUF_NODISCARD std::string* release_formula();
-  void set_allocated_formula(std::string* value);
-
-  private:
-  const std::string& _internal_formula() const;
-  inline PROTOBUF_ALWAYS_INLINE void _internal_set_formula(
-      const std::string& value);
-  std::string* _internal_mutable_formula();
-
-  public:
-  // string param_token = 4;
-  void clear_param_token() ;
-  const std::string& param_token() const;
-  template <typename Arg_ = const std::string&, typename... Args_>
-  void set_param_token(Arg_&& arg, Args_... args);
-  std::string* mutable_param_token();
-  PROTOBUF_NODISCARD std::string* release_param_token();
-  void set_allocated_param_token(std::string* value);
-
-  private:
-  const std::string& _internal_param_token() const;
-  inline PROTOBUF_ALWAYS_INLINE void _internal_set_param_token(
-      const std::string& value);
-  std::string* _internal_mutable_param_token();
-
-  public:
-  // .io.deephaven.proto.backplane.grpc.UpdateByWindowScale reverse_window_scale = 1;
-  bool has_reverse_window_scale() const;
-  void clear_reverse_window_scale() ;
-  const ::io::deephaven::proto::backplane::grpc::UpdateByWindowScale& reverse_window_scale() const;
-  PROTOBUF_NODISCARD ::io::deephaven::proto::backplane::grpc::UpdateByWindowScale* release_reverse_window_scale();
-  ::io::deephaven::proto::backplane::grpc::UpdateByWindowScale* mutable_reverse_window_scale();
-  void set_allocated_reverse_window_scale(::io::deephaven::proto::backplane::grpc::UpdateByWindowScale* value);
-  void unsafe_arena_set_allocated_reverse_window_scale(::io::deephaven::proto::backplane::grpc::UpdateByWindowScale* value);
-  ::io::deephaven::proto::backplane::grpc::UpdateByWindowScale* unsafe_arena_release_reverse_window_scale();
-
-  private:
-  const ::io::deephaven::proto::backplane::grpc::UpdateByWindowScale& _internal_reverse_window_scale() const;
-  ::io::deephaven::proto::backplane::grpc::UpdateByWindowScale* _internal_mutable_reverse_window_scale();
-
-  public:
-  // .io.deephaven.proto.backplane.grpc.UpdateByWindowScale forward_window_scale = 2;
-  bool has_forward_window_scale() const;
-  void clear_forward_window_scale() ;
-  const ::io::deephaven::proto::backplane::grpc::UpdateByWindowScale& forward_window_scale() const;
-  PROTOBUF_NODISCARD ::io::deephaven::proto::backplane::grpc::UpdateByWindowScale* release_forward_window_scale();
-  ::io::deephaven::proto::backplane::grpc::UpdateByWindowScale* mutable_forward_window_scale();
-  void set_allocated_forward_window_scale(::io::deephaven::proto::backplane::grpc::UpdateByWindowScale* value);
-  void unsafe_arena_set_allocated_forward_window_scale(::io::deephaven::proto::backplane::grpc::UpdateByWindowScale* value);
-  ::io::deephaven::proto::backplane::grpc::UpdateByWindowScale* unsafe_arena_release_forward_window_scale();
-
-  private:
-  const ::io::deephaven::proto::backplane::grpc::UpdateByWindowScale& _internal_forward_window_scale() const;
-  ::io::deephaven::proto::backplane::grpc::UpdateByWindowScale* _internal_mutable_forward_window_scale();
-
-  public:
-  // @@protoc_insertion_point(class_scope:io.deephaven.proto.backplane.grpc.UpdateByRequest.UpdateByOperation.UpdateByColumn.UpdateBySpec.UpdateByRollingFormula)
- private:
-  class _Internal;
-
-  friend class ::google::protobuf::internal::TcParser;
-  static const ::google::protobuf::internal::TcParseTable<
-      2, 4, 2,
-      145, 2>
-      _table_;
-  friend class ::google::protobuf::MessageLite;
-  friend class ::google::protobuf::Arena;
-  template <typename T>
-  friend class ::google::protobuf::Arena::InternalHelper;
-  using InternalArenaConstructable_ = void;
-  using DestructorSkippable_ = void;
-  struct Impl_ {
-
-        inline explicit constexpr Impl_(
-            ::google::protobuf::internal::ConstantInitialized) noexcept;
-        inline explicit Impl_(::google::protobuf::internal::InternalVisibility visibility,
-                              ::google::protobuf::Arena* arena);
-        inline explicit Impl_(::google::protobuf::internal::InternalVisibility visibility,
-                              ::google::protobuf::Arena* arena, const Impl_& from);
-    ::google::protobuf::internal::HasBits<1> _has_bits_;
-    mutable ::google::protobuf::internal::CachedSize _cached_size_;
-    ::google::protobuf::internal::ArenaStringPtr formula_;
-    ::google::protobuf::internal::ArenaStringPtr param_token_;
-    ::io::deephaven::proto::backplane::grpc::UpdateByWindowScale* reverse_window_scale_;
-    ::io::deephaven::proto::backplane::grpc::UpdateByWindowScale* forward_window_scale_;
-    PROTOBUF_TSAN_DECLARE_MEMBER
-  };
-  union { Impl_ _impl_; };
-  friend struct ::TableStruct_deephaven_2fproto_2ftable_2eproto;
-};// -------------------------------------------------------------------
-
-class UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingCount final :
-    public ::google::protobuf::Message /* @@protoc_insertion_point(class_definition:io.deephaven.proto.backplane.grpc.UpdateByRequest.UpdateByOperation.UpdateByColumn.UpdateBySpec.UpdateByRollingCount) */ {
- public:
-  inline UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingCount() : UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingCount(nullptr) {}
-  ~UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingCount() override;
-  template<typename = void>
-  explicit PROTOBUF_CONSTEXPR UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingCount(::google::protobuf::internal::ConstantInitialized);
-
-  inline UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingCount(const UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingCount& from)
-      : UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingCount(nullptr, from) {}
-  UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingCount(UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingCount&& from) noexcept
-    : UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingCount() {
-    *this = ::std::move(from);
-  }
-
-  inline UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingCount& operator=(const UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingCount& from) {
-    CopyFrom(from);
-    return *this;
-  }
-  inline UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingCount& operator=(UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingCount&& from) noexcept {
-    if (this == &from) return *this;
-    if (GetArena() == from.GetArena()
-  #ifdef PROTOBUF_FORCE_COPY_IN_MOVE
-        && GetArena() != nullptr
-  #endif  // !PROTOBUF_FORCE_COPY_IN_MOVE
-    ) {
-      InternalSwap(&from);
-    } else {
-      CopyFrom(from);
-    }
-    return *this;
-  }
-
-  inline const ::google::protobuf::UnknownFieldSet& unknown_fields() const
-      ABSL_ATTRIBUTE_LIFETIME_BOUND {
-    return _internal_metadata_.unknown_fields<::google::protobuf::UnknownFieldSet>(::google::protobuf::UnknownFieldSet::default_instance);
-  }
-  inline ::google::protobuf::UnknownFieldSet* mutable_unknown_fields()
-      ABSL_ATTRIBUTE_LIFETIME_BOUND {
-    return _internal_metadata_.mutable_unknown_fields<::google::protobuf::UnknownFieldSet>();
-  }
-
-  static const ::google::protobuf::Descriptor* descriptor() {
-    return GetDescriptor();
-  }
-  static const ::google::protobuf::Descriptor* GetDescriptor() {
-    return default_instance().GetMetadata().descriptor;
-  }
-  static const ::google::protobuf::Reflection* GetReflection() {
-    return default_instance().GetMetadata().reflection;
-  }
-  static const UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingCount& default_instance() {
-    return *internal_default_instance();
-  }
-  static inline const UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingCount* internal_default_instance() {
-    return reinterpret_cast<const UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingCount*>(
-               &_UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingCount_default_instance_);
-  }
-  static constexpr int kIndexInFileMessages =
-    33;
-
-  friend void swap(UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingCount& a, UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingCount& b) {
-    a.Swap(&b);
-  }
-  inline void Swap(UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingCount* other) {
-    if (other == this) return;
-  #ifdef PROTOBUF_FORCE_COPY_IN_SWAP
-    if (GetArena() != nullptr &&
-        GetArena() == other->GetArena()) {
-   #else  // PROTOBUF_FORCE_COPY_IN_SWAP
-    if (GetArena() == other->GetArena()) {
-  #endif  // !PROTOBUF_FORCE_COPY_IN_SWAP
-      InternalSwap(other);
-    } else {
-      ::google::protobuf::internal::GenericSwap(this, other);
-    }
-  }
-  void UnsafeArenaSwap(UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingCount* other) {
-    if (other == this) return;
-    ABSL_DCHECK(GetArena() == other->GetArena());
-    InternalSwap(other);
-  }
-
-  // implements Message ----------------------------------------------
-
-  UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingCount* New(::google::protobuf::Arena* arena = nullptr) const final {
-    return CreateMaybeMessage<UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingCount>(arena);
-  }
-  using ::google::protobuf::Message::CopyFrom;
-  void CopyFrom(const UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingCount& from);
-  using ::google::protobuf::Message::MergeFrom;
-  void MergeFrom( const UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingCount& from) {
-    UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingCount::MergeImpl(*this, from);
-  }
-  private:
-  static void MergeImpl(::google::protobuf::Message& to_msg, const ::google::protobuf::Message& from_msg);
-  public:
-  PROTOBUF_ATTRIBUTE_REINITIALIZES void Clear() final;
-  bool IsInitialized() const final;
-
-  ::size_t ByteSizeLong() const final;
-  const char* _InternalParse(const char* ptr, ::google::protobuf::internal::ParseContext* ctx) final;
-  ::uint8_t* _InternalSerialize(
-      ::uint8_t* target, ::google::protobuf::io::EpsCopyOutputStream* stream) const final;
-  int GetCachedSize() const { return _impl_._cached_size_.Get(); }
-
-  private:
-  ::google::protobuf::internal::CachedSize* AccessCachedSize() const final;
-  void SharedCtor(::google::protobuf::Arena* arena);
-  void SharedDtor();
-  void InternalSwap(UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingCount* other);
-
-  private:
-  friend class ::google::protobuf::internal::AnyMetadata;
-  static ::absl::string_view FullMessageName() {
-    return "io.deephaven.proto.backplane.grpc.UpdateByRequest.UpdateByOperation.UpdateByColumn.UpdateBySpec.UpdateByRollingCount";
-  }
-  protected:
-  explicit UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingCount(::google::protobuf::Arena* arena);
-  UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingCount(::google::protobuf::Arena* arena, const UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingCount& from);
-  public:
-
-  static const ClassData _class_data_;
-  const ::google::protobuf::Message::ClassData*GetClassData() const final;
-
-  ::google::protobuf::Metadata GetMetadata() const final;
-
-  // nested types ----------------------------------------------------
-
-  // accessors -------------------------------------------------------
-
-  enum : int {
-    kReverseWindowScaleFieldNumber = 1,
-    kForwardWindowScaleFieldNumber = 2,
-  };
-  // .io.deephaven.proto.backplane.grpc.UpdateByWindowScale reverse_window_scale = 1;
-  bool has_reverse_window_scale() const;
-  void clear_reverse_window_scale() ;
-  const ::io::deephaven::proto::backplane::grpc::UpdateByWindowScale& reverse_window_scale() const;
-  PROTOBUF_NODISCARD ::io::deephaven::proto::backplane::grpc::UpdateByWindowScale* release_reverse_window_scale();
-  ::io::deephaven::proto::backplane::grpc::UpdateByWindowScale* mutable_reverse_window_scale();
-  void set_allocated_reverse_window_scale(::io::deephaven::proto::backplane::grpc::UpdateByWindowScale* value);
-  void unsafe_arena_set_allocated_reverse_window_scale(::io::deephaven::proto::backplane::grpc::UpdateByWindowScale* value);
-  ::io::deephaven::proto::backplane::grpc::UpdateByWindowScale* unsafe_arena_release_reverse_window_scale();
-
-  private:
-  const ::io::deephaven::proto::backplane::grpc::UpdateByWindowScale& _internal_reverse_window_scale() const;
-  ::io::deephaven::proto::backplane::grpc::UpdateByWindowScale* _internal_mutable_reverse_window_scale();
-
-  public:
-  // .io.deephaven.proto.backplane.grpc.UpdateByWindowScale forward_window_scale = 2;
-  bool has_forward_window_scale() const;
-  void clear_forward_window_scale() ;
-  const ::io::deephaven::proto::backplane::grpc::UpdateByWindowScale& forward_window_scale() const;
-  PROTOBUF_NODISCARD ::io::deephaven::proto::backplane::grpc::UpdateByWindowScale* release_forward_window_scale();
-  ::io::deephaven::proto::backplane::grpc::UpdateByWindowScale* mutable_forward_window_scale();
-  void set_allocated_forward_window_scale(::io::deephaven::proto::backplane::grpc::UpdateByWindowScale* value);
-  void unsafe_arena_set_allocated_forward_window_scale(::io::deephaven::proto::backplane::grpc::UpdateByWindowScale* value);
-  ::io::deephaven::proto::backplane::grpc::UpdateByWindowScale* unsafe_arena_release_forward_window_scale();
-
-  private:
-  const ::io::deephaven::proto::backplane::grpc::UpdateByWindowScale& _internal_forward_window_scale() const;
-  ::io::deephaven::proto::backplane::grpc::UpdateByWindowScale* _internal_mutable_forward_window_scale();
-
-  public:
-  // @@protoc_insertion_point(class_scope:io.deephaven.proto.backplane.grpc.UpdateByRequest.UpdateByOperation.UpdateByColumn.UpdateBySpec.UpdateByRollingCount)
- private:
-  class _Internal;
-
-  friend class ::google::protobuf::internal::TcParser;
-  static const ::google::protobuf::internal::TcParseTable<
-      1, 2, 2,
-      0, 2>
-      _table_;
-  friend class ::google::protobuf::MessageLite;
-  friend class ::google::protobuf::Arena;
-  template <typename T>
-  friend class ::google::protobuf::Arena::InternalHelper;
-  using InternalArenaConstructable_ = void;
-  using DestructorSkippable_ = void;
-  struct Impl_ {
-
-        inline explicit constexpr Impl_(
-            ::google::protobuf::internal::ConstantInitialized) noexcept;
-        inline explicit Impl_(::google::protobuf::internal::InternalVisibility visibility,
-                              ::google::protobuf::Arena* arena);
-        inline explicit Impl_(::google::protobuf::internal::InternalVisibility visibility,
-                              ::google::protobuf::Arena* arena, const Impl_& from);
-    ::google::protobuf::internal::HasBits<1> _has_bits_;
-    mutable ::google::protobuf::internal::CachedSize _cached_size_;
-    ::io::deephaven::proto::backplane::grpc::UpdateByWindowScale* reverse_window_scale_;
-    ::io::deephaven::proto::backplane::grpc::UpdateByWindowScale* forward_window_scale_;
-    PROTOBUF_TSAN_DECLARE_MEMBER
-  };
-  union { Impl_ _impl_; };
-  friend struct ::TableStruct_deephaven_2fproto_2ftable_2eproto;
-};// -------------------------------------------------------------------
-
-class UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingAvg final :
-    public ::google::protobuf::Message /* @@protoc_insertion_point(class_definition:io.deephaven.proto.backplane.grpc.UpdateByRequest.UpdateByOperation.UpdateByColumn.UpdateBySpec.UpdateByRollingAvg) */ {
- public:
-  inline UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingAvg() : UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingAvg(nullptr) {}
-  ~UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingAvg() override;
-  template<typename = void>
-  explicit PROTOBUF_CONSTEXPR UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingAvg(::google::protobuf::internal::ConstantInitialized);
-
-  inline UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingAvg(const UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingAvg& from)
-      : UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingAvg(nullptr, from) {}
-  UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingAvg(UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingAvg&& from) noexcept
-    : UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingAvg() {
-    *this = ::std::move(from);
-  }
-
-  inline UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingAvg& operator=(const UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingAvg& from) {
-    CopyFrom(from);
-    return *this;
-  }
-  inline UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingAvg& operator=(UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingAvg&& from) noexcept {
-    if (this == &from) return *this;
-    if (GetArena() == from.GetArena()
-  #ifdef PROTOBUF_FORCE_COPY_IN_MOVE
-        && GetArena() != nullptr
-  #endif  // !PROTOBUF_FORCE_COPY_IN_MOVE
-    ) {
-      InternalSwap(&from);
-    } else {
-      CopyFrom(from);
-    }
-    return *this;
-  }
-
-  inline const ::google::protobuf::UnknownFieldSet& unknown_fields() const
-      ABSL_ATTRIBUTE_LIFETIME_BOUND {
-    return _internal_metadata_.unknown_fields<::google::protobuf::UnknownFieldSet>(::google::protobuf::UnknownFieldSet::default_instance);
-  }
-  inline ::google::protobuf::UnknownFieldSet* mutable_unknown_fields()
-      ABSL_ATTRIBUTE_LIFETIME_BOUND {
-    return _internal_metadata_.mutable_unknown_fields<::google::protobuf::UnknownFieldSet>();
-  }
-
-  static const ::google::protobuf::Descriptor* descriptor() {
-    return GetDescriptor();
-  }
-  static const ::google::protobuf::Descriptor* GetDescriptor() {
-    return default_instance().GetMetadata().descriptor;
-  }
-  static const ::google::protobuf::Reflection* GetReflection() {
-    return default_instance().GetMetadata().reflection;
-  }
-  static const UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingAvg& default_instance() {
-    return *internal_default_instance();
-  }
-  static inline const UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingAvg* internal_default_instance() {
-    return reinterpret_cast<const UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingAvg*>(
-               &_UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingAvg_default_instance_);
-  }
-  static constexpr int kIndexInFileMessages =
-    29;
-
-  friend void swap(UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingAvg& a, UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingAvg& b) {
-    a.Swap(&b);
-  }
-  inline void Swap(UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingAvg* other) {
-    if (other == this) return;
-  #ifdef PROTOBUF_FORCE_COPY_IN_SWAP
-    if (GetArena() != nullptr &&
-        GetArena() == other->GetArena()) {
-   #else  // PROTOBUF_FORCE_COPY_IN_SWAP
-    if (GetArena() == other->GetArena()) {
-  #endif  // !PROTOBUF_FORCE_COPY_IN_SWAP
-      InternalSwap(other);
-    } else {
-      ::google::protobuf::internal::GenericSwap(this, other);
-    }
-  }
-  void UnsafeArenaSwap(UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingAvg* other) {
-    if (other == this) return;
-    ABSL_DCHECK(GetArena() == other->GetArena());
-    InternalSwap(other);
-  }
-
-  // implements Message ----------------------------------------------
-
-  UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingAvg* New(::google::protobuf::Arena* arena = nullptr) const final {
-    return CreateMaybeMessage<UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingAvg>(arena);
-  }
-  using ::google::protobuf::Message::CopyFrom;
-  void CopyFrom(const UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingAvg& from);
-  using ::google::protobuf::Message::MergeFrom;
-  void MergeFrom( const UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingAvg& from) {
-    UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingAvg::MergeImpl(*this, from);
-  }
-  private:
-  static void MergeImpl(::google::protobuf::Message& to_msg, const ::google::protobuf::Message& from_msg);
-  public:
-  PROTOBUF_ATTRIBUTE_REINITIALIZES void Clear() final;
-  bool IsInitialized() const final;
-
-  ::size_t ByteSizeLong() const final;
-  const char* _InternalParse(const char* ptr, ::google::protobuf::internal::ParseContext* ctx) final;
-  ::uint8_t* _InternalSerialize(
-      ::uint8_t* target, ::google::protobuf::io::EpsCopyOutputStream* stream) const final;
-  int GetCachedSize() const { return _impl_._cached_size_.Get(); }
-
-  private:
-  ::google::protobuf::internal::CachedSize* AccessCachedSize() const final;
-  void SharedCtor(::google::protobuf::Arena* arena);
-  void SharedDtor();
-  void InternalSwap(UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingAvg* other);
-
-  private:
-  friend class ::google::protobuf::internal::AnyMetadata;
-  static ::absl::string_view FullMessageName() {
-    return "io.deephaven.proto.backplane.grpc.UpdateByRequest.UpdateByOperation.UpdateByColumn.UpdateBySpec.UpdateByRollingAvg";
-  }
-  protected:
-  explicit UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingAvg(::google::protobuf::Arena* arena);
-  UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingAvg(::google::protobuf::Arena* arena, const UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingAvg& from);
-  public:
-
-  static const ClassData _class_data_;
-  const ::google::protobuf::Message::ClassData*GetClassData() const final;
-
-  ::google::protobuf::Metadata GetMetadata() const final;
-
-  // nested types ----------------------------------------------------
-
-  // accessors -------------------------------------------------------
-
-  enum : int {
-    kReverseWindowScaleFieldNumber = 1,
-    kForwardWindowScaleFieldNumber = 2,
-  };
-  // .io.deephaven.proto.backplane.grpc.UpdateByWindowScale reverse_window_scale = 1;
-  bool has_reverse_window_scale() const;
-  void clear_reverse_window_scale() ;
-  const ::io::deephaven::proto::backplane::grpc::UpdateByWindowScale& reverse_window_scale() const;
-  PROTOBUF_NODISCARD ::io::deephaven::proto::backplane::grpc::UpdateByWindowScale* release_reverse_window_scale();
-  ::io::deephaven::proto::backplane::grpc::UpdateByWindowScale* mutable_reverse_window_scale();
-  void set_allocated_reverse_window_scale(::io::deephaven::proto::backplane::grpc::UpdateByWindowScale* value);
-  void unsafe_arena_set_allocated_reverse_window_scale(::io::deephaven::proto::backplane::grpc::UpdateByWindowScale* value);
-  ::io::deephaven::proto::backplane::grpc::UpdateByWindowScale* unsafe_arena_release_reverse_window_scale();
-
-  private:
-  const ::io::deephaven::proto::backplane::grpc::UpdateByWindowScale& _internal_reverse_window_scale() const;
-  ::io::deephaven::proto::backplane::grpc::UpdateByWindowScale* _internal_mutable_reverse_window_scale();
-
-  public:
-  // .io.deephaven.proto.backplane.grpc.UpdateByWindowScale forward_window_scale = 2;
-  bool has_forward_window_scale() const;
-  void clear_forward_window_scale() ;
-  const ::io::deephaven::proto::backplane::grpc::UpdateByWindowScale& forward_window_scale() const;
-  PROTOBUF_NODISCARD ::io::deephaven::proto::backplane::grpc::UpdateByWindowScale* release_forward_window_scale();
-  ::io::deephaven::proto::backplane::grpc::UpdateByWindowScale* mutable_forward_window_scale();
-  void set_allocated_forward_window_scale(::io::deephaven::proto::backplane::grpc::UpdateByWindowScale* value);
-  void unsafe_arena_set_allocated_forward_window_scale(::io::deephaven::proto::backplane::grpc::UpdateByWindowScale* value);
-  ::io::deephaven::proto::backplane::grpc::UpdateByWindowScale* unsafe_arena_release_forward_window_scale();
-
-  private:
-  const ::io::deephaven::proto::backplane::grpc::UpdateByWindowScale& _internal_forward_window_scale() const;
-  ::io::deephaven::proto::backplane::grpc::UpdateByWindowScale* _internal_mutable_forward_window_scale();
-
-  public:
-  // @@protoc_insertion_point(class_scope:io.deephaven.proto.backplane.grpc.UpdateByRequest.UpdateByOperation.UpdateByColumn.UpdateBySpec.UpdateByRollingAvg)
- private:
-  class _Internal;
-
-  friend class ::google::protobuf::internal::TcParser;
-  static const ::google::protobuf::internal::TcParseTable<
-      1, 2, 2,
-      0, 2>
-      _table_;
-  friend class ::google::protobuf::MessageLite;
-  friend class ::google::protobuf::Arena;
-  template <typename T>
-  friend class ::google::protobuf::Arena::InternalHelper;
-  using InternalArenaConstructable_ = void;
-  using DestructorSkippable_ = void;
-  struct Impl_ {
-
-        inline explicit constexpr Impl_(
-            ::google::protobuf::internal::ConstantInitialized) noexcept;
-        inline explicit Impl_(::google::protobuf::internal::InternalVisibility visibility,
-                              ::google::protobuf::Arena* arena);
-        inline explicit Impl_(::google::protobuf::internal::InternalVisibility visibility,
-                              ::google::protobuf::Arena* arena, const Impl_& from);
-    ::google::protobuf::internal::HasBits<1> _has_bits_;
-    mutable ::google::protobuf::internal::CachedSize _cached_size_;
-    ::io::deephaven::proto::backplane::grpc::UpdateByWindowScale* reverse_window_scale_;
-    ::io::deephaven::proto::backplane::grpc::UpdateByWindowScale* forward_window_scale_;
-    PROTOBUF_TSAN_DECLARE_MEMBER
-  };
-  union { Impl_ _impl_; };
-  friend struct ::TableStruct_deephaven_2fproto_2ftable_2eproto;
-};// -------------------------------------------------------------------
-
-class UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByEms final :
-    public ::google::protobuf::Message /* @@protoc_insertion_point(class_definition:io.deephaven.proto.backplane.grpc.UpdateByRequest.UpdateByOperation.UpdateByColumn.UpdateBySpec.UpdateByEms) */ {
- public:
-  inline UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByEms() : UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByEms(nullptr) {}
-  ~UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByEms() override;
-  template<typename = void>
-  explicit PROTOBUF_CONSTEXPR UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByEms(::google::protobuf::internal::ConstantInitialized);
-
-  inline UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByEms(const UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByEms& from)
-      : UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByEms(nullptr, from) {}
-  UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByEms(UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByEms&& from) noexcept
-    : UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByEms() {
-    *this = ::std::move(from);
-  }
-
-  inline UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByEms& operator=(const UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByEms& from) {
-    CopyFrom(from);
-    return *this;
-  }
-  inline UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByEms& operator=(UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByEms&& from) noexcept {
-    if (this == &from) return *this;
-    if (GetArena() == from.GetArena()
-  #ifdef PROTOBUF_FORCE_COPY_IN_MOVE
-        && GetArena() != nullptr
-  #endif  // !PROTOBUF_FORCE_COPY_IN_MOVE
-    ) {
-      InternalSwap(&from);
-    } else {
-      CopyFrom(from);
-    }
-    return *this;
-  }
-
-  inline const ::google::protobuf::UnknownFieldSet& unknown_fields() const
-      ABSL_ATTRIBUTE_LIFETIME_BOUND {
-    return _internal_metadata_.unknown_fields<::google::protobuf::UnknownFieldSet>(::google::protobuf::UnknownFieldSet::default_instance);
-  }
-  inline ::google::protobuf::UnknownFieldSet* mutable_unknown_fields()
-      ABSL_ATTRIBUTE_LIFETIME_BOUND {
-    return _internal_metadata_.mutable_unknown_fields<::google::protobuf::UnknownFieldSet>();
-  }
-
-  static const ::google::protobuf::Descriptor* descriptor() {
-    return GetDescriptor();
-  }
-  static const ::google::protobuf::Descriptor* GetDescriptor() {
-    return default_instance().GetMetadata().descriptor;
-  }
-  static const ::google::protobuf::Reflection* GetReflection() {
-    return default_instance().GetMetadata().reflection;
-  }
-  static const UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByEms& default_instance() {
-    return *internal_default_instance();
-  }
-  static inline const UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByEms* internal_default_instance() {
-    return reinterpret_cast<const UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByEms*>(
-               &_UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByEms_default_instance_);
-  }
-  static constexpr int kIndexInFileMessages =
-    22;
-
-  friend void swap(UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByEms& a, UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByEms& b) {
-    a.Swap(&b);
-  }
-  inline void Swap(UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByEms* other) {
-    if (other == this) return;
-  #ifdef PROTOBUF_FORCE_COPY_IN_SWAP
-    if (GetArena() != nullptr &&
-        GetArena() == other->GetArena()) {
-   #else  // PROTOBUF_FORCE_COPY_IN_SWAP
-    if (GetArena() == other->GetArena()) {
-  #endif  // !PROTOBUF_FORCE_COPY_IN_SWAP
-      InternalSwap(other);
-    } else {
-      ::google::protobuf::internal::GenericSwap(this, other);
-    }
-  }
-  void UnsafeArenaSwap(UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByEms* other) {
-    if (other == this) return;
-    ABSL_DCHECK(GetArena() == other->GetArena());
-    InternalSwap(other);
-  }
-
-  // implements Message ----------------------------------------------
-
-  UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByEms* New(::google::protobuf::Arena* arena = nullptr) const final {
-    return CreateMaybeMessage<UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByEms>(arena);
-  }
-  using ::google::protobuf::Message::CopyFrom;
-  void CopyFrom(const UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByEms& from);
-  using ::google::protobuf::Message::MergeFrom;
-  void MergeFrom( const UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByEms& from) {
-    UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByEms::MergeImpl(*this, from);
-  }
-  private:
-  static void MergeImpl(::google::protobuf::Message& to_msg, const ::google::protobuf::Message& from_msg);
-  public:
-  PROTOBUF_ATTRIBUTE_REINITIALIZES void Clear() final;
-  bool IsInitialized() const final;
-
-  ::size_t ByteSizeLong() const final;
-  const char* _InternalParse(const char* ptr, ::google::protobuf::internal::ParseContext* ctx) final;
-  ::uint8_t* _InternalSerialize(
-      ::uint8_t* target, ::google::protobuf::io::EpsCopyOutputStream* stream) const final;
-  int GetCachedSize() const { return _impl_._cached_size_.Get(); }
-
-  private:
-  ::google::protobuf::internal::CachedSize* AccessCachedSize() const final;
-  void SharedCtor(::google::protobuf::Arena* arena);
-  void SharedDtor();
-  void InternalSwap(UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByEms* other);
-
-  private:
-  friend class ::google::protobuf::internal::AnyMetadata;
-  static ::absl::string_view FullMessageName() {
-    return "io.deephaven.proto.backplane.grpc.UpdateByRequest.UpdateByOperation.UpdateByColumn.UpdateBySpec.UpdateByEms";
-  }
-  protected:
-  explicit UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByEms(::google::protobuf::Arena* arena);
-  UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByEms(::google::protobuf::Arena* arena, const UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByEms& from);
-  public:
-
-  static const ClassData _class_data_;
-  const ::google::protobuf::Message::ClassData*GetClassData() const final;
-
-  ::google::protobuf::Metadata GetMetadata() const final;
-
-  // nested types ----------------------------------------------------
-
-  // accessors -------------------------------------------------------
-
-  enum : int {
-    kOptionsFieldNumber = 1,
-    kWindowScaleFieldNumber = 2,
-  };
-  // .io.deephaven.proto.backplane.grpc.UpdateByEmOptions options = 1;
-  bool has_options() const;
-  void clear_options() ;
-  const ::io::deephaven::proto::backplane::grpc::UpdateByEmOptions& options() const;
-  PROTOBUF_NODISCARD ::io::deephaven::proto::backplane::grpc::UpdateByEmOptions* release_options();
-  ::io::deephaven::proto::backplane::grpc::UpdateByEmOptions* mutable_options();
-  void set_allocated_options(::io::deephaven::proto::backplane::grpc::UpdateByEmOptions* value);
-  void unsafe_arena_set_allocated_options(::io::deephaven::proto::backplane::grpc::UpdateByEmOptions* value);
-  ::io::deephaven::proto::backplane::grpc::UpdateByEmOptions* unsafe_arena_release_options();
-
-  private:
-  const ::io::deephaven::proto::backplane::grpc::UpdateByEmOptions& _internal_options() const;
-  ::io::deephaven::proto::backplane::grpc::UpdateByEmOptions* _internal_mutable_options();
-
-  public:
-  // .io.deephaven.proto.backplane.grpc.UpdateByWindowScale window_scale = 2;
-  bool has_window_scale() const;
-  void clear_window_scale() ;
-  const ::io::deephaven::proto::backplane::grpc::UpdateByWindowScale& window_scale() const;
-  PROTOBUF_NODISCARD ::io::deephaven::proto::backplane::grpc::UpdateByWindowScale* release_window_scale();
-  ::io::deephaven::proto::backplane::grpc::UpdateByWindowScale* mutable_window_scale();
-  void set_allocated_window_scale(::io::deephaven::proto::backplane::grpc::UpdateByWindowScale* value);
-  void unsafe_arena_set_allocated_window_scale(::io::deephaven::proto::backplane::grpc::UpdateByWindowScale* value);
-  ::io::deephaven::proto::backplane::grpc::UpdateByWindowScale* unsafe_arena_release_window_scale();
-
-  private:
-  const ::io::deephaven::proto::backplane::grpc::UpdateByWindowScale& _internal_window_scale() const;
-  ::io::deephaven::proto::backplane::grpc::UpdateByWindowScale* _internal_mutable_window_scale();
-
-  public:
-  // @@protoc_insertion_point(class_scope:io.deephaven.proto.backplane.grpc.UpdateByRequest.UpdateByOperation.UpdateByColumn.UpdateBySpec.UpdateByEms)
- private:
-  class _Internal;
-
-  friend class ::google::protobuf::internal::TcParser;
-  static const ::google::protobuf::internal::TcParseTable<
-      1, 2, 2,
-      0, 2>
-      _table_;
-  friend class ::google::protobuf::MessageLite;
-  friend class ::google::protobuf::Arena;
-  template <typename T>
-  friend class ::google::protobuf::Arena::InternalHelper;
-  using InternalArenaConstructable_ = void;
-  using DestructorSkippable_ = void;
-  struct Impl_ {
-
-        inline explicit constexpr Impl_(
-            ::google::protobuf::internal::ConstantInitialized) noexcept;
-        inline explicit Impl_(::google::protobuf::internal::InternalVisibility visibility,
-                              ::google::protobuf::Arena* arena);
-        inline explicit Impl_(::google::protobuf::internal::InternalVisibility visibility,
-                              ::google::protobuf::Arena* arena, const Impl_& from);
-    ::google::protobuf::internal::HasBits<1> _has_bits_;
-    mutable ::google::protobuf::internal::CachedSize _cached_size_;
-    ::io::deephaven::proto::backplane::grpc::UpdateByEmOptions* options_;
-    ::io::deephaven::proto::backplane::grpc::UpdateByWindowScale* window_scale_;
-    PROTOBUF_TSAN_DECLARE_MEMBER
-  };
-  union { Impl_ _impl_; };
-  friend struct ::TableStruct_deephaven_2fproto_2ftable_2eproto;
-};// -------------------------------------------------------------------
-
-class UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByEma final :
-    public ::google::protobuf::Message /* @@protoc_insertion_point(class_definition:io.deephaven.proto.backplane.grpc.UpdateByRequest.UpdateByOperation.UpdateByColumn.UpdateBySpec.UpdateByEma) */ {
- public:
-  inline UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByEma() : UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByEma(nullptr) {}
-  ~UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByEma() override;
-  template<typename = void>
-  explicit PROTOBUF_CONSTEXPR UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByEma(::google::protobuf::internal::ConstantInitialized);
-
-  inline UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByEma(const UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByEma& from)
-      : UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByEma(nullptr, from) {}
-  UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByEma(UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByEma&& from) noexcept
-    : UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByEma() {
-    *this = ::std::move(from);
-  }
-
-  inline UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByEma& operator=(const UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByEma& from) {
-    CopyFrom(from);
-    return *this;
-  }
-  inline UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByEma& operator=(UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByEma&& from) noexcept {
-    if (this == &from) return *this;
-    if (GetArena() == from.GetArena()
-  #ifdef PROTOBUF_FORCE_COPY_IN_MOVE
-        && GetArena() != nullptr
-  #endif  // !PROTOBUF_FORCE_COPY_IN_MOVE
-    ) {
-      InternalSwap(&from);
-    } else {
-      CopyFrom(from);
-    }
-    return *this;
-  }
-
-  inline const ::google::protobuf::UnknownFieldSet& unknown_fields() const
-      ABSL_ATTRIBUTE_LIFETIME_BOUND {
-    return _internal_metadata_.unknown_fields<::google::protobuf::UnknownFieldSet>(::google::protobuf::UnknownFieldSet::default_instance);
-  }
-  inline ::google::protobuf::UnknownFieldSet* mutable_unknown_fields()
-      ABSL_ATTRIBUTE_LIFETIME_BOUND {
-    return _internal_metadata_.mutable_unknown_fields<::google::protobuf::UnknownFieldSet>();
-  }
-
-  static const ::google::protobuf::Descriptor* descriptor() {
-    return GetDescriptor();
-  }
-  static const ::google::protobuf::Descriptor* GetDescriptor() {
-    return default_instance().GetMetadata().descriptor;
-  }
-  static const ::google::protobuf::Reflection* GetReflection() {
-    return default_instance().GetMetadata().reflection;
-  }
-  static const UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByEma& default_instance() {
-    return *internal_default_instance();
-  }
-  static inline const UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByEma* internal_default_instance() {
-    return reinterpret_cast<const UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByEma*>(
-               &_UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByEma_default_instance_);
-  }
-  static constexpr int kIndexInFileMessages =
-    21;
-
-  friend void swap(UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByEma& a, UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByEma& b) {
-    a.Swap(&b);
-  }
-  inline void Swap(UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByEma* other) {
-    if (other == this) return;
-  #ifdef PROTOBUF_FORCE_COPY_IN_SWAP
-    if (GetArena() != nullptr &&
-        GetArena() == other->GetArena()) {
-   #else  // PROTOBUF_FORCE_COPY_IN_SWAP
-    if (GetArena() == other->GetArena()) {
-  #endif  // !PROTOBUF_FORCE_COPY_IN_SWAP
-      InternalSwap(other);
-    } else {
-      ::google::protobuf::internal::GenericSwap(this, other);
-    }
-  }
-  void UnsafeArenaSwap(UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByEma* other) {
-    if (other == this) return;
-    ABSL_DCHECK(GetArena() == other->GetArena());
-    InternalSwap(other);
-  }
-
-  // implements Message ----------------------------------------------
-
-  UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByEma* New(::google::protobuf::Arena* arena = nullptr) const final {
-    return CreateMaybeMessage<UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByEma>(arena);
-  }
-  using ::google::protobuf::Message::CopyFrom;
-  void CopyFrom(const UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByEma& from);
-  using ::google::protobuf::Message::MergeFrom;
-  void MergeFrom( const UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByEma& from) {
-    UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByEma::MergeImpl(*this, from);
-  }
-  private:
-  static void MergeImpl(::google::protobuf::Message& to_msg, const ::google::protobuf::Message& from_msg);
-  public:
-  PROTOBUF_ATTRIBUTE_REINITIALIZES void Clear() final;
-  bool IsInitialized() const final;
-
-  ::size_t ByteSizeLong() const final;
-  const char* _InternalParse(const char* ptr, ::google::protobuf::internal::ParseContext* ctx) final;
-  ::uint8_t* _InternalSerialize(
-      ::uint8_t* target, ::google::protobuf::io::EpsCopyOutputStream* stream) const final;
-  int GetCachedSize() const { return _impl_._cached_size_.Get(); }
-
-  private:
-  ::google::protobuf::internal::CachedSize* AccessCachedSize() const final;
-  void SharedCtor(::google::protobuf::Arena* arena);
-  void SharedDtor();
-  void InternalSwap(UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByEma* other);
-
-  private:
-  friend class ::google::protobuf::internal::AnyMetadata;
-  static ::absl::string_view FullMessageName() {
-    return "io.deephaven.proto.backplane.grpc.UpdateByRequest.UpdateByOperation.UpdateByColumn.UpdateBySpec.UpdateByEma";
-  }
-  protected:
-  explicit UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByEma(::google::protobuf::Arena* arena);
-  UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByEma(::google::protobuf::Arena* arena, const UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByEma& from);
-  public:
-
-  static const ClassData _class_data_;
-  const ::google::protobuf::Message::ClassData*GetClassData() const final;
-
-  ::google::protobuf::Metadata GetMetadata() const final;
-
-  // nested types ----------------------------------------------------
-
-  // accessors -------------------------------------------------------
-
-  enum : int {
-    kOptionsFieldNumber = 1,
-    kWindowScaleFieldNumber = 2,
-  };
-  // .io.deephaven.proto.backplane.grpc.UpdateByEmOptions options = 1;
-  bool has_options() const;
-  void clear_options() ;
-  const ::io::deephaven::proto::backplane::grpc::UpdateByEmOptions& options() const;
-  PROTOBUF_NODISCARD ::io::deephaven::proto::backplane::grpc::UpdateByEmOptions* release_options();
-  ::io::deephaven::proto::backplane::grpc::UpdateByEmOptions* mutable_options();
-  void set_allocated_options(::io::deephaven::proto::backplane::grpc::UpdateByEmOptions* value);
-  void unsafe_arena_set_allocated_options(::io::deephaven::proto::backplane::grpc::UpdateByEmOptions* value);
-  ::io::deephaven::proto::backplane::grpc::UpdateByEmOptions* unsafe_arena_release_options();
-
-  private:
-  const ::io::deephaven::proto::backplane::grpc::UpdateByEmOptions& _internal_options() const;
-  ::io::deephaven::proto::backplane::grpc::UpdateByEmOptions* _internal_mutable_options();
-
-  public:
-  // .io.deephaven.proto.backplane.grpc.UpdateByWindowScale window_scale = 2;
-  bool has_window_scale() const;
-  void clear_window_scale() ;
-  const ::io::deephaven::proto::backplane::grpc::UpdateByWindowScale& window_scale() const;
-  PROTOBUF_NODISCARD ::io::deephaven::proto::backplane::grpc::UpdateByWindowScale* release_window_scale();
-  ::io::deephaven::proto::backplane::grpc::UpdateByWindowScale* mutable_window_scale();
-  void set_allocated_window_scale(::io::deephaven::proto::backplane::grpc::UpdateByWindowScale* value);
-  void unsafe_arena_set_allocated_window_scale(::io::deephaven::proto::backplane::grpc::UpdateByWindowScale* value);
-  ::io::deephaven::proto::backplane::grpc::UpdateByWindowScale* unsafe_arena_release_window_scale();
-
-  private:
-  const ::io::deephaven::proto::backplane::grpc::UpdateByWindowScale& _internal_window_scale() const;
-  ::io::deephaven::proto::backplane::grpc::UpdateByWindowScale* _internal_mutable_window_scale();
-
-  public:
-  // @@protoc_insertion_point(class_scope:io.deephaven.proto.backplane.grpc.UpdateByRequest.UpdateByOperation.UpdateByColumn.UpdateBySpec.UpdateByEma)
- private:
-  class _Internal;
-
-  friend class ::google::protobuf::internal::TcParser;
-  static const ::google::protobuf::internal::TcParseTable<
-      1, 2, 2,
-      0, 2>
-      _table_;
-  friend class ::google::protobuf::MessageLite;
-  friend class ::google::protobuf::Arena;
-  template <typename T>
-  friend class ::google::protobuf::Arena::InternalHelper;
-  using InternalArenaConstructable_ = void;
-  using DestructorSkippable_ = void;
-  struct Impl_ {
-
-        inline explicit constexpr Impl_(
-            ::google::protobuf::internal::ConstantInitialized) noexcept;
-        inline explicit Impl_(::google::protobuf::internal::InternalVisibility visibility,
-                              ::google::protobuf::Arena* arena);
-        inline explicit Impl_(::google::protobuf::internal::InternalVisibility visibility,
-                              ::google::protobuf::Arena* arena, const Impl_& from);
-    ::google::protobuf::internal::HasBits<1> _has_bits_;
-    mutable ::google::protobuf::internal::CachedSize _cached_size_;
-    ::io::deephaven::proto::backplane::grpc::UpdateByEmOptions* options_;
-    ::io::deephaven::proto::backplane::grpc::UpdateByWindowScale* window_scale_;
-    PROTOBUF_TSAN_DECLARE_MEMBER
-  };
-  union { Impl_ _impl_; };
-  friend struct ::TableStruct_deephaven_2fproto_2ftable_2eproto;
-};// -------------------------------------------------------------------
-
-class UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByEmStd final :
-    public ::google::protobuf::Message /* @@protoc_insertion_point(class_definition:io.deephaven.proto.backplane.grpc.UpdateByRequest.UpdateByOperation.UpdateByColumn.UpdateBySpec.UpdateByEmStd) */ {
- public:
-  inline UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByEmStd() : UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByEmStd(nullptr) {}
-  ~UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByEmStd() override;
-  template<typename = void>
-  explicit PROTOBUF_CONSTEXPR UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByEmStd(::google::protobuf::internal::ConstantInitialized);
-
-  inline UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByEmStd(const UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByEmStd& from)
-      : UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByEmStd(nullptr, from) {}
-  UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByEmStd(UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByEmStd&& from) noexcept
-    : UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByEmStd() {
-    *this = ::std::move(from);
-  }
-
-  inline UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByEmStd& operator=(const UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByEmStd& from) {
-    CopyFrom(from);
-    return *this;
-  }
-  inline UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByEmStd& operator=(UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByEmStd&& from) noexcept {
-    if (this == &from) return *this;
-    if (GetArena() == from.GetArena()
-  #ifdef PROTOBUF_FORCE_COPY_IN_MOVE
-        && GetArena() != nullptr
-  #endif  // !PROTOBUF_FORCE_COPY_IN_MOVE
-    ) {
-      InternalSwap(&from);
-    } else {
-      CopyFrom(from);
-    }
-    return *this;
-  }
-
-  inline const ::google::protobuf::UnknownFieldSet& unknown_fields() const
-      ABSL_ATTRIBUTE_LIFETIME_BOUND {
-    return _internal_metadata_.unknown_fields<::google::protobuf::UnknownFieldSet>(::google::protobuf::UnknownFieldSet::default_instance);
-  }
-  inline ::google::protobuf::UnknownFieldSet* mutable_unknown_fields()
-      ABSL_ATTRIBUTE_LIFETIME_BOUND {
-    return _internal_metadata_.mutable_unknown_fields<::google::protobuf::UnknownFieldSet>();
-  }
-
-  static const ::google::protobuf::Descriptor* descriptor() {
-    return GetDescriptor();
-  }
-  static const ::google::protobuf::Descriptor* GetDescriptor() {
-    return default_instance().GetMetadata().descriptor;
-  }
-  static const ::google::protobuf::Reflection* GetReflection() {
-    return default_instance().GetMetadata().reflection;
-  }
-  static const UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByEmStd& default_instance() {
-    return *internal_default_instance();
-  }
-  static inline const UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByEmStd* internal_default_instance() {
-    return reinterpret_cast<const UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByEmStd*>(
-               &_UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByEmStd_default_instance_);
-  }
-  static constexpr int kIndexInFileMessages =
-    25;
-
-  friend void swap(UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByEmStd& a, UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByEmStd& b) {
-    a.Swap(&b);
-  }
-  inline void Swap(UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByEmStd* other) {
-    if (other == this) return;
-  #ifdef PROTOBUF_FORCE_COPY_IN_SWAP
-    if (GetArena() != nullptr &&
-        GetArena() == other->GetArena()) {
-   #else  // PROTOBUF_FORCE_COPY_IN_SWAP
-    if (GetArena() == other->GetArena()) {
-  #endif  // !PROTOBUF_FORCE_COPY_IN_SWAP
-      InternalSwap(other);
-    } else {
-      ::google::protobuf::internal::GenericSwap(this, other);
-    }
-  }
-  void UnsafeArenaSwap(UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByEmStd* other) {
-    if (other == this) return;
-    ABSL_DCHECK(GetArena() == other->GetArena());
-    InternalSwap(other);
-  }
-
-  // implements Message ----------------------------------------------
-
-  UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByEmStd* New(::google::protobuf::Arena* arena = nullptr) const final {
-    return CreateMaybeMessage<UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByEmStd>(arena);
-  }
-  using ::google::protobuf::Message::CopyFrom;
-  void CopyFrom(const UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByEmStd& from);
-  using ::google::protobuf::Message::MergeFrom;
-  void MergeFrom( const UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByEmStd& from) {
-    UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByEmStd::MergeImpl(*this, from);
-  }
-  private:
-  static void MergeImpl(::google::protobuf::Message& to_msg, const ::google::protobuf::Message& from_msg);
-  public:
-  PROTOBUF_ATTRIBUTE_REINITIALIZES void Clear() final;
-  bool IsInitialized() const final;
-
-  ::size_t ByteSizeLong() const final;
-  const char* _InternalParse(const char* ptr, ::google::protobuf::internal::ParseContext* ctx) final;
-  ::uint8_t* _InternalSerialize(
-      ::uint8_t* target, ::google::protobuf::io::EpsCopyOutputStream* stream) const final;
-  int GetCachedSize() const { return _impl_._cached_size_.Get(); }
-
-  private:
-  ::google::protobuf::internal::CachedSize* AccessCachedSize() const final;
-  void SharedCtor(::google::protobuf::Arena* arena);
-  void SharedDtor();
-  void InternalSwap(UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByEmStd* other);
-
-  private:
-  friend class ::google::protobuf::internal::AnyMetadata;
-  static ::absl::string_view FullMessageName() {
-    return "io.deephaven.proto.backplane.grpc.UpdateByRequest.UpdateByOperation.UpdateByColumn.UpdateBySpec.UpdateByEmStd";
-  }
-  protected:
-  explicit UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByEmStd(::google::protobuf::Arena* arena);
-  UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByEmStd(::google::protobuf::Arena* arena, const UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByEmStd& from);
-  public:
-
-  static const ClassData _class_data_;
-  const ::google::protobuf::Message::ClassData*GetClassData() const final;
-
-  ::google::protobuf::Metadata GetMetadata() const final;
-
-  // nested types ----------------------------------------------------
-
-  // accessors -------------------------------------------------------
-
-  enum : int {
-    kOptionsFieldNumber = 1,
-    kWindowScaleFieldNumber = 2,
-  };
-  // .io.deephaven.proto.backplane.grpc.UpdateByEmOptions options = 1;
-  bool has_options() const;
-  void clear_options() ;
-  const ::io::deephaven::proto::backplane::grpc::UpdateByEmOptions& options() const;
-  PROTOBUF_NODISCARD ::io::deephaven::proto::backplane::grpc::UpdateByEmOptions* release_options();
-  ::io::deephaven::proto::backplane::grpc::UpdateByEmOptions* mutable_options();
-  void set_allocated_options(::io::deephaven::proto::backplane::grpc::UpdateByEmOptions* value);
-  void unsafe_arena_set_allocated_options(::io::deephaven::proto::backplane::grpc::UpdateByEmOptions* value);
-  ::io::deephaven::proto::backplane::grpc::UpdateByEmOptions* unsafe_arena_release_options();
-
-  private:
-  const ::io::deephaven::proto::backplane::grpc::UpdateByEmOptions& _internal_options() const;
-  ::io::deephaven::proto::backplane::grpc::UpdateByEmOptions* _internal_mutable_options();
-
-  public:
-  // .io.deephaven.proto.backplane.grpc.UpdateByWindowScale window_scale = 2;
-  bool has_window_scale() const;
-  void clear_window_scale() ;
-  const ::io::deephaven::proto::backplane::grpc::UpdateByWindowScale& window_scale() const;
-  PROTOBUF_NODISCARD ::io::deephaven::proto::backplane::grpc::UpdateByWindowScale* release_window_scale();
-  ::io::deephaven::proto::backplane::grpc::UpdateByWindowScale* mutable_window_scale();
-  void set_allocated_window_scale(::io::deephaven::proto::backplane::grpc::UpdateByWindowScale* value);
-  void unsafe_arena_set_allocated_window_scale(::io::deephaven::proto::backplane::grpc::UpdateByWindowScale* value);
-  ::io::deephaven::proto::backplane::grpc::UpdateByWindowScale* unsafe_arena_release_window_scale();
-
-  private:
-  const ::io::deephaven::proto::backplane::grpc::UpdateByWindowScale& _internal_window_scale() const;
-  ::io::deephaven::proto::backplane::grpc::UpdateByWindowScale* _internal_mutable_window_scale();
-
-  public:
-  // @@protoc_insertion_point(class_scope:io.deephaven.proto.backplane.grpc.UpdateByRequest.UpdateByOperation.UpdateByColumn.UpdateBySpec.UpdateByEmStd)
- private:
-  class _Internal;
-
-  friend class ::google::protobuf::internal::TcParser;
-  static const ::google::protobuf::internal::TcParseTable<
-      1, 2, 2,
-      0, 2>
-      _table_;
-  friend class ::google::protobuf::MessageLite;
-  friend class ::google::protobuf::Arena;
-  template <typename T>
-  friend class ::google::protobuf::Arena::InternalHelper;
-  using InternalArenaConstructable_ = void;
-  using DestructorSkippable_ = void;
-  struct Impl_ {
-
-        inline explicit constexpr Impl_(
-            ::google::protobuf::internal::ConstantInitialized) noexcept;
-        inline explicit Impl_(::google::protobuf::internal::InternalVisibility visibility,
-                              ::google::protobuf::Arena* arena);
-        inline explicit Impl_(::google::protobuf::internal::InternalVisibility visibility,
-                              ::google::protobuf::Arena* arena, const Impl_& from);
-    ::google::protobuf::internal::HasBits<1> _has_bits_;
-    mutable ::google::protobuf::internal::CachedSize _cached_size_;
-    ::io::deephaven::proto::backplane::grpc::UpdateByEmOptions* options_;
-    ::io::deephaven::proto::backplane::grpc::UpdateByWindowScale* window_scale_;
-    PROTOBUF_TSAN_DECLARE_MEMBER
-  };
-  union { Impl_ _impl_; };
-  friend struct ::TableStruct_deephaven_2fproto_2ftable_2eproto;
-};// -------------------------------------------------------------------
-
-class UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByEmMin final :
-    public ::google::protobuf::Message /* @@protoc_insertion_point(class_definition:io.deephaven.proto.backplane.grpc.UpdateByRequest.UpdateByOperation.UpdateByColumn.UpdateBySpec.UpdateByEmMin) */ {
- public:
-  inline UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByEmMin() : UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByEmMin(nullptr) {}
-  ~UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByEmMin() override;
-  template<typename = void>
-  explicit PROTOBUF_CONSTEXPR UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByEmMin(::google::protobuf::internal::ConstantInitialized);
-
-  inline UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByEmMin(const UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByEmMin& from)
-      : UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByEmMin(nullptr, from) {}
-  UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByEmMin(UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByEmMin&& from) noexcept
-    : UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByEmMin() {
-    *this = ::std::move(from);
-  }
-
-  inline UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByEmMin& operator=(const UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByEmMin& from) {
-    CopyFrom(from);
-    return *this;
-  }
-  inline UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByEmMin& operator=(UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByEmMin&& from) noexcept {
-    if (this == &from) return *this;
-    if (GetArena() == from.GetArena()
-  #ifdef PROTOBUF_FORCE_COPY_IN_MOVE
-        && GetArena() != nullptr
-  #endif  // !PROTOBUF_FORCE_COPY_IN_MOVE
-    ) {
-      InternalSwap(&from);
-    } else {
-      CopyFrom(from);
-    }
-    return *this;
-  }
-
-  inline const ::google::protobuf::UnknownFieldSet& unknown_fields() const
-      ABSL_ATTRIBUTE_LIFETIME_BOUND {
-    return _internal_metadata_.unknown_fields<::google::protobuf::UnknownFieldSet>(::google::protobuf::UnknownFieldSet::default_instance);
-  }
-  inline ::google::protobuf::UnknownFieldSet* mutable_unknown_fields()
-      ABSL_ATTRIBUTE_LIFETIME_BOUND {
-    return _internal_metadata_.mutable_unknown_fields<::google::protobuf::UnknownFieldSet>();
-  }
-
-  static const ::google::protobuf::Descriptor* descriptor() {
-    return GetDescriptor();
-  }
-  static const ::google::protobuf::Descriptor* GetDescriptor() {
-    return default_instance().GetMetadata().descriptor;
-  }
-  static const ::google::protobuf::Reflection* GetReflection() {
-    return default_instance().GetMetadata().reflection;
-  }
-  static const UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByEmMin& default_instance() {
-    return *internal_default_instance();
-  }
-  static inline const UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByEmMin* internal_default_instance() {
-    return reinterpret_cast<const UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByEmMin*>(
-               &_UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByEmMin_default_instance_);
-  }
-  static constexpr int kIndexInFileMessages =
-    23;
-
-  friend void swap(UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByEmMin& a, UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByEmMin& b) {
-    a.Swap(&b);
-  }
-  inline void Swap(UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByEmMin* other) {
-    if (other == this) return;
-  #ifdef PROTOBUF_FORCE_COPY_IN_SWAP
-    if (GetArena() != nullptr &&
-        GetArena() == other->GetArena()) {
-   #else  // PROTOBUF_FORCE_COPY_IN_SWAP
-    if (GetArena() == other->GetArena()) {
-  #endif  // !PROTOBUF_FORCE_COPY_IN_SWAP
-      InternalSwap(other);
-    } else {
-      ::google::protobuf::internal::GenericSwap(this, other);
-    }
-  }
-  void UnsafeArenaSwap(UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByEmMin* other) {
-    if (other == this) return;
-    ABSL_DCHECK(GetArena() == other->GetArena());
-    InternalSwap(other);
-  }
-
-  // implements Message ----------------------------------------------
-
-  UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByEmMin* New(::google::protobuf::Arena* arena = nullptr) const final {
-    return CreateMaybeMessage<UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByEmMin>(arena);
-  }
-  using ::google::protobuf::Message::CopyFrom;
-  void CopyFrom(const UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByEmMin& from);
-  using ::google::protobuf::Message::MergeFrom;
-  void MergeFrom( const UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByEmMin& from) {
-    UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByEmMin::MergeImpl(*this, from);
-  }
-  private:
-  static void MergeImpl(::google::protobuf::Message& to_msg, const ::google::protobuf::Message& from_msg);
-  public:
-  PROTOBUF_ATTRIBUTE_REINITIALIZES void Clear() final;
-  bool IsInitialized() const final;
-
-  ::size_t ByteSizeLong() const final;
-  const char* _InternalParse(const char* ptr, ::google::protobuf::internal::ParseContext* ctx) final;
-  ::uint8_t* _InternalSerialize(
-      ::uint8_t* target, ::google::protobuf::io::EpsCopyOutputStream* stream) const final;
-  int GetCachedSize() const { return _impl_._cached_size_.Get(); }
-
-  private:
-  ::google::protobuf::internal::CachedSize* AccessCachedSize() const final;
-  void SharedCtor(::google::protobuf::Arena* arena);
-  void SharedDtor();
-  void InternalSwap(UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByEmMin* other);
-
-  private:
-  friend class ::google::protobuf::internal::AnyMetadata;
-  static ::absl::string_view FullMessageName() {
-    return "io.deephaven.proto.backplane.grpc.UpdateByRequest.UpdateByOperation.UpdateByColumn.UpdateBySpec.UpdateByEmMin";
-  }
-  protected:
-  explicit UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByEmMin(::google::protobuf::Arena* arena);
-  UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByEmMin(::google::protobuf::Arena* arena, const UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByEmMin& from);
-  public:
-
-  static const ClassData _class_data_;
-  const ::google::protobuf::Message::ClassData*GetClassData() const final;
-
-  ::google::protobuf::Metadata GetMetadata() const final;
-
-  // nested types ----------------------------------------------------
-
-  // accessors -------------------------------------------------------
-
-  enum : int {
-    kOptionsFieldNumber = 1,
-    kWindowScaleFieldNumber = 2,
-  };
-  // .io.deephaven.proto.backplane.grpc.UpdateByEmOptions options = 1;
-  bool has_options() const;
-  void clear_options() ;
-  const ::io::deephaven::proto::backplane::grpc::UpdateByEmOptions& options() const;
-  PROTOBUF_NODISCARD ::io::deephaven::proto::backplane::grpc::UpdateByEmOptions* release_options();
-  ::io::deephaven::proto::backplane::grpc::UpdateByEmOptions* mutable_options();
-  void set_allocated_options(::io::deephaven::proto::backplane::grpc::UpdateByEmOptions* value);
-  void unsafe_arena_set_allocated_options(::io::deephaven::proto::backplane::grpc::UpdateByEmOptions* value);
-  ::io::deephaven::proto::backplane::grpc::UpdateByEmOptions* unsafe_arena_release_options();
-
-  private:
-  const ::io::deephaven::proto::backplane::grpc::UpdateByEmOptions& _internal_options() const;
-  ::io::deephaven::proto::backplane::grpc::UpdateByEmOptions* _internal_mutable_options();
-
-  public:
-  // .io.deephaven.proto.backplane.grpc.UpdateByWindowScale window_scale = 2;
-  bool has_window_scale() const;
-  void clear_window_scale() ;
-  const ::io::deephaven::proto::backplane::grpc::UpdateByWindowScale& window_scale() const;
-  PROTOBUF_NODISCARD ::io::deephaven::proto::backplane::grpc::UpdateByWindowScale* release_window_scale();
-  ::io::deephaven::proto::backplane::grpc::UpdateByWindowScale* mutable_window_scale();
-  void set_allocated_window_scale(::io::deephaven::proto::backplane::grpc::UpdateByWindowScale* value);
-  void unsafe_arena_set_allocated_window_scale(::io::deephaven::proto::backplane::grpc::UpdateByWindowScale* value);
-  ::io::deephaven::proto::backplane::grpc::UpdateByWindowScale* unsafe_arena_release_window_scale();
-
-  private:
-  const ::io::deephaven::proto::backplane::grpc::UpdateByWindowScale& _internal_window_scale() const;
-  ::io::deephaven::proto::backplane::grpc::UpdateByWindowScale* _internal_mutable_window_scale();
-
-  public:
-  // @@protoc_insertion_point(class_scope:io.deephaven.proto.backplane.grpc.UpdateByRequest.UpdateByOperation.UpdateByColumn.UpdateBySpec.UpdateByEmMin)
- private:
-  class _Internal;
-
-  friend class ::google::protobuf::internal::TcParser;
-  static const ::google::protobuf::internal::TcParseTable<
-      1, 2, 2,
-      0, 2>
-      _table_;
-  friend class ::google::protobuf::MessageLite;
-  friend class ::google::protobuf::Arena;
-  template <typename T>
-  friend class ::google::protobuf::Arena::InternalHelper;
-  using InternalArenaConstructable_ = void;
-  using DestructorSkippable_ = void;
-  struct Impl_ {
-
-        inline explicit constexpr Impl_(
-            ::google::protobuf::internal::ConstantInitialized) noexcept;
-        inline explicit Impl_(::google::protobuf::internal::InternalVisibility visibility,
-                              ::google::protobuf::Arena* arena);
-        inline explicit Impl_(::google::protobuf::internal::InternalVisibility visibility,
-                              ::google::protobuf::Arena* arena, const Impl_& from);
-    ::google::protobuf::internal::HasBits<1> _has_bits_;
-    mutable ::google::protobuf::internal::CachedSize _cached_size_;
-    ::io::deephaven::proto::backplane::grpc::UpdateByEmOptions* options_;
-    ::io::deephaven::proto::backplane::grpc::UpdateByWindowScale* window_scale_;
-    PROTOBUF_TSAN_DECLARE_MEMBER
-  };
-  union { Impl_ _impl_; };
-  friend struct ::TableStruct_deephaven_2fproto_2ftable_2eproto;
-};// -------------------------------------------------------------------
-
-class UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByEmMax final :
-    public ::google::protobuf::Message /* @@protoc_insertion_point(class_definition:io.deephaven.proto.backplane.grpc.UpdateByRequest.UpdateByOperation.UpdateByColumn.UpdateBySpec.UpdateByEmMax) */ {
- public:
-  inline UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByEmMax() : UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByEmMax(nullptr) {}
-  ~UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByEmMax() override;
-  template<typename = void>
-  explicit PROTOBUF_CONSTEXPR UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByEmMax(::google::protobuf::internal::ConstantInitialized);
-
-  inline UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByEmMax(const UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByEmMax& from)
-      : UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByEmMax(nullptr, from) {}
-  UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByEmMax(UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByEmMax&& from) noexcept
-    : UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByEmMax() {
-    *this = ::std::move(from);
-  }
-
-  inline UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByEmMax& operator=(const UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByEmMax& from) {
-    CopyFrom(from);
-    return *this;
-  }
-  inline UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByEmMax& operator=(UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByEmMax&& from) noexcept {
-    if (this == &from) return *this;
-    if (GetArena() == from.GetArena()
-  #ifdef PROTOBUF_FORCE_COPY_IN_MOVE
-        && GetArena() != nullptr
-  #endif  // !PROTOBUF_FORCE_COPY_IN_MOVE
-    ) {
-      InternalSwap(&from);
-    } else {
-      CopyFrom(from);
-    }
-    return *this;
-  }
-
-  inline const ::google::protobuf::UnknownFieldSet& unknown_fields() const
-      ABSL_ATTRIBUTE_LIFETIME_BOUND {
-    return _internal_metadata_.unknown_fields<::google::protobuf::UnknownFieldSet>(::google::protobuf::UnknownFieldSet::default_instance);
-  }
-  inline ::google::protobuf::UnknownFieldSet* mutable_unknown_fields()
-      ABSL_ATTRIBUTE_LIFETIME_BOUND {
-    return _internal_metadata_.mutable_unknown_fields<::google::protobuf::UnknownFieldSet>();
-  }
-
-  static const ::google::protobuf::Descriptor* descriptor() {
-    return GetDescriptor();
-  }
-  static const ::google::protobuf::Descriptor* GetDescriptor() {
-    return default_instance().GetMetadata().descriptor;
-  }
-  static const ::google::protobuf::Reflection* GetReflection() {
-    return default_instance().GetMetadata().reflection;
-  }
-  static const UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByEmMax& default_instance() {
-    return *internal_default_instance();
-  }
-  static inline const UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByEmMax* internal_default_instance() {
-    return reinterpret_cast<const UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByEmMax*>(
-               &_UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByEmMax_default_instance_);
-  }
-  static constexpr int kIndexInFileMessages =
-    24;
-
-  friend void swap(UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByEmMax& a, UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByEmMax& b) {
-    a.Swap(&b);
-  }
-  inline void Swap(UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByEmMax* other) {
-    if (other == this) return;
-  #ifdef PROTOBUF_FORCE_COPY_IN_SWAP
-    if (GetArena() != nullptr &&
-        GetArena() == other->GetArena()) {
-   #else  // PROTOBUF_FORCE_COPY_IN_SWAP
-    if (GetArena() == other->GetArena()) {
-  #endif  // !PROTOBUF_FORCE_COPY_IN_SWAP
-      InternalSwap(other);
-    } else {
-      ::google::protobuf::internal::GenericSwap(this, other);
-    }
-  }
-  void UnsafeArenaSwap(UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByEmMax* other) {
-    if (other == this) return;
-    ABSL_DCHECK(GetArena() == other->GetArena());
-    InternalSwap(other);
-  }
-
-  // implements Message ----------------------------------------------
-
-  UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByEmMax* New(::google::protobuf::Arena* arena = nullptr) const final {
-    return CreateMaybeMessage<UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByEmMax>(arena);
-  }
-  using ::google::protobuf::Message::CopyFrom;
-  void CopyFrom(const UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByEmMax& from);
-  using ::google::protobuf::Message::MergeFrom;
-  void MergeFrom( const UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByEmMax& from) {
-    UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByEmMax::MergeImpl(*this, from);
-  }
-  private:
-  static void MergeImpl(::google::protobuf::Message& to_msg, const ::google::protobuf::Message& from_msg);
-  public:
-  PROTOBUF_ATTRIBUTE_REINITIALIZES void Clear() final;
-  bool IsInitialized() const final;
-
-  ::size_t ByteSizeLong() const final;
-  const char* _InternalParse(const char* ptr, ::google::protobuf::internal::ParseContext* ctx) final;
-  ::uint8_t* _InternalSerialize(
-      ::uint8_t* target, ::google::protobuf::io::EpsCopyOutputStream* stream) const final;
-  int GetCachedSize() const { return _impl_._cached_size_.Get(); }
-
-  private:
-  ::google::protobuf::internal::CachedSize* AccessCachedSize() const final;
-  void SharedCtor(::google::protobuf::Arena* arena);
-  void SharedDtor();
-  void InternalSwap(UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByEmMax* other);
-
-  private:
-  friend class ::google::protobuf::internal::AnyMetadata;
-  static ::absl::string_view FullMessageName() {
-    return "io.deephaven.proto.backplane.grpc.UpdateByRequest.UpdateByOperation.UpdateByColumn.UpdateBySpec.UpdateByEmMax";
-  }
-  protected:
-  explicit UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByEmMax(::google::protobuf::Arena* arena);
-  UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByEmMax(::google::protobuf::Arena* arena, const UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByEmMax& from);
-  public:
-
-  static const ClassData _class_data_;
-  const ::google::protobuf::Message::ClassData*GetClassData() const final;
-
-  ::google::protobuf::Metadata GetMetadata() const final;
-
-  // nested types ----------------------------------------------------
-
-  // accessors -------------------------------------------------------
-
-  enum : int {
-    kOptionsFieldNumber = 1,
-    kWindowScaleFieldNumber = 2,
-  };
-  // .io.deephaven.proto.backplane.grpc.UpdateByEmOptions options = 1;
-  bool has_options() const;
-  void clear_options() ;
-  const ::io::deephaven::proto::backplane::grpc::UpdateByEmOptions& options() const;
-  PROTOBUF_NODISCARD ::io::deephaven::proto::backplane::grpc::UpdateByEmOptions* release_options();
-  ::io::deephaven::proto::backplane::grpc::UpdateByEmOptions* mutable_options();
-  void set_allocated_options(::io::deephaven::proto::backplane::grpc::UpdateByEmOptions* value);
-  void unsafe_arena_set_allocated_options(::io::deephaven::proto::backplane::grpc::UpdateByEmOptions* value);
-  ::io::deephaven::proto::backplane::grpc::UpdateByEmOptions* unsafe_arena_release_options();
-
-  private:
-  const ::io::deephaven::proto::backplane::grpc::UpdateByEmOptions& _internal_options() const;
-  ::io::deephaven::proto::backplane::grpc::UpdateByEmOptions* _internal_mutable_options();
-
-  public:
-  // .io.deephaven.proto.backplane.grpc.UpdateByWindowScale window_scale = 2;
-  bool has_window_scale() const;
-  void clear_window_scale() ;
-  const ::io::deephaven::proto::backplane::grpc::UpdateByWindowScale& window_scale() const;
-  PROTOBUF_NODISCARD ::io::deephaven::proto::backplane::grpc::UpdateByWindowScale* release_window_scale();
-  ::io::deephaven::proto::backplane::grpc::UpdateByWindowScale* mutable_window_scale();
-  void set_allocated_window_scale(::io::deephaven::proto::backplane::grpc::UpdateByWindowScale* value);
-  void unsafe_arena_set_allocated_window_scale(::io::deephaven::proto::backplane::grpc::UpdateByWindowScale* value);
-  ::io::deephaven::proto::backplane::grpc::UpdateByWindowScale* unsafe_arena_release_window_scale();
-
-  private:
-  const ::io::deephaven::proto::backplane::grpc::UpdateByWindowScale& _internal_window_scale() const;
-  ::io::deephaven::proto::backplane::grpc::UpdateByWindowScale* _internal_mutable_window_scale();
-
-  public:
-  // @@protoc_insertion_point(class_scope:io.deephaven.proto.backplane.grpc.UpdateByRequest.UpdateByOperation.UpdateByColumn.UpdateBySpec.UpdateByEmMax)
- private:
-  class _Internal;
-
-  friend class ::google::protobuf::internal::TcParser;
-  static const ::google::protobuf::internal::TcParseTable<
-      1, 2, 2,
-      0, 2>
-      _table_;
-  friend class ::google::protobuf::MessageLite;
-  friend class ::google::protobuf::Arena;
-  template <typename T>
-  friend class ::google::protobuf::Arena::InternalHelper;
-  using InternalArenaConstructable_ = void;
-  using DestructorSkippable_ = void;
-  struct Impl_ {
-
-        inline explicit constexpr Impl_(
-            ::google::protobuf::internal::ConstantInitialized) noexcept;
-        inline explicit Impl_(::google::protobuf::internal::InternalVisibility visibility,
-                              ::google::protobuf::Arena* arena);
-        inline explicit Impl_(::google::protobuf::internal::InternalVisibility visibility,
-                              ::google::protobuf::Arena* arena, const Impl_& from);
-    ::google::protobuf::internal::HasBits<1> _has_bits_;
-    mutable ::google::protobuf::internal::CachedSize _cached_size_;
-    ::io::deephaven::proto::backplane::grpc::UpdateByEmOptions* options_;
-    ::io::deephaven::proto::backplane::grpc::UpdateByWindowScale* window_scale_;
-    PROTOBUF_TSAN_DECLARE_MEMBER
-  };
-  union { Impl_ _impl_; };
-  friend struct ::TableStruct_deephaven_2fproto_2ftable_2eproto;
-};// -------------------------------------------------------------------
-
-class UnstructuredFilterTableRequest final :
-    public ::google::protobuf::Message /* @@protoc_insertion_point(class_definition:io.deephaven.proto.backplane.grpc.UnstructuredFilterTableRequest) */ {
- public:
-  inline UnstructuredFilterTableRequest() : UnstructuredFilterTableRequest(nullptr) {}
-  ~UnstructuredFilterTableRequest() override;
-  template<typename = void>
-  explicit PROTOBUF_CONSTEXPR UnstructuredFilterTableRequest(::google::protobuf::internal::ConstantInitialized);
-
-  inline UnstructuredFilterTableRequest(const UnstructuredFilterTableRequest& from)
-      : UnstructuredFilterTableRequest(nullptr, from) {}
-  UnstructuredFilterTableRequest(UnstructuredFilterTableRequest&& from) noexcept
-    : UnstructuredFilterTableRequest() {
-    *this = ::std::move(from);
-  }
-
-  inline UnstructuredFilterTableRequest& operator=(const UnstructuredFilterTableRequest& from) {
-    CopyFrom(from);
-    return *this;
-  }
-  inline UnstructuredFilterTableRequest& operator=(UnstructuredFilterTableRequest&& from) noexcept {
-    if (this == &from) return *this;
-    if (GetArena() == from.GetArena()
-  #ifdef PROTOBUF_FORCE_COPY_IN_MOVE
-        && GetArena() != nullptr
-  #endif  // !PROTOBUF_FORCE_COPY_IN_MOVE
-    ) {
-      InternalSwap(&from);
-    } else {
-      CopyFrom(from);
-    }
-    return *this;
-  }
-
-  inline const ::google::protobuf::UnknownFieldSet& unknown_fields() const
-      ABSL_ATTRIBUTE_LIFETIME_BOUND {
-    return _internal_metadata_.unknown_fields<::google::protobuf::UnknownFieldSet>(::google::protobuf::UnknownFieldSet::default_instance);
-  }
-  inline ::google::protobuf::UnknownFieldSet* mutable_unknown_fields()
-      ABSL_ATTRIBUTE_LIFETIME_BOUND {
-    return _internal_metadata_.mutable_unknown_fields<::google::protobuf::UnknownFieldSet>();
-  }
-
-  static const ::google::protobuf::Descriptor* descriptor() {
-    return GetDescriptor();
-  }
-  static const ::google::protobuf::Descriptor* GetDescriptor() {
-    return default_instance().GetMetadata().descriptor;
-  }
-  static const ::google::protobuf::Reflection* GetReflection() {
-    return default_instance().GetMetadata().reflection;
-  }
-  static const UnstructuredFilterTableRequest& default_instance() {
-    return *internal_default_instance();
-  }
-  static inline const UnstructuredFilterTableRequest* internal_default_instance() {
-    return reinterpret_cast<const UnstructuredFilterTableRequest*>(
-               &_UnstructuredFilterTableRequest_default_instance_);
-  }
-  static constexpr int kIndexInFileMessages =
-    43;
-
-  friend void swap(UnstructuredFilterTableRequest& a, UnstructuredFilterTableRequest& b) {
-    a.Swap(&b);
-  }
-  inline void Swap(UnstructuredFilterTableRequest* other) {
-    if (other == this) return;
-  #ifdef PROTOBUF_FORCE_COPY_IN_SWAP
-    if (GetArena() != nullptr &&
-        GetArena() == other->GetArena()) {
-   #else  // PROTOBUF_FORCE_COPY_IN_SWAP
-    if (GetArena() == other->GetArena()) {
-  #endif  // !PROTOBUF_FORCE_COPY_IN_SWAP
-      InternalSwap(other);
-    } else {
-      ::google::protobuf::internal::GenericSwap(this, other);
-    }
-  }
-  void UnsafeArenaSwap(UnstructuredFilterTableRequest* other) {
-    if (other == this) return;
-    ABSL_DCHECK(GetArena() == other->GetArena());
-    InternalSwap(other);
-  }
-
-  // implements Message ----------------------------------------------
-
-  UnstructuredFilterTableRequest* New(::google::protobuf::Arena* arena = nullptr) const final {
-    return CreateMaybeMessage<UnstructuredFilterTableRequest>(arena);
-  }
-  using ::google::protobuf::Message::CopyFrom;
-  void CopyFrom(const UnstructuredFilterTableRequest& from);
-  using ::google::protobuf::Message::MergeFrom;
-  void MergeFrom( const UnstructuredFilterTableRequest& from) {
-    UnstructuredFilterTableRequest::MergeImpl(*this, from);
-  }
-  private:
-  static void MergeImpl(::google::protobuf::Message& to_msg, const ::google::protobuf::Message& from_msg);
-  public:
-  PROTOBUF_ATTRIBUTE_REINITIALIZES void Clear() final;
-  bool IsInitialized() const final;
-
-  ::size_t ByteSizeLong() const final;
-  const char* _InternalParse(const char* ptr, ::google::protobuf::internal::ParseContext* ctx) final;
-  ::uint8_t* _InternalSerialize(
-      ::uint8_t* target, ::google::protobuf::io::EpsCopyOutputStream* stream) const final;
-  int GetCachedSize() const { return _impl_._cached_size_.Get(); }
-
-  private:
-  ::google::protobuf::internal::CachedSize* AccessCachedSize() const final;
-  void SharedCtor(::google::protobuf::Arena* arena);
-  void SharedDtor();
-  void InternalSwap(UnstructuredFilterTableRequest* other);
-
-  private:
-  friend class ::google::protobuf::internal::AnyMetadata;
-  static ::absl::string_view FullMessageName() {
-    return "io.deephaven.proto.backplane.grpc.UnstructuredFilterTableRequest";
-  }
-  protected:
-  explicit UnstructuredFilterTableRequest(::google::protobuf::Arena* arena);
-  UnstructuredFilterTableRequest(::google::protobuf::Arena* arena, const UnstructuredFilterTableRequest& from);
-  public:
-
-  static const ClassData _class_data_;
-  const ::google::protobuf::Message::ClassData*GetClassData() const final;
-
-  ::google::protobuf::Metadata GetMetadata() const final;
-
-  // nested types ----------------------------------------------------
-
-  // accessors -------------------------------------------------------
-
-  enum : int {
-    kFiltersFieldNumber = 3,
-    kResultIdFieldNumber = 1,
-    kSourceIdFieldNumber = 2,
-  };
-  // repeated string filters = 3;
-  int filters_size() const;
-  private:
-  int _internal_filters_size() const;
-
-  public:
-  void clear_filters() ;
-  const std::string& filters(int index) const;
-  std::string* mutable_filters(int index);
-  void set_filters(int index, const std::string& value);
-  void set_filters(int index, std::string&& value);
-  void set_filters(int index, const char* value);
-  void set_filters(int index, const char* value, std::size_t size);
-  void set_filters(int index, absl::string_view value);
-  std::string* add_filters();
-  void add_filters(const std::string& value);
-  void add_filters(std::string&& value);
-  void add_filters(const char* value);
-  void add_filters(const char* value, std::size_t size);
-  void add_filters(absl::string_view value);
-  const ::google::protobuf::RepeatedPtrField<std::string>& filters() const;
-  ::google::protobuf::RepeatedPtrField<std::string>* mutable_filters();
-
-  private:
-  const ::google::protobuf::RepeatedPtrField<std::string>& _internal_filters() const;
-  ::google::protobuf::RepeatedPtrField<std::string>* _internal_mutable_filters();
-
-  public:
-  // .io.deephaven.proto.backplane.grpc.Ticket result_id = 1;
-  bool has_result_id() const;
-  void clear_result_id() ;
-  const ::io::deephaven::proto::backplane::grpc::Ticket& result_id() const;
-  PROTOBUF_NODISCARD ::io::deephaven::proto::backplane::grpc::Ticket* release_result_id();
-  ::io::deephaven::proto::backplane::grpc::Ticket* mutable_result_id();
-  void set_allocated_result_id(::io::deephaven::proto::backplane::grpc::Ticket* value);
-  void unsafe_arena_set_allocated_result_id(::io::deephaven::proto::backplane::grpc::Ticket* value);
-  ::io::deephaven::proto::backplane::grpc::Ticket* unsafe_arena_release_result_id();
-
-  private:
-  const ::io::deephaven::proto::backplane::grpc::Ticket& _internal_result_id() const;
-  ::io::deephaven::proto::backplane::grpc::Ticket* _internal_mutable_result_id();
-
-  public:
-  // .io.deephaven.proto.backplane.grpc.TableReference source_id = 2;
-  bool has_source_id() const;
-  void clear_source_id() ;
-  const ::io::deephaven::proto::backplane::grpc::TableReference& source_id() const;
-  PROTOBUF_NODISCARD ::io::deephaven::proto::backplane::grpc::TableReference* release_source_id();
-  ::io::deephaven::proto::backplane::grpc::TableReference* mutable_source_id();
-  void set_allocated_source_id(::io::deephaven::proto::backplane::grpc::TableReference* value);
-  void unsafe_arena_set_allocated_source_id(::io::deephaven::proto::backplane::grpc::TableReference* value);
-  ::io::deephaven::proto::backplane::grpc::TableReference* unsafe_arena_release_source_id();
-
-  private:
-  const ::io::deephaven::proto::backplane::grpc::TableReference& _internal_source_id() const;
-  ::io::deephaven::proto::backplane::grpc::TableReference* _internal_mutable_source_id();
-
-  public:
-  // @@protoc_insertion_point(class_scope:io.deephaven.proto.backplane.grpc.UnstructuredFilterTableRequest)
- private:
-  class _Internal;
-
-  friend class ::google::protobuf::internal::TcParser;
-  static const ::google::protobuf::internal::TcParseTable<
-      2, 3, 2,
-      80, 2>
-      _table_;
-  friend class ::google::protobuf::MessageLite;
-  friend class ::google::protobuf::Arena;
-  template <typename T>
-  friend class ::google::protobuf::Arena::InternalHelper;
-  using InternalArenaConstructable_ = void;
-  using DestructorSkippable_ = void;
-  struct Impl_ {
-
-        inline explicit constexpr Impl_(
-            ::google::protobuf::internal::ConstantInitialized) noexcept;
-        inline explicit Impl_(::google::protobuf::internal::InternalVisibility visibility,
-                              ::google::protobuf::Arena* arena);
-        inline explicit Impl_(::google::protobuf::internal::InternalVisibility visibility,
-                              ::google::protobuf::Arena* arena, const Impl_& from);
-    ::google::protobuf::internal::HasBits<1> _has_bits_;
-    mutable ::google::protobuf::internal::CachedSize _cached_size_;
-    ::google::protobuf::RepeatedPtrField<std::string> filters_;
-    ::io::deephaven::proto::backplane::grpc::Ticket* result_id_;
-    ::io::deephaven::proto::backplane::grpc::TableReference* source_id_;
-    PROTOBUF_TSAN_DECLARE_MEMBER
-  };
-  union { Impl_ _impl_; };
-  friend struct ::TableStruct_deephaven_2fproto_2ftable_2eproto;
-};// -------------------------------------------------------------------
-
-class UngroupRequest final :
-    public ::google::protobuf::Message /* @@protoc_insertion_point(class_definition:io.deephaven.proto.backplane.grpc.UngroupRequest) */ {
- public:
-  inline UngroupRequest() : UngroupRequest(nullptr) {}
-  ~UngroupRequest() override;
-  template<typename = void>
-  explicit PROTOBUF_CONSTEXPR UngroupRequest(::google::protobuf::internal::ConstantInitialized);
-
-  inline UngroupRequest(const UngroupRequest& from)
-      : UngroupRequest(nullptr, from) {}
-  UngroupRequest(UngroupRequest&& from) noexcept
-    : UngroupRequest() {
-    *this = ::std::move(from);
-  }
-
-  inline UngroupRequest& operator=(const UngroupRequest& from) {
-    CopyFrom(from);
-    return *this;
-  }
-  inline UngroupRequest& operator=(UngroupRequest&& from) noexcept {
-    if (this == &from) return *this;
-    if (GetArena() == from.GetArena()
-  #ifdef PROTOBUF_FORCE_COPY_IN_MOVE
-        && GetArena() != nullptr
-  #endif  // !PROTOBUF_FORCE_COPY_IN_MOVE
-    ) {
-      InternalSwap(&from);
-    } else {
-      CopyFrom(from);
-    }
-    return *this;
-  }
-
-  inline const ::google::protobuf::UnknownFieldSet& unknown_fields() const
-      ABSL_ATTRIBUTE_LIFETIME_BOUND {
-    return _internal_metadata_.unknown_fields<::google::protobuf::UnknownFieldSet>(::google::protobuf::UnknownFieldSet::default_instance);
-  }
-  inline ::google::protobuf::UnknownFieldSet* mutable_unknown_fields()
-      ABSL_ATTRIBUTE_LIFETIME_BOUND {
-    return _internal_metadata_.mutable_unknown_fields<::google::protobuf::UnknownFieldSet>();
-  }
-
-  static const ::google::protobuf::Descriptor* descriptor() {
-    return GetDescriptor();
-  }
-  static const ::google::protobuf::Descriptor* GetDescriptor() {
-    return default_instance().GetMetadata().descriptor;
-  }
-  static const ::google::protobuf::Reflection* GetReflection() {
-    return default_instance().GetMetadata().reflection;
-  }
-  static const UngroupRequest& default_instance() {
-    return *internal_default_instance();
-  }
-  static inline const UngroupRequest* internal_default_instance() {
-    return reinterpret_cast<const UngroupRequest*>(
-               &_UngroupRequest_default_instance_);
-  }
-  static constexpr int kIndexInFileMessages =
-    46;
-
-  friend void swap(UngroupRequest& a, UngroupRequest& b) {
-    a.Swap(&b);
-  }
-  inline void Swap(UngroupRequest* other) {
-    if (other == this) return;
-  #ifdef PROTOBUF_FORCE_COPY_IN_SWAP
-    if (GetArena() != nullptr &&
-        GetArena() == other->GetArena()) {
-   #else  // PROTOBUF_FORCE_COPY_IN_SWAP
-    if (GetArena() == other->GetArena()) {
-  #endif  // !PROTOBUF_FORCE_COPY_IN_SWAP
-      InternalSwap(other);
-    } else {
-      ::google::protobuf::internal::GenericSwap(this, other);
-    }
-  }
-  void UnsafeArenaSwap(UngroupRequest* other) {
-    if (other == this) return;
-    ABSL_DCHECK(GetArena() == other->GetArena());
-    InternalSwap(other);
-  }
-
-  // implements Message ----------------------------------------------
-
-  UngroupRequest* New(::google::protobuf::Arena* arena = nullptr) const final {
-    return CreateMaybeMessage<UngroupRequest>(arena);
-  }
-  using ::google::protobuf::Message::CopyFrom;
-  void CopyFrom(const UngroupRequest& from);
-  using ::google::protobuf::Message::MergeFrom;
-  void MergeFrom( const UngroupRequest& from) {
-    UngroupRequest::MergeImpl(*this, from);
-  }
-  private:
-  static void MergeImpl(::google::protobuf::Message& to_msg, const ::google::protobuf::Message& from_msg);
-  public:
-  PROTOBUF_ATTRIBUTE_REINITIALIZES void Clear() final;
-  bool IsInitialized() const final;
-
-  ::size_t ByteSizeLong() const final;
-  const char* _InternalParse(const char* ptr, ::google::protobuf::internal::ParseContext* ctx) final;
-  ::uint8_t* _InternalSerialize(
-      ::uint8_t* target, ::google::protobuf::io::EpsCopyOutputStream* stream) const final;
-  int GetCachedSize() const { return _impl_._cached_size_.Get(); }
-
-  private:
-  ::google::protobuf::internal::CachedSize* AccessCachedSize() const final;
-  void SharedCtor(::google::protobuf::Arena* arena);
-  void SharedDtor();
-  void InternalSwap(UngroupRequest* other);
-
-  private:
-  friend class ::google::protobuf::internal::AnyMetadata;
-  static ::absl::string_view FullMessageName() {
-    return "io.deephaven.proto.backplane.grpc.UngroupRequest";
-  }
-  protected:
-  explicit UngroupRequest(::google::protobuf::Arena* arena);
-  UngroupRequest(::google::protobuf::Arena* arena, const UngroupRequest& from);
-  public:
-
-  static const ClassData _class_data_;
-  const ::google::protobuf::Message::ClassData*GetClassData() const final;
-
-  ::google::protobuf::Metadata GetMetadata() const final;
-
-  // nested types ----------------------------------------------------
-
-  // accessors -------------------------------------------------------
-
-  enum : int {
-    kColumnsToUngroupFieldNumber = 4,
-    kResultIdFieldNumber = 1,
-    kSourceIdFieldNumber = 2,
-    kNullFillFieldNumber = 3,
-  };
-  // repeated string columns_to_ungroup = 4;
-  int columns_to_ungroup_size() const;
-  private:
-  int _internal_columns_to_ungroup_size() const;
-
-  public:
-  void clear_columns_to_ungroup() ;
-  const std::string& columns_to_ungroup(int index) const;
-  std::string* mutable_columns_to_ungroup(int index);
-  void set_columns_to_ungroup(int index, const std::string& value);
-  void set_columns_to_ungroup(int index, std::string&& value);
-  void set_columns_to_ungroup(int index, const char* value);
-  void set_columns_to_ungroup(int index, const char* value, std::size_t size);
-  void set_columns_to_ungroup(int index, absl::string_view value);
-  std::string* add_columns_to_ungroup();
-  void add_columns_to_ungroup(const std::string& value);
-  void add_columns_to_ungroup(std::string&& value);
-  void add_columns_to_ungroup(const char* value);
-  void add_columns_to_ungroup(const char* value, std::size_t size);
-  void add_columns_to_ungroup(absl::string_view value);
-  const ::google::protobuf::RepeatedPtrField<std::string>& columns_to_ungroup() const;
-  ::google::protobuf::RepeatedPtrField<std::string>* mutable_columns_to_ungroup();
-
-  private:
-  const ::google::protobuf::RepeatedPtrField<std::string>& _internal_columns_to_ungroup() const;
-  ::google::protobuf::RepeatedPtrField<std::string>* _internal_mutable_columns_to_ungroup();
-
-  public:
-  // .io.deephaven.proto.backplane.grpc.Ticket result_id = 1;
-  bool has_result_id() const;
-  void clear_result_id() ;
-  const ::io::deephaven::proto::backplane::grpc::Ticket& result_id() const;
-  PROTOBUF_NODISCARD ::io::deephaven::proto::backplane::grpc::Ticket* release_result_id();
-  ::io::deephaven::proto::backplane::grpc::Ticket* mutable_result_id();
-  void set_allocated_result_id(::io::deephaven::proto::backplane::grpc::Ticket* value);
-  void unsafe_arena_set_allocated_result_id(::io::deephaven::proto::backplane::grpc::Ticket* value);
-  ::io::deephaven::proto::backplane::grpc::Ticket* unsafe_arena_release_result_id();
-
-  private:
-  const ::io::deephaven::proto::backplane::grpc::Ticket& _internal_result_id() const;
-  ::io::deephaven::proto::backplane::grpc::Ticket* _internal_mutable_result_id();
-
-  public:
-  // .io.deephaven.proto.backplane.grpc.TableReference source_id = 2;
-  bool has_source_id() const;
-  void clear_source_id() ;
-  const ::io::deephaven::proto::backplane::grpc::TableReference& source_id() const;
-  PROTOBUF_NODISCARD ::io::deephaven::proto::backplane::grpc::TableReference* release_source_id();
-  ::io::deephaven::proto::backplane::grpc::TableReference* mutable_source_id();
-  void set_allocated_source_id(::io::deephaven::proto::backplane::grpc::TableReference* value);
-  void unsafe_arena_set_allocated_source_id(::io::deephaven::proto::backplane::grpc::TableReference* value);
-  ::io::deephaven::proto::backplane::grpc::TableReference* unsafe_arena_release_source_id();
-
-  private:
-  const ::io::deephaven::proto::backplane::grpc::TableReference& _internal_source_id() const;
-  ::io::deephaven::proto::backplane::grpc::TableReference* _internal_mutable_source_id();
-
-  public:
-  // bool null_fill = 3;
-  void clear_null_fill() ;
-  bool null_fill() const;
-  void set_null_fill(bool value);
-
-  private:
-  bool _internal_null_fill() const;
-  void _internal_set_null_fill(bool value);
-
-  public:
-  // @@protoc_insertion_point(class_scope:io.deephaven.proto.backplane.grpc.UngroupRequest)
- private:
-  class _Internal;
-
-  friend class ::google::protobuf::internal::TcParser;
-  static const ::google::protobuf::internal::TcParseTable<
-      2, 4, 2,
-      75, 2>
-      _table_;
-  friend class ::google::protobuf::MessageLite;
-  friend class ::google::protobuf::Arena;
-  template <typename T>
-  friend class ::google::protobuf::Arena::InternalHelper;
-  using InternalArenaConstructable_ = void;
-  using DestructorSkippable_ = void;
-  struct Impl_ {
-
-        inline explicit constexpr Impl_(
-            ::google::protobuf::internal::ConstantInitialized) noexcept;
-        inline explicit Impl_(::google::protobuf::internal::InternalVisibility visibility,
-                              ::google::protobuf::Arena* arena);
-        inline explicit Impl_(::google::protobuf::internal::InternalVisibility visibility,
-                              ::google::protobuf::Arena* arena, const Impl_& from);
-    ::google::protobuf::internal::HasBits<1> _has_bits_;
-    mutable ::google::protobuf::internal::CachedSize _cached_size_;
-    ::google::protobuf::RepeatedPtrField<std::string> columns_to_ungroup_;
-    ::io::deephaven::proto::backplane::grpc::Ticket* result_id_;
-    ::io::deephaven::proto::backplane::grpc::TableReference* source_id_;
-    bool null_fill_;
-    PROTOBUF_TSAN_DECLARE_MEMBER
-  };
-  union { Impl_ _impl_; };
-  friend struct ::TableStruct_deephaven_2fproto_2ftable_2eproto;
-};// -------------------------------------------------------------------
-
-class SortTableRequest final :
-    public ::google::protobuf::Message /* @@protoc_insertion_point(class_definition:io.deephaven.proto.backplane.grpc.SortTableRequest) */ {
- public:
-  inline SortTableRequest() : SortTableRequest(nullptr) {}
-  ~SortTableRequest() override;
-  template<typename = void>
-  explicit PROTOBUF_CONSTEXPR SortTableRequest(::google::protobuf::internal::ConstantInitialized);
-
-  inline SortTableRequest(const SortTableRequest& from)
-      : SortTableRequest(nullptr, from) {}
-  SortTableRequest(SortTableRequest&& from) noexcept
-    : SortTableRequest() {
-    *this = ::std::move(from);
-  }
-
-  inline SortTableRequest& operator=(const SortTableRequest& from) {
-    CopyFrom(from);
-    return *this;
-  }
-  inline SortTableRequest& operator=(SortTableRequest&& from) noexcept {
-    if (this == &from) return *this;
-    if (GetArena() == from.GetArena()
-  #ifdef PROTOBUF_FORCE_COPY_IN_MOVE
-        && GetArena() != nullptr
-  #endif  // !PROTOBUF_FORCE_COPY_IN_MOVE
-    ) {
-      InternalSwap(&from);
-    } else {
-      CopyFrom(from);
-    }
-    return *this;
-  }
-
-  inline const ::google::protobuf::UnknownFieldSet& unknown_fields() const
-      ABSL_ATTRIBUTE_LIFETIME_BOUND {
-    return _internal_metadata_.unknown_fields<::google::protobuf::UnknownFieldSet>(::google::protobuf::UnknownFieldSet::default_instance);
-  }
-  inline ::google::protobuf::UnknownFieldSet* mutable_unknown_fields()
-      ABSL_ATTRIBUTE_LIFETIME_BOUND {
-    return _internal_metadata_.mutable_unknown_fields<::google::protobuf::UnknownFieldSet>();
-  }
-
-  static const ::google::protobuf::Descriptor* descriptor() {
-    return GetDescriptor();
-  }
-  static const ::google::protobuf::Descriptor* GetDescriptor() {
-    return default_instance().GetMetadata().descriptor;
-  }
-  static const ::google::protobuf::Reflection* GetReflection() {
-    return default_instance().GetMetadata().reflection;
-  }
-  static const SortTableRequest& default_instance() {
-    return *internal_default_instance();
-  }
-  static inline const SortTableRequest* internal_default_instance() {
-    return reinterpret_cast<const SortTableRequest*>(
-               &_SortTableRequest_default_instance_);
-  }
-  static constexpr int kIndexInFileMessages =
-    93;
-
-  friend void swap(SortTableRequest& a, SortTableRequest& b) {
-    a.Swap(&b);
-  }
-  inline void Swap(SortTableRequest* other) {
-    if (other == this) return;
-  #ifdef PROTOBUF_FORCE_COPY_IN_SWAP
-    if (GetArena() != nullptr &&
-        GetArena() == other->GetArena()) {
-   #else  // PROTOBUF_FORCE_COPY_IN_SWAP
-    if (GetArena() == other->GetArena()) {
-  #endif  // !PROTOBUF_FORCE_COPY_IN_SWAP
-      InternalSwap(other);
-    } else {
-      ::google::protobuf::internal::GenericSwap(this, other);
-    }
-  }
-  void UnsafeArenaSwap(SortTableRequest* other) {
-    if (other == this) return;
-    ABSL_DCHECK(GetArena() == other->GetArena());
-    InternalSwap(other);
-  }
-
-  // implements Message ----------------------------------------------
-
-  SortTableRequest* New(::google::protobuf::Arena* arena = nullptr) const final {
-    return CreateMaybeMessage<SortTableRequest>(arena);
-  }
-  using ::google::protobuf::Message::CopyFrom;
-  void CopyFrom(const SortTableRequest& from);
-  using ::google::protobuf::Message::MergeFrom;
-  void MergeFrom( const SortTableRequest& from) {
-    SortTableRequest::MergeImpl(*this, from);
-  }
-  private:
-  static void MergeImpl(::google::protobuf::Message& to_msg, const ::google::protobuf::Message& from_msg);
-  public:
-  PROTOBUF_ATTRIBUTE_REINITIALIZES void Clear() final;
-  bool IsInitialized() const final;
-
-  ::size_t ByteSizeLong() const final;
-  const char* _InternalParse(const char* ptr, ::google::protobuf::internal::ParseContext* ctx) final;
-  ::uint8_t* _InternalSerialize(
-      ::uint8_t* target, ::google::protobuf::io::EpsCopyOutputStream* stream) const final;
-  int GetCachedSize() const { return _impl_._cached_size_.Get(); }
-
-  private:
-  ::google::protobuf::internal::CachedSize* AccessCachedSize() const final;
-  void SharedCtor(::google::protobuf::Arena* arena);
-  void SharedDtor();
-  void InternalSwap(SortTableRequest* other);
-
-  private:
-  friend class ::google::protobuf::internal::AnyMetadata;
-  static ::absl::string_view FullMessageName() {
-    return "io.deephaven.proto.backplane.grpc.SortTableRequest";
-  }
-  protected:
-  explicit SortTableRequest(::google::protobuf::Arena* arena);
-  SortTableRequest(::google::protobuf::Arena* arena, const SortTableRequest& from);
-  public:
-
-  static const ClassData _class_data_;
-  const ::google::protobuf::Message::ClassData*GetClassData() const final;
-
-  ::google::protobuf::Metadata GetMetadata() const final;
-
-  // nested types ----------------------------------------------------
-
-  // accessors -------------------------------------------------------
-
-  enum : int {
-    kSortsFieldNumber = 3,
-    kResultIdFieldNumber = 1,
-    kSourceIdFieldNumber = 2,
-  };
-  // repeated .io.deephaven.proto.backplane.grpc.SortDescriptor sorts = 3;
-  int sorts_size() const;
-  private:
-  int _internal_sorts_size() const;
-
-  public:
-  void clear_sorts() ;
-  ::io::deephaven::proto::backplane::grpc::SortDescriptor* mutable_sorts(int index);
-  ::google::protobuf::RepeatedPtrField< ::io::deephaven::proto::backplane::grpc::SortDescriptor >*
-      mutable_sorts();
-  private:
-  const ::google::protobuf::RepeatedPtrField<::io::deephaven::proto::backplane::grpc::SortDescriptor>& _internal_sorts() const;
-  ::google::protobuf::RepeatedPtrField<::io::deephaven::proto::backplane::grpc::SortDescriptor>* _internal_mutable_sorts();
-  public:
-  const ::io::deephaven::proto::backplane::grpc::SortDescriptor& sorts(int index) const;
-  ::io::deephaven::proto::backplane::grpc::SortDescriptor* add_sorts();
-  const ::google::protobuf::RepeatedPtrField< ::io::deephaven::proto::backplane::grpc::SortDescriptor >&
-      sorts() const;
-  // .io.deephaven.proto.backplane.grpc.Ticket result_id = 1;
-  bool has_result_id() const;
-  void clear_result_id() ;
-  const ::io::deephaven::proto::backplane::grpc::Ticket& result_id() const;
-  PROTOBUF_NODISCARD ::io::deephaven::proto::backplane::grpc::Ticket* release_result_id();
-  ::io::deephaven::proto::backplane::grpc::Ticket* mutable_result_id();
-  void set_allocated_result_id(::io::deephaven::proto::backplane::grpc::Ticket* value);
-  void unsafe_arena_set_allocated_result_id(::io::deephaven::proto::backplane::grpc::Ticket* value);
-  ::io::deephaven::proto::backplane::grpc::Ticket* unsafe_arena_release_result_id();
-
-  private:
-  const ::io::deephaven::proto::backplane::grpc::Ticket& _internal_result_id() const;
-  ::io::deephaven::proto::backplane::grpc::Ticket* _internal_mutable_result_id();
-
-  public:
-  // .io.deephaven.proto.backplane.grpc.TableReference source_id = 2;
-  bool has_source_id() const;
-  void clear_source_id() ;
-  const ::io::deephaven::proto::backplane::grpc::TableReference& source_id() const;
-  PROTOBUF_NODISCARD ::io::deephaven::proto::backplane::grpc::TableReference* release_source_id();
-  ::io::deephaven::proto::backplane::grpc::TableReference* mutable_source_id();
-  void set_allocated_source_id(::io::deephaven::proto::backplane::grpc::TableReference* value);
-  void unsafe_arena_set_allocated_source_id(::io::deephaven::proto::backplane::grpc::TableReference* value);
-  ::io::deephaven::proto::backplane::grpc::TableReference* unsafe_arena_release_source_id();
-
-  private:
-  const ::io::deephaven::proto::backplane::grpc::TableReference& _internal_source_id() const;
-  ::io::deephaven::proto::backplane::grpc::TableReference* _internal_mutable_source_id();
-
-  public:
-  // @@protoc_insertion_point(class_scope:io.deephaven.proto.backplane.grpc.SortTableRequest)
- private:
-  class _Internal;
-
-  friend class ::google::protobuf::internal::TcParser;
-  static const ::google::protobuf::internal::TcParseTable<
-      2, 3, 3,
-      0, 2>
-      _table_;
-  friend class ::google::protobuf::MessageLite;
-  friend class ::google::protobuf::Arena;
-  template <typename T>
-  friend class ::google::protobuf::Arena::InternalHelper;
-  using InternalArenaConstructable_ = void;
-  using DestructorSkippable_ = void;
-  struct Impl_ {
-
-        inline explicit constexpr Impl_(
-            ::google::protobuf::internal::ConstantInitialized) noexcept;
-        inline explicit Impl_(::google::protobuf::internal::InternalVisibility visibility,
-                              ::google::protobuf::Arena* arena);
-        inline explicit Impl_(::google::protobuf::internal::InternalVisibility visibility,
-                              ::google::protobuf::Arena* arena, const Impl_& from);
-    ::google::protobuf::internal::HasBits<1> _has_bits_;
-    mutable ::google::protobuf::internal::CachedSize _cached_size_;
-    ::google::protobuf::RepeatedPtrField< ::io::deephaven::proto::backplane::grpc::SortDescriptor > sorts_;
-    ::io::deephaven::proto::backplane::grpc::Ticket* result_id_;
-    ::io::deephaven::proto::backplane::grpc::TableReference* source_id_;
-    PROTOBUF_TSAN_DECLARE_MEMBER
-  };
-  union { Impl_ _impl_; };
-  friend struct ::TableStruct_deephaven_2fproto_2ftable_2eproto;
-};// -------------------------------------------------------------------
-
-class SnapshotWhenTableRequest final :
-    public ::google::protobuf::Message /* @@protoc_insertion_point(class_definition:io.deephaven.proto.backplane.grpc.SnapshotWhenTableRequest) */ {
- public:
-  inline SnapshotWhenTableRequest() : SnapshotWhenTableRequest(nullptr) {}
-  ~SnapshotWhenTableRequest() override;
-  template<typename = void>
-  explicit PROTOBUF_CONSTEXPR SnapshotWhenTableRequest(::google::protobuf::internal::ConstantInitialized);
-
-  inline SnapshotWhenTableRequest(const SnapshotWhenTableRequest& from)
-      : SnapshotWhenTableRequest(nullptr, from) {}
-  SnapshotWhenTableRequest(SnapshotWhenTableRequest&& from) noexcept
-    : SnapshotWhenTableRequest() {
-    *this = ::std::move(from);
-  }
-
-  inline SnapshotWhenTableRequest& operator=(const SnapshotWhenTableRequest& from) {
-    CopyFrom(from);
-    return *this;
-  }
-  inline SnapshotWhenTableRequest& operator=(SnapshotWhenTableRequest&& from) noexcept {
-    if (this == &from) return *this;
-    if (GetArena() == from.GetArena()
-  #ifdef PROTOBUF_FORCE_COPY_IN_MOVE
-        && GetArena() != nullptr
-  #endif  // !PROTOBUF_FORCE_COPY_IN_MOVE
-    ) {
-      InternalSwap(&from);
-    } else {
-      CopyFrom(from);
-    }
-    return *this;
-  }
-
-  inline const ::google::protobuf::UnknownFieldSet& unknown_fields() const
-      ABSL_ATTRIBUTE_LIFETIME_BOUND {
-    return _internal_metadata_.unknown_fields<::google::protobuf::UnknownFieldSet>(::google::protobuf::UnknownFieldSet::default_instance);
-  }
-  inline ::google::protobuf::UnknownFieldSet* mutable_unknown_fields()
-      ABSL_ATTRIBUTE_LIFETIME_BOUND {
-    return _internal_metadata_.mutable_unknown_fields<::google::protobuf::UnknownFieldSet>();
-  }
-
-  static const ::google::protobuf::Descriptor* descriptor() {
-    return GetDescriptor();
-  }
-  static const ::google::protobuf::Descriptor* GetDescriptor() {
-    return default_instance().GetMetadata().descriptor;
-  }
-  static const ::google::protobuf::Reflection* GetReflection() {
-    return default_instance().GetMetadata().reflection;
-  }
-  static const SnapshotWhenTableRequest& default_instance() {
-    return *internal_default_instance();
-  }
-  static inline const SnapshotWhenTableRequest* internal_default_instance() {
-    return reinterpret_cast<const SnapshotWhenTableRequest*>(
-               &_SnapshotWhenTableRequest_default_instance_);
-  }
-  static constexpr int kIndexInFileMessages =
-    49;
-
-  friend void swap(SnapshotWhenTableRequest& a, SnapshotWhenTableRequest& b) {
-    a.Swap(&b);
-  }
-  inline void Swap(SnapshotWhenTableRequest* other) {
-    if (other == this) return;
-  #ifdef PROTOBUF_FORCE_COPY_IN_SWAP
-    if (GetArena() != nullptr &&
-        GetArena() == other->GetArena()) {
-   #else  // PROTOBUF_FORCE_COPY_IN_SWAP
-    if (GetArena() == other->GetArena()) {
-  #endif  // !PROTOBUF_FORCE_COPY_IN_SWAP
-      InternalSwap(other);
-    } else {
-      ::google::protobuf::internal::GenericSwap(this, other);
-    }
-  }
-  void UnsafeArenaSwap(SnapshotWhenTableRequest* other) {
-    if (other == this) return;
-    ABSL_DCHECK(GetArena() == other->GetArena());
-    InternalSwap(other);
-  }
-
-  // implements Message ----------------------------------------------
-
-  SnapshotWhenTableRequest* New(::google::protobuf::Arena* arena = nullptr) const final {
-    return CreateMaybeMessage<SnapshotWhenTableRequest>(arena);
-  }
-  using ::google::protobuf::Message::CopyFrom;
-  void CopyFrom(const SnapshotWhenTableRequest& from);
-  using ::google::protobuf::Message::MergeFrom;
-  void MergeFrom( const SnapshotWhenTableRequest& from) {
-    SnapshotWhenTableRequest::MergeImpl(*this, from);
-  }
-  private:
-  static void MergeImpl(::google::protobuf::Message& to_msg, const ::google::protobuf::Message& from_msg);
-  public:
-  PROTOBUF_ATTRIBUTE_REINITIALIZES void Clear() final;
-  bool IsInitialized() const final;
-
-  ::size_t ByteSizeLong() const final;
-  const char* _InternalParse(const char* ptr, ::google::protobuf::internal::ParseContext* ctx) final;
-  ::uint8_t* _InternalSerialize(
-      ::uint8_t* target, ::google::protobuf::io::EpsCopyOutputStream* stream) const final;
-  int GetCachedSize() const { return _impl_._cached_size_.Get(); }
-
-  private:
-  ::google::protobuf::internal::CachedSize* AccessCachedSize() const final;
-  void SharedCtor(::google::protobuf::Arena* arena);
-  void SharedDtor();
-  void InternalSwap(SnapshotWhenTableRequest* other);
-
-  private:
-  friend class ::google::protobuf::internal::AnyMetadata;
-  static ::absl::string_view FullMessageName() {
-    return "io.deephaven.proto.backplane.grpc.SnapshotWhenTableRequest";
-  }
-  protected:
-  explicit SnapshotWhenTableRequest(::google::protobuf::Arena* arena);
-  SnapshotWhenTableRequest(::google::protobuf::Arena* arena, const SnapshotWhenTableRequest& from);
-  public:
-
-  static const ClassData _class_data_;
-  const ::google::protobuf::Message::ClassData*GetClassData() const final;
-
-  ::google::protobuf::Metadata GetMetadata() const final;
-
-  // nested types ----------------------------------------------------
-
-  // accessors -------------------------------------------------------
-
-  enum : int {
-    kStampColumnsFieldNumber = 7,
-    kResultIdFieldNumber = 1,
-    kBaseIdFieldNumber = 2,
-    kTriggerIdFieldNumber = 3,
-    kInitialFieldNumber = 4,
-    kIncrementalFieldNumber = 5,
-    kHistoryFieldNumber = 6,
-  };
-  // repeated string stamp_columns = 7;
-  int stamp_columns_size() const;
-  private:
-  int _internal_stamp_columns_size() const;
-
-  public:
-  void clear_stamp_columns() ;
-  const std::string& stamp_columns(int index) const;
-  std::string* mutable_stamp_columns(int index);
-  void set_stamp_columns(int index, const std::string& value);
-  void set_stamp_columns(int index, std::string&& value);
-  void set_stamp_columns(int index, const char* value);
-  void set_stamp_columns(int index, const char* value, std::size_t size);
-  void set_stamp_columns(int index, absl::string_view value);
-  std::string* add_stamp_columns();
-  void add_stamp_columns(const std::string& value);
-  void add_stamp_columns(std::string&& value);
-  void add_stamp_columns(const char* value);
-  void add_stamp_columns(const char* value, std::size_t size);
-  void add_stamp_columns(absl::string_view value);
-  const ::google::protobuf::RepeatedPtrField<std::string>& stamp_columns() const;
-  ::google::protobuf::RepeatedPtrField<std::string>* mutable_stamp_columns();
-
-  private:
-  const ::google::protobuf::RepeatedPtrField<std::string>& _internal_stamp_columns() const;
-  ::google::protobuf::RepeatedPtrField<std::string>* _internal_mutable_stamp_columns();
-
-  public:
-  // .io.deephaven.proto.backplane.grpc.Ticket result_id = 1;
-  bool has_result_id() const;
-  void clear_result_id() ;
-  const ::io::deephaven::proto::backplane::grpc::Ticket& result_id() const;
-  PROTOBUF_NODISCARD ::io::deephaven::proto::backplane::grpc::Ticket* release_result_id();
-  ::io::deephaven::proto::backplane::grpc::Ticket* mutable_result_id();
-  void set_allocated_result_id(::io::deephaven::proto::backplane::grpc::Ticket* value);
-  void unsafe_arena_set_allocated_result_id(::io::deephaven::proto::backplane::grpc::Ticket* value);
-  ::io::deephaven::proto::backplane::grpc::Ticket* unsafe_arena_release_result_id();
-
-  private:
-  const ::io::deephaven::proto::backplane::grpc::Ticket& _internal_result_id() const;
-  ::io::deephaven::proto::backplane::grpc::Ticket* _internal_mutable_result_id();
-
-  public:
-  // .io.deephaven.proto.backplane.grpc.TableReference base_id = 2;
-  bool has_base_id() const;
-  void clear_base_id() ;
-  const ::io::deephaven::proto::backplane::grpc::TableReference& base_id() const;
-  PROTOBUF_NODISCARD ::io::deephaven::proto::backplane::grpc::TableReference* release_base_id();
-  ::io::deephaven::proto::backplane::grpc::TableReference* mutable_base_id();
-  void set_allocated_base_id(::io::deephaven::proto::backplane::grpc::TableReference* value);
-  void unsafe_arena_set_allocated_base_id(::io::deephaven::proto::backplane::grpc::TableReference* value);
-  ::io::deephaven::proto::backplane::grpc::TableReference* unsafe_arena_release_base_id();
-
-  private:
-  const ::io::deephaven::proto::backplane::grpc::TableReference& _internal_base_id() const;
-  ::io::deephaven::proto::backplane::grpc::TableReference* _internal_mutable_base_id();
-
-  public:
-  // .io.deephaven.proto.backplane.grpc.TableReference trigger_id = 3;
-  bool has_trigger_id() const;
-  void clear_trigger_id() ;
-  const ::io::deephaven::proto::backplane::grpc::TableReference& trigger_id() const;
-  PROTOBUF_NODISCARD ::io::deephaven::proto::backplane::grpc::TableReference* release_trigger_id();
-  ::io::deephaven::proto::backplane::grpc::TableReference* mutable_trigger_id();
-  void set_allocated_trigger_id(::io::deephaven::proto::backplane::grpc::TableReference* value);
-  void unsafe_arena_set_allocated_trigger_id(::io::deephaven::proto::backplane::grpc::TableReference* value);
-  ::io::deephaven::proto::backplane::grpc::TableReference* unsafe_arena_release_trigger_id();
-
-  private:
-  const ::io::deephaven::proto::backplane::grpc::TableReference& _internal_trigger_id() const;
-  ::io::deephaven::proto::backplane::grpc::TableReference* _internal_mutable_trigger_id();
-
-  public:
-  // bool initial = 4;
-  void clear_initial() ;
-  bool initial() const;
-  void set_initial(bool value);
-
-  private:
-  bool _internal_initial() const;
-  void _internal_set_initial(bool value);
-
-  public:
-  // bool incremental = 5;
-  void clear_incremental() ;
-  bool incremental() const;
-  void set_incremental(bool value);
-
-  private:
-  bool _internal_incremental() const;
-  void _internal_set_incremental(bool value);
-
-  public:
-  // bool history = 6;
-  void clear_history() ;
-  bool history() const;
-  void set_history(bool value);
-
-  private:
-  bool _internal_history() const;
-  void _internal_set_history(bool value);
-
-  public:
-  // @@protoc_insertion_point(class_scope:io.deephaven.proto.backplane.grpc.SnapshotWhenTableRequest)
- private:
-  class _Internal;
-
-  friend class ::google::protobuf::internal::TcParser;
-  static const ::google::protobuf::internal::TcParseTable<
-      3, 7, 3,
-      80, 2>
-      _table_;
-  friend class ::google::protobuf::MessageLite;
-  friend class ::google::protobuf::Arena;
-  template <typename T>
-  friend class ::google::protobuf::Arena::InternalHelper;
-  using InternalArenaConstructable_ = void;
-  using DestructorSkippable_ = void;
-  struct Impl_ {
-
-        inline explicit constexpr Impl_(
-            ::google::protobuf::internal::ConstantInitialized) noexcept;
-        inline explicit Impl_(::google::protobuf::internal::InternalVisibility visibility,
-                              ::google::protobuf::Arena* arena);
-        inline explicit Impl_(::google::protobuf::internal::InternalVisibility visibility,
-                              ::google::protobuf::Arena* arena, const Impl_& from);
-    ::google::protobuf::internal::HasBits<1> _has_bits_;
-    mutable ::google::protobuf::internal::CachedSize _cached_size_;
-    ::google::protobuf::RepeatedPtrField<std::string> stamp_columns_;
-    ::io::deephaven::proto::backplane::grpc::Ticket* result_id_;
-    ::io::deephaven::proto::backplane::grpc::TableReference* base_id_;
-    ::io::deephaven::proto::backplane::grpc::TableReference* trigger_id_;
-    bool initial_;
-    bool incremental_;
-    bool history_;
-    PROTOBUF_TSAN_DECLARE_MEMBER
-  };
-  union { Impl_ _impl_; };
-  friend struct ::TableStruct_deephaven_2fproto_2ftable_2eproto;
-};// -------------------------------------------------------------------
-
-class SnapshotTableRequest final :
-    public ::google::protobuf::Message /* @@protoc_insertion_point(class_definition:io.deephaven.proto.backplane.grpc.SnapshotTableRequest) */ {
- public:
-  inline SnapshotTableRequest() : SnapshotTableRequest(nullptr) {}
-  ~SnapshotTableRequest() override;
-  template<typename = void>
-  explicit PROTOBUF_CONSTEXPR SnapshotTableRequest(::google::protobuf::internal::ConstantInitialized);
-
-  inline SnapshotTableRequest(const SnapshotTableRequest& from)
-      : SnapshotTableRequest(nullptr, from) {}
-  SnapshotTableRequest(SnapshotTableRequest&& from) noexcept
-    : SnapshotTableRequest() {
-    *this = ::std::move(from);
-  }
-
-  inline SnapshotTableRequest& operator=(const SnapshotTableRequest& from) {
-    CopyFrom(from);
-    return *this;
-  }
-  inline SnapshotTableRequest& operator=(SnapshotTableRequest&& from) noexcept {
-    if (this == &from) return *this;
-    if (GetArena() == from.GetArena()
-  #ifdef PROTOBUF_FORCE_COPY_IN_MOVE
-        && GetArena() != nullptr
-  #endif  // !PROTOBUF_FORCE_COPY_IN_MOVE
-    ) {
-      InternalSwap(&from);
-    } else {
-      CopyFrom(from);
-    }
-    return *this;
-  }
-
-  inline const ::google::protobuf::UnknownFieldSet& unknown_fields() const
-      ABSL_ATTRIBUTE_LIFETIME_BOUND {
-    return _internal_metadata_.unknown_fields<::google::protobuf::UnknownFieldSet>(::google::protobuf::UnknownFieldSet::default_instance);
-  }
-  inline ::google::protobuf::UnknownFieldSet* mutable_unknown_fields()
-      ABSL_ATTRIBUTE_LIFETIME_BOUND {
-    return _internal_metadata_.mutable_unknown_fields<::google::protobuf::UnknownFieldSet>();
-  }
-
-  static const ::google::protobuf::Descriptor* descriptor() {
-    return GetDescriptor();
-  }
-  static const ::google::protobuf::Descriptor* GetDescriptor() {
-    return default_instance().GetMetadata().descriptor;
-  }
-  static const ::google::protobuf::Reflection* GetReflection() {
-    return default_instance().GetMetadata().reflection;
-  }
-  static const SnapshotTableRequest& default_instance() {
-    return *internal_default_instance();
-  }
-  static inline const SnapshotTableRequest* internal_default_instance() {
-    return reinterpret_cast<const SnapshotTableRequest*>(
-               &_SnapshotTableRequest_default_instance_);
-  }
-  static constexpr int kIndexInFileMessages =
-    48;
-
-  friend void swap(SnapshotTableRequest& a, SnapshotTableRequest& b) {
-    a.Swap(&b);
-  }
-  inline void Swap(SnapshotTableRequest* other) {
-    if (other == this) return;
-  #ifdef PROTOBUF_FORCE_COPY_IN_SWAP
-    if (GetArena() != nullptr &&
-        GetArena() == other->GetArena()) {
-   #else  // PROTOBUF_FORCE_COPY_IN_SWAP
-    if (GetArena() == other->GetArena()) {
-  #endif  // !PROTOBUF_FORCE_COPY_IN_SWAP
-      InternalSwap(other);
-    } else {
-      ::google::protobuf::internal::GenericSwap(this, other);
-    }
-  }
-  void UnsafeArenaSwap(SnapshotTableRequest* other) {
-    if (other == this) return;
-    ABSL_DCHECK(GetArena() == other->GetArena());
-    InternalSwap(other);
-  }
-
-  // implements Message ----------------------------------------------
-
-  SnapshotTableRequest* New(::google::protobuf::Arena* arena = nullptr) const final {
-    return CreateMaybeMessage<SnapshotTableRequest>(arena);
-  }
-  using ::google::protobuf::Message::CopyFrom;
-  void CopyFrom(const SnapshotTableRequest& from);
-  using ::google::protobuf::Message::MergeFrom;
-  void MergeFrom( const SnapshotTableRequest& from) {
-    SnapshotTableRequest::MergeImpl(*this, from);
-  }
-  private:
-  static void MergeImpl(::google::protobuf::Message& to_msg, const ::google::protobuf::Message& from_msg);
-  public:
-  PROTOBUF_ATTRIBUTE_REINITIALIZES void Clear() final;
-  bool IsInitialized() const final;
-
-  ::size_t ByteSizeLong() const final;
-  const char* _InternalParse(const char* ptr, ::google::protobuf::internal::ParseContext* ctx) final;
-  ::uint8_t* _InternalSerialize(
-      ::uint8_t* target, ::google::protobuf::io::EpsCopyOutputStream* stream) const final;
-  int GetCachedSize() const { return _impl_._cached_size_.Get(); }
-
-  private:
-  ::google::protobuf::internal::CachedSize* AccessCachedSize() const final;
-  void SharedCtor(::google::protobuf::Arena* arena);
-  void SharedDtor();
-  void InternalSwap(SnapshotTableRequest* other);
-
-  private:
-  friend class ::google::protobuf::internal::AnyMetadata;
-  static ::absl::string_view FullMessageName() {
-    return "io.deephaven.proto.backplane.grpc.SnapshotTableRequest";
-  }
-  protected:
-  explicit SnapshotTableRequest(::google::protobuf::Arena* arena);
-  SnapshotTableRequest(::google::protobuf::Arena* arena, const SnapshotTableRequest& from);
-  public:
-
-  static const ClassData _class_data_;
-  const ::google::protobuf::Message::ClassData*GetClassData() const final;
-
-  ::google::protobuf::Metadata GetMetadata() const final;
-
-  // nested types ----------------------------------------------------
-
-  // accessors -------------------------------------------------------
-
-  enum : int {
-    kResultIdFieldNumber = 1,
-    kSourceIdFieldNumber = 2,
-  };
-  // .io.deephaven.proto.backplane.grpc.Ticket result_id = 1;
-  bool has_result_id() const;
-  void clear_result_id() ;
-  const ::io::deephaven::proto::backplane::grpc::Ticket& result_id() const;
-  PROTOBUF_NODISCARD ::io::deephaven::proto::backplane::grpc::Ticket* release_result_id();
-  ::io::deephaven::proto::backplane::grpc::Ticket* mutable_result_id();
-  void set_allocated_result_id(::io::deephaven::proto::backplane::grpc::Ticket* value);
-  void unsafe_arena_set_allocated_result_id(::io::deephaven::proto::backplane::grpc::Ticket* value);
-  ::io::deephaven::proto::backplane::grpc::Ticket* unsafe_arena_release_result_id();
-
-  private:
-  const ::io::deephaven::proto::backplane::grpc::Ticket& _internal_result_id() const;
-  ::io::deephaven::proto::backplane::grpc::Ticket* _internal_mutable_result_id();
-
-  public:
-  // .io.deephaven.proto.backplane.grpc.TableReference source_id = 2;
-  bool has_source_id() const;
-  void clear_source_id() ;
-  const ::io::deephaven::proto::backplane::grpc::TableReference& source_id() const;
-  PROTOBUF_NODISCARD ::io::deephaven::proto::backplane::grpc::TableReference* release_source_id();
-  ::io::deephaven::proto::backplane::grpc::TableReference* mutable_source_id();
-  void set_allocated_source_id(::io::deephaven::proto::backplane::grpc::TableReference* value);
-  void unsafe_arena_set_allocated_source_id(::io::deephaven::proto::backplane::grpc::TableReference* value);
-  ::io::deephaven::proto::backplane::grpc::TableReference* unsafe_arena_release_source_id();
-
-  private:
-  const ::io::deephaven::proto::backplane::grpc::TableReference& _internal_source_id() const;
-  ::io::deephaven::proto::backplane::grpc::TableReference* _internal_mutable_source_id();
-
-  public:
-  // @@protoc_insertion_point(class_scope:io.deephaven.proto.backplane.grpc.SnapshotTableRequest)
- private:
-  class _Internal;
-
-  friend class ::google::protobuf::internal::TcParser;
-  static const ::google::protobuf::internal::TcParseTable<
-      1, 2, 2,
-      0, 2>
-      _table_;
-  friend class ::google::protobuf::MessageLite;
-  friend class ::google::protobuf::Arena;
-  template <typename T>
-  friend class ::google::protobuf::Arena::InternalHelper;
-  using InternalArenaConstructable_ = void;
-  using DestructorSkippable_ = void;
-  struct Impl_ {
-
-        inline explicit constexpr Impl_(
-            ::google::protobuf::internal::ConstantInitialized) noexcept;
-        inline explicit Impl_(::google::protobuf::internal::InternalVisibility visibility,
-                              ::google::protobuf::Arena* arena);
-        inline explicit Impl_(::google::protobuf::internal::InternalVisibility visibility,
-                              ::google::protobuf::Arena* arena, const Impl_& from);
-    ::google::protobuf::internal::HasBits<1> _has_bits_;
-    mutable ::google::protobuf::internal::CachedSize _cached_size_;
-    ::io::deephaven::proto::backplane::grpc::Ticket* result_id_;
-    ::io::deephaven::proto::backplane::grpc::TableReference* source_id_;
-    PROTOBUF_TSAN_DECLARE_MEMBER
-  };
-  union { Impl_ _impl_; };
-  friend struct ::TableStruct_deephaven_2fproto_2ftable_2eproto;
-};// -------------------------------------------------------------------
-
-class SelectOrUpdateRequest final :
-    public ::google::protobuf::Message /* @@protoc_insertion_point(class_definition:io.deephaven.proto.backplane.grpc.SelectOrUpdateRequest) */ {
- public:
-  inline SelectOrUpdateRequest() : SelectOrUpdateRequest(nullptr) {}
-  ~SelectOrUpdateRequest() override;
-  template<typename = void>
-  explicit PROTOBUF_CONSTEXPR SelectOrUpdateRequest(::google::protobuf::internal::ConstantInitialized);
-
-  inline SelectOrUpdateRequest(const SelectOrUpdateRequest& from)
-      : SelectOrUpdateRequest(nullptr, from) {}
-  SelectOrUpdateRequest(SelectOrUpdateRequest&& from) noexcept
-    : SelectOrUpdateRequest() {
-    *this = ::std::move(from);
-  }
-
-  inline SelectOrUpdateRequest& operator=(const SelectOrUpdateRequest& from) {
-    CopyFrom(from);
-    return *this;
-  }
-  inline SelectOrUpdateRequest& operator=(SelectOrUpdateRequest&& from) noexcept {
-    if (this == &from) return *this;
-    if (GetArena() == from.GetArena()
-  #ifdef PROTOBUF_FORCE_COPY_IN_MOVE
-        && GetArena() != nullptr
-  #endif  // !PROTOBUF_FORCE_COPY_IN_MOVE
-    ) {
-      InternalSwap(&from);
-    } else {
-      CopyFrom(from);
-    }
-    return *this;
-  }
-
-  inline const ::google::protobuf::UnknownFieldSet& unknown_fields() const
-      ABSL_ATTRIBUTE_LIFETIME_BOUND {
-    return _internal_metadata_.unknown_fields<::google::protobuf::UnknownFieldSet>(::google::protobuf::UnknownFieldSet::default_instance);
-  }
-  inline ::google::protobuf::UnknownFieldSet* mutable_unknown_fields()
-      ABSL_ATTRIBUTE_LIFETIME_BOUND {
-    return _internal_metadata_.mutable_unknown_fields<::google::protobuf::UnknownFieldSet>();
-  }
-
-  static const ::google::protobuf::Descriptor* descriptor() {
-    return GetDescriptor();
-  }
-  static const ::google::protobuf::Descriptor* GetDescriptor() {
-    return default_instance().GetMetadata().descriptor;
-  }
-  static const ::google::protobuf::Reflection* GetReflection() {
-    return default_instance().GetMetadata().reflection;
-  }
-  static const SelectOrUpdateRequest& default_instance() {
-    return *internal_default_instance();
-  }
-  static inline const SelectOrUpdateRequest* internal_default_instance() {
-    return reinterpret_cast<const SelectOrUpdateRequest*>(
-               &_SelectOrUpdateRequest_default_instance_);
-  }
-  static constexpr int kIndexInFileMessages =
-    8;
-
-  friend void swap(SelectOrUpdateRequest& a, SelectOrUpdateRequest& b) {
-    a.Swap(&b);
-  }
-  inline void Swap(SelectOrUpdateRequest* other) {
-    if (other == this) return;
-  #ifdef PROTOBUF_FORCE_COPY_IN_SWAP
-    if (GetArena() != nullptr &&
-        GetArena() == other->GetArena()) {
-   #else  // PROTOBUF_FORCE_COPY_IN_SWAP
-    if (GetArena() == other->GetArena()) {
-  #endif  // !PROTOBUF_FORCE_COPY_IN_SWAP
-      InternalSwap(other);
-    } else {
-      ::google::protobuf::internal::GenericSwap(this, other);
-    }
-  }
-  void UnsafeArenaSwap(SelectOrUpdateRequest* other) {
-    if (other == this) return;
-    ABSL_DCHECK(GetArena() == other->GetArena());
-    InternalSwap(other);
-  }
-
-  // implements Message ----------------------------------------------
-
-  SelectOrUpdateRequest* New(::google::protobuf::Arena* arena = nullptr) const final {
-    return CreateMaybeMessage<SelectOrUpdateRequest>(arena);
-  }
-  using ::google::protobuf::Message::CopyFrom;
-  void CopyFrom(const SelectOrUpdateRequest& from);
-  using ::google::protobuf::Message::MergeFrom;
-  void MergeFrom( const SelectOrUpdateRequest& from) {
-    SelectOrUpdateRequest::MergeImpl(*this, from);
-  }
-  private:
-  static void MergeImpl(::google::protobuf::Message& to_msg, const ::google::protobuf::Message& from_msg);
-  public:
-  PROTOBUF_ATTRIBUTE_REINITIALIZES void Clear() final;
-  bool IsInitialized() const final;
-
-  ::size_t ByteSizeLong() const final;
-  const char* _InternalParse(const char* ptr, ::google::protobuf::internal::ParseContext* ctx) final;
-  ::uint8_t* _InternalSerialize(
-      ::uint8_t* target, ::google::protobuf::io::EpsCopyOutputStream* stream) const final;
-  int GetCachedSize() const { return _impl_._cached_size_.Get(); }
-
-  private:
-  ::google::protobuf::internal::CachedSize* AccessCachedSize() const final;
-  void SharedCtor(::google::protobuf::Arena* arena);
-  void SharedDtor();
-  void InternalSwap(SelectOrUpdateRequest* other);
-
-  private:
-  friend class ::google::protobuf::internal::AnyMetadata;
-  static ::absl::string_view FullMessageName() {
-    return "io.deephaven.proto.backplane.grpc.SelectOrUpdateRequest";
-  }
-  protected:
-  explicit SelectOrUpdateRequest(::google::protobuf::Arena* arena);
-  SelectOrUpdateRequest(::google::protobuf::Arena* arena, const SelectOrUpdateRequest& from);
-  public:
-
-  static const ClassData _class_data_;
-  const ::google::protobuf::Message::ClassData*GetClassData() const final;
-
-  ::google::protobuf::Metadata GetMetadata() const final;
-
-  // nested types ----------------------------------------------------
-
-  // accessors -------------------------------------------------------
-
-  enum : int {
-    kColumnSpecsFieldNumber = 3,
-    kResultIdFieldNumber = 1,
-    kSourceIdFieldNumber = 2,
-  };
-  // repeated string column_specs = 3;
-  int column_specs_size() const;
-  private:
-  int _internal_column_specs_size() const;
-
-  public:
-  void clear_column_specs() ;
-  const std::string& column_specs(int index) const;
-  std::string* mutable_column_specs(int index);
-  void set_column_specs(int index, const std::string& value);
-  void set_column_specs(int index, std::string&& value);
-  void set_column_specs(int index, const char* value);
-  void set_column_specs(int index, const char* value, std::size_t size);
-  void set_column_specs(int index, absl::string_view value);
-  std::string* add_column_specs();
-  void add_column_specs(const std::string& value);
-  void add_column_specs(std::string&& value);
-  void add_column_specs(const char* value);
-  void add_column_specs(const char* value, std::size_t size);
-  void add_column_specs(absl::string_view value);
-  const ::google::protobuf::RepeatedPtrField<std::string>& column_specs() const;
-  ::google::protobuf::RepeatedPtrField<std::string>* mutable_column_specs();
-
-  private:
-  const ::google::protobuf::RepeatedPtrField<std::string>& _internal_column_specs() const;
-  ::google::protobuf::RepeatedPtrField<std::string>* _internal_mutable_column_specs();
-
-  public:
-  // .io.deephaven.proto.backplane.grpc.Ticket result_id = 1;
-  bool has_result_id() const;
-  void clear_result_id() ;
-  const ::io::deephaven::proto::backplane::grpc::Ticket& result_id() const;
-  PROTOBUF_NODISCARD ::io::deephaven::proto::backplane::grpc::Ticket* release_result_id();
-  ::io::deephaven::proto::backplane::grpc::Ticket* mutable_result_id();
-  void set_allocated_result_id(::io::deephaven::proto::backplane::grpc::Ticket* value);
-  void unsafe_arena_set_allocated_result_id(::io::deephaven::proto::backplane::grpc::Ticket* value);
-  ::io::deephaven::proto::backplane::grpc::Ticket* unsafe_arena_release_result_id();
-
-  private:
-  const ::io::deephaven::proto::backplane::grpc::Ticket& _internal_result_id() const;
-  ::io::deephaven::proto::backplane::grpc::Ticket* _internal_mutable_result_id();
-
-  public:
-  // .io.deephaven.proto.backplane.grpc.TableReference source_id = 2;
-  bool has_source_id() const;
-  void clear_source_id() ;
-  const ::io::deephaven::proto::backplane::grpc::TableReference& source_id() const;
-  PROTOBUF_NODISCARD ::io::deephaven::proto::backplane::grpc::TableReference* release_source_id();
-  ::io::deephaven::proto::backplane::grpc::TableReference* mutable_source_id();
-  void set_allocated_source_id(::io::deephaven::proto::backplane::grpc::TableReference* value);
-  void unsafe_arena_set_allocated_source_id(::io::deephaven::proto::backplane::grpc::TableReference* value);
-  ::io::deephaven::proto::backplane::grpc::TableReference* unsafe_arena_release_source_id();
-
-  private:
-  const ::io::deephaven::proto::backplane::grpc::TableReference& _internal_source_id() const;
-  ::io::deephaven::proto::backplane::grpc::TableReference* _internal_mutable_source_id();
-
-  public:
-  // @@protoc_insertion_point(class_scope:io.deephaven.proto.backplane.grpc.SelectOrUpdateRequest)
- private:
-  class _Internal;
-
-  friend class ::google::protobuf::internal::TcParser;
-  static const ::google::protobuf::internal::TcParseTable<
-      2, 3, 2,
-      76, 2>
-      _table_;
-  friend class ::google::protobuf::MessageLite;
-  friend class ::google::protobuf::Arena;
-  template <typename T>
-  friend class ::google::protobuf::Arena::InternalHelper;
-  using InternalArenaConstructable_ = void;
-  using DestructorSkippable_ = void;
-  struct Impl_ {
-
-        inline explicit constexpr Impl_(
-            ::google::protobuf::internal::ConstantInitialized) noexcept;
-        inline explicit Impl_(::google::protobuf::internal::InternalVisibility visibility,
-                              ::google::protobuf::Arena* arena);
-        inline explicit Impl_(::google::protobuf::internal::InternalVisibility visibility,
-                              ::google::protobuf::Arena* arena, const Impl_& from);
-    ::google::protobuf::internal::HasBits<1> _has_bits_;
-    mutable ::google::protobuf::internal::CachedSize _cached_size_;
-    ::google::protobuf::RepeatedPtrField<std::string> column_specs_;
-    ::io::deephaven::proto::backplane::grpc::Ticket* result_id_;
-    ::io::deephaven::proto::backplane::grpc::TableReference* source_id_;
-    PROTOBUF_TSAN_DECLARE_MEMBER
-  };
-  union { Impl_ _impl_; };
-  friend struct ::TableStruct_deephaven_2fproto_2ftable_2eproto;
-};// -------------------------------------------------------------------
-
-class SelectDistinctRequest final :
-    public ::google::protobuf::Message /* @@protoc_insertion_point(class_definition:io.deephaven.proto.backplane.grpc.SelectDistinctRequest) */ {
- public:
-  inline SelectDistinctRequest() : SelectDistinctRequest(nullptr) {}
-  ~SelectDistinctRequest() override;
-  template<typename = void>
-  explicit PROTOBUF_CONSTEXPR SelectDistinctRequest(::google::protobuf::internal::ConstantInitialized);
-
-  inline SelectDistinctRequest(const SelectDistinctRequest& from)
-      : SelectDistinctRequest(nullptr, from) {}
-  SelectDistinctRequest(SelectDistinctRequest&& from) noexcept
-    : SelectDistinctRequest() {
-    *this = ::std::move(from);
-  }
-
-  inline SelectDistinctRequest& operator=(const SelectDistinctRequest& from) {
-    CopyFrom(from);
-    return *this;
-  }
-  inline SelectDistinctRequest& operator=(SelectDistinctRequest&& from) noexcept {
-    if (this == &from) return *this;
-    if (GetArena() == from.GetArena()
-  #ifdef PROTOBUF_FORCE_COPY_IN_MOVE
-        && GetArena() != nullptr
-  #endif  // !PROTOBUF_FORCE_COPY_IN_MOVE
-    ) {
-      InternalSwap(&from);
-    } else {
-      CopyFrom(from);
-    }
-    return *this;
-  }
-
-  inline const ::google::protobuf::UnknownFieldSet& unknown_fields() const
-      ABSL_ATTRIBUTE_LIFETIME_BOUND {
-    return _internal_metadata_.unknown_fields<::google::protobuf::UnknownFieldSet>(::google::protobuf::UnknownFieldSet::default_instance);
-  }
-  inline ::google::protobuf::UnknownFieldSet* mutable_unknown_fields()
-      ABSL_ATTRIBUTE_LIFETIME_BOUND {
-    return _internal_metadata_.mutable_unknown_fields<::google::protobuf::UnknownFieldSet>();
-  }
-
-  static const ::google::protobuf::Descriptor* descriptor() {
-    return GetDescriptor();
-  }
-  static const ::google::protobuf::Descriptor* GetDescriptor() {
-    return default_instance().GetMetadata().descriptor;
-  }
-  static const ::google::protobuf::Reflection* GetReflection() {
-    return default_instance().GetMetadata().reflection;
-  }
-  static const SelectDistinctRequest& default_instance() {
-    return *internal_default_instance();
-  }
-  static inline const SelectDistinctRequest* internal_default_instance() {
-    return reinterpret_cast<const SelectDistinctRequest*>(
-               &_SelectDistinctRequest_default_instance_);
-  }
-  static constexpr int kIndexInFileMessages =
-    41;
-
-  friend void swap(SelectDistinctRequest& a, SelectDistinctRequest& b) {
-    a.Swap(&b);
-  }
-  inline void Swap(SelectDistinctRequest* other) {
-    if (other == this) return;
-  #ifdef PROTOBUF_FORCE_COPY_IN_SWAP
-    if (GetArena() != nullptr &&
-        GetArena() == other->GetArena()) {
-   #else  // PROTOBUF_FORCE_COPY_IN_SWAP
-    if (GetArena() == other->GetArena()) {
-  #endif  // !PROTOBUF_FORCE_COPY_IN_SWAP
-      InternalSwap(other);
-    } else {
-      ::google::protobuf::internal::GenericSwap(this, other);
-    }
-  }
-  void UnsafeArenaSwap(SelectDistinctRequest* other) {
-    if (other == this) return;
-    ABSL_DCHECK(GetArena() == other->GetArena());
-    InternalSwap(other);
-  }
-
-  // implements Message ----------------------------------------------
-
-  SelectDistinctRequest* New(::google::protobuf::Arena* arena = nullptr) const final {
-    return CreateMaybeMessage<SelectDistinctRequest>(arena);
-  }
-  using ::google::protobuf::Message::CopyFrom;
-  void CopyFrom(const SelectDistinctRequest& from);
-  using ::google::protobuf::Message::MergeFrom;
-  void MergeFrom( const SelectDistinctRequest& from) {
-    SelectDistinctRequest::MergeImpl(*this, from);
-  }
-  private:
-  static void MergeImpl(::google::protobuf::Message& to_msg, const ::google::protobuf::Message& from_msg);
-  public:
-  PROTOBUF_ATTRIBUTE_REINITIALIZES void Clear() final;
-  bool IsInitialized() const final;
-
-  ::size_t ByteSizeLong() const final;
-  const char* _InternalParse(const char* ptr, ::google::protobuf::internal::ParseContext* ctx) final;
-  ::uint8_t* _InternalSerialize(
-      ::uint8_t* target, ::google::protobuf::io::EpsCopyOutputStream* stream) const final;
-  int GetCachedSize() const { return _impl_._cached_size_.Get(); }
-
-  private:
-  ::google::protobuf::internal::CachedSize* AccessCachedSize() const final;
-  void SharedCtor(::google::protobuf::Arena* arena);
-  void SharedDtor();
-  void InternalSwap(SelectDistinctRequest* other);
-
-  private:
-  friend class ::google::protobuf::internal::AnyMetadata;
-  static ::absl::string_view FullMessageName() {
-    return "io.deephaven.proto.backplane.grpc.SelectDistinctRequest";
-  }
-  protected:
-  explicit SelectDistinctRequest(::google::protobuf::Arena* arena);
-  SelectDistinctRequest(::google::protobuf::Arena* arena, const SelectDistinctRequest& from);
-  public:
-
-  static const ClassData _class_data_;
-  const ::google::protobuf::Message::ClassData*GetClassData() const final;
-
-  ::google::protobuf::Metadata GetMetadata() const final;
-
-  // nested types ----------------------------------------------------
-
-  // accessors -------------------------------------------------------
-
-  enum : int {
-    kColumnNamesFieldNumber = 3,
-    kResultIdFieldNumber = 1,
-    kSourceIdFieldNumber = 2,
-  };
-  // repeated string column_names = 3;
-  int column_names_size() const;
-  private:
-  int _internal_column_names_size() const;
-
-  public:
-  void clear_column_names() ;
-  const std::string& column_names(int index) const;
-  std::string* mutable_column_names(int index);
-  void set_column_names(int index, const std::string& value);
-  void set_column_names(int index, std::string&& value);
-  void set_column_names(int index, const char* value);
-  void set_column_names(int index, const char* value, std::size_t size);
-  void set_column_names(int index, absl::string_view value);
-  std::string* add_column_names();
-  void add_column_names(const std::string& value);
-  void add_column_names(std::string&& value);
-  void add_column_names(const char* value);
-  void add_column_names(const char* value, std::size_t size);
-  void add_column_names(absl::string_view value);
-  const ::google::protobuf::RepeatedPtrField<std::string>& column_names() const;
-  ::google::protobuf::RepeatedPtrField<std::string>* mutable_column_names();
-
-  private:
-  const ::google::protobuf::RepeatedPtrField<std::string>& _internal_column_names() const;
-  ::google::protobuf::RepeatedPtrField<std::string>* _internal_mutable_column_names();
-
-  public:
-  // .io.deephaven.proto.backplane.grpc.Ticket result_id = 1;
-  bool has_result_id() const;
-  void clear_result_id() ;
-  const ::io::deephaven::proto::backplane::grpc::Ticket& result_id() const;
-  PROTOBUF_NODISCARD ::io::deephaven::proto::backplane::grpc::Ticket* release_result_id();
-  ::io::deephaven::proto::backplane::grpc::Ticket* mutable_result_id();
-  void set_allocated_result_id(::io::deephaven::proto::backplane::grpc::Ticket* value);
-  void unsafe_arena_set_allocated_result_id(::io::deephaven::proto::backplane::grpc::Ticket* value);
-  ::io::deephaven::proto::backplane::grpc::Ticket* unsafe_arena_release_result_id();
-
-  private:
-  const ::io::deephaven::proto::backplane::grpc::Ticket& _internal_result_id() const;
-  ::io::deephaven::proto::backplane::grpc::Ticket* _internal_mutable_result_id();
-
-  public:
-  // .io.deephaven.proto.backplane.grpc.TableReference source_id = 2;
-  bool has_source_id() const;
-  void clear_source_id() ;
-  const ::io::deephaven::proto::backplane::grpc::TableReference& source_id() const;
-  PROTOBUF_NODISCARD ::io::deephaven::proto::backplane::grpc::TableReference* release_source_id();
-  ::io::deephaven::proto::backplane::grpc::TableReference* mutable_source_id();
-  void set_allocated_source_id(::io::deephaven::proto::backplane::grpc::TableReference* value);
-  void unsafe_arena_set_allocated_source_id(::io::deephaven::proto::backplane::grpc::TableReference* value);
-  ::io::deephaven::proto::backplane::grpc::TableReference* unsafe_arena_release_source_id();
-
-  private:
-  const ::io::deephaven::proto::backplane::grpc::TableReference& _internal_source_id() const;
-  ::io::deephaven::proto::backplane::grpc::TableReference* _internal_mutable_source_id();
-
-  public:
-  // @@protoc_insertion_point(class_scope:io.deephaven.proto.backplane.grpc.SelectDistinctRequest)
- private:
-  class _Internal;
-
-  friend class ::google::protobuf::internal::TcParser;
-  static const ::google::protobuf::internal::TcParseTable<
-      2, 3, 2,
-      76, 2>
-      _table_;
-  friend class ::google::protobuf::MessageLite;
-  friend class ::google::protobuf::Arena;
-  template <typename T>
-  friend class ::google::protobuf::Arena::InternalHelper;
-  using InternalArenaConstructable_ = void;
-  using DestructorSkippable_ = void;
-  struct Impl_ {
-
-        inline explicit constexpr Impl_(
-            ::google::protobuf::internal::ConstantInitialized) noexcept;
-        inline explicit Impl_(::google::protobuf::internal::InternalVisibility visibility,
-                              ::google::protobuf::Arena* arena);
-        inline explicit Impl_(::google::protobuf::internal::InternalVisibility visibility,
-                              ::google::protobuf::Arena* arena, const Impl_& from);
-    ::google::protobuf::internal::HasBits<1> _has_bits_;
-    mutable ::google::protobuf::internal::CachedSize _cached_size_;
-    ::google::protobuf::RepeatedPtrField<std::string> column_names_;
-    ::io::deephaven::proto::backplane::grpc::Ticket* result_id_;
-    ::io::deephaven::proto::backplane::grpc::TableReference* source_id_;
-    PROTOBUF_TSAN_DECLARE_MEMBER
-  };
-  union { Impl_ _impl_; };
-  friend struct ::TableStruct_deephaven_2fproto_2ftable_2eproto;
-};// -------------------------------------------------------------------
-
-class RunChartDownsampleRequest final :
-    public ::google::protobuf::Message /* @@protoc_insertion_point(class_definition:io.deephaven.proto.backplane.grpc.RunChartDownsampleRequest) */ {
- public:
-  inline RunChartDownsampleRequest() : RunChartDownsampleRequest(nullptr) {}
-  ~RunChartDownsampleRequest() override;
-  template<typename = void>
-  explicit PROTOBUF_CONSTEXPR RunChartDownsampleRequest(::google::protobuf::internal::ConstantInitialized);
-
-  inline RunChartDownsampleRequest(const RunChartDownsampleRequest& from)
-      : RunChartDownsampleRequest(nullptr, from) {}
-  RunChartDownsampleRequest(RunChartDownsampleRequest&& from) noexcept
-    : RunChartDownsampleRequest() {
-    *this = ::std::move(from);
-  }
-
-  inline RunChartDownsampleRequest& operator=(const RunChartDownsampleRequest& from) {
-    CopyFrom(from);
-    return *this;
-  }
-  inline RunChartDownsampleRequest& operator=(RunChartDownsampleRequest&& from) noexcept {
-    if (this == &from) return *this;
-    if (GetArena() == from.GetArena()
-  #ifdef PROTOBUF_FORCE_COPY_IN_MOVE
-        && GetArena() != nullptr
-  #endif  // !PROTOBUF_FORCE_COPY_IN_MOVE
-    ) {
-      InternalSwap(&from);
-    } else {
-      CopyFrom(from);
-    }
-    return *this;
-  }
-
-  inline const ::google::protobuf::UnknownFieldSet& unknown_fields() const
-      ABSL_ATTRIBUTE_LIFETIME_BOUND {
-    return _internal_metadata_.unknown_fields<::google::protobuf::UnknownFieldSet>(::google::protobuf::UnknownFieldSet::default_instance);
-  }
-  inline ::google::protobuf::UnknownFieldSet* mutable_unknown_fields()
-      ABSL_ATTRIBUTE_LIFETIME_BOUND {
-    return _internal_metadata_.mutable_unknown_fields<::google::protobuf::UnknownFieldSet>();
-  }
-
-  static const ::google::protobuf::Descriptor* descriptor() {
-    return GetDescriptor();
-  }
-  static const ::google::protobuf::Descriptor* GetDescriptor() {
-    return default_instance().GetMetadata().descriptor;
-  }
-  static const ::google::protobuf::Reflection* GetReflection() {
-    return default_instance().GetMetadata().reflection;
-  }
-  static const RunChartDownsampleRequest& default_instance() {
-    return *internal_default_instance();
-  }
-  static inline const RunChartDownsampleRequest* internal_default_instance() {
-    return reinterpret_cast<const RunChartDownsampleRequest*>(
-               &_RunChartDownsampleRequest_default_instance_);
-  }
-  static constexpr int kIndexInFileMessages =
-    114;
-
-  friend void swap(RunChartDownsampleRequest& a, RunChartDownsampleRequest& b) {
-    a.Swap(&b);
-  }
-  inline void Swap(RunChartDownsampleRequest* other) {
-    if (other == this) return;
-  #ifdef PROTOBUF_FORCE_COPY_IN_SWAP
-    if (GetArena() != nullptr &&
-        GetArena() == other->GetArena()) {
-   #else  // PROTOBUF_FORCE_COPY_IN_SWAP
-    if (GetArena() == other->GetArena()) {
-  #endif  // !PROTOBUF_FORCE_COPY_IN_SWAP
-      InternalSwap(other);
-    } else {
-      ::google::protobuf::internal::GenericSwap(this, other);
-    }
-  }
-  void UnsafeArenaSwap(RunChartDownsampleRequest* other) {
-    if (other == this) return;
-    ABSL_DCHECK(GetArena() == other->GetArena());
-    InternalSwap(other);
-  }
-
-  // implements Message ----------------------------------------------
-
-  RunChartDownsampleRequest* New(::google::protobuf::Arena* arena = nullptr) const final {
-    return CreateMaybeMessage<RunChartDownsampleRequest>(arena);
-  }
-  using ::google::protobuf::Message::CopyFrom;
-  void CopyFrom(const RunChartDownsampleRequest& from);
-  using ::google::protobuf::Message::MergeFrom;
-  void MergeFrom( const RunChartDownsampleRequest& from) {
-    RunChartDownsampleRequest::MergeImpl(*this, from);
-  }
-  private:
-  static void MergeImpl(::google::protobuf::Message& to_msg, const ::google::protobuf::Message& from_msg);
-  public:
-  PROTOBUF_ATTRIBUTE_REINITIALIZES void Clear() final;
-  bool IsInitialized() const final;
-
-  ::size_t ByteSizeLong() const final;
-  const char* _InternalParse(const char* ptr, ::google::protobuf::internal::ParseContext* ctx) final;
-  ::uint8_t* _InternalSerialize(
-      ::uint8_t* target, ::google::protobuf::io::EpsCopyOutputStream* stream) const final;
-  int GetCachedSize() const { return _impl_._cached_size_.Get(); }
-
-  private:
-  ::google::protobuf::internal::CachedSize* AccessCachedSize() const final;
-  void SharedCtor(::google::protobuf::Arena* arena);
-  void SharedDtor();
-  void InternalSwap(RunChartDownsampleRequest* other);
-
-  private:
-  friend class ::google::protobuf::internal::AnyMetadata;
-  static ::absl::string_view FullMessageName() {
-    return "io.deephaven.proto.backplane.grpc.RunChartDownsampleRequest";
-  }
-  protected:
-  explicit RunChartDownsampleRequest(::google::protobuf::Arena* arena);
-  RunChartDownsampleRequest(::google::protobuf::Arena* arena, const RunChartDownsampleRequest& from);
-  public:
-
-  static const ClassData _class_data_;
-  const ::google::protobuf::Message::ClassData*GetClassData() const final;
-
-  ::google::protobuf::Metadata GetMetadata() const final;
-
-  // nested types ----------------------------------------------------
-
-  using ZoomRange = RunChartDownsampleRequest_ZoomRange;
-
-  // accessors -------------------------------------------------------
-
-  enum : int {
-    kYColumnNamesFieldNumber = 6,
-    kXColumnNameFieldNumber = 5,
-    kResultIdFieldNumber = 1,
-    kSourceIdFieldNumber = 2,
-    kZoomRangeFieldNumber = 4,
-    kPixelCountFieldNumber = 3,
-  };
-  // repeated string y_column_names = 6;
-  int y_column_names_size() const;
-  private:
-  int _internal_y_column_names_size() const;
-
-  public:
-  void clear_y_column_names() ;
-  const std::string& y_column_names(int index) const;
-  std::string* mutable_y_column_names(int index);
-  void set_y_column_names(int index, const std::string& value);
-  void set_y_column_names(int index, std::string&& value);
-  void set_y_column_names(int index, const char* value);
-  void set_y_column_names(int index, const char* value, std::size_t size);
-  void set_y_column_names(int index, absl::string_view value);
-  std::string* add_y_column_names();
-  void add_y_column_names(const std::string& value);
-  void add_y_column_names(std::string&& value);
-  void add_y_column_names(const char* value);
-  void add_y_column_names(const char* value, std::size_t size);
-  void add_y_column_names(absl::string_view value);
-  const ::google::protobuf::RepeatedPtrField<std::string>& y_column_names() const;
-  ::google::protobuf::RepeatedPtrField<std::string>* mutable_y_column_names();
-
-  private:
-  const ::google::protobuf::RepeatedPtrField<std::string>& _internal_y_column_names() const;
-  ::google::protobuf::RepeatedPtrField<std::string>* _internal_mutable_y_column_names();
-
-  public:
-  // string x_column_name = 5;
-  void clear_x_column_name() ;
-  const std::string& x_column_name() const;
-  template <typename Arg_ = const std::string&, typename... Args_>
-  void set_x_column_name(Arg_&& arg, Args_... args);
-  std::string* mutable_x_column_name();
-  PROTOBUF_NODISCARD std::string* release_x_column_name();
-  void set_allocated_x_column_name(std::string* value);
-
-  private:
-  const std::string& _internal_x_column_name() const;
-  inline PROTOBUF_ALWAYS_INLINE void _internal_set_x_column_name(
-      const std::string& value);
-  std::string* _internal_mutable_x_column_name();
-
-  public:
-  // .io.deephaven.proto.backplane.grpc.Ticket result_id = 1;
-  bool has_result_id() const;
-  void clear_result_id() ;
-  const ::io::deephaven::proto::backplane::grpc::Ticket& result_id() const;
-  PROTOBUF_NODISCARD ::io::deephaven::proto::backplane::grpc::Ticket* release_result_id();
-  ::io::deephaven::proto::backplane::grpc::Ticket* mutable_result_id();
-  void set_allocated_result_id(::io::deephaven::proto::backplane::grpc::Ticket* value);
-  void unsafe_arena_set_allocated_result_id(::io::deephaven::proto::backplane::grpc::Ticket* value);
-  ::io::deephaven::proto::backplane::grpc::Ticket* unsafe_arena_release_result_id();
-
-  private:
-  const ::io::deephaven::proto::backplane::grpc::Ticket& _internal_result_id() const;
-  ::io::deephaven::proto::backplane::grpc::Ticket* _internal_mutable_result_id();
-
-  public:
-  // .io.deephaven.proto.backplane.grpc.TableReference source_id = 2;
-  bool has_source_id() const;
-  void clear_source_id() ;
-  const ::io::deephaven::proto::backplane::grpc::TableReference& source_id() const;
-  PROTOBUF_NODISCARD ::io::deephaven::proto::backplane::grpc::TableReference* release_source_id();
-  ::io::deephaven::proto::backplane::grpc::TableReference* mutable_source_id();
-  void set_allocated_source_id(::io::deephaven::proto::backplane::grpc::TableReference* value);
-  void unsafe_arena_set_allocated_source_id(::io::deephaven::proto::backplane::grpc::TableReference* value);
-  ::io::deephaven::proto::backplane::grpc::TableReference* unsafe_arena_release_source_id();
-
-  private:
-  const ::io::deephaven::proto::backplane::grpc::TableReference& _internal_source_id() const;
-  ::io::deephaven::proto::backplane::grpc::TableReference* _internal_mutable_source_id();
-
-  public:
-  // .io.deephaven.proto.backplane.grpc.RunChartDownsampleRequest.ZoomRange zoom_range = 4;
-  bool has_zoom_range() const;
-  void clear_zoom_range() ;
-  const ::io::deephaven::proto::backplane::grpc::RunChartDownsampleRequest_ZoomRange& zoom_range() const;
-  PROTOBUF_NODISCARD ::io::deephaven::proto::backplane::grpc::RunChartDownsampleRequest_ZoomRange* release_zoom_range();
-  ::io::deephaven::proto::backplane::grpc::RunChartDownsampleRequest_ZoomRange* mutable_zoom_range();
-  void set_allocated_zoom_range(::io::deephaven::proto::backplane::grpc::RunChartDownsampleRequest_ZoomRange* value);
-  void unsafe_arena_set_allocated_zoom_range(::io::deephaven::proto::backplane::grpc::RunChartDownsampleRequest_ZoomRange* value);
-  ::io::deephaven::proto::backplane::grpc::RunChartDownsampleRequest_ZoomRange* unsafe_arena_release_zoom_range();
-
-  private:
-  const ::io::deephaven::proto::backplane::grpc::RunChartDownsampleRequest_ZoomRange& _internal_zoom_range() const;
-  ::io::deephaven::proto::backplane::grpc::RunChartDownsampleRequest_ZoomRange* _internal_mutable_zoom_range();
-
-  public:
-  // int32 pixel_count = 3;
-  void clear_pixel_count() ;
-  ::int32_t pixel_count() const;
-  void set_pixel_count(::int32_t value);
-
-  private:
-  ::int32_t _internal_pixel_count() const;
-  void _internal_set_pixel_count(::int32_t value);
-
-  public:
-  // @@protoc_insertion_point(class_scope:io.deephaven.proto.backplane.grpc.RunChartDownsampleRequest)
- private:
-  class _Internal;
-
-  friend class ::google::protobuf::internal::TcParser;
-  static const ::google::protobuf::internal::TcParseTable<
-      3, 6, 3,
-      95, 2>
-      _table_;
-  friend class ::google::protobuf::MessageLite;
-  friend class ::google::protobuf::Arena;
-  template <typename T>
-  friend class ::google::protobuf::Arena::InternalHelper;
-  using InternalArenaConstructable_ = void;
-  using DestructorSkippable_ = void;
-  struct Impl_ {
-
-        inline explicit constexpr Impl_(
-            ::google::protobuf::internal::ConstantInitialized) noexcept;
-        inline explicit Impl_(::google::protobuf::internal::InternalVisibility visibility,
-                              ::google::protobuf::Arena* arena);
-        inline explicit Impl_(::google::protobuf::internal::InternalVisibility visibility,
-                              ::google::protobuf::Arena* arena, const Impl_& from);
-    ::google::protobuf::internal::HasBits<1> _has_bits_;
-    mutable ::google::protobuf::internal::CachedSize _cached_size_;
-    ::google::protobuf::RepeatedPtrField<std::string> y_column_names_;
-    ::google::protobuf::internal::ArenaStringPtr x_column_name_;
-    ::io::deephaven::proto::backplane::grpc::Ticket* result_id_;
-    ::io::deephaven::proto::backplane::grpc::TableReference* source_id_;
-    ::io::deephaven::proto::backplane::grpc::RunChartDownsampleRequest_ZoomRange* zoom_range_;
-    ::int32_t pixel_count_;
-    PROTOBUF_TSAN_DECLARE_MEMBER
-  };
-  union { Impl_ _impl_; };
-  friend struct ::TableStruct_deephaven_2fproto_2ftable_2eproto;
-};// -------------------------------------------------------------------
-
-class NaturalJoinTablesRequest final :
-    public ::google::protobuf::Message /* @@protoc_insertion_point(class_definition:io.deephaven.proto.backplane.grpc.NaturalJoinTablesRequest) */ {
- public:
-  inline NaturalJoinTablesRequest() : NaturalJoinTablesRequest(nullptr) {}
-  ~NaturalJoinTablesRequest() override;
-  template<typename = void>
-  explicit PROTOBUF_CONSTEXPR NaturalJoinTablesRequest(::google::protobuf::internal::ConstantInitialized);
-
-  inline NaturalJoinTablesRequest(const NaturalJoinTablesRequest& from)
-      : NaturalJoinTablesRequest(nullptr, from) {}
-  NaturalJoinTablesRequest(NaturalJoinTablesRequest&& from) noexcept
-    : NaturalJoinTablesRequest() {
-    *this = ::std::move(from);
-  }
-
-  inline NaturalJoinTablesRequest& operator=(const NaturalJoinTablesRequest& from) {
-    CopyFrom(from);
-    return *this;
-  }
-  inline NaturalJoinTablesRequest& operator=(NaturalJoinTablesRequest&& from) noexcept {
-    if (this == &from) return *this;
-    if (GetArena() == from.GetArena()
-  #ifdef PROTOBUF_FORCE_COPY_IN_MOVE
-        && GetArena() != nullptr
-  #endif  // !PROTOBUF_FORCE_COPY_IN_MOVE
-    ) {
-      InternalSwap(&from);
-    } else {
-      CopyFrom(from);
-    }
-    return *this;
-  }
-
-  inline const ::google::protobuf::UnknownFieldSet& unknown_fields() const
-      ABSL_ATTRIBUTE_LIFETIME_BOUND {
-    return _internal_metadata_.unknown_fields<::google::protobuf::UnknownFieldSet>(::google::protobuf::UnknownFieldSet::default_instance);
-  }
-  inline ::google::protobuf::UnknownFieldSet* mutable_unknown_fields()
-      ABSL_ATTRIBUTE_LIFETIME_BOUND {
-    return _internal_metadata_.mutable_unknown_fields<::google::protobuf::UnknownFieldSet>();
-  }
-
-  static const ::google::protobuf::Descriptor* descriptor() {
-    return GetDescriptor();
-  }
-  static const ::google::protobuf::Descriptor* GetDescriptor() {
-    return default_instance().GetMetadata().descriptor;
-  }
-  static const ::google::protobuf::Reflection* GetReflection() {
-    return default_instance().GetMetadata().reflection;
-  }
-  static const NaturalJoinTablesRequest& default_instance() {
-    return *internal_default_instance();
-  }
-  static inline const NaturalJoinTablesRequest* internal_default_instance() {
-    return reinterpret_cast<const NaturalJoinTablesRequest*>(
-               &_NaturalJoinTablesRequest_default_instance_);
-  }
-  static constexpr int kIndexInFileMessages =
-    51;
-
-  friend void swap(NaturalJoinTablesRequest& a, NaturalJoinTablesRequest& b) {
-    a.Swap(&b);
-  }
-  inline void Swap(NaturalJoinTablesRequest* other) {
-    if (other == this) return;
-  #ifdef PROTOBUF_FORCE_COPY_IN_SWAP
-    if (GetArena() != nullptr &&
-        GetArena() == other->GetArena()) {
-   #else  // PROTOBUF_FORCE_COPY_IN_SWAP
-    if (GetArena() == other->GetArena()) {
-  #endif  // !PROTOBUF_FORCE_COPY_IN_SWAP
-      InternalSwap(other);
-    } else {
-      ::google::protobuf::internal::GenericSwap(this, other);
-    }
-  }
-  void UnsafeArenaSwap(NaturalJoinTablesRequest* other) {
-    if (other == this) return;
-    ABSL_DCHECK(GetArena() == other->GetArena());
-    InternalSwap(other);
-  }
-
-  // implements Message ----------------------------------------------
-
-  NaturalJoinTablesRequest* New(::google::protobuf::Arena* arena = nullptr) const final {
-    return CreateMaybeMessage<NaturalJoinTablesRequest>(arena);
-  }
-  using ::google::protobuf::Message::CopyFrom;
-  void CopyFrom(const NaturalJoinTablesRequest& from);
-  using ::google::protobuf::Message::MergeFrom;
-  void MergeFrom( const NaturalJoinTablesRequest& from) {
-    NaturalJoinTablesRequest::MergeImpl(*this, from);
-  }
-  private:
-  static void MergeImpl(::google::protobuf::Message& to_msg, const ::google::protobuf::Message& from_msg);
-  public:
-  PROTOBUF_ATTRIBUTE_REINITIALIZES void Clear() final;
-  bool IsInitialized() const final;
-
-  ::size_t ByteSizeLong() const final;
-  const char* _InternalParse(const char* ptr, ::google::protobuf::internal::ParseContext* ctx) final;
-  ::uint8_t* _InternalSerialize(
-      ::uint8_t* target, ::google::protobuf::io::EpsCopyOutputStream* stream) const final;
-  int GetCachedSize() const { return _impl_._cached_size_.Get(); }
-
-  private:
-  ::google::protobuf::internal::CachedSize* AccessCachedSize() const final;
-  void SharedCtor(::google::protobuf::Arena* arena);
-  void SharedDtor();
-  void InternalSwap(NaturalJoinTablesRequest* other);
-
-  private:
-  friend class ::google::protobuf::internal::AnyMetadata;
-  static ::absl::string_view FullMessageName() {
-    return "io.deephaven.proto.backplane.grpc.NaturalJoinTablesRequest";
-  }
-  protected:
-  explicit NaturalJoinTablesRequest(::google::protobuf::Arena* arena);
-  NaturalJoinTablesRequest(::google::protobuf::Arena* arena, const NaturalJoinTablesRequest& from);
-  public:
-
-  static const ClassData _class_data_;
-  const ::google::protobuf::Message::ClassData*GetClassData() const final;
-
-  ::google::protobuf::Metadata GetMetadata() const final;
-
-  // nested types ----------------------------------------------------
-
-  // accessors -------------------------------------------------------
-
-  enum : int {
-    kColumnsToMatchFieldNumber = 4,
-    kColumnsToAddFieldNumber = 5,
-    kResultIdFieldNumber = 1,
-    kLeftIdFieldNumber = 2,
-    kRightIdFieldNumber = 3,
-  };
-  // repeated string columns_to_match = 4;
-  int columns_to_match_size() const;
-  private:
-  int _internal_columns_to_match_size() const;
-
-  public:
-  void clear_columns_to_match() ;
-  const std::string& columns_to_match(int index) const;
-  std::string* mutable_columns_to_match(int index);
-  void set_columns_to_match(int index, const std::string& value);
-  void set_columns_to_match(int index, std::string&& value);
-  void set_columns_to_match(int index, const char* value);
-  void set_columns_to_match(int index, const char* value, std::size_t size);
-  void set_columns_to_match(int index, absl::string_view value);
-  std::string* add_columns_to_match();
-  void add_columns_to_match(const std::string& value);
-  void add_columns_to_match(std::string&& value);
-  void add_columns_to_match(const char* value);
-  void add_columns_to_match(const char* value, std::size_t size);
-  void add_columns_to_match(absl::string_view value);
-  const ::google::protobuf::RepeatedPtrField<std::string>& columns_to_match() const;
-  ::google::protobuf::RepeatedPtrField<std::string>* mutable_columns_to_match();
-
-  private:
-  const ::google::protobuf::RepeatedPtrField<std::string>& _internal_columns_to_match() const;
-  ::google::protobuf::RepeatedPtrField<std::string>* _internal_mutable_columns_to_match();
-
-  public:
-  // repeated string columns_to_add = 5;
-  int columns_to_add_size() const;
-  private:
-  int _internal_columns_to_add_size() const;
-
-  public:
-  void clear_columns_to_add() ;
-  const std::string& columns_to_add(int index) const;
-  std::string* mutable_columns_to_add(int index);
-  void set_columns_to_add(int index, const std::string& value);
-  void set_columns_to_add(int index, std::string&& value);
-  void set_columns_to_add(int index, const char* value);
-  void set_columns_to_add(int index, const char* value, std::size_t size);
-  void set_columns_to_add(int index, absl::string_view value);
-  std::string* add_columns_to_add();
-  void add_columns_to_add(const std::string& value);
-  void add_columns_to_add(std::string&& value);
-  void add_columns_to_add(const char* value);
-  void add_columns_to_add(const char* value, std::size_t size);
-  void add_columns_to_add(absl::string_view value);
-  const ::google::protobuf::RepeatedPtrField<std::string>& columns_to_add() const;
-  ::google::protobuf::RepeatedPtrField<std::string>* mutable_columns_to_add();
-
-  private:
-  const ::google::protobuf::RepeatedPtrField<std::string>& _internal_columns_to_add() const;
-  ::google::protobuf::RepeatedPtrField<std::string>* _internal_mutable_columns_to_add();
-
-  public:
-  // .io.deephaven.proto.backplane.grpc.Ticket result_id = 1;
-  bool has_result_id() const;
-  void clear_result_id() ;
-  const ::io::deephaven::proto::backplane::grpc::Ticket& result_id() const;
-  PROTOBUF_NODISCARD ::io::deephaven::proto::backplane::grpc::Ticket* release_result_id();
-  ::io::deephaven::proto::backplane::grpc::Ticket* mutable_result_id();
-  void set_allocated_result_id(::io::deephaven::proto::backplane::grpc::Ticket* value);
-  void unsafe_arena_set_allocated_result_id(::io::deephaven::proto::backplane::grpc::Ticket* value);
-  ::io::deephaven::proto::backplane::grpc::Ticket* unsafe_arena_release_result_id();
-
-  private:
-  const ::io::deephaven::proto::backplane::grpc::Ticket& _internal_result_id() const;
-  ::io::deephaven::proto::backplane::grpc::Ticket* _internal_mutable_result_id();
-
-  public:
-  // .io.deephaven.proto.backplane.grpc.TableReference left_id = 2;
-  bool has_left_id() const;
-  void clear_left_id() ;
-  const ::io::deephaven::proto::backplane::grpc::TableReference& left_id() const;
-  PROTOBUF_NODISCARD ::io::deephaven::proto::backplane::grpc::TableReference* release_left_id();
-  ::io::deephaven::proto::backplane::grpc::TableReference* mutable_left_id();
-  void set_allocated_left_id(::io::deephaven::proto::backplane::grpc::TableReference* value);
-  void unsafe_arena_set_allocated_left_id(::io::deephaven::proto::backplane::grpc::TableReference* value);
-  ::io::deephaven::proto::backplane::grpc::TableReference* unsafe_arena_release_left_id();
-
-  private:
-  const ::io::deephaven::proto::backplane::grpc::TableReference& _internal_left_id() const;
-  ::io::deephaven::proto::backplane::grpc::TableReference* _internal_mutable_left_id();
-
-  public:
-  // .io.deephaven.proto.backplane.grpc.TableReference right_id = 3;
-  bool has_right_id() const;
-  void clear_right_id() ;
-  const ::io::deephaven::proto::backplane::grpc::TableReference& right_id() const;
-  PROTOBUF_NODISCARD ::io::deephaven::proto::backplane::grpc::TableReference* release_right_id();
-  ::io::deephaven::proto::backplane::grpc::TableReference* mutable_right_id();
-  void set_allocated_right_id(::io::deephaven::proto::backplane::grpc::TableReference* value);
-  void unsafe_arena_set_allocated_right_id(::io::deephaven::proto::backplane::grpc::TableReference* value);
-  ::io::deephaven::proto::backplane::grpc::TableReference* unsafe_arena_release_right_id();
-
-  private:
-  const ::io::deephaven::proto::backplane::grpc::TableReference& _internal_right_id() const;
-  ::io::deephaven::proto::backplane::grpc::TableReference* _internal_mutable_right_id();
-
-  public:
-  // @@protoc_insertion_point(class_scope:io.deephaven.proto.backplane.grpc.NaturalJoinTablesRequest)
- private:
-  class _Internal;
-
-  friend class ::google::protobuf::internal::TcParser;
-  static const ::google::protobuf::internal::TcParseTable<
-      3, 5, 3,
-      97, 2>
-      _table_;
-  friend class ::google::protobuf::MessageLite;
-  friend class ::google::protobuf::Arena;
-  template <typename T>
-  friend class ::google::protobuf::Arena::InternalHelper;
-  using InternalArenaConstructable_ = void;
-  using DestructorSkippable_ = void;
-  struct Impl_ {
-
-        inline explicit constexpr Impl_(
-            ::google::protobuf::internal::ConstantInitialized) noexcept;
-        inline explicit Impl_(::google::protobuf::internal::InternalVisibility visibility,
-                              ::google::protobuf::Arena* arena);
-        inline explicit Impl_(::google::protobuf::internal::InternalVisibility visibility,
-                              ::google::protobuf::Arena* arena, const Impl_& from);
-    ::google::protobuf::internal::HasBits<1> _has_bits_;
-    mutable ::google::protobuf::internal::CachedSize _cached_size_;
-    ::google::protobuf::RepeatedPtrField<std::string> columns_to_match_;
-    ::google::protobuf::RepeatedPtrField<std::string> columns_to_add_;
-    ::io::deephaven::proto::backplane::grpc::Ticket* result_id_;
-    ::io::deephaven::proto::backplane::grpc::TableReference* left_id_;
-    ::io::deephaven::proto::backplane::grpc::TableReference* right_id_;
-    PROTOBUF_TSAN_DECLARE_MEMBER
-  };
-  union { Impl_ _impl_; };
-  friend struct ::TableStruct_deephaven_2fproto_2ftable_2eproto;
-};// -------------------------------------------------------------------
-
-class MultiJoinInput final :
-    public ::google::protobuf::Message /* @@protoc_insertion_point(class_definition:io.deephaven.proto.backplane.grpc.MultiJoinInput) */ {
- public:
-  inline MultiJoinInput() : MultiJoinInput(nullptr) {}
-  ~MultiJoinInput() override;
-  template<typename = void>
-  explicit PROTOBUF_CONSTEXPR MultiJoinInput(::google::protobuf::internal::ConstantInitialized);
-
-  inline MultiJoinInput(const MultiJoinInput& from)
-      : MultiJoinInput(nullptr, from) {}
-  MultiJoinInput(MultiJoinInput&& from) noexcept
-    : MultiJoinInput() {
-    *this = ::std::move(from);
-  }
-
-  inline MultiJoinInput& operator=(const MultiJoinInput& from) {
-    CopyFrom(from);
-    return *this;
-  }
-  inline MultiJoinInput& operator=(MultiJoinInput&& from) noexcept {
-    if (this == &from) return *this;
-    if (GetArena() == from.GetArena()
-  #ifdef PROTOBUF_FORCE_COPY_IN_MOVE
-        && GetArena() != nullptr
-  #endif  // !PROTOBUF_FORCE_COPY_IN_MOVE
-    ) {
-      InternalSwap(&from);
-    } else {
-      CopyFrom(from);
-    }
-    return *this;
-  }
-
-  inline const ::google::protobuf::UnknownFieldSet& unknown_fields() const
-      ABSL_ATTRIBUTE_LIFETIME_BOUND {
-    return _internal_metadata_.unknown_fields<::google::protobuf::UnknownFieldSet>(::google::protobuf::UnknownFieldSet::default_instance);
-  }
-  inline ::google::protobuf::UnknownFieldSet* mutable_unknown_fields()
-      ABSL_ATTRIBUTE_LIFETIME_BOUND {
-    return _internal_metadata_.mutable_unknown_fields<::google::protobuf::UnknownFieldSet>();
-  }
-
-  static const ::google::protobuf::Descriptor* descriptor() {
-    return GetDescriptor();
-  }
-  static const ::google::protobuf::Descriptor* GetDescriptor() {
-    return default_instance().GetMetadata().descriptor;
-  }
-  static const ::google::protobuf::Reflection* GetReflection() {
-    return default_instance().GetMetadata().reflection;
-  }
-  static const MultiJoinInput& default_instance() {
-    return *internal_default_instance();
-  }
-  static inline const MultiJoinInput* internal_default_instance() {
-    return reinterpret_cast<const MultiJoinInput*>(
-               &_MultiJoinInput_default_instance_);
-  }
-  static constexpr int kIndexInFileMessages =
-    56;
-
-  friend void swap(MultiJoinInput& a, MultiJoinInput& b) {
-    a.Swap(&b);
-  }
-  inline void Swap(MultiJoinInput* other) {
-    if (other == this) return;
-  #ifdef PROTOBUF_FORCE_COPY_IN_SWAP
-    if (GetArena() != nullptr &&
-        GetArena() == other->GetArena()) {
-   #else  // PROTOBUF_FORCE_COPY_IN_SWAP
-    if (GetArena() == other->GetArena()) {
-  #endif  // !PROTOBUF_FORCE_COPY_IN_SWAP
-      InternalSwap(other);
-    } else {
-      ::google::protobuf::internal::GenericSwap(this, other);
-    }
-  }
-  void UnsafeArenaSwap(MultiJoinInput* other) {
-    if (other == this) return;
-    ABSL_DCHECK(GetArena() == other->GetArena());
-    InternalSwap(other);
-  }
-
-  // implements Message ----------------------------------------------
-
-  MultiJoinInput* New(::google::protobuf::Arena* arena = nullptr) const final {
-    return CreateMaybeMessage<MultiJoinInput>(arena);
-  }
-  using ::google::protobuf::Message::CopyFrom;
-  void CopyFrom(const MultiJoinInput& from);
-  using ::google::protobuf::Message::MergeFrom;
-  void MergeFrom( const MultiJoinInput& from) {
-    MultiJoinInput::MergeImpl(*this, from);
-  }
-  private:
-  static void MergeImpl(::google::protobuf::Message& to_msg, const ::google::protobuf::Message& from_msg);
-  public:
-  PROTOBUF_ATTRIBUTE_REINITIALIZES void Clear() final;
-  bool IsInitialized() const final;
-
-  ::size_t ByteSizeLong() const final;
-  const char* _InternalParse(const char* ptr, ::google::protobuf::internal::ParseContext* ctx) final;
-  ::uint8_t* _InternalSerialize(
-      ::uint8_t* target, ::google::protobuf::io::EpsCopyOutputStream* stream) const final;
-  int GetCachedSize() const { return _impl_._cached_size_.Get(); }
-
-  private:
-  ::google::protobuf::internal::CachedSize* AccessCachedSize() const final;
-  void SharedCtor(::google::protobuf::Arena* arena);
-  void SharedDtor();
-  void InternalSwap(MultiJoinInput* other);
-
-  private:
-  friend class ::google::protobuf::internal::AnyMetadata;
-  static ::absl::string_view FullMessageName() {
-    return "io.deephaven.proto.backplane.grpc.MultiJoinInput";
-  }
-  protected:
-  explicit MultiJoinInput(::google::protobuf::Arena* arena);
-  MultiJoinInput(::google::protobuf::Arena* arena, const MultiJoinInput& from);
-  public:
-
-  static const ClassData _class_data_;
-  const ::google::protobuf::Message::ClassData*GetClassData() const final;
-
-  ::google::protobuf::Metadata GetMetadata() const final;
-
-  // nested types ----------------------------------------------------
-
-  // accessors -------------------------------------------------------
-
-  enum : int {
-    kColumnsToMatchFieldNumber = 2,
-    kColumnsToAddFieldNumber = 3,
-    kSourceIdFieldNumber = 1,
-  };
-  // repeated string columns_to_match = 2;
-  int columns_to_match_size() const;
-  private:
-  int _internal_columns_to_match_size() const;
-
-  public:
-  void clear_columns_to_match() ;
-  const std::string& columns_to_match(int index) const;
-  std::string* mutable_columns_to_match(int index);
-  void set_columns_to_match(int index, const std::string& value);
-  void set_columns_to_match(int index, std::string&& value);
-  void set_columns_to_match(int index, const char* value);
-  void set_columns_to_match(int index, const char* value, std::size_t size);
-  void set_columns_to_match(int index, absl::string_view value);
-  std::string* add_columns_to_match();
-  void add_columns_to_match(const std::string& value);
-  void add_columns_to_match(std::string&& value);
-  void add_columns_to_match(const char* value);
-  void add_columns_to_match(const char* value, std::size_t size);
-  void add_columns_to_match(absl::string_view value);
-  const ::google::protobuf::RepeatedPtrField<std::string>& columns_to_match() const;
-  ::google::protobuf::RepeatedPtrField<std::string>* mutable_columns_to_match();
-
-  private:
-  const ::google::protobuf::RepeatedPtrField<std::string>& _internal_columns_to_match() const;
-  ::google::protobuf::RepeatedPtrField<std::string>* _internal_mutable_columns_to_match();
-
-  public:
-  // repeated string columns_to_add = 3;
-  int columns_to_add_size() const;
-  private:
-  int _internal_columns_to_add_size() const;
-
-  public:
-  void clear_columns_to_add() ;
-  const std::string& columns_to_add(int index) const;
-  std::string* mutable_columns_to_add(int index);
-  void set_columns_to_add(int index, const std::string& value);
-  void set_columns_to_add(int index, std::string&& value);
-  void set_columns_to_add(int index, const char* value);
-  void set_columns_to_add(int index, const char* value, std::size_t size);
-  void set_columns_to_add(int index, absl::string_view value);
-  std::string* add_columns_to_add();
-  void add_columns_to_add(const std::string& value);
-  void add_columns_to_add(std::string&& value);
-  void add_columns_to_add(const char* value);
-  void add_columns_to_add(const char* value, std::size_t size);
-  void add_columns_to_add(absl::string_view value);
-  const ::google::protobuf::RepeatedPtrField<std::string>& columns_to_add() const;
-  ::google::protobuf::RepeatedPtrField<std::string>* mutable_columns_to_add();
-
-  private:
-  const ::google::protobuf::RepeatedPtrField<std::string>& _internal_columns_to_add() const;
-  ::google::protobuf::RepeatedPtrField<std::string>* _internal_mutable_columns_to_add();
-
-  public:
-  // .io.deephaven.proto.backplane.grpc.TableReference source_id = 1;
-  bool has_source_id() const;
-  void clear_source_id() ;
-  const ::io::deephaven::proto::backplane::grpc::TableReference& source_id() const;
-  PROTOBUF_NODISCARD ::io::deephaven::proto::backplane::grpc::TableReference* release_source_id();
-  ::io::deephaven::proto::backplane::grpc::TableReference* mutable_source_id();
-  void set_allocated_source_id(::io::deephaven::proto::backplane::grpc::TableReference* value);
-  void unsafe_arena_set_allocated_source_id(::io::deephaven::proto::backplane::grpc::TableReference* value);
-  ::io::deephaven::proto::backplane::grpc::TableReference* unsafe_arena_release_source_id();
-
-  private:
-  const ::io::deephaven::proto::backplane::grpc::TableReference& _internal_source_id() const;
-  ::io::deephaven::proto::backplane::grpc::TableReference* _internal_mutable_source_id();
-
-  public:
-  // @@protoc_insertion_point(class_scope:io.deephaven.proto.backplane.grpc.MultiJoinInput)
- private:
-  class _Internal;
-
-  friend class ::google::protobuf::internal::TcParser;
-  static const ::google::protobuf::internal::TcParseTable<
-      2, 3, 1,
-      87, 2>
-      _table_;
-  friend class ::google::protobuf::MessageLite;
-  friend class ::google::protobuf::Arena;
-  template <typename T>
-  friend class ::google::protobuf::Arena::InternalHelper;
-  using InternalArenaConstructable_ = void;
-  using DestructorSkippable_ = void;
-  struct Impl_ {
-
-        inline explicit constexpr Impl_(
-            ::google::protobuf::internal::ConstantInitialized) noexcept;
-        inline explicit Impl_(::google::protobuf::internal::InternalVisibility visibility,
-                              ::google::protobuf::Arena* arena);
-        inline explicit Impl_(::google::protobuf::internal::InternalVisibility visibility,
-                              ::google::protobuf::Arena* arena, const Impl_& from);
-    ::google::protobuf::internal::HasBits<1> _has_bits_;
-    mutable ::google::protobuf::internal::CachedSize _cached_size_;
-    ::google::protobuf::RepeatedPtrField<std::string> columns_to_match_;
-    ::google::protobuf::RepeatedPtrField<std::string> columns_to_add_;
-    ::io::deephaven::proto::backplane::grpc::TableReference* source_id_;
-    PROTOBUF_TSAN_DECLARE_MEMBER
-  };
-  union { Impl_ _impl_; };
-  friend struct ::TableStruct_deephaven_2fproto_2ftable_2eproto;
-};// -------------------------------------------------------------------
-
-class MetaTableRequest final :
-    public ::google::protobuf::Message /* @@protoc_insertion_point(class_definition:io.deephaven.proto.backplane.grpc.MetaTableRequest) */ {
- public:
-  inline MetaTableRequest() : MetaTableRequest(nullptr) {}
-  ~MetaTableRequest() override;
-  template<typename = void>
-  explicit PROTOBUF_CONSTEXPR MetaTableRequest(::google::protobuf::internal::ConstantInitialized);
-
-  inline MetaTableRequest(const MetaTableRequest& from)
-      : MetaTableRequest(nullptr, from) {}
-  MetaTableRequest(MetaTableRequest&& from) noexcept
-    : MetaTableRequest() {
-    *this = ::std::move(from);
-  }
-
-  inline MetaTableRequest& operator=(const MetaTableRequest& from) {
-    CopyFrom(from);
-    return *this;
-  }
-  inline MetaTableRequest& operator=(MetaTableRequest&& from) noexcept {
-    if (this == &from) return *this;
-    if (GetArena() == from.GetArena()
-  #ifdef PROTOBUF_FORCE_COPY_IN_MOVE
-        && GetArena() != nullptr
-  #endif  // !PROTOBUF_FORCE_COPY_IN_MOVE
-    ) {
-      InternalSwap(&from);
-    } else {
-      CopyFrom(from);
-    }
-    return *this;
-  }
-
-  inline const ::google::protobuf::UnknownFieldSet& unknown_fields() const
-      ABSL_ATTRIBUTE_LIFETIME_BOUND {
-    return _internal_metadata_.unknown_fields<::google::protobuf::UnknownFieldSet>(::google::protobuf::UnknownFieldSet::default_instance);
-  }
-  inline ::google::protobuf::UnknownFieldSet* mutable_unknown_fields()
-      ABSL_ATTRIBUTE_LIFETIME_BOUND {
-    return _internal_metadata_.mutable_unknown_fields<::google::protobuf::UnknownFieldSet>();
-  }
-
-  static const ::google::protobuf::Descriptor* descriptor() {
-    return GetDescriptor();
-  }
-  static const ::google::protobuf::Descriptor* GetDescriptor() {
-    return default_instance().GetMetadata().descriptor;
-  }
-  static const ::google::protobuf::Reflection* GetReflection() {
-    return default_instance().GetMetadata().reflection;
-  }
-  static const MetaTableRequest& default_instance() {
-    return *internal_default_instance();
-  }
-  static inline const MetaTableRequest* internal_default_instance() {
-    return reinterpret_cast<const MetaTableRequest*>(
-               &_MetaTableRequest_default_instance_);
-  }
-  static constexpr int kIndexInFileMessages =
-    112;
-
-  friend void swap(MetaTableRequest& a, MetaTableRequest& b) {
-    a.Swap(&b);
-  }
-  inline void Swap(MetaTableRequest* other) {
-    if (other == this) return;
-  #ifdef PROTOBUF_FORCE_COPY_IN_SWAP
-    if (GetArena() != nullptr &&
-        GetArena() == other->GetArena()) {
-   #else  // PROTOBUF_FORCE_COPY_IN_SWAP
-    if (GetArena() == other->GetArena()) {
-  #endif  // !PROTOBUF_FORCE_COPY_IN_SWAP
-      InternalSwap(other);
-    } else {
-      ::google::protobuf::internal::GenericSwap(this, other);
-    }
-  }
-  void UnsafeArenaSwap(MetaTableRequest* other) {
-    if (other == this) return;
-    ABSL_DCHECK(GetArena() == other->GetArena());
-    InternalSwap(other);
-  }
-
-  // implements Message ----------------------------------------------
-
-  MetaTableRequest* New(::google::protobuf::Arena* arena = nullptr) const final {
-    return CreateMaybeMessage<MetaTableRequest>(arena);
-  }
-  using ::google::protobuf::Message::CopyFrom;
-  void CopyFrom(const MetaTableRequest& from);
-  using ::google::protobuf::Message::MergeFrom;
-  void MergeFrom( const MetaTableRequest& from) {
-    MetaTableRequest::MergeImpl(*this, from);
-  }
-  private:
-  static void MergeImpl(::google::protobuf::Message& to_msg, const ::google::protobuf::Message& from_msg);
-  public:
-  PROTOBUF_ATTRIBUTE_REINITIALIZES void Clear() final;
-  bool IsInitialized() const final;
-
-  ::size_t ByteSizeLong() const final;
-  const char* _InternalParse(const char* ptr, ::google::protobuf::internal::ParseContext* ctx) final;
-  ::uint8_t* _InternalSerialize(
-      ::uint8_t* target, ::google::protobuf::io::EpsCopyOutputStream* stream) const final;
-  int GetCachedSize() const { return _impl_._cached_size_.Get(); }
-
-  private:
-  ::google::protobuf::internal::CachedSize* AccessCachedSize() const final;
-  void SharedCtor(::google::protobuf::Arena* arena);
-  void SharedDtor();
-  void InternalSwap(MetaTableRequest* other);
-
-  private:
-  friend class ::google::protobuf::internal::AnyMetadata;
-  static ::absl::string_view FullMessageName() {
-    return "io.deephaven.proto.backplane.grpc.MetaTableRequest";
-  }
-  protected:
-  explicit MetaTableRequest(::google::protobuf::Arena* arena);
-  MetaTableRequest(::google::protobuf::Arena* arena, const MetaTableRequest& from);
-  public:
-
-  static const ClassData _class_data_;
-  const ::google::protobuf::Message::ClassData*GetClassData() const final;
-
-  ::google::protobuf::Metadata GetMetadata() const final;
-
-  // nested types ----------------------------------------------------
-
-  // accessors -------------------------------------------------------
-
-  enum : int {
-    kResultIdFieldNumber = 1,
-    kSourceIdFieldNumber = 2,
-  };
-  // .io.deephaven.proto.backplane.grpc.Ticket result_id = 1;
-  bool has_result_id() const;
-  void clear_result_id() ;
-  const ::io::deephaven::proto::backplane::grpc::Ticket& result_id() const;
-  PROTOBUF_NODISCARD ::io::deephaven::proto::backplane::grpc::Ticket* release_result_id();
-  ::io::deephaven::proto::backplane::grpc::Ticket* mutable_result_id();
-  void set_allocated_result_id(::io::deephaven::proto::backplane::grpc::Ticket* value);
-  void unsafe_arena_set_allocated_result_id(::io::deephaven::proto::backplane::grpc::Ticket* value);
-  ::io::deephaven::proto::backplane::grpc::Ticket* unsafe_arena_release_result_id();
-
-  private:
-  const ::io::deephaven::proto::backplane::grpc::Ticket& _internal_result_id() const;
-  ::io::deephaven::proto::backplane::grpc::Ticket* _internal_mutable_result_id();
-
-  public:
-  // .io.deephaven.proto.backplane.grpc.TableReference source_id = 2;
-  bool has_source_id() const;
-  void clear_source_id() ;
-  const ::io::deephaven::proto::backplane::grpc::TableReference& source_id() const;
-  PROTOBUF_NODISCARD ::io::deephaven::proto::backplane::grpc::TableReference* release_source_id();
-  ::io::deephaven::proto::backplane::grpc::TableReference* mutable_source_id();
-  void set_allocated_source_id(::io::deephaven::proto::backplane::grpc::TableReference* value);
-  void unsafe_arena_set_allocated_source_id(::io::deephaven::proto::backplane::grpc::TableReference* value);
-  ::io::deephaven::proto::backplane::grpc::TableReference* unsafe_arena_release_source_id();
-
-  private:
-  const ::io::deephaven::proto::backplane::grpc::TableReference& _internal_source_id() const;
-  ::io::deephaven::proto::backplane::grpc::TableReference* _internal_mutable_source_id();
-
-  public:
-  // @@protoc_insertion_point(class_scope:io.deephaven.proto.backplane.grpc.MetaTableRequest)
- private:
-  class _Internal;
-
-  friend class ::google::protobuf::internal::TcParser;
-  static const ::google::protobuf::internal::TcParseTable<
-      1, 2, 2,
-      0, 2>
-      _table_;
-  friend class ::google::protobuf::MessageLite;
-  friend class ::google::protobuf::Arena;
-  template <typename T>
-  friend class ::google::protobuf::Arena::InternalHelper;
-  using InternalArenaConstructable_ = void;
-  using DestructorSkippable_ = void;
-  struct Impl_ {
-
-        inline explicit constexpr Impl_(
-            ::google::protobuf::internal::ConstantInitialized) noexcept;
-        inline explicit Impl_(::google::protobuf::internal::InternalVisibility visibility,
-                              ::google::protobuf::Arena* arena);
-        inline explicit Impl_(::google::protobuf::internal::InternalVisibility visibility,
-                              ::google::protobuf::Arena* arena, const Impl_& from);
-    ::google::protobuf::internal::HasBits<1> _has_bits_;
-    mutable ::google::protobuf::internal::CachedSize _cached_size_;
-    ::io::deephaven::proto::backplane::grpc::Ticket* result_id_;
-    ::io::deephaven::proto::backplane::grpc::TableReference* source_id_;
-    PROTOBUF_TSAN_DECLARE_MEMBER
-  };
-  union { Impl_ _impl_; };
-  friend struct ::TableStruct_deephaven_2fproto_2ftable_2eproto;
-};// -------------------------------------------------------------------
-
-class MergeTablesRequest final :
-    public ::google::protobuf::Message /* @@protoc_insertion_point(class_definition:io.deephaven.proto.backplane.grpc.MergeTablesRequest) */ {
- public:
-  inline MergeTablesRequest() : MergeTablesRequest(nullptr) {}
-  ~MergeTablesRequest() override;
-  template<typename = void>
-  explicit PROTOBUF_CONSTEXPR MergeTablesRequest(::google::protobuf::internal::ConstantInitialized);
-
-  inline MergeTablesRequest(const MergeTablesRequest& from)
-      : MergeTablesRequest(nullptr, from) {}
-  MergeTablesRequest(MergeTablesRequest&& from) noexcept
-    : MergeTablesRequest() {
-    *this = ::std::move(from);
-  }
-
-  inline MergeTablesRequest& operator=(const MergeTablesRequest& from) {
-    CopyFrom(from);
-    return *this;
-  }
-  inline MergeTablesRequest& operator=(MergeTablesRequest&& from) noexcept {
-    if (this == &from) return *this;
-    if (GetArena() == from.GetArena()
-  #ifdef PROTOBUF_FORCE_COPY_IN_MOVE
-        && GetArena() != nullptr
-  #endif  // !PROTOBUF_FORCE_COPY_IN_MOVE
-    ) {
-      InternalSwap(&from);
-    } else {
-      CopyFrom(from);
-    }
-    return *this;
-  }
-
-  inline const ::google::protobuf::UnknownFieldSet& unknown_fields() const
-      ABSL_ATTRIBUTE_LIFETIME_BOUND {
-    return _internal_metadata_.unknown_fields<::google::protobuf::UnknownFieldSet>(::google::protobuf::UnknownFieldSet::default_instance);
-  }
-  inline ::google::protobuf::UnknownFieldSet* mutable_unknown_fields()
-      ABSL_ATTRIBUTE_LIFETIME_BOUND {
-    return _internal_metadata_.mutable_unknown_fields<::google::protobuf::UnknownFieldSet>();
-  }
-
-  static const ::google::protobuf::Descriptor* descriptor() {
-    return GetDescriptor();
-  }
-  static const ::google::protobuf::Descriptor* GetDescriptor() {
-    return default_instance().GetMetadata().descriptor;
-  }
-  static const ::google::protobuf::Reflection* GetReflection() {
-    return default_instance().GetMetadata().reflection;
-  }
-  static const MergeTablesRequest& default_instance() {
-    return *internal_default_instance();
-  }
-  static inline const MergeTablesRequest* internal_default_instance() {
-    return reinterpret_cast<const MergeTablesRequest*>(
-               &_MergeTablesRequest_default_instance_);
-  }
-  static constexpr int kIndexInFileMessages =
-    47;
-
-  friend void swap(MergeTablesRequest& a, MergeTablesRequest& b) {
-    a.Swap(&b);
-  }
-  inline void Swap(MergeTablesRequest* other) {
-    if (other == this) return;
-  #ifdef PROTOBUF_FORCE_COPY_IN_SWAP
-    if (GetArena() != nullptr &&
-        GetArena() == other->GetArena()) {
-   #else  // PROTOBUF_FORCE_COPY_IN_SWAP
-    if (GetArena() == other->GetArena()) {
-  #endif  // !PROTOBUF_FORCE_COPY_IN_SWAP
-      InternalSwap(other);
-    } else {
-      ::google::protobuf::internal::GenericSwap(this, other);
-    }
-  }
-  void UnsafeArenaSwap(MergeTablesRequest* other) {
-    if (other == this) return;
-    ABSL_DCHECK(GetArena() == other->GetArena());
-    InternalSwap(other);
-  }
-
-  // implements Message ----------------------------------------------
-
-  MergeTablesRequest* New(::google::protobuf::Arena* arena = nullptr) const final {
-    return CreateMaybeMessage<MergeTablesRequest>(arena);
-  }
-  using ::google::protobuf::Message::CopyFrom;
-  void CopyFrom(const MergeTablesRequest& from);
-  using ::google::protobuf::Message::MergeFrom;
-  void MergeFrom( const MergeTablesRequest& from) {
-    MergeTablesRequest::MergeImpl(*this, from);
-  }
-  private:
-  static void MergeImpl(::google::protobuf::Message& to_msg, const ::google::protobuf::Message& from_msg);
-  public:
-  PROTOBUF_ATTRIBUTE_REINITIALIZES void Clear() final;
-  bool IsInitialized() const final;
-
-  ::size_t ByteSizeLong() const final;
-  const char* _InternalParse(const char* ptr, ::google::protobuf::internal::ParseContext* ctx) final;
-  ::uint8_t* _InternalSerialize(
-      ::uint8_t* target, ::google::protobuf::io::EpsCopyOutputStream* stream) const final;
-  int GetCachedSize() const { return _impl_._cached_size_.Get(); }
-
-  private:
-  ::google::protobuf::internal::CachedSize* AccessCachedSize() const final;
-  void SharedCtor(::google::protobuf::Arena* arena);
-  void SharedDtor();
-  void InternalSwap(MergeTablesRequest* other);
-
-  private:
-  friend class ::google::protobuf::internal::AnyMetadata;
-  static ::absl::string_view FullMessageName() {
-    return "io.deephaven.proto.backplane.grpc.MergeTablesRequest";
-  }
-  protected:
-  explicit MergeTablesRequest(::google::protobuf::Arena* arena);
-  MergeTablesRequest(::google::protobuf::Arena* arena, const MergeTablesRequest& from);
-  public:
-
-  static const ClassData _class_data_;
-  const ::google::protobuf::Message::ClassData*GetClassData() const final;
-
-  ::google::protobuf::Metadata GetMetadata() const final;
-
-  // nested types ----------------------------------------------------
-
-  // accessors -------------------------------------------------------
-
-  enum : int {
-    kSourceIdsFieldNumber = 2,
-    kKeyColumnFieldNumber = 3,
-    kResultIdFieldNumber = 1,
-  };
-  // repeated .io.deephaven.proto.backplane.grpc.TableReference source_ids = 2;
-  int source_ids_size() const;
-  private:
-  int _internal_source_ids_size() const;
-
-  public:
-  void clear_source_ids() ;
-  ::io::deephaven::proto::backplane::grpc::TableReference* mutable_source_ids(int index);
-  ::google::protobuf::RepeatedPtrField< ::io::deephaven::proto::backplane::grpc::TableReference >*
-      mutable_source_ids();
-  private:
-  const ::google::protobuf::RepeatedPtrField<::io::deephaven::proto::backplane::grpc::TableReference>& _internal_source_ids() const;
-  ::google::protobuf::RepeatedPtrField<::io::deephaven::proto::backplane::grpc::TableReference>* _internal_mutable_source_ids();
-  public:
-  const ::io::deephaven::proto::backplane::grpc::TableReference& source_ids(int index) const;
-  ::io::deephaven::proto::backplane::grpc::TableReference* add_source_ids();
-  const ::google::protobuf::RepeatedPtrField< ::io::deephaven::proto::backplane::grpc::TableReference >&
-      source_ids() const;
-  // string key_column = 3;
-  void clear_key_column() ;
-  const std::string& key_column() const;
-  template <typename Arg_ = const std::string&, typename... Args_>
-  void set_key_column(Arg_&& arg, Args_... args);
-  std::string* mutable_key_column();
-  PROTOBUF_NODISCARD std::string* release_key_column();
-  void set_allocated_key_column(std::string* value);
-
-  private:
-  const std::string& _internal_key_column() const;
-  inline PROTOBUF_ALWAYS_INLINE void _internal_set_key_column(
-      const std::string& value);
-  std::string* _internal_mutable_key_column();
-
-  public:
-  // .io.deephaven.proto.backplane.grpc.Ticket result_id = 1;
-  bool has_result_id() const;
-  void clear_result_id() ;
-  const ::io::deephaven::proto::backplane::grpc::Ticket& result_id() const;
-  PROTOBUF_NODISCARD ::io::deephaven::proto::backplane::grpc::Ticket* release_result_id();
-  ::io::deephaven::proto::backplane::grpc::Ticket* mutable_result_id();
-  void set_allocated_result_id(::io::deephaven::proto::backplane::grpc::Ticket* value);
-  void unsafe_arena_set_allocated_result_id(::io::deephaven::proto::backplane::grpc::Ticket* value);
-  ::io::deephaven::proto::backplane::grpc::Ticket* unsafe_arena_release_result_id();
-
-  private:
-  const ::io::deephaven::proto::backplane::grpc::Ticket& _internal_result_id() const;
-  ::io::deephaven::proto::backplane::grpc::Ticket* _internal_mutable_result_id();
-
-  public:
-  // @@protoc_insertion_point(class_scope:io.deephaven.proto.backplane.grpc.MergeTablesRequest)
- private:
-  class _Internal;
-
-  friend class ::google::protobuf::internal::TcParser;
-  static const ::google::protobuf::internal::TcParseTable<
-      2, 3, 2,
-      71, 2>
-      _table_;
-  friend class ::google::protobuf::MessageLite;
-  friend class ::google::protobuf::Arena;
-  template <typename T>
-  friend class ::google::protobuf::Arena::InternalHelper;
-  using InternalArenaConstructable_ = void;
-  using DestructorSkippable_ = void;
-  struct Impl_ {
-
-        inline explicit constexpr Impl_(
-            ::google::protobuf::internal::ConstantInitialized) noexcept;
-        inline explicit Impl_(::google::protobuf::internal::InternalVisibility visibility,
-                              ::google::protobuf::Arena* arena);
-        inline explicit Impl_(::google::protobuf::internal::InternalVisibility visibility,
-                              ::google::protobuf::Arena* arena, const Impl_& from);
-    ::google::protobuf::internal::HasBits<1> _has_bits_;
-    mutable ::google::protobuf::internal::CachedSize _cached_size_;
-    ::google::protobuf::RepeatedPtrField< ::io::deephaven::proto::backplane::grpc::TableReference > source_ids_;
-    ::google::protobuf::internal::ArenaStringPtr key_column_;
-    ::io::deephaven::proto::backplane::grpc::Ticket* result_id_;
-    PROTOBUF_TSAN_DECLARE_MEMBER
-  };
-  union { Impl_ _impl_; };
-  friend struct ::TableStruct_deephaven_2fproto_2ftable_2eproto;
-};// -------------------------------------------------------------------
-
-class LeftJoinTablesRequest final :
-    public ::google::protobuf::Message /* @@protoc_insertion_point(class_definition:io.deephaven.proto.backplane.grpc.LeftJoinTablesRequest) */ {
- public:
-  inline LeftJoinTablesRequest() : LeftJoinTablesRequest(nullptr) {}
-  ~LeftJoinTablesRequest() override;
-  template<typename = void>
-  explicit PROTOBUF_CONSTEXPR LeftJoinTablesRequest(::google::protobuf::internal::ConstantInitialized);
-
-  inline LeftJoinTablesRequest(const LeftJoinTablesRequest& from)
-      : LeftJoinTablesRequest(nullptr, from) {}
-  LeftJoinTablesRequest(LeftJoinTablesRequest&& from) noexcept
-    : LeftJoinTablesRequest() {
-    *this = ::std::move(from);
-  }
-
-  inline LeftJoinTablesRequest& operator=(const LeftJoinTablesRequest& from) {
-    CopyFrom(from);
-    return *this;
-  }
-  inline LeftJoinTablesRequest& operator=(LeftJoinTablesRequest&& from) noexcept {
-    if (this == &from) return *this;
-    if (GetArena() == from.GetArena()
-  #ifdef PROTOBUF_FORCE_COPY_IN_MOVE
-        && GetArena() != nullptr
-  #endif  // !PROTOBUF_FORCE_COPY_IN_MOVE
-    ) {
-      InternalSwap(&from);
-    } else {
-      CopyFrom(from);
-    }
-    return *this;
-  }
-
-  inline const ::google::protobuf::UnknownFieldSet& unknown_fields() const
-      ABSL_ATTRIBUTE_LIFETIME_BOUND {
-    return _internal_metadata_.unknown_fields<::google::protobuf::UnknownFieldSet>(::google::protobuf::UnknownFieldSet::default_instance);
-  }
-  inline ::google::protobuf::UnknownFieldSet* mutable_unknown_fields()
-      ABSL_ATTRIBUTE_LIFETIME_BOUND {
-    return _internal_metadata_.mutable_unknown_fields<::google::protobuf::UnknownFieldSet>();
-  }
-
-  static const ::google::protobuf::Descriptor* descriptor() {
-    return GetDescriptor();
-  }
-  static const ::google::protobuf::Descriptor* GetDescriptor() {
-    return default_instance().GetMetadata().descriptor;
-  }
-  static const ::google::protobuf::Reflection* GetReflection() {
-    return default_instance().GetMetadata().reflection;
-  }
-  static const LeftJoinTablesRequest& default_instance() {
-    return *internal_default_instance();
-  }
-  static inline const LeftJoinTablesRequest* internal_default_instance() {
-    return reinterpret_cast<const LeftJoinTablesRequest*>(
-               &_LeftJoinTablesRequest_default_instance_);
-  }
-  static constexpr int kIndexInFileMessages =
-    53;
-
-  friend void swap(LeftJoinTablesRequest& a, LeftJoinTablesRequest& b) {
-    a.Swap(&b);
-  }
-  inline void Swap(LeftJoinTablesRequest* other) {
-    if (other == this) return;
-  #ifdef PROTOBUF_FORCE_COPY_IN_SWAP
-    if (GetArena() != nullptr &&
-        GetArena() == other->GetArena()) {
-   #else  // PROTOBUF_FORCE_COPY_IN_SWAP
-    if (GetArena() == other->GetArena()) {
-  #endif  // !PROTOBUF_FORCE_COPY_IN_SWAP
-      InternalSwap(other);
-    } else {
-      ::google::protobuf::internal::GenericSwap(this, other);
-    }
-  }
-  void UnsafeArenaSwap(LeftJoinTablesRequest* other) {
-    if (other == this) return;
-    ABSL_DCHECK(GetArena() == other->GetArena());
-    InternalSwap(other);
-  }
-
-  // implements Message ----------------------------------------------
-
-  LeftJoinTablesRequest* New(::google::protobuf::Arena* arena = nullptr) const final {
-    return CreateMaybeMessage<LeftJoinTablesRequest>(arena);
-  }
-  using ::google::protobuf::Message::CopyFrom;
-  void CopyFrom(const LeftJoinTablesRequest& from);
-  using ::google::protobuf::Message::MergeFrom;
-  void MergeFrom( const LeftJoinTablesRequest& from) {
-    LeftJoinTablesRequest::MergeImpl(*this, from);
-  }
-  private:
-  static void MergeImpl(::google::protobuf::Message& to_msg, const ::google::protobuf::Message& from_msg);
-  public:
-  PROTOBUF_ATTRIBUTE_REINITIALIZES void Clear() final;
-  bool IsInitialized() const final;
-
-  ::size_t ByteSizeLong() const final;
-  const char* _InternalParse(const char* ptr, ::google::protobuf::internal::ParseContext* ctx) final;
-  ::uint8_t* _InternalSerialize(
-      ::uint8_t* target, ::google::protobuf::io::EpsCopyOutputStream* stream) const final;
-  int GetCachedSize() const { return _impl_._cached_size_.Get(); }
-
-  private:
-  ::google::protobuf::internal::CachedSize* AccessCachedSize() const final;
-  void SharedCtor(::google::protobuf::Arena* arena);
-  void SharedDtor();
-  void InternalSwap(LeftJoinTablesRequest* other);
-
-  private:
-  friend class ::google::protobuf::internal::AnyMetadata;
-  static ::absl::string_view FullMessageName() {
-    return "io.deephaven.proto.backplane.grpc.LeftJoinTablesRequest";
-  }
-  protected:
-  explicit LeftJoinTablesRequest(::google::protobuf::Arena* arena);
-  LeftJoinTablesRequest(::google::protobuf::Arena* arena, const LeftJoinTablesRequest& from);
-  public:
-
-  static const ClassData _class_data_;
-  const ::google::protobuf::Message::ClassData*GetClassData() const final;
-
-  ::google::protobuf::Metadata GetMetadata() const final;
-
-  // nested types ----------------------------------------------------
-
-  // accessors -------------------------------------------------------
-
-  enum : int {
-    kColumnsToMatchFieldNumber = 4,
-    kColumnsToAddFieldNumber = 5,
-    kResultIdFieldNumber = 1,
-    kLeftIdFieldNumber = 2,
-    kRightIdFieldNumber = 3,
-  };
-  // repeated string columns_to_match = 4;
-  int columns_to_match_size() const;
-  private:
-  int _internal_columns_to_match_size() const;
-
-  public:
-  void clear_columns_to_match() ;
-  const std::string& columns_to_match(int index) const;
-  std::string* mutable_columns_to_match(int index);
-  void set_columns_to_match(int index, const std::string& value);
-  void set_columns_to_match(int index, std::string&& value);
-  void set_columns_to_match(int index, const char* value);
-  void set_columns_to_match(int index, const char* value, std::size_t size);
-  void set_columns_to_match(int index, absl::string_view value);
-  std::string* add_columns_to_match();
-  void add_columns_to_match(const std::string& value);
-  void add_columns_to_match(std::string&& value);
-  void add_columns_to_match(const char* value);
-  void add_columns_to_match(const char* value, std::size_t size);
-  void add_columns_to_match(absl::string_view value);
-  const ::google::protobuf::RepeatedPtrField<std::string>& columns_to_match() const;
-  ::google::protobuf::RepeatedPtrField<std::string>* mutable_columns_to_match();
-
-  private:
-  const ::google::protobuf::RepeatedPtrField<std::string>& _internal_columns_to_match() const;
-  ::google::protobuf::RepeatedPtrField<std::string>* _internal_mutable_columns_to_match();
-
-  public:
-  // repeated string columns_to_add = 5;
-  int columns_to_add_size() const;
-  private:
-  int _internal_columns_to_add_size() const;
-
-  public:
-  void clear_columns_to_add() ;
-  const std::string& columns_to_add(int index) const;
-  std::string* mutable_columns_to_add(int index);
-  void set_columns_to_add(int index, const std::string& value);
-  void set_columns_to_add(int index, std::string&& value);
-  void set_columns_to_add(int index, const char* value);
-  void set_columns_to_add(int index, const char* value, std::size_t size);
-  void set_columns_to_add(int index, absl::string_view value);
-  std::string* add_columns_to_add();
-  void add_columns_to_add(const std::string& value);
-  void add_columns_to_add(std::string&& value);
-  void add_columns_to_add(const char* value);
-  void add_columns_to_add(const char* value, std::size_t size);
-  void add_columns_to_add(absl::string_view value);
-  const ::google::protobuf::RepeatedPtrField<std::string>& columns_to_add() const;
-  ::google::protobuf::RepeatedPtrField<std::string>* mutable_columns_to_add();
-
-  private:
-  const ::google::protobuf::RepeatedPtrField<std::string>& _internal_columns_to_add() const;
-  ::google::protobuf::RepeatedPtrField<std::string>* _internal_mutable_columns_to_add();
-
-  public:
-  // .io.deephaven.proto.backplane.grpc.Ticket result_id = 1;
-  bool has_result_id() const;
-  void clear_result_id() ;
-  const ::io::deephaven::proto::backplane::grpc::Ticket& result_id() const;
-  PROTOBUF_NODISCARD ::io::deephaven::proto::backplane::grpc::Ticket* release_result_id();
-  ::io::deephaven::proto::backplane::grpc::Ticket* mutable_result_id();
-  void set_allocated_result_id(::io::deephaven::proto::backplane::grpc::Ticket* value);
-  void unsafe_arena_set_allocated_result_id(::io::deephaven::proto::backplane::grpc::Ticket* value);
-  ::io::deephaven::proto::backplane::grpc::Ticket* unsafe_arena_release_result_id();
-
-  private:
-  const ::io::deephaven::proto::backplane::grpc::Ticket& _internal_result_id() const;
-  ::io::deephaven::proto::backplane::grpc::Ticket* _internal_mutable_result_id();
-
-  public:
-  // .io.deephaven.proto.backplane.grpc.TableReference left_id = 2;
-  bool has_left_id() const;
-  void clear_left_id() ;
-  const ::io::deephaven::proto::backplane::grpc::TableReference& left_id() const;
-  PROTOBUF_NODISCARD ::io::deephaven::proto::backplane::grpc::TableReference* release_left_id();
-  ::io::deephaven::proto::backplane::grpc::TableReference* mutable_left_id();
-  void set_allocated_left_id(::io::deephaven::proto::backplane::grpc::TableReference* value);
-  void unsafe_arena_set_allocated_left_id(::io::deephaven::proto::backplane::grpc::TableReference* value);
-  ::io::deephaven::proto::backplane::grpc::TableReference* unsafe_arena_release_left_id();
-
-  private:
-  const ::io::deephaven::proto::backplane::grpc::TableReference& _internal_left_id() const;
-  ::io::deephaven::proto::backplane::grpc::TableReference* _internal_mutable_left_id();
-
-  public:
-  // .io.deephaven.proto.backplane.grpc.TableReference right_id = 3;
-  bool has_right_id() const;
-  void clear_right_id() ;
-  const ::io::deephaven::proto::backplane::grpc::TableReference& right_id() const;
-  PROTOBUF_NODISCARD ::io::deephaven::proto::backplane::grpc::TableReference* release_right_id();
-  ::io::deephaven::proto::backplane::grpc::TableReference* mutable_right_id();
-  void set_allocated_right_id(::io::deephaven::proto::backplane::grpc::TableReference* value);
-  void unsafe_arena_set_allocated_right_id(::io::deephaven::proto::backplane::grpc::TableReference* value);
-  ::io::deephaven::proto::backplane::grpc::TableReference* unsafe_arena_release_right_id();
-
-  private:
-  const ::io::deephaven::proto::backplane::grpc::TableReference& _internal_right_id() const;
-  ::io::deephaven::proto::backplane::grpc::TableReference* _internal_mutable_right_id();
-
-  public:
-  // @@protoc_insertion_point(class_scope:io.deephaven.proto.backplane.grpc.LeftJoinTablesRequest)
- private:
-  class _Internal;
-
-  friend class ::google::protobuf::internal::TcParser;
-  static const ::google::protobuf::internal::TcParseTable<
-      3, 5, 3,
-      94, 2>
-      _table_;
-  friend class ::google::protobuf::MessageLite;
-  friend class ::google::protobuf::Arena;
-  template <typename T>
-  friend class ::google::protobuf::Arena::InternalHelper;
-  using InternalArenaConstructable_ = void;
-  using DestructorSkippable_ = void;
-  struct Impl_ {
-
-        inline explicit constexpr Impl_(
-            ::google::protobuf::internal::ConstantInitialized) noexcept;
-        inline explicit Impl_(::google::protobuf::internal::InternalVisibility visibility,
-                              ::google::protobuf::Arena* arena);
-        inline explicit Impl_(::google::protobuf::internal::InternalVisibility visibility,
-                              ::google::protobuf::Arena* arena, const Impl_& from);
-    ::google::protobuf::internal::HasBits<1> _has_bits_;
-    mutable ::google::protobuf::internal::CachedSize _cached_size_;
-    ::google::protobuf::RepeatedPtrField<std::string> columns_to_match_;
-    ::google::protobuf::RepeatedPtrField<std::string> columns_to_add_;
-    ::io::deephaven::proto::backplane::grpc::Ticket* result_id_;
-    ::io::deephaven::proto::backplane::grpc::TableReference* left_id_;
-    ::io::deephaven::proto::backplane::grpc::TableReference* right_id_;
-    PROTOBUF_TSAN_DECLARE_MEMBER
-  };
-  union { Impl_ _impl_; };
-  friend struct ::TableStruct_deephaven_2fproto_2ftable_2eproto;
-};// -------------------------------------------------------------------
-
-class InvokeCondition final :
-    public ::google::protobuf::Message /* @@protoc_insertion_point(class_definition:io.deephaven.proto.backplane.grpc.InvokeCondition) */ {
- public:
-  inline InvokeCondition() : InvokeCondition(nullptr) {}
-  ~InvokeCondition() override;
-  template<typename = void>
-  explicit PROTOBUF_CONSTEXPR InvokeCondition(::google::protobuf::internal::ConstantInitialized);
-
-  inline InvokeCondition(const InvokeCondition& from)
-      : InvokeCondition(nullptr, from) {}
-  InvokeCondition(InvokeCondition&& from) noexcept
-    : InvokeCondition() {
-    *this = ::std::move(from);
-  }
-
-  inline InvokeCondition& operator=(const InvokeCondition& from) {
-    CopyFrom(from);
-    return *this;
-  }
-  inline InvokeCondition& operator=(InvokeCondition&& from) noexcept {
-    if (this == &from) return *this;
-    if (GetArena() == from.GetArena()
-  #ifdef PROTOBUF_FORCE_COPY_IN_MOVE
-        && GetArena() != nullptr
-  #endif  // !PROTOBUF_FORCE_COPY_IN_MOVE
-    ) {
-      InternalSwap(&from);
-    } else {
-      CopyFrom(from);
-    }
-    return *this;
-  }
-
-  inline const ::google::protobuf::UnknownFieldSet& unknown_fields() const
-      ABSL_ATTRIBUTE_LIFETIME_BOUND {
-    return _internal_metadata_.unknown_fields<::google::protobuf::UnknownFieldSet>(::google::protobuf::UnknownFieldSet::default_instance);
-  }
-  inline ::google::protobuf::UnknownFieldSet* mutable_unknown_fields()
-      ABSL_ATTRIBUTE_LIFETIME_BOUND {
-    return _internal_metadata_.mutable_unknown_fields<::google::protobuf::UnknownFieldSet>();
-  }
-
-  static const ::google::protobuf::Descriptor* descriptor() {
-    return GetDescriptor();
-  }
-  static const ::google::protobuf::Descriptor* GetDescriptor() {
-    return default_instance().GetMetadata().descriptor;
-  }
-  static const ::google::protobuf::Reflection* GetReflection() {
-    return default_instance().GetMetadata().reflection;
-  }
-  static const InvokeCondition& default_instance() {
-    return *internal_default_instance();
-  }
-  static inline const InvokeCondition* internal_default_instance() {
-    return reinterpret_cast<const InvokeCondition*>(
-               &_InvokeCondition_default_instance_);
-  }
-  static constexpr int kIndexInFileMessages =
-    106;
-
-  friend void swap(InvokeCondition& a, InvokeCondition& b) {
-    a.Swap(&b);
-  }
-  inline void Swap(InvokeCondition* other) {
-    if (other == this) return;
-  #ifdef PROTOBUF_FORCE_COPY_IN_SWAP
-    if (GetArena() != nullptr &&
-        GetArena() == other->GetArena()) {
-   #else  // PROTOBUF_FORCE_COPY_IN_SWAP
-    if (GetArena() == other->GetArena()) {
-  #endif  // !PROTOBUF_FORCE_COPY_IN_SWAP
-      InternalSwap(other);
-    } else {
-      ::google::protobuf::internal::GenericSwap(this, other);
-    }
-  }
-  void UnsafeArenaSwap(InvokeCondition* other) {
-    if (other == this) return;
-    ABSL_DCHECK(GetArena() == other->GetArena());
-    InternalSwap(other);
-  }
-
-  // implements Message ----------------------------------------------
-
-  InvokeCondition* New(::google::protobuf::Arena* arena = nullptr) const final {
-    return CreateMaybeMessage<InvokeCondition>(arena);
-  }
-  using ::google::protobuf::Message::CopyFrom;
-  void CopyFrom(const InvokeCondition& from);
-  using ::google::protobuf::Message::MergeFrom;
-  void MergeFrom( const InvokeCondition& from) {
-    InvokeCondition::MergeImpl(*this, from);
-  }
-  private:
-  static void MergeImpl(::google::protobuf::Message& to_msg, const ::google::protobuf::Message& from_msg);
-  public:
-  PROTOBUF_ATTRIBUTE_REINITIALIZES void Clear() final;
-  bool IsInitialized() const final;
-
-  ::size_t ByteSizeLong() const final;
-  const char* _InternalParse(const char* ptr, ::google::protobuf::internal::ParseContext* ctx) final;
-  ::uint8_t* _InternalSerialize(
-      ::uint8_t* target, ::google::protobuf::io::EpsCopyOutputStream* stream) const final;
-  int GetCachedSize() const { return _impl_._cached_size_.Get(); }
-
-  private:
-  ::google::protobuf::internal::CachedSize* AccessCachedSize() const final;
-  void SharedCtor(::google::protobuf::Arena* arena);
-  void SharedDtor();
-  void InternalSwap(InvokeCondition* other);
-
-  private:
-  friend class ::google::protobuf::internal::AnyMetadata;
-  static ::absl::string_view FullMessageName() {
-    return "io.deephaven.proto.backplane.grpc.InvokeCondition";
-  }
-  protected:
-  explicit InvokeCondition(::google::protobuf::Arena* arena);
-  InvokeCondition(::google::protobuf::Arena* arena, const InvokeCondition& from);
-  public:
-
-  static const ClassData _class_data_;
-  const ::google::protobuf::Message::ClassData*GetClassData() const final;
-
-  ::google::protobuf::Metadata GetMetadata() const final;
-
-  // nested types ----------------------------------------------------
-
-  // accessors -------------------------------------------------------
-
-  enum : int {
-    kArgumentsFieldNumber = 3,
-    kMethodFieldNumber = 1,
-    kTargetFieldNumber = 2,
-  };
-  // repeated .io.deephaven.proto.backplane.grpc.Value arguments = 3;
-  int arguments_size() const;
-  private:
-  int _internal_arguments_size() const;
-
-  public:
-  void clear_arguments() ;
-  ::io::deephaven::proto::backplane::grpc::Value* mutable_arguments(int index);
-  ::google::protobuf::RepeatedPtrField< ::io::deephaven::proto::backplane::grpc::Value >*
-      mutable_arguments();
-  private:
-  const ::google::protobuf::RepeatedPtrField<::io::deephaven::proto::backplane::grpc::Value>& _internal_arguments() const;
-  ::google::protobuf::RepeatedPtrField<::io::deephaven::proto::backplane::grpc::Value>* _internal_mutable_arguments();
-  public:
-  const ::io::deephaven::proto::backplane::grpc::Value& arguments(int index) const;
-  ::io::deephaven::proto::backplane::grpc::Value* add_arguments();
-  const ::google::protobuf::RepeatedPtrField< ::io::deephaven::proto::backplane::grpc::Value >&
-      arguments() const;
-  // string method = 1;
-  void clear_method() ;
-  const std::string& method() const;
-  template <typename Arg_ = const std::string&, typename... Args_>
-  void set_method(Arg_&& arg, Args_... args);
-  std::string* mutable_method();
-  PROTOBUF_NODISCARD std::string* release_method();
-  void set_allocated_method(std::string* value);
-
-  private:
-  const std::string& _internal_method() const;
-  inline PROTOBUF_ALWAYS_INLINE void _internal_set_method(
-      const std::string& value);
-  std::string* _internal_mutable_method();
-
-  public:
-  // .io.deephaven.proto.backplane.grpc.Value target = 2;
-  bool has_target() const;
-  void clear_target() ;
-  const ::io::deephaven::proto::backplane::grpc::Value& target() const;
-  PROTOBUF_NODISCARD ::io::deephaven::proto::backplane::grpc::Value* release_target();
-  ::io::deephaven::proto::backplane::grpc::Value* mutable_target();
-  void set_allocated_target(::io::deephaven::proto::backplane::grpc::Value* value);
-  void unsafe_arena_set_allocated_target(::io::deephaven::proto::backplane::grpc::Value* value);
-  ::io::deephaven::proto::backplane::grpc::Value* unsafe_arena_release_target();
-
-  private:
-  const ::io::deephaven::proto::backplane::grpc::Value& _internal_target() const;
-  ::io::deephaven::proto::backplane::grpc::Value* _internal_mutable_target();
-
-  public:
-  // @@protoc_insertion_point(class_scope:io.deephaven.proto.backplane.grpc.InvokeCondition)
- private:
-  class _Internal;
-
-  friend class ::google::protobuf::internal::TcParser;
-  static const ::google::protobuf::internal::TcParseTable<
-      2, 3, 2,
-      64, 2>
-      _table_;
-  friend class ::google::protobuf::MessageLite;
-  friend class ::google::protobuf::Arena;
-  template <typename T>
-  friend class ::google::protobuf::Arena::InternalHelper;
-  using InternalArenaConstructable_ = void;
-  using DestructorSkippable_ = void;
-  struct Impl_ {
-
-        inline explicit constexpr Impl_(
-            ::google::protobuf::internal::ConstantInitialized) noexcept;
-        inline explicit Impl_(::google::protobuf::internal::InternalVisibility visibility,
-                              ::google::protobuf::Arena* arena);
-        inline explicit Impl_(::google::protobuf::internal::InternalVisibility visibility,
-                              ::google::protobuf::Arena* arena, const Impl_& from);
-    ::google::protobuf::internal::HasBits<1> _has_bits_;
-    mutable ::google::protobuf::internal::CachedSize _cached_size_;
-    ::google::protobuf::RepeatedPtrField< ::io::deephaven::proto::backplane::grpc::Value > arguments_;
-    ::google::protobuf::internal::ArenaStringPtr method_;
-    ::io::deephaven::proto::backplane::grpc::Value* target_;
-    PROTOBUF_TSAN_DECLARE_MEMBER
-  };
-  union { Impl_ _impl_; };
-  friend struct ::TableStruct_deephaven_2fproto_2ftable_2eproto;
-};// -------------------------------------------------------------------
-
-class InCondition final :
-    public ::google::protobuf::Message /* @@protoc_insertion_point(class_definition:io.deephaven.proto.backplane.grpc.InCondition) */ {
- public:
-  inline InCondition() : InCondition(nullptr) {}
-  ~InCondition() override;
-  template<typename = void>
-  explicit PROTOBUF_CONSTEXPR InCondition(::google::protobuf::internal::ConstantInitialized);
-
-  inline InCondition(const InCondition& from)
-      : InCondition(nullptr, from) {}
-  InCondition(InCondition&& from) noexcept
-    : InCondition() {
-    *this = ::std::move(from);
-  }
-
-  inline InCondition& operator=(const InCondition& from) {
-    CopyFrom(from);
-    return *this;
-  }
-  inline InCondition& operator=(InCondition&& from) noexcept {
-    if (this == &from) return *this;
-    if (GetArena() == from.GetArena()
-  #ifdef PROTOBUF_FORCE_COPY_IN_MOVE
-        && GetArena() != nullptr
-  #endif  // !PROTOBUF_FORCE_COPY_IN_MOVE
-    ) {
-      InternalSwap(&from);
-    } else {
-      CopyFrom(from);
-    }
-    return *this;
-  }
-
-  inline const ::google::protobuf::UnknownFieldSet& unknown_fields() const
-      ABSL_ATTRIBUTE_LIFETIME_BOUND {
-    return _internal_metadata_.unknown_fields<::google::protobuf::UnknownFieldSet>(::google::protobuf::UnknownFieldSet::default_instance);
-  }
-  inline ::google::protobuf::UnknownFieldSet* mutable_unknown_fields()
-      ABSL_ATTRIBUTE_LIFETIME_BOUND {
-    return _internal_metadata_.mutable_unknown_fields<::google::protobuf::UnknownFieldSet>();
-  }
-
-  static const ::google::protobuf::Descriptor* descriptor() {
-    return GetDescriptor();
-  }
-  static const ::google::protobuf::Descriptor* GetDescriptor() {
-    return default_instance().GetMetadata().descriptor;
-  }
-  static const ::google::protobuf::Reflection* GetReflection() {
-    return default_instance().GetMetadata().reflection;
-  }
-  static const InCondition& default_instance() {
-    return *internal_default_instance();
-  }
-  static inline const InCondition* internal_default_instance() {
-    return reinterpret_cast<const InCondition*>(
-               &_InCondition_default_instance_);
-  }
-  static constexpr int kIndexInFileMessages =
-    105;
-
-  friend void swap(InCondition& a, InCondition& b) {
-    a.Swap(&b);
-  }
-  inline void Swap(InCondition* other) {
-    if (other == this) return;
-  #ifdef PROTOBUF_FORCE_COPY_IN_SWAP
-    if (GetArena() != nullptr &&
-        GetArena() == other->GetArena()) {
-   #else  // PROTOBUF_FORCE_COPY_IN_SWAP
-    if (GetArena() == other->GetArena()) {
-  #endif  // !PROTOBUF_FORCE_COPY_IN_SWAP
-      InternalSwap(other);
-    } else {
-      ::google::protobuf::internal::GenericSwap(this, other);
-    }
-  }
-  void UnsafeArenaSwap(InCondition* other) {
-    if (other == this) return;
-    ABSL_DCHECK(GetArena() == other->GetArena());
-    InternalSwap(other);
-  }
-
-  // implements Message ----------------------------------------------
-
-  InCondition* New(::google::protobuf::Arena* arena = nullptr) const final {
-    return CreateMaybeMessage<InCondition>(arena);
-  }
-  using ::google::protobuf::Message::CopyFrom;
-  void CopyFrom(const InCondition& from);
-  using ::google::protobuf::Message::MergeFrom;
-  void MergeFrom( const InCondition& from) {
-    InCondition::MergeImpl(*this, from);
-  }
-  private:
-  static void MergeImpl(::google::protobuf::Message& to_msg, const ::google::protobuf::Message& from_msg);
-  public:
-  PROTOBUF_ATTRIBUTE_REINITIALIZES void Clear() final;
-  bool IsInitialized() const final;
-
-  ::size_t ByteSizeLong() const final;
-  const char* _InternalParse(const char* ptr, ::google::protobuf::internal::ParseContext* ctx) final;
-  ::uint8_t* _InternalSerialize(
-      ::uint8_t* target, ::google::protobuf::io::EpsCopyOutputStream* stream) const final;
-  int GetCachedSize() const { return _impl_._cached_size_.Get(); }
-
-  private:
-  ::google::protobuf::internal::CachedSize* AccessCachedSize() const final;
-  void SharedCtor(::google::protobuf::Arena* arena);
-  void SharedDtor();
-  void InternalSwap(InCondition* other);
-
-  private:
-  friend class ::google::protobuf::internal::AnyMetadata;
-  static ::absl::string_view FullMessageName() {
-    return "io.deephaven.proto.backplane.grpc.InCondition";
-  }
-  protected:
-  explicit InCondition(::google::protobuf::Arena* arena);
-  InCondition(::google::protobuf::Arena* arena, const InCondition& from);
-  public:
-
-  static const ClassData _class_data_;
-  const ::google::protobuf::Message::ClassData*GetClassData() const final;
-
-  ::google::protobuf::Metadata GetMetadata() const final;
-
-  // nested types ----------------------------------------------------
-
-  // accessors -------------------------------------------------------
-
-  enum : int {
-    kCandidatesFieldNumber = 2,
-    kTargetFieldNumber = 1,
-    kCaseSensitivityFieldNumber = 3,
-    kMatchTypeFieldNumber = 4,
-  };
-  // repeated .io.deephaven.proto.backplane.grpc.Value candidates = 2;
-  int candidates_size() const;
-  private:
-  int _internal_candidates_size() const;
-
-  public:
-  void clear_candidates() ;
-  ::io::deephaven::proto::backplane::grpc::Value* mutable_candidates(int index);
-  ::google::protobuf::RepeatedPtrField< ::io::deephaven::proto::backplane::grpc::Value >*
-      mutable_candidates();
-  private:
-  const ::google::protobuf::RepeatedPtrField<::io::deephaven::proto::backplane::grpc::Value>& _internal_candidates() const;
-  ::google::protobuf::RepeatedPtrField<::io::deephaven::proto::backplane::grpc::Value>* _internal_mutable_candidates();
-  public:
-  const ::io::deephaven::proto::backplane::grpc::Value& candidates(int index) const;
-  ::io::deephaven::proto::backplane::grpc::Value* add_candidates();
-  const ::google::protobuf::RepeatedPtrField< ::io::deephaven::proto::backplane::grpc::Value >&
-      candidates() const;
-  // .io.deephaven.proto.backplane.grpc.Value target = 1;
-  bool has_target() const;
-  void clear_target() ;
-  const ::io::deephaven::proto::backplane::grpc::Value& target() const;
-  PROTOBUF_NODISCARD ::io::deephaven::proto::backplane::grpc::Value* release_target();
-  ::io::deephaven::proto::backplane::grpc::Value* mutable_target();
-  void set_allocated_target(::io::deephaven::proto::backplane::grpc::Value* value);
-  void unsafe_arena_set_allocated_target(::io::deephaven::proto::backplane::grpc::Value* value);
-  ::io::deephaven::proto::backplane::grpc::Value* unsafe_arena_release_target();
-
-  private:
-  const ::io::deephaven::proto::backplane::grpc::Value& _internal_target() const;
-  ::io::deephaven::proto::backplane::grpc::Value* _internal_mutable_target();
-
-  public:
-  // .io.deephaven.proto.backplane.grpc.CaseSensitivity case_sensitivity = 3;
-  void clear_case_sensitivity() ;
-  ::io::deephaven::proto::backplane::grpc::CaseSensitivity case_sensitivity() const;
-  void set_case_sensitivity(::io::deephaven::proto::backplane::grpc::CaseSensitivity value);
-
-  private:
-  ::io::deephaven::proto::backplane::grpc::CaseSensitivity _internal_case_sensitivity() const;
-  void _internal_set_case_sensitivity(::io::deephaven::proto::backplane::grpc::CaseSensitivity value);
-
-  public:
-  // .io.deephaven.proto.backplane.grpc.MatchType match_type = 4;
-  void clear_match_type() ;
-  ::io::deephaven::proto::backplane::grpc::MatchType match_type() const;
-  void set_match_type(::io::deephaven::proto::backplane::grpc::MatchType value);
-
-  private:
-  ::io::deephaven::proto::backplane::grpc::MatchType _internal_match_type() const;
-  void _internal_set_match_type(::io::deephaven::proto::backplane::grpc::MatchType value);
-
-  public:
-  // @@protoc_insertion_point(class_scope:io.deephaven.proto.backplane.grpc.InCondition)
- private:
-  class _Internal;
-
-  friend class ::google::protobuf::internal::TcParser;
-  static const ::google::protobuf::internal::TcParseTable<
-      2, 4, 2,
-      0, 2>
-      _table_;
-  friend class ::google::protobuf::MessageLite;
-  friend class ::google::protobuf::Arena;
-  template <typename T>
-  friend class ::google::protobuf::Arena::InternalHelper;
-  using InternalArenaConstructable_ = void;
-  using DestructorSkippable_ = void;
-  struct Impl_ {
-
-        inline explicit constexpr Impl_(
-            ::google::protobuf::internal::ConstantInitialized) noexcept;
-        inline explicit Impl_(::google::protobuf::internal::InternalVisibility visibility,
-                              ::google::protobuf::Arena* arena);
-        inline explicit Impl_(::google::protobuf::internal::InternalVisibility visibility,
-                              ::google::protobuf::Arena* arena, const Impl_& from);
-    ::google::protobuf::internal::HasBits<1> _has_bits_;
-    mutable ::google::protobuf::internal::CachedSize _cached_size_;
-    ::google::protobuf::RepeatedPtrField< ::io::deephaven::proto::backplane::grpc::Value > candidates_;
-    ::io::deephaven::proto::backplane::grpc::Value* target_;
-    int case_sensitivity_;
-    int match_type_;
-    PROTOBUF_TSAN_DECLARE_MEMBER
-  };
-  union { Impl_ _impl_; };
-  friend struct ::TableStruct_deephaven_2fproto_2ftable_2eproto;
-};// -------------------------------------------------------------------
-
-class HeadOrTailRequest final :
-    public ::google::protobuf::Message /* @@protoc_insertion_point(class_definition:io.deephaven.proto.backplane.grpc.HeadOrTailRequest) */ {
- public:
-  inline HeadOrTailRequest() : HeadOrTailRequest(nullptr) {}
-  ~HeadOrTailRequest() override;
-  template<typename = void>
-  explicit PROTOBUF_CONSTEXPR HeadOrTailRequest(::google::protobuf::internal::ConstantInitialized);
-
-  inline HeadOrTailRequest(const HeadOrTailRequest& from)
-      : HeadOrTailRequest(nullptr, from) {}
-  HeadOrTailRequest(HeadOrTailRequest&& from) noexcept
-    : HeadOrTailRequest() {
-    *this = ::std::move(from);
-  }
-
-  inline HeadOrTailRequest& operator=(const HeadOrTailRequest& from) {
-    CopyFrom(from);
-    return *this;
-  }
-  inline HeadOrTailRequest& operator=(HeadOrTailRequest&& from) noexcept {
-    if (this == &from) return *this;
-    if (GetArena() == from.GetArena()
-  #ifdef PROTOBUF_FORCE_COPY_IN_MOVE
-        && GetArena() != nullptr
-  #endif  // !PROTOBUF_FORCE_COPY_IN_MOVE
-    ) {
-      InternalSwap(&from);
-    } else {
-      CopyFrom(from);
-    }
-    return *this;
-  }
-
-  inline const ::google::protobuf::UnknownFieldSet& unknown_fields() const
-      ABSL_ATTRIBUTE_LIFETIME_BOUND {
-    return _internal_metadata_.unknown_fields<::google::protobuf::UnknownFieldSet>(::google::protobuf::UnknownFieldSet::default_instance);
-  }
-  inline ::google::protobuf::UnknownFieldSet* mutable_unknown_fields()
-      ABSL_ATTRIBUTE_LIFETIME_BOUND {
-    return _internal_metadata_.mutable_unknown_fields<::google::protobuf::UnknownFieldSet>();
-  }
-
-  static const ::google::protobuf::Descriptor* descriptor() {
-    return GetDescriptor();
-  }
-  static const ::google::protobuf::Descriptor* GetDescriptor() {
-    return default_instance().GetMetadata().descriptor;
-  }
-  static const ::google::protobuf::Reflection* GetReflection() {
-    return default_instance().GetMetadata().reflection;
-  }
-  static const HeadOrTailRequest& default_instance() {
-    return *internal_default_instance();
-  }
-  static inline const HeadOrTailRequest* internal_default_instance() {
-    return reinterpret_cast<const HeadOrTailRequest*>(
-               &_HeadOrTailRequest_default_instance_);
-  }
-  static constexpr int kIndexInFileMessages =
-    44;
-
-  friend void swap(HeadOrTailRequest& a, HeadOrTailRequest& b) {
-    a.Swap(&b);
-  }
-  inline void Swap(HeadOrTailRequest* other) {
-    if (other == this) return;
-  #ifdef PROTOBUF_FORCE_COPY_IN_SWAP
-    if (GetArena() != nullptr &&
-        GetArena() == other->GetArena()) {
-   #else  // PROTOBUF_FORCE_COPY_IN_SWAP
-    if (GetArena() == other->GetArena()) {
-  #endif  // !PROTOBUF_FORCE_COPY_IN_SWAP
-      InternalSwap(other);
-    } else {
-      ::google::protobuf::internal::GenericSwap(this, other);
-    }
-  }
-  void UnsafeArenaSwap(HeadOrTailRequest* other) {
-    if (other == this) return;
-    ABSL_DCHECK(GetArena() == other->GetArena());
-    InternalSwap(other);
-  }
-
-  // implements Message ----------------------------------------------
-
-  HeadOrTailRequest* New(::google::protobuf::Arena* arena = nullptr) const final {
-    return CreateMaybeMessage<HeadOrTailRequest>(arena);
-  }
-  using ::google::protobuf::Message::CopyFrom;
-  void CopyFrom(const HeadOrTailRequest& from);
-  using ::google::protobuf::Message::MergeFrom;
-  void MergeFrom( const HeadOrTailRequest& from) {
-    HeadOrTailRequest::MergeImpl(*this, from);
-  }
-  private:
-  static void MergeImpl(::google::protobuf::Message& to_msg, const ::google::protobuf::Message& from_msg);
-  public:
-  PROTOBUF_ATTRIBUTE_REINITIALIZES void Clear() final;
-  bool IsInitialized() const final;
-
-  ::size_t ByteSizeLong() const final;
-  const char* _InternalParse(const char* ptr, ::google::protobuf::internal::ParseContext* ctx) final;
-  ::uint8_t* _InternalSerialize(
-      ::uint8_t* target, ::google::protobuf::io::EpsCopyOutputStream* stream) const final;
-  int GetCachedSize() const { return _impl_._cached_size_.Get(); }
-
-  private:
-  ::google::protobuf::internal::CachedSize* AccessCachedSize() const final;
-  void SharedCtor(::google::protobuf::Arena* arena);
-  void SharedDtor();
-  void InternalSwap(HeadOrTailRequest* other);
-
-  private:
-  friend class ::google::protobuf::internal::AnyMetadata;
-  static ::absl::string_view FullMessageName() {
-    return "io.deephaven.proto.backplane.grpc.HeadOrTailRequest";
-  }
-  protected:
-  explicit HeadOrTailRequest(::google::protobuf::Arena* arena);
-  HeadOrTailRequest(::google::protobuf::Arena* arena, const HeadOrTailRequest& from);
-  public:
-
-  static const ClassData _class_data_;
-  const ::google::protobuf::Message::ClassData*GetClassData() const final;
-
-  ::google::protobuf::Metadata GetMetadata() const final;
-
-  // nested types ----------------------------------------------------
-
-  // accessors -------------------------------------------------------
-
-  enum : int {
-    kResultIdFieldNumber = 1,
-    kSourceIdFieldNumber = 2,
-    kNumRowsFieldNumber = 3,
-  };
-  // .io.deephaven.proto.backplane.grpc.Ticket result_id = 1;
-  bool has_result_id() const;
-  void clear_result_id() ;
-  const ::io::deephaven::proto::backplane::grpc::Ticket& result_id() const;
-  PROTOBUF_NODISCARD ::io::deephaven::proto::backplane::grpc::Ticket* release_result_id();
-  ::io::deephaven::proto::backplane::grpc::Ticket* mutable_result_id();
-  void set_allocated_result_id(::io::deephaven::proto::backplane::grpc::Ticket* value);
-  void unsafe_arena_set_allocated_result_id(::io::deephaven::proto::backplane::grpc::Ticket* value);
-  ::io::deephaven::proto::backplane::grpc::Ticket* unsafe_arena_release_result_id();
-
-  private:
-  const ::io::deephaven::proto::backplane::grpc::Ticket& _internal_result_id() const;
-  ::io::deephaven::proto::backplane::grpc::Ticket* _internal_mutable_result_id();
-
-  public:
-  // .io.deephaven.proto.backplane.grpc.TableReference source_id = 2;
-  bool has_source_id() const;
-  void clear_source_id() ;
-  const ::io::deephaven::proto::backplane::grpc::TableReference& source_id() const;
-  PROTOBUF_NODISCARD ::io::deephaven::proto::backplane::grpc::TableReference* release_source_id();
-  ::io::deephaven::proto::backplane::grpc::TableReference* mutable_source_id();
-  void set_allocated_source_id(::io::deephaven::proto::backplane::grpc::TableReference* value);
-  void unsafe_arena_set_allocated_source_id(::io::deephaven::proto::backplane::grpc::TableReference* value);
-  ::io::deephaven::proto::backplane::grpc::TableReference* unsafe_arena_release_source_id();
-
-  private:
-  const ::io::deephaven::proto::backplane::grpc::TableReference& _internal_source_id() const;
-  ::io::deephaven::proto::backplane::grpc::TableReference* _internal_mutable_source_id();
-
-  public:
-  // sint64 num_rows = 3 [jstype = JS_STRING];
-  void clear_num_rows() ;
-  ::int64_t num_rows() const;
-  void set_num_rows(::int64_t value);
-
-  private:
-  ::int64_t _internal_num_rows() const;
-  void _internal_set_num_rows(::int64_t value);
-
-  public:
-  // @@protoc_insertion_point(class_scope:io.deephaven.proto.backplane.grpc.HeadOrTailRequest)
- private:
-  class _Internal;
-
-  friend class ::google::protobuf::internal::TcParser;
-  static const ::google::protobuf::internal::TcParseTable<
-      2, 3, 2,
-      0, 2>
-      _table_;
-  friend class ::google::protobuf::MessageLite;
-  friend class ::google::protobuf::Arena;
-  template <typename T>
-  friend class ::google::protobuf::Arena::InternalHelper;
-  using InternalArenaConstructable_ = void;
-  using DestructorSkippable_ = void;
-  struct Impl_ {
-
-        inline explicit constexpr Impl_(
-            ::google::protobuf::internal::ConstantInitialized) noexcept;
-        inline explicit Impl_(::google::protobuf::internal::InternalVisibility visibility,
-                              ::google::protobuf::Arena* arena);
-        inline explicit Impl_(::google::protobuf::internal::InternalVisibility visibility,
-                              ::google::protobuf::Arena* arena, const Impl_& from);
-    ::google::protobuf::internal::HasBits<1> _has_bits_;
-    mutable ::google::protobuf::internal::CachedSize _cached_size_;
-    ::io::deephaven::proto::backplane::grpc::Ticket* result_id_;
-    ::io::deephaven::proto::backplane::grpc::TableReference* source_id_;
-    ::int64_t num_rows_;
-    PROTOBUF_TSAN_DECLARE_MEMBER
-  };
-  union { Impl_ _impl_; };
-  friend struct ::TableStruct_deephaven_2fproto_2ftable_2eproto;
-};// -------------------------------------------------------------------
-
-class HeadOrTailByRequest final :
-    public ::google::protobuf::Message /* @@protoc_insertion_point(class_definition:io.deephaven.proto.backplane.grpc.HeadOrTailByRequest) */ {
- public:
-  inline HeadOrTailByRequest() : HeadOrTailByRequest(nullptr) {}
-  ~HeadOrTailByRequest() override;
-  template<typename = void>
-  explicit PROTOBUF_CONSTEXPR HeadOrTailByRequest(::google::protobuf::internal::ConstantInitialized);
-
-  inline HeadOrTailByRequest(const HeadOrTailByRequest& from)
-      : HeadOrTailByRequest(nullptr, from) {}
-  HeadOrTailByRequest(HeadOrTailByRequest&& from) noexcept
-    : HeadOrTailByRequest() {
-    *this = ::std::move(from);
-  }
-
-  inline HeadOrTailByRequest& operator=(const HeadOrTailByRequest& from) {
-    CopyFrom(from);
-    return *this;
-  }
-  inline HeadOrTailByRequest& operator=(HeadOrTailByRequest&& from) noexcept {
-    if (this == &from) return *this;
-    if (GetArena() == from.GetArena()
-  #ifdef PROTOBUF_FORCE_COPY_IN_MOVE
-        && GetArena() != nullptr
-  #endif  // !PROTOBUF_FORCE_COPY_IN_MOVE
-    ) {
-      InternalSwap(&from);
-    } else {
-      CopyFrom(from);
-    }
-    return *this;
-  }
-
-  inline const ::google::protobuf::UnknownFieldSet& unknown_fields() const
-      ABSL_ATTRIBUTE_LIFETIME_BOUND {
-    return _internal_metadata_.unknown_fields<::google::protobuf::UnknownFieldSet>(::google::protobuf::UnknownFieldSet::default_instance);
-  }
-  inline ::google::protobuf::UnknownFieldSet* mutable_unknown_fields()
-      ABSL_ATTRIBUTE_LIFETIME_BOUND {
-    return _internal_metadata_.mutable_unknown_fields<::google::protobuf::UnknownFieldSet>();
-  }
-
-  static const ::google::protobuf::Descriptor* descriptor() {
-    return GetDescriptor();
-  }
-  static const ::google::protobuf::Descriptor* GetDescriptor() {
-    return default_instance().GetMetadata().descriptor;
-  }
-  static const ::google::protobuf::Reflection* GetReflection() {
-    return default_instance().GetMetadata().reflection;
-  }
-  static const HeadOrTailByRequest& default_instance() {
-    return *internal_default_instance();
-  }
-  static inline const HeadOrTailByRequest* internal_default_instance() {
-    return reinterpret_cast<const HeadOrTailByRequest*>(
-               &_HeadOrTailByRequest_default_instance_);
-  }
-  static constexpr int kIndexInFileMessages =
-    45;
-
-  friend void swap(HeadOrTailByRequest& a, HeadOrTailByRequest& b) {
-    a.Swap(&b);
-  }
-  inline void Swap(HeadOrTailByRequest* other) {
-    if (other == this) return;
-  #ifdef PROTOBUF_FORCE_COPY_IN_SWAP
-    if (GetArena() != nullptr &&
-        GetArena() == other->GetArena()) {
-   #else  // PROTOBUF_FORCE_COPY_IN_SWAP
-    if (GetArena() == other->GetArena()) {
-  #endif  // !PROTOBUF_FORCE_COPY_IN_SWAP
-      InternalSwap(other);
-    } else {
-      ::google::protobuf::internal::GenericSwap(this, other);
-    }
-  }
-  void UnsafeArenaSwap(HeadOrTailByRequest* other) {
-    if (other == this) return;
-    ABSL_DCHECK(GetArena() == other->GetArena());
-    InternalSwap(other);
-  }
-
-  // implements Message ----------------------------------------------
-
-  HeadOrTailByRequest* New(::google::protobuf::Arena* arena = nullptr) const final {
-    return CreateMaybeMessage<HeadOrTailByRequest>(arena);
-  }
-  using ::google::protobuf::Message::CopyFrom;
-  void CopyFrom(const HeadOrTailByRequest& from);
-  using ::google::protobuf::Message::MergeFrom;
-  void MergeFrom( const HeadOrTailByRequest& from) {
-    HeadOrTailByRequest::MergeImpl(*this, from);
-  }
-  private:
-  static void MergeImpl(::google::protobuf::Message& to_msg, const ::google::protobuf::Message& from_msg);
-  public:
-  PROTOBUF_ATTRIBUTE_REINITIALIZES void Clear() final;
-  bool IsInitialized() const final;
-
-  ::size_t ByteSizeLong() const final;
-  const char* _InternalParse(const char* ptr, ::google::protobuf::internal::ParseContext* ctx) final;
-  ::uint8_t* _InternalSerialize(
-      ::uint8_t* target, ::google::protobuf::io::EpsCopyOutputStream* stream) const final;
-  int GetCachedSize() const { return _impl_._cached_size_.Get(); }
-
-  private:
-  ::google::protobuf::internal::CachedSize* AccessCachedSize() const final;
-  void SharedCtor(::google::protobuf::Arena* arena);
-  void SharedDtor();
-  void InternalSwap(HeadOrTailByRequest* other);
-
-  private:
-  friend class ::google::protobuf::internal::AnyMetadata;
-  static ::absl::string_view FullMessageName() {
-    return "io.deephaven.proto.backplane.grpc.HeadOrTailByRequest";
-  }
-  protected:
-  explicit HeadOrTailByRequest(::google::protobuf::Arena* arena);
-  HeadOrTailByRequest(::google::protobuf::Arena* arena, const HeadOrTailByRequest& from);
-  public:
-
-  static const ClassData _class_data_;
-  const ::google::protobuf::Message::ClassData*GetClassData() const final;
-
-  ::google::protobuf::Metadata GetMetadata() const final;
-
-  // nested types ----------------------------------------------------
-
-  // accessors -------------------------------------------------------
-
-  enum : int {
-    kGroupByColumnSpecsFieldNumber = 4,
-    kResultIdFieldNumber = 1,
-    kSourceIdFieldNumber = 2,
-    kNumRowsFieldNumber = 3,
-  };
-  // repeated string group_by_column_specs = 4;
-  int group_by_column_specs_size() const;
-  private:
-  int _internal_group_by_column_specs_size() const;
-
-  public:
-  void clear_group_by_column_specs() ;
-  const std::string& group_by_column_specs(int index) const;
-  std::string* mutable_group_by_column_specs(int index);
-  void set_group_by_column_specs(int index, const std::string& value);
-  void set_group_by_column_specs(int index, std::string&& value);
-  void set_group_by_column_specs(int index, const char* value);
-  void set_group_by_column_specs(int index, const char* value, std::size_t size);
-  void set_group_by_column_specs(int index, absl::string_view value);
-  std::string* add_group_by_column_specs();
-  void add_group_by_column_specs(const std::string& value);
-  void add_group_by_column_specs(std::string&& value);
-  void add_group_by_column_specs(const char* value);
-  void add_group_by_column_specs(const char* value, std::size_t size);
-  void add_group_by_column_specs(absl::string_view value);
-  const ::google::protobuf::RepeatedPtrField<std::string>& group_by_column_specs() const;
-  ::google::protobuf::RepeatedPtrField<std::string>* mutable_group_by_column_specs();
-
-  private:
-  const ::google::protobuf::RepeatedPtrField<std::string>& _internal_group_by_column_specs() const;
-  ::google::protobuf::RepeatedPtrField<std::string>* _internal_mutable_group_by_column_specs();
-
-  public:
-  // .io.deephaven.proto.backplane.grpc.Ticket result_id = 1;
-  bool has_result_id() const;
-  void clear_result_id() ;
-  const ::io::deephaven::proto::backplane::grpc::Ticket& result_id() const;
-  PROTOBUF_NODISCARD ::io::deephaven::proto::backplane::grpc::Ticket* release_result_id();
-  ::io::deephaven::proto::backplane::grpc::Ticket* mutable_result_id();
-  void set_allocated_result_id(::io::deephaven::proto::backplane::grpc::Ticket* value);
-  void unsafe_arena_set_allocated_result_id(::io::deephaven::proto::backplane::grpc::Ticket* value);
-  ::io::deephaven::proto::backplane::grpc::Ticket* unsafe_arena_release_result_id();
-
-  private:
-  const ::io::deephaven::proto::backplane::grpc::Ticket& _internal_result_id() const;
-  ::io::deephaven::proto::backplane::grpc::Ticket* _internal_mutable_result_id();
-
-  public:
-  // .io.deephaven.proto.backplane.grpc.TableReference source_id = 2;
-  bool has_source_id() const;
-  void clear_source_id() ;
-  const ::io::deephaven::proto::backplane::grpc::TableReference& source_id() const;
-  PROTOBUF_NODISCARD ::io::deephaven::proto::backplane::grpc::TableReference* release_source_id();
-  ::io::deephaven::proto::backplane::grpc::TableReference* mutable_source_id();
-  void set_allocated_source_id(::io::deephaven::proto::backplane::grpc::TableReference* value);
-  void unsafe_arena_set_allocated_source_id(::io::deephaven::proto::backplane::grpc::TableReference* value);
-  ::io::deephaven::proto::backplane::grpc::TableReference* unsafe_arena_release_source_id();
-
-  private:
-  const ::io::deephaven::proto::backplane::grpc::TableReference& _internal_source_id() const;
-  ::io::deephaven::proto::backplane::grpc::TableReference* _internal_mutable_source_id();
-
-  public:
-  // sint64 num_rows = 3 [jstype = JS_STRING];
-  void clear_num_rows() ;
-  ::int64_t num_rows() const;
-  void set_num_rows(::int64_t value);
-
-  private:
-  ::int64_t _internal_num_rows() const;
-  void _internal_set_num_rows(::int64_t value);
-
-  public:
-  // @@protoc_insertion_point(class_scope:io.deephaven.proto.backplane.grpc.HeadOrTailByRequest)
- private:
-  class _Internal;
-
-  friend class ::google::protobuf::internal::TcParser;
-  static const ::google::protobuf::internal::TcParseTable<
-      2, 4, 2,
-      83, 2>
-      _table_;
-  friend class ::google::protobuf::MessageLite;
-  friend class ::google::protobuf::Arena;
-  template <typename T>
-  friend class ::google::protobuf::Arena::InternalHelper;
-  using InternalArenaConstructable_ = void;
-  using DestructorSkippable_ = void;
-  struct Impl_ {
-
-        inline explicit constexpr Impl_(
-            ::google::protobuf::internal::ConstantInitialized) noexcept;
-        inline explicit Impl_(::google::protobuf::internal::InternalVisibility visibility,
-                              ::google::protobuf::Arena* arena);
-        inline explicit Impl_(::google::protobuf::internal::InternalVisibility visibility,
-                              ::google::protobuf::Arena* arena, const Impl_& from);
-    ::google::protobuf::internal::HasBits<1> _has_bits_;
-    mutable ::google::protobuf::internal::CachedSize _cached_size_;
-    ::google::protobuf::RepeatedPtrField<std::string> group_by_column_specs_;
-    ::io::deephaven::proto::backplane::grpc::Ticket* result_id_;
-    ::io::deephaven::proto::backplane::grpc::TableReference* source_id_;
-    ::int64_t num_rows_;
-    PROTOBUF_TSAN_DECLARE_MEMBER
-  };
-  union { Impl_ _impl_; };
-  friend struct ::TableStruct_deephaven_2fproto_2ftable_2eproto;
-};// -------------------------------------------------------------------
-
-class FlattenRequest final :
-    public ::google::protobuf::Message /* @@protoc_insertion_point(class_definition:io.deephaven.proto.backplane.grpc.FlattenRequest) */ {
- public:
-  inline FlattenRequest() : FlattenRequest(nullptr) {}
-  ~FlattenRequest() override;
-  template<typename = void>
-  explicit PROTOBUF_CONSTEXPR FlattenRequest(::google::protobuf::internal::ConstantInitialized);
-
-  inline FlattenRequest(const FlattenRequest& from)
-      : FlattenRequest(nullptr, from) {}
-  FlattenRequest(FlattenRequest&& from) noexcept
-    : FlattenRequest() {
-    *this = ::std::move(from);
-  }
-
-  inline FlattenRequest& operator=(const FlattenRequest& from) {
-    CopyFrom(from);
-    return *this;
-  }
-  inline FlattenRequest& operator=(FlattenRequest&& from) noexcept {
-    if (this == &from) return *this;
-    if (GetArena() == from.GetArena()
-  #ifdef PROTOBUF_FORCE_COPY_IN_MOVE
-        && GetArena() != nullptr
-  #endif  // !PROTOBUF_FORCE_COPY_IN_MOVE
-    ) {
-      InternalSwap(&from);
-    } else {
-      CopyFrom(from);
-    }
-    return *this;
-  }
-
-  inline const ::google::protobuf::UnknownFieldSet& unknown_fields() const
-      ABSL_ATTRIBUTE_LIFETIME_BOUND {
-    return _internal_metadata_.unknown_fields<::google::protobuf::UnknownFieldSet>(::google::protobuf::UnknownFieldSet::default_instance);
-  }
-  inline ::google::protobuf::UnknownFieldSet* mutable_unknown_fields()
-      ABSL_ATTRIBUTE_LIFETIME_BOUND {
-    return _internal_metadata_.mutable_unknown_fields<::google::protobuf::UnknownFieldSet>();
-  }
-
-  static const ::google::protobuf::Descriptor* descriptor() {
-    return GetDescriptor();
-  }
-  static const ::google::protobuf::Descriptor* GetDescriptor() {
-    return default_instance().GetMetadata().descriptor;
-  }
-  static const ::google::protobuf::Reflection* GetReflection() {
-    return default_instance().GetMetadata().reflection;
-  }
-  static const FlattenRequest& default_instance() {
-    return *internal_default_instance();
-  }
-  static inline const FlattenRequest* internal_default_instance() {
-    return reinterpret_cast<const FlattenRequest*>(
-               &_FlattenRequest_default_instance_);
-  }
-  static constexpr int kIndexInFileMessages =
-    111;
-
-  friend void swap(FlattenRequest& a, FlattenRequest& b) {
-    a.Swap(&b);
-  }
-  inline void Swap(FlattenRequest* other) {
-    if (other == this) return;
-  #ifdef PROTOBUF_FORCE_COPY_IN_SWAP
-    if (GetArena() != nullptr &&
-        GetArena() == other->GetArena()) {
-   #else  // PROTOBUF_FORCE_COPY_IN_SWAP
-    if (GetArena() == other->GetArena()) {
-  #endif  // !PROTOBUF_FORCE_COPY_IN_SWAP
-      InternalSwap(other);
-    } else {
-      ::google::protobuf::internal::GenericSwap(this, other);
-    }
-  }
-  void UnsafeArenaSwap(FlattenRequest* other) {
-    if (other == this) return;
-    ABSL_DCHECK(GetArena() == other->GetArena());
-    InternalSwap(other);
-  }
-
-  // implements Message ----------------------------------------------
-
-  FlattenRequest* New(::google::protobuf::Arena* arena = nullptr) const final {
-    return CreateMaybeMessage<FlattenRequest>(arena);
-  }
-  using ::google::protobuf::Message::CopyFrom;
-  void CopyFrom(const FlattenRequest& from);
-  using ::google::protobuf::Message::MergeFrom;
-  void MergeFrom( const FlattenRequest& from) {
-    FlattenRequest::MergeImpl(*this, from);
-  }
-  private:
-  static void MergeImpl(::google::protobuf::Message& to_msg, const ::google::protobuf::Message& from_msg);
-  public:
-  PROTOBUF_ATTRIBUTE_REINITIALIZES void Clear() final;
-  bool IsInitialized() const final;
-
-  ::size_t ByteSizeLong() const final;
-  const char* _InternalParse(const char* ptr, ::google::protobuf::internal::ParseContext* ctx) final;
-  ::uint8_t* _InternalSerialize(
-      ::uint8_t* target, ::google::protobuf::io::EpsCopyOutputStream* stream) const final;
-  int GetCachedSize() const { return _impl_._cached_size_.Get(); }
-
-  private:
-  ::google::protobuf::internal::CachedSize* AccessCachedSize() const final;
-  void SharedCtor(::google::protobuf::Arena* arena);
-  void SharedDtor();
-  void InternalSwap(FlattenRequest* other);
-
-  private:
-  friend class ::google::protobuf::internal::AnyMetadata;
-  static ::absl::string_view FullMessageName() {
-    return "io.deephaven.proto.backplane.grpc.FlattenRequest";
-  }
-  protected:
-  explicit FlattenRequest(::google::protobuf::Arena* arena);
-  FlattenRequest(::google::protobuf::Arena* arena, const FlattenRequest& from);
-  public:
-
-  static const ClassData _class_data_;
-  const ::google::protobuf::Message::ClassData*GetClassData() const final;
-
-  ::google::protobuf::Metadata GetMetadata() const final;
-
-  // nested types ----------------------------------------------------
-
-  // accessors -------------------------------------------------------
-
-  enum : int {
-    kResultIdFieldNumber = 1,
-    kSourceIdFieldNumber = 2,
-  };
-  // .io.deephaven.proto.backplane.grpc.Ticket result_id = 1;
-  bool has_result_id() const;
-  void clear_result_id() ;
-  const ::io::deephaven::proto::backplane::grpc::Ticket& result_id() const;
-  PROTOBUF_NODISCARD ::io::deephaven::proto::backplane::grpc::Ticket* release_result_id();
-  ::io::deephaven::proto::backplane::grpc::Ticket* mutable_result_id();
-  void set_allocated_result_id(::io::deephaven::proto::backplane::grpc::Ticket* value);
-  void unsafe_arena_set_allocated_result_id(::io::deephaven::proto::backplane::grpc::Ticket* value);
-  ::io::deephaven::proto::backplane::grpc::Ticket* unsafe_arena_release_result_id();
-
-  private:
-  const ::io::deephaven::proto::backplane::grpc::Ticket& _internal_result_id() const;
-  ::io::deephaven::proto::backplane::grpc::Ticket* _internal_mutable_result_id();
-
-  public:
-  // .io.deephaven.proto.backplane.grpc.TableReference source_id = 2;
-  bool has_source_id() const;
-  void clear_source_id() ;
-  const ::io::deephaven::proto::backplane::grpc::TableReference& source_id() const;
-  PROTOBUF_NODISCARD ::io::deephaven::proto::backplane::grpc::TableReference* release_source_id();
-  ::io::deephaven::proto::backplane::grpc::TableReference* mutable_source_id();
-  void set_allocated_source_id(::io::deephaven::proto::backplane::grpc::TableReference* value);
-  void unsafe_arena_set_allocated_source_id(::io::deephaven::proto::backplane::grpc::TableReference* value);
-  ::io::deephaven::proto::backplane::grpc::TableReference* unsafe_arena_release_source_id();
-
-  private:
-  const ::io::deephaven::proto::backplane::grpc::TableReference& _internal_source_id() const;
-  ::io::deephaven::proto::backplane::grpc::TableReference* _internal_mutable_source_id();
-
-  public:
-  // @@protoc_insertion_point(class_scope:io.deephaven.proto.backplane.grpc.FlattenRequest)
- private:
-  class _Internal;
-
-  friend class ::google::protobuf::internal::TcParser;
-  static const ::google::protobuf::internal::TcParseTable<
-      1, 2, 2,
-      0, 2>
-      _table_;
-  friend class ::google::protobuf::MessageLite;
-  friend class ::google::protobuf::Arena;
-  template <typename T>
-  friend class ::google::protobuf::Arena::InternalHelper;
-  using InternalArenaConstructable_ = void;
-  using DestructorSkippable_ = void;
-  struct Impl_ {
-
-        inline explicit constexpr Impl_(
-            ::google::protobuf::internal::ConstantInitialized) noexcept;
-        inline explicit Impl_(::google::protobuf::internal::InternalVisibility visibility,
-                              ::google::protobuf::Arena* arena);
-        inline explicit Impl_(::google::protobuf::internal::InternalVisibility visibility,
-                              ::google::protobuf::Arena* arena, const Impl_& from);
-    ::google::protobuf::internal::HasBits<1> _has_bits_;
-    mutable ::google::protobuf::internal::CachedSize _cached_size_;
-    ::io::deephaven::proto::backplane::grpc::Ticket* result_id_;
-    ::io::deephaven::proto::backplane::grpc::TableReference* source_id_;
-    PROTOBUF_TSAN_DECLARE_MEMBER
-  };
-  union { Impl_ _impl_; };
-  friend struct ::TableStruct_deephaven_2fproto_2ftable_2eproto;
-};// -------------------------------------------------------------------
-
-class FetchTableRequest final :
-    public ::google::protobuf::Message /* @@protoc_insertion_point(class_definition:io.deephaven.proto.backplane.grpc.FetchTableRequest) */ {
- public:
-  inline FetchTableRequest() : FetchTableRequest(nullptr) {}
-  ~FetchTableRequest() override;
-  template<typename = void>
-  explicit PROTOBUF_CONSTEXPR FetchTableRequest(::google::protobuf::internal::ConstantInitialized);
-
-  inline FetchTableRequest(const FetchTableRequest& from)
-      : FetchTableRequest(nullptr, from) {}
-  FetchTableRequest(FetchTableRequest&& from) noexcept
-    : FetchTableRequest() {
-    *this = ::std::move(from);
-  }
-
-  inline FetchTableRequest& operator=(const FetchTableRequest& from) {
-    CopyFrom(from);
-    return *this;
-  }
-  inline FetchTableRequest& operator=(FetchTableRequest&& from) noexcept {
-    if (this == &from) return *this;
-    if (GetArena() == from.GetArena()
-  #ifdef PROTOBUF_FORCE_COPY_IN_MOVE
-        && GetArena() != nullptr
-  #endif  // !PROTOBUF_FORCE_COPY_IN_MOVE
-    ) {
-      InternalSwap(&from);
-    } else {
-      CopyFrom(from);
-    }
-    return *this;
-  }
-
-  inline const ::google::protobuf::UnknownFieldSet& unknown_fields() const
-      ABSL_ATTRIBUTE_LIFETIME_BOUND {
-    return _internal_metadata_.unknown_fields<::google::protobuf::UnknownFieldSet>(::google::protobuf::UnknownFieldSet::default_instance);
-  }
-  inline ::google::protobuf::UnknownFieldSet* mutable_unknown_fields()
-      ABSL_ATTRIBUTE_LIFETIME_BOUND {
-    return _internal_metadata_.mutable_unknown_fields<::google::protobuf::UnknownFieldSet>();
-  }
-
-  static const ::google::protobuf::Descriptor* descriptor() {
-    return GetDescriptor();
-  }
-  static const ::google::protobuf::Descriptor* GetDescriptor() {
-    return default_instance().GetMetadata().descriptor;
-  }
-  static const ::google::protobuf::Reflection* GetReflection() {
-    return default_instance().GetMetadata().reflection;
-  }
-  static const FetchTableRequest& default_instance() {
-    return *internal_default_instance();
-  }
-  static inline const FetchTableRequest* internal_default_instance() {
-    return reinterpret_cast<const FetchTableRequest*>(
-               &_FetchTableRequest_default_instance_);
-  }
-  static constexpr int kIndexInFileMessages =
-    2;
-
-  friend void swap(FetchTableRequest& a, FetchTableRequest& b) {
-    a.Swap(&b);
-  }
-  inline void Swap(FetchTableRequest* other) {
-    if (other == this) return;
-  #ifdef PROTOBUF_FORCE_COPY_IN_SWAP
-    if (GetArena() != nullptr &&
-        GetArena() == other->GetArena()) {
-   #else  // PROTOBUF_FORCE_COPY_IN_SWAP
-    if (GetArena() == other->GetArena()) {
-  #endif  // !PROTOBUF_FORCE_COPY_IN_SWAP
-      InternalSwap(other);
-    } else {
-      ::google::protobuf::internal::GenericSwap(this, other);
-    }
-  }
-  void UnsafeArenaSwap(FetchTableRequest* other) {
-    if (other == this) return;
-    ABSL_DCHECK(GetArena() == other->GetArena());
-    InternalSwap(other);
-  }
-
-  // implements Message ----------------------------------------------
-
-  FetchTableRequest* New(::google::protobuf::Arena* arena = nullptr) const final {
-    return CreateMaybeMessage<FetchTableRequest>(arena);
-  }
-  using ::google::protobuf::Message::CopyFrom;
-  void CopyFrom(const FetchTableRequest& from);
-  using ::google::protobuf::Message::MergeFrom;
-  void MergeFrom( const FetchTableRequest& from) {
-    FetchTableRequest::MergeImpl(*this, from);
-  }
-  private:
-  static void MergeImpl(::google::protobuf::Message& to_msg, const ::google::protobuf::Message& from_msg);
-  public:
-  PROTOBUF_ATTRIBUTE_REINITIALIZES void Clear() final;
-  bool IsInitialized() const final;
-
-  ::size_t ByteSizeLong() const final;
-  const char* _InternalParse(const char* ptr, ::google::protobuf::internal::ParseContext* ctx) final;
-  ::uint8_t* _InternalSerialize(
-      ::uint8_t* target, ::google::protobuf::io::EpsCopyOutputStream* stream) const final;
-  int GetCachedSize() const { return _impl_._cached_size_.Get(); }
-
-  private:
-  ::google::protobuf::internal::CachedSize* AccessCachedSize() const final;
-  void SharedCtor(::google::protobuf::Arena* arena);
-  void SharedDtor();
-  void InternalSwap(FetchTableRequest* other);
-
-  private:
-  friend class ::google::protobuf::internal::AnyMetadata;
-  static ::absl::string_view FullMessageName() {
-    return "io.deephaven.proto.backplane.grpc.FetchTableRequest";
-  }
-  protected:
-  explicit FetchTableRequest(::google::protobuf::Arena* arena);
-  FetchTableRequest(::google::protobuf::Arena* arena, const FetchTableRequest& from);
-  public:
-
-  static const ClassData _class_data_;
-  const ::google::protobuf::Message::ClassData*GetClassData() const final;
-
-  ::google::protobuf::Metadata GetMetadata() const final;
-
-  // nested types ----------------------------------------------------
-
-  // accessors -------------------------------------------------------
-
-  enum : int {
-    kSourceIdFieldNumber = 1,
-    kResultIdFieldNumber = 2,
-  };
-  // .io.deephaven.proto.backplane.grpc.TableReference source_id = 1;
-  bool has_source_id() const;
-  void clear_source_id() ;
-  const ::io::deephaven::proto::backplane::grpc::TableReference& source_id() const;
-  PROTOBUF_NODISCARD ::io::deephaven::proto::backplane::grpc::TableReference* release_source_id();
-  ::io::deephaven::proto::backplane::grpc::TableReference* mutable_source_id();
-  void set_allocated_source_id(::io::deephaven::proto::backplane::grpc::TableReference* value);
-  void unsafe_arena_set_allocated_source_id(::io::deephaven::proto::backplane::grpc::TableReference* value);
-  ::io::deephaven::proto::backplane::grpc::TableReference* unsafe_arena_release_source_id();
-
-  private:
-  const ::io::deephaven::proto::backplane::grpc::TableReference& _internal_source_id() const;
-  ::io::deephaven::proto::backplane::grpc::TableReference* _internal_mutable_source_id();
-
-  public:
-  // .io.deephaven.proto.backplane.grpc.Ticket result_id = 2;
-  bool has_result_id() const;
-  void clear_result_id() ;
-  const ::io::deephaven::proto::backplane::grpc::Ticket& result_id() const;
-  PROTOBUF_NODISCARD ::io::deephaven::proto::backplane::grpc::Ticket* release_result_id();
-  ::io::deephaven::proto::backplane::grpc::Ticket* mutable_result_id();
-  void set_allocated_result_id(::io::deephaven::proto::backplane::grpc::Ticket* value);
-  void unsafe_arena_set_allocated_result_id(::io::deephaven::proto::backplane::grpc::Ticket* value);
-  ::io::deephaven::proto::backplane::grpc::Ticket* unsafe_arena_release_result_id();
-
-  private:
-  const ::io::deephaven::proto::backplane::grpc::Ticket& _internal_result_id() const;
-  ::io::deephaven::proto::backplane::grpc::Ticket* _internal_mutable_result_id();
-
-  public:
-  // @@protoc_insertion_point(class_scope:io.deephaven.proto.backplane.grpc.FetchTableRequest)
- private:
-  class _Internal;
-
-  friend class ::google::protobuf::internal::TcParser;
-  static const ::google::protobuf::internal::TcParseTable<
-      1, 2, 2,
-      0, 2>
-      _table_;
-  friend class ::google::protobuf::MessageLite;
-  friend class ::google::protobuf::Arena;
-  template <typename T>
-  friend class ::google::protobuf::Arena::InternalHelper;
-  using InternalArenaConstructable_ = void;
-  using DestructorSkippable_ = void;
-  struct Impl_ {
-
-        inline explicit constexpr Impl_(
-            ::google::protobuf::internal::ConstantInitialized) noexcept;
-        inline explicit Impl_(::google::protobuf::internal::InternalVisibility visibility,
-                              ::google::protobuf::Arena* arena);
-        inline explicit Impl_(::google::protobuf::internal::InternalVisibility visibility,
-                              ::google::protobuf::Arena* arena, const Impl_& from);
-    ::google::protobuf::internal::HasBits<1> _has_bits_;
-    mutable ::google::protobuf::internal::CachedSize _cached_size_;
-    ::io::deephaven::proto::backplane::grpc::TableReference* source_id_;
-    ::io::deephaven::proto::backplane::grpc::Ticket* result_id_;
-    PROTOBUF_TSAN_DECLARE_MEMBER
-  };
-  union { Impl_ _impl_; };
-  friend struct ::TableStruct_deephaven_2fproto_2ftable_2eproto;
-};// -------------------------------------------------------------------
-
-class ExportedTableCreationResponse final :
-    public ::google::protobuf::Message /* @@protoc_insertion_point(class_definition:io.deephaven.proto.backplane.grpc.ExportedTableCreationResponse) */ {
- public:
-  inline ExportedTableCreationResponse() : ExportedTableCreationResponse(nullptr) {}
-  ~ExportedTableCreationResponse() override;
-  template<typename = void>
-  explicit PROTOBUF_CONSTEXPR ExportedTableCreationResponse(::google::protobuf::internal::ConstantInitialized);
-
-  inline ExportedTableCreationResponse(const ExportedTableCreationResponse& from)
-      : ExportedTableCreationResponse(nullptr, from) {}
-  ExportedTableCreationResponse(ExportedTableCreationResponse&& from) noexcept
-    : ExportedTableCreationResponse() {
-    *this = ::std::move(from);
-  }
-
-  inline ExportedTableCreationResponse& operator=(const ExportedTableCreationResponse& from) {
-    CopyFrom(from);
-    return *this;
-  }
-  inline ExportedTableCreationResponse& operator=(ExportedTableCreationResponse&& from) noexcept {
-    if (this == &from) return *this;
-    if (GetArena() == from.GetArena()
-  #ifdef PROTOBUF_FORCE_COPY_IN_MOVE
-        && GetArena() != nullptr
-  #endif  // !PROTOBUF_FORCE_COPY_IN_MOVE
-    ) {
-      InternalSwap(&from);
-    } else {
-      CopyFrom(from);
-    }
-    return *this;
-  }
-
-  inline const ::google::protobuf::UnknownFieldSet& unknown_fields() const
-      ABSL_ATTRIBUTE_LIFETIME_BOUND {
-    return _internal_metadata_.unknown_fields<::google::protobuf::UnknownFieldSet>(::google::protobuf::UnknownFieldSet::default_instance);
-  }
-  inline ::google::protobuf::UnknownFieldSet* mutable_unknown_fields()
-      ABSL_ATTRIBUTE_LIFETIME_BOUND {
-    return _internal_metadata_.mutable_unknown_fields<::google::protobuf::UnknownFieldSet>();
-  }
-
-  static const ::google::protobuf::Descriptor* descriptor() {
-    return GetDescriptor();
-  }
-  static const ::google::protobuf::Descriptor* GetDescriptor() {
-    return default_instance().GetMetadata().descriptor;
-  }
-  static const ::google::protobuf::Reflection* GetReflection() {
-    return default_instance().GetMetadata().reflection;
-  }
-  static const ExportedTableCreationResponse& default_instance() {
-    return *internal_default_instance();
-  }
-  static inline const ExportedTableCreationResponse* internal_default_instance() {
-    return reinterpret_cast<const ExportedTableCreationResponse*>(
-               &_ExportedTableCreationResponse_default_instance_);
-  }
-  static constexpr int kIndexInFileMessages =
-    1;
-
-  friend void swap(ExportedTableCreationResponse& a, ExportedTableCreationResponse& b) {
-    a.Swap(&b);
-  }
-  inline void Swap(ExportedTableCreationResponse* other) {
-    if (other == this) return;
-  #ifdef PROTOBUF_FORCE_COPY_IN_SWAP
-    if (GetArena() != nullptr &&
-        GetArena() == other->GetArena()) {
-   #else  // PROTOBUF_FORCE_COPY_IN_SWAP
-    if (GetArena() == other->GetArena()) {
-  #endif  // !PROTOBUF_FORCE_COPY_IN_SWAP
-      InternalSwap(other);
-    } else {
-      ::google::protobuf::internal::GenericSwap(this, other);
-    }
-  }
-  void UnsafeArenaSwap(ExportedTableCreationResponse* other) {
-    if (other == this) return;
-    ABSL_DCHECK(GetArena() == other->GetArena());
-    InternalSwap(other);
-  }
-
-  // implements Message ----------------------------------------------
-
-  ExportedTableCreationResponse* New(::google::protobuf::Arena* arena = nullptr) const final {
-    return CreateMaybeMessage<ExportedTableCreationResponse>(arena);
-  }
-  using ::google::protobuf::Message::CopyFrom;
-  void CopyFrom(const ExportedTableCreationResponse& from);
-  using ::google::protobuf::Message::MergeFrom;
-  void MergeFrom( const ExportedTableCreationResponse& from) {
-    ExportedTableCreationResponse::MergeImpl(*this, from);
-  }
-  private:
-  static void MergeImpl(::google::protobuf::Message& to_msg, const ::google::protobuf::Message& from_msg);
-  public:
-  PROTOBUF_ATTRIBUTE_REINITIALIZES void Clear() final;
-  bool IsInitialized() const final;
-
-  ::size_t ByteSizeLong() const final;
-  const char* _InternalParse(const char* ptr, ::google::protobuf::internal::ParseContext* ctx) final;
-  ::uint8_t* _InternalSerialize(
-      ::uint8_t* target, ::google::protobuf::io::EpsCopyOutputStream* stream) const final;
-  int GetCachedSize() const { return _impl_._cached_size_.Get(); }
-
-  private:
-  ::google::protobuf::internal::CachedSize* AccessCachedSize() const final;
-  void SharedCtor(::google::protobuf::Arena* arena);
-  void SharedDtor();
-  void InternalSwap(ExportedTableCreationResponse* other);
-
-  private:
-  friend class ::google::protobuf::internal::AnyMetadata;
-  static ::absl::string_view FullMessageName() {
-    return "io.deephaven.proto.backplane.grpc.ExportedTableCreationResponse";
-  }
-  protected:
-  explicit ExportedTableCreationResponse(::google::protobuf::Arena* arena);
-  ExportedTableCreationResponse(::google::protobuf::Arena* arena, const ExportedTableCreationResponse& from);
-  public:
-
-  static const ClassData _class_data_;
-  const ::google::protobuf::Message::ClassData*GetClassData() const final;
-
-  ::google::protobuf::Metadata GetMetadata() const final;
-
-  // nested types ----------------------------------------------------
-
-  // accessors -------------------------------------------------------
-
-  enum : int {
-    kErrorInfoFieldNumber = 3,
-    kSchemaHeaderFieldNumber = 4,
-    kResultIdFieldNumber = 1,
-    kSizeFieldNumber = 6,
-    kSuccessFieldNumber = 2,
-    kIsStaticFieldNumber = 5,
-  };
-  // string error_info = 3;
-  void clear_error_info() ;
-  const std::string& error_info() const;
-  template <typename Arg_ = const std::string&, typename... Args_>
-  void set_error_info(Arg_&& arg, Args_... args);
-  std::string* mutable_error_info();
-  PROTOBUF_NODISCARD std::string* release_error_info();
-  void set_allocated_error_info(std::string* value);
-
-  private:
-  const std::string& _internal_error_info() const;
-  inline PROTOBUF_ALWAYS_INLINE void _internal_set_error_info(
-      const std::string& value);
-  std::string* _internal_mutable_error_info();
-
-  public:
-  // bytes schema_header = 4;
-  void clear_schema_header() ;
-  const std::string& schema_header() const;
-  template <typename Arg_ = const std::string&, typename... Args_>
-  void set_schema_header(Arg_&& arg, Args_... args);
-  std::string* mutable_schema_header();
-  PROTOBUF_NODISCARD std::string* release_schema_header();
-  void set_allocated_schema_header(std::string* value);
-
-  private:
-  const std::string& _internal_schema_header() const;
-  inline PROTOBUF_ALWAYS_INLINE void _internal_set_schema_header(
-      const std::string& value);
-  std::string* _internal_mutable_schema_header();
-
-  public:
-  // .io.deephaven.proto.backplane.grpc.TableReference result_id = 1;
-  bool has_result_id() const;
-  void clear_result_id() ;
-  const ::io::deephaven::proto::backplane::grpc::TableReference& result_id() const;
-  PROTOBUF_NODISCARD ::io::deephaven::proto::backplane::grpc::TableReference* release_result_id();
-  ::io::deephaven::proto::backplane::grpc::TableReference* mutable_result_id();
-  void set_allocated_result_id(::io::deephaven::proto::backplane::grpc::TableReference* value);
-  void unsafe_arena_set_allocated_result_id(::io::deephaven::proto::backplane::grpc::TableReference* value);
-  ::io::deephaven::proto::backplane::grpc::TableReference* unsafe_arena_release_result_id();
-
-  private:
-  const ::io::deephaven::proto::backplane::grpc::TableReference& _internal_result_id() const;
-  ::io::deephaven::proto::backplane::grpc::TableReference* _internal_mutable_result_id();
-
-  public:
-  // sint64 size = 6 [jstype = JS_STRING];
-  void clear_size() ;
-  ::int64_t size() const;
-  void set_size(::int64_t value);
-
-  private:
-  ::int64_t _internal_size() const;
-  void _internal_set_size(::int64_t value);
-
-  public:
-  // bool success = 2;
-  void clear_success() ;
-  bool success() const;
-  void set_success(bool value);
-
-  private:
-  bool _internal_success() const;
-  void _internal_set_success(bool value);
-
-  public:
-  // bool is_static = 5;
-  void clear_is_static() ;
-  bool is_static() const;
-  void set_is_static(bool value);
-
-  private:
-  bool _internal_is_static() const;
-  void _internal_set_is_static(bool value);
-
-  public:
-  // @@protoc_insertion_point(class_scope:io.deephaven.proto.backplane.grpc.ExportedTableCreationResponse)
- private:
-  class _Internal;
-
-  friend class ::google::protobuf::internal::TcParser;
-  static const ::google::protobuf::internal::TcParseTable<
-      3, 6, 1,
-      82, 2>
-      _table_;
-  friend class ::google::protobuf::MessageLite;
-  friend class ::google::protobuf::Arena;
-  template <typename T>
-  friend class ::google::protobuf::Arena::InternalHelper;
-  using InternalArenaConstructable_ = void;
-  using DestructorSkippable_ = void;
-  struct Impl_ {
-
-        inline explicit constexpr Impl_(
-            ::google::protobuf::internal::ConstantInitialized) noexcept;
-        inline explicit Impl_(::google::protobuf::internal::InternalVisibility visibility,
-                              ::google::protobuf::Arena* arena);
-        inline explicit Impl_(::google::protobuf::internal::InternalVisibility visibility,
-                              ::google::protobuf::Arena* arena, const Impl_& from);
-    ::google::protobuf::internal::HasBits<1> _has_bits_;
-    mutable ::google::protobuf::internal::CachedSize _cached_size_;
-    ::google::protobuf::internal::ArenaStringPtr error_info_;
-    ::google::protobuf::internal::ArenaStringPtr schema_header_;
-    ::io::deephaven::proto::backplane::grpc::TableReference* result_id_;
-    ::int64_t size_;
-    bool success_;
-    bool is_static_;
-    PROTOBUF_TSAN_DECLARE_MEMBER
-  };
-  union { Impl_ _impl_; };
-  friend struct ::TableStruct_deephaven_2fproto_2ftable_2eproto;
-};// -------------------------------------------------------------------
-
-class ExactJoinTablesRequest final :
-    public ::google::protobuf::Message /* @@protoc_insertion_point(class_definition:io.deephaven.proto.backplane.grpc.ExactJoinTablesRequest) */ {
- public:
-  inline ExactJoinTablesRequest() : ExactJoinTablesRequest(nullptr) {}
-  ~ExactJoinTablesRequest() override;
-  template<typename = void>
-  explicit PROTOBUF_CONSTEXPR ExactJoinTablesRequest(::google::protobuf::internal::ConstantInitialized);
-
-  inline ExactJoinTablesRequest(const ExactJoinTablesRequest& from)
-      : ExactJoinTablesRequest(nullptr, from) {}
-  ExactJoinTablesRequest(ExactJoinTablesRequest&& from) noexcept
-    : ExactJoinTablesRequest() {
-    *this = ::std::move(from);
-  }
-
-  inline ExactJoinTablesRequest& operator=(const ExactJoinTablesRequest& from) {
-    CopyFrom(from);
-    return *this;
-  }
-  inline ExactJoinTablesRequest& operator=(ExactJoinTablesRequest&& from) noexcept {
-    if (this == &from) return *this;
-    if (GetArena() == from.GetArena()
-  #ifdef PROTOBUF_FORCE_COPY_IN_MOVE
-        && GetArena() != nullptr
-  #endif  // !PROTOBUF_FORCE_COPY_IN_MOVE
-    ) {
-      InternalSwap(&from);
-    } else {
-      CopyFrom(from);
-    }
-    return *this;
-  }
-
-  inline const ::google::protobuf::UnknownFieldSet& unknown_fields() const
-      ABSL_ATTRIBUTE_LIFETIME_BOUND {
-    return _internal_metadata_.unknown_fields<::google::protobuf::UnknownFieldSet>(::google::protobuf::UnknownFieldSet::default_instance);
-  }
-  inline ::google::protobuf::UnknownFieldSet* mutable_unknown_fields()
-      ABSL_ATTRIBUTE_LIFETIME_BOUND {
-    return _internal_metadata_.mutable_unknown_fields<::google::protobuf::UnknownFieldSet>();
-  }
-
-  static const ::google::protobuf::Descriptor* descriptor() {
-    return GetDescriptor();
-  }
-  static const ::google::protobuf::Descriptor* GetDescriptor() {
-    return default_instance().GetMetadata().descriptor;
-  }
-  static const ::google::protobuf::Reflection* GetReflection() {
-    return default_instance().GetMetadata().reflection;
-  }
-  static const ExactJoinTablesRequest& default_instance() {
-    return *internal_default_instance();
-  }
-  static inline const ExactJoinTablesRequest* internal_default_instance() {
-    return reinterpret_cast<const ExactJoinTablesRequest*>(
-               &_ExactJoinTablesRequest_default_instance_);
-  }
-  static constexpr int kIndexInFileMessages =
-    52;
-
-  friend void swap(ExactJoinTablesRequest& a, ExactJoinTablesRequest& b) {
-    a.Swap(&b);
-  }
-  inline void Swap(ExactJoinTablesRequest* other) {
-    if (other == this) return;
-  #ifdef PROTOBUF_FORCE_COPY_IN_SWAP
-    if (GetArena() != nullptr &&
-        GetArena() == other->GetArena()) {
-   #else  // PROTOBUF_FORCE_COPY_IN_SWAP
-    if (GetArena() == other->GetArena()) {
-  #endif  // !PROTOBUF_FORCE_COPY_IN_SWAP
-      InternalSwap(other);
-    } else {
-      ::google::protobuf::internal::GenericSwap(this, other);
-    }
-  }
-  void UnsafeArenaSwap(ExactJoinTablesRequest* other) {
-    if (other == this) return;
-    ABSL_DCHECK(GetArena() == other->GetArena());
-    InternalSwap(other);
-  }
-
-  // implements Message ----------------------------------------------
-
-  ExactJoinTablesRequest* New(::google::protobuf::Arena* arena = nullptr) const final {
-    return CreateMaybeMessage<ExactJoinTablesRequest>(arena);
-  }
-  using ::google::protobuf::Message::CopyFrom;
-  void CopyFrom(const ExactJoinTablesRequest& from);
-  using ::google::protobuf::Message::MergeFrom;
-  void MergeFrom( const ExactJoinTablesRequest& from) {
-    ExactJoinTablesRequest::MergeImpl(*this, from);
-  }
-  private:
-  static void MergeImpl(::google::protobuf::Message& to_msg, const ::google::protobuf::Message& from_msg);
-  public:
-  PROTOBUF_ATTRIBUTE_REINITIALIZES void Clear() final;
-  bool IsInitialized() const final;
-
-  ::size_t ByteSizeLong() const final;
-  const char* _InternalParse(const char* ptr, ::google::protobuf::internal::ParseContext* ctx) final;
-  ::uint8_t* _InternalSerialize(
-      ::uint8_t* target, ::google::protobuf::io::EpsCopyOutputStream* stream) const final;
-  int GetCachedSize() const { return _impl_._cached_size_.Get(); }
-
-  private:
-  ::google::protobuf::internal::CachedSize* AccessCachedSize() const final;
-  void SharedCtor(::google::protobuf::Arena* arena);
-  void SharedDtor();
-  void InternalSwap(ExactJoinTablesRequest* other);
-
-  private:
-  friend class ::google::protobuf::internal::AnyMetadata;
-  static ::absl::string_view FullMessageName() {
-    return "io.deephaven.proto.backplane.grpc.ExactJoinTablesRequest";
-  }
-  protected:
-  explicit ExactJoinTablesRequest(::google::protobuf::Arena* arena);
-  ExactJoinTablesRequest(::google::protobuf::Arena* arena, const ExactJoinTablesRequest& from);
-  public:
-
-  static const ClassData _class_data_;
-  const ::google::protobuf::Message::ClassData*GetClassData() const final;
-
-  ::google::protobuf::Metadata GetMetadata() const final;
-
-  // nested types ----------------------------------------------------
-
-  // accessors -------------------------------------------------------
-
-  enum : int {
-    kColumnsToMatchFieldNumber = 4,
-    kColumnsToAddFieldNumber = 5,
-    kResultIdFieldNumber = 1,
-    kLeftIdFieldNumber = 2,
-    kRightIdFieldNumber = 3,
-  };
-  // repeated string columns_to_match = 4;
-  int columns_to_match_size() const;
-  private:
-  int _internal_columns_to_match_size() const;
-
-  public:
-  void clear_columns_to_match() ;
-  const std::string& columns_to_match(int index) const;
-  std::string* mutable_columns_to_match(int index);
-  void set_columns_to_match(int index, const std::string& value);
-  void set_columns_to_match(int index, std::string&& value);
-  void set_columns_to_match(int index, const char* value);
-  void set_columns_to_match(int index, const char* value, std::size_t size);
-  void set_columns_to_match(int index, absl::string_view value);
-  std::string* add_columns_to_match();
-  void add_columns_to_match(const std::string& value);
-  void add_columns_to_match(std::string&& value);
-  void add_columns_to_match(const char* value);
-  void add_columns_to_match(const char* value, std::size_t size);
-  void add_columns_to_match(absl::string_view value);
-  const ::google::protobuf::RepeatedPtrField<std::string>& columns_to_match() const;
-  ::google::protobuf::RepeatedPtrField<std::string>* mutable_columns_to_match();
-
-  private:
-  const ::google::protobuf::RepeatedPtrField<std::string>& _internal_columns_to_match() const;
-  ::google::protobuf::RepeatedPtrField<std::string>* _internal_mutable_columns_to_match();
-
-  public:
-  // repeated string columns_to_add = 5;
-  int columns_to_add_size() const;
-  private:
-  int _internal_columns_to_add_size() const;
-
-  public:
-  void clear_columns_to_add() ;
-  const std::string& columns_to_add(int index) const;
-  std::string* mutable_columns_to_add(int index);
-  void set_columns_to_add(int index, const std::string& value);
-  void set_columns_to_add(int index, std::string&& value);
-  void set_columns_to_add(int index, const char* value);
-  void set_columns_to_add(int index, const char* value, std::size_t size);
-  void set_columns_to_add(int index, absl::string_view value);
-  std::string* add_columns_to_add();
-  void add_columns_to_add(const std::string& value);
-  void add_columns_to_add(std::string&& value);
-  void add_columns_to_add(const char* value);
-  void add_columns_to_add(const char* value, std::size_t size);
-  void add_columns_to_add(absl::string_view value);
-  const ::google::protobuf::RepeatedPtrField<std::string>& columns_to_add() const;
-  ::google::protobuf::RepeatedPtrField<std::string>* mutable_columns_to_add();
-
-  private:
-  const ::google::protobuf::RepeatedPtrField<std::string>& _internal_columns_to_add() const;
-  ::google::protobuf::RepeatedPtrField<std::string>* _internal_mutable_columns_to_add();
-
-  public:
-  // .io.deephaven.proto.backplane.grpc.Ticket result_id = 1;
-  bool has_result_id() const;
-  void clear_result_id() ;
-  const ::io::deephaven::proto::backplane::grpc::Ticket& result_id() const;
-  PROTOBUF_NODISCARD ::io::deephaven::proto::backplane::grpc::Ticket* release_result_id();
-  ::io::deephaven::proto::backplane::grpc::Ticket* mutable_result_id();
-  void set_allocated_result_id(::io::deephaven::proto::backplane::grpc::Ticket* value);
-  void unsafe_arena_set_allocated_result_id(::io::deephaven::proto::backplane::grpc::Ticket* value);
-  ::io::deephaven::proto::backplane::grpc::Ticket* unsafe_arena_release_result_id();
-
-  private:
-  const ::io::deephaven::proto::backplane::grpc::Ticket& _internal_result_id() const;
-  ::io::deephaven::proto::backplane::grpc::Ticket* _internal_mutable_result_id();
-
-  public:
-  // .io.deephaven.proto.backplane.grpc.TableReference left_id = 2;
-  bool has_left_id() const;
-  void clear_left_id() ;
-  const ::io::deephaven::proto::backplane::grpc::TableReference& left_id() const;
-  PROTOBUF_NODISCARD ::io::deephaven::proto::backplane::grpc::TableReference* release_left_id();
-  ::io::deephaven::proto::backplane::grpc::TableReference* mutable_left_id();
-  void set_allocated_left_id(::io::deephaven::proto::backplane::grpc::TableReference* value);
-  void unsafe_arena_set_allocated_left_id(::io::deephaven::proto::backplane::grpc::TableReference* value);
-  ::io::deephaven::proto::backplane::grpc::TableReference* unsafe_arena_release_left_id();
-
-  private:
-  const ::io::deephaven::proto::backplane::grpc::TableReference& _internal_left_id() const;
-  ::io::deephaven::proto::backplane::grpc::TableReference* _internal_mutable_left_id();
-
-  public:
-  // .io.deephaven.proto.backplane.grpc.TableReference right_id = 3;
-  bool has_right_id() const;
-  void clear_right_id() ;
-  const ::io::deephaven::proto::backplane::grpc::TableReference& right_id() const;
-  PROTOBUF_NODISCARD ::io::deephaven::proto::backplane::grpc::TableReference* release_right_id();
-  ::io::deephaven::proto::backplane::grpc::TableReference* mutable_right_id();
-  void set_allocated_right_id(::io::deephaven::proto::backplane::grpc::TableReference* value);
-  void unsafe_arena_set_allocated_right_id(::io::deephaven::proto::backplane::grpc::TableReference* value);
-  ::io::deephaven::proto::backplane::grpc::TableReference* unsafe_arena_release_right_id();
-
-  private:
-  const ::io::deephaven::proto::backplane::grpc::TableReference& _internal_right_id() const;
-  ::io::deephaven::proto::backplane::grpc::TableReference* _internal_mutable_right_id();
-
-  public:
-  // @@protoc_insertion_point(class_scope:io.deephaven.proto.backplane.grpc.ExactJoinTablesRequest)
- private:
-  class _Internal;
-
-  friend class ::google::protobuf::internal::TcParser;
-  static const ::google::protobuf::internal::TcParseTable<
-      3, 5, 3,
-      95, 2>
-      _table_;
-  friend class ::google::protobuf::MessageLite;
-  friend class ::google::protobuf::Arena;
-  template <typename T>
-  friend class ::google::protobuf::Arena::InternalHelper;
-  using InternalArenaConstructable_ = void;
-  using DestructorSkippable_ = void;
-  struct Impl_ {
-
-        inline explicit constexpr Impl_(
-            ::google::protobuf::internal::ConstantInitialized) noexcept;
-        inline explicit Impl_(::google::protobuf::internal::InternalVisibility visibility,
-                              ::google::protobuf::Arena* arena);
-        inline explicit Impl_(::google::protobuf::internal::InternalVisibility visibility,
-                              ::google::protobuf::Arena* arena, const Impl_& from);
-    ::google::protobuf::internal::HasBits<1> _has_bits_;
-    mutable ::google::protobuf::internal::CachedSize _cached_size_;
-    ::google::protobuf::RepeatedPtrField<std::string> columns_to_match_;
-    ::google::protobuf::RepeatedPtrField<std::string> columns_to_add_;
-    ::io::deephaven::proto::backplane::grpc::Ticket* result_id_;
-    ::io::deephaven::proto::backplane::grpc::TableReference* left_id_;
-    ::io::deephaven::proto::backplane::grpc::TableReference* right_id_;
-    PROTOBUF_TSAN_DECLARE_MEMBER
-  };
-  union { Impl_ _impl_; };
-  friend struct ::TableStruct_deephaven_2fproto_2ftable_2eproto;
-};// -------------------------------------------------------------------
-
-class DropColumnsRequest final :
-    public ::google::protobuf::Message /* @@protoc_insertion_point(class_definition:io.deephaven.proto.backplane.grpc.DropColumnsRequest) */ {
- public:
-  inline DropColumnsRequest() : DropColumnsRequest(nullptr) {}
-  ~DropColumnsRequest() override;
-  template<typename = void>
-  explicit PROTOBUF_CONSTEXPR DropColumnsRequest(::google::protobuf::internal::ConstantInitialized);
-
-  inline DropColumnsRequest(const DropColumnsRequest& from)
-      : DropColumnsRequest(nullptr, from) {}
-  DropColumnsRequest(DropColumnsRequest&& from) noexcept
-    : DropColumnsRequest() {
-    *this = ::std::move(from);
-  }
-
-  inline DropColumnsRequest& operator=(const DropColumnsRequest& from) {
-    CopyFrom(from);
-    return *this;
-  }
-  inline DropColumnsRequest& operator=(DropColumnsRequest&& from) noexcept {
-    if (this == &from) return *this;
-    if (GetArena() == from.GetArena()
-  #ifdef PROTOBUF_FORCE_COPY_IN_MOVE
-        && GetArena() != nullptr
-  #endif  // !PROTOBUF_FORCE_COPY_IN_MOVE
-    ) {
-      InternalSwap(&from);
-    } else {
-      CopyFrom(from);
-    }
-    return *this;
-  }
-
-  inline const ::google::protobuf::UnknownFieldSet& unknown_fields() const
-      ABSL_ATTRIBUTE_LIFETIME_BOUND {
-    return _internal_metadata_.unknown_fields<::google::protobuf::UnknownFieldSet>(::google::protobuf::UnknownFieldSet::default_instance);
-  }
-  inline ::google::protobuf::UnknownFieldSet* mutable_unknown_fields()
-      ABSL_ATTRIBUTE_LIFETIME_BOUND {
-    return _internal_metadata_.mutable_unknown_fields<::google::protobuf::UnknownFieldSet>();
-  }
-
-  static const ::google::protobuf::Descriptor* descriptor() {
-    return GetDescriptor();
-  }
-  static const ::google::protobuf::Descriptor* GetDescriptor() {
-    return default_instance().GetMetadata().descriptor;
-  }
-  static const ::google::protobuf::Reflection* GetReflection() {
-    return default_instance().GetMetadata().reflection;
-  }
-  static const DropColumnsRequest& default_instance() {
-    return *internal_default_instance();
-  }
-  static inline const DropColumnsRequest* internal_default_instance() {
-    return reinterpret_cast<const DropColumnsRequest*>(
-               &_DropColumnsRequest_default_instance_);
-  }
-  static constexpr int kIndexInFileMessages =
-    42;
-
-  friend void swap(DropColumnsRequest& a, DropColumnsRequest& b) {
-    a.Swap(&b);
-  }
-  inline void Swap(DropColumnsRequest* other) {
-    if (other == this) return;
-  #ifdef PROTOBUF_FORCE_COPY_IN_SWAP
-    if (GetArena() != nullptr &&
-        GetArena() == other->GetArena()) {
-   #else  // PROTOBUF_FORCE_COPY_IN_SWAP
-    if (GetArena() == other->GetArena()) {
-  #endif  // !PROTOBUF_FORCE_COPY_IN_SWAP
-      InternalSwap(other);
-    } else {
-      ::google::protobuf::internal::GenericSwap(this, other);
-    }
-  }
-  void UnsafeArenaSwap(DropColumnsRequest* other) {
-    if (other == this) return;
-    ABSL_DCHECK(GetArena() == other->GetArena());
-    InternalSwap(other);
-  }
-
-  // implements Message ----------------------------------------------
-
-  DropColumnsRequest* New(::google::protobuf::Arena* arena = nullptr) const final {
-    return CreateMaybeMessage<DropColumnsRequest>(arena);
-  }
-  using ::google::protobuf::Message::CopyFrom;
-  void CopyFrom(const DropColumnsRequest& from);
-  using ::google::protobuf::Message::MergeFrom;
-  void MergeFrom( const DropColumnsRequest& from) {
-    DropColumnsRequest::MergeImpl(*this, from);
-  }
-  private:
-  static void MergeImpl(::google::protobuf::Message& to_msg, const ::google::protobuf::Message& from_msg);
-  public:
-  PROTOBUF_ATTRIBUTE_REINITIALIZES void Clear() final;
-  bool IsInitialized() const final;
-
-  ::size_t ByteSizeLong() const final;
-  const char* _InternalParse(const char* ptr, ::google::protobuf::internal::ParseContext* ctx) final;
-  ::uint8_t* _InternalSerialize(
-      ::uint8_t* target, ::google::protobuf::io::EpsCopyOutputStream* stream) const final;
-  int GetCachedSize() const { return _impl_._cached_size_.Get(); }
-
-  private:
-  ::google::protobuf::internal::CachedSize* AccessCachedSize() const final;
-  void SharedCtor(::google::protobuf::Arena* arena);
-  void SharedDtor();
-  void InternalSwap(DropColumnsRequest* other);
-
-  private:
-  friend class ::google::protobuf::internal::AnyMetadata;
-  static ::absl::string_view FullMessageName() {
-    return "io.deephaven.proto.backplane.grpc.DropColumnsRequest";
-  }
-  protected:
-  explicit DropColumnsRequest(::google::protobuf::Arena* arena);
-  DropColumnsRequest(::google::protobuf::Arena* arena, const DropColumnsRequest& from);
-  public:
-
-  static const ClassData _class_data_;
-  const ::google::protobuf::Message::ClassData*GetClassData() const final;
-
-  ::google::protobuf::Metadata GetMetadata() const final;
-
-  // nested types ----------------------------------------------------
-
-  // accessors -------------------------------------------------------
-
-  enum : int {
-    kColumnNamesFieldNumber = 3,
-    kResultIdFieldNumber = 1,
-    kSourceIdFieldNumber = 2,
-  };
-  // repeated string column_names = 3;
-  int column_names_size() const;
-  private:
-  int _internal_column_names_size() const;
-
-  public:
-  void clear_column_names() ;
-  const std::string& column_names(int index) const;
-  std::string* mutable_column_names(int index);
-  void set_column_names(int index, const std::string& value);
-  void set_column_names(int index, std::string&& value);
-  void set_column_names(int index, const char* value);
-  void set_column_names(int index, const char* value, std::size_t size);
-  void set_column_names(int index, absl::string_view value);
-  std::string* add_column_names();
-  void add_column_names(const std::string& value);
-  void add_column_names(std::string&& value);
-  void add_column_names(const char* value);
-  void add_column_names(const char* value, std::size_t size);
-  void add_column_names(absl::string_view value);
-  const ::google::protobuf::RepeatedPtrField<std::string>& column_names() const;
-  ::google::protobuf::RepeatedPtrField<std::string>* mutable_column_names();
-
-  private:
-  const ::google::protobuf::RepeatedPtrField<std::string>& _internal_column_names() const;
-  ::google::protobuf::RepeatedPtrField<std::string>* _internal_mutable_column_names();
-
-  public:
-  // .io.deephaven.proto.backplane.grpc.Ticket result_id = 1;
-  bool has_result_id() const;
-  void clear_result_id() ;
-  const ::io::deephaven::proto::backplane::grpc::Ticket& result_id() const;
-  PROTOBUF_NODISCARD ::io::deephaven::proto::backplane::grpc::Ticket* release_result_id();
-  ::io::deephaven::proto::backplane::grpc::Ticket* mutable_result_id();
-  void set_allocated_result_id(::io::deephaven::proto::backplane::grpc::Ticket* value);
-  void unsafe_arena_set_allocated_result_id(::io::deephaven::proto::backplane::grpc::Ticket* value);
-  ::io::deephaven::proto::backplane::grpc::Ticket* unsafe_arena_release_result_id();
-
-  private:
-  const ::io::deephaven::proto::backplane::grpc::Ticket& _internal_result_id() const;
-  ::io::deephaven::proto::backplane::grpc::Ticket* _internal_mutable_result_id();
-
-  public:
-  // .io.deephaven.proto.backplane.grpc.TableReference source_id = 2;
-  bool has_source_id() const;
-  void clear_source_id() ;
-  const ::io::deephaven::proto::backplane::grpc::TableReference& source_id() const;
-  PROTOBUF_NODISCARD ::io::deephaven::proto::backplane::grpc::TableReference* release_source_id();
-  ::io::deephaven::proto::backplane::grpc::TableReference* mutable_source_id();
-  void set_allocated_source_id(::io::deephaven::proto::backplane::grpc::TableReference* value);
-  void unsafe_arena_set_allocated_source_id(::io::deephaven::proto::backplane::grpc::TableReference* value);
-  ::io::deephaven::proto::backplane::grpc::TableReference* unsafe_arena_release_source_id();
-
-  private:
-  const ::io::deephaven::proto::backplane::grpc::TableReference& _internal_source_id() const;
-  ::io::deephaven::proto::backplane::grpc::TableReference* _internal_mutable_source_id();
-
-  public:
-  // @@protoc_insertion_point(class_scope:io.deephaven.proto.backplane.grpc.DropColumnsRequest)
- private:
-  class _Internal;
-
-  friend class ::google::protobuf::internal::TcParser;
-  static const ::google::protobuf::internal::TcParseTable<
-      2, 3, 2,
-      73, 2>
-      _table_;
-  friend class ::google::protobuf::MessageLite;
-  friend class ::google::protobuf::Arena;
-  template <typename T>
-  friend class ::google::protobuf::Arena::InternalHelper;
-  using InternalArenaConstructable_ = void;
-  using DestructorSkippable_ = void;
-  struct Impl_ {
-
-        inline explicit constexpr Impl_(
-            ::google::protobuf::internal::ConstantInitialized) noexcept;
-        inline explicit Impl_(::google::protobuf::internal::InternalVisibility visibility,
-                              ::google::protobuf::Arena* arena);
-        inline explicit Impl_(::google::protobuf::internal::InternalVisibility visibility,
-                              ::google::protobuf::Arena* arena, const Impl_& from);
-    ::google::protobuf::internal::HasBits<1> _has_bits_;
-    mutable ::google::protobuf::internal::CachedSize _cached_size_;
-    ::google::protobuf::RepeatedPtrField<std::string> column_names_;
-    ::io::deephaven::proto::backplane::grpc::Ticket* result_id_;
-    ::io::deephaven::proto::backplane::grpc::TableReference* source_id_;
-    PROTOBUF_TSAN_DECLARE_MEMBER
-  };
-  union { Impl_ _impl_; };
-  friend struct ::TableStruct_deephaven_2fproto_2ftable_2eproto;
-};// -------------------------------------------------------------------
-
-class CrossJoinTablesRequest final :
-    public ::google::protobuf::Message /* @@protoc_insertion_point(class_definition:io.deephaven.proto.backplane.grpc.CrossJoinTablesRequest) */ {
- public:
-  inline CrossJoinTablesRequest() : CrossJoinTablesRequest(nullptr) {}
-  ~CrossJoinTablesRequest() override;
-  template<typename = void>
-  explicit PROTOBUF_CONSTEXPR CrossJoinTablesRequest(::google::protobuf::internal::ConstantInitialized);
-
-  inline CrossJoinTablesRequest(const CrossJoinTablesRequest& from)
-      : CrossJoinTablesRequest(nullptr, from) {}
-  CrossJoinTablesRequest(CrossJoinTablesRequest&& from) noexcept
-    : CrossJoinTablesRequest() {
-    *this = ::std::move(from);
-  }
-
-  inline CrossJoinTablesRequest& operator=(const CrossJoinTablesRequest& from) {
-    CopyFrom(from);
-    return *this;
-  }
-  inline CrossJoinTablesRequest& operator=(CrossJoinTablesRequest&& from) noexcept {
-    if (this == &from) return *this;
-    if (GetArena() == from.GetArena()
-  #ifdef PROTOBUF_FORCE_COPY_IN_MOVE
-        && GetArena() != nullptr
-  #endif  // !PROTOBUF_FORCE_COPY_IN_MOVE
-    ) {
-      InternalSwap(&from);
-    } else {
-      CopyFrom(from);
-    }
-    return *this;
-  }
-
-  inline const ::google::protobuf::UnknownFieldSet& unknown_fields() const
-      ABSL_ATTRIBUTE_LIFETIME_BOUND {
-    return _internal_metadata_.unknown_fields<::google::protobuf::UnknownFieldSet>(::google::protobuf::UnknownFieldSet::default_instance);
-  }
-  inline ::google::protobuf::UnknownFieldSet* mutable_unknown_fields()
-      ABSL_ATTRIBUTE_LIFETIME_BOUND {
-    return _internal_metadata_.mutable_unknown_fields<::google::protobuf::UnknownFieldSet>();
-  }
-
-  static const ::google::protobuf::Descriptor* descriptor() {
-    return GetDescriptor();
-  }
-  static const ::google::protobuf::Descriptor* GetDescriptor() {
-    return default_instance().GetMetadata().descriptor;
-  }
-  static const ::google::protobuf::Reflection* GetReflection() {
-    return default_instance().GetMetadata().reflection;
-  }
-  static const CrossJoinTablesRequest& default_instance() {
-    return *internal_default_instance();
-  }
-  static inline const CrossJoinTablesRequest* internal_default_instance() {
-    return reinterpret_cast<const CrossJoinTablesRequest*>(
-               &_CrossJoinTablesRequest_default_instance_);
-  }
-  static constexpr int kIndexInFileMessages =
-    50;
-
-  friend void swap(CrossJoinTablesRequest& a, CrossJoinTablesRequest& b) {
-    a.Swap(&b);
-  }
-  inline void Swap(CrossJoinTablesRequest* other) {
-    if (other == this) return;
-  #ifdef PROTOBUF_FORCE_COPY_IN_SWAP
-    if (GetArena() != nullptr &&
-        GetArena() == other->GetArena()) {
-   #else  // PROTOBUF_FORCE_COPY_IN_SWAP
-    if (GetArena() == other->GetArena()) {
-  #endif  // !PROTOBUF_FORCE_COPY_IN_SWAP
-      InternalSwap(other);
-    } else {
-      ::google::protobuf::internal::GenericSwap(this, other);
-    }
-  }
-  void UnsafeArenaSwap(CrossJoinTablesRequest* other) {
-    if (other == this) return;
-    ABSL_DCHECK(GetArena() == other->GetArena());
-    InternalSwap(other);
-  }
-
-  // implements Message ----------------------------------------------
-
-  CrossJoinTablesRequest* New(::google::protobuf::Arena* arena = nullptr) const final {
-    return CreateMaybeMessage<CrossJoinTablesRequest>(arena);
-  }
-  using ::google::protobuf::Message::CopyFrom;
-  void CopyFrom(const CrossJoinTablesRequest& from);
-  using ::google::protobuf::Message::MergeFrom;
-  void MergeFrom( const CrossJoinTablesRequest& from) {
-    CrossJoinTablesRequest::MergeImpl(*this, from);
-  }
-  private:
-  static void MergeImpl(::google::protobuf::Message& to_msg, const ::google::protobuf::Message& from_msg);
-  public:
-  PROTOBUF_ATTRIBUTE_REINITIALIZES void Clear() final;
-  bool IsInitialized() const final;
-
-  ::size_t ByteSizeLong() const final;
-  const char* _InternalParse(const char* ptr, ::google::protobuf::internal::ParseContext* ctx) final;
-  ::uint8_t* _InternalSerialize(
-      ::uint8_t* target, ::google::protobuf::io::EpsCopyOutputStream* stream) const final;
-  int GetCachedSize() const { return _impl_._cached_size_.Get(); }
-
-  private:
-  ::google::protobuf::internal::CachedSize* AccessCachedSize() const final;
-  void SharedCtor(::google::protobuf::Arena* arena);
-  void SharedDtor();
-  void InternalSwap(CrossJoinTablesRequest* other);
-
-  private:
-  friend class ::google::protobuf::internal::AnyMetadata;
-  static ::absl::string_view FullMessageName() {
-    return "io.deephaven.proto.backplane.grpc.CrossJoinTablesRequest";
-  }
-  protected:
-  explicit CrossJoinTablesRequest(::google::protobuf::Arena* arena);
-  CrossJoinTablesRequest(::google::protobuf::Arena* arena, const CrossJoinTablesRequest& from);
-  public:
-
-  static const ClassData _class_data_;
-  const ::google::protobuf::Message::ClassData*GetClassData() const final;
-
-  ::google::protobuf::Metadata GetMetadata() const final;
-
-  // nested types ----------------------------------------------------
-
-  // accessors -------------------------------------------------------
-
-  enum : int {
-    kColumnsToMatchFieldNumber = 4,
-    kColumnsToAddFieldNumber = 5,
-    kResultIdFieldNumber = 1,
-    kLeftIdFieldNumber = 2,
-    kRightIdFieldNumber = 3,
-    kReserveBitsFieldNumber = 6,
-  };
-  // repeated string columns_to_match = 4;
-  int columns_to_match_size() const;
-  private:
-  int _internal_columns_to_match_size() const;
-
-  public:
-  void clear_columns_to_match() ;
-  const std::string& columns_to_match(int index) const;
-  std::string* mutable_columns_to_match(int index);
-  void set_columns_to_match(int index, const std::string& value);
-  void set_columns_to_match(int index, std::string&& value);
-  void set_columns_to_match(int index, const char* value);
-  void set_columns_to_match(int index, const char* value, std::size_t size);
-  void set_columns_to_match(int index, absl::string_view value);
-  std::string* add_columns_to_match();
-  void add_columns_to_match(const std::string& value);
-  void add_columns_to_match(std::string&& value);
-  void add_columns_to_match(const char* value);
-  void add_columns_to_match(const char* value, std::size_t size);
-  void add_columns_to_match(absl::string_view value);
-  const ::google::protobuf::RepeatedPtrField<std::string>& columns_to_match() const;
-  ::google::protobuf::RepeatedPtrField<std::string>* mutable_columns_to_match();
-
-  private:
-  const ::google::protobuf::RepeatedPtrField<std::string>& _internal_columns_to_match() const;
-  ::google::protobuf::RepeatedPtrField<std::string>* _internal_mutable_columns_to_match();
-
-  public:
-  // repeated string columns_to_add = 5;
-  int columns_to_add_size() const;
-  private:
-  int _internal_columns_to_add_size() const;
-
-  public:
-  void clear_columns_to_add() ;
-  const std::string& columns_to_add(int index) const;
-  std::string* mutable_columns_to_add(int index);
-  void set_columns_to_add(int index, const std::string& value);
-  void set_columns_to_add(int index, std::string&& value);
-  void set_columns_to_add(int index, const char* value);
-  void set_columns_to_add(int index, const char* value, std::size_t size);
-  void set_columns_to_add(int index, absl::string_view value);
-  std::string* add_columns_to_add();
-  void add_columns_to_add(const std::string& value);
-  void add_columns_to_add(std::string&& value);
-  void add_columns_to_add(const char* value);
-  void add_columns_to_add(const char* value, std::size_t size);
-  void add_columns_to_add(absl::string_view value);
-  const ::google::protobuf::RepeatedPtrField<std::string>& columns_to_add() const;
-  ::google::protobuf::RepeatedPtrField<std::string>* mutable_columns_to_add();
-
-  private:
-  const ::google::protobuf::RepeatedPtrField<std::string>& _internal_columns_to_add() const;
-  ::google::protobuf::RepeatedPtrField<std::string>* _internal_mutable_columns_to_add();
-
-  public:
-  // .io.deephaven.proto.backplane.grpc.Ticket result_id = 1;
-  bool has_result_id() const;
-  void clear_result_id() ;
-  const ::io::deephaven::proto::backplane::grpc::Ticket& result_id() const;
-  PROTOBUF_NODISCARD ::io::deephaven::proto::backplane::grpc::Ticket* release_result_id();
-  ::io::deephaven::proto::backplane::grpc::Ticket* mutable_result_id();
-  void set_allocated_result_id(::io::deephaven::proto::backplane::grpc::Ticket* value);
-  void unsafe_arena_set_allocated_result_id(::io::deephaven::proto::backplane::grpc::Ticket* value);
-  ::io::deephaven::proto::backplane::grpc::Ticket* unsafe_arena_release_result_id();
-
-  private:
-  const ::io::deephaven::proto::backplane::grpc::Ticket& _internal_result_id() const;
-  ::io::deephaven::proto::backplane::grpc::Ticket* _internal_mutable_result_id();
-
-  public:
-  // .io.deephaven.proto.backplane.grpc.TableReference left_id = 2;
-  bool has_left_id() const;
-  void clear_left_id() ;
-  const ::io::deephaven::proto::backplane::grpc::TableReference& left_id() const;
-  PROTOBUF_NODISCARD ::io::deephaven::proto::backplane::grpc::TableReference* release_left_id();
-  ::io::deephaven::proto::backplane::grpc::TableReference* mutable_left_id();
-  void set_allocated_left_id(::io::deephaven::proto::backplane::grpc::TableReference* value);
-  void unsafe_arena_set_allocated_left_id(::io::deephaven::proto::backplane::grpc::TableReference* value);
-  ::io::deephaven::proto::backplane::grpc::TableReference* unsafe_arena_release_left_id();
-
-  private:
-  const ::io::deephaven::proto::backplane::grpc::TableReference& _internal_left_id() const;
-  ::io::deephaven::proto::backplane::grpc::TableReference* _internal_mutable_left_id();
-
-  public:
-  // .io.deephaven.proto.backplane.grpc.TableReference right_id = 3;
-  bool has_right_id() const;
-  void clear_right_id() ;
-  const ::io::deephaven::proto::backplane::grpc::TableReference& right_id() const;
-  PROTOBUF_NODISCARD ::io::deephaven::proto::backplane::grpc::TableReference* release_right_id();
-  ::io::deephaven::proto::backplane::grpc::TableReference* mutable_right_id();
-  void set_allocated_right_id(::io::deephaven::proto::backplane::grpc::TableReference* value);
-  void unsafe_arena_set_allocated_right_id(::io::deephaven::proto::backplane::grpc::TableReference* value);
-  ::io::deephaven::proto::backplane::grpc::TableReference* unsafe_arena_release_right_id();
-
-  private:
-  const ::io::deephaven::proto::backplane::grpc::TableReference& _internal_right_id() const;
-  ::io::deephaven::proto::backplane::grpc::TableReference* _internal_mutable_right_id();
-
-  public:
-  // int32 reserve_bits = 6;
-  void clear_reserve_bits() ;
-  ::int32_t reserve_bits() const;
-  void set_reserve_bits(::int32_t value);
-
-  private:
-  ::int32_t _internal_reserve_bits() const;
-  void _internal_set_reserve_bits(::int32_t value);
-
-  public:
-  // @@protoc_insertion_point(class_scope:io.deephaven.proto.backplane.grpc.CrossJoinTablesRequest)
- private:
-  class _Internal;
-
-  friend class ::google::protobuf::internal::TcParser;
-  static const ::google::protobuf::internal::TcParseTable<
-      3, 6, 3,
-      95, 2>
-      _table_;
-  friend class ::google::protobuf::MessageLite;
-  friend class ::google::protobuf::Arena;
-  template <typename T>
-  friend class ::google::protobuf::Arena::InternalHelper;
-  using InternalArenaConstructable_ = void;
-  using DestructorSkippable_ = void;
-  struct Impl_ {
-
-        inline explicit constexpr Impl_(
-            ::google::protobuf::internal::ConstantInitialized) noexcept;
-        inline explicit Impl_(::google::protobuf::internal::InternalVisibility visibility,
-                              ::google::protobuf::Arena* arena);
-        inline explicit Impl_(::google::protobuf::internal::InternalVisibility visibility,
-                              ::google::protobuf::Arena* arena, const Impl_& from);
-    ::google::protobuf::internal::HasBits<1> _has_bits_;
-    mutable ::google::protobuf::internal::CachedSize _cached_size_;
-    ::google::protobuf::RepeatedPtrField<std::string> columns_to_match_;
-    ::google::protobuf::RepeatedPtrField<std::string> columns_to_add_;
-    ::io::deephaven::proto::backplane::grpc::Ticket* result_id_;
-    ::io::deephaven::proto::backplane::grpc::TableReference* left_id_;
-    ::io::deephaven::proto::backplane::grpc::TableReference* right_id_;
-    ::int32_t reserve_bits_;
-    PROTOBUF_TSAN_DECLARE_MEMBER
-  };
-  union { Impl_ _impl_; };
-  friend struct ::TableStruct_deephaven_2fproto_2ftable_2eproto;
-};// -------------------------------------------------------------------
-
-class CreateInputTableRequest final :
-    public ::google::protobuf::Message /* @@protoc_insertion_point(class_definition:io.deephaven.proto.backplane.grpc.CreateInputTableRequest) */ {
- public:
-  inline CreateInputTableRequest() : CreateInputTableRequest(nullptr) {}
-  ~CreateInputTableRequest() override;
-  template<typename = void>
-  explicit PROTOBUF_CONSTEXPR CreateInputTableRequest(::google::protobuf::internal::ConstantInitialized);
-
-  inline CreateInputTableRequest(const CreateInputTableRequest& from)
-      : CreateInputTableRequest(nullptr, from) {}
-  CreateInputTableRequest(CreateInputTableRequest&& from) noexcept
-    : CreateInputTableRequest() {
-    *this = ::std::move(from);
-  }
-
-  inline CreateInputTableRequest& operator=(const CreateInputTableRequest& from) {
-    CopyFrom(from);
-    return *this;
-  }
-  inline CreateInputTableRequest& operator=(CreateInputTableRequest&& from) noexcept {
-    if (this == &from) return *this;
-    if (GetArena() == from.GetArena()
-  #ifdef PROTOBUF_FORCE_COPY_IN_MOVE
-        && GetArena() != nullptr
-  #endif  // !PROTOBUF_FORCE_COPY_IN_MOVE
-    ) {
-      InternalSwap(&from);
-    } else {
-      CopyFrom(from);
-    }
-    return *this;
-  }
-
-  inline const ::google::protobuf::UnknownFieldSet& unknown_fields() const
-      ABSL_ATTRIBUTE_LIFETIME_BOUND {
-    return _internal_metadata_.unknown_fields<::google::protobuf::UnknownFieldSet>(::google::protobuf::UnknownFieldSet::default_instance);
-  }
-  inline ::google::protobuf::UnknownFieldSet* mutable_unknown_fields()
-      ABSL_ATTRIBUTE_LIFETIME_BOUND {
-    return _internal_metadata_.mutable_unknown_fields<::google::protobuf::UnknownFieldSet>();
-  }
-
-  static const ::google::protobuf::Descriptor* descriptor() {
-    return GetDescriptor();
-  }
-  static const ::google::protobuf::Descriptor* GetDescriptor() {
-    return default_instance().GetMetadata().descriptor;
-  }
-  static const ::google::protobuf::Reflection* GetReflection() {
-    return default_instance().GetMetadata().reflection;
-  }
-  static const CreateInputTableRequest& default_instance() {
-    return *internal_default_instance();
-  }
-  enum DefinitionCase {
-    kSourceTableId = 2,
-    kSchema = 3,
-    DEFINITION_NOT_SET = 0,
-  };
-
-  static inline const CreateInputTableRequest* internal_default_instance() {
-    return reinterpret_cast<const CreateInputTableRequest*>(
-               &_CreateInputTableRequest_default_instance_);
-  }
-  static constexpr int kIndexInFileMessages =
-    119;
-
-  friend void swap(CreateInputTableRequest& a, CreateInputTableRequest& b) {
-    a.Swap(&b);
-  }
-  inline void Swap(CreateInputTableRequest* other) {
-    if (other == this) return;
-  #ifdef PROTOBUF_FORCE_COPY_IN_SWAP
-    if (GetArena() != nullptr &&
-        GetArena() == other->GetArena()) {
-   #else  // PROTOBUF_FORCE_COPY_IN_SWAP
-    if (GetArena() == other->GetArena()) {
-  #endif  // !PROTOBUF_FORCE_COPY_IN_SWAP
-      InternalSwap(other);
-    } else {
-      ::google::protobuf::internal::GenericSwap(this, other);
-    }
-  }
-  void UnsafeArenaSwap(CreateInputTableRequest* other) {
-    if (other == this) return;
-    ABSL_DCHECK(GetArena() == other->GetArena());
-    InternalSwap(other);
-  }
-
-  // implements Message ----------------------------------------------
-
-  CreateInputTableRequest* New(::google::protobuf::Arena* arena = nullptr) const final {
-    return CreateMaybeMessage<CreateInputTableRequest>(arena);
-  }
-  using ::google::protobuf::Message::CopyFrom;
-  void CopyFrom(const CreateInputTableRequest& from);
-  using ::google::protobuf::Message::MergeFrom;
-  void MergeFrom( const CreateInputTableRequest& from) {
-    CreateInputTableRequest::MergeImpl(*this, from);
-  }
-  private:
-  static void MergeImpl(::google::protobuf::Message& to_msg, const ::google::protobuf::Message& from_msg);
-  public:
-  PROTOBUF_ATTRIBUTE_REINITIALIZES void Clear() final;
-  bool IsInitialized() const final;
-
-  ::size_t ByteSizeLong() const final;
-  const char* _InternalParse(const char* ptr, ::google::protobuf::internal::ParseContext* ctx) final;
-  ::uint8_t* _InternalSerialize(
-      ::uint8_t* target, ::google::protobuf::io::EpsCopyOutputStream* stream) const final;
-  int GetCachedSize() const { return _impl_._cached_size_.Get(); }
-
-  private:
-  ::google::protobuf::internal::CachedSize* AccessCachedSize() const final;
-  void SharedCtor(::google::protobuf::Arena* arena);
-  void SharedDtor();
-  void InternalSwap(CreateInputTableRequest* other);
-
-  private:
-  friend class ::google::protobuf::internal::AnyMetadata;
-  static ::absl::string_view FullMessageName() {
-    return "io.deephaven.proto.backplane.grpc.CreateInputTableRequest";
-  }
-  protected:
-  explicit CreateInputTableRequest(::google::protobuf::Arena* arena);
-  CreateInputTableRequest(::google::protobuf::Arena* arena, const CreateInputTableRequest& from);
-  public:
-
-  static const ClassData _class_data_;
-  const ::google::protobuf::Message::ClassData*GetClassData() const final;
-
-  ::google::protobuf::Metadata GetMetadata() const final;
-
-  // nested types ----------------------------------------------------
-
-  using InputTableKind = CreateInputTableRequest_InputTableKind;
-
-  // accessors -------------------------------------------------------
-
-  enum : int {
-    kResultIdFieldNumber = 1,
-    kKindFieldNumber = 4,
-    kSourceTableIdFieldNumber = 2,
-    kSchemaFieldNumber = 3,
-  };
-  // .io.deephaven.proto.backplane.grpc.Ticket result_id = 1;
-  bool has_result_id() const;
-  void clear_result_id() ;
-  const ::io::deephaven::proto::backplane::grpc::Ticket& result_id() const;
-  PROTOBUF_NODISCARD ::io::deephaven::proto::backplane::grpc::Ticket* release_result_id();
-  ::io::deephaven::proto::backplane::grpc::Ticket* mutable_result_id();
-  void set_allocated_result_id(::io::deephaven::proto::backplane::grpc::Ticket* value);
-  void unsafe_arena_set_allocated_result_id(::io::deephaven::proto::backplane::grpc::Ticket* value);
-  ::io::deephaven::proto::backplane::grpc::Ticket* unsafe_arena_release_result_id();
-
-  private:
-  const ::io::deephaven::proto::backplane::grpc::Ticket& _internal_result_id() const;
-  ::io::deephaven::proto::backplane::grpc::Ticket* _internal_mutable_result_id();
-
-  public:
-  // .io.deephaven.proto.backplane.grpc.CreateInputTableRequest.InputTableKind kind = 4;
-  bool has_kind() const;
-  void clear_kind() ;
-  const ::io::deephaven::proto::backplane::grpc::CreateInputTableRequest_InputTableKind& kind() const;
-  PROTOBUF_NODISCARD ::io::deephaven::proto::backplane::grpc::CreateInputTableRequest_InputTableKind* release_kind();
-  ::io::deephaven::proto::backplane::grpc::CreateInputTableRequest_InputTableKind* mutable_kind();
-  void set_allocated_kind(::io::deephaven::proto::backplane::grpc::CreateInputTableRequest_InputTableKind* value);
-  void unsafe_arena_set_allocated_kind(::io::deephaven::proto::backplane::grpc::CreateInputTableRequest_InputTableKind* value);
-  ::io::deephaven::proto::backplane::grpc::CreateInputTableRequest_InputTableKind* unsafe_arena_release_kind();
-
-  private:
-  const ::io::deephaven::proto::backplane::grpc::CreateInputTableRequest_InputTableKind& _internal_kind() const;
-  ::io::deephaven::proto::backplane::grpc::CreateInputTableRequest_InputTableKind* _internal_mutable_kind();
-
-  public:
-  // .io.deephaven.proto.backplane.grpc.TableReference source_table_id = 2;
-  bool has_source_table_id() const;
-  private:
-  bool _internal_has_source_table_id() const;
-
-  public:
-  void clear_source_table_id() ;
-  const ::io::deephaven::proto::backplane::grpc::TableReference& source_table_id() const;
-  PROTOBUF_NODISCARD ::io::deephaven::proto::backplane::grpc::TableReference* release_source_table_id();
-  ::io::deephaven::proto::backplane::grpc::TableReference* mutable_source_table_id();
-  void set_allocated_source_table_id(::io::deephaven::proto::backplane::grpc::TableReference* value);
-  void unsafe_arena_set_allocated_source_table_id(::io::deephaven::proto::backplane::grpc::TableReference* value);
-  ::io::deephaven::proto::backplane::grpc::TableReference* unsafe_arena_release_source_table_id();
-
-  private:
-  const ::io::deephaven::proto::backplane::grpc::TableReference& _internal_source_table_id() const;
-  ::io::deephaven::proto::backplane::grpc::TableReference* _internal_mutable_source_table_id();
-
-  public:
-  // bytes schema = 3;
-  bool has_schema() const;
-  void clear_schema() ;
-  const std::string& schema() const;
-  template <typename Arg_ = const std::string&, typename... Args_>
-  void set_schema(Arg_&& arg, Args_... args);
-  std::string* mutable_schema();
-  PROTOBUF_NODISCARD std::string* release_schema();
-  void set_allocated_schema(std::string* value);
-
-  private:
-  const std::string& _internal_schema() const;
-  inline PROTOBUF_ALWAYS_INLINE void _internal_set_schema(
-      const std::string& value);
-  std::string* _internal_mutable_schema();
-
-  public:
-  void clear_definition();
-  DefinitionCase definition_case() const;
-  // @@protoc_insertion_point(class_scope:io.deephaven.proto.backplane.grpc.CreateInputTableRequest)
- private:
-  class _Internal;
-  void set_has_source_table_id();
-  void set_has_schema();
-
-  inline bool has_definition() const;
-  inline void clear_has_definition();
-
-  friend class ::google::protobuf::internal::TcParser;
-  static const ::google::protobuf::internal::TcParseTable<
-      1, 4, 3,
-      0, 2>
-      _table_;
-  friend class ::google::protobuf::MessageLite;
-  friend class ::google::protobuf::Arena;
-  template <typename T>
-  friend class ::google::protobuf::Arena::InternalHelper;
-  using InternalArenaConstructable_ = void;
-  using DestructorSkippable_ = void;
-  struct Impl_ {
-
-        inline explicit constexpr Impl_(
-            ::google::protobuf::internal::ConstantInitialized) noexcept;
-        inline explicit Impl_(::google::protobuf::internal::InternalVisibility visibility,
-                              ::google::protobuf::Arena* arena);
-        inline explicit Impl_(::google::protobuf::internal::InternalVisibility visibility,
-                              ::google::protobuf::Arena* arena, const Impl_& from);
-    ::google::protobuf::internal::HasBits<1> _has_bits_;
-    mutable ::google::protobuf::internal::CachedSize _cached_size_;
-    ::io::deephaven::proto::backplane::grpc::Ticket* result_id_;
-    ::io::deephaven::proto::backplane::grpc::CreateInputTableRequest_InputTableKind* kind_;
-    union DefinitionUnion {
-      constexpr DefinitionUnion() : _constinit_{} {}
-        ::google::protobuf::internal::ConstantInitialized _constinit_;
-      ::io::deephaven::proto::backplane::grpc::TableReference* source_table_id_;
-      ::google::protobuf::internal::ArenaStringPtr schema_;
-    } definition_;
-    ::uint32_t _oneof_case_[1];
-
-    PROTOBUF_TSAN_DECLARE_MEMBER
-  };
-  union { Impl_ _impl_; };
-  friend struct ::TableStruct_deephaven_2fproto_2ftable_2eproto;
-};// -------------------------------------------------------------------
-
-class CompareCondition final :
-    public ::google::protobuf::Message /* @@protoc_insertion_point(class_definition:io.deephaven.proto.backplane.grpc.CompareCondition) */ {
- public:
-  inline CompareCondition() : CompareCondition(nullptr) {}
-  ~CompareCondition() override;
-  template<typename = void>
-  explicit PROTOBUF_CONSTEXPR CompareCondition(::google::protobuf::internal::ConstantInitialized);
-
-  inline CompareCondition(const CompareCondition& from)
-      : CompareCondition(nullptr, from) {}
-  CompareCondition(CompareCondition&& from) noexcept
-    : CompareCondition() {
-    *this = ::std::move(from);
-  }
-
-  inline CompareCondition& operator=(const CompareCondition& from) {
-    CopyFrom(from);
-    return *this;
-  }
-  inline CompareCondition& operator=(CompareCondition&& from) noexcept {
-    if (this == &from) return *this;
-    if (GetArena() == from.GetArena()
-  #ifdef PROTOBUF_FORCE_COPY_IN_MOVE
-        && GetArena() != nullptr
-  #endif  // !PROTOBUF_FORCE_COPY_IN_MOVE
-    ) {
-      InternalSwap(&from);
-    } else {
-      CopyFrom(from);
-    }
-    return *this;
-  }
-
-  inline const ::google::protobuf::UnknownFieldSet& unknown_fields() const
-      ABSL_ATTRIBUTE_LIFETIME_BOUND {
-    return _internal_metadata_.unknown_fields<::google::protobuf::UnknownFieldSet>(::google::protobuf::UnknownFieldSet::default_instance);
-  }
-  inline ::google::protobuf::UnknownFieldSet* mutable_unknown_fields()
-      ABSL_ATTRIBUTE_LIFETIME_BOUND {
-    return _internal_metadata_.mutable_unknown_fields<::google::protobuf::UnknownFieldSet>();
-  }
-
-  static const ::google::protobuf::Descriptor* descriptor() {
-    return GetDescriptor();
-  }
-  static const ::google::protobuf::Descriptor* GetDescriptor() {
-    return default_instance().GetMetadata().descriptor;
-  }
-  static const ::google::protobuf::Reflection* GetReflection() {
-    return default_instance().GetMetadata().reflection;
-  }
-  static const CompareCondition& default_instance() {
-    return *internal_default_instance();
-  }
-  static inline const CompareCondition* internal_default_instance() {
-    return reinterpret_cast<const CompareCondition*>(
-               &_CompareCondition_default_instance_);
-  }
-  static constexpr int kIndexInFileMessages =
-    104;
-
-  friend void swap(CompareCondition& a, CompareCondition& b) {
-    a.Swap(&b);
-  }
-  inline void Swap(CompareCondition* other) {
-    if (other == this) return;
-  #ifdef PROTOBUF_FORCE_COPY_IN_SWAP
-    if (GetArena() != nullptr &&
-        GetArena() == other->GetArena()) {
-   #else  // PROTOBUF_FORCE_COPY_IN_SWAP
-    if (GetArena() == other->GetArena()) {
-  #endif  // !PROTOBUF_FORCE_COPY_IN_SWAP
-      InternalSwap(other);
-    } else {
-      ::google::protobuf::internal::GenericSwap(this, other);
-    }
-  }
-  void UnsafeArenaSwap(CompareCondition* other) {
-    if (other == this) return;
-    ABSL_DCHECK(GetArena() == other->GetArena());
-    InternalSwap(other);
-  }
-
-  // implements Message ----------------------------------------------
-
-  CompareCondition* New(::google::protobuf::Arena* arena = nullptr) const final {
-    return CreateMaybeMessage<CompareCondition>(arena);
-  }
-  using ::google::protobuf::Message::CopyFrom;
-  void CopyFrom(const CompareCondition& from);
-  using ::google::protobuf::Message::MergeFrom;
-  void MergeFrom( const CompareCondition& from) {
-    CompareCondition::MergeImpl(*this, from);
-  }
-  private:
-  static void MergeImpl(::google::protobuf::Message& to_msg, const ::google::protobuf::Message& from_msg);
-  public:
-  PROTOBUF_ATTRIBUTE_REINITIALIZES void Clear() final;
-  bool IsInitialized() const final;
-
-  ::size_t ByteSizeLong() const final;
-  const char* _InternalParse(const char* ptr, ::google::protobuf::internal::ParseContext* ctx) final;
-  ::uint8_t* _InternalSerialize(
-      ::uint8_t* target, ::google::protobuf::io::EpsCopyOutputStream* stream) const final;
-  int GetCachedSize() const { return _impl_._cached_size_.Get(); }
-
-  private:
-  ::google::protobuf::internal::CachedSize* AccessCachedSize() const final;
-  void SharedCtor(::google::protobuf::Arena* arena);
-  void SharedDtor();
-  void InternalSwap(CompareCondition* other);
-
-  private:
-  friend class ::google::protobuf::internal::AnyMetadata;
-  static ::absl::string_view FullMessageName() {
-    return "io.deephaven.proto.backplane.grpc.CompareCondition";
-  }
-  protected:
-  explicit CompareCondition(::google::protobuf::Arena* arena);
-  CompareCondition(::google::protobuf::Arena* arena, const CompareCondition& from);
-  public:
-
-  static const ClassData _class_data_;
-  const ::google::protobuf::Message::ClassData*GetClassData() const final;
-
-  ::google::protobuf::Metadata GetMetadata() const final;
-
-  // nested types ----------------------------------------------------
-
-  using CompareOperation = CompareCondition_CompareOperation;
-  static constexpr CompareOperation LESS_THAN = CompareCondition_CompareOperation_LESS_THAN;
-  static constexpr CompareOperation LESS_THAN_OR_EQUAL = CompareCondition_CompareOperation_LESS_THAN_OR_EQUAL;
-  static constexpr CompareOperation GREATER_THAN = CompareCondition_CompareOperation_GREATER_THAN;
-  static constexpr CompareOperation GREATER_THAN_OR_EQUAL = CompareCondition_CompareOperation_GREATER_THAN_OR_EQUAL;
-  static constexpr CompareOperation EQUALS = CompareCondition_CompareOperation_EQUALS;
-  static constexpr CompareOperation NOT_EQUALS = CompareCondition_CompareOperation_NOT_EQUALS;
-  static inline bool CompareOperation_IsValid(int value) {
-    return CompareCondition_CompareOperation_IsValid(value);
-  }
-  static constexpr CompareOperation CompareOperation_MIN = CompareCondition_CompareOperation_CompareOperation_MIN;
-  static constexpr CompareOperation CompareOperation_MAX = CompareCondition_CompareOperation_CompareOperation_MAX;
-  static constexpr int CompareOperation_ARRAYSIZE = CompareCondition_CompareOperation_CompareOperation_ARRAYSIZE;
-  static inline const ::google::protobuf::EnumDescriptor* CompareOperation_descriptor() {
-    return CompareCondition_CompareOperation_descriptor();
-  }
-  template <typename T>
-  static inline const std::string& CompareOperation_Name(T value) {
-    return CompareCondition_CompareOperation_Name(value);
-  }
-  static inline bool CompareOperation_Parse(absl::string_view name, CompareOperation* value) {
-    return CompareCondition_CompareOperation_Parse(name, value);
-  }
-
-  // accessors -------------------------------------------------------
-
-  enum : int {
-    kLhsFieldNumber = 3,
-    kRhsFieldNumber = 4,
-    kOperationFieldNumber = 1,
-    kCaseSensitivityFieldNumber = 2,
-  };
-  // .io.deephaven.proto.backplane.grpc.Value lhs = 3;
-  bool has_lhs() const;
-  void clear_lhs() ;
-  const ::io::deephaven::proto::backplane::grpc::Value& lhs() const;
-  PROTOBUF_NODISCARD ::io::deephaven::proto::backplane::grpc::Value* release_lhs();
-  ::io::deephaven::proto::backplane::grpc::Value* mutable_lhs();
-  void set_allocated_lhs(::io::deephaven::proto::backplane::grpc::Value* value);
-  void unsafe_arena_set_allocated_lhs(::io::deephaven::proto::backplane::grpc::Value* value);
-  ::io::deephaven::proto::backplane::grpc::Value* unsafe_arena_release_lhs();
-
-  private:
-  const ::io::deephaven::proto::backplane::grpc::Value& _internal_lhs() const;
-  ::io::deephaven::proto::backplane::grpc::Value* _internal_mutable_lhs();
-
-  public:
-  // .io.deephaven.proto.backplane.grpc.Value rhs = 4;
-  bool has_rhs() const;
-  void clear_rhs() ;
-  const ::io::deephaven::proto::backplane::grpc::Value& rhs() const;
-  PROTOBUF_NODISCARD ::io::deephaven::proto::backplane::grpc::Value* release_rhs();
-  ::io::deephaven::proto::backplane::grpc::Value* mutable_rhs();
-  void set_allocated_rhs(::io::deephaven::proto::backplane::grpc::Value* value);
-  void unsafe_arena_set_allocated_rhs(::io::deephaven::proto::backplane::grpc::Value* value);
-  ::io::deephaven::proto::backplane::grpc::Value* unsafe_arena_release_rhs();
-
-  private:
-  const ::io::deephaven::proto::backplane::grpc::Value& _internal_rhs() const;
-  ::io::deephaven::proto::backplane::grpc::Value* _internal_mutable_rhs();
-
-  public:
-  // .io.deephaven.proto.backplane.grpc.CompareCondition.CompareOperation operation = 1;
-  void clear_operation() ;
-  ::io::deephaven::proto::backplane::grpc::CompareCondition_CompareOperation operation() const;
-  void set_operation(::io::deephaven::proto::backplane::grpc::CompareCondition_CompareOperation value);
-
-  private:
-  ::io::deephaven::proto::backplane::grpc::CompareCondition_CompareOperation _internal_operation() const;
-  void _internal_set_operation(::io::deephaven::proto::backplane::grpc::CompareCondition_CompareOperation value);
-
-  public:
-  // .io.deephaven.proto.backplane.grpc.CaseSensitivity case_sensitivity = 2;
-  void clear_case_sensitivity() ;
-  ::io::deephaven::proto::backplane::grpc::CaseSensitivity case_sensitivity() const;
-  void set_case_sensitivity(::io::deephaven::proto::backplane::grpc::CaseSensitivity value);
-
-  private:
-  ::io::deephaven::proto::backplane::grpc::CaseSensitivity _internal_case_sensitivity() const;
-  void _internal_set_case_sensitivity(::io::deephaven::proto::backplane::grpc::CaseSensitivity value);
-
-  public:
-  // @@protoc_insertion_point(class_scope:io.deephaven.proto.backplane.grpc.CompareCondition)
- private:
-  class _Internal;
-
-  friend class ::google::protobuf::internal::TcParser;
-  static const ::google::protobuf::internal::TcParseTable<
-      2, 4, 2,
-      0, 2>
-      _table_;
-  friend class ::google::protobuf::MessageLite;
-  friend class ::google::protobuf::Arena;
-  template <typename T>
-  friend class ::google::protobuf::Arena::InternalHelper;
-  using InternalArenaConstructable_ = void;
-  using DestructorSkippable_ = void;
-  struct Impl_ {
-
-        inline explicit constexpr Impl_(
-            ::google::protobuf::internal::ConstantInitialized) noexcept;
-        inline explicit Impl_(::google::protobuf::internal::InternalVisibility visibility,
-                              ::google::protobuf::Arena* arena);
-        inline explicit Impl_(::google::protobuf::internal::InternalVisibility visibility,
-                              ::google::protobuf::Arena* arena, const Impl_& from);
-    ::google::protobuf::internal::HasBits<1> _has_bits_;
-    mutable ::google::protobuf::internal::CachedSize _cached_size_;
-    ::io::deephaven::proto::backplane::grpc::Value* lhs_;
-    ::io::deephaven::proto::backplane::grpc::Value* rhs_;
-    int operation_;
-    int case_sensitivity_;
-    PROTOBUF_TSAN_DECLARE_MEMBER
-  };
-  union { Impl_ _impl_; };
-  friend struct ::TableStruct_deephaven_2fproto_2ftable_2eproto;
-};// -------------------------------------------------------------------
-
-class ComboAggregateRequest final :
-    public ::google::protobuf::Message /* @@protoc_insertion_point(class_definition:io.deephaven.proto.backplane.grpc.ComboAggregateRequest) */ {
- public:
-  inline ComboAggregateRequest() : ComboAggregateRequest(nullptr) {}
-  ~ComboAggregateRequest() override;
-  template<typename = void>
-  explicit PROTOBUF_CONSTEXPR ComboAggregateRequest(::google::protobuf::internal::ConstantInitialized);
-
-  inline ComboAggregateRequest(const ComboAggregateRequest& from)
-      : ComboAggregateRequest(nullptr, from) {}
-  ComboAggregateRequest(ComboAggregateRequest&& from) noexcept
-    : ComboAggregateRequest() {
-    *this = ::std::move(from);
-  }
-
-  inline ComboAggregateRequest& operator=(const ComboAggregateRequest& from) {
-    CopyFrom(from);
-    return *this;
-  }
-  inline ComboAggregateRequest& operator=(ComboAggregateRequest&& from) noexcept {
-    if (this == &from) return *this;
-    if (GetArena() == from.GetArena()
-  #ifdef PROTOBUF_FORCE_COPY_IN_MOVE
-        && GetArena() != nullptr
-  #endif  // !PROTOBUF_FORCE_COPY_IN_MOVE
-    ) {
-      InternalSwap(&from);
-    } else {
-      CopyFrom(from);
-    }
-    return *this;
-  }
-
-  inline const ::google::protobuf::UnknownFieldSet& unknown_fields() const
-      ABSL_ATTRIBUTE_LIFETIME_BOUND {
-    return _internal_metadata_.unknown_fields<::google::protobuf::UnknownFieldSet>(::google::protobuf::UnknownFieldSet::default_instance);
-  }
-  inline ::google::protobuf::UnknownFieldSet* mutable_unknown_fields()
-      ABSL_ATTRIBUTE_LIFETIME_BOUND {
-    return _internal_metadata_.mutable_unknown_fields<::google::protobuf::UnknownFieldSet>();
-  }
-
-  static const ::google::protobuf::Descriptor* descriptor() {
-    return GetDescriptor();
-  }
-  static const ::google::protobuf::Descriptor* GetDescriptor() {
-    return default_instance().GetMetadata().descriptor;
-  }
-  static const ::google::protobuf::Reflection* GetReflection() {
-    return default_instance().GetMetadata().reflection;
-  }
-  static const ComboAggregateRequest& default_instance() {
-    return *internal_default_instance();
-  }
-  static inline const ComboAggregateRequest* internal_default_instance() {
-    return reinterpret_cast<const ComboAggregateRequest*>(
-               &_ComboAggregateRequest_default_instance_);
-  }
-  static constexpr int kIndexInFileMessages =
-    60;
-
-  friend void swap(ComboAggregateRequest& a, ComboAggregateRequest& b) {
-    a.Swap(&b);
-  }
-  inline void Swap(ComboAggregateRequest* other) {
-    if (other == this) return;
-  #ifdef PROTOBUF_FORCE_COPY_IN_SWAP
-    if (GetArena() != nullptr &&
-        GetArena() == other->GetArena()) {
-   #else  // PROTOBUF_FORCE_COPY_IN_SWAP
-    if (GetArena() == other->GetArena()) {
-  #endif  // !PROTOBUF_FORCE_COPY_IN_SWAP
-      InternalSwap(other);
-    } else {
-      ::google::protobuf::internal::GenericSwap(this, other);
-    }
-  }
-  void UnsafeArenaSwap(ComboAggregateRequest* other) {
-    if (other == this) return;
-    ABSL_DCHECK(GetArena() == other->GetArena());
-    InternalSwap(other);
-  }
-
-  // implements Message ----------------------------------------------
-
-  ComboAggregateRequest* New(::google::protobuf::Arena* arena = nullptr) const final {
-    return CreateMaybeMessage<ComboAggregateRequest>(arena);
-  }
-  using ::google::protobuf::Message::CopyFrom;
-  void CopyFrom(const ComboAggregateRequest& from);
-  using ::google::protobuf::Message::MergeFrom;
-  void MergeFrom( const ComboAggregateRequest& from) {
-    ComboAggregateRequest::MergeImpl(*this, from);
-  }
-  private:
-  static void MergeImpl(::google::protobuf::Message& to_msg, const ::google::protobuf::Message& from_msg);
-  public:
-  PROTOBUF_ATTRIBUTE_REINITIALIZES void Clear() final;
-  bool IsInitialized() const final;
-
-  ::size_t ByteSizeLong() const final;
-  const char* _InternalParse(const char* ptr, ::google::protobuf::internal::ParseContext* ctx) final;
-  ::uint8_t* _InternalSerialize(
-      ::uint8_t* target, ::google::protobuf::io::EpsCopyOutputStream* stream) const final;
-  int GetCachedSize() const { return _impl_._cached_size_.Get(); }
-
-  private:
-  ::google::protobuf::internal::CachedSize* AccessCachedSize() const final;
-  void SharedCtor(::google::protobuf::Arena* arena);
-  void SharedDtor();
-  void InternalSwap(ComboAggregateRequest* other);
-
-  private:
-  friend class ::google::protobuf::internal::AnyMetadata;
-  static ::absl::string_view FullMessageName() {
-    return "io.deephaven.proto.backplane.grpc.ComboAggregateRequest";
-  }
-  protected:
-  explicit ComboAggregateRequest(::google::protobuf::Arena* arena);
-  ComboAggregateRequest(::google::protobuf::Arena* arena, const ComboAggregateRequest& from);
-  public:
-
-  static const ClassData _class_data_;
-  const ::google::protobuf::Message::ClassData*GetClassData() const final;
-
-  ::google::protobuf::Metadata GetMetadata() const final;
-
-  // nested types ----------------------------------------------------
-
-  using Aggregate = ComboAggregateRequest_Aggregate;
-
-  using AggType = ComboAggregateRequest_AggType;
-  static constexpr AggType SUM = ComboAggregateRequest_AggType_SUM;
-  static constexpr AggType ABS_SUM = ComboAggregateRequest_AggType_ABS_SUM;
-  static constexpr AggType GROUP = ComboAggregateRequest_AggType_GROUP;
-  static constexpr AggType AVG = ComboAggregateRequest_AggType_AVG;
-  static constexpr AggType COUNT = ComboAggregateRequest_AggType_COUNT;
-  static constexpr AggType FIRST = ComboAggregateRequest_AggType_FIRST;
-  static constexpr AggType LAST = ComboAggregateRequest_AggType_LAST;
-  static constexpr AggType MIN = ComboAggregateRequest_AggType_MIN;
-  static constexpr AggType MAX = ComboAggregateRequest_AggType_MAX;
-  static constexpr AggType MEDIAN = ComboAggregateRequest_AggType_MEDIAN;
-  static constexpr AggType PERCENTILE = ComboAggregateRequest_AggType_PERCENTILE;
-  static constexpr AggType STD = ComboAggregateRequest_AggType_STD;
-  static constexpr AggType VAR = ComboAggregateRequest_AggType_VAR;
-  static constexpr AggType WEIGHTED_AVG = ComboAggregateRequest_AggType_WEIGHTED_AVG;
-  static inline bool AggType_IsValid(int value) {
-    return ComboAggregateRequest_AggType_IsValid(value);
-  }
-  static constexpr AggType AggType_MIN = ComboAggregateRequest_AggType_AggType_MIN;
-  static constexpr AggType AggType_MAX = ComboAggregateRequest_AggType_AggType_MAX;
-  static constexpr int AggType_ARRAYSIZE = ComboAggregateRequest_AggType_AggType_ARRAYSIZE;
-  static inline const ::google::protobuf::EnumDescriptor* AggType_descriptor() {
-    return ComboAggregateRequest_AggType_descriptor();
-  }
-  template <typename T>
-  static inline const std::string& AggType_Name(T value) {
-    return ComboAggregateRequest_AggType_Name(value);
-  }
-  static inline bool AggType_Parse(absl::string_view name, AggType* value) {
-    return ComboAggregateRequest_AggType_Parse(name, value);
-  }
-
-  // accessors -------------------------------------------------------
-
-  enum : int {
-    kAggregatesFieldNumber = 3,
-    kGroupByColumnsFieldNumber = 4,
-    kResultIdFieldNumber = 1,
-    kSourceIdFieldNumber = 2,
-    kForceComboFieldNumber = 5,
-  };
-  // repeated .io.deephaven.proto.backplane.grpc.ComboAggregateRequest.Aggregate aggregates = 3;
-  int aggregates_size() const;
-  private:
-  int _internal_aggregates_size() const;
-
-  public:
-  void clear_aggregates() ;
-  ::io::deephaven::proto::backplane::grpc::ComboAggregateRequest_Aggregate* mutable_aggregates(int index);
-  ::google::protobuf::RepeatedPtrField< ::io::deephaven::proto::backplane::grpc::ComboAggregateRequest_Aggregate >*
-      mutable_aggregates();
-  private:
-  const ::google::protobuf::RepeatedPtrField<::io::deephaven::proto::backplane::grpc::ComboAggregateRequest_Aggregate>& _internal_aggregates() const;
-  ::google::protobuf::RepeatedPtrField<::io::deephaven::proto::backplane::grpc::ComboAggregateRequest_Aggregate>* _internal_mutable_aggregates();
-  public:
-  const ::io::deephaven::proto::backplane::grpc::ComboAggregateRequest_Aggregate& aggregates(int index) const;
-  ::io::deephaven::proto::backplane::grpc::ComboAggregateRequest_Aggregate* add_aggregates();
-  const ::google::protobuf::RepeatedPtrField< ::io::deephaven::proto::backplane::grpc::ComboAggregateRequest_Aggregate >&
-      aggregates() const;
-  // repeated string group_by_columns = 4;
-  int group_by_columns_size() const;
-  private:
-  int _internal_group_by_columns_size() const;
-
-  public:
-  void clear_group_by_columns() ;
-  const std::string& group_by_columns(int index) const;
-  std::string* mutable_group_by_columns(int index);
-  void set_group_by_columns(int index, const std::string& value);
-  void set_group_by_columns(int index, std::string&& value);
-  void set_group_by_columns(int index, const char* value);
-  void set_group_by_columns(int index, const char* value, std::size_t size);
-  void set_group_by_columns(int index, absl::string_view value);
-  std::string* add_group_by_columns();
-  void add_group_by_columns(const std::string& value);
-  void add_group_by_columns(std::string&& value);
-  void add_group_by_columns(const char* value);
-  void add_group_by_columns(const char* value, std::size_t size);
-  void add_group_by_columns(absl::string_view value);
-  const ::google::protobuf::RepeatedPtrField<std::string>& group_by_columns() const;
-  ::google::protobuf::RepeatedPtrField<std::string>* mutable_group_by_columns();
-
-  private:
-  const ::google::protobuf::RepeatedPtrField<std::string>& _internal_group_by_columns() const;
-  ::google::protobuf::RepeatedPtrField<std::string>* _internal_mutable_group_by_columns();
-
-  public:
-  // .io.deephaven.proto.backplane.grpc.Ticket result_id = 1;
-  bool has_result_id() const;
-  void clear_result_id() ;
-  const ::io::deephaven::proto::backplane::grpc::Ticket& result_id() const;
-  PROTOBUF_NODISCARD ::io::deephaven::proto::backplane::grpc::Ticket* release_result_id();
-  ::io::deephaven::proto::backplane::grpc::Ticket* mutable_result_id();
-  void set_allocated_result_id(::io::deephaven::proto::backplane::grpc::Ticket* value);
-  void unsafe_arena_set_allocated_result_id(::io::deephaven::proto::backplane::grpc::Ticket* value);
-  ::io::deephaven::proto::backplane::grpc::Ticket* unsafe_arena_release_result_id();
-
-  private:
-  const ::io::deephaven::proto::backplane::grpc::Ticket& _internal_result_id() const;
-  ::io::deephaven::proto::backplane::grpc::Ticket* _internal_mutable_result_id();
-
-  public:
-  // .io.deephaven.proto.backplane.grpc.TableReference source_id = 2;
-  bool has_source_id() const;
-  void clear_source_id() ;
-  const ::io::deephaven::proto::backplane::grpc::TableReference& source_id() const;
-  PROTOBUF_NODISCARD ::io::deephaven::proto::backplane::grpc::TableReference* release_source_id();
-  ::io::deephaven::proto::backplane::grpc::TableReference* mutable_source_id();
-  void set_allocated_source_id(::io::deephaven::proto::backplane::grpc::TableReference* value);
-  void unsafe_arena_set_allocated_source_id(::io::deephaven::proto::backplane::grpc::TableReference* value);
-  ::io::deephaven::proto::backplane::grpc::TableReference* unsafe_arena_release_source_id();
-
-  private:
-  const ::io::deephaven::proto::backplane::grpc::TableReference& _internal_source_id() const;
-  ::io::deephaven::proto::backplane::grpc::TableReference* _internal_mutable_source_id();
-
-  public:
-  // bool force_combo = 5;
-  void clear_force_combo() ;
-  bool force_combo() const;
-  void set_force_combo(bool value);
-
-  private:
-  bool _internal_force_combo() const;
-  void _internal_set_force_combo(bool value);
-
-  public:
-  // @@protoc_insertion_point(class_scope:io.deephaven.proto.backplane.grpc.ComboAggregateRequest)
- private:
-  class _Internal;
-
-  friend class ::google::protobuf::internal::TcParser;
-  static const ::google::protobuf::internal::TcParseTable<
-      3, 5, 3,
-      80, 2>
-      _table_;
-  friend class ::google::protobuf::MessageLite;
-  friend class ::google::protobuf::Arena;
-  template <typename T>
-  friend class ::google::protobuf::Arena::InternalHelper;
-  using InternalArenaConstructable_ = void;
-  using DestructorSkippable_ = void;
-  struct Impl_ {
-
-        inline explicit constexpr Impl_(
-            ::google::protobuf::internal::ConstantInitialized) noexcept;
-        inline explicit Impl_(::google::protobuf::internal::InternalVisibility visibility,
-                              ::google::protobuf::Arena* arena);
-        inline explicit Impl_(::google::protobuf::internal::InternalVisibility visibility,
-                              ::google::protobuf::Arena* arena, const Impl_& from);
-    ::google::protobuf::internal::HasBits<1> _has_bits_;
-    mutable ::google::protobuf::internal::CachedSize _cached_size_;
-    ::google::protobuf::RepeatedPtrField< ::io::deephaven::proto::backplane::grpc::ComboAggregateRequest_Aggregate > aggregates_;
-    ::google::protobuf::RepeatedPtrField<std::string> group_by_columns_;
-    ::io::deephaven::proto::backplane::grpc::Ticket* result_id_;
-    ::io::deephaven::proto::backplane::grpc::TableReference* source_id_;
-    bool force_combo_;
-    PROTOBUF_TSAN_DECLARE_MEMBER
-  };
-  union { Impl_ _impl_; };
-  friend struct ::TableStruct_deephaven_2fproto_2ftable_2eproto;
-};// -------------------------------------------------------------------
-
-class ColumnStatisticsRequest final :
-    public ::google::protobuf::Message /* @@protoc_insertion_point(class_definition:io.deephaven.proto.backplane.grpc.ColumnStatisticsRequest) */ {
- public:
-  inline ColumnStatisticsRequest() : ColumnStatisticsRequest(nullptr) {}
-  ~ColumnStatisticsRequest() override;
-  template<typename = void>
-  explicit PROTOBUF_CONSTEXPR ColumnStatisticsRequest(::google::protobuf::internal::ConstantInitialized);
-
-  inline ColumnStatisticsRequest(const ColumnStatisticsRequest& from)
-      : ColumnStatisticsRequest(nullptr, from) {}
-  ColumnStatisticsRequest(ColumnStatisticsRequest&& from) noexcept
-    : ColumnStatisticsRequest() {
-    *this = ::std::move(from);
-  }
-
-  inline ColumnStatisticsRequest& operator=(const ColumnStatisticsRequest& from) {
-    CopyFrom(from);
-    return *this;
-  }
-  inline ColumnStatisticsRequest& operator=(ColumnStatisticsRequest&& from) noexcept {
-    if (this == &from) return *this;
-    if (GetArena() == from.GetArena()
-  #ifdef PROTOBUF_FORCE_COPY_IN_MOVE
-        && GetArena() != nullptr
-  #endif  // !PROTOBUF_FORCE_COPY_IN_MOVE
-    ) {
-      InternalSwap(&from);
-    } else {
-      CopyFrom(from);
-    }
-    return *this;
-  }
-
-  inline const ::google::protobuf::UnknownFieldSet& unknown_fields() const
-      ABSL_ATTRIBUTE_LIFETIME_BOUND {
-    return _internal_metadata_.unknown_fields<::google::protobuf::UnknownFieldSet>(::google::protobuf::UnknownFieldSet::default_instance);
-  }
-  inline ::google::protobuf::UnknownFieldSet* mutable_unknown_fields()
-      ABSL_ATTRIBUTE_LIFETIME_BOUND {
-    return _internal_metadata_.mutable_unknown_fields<::google::protobuf::UnknownFieldSet>();
-  }
-
-  static const ::google::protobuf::Descriptor* descriptor() {
-    return GetDescriptor();
-  }
-  static const ::google::protobuf::Descriptor* GetDescriptor() {
-    return default_instance().GetMetadata().descriptor;
-  }
-  static const ::google::protobuf::Reflection* GetReflection() {
-    return default_instance().GetMetadata().reflection;
-  }
-  static const ColumnStatisticsRequest& default_instance() {
-    return *internal_default_instance();
-  }
-  static inline const ColumnStatisticsRequest* internal_default_instance() {
-    return reinterpret_cast<const ColumnStatisticsRequest*>(
-               &_ColumnStatisticsRequest_default_instance_);
-  }
-  static constexpr int kIndexInFileMessages =
-    121;
-
-  friend void swap(ColumnStatisticsRequest& a, ColumnStatisticsRequest& b) {
-    a.Swap(&b);
-  }
-  inline void Swap(ColumnStatisticsRequest* other) {
-    if (other == this) return;
-  #ifdef PROTOBUF_FORCE_COPY_IN_SWAP
-    if (GetArena() != nullptr &&
-        GetArena() == other->GetArena()) {
-   #else  // PROTOBUF_FORCE_COPY_IN_SWAP
-    if (GetArena() == other->GetArena()) {
-  #endif  // !PROTOBUF_FORCE_COPY_IN_SWAP
-      InternalSwap(other);
-    } else {
-      ::google::protobuf::internal::GenericSwap(this, other);
-    }
-  }
-  void UnsafeArenaSwap(ColumnStatisticsRequest* other) {
-    if (other == this) return;
-    ABSL_DCHECK(GetArena() == other->GetArena());
-    InternalSwap(other);
-  }
-
-  // implements Message ----------------------------------------------
-
-  ColumnStatisticsRequest* New(::google::protobuf::Arena* arena = nullptr) const final {
-    return CreateMaybeMessage<ColumnStatisticsRequest>(arena);
-  }
-  using ::google::protobuf::Message::CopyFrom;
-  void CopyFrom(const ColumnStatisticsRequest& from);
-  using ::google::protobuf::Message::MergeFrom;
-  void MergeFrom( const ColumnStatisticsRequest& from) {
-    ColumnStatisticsRequest::MergeImpl(*this, from);
-  }
-  private:
-  static void MergeImpl(::google::protobuf::Message& to_msg, const ::google::protobuf::Message& from_msg);
-  public:
-  PROTOBUF_ATTRIBUTE_REINITIALIZES void Clear() final;
-  bool IsInitialized() const final;
-
-  ::size_t ByteSizeLong() const final;
-  const char* _InternalParse(const char* ptr, ::google::protobuf::internal::ParseContext* ctx) final;
-  ::uint8_t* _InternalSerialize(
-      ::uint8_t* target, ::google::protobuf::io::EpsCopyOutputStream* stream) const final;
-  int GetCachedSize() const { return _impl_._cached_size_.Get(); }
-
-  private:
-  ::google::protobuf::internal::CachedSize* AccessCachedSize() const final;
-  void SharedCtor(::google::protobuf::Arena* arena);
-  void SharedDtor();
-  void InternalSwap(ColumnStatisticsRequest* other);
-
-  private:
-  friend class ::google::protobuf::internal::AnyMetadata;
-  static ::absl::string_view FullMessageName() {
-    return "io.deephaven.proto.backplane.grpc.ColumnStatisticsRequest";
-  }
-  protected:
-  explicit ColumnStatisticsRequest(::google::protobuf::Arena* arena);
-  ColumnStatisticsRequest(::google::protobuf::Arena* arena, const ColumnStatisticsRequest& from);
-  public:
-
-  static const ClassData _class_data_;
-  const ::google::protobuf::Message::ClassData*GetClassData() const final;
-
-  ::google::protobuf::Metadata GetMetadata() const final;
-
-  // nested types ----------------------------------------------------
-
-  // accessors -------------------------------------------------------
-
-  enum : int {
-    kColumnNameFieldNumber = 3,
-    kResultIdFieldNumber = 1,
-    kSourceIdFieldNumber = 2,
-    kUniqueValueLimitFieldNumber = 4,
-  };
-  // string column_name = 3;
-  void clear_column_name() ;
-  const std::string& column_name() const;
-  template <typename Arg_ = const std::string&, typename... Args_>
-  void set_column_name(Arg_&& arg, Args_... args);
-  std::string* mutable_column_name();
-  PROTOBUF_NODISCARD std::string* release_column_name();
-  void set_allocated_column_name(std::string* value);
-
-  private:
-  const std::string& _internal_column_name() const;
-  inline PROTOBUF_ALWAYS_INLINE void _internal_set_column_name(
-      const std::string& value);
-  std::string* _internal_mutable_column_name();
-
-  public:
-  // .io.deephaven.proto.backplane.grpc.Ticket result_id = 1;
-  bool has_result_id() const;
-  void clear_result_id() ;
-  const ::io::deephaven::proto::backplane::grpc::Ticket& result_id() const;
-  PROTOBUF_NODISCARD ::io::deephaven::proto::backplane::grpc::Ticket* release_result_id();
-  ::io::deephaven::proto::backplane::grpc::Ticket* mutable_result_id();
-  void set_allocated_result_id(::io::deephaven::proto::backplane::grpc::Ticket* value);
-  void unsafe_arena_set_allocated_result_id(::io::deephaven::proto::backplane::grpc::Ticket* value);
-  ::io::deephaven::proto::backplane::grpc::Ticket* unsafe_arena_release_result_id();
-
-  private:
-  const ::io::deephaven::proto::backplane::grpc::Ticket& _internal_result_id() const;
-  ::io::deephaven::proto::backplane::grpc::Ticket* _internal_mutable_result_id();
-
-  public:
-  // .io.deephaven.proto.backplane.grpc.TableReference source_id = 2;
-  bool has_source_id() const;
-  void clear_source_id() ;
-  const ::io::deephaven::proto::backplane::grpc::TableReference& source_id() const;
-  PROTOBUF_NODISCARD ::io::deephaven::proto::backplane::grpc::TableReference* release_source_id();
-  ::io::deephaven::proto::backplane::grpc::TableReference* mutable_source_id();
-  void set_allocated_source_id(::io::deephaven::proto::backplane::grpc::TableReference* value);
-  void unsafe_arena_set_allocated_source_id(::io::deephaven::proto::backplane::grpc::TableReference* value);
-  ::io::deephaven::proto::backplane::grpc::TableReference* unsafe_arena_release_source_id();
-
-  private:
-  const ::io::deephaven::proto::backplane::grpc::TableReference& _internal_source_id() const;
-  ::io::deephaven::proto::backplane::grpc::TableReference* _internal_mutable_source_id();
-
-  public:
-  // optional int32 unique_value_limit = 4;
-  bool has_unique_value_limit() const;
-  void clear_unique_value_limit() ;
-  ::int32_t unique_value_limit() const;
-  void set_unique_value_limit(::int32_t value);
-
-  private:
-  ::int32_t _internal_unique_value_limit() const;
-  void _internal_set_unique_value_limit(::int32_t value);
-
-  public:
-  // @@protoc_insertion_point(class_scope:io.deephaven.proto.backplane.grpc.ColumnStatisticsRequest)
- private:
-  class _Internal;
-
-  friend class ::google::protobuf::internal::TcParser;
-  static const ::google::protobuf::internal::TcParseTable<
-      2, 4, 2,
-      77, 2>
-      _table_;
-  friend class ::google::protobuf::MessageLite;
-  friend class ::google::protobuf::Arena;
-  template <typename T>
-  friend class ::google::protobuf::Arena::InternalHelper;
-  using InternalArenaConstructable_ = void;
-  using DestructorSkippable_ = void;
-  struct Impl_ {
-
-        inline explicit constexpr Impl_(
-            ::google::protobuf::internal::ConstantInitialized) noexcept;
-        inline explicit Impl_(::google::protobuf::internal::InternalVisibility visibility,
-                              ::google::protobuf::Arena* arena);
-        inline explicit Impl_(::google::protobuf::internal::InternalVisibility visibility,
-                              ::google::protobuf::Arena* arena, const Impl_& from);
-    ::google::protobuf::internal::HasBits<1> _has_bits_;
-    mutable ::google::protobuf::internal::CachedSize _cached_size_;
-    ::google::protobuf::internal::ArenaStringPtr column_name_;
-    ::io::deephaven::proto::backplane::grpc::Ticket* result_id_;
-    ::io::deephaven::proto::backplane::grpc::TableReference* source_id_;
-    ::int32_t unique_value_limit_;
-    PROTOBUF_TSAN_DECLARE_MEMBER
-  };
-  union { Impl_ _impl_; };
-  friend struct ::TableStruct_deephaven_2fproto_2ftable_2eproto;
-};// -------------------------------------------------------------------
-
-class AsOfJoinTablesRequest final :
-    public ::google::protobuf::Message /* @@protoc_insertion_point(class_definition:io.deephaven.proto.backplane.grpc.AsOfJoinTablesRequest) */ {
- public:
-  inline AsOfJoinTablesRequest() : AsOfJoinTablesRequest(nullptr) {}
-  ~AsOfJoinTablesRequest() override;
-  template<typename = void>
-  explicit PROTOBUF_CONSTEXPR AsOfJoinTablesRequest(::google::protobuf::internal::ConstantInitialized);
-
-  inline AsOfJoinTablesRequest(const AsOfJoinTablesRequest& from)
-      : AsOfJoinTablesRequest(nullptr, from) {}
-  AsOfJoinTablesRequest(AsOfJoinTablesRequest&& from) noexcept
-    : AsOfJoinTablesRequest() {
-    *this = ::std::move(from);
-  }
-
-  inline AsOfJoinTablesRequest& operator=(const AsOfJoinTablesRequest& from) {
-    CopyFrom(from);
-    return *this;
-  }
-  inline AsOfJoinTablesRequest& operator=(AsOfJoinTablesRequest&& from) noexcept {
-    if (this == &from) return *this;
-    if (GetArena() == from.GetArena()
-  #ifdef PROTOBUF_FORCE_COPY_IN_MOVE
-        && GetArena() != nullptr
-  #endif  // !PROTOBUF_FORCE_COPY_IN_MOVE
-    ) {
-      InternalSwap(&from);
-    } else {
-      CopyFrom(from);
-    }
-    return *this;
-  }
-
-  inline const ::google::protobuf::UnknownFieldSet& unknown_fields() const
-      ABSL_ATTRIBUTE_LIFETIME_BOUND {
-    return _internal_metadata_.unknown_fields<::google::protobuf::UnknownFieldSet>(::google::protobuf::UnknownFieldSet::default_instance);
-  }
-  inline ::google::protobuf::UnknownFieldSet* mutable_unknown_fields()
-      ABSL_ATTRIBUTE_LIFETIME_BOUND {
-    return _internal_metadata_.mutable_unknown_fields<::google::protobuf::UnknownFieldSet>();
-  }
-
-  static const ::google::protobuf::Descriptor* descriptor() {
-    return GetDescriptor();
-  }
-  static const ::google::protobuf::Descriptor* GetDescriptor() {
-    return default_instance().GetMetadata().descriptor;
-  }
-  static const ::google::protobuf::Reflection* GetReflection() {
-    return default_instance().GetMetadata().reflection;
-  }
-  static const AsOfJoinTablesRequest& default_instance() {
-    return *internal_default_instance();
-  }
-  static inline const AsOfJoinTablesRequest* internal_default_instance() {
-    return reinterpret_cast<const AsOfJoinTablesRequest*>(
-               &_AsOfJoinTablesRequest_default_instance_);
-  }
-  static constexpr int kIndexInFileMessages =
-    54;
-
-  friend void swap(AsOfJoinTablesRequest& a, AsOfJoinTablesRequest& b) {
-    a.Swap(&b);
-  }
-  inline void Swap(AsOfJoinTablesRequest* other) {
-    if (other == this) return;
-  #ifdef PROTOBUF_FORCE_COPY_IN_SWAP
-    if (GetArena() != nullptr &&
-        GetArena() == other->GetArena()) {
-   #else  // PROTOBUF_FORCE_COPY_IN_SWAP
-    if (GetArena() == other->GetArena()) {
-  #endif  // !PROTOBUF_FORCE_COPY_IN_SWAP
-      InternalSwap(other);
-    } else {
-      ::google::protobuf::internal::GenericSwap(this, other);
-    }
-  }
-  void UnsafeArenaSwap(AsOfJoinTablesRequest* other) {
-    if (other == this) return;
-    ABSL_DCHECK(GetArena() == other->GetArena());
-    InternalSwap(other);
-  }
-
-  // implements Message ----------------------------------------------
-
-  AsOfJoinTablesRequest* New(::google::protobuf::Arena* arena = nullptr) const final {
-    return CreateMaybeMessage<AsOfJoinTablesRequest>(arena);
-  }
-  using ::google::protobuf::Message::CopyFrom;
-  void CopyFrom(const AsOfJoinTablesRequest& from);
-  using ::google::protobuf::Message::MergeFrom;
-  void MergeFrom( const AsOfJoinTablesRequest& from) {
-    AsOfJoinTablesRequest::MergeImpl(*this, from);
-  }
-  private:
-  static void MergeImpl(::google::protobuf::Message& to_msg, const ::google::protobuf::Message& from_msg);
-  public:
-  PROTOBUF_ATTRIBUTE_REINITIALIZES void Clear() final;
-  bool IsInitialized() const final;
-
-  ::size_t ByteSizeLong() const final;
-  const char* _InternalParse(const char* ptr, ::google::protobuf::internal::ParseContext* ctx) final;
-  ::uint8_t* _InternalSerialize(
-      ::uint8_t* target, ::google::protobuf::io::EpsCopyOutputStream* stream) const final;
-  int GetCachedSize() const { return _impl_._cached_size_.Get(); }
-
-  private:
-  ::google::protobuf::internal::CachedSize* AccessCachedSize() const final;
-  void SharedCtor(::google::protobuf::Arena* arena);
-  void SharedDtor();
-  void InternalSwap(AsOfJoinTablesRequest* other);
-
-  private:
-  friend class ::google::protobuf::internal::AnyMetadata;
-  static ::absl::string_view FullMessageName() {
-    return "io.deephaven.proto.backplane.grpc.AsOfJoinTablesRequest";
-  }
-  protected:
-  explicit AsOfJoinTablesRequest(::google::protobuf::Arena* arena);
-  AsOfJoinTablesRequest(::google::protobuf::Arena* arena, const AsOfJoinTablesRequest& from);
-  public:
-
-  static const ClassData _class_data_;
-  const ::google::protobuf::Message::ClassData*GetClassData() const final;
-
-  ::google::protobuf::Metadata GetMetadata() const final;
-
-  // nested types ----------------------------------------------------
-
-  using MatchRule = AsOfJoinTablesRequest_MatchRule;
-  static constexpr MatchRule LESS_THAN_EQUAL = AsOfJoinTablesRequest_MatchRule_LESS_THAN_EQUAL;
-  static constexpr MatchRule LESS_THAN = AsOfJoinTablesRequest_MatchRule_LESS_THAN;
-  static constexpr MatchRule GREATER_THAN_EQUAL = AsOfJoinTablesRequest_MatchRule_GREATER_THAN_EQUAL;
-  static constexpr MatchRule GREATER_THAN = AsOfJoinTablesRequest_MatchRule_GREATER_THAN;
-  static inline bool MatchRule_IsValid(int value) {
-    return AsOfJoinTablesRequest_MatchRule_IsValid(value);
-  }
-  static constexpr MatchRule MatchRule_MIN = AsOfJoinTablesRequest_MatchRule_MatchRule_MIN;
-  static constexpr MatchRule MatchRule_MAX = AsOfJoinTablesRequest_MatchRule_MatchRule_MAX;
-  static constexpr int MatchRule_ARRAYSIZE = AsOfJoinTablesRequest_MatchRule_MatchRule_ARRAYSIZE;
-  static inline const ::google::protobuf::EnumDescriptor* MatchRule_descriptor() {
-    return AsOfJoinTablesRequest_MatchRule_descriptor();
-  }
-  template <typename T>
-  static inline const std::string& MatchRule_Name(T value) {
-    return AsOfJoinTablesRequest_MatchRule_Name(value);
-  }
-  static inline bool MatchRule_Parse(absl::string_view name, MatchRule* value) {
-    return AsOfJoinTablesRequest_MatchRule_Parse(name, value);
-  }
-
-  // accessors -------------------------------------------------------
-
-  enum : int {
-    kColumnsToMatchFieldNumber = 4,
-    kColumnsToAddFieldNumber = 5,
-    kResultIdFieldNumber = 1,
-    kLeftIdFieldNumber = 2,
-    kRightIdFieldNumber = 3,
-    kAsOfMatchRuleFieldNumber = 7,
-  };
-  // repeated string columns_to_match = 4;
-  int columns_to_match_size() const;
-  private:
-  int _internal_columns_to_match_size() const;
-
-  public:
-  void clear_columns_to_match() ;
-  const std::string& columns_to_match(int index) const;
-  std::string* mutable_columns_to_match(int index);
-  void set_columns_to_match(int index, const std::string& value);
-  void set_columns_to_match(int index, std::string&& value);
-  void set_columns_to_match(int index, const char* value);
-  void set_columns_to_match(int index, const char* value, std::size_t size);
-  void set_columns_to_match(int index, absl::string_view value);
-  std::string* add_columns_to_match();
-  void add_columns_to_match(const std::string& value);
-  void add_columns_to_match(std::string&& value);
-  void add_columns_to_match(const char* value);
-  void add_columns_to_match(const char* value, std::size_t size);
-  void add_columns_to_match(absl::string_view value);
-  const ::google::protobuf::RepeatedPtrField<std::string>& columns_to_match() const;
-  ::google::protobuf::RepeatedPtrField<std::string>* mutable_columns_to_match();
-
-  private:
-  const ::google::protobuf::RepeatedPtrField<std::string>& _internal_columns_to_match() const;
-  ::google::protobuf::RepeatedPtrField<std::string>* _internal_mutable_columns_to_match();
-
-  public:
-  // repeated string columns_to_add = 5;
-  int columns_to_add_size() const;
-  private:
-  int _internal_columns_to_add_size() const;
-
-  public:
-  void clear_columns_to_add() ;
-  const std::string& columns_to_add(int index) const;
-  std::string* mutable_columns_to_add(int index);
-  void set_columns_to_add(int index, const std::string& value);
-  void set_columns_to_add(int index, std::string&& value);
-  void set_columns_to_add(int index, const char* value);
-  void set_columns_to_add(int index, const char* value, std::size_t size);
-  void set_columns_to_add(int index, absl::string_view value);
-  std::string* add_columns_to_add();
-  void add_columns_to_add(const std::string& value);
-  void add_columns_to_add(std::string&& value);
-  void add_columns_to_add(const char* value);
-  void add_columns_to_add(const char* value, std::size_t size);
-  void add_columns_to_add(absl::string_view value);
-  const ::google::protobuf::RepeatedPtrField<std::string>& columns_to_add() const;
-  ::google::protobuf::RepeatedPtrField<std::string>* mutable_columns_to_add();
-
-  private:
-  const ::google::protobuf::RepeatedPtrField<std::string>& _internal_columns_to_add() const;
-  ::google::protobuf::RepeatedPtrField<std::string>* _internal_mutable_columns_to_add();
-
-  public:
-  // .io.deephaven.proto.backplane.grpc.Ticket result_id = 1;
-  bool has_result_id() const;
-  void clear_result_id() ;
-  const ::io::deephaven::proto::backplane::grpc::Ticket& result_id() const;
-  PROTOBUF_NODISCARD ::io::deephaven::proto::backplane::grpc::Ticket* release_result_id();
-  ::io::deephaven::proto::backplane::grpc::Ticket* mutable_result_id();
-  void set_allocated_result_id(::io::deephaven::proto::backplane::grpc::Ticket* value);
-  void unsafe_arena_set_allocated_result_id(::io::deephaven::proto::backplane::grpc::Ticket* value);
-  ::io::deephaven::proto::backplane::grpc::Ticket* unsafe_arena_release_result_id();
-
-  private:
-  const ::io::deephaven::proto::backplane::grpc::Ticket& _internal_result_id() const;
-  ::io::deephaven::proto::backplane::grpc::Ticket* _internal_mutable_result_id();
-
-  public:
-  // .io.deephaven.proto.backplane.grpc.TableReference left_id = 2;
-  bool has_left_id() const;
-  void clear_left_id() ;
-  const ::io::deephaven::proto::backplane::grpc::TableReference& left_id() const;
-  PROTOBUF_NODISCARD ::io::deephaven::proto::backplane::grpc::TableReference* release_left_id();
-  ::io::deephaven::proto::backplane::grpc::TableReference* mutable_left_id();
-  void set_allocated_left_id(::io::deephaven::proto::backplane::grpc::TableReference* value);
-  void unsafe_arena_set_allocated_left_id(::io::deephaven::proto::backplane::grpc::TableReference* value);
-  ::io::deephaven::proto::backplane::grpc::TableReference* unsafe_arena_release_left_id();
-
-  private:
-  const ::io::deephaven::proto::backplane::grpc::TableReference& _internal_left_id() const;
-  ::io::deephaven::proto::backplane::grpc::TableReference* _internal_mutable_left_id();
-
-  public:
-  // .io.deephaven.proto.backplane.grpc.TableReference right_id = 3;
-  bool has_right_id() const;
-  void clear_right_id() ;
-  const ::io::deephaven::proto::backplane::grpc::TableReference& right_id() const;
-  PROTOBUF_NODISCARD ::io::deephaven::proto::backplane::grpc::TableReference* release_right_id();
-  ::io::deephaven::proto::backplane::grpc::TableReference* mutable_right_id();
-  void set_allocated_right_id(::io::deephaven::proto::backplane::grpc::TableReference* value);
-  void unsafe_arena_set_allocated_right_id(::io::deephaven::proto::backplane::grpc::TableReference* value);
-  ::io::deephaven::proto::backplane::grpc::TableReference* unsafe_arena_release_right_id();
-
-  private:
-  const ::io::deephaven::proto::backplane::grpc::TableReference& _internal_right_id() const;
-  ::io::deephaven::proto::backplane::grpc::TableReference* _internal_mutable_right_id();
-
-  public:
-  // .io.deephaven.proto.backplane.grpc.AsOfJoinTablesRequest.MatchRule as_of_match_rule = 7;
-  void clear_as_of_match_rule() ;
-  ::io::deephaven::proto::backplane::grpc::AsOfJoinTablesRequest_MatchRule as_of_match_rule() const;
-  void set_as_of_match_rule(::io::deephaven::proto::backplane::grpc::AsOfJoinTablesRequest_MatchRule value);
-
-  private:
-  ::io::deephaven::proto::backplane::grpc::AsOfJoinTablesRequest_MatchRule _internal_as_of_match_rule() const;
-  void _internal_set_as_of_match_rule(::io::deephaven::proto::backplane::grpc::AsOfJoinTablesRequest_MatchRule value);
-
-  public:
-  // @@protoc_insertion_point(class_scope:io.deephaven.proto.backplane.grpc.AsOfJoinTablesRequest)
- private:
-  class _Internal;
-
-  friend class ::google::protobuf::internal::TcParser;
-  static const ::google::protobuf::internal::TcParseTable<
-      3, 6, 3,
-      94, 2>
-      _table_;
-  friend class ::google::protobuf::MessageLite;
-  friend class ::google::protobuf::Arena;
-  template <typename T>
-  friend class ::google::protobuf::Arena::InternalHelper;
-  using InternalArenaConstructable_ = void;
-  using DestructorSkippable_ = void;
-  struct Impl_ {
-
-        inline explicit constexpr Impl_(
-            ::google::protobuf::internal::ConstantInitialized) noexcept;
-        inline explicit Impl_(::google::protobuf::internal::InternalVisibility visibility,
-                              ::google::protobuf::Arena* arena);
-        inline explicit Impl_(::google::protobuf::internal::InternalVisibility visibility,
-                              ::google::protobuf::Arena* arena, const Impl_& from);
-    ::google::protobuf::internal::HasBits<1> _has_bits_;
-    mutable ::google::protobuf::internal::CachedSize _cached_size_;
-    ::google::protobuf::RepeatedPtrField<std::string> columns_to_match_;
-    ::google::protobuf::RepeatedPtrField<std::string> columns_to_add_;
-    ::io::deephaven::proto::backplane::grpc::Ticket* result_id_;
-    ::io::deephaven::proto::backplane::grpc::TableReference* left_id_;
-    ::io::deephaven::proto::backplane::grpc::TableReference* right_id_;
-    int as_of_match_rule_;
-    PROTOBUF_TSAN_DECLARE_MEMBER
-  };
-  union { Impl_ _impl_; };
-  friend struct ::TableStruct_deephaven_2fproto_2ftable_2eproto;
-};// -------------------------------------------------------------------
-
-class ApplyPreviewColumnsRequest final :
-    public ::google::protobuf::Message /* @@protoc_insertion_point(class_definition:io.deephaven.proto.backplane.grpc.ApplyPreviewColumnsRequest) */ {
- public:
-  inline ApplyPreviewColumnsRequest() : ApplyPreviewColumnsRequest(nullptr) {}
-  ~ApplyPreviewColumnsRequest() override;
-  template<typename = void>
-  explicit PROTOBUF_CONSTEXPR ApplyPreviewColumnsRequest(::google::protobuf::internal::ConstantInitialized);
-
-  inline ApplyPreviewColumnsRequest(const ApplyPreviewColumnsRequest& from)
-      : ApplyPreviewColumnsRequest(nullptr, from) {}
-  ApplyPreviewColumnsRequest(ApplyPreviewColumnsRequest&& from) noexcept
-    : ApplyPreviewColumnsRequest() {
-    *this = ::std::move(from);
-  }
-
-  inline ApplyPreviewColumnsRequest& operator=(const ApplyPreviewColumnsRequest& from) {
-    CopyFrom(from);
-    return *this;
-  }
-  inline ApplyPreviewColumnsRequest& operator=(ApplyPreviewColumnsRequest&& from) noexcept {
-    if (this == &from) return *this;
-    if (GetArena() == from.GetArena()
-  #ifdef PROTOBUF_FORCE_COPY_IN_MOVE
-        && GetArena() != nullptr
-  #endif  // !PROTOBUF_FORCE_COPY_IN_MOVE
-    ) {
-      InternalSwap(&from);
-    } else {
-      CopyFrom(from);
-    }
-    return *this;
-  }
-
-  inline const ::google::protobuf::UnknownFieldSet& unknown_fields() const
-      ABSL_ATTRIBUTE_LIFETIME_BOUND {
-    return _internal_metadata_.unknown_fields<::google::protobuf::UnknownFieldSet>(::google::protobuf::UnknownFieldSet::default_instance);
-  }
-  inline ::google::protobuf::UnknownFieldSet* mutable_unknown_fields()
-      ABSL_ATTRIBUTE_LIFETIME_BOUND {
-    return _internal_metadata_.mutable_unknown_fields<::google::protobuf::UnknownFieldSet>();
-  }
-
-  static const ::google::protobuf::Descriptor* descriptor() {
-    return GetDescriptor();
-  }
-  static const ::google::protobuf::Descriptor* GetDescriptor() {
-    return default_instance().GetMetadata().descriptor;
-  }
-  static const ::google::protobuf::Reflection* GetReflection() {
-    return default_instance().GetMetadata().reflection;
-  }
-  static const ApplyPreviewColumnsRequest& default_instance() {
-    return *internal_default_instance();
-  }
-  static inline const ApplyPreviewColumnsRequest* internal_default_instance() {
-    return reinterpret_cast<const ApplyPreviewColumnsRequest*>(
-               &_ApplyPreviewColumnsRequest_default_instance_);
-  }
-  static constexpr int kIndexInFileMessages =
-    3;
-
-  friend void swap(ApplyPreviewColumnsRequest& a, ApplyPreviewColumnsRequest& b) {
-    a.Swap(&b);
-  }
-  inline void Swap(ApplyPreviewColumnsRequest* other) {
-    if (other == this) return;
-  #ifdef PROTOBUF_FORCE_COPY_IN_SWAP
-    if (GetArena() != nullptr &&
-        GetArena() == other->GetArena()) {
-   #else  // PROTOBUF_FORCE_COPY_IN_SWAP
-    if (GetArena() == other->GetArena()) {
-  #endif  // !PROTOBUF_FORCE_COPY_IN_SWAP
-      InternalSwap(other);
-    } else {
-      ::google::protobuf::internal::GenericSwap(this, other);
-    }
-  }
-  void UnsafeArenaSwap(ApplyPreviewColumnsRequest* other) {
-    if (other == this) return;
-    ABSL_DCHECK(GetArena() == other->GetArena());
-    InternalSwap(other);
-  }
-
-  // implements Message ----------------------------------------------
-
-  ApplyPreviewColumnsRequest* New(::google::protobuf::Arena* arena = nullptr) const final {
-    return CreateMaybeMessage<ApplyPreviewColumnsRequest>(arena);
-  }
-  using ::google::protobuf::Message::CopyFrom;
-  void CopyFrom(const ApplyPreviewColumnsRequest& from);
-  using ::google::protobuf::Message::MergeFrom;
-  void MergeFrom( const ApplyPreviewColumnsRequest& from) {
-    ApplyPreviewColumnsRequest::MergeImpl(*this, from);
-  }
-  private:
-  static void MergeImpl(::google::protobuf::Message& to_msg, const ::google::protobuf::Message& from_msg);
-  public:
-  PROTOBUF_ATTRIBUTE_REINITIALIZES void Clear() final;
-  bool IsInitialized() const final;
-
-  ::size_t ByteSizeLong() const final;
-  const char* _InternalParse(const char* ptr, ::google::protobuf::internal::ParseContext* ctx) final;
-  ::uint8_t* _InternalSerialize(
-      ::uint8_t* target, ::google::protobuf::io::EpsCopyOutputStream* stream) const final;
-  int GetCachedSize() const { return _impl_._cached_size_.Get(); }
-
-  private:
-  ::google::protobuf::internal::CachedSize* AccessCachedSize() const final;
-  void SharedCtor(::google::protobuf::Arena* arena);
-  void SharedDtor();
-  void InternalSwap(ApplyPreviewColumnsRequest* other);
-
-  private:
-  friend class ::google::protobuf::internal::AnyMetadata;
-  static ::absl::string_view FullMessageName() {
-    return "io.deephaven.proto.backplane.grpc.ApplyPreviewColumnsRequest";
-  }
-  protected:
-  explicit ApplyPreviewColumnsRequest(::google::protobuf::Arena* arena);
-  ApplyPreviewColumnsRequest(::google::protobuf::Arena* arena, const ApplyPreviewColumnsRequest& from);
-  public:
-
-  static const ClassData _class_data_;
-  const ::google::protobuf::Message::ClassData*GetClassData() const final;
-
-  ::google::protobuf::Metadata GetMetadata() const final;
-
-  // nested types ----------------------------------------------------
-
-  // accessors -------------------------------------------------------
-
-  enum : int {
-    kSourceIdFieldNumber = 1,
-    kResultIdFieldNumber = 2,
-  };
-  // .io.deephaven.proto.backplane.grpc.TableReference source_id = 1;
-  bool has_source_id() const;
-  void clear_source_id() ;
-  const ::io::deephaven::proto::backplane::grpc::TableReference& source_id() const;
-  PROTOBUF_NODISCARD ::io::deephaven::proto::backplane::grpc::TableReference* release_source_id();
-  ::io::deephaven::proto::backplane::grpc::TableReference* mutable_source_id();
-  void set_allocated_source_id(::io::deephaven::proto::backplane::grpc::TableReference* value);
-  void unsafe_arena_set_allocated_source_id(::io::deephaven::proto::backplane::grpc::TableReference* value);
-  ::io::deephaven::proto::backplane::grpc::TableReference* unsafe_arena_release_source_id();
-
-  private:
-  const ::io::deephaven::proto::backplane::grpc::TableReference& _internal_source_id() const;
-  ::io::deephaven::proto::backplane::grpc::TableReference* _internal_mutable_source_id();
-
-  public:
-  // .io.deephaven.proto.backplane.grpc.Ticket result_id = 2;
-  bool has_result_id() const;
-  void clear_result_id() ;
-  const ::io::deephaven::proto::backplane::grpc::Ticket& result_id() const;
-  PROTOBUF_NODISCARD ::io::deephaven::proto::backplane::grpc::Ticket* release_result_id();
-  ::io::deephaven::proto::backplane::grpc::Ticket* mutable_result_id();
-  void set_allocated_result_id(::io::deephaven::proto::backplane::grpc::Ticket* value);
-  void unsafe_arena_set_allocated_result_id(::io::deephaven::proto::backplane::grpc::Ticket* value);
-  ::io::deephaven::proto::backplane::grpc::Ticket* unsafe_arena_release_result_id();
-
-  private:
-  const ::io::deephaven::proto::backplane::grpc::Ticket& _internal_result_id() const;
-  ::io::deephaven::proto::backplane::grpc::Ticket* _internal_mutable_result_id();
-
-  public:
-  // @@protoc_insertion_point(class_scope:io.deephaven.proto.backplane.grpc.ApplyPreviewColumnsRequest)
- private:
-  class _Internal;
-
-  friend class ::google::protobuf::internal::TcParser;
-  static const ::google::protobuf::internal::TcParseTable<
-      1, 2, 2,
-      0, 2>
-      _table_;
-  friend class ::google::protobuf::MessageLite;
-  friend class ::google::protobuf::Arena;
-  template <typename T>
-  friend class ::google::protobuf::Arena::InternalHelper;
-  using InternalArenaConstructable_ = void;
-  using DestructorSkippable_ = void;
-  struct Impl_ {
-
-        inline explicit constexpr Impl_(
-            ::google::protobuf::internal::ConstantInitialized) noexcept;
-        inline explicit Impl_(::google::protobuf::internal::InternalVisibility visibility,
-                              ::google::protobuf::Arena* arena);
-        inline explicit Impl_(::google::protobuf::internal::InternalVisibility visibility,
-                              ::google::protobuf::Arena* arena, const Impl_& from);
-    ::google::protobuf::internal::HasBits<1> _has_bits_;
-    mutable ::google::protobuf::internal::CachedSize _cached_size_;
-    ::io::deephaven::proto::backplane::grpc::TableReference* source_id_;
-    ::io::deephaven::proto::backplane::grpc::Ticket* result_id_;
-    PROTOBUF_TSAN_DECLARE_MEMBER
-  };
-  union { Impl_ _impl_; };
-  friend struct ::TableStruct_deephaven_2fproto_2ftable_2eproto;
-};// -------------------------------------------------------------------
-
-class AjRajTablesRequest final :
-    public ::google::protobuf::Message /* @@protoc_insertion_point(class_definition:io.deephaven.proto.backplane.grpc.AjRajTablesRequest) */ {
- public:
-  inline AjRajTablesRequest() : AjRajTablesRequest(nullptr) {}
-  ~AjRajTablesRequest() override;
-  template<typename = void>
-  explicit PROTOBUF_CONSTEXPR AjRajTablesRequest(::google::protobuf::internal::ConstantInitialized);
-
-  inline AjRajTablesRequest(const AjRajTablesRequest& from)
-      : AjRajTablesRequest(nullptr, from) {}
-  AjRajTablesRequest(AjRajTablesRequest&& from) noexcept
-    : AjRajTablesRequest() {
-    *this = ::std::move(from);
-  }
-
-  inline AjRajTablesRequest& operator=(const AjRajTablesRequest& from) {
-    CopyFrom(from);
-    return *this;
-  }
-  inline AjRajTablesRequest& operator=(AjRajTablesRequest&& from) noexcept {
-    if (this == &from) return *this;
-    if (GetArena() == from.GetArena()
-  #ifdef PROTOBUF_FORCE_COPY_IN_MOVE
-        && GetArena() != nullptr
-  #endif  // !PROTOBUF_FORCE_COPY_IN_MOVE
-    ) {
-      InternalSwap(&from);
-    } else {
-      CopyFrom(from);
-    }
-    return *this;
-  }
-
-  inline const ::google::protobuf::UnknownFieldSet& unknown_fields() const
-      ABSL_ATTRIBUTE_LIFETIME_BOUND {
-    return _internal_metadata_.unknown_fields<::google::protobuf::UnknownFieldSet>(::google::protobuf::UnknownFieldSet::default_instance);
-  }
-  inline ::google::protobuf::UnknownFieldSet* mutable_unknown_fields()
-      ABSL_ATTRIBUTE_LIFETIME_BOUND {
-    return _internal_metadata_.mutable_unknown_fields<::google::protobuf::UnknownFieldSet>();
-  }
-
-  static const ::google::protobuf::Descriptor* descriptor() {
-    return GetDescriptor();
-  }
-  static const ::google::protobuf::Descriptor* GetDescriptor() {
-    return default_instance().GetMetadata().descriptor;
-  }
-  static const ::google::protobuf::Reflection* GetReflection() {
-    return default_instance().GetMetadata().reflection;
-  }
-  static const AjRajTablesRequest& default_instance() {
-    return *internal_default_instance();
-  }
-  static inline const AjRajTablesRequest* internal_default_instance() {
-    return reinterpret_cast<const AjRajTablesRequest*>(
-               &_AjRajTablesRequest_default_instance_);
-  }
-  static constexpr int kIndexInFileMessages =
-    55;
-
-  friend void swap(AjRajTablesRequest& a, AjRajTablesRequest& b) {
-    a.Swap(&b);
-  }
-  inline void Swap(AjRajTablesRequest* other) {
-    if (other == this) return;
-  #ifdef PROTOBUF_FORCE_COPY_IN_SWAP
-    if (GetArena() != nullptr &&
-        GetArena() == other->GetArena()) {
-   #else  // PROTOBUF_FORCE_COPY_IN_SWAP
-    if (GetArena() == other->GetArena()) {
-  #endif  // !PROTOBUF_FORCE_COPY_IN_SWAP
-      InternalSwap(other);
-    } else {
-      ::google::protobuf::internal::GenericSwap(this, other);
-    }
-  }
-  void UnsafeArenaSwap(AjRajTablesRequest* other) {
-    if (other == this) return;
-    ABSL_DCHECK(GetArena() == other->GetArena());
-    InternalSwap(other);
-  }
-
-  // implements Message ----------------------------------------------
-
-  AjRajTablesRequest* New(::google::protobuf::Arena* arena = nullptr) const final {
-    return CreateMaybeMessage<AjRajTablesRequest>(arena);
-  }
-  using ::google::protobuf::Message::CopyFrom;
-  void CopyFrom(const AjRajTablesRequest& from);
-  using ::google::protobuf::Message::MergeFrom;
-  void MergeFrom( const AjRajTablesRequest& from) {
-    AjRajTablesRequest::MergeImpl(*this, from);
-  }
-  private:
-  static void MergeImpl(::google::protobuf::Message& to_msg, const ::google::protobuf::Message& from_msg);
-  public:
-  PROTOBUF_ATTRIBUTE_REINITIALIZES void Clear() final;
-  bool IsInitialized() const final;
-
-  ::size_t ByteSizeLong() const final;
-  const char* _InternalParse(const char* ptr, ::google::protobuf::internal::ParseContext* ctx) final;
-  ::uint8_t* _InternalSerialize(
-      ::uint8_t* target, ::google::protobuf::io::EpsCopyOutputStream* stream) const final;
-  int GetCachedSize() const { return _impl_._cached_size_.Get(); }
-
-  private:
-  ::google::protobuf::internal::CachedSize* AccessCachedSize() const final;
-  void SharedCtor(::google::protobuf::Arena* arena);
-  void SharedDtor();
-  void InternalSwap(AjRajTablesRequest* other);
-
-  private:
-  friend class ::google::protobuf::internal::AnyMetadata;
-  static ::absl::string_view FullMessageName() {
-    return "io.deephaven.proto.backplane.grpc.AjRajTablesRequest";
-  }
-  protected:
-  explicit AjRajTablesRequest(::google::protobuf::Arena* arena);
-  AjRajTablesRequest(::google::protobuf::Arena* arena, const AjRajTablesRequest& from);
-  public:
-
-  static const ClassData _class_data_;
-  const ::google::protobuf::Message::ClassData*GetClassData() const final;
-
-  ::google::protobuf::Metadata GetMetadata() const final;
-
-  // nested types ----------------------------------------------------
-
-  // accessors -------------------------------------------------------
-
-  enum : int {
-    kExactMatchColumnsFieldNumber = 4,
-    kColumnsToAddFieldNumber = 6,
-    kAsOfColumnFieldNumber = 5,
-    kResultIdFieldNumber = 1,
-    kLeftIdFieldNumber = 2,
-    kRightIdFieldNumber = 3,
-  };
-  // repeated string exact_match_columns = 4;
-  int exact_match_columns_size() const;
-  private:
-  int _internal_exact_match_columns_size() const;
-
-  public:
-  void clear_exact_match_columns() ;
-  const std::string& exact_match_columns(int index) const;
-  std::string* mutable_exact_match_columns(int index);
-  void set_exact_match_columns(int index, const std::string& value);
-  void set_exact_match_columns(int index, std::string&& value);
-  void set_exact_match_columns(int index, const char* value);
-  void set_exact_match_columns(int index, const char* value, std::size_t size);
-  void set_exact_match_columns(int index, absl::string_view value);
-  std::string* add_exact_match_columns();
-  void add_exact_match_columns(const std::string& value);
-  void add_exact_match_columns(std::string&& value);
-  void add_exact_match_columns(const char* value);
-  void add_exact_match_columns(const char* value, std::size_t size);
-  void add_exact_match_columns(absl::string_view value);
-  const ::google::protobuf::RepeatedPtrField<std::string>& exact_match_columns() const;
-  ::google::protobuf::RepeatedPtrField<std::string>* mutable_exact_match_columns();
-
-  private:
-  const ::google::protobuf::RepeatedPtrField<std::string>& _internal_exact_match_columns() const;
-  ::google::protobuf::RepeatedPtrField<std::string>* _internal_mutable_exact_match_columns();
-
-  public:
-  // repeated string columns_to_add = 6;
-  int columns_to_add_size() const;
-  private:
-  int _internal_columns_to_add_size() const;
-
-  public:
-  void clear_columns_to_add() ;
-  const std::string& columns_to_add(int index) const;
-  std::string* mutable_columns_to_add(int index);
-  void set_columns_to_add(int index, const std::string& value);
-  void set_columns_to_add(int index, std::string&& value);
-  void set_columns_to_add(int index, const char* value);
-  void set_columns_to_add(int index, const char* value, std::size_t size);
-  void set_columns_to_add(int index, absl::string_view value);
-  std::string* add_columns_to_add();
-  void add_columns_to_add(const std::string& value);
-  void add_columns_to_add(std::string&& value);
-  void add_columns_to_add(const char* value);
-  void add_columns_to_add(const char* value, std::size_t size);
-  void add_columns_to_add(absl::string_view value);
-  const ::google::protobuf::RepeatedPtrField<std::string>& columns_to_add() const;
-  ::google::protobuf::RepeatedPtrField<std::string>* mutable_columns_to_add();
-
-  private:
-  const ::google::protobuf::RepeatedPtrField<std::string>& _internal_columns_to_add() const;
-  ::google::protobuf::RepeatedPtrField<std::string>* _internal_mutable_columns_to_add();
-
-  public:
-  // string as_of_column = 5;
-  void clear_as_of_column() ;
-  const std::string& as_of_column() const;
-  template <typename Arg_ = const std::string&, typename... Args_>
-  void set_as_of_column(Arg_&& arg, Args_... args);
-  std::string* mutable_as_of_column();
-  PROTOBUF_NODISCARD std::string* release_as_of_column();
-  void set_allocated_as_of_column(std::string* value);
-
-  private:
-  const std::string& _internal_as_of_column() const;
-  inline PROTOBUF_ALWAYS_INLINE void _internal_set_as_of_column(
-      const std::string& value);
-  std::string* _internal_mutable_as_of_column();
-
-  public:
-  // .io.deephaven.proto.backplane.grpc.Ticket result_id = 1;
-  bool has_result_id() const;
-  void clear_result_id() ;
-  const ::io::deephaven::proto::backplane::grpc::Ticket& result_id() const;
-  PROTOBUF_NODISCARD ::io::deephaven::proto::backplane::grpc::Ticket* release_result_id();
-  ::io::deephaven::proto::backplane::grpc::Ticket* mutable_result_id();
-  void set_allocated_result_id(::io::deephaven::proto::backplane::grpc::Ticket* value);
-  void unsafe_arena_set_allocated_result_id(::io::deephaven::proto::backplane::grpc::Ticket* value);
-  ::io::deephaven::proto::backplane::grpc::Ticket* unsafe_arena_release_result_id();
-
-  private:
-  const ::io::deephaven::proto::backplane::grpc::Ticket& _internal_result_id() const;
-  ::io::deephaven::proto::backplane::grpc::Ticket* _internal_mutable_result_id();
-
-  public:
-  // .io.deephaven.proto.backplane.grpc.TableReference left_id = 2;
-  bool has_left_id() const;
-  void clear_left_id() ;
-  const ::io::deephaven::proto::backplane::grpc::TableReference& left_id() const;
-  PROTOBUF_NODISCARD ::io::deephaven::proto::backplane::grpc::TableReference* release_left_id();
-  ::io::deephaven::proto::backplane::grpc::TableReference* mutable_left_id();
-  void set_allocated_left_id(::io::deephaven::proto::backplane::grpc::TableReference* value);
-  void unsafe_arena_set_allocated_left_id(::io::deephaven::proto::backplane::grpc::TableReference* value);
-  ::io::deephaven::proto::backplane::grpc::TableReference* unsafe_arena_release_left_id();
-
-  private:
-  const ::io::deephaven::proto::backplane::grpc::TableReference& _internal_left_id() const;
-  ::io::deephaven::proto::backplane::grpc::TableReference* _internal_mutable_left_id();
-
-  public:
-  // .io.deephaven.proto.backplane.grpc.TableReference right_id = 3;
-  bool has_right_id() const;
-  void clear_right_id() ;
-  const ::io::deephaven::proto::backplane::grpc::TableReference& right_id() const;
-  PROTOBUF_NODISCARD ::io::deephaven::proto::backplane::grpc::TableReference* release_right_id();
-  ::io::deephaven::proto::backplane::grpc::TableReference* mutable_right_id();
-  void set_allocated_right_id(::io::deephaven::proto::backplane::grpc::TableReference* value);
-  void unsafe_arena_set_allocated_right_id(::io::deephaven::proto::backplane::grpc::TableReference* value);
-  ::io::deephaven::proto::backplane::grpc::TableReference* unsafe_arena_release_right_id();
-
-  private:
-  const ::io::deephaven::proto::backplane::grpc::TableReference& _internal_right_id() const;
-  ::io::deephaven::proto::backplane::grpc::TableReference* _internal_mutable_right_id();
-
-  public:
-  // @@protoc_insertion_point(class_scope:io.deephaven.proto.backplane.grpc.AjRajTablesRequest)
- private:
-  class _Internal;
-
-  friend class ::google::protobuf::internal::TcParser;
-  static const ::google::protobuf::internal::TcParseTable<
-      3, 6, 3,
-      106, 2>
-      _table_;
-  friend class ::google::protobuf::MessageLite;
-  friend class ::google::protobuf::Arena;
-  template <typename T>
-  friend class ::google::protobuf::Arena::InternalHelper;
-  using InternalArenaConstructable_ = void;
-  using DestructorSkippable_ = void;
-  struct Impl_ {
-
-        inline explicit constexpr Impl_(
-            ::google::protobuf::internal::ConstantInitialized) noexcept;
-        inline explicit Impl_(::google::protobuf::internal::InternalVisibility visibility,
-                              ::google::protobuf::Arena* arena);
-        inline explicit Impl_(::google::protobuf::internal::InternalVisibility visibility,
-                              ::google::protobuf::Arena* arena, const Impl_& from);
-    ::google::protobuf::internal::HasBits<1> _has_bits_;
-    mutable ::google::protobuf::internal::CachedSize _cached_size_;
-    ::google::protobuf::RepeatedPtrField<std::string> exact_match_columns_;
-    ::google::protobuf::RepeatedPtrField<std::string> columns_to_add_;
-    ::google::protobuf::internal::ArenaStringPtr as_of_column_;
-    ::io::deephaven::proto::backplane::grpc::Ticket* result_id_;
-    ::io::deephaven::proto::backplane::grpc::TableReference* left_id_;
-    ::io::deephaven::proto::backplane::grpc::TableReference* right_id_;
-    PROTOBUF_TSAN_DECLARE_MEMBER
-  };
-  union { Impl_ _impl_; };
-  friend struct ::TableStruct_deephaven_2fproto_2ftable_2eproto;
-};// -------------------------------------------------------------------
-
-class AggSpec final :
-    public ::google::protobuf::Message /* @@protoc_insertion_point(class_definition:io.deephaven.proto.backplane.grpc.AggSpec) */ {
- public:
-  inline AggSpec() : AggSpec(nullptr) {}
-  ~AggSpec() override;
-  template<typename = void>
-  explicit PROTOBUF_CONSTEXPR AggSpec(::google::protobuf::internal::ConstantInitialized);
-
-  inline AggSpec(const AggSpec& from)
-      : AggSpec(nullptr, from) {}
-  AggSpec(AggSpec&& from) noexcept
-    : AggSpec() {
-    *this = ::std::move(from);
-  }
-
-  inline AggSpec& operator=(const AggSpec& from) {
-    CopyFrom(from);
-    return *this;
-  }
-  inline AggSpec& operator=(AggSpec&& from) noexcept {
-    if (this == &from) return *this;
-    if (GetArena() == from.GetArena()
-  #ifdef PROTOBUF_FORCE_COPY_IN_MOVE
-        && GetArena() != nullptr
-  #endif  // !PROTOBUF_FORCE_COPY_IN_MOVE
-    ) {
-      InternalSwap(&from);
-    } else {
-      CopyFrom(from);
-    }
-    return *this;
-  }
-
-  inline const ::google::protobuf::UnknownFieldSet& unknown_fields() const
-      ABSL_ATTRIBUTE_LIFETIME_BOUND {
-    return _internal_metadata_.unknown_fields<::google::protobuf::UnknownFieldSet>(::google::protobuf::UnknownFieldSet::default_instance);
-  }
-  inline ::google::protobuf::UnknownFieldSet* mutable_unknown_fields()
-      ABSL_ATTRIBUTE_LIFETIME_BOUND {
-    return _internal_metadata_.mutable_unknown_fields<::google::protobuf::UnknownFieldSet>();
-  }
-
-  static const ::google::protobuf::Descriptor* descriptor() {
-    return GetDescriptor();
-  }
-  static const ::google::protobuf::Descriptor* GetDescriptor() {
-    return default_instance().GetMetadata().descriptor;
-  }
-  static const ::google::protobuf::Reflection* GetReflection() {
-    return default_instance().GetMetadata().reflection;
-  }
-  static const AggSpec& default_instance() {
-    return *internal_default_instance();
-  }
-  enum TypeCase {
-    kAbsSum = 1,
-    kApproximatePercentile = 2,
-    kAvg = 3,
-    kCountDistinct = 4,
-    kDistinct = 5,
-    kFirst = 6,
-    kFormula = 7,
-    kFreeze = 8,
-    kGroup = 9,
-    kLast = 10,
-    kMax = 11,
-    kMedian = 12,
-    kMin = 13,
-    kPercentile = 14,
-    kSortedFirst = 15,
-    kSortedLast = 16,
-    kStd = 17,
-    kSum = 18,
-    kTDigest = 19,
-    kUnique = 20,
-    kWeightedAvg = 21,
-    kWeightedSum = 22,
-    kVar = 23,
-    TYPE_NOT_SET = 0,
-  };
-
-  static inline const AggSpec* internal_default_instance() {
-    return reinterpret_cast<const AggSpec*>(
-               &_AggSpec_default_instance_);
-  }
-  static constexpr int kIndexInFileMessages =
-    85;
-
-  friend void swap(AggSpec& a, AggSpec& b) {
-    a.Swap(&b);
-  }
-  inline void Swap(AggSpec* other) {
-    if (other == this) return;
-  #ifdef PROTOBUF_FORCE_COPY_IN_SWAP
-    if (GetArena() != nullptr &&
-        GetArena() == other->GetArena()) {
-   #else  // PROTOBUF_FORCE_COPY_IN_SWAP
-    if (GetArena() == other->GetArena()) {
-  #endif  // !PROTOBUF_FORCE_COPY_IN_SWAP
-      InternalSwap(other);
-    } else {
-      ::google::protobuf::internal::GenericSwap(this, other);
-    }
-  }
-  void UnsafeArenaSwap(AggSpec* other) {
-    if (other == this) return;
-    ABSL_DCHECK(GetArena() == other->GetArena());
-    InternalSwap(other);
-  }
-
-  // implements Message ----------------------------------------------
-
-  AggSpec* New(::google::protobuf::Arena* arena = nullptr) const final {
-    return CreateMaybeMessage<AggSpec>(arena);
-  }
-  using ::google::protobuf::Message::CopyFrom;
-  void CopyFrom(const AggSpec& from);
-  using ::google::protobuf::Message::MergeFrom;
-  void MergeFrom( const AggSpec& from) {
-    AggSpec::MergeImpl(*this, from);
-  }
-  private:
-  static void MergeImpl(::google::protobuf::Message& to_msg, const ::google::protobuf::Message& from_msg);
-  public:
-  PROTOBUF_ATTRIBUTE_REINITIALIZES void Clear() final;
-  bool IsInitialized() const final;
-
-  ::size_t ByteSizeLong() const final;
-  const char* _InternalParse(const char* ptr, ::google::protobuf::internal::ParseContext* ctx) final;
-  ::uint8_t* _InternalSerialize(
-      ::uint8_t* target, ::google::protobuf::io::EpsCopyOutputStream* stream) const final;
-  int GetCachedSize() const { return _impl_._cached_size_.Get(); }
-
-  private:
-  ::google::protobuf::internal::CachedSize* AccessCachedSize() const final;
-  void SharedCtor(::google::protobuf::Arena* arena);
-  void SharedDtor();
-  void InternalSwap(AggSpec* other);
-
-  private:
-  friend class ::google::protobuf::internal::AnyMetadata;
-  static ::absl::string_view FullMessageName() {
-    return "io.deephaven.proto.backplane.grpc.AggSpec";
-  }
-  protected:
-  explicit AggSpec(::google::protobuf::Arena* arena);
-  AggSpec(::google::protobuf::Arena* arena, const AggSpec& from);
-  public:
-
-  static const ClassData _class_data_;
-  const ::google::protobuf::Message::ClassData*GetClassData() const final;
-
-  ::google::protobuf::Metadata GetMetadata() const final;
-
-  // nested types ----------------------------------------------------
-
-  using AggSpecApproximatePercentile = AggSpec_AggSpecApproximatePercentile;
-  using AggSpecCountDistinct = AggSpec_AggSpecCountDistinct;
-  using AggSpecDistinct = AggSpec_AggSpecDistinct;
-  using AggSpecFormula = AggSpec_AggSpecFormula;
-  using AggSpecMedian = AggSpec_AggSpecMedian;
-  using AggSpecPercentile = AggSpec_AggSpecPercentile;
-  using AggSpecSorted = AggSpec_AggSpecSorted;
-  using AggSpecSortedColumn = AggSpec_AggSpecSortedColumn;
-  using AggSpecTDigest = AggSpec_AggSpecTDigest;
-  using AggSpecUnique = AggSpec_AggSpecUnique;
-  using AggSpecNonUniqueSentinel = AggSpec_AggSpecNonUniqueSentinel;
-  using AggSpecWeighted = AggSpec_AggSpecWeighted;
-  using AggSpecAbsSum = AggSpec_AggSpecAbsSum;
-  using AggSpecAvg = AggSpec_AggSpecAvg;
-  using AggSpecFirst = AggSpec_AggSpecFirst;
-  using AggSpecFreeze = AggSpec_AggSpecFreeze;
-  using AggSpecGroup = AggSpec_AggSpecGroup;
-  using AggSpecLast = AggSpec_AggSpecLast;
-  using AggSpecMax = AggSpec_AggSpecMax;
-  using AggSpecMin = AggSpec_AggSpecMin;
-  using AggSpecStd = AggSpec_AggSpecStd;
-  using AggSpecSum = AggSpec_AggSpecSum;
-  using AggSpecVar = AggSpec_AggSpecVar;
-
-  // accessors -------------------------------------------------------
-
-  enum : int {
-    kAbsSumFieldNumber = 1,
-    kApproximatePercentileFieldNumber = 2,
-    kAvgFieldNumber = 3,
-    kCountDistinctFieldNumber = 4,
-    kDistinctFieldNumber = 5,
-    kFirstFieldNumber = 6,
-    kFormulaFieldNumber = 7,
-    kFreezeFieldNumber = 8,
-    kGroupFieldNumber = 9,
-    kLastFieldNumber = 10,
-    kMaxFieldNumber = 11,
-    kMedianFieldNumber = 12,
-    kMinFieldNumber = 13,
-    kPercentileFieldNumber = 14,
-    kSortedFirstFieldNumber = 15,
-    kSortedLastFieldNumber = 16,
-    kStdFieldNumber = 17,
-    kSumFieldNumber = 18,
-    kTDigestFieldNumber = 19,
-    kUniqueFieldNumber = 20,
-    kWeightedAvgFieldNumber = 21,
-    kWeightedSumFieldNumber = 22,
-    kVarFieldNumber = 23,
-  };
-  // .io.deephaven.proto.backplane.grpc.AggSpec.AggSpecAbsSum abs_sum = 1;
-  bool has_abs_sum() const;
-  private:
-  bool _internal_has_abs_sum() const;
-
-  public:
-  void clear_abs_sum() ;
-  const ::io::deephaven::proto::backplane::grpc::AggSpec_AggSpecAbsSum& abs_sum() const;
-  PROTOBUF_NODISCARD ::io::deephaven::proto::backplane::grpc::AggSpec_AggSpecAbsSum* release_abs_sum();
-  ::io::deephaven::proto::backplane::grpc::AggSpec_AggSpecAbsSum* mutable_abs_sum();
-  void set_allocated_abs_sum(::io::deephaven::proto::backplane::grpc::AggSpec_AggSpecAbsSum* value);
-  void unsafe_arena_set_allocated_abs_sum(::io::deephaven::proto::backplane::grpc::AggSpec_AggSpecAbsSum* value);
-  ::io::deephaven::proto::backplane::grpc::AggSpec_AggSpecAbsSum* unsafe_arena_release_abs_sum();
-
-  private:
-  const ::io::deephaven::proto::backplane::grpc::AggSpec_AggSpecAbsSum& _internal_abs_sum() const;
-  ::io::deephaven::proto::backplane::grpc::AggSpec_AggSpecAbsSum* _internal_mutable_abs_sum();
-
-  public:
-  // .io.deephaven.proto.backplane.grpc.AggSpec.AggSpecApproximatePercentile approximate_percentile = 2;
-  bool has_approximate_percentile() const;
-  private:
-  bool _internal_has_approximate_percentile() const;
-
-  public:
-  void clear_approximate_percentile() ;
-  const ::io::deephaven::proto::backplane::grpc::AggSpec_AggSpecApproximatePercentile& approximate_percentile() const;
-  PROTOBUF_NODISCARD ::io::deephaven::proto::backplane::grpc::AggSpec_AggSpecApproximatePercentile* release_approximate_percentile();
-  ::io::deephaven::proto::backplane::grpc::AggSpec_AggSpecApproximatePercentile* mutable_approximate_percentile();
-  void set_allocated_approximate_percentile(::io::deephaven::proto::backplane::grpc::AggSpec_AggSpecApproximatePercentile* value);
-  void unsafe_arena_set_allocated_approximate_percentile(::io::deephaven::proto::backplane::grpc::AggSpec_AggSpecApproximatePercentile* value);
-  ::io::deephaven::proto::backplane::grpc::AggSpec_AggSpecApproximatePercentile* unsafe_arena_release_approximate_percentile();
-
-  private:
-  const ::io::deephaven::proto::backplane::grpc::AggSpec_AggSpecApproximatePercentile& _internal_approximate_percentile() const;
-  ::io::deephaven::proto::backplane::grpc::AggSpec_AggSpecApproximatePercentile* _internal_mutable_approximate_percentile();
-
-  public:
-  // .io.deephaven.proto.backplane.grpc.AggSpec.AggSpecAvg avg = 3;
-  bool has_avg() const;
-  private:
-  bool _internal_has_avg() const;
-
-  public:
-  void clear_avg() ;
-  const ::io::deephaven::proto::backplane::grpc::AggSpec_AggSpecAvg& avg() const;
-  PROTOBUF_NODISCARD ::io::deephaven::proto::backplane::grpc::AggSpec_AggSpecAvg* release_avg();
-  ::io::deephaven::proto::backplane::grpc::AggSpec_AggSpecAvg* mutable_avg();
-  void set_allocated_avg(::io::deephaven::proto::backplane::grpc::AggSpec_AggSpecAvg* value);
-  void unsafe_arena_set_allocated_avg(::io::deephaven::proto::backplane::grpc::AggSpec_AggSpecAvg* value);
-  ::io::deephaven::proto::backplane::grpc::AggSpec_AggSpecAvg* unsafe_arena_release_avg();
-
-  private:
-  const ::io::deephaven::proto::backplane::grpc::AggSpec_AggSpecAvg& _internal_avg() const;
-  ::io::deephaven::proto::backplane::grpc::AggSpec_AggSpecAvg* _internal_mutable_avg();
-
-  public:
-  // .io.deephaven.proto.backplane.grpc.AggSpec.AggSpecCountDistinct count_distinct = 4;
-  bool has_count_distinct() const;
-  private:
-  bool _internal_has_count_distinct() const;
-
-  public:
-  void clear_count_distinct() ;
-  const ::io::deephaven::proto::backplane::grpc::AggSpec_AggSpecCountDistinct& count_distinct() const;
-  PROTOBUF_NODISCARD ::io::deephaven::proto::backplane::grpc::AggSpec_AggSpecCountDistinct* release_count_distinct();
-  ::io::deephaven::proto::backplane::grpc::AggSpec_AggSpecCountDistinct* mutable_count_distinct();
-  void set_allocated_count_distinct(::io::deephaven::proto::backplane::grpc::AggSpec_AggSpecCountDistinct* value);
-  void unsafe_arena_set_allocated_count_distinct(::io::deephaven::proto::backplane::grpc::AggSpec_AggSpecCountDistinct* value);
-  ::io::deephaven::proto::backplane::grpc::AggSpec_AggSpecCountDistinct* unsafe_arena_release_count_distinct();
-
-  private:
-  const ::io::deephaven::proto::backplane::grpc::AggSpec_AggSpecCountDistinct& _internal_count_distinct() const;
-  ::io::deephaven::proto::backplane::grpc::AggSpec_AggSpecCountDistinct* _internal_mutable_count_distinct();
-
-  public:
-  // .io.deephaven.proto.backplane.grpc.AggSpec.AggSpecDistinct distinct = 5;
-  bool has_distinct() const;
-  private:
-  bool _internal_has_distinct() const;
-
-  public:
-  void clear_distinct() ;
-  const ::io::deephaven::proto::backplane::grpc::AggSpec_AggSpecDistinct& distinct() const;
-  PROTOBUF_NODISCARD ::io::deephaven::proto::backplane::grpc::AggSpec_AggSpecDistinct* release_distinct();
-  ::io::deephaven::proto::backplane::grpc::AggSpec_AggSpecDistinct* mutable_distinct();
-  void set_allocated_distinct(::io::deephaven::proto::backplane::grpc::AggSpec_AggSpecDistinct* value);
-  void unsafe_arena_set_allocated_distinct(::io::deephaven::proto::backplane::grpc::AggSpec_AggSpecDistinct* value);
-  ::io::deephaven::proto::backplane::grpc::AggSpec_AggSpecDistinct* unsafe_arena_release_distinct();
-
-  private:
-  const ::io::deephaven::proto::backplane::grpc::AggSpec_AggSpecDistinct& _internal_distinct() const;
-  ::io::deephaven::proto::backplane::grpc::AggSpec_AggSpecDistinct* _internal_mutable_distinct();
-
-  public:
-  // .io.deephaven.proto.backplane.grpc.AggSpec.AggSpecFirst first = 6;
-  bool has_first() const;
-  private:
-  bool _internal_has_first() const;
-
-  public:
-  void clear_first() ;
-  const ::io::deephaven::proto::backplane::grpc::AggSpec_AggSpecFirst& first() const;
-  PROTOBUF_NODISCARD ::io::deephaven::proto::backplane::grpc::AggSpec_AggSpecFirst* release_first();
-  ::io::deephaven::proto::backplane::grpc::AggSpec_AggSpecFirst* mutable_first();
-  void set_allocated_first(::io::deephaven::proto::backplane::grpc::AggSpec_AggSpecFirst* value);
-  void unsafe_arena_set_allocated_first(::io::deephaven::proto::backplane::grpc::AggSpec_AggSpecFirst* value);
-  ::io::deephaven::proto::backplane::grpc::AggSpec_AggSpecFirst* unsafe_arena_release_first();
-
-  private:
-  const ::io::deephaven::proto::backplane::grpc::AggSpec_AggSpecFirst& _internal_first() const;
-  ::io::deephaven::proto::backplane::grpc::AggSpec_AggSpecFirst* _internal_mutable_first();
-
-  public:
-  // .io.deephaven.proto.backplane.grpc.AggSpec.AggSpecFormula formula = 7;
-  bool has_formula() const;
-  private:
-  bool _internal_has_formula() const;
-
-  public:
-  void clear_formula() ;
-  const ::io::deephaven::proto::backplane::grpc::AggSpec_AggSpecFormula& formula() const;
-  PROTOBUF_NODISCARD ::io::deephaven::proto::backplane::grpc::AggSpec_AggSpecFormula* release_formula();
-  ::io::deephaven::proto::backplane::grpc::AggSpec_AggSpecFormula* mutable_formula();
-  void set_allocated_formula(::io::deephaven::proto::backplane::grpc::AggSpec_AggSpecFormula* value);
-  void unsafe_arena_set_allocated_formula(::io::deephaven::proto::backplane::grpc::AggSpec_AggSpecFormula* value);
-  ::io::deephaven::proto::backplane::grpc::AggSpec_AggSpecFormula* unsafe_arena_release_formula();
-
-  private:
-  const ::io::deephaven::proto::backplane::grpc::AggSpec_AggSpecFormula& _internal_formula() const;
-  ::io::deephaven::proto::backplane::grpc::AggSpec_AggSpecFormula* _internal_mutable_formula();
-
-  public:
-  // .io.deephaven.proto.backplane.grpc.AggSpec.AggSpecFreeze freeze = 8;
-  bool has_freeze() const;
-  private:
-  bool _internal_has_freeze() const;
-
-  public:
-  void clear_freeze() ;
-  const ::io::deephaven::proto::backplane::grpc::AggSpec_AggSpecFreeze& freeze() const;
-  PROTOBUF_NODISCARD ::io::deephaven::proto::backplane::grpc::AggSpec_AggSpecFreeze* release_freeze();
-  ::io::deephaven::proto::backplane::grpc::AggSpec_AggSpecFreeze* mutable_freeze();
-  void set_allocated_freeze(::io::deephaven::proto::backplane::grpc::AggSpec_AggSpecFreeze* value);
-  void unsafe_arena_set_allocated_freeze(::io::deephaven::proto::backplane::grpc::AggSpec_AggSpecFreeze* value);
-  ::io::deephaven::proto::backplane::grpc::AggSpec_AggSpecFreeze* unsafe_arena_release_freeze();
-
-  private:
-  const ::io::deephaven::proto::backplane::grpc::AggSpec_AggSpecFreeze& _internal_freeze() const;
-  ::io::deephaven::proto::backplane::grpc::AggSpec_AggSpecFreeze* _internal_mutable_freeze();
-
-  public:
-  // .io.deephaven.proto.backplane.grpc.AggSpec.AggSpecGroup group = 9;
-  bool has_group() const;
-  private:
-  bool _internal_has_group() const;
-
-  public:
-  void clear_group() ;
-  const ::io::deephaven::proto::backplane::grpc::AggSpec_AggSpecGroup& group() const;
-  PROTOBUF_NODISCARD ::io::deephaven::proto::backplane::grpc::AggSpec_AggSpecGroup* release_group();
-  ::io::deephaven::proto::backplane::grpc::AggSpec_AggSpecGroup* mutable_group();
-  void set_allocated_group(::io::deephaven::proto::backplane::grpc::AggSpec_AggSpecGroup* value);
-  void unsafe_arena_set_allocated_group(::io::deephaven::proto::backplane::grpc::AggSpec_AggSpecGroup* value);
-  ::io::deephaven::proto::backplane::grpc::AggSpec_AggSpecGroup* unsafe_arena_release_group();
-
-  private:
-  const ::io::deephaven::proto::backplane::grpc::AggSpec_AggSpecGroup& _internal_group() const;
-  ::io::deephaven::proto::backplane::grpc::AggSpec_AggSpecGroup* _internal_mutable_group();
-
-  public:
-  // .io.deephaven.proto.backplane.grpc.AggSpec.AggSpecLast last = 10;
-  bool has_last() const;
-  private:
-  bool _internal_has_last() const;
-
-  public:
-  void clear_last() ;
-  const ::io::deephaven::proto::backplane::grpc::AggSpec_AggSpecLast& last() const;
-  PROTOBUF_NODISCARD ::io::deephaven::proto::backplane::grpc::AggSpec_AggSpecLast* release_last();
-  ::io::deephaven::proto::backplane::grpc::AggSpec_AggSpecLast* mutable_last();
-  void set_allocated_last(::io::deephaven::proto::backplane::grpc::AggSpec_AggSpecLast* value);
-  void unsafe_arena_set_allocated_last(::io::deephaven::proto::backplane::grpc::AggSpec_AggSpecLast* value);
-  ::io::deephaven::proto::backplane::grpc::AggSpec_AggSpecLast* unsafe_arena_release_last();
-
-  private:
-  const ::io::deephaven::proto::backplane::grpc::AggSpec_AggSpecLast& _internal_last() const;
-  ::io::deephaven::proto::backplane::grpc::AggSpec_AggSpecLast* _internal_mutable_last();
-
-  public:
-  // .io.deephaven.proto.backplane.grpc.AggSpec.AggSpecMax max = 11;
-  bool has_max() const;
-  private:
-  bool _internal_has_max() const;
-
-  public:
-  void clear_max() ;
-  const ::io::deephaven::proto::backplane::grpc::AggSpec_AggSpecMax& max() const;
-  PROTOBUF_NODISCARD ::io::deephaven::proto::backplane::grpc::AggSpec_AggSpecMax* release_max();
-  ::io::deephaven::proto::backplane::grpc::AggSpec_AggSpecMax* mutable_max();
-  void set_allocated_max(::io::deephaven::proto::backplane::grpc::AggSpec_AggSpecMax* value);
-  void unsafe_arena_set_allocated_max(::io::deephaven::proto::backplane::grpc::AggSpec_AggSpecMax* value);
-  ::io::deephaven::proto::backplane::grpc::AggSpec_AggSpecMax* unsafe_arena_release_max();
-
-  private:
-  const ::io::deephaven::proto::backplane::grpc::AggSpec_AggSpecMax& _internal_max() const;
-  ::io::deephaven::proto::backplane::grpc::AggSpec_AggSpecMax* _internal_mutable_max();
-
-  public:
-  // .io.deephaven.proto.backplane.grpc.AggSpec.AggSpecMedian median = 12;
-  bool has_median() const;
-  private:
-  bool _internal_has_median() const;
-
-  public:
-  void clear_median() ;
-  const ::io::deephaven::proto::backplane::grpc::AggSpec_AggSpecMedian& median() const;
-  PROTOBUF_NODISCARD ::io::deephaven::proto::backplane::grpc::AggSpec_AggSpecMedian* release_median();
-  ::io::deephaven::proto::backplane::grpc::AggSpec_AggSpecMedian* mutable_median();
-  void set_allocated_median(::io::deephaven::proto::backplane::grpc::AggSpec_AggSpecMedian* value);
-  void unsafe_arena_set_allocated_median(::io::deephaven::proto::backplane::grpc::AggSpec_AggSpecMedian* value);
-  ::io::deephaven::proto::backplane::grpc::AggSpec_AggSpecMedian* unsafe_arena_release_median();
-
-  private:
-  const ::io::deephaven::proto::backplane::grpc::AggSpec_AggSpecMedian& _internal_median() const;
-  ::io::deephaven::proto::backplane::grpc::AggSpec_AggSpecMedian* _internal_mutable_median();
-
-  public:
-  // .io.deephaven.proto.backplane.grpc.AggSpec.AggSpecMin min = 13;
-  bool has_min() const;
-  private:
-  bool _internal_has_min() const;
-
-  public:
-  void clear_min() ;
-  const ::io::deephaven::proto::backplane::grpc::AggSpec_AggSpecMin& min() const;
-  PROTOBUF_NODISCARD ::io::deephaven::proto::backplane::grpc::AggSpec_AggSpecMin* release_min();
-  ::io::deephaven::proto::backplane::grpc::AggSpec_AggSpecMin* mutable_min();
-  void set_allocated_min(::io::deephaven::proto::backplane::grpc::AggSpec_AggSpecMin* value);
-  void unsafe_arena_set_allocated_min(::io::deephaven::proto::backplane::grpc::AggSpec_AggSpecMin* value);
-  ::io::deephaven::proto::backplane::grpc::AggSpec_AggSpecMin* unsafe_arena_release_min();
-
-  private:
-  const ::io::deephaven::proto::backplane::grpc::AggSpec_AggSpecMin& _internal_min() const;
-  ::io::deephaven::proto::backplane::grpc::AggSpec_AggSpecMin* _internal_mutable_min();
-
-  public:
-  // .io.deephaven.proto.backplane.grpc.AggSpec.AggSpecPercentile percentile = 14;
-  bool has_percentile() const;
-  private:
-  bool _internal_has_percentile() const;
-
-  public:
-  void clear_percentile() ;
-  const ::io::deephaven::proto::backplane::grpc::AggSpec_AggSpecPercentile& percentile() const;
-  PROTOBUF_NODISCARD ::io::deephaven::proto::backplane::grpc::AggSpec_AggSpecPercentile* release_percentile();
-  ::io::deephaven::proto::backplane::grpc::AggSpec_AggSpecPercentile* mutable_percentile();
-  void set_allocated_percentile(::io::deephaven::proto::backplane::grpc::AggSpec_AggSpecPercentile* value);
-  void unsafe_arena_set_allocated_percentile(::io::deephaven::proto::backplane::grpc::AggSpec_AggSpecPercentile* value);
-  ::io::deephaven::proto::backplane::grpc::AggSpec_AggSpecPercentile* unsafe_arena_release_percentile();
-
-  private:
-  const ::io::deephaven::proto::backplane::grpc::AggSpec_AggSpecPercentile& _internal_percentile() const;
-  ::io::deephaven::proto::backplane::grpc::AggSpec_AggSpecPercentile* _internal_mutable_percentile();
-
-  public:
-  // .io.deephaven.proto.backplane.grpc.AggSpec.AggSpecSorted sorted_first = 15;
-  bool has_sorted_first() const;
-  private:
-  bool _internal_has_sorted_first() const;
-
-  public:
-  void clear_sorted_first() ;
-  const ::io::deephaven::proto::backplane::grpc::AggSpec_AggSpecSorted& sorted_first() const;
-  PROTOBUF_NODISCARD ::io::deephaven::proto::backplane::grpc::AggSpec_AggSpecSorted* release_sorted_first();
-  ::io::deephaven::proto::backplane::grpc::AggSpec_AggSpecSorted* mutable_sorted_first();
-  void set_allocated_sorted_first(::io::deephaven::proto::backplane::grpc::AggSpec_AggSpecSorted* value);
-  void unsafe_arena_set_allocated_sorted_first(::io::deephaven::proto::backplane::grpc::AggSpec_AggSpecSorted* value);
-  ::io::deephaven::proto::backplane::grpc::AggSpec_AggSpecSorted* unsafe_arena_release_sorted_first();
-
-  private:
-  const ::io::deephaven::proto::backplane::grpc::AggSpec_AggSpecSorted& _internal_sorted_first() const;
-  ::io::deephaven::proto::backplane::grpc::AggSpec_AggSpecSorted* _internal_mutable_sorted_first();
-
-  public:
-  // .io.deephaven.proto.backplane.grpc.AggSpec.AggSpecSorted sorted_last = 16;
-  bool has_sorted_last() const;
-  private:
-  bool _internal_has_sorted_last() const;
-
-  public:
-  void clear_sorted_last() ;
-  const ::io::deephaven::proto::backplane::grpc::AggSpec_AggSpecSorted& sorted_last() const;
-  PROTOBUF_NODISCARD ::io::deephaven::proto::backplane::grpc::AggSpec_AggSpecSorted* release_sorted_last();
-  ::io::deephaven::proto::backplane::grpc::AggSpec_AggSpecSorted* mutable_sorted_last();
-  void set_allocated_sorted_last(::io::deephaven::proto::backplane::grpc::AggSpec_AggSpecSorted* value);
-  void unsafe_arena_set_allocated_sorted_last(::io::deephaven::proto::backplane::grpc::AggSpec_AggSpecSorted* value);
-  ::io::deephaven::proto::backplane::grpc::AggSpec_AggSpecSorted* unsafe_arena_release_sorted_last();
-
-  private:
-  const ::io::deephaven::proto::backplane::grpc::AggSpec_AggSpecSorted& _internal_sorted_last() const;
-  ::io::deephaven::proto::backplane::grpc::AggSpec_AggSpecSorted* _internal_mutable_sorted_last();
-
-  public:
-  // .io.deephaven.proto.backplane.grpc.AggSpec.AggSpecStd std = 17;
-  bool has_std() const;
-  private:
-  bool _internal_has_std() const;
-
-  public:
-  void clear_std() ;
-  const ::io::deephaven::proto::backplane::grpc::AggSpec_AggSpecStd& std() const;
-  PROTOBUF_NODISCARD ::io::deephaven::proto::backplane::grpc::AggSpec_AggSpecStd* release_std();
-  ::io::deephaven::proto::backplane::grpc::AggSpec_AggSpecStd* mutable_std();
-  void set_allocated_std(::io::deephaven::proto::backplane::grpc::AggSpec_AggSpecStd* value);
-  void unsafe_arena_set_allocated_std(::io::deephaven::proto::backplane::grpc::AggSpec_AggSpecStd* value);
-  ::io::deephaven::proto::backplane::grpc::AggSpec_AggSpecStd* unsafe_arena_release_std();
-
-  private:
-  const ::io::deephaven::proto::backplane::grpc::AggSpec_AggSpecStd& _internal_std() const;
-  ::io::deephaven::proto::backplane::grpc::AggSpec_AggSpecStd* _internal_mutable_std();
-
-  public:
-  // .io.deephaven.proto.backplane.grpc.AggSpec.AggSpecSum sum = 18;
-  bool has_sum() const;
-  private:
-  bool _internal_has_sum() const;
-
-  public:
-  void clear_sum() ;
-  const ::io::deephaven::proto::backplane::grpc::AggSpec_AggSpecSum& sum() const;
-  PROTOBUF_NODISCARD ::io::deephaven::proto::backplane::grpc::AggSpec_AggSpecSum* release_sum();
-  ::io::deephaven::proto::backplane::grpc::AggSpec_AggSpecSum* mutable_sum();
-  void set_allocated_sum(::io::deephaven::proto::backplane::grpc::AggSpec_AggSpecSum* value);
-  void unsafe_arena_set_allocated_sum(::io::deephaven::proto::backplane::grpc::AggSpec_AggSpecSum* value);
-  ::io::deephaven::proto::backplane::grpc::AggSpec_AggSpecSum* unsafe_arena_release_sum();
-
-  private:
-  const ::io::deephaven::proto::backplane::grpc::AggSpec_AggSpecSum& _internal_sum() const;
-  ::io::deephaven::proto::backplane::grpc::AggSpec_AggSpecSum* _internal_mutable_sum();
-
-  public:
-  // .io.deephaven.proto.backplane.grpc.AggSpec.AggSpecTDigest t_digest = 19;
-  bool has_t_digest() const;
-  private:
-  bool _internal_has_t_digest() const;
-
-  public:
-  void clear_t_digest() ;
-  const ::io::deephaven::proto::backplane::grpc::AggSpec_AggSpecTDigest& t_digest() const;
-  PROTOBUF_NODISCARD ::io::deephaven::proto::backplane::grpc::AggSpec_AggSpecTDigest* release_t_digest();
-  ::io::deephaven::proto::backplane::grpc::AggSpec_AggSpecTDigest* mutable_t_digest();
-  void set_allocated_t_digest(::io::deephaven::proto::backplane::grpc::AggSpec_AggSpecTDigest* value);
-  void unsafe_arena_set_allocated_t_digest(::io::deephaven::proto::backplane::grpc::AggSpec_AggSpecTDigest* value);
-  ::io::deephaven::proto::backplane::grpc::AggSpec_AggSpecTDigest* unsafe_arena_release_t_digest();
-
-  private:
-  const ::io::deephaven::proto::backplane::grpc::AggSpec_AggSpecTDigest& _internal_t_digest() const;
-  ::io::deephaven::proto::backplane::grpc::AggSpec_AggSpecTDigest* _internal_mutable_t_digest();
-
-  public:
-  // .io.deephaven.proto.backplane.grpc.AggSpec.AggSpecUnique unique = 20;
-  bool has_unique() const;
-  private:
-  bool _internal_has_unique() const;
-
-  public:
-  void clear_unique() ;
-  const ::io::deephaven::proto::backplane::grpc::AggSpec_AggSpecUnique& unique() const;
-  PROTOBUF_NODISCARD ::io::deephaven::proto::backplane::grpc::AggSpec_AggSpecUnique* release_unique();
-  ::io::deephaven::proto::backplane::grpc::AggSpec_AggSpecUnique* mutable_unique();
-  void set_allocated_unique(::io::deephaven::proto::backplane::grpc::AggSpec_AggSpecUnique* value);
-  void unsafe_arena_set_allocated_unique(::io::deephaven::proto::backplane::grpc::AggSpec_AggSpecUnique* value);
-  ::io::deephaven::proto::backplane::grpc::AggSpec_AggSpecUnique* unsafe_arena_release_unique();
-
-  private:
-  const ::io::deephaven::proto::backplane::grpc::AggSpec_AggSpecUnique& _internal_unique() const;
-  ::io::deephaven::proto::backplane::grpc::AggSpec_AggSpecUnique* _internal_mutable_unique();
-
-  public:
-  // .io.deephaven.proto.backplane.grpc.AggSpec.AggSpecWeighted weighted_avg = 21;
-  bool has_weighted_avg() const;
-  private:
-  bool _internal_has_weighted_avg() const;
-
-  public:
-  void clear_weighted_avg() ;
-  const ::io::deephaven::proto::backplane::grpc::AggSpec_AggSpecWeighted& weighted_avg() const;
-  PROTOBUF_NODISCARD ::io::deephaven::proto::backplane::grpc::AggSpec_AggSpecWeighted* release_weighted_avg();
-  ::io::deephaven::proto::backplane::grpc::AggSpec_AggSpecWeighted* mutable_weighted_avg();
-  void set_allocated_weighted_avg(::io::deephaven::proto::backplane::grpc::AggSpec_AggSpecWeighted* value);
-  void unsafe_arena_set_allocated_weighted_avg(::io::deephaven::proto::backplane::grpc::AggSpec_AggSpecWeighted* value);
-  ::io::deephaven::proto::backplane::grpc::AggSpec_AggSpecWeighted* unsafe_arena_release_weighted_avg();
-
-  private:
-  const ::io::deephaven::proto::backplane::grpc::AggSpec_AggSpecWeighted& _internal_weighted_avg() const;
-  ::io::deephaven::proto::backplane::grpc::AggSpec_AggSpecWeighted* _internal_mutable_weighted_avg();
-
-  public:
-  // .io.deephaven.proto.backplane.grpc.AggSpec.AggSpecWeighted weighted_sum = 22;
-  bool has_weighted_sum() const;
-  private:
-  bool _internal_has_weighted_sum() const;
-
-  public:
-  void clear_weighted_sum() ;
-  const ::io::deephaven::proto::backplane::grpc::AggSpec_AggSpecWeighted& weighted_sum() const;
-  PROTOBUF_NODISCARD ::io::deephaven::proto::backplane::grpc::AggSpec_AggSpecWeighted* release_weighted_sum();
-  ::io::deephaven::proto::backplane::grpc::AggSpec_AggSpecWeighted* mutable_weighted_sum();
-  void set_allocated_weighted_sum(::io::deephaven::proto::backplane::grpc::AggSpec_AggSpecWeighted* value);
-  void unsafe_arena_set_allocated_weighted_sum(::io::deephaven::proto::backplane::grpc::AggSpec_AggSpecWeighted* value);
-  ::io::deephaven::proto::backplane::grpc::AggSpec_AggSpecWeighted* unsafe_arena_release_weighted_sum();
-
-  private:
-  const ::io::deephaven::proto::backplane::grpc::AggSpec_AggSpecWeighted& _internal_weighted_sum() const;
-  ::io::deephaven::proto::backplane::grpc::AggSpec_AggSpecWeighted* _internal_mutable_weighted_sum();
-
-  public:
-  // .io.deephaven.proto.backplane.grpc.AggSpec.AggSpecVar var = 23;
-  bool has_var() const;
-  private:
-  bool _internal_has_var() const;
-
-  public:
-  void clear_var() ;
-  const ::io::deephaven::proto::backplane::grpc::AggSpec_AggSpecVar& var() const;
-  PROTOBUF_NODISCARD ::io::deephaven::proto::backplane::grpc::AggSpec_AggSpecVar* release_var();
-  ::io::deephaven::proto::backplane::grpc::AggSpec_AggSpecVar* mutable_var();
-  void set_allocated_var(::io::deephaven::proto::backplane::grpc::AggSpec_AggSpecVar* value);
-  void unsafe_arena_set_allocated_var(::io::deephaven::proto::backplane::grpc::AggSpec_AggSpecVar* value);
-  ::io::deephaven::proto::backplane::grpc::AggSpec_AggSpecVar* unsafe_arena_release_var();
-
-  private:
-  const ::io::deephaven::proto::backplane::grpc::AggSpec_AggSpecVar& _internal_var() const;
-  ::io::deephaven::proto::backplane::grpc::AggSpec_AggSpecVar* _internal_mutable_var();
-
-  public:
-  void clear_type();
-  TypeCase type_case() const;
-  // @@protoc_insertion_point(class_scope:io.deephaven.proto.backplane.grpc.AggSpec)
- private:
-  class _Internal;
-  void set_has_abs_sum();
-  void set_has_approximate_percentile();
-  void set_has_avg();
-  void set_has_count_distinct();
-  void set_has_distinct();
-  void set_has_first();
-  void set_has_formula();
-  void set_has_freeze();
-  void set_has_group();
-  void set_has_last();
-  void set_has_max();
-  void set_has_median();
-  void set_has_min();
-  void set_has_percentile();
-  void set_has_sorted_first();
-  void set_has_sorted_last();
-  void set_has_std();
-  void set_has_sum();
-  void set_has_t_digest();
-  void set_has_unique();
-  void set_has_weighted_avg();
-  void set_has_weighted_sum();
-  void set_has_var();
-
-  inline bool has_type() const;
-  inline void clear_has_type();
-
-  friend class ::google::protobuf::internal::TcParser;
-  static const ::google::protobuf::internal::TcParseTable<
-      0, 23, 23,
-      0, 2>
-      _table_;
-  friend class ::google::protobuf::MessageLite;
-  friend class ::google::protobuf::Arena;
-  template <typename T>
-  friend class ::google::protobuf::Arena::InternalHelper;
-  using InternalArenaConstructable_ = void;
-  using DestructorSkippable_ = void;
-  struct Impl_ {
-
-        inline explicit constexpr Impl_(
-            ::google::protobuf::internal::ConstantInitialized) noexcept;
-        inline explicit Impl_(::google::protobuf::internal::InternalVisibility visibility,
-                              ::google::protobuf::Arena* arena);
-        inline explicit Impl_(::google::protobuf::internal::InternalVisibility visibility,
-                              ::google::protobuf::Arena* arena, const Impl_& from);
-    union TypeUnion {
-      constexpr TypeUnion() : _constinit_{} {}
-        ::google::protobuf::internal::ConstantInitialized _constinit_;
-      ::io::deephaven::proto::backplane::grpc::AggSpec_AggSpecAbsSum* abs_sum_;
-      ::io::deephaven::proto::backplane::grpc::AggSpec_AggSpecApproximatePercentile* approximate_percentile_;
-      ::io::deephaven::proto::backplane::grpc::AggSpec_AggSpecAvg* avg_;
-      ::io::deephaven::proto::backplane::grpc::AggSpec_AggSpecCountDistinct* count_distinct_;
-      ::io::deephaven::proto::backplane::grpc::AggSpec_AggSpecDistinct* distinct_;
-      ::io::deephaven::proto::backplane::grpc::AggSpec_AggSpecFirst* first_;
-      ::io::deephaven::proto::backplane::grpc::AggSpec_AggSpecFormula* formula_;
-      ::io::deephaven::proto::backplane::grpc::AggSpec_AggSpecFreeze* freeze_;
-      ::io::deephaven::proto::backplane::grpc::AggSpec_AggSpecGroup* group_;
-      ::io::deephaven::proto::backplane::grpc::AggSpec_AggSpecLast* last_;
-      ::io::deephaven::proto::backplane::grpc::AggSpec_AggSpecMax* max_;
-      ::io::deephaven::proto::backplane::grpc::AggSpec_AggSpecMedian* median_;
-      ::io::deephaven::proto::backplane::grpc::AggSpec_AggSpecMin* min_;
-      ::io::deephaven::proto::backplane::grpc::AggSpec_AggSpecPercentile* percentile_;
-      ::io::deephaven::proto::backplane::grpc::AggSpec_AggSpecSorted* sorted_first_;
-      ::io::deephaven::proto::backplane::grpc::AggSpec_AggSpecSorted* sorted_last_;
-      ::io::deephaven::proto::backplane::grpc::AggSpec_AggSpecStd* std_;
-      ::io::deephaven::proto::backplane::grpc::AggSpec_AggSpecSum* sum_;
-      ::io::deephaven::proto::backplane::grpc::AggSpec_AggSpecTDigest* t_digest_;
-      ::io::deephaven::proto::backplane::grpc::AggSpec_AggSpecUnique* unique_;
-      ::io::deephaven::proto::backplane::grpc::AggSpec_AggSpecWeighted* weighted_avg_;
-      ::io::deephaven::proto::backplane::grpc::AggSpec_AggSpecWeighted* weighted_sum_;
-      ::io::deephaven::proto::backplane::grpc::AggSpec_AggSpecVar* var_;
-    } type_;
-    mutable ::google::protobuf::internal::CachedSize _cached_size_;
-    ::uint32_t _oneof_case_[1];
-
-    PROTOBUF_TSAN_DECLARE_MEMBER
-  };
-  union { Impl_ _impl_; };
-  friend struct ::TableStruct_deephaven_2fproto_2ftable_2eproto;
-};// -------------------------------------------------------------------
-
-class UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec final :
-    public ::google::protobuf::Message /* @@protoc_insertion_point(class_definition:io.deephaven.proto.backplane.grpc.UpdateByRequest.UpdateByOperation.UpdateByColumn.UpdateBySpec) */ {
- public:
-  inline UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec() : UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec(nullptr) {}
-  ~UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec() override;
-  template<typename = void>
-  explicit PROTOBUF_CONSTEXPR UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec(::google::protobuf::internal::ConstantInitialized);
-
-  inline UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec(const UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec& from)
-      : UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec(nullptr, from) {}
-  UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec(UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec&& from) noexcept
-    : UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec() {
-    *this = ::std::move(from);
-  }
-
-  inline UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec& operator=(const UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec& from) {
-    CopyFrom(from);
-    return *this;
-  }
-  inline UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec& operator=(UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec&& from) noexcept {
-    if (this == &from) return *this;
-    if (GetArena() == from.GetArena()
-  #ifdef PROTOBUF_FORCE_COPY_IN_MOVE
-        && GetArena() != nullptr
-  #endif  // !PROTOBUF_FORCE_COPY_IN_MOVE
-    ) {
-      InternalSwap(&from);
-    } else {
-      CopyFrom(from);
-    }
-    return *this;
-  }
-
-  inline const ::google::protobuf::UnknownFieldSet& unknown_fields() const
-      ABSL_ATTRIBUTE_LIFETIME_BOUND {
-    return _internal_metadata_.unknown_fields<::google::protobuf::UnknownFieldSet>(::google::protobuf::UnknownFieldSet::default_instance);
-  }
-  inline ::google::protobuf::UnknownFieldSet* mutable_unknown_fields()
-      ABSL_ATTRIBUTE_LIFETIME_BOUND {
-    return _internal_metadata_.mutable_unknown_fields<::google::protobuf::UnknownFieldSet>();
-  }
-
-  static const ::google::protobuf::Descriptor* descriptor() {
-    return GetDescriptor();
-  }
-  static const ::google::protobuf::Descriptor* GetDescriptor() {
-    return default_instance().GetMetadata().descriptor;
-  }
-  static const ::google::protobuf::Reflection* GetReflection() {
-    return default_instance().GetMetadata().reflection;
-  }
-  static const UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec& default_instance() {
-    return *internal_default_instance();
-  }
-  enum TypeCase {
-    kSum = 1,
-    kMin = 2,
-    kMax = 3,
-    kProduct = 4,
-    kFill = 5,
-    kEma = 6,
-    kRollingSum = 7,
-    kRollingGroup = 8,
-    kRollingAvg = 9,
-    kRollingMin = 10,
-    kRollingMax = 11,
-    kRollingProduct = 12,
-    kDelta = 13,
-    kEms = 14,
-    kEmMin = 15,
-    kEmMax = 16,
-    kEmStd = 17,
-    kRollingCount = 18,
-    kRollingStd = 19,
-    kRollingWavg = 20,
-    kRollingFormula = 21,
-    TYPE_NOT_SET = 0,
-  };
-
-  static inline const UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec* internal_default_instance() {
-    return reinterpret_cast<const UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec*>(
-               &_UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_default_instance_);
-  }
-  static constexpr int kIndexInFileMessages =
-    37;
-
-  friend void swap(UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec& a, UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec& b) {
-    a.Swap(&b);
-  }
-  inline void Swap(UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec* other) {
-    if (other == this) return;
-  #ifdef PROTOBUF_FORCE_COPY_IN_SWAP
-    if (GetArena() != nullptr &&
-        GetArena() == other->GetArena()) {
-   #else  // PROTOBUF_FORCE_COPY_IN_SWAP
-    if (GetArena() == other->GetArena()) {
-  #endif  // !PROTOBUF_FORCE_COPY_IN_SWAP
-      InternalSwap(other);
-    } else {
-      ::google::protobuf::internal::GenericSwap(this, other);
-    }
-  }
-  void UnsafeArenaSwap(UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec* other) {
-    if (other == this) return;
-    ABSL_DCHECK(GetArena() == other->GetArena());
-    InternalSwap(other);
-  }
-
-  // implements Message ----------------------------------------------
-
-  UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec* New(::google::protobuf::Arena* arena = nullptr) const final {
-    return CreateMaybeMessage<UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec>(arena);
-  }
-  using ::google::protobuf::Message::CopyFrom;
-  void CopyFrom(const UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec& from);
-  using ::google::protobuf::Message::MergeFrom;
-  void MergeFrom( const UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec& from) {
-    UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec::MergeImpl(*this, from);
-  }
-  private:
-  static void MergeImpl(::google::protobuf::Message& to_msg, const ::google::protobuf::Message& from_msg);
-  public:
-  PROTOBUF_ATTRIBUTE_REINITIALIZES void Clear() final;
-  bool IsInitialized() const final;
-
-  ::size_t ByteSizeLong() const final;
-  const char* _InternalParse(const char* ptr, ::google::protobuf::internal::ParseContext* ctx) final;
-  ::uint8_t* _InternalSerialize(
-      ::uint8_t* target, ::google::protobuf::io::EpsCopyOutputStream* stream) const final;
-  int GetCachedSize() const { return _impl_._cached_size_.Get(); }
-
-  private:
-  ::google::protobuf::internal::CachedSize* AccessCachedSize() const final;
-  void SharedCtor(::google::protobuf::Arena* arena);
-  void SharedDtor();
-  void InternalSwap(UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec* other);
-
-  private:
-  friend class ::google::protobuf::internal::AnyMetadata;
-  static ::absl::string_view FullMessageName() {
-    return "io.deephaven.proto.backplane.grpc.UpdateByRequest.UpdateByOperation.UpdateByColumn.UpdateBySpec";
-  }
-  protected:
-  explicit UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec(::google::protobuf::Arena* arena);
-  UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec(::google::protobuf::Arena* arena, const UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec& from);
-  public:
-
-  static const ClassData _class_data_;
-  const ::google::protobuf::Message::ClassData*GetClassData() const final;
-
-  ::google::protobuf::Metadata GetMetadata() const final;
-
-  // nested types ----------------------------------------------------
-
-  using UpdateByCumulativeSum = UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByCumulativeSum;
-  using UpdateByCumulativeMin = UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByCumulativeMin;
-  using UpdateByCumulativeMax = UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByCumulativeMax;
-  using UpdateByCumulativeProduct = UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByCumulativeProduct;
-  using UpdateByFill = UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByFill;
-  using UpdateByEma = UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByEma;
-  using UpdateByEms = UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByEms;
-  using UpdateByEmMin = UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByEmMin;
-  using UpdateByEmMax = UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByEmMax;
-  using UpdateByEmStd = UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByEmStd;
-  using UpdateByDelta = UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByDelta;
-  using UpdateByRollingSum = UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingSum;
-  using UpdateByRollingGroup = UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingGroup;
-  using UpdateByRollingAvg = UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingAvg;
-  using UpdateByRollingMin = UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingMin;
-  using UpdateByRollingMax = UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingMax;
-  using UpdateByRollingProduct = UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingProduct;
-  using UpdateByRollingCount = UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingCount;
-  using UpdateByRollingStd = UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingStd;
-  using UpdateByRollingWAvg = UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingWAvg;
-  using UpdateByRollingFormula = UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingFormula;
-
-  // accessors -------------------------------------------------------
-
-  enum : int {
-    kSumFieldNumber = 1,
-    kMinFieldNumber = 2,
-    kMaxFieldNumber = 3,
-    kProductFieldNumber = 4,
-    kFillFieldNumber = 5,
-    kEmaFieldNumber = 6,
-    kRollingSumFieldNumber = 7,
-    kRollingGroupFieldNumber = 8,
-    kRollingAvgFieldNumber = 9,
-    kRollingMinFieldNumber = 10,
-    kRollingMaxFieldNumber = 11,
-    kRollingProductFieldNumber = 12,
-    kDeltaFieldNumber = 13,
-    kEmsFieldNumber = 14,
-    kEmMinFieldNumber = 15,
-    kEmMaxFieldNumber = 16,
-    kEmStdFieldNumber = 17,
-    kRollingCountFieldNumber = 18,
-    kRollingStdFieldNumber = 19,
-    kRollingWavgFieldNumber = 20,
-    kRollingFormulaFieldNumber = 21,
-  };
-  // .io.deephaven.proto.backplane.grpc.UpdateByRequest.UpdateByOperation.UpdateByColumn.UpdateBySpec.UpdateByCumulativeSum sum = 1;
-  bool has_sum() const;
-  private:
-  bool _internal_has_sum() const;
-
-  public:
-  void clear_sum() ;
-  const ::io::deephaven::proto::backplane::grpc::UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByCumulativeSum& sum() const;
-  PROTOBUF_NODISCARD ::io::deephaven::proto::backplane::grpc::UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByCumulativeSum* release_sum();
-  ::io::deephaven::proto::backplane::grpc::UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByCumulativeSum* mutable_sum();
-  void set_allocated_sum(::io::deephaven::proto::backplane::grpc::UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByCumulativeSum* value);
-  void unsafe_arena_set_allocated_sum(::io::deephaven::proto::backplane::grpc::UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByCumulativeSum* value);
-  ::io::deephaven::proto::backplane::grpc::UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByCumulativeSum* unsafe_arena_release_sum();
-
-  private:
-  const ::io::deephaven::proto::backplane::grpc::UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByCumulativeSum& _internal_sum() const;
-  ::io::deephaven::proto::backplane::grpc::UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByCumulativeSum* _internal_mutable_sum();
-
-  public:
-  // .io.deephaven.proto.backplane.grpc.UpdateByRequest.UpdateByOperation.UpdateByColumn.UpdateBySpec.UpdateByCumulativeMin min = 2;
-  bool has_min() const;
-  private:
-  bool _internal_has_min() const;
-
-  public:
-  void clear_min() ;
-  const ::io::deephaven::proto::backplane::grpc::UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByCumulativeMin& min() const;
-  PROTOBUF_NODISCARD ::io::deephaven::proto::backplane::grpc::UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByCumulativeMin* release_min();
-  ::io::deephaven::proto::backplane::grpc::UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByCumulativeMin* mutable_min();
-  void set_allocated_min(::io::deephaven::proto::backplane::grpc::UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByCumulativeMin* value);
-  void unsafe_arena_set_allocated_min(::io::deephaven::proto::backplane::grpc::UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByCumulativeMin* value);
-  ::io::deephaven::proto::backplane::grpc::UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByCumulativeMin* unsafe_arena_release_min();
-
-  private:
-  const ::io::deephaven::proto::backplane::grpc::UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByCumulativeMin& _internal_min() const;
-  ::io::deephaven::proto::backplane::grpc::UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByCumulativeMin* _internal_mutable_min();
-
-  public:
-  // .io.deephaven.proto.backplane.grpc.UpdateByRequest.UpdateByOperation.UpdateByColumn.UpdateBySpec.UpdateByCumulativeMax max = 3;
-  bool has_max() const;
-  private:
-  bool _internal_has_max() const;
-
-  public:
-  void clear_max() ;
-  const ::io::deephaven::proto::backplane::grpc::UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByCumulativeMax& max() const;
-  PROTOBUF_NODISCARD ::io::deephaven::proto::backplane::grpc::UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByCumulativeMax* release_max();
-  ::io::deephaven::proto::backplane::grpc::UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByCumulativeMax* mutable_max();
-  void set_allocated_max(::io::deephaven::proto::backplane::grpc::UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByCumulativeMax* value);
-  void unsafe_arena_set_allocated_max(::io::deephaven::proto::backplane::grpc::UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByCumulativeMax* value);
-  ::io::deephaven::proto::backplane::grpc::UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByCumulativeMax* unsafe_arena_release_max();
-
-  private:
-  const ::io::deephaven::proto::backplane::grpc::UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByCumulativeMax& _internal_max() const;
-  ::io::deephaven::proto::backplane::grpc::UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByCumulativeMax* _internal_mutable_max();
-
-  public:
-  // .io.deephaven.proto.backplane.grpc.UpdateByRequest.UpdateByOperation.UpdateByColumn.UpdateBySpec.UpdateByCumulativeProduct product = 4;
-  bool has_product() const;
-  private:
-  bool _internal_has_product() const;
-
-  public:
-  void clear_product() ;
-  const ::io::deephaven::proto::backplane::grpc::UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByCumulativeProduct& product() const;
-  PROTOBUF_NODISCARD ::io::deephaven::proto::backplane::grpc::UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByCumulativeProduct* release_product();
-  ::io::deephaven::proto::backplane::grpc::UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByCumulativeProduct* mutable_product();
-  void set_allocated_product(::io::deephaven::proto::backplane::grpc::UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByCumulativeProduct* value);
-  void unsafe_arena_set_allocated_product(::io::deephaven::proto::backplane::grpc::UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByCumulativeProduct* value);
-  ::io::deephaven::proto::backplane::grpc::UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByCumulativeProduct* unsafe_arena_release_product();
-
-  private:
-  const ::io::deephaven::proto::backplane::grpc::UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByCumulativeProduct& _internal_product() const;
-  ::io::deephaven::proto::backplane::grpc::UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByCumulativeProduct* _internal_mutable_product();
-
-  public:
-  // .io.deephaven.proto.backplane.grpc.UpdateByRequest.UpdateByOperation.UpdateByColumn.UpdateBySpec.UpdateByFill fill = 5;
-  bool has_fill() const;
-  private:
-  bool _internal_has_fill() const;
-
-  public:
-  void clear_fill() ;
-  const ::io::deephaven::proto::backplane::grpc::UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByFill& fill() const;
-  PROTOBUF_NODISCARD ::io::deephaven::proto::backplane::grpc::UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByFill* release_fill();
-  ::io::deephaven::proto::backplane::grpc::UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByFill* mutable_fill();
-  void set_allocated_fill(::io::deephaven::proto::backplane::grpc::UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByFill* value);
-  void unsafe_arena_set_allocated_fill(::io::deephaven::proto::backplane::grpc::UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByFill* value);
-  ::io::deephaven::proto::backplane::grpc::UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByFill* unsafe_arena_release_fill();
-
-  private:
-  const ::io::deephaven::proto::backplane::grpc::UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByFill& _internal_fill() const;
-  ::io::deephaven::proto::backplane::grpc::UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByFill* _internal_mutable_fill();
-
-  public:
-  // .io.deephaven.proto.backplane.grpc.UpdateByRequest.UpdateByOperation.UpdateByColumn.UpdateBySpec.UpdateByEma ema = 6;
-  bool has_ema() const;
-  private:
-  bool _internal_has_ema() const;
-
-  public:
-  void clear_ema() ;
-  const ::io::deephaven::proto::backplane::grpc::UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByEma& ema() const;
-  PROTOBUF_NODISCARD ::io::deephaven::proto::backplane::grpc::UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByEma* release_ema();
-  ::io::deephaven::proto::backplane::grpc::UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByEma* mutable_ema();
-  void set_allocated_ema(::io::deephaven::proto::backplane::grpc::UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByEma* value);
-  void unsafe_arena_set_allocated_ema(::io::deephaven::proto::backplane::grpc::UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByEma* value);
-  ::io::deephaven::proto::backplane::grpc::UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByEma* unsafe_arena_release_ema();
-
-  private:
-  const ::io::deephaven::proto::backplane::grpc::UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByEma& _internal_ema() const;
-  ::io::deephaven::proto::backplane::grpc::UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByEma* _internal_mutable_ema();
-
-  public:
-  // .io.deephaven.proto.backplane.grpc.UpdateByRequest.UpdateByOperation.UpdateByColumn.UpdateBySpec.UpdateByRollingSum rolling_sum = 7;
-  bool has_rolling_sum() const;
-  private:
-  bool _internal_has_rolling_sum() const;
-
-  public:
-  void clear_rolling_sum() ;
-  const ::io::deephaven::proto::backplane::grpc::UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingSum& rolling_sum() const;
-  PROTOBUF_NODISCARD ::io::deephaven::proto::backplane::grpc::UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingSum* release_rolling_sum();
-  ::io::deephaven::proto::backplane::grpc::UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingSum* mutable_rolling_sum();
-  void set_allocated_rolling_sum(::io::deephaven::proto::backplane::grpc::UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingSum* value);
-  void unsafe_arena_set_allocated_rolling_sum(::io::deephaven::proto::backplane::grpc::UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingSum* value);
-  ::io::deephaven::proto::backplane::grpc::UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingSum* unsafe_arena_release_rolling_sum();
-
-  private:
-  const ::io::deephaven::proto::backplane::grpc::UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingSum& _internal_rolling_sum() const;
-  ::io::deephaven::proto::backplane::grpc::UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingSum* _internal_mutable_rolling_sum();
-
-  public:
-  // .io.deephaven.proto.backplane.grpc.UpdateByRequest.UpdateByOperation.UpdateByColumn.UpdateBySpec.UpdateByRollingGroup rolling_group = 8;
-  bool has_rolling_group() const;
-  private:
-  bool _internal_has_rolling_group() const;
-
-  public:
-  void clear_rolling_group() ;
-  const ::io::deephaven::proto::backplane::grpc::UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingGroup& rolling_group() const;
-  PROTOBUF_NODISCARD ::io::deephaven::proto::backplane::grpc::UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingGroup* release_rolling_group();
-  ::io::deephaven::proto::backplane::grpc::UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingGroup* mutable_rolling_group();
-  void set_allocated_rolling_group(::io::deephaven::proto::backplane::grpc::UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingGroup* value);
-  void unsafe_arena_set_allocated_rolling_group(::io::deephaven::proto::backplane::grpc::UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingGroup* value);
-  ::io::deephaven::proto::backplane::grpc::UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingGroup* unsafe_arena_release_rolling_group();
-
-  private:
-  const ::io::deephaven::proto::backplane::grpc::UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingGroup& _internal_rolling_group() const;
-  ::io::deephaven::proto::backplane::grpc::UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingGroup* _internal_mutable_rolling_group();
-
-  public:
-  // .io.deephaven.proto.backplane.grpc.UpdateByRequest.UpdateByOperation.UpdateByColumn.UpdateBySpec.UpdateByRollingAvg rolling_avg = 9;
-  bool has_rolling_avg() const;
-  private:
-  bool _internal_has_rolling_avg() const;
-
-  public:
-  void clear_rolling_avg() ;
-  const ::io::deephaven::proto::backplane::grpc::UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingAvg& rolling_avg() const;
-  PROTOBUF_NODISCARD ::io::deephaven::proto::backplane::grpc::UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingAvg* release_rolling_avg();
-  ::io::deephaven::proto::backplane::grpc::UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingAvg* mutable_rolling_avg();
-  void set_allocated_rolling_avg(::io::deephaven::proto::backplane::grpc::UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingAvg* value);
-  void unsafe_arena_set_allocated_rolling_avg(::io::deephaven::proto::backplane::grpc::UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingAvg* value);
-  ::io::deephaven::proto::backplane::grpc::UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingAvg* unsafe_arena_release_rolling_avg();
-
-  private:
-  const ::io::deephaven::proto::backplane::grpc::UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingAvg& _internal_rolling_avg() const;
-  ::io::deephaven::proto::backplane::grpc::UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingAvg* _internal_mutable_rolling_avg();
-
-  public:
-  // .io.deephaven.proto.backplane.grpc.UpdateByRequest.UpdateByOperation.UpdateByColumn.UpdateBySpec.UpdateByRollingMin rolling_min = 10;
-  bool has_rolling_min() const;
-  private:
-  bool _internal_has_rolling_min() const;
-
-  public:
-  void clear_rolling_min() ;
-  const ::io::deephaven::proto::backplane::grpc::UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingMin& rolling_min() const;
-  PROTOBUF_NODISCARD ::io::deephaven::proto::backplane::grpc::UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingMin* release_rolling_min();
-  ::io::deephaven::proto::backplane::grpc::UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingMin* mutable_rolling_min();
-  void set_allocated_rolling_min(::io::deephaven::proto::backplane::grpc::UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingMin* value);
-  void unsafe_arena_set_allocated_rolling_min(::io::deephaven::proto::backplane::grpc::UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingMin* value);
-  ::io::deephaven::proto::backplane::grpc::UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingMin* unsafe_arena_release_rolling_min();
-
-  private:
-  const ::io::deephaven::proto::backplane::grpc::UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingMin& _internal_rolling_min() const;
-  ::io::deephaven::proto::backplane::grpc::UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingMin* _internal_mutable_rolling_min();
-
-  public:
-  // .io.deephaven.proto.backplane.grpc.UpdateByRequest.UpdateByOperation.UpdateByColumn.UpdateBySpec.UpdateByRollingMax rolling_max = 11;
-  bool has_rolling_max() const;
-  private:
-  bool _internal_has_rolling_max() const;
-
-  public:
-  void clear_rolling_max() ;
-  const ::io::deephaven::proto::backplane::grpc::UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingMax& rolling_max() const;
-  PROTOBUF_NODISCARD ::io::deephaven::proto::backplane::grpc::UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingMax* release_rolling_max();
-  ::io::deephaven::proto::backplane::grpc::UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingMax* mutable_rolling_max();
-  void set_allocated_rolling_max(::io::deephaven::proto::backplane::grpc::UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingMax* value);
-  void unsafe_arena_set_allocated_rolling_max(::io::deephaven::proto::backplane::grpc::UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingMax* value);
-  ::io::deephaven::proto::backplane::grpc::UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingMax* unsafe_arena_release_rolling_max();
-
-  private:
-  const ::io::deephaven::proto::backplane::grpc::UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingMax& _internal_rolling_max() const;
-  ::io::deephaven::proto::backplane::grpc::UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingMax* _internal_mutable_rolling_max();
-
-  public:
-  // .io.deephaven.proto.backplane.grpc.UpdateByRequest.UpdateByOperation.UpdateByColumn.UpdateBySpec.UpdateByRollingProduct rolling_product = 12;
-  bool has_rolling_product() const;
-  private:
-  bool _internal_has_rolling_product() const;
-
-  public:
-  void clear_rolling_product() ;
-  const ::io::deephaven::proto::backplane::grpc::UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingProduct& rolling_product() const;
-  PROTOBUF_NODISCARD ::io::deephaven::proto::backplane::grpc::UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingProduct* release_rolling_product();
-  ::io::deephaven::proto::backplane::grpc::UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingProduct* mutable_rolling_product();
-  void set_allocated_rolling_product(::io::deephaven::proto::backplane::grpc::UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingProduct* value);
-  void unsafe_arena_set_allocated_rolling_product(::io::deephaven::proto::backplane::grpc::UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingProduct* value);
-  ::io::deephaven::proto::backplane::grpc::UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingProduct* unsafe_arena_release_rolling_product();
-
-  private:
-  const ::io::deephaven::proto::backplane::grpc::UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingProduct& _internal_rolling_product() const;
-  ::io::deephaven::proto::backplane::grpc::UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingProduct* _internal_mutable_rolling_product();
-
-  public:
-  // .io.deephaven.proto.backplane.grpc.UpdateByRequest.UpdateByOperation.UpdateByColumn.UpdateBySpec.UpdateByDelta delta = 13;
-  bool has_delta() const;
-  private:
-  bool _internal_has_delta() const;
-
-  public:
-  void clear_delta() ;
-  const ::io::deephaven::proto::backplane::grpc::UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByDelta& delta() const;
-  PROTOBUF_NODISCARD ::io::deephaven::proto::backplane::grpc::UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByDelta* release_delta();
-  ::io::deephaven::proto::backplane::grpc::UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByDelta* mutable_delta();
-  void set_allocated_delta(::io::deephaven::proto::backplane::grpc::UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByDelta* value);
-  void unsafe_arena_set_allocated_delta(::io::deephaven::proto::backplane::grpc::UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByDelta* value);
-  ::io::deephaven::proto::backplane::grpc::UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByDelta* unsafe_arena_release_delta();
-
-  private:
-  const ::io::deephaven::proto::backplane::grpc::UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByDelta& _internal_delta() const;
-  ::io::deephaven::proto::backplane::grpc::UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByDelta* _internal_mutable_delta();
-
-  public:
-  // .io.deephaven.proto.backplane.grpc.UpdateByRequest.UpdateByOperation.UpdateByColumn.UpdateBySpec.UpdateByEms ems = 14;
-  bool has_ems() const;
-  private:
-  bool _internal_has_ems() const;
-
-  public:
-  void clear_ems() ;
-  const ::io::deephaven::proto::backplane::grpc::UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByEms& ems() const;
-  PROTOBUF_NODISCARD ::io::deephaven::proto::backplane::grpc::UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByEms* release_ems();
-  ::io::deephaven::proto::backplane::grpc::UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByEms* mutable_ems();
-  void set_allocated_ems(::io::deephaven::proto::backplane::grpc::UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByEms* value);
-  void unsafe_arena_set_allocated_ems(::io::deephaven::proto::backplane::grpc::UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByEms* value);
-  ::io::deephaven::proto::backplane::grpc::UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByEms* unsafe_arena_release_ems();
-
-  private:
-  const ::io::deephaven::proto::backplane::grpc::UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByEms& _internal_ems() const;
-  ::io::deephaven::proto::backplane::grpc::UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByEms* _internal_mutable_ems();
-
-  public:
-  // .io.deephaven.proto.backplane.grpc.UpdateByRequest.UpdateByOperation.UpdateByColumn.UpdateBySpec.UpdateByEmMin em_min = 15;
-  bool has_em_min() const;
-  private:
-  bool _internal_has_em_min() const;
-
-  public:
-  void clear_em_min() ;
-  const ::io::deephaven::proto::backplane::grpc::UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByEmMin& em_min() const;
-  PROTOBUF_NODISCARD ::io::deephaven::proto::backplane::grpc::UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByEmMin* release_em_min();
-  ::io::deephaven::proto::backplane::grpc::UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByEmMin* mutable_em_min();
-  void set_allocated_em_min(::io::deephaven::proto::backplane::grpc::UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByEmMin* value);
-  void unsafe_arena_set_allocated_em_min(::io::deephaven::proto::backplane::grpc::UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByEmMin* value);
-  ::io::deephaven::proto::backplane::grpc::UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByEmMin* unsafe_arena_release_em_min();
-
-  private:
-  const ::io::deephaven::proto::backplane::grpc::UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByEmMin& _internal_em_min() const;
-  ::io::deephaven::proto::backplane::grpc::UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByEmMin* _internal_mutable_em_min();
-
-  public:
-  // .io.deephaven.proto.backplane.grpc.UpdateByRequest.UpdateByOperation.UpdateByColumn.UpdateBySpec.UpdateByEmMax em_max = 16;
-  bool has_em_max() const;
-  private:
-  bool _internal_has_em_max() const;
-
-  public:
-  void clear_em_max() ;
-  const ::io::deephaven::proto::backplane::grpc::UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByEmMax& em_max() const;
-  PROTOBUF_NODISCARD ::io::deephaven::proto::backplane::grpc::UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByEmMax* release_em_max();
-  ::io::deephaven::proto::backplane::grpc::UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByEmMax* mutable_em_max();
-  void set_allocated_em_max(::io::deephaven::proto::backplane::grpc::UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByEmMax* value);
-  void unsafe_arena_set_allocated_em_max(::io::deephaven::proto::backplane::grpc::UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByEmMax* value);
-  ::io::deephaven::proto::backplane::grpc::UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByEmMax* unsafe_arena_release_em_max();
-
-  private:
-  const ::io::deephaven::proto::backplane::grpc::UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByEmMax& _internal_em_max() const;
-  ::io::deephaven::proto::backplane::grpc::UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByEmMax* _internal_mutable_em_max();
-
-  public:
-  // .io.deephaven.proto.backplane.grpc.UpdateByRequest.UpdateByOperation.UpdateByColumn.UpdateBySpec.UpdateByEmStd em_std = 17;
-  bool has_em_std() const;
-  private:
-  bool _internal_has_em_std() const;
-
-  public:
-  void clear_em_std() ;
-  const ::io::deephaven::proto::backplane::grpc::UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByEmStd& em_std() const;
-  PROTOBUF_NODISCARD ::io::deephaven::proto::backplane::grpc::UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByEmStd* release_em_std();
-  ::io::deephaven::proto::backplane::grpc::UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByEmStd* mutable_em_std();
-  void set_allocated_em_std(::io::deephaven::proto::backplane::grpc::UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByEmStd* value);
-  void unsafe_arena_set_allocated_em_std(::io::deephaven::proto::backplane::grpc::UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByEmStd* value);
-  ::io::deephaven::proto::backplane::grpc::UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByEmStd* unsafe_arena_release_em_std();
-
-  private:
-  const ::io::deephaven::proto::backplane::grpc::UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByEmStd& _internal_em_std() const;
-  ::io::deephaven::proto::backplane::grpc::UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByEmStd* _internal_mutable_em_std();
-
-  public:
-  // .io.deephaven.proto.backplane.grpc.UpdateByRequest.UpdateByOperation.UpdateByColumn.UpdateBySpec.UpdateByRollingCount rolling_count = 18;
-  bool has_rolling_count() const;
-  private:
-  bool _internal_has_rolling_count() const;
-
-  public:
-  void clear_rolling_count() ;
-  const ::io::deephaven::proto::backplane::grpc::UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingCount& rolling_count() const;
-  PROTOBUF_NODISCARD ::io::deephaven::proto::backplane::grpc::UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingCount* release_rolling_count();
-  ::io::deephaven::proto::backplane::grpc::UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingCount* mutable_rolling_count();
-  void set_allocated_rolling_count(::io::deephaven::proto::backplane::grpc::UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingCount* value);
-  void unsafe_arena_set_allocated_rolling_count(::io::deephaven::proto::backplane::grpc::UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingCount* value);
-  ::io::deephaven::proto::backplane::grpc::UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingCount* unsafe_arena_release_rolling_count();
-
-  private:
-  const ::io::deephaven::proto::backplane::grpc::UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingCount& _internal_rolling_count() const;
-  ::io::deephaven::proto::backplane::grpc::UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingCount* _internal_mutable_rolling_count();
-
-  public:
-  // .io.deephaven.proto.backplane.grpc.UpdateByRequest.UpdateByOperation.UpdateByColumn.UpdateBySpec.UpdateByRollingStd rolling_std = 19;
-  bool has_rolling_std() const;
-  private:
-  bool _internal_has_rolling_std() const;
-
-  public:
-  void clear_rolling_std() ;
-  const ::io::deephaven::proto::backplane::grpc::UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingStd& rolling_std() const;
-  PROTOBUF_NODISCARD ::io::deephaven::proto::backplane::grpc::UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingStd* release_rolling_std();
-  ::io::deephaven::proto::backplane::grpc::UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingStd* mutable_rolling_std();
-  void set_allocated_rolling_std(::io::deephaven::proto::backplane::grpc::UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingStd* value);
-  void unsafe_arena_set_allocated_rolling_std(::io::deephaven::proto::backplane::grpc::UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingStd* value);
-  ::io::deephaven::proto::backplane::grpc::UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingStd* unsafe_arena_release_rolling_std();
-
-  private:
-  const ::io::deephaven::proto::backplane::grpc::UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingStd& _internal_rolling_std() const;
-  ::io::deephaven::proto::backplane::grpc::UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingStd* _internal_mutable_rolling_std();
-
-  public:
-  // .io.deephaven.proto.backplane.grpc.UpdateByRequest.UpdateByOperation.UpdateByColumn.UpdateBySpec.UpdateByRollingWAvg rolling_wavg = 20;
-  bool has_rolling_wavg() const;
-  private:
-  bool _internal_has_rolling_wavg() const;
-
-  public:
-  void clear_rolling_wavg() ;
-  const ::io::deephaven::proto::backplane::grpc::UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingWAvg& rolling_wavg() const;
-  PROTOBUF_NODISCARD ::io::deephaven::proto::backplane::grpc::UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingWAvg* release_rolling_wavg();
-  ::io::deephaven::proto::backplane::grpc::UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingWAvg* mutable_rolling_wavg();
-  void set_allocated_rolling_wavg(::io::deephaven::proto::backplane::grpc::UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingWAvg* value);
-  void unsafe_arena_set_allocated_rolling_wavg(::io::deephaven::proto::backplane::grpc::UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingWAvg* value);
-  ::io::deephaven::proto::backplane::grpc::UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingWAvg* unsafe_arena_release_rolling_wavg();
-
-  private:
-  const ::io::deephaven::proto::backplane::grpc::UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingWAvg& _internal_rolling_wavg() const;
-  ::io::deephaven::proto::backplane::grpc::UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingWAvg* _internal_mutable_rolling_wavg();
-
-  public:
-  // .io.deephaven.proto.backplane.grpc.UpdateByRequest.UpdateByOperation.UpdateByColumn.UpdateBySpec.UpdateByRollingFormula rolling_formula = 21;
-  bool has_rolling_formula() const;
-  private:
-  bool _internal_has_rolling_formula() const;
-
-  public:
-  void clear_rolling_formula() ;
-  const ::io::deephaven::proto::backplane::grpc::UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingFormula& rolling_formula() const;
-  PROTOBUF_NODISCARD ::io::deephaven::proto::backplane::grpc::UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingFormula* release_rolling_formula();
-  ::io::deephaven::proto::backplane::grpc::UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingFormula* mutable_rolling_formula();
-  void set_allocated_rolling_formula(::io::deephaven::proto::backplane::grpc::UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingFormula* value);
-  void unsafe_arena_set_allocated_rolling_formula(::io::deephaven::proto::backplane::grpc::UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingFormula* value);
-  ::io::deephaven::proto::backplane::grpc::UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingFormula* unsafe_arena_release_rolling_formula();
-
-  private:
-  const ::io::deephaven::proto::backplane::grpc::UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingFormula& _internal_rolling_formula() const;
-  ::io::deephaven::proto::backplane::grpc::UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingFormula* _internal_mutable_rolling_formula();
-
-  public:
-  void clear_type();
-  TypeCase type_case() const;
-  // @@protoc_insertion_point(class_scope:io.deephaven.proto.backplane.grpc.UpdateByRequest.UpdateByOperation.UpdateByColumn.UpdateBySpec)
- private:
-  class _Internal;
-  void set_has_sum();
-  void set_has_min();
-  void set_has_max();
-  void set_has_product();
-  void set_has_fill();
-  void set_has_ema();
-  void set_has_rolling_sum();
-  void set_has_rolling_group();
-  void set_has_rolling_avg();
-  void set_has_rolling_min();
-  void set_has_rolling_max();
-  void set_has_rolling_product();
-  void set_has_delta();
-  void set_has_ems();
-  void set_has_em_min();
-  void set_has_em_max();
-  void set_has_em_std();
-  void set_has_rolling_count();
-  void set_has_rolling_std();
-  void set_has_rolling_wavg();
-  void set_has_rolling_formula();
-
-  inline bool has_type() const;
-  inline void clear_has_type();
-
-  friend class ::google::protobuf::internal::TcParser;
-  static const ::google::protobuf::internal::TcParseTable<
-      0, 21, 21,
-      0, 2>
-      _table_;
-  friend class ::google::protobuf::MessageLite;
-  friend class ::google::protobuf::Arena;
-  template <typename T>
-  friend class ::google::protobuf::Arena::InternalHelper;
-  using InternalArenaConstructable_ = void;
-  using DestructorSkippable_ = void;
-  struct Impl_ {
-
-        inline explicit constexpr Impl_(
-            ::google::protobuf::internal::ConstantInitialized) noexcept;
-        inline explicit Impl_(::google::protobuf::internal::InternalVisibility visibility,
-                              ::google::protobuf::Arena* arena);
-        inline explicit Impl_(::google::protobuf::internal::InternalVisibility visibility,
-                              ::google::protobuf::Arena* arena, const Impl_& from);
-    union TypeUnion {
-      constexpr TypeUnion() : _constinit_{} {}
-        ::google::protobuf::internal::ConstantInitialized _constinit_;
-      ::io::deephaven::proto::backplane::grpc::UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByCumulativeSum* sum_;
-      ::io::deephaven::proto::backplane::grpc::UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByCumulativeMin* min_;
-      ::io::deephaven::proto::backplane::grpc::UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByCumulativeMax* max_;
-      ::io::deephaven::proto::backplane::grpc::UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByCumulativeProduct* product_;
-      ::io::deephaven::proto::backplane::grpc::UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByFill* fill_;
-      ::io::deephaven::proto::backplane::grpc::UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByEma* ema_;
-      ::io::deephaven::proto::backplane::grpc::UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingSum* rolling_sum_;
-      ::io::deephaven::proto::backplane::grpc::UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingGroup* rolling_group_;
-      ::io::deephaven::proto::backplane::grpc::UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingAvg* rolling_avg_;
-      ::io::deephaven::proto::backplane::grpc::UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingMin* rolling_min_;
-      ::io::deephaven::proto::backplane::grpc::UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingMax* rolling_max_;
-      ::io::deephaven::proto::backplane::grpc::UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingProduct* rolling_product_;
-      ::io::deephaven::proto::backplane::grpc::UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByDelta* delta_;
-      ::io::deephaven::proto::backplane::grpc::UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByEms* ems_;
-      ::io::deephaven::proto::backplane::grpc::UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByEmMin* em_min_;
-      ::io::deephaven::proto::backplane::grpc::UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByEmMax* em_max_;
-      ::io::deephaven::proto::backplane::grpc::UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByEmStd* em_std_;
-      ::io::deephaven::proto::backplane::grpc::UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingCount* rolling_count_;
-      ::io::deephaven::proto::backplane::grpc::UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingStd* rolling_std_;
-      ::io::deephaven::proto::backplane::grpc::UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingWAvg* rolling_wavg_;
-      ::io::deephaven::proto::backplane::grpc::UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingFormula* rolling_formula_;
-    } type_;
-    mutable ::google::protobuf::internal::CachedSize _cached_size_;
-    ::uint32_t _oneof_case_[1];
-
-    PROTOBUF_TSAN_DECLARE_MEMBER
-  };
-  union { Impl_ _impl_; };
-  friend struct ::TableStruct_deephaven_2fproto_2ftable_2eproto;
-};// -------------------------------------------------------------------
-
-class MultiJoinTablesRequest final :
-    public ::google::protobuf::Message /* @@protoc_insertion_point(class_definition:io.deephaven.proto.backplane.grpc.MultiJoinTablesRequest) */ {
- public:
-  inline MultiJoinTablesRequest() : MultiJoinTablesRequest(nullptr) {}
-  ~MultiJoinTablesRequest() override;
-  template<typename = void>
-  explicit PROTOBUF_CONSTEXPR MultiJoinTablesRequest(::google::protobuf::internal::ConstantInitialized);
-
-  inline MultiJoinTablesRequest(const MultiJoinTablesRequest& from)
-      : MultiJoinTablesRequest(nullptr, from) {}
-  MultiJoinTablesRequest(MultiJoinTablesRequest&& from) noexcept
-    : MultiJoinTablesRequest() {
-    *this = ::std::move(from);
-  }
-
-  inline MultiJoinTablesRequest& operator=(const MultiJoinTablesRequest& from) {
-    CopyFrom(from);
-    return *this;
-  }
-  inline MultiJoinTablesRequest& operator=(MultiJoinTablesRequest&& from) noexcept {
-    if (this == &from) return *this;
-    if (GetArena() == from.GetArena()
-  #ifdef PROTOBUF_FORCE_COPY_IN_MOVE
-        && GetArena() != nullptr
-  #endif  // !PROTOBUF_FORCE_COPY_IN_MOVE
-    ) {
-      InternalSwap(&from);
-    } else {
-      CopyFrom(from);
-    }
-    return *this;
-  }
-
-  inline const ::google::protobuf::UnknownFieldSet& unknown_fields() const
-      ABSL_ATTRIBUTE_LIFETIME_BOUND {
-    return _internal_metadata_.unknown_fields<::google::protobuf::UnknownFieldSet>(::google::protobuf::UnknownFieldSet::default_instance);
-  }
-  inline ::google::protobuf::UnknownFieldSet* mutable_unknown_fields()
-      ABSL_ATTRIBUTE_LIFETIME_BOUND {
-    return _internal_metadata_.mutable_unknown_fields<::google::protobuf::UnknownFieldSet>();
-  }
-
-  static const ::google::protobuf::Descriptor* descriptor() {
-    return GetDescriptor();
-  }
-  static const ::google::protobuf::Descriptor* GetDescriptor() {
-    return default_instance().GetMetadata().descriptor;
-  }
-  static const ::google::protobuf::Reflection* GetReflection() {
-    return default_instance().GetMetadata().reflection;
-  }
-  static const MultiJoinTablesRequest& default_instance() {
-    return *internal_default_instance();
-  }
-  static inline const MultiJoinTablesRequest* internal_default_instance() {
-    return reinterpret_cast<const MultiJoinTablesRequest*>(
-               &_MultiJoinTablesRequest_default_instance_);
-  }
-  static constexpr int kIndexInFileMessages =
-    57;
-
-  friend void swap(MultiJoinTablesRequest& a, MultiJoinTablesRequest& b) {
-    a.Swap(&b);
-  }
-  inline void Swap(MultiJoinTablesRequest* other) {
-    if (other == this) return;
-  #ifdef PROTOBUF_FORCE_COPY_IN_SWAP
-    if (GetArena() != nullptr &&
-        GetArena() == other->GetArena()) {
-   #else  // PROTOBUF_FORCE_COPY_IN_SWAP
-    if (GetArena() == other->GetArena()) {
-  #endif  // !PROTOBUF_FORCE_COPY_IN_SWAP
-      InternalSwap(other);
-    } else {
-      ::google::protobuf::internal::GenericSwap(this, other);
-    }
-  }
-  void UnsafeArenaSwap(MultiJoinTablesRequest* other) {
-    if (other == this) return;
-    ABSL_DCHECK(GetArena() == other->GetArena());
-    InternalSwap(other);
-  }
-
-  // implements Message ----------------------------------------------
-
-  MultiJoinTablesRequest* New(::google::protobuf::Arena* arena = nullptr) const final {
-    return CreateMaybeMessage<MultiJoinTablesRequest>(arena);
-  }
-  using ::google::protobuf::Message::CopyFrom;
-  void CopyFrom(const MultiJoinTablesRequest& from);
-  using ::google::protobuf::Message::MergeFrom;
-  void MergeFrom( const MultiJoinTablesRequest& from) {
-    MultiJoinTablesRequest::MergeImpl(*this, from);
-  }
-  private:
-  static void MergeImpl(::google::protobuf::Message& to_msg, const ::google::protobuf::Message& from_msg);
-  public:
-  PROTOBUF_ATTRIBUTE_REINITIALIZES void Clear() final;
-  bool IsInitialized() const final;
-
-  ::size_t ByteSizeLong() const final;
-  const char* _InternalParse(const char* ptr, ::google::protobuf::internal::ParseContext* ctx) final;
-  ::uint8_t* _InternalSerialize(
-      ::uint8_t* target, ::google::protobuf::io::EpsCopyOutputStream* stream) const final;
-  int GetCachedSize() const { return _impl_._cached_size_.Get(); }
-
-  private:
-  ::google::protobuf::internal::CachedSize* AccessCachedSize() const final;
-  void SharedCtor(::google::protobuf::Arena* arena);
-  void SharedDtor();
-  void InternalSwap(MultiJoinTablesRequest* other);
-
-  private:
-  friend class ::google::protobuf::internal::AnyMetadata;
-  static ::absl::string_view FullMessageName() {
-    return "io.deephaven.proto.backplane.grpc.MultiJoinTablesRequest";
-  }
-  protected:
-  explicit MultiJoinTablesRequest(::google::protobuf::Arena* arena);
-  MultiJoinTablesRequest(::google::protobuf::Arena* arena, const MultiJoinTablesRequest& from);
-  public:
-
-  static const ClassData _class_data_;
-  const ::google::protobuf::Message::ClassData*GetClassData() const final;
-
-  ::google::protobuf::Metadata GetMetadata() const final;
-
-  // nested types ----------------------------------------------------
-
-  // accessors -------------------------------------------------------
-
-  enum : int {
-    kMultiJoinInputsFieldNumber = 2,
-    kResultIdFieldNumber = 1,
-  };
-  // repeated .io.deephaven.proto.backplane.grpc.MultiJoinInput multi_join_inputs = 2;
-  int multi_join_inputs_size() const;
-  private:
-  int _internal_multi_join_inputs_size() const;
-
-  public:
-  void clear_multi_join_inputs() ;
-  ::io::deephaven::proto::backplane::grpc::MultiJoinInput* mutable_multi_join_inputs(int index);
-  ::google::protobuf::RepeatedPtrField< ::io::deephaven::proto::backplane::grpc::MultiJoinInput >*
-      mutable_multi_join_inputs();
-  private:
-  const ::google::protobuf::RepeatedPtrField<::io::deephaven::proto::backplane::grpc::MultiJoinInput>& _internal_multi_join_inputs() const;
-  ::google::protobuf::RepeatedPtrField<::io::deephaven::proto::backplane::grpc::MultiJoinInput>* _internal_mutable_multi_join_inputs();
-  public:
-  const ::io::deephaven::proto::backplane::grpc::MultiJoinInput& multi_join_inputs(int index) const;
-  ::io::deephaven::proto::backplane::grpc::MultiJoinInput* add_multi_join_inputs();
-  const ::google::protobuf::RepeatedPtrField< ::io::deephaven::proto::backplane::grpc::MultiJoinInput >&
-      multi_join_inputs() const;
-  // .io.deephaven.proto.backplane.grpc.Ticket result_id = 1;
-  bool has_result_id() const;
-  void clear_result_id() ;
-  const ::io::deephaven::proto::backplane::grpc::Ticket& result_id() const;
-  PROTOBUF_NODISCARD ::io::deephaven::proto::backplane::grpc::Ticket* release_result_id();
-  ::io::deephaven::proto::backplane::grpc::Ticket* mutable_result_id();
-  void set_allocated_result_id(::io::deephaven::proto::backplane::grpc::Ticket* value);
-  void unsafe_arena_set_allocated_result_id(::io::deephaven::proto::backplane::grpc::Ticket* value);
-  ::io::deephaven::proto::backplane::grpc::Ticket* unsafe_arena_release_result_id();
-
-  private:
-  const ::io::deephaven::proto::backplane::grpc::Ticket& _internal_result_id() const;
-  ::io::deephaven::proto::backplane::grpc::Ticket* _internal_mutable_result_id();
-
-  public:
-  // @@protoc_insertion_point(class_scope:io.deephaven.proto.backplane.grpc.MultiJoinTablesRequest)
- private:
-  class _Internal;
-
-  friend class ::google::protobuf::internal::TcParser;
-  static const ::google::protobuf::internal::TcParseTable<
-      1, 2, 2,
-      0, 2>
-      _table_;
-  friend class ::google::protobuf::MessageLite;
-  friend class ::google::protobuf::Arena;
-  template <typename T>
-  friend class ::google::protobuf::Arena::InternalHelper;
-  using InternalArenaConstructable_ = void;
-  using DestructorSkippable_ = void;
-  struct Impl_ {
-
-        inline explicit constexpr Impl_(
-            ::google::protobuf::internal::ConstantInitialized) noexcept;
-        inline explicit Impl_(::google::protobuf::internal::InternalVisibility visibility,
-                              ::google::protobuf::Arena* arena);
-        inline explicit Impl_(::google::protobuf::internal::InternalVisibility visibility,
-                              ::google::protobuf::Arena* arena, const Impl_& from);
-    ::google::protobuf::internal::HasBits<1> _has_bits_;
-    mutable ::google::protobuf::internal::CachedSize _cached_size_;
-    ::google::protobuf::RepeatedPtrField< ::io::deephaven::proto::backplane::grpc::MultiJoinInput > multi_join_inputs_;
-    ::io::deephaven::proto::backplane::grpc::Ticket* result_id_;
-    PROTOBUF_TSAN_DECLARE_MEMBER
-  };
-  union { Impl_ _impl_; };
-  friend struct ::TableStruct_deephaven_2fproto_2ftable_2eproto;
-};// -------------------------------------------------------------------
-
-class AndCondition final :
-    public ::google::protobuf::Message /* @@protoc_insertion_point(class_definition:io.deephaven.proto.backplane.grpc.AndCondition) */ {
- public:
-  inline AndCondition() : AndCondition(nullptr) {}
-  ~AndCondition() override;
-  template<typename = void>
-  explicit PROTOBUF_CONSTEXPR AndCondition(::google::protobuf::internal::ConstantInitialized);
-
-  inline AndCondition(const AndCondition& from)
-      : AndCondition(nullptr, from) {}
-  AndCondition(AndCondition&& from) noexcept
-    : AndCondition() {
-    *this = ::std::move(from);
-  }
-
-  inline AndCondition& operator=(const AndCondition& from) {
-    CopyFrom(from);
-    return *this;
-  }
-  inline AndCondition& operator=(AndCondition&& from) noexcept {
-    if (this == &from) return *this;
-    if (GetArena() == from.GetArena()
-  #ifdef PROTOBUF_FORCE_COPY_IN_MOVE
-        && GetArena() != nullptr
-  #endif  // !PROTOBUF_FORCE_COPY_IN_MOVE
-    ) {
-      InternalSwap(&from);
-    } else {
-      CopyFrom(from);
-    }
-    return *this;
-  }
-
-  inline const ::google::protobuf::UnknownFieldSet& unknown_fields() const
-      ABSL_ATTRIBUTE_LIFETIME_BOUND {
-    return _internal_metadata_.unknown_fields<::google::protobuf::UnknownFieldSet>(::google::protobuf::UnknownFieldSet::default_instance);
-  }
-  inline ::google::protobuf::UnknownFieldSet* mutable_unknown_fields()
-      ABSL_ATTRIBUTE_LIFETIME_BOUND {
-    return _internal_metadata_.mutable_unknown_fields<::google::protobuf::UnknownFieldSet>();
-  }
-
-  static const ::google::protobuf::Descriptor* descriptor() {
-    return GetDescriptor();
-  }
-  static const ::google::protobuf::Descriptor* GetDescriptor() {
-    return default_instance().GetMetadata().descriptor;
-  }
-  static const ::google::protobuf::Reflection* GetReflection() {
-    return default_instance().GetMetadata().reflection;
-  }
-  static const AndCondition& default_instance() {
-    return *internal_default_instance();
-  }
-  static inline const AndCondition* internal_default_instance() {
-    return reinterpret_cast<const AndCondition*>(
-               &_AndCondition_default_instance_);
-  }
-  static constexpr int kIndexInFileMessages =
-    101;
-
-  friend void swap(AndCondition& a, AndCondition& b) {
-    a.Swap(&b);
-  }
-  inline void Swap(AndCondition* other) {
-    if (other == this) return;
-  #ifdef PROTOBUF_FORCE_COPY_IN_SWAP
-    if (GetArena() != nullptr &&
-        GetArena() == other->GetArena()) {
-   #else  // PROTOBUF_FORCE_COPY_IN_SWAP
-    if (GetArena() == other->GetArena()) {
-  #endif  // !PROTOBUF_FORCE_COPY_IN_SWAP
-      InternalSwap(other);
-    } else {
-      ::google::protobuf::internal::GenericSwap(this, other);
-    }
-  }
-  void UnsafeArenaSwap(AndCondition* other) {
-    if (other == this) return;
-    ABSL_DCHECK(GetArena() == other->GetArena());
-    InternalSwap(other);
-  }
-
-  // implements Message ----------------------------------------------
-
-  AndCondition* New(::google::protobuf::Arena* arena = nullptr) const final {
-    return CreateMaybeMessage<AndCondition>(arena);
-  }
-  using ::google::protobuf::Message::CopyFrom;
-  void CopyFrom(const AndCondition& from);
-  using ::google::protobuf::Message::MergeFrom;
-  void MergeFrom( const AndCondition& from) {
-    AndCondition::MergeImpl(*this, from);
-  }
-  private:
-  static void MergeImpl(::google::protobuf::Message& to_msg, const ::google::protobuf::Message& from_msg);
-  public:
-  PROTOBUF_ATTRIBUTE_REINITIALIZES void Clear() final;
-  bool IsInitialized() const final;
-
-  ::size_t ByteSizeLong() const final;
-  const char* _InternalParse(const char* ptr, ::google::protobuf::internal::ParseContext* ctx) final;
-  ::uint8_t* _InternalSerialize(
-      ::uint8_t* target, ::google::protobuf::io::EpsCopyOutputStream* stream) const final;
-  int GetCachedSize() const { return _impl_._cached_size_.Get(); }
-
-  private:
-  ::google::protobuf::internal::CachedSize* AccessCachedSize() const final;
-  void SharedCtor(::google::protobuf::Arena* arena);
-  void SharedDtor();
-  void InternalSwap(AndCondition* other);
-
-  private:
-  friend class ::google::protobuf::internal::AnyMetadata;
-  static ::absl::string_view FullMessageName() {
-    return "io.deephaven.proto.backplane.grpc.AndCondition";
-  }
-  protected:
-  explicit AndCondition(::google::protobuf::Arena* arena);
-  AndCondition(::google::protobuf::Arena* arena, const AndCondition& from);
-  public:
-
-  static const ClassData _class_data_;
-  const ::google::protobuf::Message::ClassData*GetClassData() const final;
-
-  ::google::protobuf::Metadata GetMetadata() const final;
-
-  // nested types ----------------------------------------------------
-
-  // accessors -------------------------------------------------------
-
-  enum : int {
-    kFiltersFieldNumber = 1,
-  };
-  // repeated .io.deephaven.proto.backplane.grpc.Condition filters = 1;
-  int filters_size() const;
-  private:
-  int _internal_filters_size() const;
-
-  public:
-  void clear_filters() ;
-  ::io::deephaven::proto::backplane::grpc::Condition* mutable_filters(int index);
-  ::google::protobuf::RepeatedPtrField< ::io::deephaven::proto::backplane::grpc::Condition >*
-      mutable_filters();
-  private:
-  const ::google::protobuf::RepeatedPtrField<::io::deephaven::proto::backplane::grpc::Condition>& _internal_filters() const;
-  ::google::protobuf::RepeatedPtrField<::io::deephaven::proto::backplane::grpc::Condition>* _internal_mutable_filters();
-  public:
-  const ::io::deephaven::proto::backplane::grpc::Condition& filters(int index) const;
-  ::io::deephaven::proto::backplane::grpc::Condition* add_filters();
-  const ::google::protobuf::RepeatedPtrField< ::io::deephaven::proto::backplane::grpc::Condition >&
-      filters() const;
-  // @@protoc_insertion_point(class_scope:io.deephaven.proto.backplane.grpc.AndCondition)
- private:
-  class _Internal;
-
-  friend class ::google::protobuf::internal::TcParser;
-  static const ::google::protobuf::internal::TcParseTable<
-      0, 1, 1,
-      0, 2>
-      _table_;
-  friend class ::google::protobuf::MessageLite;
-  friend class ::google::protobuf::Arena;
-  template <typename T>
-  friend class ::google::protobuf::Arena::InternalHelper;
-  using InternalArenaConstructable_ = void;
-  using DestructorSkippable_ = void;
-  struct Impl_ {
-
-        inline explicit constexpr Impl_(
-            ::google::protobuf::internal::ConstantInitialized) noexcept;
-        inline explicit Impl_(::google::protobuf::internal::InternalVisibility visibility,
-                              ::google::protobuf::Arena* arena);
-        inline explicit Impl_(::google::protobuf::internal::InternalVisibility visibility,
-                              ::google::protobuf::Arena* arena, const Impl_& from);
-    ::google::protobuf::RepeatedPtrField< ::io::deephaven::proto::backplane::grpc::Condition > filters_;
-    mutable ::google::protobuf::internal::CachedSize _cached_size_;
-    PROTOBUF_TSAN_DECLARE_MEMBER
-  };
-  union { Impl_ _impl_; };
-  friend struct ::TableStruct_deephaven_2fproto_2ftable_2eproto;
-};// -------------------------------------------------------------------
-
-class Condition final :
-    public ::google::protobuf::Message /* @@protoc_insertion_point(class_definition:io.deephaven.proto.backplane.grpc.Condition) */ {
- public:
-  inline Condition() : Condition(nullptr) {}
-  ~Condition() override;
-  template<typename = void>
-  explicit PROTOBUF_CONSTEXPR Condition(::google::protobuf::internal::ConstantInitialized);
-
-  inline Condition(const Condition& from)
-      : Condition(nullptr, from) {}
-  Condition(Condition&& from) noexcept
-    : Condition() {
-    *this = ::std::move(from);
-  }
-
-  inline Condition& operator=(const Condition& from) {
-    CopyFrom(from);
-    return *this;
-  }
-  inline Condition& operator=(Condition&& from) noexcept {
-    if (this == &from) return *this;
-    if (GetArena() == from.GetArena()
-  #ifdef PROTOBUF_FORCE_COPY_IN_MOVE
-        && GetArena() != nullptr
-  #endif  // !PROTOBUF_FORCE_COPY_IN_MOVE
-    ) {
-      InternalSwap(&from);
-    } else {
-      CopyFrom(from);
-    }
-    return *this;
-  }
-
-  inline const ::google::protobuf::UnknownFieldSet& unknown_fields() const
-      ABSL_ATTRIBUTE_LIFETIME_BOUND {
-    return _internal_metadata_.unknown_fields<::google::protobuf::UnknownFieldSet>(::google::protobuf::UnknownFieldSet::default_instance);
-  }
-  inline ::google::protobuf::UnknownFieldSet* mutable_unknown_fields()
-      ABSL_ATTRIBUTE_LIFETIME_BOUND {
-    return _internal_metadata_.mutable_unknown_fields<::google::protobuf::UnknownFieldSet>();
-  }
-
-  static const ::google::protobuf::Descriptor* descriptor() {
-    return GetDescriptor();
-  }
-  static const ::google::protobuf::Descriptor* GetDescriptor() {
-    return default_instance().GetMetadata().descriptor;
-  }
-  static const ::google::protobuf::Reflection* GetReflection() {
-    return default_instance().GetMetadata().reflection;
-  }
-  static const Condition& default_instance() {
-    return *internal_default_instance();
-  }
-  enum DataCase {
-    kAnd = 1,
-    kOr = 2,
-    kNot = 3,
-    kCompare = 4,
-    kIn = 5,
-    kInvoke = 6,
-    kIsNull = 7,
-    kMatches = 8,
-    kContains = 9,
-    kSearch = 10,
-    DATA_NOT_SET = 0,
-  };
-
-  static inline const Condition* internal_default_instance() {
-    return reinterpret_cast<const Condition*>(
-               &_Condition_default_instance_);
-  }
-  static constexpr int kIndexInFileMessages =
-    100;
-
-  friend void swap(Condition& a, Condition& b) {
-    a.Swap(&b);
-  }
-  inline void Swap(Condition* other) {
-    if (other == this) return;
-  #ifdef PROTOBUF_FORCE_COPY_IN_SWAP
-    if (GetArena() != nullptr &&
-        GetArena() == other->GetArena()) {
-   #else  // PROTOBUF_FORCE_COPY_IN_SWAP
-    if (GetArena() == other->GetArena()) {
-  #endif  // !PROTOBUF_FORCE_COPY_IN_SWAP
-      InternalSwap(other);
-    } else {
-      ::google::protobuf::internal::GenericSwap(this, other);
-    }
-  }
-  void UnsafeArenaSwap(Condition* other) {
-    if (other == this) return;
-    ABSL_DCHECK(GetArena() == other->GetArena());
-    InternalSwap(other);
-  }
-
-  // implements Message ----------------------------------------------
-
-  Condition* New(::google::protobuf::Arena* arena = nullptr) const final {
-    return CreateMaybeMessage<Condition>(arena);
-  }
-  using ::google::protobuf::Message::CopyFrom;
-  void CopyFrom(const Condition& from);
-  using ::google::protobuf::Message::MergeFrom;
-  void MergeFrom( const Condition& from) {
-    Condition::MergeImpl(*this, from);
-  }
-  private:
-  static void MergeImpl(::google::protobuf::Message& to_msg, const ::google::protobuf::Message& from_msg);
-  public:
-  PROTOBUF_ATTRIBUTE_REINITIALIZES void Clear() final;
-  bool IsInitialized() const final;
-
-  ::size_t ByteSizeLong() const final;
-  const char* _InternalParse(const char* ptr, ::google::protobuf::internal::ParseContext* ctx) final;
-  ::uint8_t* _InternalSerialize(
-      ::uint8_t* target, ::google::protobuf::io::EpsCopyOutputStream* stream) const final;
-  int GetCachedSize() const { return _impl_._cached_size_.Get(); }
-
-  private:
-  ::google::protobuf::internal::CachedSize* AccessCachedSize() const final;
-  void SharedCtor(::google::protobuf::Arena* arena);
-  void SharedDtor();
-  void InternalSwap(Condition* other);
-
-  private:
-  friend class ::google::protobuf::internal::AnyMetadata;
-  static ::absl::string_view FullMessageName() {
-    return "io.deephaven.proto.backplane.grpc.Condition";
-  }
-  protected:
-  explicit Condition(::google::protobuf::Arena* arena);
-  Condition(::google::protobuf::Arena* arena, const Condition& from);
-  public:
-
-  static const ClassData _class_data_;
-  const ::google::protobuf::Message::ClassData*GetClassData() const final;
-
-  ::google::protobuf::Metadata GetMetadata() const final;
-
-  // nested types ----------------------------------------------------
-
-  // accessors -------------------------------------------------------
-
-  enum : int {
-    kAndFieldNumber = 1,
-    kOrFieldNumber = 2,
-    kNotFieldNumber = 3,
-    kCompareFieldNumber = 4,
-    kInFieldNumber = 5,
-    kInvokeFieldNumber = 6,
-    kIsNullFieldNumber = 7,
-    kMatchesFieldNumber = 8,
-    kContainsFieldNumber = 9,
-    kSearchFieldNumber = 10,
-  };
-  // .io.deephaven.proto.backplane.grpc.AndCondition and = 1;
-  bool has_and_() const;
-  private:
-  bool _internal_has_and_() const;
-
-  public:
-  void clear_and_() ;
-  const ::io::deephaven::proto::backplane::grpc::AndCondition& and_() const;
-  PROTOBUF_NODISCARD ::io::deephaven::proto::backplane::grpc::AndCondition* release_and_();
-  ::io::deephaven::proto::backplane::grpc::AndCondition* mutable_and_();
-  void set_allocated_and_(::io::deephaven::proto::backplane::grpc::AndCondition* value);
-  void unsafe_arena_set_allocated_and_(::io::deephaven::proto::backplane::grpc::AndCondition* value);
-  ::io::deephaven::proto::backplane::grpc::AndCondition* unsafe_arena_release_and_();
-
-  private:
-  const ::io::deephaven::proto::backplane::grpc::AndCondition& _internal_and_() const;
-  ::io::deephaven::proto::backplane::grpc::AndCondition* _internal_mutable_and_();
-
-  public:
-  // .io.deephaven.proto.backplane.grpc.OrCondition or = 2;
-  bool has_or_() const;
-  private:
-  bool _internal_has_or_() const;
-
-  public:
-  void clear_or_() ;
-  const ::io::deephaven::proto::backplane::grpc::OrCondition& or_() const;
-  PROTOBUF_NODISCARD ::io::deephaven::proto::backplane::grpc::OrCondition* release_or_();
-  ::io::deephaven::proto::backplane::grpc::OrCondition* mutable_or_();
-  void set_allocated_or_(::io::deephaven::proto::backplane::grpc::OrCondition* value);
-  void unsafe_arena_set_allocated_or_(::io::deephaven::proto::backplane::grpc::OrCondition* value);
-  ::io::deephaven::proto::backplane::grpc::OrCondition* unsafe_arena_release_or_();
-
-  private:
-  const ::io::deephaven::proto::backplane::grpc::OrCondition& _internal_or_() const;
-  ::io::deephaven::proto::backplane::grpc::OrCondition* _internal_mutable_or_();
-
-  public:
-  // .io.deephaven.proto.backplane.grpc.NotCondition not = 3;
-  bool has_not_() const;
-  private:
-  bool _internal_has_not_() const;
-
-  public:
-  void clear_not_() ;
-  const ::io::deephaven::proto::backplane::grpc::NotCondition& not_() const;
-  PROTOBUF_NODISCARD ::io::deephaven::proto::backplane::grpc::NotCondition* release_not_();
-  ::io::deephaven::proto::backplane::grpc::NotCondition* mutable_not_();
-  void set_allocated_not_(::io::deephaven::proto::backplane::grpc::NotCondition* value);
-  void unsafe_arena_set_allocated_not_(::io::deephaven::proto::backplane::grpc::NotCondition* value);
-  ::io::deephaven::proto::backplane::grpc::NotCondition* unsafe_arena_release_not_();
-
-  private:
-  const ::io::deephaven::proto::backplane::grpc::NotCondition& _internal_not_() const;
-  ::io::deephaven::proto::backplane::grpc::NotCondition* _internal_mutable_not_();
-
-  public:
-  // .io.deephaven.proto.backplane.grpc.CompareCondition compare = 4;
-  bool has_compare() const;
-  private:
-  bool _internal_has_compare() const;
-
-  public:
-  void clear_compare() ;
-  const ::io::deephaven::proto::backplane::grpc::CompareCondition& compare() const;
-  PROTOBUF_NODISCARD ::io::deephaven::proto::backplane::grpc::CompareCondition* release_compare();
-  ::io::deephaven::proto::backplane::grpc::CompareCondition* mutable_compare();
-  void set_allocated_compare(::io::deephaven::proto::backplane::grpc::CompareCondition* value);
-  void unsafe_arena_set_allocated_compare(::io::deephaven::proto::backplane::grpc::CompareCondition* value);
-  ::io::deephaven::proto::backplane::grpc::CompareCondition* unsafe_arena_release_compare();
-
-  private:
-  const ::io::deephaven::proto::backplane::grpc::CompareCondition& _internal_compare() const;
-  ::io::deephaven::proto::backplane::grpc::CompareCondition* _internal_mutable_compare();
-
-  public:
-  // .io.deephaven.proto.backplane.grpc.InCondition in = 5;
-  bool has_in() const;
-  private:
-  bool _internal_has_in() const;
-
-  public:
-  void clear_in() ;
-  const ::io::deephaven::proto::backplane::grpc::InCondition& in() const;
-  PROTOBUF_NODISCARD ::io::deephaven::proto::backplane::grpc::InCondition* release_in();
-  ::io::deephaven::proto::backplane::grpc::InCondition* mutable_in();
-  void set_allocated_in(::io::deephaven::proto::backplane::grpc::InCondition* value);
-  void unsafe_arena_set_allocated_in(::io::deephaven::proto::backplane::grpc::InCondition* value);
-  ::io::deephaven::proto::backplane::grpc::InCondition* unsafe_arena_release_in();
-
-  private:
-  const ::io::deephaven::proto::backplane::grpc::InCondition& _internal_in() const;
-  ::io::deephaven::proto::backplane::grpc::InCondition* _internal_mutable_in();
-
-  public:
-  // .io.deephaven.proto.backplane.grpc.InvokeCondition invoke = 6;
-  bool has_invoke() const;
-  private:
-  bool _internal_has_invoke() const;
-
-  public:
-  void clear_invoke() ;
-  const ::io::deephaven::proto::backplane::grpc::InvokeCondition& invoke() const;
-  PROTOBUF_NODISCARD ::io::deephaven::proto::backplane::grpc::InvokeCondition* release_invoke();
-  ::io::deephaven::proto::backplane::grpc::InvokeCondition* mutable_invoke();
-  void set_allocated_invoke(::io::deephaven::proto::backplane::grpc::InvokeCondition* value);
-  void unsafe_arena_set_allocated_invoke(::io::deephaven::proto::backplane::grpc::InvokeCondition* value);
-  ::io::deephaven::proto::backplane::grpc::InvokeCondition* unsafe_arena_release_invoke();
-
-  private:
-  const ::io::deephaven::proto::backplane::grpc::InvokeCondition& _internal_invoke() const;
-  ::io::deephaven::proto::backplane::grpc::InvokeCondition* _internal_mutable_invoke();
-
-  public:
-  // .io.deephaven.proto.backplane.grpc.IsNullCondition is_null = 7;
-  bool has_is_null() const;
-  private:
-  bool _internal_has_is_null() const;
-
-  public:
-  void clear_is_null() ;
-  const ::io::deephaven::proto::backplane::grpc::IsNullCondition& is_null() const;
-  PROTOBUF_NODISCARD ::io::deephaven::proto::backplane::grpc::IsNullCondition* release_is_null();
-  ::io::deephaven::proto::backplane::grpc::IsNullCondition* mutable_is_null();
-  void set_allocated_is_null(::io::deephaven::proto::backplane::grpc::IsNullCondition* value);
-  void unsafe_arena_set_allocated_is_null(::io::deephaven::proto::backplane::grpc::IsNullCondition* value);
-  ::io::deephaven::proto::backplane::grpc::IsNullCondition* unsafe_arena_release_is_null();
-
-  private:
-  const ::io::deephaven::proto::backplane::grpc::IsNullCondition& _internal_is_null() const;
-  ::io::deephaven::proto::backplane::grpc::IsNullCondition* _internal_mutable_is_null();
-
-  public:
-  // .io.deephaven.proto.backplane.grpc.MatchesCondition matches = 8;
-  bool has_matches() const;
-  private:
-  bool _internal_has_matches() const;
-
-  public:
-  void clear_matches() ;
-  const ::io::deephaven::proto::backplane::grpc::MatchesCondition& matches() const;
-  PROTOBUF_NODISCARD ::io::deephaven::proto::backplane::grpc::MatchesCondition* release_matches();
-  ::io::deephaven::proto::backplane::grpc::MatchesCondition* mutable_matches();
-  void set_allocated_matches(::io::deephaven::proto::backplane::grpc::MatchesCondition* value);
-  void unsafe_arena_set_allocated_matches(::io::deephaven::proto::backplane::grpc::MatchesCondition* value);
-  ::io::deephaven::proto::backplane::grpc::MatchesCondition* unsafe_arena_release_matches();
-
-  private:
-  const ::io::deephaven::proto::backplane::grpc::MatchesCondition& _internal_matches() const;
-  ::io::deephaven::proto::backplane::grpc::MatchesCondition* _internal_mutable_matches();
-
-  public:
-  // .io.deephaven.proto.backplane.grpc.ContainsCondition contains = 9;
-  bool has_contains() const;
-  private:
-  bool _internal_has_contains() const;
-
-  public:
-  void clear_contains() ;
-  const ::io::deephaven::proto::backplane::grpc::ContainsCondition& contains() const;
-  PROTOBUF_NODISCARD ::io::deephaven::proto::backplane::grpc::ContainsCondition* release_contains();
-  ::io::deephaven::proto::backplane::grpc::ContainsCondition* mutable_contains();
-  void set_allocated_contains(::io::deephaven::proto::backplane::grpc::ContainsCondition* value);
-  void unsafe_arena_set_allocated_contains(::io::deephaven::proto::backplane::grpc::ContainsCondition* value);
-  ::io::deephaven::proto::backplane::grpc::ContainsCondition* unsafe_arena_release_contains();
-
-  private:
-  const ::io::deephaven::proto::backplane::grpc::ContainsCondition& _internal_contains() const;
-  ::io::deephaven::proto::backplane::grpc::ContainsCondition* _internal_mutable_contains();
-
-  public:
-  // .io.deephaven.proto.backplane.grpc.SearchCondition search = 10;
-  bool has_search() const;
-  private:
-  bool _internal_has_search() const;
-
-  public:
-  void clear_search() ;
-  const ::io::deephaven::proto::backplane::grpc::SearchCondition& search() const;
-  PROTOBUF_NODISCARD ::io::deephaven::proto::backplane::grpc::SearchCondition* release_search();
-  ::io::deephaven::proto::backplane::grpc::SearchCondition* mutable_search();
-  void set_allocated_search(::io::deephaven::proto::backplane::grpc::SearchCondition* value);
-  void unsafe_arena_set_allocated_search(::io::deephaven::proto::backplane::grpc::SearchCondition* value);
-  ::io::deephaven::proto::backplane::grpc::SearchCondition* unsafe_arena_release_search();
-
-  private:
-  const ::io::deephaven::proto::backplane::grpc::SearchCondition& _internal_search() const;
-  ::io::deephaven::proto::backplane::grpc::SearchCondition* _internal_mutable_search();
-
-  public:
-  void clear_data();
-  DataCase data_case() const;
-  // @@protoc_insertion_point(class_scope:io.deephaven.proto.backplane.grpc.Condition)
- private:
-  class _Internal;
-  void set_has_and_();
-  void set_has_or_();
-  void set_has_not_();
-  void set_has_compare();
-  void set_has_in();
-  void set_has_invoke();
-  void set_has_is_null();
-  void set_has_matches();
-  void set_has_contains();
-  void set_has_search();
-
-  inline bool has_data() const;
-  inline void clear_has_data();
-
-  friend class ::google::protobuf::internal::TcParser;
-  static const ::google::protobuf::internal::TcParseTable<
-      0, 10, 10,
-      0, 2>
-      _table_;
-  friend class ::google::protobuf::MessageLite;
-  friend class ::google::protobuf::Arena;
-  template <typename T>
-  friend class ::google::protobuf::Arena::InternalHelper;
-  using InternalArenaConstructable_ = void;
-  using DestructorSkippable_ = void;
-  struct Impl_ {
-
-        inline explicit constexpr Impl_(
-            ::google::protobuf::internal::ConstantInitialized) noexcept;
-        inline explicit Impl_(::google::protobuf::internal::InternalVisibility visibility,
-                              ::google::protobuf::Arena* arena);
-        inline explicit Impl_(::google::protobuf::internal::InternalVisibility visibility,
-                              ::google::protobuf::Arena* arena, const Impl_& from);
-    union DataUnion {
-      constexpr DataUnion() : _constinit_{} {}
-        ::google::protobuf::internal::ConstantInitialized _constinit_;
-      ::io::deephaven::proto::backplane::grpc::AndCondition* and__;
-      ::io::deephaven::proto::backplane::grpc::OrCondition* or__;
-      ::io::deephaven::proto::backplane::grpc::NotCondition* not__;
-      ::io::deephaven::proto::backplane::grpc::CompareCondition* compare_;
-      ::io::deephaven::proto::backplane::grpc::InCondition* in_;
-      ::io::deephaven::proto::backplane::grpc::InvokeCondition* invoke_;
-      ::io::deephaven::proto::backplane::grpc::IsNullCondition* is_null_;
-      ::io::deephaven::proto::backplane::grpc::MatchesCondition* matches_;
-      ::io::deephaven::proto::backplane::grpc::ContainsCondition* contains_;
-      ::io::deephaven::proto::backplane::grpc::SearchCondition* search_;
-    } data_;
-    mutable ::google::protobuf::internal::CachedSize _cached_size_;
-    ::uint32_t _oneof_case_[1];
-
-    PROTOBUF_TSAN_DECLARE_MEMBER
-  };
-  union { Impl_ _impl_; };
-  friend struct ::TableStruct_deephaven_2fproto_2ftable_2eproto;
-};// -------------------------------------------------------------------
-
-class NotCondition final :
-    public ::google::protobuf::Message /* @@protoc_insertion_point(class_definition:io.deephaven.proto.backplane.grpc.NotCondition) */ {
- public:
-  inline NotCondition() : NotCondition(nullptr) {}
-  ~NotCondition() override;
-  template<typename = void>
-  explicit PROTOBUF_CONSTEXPR NotCondition(::google::protobuf::internal::ConstantInitialized);
-
-  inline NotCondition(const NotCondition& from)
-      : NotCondition(nullptr, from) {}
-  NotCondition(NotCondition&& from) noexcept
-    : NotCondition() {
-    *this = ::std::move(from);
-  }
-
-  inline NotCondition& operator=(const NotCondition& from) {
-    CopyFrom(from);
-    return *this;
-  }
-  inline NotCondition& operator=(NotCondition&& from) noexcept {
-    if (this == &from) return *this;
-    if (GetArena() == from.GetArena()
-  #ifdef PROTOBUF_FORCE_COPY_IN_MOVE
-        && GetArena() != nullptr
-  #endif  // !PROTOBUF_FORCE_COPY_IN_MOVE
-    ) {
-      InternalSwap(&from);
-    } else {
-      CopyFrom(from);
-    }
-    return *this;
-  }
-
-  inline const ::google::protobuf::UnknownFieldSet& unknown_fields() const
-      ABSL_ATTRIBUTE_LIFETIME_BOUND {
-    return _internal_metadata_.unknown_fields<::google::protobuf::UnknownFieldSet>(::google::protobuf::UnknownFieldSet::default_instance);
-  }
-  inline ::google::protobuf::UnknownFieldSet* mutable_unknown_fields()
-      ABSL_ATTRIBUTE_LIFETIME_BOUND {
-    return _internal_metadata_.mutable_unknown_fields<::google::protobuf::UnknownFieldSet>();
-  }
-
-  static const ::google::protobuf::Descriptor* descriptor() {
-    return GetDescriptor();
-  }
-  static const ::google::protobuf::Descriptor* GetDescriptor() {
-    return default_instance().GetMetadata().descriptor;
-  }
-  static const ::google::protobuf::Reflection* GetReflection() {
-    return default_instance().GetMetadata().reflection;
-  }
-  static const NotCondition& default_instance() {
-    return *internal_default_instance();
-  }
-  static inline const NotCondition* internal_default_instance() {
-    return reinterpret_cast<const NotCondition*>(
-               &_NotCondition_default_instance_);
-  }
-  static constexpr int kIndexInFileMessages =
-    103;
-
-  friend void swap(NotCondition& a, NotCondition& b) {
-    a.Swap(&b);
-  }
-  inline void Swap(NotCondition* other) {
-    if (other == this) return;
-  #ifdef PROTOBUF_FORCE_COPY_IN_SWAP
-    if (GetArena() != nullptr &&
-        GetArena() == other->GetArena()) {
-   #else  // PROTOBUF_FORCE_COPY_IN_SWAP
-    if (GetArena() == other->GetArena()) {
-  #endif  // !PROTOBUF_FORCE_COPY_IN_SWAP
-      InternalSwap(other);
-    } else {
-      ::google::protobuf::internal::GenericSwap(this, other);
-    }
-  }
-  void UnsafeArenaSwap(NotCondition* other) {
-    if (other == this) return;
-    ABSL_DCHECK(GetArena() == other->GetArena());
-    InternalSwap(other);
-  }
-
-  // implements Message ----------------------------------------------
-
-  NotCondition* New(::google::protobuf::Arena* arena = nullptr) const final {
-    return CreateMaybeMessage<NotCondition>(arena);
-  }
-  using ::google::protobuf::Message::CopyFrom;
-  void CopyFrom(const NotCondition& from);
-  using ::google::protobuf::Message::MergeFrom;
-  void MergeFrom( const NotCondition& from) {
-    NotCondition::MergeImpl(*this, from);
-  }
-  private:
-  static void MergeImpl(::google::protobuf::Message& to_msg, const ::google::protobuf::Message& from_msg);
-  public:
-  PROTOBUF_ATTRIBUTE_REINITIALIZES void Clear() final;
-  bool IsInitialized() const final;
-
-  ::size_t ByteSizeLong() const final;
-  const char* _InternalParse(const char* ptr, ::google::protobuf::internal::ParseContext* ctx) final;
-  ::uint8_t* _InternalSerialize(
-      ::uint8_t* target, ::google::protobuf::io::EpsCopyOutputStream* stream) const final;
-  int GetCachedSize() const { return _impl_._cached_size_.Get(); }
-
-  private:
-  ::google::protobuf::internal::CachedSize* AccessCachedSize() const final;
-  void SharedCtor(::google::protobuf::Arena* arena);
-  void SharedDtor();
-  void InternalSwap(NotCondition* other);
-
-  private:
-  friend class ::google::protobuf::internal::AnyMetadata;
-  static ::absl::string_view FullMessageName() {
-    return "io.deephaven.proto.backplane.grpc.NotCondition";
-  }
-  protected:
-  explicit NotCondition(::google::protobuf::Arena* arena);
-  NotCondition(::google::protobuf::Arena* arena, const NotCondition& from);
-  public:
-
-  static const ClassData _class_data_;
-  const ::google::protobuf::Message::ClassData*GetClassData() const final;
-
-  ::google::protobuf::Metadata GetMetadata() const final;
-
-  // nested types ----------------------------------------------------
-
-  // accessors -------------------------------------------------------
-
-  enum : int {
-    kFilterFieldNumber = 1,
-  };
-  // .io.deephaven.proto.backplane.grpc.Condition filter = 1;
-  bool has_filter() const;
-  void clear_filter() ;
-  const ::io::deephaven::proto::backplane::grpc::Condition& filter() const;
-  PROTOBUF_NODISCARD ::io::deephaven::proto::backplane::grpc::Condition* release_filter();
-  ::io::deephaven::proto::backplane::grpc::Condition* mutable_filter();
-  void set_allocated_filter(::io::deephaven::proto::backplane::grpc::Condition* value);
-  void unsafe_arena_set_allocated_filter(::io::deephaven::proto::backplane::grpc::Condition* value);
-  ::io::deephaven::proto::backplane::grpc::Condition* unsafe_arena_release_filter();
-
-  private:
-  const ::io::deephaven::proto::backplane::grpc::Condition& _internal_filter() const;
-  ::io::deephaven::proto::backplane::grpc::Condition* _internal_mutable_filter();
-
-  public:
-  // @@protoc_insertion_point(class_scope:io.deephaven.proto.backplane.grpc.NotCondition)
- private:
-  class _Internal;
-
-  friend class ::google::protobuf::internal::TcParser;
-  static const ::google::protobuf::internal::TcParseTable<
-      0, 1, 1,
-      0, 2>
-      _table_;
-  friend class ::google::protobuf::MessageLite;
-  friend class ::google::protobuf::Arena;
-  template <typename T>
-  friend class ::google::protobuf::Arena::InternalHelper;
-  using InternalArenaConstructable_ = void;
-  using DestructorSkippable_ = void;
-  struct Impl_ {
-
-        inline explicit constexpr Impl_(
-            ::google::protobuf::internal::ConstantInitialized) noexcept;
-        inline explicit Impl_(::google::protobuf::internal::InternalVisibility visibility,
-                              ::google::protobuf::Arena* arena);
-        inline explicit Impl_(::google::protobuf::internal::InternalVisibility visibility,
-                              ::google::protobuf::Arena* arena, const Impl_& from);
-    ::google::protobuf::internal::HasBits<1> _has_bits_;
-    mutable ::google::protobuf::internal::CachedSize _cached_size_;
-    ::io::deephaven::proto::backplane::grpc::Condition* filter_;
-    PROTOBUF_TSAN_DECLARE_MEMBER
-  };
-  union { Impl_ _impl_; };
-  friend struct ::TableStruct_deephaven_2fproto_2ftable_2eproto;
-};// -------------------------------------------------------------------
-
-class OrCondition final :
-    public ::google::protobuf::Message /* @@protoc_insertion_point(class_definition:io.deephaven.proto.backplane.grpc.OrCondition) */ {
- public:
-  inline OrCondition() : OrCondition(nullptr) {}
-  ~OrCondition() override;
-  template<typename = void>
-  explicit PROTOBUF_CONSTEXPR OrCondition(::google::protobuf::internal::ConstantInitialized);
-
-  inline OrCondition(const OrCondition& from)
-      : OrCondition(nullptr, from) {}
-  OrCondition(OrCondition&& from) noexcept
-    : OrCondition() {
-    *this = ::std::move(from);
-  }
-
-  inline OrCondition& operator=(const OrCondition& from) {
-    CopyFrom(from);
-    return *this;
-  }
-  inline OrCondition& operator=(OrCondition&& from) noexcept {
-    if (this == &from) return *this;
-    if (GetArena() == from.GetArena()
-  #ifdef PROTOBUF_FORCE_COPY_IN_MOVE
-        && GetArena() != nullptr
-  #endif  // !PROTOBUF_FORCE_COPY_IN_MOVE
-    ) {
-      InternalSwap(&from);
-    } else {
-      CopyFrom(from);
-    }
-    return *this;
-  }
-
-  inline const ::google::protobuf::UnknownFieldSet& unknown_fields() const
-      ABSL_ATTRIBUTE_LIFETIME_BOUND {
-    return _internal_metadata_.unknown_fields<::google::protobuf::UnknownFieldSet>(::google::protobuf::UnknownFieldSet::default_instance);
-  }
-  inline ::google::protobuf::UnknownFieldSet* mutable_unknown_fields()
-      ABSL_ATTRIBUTE_LIFETIME_BOUND {
-    return _internal_metadata_.mutable_unknown_fields<::google::protobuf::UnknownFieldSet>();
-  }
-
-  static const ::google::protobuf::Descriptor* descriptor() {
-    return GetDescriptor();
-  }
-  static const ::google::protobuf::Descriptor* GetDescriptor() {
-    return default_instance().GetMetadata().descriptor;
-  }
-  static const ::google::protobuf::Reflection* GetReflection() {
-    return default_instance().GetMetadata().reflection;
-  }
-  static const OrCondition& default_instance() {
-    return *internal_default_instance();
-  }
-  static inline const OrCondition* internal_default_instance() {
-    return reinterpret_cast<const OrCondition*>(
-               &_OrCondition_default_instance_);
-  }
-  static constexpr int kIndexInFileMessages =
-    102;
-
-  friend void swap(OrCondition& a, OrCondition& b) {
-    a.Swap(&b);
-  }
-  inline void Swap(OrCondition* other) {
-    if (other == this) return;
-  #ifdef PROTOBUF_FORCE_COPY_IN_SWAP
-    if (GetArena() != nullptr &&
-        GetArena() == other->GetArena()) {
-   #else  // PROTOBUF_FORCE_COPY_IN_SWAP
-    if (GetArena() == other->GetArena()) {
-  #endif  // !PROTOBUF_FORCE_COPY_IN_SWAP
-      InternalSwap(other);
-    } else {
-      ::google::protobuf::internal::GenericSwap(this, other);
-    }
-  }
-  void UnsafeArenaSwap(OrCondition* other) {
-    if (other == this) return;
-    ABSL_DCHECK(GetArena() == other->GetArena());
-    InternalSwap(other);
-  }
-
-  // implements Message ----------------------------------------------
-
-  OrCondition* New(::google::protobuf::Arena* arena = nullptr) const final {
-    return CreateMaybeMessage<OrCondition>(arena);
-  }
-  using ::google::protobuf::Message::CopyFrom;
-  void CopyFrom(const OrCondition& from);
-  using ::google::protobuf::Message::MergeFrom;
-  void MergeFrom( const OrCondition& from) {
-    OrCondition::MergeImpl(*this, from);
-  }
-  private:
-  static void MergeImpl(::google::protobuf::Message& to_msg, const ::google::protobuf::Message& from_msg);
-  public:
-  PROTOBUF_ATTRIBUTE_REINITIALIZES void Clear() final;
-  bool IsInitialized() const final;
-
-  ::size_t ByteSizeLong() const final;
-  const char* _InternalParse(const char* ptr, ::google::protobuf::internal::ParseContext* ctx) final;
-  ::uint8_t* _InternalSerialize(
-      ::uint8_t* target, ::google::protobuf::io::EpsCopyOutputStream* stream) const final;
-  int GetCachedSize() const { return _impl_._cached_size_.Get(); }
-
-  private:
-  ::google::protobuf::internal::CachedSize* AccessCachedSize() const final;
-  void SharedCtor(::google::protobuf::Arena* arena);
-  void SharedDtor();
-  void InternalSwap(OrCondition* other);
-
-  private:
-  friend class ::google::protobuf::internal::AnyMetadata;
-  static ::absl::string_view FullMessageName() {
-    return "io.deephaven.proto.backplane.grpc.OrCondition";
-  }
-  protected:
-  explicit OrCondition(::google::protobuf::Arena* arena);
-  OrCondition(::google::protobuf::Arena* arena, const OrCondition& from);
-  public:
-
-  static const ClassData _class_data_;
-  const ::google::protobuf::Message::ClassData*GetClassData() const final;
-
-  ::google::protobuf::Metadata GetMetadata() const final;
-
-  // nested types ----------------------------------------------------
-
-  // accessors -------------------------------------------------------
-
-  enum : int {
-    kFiltersFieldNumber = 1,
-  };
-  // repeated .io.deephaven.proto.backplane.grpc.Condition filters = 1;
-  int filters_size() const;
-  private:
-  int _internal_filters_size() const;
-
-  public:
-  void clear_filters() ;
-  ::io::deephaven::proto::backplane::grpc::Condition* mutable_filters(int index);
-  ::google::protobuf::RepeatedPtrField< ::io::deephaven::proto::backplane::grpc::Condition >*
-      mutable_filters();
-  private:
-  const ::google::protobuf::RepeatedPtrField<::io::deephaven::proto::backplane::grpc::Condition>& _internal_filters() const;
-  ::google::protobuf::RepeatedPtrField<::io::deephaven::proto::backplane::grpc::Condition>* _internal_mutable_filters();
-  public:
-  const ::io::deephaven::proto::backplane::grpc::Condition& filters(int index) const;
-  ::io::deephaven::proto::backplane::grpc::Condition* add_filters();
-  const ::google::protobuf::RepeatedPtrField< ::io::deephaven::proto::backplane::grpc::Condition >&
-      filters() const;
-  // @@protoc_insertion_point(class_scope:io.deephaven.proto.backplane.grpc.OrCondition)
- private:
-  class _Internal;
-
-  friend class ::google::protobuf::internal::TcParser;
-  static const ::google::protobuf::internal::TcParseTable<
-      0, 1, 1,
-      0, 2>
-      _table_;
-  friend class ::google::protobuf::MessageLite;
-  friend class ::google::protobuf::Arena;
-  template <typename T>
-  friend class ::google::protobuf::Arena::InternalHelper;
-  using InternalArenaConstructable_ = void;
-  using DestructorSkippable_ = void;
-  struct Impl_ {
-
-        inline explicit constexpr Impl_(
-            ::google::protobuf::internal::ConstantInitialized) noexcept;
-        inline explicit Impl_(::google::protobuf::internal::InternalVisibility visibility,
-                              ::google::protobuf::Arena* arena);
-        inline explicit Impl_(::google::protobuf::internal::InternalVisibility visibility,
-                              ::google::protobuf::Arena* arena, const Impl_& from);
-    ::google::protobuf::RepeatedPtrField< ::io::deephaven::proto::backplane::grpc::Condition > filters_;
-    mutable ::google::protobuf::internal::CachedSize _cached_size_;
-    PROTOBUF_TSAN_DECLARE_MEMBER
-  };
-  union { Impl_ _impl_; };
-  friend struct ::TableStruct_deephaven_2fproto_2ftable_2eproto;
-};// -------------------------------------------------------------------
-
-class Aggregation_AggregationColumns final :
-    public ::google::protobuf::Message /* @@protoc_insertion_point(class_definition:io.deephaven.proto.backplane.grpc.Aggregation.AggregationColumns) */ {
- public:
-  inline Aggregation_AggregationColumns() : Aggregation_AggregationColumns(nullptr) {}
-  ~Aggregation_AggregationColumns() override;
-  template<typename = void>
-  explicit PROTOBUF_CONSTEXPR Aggregation_AggregationColumns(::google::protobuf::internal::ConstantInitialized);
-
-  inline Aggregation_AggregationColumns(const Aggregation_AggregationColumns& from)
-      : Aggregation_AggregationColumns(nullptr, from) {}
-  Aggregation_AggregationColumns(Aggregation_AggregationColumns&& from) noexcept
-    : Aggregation_AggregationColumns() {
-    *this = ::std::move(from);
-  }
-
-  inline Aggregation_AggregationColumns& operator=(const Aggregation_AggregationColumns& from) {
-    CopyFrom(from);
-    return *this;
-  }
-  inline Aggregation_AggregationColumns& operator=(Aggregation_AggregationColumns&& from) noexcept {
-    if (this == &from) return *this;
-    if (GetArena() == from.GetArena()
-  #ifdef PROTOBUF_FORCE_COPY_IN_MOVE
-        && GetArena() != nullptr
-  #endif  // !PROTOBUF_FORCE_COPY_IN_MOVE
-    ) {
-      InternalSwap(&from);
-    } else {
-      CopyFrom(from);
-    }
-    return *this;
-  }
-
-  inline const ::google::protobuf::UnknownFieldSet& unknown_fields() const
-      ABSL_ATTRIBUTE_LIFETIME_BOUND {
-    return _internal_metadata_.unknown_fields<::google::protobuf::UnknownFieldSet>(::google::protobuf::UnknownFieldSet::default_instance);
-  }
-  inline ::google::protobuf::UnknownFieldSet* mutable_unknown_fields()
-      ABSL_ATTRIBUTE_LIFETIME_BOUND {
-    return _internal_metadata_.mutable_unknown_fields<::google::protobuf::UnknownFieldSet>();
-  }
-
-  static const ::google::protobuf::Descriptor* descriptor() {
-    return GetDescriptor();
-  }
-  static const ::google::protobuf::Descriptor* GetDescriptor() {
-    return default_instance().GetMetadata().descriptor;
-  }
-  static const ::google::protobuf::Reflection* GetReflection() {
-    return default_instance().GetMetadata().reflection;
-  }
-  static const Aggregation_AggregationColumns& default_instance() {
-    return *internal_default_instance();
-  }
-  static inline const Aggregation_AggregationColumns* internal_default_instance() {
-    return reinterpret_cast<const Aggregation_AggregationColumns*>(
-               &_Aggregation_AggregationColumns_default_instance_);
-  }
-  static constexpr int kIndexInFileMessages =
-    87;
-
-  friend void swap(Aggregation_AggregationColumns& a, Aggregation_AggregationColumns& b) {
-    a.Swap(&b);
-  }
-  inline void Swap(Aggregation_AggregationColumns* other) {
-    if (other == this) return;
-  #ifdef PROTOBUF_FORCE_COPY_IN_SWAP
-    if (GetArena() != nullptr &&
-        GetArena() == other->GetArena()) {
-   #else  // PROTOBUF_FORCE_COPY_IN_SWAP
-    if (GetArena() == other->GetArena()) {
-  #endif  // !PROTOBUF_FORCE_COPY_IN_SWAP
-      InternalSwap(other);
-    } else {
-      ::google::protobuf::internal::GenericSwap(this, other);
-    }
-  }
-  void UnsafeArenaSwap(Aggregation_AggregationColumns* other) {
-    if (other == this) return;
-    ABSL_DCHECK(GetArena() == other->GetArena());
-    InternalSwap(other);
-  }
-
-  // implements Message ----------------------------------------------
-
-  Aggregation_AggregationColumns* New(::google::protobuf::Arena* arena = nullptr) const final {
-    return CreateMaybeMessage<Aggregation_AggregationColumns>(arena);
-  }
-  using ::google::protobuf::Message::CopyFrom;
-  void CopyFrom(const Aggregation_AggregationColumns& from);
-  using ::google::protobuf::Message::MergeFrom;
-  void MergeFrom( const Aggregation_AggregationColumns& from) {
-    Aggregation_AggregationColumns::MergeImpl(*this, from);
-  }
-  private:
-  static void MergeImpl(::google::protobuf::Message& to_msg, const ::google::protobuf::Message& from_msg);
-  public:
-  PROTOBUF_ATTRIBUTE_REINITIALIZES void Clear() final;
-  bool IsInitialized() const final;
-
-  ::size_t ByteSizeLong() const final;
-  const char* _InternalParse(const char* ptr, ::google::protobuf::internal::ParseContext* ctx) final;
-  ::uint8_t* _InternalSerialize(
-      ::uint8_t* target, ::google::protobuf::io::EpsCopyOutputStream* stream) const final;
-  int GetCachedSize() const { return _impl_._cached_size_.Get(); }
-
-  private:
-  ::google::protobuf::internal::CachedSize* AccessCachedSize() const final;
-  void SharedCtor(::google::protobuf::Arena* arena);
-  void SharedDtor();
-  void InternalSwap(Aggregation_AggregationColumns* other);
-
-  private:
-  friend class ::google::protobuf::internal::AnyMetadata;
-  static ::absl::string_view FullMessageName() {
-    return "io.deephaven.proto.backplane.grpc.Aggregation.AggregationColumns";
-  }
-  protected:
-  explicit Aggregation_AggregationColumns(::google::protobuf::Arena* arena);
-  Aggregation_AggregationColumns(::google::protobuf::Arena* arena, const Aggregation_AggregationColumns& from);
-  public:
-
-  static const ClassData _class_data_;
-  const ::google::protobuf::Message::ClassData*GetClassData() const final;
-
-  ::google::protobuf::Metadata GetMetadata() const final;
-
-  // nested types ----------------------------------------------------
-
-  // accessors -------------------------------------------------------
-
-  enum : int {
-    kMatchPairsFieldNumber = 2,
-    kSpecFieldNumber = 1,
-  };
-  // repeated string match_pairs = 2;
-  int match_pairs_size() const;
-  private:
-  int _internal_match_pairs_size() const;
-
-  public:
-  void clear_match_pairs() ;
-  const std::string& match_pairs(int index) const;
-  std::string* mutable_match_pairs(int index);
-  void set_match_pairs(int index, const std::string& value);
-  void set_match_pairs(int index, std::string&& value);
-  void set_match_pairs(int index, const char* value);
-  void set_match_pairs(int index, const char* value, std::size_t size);
-  void set_match_pairs(int index, absl::string_view value);
-  std::string* add_match_pairs();
-  void add_match_pairs(const std::string& value);
-  void add_match_pairs(std::string&& value);
-  void add_match_pairs(const char* value);
-  void add_match_pairs(const char* value, std::size_t size);
-  void add_match_pairs(absl::string_view value);
-  const ::google::protobuf::RepeatedPtrField<std::string>& match_pairs() const;
-  ::google::protobuf::RepeatedPtrField<std::string>* mutable_match_pairs();
-
-  private:
-  const ::google::protobuf::RepeatedPtrField<std::string>& _internal_match_pairs() const;
-  ::google::protobuf::RepeatedPtrField<std::string>* _internal_mutable_match_pairs();
-
-  public:
-  // .io.deephaven.proto.backplane.grpc.AggSpec spec = 1;
-  bool has_spec() const;
-  void clear_spec() ;
-  const ::io::deephaven::proto::backplane::grpc::AggSpec& spec() const;
-  PROTOBUF_NODISCARD ::io::deephaven::proto::backplane::grpc::AggSpec* release_spec();
-  ::io::deephaven::proto::backplane::grpc::AggSpec* mutable_spec();
-  void set_allocated_spec(::io::deephaven::proto::backplane::grpc::AggSpec* value);
-  void unsafe_arena_set_allocated_spec(::io::deephaven::proto::backplane::grpc::AggSpec* value);
-  ::io::deephaven::proto::backplane::grpc::AggSpec* unsafe_arena_release_spec();
-
-  private:
-  const ::io::deephaven::proto::backplane::grpc::AggSpec& _internal_spec() const;
-  ::io::deephaven::proto::backplane::grpc::AggSpec* _internal_mutable_spec();
-
-  public:
-  // @@protoc_insertion_point(class_scope:io.deephaven.proto.backplane.grpc.Aggregation.AggregationColumns)
- private:
-  class _Internal;
-
-  friend class ::google::protobuf::internal::TcParser;
-  static const ::google::protobuf::internal::TcParseTable<
-      1, 2, 1,
-      84, 2>
-      _table_;
-  friend class ::google::protobuf::MessageLite;
-  friend class ::google::protobuf::Arena;
-  template <typename T>
-  friend class ::google::protobuf::Arena::InternalHelper;
-  using InternalArenaConstructable_ = void;
-  using DestructorSkippable_ = void;
-  struct Impl_ {
-
-        inline explicit constexpr Impl_(
-            ::google::protobuf::internal::ConstantInitialized) noexcept;
-        inline explicit Impl_(::google::protobuf::internal::InternalVisibility visibility,
-                              ::google::protobuf::Arena* arena);
-        inline explicit Impl_(::google::protobuf::internal::InternalVisibility visibility,
-                              ::google::protobuf::Arena* arena, const Impl_& from);
-    ::google::protobuf::internal::HasBits<1> _has_bits_;
-    mutable ::google::protobuf::internal::CachedSize _cached_size_;
-    ::google::protobuf::RepeatedPtrField<std::string> match_pairs_;
-    ::io::deephaven::proto::backplane::grpc::AggSpec* spec_;
-    PROTOBUF_TSAN_DECLARE_MEMBER
-  };
-  union { Impl_ _impl_; };
-  friend struct ::TableStruct_deephaven_2fproto_2ftable_2eproto;
-};// -------------------------------------------------------------------
-
-class AggregateAllRequest final :
-    public ::google::protobuf::Message /* @@protoc_insertion_point(class_definition:io.deephaven.proto.backplane.grpc.AggregateAllRequest) */ {
- public:
-  inline AggregateAllRequest() : AggregateAllRequest(nullptr) {}
-  ~AggregateAllRequest() override;
-  template<typename = void>
-  explicit PROTOBUF_CONSTEXPR AggregateAllRequest(::google::protobuf::internal::ConstantInitialized);
-
-  inline AggregateAllRequest(const AggregateAllRequest& from)
-      : AggregateAllRequest(nullptr, from) {}
-  AggregateAllRequest(AggregateAllRequest&& from) noexcept
-    : AggregateAllRequest() {
-    *this = ::std::move(from);
-  }
-
-  inline AggregateAllRequest& operator=(const AggregateAllRequest& from) {
-    CopyFrom(from);
-    return *this;
-  }
-  inline AggregateAllRequest& operator=(AggregateAllRequest&& from) noexcept {
-    if (this == &from) return *this;
-    if (GetArena() == from.GetArena()
-  #ifdef PROTOBUF_FORCE_COPY_IN_MOVE
-        && GetArena() != nullptr
-  #endif  // !PROTOBUF_FORCE_COPY_IN_MOVE
-    ) {
-      InternalSwap(&from);
-    } else {
-      CopyFrom(from);
-    }
-    return *this;
-  }
-
-  inline const ::google::protobuf::UnknownFieldSet& unknown_fields() const
-      ABSL_ATTRIBUTE_LIFETIME_BOUND {
-    return _internal_metadata_.unknown_fields<::google::protobuf::UnknownFieldSet>(::google::protobuf::UnknownFieldSet::default_instance);
-  }
-  inline ::google::protobuf::UnknownFieldSet* mutable_unknown_fields()
-      ABSL_ATTRIBUTE_LIFETIME_BOUND {
-    return _internal_metadata_.mutable_unknown_fields<::google::protobuf::UnknownFieldSet>();
-  }
-
-  static const ::google::protobuf::Descriptor* descriptor() {
-    return GetDescriptor();
-  }
-  static const ::google::protobuf::Descriptor* GetDescriptor() {
-    return default_instance().GetMetadata().descriptor;
-  }
-  static const ::google::protobuf::Reflection* GetReflection() {
-    return default_instance().GetMetadata().reflection;
-  }
-  static const AggregateAllRequest& default_instance() {
-    return *internal_default_instance();
-  }
-  static inline const AggregateAllRequest* internal_default_instance() {
-    return reinterpret_cast<const AggregateAllRequest*>(
-               &_AggregateAllRequest_default_instance_);
-  }
-  static constexpr int kIndexInFileMessages =
-    61;
-
-  friend void swap(AggregateAllRequest& a, AggregateAllRequest& b) {
-    a.Swap(&b);
-  }
-  inline void Swap(AggregateAllRequest* other) {
-    if (other == this) return;
-  #ifdef PROTOBUF_FORCE_COPY_IN_SWAP
-    if (GetArena() != nullptr &&
-        GetArena() == other->GetArena()) {
-   #else  // PROTOBUF_FORCE_COPY_IN_SWAP
-    if (GetArena() == other->GetArena()) {
-  #endif  // !PROTOBUF_FORCE_COPY_IN_SWAP
-      InternalSwap(other);
-    } else {
-      ::google::protobuf::internal::GenericSwap(this, other);
-    }
-  }
-  void UnsafeArenaSwap(AggregateAllRequest* other) {
-    if (other == this) return;
-    ABSL_DCHECK(GetArena() == other->GetArena());
-    InternalSwap(other);
-  }
-
-  // implements Message ----------------------------------------------
-
-  AggregateAllRequest* New(::google::protobuf::Arena* arena = nullptr) const final {
-    return CreateMaybeMessage<AggregateAllRequest>(arena);
-  }
-  using ::google::protobuf::Message::CopyFrom;
-  void CopyFrom(const AggregateAllRequest& from);
-  using ::google::protobuf::Message::MergeFrom;
-  void MergeFrom( const AggregateAllRequest& from) {
-    AggregateAllRequest::MergeImpl(*this, from);
-  }
-  private:
-  static void MergeImpl(::google::protobuf::Message& to_msg, const ::google::protobuf::Message& from_msg);
-  public:
-  PROTOBUF_ATTRIBUTE_REINITIALIZES void Clear() final;
-  bool IsInitialized() const final;
-
-  ::size_t ByteSizeLong() const final;
-  const char* _InternalParse(const char* ptr, ::google::protobuf::internal::ParseContext* ctx) final;
-  ::uint8_t* _InternalSerialize(
-      ::uint8_t* target, ::google::protobuf::io::EpsCopyOutputStream* stream) const final;
-  int GetCachedSize() const { return _impl_._cached_size_.Get(); }
-
-  private:
-  ::google::protobuf::internal::CachedSize* AccessCachedSize() const final;
-  void SharedCtor(::google::protobuf::Arena* arena);
-  void SharedDtor();
-  void InternalSwap(AggregateAllRequest* other);
-
-  private:
-  friend class ::google::protobuf::internal::AnyMetadata;
-  static ::absl::string_view FullMessageName() {
-    return "io.deephaven.proto.backplane.grpc.AggregateAllRequest";
-  }
-  protected:
-  explicit AggregateAllRequest(::google::protobuf::Arena* arena);
-  AggregateAllRequest(::google::protobuf::Arena* arena, const AggregateAllRequest& from);
-  public:
-
-  static const ClassData _class_data_;
-  const ::google::protobuf::Message::ClassData*GetClassData() const final;
-
-  ::google::protobuf::Metadata GetMetadata() const final;
-
-  // nested types ----------------------------------------------------
-
-  // accessors -------------------------------------------------------
-
-  enum : int {
-    kGroupByColumnsFieldNumber = 4,
-    kResultIdFieldNumber = 1,
-    kSourceIdFieldNumber = 2,
-    kSpecFieldNumber = 3,
-  };
-  // repeated string group_by_columns = 4;
-  int group_by_columns_size() const;
-  private:
-  int _internal_group_by_columns_size() const;
-
-  public:
-  void clear_group_by_columns() ;
-  const std::string& group_by_columns(int index) const;
-  std::string* mutable_group_by_columns(int index);
-  void set_group_by_columns(int index, const std::string& value);
-  void set_group_by_columns(int index, std::string&& value);
-  void set_group_by_columns(int index, const char* value);
-  void set_group_by_columns(int index, const char* value, std::size_t size);
-  void set_group_by_columns(int index, absl::string_view value);
-  std::string* add_group_by_columns();
-  void add_group_by_columns(const std::string& value);
-  void add_group_by_columns(std::string&& value);
-  void add_group_by_columns(const char* value);
-  void add_group_by_columns(const char* value, std::size_t size);
-  void add_group_by_columns(absl::string_view value);
-  const ::google::protobuf::RepeatedPtrField<std::string>& group_by_columns() const;
-  ::google::protobuf::RepeatedPtrField<std::string>* mutable_group_by_columns();
-
-  private:
-  const ::google::protobuf::RepeatedPtrField<std::string>& _internal_group_by_columns() const;
-  ::google::protobuf::RepeatedPtrField<std::string>* _internal_mutable_group_by_columns();
-
-  public:
-  // .io.deephaven.proto.backplane.grpc.Ticket result_id = 1;
-  bool has_result_id() const;
-  void clear_result_id() ;
-  const ::io::deephaven::proto::backplane::grpc::Ticket& result_id() const;
-  PROTOBUF_NODISCARD ::io::deephaven::proto::backplane::grpc::Ticket* release_result_id();
-  ::io::deephaven::proto::backplane::grpc::Ticket* mutable_result_id();
-  void set_allocated_result_id(::io::deephaven::proto::backplane::grpc::Ticket* value);
-  void unsafe_arena_set_allocated_result_id(::io::deephaven::proto::backplane::grpc::Ticket* value);
-  ::io::deephaven::proto::backplane::grpc::Ticket* unsafe_arena_release_result_id();
-
-  private:
-  const ::io::deephaven::proto::backplane::grpc::Ticket& _internal_result_id() const;
-  ::io::deephaven::proto::backplane::grpc::Ticket* _internal_mutable_result_id();
-
-  public:
-  // .io.deephaven.proto.backplane.grpc.TableReference source_id = 2;
-  bool has_source_id() const;
-  void clear_source_id() ;
-  const ::io::deephaven::proto::backplane::grpc::TableReference& source_id() const;
-  PROTOBUF_NODISCARD ::io::deephaven::proto::backplane::grpc::TableReference* release_source_id();
-  ::io::deephaven::proto::backplane::grpc::TableReference* mutable_source_id();
-  void set_allocated_source_id(::io::deephaven::proto::backplane::grpc::TableReference* value);
-  void unsafe_arena_set_allocated_source_id(::io::deephaven::proto::backplane::grpc::TableReference* value);
-  ::io::deephaven::proto::backplane::grpc::TableReference* unsafe_arena_release_source_id();
-
-  private:
-  const ::io::deephaven::proto::backplane::grpc::TableReference& _internal_source_id() const;
-  ::io::deephaven::proto::backplane::grpc::TableReference* _internal_mutable_source_id();
-
-  public:
-  // .io.deephaven.proto.backplane.grpc.AggSpec spec = 3;
-  bool has_spec() const;
-  void clear_spec() ;
-  const ::io::deephaven::proto::backplane::grpc::AggSpec& spec() const;
-  PROTOBUF_NODISCARD ::io::deephaven::proto::backplane::grpc::AggSpec* release_spec();
-  ::io::deephaven::proto::backplane::grpc::AggSpec* mutable_spec();
-  void set_allocated_spec(::io::deephaven::proto::backplane::grpc::AggSpec* value);
-  void unsafe_arena_set_allocated_spec(::io::deephaven::proto::backplane::grpc::AggSpec* value);
-  ::io::deephaven::proto::backplane::grpc::AggSpec* unsafe_arena_release_spec();
-
-  private:
-  const ::io::deephaven::proto::backplane::grpc::AggSpec& _internal_spec() const;
-  ::io::deephaven::proto::backplane::grpc::AggSpec* _internal_mutable_spec();
-
-  public:
-  // @@protoc_insertion_point(class_scope:io.deephaven.proto.backplane.grpc.AggregateAllRequest)
- private:
-  class _Internal;
-
-  friend class ::google::protobuf::internal::TcParser;
-  static const ::google::protobuf::internal::TcParseTable<
-      2, 4, 3,
-      78, 2>
-      _table_;
-  friend class ::google::protobuf::MessageLite;
-  friend class ::google::protobuf::Arena;
-  template <typename T>
-  friend class ::google::protobuf::Arena::InternalHelper;
-  using InternalArenaConstructable_ = void;
-  using DestructorSkippable_ = void;
-  struct Impl_ {
-
-        inline explicit constexpr Impl_(
-            ::google::protobuf::internal::ConstantInitialized) noexcept;
-        inline explicit Impl_(::google::protobuf::internal::InternalVisibility visibility,
-                              ::google::protobuf::Arena* arena);
-        inline explicit Impl_(::google::protobuf::internal::InternalVisibility visibility,
-                              ::google::protobuf::Arena* arena, const Impl_& from);
-    ::google::protobuf::internal::HasBits<1> _has_bits_;
-    mutable ::google::protobuf::internal::CachedSize _cached_size_;
-    ::google::protobuf::RepeatedPtrField<std::string> group_by_columns_;
-    ::io::deephaven::proto::backplane::grpc::Ticket* result_id_;
-    ::io::deephaven::proto::backplane::grpc::TableReference* source_id_;
-    ::io::deephaven::proto::backplane::grpc::AggSpec* spec_;
-    PROTOBUF_TSAN_DECLARE_MEMBER
-  };
-  union { Impl_ _impl_; };
-  friend struct ::TableStruct_deephaven_2fproto_2ftable_2eproto;
-};// -------------------------------------------------------------------
-
-class UpdateByRequest_UpdateByOperation_UpdateByColumn final :
-    public ::google::protobuf::Message /* @@protoc_insertion_point(class_definition:io.deephaven.proto.backplane.grpc.UpdateByRequest.UpdateByOperation.UpdateByColumn) */ {
- public:
-  inline UpdateByRequest_UpdateByOperation_UpdateByColumn() : UpdateByRequest_UpdateByOperation_UpdateByColumn(nullptr) {}
-  ~UpdateByRequest_UpdateByOperation_UpdateByColumn() override;
-  template<typename = void>
-  explicit PROTOBUF_CONSTEXPR UpdateByRequest_UpdateByOperation_UpdateByColumn(::google::protobuf::internal::ConstantInitialized);
-
-  inline UpdateByRequest_UpdateByOperation_UpdateByColumn(const UpdateByRequest_UpdateByOperation_UpdateByColumn& from)
-      : UpdateByRequest_UpdateByOperation_UpdateByColumn(nullptr, from) {}
-  UpdateByRequest_UpdateByOperation_UpdateByColumn(UpdateByRequest_UpdateByOperation_UpdateByColumn&& from) noexcept
-    : UpdateByRequest_UpdateByOperation_UpdateByColumn() {
-    *this = ::std::move(from);
-  }
-
-  inline UpdateByRequest_UpdateByOperation_UpdateByColumn& operator=(const UpdateByRequest_UpdateByOperation_UpdateByColumn& from) {
-    CopyFrom(from);
-    return *this;
-  }
-  inline UpdateByRequest_UpdateByOperation_UpdateByColumn& operator=(UpdateByRequest_UpdateByOperation_UpdateByColumn&& from) noexcept {
-    if (this == &from) return *this;
-    if (GetArena() == from.GetArena()
-  #ifdef PROTOBUF_FORCE_COPY_IN_MOVE
-        && GetArena() != nullptr
-  #endif  // !PROTOBUF_FORCE_COPY_IN_MOVE
-    ) {
-      InternalSwap(&from);
-    } else {
-      CopyFrom(from);
-    }
-    return *this;
-  }
-
-  inline const ::google::protobuf::UnknownFieldSet& unknown_fields() const
-      ABSL_ATTRIBUTE_LIFETIME_BOUND {
-    return _internal_metadata_.unknown_fields<::google::protobuf::UnknownFieldSet>(::google::protobuf::UnknownFieldSet::default_instance);
-  }
-  inline ::google::protobuf::UnknownFieldSet* mutable_unknown_fields()
-      ABSL_ATTRIBUTE_LIFETIME_BOUND {
-    return _internal_metadata_.mutable_unknown_fields<::google::protobuf::UnknownFieldSet>();
-  }
-
-  static const ::google::protobuf::Descriptor* descriptor() {
-    return GetDescriptor();
-  }
-  static const ::google::protobuf::Descriptor* GetDescriptor() {
-    return default_instance().GetMetadata().descriptor;
-  }
-  static const ::google::protobuf::Reflection* GetReflection() {
-    return default_instance().GetMetadata().reflection;
-  }
-  static const UpdateByRequest_UpdateByOperation_UpdateByColumn& default_instance() {
-    return *internal_default_instance();
-  }
-  static inline const UpdateByRequest_UpdateByOperation_UpdateByColumn* internal_default_instance() {
-    return reinterpret_cast<const UpdateByRequest_UpdateByOperation_UpdateByColumn*>(
-               &_UpdateByRequest_UpdateByOperation_UpdateByColumn_default_instance_);
-  }
-  static constexpr int kIndexInFileMessages =
-    38;
-
-  friend void swap(UpdateByRequest_UpdateByOperation_UpdateByColumn& a, UpdateByRequest_UpdateByOperation_UpdateByColumn& b) {
-    a.Swap(&b);
-  }
-  inline void Swap(UpdateByRequest_UpdateByOperation_UpdateByColumn* other) {
-    if (other == this) return;
-  #ifdef PROTOBUF_FORCE_COPY_IN_SWAP
-    if (GetArena() != nullptr &&
-        GetArena() == other->GetArena()) {
-   #else  // PROTOBUF_FORCE_COPY_IN_SWAP
-    if (GetArena() == other->GetArena()) {
-  #endif  // !PROTOBUF_FORCE_COPY_IN_SWAP
-      InternalSwap(other);
-    } else {
-      ::google::protobuf::internal::GenericSwap(this, other);
-    }
-  }
-  void UnsafeArenaSwap(UpdateByRequest_UpdateByOperation_UpdateByColumn* other) {
-    if (other == this) return;
-    ABSL_DCHECK(GetArena() == other->GetArena());
-    InternalSwap(other);
-  }
-
-  // implements Message ----------------------------------------------
-
-  UpdateByRequest_UpdateByOperation_UpdateByColumn* New(::google::protobuf::Arena* arena = nullptr) const final {
-    return CreateMaybeMessage<UpdateByRequest_UpdateByOperation_UpdateByColumn>(arena);
-  }
-  using ::google::protobuf::Message::CopyFrom;
-  void CopyFrom(const UpdateByRequest_UpdateByOperation_UpdateByColumn& from);
-  using ::google::protobuf::Message::MergeFrom;
-  void MergeFrom( const UpdateByRequest_UpdateByOperation_UpdateByColumn& from) {
-    UpdateByRequest_UpdateByOperation_UpdateByColumn::MergeImpl(*this, from);
-  }
-  private:
-  static void MergeImpl(::google::protobuf::Message& to_msg, const ::google::protobuf::Message& from_msg);
-  public:
-  PROTOBUF_ATTRIBUTE_REINITIALIZES void Clear() final;
-  bool IsInitialized() const final;
-
-  ::size_t ByteSizeLong() const final;
-  const char* _InternalParse(const char* ptr, ::google::protobuf::internal::ParseContext* ctx) final;
-  ::uint8_t* _InternalSerialize(
-      ::uint8_t* target, ::google::protobuf::io::EpsCopyOutputStream* stream) const final;
-  int GetCachedSize() const { return _impl_._cached_size_.Get(); }
-
-  private:
-  ::google::protobuf::internal::CachedSize* AccessCachedSize() const final;
-  void SharedCtor(::google::protobuf::Arena* arena);
-  void SharedDtor();
-  void InternalSwap(UpdateByRequest_UpdateByOperation_UpdateByColumn* other);
-
-  private:
-  friend class ::google::protobuf::internal::AnyMetadata;
-  static ::absl::string_view FullMessageName() {
-    return "io.deephaven.proto.backplane.grpc.UpdateByRequest.UpdateByOperation.UpdateByColumn";
-  }
-  protected:
-  explicit UpdateByRequest_UpdateByOperation_UpdateByColumn(::google::protobuf::Arena* arena);
-  UpdateByRequest_UpdateByOperation_UpdateByColumn(::google::protobuf::Arena* arena, const UpdateByRequest_UpdateByOperation_UpdateByColumn& from);
-  public:
-
-  static const ClassData _class_data_;
-  const ::google::protobuf::Message::ClassData*GetClassData() const final;
-
-  ::google::protobuf::Metadata GetMetadata() const final;
-
-  // nested types ----------------------------------------------------
-
-  using UpdateBySpec = UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec;
-
-  // accessors -------------------------------------------------------
-
-  enum : int {
-    kMatchPairsFieldNumber = 2,
-    kSpecFieldNumber = 1,
-  };
-  // repeated string match_pairs = 2;
-  int match_pairs_size() const;
-  private:
-  int _internal_match_pairs_size() const;
-
-  public:
-  void clear_match_pairs() ;
-  const std::string& match_pairs(int index) const;
-  std::string* mutable_match_pairs(int index);
-  void set_match_pairs(int index, const std::string& value);
-  void set_match_pairs(int index, std::string&& value);
-  void set_match_pairs(int index, const char* value);
-  void set_match_pairs(int index, const char* value, std::size_t size);
-  void set_match_pairs(int index, absl::string_view value);
-  std::string* add_match_pairs();
-  void add_match_pairs(const std::string& value);
-  void add_match_pairs(std::string&& value);
-  void add_match_pairs(const char* value);
-  void add_match_pairs(const char* value, std::size_t size);
-  void add_match_pairs(absl::string_view value);
-  const ::google::protobuf::RepeatedPtrField<std::string>& match_pairs() const;
-  ::google::protobuf::RepeatedPtrField<std::string>* mutable_match_pairs();
-
-  private:
-  const ::google::protobuf::RepeatedPtrField<std::string>& _internal_match_pairs() const;
-  ::google::protobuf::RepeatedPtrField<std::string>* _internal_mutable_match_pairs();
-
-  public:
-  // .io.deephaven.proto.backplane.grpc.UpdateByRequest.UpdateByOperation.UpdateByColumn.UpdateBySpec spec = 1;
-  bool has_spec() const;
-  void clear_spec() ;
-  const ::io::deephaven::proto::backplane::grpc::UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec& spec() const;
-  PROTOBUF_NODISCARD ::io::deephaven::proto::backplane::grpc::UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec* release_spec();
-  ::io::deephaven::proto::backplane::grpc::UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec* mutable_spec();
-  void set_allocated_spec(::io::deephaven::proto::backplane::grpc::UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec* value);
-  void unsafe_arena_set_allocated_spec(::io::deephaven::proto::backplane::grpc::UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec* value);
-  ::io::deephaven::proto::backplane::grpc::UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec* unsafe_arena_release_spec();
-
-  private:
-  const ::io::deephaven::proto::backplane::grpc::UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec& _internal_spec() const;
-  ::io::deephaven::proto::backplane::grpc::UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec* _internal_mutable_spec();
-
-  public:
-  // @@protoc_insertion_point(class_scope:io.deephaven.proto.backplane.grpc.UpdateByRequest.UpdateByOperation.UpdateByColumn)
- private:
-  class _Internal;
-
-  friend class ::google::protobuf::internal::TcParser;
-  static const ::google::protobuf::internal::TcParseTable<
-      1, 2, 1,
-      102, 2>
-      _table_;
-  friend class ::google::protobuf::MessageLite;
-  friend class ::google::protobuf::Arena;
-  template <typename T>
-  friend class ::google::protobuf::Arena::InternalHelper;
-  using InternalArenaConstructable_ = void;
-  using DestructorSkippable_ = void;
-  struct Impl_ {
-
-        inline explicit constexpr Impl_(
-            ::google::protobuf::internal::ConstantInitialized) noexcept;
-        inline explicit Impl_(::google::protobuf::internal::InternalVisibility visibility,
-                              ::google::protobuf::Arena* arena);
-        inline explicit Impl_(::google::protobuf::internal::InternalVisibility visibility,
-                              ::google::protobuf::Arena* arena, const Impl_& from);
-    ::google::protobuf::internal::HasBits<1> _has_bits_;
-    mutable ::google::protobuf::internal::CachedSize _cached_size_;
-    ::google::protobuf::RepeatedPtrField<std::string> match_pairs_;
-    ::io::deephaven::proto::backplane::grpc::UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec* spec_;
-    PROTOBUF_TSAN_DECLARE_MEMBER
-  };
-  union { Impl_ _impl_; };
-  friend struct ::TableStruct_deephaven_2fproto_2ftable_2eproto;
-};// -------------------------------------------------------------------
-
-class FilterTableRequest final :
-    public ::google::protobuf::Message /* @@protoc_insertion_point(class_definition:io.deephaven.proto.backplane.grpc.FilterTableRequest) */ {
- public:
-  inline FilterTableRequest() : FilterTableRequest(nullptr) {}
-  ~FilterTableRequest() override;
-  template<typename = void>
-  explicit PROTOBUF_CONSTEXPR FilterTableRequest(::google::protobuf::internal::ConstantInitialized);
-
-  inline FilterTableRequest(const FilterTableRequest& from)
-      : FilterTableRequest(nullptr, from) {}
-  FilterTableRequest(FilterTableRequest&& from) noexcept
-    : FilterTableRequest() {
-    *this = ::std::move(from);
-  }
-
-  inline FilterTableRequest& operator=(const FilterTableRequest& from) {
-    CopyFrom(from);
-    return *this;
-  }
-  inline FilterTableRequest& operator=(FilterTableRequest&& from) noexcept {
-    if (this == &from) return *this;
-    if (GetArena() == from.GetArena()
-  #ifdef PROTOBUF_FORCE_COPY_IN_MOVE
-        && GetArena() != nullptr
-  #endif  // !PROTOBUF_FORCE_COPY_IN_MOVE
-    ) {
-      InternalSwap(&from);
-    } else {
-      CopyFrom(from);
-    }
-    return *this;
-  }
-
-  inline const ::google::protobuf::UnknownFieldSet& unknown_fields() const
-      ABSL_ATTRIBUTE_LIFETIME_BOUND {
-    return _internal_metadata_.unknown_fields<::google::protobuf::UnknownFieldSet>(::google::protobuf::UnknownFieldSet::default_instance);
-  }
-  inline ::google::protobuf::UnknownFieldSet* mutable_unknown_fields()
-      ABSL_ATTRIBUTE_LIFETIME_BOUND {
-    return _internal_metadata_.mutable_unknown_fields<::google::protobuf::UnknownFieldSet>();
-  }
-
-  static const ::google::protobuf::Descriptor* descriptor() {
-    return GetDescriptor();
-  }
-  static const ::google::protobuf::Descriptor* GetDescriptor() {
-    return default_instance().GetMetadata().descriptor;
-  }
-  static const ::google::protobuf::Reflection* GetReflection() {
-    return default_instance().GetMetadata().reflection;
-  }
-  static const FilterTableRequest& default_instance() {
-    return *internal_default_instance();
-  }
-  static inline const FilterTableRequest* internal_default_instance() {
-    return reinterpret_cast<const FilterTableRequest*>(
-               &_FilterTableRequest_default_instance_);
-  }
-  static constexpr int kIndexInFileMessages =
-    94;
-
-  friend void swap(FilterTableRequest& a, FilterTableRequest& b) {
-    a.Swap(&b);
-  }
-  inline void Swap(FilterTableRequest* other) {
-    if (other == this) return;
-  #ifdef PROTOBUF_FORCE_COPY_IN_SWAP
-    if (GetArena() != nullptr &&
-        GetArena() == other->GetArena()) {
-   #else  // PROTOBUF_FORCE_COPY_IN_SWAP
-    if (GetArena() == other->GetArena()) {
-  #endif  // !PROTOBUF_FORCE_COPY_IN_SWAP
-      InternalSwap(other);
-    } else {
-      ::google::protobuf::internal::GenericSwap(this, other);
-    }
-  }
-  void UnsafeArenaSwap(FilterTableRequest* other) {
-    if (other == this) return;
-    ABSL_DCHECK(GetArena() == other->GetArena());
-    InternalSwap(other);
-  }
-
-  // implements Message ----------------------------------------------
-
-  FilterTableRequest* New(::google::protobuf::Arena* arena = nullptr) const final {
-    return CreateMaybeMessage<FilterTableRequest>(arena);
-  }
-  using ::google::protobuf::Message::CopyFrom;
-  void CopyFrom(const FilterTableRequest& from);
-  using ::google::protobuf::Message::MergeFrom;
-  void MergeFrom( const FilterTableRequest& from) {
-    FilterTableRequest::MergeImpl(*this, from);
-  }
-  private:
-  static void MergeImpl(::google::protobuf::Message& to_msg, const ::google::protobuf::Message& from_msg);
-  public:
-  PROTOBUF_ATTRIBUTE_REINITIALIZES void Clear() final;
-  bool IsInitialized() const final;
-
-  ::size_t ByteSizeLong() const final;
-  const char* _InternalParse(const char* ptr, ::google::protobuf::internal::ParseContext* ctx) final;
-  ::uint8_t* _InternalSerialize(
-      ::uint8_t* target, ::google::protobuf::io::EpsCopyOutputStream* stream) const final;
-  int GetCachedSize() const { return _impl_._cached_size_.Get(); }
-
-  private:
-  ::google::protobuf::internal::CachedSize* AccessCachedSize() const final;
-  void SharedCtor(::google::protobuf::Arena* arena);
-  void SharedDtor();
-  void InternalSwap(FilterTableRequest* other);
-
-  private:
-  friend class ::google::protobuf::internal::AnyMetadata;
-  static ::absl::string_view FullMessageName() {
-    return "io.deephaven.proto.backplane.grpc.FilterTableRequest";
-  }
-  protected:
-  explicit FilterTableRequest(::google::protobuf::Arena* arena);
-  FilterTableRequest(::google::protobuf::Arena* arena, const FilterTableRequest& from);
-  public:
-
-  static const ClassData _class_data_;
-  const ::google::protobuf::Message::ClassData*GetClassData() const final;
-
-  ::google::protobuf::Metadata GetMetadata() const final;
-
-  // nested types ----------------------------------------------------
-
-  // accessors -------------------------------------------------------
-
-  enum : int {
-    kFiltersFieldNumber = 3,
-    kResultIdFieldNumber = 1,
-    kSourceIdFieldNumber = 2,
-  };
-  // repeated .io.deephaven.proto.backplane.grpc.Condition filters = 3;
-  int filters_size() const;
-  private:
-  int _internal_filters_size() const;
-
-  public:
-  void clear_filters() ;
-  ::io::deephaven::proto::backplane::grpc::Condition* mutable_filters(int index);
-  ::google::protobuf::RepeatedPtrField< ::io::deephaven::proto::backplane::grpc::Condition >*
-      mutable_filters();
-  private:
-  const ::google::protobuf::RepeatedPtrField<::io::deephaven::proto::backplane::grpc::Condition>& _internal_filters() const;
-  ::google::protobuf::RepeatedPtrField<::io::deephaven::proto::backplane::grpc::Condition>* _internal_mutable_filters();
-  public:
-  const ::io::deephaven::proto::backplane::grpc::Condition& filters(int index) const;
-  ::io::deephaven::proto::backplane::grpc::Condition* add_filters();
-  const ::google::protobuf::RepeatedPtrField< ::io::deephaven::proto::backplane::grpc::Condition >&
-      filters() const;
-  // .io.deephaven.proto.backplane.grpc.Ticket result_id = 1;
-  bool has_result_id() const;
-  void clear_result_id() ;
-  const ::io::deephaven::proto::backplane::grpc::Ticket& result_id() const;
-  PROTOBUF_NODISCARD ::io::deephaven::proto::backplane::grpc::Ticket* release_result_id();
-  ::io::deephaven::proto::backplane::grpc::Ticket* mutable_result_id();
-  void set_allocated_result_id(::io::deephaven::proto::backplane::grpc::Ticket* value);
-  void unsafe_arena_set_allocated_result_id(::io::deephaven::proto::backplane::grpc::Ticket* value);
-  ::io::deephaven::proto::backplane::grpc::Ticket* unsafe_arena_release_result_id();
-
-  private:
-  const ::io::deephaven::proto::backplane::grpc::Ticket& _internal_result_id() const;
-  ::io::deephaven::proto::backplane::grpc::Ticket* _internal_mutable_result_id();
-
-  public:
-  // .io.deephaven.proto.backplane.grpc.TableReference source_id = 2;
-  bool has_source_id() const;
-  void clear_source_id() ;
-  const ::io::deephaven::proto::backplane::grpc::TableReference& source_id() const;
-  PROTOBUF_NODISCARD ::io::deephaven::proto::backplane::grpc::TableReference* release_source_id();
-  ::io::deephaven::proto::backplane::grpc::TableReference* mutable_source_id();
-  void set_allocated_source_id(::io::deephaven::proto::backplane::grpc::TableReference* value);
-  void unsafe_arena_set_allocated_source_id(::io::deephaven::proto::backplane::grpc::TableReference* value);
-  ::io::deephaven::proto::backplane::grpc::TableReference* unsafe_arena_release_source_id();
-
-  private:
-  const ::io::deephaven::proto::backplane::grpc::TableReference& _internal_source_id() const;
-  ::io::deephaven::proto::backplane::grpc::TableReference* _internal_mutable_source_id();
-
-  public:
-  // @@protoc_insertion_point(class_scope:io.deephaven.proto.backplane.grpc.FilterTableRequest)
- private:
-  class _Internal;
-
-  friend class ::google::protobuf::internal::TcParser;
-  static const ::google::protobuf::internal::TcParseTable<
-      2, 3, 3,
-      0, 2>
-      _table_;
-  friend class ::google::protobuf::MessageLite;
-  friend class ::google::protobuf::Arena;
-  template <typename T>
-  friend class ::google::protobuf::Arena::InternalHelper;
-  using InternalArenaConstructable_ = void;
-  using DestructorSkippable_ = void;
-  struct Impl_ {
-
-        inline explicit constexpr Impl_(
-            ::google::protobuf::internal::ConstantInitialized) noexcept;
-        inline explicit Impl_(::google::protobuf::internal::InternalVisibility visibility,
-                              ::google::protobuf::Arena* arena);
-        inline explicit Impl_(::google::protobuf::internal::InternalVisibility visibility,
-                              ::google::protobuf::Arena* arena, const Impl_& from);
-    ::google::protobuf::internal::HasBits<1> _has_bits_;
-    mutable ::google::protobuf::internal::CachedSize _cached_size_;
-    ::google::protobuf::RepeatedPtrField< ::io::deephaven::proto::backplane::grpc::Condition > filters_;
-    ::io::deephaven::proto::backplane::grpc::Ticket* result_id_;
-    ::io::deephaven::proto::backplane::grpc::TableReference* source_id_;
-    PROTOBUF_TSAN_DECLARE_MEMBER
-  };
-  union { Impl_ _impl_; };
-  friend struct ::TableStruct_deephaven_2fproto_2ftable_2eproto;
-};// -------------------------------------------------------------------
-
-class Aggregation final :
-    public ::google::protobuf::Message /* @@protoc_insertion_point(class_definition:io.deephaven.proto.backplane.grpc.Aggregation) */ {
- public:
-  inline Aggregation() : Aggregation(nullptr) {}
-  ~Aggregation() override;
-  template<typename = void>
-  explicit PROTOBUF_CONSTEXPR Aggregation(::google::protobuf::internal::ConstantInitialized);
-
-  inline Aggregation(const Aggregation& from)
-      : Aggregation(nullptr, from) {}
-  Aggregation(Aggregation&& from) noexcept
-    : Aggregation() {
-    *this = ::std::move(from);
-  }
-
-  inline Aggregation& operator=(const Aggregation& from) {
-    CopyFrom(from);
-    return *this;
-  }
-  inline Aggregation& operator=(Aggregation&& from) noexcept {
-    if (this == &from) return *this;
-    if (GetArena() == from.GetArena()
-  #ifdef PROTOBUF_FORCE_COPY_IN_MOVE
-        && GetArena() != nullptr
-  #endif  // !PROTOBUF_FORCE_COPY_IN_MOVE
-    ) {
-      InternalSwap(&from);
-    } else {
-      CopyFrom(from);
-    }
-    return *this;
-  }
-
-  inline const ::google::protobuf::UnknownFieldSet& unknown_fields() const
-      ABSL_ATTRIBUTE_LIFETIME_BOUND {
-    return _internal_metadata_.unknown_fields<::google::protobuf::UnknownFieldSet>(::google::protobuf::UnknownFieldSet::default_instance);
-  }
-  inline ::google::protobuf::UnknownFieldSet* mutable_unknown_fields()
-      ABSL_ATTRIBUTE_LIFETIME_BOUND {
-    return _internal_metadata_.mutable_unknown_fields<::google::protobuf::UnknownFieldSet>();
-  }
-
-  static const ::google::protobuf::Descriptor* descriptor() {
-    return GetDescriptor();
-  }
-  static const ::google::protobuf::Descriptor* GetDescriptor() {
-    return default_instance().GetMetadata().descriptor;
-  }
-  static const ::google::protobuf::Reflection* GetReflection() {
-    return default_instance().GetMetadata().reflection;
-  }
-  static const Aggregation& default_instance() {
-    return *internal_default_instance();
-  }
-  enum TypeCase {
-    kColumns = 1,
-    kCount = 2,
-    kFirstRowKey = 3,
-    kLastRowKey = 4,
-    kPartition = 5,
-    TYPE_NOT_SET = 0,
-  };
-
-  static inline const Aggregation* internal_default_instance() {
-    return reinterpret_cast<const Aggregation*>(
-               &_Aggregation_default_instance_);
-  }
-  static constexpr int kIndexInFileMessages =
-    91;
-
-  friend void swap(Aggregation& a, Aggregation& b) {
-    a.Swap(&b);
-  }
-  inline void Swap(Aggregation* other) {
-    if (other == this) return;
-  #ifdef PROTOBUF_FORCE_COPY_IN_SWAP
-    if (GetArena() != nullptr &&
-        GetArena() == other->GetArena()) {
-   #else  // PROTOBUF_FORCE_COPY_IN_SWAP
-    if (GetArena() == other->GetArena()) {
-  #endif  // !PROTOBUF_FORCE_COPY_IN_SWAP
-      InternalSwap(other);
-    } else {
-      ::google::protobuf::internal::GenericSwap(this, other);
-    }
-  }
-  void UnsafeArenaSwap(Aggregation* other) {
-    if (other == this) return;
-    ABSL_DCHECK(GetArena() == other->GetArena());
-    InternalSwap(other);
-  }
-
-  // implements Message ----------------------------------------------
-
-  Aggregation* New(::google::protobuf::Arena* arena = nullptr) const final {
-    return CreateMaybeMessage<Aggregation>(arena);
-  }
-  using ::google::protobuf::Message::CopyFrom;
-  void CopyFrom(const Aggregation& from);
-  using ::google::protobuf::Message::MergeFrom;
-  void MergeFrom( const Aggregation& from) {
-    Aggregation::MergeImpl(*this, from);
-  }
-  private:
-  static void MergeImpl(::google::protobuf::Message& to_msg, const ::google::protobuf::Message& from_msg);
-  public:
-  PROTOBUF_ATTRIBUTE_REINITIALIZES void Clear() final;
-  bool IsInitialized() const final;
-
-  ::size_t ByteSizeLong() const final;
-  const char* _InternalParse(const char* ptr, ::google::protobuf::internal::ParseContext* ctx) final;
-  ::uint8_t* _InternalSerialize(
-      ::uint8_t* target, ::google::protobuf::io::EpsCopyOutputStream* stream) const final;
-  int GetCachedSize() const { return _impl_._cached_size_.Get(); }
-
-  private:
-  ::google::protobuf::internal::CachedSize* AccessCachedSize() const final;
-  void SharedCtor(::google::protobuf::Arena* arena);
-  void SharedDtor();
-  void InternalSwap(Aggregation* other);
-
-  private:
-  friend class ::google::protobuf::internal::AnyMetadata;
-  static ::absl::string_view FullMessageName() {
-    return "io.deephaven.proto.backplane.grpc.Aggregation";
-  }
-  protected:
-  explicit Aggregation(::google::protobuf::Arena* arena);
-  Aggregation(::google::protobuf::Arena* arena, const Aggregation& from);
-  public:
-
-  static const ClassData _class_data_;
-  const ::google::protobuf::Message::ClassData*GetClassData() const final;
-
-  ::google::protobuf::Metadata GetMetadata() const final;
-
-  // nested types ----------------------------------------------------
-
-  using AggregationColumns = Aggregation_AggregationColumns;
-  using AggregationCount = Aggregation_AggregationCount;
-  using AggregationRowKey = Aggregation_AggregationRowKey;
-  using AggregationPartition = Aggregation_AggregationPartition;
-
-  // accessors -------------------------------------------------------
-
-  enum : int {
-    kColumnsFieldNumber = 1,
-    kCountFieldNumber = 2,
-    kFirstRowKeyFieldNumber = 3,
-    kLastRowKeyFieldNumber = 4,
-    kPartitionFieldNumber = 5,
-  };
-  // .io.deephaven.proto.backplane.grpc.Aggregation.AggregationColumns columns = 1;
-  bool has_columns() const;
-  private:
-  bool _internal_has_columns() const;
-
-  public:
-  void clear_columns() ;
-  const ::io::deephaven::proto::backplane::grpc::Aggregation_AggregationColumns& columns() const;
-  PROTOBUF_NODISCARD ::io::deephaven::proto::backplane::grpc::Aggregation_AggregationColumns* release_columns();
-  ::io::deephaven::proto::backplane::grpc::Aggregation_AggregationColumns* mutable_columns();
-  void set_allocated_columns(::io::deephaven::proto::backplane::grpc::Aggregation_AggregationColumns* value);
-  void unsafe_arena_set_allocated_columns(::io::deephaven::proto::backplane::grpc::Aggregation_AggregationColumns* value);
-  ::io::deephaven::proto::backplane::grpc::Aggregation_AggregationColumns* unsafe_arena_release_columns();
-
-  private:
-  const ::io::deephaven::proto::backplane::grpc::Aggregation_AggregationColumns& _internal_columns() const;
-  ::io::deephaven::proto::backplane::grpc::Aggregation_AggregationColumns* _internal_mutable_columns();
-
-  public:
-  // .io.deephaven.proto.backplane.grpc.Aggregation.AggregationCount count = 2;
-  bool has_count() const;
-  private:
-  bool _internal_has_count() const;
-
-  public:
-  void clear_count() ;
-  const ::io::deephaven::proto::backplane::grpc::Aggregation_AggregationCount& count() const;
-  PROTOBUF_NODISCARD ::io::deephaven::proto::backplane::grpc::Aggregation_AggregationCount* release_count();
-  ::io::deephaven::proto::backplane::grpc::Aggregation_AggregationCount* mutable_count();
-  void set_allocated_count(::io::deephaven::proto::backplane::grpc::Aggregation_AggregationCount* value);
-  void unsafe_arena_set_allocated_count(::io::deephaven::proto::backplane::grpc::Aggregation_AggregationCount* value);
-  ::io::deephaven::proto::backplane::grpc::Aggregation_AggregationCount* unsafe_arena_release_count();
-
-  private:
-  const ::io::deephaven::proto::backplane::grpc::Aggregation_AggregationCount& _internal_count() const;
-  ::io::deephaven::proto::backplane::grpc::Aggregation_AggregationCount* _internal_mutable_count();
-
-  public:
-  // .io.deephaven.proto.backplane.grpc.Aggregation.AggregationRowKey first_row_key = 3;
-  bool has_first_row_key() const;
-  private:
-  bool _internal_has_first_row_key() const;
-
-  public:
-  void clear_first_row_key() ;
-  const ::io::deephaven::proto::backplane::grpc::Aggregation_AggregationRowKey& first_row_key() const;
-  PROTOBUF_NODISCARD ::io::deephaven::proto::backplane::grpc::Aggregation_AggregationRowKey* release_first_row_key();
-  ::io::deephaven::proto::backplane::grpc::Aggregation_AggregationRowKey* mutable_first_row_key();
-  void set_allocated_first_row_key(::io::deephaven::proto::backplane::grpc::Aggregation_AggregationRowKey* value);
-  void unsafe_arena_set_allocated_first_row_key(::io::deephaven::proto::backplane::grpc::Aggregation_AggregationRowKey* value);
-  ::io::deephaven::proto::backplane::grpc::Aggregation_AggregationRowKey* unsafe_arena_release_first_row_key();
-
-  private:
-  const ::io::deephaven::proto::backplane::grpc::Aggregation_AggregationRowKey& _internal_first_row_key() const;
-  ::io::deephaven::proto::backplane::grpc::Aggregation_AggregationRowKey* _internal_mutable_first_row_key();
-
-  public:
-  // .io.deephaven.proto.backplane.grpc.Aggregation.AggregationRowKey last_row_key = 4;
-  bool has_last_row_key() const;
-  private:
-  bool _internal_has_last_row_key() const;
-
-  public:
-  void clear_last_row_key() ;
-  const ::io::deephaven::proto::backplane::grpc::Aggregation_AggregationRowKey& last_row_key() const;
-  PROTOBUF_NODISCARD ::io::deephaven::proto::backplane::grpc::Aggregation_AggregationRowKey* release_last_row_key();
-  ::io::deephaven::proto::backplane::grpc::Aggregation_AggregationRowKey* mutable_last_row_key();
-  void set_allocated_last_row_key(::io::deephaven::proto::backplane::grpc::Aggregation_AggregationRowKey* value);
-  void unsafe_arena_set_allocated_last_row_key(::io::deephaven::proto::backplane::grpc::Aggregation_AggregationRowKey* value);
-  ::io::deephaven::proto::backplane::grpc::Aggregation_AggregationRowKey* unsafe_arena_release_last_row_key();
-
-  private:
-  const ::io::deephaven::proto::backplane::grpc::Aggregation_AggregationRowKey& _internal_last_row_key() const;
-  ::io::deephaven::proto::backplane::grpc::Aggregation_AggregationRowKey* _internal_mutable_last_row_key();
-
-  public:
-  // .io.deephaven.proto.backplane.grpc.Aggregation.AggregationPartition partition = 5;
-  bool has_partition() const;
-  private:
-  bool _internal_has_partition() const;
-
-  public:
-  void clear_partition() ;
-  const ::io::deephaven::proto::backplane::grpc::Aggregation_AggregationPartition& partition() const;
-  PROTOBUF_NODISCARD ::io::deephaven::proto::backplane::grpc::Aggregation_AggregationPartition* release_partition();
-  ::io::deephaven::proto::backplane::grpc::Aggregation_AggregationPartition* mutable_partition();
-  void set_allocated_partition(::io::deephaven::proto::backplane::grpc::Aggregation_AggregationPartition* value);
-  void unsafe_arena_set_allocated_partition(::io::deephaven::proto::backplane::grpc::Aggregation_AggregationPartition* value);
-  ::io::deephaven::proto::backplane::grpc::Aggregation_AggregationPartition* unsafe_arena_release_partition();
-
-  private:
-  const ::io::deephaven::proto::backplane::grpc::Aggregation_AggregationPartition& _internal_partition() const;
-  ::io::deephaven::proto::backplane::grpc::Aggregation_AggregationPartition* _internal_mutable_partition();
-
-  public:
-  void clear_type();
-  TypeCase type_case() const;
-  // @@protoc_insertion_point(class_scope:io.deephaven.proto.backplane.grpc.Aggregation)
- private:
-  class _Internal;
-  void set_has_columns();
-  void set_has_count();
-  void set_has_first_row_key();
-  void set_has_last_row_key();
-  void set_has_partition();
-
-  inline bool has_type() const;
-  inline void clear_has_type();
-
-  friend class ::google::protobuf::internal::TcParser;
-  static const ::google::protobuf::internal::TcParseTable<
-      0, 5, 5,
-      0, 2>
-      _table_;
-  friend class ::google::protobuf::MessageLite;
-  friend class ::google::protobuf::Arena;
-  template <typename T>
-  friend class ::google::protobuf::Arena::InternalHelper;
-  using InternalArenaConstructable_ = void;
-  using DestructorSkippable_ = void;
-  struct Impl_ {
-
-        inline explicit constexpr Impl_(
-            ::google::protobuf::internal::ConstantInitialized) noexcept;
-        inline explicit Impl_(::google::protobuf::internal::InternalVisibility visibility,
-                              ::google::protobuf::Arena* arena);
-        inline explicit Impl_(::google::protobuf::internal::InternalVisibility visibility,
-                              ::google::protobuf::Arena* arena, const Impl_& from);
-    union TypeUnion {
-      constexpr TypeUnion() : _constinit_{} {}
-        ::google::protobuf::internal::ConstantInitialized _constinit_;
-      ::io::deephaven::proto::backplane::grpc::Aggregation_AggregationColumns* columns_;
-      ::io::deephaven::proto::backplane::grpc::Aggregation_AggregationCount* count_;
-      ::io::deephaven::proto::backplane::grpc::Aggregation_AggregationRowKey* first_row_key_;
-      ::io::deephaven::proto::backplane::grpc::Aggregation_AggregationRowKey* last_row_key_;
-      ::io::deephaven::proto::backplane::grpc::Aggregation_AggregationPartition* partition_;
-    } type_;
-    mutable ::google::protobuf::internal::CachedSize _cached_size_;
-    ::uint32_t _oneof_case_[1];
-
-    PROTOBUF_TSAN_DECLARE_MEMBER
-  };
-  union { Impl_ _impl_; };
-  friend struct ::TableStruct_deephaven_2fproto_2ftable_2eproto;
-};// -------------------------------------------------------------------
-
-class UpdateByRequest_UpdateByOperation final :
-    public ::google::protobuf::Message /* @@protoc_insertion_point(class_definition:io.deephaven.proto.backplane.grpc.UpdateByRequest.UpdateByOperation) */ {
- public:
-  inline UpdateByRequest_UpdateByOperation() : UpdateByRequest_UpdateByOperation(nullptr) {}
-  ~UpdateByRequest_UpdateByOperation() override;
-  template<typename = void>
-  explicit PROTOBUF_CONSTEXPR UpdateByRequest_UpdateByOperation(::google::protobuf::internal::ConstantInitialized);
-
-  inline UpdateByRequest_UpdateByOperation(const UpdateByRequest_UpdateByOperation& from)
-      : UpdateByRequest_UpdateByOperation(nullptr, from) {}
-  UpdateByRequest_UpdateByOperation(UpdateByRequest_UpdateByOperation&& from) noexcept
-    : UpdateByRequest_UpdateByOperation() {
-    *this = ::std::move(from);
-  }
-
-  inline UpdateByRequest_UpdateByOperation& operator=(const UpdateByRequest_UpdateByOperation& from) {
-    CopyFrom(from);
-    return *this;
-  }
-  inline UpdateByRequest_UpdateByOperation& operator=(UpdateByRequest_UpdateByOperation&& from) noexcept {
-    if (this == &from) return *this;
-    if (GetArena() == from.GetArena()
-  #ifdef PROTOBUF_FORCE_COPY_IN_MOVE
-        && GetArena() != nullptr
-  #endif  // !PROTOBUF_FORCE_COPY_IN_MOVE
-    ) {
-      InternalSwap(&from);
-    } else {
-      CopyFrom(from);
-    }
-    return *this;
-  }
-
-  inline const ::google::protobuf::UnknownFieldSet& unknown_fields() const
-      ABSL_ATTRIBUTE_LIFETIME_BOUND {
-    return _internal_metadata_.unknown_fields<::google::protobuf::UnknownFieldSet>(::google::protobuf::UnknownFieldSet::default_instance);
-  }
-  inline ::google::protobuf::UnknownFieldSet* mutable_unknown_fields()
-      ABSL_ATTRIBUTE_LIFETIME_BOUND {
-    return _internal_metadata_.mutable_unknown_fields<::google::protobuf::UnknownFieldSet>();
-  }
-
-  static const ::google::protobuf::Descriptor* descriptor() {
-    return GetDescriptor();
-  }
-  static const ::google::protobuf::Descriptor* GetDescriptor() {
-    return default_instance().GetMetadata().descriptor;
-  }
-  static const ::google::protobuf::Reflection* GetReflection() {
-    return default_instance().GetMetadata().reflection;
-  }
-  static const UpdateByRequest_UpdateByOperation& default_instance() {
-    return *internal_default_instance();
-  }
-  enum TypeCase {
-    kColumn = 1,
-    TYPE_NOT_SET = 0,
-  };
-
-  static inline const UpdateByRequest_UpdateByOperation* internal_default_instance() {
-    return reinterpret_cast<const UpdateByRequest_UpdateByOperation*>(
-               &_UpdateByRequest_UpdateByOperation_default_instance_);
-  }
-  static constexpr int kIndexInFileMessages =
-    39;
-
-  friend void swap(UpdateByRequest_UpdateByOperation& a, UpdateByRequest_UpdateByOperation& b) {
-    a.Swap(&b);
-  }
-  inline void Swap(UpdateByRequest_UpdateByOperation* other) {
-    if (other == this) return;
-  #ifdef PROTOBUF_FORCE_COPY_IN_SWAP
-    if (GetArena() != nullptr &&
-        GetArena() == other->GetArena()) {
-   #else  // PROTOBUF_FORCE_COPY_IN_SWAP
-    if (GetArena() == other->GetArena()) {
-  #endif  // !PROTOBUF_FORCE_COPY_IN_SWAP
-      InternalSwap(other);
-    } else {
-      ::google::protobuf::internal::GenericSwap(this, other);
-    }
-  }
-  void UnsafeArenaSwap(UpdateByRequest_UpdateByOperation* other) {
-    if (other == this) return;
-    ABSL_DCHECK(GetArena() == other->GetArena());
-    InternalSwap(other);
-  }
-
-  // implements Message ----------------------------------------------
-
-  UpdateByRequest_UpdateByOperation* New(::google::protobuf::Arena* arena = nullptr) const final {
-    return CreateMaybeMessage<UpdateByRequest_UpdateByOperation>(arena);
-  }
-  using ::google::protobuf::Message::CopyFrom;
-  void CopyFrom(const UpdateByRequest_UpdateByOperation& from);
-  using ::google::protobuf::Message::MergeFrom;
-  void MergeFrom( const UpdateByRequest_UpdateByOperation& from) {
-    UpdateByRequest_UpdateByOperation::MergeImpl(*this, from);
-  }
-  private:
-  static void MergeImpl(::google::protobuf::Message& to_msg, const ::google::protobuf::Message& from_msg);
-  public:
-  PROTOBUF_ATTRIBUTE_REINITIALIZES void Clear() final;
-  bool IsInitialized() const final;
-
-  ::size_t ByteSizeLong() const final;
-  const char* _InternalParse(const char* ptr, ::google::protobuf::internal::ParseContext* ctx) final;
-  ::uint8_t* _InternalSerialize(
-      ::uint8_t* target, ::google::protobuf::io::EpsCopyOutputStream* stream) const final;
-  int GetCachedSize() const { return _impl_._cached_size_.Get(); }
-
-  private:
-  ::google::protobuf::internal::CachedSize* AccessCachedSize() const final;
-  void SharedCtor(::google::protobuf::Arena* arena);
-  void SharedDtor();
-  void InternalSwap(UpdateByRequest_UpdateByOperation* other);
-
-  private:
-  friend class ::google::protobuf::internal::AnyMetadata;
-  static ::absl::string_view FullMessageName() {
-    return "io.deephaven.proto.backplane.grpc.UpdateByRequest.UpdateByOperation";
-  }
-  protected:
-  explicit UpdateByRequest_UpdateByOperation(::google::protobuf::Arena* arena);
-  UpdateByRequest_UpdateByOperation(::google::protobuf::Arena* arena, const UpdateByRequest_UpdateByOperation& from);
-  public:
-
-  static const ClassData _class_data_;
-  const ::google::protobuf::Message::ClassData*GetClassData() const final;
-
-  ::google::protobuf::Metadata GetMetadata() const final;
-
-  // nested types ----------------------------------------------------
-
-  using UpdateByColumn = UpdateByRequest_UpdateByOperation_UpdateByColumn;
-
-  // accessors -------------------------------------------------------
-
-  enum : int {
-    kColumnFieldNumber = 1,
-  };
-  // .io.deephaven.proto.backplane.grpc.UpdateByRequest.UpdateByOperation.UpdateByColumn column = 1;
-  bool has_column() const;
-  private:
-  bool _internal_has_column() const;
-
-  public:
-  void clear_column() ;
-  const ::io::deephaven::proto::backplane::grpc::UpdateByRequest_UpdateByOperation_UpdateByColumn& column() const;
-  PROTOBUF_NODISCARD ::io::deephaven::proto::backplane::grpc::UpdateByRequest_UpdateByOperation_UpdateByColumn* release_column();
-  ::io::deephaven::proto::backplane::grpc::UpdateByRequest_UpdateByOperation_UpdateByColumn* mutable_column();
-  void set_allocated_column(::io::deephaven::proto::backplane::grpc::UpdateByRequest_UpdateByOperation_UpdateByColumn* value);
-  void unsafe_arena_set_allocated_column(::io::deephaven::proto::backplane::grpc::UpdateByRequest_UpdateByOperation_UpdateByColumn* value);
-  ::io::deephaven::proto::backplane::grpc::UpdateByRequest_UpdateByOperation_UpdateByColumn* unsafe_arena_release_column();
-
-  private:
-  const ::io::deephaven::proto::backplane::grpc::UpdateByRequest_UpdateByOperation_UpdateByColumn& _internal_column() const;
-  ::io::deephaven::proto::backplane::grpc::UpdateByRequest_UpdateByOperation_UpdateByColumn* _internal_mutable_column();
-
-  public:
-  void clear_type();
-  TypeCase type_case() const;
-  // @@protoc_insertion_point(class_scope:io.deephaven.proto.backplane.grpc.UpdateByRequest.UpdateByOperation)
- private:
-  class _Internal;
-  void set_has_column();
-
-  inline bool has_type() const;
-  inline void clear_has_type();
-
-  friend class ::google::protobuf::internal::TcParser;
-  static const ::google::protobuf::internal::TcParseTable<
-      0, 1, 1,
-      0, 2>
-      _table_;
-  friend class ::google::protobuf::MessageLite;
-  friend class ::google::protobuf::Arena;
-  template <typename T>
-  friend class ::google::protobuf::Arena::InternalHelper;
-  using InternalArenaConstructable_ = void;
-  using DestructorSkippable_ = void;
-  struct Impl_ {
-
-        inline explicit constexpr Impl_(
-            ::google::protobuf::internal::ConstantInitialized) noexcept;
-        inline explicit Impl_(::google::protobuf::internal::InternalVisibility visibility,
-                              ::google::protobuf::Arena* arena);
-        inline explicit Impl_(::google::protobuf::internal::InternalVisibility visibility,
-                              ::google::protobuf::Arena* arena, const Impl_& from);
-    union TypeUnion {
-      constexpr TypeUnion() : _constinit_{} {}
-        ::google::protobuf::internal::ConstantInitialized _constinit_;
-      ::io::deephaven::proto::backplane::grpc::UpdateByRequest_UpdateByOperation_UpdateByColumn* column_;
-    } type_;
-    mutable ::google::protobuf::internal::CachedSize _cached_size_;
-    ::uint32_t _oneof_case_[1];
-
-    PROTOBUF_TSAN_DECLARE_MEMBER
-  };
-  union { Impl_ _impl_; };
-  friend struct ::TableStruct_deephaven_2fproto_2ftable_2eproto;
-};// -------------------------------------------------------------------
-
-class RangeJoinTablesRequest final :
-    public ::google::protobuf::Message /* @@protoc_insertion_point(class_definition:io.deephaven.proto.backplane.grpc.RangeJoinTablesRequest) */ {
- public:
-  inline RangeJoinTablesRequest() : RangeJoinTablesRequest(nullptr) {}
-  ~RangeJoinTablesRequest() override;
-  template<typename = void>
-  explicit PROTOBUF_CONSTEXPR RangeJoinTablesRequest(::google::protobuf::internal::ConstantInitialized);
-
-  inline RangeJoinTablesRequest(const RangeJoinTablesRequest& from)
-      : RangeJoinTablesRequest(nullptr, from) {}
-  RangeJoinTablesRequest(RangeJoinTablesRequest&& from) noexcept
-    : RangeJoinTablesRequest() {
-    *this = ::std::move(from);
-  }
-
-  inline RangeJoinTablesRequest& operator=(const RangeJoinTablesRequest& from) {
-    CopyFrom(from);
-    return *this;
-  }
-  inline RangeJoinTablesRequest& operator=(RangeJoinTablesRequest&& from) noexcept {
-    if (this == &from) return *this;
-    if (GetArena() == from.GetArena()
-  #ifdef PROTOBUF_FORCE_COPY_IN_MOVE
-        && GetArena() != nullptr
-  #endif  // !PROTOBUF_FORCE_COPY_IN_MOVE
-    ) {
-      InternalSwap(&from);
-    } else {
-      CopyFrom(from);
-    }
-    return *this;
-  }
-
-  inline const ::google::protobuf::UnknownFieldSet& unknown_fields() const
-      ABSL_ATTRIBUTE_LIFETIME_BOUND {
-    return _internal_metadata_.unknown_fields<::google::protobuf::UnknownFieldSet>(::google::protobuf::UnknownFieldSet::default_instance);
-  }
-  inline ::google::protobuf::UnknownFieldSet* mutable_unknown_fields()
-      ABSL_ATTRIBUTE_LIFETIME_BOUND {
-    return _internal_metadata_.mutable_unknown_fields<::google::protobuf::UnknownFieldSet>();
-  }
-
-  static const ::google::protobuf::Descriptor* descriptor() {
-    return GetDescriptor();
-  }
-  static const ::google::protobuf::Descriptor* GetDescriptor() {
-    return default_instance().GetMetadata().descriptor;
-  }
-  static const ::google::protobuf::Reflection* GetReflection() {
-    return default_instance().GetMetadata().reflection;
-  }
-  static const RangeJoinTablesRequest& default_instance() {
-    return *internal_default_instance();
-  }
-  static inline const RangeJoinTablesRequest* internal_default_instance() {
-    return reinterpret_cast<const RangeJoinTablesRequest*>(
-               &_RangeJoinTablesRequest_default_instance_);
-  }
-  static constexpr int kIndexInFileMessages =
-    58;
-
-  friend void swap(RangeJoinTablesRequest& a, RangeJoinTablesRequest& b) {
-    a.Swap(&b);
-  }
-  inline void Swap(RangeJoinTablesRequest* other) {
-    if (other == this) return;
-  #ifdef PROTOBUF_FORCE_COPY_IN_SWAP
-    if (GetArena() != nullptr &&
-        GetArena() == other->GetArena()) {
-   #else  // PROTOBUF_FORCE_COPY_IN_SWAP
-    if (GetArena() == other->GetArena()) {
-  #endif  // !PROTOBUF_FORCE_COPY_IN_SWAP
-      InternalSwap(other);
-    } else {
-      ::google::protobuf::internal::GenericSwap(this, other);
-    }
-  }
-  void UnsafeArenaSwap(RangeJoinTablesRequest* other) {
-    if (other == this) return;
-    ABSL_DCHECK(GetArena() == other->GetArena());
-    InternalSwap(other);
-  }
-
-  // implements Message ----------------------------------------------
-
-  RangeJoinTablesRequest* New(::google::protobuf::Arena* arena = nullptr) const final {
-    return CreateMaybeMessage<RangeJoinTablesRequest>(arena);
-  }
-  using ::google::protobuf::Message::CopyFrom;
-  void CopyFrom(const RangeJoinTablesRequest& from);
-  using ::google::protobuf::Message::MergeFrom;
-  void MergeFrom( const RangeJoinTablesRequest& from) {
-    RangeJoinTablesRequest::MergeImpl(*this, from);
-  }
-  private:
-  static void MergeImpl(::google::protobuf::Message& to_msg, const ::google::protobuf::Message& from_msg);
-  public:
-  PROTOBUF_ATTRIBUTE_REINITIALIZES void Clear() final;
-  bool IsInitialized() const final;
-
-  ::size_t ByteSizeLong() const final;
-  const char* _InternalParse(const char* ptr, ::google::protobuf::internal::ParseContext* ctx) final;
-  ::uint8_t* _InternalSerialize(
-      ::uint8_t* target, ::google::protobuf::io::EpsCopyOutputStream* stream) const final;
-  int GetCachedSize() const { return _impl_._cached_size_.Get(); }
-
-  private:
-  ::google::protobuf::internal::CachedSize* AccessCachedSize() const final;
-  void SharedCtor(::google::protobuf::Arena* arena);
-  void SharedDtor();
-  void InternalSwap(RangeJoinTablesRequest* other);
-
-  private:
-  friend class ::google::protobuf::internal::AnyMetadata;
-  static ::absl::string_view FullMessageName() {
-    return "io.deephaven.proto.backplane.grpc.RangeJoinTablesRequest";
-  }
-  protected:
-  explicit RangeJoinTablesRequest(::google::protobuf::Arena* arena);
-  RangeJoinTablesRequest(::google::protobuf::Arena* arena, const RangeJoinTablesRequest& from);
-  public:
-
-  static const ClassData _class_data_;
-  const ::google::protobuf::Message::ClassData*GetClassData() const final;
-
-  ::google::protobuf::Metadata GetMetadata() const final;
-
-  // nested types ----------------------------------------------------
-
-  using RangeStartRule = RangeJoinTablesRequest_RangeStartRule;
-  static constexpr RangeStartRule START_UNSPECIFIED = RangeJoinTablesRequest_RangeStartRule_START_UNSPECIFIED;
-  static constexpr RangeStartRule LESS_THAN = RangeJoinTablesRequest_RangeStartRule_LESS_THAN;
-  static constexpr RangeStartRule LESS_THAN_OR_EQUAL = RangeJoinTablesRequest_RangeStartRule_LESS_THAN_OR_EQUAL;
-  static constexpr RangeStartRule LESS_THAN_OR_EQUAL_ALLOW_PRECEDING = RangeJoinTablesRequest_RangeStartRule_LESS_THAN_OR_EQUAL_ALLOW_PRECEDING;
-  static inline bool RangeStartRule_IsValid(int value) {
-    return RangeJoinTablesRequest_RangeStartRule_IsValid(value);
-  }
-  static constexpr RangeStartRule RangeStartRule_MIN = RangeJoinTablesRequest_RangeStartRule_RangeStartRule_MIN;
-  static constexpr RangeStartRule RangeStartRule_MAX = RangeJoinTablesRequest_RangeStartRule_RangeStartRule_MAX;
-  static constexpr int RangeStartRule_ARRAYSIZE = RangeJoinTablesRequest_RangeStartRule_RangeStartRule_ARRAYSIZE;
-  static inline const ::google::protobuf::EnumDescriptor* RangeStartRule_descriptor() {
-    return RangeJoinTablesRequest_RangeStartRule_descriptor();
-  }
-  template <typename T>
-  static inline const std::string& RangeStartRule_Name(T value) {
-    return RangeJoinTablesRequest_RangeStartRule_Name(value);
-  }
-  static inline bool RangeStartRule_Parse(absl::string_view name, RangeStartRule* value) {
-    return RangeJoinTablesRequest_RangeStartRule_Parse(name, value);
-  }
-
-  using RangeEndRule = RangeJoinTablesRequest_RangeEndRule;
-  static constexpr RangeEndRule END_UNSPECIFIED = RangeJoinTablesRequest_RangeEndRule_END_UNSPECIFIED;
-  static constexpr RangeEndRule GREATER_THAN = RangeJoinTablesRequest_RangeEndRule_GREATER_THAN;
-  static constexpr RangeEndRule GREATER_THAN_OR_EQUAL = RangeJoinTablesRequest_RangeEndRule_GREATER_THAN_OR_EQUAL;
-  static constexpr RangeEndRule GREATER_THAN_OR_EQUAL_ALLOW_FOLLOWING = RangeJoinTablesRequest_RangeEndRule_GREATER_THAN_OR_EQUAL_ALLOW_FOLLOWING;
-  static inline bool RangeEndRule_IsValid(int value) {
-    return RangeJoinTablesRequest_RangeEndRule_IsValid(value);
-  }
-  static constexpr RangeEndRule RangeEndRule_MIN = RangeJoinTablesRequest_RangeEndRule_RangeEndRule_MIN;
-  static constexpr RangeEndRule RangeEndRule_MAX = RangeJoinTablesRequest_RangeEndRule_RangeEndRule_MAX;
-  static constexpr int RangeEndRule_ARRAYSIZE = RangeJoinTablesRequest_RangeEndRule_RangeEndRule_ARRAYSIZE;
-  static inline const ::google::protobuf::EnumDescriptor* RangeEndRule_descriptor() {
-    return RangeJoinTablesRequest_RangeEndRule_descriptor();
-  }
-  template <typename T>
-  static inline const std::string& RangeEndRule_Name(T value) {
-    return RangeJoinTablesRequest_RangeEndRule_Name(value);
-  }
-  static inline bool RangeEndRule_Parse(absl::string_view name, RangeEndRule* value) {
-    return RangeJoinTablesRequest_RangeEndRule_Parse(name, value);
-  }
-
-  // accessors -------------------------------------------------------
-
-  enum : int {
-    kExactMatchColumnsFieldNumber = 4,
-    kAggregationsFieldNumber = 10,
-    kLeftStartColumnFieldNumber = 5,
-    kRightRangeColumnFieldNumber = 7,
-    kLeftEndColumnFieldNumber = 9,
-    kRangeMatchFieldNumber = 11,
-    kResultIdFieldNumber = 1,
-    kLeftIdFieldNumber = 2,
-    kRightIdFieldNumber = 3,
-    kRangeStartRuleFieldNumber = 6,
-    kRangeEndRuleFieldNumber = 8,
-  };
-  // repeated string exact_match_columns = 4;
-  int exact_match_columns_size() const;
-  private:
-  int _internal_exact_match_columns_size() const;
-
-  public:
-  void clear_exact_match_columns() ;
-  const std::string& exact_match_columns(int index) const;
-  std::string* mutable_exact_match_columns(int index);
-  void set_exact_match_columns(int index, const std::string& value);
-  void set_exact_match_columns(int index, std::string&& value);
-  void set_exact_match_columns(int index, const char* value);
-  void set_exact_match_columns(int index, const char* value, std::size_t size);
-  void set_exact_match_columns(int index, absl::string_view value);
-  std::string* add_exact_match_columns();
-  void add_exact_match_columns(const std::string& value);
-  void add_exact_match_columns(std::string&& value);
-  void add_exact_match_columns(const char* value);
-  void add_exact_match_columns(const char* value, std::size_t size);
-  void add_exact_match_columns(absl::string_view value);
-  const ::google::protobuf::RepeatedPtrField<std::string>& exact_match_columns() const;
-  ::google::protobuf::RepeatedPtrField<std::string>* mutable_exact_match_columns();
-
-  private:
-  const ::google::protobuf::RepeatedPtrField<std::string>& _internal_exact_match_columns() const;
-  ::google::protobuf::RepeatedPtrField<std::string>* _internal_mutable_exact_match_columns();
-
-  public:
-  // repeated .io.deephaven.proto.backplane.grpc.Aggregation aggregations = 10;
-  int aggregations_size() const;
-  private:
-  int _internal_aggregations_size() const;
-
-  public:
-  void clear_aggregations() ;
-  ::io::deephaven::proto::backplane::grpc::Aggregation* mutable_aggregations(int index);
-  ::google::protobuf::RepeatedPtrField< ::io::deephaven::proto::backplane::grpc::Aggregation >*
-      mutable_aggregations();
-  private:
-  const ::google::protobuf::RepeatedPtrField<::io::deephaven::proto::backplane::grpc::Aggregation>& _internal_aggregations() const;
-  ::google::protobuf::RepeatedPtrField<::io::deephaven::proto::backplane::grpc::Aggregation>* _internal_mutable_aggregations();
-  public:
-  const ::io::deephaven::proto::backplane::grpc::Aggregation& aggregations(int index) const;
-  ::io::deephaven::proto::backplane::grpc::Aggregation* add_aggregations();
-  const ::google::protobuf::RepeatedPtrField< ::io::deephaven::proto::backplane::grpc::Aggregation >&
-      aggregations() const;
-  // string left_start_column = 5;
-  void clear_left_start_column() ;
-  const std::string& left_start_column() const;
-  template <typename Arg_ = const std::string&, typename... Args_>
-  void set_left_start_column(Arg_&& arg, Args_... args);
-  std::string* mutable_left_start_column();
-  PROTOBUF_NODISCARD std::string* release_left_start_column();
-  void set_allocated_left_start_column(std::string* value);
-
-  private:
-  const std::string& _internal_left_start_column() const;
-  inline PROTOBUF_ALWAYS_INLINE void _internal_set_left_start_column(
-      const std::string& value);
-  std::string* _internal_mutable_left_start_column();
-
-  public:
-  // string right_range_column = 7;
-  void clear_right_range_column() ;
-  const std::string& right_range_column() const;
-  template <typename Arg_ = const std::string&, typename... Args_>
-  void set_right_range_column(Arg_&& arg, Args_... args);
-  std::string* mutable_right_range_column();
-  PROTOBUF_NODISCARD std::string* release_right_range_column();
-  void set_allocated_right_range_column(std::string* value);
-
-  private:
-  const std::string& _internal_right_range_column() const;
-  inline PROTOBUF_ALWAYS_INLINE void _internal_set_right_range_column(
-      const std::string& value);
-  std::string* _internal_mutable_right_range_column();
-
-  public:
-  // string left_end_column = 9;
-  void clear_left_end_column() ;
-  const std::string& left_end_column() const;
-  template <typename Arg_ = const std::string&, typename... Args_>
-  void set_left_end_column(Arg_&& arg, Args_... args);
-  std::string* mutable_left_end_column();
-  PROTOBUF_NODISCARD std::string* release_left_end_column();
-  void set_allocated_left_end_column(std::string* value);
-
-  private:
-  const std::string& _internal_left_end_column() const;
-  inline PROTOBUF_ALWAYS_INLINE void _internal_set_left_end_column(
-      const std::string& value);
-  std::string* _internal_mutable_left_end_column();
-
-  public:
-  // string range_match = 11;
-  void clear_range_match() ;
-  const std::string& range_match() const;
-  template <typename Arg_ = const std::string&, typename... Args_>
-  void set_range_match(Arg_&& arg, Args_... args);
-  std::string* mutable_range_match();
-  PROTOBUF_NODISCARD std::string* release_range_match();
-  void set_allocated_range_match(std::string* value);
-
-  private:
-  const std::string& _internal_range_match() const;
-  inline PROTOBUF_ALWAYS_INLINE void _internal_set_range_match(
-      const std::string& value);
-  std::string* _internal_mutable_range_match();
-
-  public:
-  // .io.deephaven.proto.backplane.grpc.Ticket result_id = 1;
-  bool has_result_id() const;
-  void clear_result_id() ;
-  const ::io::deephaven::proto::backplane::grpc::Ticket& result_id() const;
-  PROTOBUF_NODISCARD ::io::deephaven::proto::backplane::grpc::Ticket* release_result_id();
-  ::io::deephaven::proto::backplane::grpc::Ticket* mutable_result_id();
-  void set_allocated_result_id(::io::deephaven::proto::backplane::grpc::Ticket* value);
-  void unsafe_arena_set_allocated_result_id(::io::deephaven::proto::backplane::grpc::Ticket* value);
-  ::io::deephaven::proto::backplane::grpc::Ticket* unsafe_arena_release_result_id();
-
-  private:
-  const ::io::deephaven::proto::backplane::grpc::Ticket& _internal_result_id() const;
-  ::io::deephaven::proto::backplane::grpc::Ticket* _internal_mutable_result_id();
-
-  public:
-  // .io.deephaven.proto.backplane.grpc.TableReference left_id = 2;
-  bool has_left_id() const;
-  void clear_left_id() ;
-  const ::io::deephaven::proto::backplane::grpc::TableReference& left_id() const;
-  PROTOBUF_NODISCARD ::io::deephaven::proto::backplane::grpc::TableReference* release_left_id();
-  ::io::deephaven::proto::backplane::grpc::TableReference* mutable_left_id();
-  void set_allocated_left_id(::io::deephaven::proto::backplane::grpc::TableReference* value);
-  void unsafe_arena_set_allocated_left_id(::io::deephaven::proto::backplane::grpc::TableReference* value);
-  ::io::deephaven::proto::backplane::grpc::TableReference* unsafe_arena_release_left_id();
-
-  private:
-  const ::io::deephaven::proto::backplane::grpc::TableReference& _internal_left_id() const;
-  ::io::deephaven::proto::backplane::grpc::TableReference* _internal_mutable_left_id();
-
-  public:
-  // .io.deephaven.proto.backplane.grpc.TableReference right_id = 3;
-  bool has_right_id() const;
-  void clear_right_id() ;
-  const ::io::deephaven::proto::backplane::grpc::TableReference& right_id() const;
-  PROTOBUF_NODISCARD ::io::deephaven::proto::backplane::grpc::TableReference* release_right_id();
-  ::io::deephaven::proto::backplane::grpc::TableReference* mutable_right_id();
-  void set_allocated_right_id(::io::deephaven::proto::backplane::grpc::TableReference* value);
-  void unsafe_arena_set_allocated_right_id(::io::deephaven::proto::backplane::grpc::TableReference* value);
-  ::io::deephaven::proto::backplane::grpc::TableReference* unsafe_arena_release_right_id();
-
-  private:
-  const ::io::deephaven::proto::backplane::grpc::TableReference& _internal_right_id() const;
-  ::io::deephaven::proto::backplane::grpc::TableReference* _internal_mutable_right_id();
-
-  public:
-  // .io.deephaven.proto.backplane.grpc.RangeJoinTablesRequest.RangeStartRule range_start_rule = 6;
-  void clear_range_start_rule() ;
-  ::io::deephaven::proto::backplane::grpc::RangeJoinTablesRequest_RangeStartRule range_start_rule() const;
-  void set_range_start_rule(::io::deephaven::proto::backplane::grpc::RangeJoinTablesRequest_RangeStartRule value);
-
-  private:
-  ::io::deephaven::proto::backplane::grpc::RangeJoinTablesRequest_RangeStartRule _internal_range_start_rule() const;
-  void _internal_set_range_start_rule(::io::deephaven::proto::backplane::grpc::RangeJoinTablesRequest_RangeStartRule value);
-
-  public:
-  // .io.deephaven.proto.backplane.grpc.RangeJoinTablesRequest.RangeEndRule range_end_rule = 8;
-  void clear_range_end_rule() ;
-  ::io::deephaven::proto::backplane::grpc::RangeJoinTablesRequest_RangeEndRule range_end_rule() const;
-  void set_range_end_rule(::io::deephaven::proto::backplane::grpc::RangeJoinTablesRequest_RangeEndRule value);
-
-  private:
-  ::io::deephaven::proto::backplane::grpc::RangeJoinTablesRequest_RangeEndRule _internal_range_end_rule() const;
-  void _internal_set_range_end_rule(::io::deephaven::proto::backplane::grpc::RangeJoinTablesRequest_RangeEndRule value);
-
-  public:
-  // @@protoc_insertion_point(class_scope:io.deephaven.proto.backplane.grpc.RangeJoinTablesRequest)
- private:
-  class _Internal;
-
-  friend class ::google::protobuf::internal::TcParser;
-  static const ::google::protobuf::internal::TcParseTable<
-      4, 11, 4,
-      153, 2>
-      _table_;
-  friend class ::google::protobuf::MessageLite;
-  friend class ::google::protobuf::Arena;
-  template <typename T>
-  friend class ::google::protobuf::Arena::InternalHelper;
-  using InternalArenaConstructable_ = void;
-  using DestructorSkippable_ = void;
-  struct Impl_ {
-
-        inline explicit constexpr Impl_(
-            ::google::protobuf::internal::ConstantInitialized) noexcept;
-        inline explicit Impl_(::google::protobuf::internal::InternalVisibility visibility,
-                              ::google::protobuf::Arena* arena);
-        inline explicit Impl_(::google::protobuf::internal::InternalVisibility visibility,
-                              ::google::protobuf::Arena* arena, const Impl_& from);
-    ::google::protobuf::internal::HasBits<1> _has_bits_;
-    mutable ::google::protobuf::internal::CachedSize _cached_size_;
-    ::google::protobuf::RepeatedPtrField<std::string> exact_match_columns_;
-    ::google::protobuf::RepeatedPtrField< ::io::deephaven::proto::backplane::grpc::Aggregation > aggregations_;
-    ::google::protobuf::internal::ArenaStringPtr left_start_column_;
-    ::google::protobuf::internal::ArenaStringPtr right_range_column_;
-    ::google::protobuf::internal::ArenaStringPtr left_end_column_;
-    ::google::protobuf::internal::ArenaStringPtr range_match_;
-    ::io::deephaven::proto::backplane::grpc::Ticket* result_id_;
-    ::io::deephaven::proto::backplane::grpc::TableReference* left_id_;
-    ::io::deephaven::proto::backplane::grpc::TableReference* right_id_;
-    int range_start_rule_;
-    int range_end_rule_;
-    PROTOBUF_TSAN_DECLARE_MEMBER
-  };
-  union { Impl_ _impl_; };
-  friend struct ::TableStruct_deephaven_2fproto_2ftable_2eproto;
-};// -------------------------------------------------------------------
-
-class AggregateRequest final :
-    public ::google::protobuf::Message /* @@protoc_insertion_point(class_definition:io.deephaven.proto.backplane.grpc.AggregateRequest) */ {
- public:
-  inline AggregateRequest() : AggregateRequest(nullptr) {}
-  ~AggregateRequest() override;
-  template<typename = void>
-  explicit PROTOBUF_CONSTEXPR AggregateRequest(::google::protobuf::internal::ConstantInitialized);
-
-  inline AggregateRequest(const AggregateRequest& from)
-      : AggregateRequest(nullptr, from) {}
-  AggregateRequest(AggregateRequest&& from) noexcept
-    : AggregateRequest() {
-    *this = ::std::move(from);
-  }
-
-  inline AggregateRequest& operator=(const AggregateRequest& from) {
-    CopyFrom(from);
-    return *this;
-  }
-  inline AggregateRequest& operator=(AggregateRequest&& from) noexcept {
-    if (this == &from) return *this;
-    if (GetArena() == from.GetArena()
-  #ifdef PROTOBUF_FORCE_COPY_IN_MOVE
-        && GetArena() != nullptr
-  #endif  // !PROTOBUF_FORCE_COPY_IN_MOVE
-    ) {
-      InternalSwap(&from);
-    } else {
-      CopyFrom(from);
-    }
-    return *this;
-  }
-
-  inline const ::google::protobuf::UnknownFieldSet& unknown_fields() const
-      ABSL_ATTRIBUTE_LIFETIME_BOUND {
-    return _internal_metadata_.unknown_fields<::google::protobuf::UnknownFieldSet>(::google::protobuf::UnknownFieldSet::default_instance);
-  }
-  inline ::google::protobuf::UnknownFieldSet* mutable_unknown_fields()
-      ABSL_ATTRIBUTE_LIFETIME_BOUND {
-    return _internal_metadata_.mutable_unknown_fields<::google::protobuf::UnknownFieldSet>();
-  }
-
-  static const ::google::protobuf::Descriptor* descriptor() {
-    return GetDescriptor();
-  }
-  static const ::google::protobuf::Descriptor* GetDescriptor() {
-    return default_instance().GetMetadata().descriptor;
-  }
-  static const ::google::protobuf::Reflection* GetReflection() {
-    return default_instance().GetMetadata().reflection;
-  }
-  static const AggregateRequest& default_instance() {
-    return *internal_default_instance();
-  }
-  static inline const AggregateRequest* internal_default_instance() {
-    return reinterpret_cast<const AggregateRequest*>(
-               &_AggregateRequest_default_instance_);
-  }
-  static constexpr int kIndexInFileMessages =
-    86;
-
-  friend void swap(AggregateRequest& a, AggregateRequest& b) {
-    a.Swap(&b);
-  }
-  inline void Swap(AggregateRequest* other) {
-    if (other == this) return;
-  #ifdef PROTOBUF_FORCE_COPY_IN_SWAP
-    if (GetArena() != nullptr &&
-        GetArena() == other->GetArena()) {
-   #else  // PROTOBUF_FORCE_COPY_IN_SWAP
-    if (GetArena() == other->GetArena()) {
-  #endif  // !PROTOBUF_FORCE_COPY_IN_SWAP
-      InternalSwap(other);
-    } else {
-      ::google::protobuf::internal::GenericSwap(this, other);
-    }
-  }
-  void UnsafeArenaSwap(AggregateRequest* other) {
-    if (other == this) return;
-    ABSL_DCHECK(GetArena() == other->GetArena());
-    InternalSwap(other);
-  }
-
-  // implements Message ----------------------------------------------
-
-  AggregateRequest* New(::google::protobuf::Arena* arena = nullptr) const final {
-    return CreateMaybeMessage<AggregateRequest>(arena);
-  }
-  using ::google::protobuf::Message::CopyFrom;
-  void CopyFrom(const AggregateRequest& from);
-  using ::google::protobuf::Message::MergeFrom;
-  void MergeFrom( const AggregateRequest& from) {
-    AggregateRequest::MergeImpl(*this, from);
-  }
-  private:
-  static void MergeImpl(::google::protobuf::Message& to_msg, const ::google::protobuf::Message& from_msg);
-  public:
-  PROTOBUF_ATTRIBUTE_REINITIALIZES void Clear() final;
-  bool IsInitialized() const final;
-
-  ::size_t ByteSizeLong() const final;
-  const char* _InternalParse(const char* ptr, ::google::protobuf::internal::ParseContext* ctx) final;
-  ::uint8_t* _InternalSerialize(
-      ::uint8_t* target, ::google::protobuf::io::EpsCopyOutputStream* stream) const final;
-  int GetCachedSize() const { return _impl_._cached_size_.Get(); }
-
-  private:
-  ::google::protobuf::internal::CachedSize* AccessCachedSize() const final;
-  void SharedCtor(::google::protobuf::Arena* arena);
-  void SharedDtor();
-  void InternalSwap(AggregateRequest* other);
-
-  private:
-  friend class ::google::protobuf::internal::AnyMetadata;
-  static ::absl::string_view FullMessageName() {
-    return "io.deephaven.proto.backplane.grpc.AggregateRequest";
-  }
-  protected:
-  explicit AggregateRequest(::google::protobuf::Arena* arena);
-  AggregateRequest(::google::protobuf::Arena* arena, const AggregateRequest& from);
-  public:
-
-  static const ClassData _class_data_;
-  const ::google::protobuf::Message::ClassData*GetClassData() const final;
-
-  ::google::protobuf::Metadata GetMetadata() const final;
-
-  // nested types ----------------------------------------------------
-
-  // accessors -------------------------------------------------------
-
-  enum : int {
-    kAggregationsFieldNumber = 5,
-    kGroupByColumnsFieldNumber = 6,
-    kResultIdFieldNumber = 1,
-    kSourceIdFieldNumber = 2,
-    kInitialGroupsIdFieldNumber = 3,
-    kPreserveEmptyFieldNumber = 4,
-  };
-  // repeated .io.deephaven.proto.backplane.grpc.Aggregation aggregations = 5;
-  int aggregations_size() const;
-  private:
-  int _internal_aggregations_size() const;
-
-  public:
-  void clear_aggregations() ;
-  ::io::deephaven::proto::backplane::grpc::Aggregation* mutable_aggregations(int index);
-  ::google::protobuf::RepeatedPtrField< ::io::deephaven::proto::backplane::grpc::Aggregation >*
-      mutable_aggregations();
-  private:
-  const ::google::protobuf::RepeatedPtrField<::io::deephaven::proto::backplane::grpc::Aggregation>& _internal_aggregations() const;
-  ::google::protobuf::RepeatedPtrField<::io::deephaven::proto::backplane::grpc::Aggregation>* _internal_mutable_aggregations();
-  public:
-  const ::io::deephaven::proto::backplane::grpc::Aggregation& aggregations(int index) const;
-  ::io::deephaven::proto::backplane::grpc::Aggregation* add_aggregations();
-  const ::google::protobuf::RepeatedPtrField< ::io::deephaven::proto::backplane::grpc::Aggregation >&
-      aggregations() const;
-  // repeated string group_by_columns = 6;
-  int group_by_columns_size() const;
-  private:
-  int _internal_group_by_columns_size() const;
-
-  public:
-  void clear_group_by_columns() ;
-  const std::string& group_by_columns(int index) const;
-  std::string* mutable_group_by_columns(int index);
-  void set_group_by_columns(int index, const std::string& value);
-  void set_group_by_columns(int index, std::string&& value);
-  void set_group_by_columns(int index, const char* value);
-  void set_group_by_columns(int index, const char* value, std::size_t size);
-  void set_group_by_columns(int index, absl::string_view value);
-  std::string* add_group_by_columns();
-  void add_group_by_columns(const std::string& value);
-  void add_group_by_columns(std::string&& value);
-  void add_group_by_columns(const char* value);
-  void add_group_by_columns(const char* value, std::size_t size);
-  void add_group_by_columns(absl::string_view value);
-  const ::google::protobuf::RepeatedPtrField<std::string>& group_by_columns() const;
-  ::google::protobuf::RepeatedPtrField<std::string>* mutable_group_by_columns();
-
-  private:
-  const ::google::protobuf::RepeatedPtrField<std::string>& _internal_group_by_columns() const;
-  ::google::protobuf::RepeatedPtrField<std::string>* _internal_mutable_group_by_columns();
-
-  public:
-  // .io.deephaven.proto.backplane.grpc.Ticket result_id = 1;
-  bool has_result_id() const;
-  void clear_result_id() ;
-  const ::io::deephaven::proto::backplane::grpc::Ticket& result_id() const;
-  PROTOBUF_NODISCARD ::io::deephaven::proto::backplane::grpc::Ticket* release_result_id();
-  ::io::deephaven::proto::backplane::grpc::Ticket* mutable_result_id();
-  void set_allocated_result_id(::io::deephaven::proto::backplane::grpc::Ticket* value);
-  void unsafe_arena_set_allocated_result_id(::io::deephaven::proto::backplane::grpc::Ticket* value);
-  ::io::deephaven::proto::backplane::grpc::Ticket* unsafe_arena_release_result_id();
-
-  private:
-  const ::io::deephaven::proto::backplane::grpc::Ticket& _internal_result_id() const;
-  ::io::deephaven::proto::backplane::grpc::Ticket* _internal_mutable_result_id();
-
-  public:
-  // .io.deephaven.proto.backplane.grpc.TableReference source_id = 2;
-  bool has_source_id() const;
-  void clear_source_id() ;
-  const ::io::deephaven::proto::backplane::grpc::TableReference& source_id() const;
-  PROTOBUF_NODISCARD ::io::deephaven::proto::backplane::grpc::TableReference* release_source_id();
-  ::io::deephaven::proto::backplane::grpc::TableReference* mutable_source_id();
-  void set_allocated_source_id(::io::deephaven::proto::backplane::grpc::TableReference* value);
-  void unsafe_arena_set_allocated_source_id(::io::deephaven::proto::backplane::grpc::TableReference* value);
-  ::io::deephaven::proto::backplane::grpc::TableReference* unsafe_arena_release_source_id();
-
-  private:
-  const ::io::deephaven::proto::backplane::grpc::TableReference& _internal_source_id() const;
-  ::io::deephaven::proto::backplane::grpc::TableReference* _internal_mutable_source_id();
-
-  public:
-  // .io.deephaven.proto.backplane.grpc.TableReference initial_groups_id = 3;
-  bool has_initial_groups_id() const;
-  void clear_initial_groups_id() ;
-  const ::io::deephaven::proto::backplane::grpc::TableReference& initial_groups_id() const;
-  PROTOBUF_NODISCARD ::io::deephaven::proto::backplane::grpc::TableReference* release_initial_groups_id();
-  ::io::deephaven::proto::backplane::grpc::TableReference* mutable_initial_groups_id();
-  void set_allocated_initial_groups_id(::io::deephaven::proto::backplane::grpc::TableReference* value);
-  void unsafe_arena_set_allocated_initial_groups_id(::io::deephaven::proto::backplane::grpc::TableReference* value);
-  ::io::deephaven::proto::backplane::grpc::TableReference* unsafe_arena_release_initial_groups_id();
-
-  private:
-  const ::io::deephaven::proto::backplane::grpc::TableReference& _internal_initial_groups_id() const;
-  ::io::deephaven::proto::backplane::grpc::TableReference* _internal_mutable_initial_groups_id();
-
-  public:
-  // bool preserve_empty = 4;
-  void clear_preserve_empty() ;
-  bool preserve_empty() const;
-  void set_preserve_empty(bool value);
-
-  private:
-  bool _internal_preserve_empty() const;
-  void _internal_set_preserve_empty(bool value);
-
-  public:
-  // @@protoc_insertion_point(class_scope:io.deephaven.proto.backplane.grpc.AggregateRequest)
- private:
-  class _Internal;
-
-  friend class ::google::protobuf::internal::TcParser;
-  static const ::google::protobuf::internal::TcParseTable<
-      3, 6, 4,
-      75, 2>
-      _table_;
-  friend class ::google::protobuf::MessageLite;
-  friend class ::google::protobuf::Arena;
-  template <typename T>
-  friend class ::google::protobuf::Arena::InternalHelper;
-  using InternalArenaConstructable_ = void;
-  using DestructorSkippable_ = void;
-  struct Impl_ {
-
-        inline explicit constexpr Impl_(
-            ::google::protobuf::internal::ConstantInitialized) noexcept;
-        inline explicit Impl_(::google::protobuf::internal::InternalVisibility visibility,
-                              ::google::protobuf::Arena* arena);
-        inline explicit Impl_(::google::protobuf::internal::InternalVisibility visibility,
-                              ::google::protobuf::Arena* arena, const Impl_& from);
-    ::google::protobuf::internal::HasBits<1> _has_bits_;
-    mutable ::google::protobuf::internal::CachedSize _cached_size_;
-    ::google::protobuf::RepeatedPtrField< ::io::deephaven::proto::backplane::grpc::Aggregation > aggregations_;
-    ::google::protobuf::RepeatedPtrField<std::string> group_by_columns_;
-    ::io::deephaven::proto::backplane::grpc::Ticket* result_id_;
-    ::io::deephaven::proto::backplane::grpc::TableReference* source_id_;
-    ::io::deephaven::proto::backplane::grpc::TableReference* initial_groups_id_;
-    bool preserve_empty_;
-    PROTOBUF_TSAN_DECLARE_MEMBER
-  };
-  union { Impl_ _impl_; };
-  friend struct ::TableStruct_deephaven_2fproto_2ftable_2eproto;
-};// -------------------------------------------------------------------
-
-class UpdateByRequest final :
-    public ::google::protobuf::Message /* @@protoc_insertion_point(class_definition:io.deephaven.proto.backplane.grpc.UpdateByRequest) */ {
- public:
-  inline UpdateByRequest() : UpdateByRequest(nullptr) {}
-  ~UpdateByRequest() override;
-  template<typename = void>
-  explicit PROTOBUF_CONSTEXPR UpdateByRequest(::google::protobuf::internal::ConstantInitialized);
-
-  inline UpdateByRequest(const UpdateByRequest& from)
-      : UpdateByRequest(nullptr, from) {}
-  UpdateByRequest(UpdateByRequest&& from) noexcept
-    : UpdateByRequest() {
-    *this = ::std::move(from);
-  }
-
-  inline UpdateByRequest& operator=(const UpdateByRequest& from) {
-    CopyFrom(from);
-    return *this;
-  }
-  inline UpdateByRequest& operator=(UpdateByRequest&& from) noexcept {
-    if (this == &from) return *this;
-    if (GetArena() == from.GetArena()
-  #ifdef PROTOBUF_FORCE_COPY_IN_MOVE
-        && GetArena() != nullptr
-  #endif  // !PROTOBUF_FORCE_COPY_IN_MOVE
-    ) {
-      InternalSwap(&from);
-    } else {
-      CopyFrom(from);
-    }
-    return *this;
-  }
-
-  inline const ::google::protobuf::UnknownFieldSet& unknown_fields() const
-      ABSL_ATTRIBUTE_LIFETIME_BOUND {
-    return _internal_metadata_.unknown_fields<::google::protobuf::UnknownFieldSet>(::google::protobuf::UnknownFieldSet::default_instance);
-  }
-  inline ::google::protobuf::UnknownFieldSet* mutable_unknown_fields()
-      ABSL_ATTRIBUTE_LIFETIME_BOUND {
-    return _internal_metadata_.mutable_unknown_fields<::google::protobuf::UnknownFieldSet>();
-  }
-
-  static const ::google::protobuf::Descriptor* descriptor() {
-    return GetDescriptor();
-  }
-  static const ::google::protobuf::Descriptor* GetDescriptor() {
-    return default_instance().GetMetadata().descriptor;
-  }
-  static const ::google::protobuf::Reflection* GetReflection() {
-    return default_instance().GetMetadata().reflection;
-  }
-  static const UpdateByRequest& default_instance() {
-    return *internal_default_instance();
-  }
-  static inline const UpdateByRequest* internal_default_instance() {
-    return reinterpret_cast<const UpdateByRequest*>(
-               &_UpdateByRequest_default_instance_);
-  }
-  static constexpr int kIndexInFileMessages =
-    40;
-
-  friend void swap(UpdateByRequest& a, UpdateByRequest& b) {
-    a.Swap(&b);
-  }
-  inline void Swap(UpdateByRequest* other) {
-    if (other == this) return;
-  #ifdef PROTOBUF_FORCE_COPY_IN_SWAP
-    if (GetArena() != nullptr &&
-        GetArena() == other->GetArena()) {
-   #else  // PROTOBUF_FORCE_COPY_IN_SWAP
-    if (GetArena() == other->GetArena()) {
-  #endif  // !PROTOBUF_FORCE_COPY_IN_SWAP
-      InternalSwap(other);
-    } else {
-      ::google::protobuf::internal::GenericSwap(this, other);
-    }
-  }
-  void UnsafeArenaSwap(UpdateByRequest* other) {
-    if (other == this) return;
-    ABSL_DCHECK(GetArena() == other->GetArena());
-    InternalSwap(other);
-  }
-
-  // implements Message ----------------------------------------------
-
-  UpdateByRequest* New(::google::protobuf::Arena* arena = nullptr) const final {
-    return CreateMaybeMessage<UpdateByRequest>(arena);
-  }
-  using ::google::protobuf::Message::CopyFrom;
-  void CopyFrom(const UpdateByRequest& from);
-  using ::google::protobuf::Message::MergeFrom;
-  void MergeFrom( const UpdateByRequest& from) {
-    UpdateByRequest::MergeImpl(*this, from);
-  }
-  private:
-  static void MergeImpl(::google::protobuf::Message& to_msg, const ::google::protobuf::Message& from_msg);
-  public:
-  PROTOBUF_ATTRIBUTE_REINITIALIZES void Clear() final;
-  bool IsInitialized() const final;
-
-  ::size_t ByteSizeLong() const final;
-  const char* _InternalParse(const char* ptr, ::google::protobuf::internal::ParseContext* ctx) final;
-  ::uint8_t* _InternalSerialize(
-      ::uint8_t* target, ::google::protobuf::io::EpsCopyOutputStream* stream) const final;
-  int GetCachedSize() const { return _impl_._cached_size_.Get(); }
-
-  private:
-  ::google::protobuf::internal::CachedSize* AccessCachedSize() const final;
-  void SharedCtor(::google::protobuf::Arena* arena);
-  void SharedDtor();
-  void InternalSwap(UpdateByRequest* other);
-
-  private:
-  friend class ::google::protobuf::internal::AnyMetadata;
-  static ::absl::string_view FullMessageName() {
-    return "io.deephaven.proto.backplane.grpc.UpdateByRequest";
-  }
-  protected:
-  explicit UpdateByRequest(::google::protobuf::Arena* arena);
-  UpdateByRequest(::google::protobuf::Arena* arena, const UpdateByRequest& from);
-  public:
-
-  static const ClassData _class_data_;
-  const ::google::protobuf::Message::ClassData*GetClassData() const final;
-
-  ::google::protobuf::Metadata GetMetadata() const final;
-
-  // nested types ----------------------------------------------------
-
-  using UpdateByOptions = UpdateByRequest_UpdateByOptions;
-  using UpdateByOperation = UpdateByRequest_UpdateByOperation;
-
-  // accessors -------------------------------------------------------
-
-  enum : int {
-    kOperationsFieldNumber = 4,
-    kGroupByColumnsFieldNumber = 5,
-    kResultIdFieldNumber = 1,
-    kSourceIdFieldNumber = 2,
-    kOptionsFieldNumber = 3,
-  };
-  // repeated .io.deephaven.proto.backplane.grpc.UpdateByRequest.UpdateByOperation operations = 4;
-  int operations_size() const;
-  private:
-  int _internal_operations_size() const;
-
-  public:
-  void clear_operations() ;
-  ::io::deephaven::proto::backplane::grpc::UpdateByRequest_UpdateByOperation* mutable_operations(int index);
-  ::google::protobuf::RepeatedPtrField< ::io::deephaven::proto::backplane::grpc::UpdateByRequest_UpdateByOperation >*
-      mutable_operations();
-  private:
-  const ::google::protobuf::RepeatedPtrField<::io::deephaven::proto::backplane::grpc::UpdateByRequest_UpdateByOperation>& _internal_operations() const;
-  ::google::protobuf::RepeatedPtrField<::io::deephaven::proto::backplane::grpc::UpdateByRequest_UpdateByOperation>* _internal_mutable_operations();
-  public:
-  const ::io::deephaven::proto::backplane::grpc::UpdateByRequest_UpdateByOperation& operations(int index) const;
-  ::io::deephaven::proto::backplane::grpc::UpdateByRequest_UpdateByOperation* add_operations();
-  const ::google::protobuf::RepeatedPtrField< ::io::deephaven::proto::backplane::grpc::UpdateByRequest_UpdateByOperation >&
-      operations() const;
-  // repeated string group_by_columns = 5;
-  int group_by_columns_size() const;
-  private:
-  int _internal_group_by_columns_size() const;
-
-  public:
-  void clear_group_by_columns() ;
-  const std::string& group_by_columns(int index) const;
-  std::string* mutable_group_by_columns(int index);
-  void set_group_by_columns(int index, const std::string& value);
-  void set_group_by_columns(int index, std::string&& value);
-  void set_group_by_columns(int index, const char* value);
-  void set_group_by_columns(int index, const char* value, std::size_t size);
-  void set_group_by_columns(int index, absl::string_view value);
-  std::string* add_group_by_columns();
-  void add_group_by_columns(const std::string& value);
-  void add_group_by_columns(std::string&& value);
-  void add_group_by_columns(const char* value);
-  void add_group_by_columns(const char* value, std::size_t size);
-  void add_group_by_columns(absl::string_view value);
-  const ::google::protobuf::RepeatedPtrField<std::string>& group_by_columns() const;
-  ::google::protobuf::RepeatedPtrField<std::string>* mutable_group_by_columns();
-
-  private:
-  const ::google::protobuf::RepeatedPtrField<std::string>& _internal_group_by_columns() const;
-  ::google::protobuf::RepeatedPtrField<std::string>* _internal_mutable_group_by_columns();
-
-  public:
-  // .io.deephaven.proto.backplane.grpc.Ticket result_id = 1;
-  bool has_result_id() const;
-  void clear_result_id() ;
-  const ::io::deephaven::proto::backplane::grpc::Ticket& result_id() const;
-  PROTOBUF_NODISCARD ::io::deephaven::proto::backplane::grpc::Ticket* release_result_id();
-  ::io::deephaven::proto::backplane::grpc::Ticket* mutable_result_id();
-  void set_allocated_result_id(::io::deephaven::proto::backplane::grpc::Ticket* value);
-  void unsafe_arena_set_allocated_result_id(::io::deephaven::proto::backplane::grpc::Ticket* value);
-  ::io::deephaven::proto::backplane::grpc::Ticket* unsafe_arena_release_result_id();
-
-  private:
-  const ::io::deephaven::proto::backplane::grpc::Ticket& _internal_result_id() const;
-  ::io::deephaven::proto::backplane::grpc::Ticket* _internal_mutable_result_id();
-
-  public:
-  // .io.deephaven.proto.backplane.grpc.TableReference source_id = 2;
-  bool has_source_id() const;
-  void clear_source_id() ;
-  const ::io::deephaven::proto::backplane::grpc::TableReference& source_id() const;
-  PROTOBUF_NODISCARD ::io::deephaven::proto::backplane::grpc::TableReference* release_source_id();
-  ::io::deephaven::proto::backplane::grpc::TableReference* mutable_source_id();
-  void set_allocated_source_id(::io::deephaven::proto::backplane::grpc::TableReference* value);
-  void unsafe_arena_set_allocated_source_id(::io::deephaven::proto::backplane::grpc::TableReference* value);
-  ::io::deephaven::proto::backplane::grpc::TableReference* unsafe_arena_release_source_id();
-
-  private:
-  const ::io::deephaven::proto::backplane::grpc::TableReference& _internal_source_id() const;
-  ::io::deephaven::proto::backplane::grpc::TableReference* _internal_mutable_source_id();
-
-  public:
-  // .io.deephaven.proto.backplane.grpc.UpdateByRequest.UpdateByOptions options = 3;
-  bool has_options() const;
-  void clear_options() ;
-  const ::io::deephaven::proto::backplane::grpc::UpdateByRequest_UpdateByOptions& options() const;
-  PROTOBUF_NODISCARD ::io::deephaven::proto::backplane::grpc::UpdateByRequest_UpdateByOptions* release_options();
-  ::io::deephaven::proto::backplane::grpc::UpdateByRequest_UpdateByOptions* mutable_options();
-  void set_allocated_options(::io::deephaven::proto::backplane::grpc::UpdateByRequest_UpdateByOptions* value);
-  void unsafe_arena_set_allocated_options(::io::deephaven::proto::backplane::grpc::UpdateByRequest_UpdateByOptions* value);
-  ::io::deephaven::proto::backplane::grpc::UpdateByRequest_UpdateByOptions* unsafe_arena_release_options();
-
-  private:
-  const ::io::deephaven::proto::backplane::grpc::UpdateByRequest_UpdateByOptions& _internal_options() const;
-  ::io::deephaven::proto::backplane::grpc::UpdateByRequest_UpdateByOptions* _internal_mutable_options();
-
-  public:
-  // @@protoc_insertion_point(class_scope:io.deephaven.proto.backplane.grpc.UpdateByRequest)
- private:
-  class _Internal;
-
-  friend class ::google::protobuf::internal::TcParser;
-  static const ::google::protobuf::internal::TcParseTable<
-      3, 5, 4,
-      74, 2>
-      _table_;
-  friend class ::google::protobuf::MessageLite;
-  friend class ::google::protobuf::Arena;
-  template <typename T>
-  friend class ::google::protobuf::Arena::InternalHelper;
-  using InternalArenaConstructable_ = void;
-  using DestructorSkippable_ = void;
-  struct Impl_ {
-
-        inline explicit constexpr Impl_(
-            ::google::protobuf::internal::ConstantInitialized) noexcept;
-        inline explicit Impl_(::google::protobuf::internal::InternalVisibility visibility,
-                              ::google::protobuf::Arena* arena);
-        inline explicit Impl_(::google::protobuf::internal::InternalVisibility visibility,
-                              ::google::protobuf::Arena* arena, const Impl_& from);
-    ::google::protobuf::internal::HasBits<1> _has_bits_;
-    mutable ::google::protobuf::internal::CachedSize _cached_size_;
-    ::google::protobuf::RepeatedPtrField< ::io::deephaven::proto::backplane::grpc::UpdateByRequest_UpdateByOperation > operations_;
-    ::google::protobuf::RepeatedPtrField<std::string> group_by_columns_;
-    ::io::deephaven::proto::backplane::grpc::Ticket* result_id_;
-    ::io::deephaven::proto::backplane::grpc::TableReference* source_id_;
-    ::io::deephaven::proto::backplane::grpc::UpdateByRequest_UpdateByOptions* options_;
-    PROTOBUF_TSAN_DECLARE_MEMBER
-  };
-  union { Impl_ _impl_; };
-  friend struct ::TableStruct_deephaven_2fproto_2ftable_2eproto;
-};// -------------------------------------------------------------------
-
-class BatchTableRequest_Operation final :
-    public ::google::protobuf::Message /* @@protoc_insertion_point(class_definition:io.deephaven.proto.backplane.grpc.BatchTableRequest.Operation) */ {
- public:
-  inline BatchTableRequest_Operation() : BatchTableRequest_Operation(nullptr) {}
-  ~BatchTableRequest_Operation() override;
-  template<typename = void>
-  explicit PROTOBUF_CONSTEXPR BatchTableRequest_Operation(::google::protobuf::internal::ConstantInitialized);
-
-  inline BatchTableRequest_Operation(const BatchTableRequest_Operation& from)
-      : BatchTableRequest_Operation(nullptr, from) {}
-  BatchTableRequest_Operation(BatchTableRequest_Operation&& from) noexcept
-    : BatchTableRequest_Operation() {
-    *this = ::std::move(from);
-  }
-
-  inline BatchTableRequest_Operation& operator=(const BatchTableRequest_Operation& from) {
-    CopyFrom(from);
-    return *this;
-  }
-  inline BatchTableRequest_Operation& operator=(BatchTableRequest_Operation&& from) noexcept {
-    if (this == &from) return *this;
-    if (GetArena() == from.GetArena()
-  #ifdef PROTOBUF_FORCE_COPY_IN_MOVE
-        && GetArena() != nullptr
-  #endif  // !PROTOBUF_FORCE_COPY_IN_MOVE
-    ) {
-      InternalSwap(&from);
-    } else {
-      CopyFrom(from);
-    }
-    return *this;
-  }
-
-  inline const ::google::protobuf::UnknownFieldSet& unknown_fields() const
-      ABSL_ATTRIBUTE_LIFETIME_BOUND {
-    return _internal_metadata_.unknown_fields<::google::protobuf::UnknownFieldSet>(::google::protobuf::UnknownFieldSet::default_instance);
-  }
-  inline ::google::protobuf::UnknownFieldSet* mutable_unknown_fields()
-      ABSL_ATTRIBUTE_LIFETIME_BOUND {
-    return _internal_metadata_.mutable_unknown_fields<::google::protobuf::UnknownFieldSet>();
-  }
-
-  static const ::google::protobuf::Descriptor* descriptor() {
-    return GetDescriptor();
-  }
-  static const ::google::protobuf::Descriptor* GetDescriptor() {
-    return default_instance().GetMetadata().descriptor;
-  }
-  static const ::google::protobuf::Reflection* GetReflection() {
-    return default_instance().GetMetadata().reflection;
-  }
-  static const BatchTableRequest_Operation& default_instance() {
-    return *internal_default_instance();
-  }
-  enum OpCase {
-    kEmptyTable = 1,
-    kTimeTable = 2,
-    kDropColumns = 3,
-    kUpdate = 4,
-    kLazyUpdate = 5,
-    kView = 6,
-    kUpdateView = 7,
-    kSelect = 8,
-    kSelectDistinct = 9,
-    kFilter = 10,
-    kUnstructuredFilter = 11,
-    kSort = 12,
-    kHead = 13,
-    kTail = 14,
-    kHeadBy = 15,
-    kTailBy = 16,
-    kUngroup = 17,
-    kMerge = 18,
-    kComboAggregate = 19,
-    kFlatten = 21,
-    kRunChartDownsample = 22,
-    kCrossJoin = 23,
-    kNaturalJoin = 24,
-    kExactJoin = 25,
-    kLeftJoin = 26,
-    kAsOfJoin = 27,
-    kFetchTable = 28,
-    kApplyPreviewColumns = 30,
-    kCreateInputTable = 31,
-    kUpdateBy = 32,
-    kWhereIn = 33,
-    kAggregateAll = 34,
-    kAggregate = 35,
-    kSnapshot = 36,
-    kSnapshotWhen = 37,
-    kMetaTable = 38,
-    kRangeJoin = 39,
-    kAj = 40,
-    kRaj = 41,
-    kColumnStatistics = 42,
-    kMultiJoin = 43,
-    OP_NOT_SET = 0,
-  };
-
-  static inline const BatchTableRequest_Operation* internal_default_instance() {
-    return reinterpret_cast<const BatchTableRequest_Operation*>(
-               &_BatchTableRequest_Operation_default_instance_);
-  }
-  static constexpr int kIndexInFileMessages =
-    122;
-
-  friend void swap(BatchTableRequest_Operation& a, BatchTableRequest_Operation& b) {
-    a.Swap(&b);
-  }
-  inline void Swap(BatchTableRequest_Operation* other) {
-    if (other == this) return;
-  #ifdef PROTOBUF_FORCE_COPY_IN_SWAP
-    if (GetArena() != nullptr &&
-        GetArena() == other->GetArena()) {
-   #else  // PROTOBUF_FORCE_COPY_IN_SWAP
-    if (GetArena() == other->GetArena()) {
-  #endif  // !PROTOBUF_FORCE_COPY_IN_SWAP
-      InternalSwap(other);
-    } else {
-      ::google::protobuf::internal::GenericSwap(this, other);
-    }
-  }
-  void UnsafeArenaSwap(BatchTableRequest_Operation* other) {
-    if (other == this) return;
-    ABSL_DCHECK(GetArena() == other->GetArena());
-    InternalSwap(other);
-  }
-
-  // implements Message ----------------------------------------------
-
-  BatchTableRequest_Operation* New(::google::protobuf::Arena* arena = nullptr) const final {
-    return CreateMaybeMessage<BatchTableRequest_Operation>(arena);
-  }
-  using ::google::protobuf::Message::CopyFrom;
-  void CopyFrom(const BatchTableRequest_Operation& from);
-  using ::google::protobuf::Message::MergeFrom;
-  void MergeFrom( const BatchTableRequest_Operation& from) {
-    BatchTableRequest_Operation::MergeImpl(*this, from);
-  }
-  private:
-  static void MergeImpl(::google::protobuf::Message& to_msg, const ::google::protobuf::Message& from_msg);
-  public:
-  PROTOBUF_ATTRIBUTE_REINITIALIZES void Clear() final;
-  bool IsInitialized() const final;
-
-  ::size_t ByteSizeLong() const final;
-  const char* _InternalParse(const char* ptr, ::google::protobuf::internal::ParseContext* ctx) final;
-  ::uint8_t* _InternalSerialize(
-      ::uint8_t* target, ::google::protobuf::io::EpsCopyOutputStream* stream) const final;
-  int GetCachedSize() const { return _impl_._cached_size_.Get(); }
-
-  private:
-  ::google::protobuf::internal::CachedSize* AccessCachedSize() const final;
-  void SharedCtor(::google::protobuf::Arena* arena);
-  void SharedDtor();
-  void InternalSwap(BatchTableRequest_Operation* other);
-
-  private:
-  friend class ::google::protobuf::internal::AnyMetadata;
-  static ::absl::string_view FullMessageName() {
-    return "io.deephaven.proto.backplane.grpc.BatchTableRequest.Operation";
-  }
-  protected:
-  explicit BatchTableRequest_Operation(::google::protobuf::Arena* arena);
-  BatchTableRequest_Operation(::google::protobuf::Arena* arena, const BatchTableRequest_Operation& from);
-  public:
-
-  static const ClassData _class_data_;
-  const ::google::protobuf::Message::ClassData*GetClassData() const final;
-
-  ::google::protobuf::Metadata GetMetadata() const final;
-
-  // nested types ----------------------------------------------------
-
-  // accessors -------------------------------------------------------
-
-  enum : int {
-    kEmptyTableFieldNumber = 1,
-    kTimeTableFieldNumber = 2,
-    kDropColumnsFieldNumber = 3,
-    kUpdateFieldNumber = 4,
-    kLazyUpdateFieldNumber = 5,
-    kViewFieldNumber = 6,
-    kUpdateViewFieldNumber = 7,
-    kSelectFieldNumber = 8,
-    kSelectDistinctFieldNumber = 9,
-    kFilterFieldNumber = 10,
-    kUnstructuredFilterFieldNumber = 11,
-    kSortFieldNumber = 12,
-    kHeadFieldNumber = 13,
-    kTailFieldNumber = 14,
-    kHeadByFieldNumber = 15,
-    kTailByFieldNumber = 16,
-    kUngroupFieldNumber = 17,
-    kMergeFieldNumber = 18,
-    kComboAggregateFieldNumber = 19,
-    kFlattenFieldNumber = 21,
-    kRunChartDownsampleFieldNumber = 22,
-    kCrossJoinFieldNumber = 23,
-    kNaturalJoinFieldNumber = 24,
-    kExactJoinFieldNumber = 25,
-    kLeftJoinFieldNumber = 26,
-    kAsOfJoinFieldNumber = 27,
-    kFetchTableFieldNumber = 28,
-    kApplyPreviewColumnsFieldNumber = 30,
-    kCreateInputTableFieldNumber = 31,
-    kUpdateByFieldNumber = 32,
-    kWhereInFieldNumber = 33,
-    kAggregateAllFieldNumber = 34,
-    kAggregateFieldNumber = 35,
-    kSnapshotFieldNumber = 36,
-    kSnapshotWhenFieldNumber = 37,
-    kMetaTableFieldNumber = 38,
-    kRangeJoinFieldNumber = 39,
-    kAjFieldNumber = 40,
-    kRajFieldNumber = 41,
-    kColumnStatisticsFieldNumber = 42,
-    kMultiJoinFieldNumber = 43,
-  };
-  // .io.deephaven.proto.backplane.grpc.EmptyTableRequest empty_table = 1;
-  bool has_empty_table() const;
-  private:
-  bool _internal_has_empty_table() const;
-
-  public:
-  void clear_empty_table() ;
-  const ::io::deephaven::proto::backplane::grpc::EmptyTableRequest& empty_table() const;
-  PROTOBUF_NODISCARD ::io::deephaven::proto::backplane::grpc::EmptyTableRequest* release_empty_table();
-  ::io::deephaven::proto::backplane::grpc::EmptyTableRequest* mutable_empty_table();
-  void set_allocated_empty_table(::io::deephaven::proto::backplane::grpc::EmptyTableRequest* value);
-  void unsafe_arena_set_allocated_empty_table(::io::deephaven::proto::backplane::grpc::EmptyTableRequest* value);
-  ::io::deephaven::proto::backplane::grpc::EmptyTableRequest* unsafe_arena_release_empty_table();
-
-  private:
-  const ::io::deephaven::proto::backplane::grpc::EmptyTableRequest& _internal_empty_table() const;
-  ::io::deephaven::proto::backplane::grpc::EmptyTableRequest* _internal_mutable_empty_table();
-
-  public:
-  // .io.deephaven.proto.backplane.grpc.TimeTableRequest time_table = 2;
-  bool has_time_table() const;
-  private:
-  bool _internal_has_time_table() const;
-
-  public:
-  void clear_time_table() ;
-  const ::io::deephaven::proto::backplane::grpc::TimeTableRequest& time_table() const;
-  PROTOBUF_NODISCARD ::io::deephaven::proto::backplane::grpc::TimeTableRequest* release_time_table();
-  ::io::deephaven::proto::backplane::grpc::TimeTableRequest* mutable_time_table();
-  void set_allocated_time_table(::io::deephaven::proto::backplane::grpc::TimeTableRequest* value);
-  void unsafe_arena_set_allocated_time_table(::io::deephaven::proto::backplane::grpc::TimeTableRequest* value);
-  ::io::deephaven::proto::backplane::grpc::TimeTableRequest* unsafe_arena_release_time_table();
-
-  private:
-  const ::io::deephaven::proto::backplane::grpc::TimeTableRequest& _internal_time_table() const;
-  ::io::deephaven::proto::backplane::grpc::TimeTableRequest* _internal_mutable_time_table();
-
-  public:
-  // .io.deephaven.proto.backplane.grpc.DropColumnsRequest drop_columns = 3;
-  bool has_drop_columns() const;
-  private:
-  bool _internal_has_drop_columns() const;
-
-  public:
-  void clear_drop_columns() ;
-  const ::io::deephaven::proto::backplane::grpc::DropColumnsRequest& drop_columns() const;
-  PROTOBUF_NODISCARD ::io::deephaven::proto::backplane::grpc::DropColumnsRequest* release_drop_columns();
-  ::io::deephaven::proto::backplane::grpc::DropColumnsRequest* mutable_drop_columns();
-  void set_allocated_drop_columns(::io::deephaven::proto::backplane::grpc::DropColumnsRequest* value);
-  void unsafe_arena_set_allocated_drop_columns(::io::deephaven::proto::backplane::grpc::DropColumnsRequest* value);
-  ::io::deephaven::proto::backplane::grpc::DropColumnsRequest* unsafe_arena_release_drop_columns();
-
-  private:
-  const ::io::deephaven::proto::backplane::grpc::DropColumnsRequest& _internal_drop_columns() const;
-  ::io::deephaven::proto::backplane::grpc::DropColumnsRequest* _internal_mutable_drop_columns();
-
-  public:
-  // .io.deephaven.proto.backplane.grpc.SelectOrUpdateRequest update = 4;
-  bool has_update() const;
-  private:
-  bool _internal_has_update() const;
-
-  public:
-  void clear_update() ;
-  const ::io::deephaven::proto::backplane::grpc::SelectOrUpdateRequest& update() const;
-  PROTOBUF_NODISCARD ::io::deephaven::proto::backplane::grpc::SelectOrUpdateRequest* release_update();
-  ::io::deephaven::proto::backplane::grpc::SelectOrUpdateRequest* mutable_update();
-  void set_allocated_update(::io::deephaven::proto::backplane::grpc::SelectOrUpdateRequest* value);
-  void unsafe_arena_set_allocated_update(::io::deephaven::proto::backplane::grpc::SelectOrUpdateRequest* value);
-  ::io::deephaven::proto::backplane::grpc::SelectOrUpdateRequest* unsafe_arena_release_update();
-
-  private:
-  const ::io::deephaven::proto::backplane::grpc::SelectOrUpdateRequest& _internal_update() const;
-  ::io::deephaven::proto::backplane::grpc::SelectOrUpdateRequest* _internal_mutable_update();
-
-  public:
-  // .io.deephaven.proto.backplane.grpc.SelectOrUpdateRequest lazy_update = 5;
-  bool has_lazy_update() const;
-  private:
-  bool _internal_has_lazy_update() const;
-
-  public:
-  void clear_lazy_update() ;
-  const ::io::deephaven::proto::backplane::grpc::SelectOrUpdateRequest& lazy_update() const;
-  PROTOBUF_NODISCARD ::io::deephaven::proto::backplane::grpc::SelectOrUpdateRequest* release_lazy_update();
-  ::io::deephaven::proto::backplane::grpc::SelectOrUpdateRequest* mutable_lazy_update();
-  void set_allocated_lazy_update(::io::deephaven::proto::backplane::grpc::SelectOrUpdateRequest* value);
-  void unsafe_arena_set_allocated_lazy_update(::io::deephaven::proto::backplane::grpc::SelectOrUpdateRequest* value);
-  ::io::deephaven::proto::backplane::grpc::SelectOrUpdateRequest* unsafe_arena_release_lazy_update();
-
-  private:
-  const ::io::deephaven::proto::backplane::grpc::SelectOrUpdateRequest& _internal_lazy_update() const;
-  ::io::deephaven::proto::backplane::grpc::SelectOrUpdateRequest* _internal_mutable_lazy_update();
-
-  public:
-  // .io.deephaven.proto.backplane.grpc.SelectOrUpdateRequest view = 6;
-  bool has_view() const;
-  private:
-  bool _internal_has_view() const;
-
-  public:
-  void clear_view() ;
-  const ::io::deephaven::proto::backplane::grpc::SelectOrUpdateRequest& view() const;
-  PROTOBUF_NODISCARD ::io::deephaven::proto::backplane::grpc::SelectOrUpdateRequest* release_view();
-  ::io::deephaven::proto::backplane::grpc::SelectOrUpdateRequest* mutable_view();
-  void set_allocated_view(::io::deephaven::proto::backplane::grpc::SelectOrUpdateRequest* value);
-  void unsafe_arena_set_allocated_view(::io::deephaven::proto::backplane::grpc::SelectOrUpdateRequest* value);
-  ::io::deephaven::proto::backplane::grpc::SelectOrUpdateRequest* unsafe_arena_release_view();
-
-  private:
-  const ::io::deephaven::proto::backplane::grpc::SelectOrUpdateRequest& _internal_view() const;
-  ::io::deephaven::proto::backplane::grpc::SelectOrUpdateRequest* _internal_mutable_view();
-
-  public:
-  // .io.deephaven.proto.backplane.grpc.SelectOrUpdateRequest update_view = 7;
-  bool has_update_view() const;
-  private:
-  bool _internal_has_update_view() const;
-
-  public:
-  void clear_update_view() ;
-  const ::io::deephaven::proto::backplane::grpc::SelectOrUpdateRequest& update_view() const;
-  PROTOBUF_NODISCARD ::io::deephaven::proto::backplane::grpc::SelectOrUpdateRequest* release_update_view();
-  ::io::deephaven::proto::backplane::grpc::SelectOrUpdateRequest* mutable_update_view();
-  void set_allocated_update_view(::io::deephaven::proto::backplane::grpc::SelectOrUpdateRequest* value);
-  void unsafe_arena_set_allocated_update_view(::io::deephaven::proto::backplane::grpc::SelectOrUpdateRequest* value);
-  ::io::deephaven::proto::backplane::grpc::SelectOrUpdateRequest* unsafe_arena_release_update_view();
-
-  private:
-  const ::io::deephaven::proto::backplane::grpc::SelectOrUpdateRequest& _internal_update_view() const;
-  ::io::deephaven::proto::backplane::grpc::SelectOrUpdateRequest* _internal_mutable_update_view();
-
-  public:
-  // .io.deephaven.proto.backplane.grpc.SelectOrUpdateRequest select = 8;
-  bool has_select() const;
-  private:
-  bool _internal_has_select() const;
-
-  public:
-  void clear_select() ;
-  const ::io::deephaven::proto::backplane::grpc::SelectOrUpdateRequest& select() const;
-  PROTOBUF_NODISCARD ::io::deephaven::proto::backplane::grpc::SelectOrUpdateRequest* release_select();
-  ::io::deephaven::proto::backplane::grpc::SelectOrUpdateRequest* mutable_select();
-  void set_allocated_select(::io::deephaven::proto::backplane::grpc::SelectOrUpdateRequest* value);
-  void unsafe_arena_set_allocated_select(::io::deephaven::proto::backplane::grpc::SelectOrUpdateRequest* value);
-  ::io::deephaven::proto::backplane::grpc::SelectOrUpdateRequest* unsafe_arena_release_select();
-
-  private:
-  const ::io::deephaven::proto::backplane::grpc::SelectOrUpdateRequest& _internal_select() const;
-  ::io::deephaven::proto::backplane::grpc::SelectOrUpdateRequest* _internal_mutable_select();
-
-  public:
-  // .io.deephaven.proto.backplane.grpc.SelectDistinctRequest select_distinct = 9;
-  bool has_select_distinct() const;
-  private:
-  bool _internal_has_select_distinct() const;
-
-  public:
-  void clear_select_distinct() ;
-  const ::io::deephaven::proto::backplane::grpc::SelectDistinctRequest& select_distinct() const;
-  PROTOBUF_NODISCARD ::io::deephaven::proto::backplane::grpc::SelectDistinctRequest* release_select_distinct();
-  ::io::deephaven::proto::backplane::grpc::SelectDistinctRequest* mutable_select_distinct();
-  void set_allocated_select_distinct(::io::deephaven::proto::backplane::grpc::SelectDistinctRequest* value);
-  void unsafe_arena_set_allocated_select_distinct(::io::deephaven::proto::backplane::grpc::SelectDistinctRequest* value);
-  ::io::deephaven::proto::backplane::grpc::SelectDistinctRequest* unsafe_arena_release_select_distinct();
-
-  private:
-  const ::io::deephaven::proto::backplane::grpc::SelectDistinctRequest& _internal_select_distinct() const;
-  ::io::deephaven::proto::backplane::grpc::SelectDistinctRequest* _internal_mutable_select_distinct();
-
-  public:
-  // .io.deephaven.proto.backplane.grpc.FilterTableRequest filter = 10;
-  bool has_filter() const;
-  private:
-  bool _internal_has_filter() const;
-
-  public:
-  void clear_filter() ;
-  const ::io::deephaven::proto::backplane::grpc::FilterTableRequest& filter() const;
-  PROTOBUF_NODISCARD ::io::deephaven::proto::backplane::grpc::FilterTableRequest* release_filter();
-  ::io::deephaven::proto::backplane::grpc::FilterTableRequest* mutable_filter();
-  void set_allocated_filter(::io::deephaven::proto::backplane::grpc::FilterTableRequest* value);
-  void unsafe_arena_set_allocated_filter(::io::deephaven::proto::backplane::grpc::FilterTableRequest* value);
-  ::io::deephaven::proto::backplane::grpc::FilterTableRequest* unsafe_arena_release_filter();
-
-  private:
-  const ::io::deephaven::proto::backplane::grpc::FilterTableRequest& _internal_filter() const;
-  ::io::deephaven::proto::backplane::grpc::FilterTableRequest* _internal_mutable_filter();
-
-  public:
-  // .io.deephaven.proto.backplane.grpc.UnstructuredFilterTableRequest unstructured_filter = 11;
-  bool has_unstructured_filter() const;
-  private:
-  bool _internal_has_unstructured_filter() const;
-
-  public:
-  void clear_unstructured_filter() ;
-  const ::io::deephaven::proto::backplane::grpc::UnstructuredFilterTableRequest& unstructured_filter() const;
-  PROTOBUF_NODISCARD ::io::deephaven::proto::backplane::grpc::UnstructuredFilterTableRequest* release_unstructured_filter();
-  ::io::deephaven::proto::backplane::grpc::UnstructuredFilterTableRequest* mutable_unstructured_filter();
-  void set_allocated_unstructured_filter(::io::deephaven::proto::backplane::grpc::UnstructuredFilterTableRequest* value);
-  void unsafe_arena_set_allocated_unstructured_filter(::io::deephaven::proto::backplane::grpc::UnstructuredFilterTableRequest* value);
-  ::io::deephaven::proto::backplane::grpc::UnstructuredFilterTableRequest* unsafe_arena_release_unstructured_filter();
-
-  private:
-  const ::io::deephaven::proto::backplane::grpc::UnstructuredFilterTableRequest& _internal_unstructured_filter() const;
-  ::io::deephaven::proto::backplane::grpc::UnstructuredFilterTableRequest* _internal_mutable_unstructured_filter();
-
-  public:
-  // .io.deephaven.proto.backplane.grpc.SortTableRequest sort = 12;
-  bool has_sort() const;
-  private:
-  bool _internal_has_sort() const;
-
-  public:
-  void clear_sort() ;
-  const ::io::deephaven::proto::backplane::grpc::SortTableRequest& sort() const;
-  PROTOBUF_NODISCARD ::io::deephaven::proto::backplane::grpc::SortTableRequest* release_sort();
-  ::io::deephaven::proto::backplane::grpc::SortTableRequest* mutable_sort();
-  void set_allocated_sort(::io::deephaven::proto::backplane::grpc::SortTableRequest* value);
-  void unsafe_arena_set_allocated_sort(::io::deephaven::proto::backplane::grpc::SortTableRequest* value);
-  ::io::deephaven::proto::backplane::grpc::SortTableRequest* unsafe_arena_release_sort();
-
-  private:
-  const ::io::deephaven::proto::backplane::grpc::SortTableRequest& _internal_sort() const;
-  ::io::deephaven::proto::backplane::grpc::SortTableRequest* _internal_mutable_sort();
-
-  public:
-  // .io.deephaven.proto.backplane.grpc.HeadOrTailRequest head = 13;
-  bool has_head() const;
-  private:
-  bool _internal_has_head() const;
-
-  public:
-  void clear_head() ;
-  const ::io::deephaven::proto::backplane::grpc::HeadOrTailRequest& head() const;
-  PROTOBUF_NODISCARD ::io::deephaven::proto::backplane::grpc::HeadOrTailRequest* release_head();
-  ::io::deephaven::proto::backplane::grpc::HeadOrTailRequest* mutable_head();
-  void set_allocated_head(::io::deephaven::proto::backplane::grpc::HeadOrTailRequest* value);
-  void unsafe_arena_set_allocated_head(::io::deephaven::proto::backplane::grpc::HeadOrTailRequest* value);
-  ::io::deephaven::proto::backplane::grpc::HeadOrTailRequest* unsafe_arena_release_head();
-
-  private:
-  const ::io::deephaven::proto::backplane::grpc::HeadOrTailRequest& _internal_head() const;
-  ::io::deephaven::proto::backplane::grpc::HeadOrTailRequest* _internal_mutable_head();
-
-  public:
-  // .io.deephaven.proto.backplane.grpc.HeadOrTailRequest tail = 14;
-  bool has_tail() const;
-  private:
-  bool _internal_has_tail() const;
-
-  public:
-  void clear_tail() ;
-  const ::io::deephaven::proto::backplane::grpc::HeadOrTailRequest& tail() const;
-  PROTOBUF_NODISCARD ::io::deephaven::proto::backplane::grpc::HeadOrTailRequest* release_tail();
-  ::io::deephaven::proto::backplane::grpc::HeadOrTailRequest* mutable_tail();
-  void set_allocated_tail(::io::deephaven::proto::backplane::grpc::HeadOrTailRequest* value);
-  void unsafe_arena_set_allocated_tail(::io::deephaven::proto::backplane::grpc::HeadOrTailRequest* value);
-  ::io::deephaven::proto::backplane::grpc::HeadOrTailRequest* unsafe_arena_release_tail();
-
-  private:
-  const ::io::deephaven::proto::backplane::grpc::HeadOrTailRequest& _internal_tail() const;
-  ::io::deephaven::proto::backplane::grpc::HeadOrTailRequest* _internal_mutable_tail();
-
-  public:
-  // .io.deephaven.proto.backplane.grpc.HeadOrTailByRequest head_by = 15;
-  bool has_head_by() const;
-  private:
-  bool _internal_has_head_by() const;
-
-  public:
-  void clear_head_by() ;
-  const ::io::deephaven::proto::backplane::grpc::HeadOrTailByRequest& head_by() const;
-  PROTOBUF_NODISCARD ::io::deephaven::proto::backplane::grpc::HeadOrTailByRequest* release_head_by();
-  ::io::deephaven::proto::backplane::grpc::HeadOrTailByRequest* mutable_head_by();
-  void set_allocated_head_by(::io::deephaven::proto::backplane::grpc::HeadOrTailByRequest* value);
-  void unsafe_arena_set_allocated_head_by(::io::deephaven::proto::backplane::grpc::HeadOrTailByRequest* value);
-  ::io::deephaven::proto::backplane::grpc::HeadOrTailByRequest* unsafe_arena_release_head_by();
-
-  private:
-  const ::io::deephaven::proto::backplane::grpc::HeadOrTailByRequest& _internal_head_by() const;
-  ::io::deephaven::proto::backplane::grpc::HeadOrTailByRequest* _internal_mutable_head_by();
-
-  public:
-  // .io.deephaven.proto.backplane.grpc.HeadOrTailByRequest tail_by = 16;
-  bool has_tail_by() const;
-  private:
-  bool _internal_has_tail_by() const;
-
-  public:
-  void clear_tail_by() ;
-  const ::io::deephaven::proto::backplane::grpc::HeadOrTailByRequest& tail_by() const;
-  PROTOBUF_NODISCARD ::io::deephaven::proto::backplane::grpc::HeadOrTailByRequest* release_tail_by();
-  ::io::deephaven::proto::backplane::grpc::HeadOrTailByRequest* mutable_tail_by();
-  void set_allocated_tail_by(::io::deephaven::proto::backplane::grpc::HeadOrTailByRequest* value);
-  void unsafe_arena_set_allocated_tail_by(::io::deephaven::proto::backplane::grpc::HeadOrTailByRequest* value);
-  ::io::deephaven::proto::backplane::grpc::HeadOrTailByRequest* unsafe_arena_release_tail_by();
-
-  private:
-  const ::io::deephaven::proto::backplane::grpc::HeadOrTailByRequest& _internal_tail_by() const;
-  ::io::deephaven::proto::backplane::grpc::HeadOrTailByRequest* _internal_mutable_tail_by();
-
-  public:
-  // .io.deephaven.proto.backplane.grpc.UngroupRequest ungroup = 17;
-  bool has_ungroup() const;
-  private:
-  bool _internal_has_ungroup() const;
-
-  public:
-  void clear_ungroup() ;
-  const ::io::deephaven::proto::backplane::grpc::UngroupRequest& ungroup() const;
-  PROTOBUF_NODISCARD ::io::deephaven::proto::backplane::grpc::UngroupRequest* release_ungroup();
-  ::io::deephaven::proto::backplane::grpc::UngroupRequest* mutable_ungroup();
-  void set_allocated_ungroup(::io::deephaven::proto::backplane::grpc::UngroupRequest* value);
-  void unsafe_arena_set_allocated_ungroup(::io::deephaven::proto::backplane::grpc::UngroupRequest* value);
-  ::io::deephaven::proto::backplane::grpc::UngroupRequest* unsafe_arena_release_ungroup();
-
-  private:
-  const ::io::deephaven::proto::backplane::grpc::UngroupRequest& _internal_ungroup() const;
-  ::io::deephaven::proto::backplane::grpc::UngroupRequest* _internal_mutable_ungroup();
-
-  public:
-  // .io.deephaven.proto.backplane.grpc.MergeTablesRequest merge = 18;
-  bool has_merge() const;
-  private:
-  bool _internal_has_merge() const;
-
-  public:
-  void clear_merge() ;
-  const ::io::deephaven::proto::backplane::grpc::MergeTablesRequest& merge() const;
-  PROTOBUF_NODISCARD ::io::deephaven::proto::backplane::grpc::MergeTablesRequest* release_merge();
-  ::io::deephaven::proto::backplane::grpc::MergeTablesRequest* mutable_merge();
-  void set_allocated_merge(::io::deephaven::proto::backplane::grpc::MergeTablesRequest* value);
-  void unsafe_arena_set_allocated_merge(::io::deephaven::proto::backplane::grpc::MergeTablesRequest* value);
-  ::io::deephaven::proto::backplane::grpc::MergeTablesRequest* unsafe_arena_release_merge();
-
-  private:
-  const ::io::deephaven::proto::backplane::grpc::MergeTablesRequest& _internal_merge() const;
-  ::io::deephaven::proto::backplane::grpc::MergeTablesRequest* _internal_mutable_merge();
-
-  public:
-  // .io.deephaven.proto.backplane.grpc.ComboAggregateRequest combo_aggregate = 19;
-  bool has_combo_aggregate() const;
-  private:
-  bool _internal_has_combo_aggregate() const;
-
-  public:
-  void clear_combo_aggregate() ;
-  const ::io::deephaven::proto::backplane::grpc::ComboAggregateRequest& combo_aggregate() const;
-  PROTOBUF_NODISCARD ::io::deephaven::proto::backplane::grpc::ComboAggregateRequest* release_combo_aggregate();
-  ::io::deephaven::proto::backplane::grpc::ComboAggregateRequest* mutable_combo_aggregate();
-  void set_allocated_combo_aggregate(::io::deephaven::proto::backplane::grpc::ComboAggregateRequest* value);
-  void unsafe_arena_set_allocated_combo_aggregate(::io::deephaven::proto::backplane::grpc::ComboAggregateRequest* value);
-  ::io::deephaven::proto::backplane::grpc::ComboAggregateRequest* unsafe_arena_release_combo_aggregate();
-
-  private:
-  const ::io::deephaven::proto::backplane::grpc::ComboAggregateRequest& _internal_combo_aggregate() const;
-  ::io::deephaven::proto::backplane::grpc::ComboAggregateRequest* _internal_mutable_combo_aggregate();
-
-  public:
-  // .io.deephaven.proto.backplane.grpc.FlattenRequest flatten = 21;
-  bool has_flatten() const;
-  private:
-  bool _internal_has_flatten() const;
-
-  public:
-  void clear_flatten() ;
-  const ::io::deephaven::proto::backplane::grpc::FlattenRequest& flatten() const;
-  PROTOBUF_NODISCARD ::io::deephaven::proto::backplane::grpc::FlattenRequest* release_flatten();
-  ::io::deephaven::proto::backplane::grpc::FlattenRequest* mutable_flatten();
-  void set_allocated_flatten(::io::deephaven::proto::backplane::grpc::FlattenRequest* value);
-  void unsafe_arena_set_allocated_flatten(::io::deephaven::proto::backplane::grpc::FlattenRequest* value);
-  ::io::deephaven::proto::backplane::grpc::FlattenRequest* unsafe_arena_release_flatten();
-
-  private:
-  const ::io::deephaven::proto::backplane::grpc::FlattenRequest& _internal_flatten() const;
-  ::io::deephaven::proto::backplane::grpc::FlattenRequest* _internal_mutable_flatten();
-
-  public:
-  // .io.deephaven.proto.backplane.grpc.RunChartDownsampleRequest run_chart_downsample = 22;
-  bool has_run_chart_downsample() const;
-  private:
-  bool _internal_has_run_chart_downsample() const;
-
-  public:
-  void clear_run_chart_downsample() ;
-  const ::io::deephaven::proto::backplane::grpc::RunChartDownsampleRequest& run_chart_downsample() const;
-  PROTOBUF_NODISCARD ::io::deephaven::proto::backplane::grpc::RunChartDownsampleRequest* release_run_chart_downsample();
-  ::io::deephaven::proto::backplane::grpc::RunChartDownsampleRequest* mutable_run_chart_downsample();
-  void set_allocated_run_chart_downsample(::io::deephaven::proto::backplane::grpc::RunChartDownsampleRequest* value);
-  void unsafe_arena_set_allocated_run_chart_downsample(::io::deephaven::proto::backplane::grpc::RunChartDownsampleRequest* value);
-  ::io::deephaven::proto::backplane::grpc::RunChartDownsampleRequest* unsafe_arena_release_run_chart_downsample();
-
-  private:
-  const ::io::deephaven::proto::backplane::grpc::RunChartDownsampleRequest& _internal_run_chart_downsample() const;
-  ::io::deephaven::proto::backplane::grpc::RunChartDownsampleRequest* _internal_mutable_run_chart_downsample();
-
-  public:
-  // .io.deephaven.proto.backplane.grpc.CrossJoinTablesRequest cross_join = 23;
-  bool has_cross_join() const;
-  private:
-  bool _internal_has_cross_join() const;
-
-  public:
-  void clear_cross_join() ;
-  const ::io::deephaven::proto::backplane::grpc::CrossJoinTablesRequest& cross_join() const;
-  PROTOBUF_NODISCARD ::io::deephaven::proto::backplane::grpc::CrossJoinTablesRequest* release_cross_join();
-  ::io::deephaven::proto::backplane::grpc::CrossJoinTablesRequest* mutable_cross_join();
-  void set_allocated_cross_join(::io::deephaven::proto::backplane::grpc::CrossJoinTablesRequest* value);
-  void unsafe_arena_set_allocated_cross_join(::io::deephaven::proto::backplane::grpc::CrossJoinTablesRequest* value);
-  ::io::deephaven::proto::backplane::grpc::CrossJoinTablesRequest* unsafe_arena_release_cross_join();
-
-  private:
-  const ::io::deephaven::proto::backplane::grpc::CrossJoinTablesRequest& _internal_cross_join() const;
-  ::io::deephaven::proto::backplane::grpc::CrossJoinTablesRequest* _internal_mutable_cross_join();
-
-  public:
-  // .io.deephaven.proto.backplane.grpc.NaturalJoinTablesRequest natural_join = 24;
-  bool has_natural_join() const;
-  private:
-  bool _internal_has_natural_join() const;
-
-  public:
-  void clear_natural_join() ;
-  const ::io::deephaven::proto::backplane::grpc::NaturalJoinTablesRequest& natural_join() const;
-  PROTOBUF_NODISCARD ::io::deephaven::proto::backplane::grpc::NaturalJoinTablesRequest* release_natural_join();
-  ::io::deephaven::proto::backplane::grpc::NaturalJoinTablesRequest* mutable_natural_join();
-  void set_allocated_natural_join(::io::deephaven::proto::backplane::grpc::NaturalJoinTablesRequest* value);
-  void unsafe_arena_set_allocated_natural_join(::io::deephaven::proto::backplane::grpc::NaturalJoinTablesRequest* value);
-  ::io::deephaven::proto::backplane::grpc::NaturalJoinTablesRequest* unsafe_arena_release_natural_join();
-
-  private:
-  const ::io::deephaven::proto::backplane::grpc::NaturalJoinTablesRequest& _internal_natural_join() const;
-  ::io::deephaven::proto::backplane::grpc::NaturalJoinTablesRequest* _internal_mutable_natural_join();
-
-  public:
-  // .io.deephaven.proto.backplane.grpc.ExactJoinTablesRequest exact_join = 25;
-  bool has_exact_join() const;
-  private:
-  bool _internal_has_exact_join() const;
-
-  public:
-  void clear_exact_join() ;
-  const ::io::deephaven::proto::backplane::grpc::ExactJoinTablesRequest& exact_join() const;
-  PROTOBUF_NODISCARD ::io::deephaven::proto::backplane::grpc::ExactJoinTablesRequest* release_exact_join();
-  ::io::deephaven::proto::backplane::grpc::ExactJoinTablesRequest* mutable_exact_join();
-  void set_allocated_exact_join(::io::deephaven::proto::backplane::grpc::ExactJoinTablesRequest* value);
-  void unsafe_arena_set_allocated_exact_join(::io::deephaven::proto::backplane::grpc::ExactJoinTablesRequest* value);
-  ::io::deephaven::proto::backplane::grpc::ExactJoinTablesRequest* unsafe_arena_release_exact_join();
-
-  private:
-  const ::io::deephaven::proto::backplane::grpc::ExactJoinTablesRequest& _internal_exact_join() const;
-  ::io::deephaven::proto::backplane::grpc::ExactJoinTablesRequest* _internal_mutable_exact_join();
-
-  public:
-  // .io.deephaven.proto.backplane.grpc.LeftJoinTablesRequest left_join = 26;
-  bool has_left_join() const;
-  private:
-  bool _internal_has_left_join() const;
-
-  public:
-  void clear_left_join() ;
-  const ::io::deephaven::proto::backplane::grpc::LeftJoinTablesRequest& left_join() const;
-  PROTOBUF_NODISCARD ::io::deephaven::proto::backplane::grpc::LeftJoinTablesRequest* release_left_join();
-  ::io::deephaven::proto::backplane::grpc::LeftJoinTablesRequest* mutable_left_join();
-  void set_allocated_left_join(::io::deephaven::proto::backplane::grpc::LeftJoinTablesRequest* value);
-  void unsafe_arena_set_allocated_left_join(::io::deephaven::proto::backplane::grpc::LeftJoinTablesRequest* value);
-  ::io::deephaven::proto::backplane::grpc::LeftJoinTablesRequest* unsafe_arena_release_left_join();
-
-  private:
-  const ::io::deephaven::proto::backplane::grpc::LeftJoinTablesRequest& _internal_left_join() const;
-  ::io::deephaven::proto::backplane::grpc::LeftJoinTablesRequest* _internal_mutable_left_join();
-
-  public:
-  // .io.deephaven.proto.backplane.grpc.AsOfJoinTablesRequest as_of_join = 27 [deprecated = true];
-  [[deprecated]]  bool has_as_of_join() const;
-  private:
-  bool _internal_has_as_of_join() const;
-
-  public:
-  [[deprecated]]  void clear_as_of_join() ;
-  [[deprecated]] const ::io::deephaven::proto::backplane::grpc::AsOfJoinTablesRequest& as_of_join() const;
-  [[deprecated]] PROTOBUF_NODISCARD ::io::deephaven::proto::backplane::grpc::AsOfJoinTablesRequest* release_as_of_join();
-  [[deprecated]] ::io::deephaven::proto::backplane::grpc::AsOfJoinTablesRequest* mutable_as_of_join();
-  [[deprecated]] void set_allocated_as_of_join(::io::deephaven::proto::backplane::grpc::AsOfJoinTablesRequest* value);
-  [[deprecated]] void unsafe_arena_set_allocated_as_of_join(::io::deephaven::proto::backplane::grpc::AsOfJoinTablesRequest* value);
-  [[deprecated]] ::io::deephaven::proto::backplane::grpc::AsOfJoinTablesRequest* unsafe_arena_release_as_of_join();
-
-  private:
-  const ::io::deephaven::proto::backplane::grpc::AsOfJoinTablesRequest& _internal_as_of_join() const;
-  ::io::deephaven::proto::backplane::grpc::AsOfJoinTablesRequest* _internal_mutable_as_of_join();
-
-  public:
-  // .io.deephaven.proto.backplane.grpc.FetchTableRequest fetch_table = 28;
-  bool has_fetch_table() const;
-  private:
-  bool _internal_has_fetch_table() const;
-
-  public:
-  void clear_fetch_table() ;
-  const ::io::deephaven::proto::backplane::grpc::FetchTableRequest& fetch_table() const;
-  PROTOBUF_NODISCARD ::io::deephaven::proto::backplane::grpc::FetchTableRequest* release_fetch_table();
-  ::io::deephaven::proto::backplane::grpc::FetchTableRequest* mutable_fetch_table();
-  void set_allocated_fetch_table(::io::deephaven::proto::backplane::grpc::FetchTableRequest* value);
-  void unsafe_arena_set_allocated_fetch_table(::io::deephaven::proto::backplane::grpc::FetchTableRequest* value);
-  ::io::deephaven::proto::backplane::grpc::FetchTableRequest* unsafe_arena_release_fetch_table();
-
-  private:
-  const ::io::deephaven::proto::backplane::grpc::FetchTableRequest& _internal_fetch_table() const;
-  ::io::deephaven::proto::backplane::grpc::FetchTableRequest* _internal_mutable_fetch_table();
-
-  public:
-  // .io.deephaven.proto.backplane.grpc.ApplyPreviewColumnsRequest apply_preview_columns = 30;
-  bool has_apply_preview_columns() const;
-  private:
-  bool _internal_has_apply_preview_columns() const;
-
-  public:
-  void clear_apply_preview_columns() ;
-  const ::io::deephaven::proto::backplane::grpc::ApplyPreviewColumnsRequest& apply_preview_columns() const;
-  PROTOBUF_NODISCARD ::io::deephaven::proto::backplane::grpc::ApplyPreviewColumnsRequest* release_apply_preview_columns();
-  ::io::deephaven::proto::backplane::grpc::ApplyPreviewColumnsRequest* mutable_apply_preview_columns();
-  void set_allocated_apply_preview_columns(::io::deephaven::proto::backplane::grpc::ApplyPreviewColumnsRequest* value);
-  void unsafe_arena_set_allocated_apply_preview_columns(::io::deephaven::proto::backplane::grpc::ApplyPreviewColumnsRequest* value);
-  ::io::deephaven::proto::backplane::grpc::ApplyPreviewColumnsRequest* unsafe_arena_release_apply_preview_columns();
-
-  private:
-  const ::io::deephaven::proto::backplane::grpc::ApplyPreviewColumnsRequest& _internal_apply_preview_columns() const;
-  ::io::deephaven::proto::backplane::grpc::ApplyPreviewColumnsRequest* _internal_mutable_apply_preview_columns();
-
-  public:
-  // .io.deephaven.proto.backplane.grpc.CreateInputTableRequest create_input_table = 31;
-  bool has_create_input_table() const;
-  private:
-  bool _internal_has_create_input_table() const;
-
-  public:
-  void clear_create_input_table() ;
-  const ::io::deephaven::proto::backplane::grpc::CreateInputTableRequest& create_input_table() const;
-  PROTOBUF_NODISCARD ::io::deephaven::proto::backplane::grpc::CreateInputTableRequest* release_create_input_table();
-  ::io::deephaven::proto::backplane::grpc::CreateInputTableRequest* mutable_create_input_table();
-  void set_allocated_create_input_table(::io::deephaven::proto::backplane::grpc::CreateInputTableRequest* value);
-  void unsafe_arena_set_allocated_create_input_table(::io::deephaven::proto::backplane::grpc::CreateInputTableRequest* value);
-  ::io::deephaven::proto::backplane::grpc::CreateInputTableRequest* unsafe_arena_release_create_input_table();
-
-  private:
-  const ::io::deephaven::proto::backplane::grpc::CreateInputTableRequest& _internal_create_input_table() const;
-  ::io::deephaven::proto::backplane::grpc::CreateInputTableRequest* _internal_mutable_create_input_table();
-
-  public:
-  // .io.deephaven.proto.backplane.grpc.UpdateByRequest update_by = 32;
-  bool has_update_by() const;
-  private:
-  bool _internal_has_update_by() const;
-
-  public:
-  void clear_update_by() ;
-  const ::io::deephaven::proto::backplane::grpc::UpdateByRequest& update_by() const;
-  PROTOBUF_NODISCARD ::io::deephaven::proto::backplane::grpc::UpdateByRequest* release_update_by();
-  ::io::deephaven::proto::backplane::grpc::UpdateByRequest* mutable_update_by();
-  void set_allocated_update_by(::io::deephaven::proto::backplane::grpc::UpdateByRequest* value);
-  void unsafe_arena_set_allocated_update_by(::io::deephaven::proto::backplane::grpc::UpdateByRequest* value);
-  ::io::deephaven::proto::backplane::grpc::UpdateByRequest* unsafe_arena_release_update_by();
-
-  private:
-  const ::io::deephaven::proto::backplane::grpc::UpdateByRequest& _internal_update_by() const;
-  ::io::deephaven::proto::backplane::grpc::UpdateByRequest* _internal_mutable_update_by();
-
-  public:
-  // .io.deephaven.proto.backplane.grpc.WhereInRequest where_in = 33;
-  bool has_where_in() const;
-  private:
-  bool _internal_has_where_in() const;
-
-  public:
-  void clear_where_in() ;
-  const ::io::deephaven::proto::backplane::grpc::WhereInRequest& where_in() const;
-  PROTOBUF_NODISCARD ::io::deephaven::proto::backplane::grpc::WhereInRequest* release_where_in();
-  ::io::deephaven::proto::backplane::grpc::WhereInRequest* mutable_where_in();
-  void set_allocated_where_in(::io::deephaven::proto::backplane::grpc::WhereInRequest* value);
-  void unsafe_arena_set_allocated_where_in(::io::deephaven::proto::backplane::grpc::WhereInRequest* value);
-  ::io::deephaven::proto::backplane::grpc::WhereInRequest* unsafe_arena_release_where_in();
-
-  private:
-  const ::io::deephaven::proto::backplane::grpc::WhereInRequest& _internal_where_in() const;
-  ::io::deephaven::proto::backplane::grpc::WhereInRequest* _internal_mutable_where_in();
-
-  public:
-  // .io.deephaven.proto.backplane.grpc.AggregateAllRequest aggregate_all = 34;
-  bool has_aggregate_all() const;
-  private:
-  bool _internal_has_aggregate_all() const;
-
-  public:
-  void clear_aggregate_all() ;
-  const ::io::deephaven::proto::backplane::grpc::AggregateAllRequest& aggregate_all() const;
-  PROTOBUF_NODISCARD ::io::deephaven::proto::backplane::grpc::AggregateAllRequest* release_aggregate_all();
-  ::io::deephaven::proto::backplane::grpc::AggregateAllRequest* mutable_aggregate_all();
-  void set_allocated_aggregate_all(::io::deephaven::proto::backplane::grpc::AggregateAllRequest* value);
-  void unsafe_arena_set_allocated_aggregate_all(::io::deephaven::proto::backplane::grpc::AggregateAllRequest* value);
-  ::io::deephaven::proto::backplane::grpc::AggregateAllRequest* unsafe_arena_release_aggregate_all();
-
-  private:
-  const ::io::deephaven::proto::backplane::grpc::AggregateAllRequest& _internal_aggregate_all() const;
-  ::io::deephaven::proto::backplane::grpc::AggregateAllRequest* _internal_mutable_aggregate_all();
-
-  public:
-  // .io.deephaven.proto.backplane.grpc.AggregateRequest aggregate = 35;
-  bool has_aggregate() const;
-  private:
-  bool _internal_has_aggregate() const;
-
-  public:
-  void clear_aggregate() ;
-  const ::io::deephaven::proto::backplane::grpc::AggregateRequest& aggregate() const;
-  PROTOBUF_NODISCARD ::io::deephaven::proto::backplane::grpc::AggregateRequest* release_aggregate();
-  ::io::deephaven::proto::backplane::grpc::AggregateRequest* mutable_aggregate();
-  void set_allocated_aggregate(::io::deephaven::proto::backplane::grpc::AggregateRequest* value);
-  void unsafe_arena_set_allocated_aggregate(::io::deephaven::proto::backplane::grpc::AggregateRequest* value);
-  ::io::deephaven::proto::backplane::grpc::AggregateRequest* unsafe_arena_release_aggregate();
-
-  private:
-  const ::io::deephaven::proto::backplane::grpc::AggregateRequest& _internal_aggregate() const;
-  ::io::deephaven::proto::backplane::grpc::AggregateRequest* _internal_mutable_aggregate();
-
-  public:
-  // .io.deephaven.proto.backplane.grpc.SnapshotTableRequest snapshot = 36;
-  bool has_snapshot() const;
-  private:
-  bool _internal_has_snapshot() const;
-
-  public:
-  void clear_snapshot() ;
-  const ::io::deephaven::proto::backplane::grpc::SnapshotTableRequest& snapshot() const;
-  PROTOBUF_NODISCARD ::io::deephaven::proto::backplane::grpc::SnapshotTableRequest* release_snapshot();
-  ::io::deephaven::proto::backplane::grpc::SnapshotTableRequest* mutable_snapshot();
-  void set_allocated_snapshot(::io::deephaven::proto::backplane::grpc::SnapshotTableRequest* value);
-  void unsafe_arena_set_allocated_snapshot(::io::deephaven::proto::backplane::grpc::SnapshotTableRequest* value);
-  ::io::deephaven::proto::backplane::grpc::SnapshotTableRequest* unsafe_arena_release_snapshot();
-
-  private:
-  const ::io::deephaven::proto::backplane::grpc::SnapshotTableRequest& _internal_snapshot() const;
-  ::io::deephaven::proto::backplane::grpc::SnapshotTableRequest* _internal_mutable_snapshot();
-
-  public:
-  // .io.deephaven.proto.backplane.grpc.SnapshotWhenTableRequest snapshot_when = 37;
-  bool has_snapshot_when() const;
-  private:
-  bool _internal_has_snapshot_when() const;
-
-  public:
-  void clear_snapshot_when() ;
-  const ::io::deephaven::proto::backplane::grpc::SnapshotWhenTableRequest& snapshot_when() const;
-  PROTOBUF_NODISCARD ::io::deephaven::proto::backplane::grpc::SnapshotWhenTableRequest* release_snapshot_when();
-  ::io::deephaven::proto::backplane::grpc::SnapshotWhenTableRequest* mutable_snapshot_when();
-  void set_allocated_snapshot_when(::io::deephaven::proto::backplane::grpc::SnapshotWhenTableRequest* value);
-  void unsafe_arena_set_allocated_snapshot_when(::io::deephaven::proto::backplane::grpc::SnapshotWhenTableRequest* value);
-  ::io::deephaven::proto::backplane::grpc::SnapshotWhenTableRequest* unsafe_arena_release_snapshot_when();
-
-  private:
-  const ::io::deephaven::proto::backplane::grpc::SnapshotWhenTableRequest& _internal_snapshot_when() const;
-  ::io::deephaven::proto::backplane::grpc::SnapshotWhenTableRequest* _internal_mutable_snapshot_when();
-
-  public:
-  // .io.deephaven.proto.backplane.grpc.MetaTableRequest meta_table = 38;
-  bool has_meta_table() const;
-  private:
-  bool _internal_has_meta_table() const;
-
-  public:
-  void clear_meta_table() ;
-  const ::io::deephaven::proto::backplane::grpc::MetaTableRequest& meta_table() const;
-  PROTOBUF_NODISCARD ::io::deephaven::proto::backplane::grpc::MetaTableRequest* release_meta_table();
-  ::io::deephaven::proto::backplane::grpc::MetaTableRequest* mutable_meta_table();
-  void set_allocated_meta_table(::io::deephaven::proto::backplane::grpc::MetaTableRequest* value);
-  void unsafe_arena_set_allocated_meta_table(::io::deephaven::proto::backplane::grpc::MetaTableRequest* value);
-  ::io::deephaven::proto::backplane::grpc::MetaTableRequest* unsafe_arena_release_meta_table();
-
-  private:
-  const ::io::deephaven::proto::backplane::grpc::MetaTableRequest& _internal_meta_table() const;
-  ::io::deephaven::proto::backplane::grpc::MetaTableRequest* _internal_mutable_meta_table();
-
-  public:
-  // .io.deephaven.proto.backplane.grpc.RangeJoinTablesRequest range_join = 39;
-  bool has_range_join() const;
-  private:
-  bool _internal_has_range_join() const;
-
-  public:
-  void clear_range_join() ;
-  const ::io::deephaven::proto::backplane::grpc::RangeJoinTablesRequest& range_join() const;
-  PROTOBUF_NODISCARD ::io::deephaven::proto::backplane::grpc::RangeJoinTablesRequest* release_range_join();
-  ::io::deephaven::proto::backplane::grpc::RangeJoinTablesRequest* mutable_range_join();
-  void set_allocated_range_join(::io::deephaven::proto::backplane::grpc::RangeJoinTablesRequest* value);
-  void unsafe_arena_set_allocated_range_join(::io::deephaven::proto::backplane::grpc::RangeJoinTablesRequest* value);
-  ::io::deephaven::proto::backplane::grpc::RangeJoinTablesRequest* unsafe_arena_release_range_join();
-
-  private:
-  const ::io::deephaven::proto::backplane::grpc::RangeJoinTablesRequest& _internal_range_join() const;
-  ::io::deephaven::proto::backplane::grpc::RangeJoinTablesRequest* _internal_mutable_range_join();
-
-  public:
-  // .io.deephaven.proto.backplane.grpc.AjRajTablesRequest aj = 40;
-  bool has_aj() const;
-  private:
-  bool _internal_has_aj() const;
-
-  public:
-  void clear_aj() ;
-  const ::io::deephaven::proto::backplane::grpc::AjRajTablesRequest& aj() const;
-  PROTOBUF_NODISCARD ::io::deephaven::proto::backplane::grpc::AjRajTablesRequest* release_aj();
-  ::io::deephaven::proto::backplane::grpc::AjRajTablesRequest* mutable_aj();
-  void set_allocated_aj(::io::deephaven::proto::backplane::grpc::AjRajTablesRequest* value);
-  void unsafe_arena_set_allocated_aj(::io::deephaven::proto::backplane::grpc::AjRajTablesRequest* value);
-  ::io::deephaven::proto::backplane::grpc::AjRajTablesRequest* unsafe_arena_release_aj();
-
-  private:
-  const ::io::deephaven::proto::backplane::grpc::AjRajTablesRequest& _internal_aj() const;
-  ::io::deephaven::proto::backplane::grpc::AjRajTablesRequest* _internal_mutable_aj();
-
-  public:
-  // .io.deephaven.proto.backplane.grpc.AjRajTablesRequest raj = 41;
-  bool has_raj() const;
-  private:
-  bool _internal_has_raj() const;
-
-  public:
-  void clear_raj() ;
-  const ::io::deephaven::proto::backplane::grpc::AjRajTablesRequest& raj() const;
-  PROTOBUF_NODISCARD ::io::deephaven::proto::backplane::grpc::AjRajTablesRequest* release_raj();
-  ::io::deephaven::proto::backplane::grpc::AjRajTablesRequest* mutable_raj();
-  void set_allocated_raj(::io::deephaven::proto::backplane::grpc::AjRajTablesRequest* value);
-  void unsafe_arena_set_allocated_raj(::io::deephaven::proto::backplane::grpc::AjRajTablesRequest* value);
-  ::io::deephaven::proto::backplane::grpc::AjRajTablesRequest* unsafe_arena_release_raj();
-
-  private:
-  const ::io::deephaven::proto::backplane::grpc::AjRajTablesRequest& _internal_raj() const;
-  ::io::deephaven::proto::backplane::grpc::AjRajTablesRequest* _internal_mutable_raj();
-
-  public:
-  // .io.deephaven.proto.backplane.grpc.ColumnStatisticsRequest column_statistics = 42;
-  bool has_column_statistics() const;
-  private:
-  bool _internal_has_column_statistics() const;
-
-  public:
-  void clear_column_statistics() ;
-  const ::io::deephaven::proto::backplane::grpc::ColumnStatisticsRequest& column_statistics() const;
-  PROTOBUF_NODISCARD ::io::deephaven::proto::backplane::grpc::ColumnStatisticsRequest* release_column_statistics();
-  ::io::deephaven::proto::backplane::grpc::ColumnStatisticsRequest* mutable_column_statistics();
-  void set_allocated_column_statistics(::io::deephaven::proto::backplane::grpc::ColumnStatisticsRequest* value);
-  void unsafe_arena_set_allocated_column_statistics(::io::deephaven::proto::backplane::grpc::ColumnStatisticsRequest* value);
-  ::io::deephaven::proto::backplane::grpc::ColumnStatisticsRequest* unsafe_arena_release_column_statistics();
-
-  private:
-  const ::io::deephaven::proto::backplane::grpc::ColumnStatisticsRequest& _internal_column_statistics() const;
-  ::io::deephaven::proto::backplane::grpc::ColumnStatisticsRequest* _internal_mutable_column_statistics();
-
-  public:
-  // .io.deephaven.proto.backplane.grpc.MultiJoinTablesRequest multi_join = 43;
-  bool has_multi_join() const;
-  private:
-  bool _internal_has_multi_join() const;
-
-  public:
-  void clear_multi_join() ;
-  const ::io::deephaven::proto::backplane::grpc::MultiJoinTablesRequest& multi_join() const;
-  PROTOBUF_NODISCARD ::io::deephaven::proto::backplane::grpc::MultiJoinTablesRequest* release_multi_join();
-  ::io::deephaven::proto::backplane::grpc::MultiJoinTablesRequest* mutable_multi_join();
-  void set_allocated_multi_join(::io::deephaven::proto::backplane::grpc::MultiJoinTablesRequest* value);
-  void unsafe_arena_set_allocated_multi_join(::io::deephaven::proto::backplane::grpc::MultiJoinTablesRequest* value);
-  ::io::deephaven::proto::backplane::grpc::MultiJoinTablesRequest* unsafe_arena_release_multi_join();
-
-  private:
-  const ::io::deephaven::proto::backplane::grpc::MultiJoinTablesRequest& _internal_multi_join() const;
-  ::io::deephaven::proto::backplane::grpc::MultiJoinTablesRequest* _internal_mutable_multi_join();
-
-  public:
-  void clear_op();
-  OpCase op_case() const;
-  // @@protoc_insertion_point(class_scope:io.deephaven.proto.backplane.grpc.BatchTableRequest.Operation)
- private:
-  class _Internal;
-  void set_has_empty_table();
-  void set_has_time_table();
-  void set_has_drop_columns();
-  void set_has_update();
-  void set_has_lazy_update();
-  void set_has_view();
-  void set_has_update_view();
-  void set_has_select();
-  void set_has_select_distinct();
-  void set_has_filter();
-  void set_has_unstructured_filter();
-  void set_has_sort();
-  void set_has_head();
-  void set_has_tail();
-  void set_has_head_by();
-  void set_has_tail_by();
-  void set_has_ungroup();
-  void set_has_merge();
-  void set_has_combo_aggregate();
-  void set_has_flatten();
-  void set_has_run_chart_downsample();
-  void set_has_cross_join();
-  void set_has_natural_join();
-  void set_has_exact_join();
-  void set_has_left_join();
-  void set_has_as_of_join();
-  void set_has_fetch_table();
-  void set_has_apply_preview_columns();
-  void set_has_create_input_table();
-  void set_has_update_by();
-  void set_has_where_in();
-  void set_has_aggregate_all();
-  void set_has_aggregate();
-  void set_has_snapshot();
-  void set_has_snapshot_when();
-  void set_has_meta_table();
-  void set_has_range_join();
-  void set_has_aj();
-  void set_has_raj();
-  void set_has_column_statistics();
-  void set_has_multi_join();
-
-  inline bool has_op() const;
-  inline void clear_has_op();
-
-  friend class ::google::protobuf::internal::TcParser;
-  static const ::google::protobuf::internal::TcParseTable<
-      0, 41, 41,
-      0, 7>
-      _table_;
-  friend class ::google::protobuf::MessageLite;
-  friend class ::google::protobuf::Arena;
-  template <typename T>
-  friend class ::google::protobuf::Arena::InternalHelper;
-  using InternalArenaConstructable_ = void;
-  using DestructorSkippable_ = void;
-  struct Impl_ {
-
-        inline explicit constexpr Impl_(
-            ::google::protobuf::internal::ConstantInitialized) noexcept;
-        inline explicit Impl_(::google::protobuf::internal::InternalVisibility visibility,
-                              ::google::protobuf::Arena* arena);
-        inline explicit Impl_(::google::protobuf::internal::InternalVisibility visibility,
-                              ::google::protobuf::Arena* arena, const Impl_& from);
-    union OpUnion {
-      constexpr OpUnion() : _constinit_{} {}
-        ::google::protobuf::internal::ConstantInitialized _constinit_;
-      ::io::deephaven::proto::backplane::grpc::EmptyTableRequest* empty_table_;
-      ::io::deephaven::proto::backplane::grpc::TimeTableRequest* time_table_;
-      ::io::deephaven::proto::backplane::grpc::DropColumnsRequest* drop_columns_;
-      ::io::deephaven::proto::backplane::grpc::SelectOrUpdateRequest* update_;
-      ::io::deephaven::proto::backplane::grpc::SelectOrUpdateRequest* lazy_update_;
-      ::io::deephaven::proto::backplane::grpc::SelectOrUpdateRequest* view_;
-      ::io::deephaven::proto::backplane::grpc::SelectOrUpdateRequest* update_view_;
-      ::io::deephaven::proto::backplane::grpc::SelectOrUpdateRequest* select_;
-      ::io::deephaven::proto::backplane::grpc::SelectDistinctRequest* select_distinct_;
-      ::io::deephaven::proto::backplane::grpc::FilterTableRequest* filter_;
-      ::io::deephaven::proto::backplane::grpc::UnstructuredFilterTableRequest* unstructured_filter_;
-      ::io::deephaven::proto::backplane::grpc::SortTableRequest* sort_;
-      ::io::deephaven::proto::backplane::grpc::HeadOrTailRequest* head_;
-      ::io::deephaven::proto::backplane::grpc::HeadOrTailRequest* tail_;
-      ::io::deephaven::proto::backplane::grpc::HeadOrTailByRequest* head_by_;
-      ::io::deephaven::proto::backplane::grpc::HeadOrTailByRequest* tail_by_;
-      ::io::deephaven::proto::backplane::grpc::UngroupRequest* ungroup_;
-      ::io::deephaven::proto::backplane::grpc::MergeTablesRequest* merge_;
-      ::io::deephaven::proto::backplane::grpc::ComboAggregateRequest* combo_aggregate_;
-      ::io::deephaven::proto::backplane::grpc::FlattenRequest* flatten_;
-      ::io::deephaven::proto::backplane::grpc::RunChartDownsampleRequest* run_chart_downsample_;
-      ::io::deephaven::proto::backplane::grpc::CrossJoinTablesRequest* cross_join_;
-      ::io::deephaven::proto::backplane::grpc::NaturalJoinTablesRequest* natural_join_;
-      ::io::deephaven::proto::backplane::grpc::ExactJoinTablesRequest* exact_join_;
-      ::io::deephaven::proto::backplane::grpc::LeftJoinTablesRequest* left_join_;
-      ::io::deephaven::proto::backplane::grpc::AsOfJoinTablesRequest* as_of_join_;
-      ::io::deephaven::proto::backplane::grpc::FetchTableRequest* fetch_table_;
-      ::io::deephaven::proto::backplane::grpc::ApplyPreviewColumnsRequest* apply_preview_columns_;
-      ::io::deephaven::proto::backplane::grpc::CreateInputTableRequest* create_input_table_;
-      ::io::deephaven::proto::backplane::grpc::UpdateByRequest* update_by_;
-      ::io::deephaven::proto::backplane::grpc::WhereInRequest* where_in_;
-      ::io::deephaven::proto::backplane::grpc::AggregateAllRequest* aggregate_all_;
-      ::io::deephaven::proto::backplane::grpc::AggregateRequest* aggregate_;
-      ::io::deephaven::proto::backplane::grpc::SnapshotTableRequest* snapshot_;
-      ::io::deephaven::proto::backplane::grpc::SnapshotWhenTableRequest* snapshot_when_;
-      ::io::deephaven::proto::backplane::grpc::MetaTableRequest* meta_table_;
-      ::io::deephaven::proto::backplane::grpc::RangeJoinTablesRequest* range_join_;
-      ::io::deephaven::proto::backplane::grpc::AjRajTablesRequest* aj_;
-      ::io::deephaven::proto::backplane::grpc::AjRajTablesRequest* raj_;
-      ::io::deephaven::proto::backplane::grpc::ColumnStatisticsRequest* column_statistics_;
-      ::io::deephaven::proto::backplane::grpc::MultiJoinTablesRequest* multi_join_;
-    } op_;
-    mutable ::google::protobuf::internal::CachedSize _cached_size_;
-    ::uint32_t _oneof_case_[1];
-
-    PROTOBUF_TSAN_DECLARE_MEMBER
-  };
-  union { Impl_ _impl_; };
-  friend struct ::TableStruct_deephaven_2fproto_2ftable_2eproto;
-};// -------------------------------------------------------------------
-
-class BatchTableRequest final :
-    public ::google::protobuf::Message /* @@protoc_insertion_point(class_definition:io.deephaven.proto.backplane.grpc.BatchTableRequest) */ {
- public:
-  inline BatchTableRequest() : BatchTableRequest(nullptr) {}
-  ~BatchTableRequest() override;
-  template<typename = void>
-  explicit PROTOBUF_CONSTEXPR BatchTableRequest(::google::protobuf::internal::ConstantInitialized);
-
-  inline BatchTableRequest(const BatchTableRequest& from)
-      : BatchTableRequest(nullptr, from) {}
-  BatchTableRequest(BatchTableRequest&& from) noexcept
-    : BatchTableRequest() {
-    *this = ::std::move(from);
-  }
-
-  inline BatchTableRequest& operator=(const BatchTableRequest& from) {
-    CopyFrom(from);
-    return *this;
-  }
-  inline BatchTableRequest& operator=(BatchTableRequest&& from) noexcept {
-    if (this == &from) return *this;
-    if (GetArena() == from.GetArena()
-  #ifdef PROTOBUF_FORCE_COPY_IN_MOVE
-        && GetArena() != nullptr
-  #endif  // !PROTOBUF_FORCE_COPY_IN_MOVE
-    ) {
-      InternalSwap(&from);
-    } else {
-      CopyFrom(from);
-    }
-    return *this;
-  }
-
-  inline const ::google::protobuf::UnknownFieldSet& unknown_fields() const
-      ABSL_ATTRIBUTE_LIFETIME_BOUND {
-    return _internal_metadata_.unknown_fields<::google::protobuf::UnknownFieldSet>(::google::protobuf::UnknownFieldSet::default_instance);
-  }
-  inline ::google::protobuf::UnknownFieldSet* mutable_unknown_fields()
-      ABSL_ATTRIBUTE_LIFETIME_BOUND {
-    return _internal_metadata_.mutable_unknown_fields<::google::protobuf::UnknownFieldSet>();
-  }
-
-  static const ::google::protobuf::Descriptor* descriptor() {
-    return GetDescriptor();
-  }
-  static const ::google::protobuf::Descriptor* GetDescriptor() {
-    return default_instance().GetMetadata().descriptor;
-  }
-  static const ::google::protobuf::Reflection* GetReflection() {
-    return default_instance().GetMetadata().reflection;
-  }
-  static const BatchTableRequest& default_instance() {
-    return *internal_default_instance();
-  }
-  static inline const BatchTableRequest* internal_default_instance() {
-    return reinterpret_cast<const BatchTableRequest*>(
-               &_BatchTableRequest_default_instance_);
-  }
-  static constexpr int kIndexInFileMessages =
-    123;
-
-  friend void swap(BatchTableRequest& a, BatchTableRequest& b) {
-    a.Swap(&b);
-  }
-  inline void Swap(BatchTableRequest* other) {
-    if (other == this) return;
-  #ifdef PROTOBUF_FORCE_COPY_IN_SWAP
-    if (GetArena() != nullptr &&
-        GetArena() == other->GetArena()) {
-   #else  // PROTOBUF_FORCE_COPY_IN_SWAP
-    if (GetArena() == other->GetArena()) {
-  #endif  // !PROTOBUF_FORCE_COPY_IN_SWAP
-      InternalSwap(other);
-    } else {
-      ::google::protobuf::internal::GenericSwap(this, other);
-    }
-  }
-  void UnsafeArenaSwap(BatchTableRequest* other) {
-    if (other == this) return;
-    ABSL_DCHECK(GetArena() == other->GetArena());
-    InternalSwap(other);
-  }
-
-  // implements Message ----------------------------------------------
-
-  BatchTableRequest* New(::google::protobuf::Arena* arena = nullptr) const final {
-    return CreateMaybeMessage<BatchTableRequest>(arena);
-  }
-  using ::google::protobuf::Message::CopyFrom;
-  void CopyFrom(const BatchTableRequest& from);
-  using ::google::protobuf::Message::MergeFrom;
-  void MergeFrom( const BatchTableRequest& from) {
-    BatchTableRequest::MergeImpl(*this, from);
-  }
-  private:
-  static void MergeImpl(::google::protobuf::Message& to_msg, const ::google::protobuf::Message& from_msg);
-  public:
-  PROTOBUF_ATTRIBUTE_REINITIALIZES void Clear() final;
-  bool IsInitialized() const final;
-
-  ::size_t ByteSizeLong() const final;
-  const char* _InternalParse(const char* ptr, ::google::protobuf::internal::ParseContext* ctx) final;
-  ::uint8_t* _InternalSerialize(
-      ::uint8_t* target, ::google::protobuf::io::EpsCopyOutputStream* stream) const final;
-  int GetCachedSize() const { return _impl_._cached_size_.Get(); }
-
-  private:
-  ::google::protobuf::internal::CachedSize* AccessCachedSize() const final;
-  void SharedCtor(::google::protobuf::Arena* arena);
-  void SharedDtor();
-  void InternalSwap(BatchTableRequest* other);
-
-  private:
-  friend class ::google::protobuf::internal::AnyMetadata;
-  static ::absl::string_view FullMessageName() {
-    return "io.deephaven.proto.backplane.grpc.BatchTableRequest";
-  }
-  protected:
-  explicit BatchTableRequest(::google::protobuf::Arena* arena);
-  BatchTableRequest(::google::protobuf::Arena* arena, const BatchTableRequest& from);
-  public:
-
-  static const ClassData _class_data_;
-  const ::google::protobuf::Message::ClassData*GetClassData() const final;
-
-  ::google::protobuf::Metadata GetMetadata() const final;
-
-  // nested types ----------------------------------------------------
-
-  using Operation = BatchTableRequest_Operation;
-
-  // accessors -------------------------------------------------------
-
-  enum : int {
-    kOpsFieldNumber = 1,
-  };
-  // repeated .io.deephaven.proto.backplane.grpc.BatchTableRequest.Operation ops = 1;
-  int ops_size() const;
-  private:
-  int _internal_ops_size() const;
-
-  public:
-  void clear_ops() ;
-  ::io::deephaven::proto::backplane::grpc::BatchTableRequest_Operation* mutable_ops(int index);
-  ::google::protobuf::RepeatedPtrField< ::io::deephaven::proto::backplane::grpc::BatchTableRequest_Operation >*
-      mutable_ops();
-  private:
-  const ::google::protobuf::RepeatedPtrField<::io::deephaven::proto::backplane::grpc::BatchTableRequest_Operation>& _internal_ops() const;
-  ::google::protobuf::RepeatedPtrField<::io::deephaven::proto::backplane::grpc::BatchTableRequest_Operation>* _internal_mutable_ops();
-  public:
-  const ::io::deephaven::proto::backplane::grpc::BatchTableRequest_Operation& ops(int index) const;
-  ::io::deephaven::proto::backplane::grpc::BatchTableRequest_Operation* add_ops();
-  const ::google::protobuf::RepeatedPtrField< ::io::deephaven::proto::backplane::grpc::BatchTableRequest_Operation >&
-      ops() const;
-  // @@protoc_insertion_point(class_scope:io.deephaven.proto.backplane.grpc.BatchTableRequest)
- private:
-  class _Internal;
-
-  friend class ::google::protobuf::internal::TcParser;
-  static const ::google::protobuf::internal::TcParseTable<
-      0, 1, 1,
-      0, 2>
-      _table_;
-  friend class ::google::protobuf::MessageLite;
-  friend class ::google::protobuf::Arena;
-  template <typename T>
-  friend class ::google::protobuf::Arena::InternalHelper;
-  using InternalArenaConstructable_ = void;
-  using DestructorSkippable_ = void;
-  struct Impl_ {
-
-        inline explicit constexpr Impl_(
-            ::google::protobuf::internal::ConstantInitialized) noexcept;
-        inline explicit Impl_(::google::protobuf::internal::InternalVisibility visibility,
-                              ::google::protobuf::Arena* arena);
-        inline explicit Impl_(::google::protobuf::internal::InternalVisibility visibility,
-                              ::google::protobuf::Arena* arena, const Impl_& from);
-    ::google::protobuf::RepeatedPtrField< ::io::deephaven::proto::backplane::grpc::BatchTableRequest_Operation > ops_;
-    mutable ::google::protobuf::internal::CachedSize _cached_size_;
-    PROTOBUF_TSAN_DECLARE_MEMBER
-  };
-  union { Impl_ _impl_; };
-  friend struct ::TableStruct_deephaven_2fproto_2ftable_2eproto;
-};
-
-// ===================================================================
-
-
-
-
-// ===================================================================
-
-
-#ifdef __GNUC__
-#pragma GCC diagnostic push
-#pragma GCC diagnostic ignored "-Wstrict-aliasing"
-#endif  // __GNUC__
-// -------------------------------------------------------------------
-
-// TableReference
-
-// .io.deephaven.proto.backplane.grpc.Ticket ticket = 1;
-inline bool TableReference::has_ticket() const {
-  return ref_case() == kTicket;
-}
-inline bool TableReference::_internal_has_ticket() const {
-  return ref_case() == kTicket;
-}
-inline void TableReference::set_has_ticket() {
-  _impl_._oneof_case_[0] = kTicket;
-}
-inline ::io::deephaven::proto::backplane::grpc::Ticket* TableReference::release_ticket() {
-  // @@protoc_insertion_point(field_release:io.deephaven.proto.backplane.grpc.TableReference.ticket)
-  if (ref_case() == kTicket) {
-    clear_has_ref();
-    auto* temp = _impl_.ref_.ticket_;
-    if (GetArena() != nullptr) {
-      temp = ::google::protobuf::internal::DuplicateIfNonNull(temp);
-    }
-    _impl_.ref_.ticket_ = nullptr;
-    return temp;
-  } else {
-    return nullptr;
-  }
-}
-inline const ::io::deephaven::proto::backplane::grpc::Ticket& TableReference::_internal_ticket() const {
-  return ref_case() == kTicket ? *_impl_.ref_.ticket_ : reinterpret_cast<::io::deephaven::proto::backplane::grpc::Ticket&>(::io::deephaven::proto::backplane::grpc::_Ticket_default_instance_);
-}
-inline const ::io::deephaven::proto::backplane::grpc::Ticket& TableReference::ticket() const ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  // @@protoc_insertion_point(field_get:io.deephaven.proto.backplane.grpc.TableReference.ticket)
-  return _internal_ticket();
-}
-inline ::io::deephaven::proto::backplane::grpc::Ticket* TableReference::unsafe_arena_release_ticket() {
-  // @@protoc_insertion_point(field_unsafe_arena_release:io.deephaven.proto.backplane.grpc.TableReference.ticket)
-  if (ref_case() == kTicket) {
-    clear_has_ref();
-    auto* temp = _impl_.ref_.ticket_;
-    _impl_.ref_.ticket_ = nullptr;
-    return temp;
-  } else {
-    return nullptr;
-  }
-}
-inline void TableReference::unsafe_arena_set_allocated_ticket(::io::deephaven::proto::backplane::grpc::Ticket* value) {
-  // We rely on the oneof clear method to free the earlier contents
-  // of this oneof. We can directly use the pointer we're given to
-  // set the new value.
-  clear_ref();
-  if (value) {
-    set_has_ticket();
-    _impl_.ref_.ticket_ = value;
-  }
-  // @@protoc_insertion_point(field_unsafe_arena_set_allocated:io.deephaven.proto.backplane.grpc.TableReference.ticket)
-}
-inline ::io::deephaven::proto::backplane::grpc::Ticket* TableReference::_internal_mutable_ticket() {
-  if (ref_case() != kTicket) {
-    clear_ref();
-    set_has_ticket();
-    _impl_.ref_.ticket_ = CreateMaybeMessage<::io::deephaven::proto::backplane::grpc::Ticket>(GetArena());
-  }
-  return _impl_.ref_.ticket_;
-}
-inline ::io::deephaven::proto::backplane::grpc::Ticket* TableReference::mutable_ticket() ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  ::io::deephaven::proto::backplane::grpc::Ticket* _msg = _internal_mutable_ticket();
-  // @@protoc_insertion_point(field_mutable:io.deephaven.proto.backplane.grpc.TableReference.ticket)
-  return _msg;
-}
-
-// sint32 batch_offset = 2;
-inline bool TableReference::has_batch_offset() const {
-  return ref_case() == kBatchOffset;
-}
-inline void TableReference::set_has_batch_offset() {
-  _impl_._oneof_case_[0] = kBatchOffset;
-}
-inline void TableReference::clear_batch_offset() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  if (ref_case() == kBatchOffset) {
-    _impl_.ref_.batch_offset_ = 0;
-    clear_has_ref();
-  }
-}
-inline ::int32_t TableReference::batch_offset() const {
-  // @@protoc_insertion_point(field_get:io.deephaven.proto.backplane.grpc.TableReference.batch_offset)
-  return _internal_batch_offset();
-}
-inline void TableReference::set_batch_offset(::int32_t value) {
-  _internal_set_batch_offset(value);
-  // @@protoc_insertion_point(field_set:io.deephaven.proto.backplane.grpc.TableReference.batch_offset)
-}
-inline ::int32_t TableReference::_internal_batch_offset() const {
-  if (ref_case() == kBatchOffset) {
-    return _impl_.ref_.batch_offset_;
-  }
-  return 0;
-}
-inline void TableReference::_internal_set_batch_offset(::int32_t value) {
-  if (ref_case() != kBatchOffset) {
-    clear_ref();
-    set_has_batch_offset();
-  }
-  _impl_.ref_.batch_offset_ = value;
-}
-
-inline bool TableReference::has_ref() const {
-  return ref_case() != REF_NOT_SET;
-}
-inline void TableReference::clear_has_ref() {
-  _impl_._oneof_case_[0] = REF_NOT_SET;
-}
-inline TableReference::RefCase TableReference::ref_case() const {
-  return TableReference::RefCase(_impl_._oneof_case_[0]);
-}
-// -------------------------------------------------------------------
-
-// ExportedTableCreationResponse
-
-// .io.deephaven.proto.backplane.grpc.TableReference result_id = 1;
-inline bool ExportedTableCreationResponse::has_result_id() const {
-  bool value = (_impl_._has_bits_[0] & 0x00000001u) != 0;
-  PROTOBUF_ASSUME(!value || _impl_.result_id_ != nullptr);
-  return value;
-}
-inline void ExportedTableCreationResponse::clear_result_id() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  if (_impl_.result_id_ != nullptr) _impl_.result_id_->Clear();
-  _impl_._has_bits_[0] &= ~0x00000001u;
-}
-inline const ::io::deephaven::proto::backplane::grpc::TableReference& ExportedTableCreationResponse::_internal_result_id() const {
-  PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race);
-  const ::io::deephaven::proto::backplane::grpc::TableReference* p = _impl_.result_id_;
-  return p != nullptr ? *p : reinterpret_cast<const ::io::deephaven::proto::backplane::grpc::TableReference&>(::io::deephaven::proto::backplane::grpc::_TableReference_default_instance_);
-}
-inline const ::io::deephaven::proto::backplane::grpc::TableReference& ExportedTableCreationResponse::result_id() const ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  // @@protoc_insertion_point(field_get:io.deephaven.proto.backplane.grpc.ExportedTableCreationResponse.result_id)
-  return _internal_result_id();
-}
-inline void ExportedTableCreationResponse::unsafe_arena_set_allocated_result_id(::io::deephaven::proto::backplane::grpc::TableReference* value) {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  if (GetArena() == nullptr) {
-    delete reinterpret_cast<::google::protobuf::MessageLite*>(_impl_.result_id_);
-  }
-  _impl_.result_id_ = reinterpret_cast<::io::deephaven::proto::backplane::grpc::TableReference*>(value);
-  if (value != nullptr) {
-    _impl_._has_bits_[0] |= 0x00000001u;
-  } else {
-    _impl_._has_bits_[0] &= ~0x00000001u;
-  }
-  // @@protoc_insertion_point(field_unsafe_arena_set_allocated:io.deephaven.proto.backplane.grpc.ExportedTableCreationResponse.result_id)
-}
-inline ::io::deephaven::proto::backplane::grpc::TableReference* ExportedTableCreationResponse::release_result_id() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-
-  _impl_._has_bits_[0] &= ~0x00000001u;
-  ::io::deephaven::proto::backplane::grpc::TableReference* released = _impl_.result_id_;
-  _impl_.result_id_ = nullptr;
-#ifdef PROTOBUF_FORCE_COPY_IN_RELEASE
-  auto* old = reinterpret_cast<::google::protobuf::MessageLite*>(released);
-  released = ::google::protobuf::internal::DuplicateIfNonNull(released);
-  if (GetArena() == nullptr) {
-    delete old;
-  }
-#else   // PROTOBUF_FORCE_COPY_IN_RELEASE
-  if (GetArena() != nullptr) {
-    released = ::google::protobuf::internal::DuplicateIfNonNull(released);
-  }
-#endif  // !PROTOBUF_FORCE_COPY_IN_RELEASE
-  return released;
-}
-inline ::io::deephaven::proto::backplane::grpc::TableReference* ExportedTableCreationResponse::unsafe_arena_release_result_id() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  // @@protoc_insertion_point(field_release:io.deephaven.proto.backplane.grpc.ExportedTableCreationResponse.result_id)
-
-  _impl_._has_bits_[0] &= ~0x00000001u;
-  ::io::deephaven::proto::backplane::grpc::TableReference* temp = _impl_.result_id_;
-  _impl_.result_id_ = nullptr;
-  return temp;
-}
-inline ::io::deephaven::proto::backplane::grpc::TableReference* ExportedTableCreationResponse::_internal_mutable_result_id() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  _impl_._has_bits_[0] |= 0x00000001u;
-  if (_impl_.result_id_ == nullptr) {
-    auto* p = CreateMaybeMessage<::io::deephaven::proto::backplane::grpc::TableReference>(GetArena());
-    _impl_.result_id_ = reinterpret_cast<::io::deephaven::proto::backplane::grpc::TableReference*>(p);
-  }
-  return _impl_.result_id_;
-}
-inline ::io::deephaven::proto::backplane::grpc::TableReference* ExportedTableCreationResponse::mutable_result_id() ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  ::io::deephaven::proto::backplane::grpc::TableReference* _msg = _internal_mutable_result_id();
-  // @@protoc_insertion_point(field_mutable:io.deephaven.proto.backplane.grpc.ExportedTableCreationResponse.result_id)
-  return _msg;
-}
-inline void ExportedTableCreationResponse::set_allocated_result_id(::io::deephaven::proto::backplane::grpc::TableReference* value) {
-  ::google::protobuf::Arena* message_arena = GetArena();
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  if (message_arena == nullptr) {
-    delete reinterpret_cast<::io::deephaven::proto::backplane::grpc::TableReference*>(_impl_.result_id_);
-  }
-
-  if (value != nullptr) {
-    ::google::protobuf::Arena* submessage_arena = reinterpret_cast<::io::deephaven::proto::backplane::grpc::TableReference*>(value)->GetArena();
-    if (message_arena != submessage_arena) {
-      value = ::google::protobuf::internal::GetOwnedMessage(message_arena, value, submessage_arena);
-    }
-    _impl_._has_bits_[0] |= 0x00000001u;
-  } else {
-    _impl_._has_bits_[0] &= ~0x00000001u;
-  }
-
-  _impl_.result_id_ = reinterpret_cast<::io::deephaven::proto::backplane::grpc::TableReference*>(value);
-  // @@protoc_insertion_point(field_set_allocated:io.deephaven.proto.backplane.grpc.ExportedTableCreationResponse.result_id)
-}
-
-// bool success = 2;
-inline void ExportedTableCreationResponse::clear_success() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  _impl_.success_ = false;
-}
-inline bool ExportedTableCreationResponse::success() const {
-  // @@protoc_insertion_point(field_get:io.deephaven.proto.backplane.grpc.ExportedTableCreationResponse.success)
-  return _internal_success();
-}
-inline void ExportedTableCreationResponse::set_success(bool value) {
-  _internal_set_success(value);
-  // @@protoc_insertion_point(field_set:io.deephaven.proto.backplane.grpc.ExportedTableCreationResponse.success)
-}
-inline bool ExportedTableCreationResponse::_internal_success() const {
-  PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race);
-  return _impl_.success_;
-}
-inline void ExportedTableCreationResponse::_internal_set_success(bool value) {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  ;
-  _impl_.success_ = value;
-}
-
-// string error_info = 3;
-inline void ExportedTableCreationResponse::clear_error_info() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  _impl_.error_info_.ClearToEmpty();
-}
-inline const std::string& ExportedTableCreationResponse::error_info() const
-    ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  // @@protoc_insertion_point(field_get:io.deephaven.proto.backplane.grpc.ExportedTableCreationResponse.error_info)
-  return _internal_error_info();
-}
-template <typename Arg_, typename... Args_>
-inline PROTOBUF_ALWAYS_INLINE void ExportedTableCreationResponse::set_error_info(Arg_&& arg,
-                                                     Args_... args) {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  ;
-  _impl_.error_info_.Set(static_cast<Arg_&&>(arg), args..., GetArena());
-  // @@protoc_insertion_point(field_set:io.deephaven.proto.backplane.grpc.ExportedTableCreationResponse.error_info)
-}
-inline std::string* ExportedTableCreationResponse::mutable_error_info() ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  std::string* _s = _internal_mutable_error_info();
-  // @@protoc_insertion_point(field_mutable:io.deephaven.proto.backplane.grpc.ExportedTableCreationResponse.error_info)
-  return _s;
-}
-inline const std::string& ExportedTableCreationResponse::_internal_error_info() const {
-  PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race);
-  return _impl_.error_info_.Get();
-}
-inline void ExportedTableCreationResponse::_internal_set_error_info(const std::string& value) {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  ;
-  _impl_.error_info_.Set(value, GetArena());
-}
-inline std::string* ExportedTableCreationResponse::_internal_mutable_error_info() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  ;
-  return _impl_.error_info_.Mutable( GetArena());
-}
-inline std::string* ExportedTableCreationResponse::release_error_info() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  // @@protoc_insertion_point(field_release:io.deephaven.proto.backplane.grpc.ExportedTableCreationResponse.error_info)
-  return _impl_.error_info_.Release();
-}
-inline void ExportedTableCreationResponse::set_allocated_error_info(std::string* value) {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  _impl_.error_info_.SetAllocated(value, GetArena());
-  #ifdef PROTOBUF_FORCE_COPY_DEFAULT_STRING
-        if (_impl_.error_info_.IsDefault()) {
-          _impl_.error_info_.Set("", GetArena());
-        }
-  #endif  // PROTOBUF_FORCE_COPY_DEFAULT_STRING
-  // @@protoc_insertion_point(field_set_allocated:io.deephaven.proto.backplane.grpc.ExportedTableCreationResponse.error_info)
-}
-
-// bytes schema_header = 4;
-inline void ExportedTableCreationResponse::clear_schema_header() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  _impl_.schema_header_.ClearToEmpty();
-}
-inline const std::string& ExportedTableCreationResponse::schema_header() const
-    ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  // @@protoc_insertion_point(field_get:io.deephaven.proto.backplane.grpc.ExportedTableCreationResponse.schema_header)
-  return _internal_schema_header();
-}
-template <typename Arg_, typename... Args_>
-inline PROTOBUF_ALWAYS_INLINE void ExportedTableCreationResponse::set_schema_header(Arg_&& arg,
-                                                     Args_... args) {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  ;
-  _impl_.schema_header_.SetBytes(static_cast<Arg_&&>(arg), args..., GetArena());
-  // @@protoc_insertion_point(field_set:io.deephaven.proto.backplane.grpc.ExportedTableCreationResponse.schema_header)
-}
-inline std::string* ExportedTableCreationResponse::mutable_schema_header() ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  std::string* _s = _internal_mutable_schema_header();
-  // @@protoc_insertion_point(field_mutable:io.deephaven.proto.backplane.grpc.ExportedTableCreationResponse.schema_header)
-  return _s;
-}
-inline const std::string& ExportedTableCreationResponse::_internal_schema_header() const {
-  PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race);
-  return _impl_.schema_header_.Get();
-}
-inline void ExportedTableCreationResponse::_internal_set_schema_header(const std::string& value) {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  ;
-  _impl_.schema_header_.Set(value, GetArena());
-}
-inline std::string* ExportedTableCreationResponse::_internal_mutable_schema_header() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  ;
-  return _impl_.schema_header_.Mutable( GetArena());
-}
-inline std::string* ExportedTableCreationResponse::release_schema_header() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  // @@protoc_insertion_point(field_release:io.deephaven.proto.backplane.grpc.ExportedTableCreationResponse.schema_header)
-  return _impl_.schema_header_.Release();
-}
-inline void ExportedTableCreationResponse::set_allocated_schema_header(std::string* value) {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  _impl_.schema_header_.SetAllocated(value, GetArena());
-  #ifdef PROTOBUF_FORCE_COPY_DEFAULT_STRING
-        if (_impl_.schema_header_.IsDefault()) {
-          _impl_.schema_header_.Set("", GetArena());
-        }
-  #endif  // PROTOBUF_FORCE_COPY_DEFAULT_STRING
-  // @@protoc_insertion_point(field_set_allocated:io.deephaven.proto.backplane.grpc.ExportedTableCreationResponse.schema_header)
-}
-
-// bool is_static = 5;
-inline void ExportedTableCreationResponse::clear_is_static() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  _impl_.is_static_ = false;
-}
-inline bool ExportedTableCreationResponse::is_static() const {
-  // @@protoc_insertion_point(field_get:io.deephaven.proto.backplane.grpc.ExportedTableCreationResponse.is_static)
-  return _internal_is_static();
-}
-inline void ExportedTableCreationResponse::set_is_static(bool value) {
-  _internal_set_is_static(value);
-  // @@protoc_insertion_point(field_set:io.deephaven.proto.backplane.grpc.ExportedTableCreationResponse.is_static)
-}
-inline bool ExportedTableCreationResponse::_internal_is_static() const {
-  PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race);
-  return _impl_.is_static_;
-}
-inline void ExportedTableCreationResponse::_internal_set_is_static(bool value) {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  ;
-  _impl_.is_static_ = value;
-}
-
-// sint64 size = 6 [jstype = JS_STRING];
-inline void ExportedTableCreationResponse::clear_size() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  _impl_.size_ = ::int64_t{0};
-}
-inline ::int64_t ExportedTableCreationResponse::size() const {
-  // @@protoc_insertion_point(field_get:io.deephaven.proto.backplane.grpc.ExportedTableCreationResponse.size)
-  return _internal_size();
-}
-inline void ExportedTableCreationResponse::set_size(::int64_t value) {
-  _internal_set_size(value);
-  // @@protoc_insertion_point(field_set:io.deephaven.proto.backplane.grpc.ExportedTableCreationResponse.size)
-}
-inline ::int64_t ExportedTableCreationResponse::_internal_size() const {
-  PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race);
-  return _impl_.size_;
-}
-inline void ExportedTableCreationResponse::_internal_set_size(::int64_t value) {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  ;
-  _impl_.size_ = value;
-}
-
-// -------------------------------------------------------------------
-
-// FetchTableRequest
-
-// .io.deephaven.proto.backplane.grpc.TableReference source_id = 1;
-inline bool FetchTableRequest::has_source_id() const {
-  bool value = (_impl_._has_bits_[0] & 0x00000001u) != 0;
-  PROTOBUF_ASSUME(!value || _impl_.source_id_ != nullptr);
-  return value;
-}
-inline void FetchTableRequest::clear_source_id() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  if (_impl_.source_id_ != nullptr) _impl_.source_id_->Clear();
-  _impl_._has_bits_[0] &= ~0x00000001u;
-}
-inline const ::io::deephaven::proto::backplane::grpc::TableReference& FetchTableRequest::_internal_source_id() const {
-  PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race);
-  const ::io::deephaven::proto::backplane::grpc::TableReference* p = _impl_.source_id_;
-  return p != nullptr ? *p : reinterpret_cast<const ::io::deephaven::proto::backplane::grpc::TableReference&>(::io::deephaven::proto::backplane::grpc::_TableReference_default_instance_);
-}
-inline const ::io::deephaven::proto::backplane::grpc::TableReference& FetchTableRequest::source_id() const ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  // @@protoc_insertion_point(field_get:io.deephaven.proto.backplane.grpc.FetchTableRequest.source_id)
-  return _internal_source_id();
-}
-inline void FetchTableRequest::unsafe_arena_set_allocated_source_id(::io::deephaven::proto::backplane::grpc::TableReference* value) {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  if (GetArena() == nullptr) {
-    delete reinterpret_cast<::google::protobuf::MessageLite*>(_impl_.source_id_);
-  }
-  _impl_.source_id_ = reinterpret_cast<::io::deephaven::proto::backplane::grpc::TableReference*>(value);
-  if (value != nullptr) {
-    _impl_._has_bits_[0] |= 0x00000001u;
-  } else {
-    _impl_._has_bits_[0] &= ~0x00000001u;
-  }
-  // @@protoc_insertion_point(field_unsafe_arena_set_allocated:io.deephaven.proto.backplane.grpc.FetchTableRequest.source_id)
-}
-inline ::io::deephaven::proto::backplane::grpc::TableReference* FetchTableRequest::release_source_id() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-
-  _impl_._has_bits_[0] &= ~0x00000001u;
-  ::io::deephaven::proto::backplane::grpc::TableReference* released = _impl_.source_id_;
-  _impl_.source_id_ = nullptr;
-#ifdef PROTOBUF_FORCE_COPY_IN_RELEASE
-  auto* old = reinterpret_cast<::google::protobuf::MessageLite*>(released);
-  released = ::google::protobuf::internal::DuplicateIfNonNull(released);
-  if (GetArena() == nullptr) {
-    delete old;
-  }
-#else   // PROTOBUF_FORCE_COPY_IN_RELEASE
-  if (GetArena() != nullptr) {
-    released = ::google::protobuf::internal::DuplicateIfNonNull(released);
-  }
-#endif  // !PROTOBUF_FORCE_COPY_IN_RELEASE
-  return released;
-}
-inline ::io::deephaven::proto::backplane::grpc::TableReference* FetchTableRequest::unsafe_arena_release_source_id() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  // @@protoc_insertion_point(field_release:io.deephaven.proto.backplane.grpc.FetchTableRequest.source_id)
-
-  _impl_._has_bits_[0] &= ~0x00000001u;
-  ::io::deephaven::proto::backplane::grpc::TableReference* temp = _impl_.source_id_;
-  _impl_.source_id_ = nullptr;
-  return temp;
-}
-inline ::io::deephaven::proto::backplane::grpc::TableReference* FetchTableRequest::_internal_mutable_source_id() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  _impl_._has_bits_[0] |= 0x00000001u;
-  if (_impl_.source_id_ == nullptr) {
-    auto* p = CreateMaybeMessage<::io::deephaven::proto::backplane::grpc::TableReference>(GetArena());
-    _impl_.source_id_ = reinterpret_cast<::io::deephaven::proto::backplane::grpc::TableReference*>(p);
-  }
-  return _impl_.source_id_;
-}
-inline ::io::deephaven::proto::backplane::grpc::TableReference* FetchTableRequest::mutable_source_id() ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  ::io::deephaven::proto::backplane::grpc::TableReference* _msg = _internal_mutable_source_id();
-  // @@protoc_insertion_point(field_mutable:io.deephaven.proto.backplane.grpc.FetchTableRequest.source_id)
-  return _msg;
-}
-inline void FetchTableRequest::set_allocated_source_id(::io::deephaven::proto::backplane::grpc::TableReference* value) {
-  ::google::protobuf::Arena* message_arena = GetArena();
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  if (message_arena == nullptr) {
-    delete reinterpret_cast<::io::deephaven::proto::backplane::grpc::TableReference*>(_impl_.source_id_);
-  }
-
-  if (value != nullptr) {
-    ::google::protobuf::Arena* submessage_arena = reinterpret_cast<::io::deephaven::proto::backplane::grpc::TableReference*>(value)->GetArena();
-    if (message_arena != submessage_arena) {
-      value = ::google::protobuf::internal::GetOwnedMessage(message_arena, value, submessage_arena);
-    }
-    _impl_._has_bits_[0] |= 0x00000001u;
-  } else {
-    _impl_._has_bits_[0] &= ~0x00000001u;
-  }
-
-  _impl_.source_id_ = reinterpret_cast<::io::deephaven::proto::backplane::grpc::TableReference*>(value);
-  // @@protoc_insertion_point(field_set_allocated:io.deephaven.proto.backplane.grpc.FetchTableRequest.source_id)
-}
-
-// .io.deephaven.proto.backplane.grpc.Ticket result_id = 2;
-inline bool FetchTableRequest::has_result_id() const {
-  bool value = (_impl_._has_bits_[0] & 0x00000002u) != 0;
-  PROTOBUF_ASSUME(!value || _impl_.result_id_ != nullptr);
-  return value;
-}
-inline const ::io::deephaven::proto::backplane::grpc::Ticket& FetchTableRequest::_internal_result_id() const {
-  PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race);
-  const ::io::deephaven::proto::backplane::grpc::Ticket* p = _impl_.result_id_;
-  return p != nullptr ? *p : reinterpret_cast<const ::io::deephaven::proto::backplane::grpc::Ticket&>(::io::deephaven::proto::backplane::grpc::_Ticket_default_instance_);
-}
-inline const ::io::deephaven::proto::backplane::grpc::Ticket& FetchTableRequest::result_id() const ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  // @@protoc_insertion_point(field_get:io.deephaven.proto.backplane.grpc.FetchTableRequest.result_id)
-  return _internal_result_id();
-}
-inline void FetchTableRequest::unsafe_arena_set_allocated_result_id(::io::deephaven::proto::backplane::grpc::Ticket* value) {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  if (GetArena() == nullptr) {
-    delete reinterpret_cast<::google::protobuf::MessageLite*>(_impl_.result_id_);
-  }
-  _impl_.result_id_ = reinterpret_cast<::io::deephaven::proto::backplane::grpc::Ticket*>(value);
-  if (value != nullptr) {
-    _impl_._has_bits_[0] |= 0x00000002u;
-  } else {
-    _impl_._has_bits_[0] &= ~0x00000002u;
-  }
-  // @@protoc_insertion_point(field_unsafe_arena_set_allocated:io.deephaven.proto.backplane.grpc.FetchTableRequest.result_id)
-}
-inline ::io::deephaven::proto::backplane::grpc::Ticket* FetchTableRequest::release_result_id() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-
-  _impl_._has_bits_[0] &= ~0x00000002u;
-  ::io::deephaven::proto::backplane::grpc::Ticket* released = _impl_.result_id_;
-  _impl_.result_id_ = nullptr;
-#ifdef PROTOBUF_FORCE_COPY_IN_RELEASE
-  auto* old = reinterpret_cast<::google::protobuf::MessageLite*>(released);
-  released = ::google::protobuf::internal::DuplicateIfNonNull(released);
-  if (GetArena() == nullptr) {
-    delete old;
-  }
-#else   // PROTOBUF_FORCE_COPY_IN_RELEASE
-  if (GetArena() != nullptr) {
-    released = ::google::protobuf::internal::DuplicateIfNonNull(released);
-  }
-#endif  // !PROTOBUF_FORCE_COPY_IN_RELEASE
-  return released;
-}
-inline ::io::deephaven::proto::backplane::grpc::Ticket* FetchTableRequest::unsafe_arena_release_result_id() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  // @@protoc_insertion_point(field_release:io.deephaven.proto.backplane.grpc.FetchTableRequest.result_id)
-
-  _impl_._has_bits_[0] &= ~0x00000002u;
-  ::io::deephaven::proto::backplane::grpc::Ticket* temp = _impl_.result_id_;
-  _impl_.result_id_ = nullptr;
-  return temp;
-}
-inline ::io::deephaven::proto::backplane::grpc::Ticket* FetchTableRequest::_internal_mutable_result_id() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  _impl_._has_bits_[0] |= 0x00000002u;
-  if (_impl_.result_id_ == nullptr) {
-    auto* p = CreateMaybeMessage<::io::deephaven::proto::backplane::grpc::Ticket>(GetArena());
-    _impl_.result_id_ = reinterpret_cast<::io::deephaven::proto::backplane::grpc::Ticket*>(p);
-  }
-  return _impl_.result_id_;
-}
-inline ::io::deephaven::proto::backplane::grpc::Ticket* FetchTableRequest::mutable_result_id() ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  ::io::deephaven::proto::backplane::grpc::Ticket* _msg = _internal_mutable_result_id();
-  // @@protoc_insertion_point(field_mutable:io.deephaven.proto.backplane.grpc.FetchTableRequest.result_id)
-  return _msg;
-}
-inline void FetchTableRequest::set_allocated_result_id(::io::deephaven::proto::backplane::grpc::Ticket* value) {
-  ::google::protobuf::Arena* message_arena = GetArena();
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  if (message_arena == nullptr) {
-    delete reinterpret_cast<::google::protobuf::MessageLite*>(_impl_.result_id_);
-  }
-
-  if (value != nullptr) {
-    ::google::protobuf::Arena* submessage_arena = reinterpret_cast<::google::protobuf::MessageLite*>(value)->GetArena();
-    if (message_arena != submessage_arena) {
-      value = ::google::protobuf::internal::GetOwnedMessage(message_arena, value, submessage_arena);
-    }
-    _impl_._has_bits_[0] |= 0x00000002u;
-  } else {
-    _impl_._has_bits_[0] &= ~0x00000002u;
-  }
-
-  _impl_.result_id_ = reinterpret_cast<::io::deephaven::proto::backplane::grpc::Ticket*>(value);
-  // @@protoc_insertion_point(field_set_allocated:io.deephaven.proto.backplane.grpc.FetchTableRequest.result_id)
-}
-
-// -------------------------------------------------------------------
-
-// ApplyPreviewColumnsRequest
-
-// .io.deephaven.proto.backplane.grpc.TableReference source_id = 1;
-inline bool ApplyPreviewColumnsRequest::has_source_id() const {
-  bool value = (_impl_._has_bits_[0] & 0x00000001u) != 0;
-  PROTOBUF_ASSUME(!value || _impl_.source_id_ != nullptr);
-  return value;
-}
-inline void ApplyPreviewColumnsRequest::clear_source_id() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  if (_impl_.source_id_ != nullptr) _impl_.source_id_->Clear();
-  _impl_._has_bits_[0] &= ~0x00000001u;
-}
-inline const ::io::deephaven::proto::backplane::grpc::TableReference& ApplyPreviewColumnsRequest::_internal_source_id() const {
-  PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race);
-  const ::io::deephaven::proto::backplane::grpc::TableReference* p = _impl_.source_id_;
-  return p != nullptr ? *p : reinterpret_cast<const ::io::deephaven::proto::backplane::grpc::TableReference&>(::io::deephaven::proto::backplane::grpc::_TableReference_default_instance_);
-}
-inline const ::io::deephaven::proto::backplane::grpc::TableReference& ApplyPreviewColumnsRequest::source_id() const ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  // @@protoc_insertion_point(field_get:io.deephaven.proto.backplane.grpc.ApplyPreviewColumnsRequest.source_id)
-  return _internal_source_id();
-}
-inline void ApplyPreviewColumnsRequest::unsafe_arena_set_allocated_source_id(::io::deephaven::proto::backplane::grpc::TableReference* value) {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  if (GetArena() == nullptr) {
-    delete reinterpret_cast<::google::protobuf::MessageLite*>(_impl_.source_id_);
-  }
-  _impl_.source_id_ = reinterpret_cast<::io::deephaven::proto::backplane::grpc::TableReference*>(value);
-  if (value != nullptr) {
-    _impl_._has_bits_[0] |= 0x00000001u;
-  } else {
-    _impl_._has_bits_[0] &= ~0x00000001u;
-  }
-  // @@protoc_insertion_point(field_unsafe_arena_set_allocated:io.deephaven.proto.backplane.grpc.ApplyPreviewColumnsRequest.source_id)
-}
-inline ::io::deephaven::proto::backplane::grpc::TableReference* ApplyPreviewColumnsRequest::release_source_id() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-
-  _impl_._has_bits_[0] &= ~0x00000001u;
-  ::io::deephaven::proto::backplane::grpc::TableReference* released = _impl_.source_id_;
-  _impl_.source_id_ = nullptr;
-#ifdef PROTOBUF_FORCE_COPY_IN_RELEASE
-  auto* old = reinterpret_cast<::google::protobuf::MessageLite*>(released);
-  released = ::google::protobuf::internal::DuplicateIfNonNull(released);
-  if (GetArena() == nullptr) {
-    delete old;
-  }
-#else   // PROTOBUF_FORCE_COPY_IN_RELEASE
-  if (GetArena() != nullptr) {
-    released = ::google::protobuf::internal::DuplicateIfNonNull(released);
-  }
-#endif  // !PROTOBUF_FORCE_COPY_IN_RELEASE
-  return released;
-}
-inline ::io::deephaven::proto::backplane::grpc::TableReference* ApplyPreviewColumnsRequest::unsafe_arena_release_source_id() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  // @@protoc_insertion_point(field_release:io.deephaven.proto.backplane.grpc.ApplyPreviewColumnsRequest.source_id)
-
-  _impl_._has_bits_[0] &= ~0x00000001u;
-  ::io::deephaven::proto::backplane::grpc::TableReference* temp = _impl_.source_id_;
-  _impl_.source_id_ = nullptr;
-  return temp;
-}
-inline ::io::deephaven::proto::backplane::grpc::TableReference* ApplyPreviewColumnsRequest::_internal_mutable_source_id() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  _impl_._has_bits_[0] |= 0x00000001u;
-  if (_impl_.source_id_ == nullptr) {
-    auto* p = CreateMaybeMessage<::io::deephaven::proto::backplane::grpc::TableReference>(GetArena());
-    _impl_.source_id_ = reinterpret_cast<::io::deephaven::proto::backplane::grpc::TableReference*>(p);
-  }
-  return _impl_.source_id_;
-}
-inline ::io::deephaven::proto::backplane::grpc::TableReference* ApplyPreviewColumnsRequest::mutable_source_id() ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  ::io::deephaven::proto::backplane::grpc::TableReference* _msg = _internal_mutable_source_id();
-  // @@protoc_insertion_point(field_mutable:io.deephaven.proto.backplane.grpc.ApplyPreviewColumnsRequest.source_id)
-  return _msg;
-}
-inline void ApplyPreviewColumnsRequest::set_allocated_source_id(::io::deephaven::proto::backplane::grpc::TableReference* value) {
-  ::google::protobuf::Arena* message_arena = GetArena();
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  if (message_arena == nullptr) {
-    delete reinterpret_cast<::io::deephaven::proto::backplane::grpc::TableReference*>(_impl_.source_id_);
-  }
-
-  if (value != nullptr) {
-    ::google::protobuf::Arena* submessage_arena = reinterpret_cast<::io::deephaven::proto::backplane::grpc::TableReference*>(value)->GetArena();
-    if (message_arena != submessage_arena) {
-      value = ::google::protobuf::internal::GetOwnedMessage(message_arena, value, submessage_arena);
-    }
-    _impl_._has_bits_[0] |= 0x00000001u;
-  } else {
-    _impl_._has_bits_[0] &= ~0x00000001u;
-  }
-
-  _impl_.source_id_ = reinterpret_cast<::io::deephaven::proto::backplane::grpc::TableReference*>(value);
-  // @@protoc_insertion_point(field_set_allocated:io.deephaven.proto.backplane.grpc.ApplyPreviewColumnsRequest.source_id)
-}
-
-// .io.deephaven.proto.backplane.grpc.Ticket result_id = 2;
-inline bool ApplyPreviewColumnsRequest::has_result_id() const {
-  bool value = (_impl_._has_bits_[0] & 0x00000002u) != 0;
-  PROTOBUF_ASSUME(!value || _impl_.result_id_ != nullptr);
-  return value;
-}
-inline const ::io::deephaven::proto::backplane::grpc::Ticket& ApplyPreviewColumnsRequest::_internal_result_id() const {
-  PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race);
-  const ::io::deephaven::proto::backplane::grpc::Ticket* p = _impl_.result_id_;
-  return p != nullptr ? *p : reinterpret_cast<const ::io::deephaven::proto::backplane::grpc::Ticket&>(::io::deephaven::proto::backplane::grpc::_Ticket_default_instance_);
-}
-inline const ::io::deephaven::proto::backplane::grpc::Ticket& ApplyPreviewColumnsRequest::result_id() const ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  // @@protoc_insertion_point(field_get:io.deephaven.proto.backplane.grpc.ApplyPreviewColumnsRequest.result_id)
-  return _internal_result_id();
-}
-inline void ApplyPreviewColumnsRequest::unsafe_arena_set_allocated_result_id(::io::deephaven::proto::backplane::grpc::Ticket* value) {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  if (GetArena() == nullptr) {
-    delete reinterpret_cast<::google::protobuf::MessageLite*>(_impl_.result_id_);
-  }
-  _impl_.result_id_ = reinterpret_cast<::io::deephaven::proto::backplane::grpc::Ticket*>(value);
-  if (value != nullptr) {
-    _impl_._has_bits_[0] |= 0x00000002u;
-  } else {
-    _impl_._has_bits_[0] &= ~0x00000002u;
-  }
-  // @@protoc_insertion_point(field_unsafe_arena_set_allocated:io.deephaven.proto.backplane.grpc.ApplyPreviewColumnsRequest.result_id)
-}
-inline ::io::deephaven::proto::backplane::grpc::Ticket* ApplyPreviewColumnsRequest::release_result_id() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-
-  _impl_._has_bits_[0] &= ~0x00000002u;
-  ::io::deephaven::proto::backplane::grpc::Ticket* released = _impl_.result_id_;
-  _impl_.result_id_ = nullptr;
-#ifdef PROTOBUF_FORCE_COPY_IN_RELEASE
-  auto* old = reinterpret_cast<::google::protobuf::MessageLite*>(released);
-  released = ::google::protobuf::internal::DuplicateIfNonNull(released);
-  if (GetArena() == nullptr) {
-    delete old;
-  }
-#else   // PROTOBUF_FORCE_COPY_IN_RELEASE
-  if (GetArena() != nullptr) {
-    released = ::google::protobuf::internal::DuplicateIfNonNull(released);
-  }
-#endif  // !PROTOBUF_FORCE_COPY_IN_RELEASE
-  return released;
-}
-inline ::io::deephaven::proto::backplane::grpc::Ticket* ApplyPreviewColumnsRequest::unsafe_arena_release_result_id() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  // @@protoc_insertion_point(field_release:io.deephaven.proto.backplane.grpc.ApplyPreviewColumnsRequest.result_id)
-
-  _impl_._has_bits_[0] &= ~0x00000002u;
-  ::io::deephaven::proto::backplane::grpc::Ticket* temp = _impl_.result_id_;
-  _impl_.result_id_ = nullptr;
-  return temp;
-}
-inline ::io::deephaven::proto::backplane::grpc::Ticket* ApplyPreviewColumnsRequest::_internal_mutable_result_id() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  _impl_._has_bits_[0] |= 0x00000002u;
-  if (_impl_.result_id_ == nullptr) {
-    auto* p = CreateMaybeMessage<::io::deephaven::proto::backplane::grpc::Ticket>(GetArena());
-    _impl_.result_id_ = reinterpret_cast<::io::deephaven::proto::backplane::grpc::Ticket*>(p);
-  }
-  return _impl_.result_id_;
-}
-inline ::io::deephaven::proto::backplane::grpc::Ticket* ApplyPreviewColumnsRequest::mutable_result_id() ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  ::io::deephaven::proto::backplane::grpc::Ticket* _msg = _internal_mutable_result_id();
-  // @@protoc_insertion_point(field_mutable:io.deephaven.proto.backplane.grpc.ApplyPreviewColumnsRequest.result_id)
-  return _msg;
-}
-inline void ApplyPreviewColumnsRequest::set_allocated_result_id(::io::deephaven::proto::backplane::grpc::Ticket* value) {
-  ::google::protobuf::Arena* message_arena = GetArena();
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  if (message_arena == nullptr) {
-    delete reinterpret_cast<::google::protobuf::MessageLite*>(_impl_.result_id_);
-  }
-
-  if (value != nullptr) {
-    ::google::protobuf::Arena* submessage_arena = reinterpret_cast<::google::protobuf::MessageLite*>(value)->GetArena();
-    if (message_arena != submessage_arena) {
-      value = ::google::protobuf::internal::GetOwnedMessage(message_arena, value, submessage_arena);
-    }
-    _impl_._has_bits_[0] |= 0x00000002u;
-  } else {
-    _impl_._has_bits_[0] &= ~0x00000002u;
-  }
-
-  _impl_.result_id_ = reinterpret_cast<::io::deephaven::proto::backplane::grpc::Ticket*>(value);
-  // @@protoc_insertion_point(field_set_allocated:io.deephaven.proto.backplane.grpc.ApplyPreviewColumnsRequest.result_id)
-}
-
-// -------------------------------------------------------------------
-
-// ExportedTableUpdatesRequest
-
-// -------------------------------------------------------------------
-
-// ExportedTableUpdateMessage
-
-// .io.deephaven.proto.backplane.grpc.Ticket export_id = 1;
-inline bool ExportedTableUpdateMessage::has_export_id() const {
-  bool value = (_impl_._has_bits_[0] & 0x00000001u) != 0;
-  PROTOBUF_ASSUME(!value || _impl_.export_id_ != nullptr);
-  return value;
-}
-inline const ::io::deephaven::proto::backplane::grpc::Ticket& ExportedTableUpdateMessage::_internal_export_id() const {
-  PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race);
-  const ::io::deephaven::proto::backplane::grpc::Ticket* p = _impl_.export_id_;
-  return p != nullptr ? *p : reinterpret_cast<const ::io::deephaven::proto::backplane::grpc::Ticket&>(::io::deephaven::proto::backplane::grpc::_Ticket_default_instance_);
-}
-inline const ::io::deephaven::proto::backplane::grpc::Ticket& ExportedTableUpdateMessage::export_id() const ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  // @@protoc_insertion_point(field_get:io.deephaven.proto.backplane.grpc.ExportedTableUpdateMessage.export_id)
-  return _internal_export_id();
-}
-inline void ExportedTableUpdateMessage::unsafe_arena_set_allocated_export_id(::io::deephaven::proto::backplane::grpc::Ticket* value) {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  if (GetArena() == nullptr) {
-    delete reinterpret_cast<::google::protobuf::MessageLite*>(_impl_.export_id_);
-  }
-  _impl_.export_id_ = reinterpret_cast<::io::deephaven::proto::backplane::grpc::Ticket*>(value);
-  if (value != nullptr) {
-    _impl_._has_bits_[0] |= 0x00000001u;
-  } else {
-    _impl_._has_bits_[0] &= ~0x00000001u;
-  }
-  // @@protoc_insertion_point(field_unsafe_arena_set_allocated:io.deephaven.proto.backplane.grpc.ExportedTableUpdateMessage.export_id)
-}
-inline ::io::deephaven::proto::backplane::grpc::Ticket* ExportedTableUpdateMessage::release_export_id() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-
-  _impl_._has_bits_[0] &= ~0x00000001u;
-  ::io::deephaven::proto::backplane::grpc::Ticket* released = _impl_.export_id_;
-  _impl_.export_id_ = nullptr;
-#ifdef PROTOBUF_FORCE_COPY_IN_RELEASE
-  auto* old = reinterpret_cast<::google::protobuf::MessageLite*>(released);
-  released = ::google::protobuf::internal::DuplicateIfNonNull(released);
-  if (GetArena() == nullptr) {
-    delete old;
-  }
-#else   // PROTOBUF_FORCE_COPY_IN_RELEASE
-  if (GetArena() != nullptr) {
-    released = ::google::protobuf::internal::DuplicateIfNonNull(released);
-  }
-#endif  // !PROTOBUF_FORCE_COPY_IN_RELEASE
-  return released;
-}
-inline ::io::deephaven::proto::backplane::grpc::Ticket* ExportedTableUpdateMessage::unsafe_arena_release_export_id() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  // @@protoc_insertion_point(field_release:io.deephaven.proto.backplane.grpc.ExportedTableUpdateMessage.export_id)
-
-  _impl_._has_bits_[0] &= ~0x00000001u;
-  ::io::deephaven::proto::backplane::grpc::Ticket* temp = _impl_.export_id_;
-  _impl_.export_id_ = nullptr;
-  return temp;
-}
-inline ::io::deephaven::proto::backplane::grpc::Ticket* ExportedTableUpdateMessage::_internal_mutable_export_id() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  _impl_._has_bits_[0] |= 0x00000001u;
-  if (_impl_.export_id_ == nullptr) {
-    auto* p = CreateMaybeMessage<::io::deephaven::proto::backplane::grpc::Ticket>(GetArena());
-    _impl_.export_id_ = reinterpret_cast<::io::deephaven::proto::backplane::grpc::Ticket*>(p);
-  }
-  return _impl_.export_id_;
-}
-inline ::io::deephaven::proto::backplane::grpc::Ticket* ExportedTableUpdateMessage::mutable_export_id() ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  ::io::deephaven::proto::backplane::grpc::Ticket* _msg = _internal_mutable_export_id();
-  // @@protoc_insertion_point(field_mutable:io.deephaven.proto.backplane.grpc.ExportedTableUpdateMessage.export_id)
-  return _msg;
-}
-inline void ExportedTableUpdateMessage::set_allocated_export_id(::io::deephaven::proto::backplane::grpc::Ticket* value) {
-  ::google::protobuf::Arena* message_arena = GetArena();
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  if (message_arena == nullptr) {
-    delete reinterpret_cast<::google::protobuf::MessageLite*>(_impl_.export_id_);
-  }
-
-  if (value != nullptr) {
-    ::google::protobuf::Arena* submessage_arena = reinterpret_cast<::google::protobuf::MessageLite*>(value)->GetArena();
-    if (message_arena != submessage_arena) {
-      value = ::google::protobuf::internal::GetOwnedMessage(message_arena, value, submessage_arena);
-    }
-    _impl_._has_bits_[0] |= 0x00000001u;
-  } else {
-    _impl_._has_bits_[0] &= ~0x00000001u;
-  }
-
-  _impl_.export_id_ = reinterpret_cast<::io::deephaven::proto::backplane::grpc::Ticket*>(value);
-  // @@protoc_insertion_point(field_set_allocated:io.deephaven.proto.backplane.grpc.ExportedTableUpdateMessage.export_id)
-}
-
-// sint64 size = 2 [jstype = JS_STRING];
-inline void ExportedTableUpdateMessage::clear_size() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  _impl_.size_ = ::int64_t{0};
-}
-inline ::int64_t ExportedTableUpdateMessage::size() const {
-  // @@protoc_insertion_point(field_get:io.deephaven.proto.backplane.grpc.ExportedTableUpdateMessage.size)
-  return _internal_size();
-}
-inline void ExportedTableUpdateMessage::set_size(::int64_t value) {
-  _internal_set_size(value);
-  // @@protoc_insertion_point(field_set:io.deephaven.proto.backplane.grpc.ExportedTableUpdateMessage.size)
-}
-inline ::int64_t ExportedTableUpdateMessage::_internal_size() const {
-  PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race);
-  return _impl_.size_;
-}
-inline void ExportedTableUpdateMessage::_internal_set_size(::int64_t value) {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  ;
-  _impl_.size_ = value;
-}
-
-// string update_failure_message = 3;
-inline void ExportedTableUpdateMessage::clear_update_failure_message() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  _impl_.update_failure_message_.ClearToEmpty();
-}
-inline const std::string& ExportedTableUpdateMessage::update_failure_message() const
-    ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  // @@protoc_insertion_point(field_get:io.deephaven.proto.backplane.grpc.ExportedTableUpdateMessage.update_failure_message)
-  return _internal_update_failure_message();
-}
-template <typename Arg_, typename... Args_>
-inline PROTOBUF_ALWAYS_INLINE void ExportedTableUpdateMessage::set_update_failure_message(Arg_&& arg,
-                                                     Args_... args) {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  ;
-  _impl_.update_failure_message_.Set(static_cast<Arg_&&>(arg), args..., GetArena());
-  // @@protoc_insertion_point(field_set:io.deephaven.proto.backplane.grpc.ExportedTableUpdateMessage.update_failure_message)
-}
-inline std::string* ExportedTableUpdateMessage::mutable_update_failure_message() ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  std::string* _s = _internal_mutable_update_failure_message();
-  // @@protoc_insertion_point(field_mutable:io.deephaven.proto.backplane.grpc.ExportedTableUpdateMessage.update_failure_message)
-  return _s;
-}
-inline const std::string& ExportedTableUpdateMessage::_internal_update_failure_message() const {
-  PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race);
-  return _impl_.update_failure_message_.Get();
-}
-inline void ExportedTableUpdateMessage::_internal_set_update_failure_message(const std::string& value) {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  ;
-  _impl_.update_failure_message_.Set(value, GetArena());
-}
-inline std::string* ExportedTableUpdateMessage::_internal_mutable_update_failure_message() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  ;
-  return _impl_.update_failure_message_.Mutable( GetArena());
-}
-inline std::string* ExportedTableUpdateMessage::release_update_failure_message() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  // @@protoc_insertion_point(field_release:io.deephaven.proto.backplane.grpc.ExportedTableUpdateMessage.update_failure_message)
-  return _impl_.update_failure_message_.Release();
-}
-inline void ExportedTableUpdateMessage::set_allocated_update_failure_message(std::string* value) {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  _impl_.update_failure_message_.SetAllocated(value, GetArena());
-  #ifdef PROTOBUF_FORCE_COPY_DEFAULT_STRING
-        if (_impl_.update_failure_message_.IsDefault()) {
-          _impl_.update_failure_message_.Set("", GetArena());
-        }
-  #endif  // PROTOBUF_FORCE_COPY_DEFAULT_STRING
-  // @@protoc_insertion_point(field_set_allocated:io.deephaven.proto.backplane.grpc.ExportedTableUpdateMessage.update_failure_message)
-}
-
-// -------------------------------------------------------------------
-
-// EmptyTableRequest
-
-// .io.deephaven.proto.backplane.grpc.Ticket result_id = 1;
-inline bool EmptyTableRequest::has_result_id() const {
-  bool value = (_impl_._has_bits_[0] & 0x00000001u) != 0;
-  PROTOBUF_ASSUME(!value || _impl_.result_id_ != nullptr);
-  return value;
-}
-inline const ::io::deephaven::proto::backplane::grpc::Ticket& EmptyTableRequest::_internal_result_id() const {
-  PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race);
-  const ::io::deephaven::proto::backplane::grpc::Ticket* p = _impl_.result_id_;
-  return p != nullptr ? *p : reinterpret_cast<const ::io::deephaven::proto::backplane::grpc::Ticket&>(::io::deephaven::proto::backplane::grpc::_Ticket_default_instance_);
-}
-inline const ::io::deephaven::proto::backplane::grpc::Ticket& EmptyTableRequest::result_id() const ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  // @@protoc_insertion_point(field_get:io.deephaven.proto.backplane.grpc.EmptyTableRequest.result_id)
-  return _internal_result_id();
-}
-inline void EmptyTableRequest::unsafe_arena_set_allocated_result_id(::io::deephaven::proto::backplane::grpc::Ticket* value) {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  if (GetArena() == nullptr) {
-    delete reinterpret_cast<::google::protobuf::MessageLite*>(_impl_.result_id_);
-  }
-  _impl_.result_id_ = reinterpret_cast<::io::deephaven::proto::backplane::grpc::Ticket*>(value);
-  if (value != nullptr) {
-    _impl_._has_bits_[0] |= 0x00000001u;
-  } else {
-    _impl_._has_bits_[0] &= ~0x00000001u;
-  }
-  // @@protoc_insertion_point(field_unsafe_arena_set_allocated:io.deephaven.proto.backplane.grpc.EmptyTableRequest.result_id)
-}
-inline ::io::deephaven::proto::backplane::grpc::Ticket* EmptyTableRequest::release_result_id() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-
-  _impl_._has_bits_[0] &= ~0x00000001u;
-  ::io::deephaven::proto::backplane::grpc::Ticket* released = _impl_.result_id_;
-  _impl_.result_id_ = nullptr;
-#ifdef PROTOBUF_FORCE_COPY_IN_RELEASE
-  auto* old = reinterpret_cast<::google::protobuf::MessageLite*>(released);
-  released = ::google::protobuf::internal::DuplicateIfNonNull(released);
-  if (GetArena() == nullptr) {
-    delete old;
-  }
-#else   // PROTOBUF_FORCE_COPY_IN_RELEASE
-  if (GetArena() != nullptr) {
-    released = ::google::protobuf::internal::DuplicateIfNonNull(released);
-  }
-#endif  // !PROTOBUF_FORCE_COPY_IN_RELEASE
-  return released;
-}
-inline ::io::deephaven::proto::backplane::grpc::Ticket* EmptyTableRequest::unsafe_arena_release_result_id() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  // @@protoc_insertion_point(field_release:io.deephaven.proto.backplane.grpc.EmptyTableRequest.result_id)
-
-  _impl_._has_bits_[0] &= ~0x00000001u;
-  ::io::deephaven::proto::backplane::grpc::Ticket* temp = _impl_.result_id_;
-  _impl_.result_id_ = nullptr;
-  return temp;
-}
-inline ::io::deephaven::proto::backplane::grpc::Ticket* EmptyTableRequest::_internal_mutable_result_id() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  _impl_._has_bits_[0] |= 0x00000001u;
-  if (_impl_.result_id_ == nullptr) {
-    auto* p = CreateMaybeMessage<::io::deephaven::proto::backplane::grpc::Ticket>(GetArena());
-    _impl_.result_id_ = reinterpret_cast<::io::deephaven::proto::backplane::grpc::Ticket*>(p);
-  }
-  return _impl_.result_id_;
-}
-inline ::io::deephaven::proto::backplane::grpc::Ticket* EmptyTableRequest::mutable_result_id() ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  ::io::deephaven::proto::backplane::grpc::Ticket* _msg = _internal_mutable_result_id();
-  // @@protoc_insertion_point(field_mutable:io.deephaven.proto.backplane.grpc.EmptyTableRequest.result_id)
-  return _msg;
-}
-inline void EmptyTableRequest::set_allocated_result_id(::io::deephaven::proto::backplane::grpc::Ticket* value) {
-  ::google::protobuf::Arena* message_arena = GetArena();
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  if (message_arena == nullptr) {
-    delete reinterpret_cast<::google::protobuf::MessageLite*>(_impl_.result_id_);
-  }
-
-  if (value != nullptr) {
-    ::google::protobuf::Arena* submessage_arena = reinterpret_cast<::google::protobuf::MessageLite*>(value)->GetArena();
-    if (message_arena != submessage_arena) {
-      value = ::google::protobuf::internal::GetOwnedMessage(message_arena, value, submessage_arena);
-    }
-    _impl_._has_bits_[0] |= 0x00000001u;
-  } else {
-    _impl_._has_bits_[0] &= ~0x00000001u;
-  }
-
-  _impl_.result_id_ = reinterpret_cast<::io::deephaven::proto::backplane::grpc::Ticket*>(value);
-  // @@protoc_insertion_point(field_set_allocated:io.deephaven.proto.backplane.grpc.EmptyTableRequest.result_id)
-}
-
-// sint64 size = 2 [jstype = JS_STRING];
-inline void EmptyTableRequest::clear_size() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  _impl_.size_ = ::int64_t{0};
-}
-inline ::int64_t EmptyTableRequest::size() const {
-  // @@protoc_insertion_point(field_get:io.deephaven.proto.backplane.grpc.EmptyTableRequest.size)
-  return _internal_size();
-}
-inline void EmptyTableRequest::set_size(::int64_t value) {
-  _internal_set_size(value);
-  // @@protoc_insertion_point(field_set:io.deephaven.proto.backplane.grpc.EmptyTableRequest.size)
-}
-inline ::int64_t EmptyTableRequest::_internal_size() const {
-  PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race);
-  return _impl_.size_;
-}
-inline void EmptyTableRequest::_internal_set_size(::int64_t value) {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  ;
-  _impl_.size_ = value;
-}
-
-// -------------------------------------------------------------------
-
-// TimeTableRequest
-
-// .io.deephaven.proto.backplane.grpc.Ticket result_id = 1;
-inline bool TimeTableRequest::has_result_id() const {
-  bool value = (_impl_._has_bits_[0] & 0x00000001u) != 0;
-  PROTOBUF_ASSUME(!value || _impl_.result_id_ != nullptr);
-  return value;
-}
-inline const ::io::deephaven::proto::backplane::grpc::Ticket& TimeTableRequest::_internal_result_id() const {
-  PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race);
-  const ::io::deephaven::proto::backplane::grpc::Ticket* p = _impl_.result_id_;
-  return p != nullptr ? *p : reinterpret_cast<const ::io::deephaven::proto::backplane::grpc::Ticket&>(::io::deephaven::proto::backplane::grpc::_Ticket_default_instance_);
-}
-inline const ::io::deephaven::proto::backplane::grpc::Ticket& TimeTableRequest::result_id() const ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  // @@protoc_insertion_point(field_get:io.deephaven.proto.backplane.grpc.TimeTableRequest.result_id)
-  return _internal_result_id();
-}
-inline void TimeTableRequest::unsafe_arena_set_allocated_result_id(::io::deephaven::proto::backplane::grpc::Ticket* value) {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  if (GetArena() == nullptr) {
-    delete reinterpret_cast<::google::protobuf::MessageLite*>(_impl_.result_id_);
-  }
-  _impl_.result_id_ = reinterpret_cast<::io::deephaven::proto::backplane::grpc::Ticket*>(value);
-  if (value != nullptr) {
-    _impl_._has_bits_[0] |= 0x00000001u;
-  } else {
-    _impl_._has_bits_[0] &= ~0x00000001u;
-  }
-  // @@protoc_insertion_point(field_unsafe_arena_set_allocated:io.deephaven.proto.backplane.grpc.TimeTableRequest.result_id)
-}
-inline ::io::deephaven::proto::backplane::grpc::Ticket* TimeTableRequest::release_result_id() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-
-  _impl_._has_bits_[0] &= ~0x00000001u;
-  ::io::deephaven::proto::backplane::grpc::Ticket* released = _impl_.result_id_;
-  _impl_.result_id_ = nullptr;
-#ifdef PROTOBUF_FORCE_COPY_IN_RELEASE
-  auto* old = reinterpret_cast<::google::protobuf::MessageLite*>(released);
-  released = ::google::protobuf::internal::DuplicateIfNonNull(released);
-  if (GetArena() == nullptr) {
-    delete old;
-  }
-#else   // PROTOBUF_FORCE_COPY_IN_RELEASE
-  if (GetArena() != nullptr) {
-    released = ::google::protobuf::internal::DuplicateIfNonNull(released);
-  }
-#endif  // !PROTOBUF_FORCE_COPY_IN_RELEASE
-  return released;
-}
-inline ::io::deephaven::proto::backplane::grpc::Ticket* TimeTableRequest::unsafe_arena_release_result_id() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  // @@protoc_insertion_point(field_release:io.deephaven.proto.backplane.grpc.TimeTableRequest.result_id)
-
-  _impl_._has_bits_[0] &= ~0x00000001u;
-  ::io::deephaven::proto::backplane::grpc::Ticket* temp = _impl_.result_id_;
-  _impl_.result_id_ = nullptr;
-  return temp;
-}
-inline ::io::deephaven::proto::backplane::grpc::Ticket* TimeTableRequest::_internal_mutable_result_id() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  _impl_._has_bits_[0] |= 0x00000001u;
-  if (_impl_.result_id_ == nullptr) {
-    auto* p = CreateMaybeMessage<::io::deephaven::proto::backplane::grpc::Ticket>(GetArena());
-    _impl_.result_id_ = reinterpret_cast<::io::deephaven::proto::backplane::grpc::Ticket*>(p);
-  }
-  return _impl_.result_id_;
-}
-inline ::io::deephaven::proto::backplane::grpc::Ticket* TimeTableRequest::mutable_result_id() ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  ::io::deephaven::proto::backplane::grpc::Ticket* _msg = _internal_mutable_result_id();
-  // @@protoc_insertion_point(field_mutable:io.deephaven.proto.backplane.grpc.TimeTableRequest.result_id)
-  return _msg;
-}
-inline void TimeTableRequest::set_allocated_result_id(::io::deephaven::proto::backplane::grpc::Ticket* value) {
-  ::google::protobuf::Arena* message_arena = GetArena();
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  if (message_arena == nullptr) {
-    delete reinterpret_cast<::google::protobuf::MessageLite*>(_impl_.result_id_);
-  }
-
-  if (value != nullptr) {
-    ::google::protobuf::Arena* submessage_arena = reinterpret_cast<::google::protobuf::MessageLite*>(value)->GetArena();
-    if (message_arena != submessage_arena) {
-      value = ::google::protobuf::internal::GetOwnedMessage(message_arena, value, submessage_arena);
-    }
-    _impl_._has_bits_[0] |= 0x00000001u;
-  } else {
-    _impl_._has_bits_[0] &= ~0x00000001u;
-  }
-
-  _impl_.result_id_ = reinterpret_cast<::io::deephaven::proto::backplane::grpc::Ticket*>(value);
-  // @@protoc_insertion_point(field_set_allocated:io.deephaven.proto.backplane.grpc.TimeTableRequest.result_id)
-}
-
-// sint64 start_time_nanos = 2 [jstype = JS_STRING];
-inline bool TimeTableRequest::has_start_time_nanos() const {
-  return start_time_case() == kStartTimeNanos;
-}
-inline void TimeTableRequest::set_has_start_time_nanos() {
-  _impl_._oneof_case_[0] = kStartTimeNanos;
-}
-inline void TimeTableRequest::clear_start_time_nanos() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  if (start_time_case() == kStartTimeNanos) {
-    _impl_.start_time_.start_time_nanos_ = ::int64_t{0};
-    clear_has_start_time();
-  }
-}
-inline ::int64_t TimeTableRequest::start_time_nanos() const {
-  // @@protoc_insertion_point(field_get:io.deephaven.proto.backplane.grpc.TimeTableRequest.start_time_nanos)
-  return _internal_start_time_nanos();
-}
-inline void TimeTableRequest::set_start_time_nanos(::int64_t value) {
-  _internal_set_start_time_nanos(value);
-  // @@protoc_insertion_point(field_set:io.deephaven.proto.backplane.grpc.TimeTableRequest.start_time_nanos)
-}
-inline ::int64_t TimeTableRequest::_internal_start_time_nanos() const {
-  if (start_time_case() == kStartTimeNanos) {
-    return _impl_.start_time_.start_time_nanos_;
-  }
-  return ::int64_t{0};
-}
-inline void TimeTableRequest::_internal_set_start_time_nanos(::int64_t value) {
-  if (start_time_case() != kStartTimeNanos) {
-    clear_start_time();
-    set_has_start_time_nanos();
-  }
-  _impl_.start_time_.start_time_nanos_ = value;
-}
-
-// string start_time_string = 5;
-inline bool TimeTableRequest::has_start_time_string() const {
-  return start_time_case() == kStartTimeString;
-}
-inline void TimeTableRequest::set_has_start_time_string() {
-  _impl_._oneof_case_[0] = kStartTimeString;
-}
-inline void TimeTableRequest::clear_start_time_string() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  if (start_time_case() == kStartTimeString) {
-    _impl_.start_time_.start_time_string_.Destroy();
-    clear_has_start_time();
-  }
-}
-inline const std::string& TimeTableRequest::start_time_string() const
-    ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  // @@protoc_insertion_point(field_get:io.deephaven.proto.backplane.grpc.TimeTableRequest.start_time_string)
-  return _internal_start_time_string();
-}
-template <typename Arg_, typename... Args_>
-inline PROTOBUF_ALWAYS_INLINE void TimeTableRequest::set_start_time_string(Arg_&& arg,
-                                                     Args_... args) {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  if (start_time_case() != kStartTimeString) {
-    clear_start_time();
-
-    set_has_start_time_string();
-    _impl_.start_time_.start_time_string_.InitDefault();
-  }
-  _impl_.start_time_.start_time_string_.Set(static_cast<Arg_&&>(arg), args..., GetArena());
-  // @@protoc_insertion_point(field_set:io.deephaven.proto.backplane.grpc.TimeTableRequest.start_time_string)
-}
-inline std::string* TimeTableRequest::mutable_start_time_string() ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  std::string* _s = _internal_mutable_start_time_string();
-  // @@protoc_insertion_point(field_mutable:io.deephaven.proto.backplane.grpc.TimeTableRequest.start_time_string)
-  return _s;
-}
-inline const std::string& TimeTableRequest::_internal_start_time_string() const {
-  PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race);
-  if (start_time_case() != kStartTimeString) {
-    return ::google::protobuf::internal::GetEmptyStringAlreadyInited();
-  }
-  return _impl_.start_time_.start_time_string_.Get();
-}
-inline void TimeTableRequest::_internal_set_start_time_string(const std::string& value) {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  if (start_time_case() != kStartTimeString) {
-    clear_start_time();
-
-    set_has_start_time_string();
-    _impl_.start_time_.start_time_string_.InitDefault();
-  }
-  _impl_.start_time_.start_time_string_.Set(value, GetArena());
-}
-inline std::string* TimeTableRequest::_internal_mutable_start_time_string() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  if (start_time_case() != kStartTimeString) {
-    clear_start_time();
-
-    set_has_start_time_string();
-    _impl_.start_time_.start_time_string_.InitDefault();
-  }
-  return _impl_.start_time_.start_time_string_.Mutable( GetArena());
-}
-inline std::string* TimeTableRequest::release_start_time_string() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  // @@protoc_insertion_point(field_release:io.deephaven.proto.backplane.grpc.TimeTableRequest.start_time_string)
-  if (start_time_case() != kStartTimeString) {
-    return nullptr;
-  }
-  clear_has_start_time();
-  return _impl_.start_time_.start_time_string_.Release();
-}
-inline void TimeTableRequest::set_allocated_start_time_string(std::string* value) {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  if (has_start_time()) {
-    clear_start_time();
-  }
-  if (value != nullptr) {
-    set_has_start_time_string();
-    _impl_.start_time_.start_time_string_.InitAllocated(value, GetArena());
-  }
-  // @@protoc_insertion_point(field_set_allocated:io.deephaven.proto.backplane.grpc.TimeTableRequest.start_time_string)
-}
-
-// sint64 period_nanos = 3 [jstype = JS_STRING];
-inline bool TimeTableRequest::has_period_nanos() const {
-  return period_case() == kPeriodNanos;
-}
-inline void TimeTableRequest::set_has_period_nanos() {
-  _impl_._oneof_case_[1] = kPeriodNanos;
-}
-inline void TimeTableRequest::clear_period_nanos() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  if (period_case() == kPeriodNanos) {
-    _impl_.period_.period_nanos_ = ::int64_t{0};
-    clear_has_period();
-  }
-}
-inline ::int64_t TimeTableRequest::period_nanos() const {
-  // @@protoc_insertion_point(field_get:io.deephaven.proto.backplane.grpc.TimeTableRequest.period_nanos)
-  return _internal_period_nanos();
-}
-inline void TimeTableRequest::set_period_nanos(::int64_t value) {
-  _internal_set_period_nanos(value);
-  // @@protoc_insertion_point(field_set:io.deephaven.proto.backplane.grpc.TimeTableRequest.period_nanos)
-}
-inline ::int64_t TimeTableRequest::_internal_period_nanos() const {
-  if (period_case() == kPeriodNanos) {
-    return _impl_.period_.period_nanos_;
-  }
-  return ::int64_t{0};
-}
-inline void TimeTableRequest::_internal_set_period_nanos(::int64_t value) {
-  if (period_case() != kPeriodNanos) {
-    clear_period();
-    set_has_period_nanos();
-  }
-  _impl_.period_.period_nanos_ = value;
-}
-
-// string period_string = 6;
-inline bool TimeTableRequest::has_period_string() const {
-  return period_case() == kPeriodString;
-}
-inline void TimeTableRequest::set_has_period_string() {
-  _impl_._oneof_case_[1] = kPeriodString;
-}
-inline void TimeTableRequest::clear_period_string() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  if (period_case() == kPeriodString) {
-    _impl_.period_.period_string_.Destroy();
-    clear_has_period();
-  }
-}
-inline const std::string& TimeTableRequest::period_string() const
-    ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  // @@protoc_insertion_point(field_get:io.deephaven.proto.backplane.grpc.TimeTableRequest.period_string)
-  return _internal_period_string();
-}
-template <typename Arg_, typename... Args_>
-inline PROTOBUF_ALWAYS_INLINE void TimeTableRequest::set_period_string(Arg_&& arg,
-                                                     Args_... args) {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  if (period_case() != kPeriodString) {
-    clear_period();
-
-    set_has_period_string();
-    _impl_.period_.period_string_.InitDefault();
-  }
-  _impl_.period_.period_string_.Set(static_cast<Arg_&&>(arg), args..., GetArena());
-  // @@protoc_insertion_point(field_set:io.deephaven.proto.backplane.grpc.TimeTableRequest.period_string)
-}
-inline std::string* TimeTableRequest::mutable_period_string() ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  std::string* _s = _internal_mutable_period_string();
-  // @@protoc_insertion_point(field_mutable:io.deephaven.proto.backplane.grpc.TimeTableRequest.period_string)
-  return _s;
-}
-inline const std::string& TimeTableRequest::_internal_period_string() const {
-  PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race);
-  if (period_case() != kPeriodString) {
-    return ::google::protobuf::internal::GetEmptyStringAlreadyInited();
-  }
-  return _impl_.period_.period_string_.Get();
-}
-inline void TimeTableRequest::_internal_set_period_string(const std::string& value) {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  if (period_case() != kPeriodString) {
-    clear_period();
-
-    set_has_period_string();
-    _impl_.period_.period_string_.InitDefault();
-  }
-  _impl_.period_.period_string_.Set(value, GetArena());
-}
-inline std::string* TimeTableRequest::_internal_mutable_period_string() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  if (period_case() != kPeriodString) {
-    clear_period();
-
-    set_has_period_string();
-    _impl_.period_.period_string_.InitDefault();
-  }
-  return _impl_.period_.period_string_.Mutable( GetArena());
-}
-inline std::string* TimeTableRequest::release_period_string() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  // @@protoc_insertion_point(field_release:io.deephaven.proto.backplane.grpc.TimeTableRequest.period_string)
-  if (period_case() != kPeriodString) {
-    return nullptr;
-  }
-  clear_has_period();
-  return _impl_.period_.period_string_.Release();
-}
-inline void TimeTableRequest::set_allocated_period_string(std::string* value) {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  if (has_period()) {
-    clear_period();
-  }
-  if (value != nullptr) {
-    set_has_period_string();
-    _impl_.period_.period_string_.InitAllocated(value, GetArena());
-  }
-  // @@protoc_insertion_point(field_set_allocated:io.deephaven.proto.backplane.grpc.TimeTableRequest.period_string)
-}
-
-// bool blink_table = 4;
-inline void TimeTableRequest::clear_blink_table() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  _impl_.blink_table_ = false;
-}
-inline bool TimeTableRequest::blink_table() const {
-  // @@protoc_insertion_point(field_get:io.deephaven.proto.backplane.grpc.TimeTableRequest.blink_table)
-  return _internal_blink_table();
-}
-inline void TimeTableRequest::set_blink_table(bool value) {
-  _internal_set_blink_table(value);
-  // @@protoc_insertion_point(field_set:io.deephaven.proto.backplane.grpc.TimeTableRequest.blink_table)
-}
-inline bool TimeTableRequest::_internal_blink_table() const {
-  PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race);
-  return _impl_.blink_table_;
-}
-inline void TimeTableRequest::_internal_set_blink_table(bool value) {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  ;
-  _impl_.blink_table_ = value;
-}
-
-inline bool TimeTableRequest::has_start_time() const {
-  return start_time_case() != START_TIME_NOT_SET;
-}
-inline void TimeTableRequest::clear_has_start_time() {
-  _impl_._oneof_case_[0] = START_TIME_NOT_SET;
-}
-inline bool TimeTableRequest::has_period() const {
-  return period_case() != PERIOD_NOT_SET;
-}
-inline void TimeTableRequest::clear_has_period() {
-  _impl_._oneof_case_[1] = PERIOD_NOT_SET;
-}
-inline TimeTableRequest::StartTimeCase TimeTableRequest::start_time_case() const {
-  return TimeTableRequest::StartTimeCase(_impl_._oneof_case_[0]);
-}
-inline TimeTableRequest::PeriodCase TimeTableRequest::period_case() const {
-  return TimeTableRequest::PeriodCase(_impl_._oneof_case_[1]);
-}
-// -------------------------------------------------------------------
-
-// SelectOrUpdateRequest
-
-// .io.deephaven.proto.backplane.grpc.Ticket result_id = 1;
-inline bool SelectOrUpdateRequest::has_result_id() const {
-  bool value = (_impl_._has_bits_[0] & 0x00000001u) != 0;
-  PROTOBUF_ASSUME(!value || _impl_.result_id_ != nullptr);
-  return value;
-}
-inline const ::io::deephaven::proto::backplane::grpc::Ticket& SelectOrUpdateRequest::_internal_result_id() const {
-  PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race);
-  const ::io::deephaven::proto::backplane::grpc::Ticket* p = _impl_.result_id_;
-  return p != nullptr ? *p : reinterpret_cast<const ::io::deephaven::proto::backplane::grpc::Ticket&>(::io::deephaven::proto::backplane::grpc::_Ticket_default_instance_);
-}
-inline const ::io::deephaven::proto::backplane::grpc::Ticket& SelectOrUpdateRequest::result_id() const ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  // @@protoc_insertion_point(field_get:io.deephaven.proto.backplane.grpc.SelectOrUpdateRequest.result_id)
-  return _internal_result_id();
-}
-inline void SelectOrUpdateRequest::unsafe_arena_set_allocated_result_id(::io::deephaven::proto::backplane::grpc::Ticket* value) {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  if (GetArena() == nullptr) {
-    delete reinterpret_cast<::google::protobuf::MessageLite*>(_impl_.result_id_);
-  }
-  _impl_.result_id_ = reinterpret_cast<::io::deephaven::proto::backplane::grpc::Ticket*>(value);
-  if (value != nullptr) {
-    _impl_._has_bits_[0] |= 0x00000001u;
-  } else {
-    _impl_._has_bits_[0] &= ~0x00000001u;
-  }
-  // @@protoc_insertion_point(field_unsafe_arena_set_allocated:io.deephaven.proto.backplane.grpc.SelectOrUpdateRequest.result_id)
-}
-inline ::io::deephaven::proto::backplane::grpc::Ticket* SelectOrUpdateRequest::release_result_id() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-
-  _impl_._has_bits_[0] &= ~0x00000001u;
-  ::io::deephaven::proto::backplane::grpc::Ticket* released = _impl_.result_id_;
-  _impl_.result_id_ = nullptr;
-#ifdef PROTOBUF_FORCE_COPY_IN_RELEASE
-  auto* old = reinterpret_cast<::google::protobuf::MessageLite*>(released);
-  released = ::google::protobuf::internal::DuplicateIfNonNull(released);
-  if (GetArena() == nullptr) {
-    delete old;
-  }
-#else   // PROTOBUF_FORCE_COPY_IN_RELEASE
-  if (GetArena() != nullptr) {
-    released = ::google::protobuf::internal::DuplicateIfNonNull(released);
-  }
-#endif  // !PROTOBUF_FORCE_COPY_IN_RELEASE
-  return released;
-}
-inline ::io::deephaven::proto::backplane::grpc::Ticket* SelectOrUpdateRequest::unsafe_arena_release_result_id() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  // @@protoc_insertion_point(field_release:io.deephaven.proto.backplane.grpc.SelectOrUpdateRequest.result_id)
-
-  _impl_._has_bits_[0] &= ~0x00000001u;
-  ::io::deephaven::proto::backplane::grpc::Ticket* temp = _impl_.result_id_;
-  _impl_.result_id_ = nullptr;
-  return temp;
-}
-inline ::io::deephaven::proto::backplane::grpc::Ticket* SelectOrUpdateRequest::_internal_mutable_result_id() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  _impl_._has_bits_[0] |= 0x00000001u;
-  if (_impl_.result_id_ == nullptr) {
-    auto* p = CreateMaybeMessage<::io::deephaven::proto::backplane::grpc::Ticket>(GetArena());
-    _impl_.result_id_ = reinterpret_cast<::io::deephaven::proto::backplane::grpc::Ticket*>(p);
-  }
-  return _impl_.result_id_;
-}
-inline ::io::deephaven::proto::backplane::grpc::Ticket* SelectOrUpdateRequest::mutable_result_id() ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  ::io::deephaven::proto::backplane::grpc::Ticket* _msg = _internal_mutable_result_id();
-  // @@protoc_insertion_point(field_mutable:io.deephaven.proto.backplane.grpc.SelectOrUpdateRequest.result_id)
-  return _msg;
-}
-inline void SelectOrUpdateRequest::set_allocated_result_id(::io::deephaven::proto::backplane::grpc::Ticket* value) {
-  ::google::protobuf::Arena* message_arena = GetArena();
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  if (message_arena == nullptr) {
-    delete reinterpret_cast<::google::protobuf::MessageLite*>(_impl_.result_id_);
-  }
-
-  if (value != nullptr) {
-    ::google::protobuf::Arena* submessage_arena = reinterpret_cast<::google::protobuf::MessageLite*>(value)->GetArena();
-    if (message_arena != submessage_arena) {
-      value = ::google::protobuf::internal::GetOwnedMessage(message_arena, value, submessage_arena);
-    }
-    _impl_._has_bits_[0] |= 0x00000001u;
-  } else {
-    _impl_._has_bits_[0] &= ~0x00000001u;
-  }
-
-  _impl_.result_id_ = reinterpret_cast<::io::deephaven::proto::backplane::grpc::Ticket*>(value);
-  // @@protoc_insertion_point(field_set_allocated:io.deephaven.proto.backplane.grpc.SelectOrUpdateRequest.result_id)
-}
-
-// .io.deephaven.proto.backplane.grpc.TableReference source_id = 2;
-inline bool SelectOrUpdateRequest::has_source_id() const {
-  bool value = (_impl_._has_bits_[0] & 0x00000002u) != 0;
-  PROTOBUF_ASSUME(!value || _impl_.source_id_ != nullptr);
-  return value;
-}
-inline void SelectOrUpdateRequest::clear_source_id() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  if (_impl_.source_id_ != nullptr) _impl_.source_id_->Clear();
-  _impl_._has_bits_[0] &= ~0x00000002u;
-}
-inline const ::io::deephaven::proto::backplane::grpc::TableReference& SelectOrUpdateRequest::_internal_source_id() const {
-  PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race);
-  const ::io::deephaven::proto::backplane::grpc::TableReference* p = _impl_.source_id_;
-  return p != nullptr ? *p : reinterpret_cast<const ::io::deephaven::proto::backplane::grpc::TableReference&>(::io::deephaven::proto::backplane::grpc::_TableReference_default_instance_);
-}
-inline const ::io::deephaven::proto::backplane::grpc::TableReference& SelectOrUpdateRequest::source_id() const ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  // @@protoc_insertion_point(field_get:io.deephaven.proto.backplane.grpc.SelectOrUpdateRequest.source_id)
-  return _internal_source_id();
-}
-inline void SelectOrUpdateRequest::unsafe_arena_set_allocated_source_id(::io::deephaven::proto::backplane::grpc::TableReference* value) {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  if (GetArena() == nullptr) {
-    delete reinterpret_cast<::google::protobuf::MessageLite*>(_impl_.source_id_);
-  }
-  _impl_.source_id_ = reinterpret_cast<::io::deephaven::proto::backplane::grpc::TableReference*>(value);
-  if (value != nullptr) {
-    _impl_._has_bits_[0] |= 0x00000002u;
-  } else {
-    _impl_._has_bits_[0] &= ~0x00000002u;
-  }
-  // @@protoc_insertion_point(field_unsafe_arena_set_allocated:io.deephaven.proto.backplane.grpc.SelectOrUpdateRequest.source_id)
-}
-inline ::io::deephaven::proto::backplane::grpc::TableReference* SelectOrUpdateRequest::release_source_id() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-
-  _impl_._has_bits_[0] &= ~0x00000002u;
-  ::io::deephaven::proto::backplane::grpc::TableReference* released = _impl_.source_id_;
-  _impl_.source_id_ = nullptr;
-#ifdef PROTOBUF_FORCE_COPY_IN_RELEASE
-  auto* old = reinterpret_cast<::google::protobuf::MessageLite*>(released);
-  released = ::google::protobuf::internal::DuplicateIfNonNull(released);
-  if (GetArena() == nullptr) {
-    delete old;
-  }
-#else   // PROTOBUF_FORCE_COPY_IN_RELEASE
-  if (GetArena() != nullptr) {
-    released = ::google::protobuf::internal::DuplicateIfNonNull(released);
-  }
-#endif  // !PROTOBUF_FORCE_COPY_IN_RELEASE
-  return released;
-}
-inline ::io::deephaven::proto::backplane::grpc::TableReference* SelectOrUpdateRequest::unsafe_arena_release_source_id() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  // @@protoc_insertion_point(field_release:io.deephaven.proto.backplane.grpc.SelectOrUpdateRequest.source_id)
-
-  _impl_._has_bits_[0] &= ~0x00000002u;
-  ::io::deephaven::proto::backplane::grpc::TableReference* temp = _impl_.source_id_;
-  _impl_.source_id_ = nullptr;
-  return temp;
-}
-inline ::io::deephaven::proto::backplane::grpc::TableReference* SelectOrUpdateRequest::_internal_mutable_source_id() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  _impl_._has_bits_[0] |= 0x00000002u;
-  if (_impl_.source_id_ == nullptr) {
-    auto* p = CreateMaybeMessage<::io::deephaven::proto::backplane::grpc::TableReference>(GetArena());
-    _impl_.source_id_ = reinterpret_cast<::io::deephaven::proto::backplane::grpc::TableReference*>(p);
-  }
-  return _impl_.source_id_;
-}
-inline ::io::deephaven::proto::backplane::grpc::TableReference* SelectOrUpdateRequest::mutable_source_id() ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  ::io::deephaven::proto::backplane::grpc::TableReference* _msg = _internal_mutable_source_id();
-  // @@protoc_insertion_point(field_mutable:io.deephaven.proto.backplane.grpc.SelectOrUpdateRequest.source_id)
-  return _msg;
-}
-inline void SelectOrUpdateRequest::set_allocated_source_id(::io::deephaven::proto::backplane::grpc::TableReference* value) {
-  ::google::protobuf::Arena* message_arena = GetArena();
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  if (message_arena == nullptr) {
-    delete reinterpret_cast<::io::deephaven::proto::backplane::grpc::TableReference*>(_impl_.source_id_);
-  }
-
-  if (value != nullptr) {
-    ::google::protobuf::Arena* submessage_arena = reinterpret_cast<::io::deephaven::proto::backplane::grpc::TableReference*>(value)->GetArena();
-    if (message_arena != submessage_arena) {
-      value = ::google::protobuf::internal::GetOwnedMessage(message_arena, value, submessage_arena);
-    }
-    _impl_._has_bits_[0] |= 0x00000002u;
-  } else {
-    _impl_._has_bits_[0] &= ~0x00000002u;
-  }
-
-  _impl_.source_id_ = reinterpret_cast<::io::deephaven::proto::backplane::grpc::TableReference*>(value);
-  // @@protoc_insertion_point(field_set_allocated:io.deephaven.proto.backplane.grpc.SelectOrUpdateRequest.source_id)
-}
-
-// repeated string column_specs = 3;
-inline int SelectOrUpdateRequest::_internal_column_specs_size() const {
-  return _internal_column_specs().size();
-}
-inline int SelectOrUpdateRequest::column_specs_size() const {
-  return _internal_column_specs_size();
-}
-inline void SelectOrUpdateRequest::clear_column_specs() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  _impl_.column_specs_.Clear();
-}
-inline std::string* SelectOrUpdateRequest::add_column_specs()
-    ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  std::string* _s = _internal_mutable_column_specs()->Add();
-  // @@protoc_insertion_point(field_add_mutable:io.deephaven.proto.backplane.grpc.SelectOrUpdateRequest.column_specs)
-  return _s;
-}
-inline const std::string& SelectOrUpdateRequest::column_specs(int index) const
-    ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  // @@protoc_insertion_point(field_get:io.deephaven.proto.backplane.grpc.SelectOrUpdateRequest.column_specs)
-  return _internal_column_specs().Get(index);
-}
-inline std::string* SelectOrUpdateRequest::mutable_column_specs(int index)
-    ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  // @@protoc_insertion_point(field_mutable:io.deephaven.proto.backplane.grpc.SelectOrUpdateRequest.column_specs)
-  return _internal_mutable_column_specs()->Mutable(index);
-}
-inline void SelectOrUpdateRequest::set_column_specs(int index, const std::string& value) {
-  _internal_mutable_column_specs()->Mutable(index)->assign(value);
-  // @@protoc_insertion_point(field_set:io.deephaven.proto.backplane.grpc.SelectOrUpdateRequest.column_specs)
-}
-inline void SelectOrUpdateRequest::set_column_specs(int index, std::string&& value) {
-  _internal_mutable_column_specs()->Mutable(index)->assign(std::move(value));
-  // @@protoc_insertion_point(field_set:io.deephaven.proto.backplane.grpc.SelectOrUpdateRequest.column_specs)
-}
-inline void SelectOrUpdateRequest::set_column_specs(int index, const char* value) {
-  ABSL_DCHECK(value != nullptr);
-  _internal_mutable_column_specs()->Mutable(index)->assign(value);
-  // @@protoc_insertion_point(field_set_char:io.deephaven.proto.backplane.grpc.SelectOrUpdateRequest.column_specs)
-}
-inline void SelectOrUpdateRequest::set_column_specs(int index, const char* value,
-                              std::size_t size) {
-  _internal_mutable_column_specs()->Mutable(index)->assign(
-      reinterpret_cast<const char*>(value), size);
-  // @@protoc_insertion_point(field_set_pointer:io.deephaven.proto.backplane.grpc.SelectOrUpdateRequest.column_specs)
-}
-inline void SelectOrUpdateRequest::set_column_specs(int index, absl::string_view value) {
-  _internal_mutable_column_specs()->Mutable(index)->assign(value.data(),
-                                                     value.size());
-  // @@protoc_insertion_point(field_set_string_piece:io.deephaven.proto.backplane.grpc.SelectOrUpdateRequest.column_specs)
-}
-inline void SelectOrUpdateRequest::add_column_specs(const std::string& value) {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  _internal_mutable_column_specs()->Add()->assign(value);
-  // @@protoc_insertion_point(field_add:io.deephaven.proto.backplane.grpc.SelectOrUpdateRequest.column_specs)
-}
-inline void SelectOrUpdateRequest::add_column_specs(std::string&& value) {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  _internal_mutable_column_specs()->Add(std::move(value));
-  // @@protoc_insertion_point(field_add:io.deephaven.proto.backplane.grpc.SelectOrUpdateRequest.column_specs)
-}
-inline void SelectOrUpdateRequest::add_column_specs(const char* value) {
-  ABSL_DCHECK(value != nullptr);
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  _internal_mutable_column_specs()->Add()->assign(value);
-  // @@protoc_insertion_point(field_add_char:io.deephaven.proto.backplane.grpc.SelectOrUpdateRequest.column_specs)
-}
-inline void SelectOrUpdateRequest::add_column_specs(const char* value, std::size_t size) {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  _internal_mutable_column_specs()->Add()->assign(
-      reinterpret_cast<const char*>(value), size);
-  // @@protoc_insertion_point(field_add_pointer:io.deephaven.proto.backplane.grpc.SelectOrUpdateRequest.column_specs)
-}
-inline void SelectOrUpdateRequest::add_column_specs(absl::string_view value) {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  _internal_mutable_column_specs()->Add()->assign(value.data(), value.size());
-  // @@protoc_insertion_point(field_add_string_piece:io.deephaven.proto.backplane.grpc.SelectOrUpdateRequest.column_specs)
-}
-inline const ::google::protobuf::RepeatedPtrField<std::string>&
-SelectOrUpdateRequest::column_specs() const ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  // @@protoc_insertion_point(field_list:io.deephaven.proto.backplane.grpc.SelectOrUpdateRequest.column_specs)
-  return _internal_column_specs();
-}
-inline ::google::protobuf::RepeatedPtrField<std::string>*
-SelectOrUpdateRequest::mutable_column_specs() ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  // @@protoc_insertion_point(field_mutable_list:io.deephaven.proto.backplane.grpc.SelectOrUpdateRequest.column_specs)
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  return _internal_mutable_column_specs();
-}
-inline const ::google::protobuf::RepeatedPtrField<std::string>&
-SelectOrUpdateRequest::_internal_column_specs() const {
-  PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race);
-  return _impl_.column_specs_;
-}
-inline ::google::protobuf::RepeatedPtrField<std::string>*
-SelectOrUpdateRequest::_internal_mutable_column_specs() {
-  PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race);
-  return &_impl_.column_specs_;
-}
-
-// -------------------------------------------------------------------
-
-// MathContext
-
-// sint32 precision = 1;
-inline void MathContext::clear_precision() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  _impl_.precision_ = 0;
-}
-inline ::int32_t MathContext::precision() const {
-  // @@protoc_insertion_point(field_get:io.deephaven.proto.backplane.grpc.MathContext.precision)
-  return _internal_precision();
-}
-inline void MathContext::set_precision(::int32_t value) {
-  _internal_set_precision(value);
-  // @@protoc_insertion_point(field_set:io.deephaven.proto.backplane.grpc.MathContext.precision)
-}
-inline ::int32_t MathContext::_internal_precision() const {
-  PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race);
-  return _impl_.precision_;
-}
-inline void MathContext::_internal_set_precision(::int32_t value) {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  ;
-  _impl_.precision_ = value;
-}
-
-// .io.deephaven.proto.backplane.grpc.MathContext.RoundingMode rounding_mode = 2;
-inline void MathContext::clear_rounding_mode() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  _impl_.rounding_mode_ = 0;
-}
-inline ::io::deephaven::proto::backplane::grpc::MathContext_RoundingMode MathContext::rounding_mode() const {
-  // @@protoc_insertion_point(field_get:io.deephaven.proto.backplane.grpc.MathContext.rounding_mode)
-  return _internal_rounding_mode();
-}
-inline void MathContext::set_rounding_mode(::io::deephaven::proto::backplane::grpc::MathContext_RoundingMode value) {
-  _internal_set_rounding_mode(value);
-  // @@protoc_insertion_point(field_set:io.deephaven.proto.backplane.grpc.MathContext.rounding_mode)
-}
-inline ::io::deephaven::proto::backplane::grpc::MathContext_RoundingMode MathContext::_internal_rounding_mode() const {
-  PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race);
-  return static_cast<::io::deephaven::proto::backplane::grpc::MathContext_RoundingMode>(_impl_.rounding_mode_);
-}
-inline void MathContext::_internal_set_rounding_mode(::io::deephaven::proto::backplane::grpc::MathContext_RoundingMode value) {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  ;
-  _impl_.rounding_mode_ = value;
-}
-
-// -------------------------------------------------------------------
-
-// UpdateByWindowScale_UpdateByWindowTicks
-
-// double ticks = 1;
-inline void UpdateByWindowScale_UpdateByWindowTicks::clear_ticks() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  _impl_.ticks_ = 0;
-}
-inline double UpdateByWindowScale_UpdateByWindowTicks::ticks() const {
-  // @@protoc_insertion_point(field_get:io.deephaven.proto.backplane.grpc.UpdateByWindowScale.UpdateByWindowTicks.ticks)
-  return _internal_ticks();
-}
-inline void UpdateByWindowScale_UpdateByWindowTicks::set_ticks(double value) {
-  _internal_set_ticks(value);
-  // @@protoc_insertion_point(field_set:io.deephaven.proto.backplane.grpc.UpdateByWindowScale.UpdateByWindowTicks.ticks)
-}
-inline double UpdateByWindowScale_UpdateByWindowTicks::_internal_ticks() const {
-  PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race);
-  return _impl_.ticks_;
-}
-inline void UpdateByWindowScale_UpdateByWindowTicks::_internal_set_ticks(double value) {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  ;
-  _impl_.ticks_ = value;
-}
-
-// -------------------------------------------------------------------
-
-// UpdateByWindowScale_UpdateByWindowTime
-
-// string column = 1;
-inline void UpdateByWindowScale_UpdateByWindowTime::clear_column() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  _impl_.column_.ClearToEmpty();
-}
-inline const std::string& UpdateByWindowScale_UpdateByWindowTime::column() const
-    ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  // @@protoc_insertion_point(field_get:io.deephaven.proto.backplane.grpc.UpdateByWindowScale.UpdateByWindowTime.column)
-  return _internal_column();
-}
-template <typename Arg_, typename... Args_>
-inline PROTOBUF_ALWAYS_INLINE void UpdateByWindowScale_UpdateByWindowTime::set_column(Arg_&& arg,
-                                                     Args_... args) {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  ;
-  _impl_.column_.Set(static_cast<Arg_&&>(arg), args..., GetArena());
-  // @@protoc_insertion_point(field_set:io.deephaven.proto.backplane.grpc.UpdateByWindowScale.UpdateByWindowTime.column)
-}
-inline std::string* UpdateByWindowScale_UpdateByWindowTime::mutable_column() ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  std::string* _s = _internal_mutable_column();
-  // @@protoc_insertion_point(field_mutable:io.deephaven.proto.backplane.grpc.UpdateByWindowScale.UpdateByWindowTime.column)
-  return _s;
-}
-inline const std::string& UpdateByWindowScale_UpdateByWindowTime::_internal_column() const {
-  PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race);
-  return _impl_.column_.Get();
-}
-inline void UpdateByWindowScale_UpdateByWindowTime::_internal_set_column(const std::string& value) {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  ;
-  _impl_.column_.Set(value, GetArena());
-}
-inline std::string* UpdateByWindowScale_UpdateByWindowTime::_internal_mutable_column() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  ;
-  return _impl_.column_.Mutable( GetArena());
-}
-inline std::string* UpdateByWindowScale_UpdateByWindowTime::release_column() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  // @@protoc_insertion_point(field_release:io.deephaven.proto.backplane.grpc.UpdateByWindowScale.UpdateByWindowTime.column)
-  return _impl_.column_.Release();
-}
-inline void UpdateByWindowScale_UpdateByWindowTime::set_allocated_column(std::string* value) {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  _impl_.column_.SetAllocated(value, GetArena());
-  #ifdef PROTOBUF_FORCE_COPY_DEFAULT_STRING
-        if (_impl_.column_.IsDefault()) {
-          _impl_.column_.Set("", GetArena());
-        }
-  #endif  // PROTOBUF_FORCE_COPY_DEFAULT_STRING
-  // @@protoc_insertion_point(field_set_allocated:io.deephaven.proto.backplane.grpc.UpdateByWindowScale.UpdateByWindowTime.column)
-}
-
-// sint64 nanos = 2 [jstype = JS_STRING];
-inline bool UpdateByWindowScale_UpdateByWindowTime::has_nanos() const {
-  return window_case() == kNanos;
-}
-inline void UpdateByWindowScale_UpdateByWindowTime::set_has_nanos() {
-  _impl_._oneof_case_[0] = kNanos;
-}
-inline void UpdateByWindowScale_UpdateByWindowTime::clear_nanos() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  if (window_case() == kNanos) {
-    _impl_.window_.nanos_ = ::int64_t{0};
-    clear_has_window();
-  }
-}
-inline ::int64_t UpdateByWindowScale_UpdateByWindowTime::nanos() const {
-  // @@protoc_insertion_point(field_get:io.deephaven.proto.backplane.grpc.UpdateByWindowScale.UpdateByWindowTime.nanos)
-  return _internal_nanos();
-}
-inline void UpdateByWindowScale_UpdateByWindowTime::set_nanos(::int64_t value) {
-  _internal_set_nanos(value);
-  // @@protoc_insertion_point(field_set:io.deephaven.proto.backplane.grpc.UpdateByWindowScale.UpdateByWindowTime.nanos)
-}
-inline ::int64_t UpdateByWindowScale_UpdateByWindowTime::_internal_nanos() const {
-  if (window_case() == kNanos) {
-    return _impl_.window_.nanos_;
-  }
-  return ::int64_t{0};
-}
-inline void UpdateByWindowScale_UpdateByWindowTime::_internal_set_nanos(::int64_t value) {
-  if (window_case() != kNanos) {
-    clear_window();
-    set_has_nanos();
-  }
-  _impl_.window_.nanos_ = value;
-}
-
-// string duration_string = 3;
-inline bool UpdateByWindowScale_UpdateByWindowTime::has_duration_string() const {
-  return window_case() == kDurationString;
-}
-inline void UpdateByWindowScale_UpdateByWindowTime::set_has_duration_string() {
-  _impl_._oneof_case_[0] = kDurationString;
-}
-inline void UpdateByWindowScale_UpdateByWindowTime::clear_duration_string() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  if (window_case() == kDurationString) {
-    _impl_.window_.duration_string_.Destroy();
-    clear_has_window();
-  }
-}
-inline const std::string& UpdateByWindowScale_UpdateByWindowTime::duration_string() const
-    ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  // @@protoc_insertion_point(field_get:io.deephaven.proto.backplane.grpc.UpdateByWindowScale.UpdateByWindowTime.duration_string)
-  return _internal_duration_string();
-}
-template <typename Arg_, typename... Args_>
-inline PROTOBUF_ALWAYS_INLINE void UpdateByWindowScale_UpdateByWindowTime::set_duration_string(Arg_&& arg,
-                                                     Args_... args) {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  if (window_case() != kDurationString) {
-    clear_window();
-
-    set_has_duration_string();
-    _impl_.window_.duration_string_.InitDefault();
-  }
-  _impl_.window_.duration_string_.Set(static_cast<Arg_&&>(arg), args..., GetArena());
-  // @@protoc_insertion_point(field_set:io.deephaven.proto.backplane.grpc.UpdateByWindowScale.UpdateByWindowTime.duration_string)
-}
-inline std::string* UpdateByWindowScale_UpdateByWindowTime::mutable_duration_string() ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  std::string* _s = _internal_mutable_duration_string();
-  // @@protoc_insertion_point(field_mutable:io.deephaven.proto.backplane.grpc.UpdateByWindowScale.UpdateByWindowTime.duration_string)
-  return _s;
-}
-inline const std::string& UpdateByWindowScale_UpdateByWindowTime::_internal_duration_string() const {
-  PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race);
-  if (window_case() != kDurationString) {
-    return ::google::protobuf::internal::GetEmptyStringAlreadyInited();
-  }
-  return _impl_.window_.duration_string_.Get();
-}
-inline void UpdateByWindowScale_UpdateByWindowTime::_internal_set_duration_string(const std::string& value) {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  if (window_case() != kDurationString) {
-    clear_window();
-
-    set_has_duration_string();
-    _impl_.window_.duration_string_.InitDefault();
-  }
-  _impl_.window_.duration_string_.Set(value, GetArena());
-}
-inline std::string* UpdateByWindowScale_UpdateByWindowTime::_internal_mutable_duration_string() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  if (window_case() != kDurationString) {
-    clear_window();
-
-    set_has_duration_string();
-    _impl_.window_.duration_string_.InitDefault();
-  }
-  return _impl_.window_.duration_string_.Mutable( GetArena());
-}
-inline std::string* UpdateByWindowScale_UpdateByWindowTime::release_duration_string() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  // @@protoc_insertion_point(field_release:io.deephaven.proto.backplane.grpc.UpdateByWindowScale.UpdateByWindowTime.duration_string)
-  if (window_case() != kDurationString) {
-    return nullptr;
-  }
-  clear_has_window();
-  return _impl_.window_.duration_string_.Release();
-}
-inline void UpdateByWindowScale_UpdateByWindowTime::set_allocated_duration_string(std::string* value) {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  if (has_window()) {
-    clear_window();
-  }
-  if (value != nullptr) {
-    set_has_duration_string();
-    _impl_.window_.duration_string_.InitAllocated(value, GetArena());
-  }
-  // @@protoc_insertion_point(field_set_allocated:io.deephaven.proto.backplane.grpc.UpdateByWindowScale.UpdateByWindowTime.duration_string)
-}
-
-inline bool UpdateByWindowScale_UpdateByWindowTime::has_window() const {
-  return window_case() != WINDOW_NOT_SET;
-}
-inline void UpdateByWindowScale_UpdateByWindowTime::clear_has_window() {
-  _impl_._oneof_case_[0] = WINDOW_NOT_SET;
-}
-inline UpdateByWindowScale_UpdateByWindowTime::WindowCase UpdateByWindowScale_UpdateByWindowTime::window_case() const {
-  return UpdateByWindowScale_UpdateByWindowTime::WindowCase(_impl_._oneof_case_[0]);
-}
-// -------------------------------------------------------------------
-
-// UpdateByWindowScale
-
-// .io.deephaven.proto.backplane.grpc.UpdateByWindowScale.UpdateByWindowTicks ticks = 1;
-inline bool UpdateByWindowScale::has_ticks() const {
-  return type_case() == kTicks;
-}
-inline bool UpdateByWindowScale::_internal_has_ticks() const {
-  return type_case() == kTicks;
-}
-inline void UpdateByWindowScale::set_has_ticks() {
-  _impl_._oneof_case_[0] = kTicks;
-}
-inline void UpdateByWindowScale::clear_ticks() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  if (type_case() == kTicks) {
-    if (GetArena() == nullptr) {
-      delete _impl_.type_.ticks_;
-    }
-    clear_has_type();
-  }
-}
-inline ::io::deephaven::proto::backplane::grpc::UpdateByWindowScale_UpdateByWindowTicks* UpdateByWindowScale::release_ticks() {
-  // @@protoc_insertion_point(field_release:io.deephaven.proto.backplane.grpc.UpdateByWindowScale.ticks)
-  if (type_case() == kTicks) {
-    clear_has_type();
-    auto* temp = _impl_.type_.ticks_;
-    if (GetArena() != nullptr) {
-      temp = ::google::protobuf::internal::DuplicateIfNonNull(temp);
-    }
-    _impl_.type_.ticks_ = nullptr;
-    return temp;
-  } else {
-    return nullptr;
-  }
-}
-inline const ::io::deephaven::proto::backplane::grpc::UpdateByWindowScale_UpdateByWindowTicks& UpdateByWindowScale::_internal_ticks() const {
-  return type_case() == kTicks ? *_impl_.type_.ticks_ : reinterpret_cast<::io::deephaven::proto::backplane::grpc::UpdateByWindowScale_UpdateByWindowTicks&>(::io::deephaven::proto::backplane::grpc::_UpdateByWindowScale_UpdateByWindowTicks_default_instance_);
-}
-inline const ::io::deephaven::proto::backplane::grpc::UpdateByWindowScale_UpdateByWindowTicks& UpdateByWindowScale::ticks() const ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  // @@protoc_insertion_point(field_get:io.deephaven.proto.backplane.grpc.UpdateByWindowScale.ticks)
-  return _internal_ticks();
-}
-inline ::io::deephaven::proto::backplane::grpc::UpdateByWindowScale_UpdateByWindowTicks* UpdateByWindowScale::unsafe_arena_release_ticks() {
-  // @@protoc_insertion_point(field_unsafe_arena_release:io.deephaven.proto.backplane.grpc.UpdateByWindowScale.ticks)
-  if (type_case() == kTicks) {
-    clear_has_type();
-    auto* temp = _impl_.type_.ticks_;
-    _impl_.type_.ticks_ = nullptr;
-    return temp;
-  } else {
-    return nullptr;
-  }
-}
-inline void UpdateByWindowScale::unsafe_arena_set_allocated_ticks(::io::deephaven::proto::backplane::grpc::UpdateByWindowScale_UpdateByWindowTicks* value) {
-  // We rely on the oneof clear method to free the earlier contents
-  // of this oneof. We can directly use the pointer we're given to
-  // set the new value.
-  clear_type();
-  if (value) {
-    set_has_ticks();
-    _impl_.type_.ticks_ = value;
-  }
-  // @@protoc_insertion_point(field_unsafe_arena_set_allocated:io.deephaven.proto.backplane.grpc.UpdateByWindowScale.ticks)
-}
-inline ::io::deephaven::proto::backplane::grpc::UpdateByWindowScale_UpdateByWindowTicks* UpdateByWindowScale::_internal_mutable_ticks() {
-  if (type_case() != kTicks) {
-    clear_type();
-    set_has_ticks();
-    _impl_.type_.ticks_ = CreateMaybeMessage<::io::deephaven::proto::backplane::grpc::UpdateByWindowScale_UpdateByWindowTicks>(GetArena());
-  }
-  return _impl_.type_.ticks_;
-}
-inline ::io::deephaven::proto::backplane::grpc::UpdateByWindowScale_UpdateByWindowTicks* UpdateByWindowScale::mutable_ticks() ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  ::io::deephaven::proto::backplane::grpc::UpdateByWindowScale_UpdateByWindowTicks* _msg = _internal_mutable_ticks();
-  // @@protoc_insertion_point(field_mutable:io.deephaven.proto.backplane.grpc.UpdateByWindowScale.ticks)
-  return _msg;
-}
-
-// .io.deephaven.proto.backplane.grpc.UpdateByWindowScale.UpdateByWindowTime time = 2;
-inline bool UpdateByWindowScale::has_time() const {
-  return type_case() == kTime;
-}
-inline bool UpdateByWindowScale::_internal_has_time() const {
-  return type_case() == kTime;
-}
-inline void UpdateByWindowScale::set_has_time() {
-  _impl_._oneof_case_[0] = kTime;
-}
-inline void UpdateByWindowScale::clear_time() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  if (type_case() == kTime) {
-    if (GetArena() == nullptr) {
-      delete _impl_.type_.time_;
-    }
-    clear_has_type();
-  }
-}
-inline ::io::deephaven::proto::backplane::grpc::UpdateByWindowScale_UpdateByWindowTime* UpdateByWindowScale::release_time() {
-  // @@protoc_insertion_point(field_release:io.deephaven.proto.backplane.grpc.UpdateByWindowScale.time)
-  if (type_case() == kTime) {
-    clear_has_type();
-    auto* temp = _impl_.type_.time_;
-    if (GetArena() != nullptr) {
-      temp = ::google::protobuf::internal::DuplicateIfNonNull(temp);
-    }
-    _impl_.type_.time_ = nullptr;
-    return temp;
-  } else {
-    return nullptr;
-  }
-}
-inline const ::io::deephaven::proto::backplane::grpc::UpdateByWindowScale_UpdateByWindowTime& UpdateByWindowScale::_internal_time() const {
-  return type_case() == kTime ? *_impl_.type_.time_ : reinterpret_cast<::io::deephaven::proto::backplane::grpc::UpdateByWindowScale_UpdateByWindowTime&>(::io::deephaven::proto::backplane::grpc::_UpdateByWindowScale_UpdateByWindowTime_default_instance_);
-}
-inline const ::io::deephaven::proto::backplane::grpc::UpdateByWindowScale_UpdateByWindowTime& UpdateByWindowScale::time() const ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  // @@protoc_insertion_point(field_get:io.deephaven.proto.backplane.grpc.UpdateByWindowScale.time)
-  return _internal_time();
-}
-inline ::io::deephaven::proto::backplane::grpc::UpdateByWindowScale_UpdateByWindowTime* UpdateByWindowScale::unsafe_arena_release_time() {
-  // @@protoc_insertion_point(field_unsafe_arena_release:io.deephaven.proto.backplane.grpc.UpdateByWindowScale.time)
-  if (type_case() == kTime) {
-    clear_has_type();
-    auto* temp = _impl_.type_.time_;
-    _impl_.type_.time_ = nullptr;
-    return temp;
-  } else {
-    return nullptr;
-  }
-}
-inline void UpdateByWindowScale::unsafe_arena_set_allocated_time(::io::deephaven::proto::backplane::grpc::UpdateByWindowScale_UpdateByWindowTime* value) {
-  // We rely on the oneof clear method to free the earlier contents
-  // of this oneof. We can directly use the pointer we're given to
-  // set the new value.
-  clear_type();
-  if (value) {
-    set_has_time();
-    _impl_.type_.time_ = value;
-  }
-  // @@protoc_insertion_point(field_unsafe_arena_set_allocated:io.deephaven.proto.backplane.grpc.UpdateByWindowScale.time)
-}
-inline ::io::deephaven::proto::backplane::grpc::UpdateByWindowScale_UpdateByWindowTime* UpdateByWindowScale::_internal_mutable_time() {
-  if (type_case() != kTime) {
-    clear_type();
-    set_has_time();
-    _impl_.type_.time_ = CreateMaybeMessage<::io::deephaven::proto::backplane::grpc::UpdateByWindowScale_UpdateByWindowTime>(GetArena());
-  }
-  return _impl_.type_.time_;
-}
-inline ::io::deephaven::proto::backplane::grpc::UpdateByWindowScale_UpdateByWindowTime* UpdateByWindowScale::mutable_time() ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  ::io::deephaven::proto::backplane::grpc::UpdateByWindowScale_UpdateByWindowTime* _msg = _internal_mutable_time();
-  // @@protoc_insertion_point(field_mutable:io.deephaven.proto.backplane.grpc.UpdateByWindowScale.time)
-  return _msg;
-}
-
-inline bool UpdateByWindowScale::has_type() const {
-  return type_case() != TYPE_NOT_SET;
-}
-inline void UpdateByWindowScale::clear_has_type() {
-  _impl_._oneof_case_[0] = TYPE_NOT_SET;
-}
-inline UpdateByWindowScale::TypeCase UpdateByWindowScale::type_case() const {
-  return UpdateByWindowScale::TypeCase(_impl_._oneof_case_[0]);
-}
-// -------------------------------------------------------------------
-
-// UpdateByEmOptions
-
-// .io.deephaven.proto.backplane.grpc.BadDataBehavior on_null_value = 1;
-inline void UpdateByEmOptions::clear_on_null_value() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  _impl_.on_null_value_ = 0;
-}
-inline ::io::deephaven::proto::backplane::grpc::BadDataBehavior UpdateByEmOptions::on_null_value() const {
-  // @@protoc_insertion_point(field_get:io.deephaven.proto.backplane.grpc.UpdateByEmOptions.on_null_value)
-  return _internal_on_null_value();
-}
-inline void UpdateByEmOptions::set_on_null_value(::io::deephaven::proto::backplane::grpc::BadDataBehavior value) {
-  _internal_set_on_null_value(value);
-  // @@protoc_insertion_point(field_set:io.deephaven.proto.backplane.grpc.UpdateByEmOptions.on_null_value)
-}
-inline ::io::deephaven::proto::backplane::grpc::BadDataBehavior UpdateByEmOptions::_internal_on_null_value() const {
-  PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race);
-  return static_cast<::io::deephaven::proto::backplane::grpc::BadDataBehavior>(_impl_.on_null_value_);
-}
-inline void UpdateByEmOptions::_internal_set_on_null_value(::io::deephaven::proto::backplane::grpc::BadDataBehavior value) {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  ;
-  _impl_.on_null_value_ = value;
-}
-
-// .io.deephaven.proto.backplane.grpc.BadDataBehavior on_nan_value = 2;
-inline void UpdateByEmOptions::clear_on_nan_value() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  _impl_.on_nan_value_ = 0;
-}
-inline ::io::deephaven::proto::backplane::grpc::BadDataBehavior UpdateByEmOptions::on_nan_value() const {
-  // @@protoc_insertion_point(field_get:io.deephaven.proto.backplane.grpc.UpdateByEmOptions.on_nan_value)
-  return _internal_on_nan_value();
-}
-inline void UpdateByEmOptions::set_on_nan_value(::io::deephaven::proto::backplane::grpc::BadDataBehavior value) {
-  _internal_set_on_nan_value(value);
-  // @@protoc_insertion_point(field_set:io.deephaven.proto.backplane.grpc.UpdateByEmOptions.on_nan_value)
-}
-inline ::io::deephaven::proto::backplane::grpc::BadDataBehavior UpdateByEmOptions::_internal_on_nan_value() const {
-  PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race);
-  return static_cast<::io::deephaven::proto::backplane::grpc::BadDataBehavior>(_impl_.on_nan_value_);
-}
-inline void UpdateByEmOptions::_internal_set_on_nan_value(::io::deephaven::proto::backplane::grpc::BadDataBehavior value) {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  ;
-  _impl_.on_nan_value_ = value;
-}
-
-// .io.deephaven.proto.backplane.grpc.BadDataBehavior on_null_time = 3;
-inline void UpdateByEmOptions::clear_on_null_time() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  _impl_.on_null_time_ = 0;
-}
-inline ::io::deephaven::proto::backplane::grpc::BadDataBehavior UpdateByEmOptions::on_null_time() const {
-  // @@protoc_insertion_point(field_get:io.deephaven.proto.backplane.grpc.UpdateByEmOptions.on_null_time)
-  return _internal_on_null_time();
-}
-inline void UpdateByEmOptions::set_on_null_time(::io::deephaven::proto::backplane::grpc::BadDataBehavior value) {
-  _internal_set_on_null_time(value);
-  // @@protoc_insertion_point(field_set:io.deephaven.proto.backplane.grpc.UpdateByEmOptions.on_null_time)
-}
-inline ::io::deephaven::proto::backplane::grpc::BadDataBehavior UpdateByEmOptions::_internal_on_null_time() const {
-  PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race);
-  return static_cast<::io::deephaven::proto::backplane::grpc::BadDataBehavior>(_impl_.on_null_time_);
-}
-inline void UpdateByEmOptions::_internal_set_on_null_time(::io::deephaven::proto::backplane::grpc::BadDataBehavior value) {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  ;
-  _impl_.on_null_time_ = value;
-}
-
-// .io.deephaven.proto.backplane.grpc.BadDataBehavior on_negative_delta_time = 4;
-inline void UpdateByEmOptions::clear_on_negative_delta_time() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  _impl_.on_negative_delta_time_ = 0;
-}
-inline ::io::deephaven::proto::backplane::grpc::BadDataBehavior UpdateByEmOptions::on_negative_delta_time() const {
-  // @@protoc_insertion_point(field_get:io.deephaven.proto.backplane.grpc.UpdateByEmOptions.on_negative_delta_time)
-  return _internal_on_negative_delta_time();
-}
-inline void UpdateByEmOptions::set_on_negative_delta_time(::io::deephaven::proto::backplane::grpc::BadDataBehavior value) {
-  _internal_set_on_negative_delta_time(value);
-  // @@protoc_insertion_point(field_set:io.deephaven.proto.backplane.grpc.UpdateByEmOptions.on_negative_delta_time)
-}
-inline ::io::deephaven::proto::backplane::grpc::BadDataBehavior UpdateByEmOptions::_internal_on_negative_delta_time() const {
-  PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race);
-  return static_cast<::io::deephaven::proto::backplane::grpc::BadDataBehavior>(_impl_.on_negative_delta_time_);
-}
-inline void UpdateByEmOptions::_internal_set_on_negative_delta_time(::io::deephaven::proto::backplane::grpc::BadDataBehavior value) {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  ;
-  _impl_.on_negative_delta_time_ = value;
-}
-
-// .io.deephaven.proto.backplane.grpc.BadDataBehavior on_zero_delta_time = 5;
-inline void UpdateByEmOptions::clear_on_zero_delta_time() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  _impl_.on_zero_delta_time_ = 0;
-}
-inline ::io::deephaven::proto::backplane::grpc::BadDataBehavior UpdateByEmOptions::on_zero_delta_time() const {
-  // @@protoc_insertion_point(field_get:io.deephaven.proto.backplane.grpc.UpdateByEmOptions.on_zero_delta_time)
-  return _internal_on_zero_delta_time();
-}
-inline void UpdateByEmOptions::set_on_zero_delta_time(::io::deephaven::proto::backplane::grpc::BadDataBehavior value) {
-  _internal_set_on_zero_delta_time(value);
-  // @@protoc_insertion_point(field_set:io.deephaven.proto.backplane.grpc.UpdateByEmOptions.on_zero_delta_time)
-}
-inline ::io::deephaven::proto::backplane::grpc::BadDataBehavior UpdateByEmOptions::_internal_on_zero_delta_time() const {
-  PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race);
-  return static_cast<::io::deephaven::proto::backplane::grpc::BadDataBehavior>(_impl_.on_zero_delta_time_);
-}
-inline void UpdateByEmOptions::_internal_set_on_zero_delta_time(::io::deephaven::proto::backplane::grpc::BadDataBehavior value) {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  ;
-  _impl_.on_zero_delta_time_ = value;
-}
-
-// .io.deephaven.proto.backplane.grpc.MathContext big_value_context = 6;
-inline bool UpdateByEmOptions::has_big_value_context() const {
-  bool value = (_impl_._has_bits_[0] & 0x00000001u) != 0;
-  PROTOBUF_ASSUME(!value || _impl_.big_value_context_ != nullptr);
-  return value;
-}
-inline void UpdateByEmOptions::clear_big_value_context() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  if (_impl_.big_value_context_ != nullptr) _impl_.big_value_context_->Clear();
-  _impl_._has_bits_[0] &= ~0x00000001u;
-}
-inline const ::io::deephaven::proto::backplane::grpc::MathContext& UpdateByEmOptions::_internal_big_value_context() const {
-  PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race);
-  const ::io::deephaven::proto::backplane::grpc::MathContext* p = _impl_.big_value_context_;
-  return p != nullptr ? *p : reinterpret_cast<const ::io::deephaven::proto::backplane::grpc::MathContext&>(::io::deephaven::proto::backplane::grpc::_MathContext_default_instance_);
-}
-inline const ::io::deephaven::proto::backplane::grpc::MathContext& UpdateByEmOptions::big_value_context() const ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  // @@protoc_insertion_point(field_get:io.deephaven.proto.backplane.grpc.UpdateByEmOptions.big_value_context)
-  return _internal_big_value_context();
-}
-inline void UpdateByEmOptions::unsafe_arena_set_allocated_big_value_context(::io::deephaven::proto::backplane::grpc::MathContext* value) {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  if (GetArena() == nullptr) {
-    delete reinterpret_cast<::google::protobuf::MessageLite*>(_impl_.big_value_context_);
-  }
-  _impl_.big_value_context_ = reinterpret_cast<::io::deephaven::proto::backplane::grpc::MathContext*>(value);
-  if (value != nullptr) {
-    _impl_._has_bits_[0] |= 0x00000001u;
-  } else {
-    _impl_._has_bits_[0] &= ~0x00000001u;
-  }
-  // @@protoc_insertion_point(field_unsafe_arena_set_allocated:io.deephaven.proto.backplane.grpc.UpdateByEmOptions.big_value_context)
-}
-inline ::io::deephaven::proto::backplane::grpc::MathContext* UpdateByEmOptions::release_big_value_context() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-
-  _impl_._has_bits_[0] &= ~0x00000001u;
-  ::io::deephaven::proto::backplane::grpc::MathContext* released = _impl_.big_value_context_;
-  _impl_.big_value_context_ = nullptr;
-#ifdef PROTOBUF_FORCE_COPY_IN_RELEASE
-  auto* old = reinterpret_cast<::google::protobuf::MessageLite*>(released);
-  released = ::google::protobuf::internal::DuplicateIfNonNull(released);
-  if (GetArena() == nullptr) {
-    delete old;
-  }
-#else   // PROTOBUF_FORCE_COPY_IN_RELEASE
-  if (GetArena() != nullptr) {
-    released = ::google::protobuf::internal::DuplicateIfNonNull(released);
-  }
-#endif  // !PROTOBUF_FORCE_COPY_IN_RELEASE
-  return released;
-}
-inline ::io::deephaven::proto::backplane::grpc::MathContext* UpdateByEmOptions::unsafe_arena_release_big_value_context() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  // @@protoc_insertion_point(field_release:io.deephaven.proto.backplane.grpc.UpdateByEmOptions.big_value_context)
-
-  _impl_._has_bits_[0] &= ~0x00000001u;
-  ::io::deephaven::proto::backplane::grpc::MathContext* temp = _impl_.big_value_context_;
-  _impl_.big_value_context_ = nullptr;
-  return temp;
-}
-inline ::io::deephaven::proto::backplane::grpc::MathContext* UpdateByEmOptions::_internal_mutable_big_value_context() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  _impl_._has_bits_[0] |= 0x00000001u;
-  if (_impl_.big_value_context_ == nullptr) {
-    auto* p = CreateMaybeMessage<::io::deephaven::proto::backplane::grpc::MathContext>(GetArena());
-    _impl_.big_value_context_ = reinterpret_cast<::io::deephaven::proto::backplane::grpc::MathContext*>(p);
-  }
-  return _impl_.big_value_context_;
-}
-inline ::io::deephaven::proto::backplane::grpc::MathContext* UpdateByEmOptions::mutable_big_value_context() ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  ::io::deephaven::proto::backplane::grpc::MathContext* _msg = _internal_mutable_big_value_context();
-  // @@protoc_insertion_point(field_mutable:io.deephaven.proto.backplane.grpc.UpdateByEmOptions.big_value_context)
-  return _msg;
-}
-inline void UpdateByEmOptions::set_allocated_big_value_context(::io::deephaven::proto::backplane::grpc::MathContext* value) {
-  ::google::protobuf::Arena* message_arena = GetArena();
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  if (message_arena == nullptr) {
-    delete reinterpret_cast<::io::deephaven::proto::backplane::grpc::MathContext*>(_impl_.big_value_context_);
-  }
-
-  if (value != nullptr) {
-    ::google::protobuf::Arena* submessage_arena = reinterpret_cast<::io::deephaven::proto::backplane::grpc::MathContext*>(value)->GetArena();
-    if (message_arena != submessage_arena) {
-      value = ::google::protobuf::internal::GetOwnedMessage(message_arena, value, submessage_arena);
-    }
-    _impl_._has_bits_[0] |= 0x00000001u;
-  } else {
-    _impl_._has_bits_[0] &= ~0x00000001u;
-  }
-
-  _impl_.big_value_context_ = reinterpret_cast<::io::deephaven::proto::backplane::grpc::MathContext*>(value);
-  // @@protoc_insertion_point(field_set_allocated:io.deephaven.proto.backplane.grpc.UpdateByEmOptions.big_value_context)
-}
-
-// -------------------------------------------------------------------
-
-// UpdateByDeltaOptions
-
-// .io.deephaven.proto.backplane.grpc.UpdateByNullBehavior null_behavior = 1;
-inline void UpdateByDeltaOptions::clear_null_behavior() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  _impl_.null_behavior_ = 0;
-}
-inline ::io::deephaven::proto::backplane::grpc::UpdateByNullBehavior UpdateByDeltaOptions::null_behavior() const {
-  // @@protoc_insertion_point(field_get:io.deephaven.proto.backplane.grpc.UpdateByDeltaOptions.null_behavior)
-  return _internal_null_behavior();
-}
-inline void UpdateByDeltaOptions::set_null_behavior(::io::deephaven::proto::backplane::grpc::UpdateByNullBehavior value) {
-  _internal_set_null_behavior(value);
-  // @@protoc_insertion_point(field_set:io.deephaven.proto.backplane.grpc.UpdateByDeltaOptions.null_behavior)
-}
-inline ::io::deephaven::proto::backplane::grpc::UpdateByNullBehavior UpdateByDeltaOptions::_internal_null_behavior() const {
-  PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race);
-  return static_cast<::io::deephaven::proto::backplane::grpc::UpdateByNullBehavior>(_impl_.null_behavior_);
-}
-inline void UpdateByDeltaOptions::_internal_set_null_behavior(::io::deephaven::proto::backplane::grpc::UpdateByNullBehavior value) {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  ;
-  _impl_.null_behavior_ = value;
-}
-
-// -------------------------------------------------------------------
-
-// UpdateByRequest_UpdateByOptions
-
-// optional bool use_redirection = 1;
-inline bool UpdateByRequest_UpdateByOptions::has_use_redirection() const {
-  bool value = (_impl_._has_bits_[0] & 0x00000002u) != 0;
-  return value;
-}
-inline void UpdateByRequest_UpdateByOptions::clear_use_redirection() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  _impl_.use_redirection_ = false;
-  _impl_._has_bits_[0] &= ~0x00000002u;
-}
-inline bool UpdateByRequest_UpdateByOptions::use_redirection() const {
-  // @@protoc_insertion_point(field_get:io.deephaven.proto.backplane.grpc.UpdateByRequest.UpdateByOptions.use_redirection)
-  return _internal_use_redirection();
-}
-inline void UpdateByRequest_UpdateByOptions::set_use_redirection(bool value) {
-  _internal_set_use_redirection(value);
-  // @@protoc_insertion_point(field_set:io.deephaven.proto.backplane.grpc.UpdateByRequest.UpdateByOptions.use_redirection)
-}
-inline bool UpdateByRequest_UpdateByOptions::_internal_use_redirection() const {
-  PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race);
-  return _impl_.use_redirection_;
-}
-inline void UpdateByRequest_UpdateByOptions::_internal_set_use_redirection(bool value) {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  _impl_._has_bits_[0] |= 0x00000002u;
-  _impl_.use_redirection_ = value;
-}
-
-// optional int32 chunk_capacity = 2;
-inline bool UpdateByRequest_UpdateByOptions::has_chunk_capacity() const {
-  bool value = (_impl_._has_bits_[0] & 0x00000004u) != 0;
-  return value;
-}
-inline void UpdateByRequest_UpdateByOptions::clear_chunk_capacity() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  _impl_.chunk_capacity_ = 0;
-  _impl_._has_bits_[0] &= ~0x00000004u;
-}
-inline ::int32_t UpdateByRequest_UpdateByOptions::chunk_capacity() const {
-  // @@protoc_insertion_point(field_get:io.deephaven.proto.backplane.grpc.UpdateByRequest.UpdateByOptions.chunk_capacity)
-  return _internal_chunk_capacity();
-}
-inline void UpdateByRequest_UpdateByOptions::set_chunk_capacity(::int32_t value) {
-  _internal_set_chunk_capacity(value);
-  // @@protoc_insertion_point(field_set:io.deephaven.proto.backplane.grpc.UpdateByRequest.UpdateByOptions.chunk_capacity)
-}
-inline ::int32_t UpdateByRequest_UpdateByOptions::_internal_chunk_capacity() const {
-  PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race);
-  return _impl_.chunk_capacity_;
-}
-inline void UpdateByRequest_UpdateByOptions::_internal_set_chunk_capacity(::int32_t value) {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  _impl_._has_bits_[0] |= 0x00000004u;
-  _impl_.chunk_capacity_ = value;
-}
-
-// optional double max_static_sparse_memory_overhead = 3;
-inline bool UpdateByRequest_UpdateByOptions::has_max_static_sparse_memory_overhead() const {
-  bool value = (_impl_._has_bits_[0] & 0x00000008u) != 0;
-  return value;
-}
-inline void UpdateByRequest_UpdateByOptions::clear_max_static_sparse_memory_overhead() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  _impl_.max_static_sparse_memory_overhead_ = 0;
-  _impl_._has_bits_[0] &= ~0x00000008u;
-}
-inline double UpdateByRequest_UpdateByOptions::max_static_sparse_memory_overhead() const {
-  // @@protoc_insertion_point(field_get:io.deephaven.proto.backplane.grpc.UpdateByRequest.UpdateByOptions.max_static_sparse_memory_overhead)
-  return _internal_max_static_sparse_memory_overhead();
-}
-inline void UpdateByRequest_UpdateByOptions::set_max_static_sparse_memory_overhead(double value) {
-  _internal_set_max_static_sparse_memory_overhead(value);
-  // @@protoc_insertion_point(field_set:io.deephaven.proto.backplane.grpc.UpdateByRequest.UpdateByOptions.max_static_sparse_memory_overhead)
-}
-inline double UpdateByRequest_UpdateByOptions::_internal_max_static_sparse_memory_overhead() const {
-  PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race);
-  return _impl_.max_static_sparse_memory_overhead_;
-}
-inline void UpdateByRequest_UpdateByOptions::_internal_set_max_static_sparse_memory_overhead(double value) {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  _impl_._has_bits_[0] |= 0x00000008u;
-  _impl_.max_static_sparse_memory_overhead_ = value;
-}
-
-// optional int32 initial_hash_table_size = 4;
-inline bool UpdateByRequest_UpdateByOptions::has_initial_hash_table_size() const {
-  bool value = (_impl_._has_bits_[0] & 0x00000040u) != 0;
-  return value;
-}
-inline void UpdateByRequest_UpdateByOptions::clear_initial_hash_table_size() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  _impl_.initial_hash_table_size_ = 0;
-  _impl_._has_bits_[0] &= ~0x00000040u;
-}
-inline ::int32_t UpdateByRequest_UpdateByOptions::initial_hash_table_size() const {
-  // @@protoc_insertion_point(field_get:io.deephaven.proto.backplane.grpc.UpdateByRequest.UpdateByOptions.initial_hash_table_size)
-  return _internal_initial_hash_table_size();
-}
-inline void UpdateByRequest_UpdateByOptions::set_initial_hash_table_size(::int32_t value) {
-  _internal_set_initial_hash_table_size(value);
-  // @@protoc_insertion_point(field_set:io.deephaven.proto.backplane.grpc.UpdateByRequest.UpdateByOptions.initial_hash_table_size)
-}
-inline ::int32_t UpdateByRequest_UpdateByOptions::_internal_initial_hash_table_size() const {
-  PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race);
-  return _impl_.initial_hash_table_size_;
-}
-inline void UpdateByRequest_UpdateByOptions::_internal_set_initial_hash_table_size(::int32_t value) {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  _impl_._has_bits_[0] |= 0x00000040u;
-  _impl_.initial_hash_table_size_ = value;
-}
-
-// optional double maximum_load_factor = 5;
-inline bool UpdateByRequest_UpdateByOptions::has_maximum_load_factor() const {
-  bool value = (_impl_._has_bits_[0] & 0x00000010u) != 0;
-  return value;
-}
-inline void UpdateByRequest_UpdateByOptions::clear_maximum_load_factor() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  _impl_.maximum_load_factor_ = 0;
-  _impl_._has_bits_[0] &= ~0x00000010u;
-}
-inline double UpdateByRequest_UpdateByOptions::maximum_load_factor() const {
-  // @@protoc_insertion_point(field_get:io.deephaven.proto.backplane.grpc.UpdateByRequest.UpdateByOptions.maximum_load_factor)
-  return _internal_maximum_load_factor();
-}
-inline void UpdateByRequest_UpdateByOptions::set_maximum_load_factor(double value) {
-  _internal_set_maximum_load_factor(value);
-  // @@protoc_insertion_point(field_set:io.deephaven.proto.backplane.grpc.UpdateByRequest.UpdateByOptions.maximum_load_factor)
-}
-inline double UpdateByRequest_UpdateByOptions::_internal_maximum_load_factor() const {
-  PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race);
-  return _impl_.maximum_load_factor_;
-}
-inline void UpdateByRequest_UpdateByOptions::_internal_set_maximum_load_factor(double value) {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  _impl_._has_bits_[0] |= 0x00000010u;
-  _impl_.maximum_load_factor_ = value;
-}
-
-// optional double target_load_factor = 6;
-inline bool UpdateByRequest_UpdateByOptions::has_target_load_factor() const {
-  bool value = (_impl_._has_bits_[0] & 0x00000020u) != 0;
-  return value;
-}
-inline void UpdateByRequest_UpdateByOptions::clear_target_load_factor() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  _impl_.target_load_factor_ = 0;
-  _impl_._has_bits_[0] &= ~0x00000020u;
-}
-inline double UpdateByRequest_UpdateByOptions::target_load_factor() const {
-  // @@protoc_insertion_point(field_get:io.deephaven.proto.backplane.grpc.UpdateByRequest.UpdateByOptions.target_load_factor)
-  return _internal_target_load_factor();
-}
-inline void UpdateByRequest_UpdateByOptions::set_target_load_factor(double value) {
-  _internal_set_target_load_factor(value);
-  // @@protoc_insertion_point(field_set:io.deephaven.proto.backplane.grpc.UpdateByRequest.UpdateByOptions.target_load_factor)
-}
-inline double UpdateByRequest_UpdateByOptions::_internal_target_load_factor() const {
-  PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race);
-  return _impl_.target_load_factor_;
-}
-inline void UpdateByRequest_UpdateByOptions::_internal_set_target_load_factor(double value) {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  _impl_._has_bits_[0] |= 0x00000020u;
-  _impl_.target_load_factor_ = value;
-}
-
-// .io.deephaven.proto.backplane.grpc.MathContext math_context = 7;
-inline bool UpdateByRequest_UpdateByOptions::has_math_context() const {
-  bool value = (_impl_._has_bits_[0] & 0x00000001u) != 0;
-  PROTOBUF_ASSUME(!value || _impl_.math_context_ != nullptr);
-  return value;
-}
-inline void UpdateByRequest_UpdateByOptions::clear_math_context() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  if (_impl_.math_context_ != nullptr) _impl_.math_context_->Clear();
-  _impl_._has_bits_[0] &= ~0x00000001u;
-}
-inline const ::io::deephaven::proto::backplane::grpc::MathContext& UpdateByRequest_UpdateByOptions::_internal_math_context() const {
-  PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race);
-  const ::io::deephaven::proto::backplane::grpc::MathContext* p = _impl_.math_context_;
-  return p != nullptr ? *p : reinterpret_cast<const ::io::deephaven::proto::backplane::grpc::MathContext&>(::io::deephaven::proto::backplane::grpc::_MathContext_default_instance_);
-}
-inline const ::io::deephaven::proto::backplane::grpc::MathContext& UpdateByRequest_UpdateByOptions::math_context() const ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  // @@protoc_insertion_point(field_get:io.deephaven.proto.backplane.grpc.UpdateByRequest.UpdateByOptions.math_context)
-  return _internal_math_context();
-}
-inline void UpdateByRequest_UpdateByOptions::unsafe_arena_set_allocated_math_context(::io::deephaven::proto::backplane::grpc::MathContext* value) {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  if (GetArena() == nullptr) {
-    delete reinterpret_cast<::google::protobuf::MessageLite*>(_impl_.math_context_);
-  }
-  _impl_.math_context_ = reinterpret_cast<::io::deephaven::proto::backplane::grpc::MathContext*>(value);
-  if (value != nullptr) {
-    _impl_._has_bits_[0] |= 0x00000001u;
-  } else {
-    _impl_._has_bits_[0] &= ~0x00000001u;
-  }
-  // @@protoc_insertion_point(field_unsafe_arena_set_allocated:io.deephaven.proto.backplane.grpc.UpdateByRequest.UpdateByOptions.math_context)
-}
-inline ::io::deephaven::proto::backplane::grpc::MathContext* UpdateByRequest_UpdateByOptions::release_math_context() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-
-  _impl_._has_bits_[0] &= ~0x00000001u;
-  ::io::deephaven::proto::backplane::grpc::MathContext* released = _impl_.math_context_;
-  _impl_.math_context_ = nullptr;
-#ifdef PROTOBUF_FORCE_COPY_IN_RELEASE
-  auto* old = reinterpret_cast<::google::protobuf::MessageLite*>(released);
-  released = ::google::protobuf::internal::DuplicateIfNonNull(released);
-  if (GetArena() == nullptr) {
-    delete old;
-  }
-#else   // PROTOBUF_FORCE_COPY_IN_RELEASE
-  if (GetArena() != nullptr) {
-    released = ::google::protobuf::internal::DuplicateIfNonNull(released);
-  }
-#endif  // !PROTOBUF_FORCE_COPY_IN_RELEASE
-  return released;
-}
-inline ::io::deephaven::proto::backplane::grpc::MathContext* UpdateByRequest_UpdateByOptions::unsafe_arena_release_math_context() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  // @@protoc_insertion_point(field_release:io.deephaven.proto.backplane.grpc.UpdateByRequest.UpdateByOptions.math_context)
-
-  _impl_._has_bits_[0] &= ~0x00000001u;
-  ::io::deephaven::proto::backplane::grpc::MathContext* temp = _impl_.math_context_;
-  _impl_.math_context_ = nullptr;
-  return temp;
-}
-inline ::io::deephaven::proto::backplane::grpc::MathContext* UpdateByRequest_UpdateByOptions::_internal_mutable_math_context() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  _impl_._has_bits_[0] |= 0x00000001u;
-  if (_impl_.math_context_ == nullptr) {
-    auto* p = CreateMaybeMessage<::io::deephaven::proto::backplane::grpc::MathContext>(GetArena());
-    _impl_.math_context_ = reinterpret_cast<::io::deephaven::proto::backplane::grpc::MathContext*>(p);
-  }
-  return _impl_.math_context_;
-}
-inline ::io::deephaven::proto::backplane::grpc::MathContext* UpdateByRequest_UpdateByOptions::mutable_math_context() ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  ::io::deephaven::proto::backplane::grpc::MathContext* _msg = _internal_mutable_math_context();
-  // @@protoc_insertion_point(field_mutable:io.deephaven.proto.backplane.grpc.UpdateByRequest.UpdateByOptions.math_context)
-  return _msg;
-}
-inline void UpdateByRequest_UpdateByOptions::set_allocated_math_context(::io::deephaven::proto::backplane::grpc::MathContext* value) {
-  ::google::protobuf::Arena* message_arena = GetArena();
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  if (message_arena == nullptr) {
-    delete reinterpret_cast<::io::deephaven::proto::backplane::grpc::MathContext*>(_impl_.math_context_);
-  }
-
-  if (value != nullptr) {
-    ::google::protobuf::Arena* submessage_arena = reinterpret_cast<::io::deephaven::proto::backplane::grpc::MathContext*>(value)->GetArena();
-    if (message_arena != submessage_arena) {
-      value = ::google::protobuf::internal::GetOwnedMessage(message_arena, value, submessage_arena);
-    }
-    _impl_._has_bits_[0] |= 0x00000001u;
-  } else {
-    _impl_._has_bits_[0] &= ~0x00000001u;
-  }
-
-  _impl_.math_context_ = reinterpret_cast<::io::deephaven::proto::backplane::grpc::MathContext*>(value);
-  // @@protoc_insertion_point(field_set_allocated:io.deephaven.proto.backplane.grpc.UpdateByRequest.UpdateByOptions.math_context)
-}
-
-// -------------------------------------------------------------------
-
-// UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByCumulativeSum
-
-// -------------------------------------------------------------------
-
-// UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByCumulativeMin
-
-// -------------------------------------------------------------------
-
-// UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByCumulativeMax
-
-// -------------------------------------------------------------------
-
-// UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByCumulativeProduct
-
-// -------------------------------------------------------------------
-
-// UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByFill
-
-// -------------------------------------------------------------------
-
-// UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByEma
-
-// .io.deephaven.proto.backplane.grpc.UpdateByEmOptions options = 1;
-inline bool UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByEma::has_options() const {
-  bool value = (_impl_._has_bits_[0] & 0x00000001u) != 0;
-  PROTOBUF_ASSUME(!value || _impl_.options_ != nullptr);
-  return value;
-}
-inline void UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByEma::clear_options() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  if (_impl_.options_ != nullptr) _impl_.options_->Clear();
-  _impl_._has_bits_[0] &= ~0x00000001u;
-}
-inline const ::io::deephaven::proto::backplane::grpc::UpdateByEmOptions& UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByEma::_internal_options() const {
-  PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race);
-  const ::io::deephaven::proto::backplane::grpc::UpdateByEmOptions* p = _impl_.options_;
-  return p != nullptr ? *p : reinterpret_cast<const ::io::deephaven::proto::backplane::grpc::UpdateByEmOptions&>(::io::deephaven::proto::backplane::grpc::_UpdateByEmOptions_default_instance_);
-}
-inline const ::io::deephaven::proto::backplane::grpc::UpdateByEmOptions& UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByEma::options() const ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  // @@protoc_insertion_point(field_get:io.deephaven.proto.backplane.grpc.UpdateByRequest.UpdateByOperation.UpdateByColumn.UpdateBySpec.UpdateByEma.options)
-  return _internal_options();
-}
-inline void UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByEma::unsafe_arena_set_allocated_options(::io::deephaven::proto::backplane::grpc::UpdateByEmOptions* value) {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  if (GetArena() == nullptr) {
-    delete reinterpret_cast<::google::protobuf::MessageLite*>(_impl_.options_);
-  }
-  _impl_.options_ = reinterpret_cast<::io::deephaven::proto::backplane::grpc::UpdateByEmOptions*>(value);
-  if (value != nullptr) {
-    _impl_._has_bits_[0] |= 0x00000001u;
-  } else {
-    _impl_._has_bits_[0] &= ~0x00000001u;
-  }
-  // @@protoc_insertion_point(field_unsafe_arena_set_allocated:io.deephaven.proto.backplane.grpc.UpdateByRequest.UpdateByOperation.UpdateByColumn.UpdateBySpec.UpdateByEma.options)
-}
-inline ::io::deephaven::proto::backplane::grpc::UpdateByEmOptions* UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByEma::release_options() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-
-  _impl_._has_bits_[0] &= ~0x00000001u;
-  ::io::deephaven::proto::backplane::grpc::UpdateByEmOptions* released = _impl_.options_;
-  _impl_.options_ = nullptr;
-#ifdef PROTOBUF_FORCE_COPY_IN_RELEASE
-  auto* old = reinterpret_cast<::google::protobuf::MessageLite*>(released);
-  released = ::google::protobuf::internal::DuplicateIfNonNull(released);
-  if (GetArena() == nullptr) {
-    delete old;
-  }
-#else   // PROTOBUF_FORCE_COPY_IN_RELEASE
-  if (GetArena() != nullptr) {
-    released = ::google::protobuf::internal::DuplicateIfNonNull(released);
-  }
-#endif  // !PROTOBUF_FORCE_COPY_IN_RELEASE
-  return released;
-}
-inline ::io::deephaven::proto::backplane::grpc::UpdateByEmOptions* UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByEma::unsafe_arena_release_options() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  // @@protoc_insertion_point(field_release:io.deephaven.proto.backplane.grpc.UpdateByRequest.UpdateByOperation.UpdateByColumn.UpdateBySpec.UpdateByEma.options)
-
-  _impl_._has_bits_[0] &= ~0x00000001u;
-  ::io::deephaven::proto::backplane::grpc::UpdateByEmOptions* temp = _impl_.options_;
-  _impl_.options_ = nullptr;
-  return temp;
-}
-inline ::io::deephaven::proto::backplane::grpc::UpdateByEmOptions* UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByEma::_internal_mutable_options() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  _impl_._has_bits_[0] |= 0x00000001u;
-  if (_impl_.options_ == nullptr) {
-    auto* p = CreateMaybeMessage<::io::deephaven::proto::backplane::grpc::UpdateByEmOptions>(GetArena());
-    _impl_.options_ = reinterpret_cast<::io::deephaven::proto::backplane::grpc::UpdateByEmOptions*>(p);
-  }
-  return _impl_.options_;
-}
-inline ::io::deephaven::proto::backplane::grpc::UpdateByEmOptions* UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByEma::mutable_options() ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  ::io::deephaven::proto::backplane::grpc::UpdateByEmOptions* _msg = _internal_mutable_options();
-  // @@protoc_insertion_point(field_mutable:io.deephaven.proto.backplane.grpc.UpdateByRequest.UpdateByOperation.UpdateByColumn.UpdateBySpec.UpdateByEma.options)
-  return _msg;
-}
-inline void UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByEma::set_allocated_options(::io::deephaven::proto::backplane::grpc::UpdateByEmOptions* value) {
-  ::google::protobuf::Arena* message_arena = GetArena();
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  if (message_arena == nullptr) {
-    delete reinterpret_cast<::io::deephaven::proto::backplane::grpc::UpdateByEmOptions*>(_impl_.options_);
-  }
-
-  if (value != nullptr) {
-    ::google::protobuf::Arena* submessage_arena = reinterpret_cast<::io::deephaven::proto::backplane::grpc::UpdateByEmOptions*>(value)->GetArena();
-    if (message_arena != submessage_arena) {
-      value = ::google::protobuf::internal::GetOwnedMessage(message_arena, value, submessage_arena);
-    }
-    _impl_._has_bits_[0] |= 0x00000001u;
-  } else {
-    _impl_._has_bits_[0] &= ~0x00000001u;
-  }
-
-  _impl_.options_ = reinterpret_cast<::io::deephaven::proto::backplane::grpc::UpdateByEmOptions*>(value);
-  // @@protoc_insertion_point(field_set_allocated:io.deephaven.proto.backplane.grpc.UpdateByRequest.UpdateByOperation.UpdateByColumn.UpdateBySpec.UpdateByEma.options)
-}
-
-// .io.deephaven.proto.backplane.grpc.UpdateByWindowScale window_scale = 2;
-inline bool UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByEma::has_window_scale() const {
-  bool value = (_impl_._has_bits_[0] & 0x00000002u) != 0;
-  PROTOBUF_ASSUME(!value || _impl_.window_scale_ != nullptr);
-  return value;
-}
-inline void UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByEma::clear_window_scale() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  if (_impl_.window_scale_ != nullptr) _impl_.window_scale_->Clear();
-  _impl_._has_bits_[0] &= ~0x00000002u;
-}
-inline const ::io::deephaven::proto::backplane::grpc::UpdateByWindowScale& UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByEma::_internal_window_scale() const {
-  PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race);
-  const ::io::deephaven::proto::backplane::grpc::UpdateByWindowScale* p = _impl_.window_scale_;
-  return p != nullptr ? *p : reinterpret_cast<const ::io::deephaven::proto::backplane::grpc::UpdateByWindowScale&>(::io::deephaven::proto::backplane::grpc::_UpdateByWindowScale_default_instance_);
-}
-inline const ::io::deephaven::proto::backplane::grpc::UpdateByWindowScale& UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByEma::window_scale() const ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  // @@protoc_insertion_point(field_get:io.deephaven.proto.backplane.grpc.UpdateByRequest.UpdateByOperation.UpdateByColumn.UpdateBySpec.UpdateByEma.window_scale)
-  return _internal_window_scale();
-}
-inline void UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByEma::unsafe_arena_set_allocated_window_scale(::io::deephaven::proto::backplane::grpc::UpdateByWindowScale* value) {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  if (GetArena() == nullptr) {
-    delete reinterpret_cast<::google::protobuf::MessageLite*>(_impl_.window_scale_);
-  }
-  _impl_.window_scale_ = reinterpret_cast<::io::deephaven::proto::backplane::grpc::UpdateByWindowScale*>(value);
-  if (value != nullptr) {
-    _impl_._has_bits_[0] |= 0x00000002u;
-  } else {
-    _impl_._has_bits_[0] &= ~0x00000002u;
-  }
-  // @@protoc_insertion_point(field_unsafe_arena_set_allocated:io.deephaven.proto.backplane.grpc.UpdateByRequest.UpdateByOperation.UpdateByColumn.UpdateBySpec.UpdateByEma.window_scale)
-}
-inline ::io::deephaven::proto::backplane::grpc::UpdateByWindowScale* UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByEma::release_window_scale() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-
-  _impl_._has_bits_[0] &= ~0x00000002u;
-  ::io::deephaven::proto::backplane::grpc::UpdateByWindowScale* released = _impl_.window_scale_;
-  _impl_.window_scale_ = nullptr;
-#ifdef PROTOBUF_FORCE_COPY_IN_RELEASE
-  auto* old = reinterpret_cast<::google::protobuf::MessageLite*>(released);
-  released = ::google::protobuf::internal::DuplicateIfNonNull(released);
-  if (GetArena() == nullptr) {
-    delete old;
-  }
-#else   // PROTOBUF_FORCE_COPY_IN_RELEASE
-  if (GetArena() != nullptr) {
-    released = ::google::protobuf::internal::DuplicateIfNonNull(released);
-  }
-#endif  // !PROTOBUF_FORCE_COPY_IN_RELEASE
-  return released;
-}
-inline ::io::deephaven::proto::backplane::grpc::UpdateByWindowScale* UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByEma::unsafe_arena_release_window_scale() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  // @@protoc_insertion_point(field_release:io.deephaven.proto.backplane.grpc.UpdateByRequest.UpdateByOperation.UpdateByColumn.UpdateBySpec.UpdateByEma.window_scale)
-
-  _impl_._has_bits_[0] &= ~0x00000002u;
-  ::io::deephaven::proto::backplane::grpc::UpdateByWindowScale* temp = _impl_.window_scale_;
-  _impl_.window_scale_ = nullptr;
-  return temp;
-}
-inline ::io::deephaven::proto::backplane::grpc::UpdateByWindowScale* UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByEma::_internal_mutable_window_scale() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  _impl_._has_bits_[0] |= 0x00000002u;
-  if (_impl_.window_scale_ == nullptr) {
-    auto* p = CreateMaybeMessage<::io::deephaven::proto::backplane::grpc::UpdateByWindowScale>(GetArena());
-    _impl_.window_scale_ = reinterpret_cast<::io::deephaven::proto::backplane::grpc::UpdateByWindowScale*>(p);
-  }
-  return _impl_.window_scale_;
-}
-inline ::io::deephaven::proto::backplane::grpc::UpdateByWindowScale* UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByEma::mutable_window_scale() ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  ::io::deephaven::proto::backplane::grpc::UpdateByWindowScale* _msg = _internal_mutable_window_scale();
-  // @@protoc_insertion_point(field_mutable:io.deephaven.proto.backplane.grpc.UpdateByRequest.UpdateByOperation.UpdateByColumn.UpdateBySpec.UpdateByEma.window_scale)
-  return _msg;
-}
-inline void UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByEma::set_allocated_window_scale(::io::deephaven::proto::backplane::grpc::UpdateByWindowScale* value) {
-  ::google::protobuf::Arena* message_arena = GetArena();
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  if (message_arena == nullptr) {
-    delete reinterpret_cast<::io::deephaven::proto::backplane::grpc::UpdateByWindowScale*>(_impl_.window_scale_);
-  }
-
-  if (value != nullptr) {
-    ::google::protobuf::Arena* submessage_arena = reinterpret_cast<::io::deephaven::proto::backplane::grpc::UpdateByWindowScale*>(value)->GetArena();
-    if (message_arena != submessage_arena) {
-      value = ::google::protobuf::internal::GetOwnedMessage(message_arena, value, submessage_arena);
-    }
-    _impl_._has_bits_[0] |= 0x00000002u;
-  } else {
-    _impl_._has_bits_[0] &= ~0x00000002u;
-  }
-
-  _impl_.window_scale_ = reinterpret_cast<::io::deephaven::proto::backplane::grpc::UpdateByWindowScale*>(value);
-  // @@protoc_insertion_point(field_set_allocated:io.deephaven.proto.backplane.grpc.UpdateByRequest.UpdateByOperation.UpdateByColumn.UpdateBySpec.UpdateByEma.window_scale)
-}
-
-// -------------------------------------------------------------------
-
-// UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByEms
-
-// .io.deephaven.proto.backplane.grpc.UpdateByEmOptions options = 1;
-inline bool UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByEms::has_options() const {
-  bool value = (_impl_._has_bits_[0] & 0x00000001u) != 0;
-  PROTOBUF_ASSUME(!value || _impl_.options_ != nullptr);
-  return value;
-}
-inline void UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByEms::clear_options() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  if (_impl_.options_ != nullptr) _impl_.options_->Clear();
-  _impl_._has_bits_[0] &= ~0x00000001u;
-}
-inline const ::io::deephaven::proto::backplane::grpc::UpdateByEmOptions& UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByEms::_internal_options() const {
-  PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race);
-  const ::io::deephaven::proto::backplane::grpc::UpdateByEmOptions* p = _impl_.options_;
-  return p != nullptr ? *p : reinterpret_cast<const ::io::deephaven::proto::backplane::grpc::UpdateByEmOptions&>(::io::deephaven::proto::backplane::grpc::_UpdateByEmOptions_default_instance_);
-}
-inline const ::io::deephaven::proto::backplane::grpc::UpdateByEmOptions& UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByEms::options() const ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  // @@protoc_insertion_point(field_get:io.deephaven.proto.backplane.grpc.UpdateByRequest.UpdateByOperation.UpdateByColumn.UpdateBySpec.UpdateByEms.options)
-  return _internal_options();
-}
-inline void UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByEms::unsafe_arena_set_allocated_options(::io::deephaven::proto::backplane::grpc::UpdateByEmOptions* value) {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  if (GetArena() == nullptr) {
-    delete reinterpret_cast<::google::protobuf::MessageLite*>(_impl_.options_);
-  }
-  _impl_.options_ = reinterpret_cast<::io::deephaven::proto::backplane::grpc::UpdateByEmOptions*>(value);
-  if (value != nullptr) {
-    _impl_._has_bits_[0] |= 0x00000001u;
-  } else {
-    _impl_._has_bits_[0] &= ~0x00000001u;
-  }
-  // @@protoc_insertion_point(field_unsafe_arena_set_allocated:io.deephaven.proto.backplane.grpc.UpdateByRequest.UpdateByOperation.UpdateByColumn.UpdateBySpec.UpdateByEms.options)
-}
-inline ::io::deephaven::proto::backplane::grpc::UpdateByEmOptions* UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByEms::release_options() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-
-  _impl_._has_bits_[0] &= ~0x00000001u;
-  ::io::deephaven::proto::backplane::grpc::UpdateByEmOptions* released = _impl_.options_;
-  _impl_.options_ = nullptr;
-#ifdef PROTOBUF_FORCE_COPY_IN_RELEASE
-  auto* old = reinterpret_cast<::google::protobuf::MessageLite*>(released);
-  released = ::google::protobuf::internal::DuplicateIfNonNull(released);
-  if (GetArena() == nullptr) {
-    delete old;
-  }
-#else   // PROTOBUF_FORCE_COPY_IN_RELEASE
-  if (GetArena() != nullptr) {
-    released = ::google::protobuf::internal::DuplicateIfNonNull(released);
-  }
-#endif  // !PROTOBUF_FORCE_COPY_IN_RELEASE
-  return released;
-}
-inline ::io::deephaven::proto::backplane::grpc::UpdateByEmOptions* UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByEms::unsafe_arena_release_options() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  // @@protoc_insertion_point(field_release:io.deephaven.proto.backplane.grpc.UpdateByRequest.UpdateByOperation.UpdateByColumn.UpdateBySpec.UpdateByEms.options)
-
-  _impl_._has_bits_[0] &= ~0x00000001u;
-  ::io::deephaven::proto::backplane::grpc::UpdateByEmOptions* temp = _impl_.options_;
-  _impl_.options_ = nullptr;
-  return temp;
-}
-inline ::io::deephaven::proto::backplane::grpc::UpdateByEmOptions* UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByEms::_internal_mutable_options() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  _impl_._has_bits_[0] |= 0x00000001u;
-  if (_impl_.options_ == nullptr) {
-    auto* p = CreateMaybeMessage<::io::deephaven::proto::backplane::grpc::UpdateByEmOptions>(GetArena());
-    _impl_.options_ = reinterpret_cast<::io::deephaven::proto::backplane::grpc::UpdateByEmOptions*>(p);
-  }
-  return _impl_.options_;
-}
-inline ::io::deephaven::proto::backplane::grpc::UpdateByEmOptions* UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByEms::mutable_options() ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  ::io::deephaven::proto::backplane::grpc::UpdateByEmOptions* _msg = _internal_mutable_options();
-  // @@protoc_insertion_point(field_mutable:io.deephaven.proto.backplane.grpc.UpdateByRequest.UpdateByOperation.UpdateByColumn.UpdateBySpec.UpdateByEms.options)
-  return _msg;
-}
-inline void UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByEms::set_allocated_options(::io::deephaven::proto::backplane::grpc::UpdateByEmOptions* value) {
-  ::google::protobuf::Arena* message_arena = GetArena();
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  if (message_arena == nullptr) {
-    delete reinterpret_cast<::io::deephaven::proto::backplane::grpc::UpdateByEmOptions*>(_impl_.options_);
-  }
-
-  if (value != nullptr) {
-    ::google::protobuf::Arena* submessage_arena = reinterpret_cast<::io::deephaven::proto::backplane::grpc::UpdateByEmOptions*>(value)->GetArena();
-    if (message_arena != submessage_arena) {
-      value = ::google::protobuf::internal::GetOwnedMessage(message_arena, value, submessage_arena);
-    }
-    _impl_._has_bits_[0] |= 0x00000001u;
-  } else {
-    _impl_._has_bits_[0] &= ~0x00000001u;
-  }
-
-  _impl_.options_ = reinterpret_cast<::io::deephaven::proto::backplane::grpc::UpdateByEmOptions*>(value);
-  // @@protoc_insertion_point(field_set_allocated:io.deephaven.proto.backplane.grpc.UpdateByRequest.UpdateByOperation.UpdateByColumn.UpdateBySpec.UpdateByEms.options)
-}
-
-// .io.deephaven.proto.backplane.grpc.UpdateByWindowScale window_scale = 2;
-inline bool UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByEms::has_window_scale() const {
-  bool value = (_impl_._has_bits_[0] & 0x00000002u) != 0;
-  PROTOBUF_ASSUME(!value || _impl_.window_scale_ != nullptr);
-  return value;
-}
-inline void UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByEms::clear_window_scale() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  if (_impl_.window_scale_ != nullptr) _impl_.window_scale_->Clear();
-  _impl_._has_bits_[0] &= ~0x00000002u;
-}
-inline const ::io::deephaven::proto::backplane::grpc::UpdateByWindowScale& UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByEms::_internal_window_scale() const {
-  PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race);
-  const ::io::deephaven::proto::backplane::grpc::UpdateByWindowScale* p = _impl_.window_scale_;
-  return p != nullptr ? *p : reinterpret_cast<const ::io::deephaven::proto::backplane::grpc::UpdateByWindowScale&>(::io::deephaven::proto::backplane::grpc::_UpdateByWindowScale_default_instance_);
-}
-inline const ::io::deephaven::proto::backplane::grpc::UpdateByWindowScale& UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByEms::window_scale() const ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  // @@protoc_insertion_point(field_get:io.deephaven.proto.backplane.grpc.UpdateByRequest.UpdateByOperation.UpdateByColumn.UpdateBySpec.UpdateByEms.window_scale)
-  return _internal_window_scale();
-}
-inline void UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByEms::unsafe_arena_set_allocated_window_scale(::io::deephaven::proto::backplane::grpc::UpdateByWindowScale* value) {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  if (GetArena() == nullptr) {
-    delete reinterpret_cast<::google::protobuf::MessageLite*>(_impl_.window_scale_);
-  }
-  _impl_.window_scale_ = reinterpret_cast<::io::deephaven::proto::backplane::grpc::UpdateByWindowScale*>(value);
-  if (value != nullptr) {
-    _impl_._has_bits_[0] |= 0x00000002u;
-  } else {
-    _impl_._has_bits_[0] &= ~0x00000002u;
-  }
-  // @@protoc_insertion_point(field_unsafe_arena_set_allocated:io.deephaven.proto.backplane.grpc.UpdateByRequest.UpdateByOperation.UpdateByColumn.UpdateBySpec.UpdateByEms.window_scale)
-}
-inline ::io::deephaven::proto::backplane::grpc::UpdateByWindowScale* UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByEms::release_window_scale() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-
-  _impl_._has_bits_[0] &= ~0x00000002u;
-  ::io::deephaven::proto::backplane::grpc::UpdateByWindowScale* released = _impl_.window_scale_;
-  _impl_.window_scale_ = nullptr;
-#ifdef PROTOBUF_FORCE_COPY_IN_RELEASE
-  auto* old = reinterpret_cast<::google::protobuf::MessageLite*>(released);
-  released = ::google::protobuf::internal::DuplicateIfNonNull(released);
-  if (GetArena() == nullptr) {
-    delete old;
-  }
-#else   // PROTOBUF_FORCE_COPY_IN_RELEASE
-  if (GetArena() != nullptr) {
-    released = ::google::protobuf::internal::DuplicateIfNonNull(released);
-  }
-#endif  // !PROTOBUF_FORCE_COPY_IN_RELEASE
-  return released;
-}
-inline ::io::deephaven::proto::backplane::grpc::UpdateByWindowScale* UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByEms::unsafe_arena_release_window_scale() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  // @@protoc_insertion_point(field_release:io.deephaven.proto.backplane.grpc.UpdateByRequest.UpdateByOperation.UpdateByColumn.UpdateBySpec.UpdateByEms.window_scale)
-
-  _impl_._has_bits_[0] &= ~0x00000002u;
-  ::io::deephaven::proto::backplane::grpc::UpdateByWindowScale* temp = _impl_.window_scale_;
-  _impl_.window_scale_ = nullptr;
-  return temp;
-}
-inline ::io::deephaven::proto::backplane::grpc::UpdateByWindowScale* UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByEms::_internal_mutable_window_scale() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  _impl_._has_bits_[0] |= 0x00000002u;
-  if (_impl_.window_scale_ == nullptr) {
-    auto* p = CreateMaybeMessage<::io::deephaven::proto::backplane::grpc::UpdateByWindowScale>(GetArena());
-    _impl_.window_scale_ = reinterpret_cast<::io::deephaven::proto::backplane::grpc::UpdateByWindowScale*>(p);
-  }
-  return _impl_.window_scale_;
-}
-inline ::io::deephaven::proto::backplane::grpc::UpdateByWindowScale* UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByEms::mutable_window_scale() ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  ::io::deephaven::proto::backplane::grpc::UpdateByWindowScale* _msg = _internal_mutable_window_scale();
-  // @@protoc_insertion_point(field_mutable:io.deephaven.proto.backplane.grpc.UpdateByRequest.UpdateByOperation.UpdateByColumn.UpdateBySpec.UpdateByEms.window_scale)
-  return _msg;
-}
-inline void UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByEms::set_allocated_window_scale(::io::deephaven::proto::backplane::grpc::UpdateByWindowScale* value) {
-  ::google::protobuf::Arena* message_arena = GetArena();
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  if (message_arena == nullptr) {
-    delete reinterpret_cast<::io::deephaven::proto::backplane::grpc::UpdateByWindowScale*>(_impl_.window_scale_);
-  }
-
-  if (value != nullptr) {
-    ::google::protobuf::Arena* submessage_arena = reinterpret_cast<::io::deephaven::proto::backplane::grpc::UpdateByWindowScale*>(value)->GetArena();
-    if (message_arena != submessage_arena) {
-      value = ::google::protobuf::internal::GetOwnedMessage(message_arena, value, submessage_arena);
-    }
-    _impl_._has_bits_[0] |= 0x00000002u;
-  } else {
-    _impl_._has_bits_[0] &= ~0x00000002u;
-  }
-
-  _impl_.window_scale_ = reinterpret_cast<::io::deephaven::proto::backplane::grpc::UpdateByWindowScale*>(value);
-  // @@protoc_insertion_point(field_set_allocated:io.deephaven.proto.backplane.grpc.UpdateByRequest.UpdateByOperation.UpdateByColumn.UpdateBySpec.UpdateByEms.window_scale)
-}
-
-// -------------------------------------------------------------------
-
-// UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByEmMin
-
-// .io.deephaven.proto.backplane.grpc.UpdateByEmOptions options = 1;
-inline bool UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByEmMin::has_options() const {
-  bool value = (_impl_._has_bits_[0] & 0x00000001u) != 0;
-  PROTOBUF_ASSUME(!value || _impl_.options_ != nullptr);
-  return value;
-}
-inline void UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByEmMin::clear_options() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  if (_impl_.options_ != nullptr) _impl_.options_->Clear();
-  _impl_._has_bits_[0] &= ~0x00000001u;
-}
-inline const ::io::deephaven::proto::backplane::grpc::UpdateByEmOptions& UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByEmMin::_internal_options() const {
-  PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race);
-  const ::io::deephaven::proto::backplane::grpc::UpdateByEmOptions* p = _impl_.options_;
-  return p != nullptr ? *p : reinterpret_cast<const ::io::deephaven::proto::backplane::grpc::UpdateByEmOptions&>(::io::deephaven::proto::backplane::grpc::_UpdateByEmOptions_default_instance_);
-}
-inline const ::io::deephaven::proto::backplane::grpc::UpdateByEmOptions& UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByEmMin::options() const ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  // @@protoc_insertion_point(field_get:io.deephaven.proto.backplane.grpc.UpdateByRequest.UpdateByOperation.UpdateByColumn.UpdateBySpec.UpdateByEmMin.options)
-  return _internal_options();
-}
-inline void UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByEmMin::unsafe_arena_set_allocated_options(::io::deephaven::proto::backplane::grpc::UpdateByEmOptions* value) {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  if (GetArena() == nullptr) {
-    delete reinterpret_cast<::google::protobuf::MessageLite*>(_impl_.options_);
-  }
-  _impl_.options_ = reinterpret_cast<::io::deephaven::proto::backplane::grpc::UpdateByEmOptions*>(value);
-  if (value != nullptr) {
-    _impl_._has_bits_[0] |= 0x00000001u;
-  } else {
-    _impl_._has_bits_[0] &= ~0x00000001u;
-  }
-  // @@protoc_insertion_point(field_unsafe_arena_set_allocated:io.deephaven.proto.backplane.grpc.UpdateByRequest.UpdateByOperation.UpdateByColumn.UpdateBySpec.UpdateByEmMin.options)
-}
-inline ::io::deephaven::proto::backplane::grpc::UpdateByEmOptions* UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByEmMin::release_options() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-
-  _impl_._has_bits_[0] &= ~0x00000001u;
-  ::io::deephaven::proto::backplane::grpc::UpdateByEmOptions* released = _impl_.options_;
-  _impl_.options_ = nullptr;
-#ifdef PROTOBUF_FORCE_COPY_IN_RELEASE
-  auto* old = reinterpret_cast<::google::protobuf::MessageLite*>(released);
-  released = ::google::protobuf::internal::DuplicateIfNonNull(released);
-  if (GetArena() == nullptr) {
-    delete old;
-  }
-#else   // PROTOBUF_FORCE_COPY_IN_RELEASE
-  if (GetArena() != nullptr) {
-    released = ::google::protobuf::internal::DuplicateIfNonNull(released);
-  }
-#endif  // !PROTOBUF_FORCE_COPY_IN_RELEASE
-  return released;
-}
-inline ::io::deephaven::proto::backplane::grpc::UpdateByEmOptions* UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByEmMin::unsafe_arena_release_options() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  // @@protoc_insertion_point(field_release:io.deephaven.proto.backplane.grpc.UpdateByRequest.UpdateByOperation.UpdateByColumn.UpdateBySpec.UpdateByEmMin.options)
-
-  _impl_._has_bits_[0] &= ~0x00000001u;
-  ::io::deephaven::proto::backplane::grpc::UpdateByEmOptions* temp = _impl_.options_;
-  _impl_.options_ = nullptr;
-  return temp;
-}
-inline ::io::deephaven::proto::backplane::grpc::UpdateByEmOptions* UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByEmMin::_internal_mutable_options() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  _impl_._has_bits_[0] |= 0x00000001u;
-  if (_impl_.options_ == nullptr) {
-    auto* p = CreateMaybeMessage<::io::deephaven::proto::backplane::grpc::UpdateByEmOptions>(GetArena());
-    _impl_.options_ = reinterpret_cast<::io::deephaven::proto::backplane::grpc::UpdateByEmOptions*>(p);
-  }
-  return _impl_.options_;
-}
-inline ::io::deephaven::proto::backplane::grpc::UpdateByEmOptions* UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByEmMin::mutable_options() ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  ::io::deephaven::proto::backplane::grpc::UpdateByEmOptions* _msg = _internal_mutable_options();
-  // @@protoc_insertion_point(field_mutable:io.deephaven.proto.backplane.grpc.UpdateByRequest.UpdateByOperation.UpdateByColumn.UpdateBySpec.UpdateByEmMin.options)
-  return _msg;
-}
-inline void UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByEmMin::set_allocated_options(::io::deephaven::proto::backplane::grpc::UpdateByEmOptions* value) {
-  ::google::protobuf::Arena* message_arena = GetArena();
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  if (message_arena == nullptr) {
-    delete reinterpret_cast<::io::deephaven::proto::backplane::grpc::UpdateByEmOptions*>(_impl_.options_);
-  }
-
-  if (value != nullptr) {
-    ::google::protobuf::Arena* submessage_arena = reinterpret_cast<::io::deephaven::proto::backplane::grpc::UpdateByEmOptions*>(value)->GetArena();
-    if (message_arena != submessage_arena) {
-      value = ::google::protobuf::internal::GetOwnedMessage(message_arena, value, submessage_arena);
-    }
-    _impl_._has_bits_[0] |= 0x00000001u;
-  } else {
-    _impl_._has_bits_[0] &= ~0x00000001u;
-  }
-
-  _impl_.options_ = reinterpret_cast<::io::deephaven::proto::backplane::grpc::UpdateByEmOptions*>(value);
-  // @@protoc_insertion_point(field_set_allocated:io.deephaven.proto.backplane.grpc.UpdateByRequest.UpdateByOperation.UpdateByColumn.UpdateBySpec.UpdateByEmMin.options)
-}
-
-// .io.deephaven.proto.backplane.grpc.UpdateByWindowScale window_scale = 2;
-inline bool UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByEmMin::has_window_scale() const {
-  bool value = (_impl_._has_bits_[0] & 0x00000002u) != 0;
-  PROTOBUF_ASSUME(!value || _impl_.window_scale_ != nullptr);
-  return value;
-}
-inline void UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByEmMin::clear_window_scale() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  if (_impl_.window_scale_ != nullptr) _impl_.window_scale_->Clear();
-  _impl_._has_bits_[0] &= ~0x00000002u;
-}
-inline const ::io::deephaven::proto::backplane::grpc::UpdateByWindowScale& UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByEmMin::_internal_window_scale() const {
-  PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race);
-  const ::io::deephaven::proto::backplane::grpc::UpdateByWindowScale* p = _impl_.window_scale_;
-  return p != nullptr ? *p : reinterpret_cast<const ::io::deephaven::proto::backplane::grpc::UpdateByWindowScale&>(::io::deephaven::proto::backplane::grpc::_UpdateByWindowScale_default_instance_);
-}
-inline const ::io::deephaven::proto::backplane::grpc::UpdateByWindowScale& UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByEmMin::window_scale() const ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  // @@protoc_insertion_point(field_get:io.deephaven.proto.backplane.grpc.UpdateByRequest.UpdateByOperation.UpdateByColumn.UpdateBySpec.UpdateByEmMin.window_scale)
-  return _internal_window_scale();
-}
-inline void UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByEmMin::unsafe_arena_set_allocated_window_scale(::io::deephaven::proto::backplane::grpc::UpdateByWindowScale* value) {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  if (GetArena() == nullptr) {
-    delete reinterpret_cast<::google::protobuf::MessageLite*>(_impl_.window_scale_);
-  }
-  _impl_.window_scale_ = reinterpret_cast<::io::deephaven::proto::backplane::grpc::UpdateByWindowScale*>(value);
-  if (value != nullptr) {
-    _impl_._has_bits_[0] |= 0x00000002u;
-  } else {
-    _impl_._has_bits_[0] &= ~0x00000002u;
-  }
-  // @@protoc_insertion_point(field_unsafe_arena_set_allocated:io.deephaven.proto.backplane.grpc.UpdateByRequest.UpdateByOperation.UpdateByColumn.UpdateBySpec.UpdateByEmMin.window_scale)
-}
-inline ::io::deephaven::proto::backplane::grpc::UpdateByWindowScale* UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByEmMin::release_window_scale() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-
-  _impl_._has_bits_[0] &= ~0x00000002u;
-  ::io::deephaven::proto::backplane::grpc::UpdateByWindowScale* released = _impl_.window_scale_;
-  _impl_.window_scale_ = nullptr;
-#ifdef PROTOBUF_FORCE_COPY_IN_RELEASE
-  auto* old = reinterpret_cast<::google::protobuf::MessageLite*>(released);
-  released = ::google::protobuf::internal::DuplicateIfNonNull(released);
-  if (GetArena() == nullptr) {
-    delete old;
-  }
-#else   // PROTOBUF_FORCE_COPY_IN_RELEASE
-  if (GetArena() != nullptr) {
-    released = ::google::protobuf::internal::DuplicateIfNonNull(released);
-  }
-#endif  // !PROTOBUF_FORCE_COPY_IN_RELEASE
-  return released;
-}
-inline ::io::deephaven::proto::backplane::grpc::UpdateByWindowScale* UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByEmMin::unsafe_arena_release_window_scale() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  // @@protoc_insertion_point(field_release:io.deephaven.proto.backplane.grpc.UpdateByRequest.UpdateByOperation.UpdateByColumn.UpdateBySpec.UpdateByEmMin.window_scale)
-
-  _impl_._has_bits_[0] &= ~0x00000002u;
-  ::io::deephaven::proto::backplane::grpc::UpdateByWindowScale* temp = _impl_.window_scale_;
-  _impl_.window_scale_ = nullptr;
-  return temp;
-}
-inline ::io::deephaven::proto::backplane::grpc::UpdateByWindowScale* UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByEmMin::_internal_mutable_window_scale() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  _impl_._has_bits_[0] |= 0x00000002u;
-  if (_impl_.window_scale_ == nullptr) {
-    auto* p = CreateMaybeMessage<::io::deephaven::proto::backplane::grpc::UpdateByWindowScale>(GetArena());
-    _impl_.window_scale_ = reinterpret_cast<::io::deephaven::proto::backplane::grpc::UpdateByWindowScale*>(p);
-  }
-  return _impl_.window_scale_;
-}
-inline ::io::deephaven::proto::backplane::grpc::UpdateByWindowScale* UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByEmMin::mutable_window_scale() ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  ::io::deephaven::proto::backplane::grpc::UpdateByWindowScale* _msg = _internal_mutable_window_scale();
-  // @@protoc_insertion_point(field_mutable:io.deephaven.proto.backplane.grpc.UpdateByRequest.UpdateByOperation.UpdateByColumn.UpdateBySpec.UpdateByEmMin.window_scale)
-  return _msg;
-}
-inline void UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByEmMin::set_allocated_window_scale(::io::deephaven::proto::backplane::grpc::UpdateByWindowScale* value) {
-  ::google::protobuf::Arena* message_arena = GetArena();
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  if (message_arena == nullptr) {
-    delete reinterpret_cast<::io::deephaven::proto::backplane::grpc::UpdateByWindowScale*>(_impl_.window_scale_);
-  }
-
-  if (value != nullptr) {
-    ::google::protobuf::Arena* submessage_arena = reinterpret_cast<::io::deephaven::proto::backplane::grpc::UpdateByWindowScale*>(value)->GetArena();
-    if (message_arena != submessage_arena) {
-      value = ::google::protobuf::internal::GetOwnedMessage(message_arena, value, submessage_arena);
-    }
-    _impl_._has_bits_[0] |= 0x00000002u;
-  } else {
-    _impl_._has_bits_[0] &= ~0x00000002u;
-  }
-
-  _impl_.window_scale_ = reinterpret_cast<::io::deephaven::proto::backplane::grpc::UpdateByWindowScale*>(value);
-  // @@protoc_insertion_point(field_set_allocated:io.deephaven.proto.backplane.grpc.UpdateByRequest.UpdateByOperation.UpdateByColumn.UpdateBySpec.UpdateByEmMin.window_scale)
-}
-
-// -------------------------------------------------------------------
-
-// UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByEmMax
-
-// .io.deephaven.proto.backplane.grpc.UpdateByEmOptions options = 1;
-inline bool UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByEmMax::has_options() const {
-  bool value = (_impl_._has_bits_[0] & 0x00000001u) != 0;
-  PROTOBUF_ASSUME(!value || _impl_.options_ != nullptr);
-  return value;
-}
-inline void UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByEmMax::clear_options() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  if (_impl_.options_ != nullptr) _impl_.options_->Clear();
-  _impl_._has_bits_[0] &= ~0x00000001u;
-}
-inline const ::io::deephaven::proto::backplane::grpc::UpdateByEmOptions& UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByEmMax::_internal_options() const {
-  PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race);
-  const ::io::deephaven::proto::backplane::grpc::UpdateByEmOptions* p = _impl_.options_;
-  return p != nullptr ? *p : reinterpret_cast<const ::io::deephaven::proto::backplane::grpc::UpdateByEmOptions&>(::io::deephaven::proto::backplane::grpc::_UpdateByEmOptions_default_instance_);
-}
-inline const ::io::deephaven::proto::backplane::grpc::UpdateByEmOptions& UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByEmMax::options() const ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  // @@protoc_insertion_point(field_get:io.deephaven.proto.backplane.grpc.UpdateByRequest.UpdateByOperation.UpdateByColumn.UpdateBySpec.UpdateByEmMax.options)
-  return _internal_options();
-}
-inline void UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByEmMax::unsafe_arena_set_allocated_options(::io::deephaven::proto::backplane::grpc::UpdateByEmOptions* value) {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  if (GetArena() == nullptr) {
-    delete reinterpret_cast<::google::protobuf::MessageLite*>(_impl_.options_);
-  }
-  _impl_.options_ = reinterpret_cast<::io::deephaven::proto::backplane::grpc::UpdateByEmOptions*>(value);
-  if (value != nullptr) {
-    _impl_._has_bits_[0] |= 0x00000001u;
-  } else {
-    _impl_._has_bits_[0] &= ~0x00000001u;
-  }
-  // @@protoc_insertion_point(field_unsafe_arena_set_allocated:io.deephaven.proto.backplane.grpc.UpdateByRequest.UpdateByOperation.UpdateByColumn.UpdateBySpec.UpdateByEmMax.options)
-}
-inline ::io::deephaven::proto::backplane::grpc::UpdateByEmOptions* UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByEmMax::release_options() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-
-  _impl_._has_bits_[0] &= ~0x00000001u;
-  ::io::deephaven::proto::backplane::grpc::UpdateByEmOptions* released = _impl_.options_;
-  _impl_.options_ = nullptr;
-#ifdef PROTOBUF_FORCE_COPY_IN_RELEASE
-  auto* old = reinterpret_cast<::google::protobuf::MessageLite*>(released);
-  released = ::google::protobuf::internal::DuplicateIfNonNull(released);
-  if (GetArena() == nullptr) {
-    delete old;
-  }
-#else   // PROTOBUF_FORCE_COPY_IN_RELEASE
-  if (GetArena() != nullptr) {
-    released = ::google::protobuf::internal::DuplicateIfNonNull(released);
-  }
-#endif  // !PROTOBUF_FORCE_COPY_IN_RELEASE
-  return released;
-}
-inline ::io::deephaven::proto::backplane::grpc::UpdateByEmOptions* UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByEmMax::unsafe_arena_release_options() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  // @@protoc_insertion_point(field_release:io.deephaven.proto.backplane.grpc.UpdateByRequest.UpdateByOperation.UpdateByColumn.UpdateBySpec.UpdateByEmMax.options)
-
-  _impl_._has_bits_[0] &= ~0x00000001u;
-  ::io::deephaven::proto::backplane::grpc::UpdateByEmOptions* temp = _impl_.options_;
-  _impl_.options_ = nullptr;
-  return temp;
-}
-inline ::io::deephaven::proto::backplane::grpc::UpdateByEmOptions* UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByEmMax::_internal_mutable_options() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  _impl_._has_bits_[0] |= 0x00000001u;
-  if (_impl_.options_ == nullptr) {
-    auto* p = CreateMaybeMessage<::io::deephaven::proto::backplane::grpc::UpdateByEmOptions>(GetArena());
-    _impl_.options_ = reinterpret_cast<::io::deephaven::proto::backplane::grpc::UpdateByEmOptions*>(p);
-  }
-  return _impl_.options_;
-}
-inline ::io::deephaven::proto::backplane::grpc::UpdateByEmOptions* UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByEmMax::mutable_options() ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  ::io::deephaven::proto::backplane::grpc::UpdateByEmOptions* _msg = _internal_mutable_options();
-  // @@protoc_insertion_point(field_mutable:io.deephaven.proto.backplane.grpc.UpdateByRequest.UpdateByOperation.UpdateByColumn.UpdateBySpec.UpdateByEmMax.options)
-  return _msg;
-}
-inline void UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByEmMax::set_allocated_options(::io::deephaven::proto::backplane::grpc::UpdateByEmOptions* value) {
-  ::google::protobuf::Arena* message_arena = GetArena();
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  if (message_arena == nullptr) {
-    delete reinterpret_cast<::io::deephaven::proto::backplane::grpc::UpdateByEmOptions*>(_impl_.options_);
-  }
-
-  if (value != nullptr) {
-    ::google::protobuf::Arena* submessage_arena = reinterpret_cast<::io::deephaven::proto::backplane::grpc::UpdateByEmOptions*>(value)->GetArena();
-    if (message_arena != submessage_arena) {
-      value = ::google::protobuf::internal::GetOwnedMessage(message_arena, value, submessage_arena);
-    }
-    _impl_._has_bits_[0] |= 0x00000001u;
-  } else {
-    _impl_._has_bits_[0] &= ~0x00000001u;
-  }
-
-  _impl_.options_ = reinterpret_cast<::io::deephaven::proto::backplane::grpc::UpdateByEmOptions*>(value);
-  // @@protoc_insertion_point(field_set_allocated:io.deephaven.proto.backplane.grpc.UpdateByRequest.UpdateByOperation.UpdateByColumn.UpdateBySpec.UpdateByEmMax.options)
-}
-
-// .io.deephaven.proto.backplane.grpc.UpdateByWindowScale window_scale = 2;
-inline bool UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByEmMax::has_window_scale() const {
-  bool value = (_impl_._has_bits_[0] & 0x00000002u) != 0;
-  PROTOBUF_ASSUME(!value || _impl_.window_scale_ != nullptr);
-  return value;
-}
-inline void UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByEmMax::clear_window_scale() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  if (_impl_.window_scale_ != nullptr) _impl_.window_scale_->Clear();
-  _impl_._has_bits_[0] &= ~0x00000002u;
-}
-inline const ::io::deephaven::proto::backplane::grpc::UpdateByWindowScale& UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByEmMax::_internal_window_scale() const {
-  PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race);
-  const ::io::deephaven::proto::backplane::grpc::UpdateByWindowScale* p = _impl_.window_scale_;
-  return p != nullptr ? *p : reinterpret_cast<const ::io::deephaven::proto::backplane::grpc::UpdateByWindowScale&>(::io::deephaven::proto::backplane::grpc::_UpdateByWindowScale_default_instance_);
-}
-inline const ::io::deephaven::proto::backplane::grpc::UpdateByWindowScale& UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByEmMax::window_scale() const ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  // @@protoc_insertion_point(field_get:io.deephaven.proto.backplane.grpc.UpdateByRequest.UpdateByOperation.UpdateByColumn.UpdateBySpec.UpdateByEmMax.window_scale)
-  return _internal_window_scale();
-}
-inline void UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByEmMax::unsafe_arena_set_allocated_window_scale(::io::deephaven::proto::backplane::grpc::UpdateByWindowScale* value) {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  if (GetArena() == nullptr) {
-    delete reinterpret_cast<::google::protobuf::MessageLite*>(_impl_.window_scale_);
-  }
-  _impl_.window_scale_ = reinterpret_cast<::io::deephaven::proto::backplane::grpc::UpdateByWindowScale*>(value);
-  if (value != nullptr) {
-    _impl_._has_bits_[0] |= 0x00000002u;
-  } else {
-    _impl_._has_bits_[0] &= ~0x00000002u;
-  }
-  // @@protoc_insertion_point(field_unsafe_arena_set_allocated:io.deephaven.proto.backplane.grpc.UpdateByRequest.UpdateByOperation.UpdateByColumn.UpdateBySpec.UpdateByEmMax.window_scale)
-}
-inline ::io::deephaven::proto::backplane::grpc::UpdateByWindowScale* UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByEmMax::release_window_scale() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-
-  _impl_._has_bits_[0] &= ~0x00000002u;
-  ::io::deephaven::proto::backplane::grpc::UpdateByWindowScale* released = _impl_.window_scale_;
-  _impl_.window_scale_ = nullptr;
-#ifdef PROTOBUF_FORCE_COPY_IN_RELEASE
-  auto* old = reinterpret_cast<::google::protobuf::MessageLite*>(released);
-  released = ::google::protobuf::internal::DuplicateIfNonNull(released);
-  if (GetArena() == nullptr) {
-    delete old;
-  }
-#else   // PROTOBUF_FORCE_COPY_IN_RELEASE
-  if (GetArena() != nullptr) {
-    released = ::google::protobuf::internal::DuplicateIfNonNull(released);
-  }
-#endif  // !PROTOBUF_FORCE_COPY_IN_RELEASE
-  return released;
-}
-inline ::io::deephaven::proto::backplane::grpc::UpdateByWindowScale* UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByEmMax::unsafe_arena_release_window_scale() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  // @@protoc_insertion_point(field_release:io.deephaven.proto.backplane.grpc.UpdateByRequest.UpdateByOperation.UpdateByColumn.UpdateBySpec.UpdateByEmMax.window_scale)
-
-  _impl_._has_bits_[0] &= ~0x00000002u;
-  ::io::deephaven::proto::backplane::grpc::UpdateByWindowScale* temp = _impl_.window_scale_;
-  _impl_.window_scale_ = nullptr;
-  return temp;
-}
-inline ::io::deephaven::proto::backplane::grpc::UpdateByWindowScale* UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByEmMax::_internal_mutable_window_scale() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  _impl_._has_bits_[0] |= 0x00000002u;
-  if (_impl_.window_scale_ == nullptr) {
-    auto* p = CreateMaybeMessage<::io::deephaven::proto::backplane::grpc::UpdateByWindowScale>(GetArena());
-    _impl_.window_scale_ = reinterpret_cast<::io::deephaven::proto::backplane::grpc::UpdateByWindowScale*>(p);
-  }
-  return _impl_.window_scale_;
-}
-inline ::io::deephaven::proto::backplane::grpc::UpdateByWindowScale* UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByEmMax::mutable_window_scale() ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  ::io::deephaven::proto::backplane::grpc::UpdateByWindowScale* _msg = _internal_mutable_window_scale();
-  // @@protoc_insertion_point(field_mutable:io.deephaven.proto.backplane.grpc.UpdateByRequest.UpdateByOperation.UpdateByColumn.UpdateBySpec.UpdateByEmMax.window_scale)
-  return _msg;
-}
-inline void UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByEmMax::set_allocated_window_scale(::io::deephaven::proto::backplane::grpc::UpdateByWindowScale* value) {
-  ::google::protobuf::Arena* message_arena = GetArena();
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  if (message_arena == nullptr) {
-    delete reinterpret_cast<::io::deephaven::proto::backplane::grpc::UpdateByWindowScale*>(_impl_.window_scale_);
-  }
-
-  if (value != nullptr) {
-    ::google::protobuf::Arena* submessage_arena = reinterpret_cast<::io::deephaven::proto::backplane::grpc::UpdateByWindowScale*>(value)->GetArena();
-    if (message_arena != submessage_arena) {
-      value = ::google::protobuf::internal::GetOwnedMessage(message_arena, value, submessage_arena);
-    }
-    _impl_._has_bits_[0] |= 0x00000002u;
-  } else {
-    _impl_._has_bits_[0] &= ~0x00000002u;
-  }
-
-  _impl_.window_scale_ = reinterpret_cast<::io::deephaven::proto::backplane::grpc::UpdateByWindowScale*>(value);
-  // @@protoc_insertion_point(field_set_allocated:io.deephaven.proto.backplane.grpc.UpdateByRequest.UpdateByOperation.UpdateByColumn.UpdateBySpec.UpdateByEmMax.window_scale)
-}
-
-// -------------------------------------------------------------------
-
-// UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByEmStd
-
-// .io.deephaven.proto.backplane.grpc.UpdateByEmOptions options = 1;
-inline bool UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByEmStd::has_options() const {
-  bool value = (_impl_._has_bits_[0] & 0x00000001u) != 0;
-  PROTOBUF_ASSUME(!value || _impl_.options_ != nullptr);
-  return value;
-}
-inline void UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByEmStd::clear_options() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  if (_impl_.options_ != nullptr) _impl_.options_->Clear();
-  _impl_._has_bits_[0] &= ~0x00000001u;
-}
-inline const ::io::deephaven::proto::backplane::grpc::UpdateByEmOptions& UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByEmStd::_internal_options() const {
-  PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race);
-  const ::io::deephaven::proto::backplane::grpc::UpdateByEmOptions* p = _impl_.options_;
-  return p != nullptr ? *p : reinterpret_cast<const ::io::deephaven::proto::backplane::grpc::UpdateByEmOptions&>(::io::deephaven::proto::backplane::grpc::_UpdateByEmOptions_default_instance_);
-}
-inline const ::io::deephaven::proto::backplane::grpc::UpdateByEmOptions& UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByEmStd::options() const ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  // @@protoc_insertion_point(field_get:io.deephaven.proto.backplane.grpc.UpdateByRequest.UpdateByOperation.UpdateByColumn.UpdateBySpec.UpdateByEmStd.options)
-  return _internal_options();
-}
-inline void UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByEmStd::unsafe_arena_set_allocated_options(::io::deephaven::proto::backplane::grpc::UpdateByEmOptions* value) {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  if (GetArena() == nullptr) {
-    delete reinterpret_cast<::google::protobuf::MessageLite*>(_impl_.options_);
-  }
-  _impl_.options_ = reinterpret_cast<::io::deephaven::proto::backplane::grpc::UpdateByEmOptions*>(value);
-  if (value != nullptr) {
-    _impl_._has_bits_[0] |= 0x00000001u;
-  } else {
-    _impl_._has_bits_[0] &= ~0x00000001u;
-  }
-  // @@protoc_insertion_point(field_unsafe_arena_set_allocated:io.deephaven.proto.backplane.grpc.UpdateByRequest.UpdateByOperation.UpdateByColumn.UpdateBySpec.UpdateByEmStd.options)
-}
-inline ::io::deephaven::proto::backplane::grpc::UpdateByEmOptions* UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByEmStd::release_options() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-
-  _impl_._has_bits_[0] &= ~0x00000001u;
-  ::io::deephaven::proto::backplane::grpc::UpdateByEmOptions* released = _impl_.options_;
-  _impl_.options_ = nullptr;
-#ifdef PROTOBUF_FORCE_COPY_IN_RELEASE
-  auto* old = reinterpret_cast<::google::protobuf::MessageLite*>(released);
-  released = ::google::protobuf::internal::DuplicateIfNonNull(released);
-  if (GetArena() == nullptr) {
-    delete old;
-  }
-#else   // PROTOBUF_FORCE_COPY_IN_RELEASE
-  if (GetArena() != nullptr) {
-    released = ::google::protobuf::internal::DuplicateIfNonNull(released);
-  }
-#endif  // !PROTOBUF_FORCE_COPY_IN_RELEASE
-  return released;
-}
-inline ::io::deephaven::proto::backplane::grpc::UpdateByEmOptions* UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByEmStd::unsafe_arena_release_options() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  // @@protoc_insertion_point(field_release:io.deephaven.proto.backplane.grpc.UpdateByRequest.UpdateByOperation.UpdateByColumn.UpdateBySpec.UpdateByEmStd.options)
-
-  _impl_._has_bits_[0] &= ~0x00000001u;
-  ::io::deephaven::proto::backplane::grpc::UpdateByEmOptions* temp = _impl_.options_;
-  _impl_.options_ = nullptr;
-  return temp;
-}
-inline ::io::deephaven::proto::backplane::grpc::UpdateByEmOptions* UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByEmStd::_internal_mutable_options() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  _impl_._has_bits_[0] |= 0x00000001u;
-  if (_impl_.options_ == nullptr) {
-    auto* p = CreateMaybeMessage<::io::deephaven::proto::backplane::grpc::UpdateByEmOptions>(GetArena());
-    _impl_.options_ = reinterpret_cast<::io::deephaven::proto::backplane::grpc::UpdateByEmOptions*>(p);
-  }
-  return _impl_.options_;
-}
-inline ::io::deephaven::proto::backplane::grpc::UpdateByEmOptions* UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByEmStd::mutable_options() ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  ::io::deephaven::proto::backplane::grpc::UpdateByEmOptions* _msg = _internal_mutable_options();
-  // @@protoc_insertion_point(field_mutable:io.deephaven.proto.backplane.grpc.UpdateByRequest.UpdateByOperation.UpdateByColumn.UpdateBySpec.UpdateByEmStd.options)
-  return _msg;
-}
-inline void UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByEmStd::set_allocated_options(::io::deephaven::proto::backplane::grpc::UpdateByEmOptions* value) {
-  ::google::protobuf::Arena* message_arena = GetArena();
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  if (message_arena == nullptr) {
-    delete reinterpret_cast<::io::deephaven::proto::backplane::grpc::UpdateByEmOptions*>(_impl_.options_);
-  }
-
-  if (value != nullptr) {
-    ::google::protobuf::Arena* submessage_arena = reinterpret_cast<::io::deephaven::proto::backplane::grpc::UpdateByEmOptions*>(value)->GetArena();
-    if (message_arena != submessage_arena) {
-      value = ::google::protobuf::internal::GetOwnedMessage(message_arena, value, submessage_arena);
-    }
-    _impl_._has_bits_[0] |= 0x00000001u;
-  } else {
-    _impl_._has_bits_[0] &= ~0x00000001u;
-  }
-
-  _impl_.options_ = reinterpret_cast<::io::deephaven::proto::backplane::grpc::UpdateByEmOptions*>(value);
-  // @@protoc_insertion_point(field_set_allocated:io.deephaven.proto.backplane.grpc.UpdateByRequest.UpdateByOperation.UpdateByColumn.UpdateBySpec.UpdateByEmStd.options)
-}
-
-// .io.deephaven.proto.backplane.grpc.UpdateByWindowScale window_scale = 2;
-inline bool UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByEmStd::has_window_scale() const {
-  bool value = (_impl_._has_bits_[0] & 0x00000002u) != 0;
-  PROTOBUF_ASSUME(!value || _impl_.window_scale_ != nullptr);
-  return value;
-}
-inline void UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByEmStd::clear_window_scale() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  if (_impl_.window_scale_ != nullptr) _impl_.window_scale_->Clear();
-  _impl_._has_bits_[0] &= ~0x00000002u;
-}
-inline const ::io::deephaven::proto::backplane::grpc::UpdateByWindowScale& UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByEmStd::_internal_window_scale() const {
-  PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race);
-  const ::io::deephaven::proto::backplane::grpc::UpdateByWindowScale* p = _impl_.window_scale_;
-  return p != nullptr ? *p : reinterpret_cast<const ::io::deephaven::proto::backplane::grpc::UpdateByWindowScale&>(::io::deephaven::proto::backplane::grpc::_UpdateByWindowScale_default_instance_);
-}
-inline const ::io::deephaven::proto::backplane::grpc::UpdateByWindowScale& UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByEmStd::window_scale() const ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  // @@protoc_insertion_point(field_get:io.deephaven.proto.backplane.grpc.UpdateByRequest.UpdateByOperation.UpdateByColumn.UpdateBySpec.UpdateByEmStd.window_scale)
-  return _internal_window_scale();
-}
-inline void UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByEmStd::unsafe_arena_set_allocated_window_scale(::io::deephaven::proto::backplane::grpc::UpdateByWindowScale* value) {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  if (GetArena() == nullptr) {
-    delete reinterpret_cast<::google::protobuf::MessageLite*>(_impl_.window_scale_);
-  }
-  _impl_.window_scale_ = reinterpret_cast<::io::deephaven::proto::backplane::grpc::UpdateByWindowScale*>(value);
-  if (value != nullptr) {
-    _impl_._has_bits_[0] |= 0x00000002u;
-  } else {
-    _impl_._has_bits_[0] &= ~0x00000002u;
-  }
-  // @@protoc_insertion_point(field_unsafe_arena_set_allocated:io.deephaven.proto.backplane.grpc.UpdateByRequest.UpdateByOperation.UpdateByColumn.UpdateBySpec.UpdateByEmStd.window_scale)
-}
-inline ::io::deephaven::proto::backplane::grpc::UpdateByWindowScale* UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByEmStd::release_window_scale() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-
-  _impl_._has_bits_[0] &= ~0x00000002u;
-  ::io::deephaven::proto::backplane::grpc::UpdateByWindowScale* released = _impl_.window_scale_;
-  _impl_.window_scale_ = nullptr;
-#ifdef PROTOBUF_FORCE_COPY_IN_RELEASE
-  auto* old = reinterpret_cast<::google::protobuf::MessageLite*>(released);
-  released = ::google::protobuf::internal::DuplicateIfNonNull(released);
-  if (GetArena() == nullptr) {
-    delete old;
-  }
-#else   // PROTOBUF_FORCE_COPY_IN_RELEASE
-  if (GetArena() != nullptr) {
-    released = ::google::protobuf::internal::DuplicateIfNonNull(released);
-  }
-#endif  // !PROTOBUF_FORCE_COPY_IN_RELEASE
-  return released;
-}
-inline ::io::deephaven::proto::backplane::grpc::UpdateByWindowScale* UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByEmStd::unsafe_arena_release_window_scale() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  // @@protoc_insertion_point(field_release:io.deephaven.proto.backplane.grpc.UpdateByRequest.UpdateByOperation.UpdateByColumn.UpdateBySpec.UpdateByEmStd.window_scale)
-
-  _impl_._has_bits_[0] &= ~0x00000002u;
-  ::io::deephaven::proto::backplane::grpc::UpdateByWindowScale* temp = _impl_.window_scale_;
-  _impl_.window_scale_ = nullptr;
-  return temp;
-}
-inline ::io::deephaven::proto::backplane::grpc::UpdateByWindowScale* UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByEmStd::_internal_mutable_window_scale() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  _impl_._has_bits_[0] |= 0x00000002u;
-  if (_impl_.window_scale_ == nullptr) {
-    auto* p = CreateMaybeMessage<::io::deephaven::proto::backplane::grpc::UpdateByWindowScale>(GetArena());
-    _impl_.window_scale_ = reinterpret_cast<::io::deephaven::proto::backplane::grpc::UpdateByWindowScale*>(p);
-  }
-  return _impl_.window_scale_;
-}
-inline ::io::deephaven::proto::backplane::grpc::UpdateByWindowScale* UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByEmStd::mutable_window_scale() ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  ::io::deephaven::proto::backplane::grpc::UpdateByWindowScale* _msg = _internal_mutable_window_scale();
-  // @@protoc_insertion_point(field_mutable:io.deephaven.proto.backplane.grpc.UpdateByRequest.UpdateByOperation.UpdateByColumn.UpdateBySpec.UpdateByEmStd.window_scale)
-  return _msg;
-}
-inline void UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByEmStd::set_allocated_window_scale(::io::deephaven::proto::backplane::grpc::UpdateByWindowScale* value) {
-  ::google::protobuf::Arena* message_arena = GetArena();
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  if (message_arena == nullptr) {
-    delete reinterpret_cast<::io::deephaven::proto::backplane::grpc::UpdateByWindowScale*>(_impl_.window_scale_);
-  }
-
-  if (value != nullptr) {
-    ::google::protobuf::Arena* submessage_arena = reinterpret_cast<::io::deephaven::proto::backplane::grpc::UpdateByWindowScale*>(value)->GetArena();
-    if (message_arena != submessage_arena) {
-      value = ::google::protobuf::internal::GetOwnedMessage(message_arena, value, submessage_arena);
-    }
-    _impl_._has_bits_[0] |= 0x00000002u;
-  } else {
-    _impl_._has_bits_[0] &= ~0x00000002u;
-  }
-
-  _impl_.window_scale_ = reinterpret_cast<::io::deephaven::proto::backplane::grpc::UpdateByWindowScale*>(value);
-  // @@protoc_insertion_point(field_set_allocated:io.deephaven.proto.backplane.grpc.UpdateByRequest.UpdateByOperation.UpdateByColumn.UpdateBySpec.UpdateByEmStd.window_scale)
-}
-
-// -------------------------------------------------------------------
-
-// UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByDelta
-
-// .io.deephaven.proto.backplane.grpc.UpdateByDeltaOptions options = 1;
-inline bool UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByDelta::has_options() const {
-  bool value = (_impl_._has_bits_[0] & 0x00000001u) != 0;
-  PROTOBUF_ASSUME(!value || _impl_.options_ != nullptr);
-  return value;
-}
-inline void UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByDelta::clear_options() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  if (_impl_.options_ != nullptr) _impl_.options_->Clear();
-  _impl_._has_bits_[0] &= ~0x00000001u;
-}
-inline const ::io::deephaven::proto::backplane::grpc::UpdateByDeltaOptions& UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByDelta::_internal_options() const {
-  PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race);
-  const ::io::deephaven::proto::backplane::grpc::UpdateByDeltaOptions* p = _impl_.options_;
-  return p != nullptr ? *p : reinterpret_cast<const ::io::deephaven::proto::backplane::grpc::UpdateByDeltaOptions&>(::io::deephaven::proto::backplane::grpc::_UpdateByDeltaOptions_default_instance_);
-}
-inline const ::io::deephaven::proto::backplane::grpc::UpdateByDeltaOptions& UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByDelta::options() const ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  // @@protoc_insertion_point(field_get:io.deephaven.proto.backplane.grpc.UpdateByRequest.UpdateByOperation.UpdateByColumn.UpdateBySpec.UpdateByDelta.options)
-  return _internal_options();
-}
-inline void UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByDelta::unsafe_arena_set_allocated_options(::io::deephaven::proto::backplane::grpc::UpdateByDeltaOptions* value) {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  if (GetArena() == nullptr) {
-    delete reinterpret_cast<::google::protobuf::MessageLite*>(_impl_.options_);
-  }
-  _impl_.options_ = reinterpret_cast<::io::deephaven::proto::backplane::grpc::UpdateByDeltaOptions*>(value);
-  if (value != nullptr) {
-    _impl_._has_bits_[0] |= 0x00000001u;
-  } else {
-    _impl_._has_bits_[0] &= ~0x00000001u;
-  }
-  // @@protoc_insertion_point(field_unsafe_arena_set_allocated:io.deephaven.proto.backplane.grpc.UpdateByRequest.UpdateByOperation.UpdateByColumn.UpdateBySpec.UpdateByDelta.options)
-}
-inline ::io::deephaven::proto::backplane::grpc::UpdateByDeltaOptions* UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByDelta::release_options() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-
-  _impl_._has_bits_[0] &= ~0x00000001u;
-  ::io::deephaven::proto::backplane::grpc::UpdateByDeltaOptions* released = _impl_.options_;
-  _impl_.options_ = nullptr;
-#ifdef PROTOBUF_FORCE_COPY_IN_RELEASE
-  auto* old = reinterpret_cast<::google::protobuf::MessageLite*>(released);
-  released = ::google::protobuf::internal::DuplicateIfNonNull(released);
-  if (GetArena() == nullptr) {
-    delete old;
-  }
-#else   // PROTOBUF_FORCE_COPY_IN_RELEASE
-  if (GetArena() != nullptr) {
-    released = ::google::protobuf::internal::DuplicateIfNonNull(released);
-  }
-#endif  // !PROTOBUF_FORCE_COPY_IN_RELEASE
-  return released;
-}
-inline ::io::deephaven::proto::backplane::grpc::UpdateByDeltaOptions* UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByDelta::unsafe_arena_release_options() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  // @@protoc_insertion_point(field_release:io.deephaven.proto.backplane.grpc.UpdateByRequest.UpdateByOperation.UpdateByColumn.UpdateBySpec.UpdateByDelta.options)
-
-  _impl_._has_bits_[0] &= ~0x00000001u;
-  ::io::deephaven::proto::backplane::grpc::UpdateByDeltaOptions* temp = _impl_.options_;
-  _impl_.options_ = nullptr;
-  return temp;
-}
-inline ::io::deephaven::proto::backplane::grpc::UpdateByDeltaOptions* UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByDelta::_internal_mutable_options() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  _impl_._has_bits_[0] |= 0x00000001u;
-  if (_impl_.options_ == nullptr) {
-    auto* p = CreateMaybeMessage<::io::deephaven::proto::backplane::grpc::UpdateByDeltaOptions>(GetArena());
-    _impl_.options_ = reinterpret_cast<::io::deephaven::proto::backplane::grpc::UpdateByDeltaOptions*>(p);
-  }
-  return _impl_.options_;
-}
-inline ::io::deephaven::proto::backplane::grpc::UpdateByDeltaOptions* UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByDelta::mutable_options() ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  ::io::deephaven::proto::backplane::grpc::UpdateByDeltaOptions* _msg = _internal_mutable_options();
-  // @@protoc_insertion_point(field_mutable:io.deephaven.proto.backplane.grpc.UpdateByRequest.UpdateByOperation.UpdateByColumn.UpdateBySpec.UpdateByDelta.options)
-  return _msg;
-}
-inline void UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByDelta::set_allocated_options(::io::deephaven::proto::backplane::grpc::UpdateByDeltaOptions* value) {
-  ::google::protobuf::Arena* message_arena = GetArena();
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  if (message_arena == nullptr) {
-    delete reinterpret_cast<::io::deephaven::proto::backplane::grpc::UpdateByDeltaOptions*>(_impl_.options_);
-  }
-
-  if (value != nullptr) {
-    ::google::protobuf::Arena* submessage_arena = reinterpret_cast<::io::deephaven::proto::backplane::grpc::UpdateByDeltaOptions*>(value)->GetArena();
-    if (message_arena != submessage_arena) {
-      value = ::google::protobuf::internal::GetOwnedMessage(message_arena, value, submessage_arena);
-    }
-    _impl_._has_bits_[0] |= 0x00000001u;
-  } else {
-    _impl_._has_bits_[0] &= ~0x00000001u;
-  }
-
-  _impl_.options_ = reinterpret_cast<::io::deephaven::proto::backplane::grpc::UpdateByDeltaOptions*>(value);
-  // @@protoc_insertion_point(field_set_allocated:io.deephaven.proto.backplane.grpc.UpdateByRequest.UpdateByOperation.UpdateByColumn.UpdateBySpec.UpdateByDelta.options)
-}
-
-// -------------------------------------------------------------------
-
-// UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingSum
-
-// .io.deephaven.proto.backplane.grpc.UpdateByWindowScale reverse_window_scale = 1;
-inline bool UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingSum::has_reverse_window_scale() const {
-  bool value = (_impl_._has_bits_[0] & 0x00000001u) != 0;
-  PROTOBUF_ASSUME(!value || _impl_.reverse_window_scale_ != nullptr);
-  return value;
-}
-inline void UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingSum::clear_reverse_window_scale() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  if (_impl_.reverse_window_scale_ != nullptr) _impl_.reverse_window_scale_->Clear();
-  _impl_._has_bits_[0] &= ~0x00000001u;
-}
-inline const ::io::deephaven::proto::backplane::grpc::UpdateByWindowScale& UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingSum::_internal_reverse_window_scale() const {
-  PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race);
-  const ::io::deephaven::proto::backplane::grpc::UpdateByWindowScale* p = _impl_.reverse_window_scale_;
-  return p != nullptr ? *p : reinterpret_cast<const ::io::deephaven::proto::backplane::grpc::UpdateByWindowScale&>(::io::deephaven::proto::backplane::grpc::_UpdateByWindowScale_default_instance_);
-}
-inline const ::io::deephaven::proto::backplane::grpc::UpdateByWindowScale& UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingSum::reverse_window_scale() const ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  // @@protoc_insertion_point(field_get:io.deephaven.proto.backplane.grpc.UpdateByRequest.UpdateByOperation.UpdateByColumn.UpdateBySpec.UpdateByRollingSum.reverse_window_scale)
-  return _internal_reverse_window_scale();
-}
-inline void UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingSum::unsafe_arena_set_allocated_reverse_window_scale(::io::deephaven::proto::backplane::grpc::UpdateByWindowScale* value) {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  if (GetArena() == nullptr) {
-    delete reinterpret_cast<::google::protobuf::MessageLite*>(_impl_.reverse_window_scale_);
-  }
-  _impl_.reverse_window_scale_ = reinterpret_cast<::io::deephaven::proto::backplane::grpc::UpdateByWindowScale*>(value);
-  if (value != nullptr) {
-    _impl_._has_bits_[0] |= 0x00000001u;
-  } else {
-    _impl_._has_bits_[0] &= ~0x00000001u;
-  }
-  // @@protoc_insertion_point(field_unsafe_arena_set_allocated:io.deephaven.proto.backplane.grpc.UpdateByRequest.UpdateByOperation.UpdateByColumn.UpdateBySpec.UpdateByRollingSum.reverse_window_scale)
-}
-inline ::io::deephaven::proto::backplane::grpc::UpdateByWindowScale* UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingSum::release_reverse_window_scale() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-
-  _impl_._has_bits_[0] &= ~0x00000001u;
-  ::io::deephaven::proto::backplane::grpc::UpdateByWindowScale* released = _impl_.reverse_window_scale_;
-  _impl_.reverse_window_scale_ = nullptr;
-#ifdef PROTOBUF_FORCE_COPY_IN_RELEASE
-  auto* old = reinterpret_cast<::google::protobuf::MessageLite*>(released);
-  released = ::google::protobuf::internal::DuplicateIfNonNull(released);
-  if (GetArena() == nullptr) {
-    delete old;
-  }
-#else   // PROTOBUF_FORCE_COPY_IN_RELEASE
-  if (GetArena() != nullptr) {
-    released = ::google::protobuf::internal::DuplicateIfNonNull(released);
-  }
-#endif  // !PROTOBUF_FORCE_COPY_IN_RELEASE
-  return released;
-}
-inline ::io::deephaven::proto::backplane::grpc::UpdateByWindowScale* UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingSum::unsafe_arena_release_reverse_window_scale() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  // @@protoc_insertion_point(field_release:io.deephaven.proto.backplane.grpc.UpdateByRequest.UpdateByOperation.UpdateByColumn.UpdateBySpec.UpdateByRollingSum.reverse_window_scale)
-
-  _impl_._has_bits_[0] &= ~0x00000001u;
-  ::io::deephaven::proto::backplane::grpc::UpdateByWindowScale* temp = _impl_.reverse_window_scale_;
-  _impl_.reverse_window_scale_ = nullptr;
-  return temp;
-}
-inline ::io::deephaven::proto::backplane::grpc::UpdateByWindowScale* UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingSum::_internal_mutable_reverse_window_scale() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  _impl_._has_bits_[0] |= 0x00000001u;
-  if (_impl_.reverse_window_scale_ == nullptr) {
-    auto* p = CreateMaybeMessage<::io::deephaven::proto::backplane::grpc::UpdateByWindowScale>(GetArena());
-    _impl_.reverse_window_scale_ = reinterpret_cast<::io::deephaven::proto::backplane::grpc::UpdateByWindowScale*>(p);
-  }
-  return _impl_.reverse_window_scale_;
-}
-inline ::io::deephaven::proto::backplane::grpc::UpdateByWindowScale* UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingSum::mutable_reverse_window_scale() ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  ::io::deephaven::proto::backplane::grpc::UpdateByWindowScale* _msg = _internal_mutable_reverse_window_scale();
-  // @@protoc_insertion_point(field_mutable:io.deephaven.proto.backplane.grpc.UpdateByRequest.UpdateByOperation.UpdateByColumn.UpdateBySpec.UpdateByRollingSum.reverse_window_scale)
-  return _msg;
-}
-inline void UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingSum::set_allocated_reverse_window_scale(::io::deephaven::proto::backplane::grpc::UpdateByWindowScale* value) {
-  ::google::protobuf::Arena* message_arena = GetArena();
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  if (message_arena == nullptr) {
-    delete reinterpret_cast<::io::deephaven::proto::backplane::grpc::UpdateByWindowScale*>(_impl_.reverse_window_scale_);
-  }
-
-  if (value != nullptr) {
-    ::google::protobuf::Arena* submessage_arena = reinterpret_cast<::io::deephaven::proto::backplane::grpc::UpdateByWindowScale*>(value)->GetArena();
-    if (message_arena != submessage_arena) {
-      value = ::google::protobuf::internal::GetOwnedMessage(message_arena, value, submessage_arena);
-    }
-    _impl_._has_bits_[0] |= 0x00000001u;
-  } else {
-    _impl_._has_bits_[0] &= ~0x00000001u;
-  }
-
-  _impl_.reverse_window_scale_ = reinterpret_cast<::io::deephaven::proto::backplane::grpc::UpdateByWindowScale*>(value);
-  // @@protoc_insertion_point(field_set_allocated:io.deephaven.proto.backplane.grpc.UpdateByRequest.UpdateByOperation.UpdateByColumn.UpdateBySpec.UpdateByRollingSum.reverse_window_scale)
-}
-
-// .io.deephaven.proto.backplane.grpc.UpdateByWindowScale forward_window_scale = 2;
-inline bool UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingSum::has_forward_window_scale() const {
-  bool value = (_impl_._has_bits_[0] & 0x00000002u) != 0;
-  PROTOBUF_ASSUME(!value || _impl_.forward_window_scale_ != nullptr);
-  return value;
-}
-inline void UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingSum::clear_forward_window_scale() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  if (_impl_.forward_window_scale_ != nullptr) _impl_.forward_window_scale_->Clear();
-  _impl_._has_bits_[0] &= ~0x00000002u;
-}
-inline const ::io::deephaven::proto::backplane::grpc::UpdateByWindowScale& UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingSum::_internal_forward_window_scale() const {
-  PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race);
-  const ::io::deephaven::proto::backplane::grpc::UpdateByWindowScale* p = _impl_.forward_window_scale_;
-  return p != nullptr ? *p : reinterpret_cast<const ::io::deephaven::proto::backplane::grpc::UpdateByWindowScale&>(::io::deephaven::proto::backplane::grpc::_UpdateByWindowScale_default_instance_);
-}
-inline const ::io::deephaven::proto::backplane::grpc::UpdateByWindowScale& UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingSum::forward_window_scale() const ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  // @@protoc_insertion_point(field_get:io.deephaven.proto.backplane.grpc.UpdateByRequest.UpdateByOperation.UpdateByColumn.UpdateBySpec.UpdateByRollingSum.forward_window_scale)
-  return _internal_forward_window_scale();
-}
-inline void UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingSum::unsafe_arena_set_allocated_forward_window_scale(::io::deephaven::proto::backplane::grpc::UpdateByWindowScale* value) {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  if (GetArena() == nullptr) {
-    delete reinterpret_cast<::google::protobuf::MessageLite*>(_impl_.forward_window_scale_);
-  }
-  _impl_.forward_window_scale_ = reinterpret_cast<::io::deephaven::proto::backplane::grpc::UpdateByWindowScale*>(value);
-  if (value != nullptr) {
-    _impl_._has_bits_[0] |= 0x00000002u;
-  } else {
-    _impl_._has_bits_[0] &= ~0x00000002u;
-  }
-  // @@protoc_insertion_point(field_unsafe_arena_set_allocated:io.deephaven.proto.backplane.grpc.UpdateByRequest.UpdateByOperation.UpdateByColumn.UpdateBySpec.UpdateByRollingSum.forward_window_scale)
-}
-inline ::io::deephaven::proto::backplane::grpc::UpdateByWindowScale* UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingSum::release_forward_window_scale() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-
-  _impl_._has_bits_[0] &= ~0x00000002u;
-  ::io::deephaven::proto::backplane::grpc::UpdateByWindowScale* released = _impl_.forward_window_scale_;
-  _impl_.forward_window_scale_ = nullptr;
-#ifdef PROTOBUF_FORCE_COPY_IN_RELEASE
-  auto* old = reinterpret_cast<::google::protobuf::MessageLite*>(released);
-  released = ::google::protobuf::internal::DuplicateIfNonNull(released);
-  if (GetArena() == nullptr) {
-    delete old;
-  }
-#else   // PROTOBUF_FORCE_COPY_IN_RELEASE
-  if (GetArena() != nullptr) {
-    released = ::google::protobuf::internal::DuplicateIfNonNull(released);
-  }
-#endif  // !PROTOBUF_FORCE_COPY_IN_RELEASE
-  return released;
-}
-inline ::io::deephaven::proto::backplane::grpc::UpdateByWindowScale* UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingSum::unsafe_arena_release_forward_window_scale() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  // @@protoc_insertion_point(field_release:io.deephaven.proto.backplane.grpc.UpdateByRequest.UpdateByOperation.UpdateByColumn.UpdateBySpec.UpdateByRollingSum.forward_window_scale)
-
-  _impl_._has_bits_[0] &= ~0x00000002u;
-  ::io::deephaven::proto::backplane::grpc::UpdateByWindowScale* temp = _impl_.forward_window_scale_;
-  _impl_.forward_window_scale_ = nullptr;
-  return temp;
-}
-inline ::io::deephaven::proto::backplane::grpc::UpdateByWindowScale* UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingSum::_internal_mutable_forward_window_scale() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  _impl_._has_bits_[0] |= 0x00000002u;
-  if (_impl_.forward_window_scale_ == nullptr) {
-    auto* p = CreateMaybeMessage<::io::deephaven::proto::backplane::grpc::UpdateByWindowScale>(GetArena());
-    _impl_.forward_window_scale_ = reinterpret_cast<::io::deephaven::proto::backplane::grpc::UpdateByWindowScale*>(p);
-  }
-  return _impl_.forward_window_scale_;
-}
-inline ::io::deephaven::proto::backplane::grpc::UpdateByWindowScale* UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingSum::mutable_forward_window_scale() ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  ::io::deephaven::proto::backplane::grpc::UpdateByWindowScale* _msg = _internal_mutable_forward_window_scale();
-  // @@protoc_insertion_point(field_mutable:io.deephaven.proto.backplane.grpc.UpdateByRequest.UpdateByOperation.UpdateByColumn.UpdateBySpec.UpdateByRollingSum.forward_window_scale)
-  return _msg;
-}
-inline void UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingSum::set_allocated_forward_window_scale(::io::deephaven::proto::backplane::grpc::UpdateByWindowScale* value) {
-  ::google::protobuf::Arena* message_arena = GetArena();
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  if (message_arena == nullptr) {
-    delete reinterpret_cast<::io::deephaven::proto::backplane::grpc::UpdateByWindowScale*>(_impl_.forward_window_scale_);
-  }
-
-  if (value != nullptr) {
-    ::google::protobuf::Arena* submessage_arena = reinterpret_cast<::io::deephaven::proto::backplane::grpc::UpdateByWindowScale*>(value)->GetArena();
-    if (message_arena != submessage_arena) {
-      value = ::google::protobuf::internal::GetOwnedMessage(message_arena, value, submessage_arena);
-    }
-    _impl_._has_bits_[0] |= 0x00000002u;
-  } else {
-    _impl_._has_bits_[0] &= ~0x00000002u;
-  }
-
-  _impl_.forward_window_scale_ = reinterpret_cast<::io::deephaven::proto::backplane::grpc::UpdateByWindowScale*>(value);
-  // @@protoc_insertion_point(field_set_allocated:io.deephaven.proto.backplane.grpc.UpdateByRequest.UpdateByOperation.UpdateByColumn.UpdateBySpec.UpdateByRollingSum.forward_window_scale)
-}
-
-// -------------------------------------------------------------------
-
-// UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingGroup
-
-// .io.deephaven.proto.backplane.grpc.UpdateByWindowScale reverse_window_scale = 1;
-inline bool UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingGroup::has_reverse_window_scale() const {
-  bool value = (_impl_._has_bits_[0] & 0x00000001u) != 0;
-  PROTOBUF_ASSUME(!value || _impl_.reverse_window_scale_ != nullptr);
-  return value;
-}
-inline void UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingGroup::clear_reverse_window_scale() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  if (_impl_.reverse_window_scale_ != nullptr) _impl_.reverse_window_scale_->Clear();
-  _impl_._has_bits_[0] &= ~0x00000001u;
-}
-inline const ::io::deephaven::proto::backplane::grpc::UpdateByWindowScale& UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingGroup::_internal_reverse_window_scale() const {
-  PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race);
-  const ::io::deephaven::proto::backplane::grpc::UpdateByWindowScale* p = _impl_.reverse_window_scale_;
-  return p != nullptr ? *p : reinterpret_cast<const ::io::deephaven::proto::backplane::grpc::UpdateByWindowScale&>(::io::deephaven::proto::backplane::grpc::_UpdateByWindowScale_default_instance_);
-}
-inline const ::io::deephaven::proto::backplane::grpc::UpdateByWindowScale& UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingGroup::reverse_window_scale() const ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  // @@protoc_insertion_point(field_get:io.deephaven.proto.backplane.grpc.UpdateByRequest.UpdateByOperation.UpdateByColumn.UpdateBySpec.UpdateByRollingGroup.reverse_window_scale)
-  return _internal_reverse_window_scale();
-}
-inline void UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingGroup::unsafe_arena_set_allocated_reverse_window_scale(::io::deephaven::proto::backplane::grpc::UpdateByWindowScale* value) {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  if (GetArena() == nullptr) {
-    delete reinterpret_cast<::google::protobuf::MessageLite*>(_impl_.reverse_window_scale_);
-  }
-  _impl_.reverse_window_scale_ = reinterpret_cast<::io::deephaven::proto::backplane::grpc::UpdateByWindowScale*>(value);
-  if (value != nullptr) {
-    _impl_._has_bits_[0] |= 0x00000001u;
-  } else {
-    _impl_._has_bits_[0] &= ~0x00000001u;
-  }
-  // @@protoc_insertion_point(field_unsafe_arena_set_allocated:io.deephaven.proto.backplane.grpc.UpdateByRequest.UpdateByOperation.UpdateByColumn.UpdateBySpec.UpdateByRollingGroup.reverse_window_scale)
-}
-inline ::io::deephaven::proto::backplane::grpc::UpdateByWindowScale* UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingGroup::release_reverse_window_scale() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-
-  _impl_._has_bits_[0] &= ~0x00000001u;
-  ::io::deephaven::proto::backplane::grpc::UpdateByWindowScale* released = _impl_.reverse_window_scale_;
-  _impl_.reverse_window_scale_ = nullptr;
-#ifdef PROTOBUF_FORCE_COPY_IN_RELEASE
-  auto* old = reinterpret_cast<::google::protobuf::MessageLite*>(released);
-  released = ::google::protobuf::internal::DuplicateIfNonNull(released);
-  if (GetArena() == nullptr) {
-    delete old;
-  }
-#else   // PROTOBUF_FORCE_COPY_IN_RELEASE
-  if (GetArena() != nullptr) {
-    released = ::google::protobuf::internal::DuplicateIfNonNull(released);
-  }
-#endif  // !PROTOBUF_FORCE_COPY_IN_RELEASE
-  return released;
-}
-inline ::io::deephaven::proto::backplane::grpc::UpdateByWindowScale* UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingGroup::unsafe_arena_release_reverse_window_scale() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  // @@protoc_insertion_point(field_release:io.deephaven.proto.backplane.grpc.UpdateByRequest.UpdateByOperation.UpdateByColumn.UpdateBySpec.UpdateByRollingGroup.reverse_window_scale)
-
-  _impl_._has_bits_[0] &= ~0x00000001u;
-  ::io::deephaven::proto::backplane::grpc::UpdateByWindowScale* temp = _impl_.reverse_window_scale_;
-  _impl_.reverse_window_scale_ = nullptr;
-  return temp;
-}
-inline ::io::deephaven::proto::backplane::grpc::UpdateByWindowScale* UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingGroup::_internal_mutable_reverse_window_scale() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  _impl_._has_bits_[0] |= 0x00000001u;
-  if (_impl_.reverse_window_scale_ == nullptr) {
-    auto* p = CreateMaybeMessage<::io::deephaven::proto::backplane::grpc::UpdateByWindowScale>(GetArena());
-    _impl_.reverse_window_scale_ = reinterpret_cast<::io::deephaven::proto::backplane::grpc::UpdateByWindowScale*>(p);
-  }
-  return _impl_.reverse_window_scale_;
-}
-inline ::io::deephaven::proto::backplane::grpc::UpdateByWindowScale* UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingGroup::mutable_reverse_window_scale() ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  ::io::deephaven::proto::backplane::grpc::UpdateByWindowScale* _msg = _internal_mutable_reverse_window_scale();
-  // @@protoc_insertion_point(field_mutable:io.deephaven.proto.backplane.grpc.UpdateByRequest.UpdateByOperation.UpdateByColumn.UpdateBySpec.UpdateByRollingGroup.reverse_window_scale)
-  return _msg;
-}
-inline void UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingGroup::set_allocated_reverse_window_scale(::io::deephaven::proto::backplane::grpc::UpdateByWindowScale* value) {
-  ::google::protobuf::Arena* message_arena = GetArena();
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  if (message_arena == nullptr) {
-    delete reinterpret_cast<::io::deephaven::proto::backplane::grpc::UpdateByWindowScale*>(_impl_.reverse_window_scale_);
-  }
-
-  if (value != nullptr) {
-    ::google::protobuf::Arena* submessage_arena = reinterpret_cast<::io::deephaven::proto::backplane::grpc::UpdateByWindowScale*>(value)->GetArena();
-    if (message_arena != submessage_arena) {
-      value = ::google::protobuf::internal::GetOwnedMessage(message_arena, value, submessage_arena);
-    }
-    _impl_._has_bits_[0] |= 0x00000001u;
-  } else {
-    _impl_._has_bits_[0] &= ~0x00000001u;
-  }
-
-  _impl_.reverse_window_scale_ = reinterpret_cast<::io::deephaven::proto::backplane::grpc::UpdateByWindowScale*>(value);
-  // @@protoc_insertion_point(field_set_allocated:io.deephaven.proto.backplane.grpc.UpdateByRequest.UpdateByOperation.UpdateByColumn.UpdateBySpec.UpdateByRollingGroup.reverse_window_scale)
-}
-
-// .io.deephaven.proto.backplane.grpc.UpdateByWindowScale forward_window_scale = 2;
-inline bool UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingGroup::has_forward_window_scale() const {
-  bool value = (_impl_._has_bits_[0] & 0x00000002u) != 0;
-  PROTOBUF_ASSUME(!value || _impl_.forward_window_scale_ != nullptr);
-  return value;
-}
-inline void UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingGroup::clear_forward_window_scale() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  if (_impl_.forward_window_scale_ != nullptr) _impl_.forward_window_scale_->Clear();
-  _impl_._has_bits_[0] &= ~0x00000002u;
-}
-inline const ::io::deephaven::proto::backplane::grpc::UpdateByWindowScale& UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingGroup::_internal_forward_window_scale() const {
-  PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race);
-  const ::io::deephaven::proto::backplane::grpc::UpdateByWindowScale* p = _impl_.forward_window_scale_;
-  return p != nullptr ? *p : reinterpret_cast<const ::io::deephaven::proto::backplane::grpc::UpdateByWindowScale&>(::io::deephaven::proto::backplane::grpc::_UpdateByWindowScale_default_instance_);
-}
-inline const ::io::deephaven::proto::backplane::grpc::UpdateByWindowScale& UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingGroup::forward_window_scale() const ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  // @@protoc_insertion_point(field_get:io.deephaven.proto.backplane.grpc.UpdateByRequest.UpdateByOperation.UpdateByColumn.UpdateBySpec.UpdateByRollingGroup.forward_window_scale)
-  return _internal_forward_window_scale();
-}
-inline void UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingGroup::unsafe_arena_set_allocated_forward_window_scale(::io::deephaven::proto::backplane::grpc::UpdateByWindowScale* value) {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  if (GetArena() == nullptr) {
-    delete reinterpret_cast<::google::protobuf::MessageLite*>(_impl_.forward_window_scale_);
-  }
-  _impl_.forward_window_scale_ = reinterpret_cast<::io::deephaven::proto::backplane::grpc::UpdateByWindowScale*>(value);
-  if (value != nullptr) {
-    _impl_._has_bits_[0] |= 0x00000002u;
-  } else {
-    _impl_._has_bits_[0] &= ~0x00000002u;
-  }
-  // @@protoc_insertion_point(field_unsafe_arena_set_allocated:io.deephaven.proto.backplane.grpc.UpdateByRequest.UpdateByOperation.UpdateByColumn.UpdateBySpec.UpdateByRollingGroup.forward_window_scale)
-}
-inline ::io::deephaven::proto::backplane::grpc::UpdateByWindowScale* UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingGroup::release_forward_window_scale() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-
-  _impl_._has_bits_[0] &= ~0x00000002u;
-  ::io::deephaven::proto::backplane::grpc::UpdateByWindowScale* released = _impl_.forward_window_scale_;
-  _impl_.forward_window_scale_ = nullptr;
-#ifdef PROTOBUF_FORCE_COPY_IN_RELEASE
-  auto* old = reinterpret_cast<::google::protobuf::MessageLite*>(released);
-  released = ::google::protobuf::internal::DuplicateIfNonNull(released);
-  if (GetArena() == nullptr) {
-    delete old;
-  }
-#else   // PROTOBUF_FORCE_COPY_IN_RELEASE
-  if (GetArena() != nullptr) {
-    released = ::google::protobuf::internal::DuplicateIfNonNull(released);
-  }
-#endif  // !PROTOBUF_FORCE_COPY_IN_RELEASE
-  return released;
-}
-inline ::io::deephaven::proto::backplane::grpc::UpdateByWindowScale* UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingGroup::unsafe_arena_release_forward_window_scale() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  // @@protoc_insertion_point(field_release:io.deephaven.proto.backplane.grpc.UpdateByRequest.UpdateByOperation.UpdateByColumn.UpdateBySpec.UpdateByRollingGroup.forward_window_scale)
-
-  _impl_._has_bits_[0] &= ~0x00000002u;
-  ::io::deephaven::proto::backplane::grpc::UpdateByWindowScale* temp = _impl_.forward_window_scale_;
-  _impl_.forward_window_scale_ = nullptr;
-  return temp;
-}
-inline ::io::deephaven::proto::backplane::grpc::UpdateByWindowScale* UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingGroup::_internal_mutable_forward_window_scale() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  _impl_._has_bits_[0] |= 0x00000002u;
-  if (_impl_.forward_window_scale_ == nullptr) {
-    auto* p = CreateMaybeMessage<::io::deephaven::proto::backplane::grpc::UpdateByWindowScale>(GetArena());
-    _impl_.forward_window_scale_ = reinterpret_cast<::io::deephaven::proto::backplane::grpc::UpdateByWindowScale*>(p);
-  }
-  return _impl_.forward_window_scale_;
-}
-inline ::io::deephaven::proto::backplane::grpc::UpdateByWindowScale* UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingGroup::mutable_forward_window_scale() ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  ::io::deephaven::proto::backplane::grpc::UpdateByWindowScale* _msg = _internal_mutable_forward_window_scale();
-  // @@protoc_insertion_point(field_mutable:io.deephaven.proto.backplane.grpc.UpdateByRequest.UpdateByOperation.UpdateByColumn.UpdateBySpec.UpdateByRollingGroup.forward_window_scale)
-  return _msg;
-}
-inline void UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingGroup::set_allocated_forward_window_scale(::io::deephaven::proto::backplane::grpc::UpdateByWindowScale* value) {
-  ::google::protobuf::Arena* message_arena = GetArena();
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  if (message_arena == nullptr) {
-    delete reinterpret_cast<::io::deephaven::proto::backplane::grpc::UpdateByWindowScale*>(_impl_.forward_window_scale_);
-  }
-
-  if (value != nullptr) {
-    ::google::protobuf::Arena* submessage_arena = reinterpret_cast<::io::deephaven::proto::backplane::grpc::UpdateByWindowScale*>(value)->GetArena();
-    if (message_arena != submessage_arena) {
-      value = ::google::protobuf::internal::GetOwnedMessage(message_arena, value, submessage_arena);
-    }
-    _impl_._has_bits_[0] |= 0x00000002u;
-  } else {
-    _impl_._has_bits_[0] &= ~0x00000002u;
-  }
-
-  _impl_.forward_window_scale_ = reinterpret_cast<::io::deephaven::proto::backplane::grpc::UpdateByWindowScale*>(value);
-  // @@protoc_insertion_point(field_set_allocated:io.deephaven.proto.backplane.grpc.UpdateByRequest.UpdateByOperation.UpdateByColumn.UpdateBySpec.UpdateByRollingGroup.forward_window_scale)
-}
-
-// -------------------------------------------------------------------
-
-// UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingAvg
-
-// .io.deephaven.proto.backplane.grpc.UpdateByWindowScale reverse_window_scale = 1;
-inline bool UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingAvg::has_reverse_window_scale() const {
-  bool value = (_impl_._has_bits_[0] & 0x00000001u) != 0;
-  PROTOBUF_ASSUME(!value || _impl_.reverse_window_scale_ != nullptr);
-  return value;
-}
-inline void UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingAvg::clear_reverse_window_scale() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  if (_impl_.reverse_window_scale_ != nullptr) _impl_.reverse_window_scale_->Clear();
-  _impl_._has_bits_[0] &= ~0x00000001u;
-}
-inline const ::io::deephaven::proto::backplane::grpc::UpdateByWindowScale& UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingAvg::_internal_reverse_window_scale() const {
-  PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race);
-  const ::io::deephaven::proto::backplane::grpc::UpdateByWindowScale* p = _impl_.reverse_window_scale_;
-  return p != nullptr ? *p : reinterpret_cast<const ::io::deephaven::proto::backplane::grpc::UpdateByWindowScale&>(::io::deephaven::proto::backplane::grpc::_UpdateByWindowScale_default_instance_);
-}
-inline const ::io::deephaven::proto::backplane::grpc::UpdateByWindowScale& UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingAvg::reverse_window_scale() const ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  // @@protoc_insertion_point(field_get:io.deephaven.proto.backplane.grpc.UpdateByRequest.UpdateByOperation.UpdateByColumn.UpdateBySpec.UpdateByRollingAvg.reverse_window_scale)
-  return _internal_reverse_window_scale();
-}
-inline void UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingAvg::unsafe_arena_set_allocated_reverse_window_scale(::io::deephaven::proto::backplane::grpc::UpdateByWindowScale* value) {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  if (GetArena() == nullptr) {
-    delete reinterpret_cast<::google::protobuf::MessageLite*>(_impl_.reverse_window_scale_);
-  }
-  _impl_.reverse_window_scale_ = reinterpret_cast<::io::deephaven::proto::backplane::grpc::UpdateByWindowScale*>(value);
-  if (value != nullptr) {
-    _impl_._has_bits_[0] |= 0x00000001u;
-  } else {
-    _impl_._has_bits_[0] &= ~0x00000001u;
-  }
-  // @@protoc_insertion_point(field_unsafe_arena_set_allocated:io.deephaven.proto.backplane.grpc.UpdateByRequest.UpdateByOperation.UpdateByColumn.UpdateBySpec.UpdateByRollingAvg.reverse_window_scale)
-}
-inline ::io::deephaven::proto::backplane::grpc::UpdateByWindowScale* UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingAvg::release_reverse_window_scale() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-
-  _impl_._has_bits_[0] &= ~0x00000001u;
-  ::io::deephaven::proto::backplane::grpc::UpdateByWindowScale* released = _impl_.reverse_window_scale_;
-  _impl_.reverse_window_scale_ = nullptr;
-#ifdef PROTOBUF_FORCE_COPY_IN_RELEASE
-  auto* old = reinterpret_cast<::google::protobuf::MessageLite*>(released);
-  released = ::google::protobuf::internal::DuplicateIfNonNull(released);
-  if (GetArena() == nullptr) {
-    delete old;
-  }
-#else   // PROTOBUF_FORCE_COPY_IN_RELEASE
-  if (GetArena() != nullptr) {
-    released = ::google::protobuf::internal::DuplicateIfNonNull(released);
-  }
-#endif  // !PROTOBUF_FORCE_COPY_IN_RELEASE
-  return released;
-}
-inline ::io::deephaven::proto::backplane::grpc::UpdateByWindowScale* UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingAvg::unsafe_arena_release_reverse_window_scale() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  // @@protoc_insertion_point(field_release:io.deephaven.proto.backplane.grpc.UpdateByRequest.UpdateByOperation.UpdateByColumn.UpdateBySpec.UpdateByRollingAvg.reverse_window_scale)
-
-  _impl_._has_bits_[0] &= ~0x00000001u;
-  ::io::deephaven::proto::backplane::grpc::UpdateByWindowScale* temp = _impl_.reverse_window_scale_;
-  _impl_.reverse_window_scale_ = nullptr;
-  return temp;
-}
-inline ::io::deephaven::proto::backplane::grpc::UpdateByWindowScale* UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingAvg::_internal_mutable_reverse_window_scale() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  _impl_._has_bits_[0] |= 0x00000001u;
-  if (_impl_.reverse_window_scale_ == nullptr) {
-    auto* p = CreateMaybeMessage<::io::deephaven::proto::backplane::grpc::UpdateByWindowScale>(GetArena());
-    _impl_.reverse_window_scale_ = reinterpret_cast<::io::deephaven::proto::backplane::grpc::UpdateByWindowScale*>(p);
-  }
-  return _impl_.reverse_window_scale_;
-}
-inline ::io::deephaven::proto::backplane::grpc::UpdateByWindowScale* UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingAvg::mutable_reverse_window_scale() ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  ::io::deephaven::proto::backplane::grpc::UpdateByWindowScale* _msg = _internal_mutable_reverse_window_scale();
-  // @@protoc_insertion_point(field_mutable:io.deephaven.proto.backplane.grpc.UpdateByRequest.UpdateByOperation.UpdateByColumn.UpdateBySpec.UpdateByRollingAvg.reverse_window_scale)
-  return _msg;
-}
-inline void UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingAvg::set_allocated_reverse_window_scale(::io::deephaven::proto::backplane::grpc::UpdateByWindowScale* value) {
-  ::google::protobuf::Arena* message_arena = GetArena();
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  if (message_arena == nullptr) {
-    delete reinterpret_cast<::io::deephaven::proto::backplane::grpc::UpdateByWindowScale*>(_impl_.reverse_window_scale_);
-  }
-
-  if (value != nullptr) {
-    ::google::protobuf::Arena* submessage_arena = reinterpret_cast<::io::deephaven::proto::backplane::grpc::UpdateByWindowScale*>(value)->GetArena();
-    if (message_arena != submessage_arena) {
-      value = ::google::protobuf::internal::GetOwnedMessage(message_arena, value, submessage_arena);
-    }
-    _impl_._has_bits_[0] |= 0x00000001u;
-  } else {
-    _impl_._has_bits_[0] &= ~0x00000001u;
-  }
-
-  _impl_.reverse_window_scale_ = reinterpret_cast<::io::deephaven::proto::backplane::grpc::UpdateByWindowScale*>(value);
-  // @@protoc_insertion_point(field_set_allocated:io.deephaven.proto.backplane.grpc.UpdateByRequest.UpdateByOperation.UpdateByColumn.UpdateBySpec.UpdateByRollingAvg.reverse_window_scale)
-}
-
-// .io.deephaven.proto.backplane.grpc.UpdateByWindowScale forward_window_scale = 2;
-inline bool UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingAvg::has_forward_window_scale() const {
-  bool value = (_impl_._has_bits_[0] & 0x00000002u) != 0;
-  PROTOBUF_ASSUME(!value || _impl_.forward_window_scale_ != nullptr);
-  return value;
-}
-inline void UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingAvg::clear_forward_window_scale() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  if (_impl_.forward_window_scale_ != nullptr) _impl_.forward_window_scale_->Clear();
-  _impl_._has_bits_[0] &= ~0x00000002u;
-}
-inline const ::io::deephaven::proto::backplane::grpc::UpdateByWindowScale& UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingAvg::_internal_forward_window_scale() const {
-  PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race);
-  const ::io::deephaven::proto::backplane::grpc::UpdateByWindowScale* p = _impl_.forward_window_scale_;
-  return p != nullptr ? *p : reinterpret_cast<const ::io::deephaven::proto::backplane::grpc::UpdateByWindowScale&>(::io::deephaven::proto::backplane::grpc::_UpdateByWindowScale_default_instance_);
-}
-inline const ::io::deephaven::proto::backplane::grpc::UpdateByWindowScale& UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingAvg::forward_window_scale() const ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  // @@protoc_insertion_point(field_get:io.deephaven.proto.backplane.grpc.UpdateByRequest.UpdateByOperation.UpdateByColumn.UpdateBySpec.UpdateByRollingAvg.forward_window_scale)
-  return _internal_forward_window_scale();
-}
-inline void UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingAvg::unsafe_arena_set_allocated_forward_window_scale(::io::deephaven::proto::backplane::grpc::UpdateByWindowScale* value) {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  if (GetArena() == nullptr) {
-    delete reinterpret_cast<::google::protobuf::MessageLite*>(_impl_.forward_window_scale_);
-  }
-  _impl_.forward_window_scale_ = reinterpret_cast<::io::deephaven::proto::backplane::grpc::UpdateByWindowScale*>(value);
-  if (value != nullptr) {
-    _impl_._has_bits_[0] |= 0x00000002u;
-  } else {
-    _impl_._has_bits_[0] &= ~0x00000002u;
-  }
-  // @@protoc_insertion_point(field_unsafe_arena_set_allocated:io.deephaven.proto.backplane.grpc.UpdateByRequest.UpdateByOperation.UpdateByColumn.UpdateBySpec.UpdateByRollingAvg.forward_window_scale)
-}
-inline ::io::deephaven::proto::backplane::grpc::UpdateByWindowScale* UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingAvg::release_forward_window_scale() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-
-  _impl_._has_bits_[0] &= ~0x00000002u;
-  ::io::deephaven::proto::backplane::grpc::UpdateByWindowScale* released = _impl_.forward_window_scale_;
-  _impl_.forward_window_scale_ = nullptr;
-#ifdef PROTOBUF_FORCE_COPY_IN_RELEASE
-  auto* old = reinterpret_cast<::google::protobuf::MessageLite*>(released);
-  released = ::google::protobuf::internal::DuplicateIfNonNull(released);
-  if (GetArena() == nullptr) {
-    delete old;
-  }
-#else   // PROTOBUF_FORCE_COPY_IN_RELEASE
-  if (GetArena() != nullptr) {
-    released = ::google::protobuf::internal::DuplicateIfNonNull(released);
-  }
-#endif  // !PROTOBUF_FORCE_COPY_IN_RELEASE
-  return released;
-}
-inline ::io::deephaven::proto::backplane::grpc::UpdateByWindowScale* UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingAvg::unsafe_arena_release_forward_window_scale() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  // @@protoc_insertion_point(field_release:io.deephaven.proto.backplane.grpc.UpdateByRequest.UpdateByOperation.UpdateByColumn.UpdateBySpec.UpdateByRollingAvg.forward_window_scale)
-
-  _impl_._has_bits_[0] &= ~0x00000002u;
-  ::io::deephaven::proto::backplane::grpc::UpdateByWindowScale* temp = _impl_.forward_window_scale_;
-  _impl_.forward_window_scale_ = nullptr;
-  return temp;
-}
-inline ::io::deephaven::proto::backplane::grpc::UpdateByWindowScale* UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingAvg::_internal_mutable_forward_window_scale() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  _impl_._has_bits_[0] |= 0x00000002u;
-  if (_impl_.forward_window_scale_ == nullptr) {
-    auto* p = CreateMaybeMessage<::io::deephaven::proto::backplane::grpc::UpdateByWindowScale>(GetArena());
-    _impl_.forward_window_scale_ = reinterpret_cast<::io::deephaven::proto::backplane::grpc::UpdateByWindowScale*>(p);
-  }
-  return _impl_.forward_window_scale_;
-}
-inline ::io::deephaven::proto::backplane::grpc::UpdateByWindowScale* UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingAvg::mutable_forward_window_scale() ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  ::io::deephaven::proto::backplane::grpc::UpdateByWindowScale* _msg = _internal_mutable_forward_window_scale();
-  // @@protoc_insertion_point(field_mutable:io.deephaven.proto.backplane.grpc.UpdateByRequest.UpdateByOperation.UpdateByColumn.UpdateBySpec.UpdateByRollingAvg.forward_window_scale)
-  return _msg;
-}
-inline void UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingAvg::set_allocated_forward_window_scale(::io::deephaven::proto::backplane::grpc::UpdateByWindowScale* value) {
-  ::google::protobuf::Arena* message_arena = GetArena();
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  if (message_arena == nullptr) {
-    delete reinterpret_cast<::io::deephaven::proto::backplane::grpc::UpdateByWindowScale*>(_impl_.forward_window_scale_);
-  }
-
-  if (value != nullptr) {
-    ::google::protobuf::Arena* submessage_arena = reinterpret_cast<::io::deephaven::proto::backplane::grpc::UpdateByWindowScale*>(value)->GetArena();
-    if (message_arena != submessage_arena) {
-      value = ::google::protobuf::internal::GetOwnedMessage(message_arena, value, submessage_arena);
-    }
-    _impl_._has_bits_[0] |= 0x00000002u;
-  } else {
-    _impl_._has_bits_[0] &= ~0x00000002u;
-  }
-
-  _impl_.forward_window_scale_ = reinterpret_cast<::io::deephaven::proto::backplane::grpc::UpdateByWindowScale*>(value);
-  // @@protoc_insertion_point(field_set_allocated:io.deephaven.proto.backplane.grpc.UpdateByRequest.UpdateByOperation.UpdateByColumn.UpdateBySpec.UpdateByRollingAvg.forward_window_scale)
-}
-
-// -------------------------------------------------------------------
-
-// UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingMin
-
-// .io.deephaven.proto.backplane.grpc.UpdateByWindowScale reverse_window_scale = 1;
-inline bool UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingMin::has_reverse_window_scale() const {
-  bool value = (_impl_._has_bits_[0] & 0x00000001u) != 0;
-  PROTOBUF_ASSUME(!value || _impl_.reverse_window_scale_ != nullptr);
-  return value;
-}
-inline void UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingMin::clear_reverse_window_scale() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  if (_impl_.reverse_window_scale_ != nullptr) _impl_.reverse_window_scale_->Clear();
-  _impl_._has_bits_[0] &= ~0x00000001u;
-}
-inline const ::io::deephaven::proto::backplane::grpc::UpdateByWindowScale& UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingMin::_internal_reverse_window_scale() const {
-  PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race);
-  const ::io::deephaven::proto::backplane::grpc::UpdateByWindowScale* p = _impl_.reverse_window_scale_;
-  return p != nullptr ? *p : reinterpret_cast<const ::io::deephaven::proto::backplane::grpc::UpdateByWindowScale&>(::io::deephaven::proto::backplane::grpc::_UpdateByWindowScale_default_instance_);
-}
-inline const ::io::deephaven::proto::backplane::grpc::UpdateByWindowScale& UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingMin::reverse_window_scale() const ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  // @@protoc_insertion_point(field_get:io.deephaven.proto.backplane.grpc.UpdateByRequest.UpdateByOperation.UpdateByColumn.UpdateBySpec.UpdateByRollingMin.reverse_window_scale)
-  return _internal_reverse_window_scale();
-}
-inline void UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingMin::unsafe_arena_set_allocated_reverse_window_scale(::io::deephaven::proto::backplane::grpc::UpdateByWindowScale* value) {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  if (GetArena() == nullptr) {
-    delete reinterpret_cast<::google::protobuf::MessageLite*>(_impl_.reverse_window_scale_);
-  }
-  _impl_.reverse_window_scale_ = reinterpret_cast<::io::deephaven::proto::backplane::grpc::UpdateByWindowScale*>(value);
-  if (value != nullptr) {
-    _impl_._has_bits_[0] |= 0x00000001u;
-  } else {
-    _impl_._has_bits_[0] &= ~0x00000001u;
-  }
-  // @@protoc_insertion_point(field_unsafe_arena_set_allocated:io.deephaven.proto.backplane.grpc.UpdateByRequest.UpdateByOperation.UpdateByColumn.UpdateBySpec.UpdateByRollingMin.reverse_window_scale)
-}
-inline ::io::deephaven::proto::backplane::grpc::UpdateByWindowScale* UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingMin::release_reverse_window_scale() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-
-  _impl_._has_bits_[0] &= ~0x00000001u;
-  ::io::deephaven::proto::backplane::grpc::UpdateByWindowScale* released = _impl_.reverse_window_scale_;
-  _impl_.reverse_window_scale_ = nullptr;
-#ifdef PROTOBUF_FORCE_COPY_IN_RELEASE
-  auto* old = reinterpret_cast<::google::protobuf::MessageLite*>(released);
-  released = ::google::protobuf::internal::DuplicateIfNonNull(released);
-  if (GetArena() == nullptr) {
-    delete old;
-  }
-#else   // PROTOBUF_FORCE_COPY_IN_RELEASE
-  if (GetArena() != nullptr) {
-    released = ::google::protobuf::internal::DuplicateIfNonNull(released);
-  }
-#endif  // !PROTOBUF_FORCE_COPY_IN_RELEASE
-  return released;
-}
-inline ::io::deephaven::proto::backplane::grpc::UpdateByWindowScale* UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingMin::unsafe_arena_release_reverse_window_scale() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  // @@protoc_insertion_point(field_release:io.deephaven.proto.backplane.grpc.UpdateByRequest.UpdateByOperation.UpdateByColumn.UpdateBySpec.UpdateByRollingMin.reverse_window_scale)
-
-  _impl_._has_bits_[0] &= ~0x00000001u;
-  ::io::deephaven::proto::backplane::grpc::UpdateByWindowScale* temp = _impl_.reverse_window_scale_;
-  _impl_.reverse_window_scale_ = nullptr;
-  return temp;
-}
-inline ::io::deephaven::proto::backplane::grpc::UpdateByWindowScale* UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingMin::_internal_mutable_reverse_window_scale() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  _impl_._has_bits_[0] |= 0x00000001u;
-  if (_impl_.reverse_window_scale_ == nullptr) {
-    auto* p = CreateMaybeMessage<::io::deephaven::proto::backplane::grpc::UpdateByWindowScale>(GetArena());
-    _impl_.reverse_window_scale_ = reinterpret_cast<::io::deephaven::proto::backplane::grpc::UpdateByWindowScale*>(p);
-  }
-  return _impl_.reverse_window_scale_;
-}
-inline ::io::deephaven::proto::backplane::grpc::UpdateByWindowScale* UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingMin::mutable_reverse_window_scale() ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  ::io::deephaven::proto::backplane::grpc::UpdateByWindowScale* _msg = _internal_mutable_reverse_window_scale();
-  // @@protoc_insertion_point(field_mutable:io.deephaven.proto.backplane.grpc.UpdateByRequest.UpdateByOperation.UpdateByColumn.UpdateBySpec.UpdateByRollingMin.reverse_window_scale)
-  return _msg;
-}
-inline void UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingMin::set_allocated_reverse_window_scale(::io::deephaven::proto::backplane::grpc::UpdateByWindowScale* value) {
-  ::google::protobuf::Arena* message_arena = GetArena();
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  if (message_arena == nullptr) {
-    delete reinterpret_cast<::io::deephaven::proto::backplane::grpc::UpdateByWindowScale*>(_impl_.reverse_window_scale_);
-  }
-
-  if (value != nullptr) {
-    ::google::protobuf::Arena* submessage_arena = reinterpret_cast<::io::deephaven::proto::backplane::grpc::UpdateByWindowScale*>(value)->GetArena();
-    if (message_arena != submessage_arena) {
-      value = ::google::protobuf::internal::GetOwnedMessage(message_arena, value, submessage_arena);
-    }
-    _impl_._has_bits_[0] |= 0x00000001u;
-  } else {
-    _impl_._has_bits_[0] &= ~0x00000001u;
-  }
-
-  _impl_.reverse_window_scale_ = reinterpret_cast<::io::deephaven::proto::backplane::grpc::UpdateByWindowScale*>(value);
-  // @@protoc_insertion_point(field_set_allocated:io.deephaven.proto.backplane.grpc.UpdateByRequest.UpdateByOperation.UpdateByColumn.UpdateBySpec.UpdateByRollingMin.reverse_window_scale)
-}
-
-// .io.deephaven.proto.backplane.grpc.UpdateByWindowScale forward_window_scale = 2;
-inline bool UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingMin::has_forward_window_scale() const {
-  bool value = (_impl_._has_bits_[0] & 0x00000002u) != 0;
-  PROTOBUF_ASSUME(!value || _impl_.forward_window_scale_ != nullptr);
-  return value;
-}
-inline void UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingMin::clear_forward_window_scale() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  if (_impl_.forward_window_scale_ != nullptr) _impl_.forward_window_scale_->Clear();
-  _impl_._has_bits_[0] &= ~0x00000002u;
-}
-inline const ::io::deephaven::proto::backplane::grpc::UpdateByWindowScale& UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingMin::_internal_forward_window_scale() const {
-  PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race);
-  const ::io::deephaven::proto::backplane::grpc::UpdateByWindowScale* p = _impl_.forward_window_scale_;
-  return p != nullptr ? *p : reinterpret_cast<const ::io::deephaven::proto::backplane::grpc::UpdateByWindowScale&>(::io::deephaven::proto::backplane::grpc::_UpdateByWindowScale_default_instance_);
-}
-inline const ::io::deephaven::proto::backplane::grpc::UpdateByWindowScale& UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingMin::forward_window_scale() const ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  // @@protoc_insertion_point(field_get:io.deephaven.proto.backplane.grpc.UpdateByRequest.UpdateByOperation.UpdateByColumn.UpdateBySpec.UpdateByRollingMin.forward_window_scale)
-  return _internal_forward_window_scale();
-}
-inline void UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingMin::unsafe_arena_set_allocated_forward_window_scale(::io::deephaven::proto::backplane::grpc::UpdateByWindowScale* value) {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  if (GetArena() == nullptr) {
-    delete reinterpret_cast<::google::protobuf::MessageLite*>(_impl_.forward_window_scale_);
-  }
-  _impl_.forward_window_scale_ = reinterpret_cast<::io::deephaven::proto::backplane::grpc::UpdateByWindowScale*>(value);
-  if (value != nullptr) {
-    _impl_._has_bits_[0] |= 0x00000002u;
-  } else {
-    _impl_._has_bits_[0] &= ~0x00000002u;
-  }
-  // @@protoc_insertion_point(field_unsafe_arena_set_allocated:io.deephaven.proto.backplane.grpc.UpdateByRequest.UpdateByOperation.UpdateByColumn.UpdateBySpec.UpdateByRollingMin.forward_window_scale)
-}
-inline ::io::deephaven::proto::backplane::grpc::UpdateByWindowScale* UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingMin::release_forward_window_scale() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-
-  _impl_._has_bits_[0] &= ~0x00000002u;
-  ::io::deephaven::proto::backplane::grpc::UpdateByWindowScale* released = _impl_.forward_window_scale_;
-  _impl_.forward_window_scale_ = nullptr;
-#ifdef PROTOBUF_FORCE_COPY_IN_RELEASE
-  auto* old = reinterpret_cast<::google::protobuf::MessageLite*>(released);
-  released = ::google::protobuf::internal::DuplicateIfNonNull(released);
-  if (GetArena() == nullptr) {
-    delete old;
-  }
-#else   // PROTOBUF_FORCE_COPY_IN_RELEASE
-  if (GetArena() != nullptr) {
-    released = ::google::protobuf::internal::DuplicateIfNonNull(released);
-  }
-#endif  // !PROTOBUF_FORCE_COPY_IN_RELEASE
-  return released;
-}
-inline ::io::deephaven::proto::backplane::grpc::UpdateByWindowScale* UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingMin::unsafe_arena_release_forward_window_scale() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  // @@protoc_insertion_point(field_release:io.deephaven.proto.backplane.grpc.UpdateByRequest.UpdateByOperation.UpdateByColumn.UpdateBySpec.UpdateByRollingMin.forward_window_scale)
-
-  _impl_._has_bits_[0] &= ~0x00000002u;
-  ::io::deephaven::proto::backplane::grpc::UpdateByWindowScale* temp = _impl_.forward_window_scale_;
-  _impl_.forward_window_scale_ = nullptr;
-  return temp;
-}
-inline ::io::deephaven::proto::backplane::grpc::UpdateByWindowScale* UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingMin::_internal_mutable_forward_window_scale() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  _impl_._has_bits_[0] |= 0x00000002u;
-  if (_impl_.forward_window_scale_ == nullptr) {
-    auto* p = CreateMaybeMessage<::io::deephaven::proto::backplane::grpc::UpdateByWindowScale>(GetArena());
-    _impl_.forward_window_scale_ = reinterpret_cast<::io::deephaven::proto::backplane::grpc::UpdateByWindowScale*>(p);
-  }
-  return _impl_.forward_window_scale_;
-}
-inline ::io::deephaven::proto::backplane::grpc::UpdateByWindowScale* UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingMin::mutable_forward_window_scale() ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  ::io::deephaven::proto::backplane::grpc::UpdateByWindowScale* _msg = _internal_mutable_forward_window_scale();
-  // @@protoc_insertion_point(field_mutable:io.deephaven.proto.backplane.grpc.UpdateByRequest.UpdateByOperation.UpdateByColumn.UpdateBySpec.UpdateByRollingMin.forward_window_scale)
-  return _msg;
-}
-inline void UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingMin::set_allocated_forward_window_scale(::io::deephaven::proto::backplane::grpc::UpdateByWindowScale* value) {
-  ::google::protobuf::Arena* message_arena = GetArena();
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  if (message_arena == nullptr) {
-    delete reinterpret_cast<::io::deephaven::proto::backplane::grpc::UpdateByWindowScale*>(_impl_.forward_window_scale_);
-  }
-
-  if (value != nullptr) {
-    ::google::protobuf::Arena* submessage_arena = reinterpret_cast<::io::deephaven::proto::backplane::grpc::UpdateByWindowScale*>(value)->GetArena();
-    if (message_arena != submessage_arena) {
-      value = ::google::protobuf::internal::GetOwnedMessage(message_arena, value, submessage_arena);
-    }
-    _impl_._has_bits_[0] |= 0x00000002u;
-  } else {
-    _impl_._has_bits_[0] &= ~0x00000002u;
-  }
-
-  _impl_.forward_window_scale_ = reinterpret_cast<::io::deephaven::proto::backplane::grpc::UpdateByWindowScale*>(value);
-  // @@protoc_insertion_point(field_set_allocated:io.deephaven.proto.backplane.grpc.UpdateByRequest.UpdateByOperation.UpdateByColumn.UpdateBySpec.UpdateByRollingMin.forward_window_scale)
-}
-
-// -------------------------------------------------------------------
-
-// UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingMax
-
-// .io.deephaven.proto.backplane.grpc.UpdateByWindowScale reverse_window_scale = 1;
-inline bool UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingMax::has_reverse_window_scale() const {
-  bool value = (_impl_._has_bits_[0] & 0x00000001u) != 0;
-  PROTOBUF_ASSUME(!value || _impl_.reverse_window_scale_ != nullptr);
-  return value;
-}
-inline void UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingMax::clear_reverse_window_scale() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  if (_impl_.reverse_window_scale_ != nullptr) _impl_.reverse_window_scale_->Clear();
-  _impl_._has_bits_[0] &= ~0x00000001u;
-}
-inline const ::io::deephaven::proto::backplane::grpc::UpdateByWindowScale& UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingMax::_internal_reverse_window_scale() const {
-  PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race);
-  const ::io::deephaven::proto::backplane::grpc::UpdateByWindowScale* p = _impl_.reverse_window_scale_;
-  return p != nullptr ? *p : reinterpret_cast<const ::io::deephaven::proto::backplane::grpc::UpdateByWindowScale&>(::io::deephaven::proto::backplane::grpc::_UpdateByWindowScale_default_instance_);
-}
-inline const ::io::deephaven::proto::backplane::grpc::UpdateByWindowScale& UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingMax::reverse_window_scale() const ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  // @@protoc_insertion_point(field_get:io.deephaven.proto.backplane.grpc.UpdateByRequest.UpdateByOperation.UpdateByColumn.UpdateBySpec.UpdateByRollingMax.reverse_window_scale)
-  return _internal_reverse_window_scale();
-}
-inline void UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingMax::unsafe_arena_set_allocated_reverse_window_scale(::io::deephaven::proto::backplane::grpc::UpdateByWindowScale* value) {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  if (GetArena() == nullptr) {
-    delete reinterpret_cast<::google::protobuf::MessageLite*>(_impl_.reverse_window_scale_);
-  }
-  _impl_.reverse_window_scale_ = reinterpret_cast<::io::deephaven::proto::backplane::grpc::UpdateByWindowScale*>(value);
-  if (value != nullptr) {
-    _impl_._has_bits_[0] |= 0x00000001u;
-  } else {
-    _impl_._has_bits_[0] &= ~0x00000001u;
-  }
-  // @@protoc_insertion_point(field_unsafe_arena_set_allocated:io.deephaven.proto.backplane.grpc.UpdateByRequest.UpdateByOperation.UpdateByColumn.UpdateBySpec.UpdateByRollingMax.reverse_window_scale)
-}
-inline ::io::deephaven::proto::backplane::grpc::UpdateByWindowScale* UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingMax::release_reverse_window_scale() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-
-  _impl_._has_bits_[0] &= ~0x00000001u;
-  ::io::deephaven::proto::backplane::grpc::UpdateByWindowScale* released = _impl_.reverse_window_scale_;
-  _impl_.reverse_window_scale_ = nullptr;
-#ifdef PROTOBUF_FORCE_COPY_IN_RELEASE
-  auto* old = reinterpret_cast<::google::protobuf::MessageLite*>(released);
-  released = ::google::protobuf::internal::DuplicateIfNonNull(released);
-  if (GetArena() == nullptr) {
-    delete old;
-  }
-#else   // PROTOBUF_FORCE_COPY_IN_RELEASE
-  if (GetArena() != nullptr) {
-    released = ::google::protobuf::internal::DuplicateIfNonNull(released);
-  }
-#endif  // !PROTOBUF_FORCE_COPY_IN_RELEASE
-  return released;
-}
-inline ::io::deephaven::proto::backplane::grpc::UpdateByWindowScale* UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingMax::unsafe_arena_release_reverse_window_scale() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  // @@protoc_insertion_point(field_release:io.deephaven.proto.backplane.grpc.UpdateByRequest.UpdateByOperation.UpdateByColumn.UpdateBySpec.UpdateByRollingMax.reverse_window_scale)
-
-  _impl_._has_bits_[0] &= ~0x00000001u;
-  ::io::deephaven::proto::backplane::grpc::UpdateByWindowScale* temp = _impl_.reverse_window_scale_;
-  _impl_.reverse_window_scale_ = nullptr;
-  return temp;
-}
-inline ::io::deephaven::proto::backplane::grpc::UpdateByWindowScale* UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingMax::_internal_mutable_reverse_window_scale() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  _impl_._has_bits_[0] |= 0x00000001u;
-  if (_impl_.reverse_window_scale_ == nullptr) {
-    auto* p = CreateMaybeMessage<::io::deephaven::proto::backplane::grpc::UpdateByWindowScale>(GetArena());
-    _impl_.reverse_window_scale_ = reinterpret_cast<::io::deephaven::proto::backplane::grpc::UpdateByWindowScale*>(p);
-  }
-  return _impl_.reverse_window_scale_;
-}
-inline ::io::deephaven::proto::backplane::grpc::UpdateByWindowScale* UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingMax::mutable_reverse_window_scale() ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  ::io::deephaven::proto::backplane::grpc::UpdateByWindowScale* _msg = _internal_mutable_reverse_window_scale();
-  // @@protoc_insertion_point(field_mutable:io.deephaven.proto.backplane.grpc.UpdateByRequest.UpdateByOperation.UpdateByColumn.UpdateBySpec.UpdateByRollingMax.reverse_window_scale)
-  return _msg;
-}
-inline void UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingMax::set_allocated_reverse_window_scale(::io::deephaven::proto::backplane::grpc::UpdateByWindowScale* value) {
-  ::google::protobuf::Arena* message_arena = GetArena();
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  if (message_arena == nullptr) {
-    delete reinterpret_cast<::io::deephaven::proto::backplane::grpc::UpdateByWindowScale*>(_impl_.reverse_window_scale_);
-  }
-
-  if (value != nullptr) {
-    ::google::protobuf::Arena* submessage_arena = reinterpret_cast<::io::deephaven::proto::backplane::grpc::UpdateByWindowScale*>(value)->GetArena();
-    if (message_arena != submessage_arena) {
-      value = ::google::protobuf::internal::GetOwnedMessage(message_arena, value, submessage_arena);
-    }
-    _impl_._has_bits_[0] |= 0x00000001u;
-  } else {
-    _impl_._has_bits_[0] &= ~0x00000001u;
-  }
-
-  _impl_.reverse_window_scale_ = reinterpret_cast<::io::deephaven::proto::backplane::grpc::UpdateByWindowScale*>(value);
-  // @@protoc_insertion_point(field_set_allocated:io.deephaven.proto.backplane.grpc.UpdateByRequest.UpdateByOperation.UpdateByColumn.UpdateBySpec.UpdateByRollingMax.reverse_window_scale)
-}
-
-// .io.deephaven.proto.backplane.grpc.UpdateByWindowScale forward_window_scale = 2;
-inline bool UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingMax::has_forward_window_scale() const {
-  bool value = (_impl_._has_bits_[0] & 0x00000002u) != 0;
-  PROTOBUF_ASSUME(!value || _impl_.forward_window_scale_ != nullptr);
-  return value;
-}
-inline void UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingMax::clear_forward_window_scale() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  if (_impl_.forward_window_scale_ != nullptr) _impl_.forward_window_scale_->Clear();
-  _impl_._has_bits_[0] &= ~0x00000002u;
-}
-inline const ::io::deephaven::proto::backplane::grpc::UpdateByWindowScale& UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingMax::_internal_forward_window_scale() const {
-  PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race);
-  const ::io::deephaven::proto::backplane::grpc::UpdateByWindowScale* p = _impl_.forward_window_scale_;
-  return p != nullptr ? *p : reinterpret_cast<const ::io::deephaven::proto::backplane::grpc::UpdateByWindowScale&>(::io::deephaven::proto::backplane::grpc::_UpdateByWindowScale_default_instance_);
-}
-inline const ::io::deephaven::proto::backplane::grpc::UpdateByWindowScale& UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingMax::forward_window_scale() const ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  // @@protoc_insertion_point(field_get:io.deephaven.proto.backplane.grpc.UpdateByRequest.UpdateByOperation.UpdateByColumn.UpdateBySpec.UpdateByRollingMax.forward_window_scale)
-  return _internal_forward_window_scale();
-}
-inline void UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingMax::unsafe_arena_set_allocated_forward_window_scale(::io::deephaven::proto::backplane::grpc::UpdateByWindowScale* value) {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  if (GetArena() == nullptr) {
-    delete reinterpret_cast<::google::protobuf::MessageLite*>(_impl_.forward_window_scale_);
-  }
-  _impl_.forward_window_scale_ = reinterpret_cast<::io::deephaven::proto::backplane::grpc::UpdateByWindowScale*>(value);
-  if (value != nullptr) {
-    _impl_._has_bits_[0] |= 0x00000002u;
-  } else {
-    _impl_._has_bits_[0] &= ~0x00000002u;
-  }
-  // @@protoc_insertion_point(field_unsafe_arena_set_allocated:io.deephaven.proto.backplane.grpc.UpdateByRequest.UpdateByOperation.UpdateByColumn.UpdateBySpec.UpdateByRollingMax.forward_window_scale)
-}
-inline ::io::deephaven::proto::backplane::grpc::UpdateByWindowScale* UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingMax::release_forward_window_scale() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-
-  _impl_._has_bits_[0] &= ~0x00000002u;
-  ::io::deephaven::proto::backplane::grpc::UpdateByWindowScale* released = _impl_.forward_window_scale_;
-  _impl_.forward_window_scale_ = nullptr;
-#ifdef PROTOBUF_FORCE_COPY_IN_RELEASE
-  auto* old = reinterpret_cast<::google::protobuf::MessageLite*>(released);
-  released = ::google::protobuf::internal::DuplicateIfNonNull(released);
-  if (GetArena() == nullptr) {
-    delete old;
-  }
-#else   // PROTOBUF_FORCE_COPY_IN_RELEASE
-  if (GetArena() != nullptr) {
-    released = ::google::protobuf::internal::DuplicateIfNonNull(released);
-  }
-#endif  // !PROTOBUF_FORCE_COPY_IN_RELEASE
-  return released;
-}
-inline ::io::deephaven::proto::backplane::grpc::UpdateByWindowScale* UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingMax::unsafe_arena_release_forward_window_scale() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  // @@protoc_insertion_point(field_release:io.deephaven.proto.backplane.grpc.UpdateByRequest.UpdateByOperation.UpdateByColumn.UpdateBySpec.UpdateByRollingMax.forward_window_scale)
-
-  _impl_._has_bits_[0] &= ~0x00000002u;
-  ::io::deephaven::proto::backplane::grpc::UpdateByWindowScale* temp = _impl_.forward_window_scale_;
-  _impl_.forward_window_scale_ = nullptr;
-  return temp;
-}
-inline ::io::deephaven::proto::backplane::grpc::UpdateByWindowScale* UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingMax::_internal_mutable_forward_window_scale() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  _impl_._has_bits_[0] |= 0x00000002u;
-  if (_impl_.forward_window_scale_ == nullptr) {
-    auto* p = CreateMaybeMessage<::io::deephaven::proto::backplane::grpc::UpdateByWindowScale>(GetArena());
-    _impl_.forward_window_scale_ = reinterpret_cast<::io::deephaven::proto::backplane::grpc::UpdateByWindowScale*>(p);
-  }
-  return _impl_.forward_window_scale_;
-}
-inline ::io::deephaven::proto::backplane::grpc::UpdateByWindowScale* UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingMax::mutable_forward_window_scale() ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  ::io::deephaven::proto::backplane::grpc::UpdateByWindowScale* _msg = _internal_mutable_forward_window_scale();
-  // @@protoc_insertion_point(field_mutable:io.deephaven.proto.backplane.grpc.UpdateByRequest.UpdateByOperation.UpdateByColumn.UpdateBySpec.UpdateByRollingMax.forward_window_scale)
-  return _msg;
-}
-inline void UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingMax::set_allocated_forward_window_scale(::io::deephaven::proto::backplane::grpc::UpdateByWindowScale* value) {
-  ::google::protobuf::Arena* message_arena = GetArena();
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  if (message_arena == nullptr) {
-    delete reinterpret_cast<::io::deephaven::proto::backplane::grpc::UpdateByWindowScale*>(_impl_.forward_window_scale_);
-  }
-
-  if (value != nullptr) {
-    ::google::protobuf::Arena* submessage_arena = reinterpret_cast<::io::deephaven::proto::backplane::grpc::UpdateByWindowScale*>(value)->GetArena();
-    if (message_arena != submessage_arena) {
-      value = ::google::protobuf::internal::GetOwnedMessage(message_arena, value, submessage_arena);
-    }
-    _impl_._has_bits_[0] |= 0x00000002u;
-  } else {
-    _impl_._has_bits_[0] &= ~0x00000002u;
-  }
-
-  _impl_.forward_window_scale_ = reinterpret_cast<::io::deephaven::proto::backplane::grpc::UpdateByWindowScale*>(value);
-  // @@protoc_insertion_point(field_set_allocated:io.deephaven.proto.backplane.grpc.UpdateByRequest.UpdateByOperation.UpdateByColumn.UpdateBySpec.UpdateByRollingMax.forward_window_scale)
-}
-
-// -------------------------------------------------------------------
-
-// UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingProduct
-
-// .io.deephaven.proto.backplane.grpc.UpdateByWindowScale reverse_window_scale = 1;
-inline bool UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingProduct::has_reverse_window_scale() const {
-  bool value = (_impl_._has_bits_[0] & 0x00000001u) != 0;
-  PROTOBUF_ASSUME(!value || _impl_.reverse_window_scale_ != nullptr);
-  return value;
-}
-inline void UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingProduct::clear_reverse_window_scale() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  if (_impl_.reverse_window_scale_ != nullptr) _impl_.reverse_window_scale_->Clear();
-  _impl_._has_bits_[0] &= ~0x00000001u;
-}
-inline const ::io::deephaven::proto::backplane::grpc::UpdateByWindowScale& UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingProduct::_internal_reverse_window_scale() const {
-  PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race);
-  const ::io::deephaven::proto::backplane::grpc::UpdateByWindowScale* p = _impl_.reverse_window_scale_;
-  return p != nullptr ? *p : reinterpret_cast<const ::io::deephaven::proto::backplane::grpc::UpdateByWindowScale&>(::io::deephaven::proto::backplane::grpc::_UpdateByWindowScale_default_instance_);
-}
-inline const ::io::deephaven::proto::backplane::grpc::UpdateByWindowScale& UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingProduct::reverse_window_scale() const ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  // @@protoc_insertion_point(field_get:io.deephaven.proto.backplane.grpc.UpdateByRequest.UpdateByOperation.UpdateByColumn.UpdateBySpec.UpdateByRollingProduct.reverse_window_scale)
-  return _internal_reverse_window_scale();
-}
-inline void UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingProduct::unsafe_arena_set_allocated_reverse_window_scale(::io::deephaven::proto::backplane::grpc::UpdateByWindowScale* value) {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  if (GetArena() == nullptr) {
-    delete reinterpret_cast<::google::protobuf::MessageLite*>(_impl_.reverse_window_scale_);
-  }
-  _impl_.reverse_window_scale_ = reinterpret_cast<::io::deephaven::proto::backplane::grpc::UpdateByWindowScale*>(value);
-  if (value != nullptr) {
-    _impl_._has_bits_[0] |= 0x00000001u;
-  } else {
-    _impl_._has_bits_[0] &= ~0x00000001u;
-  }
-  // @@protoc_insertion_point(field_unsafe_arena_set_allocated:io.deephaven.proto.backplane.grpc.UpdateByRequest.UpdateByOperation.UpdateByColumn.UpdateBySpec.UpdateByRollingProduct.reverse_window_scale)
-}
-inline ::io::deephaven::proto::backplane::grpc::UpdateByWindowScale* UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingProduct::release_reverse_window_scale() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-
-  _impl_._has_bits_[0] &= ~0x00000001u;
-  ::io::deephaven::proto::backplane::grpc::UpdateByWindowScale* released = _impl_.reverse_window_scale_;
-  _impl_.reverse_window_scale_ = nullptr;
-#ifdef PROTOBUF_FORCE_COPY_IN_RELEASE
-  auto* old = reinterpret_cast<::google::protobuf::MessageLite*>(released);
-  released = ::google::protobuf::internal::DuplicateIfNonNull(released);
-  if (GetArena() == nullptr) {
-    delete old;
-  }
-#else   // PROTOBUF_FORCE_COPY_IN_RELEASE
-  if (GetArena() != nullptr) {
-    released = ::google::protobuf::internal::DuplicateIfNonNull(released);
-  }
-#endif  // !PROTOBUF_FORCE_COPY_IN_RELEASE
-  return released;
-}
-inline ::io::deephaven::proto::backplane::grpc::UpdateByWindowScale* UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingProduct::unsafe_arena_release_reverse_window_scale() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  // @@protoc_insertion_point(field_release:io.deephaven.proto.backplane.grpc.UpdateByRequest.UpdateByOperation.UpdateByColumn.UpdateBySpec.UpdateByRollingProduct.reverse_window_scale)
-
-  _impl_._has_bits_[0] &= ~0x00000001u;
-  ::io::deephaven::proto::backplane::grpc::UpdateByWindowScale* temp = _impl_.reverse_window_scale_;
-  _impl_.reverse_window_scale_ = nullptr;
-  return temp;
-}
-inline ::io::deephaven::proto::backplane::grpc::UpdateByWindowScale* UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingProduct::_internal_mutable_reverse_window_scale() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  _impl_._has_bits_[0] |= 0x00000001u;
-  if (_impl_.reverse_window_scale_ == nullptr) {
-    auto* p = CreateMaybeMessage<::io::deephaven::proto::backplane::grpc::UpdateByWindowScale>(GetArena());
-    _impl_.reverse_window_scale_ = reinterpret_cast<::io::deephaven::proto::backplane::grpc::UpdateByWindowScale*>(p);
-  }
-  return _impl_.reverse_window_scale_;
-}
-inline ::io::deephaven::proto::backplane::grpc::UpdateByWindowScale* UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingProduct::mutable_reverse_window_scale() ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  ::io::deephaven::proto::backplane::grpc::UpdateByWindowScale* _msg = _internal_mutable_reverse_window_scale();
-  // @@protoc_insertion_point(field_mutable:io.deephaven.proto.backplane.grpc.UpdateByRequest.UpdateByOperation.UpdateByColumn.UpdateBySpec.UpdateByRollingProduct.reverse_window_scale)
-  return _msg;
-}
-inline void UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingProduct::set_allocated_reverse_window_scale(::io::deephaven::proto::backplane::grpc::UpdateByWindowScale* value) {
-  ::google::protobuf::Arena* message_arena = GetArena();
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  if (message_arena == nullptr) {
-    delete reinterpret_cast<::io::deephaven::proto::backplane::grpc::UpdateByWindowScale*>(_impl_.reverse_window_scale_);
-  }
-
-  if (value != nullptr) {
-    ::google::protobuf::Arena* submessage_arena = reinterpret_cast<::io::deephaven::proto::backplane::grpc::UpdateByWindowScale*>(value)->GetArena();
-    if (message_arena != submessage_arena) {
-      value = ::google::protobuf::internal::GetOwnedMessage(message_arena, value, submessage_arena);
-    }
-    _impl_._has_bits_[0] |= 0x00000001u;
-  } else {
-    _impl_._has_bits_[0] &= ~0x00000001u;
-  }
-
-  _impl_.reverse_window_scale_ = reinterpret_cast<::io::deephaven::proto::backplane::grpc::UpdateByWindowScale*>(value);
-  // @@protoc_insertion_point(field_set_allocated:io.deephaven.proto.backplane.grpc.UpdateByRequest.UpdateByOperation.UpdateByColumn.UpdateBySpec.UpdateByRollingProduct.reverse_window_scale)
-}
-
-// .io.deephaven.proto.backplane.grpc.UpdateByWindowScale forward_window_scale = 2;
-inline bool UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingProduct::has_forward_window_scale() const {
-  bool value = (_impl_._has_bits_[0] & 0x00000002u) != 0;
-  PROTOBUF_ASSUME(!value || _impl_.forward_window_scale_ != nullptr);
-  return value;
-}
-inline void UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingProduct::clear_forward_window_scale() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  if (_impl_.forward_window_scale_ != nullptr) _impl_.forward_window_scale_->Clear();
-  _impl_._has_bits_[0] &= ~0x00000002u;
-}
-inline const ::io::deephaven::proto::backplane::grpc::UpdateByWindowScale& UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingProduct::_internal_forward_window_scale() const {
-  PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race);
-  const ::io::deephaven::proto::backplane::grpc::UpdateByWindowScale* p = _impl_.forward_window_scale_;
-  return p != nullptr ? *p : reinterpret_cast<const ::io::deephaven::proto::backplane::grpc::UpdateByWindowScale&>(::io::deephaven::proto::backplane::grpc::_UpdateByWindowScale_default_instance_);
-}
-inline const ::io::deephaven::proto::backplane::grpc::UpdateByWindowScale& UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingProduct::forward_window_scale() const ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  // @@protoc_insertion_point(field_get:io.deephaven.proto.backplane.grpc.UpdateByRequest.UpdateByOperation.UpdateByColumn.UpdateBySpec.UpdateByRollingProduct.forward_window_scale)
-  return _internal_forward_window_scale();
-}
-inline void UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingProduct::unsafe_arena_set_allocated_forward_window_scale(::io::deephaven::proto::backplane::grpc::UpdateByWindowScale* value) {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  if (GetArena() == nullptr) {
-    delete reinterpret_cast<::google::protobuf::MessageLite*>(_impl_.forward_window_scale_);
-  }
-  _impl_.forward_window_scale_ = reinterpret_cast<::io::deephaven::proto::backplane::grpc::UpdateByWindowScale*>(value);
-  if (value != nullptr) {
-    _impl_._has_bits_[0] |= 0x00000002u;
-  } else {
-    _impl_._has_bits_[0] &= ~0x00000002u;
-  }
-  // @@protoc_insertion_point(field_unsafe_arena_set_allocated:io.deephaven.proto.backplane.grpc.UpdateByRequest.UpdateByOperation.UpdateByColumn.UpdateBySpec.UpdateByRollingProduct.forward_window_scale)
-}
-inline ::io::deephaven::proto::backplane::grpc::UpdateByWindowScale* UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingProduct::release_forward_window_scale() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-
-  _impl_._has_bits_[0] &= ~0x00000002u;
-  ::io::deephaven::proto::backplane::grpc::UpdateByWindowScale* released = _impl_.forward_window_scale_;
-  _impl_.forward_window_scale_ = nullptr;
-#ifdef PROTOBUF_FORCE_COPY_IN_RELEASE
-  auto* old = reinterpret_cast<::google::protobuf::MessageLite*>(released);
-  released = ::google::protobuf::internal::DuplicateIfNonNull(released);
-  if (GetArena() == nullptr) {
-    delete old;
-  }
-#else   // PROTOBUF_FORCE_COPY_IN_RELEASE
-  if (GetArena() != nullptr) {
-    released = ::google::protobuf::internal::DuplicateIfNonNull(released);
-  }
-#endif  // !PROTOBUF_FORCE_COPY_IN_RELEASE
-  return released;
-}
-inline ::io::deephaven::proto::backplane::grpc::UpdateByWindowScale* UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingProduct::unsafe_arena_release_forward_window_scale() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  // @@protoc_insertion_point(field_release:io.deephaven.proto.backplane.grpc.UpdateByRequest.UpdateByOperation.UpdateByColumn.UpdateBySpec.UpdateByRollingProduct.forward_window_scale)
-
-  _impl_._has_bits_[0] &= ~0x00000002u;
-  ::io::deephaven::proto::backplane::grpc::UpdateByWindowScale* temp = _impl_.forward_window_scale_;
-  _impl_.forward_window_scale_ = nullptr;
-  return temp;
-}
-inline ::io::deephaven::proto::backplane::grpc::UpdateByWindowScale* UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingProduct::_internal_mutable_forward_window_scale() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  _impl_._has_bits_[0] |= 0x00000002u;
-  if (_impl_.forward_window_scale_ == nullptr) {
-    auto* p = CreateMaybeMessage<::io::deephaven::proto::backplane::grpc::UpdateByWindowScale>(GetArena());
-    _impl_.forward_window_scale_ = reinterpret_cast<::io::deephaven::proto::backplane::grpc::UpdateByWindowScale*>(p);
-  }
-  return _impl_.forward_window_scale_;
-}
-inline ::io::deephaven::proto::backplane::grpc::UpdateByWindowScale* UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingProduct::mutable_forward_window_scale() ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  ::io::deephaven::proto::backplane::grpc::UpdateByWindowScale* _msg = _internal_mutable_forward_window_scale();
-  // @@protoc_insertion_point(field_mutable:io.deephaven.proto.backplane.grpc.UpdateByRequest.UpdateByOperation.UpdateByColumn.UpdateBySpec.UpdateByRollingProduct.forward_window_scale)
-  return _msg;
-}
-inline void UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingProduct::set_allocated_forward_window_scale(::io::deephaven::proto::backplane::grpc::UpdateByWindowScale* value) {
-  ::google::protobuf::Arena* message_arena = GetArena();
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  if (message_arena == nullptr) {
-    delete reinterpret_cast<::io::deephaven::proto::backplane::grpc::UpdateByWindowScale*>(_impl_.forward_window_scale_);
-  }
-
-  if (value != nullptr) {
-    ::google::protobuf::Arena* submessage_arena = reinterpret_cast<::io::deephaven::proto::backplane::grpc::UpdateByWindowScale*>(value)->GetArena();
-    if (message_arena != submessage_arena) {
-      value = ::google::protobuf::internal::GetOwnedMessage(message_arena, value, submessage_arena);
-    }
-    _impl_._has_bits_[0] |= 0x00000002u;
-  } else {
-    _impl_._has_bits_[0] &= ~0x00000002u;
-  }
-
-  _impl_.forward_window_scale_ = reinterpret_cast<::io::deephaven::proto::backplane::grpc::UpdateByWindowScale*>(value);
-  // @@protoc_insertion_point(field_set_allocated:io.deephaven.proto.backplane.grpc.UpdateByRequest.UpdateByOperation.UpdateByColumn.UpdateBySpec.UpdateByRollingProduct.forward_window_scale)
-}
-
-// -------------------------------------------------------------------
-
-// UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingCount
-
-// .io.deephaven.proto.backplane.grpc.UpdateByWindowScale reverse_window_scale = 1;
-inline bool UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingCount::has_reverse_window_scale() const {
-  bool value = (_impl_._has_bits_[0] & 0x00000001u) != 0;
-  PROTOBUF_ASSUME(!value || _impl_.reverse_window_scale_ != nullptr);
-  return value;
-}
-inline void UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingCount::clear_reverse_window_scale() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  if (_impl_.reverse_window_scale_ != nullptr) _impl_.reverse_window_scale_->Clear();
-  _impl_._has_bits_[0] &= ~0x00000001u;
-}
-inline const ::io::deephaven::proto::backplane::grpc::UpdateByWindowScale& UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingCount::_internal_reverse_window_scale() const {
-  PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race);
-  const ::io::deephaven::proto::backplane::grpc::UpdateByWindowScale* p = _impl_.reverse_window_scale_;
-  return p != nullptr ? *p : reinterpret_cast<const ::io::deephaven::proto::backplane::grpc::UpdateByWindowScale&>(::io::deephaven::proto::backplane::grpc::_UpdateByWindowScale_default_instance_);
-}
-inline const ::io::deephaven::proto::backplane::grpc::UpdateByWindowScale& UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingCount::reverse_window_scale() const ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  // @@protoc_insertion_point(field_get:io.deephaven.proto.backplane.grpc.UpdateByRequest.UpdateByOperation.UpdateByColumn.UpdateBySpec.UpdateByRollingCount.reverse_window_scale)
-  return _internal_reverse_window_scale();
-}
-inline void UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingCount::unsafe_arena_set_allocated_reverse_window_scale(::io::deephaven::proto::backplane::grpc::UpdateByWindowScale* value) {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  if (GetArena() == nullptr) {
-    delete reinterpret_cast<::google::protobuf::MessageLite*>(_impl_.reverse_window_scale_);
-  }
-  _impl_.reverse_window_scale_ = reinterpret_cast<::io::deephaven::proto::backplane::grpc::UpdateByWindowScale*>(value);
-  if (value != nullptr) {
-    _impl_._has_bits_[0] |= 0x00000001u;
-  } else {
-    _impl_._has_bits_[0] &= ~0x00000001u;
-  }
-  // @@protoc_insertion_point(field_unsafe_arena_set_allocated:io.deephaven.proto.backplane.grpc.UpdateByRequest.UpdateByOperation.UpdateByColumn.UpdateBySpec.UpdateByRollingCount.reverse_window_scale)
-}
-inline ::io::deephaven::proto::backplane::grpc::UpdateByWindowScale* UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingCount::release_reverse_window_scale() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-
-  _impl_._has_bits_[0] &= ~0x00000001u;
-  ::io::deephaven::proto::backplane::grpc::UpdateByWindowScale* released = _impl_.reverse_window_scale_;
-  _impl_.reverse_window_scale_ = nullptr;
-#ifdef PROTOBUF_FORCE_COPY_IN_RELEASE
-  auto* old = reinterpret_cast<::google::protobuf::MessageLite*>(released);
-  released = ::google::protobuf::internal::DuplicateIfNonNull(released);
-  if (GetArena() == nullptr) {
-    delete old;
-  }
-#else   // PROTOBUF_FORCE_COPY_IN_RELEASE
-  if (GetArena() != nullptr) {
-    released = ::google::protobuf::internal::DuplicateIfNonNull(released);
-  }
-#endif  // !PROTOBUF_FORCE_COPY_IN_RELEASE
-  return released;
-}
-inline ::io::deephaven::proto::backplane::grpc::UpdateByWindowScale* UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingCount::unsafe_arena_release_reverse_window_scale() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  // @@protoc_insertion_point(field_release:io.deephaven.proto.backplane.grpc.UpdateByRequest.UpdateByOperation.UpdateByColumn.UpdateBySpec.UpdateByRollingCount.reverse_window_scale)
-
-  _impl_._has_bits_[0] &= ~0x00000001u;
-  ::io::deephaven::proto::backplane::grpc::UpdateByWindowScale* temp = _impl_.reverse_window_scale_;
-  _impl_.reverse_window_scale_ = nullptr;
-  return temp;
-}
-inline ::io::deephaven::proto::backplane::grpc::UpdateByWindowScale* UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingCount::_internal_mutable_reverse_window_scale() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  _impl_._has_bits_[0] |= 0x00000001u;
-  if (_impl_.reverse_window_scale_ == nullptr) {
-    auto* p = CreateMaybeMessage<::io::deephaven::proto::backplane::grpc::UpdateByWindowScale>(GetArena());
-    _impl_.reverse_window_scale_ = reinterpret_cast<::io::deephaven::proto::backplane::grpc::UpdateByWindowScale*>(p);
-  }
-  return _impl_.reverse_window_scale_;
-}
-inline ::io::deephaven::proto::backplane::grpc::UpdateByWindowScale* UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingCount::mutable_reverse_window_scale() ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  ::io::deephaven::proto::backplane::grpc::UpdateByWindowScale* _msg = _internal_mutable_reverse_window_scale();
-  // @@protoc_insertion_point(field_mutable:io.deephaven.proto.backplane.grpc.UpdateByRequest.UpdateByOperation.UpdateByColumn.UpdateBySpec.UpdateByRollingCount.reverse_window_scale)
-  return _msg;
-}
-inline void UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingCount::set_allocated_reverse_window_scale(::io::deephaven::proto::backplane::grpc::UpdateByWindowScale* value) {
-  ::google::protobuf::Arena* message_arena = GetArena();
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  if (message_arena == nullptr) {
-    delete reinterpret_cast<::io::deephaven::proto::backplane::grpc::UpdateByWindowScale*>(_impl_.reverse_window_scale_);
-  }
-
-  if (value != nullptr) {
-    ::google::protobuf::Arena* submessage_arena = reinterpret_cast<::io::deephaven::proto::backplane::grpc::UpdateByWindowScale*>(value)->GetArena();
-    if (message_arena != submessage_arena) {
-      value = ::google::protobuf::internal::GetOwnedMessage(message_arena, value, submessage_arena);
-    }
-    _impl_._has_bits_[0] |= 0x00000001u;
-  } else {
-    _impl_._has_bits_[0] &= ~0x00000001u;
-  }
-
-  _impl_.reverse_window_scale_ = reinterpret_cast<::io::deephaven::proto::backplane::grpc::UpdateByWindowScale*>(value);
-  // @@protoc_insertion_point(field_set_allocated:io.deephaven.proto.backplane.grpc.UpdateByRequest.UpdateByOperation.UpdateByColumn.UpdateBySpec.UpdateByRollingCount.reverse_window_scale)
-}
-
-// .io.deephaven.proto.backplane.grpc.UpdateByWindowScale forward_window_scale = 2;
-inline bool UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingCount::has_forward_window_scale() const {
-  bool value = (_impl_._has_bits_[0] & 0x00000002u) != 0;
-  PROTOBUF_ASSUME(!value || _impl_.forward_window_scale_ != nullptr);
-  return value;
-}
-inline void UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingCount::clear_forward_window_scale() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  if (_impl_.forward_window_scale_ != nullptr) _impl_.forward_window_scale_->Clear();
-  _impl_._has_bits_[0] &= ~0x00000002u;
-}
-inline const ::io::deephaven::proto::backplane::grpc::UpdateByWindowScale& UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingCount::_internal_forward_window_scale() const {
-  PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race);
-  const ::io::deephaven::proto::backplane::grpc::UpdateByWindowScale* p = _impl_.forward_window_scale_;
-  return p != nullptr ? *p : reinterpret_cast<const ::io::deephaven::proto::backplane::grpc::UpdateByWindowScale&>(::io::deephaven::proto::backplane::grpc::_UpdateByWindowScale_default_instance_);
-}
-inline const ::io::deephaven::proto::backplane::grpc::UpdateByWindowScale& UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingCount::forward_window_scale() const ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  // @@protoc_insertion_point(field_get:io.deephaven.proto.backplane.grpc.UpdateByRequest.UpdateByOperation.UpdateByColumn.UpdateBySpec.UpdateByRollingCount.forward_window_scale)
-  return _internal_forward_window_scale();
-}
-inline void UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingCount::unsafe_arena_set_allocated_forward_window_scale(::io::deephaven::proto::backplane::grpc::UpdateByWindowScale* value) {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  if (GetArena() == nullptr) {
-    delete reinterpret_cast<::google::protobuf::MessageLite*>(_impl_.forward_window_scale_);
-  }
-  _impl_.forward_window_scale_ = reinterpret_cast<::io::deephaven::proto::backplane::grpc::UpdateByWindowScale*>(value);
-  if (value != nullptr) {
-    _impl_._has_bits_[0] |= 0x00000002u;
-  } else {
-    _impl_._has_bits_[0] &= ~0x00000002u;
-  }
-  // @@protoc_insertion_point(field_unsafe_arena_set_allocated:io.deephaven.proto.backplane.grpc.UpdateByRequest.UpdateByOperation.UpdateByColumn.UpdateBySpec.UpdateByRollingCount.forward_window_scale)
-}
-inline ::io::deephaven::proto::backplane::grpc::UpdateByWindowScale* UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingCount::release_forward_window_scale() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-
-  _impl_._has_bits_[0] &= ~0x00000002u;
-  ::io::deephaven::proto::backplane::grpc::UpdateByWindowScale* released = _impl_.forward_window_scale_;
-  _impl_.forward_window_scale_ = nullptr;
-#ifdef PROTOBUF_FORCE_COPY_IN_RELEASE
-  auto* old = reinterpret_cast<::google::protobuf::MessageLite*>(released);
-  released = ::google::protobuf::internal::DuplicateIfNonNull(released);
-  if (GetArena() == nullptr) {
-    delete old;
-  }
-#else   // PROTOBUF_FORCE_COPY_IN_RELEASE
-  if (GetArena() != nullptr) {
-    released = ::google::protobuf::internal::DuplicateIfNonNull(released);
-  }
-#endif  // !PROTOBUF_FORCE_COPY_IN_RELEASE
-  return released;
-}
-inline ::io::deephaven::proto::backplane::grpc::UpdateByWindowScale* UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingCount::unsafe_arena_release_forward_window_scale() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  // @@protoc_insertion_point(field_release:io.deephaven.proto.backplane.grpc.UpdateByRequest.UpdateByOperation.UpdateByColumn.UpdateBySpec.UpdateByRollingCount.forward_window_scale)
-
-  _impl_._has_bits_[0] &= ~0x00000002u;
-  ::io::deephaven::proto::backplane::grpc::UpdateByWindowScale* temp = _impl_.forward_window_scale_;
-  _impl_.forward_window_scale_ = nullptr;
-  return temp;
-}
-inline ::io::deephaven::proto::backplane::grpc::UpdateByWindowScale* UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingCount::_internal_mutable_forward_window_scale() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  _impl_._has_bits_[0] |= 0x00000002u;
-  if (_impl_.forward_window_scale_ == nullptr) {
-    auto* p = CreateMaybeMessage<::io::deephaven::proto::backplane::grpc::UpdateByWindowScale>(GetArena());
-    _impl_.forward_window_scale_ = reinterpret_cast<::io::deephaven::proto::backplane::grpc::UpdateByWindowScale*>(p);
-  }
-  return _impl_.forward_window_scale_;
-}
-inline ::io::deephaven::proto::backplane::grpc::UpdateByWindowScale* UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingCount::mutable_forward_window_scale() ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  ::io::deephaven::proto::backplane::grpc::UpdateByWindowScale* _msg = _internal_mutable_forward_window_scale();
-  // @@protoc_insertion_point(field_mutable:io.deephaven.proto.backplane.grpc.UpdateByRequest.UpdateByOperation.UpdateByColumn.UpdateBySpec.UpdateByRollingCount.forward_window_scale)
-  return _msg;
-}
-inline void UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingCount::set_allocated_forward_window_scale(::io::deephaven::proto::backplane::grpc::UpdateByWindowScale* value) {
-  ::google::protobuf::Arena* message_arena = GetArena();
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  if (message_arena == nullptr) {
-    delete reinterpret_cast<::io::deephaven::proto::backplane::grpc::UpdateByWindowScale*>(_impl_.forward_window_scale_);
-  }
-
-  if (value != nullptr) {
-    ::google::protobuf::Arena* submessage_arena = reinterpret_cast<::io::deephaven::proto::backplane::grpc::UpdateByWindowScale*>(value)->GetArena();
-    if (message_arena != submessage_arena) {
-      value = ::google::protobuf::internal::GetOwnedMessage(message_arena, value, submessage_arena);
-    }
-    _impl_._has_bits_[0] |= 0x00000002u;
-  } else {
-    _impl_._has_bits_[0] &= ~0x00000002u;
-  }
-
-  _impl_.forward_window_scale_ = reinterpret_cast<::io::deephaven::proto::backplane::grpc::UpdateByWindowScale*>(value);
-  // @@protoc_insertion_point(field_set_allocated:io.deephaven.proto.backplane.grpc.UpdateByRequest.UpdateByOperation.UpdateByColumn.UpdateBySpec.UpdateByRollingCount.forward_window_scale)
-}
-
-// -------------------------------------------------------------------
-
-// UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingStd
-
-// .io.deephaven.proto.backplane.grpc.UpdateByWindowScale reverse_window_scale = 1;
-inline bool UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingStd::has_reverse_window_scale() const {
-  bool value = (_impl_._has_bits_[0] & 0x00000001u) != 0;
-  PROTOBUF_ASSUME(!value || _impl_.reverse_window_scale_ != nullptr);
-  return value;
-}
-inline void UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingStd::clear_reverse_window_scale() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  if (_impl_.reverse_window_scale_ != nullptr) _impl_.reverse_window_scale_->Clear();
-  _impl_._has_bits_[0] &= ~0x00000001u;
-}
-inline const ::io::deephaven::proto::backplane::grpc::UpdateByWindowScale& UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingStd::_internal_reverse_window_scale() const {
-  PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race);
-  const ::io::deephaven::proto::backplane::grpc::UpdateByWindowScale* p = _impl_.reverse_window_scale_;
-  return p != nullptr ? *p : reinterpret_cast<const ::io::deephaven::proto::backplane::grpc::UpdateByWindowScale&>(::io::deephaven::proto::backplane::grpc::_UpdateByWindowScale_default_instance_);
-}
-inline const ::io::deephaven::proto::backplane::grpc::UpdateByWindowScale& UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingStd::reverse_window_scale() const ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  // @@protoc_insertion_point(field_get:io.deephaven.proto.backplane.grpc.UpdateByRequest.UpdateByOperation.UpdateByColumn.UpdateBySpec.UpdateByRollingStd.reverse_window_scale)
-  return _internal_reverse_window_scale();
-}
-inline void UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingStd::unsafe_arena_set_allocated_reverse_window_scale(::io::deephaven::proto::backplane::grpc::UpdateByWindowScale* value) {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  if (GetArena() == nullptr) {
-    delete reinterpret_cast<::google::protobuf::MessageLite*>(_impl_.reverse_window_scale_);
-  }
-  _impl_.reverse_window_scale_ = reinterpret_cast<::io::deephaven::proto::backplane::grpc::UpdateByWindowScale*>(value);
-  if (value != nullptr) {
-    _impl_._has_bits_[0] |= 0x00000001u;
-  } else {
-    _impl_._has_bits_[0] &= ~0x00000001u;
-  }
-  // @@protoc_insertion_point(field_unsafe_arena_set_allocated:io.deephaven.proto.backplane.grpc.UpdateByRequest.UpdateByOperation.UpdateByColumn.UpdateBySpec.UpdateByRollingStd.reverse_window_scale)
-}
-inline ::io::deephaven::proto::backplane::grpc::UpdateByWindowScale* UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingStd::release_reverse_window_scale() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-
-  _impl_._has_bits_[0] &= ~0x00000001u;
-  ::io::deephaven::proto::backplane::grpc::UpdateByWindowScale* released = _impl_.reverse_window_scale_;
-  _impl_.reverse_window_scale_ = nullptr;
-#ifdef PROTOBUF_FORCE_COPY_IN_RELEASE
-  auto* old = reinterpret_cast<::google::protobuf::MessageLite*>(released);
-  released = ::google::protobuf::internal::DuplicateIfNonNull(released);
-  if (GetArena() == nullptr) {
-    delete old;
-  }
-#else   // PROTOBUF_FORCE_COPY_IN_RELEASE
-  if (GetArena() != nullptr) {
-    released = ::google::protobuf::internal::DuplicateIfNonNull(released);
-  }
-#endif  // !PROTOBUF_FORCE_COPY_IN_RELEASE
-  return released;
-}
-inline ::io::deephaven::proto::backplane::grpc::UpdateByWindowScale* UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingStd::unsafe_arena_release_reverse_window_scale() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  // @@protoc_insertion_point(field_release:io.deephaven.proto.backplane.grpc.UpdateByRequest.UpdateByOperation.UpdateByColumn.UpdateBySpec.UpdateByRollingStd.reverse_window_scale)
-
-  _impl_._has_bits_[0] &= ~0x00000001u;
-  ::io::deephaven::proto::backplane::grpc::UpdateByWindowScale* temp = _impl_.reverse_window_scale_;
-  _impl_.reverse_window_scale_ = nullptr;
-  return temp;
-}
-inline ::io::deephaven::proto::backplane::grpc::UpdateByWindowScale* UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingStd::_internal_mutable_reverse_window_scale() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  _impl_._has_bits_[0] |= 0x00000001u;
-  if (_impl_.reverse_window_scale_ == nullptr) {
-    auto* p = CreateMaybeMessage<::io::deephaven::proto::backplane::grpc::UpdateByWindowScale>(GetArena());
-    _impl_.reverse_window_scale_ = reinterpret_cast<::io::deephaven::proto::backplane::grpc::UpdateByWindowScale*>(p);
-  }
-  return _impl_.reverse_window_scale_;
-}
-inline ::io::deephaven::proto::backplane::grpc::UpdateByWindowScale* UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingStd::mutable_reverse_window_scale() ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  ::io::deephaven::proto::backplane::grpc::UpdateByWindowScale* _msg = _internal_mutable_reverse_window_scale();
-  // @@protoc_insertion_point(field_mutable:io.deephaven.proto.backplane.grpc.UpdateByRequest.UpdateByOperation.UpdateByColumn.UpdateBySpec.UpdateByRollingStd.reverse_window_scale)
-  return _msg;
-}
-inline void UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingStd::set_allocated_reverse_window_scale(::io::deephaven::proto::backplane::grpc::UpdateByWindowScale* value) {
-  ::google::protobuf::Arena* message_arena = GetArena();
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  if (message_arena == nullptr) {
-    delete reinterpret_cast<::io::deephaven::proto::backplane::grpc::UpdateByWindowScale*>(_impl_.reverse_window_scale_);
-  }
-
-  if (value != nullptr) {
-    ::google::protobuf::Arena* submessage_arena = reinterpret_cast<::io::deephaven::proto::backplane::grpc::UpdateByWindowScale*>(value)->GetArena();
-    if (message_arena != submessage_arena) {
-      value = ::google::protobuf::internal::GetOwnedMessage(message_arena, value, submessage_arena);
-    }
-    _impl_._has_bits_[0] |= 0x00000001u;
-  } else {
-    _impl_._has_bits_[0] &= ~0x00000001u;
-  }
-
-  _impl_.reverse_window_scale_ = reinterpret_cast<::io::deephaven::proto::backplane::grpc::UpdateByWindowScale*>(value);
-  // @@protoc_insertion_point(field_set_allocated:io.deephaven.proto.backplane.grpc.UpdateByRequest.UpdateByOperation.UpdateByColumn.UpdateBySpec.UpdateByRollingStd.reverse_window_scale)
-}
-
-// .io.deephaven.proto.backplane.grpc.UpdateByWindowScale forward_window_scale = 2;
-inline bool UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingStd::has_forward_window_scale() const {
-  bool value = (_impl_._has_bits_[0] & 0x00000002u) != 0;
-  PROTOBUF_ASSUME(!value || _impl_.forward_window_scale_ != nullptr);
-  return value;
-}
-inline void UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingStd::clear_forward_window_scale() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  if (_impl_.forward_window_scale_ != nullptr) _impl_.forward_window_scale_->Clear();
-  _impl_._has_bits_[0] &= ~0x00000002u;
-}
-inline const ::io::deephaven::proto::backplane::grpc::UpdateByWindowScale& UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingStd::_internal_forward_window_scale() const {
-  PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race);
-  const ::io::deephaven::proto::backplane::grpc::UpdateByWindowScale* p = _impl_.forward_window_scale_;
-  return p != nullptr ? *p : reinterpret_cast<const ::io::deephaven::proto::backplane::grpc::UpdateByWindowScale&>(::io::deephaven::proto::backplane::grpc::_UpdateByWindowScale_default_instance_);
-}
-inline const ::io::deephaven::proto::backplane::grpc::UpdateByWindowScale& UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingStd::forward_window_scale() const ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  // @@protoc_insertion_point(field_get:io.deephaven.proto.backplane.grpc.UpdateByRequest.UpdateByOperation.UpdateByColumn.UpdateBySpec.UpdateByRollingStd.forward_window_scale)
-  return _internal_forward_window_scale();
-}
-inline void UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingStd::unsafe_arena_set_allocated_forward_window_scale(::io::deephaven::proto::backplane::grpc::UpdateByWindowScale* value) {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  if (GetArena() == nullptr) {
-    delete reinterpret_cast<::google::protobuf::MessageLite*>(_impl_.forward_window_scale_);
-  }
-  _impl_.forward_window_scale_ = reinterpret_cast<::io::deephaven::proto::backplane::grpc::UpdateByWindowScale*>(value);
-  if (value != nullptr) {
-    _impl_._has_bits_[0] |= 0x00000002u;
-  } else {
-    _impl_._has_bits_[0] &= ~0x00000002u;
-  }
-  // @@protoc_insertion_point(field_unsafe_arena_set_allocated:io.deephaven.proto.backplane.grpc.UpdateByRequest.UpdateByOperation.UpdateByColumn.UpdateBySpec.UpdateByRollingStd.forward_window_scale)
-}
-inline ::io::deephaven::proto::backplane::grpc::UpdateByWindowScale* UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingStd::release_forward_window_scale() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-
-  _impl_._has_bits_[0] &= ~0x00000002u;
-  ::io::deephaven::proto::backplane::grpc::UpdateByWindowScale* released = _impl_.forward_window_scale_;
-  _impl_.forward_window_scale_ = nullptr;
-#ifdef PROTOBUF_FORCE_COPY_IN_RELEASE
-  auto* old = reinterpret_cast<::google::protobuf::MessageLite*>(released);
-  released = ::google::protobuf::internal::DuplicateIfNonNull(released);
-  if (GetArena() == nullptr) {
-    delete old;
-  }
-#else   // PROTOBUF_FORCE_COPY_IN_RELEASE
-  if (GetArena() != nullptr) {
-    released = ::google::protobuf::internal::DuplicateIfNonNull(released);
-  }
-#endif  // !PROTOBUF_FORCE_COPY_IN_RELEASE
-  return released;
-}
-inline ::io::deephaven::proto::backplane::grpc::UpdateByWindowScale* UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingStd::unsafe_arena_release_forward_window_scale() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  // @@protoc_insertion_point(field_release:io.deephaven.proto.backplane.grpc.UpdateByRequest.UpdateByOperation.UpdateByColumn.UpdateBySpec.UpdateByRollingStd.forward_window_scale)
-
-  _impl_._has_bits_[0] &= ~0x00000002u;
-  ::io::deephaven::proto::backplane::grpc::UpdateByWindowScale* temp = _impl_.forward_window_scale_;
-  _impl_.forward_window_scale_ = nullptr;
-  return temp;
-}
-inline ::io::deephaven::proto::backplane::grpc::UpdateByWindowScale* UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingStd::_internal_mutable_forward_window_scale() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  _impl_._has_bits_[0] |= 0x00000002u;
-  if (_impl_.forward_window_scale_ == nullptr) {
-    auto* p = CreateMaybeMessage<::io::deephaven::proto::backplane::grpc::UpdateByWindowScale>(GetArena());
-    _impl_.forward_window_scale_ = reinterpret_cast<::io::deephaven::proto::backplane::grpc::UpdateByWindowScale*>(p);
-  }
-  return _impl_.forward_window_scale_;
-}
-inline ::io::deephaven::proto::backplane::grpc::UpdateByWindowScale* UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingStd::mutable_forward_window_scale() ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  ::io::deephaven::proto::backplane::grpc::UpdateByWindowScale* _msg = _internal_mutable_forward_window_scale();
-  // @@protoc_insertion_point(field_mutable:io.deephaven.proto.backplane.grpc.UpdateByRequest.UpdateByOperation.UpdateByColumn.UpdateBySpec.UpdateByRollingStd.forward_window_scale)
-  return _msg;
-}
-inline void UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingStd::set_allocated_forward_window_scale(::io::deephaven::proto::backplane::grpc::UpdateByWindowScale* value) {
-  ::google::protobuf::Arena* message_arena = GetArena();
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  if (message_arena == nullptr) {
-    delete reinterpret_cast<::io::deephaven::proto::backplane::grpc::UpdateByWindowScale*>(_impl_.forward_window_scale_);
-  }
-
-  if (value != nullptr) {
-    ::google::protobuf::Arena* submessage_arena = reinterpret_cast<::io::deephaven::proto::backplane::grpc::UpdateByWindowScale*>(value)->GetArena();
-    if (message_arena != submessage_arena) {
-      value = ::google::protobuf::internal::GetOwnedMessage(message_arena, value, submessage_arena);
-    }
-    _impl_._has_bits_[0] |= 0x00000002u;
-  } else {
-    _impl_._has_bits_[0] &= ~0x00000002u;
-  }
-
-  _impl_.forward_window_scale_ = reinterpret_cast<::io::deephaven::proto::backplane::grpc::UpdateByWindowScale*>(value);
-  // @@protoc_insertion_point(field_set_allocated:io.deephaven.proto.backplane.grpc.UpdateByRequest.UpdateByOperation.UpdateByColumn.UpdateBySpec.UpdateByRollingStd.forward_window_scale)
-}
-
-// -------------------------------------------------------------------
-
-// UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingWAvg
-
-// .io.deephaven.proto.backplane.grpc.UpdateByWindowScale reverse_window_scale = 1;
-inline bool UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingWAvg::has_reverse_window_scale() const {
-  bool value = (_impl_._has_bits_[0] & 0x00000001u) != 0;
-  PROTOBUF_ASSUME(!value || _impl_.reverse_window_scale_ != nullptr);
-  return value;
-}
-inline void UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingWAvg::clear_reverse_window_scale() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  if (_impl_.reverse_window_scale_ != nullptr) _impl_.reverse_window_scale_->Clear();
-  _impl_._has_bits_[0] &= ~0x00000001u;
-}
-inline const ::io::deephaven::proto::backplane::grpc::UpdateByWindowScale& UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingWAvg::_internal_reverse_window_scale() const {
-  PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race);
-  const ::io::deephaven::proto::backplane::grpc::UpdateByWindowScale* p = _impl_.reverse_window_scale_;
-  return p != nullptr ? *p : reinterpret_cast<const ::io::deephaven::proto::backplane::grpc::UpdateByWindowScale&>(::io::deephaven::proto::backplane::grpc::_UpdateByWindowScale_default_instance_);
-}
-inline const ::io::deephaven::proto::backplane::grpc::UpdateByWindowScale& UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingWAvg::reverse_window_scale() const ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  // @@protoc_insertion_point(field_get:io.deephaven.proto.backplane.grpc.UpdateByRequest.UpdateByOperation.UpdateByColumn.UpdateBySpec.UpdateByRollingWAvg.reverse_window_scale)
-  return _internal_reverse_window_scale();
-}
-inline void UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingWAvg::unsafe_arena_set_allocated_reverse_window_scale(::io::deephaven::proto::backplane::grpc::UpdateByWindowScale* value) {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  if (GetArena() == nullptr) {
-    delete reinterpret_cast<::google::protobuf::MessageLite*>(_impl_.reverse_window_scale_);
-  }
-  _impl_.reverse_window_scale_ = reinterpret_cast<::io::deephaven::proto::backplane::grpc::UpdateByWindowScale*>(value);
-  if (value != nullptr) {
-    _impl_._has_bits_[0] |= 0x00000001u;
-  } else {
-    _impl_._has_bits_[0] &= ~0x00000001u;
-  }
-  // @@protoc_insertion_point(field_unsafe_arena_set_allocated:io.deephaven.proto.backplane.grpc.UpdateByRequest.UpdateByOperation.UpdateByColumn.UpdateBySpec.UpdateByRollingWAvg.reverse_window_scale)
-}
-inline ::io::deephaven::proto::backplane::grpc::UpdateByWindowScale* UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingWAvg::release_reverse_window_scale() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-
-  _impl_._has_bits_[0] &= ~0x00000001u;
-  ::io::deephaven::proto::backplane::grpc::UpdateByWindowScale* released = _impl_.reverse_window_scale_;
-  _impl_.reverse_window_scale_ = nullptr;
-#ifdef PROTOBUF_FORCE_COPY_IN_RELEASE
-  auto* old = reinterpret_cast<::google::protobuf::MessageLite*>(released);
-  released = ::google::protobuf::internal::DuplicateIfNonNull(released);
-  if (GetArena() == nullptr) {
-    delete old;
-  }
-#else   // PROTOBUF_FORCE_COPY_IN_RELEASE
-  if (GetArena() != nullptr) {
-    released = ::google::protobuf::internal::DuplicateIfNonNull(released);
-  }
-#endif  // !PROTOBUF_FORCE_COPY_IN_RELEASE
-  return released;
-}
-inline ::io::deephaven::proto::backplane::grpc::UpdateByWindowScale* UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingWAvg::unsafe_arena_release_reverse_window_scale() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  // @@protoc_insertion_point(field_release:io.deephaven.proto.backplane.grpc.UpdateByRequest.UpdateByOperation.UpdateByColumn.UpdateBySpec.UpdateByRollingWAvg.reverse_window_scale)
-
-  _impl_._has_bits_[0] &= ~0x00000001u;
-  ::io::deephaven::proto::backplane::grpc::UpdateByWindowScale* temp = _impl_.reverse_window_scale_;
-  _impl_.reverse_window_scale_ = nullptr;
-  return temp;
-}
-inline ::io::deephaven::proto::backplane::grpc::UpdateByWindowScale* UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingWAvg::_internal_mutable_reverse_window_scale() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  _impl_._has_bits_[0] |= 0x00000001u;
-  if (_impl_.reverse_window_scale_ == nullptr) {
-    auto* p = CreateMaybeMessage<::io::deephaven::proto::backplane::grpc::UpdateByWindowScale>(GetArena());
-    _impl_.reverse_window_scale_ = reinterpret_cast<::io::deephaven::proto::backplane::grpc::UpdateByWindowScale*>(p);
-  }
-  return _impl_.reverse_window_scale_;
-}
-inline ::io::deephaven::proto::backplane::grpc::UpdateByWindowScale* UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingWAvg::mutable_reverse_window_scale() ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  ::io::deephaven::proto::backplane::grpc::UpdateByWindowScale* _msg = _internal_mutable_reverse_window_scale();
-  // @@protoc_insertion_point(field_mutable:io.deephaven.proto.backplane.grpc.UpdateByRequest.UpdateByOperation.UpdateByColumn.UpdateBySpec.UpdateByRollingWAvg.reverse_window_scale)
-  return _msg;
-}
-inline void UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingWAvg::set_allocated_reverse_window_scale(::io::deephaven::proto::backplane::grpc::UpdateByWindowScale* value) {
-  ::google::protobuf::Arena* message_arena = GetArena();
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  if (message_arena == nullptr) {
-    delete reinterpret_cast<::io::deephaven::proto::backplane::grpc::UpdateByWindowScale*>(_impl_.reverse_window_scale_);
-  }
-
-  if (value != nullptr) {
-    ::google::protobuf::Arena* submessage_arena = reinterpret_cast<::io::deephaven::proto::backplane::grpc::UpdateByWindowScale*>(value)->GetArena();
-    if (message_arena != submessage_arena) {
-      value = ::google::protobuf::internal::GetOwnedMessage(message_arena, value, submessage_arena);
-    }
-    _impl_._has_bits_[0] |= 0x00000001u;
-  } else {
-    _impl_._has_bits_[0] &= ~0x00000001u;
-  }
-
-  _impl_.reverse_window_scale_ = reinterpret_cast<::io::deephaven::proto::backplane::grpc::UpdateByWindowScale*>(value);
-  // @@protoc_insertion_point(field_set_allocated:io.deephaven.proto.backplane.grpc.UpdateByRequest.UpdateByOperation.UpdateByColumn.UpdateBySpec.UpdateByRollingWAvg.reverse_window_scale)
-}
-
-// .io.deephaven.proto.backplane.grpc.UpdateByWindowScale forward_window_scale = 2;
-inline bool UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingWAvg::has_forward_window_scale() const {
-  bool value = (_impl_._has_bits_[0] & 0x00000002u) != 0;
-  PROTOBUF_ASSUME(!value || _impl_.forward_window_scale_ != nullptr);
-  return value;
-}
-inline void UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingWAvg::clear_forward_window_scale() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  if (_impl_.forward_window_scale_ != nullptr) _impl_.forward_window_scale_->Clear();
-  _impl_._has_bits_[0] &= ~0x00000002u;
-}
-inline const ::io::deephaven::proto::backplane::grpc::UpdateByWindowScale& UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingWAvg::_internal_forward_window_scale() const {
-  PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race);
-  const ::io::deephaven::proto::backplane::grpc::UpdateByWindowScale* p = _impl_.forward_window_scale_;
-  return p != nullptr ? *p : reinterpret_cast<const ::io::deephaven::proto::backplane::grpc::UpdateByWindowScale&>(::io::deephaven::proto::backplane::grpc::_UpdateByWindowScale_default_instance_);
-}
-inline const ::io::deephaven::proto::backplane::grpc::UpdateByWindowScale& UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingWAvg::forward_window_scale() const ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  // @@protoc_insertion_point(field_get:io.deephaven.proto.backplane.grpc.UpdateByRequest.UpdateByOperation.UpdateByColumn.UpdateBySpec.UpdateByRollingWAvg.forward_window_scale)
-  return _internal_forward_window_scale();
-}
-inline void UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingWAvg::unsafe_arena_set_allocated_forward_window_scale(::io::deephaven::proto::backplane::grpc::UpdateByWindowScale* value) {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  if (GetArena() == nullptr) {
-    delete reinterpret_cast<::google::protobuf::MessageLite*>(_impl_.forward_window_scale_);
-  }
-  _impl_.forward_window_scale_ = reinterpret_cast<::io::deephaven::proto::backplane::grpc::UpdateByWindowScale*>(value);
-  if (value != nullptr) {
-    _impl_._has_bits_[0] |= 0x00000002u;
-  } else {
-    _impl_._has_bits_[0] &= ~0x00000002u;
-  }
-  // @@protoc_insertion_point(field_unsafe_arena_set_allocated:io.deephaven.proto.backplane.grpc.UpdateByRequest.UpdateByOperation.UpdateByColumn.UpdateBySpec.UpdateByRollingWAvg.forward_window_scale)
-}
-inline ::io::deephaven::proto::backplane::grpc::UpdateByWindowScale* UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingWAvg::release_forward_window_scale() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-
-  _impl_._has_bits_[0] &= ~0x00000002u;
-  ::io::deephaven::proto::backplane::grpc::UpdateByWindowScale* released = _impl_.forward_window_scale_;
-  _impl_.forward_window_scale_ = nullptr;
-#ifdef PROTOBUF_FORCE_COPY_IN_RELEASE
-  auto* old = reinterpret_cast<::google::protobuf::MessageLite*>(released);
-  released = ::google::protobuf::internal::DuplicateIfNonNull(released);
-  if (GetArena() == nullptr) {
-    delete old;
-  }
-#else   // PROTOBUF_FORCE_COPY_IN_RELEASE
-  if (GetArena() != nullptr) {
-    released = ::google::protobuf::internal::DuplicateIfNonNull(released);
-  }
-#endif  // !PROTOBUF_FORCE_COPY_IN_RELEASE
-  return released;
-}
-inline ::io::deephaven::proto::backplane::grpc::UpdateByWindowScale* UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingWAvg::unsafe_arena_release_forward_window_scale() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  // @@protoc_insertion_point(field_release:io.deephaven.proto.backplane.grpc.UpdateByRequest.UpdateByOperation.UpdateByColumn.UpdateBySpec.UpdateByRollingWAvg.forward_window_scale)
-
-  _impl_._has_bits_[0] &= ~0x00000002u;
-  ::io::deephaven::proto::backplane::grpc::UpdateByWindowScale* temp = _impl_.forward_window_scale_;
-  _impl_.forward_window_scale_ = nullptr;
-  return temp;
-}
-inline ::io::deephaven::proto::backplane::grpc::UpdateByWindowScale* UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingWAvg::_internal_mutable_forward_window_scale() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  _impl_._has_bits_[0] |= 0x00000002u;
-  if (_impl_.forward_window_scale_ == nullptr) {
-    auto* p = CreateMaybeMessage<::io::deephaven::proto::backplane::grpc::UpdateByWindowScale>(GetArena());
-    _impl_.forward_window_scale_ = reinterpret_cast<::io::deephaven::proto::backplane::grpc::UpdateByWindowScale*>(p);
-  }
-  return _impl_.forward_window_scale_;
-}
-inline ::io::deephaven::proto::backplane::grpc::UpdateByWindowScale* UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingWAvg::mutable_forward_window_scale() ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  ::io::deephaven::proto::backplane::grpc::UpdateByWindowScale* _msg = _internal_mutable_forward_window_scale();
-  // @@protoc_insertion_point(field_mutable:io.deephaven.proto.backplane.grpc.UpdateByRequest.UpdateByOperation.UpdateByColumn.UpdateBySpec.UpdateByRollingWAvg.forward_window_scale)
-  return _msg;
-}
-inline void UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingWAvg::set_allocated_forward_window_scale(::io::deephaven::proto::backplane::grpc::UpdateByWindowScale* value) {
-  ::google::protobuf::Arena* message_arena = GetArena();
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  if (message_arena == nullptr) {
-    delete reinterpret_cast<::io::deephaven::proto::backplane::grpc::UpdateByWindowScale*>(_impl_.forward_window_scale_);
-  }
-
-  if (value != nullptr) {
-    ::google::protobuf::Arena* submessage_arena = reinterpret_cast<::io::deephaven::proto::backplane::grpc::UpdateByWindowScale*>(value)->GetArena();
-    if (message_arena != submessage_arena) {
-      value = ::google::protobuf::internal::GetOwnedMessage(message_arena, value, submessage_arena);
-    }
-    _impl_._has_bits_[0] |= 0x00000002u;
-  } else {
-    _impl_._has_bits_[0] &= ~0x00000002u;
-  }
-
-  _impl_.forward_window_scale_ = reinterpret_cast<::io::deephaven::proto::backplane::grpc::UpdateByWindowScale*>(value);
-  // @@protoc_insertion_point(field_set_allocated:io.deephaven.proto.backplane.grpc.UpdateByRequest.UpdateByOperation.UpdateByColumn.UpdateBySpec.UpdateByRollingWAvg.forward_window_scale)
-}
-
-// string weight_column = 3;
-inline void UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingWAvg::clear_weight_column() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  _impl_.weight_column_.ClearToEmpty();
-}
-inline const std::string& UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingWAvg::weight_column() const
-    ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  // @@protoc_insertion_point(field_get:io.deephaven.proto.backplane.grpc.UpdateByRequest.UpdateByOperation.UpdateByColumn.UpdateBySpec.UpdateByRollingWAvg.weight_column)
-  return _internal_weight_column();
-}
-template <typename Arg_, typename... Args_>
-inline PROTOBUF_ALWAYS_INLINE void UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingWAvg::set_weight_column(Arg_&& arg,
-                                                     Args_... args) {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  ;
-  _impl_.weight_column_.Set(static_cast<Arg_&&>(arg), args..., GetArena());
-  // @@protoc_insertion_point(field_set:io.deephaven.proto.backplane.grpc.UpdateByRequest.UpdateByOperation.UpdateByColumn.UpdateBySpec.UpdateByRollingWAvg.weight_column)
-}
-inline std::string* UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingWAvg::mutable_weight_column() ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  std::string* _s = _internal_mutable_weight_column();
-  // @@protoc_insertion_point(field_mutable:io.deephaven.proto.backplane.grpc.UpdateByRequest.UpdateByOperation.UpdateByColumn.UpdateBySpec.UpdateByRollingWAvg.weight_column)
-  return _s;
-}
-inline const std::string& UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingWAvg::_internal_weight_column() const {
-  PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race);
-  return _impl_.weight_column_.Get();
-}
-inline void UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingWAvg::_internal_set_weight_column(const std::string& value) {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  ;
-  _impl_.weight_column_.Set(value, GetArena());
-}
-inline std::string* UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingWAvg::_internal_mutable_weight_column() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  ;
-  return _impl_.weight_column_.Mutable( GetArena());
-}
-inline std::string* UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingWAvg::release_weight_column() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  // @@protoc_insertion_point(field_release:io.deephaven.proto.backplane.grpc.UpdateByRequest.UpdateByOperation.UpdateByColumn.UpdateBySpec.UpdateByRollingWAvg.weight_column)
-  return _impl_.weight_column_.Release();
-}
-inline void UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingWAvg::set_allocated_weight_column(std::string* value) {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  _impl_.weight_column_.SetAllocated(value, GetArena());
-  #ifdef PROTOBUF_FORCE_COPY_DEFAULT_STRING
-        if (_impl_.weight_column_.IsDefault()) {
-          _impl_.weight_column_.Set("", GetArena());
-        }
-  #endif  // PROTOBUF_FORCE_COPY_DEFAULT_STRING
-  // @@protoc_insertion_point(field_set_allocated:io.deephaven.proto.backplane.grpc.UpdateByRequest.UpdateByOperation.UpdateByColumn.UpdateBySpec.UpdateByRollingWAvg.weight_column)
-}
-
-// -------------------------------------------------------------------
-
-// UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingFormula
-
-// .io.deephaven.proto.backplane.grpc.UpdateByWindowScale reverse_window_scale = 1;
-inline bool UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingFormula::has_reverse_window_scale() const {
-  bool value = (_impl_._has_bits_[0] & 0x00000001u) != 0;
-  PROTOBUF_ASSUME(!value || _impl_.reverse_window_scale_ != nullptr);
-  return value;
-}
-inline void UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingFormula::clear_reverse_window_scale() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  if (_impl_.reverse_window_scale_ != nullptr) _impl_.reverse_window_scale_->Clear();
-  _impl_._has_bits_[0] &= ~0x00000001u;
-}
-inline const ::io::deephaven::proto::backplane::grpc::UpdateByWindowScale& UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingFormula::_internal_reverse_window_scale() const {
-  PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race);
-  const ::io::deephaven::proto::backplane::grpc::UpdateByWindowScale* p = _impl_.reverse_window_scale_;
-  return p != nullptr ? *p : reinterpret_cast<const ::io::deephaven::proto::backplane::grpc::UpdateByWindowScale&>(::io::deephaven::proto::backplane::grpc::_UpdateByWindowScale_default_instance_);
-}
-inline const ::io::deephaven::proto::backplane::grpc::UpdateByWindowScale& UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingFormula::reverse_window_scale() const ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  // @@protoc_insertion_point(field_get:io.deephaven.proto.backplane.grpc.UpdateByRequest.UpdateByOperation.UpdateByColumn.UpdateBySpec.UpdateByRollingFormula.reverse_window_scale)
-  return _internal_reverse_window_scale();
-}
-inline void UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingFormula::unsafe_arena_set_allocated_reverse_window_scale(::io::deephaven::proto::backplane::grpc::UpdateByWindowScale* value) {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  if (GetArena() == nullptr) {
-    delete reinterpret_cast<::google::protobuf::MessageLite*>(_impl_.reverse_window_scale_);
-  }
-  _impl_.reverse_window_scale_ = reinterpret_cast<::io::deephaven::proto::backplane::grpc::UpdateByWindowScale*>(value);
-  if (value != nullptr) {
-    _impl_._has_bits_[0] |= 0x00000001u;
-  } else {
-    _impl_._has_bits_[0] &= ~0x00000001u;
-  }
-  // @@protoc_insertion_point(field_unsafe_arena_set_allocated:io.deephaven.proto.backplane.grpc.UpdateByRequest.UpdateByOperation.UpdateByColumn.UpdateBySpec.UpdateByRollingFormula.reverse_window_scale)
-}
-inline ::io::deephaven::proto::backplane::grpc::UpdateByWindowScale* UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingFormula::release_reverse_window_scale() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-
-  _impl_._has_bits_[0] &= ~0x00000001u;
-  ::io::deephaven::proto::backplane::grpc::UpdateByWindowScale* released = _impl_.reverse_window_scale_;
-  _impl_.reverse_window_scale_ = nullptr;
-#ifdef PROTOBUF_FORCE_COPY_IN_RELEASE
-  auto* old = reinterpret_cast<::google::protobuf::MessageLite*>(released);
-  released = ::google::protobuf::internal::DuplicateIfNonNull(released);
-  if (GetArena() == nullptr) {
-    delete old;
-  }
-#else   // PROTOBUF_FORCE_COPY_IN_RELEASE
-  if (GetArena() != nullptr) {
-    released = ::google::protobuf::internal::DuplicateIfNonNull(released);
-  }
-#endif  // !PROTOBUF_FORCE_COPY_IN_RELEASE
-  return released;
-}
-inline ::io::deephaven::proto::backplane::grpc::UpdateByWindowScale* UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingFormula::unsafe_arena_release_reverse_window_scale() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  // @@protoc_insertion_point(field_release:io.deephaven.proto.backplane.grpc.UpdateByRequest.UpdateByOperation.UpdateByColumn.UpdateBySpec.UpdateByRollingFormula.reverse_window_scale)
-
-  _impl_._has_bits_[0] &= ~0x00000001u;
-  ::io::deephaven::proto::backplane::grpc::UpdateByWindowScale* temp = _impl_.reverse_window_scale_;
-  _impl_.reverse_window_scale_ = nullptr;
-  return temp;
-}
-inline ::io::deephaven::proto::backplane::grpc::UpdateByWindowScale* UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingFormula::_internal_mutable_reverse_window_scale() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  _impl_._has_bits_[0] |= 0x00000001u;
-  if (_impl_.reverse_window_scale_ == nullptr) {
-    auto* p = CreateMaybeMessage<::io::deephaven::proto::backplane::grpc::UpdateByWindowScale>(GetArena());
-    _impl_.reverse_window_scale_ = reinterpret_cast<::io::deephaven::proto::backplane::grpc::UpdateByWindowScale*>(p);
-  }
-  return _impl_.reverse_window_scale_;
-}
-inline ::io::deephaven::proto::backplane::grpc::UpdateByWindowScale* UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingFormula::mutable_reverse_window_scale() ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  ::io::deephaven::proto::backplane::grpc::UpdateByWindowScale* _msg = _internal_mutable_reverse_window_scale();
-  // @@protoc_insertion_point(field_mutable:io.deephaven.proto.backplane.grpc.UpdateByRequest.UpdateByOperation.UpdateByColumn.UpdateBySpec.UpdateByRollingFormula.reverse_window_scale)
-  return _msg;
-}
-inline void UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingFormula::set_allocated_reverse_window_scale(::io::deephaven::proto::backplane::grpc::UpdateByWindowScale* value) {
-  ::google::protobuf::Arena* message_arena = GetArena();
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  if (message_arena == nullptr) {
-    delete reinterpret_cast<::io::deephaven::proto::backplane::grpc::UpdateByWindowScale*>(_impl_.reverse_window_scale_);
-  }
-
-  if (value != nullptr) {
-    ::google::protobuf::Arena* submessage_arena = reinterpret_cast<::io::deephaven::proto::backplane::grpc::UpdateByWindowScale*>(value)->GetArena();
-    if (message_arena != submessage_arena) {
-      value = ::google::protobuf::internal::GetOwnedMessage(message_arena, value, submessage_arena);
-    }
-    _impl_._has_bits_[0] |= 0x00000001u;
-  } else {
-    _impl_._has_bits_[0] &= ~0x00000001u;
-  }
-
-  _impl_.reverse_window_scale_ = reinterpret_cast<::io::deephaven::proto::backplane::grpc::UpdateByWindowScale*>(value);
-  // @@protoc_insertion_point(field_set_allocated:io.deephaven.proto.backplane.grpc.UpdateByRequest.UpdateByOperation.UpdateByColumn.UpdateBySpec.UpdateByRollingFormula.reverse_window_scale)
-}
-
-// .io.deephaven.proto.backplane.grpc.UpdateByWindowScale forward_window_scale = 2;
-inline bool UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingFormula::has_forward_window_scale() const {
-  bool value = (_impl_._has_bits_[0] & 0x00000002u) != 0;
-  PROTOBUF_ASSUME(!value || _impl_.forward_window_scale_ != nullptr);
-  return value;
-}
-inline void UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingFormula::clear_forward_window_scale() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  if (_impl_.forward_window_scale_ != nullptr) _impl_.forward_window_scale_->Clear();
-  _impl_._has_bits_[0] &= ~0x00000002u;
-}
-inline const ::io::deephaven::proto::backplane::grpc::UpdateByWindowScale& UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingFormula::_internal_forward_window_scale() const {
-  PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race);
-  const ::io::deephaven::proto::backplane::grpc::UpdateByWindowScale* p = _impl_.forward_window_scale_;
-  return p != nullptr ? *p : reinterpret_cast<const ::io::deephaven::proto::backplane::grpc::UpdateByWindowScale&>(::io::deephaven::proto::backplane::grpc::_UpdateByWindowScale_default_instance_);
-}
-inline const ::io::deephaven::proto::backplane::grpc::UpdateByWindowScale& UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingFormula::forward_window_scale() const ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  // @@protoc_insertion_point(field_get:io.deephaven.proto.backplane.grpc.UpdateByRequest.UpdateByOperation.UpdateByColumn.UpdateBySpec.UpdateByRollingFormula.forward_window_scale)
-  return _internal_forward_window_scale();
-}
-inline void UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingFormula::unsafe_arena_set_allocated_forward_window_scale(::io::deephaven::proto::backplane::grpc::UpdateByWindowScale* value) {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  if (GetArena() == nullptr) {
-    delete reinterpret_cast<::google::protobuf::MessageLite*>(_impl_.forward_window_scale_);
-  }
-  _impl_.forward_window_scale_ = reinterpret_cast<::io::deephaven::proto::backplane::grpc::UpdateByWindowScale*>(value);
-  if (value != nullptr) {
-    _impl_._has_bits_[0] |= 0x00000002u;
-  } else {
-    _impl_._has_bits_[0] &= ~0x00000002u;
-  }
-  // @@protoc_insertion_point(field_unsafe_arena_set_allocated:io.deephaven.proto.backplane.grpc.UpdateByRequest.UpdateByOperation.UpdateByColumn.UpdateBySpec.UpdateByRollingFormula.forward_window_scale)
-}
-inline ::io::deephaven::proto::backplane::grpc::UpdateByWindowScale* UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingFormula::release_forward_window_scale() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-
-  _impl_._has_bits_[0] &= ~0x00000002u;
-  ::io::deephaven::proto::backplane::grpc::UpdateByWindowScale* released = _impl_.forward_window_scale_;
-  _impl_.forward_window_scale_ = nullptr;
-#ifdef PROTOBUF_FORCE_COPY_IN_RELEASE
-  auto* old = reinterpret_cast<::google::protobuf::MessageLite*>(released);
-  released = ::google::protobuf::internal::DuplicateIfNonNull(released);
-  if (GetArena() == nullptr) {
-    delete old;
-  }
-#else   // PROTOBUF_FORCE_COPY_IN_RELEASE
-  if (GetArena() != nullptr) {
-    released = ::google::protobuf::internal::DuplicateIfNonNull(released);
-  }
-#endif  // !PROTOBUF_FORCE_COPY_IN_RELEASE
-  return released;
-}
-inline ::io::deephaven::proto::backplane::grpc::UpdateByWindowScale* UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingFormula::unsafe_arena_release_forward_window_scale() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  // @@protoc_insertion_point(field_release:io.deephaven.proto.backplane.grpc.UpdateByRequest.UpdateByOperation.UpdateByColumn.UpdateBySpec.UpdateByRollingFormula.forward_window_scale)
-
-  _impl_._has_bits_[0] &= ~0x00000002u;
-  ::io::deephaven::proto::backplane::grpc::UpdateByWindowScale* temp = _impl_.forward_window_scale_;
-  _impl_.forward_window_scale_ = nullptr;
-  return temp;
-}
-inline ::io::deephaven::proto::backplane::grpc::UpdateByWindowScale* UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingFormula::_internal_mutable_forward_window_scale() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  _impl_._has_bits_[0] |= 0x00000002u;
-  if (_impl_.forward_window_scale_ == nullptr) {
-    auto* p = CreateMaybeMessage<::io::deephaven::proto::backplane::grpc::UpdateByWindowScale>(GetArena());
-    _impl_.forward_window_scale_ = reinterpret_cast<::io::deephaven::proto::backplane::grpc::UpdateByWindowScale*>(p);
-  }
-  return _impl_.forward_window_scale_;
-}
-inline ::io::deephaven::proto::backplane::grpc::UpdateByWindowScale* UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingFormula::mutable_forward_window_scale() ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  ::io::deephaven::proto::backplane::grpc::UpdateByWindowScale* _msg = _internal_mutable_forward_window_scale();
-  // @@protoc_insertion_point(field_mutable:io.deephaven.proto.backplane.grpc.UpdateByRequest.UpdateByOperation.UpdateByColumn.UpdateBySpec.UpdateByRollingFormula.forward_window_scale)
-  return _msg;
-}
-inline void UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingFormula::set_allocated_forward_window_scale(::io::deephaven::proto::backplane::grpc::UpdateByWindowScale* value) {
-  ::google::protobuf::Arena* message_arena = GetArena();
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  if (message_arena == nullptr) {
-    delete reinterpret_cast<::io::deephaven::proto::backplane::grpc::UpdateByWindowScale*>(_impl_.forward_window_scale_);
-  }
-
-  if (value != nullptr) {
-    ::google::protobuf::Arena* submessage_arena = reinterpret_cast<::io::deephaven::proto::backplane::grpc::UpdateByWindowScale*>(value)->GetArena();
-    if (message_arena != submessage_arena) {
-      value = ::google::protobuf::internal::GetOwnedMessage(message_arena, value, submessage_arena);
-    }
-    _impl_._has_bits_[0] |= 0x00000002u;
-  } else {
-    _impl_._has_bits_[0] &= ~0x00000002u;
-  }
-
-  _impl_.forward_window_scale_ = reinterpret_cast<::io::deephaven::proto::backplane::grpc::UpdateByWindowScale*>(value);
-  // @@protoc_insertion_point(field_set_allocated:io.deephaven.proto.backplane.grpc.UpdateByRequest.UpdateByOperation.UpdateByColumn.UpdateBySpec.UpdateByRollingFormula.forward_window_scale)
-}
-
-// string formula = 3;
-inline void UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingFormula::clear_formula() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  _impl_.formula_.ClearToEmpty();
-}
-inline const std::string& UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingFormula::formula() const
-    ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  // @@protoc_insertion_point(field_get:io.deephaven.proto.backplane.grpc.UpdateByRequest.UpdateByOperation.UpdateByColumn.UpdateBySpec.UpdateByRollingFormula.formula)
-  return _internal_formula();
-}
-template <typename Arg_, typename... Args_>
-inline PROTOBUF_ALWAYS_INLINE void UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingFormula::set_formula(Arg_&& arg,
-                                                     Args_... args) {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  ;
-  _impl_.formula_.Set(static_cast<Arg_&&>(arg), args..., GetArena());
-  // @@protoc_insertion_point(field_set:io.deephaven.proto.backplane.grpc.UpdateByRequest.UpdateByOperation.UpdateByColumn.UpdateBySpec.UpdateByRollingFormula.formula)
-}
-inline std::string* UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingFormula::mutable_formula() ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  std::string* _s = _internal_mutable_formula();
-  // @@protoc_insertion_point(field_mutable:io.deephaven.proto.backplane.grpc.UpdateByRequest.UpdateByOperation.UpdateByColumn.UpdateBySpec.UpdateByRollingFormula.formula)
-  return _s;
-}
-inline const std::string& UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingFormula::_internal_formula() const {
-  PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race);
-  return _impl_.formula_.Get();
-}
-inline void UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingFormula::_internal_set_formula(const std::string& value) {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  ;
-  _impl_.formula_.Set(value, GetArena());
-}
-inline std::string* UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingFormula::_internal_mutable_formula() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  ;
-  return _impl_.formula_.Mutable( GetArena());
-}
-inline std::string* UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingFormula::release_formula() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  // @@protoc_insertion_point(field_release:io.deephaven.proto.backplane.grpc.UpdateByRequest.UpdateByOperation.UpdateByColumn.UpdateBySpec.UpdateByRollingFormula.formula)
-  return _impl_.formula_.Release();
-}
-inline void UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingFormula::set_allocated_formula(std::string* value) {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  _impl_.formula_.SetAllocated(value, GetArena());
-  #ifdef PROTOBUF_FORCE_COPY_DEFAULT_STRING
-        if (_impl_.formula_.IsDefault()) {
-          _impl_.formula_.Set("", GetArena());
-        }
-  #endif  // PROTOBUF_FORCE_COPY_DEFAULT_STRING
-  // @@protoc_insertion_point(field_set_allocated:io.deephaven.proto.backplane.grpc.UpdateByRequest.UpdateByOperation.UpdateByColumn.UpdateBySpec.UpdateByRollingFormula.formula)
-}
-
-// string param_token = 4;
-inline void UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingFormula::clear_param_token() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  _impl_.param_token_.ClearToEmpty();
-}
-inline const std::string& UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingFormula::param_token() const
-    ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  // @@protoc_insertion_point(field_get:io.deephaven.proto.backplane.grpc.UpdateByRequest.UpdateByOperation.UpdateByColumn.UpdateBySpec.UpdateByRollingFormula.param_token)
-  return _internal_param_token();
-}
-template <typename Arg_, typename... Args_>
-inline PROTOBUF_ALWAYS_INLINE void UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingFormula::set_param_token(Arg_&& arg,
-                                                     Args_... args) {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  ;
-  _impl_.param_token_.Set(static_cast<Arg_&&>(arg), args..., GetArena());
-  // @@protoc_insertion_point(field_set:io.deephaven.proto.backplane.grpc.UpdateByRequest.UpdateByOperation.UpdateByColumn.UpdateBySpec.UpdateByRollingFormula.param_token)
-}
-inline std::string* UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingFormula::mutable_param_token() ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  std::string* _s = _internal_mutable_param_token();
-  // @@protoc_insertion_point(field_mutable:io.deephaven.proto.backplane.grpc.UpdateByRequest.UpdateByOperation.UpdateByColumn.UpdateBySpec.UpdateByRollingFormula.param_token)
-  return _s;
-}
-inline const std::string& UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingFormula::_internal_param_token() const {
-  PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race);
-  return _impl_.param_token_.Get();
-}
-inline void UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingFormula::_internal_set_param_token(const std::string& value) {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  ;
-  _impl_.param_token_.Set(value, GetArena());
-}
-inline std::string* UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingFormula::_internal_mutable_param_token() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  ;
-  return _impl_.param_token_.Mutable( GetArena());
-}
-inline std::string* UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingFormula::release_param_token() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  // @@protoc_insertion_point(field_release:io.deephaven.proto.backplane.grpc.UpdateByRequest.UpdateByOperation.UpdateByColumn.UpdateBySpec.UpdateByRollingFormula.param_token)
-  return _impl_.param_token_.Release();
-}
-inline void UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingFormula::set_allocated_param_token(std::string* value) {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  _impl_.param_token_.SetAllocated(value, GetArena());
-  #ifdef PROTOBUF_FORCE_COPY_DEFAULT_STRING
-        if (_impl_.param_token_.IsDefault()) {
-          _impl_.param_token_.Set("", GetArena());
-        }
-  #endif  // PROTOBUF_FORCE_COPY_DEFAULT_STRING
-  // @@protoc_insertion_point(field_set_allocated:io.deephaven.proto.backplane.grpc.UpdateByRequest.UpdateByOperation.UpdateByColumn.UpdateBySpec.UpdateByRollingFormula.param_token)
-}
-
-// -------------------------------------------------------------------
-
-// UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec
-
-// .io.deephaven.proto.backplane.grpc.UpdateByRequest.UpdateByOperation.UpdateByColumn.UpdateBySpec.UpdateByCumulativeSum sum = 1;
-inline bool UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec::has_sum() const {
-  return type_case() == kSum;
-}
-inline bool UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec::_internal_has_sum() const {
-  return type_case() == kSum;
-}
-inline void UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec::set_has_sum() {
-  _impl_._oneof_case_[0] = kSum;
-}
-inline void UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec::clear_sum() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  if (type_case() == kSum) {
-    if (GetArena() == nullptr) {
-      delete _impl_.type_.sum_;
-    }
-    clear_has_type();
-  }
-}
-inline ::io::deephaven::proto::backplane::grpc::UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByCumulativeSum* UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec::release_sum() {
-  // @@protoc_insertion_point(field_release:io.deephaven.proto.backplane.grpc.UpdateByRequest.UpdateByOperation.UpdateByColumn.UpdateBySpec.sum)
-  if (type_case() == kSum) {
-    clear_has_type();
-    auto* temp = _impl_.type_.sum_;
-    if (GetArena() != nullptr) {
-      temp = ::google::protobuf::internal::DuplicateIfNonNull(temp);
-    }
-    _impl_.type_.sum_ = nullptr;
-    return temp;
-  } else {
-    return nullptr;
-  }
-}
-inline const ::io::deephaven::proto::backplane::grpc::UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByCumulativeSum& UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec::_internal_sum() const {
-  return type_case() == kSum ? *_impl_.type_.sum_ : reinterpret_cast<::io::deephaven::proto::backplane::grpc::UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByCumulativeSum&>(::io::deephaven::proto::backplane::grpc::_UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByCumulativeSum_default_instance_);
-}
-inline const ::io::deephaven::proto::backplane::grpc::UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByCumulativeSum& UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec::sum() const ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  // @@protoc_insertion_point(field_get:io.deephaven.proto.backplane.grpc.UpdateByRequest.UpdateByOperation.UpdateByColumn.UpdateBySpec.sum)
-  return _internal_sum();
-}
-inline ::io::deephaven::proto::backplane::grpc::UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByCumulativeSum* UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec::unsafe_arena_release_sum() {
-  // @@protoc_insertion_point(field_unsafe_arena_release:io.deephaven.proto.backplane.grpc.UpdateByRequest.UpdateByOperation.UpdateByColumn.UpdateBySpec.sum)
-  if (type_case() == kSum) {
-    clear_has_type();
-    auto* temp = _impl_.type_.sum_;
-    _impl_.type_.sum_ = nullptr;
-    return temp;
-  } else {
-    return nullptr;
-  }
-}
-inline void UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec::unsafe_arena_set_allocated_sum(::io::deephaven::proto::backplane::grpc::UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByCumulativeSum* value) {
-  // We rely on the oneof clear method to free the earlier contents
-  // of this oneof. We can directly use the pointer we're given to
-  // set the new value.
-  clear_type();
-  if (value) {
-    set_has_sum();
-    _impl_.type_.sum_ = value;
-  }
-  // @@protoc_insertion_point(field_unsafe_arena_set_allocated:io.deephaven.proto.backplane.grpc.UpdateByRequest.UpdateByOperation.UpdateByColumn.UpdateBySpec.sum)
-}
-inline ::io::deephaven::proto::backplane::grpc::UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByCumulativeSum* UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec::_internal_mutable_sum() {
-  if (type_case() != kSum) {
-    clear_type();
-    set_has_sum();
-    _impl_.type_.sum_ = CreateMaybeMessage<::io::deephaven::proto::backplane::grpc::UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByCumulativeSum>(GetArena());
-  }
-  return _impl_.type_.sum_;
-}
-inline ::io::deephaven::proto::backplane::grpc::UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByCumulativeSum* UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec::mutable_sum() ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  ::io::deephaven::proto::backplane::grpc::UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByCumulativeSum* _msg = _internal_mutable_sum();
-  // @@protoc_insertion_point(field_mutable:io.deephaven.proto.backplane.grpc.UpdateByRequest.UpdateByOperation.UpdateByColumn.UpdateBySpec.sum)
-  return _msg;
-}
-
-// .io.deephaven.proto.backplane.grpc.UpdateByRequest.UpdateByOperation.UpdateByColumn.UpdateBySpec.UpdateByCumulativeMin min = 2;
-inline bool UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec::has_min() const {
-  return type_case() == kMin;
-}
-inline bool UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec::_internal_has_min() const {
-  return type_case() == kMin;
-}
-inline void UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec::set_has_min() {
-  _impl_._oneof_case_[0] = kMin;
-}
-inline void UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec::clear_min() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  if (type_case() == kMin) {
-    if (GetArena() == nullptr) {
-      delete _impl_.type_.min_;
-    }
-    clear_has_type();
-  }
-}
-inline ::io::deephaven::proto::backplane::grpc::UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByCumulativeMin* UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec::release_min() {
-  // @@protoc_insertion_point(field_release:io.deephaven.proto.backplane.grpc.UpdateByRequest.UpdateByOperation.UpdateByColumn.UpdateBySpec.min)
-  if (type_case() == kMin) {
-    clear_has_type();
-    auto* temp = _impl_.type_.min_;
-    if (GetArena() != nullptr) {
-      temp = ::google::protobuf::internal::DuplicateIfNonNull(temp);
-    }
-    _impl_.type_.min_ = nullptr;
-    return temp;
-  } else {
-    return nullptr;
-  }
-}
-inline const ::io::deephaven::proto::backplane::grpc::UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByCumulativeMin& UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec::_internal_min() const {
-  return type_case() == kMin ? *_impl_.type_.min_ : reinterpret_cast<::io::deephaven::proto::backplane::grpc::UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByCumulativeMin&>(::io::deephaven::proto::backplane::grpc::_UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByCumulativeMin_default_instance_);
-}
-inline const ::io::deephaven::proto::backplane::grpc::UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByCumulativeMin& UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec::min() const ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  // @@protoc_insertion_point(field_get:io.deephaven.proto.backplane.grpc.UpdateByRequest.UpdateByOperation.UpdateByColumn.UpdateBySpec.min)
-  return _internal_min();
-}
-inline ::io::deephaven::proto::backplane::grpc::UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByCumulativeMin* UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec::unsafe_arena_release_min() {
-  // @@protoc_insertion_point(field_unsafe_arena_release:io.deephaven.proto.backplane.grpc.UpdateByRequest.UpdateByOperation.UpdateByColumn.UpdateBySpec.min)
-  if (type_case() == kMin) {
-    clear_has_type();
-    auto* temp = _impl_.type_.min_;
-    _impl_.type_.min_ = nullptr;
-    return temp;
-  } else {
-    return nullptr;
-  }
-}
-inline void UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec::unsafe_arena_set_allocated_min(::io::deephaven::proto::backplane::grpc::UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByCumulativeMin* value) {
-  // We rely on the oneof clear method to free the earlier contents
-  // of this oneof. We can directly use the pointer we're given to
-  // set the new value.
-  clear_type();
-  if (value) {
-    set_has_min();
-    _impl_.type_.min_ = value;
-  }
-  // @@protoc_insertion_point(field_unsafe_arena_set_allocated:io.deephaven.proto.backplane.grpc.UpdateByRequest.UpdateByOperation.UpdateByColumn.UpdateBySpec.min)
-}
-inline ::io::deephaven::proto::backplane::grpc::UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByCumulativeMin* UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec::_internal_mutable_min() {
-  if (type_case() != kMin) {
-    clear_type();
-    set_has_min();
-    _impl_.type_.min_ = CreateMaybeMessage<::io::deephaven::proto::backplane::grpc::UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByCumulativeMin>(GetArena());
-  }
-  return _impl_.type_.min_;
-}
-inline ::io::deephaven::proto::backplane::grpc::UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByCumulativeMin* UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec::mutable_min() ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  ::io::deephaven::proto::backplane::grpc::UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByCumulativeMin* _msg = _internal_mutable_min();
-  // @@protoc_insertion_point(field_mutable:io.deephaven.proto.backplane.grpc.UpdateByRequest.UpdateByOperation.UpdateByColumn.UpdateBySpec.min)
-  return _msg;
-}
-
-// .io.deephaven.proto.backplane.grpc.UpdateByRequest.UpdateByOperation.UpdateByColumn.UpdateBySpec.UpdateByCumulativeMax max = 3;
-inline bool UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec::has_max() const {
-  return type_case() == kMax;
-}
-inline bool UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec::_internal_has_max() const {
-  return type_case() == kMax;
-}
-inline void UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec::set_has_max() {
-  _impl_._oneof_case_[0] = kMax;
-}
-inline void UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec::clear_max() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  if (type_case() == kMax) {
-    if (GetArena() == nullptr) {
-      delete _impl_.type_.max_;
-    }
-    clear_has_type();
-  }
-}
-inline ::io::deephaven::proto::backplane::grpc::UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByCumulativeMax* UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec::release_max() {
-  // @@protoc_insertion_point(field_release:io.deephaven.proto.backplane.grpc.UpdateByRequest.UpdateByOperation.UpdateByColumn.UpdateBySpec.max)
-  if (type_case() == kMax) {
-    clear_has_type();
-    auto* temp = _impl_.type_.max_;
-    if (GetArena() != nullptr) {
-      temp = ::google::protobuf::internal::DuplicateIfNonNull(temp);
-    }
-    _impl_.type_.max_ = nullptr;
-    return temp;
-  } else {
-    return nullptr;
-  }
-}
-inline const ::io::deephaven::proto::backplane::grpc::UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByCumulativeMax& UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec::_internal_max() const {
-  return type_case() == kMax ? *_impl_.type_.max_ : reinterpret_cast<::io::deephaven::proto::backplane::grpc::UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByCumulativeMax&>(::io::deephaven::proto::backplane::grpc::_UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByCumulativeMax_default_instance_);
-}
-inline const ::io::deephaven::proto::backplane::grpc::UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByCumulativeMax& UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec::max() const ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  // @@protoc_insertion_point(field_get:io.deephaven.proto.backplane.grpc.UpdateByRequest.UpdateByOperation.UpdateByColumn.UpdateBySpec.max)
-  return _internal_max();
-}
-inline ::io::deephaven::proto::backplane::grpc::UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByCumulativeMax* UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec::unsafe_arena_release_max() {
-  // @@protoc_insertion_point(field_unsafe_arena_release:io.deephaven.proto.backplane.grpc.UpdateByRequest.UpdateByOperation.UpdateByColumn.UpdateBySpec.max)
-  if (type_case() == kMax) {
-    clear_has_type();
-    auto* temp = _impl_.type_.max_;
-    _impl_.type_.max_ = nullptr;
-    return temp;
-  } else {
-    return nullptr;
-  }
-}
-inline void UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec::unsafe_arena_set_allocated_max(::io::deephaven::proto::backplane::grpc::UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByCumulativeMax* value) {
-  // We rely on the oneof clear method to free the earlier contents
-  // of this oneof. We can directly use the pointer we're given to
-  // set the new value.
-  clear_type();
-  if (value) {
-    set_has_max();
-    _impl_.type_.max_ = value;
-  }
-  // @@protoc_insertion_point(field_unsafe_arena_set_allocated:io.deephaven.proto.backplane.grpc.UpdateByRequest.UpdateByOperation.UpdateByColumn.UpdateBySpec.max)
-}
-inline ::io::deephaven::proto::backplane::grpc::UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByCumulativeMax* UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec::_internal_mutable_max() {
-  if (type_case() != kMax) {
-    clear_type();
-    set_has_max();
-    _impl_.type_.max_ = CreateMaybeMessage<::io::deephaven::proto::backplane::grpc::UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByCumulativeMax>(GetArena());
-  }
-  return _impl_.type_.max_;
-}
-inline ::io::deephaven::proto::backplane::grpc::UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByCumulativeMax* UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec::mutable_max() ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  ::io::deephaven::proto::backplane::grpc::UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByCumulativeMax* _msg = _internal_mutable_max();
-  // @@protoc_insertion_point(field_mutable:io.deephaven.proto.backplane.grpc.UpdateByRequest.UpdateByOperation.UpdateByColumn.UpdateBySpec.max)
-  return _msg;
-}
-
-// .io.deephaven.proto.backplane.grpc.UpdateByRequest.UpdateByOperation.UpdateByColumn.UpdateBySpec.UpdateByCumulativeProduct product = 4;
-inline bool UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec::has_product() const {
-  return type_case() == kProduct;
-}
-inline bool UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec::_internal_has_product() const {
-  return type_case() == kProduct;
-}
-inline void UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec::set_has_product() {
-  _impl_._oneof_case_[0] = kProduct;
-}
-inline void UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec::clear_product() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  if (type_case() == kProduct) {
-    if (GetArena() == nullptr) {
-      delete _impl_.type_.product_;
-    }
-    clear_has_type();
-  }
-}
-inline ::io::deephaven::proto::backplane::grpc::UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByCumulativeProduct* UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec::release_product() {
-  // @@protoc_insertion_point(field_release:io.deephaven.proto.backplane.grpc.UpdateByRequest.UpdateByOperation.UpdateByColumn.UpdateBySpec.product)
-  if (type_case() == kProduct) {
-    clear_has_type();
-    auto* temp = _impl_.type_.product_;
-    if (GetArena() != nullptr) {
-      temp = ::google::protobuf::internal::DuplicateIfNonNull(temp);
-    }
-    _impl_.type_.product_ = nullptr;
-    return temp;
-  } else {
-    return nullptr;
-  }
-}
-inline const ::io::deephaven::proto::backplane::grpc::UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByCumulativeProduct& UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec::_internal_product() const {
-  return type_case() == kProduct ? *_impl_.type_.product_ : reinterpret_cast<::io::deephaven::proto::backplane::grpc::UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByCumulativeProduct&>(::io::deephaven::proto::backplane::grpc::_UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByCumulativeProduct_default_instance_);
-}
-inline const ::io::deephaven::proto::backplane::grpc::UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByCumulativeProduct& UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec::product() const ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  // @@protoc_insertion_point(field_get:io.deephaven.proto.backplane.grpc.UpdateByRequest.UpdateByOperation.UpdateByColumn.UpdateBySpec.product)
-  return _internal_product();
-}
-inline ::io::deephaven::proto::backplane::grpc::UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByCumulativeProduct* UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec::unsafe_arena_release_product() {
-  // @@protoc_insertion_point(field_unsafe_arena_release:io.deephaven.proto.backplane.grpc.UpdateByRequest.UpdateByOperation.UpdateByColumn.UpdateBySpec.product)
-  if (type_case() == kProduct) {
-    clear_has_type();
-    auto* temp = _impl_.type_.product_;
-    _impl_.type_.product_ = nullptr;
-    return temp;
-  } else {
-    return nullptr;
-  }
-}
-inline void UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec::unsafe_arena_set_allocated_product(::io::deephaven::proto::backplane::grpc::UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByCumulativeProduct* value) {
-  // We rely on the oneof clear method to free the earlier contents
-  // of this oneof. We can directly use the pointer we're given to
-  // set the new value.
-  clear_type();
-  if (value) {
-    set_has_product();
-    _impl_.type_.product_ = value;
-  }
-  // @@protoc_insertion_point(field_unsafe_arena_set_allocated:io.deephaven.proto.backplane.grpc.UpdateByRequest.UpdateByOperation.UpdateByColumn.UpdateBySpec.product)
-}
-inline ::io::deephaven::proto::backplane::grpc::UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByCumulativeProduct* UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec::_internal_mutable_product() {
-  if (type_case() != kProduct) {
-    clear_type();
-    set_has_product();
-    _impl_.type_.product_ = CreateMaybeMessage<::io::deephaven::proto::backplane::grpc::UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByCumulativeProduct>(GetArena());
-  }
-  return _impl_.type_.product_;
-}
-inline ::io::deephaven::proto::backplane::grpc::UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByCumulativeProduct* UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec::mutable_product() ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  ::io::deephaven::proto::backplane::grpc::UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByCumulativeProduct* _msg = _internal_mutable_product();
-  // @@protoc_insertion_point(field_mutable:io.deephaven.proto.backplane.grpc.UpdateByRequest.UpdateByOperation.UpdateByColumn.UpdateBySpec.product)
-  return _msg;
-}
-
-// .io.deephaven.proto.backplane.grpc.UpdateByRequest.UpdateByOperation.UpdateByColumn.UpdateBySpec.UpdateByFill fill = 5;
-inline bool UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec::has_fill() const {
-  return type_case() == kFill;
-}
-inline bool UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec::_internal_has_fill() const {
-  return type_case() == kFill;
-}
-inline void UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec::set_has_fill() {
-  _impl_._oneof_case_[0] = kFill;
-}
-inline void UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec::clear_fill() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  if (type_case() == kFill) {
-    if (GetArena() == nullptr) {
-      delete _impl_.type_.fill_;
-    }
-    clear_has_type();
-  }
-}
-inline ::io::deephaven::proto::backplane::grpc::UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByFill* UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec::release_fill() {
-  // @@protoc_insertion_point(field_release:io.deephaven.proto.backplane.grpc.UpdateByRequest.UpdateByOperation.UpdateByColumn.UpdateBySpec.fill)
-  if (type_case() == kFill) {
-    clear_has_type();
-    auto* temp = _impl_.type_.fill_;
-    if (GetArena() != nullptr) {
-      temp = ::google::protobuf::internal::DuplicateIfNonNull(temp);
-    }
-    _impl_.type_.fill_ = nullptr;
-    return temp;
-  } else {
-    return nullptr;
-  }
-}
-inline const ::io::deephaven::proto::backplane::grpc::UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByFill& UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec::_internal_fill() const {
-  return type_case() == kFill ? *_impl_.type_.fill_ : reinterpret_cast<::io::deephaven::proto::backplane::grpc::UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByFill&>(::io::deephaven::proto::backplane::grpc::_UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByFill_default_instance_);
-}
-inline const ::io::deephaven::proto::backplane::grpc::UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByFill& UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec::fill() const ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  // @@protoc_insertion_point(field_get:io.deephaven.proto.backplane.grpc.UpdateByRequest.UpdateByOperation.UpdateByColumn.UpdateBySpec.fill)
-  return _internal_fill();
-}
-inline ::io::deephaven::proto::backplane::grpc::UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByFill* UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec::unsafe_arena_release_fill() {
-  // @@protoc_insertion_point(field_unsafe_arena_release:io.deephaven.proto.backplane.grpc.UpdateByRequest.UpdateByOperation.UpdateByColumn.UpdateBySpec.fill)
-  if (type_case() == kFill) {
-    clear_has_type();
-    auto* temp = _impl_.type_.fill_;
-    _impl_.type_.fill_ = nullptr;
-    return temp;
-  } else {
-    return nullptr;
-  }
-}
-inline void UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec::unsafe_arena_set_allocated_fill(::io::deephaven::proto::backplane::grpc::UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByFill* value) {
-  // We rely on the oneof clear method to free the earlier contents
-  // of this oneof. We can directly use the pointer we're given to
-  // set the new value.
-  clear_type();
-  if (value) {
-    set_has_fill();
-    _impl_.type_.fill_ = value;
-  }
-  // @@protoc_insertion_point(field_unsafe_arena_set_allocated:io.deephaven.proto.backplane.grpc.UpdateByRequest.UpdateByOperation.UpdateByColumn.UpdateBySpec.fill)
-}
-inline ::io::deephaven::proto::backplane::grpc::UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByFill* UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec::_internal_mutable_fill() {
-  if (type_case() != kFill) {
-    clear_type();
-    set_has_fill();
-    _impl_.type_.fill_ = CreateMaybeMessage<::io::deephaven::proto::backplane::grpc::UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByFill>(GetArena());
-  }
-  return _impl_.type_.fill_;
-}
-inline ::io::deephaven::proto::backplane::grpc::UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByFill* UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec::mutable_fill() ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  ::io::deephaven::proto::backplane::grpc::UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByFill* _msg = _internal_mutable_fill();
-  // @@protoc_insertion_point(field_mutable:io.deephaven.proto.backplane.grpc.UpdateByRequest.UpdateByOperation.UpdateByColumn.UpdateBySpec.fill)
-  return _msg;
-}
-
-// .io.deephaven.proto.backplane.grpc.UpdateByRequest.UpdateByOperation.UpdateByColumn.UpdateBySpec.UpdateByEma ema = 6;
-inline bool UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec::has_ema() const {
-  return type_case() == kEma;
-}
-inline bool UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec::_internal_has_ema() const {
-  return type_case() == kEma;
-}
-inline void UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec::set_has_ema() {
-  _impl_._oneof_case_[0] = kEma;
-}
-inline void UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec::clear_ema() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  if (type_case() == kEma) {
-    if (GetArena() == nullptr) {
-      delete _impl_.type_.ema_;
-    }
-    clear_has_type();
-  }
-}
-inline ::io::deephaven::proto::backplane::grpc::UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByEma* UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec::release_ema() {
-  // @@protoc_insertion_point(field_release:io.deephaven.proto.backplane.grpc.UpdateByRequest.UpdateByOperation.UpdateByColumn.UpdateBySpec.ema)
-  if (type_case() == kEma) {
-    clear_has_type();
-    auto* temp = _impl_.type_.ema_;
-    if (GetArena() != nullptr) {
-      temp = ::google::protobuf::internal::DuplicateIfNonNull(temp);
-    }
-    _impl_.type_.ema_ = nullptr;
-    return temp;
-  } else {
-    return nullptr;
-  }
-}
-inline const ::io::deephaven::proto::backplane::grpc::UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByEma& UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec::_internal_ema() const {
-  return type_case() == kEma ? *_impl_.type_.ema_ : reinterpret_cast<::io::deephaven::proto::backplane::grpc::UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByEma&>(::io::deephaven::proto::backplane::grpc::_UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByEma_default_instance_);
-}
-inline const ::io::deephaven::proto::backplane::grpc::UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByEma& UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec::ema() const ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  // @@protoc_insertion_point(field_get:io.deephaven.proto.backplane.grpc.UpdateByRequest.UpdateByOperation.UpdateByColumn.UpdateBySpec.ema)
-  return _internal_ema();
-}
-inline ::io::deephaven::proto::backplane::grpc::UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByEma* UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec::unsafe_arena_release_ema() {
-  // @@protoc_insertion_point(field_unsafe_arena_release:io.deephaven.proto.backplane.grpc.UpdateByRequest.UpdateByOperation.UpdateByColumn.UpdateBySpec.ema)
-  if (type_case() == kEma) {
-    clear_has_type();
-    auto* temp = _impl_.type_.ema_;
-    _impl_.type_.ema_ = nullptr;
-    return temp;
-  } else {
-    return nullptr;
-  }
-}
-inline void UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec::unsafe_arena_set_allocated_ema(::io::deephaven::proto::backplane::grpc::UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByEma* value) {
-  // We rely on the oneof clear method to free the earlier contents
-  // of this oneof. We can directly use the pointer we're given to
-  // set the new value.
-  clear_type();
-  if (value) {
-    set_has_ema();
-    _impl_.type_.ema_ = value;
-  }
-  // @@protoc_insertion_point(field_unsafe_arena_set_allocated:io.deephaven.proto.backplane.grpc.UpdateByRequest.UpdateByOperation.UpdateByColumn.UpdateBySpec.ema)
-}
-inline ::io::deephaven::proto::backplane::grpc::UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByEma* UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec::_internal_mutable_ema() {
-  if (type_case() != kEma) {
-    clear_type();
-    set_has_ema();
-    _impl_.type_.ema_ = CreateMaybeMessage<::io::deephaven::proto::backplane::grpc::UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByEma>(GetArena());
-  }
-  return _impl_.type_.ema_;
-}
-inline ::io::deephaven::proto::backplane::grpc::UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByEma* UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec::mutable_ema() ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  ::io::deephaven::proto::backplane::grpc::UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByEma* _msg = _internal_mutable_ema();
-  // @@protoc_insertion_point(field_mutable:io.deephaven.proto.backplane.grpc.UpdateByRequest.UpdateByOperation.UpdateByColumn.UpdateBySpec.ema)
-  return _msg;
-}
-
-// .io.deephaven.proto.backplane.grpc.UpdateByRequest.UpdateByOperation.UpdateByColumn.UpdateBySpec.UpdateByRollingSum rolling_sum = 7;
-inline bool UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec::has_rolling_sum() const {
-  return type_case() == kRollingSum;
-}
-inline bool UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec::_internal_has_rolling_sum() const {
-  return type_case() == kRollingSum;
-}
-inline void UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec::set_has_rolling_sum() {
-  _impl_._oneof_case_[0] = kRollingSum;
-}
-inline void UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec::clear_rolling_sum() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  if (type_case() == kRollingSum) {
-    if (GetArena() == nullptr) {
-      delete _impl_.type_.rolling_sum_;
-    }
-    clear_has_type();
-  }
-}
-inline ::io::deephaven::proto::backplane::grpc::UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingSum* UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec::release_rolling_sum() {
-  // @@protoc_insertion_point(field_release:io.deephaven.proto.backplane.grpc.UpdateByRequest.UpdateByOperation.UpdateByColumn.UpdateBySpec.rolling_sum)
-  if (type_case() == kRollingSum) {
-    clear_has_type();
-    auto* temp = _impl_.type_.rolling_sum_;
-    if (GetArena() != nullptr) {
-      temp = ::google::protobuf::internal::DuplicateIfNonNull(temp);
-    }
-    _impl_.type_.rolling_sum_ = nullptr;
-    return temp;
-  } else {
-    return nullptr;
-  }
-}
-inline const ::io::deephaven::proto::backplane::grpc::UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingSum& UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec::_internal_rolling_sum() const {
-  return type_case() == kRollingSum ? *_impl_.type_.rolling_sum_ : reinterpret_cast<::io::deephaven::proto::backplane::grpc::UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingSum&>(::io::deephaven::proto::backplane::grpc::_UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingSum_default_instance_);
-}
-inline const ::io::deephaven::proto::backplane::grpc::UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingSum& UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec::rolling_sum() const ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  // @@protoc_insertion_point(field_get:io.deephaven.proto.backplane.grpc.UpdateByRequest.UpdateByOperation.UpdateByColumn.UpdateBySpec.rolling_sum)
-  return _internal_rolling_sum();
-}
-inline ::io::deephaven::proto::backplane::grpc::UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingSum* UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec::unsafe_arena_release_rolling_sum() {
-  // @@protoc_insertion_point(field_unsafe_arena_release:io.deephaven.proto.backplane.grpc.UpdateByRequest.UpdateByOperation.UpdateByColumn.UpdateBySpec.rolling_sum)
-  if (type_case() == kRollingSum) {
-    clear_has_type();
-    auto* temp = _impl_.type_.rolling_sum_;
-    _impl_.type_.rolling_sum_ = nullptr;
-    return temp;
-  } else {
-    return nullptr;
-  }
-}
-inline void UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec::unsafe_arena_set_allocated_rolling_sum(::io::deephaven::proto::backplane::grpc::UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingSum* value) {
-  // We rely on the oneof clear method to free the earlier contents
-  // of this oneof. We can directly use the pointer we're given to
-  // set the new value.
-  clear_type();
-  if (value) {
-    set_has_rolling_sum();
-    _impl_.type_.rolling_sum_ = value;
-  }
-  // @@protoc_insertion_point(field_unsafe_arena_set_allocated:io.deephaven.proto.backplane.grpc.UpdateByRequest.UpdateByOperation.UpdateByColumn.UpdateBySpec.rolling_sum)
-}
-inline ::io::deephaven::proto::backplane::grpc::UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingSum* UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec::_internal_mutable_rolling_sum() {
-  if (type_case() != kRollingSum) {
-    clear_type();
-    set_has_rolling_sum();
-    _impl_.type_.rolling_sum_ = CreateMaybeMessage<::io::deephaven::proto::backplane::grpc::UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingSum>(GetArena());
-  }
-  return _impl_.type_.rolling_sum_;
-}
-inline ::io::deephaven::proto::backplane::grpc::UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingSum* UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec::mutable_rolling_sum() ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  ::io::deephaven::proto::backplane::grpc::UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingSum* _msg = _internal_mutable_rolling_sum();
-  // @@protoc_insertion_point(field_mutable:io.deephaven.proto.backplane.grpc.UpdateByRequest.UpdateByOperation.UpdateByColumn.UpdateBySpec.rolling_sum)
-  return _msg;
-}
-
-// .io.deephaven.proto.backplane.grpc.UpdateByRequest.UpdateByOperation.UpdateByColumn.UpdateBySpec.UpdateByRollingGroup rolling_group = 8;
-inline bool UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec::has_rolling_group() const {
-  return type_case() == kRollingGroup;
-}
-inline bool UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec::_internal_has_rolling_group() const {
-  return type_case() == kRollingGroup;
-}
-inline void UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec::set_has_rolling_group() {
-  _impl_._oneof_case_[0] = kRollingGroup;
-}
-inline void UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec::clear_rolling_group() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  if (type_case() == kRollingGroup) {
-    if (GetArena() == nullptr) {
-      delete _impl_.type_.rolling_group_;
-    }
-    clear_has_type();
-  }
-}
-inline ::io::deephaven::proto::backplane::grpc::UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingGroup* UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec::release_rolling_group() {
-  // @@protoc_insertion_point(field_release:io.deephaven.proto.backplane.grpc.UpdateByRequest.UpdateByOperation.UpdateByColumn.UpdateBySpec.rolling_group)
-  if (type_case() == kRollingGroup) {
-    clear_has_type();
-    auto* temp = _impl_.type_.rolling_group_;
-    if (GetArena() != nullptr) {
-      temp = ::google::protobuf::internal::DuplicateIfNonNull(temp);
-    }
-    _impl_.type_.rolling_group_ = nullptr;
-    return temp;
-  } else {
-    return nullptr;
-  }
-}
-inline const ::io::deephaven::proto::backplane::grpc::UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingGroup& UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec::_internal_rolling_group() const {
-  return type_case() == kRollingGroup ? *_impl_.type_.rolling_group_ : reinterpret_cast<::io::deephaven::proto::backplane::grpc::UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingGroup&>(::io::deephaven::proto::backplane::grpc::_UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingGroup_default_instance_);
-}
-inline const ::io::deephaven::proto::backplane::grpc::UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingGroup& UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec::rolling_group() const ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  // @@protoc_insertion_point(field_get:io.deephaven.proto.backplane.grpc.UpdateByRequest.UpdateByOperation.UpdateByColumn.UpdateBySpec.rolling_group)
-  return _internal_rolling_group();
-}
-inline ::io::deephaven::proto::backplane::grpc::UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingGroup* UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec::unsafe_arena_release_rolling_group() {
-  // @@protoc_insertion_point(field_unsafe_arena_release:io.deephaven.proto.backplane.grpc.UpdateByRequest.UpdateByOperation.UpdateByColumn.UpdateBySpec.rolling_group)
-  if (type_case() == kRollingGroup) {
-    clear_has_type();
-    auto* temp = _impl_.type_.rolling_group_;
-    _impl_.type_.rolling_group_ = nullptr;
-    return temp;
-  } else {
-    return nullptr;
-  }
-}
-inline void UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec::unsafe_arena_set_allocated_rolling_group(::io::deephaven::proto::backplane::grpc::UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingGroup* value) {
-  // We rely on the oneof clear method to free the earlier contents
-  // of this oneof. We can directly use the pointer we're given to
-  // set the new value.
-  clear_type();
-  if (value) {
-    set_has_rolling_group();
-    _impl_.type_.rolling_group_ = value;
-  }
-  // @@protoc_insertion_point(field_unsafe_arena_set_allocated:io.deephaven.proto.backplane.grpc.UpdateByRequest.UpdateByOperation.UpdateByColumn.UpdateBySpec.rolling_group)
-}
-inline ::io::deephaven::proto::backplane::grpc::UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingGroup* UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec::_internal_mutable_rolling_group() {
-  if (type_case() != kRollingGroup) {
-    clear_type();
-    set_has_rolling_group();
-    _impl_.type_.rolling_group_ = CreateMaybeMessage<::io::deephaven::proto::backplane::grpc::UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingGroup>(GetArena());
-  }
-  return _impl_.type_.rolling_group_;
-}
-inline ::io::deephaven::proto::backplane::grpc::UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingGroup* UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec::mutable_rolling_group() ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  ::io::deephaven::proto::backplane::grpc::UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingGroup* _msg = _internal_mutable_rolling_group();
-  // @@protoc_insertion_point(field_mutable:io.deephaven.proto.backplane.grpc.UpdateByRequest.UpdateByOperation.UpdateByColumn.UpdateBySpec.rolling_group)
-  return _msg;
-}
-
-// .io.deephaven.proto.backplane.grpc.UpdateByRequest.UpdateByOperation.UpdateByColumn.UpdateBySpec.UpdateByRollingAvg rolling_avg = 9;
-inline bool UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec::has_rolling_avg() const {
-  return type_case() == kRollingAvg;
-}
-inline bool UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec::_internal_has_rolling_avg() const {
-  return type_case() == kRollingAvg;
-}
-inline void UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec::set_has_rolling_avg() {
-  _impl_._oneof_case_[0] = kRollingAvg;
-}
-inline void UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec::clear_rolling_avg() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  if (type_case() == kRollingAvg) {
-    if (GetArena() == nullptr) {
-      delete _impl_.type_.rolling_avg_;
-    }
-    clear_has_type();
-  }
-}
-inline ::io::deephaven::proto::backplane::grpc::UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingAvg* UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec::release_rolling_avg() {
-  // @@protoc_insertion_point(field_release:io.deephaven.proto.backplane.grpc.UpdateByRequest.UpdateByOperation.UpdateByColumn.UpdateBySpec.rolling_avg)
-  if (type_case() == kRollingAvg) {
-    clear_has_type();
-    auto* temp = _impl_.type_.rolling_avg_;
-    if (GetArena() != nullptr) {
-      temp = ::google::protobuf::internal::DuplicateIfNonNull(temp);
-    }
-    _impl_.type_.rolling_avg_ = nullptr;
-    return temp;
-  } else {
-    return nullptr;
-  }
-}
-inline const ::io::deephaven::proto::backplane::grpc::UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingAvg& UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec::_internal_rolling_avg() const {
-  return type_case() == kRollingAvg ? *_impl_.type_.rolling_avg_ : reinterpret_cast<::io::deephaven::proto::backplane::grpc::UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingAvg&>(::io::deephaven::proto::backplane::grpc::_UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingAvg_default_instance_);
-}
-inline const ::io::deephaven::proto::backplane::grpc::UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingAvg& UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec::rolling_avg() const ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  // @@protoc_insertion_point(field_get:io.deephaven.proto.backplane.grpc.UpdateByRequest.UpdateByOperation.UpdateByColumn.UpdateBySpec.rolling_avg)
-  return _internal_rolling_avg();
-}
-inline ::io::deephaven::proto::backplane::grpc::UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingAvg* UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec::unsafe_arena_release_rolling_avg() {
-  // @@protoc_insertion_point(field_unsafe_arena_release:io.deephaven.proto.backplane.grpc.UpdateByRequest.UpdateByOperation.UpdateByColumn.UpdateBySpec.rolling_avg)
-  if (type_case() == kRollingAvg) {
-    clear_has_type();
-    auto* temp = _impl_.type_.rolling_avg_;
-    _impl_.type_.rolling_avg_ = nullptr;
-    return temp;
-  } else {
-    return nullptr;
-  }
-}
-inline void UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec::unsafe_arena_set_allocated_rolling_avg(::io::deephaven::proto::backplane::grpc::UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingAvg* value) {
-  // We rely on the oneof clear method to free the earlier contents
-  // of this oneof. We can directly use the pointer we're given to
-  // set the new value.
-  clear_type();
-  if (value) {
-    set_has_rolling_avg();
-    _impl_.type_.rolling_avg_ = value;
-  }
-  // @@protoc_insertion_point(field_unsafe_arena_set_allocated:io.deephaven.proto.backplane.grpc.UpdateByRequest.UpdateByOperation.UpdateByColumn.UpdateBySpec.rolling_avg)
-}
-inline ::io::deephaven::proto::backplane::grpc::UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingAvg* UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec::_internal_mutable_rolling_avg() {
-  if (type_case() != kRollingAvg) {
-    clear_type();
-    set_has_rolling_avg();
-    _impl_.type_.rolling_avg_ = CreateMaybeMessage<::io::deephaven::proto::backplane::grpc::UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingAvg>(GetArena());
-  }
-  return _impl_.type_.rolling_avg_;
-}
-inline ::io::deephaven::proto::backplane::grpc::UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingAvg* UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec::mutable_rolling_avg() ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  ::io::deephaven::proto::backplane::grpc::UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingAvg* _msg = _internal_mutable_rolling_avg();
-  // @@protoc_insertion_point(field_mutable:io.deephaven.proto.backplane.grpc.UpdateByRequest.UpdateByOperation.UpdateByColumn.UpdateBySpec.rolling_avg)
-  return _msg;
-}
-
-// .io.deephaven.proto.backplane.grpc.UpdateByRequest.UpdateByOperation.UpdateByColumn.UpdateBySpec.UpdateByRollingMin rolling_min = 10;
-inline bool UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec::has_rolling_min() const {
-  return type_case() == kRollingMin;
-}
-inline bool UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec::_internal_has_rolling_min() const {
-  return type_case() == kRollingMin;
-}
-inline void UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec::set_has_rolling_min() {
-  _impl_._oneof_case_[0] = kRollingMin;
-}
-inline void UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec::clear_rolling_min() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  if (type_case() == kRollingMin) {
-    if (GetArena() == nullptr) {
-      delete _impl_.type_.rolling_min_;
-    }
-    clear_has_type();
-  }
-}
-inline ::io::deephaven::proto::backplane::grpc::UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingMin* UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec::release_rolling_min() {
-  // @@protoc_insertion_point(field_release:io.deephaven.proto.backplane.grpc.UpdateByRequest.UpdateByOperation.UpdateByColumn.UpdateBySpec.rolling_min)
-  if (type_case() == kRollingMin) {
-    clear_has_type();
-    auto* temp = _impl_.type_.rolling_min_;
-    if (GetArena() != nullptr) {
-      temp = ::google::protobuf::internal::DuplicateIfNonNull(temp);
-    }
-    _impl_.type_.rolling_min_ = nullptr;
-    return temp;
-  } else {
-    return nullptr;
-  }
-}
-inline const ::io::deephaven::proto::backplane::grpc::UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingMin& UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec::_internal_rolling_min() const {
-  return type_case() == kRollingMin ? *_impl_.type_.rolling_min_ : reinterpret_cast<::io::deephaven::proto::backplane::grpc::UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingMin&>(::io::deephaven::proto::backplane::grpc::_UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingMin_default_instance_);
-}
-inline const ::io::deephaven::proto::backplane::grpc::UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingMin& UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec::rolling_min() const ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  // @@protoc_insertion_point(field_get:io.deephaven.proto.backplane.grpc.UpdateByRequest.UpdateByOperation.UpdateByColumn.UpdateBySpec.rolling_min)
-  return _internal_rolling_min();
-}
-inline ::io::deephaven::proto::backplane::grpc::UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingMin* UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec::unsafe_arena_release_rolling_min() {
-  // @@protoc_insertion_point(field_unsafe_arena_release:io.deephaven.proto.backplane.grpc.UpdateByRequest.UpdateByOperation.UpdateByColumn.UpdateBySpec.rolling_min)
-  if (type_case() == kRollingMin) {
-    clear_has_type();
-    auto* temp = _impl_.type_.rolling_min_;
-    _impl_.type_.rolling_min_ = nullptr;
-    return temp;
-  } else {
-    return nullptr;
-  }
-}
-inline void UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec::unsafe_arena_set_allocated_rolling_min(::io::deephaven::proto::backplane::grpc::UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingMin* value) {
-  // We rely on the oneof clear method to free the earlier contents
-  // of this oneof. We can directly use the pointer we're given to
-  // set the new value.
-  clear_type();
-  if (value) {
-    set_has_rolling_min();
-    _impl_.type_.rolling_min_ = value;
-  }
-  // @@protoc_insertion_point(field_unsafe_arena_set_allocated:io.deephaven.proto.backplane.grpc.UpdateByRequest.UpdateByOperation.UpdateByColumn.UpdateBySpec.rolling_min)
-}
-inline ::io::deephaven::proto::backplane::grpc::UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingMin* UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec::_internal_mutable_rolling_min() {
-  if (type_case() != kRollingMin) {
-    clear_type();
-    set_has_rolling_min();
-    _impl_.type_.rolling_min_ = CreateMaybeMessage<::io::deephaven::proto::backplane::grpc::UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingMin>(GetArena());
-  }
-  return _impl_.type_.rolling_min_;
-}
-inline ::io::deephaven::proto::backplane::grpc::UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingMin* UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec::mutable_rolling_min() ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  ::io::deephaven::proto::backplane::grpc::UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingMin* _msg = _internal_mutable_rolling_min();
-  // @@protoc_insertion_point(field_mutable:io.deephaven.proto.backplane.grpc.UpdateByRequest.UpdateByOperation.UpdateByColumn.UpdateBySpec.rolling_min)
-  return _msg;
-}
-
-// .io.deephaven.proto.backplane.grpc.UpdateByRequest.UpdateByOperation.UpdateByColumn.UpdateBySpec.UpdateByRollingMax rolling_max = 11;
-inline bool UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec::has_rolling_max() const {
-  return type_case() == kRollingMax;
-}
-inline bool UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec::_internal_has_rolling_max() const {
-  return type_case() == kRollingMax;
-}
-inline void UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec::set_has_rolling_max() {
-  _impl_._oneof_case_[0] = kRollingMax;
-}
-inline void UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec::clear_rolling_max() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  if (type_case() == kRollingMax) {
-    if (GetArena() == nullptr) {
-      delete _impl_.type_.rolling_max_;
-    }
-    clear_has_type();
-  }
-}
-inline ::io::deephaven::proto::backplane::grpc::UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingMax* UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec::release_rolling_max() {
-  // @@protoc_insertion_point(field_release:io.deephaven.proto.backplane.grpc.UpdateByRequest.UpdateByOperation.UpdateByColumn.UpdateBySpec.rolling_max)
-  if (type_case() == kRollingMax) {
-    clear_has_type();
-    auto* temp = _impl_.type_.rolling_max_;
-    if (GetArena() != nullptr) {
-      temp = ::google::protobuf::internal::DuplicateIfNonNull(temp);
-    }
-    _impl_.type_.rolling_max_ = nullptr;
-    return temp;
-  } else {
-    return nullptr;
-  }
-}
-inline const ::io::deephaven::proto::backplane::grpc::UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingMax& UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec::_internal_rolling_max() const {
-  return type_case() == kRollingMax ? *_impl_.type_.rolling_max_ : reinterpret_cast<::io::deephaven::proto::backplane::grpc::UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingMax&>(::io::deephaven::proto::backplane::grpc::_UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingMax_default_instance_);
-}
-inline const ::io::deephaven::proto::backplane::grpc::UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingMax& UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec::rolling_max() const ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  // @@protoc_insertion_point(field_get:io.deephaven.proto.backplane.grpc.UpdateByRequest.UpdateByOperation.UpdateByColumn.UpdateBySpec.rolling_max)
-  return _internal_rolling_max();
-}
-inline ::io::deephaven::proto::backplane::grpc::UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingMax* UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec::unsafe_arena_release_rolling_max() {
-  // @@protoc_insertion_point(field_unsafe_arena_release:io.deephaven.proto.backplane.grpc.UpdateByRequest.UpdateByOperation.UpdateByColumn.UpdateBySpec.rolling_max)
-  if (type_case() == kRollingMax) {
-    clear_has_type();
-    auto* temp = _impl_.type_.rolling_max_;
-    _impl_.type_.rolling_max_ = nullptr;
-    return temp;
-  } else {
-    return nullptr;
-  }
-}
-inline void UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec::unsafe_arena_set_allocated_rolling_max(::io::deephaven::proto::backplane::grpc::UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingMax* value) {
-  // We rely on the oneof clear method to free the earlier contents
-  // of this oneof. We can directly use the pointer we're given to
-  // set the new value.
-  clear_type();
-  if (value) {
-    set_has_rolling_max();
-    _impl_.type_.rolling_max_ = value;
-  }
-  // @@protoc_insertion_point(field_unsafe_arena_set_allocated:io.deephaven.proto.backplane.grpc.UpdateByRequest.UpdateByOperation.UpdateByColumn.UpdateBySpec.rolling_max)
-}
-inline ::io::deephaven::proto::backplane::grpc::UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingMax* UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec::_internal_mutable_rolling_max() {
-  if (type_case() != kRollingMax) {
-    clear_type();
-    set_has_rolling_max();
-    _impl_.type_.rolling_max_ = CreateMaybeMessage<::io::deephaven::proto::backplane::grpc::UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingMax>(GetArena());
-  }
-  return _impl_.type_.rolling_max_;
-}
-inline ::io::deephaven::proto::backplane::grpc::UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingMax* UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec::mutable_rolling_max() ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  ::io::deephaven::proto::backplane::grpc::UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingMax* _msg = _internal_mutable_rolling_max();
-  // @@protoc_insertion_point(field_mutable:io.deephaven.proto.backplane.grpc.UpdateByRequest.UpdateByOperation.UpdateByColumn.UpdateBySpec.rolling_max)
-  return _msg;
-}
-
-// .io.deephaven.proto.backplane.grpc.UpdateByRequest.UpdateByOperation.UpdateByColumn.UpdateBySpec.UpdateByRollingProduct rolling_product = 12;
-inline bool UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec::has_rolling_product() const {
-  return type_case() == kRollingProduct;
-}
-inline bool UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec::_internal_has_rolling_product() const {
-  return type_case() == kRollingProduct;
-}
-inline void UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec::set_has_rolling_product() {
-  _impl_._oneof_case_[0] = kRollingProduct;
-}
-inline void UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec::clear_rolling_product() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  if (type_case() == kRollingProduct) {
-    if (GetArena() == nullptr) {
-      delete _impl_.type_.rolling_product_;
-    }
-    clear_has_type();
-  }
-}
-inline ::io::deephaven::proto::backplane::grpc::UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingProduct* UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec::release_rolling_product() {
-  // @@protoc_insertion_point(field_release:io.deephaven.proto.backplane.grpc.UpdateByRequest.UpdateByOperation.UpdateByColumn.UpdateBySpec.rolling_product)
-  if (type_case() == kRollingProduct) {
-    clear_has_type();
-    auto* temp = _impl_.type_.rolling_product_;
-    if (GetArena() != nullptr) {
-      temp = ::google::protobuf::internal::DuplicateIfNonNull(temp);
-    }
-    _impl_.type_.rolling_product_ = nullptr;
-    return temp;
-  } else {
-    return nullptr;
-  }
-}
-inline const ::io::deephaven::proto::backplane::grpc::UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingProduct& UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec::_internal_rolling_product() const {
-  return type_case() == kRollingProduct ? *_impl_.type_.rolling_product_ : reinterpret_cast<::io::deephaven::proto::backplane::grpc::UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingProduct&>(::io::deephaven::proto::backplane::grpc::_UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingProduct_default_instance_);
-}
-inline const ::io::deephaven::proto::backplane::grpc::UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingProduct& UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec::rolling_product() const ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  // @@protoc_insertion_point(field_get:io.deephaven.proto.backplane.grpc.UpdateByRequest.UpdateByOperation.UpdateByColumn.UpdateBySpec.rolling_product)
-  return _internal_rolling_product();
-}
-inline ::io::deephaven::proto::backplane::grpc::UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingProduct* UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec::unsafe_arena_release_rolling_product() {
-  // @@protoc_insertion_point(field_unsafe_arena_release:io.deephaven.proto.backplane.grpc.UpdateByRequest.UpdateByOperation.UpdateByColumn.UpdateBySpec.rolling_product)
-  if (type_case() == kRollingProduct) {
-    clear_has_type();
-    auto* temp = _impl_.type_.rolling_product_;
-    _impl_.type_.rolling_product_ = nullptr;
-    return temp;
-  } else {
-    return nullptr;
-  }
-}
-inline void UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec::unsafe_arena_set_allocated_rolling_product(::io::deephaven::proto::backplane::grpc::UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingProduct* value) {
-  // We rely on the oneof clear method to free the earlier contents
-  // of this oneof. We can directly use the pointer we're given to
-  // set the new value.
-  clear_type();
-  if (value) {
-    set_has_rolling_product();
-    _impl_.type_.rolling_product_ = value;
-  }
-  // @@protoc_insertion_point(field_unsafe_arena_set_allocated:io.deephaven.proto.backplane.grpc.UpdateByRequest.UpdateByOperation.UpdateByColumn.UpdateBySpec.rolling_product)
-}
-inline ::io::deephaven::proto::backplane::grpc::UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingProduct* UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec::_internal_mutable_rolling_product() {
-  if (type_case() != kRollingProduct) {
-    clear_type();
-    set_has_rolling_product();
-    _impl_.type_.rolling_product_ = CreateMaybeMessage<::io::deephaven::proto::backplane::grpc::UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingProduct>(GetArena());
-  }
-  return _impl_.type_.rolling_product_;
-}
-inline ::io::deephaven::proto::backplane::grpc::UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingProduct* UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec::mutable_rolling_product() ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  ::io::deephaven::proto::backplane::grpc::UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingProduct* _msg = _internal_mutable_rolling_product();
-  // @@protoc_insertion_point(field_mutable:io.deephaven.proto.backplane.grpc.UpdateByRequest.UpdateByOperation.UpdateByColumn.UpdateBySpec.rolling_product)
-  return _msg;
-}
-
-// .io.deephaven.proto.backplane.grpc.UpdateByRequest.UpdateByOperation.UpdateByColumn.UpdateBySpec.UpdateByDelta delta = 13;
-inline bool UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec::has_delta() const {
-  return type_case() == kDelta;
-}
-inline bool UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec::_internal_has_delta() const {
-  return type_case() == kDelta;
-}
-inline void UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec::set_has_delta() {
-  _impl_._oneof_case_[0] = kDelta;
-}
-inline void UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec::clear_delta() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  if (type_case() == kDelta) {
-    if (GetArena() == nullptr) {
-      delete _impl_.type_.delta_;
-    }
-    clear_has_type();
-  }
-}
-inline ::io::deephaven::proto::backplane::grpc::UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByDelta* UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec::release_delta() {
-  // @@protoc_insertion_point(field_release:io.deephaven.proto.backplane.grpc.UpdateByRequest.UpdateByOperation.UpdateByColumn.UpdateBySpec.delta)
-  if (type_case() == kDelta) {
-    clear_has_type();
-    auto* temp = _impl_.type_.delta_;
-    if (GetArena() != nullptr) {
-      temp = ::google::protobuf::internal::DuplicateIfNonNull(temp);
-    }
-    _impl_.type_.delta_ = nullptr;
-    return temp;
-  } else {
-    return nullptr;
-  }
-}
-inline const ::io::deephaven::proto::backplane::grpc::UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByDelta& UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec::_internal_delta() const {
-  return type_case() == kDelta ? *_impl_.type_.delta_ : reinterpret_cast<::io::deephaven::proto::backplane::grpc::UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByDelta&>(::io::deephaven::proto::backplane::grpc::_UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByDelta_default_instance_);
-}
-inline const ::io::deephaven::proto::backplane::grpc::UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByDelta& UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec::delta() const ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  // @@protoc_insertion_point(field_get:io.deephaven.proto.backplane.grpc.UpdateByRequest.UpdateByOperation.UpdateByColumn.UpdateBySpec.delta)
-  return _internal_delta();
-}
-inline ::io::deephaven::proto::backplane::grpc::UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByDelta* UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec::unsafe_arena_release_delta() {
-  // @@protoc_insertion_point(field_unsafe_arena_release:io.deephaven.proto.backplane.grpc.UpdateByRequest.UpdateByOperation.UpdateByColumn.UpdateBySpec.delta)
-  if (type_case() == kDelta) {
-    clear_has_type();
-    auto* temp = _impl_.type_.delta_;
-    _impl_.type_.delta_ = nullptr;
-    return temp;
-  } else {
-    return nullptr;
-  }
-}
-inline void UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec::unsafe_arena_set_allocated_delta(::io::deephaven::proto::backplane::grpc::UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByDelta* value) {
-  // We rely on the oneof clear method to free the earlier contents
-  // of this oneof. We can directly use the pointer we're given to
-  // set the new value.
-  clear_type();
-  if (value) {
-    set_has_delta();
-    _impl_.type_.delta_ = value;
-  }
-  // @@protoc_insertion_point(field_unsafe_arena_set_allocated:io.deephaven.proto.backplane.grpc.UpdateByRequest.UpdateByOperation.UpdateByColumn.UpdateBySpec.delta)
-}
-inline ::io::deephaven::proto::backplane::grpc::UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByDelta* UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec::_internal_mutable_delta() {
-  if (type_case() != kDelta) {
-    clear_type();
-    set_has_delta();
-    _impl_.type_.delta_ = CreateMaybeMessage<::io::deephaven::proto::backplane::grpc::UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByDelta>(GetArena());
-  }
-  return _impl_.type_.delta_;
-}
-inline ::io::deephaven::proto::backplane::grpc::UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByDelta* UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec::mutable_delta() ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  ::io::deephaven::proto::backplane::grpc::UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByDelta* _msg = _internal_mutable_delta();
-  // @@protoc_insertion_point(field_mutable:io.deephaven.proto.backplane.grpc.UpdateByRequest.UpdateByOperation.UpdateByColumn.UpdateBySpec.delta)
-  return _msg;
-}
-
-// .io.deephaven.proto.backplane.grpc.UpdateByRequest.UpdateByOperation.UpdateByColumn.UpdateBySpec.UpdateByEms ems = 14;
-inline bool UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec::has_ems() const {
-  return type_case() == kEms;
-}
-inline bool UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec::_internal_has_ems() const {
-  return type_case() == kEms;
-}
-inline void UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec::set_has_ems() {
-  _impl_._oneof_case_[0] = kEms;
-}
-inline void UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec::clear_ems() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  if (type_case() == kEms) {
-    if (GetArena() == nullptr) {
-      delete _impl_.type_.ems_;
-    }
-    clear_has_type();
-  }
-}
-inline ::io::deephaven::proto::backplane::grpc::UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByEms* UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec::release_ems() {
-  // @@protoc_insertion_point(field_release:io.deephaven.proto.backplane.grpc.UpdateByRequest.UpdateByOperation.UpdateByColumn.UpdateBySpec.ems)
-  if (type_case() == kEms) {
-    clear_has_type();
-    auto* temp = _impl_.type_.ems_;
-    if (GetArena() != nullptr) {
-      temp = ::google::protobuf::internal::DuplicateIfNonNull(temp);
-    }
-    _impl_.type_.ems_ = nullptr;
-    return temp;
-  } else {
-    return nullptr;
-  }
-}
-inline const ::io::deephaven::proto::backplane::grpc::UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByEms& UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec::_internal_ems() const {
-  return type_case() == kEms ? *_impl_.type_.ems_ : reinterpret_cast<::io::deephaven::proto::backplane::grpc::UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByEms&>(::io::deephaven::proto::backplane::grpc::_UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByEms_default_instance_);
-}
-inline const ::io::deephaven::proto::backplane::grpc::UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByEms& UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec::ems() const ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  // @@protoc_insertion_point(field_get:io.deephaven.proto.backplane.grpc.UpdateByRequest.UpdateByOperation.UpdateByColumn.UpdateBySpec.ems)
-  return _internal_ems();
-}
-inline ::io::deephaven::proto::backplane::grpc::UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByEms* UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec::unsafe_arena_release_ems() {
-  // @@protoc_insertion_point(field_unsafe_arena_release:io.deephaven.proto.backplane.grpc.UpdateByRequest.UpdateByOperation.UpdateByColumn.UpdateBySpec.ems)
-  if (type_case() == kEms) {
-    clear_has_type();
-    auto* temp = _impl_.type_.ems_;
-    _impl_.type_.ems_ = nullptr;
-    return temp;
-  } else {
-    return nullptr;
-  }
-}
-inline void UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec::unsafe_arena_set_allocated_ems(::io::deephaven::proto::backplane::grpc::UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByEms* value) {
-  // We rely on the oneof clear method to free the earlier contents
-  // of this oneof. We can directly use the pointer we're given to
-  // set the new value.
-  clear_type();
-  if (value) {
-    set_has_ems();
-    _impl_.type_.ems_ = value;
-  }
-  // @@protoc_insertion_point(field_unsafe_arena_set_allocated:io.deephaven.proto.backplane.grpc.UpdateByRequest.UpdateByOperation.UpdateByColumn.UpdateBySpec.ems)
-}
-inline ::io::deephaven::proto::backplane::grpc::UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByEms* UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec::_internal_mutable_ems() {
-  if (type_case() != kEms) {
-    clear_type();
-    set_has_ems();
-    _impl_.type_.ems_ = CreateMaybeMessage<::io::deephaven::proto::backplane::grpc::UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByEms>(GetArena());
-  }
-  return _impl_.type_.ems_;
-}
-inline ::io::deephaven::proto::backplane::grpc::UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByEms* UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec::mutable_ems() ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  ::io::deephaven::proto::backplane::grpc::UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByEms* _msg = _internal_mutable_ems();
-  // @@protoc_insertion_point(field_mutable:io.deephaven.proto.backplane.grpc.UpdateByRequest.UpdateByOperation.UpdateByColumn.UpdateBySpec.ems)
-  return _msg;
-}
-
-// .io.deephaven.proto.backplane.grpc.UpdateByRequest.UpdateByOperation.UpdateByColumn.UpdateBySpec.UpdateByEmMin em_min = 15;
-inline bool UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec::has_em_min() const {
-  return type_case() == kEmMin;
-}
-inline bool UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec::_internal_has_em_min() const {
-  return type_case() == kEmMin;
-}
-inline void UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec::set_has_em_min() {
-  _impl_._oneof_case_[0] = kEmMin;
-}
-inline void UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec::clear_em_min() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  if (type_case() == kEmMin) {
-    if (GetArena() == nullptr) {
-      delete _impl_.type_.em_min_;
-    }
-    clear_has_type();
-  }
-}
-inline ::io::deephaven::proto::backplane::grpc::UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByEmMin* UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec::release_em_min() {
-  // @@protoc_insertion_point(field_release:io.deephaven.proto.backplane.grpc.UpdateByRequest.UpdateByOperation.UpdateByColumn.UpdateBySpec.em_min)
-  if (type_case() == kEmMin) {
-    clear_has_type();
-    auto* temp = _impl_.type_.em_min_;
-    if (GetArena() != nullptr) {
-      temp = ::google::protobuf::internal::DuplicateIfNonNull(temp);
-    }
-    _impl_.type_.em_min_ = nullptr;
-    return temp;
-  } else {
-    return nullptr;
-  }
-}
-inline const ::io::deephaven::proto::backplane::grpc::UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByEmMin& UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec::_internal_em_min() const {
-  return type_case() == kEmMin ? *_impl_.type_.em_min_ : reinterpret_cast<::io::deephaven::proto::backplane::grpc::UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByEmMin&>(::io::deephaven::proto::backplane::grpc::_UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByEmMin_default_instance_);
-}
-inline const ::io::deephaven::proto::backplane::grpc::UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByEmMin& UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec::em_min() const ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  // @@protoc_insertion_point(field_get:io.deephaven.proto.backplane.grpc.UpdateByRequest.UpdateByOperation.UpdateByColumn.UpdateBySpec.em_min)
-  return _internal_em_min();
-}
-inline ::io::deephaven::proto::backplane::grpc::UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByEmMin* UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec::unsafe_arena_release_em_min() {
-  // @@protoc_insertion_point(field_unsafe_arena_release:io.deephaven.proto.backplane.grpc.UpdateByRequest.UpdateByOperation.UpdateByColumn.UpdateBySpec.em_min)
-  if (type_case() == kEmMin) {
-    clear_has_type();
-    auto* temp = _impl_.type_.em_min_;
-    _impl_.type_.em_min_ = nullptr;
-    return temp;
-  } else {
-    return nullptr;
-  }
-}
-inline void UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec::unsafe_arena_set_allocated_em_min(::io::deephaven::proto::backplane::grpc::UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByEmMin* value) {
-  // We rely on the oneof clear method to free the earlier contents
-  // of this oneof. We can directly use the pointer we're given to
-  // set the new value.
-  clear_type();
-  if (value) {
-    set_has_em_min();
-    _impl_.type_.em_min_ = value;
-  }
-  // @@protoc_insertion_point(field_unsafe_arena_set_allocated:io.deephaven.proto.backplane.grpc.UpdateByRequest.UpdateByOperation.UpdateByColumn.UpdateBySpec.em_min)
-}
-inline ::io::deephaven::proto::backplane::grpc::UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByEmMin* UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec::_internal_mutable_em_min() {
-  if (type_case() != kEmMin) {
-    clear_type();
-    set_has_em_min();
-    _impl_.type_.em_min_ = CreateMaybeMessage<::io::deephaven::proto::backplane::grpc::UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByEmMin>(GetArena());
-  }
-  return _impl_.type_.em_min_;
-}
-inline ::io::deephaven::proto::backplane::grpc::UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByEmMin* UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec::mutable_em_min() ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  ::io::deephaven::proto::backplane::grpc::UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByEmMin* _msg = _internal_mutable_em_min();
-  // @@protoc_insertion_point(field_mutable:io.deephaven.proto.backplane.grpc.UpdateByRequest.UpdateByOperation.UpdateByColumn.UpdateBySpec.em_min)
-  return _msg;
-}
-
-// .io.deephaven.proto.backplane.grpc.UpdateByRequest.UpdateByOperation.UpdateByColumn.UpdateBySpec.UpdateByEmMax em_max = 16;
-inline bool UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec::has_em_max() const {
-  return type_case() == kEmMax;
-}
-inline bool UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec::_internal_has_em_max() const {
-  return type_case() == kEmMax;
-}
-inline void UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec::set_has_em_max() {
-  _impl_._oneof_case_[0] = kEmMax;
-}
-inline void UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec::clear_em_max() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  if (type_case() == kEmMax) {
-    if (GetArena() == nullptr) {
-      delete _impl_.type_.em_max_;
-    }
-    clear_has_type();
-  }
-}
-inline ::io::deephaven::proto::backplane::grpc::UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByEmMax* UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec::release_em_max() {
-  // @@protoc_insertion_point(field_release:io.deephaven.proto.backplane.grpc.UpdateByRequest.UpdateByOperation.UpdateByColumn.UpdateBySpec.em_max)
-  if (type_case() == kEmMax) {
-    clear_has_type();
-    auto* temp = _impl_.type_.em_max_;
-    if (GetArena() != nullptr) {
-      temp = ::google::protobuf::internal::DuplicateIfNonNull(temp);
-    }
-    _impl_.type_.em_max_ = nullptr;
-    return temp;
-  } else {
-    return nullptr;
-  }
-}
-inline const ::io::deephaven::proto::backplane::grpc::UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByEmMax& UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec::_internal_em_max() const {
-  return type_case() == kEmMax ? *_impl_.type_.em_max_ : reinterpret_cast<::io::deephaven::proto::backplane::grpc::UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByEmMax&>(::io::deephaven::proto::backplane::grpc::_UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByEmMax_default_instance_);
-}
-inline const ::io::deephaven::proto::backplane::grpc::UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByEmMax& UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec::em_max() const ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  // @@protoc_insertion_point(field_get:io.deephaven.proto.backplane.grpc.UpdateByRequest.UpdateByOperation.UpdateByColumn.UpdateBySpec.em_max)
-  return _internal_em_max();
-}
-inline ::io::deephaven::proto::backplane::grpc::UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByEmMax* UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec::unsafe_arena_release_em_max() {
-  // @@protoc_insertion_point(field_unsafe_arena_release:io.deephaven.proto.backplane.grpc.UpdateByRequest.UpdateByOperation.UpdateByColumn.UpdateBySpec.em_max)
-  if (type_case() == kEmMax) {
-    clear_has_type();
-    auto* temp = _impl_.type_.em_max_;
-    _impl_.type_.em_max_ = nullptr;
-    return temp;
-  } else {
-    return nullptr;
-  }
-}
-inline void UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec::unsafe_arena_set_allocated_em_max(::io::deephaven::proto::backplane::grpc::UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByEmMax* value) {
-  // We rely on the oneof clear method to free the earlier contents
-  // of this oneof. We can directly use the pointer we're given to
-  // set the new value.
-  clear_type();
-  if (value) {
-    set_has_em_max();
-    _impl_.type_.em_max_ = value;
-  }
-  // @@protoc_insertion_point(field_unsafe_arena_set_allocated:io.deephaven.proto.backplane.grpc.UpdateByRequest.UpdateByOperation.UpdateByColumn.UpdateBySpec.em_max)
-}
-inline ::io::deephaven::proto::backplane::grpc::UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByEmMax* UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec::_internal_mutable_em_max() {
-  if (type_case() != kEmMax) {
-    clear_type();
-    set_has_em_max();
-    _impl_.type_.em_max_ = CreateMaybeMessage<::io::deephaven::proto::backplane::grpc::UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByEmMax>(GetArena());
-  }
-  return _impl_.type_.em_max_;
-}
-inline ::io::deephaven::proto::backplane::grpc::UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByEmMax* UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec::mutable_em_max() ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  ::io::deephaven::proto::backplane::grpc::UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByEmMax* _msg = _internal_mutable_em_max();
-  // @@protoc_insertion_point(field_mutable:io.deephaven.proto.backplane.grpc.UpdateByRequest.UpdateByOperation.UpdateByColumn.UpdateBySpec.em_max)
-  return _msg;
-}
-
-// .io.deephaven.proto.backplane.grpc.UpdateByRequest.UpdateByOperation.UpdateByColumn.UpdateBySpec.UpdateByEmStd em_std = 17;
-inline bool UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec::has_em_std() const {
-  return type_case() == kEmStd;
-}
-inline bool UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec::_internal_has_em_std() const {
-  return type_case() == kEmStd;
-}
-inline void UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec::set_has_em_std() {
-  _impl_._oneof_case_[0] = kEmStd;
-}
-inline void UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec::clear_em_std() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  if (type_case() == kEmStd) {
-    if (GetArena() == nullptr) {
-      delete _impl_.type_.em_std_;
-    }
-    clear_has_type();
-  }
-}
-inline ::io::deephaven::proto::backplane::grpc::UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByEmStd* UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec::release_em_std() {
-  // @@protoc_insertion_point(field_release:io.deephaven.proto.backplane.grpc.UpdateByRequest.UpdateByOperation.UpdateByColumn.UpdateBySpec.em_std)
-  if (type_case() == kEmStd) {
-    clear_has_type();
-    auto* temp = _impl_.type_.em_std_;
-    if (GetArena() != nullptr) {
-      temp = ::google::protobuf::internal::DuplicateIfNonNull(temp);
-    }
-    _impl_.type_.em_std_ = nullptr;
-    return temp;
-  } else {
-    return nullptr;
-  }
-}
-inline const ::io::deephaven::proto::backplane::grpc::UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByEmStd& UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec::_internal_em_std() const {
-  return type_case() == kEmStd ? *_impl_.type_.em_std_ : reinterpret_cast<::io::deephaven::proto::backplane::grpc::UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByEmStd&>(::io::deephaven::proto::backplane::grpc::_UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByEmStd_default_instance_);
-}
-inline const ::io::deephaven::proto::backplane::grpc::UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByEmStd& UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec::em_std() const ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  // @@protoc_insertion_point(field_get:io.deephaven.proto.backplane.grpc.UpdateByRequest.UpdateByOperation.UpdateByColumn.UpdateBySpec.em_std)
-  return _internal_em_std();
-}
-inline ::io::deephaven::proto::backplane::grpc::UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByEmStd* UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec::unsafe_arena_release_em_std() {
-  // @@protoc_insertion_point(field_unsafe_arena_release:io.deephaven.proto.backplane.grpc.UpdateByRequest.UpdateByOperation.UpdateByColumn.UpdateBySpec.em_std)
-  if (type_case() == kEmStd) {
-    clear_has_type();
-    auto* temp = _impl_.type_.em_std_;
-    _impl_.type_.em_std_ = nullptr;
-    return temp;
-  } else {
-    return nullptr;
-  }
-}
-inline void UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec::unsafe_arena_set_allocated_em_std(::io::deephaven::proto::backplane::grpc::UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByEmStd* value) {
-  // We rely on the oneof clear method to free the earlier contents
-  // of this oneof. We can directly use the pointer we're given to
-  // set the new value.
-  clear_type();
-  if (value) {
-    set_has_em_std();
-    _impl_.type_.em_std_ = value;
-  }
-  // @@protoc_insertion_point(field_unsafe_arena_set_allocated:io.deephaven.proto.backplane.grpc.UpdateByRequest.UpdateByOperation.UpdateByColumn.UpdateBySpec.em_std)
-}
-inline ::io::deephaven::proto::backplane::grpc::UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByEmStd* UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec::_internal_mutable_em_std() {
-  if (type_case() != kEmStd) {
-    clear_type();
-    set_has_em_std();
-    _impl_.type_.em_std_ = CreateMaybeMessage<::io::deephaven::proto::backplane::grpc::UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByEmStd>(GetArena());
-  }
-  return _impl_.type_.em_std_;
-}
-inline ::io::deephaven::proto::backplane::grpc::UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByEmStd* UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec::mutable_em_std() ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  ::io::deephaven::proto::backplane::grpc::UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByEmStd* _msg = _internal_mutable_em_std();
-  // @@protoc_insertion_point(field_mutable:io.deephaven.proto.backplane.grpc.UpdateByRequest.UpdateByOperation.UpdateByColumn.UpdateBySpec.em_std)
-  return _msg;
-}
-
-// .io.deephaven.proto.backplane.grpc.UpdateByRequest.UpdateByOperation.UpdateByColumn.UpdateBySpec.UpdateByRollingCount rolling_count = 18;
-inline bool UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec::has_rolling_count() const {
-  return type_case() == kRollingCount;
-}
-inline bool UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec::_internal_has_rolling_count() const {
-  return type_case() == kRollingCount;
-}
-inline void UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec::set_has_rolling_count() {
-  _impl_._oneof_case_[0] = kRollingCount;
-}
-inline void UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec::clear_rolling_count() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  if (type_case() == kRollingCount) {
-    if (GetArena() == nullptr) {
-      delete _impl_.type_.rolling_count_;
-    }
-    clear_has_type();
-  }
-}
-inline ::io::deephaven::proto::backplane::grpc::UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingCount* UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec::release_rolling_count() {
-  // @@protoc_insertion_point(field_release:io.deephaven.proto.backplane.grpc.UpdateByRequest.UpdateByOperation.UpdateByColumn.UpdateBySpec.rolling_count)
-  if (type_case() == kRollingCount) {
-    clear_has_type();
-    auto* temp = _impl_.type_.rolling_count_;
-    if (GetArena() != nullptr) {
-      temp = ::google::protobuf::internal::DuplicateIfNonNull(temp);
-    }
-    _impl_.type_.rolling_count_ = nullptr;
-    return temp;
-  } else {
-    return nullptr;
-  }
-}
-inline const ::io::deephaven::proto::backplane::grpc::UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingCount& UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec::_internal_rolling_count() const {
-  return type_case() == kRollingCount ? *_impl_.type_.rolling_count_ : reinterpret_cast<::io::deephaven::proto::backplane::grpc::UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingCount&>(::io::deephaven::proto::backplane::grpc::_UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingCount_default_instance_);
-}
-inline const ::io::deephaven::proto::backplane::grpc::UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingCount& UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec::rolling_count() const ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  // @@protoc_insertion_point(field_get:io.deephaven.proto.backplane.grpc.UpdateByRequest.UpdateByOperation.UpdateByColumn.UpdateBySpec.rolling_count)
-  return _internal_rolling_count();
-}
-inline ::io::deephaven::proto::backplane::grpc::UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingCount* UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec::unsafe_arena_release_rolling_count() {
-  // @@protoc_insertion_point(field_unsafe_arena_release:io.deephaven.proto.backplane.grpc.UpdateByRequest.UpdateByOperation.UpdateByColumn.UpdateBySpec.rolling_count)
-  if (type_case() == kRollingCount) {
-    clear_has_type();
-    auto* temp = _impl_.type_.rolling_count_;
-    _impl_.type_.rolling_count_ = nullptr;
-    return temp;
-  } else {
-    return nullptr;
-  }
-}
-inline void UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec::unsafe_arena_set_allocated_rolling_count(::io::deephaven::proto::backplane::grpc::UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingCount* value) {
-  // We rely on the oneof clear method to free the earlier contents
-  // of this oneof. We can directly use the pointer we're given to
-  // set the new value.
-  clear_type();
-  if (value) {
-    set_has_rolling_count();
-    _impl_.type_.rolling_count_ = value;
-  }
-  // @@protoc_insertion_point(field_unsafe_arena_set_allocated:io.deephaven.proto.backplane.grpc.UpdateByRequest.UpdateByOperation.UpdateByColumn.UpdateBySpec.rolling_count)
-}
-inline ::io::deephaven::proto::backplane::grpc::UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingCount* UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec::_internal_mutable_rolling_count() {
-  if (type_case() != kRollingCount) {
-    clear_type();
-    set_has_rolling_count();
-    _impl_.type_.rolling_count_ = CreateMaybeMessage<::io::deephaven::proto::backplane::grpc::UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingCount>(GetArena());
-  }
-  return _impl_.type_.rolling_count_;
-}
-inline ::io::deephaven::proto::backplane::grpc::UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingCount* UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec::mutable_rolling_count() ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  ::io::deephaven::proto::backplane::grpc::UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingCount* _msg = _internal_mutable_rolling_count();
-  // @@protoc_insertion_point(field_mutable:io.deephaven.proto.backplane.grpc.UpdateByRequest.UpdateByOperation.UpdateByColumn.UpdateBySpec.rolling_count)
-  return _msg;
-}
-
-// .io.deephaven.proto.backplane.grpc.UpdateByRequest.UpdateByOperation.UpdateByColumn.UpdateBySpec.UpdateByRollingStd rolling_std = 19;
-inline bool UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec::has_rolling_std() const {
-  return type_case() == kRollingStd;
-}
-inline bool UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec::_internal_has_rolling_std() const {
-  return type_case() == kRollingStd;
-}
-inline void UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec::set_has_rolling_std() {
-  _impl_._oneof_case_[0] = kRollingStd;
-}
-inline void UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec::clear_rolling_std() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  if (type_case() == kRollingStd) {
-    if (GetArena() == nullptr) {
-      delete _impl_.type_.rolling_std_;
-    }
-    clear_has_type();
-  }
-}
-inline ::io::deephaven::proto::backplane::grpc::UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingStd* UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec::release_rolling_std() {
-  // @@protoc_insertion_point(field_release:io.deephaven.proto.backplane.grpc.UpdateByRequest.UpdateByOperation.UpdateByColumn.UpdateBySpec.rolling_std)
-  if (type_case() == kRollingStd) {
-    clear_has_type();
-    auto* temp = _impl_.type_.rolling_std_;
-    if (GetArena() != nullptr) {
-      temp = ::google::protobuf::internal::DuplicateIfNonNull(temp);
-    }
-    _impl_.type_.rolling_std_ = nullptr;
-    return temp;
-  } else {
-    return nullptr;
-  }
-}
-inline const ::io::deephaven::proto::backplane::grpc::UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingStd& UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec::_internal_rolling_std() const {
-  return type_case() == kRollingStd ? *_impl_.type_.rolling_std_ : reinterpret_cast<::io::deephaven::proto::backplane::grpc::UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingStd&>(::io::deephaven::proto::backplane::grpc::_UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingStd_default_instance_);
-}
-inline const ::io::deephaven::proto::backplane::grpc::UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingStd& UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec::rolling_std() const ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  // @@protoc_insertion_point(field_get:io.deephaven.proto.backplane.grpc.UpdateByRequest.UpdateByOperation.UpdateByColumn.UpdateBySpec.rolling_std)
-  return _internal_rolling_std();
-}
-inline ::io::deephaven::proto::backplane::grpc::UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingStd* UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec::unsafe_arena_release_rolling_std() {
-  // @@protoc_insertion_point(field_unsafe_arena_release:io.deephaven.proto.backplane.grpc.UpdateByRequest.UpdateByOperation.UpdateByColumn.UpdateBySpec.rolling_std)
-  if (type_case() == kRollingStd) {
-    clear_has_type();
-    auto* temp = _impl_.type_.rolling_std_;
-    _impl_.type_.rolling_std_ = nullptr;
-    return temp;
-  } else {
-    return nullptr;
-  }
-}
-inline void UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec::unsafe_arena_set_allocated_rolling_std(::io::deephaven::proto::backplane::grpc::UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingStd* value) {
-  // We rely on the oneof clear method to free the earlier contents
-  // of this oneof. We can directly use the pointer we're given to
-  // set the new value.
-  clear_type();
-  if (value) {
-    set_has_rolling_std();
-    _impl_.type_.rolling_std_ = value;
-  }
-  // @@protoc_insertion_point(field_unsafe_arena_set_allocated:io.deephaven.proto.backplane.grpc.UpdateByRequest.UpdateByOperation.UpdateByColumn.UpdateBySpec.rolling_std)
-}
-inline ::io::deephaven::proto::backplane::grpc::UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingStd* UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec::_internal_mutable_rolling_std() {
-  if (type_case() != kRollingStd) {
-    clear_type();
-    set_has_rolling_std();
-    _impl_.type_.rolling_std_ = CreateMaybeMessage<::io::deephaven::proto::backplane::grpc::UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingStd>(GetArena());
-  }
-  return _impl_.type_.rolling_std_;
-}
-inline ::io::deephaven::proto::backplane::grpc::UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingStd* UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec::mutable_rolling_std() ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  ::io::deephaven::proto::backplane::grpc::UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingStd* _msg = _internal_mutable_rolling_std();
-  // @@protoc_insertion_point(field_mutable:io.deephaven.proto.backplane.grpc.UpdateByRequest.UpdateByOperation.UpdateByColumn.UpdateBySpec.rolling_std)
-  return _msg;
-}
-
-// .io.deephaven.proto.backplane.grpc.UpdateByRequest.UpdateByOperation.UpdateByColumn.UpdateBySpec.UpdateByRollingWAvg rolling_wavg = 20;
-inline bool UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec::has_rolling_wavg() const {
-  return type_case() == kRollingWavg;
-}
-inline bool UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec::_internal_has_rolling_wavg() const {
-  return type_case() == kRollingWavg;
-}
-inline void UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec::set_has_rolling_wavg() {
-  _impl_._oneof_case_[0] = kRollingWavg;
-}
-inline void UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec::clear_rolling_wavg() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  if (type_case() == kRollingWavg) {
-    if (GetArena() == nullptr) {
-      delete _impl_.type_.rolling_wavg_;
-    }
-    clear_has_type();
-  }
-}
-inline ::io::deephaven::proto::backplane::grpc::UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingWAvg* UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec::release_rolling_wavg() {
-  // @@protoc_insertion_point(field_release:io.deephaven.proto.backplane.grpc.UpdateByRequest.UpdateByOperation.UpdateByColumn.UpdateBySpec.rolling_wavg)
-  if (type_case() == kRollingWavg) {
-    clear_has_type();
-    auto* temp = _impl_.type_.rolling_wavg_;
-    if (GetArena() != nullptr) {
-      temp = ::google::protobuf::internal::DuplicateIfNonNull(temp);
-    }
-    _impl_.type_.rolling_wavg_ = nullptr;
-    return temp;
-  } else {
-    return nullptr;
-  }
-}
-inline const ::io::deephaven::proto::backplane::grpc::UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingWAvg& UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec::_internal_rolling_wavg() const {
-  return type_case() == kRollingWavg ? *_impl_.type_.rolling_wavg_ : reinterpret_cast<::io::deephaven::proto::backplane::grpc::UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingWAvg&>(::io::deephaven::proto::backplane::grpc::_UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingWAvg_default_instance_);
-}
-inline const ::io::deephaven::proto::backplane::grpc::UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingWAvg& UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec::rolling_wavg() const ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  // @@protoc_insertion_point(field_get:io.deephaven.proto.backplane.grpc.UpdateByRequest.UpdateByOperation.UpdateByColumn.UpdateBySpec.rolling_wavg)
-  return _internal_rolling_wavg();
-}
-inline ::io::deephaven::proto::backplane::grpc::UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingWAvg* UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec::unsafe_arena_release_rolling_wavg() {
-  // @@protoc_insertion_point(field_unsafe_arena_release:io.deephaven.proto.backplane.grpc.UpdateByRequest.UpdateByOperation.UpdateByColumn.UpdateBySpec.rolling_wavg)
-  if (type_case() == kRollingWavg) {
-    clear_has_type();
-    auto* temp = _impl_.type_.rolling_wavg_;
-    _impl_.type_.rolling_wavg_ = nullptr;
-    return temp;
-  } else {
-    return nullptr;
-  }
-}
-inline void UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec::unsafe_arena_set_allocated_rolling_wavg(::io::deephaven::proto::backplane::grpc::UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingWAvg* value) {
-  // We rely on the oneof clear method to free the earlier contents
-  // of this oneof. We can directly use the pointer we're given to
-  // set the new value.
-  clear_type();
-  if (value) {
-    set_has_rolling_wavg();
-    _impl_.type_.rolling_wavg_ = value;
-  }
-  // @@protoc_insertion_point(field_unsafe_arena_set_allocated:io.deephaven.proto.backplane.grpc.UpdateByRequest.UpdateByOperation.UpdateByColumn.UpdateBySpec.rolling_wavg)
-}
-inline ::io::deephaven::proto::backplane::grpc::UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingWAvg* UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec::_internal_mutable_rolling_wavg() {
-  if (type_case() != kRollingWavg) {
-    clear_type();
-    set_has_rolling_wavg();
-    _impl_.type_.rolling_wavg_ = CreateMaybeMessage<::io::deephaven::proto::backplane::grpc::UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingWAvg>(GetArena());
-  }
-  return _impl_.type_.rolling_wavg_;
-}
-inline ::io::deephaven::proto::backplane::grpc::UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingWAvg* UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec::mutable_rolling_wavg() ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  ::io::deephaven::proto::backplane::grpc::UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingWAvg* _msg = _internal_mutable_rolling_wavg();
-  // @@protoc_insertion_point(field_mutable:io.deephaven.proto.backplane.grpc.UpdateByRequest.UpdateByOperation.UpdateByColumn.UpdateBySpec.rolling_wavg)
-  return _msg;
-}
-
-// .io.deephaven.proto.backplane.grpc.UpdateByRequest.UpdateByOperation.UpdateByColumn.UpdateBySpec.UpdateByRollingFormula rolling_formula = 21;
-inline bool UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec::has_rolling_formula() const {
-  return type_case() == kRollingFormula;
-}
-inline bool UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec::_internal_has_rolling_formula() const {
-  return type_case() == kRollingFormula;
-}
-inline void UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec::set_has_rolling_formula() {
-  _impl_._oneof_case_[0] = kRollingFormula;
-}
-inline void UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec::clear_rolling_formula() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  if (type_case() == kRollingFormula) {
-    if (GetArena() == nullptr) {
-      delete _impl_.type_.rolling_formula_;
-    }
-    clear_has_type();
-  }
-}
-inline ::io::deephaven::proto::backplane::grpc::UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingFormula* UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec::release_rolling_formula() {
-  // @@protoc_insertion_point(field_release:io.deephaven.proto.backplane.grpc.UpdateByRequest.UpdateByOperation.UpdateByColumn.UpdateBySpec.rolling_formula)
-  if (type_case() == kRollingFormula) {
-    clear_has_type();
-    auto* temp = _impl_.type_.rolling_formula_;
-    if (GetArena() != nullptr) {
-      temp = ::google::protobuf::internal::DuplicateIfNonNull(temp);
-    }
-    _impl_.type_.rolling_formula_ = nullptr;
-    return temp;
-  } else {
-    return nullptr;
-  }
-}
-inline const ::io::deephaven::proto::backplane::grpc::UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingFormula& UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec::_internal_rolling_formula() const {
-  return type_case() == kRollingFormula ? *_impl_.type_.rolling_formula_ : reinterpret_cast<::io::deephaven::proto::backplane::grpc::UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingFormula&>(::io::deephaven::proto::backplane::grpc::_UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingFormula_default_instance_);
-}
-inline const ::io::deephaven::proto::backplane::grpc::UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingFormula& UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec::rolling_formula() const ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  // @@protoc_insertion_point(field_get:io.deephaven.proto.backplane.grpc.UpdateByRequest.UpdateByOperation.UpdateByColumn.UpdateBySpec.rolling_formula)
-  return _internal_rolling_formula();
-}
-inline ::io::deephaven::proto::backplane::grpc::UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingFormula* UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec::unsafe_arena_release_rolling_formula() {
-  // @@protoc_insertion_point(field_unsafe_arena_release:io.deephaven.proto.backplane.grpc.UpdateByRequest.UpdateByOperation.UpdateByColumn.UpdateBySpec.rolling_formula)
-  if (type_case() == kRollingFormula) {
-    clear_has_type();
-    auto* temp = _impl_.type_.rolling_formula_;
-    _impl_.type_.rolling_formula_ = nullptr;
-    return temp;
-  } else {
-    return nullptr;
-  }
-}
-inline void UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec::unsafe_arena_set_allocated_rolling_formula(::io::deephaven::proto::backplane::grpc::UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingFormula* value) {
-  // We rely on the oneof clear method to free the earlier contents
-  // of this oneof. We can directly use the pointer we're given to
-  // set the new value.
-  clear_type();
-  if (value) {
-    set_has_rolling_formula();
-    _impl_.type_.rolling_formula_ = value;
-  }
-  // @@protoc_insertion_point(field_unsafe_arena_set_allocated:io.deephaven.proto.backplane.grpc.UpdateByRequest.UpdateByOperation.UpdateByColumn.UpdateBySpec.rolling_formula)
-}
-inline ::io::deephaven::proto::backplane::grpc::UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingFormula* UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec::_internal_mutable_rolling_formula() {
-  if (type_case() != kRollingFormula) {
-    clear_type();
-    set_has_rolling_formula();
-    _impl_.type_.rolling_formula_ = CreateMaybeMessage<::io::deephaven::proto::backplane::grpc::UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingFormula>(GetArena());
-  }
-  return _impl_.type_.rolling_formula_;
-}
-inline ::io::deephaven::proto::backplane::grpc::UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingFormula* UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec::mutable_rolling_formula() ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  ::io::deephaven::proto::backplane::grpc::UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingFormula* _msg = _internal_mutable_rolling_formula();
-  // @@protoc_insertion_point(field_mutable:io.deephaven.proto.backplane.grpc.UpdateByRequest.UpdateByOperation.UpdateByColumn.UpdateBySpec.rolling_formula)
-  return _msg;
-}
-
-inline bool UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec::has_type() const {
-  return type_case() != TYPE_NOT_SET;
-}
-inline void UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec::clear_has_type() {
-  _impl_._oneof_case_[0] = TYPE_NOT_SET;
-}
-inline UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec::TypeCase UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec::type_case() const {
-  return UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec::TypeCase(_impl_._oneof_case_[0]);
-}
-// -------------------------------------------------------------------
-
-// UpdateByRequest_UpdateByOperation_UpdateByColumn
-
-// .io.deephaven.proto.backplane.grpc.UpdateByRequest.UpdateByOperation.UpdateByColumn.UpdateBySpec spec = 1;
-inline bool UpdateByRequest_UpdateByOperation_UpdateByColumn::has_spec() const {
-  bool value = (_impl_._has_bits_[0] & 0x00000001u) != 0;
-  PROTOBUF_ASSUME(!value || _impl_.spec_ != nullptr);
-  return value;
-}
-inline void UpdateByRequest_UpdateByOperation_UpdateByColumn::clear_spec() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  if (_impl_.spec_ != nullptr) _impl_.spec_->Clear();
-  _impl_._has_bits_[0] &= ~0x00000001u;
-}
-inline const ::io::deephaven::proto::backplane::grpc::UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec& UpdateByRequest_UpdateByOperation_UpdateByColumn::_internal_spec() const {
-  PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race);
-  const ::io::deephaven::proto::backplane::grpc::UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec* p = _impl_.spec_;
-  return p != nullptr ? *p : reinterpret_cast<const ::io::deephaven::proto::backplane::grpc::UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec&>(::io::deephaven::proto::backplane::grpc::_UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_default_instance_);
-}
-inline const ::io::deephaven::proto::backplane::grpc::UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec& UpdateByRequest_UpdateByOperation_UpdateByColumn::spec() const ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  // @@protoc_insertion_point(field_get:io.deephaven.proto.backplane.grpc.UpdateByRequest.UpdateByOperation.UpdateByColumn.spec)
-  return _internal_spec();
-}
-inline void UpdateByRequest_UpdateByOperation_UpdateByColumn::unsafe_arena_set_allocated_spec(::io::deephaven::proto::backplane::grpc::UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec* value) {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  if (GetArena() == nullptr) {
-    delete reinterpret_cast<::google::protobuf::MessageLite*>(_impl_.spec_);
-  }
-  _impl_.spec_ = reinterpret_cast<::io::deephaven::proto::backplane::grpc::UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec*>(value);
-  if (value != nullptr) {
-    _impl_._has_bits_[0] |= 0x00000001u;
-  } else {
-    _impl_._has_bits_[0] &= ~0x00000001u;
-  }
-  // @@protoc_insertion_point(field_unsafe_arena_set_allocated:io.deephaven.proto.backplane.grpc.UpdateByRequest.UpdateByOperation.UpdateByColumn.spec)
-}
-inline ::io::deephaven::proto::backplane::grpc::UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec* UpdateByRequest_UpdateByOperation_UpdateByColumn::release_spec() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-
-  _impl_._has_bits_[0] &= ~0x00000001u;
-  ::io::deephaven::proto::backplane::grpc::UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec* released = _impl_.spec_;
-  _impl_.spec_ = nullptr;
-#ifdef PROTOBUF_FORCE_COPY_IN_RELEASE
-  auto* old = reinterpret_cast<::google::protobuf::MessageLite*>(released);
-  released = ::google::protobuf::internal::DuplicateIfNonNull(released);
-  if (GetArena() == nullptr) {
-    delete old;
-  }
-#else   // PROTOBUF_FORCE_COPY_IN_RELEASE
-  if (GetArena() != nullptr) {
-    released = ::google::protobuf::internal::DuplicateIfNonNull(released);
-  }
-#endif  // !PROTOBUF_FORCE_COPY_IN_RELEASE
-  return released;
-}
-inline ::io::deephaven::proto::backplane::grpc::UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec* UpdateByRequest_UpdateByOperation_UpdateByColumn::unsafe_arena_release_spec() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  // @@protoc_insertion_point(field_release:io.deephaven.proto.backplane.grpc.UpdateByRequest.UpdateByOperation.UpdateByColumn.spec)
-
-  _impl_._has_bits_[0] &= ~0x00000001u;
-  ::io::deephaven::proto::backplane::grpc::UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec* temp = _impl_.spec_;
-  _impl_.spec_ = nullptr;
-  return temp;
-}
-inline ::io::deephaven::proto::backplane::grpc::UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec* UpdateByRequest_UpdateByOperation_UpdateByColumn::_internal_mutable_spec() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  _impl_._has_bits_[0] |= 0x00000001u;
-  if (_impl_.spec_ == nullptr) {
-    auto* p = CreateMaybeMessage<::io::deephaven::proto::backplane::grpc::UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec>(GetArena());
-    _impl_.spec_ = reinterpret_cast<::io::deephaven::proto::backplane::grpc::UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec*>(p);
-  }
-  return _impl_.spec_;
-}
-inline ::io::deephaven::proto::backplane::grpc::UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec* UpdateByRequest_UpdateByOperation_UpdateByColumn::mutable_spec() ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  ::io::deephaven::proto::backplane::grpc::UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec* _msg = _internal_mutable_spec();
-  // @@protoc_insertion_point(field_mutable:io.deephaven.proto.backplane.grpc.UpdateByRequest.UpdateByOperation.UpdateByColumn.spec)
-  return _msg;
-}
-inline void UpdateByRequest_UpdateByOperation_UpdateByColumn::set_allocated_spec(::io::deephaven::proto::backplane::grpc::UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec* value) {
-  ::google::protobuf::Arena* message_arena = GetArena();
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  if (message_arena == nullptr) {
-    delete reinterpret_cast<::io::deephaven::proto::backplane::grpc::UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec*>(_impl_.spec_);
-  }
-
-  if (value != nullptr) {
-    ::google::protobuf::Arena* submessage_arena = reinterpret_cast<::io::deephaven::proto::backplane::grpc::UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec*>(value)->GetArena();
-    if (message_arena != submessage_arena) {
-      value = ::google::protobuf::internal::GetOwnedMessage(message_arena, value, submessage_arena);
-    }
-    _impl_._has_bits_[0] |= 0x00000001u;
-  } else {
-    _impl_._has_bits_[0] &= ~0x00000001u;
-  }
-
-  _impl_.spec_ = reinterpret_cast<::io::deephaven::proto::backplane::grpc::UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec*>(value);
-  // @@protoc_insertion_point(field_set_allocated:io.deephaven.proto.backplane.grpc.UpdateByRequest.UpdateByOperation.UpdateByColumn.spec)
-}
-
-// repeated string match_pairs = 2;
-inline int UpdateByRequest_UpdateByOperation_UpdateByColumn::_internal_match_pairs_size() const {
-  return _internal_match_pairs().size();
-}
-inline int UpdateByRequest_UpdateByOperation_UpdateByColumn::match_pairs_size() const {
-  return _internal_match_pairs_size();
-}
-inline void UpdateByRequest_UpdateByOperation_UpdateByColumn::clear_match_pairs() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  _impl_.match_pairs_.Clear();
-}
-inline std::string* UpdateByRequest_UpdateByOperation_UpdateByColumn::add_match_pairs()
-    ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  std::string* _s = _internal_mutable_match_pairs()->Add();
-  // @@protoc_insertion_point(field_add_mutable:io.deephaven.proto.backplane.grpc.UpdateByRequest.UpdateByOperation.UpdateByColumn.match_pairs)
-  return _s;
-}
-inline const std::string& UpdateByRequest_UpdateByOperation_UpdateByColumn::match_pairs(int index) const
-    ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  // @@protoc_insertion_point(field_get:io.deephaven.proto.backplane.grpc.UpdateByRequest.UpdateByOperation.UpdateByColumn.match_pairs)
-  return _internal_match_pairs().Get(index);
-}
-inline std::string* UpdateByRequest_UpdateByOperation_UpdateByColumn::mutable_match_pairs(int index)
-    ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  // @@protoc_insertion_point(field_mutable:io.deephaven.proto.backplane.grpc.UpdateByRequest.UpdateByOperation.UpdateByColumn.match_pairs)
-  return _internal_mutable_match_pairs()->Mutable(index);
-}
-inline void UpdateByRequest_UpdateByOperation_UpdateByColumn::set_match_pairs(int index, const std::string& value) {
-  _internal_mutable_match_pairs()->Mutable(index)->assign(value);
-  // @@protoc_insertion_point(field_set:io.deephaven.proto.backplane.grpc.UpdateByRequest.UpdateByOperation.UpdateByColumn.match_pairs)
-}
-inline void UpdateByRequest_UpdateByOperation_UpdateByColumn::set_match_pairs(int index, std::string&& value) {
-  _internal_mutable_match_pairs()->Mutable(index)->assign(std::move(value));
-  // @@protoc_insertion_point(field_set:io.deephaven.proto.backplane.grpc.UpdateByRequest.UpdateByOperation.UpdateByColumn.match_pairs)
-}
-inline void UpdateByRequest_UpdateByOperation_UpdateByColumn::set_match_pairs(int index, const char* value) {
-  ABSL_DCHECK(value != nullptr);
-  _internal_mutable_match_pairs()->Mutable(index)->assign(value);
-  // @@protoc_insertion_point(field_set_char:io.deephaven.proto.backplane.grpc.UpdateByRequest.UpdateByOperation.UpdateByColumn.match_pairs)
-}
-inline void UpdateByRequest_UpdateByOperation_UpdateByColumn::set_match_pairs(int index, const char* value,
-                              std::size_t size) {
-  _internal_mutable_match_pairs()->Mutable(index)->assign(
-      reinterpret_cast<const char*>(value), size);
-  // @@protoc_insertion_point(field_set_pointer:io.deephaven.proto.backplane.grpc.UpdateByRequest.UpdateByOperation.UpdateByColumn.match_pairs)
-}
-inline void UpdateByRequest_UpdateByOperation_UpdateByColumn::set_match_pairs(int index, absl::string_view value) {
-  _internal_mutable_match_pairs()->Mutable(index)->assign(value.data(),
-                                                     value.size());
-  // @@protoc_insertion_point(field_set_string_piece:io.deephaven.proto.backplane.grpc.UpdateByRequest.UpdateByOperation.UpdateByColumn.match_pairs)
-}
-inline void UpdateByRequest_UpdateByOperation_UpdateByColumn::add_match_pairs(const std::string& value) {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  _internal_mutable_match_pairs()->Add()->assign(value);
-  // @@protoc_insertion_point(field_add:io.deephaven.proto.backplane.grpc.UpdateByRequest.UpdateByOperation.UpdateByColumn.match_pairs)
-}
-inline void UpdateByRequest_UpdateByOperation_UpdateByColumn::add_match_pairs(std::string&& value) {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  _internal_mutable_match_pairs()->Add(std::move(value));
-  // @@protoc_insertion_point(field_add:io.deephaven.proto.backplane.grpc.UpdateByRequest.UpdateByOperation.UpdateByColumn.match_pairs)
-}
-inline void UpdateByRequest_UpdateByOperation_UpdateByColumn::add_match_pairs(const char* value) {
-  ABSL_DCHECK(value != nullptr);
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  _internal_mutable_match_pairs()->Add()->assign(value);
-  // @@protoc_insertion_point(field_add_char:io.deephaven.proto.backplane.grpc.UpdateByRequest.UpdateByOperation.UpdateByColumn.match_pairs)
-}
-inline void UpdateByRequest_UpdateByOperation_UpdateByColumn::add_match_pairs(const char* value, std::size_t size) {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  _internal_mutable_match_pairs()->Add()->assign(
-      reinterpret_cast<const char*>(value), size);
-  // @@protoc_insertion_point(field_add_pointer:io.deephaven.proto.backplane.grpc.UpdateByRequest.UpdateByOperation.UpdateByColumn.match_pairs)
-}
-inline void UpdateByRequest_UpdateByOperation_UpdateByColumn::add_match_pairs(absl::string_view value) {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  _internal_mutable_match_pairs()->Add()->assign(value.data(), value.size());
-  // @@protoc_insertion_point(field_add_string_piece:io.deephaven.proto.backplane.grpc.UpdateByRequest.UpdateByOperation.UpdateByColumn.match_pairs)
-}
-inline const ::google::protobuf::RepeatedPtrField<std::string>&
-UpdateByRequest_UpdateByOperation_UpdateByColumn::match_pairs() const ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  // @@protoc_insertion_point(field_list:io.deephaven.proto.backplane.grpc.UpdateByRequest.UpdateByOperation.UpdateByColumn.match_pairs)
-  return _internal_match_pairs();
-}
-inline ::google::protobuf::RepeatedPtrField<std::string>*
-UpdateByRequest_UpdateByOperation_UpdateByColumn::mutable_match_pairs() ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  // @@protoc_insertion_point(field_mutable_list:io.deephaven.proto.backplane.grpc.UpdateByRequest.UpdateByOperation.UpdateByColumn.match_pairs)
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  return _internal_mutable_match_pairs();
-}
-inline const ::google::protobuf::RepeatedPtrField<std::string>&
-UpdateByRequest_UpdateByOperation_UpdateByColumn::_internal_match_pairs() const {
-  PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race);
-  return _impl_.match_pairs_;
-}
-inline ::google::protobuf::RepeatedPtrField<std::string>*
-UpdateByRequest_UpdateByOperation_UpdateByColumn::_internal_mutable_match_pairs() {
-  PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race);
-  return &_impl_.match_pairs_;
-}
-
-// -------------------------------------------------------------------
-
-// UpdateByRequest_UpdateByOperation
-
-// .io.deephaven.proto.backplane.grpc.UpdateByRequest.UpdateByOperation.UpdateByColumn column = 1;
-inline bool UpdateByRequest_UpdateByOperation::has_column() const {
-  return type_case() == kColumn;
-}
-inline bool UpdateByRequest_UpdateByOperation::_internal_has_column() const {
-  return type_case() == kColumn;
-}
-inline void UpdateByRequest_UpdateByOperation::set_has_column() {
-  _impl_._oneof_case_[0] = kColumn;
-}
-inline void UpdateByRequest_UpdateByOperation::clear_column() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  if (type_case() == kColumn) {
-    if (GetArena() == nullptr) {
-      delete _impl_.type_.column_;
-    }
-    clear_has_type();
-  }
-}
-inline ::io::deephaven::proto::backplane::grpc::UpdateByRequest_UpdateByOperation_UpdateByColumn* UpdateByRequest_UpdateByOperation::release_column() {
-  // @@protoc_insertion_point(field_release:io.deephaven.proto.backplane.grpc.UpdateByRequest.UpdateByOperation.column)
-  if (type_case() == kColumn) {
-    clear_has_type();
-    auto* temp = _impl_.type_.column_;
-    if (GetArena() != nullptr) {
-      temp = ::google::protobuf::internal::DuplicateIfNonNull(temp);
-    }
-    _impl_.type_.column_ = nullptr;
-    return temp;
-  } else {
-    return nullptr;
-  }
-}
-inline const ::io::deephaven::proto::backplane::grpc::UpdateByRequest_UpdateByOperation_UpdateByColumn& UpdateByRequest_UpdateByOperation::_internal_column() const {
-  return type_case() == kColumn ? *_impl_.type_.column_ : reinterpret_cast<::io::deephaven::proto::backplane::grpc::UpdateByRequest_UpdateByOperation_UpdateByColumn&>(::io::deephaven::proto::backplane::grpc::_UpdateByRequest_UpdateByOperation_UpdateByColumn_default_instance_);
-}
-inline const ::io::deephaven::proto::backplane::grpc::UpdateByRequest_UpdateByOperation_UpdateByColumn& UpdateByRequest_UpdateByOperation::column() const ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  // @@protoc_insertion_point(field_get:io.deephaven.proto.backplane.grpc.UpdateByRequest.UpdateByOperation.column)
-  return _internal_column();
-}
-inline ::io::deephaven::proto::backplane::grpc::UpdateByRequest_UpdateByOperation_UpdateByColumn* UpdateByRequest_UpdateByOperation::unsafe_arena_release_column() {
-  // @@protoc_insertion_point(field_unsafe_arena_release:io.deephaven.proto.backplane.grpc.UpdateByRequest.UpdateByOperation.column)
-  if (type_case() == kColumn) {
-    clear_has_type();
-    auto* temp = _impl_.type_.column_;
-    _impl_.type_.column_ = nullptr;
-    return temp;
-  } else {
-    return nullptr;
-  }
-}
-inline void UpdateByRequest_UpdateByOperation::unsafe_arena_set_allocated_column(::io::deephaven::proto::backplane::grpc::UpdateByRequest_UpdateByOperation_UpdateByColumn* value) {
-  // We rely on the oneof clear method to free the earlier contents
-  // of this oneof. We can directly use the pointer we're given to
-  // set the new value.
-  clear_type();
-  if (value) {
-    set_has_column();
-    _impl_.type_.column_ = value;
-  }
-  // @@protoc_insertion_point(field_unsafe_arena_set_allocated:io.deephaven.proto.backplane.grpc.UpdateByRequest.UpdateByOperation.column)
-}
-inline ::io::deephaven::proto::backplane::grpc::UpdateByRequest_UpdateByOperation_UpdateByColumn* UpdateByRequest_UpdateByOperation::_internal_mutable_column() {
-  if (type_case() != kColumn) {
-    clear_type();
-    set_has_column();
-    _impl_.type_.column_ = CreateMaybeMessage<::io::deephaven::proto::backplane::grpc::UpdateByRequest_UpdateByOperation_UpdateByColumn>(GetArena());
-  }
-  return _impl_.type_.column_;
-}
-inline ::io::deephaven::proto::backplane::grpc::UpdateByRequest_UpdateByOperation_UpdateByColumn* UpdateByRequest_UpdateByOperation::mutable_column() ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  ::io::deephaven::proto::backplane::grpc::UpdateByRequest_UpdateByOperation_UpdateByColumn* _msg = _internal_mutable_column();
-  // @@protoc_insertion_point(field_mutable:io.deephaven.proto.backplane.grpc.UpdateByRequest.UpdateByOperation.column)
-  return _msg;
-}
-
-inline bool UpdateByRequest_UpdateByOperation::has_type() const {
-  return type_case() != TYPE_NOT_SET;
-}
-inline void UpdateByRequest_UpdateByOperation::clear_has_type() {
-  _impl_._oneof_case_[0] = TYPE_NOT_SET;
-}
-inline UpdateByRequest_UpdateByOperation::TypeCase UpdateByRequest_UpdateByOperation::type_case() const {
-  return UpdateByRequest_UpdateByOperation::TypeCase(_impl_._oneof_case_[0]);
-}
-// -------------------------------------------------------------------
-
-// UpdateByRequest
-
-// .io.deephaven.proto.backplane.grpc.Ticket result_id = 1;
-inline bool UpdateByRequest::has_result_id() const {
-  bool value = (_impl_._has_bits_[0] & 0x00000001u) != 0;
-  PROTOBUF_ASSUME(!value || _impl_.result_id_ != nullptr);
-  return value;
-}
-inline const ::io::deephaven::proto::backplane::grpc::Ticket& UpdateByRequest::_internal_result_id() const {
-  PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race);
-  const ::io::deephaven::proto::backplane::grpc::Ticket* p = _impl_.result_id_;
-  return p != nullptr ? *p : reinterpret_cast<const ::io::deephaven::proto::backplane::grpc::Ticket&>(::io::deephaven::proto::backplane::grpc::_Ticket_default_instance_);
-}
-inline const ::io::deephaven::proto::backplane::grpc::Ticket& UpdateByRequest::result_id() const ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  // @@protoc_insertion_point(field_get:io.deephaven.proto.backplane.grpc.UpdateByRequest.result_id)
-  return _internal_result_id();
-}
-inline void UpdateByRequest::unsafe_arena_set_allocated_result_id(::io::deephaven::proto::backplane::grpc::Ticket* value) {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  if (GetArena() == nullptr) {
-    delete reinterpret_cast<::google::protobuf::MessageLite*>(_impl_.result_id_);
-  }
-  _impl_.result_id_ = reinterpret_cast<::io::deephaven::proto::backplane::grpc::Ticket*>(value);
-  if (value != nullptr) {
-    _impl_._has_bits_[0] |= 0x00000001u;
-  } else {
-    _impl_._has_bits_[0] &= ~0x00000001u;
-  }
-  // @@protoc_insertion_point(field_unsafe_arena_set_allocated:io.deephaven.proto.backplane.grpc.UpdateByRequest.result_id)
-}
-inline ::io::deephaven::proto::backplane::grpc::Ticket* UpdateByRequest::release_result_id() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-
-  _impl_._has_bits_[0] &= ~0x00000001u;
-  ::io::deephaven::proto::backplane::grpc::Ticket* released = _impl_.result_id_;
-  _impl_.result_id_ = nullptr;
-#ifdef PROTOBUF_FORCE_COPY_IN_RELEASE
-  auto* old = reinterpret_cast<::google::protobuf::MessageLite*>(released);
-  released = ::google::protobuf::internal::DuplicateIfNonNull(released);
-  if (GetArena() == nullptr) {
-    delete old;
-  }
-#else   // PROTOBUF_FORCE_COPY_IN_RELEASE
-  if (GetArena() != nullptr) {
-    released = ::google::protobuf::internal::DuplicateIfNonNull(released);
-  }
-#endif  // !PROTOBUF_FORCE_COPY_IN_RELEASE
-  return released;
-}
-inline ::io::deephaven::proto::backplane::grpc::Ticket* UpdateByRequest::unsafe_arena_release_result_id() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  // @@protoc_insertion_point(field_release:io.deephaven.proto.backplane.grpc.UpdateByRequest.result_id)
-
-  _impl_._has_bits_[0] &= ~0x00000001u;
-  ::io::deephaven::proto::backplane::grpc::Ticket* temp = _impl_.result_id_;
-  _impl_.result_id_ = nullptr;
-  return temp;
-}
-inline ::io::deephaven::proto::backplane::grpc::Ticket* UpdateByRequest::_internal_mutable_result_id() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  _impl_._has_bits_[0] |= 0x00000001u;
-  if (_impl_.result_id_ == nullptr) {
-    auto* p = CreateMaybeMessage<::io::deephaven::proto::backplane::grpc::Ticket>(GetArena());
-    _impl_.result_id_ = reinterpret_cast<::io::deephaven::proto::backplane::grpc::Ticket*>(p);
-  }
-  return _impl_.result_id_;
-}
-inline ::io::deephaven::proto::backplane::grpc::Ticket* UpdateByRequest::mutable_result_id() ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  ::io::deephaven::proto::backplane::grpc::Ticket* _msg = _internal_mutable_result_id();
-  // @@protoc_insertion_point(field_mutable:io.deephaven.proto.backplane.grpc.UpdateByRequest.result_id)
-  return _msg;
-}
-inline void UpdateByRequest::set_allocated_result_id(::io::deephaven::proto::backplane::grpc::Ticket* value) {
-  ::google::protobuf::Arena* message_arena = GetArena();
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  if (message_arena == nullptr) {
-    delete reinterpret_cast<::google::protobuf::MessageLite*>(_impl_.result_id_);
-  }
-
-  if (value != nullptr) {
-    ::google::protobuf::Arena* submessage_arena = reinterpret_cast<::google::protobuf::MessageLite*>(value)->GetArena();
-    if (message_arena != submessage_arena) {
-      value = ::google::protobuf::internal::GetOwnedMessage(message_arena, value, submessage_arena);
-    }
-    _impl_._has_bits_[0] |= 0x00000001u;
-  } else {
-    _impl_._has_bits_[0] &= ~0x00000001u;
-  }
-
-  _impl_.result_id_ = reinterpret_cast<::io::deephaven::proto::backplane::grpc::Ticket*>(value);
-  // @@protoc_insertion_point(field_set_allocated:io.deephaven.proto.backplane.grpc.UpdateByRequest.result_id)
-}
-
-// .io.deephaven.proto.backplane.grpc.TableReference source_id = 2;
-inline bool UpdateByRequest::has_source_id() const {
-  bool value = (_impl_._has_bits_[0] & 0x00000002u) != 0;
-  PROTOBUF_ASSUME(!value || _impl_.source_id_ != nullptr);
-  return value;
-}
-inline void UpdateByRequest::clear_source_id() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  if (_impl_.source_id_ != nullptr) _impl_.source_id_->Clear();
-  _impl_._has_bits_[0] &= ~0x00000002u;
-}
-inline const ::io::deephaven::proto::backplane::grpc::TableReference& UpdateByRequest::_internal_source_id() const {
-  PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race);
-  const ::io::deephaven::proto::backplane::grpc::TableReference* p = _impl_.source_id_;
-  return p != nullptr ? *p : reinterpret_cast<const ::io::deephaven::proto::backplane::grpc::TableReference&>(::io::deephaven::proto::backplane::grpc::_TableReference_default_instance_);
-}
-inline const ::io::deephaven::proto::backplane::grpc::TableReference& UpdateByRequest::source_id() const ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  // @@protoc_insertion_point(field_get:io.deephaven.proto.backplane.grpc.UpdateByRequest.source_id)
-  return _internal_source_id();
-}
-inline void UpdateByRequest::unsafe_arena_set_allocated_source_id(::io::deephaven::proto::backplane::grpc::TableReference* value) {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  if (GetArena() == nullptr) {
-    delete reinterpret_cast<::google::protobuf::MessageLite*>(_impl_.source_id_);
-  }
-  _impl_.source_id_ = reinterpret_cast<::io::deephaven::proto::backplane::grpc::TableReference*>(value);
-  if (value != nullptr) {
-    _impl_._has_bits_[0] |= 0x00000002u;
-  } else {
-    _impl_._has_bits_[0] &= ~0x00000002u;
-  }
-  // @@protoc_insertion_point(field_unsafe_arena_set_allocated:io.deephaven.proto.backplane.grpc.UpdateByRequest.source_id)
-}
-inline ::io::deephaven::proto::backplane::grpc::TableReference* UpdateByRequest::release_source_id() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-
-  _impl_._has_bits_[0] &= ~0x00000002u;
-  ::io::deephaven::proto::backplane::grpc::TableReference* released = _impl_.source_id_;
-  _impl_.source_id_ = nullptr;
-#ifdef PROTOBUF_FORCE_COPY_IN_RELEASE
-  auto* old = reinterpret_cast<::google::protobuf::MessageLite*>(released);
-  released = ::google::protobuf::internal::DuplicateIfNonNull(released);
-  if (GetArena() == nullptr) {
-    delete old;
-  }
-#else   // PROTOBUF_FORCE_COPY_IN_RELEASE
-  if (GetArena() != nullptr) {
-    released = ::google::protobuf::internal::DuplicateIfNonNull(released);
-  }
-#endif  // !PROTOBUF_FORCE_COPY_IN_RELEASE
-  return released;
-}
-inline ::io::deephaven::proto::backplane::grpc::TableReference* UpdateByRequest::unsafe_arena_release_source_id() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  // @@protoc_insertion_point(field_release:io.deephaven.proto.backplane.grpc.UpdateByRequest.source_id)
-
-  _impl_._has_bits_[0] &= ~0x00000002u;
-  ::io::deephaven::proto::backplane::grpc::TableReference* temp = _impl_.source_id_;
-  _impl_.source_id_ = nullptr;
-  return temp;
-}
-inline ::io::deephaven::proto::backplane::grpc::TableReference* UpdateByRequest::_internal_mutable_source_id() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  _impl_._has_bits_[0] |= 0x00000002u;
-  if (_impl_.source_id_ == nullptr) {
-    auto* p = CreateMaybeMessage<::io::deephaven::proto::backplane::grpc::TableReference>(GetArena());
-    _impl_.source_id_ = reinterpret_cast<::io::deephaven::proto::backplane::grpc::TableReference*>(p);
-  }
-  return _impl_.source_id_;
-}
-inline ::io::deephaven::proto::backplane::grpc::TableReference* UpdateByRequest::mutable_source_id() ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  ::io::deephaven::proto::backplane::grpc::TableReference* _msg = _internal_mutable_source_id();
-  // @@protoc_insertion_point(field_mutable:io.deephaven.proto.backplane.grpc.UpdateByRequest.source_id)
-  return _msg;
-}
-inline void UpdateByRequest::set_allocated_source_id(::io::deephaven::proto::backplane::grpc::TableReference* value) {
-  ::google::protobuf::Arena* message_arena = GetArena();
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  if (message_arena == nullptr) {
-    delete reinterpret_cast<::io::deephaven::proto::backplane::grpc::TableReference*>(_impl_.source_id_);
-  }
-
-  if (value != nullptr) {
-    ::google::protobuf::Arena* submessage_arena = reinterpret_cast<::io::deephaven::proto::backplane::grpc::TableReference*>(value)->GetArena();
-    if (message_arena != submessage_arena) {
-      value = ::google::protobuf::internal::GetOwnedMessage(message_arena, value, submessage_arena);
-    }
-    _impl_._has_bits_[0] |= 0x00000002u;
-  } else {
-    _impl_._has_bits_[0] &= ~0x00000002u;
-  }
-
-  _impl_.source_id_ = reinterpret_cast<::io::deephaven::proto::backplane::grpc::TableReference*>(value);
-  // @@protoc_insertion_point(field_set_allocated:io.deephaven.proto.backplane.grpc.UpdateByRequest.source_id)
-}
-
-// .io.deephaven.proto.backplane.grpc.UpdateByRequest.UpdateByOptions options = 3;
-inline bool UpdateByRequest::has_options() const {
-  bool value = (_impl_._has_bits_[0] & 0x00000004u) != 0;
-  PROTOBUF_ASSUME(!value || _impl_.options_ != nullptr);
-  return value;
-}
-inline void UpdateByRequest::clear_options() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  if (_impl_.options_ != nullptr) _impl_.options_->Clear();
-  _impl_._has_bits_[0] &= ~0x00000004u;
-}
-inline const ::io::deephaven::proto::backplane::grpc::UpdateByRequest_UpdateByOptions& UpdateByRequest::_internal_options() const {
-  PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race);
-  const ::io::deephaven::proto::backplane::grpc::UpdateByRequest_UpdateByOptions* p = _impl_.options_;
-  return p != nullptr ? *p : reinterpret_cast<const ::io::deephaven::proto::backplane::grpc::UpdateByRequest_UpdateByOptions&>(::io::deephaven::proto::backplane::grpc::_UpdateByRequest_UpdateByOptions_default_instance_);
-}
-inline const ::io::deephaven::proto::backplane::grpc::UpdateByRequest_UpdateByOptions& UpdateByRequest::options() const ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  // @@protoc_insertion_point(field_get:io.deephaven.proto.backplane.grpc.UpdateByRequest.options)
-  return _internal_options();
-}
-inline void UpdateByRequest::unsafe_arena_set_allocated_options(::io::deephaven::proto::backplane::grpc::UpdateByRequest_UpdateByOptions* value) {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  if (GetArena() == nullptr) {
-    delete reinterpret_cast<::google::protobuf::MessageLite*>(_impl_.options_);
-  }
-  _impl_.options_ = reinterpret_cast<::io::deephaven::proto::backplane::grpc::UpdateByRequest_UpdateByOptions*>(value);
-  if (value != nullptr) {
-    _impl_._has_bits_[0] |= 0x00000004u;
-  } else {
-    _impl_._has_bits_[0] &= ~0x00000004u;
-  }
-  // @@protoc_insertion_point(field_unsafe_arena_set_allocated:io.deephaven.proto.backplane.grpc.UpdateByRequest.options)
-}
-inline ::io::deephaven::proto::backplane::grpc::UpdateByRequest_UpdateByOptions* UpdateByRequest::release_options() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-
-  _impl_._has_bits_[0] &= ~0x00000004u;
-  ::io::deephaven::proto::backplane::grpc::UpdateByRequest_UpdateByOptions* released = _impl_.options_;
-  _impl_.options_ = nullptr;
-#ifdef PROTOBUF_FORCE_COPY_IN_RELEASE
-  auto* old = reinterpret_cast<::google::protobuf::MessageLite*>(released);
-  released = ::google::protobuf::internal::DuplicateIfNonNull(released);
-  if (GetArena() == nullptr) {
-    delete old;
-  }
-#else   // PROTOBUF_FORCE_COPY_IN_RELEASE
-  if (GetArena() != nullptr) {
-    released = ::google::protobuf::internal::DuplicateIfNonNull(released);
-  }
-#endif  // !PROTOBUF_FORCE_COPY_IN_RELEASE
-  return released;
-}
-inline ::io::deephaven::proto::backplane::grpc::UpdateByRequest_UpdateByOptions* UpdateByRequest::unsafe_arena_release_options() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  // @@protoc_insertion_point(field_release:io.deephaven.proto.backplane.grpc.UpdateByRequest.options)
-
-  _impl_._has_bits_[0] &= ~0x00000004u;
-  ::io::deephaven::proto::backplane::grpc::UpdateByRequest_UpdateByOptions* temp = _impl_.options_;
-  _impl_.options_ = nullptr;
-  return temp;
-}
-inline ::io::deephaven::proto::backplane::grpc::UpdateByRequest_UpdateByOptions* UpdateByRequest::_internal_mutable_options() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  _impl_._has_bits_[0] |= 0x00000004u;
-  if (_impl_.options_ == nullptr) {
-    auto* p = CreateMaybeMessage<::io::deephaven::proto::backplane::grpc::UpdateByRequest_UpdateByOptions>(GetArena());
-    _impl_.options_ = reinterpret_cast<::io::deephaven::proto::backplane::grpc::UpdateByRequest_UpdateByOptions*>(p);
-  }
-  return _impl_.options_;
-}
-inline ::io::deephaven::proto::backplane::grpc::UpdateByRequest_UpdateByOptions* UpdateByRequest::mutable_options() ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  ::io::deephaven::proto::backplane::grpc::UpdateByRequest_UpdateByOptions* _msg = _internal_mutable_options();
-  // @@protoc_insertion_point(field_mutable:io.deephaven.proto.backplane.grpc.UpdateByRequest.options)
-  return _msg;
-}
-inline void UpdateByRequest::set_allocated_options(::io::deephaven::proto::backplane::grpc::UpdateByRequest_UpdateByOptions* value) {
-  ::google::protobuf::Arena* message_arena = GetArena();
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  if (message_arena == nullptr) {
-    delete reinterpret_cast<::io::deephaven::proto::backplane::grpc::UpdateByRequest_UpdateByOptions*>(_impl_.options_);
-  }
-
-  if (value != nullptr) {
-    ::google::protobuf::Arena* submessage_arena = reinterpret_cast<::io::deephaven::proto::backplane::grpc::UpdateByRequest_UpdateByOptions*>(value)->GetArena();
-    if (message_arena != submessage_arena) {
-      value = ::google::protobuf::internal::GetOwnedMessage(message_arena, value, submessage_arena);
-    }
-    _impl_._has_bits_[0] |= 0x00000004u;
-  } else {
-    _impl_._has_bits_[0] &= ~0x00000004u;
-  }
-
-  _impl_.options_ = reinterpret_cast<::io::deephaven::proto::backplane::grpc::UpdateByRequest_UpdateByOptions*>(value);
-  // @@protoc_insertion_point(field_set_allocated:io.deephaven.proto.backplane.grpc.UpdateByRequest.options)
-}
-
-// repeated .io.deephaven.proto.backplane.grpc.UpdateByRequest.UpdateByOperation operations = 4;
-inline int UpdateByRequest::_internal_operations_size() const {
-  return _internal_operations().size();
-}
-inline int UpdateByRequest::operations_size() const {
-  return _internal_operations_size();
-}
-inline void UpdateByRequest::clear_operations() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  _impl_.operations_.Clear();
-}
-inline ::io::deephaven::proto::backplane::grpc::UpdateByRequest_UpdateByOperation* UpdateByRequest::mutable_operations(int index)
-    ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  // @@protoc_insertion_point(field_mutable:io.deephaven.proto.backplane.grpc.UpdateByRequest.operations)
-  return _internal_mutable_operations()->Mutable(index);
-}
-inline ::google::protobuf::RepeatedPtrField<::io::deephaven::proto::backplane::grpc::UpdateByRequest_UpdateByOperation>* UpdateByRequest::mutable_operations()
-    ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  // @@protoc_insertion_point(field_mutable_list:io.deephaven.proto.backplane.grpc.UpdateByRequest.operations)
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  return _internal_mutable_operations();
-}
-inline const ::io::deephaven::proto::backplane::grpc::UpdateByRequest_UpdateByOperation& UpdateByRequest::operations(int index) const
-    ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  // @@protoc_insertion_point(field_get:io.deephaven.proto.backplane.grpc.UpdateByRequest.operations)
-  return _internal_operations().Get(index);
-}
-inline ::io::deephaven::proto::backplane::grpc::UpdateByRequest_UpdateByOperation* UpdateByRequest::add_operations() ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  ::io::deephaven::proto::backplane::grpc::UpdateByRequest_UpdateByOperation* _add = _internal_mutable_operations()->Add();
-  // @@protoc_insertion_point(field_add:io.deephaven.proto.backplane.grpc.UpdateByRequest.operations)
-  return _add;
-}
-inline const ::google::protobuf::RepeatedPtrField<::io::deephaven::proto::backplane::grpc::UpdateByRequest_UpdateByOperation>& UpdateByRequest::operations() const
-    ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  // @@protoc_insertion_point(field_list:io.deephaven.proto.backplane.grpc.UpdateByRequest.operations)
-  return _internal_operations();
-}
-inline const ::google::protobuf::RepeatedPtrField<::io::deephaven::proto::backplane::grpc::UpdateByRequest_UpdateByOperation>&
-UpdateByRequest::_internal_operations() const {
-  PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race);
-  return _impl_.operations_;
-}
-inline ::google::protobuf::RepeatedPtrField<::io::deephaven::proto::backplane::grpc::UpdateByRequest_UpdateByOperation>*
-UpdateByRequest::_internal_mutable_operations() {
-  PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race);
-  return &_impl_.operations_;
-}
-
-// repeated string group_by_columns = 5;
-inline int UpdateByRequest::_internal_group_by_columns_size() const {
-  return _internal_group_by_columns().size();
-}
-inline int UpdateByRequest::group_by_columns_size() const {
-  return _internal_group_by_columns_size();
-}
-inline void UpdateByRequest::clear_group_by_columns() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  _impl_.group_by_columns_.Clear();
-}
-inline std::string* UpdateByRequest::add_group_by_columns()
-    ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  std::string* _s = _internal_mutable_group_by_columns()->Add();
-  // @@protoc_insertion_point(field_add_mutable:io.deephaven.proto.backplane.grpc.UpdateByRequest.group_by_columns)
-  return _s;
-}
-inline const std::string& UpdateByRequest::group_by_columns(int index) const
-    ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  // @@protoc_insertion_point(field_get:io.deephaven.proto.backplane.grpc.UpdateByRequest.group_by_columns)
-  return _internal_group_by_columns().Get(index);
-}
-inline std::string* UpdateByRequest::mutable_group_by_columns(int index)
-    ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  // @@protoc_insertion_point(field_mutable:io.deephaven.proto.backplane.grpc.UpdateByRequest.group_by_columns)
-  return _internal_mutable_group_by_columns()->Mutable(index);
-}
-inline void UpdateByRequest::set_group_by_columns(int index, const std::string& value) {
-  _internal_mutable_group_by_columns()->Mutable(index)->assign(value);
-  // @@protoc_insertion_point(field_set:io.deephaven.proto.backplane.grpc.UpdateByRequest.group_by_columns)
-}
-inline void UpdateByRequest::set_group_by_columns(int index, std::string&& value) {
-  _internal_mutable_group_by_columns()->Mutable(index)->assign(std::move(value));
-  // @@protoc_insertion_point(field_set:io.deephaven.proto.backplane.grpc.UpdateByRequest.group_by_columns)
-}
-inline void UpdateByRequest::set_group_by_columns(int index, const char* value) {
-  ABSL_DCHECK(value != nullptr);
-  _internal_mutable_group_by_columns()->Mutable(index)->assign(value);
-  // @@protoc_insertion_point(field_set_char:io.deephaven.proto.backplane.grpc.UpdateByRequest.group_by_columns)
-}
-inline void UpdateByRequest::set_group_by_columns(int index, const char* value,
-                              std::size_t size) {
-  _internal_mutable_group_by_columns()->Mutable(index)->assign(
-      reinterpret_cast<const char*>(value), size);
-  // @@protoc_insertion_point(field_set_pointer:io.deephaven.proto.backplane.grpc.UpdateByRequest.group_by_columns)
-}
-inline void UpdateByRequest::set_group_by_columns(int index, absl::string_view value) {
-  _internal_mutable_group_by_columns()->Mutable(index)->assign(value.data(),
-                                                     value.size());
-  // @@protoc_insertion_point(field_set_string_piece:io.deephaven.proto.backplane.grpc.UpdateByRequest.group_by_columns)
-}
-inline void UpdateByRequest::add_group_by_columns(const std::string& value) {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  _internal_mutable_group_by_columns()->Add()->assign(value);
-  // @@protoc_insertion_point(field_add:io.deephaven.proto.backplane.grpc.UpdateByRequest.group_by_columns)
-}
-inline void UpdateByRequest::add_group_by_columns(std::string&& value) {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  _internal_mutable_group_by_columns()->Add(std::move(value));
-  // @@protoc_insertion_point(field_add:io.deephaven.proto.backplane.grpc.UpdateByRequest.group_by_columns)
-}
-inline void UpdateByRequest::add_group_by_columns(const char* value) {
-  ABSL_DCHECK(value != nullptr);
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  _internal_mutable_group_by_columns()->Add()->assign(value);
-  // @@protoc_insertion_point(field_add_char:io.deephaven.proto.backplane.grpc.UpdateByRequest.group_by_columns)
-}
-inline void UpdateByRequest::add_group_by_columns(const char* value, std::size_t size) {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  _internal_mutable_group_by_columns()->Add()->assign(
-      reinterpret_cast<const char*>(value), size);
-  // @@protoc_insertion_point(field_add_pointer:io.deephaven.proto.backplane.grpc.UpdateByRequest.group_by_columns)
-}
-inline void UpdateByRequest::add_group_by_columns(absl::string_view value) {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  _internal_mutable_group_by_columns()->Add()->assign(value.data(), value.size());
-  // @@protoc_insertion_point(field_add_string_piece:io.deephaven.proto.backplane.grpc.UpdateByRequest.group_by_columns)
-}
-inline const ::google::protobuf::RepeatedPtrField<std::string>&
-UpdateByRequest::group_by_columns() const ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  // @@protoc_insertion_point(field_list:io.deephaven.proto.backplane.grpc.UpdateByRequest.group_by_columns)
-  return _internal_group_by_columns();
-}
-inline ::google::protobuf::RepeatedPtrField<std::string>*
-UpdateByRequest::mutable_group_by_columns() ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  // @@protoc_insertion_point(field_mutable_list:io.deephaven.proto.backplane.grpc.UpdateByRequest.group_by_columns)
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  return _internal_mutable_group_by_columns();
-}
-inline const ::google::protobuf::RepeatedPtrField<std::string>&
-UpdateByRequest::_internal_group_by_columns() const {
-  PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race);
-  return _impl_.group_by_columns_;
-}
-inline ::google::protobuf::RepeatedPtrField<std::string>*
-UpdateByRequest::_internal_mutable_group_by_columns() {
-  PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race);
-  return &_impl_.group_by_columns_;
-}
-
-// -------------------------------------------------------------------
-
-// SelectDistinctRequest
-
-// .io.deephaven.proto.backplane.grpc.Ticket result_id = 1;
-inline bool SelectDistinctRequest::has_result_id() const {
-  bool value = (_impl_._has_bits_[0] & 0x00000001u) != 0;
-  PROTOBUF_ASSUME(!value || _impl_.result_id_ != nullptr);
-  return value;
-}
-inline const ::io::deephaven::proto::backplane::grpc::Ticket& SelectDistinctRequest::_internal_result_id() const {
-  PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race);
-  const ::io::deephaven::proto::backplane::grpc::Ticket* p = _impl_.result_id_;
-  return p != nullptr ? *p : reinterpret_cast<const ::io::deephaven::proto::backplane::grpc::Ticket&>(::io::deephaven::proto::backplane::grpc::_Ticket_default_instance_);
-}
-inline const ::io::deephaven::proto::backplane::grpc::Ticket& SelectDistinctRequest::result_id() const ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  // @@protoc_insertion_point(field_get:io.deephaven.proto.backplane.grpc.SelectDistinctRequest.result_id)
-  return _internal_result_id();
-}
-inline void SelectDistinctRequest::unsafe_arena_set_allocated_result_id(::io::deephaven::proto::backplane::grpc::Ticket* value) {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  if (GetArena() == nullptr) {
-    delete reinterpret_cast<::google::protobuf::MessageLite*>(_impl_.result_id_);
-  }
-  _impl_.result_id_ = reinterpret_cast<::io::deephaven::proto::backplane::grpc::Ticket*>(value);
-  if (value != nullptr) {
-    _impl_._has_bits_[0] |= 0x00000001u;
-  } else {
-    _impl_._has_bits_[0] &= ~0x00000001u;
-  }
-  // @@protoc_insertion_point(field_unsafe_arena_set_allocated:io.deephaven.proto.backplane.grpc.SelectDistinctRequest.result_id)
-}
-inline ::io::deephaven::proto::backplane::grpc::Ticket* SelectDistinctRequest::release_result_id() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-
-  _impl_._has_bits_[0] &= ~0x00000001u;
-  ::io::deephaven::proto::backplane::grpc::Ticket* released = _impl_.result_id_;
-  _impl_.result_id_ = nullptr;
-#ifdef PROTOBUF_FORCE_COPY_IN_RELEASE
-  auto* old = reinterpret_cast<::google::protobuf::MessageLite*>(released);
-  released = ::google::protobuf::internal::DuplicateIfNonNull(released);
-  if (GetArena() == nullptr) {
-    delete old;
-  }
-#else   // PROTOBUF_FORCE_COPY_IN_RELEASE
-  if (GetArena() != nullptr) {
-    released = ::google::protobuf::internal::DuplicateIfNonNull(released);
-  }
-#endif  // !PROTOBUF_FORCE_COPY_IN_RELEASE
-  return released;
-}
-inline ::io::deephaven::proto::backplane::grpc::Ticket* SelectDistinctRequest::unsafe_arena_release_result_id() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  // @@protoc_insertion_point(field_release:io.deephaven.proto.backplane.grpc.SelectDistinctRequest.result_id)
-
-  _impl_._has_bits_[0] &= ~0x00000001u;
-  ::io::deephaven::proto::backplane::grpc::Ticket* temp = _impl_.result_id_;
-  _impl_.result_id_ = nullptr;
-  return temp;
-}
-inline ::io::deephaven::proto::backplane::grpc::Ticket* SelectDistinctRequest::_internal_mutable_result_id() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  _impl_._has_bits_[0] |= 0x00000001u;
-  if (_impl_.result_id_ == nullptr) {
-    auto* p = CreateMaybeMessage<::io::deephaven::proto::backplane::grpc::Ticket>(GetArena());
-    _impl_.result_id_ = reinterpret_cast<::io::deephaven::proto::backplane::grpc::Ticket*>(p);
-  }
-  return _impl_.result_id_;
-}
-inline ::io::deephaven::proto::backplane::grpc::Ticket* SelectDistinctRequest::mutable_result_id() ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  ::io::deephaven::proto::backplane::grpc::Ticket* _msg = _internal_mutable_result_id();
-  // @@protoc_insertion_point(field_mutable:io.deephaven.proto.backplane.grpc.SelectDistinctRequest.result_id)
-  return _msg;
-}
-inline void SelectDistinctRequest::set_allocated_result_id(::io::deephaven::proto::backplane::grpc::Ticket* value) {
-  ::google::protobuf::Arena* message_arena = GetArena();
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  if (message_arena == nullptr) {
-    delete reinterpret_cast<::google::protobuf::MessageLite*>(_impl_.result_id_);
-  }
-
-  if (value != nullptr) {
-    ::google::protobuf::Arena* submessage_arena = reinterpret_cast<::google::protobuf::MessageLite*>(value)->GetArena();
-    if (message_arena != submessage_arena) {
-      value = ::google::protobuf::internal::GetOwnedMessage(message_arena, value, submessage_arena);
-    }
-    _impl_._has_bits_[0] |= 0x00000001u;
-  } else {
-    _impl_._has_bits_[0] &= ~0x00000001u;
-  }
-
-  _impl_.result_id_ = reinterpret_cast<::io::deephaven::proto::backplane::grpc::Ticket*>(value);
-  // @@protoc_insertion_point(field_set_allocated:io.deephaven.proto.backplane.grpc.SelectDistinctRequest.result_id)
-}
-
-// .io.deephaven.proto.backplane.grpc.TableReference source_id = 2;
-inline bool SelectDistinctRequest::has_source_id() const {
-  bool value = (_impl_._has_bits_[0] & 0x00000002u) != 0;
-  PROTOBUF_ASSUME(!value || _impl_.source_id_ != nullptr);
-  return value;
-}
-inline void SelectDistinctRequest::clear_source_id() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  if (_impl_.source_id_ != nullptr) _impl_.source_id_->Clear();
-  _impl_._has_bits_[0] &= ~0x00000002u;
-}
-inline const ::io::deephaven::proto::backplane::grpc::TableReference& SelectDistinctRequest::_internal_source_id() const {
-  PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race);
-  const ::io::deephaven::proto::backplane::grpc::TableReference* p = _impl_.source_id_;
-  return p != nullptr ? *p : reinterpret_cast<const ::io::deephaven::proto::backplane::grpc::TableReference&>(::io::deephaven::proto::backplane::grpc::_TableReference_default_instance_);
-}
-inline const ::io::deephaven::proto::backplane::grpc::TableReference& SelectDistinctRequest::source_id() const ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  // @@protoc_insertion_point(field_get:io.deephaven.proto.backplane.grpc.SelectDistinctRequest.source_id)
-  return _internal_source_id();
-}
-inline void SelectDistinctRequest::unsafe_arena_set_allocated_source_id(::io::deephaven::proto::backplane::grpc::TableReference* value) {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  if (GetArena() == nullptr) {
-    delete reinterpret_cast<::google::protobuf::MessageLite*>(_impl_.source_id_);
-  }
-  _impl_.source_id_ = reinterpret_cast<::io::deephaven::proto::backplane::grpc::TableReference*>(value);
-  if (value != nullptr) {
-    _impl_._has_bits_[0] |= 0x00000002u;
-  } else {
-    _impl_._has_bits_[0] &= ~0x00000002u;
-  }
-  // @@protoc_insertion_point(field_unsafe_arena_set_allocated:io.deephaven.proto.backplane.grpc.SelectDistinctRequest.source_id)
-}
-inline ::io::deephaven::proto::backplane::grpc::TableReference* SelectDistinctRequest::release_source_id() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-
-  _impl_._has_bits_[0] &= ~0x00000002u;
-  ::io::deephaven::proto::backplane::grpc::TableReference* released = _impl_.source_id_;
-  _impl_.source_id_ = nullptr;
-#ifdef PROTOBUF_FORCE_COPY_IN_RELEASE
-  auto* old = reinterpret_cast<::google::protobuf::MessageLite*>(released);
-  released = ::google::protobuf::internal::DuplicateIfNonNull(released);
-  if (GetArena() == nullptr) {
-    delete old;
-  }
-#else   // PROTOBUF_FORCE_COPY_IN_RELEASE
-  if (GetArena() != nullptr) {
-    released = ::google::protobuf::internal::DuplicateIfNonNull(released);
-  }
-#endif  // !PROTOBUF_FORCE_COPY_IN_RELEASE
-  return released;
-}
-inline ::io::deephaven::proto::backplane::grpc::TableReference* SelectDistinctRequest::unsafe_arena_release_source_id() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  // @@protoc_insertion_point(field_release:io.deephaven.proto.backplane.grpc.SelectDistinctRequest.source_id)
-
-  _impl_._has_bits_[0] &= ~0x00000002u;
-  ::io::deephaven::proto::backplane::grpc::TableReference* temp = _impl_.source_id_;
-  _impl_.source_id_ = nullptr;
-  return temp;
-}
-inline ::io::deephaven::proto::backplane::grpc::TableReference* SelectDistinctRequest::_internal_mutable_source_id() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  _impl_._has_bits_[0] |= 0x00000002u;
-  if (_impl_.source_id_ == nullptr) {
-    auto* p = CreateMaybeMessage<::io::deephaven::proto::backplane::grpc::TableReference>(GetArena());
-    _impl_.source_id_ = reinterpret_cast<::io::deephaven::proto::backplane::grpc::TableReference*>(p);
-  }
-  return _impl_.source_id_;
-}
-inline ::io::deephaven::proto::backplane::grpc::TableReference* SelectDistinctRequest::mutable_source_id() ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  ::io::deephaven::proto::backplane::grpc::TableReference* _msg = _internal_mutable_source_id();
-  // @@protoc_insertion_point(field_mutable:io.deephaven.proto.backplane.grpc.SelectDistinctRequest.source_id)
-  return _msg;
-}
-inline void SelectDistinctRequest::set_allocated_source_id(::io::deephaven::proto::backplane::grpc::TableReference* value) {
-  ::google::protobuf::Arena* message_arena = GetArena();
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  if (message_arena == nullptr) {
-    delete reinterpret_cast<::io::deephaven::proto::backplane::grpc::TableReference*>(_impl_.source_id_);
-  }
-
-  if (value != nullptr) {
-    ::google::protobuf::Arena* submessage_arena = reinterpret_cast<::io::deephaven::proto::backplane::grpc::TableReference*>(value)->GetArena();
-    if (message_arena != submessage_arena) {
-      value = ::google::protobuf::internal::GetOwnedMessage(message_arena, value, submessage_arena);
-    }
-    _impl_._has_bits_[0] |= 0x00000002u;
-  } else {
-    _impl_._has_bits_[0] &= ~0x00000002u;
-  }
-
-  _impl_.source_id_ = reinterpret_cast<::io::deephaven::proto::backplane::grpc::TableReference*>(value);
-  // @@protoc_insertion_point(field_set_allocated:io.deephaven.proto.backplane.grpc.SelectDistinctRequest.source_id)
-}
-
-// repeated string column_names = 3;
-inline int SelectDistinctRequest::_internal_column_names_size() const {
-  return _internal_column_names().size();
-}
-inline int SelectDistinctRequest::column_names_size() const {
-  return _internal_column_names_size();
-}
-inline void SelectDistinctRequest::clear_column_names() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  _impl_.column_names_.Clear();
-}
-inline std::string* SelectDistinctRequest::add_column_names()
-    ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  std::string* _s = _internal_mutable_column_names()->Add();
-  // @@protoc_insertion_point(field_add_mutable:io.deephaven.proto.backplane.grpc.SelectDistinctRequest.column_names)
-  return _s;
-}
-inline const std::string& SelectDistinctRequest::column_names(int index) const
-    ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  // @@protoc_insertion_point(field_get:io.deephaven.proto.backplane.grpc.SelectDistinctRequest.column_names)
-  return _internal_column_names().Get(index);
-}
-inline std::string* SelectDistinctRequest::mutable_column_names(int index)
-    ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  // @@protoc_insertion_point(field_mutable:io.deephaven.proto.backplane.grpc.SelectDistinctRequest.column_names)
-  return _internal_mutable_column_names()->Mutable(index);
-}
-inline void SelectDistinctRequest::set_column_names(int index, const std::string& value) {
-  _internal_mutable_column_names()->Mutable(index)->assign(value);
-  // @@protoc_insertion_point(field_set:io.deephaven.proto.backplane.grpc.SelectDistinctRequest.column_names)
-}
-inline void SelectDistinctRequest::set_column_names(int index, std::string&& value) {
-  _internal_mutable_column_names()->Mutable(index)->assign(std::move(value));
-  // @@protoc_insertion_point(field_set:io.deephaven.proto.backplane.grpc.SelectDistinctRequest.column_names)
-}
-inline void SelectDistinctRequest::set_column_names(int index, const char* value) {
-  ABSL_DCHECK(value != nullptr);
-  _internal_mutable_column_names()->Mutable(index)->assign(value);
-  // @@protoc_insertion_point(field_set_char:io.deephaven.proto.backplane.grpc.SelectDistinctRequest.column_names)
-}
-inline void SelectDistinctRequest::set_column_names(int index, const char* value,
-                              std::size_t size) {
-  _internal_mutable_column_names()->Mutable(index)->assign(
-      reinterpret_cast<const char*>(value), size);
-  // @@protoc_insertion_point(field_set_pointer:io.deephaven.proto.backplane.grpc.SelectDistinctRequest.column_names)
-}
-inline void SelectDistinctRequest::set_column_names(int index, absl::string_view value) {
-  _internal_mutable_column_names()->Mutable(index)->assign(value.data(),
-                                                     value.size());
-  // @@protoc_insertion_point(field_set_string_piece:io.deephaven.proto.backplane.grpc.SelectDistinctRequest.column_names)
-}
-inline void SelectDistinctRequest::add_column_names(const std::string& value) {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  _internal_mutable_column_names()->Add()->assign(value);
-  // @@protoc_insertion_point(field_add:io.deephaven.proto.backplane.grpc.SelectDistinctRequest.column_names)
-}
-inline void SelectDistinctRequest::add_column_names(std::string&& value) {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  _internal_mutable_column_names()->Add(std::move(value));
-  // @@protoc_insertion_point(field_add:io.deephaven.proto.backplane.grpc.SelectDistinctRequest.column_names)
-}
-inline void SelectDistinctRequest::add_column_names(const char* value) {
-  ABSL_DCHECK(value != nullptr);
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  _internal_mutable_column_names()->Add()->assign(value);
-  // @@protoc_insertion_point(field_add_char:io.deephaven.proto.backplane.grpc.SelectDistinctRequest.column_names)
-}
-inline void SelectDistinctRequest::add_column_names(const char* value, std::size_t size) {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  _internal_mutable_column_names()->Add()->assign(
-      reinterpret_cast<const char*>(value), size);
-  // @@protoc_insertion_point(field_add_pointer:io.deephaven.proto.backplane.grpc.SelectDistinctRequest.column_names)
-}
-inline void SelectDistinctRequest::add_column_names(absl::string_view value) {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  _internal_mutable_column_names()->Add()->assign(value.data(), value.size());
-  // @@protoc_insertion_point(field_add_string_piece:io.deephaven.proto.backplane.grpc.SelectDistinctRequest.column_names)
-}
-inline const ::google::protobuf::RepeatedPtrField<std::string>&
-SelectDistinctRequest::column_names() const ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  // @@protoc_insertion_point(field_list:io.deephaven.proto.backplane.grpc.SelectDistinctRequest.column_names)
-  return _internal_column_names();
-}
-inline ::google::protobuf::RepeatedPtrField<std::string>*
-SelectDistinctRequest::mutable_column_names() ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  // @@protoc_insertion_point(field_mutable_list:io.deephaven.proto.backplane.grpc.SelectDistinctRequest.column_names)
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  return _internal_mutable_column_names();
-}
-inline const ::google::protobuf::RepeatedPtrField<std::string>&
-SelectDistinctRequest::_internal_column_names() const {
-  PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race);
-  return _impl_.column_names_;
-}
-inline ::google::protobuf::RepeatedPtrField<std::string>*
-SelectDistinctRequest::_internal_mutable_column_names() {
-  PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race);
-  return &_impl_.column_names_;
-}
-
-// -------------------------------------------------------------------
-
-// DropColumnsRequest
-
-// .io.deephaven.proto.backplane.grpc.Ticket result_id = 1;
-inline bool DropColumnsRequest::has_result_id() const {
-  bool value = (_impl_._has_bits_[0] & 0x00000001u) != 0;
-  PROTOBUF_ASSUME(!value || _impl_.result_id_ != nullptr);
-  return value;
-}
-inline const ::io::deephaven::proto::backplane::grpc::Ticket& DropColumnsRequest::_internal_result_id() const {
-  PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race);
-  const ::io::deephaven::proto::backplane::grpc::Ticket* p = _impl_.result_id_;
-  return p != nullptr ? *p : reinterpret_cast<const ::io::deephaven::proto::backplane::grpc::Ticket&>(::io::deephaven::proto::backplane::grpc::_Ticket_default_instance_);
-}
-inline const ::io::deephaven::proto::backplane::grpc::Ticket& DropColumnsRequest::result_id() const ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  // @@protoc_insertion_point(field_get:io.deephaven.proto.backplane.grpc.DropColumnsRequest.result_id)
-  return _internal_result_id();
-}
-inline void DropColumnsRequest::unsafe_arena_set_allocated_result_id(::io::deephaven::proto::backplane::grpc::Ticket* value) {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  if (GetArena() == nullptr) {
-    delete reinterpret_cast<::google::protobuf::MessageLite*>(_impl_.result_id_);
-  }
-  _impl_.result_id_ = reinterpret_cast<::io::deephaven::proto::backplane::grpc::Ticket*>(value);
-  if (value != nullptr) {
-    _impl_._has_bits_[0] |= 0x00000001u;
-  } else {
-    _impl_._has_bits_[0] &= ~0x00000001u;
-  }
-  // @@protoc_insertion_point(field_unsafe_arena_set_allocated:io.deephaven.proto.backplane.grpc.DropColumnsRequest.result_id)
-}
-inline ::io::deephaven::proto::backplane::grpc::Ticket* DropColumnsRequest::release_result_id() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-
-  _impl_._has_bits_[0] &= ~0x00000001u;
-  ::io::deephaven::proto::backplane::grpc::Ticket* released = _impl_.result_id_;
-  _impl_.result_id_ = nullptr;
-#ifdef PROTOBUF_FORCE_COPY_IN_RELEASE
-  auto* old = reinterpret_cast<::google::protobuf::MessageLite*>(released);
-  released = ::google::protobuf::internal::DuplicateIfNonNull(released);
-  if (GetArena() == nullptr) {
-    delete old;
-  }
-#else   // PROTOBUF_FORCE_COPY_IN_RELEASE
-  if (GetArena() != nullptr) {
-    released = ::google::protobuf::internal::DuplicateIfNonNull(released);
-  }
-#endif  // !PROTOBUF_FORCE_COPY_IN_RELEASE
-  return released;
-}
-inline ::io::deephaven::proto::backplane::grpc::Ticket* DropColumnsRequest::unsafe_arena_release_result_id() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  // @@protoc_insertion_point(field_release:io.deephaven.proto.backplane.grpc.DropColumnsRequest.result_id)
-
-  _impl_._has_bits_[0] &= ~0x00000001u;
-  ::io::deephaven::proto::backplane::grpc::Ticket* temp = _impl_.result_id_;
-  _impl_.result_id_ = nullptr;
-  return temp;
-}
-inline ::io::deephaven::proto::backplane::grpc::Ticket* DropColumnsRequest::_internal_mutable_result_id() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  _impl_._has_bits_[0] |= 0x00000001u;
-  if (_impl_.result_id_ == nullptr) {
-    auto* p = CreateMaybeMessage<::io::deephaven::proto::backplane::grpc::Ticket>(GetArena());
-    _impl_.result_id_ = reinterpret_cast<::io::deephaven::proto::backplane::grpc::Ticket*>(p);
-  }
-  return _impl_.result_id_;
-}
-inline ::io::deephaven::proto::backplane::grpc::Ticket* DropColumnsRequest::mutable_result_id() ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  ::io::deephaven::proto::backplane::grpc::Ticket* _msg = _internal_mutable_result_id();
-  // @@protoc_insertion_point(field_mutable:io.deephaven.proto.backplane.grpc.DropColumnsRequest.result_id)
-  return _msg;
-}
-inline void DropColumnsRequest::set_allocated_result_id(::io::deephaven::proto::backplane::grpc::Ticket* value) {
-  ::google::protobuf::Arena* message_arena = GetArena();
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  if (message_arena == nullptr) {
-    delete reinterpret_cast<::google::protobuf::MessageLite*>(_impl_.result_id_);
-  }
-
-  if (value != nullptr) {
-    ::google::protobuf::Arena* submessage_arena = reinterpret_cast<::google::protobuf::MessageLite*>(value)->GetArena();
-    if (message_arena != submessage_arena) {
-      value = ::google::protobuf::internal::GetOwnedMessage(message_arena, value, submessage_arena);
-    }
-    _impl_._has_bits_[0] |= 0x00000001u;
-  } else {
-    _impl_._has_bits_[0] &= ~0x00000001u;
-  }
-
-  _impl_.result_id_ = reinterpret_cast<::io::deephaven::proto::backplane::grpc::Ticket*>(value);
-  // @@protoc_insertion_point(field_set_allocated:io.deephaven.proto.backplane.grpc.DropColumnsRequest.result_id)
-}
-
-// .io.deephaven.proto.backplane.grpc.TableReference source_id = 2;
-inline bool DropColumnsRequest::has_source_id() const {
-  bool value = (_impl_._has_bits_[0] & 0x00000002u) != 0;
-  PROTOBUF_ASSUME(!value || _impl_.source_id_ != nullptr);
-  return value;
-}
-inline void DropColumnsRequest::clear_source_id() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  if (_impl_.source_id_ != nullptr) _impl_.source_id_->Clear();
-  _impl_._has_bits_[0] &= ~0x00000002u;
-}
-inline const ::io::deephaven::proto::backplane::grpc::TableReference& DropColumnsRequest::_internal_source_id() const {
-  PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race);
-  const ::io::deephaven::proto::backplane::grpc::TableReference* p = _impl_.source_id_;
-  return p != nullptr ? *p : reinterpret_cast<const ::io::deephaven::proto::backplane::grpc::TableReference&>(::io::deephaven::proto::backplane::grpc::_TableReference_default_instance_);
-}
-inline const ::io::deephaven::proto::backplane::grpc::TableReference& DropColumnsRequest::source_id() const ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  // @@protoc_insertion_point(field_get:io.deephaven.proto.backplane.grpc.DropColumnsRequest.source_id)
-  return _internal_source_id();
-}
-inline void DropColumnsRequest::unsafe_arena_set_allocated_source_id(::io::deephaven::proto::backplane::grpc::TableReference* value) {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  if (GetArena() == nullptr) {
-    delete reinterpret_cast<::google::protobuf::MessageLite*>(_impl_.source_id_);
-  }
-  _impl_.source_id_ = reinterpret_cast<::io::deephaven::proto::backplane::grpc::TableReference*>(value);
-  if (value != nullptr) {
-    _impl_._has_bits_[0] |= 0x00000002u;
-  } else {
-    _impl_._has_bits_[0] &= ~0x00000002u;
-  }
-  // @@protoc_insertion_point(field_unsafe_arena_set_allocated:io.deephaven.proto.backplane.grpc.DropColumnsRequest.source_id)
-}
-inline ::io::deephaven::proto::backplane::grpc::TableReference* DropColumnsRequest::release_source_id() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-
-  _impl_._has_bits_[0] &= ~0x00000002u;
-  ::io::deephaven::proto::backplane::grpc::TableReference* released = _impl_.source_id_;
-  _impl_.source_id_ = nullptr;
-#ifdef PROTOBUF_FORCE_COPY_IN_RELEASE
-  auto* old = reinterpret_cast<::google::protobuf::MessageLite*>(released);
-  released = ::google::protobuf::internal::DuplicateIfNonNull(released);
-  if (GetArena() == nullptr) {
-    delete old;
-  }
-#else   // PROTOBUF_FORCE_COPY_IN_RELEASE
-  if (GetArena() != nullptr) {
-    released = ::google::protobuf::internal::DuplicateIfNonNull(released);
-  }
-#endif  // !PROTOBUF_FORCE_COPY_IN_RELEASE
-  return released;
-}
-inline ::io::deephaven::proto::backplane::grpc::TableReference* DropColumnsRequest::unsafe_arena_release_source_id() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  // @@protoc_insertion_point(field_release:io.deephaven.proto.backplane.grpc.DropColumnsRequest.source_id)
-
-  _impl_._has_bits_[0] &= ~0x00000002u;
-  ::io::deephaven::proto::backplane::grpc::TableReference* temp = _impl_.source_id_;
-  _impl_.source_id_ = nullptr;
-  return temp;
-}
-inline ::io::deephaven::proto::backplane::grpc::TableReference* DropColumnsRequest::_internal_mutable_source_id() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  _impl_._has_bits_[0] |= 0x00000002u;
-  if (_impl_.source_id_ == nullptr) {
-    auto* p = CreateMaybeMessage<::io::deephaven::proto::backplane::grpc::TableReference>(GetArena());
-    _impl_.source_id_ = reinterpret_cast<::io::deephaven::proto::backplane::grpc::TableReference*>(p);
-  }
-  return _impl_.source_id_;
-}
-inline ::io::deephaven::proto::backplane::grpc::TableReference* DropColumnsRequest::mutable_source_id() ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  ::io::deephaven::proto::backplane::grpc::TableReference* _msg = _internal_mutable_source_id();
-  // @@protoc_insertion_point(field_mutable:io.deephaven.proto.backplane.grpc.DropColumnsRequest.source_id)
-  return _msg;
-}
-inline void DropColumnsRequest::set_allocated_source_id(::io::deephaven::proto::backplane::grpc::TableReference* value) {
-  ::google::protobuf::Arena* message_arena = GetArena();
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  if (message_arena == nullptr) {
-    delete reinterpret_cast<::io::deephaven::proto::backplane::grpc::TableReference*>(_impl_.source_id_);
-  }
-
-  if (value != nullptr) {
-    ::google::protobuf::Arena* submessage_arena = reinterpret_cast<::io::deephaven::proto::backplane::grpc::TableReference*>(value)->GetArena();
-    if (message_arena != submessage_arena) {
-      value = ::google::protobuf::internal::GetOwnedMessage(message_arena, value, submessage_arena);
-    }
-    _impl_._has_bits_[0] |= 0x00000002u;
-  } else {
-    _impl_._has_bits_[0] &= ~0x00000002u;
-  }
-
-  _impl_.source_id_ = reinterpret_cast<::io::deephaven::proto::backplane::grpc::TableReference*>(value);
-  // @@protoc_insertion_point(field_set_allocated:io.deephaven.proto.backplane.grpc.DropColumnsRequest.source_id)
-}
-
-// repeated string column_names = 3;
-inline int DropColumnsRequest::_internal_column_names_size() const {
-  return _internal_column_names().size();
-}
-inline int DropColumnsRequest::column_names_size() const {
-  return _internal_column_names_size();
-}
-inline void DropColumnsRequest::clear_column_names() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  _impl_.column_names_.Clear();
-}
-inline std::string* DropColumnsRequest::add_column_names()
-    ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  std::string* _s = _internal_mutable_column_names()->Add();
-  // @@protoc_insertion_point(field_add_mutable:io.deephaven.proto.backplane.grpc.DropColumnsRequest.column_names)
-  return _s;
-}
-inline const std::string& DropColumnsRequest::column_names(int index) const
-    ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  // @@protoc_insertion_point(field_get:io.deephaven.proto.backplane.grpc.DropColumnsRequest.column_names)
-  return _internal_column_names().Get(index);
-}
-inline std::string* DropColumnsRequest::mutable_column_names(int index)
-    ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  // @@protoc_insertion_point(field_mutable:io.deephaven.proto.backplane.grpc.DropColumnsRequest.column_names)
-  return _internal_mutable_column_names()->Mutable(index);
-}
-inline void DropColumnsRequest::set_column_names(int index, const std::string& value) {
-  _internal_mutable_column_names()->Mutable(index)->assign(value);
-  // @@protoc_insertion_point(field_set:io.deephaven.proto.backplane.grpc.DropColumnsRequest.column_names)
-}
-inline void DropColumnsRequest::set_column_names(int index, std::string&& value) {
-  _internal_mutable_column_names()->Mutable(index)->assign(std::move(value));
-  // @@protoc_insertion_point(field_set:io.deephaven.proto.backplane.grpc.DropColumnsRequest.column_names)
-}
-inline void DropColumnsRequest::set_column_names(int index, const char* value) {
-  ABSL_DCHECK(value != nullptr);
-  _internal_mutable_column_names()->Mutable(index)->assign(value);
-  // @@protoc_insertion_point(field_set_char:io.deephaven.proto.backplane.grpc.DropColumnsRequest.column_names)
-}
-inline void DropColumnsRequest::set_column_names(int index, const char* value,
-                              std::size_t size) {
-  _internal_mutable_column_names()->Mutable(index)->assign(
-      reinterpret_cast<const char*>(value), size);
-  // @@protoc_insertion_point(field_set_pointer:io.deephaven.proto.backplane.grpc.DropColumnsRequest.column_names)
-}
-inline void DropColumnsRequest::set_column_names(int index, absl::string_view value) {
-  _internal_mutable_column_names()->Mutable(index)->assign(value.data(),
-                                                     value.size());
-  // @@protoc_insertion_point(field_set_string_piece:io.deephaven.proto.backplane.grpc.DropColumnsRequest.column_names)
-}
-inline void DropColumnsRequest::add_column_names(const std::string& value) {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  _internal_mutable_column_names()->Add()->assign(value);
-  // @@protoc_insertion_point(field_add:io.deephaven.proto.backplane.grpc.DropColumnsRequest.column_names)
-}
-inline void DropColumnsRequest::add_column_names(std::string&& value) {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  _internal_mutable_column_names()->Add(std::move(value));
-  // @@protoc_insertion_point(field_add:io.deephaven.proto.backplane.grpc.DropColumnsRequest.column_names)
-}
-inline void DropColumnsRequest::add_column_names(const char* value) {
-  ABSL_DCHECK(value != nullptr);
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  _internal_mutable_column_names()->Add()->assign(value);
-  // @@protoc_insertion_point(field_add_char:io.deephaven.proto.backplane.grpc.DropColumnsRequest.column_names)
-}
-inline void DropColumnsRequest::add_column_names(const char* value, std::size_t size) {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  _internal_mutable_column_names()->Add()->assign(
-      reinterpret_cast<const char*>(value), size);
-  // @@protoc_insertion_point(field_add_pointer:io.deephaven.proto.backplane.grpc.DropColumnsRequest.column_names)
-}
-inline void DropColumnsRequest::add_column_names(absl::string_view value) {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  _internal_mutable_column_names()->Add()->assign(value.data(), value.size());
-  // @@protoc_insertion_point(field_add_string_piece:io.deephaven.proto.backplane.grpc.DropColumnsRequest.column_names)
-}
-inline const ::google::protobuf::RepeatedPtrField<std::string>&
-DropColumnsRequest::column_names() const ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  // @@protoc_insertion_point(field_list:io.deephaven.proto.backplane.grpc.DropColumnsRequest.column_names)
-  return _internal_column_names();
-}
-inline ::google::protobuf::RepeatedPtrField<std::string>*
-DropColumnsRequest::mutable_column_names() ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  // @@protoc_insertion_point(field_mutable_list:io.deephaven.proto.backplane.grpc.DropColumnsRequest.column_names)
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  return _internal_mutable_column_names();
-}
-inline const ::google::protobuf::RepeatedPtrField<std::string>&
-DropColumnsRequest::_internal_column_names() const {
-  PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race);
-  return _impl_.column_names_;
-}
-inline ::google::protobuf::RepeatedPtrField<std::string>*
-DropColumnsRequest::_internal_mutable_column_names() {
-  PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race);
-  return &_impl_.column_names_;
-}
-
-// -------------------------------------------------------------------
-
-// UnstructuredFilterTableRequest
-
-// .io.deephaven.proto.backplane.grpc.Ticket result_id = 1;
-inline bool UnstructuredFilterTableRequest::has_result_id() const {
-  bool value = (_impl_._has_bits_[0] & 0x00000001u) != 0;
-  PROTOBUF_ASSUME(!value || _impl_.result_id_ != nullptr);
-  return value;
-}
-inline const ::io::deephaven::proto::backplane::grpc::Ticket& UnstructuredFilterTableRequest::_internal_result_id() const {
-  PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race);
-  const ::io::deephaven::proto::backplane::grpc::Ticket* p = _impl_.result_id_;
-  return p != nullptr ? *p : reinterpret_cast<const ::io::deephaven::proto::backplane::grpc::Ticket&>(::io::deephaven::proto::backplane::grpc::_Ticket_default_instance_);
-}
-inline const ::io::deephaven::proto::backplane::grpc::Ticket& UnstructuredFilterTableRequest::result_id() const ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  // @@protoc_insertion_point(field_get:io.deephaven.proto.backplane.grpc.UnstructuredFilterTableRequest.result_id)
-  return _internal_result_id();
-}
-inline void UnstructuredFilterTableRequest::unsafe_arena_set_allocated_result_id(::io::deephaven::proto::backplane::grpc::Ticket* value) {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  if (GetArena() == nullptr) {
-    delete reinterpret_cast<::google::protobuf::MessageLite*>(_impl_.result_id_);
-  }
-  _impl_.result_id_ = reinterpret_cast<::io::deephaven::proto::backplane::grpc::Ticket*>(value);
-  if (value != nullptr) {
-    _impl_._has_bits_[0] |= 0x00000001u;
-  } else {
-    _impl_._has_bits_[0] &= ~0x00000001u;
-  }
-  // @@protoc_insertion_point(field_unsafe_arena_set_allocated:io.deephaven.proto.backplane.grpc.UnstructuredFilterTableRequest.result_id)
-}
-inline ::io::deephaven::proto::backplane::grpc::Ticket* UnstructuredFilterTableRequest::release_result_id() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-
-  _impl_._has_bits_[0] &= ~0x00000001u;
-  ::io::deephaven::proto::backplane::grpc::Ticket* released = _impl_.result_id_;
-  _impl_.result_id_ = nullptr;
-#ifdef PROTOBUF_FORCE_COPY_IN_RELEASE
-  auto* old = reinterpret_cast<::google::protobuf::MessageLite*>(released);
-  released = ::google::protobuf::internal::DuplicateIfNonNull(released);
-  if (GetArena() == nullptr) {
-    delete old;
-  }
-#else   // PROTOBUF_FORCE_COPY_IN_RELEASE
-  if (GetArena() != nullptr) {
-    released = ::google::protobuf::internal::DuplicateIfNonNull(released);
-  }
-#endif  // !PROTOBUF_FORCE_COPY_IN_RELEASE
-  return released;
-}
-inline ::io::deephaven::proto::backplane::grpc::Ticket* UnstructuredFilterTableRequest::unsafe_arena_release_result_id() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  // @@protoc_insertion_point(field_release:io.deephaven.proto.backplane.grpc.UnstructuredFilterTableRequest.result_id)
-
-  _impl_._has_bits_[0] &= ~0x00000001u;
-  ::io::deephaven::proto::backplane::grpc::Ticket* temp = _impl_.result_id_;
-  _impl_.result_id_ = nullptr;
-  return temp;
-}
-inline ::io::deephaven::proto::backplane::grpc::Ticket* UnstructuredFilterTableRequest::_internal_mutable_result_id() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  _impl_._has_bits_[0] |= 0x00000001u;
-  if (_impl_.result_id_ == nullptr) {
-    auto* p = CreateMaybeMessage<::io::deephaven::proto::backplane::grpc::Ticket>(GetArena());
-    _impl_.result_id_ = reinterpret_cast<::io::deephaven::proto::backplane::grpc::Ticket*>(p);
-  }
-  return _impl_.result_id_;
-}
-inline ::io::deephaven::proto::backplane::grpc::Ticket* UnstructuredFilterTableRequest::mutable_result_id() ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  ::io::deephaven::proto::backplane::grpc::Ticket* _msg = _internal_mutable_result_id();
-  // @@protoc_insertion_point(field_mutable:io.deephaven.proto.backplane.grpc.UnstructuredFilterTableRequest.result_id)
-  return _msg;
-}
-inline void UnstructuredFilterTableRequest::set_allocated_result_id(::io::deephaven::proto::backplane::grpc::Ticket* value) {
-  ::google::protobuf::Arena* message_arena = GetArena();
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  if (message_arena == nullptr) {
-    delete reinterpret_cast<::google::protobuf::MessageLite*>(_impl_.result_id_);
-  }
-
-  if (value != nullptr) {
-    ::google::protobuf::Arena* submessage_arena = reinterpret_cast<::google::protobuf::MessageLite*>(value)->GetArena();
-    if (message_arena != submessage_arena) {
-      value = ::google::protobuf::internal::GetOwnedMessage(message_arena, value, submessage_arena);
-    }
-    _impl_._has_bits_[0] |= 0x00000001u;
-  } else {
-    _impl_._has_bits_[0] &= ~0x00000001u;
-  }
-
-  _impl_.result_id_ = reinterpret_cast<::io::deephaven::proto::backplane::grpc::Ticket*>(value);
-  // @@protoc_insertion_point(field_set_allocated:io.deephaven.proto.backplane.grpc.UnstructuredFilterTableRequest.result_id)
-}
-
-// .io.deephaven.proto.backplane.grpc.TableReference source_id = 2;
-inline bool UnstructuredFilterTableRequest::has_source_id() const {
-  bool value = (_impl_._has_bits_[0] & 0x00000002u) != 0;
-  PROTOBUF_ASSUME(!value || _impl_.source_id_ != nullptr);
-  return value;
-}
-inline void UnstructuredFilterTableRequest::clear_source_id() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  if (_impl_.source_id_ != nullptr) _impl_.source_id_->Clear();
-  _impl_._has_bits_[0] &= ~0x00000002u;
-}
-inline const ::io::deephaven::proto::backplane::grpc::TableReference& UnstructuredFilterTableRequest::_internal_source_id() const {
-  PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race);
-  const ::io::deephaven::proto::backplane::grpc::TableReference* p = _impl_.source_id_;
-  return p != nullptr ? *p : reinterpret_cast<const ::io::deephaven::proto::backplane::grpc::TableReference&>(::io::deephaven::proto::backplane::grpc::_TableReference_default_instance_);
-}
-inline const ::io::deephaven::proto::backplane::grpc::TableReference& UnstructuredFilterTableRequest::source_id() const ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  // @@protoc_insertion_point(field_get:io.deephaven.proto.backplane.grpc.UnstructuredFilterTableRequest.source_id)
-  return _internal_source_id();
-}
-inline void UnstructuredFilterTableRequest::unsafe_arena_set_allocated_source_id(::io::deephaven::proto::backplane::grpc::TableReference* value) {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  if (GetArena() == nullptr) {
-    delete reinterpret_cast<::google::protobuf::MessageLite*>(_impl_.source_id_);
-  }
-  _impl_.source_id_ = reinterpret_cast<::io::deephaven::proto::backplane::grpc::TableReference*>(value);
-  if (value != nullptr) {
-    _impl_._has_bits_[0] |= 0x00000002u;
-  } else {
-    _impl_._has_bits_[0] &= ~0x00000002u;
-  }
-  // @@protoc_insertion_point(field_unsafe_arena_set_allocated:io.deephaven.proto.backplane.grpc.UnstructuredFilterTableRequest.source_id)
-}
-inline ::io::deephaven::proto::backplane::grpc::TableReference* UnstructuredFilterTableRequest::release_source_id() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-
-  _impl_._has_bits_[0] &= ~0x00000002u;
-  ::io::deephaven::proto::backplane::grpc::TableReference* released = _impl_.source_id_;
-  _impl_.source_id_ = nullptr;
-#ifdef PROTOBUF_FORCE_COPY_IN_RELEASE
-  auto* old = reinterpret_cast<::google::protobuf::MessageLite*>(released);
-  released = ::google::protobuf::internal::DuplicateIfNonNull(released);
-  if (GetArena() == nullptr) {
-    delete old;
-  }
-#else   // PROTOBUF_FORCE_COPY_IN_RELEASE
-  if (GetArena() != nullptr) {
-    released = ::google::protobuf::internal::DuplicateIfNonNull(released);
-  }
-#endif  // !PROTOBUF_FORCE_COPY_IN_RELEASE
-  return released;
-}
-inline ::io::deephaven::proto::backplane::grpc::TableReference* UnstructuredFilterTableRequest::unsafe_arena_release_source_id() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  // @@protoc_insertion_point(field_release:io.deephaven.proto.backplane.grpc.UnstructuredFilterTableRequest.source_id)
-
-  _impl_._has_bits_[0] &= ~0x00000002u;
-  ::io::deephaven::proto::backplane::grpc::TableReference* temp = _impl_.source_id_;
-  _impl_.source_id_ = nullptr;
-  return temp;
-}
-inline ::io::deephaven::proto::backplane::grpc::TableReference* UnstructuredFilterTableRequest::_internal_mutable_source_id() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  _impl_._has_bits_[0] |= 0x00000002u;
-  if (_impl_.source_id_ == nullptr) {
-    auto* p = CreateMaybeMessage<::io::deephaven::proto::backplane::grpc::TableReference>(GetArena());
-    _impl_.source_id_ = reinterpret_cast<::io::deephaven::proto::backplane::grpc::TableReference*>(p);
-  }
-  return _impl_.source_id_;
-}
-inline ::io::deephaven::proto::backplane::grpc::TableReference* UnstructuredFilterTableRequest::mutable_source_id() ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  ::io::deephaven::proto::backplane::grpc::TableReference* _msg = _internal_mutable_source_id();
-  // @@protoc_insertion_point(field_mutable:io.deephaven.proto.backplane.grpc.UnstructuredFilterTableRequest.source_id)
-  return _msg;
-}
-inline void UnstructuredFilterTableRequest::set_allocated_source_id(::io::deephaven::proto::backplane::grpc::TableReference* value) {
-  ::google::protobuf::Arena* message_arena = GetArena();
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  if (message_arena == nullptr) {
-    delete reinterpret_cast<::io::deephaven::proto::backplane::grpc::TableReference*>(_impl_.source_id_);
-  }
-
-  if (value != nullptr) {
-    ::google::protobuf::Arena* submessage_arena = reinterpret_cast<::io::deephaven::proto::backplane::grpc::TableReference*>(value)->GetArena();
-    if (message_arena != submessage_arena) {
-      value = ::google::protobuf::internal::GetOwnedMessage(message_arena, value, submessage_arena);
-    }
-    _impl_._has_bits_[0] |= 0x00000002u;
-  } else {
-    _impl_._has_bits_[0] &= ~0x00000002u;
-  }
-
-  _impl_.source_id_ = reinterpret_cast<::io::deephaven::proto::backplane::grpc::TableReference*>(value);
-  // @@protoc_insertion_point(field_set_allocated:io.deephaven.proto.backplane.grpc.UnstructuredFilterTableRequest.source_id)
-}
-
-// repeated string filters = 3;
-inline int UnstructuredFilterTableRequest::_internal_filters_size() const {
-  return _internal_filters().size();
-}
-inline int UnstructuredFilterTableRequest::filters_size() const {
-  return _internal_filters_size();
-}
-inline void UnstructuredFilterTableRequest::clear_filters() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  _impl_.filters_.Clear();
-}
-inline std::string* UnstructuredFilterTableRequest::add_filters()
-    ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  std::string* _s = _internal_mutable_filters()->Add();
-  // @@protoc_insertion_point(field_add_mutable:io.deephaven.proto.backplane.grpc.UnstructuredFilterTableRequest.filters)
-  return _s;
-}
-inline const std::string& UnstructuredFilterTableRequest::filters(int index) const
-    ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  // @@protoc_insertion_point(field_get:io.deephaven.proto.backplane.grpc.UnstructuredFilterTableRequest.filters)
-  return _internal_filters().Get(index);
-}
-inline std::string* UnstructuredFilterTableRequest::mutable_filters(int index)
-    ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  // @@protoc_insertion_point(field_mutable:io.deephaven.proto.backplane.grpc.UnstructuredFilterTableRequest.filters)
-  return _internal_mutable_filters()->Mutable(index);
-}
-inline void UnstructuredFilterTableRequest::set_filters(int index, const std::string& value) {
-  _internal_mutable_filters()->Mutable(index)->assign(value);
-  // @@protoc_insertion_point(field_set:io.deephaven.proto.backplane.grpc.UnstructuredFilterTableRequest.filters)
-}
-inline void UnstructuredFilterTableRequest::set_filters(int index, std::string&& value) {
-  _internal_mutable_filters()->Mutable(index)->assign(std::move(value));
-  // @@protoc_insertion_point(field_set:io.deephaven.proto.backplane.grpc.UnstructuredFilterTableRequest.filters)
-}
-inline void UnstructuredFilterTableRequest::set_filters(int index, const char* value) {
-  ABSL_DCHECK(value != nullptr);
-  _internal_mutable_filters()->Mutable(index)->assign(value);
-  // @@protoc_insertion_point(field_set_char:io.deephaven.proto.backplane.grpc.UnstructuredFilterTableRequest.filters)
-}
-inline void UnstructuredFilterTableRequest::set_filters(int index, const char* value,
-                              std::size_t size) {
-  _internal_mutable_filters()->Mutable(index)->assign(
-      reinterpret_cast<const char*>(value), size);
-  // @@protoc_insertion_point(field_set_pointer:io.deephaven.proto.backplane.grpc.UnstructuredFilterTableRequest.filters)
-}
-inline void UnstructuredFilterTableRequest::set_filters(int index, absl::string_view value) {
-  _internal_mutable_filters()->Mutable(index)->assign(value.data(),
-                                                     value.size());
-  // @@protoc_insertion_point(field_set_string_piece:io.deephaven.proto.backplane.grpc.UnstructuredFilterTableRequest.filters)
-}
-inline void UnstructuredFilterTableRequest::add_filters(const std::string& value) {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  _internal_mutable_filters()->Add()->assign(value);
-  // @@protoc_insertion_point(field_add:io.deephaven.proto.backplane.grpc.UnstructuredFilterTableRequest.filters)
-}
-inline void UnstructuredFilterTableRequest::add_filters(std::string&& value) {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  _internal_mutable_filters()->Add(std::move(value));
-  // @@protoc_insertion_point(field_add:io.deephaven.proto.backplane.grpc.UnstructuredFilterTableRequest.filters)
-}
-inline void UnstructuredFilterTableRequest::add_filters(const char* value) {
-  ABSL_DCHECK(value != nullptr);
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  _internal_mutable_filters()->Add()->assign(value);
-  // @@protoc_insertion_point(field_add_char:io.deephaven.proto.backplane.grpc.UnstructuredFilterTableRequest.filters)
-}
-inline void UnstructuredFilterTableRequest::add_filters(const char* value, std::size_t size) {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  _internal_mutable_filters()->Add()->assign(
-      reinterpret_cast<const char*>(value), size);
-  // @@protoc_insertion_point(field_add_pointer:io.deephaven.proto.backplane.grpc.UnstructuredFilterTableRequest.filters)
-}
-inline void UnstructuredFilterTableRequest::add_filters(absl::string_view value) {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  _internal_mutable_filters()->Add()->assign(value.data(), value.size());
-  // @@protoc_insertion_point(field_add_string_piece:io.deephaven.proto.backplane.grpc.UnstructuredFilterTableRequest.filters)
-}
-inline const ::google::protobuf::RepeatedPtrField<std::string>&
-UnstructuredFilterTableRequest::filters() const ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  // @@protoc_insertion_point(field_list:io.deephaven.proto.backplane.grpc.UnstructuredFilterTableRequest.filters)
-  return _internal_filters();
-}
-inline ::google::protobuf::RepeatedPtrField<std::string>*
-UnstructuredFilterTableRequest::mutable_filters() ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  // @@protoc_insertion_point(field_mutable_list:io.deephaven.proto.backplane.grpc.UnstructuredFilterTableRequest.filters)
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  return _internal_mutable_filters();
-}
-inline const ::google::protobuf::RepeatedPtrField<std::string>&
-UnstructuredFilterTableRequest::_internal_filters() const {
-  PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race);
-  return _impl_.filters_;
-}
-inline ::google::protobuf::RepeatedPtrField<std::string>*
-UnstructuredFilterTableRequest::_internal_mutable_filters() {
-  PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race);
-  return &_impl_.filters_;
-}
-
-// -------------------------------------------------------------------
-
-// HeadOrTailRequest
-
-// .io.deephaven.proto.backplane.grpc.Ticket result_id = 1;
-inline bool HeadOrTailRequest::has_result_id() const {
-  bool value = (_impl_._has_bits_[0] & 0x00000001u) != 0;
-  PROTOBUF_ASSUME(!value || _impl_.result_id_ != nullptr);
-  return value;
-}
-inline const ::io::deephaven::proto::backplane::grpc::Ticket& HeadOrTailRequest::_internal_result_id() const {
-  PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race);
-  const ::io::deephaven::proto::backplane::grpc::Ticket* p = _impl_.result_id_;
-  return p != nullptr ? *p : reinterpret_cast<const ::io::deephaven::proto::backplane::grpc::Ticket&>(::io::deephaven::proto::backplane::grpc::_Ticket_default_instance_);
-}
-inline const ::io::deephaven::proto::backplane::grpc::Ticket& HeadOrTailRequest::result_id() const ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  // @@protoc_insertion_point(field_get:io.deephaven.proto.backplane.grpc.HeadOrTailRequest.result_id)
-  return _internal_result_id();
-}
-inline void HeadOrTailRequest::unsafe_arena_set_allocated_result_id(::io::deephaven::proto::backplane::grpc::Ticket* value) {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  if (GetArena() == nullptr) {
-    delete reinterpret_cast<::google::protobuf::MessageLite*>(_impl_.result_id_);
-  }
-  _impl_.result_id_ = reinterpret_cast<::io::deephaven::proto::backplane::grpc::Ticket*>(value);
-  if (value != nullptr) {
-    _impl_._has_bits_[0] |= 0x00000001u;
-  } else {
-    _impl_._has_bits_[0] &= ~0x00000001u;
-  }
-  // @@protoc_insertion_point(field_unsafe_arena_set_allocated:io.deephaven.proto.backplane.grpc.HeadOrTailRequest.result_id)
-}
-inline ::io::deephaven::proto::backplane::grpc::Ticket* HeadOrTailRequest::release_result_id() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-
-  _impl_._has_bits_[0] &= ~0x00000001u;
-  ::io::deephaven::proto::backplane::grpc::Ticket* released = _impl_.result_id_;
-  _impl_.result_id_ = nullptr;
-#ifdef PROTOBUF_FORCE_COPY_IN_RELEASE
-  auto* old = reinterpret_cast<::google::protobuf::MessageLite*>(released);
-  released = ::google::protobuf::internal::DuplicateIfNonNull(released);
-  if (GetArena() == nullptr) {
-    delete old;
-  }
-#else   // PROTOBUF_FORCE_COPY_IN_RELEASE
-  if (GetArena() != nullptr) {
-    released = ::google::protobuf::internal::DuplicateIfNonNull(released);
-  }
-#endif  // !PROTOBUF_FORCE_COPY_IN_RELEASE
-  return released;
-}
-inline ::io::deephaven::proto::backplane::grpc::Ticket* HeadOrTailRequest::unsafe_arena_release_result_id() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  // @@protoc_insertion_point(field_release:io.deephaven.proto.backplane.grpc.HeadOrTailRequest.result_id)
-
-  _impl_._has_bits_[0] &= ~0x00000001u;
-  ::io::deephaven::proto::backplane::grpc::Ticket* temp = _impl_.result_id_;
-  _impl_.result_id_ = nullptr;
-  return temp;
-}
-inline ::io::deephaven::proto::backplane::grpc::Ticket* HeadOrTailRequest::_internal_mutable_result_id() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  _impl_._has_bits_[0] |= 0x00000001u;
-  if (_impl_.result_id_ == nullptr) {
-    auto* p = CreateMaybeMessage<::io::deephaven::proto::backplane::grpc::Ticket>(GetArena());
-    _impl_.result_id_ = reinterpret_cast<::io::deephaven::proto::backplane::grpc::Ticket*>(p);
-  }
-  return _impl_.result_id_;
-}
-inline ::io::deephaven::proto::backplane::grpc::Ticket* HeadOrTailRequest::mutable_result_id() ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  ::io::deephaven::proto::backplane::grpc::Ticket* _msg = _internal_mutable_result_id();
-  // @@protoc_insertion_point(field_mutable:io.deephaven.proto.backplane.grpc.HeadOrTailRequest.result_id)
-  return _msg;
-}
-inline void HeadOrTailRequest::set_allocated_result_id(::io::deephaven::proto::backplane::grpc::Ticket* value) {
-  ::google::protobuf::Arena* message_arena = GetArena();
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  if (message_arena == nullptr) {
-    delete reinterpret_cast<::google::protobuf::MessageLite*>(_impl_.result_id_);
-  }
-
-  if (value != nullptr) {
-    ::google::protobuf::Arena* submessage_arena = reinterpret_cast<::google::protobuf::MessageLite*>(value)->GetArena();
-    if (message_arena != submessage_arena) {
-      value = ::google::protobuf::internal::GetOwnedMessage(message_arena, value, submessage_arena);
-    }
-    _impl_._has_bits_[0] |= 0x00000001u;
-  } else {
-    _impl_._has_bits_[0] &= ~0x00000001u;
-  }
-
-  _impl_.result_id_ = reinterpret_cast<::io::deephaven::proto::backplane::grpc::Ticket*>(value);
-  // @@protoc_insertion_point(field_set_allocated:io.deephaven.proto.backplane.grpc.HeadOrTailRequest.result_id)
-}
-
-// .io.deephaven.proto.backplane.grpc.TableReference source_id = 2;
-inline bool HeadOrTailRequest::has_source_id() const {
-  bool value = (_impl_._has_bits_[0] & 0x00000002u) != 0;
-  PROTOBUF_ASSUME(!value || _impl_.source_id_ != nullptr);
-  return value;
-}
-inline void HeadOrTailRequest::clear_source_id() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  if (_impl_.source_id_ != nullptr) _impl_.source_id_->Clear();
-  _impl_._has_bits_[0] &= ~0x00000002u;
-}
-inline const ::io::deephaven::proto::backplane::grpc::TableReference& HeadOrTailRequest::_internal_source_id() const {
-  PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race);
-  const ::io::deephaven::proto::backplane::grpc::TableReference* p = _impl_.source_id_;
-  return p != nullptr ? *p : reinterpret_cast<const ::io::deephaven::proto::backplane::grpc::TableReference&>(::io::deephaven::proto::backplane::grpc::_TableReference_default_instance_);
-}
-inline const ::io::deephaven::proto::backplane::grpc::TableReference& HeadOrTailRequest::source_id() const ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  // @@protoc_insertion_point(field_get:io.deephaven.proto.backplane.grpc.HeadOrTailRequest.source_id)
-  return _internal_source_id();
-}
-inline void HeadOrTailRequest::unsafe_arena_set_allocated_source_id(::io::deephaven::proto::backplane::grpc::TableReference* value) {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  if (GetArena() == nullptr) {
-    delete reinterpret_cast<::google::protobuf::MessageLite*>(_impl_.source_id_);
-  }
-  _impl_.source_id_ = reinterpret_cast<::io::deephaven::proto::backplane::grpc::TableReference*>(value);
-  if (value != nullptr) {
-    _impl_._has_bits_[0] |= 0x00000002u;
-  } else {
-    _impl_._has_bits_[0] &= ~0x00000002u;
-  }
-  // @@protoc_insertion_point(field_unsafe_arena_set_allocated:io.deephaven.proto.backplane.grpc.HeadOrTailRequest.source_id)
-}
-inline ::io::deephaven::proto::backplane::grpc::TableReference* HeadOrTailRequest::release_source_id() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-
-  _impl_._has_bits_[0] &= ~0x00000002u;
-  ::io::deephaven::proto::backplane::grpc::TableReference* released = _impl_.source_id_;
-  _impl_.source_id_ = nullptr;
-#ifdef PROTOBUF_FORCE_COPY_IN_RELEASE
-  auto* old = reinterpret_cast<::google::protobuf::MessageLite*>(released);
-  released = ::google::protobuf::internal::DuplicateIfNonNull(released);
-  if (GetArena() == nullptr) {
-    delete old;
-  }
-#else   // PROTOBUF_FORCE_COPY_IN_RELEASE
-  if (GetArena() != nullptr) {
-    released = ::google::protobuf::internal::DuplicateIfNonNull(released);
-  }
-#endif  // !PROTOBUF_FORCE_COPY_IN_RELEASE
-  return released;
-}
-inline ::io::deephaven::proto::backplane::grpc::TableReference* HeadOrTailRequest::unsafe_arena_release_source_id() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  // @@protoc_insertion_point(field_release:io.deephaven.proto.backplane.grpc.HeadOrTailRequest.source_id)
-
-  _impl_._has_bits_[0] &= ~0x00000002u;
-  ::io::deephaven::proto::backplane::grpc::TableReference* temp = _impl_.source_id_;
-  _impl_.source_id_ = nullptr;
-  return temp;
-}
-inline ::io::deephaven::proto::backplane::grpc::TableReference* HeadOrTailRequest::_internal_mutable_source_id() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  _impl_._has_bits_[0] |= 0x00000002u;
-  if (_impl_.source_id_ == nullptr) {
-    auto* p = CreateMaybeMessage<::io::deephaven::proto::backplane::grpc::TableReference>(GetArena());
-    _impl_.source_id_ = reinterpret_cast<::io::deephaven::proto::backplane::grpc::TableReference*>(p);
-  }
-  return _impl_.source_id_;
-}
-inline ::io::deephaven::proto::backplane::grpc::TableReference* HeadOrTailRequest::mutable_source_id() ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  ::io::deephaven::proto::backplane::grpc::TableReference* _msg = _internal_mutable_source_id();
-  // @@protoc_insertion_point(field_mutable:io.deephaven.proto.backplane.grpc.HeadOrTailRequest.source_id)
-  return _msg;
-}
-inline void HeadOrTailRequest::set_allocated_source_id(::io::deephaven::proto::backplane::grpc::TableReference* value) {
-  ::google::protobuf::Arena* message_arena = GetArena();
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  if (message_arena == nullptr) {
-    delete reinterpret_cast<::io::deephaven::proto::backplane::grpc::TableReference*>(_impl_.source_id_);
-  }
-
-  if (value != nullptr) {
-    ::google::protobuf::Arena* submessage_arena = reinterpret_cast<::io::deephaven::proto::backplane::grpc::TableReference*>(value)->GetArena();
-    if (message_arena != submessage_arena) {
-      value = ::google::protobuf::internal::GetOwnedMessage(message_arena, value, submessage_arena);
-    }
-    _impl_._has_bits_[0] |= 0x00000002u;
-  } else {
-    _impl_._has_bits_[0] &= ~0x00000002u;
-  }
-
-  _impl_.source_id_ = reinterpret_cast<::io::deephaven::proto::backplane::grpc::TableReference*>(value);
-  // @@protoc_insertion_point(field_set_allocated:io.deephaven.proto.backplane.grpc.HeadOrTailRequest.source_id)
-}
-
-// sint64 num_rows = 3 [jstype = JS_STRING];
-inline void HeadOrTailRequest::clear_num_rows() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  _impl_.num_rows_ = ::int64_t{0};
-}
-inline ::int64_t HeadOrTailRequest::num_rows() const {
-  // @@protoc_insertion_point(field_get:io.deephaven.proto.backplane.grpc.HeadOrTailRequest.num_rows)
-  return _internal_num_rows();
-}
-inline void HeadOrTailRequest::set_num_rows(::int64_t value) {
-  _internal_set_num_rows(value);
-  // @@protoc_insertion_point(field_set:io.deephaven.proto.backplane.grpc.HeadOrTailRequest.num_rows)
-}
-inline ::int64_t HeadOrTailRequest::_internal_num_rows() const {
-  PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race);
-  return _impl_.num_rows_;
-}
-inline void HeadOrTailRequest::_internal_set_num_rows(::int64_t value) {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  ;
-  _impl_.num_rows_ = value;
-}
-
-// -------------------------------------------------------------------
-
-// HeadOrTailByRequest
-
-// .io.deephaven.proto.backplane.grpc.Ticket result_id = 1;
-inline bool HeadOrTailByRequest::has_result_id() const {
-  bool value = (_impl_._has_bits_[0] & 0x00000001u) != 0;
-  PROTOBUF_ASSUME(!value || _impl_.result_id_ != nullptr);
-  return value;
-}
-inline const ::io::deephaven::proto::backplane::grpc::Ticket& HeadOrTailByRequest::_internal_result_id() const {
-  PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race);
-  const ::io::deephaven::proto::backplane::grpc::Ticket* p = _impl_.result_id_;
-  return p != nullptr ? *p : reinterpret_cast<const ::io::deephaven::proto::backplane::grpc::Ticket&>(::io::deephaven::proto::backplane::grpc::_Ticket_default_instance_);
-}
-inline const ::io::deephaven::proto::backplane::grpc::Ticket& HeadOrTailByRequest::result_id() const ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  // @@protoc_insertion_point(field_get:io.deephaven.proto.backplane.grpc.HeadOrTailByRequest.result_id)
-  return _internal_result_id();
-}
-inline void HeadOrTailByRequest::unsafe_arena_set_allocated_result_id(::io::deephaven::proto::backplane::grpc::Ticket* value) {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  if (GetArena() == nullptr) {
-    delete reinterpret_cast<::google::protobuf::MessageLite*>(_impl_.result_id_);
-  }
-  _impl_.result_id_ = reinterpret_cast<::io::deephaven::proto::backplane::grpc::Ticket*>(value);
-  if (value != nullptr) {
-    _impl_._has_bits_[0] |= 0x00000001u;
-  } else {
-    _impl_._has_bits_[0] &= ~0x00000001u;
-  }
-  // @@protoc_insertion_point(field_unsafe_arena_set_allocated:io.deephaven.proto.backplane.grpc.HeadOrTailByRequest.result_id)
-}
-inline ::io::deephaven::proto::backplane::grpc::Ticket* HeadOrTailByRequest::release_result_id() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-
-  _impl_._has_bits_[0] &= ~0x00000001u;
-  ::io::deephaven::proto::backplane::grpc::Ticket* released = _impl_.result_id_;
-  _impl_.result_id_ = nullptr;
-#ifdef PROTOBUF_FORCE_COPY_IN_RELEASE
-  auto* old = reinterpret_cast<::google::protobuf::MessageLite*>(released);
-  released = ::google::protobuf::internal::DuplicateIfNonNull(released);
-  if (GetArena() == nullptr) {
-    delete old;
-  }
-#else   // PROTOBUF_FORCE_COPY_IN_RELEASE
-  if (GetArena() != nullptr) {
-    released = ::google::protobuf::internal::DuplicateIfNonNull(released);
-  }
-#endif  // !PROTOBUF_FORCE_COPY_IN_RELEASE
-  return released;
-}
-inline ::io::deephaven::proto::backplane::grpc::Ticket* HeadOrTailByRequest::unsafe_arena_release_result_id() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  // @@protoc_insertion_point(field_release:io.deephaven.proto.backplane.grpc.HeadOrTailByRequest.result_id)
-
-  _impl_._has_bits_[0] &= ~0x00000001u;
-  ::io::deephaven::proto::backplane::grpc::Ticket* temp = _impl_.result_id_;
-  _impl_.result_id_ = nullptr;
-  return temp;
-}
-inline ::io::deephaven::proto::backplane::grpc::Ticket* HeadOrTailByRequest::_internal_mutable_result_id() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  _impl_._has_bits_[0] |= 0x00000001u;
-  if (_impl_.result_id_ == nullptr) {
-    auto* p = CreateMaybeMessage<::io::deephaven::proto::backplane::grpc::Ticket>(GetArena());
-    _impl_.result_id_ = reinterpret_cast<::io::deephaven::proto::backplane::grpc::Ticket*>(p);
-  }
-  return _impl_.result_id_;
-}
-inline ::io::deephaven::proto::backplane::grpc::Ticket* HeadOrTailByRequest::mutable_result_id() ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  ::io::deephaven::proto::backplane::grpc::Ticket* _msg = _internal_mutable_result_id();
-  // @@protoc_insertion_point(field_mutable:io.deephaven.proto.backplane.grpc.HeadOrTailByRequest.result_id)
-  return _msg;
-}
-inline void HeadOrTailByRequest::set_allocated_result_id(::io::deephaven::proto::backplane::grpc::Ticket* value) {
-  ::google::protobuf::Arena* message_arena = GetArena();
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  if (message_arena == nullptr) {
-    delete reinterpret_cast<::google::protobuf::MessageLite*>(_impl_.result_id_);
-  }
-
-  if (value != nullptr) {
-    ::google::protobuf::Arena* submessage_arena = reinterpret_cast<::google::protobuf::MessageLite*>(value)->GetArena();
-    if (message_arena != submessage_arena) {
-      value = ::google::protobuf::internal::GetOwnedMessage(message_arena, value, submessage_arena);
-    }
-    _impl_._has_bits_[0] |= 0x00000001u;
-  } else {
-    _impl_._has_bits_[0] &= ~0x00000001u;
-  }
-
-  _impl_.result_id_ = reinterpret_cast<::io::deephaven::proto::backplane::grpc::Ticket*>(value);
-  // @@protoc_insertion_point(field_set_allocated:io.deephaven.proto.backplane.grpc.HeadOrTailByRequest.result_id)
-}
-
-// .io.deephaven.proto.backplane.grpc.TableReference source_id = 2;
-inline bool HeadOrTailByRequest::has_source_id() const {
-  bool value = (_impl_._has_bits_[0] & 0x00000002u) != 0;
-  PROTOBUF_ASSUME(!value || _impl_.source_id_ != nullptr);
-  return value;
-}
-inline void HeadOrTailByRequest::clear_source_id() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  if (_impl_.source_id_ != nullptr) _impl_.source_id_->Clear();
-  _impl_._has_bits_[0] &= ~0x00000002u;
-}
-inline const ::io::deephaven::proto::backplane::grpc::TableReference& HeadOrTailByRequest::_internal_source_id() const {
-  PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race);
-  const ::io::deephaven::proto::backplane::grpc::TableReference* p = _impl_.source_id_;
-  return p != nullptr ? *p : reinterpret_cast<const ::io::deephaven::proto::backplane::grpc::TableReference&>(::io::deephaven::proto::backplane::grpc::_TableReference_default_instance_);
-}
-inline const ::io::deephaven::proto::backplane::grpc::TableReference& HeadOrTailByRequest::source_id() const ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  // @@protoc_insertion_point(field_get:io.deephaven.proto.backplane.grpc.HeadOrTailByRequest.source_id)
-  return _internal_source_id();
-}
-inline void HeadOrTailByRequest::unsafe_arena_set_allocated_source_id(::io::deephaven::proto::backplane::grpc::TableReference* value) {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  if (GetArena() == nullptr) {
-    delete reinterpret_cast<::google::protobuf::MessageLite*>(_impl_.source_id_);
-  }
-  _impl_.source_id_ = reinterpret_cast<::io::deephaven::proto::backplane::grpc::TableReference*>(value);
-  if (value != nullptr) {
-    _impl_._has_bits_[0] |= 0x00000002u;
-  } else {
-    _impl_._has_bits_[0] &= ~0x00000002u;
-  }
-  // @@protoc_insertion_point(field_unsafe_arena_set_allocated:io.deephaven.proto.backplane.grpc.HeadOrTailByRequest.source_id)
-}
-inline ::io::deephaven::proto::backplane::grpc::TableReference* HeadOrTailByRequest::release_source_id() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-
-  _impl_._has_bits_[0] &= ~0x00000002u;
-  ::io::deephaven::proto::backplane::grpc::TableReference* released = _impl_.source_id_;
-  _impl_.source_id_ = nullptr;
-#ifdef PROTOBUF_FORCE_COPY_IN_RELEASE
-  auto* old = reinterpret_cast<::google::protobuf::MessageLite*>(released);
-  released = ::google::protobuf::internal::DuplicateIfNonNull(released);
-  if (GetArena() == nullptr) {
-    delete old;
-  }
-#else   // PROTOBUF_FORCE_COPY_IN_RELEASE
-  if (GetArena() != nullptr) {
-    released = ::google::protobuf::internal::DuplicateIfNonNull(released);
-  }
-#endif  // !PROTOBUF_FORCE_COPY_IN_RELEASE
-  return released;
-}
-inline ::io::deephaven::proto::backplane::grpc::TableReference* HeadOrTailByRequest::unsafe_arena_release_source_id() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  // @@protoc_insertion_point(field_release:io.deephaven.proto.backplane.grpc.HeadOrTailByRequest.source_id)
-
-  _impl_._has_bits_[0] &= ~0x00000002u;
-  ::io::deephaven::proto::backplane::grpc::TableReference* temp = _impl_.source_id_;
-  _impl_.source_id_ = nullptr;
-  return temp;
-}
-inline ::io::deephaven::proto::backplane::grpc::TableReference* HeadOrTailByRequest::_internal_mutable_source_id() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  _impl_._has_bits_[0] |= 0x00000002u;
-  if (_impl_.source_id_ == nullptr) {
-    auto* p = CreateMaybeMessage<::io::deephaven::proto::backplane::grpc::TableReference>(GetArena());
-    _impl_.source_id_ = reinterpret_cast<::io::deephaven::proto::backplane::grpc::TableReference*>(p);
-  }
-  return _impl_.source_id_;
-}
-inline ::io::deephaven::proto::backplane::grpc::TableReference* HeadOrTailByRequest::mutable_source_id() ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  ::io::deephaven::proto::backplane::grpc::TableReference* _msg = _internal_mutable_source_id();
-  // @@protoc_insertion_point(field_mutable:io.deephaven.proto.backplane.grpc.HeadOrTailByRequest.source_id)
-  return _msg;
-}
-inline void HeadOrTailByRequest::set_allocated_source_id(::io::deephaven::proto::backplane::grpc::TableReference* value) {
-  ::google::protobuf::Arena* message_arena = GetArena();
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  if (message_arena == nullptr) {
-    delete reinterpret_cast<::io::deephaven::proto::backplane::grpc::TableReference*>(_impl_.source_id_);
-  }
-
-  if (value != nullptr) {
-    ::google::protobuf::Arena* submessage_arena = reinterpret_cast<::io::deephaven::proto::backplane::grpc::TableReference*>(value)->GetArena();
-    if (message_arena != submessage_arena) {
-      value = ::google::protobuf::internal::GetOwnedMessage(message_arena, value, submessage_arena);
-    }
-    _impl_._has_bits_[0] |= 0x00000002u;
-  } else {
-    _impl_._has_bits_[0] &= ~0x00000002u;
-  }
-
-  _impl_.source_id_ = reinterpret_cast<::io::deephaven::proto::backplane::grpc::TableReference*>(value);
-  // @@protoc_insertion_point(field_set_allocated:io.deephaven.proto.backplane.grpc.HeadOrTailByRequest.source_id)
-}
-
-// sint64 num_rows = 3 [jstype = JS_STRING];
-inline void HeadOrTailByRequest::clear_num_rows() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  _impl_.num_rows_ = ::int64_t{0};
-}
-inline ::int64_t HeadOrTailByRequest::num_rows() const {
-  // @@protoc_insertion_point(field_get:io.deephaven.proto.backplane.grpc.HeadOrTailByRequest.num_rows)
-  return _internal_num_rows();
-}
-inline void HeadOrTailByRequest::set_num_rows(::int64_t value) {
-  _internal_set_num_rows(value);
-  // @@protoc_insertion_point(field_set:io.deephaven.proto.backplane.grpc.HeadOrTailByRequest.num_rows)
-}
-inline ::int64_t HeadOrTailByRequest::_internal_num_rows() const {
-  PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race);
-  return _impl_.num_rows_;
-}
-inline void HeadOrTailByRequest::_internal_set_num_rows(::int64_t value) {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  ;
-  _impl_.num_rows_ = value;
-}
-
-// repeated string group_by_column_specs = 4;
-inline int HeadOrTailByRequest::_internal_group_by_column_specs_size() const {
-  return _internal_group_by_column_specs().size();
-}
-inline int HeadOrTailByRequest::group_by_column_specs_size() const {
-  return _internal_group_by_column_specs_size();
-}
-inline void HeadOrTailByRequest::clear_group_by_column_specs() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  _impl_.group_by_column_specs_.Clear();
-}
-inline std::string* HeadOrTailByRequest::add_group_by_column_specs()
-    ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  std::string* _s = _internal_mutable_group_by_column_specs()->Add();
-  // @@protoc_insertion_point(field_add_mutable:io.deephaven.proto.backplane.grpc.HeadOrTailByRequest.group_by_column_specs)
-  return _s;
-}
-inline const std::string& HeadOrTailByRequest::group_by_column_specs(int index) const
-    ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  // @@protoc_insertion_point(field_get:io.deephaven.proto.backplane.grpc.HeadOrTailByRequest.group_by_column_specs)
-  return _internal_group_by_column_specs().Get(index);
-}
-inline std::string* HeadOrTailByRequest::mutable_group_by_column_specs(int index)
-    ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  // @@protoc_insertion_point(field_mutable:io.deephaven.proto.backplane.grpc.HeadOrTailByRequest.group_by_column_specs)
-  return _internal_mutable_group_by_column_specs()->Mutable(index);
-}
-inline void HeadOrTailByRequest::set_group_by_column_specs(int index, const std::string& value) {
-  _internal_mutable_group_by_column_specs()->Mutable(index)->assign(value);
-  // @@protoc_insertion_point(field_set:io.deephaven.proto.backplane.grpc.HeadOrTailByRequest.group_by_column_specs)
-}
-inline void HeadOrTailByRequest::set_group_by_column_specs(int index, std::string&& value) {
-  _internal_mutable_group_by_column_specs()->Mutable(index)->assign(std::move(value));
-  // @@protoc_insertion_point(field_set:io.deephaven.proto.backplane.grpc.HeadOrTailByRequest.group_by_column_specs)
-}
-inline void HeadOrTailByRequest::set_group_by_column_specs(int index, const char* value) {
-  ABSL_DCHECK(value != nullptr);
-  _internal_mutable_group_by_column_specs()->Mutable(index)->assign(value);
-  // @@protoc_insertion_point(field_set_char:io.deephaven.proto.backplane.grpc.HeadOrTailByRequest.group_by_column_specs)
-}
-inline void HeadOrTailByRequest::set_group_by_column_specs(int index, const char* value,
-                              std::size_t size) {
-  _internal_mutable_group_by_column_specs()->Mutable(index)->assign(
-      reinterpret_cast<const char*>(value), size);
-  // @@protoc_insertion_point(field_set_pointer:io.deephaven.proto.backplane.grpc.HeadOrTailByRequest.group_by_column_specs)
-}
-inline void HeadOrTailByRequest::set_group_by_column_specs(int index, absl::string_view value) {
-  _internal_mutable_group_by_column_specs()->Mutable(index)->assign(value.data(),
-                                                     value.size());
-  // @@protoc_insertion_point(field_set_string_piece:io.deephaven.proto.backplane.grpc.HeadOrTailByRequest.group_by_column_specs)
-}
-inline void HeadOrTailByRequest::add_group_by_column_specs(const std::string& value) {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  _internal_mutable_group_by_column_specs()->Add()->assign(value);
-  // @@protoc_insertion_point(field_add:io.deephaven.proto.backplane.grpc.HeadOrTailByRequest.group_by_column_specs)
-}
-inline void HeadOrTailByRequest::add_group_by_column_specs(std::string&& value) {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  _internal_mutable_group_by_column_specs()->Add(std::move(value));
-  // @@protoc_insertion_point(field_add:io.deephaven.proto.backplane.grpc.HeadOrTailByRequest.group_by_column_specs)
-}
-inline void HeadOrTailByRequest::add_group_by_column_specs(const char* value) {
-  ABSL_DCHECK(value != nullptr);
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  _internal_mutable_group_by_column_specs()->Add()->assign(value);
-  // @@protoc_insertion_point(field_add_char:io.deephaven.proto.backplane.grpc.HeadOrTailByRequest.group_by_column_specs)
-}
-inline void HeadOrTailByRequest::add_group_by_column_specs(const char* value, std::size_t size) {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  _internal_mutable_group_by_column_specs()->Add()->assign(
-      reinterpret_cast<const char*>(value), size);
-  // @@protoc_insertion_point(field_add_pointer:io.deephaven.proto.backplane.grpc.HeadOrTailByRequest.group_by_column_specs)
-}
-inline void HeadOrTailByRequest::add_group_by_column_specs(absl::string_view value) {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  _internal_mutable_group_by_column_specs()->Add()->assign(value.data(), value.size());
-  // @@protoc_insertion_point(field_add_string_piece:io.deephaven.proto.backplane.grpc.HeadOrTailByRequest.group_by_column_specs)
-}
-inline const ::google::protobuf::RepeatedPtrField<std::string>&
-HeadOrTailByRequest::group_by_column_specs() const ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  // @@protoc_insertion_point(field_list:io.deephaven.proto.backplane.grpc.HeadOrTailByRequest.group_by_column_specs)
-  return _internal_group_by_column_specs();
-}
-inline ::google::protobuf::RepeatedPtrField<std::string>*
-HeadOrTailByRequest::mutable_group_by_column_specs() ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  // @@protoc_insertion_point(field_mutable_list:io.deephaven.proto.backplane.grpc.HeadOrTailByRequest.group_by_column_specs)
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  return _internal_mutable_group_by_column_specs();
-}
-inline const ::google::protobuf::RepeatedPtrField<std::string>&
-HeadOrTailByRequest::_internal_group_by_column_specs() const {
-  PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race);
-  return _impl_.group_by_column_specs_;
-}
-inline ::google::protobuf::RepeatedPtrField<std::string>*
-HeadOrTailByRequest::_internal_mutable_group_by_column_specs() {
-  PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race);
-  return &_impl_.group_by_column_specs_;
-}
-
-// -------------------------------------------------------------------
-
-// UngroupRequest
-
-// .io.deephaven.proto.backplane.grpc.Ticket result_id = 1;
-inline bool UngroupRequest::has_result_id() const {
-  bool value = (_impl_._has_bits_[0] & 0x00000001u) != 0;
-  PROTOBUF_ASSUME(!value || _impl_.result_id_ != nullptr);
-  return value;
-}
-inline const ::io::deephaven::proto::backplane::grpc::Ticket& UngroupRequest::_internal_result_id() const {
-  PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race);
-  const ::io::deephaven::proto::backplane::grpc::Ticket* p = _impl_.result_id_;
-  return p != nullptr ? *p : reinterpret_cast<const ::io::deephaven::proto::backplane::grpc::Ticket&>(::io::deephaven::proto::backplane::grpc::_Ticket_default_instance_);
-}
-inline const ::io::deephaven::proto::backplane::grpc::Ticket& UngroupRequest::result_id() const ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  // @@protoc_insertion_point(field_get:io.deephaven.proto.backplane.grpc.UngroupRequest.result_id)
-  return _internal_result_id();
-}
-inline void UngroupRequest::unsafe_arena_set_allocated_result_id(::io::deephaven::proto::backplane::grpc::Ticket* value) {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  if (GetArena() == nullptr) {
-    delete reinterpret_cast<::google::protobuf::MessageLite*>(_impl_.result_id_);
-  }
-  _impl_.result_id_ = reinterpret_cast<::io::deephaven::proto::backplane::grpc::Ticket*>(value);
-  if (value != nullptr) {
-    _impl_._has_bits_[0] |= 0x00000001u;
-  } else {
-    _impl_._has_bits_[0] &= ~0x00000001u;
-  }
-  // @@protoc_insertion_point(field_unsafe_arena_set_allocated:io.deephaven.proto.backplane.grpc.UngroupRequest.result_id)
-}
-inline ::io::deephaven::proto::backplane::grpc::Ticket* UngroupRequest::release_result_id() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-
-  _impl_._has_bits_[0] &= ~0x00000001u;
-  ::io::deephaven::proto::backplane::grpc::Ticket* released = _impl_.result_id_;
-  _impl_.result_id_ = nullptr;
-#ifdef PROTOBUF_FORCE_COPY_IN_RELEASE
-  auto* old = reinterpret_cast<::google::protobuf::MessageLite*>(released);
-  released = ::google::protobuf::internal::DuplicateIfNonNull(released);
-  if (GetArena() == nullptr) {
-    delete old;
-  }
-#else   // PROTOBUF_FORCE_COPY_IN_RELEASE
-  if (GetArena() != nullptr) {
-    released = ::google::protobuf::internal::DuplicateIfNonNull(released);
-  }
-#endif  // !PROTOBUF_FORCE_COPY_IN_RELEASE
-  return released;
-}
-inline ::io::deephaven::proto::backplane::grpc::Ticket* UngroupRequest::unsafe_arena_release_result_id() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  // @@protoc_insertion_point(field_release:io.deephaven.proto.backplane.grpc.UngroupRequest.result_id)
-
-  _impl_._has_bits_[0] &= ~0x00000001u;
-  ::io::deephaven::proto::backplane::grpc::Ticket* temp = _impl_.result_id_;
-  _impl_.result_id_ = nullptr;
-  return temp;
-}
-inline ::io::deephaven::proto::backplane::grpc::Ticket* UngroupRequest::_internal_mutable_result_id() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  _impl_._has_bits_[0] |= 0x00000001u;
-  if (_impl_.result_id_ == nullptr) {
-    auto* p = CreateMaybeMessage<::io::deephaven::proto::backplane::grpc::Ticket>(GetArena());
-    _impl_.result_id_ = reinterpret_cast<::io::deephaven::proto::backplane::grpc::Ticket*>(p);
-  }
-  return _impl_.result_id_;
-}
-inline ::io::deephaven::proto::backplane::grpc::Ticket* UngroupRequest::mutable_result_id() ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  ::io::deephaven::proto::backplane::grpc::Ticket* _msg = _internal_mutable_result_id();
-  // @@protoc_insertion_point(field_mutable:io.deephaven.proto.backplane.grpc.UngroupRequest.result_id)
-  return _msg;
-}
-inline void UngroupRequest::set_allocated_result_id(::io::deephaven::proto::backplane::grpc::Ticket* value) {
-  ::google::protobuf::Arena* message_arena = GetArena();
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  if (message_arena == nullptr) {
-    delete reinterpret_cast<::google::protobuf::MessageLite*>(_impl_.result_id_);
-  }
-
-  if (value != nullptr) {
-    ::google::protobuf::Arena* submessage_arena = reinterpret_cast<::google::protobuf::MessageLite*>(value)->GetArena();
-    if (message_arena != submessage_arena) {
-      value = ::google::protobuf::internal::GetOwnedMessage(message_arena, value, submessage_arena);
-    }
-    _impl_._has_bits_[0] |= 0x00000001u;
-  } else {
-    _impl_._has_bits_[0] &= ~0x00000001u;
-  }
-
-  _impl_.result_id_ = reinterpret_cast<::io::deephaven::proto::backplane::grpc::Ticket*>(value);
-  // @@protoc_insertion_point(field_set_allocated:io.deephaven.proto.backplane.grpc.UngroupRequest.result_id)
-}
-
-// .io.deephaven.proto.backplane.grpc.TableReference source_id = 2;
-inline bool UngroupRequest::has_source_id() const {
-  bool value = (_impl_._has_bits_[0] & 0x00000002u) != 0;
-  PROTOBUF_ASSUME(!value || _impl_.source_id_ != nullptr);
-  return value;
-}
-inline void UngroupRequest::clear_source_id() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  if (_impl_.source_id_ != nullptr) _impl_.source_id_->Clear();
-  _impl_._has_bits_[0] &= ~0x00000002u;
-}
-inline const ::io::deephaven::proto::backplane::grpc::TableReference& UngroupRequest::_internal_source_id() const {
-  PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race);
-  const ::io::deephaven::proto::backplane::grpc::TableReference* p = _impl_.source_id_;
-  return p != nullptr ? *p : reinterpret_cast<const ::io::deephaven::proto::backplane::grpc::TableReference&>(::io::deephaven::proto::backplane::grpc::_TableReference_default_instance_);
-}
-inline const ::io::deephaven::proto::backplane::grpc::TableReference& UngroupRequest::source_id() const ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  // @@protoc_insertion_point(field_get:io.deephaven.proto.backplane.grpc.UngroupRequest.source_id)
-  return _internal_source_id();
-}
-inline void UngroupRequest::unsafe_arena_set_allocated_source_id(::io::deephaven::proto::backplane::grpc::TableReference* value) {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  if (GetArena() == nullptr) {
-    delete reinterpret_cast<::google::protobuf::MessageLite*>(_impl_.source_id_);
-  }
-  _impl_.source_id_ = reinterpret_cast<::io::deephaven::proto::backplane::grpc::TableReference*>(value);
-  if (value != nullptr) {
-    _impl_._has_bits_[0] |= 0x00000002u;
-  } else {
-    _impl_._has_bits_[0] &= ~0x00000002u;
-  }
-  // @@protoc_insertion_point(field_unsafe_arena_set_allocated:io.deephaven.proto.backplane.grpc.UngroupRequest.source_id)
-}
-inline ::io::deephaven::proto::backplane::grpc::TableReference* UngroupRequest::release_source_id() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-
-  _impl_._has_bits_[0] &= ~0x00000002u;
-  ::io::deephaven::proto::backplane::grpc::TableReference* released = _impl_.source_id_;
-  _impl_.source_id_ = nullptr;
-#ifdef PROTOBUF_FORCE_COPY_IN_RELEASE
-  auto* old = reinterpret_cast<::google::protobuf::MessageLite*>(released);
-  released = ::google::protobuf::internal::DuplicateIfNonNull(released);
-  if (GetArena() == nullptr) {
-    delete old;
-  }
-#else   // PROTOBUF_FORCE_COPY_IN_RELEASE
-  if (GetArena() != nullptr) {
-    released = ::google::protobuf::internal::DuplicateIfNonNull(released);
-  }
-#endif  // !PROTOBUF_FORCE_COPY_IN_RELEASE
-  return released;
-}
-inline ::io::deephaven::proto::backplane::grpc::TableReference* UngroupRequest::unsafe_arena_release_source_id() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  // @@protoc_insertion_point(field_release:io.deephaven.proto.backplane.grpc.UngroupRequest.source_id)
-
-  _impl_._has_bits_[0] &= ~0x00000002u;
-  ::io::deephaven::proto::backplane::grpc::TableReference* temp = _impl_.source_id_;
-  _impl_.source_id_ = nullptr;
-  return temp;
-}
-inline ::io::deephaven::proto::backplane::grpc::TableReference* UngroupRequest::_internal_mutable_source_id() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  _impl_._has_bits_[0] |= 0x00000002u;
-  if (_impl_.source_id_ == nullptr) {
-    auto* p = CreateMaybeMessage<::io::deephaven::proto::backplane::grpc::TableReference>(GetArena());
-    _impl_.source_id_ = reinterpret_cast<::io::deephaven::proto::backplane::grpc::TableReference*>(p);
-  }
-  return _impl_.source_id_;
-}
-inline ::io::deephaven::proto::backplane::grpc::TableReference* UngroupRequest::mutable_source_id() ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  ::io::deephaven::proto::backplane::grpc::TableReference* _msg = _internal_mutable_source_id();
-  // @@protoc_insertion_point(field_mutable:io.deephaven.proto.backplane.grpc.UngroupRequest.source_id)
-  return _msg;
-}
-inline void UngroupRequest::set_allocated_source_id(::io::deephaven::proto::backplane::grpc::TableReference* value) {
-  ::google::protobuf::Arena* message_arena = GetArena();
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  if (message_arena == nullptr) {
-    delete reinterpret_cast<::io::deephaven::proto::backplane::grpc::TableReference*>(_impl_.source_id_);
-  }
-
-  if (value != nullptr) {
-    ::google::protobuf::Arena* submessage_arena = reinterpret_cast<::io::deephaven::proto::backplane::grpc::TableReference*>(value)->GetArena();
-    if (message_arena != submessage_arena) {
-      value = ::google::protobuf::internal::GetOwnedMessage(message_arena, value, submessage_arena);
-    }
-    _impl_._has_bits_[0] |= 0x00000002u;
-  } else {
-    _impl_._has_bits_[0] &= ~0x00000002u;
-  }
-
-  _impl_.source_id_ = reinterpret_cast<::io::deephaven::proto::backplane::grpc::TableReference*>(value);
-  // @@protoc_insertion_point(field_set_allocated:io.deephaven.proto.backplane.grpc.UngroupRequest.source_id)
-}
-
-// bool null_fill = 3;
-inline void UngroupRequest::clear_null_fill() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  _impl_.null_fill_ = false;
-}
-inline bool UngroupRequest::null_fill() const {
-  // @@protoc_insertion_point(field_get:io.deephaven.proto.backplane.grpc.UngroupRequest.null_fill)
-  return _internal_null_fill();
-}
-inline void UngroupRequest::set_null_fill(bool value) {
-  _internal_set_null_fill(value);
-  // @@protoc_insertion_point(field_set:io.deephaven.proto.backplane.grpc.UngroupRequest.null_fill)
-}
-inline bool UngroupRequest::_internal_null_fill() const {
-  PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race);
-  return _impl_.null_fill_;
-}
-inline void UngroupRequest::_internal_set_null_fill(bool value) {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  ;
-  _impl_.null_fill_ = value;
-}
-
-// repeated string columns_to_ungroup = 4;
-inline int UngroupRequest::_internal_columns_to_ungroup_size() const {
-  return _internal_columns_to_ungroup().size();
-}
-inline int UngroupRequest::columns_to_ungroup_size() const {
-  return _internal_columns_to_ungroup_size();
-}
-inline void UngroupRequest::clear_columns_to_ungroup() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  _impl_.columns_to_ungroup_.Clear();
-}
-inline std::string* UngroupRequest::add_columns_to_ungroup()
-    ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  std::string* _s = _internal_mutable_columns_to_ungroup()->Add();
-  // @@protoc_insertion_point(field_add_mutable:io.deephaven.proto.backplane.grpc.UngroupRequest.columns_to_ungroup)
-  return _s;
-}
-inline const std::string& UngroupRequest::columns_to_ungroup(int index) const
-    ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  // @@protoc_insertion_point(field_get:io.deephaven.proto.backplane.grpc.UngroupRequest.columns_to_ungroup)
-  return _internal_columns_to_ungroup().Get(index);
-}
-inline std::string* UngroupRequest::mutable_columns_to_ungroup(int index)
-    ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  // @@protoc_insertion_point(field_mutable:io.deephaven.proto.backplane.grpc.UngroupRequest.columns_to_ungroup)
-  return _internal_mutable_columns_to_ungroup()->Mutable(index);
-}
-inline void UngroupRequest::set_columns_to_ungroup(int index, const std::string& value) {
-  _internal_mutable_columns_to_ungroup()->Mutable(index)->assign(value);
-  // @@protoc_insertion_point(field_set:io.deephaven.proto.backplane.grpc.UngroupRequest.columns_to_ungroup)
-}
-inline void UngroupRequest::set_columns_to_ungroup(int index, std::string&& value) {
-  _internal_mutable_columns_to_ungroup()->Mutable(index)->assign(std::move(value));
-  // @@protoc_insertion_point(field_set:io.deephaven.proto.backplane.grpc.UngroupRequest.columns_to_ungroup)
-}
-inline void UngroupRequest::set_columns_to_ungroup(int index, const char* value) {
-  ABSL_DCHECK(value != nullptr);
-  _internal_mutable_columns_to_ungroup()->Mutable(index)->assign(value);
-  // @@protoc_insertion_point(field_set_char:io.deephaven.proto.backplane.grpc.UngroupRequest.columns_to_ungroup)
-}
-inline void UngroupRequest::set_columns_to_ungroup(int index, const char* value,
-                              std::size_t size) {
-  _internal_mutable_columns_to_ungroup()->Mutable(index)->assign(
-      reinterpret_cast<const char*>(value), size);
-  // @@protoc_insertion_point(field_set_pointer:io.deephaven.proto.backplane.grpc.UngroupRequest.columns_to_ungroup)
-}
-inline void UngroupRequest::set_columns_to_ungroup(int index, absl::string_view value) {
-  _internal_mutable_columns_to_ungroup()->Mutable(index)->assign(value.data(),
-                                                     value.size());
-  // @@protoc_insertion_point(field_set_string_piece:io.deephaven.proto.backplane.grpc.UngroupRequest.columns_to_ungroup)
-}
-inline void UngroupRequest::add_columns_to_ungroup(const std::string& value) {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  _internal_mutable_columns_to_ungroup()->Add()->assign(value);
-  // @@protoc_insertion_point(field_add:io.deephaven.proto.backplane.grpc.UngroupRequest.columns_to_ungroup)
-}
-inline void UngroupRequest::add_columns_to_ungroup(std::string&& value) {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  _internal_mutable_columns_to_ungroup()->Add(std::move(value));
-  // @@protoc_insertion_point(field_add:io.deephaven.proto.backplane.grpc.UngroupRequest.columns_to_ungroup)
-}
-inline void UngroupRequest::add_columns_to_ungroup(const char* value) {
-  ABSL_DCHECK(value != nullptr);
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  _internal_mutable_columns_to_ungroup()->Add()->assign(value);
-  // @@protoc_insertion_point(field_add_char:io.deephaven.proto.backplane.grpc.UngroupRequest.columns_to_ungroup)
-}
-inline void UngroupRequest::add_columns_to_ungroup(const char* value, std::size_t size) {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  _internal_mutable_columns_to_ungroup()->Add()->assign(
-      reinterpret_cast<const char*>(value), size);
-  // @@protoc_insertion_point(field_add_pointer:io.deephaven.proto.backplane.grpc.UngroupRequest.columns_to_ungroup)
-}
-inline void UngroupRequest::add_columns_to_ungroup(absl::string_view value) {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  _internal_mutable_columns_to_ungroup()->Add()->assign(value.data(), value.size());
-  // @@protoc_insertion_point(field_add_string_piece:io.deephaven.proto.backplane.grpc.UngroupRequest.columns_to_ungroup)
-}
-inline const ::google::protobuf::RepeatedPtrField<std::string>&
-UngroupRequest::columns_to_ungroup() const ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  // @@protoc_insertion_point(field_list:io.deephaven.proto.backplane.grpc.UngroupRequest.columns_to_ungroup)
-  return _internal_columns_to_ungroup();
-}
-inline ::google::protobuf::RepeatedPtrField<std::string>*
-UngroupRequest::mutable_columns_to_ungroup() ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  // @@protoc_insertion_point(field_mutable_list:io.deephaven.proto.backplane.grpc.UngroupRequest.columns_to_ungroup)
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  return _internal_mutable_columns_to_ungroup();
-}
-inline const ::google::protobuf::RepeatedPtrField<std::string>&
-UngroupRequest::_internal_columns_to_ungroup() const {
-  PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race);
-  return _impl_.columns_to_ungroup_;
-}
-inline ::google::protobuf::RepeatedPtrField<std::string>*
-UngroupRequest::_internal_mutable_columns_to_ungroup() {
-  PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race);
-  return &_impl_.columns_to_ungroup_;
-}
-
-// -------------------------------------------------------------------
-
-// MergeTablesRequest
-
-// .io.deephaven.proto.backplane.grpc.Ticket result_id = 1;
-inline bool MergeTablesRequest::has_result_id() const {
-  bool value = (_impl_._has_bits_[0] & 0x00000001u) != 0;
-  PROTOBUF_ASSUME(!value || _impl_.result_id_ != nullptr);
-  return value;
-}
-inline const ::io::deephaven::proto::backplane::grpc::Ticket& MergeTablesRequest::_internal_result_id() const {
-  PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race);
-  const ::io::deephaven::proto::backplane::grpc::Ticket* p = _impl_.result_id_;
-  return p != nullptr ? *p : reinterpret_cast<const ::io::deephaven::proto::backplane::grpc::Ticket&>(::io::deephaven::proto::backplane::grpc::_Ticket_default_instance_);
-}
-inline const ::io::deephaven::proto::backplane::grpc::Ticket& MergeTablesRequest::result_id() const ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  // @@protoc_insertion_point(field_get:io.deephaven.proto.backplane.grpc.MergeTablesRequest.result_id)
-  return _internal_result_id();
-}
-inline void MergeTablesRequest::unsafe_arena_set_allocated_result_id(::io::deephaven::proto::backplane::grpc::Ticket* value) {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  if (GetArena() == nullptr) {
-    delete reinterpret_cast<::google::protobuf::MessageLite*>(_impl_.result_id_);
-  }
-  _impl_.result_id_ = reinterpret_cast<::io::deephaven::proto::backplane::grpc::Ticket*>(value);
-  if (value != nullptr) {
-    _impl_._has_bits_[0] |= 0x00000001u;
-  } else {
-    _impl_._has_bits_[0] &= ~0x00000001u;
-  }
-  // @@protoc_insertion_point(field_unsafe_arena_set_allocated:io.deephaven.proto.backplane.grpc.MergeTablesRequest.result_id)
-}
-inline ::io::deephaven::proto::backplane::grpc::Ticket* MergeTablesRequest::release_result_id() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-
-  _impl_._has_bits_[0] &= ~0x00000001u;
-  ::io::deephaven::proto::backplane::grpc::Ticket* released = _impl_.result_id_;
-  _impl_.result_id_ = nullptr;
-#ifdef PROTOBUF_FORCE_COPY_IN_RELEASE
-  auto* old = reinterpret_cast<::google::protobuf::MessageLite*>(released);
-  released = ::google::protobuf::internal::DuplicateIfNonNull(released);
-  if (GetArena() == nullptr) {
-    delete old;
-  }
-#else   // PROTOBUF_FORCE_COPY_IN_RELEASE
-  if (GetArena() != nullptr) {
-    released = ::google::protobuf::internal::DuplicateIfNonNull(released);
-  }
-#endif  // !PROTOBUF_FORCE_COPY_IN_RELEASE
-  return released;
-}
-inline ::io::deephaven::proto::backplane::grpc::Ticket* MergeTablesRequest::unsafe_arena_release_result_id() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  // @@protoc_insertion_point(field_release:io.deephaven.proto.backplane.grpc.MergeTablesRequest.result_id)
-
-  _impl_._has_bits_[0] &= ~0x00000001u;
-  ::io::deephaven::proto::backplane::grpc::Ticket* temp = _impl_.result_id_;
-  _impl_.result_id_ = nullptr;
-  return temp;
-}
-inline ::io::deephaven::proto::backplane::grpc::Ticket* MergeTablesRequest::_internal_mutable_result_id() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  _impl_._has_bits_[0] |= 0x00000001u;
-  if (_impl_.result_id_ == nullptr) {
-    auto* p = CreateMaybeMessage<::io::deephaven::proto::backplane::grpc::Ticket>(GetArena());
-    _impl_.result_id_ = reinterpret_cast<::io::deephaven::proto::backplane::grpc::Ticket*>(p);
-  }
-  return _impl_.result_id_;
-}
-inline ::io::deephaven::proto::backplane::grpc::Ticket* MergeTablesRequest::mutable_result_id() ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  ::io::deephaven::proto::backplane::grpc::Ticket* _msg = _internal_mutable_result_id();
-  // @@protoc_insertion_point(field_mutable:io.deephaven.proto.backplane.grpc.MergeTablesRequest.result_id)
-  return _msg;
-}
-inline void MergeTablesRequest::set_allocated_result_id(::io::deephaven::proto::backplane::grpc::Ticket* value) {
-  ::google::protobuf::Arena* message_arena = GetArena();
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  if (message_arena == nullptr) {
-    delete reinterpret_cast<::google::protobuf::MessageLite*>(_impl_.result_id_);
-  }
-
-  if (value != nullptr) {
-    ::google::protobuf::Arena* submessage_arena = reinterpret_cast<::google::protobuf::MessageLite*>(value)->GetArena();
-    if (message_arena != submessage_arena) {
-      value = ::google::protobuf::internal::GetOwnedMessage(message_arena, value, submessage_arena);
-    }
-    _impl_._has_bits_[0] |= 0x00000001u;
-  } else {
-    _impl_._has_bits_[0] &= ~0x00000001u;
-  }
-
-  _impl_.result_id_ = reinterpret_cast<::io::deephaven::proto::backplane::grpc::Ticket*>(value);
-  // @@protoc_insertion_point(field_set_allocated:io.deephaven.proto.backplane.grpc.MergeTablesRequest.result_id)
-}
-
-// repeated .io.deephaven.proto.backplane.grpc.TableReference source_ids = 2;
-inline int MergeTablesRequest::_internal_source_ids_size() const {
-  return _internal_source_ids().size();
-}
-inline int MergeTablesRequest::source_ids_size() const {
-  return _internal_source_ids_size();
-}
-inline void MergeTablesRequest::clear_source_ids() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  _impl_.source_ids_.Clear();
-}
-inline ::io::deephaven::proto::backplane::grpc::TableReference* MergeTablesRequest::mutable_source_ids(int index)
-    ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  // @@protoc_insertion_point(field_mutable:io.deephaven.proto.backplane.grpc.MergeTablesRequest.source_ids)
-  return _internal_mutable_source_ids()->Mutable(index);
-}
-inline ::google::protobuf::RepeatedPtrField<::io::deephaven::proto::backplane::grpc::TableReference>* MergeTablesRequest::mutable_source_ids()
-    ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  // @@protoc_insertion_point(field_mutable_list:io.deephaven.proto.backplane.grpc.MergeTablesRequest.source_ids)
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  return _internal_mutable_source_ids();
-}
-inline const ::io::deephaven::proto::backplane::grpc::TableReference& MergeTablesRequest::source_ids(int index) const
-    ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  // @@protoc_insertion_point(field_get:io.deephaven.proto.backplane.grpc.MergeTablesRequest.source_ids)
-  return _internal_source_ids().Get(index);
-}
-inline ::io::deephaven::proto::backplane::grpc::TableReference* MergeTablesRequest::add_source_ids() ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  ::io::deephaven::proto::backplane::grpc::TableReference* _add = _internal_mutable_source_ids()->Add();
-  // @@protoc_insertion_point(field_add:io.deephaven.proto.backplane.grpc.MergeTablesRequest.source_ids)
-  return _add;
-}
-inline const ::google::protobuf::RepeatedPtrField<::io::deephaven::proto::backplane::grpc::TableReference>& MergeTablesRequest::source_ids() const
-    ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  // @@protoc_insertion_point(field_list:io.deephaven.proto.backplane.grpc.MergeTablesRequest.source_ids)
-  return _internal_source_ids();
-}
-inline const ::google::protobuf::RepeatedPtrField<::io::deephaven::proto::backplane::grpc::TableReference>&
-MergeTablesRequest::_internal_source_ids() const {
-  PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race);
-  return _impl_.source_ids_;
-}
-inline ::google::protobuf::RepeatedPtrField<::io::deephaven::proto::backplane::grpc::TableReference>*
-MergeTablesRequest::_internal_mutable_source_ids() {
-  PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race);
-  return &_impl_.source_ids_;
-}
-
-// string key_column = 3;
-inline void MergeTablesRequest::clear_key_column() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  _impl_.key_column_.ClearToEmpty();
-}
-inline const std::string& MergeTablesRequest::key_column() const
-    ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  // @@protoc_insertion_point(field_get:io.deephaven.proto.backplane.grpc.MergeTablesRequest.key_column)
-  return _internal_key_column();
-}
-template <typename Arg_, typename... Args_>
-inline PROTOBUF_ALWAYS_INLINE void MergeTablesRequest::set_key_column(Arg_&& arg,
-                                                     Args_... args) {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  ;
-  _impl_.key_column_.Set(static_cast<Arg_&&>(arg), args..., GetArena());
-  // @@protoc_insertion_point(field_set:io.deephaven.proto.backplane.grpc.MergeTablesRequest.key_column)
-}
-inline std::string* MergeTablesRequest::mutable_key_column() ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  std::string* _s = _internal_mutable_key_column();
-  // @@protoc_insertion_point(field_mutable:io.deephaven.proto.backplane.grpc.MergeTablesRequest.key_column)
-  return _s;
-}
-inline const std::string& MergeTablesRequest::_internal_key_column() const {
-  PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race);
-  return _impl_.key_column_.Get();
-}
-inline void MergeTablesRequest::_internal_set_key_column(const std::string& value) {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  ;
-  _impl_.key_column_.Set(value, GetArena());
-}
-inline std::string* MergeTablesRequest::_internal_mutable_key_column() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  ;
-  return _impl_.key_column_.Mutable( GetArena());
-}
-inline std::string* MergeTablesRequest::release_key_column() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  // @@protoc_insertion_point(field_release:io.deephaven.proto.backplane.grpc.MergeTablesRequest.key_column)
-  return _impl_.key_column_.Release();
-}
-inline void MergeTablesRequest::set_allocated_key_column(std::string* value) {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  _impl_.key_column_.SetAllocated(value, GetArena());
-  #ifdef PROTOBUF_FORCE_COPY_DEFAULT_STRING
-        if (_impl_.key_column_.IsDefault()) {
-          _impl_.key_column_.Set("", GetArena());
-        }
-  #endif  // PROTOBUF_FORCE_COPY_DEFAULT_STRING
-  // @@protoc_insertion_point(field_set_allocated:io.deephaven.proto.backplane.grpc.MergeTablesRequest.key_column)
-}
-
-// -------------------------------------------------------------------
-
-// SnapshotTableRequest
-
-// .io.deephaven.proto.backplane.grpc.Ticket result_id = 1;
-inline bool SnapshotTableRequest::has_result_id() const {
-  bool value = (_impl_._has_bits_[0] & 0x00000001u) != 0;
-  PROTOBUF_ASSUME(!value || _impl_.result_id_ != nullptr);
-  return value;
-}
-inline const ::io::deephaven::proto::backplane::grpc::Ticket& SnapshotTableRequest::_internal_result_id() const {
-  PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race);
-  const ::io::deephaven::proto::backplane::grpc::Ticket* p = _impl_.result_id_;
-  return p != nullptr ? *p : reinterpret_cast<const ::io::deephaven::proto::backplane::grpc::Ticket&>(::io::deephaven::proto::backplane::grpc::_Ticket_default_instance_);
-}
-inline const ::io::deephaven::proto::backplane::grpc::Ticket& SnapshotTableRequest::result_id() const ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  // @@protoc_insertion_point(field_get:io.deephaven.proto.backplane.grpc.SnapshotTableRequest.result_id)
-  return _internal_result_id();
-}
-inline void SnapshotTableRequest::unsafe_arena_set_allocated_result_id(::io::deephaven::proto::backplane::grpc::Ticket* value) {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  if (GetArena() == nullptr) {
-    delete reinterpret_cast<::google::protobuf::MessageLite*>(_impl_.result_id_);
-  }
-  _impl_.result_id_ = reinterpret_cast<::io::deephaven::proto::backplane::grpc::Ticket*>(value);
-  if (value != nullptr) {
-    _impl_._has_bits_[0] |= 0x00000001u;
-  } else {
-    _impl_._has_bits_[0] &= ~0x00000001u;
-  }
-  // @@protoc_insertion_point(field_unsafe_arena_set_allocated:io.deephaven.proto.backplane.grpc.SnapshotTableRequest.result_id)
-}
-inline ::io::deephaven::proto::backplane::grpc::Ticket* SnapshotTableRequest::release_result_id() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-
-  _impl_._has_bits_[0] &= ~0x00000001u;
-  ::io::deephaven::proto::backplane::grpc::Ticket* released = _impl_.result_id_;
-  _impl_.result_id_ = nullptr;
-#ifdef PROTOBUF_FORCE_COPY_IN_RELEASE
-  auto* old = reinterpret_cast<::google::protobuf::MessageLite*>(released);
-  released = ::google::protobuf::internal::DuplicateIfNonNull(released);
-  if (GetArena() == nullptr) {
-    delete old;
-  }
-#else   // PROTOBUF_FORCE_COPY_IN_RELEASE
-  if (GetArena() != nullptr) {
-    released = ::google::protobuf::internal::DuplicateIfNonNull(released);
-  }
-#endif  // !PROTOBUF_FORCE_COPY_IN_RELEASE
-  return released;
-}
-inline ::io::deephaven::proto::backplane::grpc::Ticket* SnapshotTableRequest::unsafe_arena_release_result_id() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  // @@protoc_insertion_point(field_release:io.deephaven.proto.backplane.grpc.SnapshotTableRequest.result_id)
-
-  _impl_._has_bits_[0] &= ~0x00000001u;
-  ::io::deephaven::proto::backplane::grpc::Ticket* temp = _impl_.result_id_;
-  _impl_.result_id_ = nullptr;
-  return temp;
-}
-inline ::io::deephaven::proto::backplane::grpc::Ticket* SnapshotTableRequest::_internal_mutable_result_id() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  _impl_._has_bits_[0] |= 0x00000001u;
-  if (_impl_.result_id_ == nullptr) {
-    auto* p = CreateMaybeMessage<::io::deephaven::proto::backplane::grpc::Ticket>(GetArena());
-    _impl_.result_id_ = reinterpret_cast<::io::deephaven::proto::backplane::grpc::Ticket*>(p);
-  }
-  return _impl_.result_id_;
-}
-inline ::io::deephaven::proto::backplane::grpc::Ticket* SnapshotTableRequest::mutable_result_id() ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  ::io::deephaven::proto::backplane::grpc::Ticket* _msg = _internal_mutable_result_id();
-  // @@protoc_insertion_point(field_mutable:io.deephaven.proto.backplane.grpc.SnapshotTableRequest.result_id)
-  return _msg;
-}
-inline void SnapshotTableRequest::set_allocated_result_id(::io::deephaven::proto::backplane::grpc::Ticket* value) {
-  ::google::protobuf::Arena* message_arena = GetArena();
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  if (message_arena == nullptr) {
-    delete reinterpret_cast<::google::protobuf::MessageLite*>(_impl_.result_id_);
-  }
-
-  if (value != nullptr) {
-    ::google::protobuf::Arena* submessage_arena = reinterpret_cast<::google::protobuf::MessageLite*>(value)->GetArena();
-    if (message_arena != submessage_arena) {
-      value = ::google::protobuf::internal::GetOwnedMessage(message_arena, value, submessage_arena);
-    }
-    _impl_._has_bits_[0] |= 0x00000001u;
-  } else {
-    _impl_._has_bits_[0] &= ~0x00000001u;
-  }
-
-  _impl_.result_id_ = reinterpret_cast<::io::deephaven::proto::backplane::grpc::Ticket*>(value);
-  // @@protoc_insertion_point(field_set_allocated:io.deephaven.proto.backplane.grpc.SnapshotTableRequest.result_id)
-}
-
-// .io.deephaven.proto.backplane.grpc.TableReference source_id = 2;
-inline bool SnapshotTableRequest::has_source_id() const {
-  bool value = (_impl_._has_bits_[0] & 0x00000002u) != 0;
-  PROTOBUF_ASSUME(!value || _impl_.source_id_ != nullptr);
-  return value;
-}
-inline void SnapshotTableRequest::clear_source_id() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  if (_impl_.source_id_ != nullptr) _impl_.source_id_->Clear();
-  _impl_._has_bits_[0] &= ~0x00000002u;
-}
-inline const ::io::deephaven::proto::backplane::grpc::TableReference& SnapshotTableRequest::_internal_source_id() const {
-  PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race);
-  const ::io::deephaven::proto::backplane::grpc::TableReference* p = _impl_.source_id_;
-  return p != nullptr ? *p : reinterpret_cast<const ::io::deephaven::proto::backplane::grpc::TableReference&>(::io::deephaven::proto::backplane::grpc::_TableReference_default_instance_);
-}
-inline const ::io::deephaven::proto::backplane::grpc::TableReference& SnapshotTableRequest::source_id() const ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  // @@protoc_insertion_point(field_get:io.deephaven.proto.backplane.grpc.SnapshotTableRequest.source_id)
-  return _internal_source_id();
-}
-inline void SnapshotTableRequest::unsafe_arena_set_allocated_source_id(::io::deephaven::proto::backplane::grpc::TableReference* value) {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  if (GetArena() == nullptr) {
-    delete reinterpret_cast<::google::protobuf::MessageLite*>(_impl_.source_id_);
-  }
-  _impl_.source_id_ = reinterpret_cast<::io::deephaven::proto::backplane::grpc::TableReference*>(value);
-  if (value != nullptr) {
-    _impl_._has_bits_[0] |= 0x00000002u;
-  } else {
-    _impl_._has_bits_[0] &= ~0x00000002u;
-  }
-  // @@protoc_insertion_point(field_unsafe_arena_set_allocated:io.deephaven.proto.backplane.grpc.SnapshotTableRequest.source_id)
-}
-inline ::io::deephaven::proto::backplane::grpc::TableReference* SnapshotTableRequest::release_source_id() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-
-  _impl_._has_bits_[0] &= ~0x00000002u;
-  ::io::deephaven::proto::backplane::grpc::TableReference* released = _impl_.source_id_;
-  _impl_.source_id_ = nullptr;
-#ifdef PROTOBUF_FORCE_COPY_IN_RELEASE
-  auto* old = reinterpret_cast<::google::protobuf::MessageLite*>(released);
-  released = ::google::protobuf::internal::DuplicateIfNonNull(released);
-  if (GetArena() == nullptr) {
-    delete old;
-  }
-#else   // PROTOBUF_FORCE_COPY_IN_RELEASE
-  if (GetArena() != nullptr) {
-    released = ::google::protobuf::internal::DuplicateIfNonNull(released);
-  }
-#endif  // !PROTOBUF_FORCE_COPY_IN_RELEASE
-  return released;
-}
-inline ::io::deephaven::proto::backplane::grpc::TableReference* SnapshotTableRequest::unsafe_arena_release_source_id() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  // @@protoc_insertion_point(field_release:io.deephaven.proto.backplane.grpc.SnapshotTableRequest.source_id)
-
-  _impl_._has_bits_[0] &= ~0x00000002u;
-  ::io::deephaven::proto::backplane::grpc::TableReference* temp = _impl_.source_id_;
-  _impl_.source_id_ = nullptr;
-  return temp;
-}
-inline ::io::deephaven::proto::backplane::grpc::TableReference* SnapshotTableRequest::_internal_mutable_source_id() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  _impl_._has_bits_[0] |= 0x00000002u;
-  if (_impl_.source_id_ == nullptr) {
-    auto* p = CreateMaybeMessage<::io::deephaven::proto::backplane::grpc::TableReference>(GetArena());
-    _impl_.source_id_ = reinterpret_cast<::io::deephaven::proto::backplane::grpc::TableReference*>(p);
-  }
-  return _impl_.source_id_;
-}
-inline ::io::deephaven::proto::backplane::grpc::TableReference* SnapshotTableRequest::mutable_source_id() ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  ::io::deephaven::proto::backplane::grpc::TableReference* _msg = _internal_mutable_source_id();
-  // @@protoc_insertion_point(field_mutable:io.deephaven.proto.backplane.grpc.SnapshotTableRequest.source_id)
-  return _msg;
-}
-inline void SnapshotTableRequest::set_allocated_source_id(::io::deephaven::proto::backplane::grpc::TableReference* value) {
-  ::google::protobuf::Arena* message_arena = GetArena();
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  if (message_arena == nullptr) {
-    delete reinterpret_cast<::io::deephaven::proto::backplane::grpc::TableReference*>(_impl_.source_id_);
-  }
-
-  if (value != nullptr) {
-    ::google::protobuf::Arena* submessage_arena = reinterpret_cast<::io::deephaven::proto::backplane::grpc::TableReference*>(value)->GetArena();
-    if (message_arena != submessage_arena) {
-      value = ::google::protobuf::internal::GetOwnedMessage(message_arena, value, submessage_arena);
-    }
-    _impl_._has_bits_[0] |= 0x00000002u;
-  } else {
-    _impl_._has_bits_[0] &= ~0x00000002u;
-  }
-
-  _impl_.source_id_ = reinterpret_cast<::io::deephaven::proto::backplane::grpc::TableReference*>(value);
-  // @@protoc_insertion_point(field_set_allocated:io.deephaven.proto.backplane.grpc.SnapshotTableRequest.source_id)
-}
-
-// -------------------------------------------------------------------
-
-// SnapshotWhenTableRequest
-
-// .io.deephaven.proto.backplane.grpc.Ticket result_id = 1;
-inline bool SnapshotWhenTableRequest::has_result_id() const {
-  bool value = (_impl_._has_bits_[0] & 0x00000001u) != 0;
-  PROTOBUF_ASSUME(!value || _impl_.result_id_ != nullptr);
-  return value;
-}
-inline const ::io::deephaven::proto::backplane::grpc::Ticket& SnapshotWhenTableRequest::_internal_result_id() const {
-  PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race);
-  const ::io::deephaven::proto::backplane::grpc::Ticket* p = _impl_.result_id_;
-  return p != nullptr ? *p : reinterpret_cast<const ::io::deephaven::proto::backplane::grpc::Ticket&>(::io::deephaven::proto::backplane::grpc::_Ticket_default_instance_);
-}
-inline const ::io::deephaven::proto::backplane::grpc::Ticket& SnapshotWhenTableRequest::result_id() const ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  // @@protoc_insertion_point(field_get:io.deephaven.proto.backplane.grpc.SnapshotWhenTableRequest.result_id)
-  return _internal_result_id();
-}
-inline void SnapshotWhenTableRequest::unsafe_arena_set_allocated_result_id(::io::deephaven::proto::backplane::grpc::Ticket* value) {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  if (GetArena() == nullptr) {
-    delete reinterpret_cast<::google::protobuf::MessageLite*>(_impl_.result_id_);
-  }
-  _impl_.result_id_ = reinterpret_cast<::io::deephaven::proto::backplane::grpc::Ticket*>(value);
-  if (value != nullptr) {
-    _impl_._has_bits_[0] |= 0x00000001u;
-  } else {
-    _impl_._has_bits_[0] &= ~0x00000001u;
-  }
-  // @@protoc_insertion_point(field_unsafe_arena_set_allocated:io.deephaven.proto.backplane.grpc.SnapshotWhenTableRequest.result_id)
-}
-inline ::io::deephaven::proto::backplane::grpc::Ticket* SnapshotWhenTableRequest::release_result_id() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-
-  _impl_._has_bits_[0] &= ~0x00000001u;
-  ::io::deephaven::proto::backplane::grpc::Ticket* released = _impl_.result_id_;
-  _impl_.result_id_ = nullptr;
-#ifdef PROTOBUF_FORCE_COPY_IN_RELEASE
-  auto* old = reinterpret_cast<::google::protobuf::MessageLite*>(released);
-  released = ::google::protobuf::internal::DuplicateIfNonNull(released);
-  if (GetArena() == nullptr) {
-    delete old;
-  }
-#else   // PROTOBUF_FORCE_COPY_IN_RELEASE
-  if (GetArena() != nullptr) {
-    released = ::google::protobuf::internal::DuplicateIfNonNull(released);
-  }
-#endif  // !PROTOBUF_FORCE_COPY_IN_RELEASE
-  return released;
-}
-inline ::io::deephaven::proto::backplane::grpc::Ticket* SnapshotWhenTableRequest::unsafe_arena_release_result_id() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  // @@protoc_insertion_point(field_release:io.deephaven.proto.backplane.grpc.SnapshotWhenTableRequest.result_id)
-
-  _impl_._has_bits_[0] &= ~0x00000001u;
-  ::io::deephaven::proto::backplane::grpc::Ticket* temp = _impl_.result_id_;
-  _impl_.result_id_ = nullptr;
-  return temp;
-}
-inline ::io::deephaven::proto::backplane::grpc::Ticket* SnapshotWhenTableRequest::_internal_mutable_result_id() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  _impl_._has_bits_[0] |= 0x00000001u;
-  if (_impl_.result_id_ == nullptr) {
-    auto* p = CreateMaybeMessage<::io::deephaven::proto::backplane::grpc::Ticket>(GetArena());
-    _impl_.result_id_ = reinterpret_cast<::io::deephaven::proto::backplane::grpc::Ticket*>(p);
-  }
-  return _impl_.result_id_;
-}
-inline ::io::deephaven::proto::backplane::grpc::Ticket* SnapshotWhenTableRequest::mutable_result_id() ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  ::io::deephaven::proto::backplane::grpc::Ticket* _msg = _internal_mutable_result_id();
-  // @@protoc_insertion_point(field_mutable:io.deephaven.proto.backplane.grpc.SnapshotWhenTableRequest.result_id)
-  return _msg;
-}
-inline void SnapshotWhenTableRequest::set_allocated_result_id(::io::deephaven::proto::backplane::grpc::Ticket* value) {
-  ::google::protobuf::Arena* message_arena = GetArena();
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  if (message_arena == nullptr) {
-    delete reinterpret_cast<::google::protobuf::MessageLite*>(_impl_.result_id_);
-  }
-
-  if (value != nullptr) {
-    ::google::protobuf::Arena* submessage_arena = reinterpret_cast<::google::protobuf::MessageLite*>(value)->GetArena();
-    if (message_arena != submessage_arena) {
-      value = ::google::protobuf::internal::GetOwnedMessage(message_arena, value, submessage_arena);
-    }
-    _impl_._has_bits_[0] |= 0x00000001u;
-  } else {
-    _impl_._has_bits_[0] &= ~0x00000001u;
-  }
-
-  _impl_.result_id_ = reinterpret_cast<::io::deephaven::proto::backplane::grpc::Ticket*>(value);
-  // @@protoc_insertion_point(field_set_allocated:io.deephaven.proto.backplane.grpc.SnapshotWhenTableRequest.result_id)
-}
-
-// .io.deephaven.proto.backplane.grpc.TableReference base_id = 2;
-inline bool SnapshotWhenTableRequest::has_base_id() const {
-  bool value = (_impl_._has_bits_[0] & 0x00000002u) != 0;
-  PROTOBUF_ASSUME(!value || _impl_.base_id_ != nullptr);
-  return value;
-}
-inline void SnapshotWhenTableRequest::clear_base_id() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  if (_impl_.base_id_ != nullptr) _impl_.base_id_->Clear();
-  _impl_._has_bits_[0] &= ~0x00000002u;
-}
-inline const ::io::deephaven::proto::backplane::grpc::TableReference& SnapshotWhenTableRequest::_internal_base_id() const {
-  PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race);
-  const ::io::deephaven::proto::backplane::grpc::TableReference* p = _impl_.base_id_;
-  return p != nullptr ? *p : reinterpret_cast<const ::io::deephaven::proto::backplane::grpc::TableReference&>(::io::deephaven::proto::backplane::grpc::_TableReference_default_instance_);
-}
-inline const ::io::deephaven::proto::backplane::grpc::TableReference& SnapshotWhenTableRequest::base_id() const ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  // @@protoc_insertion_point(field_get:io.deephaven.proto.backplane.grpc.SnapshotWhenTableRequest.base_id)
-  return _internal_base_id();
-}
-inline void SnapshotWhenTableRequest::unsafe_arena_set_allocated_base_id(::io::deephaven::proto::backplane::grpc::TableReference* value) {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  if (GetArena() == nullptr) {
-    delete reinterpret_cast<::google::protobuf::MessageLite*>(_impl_.base_id_);
-  }
-  _impl_.base_id_ = reinterpret_cast<::io::deephaven::proto::backplane::grpc::TableReference*>(value);
-  if (value != nullptr) {
-    _impl_._has_bits_[0] |= 0x00000002u;
-  } else {
-    _impl_._has_bits_[0] &= ~0x00000002u;
-  }
-  // @@protoc_insertion_point(field_unsafe_arena_set_allocated:io.deephaven.proto.backplane.grpc.SnapshotWhenTableRequest.base_id)
-}
-inline ::io::deephaven::proto::backplane::grpc::TableReference* SnapshotWhenTableRequest::release_base_id() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-
-  _impl_._has_bits_[0] &= ~0x00000002u;
-  ::io::deephaven::proto::backplane::grpc::TableReference* released = _impl_.base_id_;
-  _impl_.base_id_ = nullptr;
-#ifdef PROTOBUF_FORCE_COPY_IN_RELEASE
-  auto* old = reinterpret_cast<::google::protobuf::MessageLite*>(released);
-  released = ::google::protobuf::internal::DuplicateIfNonNull(released);
-  if (GetArena() == nullptr) {
-    delete old;
-  }
-#else   // PROTOBUF_FORCE_COPY_IN_RELEASE
-  if (GetArena() != nullptr) {
-    released = ::google::protobuf::internal::DuplicateIfNonNull(released);
-  }
-#endif  // !PROTOBUF_FORCE_COPY_IN_RELEASE
-  return released;
-}
-inline ::io::deephaven::proto::backplane::grpc::TableReference* SnapshotWhenTableRequest::unsafe_arena_release_base_id() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  // @@protoc_insertion_point(field_release:io.deephaven.proto.backplane.grpc.SnapshotWhenTableRequest.base_id)
-
-  _impl_._has_bits_[0] &= ~0x00000002u;
-  ::io::deephaven::proto::backplane::grpc::TableReference* temp = _impl_.base_id_;
-  _impl_.base_id_ = nullptr;
-  return temp;
-}
-inline ::io::deephaven::proto::backplane::grpc::TableReference* SnapshotWhenTableRequest::_internal_mutable_base_id() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  _impl_._has_bits_[0] |= 0x00000002u;
-  if (_impl_.base_id_ == nullptr) {
-    auto* p = CreateMaybeMessage<::io::deephaven::proto::backplane::grpc::TableReference>(GetArena());
-    _impl_.base_id_ = reinterpret_cast<::io::deephaven::proto::backplane::grpc::TableReference*>(p);
-  }
-  return _impl_.base_id_;
-}
-inline ::io::deephaven::proto::backplane::grpc::TableReference* SnapshotWhenTableRequest::mutable_base_id() ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  ::io::deephaven::proto::backplane::grpc::TableReference* _msg = _internal_mutable_base_id();
-  // @@protoc_insertion_point(field_mutable:io.deephaven.proto.backplane.grpc.SnapshotWhenTableRequest.base_id)
-  return _msg;
-}
-inline void SnapshotWhenTableRequest::set_allocated_base_id(::io::deephaven::proto::backplane::grpc::TableReference* value) {
-  ::google::protobuf::Arena* message_arena = GetArena();
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  if (message_arena == nullptr) {
-    delete reinterpret_cast<::io::deephaven::proto::backplane::grpc::TableReference*>(_impl_.base_id_);
-  }
-
-  if (value != nullptr) {
-    ::google::protobuf::Arena* submessage_arena = reinterpret_cast<::io::deephaven::proto::backplane::grpc::TableReference*>(value)->GetArena();
-    if (message_arena != submessage_arena) {
-      value = ::google::protobuf::internal::GetOwnedMessage(message_arena, value, submessage_arena);
-    }
-    _impl_._has_bits_[0] |= 0x00000002u;
-  } else {
-    _impl_._has_bits_[0] &= ~0x00000002u;
-  }
-
-  _impl_.base_id_ = reinterpret_cast<::io::deephaven::proto::backplane::grpc::TableReference*>(value);
-  // @@protoc_insertion_point(field_set_allocated:io.deephaven.proto.backplane.grpc.SnapshotWhenTableRequest.base_id)
-}
-
-// .io.deephaven.proto.backplane.grpc.TableReference trigger_id = 3;
-inline bool SnapshotWhenTableRequest::has_trigger_id() const {
-  bool value = (_impl_._has_bits_[0] & 0x00000004u) != 0;
-  PROTOBUF_ASSUME(!value || _impl_.trigger_id_ != nullptr);
-  return value;
-}
-inline void SnapshotWhenTableRequest::clear_trigger_id() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  if (_impl_.trigger_id_ != nullptr) _impl_.trigger_id_->Clear();
-  _impl_._has_bits_[0] &= ~0x00000004u;
-}
-inline const ::io::deephaven::proto::backplane::grpc::TableReference& SnapshotWhenTableRequest::_internal_trigger_id() const {
-  PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race);
-  const ::io::deephaven::proto::backplane::grpc::TableReference* p = _impl_.trigger_id_;
-  return p != nullptr ? *p : reinterpret_cast<const ::io::deephaven::proto::backplane::grpc::TableReference&>(::io::deephaven::proto::backplane::grpc::_TableReference_default_instance_);
-}
-inline const ::io::deephaven::proto::backplane::grpc::TableReference& SnapshotWhenTableRequest::trigger_id() const ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  // @@protoc_insertion_point(field_get:io.deephaven.proto.backplane.grpc.SnapshotWhenTableRequest.trigger_id)
-  return _internal_trigger_id();
-}
-inline void SnapshotWhenTableRequest::unsafe_arena_set_allocated_trigger_id(::io::deephaven::proto::backplane::grpc::TableReference* value) {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  if (GetArena() == nullptr) {
-    delete reinterpret_cast<::google::protobuf::MessageLite*>(_impl_.trigger_id_);
-  }
-  _impl_.trigger_id_ = reinterpret_cast<::io::deephaven::proto::backplane::grpc::TableReference*>(value);
-  if (value != nullptr) {
-    _impl_._has_bits_[0] |= 0x00000004u;
-  } else {
-    _impl_._has_bits_[0] &= ~0x00000004u;
-  }
-  // @@protoc_insertion_point(field_unsafe_arena_set_allocated:io.deephaven.proto.backplane.grpc.SnapshotWhenTableRequest.trigger_id)
-}
-inline ::io::deephaven::proto::backplane::grpc::TableReference* SnapshotWhenTableRequest::release_trigger_id() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-
-  _impl_._has_bits_[0] &= ~0x00000004u;
-  ::io::deephaven::proto::backplane::grpc::TableReference* released = _impl_.trigger_id_;
-  _impl_.trigger_id_ = nullptr;
-#ifdef PROTOBUF_FORCE_COPY_IN_RELEASE
-  auto* old = reinterpret_cast<::google::protobuf::MessageLite*>(released);
-  released = ::google::protobuf::internal::DuplicateIfNonNull(released);
-  if (GetArena() == nullptr) {
-    delete old;
-  }
-#else   // PROTOBUF_FORCE_COPY_IN_RELEASE
-  if (GetArena() != nullptr) {
-    released = ::google::protobuf::internal::DuplicateIfNonNull(released);
-  }
-#endif  // !PROTOBUF_FORCE_COPY_IN_RELEASE
-  return released;
-}
-inline ::io::deephaven::proto::backplane::grpc::TableReference* SnapshotWhenTableRequest::unsafe_arena_release_trigger_id() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  // @@protoc_insertion_point(field_release:io.deephaven.proto.backplane.grpc.SnapshotWhenTableRequest.trigger_id)
-
-  _impl_._has_bits_[0] &= ~0x00000004u;
-  ::io::deephaven::proto::backplane::grpc::TableReference* temp = _impl_.trigger_id_;
-  _impl_.trigger_id_ = nullptr;
-  return temp;
-}
-inline ::io::deephaven::proto::backplane::grpc::TableReference* SnapshotWhenTableRequest::_internal_mutable_trigger_id() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  _impl_._has_bits_[0] |= 0x00000004u;
-  if (_impl_.trigger_id_ == nullptr) {
-    auto* p = CreateMaybeMessage<::io::deephaven::proto::backplane::grpc::TableReference>(GetArena());
-    _impl_.trigger_id_ = reinterpret_cast<::io::deephaven::proto::backplane::grpc::TableReference*>(p);
-  }
-  return _impl_.trigger_id_;
-}
-inline ::io::deephaven::proto::backplane::grpc::TableReference* SnapshotWhenTableRequest::mutable_trigger_id() ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  ::io::deephaven::proto::backplane::grpc::TableReference* _msg = _internal_mutable_trigger_id();
-  // @@protoc_insertion_point(field_mutable:io.deephaven.proto.backplane.grpc.SnapshotWhenTableRequest.trigger_id)
-  return _msg;
-}
-inline void SnapshotWhenTableRequest::set_allocated_trigger_id(::io::deephaven::proto::backplane::grpc::TableReference* value) {
-  ::google::protobuf::Arena* message_arena = GetArena();
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  if (message_arena == nullptr) {
-    delete reinterpret_cast<::io::deephaven::proto::backplane::grpc::TableReference*>(_impl_.trigger_id_);
-  }
-
-  if (value != nullptr) {
-    ::google::protobuf::Arena* submessage_arena = reinterpret_cast<::io::deephaven::proto::backplane::grpc::TableReference*>(value)->GetArena();
-    if (message_arena != submessage_arena) {
-      value = ::google::protobuf::internal::GetOwnedMessage(message_arena, value, submessage_arena);
-    }
-    _impl_._has_bits_[0] |= 0x00000004u;
-  } else {
-    _impl_._has_bits_[0] &= ~0x00000004u;
-  }
-
-  _impl_.trigger_id_ = reinterpret_cast<::io::deephaven::proto::backplane::grpc::TableReference*>(value);
-  // @@protoc_insertion_point(field_set_allocated:io.deephaven.proto.backplane.grpc.SnapshotWhenTableRequest.trigger_id)
-}
-
-// bool initial = 4;
-inline void SnapshotWhenTableRequest::clear_initial() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  _impl_.initial_ = false;
-}
-inline bool SnapshotWhenTableRequest::initial() const {
-  // @@protoc_insertion_point(field_get:io.deephaven.proto.backplane.grpc.SnapshotWhenTableRequest.initial)
-  return _internal_initial();
-}
-inline void SnapshotWhenTableRequest::set_initial(bool value) {
-  _internal_set_initial(value);
-  // @@protoc_insertion_point(field_set:io.deephaven.proto.backplane.grpc.SnapshotWhenTableRequest.initial)
-}
-inline bool SnapshotWhenTableRequest::_internal_initial() const {
-  PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race);
-  return _impl_.initial_;
-}
-inline void SnapshotWhenTableRequest::_internal_set_initial(bool value) {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  ;
-  _impl_.initial_ = value;
-}
-
-// bool incremental = 5;
-inline void SnapshotWhenTableRequest::clear_incremental() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  _impl_.incremental_ = false;
-}
-inline bool SnapshotWhenTableRequest::incremental() const {
-  // @@protoc_insertion_point(field_get:io.deephaven.proto.backplane.grpc.SnapshotWhenTableRequest.incremental)
-  return _internal_incremental();
-}
-inline void SnapshotWhenTableRequest::set_incremental(bool value) {
-  _internal_set_incremental(value);
-  // @@protoc_insertion_point(field_set:io.deephaven.proto.backplane.grpc.SnapshotWhenTableRequest.incremental)
-}
-inline bool SnapshotWhenTableRequest::_internal_incremental() const {
-  PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race);
-  return _impl_.incremental_;
-}
-inline void SnapshotWhenTableRequest::_internal_set_incremental(bool value) {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  ;
-  _impl_.incremental_ = value;
-}
-
-// bool history = 6;
-inline void SnapshotWhenTableRequest::clear_history() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  _impl_.history_ = false;
-}
-inline bool SnapshotWhenTableRequest::history() const {
-  // @@protoc_insertion_point(field_get:io.deephaven.proto.backplane.grpc.SnapshotWhenTableRequest.history)
-  return _internal_history();
-}
-inline void SnapshotWhenTableRequest::set_history(bool value) {
-  _internal_set_history(value);
-  // @@protoc_insertion_point(field_set:io.deephaven.proto.backplane.grpc.SnapshotWhenTableRequest.history)
-}
-inline bool SnapshotWhenTableRequest::_internal_history() const {
-  PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race);
-  return _impl_.history_;
-}
-inline void SnapshotWhenTableRequest::_internal_set_history(bool value) {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  ;
-  _impl_.history_ = value;
-}
-
-// repeated string stamp_columns = 7;
-inline int SnapshotWhenTableRequest::_internal_stamp_columns_size() const {
-  return _internal_stamp_columns().size();
-}
-inline int SnapshotWhenTableRequest::stamp_columns_size() const {
-  return _internal_stamp_columns_size();
-}
-inline void SnapshotWhenTableRequest::clear_stamp_columns() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  _impl_.stamp_columns_.Clear();
-}
-inline std::string* SnapshotWhenTableRequest::add_stamp_columns()
-    ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  std::string* _s = _internal_mutable_stamp_columns()->Add();
-  // @@protoc_insertion_point(field_add_mutable:io.deephaven.proto.backplane.grpc.SnapshotWhenTableRequest.stamp_columns)
-  return _s;
-}
-inline const std::string& SnapshotWhenTableRequest::stamp_columns(int index) const
-    ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  // @@protoc_insertion_point(field_get:io.deephaven.proto.backplane.grpc.SnapshotWhenTableRequest.stamp_columns)
-  return _internal_stamp_columns().Get(index);
-}
-inline std::string* SnapshotWhenTableRequest::mutable_stamp_columns(int index)
-    ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  // @@protoc_insertion_point(field_mutable:io.deephaven.proto.backplane.grpc.SnapshotWhenTableRequest.stamp_columns)
-  return _internal_mutable_stamp_columns()->Mutable(index);
-}
-inline void SnapshotWhenTableRequest::set_stamp_columns(int index, const std::string& value) {
-  _internal_mutable_stamp_columns()->Mutable(index)->assign(value);
-  // @@protoc_insertion_point(field_set:io.deephaven.proto.backplane.grpc.SnapshotWhenTableRequest.stamp_columns)
-}
-inline void SnapshotWhenTableRequest::set_stamp_columns(int index, std::string&& value) {
-  _internal_mutable_stamp_columns()->Mutable(index)->assign(std::move(value));
-  // @@protoc_insertion_point(field_set:io.deephaven.proto.backplane.grpc.SnapshotWhenTableRequest.stamp_columns)
-}
-inline void SnapshotWhenTableRequest::set_stamp_columns(int index, const char* value) {
-  ABSL_DCHECK(value != nullptr);
-  _internal_mutable_stamp_columns()->Mutable(index)->assign(value);
-  // @@protoc_insertion_point(field_set_char:io.deephaven.proto.backplane.grpc.SnapshotWhenTableRequest.stamp_columns)
-}
-inline void SnapshotWhenTableRequest::set_stamp_columns(int index, const char* value,
-                              std::size_t size) {
-  _internal_mutable_stamp_columns()->Mutable(index)->assign(
-      reinterpret_cast<const char*>(value), size);
-  // @@protoc_insertion_point(field_set_pointer:io.deephaven.proto.backplane.grpc.SnapshotWhenTableRequest.stamp_columns)
-}
-inline void SnapshotWhenTableRequest::set_stamp_columns(int index, absl::string_view value) {
-  _internal_mutable_stamp_columns()->Mutable(index)->assign(value.data(),
-                                                     value.size());
-  // @@protoc_insertion_point(field_set_string_piece:io.deephaven.proto.backplane.grpc.SnapshotWhenTableRequest.stamp_columns)
-}
-inline void SnapshotWhenTableRequest::add_stamp_columns(const std::string& value) {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  _internal_mutable_stamp_columns()->Add()->assign(value);
-  // @@protoc_insertion_point(field_add:io.deephaven.proto.backplane.grpc.SnapshotWhenTableRequest.stamp_columns)
-}
-inline void SnapshotWhenTableRequest::add_stamp_columns(std::string&& value) {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  _internal_mutable_stamp_columns()->Add(std::move(value));
-  // @@protoc_insertion_point(field_add:io.deephaven.proto.backplane.grpc.SnapshotWhenTableRequest.stamp_columns)
-}
-inline void SnapshotWhenTableRequest::add_stamp_columns(const char* value) {
-  ABSL_DCHECK(value != nullptr);
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  _internal_mutable_stamp_columns()->Add()->assign(value);
-  // @@protoc_insertion_point(field_add_char:io.deephaven.proto.backplane.grpc.SnapshotWhenTableRequest.stamp_columns)
-}
-inline void SnapshotWhenTableRequest::add_stamp_columns(const char* value, std::size_t size) {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  _internal_mutable_stamp_columns()->Add()->assign(
-      reinterpret_cast<const char*>(value), size);
-  // @@protoc_insertion_point(field_add_pointer:io.deephaven.proto.backplane.grpc.SnapshotWhenTableRequest.stamp_columns)
-}
-inline void SnapshotWhenTableRequest::add_stamp_columns(absl::string_view value) {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  _internal_mutable_stamp_columns()->Add()->assign(value.data(), value.size());
-  // @@protoc_insertion_point(field_add_string_piece:io.deephaven.proto.backplane.grpc.SnapshotWhenTableRequest.stamp_columns)
-}
-inline const ::google::protobuf::RepeatedPtrField<std::string>&
-SnapshotWhenTableRequest::stamp_columns() const ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  // @@protoc_insertion_point(field_list:io.deephaven.proto.backplane.grpc.SnapshotWhenTableRequest.stamp_columns)
-  return _internal_stamp_columns();
-}
-inline ::google::protobuf::RepeatedPtrField<std::string>*
-SnapshotWhenTableRequest::mutable_stamp_columns() ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  // @@protoc_insertion_point(field_mutable_list:io.deephaven.proto.backplane.grpc.SnapshotWhenTableRequest.stamp_columns)
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  return _internal_mutable_stamp_columns();
-}
-inline const ::google::protobuf::RepeatedPtrField<std::string>&
-SnapshotWhenTableRequest::_internal_stamp_columns() const {
-  PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race);
-  return _impl_.stamp_columns_;
-}
-inline ::google::protobuf::RepeatedPtrField<std::string>*
-SnapshotWhenTableRequest::_internal_mutable_stamp_columns() {
-  PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race);
-  return &_impl_.stamp_columns_;
-}
-
-// -------------------------------------------------------------------
-
-// CrossJoinTablesRequest
-
-// .io.deephaven.proto.backplane.grpc.Ticket result_id = 1;
-inline bool CrossJoinTablesRequest::has_result_id() const {
-  bool value = (_impl_._has_bits_[0] & 0x00000001u) != 0;
-  PROTOBUF_ASSUME(!value || _impl_.result_id_ != nullptr);
-  return value;
-}
-inline const ::io::deephaven::proto::backplane::grpc::Ticket& CrossJoinTablesRequest::_internal_result_id() const {
-  PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race);
-  const ::io::deephaven::proto::backplane::grpc::Ticket* p = _impl_.result_id_;
-  return p != nullptr ? *p : reinterpret_cast<const ::io::deephaven::proto::backplane::grpc::Ticket&>(::io::deephaven::proto::backplane::grpc::_Ticket_default_instance_);
-}
-inline const ::io::deephaven::proto::backplane::grpc::Ticket& CrossJoinTablesRequest::result_id() const ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  // @@protoc_insertion_point(field_get:io.deephaven.proto.backplane.grpc.CrossJoinTablesRequest.result_id)
-  return _internal_result_id();
-}
-inline void CrossJoinTablesRequest::unsafe_arena_set_allocated_result_id(::io::deephaven::proto::backplane::grpc::Ticket* value) {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  if (GetArena() == nullptr) {
-    delete reinterpret_cast<::google::protobuf::MessageLite*>(_impl_.result_id_);
-  }
-  _impl_.result_id_ = reinterpret_cast<::io::deephaven::proto::backplane::grpc::Ticket*>(value);
-  if (value != nullptr) {
-    _impl_._has_bits_[0] |= 0x00000001u;
-  } else {
-    _impl_._has_bits_[0] &= ~0x00000001u;
-  }
-  // @@protoc_insertion_point(field_unsafe_arena_set_allocated:io.deephaven.proto.backplane.grpc.CrossJoinTablesRequest.result_id)
-}
-inline ::io::deephaven::proto::backplane::grpc::Ticket* CrossJoinTablesRequest::release_result_id() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-
-  _impl_._has_bits_[0] &= ~0x00000001u;
-  ::io::deephaven::proto::backplane::grpc::Ticket* released = _impl_.result_id_;
-  _impl_.result_id_ = nullptr;
-#ifdef PROTOBUF_FORCE_COPY_IN_RELEASE
-  auto* old = reinterpret_cast<::google::protobuf::MessageLite*>(released);
-  released = ::google::protobuf::internal::DuplicateIfNonNull(released);
-  if (GetArena() == nullptr) {
-    delete old;
-  }
-#else   // PROTOBUF_FORCE_COPY_IN_RELEASE
-  if (GetArena() != nullptr) {
-    released = ::google::protobuf::internal::DuplicateIfNonNull(released);
-  }
-#endif  // !PROTOBUF_FORCE_COPY_IN_RELEASE
-  return released;
-}
-inline ::io::deephaven::proto::backplane::grpc::Ticket* CrossJoinTablesRequest::unsafe_arena_release_result_id() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  // @@protoc_insertion_point(field_release:io.deephaven.proto.backplane.grpc.CrossJoinTablesRequest.result_id)
-
-  _impl_._has_bits_[0] &= ~0x00000001u;
-  ::io::deephaven::proto::backplane::grpc::Ticket* temp = _impl_.result_id_;
-  _impl_.result_id_ = nullptr;
-  return temp;
-}
-inline ::io::deephaven::proto::backplane::grpc::Ticket* CrossJoinTablesRequest::_internal_mutable_result_id() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  _impl_._has_bits_[0] |= 0x00000001u;
-  if (_impl_.result_id_ == nullptr) {
-    auto* p = CreateMaybeMessage<::io::deephaven::proto::backplane::grpc::Ticket>(GetArena());
-    _impl_.result_id_ = reinterpret_cast<::io::deephaven::proto::backplane::grpc::Ticket*>(p);
-  }
-  return _impl_.result_id_;
-}
-inline ::io::deephaven::proto::backplane::grpc::Ticket* CrossJoinTablesRequest::mutable_result_id() ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  ::io::deephaven::proto::backplane::grpc::Ticket* _msg = _internal_mutable_result_id();
-  // @@protoc_insertion_point(field_mutable:io.deephaven.proto.backplane.grpc.CrossJoinTablesRequest.result_id)
-  return _msg;
-}
-inline void CrossJoinTablesRequest::set_allocated_result_id(::io::deephaven::proto::backplane::grpc::Ticket* value) {
-  ::google::protobuf::Arena* message_arena = GetArena();
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  if (message_arena == nullptr) {
-    delete reinterpret_cast<::google::protobuf::MessageLite*>(_impl_.result_id_);
-  }
-
-  if (value != nullptr) {
-    ::google::protobuf::Arena* submessage_arena = reinterpret_cast<::google::protobuf::MessageLite*>(value)->GetArena();
-    if (message_arena != submessage_arena) {
-      value = ::google::protobuf::internal::GetOwnedMessage(message_arena, value, submessage_arena);
-    }
-    _impl_._has_bits_[0] |= 0x00000001u;
-  } else {
-    _impl_._has_bits_[0] &= ~0x00000001u;
-  }
-
-  _impl_.result_id_ = reinterpret_cast<::io::deephaven::proto::backplane::grpc::Ticket*>(value);
-  // @@protoc_insertion_point(field_set_allocated:io.deephaven.proto.backplane.grpc.CrossJoinTablesRequest.result_id)
-}
-
-// .io.deephaven.proto.backplane.grpc.TableReference left_id = 2;
-inline bool CrossJoinTablesRequest::has_left_id() const {
-  bool value = (_impl_._has_bits_[0] & 0x00000002u) != 0;
-  PROTOBUF_ASSUME(!value || _impl_.left_id_ != nullptr);
-  return value;
-}
-inline void CrossJoinTablesRequest::clear_left_id() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  if (_impl_.left_id_ != nullptr) _impl_.left_id_->Clear();
-  _impl_._has_bits_[0] &= ~0x00000002u;
-}
-inline const ::io::deephaven::proto::backplane::grpc::TableReference& CrossJoinTablesRequest::_internal_left_id() const {
-  PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race);
-  const ::io::deephaven::proto::backplane::grpc::TableReference* p = _impl_.left_id_;
-  return p != nullptr ? *p : reinterpret_cast<const ::io::deephaven::proto::backplane::grpc::TableReference&>(::io::deephaven::proto::backplane::grpc::_TableReference_default_instance_);
-}
-inline const ::io::deephaven::proto::backplane::grpc::TableReference& CrossJoinTablesRequest::left_id() const ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  // @@protoc_insertion_point(field_get:io.deephaven.proto.backplane.grpc.CrossJoinTablesRequest.left_id)
-  return _internal_left_id();
-}
-inline void CrossJoinTablesRequest::unsafe_arena_set_allocated_left_id(::io::deephaven::proto::backplane::grpc::TableReference* value) {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  if (GetArena() == nullptr) {
-    delete reinterpret_cast<::google::protobuf::MessageLite*>(_impl_.left_id_);
-  }
-  _impl_.left_id_ = reinterpret_cast<::io::deephaven::proto::backplane::grpc::TableReference*>(value);
-  if (value != nullptr) {
-    _impl_._has_bits_[0] |= 0x00000002u;
-  } else {
-    _impl_._has_bits_[0] &= ~0x00000002u;
-  }
-  // @@protoc_insertion_point(field_unsafe_arena_set_allocated:io.deephaven.proto.backplane.grpc.CrossJoinTablesRequest.left_id)
-}
-inline ::io::deephaven::proto::backplane::grpc::TableReference* CrossJoinTablesRequest::release_left_id() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-
-  _impl_._has_bits_[0] &= ~0x00000002u;
-  ::io::deephaven::proto::backplane::grpc::TableReference* released = _impl_.left_id_;
-  _impl_.left_id_ = nullptr;
-#ifdef PROTOBUF_FORCE_COPY_IN_RELEASE
-  auto* old = reinterpret_cast<::google::protobuf::MessageLite*>(released);
-  released = ::google::protobuf::internal::DuplicateIfNonNull(released);
-  if (GetArena() == nullptr) {
-    delete old;
-  }
-#else   // PROTOBUF_FORCE_COPY_IN_RELEASE
-  if (GetArena() != nullptr) {
-    released = ::google::protobuf::internal::DuplicateIfNonNull(released);
-  }
-#endif  // !PROTOBUF_FORCE_COPY_IN_RELEASE
-  return released;
-}
-inline ::io::deephaven::proto::backplane::grpc::TableReference* CrossJoinTablesRequest::unsafe_arena_release_left_id() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  // @@protoc_insertion_point(field_release:io.deephaven.proto.backplane.grpc.CrossJoinTablesRequest.left_id)
-
-  _impl_._has_bits_[0] &= ~0x00000002u;
-  ::io::deephaven::proto::backplane::grpc::TableReference* temp = _impl_.left_id_;
-  _impl_.left_id_ = nullptr;
-  return temp;
-}
-inline ::io::deephaven::proto::backplane::grpc::TableReference* CrossJoinTablesRequest::_internal_mutable_left_id() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  _impl_._has_bits_[0] |= 0x00000002u;
-  if (_impl_.left_id_ == nullptr) {
-    auto* p = CreateMaybeMessage<::io::deephaven::proto::backplane::grpc::TableReference>(GetArena());
-    _impl_.left_id_ = reinterpret_cast<::io::deephaven::proto::backplane::grpc::TableReference*>(p);
-  }
-  return _impl_.left_id_;
-}
-inline ::io::deephaven::proto::backplane::grpc::TableReference* CrossJoinTablesRequest::mutable_left_id() ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  ::io::deephaven::proto::backplane::grpc::TableReference* _msg = _internal_mutable_left_id();
-  // @@protoc_insertion_point(field_mutable:io.deephaven.proto.backplane.grpc.CrossJoinTablesRequest.left_id)
-  return _msg;
-}
-inline void CrossJoinTablesRequest::set_allocated_left_id(::io::deephaven::proto::backplane::grpc::TableReference* value) {
-  ::google::protobuf::Arena* message_arena = GetArena();
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  if (message_arena == nullptr) {
-    delete reinterpret_cast<::io::deephaven::proto::backplane::grpc::TableReference*>(_impl_.left_id_);
-  }
-
-  if (value != nullptr) {
-    ::google::protobuf::Arena* submessage_arena = reinterpret_cast<::io::deephaven::proto::backplane::grpc::TableReference*>(value)->GetArena();
-    if (message_arena != submessage_arena) {
-      value = ::google::protobuf::internal::GetOwnedMessage(message_arena, value, submessage_arena);
-    }
-    _impl_._has_bits_[0] |= 0x00000002u;
-  } else {
-    _impl_._has_bits_[0] &= ~0x00000002u;
-  }
-
-  _impl_.left_id_ = reinterpret_cast<::io::deephaven::proto::backplane::grpc::TableReference*>(value);
-  // @@protoc_insertion_point(field_set_allocated:io.deephaven.proto.backplane.grpc.CrossJoinTablesRequest.left_id)
-}
-
-// .io.deephaven.proto.backplane.grpc.TableReference right_id = 3;
-inline bool CrossJoinTablesRequest::has_right_id() const {
-  bool value = (_impl_._has_bits_[0] & 0x00000004u) != 0;
-  PROTOBUF_ASSUME(!value || _impl_.right_id_ != nullptr);
-  return value;
-}
-inline void CrossJoinTablesRequest::clear_right_id() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  if (_impl_.right_id_ != nullptr) _impl_.right_id_->Clear();
-  _impl_._has_bits_[0] &= ~0x00000004u;
-}
-inline const ::io::deephaven::proto::backplane::grpc::TableReference& CrossJoinTablesRequest::_internal_right_id() const {
-  PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race);
-  const ::io::deephaven::proto::backplane::grpc::TableReference* p = _impl_.right_id_;
-  return p != nullptr ? *p : reinterpret_cast<const ::io::deephaven::proto::backplane::grpc::TableReference&>(::io::deephaven::proto::backplane::grpc::_TableReference_default_instance_);
-}
-inline const ::io::deephaven::proto::backplane::grpc::TableReference& CrossJoinTablesRequest::right_id() const ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  // @@protoc_insertion_point(field_get:io.deephaven.proto.backplane.grpc.CrossJoinTablesRequest.right_id)
-  return _internal_right_id();
-}
-inline void CrossJoinTablesRequest::unsafe_arena_set_allocated_right_id(::io::deephaven::proto::backplane::grpc::TableReference* value) {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  if (GetArena() == nullptr) {
-    delete reinterpret_cast<::google::protobuf::MessageLite*>(_impl_.right_id_);
-  }
-  _impl_.right_id_ = reinterpret_cast<::io::deephaven::proto::backplane::grpc::TableReference*>(value);
-  if (value != nullptr) {
-    _impl_._has_bits_[0] |= 0x00000004u;
-  } else {
-    _impl_._has_bits_[0] &= ~0x00000004u;
-  }
-  // @@protoc_insertion_point(field_unsafe_arena_set_allocated:io.deephaven.proto.backplane.grpc.CrossJoinTablesRequest.right_id)
-}
-inline ::io::deephaven::proto::backplane::grpc::TableReference* CrossJoinTablesRequest::release_right_id() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-
-  _impl_._has_bits_[0] &= ~0x00000004u;
-  ::io::deephaven::proto::backplane::grpc::TableReference* released = _impl_.right_id_;
-  _impl_.right_id_ = nullptr;
-#ifdef PROTOBUF_FORCE_COPY_IN_RELEASE
-  auto* old = reinterpret_cast<::google::protobuf::MessageLite*>(released);
-  released = ::google::protobuf::internal::DuplicateIfNonNull(released);
-  if (GetArena() == nullptr) {
-    delete old;
-  }
-#else   // PROTOBUF_FORCE_COPY_IN_RELEASE
-  if (GetArena() != nullptr) {
-    released = ::google::protobuf::internal::DuplicateIfNonNull(released);
-  }
-#endif  // !PROTOBUF_FORCE_COPY_IN_RELEASE
-  return released;
-}
-inline ::io::deephaven::proto::backplane::grpc::TableReference* CrossJoinTablesRequest::unsafe_arena_release_right_id() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  // @@protoc_insertion_point(field_release:io.deephaven.proto.backplane.grpc.CrossJoinTablesRequest.right_id)
-
-  _impl_._has_bits_[0] &= ~0x00000004u;
-  ::io::deephaven::proto::backplane::grpc::TableReference* temp = _impl_.right_id_;
-  _impl_.right_id_ = nullptr;
-  return temp;
-}
-inline ::io::deephaven::proto::backplane::grpc::TableReference* CrossJoinTablesRequest::_internal_mutable_right_id() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  _impl_._has_bits_[0] |= 0x00000004u;
-  if (_impl_.right_id_ == nullptr) {
-    auto* p = CreateMaybeMessage<::io::deephaven::proto::backplane::grpc::TableReference>(GetArena());
-    _impl_.right_id_ = reinterpret_cast<::io::deephaven::proto::backplane::grpc::TableReference*>(p);
-  }
-  return _impl_.right_id_;
-}
-inline ::io::deephaven::proto::backplane::grpc::TableReference* CrossJoinTablesRequest::mutable_right_id() ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  ::io::deephaven::proto::backplane::grpc::TableReference* _msg = _internal_mutable_right_id();
-  // @@protoc_insertion_point(field_mutable:io.deephaven.proto.backplane.grpc.CrossJoinTablesRequest.right_id)
-  return _msg;
-}
-inline void CrossJoinTablesRequest::set_allocated_right_id(::io::deephaven::proto::backplane::grpc::TableReference* value) {
-  ::google::protobuf::Arena* message_arena = GetArena();
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  if (message_arena == nullptr) {
-    delete reinterpret_cast<::io::deephaven::proto::backplane::grpc::TableReference*>(_impl_.right_id_);
-  }
-
-  if (value != nullptr) {
-    ::google::protobuf::Arena* submessage_arena = reinterpret_cast<::io::deephaven::proto::backplane::grpc::TableReference*>(value)->GetArena();
-    if (message_arena != submessage_arena) {
-      value = ::google::protobuf::internal::GetOwnedMessage(message_arena, value, submessage_arena);
-    }
-    _impl_._has_bits_[0] |= 0x00000004u;
-  } else {
-    _impl_._has_bits_[0] &= ~0x00000004u;
-  }
-
-  _impl_.right_id_ = reinterpret_cast<::io::deephaven::proto::backplane::grpc::TableReference*>(value);
-  // @@protoc_insertion_point(field_set_allocated:io.deephaven.proto.backplane.grpc.CrossJoinTablesRequest.right_id)
-}
-
-// repeated string columns_to_match = 4;
-inline int CrossJoinTablesRequest::_internal_columns_to_match_size() const {
-  return _internal_columns_to_match().size();
-}
-inline int CrossJoinTablesRequest::columns_to_match_size() const {
-  return _internal_columns_to_match_size();
-}
-inline void CrossJoinTablesRequest::clear_columns_to_match() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  _impl_.columns_to_match_.Clear();
-}
-inline std::string* CrossJoinTablesRequest::add_columns_to_match()
-    ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  std::string* _s = _internal_mutable_columns_to_match()->Add();
-  // @@protoc_insertion_point(field_add_mutable:io.deephaven.proto.backplane.grpc.CrossJoinTablesRequest.columns_to_match)
-  return _s;
-}
-inline const std::string& CrossJoinTablesRequest::columns_to_match(int index) const
-    ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  // @@protoc_insertion_point(field_get:io.deephaven.proto.backplane.grpc.CrossJoinTablesRequest.columns_to_match)
-  return _internal_columns_to_match().Get(index);
-}
-inline std::string* CrossJoinTablesRequest::mutable_columns_to_match(int index)
-    ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  // @@protoc_insertion_point(field_mutable:io.deephaven.proto.backplane.grpc.CrossJoinTablesRequest.columns_to_match)
-  return _internal_mutable_columns_to_match()->Mutable(index);
-}
-inline void CrossJoinTablesRequest::set_columns_to_match(int index, const std::string& value) {
-  _internal_mutable_columns_to_match()->Mutable(index)->assign(value);
-  // @@protoc_insertion_point(field_set:io.deephaven.proto.backplane.grpc.CrossJoinTablesRequest.columns_to_match)
-}
-inline void CrossJoinTablesRequest::set_columns_to_match(int index, std::string&& value) {
-  _internal_mutable_columns_to_match()->Mutable(index)->assign(std::move(value));
-  // @@protoc_insertion_point(field_set:io.deephaven.proto.backplane.grpc.CrossJoinTablesRequest.columns_to_match)
-}
-inline void CrossJoinTablesRequest::set_columns_to_match(int index, const char* value) {
-  ABSL_DCHECK(value != nullptr);
-  _internal_mutable_columns_to_match()->Mutable(index)->assign(value);
-  // @@protoc_insertion_point(field_set_char:io.deephaven.proto.backplane.grpc.CrossJoinTablesRequest.columns_to_match)
-}
-inline void CrossJoinTablesRequest::set_columns_to_match(int index, const char* value,
-                              std::size_t size) {
-  _internal_mutable_columns_to_match()->Mutable(index)->assign(
-      reinterpret_cast<const char*>(value), size);
-  // @@protoc_insertion_point(field_set_pointer:io.deephaven.proto.backplane.grpc.CrossJoinTablesRequest.columns_to_match)
-}
-inline void CrossJoinTablesRequest::set_columns_to_match(int index, absl::string_view value) {
-  _internal_mutable_columns_to_match()->Mutable(index)->assign(value.data(),
-                                                     value.size());
-  // @@protoc_insertion_point(field_set_string_piece:io.deephaven.proto.backplane.grpc.CrossJoinTablesRequest.columns_to_match)
-}
-inline void CrossJoinTablesRequest::add_columns_to_match(const std::string& value) {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  _internal_mutable_columns_to_match()->Add()->assign(value);
-  // @@protoc_insertion_point(field_add:io.deephaven.proto.backplane.grpc.CrossJoinTablesRequest.columns_to_match)
-}
-inline void CrossJoinTablesRequest::add_columns_to_match(std::string&& value) {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  _internal_mutable_columns_to_match()->Add(std::move(value));
-  // @@protoc_insertion_point(field_add:io.deephaven.proto.backplane.grpc.CrossJoinTablesRequest.columns_to_match)
-}
-inline void CrossJoinTablesRequest::add_columns_to_match(const char* value) {
-  ABSL_DCHECK(value != nullptr);
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  _internal_mutable_columns_to_match()->Add()->assign(value);
-  // @@protoc_insertion_point(field_add_char:io.deephaven.proto.backplane.grpc.CrossJoinTablesRequest.columns_to_match)
-}
-inline void CrossJoinTablesRequest::add_columns_to_match(const char* value, std::size_t size) {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  _internal_mutable_columns_to_match()->Add()->assign(
-      reinterpret_cast<const char*>(value), size);
-  // @@protoc_insertion_point(field_add_pointer:io.deephaven.proto.backplane.grpc.CrossJoinTablesRequest.columns_to_match)
-}
-inline void CrossJoinTablesRequest::add_columns_to_match(absl::string_view value) {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  _internal_mutable_columns_to_match()->Add()->assign(value.data(), value.size());
-  // @@protoc_insertion_point(field_add_string_piece:io.deephaven.proto.backplane.grpc.CrossJoinTablesRequest.columns_to_match)
-}
-inline const ::google::protobuf::RepeatedPtrField<std::string>&
-CrossJoinTablesRequest::columns_to_match() const ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  // @@protoc_insertion_point(field_list:io.deephaven.proto.backplane.grpc.CrossJoinTablesRequest.columns_to_match)
-  return _internal_columns_to_match();
-}
-inline ::google::protobuf::RepeatedPtrField<std::string>*
-CrossJoinTablesRequest::mutable_columns_to_match() ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  // @@protoc_insertion_point(field_mutable_list:io.deephaven.proto.backplane.grpc.CrossJoinTablesRequest.columns_to_match)
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  return _internal_mutable_columns_to_match();
-}
-inline const ::google::protobuf::RepeatedPtrField<std::string>&
-CrossJoinTablesRequest::_internal_columns_to_match() const {
-  PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race);
-  return _impl_.columns_to_match_;
-}
-inline ::google::protobuf::RepeatedPtrField<std::string>*
-CrossJoinTablesRequest::_internal_mutable_columns_to_match() {
-  PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race);
-  return &_impl_.columns_to_match_;
-}
-
-// repeated string columns_to_add = 5;
-inline int CrossJoinTablesRequest::_internal_columns_to_add_size() const {
-  return _internal_columns_to_add().size();
-}
-inline int CrossJoinTablesRequest::columns_to_add_size() const {
-  return _internal_columns_to_add_size();
-}
-inline void CrossJoinTablesRequest::clear_columns_to_add() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  _impl_.columns_to_add_.Clear();
-}
-inline std::string* CrossJoinTablesRequest::add_columns_to_add()
-    ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  std::string* _s = _internal_mutable_columns_to_add()->Add();
-  // @@protoc_insertion_point(field_add_mutable:io.deephaven.proto.backplane.grpc.CrossJoinTablesRequest.columns_to_add)
-  return _s;
-}
-inline const std::string& CrossJoinTablesRequest::columns_to_add(int index) const
-    ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  // @@protoc_insertion_point(field_get:io.deephaven.proto.backplane.grpc.CrossJoinTablesRequest.columns_to_add)
-  return _internal_columns_to_add().Get(index);
-}
-inline std::string* CrossJoinTablesRequest::mutable_columns_to_add(int index)
-    ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  // @@protoc_insertion_point(field_mutable:io.deephaven.proto.backplane.grpc.CrossJoinTablesRequest.columns_to_add)
-  return _internal_mutable_columns_to_add()->Mutable(index);
-}
-inline void CrossJoinTablesRequest::set_columns_to_add(int index, const std::string& value) {
-  _internal_mutable_columns_to_add()->Mutable(index)->assign(value);
-  // @@protoc_insertion_point(field_set:io.deephaven.proto.backplane.grpc.CrossJoinTablesRequest.columns_to_add)
-}
-inline void CrossJoinTablesRequest::set_columns_to_add(int index, std::string&& value) {
-  _internal_mutable_columns_to_add()->Mutable(index)->assign(std::move(value));
-  // @@protoc_insertion_point(field_set:io.deephaven.proto.backplane.grpc.CrossJoinTablesRequest.columns_to_add)
-}
-inline void CrossJoinTablesRequest::set_columns_to_add(int index, const char* value) {
-  ABSL_DCHECK(value != nullptr);
-  _internal_mutable_columns_to_add()->Mutable(index)->assign(value);
-  // @@protoc_insertion_point(field_set_char:io.deephaven.proto.backplane.grpc.CrossJoinTablesRequest.columns_to_add)
-}
-inline void CrossJoinTablesRequest::set_columns_to_add(int index, const char* value,
-                              std::size_t size) {
-  _internal_mutable_columns_to_add()->Mutable(index)->assign(
-      reinterpret_cast<const char*>(value), size);
-  // @@protoc_insertion_point(field_set_pointer:io.deephaven.proto.backplane.grpc.CrossJoinTablesRequest.columns_to_add)
-}
-inline void CrossJoinTablesRequest::set_columns_to_add(int index, absl::string_view value) {
-  _internal_mutable_columns_to_add()->Mutable(index)->assign(value.data(),
-                                                     value.size());
-  // @@protoc_insertion_point(field_set_string_piece:io.deephaven.proto.backplane.grpc.CrossJoinTablesRequest.columns_to_add)
-}
-inline void CrossJoinTablesRequest::add_columns_to_add(const std::string& value) {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  _internal_mutable_columns_to_add()->Add()->assign(value);
-  // @@protoc_insertion_point(field_add:io.deephaven.proto.backplane.grpc.CrossJoinTablesRequest.columns_to_add)
-}
-inline void CrossJoinTablesRequest::add_columns_to_add(std::string&& value) {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  _internal_mutable_columns_to_add()->Add(std::move(value));
-  // @@protoc_insertion_point(field_add:io.deephaven.proto.backplane.grpc.CrossJoinTablesRequest.columns_to_add)
-}
-inline void CrossJoinTablesRequest::add_columns_to_add(const char* value) {
-  ABSL_DCHECK(value != nullptr);
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  _internal_mutable_columns_to_add()->Add()->assign(value);
-  // @@protoc_insertion_point(field_add_char:io.deephaven.proto.backplane.grpc.CrossJoinTablesRequest.columns_to_add)
-}
-inline void CrossJoinTablesRequest::add_columns_to_add(const char* value, std::size_t size) {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  _internal_mutable_columns_to_add()->Add()->assign(
-      reinterpret_cast<const char*>(value), size);
-  // @@protoc_insertion_point(field_add_pointer:io.deephaven.proto.backplane.grpc.CrossJoinTablesRequest.columns_to_add)
-}
-inline void CrossJoinTablesRequest::add_columns_to_add(absl::string_view value) {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  _internal_mutable_columns_to_add()->Add()->assign(value.data(), value.size());
-  // @@protoc_insertion_point(field_add_string_piece:io.deephaven.proto.backplane.grpc.CrossJoinTablesRequest.columns_to_add)
-}
-inline const ::google::protobuf::RepeatedPtrField<std::string>&
-CrossJoinTablesRequest::columns_to_add() const ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  // @@protoc_insertion_point(field_list:io.deephaven.proto.backplane.grpc.CrossJoinTablesRequest.columns_to_add)
-  return _internal_columns_to_add();
-}
-inline ::google::protobuf::RepeatedPtrField<std::string>*
-CrossJoinTablesRequest::mutable_columns_to_add() ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  // @@protoc_insertion_point(field_mutable_list:io.deephaven.proto.backplane.grpc.CrossJoinTablesRequest.columns_to_add)
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  return _internal_mutable_columns_to_add();
-}
-inline const ::google::protobuf::RepeatedPtrField<std::string>&
-CrossJoinTablesRequest::_internal_columns_to_add() const {
-  PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race);
-  return _impl_.columns_to_add_;
-}
-inline ::google::protobuf::RepeatedPtrField<std::string>*
-CrossJoinTablesRequest::_internal_mutable_columns_to_add() {
-  PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race);
-  return &_impl_.columns_to_add_;
-}
-
-// int32 reserve_bits = 6;
-inline void CrossJoinTablesRequest::clear_reserve_bits() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  _impl_.reserve_bits_ = 0;
-}
-inline ::int32_t CrossJoinTablesRequest::reserve_bits() const {
-  // @@protoc_insertion_point(field_get:io.deephaven.proto.backplane.grpc.CrossJoinTablesRequest.reserve_bits)
-  return _internal_reserve_bits();
-}
-inline void CrossJoinTablesRequest::set_reserve_bits(::int32_t value) {
-  _internal_set_reserve_bits(value);
-  // @@protoc_insertion_point(field_set:io.deephaven.proto.backplane.grpc.CrossJoinTablesRequest.reserve_bits)
-}
-inline ::int32_t CrossJoinTablesRequest::_internal_reserve_bits() const {
-  PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race);
-  return _impl_.reserve_bits_;
-}
-inline void CrossJoinTablesRequest::_internal_set_reserve_bits(::int32_t value) {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  ;
-  _impl_.reserve_bits_ = value;
-}
-
-// -------------------------------------------------------------------
-
-// NaturalJoinTablesRequest
-
-// .io.deephaven.proto.backplane.grpc.Ticket result_id = 1;
-inline bool NaturalJoinTablesRequest::has_result_id() const {
-  bool value = (_impl_._has_bits_[0] & 0x00000001u) != 0;
-  PROTOBUF_ASSUME(!value || _impl_.result_id_ != nullptr);
-  return value;
-}
-inline const ::io::deephaven::proto::backplane::grpc::Ticket& NaturalJoinTablesRequest::_internal_result_id() const {
-  PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race);
-  const ::io::deephaven::proto::backplane::grpc::Ticket* p = _impl_.result_id_;
-  return p != nullptr ? *p : reinterpret_cast<const ::io::deephaven::proto::backplane::grpc::Ticket&>(::io::deephaven::proto::backplane::grpc::_Ticket_default_instance_);
-}
-inline const ::io::deephaven::proto::backplane::grpc::Ticket& NaturalJoinTablesRequest::result_id() const ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  // @@protoc_insertion_point(field_get:io.deephaven.proto.backplane.grpc.NaturalJoinTablesRequest.result_id)
-  return _internal_result_id();
-}
-inline void NaturalJoinTablesRequest::unsafe_arena_set_allocated_result_id(::io::deephaven::proto::backplane::grpc::Ticket* value) {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  if (GetArena() == nullptr) {
-    delete reinterpret_cast<::google::protobuf::MessageLite*>(_impl_.result_id_);
-  }
-  _impl_.result_id_ = reinterpret_cast<::io::deephaven::proto::backplane::grpc::Ticket*>(value);
-  if (value != nullptr) {
-    _impl_._has_bits_[0] |= 0x00000001u;
-  } else {
-    _impl_._has_bits_[0] &= ~0x00000001u;
-  }
-  // @@protoc_insertion_point(field_unsafe_arena_set_allocated:io.deephaven.proto.backplane.grpc.NaturalJoinTablesRequest.result_id)
-}
-inline ::io::deephaven::proto::backplane::grpc::Ticket* NaturalJoinTablesRequest::release_result_id() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-
-  _impl_._has_bits_[0] &= ~0x00000001u;
-  ::io::deephaven::proto::backplane::grpc::Ticket* released = _impl_.result_id_;
-  _impl_.result_id_ = nullptr;
-#ifdef PROTOBUF_FORCE_COPY_IN_RELEASE
-  auto* old = reinterpret_cast<::google::protobuf::MessageLite*>(released);
-  released = ::google::protobuf::internal::DuplicateIfNonNull(released);
-  if (GetArena() == nullptr) {
-    delete old;
-  }
-#else   // PROTOBUF_FORCE_COPY_IN_RELEASE
-  if (GetArena() != nullptr) {
-    released = ::google::protobuf::internal::DuplicateIfNonNull(released);
-  }
-#endif  // !PROTOBUF_FORCE_COPY_IN_RELEASE
-  return released;
-}
-inline ::io::deephaven::proto::backplane::grpc::Ticket* NaturalJoinTablesRequest::unsafe_arena_release_result_id() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  // @@protoc_insertion_point(field_release:io.deephaven.proto.backplane.grpc.NaturalJoinTablesRequest.result_id)
-
-  _impl_._has_bits_[0] &= ~0x00000001u;
-  ::io::deephaven::proto::backplane::grpc::Ticket* temp = _impl_.result_id_;
-  _impl_.result_id_ = nullptr;
-  return temp;
-}
-inline ::io::deephaven::proto::backplane::grpc::Ticket* NaturalJoinTablesRequest::_internal_mutable_result_id() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  _impl_._has_bits_[0] |= 0x00000001u;
-  if (_impl_.result_id_ == nullptr) {
-    auto* p = CreateMaybeMessage<::io::deephaven::proto::backplane::grpc::Ticket>(GetArena());
-    _impl_.result_id_ = reinterpret_cast<::io::deephaven::proto::backplane::grpc::Ticket*>(p);
-  }
-  return _impl_.result_id_;
-}
-inline ::io::deephaven::proto::backplane::grpc::Ticket* NaturalJoinTablesRequest::mutable_result_id() ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  ::io::deephaven::proto::backplane::grpc::Ticket* _msg = _internal_mutable_result_id();
-  // @@protoc_insertion_point(field_mutable:io.deephaven.proto.backplane.grpc.NaturalJoinTablesRequest.result_id)
-  return _msg;
-}
-inline void NaturalJoinTablesRequest::set_allocated_result_id(::io::deephaven::proto::backplane::grpc::Ticket* value) {
-  ::google::protobuf::Arena* message_arena = GetArena();
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  if (message_arena == nullptr) {
-    delete reinterpret_cast<::google::protobuf::MessageLite*>(_impl_.result_id_);
-  }
-
-  if (value != nullptr) {
-    ::google::protobuf::Arena* submessage_arena = reinterpret_cast<::google::protobuf::MessageLite*>(value)->GetArena();
-    if (message_arena != submessage_arena) {
-      value = ::google::protobuf::internal::GetOwnedMessage(message_arena, value, submessage_arena);
-    }
-    _impl_._has_bits_[0] |= 0x00000001u;
-  } else {
-    _impl_._has_bits_[0] &= ~0x00000001u;
-  }
-
-  _impl_.result_id_ = reinterpret_cast<::io::deephaven::proto::backplane::grpc::Ticket*>(value);
-  // @@protoc_insertion_point(field_set_allocated:io.deephaven.proto.backplane.grpc.NaturalJoinTablesRequest.result_id)
-}
-
-// .io.deephaven.proto.backplane.grpc.TableReference left_id = 2;
-inline bool NaturalJoinTablesRequest::has_left_id() const {
-  bool value = (_impl_._has_bits_[0] & 0x00000002u) != 0;
-  PROTOBUF_ASSUME(!value || _impl_.left_id_ != nullptr);
-  return value;
-}
-inline void NaturalJoinTablesRequest::clear_left_id() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  if (_impl_.left_id_ != nullptr) _impl_.left_id_->Clear();
-  _impl_._has_bits_[0] &= ~0x00000002u;
-}
-inline const ::io::deephaven::proto::backplane::grpc::TableReference& NaturalJoinTablesRequest::_internal_left_id() const {
-  PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race);
-  const ::io::deephaven::proto::backplane::grpc::TableReference* p = _impl_.left_id_;
-  return p != nullptr ? *p : reinterpret_cast<const ::io::deephaven::proto::backplane::grpc::TableReference&>(::io::deephaven::proto::backplane::grpc::_TableReference_default_instance_);
-}
-inline const ::io::deephaven::proto::backplane::grpc::TableReference& NaturalJoinTablesRequest::left_id() const ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  // @@protoc_insertion_point(field_get:io.deephaven.proto.backplane.grpc.NaturalJoinTablesRequest.left_id)
-  return _internal_left_id();
-}
-inline void NaturalJoinTablesRequest::unsafe_arena_set_allocated_left_id(::io::deephaven::proto::backplane::grpc::TableReference* value) {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  if (GetArena() == nullptr) {
-    delete reinterpret_cast<::google::protobuf::MessageLite*>(_impl_.left_id_);
-  }
-  _impl_.left_id_ = reinterpret_cast<::io::deephaven::proto::backplane::grpc::TableReference*>(value);
-  if (value != nullptr) {
-    _impl_._has_bits_[0] |= 0x00000002u;
-  } else {
-    _impl_._has_bits_[0] &= ~0x00000002u;
-  }
-  // @@protoc_insertion_point(field_unsafe_arena_set_allocated:io.deephaven.proto.backplane.grpc.NaturalJoinTablesRequest.left_id)
-}
-inline ::io::deephaven::proto::backplane::grpc::TableReference* NaturalJoinTablesRequest::release_left_id() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-
-  _impl_._has_bits_[0] &= ~0x00000002u;
-  ::io::deephaven::proto::backplane::grpc::TableReference* released = _impl_.left_id_;
-  _impl_.left_id_ = nullptr;
-#ifdef PROTOBUF_FORCE_COPY_IN_RELEASE
-  auto* old = reinterpret_cast<::google::protobuf::MessageLite*>(released);
-  released = ::google::protobuf::internal::DuplicateIfNonNull(released);
-  if (GetArena() == nullptr) {
-    delete old;
-  }
-#else   // PROTOBUF_FORCE_COPY_IN_RELEASE
-  if (GetArena() != nullptr) {
-    released = ::google::protobuf::internal::DuplicateIfNonNull(released);
-  }
-#endif  // !PROTOBUF_FORCE_COPY_IN_RELEASE
-  return released;
-}
-inline ::io::deephaven::proto::backplane::grpc::TableReference* NaturalJoinTablesRequest::unsafe_arena_release_left_id() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  // @@protoc_insertion_point(field_release:io.deephaven.proto.backplane.grpc.NaturalJoinTablesRequest.left_id)
-
-  _impl_._has_bits_[0] &= ~0x00000002u;
-  ::io::deephaven::proto::backplane::grpc::TableReference* temp = _impl_.left_id_;
-  _impl_.left_id_ = nullptr;
-  return temp;
-}
-inline ::io::deephaven::proto::backplane::grpc::TableReference* NaturalJoinTablesRequest::_internal_mutable_left_id() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  _impl_._has_bits_[0] |= 0x00000002u;
-  if (_impl_.left_id_ == nullptr) {
-    auto* p = CreateMaybeMessage<::io::deephaven::proto::backplane::grpc::TableReference>(GetArena());
-    _impl_.left_id_ = reinterpret_cast<::io::deephaven::proto::backplane::grpc::TableReference*>(p);
-  }
-  return _impl_.left_id_;
-}
-inline ::io::deephaven::proto::backplane::grpc::TableReference* NaturalJoinTablesRequest::mutable_left_id() ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  ::io::deephaven::proto::backplane::grpc::TableReference* _msg = _internal_mutable_left_id();
-  // @@protoc_insertion_point(field_mutable:io.deephaven.proto.backplane.grpc.NaturalJoinTablesRequest.left_id)
-  return _msg;
-}
-inline void NaturalJoinTablesRequest::set_allocated_left_id(::io::deephaven::proto::backplane::grpc::TableReference* value) {
-  ::google::protobuf::Arena* message_arena = GetArena();
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  if (message_arena == nullptr) {
-    delete reinterpret_cast<::io::deephaven::proto::backplane::grpc::TableReference*>(_impl_.left_id_);
-  }
-
-  if (value != nullptr) {
-    ::google::protobuf::Arena* submessage_arena = reinterpret_cast<::io::deephaven::proto::backplane::grpc::TableReference*>(value)->GetArena();
-    if (message_arena != submessage_arena) {
-      value = ::google::protobuf::internal::GetOwnedMessage(message_arena, value, submessage_arena);
-    }
-    _impl_._has_bits_[0] |= 0x00000002u;
-  } else {
-    _impl_._has_bits_[0] &= ~0x00000002u;
-  }
-
-  _impl_.left_id_ = reinterpret_cast<::io::deephaven::proto::backplane::grpc::TableReference*>(value);
-  // @@protoc_insertion_point(field_set_allocated:io.deephaven.proto.backplane.grpc.NaturalJoinTablesRequest.left_id)
-}
-
-// .io.deephaven.proto.backplane.grpc.TableReference right_id = 3;
-inline bool NaturalJoinTablesRequest::has_right_id() const {
-  bool value = (_impl_._has_bits_[0] & 0x00000004u) != 0;
-  PROTOBUF_ASSUME(!value || _impl_.right_id_ != nullptr);
-  return value;
-}
-inline void NaturalJoinTablesRequest::clear_right_id() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  if (_impl_.right_id_ != nullptr) _impl_.right_id_->Clear();
-  _impl_._has_bits_[0] &= ~0x00000004u;
-}
-inline const ::io::deephaven::proto::backplane::grpc::TableReference& NaturalJoinTablesRequest::_internal_right_id() const {
-  PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race);
-  const ::io::deephaven::proto::backplane::grpc::TableReference* p = _impl_.right_id_;
-  return p != nullptr ? *p : reinterpret_cast<const ::io::deephaven::proto::backplane::grpc::TableReference&>(::io::deephaven::proto::backplane::grpc::_TableReference_default_instance_);
-}
-inline const ::io::deephaven::proto::backplane::grpc::TableReference& NaturalJoinTablesRequest::right_id() const ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  // @@protoc_insertion_point(field_get:io.deephaven.proto.backplane.grpc.NaturalJoinTablesRequest.right_id)
-  return _internal_right_id();
-}
-inline void NaturalJoinTablesRequest::unsafe_arena_set_allocated_right_id(::io::deephaven::proto::backplane::grpc::TableReference* value) {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  if (GetArena() == nullptr) {
-    delete reinterpret_cast<::google::protobuf::MessageLite*>(_impl_.right_id_);
-  }
-  _impl_.right_id_ = reinterpret_cast<::io::deephaven::proto::backplane::grpc::TableReference*>(value);
-  if (value != nullptr) {
-    _impl_._has_bits_[0] |= 0x00000004u;
-  } else {
-    _impl_._has_bits_[0] &= ~0x00000004u;
-  }
-  // @@protoc_insertion_point(field_unsafe_arena_set_allocated:io.deephaven.proto.backplane.grpc.NaturalJoinTablesRequest.right_id)
-}
-inline ::io::deephaven::proto::backplane::grpc::TableReference* NaturalJoinTablesRequest::release_right_id() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-
-  _impl_._has_bits_[0] &= ~0x00000004u;
-  ::io::deephaven::proto::backplane::grpc::TableReference* released = _impl_.right_id_;
-  _impl_.right_id_ = nullptr;
-#ifdef PROTOBUF_FORCE_COPY_IN_RELEASE
-  auto* old = reinterpret_cast<::google::protobuf::MessageLite*>(released);
-  released = ::google::protobuf::internal::DuplicateIfNonNull(released);
-  if (GetArena() == nullptr) {
-    delete old;
-  }
-#else   // PROTOBUF_FORCE_COPY_IN_RELEASE
-  if (GetArena() != nullptr) {
-    released = ::google::protobuf::internal::DuplicateIfNonNull(released);
-  }
-#endif  // !PROTOBUF_FORCE_COPY_IN_RELEASE
-  return released;
-}
-inline ::io::deephaven::proto::backplane::grpc::TableReference* NaturalJoinTablesRequest::unsafe_arena_release_right_id() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  // @@protoc_insertion_point(field_release:io.deephaven.proto.backplane.grpc.NaturalJoinTablesRequest.right_id)
-
-  _impl_._has_bits_[0] &= ~0x00000004u;
-  ::io::deephaven::proto::backplane::grpc::TableReference* temp = _impl_.right_id_;
-  _impl_.right_id_ = nullptr;
-  return temp;
-}
-inline ::io::deephaven::proto::backplane::grpc::TableReference* NaturalJoinTablesRequest::_internal_mutable_right_id() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  _impl_._has_bits_[0] |= 0x00000004u;
-  if (_impl_.right_id_ == nullptr) {
-    auto* p = CreateMaybeMessage<::io::deephaven::proto::backplane::grpc::TableReference>(GetArena());
-    _impl_.right_id_ = reinterpret_cast<::io::deephaven::proto::backplane::grpc::TableReference*>(p);
-  }
-  return _impl_.right_id_;
-}
-inline ::io::deephaven::proto::backplane::grpc::TableReference* NaturalJoinTablesRequest::mutable_right_id() ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  ::io::deephaven::proto::backplane::grpc::TableReference* _msg = _internal_mutable_right_id();
-  // @@protoc_insertion_point(field_mutable:io.deephaven.proto.backplane.grpc.NaturalJoinTablesRequest.right_id)
-  return _msg;
-}
-inline void NaturalJoinTablesRequest::set_allocated_right_id(::io::deephaven::proto::backplane::grpc::TableReference* value) {
-  ::google::protobuf::Arena* message_arena = GetArena();
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  if (message_arena == nullptr) {
-    delete reinterpret_cast<::io::deephaven::proto::backplane::grpc::TableReference*>(_impl_.right_id_);
-  }
-
-  if (value != nullptr) {
-    ::google::protobuf::Arena* submessage_arena = reinterpret_cast<::io::deephaven::proto::backplane::grpc::TableReference*>(value)->GetArena();
-    if (message_arena != submessage_arena) {
-      value = ::google::protobuf::internal::GetOwnedMessage(message_arena, value, submessage_arena);
-    }
-    _impl_._has_bits_[0] |= 0x00000004u;
-  } else {
-    _impl_._has_bits_[0] &= ~0x00000004u;
-  }
-
-  _impl_.right_id_ = reinterpret_cast<::io::deephaven::proto::backplane::grpc::TableReference*>(value);
-  // @@protoc_insertion_point(field_set_allocated:io.deephaven.proto.backplane.grpc.NaturalJoinTablesRequest.right_id)
-}
-
-// repeated string columns_to_match = 4;
-inline int NaturalJoinTablesRequest::_internal_columns_to_match_size() const {
-  return _internal_columns_to_match().size();
-}
-inline int NaturalJoinTablesRequest::columns_to_match_size() const {
-  return _internal_columns_to_match_size();
-}
-inline void NaturalJoinTablesRequest::clear_columns_to_match() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  _impl_.columns_to_match_.Clear();
-}
-inline std::string* NaturalJoinTablesRequest::add_columns_to_match()
-    ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  std::string* _s = _internal_mutable_columns_to_match()->Add();
-  // @@protoc_insertion_point(field_add_mutable:io.deephaven.proto.backplane.grpc.NaturalJoinTablesRequest.columns_to_match)
-  return _s;
-}
-inline const std::string& NaturalJoinTablesRequest::columns_to_match(int index) const
-    ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  // @@protoc_insertion_point(field_get:io.deephaven.proto.backplane.grpc.NaturalJoinTablesRequest.columns_to_match)
-  return _internal_columns_to_match().Get(index);
-}
-inline std::string* NaturalJoinTablesRequest::mutable_columns_to_match(int index)
-    ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  // @@protoc_insertion_point(field_mutable:io.deephaven.proto.backplane.grpc.NaturalJoinTablesRequest.columns_to_match)
-  return _internal_mutable_columns_to_match()->Mutable(index);
-}
-inline void NaturalJoinTablesRequest::set_columns_to_match(int index, const std::string& value) {
-  _internal_mutable_columns_to_match()->Mutable(index)->assign(value);
-  // @@protoc_insertion_point(field_set:io.deephaven.proto.backplane.grpc.NaturalJoinTablesRequest.columns_to_match)
-}
-inline void NaturalJoinTablesRequest::set_columns_to_match(int index, std::string&& value) {
-  _internal_mutable_columns_to_match()->Mutable(index)->assign(std::move(value));
-  // @@protoc_insertion_point(field_set:io.deephaven.proto.backplane.grpc.NaturalJoinTablesRequest.columns_to_match)
-}
-inline void NaturalJoinTablesRequest::set_columns_to_match(int index, const char* value) {
-  ABSL_DCHECK(value != nullptr);
-  _internal_mutable_columns_to_match()->Mutable(index)->assign(value);
-  // @@protoc_insertion_point(field_set_char:io.deephaven.proto.backplane.grpc.NaturalJoinTablesRequest.columns_to_match)
-}
-inline void NaturalJoinTablesRequest::set_columns_to_match(int index, const char* value,
-                              std::size_t size) {
-  _internal_mutable_columns_to_match()->Mutable(index)->assign(
-      reinterpret_cast<const char*>(value), size);
-  // @@protoc_insertion_point(field_set_pointer:io.deephaven.proto.backplane.grpc.NaturalJoinTablesRequest.columns_to_match)
-}
-inline void NaturalJoinTablesRequest::set_columns_to_match(int index, absl::string_view value) {
-  _internal_mutable_columns_to_match()->Mutable(index)->assign(value.data(),
-                                                     value.size());
-  // @@protoc_insertion_point(field_set_string_piece:io.deephaven.proto.backplane.grpc.NaturalJoinTablesRequest.columns_to_match)
-}
-inline void NaturalJoinTablesRequest::add_columns_to_match(const std::string& value) {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  _internal_mutable_columns_to_match()->Add()->assign(value);
-  // @@protoc_insertion_point(field_add:io.deephaven.proto.backplane.grpc.NaturalJoinTablesRequest.columns_to_match)
-}
-inline void NaturalJoinTablesRequest::add_columns_to_match(std::string&& value) {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  _internal_mutable_columns_to_match()->Add(std::move(value));
-  // @@protoc_insertion_point(field_add:io.deephaven.proto.backplane.grpc.NaturalJoinTablesRequest.columns_to_match)
-}
-inline void NaturalJoinTablesRequest::add_columns_to_match(const char* value) {
-  ABSL_DCHECK(value != nullptr);
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  _internal_mutable_columns_to_match()->Add()->assign(value);
-  // @@protoc_insertion_point(field_add_char:io.deephaven.proto.backplane.grpc.NaturalJoinTablesRequest.columns_to_match)
-}
-inline void NaturalJoinTablesRequest::add_columns_to_match(const char* value, std::size_t size) {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  _internal_mutable_columns_to_match()->Add()->assign(
-      reinterpret_cast<const char*>(value), size);
-  // @@protoc_insertion_point(field_add_pointer:io.deephaven.proto.backplane.grpc.NaturalJoinTablesRequest.columns_to_match)
-}
-inline void NaturalJoinTablesRequest::add_columns_to_match(absl::string_view value) {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  _internal_mutable_columns_to_match()->Add()->assign(value.data(), value.size());
-  // @@protoc_insertion_point(field_add_string_piece:io.deephaven.proto.backplane.grpc.NaturalJoinTablesRequest.columns_to_match)
-}
-inline const ::google::protobuf::RepeatedPtrField<std::string>&
-NaturalJoinTablesRequest::columns_to_match() const ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  // @@protoc_insertion_point(field_list:io.deephaven.proto.backplane.grpc.NaturalJoinTablesRequest.columns_to_match)
-  return _internal_columns_to_match();
-}
-inline ::google::protobuf::RepeatedPtrField<std::string>*
-NaturalJoinTablesRequest::mutable_columns_to_match() ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  // @@protoc_insertion_point(field_mutable_list:io.deephaven.proto.backplane.grpc.NaturalJoinTablesRequest.columns_to_match)
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  return _internal_mutable_columns_to_match();
-}
-inline const ::google::protobuf::RepeatedPtrField<std::string>&
-NaturalJoinTablesRequest::_internal_columns_to_match() const {
-  PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race);
-  return _impl_.columns_to_match_;
-}
-inline ::google::protobuf::RepeatedPtrField<std::string>*
-NaturalJoinTablesRequest::_internal_mutable_columns_to_match() {
-  PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race);
-  return &_impl_.columns_to_match_;
-}
-
-// repeated string columns_to_add = 5;
-inline int NaturalJoinTablesRequest::_internal_columns_to_add_size() const {
-  return _internal_columns_to_add().size();
-}
-inline int NaturalJoinTablesRequest::columns_to_add_size() const {
-  return _internal_columns_to_add_size();
-}
-inline void NaturalJoinTablesRequest::clear_columns_to_add() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  _impl_.columns_to_add_.Clear();
-}
-inline std::string* NaturalJoinTablesRequest::add_columns_to_add()
-    ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  std::string* _s = _internal_mutable_columns_to_add()->Add();
-  // @@protoc_insertion_point(field_add_mutable:io.deephaven.proto.backplane.grpc.NaturalJoinTablesRequest.columns_to_add)
-  return _s;
-}
-inline const std::string& NaturalJoinTablesRequest::columns_to_add(int index) const
-    ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  // @@protoc_insertion_point(field_get:io.deephaven.proto.backplane.grpc.NaturalJoinTablesRequest.columns_to_add)
-  return _internal_columns_to_add().Get(index);
-}
-inline std::string* NaturalJoinTablesRequest::mutable_columns_to_add(int index)
-    ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  // @@protoc_insertion_point(field_mutable:io.deephaven.proto.backplane.grpc.NaturalJoinTablesRequest.columns_to_add)
-  return _internal_mutable_columns_to_add()->Mutable(index);
-}
-inline void NaturalJoinTablesRequest::set_columns_to_add(int index, const std::string& value) {
-  _internal_mutable_columns_to_add()->Mutable(index)->assign(value);
-  // @@protoc_insertion_point(field_set:io.deephaven.proto.backplane.grpc.NaturalJoinTablesRequest.columns_to_add)
-}
-inline void NaturalJoinTablesRequest::set_columns_to_add(int index, std::string&& value) {
-  _internal_mutable_columns_to_add()->Mutable(index)->assign(std::move(value));
-  // @@protoc_insertion_point(field_set:io.deephaven.proto.backplane.grpc.NaturalJoinTablesRequest.columns_to_add)
-}
-inline void NaturalJoinTablesRequest::set_columns_to_add(int index, const char* value) {
-  ABSL_DCHECK(value != nullptr);
-  _internal_mutable_columns_to_add()->Mutable(index)->assign(value);
-  // @@protoc_insertion_point(field_set_char:io.deephaven.proto.backplane.grpc.NaturalJoinTablesRequest.columns_to_add)
-}
-inline void NaturalJoinTablesRequest::set_columns_to_add(int index, const char* value,
-                              std::size_t size) {
-  _internal_mutable_columns_to_add()->Mutable(index)->assign(
-      reinterpret_cast<const char*>(value), size);
-  // @@protoc_insertion_point(field_set_pointer:io.deephaven.proto.backplane.grpc.NaturalJoinTablesRequest.columns_to_add)
-}
-inline void NaturalJoinTablesRequest::set_columns_to_add(int index, absl::string_view value) {
-  _internal_mutable_columns_to_add()->Mutable(index)->assign(value.data(),
-                                                     value.size());
-  // @@protoc_insertion_point(field_set_string_piece:io.deephaven.proto.backplane.grpc.NaturalJoinTablesRequest.columns_to_add)
-}
-inline void NaturalJoinTablesRequest::add_columns_to_add(const std::string& value) {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  _internal_mutable_columns_to_add()->Add()->assign(value);
-  // @@protoc_insertion_point(field_add:io.deephaven.proto.backplane.grpc.NaturalJoinTablesRequest.columns_to_add)
-}
-inline void NaturalJoinTablesRequest::add_columns_to_add(std::string&& value) {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  _internal_mutable_columns_to_add()->Add(std::move(value));
-  // @@protoc_insertion_point(field_add:io.deephaven.proto.backplane.grpc.NaturalJoinTablesRequest.columns_to_add)
-}
-inline void NaturalJoinTablesRequest::add_columns_to_add(const char* value) {
-  ABSL_DCHECK(value != nullptr);
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  _internal_mutable_columns_to_add()->Add()->assign(value);
-  // @@protoc_insertion_point(field_add_char:io.deephaven.proto.backplane.grpc.NaturalJoinTablesRequest.columns_to_add)
-}
-inline void NaturalJoinTablesRequest::add_columns_to_add(const char* value, std::size_t size) {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  _internal_mutable_columns_to_add()->Add()->assign(
-      reinterpret_cast<const char*>(value), size);
-  // @@protoc_insertion_point(field_add_pointer:io.deephaven.proto.backplane.grpc.NaturalJoinTablesRequest.columns_to_add)
-}
-inline void NaturalJoinTablesRequest::add_columns_to_add(absl::string_view value) {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  _internal_mutable_columns_to_add()->Add()->assign(value.data(), value.size());
-  // @@protoc_insertion_point(field_add_string_piece:io.deephaven.proto.backplane.grpc.NaturalJoinTablesRequest.columns_to_add)
-}
-inline const ::google::protobuf::RepeatedPtrField<std::string>&
-NaturalJoinTablesRequest::columns_to_add() const ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  // @@protoc_insertion_point(field_list:io.deephaven.proto.backplane.grpc.NaturalJoinTablesRequest.columns_to_add)
-  return _internal_columns_to_add();
-}
-inline ::google::protobuf::RepeatedPtrField<std::string>*
-NaturalJoinTablesRequest::mutable_columns_to_add() ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  // @@protoc_insertion_point(field_mutable_list:io.deephaven.proto.backplane.grpc.NaturalJoinTablesRequest.columns_to_add)
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  return _internal_mutable_columns_to_add();
-}
-inline const ::google::protobuf::RepeatedPtrField<std::string>&
-NaturalJoinTablesRequest::_internal_columns_to_add() const {
-  PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race);
-  return _impl_.columns_to_add_;
-}
-inline ::google::protobuf::RepeatedPtrField<std::string>*
-NaturalJoinTablesRequest::_internal_mutable_columns_to_add() {
-  PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race);
-  return &_impl_.columns_to_add_;
-}
-
-// -------------------------------------------------------------------
-
-// ExactJoinTablesRequest
-
-// .io.deephaven.proto.backplane.grpc.Ticket result_id = 1;
-inline bool ExactJoinTablesRequest::has_result_id() const {
-  bool value = (_impl_._has_bits_[0] & 0x00000001u) != 0;
-  PROTOBUF_ASSUME(!value || _impl_.result_id_ != nullptr);
-  return value;
-}
-inline const ::io::deephaven::proto::backplane::grpc::Ticket& ExactJoinTablesRequest::_internal_result_id() const {
-  PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race);
-  const ::io::deephaven::proto::backplane::grpc::Ticket* p = _impl_.result_id_;
-  return p != nullptr ? *p : reinterpret_cast<const ::io::deephaven::proto::backplane::grpc::Ticket&>(::io::deephaven::proto::backplane::grpc::_Ticket_default_instance_);
-}
-inline const ::io::deephaven::proto::backplane::grpc::Ticket& ExactJoinTablesRequest::result_id() const ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  // @@protoc_insertion_point(field_get:io.deephaven.proto.backplane.grpc.ExactJoinTablesRequest.result_id)
-  return _internal_result_id();
-}
-inline void ExactJoinTablesRequest::unsafe_arena_set_allocated_result_id(::io::deephaven::proto::backplane::grpc::Ticket* value) {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  if (GetArena() == nullptr) {
-    delete reinterpret_cast<::google::protobuf::MessageLite*>(_impl_.result_id_);
-  }
-  _impl_.result_id_ = reinterpret_cast<::io::deephaven::proto::backplane::grpc::Ticket*>(value);
-  if (value != nullptr) {
-    _impl_._has_bits_[0] |= 0x00000001u;
-  } else {
-    _impl_._has_bits_[0] &= ~0x00000001u;
-  }
-  // @@protoc_insertion_point(field_unsafe_arena_set_allocated:io.deephaven.proto.backplane.grpc.ExactJoinTablesRequest.result_id)
-}
-inline ::io::deephaven::proto::backplane::grpc::Ticket* ExactJoinTablesRequest::release_result_id() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-
-  _impl_._has_bits_[0] &= ~0x00000001u;
-  ::io::deephaven::proto::backplane::grpc::Ticket* released = _impl_.result_id_;
-  _impl_.result_id_ = nullptr;
-#ifdef PROTOBUF_FORCE_COPY_IN_RELEASE
-  auto* old = reinterpret_cast<::google::protobuf::MessageLite*>(released);
-  released = ::google::protobuf::internal::DuplicateIfNonNull(released);
-  if (GetArena() == nullptr) {
-    delete old;
-  }
-#else   // PROTOBUF_FORCE_COPY_IN_RELEASE
-  if (GetArena() != nullptr) {
-    released = ::google::protobuf::internal::DuplicateIfNonNull(released);
-  }
-#endif  // !PROTOBUF_FORCE_COPY_IN_RELEASE
-  return released;
-}
-inline ::io::deephaven::proto::backplane::grpc::Ticket* ExactJoinTablesRequest::unsafe_arena_release_result_id() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  // @@protoc_insertion_point(field_release:io.deephaven.proto.backplane.grpc.ExactJoinTablesRequest.result_id)
-
-  _impl_._has_bits_[0] &= ~0x00000001u;
-  ::io::deephaven::proto::backplane::grpc::Ticket* temp = _impl_.result_id_;
-  _impl_.result_id_ = nullptr;
-  return temp;
-}
-inline ::io::deephaven::proto::backplane::grpc::Ticket* ExactJoinTablesRequest::_internal_mutable_result_id() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  _impl_._has_bits_[0] |= 0x00000001u;
-  if (_impl_.result_id_ == nullptr) {
-    auto* p = CreateMaybeMessage<::io::deephaven::proto::backplane::grpc::Ticket>(GetArena());
-    _impl_.result_id_ = reinterpret_cast<::io::deephaven::proto::backplane::grpc::Ticket*>(p);
-  }
-  return _impl_.result_id_;
-}
-inline ::io::deephaven::proto::backplane::grpc::Ticket* ExactJoinTablesRequest::mutable_result_id() ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  ::io::deephaven::proto::backplane::grpc::Ticket* _msg = _internal_mutable_result_id();
-  // @@protoc_insertion_point(field_mutable:io.deephaven.proto.backplane.grpc.ExactJoinTablesRequest.result_id)
-  return _msg;
-}
-inline void ExactJoinTablesRequest::set_allocated_result_id(::io::deephaven::proto::backplane::grpc::Ticket* value) {
-  ::google::protobuf::Arena* message_arena = GetArena();
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  if (message_arena == nullptr) {
-    delete reinterpret_cast<::google::protobuf::MessageLite*>(_impl_.result_id_);
-  }
-
-  if (value != nullptr) {
-    ::google::protobuf::Arena* submessage_arena = reinterpret_cast<::google::protobuf::MessageLite*>(value)->GetArena();
-    if (message_arena != submessage_arena) {
-      value = ::google::protobuf::internal::GetOwnedMessage(message_arena, value, submessage_arena);
-    }
-    _impl_._has_bits_[0] |= 0x00000001u;
-  } else {
-    _impl_._has_bits_[0] &= ~0x00000001u;
-  }
-
-  _impl_.result_id_ = reinterpret_cast<::io::deephaven::proto::backplane::grpc::Ticket*>(value);
-  // @@protoc_insertion_point(field_set_allocated:io.deephaven.proto.backplane.grpc.ExactJoinTablesRequest.result_id)
-}
-
-// .io.deephaven.proto.backplane.grpc.TableReference left_id = 2;
-inline bool ExactJoinTablesRequest::has_left_id() const {
-  bool value = (_impl_._has_bits_[0] & 0x00000002u) != 0;
-  PROTOBUF_ASSUME(!value || _impl_.left_id_ != nullptr);
-  return value;
-}
-inline void ExactJoinTablesRequest::clear_left_id() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  if (_impl_.left_id_ != nullptr) _impl_.left_id_->Clear();
-  _impl_._has_bits_[0] &= ~0x00000002u;
-}
-inline const ::io::deephaven::proto::backplane::grpc::TableReference& ExactJoinTablesRequest::_internal_left_id() const {
-  PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race);
-  const ::io::deephaven::proto::backplane::grpc::TableReference* p = _impl_.left_id_;
-  return p != nullptr ? *p : reinterpret_cast<const ::io::deephaven::proto::backplane::grpc::TableReference&>(::io::deephaven::proto::backplane::grpc::_TableReference_default_instance_);
-}
-inline const ::io::deephaven::proto::backplane::grpc::TableReference& ExactJoinTablesRequest::left_id() const ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  // @@protoc_insertion_point(field_get:io.deephaven.proto.backplane.grpc.ExactJoinTablesRequest.left_id)
-  return _internal_left_id();
-}
-inline void ExactJoinTablesRequest::unsafe_arena_set_allocated_left_id(::io::deephaven::proto::backplane::grpc::TableReference* value) {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  if (GetArena() == nullptr) {
-    delete reinterpret_cast<::google::protobuf::MessageLite*>(_impl_.left_id_);
-  }
-  _impl_.left_id_ = reinterpret_cast<::io::deephaven::proto::backplane::grpc::TableReference*>(value);
-  if (value != nullptr) {
-    _impl_._has_bits_[0] |= 0x00000002u;
-  } else {
-    _impl_._has_bits_[0] &= ~0x00000002u;
-  }
-  // @@protoc_insertion_point(field_unsafe_arena_set_allocated:io.deephaven.proto.backplane.grpc.ExactJoinTablesRequest.left_id)
-}
-inline ::io::deephaven::proto::backplane::grpc::TableReference* ExactJoinTablesRequest::release_left_id() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-
-  _impl_._has_bits_[0] &= ~0x00000002u;
-  ::io::deephaven::proto::backplane::grpc::TableReference* released = _impl_.left_id_;
-  _impl_.left_id_ = nullptr;
-#ifdef PROTOBUF_FORCE_COPY_IN_RELEASE
-  auto* old = reinterpret_cast<::google::protobuf::MessageLite*>(released);
-  released = ::google::protobuf::internal::DuplicateIfNonNull(released);
-  if (GetArena() == nullptr) {
-    delete old;
-  }
-#else   // PROTOBUF_FORCE_COPY_IN_RELEASE
-  if (GetArena() != nullptr) {
-    released = ::google::protobuf::internal::DuplicateIfNonNull(released);
-  }
-#endif  // !PROTOBUF_FORCE_COPY_IN_RELEASE
-  return released;
-}
-inline ::io::deephaven::proto::backplane::grpc::TableReference* ExactJoinTablesRequest::unsafe_arena_release_left_id() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  // @@protoc_insertion_point(field_release:io.deephaven.proto.backplane.grpc.ExactJoinTablesRequest.left_id)
-
-  _impl_._has_bits_[0] &= ~0x00000002u;
-  ::io::deephaven::proto::backplane::grpc::TableReference* temp = _impl_.left_id_;
-  _impl_.left_id_ = nullptr;
-  return temp;
-}
-inline ::io::deephaven::proto::backplane::grpc::TableReference* ExactJoinTablesRequest::_internal_mutable_left_id() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  _impl_._has_bits_[0] |= 0x00000002u;
-  if (_impl_.left_id_ == nullptr) {
-    auto* p = CreateMaybeMessage<::io::deephaven::proto::backplane::grpc::TableReference>(GetArena());
-    _impl_.left_id_ = reinterpret_cast<::io::deephaven::proto::backplane::grpc::TableReference*>(p);
-  }
-  return _impl_.left_id_;
-}
-inline ::io::deephaven::proto::backplane::grpc::TableReference* ExactJoinTablesRequest::mutable_left_id() ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  ::io::deephaven::proto::backplane::grpc::TableReference* _msg = _internal_mutable_left_id();
-  // @@protoc_insertion_point(field_mutable:io.deephaven.proto.backplane.grpc.ExactJoinTablesRequest.left_id)
-  return _msg;
-}
-inline void ExactJoinTablesRequest::set_allocated_left_id(::io::deephaven::proto::backplane::grpc::TableReference* value) {
-  ::google::protobuf::Arena* message_arena = GetArena();
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  if (message_arena == nullptr) {
-    delete reinterpret_cast<::io::deephaven::proto::backplane::grpc::TableReference*>(_impl_.left_id_);
-  }
-
-  if (value != nullptr) {
-    ::google::protobuf::Arena* submessage_arena = reinterpret_cast<::io::deephaven::proto::backplane::grpc::TableReference*>(value)->GetArena();
-    if (message_arena != submessage_arena) {
-      value = ::google::protobuf::internal::GetOwnedMessage(message_arena, value, submessage_arena);
-    }
-    _impl_._has_bits_[0] |= 0x00000002u;
-  } else {
-    _impl_._has_bits_[0] &= ~0x00000002u;
-  }
-
-  _impl_.left_id_ = reinterpret_cast<::io::deephaven::proto::backplane::grpc::TableReference*>(value);
-  // @@protoc_insertion_point(field_set_allocated:io.deephaven.proto.backplane.grpc.ExactJoinTablesRequest.left_id)
-}
-
-// .io.deephaven.proto.backplane.grpc.TableReference right_id = 3;
-inline bool ExactJoinTablesRequest::has_right_id() const {
-  bool value = (_impl_._has_bits_[0] & 0x00000004u) != 0;
-  PROTOBUF_ASSUME(!value || _impl_.right_id_ != nullptr);
-  return value;
-}
-inline void ExactJoinTablesRequest::clear_right_id() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  if (_impl_.right_id_ != nullptr) _impl_.right_id_->Clear();
-  _impl_._has_bits_[0] &= ~0x00000004u;
-}
-inline const ::io::deephaven::proto::backplane::grpc::TableReference& ExactJoinTablesRequest::_internal_right_id() const {
-  PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race);
-  const ::io::deephaven::proto::backplane::grpc::TableReference* p = _impl_.right_id_;
-  return p != nullptr ? *p : reinterpret_cast<const ::io::deephaven::proto::backplane::grpc::TableReference&>(::io::deephaven::proto::backplane::grpc::_TableReference_default_instance_);
-}
-inline const ::io::deephaven::proto::backplane::grpc::TableReference& ExactJoinTablesRequest::right_id() const ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  // @@protoc_insertion_point(field_get:io.deephaven.proto.backplane.grpc.ExactJoinTablesRequest.right_id)
-  return _internal_right_id();
-}
-inline void ExactJoinTablesRequest::unsafe_arena_set_allocated_right_id(::io::deephaven::proto::backplane::grpc::TableReference* value) {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  if (GetArena() == nullptr) {
-    delete reinterpret_cast<::google::protobuf::MessageLite*>(_impl_.right_id_);
-  }
-  _impl_.right_id_ = reinterpret_cast<::io::deephaven::proto::backplane::grpc::TableReference*>(value);
-  if (value != nullptr) {
-    _impl_._has_bits_[0] |= 0x00000004u;
-  } else {
-    _impl_._has_bits_[0] &= ~0x00000004u;
-  }
-  // @@protoc_insertion_point(field_unsafe_arena_set_allocated:io.deephaven.proto.backplane.grpc.ExactJoinTablesRequest.right_id)
-}
-inline ::io::deephaven::proto::backplane::grpc::TableReference* ExactJoinTablesRequest::release_right_id() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-
-  _impl_._has_bits_[0] &= ~0x00000004u;
-  ::io::deephaven::proto::backplane::grpc::TableReference* released = _impl_.right_id_;
-  _impl_.right_id_ = nullptr;
-#ifdef PROTOBUF_FORCE_COPY_IN_RELEASE
-  auto* old = reinterpret_cast<::google::protobuf::MessageLite*>(released);
-  released = ::google::protobuf::internal::DuplicateIfNonNull(released);
-  if (GetArena() == nullptr) {
-    delete old;
-  }
-#else   // PROTOBUF_FORCE_COPY_IN_RELEASE
-  if (GetArena() != nullptr) {
-    released = ::google::protobuf::internal::DuplicateIfNonNull(released);
-  }
-#endif  // !PROTOBUF_FORCE_COPY_IN_RELEASE
-  return released;
-}
-inline ::io::deephaven::proto::backplane::grpc::TableReference* ExactJoinTablesRequest::unsafe_arena_release_right_id() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  // @@protoc_insertion_point(field_release:io.deephaven.proto.backplane.grpc.ExactJoinTablesRequest.right_id)
-
-  _impl_._has_bits_[0] &= ~0x00000004u;
-  ::io::deephaven::proto::backplane::grpc::TableReference* temp = _impl_.right_id_;
-  _impl_.right_id_ = nullptr;
-  return temp;
-}
-inline ::io::deephaven::proto::backplane::grpc::TableReference* ExactJoinTablesRequest::_internal_mutable_right_id() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  _impl_._has_bits_[0] |= 0x00000004u;
-  if (_impl_.right_id_ == nullptr) {
-    auto* p = CreateMaybeMessage<::io::deephaven::proto::backplane::grpc::TableReference>(GetArena());
-    _impl_.right_id_ = reinterpret_cast<::io::deephaven::proto::backplane::grpc::TableReference*>(p);
-  }
-  return _impl_.right_id_;
-}
-inline ::io::deephaven::proto::backplane::grpc::TableReference* ExactJoinTablesRequest::mutable_right_id() ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  ::io::deephaven::proto::backplane::grpc::TableReference* _msg = _internal_mutable_right_id();
-  // @@protoc_insertion_point(field_mutable:io.deephaven.proto.backplane.grpc.ExactJoinTablesRequest.right_id)
-  return _msg;
-}
-inline void ExactJoinTablesRequest::set_allocated_right_id(::io::deephaven::proto::backplane::grpc::TableReference* value) {
-  ::google::protobuf::Arena* message_arena = GetArena();
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  if (message_arena == nullptr) {
-    delete reinterpret_cast<::io::deephaven::proto::backplane::grpc::TableReference*>(_impl_.right_id_);
-  }
-
-  if (value != nullptr) {
-    ::google::protobuf::Arena* submessage_arena = reinterpret_cast<::io::deephaven::proto::backplane::grpc::TableReference*>(value)->GetArena();
-    if (message_arena != submessage_arena) {
-      value = ::google::protobuf::internal::GetOwnedMessage(message_arena, value, submessage_arena);
-    }
-    _impl_._has_bits_[0] |= 0x00000004u;
-  } else {
-    _impl_._has_bits_[0] &= ~0x00000004u;
-  }
-
-  _impl_.right_id_ = reinterpret_cast<::io::deephaven::proto::backplane::grpc::TableReference*>(value);
-  // @@protoc_insertion_point(field_set_allocated:io.deephaven.proto.backplane.grpc.ExactJoinTablesRequest.right_id)
-}
-
-// repeated string columns_to_match = 4;
-inline int ExactJoinTablesRequest::_internal_columns_to_match_size() const {
-  return _internal_columns_to_match().size();
-}
-inline int ExactJoinTablesRequest::columns_to_match_size() const {
-  return _internal_columns_to_match_size();
-}
-inline void ExactJoinTablesRequest::clear_columns_to_match() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  _impl_.columns_to_match_.Clear();
-}
-inline std::string* ExactJoinTablesRequest::add_columns_to_match()
-    ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  std::string* _s = _internal_mutable_columns_to_match()->Add();
-  // @@protoc_insertion_point(field_add_mutable:io.deephaven.proto.backplane.grpc.ExactJoinTablesRequest.columns_to_match)
-  return _s;
-}
-inline const std::string& ExactJoinTablesRequest::columns_to_match(int index) const
-    ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  // @@protoc_insertion_point(field_get:io.deephaven.proto.backplane.grpc.ExactJoinTablesRequest.columns_to_match)
-  return _internal_columns_to_match().Get(index);
-}
-inline std::string* ExactJoinTablesRequest::mutable_columns_to_match(int index)
-    ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  // @@protoc_insertion_point(field_mutable:io.deephaven.proto.backplane.grpc.ExactJoinTablesRequest.columns_to_match)
-  return _internal_mutable_columns_to_match()->Mutable(index);
-}
-inline void ExactJoinTablesRequest::set_columns_to_match(int index, const std::string& value) {
-  _internal_mutable_columns_to_match()->Mutable(index)->assign(value);
-  // @@protoc_insertion_point(field_set:io.deephaven.proto.backplane.grpc.ExactJoinTablesRequest.columns_to_match)
-}
-inline void ExactJoinTablesRequest::set_columns_to_match(int index, std::string&& value) {
-  _internal_mutable_columns_to_match()->Mutable(index)->assign(std::move(value));
-  // @@protoc_insertion_point(field_set:io.deephaven.proto.backplane.grpc.ExactJoinTablesRequest.columns_to_match)
-}
-inline void ExactJoinTablesRequest::set_columns_to_match(int index, const char* value) {
-  ABSL_DCHECK(value != nullptr);
-  _internal_mutable_columns_to_match()->Mutable(index)->assign(value);
-  // @@protoc_insertion_point(field_set_char:io.deephaven.proto.backplane.grpc.ExactJoinTablesRequest.columns_to_match)
-}
-inline void ExactJoinTablesRequest::set_columns_to_match(int index, const char* value,
-                              std::size_t size) {
-  _internal_mutable_columns_to_match()->Mutable(index)->assign(
-      reinterpret_cast<const char*>(value), size);
-  // @@protoc_insertion_point(field_set_pointer:io.deephaven.proto.backplane.grpc.ExactJoinTablesRequest.columns_to_match)
-}
-inline void ExactJoinTablesRequest::set_columns_to_match(int index, absl::string_view value) {
-  _internal_mutable_columns_to_match()->Mutable(index)->assign(value.data(),
-                                                     value.size());
-  // @@protoc_insertion_point(field_set_string_piece:io.deephaven.proto.backplane.grpc.ExactJoinTablesRequest.columns_to_match)
-}
-inline void ExactJoinTablesRequest::add_columns_to_match(const std::string& value) {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  _internal_mutable_columns_to_match()->Add()->assign(value);
-  // @@protoc_insertion_point(field_add:io.deephaven.proto.backplane.grpc.ExactJoinTablesRequest.columns_to_match)
-}
-inline void ExactJoinTablesRequest::add_columns_to_match(std::string&& value) {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  _internal_mutable_columns_to_match()->Add(std::move(value));
-  // @@protoc_insertion_point(field_add:io.deephaven.proto.backplane.grpc.ExactJoinTablesRequest.columns_to_match)
-}
-inline void ExactJoinTablesRequest::add_columns_to_match(const char* value) {
-  ABSL_DCHECK(value != nullptr);
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  _internal_mutable_columns_to_match()->Add()->assign(value);
-  // @@protoc_insertion_point(field_add_char:io.deephaven.proto.backplane.grpc.ExactJoinTablesRequest.columns_to_match)
-}
-inline void ExactJoinTablesRequest::add_columns_to_match(const char* value, std::size_t size) {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  _internal_mutable_columns_to_match()->Add()->assign(
-      reinterpret_cast<const char*>(value), size);
-  // @@protoc_insertion_point(field_add_pointer:io.deephaven.proto.backplane.grpc.ExactJoinTablesRequest.columns_to_match)
-}
-inline void ExactJoinTablesRequest::add_columns_to_match(absl::string_view value) {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  _internal_mutable_columns_to_match()->Add()->assign(value.data(), value.size());
-  // @@protoc_insertion_point(field_add_string_piece:io.deephaven.proto.backplane.grpc.ExactJoinTablesRequest.columns_to_match)
-}
-inline const ::google::protobuf::RepeatedPtrField<std::string>&
-ExactJoinTablesRequest::columns_to_match() const ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  // @@protoc_insertion_point(field_list:io.deephaven.proto.backplane.grpc.ExactJoinTablesRequest.columns_to_match)
-  return _internal_columns_to_match();
-}
-inline ::google::protobuf::RepeatedPtrField<std::string>*
-ExactJoinTablesRequest::mutable_columns_to_match() ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  // @@protoc_insertion_point(field_mutable_list:io.deephaven.proto.backplane.grpc.ExactJoinTablesRequest.columns_to_match)
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  return _internal_mutable_columns_to_match();
-}
-inline const ::google::protobuf::RepeatedPtrField<std::string>&
-ExactJoinTablesRequest::_internal_columns_to_match() const {
-  PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race);
-  return _impl_.columns_to_match_;
-}
-inline ::google::protobuf::RepeatedPtrField<std::string>*
-ExactJoinTablesRequest::_internal_mutable_columns_to_match() {
-  PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race);
-  return &_impl_.columns_to_match_;
-}
-
-// repeated string columns_to_add = 5;
-inline int ExactJoinTablesRequest::_internal_columns_to_add_size() const {
-  return _internal_columns_to_add().size();
-}
-inline int ExactJoinTablesRequest::columns_to_add_size() const {
-  return _internal_columns_to_add_size();
-}
-inline void ExactJoinTablesRequest::clear_columns_to_add() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  _impl_.columns_to_add_.Clear();
-}
-inline std::string* ExactJoinTablesRequest::add_columns_to_add()
-    ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  std::string* _s = _internal_mutable_columns_to_add()->Add();
-  // @@protoc_insertion_point(field_add_mutable:io.deephaven.proto.backplane.grpc.ExactJoinTablesRequest.columns_to_add)
-  return _s;
-}
-inline const std::string& ExactJoinTablesRequest::columns_to_add(int index) const
-    ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  // @@protoc_insertion_point(field_get:io.deephaven.proto.backplane.grpc.ExactJoinTablesRequest.columns_to_add)
-  return _internal_columns_to_add().Get(index);
-}
-inline std::string* ExactJoinTablesRequest::mutable_columns_to_add(int index)
-    ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  // @@protoc_insertion_point(field_mutable:io.deephaven.proto.backplane.grpc.ExactJoinTablesRequest.columns_to_add)
-  return _internal_mutable_columns_to_add()->Mutable(index);
-}
-inline void ExactJoinTablesRequest::set_columns_to_add(int index, const std::string& value) {
-  _internal_mutable_columns_to_add()->Mutable(index)->assign(value);
-  // @@protoc_insertion_point(field_set:io.deephaven.proto.backplane.grpc.ExactJoinTablesRequest.columns_to_add)
-}
-inline void ExactJoinTablesRequest::set_columns_to_add(int index, std::string&& value) {
-  _internal_mutable_columns_to_add()->Mutable(index)->assign(std::move(value));
-  // @@protoc_insertion_point(field_set:io.deephaven.proto.backplane.grpc.ExactJoinTablesRequest.columns_to_add)
-}
-inline void ExactJoinTablesRequest::set_columns_to_add(int index, const char* value) {
-  ABSL_DCHECK(value != nullptr);
-  _internal_mutable_columns_to_add()->Mutable(index)->assign(value);
-  // @@protoc_insertion_point(field_set_char:io.deephaven.proto.backplane.grpc.ExactJoinTablesRequest.columns_to_add)
-}
-inline void ExactJoinTablesRequest::set_columns_to_add(int index, const char* value,
-                              std::size_t size) {
-  _internal_mutable_columns_to_add()->Mutable(index)->assign(
-      reinterpret_cast<const char*>(value), size);
-  // @@protoc_insertion_point(field_set_pointer:io.deephaven.proto.backplane.grpc.ExactJoinTablesRequest.columns_to_add)
-}
-inline void ExactJoinTablesRequest::set_columns_to_add(int index, absl::string_view value) {
-  _internal_mutable_columns_to_add()->Mutable(index)->assign(value.data(),
-                                                     value.size());
-  // @@protoc_insertion_point(field_set_string_piece:io.deephaven.proto.backplane.grpc.ExactJoinTablesRequest.columns_to_add)
-}
-inline void ExactJoinTablesRequest::add_columns_to_add(const std::string& value) {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  _internal_mutable_columns_to_add()->Add()->assign(value);
-  // @@protoc_insertion_point(field_add:io.deephaven.proto.backplane.grpc.ExactJoinTablesRequest.columns_to_add)
-}
-inline void ExactJoinTablesRequest::add_columns_to_add(std::string&& value) {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  _internal_mutable_columns_to_add()->Add(std::move(value));
-  // @@protoc_insertion_point(field_add:io.deephaven.proto.backplane.grpc.ExactJoinTablesRequest.columns_to_add)
-}
-inline void ExactJoinTablesRequest::add_columns_to_add(const char* value) {
-  ABSL_DCHECK(value != nullptr);
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  _internal_mutable_columns_to_add()->Add()->assign(value);
-  // @@protoc_insertion_point(field_add_char:io.deephaven.proto.backplane.grpc.ExactJoinTablesRequest.columns_to_add)
-}
-inline void ExactJoinTablesRequest::add_columns_to_add(const char* value, std::size_t size) {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  _internal_mutable_columns_to_add()->Add()->assign(
-      reinterpret_cast<const char*>(value), size);
-  // @@protoc_insertion_point(field_add_pointer:io.deephaven.proto.backplane.grpc.ExactJoinTablesRequest.columns_to_add)
-}
-inline void ExactJoinTablesRequest::add_columns_to_add(absl::string_view value) {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  _internal_mutable_columns_to_add()->Add()->assign(value.data(), value.size());
-  // @@protoc_insertion_point(field_add_string_piece:io.deephaven.proto.backplane.grpc.ExactJoinTablesRequest.columns_to_add)
-}
-inline const ::google::protobuf::RepeatedPtrField<std::string>&
-ExactJoinTablesRequest::columns_to_add() const ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  // @@protoc_insertion_point(field_list:io.deephaven.proto.backplane.grpc.ExactJoinTablesRequest.columns_to_add)
-  return _internal_columns_to_add();
-}
-inline ::google::protobuf::RepeatedPtrField<std::string>*
-ExactJoinTablesRequest::mutable_columns_to_add() ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  // @@protoc_insertion_point(field_mutable_list:io.deephaven.proto.backplane.grpc.ExactJoinTablesRequest.columns_to_add)
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  return _internal_mutable_columns_to_add();
-}
-inline const ::google::protobuf::RepeatedPtrField<std::string>&
-ExactJoinTablesRequest::_internal_columns_to_add() const {
-  PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race);
-  return _impl_.columns_to_add_;
-}
-inline ::google::protobuf::RepeatedPtrField<std::string>*
-ExactJoinTablesRequest::_internal_mutable_columns_to_add() {
-  PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race);
-  return &_impl_.columns_to_add_;
-}
-
-// -------------------------------------------------------------------
-
-// LeftJoinTablesRequest
-
-// .io.deephaven.proto.backplane.grpc.Ticket result_id = 1;
-inline bool LeftJoinTablesRequest::has_result_id() const {
-  bool value = (_impl_._has_bits_[0] & 0x00000001u) != 0;
-  PROTOBUF_ASSUME(!value || _impl_.result_id_ != nullptr);
-  return value;
-}
-inline const ::io::deephaven::proto::backplane::grpc::Ticket& LeftJoinTablesRequest::_internal_result_id() const {
-  PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race);
-  const ::io::deephaven::proto::backplane::grpc::Ticket* p = _impl_.result_id_;
-  return p != nullptr ? *p : reinterpret_cast<const ::io::deephaven::proto::backplane::grpc::Ticket&>(::io::deephaven::proto::backplane::grpc::_Ticket_default_instance_);
-}
-inline const ::io::deephaven::proto::backplane::grpc::Ticket& LeftJoinTablesRequest::result_id() const ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  // @@protoc_insertion_point(field_get:io.deephaven.proto.backplane.grpc.LeftJoinTablesRequest.result_id)
-  return _internal_result_id();
-}
-inline void LeftJoinTablesRequest::unsafe_arena_set_allocated_result_id(::io::deephaven::proto::backplane::grpc::Ticket* value) {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  if (GetArena() == nullptr) {
-    delete reinterpret_cast<::google::protobuf::MessageLite*>(_impl_.result_id_);
-  }
-  _impl_.result_id_ = reinterpret_cast<::io::deephaven::proto::backplane::grpc::Ticket*>(value);
-  if (value != nullptr) {
-    _impl_._has_bits_[0] |= 0x00000001u;
-  } else {
-    _impl_._has_bits_[0] &= ~0x00000001u;
-  }
-  // @@protoc_insertion_point(field_unsafe_arena_set_allocated:io.deephaven.proto.backplane.grpc.LeftJoinTablesRequest.result_id)
-}
-inline ::io::deephaven::proto::backplane::grpc::Ticket* LeftJoinTablesRequest::release_result_id() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-
-  _impl_._has_bits_[0] &= ~0x00000001u;
-  ::io::deephaven::proto::backplane::grpc::Ticket* released = _impl_.result_id_;
-  _impl_.result_id_ = nullptr;
-#ifdef PROTOBUF_FORCE_COPY_IN_RELEASE
-  auto* old = reinterpret_cast<::google::protobuf::MessageLite*>(released);
-  released = ::google::protobuf::internal::DuplicateIfNonNull(released);
-  if (GetArena() == nullptr) {
-    delete old;
-  }
-#else   // PROTOBUF_FORCE_COPY_IN_RELEASE
-  if (GetArena() != nullptr) {
-    released = ::google::protobuf::internal::DuplicateIfNonNull(released);
-  }
-#endif  // !PROTOBUF_FORCE_COPY_IN_RELEASE
-  return released;
-}
-inline ::io::deephaven::proto::backplane::grpc::Ticket* LeftJoinTablesRequest::unsafe_arena_release_result_id() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  // @@protoc_insertion_point(field_release:io.deephaven.proto.backplane.grpc.LeftJoinTablesRequest.result_id)
-
-  _impl_._has_bits_[0] &= ~0x00000001u;
-  ::io::deephaven::proto::backplane::grpc::Ticket* temp = _impl_.result_id_;
-  _impl_.result_id_ = nullptr;
-  return temp;
-}
-inline ::io::deephaven::proto::backplane::grpc::Ticket* LeftJoinTablesRequest::_internal_mutable_result_id() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  _impl_._has_bits_[0] |= 0x00000001u;
-  if (_impl_.result_id_ == nullptr) {
-    auto* p = CreateMaybeMessage<::io::deephaven::proto::backplane::grpc::Ticket>(GetArena());
-    _impl_.result_id_ = reinterpret_cast<::io::deephaven::proto::backplane::grpc::Ticket*>(p);
-  }
-  return _impl_.result_id_;
-}
-inline ::io::deephaven::proto::backplane::grpc::Ticket* LeftJoinTablesRequest::mutable_result_id() ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  ::io::deephaven::proto::backplane::grpc::Ticket* _msg = _internal_mutable_result_id();
-  // @@protoc_insertion_point(field_mutable:io.deephaven.proto.backplane.grpc.LeftJoinTablesRequest.result_id)
-  return _msg;
-}
-inline void LeftJoinTablesRequest::set_allocated_result_id(::io::deephaven::proto::backplane::grpc::Ticket* value) {
-  ::google::protobuf::Arena* message_arena = GetArena();
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  if (message_arena == nullptr) {
-    delete reinterpret_cast<::google::protobuf::MessageLite*>(_impl_.result_id_);
-  }
-
-  if (value != nullptr) {
-    ::google::protobuf::Arena* submessage_arena = reinterpret_cast<::google::protobuf::MessageLite*>(value)->GetArena();
-    if (message_arena != submessage_arena) {
-      value = ::google::protobuf::internal::GetOwnedMessage(message_arena, value, submessage_arena);
-    }
-    _impl_._has_bits_[0] |= 0x00000001u;
-  } else {
-    _impl_._has_bits_[0] &= ~0x00000001u;
-  }
-
-  _impl_.result_id_ = reinterpret_cast<::io::deephaven::proto::backplane::grpc::Ticket*>(value);
-  // @@protoc_insertion_point(field_set_allocated:io.deephaven.proto.backplane.grpc.LeftJoinTablesRequest.result_id)
-}
-
-// .io.deephaven.proto.backplane.grpc.TableReference left_id = 2;
-inline bool LeftJoinTablesRequest::has_left_id() const {
-  bool value = (_impl_._has_bits_[0] & 0x00000002u) != 0;
-  PROTOBUF_ASSUME(!value || _impl_.left_id_ != nullptr);
-  return value;
-}
-inline void LeftJoinTablesRequest::clear_left_id() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  if (_impl_.left_id_ != nullptr) _impl_.left_id_->Clear();
-  _impl_._has_bits_[0] &= ~0x00000002u;
-}
-inline const ::io::deephaven::proto::backplane::grpc::TableReference& LeftJoinTablesRequest::_internal_left_id() const {
-  PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race);
-  const ::io::deephaven::proto::backplane::grpc::TableReference* p = _impl_.left_id_;
-  return p != nullptr ? *p : reinterpret_cast<const ::io::deephaven::proto::backplane::grpc::TableReference&>(::io::deephaven::proto::backplane::grpc::_TableReference_default_instance_);
-}
-inline const ::io::deephaven::proto::backplane::grpc::TableReference& LeftJoinTablesRequest::left_id() const ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  // @@protoc_insertion_point(field_get:io.deephaven.proto.backplane.grpc.LeftJoinTablesRequest.left_id)
-  return _internal_left_id();
-}
-inline void LeftJoinTablesRequest::unsafe_arena_set_allocated_left_id(::io::deephaven::proto::backplane::grpc::TableReference* value) {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  if (GetArena() == nullptr) {
-    delete reinterpret_cast<::google::protobuf::MessageLite*>(_impl_.left_id_);
-  }
-  _impl_.left_id_ = reinterpret_cast<::io::deephaven::proto::backplane::grpc::TableReference*>(value);
-  if (value != nullptr) {
-    _impl_._has_bits_[0] |= 0x00000002u;
-  } else {
-    _impl_._has_bits_[0] &= ~0x00000002u;
-  }
-  // @@protoc_insertion_point(field_unsafe_arena_set_allocated:io.deephaven.proto.backplane.grpc.LeftJoinTablesRequest.left_id)
-}
-inline ::io::deephaven::proto::backplane::grpc::TableReference* LeftJoinTablesRequest::release_left_id() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-
-  _impl_._has_bits_[0] &= ~0x00000002u;
-  ::io::deephaven::proto::backplane::grpc::TableReference* released = _impl_.left_id_;
-  _impl_.left_id_ = nullptr;
-#ifdef PROTOBUF_FORCE_COPY_IN_RELEASE
-  auto* old = reinterpret_cast<::google::protobuf::MessageLite*>(released);
-  released = ::google::protobuf::internal::DuplicateIfNonNull(released);
-  if (GetArena() == nullptr) {
-    delete old;
-  }
-#else   // PROTOBUF_FORCE_COPY_IN_RELEASE
-  if (GetArena() != nullptr) {
-    released = ::google::protobuf::internal::DuplicateIfNonNull(released);
-  }
-#endif  // !PROTOBUF_FORCE_COPY_IN_RELEASE
-  return released;
-}
-inline ::io::deephaven::proto::backplane::grpc::TableReference* LeftJoinTablesRequest::unsafe_arena_release_left_id() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  // @@protoc_insertion_point(field_release:io.deephaven.proto.backplane.grpc.LeftJoinTablesRequest.left_id)
-
-  _impl_._has_bits_[0] &= ~0x00000002u;
-  ::io::deephaven::proto::backplane::grpc::TableReference* temp = _impl_.left_id_;
-  _impl_.left_id_ = nullptr;
-  return temp;
-}
-inline ::io::deephaven::proto::backplane::grpc::TableReference* LeftJoinTablesRequest::_internal_mutable_left_id() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  _impl_._has_bits_[0] |= 0x00000002u;
-  if (_impl_.left_id_ == nullptr) {
-    auto* p = CreateMaybeMessage<::io::deephaven::proto::backplane::grpc::TableReference>(GetArena());
-    _impl_.left_id_ = reinterpret_cast<::io::deephaven::proto::backplane::grpc::TableReference*>(p);
-  }
-  return _impl_.left_id_;
-}
-inline ::io::deephaven::proto::backplane::grpc::TableReference* LeftJoinTablesRequest::mutable_left_id() ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  ::io::deephaven::proto::backplane::grpc::TableReference* _msg = _internal_mutable_left_id();
-  // @@protoc_insertion_point(field_mutable:io.deephaven.proto.backplane.grpc.LeftJoinTablesRequest.left_id)
-  return _msg;
-}
-inline void LeftJoinTablesRequest::set_allocated_left_id(::io::deephaven::proto::backplane::grpc::TableReference* value) {
-  ::google::protobuf::Arena* message_arena = GetArena();
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  if (message_arena == nullptr) {
-    delete reinterpret_cast<::io::deephaven::proto::backplane::grpc::TableReference*>(_impl_.left_id_);
-  }
-
-  if (value != nullptr) {
-    ::google::protobuf::Arena* submessage_arena = reinterpret_cast<::io::deephaven::proto::backplane::grpc::TableReference*>(value)->GetArena();
-    if (message_arena != submessage_arena) {
-      value = ::google::protobuf::internal::GetOwnedMessage(message_arena, value, submessage_arena);
-    }
-    _impl_._has_bits_[0] |= 0x00000002u;
-  } else {
-    _impl_._has_bits_[0] &= ~0x00000002u;
-  }
-
-  _impl_.left_id_ = reinterpret_cast<::io::deephaven::proto::backplane::grpc::TableReference*>(value);
-  // @@protoc_insertion_point(field_set_allocated:io.deephaven.proto.backplane.grpc.LeftJoinTablesRequest.left_id)
-}
-
-// .io.deephaven.proto.backplane.grpc.TableReference right_id = 3;
-inline bool LeftJoinTablesRequest::has_right_id() const {
-  bool value = (_impl_._has_bits_[0] & 0x00000004u) != 0;
-  PROTOBUF_ASSUME(!value || _impl_.right_id_ != nullptr);
-  return value;
-}
-inline void LeftJoinTablesRequest::clear_right_id() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  if (_impl_.right_id_ != nullptr) _impl_.right_id_->Clear();
-  _impl_._has_bits_[0] &= ~0x00000004u;
-}
-inline const ::io::deephaven::proto::backplane::grpc::TableReference& LeftJoinTablesRequest::_internal_right_id() const {
-  PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race);
-  const ::io::deephaven::proto::backplane::grpc::TableReference* p = _impl_.right_id_;
-  return p != nullptr ? *p : reinterpret_cast<const ::io::deephaven::proto::backplane::grpc::TableReference&>(::io::deephaven::proto::backplane::grpc::_TableReference_default_instance_);
-}
-inline const ::io::deephaven::proto::backplane::grpc::TableReference& LeftJoinTablesRequest::right_id() const ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  // @@protoc_insertion_point(field_get:io.deephaven.proto.backplane.grpc.LeftJoinTablesRequest.right_id)
-  return _internal_right_id();
-}
-inline void LeftJoinTablesRequest::unsafe_arena_set_allocated_right_id(::io::deephaven::proto::backplane::grpc::TableReference* value) {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  if (GetArena() == nullptr) {
-    delete reinterpret_cast<::google::protobuf::MessageLite*>(_impl_.right_id_);
-  }
-  _impl_.right_id_ = reinterpret_cast<::io::deephaven::proto::backplane::grpc::TableReference*>(value);
-  if (value != nullptr) {
-    _impl_._has_bits_[0] |= 0x00000004u;
-  } else {
-    _impl_._has_bits_[0] &= ~0x00000004u;
-  }
-  // @@protoc_insertion_point(field_unsafe_arena_set_allocated:io.deephaven.proto.backplane.grpc.LeftJoinTablesRequest.right_id)
-}
-inline ::io::deephaven::proto::backplane::grpc::TableReference* LeftJoinTablesRequest::release_right_id() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-
-  _impl_._has_bits_[0] &= ~0x00000004u;
-  ::io::deephaven::proto::backplane::grpc::TableReference* released = _impl_.right_id_;
-  _impl_.right_id_ = nullptr;
-#ifdef PROTOBUF_FORCE_COPY_IN_RELEASE
-  auto* old = reinterpret_cast<::google::protobuf::MessageLite*>(released);
-  released = ::google::protobuf::internal::DuplicateIfNonNull(released);
-  if (GetArena() == nullptr) {
-    delete old;
-  }
-#else   // PROTOBUF_FORCE_COPY_IN_RELEASE
-  if (GetArena() != nullptr) {
-    released = ::google::protobuf::internal::DuplicateIfNonNull(released);
-  }
-#endif  // !PROTOBUF_FORCE_COPY_IN_RELEASE
-  return released;
-}
-inline ::io::deephaven::proto::backplane::grpc::TableReference* LeftJoinTablesRequest::unsafe_arena_release_right_id() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  // @@protoc_insertion_point(field_release:io.deephaven.proto.backplane.grpc.LeftJoinTablesRequest.right_id)
-
-  _impl_._has_bits_[0] &= ~0x00000004u;
-  ::io::deephaven::proto::backplane::grpc::TableReference* temp = _impl_.right_id_;
-  _impl_.right_id_ = nullptr;
-  return temp;
-}
-inline ::io::deephaven::proto::backplane::grpc::TableReference* LeftJoinTablesRequest::_internal_mutable_right_id() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  _impl_._has_bits_[0] |= 0x00000004u;
-  if (_impl_.right_id_ == nullptr) {
-    auto* p = CreateMaybeMessage<::io::deephaven::proto::backplane::grpc::TableReference>(GetArena());
-    _impl_.right_id_ = reinterpret_cast<::io::deephaven::proto::backplane::grpc::TableReference*>(p);
-  }
-  return _impl_.right_id_;
-}
-inline ::io::deephaven::proto::backplane::grpc::TableReference* LeftJoinTablesRequest::mutable_right_id() ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  ::io::deephaven::proto::backplane::grpc::TableReference* _msg = _internal_mutable_right_id();
-  // @@protoc_insertion_point(field_mutable:io.deephaven.proto.backplane.grpc.LeftJoinTablesRequest.right_id)
-  return _msg;
-}
-inline void LeftJoinTablesRequest::set_allocated_right_id(::io::deephaven::proto::backplane::grpc::TableReference* value) {
-  ::google::protobuf::Arena* message_arena = GetArena();
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  if (message_arena == nullptr) {
-    delete reinterpret_cast<::io::deephaven::proto::backplane::grpc::TableReference*>(_impl_.right_id_);
-  }
-
-  if (value != nullptr) {
-    ::google::protobuf::Arena* submessage_arena = reinterpret_cast<::io::deephaven::proto::backplane::grpc::TableReference*>(value)->GetArena();
-    if (message_arena != submessage_arena) {
-      value = ::google::protobuf::internal::GetOwnedMessage(message_arena, value, submessage_arena);
-    }
-    _impl_._has_bits_[0] |= 0x00000004u;
-  } else {
-    _impl_._has_bits_[0] &= ~0x00000004u;
-  }
-
-  _impl_.right_id_ = reinterpret_cast<::io::deephaven::proto::backplane::grpc::TableReference*>(value);
-  // @@protoc_insertion_point(field_set_allocated:io.deephaven.proto.backplane.grpc.LeftJoinTablesRequest.right_id)
-}
-
-// repeated string columns_to_match = 4;
-inline int LeftJoinTablesRequest::_internal_columns_to_match_size() const {
-  return _internal_columns_to_match().size();
-}
-inline int LeftJoinTablesRequest::columns_to_match_size() const {
-  return _internal_columns_to_match_size();
-}
-inline void LeftJoinTablesRequest::clear_columns_to_match() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  _impl_.columns_to_match_.Clear();
-}
-inline std::string* LeftJoinTablesRequest::add_columns_to_match()
-    ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  std::string* _s = _internal_mutable_columns_to_match()->Add();
-  // @@protoc_insertion_point(field_add_mutable:io.deephaven.proto.backplane.grpc.LeftJoinTablesRequest.columns_to_match)
-  return _s;
-}
-inline const std::string& LeftJoinTablesRequest::columns_to_match(int index) const
-    ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  // @@protoc_insertion_point(field_get:io.deephaven.proto.backplane.grpc.LeftJoinTablesRequest.columns_to_match)
-  return _internal_columns_to_match().Get(index);
-}
-inline std::string* LeftJoinTablesRequest::mutable_columns_to_match(int index)
-    ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  // @@protoc_insertion_point(field_mutable:io.deephaven.proto.backplane.grpc.LeftJoinTablesRequest.columns_to_match)
-  return _internal_mutable_columns_to_match()->Mutable(index);
-}
-inline void LeftJoinTablesRequest::set_columns_to_match(int index, const std::string& value) {
-  _internal_mutable_columns_to_match()->Mutable(index)->assign(value);
-  // @@protoc_insertion_point(field_set:io.deephaven.proto.backplane.grpc.LeftJoinTablesRequest.columns_to_match)
-}
-inline void LeftJoinTablesRequest::set_columns_to_match(int index, std::string&& value) {
-  _internal_mutable_columns_to_match()->Mutable(index)->assign(std::move(value));
-  // @@protoc_insertion_point(field_set:io.deephaven.proto.backplane.grpc.LeftJoinTablesRequest.columns_to_match)
-}
-inline void LeftJoinTablesRequest::set_columns_to_match(int index, const char* value) {
-  ABSL_DCHECK(value != nullptr);
-  _internal_mutable_columns_to_match()->Mutable(index)->assign(value);
-  // @@protoc_insertion_point(field_set_char:io.deephaven.proto.backplane.grpc.LeftJoinTablesRequest.columns_to_match)
-}
-inline void LeftJoinTablesRequest::set_columns_to_match(int index, const char* value,
-                              std::size_t size) {
-  _internal_mutable_columns_to_match()->Mutable(index)->assign(
-      reinterpret_cast<const char*>(value), size);
-  // @@protoc_insertion_point(field_set_pointer:io.deephaven.proto.backplane.grpc.LeftJoinTablesRequest.columns_to_match)
-}
-inline void LeftJoinTablesRequest::set_columns_to_match(int index, absl::string_view value) {
-  _internal_mutable_columns_to_match()->Mutable(index)->assign(value.data(),
-                                                     value.size());
-  // @@protoc_insertion_point(field_set_string_piece:io.deephaven.proto.backplane.grpc.LeftJoinTablesRequest.columns_to_match)
-}
-inline void LeftJoinTablesRequest::add_columns_to_match(const std::string& value) {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  _internal_mutable_columns_to_match()->Add()->assign(value);
-  // @@protoc_insertion_point(field_add:io.deephaven.proto.backplane.grpc.LeftJoinTablesRequest.columns_to_match)
-}
-inline void LeftJoinTablesRequest::add_columns_to_match(std::string&& value) {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  _internal_mutable_columns_to_match()->Add(std::move(value));
-  // @@protoc_insertion_point(field_add:io.deephaven.proto.backplane.grpc.LeftJoinTablesRequest.columns_to_match)
-}
-inline void LeftJoinTablesRequest::add_columns_to_match(const char* value) {
-  ABSL_DCHECK(value != nullptr);
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  _internal_mutable_columns_to_match()->Add()->assign(value);
-  // @@protoc_insertion_point(field_add_char:io.deephaven.proto.backplane.grpc.LeftJoinTablesRequest.columns_to_match)
-}
-inline void LeftJoinTablesRequest::add_columns_to_match(const char* value, std::size_t size) {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  _internal_mutable_columns_to_match()->Add()->assign(
-      reinterpret_cast<const char*>(value), size);
-  // @@protoc_insertion_point(field_add_pointer:io.deephaven.proto.backplane.grpc.LeftJoinTablesRequest.columns_to_match)
-}
-inline void LeftJoinTablesRequest::add_columns_to_match(absl::string_view value) {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  _internal_mutable_columns_to_match()->Add()->assign(value.data(), value.size());
-  // @@protoc_insertion_point(field_add_string_piece:io.deephaven.proto.backplane.grpc.LeftJoinTablesRequest.columns_to_match)
-}
-inline const ::google::protobuf::RepeatedPtrField<std::string>&
-LeftJoinTablesRequest::columns_to_match() const ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  // @@protoc_insertion_point(field_list:io.deephaven.proto.backplane.grpc.LeftJoinTablesRequest.columns_to_match)
-  return _internal_columns_to_match();
-}
-inline ::google::protobuf::RepeatedPtrField<std::string>*
-LeftJoinTablesRequest::mutable_columns_to_match() ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  // @@protoc_insertion_point(field_mutable_list:io.deephaven.proto.backplane.grpc.LeftJoinTablesRequest.columns_to_match)
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  return _internal_mutable_columns_to_match();
-}
-inline const ::google::protobuf::RepeatedPtrField<std::string>&
-LeftJoinTablesRequest::_internal_columns_to_match() const {
-  PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race);
-  return _impl_.columns_to_match_;
-}
-inline ::google::protobuf::RepeatedPtrField<std::string>*
-LeftJoinTablesRequest::_internal_mutable_columns_to_match() {
-  PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race);
-  return &_impl_.columns_to_match_;
-}
-
-// repeated string columns_to_add = 5;
-inline int LeftJoinTablesRequest::_internal_columns_to_add_size() const {
-  return _internal_columns_to_add().size();
-}
-inline int LeftJoinTablesRequest::columns_to_add_size() const {
-  return _internal_columns_to_add_size();
-}
-inline void LeftJoinTablesRequest::clear_columns_to_add() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  _impl_.columns_to_add_.Clear();
-}
-inline std::string* LeftJoinTablesRequest::add_columns_to_add()
-    ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  std::string* _s = _internal_mutable_columns_to_add()->Add();
-  // @@protoc_insertion_point(field_add_mutable:io.deephaven.proto.backplane.grpc.LeftJoinTablesRequest.columns_to_add)
-  return _s;
-}
-inline const std::string& LeftJoinTablesRequest::columns_to_add(int index) const
-    ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  // @@protoc_insertion_point(field_get:io.deephaven.proto.backplane.grpc.LeftJoinTablesRequest.columns_to_add)
-  return _internal_columns_to_add().Get(index);
-}
-inline std::string* LeftJoinTablesRequest::mutable_columns_to_add(int index)
-    ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  // @@protoc_insertion_point(field_mutable:io.deephaven.proto.backplane.grpc.LeftJoinTablesRequest.columns_to_add)
-  return _internal_mutable_columns_to_add()->Mutable(index);
-}
-inline void LeftJoinTablesRequest::set_columns_to_add(int index, const std::string& value) {
-  _internal_mutable_columns_to_add()->Mutable(index)->assign(value);
-  // @@protoc_insertion_point(field_set:io.deephaven.proto.backplane.grpc.LeftJoinTablesRequest.columns_to_add)
-}
-inline void LeftJoinTablesRequest::set_columns_to_add(int index, std::string&& value) {
-  _internal_mutable_columns_to_add()->Mutable(index)->assign(std::move(value));
-  // @@protoc_insertion_point(field_set:io.deephaven.proto.backplane.grpc.LeftJoinTablesRequest.columns_to_add)
-}
-inline void LeftJoinTablesRequest::set_columns_to_add(int index, const char* value) {
-  ABSL_DCHECK(value != nullptr);
-  _internal_mutable_columns_to_add()->Mutable(index)->assign(value);
-  // @@protoc_insertion_point(field_set_char:io.deephaven.proto.backplane.grpc.LeftJoinTablesRequest.columns_to_add)
-}
-inline void LeftJoinTablesRequest::set_columns_to_add(int index, const char* value,
-                              std::size_t size) {
-  _internal_mutable_columns_to_add()->Mutable(index)->assign(
-      reinterpret_cast<const char*>(value), size);
-  // @@protoc_insertion_point(field_set_pointer:io.deephaven.proto.backplane.grpc.LeftJoinTablesRequest.columns_to_add)
-}
-inline void LeftJoinTablesRequest::set_columns_to_add(int index, absl::string_view value) {
-  _internal_mutable_columns_to_add()->Mutable(index)->assign(value.data(),
-                                                     value.size());
-  // @@protoc_insertion_point(field_set_string_piece:io.deephaven.proto.backplane.grpc.LeftJoinTablesRequest.columns_to_add)
-}
-inline void LeftJoinTablesRequest::add_columns_to_add(const std::string& value) {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  _internal_mutable_columns_to_add()->Add()->assign(value);
-  // @@protoc_insertion_point(field_add:io.deephaven.proto.backplane.grpc.LeftJoinTablesRequest.columns_to_add)
-}
-inline void LeftJoinTablesRequest::add_columns_to_add(std::string&& value) {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  _internal_mutable_columns_to_add()->Add(std::move(value));
-  // @@protoc_insertion_point(field_add:io.deephaven.proto.backplane.grpc.LeftJoinTablesRequest.columns_to_add)
-}
-inline void LeftJoinTablesRequest::add_columns_to_add(const char* value) {
-  ABSL_DCHECK(value != nullptr);
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  _internal_mutable_columns_to_add()->Add()->assign(value);
-  // @@protoc_insertion_point(field_add_char:io.deephaven.proto.backplane.grpc.LeftJoinTablesRequest.columns_to_add)
-}
-inline void LeftJoinTablesRequest::add_columns_to_add(const char* value, std::size_t size) {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  _internal_mutable_columns_to_add()->Add()->assign(
-      reinterpret_cast<const char*>(value), size);
-  // @@protoc_insertion_point(field_add_pointer:io.deephaven.proto.backplane.grpc.LeftJoinTablesRequest.columns_to_add)
-}
-inline void LeftJoinTablesRequest::add_columns_to_add(absl::string_view value) {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  _internal_mutable_columns_to_add()->Add()->assign(value.data(), value.size());
-  // @@protoc_insertion_point(field_add_string_piece:io.deephaven.proto.backplane.grpc.LeftJoinTablesRequest.columns_to_add)
-}
-inline const ::google::protobuf::RepeatedPtrField<std::string>&
-LeftJoinTablesRequest::columns_to_add() const ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  // @@protoc_insertion_point(field_list:io.deephaven.proto.backplane.grpc.LeftJoinTablesRequest.columns_to_add)
-  return _internal_columns_to_add();
-}
-inline ::google::protobuf::RepeatedPtrField<std::string>*
-LeftJoinTablesRequest::mutable_columns_to_add() ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  // @@protoc_insertion_point(field_mutable_list:io.deephaven.proto.backplane.grpc.LeftJoinTablesRequest.columns_to_add)
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  return _internal_mutable_columns_to_add();
-}
-inline const ::google::protobuf::RepeatedPtrField<std::string>&
-LeftJoinTablesRequest::_internal_columns_to_add() const {
-  PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race);
-  return _impl_.columns_to_add_;
-}
-inline ::google::protobuf::RepeatedPtrField<std::string>*
-LeftJoinTablesRequest::_internal_mutable_columns_to_add() {
-  PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race);
-  return &_impl_.columns_to_add_;
-}
-
-// -------------------------------------------------------------------
-
-// AsOfJoinTablesRequest
-
-// .io.deephaven.proto.backplane.grpc.Ticket result_id = 1;
-inline bool AsOfJoinTablesRequest::has_result_id() const {
-  bool value = (_impl_._has_bits_[0] & 0x00000001u) != 0;
-  PROTOBUF_ASSUME(!value || _impl_.result_id_ != nullptr);
-  return value;
-}
-inline const ::io::deephaven::proto::backplane::grpc::Ticket& AsOfJoinTablesRequest::_internal_result_id() const {
-  PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race);
-  const ::io::deephaven::proto::backplane::grpc::Ticket* p = _impl_.result_id_;
-  return p != nullptr ? *p : reinterpret_cast<const ::io::deephaven::proto::backplane::grpc::Ticket&>(::io::deephaven::proto::backplane::grpc::_Ticket_default_instance_);
-}
-inline const ::io::deephaven::proto::backplane::grpc::Ticket& AsOfJoinTablesRequest::result_id() const ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  // @@protoc_insertion_point(field_get:io.deephaven.proto.backplane.grpc.AsOfJoinTablesRequest.result_id)
-  return _internal_result_id();
-}
-inline void AsOfJoinTablesRequest::unsafe_arena_set_allocated_result_id(::io::deephaven::proto::backplane::grpc::Ticket* value) {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  if (GetArena() == nullptr) {
-    delete reinterpret_cast<::google::protobuf::MessageLite*>(_impl_.result_id_);
-  }
-  _impl_.result_id_ = reinterpret_cast<::io::deephaven::proto::backplane::grpc::Ticket*>(value);
-  if (value != nullptr) {
-    _impl_._has_bits_[0] |= 0x00000001u;
-  } else {
-    _impl_._has_bits_[0] &= ~0x00000001u;
-  }
-  // @@protoc_insertion_point(field_unsafe_arena_set_allocated:io.deephaven.proto.backplane.grpc.AsOfJoinTablesRequest.result_id)
-}
-inline ::io::deephaven::proto::backplane::grpc::Ticket* AsOfJoinTablesRequest::release_result_id() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-
-  _impl_._has_bits_[0] &= ~0x00000001u;
-  ::io::deephaven::proto::backplane::grpc::Ticket* released = _impl_.result_id_;
-  _impl_.result_id_ = nullptr;
-#ifdef PROTOBUF_FORCE_COPY_IN_RELEASE
-  auto* old = reinterpret_cast<::google::protobuf::MessageLite*>(released);
-  released = ::google::protobuf::internal::DuplicateIfNonNull(released);
-  if (GetArena() == nullptr) {
-    delete old;
-  }
-#else   // PROTOBUF_FORCE_COPY_IN_RELEASE
-  if (GetArena() != nullptr) {
-    released = ::google::protobuf::internal::DuplicateIfNonNull(released);
-  }
-#endif  // !PROTOBUF_FORCE_COPY_IN_RELEASE
-  return released;
-}
-inline ::io::deephaven::proto::backplane::grpc::Ticket* AsOfJoinTablesRequest::unsafe_arena_release_result_id() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  // @@protoc_insertion_point(field_release:io.deephaven.proto.backplane.grpc.AsOfJoinTablesRequest.result_id)
-
-  _impl_._has_bits_[0] &= ~0x00000001u;
-  ::io::deephaven::proto::backplane::grpc::Ticket* temp = _impl_.result_id_;
-  _impl_.result_id_ = nullptr;
-  return temp;
-}
-inline ::io::deephaven::proto::backplane::grpc::Ticket* AsOfJoinTablesRequest::_internal_mutable_result_id() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  _impl_._has_bits_[0] |= 0x00000001u;
-  if (_impl_.result_id_ == nullptr) {
-    auto* p = CreateMaybeMessage<::io::deephaven::proto::backplane::grpc::Ticket>(GetArena());
-    _impl_.result_id_ = reinterpret_cast<::io::deephaven::proto::backplane::grpc::Ticket*>(p);
-  }
-  return _impl_.result_id_;
-}
-inline ::io::deephaven::proto::backplane::grpc::Ticket* AsOfJoinTablesRequest::mutable_result_id() ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  ::io::deephaven::proto::backplane::grpc::Ticket* _msg = _internal_mutable_result_id();
-  // @@protoc_insertion_point(field_mutable:io.deephaven.proto.backplane.grpc.AsOfJoinTablesRequest.result_id)
-  return _msg;
-}
-inline void AsOfJoinTablesRequest::set_allocated_result_id(::io::deephaven::proto::backplane::grpc::Ticket* value) {
-  ::google::protobuf::Arena* message_arena = GetArena();
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  if (message_arena == nullptr) {
-    delete reinterpret_cast<::google::protobuf::MessageLite*>(_impl_.result_id_);
-  }
-
-  if (value != nullptr) {
-    ::google::protobuf::Arena* submessage_arena = reinterpret_cast<::google::protobuf::MessageLite*>(value)->GetArena();
-    if (message_arena != submessage_arena) {
-      value = ::google::protobuf::internal::GetOwnedMessage(message_arena, value, submessage_arena);
-    }
-    _impl_._has_bits_[0] |= 0x00000001u;
-  } else {
-    _impl_._has_bits_[0] &= ~0x00000001u;
-  }
-
-  _impl_.result_id_ = reinterpret_cast<::io::deephaven::proto::backplane::grpc::Ticket*>(value);
-  // @@protoc_insertion_point(field_set_allocated:io.deephaven.proto.backplane.grpc.AsOfJoinTablesRequest.result_id)
-}
-
-// .io.deephaven.proto.backplane.grpc.TableReference left_id = 2;
-inline bool AsOfJoinTablesRequest::has_left_id() const {
-  bool value = (_impl_._has_bits_[0] & 0x00000002u) != 0;
-  PROTOBUF_ASSUME(!value || _impl_.left_id_ != nullptr);
-  return value;
-}
-inline void AsOfJoinTablesRequest::clear_left_id() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  if (_impl_.left_id_ != nullptr) _impl_.left_id_->Clear();
-  _impl_._has_bits_[0] &= ~0x00000002u;
-}
-inline const ::io::deephaven::proto::backplane::grpc::TableReference& AsOfJoinTablesRequest::_internal_left_id() const {
-  PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race);
-  const ::io::deephaven::proto::backplane::grpc::TableReference* p = _impl_.left_id_;
-  return p != nullptr ? *p : reinterpret_cast<const ::io::deephaven::proto::backplane::grpc::TableReference&>(::io::deephaven::proto::backplane::grpc::_TableReference_default_instance_);
-}
-inline const ::io::deephaven::proto::backplane::grpc::TableReference& AsOfJoinTablesRequest::left_id() const ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  // @@protoc_insertion_point(field_get:io.deephaven.proto.backplane.grpc.AsOfJoinTablesRequest.left_id)
-  return _internal_left_id();
-}
-inline void AsOfJoinTablesRequest::unsafe_arena_set_allocated_left_id(::io::deephaven::proto::backplane::grpc::TableReference* value) {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  if (GetArena() == nullptr) {
-    delete reinterpret_cast<::google::protobuf::MessageLite*>(_impl_.left_id_);
-  }
-  _impl_.left_id_ = reinterpret_cast<::io::deephaven::proto::backplane::grpc::TableReference*>(value);
-  if (value != nullptr) {
-    _impl_._has_bits_[0] |= 0x00000002u;
-  } else {
-    _impl_._has_bits_[0] &= ~0x00000002u;
-  }
-  // @@protoc_insertion_point(field_unsafe_arena_set_allocated:io.deephaven.proto.backplane.grpc.AsOfJoinTablesRequest.left_id)
-}
-inline ::io::deephaven::proto::backplane::grpc::TableReference* AsOfJoinTablesRequest::release_left_id() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-
-  _impl_._has_bits_[0] &= ~0x00000002u;
-  ::io::deephaven::proto::backplane::grpc::TableReference* released = _impl_.left_id_;
-  _impl_.left_id_ = nullptr;
-#ifdef PROTOBUF_FORCE_COPY_IN_RELEASE
-  auto* old = reinterpret_cast<::google::protobuf::MessageLite*>(released);
-  released = ::google::protobuf::internal::DuplicateIfNonNull(released);
-  if (GetArena() == nullptr) {
-    delete old;
-  }
-#else   // PROTOBUF_FORCE_COPY_IN_RELEASE
-  if (GetArena() != nullptr) {
-    released = ::google::protobuf::internal::DuplicateIfNonNull(released);
-  }
-#endif  // !PROTOBUF_FORCE_COPY_IN_RELEASE
-  return released;
-}
-inline ::io::deephaven::proto::backplane::grpc::TableReference* AsOfJoinTablesRequest::unsafe_arena_release_left_id() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  // @@protoc_insertion_point(field_release:io.deephaven.proto.backplane.grpc.AsOfJoinTablesRequest.left_id)
-
-  _impl_._has_bits_[0] &= ~0x00000002u;
-  ::io::deephaven::proto::backplane::grpc::TableReference* temp = _impl_.left_id_;
-  _impl_.left_id_ = nullptr;
-  return temp;
-}
-inline ::io::deephaven::proto::backplane::grpc::TableReference* AsOfJoinTablesRequest::_internal_mutable_left_id() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  _impl_._has_bits_[0] |= 0x00000002u;
-  if (_impl_.left_id_ == nullptr) {
-    auto* p = CreateMaybeMessage<::io::deephaven::proto::backplane::grpc::TableReference>(GetArena());
-    _impl_.left_id_ = reinterpret_cast<::io::deephaven::proto::backplane::grpc::TableReference*>(p);
-  }
-  return _impl_.left_id_;
-}
-inline ::io::deephaven::proto::backplane::grpc::TableReference* AsOfJoinTablesRequest::mutable_left_id() ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  ::io::deephaven::proto::backplane::grpc::TableReference* _msg = _internal_mutable_left_id();
-  // @@protoc_insertion_point(field_mutable:io.deephaven.proto.backplane.grpc.AsOfJoinTablesRequest.left_id)
-  return _msg;
-}
-inline void AsOfJoinTablesRequest::set_allocated_left_id(::io::deephaven::proto::backplane::grpc::TableReference* value) {
-  ::google::protobuf::Arena* message_arena = GetArena();
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  if (message_arena == nullptr) {
-    delete reinterpret_cast<::io::deephaven::proto::backplane::grpc::TableReference*>(_impl_.left_id_);
-  }
-
-  if (value != nullptr) {
-    ::google::protobuf::Arena* submessage_arena = reinterpret_cast<::io::deephaven::proto::backplane::grpc::TableReference*>(value)->GetArena();
-    if (message_arena != submessage_arena) {
-      value = ::google::protobuf::internal::GetOwnedMessage(message_arena, value, submessage_arena);
-    }
-    _impl_._has_bits_[0] |= 0x00000002u;
-  } else {
-    _impl_._has_bits_[0] &= ~0x00000002u;
-  }
-
-  _impl_.left_id_ = reinterpret_cast<::io::deephaven::proto::backplane::grpc::TableReference*>(value);
-  // @@protoc_insertion_point(field_set_allocated:io.deephaven.proto.backplane.grpc.AsOfJoinTablesRequest.left_id)
-}
-
-// .io.deephaven.proto.backplane.grpc.TableReference right_id = 3;
-inline bool AsOfJoinTablesRequest::has_right_id() const {
-  bool value = (_impl_._has_bits_[0] & 0x00000004u) != 0;
-  PROTOBUF_ASSUME(!value || _impl_.right_id_ != nullptr);
-  return value;
-}
-inline void AsOfJoinTablesRequest::clear_right_id() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  if (_impl_.right_id_ != nullptr) _impl_.right_id_->Clear();
-  _impl_._has_bits_[0] &= ~0x00000004u;
-}
-inline const ::io::deephaven::proto::backplane::grpc::TableReference& AsOfJoinTablesRequest::_internal_right_id() const {
-  PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race);
-  const ::io::deephaven::proto::backplane::grpc::TableReference* p = _impl_.right_id_;
-  return p != nullptr ? *p : reinterpret_cast<const ::io::deephaven::proto::backplane::grpc::TableReference&>(::io::deephaven::proto::backplane::grpc::_TableReference_default_instance_);
-}
-inline const ::io::deephaven::proto::backplane::grpc::TableReference& AsOfJoinTablesRequest::right_id() const ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  // @@protoc_insertion_point(field_get:io.deephaven.proto.backplane.grpc.AsOfJoinTablesRequest.right_id)
-  return _internal_right_id();
-}
-inline void AsOfJoinTablesRequest::unsafe_arena_set_allocated_right_id(::io::deephaven::proto::backplane::grpc::TableReference* value) {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  if (GetArena() == nullptr) {
-    delete reinterpret_cast<::google::protobuf::MessageLite*>(_impl_.right_id_);
-  }
-  _impl_.right_id_ = reinterpret_cast<::io::deephaven::proto::backplane::grpc::TableReference*>(value);
-  if (value != nullptr) {
-    _impl_._has_bits_[0] |= 0x00000004u;
-  } else {
-    _impl_._has_bits_[0] &= ~0x00000004u;
-  }
-  // @@protoc_insertion_point(field_unsafe_arena_set_allocated:io.deephaven.proto.backplane.grpc.AsOfJoinTablesRequest.right_id)
-}
-inline ::io::deephaven::proto::backplane::grpc::TableReference* AsOfJoinTablesRequest::release_right_id() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-
-  _impl_._has_bits_[0] &= ~0x00000004u;
-  ::io::deephaven::proto::backplane::grpc::TableReference* released = _impl_.right_id_;
-  _impl_.right_id_ = nullptr;
-#ifdef PROTOBUF_FORCE_COPY_IN_RELEASE
-  auto* old = reinterpret_cast<::google::protobuf::MessageLite*>(released);
-  released = ::google::protobuf::internal::DuplicateIfNonNull(released);
-  if (GetArena() == nullptr) {
-    delete old;
-  }
-#else   // PROTOBUF_FORCE_COPY_IN_RELEASE
-  if (GetArena() != nullptr) {
-    released = ::google::protobuf::internal::DuplicateIfNonNull(released);
-  }
-#endif  // !PROTOBUF_FORCE_COPY_IN_RELEASE
-  return released;
-}
-inline ::io::deephaven::proto::backplane::grpc::TableReference* AsOfJoinTablesRequest::unsafe_arena_release_right_id() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  // @@protoc_insertion_point(field_release:io.deephaven.proto.backplane.grpc.AsOfJoinTablesRequest.right_id)
-
-  _impl_._has_bits_[0] &= ~0x00000004u;
-  ::io::deephaven::proto::backplane::grpc::TableReference* temp = _impl_.right_id_;
-  _impl_.right_id_ = nullptr;
-  return temp;
-}
-inline ::io::deephaven::proto::backplane::grpc::TableReference* AsOfJoinTablesRequest::_internal_mutable_right_id() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  _impl_._has_bits_[0] |= 0x00000004u;
-  if (_impl_.right_id_ == nullptr) {
-    auto* p = CreateMaybeMessage<::io::deephaven::proto::backplane::grpc::TableReference>(GetArena());
-    _impl_.right_id_ = reinterpret_cast<::io::deephaven::proto::backplane::grpc::TableReference*>(p);
-  }
-  return _impl_.right_id_;
-}
-inline ::io::deephaven::proto::backplane::grpc::TableReference* AsOfJoinTablesRequest::mutable_right_id() ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  ::io::deephaven::proto::backplane::grpc::TableReference* _msg = _internal_mutable_right_id();
-  // @@protoc_insertion_point(field_mutable:io.deephaven.proto.backplane.grpc.AsOfJoinTablesRequest.right_id)
-  return _msg;
-}
-inline void AsOfJoinTablesRequest::set_allocated_right_id(::io::deephaven::proto::backplane::grpc::TableReference* value) {
-  ::google::protobuf::Arena* message_arena = GetArena();
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  if (message_arena == nullptr) {
-    delete reinterpret_cast<::io::deephaven::proto::backplane::grpc::TableReference*>(_impl_.right_id_);
-  }
-
-  if (value != nullptr) {
-    ::google::protobuf::Arena* submessage_arena = reinterpret_cast<::io::deephaven::proto::backplane::grpc::TableReference*>(value)->GetArena();
-    if (message_arena != submessage_arena) {
-      value = ::google::protobuf::internal::GetOwnedMessage(message_arena, value, submessage_arena);
-    }
-    _impl_._has_bits_[0] |= 0x00000004u;
-  } else {
-    _impl_._has_bits_[0] &= ~0x00000004u;
-  }
-
-  _impl_.right_id_ = reinterpret_cast<::io::deephaven::proto::backplane::grpc::TableReference*>(value);
-  // @@protoc_insertion_point(field_set_allocated:io.deephaven.proto.backplane.grpc.AsOfJoinTablesRequest.right_id)
-}
-
-// repeated string columns_to_match = 4;
-inline int AsOfJoinTablesRequest::_internal_columns_to_match_size() const {
-  return _internal_columns_to_match().size();
-}
-inline int AsOfJoinTablesRequest::columns_to_match_size() const {
-  return _internal_columns_to_match_size();
-}
-inline void AsOfJoinTablesRequest::clear_columns_to_match() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  _impl_.columns_to_match_.Clear();
-}
-inline std::string* AsOfJoinTablesRequest::add_columns_to_match()
-    ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  std::string* _s = _internal_mutable_columns_to_match()->Add();
-  // @@protoc_insertion_point(field_add_mutable:io.deephaven.proto.backplane.grpc.AsOfJoinTablesRequest.columns_to_match)
-  return _s;
-}
-inline const std::string& AsOfJoinTablesRequest::columns_to_match(int index) const
-    ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  // @@protoc_insertion_point(field_get:io.deephaven.proto.backplane.grpc.AsOfJoinTablesRequest.columns_to_match)
-  return _internal_columns_to_match().Get(index);
-}
-inline std::string* AsOfJoinTablesRequest::mutable_columns_to_match(int index)
-    ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  // @@protoc_insertion_point(field_mutable:io.deephaven.proto.backplane.grpc.AsOfJoinTablesRequest.columns_to_match)
-  return _internal_mutable_columns_to_match()->Mutable(index);
-}
-inline void AsOfJoinTablesRequest::set_columns_to_match(int index, const std::string& value) {
-  _internal_mutable_columns_to_match()->Mutable(index)->assign(value);
-  // @@protoc_insertion_point(field_set:io.deephaven.proto.backplane.grpc.AsOfJoinTablesRequest.columns_to_match)
-}
-inline void AsOfJoinTablesRequest::set_columns_to_match(int index, std::string&& value) {
-  _internal_mutable_columns_to_match()->Mutable(index)->assign(std::move(value));
-  // @@protoc_insertion_point(field_set:io.deephaven.proto.backplane.grpc.AsOfJoinTablesRequest.columns_to_match)
-}
-inline void AsOfJoinTablesRequest::set_columns_to_match(int index, const char* value) {
-  ABSL_DCHECK(value != nullptr);
-  _internal_mutable_columns_to_match()->Mutable(index)->assign(value);
-  // @@protoc_insertion_point(field_set_char:io.deephaven.proto.backplane.grpc.AsOfJoinTablesRequest.columns_to_match)
-}
-inline void AsOfJoinTablesRequest::set_columns_to_match(int index, const char* value,
-                              std::size_t size) {
-  _internal_mutable_columns_to_match()->Mutable(index)->assign(
-      reinterpret_cast<const char*>(value), size);
-  // @@protoc_insertion_point(field_set_pointer:io.deephaven.proto.backplane.grpc.AsOfJoinTablesRequest.columns_to_match)
-}
-inline void AsOfJoinTablesRequest::set_columns_to_match(int index, absl::string_view value) {
-  _internal_mutable_columns_to_match()->Mutable(index)->assign(value.data(),
-                                                     value.size());
-  // @@protoc_insertion_point(field_set_string_piece:io.deephaven.proto.backplane.grpc.AsOfJoinTablesRequest.columns_to_match)
-}
-inline void AsOfJoinTablesRequest::add_columns_to_match(const std::string& value) {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  _internal_mutable_columns_to_match()->Add()->assign(value);
-  // @@protoc_insertion_point(field_add:io.deephaven.proto.backplane.grpc.AsOfJoinTablesRequest.columns_to_match)
-}
-inline void AsOfJoinTablesRequest::add_columns_to_match(std::string&& value) {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  _internal_mutable_columns_to_match()->Add(std::move(value));
-  // @@protoc_insertion_point(field_add:io.deephaven.proto.backplane.grpc.AsOfJoinTablesRequest.columns_to_match)
-}
-inline void AsOfJoinTablesRequest::add_columns_to_match(const char* value) {
-  ABSL_DCHECK(value != nullptr);
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  _internal_mutable_columns_to_match()->Add()->assign(value);
-  // @@protoc_insertion_point(field_add_char:io.deephaven.proto.backplane.grpc.AsOfJoinTablesRequest.columns_to_match)
-}
-inline void AsOfJoinTablesRequest::add_columns_to_match(const char* value, std::size_t size) {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  _internal_mutable_columns_to_match()->Add()->assign(
-      reinterpret_cast<const char*>(value), size);
-  // @@protoc_insertion_point(field_add_pointer:io.deephaven.proto.backplane.grpc.AsOfJoinTablesRequest.columns_to_match)
-}
-inline void AsOfJoinTablesRequest::add_columns_to_match(absl::string_view value) {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  _internal_mutable_columns_to_match()->Add()->assign(value.data(), value.size());
-  // @@protoc_insertion_point(field_add_string_piece:io.deephaven.proto.backplane.grpc.AsOfJoinTablesRequest.columns_to_match)
-}
-inline const ::google::protobuf::RepeatedPtrField<std::string>&
-AsOfJoinTablesRequest::columns_to_match() const ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  // @@protoc_insertion_point(field_list:io.deephaven.proto.backplane.grpc.AsOfJoinTablesRequest.columns_to_match)
-  return _internal_columns_to_match();
-}
-inline ::google::protobuf::RepeatedPtrField<std::string>*
-AsOfJoinTablesRequest::mutable_columns_to_match() ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  // @@protoc_insertion_point(field_mutable_list:io.deephaven.proto.backplane.grpc.AsOfJoinTablesRequest.columns_to_match)
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  return _internal_mutable_columns_to_match();
-}
-inline const ::google::protobuf::RepeatedPtrField<std::string>&
-AsOfJoinTablesRequest::_internal_columns_to_match() const {
-  PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race);
-  return _impl_.columns_to_match_;
-}
-inline ::google::protobuf::RepeatedPtrField<std::string>*
-AsOfJoinTablesRequest::_internal_mutable_columns_to_match() {
-  PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race);
-  return &_impl_.columns_to_match_;
-}
-
-// repeated string columns_to_add = 5;
-inline int AsOfJoinTablesRequest::_internal_columns_to_add_size() const {
-  return _internal_columns_to_add().size();
-}
-inline int AsOfJoinTablesRequest::columns_to_add_size() const {
-  return _internal_columns_to_add_size();
-}
-inline void AsOfJoinTablesRequest::clear_columns_to_add() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  _impl_.columns_to_add_.Clear();
-}
-inline std::string* AsOfJoinTablesRequest::add_columns_to_add()
-    ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  std::string* _s = _internal_mutable_columns_to_add()->Add();
-  // @@protoc_insertion_point(field_add_mutable:io.deephaven.proto.backplane.grpc.AsOfJoinTablesRequest.columns_to_add)
-  return _s;
-}
-inline const std::string& AsOfJoinTablesRequest::columns_to_add(int index) const
-    ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  // @@protoc_insertion_point(field_get:io.deephaven.proto.backplane.grpc.AsOfJoinTablesRequest.columns_to_add)
-  return _internal_columns_to_add().Get(index);
-}
-inline std::string* AsOfJoinTablesRequest::mutable_columns_to_add(int index)
-    ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  // @@protoc_insertion_point(field_mutable:io.deephaven.proto.backplane.grpc.AsOfJoinTablesRequest.columns_to_add)
-  return _internal_mutable_columns_to_add()->Mutable(index);
-}
-inline void AsOfJoinTablesRequest::set_columns_to_add(int index, const std::string& value) {
-  _internal_mutable_columns_to_add()->Mutable(index)->assign(value);
-  // @@protoc_insertion_point(field_set:io.deephaven.proto.backplane.grpc.AsOfJoinTablesRequest.columns_to_add)
-}
-inline void AsOfJoinTablesRequest::set_columns_to_add(int index, std::string&& value) {
-  _internal_mutable_columns_to_add()->Mutable(index)->assign(std::move(value));
-  // @@protoc_insertion_point(field_set:io.deephaven.proto.backplane.grpc.AsOfJoinTablesRequest.columns_to_add)
-}
-inline void AsOfJoinTablesRequest::set_columns_to_add(int index, const char* value) {
-  ABSL_DCHECK(value != nullptr);
-  _internal_mutable_columns_to_add()->Mutable(index)->assign(value);
-  // @@protoc_insertion_point(field_set_char:io.deephaven.proto.backplane.grpc.AsOfJoinTablesRequest.columns_to_add)
-}
-inline void AsOfJoinTablesRequest::set_columns_to_add(int index, const char* value,
-                              std::size_t size) {
-  _internal_mutable_columns_to_add()->Mutable(index)->assign(
-      reinterpret_cast<const char*>(value), size);
-  // @@protoc_insertion_point(field_set_pointer:io.deephaven.proto.backplane.grpc.AsOfJoinTablesRequest.columns_to_add)
-}
-inline void AsOfJoinTablesRequest::set_columns_to_add(int index, absl::string_view value) {
-  _internal_mutable_columns_to_add()->Mutable(index)->assign(value.data(),
-                                                     value.size());
-  // @@protoc_insertion_point(field_set_string_piece:io.deephaven.proto.backplane.grpc.AsOfJoinTablesRequest.columns_to_add)
-}
-inline void AsOfJoinTablesRequest::add_columns_to_add(const std::string& value) {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  _internal_mutable_columns_to_add()->Add()->assign(value);
-  // @@protoc_insertion_point(field_add:io.deephaven.proto.backplane.grpc.AsOfJoinTablesRequest.columns_to_add)
-}
-inline void AsOfJoinTablesRequest::add_columns_to_add(std::string&& value) {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  _internal_mutable_columns_to_add()->Add(std::move(value));
-  // @@protoc_insertion_point(field_add:io.deephaven.proto.backplane.grpc.AsOfJoinTablesRequest.columns_to_add)
-}
-inline void AsOfJoinTablesRequest::add_columns_to_add(const char* value) {
-  ABSL_DCHECK(value != nullptr);
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  _internal_mutable_columns_to_add()->Add()->assign(value);
-  // @@protoc_insertion_point(field_add_char:io.deephaven.proto.backplane.grpc.AsOfJoinTablesRequest.columns_to_add)
-}
-inline void AsOfJoinTablesRequest::add_columns_to_add(const char* value, std::size_t size) {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  _internal_mutable_columns_to_add()->Add()->assign(
-      reinterpret_cast<const char*>(value), size);
-  // @@protoc_insertion_point(field_add_pointer:io.deephaven.proto.backplane.grpc.AsOfJoinTablesRequest.columns_to_add)
-}
-inline void AsOfJoinTablesRequest::add_columns_to_add(absl::string_view value) {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  _internal_mutable_columns_to_add()->Add()->assign(value.data(), value.size());
-  // @@protoc_insertion_point(field_add_string_piece:io.deephaven.proto.backplane.grpc.AsOfJoinTablesRequest.columns_to_add)
-}
-inline const ::google::protobuf::RepeatedPtrField<std::string>&
-AsOfJoinTablesRequest::columns_to_add() const ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  // @@protoc_insertion_point(field_list:io.deephaven.proto.backplane.grpc.AsOfJoinTablesRequest.columns_to_add)
-  return _internal_columns_to_add();
-}
-inline ::google::protobuf::RepeatedPtrField<std::string>*
-AsOfJoinTablesRequest::mutable_columns_to_add() ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  // @@protoc_insertion_point(field_mutable_list:io.deephaven.proto.backplane.grpc.AsOfJoinTablesRequest.columns_to_add)
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  return _internal_mutable_columns_to_add();
-}
-inline const ::google::protobuf::RepeatedPtrField<std::string>&
-AsOfJoinTablesRequest::_internal_columns_to_add() const {
-  PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race);
-  return _impl_.columns_to_add_;
-}
-inline ::google::protobuf::RepeatedPtrField<std::string>*
-AsOfJoinTablesRequest::_internal_mutable_columns_to_add() {
-  PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race);
-  return &_impl_.columns_to_add_;
-}
-
-// .io.deephaven.proto.backplane.grpc.AsOfJoinTablesRequest.MatchRule as_of_match_rule = 7;
-inline void AsOfJoinTablesRequest::clear_as_of_match_rule() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  _impl_.as_of_match_rule_ = 0;
-}
-inline ::io::deephaven::proto::backplane::grpc::AsOfJoinTablesRequest_MatchRule AsOfJoinTablesRequest::as_of_match_rule() const {
-  // @@protoc_insertion_point(field_get:io.deephaven.proto.backplane.grpc.AsOfJoinTablesRequest.as_of_match_rule)
-  return _internal_as_of_match_rule();
-}
-inline void AsOfJoinTablesRequest::set_as_of_match_rule(::io::deephaven::proto::backplane::grpc::AsOfJoinTablesRequest_MatchRule value) {
-  _internal_set_as_of_match_rule(value);
-  // @@protoc_insertion_point(field_set:io.deephaven.proto.backplane.grpc.AsOfJoinTablesRequest.as_of_match_rule)
-}
-inline ::io::deephaven::proto::backplane::grpc::AsOfJoinTablesRequest_MatchRule AsOfJoinTablesRequest::_internal_as_of_match_rule() const {
-  PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race);
-  return static_cast<::io::deephaven::proto::backplane::grpc::AsOfJoinTablesRequest_MatchRule>(_impl_.as_of_match_rule_);
-}
-inline void AsOfJoinTablesRequest::_internal_set_as_of_match_rule(::io::deephaven::proto::backplane::grpc::AsOfJoinTablesRequest_MatchRule value) {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  ;
-  _impl_.as_of_match_rule_ = value;
-}
-
-// -------------------------------------------------------------------
-
-// AjRajTablesRequest
-
-// .io.deephaven.proto.backplane.grpc.Ticket result_id = 1;
-inline bool AjRajTablesRequest::has_result_id() const {
-  bool value = (_impl_._has_bits_[0] & 0x00000001u) != 0;
-  PROTOBUF_ASSUME(!value || _impl_.result_id_ != nullptr);
-  return value;
-}
-inline const ::io::deephaven::proto::backplane::grpc::Ticket& AjRajTablesRequest::_internal_result_id() const {
-  PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race);
-  const ::io::deephaven::proto::backplane::grpc::Ticket* p = _impl_.result_id_;
-  return p != nullptr ? *p : reinterpret_cast<const ::io::deephaven::proto::backplane::grpc::Ticket&>(::io::deephaven::proto::backplane::grpc::_Ticket_default_instance_);
-}
-inline const ::io::deephaven::proto::backplane::grpc::Ticket& AjRajTablesRequest::result_id() const ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  // @@protoc_insertion_point(field_get:io.deephaven.proto.backplane.grpc.AjRajTablesRequest.result_id)
-  return _internal_result_id();
-}
-inline void AjRajTablesRequest::unsafe_arena_set_allocated_result_id(::io::deephaven::proto::backplane::grpc::Ticket* value) {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  if (GetArena() == nullptr) {
-    delete reinterpret_cast<::google::protobuf::MessageLite*>(_impl_.result_id_);
-  }
-  _impl_.result_id_ = reinterpret_cast<::io::deephaven::proto::backplane::grpc::Ticket*>(value);
-  if (value != nullptr) {
-    _impl_._has_bits_[0] |= 0x00000001u;
-  } else {
-    _impl_._has_bits_[0] &= ~0x00000001u;
-  }
-  // @@protoc_insertion_point(field_unsafe_arena_set_allocated:io.deephaven.proto.backplane.grpc.AjRajTablesRequest.result_id)
-}
-inline ::io::deephaven::proto::backplane::grpc::Ticket* AjRajTablesRequest::release_result_id() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-
-  _impl_._has_bits_[0] &= ~0x00000001u;
-  ::io::deephaven::proto::backplane::grpc::Ticket* released = _impl_.result_id_;
-  _impl_.result_id_ = nullptr;
-#ifdef PROTOBUF_FORCE_COPY_IN_RELEASE
-  auto* old = reinterpret_cast<::google::protobuf::MessageLite*>(released);
-  released = ::google::protobuf::internal::DuplicateIfNonNull(released);
-  if (GetArena() == nullptr) {
-    delete old;
-  }
-#else   // PROTOBUF_FORCE_COPY_IN_RELEASE
-  if (GetArena() != nullptr) {
-    released = ::google::protobuf::internal::DuplicateIfNonNull(released);
-  }
-#endif  // !PROTOBUF_FORCE_COPY_IN_RELEASE
-  return released;
-}
-inline ::io::deephaven::proto::backplane::grpc::Ticket* AjRajTablesRequest::unsafe_arena_release_result_id() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  // @@protoc_insertion_point(field_release:io.deephaven.proto.backplane.grpc.AjRajTablesRequest.result_id)
-
-  _impl_._has_bits_[0] &= ~0x00000001u;
-  ::io::deephaven::proto::backplane::grpc::Ticket* temp = _impl_.result_id_;
-  _impl_.result_id_ = nullptr;
-  return temp;
-}
-inline ::io::deephaven::proto::backplane::grpc::Ticket* AjRajTablesRequest::_internal_mutable_result_id() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  _impl_._has_bits_[0] |= 0x00000001u;
-  if (_impl_.result_id_ == nullptr) {
-    auto* p = CreateMaybeMessage<::io::deephaven::proto::backplane::grpc::Ticket>(GetArena());
-    _impl_.result_id_ = reinterpret_cast<::io::deephaven::proto::backplane::grpc::Ticket*>(p);
-  }
-  return _impl_.result_id_;
-}
-inline ::io::deephaven::proto::backplane::grpc::Ticket* AjRajTablesRequest::mutable_result_id() ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  ::io::deephaven::proto::backplane::grpc::Ticket* _msg = _internal_mutable_result_id();
-  // @@protoc_insertion_point(field_mutable:io.deephaven.proto.backplane.grpc.AjRajTablesRequest.result_id)
-  return _msg;
-}
-inline void AjRajTablesRequest::set_allocated_result_id(::io::deephaven::proto::backplane::grpc::Ticket* value) {
-  ::google::protobuf::Arena* message_arena = GetArena();
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  if (message_arena == nullptr) {
-    delete reinterpret_cast<::google::protobuf::MessageLite*>(_impl_.result_id_);
-  }
-
-  if (value != nullptr) {
-    ::google::protobuf::Arena* submessage_arena = reinterpret_cast<::google::protobuf::MessageLite*>(value)->GetArena();
-    if (message_arena != submessage_arena) {
-      value = ::google::protobuf::internal::GetOwnedMessage(message_arena, value, submessage_arena);
-    }
-    _impl_._has_bits_[0] |= 0x00000001u;
-  } else {
-    _impl_._has_bits_[0] &= ~0x00000001u;
-  }
-
-  _impl_.result_id_ = reinterpret_cast<::io::deephaven::proto::backplane::grpc::Ticket*>(value);
-  // @@protoc_insertion_point(field_set_allocated:io.deephaven.proto.backplane.grpc.AjRajTablesRequest.result_id)
-}
-
-// .io.deephaven.proto.backplane.grpc.TableReference left_id = 2;
-inline bool AjRajTablesRequest::has_left_id() const {
-  bool value = (_impl_._has_bits_[0] & 0x00000002u) != 0;
-  PROTOBUF_ASSUME(!value || _impl_.left_id_ != nullptr);
-  return value;
-}
-inline void AjRajTablesRequest::clear_left_id() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  if (_impl_.left_id_ != nullptr) _impl_.left_id_->Clear();
-  _impl_._has_bits_[0] &= ~0x00000002u;
-}
-inline const ::io::deephaven::proto::backplane::grpc::TableReference& AjRajTablesRequest::_internal_left_id() const {
-  PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race);
-  const ::io::deephaven::proto::backplane::grpc::TableReference* p = _impl_.left_id_;
-  return p != nullptr ? *p : reinterpret_cast<const ::io::deephaven::proto::backplane::grpc::TableReference&>(::io::deephaven::proto::backplane::grpc::_TableReference_default_instance_);
-}
-inline const ::io::deephaven::proto::backplane::grpc::TableReference& AjRajTablesRequest::left_id() const ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  // @@protoc_insertion_point(field_get:io.deephaven.proto.backplane.grpc.AjRajTablesRequest.left_id)
-  return _internal_left_id();
-}
-inline void AjRajTablesRequest::unsafe_arena_set_allocated_left_id(::io::deephaven::proto::backplane::grpc::TableReference* value) {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  if (GetArena() == nullptr) {
-    delete reinterpret_cast<::google::protobuf::MessageLite*>(_impl_.left_id_);
-  }
-  _impl_.left_id_ = reinterpret_cast<::io::deephaven::proto::backplane::grpc::TableReference*>(value);
-  if (value != nullptr) {
-    _impl_._has_bits_[0] |= 0x00000002u;
-  } else {
-    _impl_._has_bits_[0] &= ~0x00000002u;
-  }
-  // @@protoc_insertion_point(field_unsafe_arena_set_allocated:io.deephaven.proto.backplane.grpc.AjRajTablesRequest.left_id)
-}
-inline ::io::deephaven::proto::backplane::grpc::TableReference* AjRajTablesRequest::release_left_id() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-
-  _impl_._has_bits_[0] &= ~0x00000002u;
-  ::io::deephaven::proto::backplane::grpc::TableReference* released = _impl_.left_id_;
-  _impl_.left_id_ = nullptr;
-#ifdef PROTOBUF_FORCE_COPY_IN_RELEASE
-  auto* old = reinterpret_cast<::google::protobuf::MessageLite*>(released);
-  released = ::google::protobuf::internal::DuplicateIfNonNull(released);
-  if (GetArena() == nullptr) {
-    delete old;
-  }
-#else   // PROTOBUF_FORCE_COPY_IN_RELEASE
-  if (GetArena() != nullptr) {
-    released = ::google::protobuf::internal::DuplicateIfNonNull(released);
-  }
-#endif  // !PROTOBUF_FORCE_COPY_IN_RELEASE
-  return released;
-}
-inline ::io::deephaven::proto::backplane::grpc::TableReference* AjRajTablesRequest::unsafe_arena_release_left_id() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  // @@protoc_insertion_point(field_release:io.deephaven.proto.backplane.grpc.AjRajTablesRequest.left_id)
-
-  _impl_._has_bits_[0] &= ~0x00000002u;
-  ::io::deephaven::proto::backplane::grpc::TableReference* temp = _impl_.left_id_;
-  _impl_.left_id_ = nullptr;
-  return temp;
-}
-inline ::io::deephaven::proto::backplane::grpc::TableReference* AjRajTablesRequest::_internal_mutable_left_id() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  _impl_._has_bits_[0] |= 0x00000002u;
-  if (_impl_.left_id_ == nullptr) {
-    auto* p = CreateMaybeMessage<::io::deephaven::proto::backplane::grpc::TableReference>(GetArena());
-    _impl_.left_id_ = reinterpret_cast<::io::deephaven::proto::backplane::grpc::TableReference*>(p);
-  }
-  return _impl_.left_id_;
-}
-inline ::io::deephaven::proto::backplane::grpc::TableReference* AjRajTablesRequest::mutable_left_id() ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  ::io::deephaven::proto::backplane::grpc::TableReference* _msg = _internal_mutable_left_id();
-  // @@protoc_insertion_point(field_mutable:io.deephaven.proto.backplane.grpc.AjRajTablesRequest.left_id)
-  return _msg;
-}
-inline void AjRajTablesRequest::set_allocated_left_id(::io::deephaven::proto::backplane::grpc::TableReference* value) {
-  ::google::protobuf::Arena* message_arena = GetArena();
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  if (message_arena == nullptr) {
-    delete reinterpret_cast<::io::deephaven::proto::backplane::grpc::TableReference*>(_impl_.left_id_);
-  }
-
-  if (value != nullptr) {
-    ::google::protobuf::Arena* submessage_arena = reinterpret_cast<::io::deephaven::proto::backplane::grpc::TableReference*>(value)->GetArena();
-    if (message_arena != submessage_arena) {
-      value = ::google::protobuf::internal::GetOwnedMessage(message_arena, value, submessage_arena);
-    }
-    _impl_._has_bits_[0] |= 0x00000002u;
-  } else {
-    _impl_._has_bits_[0] &= ~0x00000002u;
-  }
-
-  _impl_.left_id_ = reinterpret_cast<::io::deephaven::proto::backplane::grpc::TableReference*>(value);
-  // @@protoc_insertion_point(field_set_allocated:io.deephaven.proto.backplane.grpc.AjRajTablesRequest.left_id)
-}
-
-// .io.deephaven.proto.backplane.grpc.TableReference right_id = 3;
-inline bool AjRajTablesRequest::has_right_id() const {
-  bool value = (_impl_._has_bits_[0] & 0x00000004u) != 0;
-  PROTOBUF_ASSUME(!value || _impl_.right_id_ != nullptr);
-  return value;
-}
-inline void AjRajTablesRequest::clear_right_id() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  if (_impl_.right_id_ != nullptr) _impl_.right_id_->Clear();
-  _impl_._has_bits_[0] &= ~0x00000004u;
-}
-inline const ::io::deephaven::proto::backplane::grpc::TableReference& AjRajTablesRequest::_internal_right_id() const {
-  PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race);
-  const ::io::deephaven::proto::backplane::grpc::TableReference* p = _impl_.right_id_;
-  return p != nullptr ? *p : reinterpret_cast<const ::io::deephaven::proto::backplane::grpc::TableReference&>(::io::deephaven::proto::backplane::grpc::_TableReference_default_instance_);
-}
-inline const ::io::deephaven::proto::backplane::grpc::TableReference& AjRajTablesRequest::right_id() const ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  // @@protoc_insertion_point(field_get:io.deephaven.proto.backplane.grpc.AjRajTablesRequest.right_id)
-  return _internal_right_id();
-}
-inline void AjRajTablesRequest::unsafe_arena_set_allocated_right_id(::io::deephaven::proto::backplane::grpc::TableReference* value) {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  if (GetArena() == nullptr) {
-    delete reinterpret_cast<::google::protobuf::MessageLite*>(_impl_.right_id_);
-  }
-  _impl_.right_id_ = reinterpret_cast<::io::deephaven::proto::backplane::grpc::TableReference*>(value);
-  if (value != nullptr) {
-    _impl_._has_bits_[0] |= 0x00000004u;
-  } else {
-    _impl_._has_bits_[0] &= ~0x00000004u;
-  }
-  // @@protoc_insertion_point(field_unsafe_arena_set_allocated:io.deephaven.proto.backplane.grpc.AjRajTablesRequest.right_id)
-}
-inline ::io::deephaven::proto::backplane::grpc::TableReference* AjRajTablesRequest::release_right_id() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-
-  _impl_._has_bits_[0] &= ~0x00000004u;
-  ::io::deephaven::proto::backplane::grpc::TableReference* released = _impl_.right_id_;
-  _impl_.right_id_ = nullptr;
-#ifdef PROTOBUF_FORCE_COPY_IN_RELEASE
-  auto* old = reinterpret_cast<::google::protobuf::MessageLite*>(released);
-  released = ::google::protobuf::internal::DuplicateIfNonNull(released);
-  if (GetArena() == nullptr) {
-    delete old;
-  }
-#else   // PROTOBUF_FORCE_COPY_IN_RELEASE
-  if (GetArena() != nullptr) {
-    released = ::google::protobuf::internal::DuplicateIfNonNull(released);
-  }
-#endif  // !PROTOBUF_FORCE_COPY_IN_RELEASE
-  return released;
-}
-inline ::io::deephaven::proto::backplane::grpc::TableReference* AjRajTablesRequest::unsafe_arena_release_right_id() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  // @@protoc_insertion_point(field_release:io.deephaven.proto.backplane.grpc.AjRajTablesRequest.right_id)
-
-  _impl_._has_bits_[0] &= ~0x00000004u;
-  ::io::deephaven::proto::backplane::grpc::TableReference* temp = _impl_.right_id_;
-  _impl_.right_id_ = nullptr;
-  return temp;
-}
-inline ::io::deephaven::proto::backplane::grpc::TableReference* AjRajTablesRequest::_internal_mutable_right_id() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  _impl_._has_bits_[0] |= 0x00000004u;
-  if (_impl_.right_id_ == nullptr) {
-    auto* p = CreateMaybeMessage<::io::deephaven::proto::backplane::grpc::TableReference>(GetArena());
-    _impl_.right_id_ = reinterpret_cast<::io::deephaven::proto::backplane::grpc::TableReference*>(p);
-  }
-  return _impl_.right_id_;
-}
-inline ::io::deephaven::proto::backplane::grpc::TableReference* AjRajTablesRequest::mutable_right_id() ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  ::io::deephaven::proto::backplane::grpc::TableReference* _msg = _internal_mutable_right_id();
-  // @@protoc_insertion_point(field_mutable:io.deephaven.proto.backplane.grpc.AjRajTablesRequest.right_id)
-  return _msg;
-}
-inline void AjRajTablesRequest::set_allocated_right_id(::io::deephaven::proto::backplane::grpc::TableReference* value) {
-  ::google::protobuf::Arena* message_arena = GetArena();
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  if (message_arena == nullptr) {
-    delete reinterpret_cast<::io::deephaven::proto::backplane::grpc::TableReference*>(_impl_.right_id_);
-  }
-
-  if (value != nullptr) {
-    ::google::protobuf::Arena* submessage_arena = reinterpret_cast<::io::deephaven::proto::backplane::grpc::TableReference*>(value)->GetArena();
-    if (message_arena != submessage_arena) {
-      value = ::google::protobuf::internal::GetOwnedMessage(message_arena, value, submessage_arena);
-    }
-    _impl_._has_bits_[0] |= 0x00000004u;
-  } else {
-    _impl_._has_bits_[0] &= ~0x00000004u;
-  }
-
-  _impl_.right_id_ = reinterpret_cast<::io::deephaven::proto::backplane::grpc::TableReference*>(value);
-  // @@protoc_insertion_point(field_set_allocated:io.deephaven.proto.backplane.grpc.AjRajTablesRequest.right_id)
-}
-
-// repeated string exact_match_columns = 4;
-inline int AjRajTablesRequest::_internal_exact_match_columns_size() const {
-  return _internal_exact_match_columns().size();
-}
-inline int AjRajTablesRequest::exact_match_columns_size() const {
-  return _internal_exact_match_columns_size();
-}
-inline void AjRajTablesRequest::clear_exact_match_columns() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  _impl_.exact_match_columns_.Clear();
-}
-inline std::string* AjRajTablesRequest::add_exact_match_columns()
-    ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  std::string* _s = _internal_mutable_exact_match_columns()->Add();
-  // @@protoc_insertion_point(field_add_mutable:io.deephaven.proto.backplane.grpc.AjRajTablesRequest.exact_match_columns)
-  return _s;
-}
-inline const std::string& AjRajTablesRequest::exact_match_columns(int index) const
-    ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  // @@protoc_insertion_point(field_get:io.deephaven.proto.backplane.grpc.AjRajTablesRequest.exact_match_columns)
-  return _internal_exact_match_columns().Get(index);
-}
-inline std::string* AjRajTablesRequest::mutable_exact_match_columns(int index)
-    ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  // @@protoc_insertion_point(field_mutable:io.deephaven.proto.backplane.grpc.AjRajTablesRequest.exact_match_columns)
-  return _internal_mutable_exact_match_columns()->Mutable(index);
-}
-inline void AjRajTablesRequest::set_exact_match_columns(int index, const std::string& value) {
-  _internal_mutable_exact_match_columns()->Mutable(index)->assign(value);
-  // @@protoc_insertion_point(field_set:io.deephaven.proto.backplane.grpc.AjRajTablesRequest.exact_match_columns)
-}
-inline void AjRajTablesRequest::set_exact_match_columns(int index, std::string&& value) {
-  _internal_mutable_exact_match_columns()->Mutable(index)->assign(std::move(value));
-  // @@protoc_insertion_point(field_set:io.deephaven.proto.backplane.grpc.AjRajTablesRequest.exact_match_columns)
-}
-inline void AjRajTablesRequest::set_exact_match_columns(int index, const char* value) {
-  ABSL_DCHECK(value != nullptr);
-  _internal_mutable_exact_match_columns()->Mutable(index)->assign(value);
-  // @@protoc_insertion_point(field_set_char:io.deephaven.proto.backplane.grpc.AjRajTablesRequest.exact_match_columns)
-}
-inline void AjRajTablesRequest::set_exact_match_columns(int index, const char* value,
-                              std::size_t size) {
-  _internal_mutable_exact_match_columns()->Mutable(index)->assign(
-      reinterpret_cast<const char*>(value), size);
-  // @@protoc_insertion_point(field_set_pointer:io.deephaven.proto.backplane.grpc.AjRajTablesRequest.exact_match_columns)
-}
-inline void AjRajTablesRequest::set_exact_match_columns(int index, absl::string_view value) {
-  _internal_mutable_exact_match_columns()->Mutable(index)->assign(value.data(),
-                                                     value.size());
-  // @@protoc_insertion_point(field_set_string_piece:io.deephaven.proto.backplane.grpc.AjRajTablesRequest.exact_match_columns)
-}
-inline void AjRajTablesRequest::add_exact_match_columns(const std::string& value) {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  _internal_mutable_exact_match_columns()->Add()->assign(value);
-  // @@protoc_insertion_point(field_add:io.deephaven.proto.backplane.grpc.AjRajTablesRequest.exact_match_columns)
-}
-inline void AjRajTablesRequest::add_exact_match_columns(std::string&& value) {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  _internal_mutable_exact_match_columns()->Add(std::move(value));
-  // @@protoc_insertion_point(field_add:io.deephaven.proto.backplane.grpc.AjRajTablesRequest.exact_match_columns)
-}
-inline void AjRajTablesRequest::add_exact_match_columns(const char* value) {
-  ABSL_DCHECK(value != nullptr);
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  _internal_mutable_exact_match_columns()->Add()->assign(value);
-  // @@protoc_insertion_point(field_add_char:io.deephaven.proto.backplane.grpc.AjRajTablesRequest.exact_match_columns)
-}
-inline void AjRajTablesRequest::add_exact_match_columns(const char* value, std::size_t size) {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  _internal_mutable_exact_match_columns()->Add()->assign(
-      reinterpret_cast<const char*>(value), size);
-  // @@protoc_insertion_point(field_add_pointer:io.deephaven.proto.backplane.grpc.AjRajTablesRequest.exact_match_columns)
-}
-inline void AjRajTablesRequest::add_exact_match_columns(absl::string_view value) {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  _internal_mutable_exact_match_columns()->Add()->assign(value.data(), value.size());
-  // @@protoc_insertion_point(field_add_string_piece:io.deephaven.proto.backplane.grpc.AjRajTablesRequest.exact_match_columns)
-}
-inline const ::google::protobuf::RepeatedPtrField<std::string>&
-AjRajTablesRequest::exact_match_columns() const ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  // @@protoc_insertion_point(field_list:io.deephaven.proto.backplane.grpc.AjRajTablesRequest.exact_match_columns)
-  return _internal_exact_match_columns();
-}
-inline ::google::protobuf::RepeatedPtrField<std::string>*
-AjRajTablesRequest::mutable_exact_match_columns() ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  // @@protoc_insertion_point(field_mutable_list:io.deephaven.proto.backplane.grpc.AjRajTablesRequest.exact_match_columns)
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  return _internal_mutable_exact_match_columns();
-}
-inline const ::google::protobuf::RepeatedPtrField<std::string>&
-AjRajTablesRequest::_internal_exact_match_columns() const {
-  PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race);
-  return _impl_.exact_match_columns_;
-}
-inline ::google::protobuf::RepeatedPtrField<std::string>*
-AjRajTablesRequest::_internal_mutable_exact_match_columns() {
-  PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race);
-  return &_impl_.exact_match_columns_;
-}
-
-// string as_of_column = 5;
-inline void AjRajTablesRequest::clear_as_of_column() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  _impl_.as_of_column_.ClearToEmpty();
-}
-inline const std::string& AjRajTablesRequest::as_of_column() const
-    ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  // @@protoc_insertion_point(field_get:io.deephaven.proto.backplane.grpc.AjRajTablesRequest.as_of_column)
-  return _internal_as_of_column();
-}
-template <typename Arg_, typename... Args_>
-inline PROTOBUF_ALWAYS_INLINE void AjRajTablesRequest::set_as_of_column(Arg_&& arg,
-                                                     Args_... args) {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  ;
-  _impl_.as_of_column_.Set(static_cast<Arg_&&>(arg), args..., GetArena());
-  // @@protoc_insertion_point(field_set:io.deephaven.proto.backplane.grpc.AjRajTablesRequest.as_of_column)
-}
-inline std::string* AjRajTablesRequest::mutable_as_of_column() ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  std::string* _s = _internal_mutable_as_of_column();
-  // @@protoc_insertion_point(field_mutable:io.deephaven.proto.backplane.grpc.AjRajTablesRequest.as_of_column)
-  return _s;
-}
-inline const std::string& AjRajTablesRequest::_internal_as_of_column() const {
-  PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race);
-  return _impl_.as_of_column_.Get();
-}
-inline void AjRajTablesRequest::_internal_set_as_of_column(const std::string& value) {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  ;
-  _impl_.as_of_column_.Set(value, GetArena());
-}
-inline std::string* AjRajTablesRequest::_internal_mutable_as_of_column() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  ;
-  return _impl_.as_of_column_.Mutable( GetArena());
-}
-inline std::string* AjRajTablesRequest::release_as_of_column() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  // @@protoc_insertion_point(field_release:io.deephaven.proto.backplane.grpc.AjRajTablesRequest.as_of_column)
-  return _impl_.as_of_column_.Release();
-}
-inline void AjRajTablesRequest::set_allocated_as_of_column(std::string* value) {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  _impl_.as_of_column_.SetAllocated(value, GetArena());
-  #ifdef PROTOBUF_FORCE_COPY_DEFAULT_STRING
-        if (_impl_.as_of_column_.IsDefault()) {
-          _impl_.as_of_column_.Set("", GetArena());
-        }
-  #endif  // PROTOBUF_FORCE_COPY_DEFAULT_STRING
-  // @@protoc_insertion_point(field_set_allocated:io.deephaven.proto.backplane.grpc.AjRajTablesRequest.as_of_column)
-}
-
-// repeated string columns_to_add = 6;
-inline int AjRajTablesRequest::_internal_columns_to_add_size() const {
-  return _internal_columns_to_add().size();
-}
-inline int AjRajTablesRequest::columns_to_add_size() const {
-  return _internal_columns_to_add_size();
-}
-inline void AjRajTablesRequest::clear_columns_to_add() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  _impl_.columns_to_add_.Clear();
-}
-inline std::string* AjRajTablesRequest::add_columns_to_add()
-    ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  std::string* _s = _internal_mutable_columns_to_add()->Add();
-  // @@protoc_insertion_point(field_add_mutable:io.deephaven.proto.backplane.grpc.AjRajTablesRequest.columns_to_add)
-  return _s;
-}
-inline const std::string& AjRajTablesRequest::columns_to_add(int index) const
-    ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  // @@protoc_insertion_point(field_get:io.deephaven.proto.backplane.grpc.AjRajTablesRequest.columns_to_add)
-  return _internal_columns_to_add().Get(index);
-}
-inline std::string* AjRajTablesRequest::mutable_columns_to_add(int index)
-    ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  // @@protoc_insertion_point(field_mutable:io.deephaven.proto.backplane.grpc.AjRajTablesRequest.columns_to_add)
-  return _internal_mutable_columns_to_add()->Mutable(index);
-}
-inline void AjRajTablesRequest::set_columns_to_add(int index, const std::string& value) {
-  _internal_mutable_columns_to_add()->Mutable(index)->assign(value);
-  // @@protoc_insertion_point(field_set:io.deephaven.proto.backplane.grpc.AjRajTablesRequest.columns_to_add)
-}
-inline void AjRajTablesRequest::set_columns_to_add(int index, std::string&& value) {
-  _internal_mutable_columns_to_add()->Mutable(index)->assign(std::move(value));
-  // @@protoc_insertion_point(field_set:io.deephaven.proto.backplane.grpc.AjRajTablesRequest.columns_to_add)
-}
-inline void AjRajTablesRequest::set_columns_to_add(int index, const char* value) {
-  ABSL_DCHECK(value != nullptr);
-  _internal_mutable_columns_to_add()->Mutable(index)->assign(value);
-  // @@protoc_insertion_point(field_set_char:io.deephaven.proto.backplane.grpc.AjRajTablesRequest.columns_to_add)
-}
-inline void AjRajTablesRequest::set_columns_to_add(int index, const char* value,
-                              std::size_t size) {
-  _internal_mutable_columns_to_add()->Mutable(index)->assign(
-      reinterpret_cast<const char*>(value), size);
-  // @@protoc_insertion_point(field_set_pointer:io.deephaven.proto.backplane.grpc.AjRajTablesRequest.columns_to_add)
-}
-inline void AjRajTablesRequest::set_columns_to_add(int index, absl::string_view value) {
-  _internal_mutable_columns_to_add()->Mutable(index)->assign(value.data(),
-                                                     value.size());
-  // @@protoc_insertion_point(field_set_string_piece:io.deephaven.proto.backplane.grpc.AjRajTablesRequest.columns_to_add)
-}
-inline void AjRajTablesRequest::add_columns_to_add(const std::string& value) {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  _internal_mutable_columns_to_add()->Add()->assign(value);
-  // @@protoc_insertion_point(field_add:io.deephaven.proto.backplane.grpc.AjRajTablesRequest.columns_to_add)
-}
-inline void AjRajTablesRequest::add_columns_to_add(std::string&& value) {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  _internal_mutable_columns_to_add()->Add(std::move(value));
-  // @@protoc_insertion_point(field_add:io.deephaven.proto.backplane.grpc.AjRajTablesRequest.columns_to_add)
-}
-inline void AjRajTablesRequest::add_columns_to_add(const char* value) {
-  ABSL_DCHECK(value != nullptr);
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  _internal_mutable_columns_to_add()->Add()->assign(value);
-  // @@protoc_insertion_point(field_add_char:io.deephaven.proto.backplane.grpc.AjRajTablesRequest.columns_to_add)
-}
-inline void AjRajTablesRequest::add_columns_to_add(const char* value, std::size_t size) {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  _internal_mutable_columns_to_add()->Add()->assign(
-      reinterpret_cast<const char*>(value), size);
-  // @@protoc_insertion_point(field_add_pointer:io.deephaven.proto.backplane.grpc.AjRajTablesRequest.columns_to_add)
-}
-inline void AjRajTablesRequest::add_columns_to_add(absl::string_view value) {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  _internal_mutable_columns_to_add()->Add()->assign(value.data(), value.size());
-  // @@protoc_insertion_point(field_add_string_piece:io.deephaven.proto.backplane.grpc.AjRajTablesRequest.columns_to_add)
-}
-inline const ::google::protobuf::RepeatedPtrField<std::string>&
-AjRajTablesRequest::columns_to_add() const ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  // @@protoc_insertion_point(field_list:io.deephaven.proto.backplane.grpc.AjRajTablesRequest.columns_to_add)
-  return _internal_columns_to_add();
-}
-inline ::google::protobuf::RepeatedPtrField<std::string>*
-AjRajTablesRequest::mutable_columns_to_add() ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  // @@protoc_insertion_point(field_mutable_list:io.deephaven.proto.backplane.grpc.AjRajTablesRequest.columns_to_add)
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  return _internal_mutable_columns_to_add();
-}
-inline const ::google::protobuf::RepeatedPtrField<std::string>&
-AjRajTablesRequest::_internal_columns_to_add() const {
-  PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race);
-  return _impl_.columns_to_add_;
-}
-inline ::google::protobuf::RepeatedPtrField<std::string>*
-AjRajTablesRequest::_internal_mutable_columns_to_add() {
-  PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race);
-  return &_impl_.columns_to_add_;
-}
-
-// -------------------------------------------------------------------
-
-// MultiJoinInput
-
-// .io.deephaven.proto.backplane.grpc.TableReference source_id = 1;
-inline bool MultiJoinInput::has_source_id() const {
-  bool value = (_impl_._has_bits_[0] & 0x00000001u) != 0;
-  PROTOBUF_ASSUME(!value || _impl_.source_id_ != nullptr);
-  return value;
-}
-inline void MultiJoinInput::clear_source_id() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  if (_impl_.source_id_ != nullptr) _impl_.source_id_->Clear();
-  _impl_._has_bits_[0] &= ~0x00000001u;
-}
-inline const ::io::deephaven::proto::backplane::grpc::TableReference& MultiJoinInput::_internal_source_id() const {
-  PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race);
-  const ::io::deephaven::proto::backplane::grpc::TableReference* p = _impl_.source_id_;
-  return p != nullptr ? *p : reinterpret_cast<const ::io::deephaven::proto::backplane::grpc::TableReference&>(::io::deephaven::proto::backplane::grpc::_TableReference_default_instance_);
-}
-inline const ::io::deephaven::proto::backplane::grpc::TableReference& MultiJoinInput::source_id() const ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  // @@protoc_insertion_point(field_get:io.deephaven.proto.backplane.grpc.MultiJoinInput.source_id)
-  return _internal_source_id();
-}
-inline void MultiJoinInput::unsafe_arena_set_allocated_source_id(::io::deephaven::proto::backplane::grpc::TableReference* value) {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  if (GetArena() == nullptr) {
-    delete reinterpret_cast<::google::protobuf::MessageLite*>(_impl_.source_id_);
-  }
-  _impl_.source_id_ = reinterpret_cast<::io::deephaven::proto::backplane::grpc::TableReference*>(value);
-  if (value != nullptr) {
-    _impl_._has_bits_[0] |= 0x00000001u;
-  } else {
-    _impl_._has_bits_[0] &= ~0x00000001u;
-  }
-  // @@protoc_insertion_point(field_unsafe_arena_set_allocated:io.deephaven.proto.backplane.grpc.MultiJoinInput.source_id)
-}
-inline ::io::deephaven::proto::backplane::grpc::TableReference* MultiJoinInput::release_source_id() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-
-  _impl_._has_bits_[0] &= ~0x00000001u;
-  ::io::deephaven::proto::backplane::grpc::TableReference* released = _impl_.source_id_;
-  _impl_.source_id_ = nullptr;
-#ifdef PROTOBUF_FORCE_COPY_IN_RELEASE
-  auto* old = reinterpret_cast<::google::protobuf::MessageLite*>(released);
-  released = ::google::protobuf::internal::DuplicateIfNonNull(released);
-  if (GetArena() == nullptr) {
-    delete old;
-  }
-#else   // PROTOBUF_FORCE_COPY_IN_RELEASE
-  if (GetArena() != nullptr) {
-    released = ::google::protobuf::internal::DuplicateIfNonNull(released);
-  }
-#endif  // !PROTOBUF_FORCE_COPY_IN_RELEASE
-  return released;
-}
-inline ::io::deephaven::proto::backplane::grpc::TableReference* MultiJoinInput::unsafe_arena_release_source_id() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  // @@protoc_insertion_point(field_release:io.deephaven.proto.backplane.grpc.MultiJoinInput.source_id)
-
-  _impl_._has_bits_[0] &= ~0x00000001u;
-  ::io::deephaven::proto::backplane::grpc::TableReference* temp = _impl_.source_id_;
-  _impl_.source_id_ = nullptr;
-  return temp;
-}
-inline ::io::deephaven::proto::backplane::grpc::TableReference* MultiJoinInput::_internal_mutable_source_id() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  _impl_._has_bits_[0] |= 0x00000001u;
-  if (_impl_.source_id_ == nullptr) {
-    auto* p = CreateMaybeMessage<::io::deephaven::proto::backplane::grpc::TableReference>(GetArena());
-    _impl_.source_id_ = reinterpret_cast<::io::deephaven::proto::backplane::grpc::TableReference*>(p);
-  }
-  return _impl_.source_id_;
-}
-inline ::io::deephaven::proto::backplane::grpc::TableReference* MultiJoinInput::mutable_source_id() ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  ::io::deephaven::proto::backplane::grpc::TableReference* _msg = _internal_mutable_source_id();
-  // @@protoc_insertion_point(field_mutable:io.deephaven.proto.backplane.grpc.MultiJoinInput.source_id)
-  return _msg;
-}
-inline void MultiJoinInput::set_allocated_source_id(::io::deephaven::proto::backplane::grpc::TableReference* value) {
-  ::google::protobuf::Arena* message_arena = GetArena();
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  if (message_arena == nullptr) {
-    delete reinterpret_cast<::io::deephaven::proto::backplane::grpc::TableReference*>(_impl_.source_id_);
-  }
-
-  if (value != nullptr) {
-    ::google::protobuf::Arena* submessage_arena = reinterpret_cast<::io::deephaven::proto::backplane::grpc::TableReference*>(value)->GetArena();
-    if (message_arena != submessage_arena) {
-      value = ::google::protobuf::internal::GetOwnedMessage(message_arena, value, submessage_arena);
-    }
-    _impl_._has_bits_[0] |= 0x00000001u;
-  } else {
-    _impl_._has_bits_[0] &= ~0x00000001u;
-  }
-
-  _impl_.source_id_ = reinterpret_cast<::io::deephaven::proto::backplane::grpc::TableReference*>(value);
-  // @@protoc_insertion_point(field_set_allocated:io.deephaven.proto.backplane.grpc.MultiJoinInput.source_id)
-}
-
-// repeated string columns_to_match = 2;
-inline int MultiJoinInput::_internal_columns_to_match_size() const {
-  return _internal_columns_to_match().size();
-}
-inline int MultiJoinInput::columns_to_match_size() const {
-  return _internal_columns_to_match_size();
-}
-inline void MultiJoinInput::clear_columns_to_match() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  _impl_.columns_to_match_.Clear();
-}
-inline std::string* MultiJoinInput::add_columns_to_match()
-    ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  std::string* _s = _internal_mutable_columns_to_match()->Add();
-  // @@protoc_insertion_point(field_add_mutable:io.deephaven.proto.backplane.grpc.MultiJoinInput.columns_to_match)
-  return _s;
-}
-inline const std::string& MultiJoinInput::columns_to_match(int index) const
-    ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  // @@protoc_insertion_point(field_get:io.deephaven.proto.backplane.grpc.MultiJoinInput.columns_to_match)
-  return _internal_columns_to_match().Get(index);
-}
-inline std::string* MultiJoinInput::mutable_columns_to_match(int index)
-    ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  // @@protoc_insertion_point(field_mutable:io.deephaven.proto.backplane.grpc.MultiJoinInput.columns_to_match)
-  return _internal_mutable_columns_to_match()->Mutable(index);
-}
-inline void MultiJoinInput::set_columns_to_match(int index, const std::string& value) {
-  _internal_mutable_columns_to_match()->Mutable(index)->assign(value);
-  // @@protoc_insertion_point(field_set:io.deephaven.proto.backplane.grpc.MultiJoinInput.columns_to_match)
-}
-inline void MultiJoinInput::set_columns_to_match(int index, std::string&& value) {
-  _internal_mutable_columns_to_match()->Mutable(index)->assign(std::move(value));
-  // @@protoc_insertion_point(field_set:io.deephaven.proto.backplane.grpc.MultiJoinInput.columns_to_match)
-}
-inline void MultiJoinInput::set_columns_to_match(int index, const char* value) {
-  ABSL_DCHECK(value != nullptr);
-  _internal_mutable_columns_to_match()->Mutable(index)->assign(value);
-  // @@protoc_insertion_point(field_set_char:io.deephaven.proto.backplane.grpc.MultiJoinInput.columns_to_match)
-}
-inline void MultiJoinInput::set_columns_to_match(int index, const char* value,
-                              std::size_t size) {
-  _internal_mutable_columns_to_match()->Mutable(index)->assign(
-      reinterpret_cast<const char*>(value), size);
-  // @@protoc_insertion_point(field_set_pointer:io.deephaven.proto.backplane.grpc.MultiJoinInput.columns_to_match)
-}
-inline void MultiJoinInput::set_columns_to_match(int index, absl::string_view value) {
-  _internal_mutable_columns_to_match()->Mutable(index)->assign(value.data(),
-                                                     value.size());
-  // @@protoc_insertion_point(field_set_string_piece:io.deephaven.proto.backplane.grpc.MultiJoinInput.columns_to_match)
-}
-inline void MultiJoinInput::add_columns_to_match(const std::string& value) {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  _internal_mutable_columns_to_match()->Add()->assign(value);
-  // @@protoc_insertion_point(field_add:io.deephaven.proto.backplane.grpc.MultiJoinInput.columns_to_match)
-}
-inline void MultiJoinInput::add_columns_to_match(std::string&& value) {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  _internal_mutable_columns_to_match()->Add(std::move(value));
-  // @@protoc_insertion_point(field_add:io.deephaven.proto.backplane.grpc.MultiJoinInput.columns_to_match)
-}
-inline void MultiJoinInput::add_columns_to_match(const char* value) {
-  ABSL_DCHECK(value != nullptr);
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  _internal_mutable_columns_to_match()->Add()->assign(value);
-  // @@protoc_insertion_point(field_add_char:io.deephaven.proto.backplane.grpc.MultiJoinInput.columns_to_match)
-}
-inline void MultiJoinInput::add_columns_to_match(const char* value, std::size_t size) {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  _internal_mutable_columns_to_match()->Add()->assign(
-      reinterpret_cast<const char*>(value), size);
-  // @@protoc_insertion_point(field_add_pointer:io.deephaven.proto.backplane.grpc.MultiJoinInput.columns_to_match)
-}
-inline void MultiJoinInput::add_columns_to_match(absl::string_view value) {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  _internal_mutable_columns_to_match()->Add()->assign(value.data(), value.size());
-  // @@protoc_insertion_point(field_add_string_piece:io.deephaven.proto.backplane.grpc.MultiJoinInput.columns_to_match)
-}
-inline const ::google::protobuf::RepeatedPtrField<std::string>&
-MultiJoinInput::columns_to_match() const ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  // @@protoc_insertion_point(field_list:io.deephaven.proto.backplane.grpc.MultiJoinInput.columns_to_match)
-  return _internal_columns_to_match();
-}
-inline ::google::protobuf::RepeatedPtrField<std::string>*
-MultiJoinInput::mutable_columns_to_match() ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  // @@protoc_insertion_point(field_mutable_list:io.deephaven.proto.backplane.grpc.MultiJoinInput.columns_to_match)
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  return _internal_mutable_columns_to_match();
-}
-inline const ::google::protobuf::RepeatedPtrField<std::string>&
-MultiJoinInput::_internal_columns_to_match() const {
-  PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race);
-  return _impl_.columns_to_match_;
-}
-inline ::google::protobuf::RepeatedPtrField<std::string>*
-MultiJoinInput::_internal_mutable_columns_to_match() {
-  PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race);
-  return &_impl_.columns_to_match_;
-}
-
-// repeated string columns_to_add = 3;
-inline int MultiJoinInput::_internal_columns_to_add_size() const {
-  return _internal_columns_to_add().size();
-}
-inline int MultiJoinInput::columns_to_add_size() const {
-  return _internal_columns_to_add_size();
-}
-inline void MultiJoinInput::clear_columns_to_add() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  _impl_.columns_to_add_.Clear();
-}
-inline std::string* MultiJoinInput::add_columns_to_add()
-    ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  std::string* _s = _internal_mutable_columns_to_add()->Add();
-  // @@protoc_insertion_point(field_add_mutable:io.deephaven.proto.backplane.grpc.MultiJoinInput.columns_to_add)
-  return _s;
-}
-inline const std::string& MultiJoinInput::columns_to_add(int index) const
-    ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  // @@protoc_insertion_point(field_get:io.deephaven.proto.backplane.grpc.MultiJoinInput.columns_to_add)
-  return _internal_columns_to_add().Get(index);
-}
-inline std::string* MultiJoinInput::mutable_columns_to_add(int index)
-    ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  // @@protoc_insertion_point(field_mutable:io.deephaven.proto.backplane.grpc.MultiJoinInput.columns_to_add)
-  return _internal_mutable_columns_to_add()->Mutable(index);
-}
-inline void MultiJoinInput::set_columns_to_add(int index, const std::string& value) {
-  _internal_mutable_columns_to_add()->Mutable(index)->assign(value);
-  // @@protoc_insertion_point(field_set:io.deephaven.proto.backplane.grpc.MultiJoinInput.columns_to_add)
-}
-inline void MultiJoinInput::set_columns_to_add(int index, std::string&& value) {
-  _internal_mutable_columns_to_add()->Mutable(index)->assign(std::move(value));
-  // @@protoc_insertion_point(field_set:io.deephaven.proto.backplane.grpc.MultiJoinInput.columns_to_add)
-}
-inline void MultiJoinInput::set_columns_to_add(int index, const char* value) {
-  ABSL_DCHECK(value != nullptr);
-  _internal_mutable_columns_to_add()->Mutable(index)->assign(value);
-  // @@protoc_insertion_point(field_set_char:io.deephaven.proto.backplane.grpc.MultiJoinInput.columns_to_add)
-}
-inline void MultiJoinInput::set_columns_to_add(int index, const char* value,
-                              std::size_t size) {
-  _internal_mutable_columns_to_add()->Mutable(index)->assign(
-      reinterpret_cast<const char*>(value), size);
-  // @@protoc_insertion_point(field_set_pointer:io.deephaven.proto.backplane.grpc.MultiJoinInput.columns_to_add)
-}
-inline void MultiJoinInput::set_columns_to_add(int index, absl::string_view value) {
-  _internal_mutable_columns_to_add()->Mutable(index)->assign(value.data(),
-                                                     value.size());
-  // @@protoc_insertion_point(field_set_string_piece:io.deephaven.proto.backplane.grpc.MultiJoinInput.columns_to_add)
-}
-inline void MultiJoinInput::add_columns_to_add(const std::string& value) {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  _internal_mutable_columns_to_add()->Add()->assign(value);
-  // @@protoc_insertion_point(field_add:io.deephaven.proto.backplane.grpc.MultiJoinInput.columns_to_add)
-}
-inline void MultiJoinInput::add_columns_to_add(std::string&& value) {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  _internal_mutable_columns_to_add()->Add(std::move(value));
-  // @@protoc_insertion_point(field_add:io.deephaven.proto.backplane.grpc.MultiJoinInput.columns_to_add)
-}
-inline void MultiJoinInput::add_columns_to_add(const char* value) {
-  ABSL_DCHECK(value != nullptr);
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  _internal_mutable_columns_to_add()->Add()->assign(value);
-  // @@protoc_insertion_point(field_add_char:io.deephaven.proto.backplane.grpc.MultiJoinInput.columns_to_add)
-}
-inline void MultiJoinInput::add_columns_to_add(const char* value, std::size_t size) {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  _internal_mutable_columns_to_add()->Add()->assign(
-      reinterpret_cast<const char*>(value), size);
-  // @@protoc_insertion_point(field_add_pointer:io.deephaven.proto.backplane.grpc.MultiJoinInput.columns_to_add)
-}
-inline void MultiJoinInput::add_columns_to_add(absl::string_view value) {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  _internal_mutable_columns_to_add()->Add()->assign(value.data(), value.size());
-  // @@protoc_insertion_point(field_add_string_piece:io.deephaven.proto.backplane.grpc.MultiJoinInput.columns_to_add)
-}
-inline const ::google::protobuf::RepeatedPtrField<std::string>&
-MultiJoinInput::columns_to_add() const ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  // @@protoc_insertion_point(field_list:io.deephaven.proto.backplane.grpc.MultiJoinInput.columns_to_add)
-  return _internal_columns_to_add();
-}
-inline ::google::protobuf::RepeatedPtrField<std::string>*
-MultiJoinInput::mutable_columns_to_add() ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  // @@protoc_insertion_point(field_mutable_list:io.deephaven.proto.backplane.grpc.MultiJoinInput.columns_to_add)
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  return _internal_mutable_columns_to_add();
-}
-inline const ::google::protobuf::RepeatedPtrField<std::string>&
-MultiJoinInput::_internal_columns_to_add() const {
-  PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race);
-  return _impl_.columns_to_add_;
-}
-inline ::google::protobuf::RepeatedPtrField<std::string>*
-MultiJoinInput::_internal_mutable_columns_to_add() {
-  PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race);
-  return &_impl_.columns_to_add_;
-}
-
-// -------------------------------------------------------------------
-
-// MultiJoinTablesRequest
-
-// .io.deephaven.proto.backplane.grpc.Ticket result_id = 1;
-inline bool MultiJoinTablesRequest::has_result_id() const {
-  bool value = (_impl_._has_bits_[0] & 0x00000001u) != 0;
-  PROTOBUF_ASSUME(!value || _impl_.result_id_ != nullptr);
-  return value;
-}
-inline const ::io::deephaven::proto::backplane::grpc::Ticket& MultiJoinTablesRequest::_internal_result_id() const {
-  PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race);
-  const ::io::deephaven::proto::backplane::grpc::Ticket* p = _impl_.result_id_;
-  return p != nullptr ? *p : reinterpret_cast<const ::io::deephaven::proto::backplane::grpc::Ticket&>(::io::deephaven::proto::backplane::grpc::_Ticket_default_instance_);
-}
-inline const ::io::deephaven::proto::backplane::grpc::Ticket& MultiJoinTablesRequest::result_id() const ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  // @@protoc_insertion_point(field_get:io.deephaven.proto.backplane.grpc.MultiJoinTablesRequest.result_id)
-  return _internal_result_id();
-}
-inline void MultiJoinTablesRequest::unsafe_arena_set_allocated_result_id(::io::deephaven::proto::backplane::grpc::Ticket* value) {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  if (GetArena() == nullptr) {
-    delete reinterpret_cast<::google::protobuf::MessageLite*>(_impl_.result_id_);
-  }
-  _impl_.result_id_ = reinterpret_cast<::io::deephaven::proto::backplane::grpc::Ticket*>(value);
-  if (value != nullptr) {
-    _impl_._has_bits_[0] |= 0x00000001u;
-  } else {
-    _impl_._has_bits_[0] &= ~0x00000001u;
-  }
-  // @@protoc_insertion_point(field_unsafe_arena_set_allocated:io.deephaven.proto.backplane.grpc.MultiJoinTablesRequest.result_id)
-}
-inline ::io::deephaven::proto::backplane::grpc::Ticket* MultiJoinTablesRequest::release_result_id() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-
-  _impl_._has_bits_[0] &= ~0x00000001u;
-  ::io::deephaven::proto::backplane::grpc::Ticket* released = _impl_.result_id_;
-  _impl_.result_id_ = nullptr;
-#ifdef PROTOBUF_FORCE_COPY_IN_RELEASE
-  auto* old = reinterpret_cast<::google::protobuf::MessageLite*>(released);
-  released = ::google::protobuf::internal::DuplicateIfNonNull(released);
-  if (GetArena() == nullptr) {
-    delete old;
-  }
-#else   // PROTOBUF_FORCE_COPY_IN_RELEASE
-  if (GetArena() != nullptr) {
-    released = ::google::protobuf::internal::DuplicateIfNonNull(released);
-  }
-#endif  // !PROTOBUF_FORCE_COPY_IN_RELEASE
-  return released;
-}
-inline ::io::deephaven::proto::backplane::grpc::Ticket* MultiJoinTablesRequest::unsafe_arena_release_result_id() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  // @@protoc_insertion_point(field_release:io.deephaven.proto.backplane.grpc.MultiJoinTablesRequest.result_id)
-
-  _impl_._has_bits_[0] &= ~0x00000001u;
-  ::io::deephaven::proto::backplane::grpc::Ticket* temp = _impl_.result_id_;
-  _impl_.result_id_ = nullptr;
-  return temp;
-}
-inline ::io::deephaven::proto::backplane::grpc::Ticket* MultiJoinTablesRequest::_internal_mutable_result_id() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  _impl_._has_bits_[0] |= 0x00000001u;
-  if (_impl_.result_id_ == nullptr) {
-    auto* p = CreateMaybeMessage<::io::deephaven::proto::backplane::grpc::Ticket>(GetArena());
-    _impl_.result_id_ = reinterpret_cast<::io::deephaven::proto::backplane::grpc::Ticket*>(p);
-  }
-  return _impl_.result_id_;
-}
-inline ::io::deephaven::proto::backplane::grpc::Ticket* MultiJoinTablesRequest::mutable_result_id() ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  ::io::deephaven::proto::backplane::grpc::Ticket* _msg = _internal_mutable_result_id();
-  // @@protoc_insertion_point(field_mutable:io.deephaven.proto.backplane.grpc.MultiJoinTablesRequest.result_id)
-  return _msg;
-}
-inline void MultiJoinTablesRequest::set_allocated_result_id(::io::deephaven::proto::backplane::grpc::Ticket* value) {
-  ::google::protobuf::Arena* message_arena = GetArena();
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  if (message_arena == nullptr) {
-    delete reinterpret_cast<::google::protobuf::MessageLite*>(_impl_.result_id_);
-  }
-
-  if (value != nullptr) {
-    ::google::protobuf::Arena* submessage_arena = reinterpret_cast<::google::protobuf::MessageLite*>(value)->GetArena();
-    if (message_arena != submessage_arena) {
-      value = ::google::protobuf::internal::GetOwnedMessage(message_arena, value, submessage_arena);
-    }
-    _impl_._has_bits_[0] |= 0x00000001u;
-  } else {
-    _impl_._has_bits_[0] &= ~0x00000001u;
-  }
-
-  _impl_.result_id_ = reinterpret_cast<::io::deephaven::proto::backplane::grpc::Ticket*>(value);
-  // @@protoc_insertion_point(field_set_allocated:io.deephaven.proto.backplane.grpc.MultiJoinTablesRequest.result_id)
-}
-
-// repeated .io.deephaven.proto.backplane.grpc.MultiJoinInput multi_join_inputs = 2;
-inline int MultiJoinTablesRequest::_internal_multi_join_inputs_size() const {
-  return _internal_multi_join_inputs().size();
-}
-inline int MultiJoinTablesRequest::multi_join_inputs_size() const {
-  return _internal_multi_join_inputs_size();
-}
-inline void MultiJoinTablesRequest::clear_multi_join_inputs() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  _impl_.multi_join_inputs_.Clear();
-}
-inline ::io::deephaven::proto::backplane::grpc::MultiJoinInput* MultiJoinTablesRequest::mutable_multi_join_inputs(int index)
-    ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  // @@protoc_insertion_point(field_mutable:io.deephaven.proto.backplane.grpc.MultiJoinTablesRequest.multi_join_inputs)
-  return _internal_mutable_multi_join_inputs()->Mutable(index);
-}
-inline ::google::protobuf::RepeatedPtrField<::io::deephaven::proto::backplane::grpc::MultiJoinInput>* MultiJoinTablesRequest::mutable_multi_join_inputs()
-    ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  // @@protoc_insertion_point(field_mutable_list:io.deephaven.proto.backplane.grpc.MultiJoinTablesRequest.multi_join_inputs)
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  return _internal_mutable_multi_join_inputs();
-}
-inline const ::io::deephaven::proto::backplane::grpc::MultiJoinInput& MultiJoinTablesRequest::multi_join_inputs(int index) const
-    ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  // @@protoc_insertion_point(field_get:io.deephaven.proto.backplane.grpc.MultiJoinTablesRequest.multi_join_inputs)
-  return _internal_multi_join_inputs().Get(index);
-}
-inline ::io::deephaven::proto::backplane::grpc::MultiJoinInput* MultiJoinTablesRequest::add_multi_join_inputs() ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  ::io::deephaven::proto::backplane::grpc::MultiJoinInput* _add = _internal_mutable_multi_join_inputs()->Add();
-  // @@protoc_insertion_point(field_add:io.deephaven.proto.backplane.grpc.MultiJoinTablesRequest.multi_join_inputs)
-  return _add;
-}
-inline const ::google::protobuf::RepeatedPtrField<::io::deephaven::proto::backplane::grpc::MultiJoinInput>& MultiJoinTablesRequest::multi_join_inputs() const
-    ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  // @@protoc_insertion_point(field_list:io.deephaven.proto.backplane.grpc.MultiJoinTablesRequest.multi_join_inputs)
-  return _internal_multi_join_inputs();
-}
-inline const ::google::protobuf::RepeatedPtrField<::io::deephaven::proto::backplane::grpc::MultiJoinInput>&
-MultiJoinTablesRequest::_internal_multi_join_inputs() const {
-  PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race);
-  return _impl_.multi_join_inputs_;
-}
-inline ::google::protobuf::RepeatedPtrField<::io::deephaven::proto::backplane::grpc::MultiJoinInput>*
-MultiJoinTablesRequest::_internal_mutable_multi_join_inputs() {
-  PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race);
-  return &_impl_.multi_join_inputs_;
-}
-
-// -------------------------------------------------------------------
-
-// RangeJoinTablesRequest
-
-// .io.deephaven.proto.backplane.grpc.Ticket result_id = 1;
-inline bool RangeJoinTablesRequest::has_result_id() const {
-  bool value = (_impl_._has_bits_[0] & 0x00000001u) != 0;
-  PROTOBUF_ASSUME(!value || _impl_.result_id_ != nullptr);
-  return value;
-}
-inline const ::io::deephaven::proto::backplane::grpc::Ticket& RangeJoinTablesRequest::_internal_result_id() const {
-  PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race);
-  const ::io::deephaven::proto::backplane::grpc::Ticket* p = _impl_.result_id_;
-  return p != nullptr ? *p : reinterpret_cast<const ::io::deephaven::proto::backplane::grpc::Ticket&>(::io::deephaven::proto::backplane::grpc::_Ticket_default_instance_);
-}
-inline const ::io::deephaven::proto::backplane::grpc::Ticket& RangeJoinTablesRequest::result_id() const ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  // @@protoc_insertion_point(field_get:io.deephaven.proto.backplane.grpc.RangeJoinTablesRequest.result_id)
-  return _internal_result_id();
-}
-inline void RangeJoinTablesRequest::unsafe_arena_set_allocated_result_id(::io::deephaven::proto::backplane::grpc::Ticket* value) {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  if (GetArena() == nullptr) {
-    delete reinterpret_cast<::google::protobuf::MessageLite*>(_impl_.result_id_);
-  }
-  _impl_.result_id_ = reinterpret_cast<::io::deephaven::proto::backplane::grpc::Ticket*>(value);
-  if (value != nullptr) {
-    _impl_._has_bits_[0] |= 0x00000001u;
-  } else {
-    _impl_._has_bits_[0] &= ~0x00000001u;
-  }
-  // @@protoc_insertion_point(field_unsafe_arena_set_allocated:io.deephaven.proto.backplane.grpc.RangeJoinTablesRequest.result_id)
-}
-inline ::io::deephaven::proto::backplane::grpc::Ticket* RangeJoinTablesRequest::release_result_id() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-
-  _impl_._has_bits_[0] &= ~0x00000001u;
-  ::io::deephaven::proto::backplane::grpc::Ticket* released = _impl_.result_id_;
-  _impl_.result_id_ = nullptr;
-#ifdef PROTOBUF_FORCE_COPY_IN_RELEASE
-  auto* old = reinterpret_cast<::google::protobuf::MessageLite*>(released);
-  released = ::google::protobuf::internal::DuplicateIfNonNull(released);
-  if (GetArena() == nullptr) {
-    delete old;
-  }
-#else   // PROTOBUF_FORCE_COPY_IN_RELEASE
-  if (GetArena() != nullptr) {
-    released = ::google::protobuf::internal::DuplicateIfNonNull(released);
-  }
-#endif  // !PROTOBUF_FORCE_COPY_IN_RELEASE
-  return released;
-}
-inline ::io::deephaven::proto::backplane::grpc::Ticket* RangeJoinTablesRequest::unsafe_arena_release_result_id() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  // @@protoc_insertion_point(field_release:io.deephaven.proto.backplane.grpc.RangeJoinTablesRequest.result_id)
-
-  _impl_._has_bits_[0] &= ~0x00000001u;
-  ::io::deephaven::proto::backplane::grpc::Ticket* temp = _impl_.result_id_;
-  _impl_.result_id_ = nullptr;
-  return temp;
-}
-inline ::io::deephaven::proto::backplane::grpc::Ticket* RangeJoinTablesRequest::_internal_mutable_result_id() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  _impl_._has_bits_[0] |= 0x00000001u;
-  if (_impl_.result_id_ == nullptr) {
-    auto* p = CreateMaybeMessage<::io::deephaven::proto::backplane::grpc::Ticket>(GetArena());
-    _impl_.result_id_ = reinterpret_cast<::io::deephaven::proto::backplane::grpc::Ticket*>(p);
-  }
-  return _impl_.result_id_;
-}
-inline ::io::deephaven::proto::backplane::grpc::Ticket* RangeJoinTablesRequest::mutable_result_id() ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  ::io::deephaven::proto::backplane::grpc::Ticket* _msg = _internal_mutable_result_id();
-  // @@protoc_insertion_point(field_mutable:io.deephaven.proto.backplane.grpc.RangeJoinTablesRequest.result_id)
-  return _msg;
-}
-inline void RangeJoinTablesRequest::set_allocated_result_id(::io::deephaven::proto::backplane::grpc::Ticket* value) {
-  ::google::protobuf::Arena* message_arena = GetArena();
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  if (message_arena == nullptr) {
-    delete reinterpret_cast<::google::protobuf::MessageLite*>(_impl_.result_id_);
-  }
-
-  if (value != nullptr) {
-    ::google::protobuf::Arena* submessage_arena = reinterpret_cast<::google::protobuf::MessageLite*>(value)->GetArena();
-    if (message_arena != submessage_arena) {
-      value = ::google::protobuf::internal::GetOwnedMessage(message_arena, value, submessage_arena);
-    }
-    _impl_._has_bits_[0] |= 0x00000001u;
-  } else {
-    _impl_._has_bits_[0] &= ~0x00000001u;
-  }
-
-  _impl_.result_id_ = reinterpret_cast<::io::deephaven::proto::backplane::grpc::Ticket*>(value);
-  // @@protoc_insertion_point(field_set_allocated:io.deephaven.proto.backplane.grpc.RangeJoinTablesRequest.result_id)
-}
-
-// .io.deephaven.proto.backplane.grpc.TableReference left_id = 2;
-inline bool RangeJoinTablesRequest::has_left_id() const {
-  bool value = (_impl_._has_bits_[0] & 0x00000002u) != 0;
-  PROTOBUF_ASSUME(!value || _impl_.left_id_ != nullptr);
-  return value;
-}
-inline void RangeJoinTablesRequest::clear_left_id() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  if (_impl_.left_id_ != nullptr) _impl_.left_id_->Clear();
-  _impl_._has_bits_[0] &= ~0x00000002u;
-}
-inline const ::io::deephaven::proto::backplane::grpc::TableReference& RangeJoinTablesRequest::_internal_left_id() const {
-  PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race);
-  const ::io::deephaven::proto::backplane::grpc::TableReference* p = _impl_.left_id_;
-  return p != nullptr ? *p : reinterpret_cast<const ::io::deephaven::proto::backplane::grpc::TableReference&>(::io::deephaven::proto::backplane::grpc::_TableReference_default_instance_);
-}
-inline const ::io::deephaven::proto::backplane::grpc::TableReference& RangeJoinTablesRequest::left_id() const ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  // @@protoc_insertion_point(field_get:io.deephaven.proto.backplane.grpc.RangeJoinTablesRequest.left_id)
-  return _internal_left_id();
-}
-inline void RangeJoinTablesRequest::unsafe_arena_set_allocated_left_id(::io::deephaven::proto::backplane::grpc::TableReference* value) {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  if (GetArena() == nullptr) {
-    delete reinterpret_cast<::google::protobuf::MessageLite*>(_impl_.left_id_);
-  }
-  _impl_.left_id_ = reinterpret_cast<::io::deephaven::proto::backplane::grpc::TableReference*>(value);
-  if (value != nullptr) {
-    _impl_._has_bits_[0] |= 0x00000002u;
-  } else {
-    _impl_._has_bits_[0] &= ~0x00000002u;
-  }
-  // @@protoc_insertion_point(field_unsafe_arena_set_allocated:io.deephaven.proto.backplane.grpc.RangeJoinTablesRequest.left_id)
-}
-inline ::io::deephaven::proto::backplane::grpc::TableReference* RangeJoinTablesRequest::release_left_id() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-
-  _impl_._has_bits_[0] &= ~0x00000002u;
-  ::io::deephaven::proto::backplane::grpc::TableReference* released = _impl_.left_id_;
-  _impl_.left_id_ = nullptr;
-#ifdef PROTOBUF_FORCE_COPY_IN_RELEASE
-  auto* old = reinterpret_cast<::google::protobuf::MessageLite*>(released);
-  released = ::google::protobuf::internal::DuplicateIfNonNull(released);
-  if (GetArena() == nullptr) {
-    delete old;
-  }
-#else   // PROTOBUF_FORCE_COPY_IN_RELEASE
-  if (GetArena() != nullptr) {
-    released = ::google::protobuf::internal::DuplicateIfNonNull(released);
-  }
-#endif  // !PROTOBUF_FORCE_COPY_IN_RELEASE
-  return released;
-}
-inline ::io::deephaven::proto::backplane::grpc::TableReference* RangeJoinTablesRequest::unsafe_arena_release_left_id() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  // @@protoc_insertion_point(field_release:io.deephaven.proto.backplane.grpc.RangeJoinTablesRequest.left_id)
-
-  _impl_._has_bits_[0] &= ~0x00000002u;
-  ::io::deephaven::proto::backplane::grpc::TableReference* temp = _impl_.left_id_;
-  _impl_.left_id_ = nullptr;
-  return temp;
-}
-inline ::io::deephaven::proto::backplane::grpc::TableReference* RangeJoinTablesRequest::_internal_mutable_left_id() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  _impl_._has_bits_[0] |= 0x00000002u;
-  if (_impl_.left_id_ == nullptr) {
-    auto* p = CreateMaybeMessage<::io::deephaven::proto::backplane::grpc::TableReference>(GetArena());
-    _impl_.left_id_ = reinterpret_cast<::io::deephaven::proto::backplane::grpc::TableReference*>(p);
-  }
-  return _impl_.left_id_;
-}
-inline ::io::deephaven::proto::backplane::grpc::TableReference* RangeJoinTablesRequest::mutable_left_id() ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  ::io::deephaven::proto::backplane::grpc::TableReference* _msg = _internal_mutable_left_id();
-  // @@protoc_insertion_point(field_mutable:io.deephaven.proto.backplane.grpc.RangeJoinTablesRequest.left_id)
-  return _msg;
-}
-inline void RangeJoinTablesRequest::set_allocated_left_id(::io::deephaven::proto::backplane::grpc::TableReference* value) {
-  ::google::protobuf::Arena* message_arena = GetArena();
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  if (message_arena == nullptr) {
-    delete reinterpret_cast<::io::deephaven::proto::backplane::grpc::TableReference*>(_impl_.left_id_);
-  }
-
-  if (value != nullptr) {
-    ::google::protobuf::Arena* submessage_arena = reinterpret_cast<::io::deephaven::proto::backplane::grpc::TableReference*>(value)->GetArena();
-    if (message_arena != submessage_arena) {
-      value = ::google::protobuf::internal::GetOwnedMessage(message_arena, value, submessage_arena);
-    }
-    _impl_._has_bits_[0] |= 0x00000002u;
-  } else {
-    _impl_._has_bits_[0] &= ~0x00000002u;
-  }
-
-  _impl_.left_id_ = reinterpret_cast<::io::deephaven::proto::backplane::grpc::TableReference*>(value);
-  // @@protoc_insertion_point(field_set_allocated:io.deephaven.proto.backplane.grpc.RangeJoinTablesRequest.left_id)
-}
-
-// .io.deephaven.proto.backplane.grpc.TableReference right_id = 3;
-inline bool RangeJoinTablesRequest::has_right_id() const {
-  bool value = (_impl_._has_bits_[0] & 0x00000004u) != 0;
-  PROTOBUF_ASSUME(!value || _impl_.right_id_ != nullptr);
-  return value;
-}
-inline void RangeJoinTablesRequest::clear_right_id() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  if (_impl_.right_id_ != nullptr) _impl_.right_id_->Clear();
-  _impl_._has_bits_[0] &= ~0x00000004u;
-}
-inline const ::io::deephaven::proto::backplane::grpc::TableReference& RangeJoinTablesRequest::_internal_right_id() const {
-  PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race);
-  const ::io::deephaven::proto::backplane::grpc::TableReference* p = _impl_.right_id_;
-  return p != nullptr ? *p : reinterpret_cast<const ::io::deephaven::proto::backplane::grpc::TableReference&>(::io::deephaven::proto::backplane::grpc::_TableReference_default_instance_);
-}
-inline const ::io::deephaven::proto::backplane::grpc::TableReference& RangeJoinTablesRequest::right_id() const ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  // @@protoc_insertion_point(field_get:io.deephaven.proto.backplane.grpc.RangeJoinTablesRequest.right_id)
-  return _internal_right_id();
-}
-inline void RangeJoinTablesRequest::unsafe_arena_set_allocated_right_id(::io::deephaven::proto::backplane::grpc::TableReference* value) {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  if (GetArena() == nullptr) {
-    delete reinterpret_cast<::google::protobuf::MessageLite*>(_impl_.right_id_);
-  }
-  _impl_.right_id_ = reinterpret_cast<::io::deephaven::proto::backplane::grpc::TableReference*>(value);
-  if (value != nullptr) {
-    _impl_._has_bits_[0] |= 0x00000004u;
-  } else {
-    _impl_._has_bits_[0] &= ~0x00000004u;
-  }
-  // @@protoc_insertion_point(field_unsafe_arena_set_allocated:io.deephaven.proto.backplane.grpc.RangeJoinTablesRequest.right_id)
-}
-inline ::io::deephaven::proto::backplane::grpc::TableReference* RangeJoinTablesRequest::release_right_id() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-
-  _impl_._has_bits_[0] &= ~0x00000004u;
-  ::io::deephaven::proto::backplane::grpc::TableReference* released = _impl_.right_id_;
-  _impl_.right_id_ = nullptr;
-#ifdef PROTOBUF_FORCE_COPY_IN_RELEASE
-  auto* old = reinterpret_cast<::google::protobuf::MessageLite*>(released);
-  released = ::google::protobuf::internal::DuplicateIfNonNull(released);
-  if (GetArena() == nullptr) {
-    delete old;
-  }
-#else   // PROTOBUF_FORCE_COPY_IN_RELEASE
-  if (GetArena() != nullptr) {
-    released = ::google::protobuf::internal::DuplicateIfNonNull(released);
-  }
-#endif  // !PROTOBUF_FORCE_COPY_IN_RELEASE
-  return released;
-}
-inline ::io::deephaven::proto::backplane::grpc::TableReference* RangeJoinTablesRequest::unsafe_arena_release_right_id() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  // @@protoc_insertion_point(field_release:io.deephaven.proto.backplane.grpc.RangeJoinTablesRequest.right_id)
-
-  _impl_._has_bits_[0] &= ~0x00000004u;
-  ::io::deephaven::proto::backplane::grpc::TableReference* temp = _impl_.right_id_;
-  _impl_.right_id_ = nullptr;
-  return temp;
-}
-inline ::io::deephaven::proto::backplane::grpc::TableReference* RangeJoinTablesRequest::_internal_mutable_right_id() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  _impl_._has_bits_[0] |= 0x00000004u;
-  if (_impl_.right_id_ == nullptr) {
-    auto* p = CreateMaybeMessage<::io::deephaven::proto::backplane::grpc::TableReference>(GetArena());
-    _impl_.right_id_ = reinterpret_cast<::io::deephaven::proto::backplane::grpc::TableReference*>(p);
-  }
-  return _impl_.right_id_;
-}
-inline ::io::deephaven::proto::backplane::grpc::TableReference* RangeJoinTablesRequest::mutable_right_id() ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  ::io::deephaven::proto::backplane::grpc::TableReference* _msg = _internal_mutable_right_id();
-  // @@protoc_insertion_point(field_mutable:io.deephaven.proto.backplane.grpc.RangeJoinTablesRequest.right_id)
-  return _msg;
-}
-inline void RangeJoinTablesRequest::set_allocated_right_id(::io::deephaven::proto::backplane::grpc::TableReference* value) {
-  ::google::protobuf::Arena* message_arena = GetArena();
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  if (message_arena == nullptr) {
-    delete reinterpret_cast<::io::deephaven::proto::backplane::grpc::TableReference*>(_impl_.right_id_);
-  }
-
-  if (value != nullptr) {
-    ::google::protobuf::Arena* submessage_arena = reinterpret_cast<::io::deephaven::proto::backplane::grpc::TableReference*>(value)->GetArena();
-    if (message_arena != submessage_arena) {
-      value = ::google::protobuf::internal::GetOwnedMessage(message_arena, value, submessage_arena);
-    }
-    _impl_._has_bits_[0] |= 0x00000004u;
-  } else {
-    _impl_._has_bits_[0] &= ~0x00000004u;
-  }
-
-  _impl_.right_id_ = reinterpret_cast<::io::deephaven::proto::backplane::grpc::TableReference*>(value);
-  // @@protoc_insertion_point(field_set_allocated:io.deephaven.proto.backplane.grpc.RangeJoinTablesRequest.right_id)
-}
-
-// repeated string exact_match_columns = 4;
-inline int RangeJoinTablesRequest::_internal_exact_match_columns_size() const {
-  return _internal_exact_match_columns().size();
-}
-inline int RangeJoinTablesRequest::exact_match_columns_size() const {
-  return _internal_exact_match_columns_size();
-}
-inline void RangeJoinTablesRequest::clear_exact_match_columns() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  _impl_.exact_match_columns_.Clear();
-}
-inline std::string* RangeJoinTablesRequest::add_exact_match_columns()
-    ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  std::string* _s = _internal_mutable_exact_match_columns()->Add();
-  // @@protoc_insertion_point(field_add_mutable:io.deephaven.proto.backplane.grpc.RangeJoinTablesRequest.exact_match_columns)
-  return _s;
-}
-inline const std::string& RangeJoinTablesRequest::exact_match_columns(int index) const
-    ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  // @@protoc_insertion_point(field_get:io.deephaven.proto.backplane.grpc.RangeJoinTablesRequest.exact_match_columns)
-  return _internal_exact_match_columns().Get(index);
-}
-inline std::string* RangeJoinTablesRequest::mutable_exact_match_columns(int index)
-    ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  // @@protoc_insertion_point(field_mutable:io.deephaven.proto.backplane.grpc.RangeJoinTablesRequest.exact_match_columns)
-  return _internal_mutable_exact_match_columns()->Mutable(index);
-}
-inline void RangeJoinTablesRequest::set_exact_match_columns(int index, const std::string& value) {
-  _internal_mutable_exact_match_columns()->Mutable(index)->assign(value);
-  // @@protoc_insertion_point(field_set:io.deephaven.proto.backplane.grpc.RangeJoinTablesRequest.exact_match_columns)
-}
-inline void RangeJoinTablesRequest::set_exact_match_columns(int index, std::string&& value) {
-  _internal_mutable_exact_match_columns()->Mutable(index)->assign(std::move(value));
-  // @@protoc_insertion_point(field_set:io.deephaven.proto.backplane.grpc.RangeJoinTablesRequest.exact_match_columns)
-}
-inline void RangeJoinTablesRequest::set_exact_match_columns(int index, const char* value) {
-  ABSL_DCHECK(value != nullptr);
-  _internal_mutable_exact_match_columns()->Mutable(index)->assign(value);
-  // @@protoc_insertion_point(field_set_char:io.deephaven.proto.backplane.grpc.RangeJoinTablesRequest.exact_match_columns)
-}
-inline void RangeJoinTablesRequest::set_exact_match_columns(int index, const char* value,
-                              std::size_t size) {
-  _internal_mutable_exact_match_columns()->Mutable(index)->assign(
-      reinterpret_cast<const char*>(value), size);
-  // @@protoc_insertion_point(field_set_pointer:io.deephaven.proto.backplane.grpc.RangeJoinTablesRequest.exact_match_columns)
-}
-inline void RangeJoinTablesRequest::set_exact_match_columns(int index, absl::string_view value) {
-  _internal_mutable_exact_match_columns()->Mutable(index)->assign(value.data(),
-                                                     value.size());
-  // @@protoc_insertion_point(field_set_string_piece:io.deephaven.proto.backplane.grpc.RangeJoinTablesRequest.exact_match_columns)
-}
-inline void RangeJoinTablesRequest::add_exact_match_columns(const std::string& value) {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  _internal_mutable_exact_match_columns()->Add()->assign(value);
-  // @@protoc_insertion_point(field_add:io.deephaven.proto.backplane.grpc.RangeJoinTablesRequest.exact_match_columns)
-}
-inline void RangeJoinTablesRequest::add_exact_match_columns(std::string&& value) {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  _internal_mutable_exact_match_columns()->Add(std::move(value));
-  // @@protoc_insertion_point(field_add:io.deephaven.proto.backplane.grpc.RangeJoinTablesRequest.exact_match_columns)
-}
-inline void RangeJoinTablesRequest::add_exact_match_columns(const char* value) {
-  ABSL_DCHECK(value != nullptr);
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  _internal_mutable_exact_match_columns()->Add()->assign(value);
-  // @@protoc_insertion_point(field_add_char:io.deephaven.proto.backplane.grpc.RangeJoinTablesRequest.exact_match_columns)
-}
-inline void RangeJoinTablesRequest::add_exact_match_columns(const char* value, std::size_t size) {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  _internal_mutable_exact_match_columns()->Add()->assign(
-      reinterpret_cast<const char*>(value), size);
-  // @@protoc_insertion_point(field_add_pointer:io.deephaven.proto.backplane.grpc.RangeJoinTablesRequest.exact_match_columns)
-}
-inline void RangeJoinTablesRequest::add_exact_match_columns(absl::string_view value) {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  _internal_mutable_exact_match_columns()->Add()->assign(value.data(), value.size());
-  // @@protoc_insertion_point(field_add_string_piece:io.deephaven.proto.backplane.grpc.RangeJoinTablesRequest.exact_match_columns)
-}
-inline const ::google::protobuf::RepeatedPtrField<std::string>&
-RangeJoinTablesRequest::exact_match_columns() const ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  // @@protoc_insertion_point(field_list:io.deephaven.proto.backplane.grpc.RangeJoinTablesRequest.exact_match_columns)
-  return _internal_exact_match_columns();
-}
-inline ::google::protobuf::RepeatedPtrField<std::string>*
-RangeJoinTablesRequest::mutable_exact_match_columns() ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  // @@protoc_insertion_point(field_mutable_list:io.deephaven.proto.backplane.grpc.RangeJoinTablesRequest.exact_match_columns)
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  return _internal_mutable_exact_match_columns();
-}
-inline const ::google::protobuf::RepeatedPtrField<std::string>&
-RangeJoinTablesRequest::_internal_exact_match_columns() const {
-  PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race);
-  return _impl_.exact_match_columns_;
-}
-inline ::google::protobuf::RepeatedPtrField<std::string>*
-RangeJoinTablesRequest::_internal_mutable_exact_match_columns() {
-  PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race);
-  return &_impl_.exact_match_columns_;
-}
-
-// string left_start_column = 5;
-inline void RangeJoinTablesRequest::clear_left_start_column() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  _impl_.left_start_column_.ClearToEmpty();
-}
-inline const std::string& RangeJoinTablesRequest::left_start_column() const
-    ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  // @@protoc_insertion_point(field_get:io.deephaven.proto.backplane.grpc.RangeJoinTablesRequest.left_start_column)
-  return _internal_left_start_column();
-}
-template <typename Arg_, typename... Args_>
-inline PROTOBUF_ALWAYS_INLINE void RangeJoinTablesRequest::set_left_start_column(Arg_&& arg,
-                                                     Args_... args) {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  ;
-  _impl_.left_start_column_.Set(static_cast<Arg_&&>(arg), args..., GetArena());
-  // @@protoc_insertion_point(field_set:io.deephaven.proto.backplane.grpc.RangeJoinTablesRequest.left_start_column)
-}
-inline std::string* RangeJoinTablesRequest::mutable_left_start_column() ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  std::string* _s = _internal_mutable_left_start_column();
-  // @@protoc_insertion_point(field_mutable:io.deephaven.proto.backplane.grpc.RangeJoinTablesRequest.left_start_column)
-  return _s;
-}
-inline const std::string& RangeJoinTablesRequest::_internal_left_start_column() const {
-  PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race);
-  return _impl_.left_start_column_.Get();
-}
-inline void RangeJoinTablesRequest::_internal_set_left_start_column(const std::string& value) {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  ;
-  _impl_.left_start_column_.Set(value, GetArena());
-}
-inline std::string* RangeJoinTablesRequest::_internal_mutable_left_start_column() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  ;
-  return _impl_.left_start_column_.Mutable( GetArena());
-}
-inline std::string* RangeJoinTablesRequest::release_left_start_column() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  // @@protoc_insertion_point(field_release:io.deephaven.proto.backplane.grpc.RangeJoinTablesRequest.left_start_column)
-  return _impl_.left_start_column_.Release();
-}
-inline void RangeJoinTablesRequest::set_allocated_left_start_column(std::string* value) {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  _impl_.left_start_column_.SetAllocated(value, GetArena());
-  #ifdef PROTOBUF_FORCE_COPY_DEFAULT_STRING
-        if (_impl_.left_start_column_.IsDefault()) {
-          _impl_.left_start_column_.Set("", GetArena());
-        }
-  #endif  // PROTOBUF_FORCE_COPY_DEFAULT_STRING
-  // @@protoc_insertion_point(field_set_allocated:io.deephaven.proto.backplane.grpc.RangeJoinTablesRequest.left_start_column)
-}
-
-// .io.deephaven.proto.backplane.grpc.RangeJoinTablesRequest.RangeStartRule range_start_rule = 6;
-inline void RangeJoinTablesRequest::clear_range_start_rule() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  _impl_.range_start_rule_ = 0;
-}
-inline ::io::deephaven::proto::backplane::grpc::RangeJoinTablesRequest_RangeStartRule RangeJoinTablesRequest::range_start_rule() const {
-  // @@protoc_insertion_point(field_get:io.deephaven.proto.backplane.grpc.RangeJoinTablesRequest.range_start_rule)
-  return _internal_range_start_rule();
-}
-inline void RangeJoinTablesRequest::set_range_start_rule(::io::deephaven::proto::backplane::grpc::RangeJoinTablesRequest_RangeStartRule value) {
-  _internal_set_range_start_rule(value);
-  // @@protoc_insertion_point(field_set:io.deephaven.proto.backplane.grpc.RangeJoinTablesRequest.range_start_rule)
-}
-inline ::io::deephaven::proto::backplane::grpc::RangeJoinTablesRequest_RangeStartRule RangeJoinTablesRequest::_internal_range_start_rule() const {
-  PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race);
-  return static_cast<::io::deephaven::proto::backplane::grpc::RangeJoinTablesRequest_RangeStartRule>(_impl_.range_start_rule_);
-}
-inline void RangeJoinTablesRequest::_internal_set_range_start_rule(::io::deephaven::proto::backplane::grpc::RangeJoinTablesRequest_RangeStartRule value) {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  ;
-  _impl_.range_start_rule_ = value;
-}
-
-// string right_range_column = 7;
-inline void RangeJoinTablesRequest::clear_right_range_column() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  _impl_.right_range_column_.ClearToEmpty();
-}
-inline const std::string& RangeJoinTablesRequest::right_range_column() const
-    ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  // @@protoc_insertion_point(field_get:io.deephaven.proto.backplane.grpc.RangeJoinTablesRequest.right_range_column)
-  return _internal_right_range_column();
-}
-template <typename Arg_, typename... Args_>
-inline PROTOBUF_ALWAYS_INLINE void RangeJoinTablesRequest::set_right_range_column(Arg_&& arg,
-                                                     Args_... args) {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  ;
-  _impl_.right_range_column_.Set(static_cast<Arg_&&>(arg), args..., GetArena());
-  // @@protoc_insertion_point(field_set:io.deephaven.proto.backplane.grpc.RangeJoinTablesRequest.right_range_column)
-}
-inline std::string* RangeJoinTablesRequest::mutable_right_range_column() ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  std::string* _s = _internal_mutable_right_range_column();
-  // @@protoc_insertion_point(field_mutable:io.deephaven.proto.backplane.grpc.RangeJoinTablesRequest.right_range_column)
-  return _s;
-}
-inline const std::string& RangeJoinTablesRequest::_internal_right_range_column() const {
-  PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race);
-  return _impl_.right_range_column_.Get();
-}
-inline void RangeJoinTablesRequest::_internal_set_right_range_column(const std::string& value) {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  ;
-  _impl_.right_range_column_.Set(value, GetArena());
-}
-inline std::string* RangeJoinTablesRequest::_internal_mutable_right_range_column() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  ;
-  return _impl_.right_range_column_.Mutable( GetArena());
-}
-inline std::string* RangeJoinTablesRequest::release_right_range_column() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  // @@protoc_insertion_point(field_release:io.deephaven.proto.backplane.grpc.RangeJoinTablesRequest.right_range_column)
-  return _impl_.right_range_column_.Release();
-}
-inline void RangeJoinTablesRequest::set_allocated_right_range_column(std::string* value) {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  _impl_.right_range_column_.SetAllocated(value, GetArena());
-  #ifdef PROTOBUF_FORCE_COPY_DEFAULT_STRING
-        if (_impl_.right_range_column_.IsDefault()) {
-          _impl_.right_range_column_.Set("", GetArena());
-        }
-  #endif  // PROTOBUF_FORCE_COPY_DEFAULT_STRING
-  // @@protoc_insertion_point(field_set_allocated:io.deephaven.proto.backplane.grpc.RangeJoinTablesRequest.right_range_column)
-}
-
-// .io.deephaven.proto.backplane.grpc.RangeJoinTablesRequest.RangeEndRule range_end_rule = 8;
-inline void RangeJoinTablesRequest::clear_range_end_rule() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  _impl_.range_end_rule_ = 0;
-}
-inline ::io::deephaven::proto::backplane::grpc::RangeJoinTablesRequest_RangeEndRule RangeJoinTablesRequest::range_end_rule() const {
-  // @@protoc_insertion_point(field_get:io.deephaven.proto.backplane.grpc.RangeJoinTablesRequest.range_end_rule)
-  return _internal_range_end_rule();
-}
-inline void RangeJoinTablesRequest::set_range_end_rule(::io::deephaven::proto::backplane::grpc::RangeJoinTablesRequest_RangeEndRule value) {
-  _internal_set_range_end_rule(value);
-  // @@protoc_insertion_point(field_set:io.deephaven.proto.backplane.grpc.RangeJoinTablesRequest.range_end_rule)
-}
-inline ::io::deephaven::proto::backplane::grpc::RangeJoinTablesRequest_RangeEndRule RangeJoinTablesRequest::_internal_range_end_rule() const {
-  PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race);
-  return static_cast<::io::deephaven::proto::backplane::grpc::RangeJoinTablesRequest_RangeEndRule>(_impl_.range_end_rule_);
-}
-inline void RangeJoinTablesRequest::_internal_set_range_end_rule(::io::deephaven::proto::backplane::grpc::RangeJoinTablesRequest_RangeEndRule value) {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  ;
-  _impl_.range_end_rule_ = value;
-}
-
-// string left_end_column = 9;
-inline void RangeJoinTablesRequest::clear_left_end_column() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  _impl_.left_end_column_.ClearToEmpty();
-}
-inline const std::string& RangeJoinTablesRequest::left_end_column() const
-    ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  // @@protoc_insertion_point(field_get:io.deephaven.proto.backplane.grpc.RangeJoinTablesRequest.left_end_column)
-  return _internal_left_end_column();
-}
-template <typename Arg_, typename... Args_>
-inline PROTOBUF_ALWAYS_INLINE void RangeJoinTablesRequest::set_left_end_column(Arg_&& arg,
-                                                     Args_... args) {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  ;
-  _impl_.left_end_column_.Set(static_cast<Arg_&&>(arg), args..., GetArena());
-  // @@protoc_insertion_point(field_set:io.deephaven.proto.backplane.grpc.RangeJoinTablesRequest.left_end_column)
-}
-inline std::string* RangeJoinTablesRequest::mutable_left_end_column() ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  std::string* _s = _internal_mutable_left_end_column();
-  // @@protoc_insertion_point(field_mutable:io.deephaven.proto.backplane.grpc.RangeJoinTablesRequest.left_end_column)
-  return _s;
-}
-inline const std::string& RangeJoinTablesRequest::_internal_left_end_column() const {
-  PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race);
-  return _impl_.left_end_column_.Get();
-}
-inline void RangeJoinTablesRequest::_internal_set_left_end_column(const std::string& value) {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  ;
-  _impl_.left_end_column_.Set(value, GetArena());
-}
-inline std::string* RangeJoinTablesRequest::_internal_mutable_left_end_column() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  ;
-  return _impl_.left_end_column_.Mutable( GetArena());
-}
-inline std::string* RangeJoinTablesRequest::release_left_end_column() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  // @@protoc_insertion_point(field_release:io.deephaven.proto.backplane.grpc.RangeJoinTablesRequest.left_end_column)
-  return _impl_.left_end_column_.Release();
-}
-inline void RangeJoinTablesRequest::set_allocated_left_end_column(std::string* value) {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  _impl_.left_end_column_.SetAllocated(value, GetArena());
-  #ifdef PROTOBUF_FORCE_COPY_DEFAULT_STRING
-        if (_impl_.left_end_column_.IsDefault()) {
-          _impl_.left_end_column_.Set("", GetArena());
-        }
-  #endif  // PROTOBUF_FORCE_COPY_DEFAULT_STRING
-  // @@protoc_insertion_point(field_set_allocated:io.deephaven.proto.backplane.grpc.RangeJoinTablesRequest.left_end_column)
-}
-
-// repeated .io.deephaven.proto.backplane.grpc.Aggregation aggregations = 10;
-inline int RangeJoinTablesRequest::_internal_aggregations_size() const {
-  return _internal_aggregations().size();
-}
-inline int RangeJoinTablesRequest::aggregations_size() const {
-  return _internal_aggregations_size();
-}
-inline void RangeJoinTablesRequest::clear_aggregations() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  _impl_.aggregations_.Clear();
-}
-inline ::io::deephaven::proto::backplane::grpc::Aggregation* RangeJoinTablesRequest::mutable_aggregations(int index)
-    ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  // @@protoc_insertion_point(field_mutable:io.deephaven.proto.backplane.grpc.RangeJoinTablesRequest.aggregations)
-  return _internal_mutable_aggregations()->Mutable(index);
-}
-inline ::google::protobuf::RepeatedPtrField<::io::deephaven::proto::backplane::grpc::Aggregation>* RangeJoinTablesRequest::mutable_aggregations()
-    ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  // @@protoc_insertion_point(field_mutable_list:io.deephaven.proto.backplane.grpc.RangeJoinTablesRequest.aggregations)
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  return _internal_mutable_aggregations();
-}
-inline const ::io::deephaven::proto::backplane::grpc::Aggregation& RangeJoinTablesRequest::aggregations(int index) const
-    ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  // @@protoc_insertion_point(field_get:io.deephaven.proto.backplane.grpc.RangeJoinTablesRequest.aggregations)
-  return _internal_aggregations().Get(index);
-}
-inline ::io::deephaven::proto::backplane::grpc::Aggregation* RangeJoinTablesRequest::add_aggregations() ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  ::io::deephaven::proto::backplane::grpc::Aggregation* _add = _internal_mutable_aggregations()->Add();
-  // @@protoc_insertion_point(field_add:io.deephaven.proto.backplane.grpc.RangeJoinTablesRequest.aggregations)
-  return _add;
-}
-inline const ::google::protobuf::RepeatedPtrField<::io::deephaven::proto::backplane::grpc::Aggregation>& RangeJoinTablesRequest::aggregations() const
-    ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  // @@protoc_insertion_point(field_list:io.deephaven.proto.backplane.grpc.RangeJoinTablesRequest.aggregations)
-  return _internal_aggregations();
-}
-inline const ::google::protobuf::RepeatedPtrField<::io::deephaven::proto::backplane::grpc::Aggregation>&
-RangeJoinTablesRequest::_internal_aggregations() const {
-  PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race);
-  return _impl_.aggregations_;
-}
-inline ::google::protobuf::RepeatedPtrField<::io::deephaven::proto::backplane::grpc::Aggregation>*
-RangeJoinTablesRequest::_internal_mutable_aggregations() {
-  PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race);
-  return &_impl_.aggregations_;
-}
-
-// string range_match = 11;
-inline void RangeJoinTablesRequest::clear_range_match() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  _impl_.range_match_.ClearToEmpty();
-}
-inline const std::string& RangeJoinTablesRequest::range_match() const
-    ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  // @@protoc_insertion_point(field_get:io.deephaven.proto.backplane.grpc.RangeJoinTablesRequest.range_match)
-  return _internal_range_match();
-}
-template <typename Arg_, typename... Args_>
-inline PROTOBUF_ALWAYS_INLINE void RangeJoinTablesRequest::set_range_match(Arg_&& arg,
-                                                     Args_... args) {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  ;
-  _impl_.range_match_.Set(static_cast<Arg_&&>(arg), args..., GetArena());
-  // @@protoc_insertion_point(field_set:io.deephaven.proto.backplane.grpc.RangeJoinTablesRequest.range_match)
-}
-inline std::string* RangeJoinTablesRequest::mutable_range_match() ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  std::string* _s = _internal_mutable_range_match();
-  // @@protoc_insertion_point(field_mutable:io.deephaven.proto.backplane.grpc.RangeJoinTablesRequest.range_match)
-  return _s;
-}
-inline const std::string& RangeJoinTablesRequest::_internal_range_match() const {
-  PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race);
-  return _impl_.range_match_.Get();
-}
-inline void RangeJoinTablesRequest::_internal_set_range_match(const std::string& value) {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  ;
-  _impl_.range_match_.Set(value, GetArena());
-}
-inline std::string* RangeJoinTablesRequest::_internal_mutable_range_match() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  ;
-  return _impl_.range_match_.Mutable( GetArena());
-}
-inline std::string* RangeJoinTablesRequest::release_range_match() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  // @@protoc_insertion_point(field_release:io.deephaven.proto.backplane.grpc.RangeJoinTablesRequest.range_match)
-  return _impl_.range_match_.Release();
-}
-inline void RangeJoinTablesRequest::set_allocated_range_match(std::string* value) {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  _impl_.range_match_.SetAllocated(value, GetArena());
-  #ifdef PROTOBUF_FORCE_COPY_DEFAULT_STRING
-        if (_impl_.range_match_.IsDefault()) {
-          _impl_.range_match_.Set("", GetArena());
-        }
-  #endif  // PROTOBUF_FORCE_COPY_DEFAULT_STRING
-  // @@protoc_insertion_point(field_set_allocated:io.deephaven.proto.backplane.grpc.RangeJoinTablesRequest.range_match)
-}
-
-// -------------------------------------------------------------------
-
-// ComboAggregateRequest_Aggregate
-
-// .io.deephaven.proto.backplane.grpc.ComboAggregateRequest.AggType type = 1;
-inline void ComboAggregateRequest_Aggregate::clear_type() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  _impl_.type_ = 0;
-}
-inline ::io::deephaven::proto::backplane::grpc::ComboAggregateRequest_AggType ComboAggregateRequest_Aggregate::type() const {
-  // @@protoc_insertion_point(field_get:io.deephaven.proto.backplane.grpc.ComboAggregateRequest.Aggregate.type)
-  return _internal_type();
-}
-inline void ComboAggregateRequest_Aggregate::set_type(::io::deephaven::proto::backplane::grpc::ComboAggregateRequest_AggType value) {
-  _internal_set_type(value);
-  // @@protoc_insertion_point(field_set:io.deephaven.proto.backplane.grpc.ComboAggregateRequest.Aggregate.type)
-}
-inline ::io::deephaven::proto::backplane::grpc::ComboAggregateRequest_AggType ComboAggregateRequest_Aggregate::_internal_type() const {
-  PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race);
-  return static_cast<::io::deephaven::proto::backplane::grpc::ComboAggregateRequest_AggType>(_impl_.type_);
-}
-inline void ComboAggregateRequest_Aggregate::_internal_set_type(::io::deephaven::proto::backplane::grpc::ComboAggregateRequest_AggType value) {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  ;
-  _impl_.type_ = value;
-}
-
-// repeated string match_pairs = 2;
-inline int ComboAggregateRequest_Aggregate::_internal_match_pairs_size() const {
-  return _internal_match_pairs().size();
-}
-inline int ComboAggregateRequest_Aggregate::match_pairs_size() const {
-  return _internal_match_pairs_size();
-}
-inline void ComboAggregateRequest_Aggregate::clear_match_pairs() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  _impl_.match_pairs_.Clear();
-}
-inline std::string* ComboAggregateRequest_Aggregate::add_match_pairs()
-    ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  std::string* _s = _internal_mutable_match_pairs()->Add();
-  // @@protoc_insertion_point(field_add_mutable:io.deephaven.proto.backplane.grpc.ComboAggregateRequest.Aggregate.match_pairs)
-  return _s;
-}
-inline const std::string& ComboAggregateRequest_Aggregate::match_pairs(int index) const
-    ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  // @@protoc_insertion_point(field_get:io.deephaven.proto.backplane.grpc.ComboAggregateRequest.Aggregate.match_pairs)
-  return _internal_match_pairs().Get(index);
-}
-inline std::string* ComboAggregateRequest_Aggregate::mutable_match_pairs(int index)
-    ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  // @@protoc_insertion_point(field_mutable:io.deephaven.proto.backplane.grpc.ComboAggregateRequest.Aggregate.match_pairs)
-  return _internal_mutable_match_pairs()->Mutable(index);
-}
-inline void ComboAggregateRequest_Aggregate::set_match_pairs(int index, const std::string& value) {
-  _internal_mutable_match_pairs()->Mutable(index)->assign(value);
-  // @@protoc_insertion_point(field_set:io.deephaven.proto.backplane.grpc.ComboAggregateRequest.Aggregate.match_pairs)
-}
-inline void ComboAggregateRequest_Aggregate::set_match_pairs(int index, std::string&& value) {
-  _internal_mutable_match_pairs()->Mutable(index)->assign(std::move(value));
-  // @@protoc_insertion_point(field_set:io.deephaven.proto.backplane.grpc.ComboAggregateRequest.Aggregate.match_pairs)
-}
-inline void ComboAggregateRequest_Aggregate::set_match_pairs(int index, const char* value) {
-  ABSL_DCHECK(value != nullptr);
-  _internal_mutable_match_pairs()->Mutable(index)->assign(value);
-  // @@protoc_insertion_point(field_set_char:io.deephaven.proto.backplane.grpc.ComboAggregateRequest.Aggregate.match_pairs)
-}
-inline void ComboAggregateRequest_Aggregate::set_match_pairs(int index, const char* value,
-                              std::size_t size) {
-  _internal_mutable_match_pairs()->Mutable(index)->assign(
-      reinterpret_cast<const char*>(value), size);
-  // @@protoc_insertion_point(field_set_pointer:io.deephaven.proto.backplane.grpc.ComboAggregateRequest.Aggregate.match_pairs)
-}
-inline void ComboAggregateRequest_Aggregate::set_match_pairs(int index, absl::string_view value) {
-  _internal_mutable_match_pairs()->Mutable(index)->assign(value.data(),
-                                                     value.size());
-  // @@protoc_insertion_point(field_set_string_piece:io.deephaven.proto.backplane.grpc.ComboAggregateRequest.Aggregate.match_pairs)
-}
-inline void ComboAggregateRequest_Aggregate::add_match_pairs(const std::string& value) {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  _internal_mutable_match_pairs()->Add()->assign(value);
-  // @@protoc_insertion_point(field_add:io.deephaven.proto.backplane.grpc.ComboAggregateRequest.Aggregate.match_pairs)
-}
-inline void ComboAggregateRequest_Aggregate::add_match_pairs(std::string&& value) {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  _internal_mutable_match_pairs()->Add(std::move(value));
-  // @@protoc_insertion_point(field_add:io.deephaven.proto.backplane.grpc.ComboAggregateRequest.Aggregate.match_pairs)
-}
-inline void ComboAggregateRequest_Aggregate::add_match_pairs(const char* value) {
-  ABSL_DCHECK(value != nullptr);
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  _internal_mutable_match_pairs()->Add()->assign(value);
-  // @@protoc_insertion_point(field_add_char:io.deephaven.proto.backplane.grpc.ComboAggregateRequest.Aggregate.match_pairs)
-}
-inline void ComboAggregateRequest_Aggregate::add_match_pairs(const char* value, std::size_t size) {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  _internal_mutable_match_pairs()->Add()->assign(
-      reinterpret_cast<const char*>(value), size);
-  // @@protoc_insertion_point(field_add_pointer:io.deephaven.proto.backplane.grpc.ComboAggregateRequest.Aggregate.match_pairs)
-}
-inline void ComboAggregateRequest_Aggregate::add_match_pairs(absl::string_view value) {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  _internal_mutable_match_pairs()->Add()->assign(value.data(), value.size());
-  // @@protoc_insertion_point(field_add_string_piece:io.deephaven.proto.backplane.grpc.ComboAggregateRequest.Aggregate.match_pairs)
-}
-inline const ::google::protobuf::RepeatedPtrField<std::string>&
-ComboAggregateRequest_Aggregate::match_pairs() const ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  // @@protoc_insertion_point(field_list:io.deephaven.proto.backplane.grpc.ComboAggregateRequest.Aggregate.match_pairs)
-  return _internal_match_pairs();
-}
-inline ::google::protobuf::RepeatedPtrField<std::string>*
-ComboAggregateRequest_Aggregate::mutable_match_pairs() ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  // @@protoc_insertion_point(field_mutable_list:io.deephaven.proto.backplane.grpc.ComboAggregateRequest.Aggregate.match_pairs)
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  return _internal_mutable_match_pairs();
-}
-inline const ::google::protobuf::RepeatedPtrField<std::string>&
-ComboAggregateRequest_Aggregate::_internal_match_pairs() const {
-  PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race);
-  return _impl_.match_pairs_;
-}
-inline ::google::protobuf::RepeatedPtrField<std::string>*
-ComboAggregateRequest_Aggregate::_internal_mutable_match_pairs() {
-  PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race);
-  return &_impl_.match_pairs_;
-}
-
-// string column_name = 3;
-inline void ComboAggregateRequest_Aggregate::clear_column_name() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  _impl_.column_name_.ClearToEmpty();
-}
-inline const std::string& ComboAggregateRequest_Aggregate::column_name() const
-    ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  // @@protoc_insertion_point(field_get:io.deephaven.proto.backplane.grpc.ComboAggregateRequest.Aggregate.column_name)
-  return _internal_column_name();
-}
-template <typename Arg_, typename... Args_>
-inline PROTOBUF_ALWAYS_INLINE void ComboAggregateRequest_Aggregate::set_column_name(Arg_&& arg,
-                                                     Args_... args) {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  ;
-  _impl_.column_name_.Set(static_cast<Arg_&&>(arg), args..., GetArena());
-  // @@protoc_insertion_point(field_set:io.deephaven.proto.backplane.grpc.ComboAggregateRequest.Aggregate.column_name)
-}
-inline std::string* ComboAggregateRequest_Aggregate::mutable_column_name() ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  std::string* _s = _internal_mutable_column_name();
-  // @@protoc_insertion_point(field_mutable:io.deephaven.proto.backplane.grpc.ComboAggregateRequest.Aggregate.column_name)
-  return _s;
-}
-inline const std::string& ComboAggregateRequest_Aggregate::_internal_column_name() const {
-  PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race);
-  return _impl_.column_name_.Get();
-}
-inline void ComboAggregateRequest_Aggregate::_internal_set_column_name(const std::string& value) {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  ;
-  _impl_.column_name_.Set(value, GetArena());
-}
-inline std::string* ComboAggregateRequest_Aggregate::_internal_mutable_column_name() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  ;
-  return _impl_.column_name_.Mutable( GetArena());
-}
-inline std::string* ComboAggregateRequest_Aggregate::release_column_name() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  // @@protoc_insertion_point(field_release:io.deephaven.proto.backplane.grpc.ComboAggregateRequest.Aggregate.column_name)
-  return _impl_.column_name_.Release();
-}
-inline void ComboAggregateRequest_Aggregate::set_allocated_column_name(std::string* value) {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  _impl_.column_name_.SetAllocated(value, GetArena());
-  #ifdef PROTOBUF_FORCE_COPY_DEFAULT_STRING
-        if (_impl_.column_name_.IsDefault()) {
-          _impl_.column_name_.Set("", GetArena());
-        }
-  #endif  // PROTOBUF_FORCE_COPY_DEFAULT_STRING
-  // @@protoc_insertion_point(field_set_allocated:io.deephaven.proto.backplane.grpc.ComboAggregateRequest.Aggregate.column_name)
-}
-
-// double percentile = 4;
-inline void ComboAggregateRequest_Aggregate::clear_percentile() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  _impl_.percentile_ = 0;
-}
-inline double ComboAggregateRequest_Aggregate::percentile() const {
-  // @@protoc_insertion_point(field_get:io.deephaven.proto.backplane.grpc.ComboAggregateRequest.Aggregate.percentile)
-  return _internal_percentile();
-}
-inline void ComboAggregateRequest_Aggregate::set_percentile(double value) {
-  _internal_set_percentile(value);
-  // @@protoc_insertion_point(field_set:io.deephaven.proto.backplane.grpc.ComboAggregateRequest.Aggregate.percentile)
-}
-inline double ComboAggregateRequest_Aggregate::_internal_percentile() const {
-  PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race);
-  return _impl_.percentile_;
-}
-inline void ComboAggregateRequest_Aggregate::_internal_set_percentile(double value) {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  ;
-  _impl_.percentile_ = value;
-}
-
-// bool avg_median = 5;
-inline void ComboAggregateRequest_Aggregate::clear_avg_median() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  _impl_.avg_median_ = false;
-}
-inline bool ComboAggregateRequest_Aggregate::avg_median() const {
-  // @@protoc_insertion_point(field_get:io.deephaven.proto.backplane.grpc.ComboAggregateRequest.Aggregate.avg_median)
-  return _internal_avg_median();
-}
-inline void ComboAggregateRequest_Aggregate::set_avg_median(bool value) {
-  _internal_set_avg_median(value);
-  // @@protoc_insertion_point(field_set:io.deephaven.proto.backplane.grpc.ComboAggregateRequest.Aggregate.avg_median)
-}
-inline bool ComboAggregateRequest_Aggregate::_internal_avg_median() const {
-  PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race);
-  return _impl_.avg_median_;
-}
-inline void ComboAggregateRequest_Aggregate::_internal_set_avg_median(bool value) {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  ;
-  _impl_.avg_median_ = value;
-}
-
-// -------------------------------------------------------------------
-
-// ComboAggregateRequest
-
-// .io.deephaven.proto.backplane.grpc.Ticket result_id = 1;
-inline bool ComboAggregateRequest::has_result_id() const {
-  bool value = (_impl_._has_bits_[0] & 0x00000001u) != 0;
-  PROTOBUF_ASSUME(!value || _impl_.result_id_ != nullptr);
-  return value;
-}
-inline const ::io::deephaven::proto::backplane::grpc::Ticket& ComboAggregateRequest::_internal_result_id() const {
-  PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race);
-  const ::io::deephaven::proto::backplane::grpc::Ticket* p = _impl_.result_id_;
-  return p != nullptr ? *p : reinterpret_cast<const ::io::deephaven::proto::backplane::grpc::Ticket&>(::io::deephaven::proto::backplane::grpc::_Ticket_default_instance_);
-}
-inline const ::io::deephaven::proto::backplane::grpc::Ticket& ComboAggregateRequest::result_id() const ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  // @@protoc_insertion_point(field_get:io.deephaven.proto.backplane.grpc.ComboAggregateRequest.result_id)
-  return _internal_result_id();
-}
-inline void ComboAggregateRequest::unsafe_arena_set_allocated_result_id(::io::deephaven::proto::backplane::grpc::Ticket* value) {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  if (GetArena() == nullptr) {
-    delete reinterpret_cast<::google::protobuf::MessageLite*>(_impl_.result_id_);
-  }
-  _impl_.result_id_ = reinterpret_cast<::io::deephaven::proto::backplane::grpc::Ticket*>(value);
-  if (value != nullptr) {
-    _impl_._has_bits_[0] |= 0x00000001u;
-  } else {
-    _impl_._has_bits_[0] &= ~0x00000001u;
-  }
-  // @@protoc_insertion_point(field_unsafe_arena_set_allocated:io.deephaven.proto.backplane.grpc.ComboAggregateRequest.result_id)
-}
-inline ::io::deephaven::proto::backplane::grpc::Ticket* ComboAggregateRequest::release_result_id() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-
-  _impl_._has_bits_[0] &= ~0x00000001u;
-  ::io::deephaven::proto::backplane::grpc::Ticket* released = _impl_.result_id_;
-  _impl_.result_id_ = nullptr;
-#ifdef PROTOBUF_FORCE_COPY_IN_RELEASE
-  auto* old = reinterpret_cast<::google::protobuf::MessageLite*>(released);
-  released = ::google::protobuf::internal::DuplicateIfNonNull(released);
-  if (GetArena() == nullptr) {
-    delete old;
-  }
-#else   // PROTOBUF_FORCE_COPY_IN_RELEASE
-  if (GetArena() != nullptr) {
-    released = ::google::protobuf::internal::DuplicateIfNonNull(released);
-  }
-#endif  // !PROTOBUF_FORCE_COPY_IN_RELEASE
-  return released;
-}
-inline ::io::deephaven::proto::backplane::grpc::Ticket* ComboAggregateRequest::unsafe_arena_release_result_id() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  // @@protoc_insertion_point(field_release:io.deephaven.proto.backplane.grpc.ComboAggregateRequest.result_id)
-
-  _impl_._has_bits_[0] &= ~0x00000001u;
-  ::io::deephaven::proto::backplane::grpc::Ticket* temp = _impl_.result_id_;
-  _impl_.result_id_ = nullptr;
-  return temp;
-}
-inline ::io::deephaven::proto::backplane::grpc::Ticket* ComboAggregateRequest::_internal_mutable_result_id() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  _impl_._has_bits_[0] |= 0x00000001u;
-  if (_impl_.result_id_ == nullptr) {
-    auto* p = CreateMaybeMessage<::io::deephaven::proto::backplane::grpc::Ticket>(GetArena());
-    _impl_.result_id_ = reinterpret_cast<::io::deephaven::proto::backplane::grpc::Ticket*>(p);
-  }
-  return _impl_.result_id_;
-}
-inline ::io::deephaven::proto::backplane::grpc::Ticket* ComboAggregateRequest::mutable_result_id() ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  ::io::deephaven::proto::backplane::grpc::Ticket* _msg = _internal_mutable_result_id();
-  // @@protoc_insertion_point(field_mutable:io.deephaven.proto.backplane.grpc.ComboAggregateRequest.result_id)
-  return _msg;
-}
-inline void ComboAggregateRequest::set_allocated_result_id(::io::deephaven::proto::backplane::grpc::Ticket* value) {
-  ::google::protobuf::Arena* message_arena = GetArena();
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  if (message_arena == nullptr) {
-    delete reinterpret_cast<::google::protobuf::MessageLite*>(_impl_.result_id_);
-  }
-
-  if (value != nullptr) {
-    ::google::protobuf::Arena* submessage_arena = reinterpret_cast<::google::protobuf::MessageLite*>(value)->GetArena();
-    if (message_arena != submessage_arena) {
-      value = ::google::protobuf::internal::GetOwnedMessage(message_arena, value, submessage_arena);
-    }
-    _impl_._has_bits_[0] |= 0x00000001u;
-  } else {
-    _impl_._has_bits_[0] &= ~0x00000001u;
-  }
-
-  _impl_.result_id_ = reinterpret_cast<::io::deephaven::proto::backplane::grpc::Ticket*>(value);
-  // @@protoc_insertion_point(field_set_allocated:io.deephaven.proto.backplane.grpc.ComboAggregateRequest.result_id)
-}
-
-// .io.deephaven.proto.backplane.grpc.TableReference source_id = 2;
-inline bool ComboAggregateRequest::has_source_id() const {
-  bool value = (_impl_._has_bits_[0] & 0x00000002u) != 0;
-  PROTOBUF_ASSUME(!value || _impl_.source_id_ != nullptr);
-  return value;
-}
-inline void ComboAggregateRequest::clear_source_id() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  if (_impl_.source_id_ != nullptr) _impl_.source_id_->Clear();
-  _impl_._has_bits_[0] &= ~0x00000002u;
-}
-inline const ::io::deephaven::proto::backplane::grpc::TableReference& ComboAggregateRequest::_internal_source_id() const {
-  PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race);
-  const ::io::deephaven::proto::backplane::grpc::TableReference* p = _impl_.source_id_;
-  return p != nullptr ? *p : reinterpret_cast<const ::io::deephaven::proto::backplane::grpc::TableReference&>(::io::deephaven::proto::backplane::grpc::_TableReference_default_instance_);
-}
-inline const ::io::deephaven::proto::backplane::grpc::TableReference& ComboAggregateRequest::source_id() const ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  // @@protoc_insertion_point(field_get:io.deephaven.proto.backplane.grpc.ComboAggregateRequest.source_id)
-  return _internal_source_id();
-}
-inline void ComboAggregateRequest::unsafe_arena_set_allocated_source_id(::io::deephaven::proto::backplane::grpc::TableReference* value) {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  if (GetArena() == nullptr) {
-    delete reinterpret_cast<::google::protobuf::MessageLite*>(_impl_.source_id_);
-  }
-  _impl_.source_id_ = reinterpret_cast<::io::deephaven::proto::backplane::grpc::TableReference*>(value);
-  if (value != nullptr) {
-    _impl_._has_bits_[0] |= 0x00000002u;
-  } else {
-    _impl_._has_bits_[0] &= ~0x00000002u;
-  }
-  // @@protoc_insertion_point(field_unsafe_arena_set_allocated:io.deephaven.proto.backplane.grpc.ComboAggregateRequest.source_id)
-}
-inline ::io::deephaven::proto::backplane::grpc::TableReference* ComboAggregateRequest::release_source_id() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-
-  _impl_._has_bits_[0] &= ~0x00000002u;
-  ::io::deephaven::proto::backplane::grpc::TableReference* released = _impl_.source_id_;
-  _impl_.source_id_ = nullptr;
-#ifdef PROTOBUF_FORCE_COPY_IN_RELEASE
-  auto* old = reinterpret_cast<::google::protobuf::MessageLite*>(released);
-  released = ::google::protobuf::internal::DuplicateIfNonNull(released);
-  if (GetArena() == nullptr) {
-    delete old;
-  }
-#else   // PROTOBUF_FORCE_COPY_IN_RELEASE
-  if (GetArena() != nullptr) {
-    released = ::google::protobuf::internal::DuplicateIfNonNull(released);
-  }
-#endif  // !PROTOBUF_FORCE_COPY_IN_RELEASE
-  return released;
-}
-inline ::io::deephaven::proto::backplane::grpc::TableReference* ComboAggregateRequest::unsafe_arena_release_source_id() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  // @@protoc_insertion_point(field_release:io.deephaven.proto.backplane.grpc.ComboAggregateRequest.source_id)
-
-  _impl_._has_bits_[0] &= ~0x00000002u;
-  ::io::deephaven::proto::backplane::grpc::TableReference* temp = _impl_.source_id_;
-  _impl_.source_id_ = nullptr;
-  return temp;
-}
-inline ::io::deephaven::proto::backplane::grpc::TableReference* ComboAggregateRequest::_internal_mutable_source_id() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  _impl_._has_bits_[0] |= 0x00000002u;
-  if (_impl_.source_id_ == nullptr) {
-    auto* p = CreateMaybeMessage<::io::deephaven::proto::backplane::grpc::TableReference>(GetArena());
-    _impl_.source_id_ = reinterpret_cast<::io::deephaven::proto::backplane::grpc::TableReference*>(p);
-  }
-  return _impl_.source_id_;
-}
-inline ::io::deephaven::proto::backplane::grpc::TableReference* ComboAggregateRequest::mutable_source_id() ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  ::io::deephaven::proto::backplane::grpc::TableReference* _msg = _internal_mutable_source_id();
-  // @@protoc_insertion_point(field_mutable:io.deephaven.proto.backplane.grpc.ComboAggregateRequest.source_id)
-  return _msg;
-}
-inline void ComboAggregateRequest::set_allocated_source_id(::io::deephaven::proto::backplane::grpc::TableReference* value) {
-  ::google::protobuf::Arena* message_arena = GetArena();
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  if (message_arena == nullptr) {
-    delete reinterpret_cast<::io::deephaven::proto::backplane::grpc::TableReference*>(_impl_.source_id_);
-  }
-
-  if (value != nullptr) {
-    ::google::protobuf::Arena* submessage_arena = reinterpret_cast<::io::deephaven::proto::backplane::grpc::TableReference*>(value)->GetArena();
-    if (message_arena != submessage_arena) {
-      value = ::google::protobuf::internal::GetOwnedMessage(message_arena, value, submessage_arena);
-    }
-    _impl_._has_bits_[0] |= 0x00000002u;
-  } else {
-    _impl_._has_bits_[0] &= ~0x00000002u;
-  }
-
-  _impl_.source_id_ = reinterpret_cast<::io::deephaven::proto::backplane::grpc::TableReference*>(value);
-  // @@protoc_insertion_point(field_set_allocated:io.deephaven.proto.backplane.grpc.ComboAggregateRequest.source_id)
-}
-
-// repeated .io.deephaven.proto.backplane.grpc.ComboAggregateRequest.Aggregate aggregates = 3;
-inline int ComboAggregateRequest::_internal_aggregates_size() const {
-  return _internal_aggregates().size();
-}
-inline int ComboAggregateRequest::aggregates_size() const {
-  return _internal_aggregates_size();
-}
-inline void ComboAggregateRequest::clear_aggregates() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  _impl_.aggregates_.Clear();
-}
-inline ::io::deephaven::proto::backplane::grpc::ComboAggregateRequest_Aggregate* ComboAggregateRequest::mutable_aggregates(int index)
-    ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  // @@protoc_insertion_point(field_mutable:io.deephaven.proto.backplane.grpc.ComboAggregateRequest.aggregates)
-  return _internal_mutable_aggregates()->Mutable(index);
-}
-inline ::google::protobuf::RepeatedPtrField<::io::deephaven::proto::backplane::grpc::ComboAggregateRequest_Aggregate>* ComboAggregateRequest::mutable_aggregates()
-    ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  // @@protoc_insertion_point(field_mutable_list:io.deephaven.proto.backplane.grpc.ComboAggregateRequest.aggregates)
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  return _internal_mutable_aggregates();
-}
-inline const ::io::deephaven::proto::backplane::grpc::ComboAggregateRequest_Aggregate& ComboAggregateRequest::aggregates(int index) const
-    ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  // @@protoc_insertion_point(field_get:io.deephaven.proto.backplane.grpc.ComboAggregateRequest.aggregates)
-  return _internal_aggregates().Get(index);
-}
-inline ::io::deephaven::proto::backplane::grpc::ComboAggregateRequest_Aggregate* ComboAggregateRequest::add_aggregates() ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  ::io::deephaven::proto::backplane::grpc::ComboAggregateRequest_Aggregate* _add = _internal_mutable_aggregates()->Add();
-  // @@protoc_insertion_point(field_add:io.deephaven.proto.backplane.grpc.ComboAggregateRequest.aggregates)
-  return _add;
-}
-inline const ::google::protobuf::RepeatedPtrField<::io::deephaven::proto::backplane::grpc::ComboAggregateRequest_Aggregate>& ComboAggregateRequest::aggregates() const
-    ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  // @@protoc_insertion_point(field_list:io.deephaven.proto.backplane.grpc.ComboAggregateRequest.aggregates)
-  return _internal_aggregates();
-}
-inline const ::google::protobuf::RepeatedPtrField<::io::deephaven::proto::backplane::grpc::ComboAggregateRequest_Aggregate>&
-ComboAggregateRequest::_internal_aggregates() const {
-  PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race);
-  return _impl_.aggregates_;
-}
-inline ::google::protobuf::RepeatedPtrField<::io::deephaven::proto::backplane::grpc::ComboAggregateRequest_Aggregate>*
-ComboAggregateRequest::_internal_mutable_aggregates() {
-  PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race);
-  return &_impl_.aggregates_;
-}
-
-// repeated string group_by_columns = 4;
-inline int ComboAggregateRequest::_internal_group_by_columns_size() const {
-  return _internal_group_by_columns().size();
-}
-inline int ComboAggregateRequest::group_by_columns_size() const {
-  return _internal_group_by_columns_size();
-}
-inline void ComboAggregateRequest::clear_group_by_columns() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  _impl_.group_by_columns_.Clear();
-}
-inline std::string* ComboAggregateRequest::add_group_by_columns()
-    ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  std::string* _s = _internal_mutable_group_by_columns()->Add();
-  // @@protoc_insertion_point(field_add_mutable:io.deephaven.proto.backplane.grpc.ComboAggregateRequest.group_by_columns)
-  return _s;
-}
-inline const std::string& ComboAggregateRequest::group_by_columns(int index) const
-    ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  // @@protoc_insertion_point(field_get:io.deephaven.proto.backplane.grpc.ComboAggregateRequest.group_by_columns)
-  return _internal_group_by_columns().Get(index);
-}
-inline std::string* ComboAggregateRequest::mutable_group_by_columns(int index)
-    ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  // @@protoc_insertion_point(field_mutable:io.deephaven.proto.backplane.grpc.ComboAggregateRequest.group_by_columns)
-  return _internal_mutable_group_by_columns()->Mutable(index);
-}
-inline void ComboAggregateRequest::set_group_by_columns(int index, const std::string& value) {
-  _internal_mutable_group_by_columns()->Mutable(index)->assign(value);
-  // @@protoc_insertion_point(field_set:io.deephaven.proto.backplane.grpc.ComboAggregateRequest.group_by_columns)
-}
-inline void ComboAggregateRequest::set_group_by_columns(int index, std::string&& value) {
-  _internal_mutable_group_by_columns()->Mutable(index)->assign(std::move(value));
-  // @@protoc_insertion_point(field_set:io.deephaven.proto.backplane.grpc.ComboAggregateRequest.group_by_columns)
-}
-inline void ComboAggregateRequest::set_group_by_columns(int index, const char* value) {
-  ABSL_DCHECK(value != nullptr);
-  _internal_mutable_group_by_columns()->Mutable(index)->assign(value);
-  // @@protoc_insertion_point(field_set_char:io.deephaven.proto.backplane.grpc.ComboAggregateRequest.group_by_columns)
-}
-inline void ComboAggregateRequest::set_group_by_columns(int index, const char* value,
-                              std::size_t size) {
-  _internal_mutable_group_by_columns()->Mutable(index)->assign(
-      reinterpret_cast<const char*>(value), size);
-  // @@protoc_insertion_point(field_set_pointer:io.deephaven.proto.backplane.grpc.ComboAggregateRequest.group_by_columns)
-}
-inline void ComboAggregateRequest::set_group_by_columns(int index, absl::string_view value) {
-  _internal_mutable_group_by_columns()->Mutable(index)->assign(value.data(),
-                                                     value.size());
-  // @@protoc_insertion_point(field_set_string_piece:io.deephaven.proto.backplane.grpc.ComboAggregateRequest.group_by_columns)
-}
-inline void ComboAggregateRequest::add_group_by_columns(const std::string& value) {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  _internal_mutable_group_by_columns()->Add()->assign(value);
-  // @@protoc_insertion_point(field_add:io.deephaven.proto.backplane.grpc.ComboAggregateRequest.group_by_columns)
-}
-inline void ComboAggregateRequest::add_group_by_columns(std::string&& value) {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  _internal_mutable_group_by_columns()->Add(std::move(value));
-  // @@protoc_insertion_point(field_add:io.deephaven.proto.backplane.grpc.ComboAggregateRequest.group_by_columns)
-}
-inline void ComboAggregateRequest::add_group_by_columns(const char* value) {
-  ABSL_DCHECK(value != nullptr);
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  _internal_mutable_group_by_columns()->Add()->assign(value);
-  // @@protoc_insertion_point(field_add_char:io.deephaven.proto.backplane.grpc.ComboAggregateRequest.group_by_columns)
-}
-inline void ComboAggregateRequest::add_group_by_columns(const char* value, std::size_t size) {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  _internal_mutable_group_by_columns()->Add()->assign(
-      reinterpret_cast<const char*>(value), size);
-  // @@protoc_insertion_point(field_add_pointer:io.deephaven.proto.backplane.grpc.ComboAggregateRequest.group_by_columns)
-}
-inline void ComboAggregateRequest::add_group_by_columns(absl::string_view value) {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  _internal_mutable_group_by_columns()->Add()->assign(value.data(), value.size());
-  // @@protoc_insertion_point(field_add_string_piece:io.deephaven.proto.backplane.grpc.ComboAggregateRequest.group_by_columns)
-}
-inline const ::google::protobuf::RepeatedPtrField<std::string>&
-ComboAggregateRequest::group_by_columns() const ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  // @@protoc_insertion_point(field_list:io.deephaven.proto.backplane.grpc.ComboAggregateRequest.group_by_columns)
-  return _internal_group_by_columns();
-}
-inline ::google::protobuf::RepeatedPtrField<std::string>*
-ComboAggregateRequest::mutable_group_by_columns() ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  // @@protoc_insertion_point(field_mutable_list:io.deephaven.proto.backplane.grpc.ComboAggregateRequest.group_by_columns)
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  return _internal_mutable_group_by_columns();
-}
-inline const ::google::protobuf::RepeatedPtrField<std::string>&
-ComboAggregateRequest::_internal_group_by_columns() const {
-  PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race);
-  return _impl_.group_by_columns_;
-}
-inline ::google::protobuf::RepeatedPtrField<std::string>*
-ComboAggregateRequest::_internal_mutable_group_by_columns() {
-  PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race);
-  return &_impl_.group_by_columns_;
-}
-
-// bool force_combo = 5;
-inline void ComboAggregateRequest::clear_force_combo() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  _impl_.force_combo_ = false;
-}
-inline bool ComboAggregateRequest::force_combo() const {
-  // @@protoc_insertion_point(field_get:io.deephaven.proto.backplane.grpc.ComboAggregateRequest.force_combo)
-  return _internal_force_combo();
-}
-inline void ComboAggregateRequest::set_force_combo(bool value) {
-  _internal_set_force_combo(value);
-  // @@protoc_insertion_point(field_set:io.deephaven.proto.backplane.grpc.ComboAggregateRequest.force_combo)
-}
-inline bool ComboAggregateRequest::_internal_force_combo() const {
-  PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race);
-  return _impl_.force_combo_;
-}
-inline void ComboAggregateRequest::_internal_set_force_combo(bool value) {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  ;
-  _impl_.force_combo_ = value;
-}
-
-// -------------------------------------------------------------------
-
-// AggregateAllRequest
-
-// .io.deephaven.proto.backplane.grpc.Ticket result_id = 1;
-inline bool AggregateAllRequest::has_result_id() const {
-  bool value = (_impl_._has_bits_[0] & 0x00000001u) != 0;
-  PROTOBUF_ASSUME(!value || _impl_.result_id_ != nullptr);
-  return value;
-}
-inline const ::io::deephaven::proto::backplane::grpc::Ticket& AggregateAllRequest::_internal_result_id() const {
-  PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race);
-  const ::io::deephaven::proto::backplane::grpc::Ticket* p = _impl_.result_id_;
-  return p != nullptr ? *p : reinterpret_cast<const ::io::deephaven::proto::backplane::grpc::Ticket&>(::io::deephaven::proto::backplane::grpc::_Ticket_default_instance_);
-}
-inline const ::io::deephaven::proto::backplane::grpc::Ticket& AggregateAllRequest::result_id() const ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  // @@protoc_insertion_point(field_get:io.deephaven.proto.backplane.grpc.AggregateAllRequest.result_id)
-  return _internal_result_id();
-}
-inline void AggregateAllRequest::unsafe_arena_set_allocated_result_id(::io::deephaven::proto::backplane::grpc::Ticket* value) {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  if (GetArena() == nullptr) {
-    delete reinterpret_cast<::google::protobuf::MessageLite*>(_impl_.result_id_);
-  }
-  _impl_.result_id_ = reinterpret_cast<::io::deephaven::proto::backplane::grpc::Ticket*>(value);
-  if (value != nullptr) {
-    _impl_._has_bits_[0] |= 0x00000001u;
-  } else {
-    _impl_._has_bits_[0] &= ~0x00000001u;
-  }
-  // @@protoc_insertion_point(field_unsafe_arena_set_allocated:io.deephaven.proto.backplane.grpc.AggregateAllRequest.result_id)
-}
-inline ::io::deephaven::proto::backplane::grpc::Ticket* AggregateAllRequest::release_result_id() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-
-  _impl_._has_bits_[0] &= ~0x00000001u;
-  ::io::deephaven::proto::backplane::grpc::Ticket* released = _impl_.result_id_;
-  _impl_.result_id_ = nullptr;
-#ifdef PROTOBUF_FORCE_COPY_IN_RELEASE
-  auto* old = reinterpret_cast<::google::protobuf::MessageLite*>(released);
-  released = ::google::protobuf::internal::DuplicateIfNonNull(released);
-  if (GetArena() == nullptr) {
-    delete old;
-  }
-#else   // PROTOBUF_FORCE_COPY_IN_RELEASE
-  if (GetArena() != nullptr) {
-    released = ::google::protobuf::internal::DuplicateIfNonNull(released);
-  }
-#endif  // !PROTOBUF_FORCE_COPY_IN_RELEASE
-  return released;
-}
-inline ::io::deephaven::proto::backplane::grpc::Ticket* AggregateAllRequest::unsafe_arena_release_result_id() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  // @@protoc_insertion_point(field_release:io.deephaven.proto.backplane.grpc.AggregateAllRequest.result_id)
-
-  _impl_._has_bits_[0] &= ~0x00000001u;
-  ::io::deephaven::proto::backplane::grpc::Ticket* temp = _impl_.result_id_;
-  _impl_.result_id_ = nullptr;
-  return temp;
-}
-inline ::io::deephaven::proto::backplane::grpc::Ticket* AggregateAllRequest::_internal_mutable_result_id() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  _impl_._has_bits_[0] |= 0x00000001u;
-  if (_impl_.result_id_ == nullptr) {
-    auto* p = CreateMaybeMessage<::io::deephaven::proto::backplane::grpc::Ticket>(GetArena());
-    _impl_.result_id_ = reinterpret_cast<::io::deephaven::proto::backplane::grpc::Ticket*>(p);
-  }
-  return _impl_.result_id_;
-}
-inline ::io::deephaven::proto::backplane::grpc::Ticket* AggregateAllRequest::mutable_result_id() ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  ::io::deephaven::proto::backplane::grpc::Ticket* _msg = _internal_mutable_result_id();
-  // @@protoc_insertion_point(field_mutable:io.deephaven.proto.backplane.grpc.AggregateAllRequest.result_id)
-  return _msg;
-}
-inline void AggregateAllRequest::set_allocated_result_id(::io::deephaven::proto::backplane::grpc::Ticket* value) {
-  ::google::protobuf::Arena* message_arena = GetArena();
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  if (message_arena == nullptr) {
-    delete reinterpret_cast<::google::protobuf::MessageLite*>(_impl_.result_id_);
-  }
-
-  if (value != nullptr) {
-    ::google::protobuf::Arena* submessage_arena = reinterpret_cast<::google::protobuf::MessageLite*>(value)->GetArena();
-    if (message_arena != submessage_arena) {
-      value = ::google::protobuf::internal::GetOwnedMessage(message_arena, value, submessage_arena);
-    }
-    _impl_._has_bits_[0] |= 0x00000001u;
-  } else {
-    _impl_._has_bits_[0] &= ~0x00000001u;
-  }
-
-  _impl_.result_id_ = reinterpret_cast<::io::deephaven::proto::backplane::grpc::Ticket*>(value);
-  // @@protoc_insertion_point(field_set_allocated:io.deephaven.proto.backplane.grpc.AggregateAllRequest.result_id)
-}
-
-// .io.deephaven.proto.backplane.grpc.TableReference source_id = 2;
-inline bool AggregateAllRequest::has_source_id() const {
-  bool value = (_impl_._has_bits_[0] & 0x00000002u) != 0;
-  PROTOBUF_ASSUME(!value || _impl_.source_id_ != nullptr);
-  return value;
-}
-inline void AggregateAllRequest::clear_source_id() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  if (_impl_.source_id_ != nullptr) _impl_.source_id_->Clear();
-  _impl_._has_bits_[0] &= ~0x00000002u;
-}
-inline const ::io::deephaven::proto::backplane::grpc::TableReference& AggregateAllRequest::_internal_source_id() const {
-  PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race);
-  const ::io::deephaven::proto::backplane::grpc::TableReference* p = _impl_.source_id_;
-  return p != nullptr ? *p : reinterpret_cast<const ::io::deephaven::proto::backplane::grpc::TableReference&>(::io::deephaven::proto::backplane::grpc::_TableReference_default_instance_);
-}
-inline const ::io::deephaven::proto::backplane::grpc::TableReference& AggregateAllRequest::source_id() const ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  // @@protoc_insertion_point(field_get:io.deephaven.proto.backplane.grpc.AggregateAllRequest.source_id)
-  return _internal_source_id();
-}
-inline void AggregateAllRequest::unsafe_arena_set_allocated_source_id(::io::deephaven::proto::backplane::grpc::TableReference* value) {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  if (GetArena() == nullptr) {
-    delete reinterpret_cast<::google::protobuf::MessageLite*>(_impl_.source_id_);
-  }
-  _impl_.source_id_ = reinterpret_cast<::io::deephaven::proto::backplane::grpc::TableReference*>(value);
-  if (value != nullptr) {
-    _impl_._has_bits_[0] |= 0x00000002u;
-  } else {
-    _impl_._has_bits_[0] &= ~0x00000002u;
-  }
-  // @@protoc_insertion_point(field_unsafe_arena_set_allocated:io.deephaven.proto.backplane.grpc.AggregateAllRequest.source_id)
-}
-inline ::io::deephaven::proto::backplane::grpc::TableReference* AggregateAllRequest::release_source_id() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-
-  _impl_._has_bits_[0] &= ~0x00000002u;
-  ::io::deephaven::proto::backplane::grpc::TableReference* released = _impl_.source_id_;
-  _impl_.source_id_ = nullptr;
-#ifdef PROTOBUF_FORCE_COPY_IN_RELEASE
-  auto* old = reinterpret_cast<::google::protobuf::MessageLite*>(released);
-  released = ::google::protobuf::internal::DuplicateIfNonNull(released);
-  if (GetArena() == nullptr) {
-    delete old;
-  }
-#else   // PROTOBUF_FORCE_COPY_IN_RELEASE
-  if (GetArena() != nullptr) {
-    released = ::google::protobuf::internal::DuplicateIfNonNull(released);
-  }
-#endif  // !PROTOBUF_FORCE_COPY_IN_RELEASE
-  return released;
-}
-inline ::io::deephaven::proto::backplane::grpc::TableReference* AggregateAllRequest::unsafe_arena_release_source_id() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  // @@protoc_insertion_point(field_release:io.deephaven.proto.backplane.grpc.AggregateAllRequest.source_id)
-
-  _impl_._has_bits_[0] &= ~0x00000002u;
-  ::io::deephaven::proto::backplane::grpc::TableReference* temp = _impl_.source_id_;
-  _impl_.source_id_ = nullptr;
-  return temp;
-}
-inline ::io::deephaven::proto::backplane::grpc::TableReference* AggregateAllRequest::_internal_mutable_source_id() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  _impl_._has_bits_[0] |= 0x00000002u;
-  if (_impl_.source_id_ == nullptr) {
-    auto* p = CreateMaybeMessage<::io::deephaven::proto::backplane::grpc::TableReference>(GetArena());
-    _impl_.source_id_ = reinterpret_cast<::io::deephaven::proto::backplane::grpc::TableReference*>(p);
-  }
-  return _impl_.source_id_;
-}
-inline ::io::deephaven::proto::backplane::grpc::TableReference* AggregateAllRequest::mutable_source_id() ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  ::io::deephaven::proto::backplane::grpc::TableReference* _msg = _internal_mutable_source_id();
-  // @@protoc_insertion_point(field_mutable:io.deephaven.proto.backplane.grpc.AggregateAllRequest.source_id)
-  return _msg;
-}
-inline void AggregateAllRequest::set_allocated_source_id(::io::deephaven::proto::backplane::grpc::TableReference* value) {
-  ::google::protobuf::Arena* message_arena = GetArena();
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  if (message_arena == nullptr) {
-    delete reinterpret_cast<::io::deephaven::proto::backplane::grpc::TableReference*>(_impl_.source_id_);
-  }
-
-  if (value != nullptr) {
-    ::google::protobuf::Arena* submessage_arena = reinterpret_cast<::io::deephaven::proto::backplane::grpc::TableReference*>(value)->GetArena();
-    if (message_arena != submessage_arena) {
-      value = ::google::protobuf::internal::GetOwnedMessage(message_arena, value, submessage_arena);
-    }
-    _impl_._has_bits_[0] |= 0x00000002u;
-  } else {
-    _impl_._has_bits_[0] &= ~0x00000002u;
-  }
-
-  _impl_.source_id_ = reinterpret_cast<::io::deephaven::proto::backplane::grpc::TableReference*>(value);
-  // @@protoc_insertion_point(field_set_allocated:io.deephaven.proto.backplane.grpc.AggregateAllRequest.source_id)
-}
-
-// .io.deephaven.proto.backplane.grpc.AggSpec spec = 3;
-inline bool AggregateAllRequest::has_spec() const {
-  bool value = (_impl_._has_bits_[0] & 0x00000004u) != 0;
-  PROTOBUF_ASSUME(!value || _impl_.spec_ != nullptr);
-  return value;
-}
-inline void AggregateAllRequest::clear_spec() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  if (_impl_.spec_ != nullptr) _impl_.spec_->Clear();
-  _impl_._has_bits_[0] &= ~0x00000004u;
-}
-inline const ::io::deephaven::proto::backplane::grpc::AggSpec& AggregateAllRequest::_internal_spec() const {
-  PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race);
-  const ::io::deephaven::proto::backplane::grpc::AggSpec* p = _impl_.spec_;
-  return p != nullptr ? *p : reinterpret_cast<const ::io::deephaven::proto::backplane::grpc::AggSpec&>(::io::deephaven::proto::backplane::grpc::_AggSpec_default_instance_);
-}
-inline const ::io::deephaven::proto::backplane::grpc::AggSpec& AggregateAllRequest::spec() const ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  // @@protoc_insertion_point(field_get:io.deephaven.proto.backplane.grpc.AggregateAllRequest.spec)
-  return _internal_spec();
-}
-inline void AggregateAllRequest::unsafe_arena_set_allocated_spec(::io::deephaven::proto::backplane::grpc::AggSpec* value) {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  if (GetArena() == nullptr) {
-    delete reinterpret_cast<::google::protobuf::MessageLite*>(_impl_.spec_);
-  }
-  _impl_.spec_ = reinterpret_cast<::io::deephaven::proto::backplane::grpc::AggSpec*>(value);
-  if (value != nullptr) {
-    _impl_._has_bits_[0] |= 0x00000004u;
-  } else {
-    _impl_._has_bits_[0] &= ~0x00000004u;
-  }
-  // @@protoc_insertion_point(field_unsafe_arena_set_allocated:io.deephaven.proto.backplane.grpc.AggregateAllRequest.spec)
-}
-inline ::io::deephaven::proto::backplane::grpc::AggSpec* AggregateAllRequest::release_spec() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-
-  _impl_._has_bits_[0] &= ~0x00000004u;
-  ::io::deephaven::proto::backplane::grpc::AggSpec* released = _impl_.spec_;
-  _impl_.spec_ = nullptr;
-#ifdef PROTOBUF_FORCE_COPY_IN_RELEASE
-  auto* old = reinterpret_cast<::google::protobuf::MessageLite*>(released);
-  released = ::google::protobuf::internal::DuplicateIfNonNull(released);
-  if (GetArena() == nullptr) {
-    delete old;
-  }
-#else   // PROTOBUF_FORCE_COPY_IN_RELEASE
-  if (GetArena() != nullptr) {
-    released = ::google::protobuf::internal::DuplicateIfNonNull(released);
-  }
-#endif  // !PROTOBUF_FORCE_COPY_IN_RELEASE
-  return released;
-}
-inline ::io::deephaven::proto::backplane::grpc::AggSpec* AggregateAllRequest::unsafe_arena_release_spec() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  // @@protoc_insertion_point(field_release:io.deephaven.proto.backplane.grpc.AggregateAllRequest.spec)
-
-  _impl_._has_bits_[0] &= ~0x00000004u;
-  ::io::deephaven::proto::backplane::grpc::AggSpec* temp = _impl_.spec_;
-  _impl_.spec_ = nullptr;
-  return temp;
-}
-inline ::io::deephaven::proto::backplane::grpc::AggSpec* AggregateAllRequest::_internal_mutable_spec() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  _impl_._has_bits_[0] |= 0x00000004u;
-  if (_impl_.spec_ == nullptr) {
-    auto* p = CreateMaybeMessage<::io::deephaven::proto::backplane::grpc::AggSpec>(GetArena());
-    _impl_.spec_ = reinterpret_cast<::io::deephaven::proto::backplane::grpc::AggSpec*>(p);
-  }
-  return _impl_.spec_;
-}
-inline ::io::deephaven::proto::backplane::grpc::AggSpec* AggregateAllRequest::mutable_spec() ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  ::io::deephaven::proto::backplane::grpc::AggSpec* _msg = _internal_mutable_spec();
-  // @@protoc_insertion_point(field_mutable:io.deephaven.proto.backplane.grpc.AggregateAllRequest.spec)
-  return _msg;
-}
-inline void AggregateAllRequest::set_allocated_spec(::io::deephaven::proto::backplane::grpc::AggSpec* value) {
-  ::google::protobuf::Arena* message_arena = GetArena();
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  if (message_arena == nullptr) {
-    delete reinterpret_cast<::io::deephaven::proto::backplane::grpc::AggSpec*>(_impl_.spec_);
-  }
-
-  if (value != nullptr) {
-    ::google::protobuf::Arena* submessage_arena = reinterpret_cast<::io::deephaven::proto::backplane::grpc::AggSpec*>(value)->GetArena();
-    if (message_arena != submessage_arena) {
-      value = ::google::protobuf::internal::GetOwnedMessage(message_arena, value, submessage_arena);
-    }
-    _impl_._has_bits_[0] |= 0x00000004u;
-  } else {
-    _impl_._has_bits_[0] &= ~0x00000004u;
-  }
-
-  _impl_.spec_ = reinterpret_cast<::io::deephaven::proto::backplane::grpc::AggSpec*>(value);
-  // @@protoc_insertion_point(field_set_allocated:io.deephaven.proto.backplane.grpc.AggregateAllRequest.spec)
-}
-
-// repeated string group_by_columns = 4;
-inline int AggregateAllRequest::_internal_group_by_columns_size() const {
-  return _internal_group_by_columns().size();
-}
-inline int AggregateAllRequest::group_by_columns_size() const {
-  return _internal_group_by_columns_size();
-}
-inline void AggregateAllRequest::clear_group_by_columns() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  _impl_.group_by_columns_.Clear();
-}
-inline std::string* AggregateAllRequest::add_group_by_columns()
-    ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  std::string* _s = _internal_mutable_group_by_columns()->Add();
-  // @@protoc_insertion_point(field_add_mutable:io.deephaven.proto.backplane.grpc.AggregateAllRequest.group_by_columns)
-  return _s;
-}
-inline const std::string& AggregateAllRequest::group_by_columns(int index) const
-    ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  // @@protoc_insertion_point(field_get:io.deephaven.proto.backplane.grpc.AggregateAllRequest.group_by_columns)
-  return _internal_group_by_columns().Get(index);
-}
-inline std::string* AggregateAllRequest::mutable_group_by_columns(int index)
-    ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  // @@protoc_insertion_point(field_mutable:io.deephaven.proto.backplane.grpc.AggregateAllRequest.group_by_columns)
-  return _internal_mutable_group_by_columns()->Mutable(index);
-}
-inline void AggregateAllRequest::set_group_by_columns(int index, const std::string& value) {
-  _internal_mutable_group_by_columns()->Mutable(index)->assign(value);
-  // @@protoc_insertion_point(field_set:io.deephaven.proto.backplane.grpc.AggregateAllRequest.group_by_columns)
-}
-inline void AggregateAllRequest::set_group_by_columns(int index, std::string&& value) {
-  _internal_mutable_group_by_columns()->Mutable(index)->assign(std::move(value));
-  // @@protoc_insertion_point(field_set:io.deephaven.proto.backplane.grpc.AggregateAllRequest.group_by_columns)
-}
-inline void AggregateAllRequest::set_group_by_columns(int index, const char* value) {
-  ABSL_DCHECK(value != nullptr);
-  _internal_mutable_group_by_columns()->Mutable(index)->assign(value);
-  // @@protoc_insertion_point(field_set_char:io.deephaven.proto.backplane.grpc.AggregateAllRequest.group_by_columns)
-}
-inline void AggregateAllRequest::set_group_by_columns(int index, const char* value,
-                              std::size_t size) {
-  _internal_mutable_group_by_columns()->Mutable(index)->assign(
-      reinterpret_cast<const char*>(value), size);
-  // @@protoc_insertion_point(field_set_pointer:io.deephaven.proto.backplane.grpc.AggregateAllRequest.group_by_columns)
-}
-inline void AggregateAllRequest::set_group_by_columns(int index, absl::string_view value) {
-  _internal_mutable_group_by_columns()->Mutable(index)->assign(value.data(),
-                                                     value.size());
-  // @@protoc_insertion_point(field_set_string_piece:io.deephaven.proto.backplane.grpc.AggregateAllRequest.group_by_columns)
-}
-inline void AggregateAllRequest::add_group_by_columns(const std::string& value) {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  _internal_mutable_group_by_columns()->Add()->assign(value);
-  // @@protoc_insertion_point(field_add:io.deephaven.proto.backplane.grpc.AggregateAllRequest.group_by_columns)
-}
-inline void AggregateAllRequest::add_group_by_columns(std::string&& value) {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  _internal_mutable_group_by_columns()->Add(std::move(value));
-  // @@protoc_insertion_point(field_add:io.deephaven.proto.backplane.grpc.AggregateAllRequest.group_by_columns)
-}
-inline void AggregateAllRequest::add_group_by_columns(const char* value) {
-  ABSL_DCHECK(value != nullptr);
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  _internal_mutable_group_by_columns()->Add()->assign(value);
-  // @@protoc_insertion_point(field_add_char:io.deephaven.proto.backplane.grpc.AggregateAllRequest.group_by_columns)
-}
-inline void AggregateAllRequest::add_group_by_columns(const char* value, std::size_t size) {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  _internal_mutable_group_by_columns()->Add()->assign(
-      reinterpret_cast<const char*>(value), size);
-  // @@protoc_insertion_point(field_add_pointer:io.deephaven.proto.backplane.grpc.AggregateAllRequest.group_by_columns)
-}
-inline void AggregateAllRequest::add_group_by_columns(absl::string_view value) {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  _internal_mutable_group_by_columns()->Add()->assign(value.data(), value.size());
-  // @@protoc_insertion_point(field_add_string_piece:io.deephaven.proto.backplane.grpc.AggregateAllRequest.group_by_columns)
-}
-inline const ::google::protobuf::RepeatedPtrField<std::string>&
-AggregateAllRequest::group_by_columns() const ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  // @@protoc_insertion_point(field_list:io.deephaven.proto.backplane.grpc.AggregateAllRequest.group_by_columns)
-  return _internal_group_by_columns();
-}
-inline ::google::protobuf::RepeatedPtrField<std::string>*
-AggregateAllRequest::mutable_group_by_columns() ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  // @@protoc_insertion_point(field_mutable_list:io.deephaven.proto.backplane.grpc.AggregateAllRequest.group_by_columns)
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  return _internal_mutable_group_by_columns();
-}
-inline const ::google::protobuf::RepeatedPtrField<std::string>&
-AggregateAllRequest::_internal_group_by_columns() const {
-  PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race);
-  return _impl_.group_by_columns_;
-}
-inline ::google::protobuf::RepeatedPtrField<std::string>*
-AggregateAllRequest::_internal_mutable_group_by_columns() {
-  PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race);
-  return &_impl_.group_by_columns_;
-}
-
-// -------------------------------------------------------------------
-
-// AggSpec_AggSpecApproximatePercentile
-
-// double percentile = 1;
-inline void AggSpec_AggSpecApproximatePercentile::clear_percentile() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  _impl_.percentile_ = 0;
-}
-inline double AggSpec_AggSpecApproximatePercentile::percentile() const {
-  // @@protoc_insertion_point(field_get:io.deephaven.proto.backplane.grpc.AggSpec.AggSpecApproximatePercentile.percentile)
-  return _internal_percentile();
-}
-inline void AggSpec_AggSpecApproximatePercentile::set_percentile(double value) {
-  _internal_set_percentile(value);
-  // @@protoc_insertion_point(field_set:io.deephaven.proto.backplane.grpc.AggSpec.AggSpecApproximatePercentile.percentile)
-}
-inline double AggSpec_AggSpecApproximatePercentile::_internal_percentile() const {
-  PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race);
-  return _impl_.percentile_;
-}
-inline void AggSpec_AggSpecApproximatePercentile::_internal_set_percentile(double value) {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  ;
-  _impl_.percentile_ = value;
-}
-
-// optional double compression = 2;
-inline bool AggSpec_AggSpecApproximatePercentile::has_compression() const {
-  bool value = (_impl_._has_bits_[0] & 0x00000001u) != 0;
-  return value;
-}
-inline void AggSpec_AggSpecApproximatePercentile::clear_compression() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  _impl_.compression_ = 0;
-  _impl_._has_bits_[0] &= ~0x00000001u;
-}
-inline double AggSpec_AggSpecApproximatePercentile::compression() const {
-  // @@protoc_insertion_point(field_get:io.deephaven.proto.backplane.grpc.AggSpec.AggSpecApproximatePercentile.compression)
-  return _internal_compression();
-}
-inline void AggSpec_AggSpecApproximatePercentile::set_compression(double value) {
-  _internal_set_compression(value);
-  // @@protoc_insertion_point(field_set:io.deephaven.proto.backplane.grpc.AggSpec.AggSpecApproximatePercentile.compression)
-}
-inline double AggSpec_AggSpecApproximatePercentile::_internal_compression() const {
-  PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race);
-  return _impl_.compression_;
-}
-inline void AggSpec_AggSpecApproximatePercentile::_internal_set_compression(double value) {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  _impl_._has_bits_[0] |= 0x00000001u;
-  _impl_.compression_ = value;
-}
-
-// -------------------------------------------------------------------
-
-// AggSpec_AggSpecCountDistinct
-
-// bool count_nulls = 1;
-inline void AggSpec_AggSpecCountDistinct::clear_count_nulls() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  _impl_.count_nulls_ = false;
-}
-inline bool AggSpec_AggSpecCountDistinct::count_nulls() const {
-  // @@protoc_insertion_point(field_get:io.deephaven.proto.backplane.grpc.AggSpec.AggSpecCountDistinct.count_nulls)
-  return _internal_count_nulls();
-}
-inline void AggSpec_AggSpecCountDistinct::set_count_nulls(bool value) {
-  _internal_set_count_nulls(value);
-  // @@protoc_insertion_point(field_set:io.deephaven.proto.backplane.grpc.AggSpec.AggSpecCountDistinct.count_nulls)
-}
-inline bool AggSpec_AggSpecCountDistinct::_internal_count_nulls() const {
-  PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race);
-  return _impl_.count_nulls_;
-}
-inline void AggSpec_AggSpecCountDistinct::_internal_set_count_nulls(bool value) {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  ;
-  _impl_.count_nulls_ = value;
-}
-
-// -------------------------------------------------------------------
-
-// AggSpec_AggSpecDistinct
-
-// bool include_nulls = 1;
-inline void AggSpec_AggSpecDistinct::clear_include_nulls() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  _impl_.include_nulls_ = false;
-}
-inline bool AggSpec_AggSpecDistinct::include_nulls() const {
-  // @@protoc_insertion_point(field_get:io.deephaven.proto.backplane.grpc.AggSpec.AggSpecDistinct.include_nulls)
-  return _internal_include_nulls();
-}
-inline void AggSpec_AggSpecDistinct::set_include_nulls(bool value) {
-  _internal_set_include_nulls(value);
-  // @@protoc_insertion_point(field_set:io.deephaven.proto.backplane.grpc.AggSpec.AggSpecDistinct.include_nulls)
-}
-inline bool AggSpec_AggSpecDistinct::_internal_include_nulls() const {
-  PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race);
-  return _impl_.include_nulls_;
-}
-inline void AggSpec_AggSpecDistinct::_internal_set_include_nulls(bool value) {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  ;
-  _impl_.include_nulls_ = value;
-}
-
-// -------------------------------------------------------------------
-
-// AggSpec_AggSpecFormula
-
-// string formula = 1;
-inline void AggSpec_AggSpecFormula::clear_formula() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  _impl_.formula_.ClearToEmpty();
-}
-inline const std::string& AggSpec_AggSpecFormula::formula() const
-    ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  // @@protoc_insertion_point(field_get:io.deephaven.proto.backplane.grpc.AggSpec.AggSpecFormula.formula)
-  return _internal_formula();
-}
-template <typename Arg_, typename... Args_>
-inline PROTOBUF_ALWAYS_INLINE void AggSpec_AggSpecFormula::set_formula(Arg_&& arg,
-                                                     Args_... args) {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  ;
-  _impl_.formula_.Set(static_cast<Arg_&&>(arg), args..., GetArena());
-  // @@protoc_insertion_point(field_set:io.deephaven.proto.backplane.grpc.AggSpec.AggSpecFormula.formula)
-}
-inline std::string* AggSpec_AggSpecFormula::mutable_formula() ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  std::string* _s = _internal_mutable_formula();
-  // @@protoc_insertion_point(field_mutable:io.deephaven.proto.backplane.grpc.AggSpec.AggSpecFormula.formula)
-  return _s;
-}
-inline const std::string& AggSpec_AggSpecFormula::_internal_formula() const {
-  PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race);
-  return _impl_.formula_.Get();
-}
-inline void AggSpec_AggSpecFormula::_internal_set_formula(const std::string& value) {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  ;
-  _impl_.formula_.Set(value, GetArena());
-}
-inline std::string* AggSpec_AggSpecFormula::_internal_mutable_formula() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  ;
-  return _impl_.formula_.Mutable( GetArena());
-}
-inline std::string* AggSpec_AggSpecFormula::release_formula() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  // @@protoc_insertion_point(field_release:io.deephaven.proto.backplane.grpc.AggSpec.AggSpecFormula.formula)
-  return _impl_.formula_.Release();
-}
-inline void AggSpec_AggSpecFormula::set_allocated_formula(std::string* value) {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  _impl_.formula_.SetAllocated(value, GetArena());
-  #ifdef PROTOBUF_FORCE_COPY_DEFAULT_STRING
-        if (_impl_.formula_.IsDefault()) {
-          _impl_.formula_.Set("", GetArena());
-        }
-  #endif  // PROTOBUF_FORCE_COPY_DEFAULT_STRING
-  // @@protoc_insertion_point(field_set_allocated:io.deephaven.proto.backplane.grpc.AggSpec.AggSpecFormula.formula)
-}
-
-// string param_token = 2;
-inline void AggSpec_AggSpecFormula::clear_param_token() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  _impl_.param_token_.ClearToEmpty();
-}
-inline const std::string& AggSpec_AggSpecFormula::param_token() const
-    ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  // @@protoc_insertion_point(field_get:io.deephaven.proto.backplane.grpc.AggSpec.AggSpecFormula.param_token)
-  return _internal_param_token();
-}
-template <typename Arg_, typename... Args_>
-inline PROTOBUF_ALWAYS_INLINE void AggSpec_AggSpecFormula::set_param_token(Arg_&& arg,
-                                                     Args_... args) {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  ;
-  _impl_.param_token_.Set(static_cast<Arg_&&>(arg), args..., GetArena());
-  // @@protoc_insertion_point(field_set:io.deephaven.proto.backplane.grpc.AggSpec.AggSpecFormula.param_token)
-}
-inline std::string* AggSpec_AggSpecFormula::mutable_param_token() ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  std::string* _s = _internal_mutable_param_token();
-  // @@protoc_insertion_point(field_mutable:io.deephaven.proto.backplane.grpc.AggSpec.AggSpecFormula.param_token)
-  return _s;
-}
-inline const std::string& AggSpec_AggSpecFormula::_internal_param_token() const {
-  PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race);
-  return _impl_.param_token_.Get();
-}
-inline void AggSpec_AggSpecFormula::_internal_set_param_token(const std::string& value) {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  ;
-  _impl_.param_token_.Set(value, GetArena());
-}
-inline std::string* AggSpec_AggSpecFormula::_internal_mutable_param_token() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  ;
-  return _impl_.param_token_.Mutable( GetArena());
-}
-inline std::string* AggSpec_AggSpecFormula::release_param_token() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  // @@protoc_insertion_point(field_release:io.deephaven.proto.backplane.grpc.AggSpec.AggSpecFormula.param_token)
-  return _impl_.param_token_.Release();
-}
-inline void AggSpec_AggSpecFormula::set_allocated_param_token(std::string* value) {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  _impl_.param_token_.SetAllocated(value, GetArena());
-  #ifdef PROTOBUF_FORCE_COPY_DEFAULT_STRING
-        if (_impl_.param_token_.IsDefault()) {
-          _impl_.param_token_.Set("", GetArena());
-        }
-  #endif  // PROTOBUF_FORCE_COPY_DEFAULT_STRING
-  // @@protoc_insertion_point(field_set_allocated:io.deephaven.proto.backplane.grpc.AggSpec.AggSpecFormula.param_token)
-}
-
-// -------------------------------------------------------------------
-
-// AggSpec_AggSpecMedian
-
-// bool average_evenly_divided = 1;
-inline void AggSpec_AggSpecMedian::clear_average_evenly_divided() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  _impl_.average_evenly_divided_ = false;
-}
-inline bool AggSpec_AggSpecMedian::average_evenly_divided() const {
-  // @@protoc_insertion_point(field_get:io.deephaven.proto.backplane.grpc.AggSpec.AggSpecMedian.average_evenly_divided)
-  return _internal_average_evenly_divided();
-}
-inline void AggSpec_AggSpecMedian::set_average_evenly_divided(bool value) {
-  _internal_set_average_evenly_divided(value);
-  // @@protoc_insertion_point(field_set:io.deephaven.proto.backplane.grpc.AggSpec.AggSpecMedian.average_evenly_divided)
-}
-inline bool AggSpec_AggSpecMedian::_internal_average_evenly_divided() const {
-  PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race);
-  return _impl_.average_evenly_divided_;
-}
-inline void AggSpec_AggSpecMedian::_internal_set_average_evenly_divided(bool value) {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  ;
-  _impl_.average_evenly_divided_ = value;
-}
-
-// -------------------------------------------------------------------
-
-// AggSpec_AggSpecPercentile
-
-// double percentile = 1;
-inline void AggSpec_AggSpecPercentile::clear_percentile() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  _impl_.percentile_ = 0;
-}
-inline double AggSpec_AggSpecPercentile::percentile() const {
-  // @@protoc_insertion_point(field_get:io.deephaven.proto.backplane.grpc.AggSpec.AggSpecPercentile.percentile)
-  return _internal_percentile();
-}
-inline void AggSpec_AggSpecPercentile::set_percentile(double value) {
-  _internal_set_percentile(value);
-  // @@protoc_insertion_point(field_set:io.deephaven.proto.backplane.grpc.AggSpec.AggSpecPercentile.percentile)
-}
-inline double AggSpec_AggSpecPercentile::_internal_percentile() const {
-  PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race);
-  return _impl_.percentile_;
-}
-inline void AggSpec_AggSpecPercentile::_internal_set_percentile(double value) {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  ;
-  _impl_.percentile_ = value;
-}
-
-// bool average_evenly_divided = 2;
-inline void AggSpec_AggSpecPercentile::clear_average_evenly_divided() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  _impl_.average_evenly_divided_ = false;
-}
-inline bool AggSpec_AggSpecPercentile::average_evenly_divided() const {
-  // @@protoc_insertion_point(field_get:io.deephaven.proto.backplane.grpc.AggSpec.AggSpecPercentile.average_evenly_divided)
-  return _internal_average_evenly_divided();
-}
-inline void AggSpec_AggSpecPercentile::set_average_evenly_divided(bool value) {
-  _internal_set_average_evenly_divided(value);
-  // @@protoc_insertion_point(field_set:io.deephaven.proto.backplane.grpc.AggSpec.AggSpecPercentile.average_evenly_divided)
-}
-inline bool AggSpec_AggSpecPercentile::_internal_average_evenly_divided() const {
-  PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race);
-  return _impl_.average_evenly_divided_;
-}
-inline void AggSpec_AggSpecPercentile::_internal_set_average_evenly_divided(bool value) {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  ;
-  _impl_.average_evenly_divided_ = value;
-}
-
-// -------------------------------------------------------------------
-
-// AggSpec_AggSpecSorted
-
-// repeated .io.deephaven.proto.backplane.grpc.AggSpec.AggSpecSortedColumn columns = 1;
-inline int AggSpec_AggSpecSorted::_internal_columns_size() const {
-  return _internal_columns().size();
-}
-inline int AggSpec_AggSpecSorted::columns_size() const {
-  return _internal_columns_size();
-}
-inline void AggSpec_AggSpecSorted::clear_columns() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  _impl_.columns_.Clear();
-}
-inline ::io::deephaven::proto::backplane::grpc::AggSpec_AggSpecSortedColumn* AggSpec_AggSpecSorted::mutable_columns(int index)
-    ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  // @@protoc_insertion_point(field_mutable:io.deephaven.proto.backplane.grpc.AggSpec.AggSpecSorted.columns)
-  return _internal_mutable_columns()->Mutable(index);
-}
-inline ::google::protobuf::RepeatedPtrField<::io::deephaven::proto::backplane::grpc::AggSpec_AggSpecSortedColumn>* AggSpec_AggSpecSorted::mutable_columns()
-    ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  // @@protoc_insertion_point(field_mutable_list:io.deephaven.proto.backplane.grpc.AggSpec.AggSpecSorted.columns)
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  return _internal_mutable_columns();
-}
-inline const ::io::deephaven::proto::backplane::grpc::AggSpec_AggSpecSortedColumn& AggSpec_AggSpecSorted::columns(int index) const
-    ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  // @@protoc_insertion_point(field_get:io.deephaven.proto.backplane.grpc.AggSpec.AggSpecSorted.columns)
-  return _internal_columns().Get(index);
-}
-inline ::io::deephaven::proto::backplane::grpc::AggSpec_AggSpecSortedColumn* AggSpec_AggSpecSorted::add_columns() ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  ::io::deephaven::proto::backplane::grpc::AggSpec_AggSpecSortedColumn* _add = _internal_mutable_columns()->Add();
-  // @@protoc_insertion_point(field_add:io.deephaven.proto.backplane.grpc.AggSpec.AggSpecSorted.columns)
-  return _add;
-}
-inline const ::google::protobuf::RepeatedPtrField<::io::deephaven::proto::backplane::grpc::AggSpec_AggSpecSortedColumn>& AggSpec_AggSpecSorted::columns() const
-    ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  // @@protoc_insertion_point(field_list:io.deephaven.proto.backplane.grpc.AggSpec.AggSpecSorted.columns)
-  return _internal_columns();
-}
-inline const ::google::protobuf::RepeatedPtrField<::io::deephaven::proto::backplane::grpc::AggSpec_AggSpecSortedColumn>&
-AggSpec_AggSpecSorted::_internal_columns() const {
-  PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race);
-  return _impl_.columns_;
-}
-inline ::google::protobuf::RepeatedPtrField<::io::deephaven::proto::backplane::grpc::AggSpec_AggSpecSortedColumn>*
-AggSpec_AggSpecSorted::_internal_mutable_columns() {
-  PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race);
-  return &_impl_.columns_;
-}
-
-// -------------------------------------------------------------------
-
-// AggSpec_AggSpecSortedColumn
-
-// string column_name = 1;
-inline void AggSpec_AggSpecSortedColumn::clear_column_name() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  _impl_.column_name_.ClearToEmpty();
-}
-inline const std::string& AggSpec_AggSpecSortedColumn::column_name() const
-    ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  // @@protoc_insertion_point(field_get:io.deephaven.proto.backplane.grpc.AggSpec.AggSpecSortedColumn.column_name)
-  return _internal_column_name();
-}
-template <typename Arg_, typename... Args_>
-inline PROTOBUF_ALWAYS_INLINE void AggSpec_AggSpecSortedColumn::set_column_name(Arg_&& arg,
-                                                     Args_... args) {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  ;
-  _impl_.column_name_.Set(static_cast<Arg_&&>(arg), args..., GetArena());
-  // @@protoc_insertion_point(field_set:io.deephaven.proto.backplane.grpc.AggSpec.AggSpecSortedColumn.column_name)
-}
-inline std::string* AggSpec_AggSpecSortedColumn::mutable_column_name() ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  std::string* _s = _internal_mutable_column_name();
-  // @@protoc_insertion_point(field_mutable:io.deephaven.proto.backplane.grpc.AggSpec.AggSpecSortedColumn.column_name)
-  return _s;
-}
-inline const std::string& AggSpec_AggSpecSortedColumn::_internal_column_name() const {
-  PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race);
-  return _impl_.column_name_.Get();
-}
-inline void AggSpec_AggSpecSortedColumn::_internal_set_column_name(const std::string& value) {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  ;
-  _impl_.column_name_.Set(value, GetArena());
-}
-inline std::string* AggSpec_AggSpecSortedColumn::_internal_mutable_column_name() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  ;
-  return _impl_.column_name_.Mutable( GetArena());
-}
-inline std::string* AggSpec_AggSpecSortedColumn::release_column_name() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  // @@protoc_insertion_point(field_release:io.deephaven.proto.backplane.grpc.AggSpec.AggSpecSortedColumn.column_name)
-  return _impl_.column_name_.Release();
-}
-inline void AggSpec_AggSpecSortedColumn::set_allocated_column_name(std::string* value) {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  _impl_.column_name_.SetAllocated(value, GetArena());
-  #ifdef PROTOBUF_FORCE_COPY_DEFAULT_STRING
-        if (_impl_.column_name_.IsDefault()) {
-          _impl_.column_name_.Set("", GetArena());
-        }
-  #endif  // PROTOBUF_FORCE_COPY_DEFAULT_STRING
-  // @@protoc_insertion_point(field_set_allocated:io.deephaven.proto.backplane.grpc.AggSpec.AggSpecSortedColumn.column_name)
-}
-
-// -------------------------------------------------------------------
-
-// AggSpec_AggSpecTDigest
-
-// optional double compression = 1;
-inline bool AggSpec_AggSpecTDigest::has_compression() const {
-  bool value = (_impl_._has_bits_[0] & 0x00000001u) != 0;
-  return value;
-}
-inline void AggSpec_AggSpecTDigest::clear_compression() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  _impl_.compression_ = 0;
-  _impl_._has_bits_[0] &= ~0x00000001u;
-}
-inline double AggSpec_AggSpecTDigest::compression() const {
-  // @@protoc_insertion_point(field_get:io.deephaven.proto.backplane.grpc.AggSpec.AggSpecTDigest.compression)
-  return _internal_compression();
-}
-inline void AggSpec_AggSpecTDigest::set_compression(double value) {
-  _internal_set_compression(value);
-  // @@protoc_insertion_point(field_set:io.deephaven.proto.backplane.grpc.AggSpec.AggSpecTDigest.compression)
-}
-inline double AggSpec_AggSpecTDigest::_internal_compression() const {
-  PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race);
-  return _impl_.compression_;
-}
-inline void AggSpec_AggSpecTDigest::_internal_set_compression(double value) {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  _impl_._has_bits_[0] |= 0x00000001u;
-  _impl_.compression_ = value;
-}
-
-// -------------------------------------------------------------------
-
-// AggSpec_AggSpecUnique
-
-// bool include_nulls = 1;
-inline void AggSpec_AggSpecUnique::clear_include_nulls() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  _impl_.include_nulls_ = false;
-}
-inline bool AggSpec_AggSpecUnique::include_nulls() const {
-  // @@protoc_insertion_point(field_get:io.deephaven.proto.backplane.grpc.AggSpec.AggSpecUnique.include_nulls)
-  return _internal_include_nulls();
-}
-inline void AggSpec_AggSpecUnique::set_include_nulls(bool value) {
-  _internal_set_include_nulls(value);
-  // @@protoc_insertion_point(field_set:io.deephaven.proto.backplane.grpc.AggSpec.AggSpecUnique.include_nulls)
-}
-inline bool AggSpec_AggSpecUnique::_internal_include_nulls() const {
-  PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race);
-  return _impl_.include_nulls_;
-}
-inline void AggSpec_AggSpecUnique::_internal_set_include_nulls(bool value) {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  ;
-  _impl_.include_nulls_ = value;
-}
-
-// .io.deephaven.proto.backplane.grpc.AggSpec.AggSpecNonUniqueSentinel non_unique_sentinel = 2;
-inline bool AggSpec_AggSpecUnique::has_non_unique_sentinel() const {
-  bool value = (_impl_._has_bits_[0] & 0x00000001u) != 0;
-  PROTOBUF_ASSUME(!value || _impl_.non_unique_sentinel_ != nullptr);
-  return value;
-}
-inline void AggSpec_AggSpecUnique::clear_non_unique_sentinel() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  if (_impl_.non_unique_sentinel_ != nullptr) _impl_.non_unique_sentinel_->Clear();
-  _impl_._has_bits_[0] &= ~0x00000001u;
-}
-inline const ::io::deephaven::proto::backplane::grpc::AggSpec_AggSpecNonUniqueSentinel& AggSpec_AggSpecUnique::_internal_non_unique_sentinel() const {
-  PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race);
-  const ::io::deephaven::proto::backplane::grpc::AggSpec_AggSpecNonUniqueSentinel* p = _impl_.non_unique_sentinel_;
-  return p != nullptr ? *p : reinterpret_cast<const ::io::deephaven::proto::backplane::grpc::AggSpec_AggSpecNonUniqueSentinel&>(::io::deephaven::proto::backplane::grpc::_AggSpec_AggSpecNonUniqueSentinel_default_instance_);
-}
-inline const ::io::deephaven::proto::backplane::grpc::AggSpec_AggSpecNonUniqueSentinel& AggSpec_AggSpecUnique::non_unique_sentinel() const ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  // @@protoc_insertion_point(field_get:io.deephaven.proto.backplane.grpc.AggSpec.AggSpecUnique.non_unique_sentinel)
-  return _internal_non_unique_sentinel();
-}
-inline void AggSpec_AggSpecUnique::unsafe_arena_set_allocated_non_unique_sentinel(::io::deephaven::proto::backplane::grpc::AggSpec_AggSpecNonUniqueSentinel* value) {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  if (GetArena() == nullptr) {
-    delete reinterpret_cast<::google::protobuf::MessageLite*>(_impl_.non_unique_sentinel_);
-  }
-  _impl_.non_unique_sentinel_ = reinterpret_cast<::io::deephaven::proto::backplane::grpc::AggSpec_AggSpecNonUniqueSentinel*>(value);
-  if (value != nullptr) {
-    _impl_._has_bits_[0] |= 0x00000001u;
-  } else {
-    _impl_._has_bits_[0] &= ~0x00000001u;
-  }
-  // @@protoc_insertion_point(field_unsafe_arena_set_allocated:io.deephaven.proto.backplane.grpc.AggSpec.AggSpecUnique.non_unique_sentinel)
-}
-inline ::io::deephaven::proto::backplane::grpc::AggSpec_AggSpecNonUniqueSentinel* AggSpec_AggSpecUnique::release_non_unique_sentinel() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-
-  _impl_._has_bits_[0] &= ~0x00000001u;
-  ::io::deephaven::proto::backplane::grpc::AggSpec_AggSpecNonUniqueSentinel* released = _impl_.non_unique_sentinel_;
-  _impl_.non_unique_sentinel_ = nullptr;
-#ifdef PROTOBUF_FORCE_COPY_IN_RELEASE
-  auto* old = reinterpret_cast<::google::protobuf::MessageLite*>(released);
-  released = ::google::protobuf::internal::DuplicateIfNonNull(released);
-  if (GetArena() == nullptr) {
-    delete old;
-  }
-#else   // PROTOBUF_FORCE_COPY_IN_RELEASE
-  if (GetArena() != nullptr) {
-    released = ::google::protobuf::internal::DuplicateIfNonNull(released);
-  }
-#endif  // !PROTOBUF_FORCE_COPY_IN_RELEASE
-  return released;
-}
-inline ::io::deephaven::proto::backplane::grpc::AggSpec_AggSpecNonUniqueSentinel* AggSpec_AggSpecUnique::unsafe_arena_release_non_unique_sentinel() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  // @@protoc_insertion_point(field_release:io.deephaven.proto.backplane.grpc.AggSpec.AggSpecUnique.non_unique_sentinel)
-
-  _impl_._has_bits_[0] &= ~0x00000001u;
-  ::io::deephaven::proto::backplane::grpc::AggSpec_AggSpecNonUniqueSentinel* temp = _impl_.non_unique_sentinel_;
-  _impl_.non_unique_sentinel_ = nullptr;
-  return temp;
-}
-inline ::io::deephaven::proto::backplane::grpc::AggSpec_AggSpecNonUniqueSentinel* AggSpec_AggSpecUnique::_internal_mutable_non_unique_sentinel() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  _impl_._has_bits_[0] |= 0x00000001u;
-  if (_impl_.non_unique_sentinel_ == nullptr) {
-    auto* p = CreateMaybeMessage<::io::deephaven::proto::backplane::grpc::AggSpec_AggSpecNonUniqueSentinel>(GetArena());
-    _impl_.non_unique_sentinel_ = reinterpret_cast<::io::deephaven::proto::backplane::grpc::AggSpec_AggSpecNonUniqueSentinel*>(p);
-  }
-  return _impl_.non_unique_sentinel_;
-}
-inline ::io::deephaven::proto::backplane::grpc::AggSpec_AggSpecNonUniqueSentinel* AggSpec_AggSpecUnique::mutable_non_unique_sentinel() ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  ::io::deephaven::proto::backplane::grpc::AggSpec_AggSpecNonUniqueSentinel* _msg = _internal_mutable_non_unique_sentinel();
-  // @@protoc_insertion_point(field_mutable:io.deephaven.proto.backplane.grpc.AggSpec.AggSpecUnique.non_unique_sentinel)
-  return _msg;
-}
-inline void AggSpec_AggSpecUnique::set_allocated_non_unique_sentinel(::io::deephaven::proto::backplane::grpc::AggSpec_AggSpecNonUniqueSentinel* value) {
-  ::google::protobuf::Arena* message_arena = GetArena();
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  if (message_arena == nullptr) {
-    delete reinterpret_cast<::io::deephaven::proto::backplane::grpc::AggSpec_AggSpecNonUniqueSentinel*>(_impl_.non_unique_sentinel_);
-  }
-
-  if (value != nullptr) {
-    ::google::protobuf::Arena* submessage_arena = reinterpret_cast<::io::deephaven::proto::backplane::grpc::AggSpec_AggSpecNonUniqueSentinel*>(value)->GetArena();
-    if (message_arena != submessage_arena) {
-      value = ::google::protobuf::internal::GetOwnedMessage(message_arena, value, submessage_arena);
-    }
-    _impl_._has_bits_[0] |= 0x00000001u;
-  } else {
-    _impl_._has_bits_[0] &= ~0x00000001u;
-  }
-
-  _impl_.non_unique_sentinel_ = reinterpret_cast<::io::deephaven::proto::backplane::grpc::AggSpec_AggSpecNonUniqueSentinel*>(value);
-  // @@protoc_insertion_point(field_set_allocated:io.deephaven.proto.backplane.grpc.AggSpec.AggSpecUnique.non_unique_sentinel)
-}
-
-// -------------------------------------------------------------------
-
-// AggSpec_AggSpecNonUniqueSentinel
-
-// .io.deephaven.proto.backplane.grpc.NullValue null_value = 1;
-inline bool AggSpec_AggSpecNonUniqueSentinel::has_null_value() const {
-  return type_case() == kNullValue;
-}
-inline void AggSpec_AggSpecNonUniqueSentinel::set_has_null_value() {
-  _impl_._oneof_case_[0] = kNullValue;
-}
-inline void AggSpec_AggSpecNonUniqueSentinel::clear_null_value() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  if (type_case() == kNullValue) {
-    _impl_.type_.null_value_ = 0;
-    clear_has_type();
-  }
-}
-inline ::io::deephaven::proto::backplane::grpc::NullValue AggSpec_AggSpecNonUniqueSentinel::null_value() const {
-  // @@protoc_insertion_point(field_get:io.deephaven.proto.backplane.grpc.AggSpec.AggSpecNonUniqueSentinel.null_value)
-  return _internal_null_value();
-}
-inline void AggSpec_AggSpecNonUniqueSentinel::set_null_value(::io::deephaven::proto::backplane::grpc::NullValue value) {
-  _internal_set_null_value(value);
-  // @@protoc_insertion_point(field_set:io.deephaven.proto.backplane.grpc.AggSpec.AggSpecNonUniqueSentinel.null_value)
-}
-inline ::io::deephaven::proto::backplane::grpc::NullValue AggSpec_AggSpecNonUniqueSentinel::_internal_null_value() const {
-  if (type_case() == kNullValue) {
-    return static_cast<::io::deephaven::proto::backplane::grpc::NullValue>(_impl_.type_.null_value_);
-  }
-  return static_cast<::io::deephaven::proto::backplane::grpc::NullValue>(0);
-}
-inline void AggSpec_AggSpecNonUniqueSentinel::_internal_set_null_value(::io::deephaven::proto::backplane::grpc::NullValue value) {
-  if (type_case() != kNullValue) {
-    clear_type();
-    set_has_null_value();
-  }
-  _impl_.type_.null_value_ = value;
-}
-
-// string string_value = 2;
-inline bool AggSpec_AggSpecNonUniqueSentinel::has_string_value() const {
-  return type_case() == kStringValue;
-}
-inline void AggSpec_AggSpecNonUniqueSentinel::set_has_string_value() {
-  _impl_._oneof_case_[0] = kStringValue;
-}
-inline void AggSpec_AggSpecNonUniqueSentinel::clear_string_value() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  if (type_case() == kStringValue) {
-    _impl_.type_.string_value_.Destroy();
-    clear_has_type();
-  }
-}
-inline const std::string& AggSpec_AggSpecNonUniqueSentinel::string_value() const
-    ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  // @@protoc_insertion_point(field_get:io.deephaven.proto.backplane.grpc.AggSpec.AggSpecNonUniqueSentinel.string_value)
-  return _internal_string_value();
-}
-template <typename Arg_, typename... Args_>
-inline PROTOBUF_ALWAYS_INLINE void AggSpec_AggSpecNonUniqueSentinel::set_string_value(Arg_&& arg,
-                                                     Args_... args) {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  if (type_case() != kStringValue) {
-    clear_type();
-
-    set_has_string_value();
-    _impl_.type_.string_value_.InitDefault();
-  }
-  _impl_.type_.string_value_.Set(static_cast<Arg_&&>(arg), args..., GetArena());
-  // @@protoc_insertion_point(field_set:io.deephaven.proto.backplane.grpc.AggSpec.AggSpecNonUniqueSentinel.string_value)
-}
-inline std::string* AggSpec_AggSpecNonUniqueSentinel::mutable_string_value() ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  std::string* _s = _internal_mutable_string_value();
-  // @@protoc_insertion_point(field_mutable:io.deephaven.proto.backplane.grpc.AggSpec.AggSpecNonUniqueSentinel.string_value)
-  return _s;
-}
-inline const std::string& AggSpec_AggSpecNonUniqueSentinel::_internal_string_value() const {
-  PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race);
-  if (type_case() != kStringValue) {
-    return ::google::protobuf::internal::GetEmptyStringAlreadyInited();
-  }
-  return _impl_.type_.string_value_.Get();
-}
-inline void AggSpec_AggSpecNonUniqueSentinel::_internal_set_string_value(const std::string& value) {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  if (type_case() != kStringValue) {
-    clear_type();
-
-    set_has_string_value();
-    _impl_.type_.string_value_.InitDefault();
-  }
-  _impl_.type_.string_value_.Set(value, GetArena());
-}
-inline std::string* AggSpec_AggSpecNonUniqueSentinel::_internal_mutable_string_value() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  if (type_case() != kStringValue) {
-    clear_type();
-
-    set_has_string_value();
-    _impl_.type_.string_value_.InitDefault();
-  }
-  return _impl_.type_.string_value_.Mutable( GetArena());
-}
-inline std::string* AggSpec_AggSpecNonUniqueSentinel::release_string_value() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  // @@protoc_insertion_point(field_release:io.deephaven.proto.backplane.grpc.AggSpec.AggSpecNonUniqueSentinel.string_value)
-  if (type_case() != kStringValue) {
-    return nullptr;
-  }
-  clear_has_type();
-  return _impl_.type_.string_value_.Release();
-}
-inline void AggSpec_AggSpecNonUniqueSentinel::set_allocated_string_value(std::string* value) {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  if (has_type()) {
-    clear_type();
-  }
-  if (value != nullptr) {
-    set_has_string_value();
-    _impl_.type_.string_value_.InitAllocated(value, GetArena());
-  }
-  // @@protoc_insertion_point(field_set_allocated:io.deephaven.proto.backplane.grpc.AggSpec.AggSpecNonUniqueSentinel.string_value)
-}
-
-// sint32 int_value = 3;
-inline bool AggSpec_AggSpecNonUniqueSentinel::has_int_value() const {
-  return type_case() == kIntValue;
-}
-inline void AggSpec_AggSpecNonUniqueSentinel::set_has_int_value() {
-  _impl_._oneof_case_[0] = kIntValue;
-}
-inline void AggSpec_AggSpecNonUniqueSentinel::clear_int_value() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  if (type_case() == kIntValue) {
-    _impl_.type_.int_value_ = 0;
-    clear_has_type();
-  }
-}
-inline ::int32_t AggSpec_AggSpecNonUniqueSentinel::int_value() const {
-  // @@protoc_insertion_point(field_get:io.deephaven.proto.backplane.grpc.AggSpec.AggSpecNonUniqueSentinel.int_value)
-  return _internal_int_value();
-}
-inline void AggSpec_AggSpecNonUniqueSentinel::set_int_value(::int32_t value) {
-  _internal_set_int_value(value);
-  // @@protoc_insertion_point(field_set:io.deephaven.proto.backplane.grpc.AggSpec.AggSpecNonUniqueSentinel.int_value)
-}
-inline ::int32_t AggSpec_AggSpecNonUniqueSentinel::_internal_int_value() const {
-  if (type_case() == kIntValue) {
-    return _impl_.type_.int_value_;
-  }
-  return 0;
-}
-inline void AggSpec_AggSpecNonUniqueSentinel::_internal_set_int_value(::int32_t value) {
-  if (type_case() != kIntValue) {
-    clear_type();
-    set_has_int_value();
-  }
-  _impl_.type_.int_value_ = value;
-}
-
-// sint64 long_value = 4 [jstype = JS_STRING];
-inline bool AggSpec_AggSpecNonUniqueSentinel::has_long_value() const {
-  return type_case() == kLongValue;
-}
-inline void AggSpec_AggSpecNonUniqueSentinel::set_has_long_value() {
-  _impl_._oneof_case_[0] = kLongValue;
-}
-inline void AggSpec_AggSpecNonUniqueSentinel::clear_long_value() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  if (type_case() == kLongValue) {
-    _impl_.type_.long_value_ = ::int64_t{0};
-    clear_has_type();
-  }
-}
-inline ::int64_t AggSpec_AggSpecNonUniqueSentinel::long_value() const {
-  // @@protoc_insertion_point(field_get:io.deephaven.proto.backplane.grpc.AggSpec.AggSpecNonUniqueSentinel.long_value)
-  return _internal_long_value();
-}
-inline void AggSpec_AggSpecNonUniqueSentinel::set_long_value(::int64_t value) {
-  _internal_set_long_value(value);
-  // @@protoc_insertion_point(field_set:io.deephaven.proto.backplane.grpc.AggSpec.AggSpecNonUniqueSentinel.long_value)
-}
-inline ::int64_t AggSpec_AggSpecNonUniqueSentinel::_internal_long_value() const {
-  if (type_case() == kLongValue) {
-    return _impl_.type_.long_value_;
-  }
-  return ::int64_t{0};
-}
-inline void AggSpec_AggSpecNonUniqueSentinel::_internal_set_long_value(::int64_t value) {
-  if (type_case() != kLongValue) {
-    clear_type();
-    set_has_long_value();
-  }
-  _impl_.type_.long_value_ = value;
-}
-
-// float float_value = 5;
-inline bool AggSpec_AggSpecNonUniqueSentinel::has_float_value() const {
-  return type_case() == kFloatValue;
-}
-inline void AggSpec_AggSpecNonUniqueSentinel::set_has_float_value() {
-  _impl_._oneof_case_[0] = kFloatValue;
-}
-inline void AggSpec_AggSpecNonUniqueSentinel::clear_float_value() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  if (type_case() == kFloatValue) {
-    _impl_.type_.float_value_ = 0;
-    clear_has_type();
-  }
-}
-inline float AggSpec_AggSpecNonUniqueSentinel::float_value() const {
-  // @@protoc_insertion_point(field_get:io.deephaven.proto.backplane.grpc.AggSpec.AggSpecNonUniqueSentinel.float_value)
-  return _internal_float_value();
-}
-inline void AggSpec_AggSpecNonUniqueSentinel::set_float_value(float value) {
-  _internal_set_float_value(value);
-  // @@protoc_insertion_point(field_set:io.deephaven.proto.backplane.grpc.AggSpec.AggSpecNonUniqueSentinel.float_value)
-}
-inline float AggSpec_AggSpecNonUniqueSentinel::_internal_float_value() const {
-  if (type_case() == kFloatValue) {
-    return _impl_.type_.float_value_;
-  }
-  return 0;
-}
-inline void AggSpec_AggSpecNonUniqueSentinel::_internal_set_float_value(float value) {
-  if (type_case() != kFloatValue) {
-    clear_type();
-    set_has_float_value();
-  }
-  _impl_.type_.float_value_ = value;
-}
-
-// double double_value = 6;
-inline bool AggSpec_AggSpecNonUniqueSentinel::has_double_value() const {
-  return type_case() == kDoubleValue;
-}
-inline void AggSpec_AggSpecNonUniqueSentinel::set_has_double_value() {
-  _impl_._oneof_case_[0] = kDoubleValue;
-}
-inline void AggSpec_AggSpecNonUniqueSentinel::clear_double_value() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  if (type_case() == kDoubleValue) {
-    _impl_.type_.double_value_ = 0;
-    clear_has_type();
-  }
-}
-inline double AggSpec_AggSpecNonUniqueSentinel::double_value() const {
-  // @@protoc_insertion_point(field_get:io.deephaven.proto.backplane.grpc.AggSpec.AggSpecNonUniqueSentinel.double_value)
-  return _internal_double_value();
-}
-inline void AggSpec_AggSpecNonUniqueSentinel::set_double_value(double value) {
-  _internal_set_double_value(value);
-  // @@protoc_insertion_point(field_set:io.deephaven.proto.backplane.grpc.AggSpec.AggSpecNonUniqueSentinel.double_value)
-}
-inline double AggSpec_AggSpecNonUniqueSentinel::_internal_double_value() const {
-  if (type_case() == kDoubleValue) {
-    return _impl_.type_.double_value_;
-  }
-  return 0;
-}
-inline void AggSpec_AggSpecNonUniqueSentinel::_internal_set_double_value(double value) {
-  if (type_case() != kDoubleValue) {
-    clear_type();
-    set_has_double_value();
-  }
-  _impl_.type_.double_value_ = value;
-}
-
-// bool bool_value = 7;
-inline bool AggSpec_AggSpecNonUniqueSentinel::has_bool_value() const {
-  return type_case() == kBoolValue;
-}
-inline void AggSpec_AggSpecNonUniqueSentinel::set_has_bool_value() {
-  _impl_._oneof_case_[0] = kBoolValue;
-}
-inline void AggSpec_AggSpecNonUniqueSentinel::clear_bool_value() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  if (type_case() == kBoolValue) {
-    _impl_.type_.bool_value_ = false;
-    clear_has_type();
-  }
-}
-inline bool AggSpec_AggSpecNonUniqueSentinel::bool_value() const {
-  // @@protoc_insertion_point(field_get:io.deephaven.proto.backplane.grpc.AggSpec.AggSpecNonUniqueSentinel.bool_value)
-  return _internal_bool_value();
-}
-inline void AggSpec_AggSpecNonUniqueSentinel::set_bool_value(bool value) {
-  _internal_set_bool_value(value);
-  // @@protoc_insertion_point(field_set:io.deephaven.proto.backplane.grpc.AggSpec.AggSpecNonUniqueSentinel.bool_value)
-}
-inline bool AggSpec_AggSpecNonUniqueSentinel::_internal_bool_value() const {
-  if (type_case() == kBoolValue) {
-    return _impl_.type_.bool_value_;
-  }
-  return false;
-}
-inline void AggSpec_AggSpecNonUniqueSentinel::_internal_set_bool_value(bool value) {
-  if (type_case() != kBoolValue) {
-    clear_type();
-    set_has_bool_value();
-  }
-  _impl_.type_.bool_value_ = value;
-}
-
-// sint32 byte_value = 8;
-inline bool AggSpec_AggSpecNonUniqueSentinel::has_byte_value() const {
-  return type_case() == kByteValue;
-}
-inline void AggSpec_AggSpecNonUniqueSentinel::set_has_byte_value() {
-  _impl_._oneof_case_[0] = kByteValue;
-}
-inline void AggSpec_AggSpecNonUniqueSentinel::clear_byte_value() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  if (type_case() == kByteValue) {
-    _impl_.type_.byte_value_ = 0;
-    clear_has_type();
-  }
-}
-inline ::int32_t AggSpec_AggSpecNonUniqueSentinel::byte_value() const {
-  // @@protoc_insertion_point(field_get:io.deephaven.proto.backplane.grpc.AggSpec.AggSpecNonUniqueSentinel.byte_value)
-  return _internal_byte_value();
-}
-inline void AggSpec_AggSpecNonUniqueSentinel::set_byte_value(::int32_t value) {
-  _internal_set_byte_value(value);
-  // @@protoc_insertion_point(field_set:io.deephaven.proto.backplane.grpc.AggSpec.AggSpecNonUniqueSentinel.byte_value)
-}
-inline ::int32_t AggSpec_AggSpecNonUniqueSentinel::_internal_byte_value() const {
-  if (type_case() == kByteValue) {
-    return _impl_.type_.byte_value_;
-  }
-  return 0;
-}
-inline void AggSpec_AggSpecNonUniqueSentinel::_internal_set_byte_value(::int32_t value) {
-  if (type_case() != kByteValue) {
-    clear_type();
-    set_has_byte_value();
-  }
-  _impl_.type_.byte_value_ = value;
-}
-
-// sint32 short_value = 9;
-inline bool AggSpec_AggSpecNonUniqueSentinel::has_short_value() const {
-  return type_case() == kShortValue;
-}
-inline void AggSpec_AggSpecNonUniqueSentinel::set_has_short_value() {
-  _impl_._oneof_case_[0] = kShortValue;
-}
-inline void AggSpec_AggSpecNonUniqueSentinel::clear_short_value() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  if (type_case() == kShortValue) {
-    _impl_.type_.short_value_ = 0;
-    clear_has_type();
-  }
-}
-inline ::int32_t AggSpec_AggSpecNonUniqueSentinel::short_value() const {
-  // @@protoc_insertion_point(field_get:io.deephaven.proto.backplane.grpc.AggSpec.AggSpecNonUniqueSentinel.short_value)
-  return _internal_short_value();
-}
-inline void AggSpec_AggSpecNonUniqueSentinel::set_short_value(::int32_t value) {
-  _internal_set_short_value(value);
-  // @@protoc_insertion_point(field_set:io.deephaven.proto.backplane.grpc.AggSpec.AggSpecNonUniqueSentinel.short_value)
-}
-inline ::int32_t AggSpec_AggSpecNonUniqueSentinel::_internal_short_value() const {
-  if (type_case() == kShortValue) {
-    return _impl_.type_.short_value_;
-  }
-  return 0;
-}
-inline void AggSpec_AggSpecNonUniqueSentinel::_internal_set_short_value(::int32_t value) {
-  if (type_case() != kShortValue) {
-    clear_type();
-    set_has_short_value();
-  }
-  _impl_.type_.short_value_ = value;
-}
-
-// sint32 char_value = 10;
-inline bool AggSpec_AggSpecNonUniqueSentinel::has_char_value() const {
-  return type_case() == kCharValue;
-}
-inline void AggSpec_AggSpecNonUniqueSentinel::set_has_char_value() {
-  _impl_._oneof_case_[0] = kCharValue;
-}
-inline void AggSpec_AggSpecNonUniqueSentinel::clear_char_value() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  if (type_case() == kCharValue) {
-    _impl_.type_.char_value_ = 0;
-    clear_has_type();
-  }
-}
-inline ::int32_t AggSpec_AggSpecNonUniqueSentinel::char_value() const {
-  // @@protoc_insertion_point(field_get:io.deephaven.proto.backplane.grpc.AggSpec.AggSpecNonUniqueSentinel.char_value)
-  return _internal_char_value();
-}
-inline void AggSpec_AggSpecNonUniqueSentinel::set_char_value(::int32_t value) {
-  _internal_set_char_value(value);
-  // @@protoc_insertion_point(field_set:io.deephaven.proto.backplane.grpc.AggSpec.AggSpecNonUniqueSentinel.char_value)
-}
-inline ::int32_t AggSpec_AggSpecNonUniqueSentinel::_internal_char_value() const {
-  if (type_case() == kCharValue) {
-    return _impl_.type_.char_value_;
-  }
-  return 0;
-}
-inline void AggSpec_AggSpecNonUniqueSentinel::_internal_set_char_value(::int32_t value) {
-  if (type_case() != kCharValue) {
-    clear_type();
-    set_has_char_value();
-  }
-  _impl_.type_.char_value_ = value;
-}
-
-inline bool AggSpec_AggSpecNonUniqueSentinel::has_type() const {
-  return type_case() != TYPE_NOT_SET;
-}
-inline void AggSpec_AggSpecNonUniqueSentinel::clear_has_type() {
-  _impl_._oneof_case_[0] = TYPE_NOT_SET;
-}
-inline AggSpec_AggSpecNonUniqueSentinel::TypeCase AggSpec_AggSpecNonUniqueSentinel::type_case() const {
-  return AggSpec_AggSpecNonUniqueSentinel::TypeCase(_impl_._oneof_case_[0]);
-}
-// -------------------------------------------------------------------
-
-// AggSpec_AggSpecWeighted
-
-// string weight_column = 1;
-inline void AggSpec_AggSpecWeighted::clear_weight_column() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  _impl_.weight_column_.ClearToEmpty();
-}
-inline const std::string& AggSpec_AggSpecWeighted::weight_column() const
-    ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  // @@protoc_insertion_point(field_get:io.deephaven.proto.backplane.grpc.AggSpec.AggSpecWeighted.weight_column)
-  return _internal_weight_column();
-}
-template <typename Arg_, typename... Args_>
-inline PROTOBUF_ALWAYS_INLINE void AggSpec_AggSpecWeighted::set_weight_column(Arg_&& arg,
-                                                     Args_... args) {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  ;
-  _impl_.weight_column_.Set(static_cast<Arg_&&>(arg), args..., GetArena());
-  // @@protoc_insertion_point(field_set:io.deephaven.proto.backplane.grpc.AggSpec.AggSpecWeighted.weight_column)
-}
-inline std::string* AggSpec_AggSpecWeighted::mutable_weight_column() ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  std::string* _s = _internal_mutable_weight_column();
-  // @@protoc_insertion_point(field_mutable:io.deephaven.proto.backplane.grpc.AggSpec.AggSpecWeighted.weight_column)
-  return _s;
-}
-inline const std::string& AggSpec_AggSpecWeighted::_internal_weight_column() const {
-  PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race);
-  return _impl_.weight_column_.Get();
-}
-inline void AggSpec_AggSpecWeighted::_internal_set_weight_column(const std::string& value) {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  ;
-  _impl_.weight_column_.Set(value, GetArena());
-}
-inline std::string* AggSpec_AggSpecWeighted::_internal_mutable_weight_column() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  ;
-  return _impl_.weight_column_.Mutable( GetArena());
-}
-inline std::string* AggSpec_AggSpecWeighted::release_weight_column() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  // @@protoc_insertion_point(field_release:io.deephaven.proto.backplane.grpc.AggSpec.AggSpecWeighted.weight_column)
-  return _impl_.weight_column_.Release();
-}
-inline void AggSpec_AggSpecWeighted::set_allocated_weight_column(std::string* value) {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  _impl_.weight_column_.SetAllocated(value, GetArena());
-  #ifdef PROTOBUF_FORCE_COPY_DEFAULT_STRING
-        if (_impl_.weight_column_.IsDefault()) {
-          _impl_.weight_column_.Set("", GetArena());
-        }
-  #endif  // PROTOBUF_FORCE_COPY_DEFAULT_STRING
-  // @@protoc_insertion_point(field_set_allocated:io.deephaven.proto.backplane.grpc.AggSpec.AggSpecWeighted.weight_column)
-}
-
-// -------------------------------------------------------------------
-
-// AggSpec_AggSpecAbsSum
-
-// -------------------------------------------------------------------
-
-// AggSpec_AggSpecAvg
-
-// -------------------------------------------------------------------
-
-// AggSpec_AggSpecFirst
-
-// -------------------------------------------------------------------
-
-// AggSpec_AggSpecFreeze
-
-// -------------------------------------------------------------------
-
-// AggSpec_AggSpecGroup
-
-// -------------------------------------------------------------------
-
-// AggSpec_AggSpecLast
-
-// -------------------------------------------------------------------
-
-// AggSpec_AggSpecMax
-
-// -------------------------------------------------------------------
-
-// AggSpec_AggSpecMin
-
-// -------------------------------------------------------------------
-
-// AggSpec_AggSpecStd
-
-// -------------------------------------------------------------------
-
-// AggSpec_AggSpecSum
-
-// -------------------------------------------------------------------
-
-// AggSpec_AggSpecVar
-
-// -------------------------------------------------------------------
-
-// AggSpec
-
-// .io.deephaven.proto.backplane.grpc.AggSpec.AggSpecAbsSum abs_sum = 1;
-inline bool AggSpec::has_abs_sum() const {
-  return type_case() == kAbsSum;
-}
-inline bool AggSpec::_internal_has_abs_sum() const {
-  return type_case() == kAbsSum;
-}
-inline void AggSpec::set_has_abs_sum() {
-  _impl_._oneof_case_[0] = kAbsSum;
-}
-inline void AggSpec::clear_abs_sum() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  if (type_case() == kAbsSum) {
-    if (GetArena() == nullptr) {
-      delete _impl_.type_.abs_sum_;
-    }
-    clear_has_type();
-  }
-}
-inline ::io::deephaven::proto::backplane::grpc::AggSpec_AggSpecAbsSum* AggSpec::release_abs_sum() {
-  // @@protoc_insertion_point(field_release:io.deephaven.proto.backplane.grpc.AggSpec.abs_sum)
-  if (type_case() == kAbsSum) {
-    clear_has_type();
-    auto* temp = _impl_.type_.abs_sum_;
-    if (GetArena() != nullptr) {
-      temp = ::google::protobuf::internal::DuplicateIfNonNull(temp);
-    }
-    _impl_.type_.abs_sum_ = nullptr;
-    return temp;
-  } else {
-    return nullptr;
-  }
-}
-inline const ::io::deephaven::proto::backplane::grpc::AggSpec_AggSpecAbsSum& AggSpec::_internal_abs_sum() const {
-  return type_case() == kAbsSum ? *_impl_.type_.abs_sum_ : reinterpret_cast<::io::deephaven::proto::backplane::grpc::AggSpec_AggSpecAbsSum&>(::io::deephaven::proto::backplane::grpc::_AggSpec_AggSpecAbsSum_default_instance_);
-}
-inline const ::io::deephaven::proto::backplane::grpc::AggSpec_AggSpecAbsSum& AggSpec::abs_sum() const ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  // @@protoc_insertion_point(field_get:io.deephaven.proto.backplane.grpc.AggSpec.abs_sum)
-  return _internal_abs_sum();
-}
-inline ::io::deephaven::proto::backplane::grpc::AggSpec_AggSpecAbsSum* AggSpec::unsafe_arena_release_abs_sum() {
-  // @@protoc_insertion_point(field_unsafe_arena_release:io.deephaven.proto.backplane.grpc.AggSpec.abs_sum)
-  if (type_case() == kAbsSum) {
-    clear_has_type();
-    auto* temp = _impl_.type_.abs_sum_;
-    _impl_.type_.abs_sum_ = nullptr;
-    return temp;
-  } else {
-    return nullptr;
-  }
-}
-inline void AggSpec::unsafe_arena_set_allocated_abs_sum(::io::deephaven::proto::backplane::grpc::AggSpec_AggSpecAbsSum* value) {
-  // We rely on the oneof clear method to free the earlier contents
-  // of this oneof. We can directly use the pointer we're given to
-  // set the new value.
-  clear_type();
-  if (value) {
-    set_has_abs_sum();
-    _impl_.type_.abs_sum_ = value;
-  }
-  // @@protoc_insertion_point(field_unsafe_arena_set_allocated:io.deephaven.proto.backplane.grpc.AggSpec.abs_sum)
-}
-inline ::io::deephaven::proto::backplane::grpc::AggSpec_AggSpecAbsSum* AggSpec::_internal_mutable_abs_sum() {
-  if (type_case() != kAbsSum) {
-    clear_type();
-    set_has_abs_sum();
-    _impl_.type_.abs_sum_ = CreateMaybeMessage<::io::deephaven::proto::backplane::grpc::AggSpec_AggSpecAbsSum>(GetArena());
-  }
-  return _impl_.type_.abs_sum_;
-}
-inline ::io::deephaven::proto::backplane::grpc::AggSpec_AggSpecAbsSum* AggSpec::mutable_abs_sum() ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  ::io::deephaven::proto::backplane::grpc::AggSpec_AggSpecAbsSum* _msg = _internal_mutable_abs_sum();
-  // @@protoc_insertion_point(field_mutable:io.deephaven.proto.backplane.grpc.AggSpec.abs_sum)
-  return _msg;
-}
-
-// .io.deephaven.proto.backplane.grpc.AggSpec.AggSpecApproximatePercentile approximate_percentile = 2;
-inline bool AggSpec::has_approximate_percentile() const {
-  return type_case() == kApproximatePercentile;
-}
-inline bool AggSpec::_internal_has_approximate_percentile() const {
-  return type_case() == kApproximatePercentile;
-}
-inline void AggSpec::set_has_approximate_percentile() {
-  _impl_._oneof_case_[0] = kApproximatePercentile;
-}
-inline void AggSpec::clear_approximate_percentile() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  if (type_case() == kApproximatePercentile) {
-    if (GetArena() == nullptr) {
-      delete _impl_.type_.approximate_percentile_;
-    }
-    clear_has_type();
-  }
-}
-inline ::io::deephaven::proto::backplane::grpc::AggSpec_AggSpecApproximatePercentile* AggSpec::release_approximate_percentile() {
-  // @@protoc_insertion_point(field_release:io.deephaven.proto.backplane.grpc.AggSpec.approximate_percentile)
-  if (type_case() == kApproximatePercentile) {
-    clear_has_type();
-    auto* temp = _impl_.type_.approximate_percentile_;
-    if (GetArena() != nullptr) {
-      temp = ::google::protobuf::internal::DuplicateIfNonNull(temp);
-    }
-    _impl_.type_.approximate_percentile_ = nullptr;
-    return temp;
-  } else {
-    return nullptr;
-  }
-}
-inline const ::io::deephaven::proto::backplane::grpc::AggSpec_AggSpecApproximatePercentile& AggSpec::_internal_approximate_percentile() const {
-  return type_case() == kApproximatePercentile ? *_impl_.type_.approximate_percentile_ : reinterpret_cast<::io::deephaven::proto::backplane::grpc::AggSpec_AggSpecApproximatePercentile&>(::io::deephaven::proto::backplane::grpc::_AggSpec_AggSpecApproximatePercentile_default_instance_);
-}
-inline const ::io::deephaven::proto::backplane::grpc::AggSpec_AggSpecApproximatePercentile& AggSpec::approximate_percentile() const ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  // @@protoc_insertion_point(field_get:io.deephaven.proto.backplane.grpc.AggSpec.approximate_percentile)
-  return _internal_approximate_percentile();
-}
-inline ::io::deephaven::proto::backplane::grpc::AggSpec_AggSpecApproximatePercentile* AggSpec::unsafe_arena_release_approximate_percentile() {
-  // @@protoc_insertion_point(field_unsafe_arena_release:io.deephaven.proto.backplane.grpc.AggSpec.approximate_percentile)
-  if (type_case() == kApproximatePercentile) {
-    clear_has_type();
-    auto* temp = _impl_.type_.approximate_percentile_;
-    _impl_.type_.approximate_percentile_ = nullptr;
-    return temp;
-  } else {
-    return nullptr;
-  }
-}
-inline void AggSpec::unsafe_arena_set_allocated_approximate_percentile(::io::deephaven::proto::backplane::grpc::AggSpec_AggSpecApproximatePercentile* value) {
-  // We rely on the oneof clear method to free the earlier contents
-  // of this oneof. We can directly use the pointer we're given to
-  // set the new value.
-  clear_type();
-  if (value) {
-    set_has_approximate_percentile();
-    _impl_.type_.approximate_percentile_ = value;
-  }
-  // @@protoc_insertion_point(field_unsafe_arena_set_allocated:io.deephaven.proto.backplane.grpc.AggSpec.approximate_percentile)
-}
-inline ::io::deephaven::proto::backplane::grpc::AggSpec_AggSpecApproximatePercentile* AggSpec::_internal_mutable_approximate_percentile() {
-  if (type_case() != kApproximatePercentile) {
-    clear_type();
-    set_has_approximate_percentile();
-    _impl_.type_.approximate_percentile_ = CreateMaybeMessage<::io::deephaven::proto::backplane::grpc::AggSpec_AggSpecApproximatePercentile>(GetArena());
-  }
-  return _impl_.type_.approximate_percentile_;
-}
-inline ::io::deephaven::proto::backplane::grpc::AggSpec_AggSpecApproximatePercentile* AggSpec::mutable_approximate_percentile() ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  ::io::deephaven::proto::backplane::grpc::AggSpec_AggSpecApproximatePercentile* _msg = _internal_mutable_approximate_percentile();
-  // @@protoc_insertion_point(field_mutable:io.deephaven.proto.backplane.grpc.AggSpec.approximate_percentile)
-  return _msg;
-}
-
-// .io.deephaven.proto.backplane.grpc.AggSpec.AggSpecAvg avg = 3;
-inline bool AggSpec::has_avg() const {
-  return type_case() == kAvg;
-}
-inline bool AggSpec::_internal_has_avg() const {
-  return type_case() == kAvg;
-}
-inline void AggSpec::set_has_avg() {
-  _impl_._oneof_case_[0] = kAvg;
-}
-inline void AggSpec::clear_avg() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  if (type_case() == kAvg) {
-    if (GetArena() == nullptr) {
-      delete _impl_.type_.avg_;
-    }
-    clear_has_type();
-  }
-}
-inline ::io::deephaven::proto::backplane::grpc::AggSpec_AggSpecAvg* AggSpec::release_avg() {
-  // @@protoc_insertion_point(field_release:io.deephaven.proto.backplane.grpc.AggSpec.avg)
-  if (type_case() == kAvg) {
-    clear_has_type();
-    auto* temp = _impl_.type_.avg_;
-    if (GetArena() != nullptr) {
-      temp = ::google::protobuf::internal::DuplicateIfNonNull(temp);
-    }
-    _impl_.type_.avg_ = nullptr;
-    return temp;
-  } else {
-    return nullptr;
-  }
-}
-inline const ::io::deephaven::proto::backplane::grpc::AggSpec_AggSpecAvg& AggSpec::_internal_avg() const {
-  return type_case() == kAvg ? *_impl_.type_.avg_ : reinterpret_cast<::io::deephaven::proto::backplane::grpc::AggSpec_AggSpecAvg&>(::io::deephaven::proto::backplane::grpc::_AggSpec_AggSpecAvg_default_instance_);
-}
-inline const ::io::deephaven::proto::backplane::grpc::AggSpec_AggSpecAvg& AggSpec::avg() const ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  // @@protoc_insertion_point(field_get:io.deephaven.proto.backplane.grpc.AggSpec.avg)
-  return _internal_avg();
-}
-inline ::io::deephaven::proto::backplane::grpc::AggSpec_AggSpecAvg* AggSpec::unsafe_arena_release_avg() {
-  // @@protoc_insertion_point(field_unsafe_arena_release:io.deephaven.proto.backplane.grpc.AggSpec.avg)
-  if (type_case() == kAvg) {
-    clear_has_type();
-    auto* temp = _impl_.type_.avg_;
-    _impl_.type_.avg_ = nullptr;
-    return temp;
-  } else {
-    return nullptr;
-  }
-}
-inline void AggSpec::unsafe_arena_set_allocated_avg(::io::deephaven::proto::backplane::grpc::AggSpec_AggSpecAvg* value) {
-  // We rely on the oneof clear method to free the earlier contents
-  // of this oneof. We can directly use the pointer we're given to
-  // set the new value.
-  clear_type();
-  if (value) {
-    set_has_avg();
-    _impl_.type_.avg_ = value;
-  }
-  // @@protoc_insertion_point(field_unsafe_arena_set_allocated:io.deephaven.proto.backplane.grpc.AggSpec.avg)
-}
-inline ::io::deephaven::proto::backplane::grpc::AggSpec_AggSpecAvg* AggSpec::_internal_mutable_avg() {
-  if (type_case() != kAvg) {
-    clear_type();
-    set_has_avg();
-    _impl_.type_.avg_ = CreateMaybeMessage<::io::deephaven::proto::backplane::grpc::AggSpec_AggSpecAvg>(GetArena());
-  }
-  return _impl_.type_.avg_;
-}
-inline ::io::deephaven::proto::backplane::grpc::AggSpec_AggSpecAvg* AggSpec::mutable_avg() ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  ::io::deephaven::proto::backplane::grpc::AggSpec_AggSpecAvg* _msg = _internal_mutable_avg();
-  // @@protoc_insertion_point(field_mutable:io.deephaven.proto.backplane.grpc.AggSpec.avg)
-  return _msg;
-}
-
-// .io.deephaven.proto.backplane.grpc.AggSpec.AggSpecCountDistinct count_distinct = 4;
-inline bool AggSpec::has_count_distinct() const {
-  return type_case() == kCountDistinct;
-}
-inline bool AggSpec::_internal_has_count_distinct() const {
-  return type_case() == kCountDistinct;
-}
-inline void AggSpec::set_has_count_distinct() {
-  _impl_._oneof_case_[0] = kCountDistinct;
-}
-inline void AggSpec::clear_count_distinct() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  if (type_case() == kCountDistinct) {
-    if (GetArena() == nullptr) {
-      delete _impl_.type_.count_distinct_;
-    }
-    clear_has_type();
-  }
-}
-inline ::io::deephaven::proto::backplane::grpc::AggSpec_AggSpecCountDistinct* AggSpec::release_count_distinct() {
-  // @@protoc_insertion_point(field_release:io.deephaven.proto.backplane.grpc.AggSpec.count_distinct)
-  if (type_case() == kCountDistinct) {
-    clear_has_type();
-    auto* temp = _impl_.type_.count_distinct_;
-    if (GetArena() != nullptr) {
-      temp = ::google::protobuf::internal::DuplicateIfNonNull(temp);
-    }
-    _impl_.type_.count_distinct_ = nullptr;
-    return temp;
-  } else {
-    return nullptr;
-  }
-}
-inline const ::io::deephaven::proto::backplane::grpc::AggSpec_AggSpecCountDistinct& AggSpec::_internal_count_distinct() const {
-  return type_case() == kCountDistinct ? *_impl_.type_.count_distinct_ : reinterpret_cast<::io::deephaven::proto::backplane::grpc::AggSpec_AggSpecCountDistinct&>(::io::deephaven::proto::backplane::grpc::_AggSpec_AggSpecCountDistinct_default_instance_);
-}
-inline const ::io::deephaven::proto::backplane::grpc::AggSpec_AggSpecCountDistinct& AggSpec::count_distinct() const ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  // @@protoc_insertion_point(field_get:io.deephaven.proto.backplane.grpc.AggSpec.count_distinct)
-  return _internal_count_distinct();
-}
-inline ::io::deephaven::proto::backplane::grpc::AggSpec_AggSpecCountDistinct* AggSpec::unsafe_arena_release_count_distinct() {
-  // @@protoc_insertion_point(field_unsafe_arena_release:io.deephaven.proto.backplane.grpc.AggSpec.count_distinct)
-  if (type_case() == kCountDistinct) {
-    clear_has_type();
-    auto* temp = _impl_.type_.count_distinct_;
-    _impl_.type_.count_distinct_ = nullptr;
-    return temp;
-  } else {
-    return nullptr;
-  }
-}
-inline void AggSpec::unsafe_arena_set_allocated_count_distinct(::io::deephaven::proto::backplane::grpc::AggSpec_AggSpecCountDistinct* value) {
-  // We rely on the oneof clear method to free the earlier contents
-  // of this oneof. We can directly use the pointer we're given to
-  // set the new value.
-  clear_type();
-  if (value) {
-    set_has_count_distinct();
-    _impl_.type_.count_distinct_ = value;
-  }
-  // @@protoc_insertion_point(field_unsafe_arena_set_allocated:io.deephaven.proto.backplane.grpc.AggSpec.count_distinct)
-}
-inline ::io::deephaven::proto::backplane::grpc::AggSpec_AggSpecCountDistinct* AggSpec::_internal_mutable_count_distinct() {
-  if (type_case() != kCountDistinct) {
-    clear_type();
-    set_has_count_distinct();
-    _impl_.type_.count_distinct_ = CreateMaybeMessage<::io::deephaven::proto::backplane::grpc::AggSpec_AggSpecCountDistinct>(GetArena());
-  }
-  return _impl_.type_.count_distinct_;
-}
-inline ::io::deephaven::proto::backplane::grpc::AggSpec_AggSpecCountDistinct* AggSpec::mutable_count_distinct() ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  ::io::deephaven::proto::backplane::grpc::AggSpec_AggSpecCountDistinct* _msg = _internal_mutable_count_distinct();
-  // @@protoc_insertion_point(field_mutable:io.deephaven.proto.backplane.grpc.AggSpec.count_distinct)
-  return _msg;
-}
-
-// .io.deephaven.proto.backplane.grpc.AggSpec.AggSpecDistinct distinct = 5;
-inline bool AggSpec::has_distinct() const {
-  return type_case() == kDistinct;
-}
-inline bool AggSpec::_internal_has_distinct() const {
-  return type_case() == kDistinct;
-}
-inline void AggSpec::set_has_distinct() {
-  _impl_._oneof_case_[0] = kDistinct;
-}
-inline void AggSpec::clear_distinct() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  if (type_case() == kDistinct) {
-    if (GetArena() == nullptr) {
-      delete _impl_.type_.distinct_;
-    }
-    clear_has_type();
-  }
-}
-inline ::io::deephaven::proto::backplane::grpc::AggSpec_AggSpecDistinct* AggSpec::release_distinct() {
-  // @@protoc_insertion_point(field_release:io.deephaven.proto.backplane.grpc.AggSpec.distinct)
-  if (type_case() == kDistinct) {
-    clear_has_type();
-    auto* temp = _impl_.type_.distinct_;
-    if (GetArena() != nullptr) {
-      temp = ::google::protobuf::internal::DuplicateIfNonNull(temp);
-    }
-    _impl_.type_.distinct_ = nullptr;
-    return temp;
-  } else {
-    return nullptr;
-  }
-}
-inline const ::io::deephaven::proto::backplane::grpc::AggSpec_AggSpecDistinct& AggSpec::_internal_distinct() const {
-  return type_case() == kDistinct ? *_impl_.type_.distinct_ : reinterpret_cast<::io::deephaven::proto::backplane::grpc::AggSpec_AggSpecDistinct&>(::io::deephaven::proto::backplane::grpc::_AggSpec_AggSpecDistinct_default_instance_);
-}
-inline const ::io::deephaven::proto::backplane::grpc::AggSpec_AggSpecDistinct& AggSpec::distinct() const ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  // @@protoc_insertion_point(field_get:io.deephaven.proto.backplane.grpc.AggSpec.distinct)
-  return _internal_distinct();
-}
-inline ::io::deephaven::proto::backplane::grpc::AggSpec_AggSpecDistinct* AggSpec::unsafe_arena_release_distinct() {
-  // @@protoc_insertion_point(field_unsafe_arena_release:io.deephaven.proto.backplane.grpc.AggSpec.distinct)
-  if (type_case() == kDistinct) {
-    clear_has_type();
-    auto* temp = _impl_.type_.distinct_;
-    _impl_.type_.distinct_ = nullptr;
-    return temp;
-  } else {
-    return nullptr;
-  }
-}
-inline void AggSpec::unsafe_arena_set_allocated_distinct(::io::deephaven::proto::backplane::grpc::AggSpec_AggSpecDistinct* value) {
-  // We rely on the oneof clear method to free the earlier contents
-  // of this oneof. We can directly use the pointer we're given to
-  // set the new value.
-  clear_type();
-  if (value) {
-    set_has_distinct();
-    _impl_.type_.distinct_ = value;
-  }
-  // @@protoc_insertion_point(field_unsafe_arena_set_allocated:io.deephaven.proto.backplane.grpc.AggSpec.distinct)
-}
-inline ::io::deephaven::proto::backplane::grpc::AggSpec_AggSpecDistinct* AggSpec::_internal_mutable_distinct() {
-  if (type_case() != kDistinct) {
-    clear_type();
-    set_has_distinct();
-    _impl_.type_.distinct_ = CreateMaybeMessage<::io::deephaven::proto::backplane::grpc::AggSpec_AggSpecDistinct>(GetArena());
-  }
-  return _impl_.type_.distinct_;
-}
-inline ::io::deephaven::proto::backplane::grpc::AggSpec_AggSpecDistinct* AggSpec::mutable_distinct() ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  ::io::deephaven::proto::backplane::grpc::AggSpec_AggSpecDistinct* _msg = _internal_mutable_distinct();
-  // @@protoc_insertion_point(field_mutable:io.deephaven.proto.backplane.grpc.AggSpec.distinct)
-  return _msg;
-}
-
-// .io.deephaven.proto.backplane.grpc.AggSpec.AggSpecFirst first = 6;
-inline bool AggSpec::has_first() const {
-  return type_case() == kFirst;
-}
-inline bool AggSpec::_internal_has_first() const {
-  return type_case() == kFirst;
-}
-inline void AggSpec::set_has_first() {
-  _impl_._oneof_case_[0] = kFirst;
-}
-inline void AggSpec::clear_first() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  if (type_case() == kFirst) {
-    if (GetArena() == nullptr) {
-      delete _impl_.type_.first_;
-    }
-    clear_has_type();
-  }
-}
-inline ::io::deephaven::proto::backplane::grpc::AggSpec_AggSpecFirst* AggSpec::release_first() {
-  // @@protoc_insertion_point(field_release:io.deephaven.proto.backplane.grpc.AggSpec.first)
-  if (type_case() == kFirst) {
-    clear_has_type();
-    auto* temp = _impl_.type_.first_;
-    if (GetArena() != nullptr) {
-      temp = ::google::protobuf::internal::DuplicateIfNonNull(temp);
-    }
-    _impl_.type_.first_ = nullptr;
-    return temp;
-  } else {
-    return nullptr;
-  }
-}
-inline const ::io::deephaven::proto::backplane::grpc::AggSpec_AggSpecFirst& AggSpec::_internal_first() const {
-  return type_case() == kFirst ? *_impl_.type_.first_ : reinterpret_cast<::io::deephaven::proto::backplane::grpc::AggSpec_AggSpecFirst&>(::io::deephaven::proto::backplane::grpc::_AggSpec_AggSpecFirst_default_instance_);
-}
-inline const ::io::deephaven::proto::backplane::grpc::AggSpec_AggSpecFirst& AggSpec::first() const ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  // @@protoc_insertion_point(field_get:io.deephaven.proto.backplane.grpc.AggSpec.first)
-  return _internal_first();
-}
-inline ::io::deephaven::proto::backplane::grpc::AggSpec_AggSpecFirst* AggSpec::unsafe_arena_release_first() {
-  // @@protoc_insertion_point(field_unsafe_arena_release:io.deephaven.proto.backplane.grpc.AggSpec.first)
-  if (type_case() == kFirst) {
-    clear_has_type();
-    auto* temp = _impl_.type_.first_;
-    _impl_.type_.first_ = nullptr;
-    return temp;
-  } else {
-    return nullptr;
-  }
-}
-inline void AggSpec::unsafe_arena_set_allocated_first(::io::deephaven::proto::backplane::grpc::AggSpec_AggSpecFirst* value) {
-  // We rely on the oneof clear method to free the earlier contents
-  // of this oneof. We can directly use the pointer we're given to
-  // set the new value.
-  clear_type();
-  if (value) {
-    set_has_first();
-    _impl_.type_.first_ = value;
-  }
-  // @@protoc_insertion_point(field_unsafe_arena_set_allocated:io.deephaven.proto.backplane.grpc.AggSpec.first)
-}
-inline ::io::deephaven::proto::backplane::grpc::AggSpec_AggSpecFirst* AggSpec::_internal_mutable_first() {
-  if (type_case() != kFirst) {
-    clear_type();
-    set_has_first();
-    _impl_.type_.first_ = CreateMaybeMessage<::io::deephaven::proto::backplane::grpc::AggSpec_AggSpecFirst>(GetArena());
-  }
-  return _impl_.type_.first_;
-}
-inline ::io::deephaven::proto::backplane::grpc::AggSpec_AggSpecFirst* AggSpec::mutable_first() ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  ::io::deephaven::proto::backplane::grpc::AggSpec_AggSpecFirst* _msg = _internal_mutable_first();
-  // @@protoc_insertion_point(field_mutable:io.deephaven.proto.backplane.grpc.AggSpec.first)
-  return _msg;
-}
-
-// .io.deephaven.proto.backplane.grpc.AggSpec.AggSpecFormula formula = 7;
-inline bool AggSpec::has_formula() const {
-  return type_case() == kFormula;
-}
-inline bool AggSpec::_internal_has_formula() const {
-  return type_case() == kFormula;
-}
-inline void AggSpec::set_has_formula() {
-  _impl_._oneof_case_[0] = kFormula;
-}
-inline void AggSpec::clear_formula() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  if (type_case() == kFormula) {
-    if (GetArena() == nullptr) {
-      delete _impl_.type_.formula_;
-    }
-    clear_has_type();
-  }
-}
-inline ::io::deephaven::proto::backplane::grpc::AggSpec_AggSpecFormula* AggSpec::release_formula() {
-  // @@protoc_insertion_point(field_release:io.deephaven.proto.backplane.grpc.AggSpec.formula)
-  if (type_case() == kFormula) {
-    clear_has_type();
-    auto* temp = _impl_.type_.formula_;
-    if (GetArena() != nullptr) {
-      temp = ::google::protobuf::internal::DuplicateIfNonNull(temp);
-    }
-    _impl_.type_.formula_ = nullptr;
-    return temp;
-  } else {
-    return nullptr;
-  }
-}
-inline const ::io::deephaven::proto::backplane::grpc::AggSpec_AggSpecFormula& AggSpec::_internal_formula() const {
-  return type_case() == kFormula ? *_impl_.type_.formula_ : reinterpret_cast<::io::deephaven::proto::backplane::grpc::AggSpec_AggSpecFormula&>(::io::deephaven::proto::backplane::grpc::_AggSpec_AggSpecFormula_default_instance_);
-}
-inline const ::io::deephaven::proto::backplane::grpc::AggSpec_AggSpecFormula& AggSpec::formula() const ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  // @@protoc_insertion_point(field_get:io.deephaven.proto.backplane.grpc.AggSpec.formula)
-  return _internal_formula();
-}
-inline ::io::deephaven::proto::backplane::grpc::AggSpec_AggSpecFormula* AggSpec::unsafe_arena_release_formula() {
-  // @@protoc_insertion_point(field_unsafe_arena_release:io.deephaven.proto.backplane.grpc.AggSpec.formula)
-  if (type_case() == kFormula) {
-    clear_has_type();
-    auto* temp = _impl_.type_.formula_;
-    _impl_.type_.formula_ = nullptr;
-    return temp;
-  } else {
-    return nullptr;
-  }
-}
-inline void AggSpec::unsafe_arena_set_allocated_formula(::io::deephaven::proto::backplane::grpc::AggSpec_AggSpecFormula* value) {
-  // We rely on the oneof clear method to free the earlier contents
-  // of this oneof. We can directly use the pointer we're given to
-  // set the new value.
-  clear_type();
-  if (value) {
-    set_has_formula();
-    _impl_.type_.formula_ = value;
-  }
-  // @@protoc_insertion_point(field_unsafe_arena_set_allocated:io.deephaven.proto.backplane.grpc.AggSpec.formula)
-}
-inline ::io::deephaven::proto::backplane::grpc::AggSpec_AggSpecFormula* AggSpec::_internal_mutable_formula() {
-  if (type_case() != kFormula) {
-    clear_type();
-    set_has_formula();
-    _impl_.type_.formula_ = CreateMaybeMessage<::io::deephaven::proto::backplane::grpc::AggSpec_AggSpecFormula>(GetArena());
-  }
-  return _impl_.type_.formula_;
-}
-inline ::io::deephaven::proto::backplane::grpc::AggSpec_AggSpecFormula* AggSpec::mutable_formula() ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  ::io::deephaven::proto::backplane::grpc::AggSpec_AggSpecFormula* _msg = _internal_mutable_formula();
-  // @@protoc_insertion_point(field_mutable:io.deephaven.proto.backplane.grpc.AggSpec.formula)
-  return _msg;
-}
-
-// .io.deephaven.proto.backplane.grpc.AggSpec.AggSpecFreeze freeze = 8;
-inline bool AggSpec::has_freeze() const {
-  return type_case() == kFreeze;
-}
-inline bool AggSpec::_internal_has_freeze() const {
-  return type_case() == kFreeze;
-}
-inline void AggSpec::set_has_freeze() {
-  _impl_._oneof_case_[0] = kFreeze;
-}
-inline void AggSpec::clear_freeze() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  if (type_case() == kFreeze) {
-    if (GetArena() == nullptr) {
-      delete _impl_.type_.freeze_;
-    }
-    clear_has_type();
-  }
-}
-inline ::io::deephaven::proto::backplane::grpc::AggSpec_AggSpecFreeze* AggSpec::release_freeze() {
-  // @@protoc_insertion_point(field_release:io.deephaven.proto.backplane.grpc.AggSpec.freeze)
-  if (type_case() == kFreeze) {
-    clear_has_type();
-    auto* temp = _impl_.type_.freeze_;
-    if (GetArena() != nullptr) {
-      temp = ::google::protobuf::internal::DuplicateIfNonNull(temp);
-    }
-    _impl_.type_.freeze_ = nullptr;
-    return temp;
-  } else {
-    return nullptr;
-  }
-}
-inline const ::io::deephaven::proto::backplane::grpc::AggSpec_AggSpecFreeze& AggSpec::_internal_freeze() const {
-  return type_case() == kFreeze ? *_impl_.type_.freeze_ : reinterpret_cast<::io::deephaven::proto::backplane::grpc::AggSpec_AggSpecFreeze&>(::io::deephaven::proto::backplane::grpc::_AggSpec_AggSpecFreeze_default_instance_);
-}
-inline const ::io::deephaven::proto::backplane::grpc::AggSpec_AggSpecFreeze& AggSpec::freeze() const ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  // @@protoc_insertion_point(field_get:io.deephaven.proto.backplane.grpc.AggSpec.freeze)
-  return _internal_freeze();
-}
-inline ::io::deephaven::proto::backplane::grpc::AggSpec_AggSpecFreeze* AggSpec::unsafe_arena_release_freeze() {
-  // @@protoc_insertion_point(field_unsafe_arena_release:io.deephaven.proto.backplane.grpc.AggSpec.freeze)
-  if (type_case() == kFreeze) {
-    clear_has_type();
-    auto* temp = _impl_.type_.freeze_;
-    _impl_.type_.freeze_ = nullptr;
-    return temp;
-  } else {
-    return nullptr;
-  }
-}
-inline void AggSpec::unsafe_arena_set_allocated_freeze(::io::deephaven::proto::backplane::grpc::AggSpec_AggSpecFreeze* value) {
-  // We rely on the oneof clear method to free the earlier contents
-  // of this oneof. We can directly use the pointer we're given to
-  // set the new value.
-  clear_type();
-  if (value) {
-    set_has_freeze();
-    _impl_.type_.freeze_ = value;
-  }
-  // @@protoc_insertion_point(field_unsafe_arena_set_allocated:io.deephaven.proto.backplane.grpc.AggSpec.freeze)
-}
-inline ::io::deephaven::proto::backplane::grpc::AggSpec_AggSpecFreeze* AggSpec::_internal_mutable_freeze() {
-  if (type_case() != kFreeze) {
-    clear_type();
-    set_has_freeze();
-    _impl_.type_.freeze_ = CreateMaybeMessage<::io::deephaven::proto::backplane::grpc::AggSpec_AggSpecFreeze>(GetArena());
-  }
-  return _impl_.type_.freeze_;
-}
-inline ::io::deephaven::proto::backplane::grpc::AggSpec_AggSpecFreeze* AggSpec::mutable_freeze() ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  ::io::deephaven::proto::backplane::grpc::AggSpec_AggSpecFreeze* _msg = _internal_mutable_freeze();
-  // @@protoc_insertion_point(field_mutable:io.deephaven.proto.backplane.grpc.AggSpec.freeze)
-  return _msg;
-}
-
-// .io.deephaven.proto.backplane.grpc.AggSpec.AggSpecGroup group = 9;
-inline bool AggSpec::has_group() const {
-  return type_case() == kGroup;
-}
-inline bool AggSpec::_internal_has_group() const {
-  return type_case() == kGroup;
-}
-inline void AggSpec::set_has_group() {
-  _impl_._oneof_case_[0] = kGroup;
-}
-inline void AggSpec::clear_group() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  if (type_case() == kGroup) {
-    if (GetArena() == nullptr) {
-      delete _impl_.type_.group_;
-    }
-    clear_has_type();
-  }
-}
-inline ::io::deephaven::proto::backplane::grpc::AggSpec_AggSpecGroup* AggSpec::release_group() {
-  // @@protoc_insertion_point(field_release:io.deephaven.proto.backplane.grpc.AggSpec.group)
-  if (type_case() == kGroup) {
-    clear_has_type();
-    auto* temp = _impl_.type_.group_;
-    if (GetArena() != nullptr) {
-      temp = ::google::protobuf::internal::DuplicateIfNonNull(temp);
-    }
-    _impl_.type_.group_ = nullptr;
-    return temp;
-  } else {
-    return nullptr;
-  }
-}
-inline const ::io::deephaven::proto::backplane::grpc::AggSpec_AggSpecGroup& AggSpec::_internal_group() const {
-  return type_case() == kGroup ? *_impl_.type_.group_ : reinterpret_cast<::io::deephaven::proto::backplane::grpc::AggSpec_AggSpecGroup&>(::io::deephaven::proto::backplane::grpc::_AggSpec_AggSpecGroup_default_instance_);
-}
-inline const ::io::deephaven::proto::backplane::grpc::AggSpec_AggSpecGroup& AggSpec::group() const ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  // @@protoc_insertion_point(field_get:io.deephaven.proto.backplane.grpc.AggSpec.group)
-  return _internal_group();
-}
-inline ::io::deephaven::proto::backplane::grpc::AggSpec_AggSpecGroup* AggSpec::unsafe_arena_release_group() {
-  // @@protoc_insertion_point(field_unsafe_arena_release:io.deephaven.proto.backplane.grpc.AggSpec.group)
-  if (type_case() == kGroup) {
-    clear_has_type();
-    auto* temp = _impl_.type_.group_;
-    _impl_.type_.group_ = nullptr;
-    return temp;
-  } else {
-    return nullptr;
-  }
-}
-inline void AggSpec::unsafe_arena_set_allocated_group(::io::deephaven::proto::backplane::grpc::AggSpec_AggSpecGroup* value) {
-  // We rely on the oneof clear method to free the earlier contents
-  // of this oneof. We can directly use the pointer we're given to
-  // set the new value.
-  clear_type();
-  if (value) {
-    set_has_group();
-    _impl_.type_.group_ = value;
-  }
-  // @@protoc_insertion_point(field_unsafe_arena_set_allocated:io.deephaven.proto.backplane.grpc.AggSpec.group)
-}
-inline ::io::deephaven::proto::backplane::grpc::AggSpec_AggSpecGroup* AggSpec::_internal_mutable_group() {
-  if (type_case() != kGroup) {
-    clear_type();
-    set_has_group();
-    _impl_.type_.group_ = CreateMaybeMessage<::io::deephaven::proto::backplane::grpc::AggSpec_AggSpecGroup>(GetArena());
-  }
-  return _impl_.type_.group_;
-}
-inline ::io::deephaven::proto::backplane::grpc::AggSpec_AggSpecGroup* AggSpec::mutable_group() ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  ::io::deephaven::proto::backplane::grpc::AggSpec_AggSpecGroup* _msg = _internal_mutable_group();
-  // @@protoc_insertion_point(field_mutable:io.deephaven.proto.backplane.grpc.AggSpec.group)
-  return _msg;
-}
-
-// .io.deephaven.proto.backplane.grpc.AggSpec.AggSpecLast last = 10;
-inline bool AggSpec::has_last() const {
-  return type_case() == kLast;
-}
-inline bool AggSpec::_internal_has_last() const {
-  return type_case() == kLast;
-}
-inline void AggSpec::set_has_last() {
-  _impl_._oneof_case_[0] = kLast;
-}
-inline void AggSpec::clear_last() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  if (type_case() == kLast) {
-    if (GetArena() == nullptr) {
-      delete _impl_.type_.last_;
-    }
-    clear_has_type();
-  }
-}
-inline ::io::deephaven::proto::backplane::grpc::AggSpec_AggSpecLast* AggSpec::release_last() {
-  // @@protoc_insertion_point(field_release:io.deephaven.proto.backplane.grpc.AggSpec.last)
-  if (type_case() == kLast) {
-    clear_has_type();
-    auto* temp = _impl_.type_.last_;
-    if (GetArena() != nullptr) {
-      temp = ::google::protobuf::internal::DuplicateIfNonNull(temp);
-    }
-    _impl_.type_.last_ = nullptr;
-    return temp;
-  } else {
-    return nullptr;
-  }
-}
-inline const ::io::deephaven::proto::backplane::grpc::AggSpec_AggSpecLast& AggSpec::_internal_last() const {
-  return type_case() == kLast ? *_impl_.type_.last_ : reinterpret_cast<::io::deephaven::proto::backplane::grpc::AggSpec_AggSpecLast&>(::io::deephaven::proto::backplane::grpc::_AggSpec_AggSpecLast_default_instance_);
-}
-inline const ::io::deephaven::proto::backplane::grpc::AggSpec_AggSpecLast& AggSpec::last() const ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  // @@protoc_insertion_point(field_get:io.deephaven.proto.backplane.grpc.AggSpec.last)
-  return _internal_last();
-}
-inline ::io::deephaven::proto::backplane::grpc::AggSpec_AggSpecLast* AggSpec::unsafe_arena_release_last() {
-  // @@protoc_insertion_point(field_unsafe_arena_release:io.deephaven.proto.backplane.grpc.AggSpec.last)
-  if (type_case() == kLast) {
-    clear_has_type();
-    auto* temp = _impl_.type_.last_;
-    _impl_.type_.last_ = nullptr;
-    return temp;
-  } else {
-    return nullptr;
-  }
-}
-inline void AggSpec::unsafe_arena_set_allocated_last(::io::deephaven::proto::backplane::grpc::AggSpec_AggSpecLast* value) {
-  // We rely on the oneof clear method to free the earlier contents
-  // of this oneof. We can directly use the pointer we're given to
-  // set the new value.
-  clear_type();
-  if (value) {
-    set_has_last();
-    _impl_.type_.last_ = value;
-  }
-  // @@protoc_insertion_point(field_unsafe_arena_set_allocated:io.deephaven.proto.backplane.grpc.AggSpec.last)
-}
-inline ::io::deephaven::proto::backplane::grpc::AggSpec_AggSpecLast* AggSpec::_internal_mutable_last() {
-  if (type_case() != kLast) {
-    clear_type();
-    set_has_last();
-    _impl_.type_.last_ = CreateMaybeMessage<::io::deephaven::proto::backplane::grpc::AggSpec_AggSpecLast>(GetArena());
-  }
-  return _impl_.type_.last_;
-}
-inline ::io::deephaven::proto::backplane::grpc::AggSpec_AggSpecLast* AggSpec::mutable_last() ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  ::io::deephaven::proto::backplane::grpc::AggSpec_AggSpecLast* _msg = _internal_mutable_last();
-  // @@protoc_insertion_point(field_mutable:io.deephaven.proto.backplane.grpc.AggSpec.last)
-  return _msg;
-}
-
-// .io.deephaven.proto.backplane.grpc.AggSpec.AggSpecMax max = 11;
-inline bool AggSpec::has_max() const {
-  return type_case() == kMax;
-}
-inline bool AggSpec::_internal_has_max() const {
-  return type_case() == kMax;
-}
-inline void AggSpec::set_has_max() {
-  _impl_._oneof_case_[0] = kMax;
-}
-inline void AggSpec::clear_max() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  if (type_case() == kMax) {
-    if (GetArena() == nullptr) {
-      delete _impl_.type_.max_;
-    }
-    clear_has_type();
-  }
-}
-inline ::io::deephaven::proto::backplane::grpc::AggSpec_AggSpecMax* AggSpec::release_max() {
-  // @@protoc_insertion_point(field_release:io.deephaven.proto.backplane.grpc.AggSpec.max)
-  if (type_case() == kMax) {
-    clear_has_type();
-    auto* temp = _impl_.type_.max_;
-    if (GetArena() != nullptr) {
-      temp = ::google::protobuf::internal::DuplicateIfNonNull(temp);
-    }
-    _impl_.type_.max_ = nullptr;
-    return temp;
-  } else {
-    return nullptr;
-  }
-}
-inline const ::io::deephaven::proto::backplane::grpc::AggSpec_AggSpecMax& AggSpec::_internal_max() const {
-  return type_case() == kMax ? *_impl_.type_.max_ : reinterpret_cast<::io::deephaven::proto::backplane::grpc::AggSpec_AggSpecMax&>(::io::deephaven::proto::backplane::grpc::_AggSpec_AggSpecMax_default_instance_);
-}
-inline const ::io::deephaven::proto::backplane::grpc::AggSpec_AggSpecMax& AggSpec::max() const ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  // @@protoc_insertion_point(field_get:io.deephaven.proto.backplane.grpc.AggSpec.max)
-  return _internal_max();
-}
-inline ::io::deephaven::proto::backplane::grpc::AggSpec_AggSpecMax* AggSpec::unsafe_arena_release_max() {
-  // @@protoc_insertion_point(field_unsafe_arena_release:io.deephaven.proto.backplane.grpc.AggSpec.max)
-  if (type_case() == kMax) {
-    clear_has_type();
-    auto* temp = _impl_.type_.max_;
-    _impl_.type_.max_ = nullptr;
-    return temp;
-  } else {
-    return nullptr;
-  }
-}
-inline void AggSpec::unsafe_arena_set_allocated_max(::io::deephaven::proto::backplane::grpc::AggSpec_AggSpecMax* value) {
-  // We rely on the oneof clear method to free the earlier contents
-  // of this oneof. We can directly use the pointer we're given to
-  // set the new value.
-  clear_type();
-  if (value) {
-    set_has_max();
-    _impl_.type_.max_ = value;
-  }
-  // @@protoc_insertion_point(field_unsafe_arena_set_allocated:io.deephaven.proto.backplane.grpc.AggSpec.max)
-}
-inline ::io::deephaven::proto::backplane::grpc::AggSpec_AggSpecMax* AggSpec::_internal_mutable_max() {
-  if (type_case() != kMax) {
-    clear_type();
-    set_has_max();
-    _impl_.type_.max_ = CreateMaybeMessage<::io::deephaven::proto::backplane::grpc::AggSpec_AggSpecMax>(GetArena());
-  }
-  return _impl_.type_.max_;
-}
-inline ::io::deephaven::proto::backplane::grpc::AggSpec_AggSpecMax* AggSpec::mutable_max() ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  ::io::deephaven::proto::backplane::grpc::AggSpec_AggSpecMax* _msg = _internal_mutable_max();
-  // @@protoc_insertion_point(field_mutable:io.deephaven.proto.backplane.grpc.AggSpec.max)
-  return _msg;
-}
-
-// .io.deephaven.proto.backplane.grpc.AggSpec.AggSpecMedian median = 12;
-inline bool AggSpec::has_median() const {
-  return type_case() == kMedian;
-}
-inline bool AggSpec::_internal_has_median() const {
-  return type_case() == kMedian;
-}
-inline void AggSpec::set_has_median() {
-  _impl_._oneof_case_[0] = kMedian;
-}
-inline void AggSpec::clear_median() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  if (type_case() == kMedian) {
-    if (GetArena() == nullptr) {
-      delete _impl_.type_.median_;
-    }
-    clear_has_type();
-  }
-}
-inline ::io::deephaven::proto::backplane::grpc::AggSpec_AggSpecMedian* AggSpec::release_median() {
-  // @@protoc_insertion_point(field_release:io.deephaven.proto.backplane.grpc.AggSpec.median)
-  if (type_case() == kMedian) {
-    clear_has_type();
-    auto* temp = _impl_.type_.median_;
-    if (GetArena() != nullptr) {
-      temp = ::google::protobuf::internal::DuplicateIfNonNull(temp);
-    }
-    _impl_.type_.median_ = nullptr;
-    return temp;
-  } else {
-    return nullptr;
-  }
-}
-inline const ::io::deephaven::proto::backplane::grpc::AggSpec_AggSpecMedian& AggSpec::_internal_median() const {
-  return type_case() == kMedian ? *_impl_.type_.median_ : reinterpret_cast<::io::deephaven::proto::backplane::grpc::AggSpec_AggSpecMedian&>(::io::deephaven::proto::backplane::grpc::_AggSpec_AggSpecMedian_default_instance_);
-}
-inline const ::io::deephaven::proto::backplane::grpc::AggSpec_AggSpecMedian& AggSpec::median() const ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  // @@protoc_insertion_point(field_get:io.deephaven.proto.backplane.grpc.AggSpec.median)
-  return _internal_median();
-}
-inline ::io::deephaven::proto::backplane::grpc::AggSpec_AggSpecMedian* AggSpec::unsafe_arena_release_median() {
-  // @@protoc_insertion_point(field_unsafe_arena_release:io.deephaven.proto.backplane.grpc.AggSpec.median)
-  if (type_case() == kMedian) {
-    clear_has_type();
-    auto* temp = _impl_.type_.median_;
-    _impl_.type_.median_ = nullptr;
-    return temp;
-  } else {
-    return nullptr;
-  }
-}
-inline void AggSpec::unsafe_arena_set_allocated_median(::io::deephaven::proto::backplane::grpc::AggSpec_AggSpecMedian* value) {
-  // We rely on the oneof clear method to free the earlier contents
-  // of this oneof. We can directly use the pointer we're given to
-  // set the new value.
-  clear_type();
-  if (value) {
-    set_has_median();
-    _impl_.type_.median_ = value;
-  }
-  // @@protoc_insertion_point(field_unsafe_arena_set_allocated:io.deephaven.proto.backplane.grpc.AggSpec.median)
-}
-inline ::io::deephaven::proto::backplane::grpc::AggSpec_AggSpecMedian* AggSpec::_internal_mutable_median() {
-  if (type_case() != kMedian) {
-    clear_type();
-    set_has_median();
-    _impl_.type_.median_ = CreateMaybeMessage<::io::deephaven::proto::backplane::grpc::AggSpec_AggSpecMedian>(GetArena());
-  }
-  return _impl_.type_.median_;
-}
-inline ::io::deephaven::proto::backplane::grpc::AggSpec_AggSpecMedian* AggSpec::mutable_median() ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  ::io::deephaven::proto::backplane::grpc::AggSpec_AggSpecMedian* _msg = _internal_mutable_median();
-  // @@protoc_insertion_point(field_mutable:io.deephaven.proto.backplane.grpc.AggSpec.median)
-  return _msg;
-}
-
-// .io.deephaven.proto.backplane.grpc.AggSpec.AggSpecMin min = 13;
-inline bool AggSpec::has_min() const {
-  return type_case() == kMin;
-}
-inline bool AggSpec::_internal_has_min() const {
-  return type_case() == kMin;
-}
-inline void AggSpec::set_has_min() {
-  _impl_._oneof_case_[0] = kMin;
-}
-inline void AggSpec::clear_min() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  if (type_case() == kMin) {
-    if (GetArena() == nullptr) {
-      delete _impl_.type_.min_;
-    }
-    clear_has_type();
-  }
-}
-inline ::io::deephaven::proto::backplane::grpc::AggSpec_AggSpecMin* AggSpec::release_min() {
-  // @@protoc_insertion_point(field_release:io.deephaven.proto.backplane.grpc.AggSpec.min)
-  if (type_case() == kMin) {
-    clear_has_type();
-    auto* temp = _impl_.type_.min_;
-    if (GetArena() != nullptr) {
-      temp = ::google::protobuf::internal::DuplicateIfNonNull(temp);
-    }
-    _impl_.type_.min_ = nullptr;
-    return temp;
-  } else {
-    return nullptr;
-  }
-}
-inline const ::io::deephaven::proto::backplane::grpc::AggSpec_AggSpecMin& AggSpec::_internal_min() const {
-  return type_case() == kMin ? *_impl_.type_.min_ : reinterpret_cast<::io::deephaven::proto::backplane::grpc::AggSpec_AggSpecMin&>(::io::deephaven::proto::backplane::grpc::_AggSpec_AggSpecMin_default_instance_);
-}
-inline const ::io::deephaven::proto::backplane::grpc::AggSpec_AggSpecMin& AggSpec::min() const ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  // @@protoc_insertion_point(field_get:io.deephaven.proto.backplane.grpc.AggSpec.min)
-  return _internal_min();
-}
-inline ::io::deephaven::proto::backplane::grpc::AggSpec_AggSpecMin* AggSpec::unsafe_arena_release_min() {
-  // @@protoc_insertion_point(field_unsafe_arena_release:io.deephaven.proto.backplane.grpc.AggSpec.min)
-  if (type_case() == kMin) {
-    clear_has_type();
-    auto* temp = _impl_.type_.min_;
-    _impl_.type_.min_ = nullptr;
-    return temp;
-  } else {
-    return nullptr;
-  }
-}
-inline void AggSpec::unsafe_arena_set_allocated_min(::io::deephaven::proto::backplane::grpc::AggSpec_AggSpecMin* value) {
-  // We rely on the oneof clear method to free the earlier contents
-  // of this oneof. We can directly use the pointer we're given to
-  // set the new value.
-  clear_type();
-  if (value) {
-    set_has_min();
-    _impl_.type_.min_ = value;
-  }
-  // @@protoc_insertion_point(field_unsafe_arena_set_allocated:io.deephaven.proto.backplane.grpc.AggSpec.min)
-}
-inline ::io::deephaven::proto::backplane::grpc::AggSpec_AggSpecMin* AggSpec::_internal_mutable_min() {
-  if (type_case() != kMin) {
-    clear_type();
-    set_has_min();
-    _impl_.type_.min_ = CreateMaybeMessage<::io::deephaven::proto::backplane::grpc::AggSpec_AggSpecMin>(GetArena());
-  }
-  return _impl_.type_.min_;
-}
-inline ::io::deephaven::proto::backplane::grpc::AggSpec_AggSpecMin* AggSpec::mutable_min() ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  ::io::deephaven::proto::backplane::grpc::AggSpec_AggSpecMin* _msg = _internal_mutable_min();
-  // @@protoc_insertion_point(field_mutable:io.deephaven.proto.backplane.grpc.AggSpec.min)
-  return _msg;
-}
-
-// .io.deephaven.proto.backplane.grpc.AggSpec.AggSpecPercentile percentile = 14;
-inline bool AggSpec::has_percentile() const {
-  return type_case() == kPercentile;
-}
-inline bool AggSpec::_internal_has_percentile() const {
-  return type_case() == kPercentile;
-}
-inline void AggSpec::set_has_percentile() {
-  _impl_._oneof_case_[0] = kPercentile;
-}
-inline void AggSpec::clear_percentile() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  if (type_case() == kPercentile) {
-    if (GetArena() == nullptr) {
-      delete _impl_.type_.percentile_;
-    }
-    clear_has_type();
-  }
-}
-inline ::io::deephaven::proto::backplane::grpc::AggSpec_AggSpecPercentile* AggSpec::release_percentile() {
-  // @@protoc_insertion_point(field_release:io.deephaven.proto.backplane.grpc.AggSpec.percentile)
-  if (type_case() == kPercentile) {
-    clear_has_type();
-    auto* temp = _impl_.type_.percentile_;
-    if (GetArena() != nullptr) {
-      temp = ::google::protobuf::internal::DuplicateIfNonNull(temp);
-    }
-    _impl_.type_.percentile_ = nullptr;
-    return temp;
-  } else {
-    return nullptr;
-  }
-}
-inline const ::io::deephaven::proto::backplane::grpc::AggSpec_AggSpecPercentile& AggSpec::_internal_percentile() const {
-  return type_case() == kPercentile ? *_impl_.type_.percentile_ : reinterpret_cast<::io::deephaven::proto::backplane::grpc::AggSpec_AggSpecPercentile&>(::io::deephaven::proto::backplane::grpc::_AggSpec_AggSpecPercentile_default_instance_);
-}
-inline const ::io::deephaven::proto::backplane::grpc::AggSpec_AggSpecPercentile& AggSpec::percentile() const ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  // @@protoc_insertion_point(field_get:io.deephaven.proto.backplane.grpc.AggSpec.percentile)
-  return _internal_percentile();
-}
-inline ::io::deephaven::proto::backplane::grpc::AggSpec_AggSpecPercentile* AggSpec::unsafe_arena_release_percentile() {
-  // @@protoc_insertion_point(field_unsafe_arena_release:io.deephaven.proto.backplane.grpc.AggSpec.percentile)
-  if (type_case() == kPercentile) {
-    clear_has_type();
-    auto* temp = _impl_.type_.percentile_;
-    _impl_.type_.percentile_ = nullptr;
-    return temp;
-  } else {
-    return nullptr;
-  }
-}
-inline void AggSpec::unsafe_arena_set_allocated_percentile(::io::deephaven::proto::backplane::grpc::AggSpec_AggSpecPercentile* value) {
-  // We rely on the oneof clear method to free the earlier contents
-  // of this oneof. We can directly use the pointer we're given to
-  // set the new value.
-  clear_type();
-  if (value) {
-    set_has_percentile();
-    _impl_.type_.percentile_ = value;
-  }
-  // @@protoc_insertion_point(field_unsafe_arena_set_allocated:io.deephaven.proto.backplane.grpc.AggSpec.percentile)
-}
-inline ::io::deephaven::proto::backplane::grpc::AggSpec_AggSpecPercentile* AggSpec::_internal_mutable_percentile() {
-  if (type_case() != kPercentile) {
-    clear_type();
-    set_has_percentile();
-    _impl_.type_.percentile_ = CreateMaybeMessage<::io::deephaven::proto::backplane::grpc::AggSpec_AggSpecPercentile>(GetArena());
-  }
-  return _impl_.type_.percentile_;
-}
-inline ::io::deephaven::proto::backplane::grpc::AggSpec_AggSpecPercentile* AggSpec::mutable_percentile() ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  ::io::deephaven::proto::backplane::grpc::AggSpec_AggSpecPercentile* _msg = _internal_mutable_percentile();
-  // @@protoc_insertion_point(field_mutable:io.deephaven.proto.backplane.grpc.AggSpec.percentile)
-  return _msg;
-}
-
-// .io.deephaven.proto.backplane.grpc.AggSpec.AggSpecSorted sorted_first = 15;
-inline bool AggSpec::has_sorted_first() const {
-  return type_case() == kSortedFirst;
-}
-inline bool AggSpec::_internal_has_sorted_first() const {
-  return type_case() == kSortedFirst;
-}
-inline void AggSpec::set_has_sorted_first() {
-  _impl_._oneof_case_[0] = kSortedFirst;
-}
-inline void AggSpec::clear_sorted_first() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  if (type_case() == kSortedFirst) {
-    if (GetArena() == nullptr) {
-      delete _impl_.type_.sorted_first_;
-    }
-    clear_has_type();
-  }
-}
-inline ::io::deephaven::proto::backplane::grpc::AggSpec_AggSpecSorted* AggSpec::release_sorted_first() {
-  // @@protoc_insertion_point(field_release:io.deephaven.proto.backplane.grpc.AggSpec.sorted_first)
-  if (type_case() == kSortedFirst) {
-    clear_has_type();
-    auto* temp = _impl_.type_.sorted_first_;
-    if (GetArena() != nullptr) {
-      temp = ::google::protobuf::internal::DuplicateIfNonNull(temp);
-    }
-    _impl_.type_.sorted_first_ = nullptr;
-    return temp;
-  } else {
-    return nullptr;
-  }
-}
-inline const ::io::deephaven::proto::backplane::grpc::AggSpec_AggSpecSorted& AggSpec::_internal_sorted_first() const {
-  return type_case() == kSortedFirst ? *_impl_.type_.sorted_first_ : reinterpret_cast<::io::deephaven::proto::backplane::grpc::AggSpec_AggSpecSorted&>(::io::deephaven::proto::backplane::grpc::_AggSpec_AggSpecSorted_default_instance_);
-}
-inline const ::io::deephaven::proto::backplane::grpc::AggSpec_AggSpecSorted& AggSpec::sorted_first() const ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  // @@protoc_insertion_point(field_get:io.deephaven.proto.backplane.grpc.AggSpec.sorted_first)
-  return _internal_sorted_first();
-}
-inline ::io::deephaven::proto::backplane::grpc::AggSpec_AggSpecSorted* AggSpec::unsafe_arena_release_sorted_first() {
-  // @@protoc_insertion_point(field_unsafe_arena_release:io.deephaven.proto.backplane.grpc.AggSpec.sorted_first)
-  if (type_case() == kSortedFirst) {
-    clear_has_type();
-    auto* temp = _impl_.type_.sorted_first_;
-    _impl_.type_.sorted_first_ = nullptr;
-    return temp;
-  } else {
-    return nullptr;
-  }
-}
-inline void AggSpec::unsafe_arena_set_allocated_sorted_first(::io::deephaven::proto::backplane::grpc::AggSpec_AggSpecSorted* value) {
-  // We rely on the oneof clear method to free the earlier contents
-  // of this oneof. We can directly use the pointer we're given to
-  // set the new value.
-  clear_type();
-  if (value) {
-    set_has_sorted_first();
-    _impl_.type_.sorted_first_ = value;
-  }
-  // @@protoc_insertion_point(field_unsafe_arena_set_allocated:io.deephaven.proto.backplane.grpc.AggSpec.sorted_first)
-}
-inline ::io::deephaven::proto::backplane::grpc::AggSpec_AggSpecSorted* AggSpec::_internal_mutable_sorted_first() {
-  if (type_case() != kSortedFirst) {
-    clear_type();
-    set_has_sorted_first();
-    _impl_.type_.sorted_first_ = CreateMaybeMessage<::io::deephaven::proto::backplane::grpc::AggSpec_AggSpecSorted>(GetArena());
-  }
-  return _impl_.type_.sorted_first_;
-}
-inline ::io::deephaven::proto::backplane::grpc::AggSpec_AggSpecSorted* AggSpec::mutable_sorted_first() ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  ::io::deephaven::proto::backplane::grpc::AggSpec_AggSpecSorted* _msg = _internal_mutable_sorted_first();
-  // @@protoc_insertion_point(field_mutable:io.deephaven.proto.backplane.grpc.AggSpec.sorted_first)
-  return _msg;
-}
-
-// .io.deephaven.proto.backplane.grpc.AggSpec.AggSpecSorted sorted_last = 16;
-inline bool AggSpec::has_sorted_last() const {
-  return type_case() == kSortedLast;
-}
-inline bool AggSpec::_internal_has_sorted_last() const {
-  return type_case() == kSortedLast;
-}
-inline void AggSpec::set_has_sorted_last() {
-  _impl_._oneof_case_[0] = kSortedLast;
-}
-inline void AggSpec::clear_sorted_last() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  if (type_case() == kSortedLast) {
-    if (GetArena() == nullptr) {
-      delete _impl_.type_.sorted_last_;
-    }
-    clear_has_type();
-  }
-}
-inline ::io::deephaven::proto::backplane::grpc::AggSpec_AggSpecSorted* AggSpec::release_sorted_last() {
-  // @@protoc_insertion_point(field_release:io.deephaven.proto.backplane.grpc.AggSpec.sorted_last)
-  if (type_case() == kSortedLast) {
-    clear_has_type();
-    auto* temp = _impl_.type_.sorted_last_;
-    if (GetArena() != nullptr) {
-      temp = ::google::protobuf::internal::DuplicateIfNonNull(temp);
-    }
-    _impl_.type_.sorted_last_ = nullptr;
-    return temp;
-  } else {
-    return nullptr;
-  }
-}
-inline const ::io::deephaven::proto::backplane::grpc::AggSpec_AggSpecSorted& AggSpec::_internal_sorted_last() const {
-  return type_case() == kSortedLast ? *_impl_.type_.sorted_last_ : reinterpret_cast<::io::deephaven::proto::backplane::grpc::AggSpec_AggSpecSorted&>(::io::deephaven::proto::backplane::grpc::_AggSpec_AggSpecSorted_default_instance_);
-}
-inline const ::io::deephaven::proto::backplane::grpc::AggSpec_AggSpecSorted& AggSpec::sorted_last() const ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  // @@protoc_insertion_point(field_get:io.deephaven.proto.backplane.grpc.AggSpec.sorted_last)
-  return _internal_sorted_last();
-}
-inline ::io::deephaven::proto::backplane::grpc::AggSpec_AggSpecSorted* AggSpec::unsafe_arena_release_sorted_last() {
-  // @@protoc_insertion_point(field_unsafe_arena_release:io.deephaven.proto.backplane.grpc.AggSpec.sorted_last)
-  if (type_case() == kSortedLast) {
-    clear_has_type();
-    auto* temp = _impl_.type_.sorted_last_;
-    _impl_.type_.sorted_last_ = nullptr;
-    return temp;
-  } else {
-    return nullptr;
-  }
-}
-inline void AggSpec::unsafe_arena_set_allocated_sorted_last(::io::deephaven::proto::backplane::grpc::AggSpec_AggSpecSorted* value) {
-  // We rely on the oneof clear method to free the earlier contents
-  // of this oneof. We can directly use the pointer we're given to
-  // set the new value.
-  clear_type();
-  if (value) {
-    set_has_sorted_last();
-    _impl_.type_.sorted_last_ = value;
-  }
-  // @@protoc_insertion_point(field_unsafe_arena_set_allocated:io.deephaven.proto.backplane.grpc.AggSpec.sorted_last)
-}
-inline ::io::deephaven::proto::backplane::grpc::AggSpec_AggSpecSorted* AggSpec::_internal_mutable_sorted_last() {
-  if (type_case() != kSortedLast) {
-    clear_type();
-    set_has_sorted_last();
-    _impl_.type_.sorted_last_ = CreateMaybeMessage<::io::deephaven::proto::backplane::grpc::AggSpec_AggSpecSorted>(GetArena());
-  }
-  return _impl_.type_.sorted_last_;
-}
-inline ::io::deephaven::proto::backplane::grpc::AggSpec_AggSpecSorted* AggSpec::mutable_sorted_last() ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  ::io::deephaven::proto::backplane::grpc::AggSpec_AggSpecSorted* _msg = _internal_mutable_sorted_last();
-  // @@protoc_insertion_point(field_mutable:io.deephaven.proto.backplane.grpc.AggSpec.sorted_last)
-  return _msg;
-}
-
-// .io.deephaven.proto.backplane.grpc.AggSpec.AggSpecStd std = 17;
-inline bool AggSpec::has_std() const {
-  return type_case() == kStd;
-}
-inline bool AggSpec::_internal_has_std() const {
-  return type_case() == kStd;
-}
-inline void AggSpec::set_has_std() {
-  _impl_._oneof_case_[0] = kStd;
-}
-inline void AggSpec::clear_std() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  if (type_case() == kStd) {
-    if (GetArena() == nullptr) {
-      delete _impl_.type_.std_;
-    }
-    clear_has_type();
-  }
-}
-inline ::io::deephaven::proto::backplane::grpc::AggSpec_AggSpecStd* AggSpec::release_std() {
-  // @@protoc_insertion_point(field_release:io.deephaven.proto.backplane.grpc.AggSpec.std)
-  if (type_case() == kStd) {
-    clear_has_type();
-    auto* temp = _impl_.type_.std_;
-    if (GetArena() != nullptr) {
-      temp = ::google::protobuf::internal::DuplicateIfNonNull(temp);
-    }
-    _impl_.type_.std_ = nullptr;
-    return temp;
-  } else {
-    return nullptr;
-  }
-}
-inline const ::io::deephaven::proto::backplane::grpc::AggSpec_AggSpecStd& AggSpec::_internal_std() const {
-  return type_case() == kStd ? *_impl_.type_.std_ : reinterpret_cast<::io::deephaven::proto::backplane::grpc::AggSpec_AggSpecStd&>(::io::deephaven::proto::backplane::grpc::_AggSpec_AggSpecStd_default_instance_);
-}
-inline const ::io::deephaven::proto::backplane::grpc::AggSpec_AggSpecStd& AggSpec::std() const ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  // @@protoc_insertion_point(field_get:io.deephaven.proto.backplane.grpc.AggSpec.std)
-  return _internal_std();
-}
-inline ::io::deephaven::proto::backplane::grpc::AggSpec_AggSpecStd* AggSpec::unsafe_arena_release_std() {
-  // @@protoc_insertion_point(field_unsafe_arena_release:io.deephaven.proto.backplane.grpc.AggSpec.std)
-  if (type_case() == kStd) {
-    clear_has_type();
-    auto* temp = _impl_.type_.std_;
-    _impl_.type_.std_ = nullptr;
-    return temp;
-  } else {
-    return nullptr;
-  }
-}
-inline void AggSpec::unsafe_arena_set_allocated_std(::io::deephaven::proto::backplane::grpc::AggSpec_AggSpecStd* value) {
-  // We rely on the oneof clear method to free the earlier contents
-  // of this oneof. We can directly use the pointer we're given to
-  // set the new value.
-  clear_type();
-  if (value) {
-    set_has_std();
-    _impl_.type_.std_ = value;
-  }
-  // @@protoc_insertion_point(field_unsafe_arena_set_allocated:io.deephaven.proto.backplane.grpc.AggSpec.std)
-}
-inline ::io::deephaven::proto::backplane::grpc::AggSpec_AggSpecStd* AggSpec::_internal_mutable_std() {
-  if (type_case() != kStd) {
-    clear_type();
-    set_has_std();
-    _impl_.type_.std_ = CreateMaybeMessage<::io::deephaven::proto::backplane::grpc::AggSpec_AggSpecStd>(GetArena());
-  }
-  return _impl_.type_.std_;
-}
-inline ::io::deephaven::proto::backplane::grpc::AggSpec_AggSpecStd* AggSpec::mutable_std() ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  ::io::deephaven::proto::backplane::grpc::AggSpec_AggSpecStd* _msg = _internal_mutable_std();
-  // @@protoc_insertion_point(field_mutable:io.deephaven.proto.backplane.grpc.AggSpec.std)
-  return _msg;
-}
-
-// .io.deephaven.proto.backplane.grpc.AggSpec.AggSpecSum sum = 18;
-inline bool AggSpec::has_sum() const {
-  return type_case() == kSum;
-}
-inline bool AggSpec::_internal_has_sum() const {
-  return type_case() == kSum;
-}
-inline void AggSpec::set_has_sum() {
-  _impl_._oneof_case_[0] = kSum;
-}
-inline void AggSpec::clear_sum() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  if (type_case() == kSum) {
-    if (GetArena() == nullptr) {
-      delete _impl_.type_.sum_;
-    }
-    clear_has_type();
-  }
-}
-inline ::io::deephaven::proto::backplane::grpc::AggSpec_AggSpecSum* AggSpec::release_sum() {
-  // @@protoc_insertion_point(field_release:io.deephaven.proto.backplane.grpc.AggSpec.sum)
-  if (type_case() == kSum) {
-    clear_has_type();
-    auto* temp = _impl_.type_.sum_;
-    if (GetArena() != nullptr) {
-      temp = ::google::protobuf::internal::DuplicateIfNonNull(temp);
-    }
-    _impl_.type_.sum_ = nullptr;
-    return temp;
-  } else {
-    return nullptr;
-  }
-}
-inline const ::io::deephaven::proto::backplane::grpc::AggSpec_AggSpecSum& AggSpec::_internal_sum() const {
-  return type_case() == kSum ? *_impl_.type_.sum_ : reinterpret_cast<::io::deephaven::proto::backplane::grpc::AggSpec_AggSpecSum&>(::io::deephaven::proto::backplane::grpc::_AggSpec_AggSpecSum_default_instance_);
-}
-inline const ::io::deephaven::proto::backplane::grpc::AggSpec_AggSpecSum& AggSpec::sum() const ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  // @@protoc_insertion_point(field_get:io.deephaven.proto.backplane.grpc.AggSpec.sum)
-  return _internal_sum();
-}
-inline ::io::deephaven::proto::backplane::grpc::AggSpec_AggSpecSum* AggSpec::unsafe_arena_release_sum() {
-  // @@protoc_insertion_point(field_unsafe_arena_release:io.deephaven.proto.backplane.grpc.AggSpec.sum)
-  if (type_case() == kSum) {
-    clear_has_type();
-    auto* temp = _impl_.type_.sum_;
-    _impl_.type_.sum_ = nullptr;
-    return temp;
-  } else {
-    return nullptr;
-  }
-}
-inline void AggSpec::unsafe_arena_set_allocated_sum(::io::deephaven::proto::backplane::grpc::AggSpec_AggSpecSum* value) {
-  // We rely on the oneof clear method to free the earlier contents
-  // of this oneof. We can directly use the pointer we're given to
-  // set the new value.
-  clear_type();
-  if (value) {
-    set_has_sum();
-    _impl_.type_.sum_ = value;
-  }
-  // @@protoc_insertion_point(field_unsafe_arena_set_allocated:io.deephaven.proto.backplane.grpc.AggSpec.sum)
-}
-inline ::io::deephaven::proto::backplane::grpc::AggSpec_AggSpecSum* AggSpec::_internal_mutable_sum() {
-  if (type_case() != kSum) {
-    clear_type();
-    set_has_sum();
-    _impl_.type_.sum_ = CreateMaybeMessage<::io::deephaven::proto::backplane::grpc::AggSpec_AggSpecSum>(GetArena());
-  }
-  return _impl_.type_.sum_;
-}
-inline ::io::deephaven::proto::backplane::grpc::AggSpec_AggSpecSum* AggSpec::mutable_sum() ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  ::io::deephaven::proto::backplane::grpc::AggSpec_AggSpecSum* _msg = _internal_mutable_sum();
-  // @@protoc_insertion_point(field_mutable:io.deephaven.proto.backplane.grpc.AggSpec.sum)
-  return _msg;
-}
-
-// .io.deephaven.proto.backplane.grpc.AggSpec.AggSpecTDigest t_digest = 19;
-inline bool AggSpec::has_t_digest() const {
-  return type_case() == kTDigest;
-}
-inline bool AggSpec::_internal_has_t_digest() const {
-  return type_case() == kTDigest;
-}
-inline void AggSpec::set_has_t_digest() {
-  _impl_._oneof_case_[0] = kTDigest;
-}
-inline void AggSpec::clear_t_digest() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  if (type_case() == kTDigest) {
-    if (GetArena() == nullptr) {
-      delete _impl_.type_.t_digest_;
-    }
-    clear_has_type();
-  }
-}
-inline ::io::deephaven::proto::backplane::grpc::AggSpec_AggSpecTDigest* AggSpec::release_t_digest() {
-  // @@protoc_insertion_point(field_release:io.deephaven.proto.backplane.grpc.AggSpec.t_digest)
-  if (type_case() == kTDigest) {
-    clear_has_type();
-    auto* temp = _impl_.type_.t_digest_;
-    if (GetArena() != nullptr) {
-      temp = ::google::protobuf::internal::DuplicateIfNonNull(temp);
-    }
-    _impl_.type_.t_digest_ = nullptr;
-    return temp;
-  } else {
-    return nullptr;
-  }
-}
-inline const ::io::deephaven::proto::backplane::grpc::AggSpec_AggSpecTDigest& AggSpec::_internal_t_digest() const {
-  return type_case() == kTDigest ? *_impl_.type_.t_digest_ : reinterpret_cast<::io::deephaven::proto::backplane::grpc::AggSpec_AggSpecTDigest&>(::io::deephaven::proto::backplane::grpc::_AggSpec_AggSpecTDigest_default_instance_);
-}
-inline const ::io::deephaven::proto::backplane::grpc::AggSpec_AggSpecTDigest& AggSpec::t_digest() const ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  // @@protoc_insertion_point(field_get:io.deephaven.proto.backplane.grpc.AggSpec.t_digest)
-  return _internal_t_digest();
-}
-inline ::io::deephaven::proto::backplane::grpc::AggSpec_AggSpecTDigest* AggSpec::unsafe_arena_release_t_digest() {
-  // @@protoc_insertion_point(field_unsafe_arena_release:io.deephaven.proto.backplane.grpc.AggSpec.t_digest)
-  if (type_case() == kTDigest) {
-    clear_has_type();
-    auto* temp = _impl_.type_.t_digest_;
-    _impl_.type_.t_digest_ = nullptr;
-    return temp;
-  } else {
-    return nullptr;
-  }
-}
-inline void AggSpec::unsafe_arena_set_allocated_t_digest(::io::deephaven::proto::backplane::grpc::AggSpec_AggSpecTDigest* value) {
-  // We rely on the oneof clear method to free the earlier contents
-  // of this oneof. We can directly use the pointer we're given to
-  // set the new value.
-  clear_type();
-  if (value) {
-    set_has_t_digest();
-    _impl_.type_.t_digest_ = value;
-  }
-  // @@protoc_insertion_point(field_unsafe_arena_set_allocated:io.deephaven.proto.backplane.grpc.AggSpec.t_digest)
-}
-inline ::io::deephaven::proto::backplane::grpc::AggSpec_AggSpecTDigest* AggSpec::_internal_mutable_t_digest() {
-  if (type_case() != kTDigest) {
-    clear_type();
-    set_has_t_digest();
-    _impl_.type_.t_digest_ = CreateMaybeMessage<::io::deephaven::proto::backplane::grpc::AggSpec_AggSpecTDigest>(GetArena());
-  }
-  return _impl_.type_.t_digest_;
-}
-inline ::io::deephaven::proto::backplane::grpc::AggSpec_AggSpecTDigest* AggSpec::mutable_t_digest() ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  ::io::deephaven::proto::backplane::grpc::AggSpec_AggSpecTDigest* _msg = _internal_mutable_t_digest();
-  // @@protoc_insertion_point(field_mutable:io.deephaven.proto.backplane.grpc.AggSpec.t_digest)
-  return _msg;
-}
-
-// .io.deephaven.proto.backplane.grpc.AggSpec.AggSpecUnique unique = 20;
-inline bool AggSpec::has_unique() const {
-  return type_case() == kUnique;
-}
-inline bool AggSpec::_internal_has_unique() const {
-  return type_case() == kUnique;
-}
-inline void AggSpec::set_has_unique() {
-  _impl_._oneof_case_[0] = kUnique;
-}
-inline void AggSpec::clear_unique() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  if (type_case() == kUnique) {
-    if (GetArena() == nullptr) {
-      delete _impl_.type_.unique_;
-    }
-    clear_has_type();
-  }
-}
-inline ::io::deephaven::proto::backplane::grpc::AggSpec_AggSpecUnique* AggSpec::release_unique() {
-  // @@protoc_insertion_point(field_release:io.deephaven.proto.backplane.grpc.AggSpec.unique)
-  if (type_case() == kUnique) {
-    clear_has_type();
-    auto* temp = _impl_.type_.unique_;
-    if (GetArena() != nullptr) {
-      temp = ::google::protobuf::internal::DuplicateIfNonNull(temp);
-    }
-    _impl_.type_.unique_ = nullptr;
-    return temp;
-  } else {
-    return nullptr;
-  }
-}
-inline const ::io::deephaven::proto::backplane::grpc::AggSpec_AggSpecUnique& AggSpec::_internal_unique() const {
-  return type_case() == kUnique ? *_impl_.type_.unique_ : reinterpret_cast<::io::deephaven::proto::backplane::grpc::AggSpec_AggSpecUnique&>(::io::deephaven::proto::backplane::grpc::_AggSpec_AggSpecUnique_default_instance_);
-}
-inline const ::io::deephaven::proto::backplane::grpc::AggSpec_AggSpecUnique& AggSpec::unique() const ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  // @@protoc_insertion_point(field_get:io.deephaven.proto.backplane.grpc.AggSpec.unique)
-  return _internal_unique();
-}
-inline ::io::deephaven::proto::backplane::grpc::AggSpec_AggSpecUnique* AggSpec::unsafe_arena_release_unique() {
-  // @@protoc_insertion_point(field_unsafe_arena_release:io.deephaven.proto.backplane.grpc.AggSpec.unique)
-  if (type_case() == kUnique) {
-    clear_has_type();
-    auto* temp = _impl_.type_.unique_;
-    _impl_.type_.unique_ = nullptr;
-    return temp;
-  } else {
-    return nullptr;
-  }
-}
-inline void AggSpec::unsafe_arena_set_allocated_unique(::io::deephaven::proto::backplane::grpc::AggSpec_AggSpecUnique* value) {
-  // We rely on the oneof clear method to free the earlier contents
-  // of this oneof. We can directly use the pointer we're given to
-  // set the new value.
-  clear_type();
-  if (value) {
-    set_has_unique();
-    _impl_.type_.unique_ = value;
-  }
-  // @@protoc_insertion_point(field_unsafe_arena_set_allocated:io.deephaven.proto.backplane.grpc.AggSpec.unique)
-}
-inline ::io::deephaven::proto::backplane::grpc::AggSpec_AggSpecUnique* AggSpec::_internal_mutable_unique() {
-  if (type_case() != kUnique) {
-    clear_type();
-    set_has_unique();
-    _impl_.type_.unique_ = CreateMaybeMessage<::io::deephaven::proto::backplane::grpc::AggSpec_AggSpecUnique>(GetArena());
-  }
-  return _impl_.type_.unique_;
-}
-inline ::io::deephaven::proto::backplane::grpc::AggSpec_AggSpecUnique* AggSpec::mutable_unique() ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  ::io::deephaven::proto::backplane::grpc::AggSpec_AggSpecUnique* _msg = _internal_mutable_unique();
-  // @@protoc_insertion_point(field_mutable:io.deephaven.proto.backplane.grpc.AggSpec.unique)
-  return _msg;
-}
-
-// .io.deephaven.proto.backplane.grpc.AggSpec.AggSpecWeighted weighted_avg = 21;
-inline bool AggSpec::has_weighted_avg() const {
-  return type_case() == kWeightedAvg;
-}
-inline bool AggSpec::_internal_has_weighted_avg() const {
-  return type_case() == kWeightedAvg;
-}
-inline void AggSpec::set_has_weighted_avg() {
-  _impl_._oneof_case_[0] = kWeightedAvg;
-}
-inline void AggSpec::clear_weighted_avg() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  if (type_case() == kWeightedAvg) {
-    if (GetArena() == nullptr) {
-      delete _impl_.type_.weighted_avg_;
-    }
-    clear_has_type();
-  }
-}
-inline ::io::deephaven::proto::backplane::grpc::AggSpec_AggSpecWeighted* AggSpec::release_weighted_avg() {
-  // @@protoc_insertion_point(field_release:io.deephaven.proto.backplane.grpc.AggSpec.weighted_avg)
-  if (type_case() == kWeightedAvg) {
-    clear_has_type();
-    auto* temp = _impl_.type_.weighted_avg_;
-    if (GetArena() != nullptr) {
-      temp = ::google::protobuf::internal::DuplicateIfNonNull(temp);
-    }
-    _impl_.type_.weighted_avg_ = nullptr;
-    return temp;
-  } else {
-    return nullptr;
-  }
-}
-inline const ::io::deephaven::proto::backplane::grpc::AggSpec_AggSpecWeighted& AggSpec::_internal_weighted_avg() const {
-  return type_case() == kWeightedAvg ? *_impl_.type_.weighted_avg_ : reinterpret_cast<::io::deephaven::proto::backplane::grpc::AggSpec_AggSpecWeighted&>(::io::deephaven::proto::backplane::grpc::_AggSpec_AggSpecWeighted_default_instance_);
-}
-inline const ::io::deephaven::proto::backplane::grpc::AggSpec_AggSpecWeighted& AggSpec::weighted_avg() const ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  // @@protoc_insertion_point(field_get:io.deephaven.proto.backplane.grpc.AggSpec.weighted_avg)
-  return _internal_weighted_avg();
-}
-inline ::io::deephaven::proto::backplane::grpc::AggSpec_AggSpecWeighted* AggSpec::unsafe_arena_release_weighted_avg() {
-  // @@protoc_insertion_point(field_unsafe_arena_release:io.deephaven.proto.backplane.grpc.AggSpec.weighted_avg)
-  if (type_case() == kWeightedAvg) {
-    clear_has_type();
-    auto* temp = _impl_.type_.weighted_avg_;
-    _impl_.type_.weighted_avg_ = nullptr;
-    return temp;
-  } else {
-    return nullptr;
-  }
-}
-inline void AggSpec::unsafe_arena_set_allocated_weighted_avg(::io::deephaven::proto::backplane::grpc::AggSpec_AggSpecWeighted* value) {
-  // We rely on the oneof clear method to free the earlier contents
-  // of this oneof. We can directly use the pointer we're given to
-  // set the new value.
-  clear_type();
-  if (value) {
-    set_has_weighted_avg();
-    _impl_.type_.weighted_avg_ = value;
-  }
-  // @@protoc_insertion_point(field_unsafe_arena_set_allocated:io.deephaven.proto.backplane.grpc.AggSpec.weighted_avg)
-}
-inline ::io::deephaven::proto::backplane::grpc::AggSpec_AggSpecWeighted* AggSpec::_internal_mutable_weighted_avg() {
-  if (type_case() != kWeightedAvg) {
-    clear_type();
-    set_has_weighted_avg();
-    _impl_.type_.weighted_avg_ = CreateMaybeMessage<::io::deephaven::proto::backplane::grpc::AggSpec_AggSpecWeighted>(GetArena());
-  }
-  return _impl_.type_.weighted_avg_;
-}
-inline ::io::deephaven::proto::backplane::grpc::AggSpec_AggSpecWeighted* AggSpec::mutable_weighted_avg() ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  ::io::deephaven::proto::backplane::grpc::AggSpec_AggSpecWeighted* _msg = _internal_mutable_weighted_avg();
-  // @@protoc_insertion_point(field_mutable:io.deephaven.proto.backplane.grpc.AggSpec.weighted_avg)
-  return _msg;
-}
-
-// .io.deephaven.proto.backplane.grpc.AggSpec.AggSpecWeighted weighted_sum = 22;
-inline bool AggSpec::has_weighted_sum() const {
-  return type_case() == kWeightedSum;
-}
-inline bool AggSpec::_internal_has_weighted_sum() const {
-  return type_case() == kWeightedSum;
-}
-inline void AggSpec::set_has_weighted_sum() {
-  _impl_._oneof_case_[0] = kWeightedSum;
-}
-inline void AggSpec::clear_weighted_sum() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  if (type_case() == kWeightedSum) {
-    if (GetArena() == nullptr) {
-      delete _impl_.type_.weighted_sum_;
-    }
-    clear_has_type();
-  }
-}
-inline ::io::deephaven::proto::backplane::grpc::AggSpec_AggSpecWeighted* AggSpec::release_weighted_sum() {
-  // @@protoc_insertion_point(field_release:io.deephaven.proto.backplane.grpc.AggSpec.weighted_sum)
-  if (type_case() == kWeightedSum) {
-    clear_has_type();
-    auto* temp = _impl_.type_.weighted_sum_;
-    if (GetArena() != nullptr) {
-      temp = ::google::protobuf::internal::DuplicateIfNonNull(temp);
-    }
-    _impl_.type_.weighted_sum_ = nullptr;
-    return temp;
-  } else {
-    return nullptr;
-  }
-}
-inline const ::io::deephaven::proto::backplane::grpc::AggSpec_AggSpecWeighted& AggSpec::_internal_weighted_sum() const {
-  return type_case() == kWeightedSum ? *_impl_.type_.weighted_sum_ : reinterpret_cast<::io::deephaven::proto::backplane::grpc::AggSpec_AggSpecWeighted&>(::io::deephaven::proto::backplane::grpc::_AggSpec_AggSpecWeighted_default_instance_);
-}
-inline const ::io::deephaven::proto::backplane::grpc::AggSpec_AggSpecWeighted& AggSpec::weighted_sum() const ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  // @@protoc_insertion_point(field_get:io.deephaven.proto.backplane.grpc.AggSpec.weighted_sum)
-  return _internal_weighted_sum();
-}
-inline ::io::deephaven::proto::backplane::grpc::AggSpec_AggSpecWeighted* AggSpec::unsafe_arena_release_weighted_sum() {
-  // @@protoc_insertion_point(field_unsafe_arena_release:io.deephaven.proto.backplane.grpc.AggSpec.weighted_sum)
-  if (type_case() == kWeightedSum) {
-    clear_has_type();
-    auto* temp = _impl_.type_.weighted_sum_;
-    _impl_.type_.weighted_sum_ = nullptr;
-    return temp;
-  } else {
-    return nullptr;
-  }
-}
-inline void AggSpec::unsafe_arena_set_allocated_weighted_sum(::io::deephaven::proto::backplane::grpc::AggSpec_AggSpecWeighted* value) {
-  // We rely on the oneof clear method to free the earlier contents
-  // of this oneof. We can directly use the pointer we're given to
-  // set the new value.
-  clear_type();
-  if (value) {
-    set_has_weighted_sum();
-    _impl_.type_.weighted_sum_ = value;
-  }
-  // @@protoc_insertion_point(field_unsafe_arena_set_allocated:io.deephaven.proto.backplane.grpc.AggSpec.weighted_sum)
-}
-inline ::io::deephaven::proto::backplane::grpc::AggSpec_AggSpecWeighted* AggSpec::_internal_mutable_weighted_sum() {
-  if (type_case() != kWeightedSum) {
-    clear_type();
-    set_has_weighted_sum();
-    _impl_.type_.weighted_sum_ = CreateMaybeMessage<::io::deephaven::proto::backplane::grpc::AggSpec_AggSpecWeighted>(GetArena());
-  }
-  return _impl_.type_.weighted_sum_;
-}
-inline ::io::deephaven::proto::backplane::grpc::AggSpec_AggSpecWeighted* AggSpec::mutable_weighted_sum() ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  ::io::deephaven::proto::backplane::grpc::AggSpec_AggSpecWeighted* _msg = _internal_mutable_weighted_sum();
-  // @@protoc_insertion_point(field_mutable:io.deephaven.proto.backplane.grpc.AggSpec.weighted_sum)
-  return _msg;
-}
-
-// .io.deephaven.proto.backplane.grpc.AggSpec.AggSpecVar var = 23;
-inline bool AggSpec::has_var() const {
-  return type_case() == kVar;
-}
-inline bool AggSpec::_internal_has_var() const {
-  return type_case() == kVar;
-}
-inline void AggSpec::set_has_var() {
-  _impl_._oneof_case_[0] = kVar;
-}
-inline void AggSpec::clear_var() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  if (type_case() == kVar) {
-    if (GetArena() == nullptr) {
-      delete _impl_.type_.var_;
-    }
-    clear_has_type();
-  }
-}
-inline ::io::deephaven::proto::backplane::grpc::AggSpec_AggSpecVar* AggSpec::release_var() {
-  // @@protoc_insertion_point(field_release:io.deephaven.proto.backplane.grpc.AggSpec.var)
-  if (type_case() == kVar) {
-    clear_has_type();
-    auto* temp = _impl_.type_.var_;
-    if (GetArena() != nullptr) {
-      temp = ::google::protobuf::internal::DuplicateIfNonNull(temp);
-    }
-    _impl_.type_.var_ = nullptr;
-    return temp;
-  } else {
-    return nullptr;
-  }
-}
-inline const ::io::deephaven::proto::backplane::grpc::AggSpec_AggSpecVar& AggSpec::_internal_var() const {
-  return type_case() == kVar ? *_impl_.type_.var_ : reinterpret_cast<::io::deephaven::proto::backplane::grpc::AggSpec_AggSpecVar&>(::io::deephaven::proto::backplane::grpc::_AggSpec_AggSpecVar_default_instance_);
-}
-inline const ::io::deephaven::proto::backplane::grpc::AggSpec_AggSpecVar& AggSpec::var() const ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  // @@protoc_insertion_point(field_get:io.deephaven.proto.backplane.grpc.AggSpec.var)
-  return _internal_var();
-}
-inline ::io::deephaven::proto::backplane::grpc::AggSpec_AggSpecVar* AggSpec::unsafe_arena_release_var() {
-  // @@protoc_insertion_point(field_unsafe_arena_release:io.deephaven.proto.backplane.grpc.AggSpec.var)
-  if (type_case() == kVar) {
-    clear_has_type();
-    auto* temp = _impl_.type_.var_;
-    _impl_.type_.var_ = nullptr;
-    return temp;
-  } else {
-    return nullptr;
-  }
-}
-inline void AggSpec::unsafe_arena_set_allocated_var(::io::deephaven::proto::backplane::grpc::AggSpec_AggSpecVar* value) {
-  // We rely on the oneof clear method to free the earlier contents
-  // of this oneof. We can directly use the pointer we're given to
-  // set the new value.
-  clear_type();
-  if (value) {
-    set_has_var();
-    _impl_.type_.var_ = value;
-  }
-  // @@protoc_insertion_point(field_unsafe_arena_set_allocated:io.deephaven.proto.backplane.grpc.AggSpec.var)
-}
-inline ::io::deephaven::proto::backplane::grpc::AggSpec_AggSpecVar* AggSpec::_internal_mutable_var() {
-  if (type_case() != kVar) {
-    clear_type();
-    set_has_var();
-    _impl_.type_.var_ = CreateMaybeMessage<::io::deephaven::proto::backplane::grpc::AggSpec_AggSpecVar>(GetArena());
-  }
-  return _impl_.type_.var_;
-}
-inline ::io::deephaven::proto::backplane::grpc::AggSpec_AggSpecVar* AggSpec::mutable_var() ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  ::io::deephaven::proto::backplane::grpc::AggSpec_AggSpecVar* _msg = _internal_mutable_var();
-  // @@protoc_insertion_point(field_mutable:io.deephaven.proto.backplane.grpc.AggSpec.var)
-  return _msg;
-}
-
-inline bool AggSpec::has_type() const {
-  return type_case() != TYPE_NOT_SET;
-}
-inline void AggSpec::clear_has_type() {
-  _impl_._oneof_case_[0] = TYPE_NOT_SET;
-}
-inline AggSpec::TypeCase AggSpec::type_case() const {
-  return AggSpec::TypeCase(_impl_._oneof_case_[0]);
-}
-// -------------------------------------------------------------------
-
-// AggregateRequest
-
-// .io.deephaven.proto.backplane.grpc.Ticket result_id = 1;
-inline bool AggregateRequest::has_result_id() const {
-  bool value = (_impl_._has_bits_[0] & 0x00000001u) != 0;
-  PROTOBUF_ASSUME(!value || _impl_.result_id_ != nullptr);
-  return value;
-}
-inline const ::io::deephaven::proto::backplane::grpc::Ticket& AggregateRequest::_internal_result_id() const {
-  PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race);
-  const ::io::deephaven::proto::backplane::grpc::Ticket* p = _impl_.result_id_;
-  return p != nullptr ? *p : reinterpret_cast<const ::io::deephaven::proto::backplane::grpc::Ticket&>(::io::deephaven::proto::backplane::grpc::_Ticket_default_instance_);
-}
-inline const ::io::deephaven::proto::backplane::grpc::Ticket& AggregateRequest::result_id() const ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  // @@protoc_insertion_point(field_get:io.deephaven.proto.backplane.grpc.AggregateRequest.result_id)
-  return _internal_result_id();
-}
-inline void AggregateRequest::unsafe_arena_set_allocated_result_id(::io::deephaven::proto::backplane::grpc::Ticket* value) {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  if (GetArena() == nullptr) {
-    delete reinterpret_cast<::google::protobuf::MessageLite*>(_impl_.result_id_);
-  }
-  _impl_.result_id_ = reinterpret_cast<::io::deephaven::proto::backplane::grpc::Ticket*>(value);
-  if (value != nullptr) {
-    _impl_._has_bits_[0] |= 0x00000001u;
-  } else {
-    _impl_._has_bits_[0] &= ~0x00000001u;
-  }
-  // @@protoc_insertion_point(field_unsafe_arena_set_allocated:io.deephaven.proto.backplane.grpc.AggregateRequest.result_id)
-}
-inline ::io::deephaven::proto::backplane::grpc::Ticket* AggregateRequest::release_result_id() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-
-  _impl_._has_bits_[0] &= ~0x00000001u;
-  ::io::deephaven::proto::backplane::grpc::Ticket* released = _impl_.result_id_;
-  _impl_.result_id_ = nullptr;
-#ifdef PROTOBUF_FORCE_COPY_IN_RELEASE
-  auto* old = reinterpret_cast<::google::protobuf::MessageLite*>(released);
-  released = ::google::protobuf::internal::DuplicateIfNonNull(released);
-  if (GetArena() == nullptr) {
-    delete old;
-  }
-#else   // PROTOBUF_FORCE_COPY_IN_RELEASE
-  if (GetArena() != nullptr) {
-    released = ::google::protobuf::internal::DuplicateIfNonNull(released);
-  }
-#endif  // !PROTOBUF_FORCE_COPY_IN_RELEASE
-  return released;
-}
-inline ::io::deephaven::proto::backplane::grpc::Ticket* AggregateRequest::unsafe_arena_release_result_id() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  // @@protoc_insertion_point(field_release:io.deephaven.proto.backplane.grpc.AggregateRequest.result_id)
-
-  _impl_._has_bits_[0] &= ~0x00000001u;
-  ::io::deephaven::proto::backplane::grpc::Ticket* temp = _impl_.result_id_;
-  _impl_.result_id_ = nullptr;
-  return temp;
-}
-inline ::io::deephaven::proto::backplane::grpc::Ticket* AggregateRequest::_internal_mutable_result_id() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  _impl_._has_bits_[0] |= 0x00000001u;
-  if (_impl_.result_id_ == nullptr) {
-    auto* p = CreateMaybeMessage<::io::deephaven::proto::backplane::grpc::Ticket>(GetArena());
-    _impl_.result_id_ = reinterpret_cast<::io::deephaven::proto::backplane::grpc::Ticket*>(p);
-  }
-  return _impl_.result_id_;
-}
-inline ::io::deephaven::proto::backplane::grpc::Ticket* AggregateRequest::mutable_result_id() ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  ::io::deephaven::proto::backplane::grpc::Ticket* _msg = _internal_mutable_result_id();
-  // @@protoc_insertion_point(field_mutable:io.deephaven.proto.backplane.grpc.AggregateRequest.result_id)
-  return _msg;
-}
-inline void AggregateRequest::set_allocated_result_id(::io::deephaven::proto::backplane::grpc::Ticket* value) {
-  ::google::protobuf::Arena* message_arena = GetArena();
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  if (message_arena == nullptr) {
-    delete reinterpret_cast<::google::protobuf::MessageLite*>(_impl_.result_id_);
-  }
-
-  if (value != nullptr) {
-    ::google::protobuf::Arena* submessage_arena = reinterpret_cast<::google::protobuf::MessageLite*>(value)->GetArena();
-    if (message_arena != submessage_arena) {
-      value = ::google::protobuf::internal::GetOwnedMessage(message_arena, value, submessage_arena);
-    }
-    _impl_._has_bits_[0] |= 0x00000001u;
-  } else {
-    _impl_._has_bits_[0] &= ~0x00000001u;
-  }
-
-  _impl_.result_id_ = reinterpret_cast<::io::deephaven::proto::backplane::grpc::Ticket*>(value);
-  // @@protoc_insertion_point(field_set_allocated:io.deephaven.proto.backplane.grpc.AggregateRequest.result_id)
-}
-
-// .io.deephaven.proto.backplane.grpc.TableReference source_id = 2;
-inline bool AggregateRequest::has_source_id() const {
-  bool value = (_impl_._has_bits_[0] & 0x00000002u) != 0;
-  PROTOBUF_ASSUME(!value || _impl_.source_id_ != nullptr);
-  return value;
-}
-inline void AggregateRequest::clear_source_id() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  if (_impl_.source_id_ != nullptr) _impl_.source_id_->Clear();
-  _impl_._has_bits_[0] &= ~0x00000002u;
-}
-inline const ::io::deephaven::proto::backplane::grpc::TableReference& AggregateRequest::_internal_source_id() const {
-  PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race);
-  const ::io::deephaven::proto::backplane::grpc::TableReference* p = _impl_.source_id_;
-  return p != nullptr ? *p : reinterpret_cast<const ::io::deephaven::proto::backplane::grpc::TableReference&>(::io::deephaven::proto::backplane::grpc::_TableReference_default_instance_);
-}
-inline const ::io::deephaven::proto::backplane::grpc::TableReference& AggregateRequest::source_id() const ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  // @@protoc_insertion_point(field_get:io.deephaven.proto.backplane.grpc.AggregateRequest.source_id)
-  return _internal_source_id();
-}
-inline void AggregateRequest::unsafe_arena_set_allocated_source_id(::io::deephaven::proto::backplane::grpc::TableReference* value) {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  if (GetArena() == nullptr) {
-    delete reinterpret_cast<::google::protobuf::MessageLite*>(_impl_.source_id_);
-  }
-  _impl_.source_id_ = reinterpret_cast<::io::deephaven::proto::backplane::grpc::TableReference*>(value);
-  if (value != nullptr) {
-    _impl_._has_bits_[0] |= 0x00000002u;
-  } else {
-    _impl_._has_bits_[0] &= ~0x00000002u;
-  }
-  // @@protoc_insertion_point(field_unsafe_arena_set_allocated:io.deephaven.proto.backplane.grpc.AggregateRequest.source_id)
-}
-inline ::io::deephaven::proto::backplane::grpc::TableReference* AggregateRequest::release_source_id() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-
-  _impl_._has_bits_[0] &= ~0x00000002u;
-  ::io::deephaven::proto::backplane::grpc::TableReference* released = _impl_.source_id_;
-  _impl_.source_id_ = nullptr;
-#ifdef PROTOBUF_FORCE_COPY_IN_RELEASE
-  auto* old = reinterpret_cast<::google::protobuf::MessageLite*>(released);
-  released = ::google::protobuf::internal::DuplicateIfNonNull(released);
-  if (GetArena() == nullptr) {
-    delete old;
-  }
-#else   // PROTOBUF_FORCE_COPY_IN_RELEASE
-  if (GetArena() != nullptr) {
-    released = ::google::protobuf::internal::DuplicateIfNonNull(released);
-  }
-#endif  // !PROTOBUF_FORCE_COPY_IN_RELEASE
-  return released;
-}
-inline ::io::deephaven::proto::backplane::grpc::TableReference* AggregateRequest::unsafe_arena_release_source_id() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  // @@protoc_insertion_point(field_release:io.deephaven.proto.backplane.grpc.AggregateRequest.source_id)
-
-  _impl_._has_bits_[0] &= ~0x00000002u;
-  ::io::deephaven::proto::backplane::grpc::TableReference* temp = _impl_.source_id_;
-  _impl_.source_id_ = nullptr;
-  return temp;
-}
-inline ::io::deephaven::proto::backplane::grpc::TableReference* AggregateRequest::_internal_mutable_source_id() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  _impl_._has_bits_[0] |= 0x00000002u;
-  if (_impl_.source_id_ == nullptr) {
-    auto* p = CreateMaybeMessage<::io::deephaven::proto::backplane::grpc::TableReference>(GetArena());
-    _impl_.source_id_ = reinterpret_cast<::io::deephaven::proto::backplane::grpc::TableReference*>(p);
-  }
-  return _impl_.source_id_;
-}
-inline ::io::deephaven::proto::backplane::grpc::TableReference* AggregateRequest::mutable_source_id() ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  ::io::deephaven::proto::backplane::grpc::TableReference* _msg = _internal_mutable_source_id();
-  // @@protoc_insertion_point(field_mutable:io.deephaven.proto.backplane.grpc.AggregateRequest.source_id)
-  return _msg;
-}
-inline void AggregateRequest::set_allocated_source_id(::io::deephaven::proto::backplane::grpc::TableReference* value) {
-  ::google::protobuf::Arena* message_arena = GetArena();
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  if (message_arena == nullptr) {
-    delete reinterpret_cast<::io::deephaven::proto::backplane::grpc::TableReference*>(_impl_.source_id_);
-  }
-
-  if (value != nullptr) {
-    ::google::protobuf::Arena* submessage_arena = reinterpret_cast<::io::deephaven::proto::backplane::grpc::TableReference*>(value)->GetArena();
-    if (message_arena != submessage_arena) {
-      value = ::google::protobuf::internal::GetOwnedMessage(message_arena, value, submessage_arena);
-    }
-    _impl_._has_bits_[0] |= 0x00000002u;
-  } else {
-    _impl_._has_bits_[0] &= ~0x00000002u;
-  }
-
-  _impl_.source_id_ = reinterpret_cast<::io::deephaven::proto::backplane::grpc::TableReference*>(value);
-  // @@protoc_insertion_point(field_set_allocated:io.deephaven.proto.backplane.grpc.AggregateRequest.source_id)
-}
-
-// .io.deephaven.proto.backplane.grpc.TableReference initial_groups_id = 3;
-inline bool AggregateRequest::has_initial_groups_id() const {
-  bool value = (_impl_._has_bits_[0] & 0x00000004u) != 0;
-  PROTOBUF_ASSUME(!value || _impl_.initial_groups_id_ != nullptr);
-  return value;
-}
-inline void AggregateRequest::clear_initial_groups_id() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  if (_impl_.initial_groups_id_ != nullptr) _impl_.initial_groups_id_->Clear();
-  _impl_._has_bits_[0] &= ~0x00000004u;
-}
-inline const ::io::deephaven::proto::backplane::grpc::TableReference& AggregateRequest::_internal_initial_groups_id() const {
-  PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race);
-  const ::io::deephaven::proto::backplane::grpc::TableReference* p = _impl_.initial_groups_id_;
-  return p != nullptr ? *p : reinterpret_cast<const ::io::deephaven::proto::backplane::grpc::TableReference&>(::io::deephaven::proto::backplane::grpc::_TableReference_default_instance_);
-}
-inline const ::io::deephaven::proto::backplane::grpc::TableReference& AggregateRequest::initial_groups_id() const ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  // @@protoc_insertion_point(field_get:io.deephaven.proto.backplane.grpc.AggregateRequest.initial_groups_id)
-  return _internal_initial_groups_id();
-}
-inline void AggregateRequest::unsafe_arena_set_allocated_initial_groups_id(::io::deephaven::proto::backplane::grpc::TableReference* value) {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  if (GetArena() == nullptr) {
-    delete reinterpret_cast<::google::protobuf::MessageLite*>(_impl_.initial_groups_id_);
-  }
-  _impl_.initial_groups_id_ = reinterpret_cast<::io::deephaven::proto::backplane::grpc::TableReference*>(value);
-  if (value != nullptr) {
-    _impl_._has_bits_[0] |= 0x00000004u;
-  } else {
-    _impl_._has_bits_[0] &= ~0x00000004u;
-  }
-  // @@protoc_insertion_point(field_unsafe_arena_set_allocated:io.deephaven.proto.backplane.grpc.AggregateRequest.initial_groups_id)
-}
-inline ::io::deephaven::proto::backplane::grpc::TableReference* AggregateRequest::release_initial_groups_id() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-
-  _impl_._has_bits_[0] &= ~0x00000004u;
-  ::io::deephaven::proto::backplane::grpc::TableReference* released = _impl_.initial_groups_id_;
-  _impl_.initial_groups_id_ = nullptr;
-#ifdef PROTOBUF_FORCE_COPY_IN_RELEASE
-  auto* old = reinterpret_cast<::google::protobuf::MessageLite*>(released);
-  released = ::google::protobuf::internal::DuplicateIfNonNull(released);
-  if (GetArena() == nullptr) {
-    delete old;
-  }
-#else   // PROTOBUF_FORCE_COPY_IN_RELEASE
-  if (GetArena() != nullptr) {
-    released = ::google::protobuf::internal::DuplicateIfNonNull(released);
-  }
-#endif  // !PROTOBUF_FORCE_COPY_IN_RELEASE
-  return released;
-}
-inline ::io::deephaven::proto::backplane::grpc::TableReference* AggregateRequest::unsafe_arena_release_initial_groups_id() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  // @@protoc_insertion_point(field_release:io.deephaven.proto.backplane.grpc.AggregateRequest.initial_groups_id)
-
-  _impl_._has_bits_[0] &= ~0x00000004u;
-  ::io::deephaven::proto::backplane::grpc::TableReference* temp = _impl_.initial_groups_id_;
-  _impl_.initial_groups_id_ = nullptr;
-  return temp;
-}
-inline ::io::deephaven::proto::backplane::grpc::TableReference* AggregateRequest::_internal_mutable_initial_groups_id() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  _impl_._has_bits_[0] |= 0x00000004u;
-  if (_impl_.initial_groups_id_ == nullptr) {
-    auto* p = CreateMaybeMessage<::io::deephaven::proto::backplane::grpc::TableReference>(GetArena());
-    _impl_.initial_groups_id_ = reinterpret_cast<::io::deephaven::proto::backplane::grpc::TableReference*>(p);
-  }
-  return _impl_.initial_groups_id_;
-}
-inline ::io::deephaven::proto::backplane::grpc::TableReference* AggregateRequest::mutable_initial_groups_id() ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  ::io::deephaven::proto::backplane::grpc::TableReference* _msg = _internal_mutable_initial_groups_id();
-  // @@protoc_insertion_point(field_mutable:io.deephaven.proto.backplane.grpc.AggregateRequest.initial_groups_id)
-  return _msg;
-}
-inline void AggregateRequest::set_allocated_initial_groups_id(::io::deephaven::proto::backplane::grpc::TableReference* value) {
-  ::google::protobuf::Arena* message_arena = GetArena();
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  if (message_arena == nullptr) {
-    delete reinterpret_cast<::io::deephaven::proto::backplane::grpc::TableReference*>(_impl_.initial_groups_id_);
-  }
-
-  if (value != nullptr) {
-    ::google::protobuf::Arena* submessage_arena = reinterpret_cast<::io::deephaven::proto::backplane::grpc::TableReference*>(value)->GetArena();
-    if (message_arena != submessage_arena) {
-      value = ::google::protobuf::internal::GetOwnedMessage(message_arena, value, submessage_arena);
-    }
-    _impl_._has_bits_[0] |= 0x00000004u;
-  } else {
-    _impl_._has_bits_[0] &= ~0x00000004u;
-  }
-
-  _impl_.initial_groups_id_ = reinterpret_cast<::io::deephaven::proto::backplane::grpc::TableReference*>(value);
-  // @@protoc_insertion_point(field_set_allocated:io.deephaven.proto.backplane.grpc.AggregateRequest.initial_groups_id)
-}
-
-// bool preserve_empty = 4;
-inline void AggregateRequest::clear_preserve_empty() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  _impl_.preserve_empty_ = false;
-}
-inline bool AggregateRequest::preserve_empty() const {
-  // @@protoc_insertion_point(field_get:io.deephaven.proto.backplane.grpc.AggregateRequest.preserve_empty)
-  return _internal_preserve_empty();
-}
-inline void AggregateRequest::set_preserve_empty(bool value) {
-  _internal_set_preserve_empty(value);
-  // @@protoc_insertion_point(field_set:io.deephaven.proto.backplane.grpc.AggregateRequest.preserve_empty)
-}
-inline bool AggregateRequest::_internal_preserve_empty() const {
-  PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race);
-  return _impl_.preserve_empty_;
-}
-inline void AggregateRequest::_internal_set_preserve_empty(bool value) {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  ;
-  _impl_.preserve_empty_ = value;
-}
-
-// repeated .io.deephaven.proto.backplane.grpc.Aggregation aggregations = 5;
-inline int AggregateRequest::_internal_aggregations_size() const {
-  return _internal_aggregations().size();
-}
-inline int AggregateRequest::aggregations_size() const {
-  return _internal_aggregations_size();
-}
-inline void AggregateRequest::clear_aggregations() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  _impl_.aggregations_.Clear();
-}
-inline ::io::deephaven::proto::backplane::grpc::Aggregation* AggregateRequest::mutable_aggregations(int index)
-    ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  // @@protoc_insertion_point(field_mutable:io.deephaven.proto.backplane.grpc.AggregateRequest.aggregations)
-  return _internal_mutable_aggregations()->Mutable(index);
-}
-inline ::google::protobuf::RepeatedPtrField<::io::deephaven::proto::backplane::grpc::Aggregation>* AggregateRequest::mutable_aggregations()
-    ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  // @@protoc_insertion_point(field_mutable_list:io.deephaven.proto.backplane.grpc.AggregateRequest.aggregations)
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  return _internal_mutable_aggregations();
-}
-inline const ::io::deephaven::proto::backplane::grpc::Aggregation& AggregateRequest::aggregations(int index) const
-    ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  // @@protoc_insertion_point(field_get:io.deephaven.proto.backplane.grpc.AggregateRequest.aggregations)
-  return _internal_aggregations().Get(index);
-}
-inline ::io::deephaven::proto::backplane::grpc::Aggregation* AggregateRequest::add_aggregations() ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  ::io::deephaven::proto::backplane::grpc::Aggregation* _add = _internal_mutable_aggregations()->Add();
-  // @@protoc_insertion_point(field_add:io.deephaven.proto.backplane.grpc.AggregateRequest.aggregations)
-  return _add;
-}
-inline const ::google::protobuf::RepeatedPtrField<::io::deephaven::proto::backplane::grpc::Aggregation>& AggregateRequest::aggregations() const
-    ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  // @@protoc_insertion_point(field_list:io.deephaven.proto.backplane.grpc.AggregateRequest.aggregations)
-  return _internal_aggregations();
-}
-inline const ::google::protobuf::RepeatedPtrField<::io::deephaven::proto::backplane::grpc::Aggregation>&
-AggregateRequest::_internal_aggregations() const {
-  PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race);
-  return _impl_.aggregations_;
-}
-inline ::google::protobuf::RepeatedPtrField<::io::deephaven::proto::backplane::grpc::Aggregation>*
-AggregateRequest::_internal_mutable_aggregations() {
-  PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race);
-  return &_impl_.aggregations_;
-}
-
-// repeated string group_by_columns = 6;
-inline int AggregateRequest::_internal_group_by_columns_size() const {
-  return _internal_group_by_columns().size();
-}
-inline int AggregateRequest::group_by_columns_size() const {
-  return _internal_group_by_columns_size();
-}
-inline void AggregateRequest::clear_group_by_columns() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  _impl_.group_by_columns_.Clear();
-}
-inline std::string* AggregateRequest::add_group_by_columns()
-    ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  std::string* _s = _internal_mutable_group_by_columns()->Add();
-  // @@protoc_insertion_point(field_add_mutable:io.deephaven.proto.backplane.grpc.AggregateRequest.group_by_columns)
-  return _s;
-}
-inline const std::string& AggregateRequest::group_by_columns(int index) const
-    ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  // @@protoc_insertion_point(field_get:io.deephaven.proto.backplane.grpc.AggregateRequest.group_by_columns)
-  return _internal_group_by_columns().Get(index);
-}
-inline std::string* AggregateRequest::mutable_group_by_columns(int index)
-    ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  // @@protoc_insertion_point(field_mutable:io.deephaven.proto.backplane.grpc.AggregateRequest.group_by_columns)
-  return _internal_mutable_group_by_columns()->Mutable(index);
-}
-inline void AggregateRequest::set_group_by_columns(int index, const std::string& value) {
-  _internal_mutable_group_by_columns()->Mutable(index)->assign(value);
-  // @@protoc_insertion_point(field_set:io.deephaven.proto.backplane.grpc.AggregateRequest.group_by_columns)
-}
-inline void AggregateRequest::set_group_by_columns(int index, std::string&& value) {
-  _internal_mutable_group_by_columns()->Mutable(index)->assign(std::move(value));
-  // @@protoc_insertion_point(field_set:io.deephaven.proto.backplane.grpc.AggregateRequest.group_by_columns)
-}
-inline void AggregateRequest::set_group_by_columns(int index, const char* value) {
-  ABSL_DCHECK(value != nullptr);
-  _internal_mutable_group_by_columns()->Mutable(index)->assign(value);
-  // @@protoc_insertion_point(field_set_char:io.deephaven.proto.backplane.grpc.AggregateRequest.group_by_columns)
-}
-inline void AggregateRequest::set_group_by_columns(int index, const char* value,
-                              std::size_t size) {
-  _internal_mutable_group_by_columns()->Mutable(index)->assign(
-      reinterpret_cast<const char*>(value), size);
-  // @@protoc_insertion_point(field_set_pointer:io.deephaven.proto.backplane.grpc.AggregateRequest.group_by_columns)
-}
-inline void AggregateRequest::set_group_by_columns(int index, absl::string_view value) {
-  _internal_mutable_group_by_columns()->Mutable(index)->assign(value.data(),
-                                                     value.size());
-  // @@protoc_insertion_point(field_set_string_piece:io.deephaven.proto.backplane.grpc.AggregateRequest.group_by_columns)
-}
-inline void AggregateRequest::add_group_by_columns(const std::string& value) {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  _internal_mutable_group_by_columns()->Add()->assign(value);
-  // @@protoc_insertion_point(field_add:io.deephaven.proto.backplane.grpc.AggregateRequest.group_by_columns)
-}
-inline void AggregateRequest::add_group_by_columns(std::string&& value) {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  _internal_mutable_group_by_columns()->Add(std::move(value));
-  // @@protoc_insertion_point(field_add:io.deephaven.proto.backplane.grpc.AggregateRequest.group_by_columns)
-}
-inline void AggregateRequest::add_group_by_columns(const char* value) {
-  ABSL_DCHECK(value != nullptr);
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  _internal_mutable_group_by_columns()->Add()->assign(value);
-  // @@protoc_insertion_point(field_add_char:io.deephaven.proto.backplane.grpc.AggregateRequest.group_by_columns)
-}
-inline void AggregateRequest::add_group_by_columns(const char* value, std::size_t size) {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  _internal_mutable_group_by_columns()->Add()->assign(
-      reinterpret_cast<const char*>(value), size);
-  // @@protoc_insertion_point(field_add_pointer:io.deephaven.proto.backplane.grpc.AggregateRequest.group_by_columns)
-}
-inline void AggregateRequest::add_group_by_columns(absl::string_view value) {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  _internal_mutable_group_by_columns()->Add()->assign(value.data(), value.size());
-  // @@protoc_insertion_point(field_add_string_piece:io.deephaven.proto.backplane.grpc.AggregateRequest.group_by_columns)
-}
-inline const ::google::protobuf::RepeatedPtrField<std::string>&
-AggregateRequest::group_by_columns() const ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  // @@protoc_insertion_point(field_list:io.deephaven.proto.backplane.grpc.AggregateRequest.group_by_columns)
-  return _internal_group_by_columns();
-}
-inline ::google::protobuf::RepeatedPtrField<std::string>*
-AggregateRequest::mutable_group_by_columns() ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  // @@protoc_insertion_point(field_mutable_list:io.deephaven.proto.backplane.grpc.AggregateRequest.group_by_columns)
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  return _internal_mutable_group_by_columns();
-}
-inline const ::google::protobuf::RepeatedPtrField<std::string>&
-AggregateRequest::_internal_group_by_columns() const {
-  PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race);
-  return _impl_.group_by_columns_;
-}
-inline ::google::protobuf::RepeatedPtrField<std::string>*
-AggregateRequest::_internal_mutable_group_by_columns() {
-  PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race);
-  return &_impl_.group_by_columns_;
-}
-
-// -------------------------------------------------------------------
-
-// Aggregation_AggregationColumns
-
-// .io.deephaven.proto.backplane.grpc.AggSpec spec = 1;
-inline bool Aggregation_AggregationColumns::has_spec() const {
-  bool value = (_impl_._has_bits_[0] & 0x00000001u) != 0;
-  PROTOBUF_ASSUME(!value || _impl_.spec_ != nullptr);
-  return value;
-}
-inline void Aggregation_AggregationColumns::clear_spec() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  if (_impl_.spec_ != nullptr) _impl_.spec_->Clear();
-  _impl_._has_bits_[0] &= ~0x00000001u;
-}
-inline const ::io::deephaven::proto::backplane::grpc::AggSpec& Aggregation_AggregationColumns::_internal_spec() const {
-  PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race);
-  const ::io::deephaven::proto::backplane::grpc::AggSpec* p = _impl_.spec_;
-  return p != nullptr ? *p : reinterpret_cast<const ::io::deephaven::proto::backplane::grpc::AggSpec&>(::io::deephaven::proto::backplane::grpc::_AggSpec_default_instance_);
-}
-inline const ::io::deephaven::proto::backplane::grpc::AggSpec& Aggregation_AggregationColumns::spec() const ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  // @@protoc_insertion_point(field_get:io.deephaven.proto.backplane.grpc.Aggregation.AggregationColumns.spec)
-  return _internal_spec();
-}
-inline void Aggregation_AggregationColumns::unsafe_arena_set_allocated_spec(::io::deephaven::proto::backplane::grpc::AggSpec* value) {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  if (GetArena() == nullptr) {
-    delete reinterpret_cast<::google::protobuf::MessageLite*>(_impl_.spec_);
-  }
-  _impl_.spec_ = reinterpret_cast<::io::deephaven::proto::backplane::grpc::AggSpec*>(value);
-  if (value != nullptr) {
-    _impl_._has_bits_[0] |= 0x00000001u;
-  } else {
-    _impl_._has_bits_[0] &= ~0x00000001u;
-  }
-  // @@protoc_insertion_point(field_unsafe_arena_set_allocated:io.deephaven.proto.backplane.grpc.Aggregation.AggregationColumns.spec)
-}
-inline ::io::deephaven::proto::backplane::grpc::AggSpec* Aggregation_AggregationColumns::release_spec() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-
-  _impl_._has_bits_[0] &= ~0x00000001u;
-  ::io::deephaven::proto::backplane::grpc::AggSpec* released = _impl_.spec_;
-  _impl_.spec_ = nullptr;
-#ifdef PROTOBUF_FORCE_COPY_IN_RELEASE
-  auto* old = reinterpret_cast<::google::protobuf::MessageLite*>(released);
-  released = ::google::protobuf::internal::DuplicateIfNonNull(released);
-  if (GetArena() == nullptr) {
-    delete old;
-  }
-#else   // PROTOBUF_FORCE_COPY_IN_RELEASE
-  if (GetArena() != nullptr) {
-    released = ::google::protobuf::internal::DuplicateIfNonNull(released);
-  }
-#endif  // !PROTOBUF_FORCE_COPY_IN_RELEASE
-  return released;
-}
-inline ::io::deephaven::proto::backplane::grpc::AggSpec* Aggregation_AggregationColumns::unsafe_arena_release_spec() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  // @@protoc_insertion_point(field_release:io.deephaven.proto.backplane.grpc.Aggregation.AggregationColumns.spec)
-
-  _impl_._has_bits_[0] &= ~0x00000001u;
-  ::io::deephaven::proto::backplane::grpc::AggSpec* temp = _impl_.spec_;
-  _impl_.spec_ = nullptr;
-  return temp;
-}
-inline ::io::deephaven::proto::backplane::grpc::AggSpec* Aggregation_AggregationColumns::_internal_mutable_spec() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  _impl_._has_bits_[0] |= 0x00000001u;
-  if (_impl_.spec_ == nullptr) {
-    auto* p = CreateMaybeMessage<::io::deephaven::proto::backplane::grpc::AggSpec>(GetArena());
-    _impl_.spec_ = reinterpret_cast<::io::deephaven::proto::backplane::grpc::AggSpec*>(p);
-  }
-  return _impl_.spec_;
-}
-inline ::io::deephaven::proto::backplane::grpc::AggSpec* Aggregation_AggregationColumns::mutable_spec() ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  ::io::deephaven::proto::backplane::grpc::AggSpec* _msg = _internal_mutable_spec();
-  // @@protoc_insertion_point(field_mutable:io.deephaven.proto.backplane.grpc.Aggregation.AggregationColumns.spec)
-  return _msg;
-}
-inline void Aggregation_AggregationColumns::set_allocated_spec(::io::deephaven::proto::backplane::grpc::AggSpec* value) {
-  ::google::protobuf::Arena* message_arena = GetArena();
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  if (message_arena == nullptr) {
-    delete reinterpret_cast<::io::deephaven::proto::backplane::grpc::AggSpec*>(_impl_.spec_);
-  }
-
-  if (value != nullptr) {
-    ::google::protobuf::Arena* submessage_arena = reinterpret_cast<::io::deephaven::proto::backplane::grpc::AggSpec*>(value)->GetArena();
-    if (message_arena != submessage_arena) {
-      value = ::google::protobuf::internal::GetOwnedMessage(message_arena, value, submessage_arena);
-    }
-    _impl_._has_bits_[0] |= 0x00000001u;
-  } else {
-    _impl_._has_bits_[0] &= ~0x00000001u;
-  }
-
-  _impl_.spec_ = reinterpret_cast<::io::deephaven::proto::backplane::grpc::AggSpec*>(value);
-  // @@protoc_insertion_point(field_set_allocated:io.deephaven.proto.backplane.grpc.Aggregation.AggregationColumns.spec)
-}
-
-// repeated string match_pairs = 2;
-inline int Aggregation_AggregationColumns::_internal_match_pairs_size() const {
-  return _internal_match_pairs().size();
-}
-inline int Aggregation_AggregationColumns::match_pairs_size() const {
-  return _internal_match_pairs_size();
-}
-inline void Aggregation_AggregationColumns::clear_match_pairs() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  _impl_.match_pairs_.Clear();
-}
-inline std::string* Aggregation_AggregationColumns::add_match_pairs()
-    ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  std::string* _s = _internal_mutable_match_pairs()->Add();
-  // @@protoc_insertion_point(field_add_mutable:io.deephaven.proto.backplane.grpc.Aggregation.AggregationColumns.match_pairs)
-  return _s;
-}
-inline const std::string& Aggregation_AggregationColumns::match_pairs(int index) const
-    ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  // @@protoc_insertion_point(field_get:io.deephaven.proto.backplane.grpc.Aggregation.AggregationColumns.match_pairs)
-  return _internal_match_pairs().Get(index);
-}
-inline std::string* Aggregation_AggregationColumns::mutable_match_pairs(int index)
-    ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  // @@protoc_insertion_point(field_mutable:io.deephaven.proto.backplane.grpc.Aggregation.AggregationColumns.match_pairs)
-  return _internal_mutable_match_pairs()->Mutable(index);
-}
-inline void Aggregation_AggregationColumns::set_match_pairs(int index, const std::string& value) {
-  _internal_mutable_match_pairs()->Mutable(index)->assign(value);
-  // @@protoc_insertion_point(field_set:io.deephaven.proto.backplane.grpc.Aggregation.AggregationColumns.match_pairs)
-}
-inline void Aggregation_AggregationColumns::set_match_pairs(int index, std::string&& value) {
-  _internal_mutable_match_pairs()->Mutable(index)->assign(std::move(value));
-  // @@protoc_insertion_point(field_set:io.deephaven.proto.backplane.grpc.Aggregation.AggregationColumns.match_pairs)
-}
-inline void Aggregation_AggregationColumns::set_match_pairs(int index, const char* value) {
-  ABSL_DCHECK(value != nullptr);
-  _internal_mutable_match_pairs()->Mutable(index)->assign(value);
-  // @@protoc_insertion_point(field_set_char:io.deephaven.proto.backplane.grpc.Aggregation.AggregationColumns.match_pairs)
-}
-inline void Aggregation_AggregationColumns::set_match_pairs(int index, const char* value,
-                              std::size_t size) {
-  _internal_mutable_match_pairs()->Mutable(index)->assign(
-      reinterpret_cast<const char*>(value), size);
-  // @@protoc_insertion_point(field_set_pointer:io.deephaven.proto.backplane.grpc.Aggregation.AggregationColumns.match_pairs)
-}
-inline void Aggregation_AggregationColumns::set_match_pairs(int index, absl::string_view value) {
-  _internal_mutable_match_pairs()->Mutable(index)->assign(value.data(),
-                                                     value.size());
-  // @@protoc_insertion_point(field_set_string_piece:io.deephaven.proto.backplane.grpc.Aggregation.AggregationColumns.match_pairs)
-}
-inline void Aggregation_AggregationColumns::add_match_pairs(const std::string& value) {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  _internal_mutable_match_pairs()->Add()->assign(value);
-  // @@protoc_insertion_point(field_add:io.deephaven.proto.backplane.grpc.Aggregation.AggregationColumns.match_pairs)
-}
-inline void Aggregation_AggregationColumns::add_match_pairs(std::string&& value) {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  _internal_mutable_match_pairs()->Add(std::move(value));
-  // @@protoc_insertion_point(field_add:io.deephaven.proto.backplane.grpc.Aggregation.AggregationColumns.match_pairs)
-}
-inline void Aggregation_AggregationColumns::add_match_pairs(const char* value) {
-  ABSL_DCHECK(value != nullptr);
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  _internal_mutable_match_pairs()->Add()->assign(value);
-  // @@protoc_insertion_point(field_add_char:io.deephaven.proto.backplane.grpc.Aggregation.AggregationColumns.match_pairs)
-}
-inline void Aggregation_AggregationColumns::add_match_pairs(const char* value, std::size_t size) {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  _internal_mutable_match_pairs()->Add()->assign(
-      reinterpret_cast<const char*>(value), size);
-  // @@protoc_insertion_point(field_add_pointer:io.deephaven.proto.backplane.grpc.Aggregation.AggregationColumns.match_pairs)
-}
-inline void Aggregation_AggregationColumns::add_match_pairs(absl::string_view value) {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  _internal_mutable_match_pairs()->Add()->assign(value.data(), value.size());
-  // @@protoc_insertion_point(field_add_string_piece:io.deephaven.proto.backplane.grpc.Aggregation.AggregationColumns.match_pairs)
-}
-inline const ::google::protobuf::RepeatedPtrField<std::string>&
-Aggregation_AggregationColumns::match_pairs() const ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  // @@protoc_insertion_point(field_list:io.deephaven.proto.backplane.grpc.Aggregation.AggregationColumns.match_pairs)
-  return _internal_match_pairs();
-}
-inline ::google::protobuf::RepeatedPtrField<std::string>*
-Aggregation_AggregationColumns::mutable_match_pairs() ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  // @@protoc_insertion_point(field_mutable_list:io.deephaven.proto.backplane.grpc.Aggregation.AggregationColumns.match_pairs)
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  return _internal_mutable_match_pairs();
-}
-inline const ::google::protobuf::RepeatedPtrField<std::string>&
-Aggregation_AggregationColumns::_internal_match_pairs() const {
-  PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race);
-  return _impl_.match_pairs_;
-}
-inline ::google::protobuf::RepeatedPtrField<std::string>*
-Aggregation_AggregationColumns::_internal_mutable_match_pairs() {
-  PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race);
-  return &_impl_.match_pairs_;
-}
-
-// -------------------------------------------------------------------
-
-// Aggregation_AggregationCount
-
-// string column_name = 1;
-inline void Aggregation_AggregationCount::clear_column_name() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  _impl_.column_name_.ClearToEmpty();
-}
-inline const std::string& Aggregation_AggregationCount::column_name() const
-    ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  // @@protoc_insertion_point(field_get:io.deephaven.proto.backplane.grpc.Aggregation.AggregationCount.column_name)
-  return _internal_column_name();
-}
-template <typename Arg_, typename... Args_>
-inline PROTOBUF_ALWAYS_INLINE void Aggregation_AggregationCount::set_column_name(Arg_&& arg,
-                                                     Args_... args) {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  ;
-  _impl_.column_name_.Set(static_cast<Arg_&&>(arg), args..., GetArena());
-  // @@protoc_insertion_point(field_set:io.deephaven.proto.backplane.grpc.Aggregation.AggregationCount.column_name)
-}
-inline std::string* Aggregation_AggregationCount::mutable_column_name() ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  std::string* _s = _internal_mutable_column_name();
-  // @@protoc_insertion_point(field_mutable:io.deephaven.proto.backplane.grpc.Aggregation.AggregationCount.column_name)
-  return _s;
-}
-inline const std::string& Aggregation_AggregationCount::_internal_column_name() const {
-  PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race);
-  return _impl_.column_name_.Get();
-}
-inline void Aggregation_AggregationCount::_internal_set_column_name(const std::string& value) {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  ;
-  _impl_.column_name_.Set(value, GetArena());
-}
-inline std::string* Aggregation_AggregationCount::_internal_mutable_column_name() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  ;
-  return _impl_.column_name_.Mutable( GetArena());
-}
-inline std::string* Aggregation_AggregationCount::release_column_name() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  // @@protoc_insertion_point(field_release:io.deephaven.proto.backplane.grpc.Aggregation.AggregationCount.column_name)
-  return _impl_.column_name_.Release();
-}
-inline void Aggregation_AggregationCount::set_allocated_column_name(std::string* value) {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  _impl_.column_name_.SetAllocated(value, GetArena());
-  #ifdef PROTOBUF_FORCE_COPY_DEFAULT_STRING
-        if (_impl_.column_name_.IsDefault()) {
-          _impl_.column_name_.Set("", GetArena());
-        }
-  #endif  // PROTOBUF_FORCE_COPY_DEFAULT_STRING
-  // @@protoc_insertion_point(field_set_allocated:io.deephaven.proto.backplane.grpc.Aggregation.AggregationCount.column_name)
-}
-
-// -------------------------------------------------------------------
-
-// Aggregation_AggregationRowKey
-
-// string column_name = 1;
-inline void Aggregation_AggregationRowKey::clear_column_name() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  _impl_.column_name_.ClearToEmpty();
-}
-inline const std::string& Aggregation_AggregationRowKey::column_name() const
-    ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  // @@protoc_insertion_point(field_get:io.deephaven.proto.backplane.grpc.Aggregation.AggregationRowKey.column_name)
-  return _internal_column_name();
-}
-template <typename Arg_, typename... Args_>
-inline PROTOBUF_ALWAYS_INLINE void Aggregation_AggregationRowKey::set_column_name(Arg_&& arg,
-                                                     Args_... args) {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  ;
-  _impl_.column_name_.Set(static_cast<Arg_&&>(arg), args..., GetArena());
-  // @@protoc_insertion_point(field_set:io.deephaven.proto.backplane.grpc.Aggregation.AggregationRowKey.column_name)
-}
-inline std::string* Aggregation_AggregationRowKey::mutable_column_name() ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  std::string* _s = _internal_mutable_column_name();
-  // @@protoc_insertion_point(field_mutable:io.deephaven.proto.backplane.grpc.Aggregation.AggregationRowKey.column_name)
-  return _s;
-}
-inline const std::string& Aggregation_AggregationRowKey::_internal_column_name() const {
-  PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race);
-  return _impl_.column_name_.Get();
-}
-inline void Aggregation_AggregationRowKey::_internal_set_column_name(const std::string& value) {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  ;
-  _impl_.column_name_.Set(value, GetArena());
-}
-inline std::string* Aggregation_AggregationRowKey::_internal_mutable_column_name() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  ;
-  return _impl_.column_name_.Mutable( GetArena());
-}
-inline std::string* Aggregation_AggregationRowKey::release_column_name() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  // @@protoc_insertion_point(field_release:io.deephaven.proto.backplane.grpc.Aggregation.AggregationRowKey.column_name)
-  return _impl_.column_name_.Release();
-}
-inline void Aggregation_AggregationRowKey::set_allocated_column_name(std::string* value) {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  _impl_.column_name_.SetAllocated(value, GetArena());
-  #ifdef PROTOBUF_FORCE_COPY_DEFAULT_STRING
-        if (_impl_.column_name_.IsDefault()) {
-          _impl_.column_name_.Set("", GetArena());
-        }
-  #endif  // PROTOBUF_FORCE_COPY_DEFAULT_STRING
-  // @@protoc_insertion_point(field_set_allocated:io.deephaven.proto.backplane.grpc.Aggregation.AggregationRowKey.column_name)
-}
-
-// -------------------------------------------------------------------
-
-// Aggregation_AggregationPartition
-
-// string column_name = 1;
-inline void Aggregation_AggregationPartition::clear_column_name() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  _impl_.column_name_.ClearToEmpty();
-}
-inline const std::string& Aggregation_AggregationPartition::column_name() const
-    ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  // @@protoc_insertion_point(field_get:io.deephaven.proto.backplane.grpc.Aggregation.AggregationPartition.column_name)
-  return _internal_column_name();
-}
-template <typename Arg_, typename... Args_>
-inline PROTOBUF_ALWAYS_INLINE void Aggregation_AggregationPartition::set_column_name(Arg_&& arg,
-                                                     Args_... args) {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  ;
-  _impl_.column_name_.Set(static_cast<Arg_&&>(arg), args..., GetArena());
-  // @@protoc_insertion_point(field_set:io.deephaven.proto.backplane.grpc.Aggregation.AggregationPartition.column_name)
-}
-inline std::string* Aggregation_AggregationPartition::mutable_column_name() ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  std::string* _s = _internal_mutable_column_name();
-  // @@protoc_insertion_point(field_mutable:io.deephaven.proto.backplane.grpc.Aggregation.AggregationPartition.column_name)
-  return _s;
-}
-inline const std::string& Aggregation_AggregationPartition::_internal_column_name() const {
-  PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race);
-  return _impl_.column_name_.Get();
-}
-inline void Aggregation_AggregationPartition::_internal_set_column_name(const std::string& value) {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  ;
-  _impl_.column_name_.Set(value, GetArena());
-}
-inline std::string* Aggregation_AggregationPartition::_internal_mutable_column_name() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  ;
-  return _impl_.column_name_.Mutable( GetArena());
-}
-inline std::string* Aggregation_AggregationPartition::release_column_name() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  // @@protoc_insertion_point(field_release:io.deephaven.proto.backplane.grpc.Aggregation.AggregationPartition.column_name)
-  return _impl_.column_name_.Release();
-}
-inline void Aggregation_AggregationPartition::set_allocated_column_name(std::string* value) {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  _impl_.column_name_.SetAllocated(value, GetArena());
-  #ifdef PROTOBUF_FORCE_COPY_DEFAULT_STRING
-        if (_impl_.column_name_.IsDefault()) {
-          _impl_.column_name_.Set("", GetArena());
-        }
-  #endif  // PROTOBUF_FORCE_COPY_DEFAULT_STRING
-  // @@protoc_insertion_point(field_set_allocated:io.deephaven.proto.backplane.grpc.Aggregation.AggregationPartition.column_name)
-}
-
-// bool include_group_by_columns = 2;
-inline void Aggregation_AggregationPartition::clear_include_group_by_columns() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  _impl_.include_group_by_columns_ = false;
-}
-inline bool Aggregation_AggregationPartition::include_group_by_columns() const {
-  // @@protoc_insertion_point(field_get:io.deephaven.proto.backplane.grpc.Aggregation.AggregationPartition.include_group_by_columns)
-  return _internal_include_group_by_columns();
-}
-inline void Aggregation_AggregationPartition::set_include_group_by_columns(bool value) {
-  _internal_set_include_group_by_columns(value);
-  // @@protoc_insertion_point(field_set:io.deephaven.proto.backplane.grpc.Aggregation.AggregationPartition.include_group_by_columns)
-}
-inline bool Aggregation_AggregationPartition::_internal_include_group_by_columns() const {
-  PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race);
-  return _impl_.include_group_by_columns_;
-}
-inline void Aggregation_AggregationPartition::_internal_set_include_group_by_columns(bool value) {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  ;
-  _impl_.include_group_by_columns_ = value;
-}
-
-// -------------------------------------------------------------------
-
-// Aggregation
-
-// .io.deephaven.proto.backplane.grpc.Aggregation.AggregationColumns columns = 1;
-inline bool Aggregation::has_columns() const {
-  return type_case() == kColumns;
-}
-inline bool Aggregation::_internal_has_columns() const {
-  return type_case() == kColumns;
-}
-inline void Aggregation::set_has_columns() {
-  _impl_._oneof_case_[0] = kColumns;
-}
-inline void Aggregation::clear_columns() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  if (type_case() == kColumns) {
-    if (GetArena() == nullptr) {
-      delete _impl_.type_.columns_;
-    }
-    clear_has_type();
-  }
-}
-inline ::io::deephaven::proto::backplane::grpc::Aggregation_AggregationColumns* Aggregation::release_columns() {
-  // @@protoc_insertion_point(field_release:io.deephaven.proto.backplane.grpc.Aggregation.columns)
-  if (type_case() == kColumns) {
-    clear_has_type();
-    auto* temp = _impl_.type_.columns_;
-    if (GetArena() != nullptr) {
-      temp = ::google::protobuf::internal::DuplicateIfNonNull(temp);
-    }
-    _impl_.type_.columns_ = nullptr;
-    return temp;
-  } else {
-    return nullptr;
-  }
-}
-inline const ::io::deephaven::proto::backplane::grpc::Aggregation_AggregationColumns& Aggregation::_internal_columns() const {
-  return type_case() == kColumns ? *_impl_.type_.columns_ : reinterpret_cast<::io::deephaven::proto::backplane::grpc::Aggregation_AggregationColumns&>(::io::deephaven::proto::backplane::grpc::_Aggregation_AggregationColumns_default_instance_);
-}
-inline const ::io::deephaven::proto::backplane::grpc::Aggregation_AggregationColumns& Aggregation::columns() const ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  // @@protoc_insertion_point(field_get:io.deephaven.proto.backplane.grpc.Aggregation.columns)
-  return _internal_columns();
-}
-inline ::io::deephaven::proto::backplane::grpc::Aggregation_AggregationColumns* Aggregation::unsafe_arena_release_columns() {
-  // @@protoc_insertion_point(field_unsafe_arena_release:io.deephaven.proto.backplane.grpc.Aggregation.columns)
-  if (type_case() == kColumns) {
-    clear_has_type();
-    auto* temp = _impl_.type_.columns_;
-    _impl_.type_.columns_ = nullptr;
-    return temp;
-  } else {
-    return nullptr;
-  }
-}
-inline void Aggregation::unsafe_arena_set_allocated_columns(::io::deephaven::proto::backplane::grpc::Aggregation_AggregationColumns* value) {
-  // We rely on the oneof clear method to free the earlier contents
-  // of this oneof. We can directly use the pointer we're given to
-  // set the new value.
-  clear_type();
-  if (value) {
-    set_has_columns();
-    _impl_.type_.columns_ = value;
-  }
-  // @@protoc_insertion_point(field_unsafe_arena_set_allocated:io.deephaven.proto.backplane.grpc.Aggregation.columns)
-}
-inline ::io::deephaven::proto::backplane::grpc::Aggregation_AggregationColumns* Aggregation::_internal_mutable_columns() {
-  if (type_case() != kColumns) {
-    clear_type();
-    set_has_columns();
-    _impl_.type_.columns_ = CreateMaybeMessage<::io::deephaven::proto::backplane::grpc::Aggregation_AggregationColumns>(GetArena());
-  }
-  return _impl_.type_.columns_;
-}
-inline ::io::deephaven::proto::backplane::grpc::Aggregation_AggregationColumns* Aggregation::mutable_columns() ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  ::io::deephaven::proto::backplane::grpc::Aggregation_AggregationColumns* _msg = _internal_mutable_columns();
-  // @@protoc_insertion_point(field_mutable:io.deephaven.proto.backplane.grpc.Aggregation.columns)
-  return _msg;
-}
-
-// .io.deephaven.proto.backplane.grpc.Aggregation.AggregationCount count = 2;
-inline bool Aggregation::has_count() const {
-  return type_case() == kCount;
-}
-inline bool Aggregation::_internal_has_count() const {
-  return type_case() == kCount;
-}
-inline void Aggregation::set_has_count() {
-  _impl_._oneof_case_[0] = kCount;
-}
-inline void Aggregation::clear_count() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  if (type_case() == kCount) {
-    if (GetArena() == nullptr) {
-      delete _impl_.type_.count_;
-    }
-    clear_has_type();
-  }
-}
-inline ::io::deephaven::proto::backplane::grpc::Aggregation_AggregationCount* Aggregation::release_count() {
-  // @@protoc_insertion_point(field_release:io.deephaven.proto.backplane.grpc.Aggregation.count)
-  if (type_case() == kCount) {
-    clear_has_type();
-    auto* temp = _impl_.type_.count_;
-    if (GetArena() != nullptr) {
-      temp = ::google::protobuf::internal::DuplicateIfNonNull(temp);
-    }
-    _impl_.type_.count_ = nullptr;
-    return temp;
-  } else {
-    return nullptr;
-  }
-}
-inline const ::io::deephaven::proto::backplane::grpc::Aggregation_AggregationCount& Aggregation::_internal_count() const {
-  return type_case() == kCount ? *_impl_.type_.count_ : reinterpret_cast<::io::deephaven::proto::backplane::grpc::Aggregation_AggregationCount&>(::io::deephaven::proto::backplane::grpc::_Aggregation_AggregationCount_default_instance_);
-}
-inline const ::io::deephaven::proto::backplane::grpc::Aggregation_AggregationCount& Aggregation::count() const ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  // @@protoc_insertion_point(field_get:io.deephaven.proto.backplane.grpc.Aggregation.count)
-  return _internal_count();
-}
-inline ::io::deephaven::proto::backplane::grpc::Aggregation_AggregationCount* Aggregation::unsafe_arena_release_count() {
-  // @@protoc_insertion_point(field_unsafe_arena_release:io.deephaven.proto.backplane.grpc.Aggregation.count)
-  if (type_case() == kCount) {
-    clear_has_type();
-    auto* temp = _impl_.type_.count_;
-    _impl_.type_.count_ = nullptr;
-    return temp;
-  } else {
-    return nullptr;
-  }
-}
-inline void Aggregation::unsafe_arena_set_allocated_count(::io::deephaven::proto::backplane::grpc::Aggregation_AggregationCount* value) {
-  // We rely on the oneof clear method to free the earlier contents
-  // of this oneof. We can directly use the pointer we're given to
-  // set the new value.
-  clear_type();
-  if (value) {
-    set_has_count();
-    _impl_.type_.count_ = value;
-  }
-  // @@protoc_insertion_point(field_unsafe_arena_set_allocated:io.deephaven.proto.backplane.grpc.Aggregation.count)
-}
-inline ::io::deephaven::proto::backplane::grpc::Aggregation_AggregationCount* Aggregation::_internal_mutable_count() {
-  if (type_case() != kCount) {
-    clear_type();
-    set_has_count();
-    _impl_.type_.count_ = CreateMaybeMessage<::io::deephaven::proto::backplane::grpc::Aggregation_AggregationCount>(GetArena());
-  }
-  return _impl_.type_.count_;
-}
-inline ::io::deephaven::proto::backplane::grpc::Aggregation_AggregationCount* Aggregation::mutable_count() ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  ::io::deephaven::proto::backplane::grpc::Aggregation_AggregationCount* _msg = _internal_mutable_count();
-  // @@protoc_insertion_point(field_mutable:io.deephaven.proto.backplane.grpc.Aggregation.count)
-  return _msg;
-}
-
-// .io.deephaven.proto.backplane.grpc.Aggregation.AggregationRowKey first_row_key = 3;
-inline bool Aggregation::has_first_row_key() const {
-  return type_case() == kFirstRowKey;
-}
-inline bool Aggregation::_internal_has_first_row_key() const {
-  return type_case() == kFirstRowKey;
-}
-inline void Aggregation::set_has_first_row_key() {
-  _impl_._oneof_case_[0] = kFirstRowKey;
-}
-inline void Aggregation::clear_first_row_key() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  if (type_case() == kFirstRowKey) {
-    if (GetArena() == nullptr) {
-      delete _impl_.type_.first_row_key_;
-    }
-    clear_has_type();
-  }
-}
-inline ::io::deephaven::proto::backplane::grpc::Aggregation_AggregationRowKey* Aggregation::release_first_row_key() {
-  // @@protoc_insertion_point(field_release:io.deephaven.proto.backplane.grpc.Aggregation.first_row_key)
-  if (type_case() == kFirstRowKey) {
-    clear_has_type();
-    auto* temp = _impl_.type_.first_row_key_;
-    if (GetArena() != nullptr) {
-      temp = ::google::protobuf::internal::DuplicateIfNonNull(temp);
-    }
-    _impl_.type_.first_row_key_ = nullptr;
-    return temp;
-  } else {
-    return nullptr;
-  }
-}
-inline const ::io::deephaven::proto::backplane::grpc::Aggregation_AggregationRowKey& Aggregation::_internal_first_row_key() const {
-  return type_case() == kFirstRowKey ? *_impl_.type_.first_row_key_ : reinterpret_cast<::io::deephaven::proto::backplane::grpc::Aggregation_AggregationRowKey&>(::io::deephaven::proto::backplane::grpc::_Aggregation_AggregationRowKey_default_instance_);
-}
-inline const ::io::deephaven::proto::backplane::grpc::Aggregation_AggregationRowKey& Aggregation::first_row_key() const ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  // @@protoc_insertion_point(field_get:io.deephaven.proto.backplane.grpc.Aggregation.first_row_key)
-  return _internal_first_row_key();
-}
-inline ::io::deephaven::proto::backplane::grpc::Aggregation_AggregationRowKey* Aggregation::unsafe_arena_release_first_row_key() {
-  // @@protoc_insertion_point(field_unsafe_arena_release:io.deephaven.proto.backplane.grpc.Aggregation.first_row_key)
-  if (type_case() == kFirstRowKey) {
-    clear_has_type();
-    auto* temp = _impl_.type_.first_row_key_;
-    _impl_.type_.first_row_key_ = nullptr;
-    return temp;
-  } else {
-    return nullptr;
-  }
-}
-inline void Aggregation::unsafe_arena_set_allocated_first_row_key(::io::deephaven::proto::backplane::grpc::Aggregation_AggregationRowKey* value) {
-  // We rely on the oneof clear method to free the earlier contents
-  // of this oneof. We can directly use the pointer we're given to
-  // set the new value.
-  clear_type();
-  if (value) {
-    set_has_first_row_key();
-    _impl_.type_.first_row_key_ = value;
-  }
-  // @@protoc_insertion_point(field_unsafe_arena_set_allocated:io.deephaven.proto.backplane.grpc.Aggregation.first_row_key)
-}
-inline ::io::deephaven::proto::backplane::grpc::Aggregation_AggregationRowKey* Aggregation::_internal_mutable_first_row_key() {
-  if (type_case() != kFirstRowKey) {
-    clear_type();
-    set_has_first_row_key();
-    _impl_.type_.first_row_key_ = CreateMaybeMessage<::io::deephaven::proto::backplane::grpc::Aggregation_AggregationRowKey>(GetArena());
-  }
-  return _impl_.type_.first_row_key_;
-}
-inline ::io::deephaven::proto::backplane::grpc::Aggregation_AggregationRowKey* Aggregation::mutable_first_row_key() ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  ::io::deephaven::proto::backplane::grpc::Aggregation_AggregationRowKey* _msg = _internal_mutable_first_row_key();
-  // @@protoc_insertion_point(field_mutable:io.deephaven.proto.backplane.grpc.Aggregation.first_row_key)
-  return _msg;
-}
-
-// .io.deephaven.proto.backplane.grpc.Aggregation.AggregationRowKey last_row_key = 4;
-inline bool Aggregation::has_last_row_key() const {
-  return type_case() == kLastRowKey;
-}
-inline bool Aggregation::_internal_has_last_row_key() const {
-  return type_case() == kLastRowKey;
-}
-inline void Aggregation::set_has_last_row_key() {
-  _impl_._oneof_case_[0] = kLastRowKey;
-}
-inline void Aggregation::clear_last_row_key() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  if (type_case() == kLastRowKey) {
-    if (GetArena() == nullptr) {
-      delete _impl_.type_.last_row_key_;
-    }
-    clear_has_type();
-  }
-}
-inline ::io::deephaven::proto::backplane::grpc::Aggregation_AggregationRowKey* Aggregation::release_last_row_key() {
-  // @@protoc_insertion_point(field_release:io.deephaven.proto.backplane.grpc.Aggregation.last_row_key)
-  if (type_case() == kLastRowKey) {
-    clear_has_type();
-    auto* temp = _impl_.type_.last_row_key_;
-    if (GetArena() != nullptr) {
-      temp = ::google::protobuf::internal::DuplicateIfNonNull(temp);
-    }
-    _impl_.type_.last_row_key_ = nullptr;
-    return temp;
-  } else {
-    return nullptr;
-  }
-}
-inline const ::io::deephaven::proto::backplane::grpc::Aggregation_AggregationRowKey& Aggregation::_internal_last_row_key() const {
-  return type_case() == kLastRowKey ? *_impl_.type_.last_row_key_ : reinterpret_cast<::io::deephaven::proto::backplane::grpc::Aggregation_AggregationRowKey&>(::io::deephaven::proto::backplane::grpc::_Aggregation_AggregationRowKey_default_instance_);
-}
-inline const ::io::deephaven::proto::backplane::grpc::Aggregation_AggregationRowKey& Aggregation::last_row_key() const ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  // @@protoc_insertion_point(field_get:io.deephaven.proto.backplane.grpc.Aggregation.last_row_key)
-  return _internal_last_row_key();
-}
-inline ::io::deephaven::proto::backplane::grpc::Aggregation_AggregationRowKey* Aggregation::unsafe_arena_release_last_row_key() {
-  // @@protoc_insertion_point(field_unsafe_arena_release:io.deephaven.proto.backplane.grpc.Aggregation.last_row_key)
-  if (type_case() == kLastRowKey) {
-    clear_has_type();
-    auto* temp = _impl_.type_.last_row_key_;
-    _impl_.type_.last_row_key_ = nullptr;
-    return temp;
-  } else {
-    return nullptr;
-  }
-}
-inline void Aggregation::unsafe_arena_set_allocated_last_row_key(::io::deephaven::proto::backplane::grpc::Aggregation_AggregationRowKey* value) {
-  // We rely on the oneof clear method to free the earlier contents
-  // of this oneof. We can directly use the pointer we're given to
-  // set the new value.
-  clear_type();
-  if (value) {
-    set_has_last_row_key();
-    _impl_.type_.last_row_key_ = value;
-  }
-  // @@protoc_insertion_point(field_unsafe_arena_set_allocated:io.deephaven.proto.backplane.grpc.Aggregation.last_row_key)
-}
-inline ::io::deephaven::proto::backplane::grpc::Aggregation_AggregationRowKey* Aggregation::_internal_mutable_last_row_key() {
-  if (type_case() != kLastRowKey) {
-    clear_type();
-    set_has_last_row_key();
-    _impl_.type_.last_row_key_ = CreateMaybeMessage<::io::deephaven::proto::backplane::grpc::Aggregation_AggregationRowKey>(GetArena());
-  }
-  return _impl_.type_.last_row_key_;
-}
-inline ::io::deephaven::proto::backplane::grpc::Aggregation_AggregationRowKey* Aggregation::mutable_last_row_key() ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  ::io::deephaven::proto::backplane::grpc::Aggregation_AggregationRowKey* _msg = _internal_mutable_last_row_key();
-  // @@protoc_insertion_point(field_mutable:io.deephaven.proto.backplane.grpc.Aggregation.last_row_key)
-  return _msg;
-}
-
-// .io.deephaven.proto.backplane.grpc.Aggregation.AggregationPartition partition = 5;
-inline bool Aggregation::has_partition() const {
-  return type_case() == kPartition;
-}
-inline bool Aggregation::_internal_has_partition() const {
-  return type_case() == kPartition;
-}
-inline void Aggregation::set_has_partition() {
-  _impl_._oneof_case_[0] = kPartition;
-}
-inline void Aggregation::clear_partition() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  if (type_case() == kPartition) {
-    if (GetArena() == nullptr) {
-      delete _impl_.type_.partition_;
-    }
-    clear_has_type();
-  }
-}
-inline ::io::deephaven::proto::backplane::grpc::Aggregation_AggregationPartition* Aggregation::release_partition() {
-  // @@protoc_insertion_point(field_release:io.deephaven.proto.backplane.grpc.Aggregation.partition)
-  if (type_case() == kPartition) {
-    clear_has_type();
-    auto* temp = _impl_.type_.partition_;
-    if (GetArena() != nullptr) {
-      temp = ::google::protobuf::internal::DuplicateIfNonNull(temp);
-    }
-    _impl_.type_.partition_ = nullptr;
-    return temp;
-  } else {
-    return nullptr;
-  }
-}
-inline const ::io::deephaven::proto::backplane::grpc::Aggregation_AggregationPartition& Aggregation::_internal_partition() const {
-  return type_case() == kPartition ? *_impl_.type_.partition_ : reinterpret_cast<::io::deephaven::proto::backplane::grpc::Aggregation_AggregationPartition&>(::io::deephaven::proto::backplane::grpc::_Aggregation_AggregationPartition_default_instance_);
-}
-inline const ::io::deephaven::proto::backplane::grpc::Aggregation_AggregationPartition& Aggregation::partition() const ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  // @@protoc_insertion_point(field_get:io.deephaven.proto.backplane.grpc.Aggregation.partition)
-  return _internal_partition();
-}
-inline ::io::deephaven::proto::backplane::grpc::Aggregation_AggregationPartition* Aggregation::unsafe_arena_release_partition() {
-  // @@protoc_insertion_point(field_unsafe_arena_release:io.deephaven.proto.backplane.grpc.Aggregation.partition)
-  if (type_case() == kPartition) {
-    clear_has_type();
-    auto* temp = _impl_.type_.partition_;
-    _impl_.type_.partition_ = nullptr;
-    return temp;
-  } else {
-    return nullptr;
-  }
-}
-inline void Aggregation::unsafe_arena_set_allocated_partition(::io::deephaven::proto::backplane::grpc::Aggregation_AggregationPartition* value) {
-  // We rely on the oneof clear method to free the earlier contents
-  // of this oneof. We can directly use the pointer we're given to
-  // set the new value.
-  clear_type();
-  if (value) {
-    set_has_partition();
-    _impl_.type_.partition_ = value;
-  }
-  // @@protoc_insertion_point(field_unsafe_arena_set_allocated:io.deephaven.proto.backplane.grpc.Aggregation.partition)
-}
-inline ::io::deephaven::proto::backplane::grpc::Aggregation_AggregationPartition* Aggregation::_internal_mutable_partition() {
-  if (type_case() != kPartition) {
-    clear_type();
-    set_has_partition();
-    _impl_.type_.partition_ = CreateMaybeMessage<::io::deephaven::proto::backplane::grpc::Aggregation_AggregationPartition>(GetArena());
-  }
-  return _impl_.type_.partition_;
-}
-inline ::io::deephaven::proto::backplane::grpc::Aggregation_AggregationPartition* Aggregation::mutable_partition() ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  ::io::deephaven::proto::backplane::grpc::Aggregation_AggregationPartition* _msg = _internal_mutable_partition();
-  // @@protoc_insertion_point(field_mutable:io.deephaven.proto.backplane.grpc.Aggregation.partition)
-  return _msg;
-}
-
-inline bool Aggregation::has_type() const {
-  return type_case() != TYPE_NOT_SET;
-}
-inline void Aggregation::clear_has_type() {
-  _impl_._oneof_case_[0] = TYPE_NOT_SET;
-}
-inline Aggregation::TypeCase Aggregation::type_case() const {
-  return Aggregation::TypeCase(_impl_._oneof_case_[0]);
-}
-// -------------------------------------------------------------------
-
-// SortDescriptor
-
-// string column_name = 1;
-inline void SortDescriptor::clear_column_name() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  _impl_.column_name_.ClearToEmpty();
-}
-inline const std::string& SortDescriptor::column_name() const
-    ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  // @@protoc_insertion_point(field_get:io.deephaven.proto.backplane.grpc.SortDescriptor.column_name)
-  return _internal_column_name();
-}
-template <typename Arg_, typename... Args_>
-inline PROTOBUF_ALWAYS_INLINE void SortDescriptor::set_column_name(Arg_&& arg,
-                                                     Args_... args) {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  ;
-  _impl_.column_name_.Set(static_cast<Arg_&&>(arg), args..., GetArena());
-  // @@protoc_insertion_point(field_set:io.deephaven.proto.backplane.grpc.SortDescriptor.column_name)
-}
-inline std::string* SortDescriptor::mutable_column_name() ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  std::string* _s = _internal_mutable_column_name();
-  // @@protoc_insertion_point(field_mutable:io.deephaven.proto.backplane.grpc.SortDescriptor.column_name)
-  return _s;
-}
-inline const std::string& SortDescriptor::_internal_column_name() const {
-  PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race);
-  return _impl_.column_name_.Get();
-}
-inline void SortDescriptor::_internal_set_column_name(const std::string& value) {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  ;
-  _impl_.column_name_.Set(value, GetArena());
-}
-inline std::string* SortDescriptor::_internal_mutable_column_name() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  ;
-  return _impl_.column_name_.Mutable( GetArena());
-}
-inline std::string* SortDescriptor::release_column_name() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  // @@protoc_insertion_point(field_release:io.deephaven.proto.backplane.grpc.SortDescriptor.column_name)
-  return _impl_.column_name_.Release();
-}
-inline void SortDescriptor::set_allocated_column_name(std::string* value) {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  _impl_.column_name_.SetAllocated(value, GetArena());
-  #ifdef PROTOBUF_FORCE_COPY_DEFAULT_STRING
-        if (_impl_.column_name_.IsDefault()) {
-          _impl_.column_name_.Set("", GetArena());
-        }
-  #endif  // PROTOBUF_FORCE_COPY_DEFAULT_STRING
-  // @@protoc_insertion_point(field_set_allocated:io.deephaven.proto.backplane.grpc.SortDescriptor.column_name)
-}
-
-// bool is_absolute = 2;
-inline void SortDescriptor::clear_is_absolute() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  _impl_.is_absolute_ = false;
-}
-inline bool SortDescriptor::is_absolute() const {
-  // @@protoc_insertion_point(field_get:io.deephaven.proto.backplane.grpc.SortDescriptor.is_absolute)
-  return _internal_is_absolute();
-}
-inline void SortDescriptor::set_is_absolute(bool value) {
-  _internal_set_is_absolute(value);
-  // @@protoc_insertion_point(field_set:io.deephaven.proto.backplane.grpc.SortDescriptor.is_absolute)
-}
-inline bool SortDescriptor::_internal_is_absolute() const {
-  PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race);
-  return _impl_.is_absolute_;
-}
-inline void SortDescriptor::_internal_set_is_absolute(bool value) {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  ;
-  _impl_.is_absolute_ = value;
-}
-
-// .io.deephaven.proto.backplane.grpc.SortDescriptor.SortDirection direction = 3;
-inline void SortDescriptor::clear_direction() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  _impl_.direction_ = 0;
-}
-inline ::io::deephaven::proto::backplane::grpc::SortDescriptor_SortDirection SortDescriptor::direction() const {
-  // @@protoc_insertion_point(field_get:io.deephaven.proto.backplane.grpc.SortDescriptor.direction)
-  return _internal_direction();
-}
-inline void SortDescriptor::set_direction(::io::deephaven::proto::backplane::grpc::SortDescriptor_SortDirection value) {
-  _internal_set_direction(value);
-  // @@protoc_insertion_point(field_set:io.deephaven.proto.backplane.grpc.SortDescriptor.direction)
-}
-inline ::io::deephaven::proto::backplane::grpc::SortDescriptor_SortDirection SortDescriptor::_internal_direction() const {
-  PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race);
-  return static_cast<::io::deephaven::proto::backplane::grpc::SortDescriptor_SortDirection>(_impl_.direction_);
-}
-inline void SortDescriptor::_internal_set_direction(::io::deephaven::proto::backplane::grpc::SortDescriptor_SortDirection value) {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  ;
-  _impl_.direction_ = value;
-}
-
-// -------------------------------------------------------------------
-
-// SortTableRequest
-
-// .io.deephaven.proto.backplane.grpc.Ticket result_id = 1;
-inline bool SortTableRequest::has_result_id() const {
-  bool value = (_impl_._has_bits_[0] & 0x00000001u) != 0;
-  PROTOBUF_ASSUME(!value || _impl_.result_id_ != nullptr);
-  return value;
-}
-inline const ::io::deephaven::proto::backplane::grpc::Ticket& SortTableRequest::_internal_result_id() const {
-  PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race);
-  const ::io::deephaven::proto::backplane::grpc::Ticket* p = _impl_.result_id_;
-  return p != nullptr ? *p : reinterpret_cast<const ::io::deephaven::proto::backplane::grpc::Ticket&>(::io::deephaven::proto::backplane::grpc::_Ticket_default_instance_);
-}
-inline const ::io::deephaven::proto::backplane::grpc::Ticket& SortTableRequest::result_id() const ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  // @@protoc_insertion_point(field_get:io.deephaven.proto.backplane.grpc.SortTableRequest.result_id)
-  return _internal_result_id();
-}
-inline void SortTableRequest::unsafe_arena_set_allocated_result_id(::io::deephaven::proto::backplane::grpc::Ticket* value) {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  if (GetArena() == nullptr) {
-    delete reinterpret_cast<::google::protobuf::MessageLite*>(_impl_.result_id_);
-  }
-  _impl_.result_id_ = reinterpret_cast<::io::deephaven::proto::backplane::grpc::Ticket*>(value);
-  if (value != nullptr) {
-    _impl_._has_bits_[0] |= 0x00000001u;
-  } else {
-    _impl_._has_bits_[0] &= ~0x00000001u;
-  }
-  // @@protoc_insertion_point(field_unsafe_arena_set_allocated:io.deephaven.proto.backplane.grpc.SortTableRequest.result_id)
-}
-inline ::io::deephaven::proto::backplane::grpc::Ticket* SortTableRequest::release_result_id() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-
-  _impl_._has_bits_[0] &= ~0x00000001u;
-  ::io::deephaven::proto::backplane::grpc::Ticket* released = _impl_.result_id_;
-  _impl_.result_id_ = nullptr;
-#ifdef PROTOBUF_FORCE_COPY_IN_RELEASE
-  auto* old = reinterpret_cast<::google::protobuf::MessageLite*>(released);
-  released = ::google::protobuf::internal::DuplicateIfNonNull(released);
-  if (GetArena() == nullptr) {
-    delete old;
-  }
-#else   // PROTOBUF_FORCE_COPY_IN_RELEASE
-  if (GetArena() != nullptr) {
-    released = ::google::protobuf::internal::DuplicateIfNonNull(released);
-  }
-#endif  // !PROTOBUF_FORCE_COPY_IN_RELEASE
-  return released;
-}
-inline ::io::deephaven::proto::backplane::grpc::Ticket* SortTableRequest::unsafe_arena_release_result_id() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  // @@protoc_insertion_point(field_release:io.deephaven.proto.backplane.grpc.SortTableRequest.result_id)
-
-  _impl_._has_bits_[0] &= ~0x00000001u;
-  ::io::deephaven::proto::backplane::grpc::Ticket* temp = _impl_.result_id_;
-  _impl_.result_id_ = nullptr;
-  return temp;
-}
-inline ::io::deephaven::proto::backplane::grpc::Ticket* SortTableRequest::_internal_mutable_result_id() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  _impl_._has_bits_[0] |= 0x00000001u;
-  if (_impl_.result_id_ == nullptr) {
-    auto* p = CreateMaybeMessage<::io::deephaven::proto::backplane::grpc::Ticket>(GetArena());
-    _impl_.result_id_ = reinterpret_cast<::io::deephaven::proto::backplane::grpc::Ticket*>(p);
-  }
-  return _impl_.result_id_;
-}
-inline ::io::deephaven::proto::backplane::grpc::Ticket* SortTableRequest::mutable_result_id() ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  ::io::deephaven::proto::backplane::grpc::Ticket* _msg = _internal_mutable_result_id();
-  // @@protoc_insertion_point(field_mutable:io.deephaven.proto.backplane.grpc.SortTableRequest.result_id)
-  return _msg;
-}
-inline void SortTableRequest::set_allocated_result_id(::io::deephaven::proto::backplane::grpc::Ticket* value) {
-  ::google::protobuf::Arena* message_arena = GetArena();
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  if (message_arena == nullptr) {
-    delete reinterpret_cast<::google::protobuf::MessageLite*>(_impl_.result_id_);
-  }
-
-  if (value != nullptr) {
-    ::google::protobuf::Arena* submessage_arena = reinterpret_cast<::google::protobuf::MessageLite*>(value)->GetArena();
-    if (message_arena != submessage_arena) {
-      value = ::google::protobuf::internal::GetOwnedMessage(message_arena, value, submessage_arena);
-    }
-    _impl_._has_bits_[0] |= 0x00000001u;
-  } else {
-    _impl_._has_bits_[0] &= ~0x00000001u;
-  }
-
-  _impl_.result_id_ = reinterpret_cast<::io::deephaven::proto::backplane::grpc::Ticket*>(value);
-  // @@protoc_insertion_point(field_set_allocated:io.deephaven.proto.backplane.grpc.SortTableRequest.result_id)
-}
-
-// .io.deephaven.proto.backplane.grpc.TableReference source_id = 2;
-inline bool SortTableRequest::has_source_id() const {
-  bool value = (_impl_._has_bits_[0] & 0x00000002u) != 0;
-  PROTOBUF_ASSUME(!value || _impl_.source_id_ != nullptr);
-  return value;
-}
-inline void SortTableRequest::clear_source_id() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  if (_impl_.source_id_ != nullptr) _impl_.source_id_->Clear();
-  _impl_._has_bits_[0] &= ~0x00000002u;
-}
-inline const ::io::deephaven::proto::backplane::grpc::TableReference& SortTableRequest::_internal_source_id() const {
-  PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race);
-  const ::io::deephaven::proto::backplane::grpc::TableReference* p = _impl_.source_id_;
-  return p != nullptr ? *p : reinterpret_cast<const ::io::deephaven::proto::backplane::grpc::TableReference&>(::io::deephaven::proto::backplane::grpc::_TableReference_default_instance_);
-}
-inline const ::io::deephaven::proto::backplane::grpc::TableReference& SortTableRequest::source_id() const ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  // @@protoc_insertion_point(field_get:io.deephaven.proto.backplane.grpc.SortTableRequest.source_id)
-  return _internal_source_id();
-}
-inline void SortTableRequest::unsafe_arena_set_allocated_source_id(::io::deephaven::proto::backplane::grpc::TableReference* value) {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  if (GetArena() == nullptr) {
-    delete reinterpret_cast<::google::protobuf::MessageLite*>(_impl_.source_id_);
-  }
-  _impl_.source_id_ = reinterpret_cast<::io::deephaven::proto::backplane::grpc::TableReference*>(value);
-  if (value != nullptr) {
-    _impl_._has_bits_[0] |= 0x00000002u;
-  } else {
-    _impl_._has_bits_[0] &= ~0x00000002u;
-  }
-  // @@protoc_insertion_point(field_unsafe_arena_set_allocated:io.deephaven.proto.backplane.grpc.SortTableRequest.source_id)
-}
-inline ::io::deephaven::proto::backplane::grpc::TableReference* SortTableRequest::release_source_id() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-
-  _impl_._has_bits_[0] &= ~0x00000002u;
-  ::io::deephaven::proto::backplane::grpc::TableReference* released = _impl_.source_id_;
-  _impl_.source_id_ = nullptr;
-#ifdef PROTOBUF_FORCE_COPY_IN_RELEASE
-  auto* old = reinterpret_cast<::google::protobuf::MessageLite*>(released);
-  released = ::google::protobuf::internal::DuplicateIfNonNull(released);
-  if (GetArena() == nullptr) {
-    delete old;
-  }
-#else   // PROTOBUF_FORCE_COPY_IN_RELEASE
-  if (GetArena() != nullptr) {
-    released = ::google::protobuf::internal::DuplicateIfNonNull(released);
-  }
-#endif  // !PROTOBUF_FORCE_COPY_IN_RELEASE
-  return released;
-}
-inline ::io::deephaven::proto::backplane::grpc::TableReference* SortTableRequest::unsafe_arena_release_source_id() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  // @@protoc_insertion_point(field_release:io.deephaven.proto.backplane.grpc.SortTableRequest.source_id)
-
-  _impl_._has_bits_[0] &= ~0x00000002u;
-  ::io::deephaven::proto::backplane::grpc::TableReference* temp = _impl_.source_id_;
-  _impl_.source_id_ = nullptr;
-  return temp;
-}
-inline ::io::deephaven::proto::backplane::grpc::TableReference* SortTableRequest::_internal_mutable_source_id() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  _impl_._has_bits_[0] |= 0x00000002u;
-  if (_impl_.source_id_ == nullptr) {
-    auto* p = CreateMaybeMessage<::io::deephaven::proto::backplane::grpc::TableReference>(GetArena());
-    _impl_.source_id_ = reinterpret_cast<::io::deephaven::proto::backplane::grpc::TableReference*>(p);
-  }
-  return _impl_.source_id_;
-}
-inline ::io::deephaven::proto::backplane::grpc::TableReference* SortTableRequest::mutable_source_id() ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  ::io::deephaven::proto::backplane::grpc::TableReference* _msg = _internal_mutable_source_id();
-  // @@protoc_insertion_point(field_mutable:io.deephaven.proto.backplane.grpc.SortTableRequest.source_id)
-  return _msg;
-}
-inline void SortTableRequest::set_allocated_source_id(::io::deephaven::proto::backplane::grpc::TableReference* value) {
-  ::google::protobuf::Arena* message_arena = GetArena();
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  if (message_arena == nullptr) {
-    delete reinterpret_cast<::io::deephaven::proto::backplane::grpc::TableReference*>(_impl_.source_id_);
-  }
-
-  if (value != nullptr) {
-    ::google::protobuf::Arena* submessage_arena = reinterpret_cast<::io::deephaven::proto::backplane::grpc::TableReference*>(value)->GetArena();
-    if (message_arena != submessage_arena) {
-      value = ::google::protobuf::internal::GetOwnedMessage(message_arena, value, submessage_arena);
-    }
-    _impl_._has_bits_[0] |= 0x00000002u;
-  } else {
-    _impl_._has_bits_[0] &= ~0x00000002u;
-  }
-
-  _impl_.source_id_ = reinterpret_cast<::io::deephaven::proto::backplane::grpc::TableReference*>(value);
-  // @@protoc_insertion_point(field_set_allocated:io.deephaven.proto.backplane.grpc.SortTableRequest.source_id)
-}
-
-// repeated .io.deephaven.proto.backplane.grpc.SortDescriptor sorts = 3;
-inline int SortTableRequest::_internal_sorts_size() const {
-  return _internal_sorts().size();
-}
-inline int SortTableRequest::sorts_size() const {
-  return _internal_sorts_size();
-}
-inline void SortTableRequest::clear_sorts() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  _impl_.sorts_.Clear();
-}
-inline ::io::deephaven::proto::backplane::grpc::SortDescriptor* SortTableRequest::mutable_sorts(int index)
-    ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  // @@protoc_insertion_point(field_mutable:io.deephaven.proto.backplane.grpc.SortTableRequest.sorts)
-  return _internal_mutable_sorts()->Mutable(index);
-}
-inline ::google::protobuf::RepeatedPtrField<::io::deephaven::proto::backplane::grpc::SortDescriptor>* SortTableRequest::mutable_sorts()
-    ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  // @@protoc_insertion_point(field_mutable_list:io.deephaven.proto.backplane.grpc.SortTableRequest.sorts)
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  return _internal_mutable_sorts();
-}
-inline const ::io::deephaven::proto::backplane::grpc::SortDescriptor& SortTableRequest::sorts(int index) const
-    ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  // @@protoc_insertion_point(field_get:io.deephaven.proto.backplane.grpc.SortTableRequest.sorts)
-  return _internal_sorts().Get(index);
-}
-inline ::io::deephaven::proto::backplane::grpc::SortDescriptor* SortTableRequest::add_sorts() ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  ::io::deephaven::proto::backplane::grpc::SortDescriptor* _add = _internal_mutable_sorts()->Add();
-  // @@protoc_insertion_point(field_add:io.deephaven.proto.backplane.grpc.SortTableRequest.sorts)
-  return _add;
-}
-inline const ::google::protobuf::RepeatedPtrField<::io::deephaven::proto::backplane::grpc::SortDescriptor>& SortTableRequest::sorts() const
-    ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  // @@protoc_insertion_point(field_list:io.deephaven.proto.backplane.grpc.SortTableRequest.sorts)
-  return _internal_sorts();
-}
-inline const ::google::protobuf::RepeatedPtrField<::io::deephaven::proto::backplane::grpc::SortDescriptor>&
-SortTableRequest::_internal_sorts() const {
-  PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race);
-  return _impl_.sorts_;
-}
-inline ::google::protobuf::RepeatedPtrField<::io::deephaven::proto::backplane::grpc::SortDescriptor>*
-SortTableRequest::_internal_mutable_sorts() {
-  PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race);
-  return &_impl_.sorts_;
-}
-
-// -------------------------------------------------------------------
-
-// FilterTableRequest
-
-// .io.deephaven.proto.backplane.grpc.Ticket result_id = 1;
-inline bool FilterTableRequest::has_result_id() const {
-  bool value = (_impl_._has_bits_[0] & 0x00000001u) != 0;
-  PROTOBUF_ASSUME(!value || _impl_.result_id_ != nullptr);
-  return value;
-}
-inline const ::io::deephaven::proto::backplane::grpc::Ticket& FilterTableRequest::_internal_result_id() const {
-  PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race);
-  const ::io::deephaven::proto::backplane::grpc::Ticket* p = _impl_.result_id_;
-  return p != nullptr ? *p : reinterpret_cast<const ::io::deephaven::proto::backplane::grpc::Ticket&>(::io::deephaven::proto::backplane::grpc::_Ticket_default_instance_);
-}
-inline const ::io::deephaven::proto::backplane::grpc::Ticket& FilterTableRequest::result_id() const ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  // @@protoc_insertion_point(field_get:io.deephaven.proto.backplane.grpc.FilterTableRequest.result_id)
-  return _internal_result_id();
-}
-inline void FilterTableRequest::unsafe_arena_set_allocated_result_id(::io::deephaven::proto::backplane::grpc::Ticket* value) {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  if (GetArena() == nullptr) {
-    delete reinterpret_cast<::google::protobuf::MessageLite*>(_impl_.result_id_);
-  }
-  _impl_.result_id_ = reinterpret_cast<::io::deephaven::proto::backplane::grpc::Ticket*>(value);
-  if (value != nullptr) {
-    _impl_._has_bits_[0] |= 0x00000001u;
-  } else {
-    _impl_._has_bits_[0] &= ~0x00000001u;
-  }
-  // @@protoc_insertion_point(field_unsafe_arena_set_allocated:io.deephaven.proto.backplane.grpc.FilterTableRequest.result_id)
-}
-inline ::io::deephaven::proto::backplane::grpc::Ticket* FilterTableRequest::release_result_id() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-
-  _impl_._has_bits_[0] &= ~0x00000001u;
-  ::io::deephaven::proto::backplane::grpc::Ticket* released = _impl_.result_id_;
-  _impl_.result_id_ = nullptr;
-#ifdef PROTOBUF_FORCE_COPY_IN_RELEASE
-  auto* old = reinterpret_cast<::google::protobuf::MessageLite*>(released);
-  released = ::google::protobuf::internal::DuplicateIfNonNull(released);
-  if (GetArena() == nullptr) {
-    delete old;
-  }
-#else   // PROTOBUF_FORCE_COPY_IN_RELEASE
-  if (GetArena() != nullptr) {
-    released = ::google::protobuf::internal::DuplicateIfNonNull(released);
-  }
-#endif  // !PROTOBUF_FORCE_COPY_IN_RELEASE
-  return released;
-}
-inline ::io::deephaven::proto::backplane::grpc::Ticket* FilterTableRequest::unsafe_arena_release_result_id() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  // @@protoc_insertion_point(field_release:io.deephaven.proto.backplane.grpc.FilterTableRequest.result_id)
-
-  _impl_._has_bits_[0] &= ~0x00000001u;
-  ::io::deephaven::proto::backplane::grpc::Ticket* temp = _impl_.result_id_;
-  _impl_.result_id_ = nullptr;
-  return temp;
-}
-inline ::io::deephaven::proto::backplane::grpc::Ticket* FilterTableRequest::_internal_mutable_result_id() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  _impl_._has_bits_[0] |= 0x00000001u;
-  if (_impl_.result_id_ == nullptr) {
-    auto* p = CreateMaybeMessage<::io::deephaven::proto::backplane::grpc::Ticket>(GetArena());
-    _impl_.result_id_ = reinterpret_cast<::io::deephaven::proto::backplane::grpc::Ticket*>(p);
-  }
-  return _impl_.result_id_;
-}
-inline ::io::deephaven::proto::backplane::grpc::Ticket* FilterTableRequest::mutable_result_id() ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  ::io::deephaven::proto::backplane::grpc::Ticket* _msg = _internal_mutable_result_id();
-  // @@protoc_insertion_point(field_mutable:io.deephaven.proto.backplane.grpc.FilterTableRequest.result_id)
-  return _msg;
-}
-inline void FilterTableRequest::set_allocated_result_id(::io::deephaven::proto::backplane::grpc::Ticket* value) {
-  ::google::protobuf::Arena* message_arena = GetArena();
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  if (message_arena == nullptr) {
-    delete reinterpret_cast<::google::protobuf::MessageLite*>(_impl_.result_id_);
-  }
-
-  if (value != nullptr) {
-    ::google::protobuf::Arena* submessage_arena = reinterpret_cast<::google::protobuf::MessageLite*>(value)->GetArena();
-    if (message_arena != submessage_arena) {
-      value = ::google::protobuf::internal::GetOwnedMessage(message_arena, value, submessage_arena);
-    }
-    _impl_._has_bits_[0] |= 0x00000001u;
-  } else {
-    _impl_._has_bits_[0] &= ~0x00000001u;
-  }
-
-  _impl_.result_id_ = reinterpret_cast<::io::deephaven::proto::backplane::grpc::Ticket*>(value);
-  // @@protoc_insertion_point(field_set_allocated:io.deephaven.proto.backplane.grpc.FilterTableRequest.result_id)
-}
-
-// .io.deephaven.proto.backplane.grpc.TableReference source_id = 2;
-inline bool FilterTableRequest::has_source_id() const {
-  bool value = (_impl_._has_bits_[0] & 0x00000002u) != 0;
-  PROTOBUF_ASSUME(!value || _impl_.source_id_ != nullptr);
-  return value;
-}
-inline void FilterTableRequest::clear_source_id() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  if (_impl_.source_id_ != nullptr) _impl_.source_id_->Clear();
-  _impl_._has_bits_[0] &= ~0x00000002u;
-}
-inline const ::io::deephaven::proto::backplane::grpc::TableReference& FilterTableRequest::_internal_source_id() const {
-  PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race);
-  const ::io::deephaven::proto::backplane::grpc::TableReference* p = _impl_.source_id_;
-  return p != nullptr ? *p : reinterpret_cast<const ::io::deephaven::proto::backplane::grpc::TableReference&>(::io::deephaven::proto::backplane::grpc::_TableReference_default_instance_);
-}
-inline const ::io::deephaven::proto::backplane::grpc::TableReference& FilterTableRequest::source_id() const ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  // @@protoc_insertion_point(field_get:io.deephaven.proto.backplane.grpc.FilterTableRequest.source_id)
-  return _internal_source_id();
-}
-inline void FilterTableRequest::unsafe_arena_set_allocated_source_id(::io::deephaven::proto::backplane::grpc::TableReference* value) {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  if (GetArena() == nullptr) {
-    delete reinterpret_cast<::google::protobuf::MessageLite*>(_impl_.source_id_);
-  }
-  _impl_.source_id_ = reinterpret_cast<::io::deephaven::proto::backplane::grpc::TableReference*>(value);
-  if (value != nullptr) {
-    _impl_._has_bits_[0] |= 0x00000002u;
-  } else {
-    _impl_._has_bits_[0] &= ~0x00000002u;
-  }
-  // @@protoc_insertion_point(field_unsafe_arena_set_allocated:io.deephaven.proto.backplane.grpc.FilterTableRequest.source_id)
-}
-inline ::io::deephaven::proto::backplane::grpc::TableReference* FilterTableRequest::release_source_id() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-
-  _impl_._has_bits_[0] &= ~0x00000002u;
-  ::io::deephaven::proto::backplane::grpc::TableReference* released = _impl_.source_id_;
-  _impl_.source_id_ = nullptr;
-#ifdef PROTOBUF_FORCE_COPY_IN_RELEASE
-  auto* old = reinterpret_cast<::google::protobuf::MessageLite*>(released);
-  released = ::google::protobuf::internal::DuplicateIfNonNull(released);
-  if (GetArena() == nullptr) {
-    delete old;
-  }
-#else   // PROTOBUF_FORCE_COPY_IN_RELEASE
-  if (GetArena() != nullptr) {
-    released = ::google::protobuf::internal::DuplicateIfNonNull(released);
-  }
-#endif  // !PROTOBUF_FORCE_COPY_IN_RELEASE
-  return released;
-}
-inline ::io::deephaven::proto::backplane::grpc::TableReference* FilterTableRequest::unsafe_arena_release_source_id() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  // @@protoc_insertion_point(field_release:io.deephaven.proto.backplane.grpc.FilterTableRequest.source_id)
-
-  _impl_._has_bits_[0] &= ~0x00000002u;
-  ::io::deephaven::proto::backplane::grpc::TableReference* temp = _impl_.source_id_;
-  _impl_.source_id_ = nullptr;
-  return temp;
-}
-inline ::io::deephaven::proto::backplane::grpc::TableReference* FilterTableRequest::_internal_mutable_source_id() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  _impl_._has_bits_[0] |= 0x00000002u;
-  if (_impl_.source_id_ == nullptr) {
-    auto* p = CreateMaybeMessage<::io::deephaven::proto::backplane::grpc::TableReference>(GetArena());
-    _impl_.source_id_ = reinterpret_cast<::io::deephaven::proto::backplane::grpc::TableReference*>(p);
-  }
-  return _impl_.source_id_;
-}
-inline ::io::deephaven::proto::backplane::grpc::TableReference* FilterTableRequest::mutable_source_id() ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  ::io::deephaven::proto::backplane::grpc::TableReference* _msg = _internal_mutable_source_id();
-  // @@protoc_insertion_point(field_mutable:io.deephaven.proto.backplane.grpc.FilterTableRequest.source_id)
-  return _msg;
-}
-inline void FilterTableRequest::set_allocated_source_id(::io::deephaven::proto::backplane::grpc::TableReference* value) {
-  ::google::protobuf::Arena* message_arena = GetArena();
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  if (message_arena == nullptr) {
-    delete reinterpret_cast<::io::deephaven::proto::backplane::grpc::TableReference*>(_impl_.source_id_);
-  }
-
-  if (value != nullptr) {
-    ::google::protobuf::Arena* submessage_arena = reinterpret_cast<::io::deephaven::proto::backplane::grpc::TableReference*>(value)->GetArena();
-    if (message_arena != submessage_arena) {
-      value = ::google::protobuf::internal::GetOwnedMessage(message_arena, value, submessage_arena);
-    }
-    _impl_._has_bits_[0] |= 0x00000002u;
-  } else {
-    _impl_._has_bits_[0] &= ~0x00000002u;
-  }
-
-  _impl_.source_id_ = reinterpret_cast<::io::deephaven::proto::backplane::grpc::TableReference*>(value);
-  // @@protoc_insertion_point(field_set_allocated:io.deephaven.proto.backplane.grpc.FilterTableRequest.source_id)
-}
-
-// repeated .io.deephaven.proto.backplane.grpc.Condition filters = 3;
-inline int FilterTableRequest::_internal_filters_size() const {
-  return _internal_filters().size();
-}
-inline int FilterTableRequest::filters_size() const {
-  return _internal_filters_size();
-}
-inline void FilterTableRequest::clear_filters() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  _impl_.filters_.Clear();
-}
-inline ::io::deephaven::proto::backplane::grpc::Condition* FilterTableRequest::mutable_filters(int index)
-    ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  // @@protoc_insertion_point(field_mutable:io.deephaven.proto.backplane.grpc.FilterTableRequest.filters)
-  return _internal_mutable_filters()->Mutable(index);
-}
-inline ::google::protobuf::RepeatedPtrField<::io::deephaven::proto::backplane::grpc::Condition>* FilterTableRequest::mutable_filters()
-    ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  // @@protoc_insertion_point(field_mutable_list:io.deephaven.proto.backplane.grpc.FilterTableRequest.filters)
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  return _internal_mutable_filters();
-}
-inline const ::io::deephaven::proto::backplane::grpc::Condition& FilterTableRequest::filters(int index) const
-    ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  // @@protoc_insertion_point(field_get:io.deephaven.proto.backplane.grpc.FilterTableRequest.filters)
-  return _internal_filters().Get(index);
-}
-inline ::io::deephaven::proto::backplane::grpc::Condition* FilterTableRequest::add_filters() ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  ::io::deephaven::proto::backplane::grpc::Condition* _add = _internal_mutable_filters()->Add();
-  // @@protoc_insertion_point(field_add:io.deephaven.proto.backplane.grpc.FilterTableRequest.filters)
-  return _add;
-}
-inline const ::google::protobuf::RepeatedPtrField<::io::deephaven::proto::backplane::grpc::Condition>& FilterTableRequest::filters() const
-    ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  // @@protoc_insertion_point(field_list:io.deephaven.proto.backplane.grpc.FilterTableRequest.filters)
-  return _internal_filters();
-}
-inline const ::google::protobuf::RepeatedPtrField<::io::deephaven::proto::backplane::grpc::Condition>&
-FilterTableRequest::_internal_filters() const {
-  PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race);
-  return _impl_.filters_;
-}
-inline ::google::protobuf::RepeatedPtrField<::io::deephaven::proto::backplane::grpc::Condition>*
-FilterTableRequest::_internal_mutable_filters() {
-  PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race);
-  return &_impl_.filters_;
-}
-
-// -------------------------------------------------------------------
-
-// SeekRowRequest
-
-// .io.deephaven.proto.backplane.grpc.Ticket source_id = 1;
-inline bool SeekRowRequest::has_source_id() const {
-  bool value = (_impl_._has_bits_[0] & 0x00000001u) != 0;
-  PROTOBUF_ASSUME(!value || _impl_.source_id_ != nullptr);
-  return value;
-}
-inline const ::io::deephaven::proto::backplane::grpc::Ticket& SeekRowRequest::_internal_source_id() const {
-  PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race);
-  const ::io::deephaven::proto::backplane::grpc::Ticket* p = _impl_.source_id_;
-  return p != nullptr ? *p : reinterpret_cast<const ::io::deephaven::proto::backplane::grpc::Ticket&>(::io::deephaven::proto::backplane::grpc::_Ticket_default_instance_);
-}
-inline const ::io::deephaven::proto::backplane::grpc::Ticket& SeekRowRequest::source_id() const ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  // @@protoc_insertion_point(field_get:io.deephaven.proto.backplane.grpc.SeekRowRequest.source_id)
-  return _internal_source_id();
-}
-inline void SeekRowRequest::unsafe_arena_set_allocated_source_id(::io::deephaven::proto::backplane::grpc::Ticket* value) {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  if (GetArena() == nullptr) {
-    delete reinterpret_cast<::google::protobuf::MessageLite*>(_impl_.source_id_);
-  }
-  _impl_.source_id_ = reinterpret_cast<::io::deephaven::proto::backplane::grpc::Ticket*>(value);
-  if (value != nullptr) {
-    _impl_._has_bits_[0] |= 0x00000001u;
-  } else {
-    _impl_._has_bits_[0] &= ~0x00000001u;
-  }
-  // @@protoc_insertion_point(field_unsafe_arena_set_allocated:io.deephaven.proto.backplane.grpc.SeekRowRequest.source_id)
-}
-inline ::io::deephaven::proto::backplane::grpc::Ticket* SeekRowRequest::release_source_id() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-
-  _impl_._has_bits_[0] &= ~0x00000001u;
-  ::io::deephaven::proto::backplane::grpc::Ticket* released = _impl_.source_id_;
-  _impl_.source_id_ = nullptr;
-#ifdef PROTOBUF_FORCE_COPY_IN_RELEASE
-  auto* old = reinterpret_cast<::google::protobuf::MessageLite*>(released);
-  released = ::google::protobuf::internal::DuplicateIfNonNull(released);
-  if (GetArena() == nullptr) {
-    delete old;
-  }
-#else   // PROTOBUF_FORCE_COPY_IN_RELEASE
-  if (GetArena() != nullptr) {
-    released = ::google::protobuf::internal::DuplicateIfNonNull(released);
-  }
-#endif  // !PROTOBUF_FORCE_COPY_IN_RELEASE
-  return released;
-}
-inline ::io::deephaven::proto::backplane::grpc::Ticket* SeekRowRequest::unsafe_arena_release_source_id() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  // @@protoc_insertion_point(field_release:io.deephaven.proto.backplane.grpc.SeekRowRequest.source_id)
-
-  _impl_._has_bits_[0] &= ~0x00000001u;
-  ::io::deephaven::proto::backplane::grpc::Ticket* temp = _impl_.source_id_;
-  _impl_.source_id_ = nullptr;
-  return temp;
-}
-inline ::io::deephaven::proto::backplane::grpc::Ticket* SeekRowRequest::_internal_mutable_source_id() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  _impl_._has_bits_[0] |= 0x00000001u;
-  if (_impl_.source_id_ == nullptr) {
-    auto* p = CreateMaybeMessage<::io::deephaven::proto::backplane::grpc::Ticket>(GetArena());
-    _impl_.source_id_ = reinterpret_cast<::io::deephaven::proto::backplane::grpc::Ticket*>(p);
-  }
-  return _impl_.source_id_;
-}
-inline ::io::deephaven::proto::backplane::grpc::Ticket* SeekRowRequest::mutable_source_id() ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  ::io::deephaven::proto::backplane::grpc::Ticket* _msg = _internal_mutable_source_id();
-  // @@protoc_insertion_point(field_mutable:io.deephaven.proto.backplane.grpc.SeekRowRequest.source_id)
-  return _msg;
-}
-inline void SeekRowRequest::set_allocated_source_id(::io::deephaven::proto::backplane::grpc::Ticket* value) {
-  ::google::protobuf::Arena* message_arena = GetArena();
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  if (message_arena == nullptr) {
-    delete reinterpret_cast<::google::protobuf::MessageLite*>(_impl_.source_id_);
-  }
-
-  if (value != nullptr) {
-    ::google::protobuf::Arena* submessage_arena = reinterpret_cast<::google::protobuf::MessageLite*>(value)->GetArena();
-    if (message_arena != submessage_arena) {
-      value = ::google::protobuf::internal::GetOwnedMessage(message_arena, value, submessage_arena);
-    }
-    _impl_._has_bits_[0] |= 0x00000001u;
-  } else {
-    _impl_._has_bits_[0] &= ~0x00000001u;
-  }
-
-  _impl_.source_id_ = reinterpret_cast<::io::deephaven::proto::backplane::grpc::Ticket*>(value);
-  // @@protoc_insertion_point(field_set_allocated:io.deephaven.proto.backplane.grpc.SeekRowRequest.source_id)
-}
-
-// sint64 starting_row = 2 [jstype = JS_STRING];
-inline void SeekRowRequest::clear_starting_row() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  _impl_.starting_row_ = ::int64_t{0};
-}
-inline ::int64_t SeekRowRequest::starting_row() const {
-  // @@protoc_insertion_point(field_get:io.deephaven.proto.backplane.grpc.SeekRowRequest.starting_row)
-  return _internal_starting_row();
-}
-inline void SeekRowRequest::set_starting_row(::int64_t value) {
-  _internal_set_starting_row(value);
-  // @@protoc_insertion_point(field_set:io.deephaven.proto.backplane.grpc.SeekRowRequest.starting_row)
-}
-inline ::int64_t SeekRowRequest::_internal_starting_row() const {
-  PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race);
-  return _impl_.starting_row_;
-}
-inline void SeekRowRequest::_internal_set_starting_row(::int64_t value) {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  ;
-  _impl_.starting_row_ = value;
-}
-
-// string column_name = 3;
-inline void SeekRowRequest::clear_column_name() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  _impl_.column_name_.ClearToEmpty();
-}
-inline const std::string& SeekRowRequest::column_name() const
-    ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  // @@protoc_insertion_point(field_get:io.deephaven.proto.backplane.grpc.SeekRowRequest.column_name)
-  return _internal_column_name();
-}
-template <typename Arg_, typename... Args_>
-inline PROTOBUF_ALWAYS_INLINE void SeekRowRequest::set_column_name(Arg_&& arg,
-                                                     Args_... args) {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  ;
-  _impl_.column_name_.Set(static_cast<Arg_&&>(arg), args..., GetArena());
-  // @@protoc_insertion_point(field_set:io.deephaven.proto.backplane.grpc.SeekRowRequest.column_name)
-}
-inline std::string* SeekRowRequest::mutable_column_name() ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  std::string* _s = _internal_mutable_column_name();
-  // @@protoc_insertion_point(field_mutable:io.deephaven.proto.backplane.grpc.SeekRowRequest.column_name)
-  return _s;
-}
-inline const std::string& SeekRowRequest::_internal_column_name() const {
-  PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race);
-  return _impl_.column_name_.Get();
-}
-inline void SeekRowRequest::_internal_set_column_name(const std::string& value) {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  ;
-  _impl_.column_name_.Set(value, GetArena());
-}
-inline std::string* SeekRowRequest::_internal_mutable_column_name() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  ;
-  return _impl_.column_name_.Mutable( GetArena());
-}
-inline std::string* SeekRowRequest::release_column_name() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  // @@protoc_insertion_point(field_release:io.deephaven.proto.backplane.grpc.SeekRowRequest.column_name)
-  return _impl_.column_name_.Release();
-}
-inline void SeekRowRequest::set_allocated_column_name(std::string* value) {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  _impl_.column_name_.SetAllocated(value, GetArena());
-  #ifdef PROTOBUF_FORCE_COPY_DEFAULT_STRING
-        if (_impl_.column_name_.IsDefault()) {
-          _impl_.column_name_.Set("", GetArena());
-        }
-  #endif  // PROTOBUF_FORCE_COPY_DEFAULT_STRING
-  // @@protoc_insertion_point(field_set_allocated:io.deephaven.proto.backplane.grpc.SeekRowRequest.column_name)
-}
-
-// .io.deephaven.proto.backplane.grpc.Literal seek_value = 4;
-inline bool SeekRowRequest::has_seek_value() const {
-  bool value = (_impl_._has_bits_[0] & 0x00000002u) != 0;
-  PROTOBUF_ASSUME(!value || _impl_.seek_value_ != nullptr);
-  return value;
-}
-inline void SeekRowRequest::clear_seek_value() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  if (_impl_.seek_value_ != nullptr) _impl_.seek_value_->Clear();
-  _impl_._has_bits_[0] &= ~0x00000002u;
-}
-inline const ::io::deephaven::proto::backplane::grpc::Literal& SeekRowRequest::_internal_seek_value() const {
-  PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race);
-  const ::io::deephaven::proto::backplane::grpc::Literal* p = _impl_.seek_value_;
-  return p != nullptr ? *p : reinterpret_cast<const ::io::deephaven::proto::backplane::grpc::Literal&>(::io::deephaven::proto::backplane::grpc::_Literal_default_instance_);
-}
-inline const ::io::deephaven::proto::backplane::grpc::Literal& SeekRowRequest::seek_value() const ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  // @@protoc_insertion_point(field_get:io.deephaven.proto.backplane.grpc.SeekRowRequest.seek_value)
-  return _internal_seek_value();
-}
-inline void SeekRowRequest::unsafe_arena_set_allocated_seek_value(::io::deephaven::proto::backplane::grpc::Literal* value) {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  if (GetArena() == nullptr) {
-    delete reinterpret_cast<::google::protobuf::MessageLite*>(_impl_.seek_value_);
-  }
-  _impl_.seek_value_ = reinterpret_cast<::io::deephaven::proto::backplane::grpc::Literal*>(value);
-  if (value != nullptr) {
-    _impl_._has_bits_[0] |= 0x00000002u;
-  } else {
-    _impl_._has_bits_[0] &= ~0x00000002u;
-  }
-  // @@protoc_insertion_point(field_unsafe_arena_set_allocated:io.deephaven.proto.backplane.grpc.SeekRowRequest.seek_value)
-}
-inline ::io::deephaven::proto::backplane::grpc::Literal* SeekRowRequest::release_seek_value() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-
-  _impl_._has_bits_[0] &= ~0x00000002u;
-  ::io::deephaven::proto::backplane::grpc::Literal* released = _impl_.seek_value_;
-  _impl_.seek_value_ = nullptr;
-#ifdef PROTOBUF_FORCE_COPY_IN_RELEASE
-  auto* old = reinterpret_cast<::google::protobuf::MessageLite*>(released);
-  released = ::google::protobuf::internal::DuplicateIfNonNull(released);
-  if (GetArena() == nullptr) {
-    delete old;
-  }
-#else   // PROTOBUF_FORCE_COPY_IN_RELEASE
-  if (GetArena() != nullptr) {
-    released = ::google::protobuf::internal::DuplicateIfNonNull(released);
-  }
-#endif  // !PROTOBUF_FORCE_COPY_IN_RELEASE
-  return released;
-}
-inline ::io::deephaven::proto::backplane::grpc::Literal* SeekRowRequest::unsafe_arena_release_seek_value() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  // @@protoc_insertion_point(field_release:io.deephaven.proto.backplane.grpc.SeekRowRequest.seek_value)
-
-  _impl_._has_bits_[0] &= ~0x00000002u;
-  ::io::deephaven::proto::backplane::grpc::Literal* temp = _impl_.seek_value_;
-  _impl_.seek_value_ = nullptr;
-  return temp;
-}
-inline ::io::deephaven::proto::backplane::grpc::Literal* SeekRowRequest::_internal_mutable_seek_value() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  _impl_._has_bits_[0] |= 0x00000002u;
-  if (_impl_.seek_value_ == nullptr) {
-    auto* p = CreateMaybeMessage<::io::deephaven::proto::backplane::grpc::Literal>(GetArena());
-    _impl_.seek_value_ = reinterpret_cast<::io::deephaven::proto::backplane::grpc::Literal*>(p);
-  }
-  return _impl_.seek_value_;
-}
-inline ::io::deephaven::proto::backplane::grpc::Literal* SeekRowRequest::mutable_seek_value() ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  ::io::deephaven::proto::backplane::grpc::Literal* _msg = _internal_mutable_seek_value();
-  // @@protoc_insertion_point(field_mutable:io.deephaven.proto.backplane.grpc.SeekRowRequest.seek_value)
-  return _msg;
-}
-inline void SeekRowRequest::set_allocated_seek_value(::io::deephaven::proto::backplane::grpc::Literal* value) {
-  ::google::protobuf::Arena* message_arena = GetArena();
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  if (message_arena == nullptr) {
-    delete reinterpret_cast<::io::deephaven::proto::backplane::grpc::Literal*>(_impl_.seek_value_);
-  }
-
-  if (value != nullptr) {
-    ::google::protobuf::Arena* submessage_arena = reinterpret_cast<::io::deephaven::proto::backplane::grpc::Literal*>(value)->GetArena();
-    if (message_arena != submessage_arena) {
-      value = ::google::protobuf::internal::GetOwnedMessage(message_arena, value, submessage_arena);
-    }
-    _impl_._has_bits_[0] |= 0x00000002u;
-  } else {
-    _impl_._has_bits_[0] &= ~0x00000002u;
-  }
-
-  _impl_.seek_value_ = reinterpret_cast<::io::deephaven::proto::backplane::grpc::Literal*>(value);
-  // @@protoc_insertion_point(field_set_allocated:io.deephaven.proto.backplane.grpc.SeekRowRequest.seek_value)
-}
-
-// bool insensitive = 5;
-inline void SeekRowRequest::clear_insensitive() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  _impl_.insensitive_ = false;
-}
-inline bool SeekRowRequest::insensitive() const {
-  // @@protoc_insertion_point(field_get:io.deephaven.proto.backplane.grpc.SeekRowRequest.insensitive)
-  return _internal_insensitive();
-}
-inline void SeekRowRequest::set_insensitive(bool value) {
-  _internal_set_insensitive(value);
-  // @@protoc_insertion_point(field_set:io.deephaven.proto.backplane.grpc.SeekRowRequest.insensitive)
-}
-inline bool SeekRowRequest::_internal_insensitive() const {
-  PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race);
-  return _impl_.insensitive_;
-}
-inline void SeekRowRequest::_internal_set_insensitive(bool value) {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  ;
-  _impl_.insensitive_ = value;
-}
-
-// bool contains = 6;
-inline void SeekRowRequest::clear_contains() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  _impl_.contains_ = false;
-}
-inline bool SeekRowRequest::contains() const {
-  // @@protoc_insertion_point(field_get:io.deephaven.proto.backplane.grpc.SeekRowRequest.contains)
-  return _internal_contains();
-}
-inline void SeekRowRequest::set_contains(bool value) {
-  _internal_set_contains(value);
-  // @@protoc_insertion_point(field_set:io.deephaven.proto.backplane.grpc.SeekRowRequest.contains)
-}
-inline bool SeekRowRequest::_internal_contains() const {
-  PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race);
-  return _impl_.contains_;
-}
-inline void SeekRowRequest::_internal_set_contains(bool value) {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  ;
-  _impl_.contains_ = value;
-}
-
-// bool is_backward = 7;
-inline void SeekRowRequest::clear_is_backward() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  _impl_.is_backward_ = false;
-}
-inline bool SeekRowRequest::is_backward() const {
-  // @@protoc_insertion_point(field_get:io.deephaven.proto.backplane.grpc.SeekRowRequest.is_backward)
-  return _internal_is_backward();
-}
-inline void SeekRowRequest::set_is_backward(bool value) {
-  _internal_set_is_backward(value);
-  // @@protoc_insertion_point(field_set:io.deephaven.proto.backplane.grpc.SeekRowRequest.is_backward)
-}
-inline bool SeekRowRequest::_internal_is_backward() const {
-  PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race);
-  return _impl_.is_backward_;
-}
-inline void SeekRowRequest::_internal_set_is_backward(bool value) {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  ;
-  _impl_.is_backward_ = value;
-}
-
-// -------------------------------------------------------------------
-
-// SeekRowResponse
-
-// sint64 result_row = 1 [jstype = JS_STRING];
-inline void SeekRowResponse::clear_result_row() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  _impl_.result_row_ = ::int64_t{0};
-}
-inline ::int64_t SeekRowResponse::result_row() const {
-  // @@protoc_insertion_point(field_get:io.deephaven.proto.backplane.grpc.SeekRowResponse.result_row)
-  return _internal_result_row();
-}
-inline void SeekRowResponse::set_result_row(::int64_t value) {
-  _internal_set_result_row(value);
-  // @@protoc_insertion_point(field_set:io.deephaven.proto.backplane.grpc.SeekRowResponse.result_row)
-}
-inline ::int64_t SeekRowResponse::_internal_result_row() const {
-  PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race);
-  return _impl_.result_row_;
-}
-inline void SeekRowResponse::_internal_set_result_row(::int64_t value) {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  ;
-  _impl_.result_row_ = value;
-}
-
-// -------------------------------------------------------------------
-
-// Reference
-
-// string column_name = 1;
-inline void Reference::clear_column_name() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  _impl_.column_name_.ClearToEmpty();
-}
-inline const std::string& Reference::column_name() const
-    ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  // @@protoc_insertion_point(field_get:io.deephaven.proto.backplane.grpc.Reference.column_name)
-  return _internal_column_name();
-}
-template <typename Arg_, typename... Args_>
-inline PROTOBUF_ALWAYS_INLINE void Reference::set_column_name(Arg_&& arg,
-                                                     Args_... args) {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  ;
-  _impl_.column_name_.Set(static_cast<Arg_&&>(arg), args..., GetArena());
-  // @@protoc_insertion_point(field_set:io.deephaven.proto.backplane.grpc.Reference.column_name)
-}
-inline std::string* Reference::mutable_column_name() ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  std::string* _s = _internal_mutable_column_name();
-  // @@protoc_insertion_point(field_mutable:io.deephaven.proto.backplane.grpc.Reference.column_name)
-  return _s;
-}
-inline const std::string& Reference::_internal_column_name() const {
-  PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race);
-  return _impl_.column_name_.Get();
-}
-inline void Reference::_internal_set_column_name(const std::string& value) {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  ;
-  _impl_.column_name_.Set(value, GetArena());
-}
-inline std::string* Reference::_internal_mutable_column_name() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  ;
-  return _impl_.column_name_.Mutable( GetArena());
-}
-inline std::string* Reference::release_column_name() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  // @@protoc_insertion_point(field_release:io.deephaven.proto.backplane.grpc.Reference.column_name)
-  return _impl_.column_name_.Release();
-}
-inline void Reference::set_allocated_column_name(std::string* value) {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  _impl_.column_name_.SetAllocated(value, GetArena());
-  #ifdef PROTOBUF_FORCE_COPY_DEFAULT_STRING
-        if (_impl_.column_name_.IsDefault()) {
-          _impl_.column_name_.Set("", GetArena());
-        }
-  #endif  // PROTOBUF_FORCE_COPY_DEFAULT_STRING
-  // @@protoc_insertion_point(field_set_allocated:io.deephaven.proto.backplane.grpc.Reference.column_name)
-}
-
-// -------------------------------------------------------------------
-
-// Literal
-
-// string string_value = 1;
-inline bool Literal::has_string_value() const {
-  return value_case() == kStringValue;
-}
-inline void Literal::set_has_string_value() {
-  _impl_._oneof_case_[0] = kStringValue;
-}
-inline void Literal::clear_string_value() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  if (value_case() == kStringValue) {
-    _impl_.value_.string_value_.Destroy();
-    clear_has_value();
-  }
-}
-inline const std::string& Literal::string_value() const
-    ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  // @@protoc_insertion_point(field_get:io.deephaven.proto.backplane.grpc.Literal.string_value)
-  return _internal_string_value();
-}
-template <typename Arg_, typename... Args_>
-inline PROTOBUF_ALWAYS_INLINE void Literal::set_string_value(Arg_&& arg,
-                                                     Args_... args) {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  if (value_case() != kStringValue) {
-    clear_value();
-
-    set_has_string_value();
-    _impl_.value_.string_value_.InitDefault();
-  }
-  _impl_.value_.string_value_.Set(static_cast<Arg_&&>(arg), args..., GetArena());
-  // @@protoc_insertion_point(field_set:io.deephaven.proto.backplane.grpc.Literal.string_value)
-}
-inline std::string* Literal::mutable_string_value() ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  std::string* _s = _internal_mutable_string_value();
-  // @@protoc_insertion_point(field_mutable:io.deephaven.proto.backplane.grpc.Literal.string_value)
-  return _s;
-}
-inline const std::string& Literal::_internal_string_value() const {
-  PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race);
-  if (value_case() != kStringValue) {
-    return ::google::protobuf::internal::GetEmptyStringAlreadyInited();
-  }
-  return _impl_.value_.string_value_.Get();
-}
-inline void Literal::_internal_set_string_value(const std::string& value) {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  if (value_case() != kStringValue) {
-    clear_value();
-
-    set_has_string_value();
-    _impl_.value_.string_value_.InitDefault();
-  }
-  _impl_.value_.string_value_.Set(value, GetArena());
-}
-inline std::string* Literal::_internal_mutable_string_value() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  if (value_case() != kStringValue) {
-    clear_value();
-
-    set_has_string_value();
-    _impl_.value_.string_value_.InitDefault();
-  }
-  return _impl_.value_.string_value_.Mutable( GetArena());
-}
-inline std::string* Literal::release_string_value() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  // @@protoc_insertion_point(field_release:io.deephaven.proto.backplane.grpc.Literal.string_value)
-  if (value_case() != kStringValue) {
-    return nullptr;
-  }
-  clear_has_value();
-  return _impl_.value_.string_value_.Release();
-}
-inline void Literal::set_allocated_string_value(std::string* value) {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  if (has_value()) {
-    clear_value();
-  }
-  if (value != nullptr) {
-    set_has_string_value();
-    _impl_.value_.string_value_.InitAllocated(value, GetArena());
-  }
-  // @@protoc_insertion_point(field_set_allocated:io.deephaven.proto.backplane.grpc.Literal.string_value)
-}
-
-// double double_value = 2;
-inline bool Literal::has_double_value() const {
-  return value_case() == kDoubleValue;
-}
-inline void Literal::set_has_double_value() {
-  _impl_._oneof_case_[0] = kDoubleValue;
-}
-inline void Literal::clear_double_value() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  if (value_case() == kDoubleValue) {
-    _impl_.value_.double_value_ = 0;
-    clear_has_value();
-  }
-}
-inline double Literal::double_value() const {
-  // @@protoc_insertion_point(field_get:io.deephaven.proto.backplane.grpc.Literal.double_value)
-  return _internal_double_value();
-}
-inline void Literal::set_double_value(double value) {
-  _internal_set_double_value(value);
-  // @@protoc_insertion_point(field_set:io.deephaven.proto.backplane.grpc.Literal.double_value)
-}
-inline double Literal::_internal_double_value() const {
-  if (value_case() == kDoubleValue) {
-    return _impl_.value_.double_value_;
-  }
-  return 0;
-}
-inline void Literal::_internal_set_double_value(double value) {
-  if (value_case() != kDoubleValue) {
-    clear_value();
-    set_has_double_value();
-  }
-  _impl_.value_.double_value_ = value;
-}
-
-// bool bool_value = 3;
-inline bool Literal::has_bool_value() const {
-  return value_case() == kBoolValue;
-}
-inline void Literal::set_has_bool_value() {
-  _impl_._oneof_case_[0] = kBoolValue;
-}
-inline void Literal::clear_bool_value() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  if (value_case() == kBoolValue) {
-    _impl_.value_.bool_value_ = false;
-    clear_has_value();
-  }
-}
-inline bool Literal::bool_value() const {
-  // @@protoc_insertion_point(field_get:io.deephaven.proto.backplane.grpc.Literal.bool_value)
-  return _internal_bool_value();
-}
-inline void Literal::set_bool_value(bool value) {
-  _internal_set_bool_value(value);
-  // @@protoc_insertion_point(field_set:io.deephaven.proto.backplane.grpc.Literal.bool_value)
-}
-inline bool Literal::_internal_bool_value() const {
-  if (value_case() == kBoolValue) {
-    return _impl_.value_.bool_value_;
-  }
-  return false;
-}
-inline void Literal::_internal_set_bool_value(bool value) {
-  if (value_case() != kBoolValue) {
-    clear_value();
-    set_has_bool_value();
-  }
-  _impl_.value_.bool_value_ = value;
-}
-
-// sint64 long_value = 4 [jstype = JS_STRING];
-inline bool Literal::has_long_value() const {
-  return value_case() == kLongValue;
-}
-inline void Literal::set_has_long_value() {
-  _impl_._oneof_case_[0] = kLongValue;
-}
-inline void Literal::clear_long_value() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  if (value_case() == kLongValue) {
-    _impl_.value_.long_value_ = ::int64_t{0};
-    clear_has_value();
-  }
-}
-inline ::int64_t Literal::long_value() const {
-  // @@protoc_insertion_point(field_get:io.deephaven.proto.backplane.grpc.Literal.long_value)
-  return _internal_long_value();
-}
-inline void Literal::set_long_value(::int64_t value) {
-  _internal_set_long_value(value);
-  // @@protoc_insertion_point(field_set:io.deephaven.proto.backplane.grpc.Literal.long_value)
-}
-inline ::int64_t Literal::_internal_long_value() const {
-  if (value_case() == kLongValue) {
-    return _impl_.value_.long_value_;
-  }
-  return ::int64_t{0};
-}
-inline void Literal::_internal_set_long_value(::int64_t value) {
-  if (value_case() != kLongValue) {
-    clear_value();
-    set_has_long_value();
-  }
-  _impl_.value_.long_value_ = value;
-}
-
-// sint64 nano_time_value = 5 [jstype = JS_STRING];
-inline bool Literal::has_nano_time_value() const {
-  return value_case() == kNanoTimeValue;
-}
-inline void Literal::set_has_nano_time_value() {
-  _impl_._oneof_case_[0] = kNanoTimeValue;
-}
-inline void Literal::clear_nano_time_value() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  if (value_case() == kNanoTimeValue) {
-    _impl_.value_.nano_time_value_ = ::int64_t{0};
-    clear_has_value();
-  }
-}
-inline ::int64_t Literal::nano_time_value() const {
-  // @@protoc_insertion_point(field_get:io.deephaven.proto.backplane.grpc.Literal.nano_time_value)
-  return _internal_nano_time_value();
-}
-inline void Literal::set_nano_time_value(::int64_t value) {
-  _internal_set_nano_time_value(value);
-  // @@protoc_insertion_point(field_set:io.deephaven.proto.backplane.grpc.Literal.nano_time_value)
-}
-inline ::int64_t Literal::_internal_nano_time_value() const {
-  if (value_case() == kNanoTimeValue) {
-    return _impl_.value_.nano_time_value_;
-  }
-  return ::int64_t{0};
-}
-inline void Literal::_internal_set_nano_time_value(::int64_t value) {
-  if (value_case() != kNanoTimeValue) {
-    clear_value();
-    set_has_nano_time_value();
-  }
-  _impl_.value_.nano_time_value_ = value;
-}
-
-inline bool Literal::has_value() const {
-  return value_case() != VALUE_NOT_SET;
-}
-inline void Literal::clear_has_value() {
-  _impl_._oneof_case_[0] = VALUE_NOT_SET;
-}
-inline Literal::ValueCase Literal::value_case() const {
-  return Literal::ValueCase(_impl_._oneof_case_[0]);
-}
-// -------------------------------------------------------------------
-
-// Value
-
-// .io.deephaven.proto.backplane.grpc.Reference reference = 1;
-inline bool Value::has_reference() const {
-  return data_case() == kReference;
-}
-inline bool Value::_internal_has_reference() const {
-  return data_case() == kReference;
-}
-inline void Value::set_has_reference() {
-  _impl_._oneof_case_[0] = kReference;
-}
-inline void Value::clear_reference() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  if (data_case() == kReference) {
-    if (GetArena() == nullptr) {
-      delete _impl_.data_.reference_;
-    }
-    clear_has_data();
-  }
-}
-inline ::io::deephaven::proto::backplane::grpc::Reference* Value::release_reference() {
-  // @@protoc_insertion_point(field_release:io.deephaven.proto.backplane.grpc.Value.reference)
-  if (data_case() == kReference) {
-    clear_has_data();
-    auto* temp = _impl_.data_.reference_;
-    if (GetArena() != nullptr) {
-      temp = ::google::protobuf::internal::DuplicateIfNonNull(temp);
-    }
-    _impl_.data_.reference_ = nullptr;
-    return temp;
-  } else {
-    return nullptr;
-  }
-}
-inline const ::io::deephaven::proto::backplane::grpc::Reference& Value::_internal_reference() const {
-  return data_case() == kReference ? *_impl_.data_.reference_ : reinterpret_cast<::io::deephaven::proto::backplane::grpc::Reference&>(::io::deephaven::proto::backplane::grpc::_Reference_default_instance_);
-}
-inline const ::io::deephaven::proto::backplane::grpc::Reference& Value::reference() const ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  // @@protoc_insertion_point(field_get:io.deephaven.proto.backplane.grpc.Value.reference)
-  return _internal_reference();
-}
-inline ::io::deephaven::proto::backplane::grpc::Reference* Value::unsafe_arena_release_reference() {
-  // @@protoc_insertion_point(field_unsafe_arena_release:io.deephaven.proto.backplane.grpc.Value.reference)
-  if (data_case() == kReference) {
-    clear_has_data();
-    auto* temp = _impl_.data_.reference_;
-    _impl_.data_.reference_ = nullptr;
-    return temp;
-  } else {
-    return nullptr;
-  }
-}
-inline void Value::unsafe_arena_set_allocated_reference(::io::deephaven::proto::backplane::grpc::Reference* value) {
-  // We rely on the oneof clear method to free the earlier contents
-  // of this oneof. We can directly use the pointer we're given to
-  // set the new value.
-  clear_data();
-  if (value) {
-    set_has_reference();
-    _impl_.data_.reference_ = value;
-  }
-  // @@protoc_insertion_point(field_unsafe_arena_set_allocated:io.deephaven.proto.backplane.grpc.Value.reference)
-}
-inline ::io::deephaven::proto::backplane::grpc::Reference* Value::_internal_mutable_reference() {
-  if (data_case() != kReference) {
-    clear_data();
-    set_has_reference();
-    _impl_.data_.reference_ = CreateMaybeMessage<::io::deephaven::proto::backplane::grpc::Reference>(GetArena());
-  }
-  return _impl_.data_.reference_;
-}
-inline ::io::deephaven::proto::backplane::grpc::Reference* Value::mutable_reference() ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  ::io::deephaven::proto::backplane::grpc::Reference* _msg = _internal_mutable_reference();
-  // @@protoc_insertion_point(field_mutable:io.deephaven.proto.backplane.grpc.Value.reference)
-  return _msg;
-}
-
-// .io.deephaven.proto.backplane.grpc.Literal literal = 2;
-inline bool Value::has_literal() const {
-  return data_case() == kLiteral;
-}
-inline bool Value::_internal_has_literal() const {
-  return data_case() == kLiteral;
-}
-inline void Value::set_has_literal() {
-  _impl_._oneof_case_[0] = kLiteral;
-}
-inline void Value::clear_literal() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  if (data_case() == kLiteral) {
-    if (GetArena() == nullptr) {
-      delete _impl_.data_.literal_;
-    }
-    clear_has_data();
-  }
-}
-inline ::io::deephaven::proto::backplane::grpc::Literal* Value::release_literal() {
-  // @@protoc_insertion_point(field_release:io.deephaven.proto.backplane.grpc.Value.literal)
-  if (data_case() == kLiteral) {
-    clear_has_data();
-    auto* temp = _impl_.data_.literal_;
-    if (GetArena() != nullptr) {
-      temp = ::google::protobuf::internal::DuplicateIfNonNull(temp);
-    }
-    _impl_.data_.literal_ = nullptr;
-    return temp;
-  } else {
-    return nullptr;
-  }
-}
-inline const ::io::deephaven::proto::backplane::grpc::Literal& Value::_internal_literal() const {
-  return data_case() == kLiteral ? *_impl_.data_.literal_ : reinterpret_cast<::io::deephaven::proto::backplane::grpc::Literal&>(::io::deephaven::proto::backplane::grpc::_Literal_default_instance_);
-}
-inline const ::io::deephaven::proto::backplane::grpc::Literal& Value::literal() const ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  // @@protoc_insertion_point(field_get:io.deephaven.proto.backplane.grpc.Value.literal)
-  return _internal_literal();
-}
-inline ::io::deephaven::proto::backplane::grpc::Literal* Value::unsafe_arena_release_literal() {
-  // @@protoc_insertion_point(field_unsafe_arena_release:io.deephaven.proto.backplane.grpc.Value.literal)
-  if (data_case() == kLiteral) {
-    clear_has_data();
-    auto* temp = _impl_.data_.literal_;
-    _impl_.data_.literal_ = nullptr;
-    return temp;
-  } else {
-    return nullptr;
-  }
-}
-inline void Value::unsafe_arena_set_allocated_literal(::io::deephaven::proto::backplane::grpc::Literal* value) {
-  // We rely on the oneof clear method to free the earlier contents
-  // of this oneof. We can directly use the pointer we're given to
-  // set the new value.
-  clear_data();
-  if (value) {
-    set_has_literal();
-    _impl_.data_.literal_ = value;
-  }
-  // @@protoc_insertion_point(field_unsafe_arena_set_allocated:io.deephaven.proto.backplane.grpc.Value.literal)
-}
-inline ::io::deephaven::proto::backplane::grpc::Literal* Value::_internal_mutable_literal() {
-  if (data_case() != kLiteral) {
-    clear_data();
-    set_has_literal();
-    _impl_.data_.literal_ = CreateMaybeMessage<::io::deephaven::proto::backplane::grpc::Literal>(GetArena());
-  }
-  return _impl_.data_.literal_;
-}
-inline ::io::deephaven::proto::backplane::grpc::Literal* Value::mutable_literal() ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  ::io::deephaven::proto::backplane::grpc::Literal* _msg = _internal_mutable_literal();
-  // @@protoc_insertion_point(field_mutable:io.deephaven.proto.backplane.grpc.Value.literal)
-  return _msg;
-}
-
-inline bool Value::has_data() const {
-  return data_case() != DATA_NOT_SET;
-}
-inline void Value::clear_has_data() {
-  _impl_._oneof_case_[0] = DATA_NOT_SET;
-}
-inline Value::DataCase Value::data_case() const {
-  return Value::DataCase(_impl_._oneof_case_[0]);
-}
-// -------------------------------------------------------------------
-
-// Condition
-
-// .io.deephaven.proto.backplane.grpc.AndCondition and = 1;
-inline bool Condition::has_and_() const {
-  return data_case() == kAnd;
-}
-inline bool Condition::_internal_has_and_() const {
-  return data_case() == kAnd;
-}
-inline void Condition::set_has_and_() {
-  _impl_._oneof_case_[0] = kAnd;
-}
-inline void Condition::clear_and_() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  if (data_case() == kAnd) {
-    if (GetArena() == nullptr) {
-      delete _impl_.data_.and__;
-    }
-    clear_has_data();
-  }
-}
-inline ::io::deephaven::proto::backplane::grpc::AndCondition* Condition::release_and_() {
-  // @@protoc_insertion_point(field_release:io.deephaven.proto.backplane.grpc.Condition.and)
-  if (data_case() == kAnd) {
-    clear_has_data();
-    auto* temp = _impl_.data_.and__;
-    if (GetArena() != nullptr) {
-      temp = ::google::protobuf::internal::DuplicateIfNonNull(temp);
-    }
-    _impl_.data_.and__ = nullptr;
-    return temp;
-  } else {
-    return nullptr;
-  }
-}
-inline const ::io::deephaven::proto::backplane::grpc::AndCondition& Condition::_internal_and_() const {
-  return data_case() == kAnd ? *_impl_.data_.and__ : reinterpret_cast<::io::deephaven::proto::backplane::grpc::AndCondition&>(::io::deephaven::proto::backplane::grpc::_AndCondition_default_instance_);
-}
-inline const ::io::deephaven::proto::backplane::grpc::AndCondition& Condition::and_() const ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  // @@protoc_insertion_point(field_get:io.deephaven.proto.backplane.grpc.Condition.and)
-  return _internal_and_();
-}
-inline ::io::deephaven::proto::backplane::grpc::AndCondition* Condition::unsafe_arena_release_and_() {
-  // @@protoc_insertion_point(field_unsafe_arena_release:io.deephaven.proto.backplane.grpc.Condition.and)
-  if (data_case() == kAnd) {
-    clear_has_data();
-    auto* temp = _impl_.data_.and__;
-    _impl_.data_.and__ = nullptr;
-    return temp;
-  } else {
-    return nullptr;
-  }
-}
-inline void Condition::unsafe_arena_set_allocated_and_(::io::deephaven::proto::backplane::grpc::AndCondition* value) {
-  // We rely on the oneof clear method to free the earlier contents
-  // of this oneof. We can directly use the pointer we're given to
-  // set the new value.
-  clear_data();
-  if (value) {
-    set_has_and_();
-    _impl_.data_.and__ = value;
-  }
-  // @@protoc_insertion_point(field_unsafe_arena_set_allocated:io.deephaven.proto.backplane.grpc.Condition.and)
-}
-inline ::io::deephaven::proto::backplane::grpc::AndCondition* Condition::_internal_mutable_and_() {
-  if (data_case() != kAnd) {
-    clear_data();
-    set_has_and_();
-    _impl_.data_.and__ = CreateMaybeMessage<::io::deephaven::proto::backplane::grpc::AndCondition>(GetArena());
-  }
-  return _impl_.data_.and__;
-}
-inline ::io::deephaven::proto::backplane::grpc::AndCondition* Condition::mutable_and_() ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  ::io::deephaven::proto::backplane::grpc::AndCondition* _msg = _internal_mutable_and_();
-  // @@protoc_insertion_point(field_mutable:io.deephaven.proto.backplane.grpc.Condition.and)
-  return _msg;
-}
-
-// .io.deephaven.proto.backplane.grpc.OrCondition or = 2;
-inline bool Condition::has_or_() const {
-  return data_case() == kOr;
-}
-inline bool Condition::_internal_has_or_() const {
-  return data_case() == kOr;
-}
-inline void Condition::set_has_or_() {
-  _impl_._oneof_case_[0] = kOr;
-}
-inline void Condition::clear_or_() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  if (data_case() == kOr) {
-    if (GetArena() == nullptr) {
-      delete _impl_.data_.or__;
-    }
-    clear_has_data();
-  }
-}
-inline ::io::deephaven::proto::backplane::grpc::OrCondition* Condition::release_or_() {
-  // @@protoc_insertion_point(field_release:io.deephaven.proto.backplane.grpc.Condition.or)
-  if (data_case() == kOr) {
-    clear_has_data();
-    auto* temp = _impl_.data_.or__;
-    if (GetArena() != nullptr) {
-      temp = ::google::protobuf::internal::DuplicateIfNonNull(temp);
-    }
-    _impl_.data_.or__ = nullptr;
-    return temp;
-  } else {
-    return nullptr;
-  }
-}
-inline const ::io::deephaven::proto::backplane::grpc::OrCondition& Condition::_internal_or_() const {
-  return data_case() == kOr ? *_impl_.data_.or__ : reinterpret_cast<::io::deephaven::proto::backplane::grpc::OrCondition&>(::io::deephaven::proto::backplane::grpc::_OrCondition_default_instance_);
-}
-inline const ::io::deephaven::proto::backplane::grpc::OrCondition& Condition::or_() const ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  // @@protoc_insertion_point(field_get:io.deephaven.proto.backplane.grpc.Condition.or)
-  return _internal_or_();
-}
-inline ::io::deephaven::proto::backplane::grpc::OrCondition* Condition::unsafe_arena_release_or_() {
-  // @@protoc_insertion_point(field_unsafe_arena_release:io.deephaven.proto.backplane.grpc.Condition.or)
-  if (data_case() == kOr) {
-    clear_has_data();
-    auto* temp = _impl_.data_.or__;
-    _impl_.data_.or__ = nullptr;
-    return temp;
-  } else {
-    return nullptr;
-  }
-}
-inline void Condition::unsafe_arena_set_allocated_or_(::io::deephaven::proto::backplane::grpc::OrCondition* value) {
-  // We rely on the oneof clear method to free the earlier contents
-  // of this oneof. We can directly use the pointer we're given to
-  // set the new value.
-  clear_data();
-  if (value) {
-    set_has_or_();
-    _impl_.data_.or__ = value;
-  }
-  // @@protoc_insertion_point(field_unsafe_arena_set_allocated:io.deephaven.proto.backplane.grpc.Condition.or)
-}
-inline ::io::deephaven::proto::backplane::grpc::OrCondition* Condition::_internal_mutable_or_() {
-  if (data_case() != kOr) {
-    clear_data();
-    set_has_or_();
-    _impl_.data_.or__ = CreateMaybeMessage<::io::deephaven::proto::backplane::grpc::OrCondition>(GetArena());
-  }
-  return _impl_.data_.or__;
-}
-inline ::io::deephaven::proto::backplane::grpc::OrCondition* Condition::mutable_or_() ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  ::io::deephaven::proto::backplane::grpc::OrCondition* _msg = _internal_mutable_or_();
-  // @@protoc_insertion_point(field_mutable:io.deephaven.proto.backplane.grpc.Condition.or)
-  return _msg;
-}
-
-// .io.deephaven.proto.backplane.grpc.NotCondition not = 3;
-inline bool Condition::has_not_() const {
-  return data_case() == kNot;
-}
-inline bool Condition::_internal_has_not_() const {
-  return data_case() == kNot;
-}
-inline void Condition::set_has_not_() {
-  _impl_._oneof_case_[0] = kNot;
-}
-inline void Condition::clear_not_() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  if (data_case() == kNot) {
-    if (GetArena() == nullptr) {
-      delete _impl_.data_.not__;
-    }
-    clear_has_data();
-  }
-}
-inline ::io::deephaven::proto::backplane::grpc::NotCondition* Condition::release_not_() {
-  // @@protoc_insertion_point(field_release:io.deephaven.proto.backplane.grpc.Condition.not)
-  if (data_case() == kNot) {
-    clear_has_data();
-    auto* temp = _impl_.data_.not__;
-    if (GetArena() != nullptr) {
-      temp = ::google::protobuf::internal::DuplicateIfNonNull(temp);
-    }
-    _impl_.data_.not__ = nullptr;
-    return temp;
-  } else {
-    return nullptr;
-  }
-}
-inline const ::io::deephaven::proto::backplane::grpc::NotCondition& Condition::_internal_not_() const {
-  return data_case() == kNot ? *_impl_.data_.not__ : reinterpret_cast<::io::deephaven::proto::backplane::grpc::NotCondition&>(::io::deephaven::proto::backplane::grpc::_NotCondition_default_instance_);
-}
-inline const ::io::deephaven::proto::backplane::grpc::NotCondition& Condition::not_() const ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  // @@protoc_insertion_point(field_get:io.deephaven.proto.backplane.grpc.Condition.not)
-  return _internal_not_();
-}
-inline ::io::deephaven::proto::backplane::grpc::NotCondition* Condition::unsafe_arena_release_not_() {
-  // @@protoc_insertion_point(field_unsafe_arena_release:io.deephaven.proto.backplane.grpc.Condition.not)
-  if (data_case() == kNot) {
-    clear_has_data();
-    auto* temp = _impl_.data_.not__;
-    _impl_.data_.not__ = nullptr;
-    return temp;
-  } else {
-    return nullptr;
-  }
-}
-inline void Condition::unsafe_arena_set_allocated_not_(::io::deephaven::proto::backplane::grpc::NotCondition* value) {
-  // We rely on the oneof clear method to free the earlier contents
-  // of this oneof. We can directly use the pointer we're given to
-  // set the new value.
-  clear_data();
-  if (value) {
-    set_has_not_();
-    _impl_.data_.not__ = value;
-  }
-  // @@protoc_insertion_point(field_unsafe_arena_set_allocated:io.deephaven.proto.backplane.grpc.Condition.not)
-}
-inline ::io::deephaven::proto::backplane::grpc::NotCondition* Condition::_internal_mutable_not_() {
-  if (data_case() != kNot) {
-    clear_data();
-    set_has_not_();
-    _impl_.data_.not__ = CreateMaybeMessage<::io::deephaven::proto::backplane::grpc::NotCondition>(GetArena());
-  }
-  return _impl_.data_.not__;
-}
-inline ::io::deephaven::proto::backplane::grpc::NotCondition* Condition::mutable_not_() ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  ::io::deephaven::proto::backplane::grpc::NotCondition* _msg = _internal_mutable_not_();
-  // @@protoc_insertion_point(field_mutable:io.deephaven.proto.backplane.grpc.Condition.not)
-  return _msg;
-}
-
-// .io.deephaven.proto.backplane.grpc.CompareCondition compare = 4;
-inline bool Condition::has_compare() const {
-  return data_case() == kCompare;
-}
-inline bool Condition::_internal_has_compare() const {
-  return data_case() == kCompare;
-}
-inline void Condition::set_has_compare() {
-  _impl_._oneof_case_[0] = kCompare;
-}
-inline void Condition::clear_compare() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  if (data_case() == kCompare) {
-    if (GetArena() == nullptr) {
-      delete _impl_.data_.compare_;
-    }
-    clear_has_data();
-  }
-}
-inline ::io::deephaven::proto::backplane::grpc::CompareCondition* Condition::release_compare() {
-  // @@protoc_insertion_point(field_release:io.deephaven.proto.backplane.grpc.Condition.compare)
-  if (data_case() == kCompare) {
-    clear_has_data();
-    auto* temp = _impl_.data_.compare_;
-    if (GetArena() != nullptr) {
-      temp = ::google::protobuf::internal::DuplicateIfNonNull(temp);
-    }
-    _impl_.data_.compare_ = nullptr;
-    return temp;
-  } else {
-    return nullptr;
-  }
-}
-inline const ::io::deephaven::proto::backplane::grpc::CompareCondition& Condition::_internal_compare() const {
-  return data_case() == kCompare ? *_impl_.data_.compare_ : reinterpret_cast<::io::deephaven::proto::backplane::grpc::CompareCondition&>(::io::deephaven::proto::backplane::grpc::_CompareCondition_default_instance_);
-}
-inline const ::io::deephaven::proto::backplane::grpc::CompareCondition& Condition::compare() const ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  // @@protoc_insertion_point(field_get:io.deephaven.proto.backplane.grpc.Condition.compare)
-  return _internal_compare();
-}
-inline ::io::deephaven::proto::backplane::grpc::CompareCondition* Condition::unsafe_arena_release_compare() {
-  // @@protoc_insertion_point(field_unsafe_arena_release:io.deephaven.proto.backplane.grpc.Condition.compare)
-  if (data_case() == kCompare) {
-    clear_has_data();
-    auto* temp = _impl_.data_.compare_;
-    _impl_.data_.compare_ = nullptr;
-    return temp;
-  } else {
-    return nullptr;
-  }
-}
-inline void Condition::unsafe_arena_set_allocated_compare(::io::deephaven::proto::backplane::grpc::CompareCondition* value) {
-  // We rely on the oneof clear method to free the earlier contents
-  // of this oneof. We can directly use the pointer we're given to
-  // set the new value.
-  clear_data();
-  if (value) {
-    set_has_compare();
-    _impl_.data_.compare_ = value;
-  }
-  // @@protoc_insertion_point(field_unsafe_arena_set_allocated:io.deephaven.proto.backplane.grpc.Condition.compare)
-}
-inline ::io::deephaven::proto::backplane::grpc::CompareCondition* Condition::_internal_mutable_compare() {
-  if (data_case() != kCompare) {
-    clear_data();
-    set_has_compare();
-    _impl_.data_.compare_ = CreateMaybeMessage<::io::deephaven::proto::backplane::grpc::CompareCondition>(GetArena());
-  }
-  return _impl_.data_.compare_;
-}
-inline ::io::deephaven::proto::backplane::grpc::CompareCondition* Condition::mutable_compare() ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  ::io::deephaven::proto::backplane::grpc::CompareCondition* _msg = _internal_mutable_compare();
-  // @@protoc_insertion_point(field_mutable:io.deephaven.proto.backplane.grpc.Condition.compare)
-  return _msg;
-}
-
-// .io.deephaven.proto.backplane.grpc.InCondition in = 5;
-inline bool Condition::has_in() const {
-  return data_case() == kIn;
-}
-inline bool Condition::_internal_has_in() const {
-  return data_case() == kIn;
-}
-inline void Condition::set_has_in() {
-  _impl_._oneof_case_[0] = kIn;
-}
-inline void Condition::clear_in() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  if (data_case() == kIn) {
-    if (GetArena() == nullptr) {
-      delete _impl_.data_.in_;
-    }
-    clear_has_data();
-  }
-}
-inline ::io::deephaven::proto::backplane::grpc::InCondition* Condition::release_in() {
-  // @@protoc_insertion_point(field_release:io.deephaven.proto.backplane.grpc.Condition.in)
-  if (data_case() == kIn) {
-    clear_has_data();
-    auto* temp = _impl_.data_.in_;
-    if (GetArena() != nullptr) {
-      temp = ::google::protobuf::internal::DuplicateIfNonNull(temp);
-    }
-    _impl_.data_.in_ = nullptr;
-    return temp;
-  } else {
-    return nullptr;
-  }
-}
-inline const ::io::deephaven::proto::backplane::grpc::InCondition& Condition::_internal_in() const {
-  return data_case() == kIn ? *_impl_.data_.in_ : reinterpret_cast<::io::deephaven::proto::backplane::grpc::InCondition&>(::io::deephaven::proto::backplane::grpc::_InCondition_default_instance_);
-}
-inline const ::io::deephaven::proto::backplane::grpc::InCondition& Condition::in() const ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  // @@protoc_insertion_point(field_get:io.deephaven.proto.backplane.grpc.Condition.in)
-  return _internal_in();
-}
-inline ::io::deephaven::proto::backplane::grpc::InCondition* Condition::unsafe_arena_release_in() {
-  // @@protoc_insertion_point(field_unsafe_arena_release:io.deephaven.proto.backplane.grpc.Condition.in)
-  if (data_case() == kIn) {
-    clear_has_data();
-    auto* temp = _impl_.data_.in_;
-    _impl_.data_.in_ = nullptr;
-    return temp;
-  } else {
-    return nullptr;
-  }
-}
-inline void Condition::unsafe_arena_set_allocated_in(::io::deephaven::proto::backplane::grpc::InCondition* value) {
-  // We rely on the oneof clear method to free the earlier contents
-  // of this oneof. We can directly use the pointer we're given to
-  // set the new value.
-  clear_data();
-  if (value) {
-    set_has_in();
-    _impl_.data_.in_ = value;
-  }
-  // @@protoc_insertion_point(field_unsafe_arena_set_allocated:io.deephaven.proto.backplane.grpc.Condition.in)
-}
-inline ::io::deephaven::proto::backplane::grpc::InCondition* Condition::_internal_mutable_in() {
-  if (data_case() != kIn) {
-    clear_data();
-    set_has_in();
-    _impl_.data_.in_ = CreateMaybeMessage<::io::deephaven::proto::backplane::grpc::InCondition>(GetArena());
-  }
-  return _impl_.data_.in_;
-}
-inline ::io::deephaven::proto::backplane::grpc::InCondition* Condition::mutable_in() ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  ::io::deephaven::proto::backplane::grpc::InCondition* _msg = _internal_mutable_in();
-  // @@protoc_insertion_point(field_mutable:io.deephaven.proto.backplane.grpc.Condition.in)
-  return _msg;
-}
-
-// .io.deephaven.proto.backplane.grpc.InvokeCondition invoke = 6;
-inline bool Condition::has_invoke() const {
-  return data_case() == kInvoke;
-}
-inline bool Condition::_internal_has_invoke() const {
-  return data_case() == kInvoke;
-}
-inline void Condition::set_has_invoke() {
-  _impl_._oneof_case_[0] = kInvoke;
-}
-inline void Condition::clear_invoke() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  if (data_case() == kInvoke) {
-    if (GetArena() == nullptr) {
-      delete _impl_.data_.invoke_;
-    }
-    clear_has_data();
-  }
-}
-inline ::io::deephaven::proto::backplane::grpc::InvokeCondition* Condition::release_invoke() {
-  // @@protoc_insertion_point(field_release:io.deephaven.proto.backplane.grpc.Condition.invoke)
-  if (data_case() == kInvoke) {
-    clear_has_data();
-    auto* temp = _impl_.data_.invoke_;
-    if (GetArena() != nullptr) {
-      temp = ::google::protobuf::internal::DuplicateIfNonNull(temp);
-    }
-    _impl_.data_.invoke_ = nullptr;
-    return temp;
-  } else {
-    return nullptr;
-  }
-}
-inline const ::io::deephaven::proto::backplane::grpc::InvokeCondition& Condition::_internal_invoke() const {
-  return data_case() == kInvoke ? *_impl_.data_.invoke_ : reinterpret_cast<::io::deephaven::proto::backplane::grpc::InvokeCondition&>(::io::deephaven::proto::backplane::grpc::_InvokeCondition_default_instance_);
-}
-inline const ::io::deephaven::proto::backplane::grpc::InvokeCondition& Condition::invoke() const ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  // @@protoc_insertion_point(field_get:io.deephaven.proto.backplane.grpc.Condition.invoke)
-  return _internal_invoke();
-}
-inline ::io::deephaven::proto::backplane::grpc::InvokeCondition* Condition::unsafe_arena_release_invoke() {
-  // @@protoc_insertion_point(field_unsafe_arena_release:io.deephaven.proto.backplane.grpc.Condition.invoke)
-  if (data_case() == kInvoke) {
-    clear_has_data();
-    auto* temp = _impl_.data_.invoke_;
-    _impl_.data_.invoke_ = nullptr;
-    return temp;
-  } else {
-    return nullptr;
-  }
-}
-inline void Condition::unsafe_arena_set_allocated_invoke(::io::deephaven::proto::backplane::grpc::InvokeCondition* value) {
-  // We rely on the oneof clear method to free the earlier contents
-  // of this oneof. We can directly use the pointer we're given to
-  // set the new value.
-  clear_data();
-  if (value) {
-    set_has_invoke();
-    _impl_.data_.invoke_ = value;
-  }
-  // @@protoc_insertion_point(field_unsafe_arena_set_allocated:io.deephaven.proto.backplane.grpc.Condition.invoke)
-}
-inline ::io::deephaven::proto::backplane::grpc::InvokeCondition* Condition::_internal_mutable_invoke() {
-  if (data_case() != kInvoke) {
-    clear_data();
-    set_has_invoke();
-    _impl_.data_.invoke_ = CreateMaybeMessage<::io::deephaven::proto::backplane::grpc::InvokeCondition>(GetArena());
-  }
-  return _impl_.data_.invoke_;
-}
-inline ::io::deephaven::proto::backplane::grpc::InvokeCondition* Condition::mutable_invoke() ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  ::io::deephaven::proto::backplane::grpc::InvokeCondition* _msg = _internal_mutable_invoke();
-  // @@protoc_insertion_point(field_mutable:io.deephaven.proto.backplane.grpc.Condition.invoke)
-  return _msg;
-}
-
-// .io.deephaven.proto.backplane.grpc.IsNullCondition is_null = 7;
-inline bool Condition::has_is_null() const {
-  return data_case() == kIsNull;
-}
-inline bool Condition::_internal_has_is_null() const {
-  return data_case() == kIsNull;
-}
-inline void Condition::set_has_is_null() {
-  _impl_._oneof_case_[0] = kIsNull;
-}
-inline void Condition::clear_is_null() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  if (data_case() == kIsNull) {
-    if (GetArena() == nullptr) {
-      delete _impl_.data_.is_null_;
-    }
-    clear_has_data();
-  }
-}
-inline ::io::deephaven::proto::backplane::grpc::IsNullCondition* Condition::release_is_null() {
-  // @@protoc_insertion_point(field_release:io.deephaven.proto.backplane.grpc.Condition.is_null)
-  if (data_case() == kIsNull) {
-    clear_has_data();
-    auto* temp = _impl_.data_.is_null_;
-    if (GetArena() != nullptr) {
-      temp = ::google::protobuf::internal::DuplicateIfNonNull(temp);
-    }
-    _impl_.data_.is_null_ = nullptr;
-    return temp;
-  } else {
-    return nullptr;
-  }
-}
-inline const ::io::deephaven::proto::backplane::grpc::IsNullCondition& Condition::_internal_is_null() const {
-  return data_case() == kIsNull ? *_impl_.data_.is_null_ : reinterpret_cast<::io::deephaven::proto::backplane::grpc::IsNullCondition&>(::io::deephaven::proto::backplane::grpc::_IsNullCondition_default_instance_);
-}
-inline const ::io::deephaven::proto::backplane::grpc::IsNullCondition& Condition::is_null() const ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  // @@protoc_insertion_point(field_get:io.deephaven.proto.backplane.grpc.Condition.is_null)
-  return _internal_is_null();
-}
-inline ::io::deephaven::proto::backplane::grpc::IsNullCondition* Condition::unsafe_arena_release_is_null() {
-  // @@protoc_insertion_point(field_unsafe_arena_release:io.deephaven.proto.backplane.grpc.Condition.is_null)
-  if (data_case() == kIsNull) {
-    clear_has_data();
-    auto* temp = _impl_.data_.is_null_;
-    _impl_.data_.is_null_ = nullptr;
-    return temp;
-  } else {
-    return nullptr;
-  }
-}
-inline void Condition::unsafe_arena_set_allocated_is_null(::io::deephaven::proto::backplane::grpc::IsNullCondition* value) {
-  // We rely on the oneof clear method to free the earlier contents
-  // of this oneof. We can directly use the pointer we're given to
-  // set the new value.
-  clear_data();
-  if (value) {
-    set_has_is_null();
-    _impl_.data_.is_null_ = value;
-  }
-  // @@protoc_insertion_point(field_unsafe_arena_set_allocated:io.deephaven.proto.backplane.grpc.Condition.is_null)
-}
-inline ::io::deephaven::proto::backplane::grpc::IsNullCondition* Condition::_internal_mutable_is_null() {
-  if (data_case() != kIsNull) {
-    clear_data();
-    set_has_is_null();
-    _impl_.data_.is_null_ = CreateMaybeMessage<::io::deephaven::proto::backplane::grpc::IsNullCondition>(GetArena());
-  }
-  return _impl_.data_.is_null_;
-}
-inline ::io::deephaven::proto::backplane::grpc::IsNullCondition* Condition::mutable_is_null() ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  ::io::deephaven::proto::backplane::grpc::IsNullCondition* _msg = _internal_mutable_is_null();
-  // @@protoc_insertion_point(field_mutable:io.deephaven.proto.backplane.grpc.Condition.is_null)
-  return _msg;
-}
-
-// .io.deephaven.proto.backplane.grpc.MatchesCondition matches = 8;
-inline bool Condition::has_matches() const {
-  return data_case() == kMatches;
-}
-inline bool Condition::_internal_has_matches() const {
-  return data_case() == kMatches;
-}
-inline void Condition::set_has_matches() {
-  _impl_._oneof_case_[0] = kMatches;
-}
-inline void Condition::clear_matches() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  if (data_case() == kMatches) {
-    if (GetArena() == nullptr) {
-      delete _impl_.data_.matches_;
-    }
-    clear_has_data();
-  }
-}
-inline ::io::deephaven::proto::backplane::grpc::MatchesCondition* Condition::release_matches() {
-  // @@protoc_insertion_point(field_release:io.deephaven.proto.backplane.grpc.Condition.matches)
-  if (data_case() == kMatches) {
-    clear_has_data();
-    auto* temp = _impl_.data_.matches_;
-    if (GetArena() != nullptr) {
-      temp = ::google::protobuf::internal::DuplicateIfNonNull(temp);
-    }
-    _impl_.data_.matches_ = nullptr;
-    return temp;
-  } else {
-    return nullptr;
-  }
-}
-inline const ::io::deephaven::proto::backplane::grpc::MatchesCondition& Condition::_internal_matches() const {
-  return data_case() == kMatches ? *_impl_.data_.matches_ : reinterpret_cast<::io::deephaven::proto::backplane::grpc::MatchesCondition&>(::io::deephaven::proto::backplane::grpc::_MatchesCondition_default_instance_);
-}
-inline const ::io::deephaven::proto::backplane::grpc::MatchesCondition& Condition::matches() const ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  // @@protoc_insertion_point(field_get:io.deephaven.proto.backplane.grpc.Condition.matches)
-  return _internal_matches();
-}
-inline ::io::deephaven::proto::backplane::grpc::MatchesCondition* Condition::unsafe_arena_release_matches() {
-  // @@protoc_insertion_point(field_unsafe_arena_release:io.deephaven.proto.backplane.grpc.Condition.matches)
-  if (data_case() == kMatches) {
-    clear_has_data();
-    auto* temp = _impl_.data_.matches_;
-    _impl_.data_.matches_ = nullptr;
-    return temp;
-  } else {
-    return nullptr;
-  }
-}
-inline void Condition::unsafe_arena_set_allocated_matches(::io::deephaven::proto::backplane::grpc::MatchesCondition* value) {
-  // We rely on the oneof clear method to free the earlier contents
-  // of this oneof. We can directly use the pointer we're given to
-  // set the new value.
-  clear_data();
-  if (value) {
-    set_has_matches();
-    _impl_.data_.matches_ = value;
-  }
-  // @@protoc_insertion_point(field_unsafe_arena_set_allocated:io.deephaven.proto.backplane.grpc.Condition.matches)
-}
-inline ::io::deephaven::proto::backplane::grpc::MatchesCondition* Condition::_internal_mutable_matches() {
-  if (data_case() != kMatches) {
-    clear_data();
-    set_has_matches();
-    _impl_.data_.matches_ = CreateMaybeMessage<::io::deephaven::proto::backplane::grpc::MatchesCondition>(GetArena());
-  }
-  return _impl_.data_.matches_;
-}
-inline ::io::deephaven::proto::backplane::grpc::MatchesCondition* Condition::mutable_matches() ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  ::io::deephaven::proto::backplane::grpc::MatchesCondition* _msg = _internal_mutable_matches();
-  // @@protoc_insertion_point(field_mutable:io.deephaven.proto.backplane.grpc.Condition.matches)
-  return _msg;
-}
-
-// .io.deephaven.proto.backplane.grpc.ContainsCondition contains = 9;
-inline bool Condition::has_contains() const {
-  return data_case() == kContains;
-}
-inline bool Condition::_internal_has_contains() const {
-  return data_case() == kContains;
-}
-inline void Condition::set_has_contains() {
-  _impl_._oneof_case_[0] = kContains;
-}
-inline void Condition::clear_contains() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  if (data_case() == kContains) {
-    if (GetArena() == nullptr) {
-      delete _impl_.data_.contains_;
-    }
-    clear_has_data();
-  }
-}
-inline ::io::deephaven::proto::backplane::grpc::ContainsCondition* Condition::release_contains() {
-  // @@protoc_insertion_point(field_release:io.deephaven.proto.backplane.grpc.Condition.contains)
-  if (data_case() == kContains) {
-    clear_has_data();
-    auto* temp = _impl_.data_.contains_;
-    if (GetArena() != nullptr) {
-      temp = ::google::protobuf::internal::DuplicateIfNonNull(temp);
-    }
-    _impl_.data_.contains_ = nullptr;
-    return temp;
-  } else {
-    return nullptr;
-  }
-}
-inline const ::io::deephaven::proto::backplane::grpc::ContainsCondition& Condition::_internal_contains() const {
-  return data_case() == kContains ? *_impl_.data_.contains_ : reinterpret_cast<::io::deephaven::proto::backplane::grpc::ContainsCondition&>(::io::deephaven::proto::backplane::grpc::_ContainsCondition_default_instance_);
-}
-inline const ::io::deephaven::proto::backplane::grpc::ContainsCondition& Condition::contains() const ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  // @@protoc_insertion_point(field_get:io.deephaven.proto.backplane.grpc.Condition.contains)
-  return _internal_contains();
-}
-inline ::io::deephaven::proto::backplane::grpc::ContainsCondition* Condition::unsafe_arena_release_contains() {
-  // @@protoc_insertion_point(field_unsafe_arena_release:io.deephaven.proto.backplane.grpc.Condition.contains)
-  if (data_case() == kContains) {
-    clear_has_data();
-    auto* temp = _impl_.data_.contains_;
-    _impl_.data_.contains_ = nullptr;
-    return temp;
-  } else {
-    return nullptr;
-  }
-}
-inline void Condition::unsafe_arena_set_allocated_contains(::io::deephaven::proto::backplane::grpc::ContainsCondition* value) {
-  // We rely on the oneof clear method to free the earlier contents
-  // of this oneof. We can directly use the pointer we're given to
-  // set the new value.
-  clear_data();
-  if (value) {
-    set_has_contains();
-    _impl_.data_.contains_ = value;
-  }
-  // @@protoc_insertion_point(field_unsafe_arena_set_allocated:io.deephaven.proto.backplane.grpc.Condition.contains)
-}
-inline ::io::deephaven::proto::backplane::grpc::ContainsCondition* Condition::_internal_mutable_contains() {
-  if (data_case() != kContains) {
-    clear_data();
-    set_has_contains();
-    _impl_.data_.contains_ = CreateMaybeMessage<::io::deephaven::proto::backplane::grpc::ContainsCondition>(GetArena());
-  }
-  return _impl_.data_.contains_;
-}
-inline ::io::deephaven::proto::backplane::grpc::ContainsCondition* Condition::mutable_contains() ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  ::io::deephaven::proto::backplane::grpc::ContainsCondition* _msg = _internal_mutable_contains();
-  // @@protoc_insertion_point(field_mutable:io.deephaven.proto.backplane.grpc.Condition.contains)
-  return _msg;
-}
-
-// .io.deephaven.proto.backplane.grpc.SearchCondition search = 10;
-inline bool Condition::has_search() const {
-  return data_case() == kSearch;
-}
-inline bool Condition::_internal_has_search() const {
-  return data_case() == kSearch;
-}
-inline void Condition::set_has_search() {
-  _impl_._oneof_case_[0] = kSearch;
-}
-inline void Condition::clear_search() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  if (data_case() == kSearch) {
-    if (GetArena() == nullptr) {
-      delete _impl_.data_.search_;
-    }
-    clear_has_data();
-  }
-}
-inline ::io::deephaven::proto::backplane::grpc::SearchCondition* Condition::release_search() {
-  // @@protoc_insertion_point(field_release:io.deephaven.proto.backplane.grpc.Condition.search)
-  if (data_case() == kSearch) {
-    clear_has_data();
-    auto* temp = _impl_.data_.search_;
-    if (GetArena() != nullptr) {
-      temp = ::google::protobuf::internal::DuplicateIfNonNull(temp);
-    }
-    _impl_.data_.search_ = nullptr;
-    return temp;
-  } else {
-    return nullptr;
-  }
-}
-inline const ::io::deephaven::proto::backplane::grpc::SearchCondition& Condition::_internal_search() const {
-  return data_case() == kSearch ? *_impl_.data_.search_ : reinterpret_cast<::io::deephaven::proto::backplane::grpc::SearchCondition&>(::io::deephaven::proto::backplane::grpc::_SearchCondition_default_instance_);
-}
-inline const ::io::deephaven::proto::backplane::grpc::SearchCondition& Condition::search() const ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  // @@protoc_insertion_point(field_get:io.deephaven.proto.backplane.grpc.Condition.search)
-  return _internal_search();
-}
-inline ::io::deephaven::proto::backplane::grpc::SearchCondition* Condition::unsafe_arena_release_search() {
-  // @@protoc_insertion_point(field_unsafe_arena_release:io.deephaven.proto.backplane.grpc.Condition.search)
-  if (data_case() == kSearch) {
-    clear_has_data();
-    auto* temp = _impl_.data_.search_;
-    _impl_.data_.search_ = nullptr;
-    return temp;
-  } else {
-    return nullptr;
-  }
-}
-inline void Condition::unsafe_arena_set_allocated_search(::io::deephaven::proto::backplane::grpc::SearchCondition* value) {
-  // We rely on the oneof clear method to free the earlier contents
-  // of this oneof. We can directly use the pointer we're given to
-  // set the new value.
-  clear_data();
-  if (value) {
-    set_has_search();
-    _impl_.data_.search_ = value;
-  }
-  // @@protoc_insertion_point(field_unsafe_arena_set_allocated:io.deephaven.proto.backplane.grpc.Condition.search)
-}
-inline ::io::deephaven::proto::backplane::grpc::SearchCondition* Condition::_internal_mutable_search() {
-  if (data_case() != kSearch) {
-    clear_data();
-    set_has_search();
-    _impl_.data_.search_ = CreateMaybeMessage<::io::deephaven::proto::backplane::grpc::SearchCondition>(GetArena());
-  }
-  return _impl_.data_.search_;
-}
-inline ::io::deephaven::proto::backplane::grpc::SearchCondition* Condition::mutable_search() ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  ::io::deephaven::proto::backplane::grpc::SearchCondition* _msg = _internal_mutable_search();
-  // @@protoc_insertion_point(field_mutable:io.deephaven.proto.backplane.grpc.Condition.search)
-  return _msg;
-}
-
-inline bool Condition::has_data() const {
-  return data_case() != DATA_NOT_SET;
-}
-inline void Condition::clear_has_data() {
-  _impl_._oneof_case_[0] = DATA_NOT_SET;
-}
-inline Condition::DataCase Condition::data_case() const {
-  return Condition::DataCase(_impl_._oneof_case_[0]);
-}
-// -------------------------------------------------------------------
-
-// AndCondition
-
-// repeated .io.deephaven.proto.backplane.grpc.Condition filters = 1;
-inline int AndCondition::_internal_filters_size() const {
-  return _internal_filters().size();
-}
-inline int AndCondition::filters_size() const {
-  return _internal_filters_size();
-}
-inline void AndCondition::clear_filters() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  _impl_.filters_.Clear();
-}
-inline ::io::deephaven::proto::backplane::grpc::Condition* AndCondition::mutable_filters(int index)
-    ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  // @@protoc_insertion_point(field_mutable:io.deephaven.proto.backplane.grpc.AndCondition.filters)
-  return _internal_mutable_filters()->Mutable(index);
-}
-inline ::google::protobuf::RepeatedPtrField<::io::deephaven::proto::backplane::grpc::Condition>* AndCondition::mutable_filters()
-    ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  // @@protoc_insertion_point(field_mutable_list:io.deephaven.proto.backplane.grpc.AndCondition.filters)
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  return _internal_mutable_filters();
-}
-inline const ::io::deephaven::proto::backplane::grpc::Condition& AndCondition::filters(int index) const
-    ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  // @@protoc_insertion_point(field_get:io.deephaven.proto.backplane.grpc.AndCondition.filters)
-  return _internal_filters().Get(index);
-}
-inline ::io::deephaven::proto::backplane::grpc::Condition* AndCondition::add_filters() ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  ::io::deephaven::proto::backplane::grpc::Condition* _add = _internal_mutable_filters()->Add();
-  // @@protoc_insertion_point(field_add:io.deephaven.proto.backplane.grpc.AndCondition.filters)
-  return _add;
-}
-inline const ::google::protobuf::RepeatedPtrField<::io::deephaven::proto::backplane::grpc::Condition>& AndCondition::filters() const
-    ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  // @@protoc_insertion_point(field_list:io.deephaven.proto.backplane.grpc.AndCondition.filters)
-  return _internal_filters();
-}
-inline const ::google::protobuf::RepeatedPtrField<::io::deephaven::proto::backplane::grpc::Condition>&
-AndCondition::_internal_filters() const {
-  PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race);
-  return _impl_.filters_;
-}
-inline ::google::protobuf::RepeatedPtrField<::io::deephaven::proto::backplane::grpc::Condition>*
-AndCondition::_internal_mutable_filters() {
-  PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race);
-  return &_impl_.filters_;
-}
-
-// -------------------------------------------------------------------
-
-// OrCondition
-
-// repeated .io.deephaven.proto.backplane.grpc.Condition filters = 1;
-inline int OrCondition::_internal_filters_size() const {
-  return _internal_filters().size();
-}
-inline int OrCondition::filters_size() const {
-  return _internal_filters_size();
-}
-inline void OrCondition::clear_filters() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  _impl_.filters_.Clear();
-}
-inline ::io::deephaven::proto::backplane::grpc::Condition* OrCondition::mutable_filters(int index)
-    ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  // @@protoc_insertion_point(field_mutable:io.deephaven.proto.backplane.grpc.OrCondition.filters)
-  return _internal_mutable_filters()->Mutable(index);
-}
-inline ::google::protobuf::RepeatedPtrField<::io::deephaven::proto::backplane::grpc::Condition>* OrCondition::mutable_filters()
-    ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  // @@protoc_insertion_point(field_mutable_list:io.deephaven.proto.backplane.grpc.OrCondition.filters)
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  return _internal_mutable_filters();
-}
-inline const ::io::deephaven::proto::backplane::grpc::Condition& OrCondition::filters(int index) const
-    ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  // @@protoc_insertion_point(field_get:io.deephaven.proto.backplane.grpc.OrCondition.filters)
-  return _internal_filters().Get(index);
-}
-inline ::io::deephaven::proto::backplane::grpc::Condition* OrCondition::add_filters() ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  ::io::deephaven::proto::backplane::grpc::Condition* _add = _internal_mutable_filters()->Add();
-  // @@protoc_insertion_point(field_add:io.deephaven.proto.backplane.grpc.OrCondition.filters)
-  return _add;
-}
-inline const ::google::protobuf::RepeatedPtrField<::io::deephaven::proto::backplane::grpc::Condition>& OrCondition::filters() const
-    ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  // @@protoc_insertion_point(field_list:io.deephaven.proto.backplane.grpc.OrCondition.filters)
-  return _internal_filters();
-}
-inline const ::google::protobuf::RepeatedPtrField<::io::deephaven::proto::backplane::grpc::Condition>&
-OrCondition::_internal_filters() const {
-  PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race);
-  return _impl_.filters_;
-}
-inline ::google::protobuf::RepeatedPtrField<::io::deephaven::proto::backplane::grpc::Condition>*
-OrCondition::_internal_mutable_filters() {
-  PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race);
-  return &_impl_.filters_;
-}
-
-// -------------------------------------------------------------------
-
-// NotCondition
-
-// .io.deephaven.proto.backplane.grpc.Condition filter = 1;
-inline bool NotCondition::has_filter() const {
-  bool value = (_impl_._has_bits_[0] & 0x00000001u) != 0;
-  PROTOBUF_ASSUME(!value || _impl_.filter_ != nullptr);
-  return value;
-}
-inline void NotCondition::clear_filter() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  if (_impl_.filter_ != nullptr) _impl_.filter_->Clear();
-  _impl_._has_bits_[0] &= ~0x00000001u;
-}
-inline const ::io::deephaven::proto::backplane::grpc::Condition& NotCondition::_internal_filter() const {
-  PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race);
-  const ::io::deephaven::proto::backplane::grpc::Condition* p = _impl_.filter_;
-  return p != nullptr ? *p : reinterpret_cast<const ::io::deephaven::proto::backplane::grpc::Condition&>(::io::deephaven::proto::backplane::grpc::_Condition_default_instance_);
-}
-inline const ::io::deephaven::proto::backplane::grpc::Condition& NotCondition::filter() const ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  // @@protoc_insertion_point(field_get:io.deephaven.proto.backplane.grpc.NotCondition.filter)
-  return _internal_filter();
-}
-inline void NotCondition::unsafe_arena_set_allocated_filter(::io::deephaven::proto::backplane::grpc::Condition* value) {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  if (GetArena() == nullptr) {
-    delete reinterpret_cast<::google::protobuf::MessageLite*>(_impl_.filter_);
-  }
-  _impl_.filter_ = reinterpret_cast<::io::deephaven::proto::backplane::grpc::Condition*>(value);
-  if (value != nullptr) {
-    _impl_._has_bits_[0] |= 0x00000001u;
-  } else {
-    _impl_._has_bits_[0] &= ~0x00000001u;
-  }
-  // @@protoc_insertion_point(field_unsafe_arena_set_allocated:io.deephaven.proto.backplane.grpc.NotCondition.filter)
-}
-inline ::io::deephaven::proto::backplane::grpc::Condition* NotCondition::release_filter() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-
-  _impl_._has_bits_[0] &= ~0x00000001u;
-  ::io::deephaven::proto::backplane::grpc::Condition* released = _impl_.filter_;
-  _impl_.filter_ = nullptr;
-#ifdef PROTOBUF_FORCE_COPY_IN_RELEASE
-  auto* old = reinterpret_cast<::google::protobuf::MessageLite*>(released);
-  released = ::google::protobuf::internal::DuplicateIfNonNull(released);
-  if (GetArena() == nullptr) {
-    delete old;
-  }
-#else   // PROTOBUF_FORCE_COPY_IN_RELEASE
-  if (GetArena() != nullptr) {
-    released = ::google::protobuf::internal::DuplicateIfNonNull(released);
-  }
-#endif  // !PROTOBUF_FORCE_COPY_IN_RELEASE
-  return released;
-}
-inline ::io::deephaven::proto::backplane::grpc::Condition* NotCondition::unsafe_arena_release_filter() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  // @@protoc_insertion_point(field_release:io.deephaven.proto.backplane.grpc.NotCondition.filter)
-
-  _impl_._has_bits_[0] &= ~0x00000001u;
-  ::io::deephaven::proto::backplane::grpc::Condition* temp = _impl_.filter_;
-  _impl_.filter_ = nullptr;
-  return temp;
-}
-inline ::io::deephaven::proto::backplane::grpc::Condition* NotCondition::_internal_mutable_filter() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  _impl_._has_bits_[0] |= 0x00000001u;
-  if (_impl_.filter_ == nullptr) {
-    auto* p = CreateMaybeMessage<::io::deephaven::proto::backplane::grpc::Condition>(GetArena());
-    _impl_.filter_ = reinterpret_cast<::io::deephaven::proto::backplane::grpc::Condition*>(p);
-  }
-  return _impl_.filter_;
-}
-inline ::io::deephaven::proto::backplane::grpc::Condition* NotCondition::mutable_filter() ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  ::io::deephaven::proto::backplane::grpc::Condition* _msg = _internal_mutable_filter();
-  // @@protoc_insertion_point(field_mutable:io.deephaven.proto.backplane.grpc.NotCondition.filter)
-  return _msg;
-}
-inline void NotCondition::set_allocated_filter(::io::deephaven::proto::backplane::grpc::Condition* value) {
-  ::google::protobuf::Arena* message_arena = GetArena();
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  if (message_arena == nullptr) {
-    delete reinterpret_cast<::io::deephaven::proto::backplane::grpc::Condition*>(_impl_.filter_);
-  }
-
-  if (value != nullptr) {
-    ::google::protobuf::Arena* submessage_arena = reinterpret_cast<::io::deephaven::proto::backplane::grpc::Condition*>(value)->GetArena();
-    if (message_arena != submessage_arena) {
-      value = ::google::protobuf::internal::GetOwnedMessage(message_arena, value, submessage_arena);
-    }
-    _impl_._has_bits_[0] |= 0x00000001u;
-  } else {
-    _impl_._has_bits_[0] &= ~0x00000001u;
-  }
-
-  _impl_.filter_ = reinterpret_cast<::io::deephaven::proto::backplane::grpc::Condition*>(value);
-  // @@protoc_insertion_point(field_set_allocated:io.deephaven.proto.backplane.grpc.NotCondition.filter)
-}
-
-// -------------------------------------------------------------------
-
-// CompareCondition
-
-// .io.deephaven.proto.backplane.grpc.CompareCondition.CompareOperation operation = 1;
-inline void CompareCondition::clear_operation() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  _impl_.operation_ = 0;
-}
-inline ::io::deephaven::proto::backplane::grpc::CompareCondition_CompareOperation CompareCondition::operation() const {
-  // @@protoc_insertion_point(field_get:io.deephaven.proto.backplane.grpc.CompareCondition.operation)
-  return _internal_operation();
-}
-inline void CompareCondition::set_operation(::io::deephaven::proto::backplane::grpc::CompareCondition_CompareOperation value) {
-  _internal_set_operation(value);
-  // @@protoc_insertion_point(field_set:io.deephaven.proto.backplane.grpc.CompareCondition.operation)
-}
-inline ::io::deephaven::proto::backplane::grpc::CompareCondition_CompareOperation CompareCondition::_internal_operation() const {
-  PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race);
-  return static_cast<::io::deephaven::proto::backplane::grpc::CompareCondition_CompareOperation>(_impl_.operation_);
-}
-inline void CompareCondition::_internal_set_operation(::io::deephaven::proto::backplane::grpc::CompareCondition_CompareOperation value) {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  ;
-  _impl_.operation_ = value;
-}
-
-// .io.deephaven.proto.backplane.grpc.CaseSensitivity case_sensitivity = 2;
-inline void CompareCondition::clear_case_sensitivity() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  _impl_.case_sensitivity_ = 0;
-}
-inline ::io::deephaven::proto::backplane::grpc::CaseSensitivity CompareCondition::case_sensitivity() const {
-  // @@protoc_insertion_point(field_get:io.deephaven.proto.backplane.grpc.CompareCondition.case_sensitivity)
-  return _internal_case_sensitivity();
-}
-inline void CompareCondition::set_case_sensitivity(::io::deephaven::proto::backplane::grpc::CaseSensitivity value) {
-  _internal_set_case_sensitivity(value);
-  // @@protoc_insertion_point(field_set:io.deephaven.proto.backplane.grpc.CompareCondition.case_sensitivity)
-}
-inline ::io::deephaven::proto::backplane::grpc::CaseSensitivity CompareCondition::_internal_case_sensitivity() const {
-  PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race);
-  return static_cast<::io::deephaven::proto::backplane::grpc::CaseSensitivity>(_impl_.case_sensitivity_);
-}
-inline void CompareCondition::_internal_set_case_sensitivity(::io::deephaven::proto::backplane::grpc::CaseSensitivity value) {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  ;
-  _impl_.case_sensitivity_ = value;
-}
-
-// .io.deephaven.proto.backplane.grpc.Value lhs = 3;
-inline bool CompareCondition::has_lhs() const {
-  bool value = (_impl_._has_bits_[0] & 0x00000001u) != 0;
-  PROTOBUF_ASSUME(!value || _impl_.lhs_ != nullptr);
-  return value;
-}
-inline void CompareCondition::clear_lhs() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  if (_impl_.lhs_ != nullptr) _impl_.lhs_->Clear();
-  _impl_._has_bits_[0] &= ~0x00000001u;
-}
-inline const ::io::deephaven::proto::backplane::grpc::Value& CompareCondition::_internal_lhs() const {
-  PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race);
-  const ::io::deephaven::proto::backplane::grpc::Value* p = _impl_.lhs_;
-  return p != nullptr ? *p : reinterpret_cast<const ::io::deephaven::proto::backplane::grpc::Value&>(::io::deephaven::proto::backplane::grpc::_Value_default_instance_);
-}
-inline const ::io::deephaven::proto::backplane::grpc::Value& CompareCondition::lhs() const ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  // @@protoc_insertion_point(field_get:io.deephaven.proto.backplane.grpc.CompareCondition.lhs)
-  return _internal_lhs();
-}
-inline void CompareCondition::unsafe_arena_set_allocated_lhs(::io::deephaven::proto::backplane::grpc::Value* value) {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  if (GetArena() == nullptr) {
-    delete reinterpret_cast<::google::protobuf::MessageLite*>(_impl_.lhs_);
-  }
-  _impl_.lhs_ = reinterpret_cast<::io::deephaven::proto::backplane::grpc::Value*>(value);
-  if (value != nullptr) {
-    _impl_._has_bits_[0] |= 0x00000001u;
-  } else {
-    _impl_._has_bits_[0] &= ~0x00000001u;
-  }
-  // @@protoc_insertion_point(field_unsafe_arena_set_allocated:io.deephaven.proto.backplane.grpc.CompareCondition.lhs)
-}
-inline ::io::deephaven::proto::backplane::grpc::Value* CompareCondition::release_lhs() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-
-  _impl_._has_bits_[0] &= ~0x00000001u;
-  ::io::deephaven::proto::backplane::grpc::Value* released = _impl_.lhs_;
-  _impl_.lhs_ = nullptr;
-#ifdef PROTOBUF_FORCE_COPY_IN_RELEASE
-  auto* old = reinterpret_cast<::google::protobuf::MessageLite*>(released);
-  released = ::google::protobuf::internal::DuplicateIfNonNull(released);
-  if (GetArena() == nullptr) {
-    delete old;
-  }
-#else   // PROTOBUF_FORCE_COPY_IN_RELEASE
-  if (GetArena() != nullptr) {
-    released = ::google::protobuf::internal::DuplicateIfNonNull(released);
-  }
-#endif  // !PROTOBUF_FORCE_COPY_IN_RELEASE
-  return released;
-}
-inline ::io::deephaven::proto::backplane::grpc::Value* CompareCondition::unsafe_arena_release_lhs() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  // @@protoc_insertion_point(field_release:io.deephaven.proto.backplane.grpc.CompareCondition.lhs)
-
-  _impl_._has_bits_[0] &= ~0x00000001u;
-  ::io::deephaven::proto::backplane::grpc::Value* temp = _impl_.lhs_;
-  _impl_.lhs_ = nullptr;
-  return temp;
-}
-inline ::io::deephaven::proto::backplane::grpc::Value* CompareCondition::_internal_mutable_lhs() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  _impl_._has_bits_[0] |= 0x00000001u;
-  if (_impl_.lhs_ == nullptr) {
-    auto* p = CreateMaybeMessage<::io::deephaven::proto::backplane::grpc::Value>(GetArena());
-    _impl_.lhs_ = reinterpret_cast<::io::deephaven::proto::backplane::grpc::Value*>(p);
-  }
-  return _impl_.lhs_;
-}
-inline ::io::deephaven::proto::backplane::grpc::Value* CompareCondition::mutable_lhs() ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  ::io::deephaven::proto::backplane::grpc::Value* _msg = _internal_mutable_lhs();
-  // @@protoc_insertion_point(field_mutable:io.deephaven.proto.backplane.grpc.CompareCondition.lhs)
-  return _msg;
-}
-inline void CompareCondition::set_allocated_lhs(::io::deephaven::proto::backplane::grpc::Value* value) {
-  ::google::protobuf::Arena* message_arena = GetArena();
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  if (message_arena == nullptr) {
-    delete reinterpret_cast<::io::deephaven::proto::backplane::grpc::Value*>(_impl_.lhs_);
-  }
-
-  if (value != nullptr) {
-    ::google::protobuf::Arena* submessage_arena = reinterpret_cast<::io::deephaven::proto::backplane::grpc::Value*>(value)->GetArena();
-    if (message_arena != submessage_arena) {
-      value = ::google::protobuf::internal::GetOwnedMessage(message_arena, value, submessage_arena);
-    }
-    _impl_._has_bits_[0] |= 0x00000001u;
-  } else {
-    _impl_._has_bits_[0] &= ~0x00000001u;
-  }
-
-  _impl_.lhs_ = reinterpret_cast<::io::deephaven::proto::backplane::grpc::Value*>(value);
-  // @@protoc_insertion_point(field_set_allocated:io.deephaven.proto.backplane.grpc.CompareCondition.lhs)
-}
-
-// .io.deephaven.proto.backplane.grpc.Value rhs = 4;
-inline bool CompareCondition::has_rhs() const {
-  bool value = (_impl_._has_bits_[0] & 0x00000002u) != 0;
-  PROTOBUF_ASSUME(!value || _impl_.rhs_ != nullptr);
-  return value;
-}
-inline void CompareCondition::clear_rhs() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  if (_impl_.rhs_ != nullptr) _impl_.rhs_->Clear();
-  _impl_._has_bits_[0] &= ~0x00000002u;
-}
-inline const ::io::deephaven::proto::backplane::grpc::Value& CompareCondition::_internal_rhs() const {
-  PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race);
-  const ::io::deephaven::proto::backplane::grpc::Value* p = _impl_.rhs_;
-  return p != nullptr ? *p : reinterpret_cast<const ::io::deephaven::proto::backplane::grpc::Value&>(::io::deephaven::proto::backplane::grpc::_Value_default_instance_);
-}
-inline const ::io::deephaven::proto::backplane::grpc::Value& CompareCondition::rhs() const ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  // @@protoc_insertion_point(field_get:io.deephaven.proto.backplane.grpc.CompareCondition.rhs)
-  return _internal_rhs();
-}
-inline void CompareCondition::unsafe_arena_set_allocated_rhs(::io::deephaven::proto::backplane::grpc::Value* value) {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  if (GetArena() == nullptr) {
-    delete reinterpret_cast<::google::protobuf::MessageLite*>(_impl_.rhs_);
-  }
-  _impl_.rhs_ = reinterpret_cast<::io::deephaven::proto::backplane::grpc::Value*>(value);
-  if (value != nullptr) {
-    _impl_._has_bits_[0] |= 0x00000002u;
-  } else {
-    _impl_._has_bits_[0] &= ~0x00000002u;
-  }
-  // @@protoc_insertion_point(field_unsafe_arena_set_allocated:io.deephaven.proto.backplane.grpc.CompareCondition.rhs)
-}
-inline ::io::deephaven::proto::backplane::grpc::Value* CompareCondition::release_rhs() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-
-  _impl_._has_bits_[0] &= ~0x00000002u;
-  ::io::deephaven::proto::backplane::grpc::Value* released = _impl_.rhs_;
-  _impl_.rhs_ = nullptr;
-#ifdef PROTOBUF_FORCE_COPY_IN_RELEASE
-  auto* old = reinterpret_cast<::google::protobuf::MessageLite*>(released);
-  released = ::google::protobuf::internal::DuplicateIfNonNull(released);
-  if (GetArena() == nullptr) {
-    delete old;
-  }
-#else   // PROTOBUF_FORCE_COPY_IN_RELEASE
-  if (GetArena() != nullptr) {
-    released = ::google::protobuf::internal::DuplicateIfNonNull(released);
-  }
-#endif  // !PROTOBUF_FORCE_COPY_IN_RELEASE
-  return released;
-}
-inline ::io::deephaven::proto::backplane::grpc::Value* CompareCondition::unsafe_arena_release_rhs() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  // @@protoc_insertion_point(field_release:io.deephaven.proto.backplane.grpc.CompareCondition.rhs)
-
-  _impl_._has_bits_[0] &= ~0x00000002u;
-  ::io::deephaven::proto::backplane::grpc::Value* temp = _impl_.rhs_;
-  _impl_.rhs_ = nullptr;
-  return temp;
-}
-inline ::io::deephaven::proto::backplane::grpc::Value* CompareCondition::_internal_mutable_rhs() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  _impl_._has_bits_[0] |= 0x00000002u;
-  if (_impl_.rhs_ == nullptr) {
-    auto* p = CreateMaybeMessage<::io::deephaven::proto::backplane::grpc::Value>(GetArena());
-    _impl_.rhs_ = reinterpret_cast<::io::deephaven::proto::backplane::grpc::Value*>(p);
-  }
-  return _impl_.rhs_;
-}
-inline ::io::deephaven::proto::backplane::grpc::Value* CompareCondition::mutable_rhs() ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  ::io::deephaven::proto::backplane::grpc::Value* _msg = _internal_mutable_rhs();
-  // @@protoc_insertion_point(field_mutable:io.deephaven.proto.backplane.grpc.CompareCondition.rhs)
-  return _msg;
-}
-inline void CompareCondition::set_allocated_rhs(::io::deephaven::proto::backplane::grpc::Value* value) {
-  ::google::protobuf::Arena* message_arena = GetArena();
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  if (message_arena == nullptr) {
-    delete reinterpret_cast<::io::deephaven::proto::backplane::grpc::Value*>(_impl_.rhs_);
-  }
-
-  if (value != nullptr) {
-    ::google::protobuf::Arena* submessage_arena = reinterpret_cast<::io::deephaven::proto::backplane::grpc::Value*>(value)->GetArena();
-    if (message_arena != submessage_arena) {
-      value = ::google::protobuf::internal::GetOwnedMessage(message_arena, value, submessage_arena);
-    }
-    _impl_._has_bits_[0] |= 0x00000002u;
-  } else {
-    _impl_._has_bits_[0] &= ~0x00000002u;
-  }
-
-  _impl_.rhs_ = reinterpret_cast<::io::deephaven::proto::backplane::grpc::Value*>(value);
-  // @@protoc_insertion_point(field_set_allocated:io.deephaven.proto.backplane.grpc.CompareCondition.rhs)
-}
-
-// -------------------------------------------------------------------
-
-// InCondition
-
-// .io.deephaven.proto.backplane.grpc.Value target = 1;
-inline bool InCondition::has_target() const {
-  bool value = (_impl_._has_bits_[0] & 0x00000001u) != 0;
-  PROTOBUF_ASSUME(!value || _impl_.target_ != nullptr);
-  return value;
-}
-inline void InCondition::clear_target() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  if (_impl_.target_ != nullptr) _impl_.target_->Clear();
-  _impl_._has_bits_[0] &= ~0x00000001u;
-}
-inline const ::io::deephaven::proto::backplane::grpc::Value& InCondition::_internal_target() const {
-  PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race);
-  const ::io::deephaven::proto::backplane::grpc::Value* p = _impl_.target_;
-  return p != nullptr ? *p : reinterpret_cast<const ::io::deephaven::proto::backplane::grpc::Value&>(::io::deephaven::proto::backplane::grpc::_Value_default_instance_);
-}
-inline const ::io::deephaven::proto::backplane::grpc::Value& InCondition::target() const ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  // @@protoc_insertion_point(field_get:io.deephaven.proto.backplane.grpc.InCondition.target)
-  return _internal_target();
-}
-inline void InCondition::unsafe_arena_set_allocated_target(::io::deephaven::proto::backplane::grpc::Value* value) {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  if (GetArena() == nullptr) {
-    delete reinterpret_cast<::google::protobuf::MessageLite*>(_impl_.target_);
-  }
-  _impl_.target_ = reinterpret_cast<::io::deephaven::proto::backplane::grpc::Value*>(value);
-  if (value != nullptr) {
-    _impl_._has_bits_[0] |= 0x00000001u;
-  } else {
-    _impl_._has_bits_[0] &= ~0x00000001u;
-  }
-  // @@protoc_insertion_point(field_unsafe_arena_set_allocated:io.deephaven.proto.backplane.grpc.InCondition.target)
-}
-inline ::io::deephaven::proto::backplane::grpc::Value* InCondition::release_target() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-
-  _impl_._has_bits_[0] &= ~0x00000001u;
-  ::io::deephaven::proto::backplane::grpc::Value* released = _impl_.target_;
-  _impl_.target_ = nullptr;
-#ifdef PROTOBUF_FORCE_COPY_IN_RELEASE
-  auto* old = reinterpret_cast<::google::protobuf::MessageLite*>(released);
-  released = ::google::protobuf::internal::DuplicateIfNonNull(released);
-  if (GetArena() == nullptr) {
-    delete old;
-  }
-#else   // PROTOBUF_FORCE_COPY_IN_RELEASE
-  if (GetArena() != nullptr) {
-    released = ::google::protobuf::internal::DuplicateIfNonNull(released);
-  }
-#endif  // !PROTOBUF_FORCE_COPY_IN_RELEASE
-  return released;
-}
-inline ::io::deephaven::proto::backplane::grpc::Value* InCondition::unsafe_arena_release_target() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  // @@protoc_insertion_point(field_release:io.deephaven.proto.backplane.grpc.InCondition.target)
-
-  _impl_._has_bits_[0] &= ~0x00000001u;
-  ::io::deephaven::proto::backplane::grpc::Value* temp = _impl_.target_;
-  _impl_.target_ = nullptr;
-  return temp;
-}
-inline ::io::deephaven::proto::backplane::grpc::Value* InCondition::_internal_mutable_target() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  _impl_._has_bits_[0] |= 0x00000001u;
-  if (_impl_.target_ == nullptr) {
-    auto* p = CreateMaybeMessage<::io::deephaven::proto::backplane::grpc::Value>(GetArena());
-    _impl_.target_ = reinterpret_cast<::io::deephaven::proto::backplane::grpc::Value*>(p);
-  }
-  return _impl_.target_;
-}
-inline ::io::deephaven::proto::backplane::grpc::Value* InCondition::mutable_target() ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  ::io::deephaven::proto::backplane::grpc::Value* _msg = _internal_mutable_target();
-  // @@protoc_insertion_point(field_mutable:io.deephaven.proto.backplane.grpc.InCondition.target)
-  return _msg;
-}
-inline void InCondition::set_allocated_target(::io::deephaven::proto::backplane::grpc::Value* value) {
-  ::google::protobuf::Arena* message_arena = GetArena();
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  if (message_arena == nullptr) {
-    delete reinterpret_cast<::io::deephaven::proto::backplane::grpc::Value*>(_impl_.target_);
-  }
-
-  if (value != nullptr) {
-    ::google::protobuf::Arena* submessage_arena = reinterpret_cast<::io::deephaven::proto::backplane::grpc::Value*>(value)->GetArena();
-    if (message_arena != submessage_arena) {
-      value = ::google::protobuf::internal::GetOwnedMessage(message_arena, value, submessage_arena);
-    }
-    _impl_._has_bits_[0] |= 0x00000001u;
-  } else {
-    _impl_._has_bits_[0] &= ~0x00000001u;
-  }
-
-  _impl_.target_ = reinterpret_cast<::io::deephaven::proto::backplane::grpc::Value*>(value);
-  // @@protoc_insertion_point(field_set_allocated:io.deephaven.proto.backplane.grpc.InCondition.target)
-}
-
-// repeated .io.deephaven.proto.backplane.grpc.Value candidates = 2;
-inline int InCondition::_internal_candidates_size() const {
-  return _internal_candidates().size();
-}
-inline int InCondition::candidates_size() const {
-  return _internal_candidates_size();
-}
-inline void InCondition::clear_candidates() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  _impl_.candidates_.Clear();
-}
-inline ::io::deephaven::proto::backplane::grpc::Value* InCondition::mutable_candidates(int index)
-    ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  // @@protoc_insertion_point(field_mutable:io.deephaven.proto.backplane.grpc.InCondition.candidates)
-  return _internal_mutable_candidates()->Mutable(index);
-}
-inline ::google::protobuf::RepeatedPtrField<::io::deephaven::proto::backplane::grpc::Value>* InCondition::mutable_candidates()
-    ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  // @@protoc_insertion_point(field_mutable_list:io.deephaven.proto.backplane.grpc.InCondition.candidates)
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  return _internal_mutable_candidates();
-}
-inline const ::io::deephaven::proto::backplane::grpc::Value& InCondition::candidates(int index) const
-    ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  // @@protoc_insertion_point(field_get:io.deephaven.proto.backplane.grpc.InCondition.candidates)
-  return _internal_candidates().Get(index);
-}
-inline ::io::deephaven::proto::backplane::grpc::Value* InCondition::add_candidates() ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  ::io::deephaven::proto::backplane::grpc::Value* _add = _internal_mutable_candidates()->Add();
-  // @@protoc_insertion_point(field_add:io.deephaven.proto.backplane.grpc.InCondition.candidates)
-  return _add;
-}
-inline const ::google::protobuf::RepeatedPtrField<::io::deephaven::proto::backplane::grpc::Value>& InCondition::candidates() const
-    ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  // @@protoc_insertion_point(field_list:io.deephaven.proto.backplane.grpc.InCondition.candidates)
-  return _internal_candidates();
-}
-inline const ::google::protobuf::RepeatedPtrField<::io::deephaven::proto::backplane::grpc::Value>&
-InCondition::_internal_candidates() const {
-  PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race);
-  return _impl_.candidates_;
-}
-inline ::google::protobuf::RepeatedPtrField<::io::deephaven::proto::backplane::grpc::Value>*
-InCondition::_internal_mutable_candidates() {
-  PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race);
-  return &_impl_.candidates_;
-}
-
-// .io.deephaven.proto.backplane.grpc.CaseSensitivity case_sensitivity = 3;
-inline void InCondition::clear_case_sensitivity() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  _impl_.case_sensitivity_ = 0;
-}
-inline ::io::deephaven::proto::backplane::grpc::CaseSensitivity InCondition::case_sensitivity() const {
-  // @@protoc_insertion_point(field_get:io.deephaven.proto.backplane.grpc.InCondition.case_sensitivity)
-  return _internal_case_sensitivity();
-}
-inline void InCondition::set_case_sensitivity(::io::deephaven::proto::backplane::grpc::CaseSensitivity value) {
-  _internal_set_case_sensitivity(value);
-  // @@protoc_insertion_point(field_set:io.deephaven.proto.backplane.grpc.InCondition.case_sensitivity)
-}
-inline ::io::deephaven::proto::backplane::grpc::CaseSensitivity InCondition::_internal_case_sensitivity() const {
-  PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race);
-  return static_cast<::io::deephaven::proto::backplane::grpc::CaseSensitivity>(_impl_.case_sensitivity_);
-}
-inline void InCondition::_internal_set_case_sensitivity(::io::deephaven::proto::backplane::grpc::CaseSensitivity value) {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  ;
-  _impl_.case_sensitivity_ = value;
-}
-
-// .io.deephaven.proto.backplane.grpc.MatchType match_type = 4;
-inline void InCondition::clear_match_type() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  _impl_.match_type_ = 0;
-}
-inline ::io::deephaven::proto::backplane::grpc::MatchType InCondition::match_type() const {
-  // @@protoc_insertion_point(field_get:io.deephaven.proto.backplane.grpc.InCondition.match_type)
-  return _internal_match_type();
-}
-inline void InCondition::set_match_type(::io::deephaven::proto::backplane::grpc::MatchType value) {
-  _internal_set_match_type(value);
-  // @@protoc_insertion_point(field_set:io.deephaven.proto.backplane.grpc.InCondition.match_type)
-}
-inline ::io::deephaven::proto::backplane::grpc::MatchType InCondition::_internal_match_type() const {
-  PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race);
-  return static_cast<::io::deephaven::proto::backplane::grpc::MatchType>(_impl_.match_type_);
-}
-inline void InCondition::_internal_set_match_type(::io::deephaven::proto::backplane::grpc::MatchType value) {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  ;
-  _impl_.match_type_ = value;
-}
-
-// -------------------------------------------------------------------
-
-// InvokeCondition
-
-// string method = 1;
-inline void InvokeCondition::clear_method() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  _impl_.method_.ClearToEmpty();
-}
-inline const std::string& InvokeCondition::method() const
-    ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  // @@protoc_insertion_point(field_get:io.deephaven.proto.backplane.grpc.InvokeCondition.method)
-  return _internal_method();
-}
-template <typename Arg_, typename... Args_>
-inline PROTOBUF_ALWAYS_INLINE void InvokeCondition::set_method(Arg_&& arg,
-                                                     Args_... args) {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  ;
-  _impl_.method_.Set(static_cast<Arg_&&>(arg), args..., GetArena());
-  // @@protoc_insertion_point(field_set:io.deephaven.proto.backplane.grpc.InvokeCondition.method)
-}
-inline std::string* InvokeCondition::mutable_method() ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  std::string* _s = _internal_mutable_method();
-  // @@protoc_insertion_point(field_mutable:io.deephaven.proto.backplane.grpc.InvokeCondition.method)
-  return _s;
-}
-inline const std::string& InvokeCondition::_internal_method() const {
-  PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race);
-  return _impl_.method_.Get();
-}
-inline void InvokeCondition::_internal_set_method(const std::string& value) {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  ;
-  _impl_.method_.Set(value, GetArena());
-}
-inline std::string* InvokeCondition::_internal_mutable_method() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  ;
-  return _impl_.method_.Mutable( GetArena());
-}
-inline std::string* InvokeCondition::release_method() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  // @@protoc_insertion_point(field_release:io.deephaven.proto.backplane.grpc.InvokeCondition.method)
-  return _impl_.method_.Release();
-}
-inline void InvokeCondition::set_allocated_method(std::string* value) {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  _impl_.method_.SetAllocated(value, GetArena());
-  #ifdef PROTOBUF_FORCE_COPY_DEFAULT_STRING
-        if (_impl_.method_.IsDefault()) {
-          _impl_.method_.Set("", GetArena());
-        }
-  #endif  // PROTOBUF_FORCE_COPY_DEFAULT_STRING
-  // @@protoc_insertion_point(field_set_allocated:io.deephaven.proto.backplane.grpc.InvokeCondition.method)
-}
-
-// .io.deephaven.proto.backplane.grpc.Value target = 2;
-inline bool InvokeCondition::has_target() const {
-  bool value = (_impl_._has_bits_[0] & 0x00000001u) != 0;
-  PROTOBUF_ASSUME(!value || _impl_.target_ != nullptr);
-  return value;
-}
-inline void InvokeCondition::clear_target() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  if (_impl_.target_ != nullptr) _impl_.target_->Clear();
-  _impl_._has_bits_[0] &= ~0x00000001u;
-}
-inline const ::io::deephaven::proto::backplane::grpc::Value& InvokeCondition::_internal_target() const {
-  PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race);
-  const ::io::deephaven::proto::backplane::grpc::Value* p = _impl_.target_;
-  return p != nullptr ? *p : reinterpret_cast<const ::io::deephaven::proto::backplane::grpc::Value&>(::io::deephaven::proto::backplane::grpc::_Value_default_instance_);
-}
-inline const ::io::deephaven::proto::backplane::grpc::Value& InvokeCondition::target() const ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  // @@protoc_insertion_point(field_get:io.deephaven.proto.backplane.grpc.InvokeCondition.target)
-  return _internal_target();
-}
-inline void InvokeCondition::unsafe_arena_set_allocated_target(::io::deephaven::proto::backplane::grpc::Value* value) {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  if (GetArena() == nullptr) {
-    delete reinterpret_cast<::google::protobuf::MessageLite*>(_impl_.target_);
-  }
-  _impl_.target_ = reinterpret_cast<::io::deephaven::proto::backplane::grpc::Value*>(value);
-  if (value != nullptr) {
-    _impl_._has_bits_[0] |= 0x00000001u;
-  } else {
-    _impl_._has_bits_[0] &= ~0x00000001u;
-  }
-  // @@protoc_insertion_point(field_unsafe_arena_set_allocated:io.deephaven.proto.backplane.grpc.InvokeCondition.target)
-}
-inline ::io::deephaven::proto::backplane::grpc::Value* InvokeCondition::release_target() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-
-  _impl_._has_bits_[0] &= ~0x00000001u;
-  ::io::deephaven::proto::backplane::grpc::Value* released = _impl_.target_;
-  _impl_.target_ = nullptr;
-#ifdef PROTOBUF_FORCE_COPY_IN_RELEASE
-  auto* old = reinterpret_cast<::google::protobuf::MessageLite*>(released);
-  released = ::google::protobuf::internal::DuplicateIfNonNull(released);
-  if (GetArena() == nullptr) {
-    delete old;
-  }
-#else   // PROTOBUF_FORCE_COPY_IN_RELEASE
-  if (GetArena() != nullptr) {
-    released = ::google::protobuf::internal::DuplicateIfNonNull(released);
-  }
-#endif  // !PROTOBUF_FORCE_COPY_IN_RELEASE
-  return released;
-}
-inline ::io::deephaven::proto::backplane::grpc::Value* InvokeCondition::unsafe_arena_release_target() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  // @@protoc_insertion_point(field_release:io.deephaven.proto.backplane.grpc.InvokeCondition.target)
-
-  _impl_._has_bits_[0] &= ~0x00000001u;
-  ::io::deephaven::proto::backplane::grpc::Value* temp = _impl_.target_;
-  _impl_.target_ = nullptr;
-  return temp;
-}
-inline ::io::deephaven::proto::backplane::grpc::Value* InvokeCondition::_internal_mutable_target() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  _impl_._has_bits_[0] |= 0x00000001u;
-  if (_impl_.target_ == nullptr) {
-    auto* p = CreateMaybeMessage<::io::deephaven::proto::backplane::grpc::Value>(GetArena());
-    _impl_.target_ = reinterpret_cast<::io::deephaven::proto::backplane::grpc::Value*>(p);
-  }
-  return _impl_.target_;
-}
-inline ::io::deephaven::proto::backplane::grpc::Value* InvokeCondition::mutable_target() ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  ::io::deephaven::proto::backplane::grpc::Value* _msg = _internal_mutable_target();
-  // @@protoc_insertion_point(field_mutable:io.deephaven.proto.backplane.grpc.InvokeCondition.target)
-  return _msg;
-}
-inline void InvokeCondition::set_allocated_target(::io::deephaven::proto::backplane::grpc::Value* value) {
-  ::google::protobuf::Arena* message_arena = GetArena();
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  if (message_arena == nullptr) {
-    delete reinterpret_cast<::io::deephaven::proto::backplane::grpc::Value*>(_impl_.target_);
-  }
-
-  if (value != nullptr) {
-    ::google::protobuf::Arena* submessage_arena = reinterpret_cast<::io::deephaven::proto::backplane::grpc::Value*>(value)->GetArena();
-    if (message_arena != submessage_arena) {
-      value = ::google::protobuf::internal::GetOwnedMessage(message_arena, value, submessage_arena);
-    }
-    _impl_._has_bits_[0] |= 0x00000001u;
-  } else {
-    _impl_._has_bits_[0] &= ~0x00000001u;
-  }
-
-  _impl_.target_ = reinterpret_cast<::io::deephaven::proto::backplane::grpc::Value*>(value);
-  // @@protoc_insertion_point(field_set_allocated:io.deephaven.proto.backplane.grpc.InvokeCondition.target)
-}
-
-// repeated .io.deephaven.proto.backplane.grpc.Value arguments = 3;
-inline int InvokeCondition::_internal_arguments_size() const {
-  return _internal_arguments().size();
-}
-inline int InvokeCondition::arguments_size() const {
-  return _internal_arguments_size();
-}
-inline void InvokeCondition::clear_arguments() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  _impl_.arguments_.Clear();
-}
-inline ::io::deephaven::proto::backplane::grpc::Value* InvokeCondition::mutable_arguments(int index)
-    ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  // @@protoc_insertion_point(field_mutable:io.deephaven.proto.backplane.grpc.InvokeCondition.arguments)
-  return _internal_mutable_arguments()->Mutable(index);
-}
-inline ::google::protobuf::RepeatedPtrField<::io::deephaven::proto::backplane::grpc::Value>* InvokeCondition::mutable_arguments()
-    ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  // @@protoc_insertion_point(field_mutable_list:io.deephaven.proto.backplane.grpc.InvokeCondition.arguments)
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  return _internal_mutable_arguments();
-}
-inline const ::io::deephaven::proto::backplane::grpc::Value& InvokeCondition::arguments(int index) const
-    ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  // @@protoc_insertion_point(field_get:io.deephaven.proto.backplane.grpc.InvokeCondition.arguments)
-  return _internal_arguments().Get(index);
-}
-inline ::io::deephaven::proto::backplane::grpc::Value* InvokeCondition::add_arguments() ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  ::io::deephaven::proto::backplane::grpc::Value* _add = _internal_mutable_arguments()->Add();
-  // @@protoc_insertion_point(field_add:io.deephaven.proto.backplane.grpc.InvokeCondition.arguments)
-  return _add;
-}
-inline const ::google::protobuf::RepeatedPtrField<::io::deephaven::proto::backplane::grpc::Value>& InvokeCondition::arguments() const
-    ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  // @@protoc_insertion_point(field_list:io.deephaven.proto.backplane.grpc.InvokeCondition.arguments)
-  return _internal_arguments();
-}
-inline const ::google::protobuf::RepeatedPtrField<::io::deephaven::proto::backplane::grpc::Value>&
-InvokeCondition::_internal_arguments() const {
-  PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race);
-  return _impl_.arguments_;
-}
-inline ::google::protobuf::RepeatedPtrField<::io::deephaven::proto::backplane::grpc::Value>*
-InvokeCondition::_internal_mutable_arguments() {
-  PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race);
-  return &_impl_.arguments_;
-}
-
-// -------------------------------------------------------------------
-
-// IsNullCondition
-
-// .io.deephaven.proto.backplane.grpc.Reference reference = 1;
-inline bool IsNullCondition::has_reference() const {
-  bool value = (_impl_._has_bits_[0] & 0x00000001u) != 0;
-  PROTOBUF_ASSUME(!value || _impl_.reference_ != nullptr);
-  return value;
-}
-inline void IsNullCondition::clear_reference() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  if (_impl_.reference_ != nullptr) _impl_.reference_->Clear();
-  _impl_._has_bits_[0] &= ~0x00000001u;
-}
-inline const ::io::deephaven::proto::backplane::grpc::Reference& IsNullCondition::_internal_reference() const {
-  PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race);
-  const ::io::deephaven::proto::backplane::grpc::Reference* p = _impl_.reference_;
-  return p != nullptr ? *p : reinterpret_cast<const ::io::deephaven::proto::backplane::grpc::Reference&>(::io::deephaven::proto::backplane::grpc::_Reference_default_instance_);
-}
-inline const ::io::deephaven::proto::backplane::grpc::Reference& IsNullCondition::reference() const ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  // @@protoc_insertion_point(field_get:io.deephaven.proto.backplane.grpc.IsNullCondition.reference)
-  return _internal_reference();
-}
-inline void IsNullCondition::unsafe_arena_set_allocated_reference(::io::deephaven::proto::backplane::grpc::Reference* value) {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  if (GetArena() == nullptr) {
-    delete reinterpret_cast<::google::protobuf::MessageLite*>(_impl_.reference_);
-  }
-  _impl_.reference_ = reinterpret_cast<::io::deephaven::proto::backplane::grpc::Reference*>(value);
-  if (value != nullptr) {
-    _impl_._has_bits_[0] |= 0x00000001u;
-  } else {
-    _impl_._has_bits_[0] &= ~0x00000001u;
-  }
-  // @@protoc_insertion_point(field_unsafe_arena_set_allocated:io.deephaven.proto.backplane.grpc.IsNullCondition.reference)
-}
-inline ::io::deephaven::proto::backplane::grpc::Reference* IsNullCondition::release_reference() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-
-  _impl_._has_bits_[0] &= ~0x00000001u;
-  ::io::deephaven::proto::backplane::grpc::Reference* released = _impl_.reference_;
-  _impl_.reference_ = nullptr;
-#ifdef PROTOBUF_FORCE_COPY_IN_RELEASE
-  auto* old = reinterpret_cast<::google::protobuf::MessageLite*>(released);
-  released = ::google::protobuf::internal::DuplicateIfNonNull(released);
-  if (GetArena() == nullptr) {
-    delete old;
-  }
-#else   // PROTOBUF_FORCE_COPY_IN_RELEASE
-  if (GetArena() != nullptr) {
-    released = ::google::protobuf::internal::DuplicateIfNonNull(released);
-  }
-#endif  // !PROTOBUF_FORCE_COPY_IN_RELEASE
-  return released;
-}
-inline ::io::deephaven::proto::backplane::grpc::Reference* IsNullCondition::unsafe_arena_release_reference() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  // @@protoc_insertion_point(field_release:io.deephaven.proto.backplane.grpc.IsNullCondition.reference)
-
-  _impl_._has_bits_[0] &= ~0x00000001u;
-  ::io::deephaven::proto::backplane::grpc::Reference* temp = _impl_.reference_;
-  _impl_.reference_ = nullptr;
-  return temp;
-}
-inline ::io::deephaven::proto::backplane::grpc::Reference* IsNullCondition::_internal_mutable_reference() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  _impl_._has_bits_[0] |= 0x00000001u;
-  if (_impl_.reference_ == nullptr) {
-    auto* p = CreateMaybeMessage<::io::deephaven::proto::backplane::grpc::Reference>(GetArena());
-    _impl_.reference_ = reinterpret_cast<::io::deephaven::proto::backplane::grpc::Reference*>(p);
-  }
-  return _impl_.reference_;
-}
-inline ::io::deephaven::proto::backplane::grpc::Reference* IsNullCondition::mutable_reference() ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  ::io::deephaven::proto::backplane::grpc::Reference* _msg = _internal_mutable_reference();
-  // @@protoc_insertion_point(field_mutable:io.deephaven.proto.backplane.grpc.IsNullCondition.reference)
-  return _msg;
-}
-inline void IsNullCondition::set_allocated_reference(::io::deephaven::proto::backplane::grpc::Reference* value) {
-  ::google::protobuf::Arena* message_arena = GetArena();
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  if (message_arena == nullptr) {
-    delete reinterpret_cast<::io::deephaven::proto::backplane::grpc::Reference*>(_impl_.reference_);
-  }
-
-  if (value != nullptr) {
-    ::google::protobuf::Arena* submessage_arena = reinterpret_cast<::io::deephaven::proto::backplane::grpc::Reference*>(value)->GetArena();
-    if (message_arena != submessage_arena) {
-      value = ::google::protobuf::internal::GetOwnedMessage(message_arena, value, submessage_arena);
-    }
-    _impl_._has_bits_[0] |= 0x00000001u;
-  } else {
-    _impl_._has_bits_[0] &= ~0x00000001u;
-  }
-
-  _impl_.reference_ = reinterpret_cast<::io::deephaven::proto::backplane::grpc::Reference*>(value);
-  // @@protoc_insertion_point(field_set_allocated:io.deephaven.proto.backplane.grpc.IsNullCondition.reference)
-}
-
-// -------------------------------------------------------------------
-
-// MatchesCondition
-
-// .io.deephaven.proto.backplane.grpc.Reference reference = 1;
-inline bool MatchesCondition::has_reference() const {
-  bool value = (_impl_._has_bits_[0] & 0x00000001u) != 0;
-  PROTOBUF_ASSUME(!value || _impl_.reference_ != nullptr);
-  return value;
-}
-inline void MatchesCondition::clear_reference() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  if (_impl_.reference_ != nullptr) _impl_.reference_->Clear();
-  _impl_._has_bits_[0] &= ~0x00000001u;
-}
-inline const ::io::deephaven::proto::backplane::grpc::Reference& MatchesCondition::_internal_reference() const {
-  PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race);
-  const ::io::deephaven::proto::backplane::grpc::Reference* p = _impl_.reference_;
-  return p != nullptr ? *p : reinterpret_cast<const ::io::deephaven::proto::backplane::grpc::Reference&>(::io::deephaven::proto::backplane::grpc::_Reference_default_instance_);
-}
-inline const ::io::deephaven::proto::backplane::grpc::Reference& MatchesCondition::reference() const ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  // @@protoc_insertion_point(field_get:io.deephaven.proto.backplane.grpc.MatchesCondition.reference)
-  return _internal_reference();
-}
-inline void MatchesCondition::unsafe_arena_set_allocated_reference(::io::deephaven::proto::backplane::grpc::Reference* value) {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  if (GetArena() == nullptr) {
-    delete reinterpret_cast<::google::protobuf::MessageLite*>(_impl_.reference_);
-  }
-  _impl_.reference_ = reinterpret_cast<::io::deephaven::proto::backplane::grpc::Reference*>(value);
-  if (value != nullptr) {
-    _impl_._has_bits_[0] |= 0x00000001u;
-  } else {
-    _impl_._has_bits_[0] &= ~0x00000001u;
-  }
-  // @@protoc_insertion_point(field_unsafe_arena_set_allocated:io.deephaven.proto.backplane.grpc.MatchesCondition.reference)
-}
-inline ::io::deephaven::proto::backplane::grpc::Reference* MatchesCondition::release_reference() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-
-  _impl_._has_bits_[0] &= ~0x00000001u;
-  ::io::deephaven::proto::backplane::grpc::Reference* released = _impl_.reference_;
-  _impl_.reference_ = nullptr;
-#ifdef PROTOBUF_FORCE_COPY_IN_RELEASE
-  auto* old = reinterpret_cast<::google::protobuf::MessageLite*>(released);
-  released = ::google::protobuf::internal::DuplicateIfNonNull(released);
-  if (GetArena() == nullptr) {
-    delete old;
-  }
-#else   // PROTOBUF_FORCE_COPY_IN_RELEASE
-  if (GetArena() != nullptr) {
-    released = ::google::protobuf::internal::DuplicateIfNonNull(released);
-  }
-#endif  // !PROTOBUF_FORCE_COPY_IN_RELEASE
-  return released;
-}
-inline ::io::deephaven::proto::backplane::grpc::Reference* MatchesCondition::unsafe_arena_release_reference() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  // @@protoc_insertion_point(field_release:io.deephaven.proto.backplane.grpc.MatchesCondition.reference)
-
-  _impl_._has_bits_[0] &= ~0x00000001u;
-  ::io::deephaven::proto::backplane::grpc::Reference* temp = _impl_.reference_;
-  _impl_.reference_ = nullptr;
-  return temp;
-}
-inline ::io::deephaven::proto::backplane::grpc::Reference* MatchesCondition::_internal_mutable_reference() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  _impl_._has_bits_[0] |= 0x00000001u;
-  if (_impl_.reference_ == nullptr) {
-    auto* p = CreateMaybeMessage<::io::deephaven::proto::backplane::grpc::Reference>(GetArena());
-    _impl_.reference_ = reinterpret_cast<::io::deephaven::proto::backplane::grpc::Reference*>(p);
-  }
-  return _impl_.reference_;
-}
-inline ::io::deephaven::proto::backplane::grpc::Reference* MatchesCondition::mutable_reference() ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  ::io::deephaven::proto::backplane::grpc::Reference* _msg = _internal_mutable_reference();
-  // @@protoc_insertion_point(field_mutable:io.deephaven.proto.backplane.grpc.MatchesCondition.reference)
-  return _msg;
-}
-inline void MatchesCondition::set_allocated_reference(::io::deephaven::proto::backplane::grpc::Reference* value) {
-  ::google::protobuf::Arena* message_arena = GetArena();
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  if (message_arena == nullptr) {
-    delete reinterpret_cast<::io::deephaven::proto::backplane::grpc::Reference*>(_impl_.reference_);
-  }
-
-  if (value != nullptr) {
-    ::google::protobuf::Arena* submessage_arena = reinterpret_cast<::io::deephaven::proto::backplane::grpc::Reference*>(value)->GetArena();
-    if (message_arena != submessage_arena) {
-      value = ::google::protobuf::internal::GetOwnedMessage(message_arena, value, submessage_arena);
-    }
-    _impl_._has_bits_[0] |= 0x00000001u;
-  } else {
-    _impl_._has_bits_[0] &= ~0x00000001u;
-  }
-
-  _impl_.reference_ = reinterpret_cast<::io::deephaven::proto::backplane::grpc::Reference*>(value);
-  // @@protoc_insertion_point(field_set_allocated:io.deephaven.proto.backplane.grpc.MatchesCondition.reference)
-}
-
-// string regex = 2;
-inline void MatchesCondition::clear_regex() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  _impl_.regex_.ClearToEmpty();
-}
-inline const std::string& MatchesCondition::regex() const
-    ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  // @@protoc_insertion_point(field_get:io.deephaven.proto.backplane.grpc.MatchesCondition.regex)
-  return _internal_regex();
-}
-template <typename Arg_, typename... Args_>
-inline PROTOBUF_ALWAYS_INLINE void MatchesCondition::set_regex(Arg_&& arg,
-                                                     Args_... args) {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  ;
-  _impl_.regex_.Set(static_cast<Arg_&&>(arg), args..., GetArena());
-  // @@protoc_insertion_point(field_set:io.deephaven.proto.backplane.grpc.MatchesCondition.regex)
-}
-inline std::string* MatchesCondition::mutable_regex() ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  std::string* _s = _internal_mutable_regex();
-  // @@protoc_insertion_point(field_mutable:io.deephaven.proto.backplane.grpc.MatchesCondition.regex)
-  return _s;
-}
-inline const std::string& MatchesCondition::_internal_regex() const {
-  PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race);
-  return _impl_.regex_.Get();
-}
-inline void MatchesCondition::_internal_set_regex(const std::string& value) {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  ;
-  _impl_.regex_.Set(value, GetArena());
-}
-inline std::string* MatchesCondition::_internal_mutable_regex() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  ;
-  return _impl_.regex_.Mutable( GetArena());
-}
-inline std::string* MatchesCondition::release_regex() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  // @@protoc_insertion_point(field_release:io.deephaven.proto.backplane.grpc.MatchesCondition.regex)
-  return _impl_.regex_.Release();
-}
-inline void MatchesCondition::set_allocated_regex(std::string* value) {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  _impl_.regex_.SetAllocated(value, GetArena());
-  #ifdef PROTOBUF_FORCE_COPY_DEFAULT_STRING
-        if (_impl_.regex_.IsDefault()) {
-          _impl_.regex_.Set("", GetArena());
-        }
-  #endif  // PROTOBUF_FORCE_COPY_DEFAULT_STRING
-  // @@protoc_insertion_point(field_set_allocated:io.deephaven.proto.backplane.grpc.MatchesCondition.regex)
-}
-
-// .io.deephaven.proto.backplane.grpc.CaseSensitivity case_sensitivity = 3;
-inline void MatchesCondition::clear_case_sensitivity() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  _impl_.case_sensitivity_ = 0;
-}
-inline ::io::deephaven::proto::backplane::grpc::CaseSensitivity MatchesCondition::case_sensitivity() const {
-  // @@protoc_insertion_point(field_get:io.deephaven.proto.backplane.grpc.MatchesCondition.case_sensitivity)
-  return _internal_case_sensitivity();
-}
-inline void MatchesCondition::set_case_sensitivity(::io::deephaven::proto::backplane::grpc::CaseSensitivity value) {
-  _internal_set_case_sensitivity(value);
-  // @@protoc_insertion_point(field_set:io.deephaven.proto.backplane.grpc.MatchesCondition.case_sensitivity)
-}
-inline ::io::deephaven::proto::backplane::grpc::CaseSensitivity MatchesCondition::_internal_case_sensitivity() const {
-  PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race);
-  return static_cast<::io::deephaven::proto::backplane::grpc::CaseSensitivity>(_impl_.case_sensitivity_);
-}
-inline void MatchesCondition::_internal_set_case_sensitivity(::io::deephaven::proto::backplane::grpc::CaseSensitivity value) {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  ;
-  _impl_.case_sensitivity_ = value;
-}
-
-// .io.deephaven.proto.backplane.grpc.MatchType match_type = 4;
-inline void MatchesCondition::clear_match_type() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  _impl_.match_type_ = 0;
-}
-inline ::io::deephaven::proto::backplane::grpc::MatchType MatchesCondition::match_type() const {
-  // @@protoc_insertion_point(field_get:io.deephaven.proto.backplane.grpc.MatchesCondition.match_type)
-  return _internal_match_type();
-}
-inline void MatchesCondition::set_match_type(::io::deephaven::proto::backplane::grpc::MatchType value) {
-  _internal_set_match_type(value);
-  // @@protoc_insertion_point(field_set:io.deephaven.proto.backplane.grpc.MatchesCondition.match_type)
-}
-inline ::io::deephaven::proto::backplane::grpc::MatchType MatchesCondition::_internal_match_type() const {
-  PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race);
-  return static_cast<::io::deephaven::proto::backplane::grpc::MatchType>(_impl_.match_type_);
-}
-inline void MatchesCondition::_internal_set_match_type(::io::deephaven::proto::backplane::grpc::MatchType value) {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  ;
-  _impl_.match_type_ = value;
-}
-
-// -------------------------------------------------------------------
-
-// ContainsCondition
-
-// .io.deephaven.proto.backplane.grpc.Reference reference = 1;
-inline bool ContainsCondition::has_reference() const {
-  bool value = (_impl_._has_bits_[0] & 0x00000001u) != 0;
-  PROTOBUF_ASSUME(!value || _impl_.reference_ != nullptr);
-  return value;
-}
-inline void ContainsCondition::clear_reference() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  if (_impl_.reference_ != nullptr) _impl_.reference_->Clear();
-  _impl_._has_bits_[0] &= ~0x00000001u;
-}
-inline const ::io::deephaven::proto::backplane::grpc::Reference& ContainsCondition::_internal_reference() const {
-  PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race);
-  const ::io::deephaven::proto::backplane::grpc::Reference* p = _impl_.reference_;
-  return p != nullptr ? *p : reinterpret_cast<const ::io::deephaven::proto::backplane::grpc::Reference&>(::io::deephaven::proto::backplane::grpc::_Reference_default_instance_);
-}
-inline const ::io::deephaven::proto::backplane::grpc::Reference& ContainsCondition::reference() const ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  // @@protoc_insertion_point(field_get:io.deephaven.proto.backplane.grpc.ContainsCondition.reference)
-  return _internal_reference();
-}
-inline void ContainsCondition::unsafe_arena_set_allocated_reference(::io::deephaven::proto::backplane::grpc::Reference* value) {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  if (GetArena() == nullptr) {
-    delete reinterpret_cast<::google::protobuf::MessageLite*>(_impl_.reference_);
-  }
-  _impl_.reference_ = reinterpret_cast<::io::deephaven::proto::backplane::grpc::Reference*>(value);
-  if (value != nullptr) {
-    _impl_._has_bits_[0] |= 0x00000001u;
-  } else {
-    _impl_._has_bits_[0] &= ~0x00000001u;
-  }
-  // @@protoc_insertion_point(field_unsafe_arena_set_allocated:io.deephaven.proto.backplane.grpc.ContainsCondition.reference)
-}
-inline ::io::deephaven::proto::backplane::grpc::Reference* ContainsCondition::release_reference() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-
-  _impl_._has_bits_[0] &= ~0x00000001u;
-  ::io::deephaven::proto::backplane::grpc::Reference* released = _impl_.reference_;
-  _impl_.reference_ = nullptr;
-#ifdef PROTOBUF_FORCE_COPY_IN_RELEASE
-  auto* old = reinterpret_cast<::google::protobuf::MessageLite*>(released);
-  released = ::google::protobuf::internal::DuplicateIfNonNull(released);
-  if (GetArena() == nullptr) {
-    delete old;
-  }
-#else   // PROTOBUF_FORCE_COPY_IN_RELEASE
-  if (GetArena() != nullptr) {
-    released = ::google::protobuf::internal::DuplicateIfNonNull(released);
-  }
-#endif  // !PROTOBUF_FORCE_COPY_IN_RELEASE
-  return released;
-}
-inline ::io::deephaven::proto::backplane::grpc::Reference* ContainsCondition::unsafe_arena_release_reference() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  // @@protoc_insertion_point(field_release:io.deephaven.proto.backplane.grpc.ContainsCondition.reference)
-
-  _impl_._has_bits_[0] &= ~0x00000001u;
-  ::io::deephaven::proto::backplane::grpc::Reference* temp = _impl_.reference_;
-  _impl_.reference_ = nullptr;
-  return temp;
-}
-inline ::io::deephaven::proto::backplane::grpc::Reference* ContainsCondition::_internal_mutable_reference() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  _impl_._has_bits_[0] |= 0x00000001u;
-  if (_impl_.reference_ == nullptr) {
-    auto* p = CreateMaybeMessage<::io::deephaven::proto::backplane::grpc::Reference>(GetArena());
-    _impl_.reference_ = reinterpret_cast<::io::deephaven::proto::backplane::grpc::Reference*>(p);
-  }
-  return _impl_.reference_;
-}
-inline ::io::deephaven::proto::backplane::grpc::Reference* ContainsCondition::mutable_reference() ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  ::io::deephaven::proto::backplane::grpc::Reference* _msg = _internal_mutable_reference();
-  // @@protoc_insertion_point(field_mutable:io.deephaven.proto.backplane.grpc.ContainsCondition.reference)
-  return _msg;
-}
-inline void ContainsCondition::set_allocated_reference(::io::deephaven::proto::backplane::grpc::Reference* value) {
-  ::google::protobuf::Arena* message_arena = GetArena();
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  if (message_arena == nullptr) {
-    delete reinterpret_cast<::io::deephaven::proto::backplane::grpc::Reference*>(_impl_.reference_);
-  }
-
-  if (value != nullptr) {
-    ::google::protobuf::Arena* submessage_arena = reinterpret_cast<::io::deephaven::proto::backplane::grpc::Reference*>(value)->GetArena();
-    if (message_arena != submessage_arena) {
-      value = ::google::protobuf::internal::GetOwnedMessage(message_arena, value, submessage_arena);
-    }
-    _impl_._has_bits_[0] |= 0x00000001u;
-  } else {
-    _impl_._has_bits_[0] &= ~0x00000001u;
-  }
-
-  _impl_.reference_ = reinterpret_cast<::io::deephaven::proto::backplane::grpc::Reference*>(value);
-  // @@protoc_insertion_point(field_set_allocated:io.deephaven.proto.backplane.grpc.ContainsCondition.reference)
-}
-
-// string search_string = 2;
-inline void ContainsCondition::clear_search_string() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  _impl_.search_string_.ClearToEmpty();
-}
-inline const std::string& ContainsCondition::search_string() const
-    ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  // @@protoc_insertion_point(field_get:io.deephaven.proto.backplane.grpc.ContainsCondition.search_string)
-  return _internal_search_string();
-}
-template <typename Arg_, typename... Args_>
-inline PROTOBUF_ALWAYS_INLINE void ContainsCondition::set_search_string(Arg_&& arg,
-                                                     Args_... args) {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  ;
-  _impl_.search_string_.Set(static_cast<Arg_&&>(arg), args..., GetArena());
-  // @@protoc_insertion_point(field_set:io.deephaven.proto.backplane.grpc.ContainsCondition.search_string)
-}
-inline std::string* ContainsCondition::mutable_search_string() ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  std::string* _s = _internal_mutable_search_string();
-  // @@protoc_insertion_point(field_mutable:io.deephaven.proto.backplane.grpc.ContainsCondition.search_string)
-  return _s;
-}
-inline const std::string& ContainsCondition::_internal_search_string() const {
-  PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race);
-  return _impl_.search_string_.Get();
-}
-inline void ContainsCondition::_internal_set_search_string(const std::string& value) {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  ;
-  _impl_.search_string_.Set(value, GetArena());
-}
-inline std::string* ContainsCondition::_internal_mutable_search_string() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  ;
-  return _impl_.search_string_.Mutable( GetArena());
-}
-inline std::string* ContainsCondition::release_search_string() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  // @@protoc_insertion_point(field_release:io.deephaven.proto.backplane.grpc.ContainsCondition.search_string)
-  return _impl_.search_string_.Release();
-}
-inline void ContainsCondition::set_allocated_search_string(std::string* value) {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  _impl_.search_string_.SetAllocated(value, GetArena());
-  #ifdef PROTOBUF_FORCE_COPY_DEFAULT_STRING
-        if (_impl_.search_string_.IsDefault()) {
-          _impl_.search_string_.Set("", GetArena());
-        }
-  #endif  // PROTOBUF_FORCE_COPY_DEFAULT_STRING
-  // @@protoc_insertion_point(field_set_allocated:io.deephaven.proto.backplane.grpc.ContainsCondition.search_string)
-}
-
-// .io.deephaven.proto.backplane.grpc.CaseSensitivity case_sensitivity = 3;
-inline void ContainsCondition::clear_case_sensitivity() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  _impl_.case_sensitivity_ = 0;
-}
-inline ::io::deephaven::proto::backplane::grpc::CaseSensitivity ContainsCondition::case_sensitivity() const {
-  // @@protoc_insertion_point(field_get:io.deephaven.proto.backplane.grpc.ContainsCondition.case_sensitivity)
-  return _internal_case_sensitivity();
-}
-inline void ContainsCondition::set_case_sensitivity(::io::deephaven::proto::backplane::grpc::CaseSensitivity value) {
-  _internal_set_case_sensitivity(value);
-  // @@protoc_insertion_point(field_set:io.deephaven.proto.backplane.grpc.ContainsCondition.case_sensitivity)
-}
-inline ::io::deephaven::proto::backplane::grpc::CaseSensitivity ContainsCondition::_internal_case_sensitivity() const {
-  PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race);
-  return static_cast<::io::deephaven::proto::backplane::grpc::CaseSensitivity>(_impl_.case_sensitivity_);
-}
-inline void ContainsCondition::_internal_set_case_sensitivity(::io::deephaven::proto::backplane::grpc::CaseSensitivity value) {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  ;
-  _impl_.case_sensitivity_ = value;
-}
-
-// .io.deephaven.proto.backplane.grpc.MatchType match_type = 4;
-inline void ContainsCondition::clear_match_type() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  _impl_.match_type_ = 0;
-}
-inline ::io::deephaven::proto::backplane::grpc::MatchType ContainsCondition::match_type() const {
-  // @@protoc_insertion_point(field_get:io.deephaven.proto.backplane.grpc.ContainsCondition.match_type)
-  return _internal_match_type();
-}
-inline void ContainsCondition::set_match_type(::io::deephaven::proto::backplane::grpc::MatchType value) {
-  _internal_set_match_type(value);
-  // @@protoc_insertion_point(field_set:io.deephaven.proto.backplane.grpc.ContainsCondition.match_type)
-}
-inline ::io::deephaven::proto::backplane::grpc::MatchType ContainsCondition::_internal_match_type() const {
-  PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race);
-  return static_cast<::io::deephaven::proto::backplane::grpc::MatchType>(_impl_.match_type_);
-}
-inline void ContainsCondition::_internal_set_match_type(::io::deephaven::proto::backplane::grpc::MatchType value) {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  ;
-  _impl_.match_type_ = value;
-}
-
-// -------------------------------------------------------------------
-
-// SearchCondition
-
-// string search_string = 1;
-inline void SearchCondition::clear_search_string() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  _impl_.search_string_.ClearToEmpty();
-}
-inline const std::string& SearchCondition::search_string() const
-    ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  // @@protoc_insertion_point(field_get:io.deephaven.proto.backplane.grpc.SearchCondition.search_string)
-  return _internal_search_string();
-}
-template <typename Arg_, typename... Args_>
-inline PROTOBUF_ALWAYS_INLINE void SearchCondition::set_search_string(Arg_&& arg,
-                                                     Args_... args) {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  ;
-  _impl_.search_string_.Set(static_cast<Arg_&&>(arg), args..., GetArena());
-  // @@protoc_insertion_point(field_set:io.deephaven.proto.backplane.grpc.SearchCondition.search_string)
-}
-inline std::string* SearchCondition::mutable_search_string() ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  std::string* _s = _internal_mutable_search_string();
-  // @@protoc_insertion_point(field_mutable:io.deephaven.proto.backplane.grpc.SearchCondition.search_string)
-  return _s;
-}
-inline const std::string& SearchCondition::_internal_search_string() const {
-  PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race);
-  return _impl_.search_string_.Get();
-}
-inline void SearchCondition::_internal_set_search_string(const std::string& value) {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  ;
-  _impl_.search_string_.Set(value, GetArena());
-}
-inline std::string* SearchCondition::_internal_mutable_search_string() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  ;
-  return _impl_.search_string_.Mutable( GetArena());
-}
-inline std::string* SearchCondition::release_search_string() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  // @@protoc_insertion_point(field_release:io.deephaven.proto.backplane.grpc.SearchCondition.search_string)
-  return _impl_.search_string_.Release();
-}
-inline void SearchCondition::set_allocated_search_string(std::string* value) {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  _impl_.search_string_.SetAllocated(value, GetArena());
-  #ifdef PROTOBUF_FORCE_COPY_DEFAULT_STRING
-        if (_impl_.search_string_.IsDefault()) {
-          _impl_.search_string_.Set("", GetArena());
-        }
-  #endif  // PROTOBUF_FORCE_COPY_DEFAULT_STRING
-  // @@protoc_insertion_point(field_set_allocated:io.deephaven.proto.backplane.grpc.SearchCondition.search_string)
-}
-
-// repeated .io.deephaven.proto.backplane.grpc.Reference optional_references = 2;
-inline int SearchCondition::_internal_optional_references_size() const {
-  return _internal_optional_references().size();
-}
-inline int SearchCondition::optional_references_size() const {
-  return _internal_optional_references_size();
-}
-inline void SearchCondition::clear_optional_references() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  _impl_.optional_references_.Clear();
-}
-inline ::io::deephaven::proto::backplane::grpc::Reference* SearchCondition::mutable_optional_references(int index)
-    ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  // @@protoc_insertion_point(field_mutable:io.deephaven.proto.backplane.grpc.SearchCondition.optional_references)
-  return _internal_mutable_optional_references()->Mutable(index);
-}
-inline ::google::protobuf::RepeatedPtrField<::io::deephaven::proto::backplane::grpc::Reference>* SearchCondition::mutable_optional_references()
-    ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  // @@protoc_insertion_point(field_mutable_list:io.deephaven.proto.backplane.grpc.SearchCondition.optional_references)
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  return _internal_mutable_optional_references();
-}
-inline const ::io::deephaven::proto::backplane::grpc::Reference& SearchCondition::optional_references(int index) const
-    ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  // @@protoc_insertion_point(field_get:io.deephaven.proto.backplane.grpc.SearchCondition.optional_references)
-  return _internal_optional_references().Get(index);
-}
-inline ::io::deephaven::proto::backplane::grpc::Reference* SearchCondition::add_optional_references() ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  ::io::deephaven::proto::backplane::grpc::Reference* _add = _internal_mutable_optional_references()->Add();
-  // @@protoc_insertion_point(field_add:io.deephaven.proto.backplane.grpc.SearchCondition.optional_references)
-  return _add;
-}
-inline const ::google::protobuf::RepeatedPtrField<::io::deephaven::proto::backplane::grpc::Reference>& SearchCondition::optional_references() const
-    ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  // @@protoc_insertion_point(field_list:io.deephaven.proto.backplane.grpc.SearchCondition.optional_references)
-  return _internal_optional_references();
-}
-inline const ::google::protobuf::RepeatedPtrField<::io::deephaven::proto::backplane::grpc::Reference>&
-SearchCondition::_internal_optional_references() const {
-  PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race);
-  return _impl_.optional_references_;
-}
-inline ::google::protobuf::RepeatedPtrField<::io::deephaven::proto::backplane::grpc::Reference>*
-SearchCondition::_internal_mutable_optional_references() {
-  PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race);
-  return &_impl_.optional_references_;
-}
-
-// -------------------------------------------------------------------
-
-// FlattenRequest
-
-// .io.deephaven.proto.backplane.grpc.Ticket result_id = 1;
-inline bool FlattenRequest::has_result_id() const {
-  bool value = (_impl_._has_bits_[0] & 0x00000001u) != 0;
-  PROTOBUF_ASSUME(!value || _impl_.result_id_ != nullptr);
-  return value;
-}
-inline const ::io::deephaven::proto::backplane::grpc::Ticket& FlattenRequest::_internal_result_id() const {
-  PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race);
-  const ::io::deephaven::proto::backplane::grpc::Ticket* p = _impl_.result_id_;
-  return p != nullptr ? *p : reinterpret_cast<const ::io::deephaven::proto::backplane::grpc::Ticket&>(::io::deephaven::proto::backplane::grpc::_Ticket_default_instance_);
-}
-inline const ::io::deephaven::proto::backplane::grpc::Ticket& FlattenRequest::result_id() const ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  // @@protoc_insertion_point(field_get:io.deephaven.proto.backplane.grpc.FlattenRequest.result_id)
-  return _internal_result_id();
-}
-inline void FlattenRequest::unsafe_arena_set_allocated_result_id(::io::deephaven::proto::backplane::grpc::Ticket* value) {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  if (GetArena() == nullptr) {
-    delete reinterpret_cast<::google::protobuf::MessageLite*>(_impl_.result_id_);
-  }
-  _impl_.result_id_ = reinterpret_cast<::io::deephaven::proto::backplane::grpc::Ticket*>(value);
-  if (value != nullptr) {
-    _impl_._has_bits_[0] |= 0x00000001u;
-  } else {
-    _impl_._has_bits_[0] &= ~0x00000001u;
-  }
-  // @@protoc_insertion_point(field_unsafe_arena_set_allocated:io.deephaven.proto.backplane.grpc.FlattenRequest.result_id)
-}
-inline ::io::deephaven::proto::backplane::grpc::Ticket* FlattenRequest::release_result_id() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-
-  _impl_._has_bits_[0] &= ~0x00000001u;
-  ::io::deephaven::proto::backplane::grpc::Ticket* released = _impl_.result_id_;
-  _impl_.result_id_ = nullptr;
-#ifdef PROTOBUF_FORCE_COPY_IN_RELEASE
-  auto* old = reinterpret_cast<::google::protobuf::MessageLite*>(released);
-  released = ::google::protobuf::internal::DuplicateIfNonNull(released);
-  if (GetArena() == nullptr) {
-    delete old;
-  }
-#else   // PROTOBUF_FORCE_COPY_IN_RELEASE
-  if (GetArena() != nullptr) {
-    released = ::google::protobuf::internal::DuplicateIfNonNull(released);
-  }
-#endif  // !PROTOBUF_FORCE_COPY_IN_RELEASE
-  return released;
-}
-inline ::io::deephaven::proto::backplane::grpc::Ticket* FlattenRequest::unsafe_arena_release_result_id() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  // @@protoc_insertion_point(field_release:io.deephaven.proto.backplane.grpc.FlattenRequest.result_id)
-
-  _impl_._has_bits_[0] &= ~0x00000001u;
-  ::io::deephaven::proto::backplane::grpc::Ticket* temp = _impl_.result_id_;
-  _impl_.result_id_ = nullptr;
-  return temp;
-}
-inline ::io::deephaven::proto::backplane::grpc::Ticket* FlattenRequest::_internal_mutable_result_id() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  _impl_._has_bits_[0] |= 0x00000001u;
-  if (_impl_.result_id_ == nullptr) {
-    auto* p = CreateMaybeMessage<::io::deephaven::proto::backplane::grpc::Ticket>(GetArena());
-    _impl_.result_id_ = reinterpret_cast<::io::deephaven::proto::backplane::grpc::Ticket*>(p);
-  }
-  return _impl_.result_id_;
-}
-inline ::io::deephaven::proto::backplane::grpc::Ticket* FlattenRequest::mutable_result_id() ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  ::io::deephaven::proto::backplane::grpc::Ticket* _msg = _internal_mutable_result_id();
-  // @@protoc_insertion_point(field_mutable:io.deephaven.proto.backplane.grpc.FlattenRequest.result_id)
-  return _msg;
-}
-inline void FlattenRequest::set_allocated_result_id(::io::deephaven::proto::backplane::grpc::Ticket* value) {
-  ::google::protobuf::Arena* message_arena = GetArena();
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  if (message_arena == nullptr) {
-    delete reinterpret_cast<::google::protobuf::MessageLite*>(_impl_.result_id_);
-  }
-
-  if (value != nullptr) {
-    ::google::protobuf::Arena* submessage_arena = reinterpret_cast<::google::protobuf::MessageLite*>(value)->GetArena();
-    if (message_arena != submessage_arena) {
-      value = ::google::protobuf::internal::GetOwnedMessage(message_arena, value, submessage_arena);
-    }
-    _impl_._has_bits_[0] |= 0x00000001u;
-  } else {
-    _impl_._has_bits_[0] &= ~0x00000001u;
-  }
-
-  _impl_.result_id_ = reinterpret_cast<::io::deephaven::proto::backplane::grpc::Ticket*>(value);
-  // @@protoc_insertion_point(field_set_allocated:io.deephaven.proto.backplane.grpc.FlattenRequest.result_id)
-}
-
-// .io.deephaven.proto.backplane.grpc.TableReference source_id = 2;
-inline bool FlattenRequest::has_source_id() const {
-  bool value = (_impl_._has_bits_[0] & 0x00000002u) != 0;
-  PROTOBUF_ASSUME(!value || _impl_.source_id_ != nullptr);
-  return value;
-}
-inline void FlattenRequest::clear_source_id() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  if (_impl_.source_id_ != nullptr) _impl_.source_id_->Clear();
-  _impl_._has_bits_[0] &= ~0x00000002u;
-}
-inline const ::io::deephaven::proto::backplane::grpc::TableReference& FlattenRequest::_internal_source_id() const {
-  PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race);
-  const ::io::deephaven::proto::backplane::grpc::TableReference* p = _impl_.source_id_;
-  return p != nullptr ? *p : reinterpret_cast<const ::io::deephaven::proto::backplane::grpc::TableReference&>(::io::deephaven::proto::backplane::grpc::_TableReference_default_instance_);
-}
-inline const ::io::deephaven::proto::backplane::grpc::TableReference& FlattenRequest::source_id() const ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  // @@protoc_insertion_point(field_get:io.deephaven.proto.backplane.grpc.FlattenRequest.source_id)
-  return _internal_source_id();
-}
-inline void FlattenRequest::unsafe_arena_set_allocated_source_id(::io::deephaven::proto::backplane::grpc::TableReference* value) {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  if (GetArena() == nullptr) {
-    delete reinterpret_cast<::google::protobuf::MessageLite*>(_impl_.source_id_);
-  }
-  _impl_.source_id_ = reinterpret_cast<::io::deephaven::proto::backplane::grpc::TableReference*>(value);
-  if (value != nullptr) {
-    _impl_._has_bits_[0] |= 0x00000002u;
-  } else {
-    _impl_._has_bits_[0] &= ~0x00000002u;
-  }
-  // @@protoc_insertion_point(field_unsafe_arena_set_allocated:io.deephaven.proto.backplane.grpc.FlattenRequest.source_id)
-}
-inline ::io::deephaven::proto::backplane::grpc::TableReference* FlattenRequest::release_source_id() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-
-  _impl_._has_bits_[0] &= ~0x00000002u;
-  ::io::deephaven::proto::backplane::grpc::TableReference* released = _impl_.source_id_;
-  _impl_.source_id_ = nullptr;
-#ifdef PROTOBUF_FORCE_COPY_IN_RELEASE
-  auto* old = reinterpret_cast<::google::protobuf::MessageLite*>(released);
-  released = ::google::protobuf::internal::DuplicateIfNonNull(released);
-  if (GetArena() == nullptr) {
-    delete old;
-  }
-#else   // PROTOBUF_FORCE_COPY_IN_RELEASE
-  if (GetArena() != nullptr) {
-    released = ::google::protobuf::internal::DuplicateIfNonNull(released);
-  }
-#endif  // !PROTOBUF_FORCE_COPY_IN_RELEASE
-  return released;
-}
-inline ::io::deephaven::proto::backplane::grpc::TableReference* FlattenRequest::unsafe_arena_release_source_id() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  // @@protoc_insertion_point(field_release:io.deephaven.proto.backplane.grpc.FlattenRequest.source_id)
-
-  _impl_._has_bits_[0] &= ~0x00000002u;
-  ::io::deephaven::proto::backplane::grpc::TableReference* temp = _impl_.source_id_;
-  _impl_.source_id_ = nullptr;
-  return temp;
-}
-inline ::io::deephaven::proto::backplane::grpc::TableReference* FlattenRequest::_internal_mutable_source_id() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  _impl_._has_bits_[0] |= 0x00000002u;
-  if (_impl_.source_id_ == nullptr) {
-    auto* p = CreateMaybeMessage<::io::deephaven::proto::backplane::grpc::TableReference>(GetArena());
-    _impl_.source_id_ = reinterpret_cast<::io::deephaven::proto::backplane::grpc::TableReference*>(p);
-  }
-  return _impl_.source_id_;
-}
-inline ::io::deephaven::proto::backplane::grpc::TableReference* FlattenRequest::mutable_source_id() ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  ::io::deephaven::proto::backplane::grpc::TableReference* _msg = _internal_mutable_source_id();
-  // @@protoc_insertion_point(field_mutable:io.deephaven.proto.backplane.grpc.FlattenRequest.source_id)
-  return _msg;
-}
-inline void FlattenRequest::set_allocated_source_id(::io::deephaven::proto::backplane::grpc::TableReference* value) {
-  ::google::protobuf::Arena* message_arena = GetArena();
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  if (message_arena == nullptr) {
-    delete reinterpret_cast<::io::deephaven::proto::backplane::grpc::TableReference*>(_impl_.source_id_);
-  }
-
-  if (value != nullptr) {
-    ::google::protobuf::Arena* submessage_arena = reinterpret_cast<::io::deephaven::proto::backplane::grpc::TableReference*>(value)->GetArena();
-    if (message_arena != submessage_arena) {
-      value = ::google::protobuf::internal::GetOwnedMessage(message_arena, value, submessage_arena);
-    }
-    _impl_._has_bits_[0] |= 0x00000002u;
-  } else {
-    _impl_._has_bits_[0] &= ~0x00000002u;
-  }
-
-  _impl_.source_id_ = reinterpret_cast<::io::deephaven::proto::backplane::grpc::TableReference*>(value);
-  // @@protoc_insertion_point(field_set_allocated:io.deephaven.proto.backplane.grpc.FlattenRequest.source_id)
-}
-
-// -------------------------------------------------------------------
-
-// MetaTableRequest
-
-// .io.deephaven.proto.backplane.grpc.Ticket result_id = 1;
-inline bool MetaTableRequest::has_result_id() const {
-  bool value = (_impl_._has_bits_[0] & 0x00000001u) != 0;
-  PROTOBUF_ASSUME(!value || _impl_.result_id_ != nullptr);
-  return value;
-}
-inline const ::io::deephaven::proto::backplane::grpc::Ticket& MetaTableRequest::_internal_result_id() const {
-  PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race);
-  const ::io::deephaven::proto::backplane::grpc::Ticket* p = _impl_.result_id_;
-  return p != nullptr ? *p : reinterpret_cast<const ::io::deephaven::proto::backplane::grpc::Ticket&>(::io::deephaven::proto::backplane::grpc::_Ticket_default_instance_);
-}
-inline const ::io::deephaven::proto::backplane::grpc::Ticket& MetaTableRequest::result_id() const ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  // @@protoc_insertion_point(field_get:io.deephaven.proto.backplane.grpc.MetaTableRequest.result_id)
-  return _internal_result_id();
-}
-inline void MetaTableRequest::unsafe_arena_set_allocated_result_id(::io::deephaven::proto::backplane::grpc::Ticket* value) {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  if (GetArena() == nullptr) {
-    delete reinterpret_cast<::google::protobuf::MessageLite*>(_impl_.result_id_);
-  }
-  _impl_.result_id_ = reinterpret_cast<::io::deephaven::proto::backplane::grpc::Ticket*>(value);
-  if (value != nullptr) {
-    _impl_._has_bits_[0] |= 0x00000001u;
-  } else {
-    _impl_._has_bits_[0] &= ~0x00000001u;
-  }
-  // @@protoc_insertion_point(field_unsafe_arena_set_allocated:io.deephaven.proto.backplane.grpc.MetaTableRequest.result_id)
-}
-inline ::io::deephaven::proto::backplane::grpc::Ticket* MetaTableRequest::release_result_id() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-
-  _impl_._has_bits_[0] &= ~0x00000001u;
-  ::io::deephaven::proto::backplane::grpc::Ticket* released = _impl_.result_id_;
-  _impl_.result_id_ = nullptr;
-#ifdef PROTOBUF_FORCE_COPY_IN_RELEASE
-  auto* old = reinterpret_cast<::google::protobuf::MessageLite*>(released);
-  released = ::google::protobuf::internal::DuplicateIfNonNull(released);
-  if (GetArena() == nullptr) {
-    delete old;
-  }
-#else   // PROTOBUF_FORCE_COPY_IN_RELEASE
-  if (GetArena() != nullptr) {
-    released = ::google::protobuf::internal::DuplicateIfNonNull(released);
-  }
-#endif  // !PROTOBUF_FORCE_COPY_IN_RELEASE
-  return released;
-}
-inline ::io::deephaven::proto::backplane::grpc::Ticket* MetaTableRequest::unsafe_arena_release_result_id() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  // @@protoc_insertion_point(field_release:io.deephaven.proto.backplane.grpc.MetaTableRequest.result_id)
-
-  _impl_._has_bits_[0] &= ~0x00000001u;
-  ::io::deephaven::proto::backplane::grpc::Ticket* temp = _impl_.result_id_;
-  _impl_.result_id_ = nullptr;
-  return temp;
-}
-inline ::io::deephaven::proto::backplane::grpc::Ticket* MetaTableRequest::_internal_mutable_result_id() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  _impl_._has_bits_[0] |= 0x00000001u;
-  if (_impl_.result_id_ == nullptr) {
-    auto* p = CreateMaybeMessage<::io::deephaven::proto::backplane::grpc::Ticket>(GetArena());
-    _impl_.result_id_ = reinterpret_cast<::io::deephaven::proto::backplane::grpc::Ticket*>(p);
-  }
-  return _impl_.result_id_;
-}
-inline ::io::deephaven::proto::backplane::grpc::Ticket* MetaTableRequest::mutable_result_id() ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  ::io::deephaven::proto::backplane::grpc::Ticket* _msg = _internal_mutable_result_id();
-  // @@protoc_insertion_point(field_mutable:io.deephaven.proto.backplane.grpc.MetaTableRequest.result_id)
-  return _msg;
-}
-inline void MetaTableRequest::set_allocated_result_id(::io::deephaven::proto::backplane::grpc::Ticket* value) {
-  ::google::protobuf::Arena* message_arena = GetArena();
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  if (message_arena == nullptr) {
-    delete reinterpret_cast<::google::protobuf::MessageLite*>(_impl_.result_id_);
-  }
-
-  if (value != nullptr) {
-    ::google::protobuf::Arena* submessage_arena = reinterpret_cast<::google::protobuf::MessageLite*>(value)->GetArena();
-    if (message_arena != submessage_arena) {
-      value = ::google::protobuf::internal::GetOwnedMessage(message_arena, value, submessage_arena);
-    }
-    _impl_._has_bits_[0] |= 0x00000001u;
-  } else {
-    _impl_._has_bits_[0] &= ~0x00000001u;
-  }
-
-  _impl_.result_id_ = reinterpret_cast<::io::deephaven::proto::backplane::grpc::Ticket*>(value);
-  // @@protoc_insertion_point(field_set_allocated:io.deephaven.proto.backplane.grpc.MetaTableRequest.result_id)
-}
-
-// .io.deephaven.proto.backplane.grpc.TableReference source_id = 2;
-inline bool MetaTableRequest::has_source_id() const {
-  bool value = (_impl_._has_bits_[0] & 0x00000002u) != 0;
-  PROTOBUF_ASSUME(!value || _impl_.source_id_ != nullptr);
-  return value;
-}
-inline void MetaTableRequest::clear_source_id() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  if (_impl_.source_id_ != nullptr) _impl_.source_id_->Clear();
-  _impl_._has_bits_[0] &= ~0x00000002u;
-}
-inline const ::io::deephaven::proto::backplane::grpc::TableReference& MetaTableRequest::_internal_source_id() const {
-  PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race);
-  const ::io::deephaven::proto::backplane::grpc::TableReference* p = _impl_.source_id_;
-  return p != nullptr ? *p : reinterpret_cast<const ::io::deephaven::proto::backplane::grpc::TableReference&>(::io::deephaven::proto::backplane::grpc::_TableReference_default_instance_);
-}
-inline const ::io::deephaven::proto::backplane::grpc::TableReference& MetaTableRequest::source_id() const ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  // @@protoc_insertion_point(field_get:io.deephaven.proto.backplane.grpc.MetaTableRequest.source_id)
-  return _internal_source_id();
-}
-inline void MetaTableRequest::unsafe_arena_set_allocated_source_id(::io::deephaven::proto::backplane::grpc::TableReference* value) {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  if (GetArena() == nullptr) {
-    delete reinterpret_cast<::google::protobuf::MessageLite*>(_impl_.source_id_);
-  }
-  _impl_.source_id_ = reinterpret_cast<::io::deephaven::proto::backplane::grpc::TableReference*>(value);
-  if (value != nullptr) {
-    _impl_._has_bits_[0] |= 0x00000002u;
-  } else {
-    _impl_._has_bits_[0] &= ~0x00000002u;
-  }
-  // @@protoc_insertion_point(field_unsafe_arena_set_allocated:io.deephaven.proto.backplane.grpc.MetaTableRequest.source_id)
-}
-inline ::io::deephaven::proto::backplane::grpc::TableReference* MetaTableRequest::release_source_id() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-
-  _impl_._has_bits_[0] &= ~0x00000002u;
-  ::io::deephaven::proto::backplane::grpc::TableReference* released = _impl_.source_id_;
-  _impl_.source_id_ = nullptr;
-#ifdef PROTOBUF_FORCE_COPY_IN_RELEASE
-  auto* old = reinterpret_cast<::google::protobuf::MessageLite*>(released);
-  released = ::google::protobuf::internal::DuplicateIfNonNull(released);
-  if (GetArena() == nullptr) {
-    delete old;
-  }
-#else   // PROTOBUF_FORCE_COPY_IN_RELEASE
-  if (GetArena() != nullptr) {
-    released = ::google::protobuf::internal::DuplicateIfNonNull(released);
-  }
-#endif  // !PROTOBUF_FORCE_COPY_IN_RELEASE
-  return released;
-}
-inline ::io::deephaven::proto::backplane::grpc::TableReference* MetaTableRequest::unsafe_arena_release_source_id() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  // @@protoc_insertion_point(field_release:io.deephaven.proto.backplane.grpc.MetaTableRequest.source_id)
-
-  _impl_._has_bits_[0] &= ~0x00000002u;
-  ::io::deephaven::proto::backplane::grpc::TableReference* temp = _impl_.source_id_;
-  _impl_.source_id_ = nullptr;
-  return temp;
-}
-inline ::io::deephaven::proto::backplane::grpc::TableReference* MetaTableRequest::_internal_mutable_source_id() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  _impl_._has_bits_[0] |= 0x00000002u;
-  if (_impl_.source_id_ == nullptr) {
-    auto* p = CreateMaybeMessage<::io::deephaven::proto::backplane::grpc::TableReference>(GetArena());
-    _impl_.source_id_ = reinterpret_cast<::io::deephaven::proto::backplane::grpc::TableReference*>(p);
-  }
-  return _impl_.source_id_;
-}
-inline ::io::deephaven::proto::backplane::grpc::TableReference* MetaTableRequest::mutable_source_id() ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  ::io::deephaven::proto::backplane::grpc::TableReference* _msg = _internal_mutable_source_id();
-  // @@protoc_insertion_point(field_mutable:io.deephaven.proto.backplane.grpc.MetaTableRequest.source_id)
-  return _msg;
-}
-inline void MetaTableRequest::set_allocated_source_id(::io::deephaven::proto::backplane::grpc::TableReference* value) {
-  ::google::protobuf::Arena* message_arena = GetArena();
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  if (message_arena == nullptr) {
-    delete reinterpret_cast<::io::deephaven::proto::backplane::grpc::TableReference*>(_impl_.source_id_);
-  }
-
-  if (value != nullptr) {
-    ::google::protobuf::Arena* submessage_arena = reinterpret_cast<::io::deephaven::proto::backplane::grpc::TableReference*>(value)->GetArena();
-    if (message_arena != submessage_arena) {
-      value = ::google::protobuf::internal::GetOwnedMessage(message_arena, value, submessage_arena);
-    }
-    _impl_._has_bits_[0] |= 0x00000002u;
-  } else {
-    _impl_._has_bits_[0] &= ~0x00000002u;
-  }
-
-  _impl_.source_id_ = reinterpret_cast<::io::deephaven::proto::backplane::grpc::TableReference*>(value);
-  // @@protoc_insertion_point(field_set_allocated:io.deephaven.proto.backplane.grpc.MetaTableRequest.source_id)
-}
-
-// -------------------------------------------------------------------
-
-// RunChartDownsampleRequest_ZoomRange
-
-// optional int64 min_date_nanos = 1 [jstype = JS_STRING];
-inline bool RunChartDownsampleRequest_ZoomRange::has_min_date_nanos() const {
-  bool value = (_impl_._has_bits_[0] & 0x00000001u) != 0;
-  return value;
-}
-inline void RunChartDownsampleRequest_ZoomRange::clear_min_date_nanos() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  _impl_.min_date_nanos_ = ::int64_t{0};
-  _impl_._has_bits_[0] &= ~0x00000001u;
-}
-inline ::int64_t RunChartDownsampleRequest_ZoomRange::min_date_nanos() const {
-  // @@protoc_insertion_point(field_get:io.deephaven.proto.backplane.grpc.RunChartDownsampleRequest.ZoomRange.min_date_nanos)
-  return _internal_min_date_nanos();
-}
-inline void RunChartDownsampleRequest_ZoomRange::set_min_date_nanos(::int64_t value) {
-  _internal_set_min_date_nanos(value);
-  // @@protoc_insertion_point(field_set:io.deephaven.proto.backplane.grpc.RunChartDownsampleRequest.ZoomRange.min_date_nanos)
-}
-inline ::int64_t RunChartDownsampleRequest_ZoomRange::_internal_min_date_nanos() const {
-  PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race);
-  return _impl_.min_date_nanos_;
-}
-inline void RunChartDownsampleRequest_ZoomRange::_internal_set_min_date_nanos(::int64_t value) {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  _impl_._has_bits_[0] |= 0x00000001u;
-  _impl_.min_date_nanos_ = value;
-}
-
-// optional int64 max_date_nanos = 2 [jstype = JS_STRING];
-inline bool RunChartDownsampleRequest_ZoomRange::has_max_date_nanos() const {
-  bool value = (_impl_._has_bits_[0] & 0x00000002u) != 0;
-  return value;
-}
-inline void RunChartDownsampleRequest_ZoomRange::clear_max_date_nanos() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  _impl_.max_date_nanos_ = ::int64_t{0};
-  _impl_._has_bits_[0] &= ~0x00000002u;
-}
-inline ::int64_t RunChartDownsampleRequest_ZoomRange::max_date_nanos() const {
-  // @@protoc_insertion_point(field_get:io.deephaven.proto.backplane.grpc.RunChartDownsampleRequest.ZoomRange.max_date_nanos)
-  return _internal_max_date_nanos();
-}
-inline void RunChartDownsampleRequest_ZoomRange::set_max_date_nanos(::int64_t value) {
-  _internal_set_max_date_nanos(value);
-  // @@protoc_insertion_point(field_set:io.deephaven.proto.backplane.grpc.RunChartDownsampleRequest.ZoomRange.max_date_nanos)
-}
-inline ::int64_t RunChartDownsampleRequest_ZoomRange::_internal_max_date_nanos() const {
-  PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race);
-  return _impl_.max_date_nanos_;
-}
-inline void RunChartDownsampleRequest_ZoomRange::_internal_set_max_date_nanos(::int64_t value) {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  _impl_._has_bits_[0] |= 0x00000002u;
-  _impl_.max_date_nanos_ = value;
-}
-
-// -------------------------------------------------------------------
-
-// RunChartDownsampleRequest
-
-// .io.deephaven.proto.backplane.grpc.Ticket result_id = 1;
-inline bool RunChartDownsampleRequest::has_result_id() const {
-  bool value = (_impl_._has_bits_[0] & 0x00000001u) != 0;
-  PROTOBUF_ASSUME(!value || _impl_.result_id_ != nullptr);
-  return value;
-}
-inline const ::io::deephaven::proto::backplane::grpc::Ticket& RunChartDownsampleRequest::_internal_result_id() const {
-  PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race);
-  const ::io::deephaven::proto::backplane::grpc::Ticket* p = _impl_.result_id_;
-  return p != nullptr ? *p : reinterpret_cast<const ::io::deephaven::proto::backplane::grpc::Ticket&>(::io::deephaven::proto::backplane::grpc::_Ticket_default_instance_);
-}
-inline const ::io::deephaven::proto::backplane::grpc::Ticket& RunChartDownsampleRequest::result_id() const ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  // @@protoc_insertion_point(field_get:io.deephaven.proto.backplane.grpc.RunChartDownsampleRequest.result_id)
-  return _internal_result_id();
-}
-inline void RunChartDownsampleRequest::unsafe_arena_set_allocated_result_id(::io::deephaven::proto::backplane::grpc::Ticket* value) {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  if (GetArena() == nullptr) {
-    delete reinterpret_cast<::google::protobuf::MessageLite*>(_impl_.result_id_);
-  }
-  _impl_.result_id_ = reinterpret_cast<::io::deephaven::proto::backplane::grpc::Ticket*>(value);
-  if (value != nullptr) {
-    _impl_._has_bits_[0] |= 0x00000001u;
-  } else {
-    _impl_._has_bits_[0] &= ~0x00000001u;
-  }
-  // @@protoc_insertion_point(field_unsafe_arena_set_allocated:io.deephaven.proto.backplane.grpc.RunChartDownsampleRequest.result_id)
-}
-inline ::io::deephaven::proto::backplane::grpc::Ticket* RunChartDownsampleRequest::release_result_id() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-
-  _impl_._has_bits_[0] &= ~0x00000001u;
-  ::io::deephaven::proto::backplane::grpc::Ticket* released = _impl_.result_id_;
-  _impl_.result_id_ = nullptr;
-#ifdef PROTOBUF_FORCE_COPY_IN_RELEASE
-  auto* old = reinterpret_cast<::google::protobuf::MessageLite*>(released);
-  released = ::google::protobuf::internal::DuplicateIfNonNull(released);
-  if (GetArena() == nullptr) {
-    delete old;
-  }
-#else   // PROTOBUF_FORCE_COPY_IN_RELEASE
-  if (GetArena() != nullptr) {
-    released = ::google::protobuf::internal::DuplicateIfNonNull(released);
-  }
-#endif  // !PROTOBUF_FORCE_COPY_IN_RELEASE
-  return released;
-}
-inline ::io::deephaven::proto::backplane::grpc::Ticket* RunChartDownsampleRequest::unsafe_arena_release_result_id() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  // @@protoc_insertion_point(field_release:io.deephaven.proto.backplane.grpc.RunChartDownsampleRequest.result_id)
-
-  _impl_._has_bits_[0] &= ~0x00000001u;
-  ::io::deephaven::proto::backplane::grpc::Ticket* temp = _impl_.result_id_;
-  _impl_.result_id_ = nullptr;
-  return temp;
-}
-inline ::io::deephaven::proto::backplane::grpc::Ticket* RunChartDownsampleRequest::_internal_mutable_result_id() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  _impl_._has_bits_[0] |= 0x00000001u;
-  if (_impl_.result_id_ == nullptr) {
-    auto* p = CreateMaybeMessage<::io::deephaven::proto::backplane::grpc::Ticket>(GetArena());
-    _impl_.result_id_ = reinterpret_cast<::io::deephaven::proto::backplane::grpc::Ticket*>(p);
-  }
-  return _impl_.result_id_;
-}
-inline ::io::deephaven::proto::backplane::grpc::Ticket* RunChartDownsampleRequest::mutable_result_id() ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  ::io::deephaven::proto::backplane::grpc::Ticket* _msg = _internal_mutable_result_id();
-  // @@protoc_insertion_point(field_mutable:io.deephaven.proto.backplane.grpc.RunChartDownsampleRequest.result_id)
-  return _msg;
-}
-inline void RunChartDownsampleRequest::set_allocated_result_id(::io::deephaven::proto::backplane::grpc::Ticket* value) {
-  ::google::protobuf::Arena* message_arena = GetArena();
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  if (message_arena == nullptr) {
-    delete reinterpret_cast<::google::protobuf::MessageLite*>(_impl_.result_id_);
-  }
-
-  if (value != nullptr) {
-    ::google::protobuf::Arena* submessage_arena = reinterpret_cast<::google::protobuf::MessageLite*>(value)->GetArena();
-    if (message_arena != submessage_arena) {
-      value = ::google::protobuf::internal::GetOwnedMessage(message_arena, value, submessage_arena);
-    }
-    _impl_._has_bits_[0] |= 0x00000001u;
-  } else {
-    _impl_._has_bits_[0] &= ~0x00000001u;
-  }
-
-  _impl_.result_id_ = reinterpret_cast<::io::deephaven::proto::backplane::grpc::Ticket*>(value);
-  // @@protoc_insertion_point(field_set_allocated:io.deephaven.proto.backplane.grpc.RunChartDownsampleRequest.result_id)
-}
-
-// .io.deephaven.proto.backplane.grpc.TableReference source_id = 2;
-inline bool RunChartDownsampleRequest::has_source_id() const {
-  bool value = (_impl_._has_bits_[0] & 0x00000002u) != 0;
-  PROTOBUF_ASSUME(!value || _impl_.source_id_ != nullptr);
-  return value;
-}
-inline void RunChartDownsampleRequest::clear_source_id() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  if (_impl_.source_id_ != nullptr) _impl_.source_id_->Clear();
-  _impl_._has_bits_[0] &= ~0x00000002u;
-}
-inline const ::io::deephaven::proto::backplane::grpc::TableReference& RunChartDownsampleRequest::_internal_source_id() const {
-  PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race);
-  const ::io::deephaven::proto::backplane::grpc::TableReference* p = _impl_.source_id_;
-  return p != nullptr ? *p : reinterpret_cast<const ::io::deephaven::proto::backplane::grpc::TableReference&>(::io::deephaven::proto::backplane::grpc::_TableReference_default_instance_);
-}
-inline const ::io::deephaven::proto::backplane::grpc::TableReference& RunChartDownsampleRequest::source_id() const ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  // @@protoc_insertion_point(field_get:io.deephaven.proto.backplane.grpc.RunChartDownsampleRequest.source_id)
-  return _internal_source_id();
-}
-inline void RunChartDownsampleRequest::unsafe_arena_set_allocated_source_id(::io::deephaven::proto::backplane::grpc::TableReference* value) {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  if (GetArena() == nullptr) {
-    delete reinterpret_cast<::google::protobuf::MessageLite*>(_impl_.source_id_);
-  }
-  _impl_.source_id_ = reinterpret_cast<::io::deephaven::proto::backplane::grpc::TableReference*>(value);
-  if (value != nullptr) {
-    _impl_._has_bits_[0] |= 0x00000002u;
-  } else {
-    _impl_._has_bits_[0] &= ~0x00000002u;
-  }
-  // @@protoc_insertion_point(field_unsafe_arena_set_allocated:io.deephaven.proto.backplane.grpc.RunChartDownsampleRequest.source_id)
-}
-inline ::io::deephaven::proto::backplane::grpc::TableReference* RunChartDownsampleRequest::release_source_id() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-
-  _impl_._has_bits_[0] &= ~0x00000002u;
-  ::io::deephaven::proto::backplane::grpc::TableReference* released = _impl_.source_id_;
-  _impl_.source_id_ = nullptr;
-#ifdef PROTOBUF_FORCE_COPY_IN_RELEASE
-  auto* old = reinterpret_cast<::google::protobuf::MessageLite*>(released);
-  released = ::google::protobuf::internal::DuplicateIfNonNull(released);
-  if (GetArena() == nullptr) {
-    delete old;
-  }
-#else   // PROTOBUF_FORCE_COPY_IN_RELEASE
-  if (GetArena() != nullptr) {
-    released = ::google::protobuf::internal::DuplicateIfNonNull(released);
-  }
-#endif  // !PROTOBUF_FORCE_COPY_IN_RELEASE
-  return released;
-}
-inline ::io::deephaven::proto::backplane::grpc::TableReference* RunChartDownsampleRequest::unsafe_arena_release_source_id() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  // @@protoc_insertion_point(field_release:io.deephaven.proto.backplane.grpc.RunChartDownsampleRequest.source_id)
-
-  _impl_._has_bits_[0] &= ~0x00000002u;
-  ::io::deephaven::proto::backplane::grpc::TableReference* temp = _impl_.source_id_;
-  _impl_.source_id_ = nullptr;
-  return temp;
-}
-inline ::io::deephaven::proto::backplane::grpc::TableReference* RunChartDownsampleRequest::_internal_mutable_source_id() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  _impl_._has_bits_[0] |= 0x00000002u;
-  if (_impl_.source_id_ == nullptr) {
-    auto* p = CreateMaybeMessage<::io::deephaven::proto::backplane::grpc::TableReference>(GetArena());
-    _impl_.source_id_ = reinterpret_cast<::io::deephaven::proto::backplane::grpc::TableReference*>(p);
-  }
-  return _impl_.source_id_;
-}
-inline ::io::deephaven::proto::backplane::grpc::TableReference* RunChartDownsampleRequest::mutable_source_id() ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  ::io::deephaven::proto::backplane::grpc::TableReference* _msg = _internal_mutable_source_id();
-  // @@protoc_insertion_point(field_mutable:io.deephaven.proto.backplane.grpc.RunChartDownsampleRequest.source_id)
-  return _msg;
-}
-inline void RunChartDownsampleRequest::set_allocated_source_id(::io::deephaven::proto::backplane::grpc::TableReference* value) {
-  ::google::protobuf::Arena* message_arena = GetArena();
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  if (message_arena == nullptr) {
-    delete reinterpret_cast<::io::deephaven::proto::backplane::grpc::TableReference*>(_impl_.source_id_);
-  }
-
-  if (value != nullptr) {
-    ::google::protobuf::Arena* submessage_arena = reinterpret_cast<::io::deephaven::proto::backplane::grpc::TableReference*>(value)->GetArena();
-    if (message_arena != submessage_arena) {
-      value = ::google::protobuf::internal::GetOwnedMessage(message_arena, value, submessage_arena);
-    }
-    _impl_._has_bits_[0] |= 0x00000002u;
-  } else {
-    _impl_._has_bits_[0] &= ~0x00000002u;
-  }
-
-  _impl_.source_id_ = reinterpret_cast<::io::deephaven::proto::backplane::grpc::TableReference*>(value);
-  // @@protoc_insertion_point(field_set_allocated:io.deephaven.proto.backplane.grpc.RunChartDownsampleRequest.source_id)
-}
-
-// int32 pixel_count = 3;
-inline void RunChartDownsampleRequest::clear_pixel_count() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  _impl_.pixel_count_ = 0;
-}
-inline ::int32_t RunChartDownsampleRequest::pixel_count() const {
-  // @@protoc_insertion_point(field_get:io.deephaven.proto.backplane.grpc.RunChartDownsampleRequest.pixel_count)
-  return _internal_pixel_count();
-}
-inline void RunChartDownsampleRequest::set_pixel_count(::int32_t value) {
-  _internal_set_pixel_count(value);
-  // @@protoc_insertion_point(field_set:io.deephaven.proto.backplane.grpc.RunChartDownsampleRequest.pixel_count)
-}
-inline ::int32_t RunChartDownsampleRequest::_internal_pixel_count() const {
-  PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race);
-  return _impl_.pixel_count_;
-}
-inline void RunChartDownsampleRequest::_internal_set_pixel_count(::int32_t value) {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  ;
-  _impl_.pixel_count_ = value;
-}
-
-// .io.deephaven.proto.backplane.grpc.RunChartDownsampleRequest.ZoomRange zoom_range = 4;
-inline bool RunChartDownsampleRequest::has_zoom_range() const {
-  bool value = (_impl_._has_bits_[0] & 0x00000004u) != 0;
-  PROTOBUF_ASSUME(!value || _impl_.zoom_range_ != nullptr);
-  return value;
-}
-inline void RunChartDownsampleRequest::clear_zoom_range() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  if (_impl_.zoom_range_ != nullptr) _impl_.zoom_range_->Clear();
-  _impl_._has_bits_[0] &= ~0x00000004u;
-}
-inline const ::io::deephaven::proto::backplane::grpc::RunChartDownsampleRequest_ZoomRange& RunChartDownsampleRequest::_internal_zoom_range() const {
-  PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race);
-  const ::io::deephaven::proto::backplane::grpc::RunChartDownsampleRequest_ZoomRange* p = _impl_.zoom_range_;
-  return p != nullptr ? *p : reinterpret_cast<const ::io::deephaven::proto::backplane::grpc::RunChartDownsampleRequest_ZoomRange&>(::io::deephaven::proto::backplane::grpc::_RunChartDownsampleRequest_ZoomRange_default_instance_);
-}
-inline const ::io::deephaven::proto::backplane::grpc::RunChartDownsampleRequest_ZoomRange& RunChartDownsampleRequest::zoom_range() const ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  // @@protoc_insertion_point(field_get:io.deephaven.proto.backplane.grpc.RunChartDownsampleRequest.zoom_range)
-  return _internal_zoom_range();
-}
-inline void RunChartDownsampleRequest::unsafe_arena_set_allocated_zoom_range(::io::deephaven::proto::backplane::grpc::RunChartDownsampleRequest_ZoomRange* value) {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  if (GetArena() == nullptr) {
-    delete reinterpret_cast<::google::protobuf::MessageLite*>(_impl_.zoom_range_);
-  }
-  _impl_.zoom_range_ = reinterpret_cast<::io::deephaven::proto::backplane::grpc::RunChartDownsampleRequest_ZoomRange*>(value);
-  if (value != nullptr) {
-    _impl_._has_bits_[0] |= 0x00000004u;
-  } else {
-    _impl_._has_bits_[0] &= ~0x00000004u;
-  }
-  // @@protoc_insertion_point(field_unsafe_arena_set_allocated:io.deephaven.proto.backplane.grpc.RunChartDownsampleRequest.zoom_range)
-}
-inline ::io::deephaven::proto::backplane::grpc::RunChartDownsampleRequest_ZoomRange* RunChartDownsampleRequest::release_zoom_range() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-
-  _impl_._has_bits_[0] &= ~0x00000004u;
-  ::io::deephaven::proto::backplane::grpc::RunChartDownsampleRequest_ZoomRange* released = _impl_.zoom_range_;
-  _impl_.zoom_range_ = nullptr;
-#ifdef PROTOBUF_FORCE_COPY_IN_RELEASE
-  auto* old = reinterpret_cast<::google::protobuf::MessageLite*>(released);
-  released = ::google::protobuf::internal::DuplicateIfNonNull(released);
-  if (GetArena() == nullptr) {
-    delete old;
-  }
-#else   // PROTOBUF_FORCE_COPY_IN_RELEASE
-  if (GetArena() != nullptr) {
-    released = ::google::protobuf::internal::DuplicateIfNonNull(released);
-  }
-#endif  // !PROTOBUF_FORCE_COPY_IN_RELEASE
-  return released;
-}
-inline ::io::deephaven::proto::backplane::grpc::RunChartDownsampleRequest_ZoomRange* RunChartDownsampleRequest::unsafe_arena_release_zoom_range() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  // @@protoc_insertion_point(field_release:io.deephaven.proto.backplane.grpc.RunChartDownsampleRequest.zoom_range)
-
-  _impl_._has_bits_[0] &= ~0x00000004u;
-  ::io::deephaven::proto::backplane::grpc::RunChartDownsampleRequest_ZoomRange* temp = _impl_.zoom_range_;
-  _impl_.zoom_range_ = nullptr;
-  return temp;
-}
-inline ::io::deephaven::proto::backplane::grpc::RunChartDownsampleRequest_ZoomRange* RunChartDownsampleRequest::_internal_mutable_zoom_range() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  _impl_._has_bits_[0] |= 0x00000004u;
-  if (_impl_.zoom_range_ == nullptr) {
-    auto* p = CreateMaybeMessage<::io::deephaven::proto::backplane::grpc::RunChartDownsampleRequest_ZoomRange>(GetArena());
-    _impl_.zoom_range_ = reinterpret_cast<::io::deephaven::proto::backplane::grpc::RunChartDownsampleRequest_ZoomRange*>(p);
-  }
-  return _impl_.zoom_range_;
-}
-inline ::io::deephaven::proto::backplane::grpc::RunChartDownsampleRequest_ZoomRange* RunChartDownsampleRequest::mutable_zoom_range() ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  ::io::deephaven::proto::backplane::grpc::RunChartDownsampleRequest_ZoomRange* _msg = _internal_mutable_zoom_range();
-  // @@protoc_insertion_point(field_mutable:io.deephaven.proto.backplane.grpc.RunChartDownsampleRequest.zoom_range)
-  return _msg;
-}
-inline void RunChartDownsampleRequest::set_allocated_zoom_range(::io::deephaven::proto::backplane::grpc::RunChartDownsampleRequest_ZoomRange* value) {
-  ::google::protobuf::Arena* message_arena = GetArena();
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  if (message_arena == nullptr) {
-    delete reinterpret_cast<::io::deephaven::proto::backplane::grpc::RunChartDownsampleRequest_ZoomRange*>(_impl_.zoom_range_);
-  }
-
-  if (value != nullptr) {
-    ::google::protobuf::Arena* submessage_arena = reinterpret_cast<::io::deephaven::proto::backplane::grpc::RunChartDownsampleRequest_ZoomRange*>(value)->GetArena();
-    if (message_arena != submessage_arena) {
-      value = ::google::protobuf::internal::GetOwnedMessage(message_arena, value, submessage_arena);
-    }
-    _impl_._has_bits_[0] |= 0x00000004u;
-  } else {
-    _impl_._has_bits_[0] &= ~0x00000004u;
-  }
-
-  _impl_.zoom_range_ = reinterpret_cast<::io::deephaven::proto::backplane::grpc::RunChartDownsampleRequest_ZoomRange*>(value);
-  // @@protoc_insertion_point(field_set_allocated:io.deephaven.proto.backplane.grpc.RunChartDownsampleRequest.zoom_range)
-}
-
-// string x_column_name = 5;
-inline void RunChartDownsampleRequest::clear_x_column_name() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  _impl_.x_column_name_.ClearToEmpty();
-}
-inline const std::string& RunChartDownsampleRequest::x_column_name() const
-    ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  // @@protoc_insertion_point(field_get:io.deephaven.proto.backplane.grpc.RunChartDownsampleRequest.x_column_name)
-  return _internal_x_column_name();
-}
-template <typename Arg_, typename... Args_>
-inline PROTOBUF_ALWAYS_INLINE void RunChartDownsampleRequest::set_x_column_name(Arg_&& arg,
-                                                     Args_... args) {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  ;
-  _impl_.x_column_name_.Set(static_cast<Arg_&&>(arg), args..., GetArena());
-  // @@protoc_insertion_point(field_set:io.deephaven.proto.backplane.grpc.RunChartDownsampleRequest.x_column_name)
-}
-inline std::string* RunChartDownsampleRequest::mutable_x_column_name() ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  std::string* _s = _internal_mutable_x_column_name();
-  // @@protoc_insertion_point(field_mutable:io.deephaven.proto.backplane.grpc.RunChartDownsampleRequest.x_column_name)
-  return _s;
-}
-inline const std::string& RunChartDownsampleRequest::_internal_x_column_name() const {
-  PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race);
-  return _impl_.x_column_name_.Get();
-}
-inline void RunChartDownsampleRequest::_internal_set_x_column_name(const std::string& value) {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  ;
-  _impl_.x_column_name_.Set(value, GetArena());
-}
-inline std::string* RunChartDownsampleRequest::_internal_mutable_x_column_name() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  ;
-  return _impl_.x_column_name_.Mutable( GetArena());
-}
-inline std::string* RunChartDownsampleRequest::release_x_column_name() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  // @@protoc_insertion_point(field_release:io.deephaven.proto.backplane.grpc.RunChartDownsampleRequest.x_column_name)
-  return _impl_.x_column_name_.Release();
-}
-inline void RunChartDownsampleRequest::set_allocated_x_column_name(std::string* value) {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  _impl_.x_column_name_.SetAllocated(value, GetArena());
-  #ifdef PROTOBUF_FORCE_COPY_DEFAULT_STRING
-        if (_impl_.x_column_name_.IsDefault()) {
-          _impl_.x_column_name_.Set("", GetArena());
-        }
-  #endif  // PROTOBUF_FORCE_COPY_DEFAULT_STRING
-  // @@protoc_insertion_point(field_set_allocated:io.deephaven.proto.backplane.grpc.RunChartDownsampleRequest.x_column_name)
-}
-
-// repeated string y_column_names = 6;
-inline int RunChartDownsampleRequest::_internal_y_column_names_size() const {
-  return _internal_y_column_names().size();
-}
-inline int RunChartDownsampleRequest::y_column_names_size() const {
-  return _internal_y_column_names_size();
-}
-inline void RunChartDownsampleRequest::clear_y_column_names() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  _impl_.y_column_names_.Clear();
-}
-inline std::string* RunChartDownsampleRequest::add_y_column_names()
-    ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  std::string* _s = _internal_mutable_y_column_names()->Add();
-  // @@protoc_insertion_point(field_add_mutable:io.deephaven.proto.backplane.grpc.RunChartDownsampleRequest.y_column_names)
-  return _s;
-}
-inline const std::string& RunChartDownsampleRequest::y_column_names(int index) const
-    ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  // @@protoc_insertion_point(field_get:io.deephaven.proto.backplane.grpc.RunChartDownsampleRequest.y_column_names)
-  return _internal_y_column_names().Get(index);
-}
-inline std::string* RunChartDownsampleRequest::mutable_y_column_names(int index)
-    ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  // @@protoc_insertion_point(field_mutable:io.deephaven.proto.backplane.grpc.RunChartDownsampleRequest.y_column_names)
-  return _internal_mutable_y_column_names()->Mutable(index);
-}
-inline void RunChartDownsampleRequest::set_y_column_names(int index, const std::string& value) {
-  _internal_mutable_y_column_names()->Mutable(index)->assign(value);
-  // @@protoc_insertion_point(field_set:io.deephaven.proto.backplane.grpc.RunChartDownsampleRequest.y_column_names)
-}
-inline void RunChartDownsampleRequest::set_y_column_names(int index, std::string&& value) {
-  _internal_mutable_y_column_names()->Mutable(index)->assign(std::move(value));
-  // @@protoc_insertion_point(field_set:io.deephaven.proto.backplane.grpc.RunChartDownsampleRequest.y_column_names)
-}
-inline void RunChartDownsampleRequest::set_y_column_names(int index, const char* value) {
-  ABSL_DCHECK(value != nullptr);
-  _internal_mutable_y_column_names()->Mutable(index)->assign(value);
-  // @@protoc_insertion_point(field_set_char:io.deephaven.proto.backplane.grpc.RunChartDownsampleRequest.y_column_names)
-}
-inline void RunChartDownsampleRequest::set_y_column_names(int index, const char* value,
-                              std::size_t size) {
-  _internal_mutable_y_column_names()->Mutable(index)->assign(
-      reinterpret_cast<const char*>(value), size);
-  // @@protoc_insertion_point(field_set_pointer:io.deephaven.proto.backplane.grpc.RunChartDownsampleRequest.y_column_names)
-}
-inline void RunChartDownsampleRequest::set_y_column_names(int index, absl::string_view value) {
-  _internal_mutable_y_column_names()->Mutable(index)->assign(value.data(),
-                                                     value.size());
-  // @@protoc_insertion_point(field_set_string_piece:io.deephaven.proto.backplane.grpc.RunChartDownsampleRequest.y_column_names)
-}
-inline void RunChartDownsampleRequest::add_y_column_names(const std::string& value) {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  _internal_mutable_y_column_names()->Add()->assign(value);
-  // @@protoc_insertion_point(field_add:io.deephaven.proto.backplane.grpc.RunChartDownsampleRequest.y_column_names)
-}
-inline void RunChartDownsampleRequest::add_y_column_names(std::string&& value) {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  _internal_mutable_y_column_names()->Add(std::move(value));
-  // @@protoc_insertion_point(field_add:io.deephaven.proto.backplane.grpc.RunChartDownsampleRequest.y_column_names)
-}
-inline void RunChartDownsampleRequest::add_y_column_names(const char* value) {
-  ABSL_DCHECK(value != nullptr);
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  _internal_mutable_y_column_names()->Add()->assign(value);
-  // @@protoc_insertion_point(field_add_char:io.deephaven.proto.backplane.grpc.RunChartDownsampleRequest.y_column_names)
-}
-inline void RunChartDownsampleRequest::add_y_column_names(const char* value, std::size_t size) {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  _internal_mutable_y_column_names()->Add()->assign(
-      reinterpret_cast<const char*>(value), size);
-  // @@protoc_insertion_point(field_add_pointer:io.deephaven.proto.backplane.grpc.RunChartDownsampleRequest.y_column_names)
-}
-inline void RunChartDownsampleRequest::add_y_column_names(absl::string_view value) {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  _internal_mutable_y_column_names()->Add()->assign(value.data(), value.size());
-  // @@protoc_insertion_point(field_add_string_piece:io.deephaven.proto.backplane.grpc.RunChartDownsampleRequest.y_column_names)
-}
-inline const ::google::protobuf::RepeatedPtrField<std::string>&
-RunChartDownsampleRequest::y_column_names() const ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  // @@protoc_insertion_point(field_list:io.deephaven.proto.backplane.grpc.RunChartDownsampleRequest.y_column_names)
-  return _internal_y_column_names();
-}
-inline ::google::protobuf::RepeatedPtrField<std::string>*
-RunChartDownsampleRequest::mutable_y_column_names() ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  // @@protoc_insertion_point(field_mutable_list:io.deephaven.proto.backplane.grpc.RunChartDownsampleRequest.y_column_names)
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  return _internal_mutable_y_column_names();
-}
-inline const ::google::protobuf::RepeatedPtrField<std::string>&
-RunChartDownsampleRequest::_internal_y_column_names() const {
-  PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race);
-  return _impl_.y_column_names_;
-}
-inline ::google::protobuf::RepeatedPtrField<std::string>*
-RunChartDownsampleRequest::_internal_mutable_y_column_names() {
-  PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race);
-  return &_impl_.y_column_names_;
-}
-
-// -------------------------------------------------------------------
-
-// CreateInputTableRequest_InputTableKind_InMemoryAppendOnly
-
-// -------------------------------------------------------------------
-
-// CreateInputTableRequest_InputTableKind_InMemoryKeyBacked
-
-// repeated string key_columns = 1;
-inline int CreateInputTableRequest_InputTableKind_InMemoryKeyBacked::_internal_key_columns_size() const {
-  return _internal_key_columns().size();
-}
-inline int CreateInputTableRequest_InputTableKind_InMemoryKeyBacked::key_columns_size() const {
-  return _internal_key_columns_size();
-}
-inline void CreateInputTableRequest_InputTableKind_InMemoryKeyBacked::clear_key_columns() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  _impl_.key_columns_.Clear();
-}
-inline std::string* CreateInputTableRequest_InputTableKind_InMemoryKeyBacked::add_key_columns()
-    ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  std::string* _s = _internal_mutable_key_columns()->Add();
-  // @@protoc_insertion_point(field_add_mutable:io.deephaven.proto.backplane.grpc.CreateInputTableRequest.InputTableKind.InMemoryKeyBacked.key_columns)
-  return _s;
-}
-inline const std::string& CreateInputTableRequest_InputTableKind_InMemoryKeyBacked::key_columns(int index) const
-    ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  // @@protoc_insertion_point(field_get:io.deephaven.proto.backplane.grpc.CreateInputTableRequest.InputTableKind.InMemoryKeyBacked.key_columns)
-  return _internal_key_columns().Get(index);
-}
-inline std::string* CreateInputTableRequest_InputTableKind_InMemoryKeyBacked::mutable_key_columns(int index)
-    ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  // @@protoc_insertion_point(field_mutable:io.deephaven.proto.backplane.grpc.CreateInputTableRequest.InputTableKind.InMemoryKeyBacked.key_columns)
-  return _internal_mutable_key_columns()->Mutable(index);
-}
-inline void CreateInputTableRequest_InputTableKind_InMemoryKeyBacked::set_key_columns(int index, const std::string& value) {
-  _internal_mutable_key_columns()->Mutable(index)->assign(value);
-  // @@protoc_insertion_point(field_set:io.deephaven.proto.backplane.grpc.CreateInputTableRequest.InputTableKind.InMemoryKeyBacked.key_columns)
-}
-inline void CreateInputTableRequest_InputTableKind_InMemoryKeyBacked::set_key_columns(int index, std::string&& value) {
-  _internal_mutable_key_columns()->Mutable(index)->assign(std::move(value));
-  // @@protoc_insertion_point(field_set:io.deephaven.proto.backplane.grpc.CreateInputTableRequest.InputTableKind.InMemoryKeyBacked.key_columns)
-}
-inline void CreateInputTableRequest_InputTableKind_InMemoryKeyBacked::set_key_columns(int index, const char* value) {
-  ABSL_DCHECK(value != nullptr);
-  _internal_mutable_key_columns()->Mutable(index)->assign(value);
-  // @@protoc_insertion_point(field_set_char:io.deephaven.proto.backplane.grpc.CreateInputTableRequest.InputTableKind.InMemoryKeyBacked.key_columns)
-}
-inline void CreateInputTableRequest_InputTableKind_InMemoryKeyBacked::set_key_columns(int index, const char* value,
-                              std::size_t size) {
-  _internal_mutable_key_columns()->Mutable(index)->assign(
-      reinterpret_cast<const char*>(value), size);
-  // @@protoc_insertion_point(field_set_pointer:io.deephaven.proto.backplane.grpc.CreateInputTableRequest.InputTableKind.InMemoryKeyBacked.key_columns)
-}
-inline void CreateInputTableRequest_InputTableKind_InMemoryKeyBacked::set_key_columns(int index, absl::string_view value) {
-  _internal_mutable_key_columns()->Mutable(index)->assign(value.data(),
-                                                     value.size());
-  // @@protoc_insertion_point(field_set_string_piece:io.deephaven.proto.backplane.grpc.CreateInputTableRequest.InputTableKind.InMemoryKeyBacked.key_columns)
-}
-inline void CreateInputTableRequest_InputTableKind_InMemoryKeyBacked::add_key_columns(const std::string& value) {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  _internal_mutable_key_columns()->Add()->assign(value);
-  // @@protoc_insertion_point(field_add:io.deephaven.proto.backplane.grpc.CreateInputTableRequest.InputTableKind.InMemoryKeyBacked.key_columns)
-}
-inline void CreateInputTableRequest_InputTableKind_InMemoryKeyBacked::add_key_columns(std::string&& value) {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  _internal_mutable_key_columns()->Add(std::move(value));
-  // @@protoc_insertion_point(field_add:io.deephaven.proto.backplane.grpc.CreateInputTableRequest.InputTableKind.InMemoryKeyBacked.key_columns)
-}
-inline void CreateInputTableRequest_InputTableKind_InMemoryKeyBacked::add_key_columns(const char* value) {
-  ABSL_DCHECK(value != nullptr);
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  _internal_mutable_key_columns()->Add()->assign(value);
-  // @@protoc_insertion_point(field_add_char:io.deephaven.proto.backplane.grpc.CreateInputTableRequest.InputTableKind.InMemoryKeyBacked.key_columns)
-}
-inline void CreateInputTableRequest_InputTableKind_InMemoryKeyBacked::add_key_columns(const char* value, std::size_t size) {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  _internal_mutable_key_columns()->Add()->assign(
-      reinterpret_cast<const char*>(value), size);
-  // @@protoc_insertion_point(field_add_pointer:io.deephaven.proto.backplane.grpc.CreateInputTableRequest.InputTableKind.InMemoryKeyBacked.key_columns)
-}
-inline void CreateInputTableRequest_InputTableKind_InMemoryKeyBacked::add_key_columns(absl::string_view value) {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  _internal_mutable_key_columns()->Add()->assign(value.data(), value.size());
-  // @@protoc_insertion_point(field_add_string_piece:io.deephaven.proto.backplane.grpc.CreateInputTableRequest.InputTableKind.InMemoryKeyBacked.key_columns)
-}
-inline const ::google::protobuf::RepeatedPtrField<std::string>&
-CreateInputTableRequest_InputTableKind_InMemoryKeyBacked::key_columns() const ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  // @@protoc_insertion_point(field_list:io.deephaven.proto.backplane.grpc.CreateInputTableRequest.InputTableKind.InMemoryKeyBacked.key_columns)
-  return _internal_key_columns();
-}
-inline ::google::protobuf::RepeatedPtrField<std::string>*
-CreateInputTableRequest_InputTableKind_InMemoryKeyBacked::mutable_key_columns() ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  // @@protoc_insertion_point(field_mutable_list:io.deephaven.proto.backplane.grpc.CreateInputTableRequest.InputTableKind.InMemoryKeyBacked.key_columns)
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  return _internal_mutable_key_columns();
-}
-inline const ::google::protobuf::RepeatedPtrField<std::string>&
-CreateInputTableRequest_InputTableKind_InMemoryKeyBacked::_internal_key_columns() const {
-  PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race);
-  return _impl_.key_columns_;
-}
-inline ::google::protobuf::RepeatedPtrField<std::string>*
-CreateInputTableRequest_InputTableKind_InMemoryKeyBacked::_internal_mutable_key_columns() {
-  PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race);
-  return &_impl_.key_columns_;
-}
-
-// -------------------------------------------------------------------
-
-// CreateInputTableRequest_InputTableKind_Blink
-
-// -------------------------------------------------------------------
-
-// CreateInputTableRequest_InputTableKind
-
-// .io.deephaven.proto.backplane.grpc.CreateInputTableRequest.InputTableKind.InMemoryAppendOnly in_memory_append_only = 1;
-inline bool CreateInputTableRequest_InputTableKind::has_in_memory_append_only() const {
-  return kind_case() == kInMemoryAppendOnly;
-}
-inline bool CreateInputTableRequest_InputTableKind::_internal_has_in_memory_append_only() const {
-  return kind_case() == kInMemoryAppendOnly;
-}
-inline void CreateInputTableRequest_InputTableKind::set_has_in_memory_append_only() {
-  _impl_._oneof_case_[0] = kInMemoryAppendOnly;
-}
-inline void CreateInputTableRequest_InputTableKind::clear_in_memory_append_only() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  if (kind_case() == kInMemoryAppendOnly) {
-    if (GetArena() == nullptr) {
-      delete _impl_.kind_.in_memory_append_only_;
-    }
-    clear_has_kind();
-  }
-}
-inline ::io::deephaven::proto::backplane::grpc::CreateInputTableRequest_InputTableKind_InMemoryAppendOnly* CreateInputTableRequest_InputTableKind::release_in_memory_append_only() {
-  // @@protoc_insertion_point(field_release:io.deephaven.proto.backplane.grpc.CreateInputTableRequest.InputTableKind.in_memory_append_only)
-  if (kind_case() == kInMemoryAppendOnly) {
-    clear_has_kind();
-    auto* temp = _impl_.kind_.in_memory_append_only_;
-    if (GetArena() != nullptr) {
-      temp = ::google::protobuf::internal::DuplicateIfNonNull(temp);
-    }
-    _impl_.kind_.in_memory_append_only_ = nullptr;
-    return temp;
-  } else {
-    return nullptr;
-  }
-}
-inline const ::io::deephaven::proto::backplane::grpc::CreateInputTableRequest_InputTableKind_InMemoryAppendOnly& CreateInputTableRequest_InputTableKind::_internal_in_memory_append_only() const {
-  return kind_case() == kInMemoryAppendOnly ? *_impl_.kind_.in_memory_append_only_ : reinterpret_cast<::io::deephaven::proto::backplane::grpc::CreateInputTableRequest_InputTableKind_InMemoryAppendOnly&>(::io::deephaven::proto::backplane::grpc::_CreateInputTableRequest_InputTableKind_InMemoryAppendOnly_default_instance_);
-}
-inline const ::io::deephaven::proto::backplane::grpc::CreateInputTableRequest_InputTableKind_InMemoryAppendOnly& CreateInputTableRequest_InputTableKind::in_memory_append_only() const ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  // @@protoc_insertion_point(field_get:io.deephaven.proto.backplane.grpc.CreateInputTableRequest.InputTableKind.in_memory_append_only)
-  return _internal_in_memory_append_only();
-}
-inline ::io::deephaven::proto::backplane::grpc::CreateInputTableRequest_InputTableKind_InMemoryAppendOnly* CreateInputTableRequest_InputTableKind::unsafe_arena_release_in_memory_append_only() {
-  // @@protoc_insertion_point(field_unsafe_arena_release:io.deephaven.proto.backplane.grpc.CreateInputTableRequest.InputTableKind.in_memory_append_only)
-  if (kind_case() == kInMemoryAppendOnly) {
-    clear_has_kind();
-    auto* temp = _impl_.kind_.in_memory_append_only_;
-    _impl_.kind_.in_memory_append_only_ = nullptr;
-    return temp;
-  } else {
-    return nullptr;
-  }
-}
-inline void CreateInputTableRequest_InputTableKind::unsafe_arena_set_allocated_in_memory_append_only(::io::deephaven::proto::backplane::grpc::CreateInputTableRequest_InputTableKind_InMemoryAppendOnly* value) {
-  // We rely on the oneof clear method to free the earlier contents
-  // of this oneof. We can directly use the pointer we're given to
-  // set the new value.
-  clear_kind();
-  if (value) {
-    set_has_in_memory_append_only();
-    _impl_.kind_.in_memory_append_only_ = value;
-  }
-  // @@protoc_insertion_point(field_unsafe_arena_set_allocated:io.deephaven.proto.backplane.grpc.CreateInputTableRequest.InputTableKind.in_memory_append_only)
-}
-inline ::io::deephaven::proto::backplane::grpc::CreateInputTableRequest_InputTableKind_InMemoryAppendOnly* CreateInputTableRequest_InputTableKind::_internal_mutable_in_memory_append_only() {
-  if (kind_case() != kInMemoryAppendOnly) {
-    clear_kind();
-    set_has_in_memory_append_only();
-    _impl_.kind_.in_memory_append_only_ = CreateMaybeMessage<::io::deephaven::proto::backplane::grpc::CreateInputTableRequest_InputTableKind_InMemoryAppendOnly>(GetArena());
-  }
-  return _impl_.kind_.in_memory_append_only_;
-}
-inline ::io::deephaven::proto::backplane::grpc::CreateInputTableRequest_InputTableKind_InMemoryAppendOnly* CreateInputTableRequest_InputTableKind::mutable_in_memory_append_only() ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  ::io::deephaven::proto::backplane::grpc::CreateInputTableRequest_InputTableKind_InMemoryAppendOnly* _msg = _internal_mutable_in_memory_append_only();
-  // @@protoc_insertion_point(field_mutable:io.deephaven.proto.backplane.grpc.CreateInputTableRequest.InputTableKind.in_memory_append_only)
-  return _msg;
-}
-
-// .io.deephaven.proto.backplane.grpc.CreateInputTableRequest.InputTableKind.InMemoryKeyBacked in_memory_key_backed = 2;
-inline bool CreateInputTableRequest_InputTableKind::has_in_memory_key_backed() const {
-  return kind_case() == kInMemoryKeyBacked;
-}
-inline bool CreateInputTableRequest_InputTableKind::_internal_has_in_memory_key_backed() const {
-  return kind_case() == kInMemoryKeyBacked;
-}
-inline void CreateInputTableRequest_InputTableKind::set_has_in_memory_key_backed() {
-  _impl_._oneof_case_[0] = kInMemoryKeyBacked;
-}
-inline void CreateInputTableRequest_InputTableKind::clear_in_memory_key_backed() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  if (kind_case() == kInMemoryKeyBacked) {
-    if (GetArena() == nullptr) {
-      delete _impl_.kind_.in_memory_key_backed_;
-    }
-    clear_has_kind();
-  }
-}
-inline ::io::deephaven::proto::backplane::grpc::CreateInputTableRequest_InputTableKind_InMemoryKeyBacked* CreateInputTableRequest_InputTableKind::release_in_memory_key_backed() {
-  // @@protoc_insertion_point(field_release:io.deephaven.proto.backplane.grpc.CreateInputTableRequest.InputTableKind.in_memory_key_backed)
-  if (kind_case() == kInMemoryKeyBacked) {
-    clear_has_kind();
-    auto* temp = _impl_.kind_.in_memory_key_backed_;
-    if (GetArena() != nullptr) {
-      temp = ::google::protobuf::internal::DuplicateIfNonNull(temp);
-    }
-    _impl_.kind_.in_memory_key_backed_ = nullptr;
-    return temp;
-  } else {
-    return nullptr;
-  }
-}
-inline const ::io::deephaven::proto::backplane::grpc::CreateInputTableRequest_InputTableKind_InMemoryKeyBacked& CreateInputTableRequest_InputTableKind::_internal_in_memory_key_backed() const {
-  return kind_case() == kInMemoryKeyBacked ? *_impl_.kind_.in_memory_key_backed_ : reinterpret_cast<::io::deephaven::proto::backplane::grpc::CreateInputTableRequest_InputTableKind_InMemoryKeyBacked&>(::io::deephaven::proto::backplane::grpc::_CreateInputTableRequest_InputTableKind_InMemoryKeyBacked_default_instance_);
-}
-inline const ::io::deephaven::proto::backplane::grpc::CreateInputTableRequest_InputTableKind_InMemoryKeyBacked& CreateInputTableRequest_InputTableKind::in_memory_key_backed() const ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  // @@protoc_insertion_point(field_get:io.deephaven.proto.backplane.grpc.CreateInputTableRequest.InputTableKind.in_memory_key_backed)
-  return _internal_in_memory_key_backed();
-}
-inline ::io::deephaven::proto::backplane::grpc::CreateInputTableRequest_InputTableKind_InMemoryKeyBacked* CreateInputTableRequest_InputTableKind::unsafe_arena_release_in_memory_key_backed() {
-  // @@protoc_insertion_point(field_unsafe_arena_release:io.deephaven.proto.backplane.grpc.CreateInputTableRequest.InputTableKind.in_memory_key_backed)
-  if (kind_case() == kInMemoryKeyBacked) {
-    clear_has_kind();
-    auto* temp = _impl_.kind_.in_memory_key_backed_;
-    _impl_.kind_.in_memory_key_backed_ = nullptr;
-    return temp;
-  } else {
-    return nullptr;
-  }
-}
-inline void CreateInputTableRequest_InputTableKind::unsafe_arena_set_allocated_in_memory_key_backed(::io::deephaven::proto::backplane::grpc::CreateInputTableRequest_InputTableKind_InMemoryKeyBacked* value) {
-  // We rely on the oneof clear method to free the earlier contents
-  // of this oneof. We can directly use the pointer we're given to
-  // set the new value.
-  clear_kind();
-  if (value) {
-    set_has_in_memory_key_backed();
-    _impl_.kind_.in_memory_key_backed_ = value;
-  }
-  // @@protoc_insertion_point(field_unsafe_arena_set_allocated:io.deephaven.proto.backplane.grpc.CreateInputTableRequest.InputTableKind.in_memory_key_backed)
-}
-inline ::io::deephaven::proto::backplane::grpc::CreateInputTableRequest_InputTableKind_InMemoryKeyBacked* CreateInputTableRequest_InputTableKind::_internal_mutable_in_memory_key_backed() {
-  if (kind_case() != kInMemoryKeyBacked) {
-    clear_kind();
-    set_has_in_memory_key_backed();
-    _impl_.kind_.in_memory_key_backed_ = CreateMaybeMessage<::io::deephaven::proto::backplane::grpc::CreateInputTableRequest_InputTableKind_InMemoryKeyBacked>(GetArena());
-  }
-  return _impl_.kind_.in_memory_key_backed_;
-}
-inline ::io::deephaven::proto::backplane::grpc::CreateInputTableRequest_InputTableKind_InMemoryKeyBacked* CreateInputTableRequest_InputTableKind::mutable_in_memory_key_backed() ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  ::io::deephaven::proto::backplane::grpc::CreateInputTableRequest_InputTableKind_InMemoryKeyBacked* _msg = _internal_mutable_in_memory_key_backed();
-  // @@protoc_insertion_point(field_mutable:io.deephaven.proto.backplane.grpc.CreateInputTableRequest.InputTableKind.in_memory_key_backed)
-  return _msg;
-}
-
-// .io.deephaven.proto.backplane.grpc.CreateInputTableRequest.InputTableKind.Blink blink = 3;
-inline bool CreateInputTableRequest_InputTableKind::has_blink() const {
-  return kind_case() == kBlink;
-}
-inline bool CreateInputTableRequest_InputTableKind::_internal_has_blink() const {
-  return kind_case() == kBlink;
-}
-inline void CreateInputTableRequest_InputTableKind::set_has_blink() {
-  _impl_._oneof_case_[0] = kBlink;
-}
-inline void CreateInputTableRequest_InputTableKind::clear_blink() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  if (kind_case() == kBlink) {
-    if (GetArena() == nullptr) {
-      delete _impl_.kind_.blink_;
-    }
-    clear_has_kind();
-  }
-}
-inline ::io::deephaven::proto::backplane::grpc::CreateInputTableRequest_InputTableKind_Blink* CreateInputTableRequest_InputTableKind::release_blink() {
-  // @@protoc_insertion_point(field_release:io.deephaven.proto.backplane.grpc.CreateInputTableRequest.InputTableKind.blink)
-  if (kind_case() == kBlink) {
-    clear_has_kind();
-    auto* temp = _impl_.kind_.blink_;
-    if (GetArena() != nullptr) {
-      temp = ::google::protobuf::internal::DuplicateIfNonNull(temp);
-    }
-    _impl_.kind_.blink_ = nullptr;
-    return temp;
-  } else {
-    return nullptr;
-  }
-}
-inline const ::io::deephaven::proto::backplane::grpc::CreateInputTableRequest_InputTableKind_Blink& CreateInputTableRequest_InputTableKind::_internal_blink() const {
-  return kind_case() == kBlink ? *_impl_.kind_.blink_ : reinterpret_cast<::io::deephaven::proto::backplane::grpc::CreateInputTableRequest_InputTableKind_Blink&>(::io::deephaven::proto::backplane::grpc::_CreateInputTableRequest_InputTableKind_Blink_default_instance_);
-}
-inline const ::io::deephaven::proto::backplane::grpc::CreateInputTableRequest_InputTableKind_Blink& CreateInputTableRequest_InputTableKind::blink() const ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  // @@protoc_insertion_point(field_get:io.deephaven.proto.backplane.grpc.CreateInputTableRequest.InputTableKind.blink)
-  return _internal_blink();
-}
-inline ::io::deephaven::proto::backplane::grpc::CreateInputTableRequest_InputTableKind_Blink* CreateInputTableRequest_InputTableKind::unsafe_arena_release_blink() {
-  // @@protoc_insertion_point(field_unsafe_arena_release:io.deephaven.proto.backplane.grpc.CreateInputTableRequest.InputTableKind.blink)
-  if (kind_case() == kBlink) {
-    clear_has_kind();
-    auto* temp = _impl_.kind_.blink_;
-    _impl_.kind_.blink_ = nullptr;
-    return temp;
-  } else {
-    return nullptr;
-  }
-}
-inline void CreateInputTableRequest_InputTableKind::unsafe_arena_set_allocated_blink(::io::deephaven::proto::backplane::grpc::CreateInputTableRequest_InputTableKind_Blink* value) {
-  // We rely on the oneof clear method to free the earlier contents
-  // of this oneof. We can directly use the pointer we're given to
-  // set the new value.
-  clear_kind();
-  if (value) {
-    set_has_blink();
-    _impl_.kind_.blink_ = value;
-  }
-  // @@protoc_insertion_point(field_unsafe_arena_set_allocated:io.deephaven.proto.backplane.grpc.CreateInputTableRequest.InputTableKind.blink)
-}
-inline ::io::deephaven::proto::backplane::grpc::CreateInputTableRequest_InputTableKind_Blink* CreateInputTableRequest_InputTableKind::_internal_mutable_blink() {
-  if (kind_case() != kBlink) {
-    clear_kind();
-    set_has_blink();
-    _impl_.kind_.blink_ = CreateMaybeMessage<::io::deephaven::proto::backplane::grpc::CreateInputTableRequest_InputTableKind_Blink>(GetArena());
-  }
-  return _impl_.kind_.blink_;
-}
-inline ::io::deephaven::proto::backplane::grpc::CreateInputTableRequest_InputTableKind_Blink* CreateInputTableRequest_InputTableKind::mutable_blink() ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  ::io::deephaven::proto::backplane::grpc::CreateInputTableRequest_InputTableKind_Blink* _msg = _internal_mutable_blink();
-  // @@protoc_insertion_point(field_mutable:io.deephaven.proto.backplane.grpc.CreateInputTableRequest.InputTableKind.blink)
-  return _msg;
-}
-
-inline bool CreateInputTableRequest_InputTableKind::has_kind() const {
-  return kind_case() != KIND_NOT_SET;
-}
-inline void CreateInputTableRequest_InputTableKind::clear_has_kind() {
-  _impl_._oneof_case_[0] = KIND_NOT_SET;
-}
-inline CreateInputTableRequest_InputTableKind::KindCase CreateInputTableRequest_InputTableKind::kind_case() const {
-  return CreateInputTableRequest_InputTableKind::KindCase(_impl_._oneof_case_[0]);
-}
-// -------------------------------------------------------------------
-
-// CreateInputTableRequest
-
-// .io.deephaven.proto.backplane.grpc.Ticket result_id = 1;
-inline bool CreateInputTableRequest::has_result_id() const {
-  bool value = (_impl_._has_bits_[0] & 0x00000001u) != 0;
-  PROTOBUF_ASSUME(!value || _impl_.result_id_ != nullptr);
-  return value;
-}
-inline const ::io::deephaven::proto::backplane::grpc::Ticket& CreateInputTableRequest::_internal_result_id() const {
-  PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race);
-  const ::io::deephaven::proto::backplane::grpc::Ticket* p = _impl_.result_id_;
-  return p != nullptr ? *p : reinterpret_cast<const ::io::deephaven::proto::backplane::grpc::Ticket&>(::io::deephaven::proto::backplane::grpc::_Ticket_default_instance_);
-}
-inline const ::io::deephaven::proto::backplane::grpc::Ticket& CreateInputTableRequest::result_id() const ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  // @@protoc_insertion_point(field_get:io.deephaven.proto.backplane.grpc.CreateInputTableRequest.result_id)
-  return _internal_result_id();
-}
-inline void CreateInputTableRequest::unsafe_arena_set_allocated_result_id(::io::deephaven::proto::backplane::grpc::Ticket* value) {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  if (GetArena() == nullptr) {
-    delete reinterpret_cast<::google::protobuf::MessageLite*>(_impl_.result_id_);
-  }
-  _impl_.result_id_ = reinterpret_cast<::io::deephaven::proto::backplane::grpc::Ticket*>(value);
-  if (value != nullptr) {
-    _impl_._has_bits_[0] |= 0x00000001u;
-  } else {
-    _impl_._has_bits_[0] &= ~0x00000001u;
-  }
-  // @@protoc_insertion_point(field_unsafe_arena_set_allocated:io.deephaven.proto.backplane.grpc.CreateInputTableRequest.result_id)
-}
-inline ::io::deephaven::proto::backplane::grpc::Ticket* CreateInputTableRequest::release_result_id() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-
-  _impl_._has_bits_[0] &= ~0x00000001u;
-  ::io::deephaven::proto::backplane::grpc::Ticket* released = _impl_.result_id_;
-  _impl_.result_id_ = nullptr;
-#ifdef PROTOBUF_FORCE_COPY_IN_RELEASE
-  auto* old = reinterpret_cast<::google::protobuf::MessageLite*>(released);
-  released = ::google::protobuf::internal::DuplicateIfNonNull(released);
-  if (GetArena() == nullptr) {
-    delete old;
-  }
-#else   // PROTOBUF_FORCE_COPY_IN_RELEASE
-  if (GetArena() != nullptr) {
-    released = ::google::protobuf::internal::DuplicateIfNonNull(released);
-  }
-#endif  // !PROTOBUF_FORCE_COPY_IN_RELEASE
-  return released;
-}
-inline ::io::deephaven::proto::backplane::grpc::Ticket* CreateInputTableRequest::unsafe_arena_release_result_id() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  // @@protoc_insertion_point(field_release:io.deephaven.proto.backplane.grpc.CreateInputTableRequest.result_id)
-
-  _impl_._has_bits_[0] &= ~0x00000001u;
-  ::io::deephaven::proto::backplane::grpc::Ticket* temp = _impl_.result_id_;
-  _impl_.result_id_ = nullptr;
-  return temp;
-}
-inline ::io::deephaven::proto::backplane::grpc::Ticket* CreateInputTableRequest::_internal_mutable_result_id() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  _impl_._has_bits_[0] |= 0x00000001u;
-  if (_impl_.result_id_ == nullptr) {
-    auto* p = CreateMaybeMessage<::io::deephaven::proto::backplane::grpc::Ticket>(GetArena());
-    _impl_.result_id_ = reinterpret_cast<::io::deephaven::proto::backplane::grpc::Ticket*>(p);
-  }
-  return _impl_.result_id_;
-}
-inline ::io::deephaven::proto::backplane::grpc::Ticket* CreateInputTableRequest::mutable_result_id() ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  ::io::deephaven::proto::backplane::grpc::Ticket* _msg = _internal_mutable_result_id();
-  // @@protoc_insertion_point(field_mutable:io.deephaven.proto.backplane.grpc.CreateInputTableRequest.result_id)
-  return _msg;
-}
-inline void CreateInputTableRequest::set_allocated_result_id(::io::deephaven::proto::backplane::grpc::Ticket* value) {
-  ::google::protobuf::Arena* message_arena = GetArena();
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  if (message_arena == nullptr) {
-    delete reinterpret_cast<::google::protobuf::MessageLite*>(_impl_.result_id_);
-  }
-
-  if (value != nullptr) {
-    ::google::protobuf::Arena* submessage_arena = reinterpret_cast<::google::protobuf::MessageLite*>(value)->GetArena();
-    if (message_arena != submessage_arena) {
-      value = ::google::protobuf::internal::GetOwnedMessage(message_arena, value, submessage_arena);
-    }
-    _impl_._has_bits_[0] |= 0x00000001u;
-  } else {
-    _impl_._has_bits_[0] &= ~0x00000001u;
-  }
-
-  _impl_.result_id_ = reinterpret_cast<::io::deephaven::proto::backplane::grpc::Ticket*>(value);
-  // @@protoc_insertion_point(field_set_allocated:io.deephaven.proto.backplane.grpc.CreateInputTableRequest.result_id)
-}
-
-// .io.deephaven.proto.backplane.grpc.TableReference source_table_id = 2;
-inline bool CreateInputTableRequest::has_source_table_id() const {
-  return definition_case() == kSourceTableId;
-}
-inline bool CreateInputTableRequest::_internal_has_source_table_id() const {
-  return definition_case() == kSourceTableId;
-}
-inline void CreateInputTableRequest::set_has_source_table_id() {
-  _impl_._oneof_case_[0] = kSourceTableId;
-}
-inline void CreateInputTableRequest::clear_source_table_id() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  if (definition_case() == kSourceTableId) {
-    if (GetArena() == nullptr) {
-      delete _impl_.definition_.source_table_id_;
-    }
-    clear_has_definition();
-  }
-}
-inline ::io::deephaven::proto::backplane::grpc::TableReference* CreateInputTableRequest::release_source_table_id() {
-  // @@protoc_insertion_point(field_release:io.deephaven.proto.backplane.grpc.CreateInputTableRequest.source_table_id)
-  if (definition_case() == kSourceTableId) {
-    clear_has_definition();
-    auto* temp = _impl_.definition_.source_table_id_;
-    if (GetArena() != nullptr) {
-      temp = ::google::protobuf::internal::DuplicateIfNonNull(temp);
-    }
-    _impl_.definition_.source_table_id_ = nullptr;
-    return temp;
-  } else {
-    return nullptr;
-  }
-}
-inline const ::io::deephaven::proto::backplane::grpc::TableReference& CreateInputTableRequest::_internal_source_table_id() const {
-  return definition_case() == kSourceTableId ? *_impl_.definition_.source_table_id_ : reinterpret_cast<::io::deephaven::proto::backplane::grpc::TableReference&>(::io::deephaven::proto::backplane::grpc::_TableReference_default_instance_);
-}
-inline const ::io::deephaven::proto::backplane::grpc::TableReference& CreateInputTableRequest::source_table_id() const ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  // @@protoc_insertion_point(field_get:io.deephaven.proto.backplane.grpc.CreateInputTableRequest.source_table_id)
-  return _internal_source_table_id();
-}
-inline ::io::deephaven::proto::backplane::grpc::TableReference* CreateInputTableRequest::unsafe_arena_release_source_table_id() {
-  // @@protoc_insertion_point(field_unsafe_arena_release:io.deephaven.proto.backplane.grpc.CreateInputTableRequest.source_table_id)
-  if (definition_case() == kSourceTableId) {
-    clear_has_definition();
-    auto* temp = _impl_.definition_.source_table_id_;
-    _impl_.definition_.source_table_id_ = nullptr;
-    return temp;
-  } else {
-    return nullptr;
-  }
-}
-inline void CreateInputTableRequest::unsafe_arena_set_allocated_source_table_id(::io::deephaven::proto::backplane::grpc::TableReference* value) {
-  // We rely on the oneof clear method to free the earlier contents
-  // of this oneof. We can directly use the pointer we're given to
-  // set the new value.
-  clear_definition();
-  if (value) {
-    set_has_source_table_id();
-    _impl_.definition_.source_table_id_ = value;
-  }
-  // @@protoc_insertion_point(field_unsafe_arena_set_allocated:io.deephaven.proto.backplane.grpc.CreateInputTableRequest.source_table_id)
-}
-inline ::io::deephaven::proto::backplane::grpc::TableReference* CreateInputTableRequest::_internal_mutable_source_table_id() {
-  if (definition_case() != kSourceTableId) {
-    clear_definition();
-    set_has_source_table_id();
-    _impl_.definition_.source_table_id_ = CreateMaybeMessage<::io::deephaven::proto::backplane::grpc::TableReference>(GetArena());
-  }
-  return _impl_.definition_.source_table_id_;
-}
-inline ::io::deephaven::proto::backplane::grpc::TableReference* CreateInputTableRequest::mutable_source_table_id() ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  ::io::deephaven::proto::backplane::grpc::TableReference* _msg = _internal_mutable_source_table_id();
-  // @@protoc_insertion_point(field_mutable:io.deephaven.proto.backplane.grpc.CreateInputTableRequest.source_table_id)
-  return _msg;
-}
-
-// bytes schema = 3;
-inline bool CreateInputTableRequest::has_schema() const {
-  return definition_case() == kSchema;
-}
-inline void CreateInputTableRequest::set_has_schema() {
-  _impl_._oneof_case_[0] = kSchema;
-}
-inline void CreateInputTableRequest::clear_schema() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  if (definition_case() == kSchema) {
-    _impl_.definition_.schema_.Destroy();
-    clear_has_definition();
-  }
-}
-inline const std::string& CreateInputTableRequest::schema() const
-    ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  // @@protoc_insertion_point(field_get:io.deephaven.proto.backplane.grpc.CreateInputTableRequest.schema)
-  return _internal_schema();
-}
-template <typename Arg_, typename... Args_>
-inline PROTOBUF_ALWAYS_INLINE void CreateInputTableRequest::set_schema(Arg_&& arg,
-                                                     Args_... args) {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  if (definition_case() != kSchema) {
-    clear_definition();
-
-    set_has_schema();
-    _impl_.definition_.schema_.InitDefault();
-  }
-  _impl_.definition_.schema_.SetBytes(static_cast<Arg_&&>(arg), args..., GetArena());
-  // @@protoc_insertion_point(field_set:io.deephaven.proto.backplane.grpc.CreateInputTableRequest.schema)
-}
-inline std::string* CreateInputTableRequest::mutable_schema() ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  std::string* _s = _internal_mutable_schema();
-  // @@protoc_insertion_point(field_mutable:io.deephaven.proto.backplane.grpc.CreateInputTableRequest.schema)
-  return _s;
-}
-inline const std::string& CreateInputTableRequest::_internal_schema() const {
-  PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race);
-  if (definition_case() != kSchema) {
-    return ::google::protobuf::internal::GetEmptyStringAlreadyInited();
-  }
-  return _impl_.definition_.schema_.Get();
-}
-inline void CreateInputTableRequest::_internal_set_schema(const std::string& value) {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  if (definition_case() != kSchema) {
-    clear_definition();
-
-    set_has_schema();
-    _impl_.definition_.schema_.InitDefault();
-  }
-  _impl_.definition_.schema_.Set(value, GetArena());
-}
-inline std::string* CreateInputTableRequest::_internal_mutable_schema() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  if (definition_case() != kSchema) {
-    clear_definition();
-
-    set_has_schema();
-    _impl_.definition_.schema_.InitDefault();
-  }
-  return _impl_.definition_.schema_.Mutable( GetArena());
-}
-inline std::string* CreateInputTableRequest::release_schema() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  // @@protoc_insertion_point(field_release:io.deephaven.proto.backplane.grpc.CreateInputTableRequest.schema)
-  if (definition_case() != kSchema) {
-    return nullptr;
-  }
-  clear_has_definition();
-  return _impl_.definition_.schema_.Release();
-}
-inline void CreateInputTableRequest::set_allocated_schema(std::string* value) {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  if (has_definition()) {
-    clear_definition();
-  }
-  if (value != nullptr) {
-    set_has_schema();
-    _impl_.definition_.schema_.InitAllocated(value, GetArena());
-  }
-  // @@protoc_insertion_point(field_set_allocated:io.deephaven.proto.backplane.grpc.CreateInputTableRequest.schema)
-}
-
-// .io.deephaven.proto.backplane.grpc.CreateInputTableRequest.InputTableKind kind = 4;
-inline bool CreateInputTableRequest::has_kind() const {
-  bool value = (_impl_._has_bits_[0] & 0x00000002u) != 0;
-  PROTOBUF_ASSUME(!value || _impl_.kind_ != nullptr);
-  return value;
-}
-inline void CreateInputTableRequest::clear_kind() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  if (_impl_.kind_ != nullptr) _impl_.kind_->Clear();
-  _impl_._has_bits_[0] &= ~0x00000002u;
-}
-inline const ::io::deephaven::proto::backplane::grpc::CreateInputTableRequest_InputTableKind& CreateInputTableRequest::_internal_kind() const {
-  PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race);
-  const ::io::deephaven::proto::backplane::grpc::CreateInputTableRequest_InputTableKind* p = _impl_.kind_;
-  return p != nullptr ? *p : reinterpret_cast<const ::io::deephaven::proto::backplane::grpc::CreateInputTableRequest_InputTableKind&>(::io::deephaven::proto::backplane::grpc::_CreateInputTableRequest_InputTableKind_default_instance_);
-}
-inline const ::io::deephaven::proto::backplane::grpc::CreateInputTableRequest_InputTableKind& CreateInputTableRequest::kind() const ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  // @@protoc_insertion_point(field_get:io.deephaven.proto.backplane.grpc.CreateInputTableRequest.kind)
-  return _internal_kind();
-}
-inline void CreateInputTableRequest::unsafe_arena_set_allocated_kind(::io::deephaven::proto::backplane::grpc::CreateInputTableRequest_InputTableKind* value) {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  if (GetArena() == nullptr) {
-    delete reinterpret_cast<::google::protobuf::MessageLite*>(_impl_.kind_);
-  }
-  _impl_.kind_ = reinterpret_cast<::io::deephaven::proto::backplane::grpc::CreateInputTableRequest_InputTableKind*>(value);
-  if (value != nullptr) {
-    _impl_._has_bits_[0] |= 0x00000002u;
-  } else {
-    _impl_._has_bits_[0] &= ~0x00000002u;
-  }
-  // @@protoc_insertion_point(field_unsafe_arena_set_allocated:io.deephaven.proto.backplane.grpc.CreateInputTableRequest.kind)
-}
-inline ::io::deephaven::proto::backplane::grpc::CreateInputTableRequest_InputTableKind* CreateInputTableRequest::release_kind() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-
-  _impl_._has_bits_[0] &= ~0x00000002u;
-  ::io::deephaven::proto::backplane::grpc::CreateInputTableRequest_InputTableKind* released = _impl_.kind_;
-  _impl_.kind_ = nullptr;
-#ifdef PROTOBUF_FORCE_COPY_IN_RELEASE
-  auto* old = reinterpret_cast<::google::protobuf::MessageLite*>(released);
-  released = ::google::protobuf::internal::DuplicateIfNonNull(released);
-  if (GetArena() == nullptr) {
-    delete old;
-  }
-#else   // PROTOBUF_FORCE_COPY_IN_RELEASE
-  if (GetArena() != nullptr) {
-    released = ::google::protobuf::internal::DuplicateIfNonNull(released);
-  }
-#endif  // !PROTOBUF_FORCE_COPY_IN_RELEASE
-  return released;
-}
-inline ::io::deephaven::proto::backplane::grpc::CreateInputTableRequest_InputTableKind* CreateInputTableRequest::unsafe_arena_release_kind() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  // @@protoc_insertion_point(field_release:io.deephaven.proto.backplane.grpc.CreateInputTableRequest.kind)
-
-  _impl_._has_bits_[0] &= ~0x00000002u;
-  ::io::deephaven::proto::backplane::grpc::CreateInputTableRequest_InputTableKind* temp = _impl_.kind_;
-  _impl_.kind_ = nullptr;
-  return temp;
-}
-inline ::io::deephaven::proto::backplane::grpc::CreateInputTableRequest_InputTableKind* CreateInputTableRequest::_internal_mutable_kind() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  _impl_._has_bits_[0] |= 0x00000002u;
-  if (_impl_.kind_ == nullptr) {
-    auto* p = CreateMaybeMessage<::io::deephaven::proto::backplane::grpc::CreateInputTableRequest_InputTableKind>(GetArena());
-    _impl_.kind_ = reinterpret_cast<::io::deephaven::proto::backplane::grpc::CreateInputTableRequest_InputTableKind*>(p);
-  }
-  return _impl_.kind_;
-}
-inline ::io::deephaven::proto::backplane::grpc::CreateInputTableRequest_InputTableKind* CreateInputTableRequest::mutable_kind() ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  ::io::deephaven::proto::backplane::grpc::CreateInputTableRequest_InputTableKind* _msg = _internal_mutable_kind();
-  // @@protoc_insertion_point(field_mutable:io.deephaven.proto.backplane.grpc.CreateInputTableRequest.kind)
-  return _msg;
-}
-inline void CreateInputTableRequest::set_allocated_kind(::io::deephaven::proto::backplane::grpc::CreateInputTableRequest_InputTableKind* value) {
-  ::google::protobuf::Arena* message_arena = GetArena();
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  if (message_arena == nullptr) {
-    delete reinterpret_cast<::io::deephaven::proto::backplane::grpc::CreateInputTableRequest_InputTableKind*>(_impl_.kind_);
-  }
-
-  if (value != nullptr) {
-    ::google::protobuf::Arena* submessage_arena = reinterpret_cast<::io::deephaven::proto::backplane::grpc::CreateInputTableRequest_InputTableKind*>(value)->GetArena();
-    if (message_arena != submessage_arena) {
-      value = ::google::protobuf::internal::GetOwnedMessage(message_arena, value, submessage_arena);
-    }
-    _impl_._has_bits_[0] |= 0x00000002u;
-  } else {
-    _impl_._has_bits_[0] &= ~0x00000002u;
-  }
-
-  _impl_.kind_ = reinterpret_cast<::io::deephaven::proto::backplane::grpc::CreateInputTableRequest_InputTableKind*>(value);
-  // @@protoc_insertion_point(field_set_allocated:io.deephaven.proto.backplane.grpc.CreateInputTableRequest.kind)
-}
-
-inline bool CreateInputTableRequest::has_definition() const {
-  return definition_case() != DEFINITION_NOT_SET;
-}
-inline void CreateInputTableRequest::clear_has_definition() {
-  _impl_._oneof_case_[0] = DEFINITION_NOT_SET;
-}
-inline CreateInputTableRequest::DefinitionCase CreateInputTableRequest::definition_case() const {
-  return CreateInputTableRequest::DefinitionCase(_impl_._oneof_case_[0]);
-}
-// -------------------------------------------------------------------
-
-// WhereInRequest
-
-// .io.deephaven.proto.backplane.grpc.Ticket result_id = 1;
-inline bool WhereInRequest::has_result_id() const {
-  bool value = (_impl_._has_bits_[0] & 0x00000001u) != 0;
-  PROTOBUF_ASSUME(!value || _impl_.result_id_ != nullptr);
-  return value;
-}
-inline const ::io::deephaven::proto::backplane::grpc::Ticket& WhereInRequest::_internal_result_id() const {
-  PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race);
-  const ::io::deephaven::proto::backplane::grpc::Ticket* p = _impl_.result_id_;
-  return p != nullptr ? *p : reinterpret_cast<const ::io::deephaven::proto::backplane::grpc::Ticket&>(::io::deephaven::proto::backplane::grpc::_Ticket_default_instance_);
-}
-inline const ::io::deephaven::proto::backplane::grpc::Ticket& WhereInRequest::result_id() const ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  // @@protoc_insertion_point(field_get:io.deephaven.proto.backplane.grpc.WhereInRequest.result_id)
-  return _internal_result_id();
-}
-inline void WhereInRequest::unsafe_arena_set_allocated_result_id(::io::deephaven::proto::backplane::grpc::Ticket* value) {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  if (GetArena() == nullptr) {
-    delete reinterpret_cast<::google::protobuf::MessageLite*>(_impl_.result_id_);
-  }
-  _impl_.result_id_ = reinterpret_cast<::io::deephaven::proto::backplane::grpc::Ticket*>(value);
-  if (value != nullptr) {
-    _impl_._has_bits_[0] |= 0x00000001u;
-  } else {
-    _impl_._has_bits_[0] &= ~0x00000001u;
-  }
-  // @@protoc_insertion_point(field_unsafe_arena_set_allocated:io.deephaven.proto.backplane.grpc.WhereInRequest.result_id)
-}
-inline ::io::deephaven::proto::backplane::grpc::Ticket* WhereInRequest::release_result_id() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-
-  _impl_._has_bits_[0] &= ~0x00000001u;
-  ::io::deephaven::proto::backplane::grpc::Ticket* released = _impl_.result_id_;
-  _impl_.result_id_ = nullptr;
-#ifdef PROTOBUF_FORCE_COPY_IN_RELEASE
-  auto* old = reinterpret_cast<::google::protobuf::MessageLite*>(released);
-  released = ::google::protobuf::internal::DuplicateIfNonNull(released);
-  if (GetArena() == nullptr) {
-    delete old;
-  }
-#else   // PROTOBUF_FORCE_COPY_IN_RELEASE
-  if (GetArena() != nullptr) {
-    released = ::google::protobuf::internal::DuplicateIfNonNull(released);
-  }
-#endif  // !PROTOBUF_FORCE_COPY_IN_RELEASE
-  return released;
-}
-inline ::io::deephaven::proto::backplane::grpc::Ticket* WhereInRequest::unsafe_arena_release_result_id() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  // @@protoc_insertion_point(field_release:io.deephaven.proto.backplane.grpc.WhereInRequest.result_id)
-
-  _impl_._has_bits_[0] &= ~0x00000001u;
-  ::io::deephaven::proto::backplane::grpc::Ticket* temp = _impl_.result_id_;
-  _impl_.result_id_ = nullptr;
-  return temp;
-}
-inline ::io::deephaven::proto::backplane::grpc::Ticket* WhereInRequest::_internal_mutable_result_id() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  _impl_._has_bits_[0] |= 0x00000001u;
-  if (_impl_.result_id_ == nullptr) {
-    auto* p = CreateMaybeMessage<::io::deephaven::proto::backplane::grpc::Ticket>(GetArena());
-    _impl_.result_id_ = reinterpret_cast<::io::deephaven::proto::backplane::grpc::Ticket*>(p);
-  }
-  return _impl_.result_id_;
-}
-inline ::io::deephaven::proto::backplane::grpc::Ticket* WhereInRequest::mutable_result_id() ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  ::io::deephaven::proto::backplane::grpc::Ticket* _msg = _internal_mutable_result_id();
-  // @@protoc_insertion_point(field_mutable:io.deephaven.proto.backplane.grpc.WhereInRequest.result_id)
-  return _msg;
-}
-inline void WhereInRequest::set_allocated_result_id(::io::deephaven::proto::backplane::grpc::Ticket* value) {
-  ::google::protobuf::Arena* message_arena = GetArena();
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  if (message_arena == nullptr) {
-    delete reinterpret_cast<::google::protobuf::MessageLite*>(_impl_.result_id_);
-  }
-
-  if (value != nullptr) {
-    ::google::protobuf::Arena* submessage_arena = reinterpret_cast<::google::protobuf::MessageLite*>(value)->GetArena();
-    if (message_arena != submessage_arena) {
-      value = ::google::protobuf::internal::GetOwnedMessage(message_arena, value, submessage_arena);
-    }
-    _impl_._has_bits_[0] |= 0x00000001u;
-  } else {
-    _impl_._has_bits_[0] &= ~0x00000001u;
-  }
-
-  _impl_.result_id_ = reinterpret_cast<::io::deephaven::proto::backplane::grpc::Ticket*>(value);
-  // @@protoc_insertion_point(field_set_allocated:io.deephaven.proto.backplane.grpc.WhereInRequest.result_id)
-}
-
-// .io.deephaven.proto.backplane.grpc.TableReference left_id = 2;
-inline bool WhereInRequest::has_left_id() const {
-  bool value = (_impl_._has_bits_[0] & 0x00000002u) != 0;
-  PROTOBUF_ASSUME(!value || _impl_.left_id_ != nullptr);
-  return value;
-}
-inline void WhereInRequest::clear_left_id() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  if (_impl_.left_id_ != nullptr) _impl_.left_id_->Clear();
-  _impl_._has_bits_[0] &= ~0x00000002u;
-}
-inline const ::io::deephaven::proto::backplane::grpc::TableReference& WhereInRequest::_internal_left_id() const {
-  PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race);
-  const ::io::deephaven::proto::backplane::grpc::TableReference* p = _impl_.left_id_;
-  return p != nullptr ? *p : reinterpret_cast<const ::io::deephaven::proto::backplane::grpc::TableReference&>(::io::deephaven::proto::backplane::grpc::_TableReference_default_instance_);
-}
-inline const ::io::deephaven::proto::backplane::grpc::TableReference& WhereInRequest::left_id() const ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  // @@protoc_insertion_point(field_get:io.deephaven.proto.backplane.grpc.WhereInRequest.left_id)
-  return _internal_left_id();
-}
-inline void WhereInRequest::unsafe_arena_set_allocated_left_id(::io::deephaven::proto::backplane::grpc::TableReference* value) {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  if (GetArena() == nullptr) {
-    delete reinterpret_cast<::google::protobuf::MessageLite*>(_impl_.left_id_);
-  }
-  _impl_.left_id_ = reinterpret_cast<::io::deephaven::proto::backplane::grpc::TableReference*>(value);
-  if (value != nullptr) {
-    _impl_._has_bits_[0] |= 0x00000002u;
-  } else {
-    _impl_._has_bits_[0] &= ~0x00000002u;
-  }
-  // @@protoc_insertion_point(field_unsafe_arena_set_allocated:io.deephaven.proto.backplane.grpc.WhereInRequest.left_id)
-}
-inline ::io::deephaven::proto::backplane::grpc::TableReference* WhereInRequest::release_left_id() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-
-  _impl_._has_bits_[0] &= ~0x00000002u;
-  ::io::deephaven::proto::backplane::grpc::TableReference* released = _impl_.left_id_;
-  _impl_.left_id_ = nullptr;
-#ifdef PROTOBUF_FORCE_COPY_IN_RELEASE
-  auto* old = reinterpret_cast<::google::protobuf::MessageLite*>(released);
-  released = ::google::protobuf::internal::DuplicateIfNonNull(released);
-  if (GetArena() == nullptr) {
-    delete old;
-  }
-#else   // PROTOBUF_FORCE_COPY_IN_RELEASE
-  if (GetArena() != nullptr) {
-    released = ::google::protobuf::internal::DuplicateIfNonNull(released);
-  }
-#endif  // !PROTOBUF_FORCE_COPY_IN_RELEASE
-  return released;
-}
-inline ::io::deephaven::proto::backplane::grpc::TableReference* WhereInRequest::unsafe_arena_release_left_id() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  // @@protoc_insertion_point(field_release:io.deephaven.proto.backplane.grpc.WhereInRequest.left_id)
-
-  _impl_._has_bits_[0] &= ~0x00000002u;
-  ::io::deephaven::proto::backplane::grpc::TableReference* temp = _impl_.left_id_;
-  _impl_.left_id_ = nullptr;
-  return temp;
-}
-inline ::io::deephaven::proto::backplane::grpc::TableReference* WhereInRequest::_internal_mutable_left_id() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  _impl_._has_bits_[0] |= 0x00000002u;
-  if (_impl_.left_id_ == nullptr) {
-    auto* p = CreateMaybeMessage<::io::deephaven::proto::backplane::grpc::TableReference>(GetArena());
-    _impl_.left_id_ = reinterpret_cast<::io::deephaven::proto::backplane::grpc::TableReference*>(p);
-  }
-  return _impl_.left_id_;
-}
-inline ::io::deephaven::proto::backplane::grpc::TableReference* WhereInRequest::mutable_left_id() ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  ::io::deephaven::proto::backplane::grpc::TableReference* _msg = _internal_mutable_left_id();
-  // @@protoc_insertion_point(field_mutable:io.deephaven.proto.backplane.grpc.WhereInRequest.left_id)
-  return _msg;
-}
-inline void WhereInRequest::set_allocated_left_id(::io::deephaven::proto::backplane::grpc::TableReference* value) {
-  ::google::protobuf::Arena* message_arena = GetArena();
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  if (message_arena == nullptr) {
-    delete reinterpret_cast<::io::deephaven::proto::backplane::grpc::TableReference*>(_impl_.left_id_);
-  }
-
-  if (value != nullptr) {
-    ::google::protobuf::Arena* submessage_arena = reinterpret_cast<::io::deephaven::proto::backplane::grpc::TableReference*>(value)->GetArena();
-    if (message_arena != submessage_arena) {
-      value = ::google::protobuf::internal::GetOwnedMessage(message_arena, value, submessage_arena);
-    }
-    _impl_._has_bits_[0] |= 0x00000002u;
-  } else {
-    _impl_._has_bits_[0] &= ~0x00000002u;
-  }
-
-  _impl_.left_id_ = reinterpret_cast<::io::deephaven::proto::backplane::grpc::TableReference*>(value);
-  // @@protoc_insertion_point(field_set_allocated:io.deephaven.proto.backplane.grpc.WhereInRequest.left_id)
-}
-
-// .io.deephaven.proto.backplane.grpc.TableReference right_id = 3;
-inline bool WhereInRequest::has_right_id() const {
-  bool value = (_impl_._has_bits_[0] & 0x00000004u) != 0;
-  PROTOBUF_ASSUME(!value || _impl_.right_id_ != nullptr);
-  return value;
-}
-inline void WhereInRequest::clear_right_id() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  if (_impl_.right_id_ != nullptr) _impl_.right_id_->Clear();
-  _impl_._has_bits_[0] &= ~0x00000004u;
-}
-inline const ::io::deephaven::proto::backplane::grpc::TableReference& WhereInRequest::_internal_right_id() const {
-  PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race);
-  const ::io::deephaven::proto::backplane::grpc::TableReference* p = _impl_.right_id_;
-  return p != nullptr ? *p : reinterpret_cast<const ::io::deephaven::proto::backplane::grpc::TableReference&>(::io::deephaven::proto::backplane::grpc::_TableReference_default_instance_);
-}
-inline const ::io::deephaven::proto::backplane::grpc::TableReference& WhereInRequest::right_id() const ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  // @@protoc_insertion_point(field_get:io.deephaven.proto.backplane.grpc.WhereInRequest.right_id)
-  return _internal_right_id();
-}
-inline void WhereInRequest::unsafe_arena_set_allocated_right_id(::io::deephaven::proto::backplane::grpc::TableReference* value) {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  if (GetArena() == nullptr) {
-    delete reinterpret_cast<::google::protobuf::MessageLite*>(_impl_.right_id_);
-  }
-  _impl_.right_id_ = reinterpret_cast<::io::deephaven::proto::backplane::grpc::TableReference*>(value);
-  if (value != nullptr) {
-    _impl_._has_bits_[0] |= 0x00000004u;
-  } else {
-    _impl_._has_bits_[0] &= ~0x00000004u;
-  }
-  // @@protoc_insertion_point(field_unsafe_arena_set_allocated:io.deephaven.proto.backplane.grpc.WhereInRequest.right_id)
-}
-inline ::io::deephaven::proto::backplane::grpc::TableReference* WhereInRequest::release_right_id() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-
-  _impl_._has_bits_[0] &= ~0x00000004u;
-  ::io::deephaven::proto::backplane::grpc::TableReference* released = _impl_.right_id_;
-  _impl_.right_id_ = nullptr;
-#ifdef PROTOBUF_FORCE_COPY_IN_RELEASE
-  auto* old = reinterpret_cast<::google::protobuf::MessageLite*>(released);
-  released = ::google::protobuf::internal::DuplicateIfNonNull(released);
-  if (GetArena() == nullptr) {
-    delete old;
-  }
-#else   // PROTOBUF_FORCE_COPY_IN_RELEASE
-  if (GetArena() != nullptr) {
-    released = ::google::protobuf::internal::DuplicateIfNonNull(released);
-  }
-#endif  // !PROTOBUF_FORCE_COPY_IN_RELEASE
-  return released;
-}
-inline ::io::deephaven::proto::backplane::grpc::TableReference* WhereInRequest::unsafe_arena_release_right_id() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  // @@protoc_insertion_point(field_release:io.deephaven.proto.backplane.grpc.WhereInRequest.right_id)
-
-  _impl_._has_bits_[0] &= ~0x00000004u;
-  ::io::deephaven::proto::backplane::grpc::TableReference* temp = _impl_.right_id_;
-  _impl_.right_id_ = nullptr;
-  return temp;
-}
-inline ::io::deephaven::proto::backplane::grpc::TableReference* WhereInRequest::_internal_mutable_right_id() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  _impl_._has_bits_[0] |= 0x00000004u;
-  if (_impl_.right_id_ == nullptr) {
-    auto* p = CreateMaybeMessage<::io::deephaven::proto::backplane::grpc::TableReference>(GetArena());
-    _impl_.right_id_ = reinterpret_cast<::io::deephaven::proto::backplane::grpc::TableReference*>(p);
-  }
-  return _impl_.right_id_;
-}
-inline ::io::deephaven::proto::backplane::grpc::TableReference* WhereInRequest::mutable_right_id() ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  ::io::deephaven::proto::backplane::grpc::TableReference* _msg = _internal_mutable_right_id();
-  // @@protoc_insertion_point(field_mutable:io.deephaven.proto.backplane.grpc.WhereInRequest.right_id)
-  return _msg;
-}
-inline void WhereInRequest::set_allocated_right_id(::io::deephaven::proto::backplane::grpc::TableReference* value) {
-  ::google::protobuf::Arena* message_arena = GetArena();
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  if (message_arena == nullptr) {
-    delete reinterpret_cast<::io::deephaven::proto::backplane::grpc::TableReference*>(_impl_.right_id_);
-  }
-
-  if (value != nullptr) {
-    ::google::protobuf::Arena* submessage_arena = reinterpret_cast<::io::deephaven::proto::backplane::grpc::TableReference*>(value)->GetArena();
-    if (message_arena != submessage_arena) {
-      value = ::google::protobuf::internal::GetOwnedMessage(message_arena, value, submessage_arena);
-    }
-    _impl_._has_bits_[0] |= 0x00000004u;
-  } else {
-    _impl_._has_bits_[0] &= ~0x00000004u;
-  }
-
-  _impl_.right_id_ = reinterpret_cast<::io::deephaven::proto::backplane::grpc::TableReference*>(value);
-  // @@protoc_insertion_point(field_set_allocated:io.deephaven.proto.backplane.grpc.WhereInRequest.right_id)
-}
-
-// bool inverted = 4;
-inline void WhereInRequest::clear_inverted() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  _impl_.inverted_ = false;
-}
-inline bool WhereInRequest::inverted() const {
-  // @@protoc_insertion_point(field_get:io.deephaven.proto.backplane.grpc.WhereInRequest.inverted)
-  return _internal_inverted();
-}
-inline void WhereInRequest::set_inverted(bool value) {
-  _internal_set_inverted(value);
-  // @@protoc_insertion_point(field_set:io.deephaven.proto.backplane.grpc.WhereInRequest.inverted)
-}
-inline bool WhereInRequest::_internal_inverted() const {
-  PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race);
-  return _impl_.inverted_;
-}
-inline void WhereInRequest::_internal_set_inverted(bool value) {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  ;
-  _impl_.inverted_ = value;
-}
-
-// repeated string columns_to_match = 5;
-inline int WhereInRequest::_internal_columns_to_match_size() const {
-  return _internal_columns_to_match().size();
-}
-inline int WhereInRequest::columns_to_match_size() const {
-  return _internal_columns_to_match_size();
-}
-inline void WhereInRequest::clear_columns_to_match() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  _impl_.columns_to_match_.Clear();
-}
-inline std::string* WhereInRequest::add_columns_to_match()
-    ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  std::string* _s = _internal_mutable_columns_to_match()->Add();
-  // @@protoc_insertion_point(field_add_mutable:io.deephaven.proto.backplane.grpc.WhereInRequest.columns_to_match)
-  return _s;
-}
-inline const std::string& WhereInRequest::columns_to_match(int index) const
-    ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  // @@protoc_insertion_point(field_get:io.deephaven.proto.backplane.grpc.WhereInRequest.columns_to_match)
-  return _internal_columns_to_match().Get(index);
-}
-inline std::string* WhereInRequest::mutable_columns_to_match(int index)
-    ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  // @@protoc_insertion_point(field_mutable:io.deephaven.proto.backplane.grpc.WhereInRequest.columns_to_match)
-  return _internal_mutable_columns_to_match()->Mutable(index);
-}
-inline void WhereInRequest::set_columns_to_match(int index, const std::string& value) {
-  _internal_mutable_columns_to_match()->Mutable(index)->assign(value);
-  // @@protoc_insertion_point(field_set:io.deephaven.proto.backplane.grpc.WhereInRequest.columns_to_match)
-}
-inline void WhereInRequest::set_columns_to_match(int index, std::string&& value) {
-  _internal_mutable_columns_to_match()->Mutable(index)->assign(std::move(value));
-  // @@protoc_insertion_point(field_set:io.deephaven.proto.backplane.grpc.WhereInRequest.columns_to_match)
-}
-inline void WhereInRequest::set_columns_to_match(int index, const char* value) {
-  ABSL_DCHECK(value != nullptr);
-  _internal_mutable_columns_to_match()->Mutable(index)->assign(value);
-  // @@protoc_insertion_point(field_set_char:io.deephaven.proto.backplane.grpc.WhereInRequest.columns_to_match)
-}
-inline void WhereInRequest::set_columns_to_match(int index, const char* value,
-                              std::size_t size) {
-  _internal_mutable_columns_to_match()->Mutable(index)->assign(
-      reinterpret_cast<const char*>(value), size);
-  // @@protoc_insertion_point(field_set_pointer:io.deephaven.proto.backplane.grpc.WhereInRequest.columns_to_match)
-}
-inline void WhereInRequest::set_columns_to_match(int index, absl::string_view value) {
-  _internal_mutable_columns_to_match()->Mutable(index)->assign(value.data(),
-                                                     value.size());
-  // @@protoc_insertion_point(field_set_string_piece:io.deephaven.proto.backplane.grpc.WhereInRequest.columns_to_match)
-}
-inline void WhereInRequest::add_columns_to_match(const std::string& value) {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  _internal_mutable_columns_to_match()->Add()->assign(value);
-  // @@protoc_insertion_point(field_add:io.deephaven.proto.backplane.grpc.WhereInRequest.columns_to_match)
-}
-inline void WhereInRequest::add_columns_to_match(std::string&& value) {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  _internal_mutable_columns_to_match()->Add(std::move(value));
-  // @@protoc_insertion_point(field_add:io.deephaven.proto.backplane.grpc.WhereInRequest.columns_to_match)
-}
-inline void WhereInRequest::add_columns_to_match(const char* value) {
-  ABSL_DCHECK(value != nullptr);
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  _internal_mutable_columns_to_match()->Add()->assign(value);
-  // @@protoc_insertion_point(field_add_char:io.deephaven.proto.backplane.grpc.WhereInRequest.columns_to_match)
-}
-inline void WhereInRequest::add_columns_to_match(const char* value, std::size_t size) {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  _internal_mutable_columns_to_match()->Add()->assign(
-      reinterpret_cast<const char*>(value), size);
-  // @@protoc_insertion_point(field_add_pointer:io.deephaven.proto.backplane.grpc.WhereInRequest.columns_to_match)
-}
-inline void WhereInRequest::add_columns_to_match(absl::string_view value) {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  _internal_mutable_columns_to_match()->Add()->assign(value.data(), value.size());
-  // @@protoc_insertion_point(field_add_string_piece:io.deephaven.proto.backplane.grpc.WhereInRequest.columns_to_match)
-}
-inline const ::google::protobuf::RepeatedPtrField<std::string>&
-WhereInRequest::columns_to_match() const ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  // @@protoc_insertion_point(field_list:io.deephaven.proto.backplane.grpc.WhereInRequest.columns_to_match)
-  return _internal_columns_to_match();
-}
-inline ::google::protobuf::RepeatedPtrField<std::string>*
-WhereInRequest::mutable_columns_to_match() ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  // @@protoc_insertion_point(field_mutable_list:io.deephaven.proto.backplane.grpc.WhereInRequest.columns_to_match)
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  return _internal_mutable_columns_to_match();
-}
-inline const ::google::protobuf::RepeatedPtrField<std::string>&
-WhereInRequest::_internal_columns_to_match() const {
-  PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race);
-  return _impl_.columns_to_match_;
-}
-inline ::google::protobuf::RepeatedPtrField<std::string>*
-WhereInRequest::_internal_mutable_columns_to_match() {
-  PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race);
-  return &_impl_.columns_to_match_;
-}
-
-// -------------------------------------------------------------------
-
-// ColumnStatisticsRequest
-
-// .io.deephaven.proto.backplane.grpc.Ticket result_id = 1;
-inline bool ColumnStatisticsRequest::has_result_id() const {
-  bool value = (_impl_._has_bits_[0] & 0x00000001u) != 0;
-  PROTOBUF_ASSUME(!value || _impl_.result_id_ != nullptr);
-  return value;
-}
-inline const ::io::deephaven::proto::backplane::grpc::Ticket& ColumnStatisticsRequest::_internal_result_id() const {
-  PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race);
-  const ::io::deephaven::proto::backplane::grpc::Ticket* p = _impl_.result_id_;
-  return p != nullptr ? *p : reinterpret_cast<const ::io::deephaven::proto::backplane::grpc::Ticket&>(::io::deephaven::proto::backplane::grpc::_Ticket_default_instance_);
-}
-inline const ::io::deephaven::proto::backplane::grpc::Ticket& ColumnStatisticsRequest::result_id() const ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  // @@protoc_insertion_point(field_get:io.deephaven.proto.backplane.grpc.ColumnStatisticsRequest.result_id)
-  return _internal_result_id();
-}
-inline void ColumnStatisticsRequest::unsafe_arena_set_allocated_result_id(::io::deephaven::proto::backplane::grpc::Ticket* value) {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  if (GetArena() == nullptr) {
-    delete reinterpret_cast<::google::protobuf::MessageLite*>(_impl_.result_id_);
-  }
-  _impl_.result_id_ = reinterpret_cast<::io::deephaven::proto::backplane::grpc::Ticket*>(value);
-  if (value != nullptr) {
-    _impl_._has_bits_[0] |= 0x00000001u;
-  } else {
-    _impl_._has_bits_[0] &= ~0x00000001u;
-  }
-  // @@protoc_insertion_point(field_unsafe_arena_set_allocated:io.deephaven.proto.backplane.grpc.ColumnStatisticsRequest.result_id)
-}
-inline ::io::deephaven::proto::backplane::grpc::Ticket* ColumnStatisticsRequest::release_result_id() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-
-  _impl_._has_bits_[0] &= ~0x00000001u;
-  ::io::deephaven::proto::backplane::grpc::Ticket* released = _impl_.result_id_;
-  _impl_.result_id_ = nullptr;
-#ifdef PROTOBUF_FORCE_COPY_IN_RELEASE
-  auto* old = reinterpret_cast<::google::protobuf::MessageLite*>(released);
-  released = ::google::protobuf::internal::DuplicateIfNonNull(released);
-  if (GetArena() == nullptr) {
-    delete old;
-  }
-#else   // PROTOBUF_FORCE_COPY_IN_RELEASE
-  if (GetArena() != nullptr) {
-    released = ::google::protobuf::internal::DuplicateIfNonNull(released);
-  }
-#endif  // !PROTOBUF_FORCE_COPY_IN_RELEASE
-  return released;
-}
-inline ::io::deephaven::proto::backplane::grpc::Ticket* ColumnStatisticsRequest::unsafe_arena_release_result_id() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  // @@protoc_insertion_point(field_release:io.deephaven.proto.backplane.grpc.ColumnStatisticsRequest.result_id)
-
-  _impl_._has_bits_[0] &= ~0x00000001u;
-  ::io::deephaven::proto::backplane::grpc::Ticket* temp = _impl_.result_id_;
-  _impl_.result_id_ = nullptr;
-  return temp;
-}
-inline ::io::deephaven::proto::backplane::grpc::Ticket* ColumnStatisticsRequest::_internal_mutable_result_id() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  _impl_._has_bits_[0] |= 0x00000001u;
-  if (_impl_.result_id_ == nullptr) {
-    auto* p = CreateMaybeMessage<::io::deephaven::proto::backplane::grpc::Ticket>(GetArena());
-    _impl_.result_id_ = reinterpret_cast<::io::deephaven::proto::backplane::grpc::Ticket*>(p);
-  }
-  return _impl_.result_id_;
-}
-inline ::io::deephaven::proto::backplane::grpc::Ticket* ColumnStatisticsRequest::mutable_result_id() ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  ::io::deephaven::proto::backplane::grpc::Ticket* _msg = _internal_mutable_result_id();
-  // @@protoc_insertion_point(field_mutable:io.deephaven.proto.backplane.grpc.ColumnStatisticsRequest.result_id)
-  return _msg;
-}
-inline void ColumnStatisticsRequest::set_allocated_result_id(::io::deephaven::proto::backplane::grpc::Ticket* value) {
-  ::google::protobuf::Arena* message_arena = GetArena();
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  if (message_arena == nullptr) {
-    delete reinterpret_cast<::google::protobuf::MessageLite*>(_impl_.result_id_);
-  }
-
-  if (value != nullptr) {
-    ::google::protobuf::Arena* submessage_arena = reinterpret_cast<::google::protobuf::MessageLite*>(value)->GetArena();
-    if (message_arena != submessage_arena) {
-      value = ::google::protobuf::internal::GetOwnedMessage(message_arena, value, submessage_arena);
-    }
-    _impl_._has_bits_[0] |= 0x00000001u;
-  } else {
-    _impl_._has_bits_[0] &= ~0x00000001u;
-  }
-
-  _impl_.result_id_ = reinterpret_cast<::io::deephaven::proto::backplane::grpc::Ticket*>(value);
-  // @@protoc_insertion_point(field_set_allocated:io.deephaven.proto.backplane.grpc.ColumnStatisticsRequest.result_id)
-}
-
-// .io.deephaven.proto.backplane.grpc.TableReference source_id = 2;
-inline bool ColumnStatisticsRequest::has_source_id() const {
-  bool value = (_impl_._has_bits_[0] & 0x00000002u) != 0;
-  PROTOBUF_ASSUME(!value || _impl_.source_id_ != nullptr);
-  return value;
-}
-inline void ColumnStatisticsRequest::clear_source_id() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  if (_impl_.source_id_ != nullptr) _impl_.source_id_->Clear();
-  _impl_._has_bits_[0] &= ~0x00000002u;
-}
-inline const ::io::deephaven::proto::backplane::grpc::TableReference& ColumnStatisticsRequest::_internal_source_id() const {
-  PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race);
-  const ::io::deephaven::proto::backplane::grpc::TableReference* p = _impl_.source_id_;
-  return p != nullptr ? *p : reinterpret_cast<const ::io::deephaven::proto::backplane::grpc::TableReference&>(::io::deephaven::proto::backplane::grpc::_TableReference_default_instance_);
-}
-inline const ::io::deephaven::proto::backplane::grpc::TableReference& ColumnStatisticsRequest::source_id() const ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  // @@protoc_insertion_point(field_get:io.deephaven.proto.backplane.grpc.ColumnStatisticsRequest.source_id)
-  return _internal_source_id();
-}
-inline void ColumnStatisticsRequest::unsafe_arena_set_allocated_source_id(::io::deephaven::proto::backplane::grpc::TableReference* value) {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  if (GetArena() == nullptr) {
-    delete reinterpret_cast<::google::protobuf::MessageLite*>(_impl_.source_id_);
-  }
-  _impl_.source_id_ = reinterpret_cast<::io::deephaven::proto::backplane::grpc::TableReference*>(value);
-  if (value != nullptr) {
-    _impl_._has_bits_[0] |= 0x00000002u;
-  } else {
-    _impl_._has_bits_[0] &= ~0x00000002u;
-  }
-  // @@protoc_insertion_point(field_unsafe_arena_set_allocated:io.deephaven.proto.backplane.grpc.ColumnStatisticsRequest.source_id)
-}
-inline ::io::deephaven::proto::backplane::grpc::TableReference* ColumnStatisticsRequest::release_source_id() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-
-  _impl_._has_bits_[0] &= ~0x00000002u;
-  ::io::deephaven::proto::backplane::grpc::TableReference* released = _impl_.source_id_;
-  _impl_.source_id_ = nullptr;
-#ifdef PROTOBUF_FORCE_COPY_IN_RELEASE
-  auto* old = reinterpret_cast<::google::protobuf::MessageLite*>(released);
-  released = ::google::protobuf::internal::DuplicateIfNonNull(released);
-  if (GetArena() == nullptr) {
-    delete old;
-  }
-#else   // PROTOBUF_FORCE_COPY_IN_RELEASE
-  if (GetArena() != nullptr) {
-    released = ::google::protobuf::internal::DuplicateIfNonNull(released);
-  }
-#endif  // !PROTOBUF_FORCE_COPY_IN_RELEASE
-  return released;
-}
-inline ::io::deephaven::proto::backplane::grpc::TableReference* ColumnStatisticsRequest::unsafe_arena_release_source_id() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  // @@protoc_insertion_point(field_release:io.deephaven.proto.backplane.grpc.ColumnStatisticsRequest.source_id)
-
-  _impl_._has_bits_[0] &= ~0x00000002u;
-  ::io::deephaven::proto::backplane::grpc::TableReference* temp = _impl_.source_id_;
-  _impl_.source_id_ = nullptr;
-  return temp;
-}
-inline ::io::deephaven::proto::backplane::grpc::TableReference* ColumnStatisticsRequest::_internal_mutable_source_id() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  _impl_._has_bits_[0] |= 0x00000002u;
-  if (_impl_.source_id_ == nullptr) {
-    auto* p = CreateMaybeMessage<::io::deephaven::proto::backplane::grpc::TableReference>(GetArena());
-    _impl_.source_id_ = reinterpret_cast<::io::deephaven::proto::backplane::grpc::TableReference*>(p);
-  }
-  return _impl_.source_id_;
-}
-inline ::io::deephaven::proto::backplane::grpc::TableReference* ColumnStatisticsRequest::mutable_source_id() ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  ::io::deephaven::proto::backplane::grpc::TableReference* _msg = _internal_mutable_source_id();
-  // @@protoc_insertion_point(field_mutable:io.deephaven.proto.backplane.grpc.ColumnStatisticsRequest.source_id)
-  return _msg;
-}
-inline void ColumnStatisticsRequest::set_allocated_source_id(::io::deephaven::proto::backplane::grpc::TableReference* value) {
-  ::google::protobuf::Arena* message_arena = GetArena();
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  if (message_arena == nullptr) {
-    delete reinterpret_cast<::io::deephaven::proto::backplane::grpc::TableReference*>(_impl_.source_id_);
-  }
-
-  if (value != nullptr) {
-    ::google::protobuf::Arena* submessage_arena = reinterpret_cast<::io::deephaven::proto::backplane::grpc::TableReference*>(value)->GetArena();
-    if (message_arena != submessage_arena) {
-      value = ::google::protobuf::internal::GetOwnedMessage(message_arena, value, submessage_arena);
-    }
-    _impl_._has_bits_[0] |= 0x00000002u;
-  } else {
-    _impl_._has_bits_[0] &= ~0x00000002u;
-  }
-
-  _impl_.source_id_ = reinterpret_cast<::io::deephaven::proto::backplane::grpc::TableReference*>(value);
-  // @@protoc_insertion_point(field_set_allocated:io.deephaven.proto.backplane.grpc.ColumnStatisticsRequest.source_id)
-}
-
-// string column_name = 3;
-inline void ColumnStatisticsRequest::clear_column_name() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  _impl_.column_name_.ClearToEmpty();
-}
-inline const std::string& ColumnStatisticsRequest::column_name() const
-    ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  // @@protoc_insertion_point(field_get:io.deephaven.proto.backplane.grpc.ColumnStatisticsRequest.column_name)
-  return _internal_column_name();
-}
-template <typename Arg_, typename... Args_>
-inline PROTOBUF_ALWAYS_INLINE void ColumnStatisticsRequest::set_column_name(Arg_&& arg,
-                                                     Args_... args) {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  ;
-  _impl_.column_name_.Set(static_cast<Arg_&&>(arg), args..., GetArena());
-  // @@protoc_insertion_point(field_set:io.deephaven.proto.backplane.grpc.ColumnStatisticsRequest.column_name)
-}
-inline std::string* ColumnStatisticsRequest::mutable_column_name() ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  std::string* _s = _internal_mutable_column_name();
-  // @@protoc_insertion_point(field_mutable:io.deephaven.proto.backplane.grpc.ColumnStatisticsRequest.column_name)
-  return _s;
-}
-inline const std::string& ColumnStatisticsRequest::_internal_column_name() const {
-  PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race);
-  return _impl_.column_name_.Get();
-}
-inline void ColumnStatisticsRequest::_internal_set_column_name(const std::string& value) {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  ;
-  _impl_.column_name_.Set(value, GetArena());
-}
-inline std::string* ColumnStatisticsRequest::_internal_mutable_column_name() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  ;
-  return _impl_.column_name_.Mutable( GetArena());
-}
-inline std::string* ColumnStatisticsRequest::release_column_name() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  // @@protoc_insertion_point(field_release:io.deephaven.proto.backplane.grpc.ColumnStatisticsRequest.column_name)
-  return _impl_.column_name_.Release();
-}
-inline void ColumnStatisticsRequest::set_allocated_column_name(std::string* value) {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  _impl_.column_name_.SetAllocated(value, GetArena());
-  #ifdef PROTOBUF_FORCE_COPY_DEFAULT_STRING
-        if (_impl_.column_name_.IsDefault()) {
-          _impl_.column_name_.Set("", GetArena());
-        }
-  #endif  // PROTOBUF_FORCE_COPY_DEFAULT_STRING
-  // @@protoc_insertion_point(field_set_allocated:io.deephaven.proto.backplane.grpc.ColumnStatisticsRequest.column_name)
-}
-
-// optional int32 unique_value_limit = 4;
-inline bool ColumnStatisticsRequest::has_unique_value_limit() const {
-  bool value = (_impl_._has_bits_[0] & 0x00000004u) != 0;
-  return value;
-}
-inline void ColumnStatisticsRequest::clear_unique_value_limit() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  _impl_.unique_value_limit_ = 0;
-  _impl_._has_bits_[0] &= ~0x00000004u;
-}
-inline ::int32_t ColumnStatisticsRequest::unique_value_limit() const {
-  // @@protoc_insertion_point(field_get:io.deephaven.proto.backplane.grpc.ColumnStatisticsRequest.unique_value_limit)
-  return _internal_unique_value_limit();
-}
-inline void ColumnStatisticsRequest::set_unique_value_limit(::int32_t value) {
-  _internal_set_unique_value_limit(value);
-  // @@protoc_insertion_point(field_set:io.deephaven.proto.backplane.grpc.ColumnStatisticsRequest.unique_value_limit)
-}
-inline ::int32_t ColumnStatisticsRequest::_internal_unique_value_limit() const {
-  PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race);
-  return _impl_.unique_value_limit_;
-}
-inline void ColumnStatisticsRequest::_internal_set_unique_value_limit(::int32_t value) {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  _impl_._has_bits_[0] |= 0x00000004u;
-  _impl_.unique_value_limit_ = value;
-}
-
-// -------------------------------------------------------------------
-
-// BatchTableRequest_Operation
-
-// .io.deephaven.proto.backplane.grpc.EmptyTableRequest empty_table = 1;
-inline bool BatchTableRequest_Operation::has_empty_table() const {
-  return op_case() == kEmptyTable;
-}
-inline bool BatchTableRequest_Operation::_internal_has_empty_table() const {
-  return op_case() == kEmptyTable;
-}
-inline void BatchTableRequest_Operation::set_has_empty_table() {
-  _impl_._oneof_case_[0] = kEmptyTable;
-}
-inline void BatchTableRequest_Operation::clear_empty_table() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  if (op_case() == kEmptyTable) {
-    if (GetArena() == nullptr) {
-      delete _impl_.op_.empty_table_;
-    }
-    clear_has_op();
-  }
-}
-inline ::io::deephaven::proto::backplane::grpc::EmptyTableRequest* BatchTableRequest_Operation::release_empty_table() {
-  // @@protoc_insertion_point(field_release:io.deephaven.proto.backplane.grpc.BatchTableRequest.Operation.empty_table)
-  if (op_case() == kEmptyTable) {
-    clear_has_op();
-    auto* temp = _impl_.op_.empty_table_;
-    if (GetArena() != nullptr) {
-      temp = ::google::protobuf::internal::DuplicateIfNonNull(temp);
-    }
-    _impl_.op_.empty_table_ = nullptr;
-    return temp;
-  } else {
-    return nullptr;
-  }
-}
-inline const ::io::deephaven::proto::backplane::grpc::EmptyTableRequest& BatchTableRequest_Operation::_internal_empty_table() const {
-  return op_case() == kEmptyTable ? *_impl_.op_.empty_table_ : reinterpret_cast<::io::deephaven::proto::backplane::grpc::EmptyTableRequest&>(::io::deephaven::proto::backplane::grpc::_EmptyTableRequest_default_instance_);
-}
-inline const ::io::deephaven::proto::backplane::grpc::EmptyTableRequest& BatchTableRequest_Operation::empty_table() const ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  // @@protoc_insertion_point(field_get:io.deephaven.proto.backplane.grpc.BatchTableRequest.Operation.empty_table)
-  return _internal_empty_table();
-}
-inline ::io::deephaven::proto::backplane::grpc::EmptyTableRequest* BatchTableRequest_Operation::unsafe_arena_release_empty_table() {
-  // @@protoc_insertion_point(field_unsafe_arena_release:io.deephaven.proto.backplane.grpc.BatchTableRequest.Operation.empty_table)
-  if (op_case() == kEmptyTable) {
-    clear_has_op();
-    auto* temp = _impl_.op_.empty_table_;
-    _impl_.op_.empty_table_ = nullptr;
-    return temp;
-  } else {
-    return nullptr;
-  }
-}
-inline void BatchTableRequest_Operation::unsafe_arena_set_allocated_empty_table(::io::deephaven::proto::backplane::grpc::EmptyTableRequest* value) {
-  // We rely on the oneof clear method to free the earlier contents
-  // of this oneof. We can directly use the pointer we're given to
-  // set the new value.
-  clear_op();
-  if (value) {
-    set_has_empty_table();
-    _impl_.op_.empty_table_ = value;
-  }
-  // @@protoc_insertion_point(field_unsafe_arena_set_allocated:io.deephaven.proto.backplane.grpc.BatchTableRequest.Operation.empty_table)
-}
-inline ::io::deephaven::proto::backplane::grpc::EmptyTableRequest* BatchTableRequest_Operation::_internal_mutable_empty_table() {
-  if (op_case() != kEmptyTable) {
-    clear_op();
-    set_has_empty_table();
-    _impl_.op_.empty_table_ = CreateMaybeMessage<::io::deephaven::proto::backplane::grpc::EmptyTableRequest>(GetArena());
-  }
-  return _impl_.op_.empty_table_;
-}
-inline ::io::deephaven::proto::backplane::grpc::EmptyTableRequest* BatchTableRequest_Operation::mutable_empty_table() ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  ::io::deephaven::proto::backplane::grpc::EmptyTableRequest* _msg = _internal_mutable_empty_table();
-  // @@protoc_insertion_point(field_mutable:io.deephaven.proto.backplane.grpc.BatchTableRequest.Operation.empty_table)
-  return _msg;
-}
-
-// .io.deephaven.proto.backplane.grpc.TimeTableRequest time_table = 2;
-inline bool BatchTableRequest_Operation::has_time_table() const {
-  return op_case() == kTimeTable;
-}
-inline bool BatchTableRequest_Operation::_internal_has_time_table() const {
-  return op_case() == kTimeTable;
-}
-inline void BatchTableRequest_Operation::set_has_time_table() {
-  _impl_._oneof_case_[0] = kTimeTable;
-}
-inline void BatchTableRequest_Operation::clear_time_table() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  if (op_case() == kTimeTable) {
-    if (GetArena() == nullptr) {
-      delete _impl_.op_.time_table_;
-    }
-    clear_has_op();
-  }
-}
-inline ::io::deephaven::proto::backplane::grpc::TimeTableRequest* BatchTableRequest_Operation::release_time_table() {
-  // @@protoc_insertion_point(field_release:io.deephaven.proto.backplane.grpc.BatchTableRequest.Operation.time_table)
-  if (op_case() == kTimeTable) {
-    clear_has_op();
-    auto* temp = _impl_.op_.time_table_;
-    if (GetArena() != nullptr) {
-      temp = ::google::protobuf::internal::DuplicateIfNonNull(temp);
-    }
-    _impl_.op_.time_table_ = nullptr;
-    return temp;
-  } else {
-    return nullptr;
-  }
-}
-inline const ::io::deephaven::proto::backplane::grpc::TimeTableRequest& BatchTableRequest_Operation::_internal_time_table() const {
-  return op_case() == kTimeTable ? *_impl_.op_.time_table_ : reinterpret_cast<::io::deephaven::proto::backplane::grpc::TimeTableRequest&>(::io::deephaven::proto::backplane::grpc::_TimeTableRequest_default_instance_);
-}
-inline const ::io::deephaven::proto::backplane::grpc::TimeTableRequest& BatchTableRequest_Operation::time_table() const ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  // @@protoc_insertion_point(field_get:io.deephaven.proto.backplane.grpc.BatchTableRequest.Operation.time_table)
-  return _internal_time_table();
-}
-inline ::io::deephaven::proto::backplane::grpc::TimeTableRequest* BatchTableRequest_Operation::unsafe_arena_release_time_table() {
-  // @@protoc_insertion_point(field_unsafe_arena_release:io.deephaven.proto.backplane.grpc.BatchTableRequest.Operation.time_table)
-  if (op_case() == kTimeTable) {
-    clear_has_op();
-    auto* temp = _impl_.op_.time_table_;
-    _impl_.op_.time_table_ = nullptr;
-    return temp;
-  } else {
-    return nullptr;
-  }
-}
-inline void BatchTableRequest_Operation::unsafe_arena_set_allocated_time_table(::io::deephaven::proto::backplane::grpc::TimeTableRequest* value) {
-  // We rely on the oneof clear method to free the earlier contents
-  // of this oneof. We can directly use the pointer we're given to
-  // set the new value.
-  clear_op();
-  if (value) {
-    set_has_time_table();
-    _impl_.op_.time_table_ = value;
-  }
-  // @@protoc_insertion_point(field_unsafe_arena_set_allocated:io.deephaven.proto.backplane.grpc.BatchTableRequest.Operation.time_table)
-}
-inline ::io::deephaven::proto::backplane::grpc::TimeTableRequest* BatchTableRequest_Operation::_internal_mutable_time_table() {
-  if (op_case() != kTimeTable) {
-    clear_op();
-    set_has_time_table();
-    _impl_.op_.time_table_ = CreateMaybeMessage<::io::deephaven::proto::backplane::grpc::TimeTableRequest>(GetArena());
-  }
-  return _impl_.op_.time_table_;
-}
-inline ::io::deephaven::proto::backplane::grpc::TimeTableRequest* BatchTableRequest_Operation::mutable_time_table() ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  ::io::deephaven::proto::backplane::grpc::TimeTableRequest* _msg = _internal_mutable_time_table();
-  // @@protoc_insertion_point(field_mutable:io.deephaven.proto.backplane.grpc.BatchTableRequest.Operation.time_table)
-  return _msg;
-}
-
-// .io.deephaven.proto.backplane.grpc.DropColumnsRequest drop_columns = 3;
-inline bool BatchTableRequest_Operation::has_drop_columns() const {
-  return op_case() == kDropColumns;
-}
-inline bool BatchTableRequest_Operation::_internal_has_drop_columns() const {
-  return op_case() == kDropColumns;
-}
-inline void BatchTableRequest_Operation::set_has_drop_columns() {
-  _impl_._oneof_case_[0] = kDropColumns;
-}
-inline void BatchTableRequest_Operation::clear_drop_columns() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  if (op_case() == kDropColumns) {
-    if (GetArena() == nullptr) {
-      delete _impl_.op_.drop_columns_;
-    }
-    clear_has_op();
-  }
-}
-inline ::io::deephaven::proto::backplane::grpc::DropColumnsRequest* BatchTableRequest_Operation::release_drop_columns() {
-  // @@protoc_insertion_point(field_release:io.deephaven.proto.backplane.grpc.BatchTableRequest.Operation.drop_columns)
-  if (op_case() == kDropColumns) {
-    clear_has_op();
-    auto* temp = _impl_.op_.drop_columns_;
-    if (GetArena() != nullptr) {
-      temp = ::google::protobuf::internal::DuplicateIfNonNull(temp);
-    }
-    _impl_.op_.drop_columns_ = nullptr;
-    return temp;
-  } else {
-    return nullptr;
-  }
-}
-inline const ::io::deephaven::proto::backplane::grpc::DropColumnsRequest& BatchTableRequest_Operation::_internal_drop_columns() const {
-  return op_case() == kDropColumns ? *_impl_.op_.drop_columns_ : reinterpret_cast<::io::deephaven::proto::backplane::grpc::DropColumnsRequest&>(::io::deephaven::proto::backplane::grpc::_DropColumnsRequest_default_instance_);
-}
-inline const ::io::deephaven::proto::backplane::grpc::DropColumnsRequest& BatchTableRequest_Operation::drop_columns() const ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  // @@protoc_insertion_point(field_get:io.deephaven.proto.backplane.grpc.BatchTableRequest.Operation.drop_columns)
-  return _internal_drop_columns();
-}
-inline ::io::deephaven::proto::backplane::grpc::DropColumnsRequest* BatchTableRequest_Operation::unsafe_arena_release_drop_columns() {
-  // @@protoc_insertion_point(field_unsafe_arena_release:io.deephaven.proto.backplane.grpc.BatchTableRequest.Operation.drop_columns)
-  if (op_case() == kDropColumns) {
-    clear_has_op();
-    auto* temp = _impl_.op_.drop_columns_;
-    _impl_.op_.drop_columns_ = nullptr;
-    return temp;
-  } else {
-    return nullptr;
-  }
-}
-inline void BatchTableRequest_Operation::unsafe_arena_set_allocated_drop_columns(::io::deephaven::proto::backplane::grpc::DropColumnsRequest* value) {
-  // We rely on the oneof clear method to free the earlier contents
-  // of this oneof. We can directly use the pointer we're given to
-  // set the new value.
-  clear_op();
-  if (value) {
-    set_has_drop_columns();
-    _impl_.op_.drop_columns_ = value;
-  }
-  // @@protoc_insertion_point(field_unsafe_arena_set_allocated:io.deephaven.proto.backplane.grpc.BatchTableRequest.Operation.drop_columns)
-}
-inline ::io::deephaven::proto::backplane::grpc::DropColumnsRequest* BatchTableRequest_Operation::_internal_mutable_drop_columns() {
-  if (op_case() != kDropColumns) {
-    clear_op();
-    set_has_drop_columns();
-    _impl_.op_.drop_columns_ = CreateMaybeMessage<::io::deephaven::proto::backplane::grpc::DropColumnsRequest>(GetArena());
-  }
-  return _impl_.op_.drop_columns_;
-}
-inline ::io::deephaven::proto::backplane::grpc::DropColumnsRequest* BatchTableRequest_Operation::mutable_drop_columns() ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  ::io::deephaven::proto::backplane::grpc::DropColumnsRequest* _msg = _internal_mutable_drop_columns();
-  // @@protoc_insertion_point(field_mutable:io.deephaven.proto.backplane.grpc.BatchTableRequest.Operation.drop_columns)
-  return _msg;
-}
-
-// .io.deephaven.proto.backplane.grpc.SelectOrUpdateRequest update = 4;
-inline bool BatchTableRequest_Operation::has_update() const {
-  return op_case() == kUpdate;
-}
-inline bool BatchTableRequest_Operation::_internal_has_update() const {
-  return op_case() == kUpdate;
-}
-inline void BatchTableRequest_Operation::set_has_update() {
-  _impl_._oneof_case_[0] = kUpdate;
-}
-inline void BatchTableRequest_Operation::clear_update() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  if (op_case() == kUpdate) {
-    if (GetArena() == nullptr) {
-      delete _impl_.op_.update_;
-    }
-    clear_has_op();
-  }
-}
-inline ::io::deephaven::proto::backplane::grpc::SelectOrUpdateRequest* BatchTableRequest_Operation::release_update() {
-  // @@protoc_insertion_point(field_release:io.deephaven.proto.backplane.grpc.BatchTableRequest.Operation.update)
-  if (op_case() == kUpdate) {
-    clear_has_op();
-    auto* temp = _impl_.op_.update_;
-    if (GetArena() != nullptr) {
-      temp = ::google::protobuf::internal::DuplicateIfNonNull(temp);
-    }
-    _impl_.op_.update_ = nullptr;
-    return temp;
-  } else {
-    return nullptr;
-  }
-}
-inline const ::io::deephaven::proto::backplane::grpc::SelectOrUpdateRequest& BatchTableRequest_Operation::_internal_update() const {
-  return op_case() == kUpdate ? *_impl_.op_.update_ : reinterpret_cast<::io::deephaven::proto::backplane::grpc::SelectOrUpdateRequest&>(::io::deephaven::proto::backplane::grpc::_SelectOrUpdateRequest_default_instance_);
-}
-inline const ::io::deephaven::proto::backplane::grpc::SelectOrUpdateRequest& BatchTableRequest_Operation::update() const ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  // @@protoc_insertion_point(field_get:io.deephaven.proto.backplane.grpc.BatchTableRequest.Operation.update)
-  return _internal_update();
-}
-inline ::io::deephaven::proto::backplane::grpc::SelectOrUpdateRequest* BatchTableRequest_Operation::unsafe_arena_release_update() {
-  // @@protoc_insertion_point(field_unsafe_arena_release:io.deephaven.proto.backplane.grpc.BatchTableRequest.Operation.update)
-  if (op_case() == kUpdate) {
-    clear_has_op();
-    auto* temp = _impl_.op_.update_;
-    _impl_.op_.update_ = nullptr;
-    return temp;
-  } else {
-    return nullptr;
-  }
-}
-inline void BatchTableRequest_Operation::unsafe_arena_set_allocated_update(::io::deephaven::proto::backplane::grpc::SelectOrUpdateRequest* value) {
-  // We rely on the oneof clear method to free the earlier contents
-  // of this oneof. We can directly use the pointer we're given to
-  // set the new value.
-  clear_op();
-  if (value) {
-    set_has_update();
-    _impl_.op_.update_ = value;
-  }
-  // @@protoc_insertion_point(field_unsafe_arena_set_allocated:io.deephaven.proto.backplane.grpc.BatchTableRequest.Operation.update)
-}
-inline ::io::deephaven::proto::backplane::grpc::SelectOrUpdateRequest* BatchTableRequest_Operation::_internal_mutable_update() {
-  if (op_case() != kUpdate) {
-    clear_op();
-    set_has_update();
-    _impl_.op_.update_ = CreateMaybeMessage<::io::deephaven::proto::backplane::grpc::SelectOrUpdateRequest>(GetArena());
-  }
-  return _impl_.op_.update_;
-}
-inline ::io::deephaven::proto::backplane::grpc::SelectOrUpdateRequest* BatchTableRequest_Operation::mutable_update() ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  ::io::deephaven::proto::backplane::grpc::SelectOrUpdateRequest* _msg = _internal_mutable_update();
-  // @@protoc_insertion_point(field_mutable:io.deephaven.proto.backplane.grpc.BatchTableRequest.Operation.update)
-  return _msg;
-}
-
-// .io.deephaven.proto.backplane.grpc.SelectOrUpdateRequest lazy_update = 5;
-inline bool BatchTableRequest_Operation::has_lazy_update() const {
-  return op_case() == kLazyUpdate;
-}
-inline bool BatchTableRequest_Operation::_internal_has_lazy_update() const {
-  return op_case() == kLazyUpdate;
-}
-inline void BatchTableRequest_Operation::set_has_lazy_update() {
-  _impl_._oneof_case_[0] = kLazyUpdate;
-}
-inline void BatchTableRequest_Operation::clear_lazy_update() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  if (op_case() == kLazyUpdate) {
-    if (GetArena() == nullptr) {
-      delete _impl_.op_.lazy_update_;
-    }
-    clear_has_op();
-  }
-}
-inline ::io::deephaven::proto::backplane::grpc::SelectOrUpdateRequest* BatchTableRequest_Operation::release_lazy_update() {
-  // @@protoc_insertion_point(field_release:io.deephaven.proto.backplane.grpc.BatchTableRequest.Operation.lazy_update)
-  if (op_case() == kLazyUpdate) {
-    clear_has_op();
-    auto* temp = _impl_.op_.lazy_update_;
-    if (GetArena() != nullptr) {
-      temp = ::google::protobuf::internal::DuplicateIfNonNull(temp);
-    }
-    _impl_.op_.lazy_update_ = nullptr;
-    return temp;
-  } else {
-    return nullptr;
-  }
-}
-inline const ::io::deephaven::proto::backplane::grpc::SelectOrUpdateRequest& BatchTableRequest_Operation::_internal_lazy_update() const {
-  return op_case() == kLazyUpdate ? *_impl_.op_.lazy_update_ : reinterpret_cast<::io::deephaven::proto::backplane::grpc::SelectOrUpdateRequest&>(::io::deephaven::proto::backplane::grpc::_SelectOrUpdateRequest_default_instance_);
-}
-inline const ::io::deephaven::proto::backplane::grpc::SelectOrUpdateRequest& BatchTableRequest_Operation::lazy_update() const ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  // @@protoc_insertion_point(field_get:io.deephaven.proto.backplane.grpc.BatchTableRequest.Operation.lazy_update)
-  return _internal_lazy_update();
-}
-inline ::io::deephaven::proto::backplane::grpc::SelectOrUpdateRequest* BatchTableRequest_Operation::unsafe_arena_release_lazy_update() {
-  // @@protoc_insertion_point(field_unsafe_arena_release:io.deephaven.proto.backplane.grpc.BatchTableRequest.Operation.lazy_update)
-  if (op_case() == kLazyUpdate) {
-    clear_has_op();
-    auto* temp = _impl_.op_.lazy_update_;
-    _impl_.op_.lazy_update_ = nullptr;
-    return temp;
-  } else {
-    return nullptr;
-  }
-}
-inline void BatchTableRequest_Operation::unsafe_arena_set_allocated_lazy_update(::io::deephaven::proto::backplane::grpc::SelectOrUpdateRequest* value) {
-  // We rely on the oneof clear method to free the earlier contents
-  // of this oneof. We can directly use the pointer we're given to
-  // set the new value.
-  clear_op();
-  if (value) {
-    set_has_lazy_update();
-    _impl_.op_.lazy_update_ = value;
-  }
-  // @@protoc_insertion_point(field_unsafe_arena_set_allocated:io.deephaven.proto.backplane.grpc.BatchTableRequest.Operation.lazy_update)
-}
-inline ::io::deephaven::proto::backplane::grpc::SelectOrUpdateRequest* BatchTableRequest_Operation::_internal_mutable_lazy_update() {
-  if (op_case() != kLazyUpdate) {
-    clear_op();
-    set_has_lazy_update();
-    _impl_.op_.lazy_update_ = CreateMaybeMessage<::io::deephaven::proto::backplane::grpc::SelectOrUpdateRequest>(GetArena());
-  }
-  return _impl_.op_.lazy_update_;
-}
-inline ::io::deephaven::proto::backplane::grpc::SelectOrUpdateRequest* BatchTableRequest_Operation::mutable_lazy_update() ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  ::io::deephaven::proto::backplane::grpc::SelectOrUpdateRequest* _msg = _internal_mutable_lazy_update();
-  // @@protoc_insertion_point(field_mutable:io.deephaven.proto.backplane.grpc.BatchTableRequest.Operation.lazy_update)
-  return _msg;
-}
-
-// .io.deephaven.proto.backplane.grpc.SelectOrUpdateRequest view = 6;
-inline bool BatchTableRequest_Operation::has_view() const {
-  return op_case() == kView;
-}
-inline bool BatchTableRequest_Operation::_internal_has_view() const {
-  return op_case() == kView;
-}
-inline void BatchTableRequest_Operation::set_has_view() {
-  _impl_._oneof_case_[0] = kView;
-}
-inline void BatchTableRequest_Operation::clear_view() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  if (op_case() == kView) {
-    if (GetArena() == nullptr) {
-      delete _impl_.op_.view_;
-    }
-    clear_has_op();
-  }
-}
-inline ::io::deephaven::proto::backplane::grpc::SelectOrUpdateRequest* BatchTableRequest_Operation::release_view() {
-  // @@protoc_insertion_point(field_release:io.deephaven.proto.backplane.grpc.BatchTableRequest.Operation.view)
-  if (op_case() == kView) {
-    clear_has_op();
-    auto* temp = _impl_.op_.view_;
-    if (GetArena() != nullptr) {
-      temp = ::google::protobuf::internal::DuplicateIfNonNull(temp);
-    }
-    _impl_.op_.view_ = nullptr;
-    return temp;
-  } else {
-    return nullptr;
-  }
-}
-inline const ::io::deephaven::proto::backplane::grpc::SelectOrUpdateRequest& BatchTableRequest_Operation::_internal_view() const {
-  return op_case() == kView ? *_impl_.op_.view_ : reinterpret_cast<::io::deephaven::proto::backplane::grpc::SelectOrUpdateRequest&>(::io::deephaven::proto::backplane::grpc::_SelectOrUpdateRequest_default_instance_);
-}
-inline const ::io::deephaven::proto::backplane::grpc::SelectOrUpdateRequest& BatchTableRequest_Operation::view() const ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  // @@protoc_insertion_point(field_get:io.deephaven.proto.backplane.grpc.BatchTableRequest.Operation.view)
-  return _internal_view();
-}
-inline ::io::deephaven::proto::backplane::grpc::SelectOrUpdateRequest* BatchTableRequest_Operation::unsafe_arena_release_view() {
-  // @@protoc_insertion_point(field_unsafe_arena_release:io.deephaven.proto.backplane.grpc.BatchTableRequest.Operation.view)
-  if (op_case() == kView) {
-    clear_has_op();
-    auto* temp = _impl_.op_.view_;
-    _impl_.op_.view_ = nullptr;
-    return temp;
-  } else {
-    return nullptr;
-  }
-}
-inline void BatchTableRequest_Operation::unsafe_arena_set_allocated_view(::io::deephaven::proto::backplane::grpc::SelectOrUpdateRequest* value) {
-  // We rely on the oneof clear method to free the earlier contents
-  // of this oneof. We can directly use the pointer we're given to
-  // set the new value.
-  clear_op();
-  if (value) {
-    set_has_view();
-    _impl_.op_.view_ = value;
-  }
-  // @@protoc_insertion_point(field_unsafe_arena_set_allocated:io.deephaven.proto.backplane.grpc.BatchTableRequest.Operation.view)
-}
-inline ::io::deephaven::proto::backplane::grpc::SelectOrUpdateRequest* BatchTableRequest_Operation::_internal_mutable_view() {
-  if (op_case() != kView) {
-    clear_op();
-    set_has_view();
-    _impl_.op_.view_ = CreateMaybeMessage<::io::deephaven::proto::backplane::grpc::SelectOrUpdateRequest>(GetArena());
-  }
-  return _impl_.op_.view_;
-}
-inline ::io::deephaven::proto::backplane::grpc::SelectOrUpdateRequest* BatchTableRequest_Operation::mutable_view() ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  ::io::deephaven::proto::backplane::grpc::SelectOrUpdateRequest* _msg = _internal_mutable_view();
-  // @@protoc_insertion_point(field_mutable:io.deephaven.proto.backplane.grpc.BatchTableRequest.Operation.view)
-  return _msg;
-}
-
-// .io.deephaven.proto.backplane.grpc.SelectOrUpdateRequest update_view = 7;
-inline bool BatchTableRequest_Operation::has_update_view() const {
-  return op_case() == kUpdateView;
-}
-inline bool BatchTableRequest_Operation::_internal_has_update_view() const {
-  return op_case() == kUpdateView;
-}
-inline void BatchTableRequest_Operation::set_has_update_view() {
-  _impl_._oneof_case_[0] = kUpdateView;
-}
-inline void BatchTableRequest_Operation::clear_update_view() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  if (op_case() == kUpdateView) {
-    if (GetArena() == nullptr) {
-      delete _impl_.op_.update_view_;
-    }
-    clear_has_op();
-  }
-}
-inline ::io::deephaven::proto::backplane::grpc::SelectOrUpdateRequest* BatchTableRequest_Operation::release_update_view() {
-  // @@protoc_insertion_point(field_release:io.deephaven.proto.backplane.grpc.BatchTableRequest.Operation.update_view)
-  if (op_case() == kUpdateView) {
-    clear_has_op();
-    auto* temp = _impl_.op_.update_view_;
-    if (GetArena() != nullptr) {
-      temp = ::google::protobuf::internal::DuplicateIfNonNull(temp);
-    }
-    _impl_.op_.update_view_ = nullptr;
-    return temp;
-  } else {
-    return nullptr;
-  }
-}
-inline const ::io::deephaven::proto::backplane::grpc::SelectOrUpdateRequest& BatchTableRequest_Operation::_internal_update_view() const {
-  return op_case() == kUpdateView ? *_impl_.op_.update_view_ : reinterpret_cast<::io::deephaven::proto::backplane::grpc::SelectOrUpdateRequest&>(::io::deephaven::proto::backplane::grpc::_SelectOrUpdateRequest_default_instance_);
-}
-inline const ::io::deephaven::proto::backplane::grpc::SelectOrUpdateRequest& BatchTableRequest_Operation::update_view() const ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  // @@protoc_insertion_point(field_get:io.deephaven.proto.backplane.grpc.BatchTableRequest.Operation.update_view)
-  return _internal_update_view();
-}
-inline ::io::deephaven::proto::backplane::grpc::SelectOrUpdateRequest* BatchTableRequest_Operation::unsafe_arena_release_update_view() {
-  // @@protoc_insertion_point(field_unsafe_arena_release:io.deephaven.proto.backplane.grpc.BatchTableRequest.Operation.update_view)
-  if (op_case() == kUpdateView) {
-    clear_has_op();
-    auto* temp = _impl_.op_.update_view_;
-    _impl_.op_.update_view_ = nullptr;
-    return temp;
-  } else {
-    return nullptr;
-  }
-}
-inline void BatchTableRequest_Operation::unsafe_arena_set_allocated_update_view(::io::deephaven::proto::backplane::grpc::SelectOrUpdateRequest* value) {
-  // We rely on the oneof clear method to free the earlier contents
-  // of this oneof. We can directly use the pointer we're given to
-  // set the new value.
-  clear_op();
-  if (value) {
-    set_has_update_view();
-    _impl_.op_.update_view_ = value;
-  }
-  // @@protoc_insertion_point(field_unsafe_arena_set_allocated:io.deephaven.proto.backplane.grpc.BatchTableRequest.Operation.update_view)
-}
-inline ::io::deephaven::proto::backplane::grpc::SelectOrUpdateRequest* BatchTableRequest_Operation::_internal_mutable_update_view() {
-  if (op_case() != kUpdateView) {
-    clear_op();
-    set_has_update_view();
-    _impl_.op_.update_view_ = CreateMaybeMessage<::io::deephaven::proto::backplane::grpc::SelectOrUpdateRequest>(GetArena());
-  }
-  return _impl_.op_.update_view_;
-}
-inline ::io::deephaven::proto::backplane::grpc::SelectOrUpdateRequest* BatchTableRequest_Operation::mutable_update_view() ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  ::io::deephaven::proto::backplane::grpc::SelectOrUpdateRequest* _msg = _internal_mutable_update_view();
-  // @@protoc_insertion_point(field_mutable:io.deephaven.proto.backplane.grpc.BatchTableRequest.Operation.update_view)
-  return _msg;
-}
-
-// .io.deephaven.proto.backplane.grpc.SelectOrUpdateRequest select = 8;
-inline bool BatchTableRequest_Operation::has_select() const {
-  return op_case() == kSelect;
-}
-inline bool BatchTableRequest_Operation::_internal_has_select() const {
-  return op_case() == kSelect;
-}
-inline void BatchTableRequest_Operation::set_has_select() {
-  _impl_._oneof_case_[0] = kSelect;
-}
-inline void BatchTableRequest_Operation::clear_select() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  if (op_case() == kSelect) {
-    if (GetArena() == nullptr) {
-      delete _impl_.op_.select_;
-    }
-    clear_has_op();
-  }
-}
-inline ::io::deephaven::proto::backplane::grpc::SelectOrUpdateRequest* BatchTableRequest_Operation::release_select() {
-  // @@protoc_insertion_point(field_release:io.deephaven.proto.backplane.grpc.BatchTableRequest.Operation.select)
-  if (op_case() == kSelect) {
-    clear_has_op();
-    auto* temp = _impl_.op_.select_;
-    if (GetArena() != nullptr) {
-      temp = ::google::protobuf::internal::DuplicateIfNonNull(temp);
-    }
-    _impl_.op_.select_ = nullptr;
-    return temp;
-  } else {
-    return nullptr;
-  }
-}
-inline const ::io::deephaven::proto::backplane::grpc::SelectOrUpdateRequest& BatchTableRequest_Operation::_internal_select() const {
-  return op_case() == kSelect ? *_impl_.op_.select_ : reinterpret_cast<::io::deephaven::proto::backplane::grpc::SelectOrUpdateRequest&>(::io::deephaven::proto::backplane::grpc::_SelectOrUpdateRequest_default_instance_);
-}
-inline const ::io::deephaven::proto::backplane::grpc::SelectOrUpdateRequest& BatchTableRequest_Operation::select() const ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  // @@protoc_insertion_point(field_get:io.deephaven.proto.backplane.grpc.BatchTableRequest.Operation.select)
-  return _internal_select();
-}
-inline ::io::deephaven::proto::backplane::grpc::SelectOrUpdateRequest* BatchTableRequest_Operation::unsafe_arena_release_select() {
-  // @@protoc_insertion_point(field_unsafe_arena_release:io.deephaven.proto.backplane.grpc.BatchTableRequest.Operation.select)
-  if (op_case() == kSelect) {
-    clear_has_op();
-    auto* temp = _impl_.op_.select_;
-    _impl_.op_.select_ = nullptr;
-    return temp;
-  } else {
-    return nullptr;
-  }
-}
-inline void BatchTableRequest_Operation::unsafe_arena_set_allocated_select(::io::deephaven::proto::backplane::grpc::SelectOrUpdateRequest* value) {
-  // We rely on the oneof clear method to free the earlier contents
-  // of this oneof. We can directly use the pointer we're given to
-  // set the new value.
-  clear_op();
-  if (value) {
-    set_has_select();
-    _impl_.op_.select_ = value;
-  }
-  // @@protoc_insertion_point(field_unsafe_arena_set_allocated:io.deephaven.proto.backplane.grpc.BatchTableRequest.Operation.select)
-}
-inline ::io::deephaven::proto::backplane::grpc::SelectOrUpdateRequest* BatchTableRequest_Operation::_internal_mutable_select() {
-  if (op_case() != kSelect) {
-    clear_op();
-    set_has_select();
-    _impl_.op_.select_ = CreateMaybeMessage<::io::deephaven::proto::backplane::grpc::SelectOrUpdateRequest>(GetArena());
-  }
-  return _impl_.op_.select_;
-}
-inline ::io::deephaven::proto::backplane::grpc::SelectOrUpdateRequest* BatchTableRequest_Operation::mutable_select() ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  ::io::deephaven::proto::backplane::grpc::SelectOrUpdateRequest* _msg = _internal_mutable_select();
-  // @@protoc_insertion_point(field_mutable:io.deephaven.proto.backplane.grpc.BatchTableRequest.Operation.select)
-  return _msg;
-}
-
-// .io.deephaven.proto.backplane.grpc.SelectDistinctRequest select_distinct = 9;
-inline bool BatchTableRequest_Operation::has_select_distinct() const {
-  return op_case() == kSelectDistinct;
-}
-inline bool BatchTableRequest_Operation::_internal_has_select_distinct() const {
-  return op_case() == kSelectDistinct;
-}
-inline void BatchTableRequest_Operation::set_has_select_distinct() {
-  _impl_._oneof_case_[0] = kSelectDistinct;
-}
-inline void BatchTableRequest_Operation::clear_select_distinct() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  if (op_case() == kSelectDistinct) {
-    if (GetArena() == nullptr) {
-      delete _impl_.op_.select_distinct_;
-    }
-    clear_has_op();
-  }
-}
-inline ::io::deephaven::proto::backplane::grpc::SelectDistinctRequest* BatchTableRequest_Operation::release_select_distinct() {
-  // @@protoc_insertion_point(field_release:io.deephaven.proto.backplane.grpc.BatchTableRequest.Operation.select_distinct)
-  if (op_case() == kSelectDistinct) {
-    clear_has_op();
-    auto* temp = _impl_.op_.select_distinct_;
-    if (GetArena() != nullptr) {
-      temp = ::google::protobuf::internal::DuplicateIfNonNull(temp);
-    }
-    _impl_.op_.select_distinct_ = nullptr;
-    return temp;
-  } else {
-    return nullptr;
-  }
-}
-inline const ::io::deephaven::proto::backplane::grpc::SelectDistinctRequest& BatchTableRequest_Operation::_internal_select_distinct() const {
-  return op_case() == kSelectDistinct ? *_impl_.op_.select_distinct_ : reinterpret_cast<::io::deephaven::proto::backplane::grpc::SelectDistinctRequest&>(::io::deephaven::proto::backplane::grpc::_SelectDistinctRequest_default_instance_);
-}
-inline const ::io::deephaven::proto::backplane::grpc::SelectDistinctRequest& BatchTableRequest_Operation::select_distinct() const ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  // @@protoc_insertion_point(field_get:io.deephaven.proto.backplane.grpc.BatchTableRequest.Operation.select_distinct)
-  return _internal_select_distinct();
-}
-inline ::io::deephaven::proto::backplane::grpc::SelectDistinctRequest* BatchTableRequest_Operation::unsafe_arena_release_select_distinct() {
-  // @@protoc_insertion_point(field_unsafe_arena_release:io.deephaven.proto.backplane.grpc.BatchTableRequest.Operation.select_distinct)
-  if (op_case() == kSelectDistinct) {
-    clear_has_op();
-    auto* temp = _impl_.op_.select_distinct_;
-    _impl_.op_.select_distinct_ = nullptr;
-    return temp;
-  } else {
-    return nullptr;
-  }
-}
-inline void BatchTableRequest_Operation::unsafe_arena_set_allocated_select_distinct(::io::deephaven::proto::backplane::grpc::SelectDistinctRequest* value) {
-  // We rely on the oneof clear method to free the earlier contents
-  // of this oneof. We can directly use the pointer we're given to
-  // set the new value.
-  clear_op();
-  if (value) {
-    set_has_select_distinct();
-    _impl_.op_.select_distinct_ = value;
-  }
-  // @@protoc_insertion_point(field_unsafe_arena_set_allocated:io.deephaven.proto.backplane.grpc.BatchTableRequest.Operation.select_distinct)
-}
-inline ::io::deephaven::proto::backplane::grpc::SelectDistinctRequest* BatchTableRequest_Operation::_internal_mutable_select_distinct() {
-  if (op_case() != kSelectDistinct) {
-    clear_op();
-    set_has_select_distinct();
-    _impl_.op_.select_distinct_ = CreateMaybeMessage<::io::deephaven::proto::backplane::grpc::SelectDistinctRequest>(GetArena());
-  }
-  return _impl_.op_.select_distinct_;
-}
-inline ::io::deephaven::proto::backplane::grpc::SelectDistinctRequest* BatchTableRequest_Operation::mutable_select_distinct() ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  ::io::deephaven::proto::backplane::grpc::SelectDistinctRequest* _msg = _internal_mutable_select_distinct();
-  // @@protoc_insertion_point(field_mutable:io.deephaven.proto.backplane.grpc.BatchTableRequest.Operation.select_distinct)
-  return _msg;
-}
-
-// .io.deephaven.proto.backplane.grpc.FilterTableRequest filter = 10;
-inline bool BatchTableRequest_Operation::has_filter() const {
-  return op_case() == kFilter;
-}
-inline bool BatchTableRequest_Operation::_internal_has_filter() const {
-  return op_case() == kFilter;
-}
-inline void BatchTableRequest_Operation::set_has_filter() {
-  _impl_._oneof_case_[0] = kFilter;
-}
-inline void BatchTableRequest_Operation::clear_filter() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  if (op_case() == kFilter) {
-    if (GetArena() == nullptr) {
-      delete _impl_.op_.filter_;
-    }
-    clear_has_op();
-  }
-}
-inline ::io::deephaven::proto::backplane::grpc::FilterTableRequest* BatchTableRequest_Operation::release_filter() {
-  // @@protoc_insertion_point(field_release:io.deephaven.proto.backplane.grpc.BatchTableRequest.Operation.filter)
-  if (op_case() == kFilter) {
-    clear_has_op();
-    auto* temp = _impl_.op_.filter_;
-    if (GetArena() != nullptr) {
-      temp = ::google::protobuf::internal::DuplicateIfNonNull(temp);
-    }
-    _impl_.op_.filter_ = nullptr;
-    return temp;
-  } else {
-    return nullptr;
-  }
-}
-inline const ::io::deephaven::proto::backplane::grpc::FilterTableRequest& BatchTableRequest_Operation::_internal_filter() const {
-  return op_case() == kFilter ? *_impl_.op_.filter_ : reinterpret_cast<::io::deephaven::proto::backplane::grpc::FilterTableRequest&>(::io::deephaven::proto::backplane::grpc::_FilterTableRequest_default_instance_);
-}
-inline const ::io::deephaven::proto::backplane::grpc::FilterTableRequest& BatchTableRequest_Operation::filter() const ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  // @@protoc_insertion_point(field_get:io.deephaven.proto.backplane.grpc.BatchTableRequest.Operation.filter)
-  return _internal_filter();
-}
-inline ::io::deephaven::proto::backplane::grpc::FilterTableRequest* BatchTableRequest_Operation::unsafe_arena_release_filter() {
-  // @@protoc_insertion_point(field_unsafe_arena_release:io.deephaven.proto.backplane.grpc.BatchTableRequest.Operation.filter)
-  if (op_case() == kFilter) {
-    clear_has_op();
-    auto* temp = _impl_.op_.filter_;
-    _impl_.op_.filter_ = nullptr;
-    return temp;
-  } else {
-    return nullptr;
-  }
-}
-inline void BatchTableRequest_Operation::unsafe_arena_set_allocated_filter(::io::deephaven::proto::backplane::grpc::FilterTableRequest* value) {
-  // We rely on the oneof clear method to free the earlier contents
-  // of this oneof. We can directly use the pointer we're given to
-  // set the new value.
-  clear_op();
-  if (value) {
-    set_has_filter();
-    _impl_.op_.filter_ = value;
-  }
-  // @@protoc_insertion_point(field_unsafe_arena_set_allocated:io.deephaven.proto.backplane.grpc.BatchTableRequest.Operation.filter)
-}
-inline ::io::deephaven::proto::backplane::grpc::FilterTableRequest* BatchTableRequest_Operation::_internal_mutable_filter() {
-  if (op_case() != kFilter) {
-    clear_op();
-    set_has_filter();
-    _impl_.op_.filter_ = CreateMaybeMessage<::io::deephaven::proto::backplane::grpc::FilterTableRequest>(GetArena());
-  }
-  return _impl_.op_.filter_;
-}
-inline ::io::deephaven::proto::backplane::grpc::FilterTableRequest* BatchTableRequest_Operation::mutable_filter() ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  ::io::deephaven::proto::backplane::grpc::FilterTableRequest* _msg = _internal_mutable_filter();
-  // @@protoc_insertion_point(field_mutable:io.deephaven.proto.backplane.grpc.BatchTableRequest.Operation.filter)
-  return _msg;
-}
-
-// .io.deephaven.proto.backplane.grpc.UnstructuredFilterTableRequest unstructured_filter = 11;
-inline bool BatchTableRequest_Operation::has_unstructured_filter() const {
-  return op_case() == kUnstructuredFilter;
-}
-inline bool BatchTableRequest_Operation::_internal_has_unstructured_filter() const {
-  return op_case() == kUnstructuredFilter;
-}
-inline void BatchTableRequest_Operation::set_has_unstructured_filter() {
-  _impl_._oneof_case_[0] = kUnstructuredFilter;
-}
-inline void BatchTableRequest_Operation::clear_unstructured_filter() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  if (op_case() == kUnstructuredFilter) {
-    if (GetArena() == nullptr) {
-      delete _impl_.op_.unstructured_filter_;
-    }
-    clear_has_op();
-  }
-}
-inline ::io::deephaven::proto::backplane::grpc::UnstructuredFilterTableRequest* BatchTableRequest_Operation::release_unstructured_filter() {
-  // @@protoc_insertion_point(field_release:io.deephaven.proto.backplane.grpc.BatchTableRequest.Operation.unstructured_filter)
-  if (op_case() == kUnstructuredFilter) {
-    clear_has_op();
-    auto* temp = _impl_.op_.unstructured_filter_;
-    if (GetArena() != nullptr) {
-      temp = ::google::protobuf::internal::DuplicateIfNonNull(temp);
-    }
-    _impl_.op_.unstructured_filter_ = nullptr;
-    return temp;
-  } else {
-    return nullptr;
-  }
-}
-inline const ::io::deephaven::proto::backplane::grpc::UnstructuredFilterTableRequest& BatchTableRequest_Operation::_internal_unstructured_filter() const {
-  return op_case() == kUnstructuredFilter ? *_impl_.op_.unstructured_filter_ : reinterpret_cast<::io::deephaven::proto::backplane::grpc::UnstructuredFilterTableRequest&>(::io::deephaven::proto::backplane::grpc::_UnstructuredFilterTableRequest_default_instance_);
-}
-inline const ::io::deephaven::proto::backplane::grpc::UnstructuredFilterTableRequest& BatchTableRequest_Operation::unstructured_filter() const ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  // @@protoc_insertion_point(field_get:io.deephaven.proto.backplane.grpc.BatchTableRequest.Operation.unstructured_filter)
-  return _internal_unstructured_filter();
-}
-inline ::io::deephaven::proto::backplane::grpc::UnstructuredFilterTableRequest* BatchTableRequest_Operation::unsafe_arena_release_unstructured_filter() {
-  // @@protoc_insertion_point(field_unsafe_arena_release:io.deephaven.proto.backplane.grpc.BatchTableRequest.Operation.unstructured_filter)
-  if (op_case() == kUnstructuredFilter) {
-    clear_has_op();
-    auto* temp = _impl_.op_.unstructured_filter_;
-    _impl_.op_.unstructured_filter_ = nullptr;
-    return temp;
-  } else {
-    return nullptr;
-  }
-}
-inline void BatchTableRequest_Operation::unsafe_arena_set_allocated_unstructured_filter(::io::deephaven::proto::backplane::grpc::UnstructuredFilterTableRequest* value) {
-  // We rely on the oneof clear method to free the earlier contents
-  // of this oneof. We can directly use the pointer we're given to
-  // set the new value.
-  clear_op();
-  if (value) {
-    set_has_unstructured_filter();
-    _impl_.op_.unstructured_filter_ = value;
-  }
-  // @@protoc_insertion_point(field_unsafe_arena_set_allocated:io.deephaven.proto.backplane.grpc.BatchTableRequest.Operation.unstructured_filter)
-}
-inline ::io::deephaven::proto::backplane::grpc::UnstructuredFilterTableRequest* BatchTableRequest_Operation::_internal_mutable_unstructured_filter() {
-  if (op_case() != kUnstructuredFilter) {
-    clear_op();
-    set_has_unstructured_filter();
-    _impl_.op_.unstructured_filter_ = CreateMaybeMessage<::io::deephaven::proto::backplane::grpc::UnstructuredFilterTableRequest>(GetArena());
-  }
-  return _impl_.op_.unstructured_filter_;
-}
-inline ::io::deephaven::proto::backplane::grpc::UnstructuredFilterTableRequest* BatchTableRequest_Operation::mutable_unstructured_filter() ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  ::io::deephaven::proto::backplane::grpc::UnstructuredFilterTableRequest* _msg = _internal_mutable_unstructured_filter();
-  // @@protoc_insertion_point(field_mutable:io.deephaven.proto.backplane.grpc.BatchTableRequest.Operation.unstructured_filter)
-  return _msg;
-}
-
-// .io.deephaven.proto.backplane.grpc.SortTableRequest sort = 12;
-inline bool BatchTableRequest_Operation::has_sort() const {
-  return op_case() == kSort;
-}
-inline bool BatchTableRequest_Operation::_internal_has_sort() const {
-  return op_case() == kSort;
-}
-inline void BatchTableRequest_Operation::set_has_sort() {
-  _impl_._oneof_case_[0] = kSort;
-}
-inline void BatchTableRequest_Operation::clear_sort() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  if (op_case() == kSort) {
-    if (GetArena() == nullptr) {
-      delete _impl_.op_.sort_;
-    }
-    clear_has_op();
-  }
-}
-inline ::io::deephaven::proto::backplane::grpc::SortTableRequest* BatchTableRequest_Operation::release_sort() {
-  // @@protoc_insertion_point(field_release:io.deephaven.proto.backplane.grpc.BatchTableRequest.Operation.sort)
-  if (op_case() == kSort) {
-    clear_has_op();
-    auto* temp = _impl_.op_.sort_;
-    if (GetArena() != nullptr) {
-      temp = ::google::protobuf::internal::DuplicateIfNonNull(temp);
-    }
-    _impl_.op_.sort_ = nullptr;
-    return temp;
-  } else {
-    return nullptr;
-  }
-}
-inline const ::io::deephaven::proto::backplane::grpc::SortTableRequest& BatchTableRequest_Operation::_internal_sort() const {
-  return op_case() == kSort ? *_impl_.op_.sort_ : reinterpret_cast<::io::deephaven::proto::backplane::grpc::SortTableRequest&>(::io::deephaven::proto::backplane::grpc::_SortTableRequest_default_instance_);
-}
-inline const ::io::deephaven::proto::backplane::grpc::SortTableRequest& BatchTableRequest_Operation::sort() const ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  // @@protoc_insertion_point(field_get:io.deephaven.proto.backplane.grpc.BatchTableRequest.Operation.sort)
-  return _internal_sort();
-}
-inline ::io::deephaven::proto::backplane::grpc::SortTableRequest* BatchTableRequest_Operation::unsafe_arena_release_sort() {
-  // @@protoc_insertion_point(field_unsafe_arena_release:io.deephaven.proto.backplane.grpc.BatchTableRequest.Operation.sort)
-  if (op_case() == kSort) {
-    clear_has_op();
-    auto* temp = _impl_.op_.sort_;
-    _impl_.op_.sort_ = nullptr;
-    return temp;
-  } else {
-    return nullptr;
-  }
-}
-inline void BatchTableRequest_Operation::unsafe_arena_set_allocated_sort(::io::deephaven::proto::backplane::grpc::SortTableRequest* value) {
-  // We rely on the oneof clear method to free the earlier contents
-  // of this oneof. We can directly use the pointer we're given to
-  // set the new value.
-  clear_op();
-  if (value) {
-    set_has_sort();
-    _impl_.op_.sort_ = value;
-  }
-  // @@protoc_insertion_point(field_unsafe_arena_set_allocated:io.deephaven.proto.backplane.grpc.BatchTableRequest.Operation.sort)
-}
-inline ::io::deephaven::proto::backplane::grpc::SortTableRequest* BatchTableRequest_Operation::_internal_mutable_sort() {
-  if (op_case() != kSort) {
-    clear_op();
-    set_has_sort();
-    _impl_.op_.sort_ = CreateMaybeMessage<::io::deephaven::proto::backplane::grpc::SortTableRequest>(GetArena());
-  }
-  return _impl_.op_.sort_;
-}
-inline ::io::deephaven::proto::backplane::grpc::SortTableRequest* BatchTableRequest_Operation::mutable_sort() ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  ::io::deephaven::proto::backplane::grpc::SortTableRequest* _msg = _internal_mutable_sort();
-  // @@protoc_insertion_point(field_mutable:io.deephaven.proto.backplane.grpc.BatchTableRequest.Operation.sort)
-  return _msg;
-}
-
-// .io.deephaven.proto.backplane.grpc.HeadOrTailRequest head = 13;
-inline bool BatchTableRequest_Operation::has_head() const {
-  return op_case() == kHead;
-}
-inline bool BatchTableRequest_Operation::_internal_has_head() const {
-  return op_case() == kHead;
-}
-inline void BatchTableRequest_Operation::set_has_head() {
-  _impl_._oneof_case_[0] = kHead;
-}
-inline void BatchTableRequest_Operation::clear_head() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  if (op_case() == kHead) {
-    if (GetArena() == nullptr) {
-      delete _impl_.op_.head_;
-    }
-    clear_has_op();
-  }
-}
-inline ::io::deephaven::proto::backplane::grpc::HeadOrTailRequest* BatchTableRequest_Operation::release_head() {
-  // @@protoc_insertion_point(field_release:io.deephaven.proto.backplane.grpc.BatchTableRequest.Operation.head)
-  if (op_case() == kHead) {
-    clear_has_op();
-    auto* temp = _impl_.op_.head_;
-    if (GetArena() != nullptr) {
-      temp = ::google::protobuf::internal::DuplicateIfNonNull(temp);
-    }
-    _impl_.op_.head_ = nullptr;
-    return temp;
-  } else {
-    return nullptr;
-  }
-}
-inline const ::io::deephaven::proto::backplane::grpc::HeadOrTailRequest& BatchTableRequest_Operation::_internal_head() const {
-  return op_case() == kHead ? *_impl_.op_.head_ : reinterpret_cast<::io::deephaven::proto::backplane::grpc::HeadOrTailRequest&>(::io::deephaven::proto::backplane::grpc::_HeadOrTailRequest_default_instance_);
-}
-inline const ::io::deephaven::proto::backplane::grpc::HeadOrTailRequest& BatchTableRequest_Operation::head() const ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  // @@protoc_insertion_point(field_get:io.deephaven.proto.backplane.grpc.BatchTableRequest.Operation.head)
-  return _internal_head();
-}
-inline ::io::deephaven::proto::backplane::grpc::HeadOrTailRequest* BatchTableRequest_Operation::unsafe_arena_release_head() {
-  // @@protoc_insertion_point(field_unsafe_arena_release:io.deephaven.proto.backplane.grpc.BatchTableRequest.Operation.head)
-  if (op_case() == kHead) {
-    clear_has_op();
-    auto* temp = _impl_.op_.head_;
-    _impl_.op_.head_ = nullptr;
-    return temp;
-  } else {
-    return nullptr;
-  }
-}
-inline void BatchTableRequest_Operation::unsafe_arena_set_allocated_head(::io::deephaven::proto::backplane::grpc::HeadOrTailRequest* value) {
-  // We rely on the oneof clear method to free the earlier contents
-  // of this oneof. We can directly use the pointer we're given to
-  // set the new value.
-  clear_op();
-  if (value) {
-    set_has_head();
-    _impl_.op_.head_ = value;
-  }
-  // @@protoc_insertion_point(field_unsafe_arena_set_allocated:io.deephaven.proto.backplane.grpc.BatchTableRequest.Operation.head)
-}
-inline ::io::deephaven::proto::backplane::grpc::HeadOrTailRequest* BatchTableRequest_Operation::_internal_mutable_head() {
-  if (op_case() != kHead) {
-    clear_op();
-    set_has_head();
-    _impl_.op_.head_ = CreateMaybeMessage<::io::deephaven::proto::backplane::grpc::HeadOrTailRequest>(GetArena());
-  }
-  return _impl_.op_.head_;
-}
-inline ::io::deephaven::proto::backplane::grpc::HeadOrTailRequest* BatchTableRequest_Operation::mutable_head() ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  ::io::deephaven::proto::backplane::grpc::HeadOrTailRequest* _msg = _internal_mutable_head();
-  // @@protoc_insertion_point(field_mutable:io.deephaven.proto.backplane.grpc.BatchTableRequest.Operation.head)
-  return _msg;
-}
-
-// .io.deephaven.proto.backplane.grpc.HeadOrTailRequest tail = 14;
-inline bool BatchTableRequest_Operation::has_tail() const {
-  return op_case() == kTail;
-}
-inline bool BatchTableRequest_Operation::_internal_has_tail() const {
-  return op_case() == kTail;
-}
-inline void BatchTableRequest_Operation::set_has_tail() {
-  _impl_._oneof_case_[0] = kTail;
-}
-inline void BatchTableRequest_Operation::clear_tail() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  if (op_case() == kTail) {
-    if (GetArena() == nullptr) {
-      delete _impl_.op_.tail_;
-    }
-    clear_has_op();
-  }
-}
-inline ::io::deephaven::proto::backplane::grpc::HeadOrTailRequest* BatchTableRequest_Operation::release_tail() {
-  // @@protoc_insertion_point(field_release:io.deephaven.proto.backplane.grpc.BatchTableRequest.Operation.tail)
-  if (op_case() == kTail) {
-    clear_has_op();
-    auto* temp = _impl_.op_.tail_;
-    if (GetArena() != nullptr) {
-      temp = ::google::protobuf::internal::DuplicateIfNonNull(temp);
-    }
-    _impl_.op_.tail_ = nullptr;
-    return temp;
-  } else {
-    return nullptr;
-  }
-}
-inline const ::io::deephaven::proto::backplane::grpc::HeadOrTailRequest& BatchTableRequest_Operation::_internal_tail() const {
-  return op_case() == kTail ? *_impl_.op_.tail_ : reinterpret_cast<::io::deephaven::proto::backplane::grpc::HeadOrTailRequest&>(::io::deephaven::proto::backplane::grpc::_HeadOrTailRequest_default_instance_);
-}
-inline const ::io::deephaven::proto::backplane::grpc::HeadOrTailRequest& BatchTableRequest_Operation::tail() const ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  // @@protoc_insertion_point(field_get:io.deephaven.proto.backplane.grpc.BatchTableRequest.Operation.tail)
-  return _internal_tail();
-}
-inline ::io::deephaven::proto::backplane::grpc::HeadOrTailRequest* BatchTableRequest_Operation::unsafe_arena_release_tail() {
-  // @@protoc_insertion_point(field_unsafe_arena_release:io.deephaven.proto.backplane.grpc.BatchTableRequest.Operation.tail)
-  if (op_case() == kTail) {
-    clear_has_op();
-    auto* temp = _impl_.op_.tail_;
-    _impl_.op_.tail_ = nullptr;
-    return temp;
-  } else {
-    return nullptr;
-  }
-}
-inline void BatchTableRequest_Operation::unsafe_arena_set_allocated_tail(::io::deephaven::proto::backplane::grpc::HeadOrTailRequest* value) {
-  // We rely on the oneof clear method to free the earlier contents
-  // of this oneof. We can directly use the pointer we're given to
-  // set the new value.
-  clear_op();
-  if (value) {
-    set_has_tail();
-    _impl_.op_.tail_ = value;
-  }
-  // @@protoc_insertion_point(field_unsafe_arena_set_allocated:io.deephaven.proto.backplane.grpc.BatchTableRequest.Operation.tail)
-}
-inline ::io::deephaven::proto::backplane::grpc::HeadOrTailRequest* BatchTableRequest_Operation::_internal_mutable_tail() {
-  if (op_case() != kTail) {
-    clear_op();
-    set_has_tail();
-    _impl_.op_.tail_ = CreateMaybeMessage<::io::deephaven::proto::backplane::grpc::HeadOrTailRequest>(GetArena());
-  }
-  return _impl_.op_.tail_;
-}
-inline ::io::deephaven::proto::backplane::grpc::HeadOrTailRequest* BatchTableRequest_Operation::mutable_tail() ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  ::io::deephaven::proto::backplane::grpc::HeadOrTailRequest* _msg = _internal_mutable_tail();
-  // @@protoc_insertion_point(field_mutable:io.deephaven.proto.backplane.grpc.BatchTableRequest.Operation.tail)
-  return _msg;
-}
-
-// .io.deephaven.proto.backplane.grpc.HeadOrTailByRequest head_by = 15;
-inline bool BatchTableRequest_Operation::has_head_by() const {
-  return op_case() == kHeadBy;
-}
-inline bool BatchTableRequest_Operation::_internal_has_head_by() const {
-  return op_case() == kHeadBy;
-}
-inline void BatchTableRequest_Operation::set_has_head_by() {
-  _impl_._oneof_case_[0] = kHeadBy;
-}
-inline void BatchTableRequest_Operation::clear_head_by() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  if (op_case() == kHeadBy) {
-    if (GetArena() == nullptr) {
-      delete _impl_.op_.head_by_;
-    }
-    clear_has_op();
-  }
-}
-inline ::io::deephaven::proto::backplane::grpc::HeadOrTailByRequest* BatchTableRequest_Operation::release_head_by() {
-  // @@protoc_insertion_point(field_release:io.deephaven.proto.backplane.grpc.BatchTableRequest.Operation.head_by)
-  if (op_case() == kHeadBy) {
-    clear_has_op();
-    auto* temp = _impl_.op_.head_by_;
-    if (GetArena() != nullptr) {
-      temp = ::google::protobuf::internal::DuplicateIfNonNull(temp);
-    }
-    _impl_.op_.head_by_ = nullptr;
-    return temp;
-  } else {
-    return nullptr;
-  }
-}
-inline const ::io::deephaven::proto::backplane::grpc::HeadOrTailByRequest& BatchTableRequest_Operation::_internal_head_by() const {
-  return op_case() == kHeadBy ? *_impl_.op_.head_by_ : reinterpret_cast<::io::deephaven::proto::backplane::grpc::HeadOrTailByRequest&>(::io::deephaven::proto::backplane::grpc::_HeadOrTailByRequest_default_instance_);
-}
-inline const ::io::deephaven::proto::backplane::grpc::HeadOrTailByRequest& BatchTableRequest_Operation::head_by() const ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  // @@protoc_insertion_point(field_get:io.deephaven.proto.backplane.grpc.BatchTableRequest.Operation.head_by)
-  return _internal_head_by();
-}
-inline ::io::deephaven::proto::backplane::grpc::HeadOrTailByRequest* BatchTableRequest_Operation::unsafe_arena_release_head_by() {
-  // @@protoc_insertion_point(field_unsafe_arena_release:io.deephaven.proto.backplane.grpc.BatchTableRequest.Operation.head_by)
-  if (op_case() == kHeadBy) {
-    clear_has_op();
-    auto* temp = _impl_.op_.head_by_;
-    _impl_.op_.head_by_ = nullptr;
-    return temp;
-  } else {
-    return nullptr;
-  }
-}
-inline void BatchTableRequest_Operation::unsafe_arena_set_allocated_head_by(::io::deephaven::proto::backplane::grpc::HeadOrTailByRequest* value) {
-  // We rely on the oneof clear method to free the earlier contents
-  // of this oneof. We can directly use the pointer we're given to
-  // set the new value.
-  clear_op();
-  if (value) {
-    set_has_head_by();
-    _impl_.op_.head_by_ = value;
-  }
-  // @@protoc_insertion_point(field_unsafe_arena_set_allocated:io.deephaven.proto.backplane.grpc.BatchTableRequest.Operation.head_by)
-}
-inline ::io::deephaven::proto::backplane::grpc::HeadOrTailByRequest* BatchTableRequest_Operation::_internal_mutable_head_by() {
-  if (op_case() != kHeadBy) {
-    clear_op();
-    set_has_head_by();
-    _impl_.op_.head_by_ = CreateMaybeMessage<::io::deephaven::proto::backplane::grpc::HeadOrTailByRequest>(GetArena());
-  }
-  return _impl_.op_.head_by_;
-}
-inline ::io::deephaven::proto::backplane::grpc::HeadOrTailByRequest* BatchTableRequest_Operation::mutable_head_by() ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  ::io::deephaven::proto::backplane::grpc::HeadOrTailByRequest* _msg = _internal_mutable_head_by();
-  // @@protoc_insertion_point(field_mutable:io.deephaven.proto.backplane.grpc.BatchTableRequest.Operation.head_by)
-  return _msg;
-}
-
-// .io.deephaven.proto.backplane.grpc.HeadOrTailByRequest tail_by = 16;
-inline bool BatchTableRequest_Operation::has_tail_by() const {
-  return op_case() == kTailBy;
-}
-inline bool BatchTableRequest_Operation::_internal_has_tail_by() const {
-  return op_case() == kTailBy;
-}
-inline void BatchTableRequest_Operation::set_has_tail_by() {
-  _impl_._oneof_case_[0] = kTailBy;
-}
-inline void BatchTableRequest_Operation::clear_tail_by() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  if (op_case() == kTailBy) {
-    if (GetArena() == nullptr) {
-      delete _impl_.op_.tail_by_;
-    }
-    clear_has_op();
-  }
-}
-inline ::io::deephaven::proto::backplane::grpc::HeadOrTailByRequest* BatchTableRequest_Operation::release_tail_by() {
-  // @@protoc_insertion_point(field_release:io.deephaven.proto.backplane.grpc.BatchTableRequest.Operation.tail_by)
-  if (op_case() == kTailBy) {
-    clear_has_op();
-    auto* temp = _impl_.op_.tail_by_;
-    if (GetArena() != nullptr) {
-      temp = ::google::protobuf::internal::DuplicateIfNonNull(temp);
-    }
-    _impl_.op_.tail_by_ = nullptr;
-    return temp;
-  } else {
-    return nullptr;
-  }
-}
-inline const ::io::deephaven::proto::backplane::grpc::HeadOrTailByRequest& BatchTableRequest_Operation::_internal_tail_by() const {
-  return op_case() == kTailBy ? *_impl_.op_.tail_by_ : reinterpret_cast<::io::deephaven::proto::backplane::grpc::HeadOrTailByRequest&>(::io::deephaven::proto::backplane::grpc::_HeadOrTailByRequest_default_instance_);
-}
-inline const ::io::deephaven::proto::backplane::grpc::HeadOrTailByRequest& BatchTableRequest_Operation::tail_by() const ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  // @@protoc_insertion_point(field_get:io.deephaven.proto.backplane.grpc.BatchTableRequest.Operation.tail_by)
-  return _internal_tail_by();
-}
-inline ::io::deephaven::proto::backplane::grpc::HeadOrTailByRequest* BatchTableRequest_Operation::unsafe_arena_release_tail_by() {
-  // @@protoc_insertion_point(field_unsafe_arena_release:io.deephaven.proto.backplane.grpc.BatchTableRequest.Operation.tail_by)
-  if (op_case() == kTailBy) {
-    clear_has_op();
-    auto* temp = _impl_.op_.tail_by_;
-    _impl_.op_.tail_by_ = nullptr;
-    return temp;
-  } else {
-    return nullptr;
-  }
-}
-inline void BatchTableRequest_Operation::unsafe_arena_set_allocated_tail_by(::io::deephaven::proto::backplane::grpc::HeadOrTailByRequest* value) {
-  // We rely on the oneof clear method to free the earlier contents
-  // of this oneof. We can directly use the pointer we're given to
-  // set the new value.
-  clear_op();
-  if (value) {
-    set_has_tail_by();
-    _impl_.op_.tail_by_ = value;
-  }
-  // @@protoc_insertion_point(field_unsafe_arena_set_allocated:io.deephaven.proto.backplane.grpc.BatchTableRequest.Operation.tail_by)
-}
-inline ::io::deephaven::proto::backplane::grpc::HeadOrTailByRequest* BatchTableRequest_Operation::_internal_mutable_tail_by() {
-  if (op_case() != kTailBy) {
-    clear_op();
-    set_has_tail_by();
-    _impl_.op_.tail_by_ = CreateMaybeMessage<::io::deephaven::proto::backplane::grpc::HeadOrTailByRequest>(GetArena());
-  }
-  return _impl_.op_.tail_by_;
-}
-inline ::io::deephaven::proto::backplane::grpc::HeadOrTailByRequest* BatchTableRequest_Operation::mutable_tail_by() ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  ::io::deephaven::proto::backplane::grpc::HeadOrTailByRequest* _msg = _internal_mutable_tail_by();
-  // @@protoc_insertion_point(field_mutable:io.deephaven.proto.backplane.grpc.BatchTableRequest.Operation.tail_by)
-  return _msg;
-}
-
-// .io.deephaven.proto.backplane.grpc.UngroupRequest ungroup = 17;
-inline bool BatchTableRequest_Operation::has_ungroup() const {
-  return op_case() == kUngroup;
-}
-inline bool BatchTableRequest_Operation::_internal_has_ungroup() const {
-  return op_case() == kUngroup;
-}
-inline void BatchTableRequest_Operation::set_has_ungroup() {
-  _impl_._oneof_case_[0] = kUngroup;
-}
-inline void BatchTableRequest_Operation::clear_ungroup() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  if (op_case() == kUngroup) {
-    if (GetArena() == nullptr) {
-      delete _impl_.op_.ungroup_;
-    }
-    clear_has_op();
-  }
-}
-inline ::io::deephaven::proto::backplane::grpc::UngroupRequest* BatchTableRequest_Operation::release_ungroup() {
-  // @@protoc_insertion_point(field_release:io.deephaven.proto.backplane.grpc.BatchTableRequest.Operation.ungroup)
-  if (op_case() == kUngroup) {
-    clear_has_op();
-    auto* temp = _impl_.op_.ungroup_;
-    if (GetArena() != nullptr) {
-      temp = ::google::protobuf::internal::DuplicateIfNonNull(temp);
-    }
-    _impl_.op_.ungroup_ = nullptr;
-    return temp;
-  } else {
-    return nullptr;
-  }
-}
-inline const ::io::deephaven::proto::backplane::grpc::UngroupRequest& BatchTableRequest_Operation::_internal_ungroup() const {
-  return op_case() == kUngroup ? *_impl_.op_.ungroup_ : reinterpret_cast<::io::deephaven::proto::backplane::grpc::UngroupRequest&>(::io::deephaven::proto::backplane::grpc::_UngroupRequest_default_instance_);
-}
-inline const ::io::deephaven::proto::backplane::grpc::UngroupRequest& BatchTableRequest_Operation::ungroup() const ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  // @@protoc_insertion_point(field_get:io.deephaven.proto.backplane.grpc.BatchTableRequest.Operation.ungroup)
-  return _internal_ungroup();
-}
-inline ::io::deephaven::proto::backplane::grpc::UngroupRequest* BatchTableRequest_Operation::unsafe_arena_release_ungroup() {
-  // @@protoc_insertion_point(field_unsafe_arena_release:io.deephaven.proto.backplane.grpc.BatchTableRequest.Operation.ungroup)
-  if (op_case() == kUngroup) {
-    clear_has_op();
-    auto* temp = _impl_.op_.ungroup_;
-    _impl_.op_.ungroup_ = nullptr;
-    return temp;
-  } else {
-    return nullptr;
-  }
-}
-inline void BatchTableRequest_Operation::unsafe_arena_set_allocated_ungroup(::io::deephaven::proto::backplane::grpc::UngroupRequest* value) {
-  // We rely on the oneof clear method to free the earlier contents
-  // of this oneof. We can directly use the pointer we're given to
-  // set the new value.
-  clear_op();
-  if (value) {
-    set_has_ungroup();
-    _impl_.op_.ungroup_ = value;
-  }
-  // @@protoc_insertion_point(field_unsafe_arena_set_allocated:io.deephaven.proto.backplane.grpc.BatchTableRequest.Operation.ungroup)
-}
-inline ::io::deephaven::proto::backplane::grpc::UngroupRequest* BatchTableRequest_Operation::_internal_mutable_ungroup() {
-  if (op_case() != kUngroup) {
-    clear_op();
-    set_has_ungroup();
-    _impl_.op_.ungroup_ = CreateMaybeMessage<::io::deephaven::proto::backplane::grpc::UngroupRequest>(GetArena());
-  }
-  return _impl_.op_.ungroup_;
-}
-inline ::io::deephaven::proto::backplane::grpc::UngroupRequest* BatchTableRequest_Operation::mutable_ungroup() ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  ::io::deephaven::proto::backplane::grpc::UngroupRequest* _msg = _internal_mutable_ungroup();
-  // @@protoc_insertion_point(field_mutable:io.deephaven.proto.backplane.grpc.BatchTableRequest.Operation.ungroup)
-  return _msg;
-}
-
-// .io.deephaven.proto.backplane.grpc.MergeTablesRequest merge = 18;
-inline bool BatchTableRequest_Operation::has_merge() const {
-  return op_case() == kMerge;
-}
-inline bool BatchTableRequest_Operation::_internal_has_merge() const {
-  return op_case() == kMerge;
-}
-inline void BatchTableRequest_Operation::set_has_merge() {
-  _impl_._oneof_case_[0] = kMerge;
-}
-inline void BatchTableRequest_Operation::clear_merge() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  if (op_case() == kMerge) {
-    if (GetArena() == nullptr) {
-      delete _impl_.op_.merge_;
-    }
-    clear_has_op();
-  }
-}
-inline ::io::deephaven::proto::backplane::grpc::MergeTablesRequest* BatchTableRequest_Operation::release_merge() {
-  // @@protoc_insertion_point(field_release:io.deephaven.proto.backplane.grpc.BatchTableRequest.Operation.merge)
-  if (op_case() == kMerge) {
-    clear_has_op();
-    auto* temp = _impl_.op_.merge_;
-    if (GetArena() != nullptr) {
-      temp = ::google::protobuf::internal::DuplicateIfNonNull(temp);
-    }
-    _impl_.op_.merge_ = nullptr;
-    return temp;
-  } else {
-    return nullptr;
-  }
-}
-inline const ::io::deephaven::proto::backplane::grpc::MergeTablesRequest& BatchTableRequest_Operation::_internal_merge() const {
-  return op_case() == kMerge ? *_impl_.op_.merge_ : reinterpret_cast<::io::deephaven::proto::backplane::grpc::MergeTablesRequest&>(::io::deephaven::proto::backplane::grpc::_MergeTablesRequest_default_instance_);
-}
-inline const ::io::deephaven::proto::backplane::grpc::MergeTablesRequest& BatchTableRequest_Operation::merge() const ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  // @@protoc_insertion_point(field_get:io.deephaven.proto.backplane.grpc.BatchTableRequest.Operation.merge)
-  return _internal_merge();
-}
-inline ::io::deephaven::proto::backplane::grpc::MergeTablesRequest* BatchTableRequest_Operation::unsafe_arena_release_merge() {
-  // @@protoc_insertion_point(field_unsafe_arena_release:io.deephaven.proto.backplane.grpc.BatchTableRequest.Operation.merge)
-  if (op_case() == kMerge) {
-    clear_has_op();
-    auto* temp = _impl_.op_.merge_;
-    _impl_.op_.merge_ = nullptr;
-    return temp;
-  } else {
-    return nullptr;
-  }
-}
-inline void BatchTableRequest_Operation::unsafe_arena_set_allocated_merge(::io::deephaven::proto::backplane::grpc::MergeTablesRequest* value) {
-  // We rely on the oneof clear method to free the earlier contents
-  // of this oneof. We can directly use the pointer we're given to
-  // set the new value.
-  clear_op();
-  if (value) {
-    set_has_merge();
-    _impl_.op_.merge_ = value;
-  }
-  // @@protoc_insertion_point(field_unsafe_arena_set_allocated:io.deephaven.proto.backplane.grpc.BatchTableRequest.Operation.merge)
-}
-inline ::io::deephaven::proto::backplane::grpc::MergeTablesRequest* BatchTableRequest_Operation::_internal_mutable_merge() {
-  if (op_case() != kMerge) {
-    clear_op();
-    set_has_merge();
-    _impl_.op_.merge_ = CreateMaybeMessage<::io::deephaven::proto::backplane::grpc::MergeTablesRequest>(GetArena());
-  }
-  return _impl_.op_.merge_;
-}
-inline ::io::deephaven::proto::backplane::grpc::MergeTablesRequest* BatchTableRequest_Operation::mutable_merge() ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  ::io::deephaven::proto::backplane::grpc::MergeTablesRequest* _msg = _internal_mutable_merge();
-  // @@protoc_insertion_point(field_mutable:io.deephaven.proto.backplane.grpc.BatchTableRequest.Operation.merge)
-  return _msg;
-}
-
-// .io.deephaven.proto.backplane.grpc.ComboAggregateRequest combo_aggregate = 19;
-inline bool BatchTableRequest_Operation::has_combo_aggregate() const {
-  return op_case() == kComboAggregate;
-}
-inline bool BatchTableRequest_Operation::_internal_has_combo_aggregate() const {
-  return op_case() == kComboAggregate;
-}
-inline void BatchTableRequest_Operation::set_has_combo_aggregate() {
-  _impl_._oneof_case_[0] = kComboAggregate;
-}
-inline void BatchTableRequest_Operation::clear_combo_aggregate() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  if (op_case() == kComboAggregate) {
-    if (GetArena() == nullptr) {
-      delete _impl_.op_.combo_aggregate_;
-    }
-    clear_has_op();
-  }
-}
-inline ::io::deephaven::proto::backplane::grpc::ComboAggregateRequest* BatchTableRequest_Operation::release_combo_aggregate() {
-  // @@protoc_insertion_point(field_release:io.deephaven.proto.backplane.grpc.BatchTableRequest.Operation.combo_aggregate)
-  if (op_case() == kComboAggregate) {
-    clear_has_op();
-    auto* temp = _impl_.op_.combo_aggregate_;
-    if (GetArena() != nullptr) {
-      temp = ::google::protobuf::internal::DuplicateIfNonNull(temp);
-    }
-    _impl_.op_.combo_aggregate_ = nullptr;
-    return temp;
-  } else {
-    return nullptr;
-  }
-}
-inline const ::io::deephaven::proto::backplane::grpc::ComboAggregateRequest& BatchTableRequest_Operation::_internal_combo_aggregate() const {
-  return op_case() == kComboAggregate ? *_impl_.op_.combo_aggregate_ : reinterpret_cast<::io::deephaven::proto::backplane::grpc::ComboAggregateRequest&>(::io::deephaven::proto::backplane::grpc::_ComboAggregateRequest_default_instance_);
-}
-inline const ::io::deephaven::proto::backplane::grpc::ComboAggregateRequest& BatchTableRequest_Operation::combo_aggregate() const ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  // @@protoc_insertion_point(field_get:io.deephaven.proto.backplane.grpc.BatchTableRequest.Operation.combo_aggregate)
-  return _internal_combo_aggregate();
-}
-inline ::io::deephaven::proto::backplane::grpc::ComboAggregateRequest* BatchTableRequest_Operation::unsafe_arena_release_combo_aggregate() {
-  // @@protoc_insertion_point(field_unsafe_arena_release:io.deephaven.proto.backplane.grpc.BatchTableRequest.Operation.combo_aggregate)
-  if (op_case() == kComboAggregate) {
-    clear_has_op();
-    auto* temp = _impl_.op_.combo_aggregate_;
-    _impl_.op_.combo_aggregate_ = nullptr;
-    return temp;
-  } else {
-    return nullptr;
-  }
-}
-inline void BatchTableRequest_Operation::unsafe_arena_set_allocated_combo_aggregate(::io::deephaven::proto::backplane::grpc::ComboAggregateRequest* value) {
-  // We rely on the oneof clear method to free the earlier contents
-  // of this oneof. We can directly use the pointer we're given to
-  // set the new value.
-  clear_op();
-  if (value) {
-    set_has_combo_aggregate();
-    _impl_.op_.combo_aggregate_ = value;
-  }
-  // @@protoc_insertion_point(field_unsafe_arena_set_allocated:io.deephaven.proto.backplane.grpc.BatchTableRequest.Operation.combo_aggregate)
-}
-inline ::io::deephaven::proto::backplane::grpc::ComboAggregateRequest* BatchTableRequest_Operation::_internal_mutable_combo_aggregate() {
-  if (op_case() != kComboAggregate) {
-    clear_op();
-    set_has_combo_aggregate();
-    _impl_.op_.combo_aggregate_ = CreateMaybeMessage<::io::deephaven::proto::backplane::grpc::ComboAggregateRequest>(GetArena());
-  }
-  return _impl_.op_.combo_aggregate_;
-}
-inline ::io::deephaven::proto::backplane::grpc::ComboAggregateRequest* BatchTableRequest_Operation::mutable_combo_aggregate() ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  ::io::deephaven::proto::backplane::grpc::ComboAggregateRequest* _msg = _internal_mutable_combo_aggregate();
-  // @@protoc_insertion_point(field_mutable:io.deephaven.proto.backplane.grpc.BatchTableRequest.Operation.combo_aggregate)
-  return _msg;
-}
-
-// .io.deephaven.proto.backplane.grpc.FlattenRequest flatten = 21;
-inline bool BatchTableRequest_Operation::has_flatten() const {
-  return op_case() == kFlatten;
-}
-inline bool BatchTableRequest_Operation::_internal_has_flatten() const {
-  return op_case() == kFlatten;
-}
-inline void BatchTableRequest_Operation::set_has_flatten() {
-  _impl_._oneof_case_[0] = kFlatten;
-}
-inline void BatchTableRequest_Operation::clear_flatten() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  if (op_case() == kFlatten) {
-    if (GetArena() == nullptr) {
-      delete _impl_.op_.flatten_;
-    }
-    clear_has_op();
-  }
-}
-inline ::io::deephaven::proto::backplane::grpc::FlattenRequest* BatchTableRequest_Operation::release_flatten() {
-  // @@protoc_insertion_point(field_release:io.deephaven.proto.backplane.grpc.BatchTableRequest.Operation.flatten)
-  if (op_case() == kFlatten) {
-    clear_has_op();
-    auto* temp = _impl_.op_.flatten_;
-    if (GetArena() != nullptr) {
-      temp = ::google::protobuf::internal::DuplicateIfNonNull(temp);
-    }
-    _impl_.op_.flatten_ = nullptr;
-    return temp;
-  } else {
-    return nullptr;
-  }
-}
-inline const ::io::deephaven::proto::backplane::grpc::FlattenRequest& BatchTableRequest_Operation::_internal_flatten() const {
-  return op_case() == kFlatten ? *_impl_.op_.flatten_ : reinterpret_cast<::io::deephaven::proto::backplane::grpc::FlattenRequest&>(::io::deephaven::proto::backplane::grpc::_FlattenRequest_default_instance_);
-}
-inline const ::io::deephaven::proto::backplane::grpc::FlattenRequest& BatchTableRequest_Operation::flatten() const ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  // @@protoc_insertion_point(field_get:io.deephaven.proto.backplane.grpc.BatchTableRequest.Operation.flatten)
-  return _internal_flatten();
-}
-inline ::io::deephaven::proto::backplane::grpc::FlattenRequest* BatchTableRequest_Operation::unsafe_arena_release_flatten() {
-  // @@protoc_insertion_point(field_unsafe_arena_release:io.deephaven.proto.backplane.grpc.BatchTableRequest.Operation.flatten)
-  if (op_case() == kFlatten) {
-    clear_has_op();
-    auto* temp = _impl_.op_.flatten_;
-    _impl_.op_.flatten_ = nullptr;
-    return temp;
-  } else {
-    return nullptr;
-  }
-}
-inline void BatchTableRequest_Operation::unsafe_arena_set_allocated_flatten(::io::deephaven::proto::backplane::grpc::FlattenRequest* value) {
-  // We rely on the oneof clear method to free the earlier contents
-  // of this oneof. We can directly use the pointer we're given to
-  // set the new value.
-  clear_op();
-  if (value) {
-    set_has_flatten();
-    _impl_.op_.flatten_ = value;
-  }
-  // @@protoc_insertion_point(field_unsafe_arena_set_allocated:io.deephaven.proto.backplane.grpc.BatchTableRequest.Operation.flatten)
-}
-inline ::io::deephaven::proto::backplane::grpc::FlattenRequest* BatchTableRequest_Operation::_internal_mutable_flatten() {
-  if (op_case() != kFlatten) {
-    clear_op();
-    set_has_flatten();
-    _impl_.op_.flatten_ = CreateMaybeMessage<::io::deephaven::proto::backplane::grpc::FlattenRequest>(GetArena());
-  }
-  return _impl_.op_.flatten_;
-}
-inline ::io::deephaven::proto::backplane::grpc::FlattenRequest* BatchTableRequest_Operation::mutable_flatten() ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  ::io::deephaven::proto::backplane::grpc::FlattenRequest* _msg = _internal_mutable_flatten();
-  // @@protoc_insertion_point(field_mutable:io.deephaven.proto.backplane.grpc.BatchTableRequest.Operation.flatten)
-  return _msg;
-}
-
-// .io.deephaven.proto.backplane.grpc.RunChartDownsampleRequest run_chart_downsample = 22;
-inline bool BatchTableRequest_Operation::has_run_chart_downsample() const {
-  return op_case() == kRunChartDownsample;
-}
-inline bool BatchTableRequest_Operation::_internal_has_run_chart_downsample() const {
-  return op_case() == kRunChartDownsample;
-}
-inline void BatchTableRequest_Operation::set_has_run_chart_downsample() {
-  _impl_._oneof_case_[0] = kRunChartDownsample;
-}
-inline void BatchTableRequest_Operation::clear_run_chart_downsample() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  if (op_case() == kRunChartDownsample) {
-    if (GetArena() == nullptr) {
-      delete _impl_.op_.run_chart_downsample_;
-    }
-    clear_has_op();
-  }
-}
-inline ::io::deephaven::proto::backplane::grpc::RunChartDownsampleRequest* BatchTableRequest_Operation::release_run_chart_downsample() {
-  // @@protoc_insertion_point(field_release:io.deephaven.proto.backplane.grpc.BatchTableRequest.Operation.run_chart_downsample)
-  if (op_case() == kRunChartDownsample) {
-    clear_has_op();
-    auto* temp = _impl_.op_.run_chart_downsample_;
-    if (GetArena() != nullptr) {
-      temp = ::google::protobuf::internal::DuplicateIfNonNull(temp);
-    }
-    _impl_.op_.run_chart_downsample_ = nullptr;
-    return temp;
-  } else {
-    return nullptr;
-  }
-}
-inline const ::io::deephaven::proto::backplane::grpc::RunChartDownsampleRequest& BatchTableRequest_Operation::_internal_run_chart_downsample() const {
-  return op_case() == kRunChartDownsample ? *_impl_.op_.run_chart_downsample_ : reinterpret_cast<::io::deephaven::proto::backplane::grpc::RunChartDownsampleRequest&>(::io::deephaven::proto::backplane::grpc::_RunChartDownsampleRequest_default_instance_);
-}
-inline const ::io::deephaven::proto::backplane::grpc::RunChartDownsampleRequest& BatchTableRequest_Operation::run_chart_downsample() const ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  // @@protoc_insertion_point(field_get:io.deephaven.proto.backplane.grpc.BatchTableRequest.Operation.run_chart_downsample)
-  return _internal_run_chart_downsample();
-}
-inline ::io::deephaven::proto::backplane::grpc::RunChartDownsampleRequest* BatchTableRequest_Operation::unsafe_arena_release_run_chart_downsample() {
-  // @@protoc_insertion_point(field_unsafe_arena_release:io.deephaven.proto.backplane.grpc.BatchTableRequest.Operation.run_chart_downsample)
-  if (op_case() == kRunChartDownsample) {
-    clear_has_op();
-    auto* temp = _impl_.op_.run_chart_downsample_;
-    _impl_.op_.run_chart_downsample_ = nullptr;
-    return temp;
-  } else {
-    return nullptr;
-  }
-}
-inline void BatchTableRequest_Operation::unsafe_arena_set_allocated_run_chart_downsample(::io::deephaven::proto::backplane::grpc::RunChartDownsampleRequest* value) {
-  // We rely on the oneof clear method to free the earlier contents
-  // of this oneof. We can directly use the pointer we're given to
-  // set the new value.
-  clear_op();
-  if (value) {
-    set_has_run_chart_downsample();
-    _impl_.op_.run_chart_downsample_ = value;
-  }
-  // @@protoc_insertion_point(field_unsafe_arena_set_allocated:io.deephaven.proto.backplane.grpc.BatchTableRequest.Operation.run_chart_downsample)
-}
-inline ::io::deephaven::proto::backplane::grpc::RunChartDownsampleRequest* BatchTableRequest_Operation::_internal_mutable_run_chart_downsample() {
-  if (op_case() != kRunChartDownsample) {
-    clear_op();
-    set_has_run_chart_downsample();
-    _impl_.op_.run_chart_downsample_ = CreateMaybeMessage<::io::deephaven::proto::backplane::grpc::RunChartDownsampleRequest>(GetArena());
-  }
-  return _impl_.op_.run_chart_downsample_;
-}
-inline ::io::deephaven::proto::backplane::grpc::RunChartDownsampleRequest* BatchTableRequest_Operation::mutable_run_chart_downsample() ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  ::io::deephaven::proto::backplane::grpc::RunChartDownsampleRequest* _msg = _internal_mutable_run_chart_downsample();
-  // @@protoc_insertion_point(field_mutable:io.deephaven.proto.backplane.grpc.BatchTableRequest.Operation.run_chart_downsample)
-  return _msg;
-}
-
-// .io.deephaven.proto.backplane.grpc.CrossJoinTablesRequest cross_join = 23;
-inline bool BatchTableRequest_Operation::has_cross_join() const {
-  return op_case() == kCrossJoin;
-}
-inline bool BatchTableRequest_Operation::_internal_has_cross_join() const {
-  return op_case() == kCrossJoin;
-}
-inline void BatchTableRequest_Operation::set_has_cross_join() {
-  _impl_._oneof_case_[0] = kCrossJoin;
-}
-inline void BatchTableRequest_Operation::clear_cross_join() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  if (op_case() == kCrossJoin) {
-    if (GetArena() == nullptr) {
-      delete _impl_.op_.cross_join_;
-    }
-    clear_has_op();
-  }
-}
-inline ::io::deephaven::proto::backplane::grpc::CrossJoinTablesRequest* BatchTableRequest_Operation::release_cross_join() {
-  // @@protoc_insertion_point(field_release:io.deephaven.proto.backplane.grpc.BatchTableRequest.Operation.cross_join)
-  if (op_case() == kCrossJoin) {
-    clear_has_op();
-    auto* temp = _impl_.op_.cross_join_;
-    if (GetArena() != nullptr) {
-      temp = ::google::protobuf::internal::DuplicateIfNonNull(temp);
-    }
-    _impl_.op_.cross_join_ = nullptr;
-    return temp;
-  } else {
-    return nullptr;
-  }
-}
-inline const ::io::deephaven::proto::backplane::grpc::CrossJoinTablesRequest& BatchTableRequest_Operation::_internal_cross_join() const {
-  return op_case() == kCrossJoin ? *_impl_.op_.cross_join_ : reinterpret_cast<::io::deephaven::proto::backplane::grpc::CrossJoinTablesRequest&>(::io::deephaven::proto::backplane::grpc::_CrossJoinTablesRequest_default_instance_);
-}
-inline const ::io::deephaven::proto::backplane::grpc::CrossJoinTablesRequest& BatchTableRequest_Operation::cross_join() const ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  // @@protoc_insertion_point(field_get:io.deephaven.proto.backplane.grpc.BatchTableRequest.Operation.cross_join)
-  return _internal_cross_join();
-}
-inline ::io::deephaven::proto::backplane::grpc::CrossJoinTablesRequest* BatchTableRequest_Operation::unsafe_arena_release_cross_join() {
-  // @@protoc_insertion_point(field_unsafe_arena_release:io.deephaven.proto.backplane.grpc.BatchTableRequest.Operation.cross_join)
-  if (op_case() == kCrossJoin) {
-    clear_has_op();
-    auto* temp = _impl_.op_.cross_join_;
-    _impl_.op_.cross_join_ = nullptr;
-    return temp;
-  } else {
-    return nullptr;
-  }
-}
-inline void BatchTableRequest_Operation::unsafe_arena_set_allocated_cross_join(::io::deephaven::proto::backplane::grpc::CrossJoinTablesRequest* value) {
-  // We rely on the oneof clear method to free the earlier contents
-  // of this oneof. We can directly use the pointer we're given to
-  // set the new value.
-  clear_op();
-  if (value) {
-    set_has_cross_join();
-    _impl_.op_.cross_join_ = value;
-  }
-  // @@protoc_insertion_point(field_unsafe_arena_set_allocated:io.deephaven.proto.backplane.grpc.BatchTableRequest.Operation.cross_join)
-}
-inline ::io::deephaven::proto::backplane::grpc::CrossJoinTablesRequest* BatchTableRequest_Operation::_internal_mutable_cross_join() {
-  if (op_case() != kCrossJoin) {
-    clear_op();
-    set_has_cross_join();
-    _impl_.op_.cross_join_ = CreateMaybeMessage<::io::deephaven::proto::backplane::grpc::CrossJoinTablesRequest>(GetArena());
-  }
-  return _impl_.op_.cross_join_;
-}
-inline ::io::deephaven::proto::backplane::grpc::CrossJoinTablesRequest* BatchTableRequest_Operation::mutable_cross_join() ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  ::io::deephaven::proto::backplane::grpc::CrossJoinTablesRequest* _msg = _internal_mutable_cross_join();
-  // @@protoc_insertion_point(field_mutable:io.deephaven.proto.backplane.grpc.BatchTableRequest.Operation.cross_join)
-  return _msg;
-}
-
-// .io.deephaven.proto.backplane.grpc.NaturalJoinTablesRequest natural_join = 24;
-inline bool BatchTableRequest_Operation::has_natural_join() const {
-  return op_case() == kNaturalJoin;
-}
-inline bool BatchTableRequest_Operation::_internal_has_natural_join() const {
-  return op_case() == kNaturalJoin;
-}
-inline void BatchTableRequest_Operation::set_has_natural_join() {
-  _impl_._oneof_case_[0] = kNaturalJoin;
-}
-inline void BatchTableRequest_Operation::clear_natural_join() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  if (op_case() == kNaturalJoin) {
-    if (GetArena() == nullptr) {
-      delete _impl_.op_.natural_join_;
-    }
-    clear_has_op();
-  }
-}
-inline ::io::deephaven::proto::backplane::grpc::NaturalJoinTablesRequest* BatchTableRequest_Operation::release_natural_join() {
-  // @@protoc_insertion_point(field_release:io.deephaven.proto.backplane.grpc.BatchTableRequest.Operation.natural_join)
-  if (op_case() == kNaturalJoin) {
-    clear_has_op();
-    auto* temp = _impl_.op_.natural_join_;
-    if (GetArena() != nullptr) {
-      temp = ::google::protobuf::internal::DuplicateIfNonNull(temp);
-    }
-    _impl_.op_.natural_join_ = nullptr;
-    return temp;
-  } else {
-    return nullptr;
-  }
-}
-inline const ::io::deephaven::proto::backplane::grpc::NaturalJoinTablesRequest& BatchTableRequest_Operation::_internal_natural_join() const {
-  return op_case() == kNaturalJoin ? *_impl_.op_.natural_join_ : reinterpret_cast<::io::deephaven::proto::backplane::grpc::NaturalJoinTablesRequest&>(::io::deephaven::proto::backplane::grpc::_NaturalJoinTablesRequest_default_instance_);
-}
-inline const ::io::deephaven::proto::backplane::grpc::NaturalJoinTablesRequest& BatchTableRequest_Operation::natural_join() const ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  // @@protoc_insertion_point(field_get:io.deephaven.proto.backplane.grpc.BatchTableRequest.Operation.natural_join)
-  return _internal_natural_join();
-}
-inline ::io::deephaven::proto::backplane::grpc::NaturalJoinTablesRequest* BatchTableRequest_Operation::unsafe_arena_release_natural_join() {
-  // @@protoc_insertion_point(field_unsafe_arena_release:io.deephaven.proto.backplane.grpc.BatchTableRequest.Operation.natural_join)
-  if (op_case() == kNaturalJoin) {
-    clear_has_op();
-    auto* temp = _impl_.op_.natural_join_;
-    _impl_.op_.natural_join_ = nullptr;
-    return temp;
-  } else {
-    return nullptr;
-  }
-}
-inline void BatchTableRequest_Operation::unsafe_arena_set_allocated_natural_join(::io::deephaven::proto::backplane::grpc::NaturalJoinTablesRequest* value) {
-  // We rely on the oneof clear method to free the earlier contents
-  // of this oneof. We can directly use the pointer we're given to
-  // set the new value.
-  clear_op();
-  if (value) {
-    set_has_natural_join();
-    _impl_.op_.natural_join_ = value;
-  }
-  // @@protoc_insertion_point(field_unsafe_arena_set_allocated:io.deephaven.proto.backplane.grpc.BatchTableRequest.Operation.natural_join)
-}
-inline ::io::deephaven::proto::backplane::grpc::NaturalJoinTablesRequest* BatchTableRequest_Operation::_internal_mutable_natural_join() {
-  if (op_case() != kNaturalJoin) {
-    clear_op();
-    set_has_natural_join();
-    _impl_.op_.natural_join_ = CreateMaybeMessage<::io::deephaven::proto::backplane::grpc::NaturalJoinTablesRequest>(GetArena());
-  }
-  return _impl_.op_.natural_join_;
-}
-inline ::io::deephaven::proto::backplane::grpc::NaturalJoinTablesRequest* BatchTableRequest_Operation::mutable_natural_join() ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  ::io::deephaven::proto::backplane::grpc::NaturalJoinTablesRequest* _msg = _internal_mutable_natural_join();
-  // @@protoc_insertion_point(field_mutable:io.deephaven.proto.backplane.grpc.BatchTableRequest.Operation.natural_join)
-  return _msg;
-}
-
-// .io.deephaven.proto.backplane.grpc.ExactJoinTablesRequest exact_join = 25;
-inline bool BatchTableRequest_Operation::has_exact_join() const {
-  return op_case() == kExactJoin;
-}
-inline bool BatchTableRequest_Operation::_internal_has_exact_join() const {
-  return op_case() == kExactJoin;
-}
-inline void BatchTableRequest_Operation::set_has_exact_join() {
-  _impl_._oneof_case_[0] = kExactJoin;
-}
-inline void BatchTableRequest_Operation::clear_exact_join() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  if (op_case() == kExactJoin) {
-    if (GetArena() == nullptr) {
-      delete _impl_.op_.exact_join_;
-    }
-    clear_has_op();
-  }
-}
-inline ::io::deephaven::proto::backplane::grpc::ExactJoinTablesRequest* BatchTableRequest_Operation::release_exact_join() {
-  // @@protoc_insertion_point(field_release:io.deephaven.proto.backplane.grpc.BatchTableRequest.Operation.exact_join)
-  if (op_case() == kExactJoin) {
-    clear_has_op();
-    auto* temp = _impl_.op_.exact_join_;
-    if (GetArena() != nullptr) {
-      temp = ::google::protobuf::internal::DuplicateIfNonNull(temp);
-    }
-    _impl_.op_.exact_join_ = nullptr;
-    return temp;
-  } else {
-    return nullptr;
-  }
-}
-inline const ::io::deephaven::proto::backplane::grpc::ExactJoinTablesRequest& BatchTableRequest_Operation::_internal_exact_join() const {
-  return op_case() == kExactJoin ? *_impl_.op_.exact_join_ : reinterpret_cast<::io::deephaven::proto::backplane::grpc::ExactJoinTablesRequest&>(::io::deephaven::proto::backplane::grpc::_ExactJoinTablesRequest_default_instance_);
-}
-inline const ::io::deephaven::proto::backplane::grpc::ExactJoinTablesRequest& BatchTableRequest_Operation::exact_join() const ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  // @@protoc_insertion_point(field_get:io.deephaven.proto.backplane.grpc.BatchTableRequest.Operation.exact_join)
-  return _internal_exact_join();
-}
-inline ::io::deephaven::proto::backplane::grpc::ExactJoinTablesRequest* BatchTableRequest_Operation::unsafe_arena_release_exact_join() {
-  // @@protoc_insertion_point(field_unsafe_arena_release:io.deephaven.proto.backplane.grpc.BatchTableRequest.Operation.exact_join)
-  if (op_case() == kExactJoin) {
-    clear_has_op();
-    auto* temp = _impl_.op_.exact_join_;
-    _impl_.op_.exact_join_ = nullptr;
-    return temp;
-  } else {
-    return nullptr;
-  }
-}
-inline void BatchTableRequest_Operation::unsafe_arena_set_allocated_exact_join(::io::deephaven::proto::backplane::grpc::ExactJoinTablesRequest* value) {
-  // We rely on the oneof clear method to free the earlier contents
-  // of this oneof. We can directly use the pointer we're given to
-  // set the new value.
-  clear_op();
-  if (value) {
-    set_has_exact_join();
-    _impl_.op_.exact_join_ = value;
-  }
-  // @@protoc_insertion_point(field_unsafe_arena_set_allocated:io.deephaven.proto.backplane.grpc.BatchTableRequest.Operation.exact_join)
-}
-inline ::io::deephaven::proto::backplane::grpc::ExactJoinTablesRequest* BatchTableRequest_Operation::_internal_mutable_exact_join() {
-  if (op_case() != kExactJoin) {
-    clear_op();
-    set_has_exact_join();
-    _impl_.op_.exact_join_ = CreateMaybeMessage<::io::deephaven::proto::backplane::grpc::ExactJoinTablesRequest>(GetArena());
-  }
-  return _impl_.op_.exact_join_;
-}
-inline ::io::deephaven::proto::backplane::grpc::ExactJoinTablesRequest* BatchTableRequest_Operation::mutable_exact_join() ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  ::io::deephaven::proto::backplane::grpc::ExactJoinTablesRequest* _msg = _internal_mutable_exact_join();
-  // @@protoc_insertion_point(field_mutable:io.deephaven.proto.backplane.grpc.BatchTableRequest.Operation.exact_join)
-  return _msg;
-}
-
-// .io.deephaven.proto.backplane.grpc.LeftJoinTablesRequest left_join = 26;
-inline bool BatchTableRequest_Operation::has_left_join() const {
-  return op_case() == kLeftJoin;
-}
-inline bool BatchTableRequest_Operation::_internal_has_left_join() const {
-  return op_case() == kLeftJoin;
-}
-inline void BatchTableRequest_Operation::set_has_left_join() {
-  _impl_._oneof_case_[0] = kLeftJoin;
-}
-inline void BatchTableRequest_Operation::clear_left_join() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  if (op_case() == kLeftJoin) {
-    if (GetArena() == nullptr) {
-      delete _impl_.op_.left_join_;
-    }
-    clear_has_op();
-  }
-}
-inline ::io::deephaven::proto::backplane::grpc::LeftJoinTablesRequest* BatchTableRequest_Operation::release_left_join() {
-  // @@protoc_insertion_point(field_release:io.deephaven.proto.backplane.grpc.BatchTableRequest.Operation.left_join)
-  if (op_case() == kLeftJoin) {
-    clear_has_op();
-    auto* temp = _impl_.op_.left_join_;
-    if (GetArena() != nullptr) {
-      temp = ::google::protobuf::internal::DuplicateIfNonNull(temp);
-    }
-    _impl_.op_.left_join_ = nullptr;
-    return temp;
-  } else {
-    return nullptr;
-  }
-}
-inline const ::io::deephaven::proto::backplane::grpc::LeftJoinTablesRequest& BatchTableRequest_Operation::_internal_left_join() const {
-  return op_case() == kLeftJoin ? *_impl_.op_.left_join_ : reinterpret_cast<::io::deephaven::proto::backplane::grpc::LeftJoinTablesRequest&>(::io::deephaven::proto::backplane::grpc::_LeftJoinTablesRequest_default_instance_);
-}
-inline const ::io::deephaven::proto::backplane::grpc::LeftJoinTablesRequest& BatchTableRequest_Operation::left_join() const ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  // @@protoc_insertion_point(field_get:io.deephaven.proto.backplane.grpc.BatchTableRequest.Operation.left_join)
-  return _internal_left_join();
-}
-inline ::io::deephaven::proto::backplane::grpc::LeftJoinTablesRequest* BatchTableRequest_Operation::unsafe_arena_release_left_join() {
-  // @@protoc_insertion_point(field_unsafe_arena_release:io.deephaven.proto.backplane.grpc.BatchTableRequest.Operation.left_join)
-  if (op_case() == kLeftJoin) {
-    clear_has_op();
-    auto* temp = _impl_.op_.left_join_;
-    _impl_.op_.left_join_ = nullptr;
-    return temp;
-  } else {
-    return nullptr;
-  }
-}
-inline void BatchTableRequest_Operation::unsafe_arena_set_allocated_left_join(::io::deephaven::proto::backplane::grpc::LeftJoinTablesRequest* value) {
-  // We rely on the oneof clear method to free the earlier contents
-  // of this oneof. We can directly use the pointer we're given to
-  // set the new value.
-  clear_op();
-  if (value) {
-    set_has_left_join();
-    _impl_.op_.left_join_ = value;
-  }
-  // @@protoc_insertion_point(field_unsafe_arena_set_allocated:io.deephaven.proto.backplane.grpc.BatchTableRequest.Operation.left_join)
-}
-inline ::io::deephaven::proto::backplane::grpc::LeftJoinTablesRequest* BatchTableRequest_Operation::_internal_mutable_left_join() {
-  if (op_case() != kLeftJoin) {
-    clear_op();
-    set_has_left_join();
-    _impl_.op_.left_join_ = CreateMaybeMessage<::io::deephaven::proto::backplane::grpc::LeftJoinTablesRequest>(GetArena());
-  }
-  return _impl_.op_.left_join_;
-}
-inline ::io::deephaven::proto::backplane::grpc::LeftJoinTablesRequest* BatchTableRequest_Operation::mutable_left_join() ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  ::io::deephaven::proto::backplane::grpc::LeftJoinTablesRequest* _msg = _internal_mutable_left_join();
-  // @@protoc_insertion_point(field_mutable:io.deephaven.proto.backplane.grpc.BatchTableRequest.Operation.left_join)
-  return _msg;
-}
-
-// .io.deephaven.proto.backplane.grpc.AsOfJoinTablesRequest as_of_join = 27 [deprecated = true];
-inline bool BatchTableRequest_Operation::has_as_of_join() const {
-  return op_case() == kAsOfJoin;
-}
-inline bool BatchTableRequest_Operation::_internal_has_as_of_join() const {
-  return op_case() == kAsOfJoin;
-}
-inline void BatchTableRequest_Operation::set_has_as_of_join() {
-  _impl_._oneof_case_[0] = kAsOfJoin;
-}
-inline void BatchTableRequest_Operation::clear_as_of_join() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  if (op_case() == kAsOfJoin) {
-    if (GetArena() == nullptr) {
-      delete _impl_.op_.as_of_join_;
-    }
-    clear_has_op();
-  }
-}
-inline ::io::deephaven::proto::backplane::grpc::AsOfJoinTablesRequest* BatchTableRequest_Operation::release_as_of_join() {
-  // @@protoc_insertion_point(field_release:io.deephaven.proto.backplane.grpc.BatchTableRequest.Operation.as_of_join)
-  if (op_case() == kAsOfJoin) {
-    clear_has_op();
-    auto* temp = _impl_.op_.as_of_join_;
-    if (GetArena() != nullptr) {
-      temp = ::google::protobuf::internal::DuplicateIfNonNull(temp);
-    }
-    _impl_.op_.as_of_join_ = nullptr;
-    return temp;
-  } else {
-    return nullptr;
-  }
-}
-inline const ::io::deephaven::proto::backplane::grpc::AsOfJoinTablesRequest& BatchTableRequest_Operation::_internal_as_of_join() const {
-  return op_case() == kAsOfJoin ? *_impl_.op_.as_of_join_ : reinterpret_cast<::io::deephaven::proto::backplane::grpc::AsOfJoinTablesRequest&>(::io::deephaven::proto::backplane::grpc::_AsOfJoinTablesRequest_default_instance_);
-}
-inline const ::io::deephaven::proto::backplane::grpc::AsOfJoinTablesRequest& BatchTableRequest_Operation::as_of_join() const ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  // @@protoc_insertion_point(field_get:io.deephaven.proto.backplane.grpc.BatchTableRequest.Operation.as_of_join)
-  return _internal_as_of_join();
-}
-inline ::io::deephaven::proto::backplane::grpc::AsOfJoinTablesRequest* BatchTableRequest_Operation::unsafe_arena_release_as_of_join() {
-  // @@protoc_insertion_point(field_unsafe_arena_release:io.deephaven.proto.backplane.grpc.BatchTableRequest.Operation.as_of_join)
-  if (op_case() == kAsOfJoin) {
-    clear_has_op();
-    auto* temp = _impl_.op_.as_of_join_;
-    _impl_.op_.as_of_join_ = nullptr;
-    return temp;
-  } else {
-    return nullptr;
-  }
-}
-inline void BatchTableRequest_Operation::unsafe_arena_set_allocated_as_of_join(::io::deephaven::proto::backplane::grpc::AsOfJoinTablesRequest* value) {
-  // We rely on the oneof clear method to free the earlier contents
-  // of this oneof. We can directly use the pointer we're given to
-  // set the new value.
-  clear_op();
-  if (value) {
-    set_has_as_of_join();
-    _impl_.op_.as_of_join_ = value;
-  }
-  // @@protoc_insertion_point(field_unsafe_arena_set_allocated:io.deephaven.proto.backplane.grpc.BatchTableRequest.Operation.as_of_join)
-}
-inline ::io::deephaven::proto::backplane::grpc::AsOfJoinTablesRequest* BatchTableRequest_Operation::_internal_mutable_as_of_join() {
-  if (op_case() != kAsOfJoin) {
-    clear_op();
-    set_has_as_of_join();
-    _impl_.op_.as_of_join_ = CreateMaybeMessage<::io::deephaven::proto::backplane::grpc::AsOfJoinTablesRequest>(GetArena());
-  }
-  return _impl_.op_.as_of_join_;
-}
-inline ::io::deephaven::proto::backplane::grpc::AsOfJoinTablesRequest* BatchTableRequest_Operation::mutable_as_of_join() ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  ::io::deephaven::proto::backplane::grpc::AsOfJoinTablesRequest* _msg = _internal_mutable_as_of_join();
-  // @@protoc_insertion_point(field_mutable:io.deephaven.proto.backplane.grpc.BatchTableRequest.Operation.as_of_join)
-  return _msg;
-}
-
-// .io.deephaven.proto.backplane.grpc.FetchTableRequest fetch_table = 28;
-inline bool BatchTableRequest_Operation::has_fetch_table() const {
-  return op_case() == kFetchTable;
-}
-inline bool BatchTableRequest_Operation::_internal_has_fetch_table() const {
-  return op_case() == kFetchTable;
-}
-inline void BatchTableRequest_Operation::set_has_fetch_table() {
-  _impl_._oneof_case_[0] = kFetchTable;
-}
-inline void BatchTableRequest_Operation::clear_fetch_table() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  if (op_case() == kFetchTable) {
-    if (GetArena() == nullptr) {
-      delete _impl_.op_.fetch_table_;
-    }
-    clear_has_op();
-  }
-}
-inline ::io::deephaven::proto::backplane::grpc::FetchTableRequest* BatchTableRequest_Operation::release_fetch_table() {
-  // @@protoc_insertion_point(field_release:io.deephaven.proto.backplane.grpc.BatchTableRequest.Operation.fetch_table)
-  if (op_case() == kFetchTable) {
-    clear_has_op();
-    auto* temp = _impl_.op_.fetch_table_;
-    if (GetArena() != nullptr) {
-      temp = ::google::protobuf::internal::DuplicateIfNonNull(temp);
-    }
-    _impl_.op_.fetch_table_ = nullptr;
-    return temp;
-  } else {
-    return nullptr;
-  }
-}
-inline const ::io::deephaven::proto::backplane::grpc::FetchTableRequest& BatchTableRequest_Operation::_internal_fetch_table() const {
-  return op_case() == kFetchTable ? *_impl_.op_.fetch_table_ : reinterpret_cast<::io::deephaven::proto::backplane::grpc::FetchTableRequest&>(::io::deephaven::proto::backplane::grpc::_FetchTableRequest_default_instance_);
-}
-inline const ::io::deephaven::proto::backplane::grpc::FetchTableRequest& BatchTableRequest_Operation::fetch_table() const ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  // @@protoc_insertion_point(field_get:io.deephaven.proto.backplane.grpc.BatchTableRequest.Operation.fetch_table)
-  return _internal_fetch_table();
-}
-inline ::io::deephaven::proto::backplane::grpc::FetchTableRequest* BatchTableRequest_Operation::unsafe_arena_release_fetch_table() {
-  // @@protoc_insertion_point(field_unsafe_arena_release:io.deephaven.proto.backplane.grpc.BatchTableRequest.Operation.fetch_table)
-  if (op_case() == kFetchTable) {
-    clear_has_op();
-    auto* temp = _impl_.op_.fetch_table_;
-    _impl_.op_.fetch_table_ = nullptr;
-    return temp;
-  } else {
-    return nullptr;
-  }
-}
-inline void BatchTableRequest_Operation::unsafe_arena_set_allocated_fetch_table(::io::deephaven::proto::backplane::grpc::FetchTableRequest* value) {
-  // We rely on the oneof clear method to free the earlier contents
-  // of this oneof. We can directly use the pointer we're given to
-  // set the new value.
-  clear_op();
-  if (value) {
-    set_has_fetch_table();
-    _impl_.op_.fetch_table_ = value;
-  }
-  // @@protoc_insertion_point(field_unsafe_arena_set_allocated:io.deephaven.proto.backplane.grpc.BatchTableRequest.Operation.fetch_table)
-}
-inline ::io::deephaven::proto::backplane::grpc::FetchTableRequest* BatchTableRequest_Operation::_internal_mutable_fetch_table() {
-  if (op_case() != kFetchTable) {
-    clear_op();
-    set_has_fetch_table();
-    _impl_.op_.fetch_table_ = CreateMaybeMessage<::io::deephaven::proto::backplane::grpc::FetchTableRequest>(GetArena());
-  }
-  return _impl_.op_.fetch_table_;
-}
-inline ::io::deephaven::proto::backplane::grpc::FetchTableRequest* BatchTableRequest_Operation::mutable_fetch_table() ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  ::io::deephaven::proto::backplane::grpc::FetchTableRequest* _msg = _internal_mutable_fetch_table();
-  // @@protoc_insertion_point(field_mutable:io.deephaven.proto.backplane.grpc.BatchTableRequest.Operation.fetch_table)
-  return _msg;
-}
-
-// .io.deephaven.proto.backplane.grpc.ApplyPreviewColumnsRequest apply_preview_columns = 30;
-inline bool BatchTableRequest_Operation::has_apply_preview_columns() const {
-  return op_case() == kApplyPreviewColumns;
-}
-inline bool BatchTableRequest_Operation::_internal_has_apply_preview_columns() const {
-  return op_case() == kApplyPreviewColumns;
-}
-inline void BatchTableRequest_Operation::set_has_apply_preview_columns() {
-  _impl_._oneof_case_[0] = kApplyPreviewColumns;
-}
-inline void BatchTableRequest_Operation::clear_apply_preview_columns() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  if (op_case() == kApplyPreviewColumns) {
-    if (GetArena() == nullptr) {
-      delete _impl_.op_.apply_preview_columns_;
-    }
-    clear_has_op();
-  }
-}
-inline ::io::deephaven::proto::backplane::grpc::ApplyPreviewColumnsRequest* BatchTableRequest_Operation::release_apply_preview_columns() {
-  // @@protoc_insertion_point(field_release:io.deephaven.proto.backplane.grpc.BatchTableRequest.Operation.apply_preview_columns)
-  if (op_case() == kApplyPreviewColumns) {
-    clear_has_op();
-    auto* temp = _impl_.op_.apply_preview_columns_;
-    if (GetArena() != nullptr) {
-      temp = ::google::protobuf::internal::DuplicateIfNonNull(temp);
-    }
-    _impl_.op_.apply_preview_columns_ = nullptr;
-    return temp;
-  } else {
-    return nullptr;
-  }
-}
-inline const ::io::deephaven::proto::backplane::grpc::ApplyPreviewColumnsRequest& BatchTableRequest_Operation::_internal_apply_preview_columns() const {
-  return op_case() == kApplyPreviewColumns ? *_impl_.op_.apply_preview_columns_ : reinterpret_cast<::io::deephaven::proto::backplane::grpc::ApplyPreviewColumnsRequest&>(::io::deephaven::proto::backplane::grpc::_ApplyPreviewColumnsRequest_default_instance_);
-}
-inline const ::io::deephaven::proto::backplane::grpc::ApplyPreviewColumnsRequest& BatchTableRequest_Operation::apply_preview_columns() const ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  // @@protoc_insertion_point(field_get:io.deephaven.proto.backplane.grpc.BatchTableRequest.Operation.apply_preview_columns)
-  return _internal_apply_preview_columns();
-}
-inline ::io::deephaven::proto::backplane::grpc::ApplyPreviewColumnsRequest* BatchTableRequest_Operation::unsafe_arena_release_apply_preview_columns() {
-  // @@protoc_insertion_point(field_unsafe_arena_release:io.deephaven.proto.backplane.grpc.BatchTableRequest.Operation.apply_preview_columns)
-  if (op_case() == kApplyPreviewColumns) {
-    clear_has_op();
-    auto* temp = _impl_.op_.apply_preview_columns_;
-    _impl_.op_.apply_preview_columns_ = nullptr;
-    return temp;
-  } else {
-    return nullptr;
-  }
-}
-inline void BatchTableRequest_Operation::unsafe_arena_set_allocated_apply_preview_columns(::io::deephaven::proto::backplane::grpc::ApplyPreviewColumnsRequest* value) {
-  // We rely on the oneof clear method to free the earlier contents
-  // of this oneof. We can directly use the pointer we're given to
-  // set the new value.
-  clear_op();
-  if (value) {
-    set_has_apply_preview_columns();
-    _impl_.op_.apply_preview_columns_ = value;
-  }
-  // @@protoc_insertion_point(field_unsafe_arena_set_allocated:io.deephaven.proto.backplane.grpc.BatchTableRequest.Operation.apply_preview_columns)
-}
-inline ::io::deephaven::proto::backplane::grpc::ApplyPreviewColumnsRequest* BatchTableRequest_Operation::_internal_mutable_apply_preview_columns() {
-  if (op_case() != kApplyPreviewColumns) {
-    clear_op();
-    set_has_apply_preview_columns();
-    _impl_.op_.apply_preview_columns_ = CreateMaybeMessage<::io::deephaven::proto::backplane::grpc::ApplyPreviewColumnsRequest>(GetArena());
-  }
-  return _impl_.op_.apply_preview_columns_;
-}
-inline ::io::deephaven::proto::backplane::grpc::ApplyPreviewColumnsRequest* BatchTableRequest_Operation::mutable_apply_preview_columns() ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  ::io::deephaven::proto::backplane::grpc::ApplyPreviewColumnsRequest* _msg = _internal_mutable_apply_preview_columns();
-  // @@protoc_insertion_point(field_mutable:io.deephaven.proto.backplane.grpc.BatchTableRequest.Operation.apply_preview_columns)
-  return _msg;
-}
-
-// .io.deephaven.proto.backplane.grpc.CreateInputTableRequest create_input_table = 31;
-inline bool BatchTableRequest_Operation::has_create_input_table() const {
-  return op_case() == kCreateInputTable;
-}
-inline bool BatchTableRequest_Operation::_internal_has_create_input_table() const {
-  return op_case() == kCreateInputTable;
-}
-inline void BatchTableRequest_Operation::set_has_create_input_table() {
-  _impl_._oneof_case_[0] = kCreateInputTable;
-}
-inline void BatchTableRequest_Operation::clear_create_input_table() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  if (op_case() == kCreateInputTable) {
-    if (GetArena() == nullptr) {
-      delete _impl_.op_.create_input_table_;
-    }
-    clear_has_op();
-  }
-}
-inline ::io::deephaven::proto::backplane::grpc::CreateInputTableRequest* BatchTableRequest_Operation::release_create_input_table() {
-  // @@protoc_insertion_point(field_release:io.deephaven.proto.backplane.grpc.BatchTableRequest.Operation.create_input_table)
-  if (op_case() == kCreateInputTable) {
-    clear_has_op();
-    auto* temp = _impl_.op_.create_input_table_;
-    if (GetArena() != nullptr) {
-      temp = ::google::protobuf::internal::DuplicateIfNonNull(temp);
-    }
-    _impl_.op_.create_input_table_ = nullptr;
-    return temp;
-  } else {
-    return nullptr;
-  }
-}
-inline const ::io::deephaven::proto::backplane::grpc::CreateInputTableRequest& BatchTableRequest_Operation::_internal_create_input_table() const {
-  return op_case() == kCreateInputTable ? *_impl_.op_.create_input_table_ : reinterpret_cast<::io::deephaven::proto::backplane::grpc::CreateInputTableRequest&>(::io::deephaven::proto::backplane::grpc::_CreateInputTableRequest_default_instance_);
-}
-inline const ::io::deephaven::proto::backplane::grpc::CreateInputTableRequest& BatchTableRequest_Operation::create_input_table() const ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  // @@protoc_insertion_point(field_get:io.deephaven.proto.backplane.grpc.BatchTableRequest.Operation.create_input_table)
-  return _internal_create_input_table();
-}
-inline ::io::deephaven::proto::backplane::grpc::CreateInputTableRequest* BatchTableRequest_Operation::unsafe_arena_release_create_input_table() {
-  // @@protoc_insertion_point(field_unsafe_arena_release:io.deephaven.proto.backplane.grpc.BatchTableRequest.Operation.create_input_table)
-  if (op_case() == kCreateInputTable) {
-    clear_has_op();
-    auto* temp = _impl_.op_.create_input_table_;
-    _impl_.op_.create_input_table_ = nullptr;
-    return temp;
-  } else {
-    return nullptr;
-  }
-}
-inline void BatchTableRequest_Operation::unsafe_arena_set_allocated_create_input_table(::io::deephaven::proto::backplane::grpc::CreateInputTableRequest* value) {
-  // We rely on the oneof clear method to free the earlier contents
-  // of this oneof. We can directly use the pointer we're given to
-  // set the new value.
-  clear_op();
-  if (value) {
-    set_has_create_input_table();
-    _impl_.op_.create_input_table_ = value;
-  }
-  // @@protoc_insertion_point(field_unsafe_arena_set_allocated:io.deephaven.proto.backplane.grpc.BatchTableRequest.Operation.create_input_table)
-}
-inline ::io::deephaven::proto::backplane::grpc::CreateInputTableRequest* BatchTableRequest_Operation::_internal_mutable_create_input_table() {
-  if (op_case() != kCreateInputTable) {
-    clear_op();
-    set_has_create_input_table();
-    _impl_.op_.create_input_table_ = CreateMaybeMessage<::io::deephaven::proto::backplane::grpc::CreateInputTableRequest>(GetArena());
-  }
-  return _impl_.op_.create_input_table_;
-}
-inline ::io::deephaven::proto::backplane::grpc::CreateInputTableRequest* BatchTableRequest_Operation::mutable_create_input_table() ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  ::io::deephaven::proto::backplane::grpc::CreateInputTableRequest* _msg = _internal_mutable_create_input_table();
-  // @@protoc_insertion_point(field_mutable:io.deephaven.proto.backplane.grpc.BatchTableRequest.Operation.create_input_table)
-  return _msg;
-}
-
-// .io.deephaven.proto.backplane.grpc.UpdateByRequest update_by = 32;
-inline bool BatchTableRequest_Operation::has_update_by() const {
-  return op_case() == kUpdateBy;
-}
-inline bool BatchTableRequest_Operation::_internal_has_update_by() const {
-  return op_case() == kUpdateBy;
-}
-inline void BatchTableRequest_Operation::set_has_update_by() {
-  _impl_._oneof_case_[0] = kUpdateBy;
-}
-inline void BatchTableRequest_Operation::clear_update_by() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  if (op_case() == kUpdateBy) {
-    if (GetArena() == nullptr) {
-      delete _impl_.op_.update_by_;
-    }
-    clear_has_op();
-  }
-}
-inline ::io::deephaven::proto::backplane::grpc::UpdateByRequest* BatchTableRequest_Operation::release_update_by() {
-  // @@protoc_insertion_point(field_release:io.deephaven.proto.backplane.grpc.BatchTableRequest.Operation.update_by)
-  if (op_case() == kUpdateBy) {
-    clear_has_op();
-    auto* temp = _impl_.op_.update_by_;
-    if (GetArena() != nullptr) {
-      temp = ::google::protobuf::internal::DuplicateIfNonNull(temp);
-    }
-    _impl_.op_.update_by_ = nullptr;
-    return temp;
-  } else {
-    return nullptr;
-  }
-}
-inline const ::io::deephaven::proto::backplane::grpc::UpdateByRequest& BatchTableRequest_Operation::_internal_update_by() const {
-  return op_case() == kUpdateBy ? *_impl_.op_.update_by_ : reinterpret_cast<::io::deephaven::proto::backplane::grpc::UpdateByRequest&>(::io::deephaven::proto::backplane::grpc::_UpdateByRequest_default_instance_);
-}
-inline const ::io::deephaven::proto::backplane::grpc::UpdateByRequest& BatchTableRequest_Operation::update_by() const ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  // @@protoc_insertion_point(field_get:io.deephaven.proto.backplane.grpc.BatchTableRequest.Operation.update_by)
-  return _internal_update_by();
-}
-inline ::io::deephaven::proto::backplane::grpc::UpdateByRequest* BatchTableRequest_Operation::unsafe_arena_release_update_by() {
-  // @@protoc_insertion_point(field_unsafe_arena_release:io.deephaven.proto.backplane.grpc.BatchTableRequest.Operation.update_by)
-  if (op_case() == kUpdateBy) {
-    clear_has_op();
-    auto* temp = _impl_.op_.update_by_;
-    _impl_.op_.update_by_ = nullptr;
-    return temp;
-  } else {
-    return nullptr;
-  }
-}
-inline void BatchTableRequest_Operation::unsafe_arena_set_allocated_update_by(::io::deephaven::proto::backplane::grpc::UpdateByRequest* value) {
-  // We rely on the oneof clear method to free the earlier contents
-  // of this oneof. We can directly use the pointer we're given to
-  // set the new value.
-  clear_op();
-  if (value) {
-    set_has_update_by();
-    _impl_.op_.update_by_ = value;
-  }
-  // @@protoc_insertion_point(field_unsafe_arena_set_allocated:io.deephaven.proto.backplane.grpc.BatchTableRequest.Operation.update_by)
-}
-inline ::io::deephaven::proto::backplane::grpc::UpdateByRequest* BatchTableRequest_Operation::_internal_mutable_update_by() {
-  if (op_case() != kUpdateBy) {
-    clear_op();
-    set_has_update_by();
-    _impl_.op_.update_by_ = CreateMaybeMessage<::io::deephaven::proto::backplane::grpc::UpdateByRequest>(GetArena());
-  }
-  return _impl_.op_.update_by_;
-}
-inline ::io::deephaven::proto::backplane::grpc::UpdateByRequest* BatchTableRequest_Operation::mutable_update_by() ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  ::io::deephaven::proto::backplane::grpc::UpdateByRequest* _msg = _internal_mutable_update_by();
-  // @@protoc_insertion_point(field_mutable:io.deephaven.proto.backplane.grpc.BatchTableRequest.Operation.update_by)
-  return _msg;
-}
-
-// .io.deephaven.proto.backplane.grpc.WhereInRequest where_in = 33;
-inline bool BatchTableRequest_Operation::has_where_in() const {
-  return op_case() == kWhereIn;
-}
-inline bool BatchTableRequest_Operation::_internal_has_where_in() const {
-  return op_case() == kWhereIn;
-}
-inline void BatchTableRequest_Operation::set_has_where_in() {
-  _impl_._oneof_case_[0] = kWhereIn;
-}
-inline void BatchTableRequest_Operation::clear_where_in() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  if (op_case() == kWhereIn) {
-    if (GetArena() == nullptr) {
-      delete _impl_.op_.where_in_;
-    }
-    clear_has_op();
-  }
-}
-inline ::io::deephaven::proto::backplane::grpc::WhereInRequest* BatchTableRequest_Operation::release_where_in() {
-  // @@protoc_insertion_point(field_release:io.deephaven.proto.backplane.grpc.BatchTableRequest.Operation.where_in)
-  if (op_case() == kWhereIn) {
-    clear_has_op();
-    auto* temp = _impl_.op_.where_in_;
-    if (GetArena() != nullptr) {
-      temp = ::google::protobuf::internal::DuplicateIfNonNull(temp);
-    }
-    _impl_.op_.where_in_ = nullptr;
-    return temp;
-  } else {
-    return nullptr;
-  }
-}
-inline const ::io::deephaven::proto::backplane::grpc::WhereInRequest& BatchTableRequest_Operation::_internal_where_in() const {
-  return op_case() == kWhereIn ? *_impl_.op_.where_in_ : reinterpret_cast<::io::deephaven::proto::backplane::grpc::WhereInRequest&>(::io::deephaven::proto::backplane::grpc::_WhereInRequest_default_instance_);
-}
-inline const ::io::deephaven::proto::backplane::grpc::WhereInRequest& BatchTableRequest_Operation::where_in() const ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  // @@protoc_insertion_point(field_get:io.deephaven.proto.backplane.grpc.BatchTableRequest.Operation.where_in)
-  return _internal_where_in();
-}
-inline ::io::deephaven::proto::backplane::grpc::WhereInRequest* BatchTableRequest_Operation::unsafe_arena_release_where_in() {
-  // @@protoc_insertion_point(field_unsafe_arena_release:io.deephaven.proto.backplane.grpc.BatchTableRequest.Operation.where_in)
-  if (op_case() == kWhereIn) {
-    clear_has_op();
-    auto* temp = _impl_.op_.where_in_;
-    _impl_.op_.where_in_ = nullptr;
-    return temp;
-  } else {
-    return nullptr;
-  }
-}
-inline void BatchTableRequest_Operation::unsafe_arena_set_allocated_where_in(::io::deephaven::proto::backplane::grpc::WhereInRequest* value) {
-  // We rely on the oneof clear method to free the earlier contents
-  // of this oneof. We can directly use the pointer we're given to
-  // set the new value.
-  clear_op();
-  if (value) {
-    set_has_where_in();
-    _impl_.op_.where_in_ = value;
-  }
-  // @@protoc_insertion_point(field_unsafe_arena_set_allocated:io.deephaven.proto.backplane.grpc.BatchTableRequest.Operation.where_in)
-}
-inline ::io::deephaven::proto::backplane::grpc::WhereInRequest* BatchTableRequest_Operation::_internal_mutable_where_in() {
-  if (op_case() != kWhereIn) {
-    clear_op();
-    set_has_where_in();
-    _impl_.op_.where_in_ = CreateMaybeMessage<::io::deephaven::proto::backplane::grpc::WhereInRequest>(GetArena());
-  }
-  return _impl_.op_.where_in_;
-}
-inline ::io::deephaven::proto::backplane::grpc::WhereInRequest* BatchTableRequest_Operation::mutable_where_in() ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  ::io::deephaven::proto::backplane::grpc::WhereInRequest* _msg = _internal_mutable_where_in();
-  // @@protoc_insertion_point(field_mutable:io.deephaven.proto.backplane.grpc.BatchTableRequest.Operation.where_in)
-  return _msg;
-}
-
-// .io.deephaven.proto.backplane.grpc.AggregateAllRequest aggregate_all = 34;
-inline bool BatchTableRequest_Operation::has_aggregate_all() const {
-  return op_case() == kAggregateAll;
-}
-inline bool BatchTableRequest_Operation::_internal_has_aggregate_all() const {
-  return op_case() == kAggregateAll;
-}
-inline void BatchTableRequest_Operation::set_has_aggregate_all() {
-  _impl_._oneof_case_[0] = kAggregateAll;
-}
-inline void BatchTableRequest_Operation::clear_aggregate_all() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  if (op_case() == kAggregateAll) {
-    if (GetArena() == nullptr) {
-      delete _impl_.op_.aggregate_all_;
-    }
-    clear_has_op();
-  }
-}
-inline ::io::deephaven::proto::backplane::grpc::AggregateAllRequest* BatchTableRequest_Operation::release_aggregate_all() {
-  // @@protoc_insertion_point(field_release:io.deephaven.proto.backplane.grpc.BatchTableRequest.Operation.aggregate_all)
-  if (op_case() == kAggregateAll) {
-    clear_has_op();
-    auto* temp = _impl_.op_.aggregate_all_;
-    if (GetArena() != nullptr) {
-      temp = ::google::protobuf::internal::DuplicateIfNonNull(temp);
-    }
-    _impl_.op_.aggregate_all_ = nullptr;
-    return temp;
-  } else {
-    return nullptr;
-  }
-}
-inline const ::io::deephaven::proto::backplane::grpc::AggregateAllRequest& BatchTableRequest_Operation::_internal_aggregate_all() const {
-  return op_case() == kAggregateAll ? *_impl_.op_.aggregate_all_ : reinterpret_cast<::io::deephaven::proto::backplane::grpc::AggregateAllRequest&>(::io::deephaven::proto::backplane::grpc::_AggregateAllRequest_default_instance_);
-}
-inline const ::io::deephaven::proto::backplane::grpc::AggregateAllRequest& BatchTableRequest_Operation::aggregate_all() const ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  // @@protoc_insertion_point(field_get:io.deephaven.proto.backplane.grpc.BatchTableRequest.Operation.aggregate_all)
-  return _internal_aggregate_all();
-}
-inline ::io::deephaven::proto::backplane::grpc::AggregateAllRequest* BatchTableRequest_Operation::unsafe_arena_release_aggregate_all() {
-  // @@protoc_insertion_point(field_unsafe_arena_release:io.deephaven.proto.backplane.grpc.BatchTableRequest.Operation.aggregate_all)
-  if (op_case() == kAggregateAll) {
-    clear_has_op();
-    auto* temp = _impl_.op_.aggregate_all_;
-    _impl_.op_.aggregate_all_ = nullptr;
-    return temp;
-  } else {
-    return nullptr;
-  }
-}
-inline void BatchTableRequest_Operation::unsafe_arena_set_allocated_aggregate_all(::io::deephaven::proto::backplane::grpc::AggregateAllRequest* value) {
-  // We rely on the oneof clear method to free the earlier contents
-  // of this oneof. We can directly use the pointer we're given to
-  // set the new value.
-  clear_op();
-  if (value) {
-    set_has_aggregate_all();
-    _impl_.op_.aggregate_all_ = value;
-  }
-  // @@protoc_insertion_point(field_unsafe_arena_set_allocated:io.deephaven.proto.backplane.grpc.BatchTableRequest.Operation.aggregate_all)
-}
-inline ::io::deephaven::proto::backplane::grpc::AggregateAllRequest* BatchTableRequest_Operation::_internal_mutable_aggregate_all() {
-  if (op_case() != kAggregateAll) {
-    clear_op();
-    set_has_aggregate_all();
-    _impl_.op_.aggregate_all_ = CreateMaybeMessage<::io::deephaven::proto::backplane::grpc::AggregateAllRequest>(GetArena());
-  }
-  return _impl_.op_.aggregate_all_;
-}
-inline ::io::deephaven::proto::backplane::grpc::AggregateAllRequest* BatchTableRequest_Operation::mutable_aggregate_all() ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  ::io::deephaven::proto::backplane::grpc::AggregateAllRequest* _msg = _internal_mutable_aggregate_all();
-  // @@protoc_insertion_point(field_mutable:io.deephaven.proto.backplane.grpc.BatchTableRequest.Operation.aggregate_all)
-  return _msg;
-}
-
-// .io.deephaven.proto.backplane.grpc.AggregateRequest aggregate = 35;
-inline bool BatchTableRequest_Operation::has_aggregate() const {
-  return op_case() == kAggregate;
-}
-inline bool BatchTableRequest_Operation::_internal_has_aggregate() const {
-  return op_case() == kAggregate;
-}
-inline void BatchTableRequest_Operation::set_has_aggregate() {
-  _impl_._oneof_case_[0] = kAggregate;
-}
-inline void BatchTableRequest_Operation::clear_aggregate() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  if (op_case() == kAggregate) {
-    if (GetArena() == nullptr) {
-      delete _impl_.op_.aggregate_;
-    }
-    clear_has_op();
-  }
-}
-inline ::io::deephaven::proto::backplane::grpc::AggregateRequest* BatchTableRequest_Operation::release_aggregate() {
-  // @@protoc_insertion_point(field_release:io.deephaven.proto.backplane.grpc.BatchTableRequest.Operation.aggregate)
-  if (op_case() == kAggregate) {
-    clear_has_op();
-    auto* temp = _impl_.op_.aggregate_;
-    if (GetArena() != nullptr) {
-      temp = ::google::protobuf::internal::DuplicateIfNonNull(temp);
-    }
-    _impl_.op_.aggregate_ = nullptr;
-    return temp;
-  } else {
-    return nullptr;
-  }
-}
-inline const ::io::deephaven::proto::backplane::grpc::AggregateRequest& BatchTableRequest_Operation::_internal_aggregate() const {
-  return op_case() == kAggregate ? *_impl_.op_.aggregate_ : reinterpret_cast<::io::deephaven::proto::backplane::grpc::AggregateRequest&>(::io::deephaven::proto::backplane::grpc::_AggregateRequest_default_instance_);
-}
-inline const ::io::deephaven::proto::backplane::grpc::AggregateRequest& BatchTableRequest_Operation::aggregate() const ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  // @@protoc_insertion_point(field_get:io.deephaven.proto.backplane.grpc.BatchTableRequest.Operation.aggregate)
-  return _internal_aggregate();
-}
-inline ::io::deephaven::proto::backplane::grpc::AggregateRequest* BatchTableRequest_Operation::unsafe_arena_release_aggregate() {
-  // @@protoc_insertion_point(field_unsafe_arena_release:io.deephaven.proto.backplane.grpc.BatchTableRequest.Operation.aggregate)
-  if (op_case() == kAggregate) {
-    clear_has_op();
-    auto* temp = _impl_.op_.aggregate_;
-    _impl_.op_.aggregate_ = nullptr;
-    return temp;
-  } else {
-    return nullptr;
-  }
-}
-inline void BatchTableRequest_Operation::unsafe_arena_set_allocated_aggregate(::io::deephaven::proto::backplane::grpc::AggregateRequest* value) {
-  // We rely on the oneof clear method to free the earlier contents
-  // of this oneof. We can directly use the pointer we're given to
-  // set the new value.
-  clear_op();
-  if (value) {
-    set_has_aggregate();
-    _impl_.op_.aggregate_ = value;
-  }
-  // @@protoc_insertion_point(field_unsafe_arena_set_allocated:io.deephaven.proto.backplane.grpc.BatchTableRequest.Operation.aggregate)
-}
-inline ::io::deephaven::proto::backplane::grpc::AggregateRequest* BatchTableRequest_Operation::_internal_mutable_aggregate() {
-  if (op_case() != kAggregate) {
-    clear_op();
-    set_has_aggregate();
-    _impl_.op_.aggregate_ = CreateMaybeMessage<::io::deephaven::proto::backplane::grpc::AggregateRequest>(GetArena());
-  }
-  return _impl_.op_.aggregate_;
-}
-inline ::io::deephaven::proto::backplane::grpc::AggregateRequest* BatchTableRequest_Operation::mutable_aggregate() ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  ::io::deephaven::proto::backplane::grpc::AggregateRequest* _msg = _internal_mutable_aggregate();
-  // @@protoc_insertion_point(field_mutable:io.deephaven.proto.backplane.grpc.BatchTableRequest.Operation.aggregate)
-  return _msg;
-}
-
-// .io.deephaven.proto.backplane.grpc.SnapshotTableRequest snapshot = 36;
-inline bool BatchTableRequest_Operation::has_snapshot() const {
-  return op_case() == kSnapshot;
-}
-inline bool BatchTableRequest_Operation::_internal_has_snapshot() const {
-  return op_case() == kSnapshot;
-}
-inline void BatchTableRequest_Operation::set_has_snapshot() {
-  _impl_._oneof_case_[0] = kSnapshot;
-}
-inline void BatchTableRequest_Operation::clear_snapshot() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  if (op_case() == kSnapshot) {
-    if (GetArena() == nullptr) {
-      delete _impl_.op_.snapshot_;
-    }
-    clear_has_op();
-  }
-}
-inline ::io::deephaven::proto::backplane::grpc::SnapshotTableRequest* BatchTableRequest_Operation::release_snapshot() {
-  // @@protoc_insertion_point(field_release:io.deephaven.proto.backplane.grpc.BatchTableRequest.Operation.snapshot)
-  if (op_case() == kSnapshot) {
-    clear_has_op();
-    auto* temp = _impl_.op_.snapshot_;
-    if (GetArena() != nullptr) {
-      temp = ::google::protobuf::internal::DuplicateIfNonNull(temp);
-    }
-    _impl_.op_.snapshot_ = nullptr;
-    return temp;
-  } else {
-    return nullptr;
-  }
-}
-inline const ::io::deephaven::proto::backplane::grpc::SnapshotTableRequest& BatchTableRequest_Operation::_internal_snapshot() const {
-  return op_case() == kSnapshot ? *_impl_.op_.snapshot_ : reinterpret_cast<::io::deephaven::proto::backplane::grpc::SnapshotTableRequest&>(::io::deephaven::proto::backplane::grpc::_SnapshotTableRequest_default_instance_);
-}
-inline const ::io::deephaven::proto::backplane::grpc::SnapshotTableRequest& BatchTableRequest_Operation::snapshot() const ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  // @@protoc_insertion_point(field_get:io.deephaven.proto.backplane.grpc.BatchTableRequest.Operation.snapshot)
-  return _internal_snapshot();
-}
-inline ::io::deephaven::proto::backplane::grpc::SnapshotTableRequest* BatchTableRequest_Operation::unsafe_arena_release_snapshot() {
-  // @@protoc_insertion_point(field_unsafe_arena_release:io.deephaven.proto.backplane.grpc.BatchTableRequest.Operation.snapshot)
-  if (op_case() == kSnapshot) {
-    clear_has_op();
-    auto* temp = _impl_.op_.snapshot_;
-    _impl_.op_.snapshot_ = nullptr;
-    return temp;
-  } else {
-    return nullptr;
-  }
-}
-inline void BatchTableRequest_Operation::unsafe_arena_set_allocated_snapshot(::io::deephaven::proto::backplane::grpc::SnapshotTableRequest* value) {
-  // We rely on the oneof clear method to free the earlier contents
-  // of this oneof. We can directly use the pointer we're given to
-  // set the new value.
-  clear_op();
-  if (value) {
-    set_has_snapshot();
-    _impl_.op_.snapshot_ = value;
-  }
-  // @@protoc_insertion_point(field_unsafe_arena_set_allocated:io.deephaven.proto.backplane.grpc.BatchTableRequest.Operation.snapshot)
-}
-inline ::io::deephaven::proto::backplane::grpc::SnapshotTableRequest* BatchTableRequest_Operation::_internal_mutable_snapshot() {
-  if (op_case() != kSnapshot) {
-    clear_op();
-    set_has_snapshot();
-    _impl_.op_.snapshot_ = CreateMaybeMessage<::io::deephaven::proto::backplane::grpc::SnapshotTableRequest>(GetArena());
-  }
-  return _impl_.op_.snapshot_;
-}
-inline ::io::deephaven::proto::backplane::grpc::SnapshotTableRequest* BatchTableRequest_Operation::mutable_snapshot() ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  ::io::deephaven::proto::backplane::grpc::SnapshotTableRequest* _msg = _internal_mutable_snapshot();
-  // @@protoc_insertion_point(field_mutable:io.deephaven.proto.backplane.grpc.BatchTableRequest.Operation.snapshot)
-  return _msg;
-}
-
-// .io.deephaven.proto.backplane.grpc.SnapshotWhenTableRequest snapshot_when = 37;
-inline bool BatchTableRequest_Operation::has_snapshot_when() const {
-  return op_case() == kSnapshotWhen;
-}
-inline bool BatchTableRequest_Operation::_internal_has_snapshot_when() const {
-  return op_case() == kSnapshotWhen;
-}
-inline void BatchTableRequest_Operation::set_has_snapshot_when() {
-  _impl_._oneof_case_[0] = kSnapshotWhen;
-}
-inline void BatchTableRequest_Operation::clear_snapshot_when() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  if (op_case() == kSnapshotWhen) {
-    if (GetArena() == nullptr) {
-      delete _impl_.op_.snapshot_when_;
-    }
-    clear_has_op();
-  }
-}
-inline ::io::deephaven::proto::backplane::grpc::SnapshotWhenTableRequest* BatchTableRequest_Operation::release_snapshot_when() {
-  // @@protoc_insertion_point(field_release:io.deephaven.proto.backplane.grpc.BatchTableRequest.Operation.snapshot_when)
-  if (op_case() == kSnapshotWhen) {
-    clear_has_op();
-    auto* temp = _impl_.op_.snapshot_when_;
-    if (GetArena() != nullptr) {
-      temp = ::google::protobuf::internal::DuplicateIfNonNull(temp);
-    }
-    _impl_.op_.snapshot_when_ = nullptr;
-    return temp;
-  } else {
-    return nullptr;
-  }
-}
-inline const ::io::deephaven::proto::backplane::grpc::SnapshotWhenTableRequest& BatchTableRequest_Operation::_internal_snapshot_when() const {
-  return op_case() == kSnapshotWhen ? *_impl_.op_.snapshot_when_ : reinterpret_cast<::io::deephaven::proto::backplane::grpc::SnapshotWhenTableRequest&>(::io::deephaven::proto::backplane::grpc::_SnapshotWhenTableRequest_default_instance_);
-}
-inline const ::io::deephaven::proto::backplane::grpc::SnapshotWhenTableRequest& BatchTableRequest_Operation::snapshot_when() const ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  // @@protoc_insertion_point(field_get:io.deephaven.proto.backplane.grpc.BatchTableRequest.Operation.snapshot_when)
-  return _internal_snapshot_when();
-}
-inline ::io::deephaven::proto::backplane::grpc::SnapshotWhenTableRequest* BatchTableRequest_Operation::unsafe_arena_release_snapshot_when() {
-  // @@protoc_insertion_point(field_unsafe_arena_release:io.deephaven.proto.backplane.grpc.BatchTableRequest.Operation.snapshot_when)
-  if (op_case() == kSnapshotWhen) {
-    clear_has_op();
-    auto* temp = _impl_.op_.snapshot_when_;
-    _impl_.op_.snapshot_when_ = nullptr;
-    return temp;
-  } else {
-    return nullptr;
-  }
-}
-inline void BatchTableRequest_Operation::unsafe_arena_set_allocated_snapshot_when(::io::deephaven::proto::backplane::grpc::SnapshotWhenTableRequest* value) {
-  // We rely on the oneof clear method to free the earlier contents
-  // of this oneof. We can directly use the pointer we're given to
-  // set the new value.
-  clear_op();
-  if (value) {
-    set_has_snapshot_when();
-    _impl_.op_.snapshot_when_ = value;
-  }
-  // @@protoc_insertion_point(field_unsafe_arena_set_allocated:io.deephaven.proto.backplane.grpc.BatchTableRequest.Operation.snapshot_when)
-}
-inline ::io::deephaven::proto::backplane::grpc::SnapshotWhenTableRequest* BatchTableRequest_Operation::_internal_mutable_snapshot_when() {
-  if (op_case() != kSnapshotWhen) {
-    clear_op();
-    set_has_snapshot_when();
-    _impl_.op_.snapshot_when_ = CreateMaybeMessage<::io::deephaven::proto::backplane::grpc::SnapshotWhenTableRequest>(GetArena());
-  }
-  return _impl_.op_.snapshot_when_;
-}
-inline ::io::deephaven::proto::backplane::grpc::SnapshotWhenTableRequest* BatchTableRequest_Operation::mutable_snapshot_when() ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  ::io::deephaven::proto::backplane::grpc::SnapshotWhenTableRequest* _msg = _internal_mutable_snapshot_when();
-  // @@protoc_insertion_point(field_mutable:io.deephaven.proto.backplane.grpc.BatchTableRequest.Operation.snapshot_when)
-  return _msg;
-}
-
-// .io.deephaven.proto.backplane.grpc.MetaTableRequest meta_table = 38;
-inline bool BatchTableRequest_Operation::has_meta_table() const {
-  return op_case() == kMetaTable;
-}
-inline bool BatchTableRequest_Operation::_internal_has_meta_table() const {
-  return op_case() == kMetaTable;
-}
-inline void BatchTableRequest_Operation::set_has_meta_table() {
-  _impl_._oneof_case_[0] = kMetaTable;
-}
-inline void BatchTableRequest_Operation::clear_meta_table() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  if (op_case() == kMetaTable) {
-    if (GetArena() == nullptr) {
-      delete _impl_.op_.meta_table_;
-    }
-    clear_has_op();
-  }
-}
-inline ::io::deephaven::proto::backplane::grpc::MetaTableRequest* BatchTableRequest_Operation::release_meta_table() {
-  // @@protoc_insertion_point(field_release:io.deephaven.proto.backplane.grpc.BatchTableRequest.Operation.meta_table)
-  if (op_case() == kMetaTable) {
-    clear_has_op();
-    auto* temp = _impl_.op_.meta_table_;
-    if (GetArena() != nullptr) {
-      temp = ::google::protobuf::internal::DuplicateIfNonNull(temp);
-    }
-    _impl_.op_.meta_table_ = nullptr;
-    return temp;
-  } else {
-    return nullptr;
-  }
-}
-inline const ::io::deephaven::proto::backplane::grpc::MetaTableRequest& BatchTableRequest_Operation::_internal_meta_table() const {
-  return op_case() == kMetaTable ? *_impl_.op_.meta_table_ : reinterpret_cast<::io::deephaven::proto::backplane::grpc::MetaTableRequest&>(::io::deephaven::proto::backplane::grpc::_MetaTableRequest_default_instance_);
-}
-inline const ::io::deephaven::proto::backplane::grpc::MetaTableRequest& BatchTableRequest_Operation::meta_table() const ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  // @@protoc_insertion_point(field_get:io.deephaven.proto.backplane.grpc.BatchTableRequest.Operation.meta_table)
-  return _internal_meta_table();
-}
-inline ::io::deephaven::proto::backplane::grpc::MetaTableRequest* BatchTableRequest_Operation::unsafe_arena_release_meta_table() {
-  // @@protoc_insertion_point(field_unsafe_arena_release:io.deephaven.proto.backplane.grpc.BatchTableRequest.Operation.meta_table)
-  if (op_case() == kMetaTable) {
-    clear_has_op();
-    auto* temp = _impl_.op_.meta_table_;
-    _impl_.op_.meta_table_ = nullptr;
-    return temp;
-  } else {
-    return nullptr;
-  }
-}
-inline void BatchTableRequest_Operation::unsafe_arena_set_allocated_meta_table(::io::deephaven::proto::backplane::grpc::MetaTableRequest* value) {
-  // We rely on the oneof clear method to free the earlier contents
-  // of this oneof. We can directly use the pointer we're given to
-  // set the new value.
-  clear_op();
-  if (value) {
-    set_has_meta_table();
-    _impl_.op_.meta_table_ = value;
-  }
-  // @@protoc_insertion_point(field_unsafe_arena_set_allocated:io.deephaven.proto.backplane.grpc.BatchTableRequest.Operation.meta_table)
-}
-inline ::io::deephaven::proto::backplane::grpc::MetaTableRequest* BatchTableRequest_Operation::_internal_mutable_meta_table() {
-  if (op_case() != kMetaTable) {
-    clear_op();
-    set_has_meta_table();
-    _impl_.op_.meta_table_ = CreateMaybeMessage<::io::deephaven::proto::backplane::grpc::MetaTableRequest>(GetArena());
-  }
-  return _impl_.op_.meta_table_;
-}
-inline ::io::deephaven::proto::backplane::grpc::MetaTableRequest* BatchTableRequest_Operation::mutable_meta_table() ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  ::io::deephaven::proto::backplane::grpc::MetaTableRequest* _msg = _internal_mutable_meta_table();
-  // @@protoc_insertion_point(field_mutable:io.deephaven.proto.backplane.grpc.BatchTableRequest.Operation.meta_table)
-  return _msg;
-}
-
-// .io.deephaven.proto.backplane.grpc.RangeJoinTablesRequest range_join = 39;
-inline bool BatchTableRequest_Operation::has_range_join() const {
-  return op_case() == kRangeJoin;
-}
-inline bool BatchTableRequest_Operation::_internal_has_range_join() const {
-  return op_case() == kRangeJoin;
-}
-inline void BatchTableRequest_Operation::set_has_range_join() {
-  _impl_._oneof_case_[0] = kRangeJoin;
-}
-inline void BatchTableRequest_Operation::clear_range_join() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  if (op_case() == kRangeJoin) {
-    if (GetArena() == nullptr) {
-      delete _impl_.op_.range_join_;
-    }
-    clear_has_op();
-  }
-}
-inline ::io::deephaven::proto::backplane::grpc::RangeJoinTablesRequest* BatchTableRequest_Operation::release_range_join() {
-  // @@protoc_insertion_point(field_release:io.deephaven.proto.backplane.grpc.BatchTableRequest.Operation.range_join)
-  if (op_case() == kRangeJoin) {
-    clear_has_op();
-    auto* temp = _impl_.op_.range_join_;
-    if (GetArena() != nullptr) {
-      temp = ::google::protobuf::internal::DuplicateIfNonNull(temp);
-    }
-    _impl_.op_.range_join_ = nullptr;
-    return temp;
-  } else {
-    return nullptr;
-  }
-}
-inline const ::io::deephaven::proto::backplane::grpc::RangeJoinTablesRequest& BatchTableRequest_Operation::_internal_range_join() const {
-  return op_case() == kRangeJoin ? *_impl_.op_.range_join_ : reinterpret_cast<::io::deephaven::proto::backplane::grpc::RangeJoinTablesRequest&>(::io::deephaven::proto::backplane::grpc::_RangeJoinTablesRequest_default_instance_);
-}
-inline const ::io::deephaven::proto::backplane::grpc::RangeJoinTablesRequest& BatchTableRequest_Operation::range_join() const ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  // @@protoc_insertion_point(field_get:io.deephaven.proto.backplane.grpc.BatchTableRequest.Operation.range_join)
-  return _internal_range_join();
-}
-inline ::io::deephaven::proto::backplane::grpc::RangeJoinTablesRequest* BatchTableRequest_Operation::unsafe_arena_release_range_join() {
-  // @@protoc_insertion_point(field_unsafe_arena_release:io.deephaven.proto.backplane.grpc.BatchTableRequest.Operation.range_join)
-  if (op_case() == kRangeJoin) {
-    clear_has_op();
-    auto* temp = _impl_.op_.range_join_;
-    _impl_.op_.range_join_ = nullptr;
-    return temp;
-  } else {
-    return nullptr;
-  }
-}
-inline void BatchTableRequest_Operation::unsafe_arena_set_allocated_range_join(::io::deephaven::proto::backplane::grpc::RangeJoinTablesRequest* value) {
-  // We rely on the oneof clear method to free the earlier contents
-  // of this oneof. We can directly use the pointer we're given to
-  // set the new value.
-  clear_op();
-  if (value) {
-    set_has_range_join();
-    _impl_.op_.range_join_ = value;
-  }
-  // @@protoc_insertion_point(field_unsafe_arena_set_allocated:io.deephaven.proto.backplane.grpc.BatchTableRequest.Operation.range_join)
-}
-inline ::io::deephaven::proto::backplane::grpc::RangeJoinTablesRequest* BatchTableRequest_Operation::_internal_mutable_range_join() {
-  if (op_case() != kRangeJoin) {
-    clear_op();
-    set_has_range_join();
-    _impl_.op_.range_join_ = CreateMaybeMessage<::io::deephaven::proto::backplane::grpc::RangeJoinTablesRequest>(GetArena());
-  }
-  return _impl_.op_.range_join_;
-}
-inline ::io::deephaven::proto::backplane::grpc::RangeJoinTablesRequest* BatchTableRequest_Operation::mutable_range_join() ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  ::io::deephaven::proto::backplane::grpc::RangeJoinTablesRequest* _msg = _internal_mutable_range_join();
-  // @@protoc_insertion_point(field_mutable:io.deephaven.proto.backplane.grpc.BatchTableRequest.Operation.range_join)
-  return _msg;
-}
-
-// .io.deephaven.proto.backplane.grpc.AjRajTablesRequest aj = 40;
-inline bool BatchTableRequest_Operation::has_aj() const {
-  return op_case() == kAj;
-}
-inline bool BatchTableRequest_Operation::_internal_has_aj() const {
-  return op_case() == kAj;
-}
-inline void BatchTableRequest_Operation::set_has_aj() {
-  _impl_._oneof_case_[0] = kAj;
-}
-inline void BatchTableRequest_Operation::clear_aj() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  if (op_case() == kAj) {
-    if (GetArena() == nullptr) {
-      delete _impl_.op_.aj_;
-    }
-    clear_has_op();
-  }
-}
-inline ::io::deephaven::proto::backplane::grpc::AjRajTablesRequest* BatchTableRequest_Operation::release_aj() {
-  // @@protoc_insertion_point(field_release:io.deephaven.proto.backplane.grpc.BatchTableRequest.Operation.aj)
-  if (op_case() == kAj) {
-    clear_has_op();
-    auto* temp = _impl_.op_.aj_;
-    if (GetArena() != nullptr) {
-      temp = ::google::protobuf::internal::DuplicateIfNonNull(temp);
-    }
-    _impl_.op_.aj_ = nullptr;
-    return temp;
-  } else {
-    return nullptr;
-  }
-}
-inline const ::io::deephaven::proto::backplane::grpc::AjRajTablesRequest& BatchTableRequest_Operation::_internal_aj() const {
-  return op_case() == kAj ? *_impl_.op_.aj_ : reinterpret_cast<::io::deephaven::proto::backplane::grpc::AjRajTablesRequest&>(::io::deephaven::proto::backplane::grpc::_AjRajTablesRequest_default_instance_);
-}
-inline const ::io::deephaven::proto::backplane::grpc::AjRajTablesRequest& BatchTableRequest_Operation::aj() const ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  // @@protoc_insertion_point(field_get:io.deephaven.proto.backplane.grpc.BatchTableRequest.Operation.aj)
-  return _internal_aj();
-}
-inline ::io::deephaven::proto::backplane::grpc::AjRajTablesRequest* BatchTableRequest_Operation::unsafe_arena_release_aj() {
-  // @@protoc_insertion_point(field_unsafe_arena_release:io.deephaven.proto.backplane.grpc.BatchTableRequest.Operation.aj)
-  if (op_case() == kAj) {
-    clear_has_op();
-    auto* temp = _impl_.op_.aj_;
-    _impl_.op_.aj_ = nullptr;
-    return temp;
-  } else {
-    return nullptr;
-  }
-}
-inline void BatchTableRequest_Operation::unsafe_arena_set_allocated_aj(::io::deephaven::proto::backplane::grpc::AjRajTablesRequest* value) {
-  // We rely on the oneof clear method to free the earlier contents
-  // of this oneof. We can directly use the pointer we're given to
-  // set the new value.
-  clear_op();
-  if (value) {
-    set_has_aj();
-    _impl_.op_.aj_ = value;
-  }
-  // @@protoc_insertion_point(field_unsafe_arena_set_allocated:io.deephaven.proto.backplane.grpc.BatchTableRequest.Operation.aj)
-}
-inline ::io::deephaven::proto::backplane::grpc::AjRajTablesRequest* BatchTableRequest_Operation::_internal_mutable_aj() {
-  if (op_case() != kAj) {
-    clear_op();
-    set_has_aj();
-    _impl_.op_.aj_ = CreateMaybeMessage<::io::deephaven::proto::backplane::grpc::AjRajTablesRequest>(GetArena());
-  }
-  return _impl_.op_.aj_;
-}
-inline ::io::deephaven::proto::backplane::grpc::AjRajTablesRequest* BatchTableRequest_Operation::mutable_aj() ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  ::io::deephaven::proto::backplane::grpc::AjRajTablesRequest* _msg = _internal_mutable_aj();
-  // @@protoc_insertion_point(field_mutable:io.deephaven.proto.backplane.grpc.BatchTableRequest.Operation.aj)
-  return _msg;
-}
-
-// .io.deephaven.proto.backplane.grpc.AjRajTablesRequest raj = 41;
-inline bool BatchTableRequest_Operation::has_raj() const {
-  return op_case() == kRaj;
-}
-inline bool BatchTableRequest_Operation::_internal_has_raj() const {
-  return op_case() == kRaj;
-}
-inline void BatchTableRequest_Operation::set_has_raj() {
-  _impl_._oneof_case_[0] = kRaj;
-}
-inline void BatchTableRequest_Operation::clear_raj() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  if (op_case() == kRaj) {
-    if (GetArena() == nullptr) {
-      delete _impl_.op_.raj_;
-    }
-    clear_has_op();
-  }
-}
-inline ::io::deephaven::proto::backplane::grpc::AjRajTablesRequest* BatchTableRequest_Operation::release_raj() {
-  // @@protoc_insertion_point(field_release:io.deephaven.proto.backplane.grpc.BatchTableRequest.Operation.raj)
-  if (op_case() == kRaj) {
-    clear_has_op();
-    auto* temp = _impl_.op_.raj_;
-    if (GetArena() != nullptr) {
-      temp = ::google::protobuf::internal::DuplicateIfNonNull(temp);
-    }
-    _impl_.op_.raj_ = nullptr;
-    return temp;
-  } else {
-    return nullptr;
-  }
-}
-inline const ::io::deephaven::proto::backplane::grpc::AjRajTablesRequest& BatchTableRequest_Operation::_internal_raj() const {
-  return op_case() == kRaj ? *_impl_.op_.raj_ : reinterpret_cast<::io::deephaven::proto::backplane::grpc::AjRajTablesRequest&>(::io::deephaven::proto::backplane::grpc::_AjRajTablesRequest_default_instance_);
-}
-inline const ::io::deephaven::proto::backplane::grpc::AjRajTablesRequest& BatchTableRequest_Operation::raj() const ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  // @@protoc_insertion_point(field_get:io.deephaven.proto.backplane.grpc.BatchTableRequest.Operation.raj)
-  return _internal_raj();
-}
-inline ::io::deephaven::proto::backplane::grpc::AjRajTablesRequest* BatchTableRequest_Operation::unsafe_arena_release_raj() {
-  // @@protoc_insertion_point(field_unsafe_arena_release:io.deephaven.proto.backplane.grpc.BatchTableRequest.Operation.raj)
-  if (op_case() == kRaj) {
-    clear_has_op();
-    auto* temp = _impl_.op_.raj_;
-    _impl_.op_.raj_ = nullptr;
-    return temp;
-  } else {
-    return nullptr;
-  }
-}
-inline void BatchTableRequest_Operation::unsafe_arena_set_allocated_raj(::io::deephaven::proto::backplane::grpc::AjRajTablesRequest* value) {
-  // We rely on the oneof clear method to free the earlier contents
-  // of this oneof. We can directly use the pointer we're given to
-  // set the new value.
-  clear_op();
-  if (value) {
-    set_has_raj();
-    _impl_.op_.raj_ = value;
-  }
-  // @@protoc_insertion_point(field_unsafe_arena_set_allocated:io.deephaven.proto.backplane.grpc.BatchTableRequest.Operation.raj)
-}
-inline ::io::deephaven::proto::backplane::grpc::AjRajTablesRequest* BatchTableRequest_Operation::_internal_mutable_raj() {
-  if (op_case() != kRaj) {
-    clear_op();
-    set_has_raj();
-    _impl_.op_.raj_ = CreateMaybeMessage<::io::deephaven::proto::backplane::grpc::AjRajTablesRequest>(GetArena());
-  }
-  return _impl_.op_.raj_;
-}
-inline ::io::deephaven::proto::backplane::grpc::AjRajTablesRequest* BatchTableRequest_Operation::mutable_raj() ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  ::io::deephaven::proto::backplane::grpc::AjRajTablesRequest* _msg = _internal_mutable_raj();
-  // @@protoc_insertion_point(field_mutable:io.deephaven.proto.backplane.grpc.BatchTableRequest.Operation.raj)
-  return _msg;
-}
-
-// .io.deephaven.proto.backplane.grpc.ColumnStatisticsRequest column_statistics = 42;
-inline bool BatchTableRequest_Operation::has_column_statistics() const {
-  return op_case() == kColumnStatistics;
-}
-inline bool BatchTableRequest_Operation::_internal_has_column_statistics() const {
-  return op_case() == kColumnStatistics;
-}
-inline void BatchTableRequest_Operation::set_has_column_statistics() {
-  _impl_._oneof_case_[0] = kColumnStatistics;
-}
-inline void BatchTableRequest_Operation::clear_column_statistics() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  if (op_case() == kColumnStatistics) {
-    if (GetArena() == nullptr) {
-      delete _impl_.op_.column_statistics_;
-    }
-    clear_has_op();
-  }
-}
-inline ::io::deephaven::proto::backplane::grpc::ColumnStatisticsRequest* BatchTableRequest_Operation::release_column_statistics() {
-  // @@protoc_insertion_point(field_release:io.deephaven.proto.backplane.grpc.BatchTableRequest.Operation.column_statistics)
-  if (op_case() == kColumnStatistics) {
-    clear_has_op();
-    auto* temp = _impl_.op_.column_statistics_;
-    if (GetArena() != nullptr) {
-      temp = ::google::protobuf::internal::DuplicateIfNonNull(temp);
-    }
-    _impl_.op_.column_statistics_ = nullptr;
-    return temp;
-  } else {
-    return nullptr;
-  }
-}
-inline const ::io::deephaven::proto::backplane::grpc::ColumnStatisticsRequest& BatchTableRequest_Operation::_internal_column_statistics() const {
-  return op_case() == kColumnStatistics ? *_impl_.op_.column_statistics_ : reinterpret_cast<::io::deephaven::proto::backplane::grpc::ColumnStatisticsRequest&>(::io::deephaven::proto::backplane::grpc::_ColumnStatisticsRequest_default_instance_);
-}
-inline const ::io::deephaven::proto::backplane::grpc::ColumnStatisticsRequest& BatchTableRequest_Operation::column_statistics() const ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  // @@protoc_insertion_point(field_get:io.deephaven.proto.backplane.grpc.BatchTableRequest.Operation.column_statistics)
-  return _internal_column_statistics();
-}
-inline ::io::deephaven::proto::backplane::grpc::ColumnStatisticsRequest* BatchTableRequest_Operation::unsafe_arena_release_column_statistics() {
-  // @@protoc_insertion_point(field_unsafe_arena_release:io.deephaven.proto.backplane.grpc.BatchTableRequest.Operation.column_statistics)
-  if (op_case() == kColumnStatistics) {
-    clear_has_op();
-    auto* temp = _impl_.op_.column_statistics_;
-    _impl_.op_.column_statistics_ = nullptr;
-    return temp;
-  } else {
-    return nullptr;
-  }
-}
-inline void BatchTableRequest_Operation::unsafe_arena_set_allocated_column_statistics(::io::deephaven::proto::backplane::grpc::ColumnStatisticsRequest* value) {
-  // We rely on the oneof clear method to free the earlier contents
-  // of this oneof. We can directly use the pointer we're given to
-  // set the new value.
-  clear_op();
-  if (value) {
-    set_has_column_statistics();
-    _impl_.op_.column_statistics_ = value;
-  }
-  // @@protoc_insertion_point(field_unsafe_arena_set_allocated:io.deephaven.proto.backplane.grpc.BatchTableRequest.Operation.column_statistics)
-}
-inline ::io::deephaven::proto::backplane::grpc::ColumnStatisticsRequest* BatchTableRequest_Operation::_internal_mutable_column_statistics() {
-  if (op_case() != kColumnStatistics) {
-    clear_op();
-    set_has_column_statistics();
-    _impl_.op_.column_statistics_ = CreateMaybeMessage<::io::deephaven::proto::backplane::grpc::ColumnStatisticsRequest>(GetArena());
-  }
-  return _impl_.op_.column_statistics_;
-}
-inline ::io::deephaven::proto::backplane::grpc::ColumnStatisticsRequest* BatchTableRequest_Operation::mutable_column_statistics() ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  ::io::deephaven::proto::backplane::grpc::ColumnStatisticsRequest* _msg = _internal_mutable_column_statistics();
-  // @@protoc_insertion_point(field_mutable:io.deephaven.proto.backplane.grpc.BatchTableRequest.Operation.column_statistics)
-  return _msg;
-}
-
-// .io.deephaven.proto.backplane.grpc.MultiJoinTablesRequest multi_join = 43;
-inline bool BatchTableRequest_Operation::has_multi_join() const {
-  return op_case() == kMultiJoin;
-}
-inline bool BatchTableRequest_Operation::_internal_has_multi_join() const {
-  return op_case() == kMultiJoin;
-}
-inline void BatchTableRequest_Operation::set_has_multi_join() {
-  _impl_._oneof_case_[0] = kMultiJoin;
-}
-inline void BatchTableRequest_Operation::clear_multi_join() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  if (op_case() == kMultiJoin) {
-    if (GetArena() == nullptr) {
-      delete _impl_.op_.multi_join_;
-    }
-    clear_has_op();
-  }
-}
-inline ::io::deephaven::proto::backplane::grpc::MultiJoinTablesRequest* BatchTableRequest_Operation::release_multi_join() {
-  // @@protoc_insertion_point(field_release:io.deephaven.proto.backplane.grpc.BatchTableRequest.Operation.multi_join)
-  if (op_case() == kMultiJoin) {
-    clear_has_op();
-    auto* temp = _impl_.op_.multi_join_;
-    if (GetArena() != nullptr) {
-      temp = ::google::protobuf::internal::DuplicateIfNonNull(temp);
-    }
-    _impl_.op_.multi_join_ = nullptr;
-    return temp;
-  } else {
-    return nullptr;
-  }
-}
-inline const ::io::deephaven::proto::backplane::grpc::MultiJoinTablesRequest& BatchTableRequest_Operation::_internal_multi_join() const {
-  return op_case() == kMultiJoin ? *_impl_.op_.multi_join_ : reinterpret_cast<::io::deephaven::proto::backplane::grpc::MultiJoinTablesRequest&>(::io::deephaven::proto::backplane::grpc::_MultiJoinTablesRequest_default_instance_);
-}
-inline const ::io::deephaven::proto::backplane::grpc::MultiJoinTablesRequest& BatchTableRequest_Operation::multi_join() const ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  // @@protoc_insertion_point(field_get:io.deephaven.proto.backplane.grpc.BatchTableRequest.Operation.multi_join)
-  return _internal_multi_join();
-}
-inline ::io::deephaven::proto::backplane::grpc::MultiJoinTablesRequest* BatchTableRequest_Operation::unsafe_arena_release_multi_join() {
-  // @@protoc_insertion_point(field_unsafe_arena_release:io.deephaven.proto.backplane.grpc.BatchTableRequest.Operation.multi_join)
-  if (op_case() == kMultiJoin) {
-    clear_has_op();
-    auto* temp = _impl_.op_.multi_join_;
-    _impl_.op_.multi_join_ = nullptr;
-    return temp;
-  } else {
-    return nullptr;
-  }
-}
-inline void BatchTableRequest_Operation::unsafe_arena_set_allocated_multi_join(::io::deephaven::proto::backplane::grpc::MultiJoinTablesRequest* value) {
-  // We rely on the oneof clear method to free the earlier contents
-  // of this oneof. We can directly use the pointer we're given to
-  // set the new value.
-  clear_op();
-  if (value) {
-    set_has_multi_join();
-    _impl_.op_.multi_join_ = value;
-  }
-  // @@protoc_insertion_point(field_unsafe_arena_set_allocated:io.deephaven.proto.backplane.grpc.BatchTableRequest.Operation.multi_join)
-}
-inline ::io::deephaven::proto::backplane::grpc::MultiJoinTablesRequest* BatchTableRequest_Operation::_internal_mutable_multi_join() {
-  if (op_case() != kMultiJoin) {
-    clear_op();
-    set_has_multi_join();
-    _impl_.op_.multi_join_ = CreateMaybeMessage<::io::deephaven::proto::backplane::grpc::MultiJoinTablesRequest>(GetArena());
-  }
-  return _impl_.op_.multi_join_;
-}
-inline ::io::deephaven::proto::backplane::grpc::MultiJoinTablesRequest* BatchTableRequest_Operation::mutable_multi_join() ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  ::io::deephaven::proto::backplane::grpc::MultiJoinTablesRequest* _msg = _internal_mutable_multi_join();
-  // @@protoc_insertion_point(field_mutable:io.deephaven.proto.backplane.grpc.BatchTableRequest.Operation.multi_join)
-  return _msg;
-}
-
-inline bool BatchTableRequest_Operation::has_op() const {
-  return op_case() != OP_NOT_SET;
-}
-inline void BatchTableRequest_Operation::clear_has_op() {
-  _impl_._oneof_case_[0] = OP_NOT_SET;
-}
-inline BatchTableRequest_Operation::OpCase BatchTableRequest_Operation::op_case() const {
-  return BatchTableRequest_Operation::OpCase(_impl_._oneof_case_[0]);
-}
-// -------------------------------------------------------------------
-
-// BatchTableRequest
-
-// repeated .io.deephaven.proto.backplane.grpc.BatchTableRequest.Operation ops = 1;
-inline int BatchTableRequest::_internal_ops_size() const {
-  return _internal_ops().size();
-}
-inline int BatchTableRequest::ops_size() const {
-  return _internal_ops_size();
-}
-inline void BatchTableRequest::clear_ops() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  _impl_.ops_.Clear();
-}
-inline ::io::deephaven::proto::backplane::grpc::BatchTableRequest_Operation* BatchTableRequest::mutable_ops(int index)
-    ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  // @@protoc_insertion_point(field_mutable:io.deephaven.proto.backplane.grpc.BatchTableRequest.ops)
-  return _internal_mutable_ops()->Mutable(index);
-}
-inline ::google::protobuf::RepeatedPtrField<::io::deephaven::proto::backplane::grpc::BatchTableRequest_Operation>* BatchTableRequest::mutable_ops()
-    ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  // @@protoc_insertion_point(field_mutable_list:io.deephaven.proto.backplane.grpc.BatchTableRequest.ops)
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  return _internal_mutable_ops();
-}
-inline const ::io::deephaven::proto::backplane::grpc::BatchTableRequest_Operation& BatchTableRequest::ops(int index) const
-    ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  // @@protoc_insertion_point(field_get:io.deephaven.proto.backplane.grpc.BatchTableRequest.ops)
-  return _internal_ops().Get(index);
-}
-inline ::io::deephaven::proto::backplane::grpc::BatchTableRequest_Operation* BatchTableRequest::add_ops() ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  ::io::deephaven::proto::backplane::grpc::BatchTableRequest_Operation* _add = _internal_mutable_ops()->Add();
-  // @@protoc_insertion_point(field_add:io.deephaven.proto.backplane.grpc.BatchTableRequest.ops)
-  return _add;
-}
-inline const ::google::protobuf::RepeatedPtrField<::io::deephaven::proto::backplane::grpc::BatchTableRequest_Operation>& BatchTableRequest::ops() const
-    ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  // @@protoc_insertion_point(field_list:io.deephaven.proto.backplane.grpc.BatchTableRequest.ops)
-  return _internal_ops();
-}
-inline const ::google::protobuf::RepeatedPtrField<::io::deephaven::proto::backplane::grpc::BatchTableRequest_Operation>&
-BatchTableRequest::_internal_ops() const {
-  PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race);
-  return _impl_.ops_;
-}
-inline ::google::protobuf::RepeatedPtrField<::io::deephaven::proto::backplane::grpc::BatchTableRequest_Operation>*
-BatchTableRequest::_internal_mutable_ops() {
-  PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race);
-  return &_impl_.ops_;
-}
-
-#ifdef __GNUC__
-#pragma GCC diagnostic pop
-#endif  // __GNUC__
-
-// @@protoc_insertion_point(namespace_scope)
-}  // namespace grpc
-}  // namespace backplane
-}  // namespace proto
-}  // namespace deephaven
-}  // namespace io
-
-
-namespace google {
-namespace protobuf {
-
-template <>
-struct is_proto_enum<::io::deephaven::proto::backplane::grpc::MathContext_RoundingMode> : std::true_type {};
-template <>
-inline const EnumDescriptor* GetEnumDescriptor<::io::deephaven::proto::backplane::grpc::MathContext_RoundingMode>() {
-  return ::io::deephaven::proto::backplane::grpc::MathContext_RoundingMode_descriptor();
-}
-template <>
-struct is_proto_enum<::io::deephaven::proto::backplane::grpc::AsOfJoinTablesRequest_MatchRule> : std::true_type {};
-template <>
-inline const EnumDescriptor* GetEnumDescriptor<::io::deephaven::proto::backplane::grpc::AsOfJoinTablesRequest_MatchRule>() {
-  return ::io::deephaven::proto::backplane::grpc::AsOfJoinTablesRequest_MatchRule_descriptor();
-}
-template <>
-struct is_proto_enum<::io::deephaven::proto::backplane::grpc::RangeJoinTablesRequest_RangeStartRule> : std::true_type {};
-template <>
-inline const EnumDescriptor* GetEnumDescriptor<::io::deephaven::proto::backplane::grpc::RangeJoinTablesRequest_RangeStartRule>() {
-  return ::io::deephaven::proto::backplane::grpc::RangeJoinTablesRequest_RangeStartRule_descriptor();
-}
-template <>
-struct is_proto_enum<::io::deephaven::proto::backplane::grpc::RangeJoinTablesRequest_RangeEndRule> : std::true_type {};
-template <>
-inline const EnumDescriptor* GetEnumDescriptor<::io::deephaven::proto::backplane::grpc::RangeJoinTablesRequest_RangeEndRule>() {
-  return ::io::deephaven::proto::backplane::grpc::RangeJoinTablesRequest_RangeEndRule_descriptor();
-}
-template <>
-struct is_proto_enum<::io::deephaven::proto::backplane::grpc::ComboAggregateRequest_AggType> : std::true_type {};
-template <>
-inline const EnumDescriptor* GetEnumDescriptor<::io::deephaven::proto::backplane::grpc::ComboAggregateRequest_AggType>() {
-  return ::io::deephaven::proto::backplane::grpc::ComboAggregateRequest_AggType_descriptor();
-}
-template <>
-struct is_proto_enum<::io::deephaven::proto::backplane::grpc::SortDescriptor_SortDirection> : std::true_type {};
-template <>
-inline const EnumDescriptor* GetEnumDescriptor<::io::deephaven::proto::backplane::grpc::SortDescriptor_SortDirection>() {
-  return ::io::deephaven::proto::backplane::grpc::SortDescriptor_SortDirection_descriptor();
-}
-template <>
-struct is_proto_enum<::io::deephaven::proto::backplane::grpc::CompareCondition_CompareOperation> : std::true_type {};
-template <>
-inline const EnumDescriptor* GetEnumDescriptor<::io::deephaven::proto::backplane::grpc::CompareCondition_CompareOperation>() {
-  return ::io::deephaven::proto::backplane::grpc::CompareCondition_CompareOperation_descriptor();
-}
-template <>
-struct is_proto_enum<::io::deephaven::proto::backplane::grpc::BadDataBehavior> : std::true_type {};
-template <>
-inline const EnumDescriptor* GetEnumDescriptor<::io::deephaven::proto::backplane::grpc::BadDataBehavior>() {
-  return ::io::deephaven::proto::backplane::grpc::BadDataBehavior_descriptor();
-}
-template <>
-struct is_proto_enum<::io::deephaven::proto::backplane::grpc::UpdateByNullBehavior> : std::true_type {};
-template <>
-inline const EnumDescriptor* GetEnumDescriptor<::io::deephaven::proto::backplane::grpc::UpdateByNullBehavior>() {
-  return ::io::deephaven::proto::backplane::grpc::UpdateByNullBehavior_descriptor();
-}
-template <>
-struct is_proto_enum<::io::deephaven::proto::backplane::grpc::NullValue> : std::true_type {};
-template <>
-inline const EnumDescriptor* GetEnumDescriptor<::io::deephaven::proto::backplane::grpc::NullValue>() {
-  return ::io::deephaven::proto::backplane::grpc::NullValue_descriptor();
-}
-template <>
-struct is_proto_enum<::io::deephaven::proto::backplane::grpc::CaseSensitivity> : std::true_type {};
-template <>
-inline const EnumDescriptor* GetEnumDescriptor<::io::deephaven::proto::backplane::grpc::CaseSensitivity>() {
-  return ::io::deephaven::proto::backplane::grpc::CaseSensitivity_descriptor();
-}
-template <>
-struct is_proto_enum<::io::deephaven::proto::backplane::grpc::MatchType> : std::true_type {};
-template <>
-inline const EnumDescriptor* GetEnumDescriptor<::io::deephaven::proto::backplane::grpc::MatchType>() {
-  return ::io::deephaven::proto::backplane::grpc::MatchType_descriptor();
-}
-
-}  // namespace protobuf
-}  // namespace google
-
-// @@protoc_insertion_point(global_scope)
-
-#include "google/protobuf/port_undef.inc"
-
-#endif  // GOOGLE_PROTOBUF_INCLUDED_deephaven_2fproto_2ftable_2eproto_2epb_2eh
diff --git a/cpp-client/deephaven/dhclient/proto/deephaven/proto/ticket.grpc.pb.cc b/cpp-client/deephaven/dhclient/proto/deephaven/proto/ticket.grpc.pb.cc
deleted file mode 100644
index 0de3d0f901c..00000000000
--- a/cpp-client/deephaven/dhclient/proto/deephaven/proto/ticket.grpc.pb.cc
+++ /dev/null
@@ -1,33 +0,0 @@
-// Generated by the gRPC C++ plugin.
-// If you make any local change, they will be lost.
-// source: deephaven/proto/ticket.proto
-
-#include "deephaven/proto/ticket.pb.h"
-#include "deephaven/proto/ticket.grpc.pb.h"
-
-#include <functional>
-#include <grpcpp/support/async_stream.h>
-#include <grpcpp/support/async_unary_call.h>
-#include <grpcpp/impl/channel_interface.h>
-#include <grpcpp/impl/client_unary_call.h>
-#include <grpcpp/support/client_callback.h>
-#include <grpcpp/support/message_allocator.h>
-#include <grpcpp/support/method_handler.h>
-#include <grpcpp/impl/rpc_service_method.h>
-#include <grpcpp/support/server_callback.h>
-#include <grpcpp/impl/server_callback_handlers.h>
-#include <grpcpp/server_context.h>
-#include <grpcpp/impl/service_type.h>
-#include <grpcpp/support/sync_stream.h>
-namespace io {
-namespace deephaven {
-namespace proto {
-namespace backplane {
-namespace grpc {
-
-}  // namespace io
-}  // namespace deephaven
-}  // namespace proto
-}  // namespace backplane
-}  // namespace grpc
-
diff --git a/cpp-client/deephaven/dhclient/proto/deephaven/proto/ticket.grpc.pb.h b/cpp-client/deephaven/dhclient/proto/deephaven/proto/ticket.grpc.pb.h
deleted file mode 100644
index 22846db194c..00000000000
--- a/cpp-client/deephaven/dhclient/proto/deephaven/proto/ticket.grpc.pb.h
+++ /dev/null
@@ -1,44 +0,0 @@
-// Generated by the gRPC C++ plugin.
-// If you make any local change, they will be lost.
-// source: deephaven/proto/ticket.proto
-// Original file comments:
-//
-// Copyright (c) 2016-2022 Deephaven Data Labs and Patent Pending
-#ifndef GRPC_deephaven_2fproto_2fticket_2eproto__INCLUDED
-#define GRPC_deephaven_2fproto_2fticket_2eproto__INCLUDED
-
-#include "deephaven/proto/ticket.pb.h"
-
-#include <functional>
-#include <grpcpp/generic/async_generic_service.h>
-#include <grpcpp/support/async_stream.h>
-#include <grpcpp/support/async_unary_call.h>
-#include <grpcpp/support/client_callback.h>
-#include <grpcpp/client_context.h>
-#include <grpcpp/completion_queue.h>
-#include <grpcpp/support/message_allocator.h>
-#include <grpcpp/support/method_handler.h>
-#include <grpcpp/impl/proto_utils.h>
-#include <grpcpp/impl/rpc_method.h>
-#include <grpcpp/support/server_callback.h>
-#include <grpcpp/impl/server_callback_handlers.h>
-#include <grpcpp/server_context.h>
-#include <grpcpp/impl/service_type.h>
-#include <grpcpp/support/status.h>
-#include <grpcpp/support/stub_options.h>
-#include <grpcpp/support/sync_stream.h>
-
-namespace io {
-namespace deephaven {
-namespace proto {
-namespace backplane {
-namespace grpc {
-
-}  // namespace grpc
-}  // namespace backplane
-}  // namespace proto
-}  // namespace deephaven
-}  // namespace io
-
-
-#endif  // GRPC_deephaven_2fproto_2fticket_2eproto__INCLUDED
diff --git a/cpp-client/deephaven/dhclient/proto/deephaven/proto/ticket.pb.cc b/cpp-client/deephaven/dhclient/proto/deephaven/proto/ticket.pb.cc
deleted file mode 100644
index 8dd24d6cdb9..00000000000
--- a/cpp-client/deephaven/dhclient/proto/deephaven/proto/ticket.pb.cc
+++ /dev/null
@@ -1,602 +0,0 @@
-// Generated by the protocol buffer compiler.  DO NOT EDIT!
-// source: deephaven/proto/ticket.proto
-
-#include "deephaven/proto/ticket.pb.h"
-
-#include <algorithm>
-#include "google/protobuf/io/coded_stream.h"
-#include "google/protobuf/extension_set.h"
-#include "google/protobuf/wire_format_lite.h"
-#include "google/protobuf/descriptor.h"
-#include "google/protobuf/generated_message_reflection.h"
-#include "google/protobuf/reflection_ops.h"
-#include "google/protobuf/wire_format.h"
-#include "google/protobuf/generated_message_tctable_impl.h"
-// @@protoc_insertion_point(includes)
-
-// Must be included last.
-#include "google/protobuf/port_def.inc"
-PROTOBUF_PRAGMA_INIT_SEG
-namespace _pb = ::google::protobuf;
-namespace _pbi = ::google::protobuf::internal;
-namespace _fl = ::google::protobuf::internal::field_layout;
-namespace io {
-namespace deephaven {
-namespace proto {
-namespace backplane {
-namespace grpc {
-
-inline constexpr Ticket::Impl_::Impl_(
-    ::_pbi::ConstantInitialized) noexcept
-      : ticket_(
-            &::google::protobuf::internal::fixed_address_empty_string,
-            ::_pbi::ConstantInitialized()),
-        _cached_size_{0} {}
-
-template <typename>
-PROTOBUF_CONSTEXPR Ticket::Ticket(::_pbi::ConstantInitialized)
-    : _impl_(::_pbi::ConstantInitialized()) {}
-struct TicketDefaultTypeInternal {
-  PROTOBUF_CONSTEXPR TicketDefaultTypeInternal() : _instance(::_pbi::ConstantInitialized{}) {}
-  ~TicketDefaultTypeInternal() {}
-  union {
-    Ticket _instance;
-  };
-};
-
-PROTOBUF_ATTRIBUTE_NO_DESTROY PROTOBUF_CONSTINIT
-    PROTOBUF_ATTRIBUTE_INIT_PRIORITY1 TicketDefaultTypeInternal _Ticket_default_instance_;
-
-inline constexpr TypedTicket::Impl_::Impl_(
-    ::_pbi::ConstantInitialized) noexcept
-      : _cached_size_{0},
-        type_(
-            &::google::protobuf::internal::fixed_address_empty_string,
-            ::_pbi::ConstantInitialized()),
-        ticket_{nullptr} {}
-
-template <typename>
-PROTOBUF_CONSTEXPR TypedTicket::TypedTicket(::_pbi::ConstantInitialized)
-    : _impl_(::_pbi::ConstantInitialized()) {}
-struct TypedTicketDefaultTypeInternal {
-  PROTOBUF_CONSTEXPR TypedTicketDefaultTypeInternal() : _instance(::_pbi::ConstantInitialized{}) {}
-  ~TypedTicketDefaultTypeInternal() {}
-  union {
-    TypedTicket _instance;
-  };
-};
-
-PROTOBUF_ATTRIBUTE_NO_DESTROY PROTOBUF_CONSTINIT
-    PROTOBUF_ATTRIBUTE_INIT_PRIORITY1 TypedTicketDefaultTypeInternal _TypedTicket_default_instance_;
-}  // namespace grpc
-}  // namespace backplane
-}  // namespace proto
-}  // namespace deephaven
-}  // namespace io
-static ::_pb::Metadata file_level_metadata_deephaven_2fproto_2fticket_2eproto[2];
-static constexpr const ::_pb::EnumDescriptor**
-    file_level_enum_descriptors_deephaven_2fproto_2fticket_2eproto = nullptr;
-static constexpr const ::_pb::ServiceDescriptor**
-    file_level_service_descriptors_deephaven_2fproto_2fticket_2eproto = nullptr;
-const ::uint32_t TableStruct_deephaven_2fproto_2fticket_2eproto::offsets[] PROTOBUF_SECTION_VARIABLE(
-    protodesc_cold) = {
-    ~0u,  // no _has_bits_
-    PROTOBUF_FIELD_OFFSET(::io::deephaven::proto::backplane::grpc::Ticket, _internal_metadata_),
-    ~0u,  // no _extensions_
-    ~0u,  // no _oneof_case_
-    ~0u,  // no _weak_field_map_
-    ~0u,  // no _inlined_string_donated_
-    ~0u,  // no _split_
-    ~0u,  // no sizeof(Split)
-    PROTOBUF_FIELD_OFFSET(::io::deephaven::proto::backplane::grpc::Ticket, _impl_.ticket_),
-    PROTOBUF_FIELD_OFFSET(::io::deephaven::proto::backplane::grpc::TypedTicket, _impl_._has_bits_),
-    PROTOBUF_FIELD_OFFSET(::io::deephaven::proto::backplane::grpc::TypedTicket, _internal_metadata_),
-    ~0u,  // no _extensions_
-    ~0u,  // no _oneof_case_
-    ~0u,  // no _weak_field_map_
-    ~0u,  // no _inlined_string_donated_
-    ~0u,  // no _split_
-    ~0u,  // no sizeof(Split)
-    PROTOBUF_FIELD_OFFSET(::io::deephaven::proto::backplane::grpc::TypedTicket, _impl_.ticket_),
-    PROTOBUF_FIELD_OFFSET(::io::deephaven::proto::backplane::grpc::TypedTicket, _impl_.type_),
-    0,
-    ~0u,
-};
-
-static const ::_pbi::MigrationSchema
-    schemas[] PROTOBUF_SECTION_VARIABLE(protodesc_cold) = {
-        {0, -1, -1, sizeof(::io::deephaven::proto::backplane::grpc::Ticket)},
-        {9, 19, -1, sizeof(::io::deephaven::proto::backplane::grpc::TypedTicket)},
-};
-
-static const ::_pb::Message* const file_default_instances[] = {
-    &::io::deephaven::proto::backplane::grpc::_Ticket_default_instance_._instance,
-    &::io::deephaven::proto::backplane::grpc::_TypedTicket_default_instance_._instance,
-};
-const char descriptor_table_protodef_deephaven_2fproto_2fticket_2eproto[] PROTOBUF_SECTION_VARIABLE(protodesc_cold) = {
-    "\n\034deephaven/proto/ticket.proto\022!io.deeph"
-    "aven.proto.backplane.grpc\"\030\n\006Ticket\022\016\n\006t"
-    "icket\030\001 \001(\014\"V\n\013TypedTicket\0229\n\006ticket\030\001 \001"
-    "(\0132).io.deephaven.proto.backplane.grpc.T"
-    "icket\022\014\n\004type\030\002 \001(\tBBH\001P\001Z<github.com/de"
-    "ephaven/deephaven-core/go/internal/proto"
-    "/ticketb\006proto3"
-};
-static ::absl::once_flag descriptor_table_deephaven_2fproto_2fticket_2eproto_once;
-const ::_pbi::DescriptorTable descriptor_table_deephaven_2fproto_2fticket_2eproto = {
-    false,
-    false,
-    255,
-    descriptor_table_protodef_deephaven_2fproto_2fticket_2eproto,
-    "deephaven/proto/ticket.proto",
-    &descriptor_table_deephaven_2fproto_2fticket_2eproto_once,
-    nullptr,
-    0,
-    2,
-    schemas,
-    file_default_instances,
-    TableStruct_deephaven_2fproto_2fticket_2eproto::offsets,
-    file_level_metadata_deephaven_2fproto_2fticket_2eproto,
-    file_level_enum_descriptors_deephaven_2fproto_2fticket_2eproto,
-    file_level_service_descriptors_deephaven_2fproto_2fticket_2eproto,
-};
-
-// This function exists to be marked as weak.
-// It can significantly speed up compilation by breaking up LLVM's SCC
-// in the .pb.cc translation units. Large translation units see a
-// reduction of more than 35% of walltime for optimized builds. Without
-// the weak attribute all the messages in the file, including all the
-// vtables and everything they use become part of the same SCC through
-// a cycle like:
-// GetMetadata -> descriptor table -> default instances ->
-//   vtables -> GetMetadata
-// By adding a weak function here we break the connection from the
-// individual vtables back into the descriptor table.
-PROTOBUF_ATTRIBUTE_WEAK const ::_pbi::DescriptorTable* descriptor_table_deephaven_2fproto_2fticket_2eproto_getter() {
-  return &descriptor_table_deephaven_2fproto_2fticket_2eproto;
-}
-// Force running AddDescriptors() at dynamic initialization time.
-PROTOBUF_ATTRIBUTE_INIT_PRIORITY2
-static ::_pbi::AddDescriptorsRunner dynamic_init_dummy_deephaven_2fproto_2fticket_2eproto(&descriptor_table_deephaven_2fproto_2fticket_2eproto);
-namespace io {
-namespace deephaven {
-namespace proto {
-namespace backplane {
-namespace grpc {
-// ===================================================================
-
-class Ticket::_Internal {
- public:
-};
-
-Ticket::Ticket(::google::protobuf::Arena* arena)
-    : ::google::protobuf::Message(arena) {
-  SharedCtor(arena);
-  // @@protoc_insertion_point(arena_constructor:io.deephaven.proto.backplane.grpc.Ticket)
-}
-inline PROTOBUF_NDEBUG_INLINE Ticket::Impl_::Impl_(
-    ::google::protobuf::internal::InternalVisibility visibility, ::google::protobuf::Arena* arena,
-    const Impl_& from)
-      : ticket_(arena, from.ticket_),
-        _cached_size_{0} {}
-
-Ticket::Ticket(
-    ::google::protobuf::Arena* arena,
-    const Ticket& from)
-    : ::google::protobuf::Message(arena) {
-  Ticket* const _this = this;
-  (void)_this;
-  _internal_metadata_.MergeFrom<::google::protobuf::UnknownFieldSet>(
-      from._internal_metadata_);
-  new (&_impl_) Impl_(internal_visibility(), arena, from._impl_);
-
-  // @@protoc_insertion_point(copy_constructor:io.deephaven.proto.backplane.grpc.Ticket)
-}
-inline PROTOBUF_NDEBUG_INLINE Ticket::Impl_::Impl_(
-    ::google::protobuf::internal::InternalVisibility visibility,
-    ::google::protobuf::Arena* arena)
-      : ticket_(arena),
-        _cached_size_{0} {}
-
-inline void Ticket::SharedCtor(::_pb::Arena* arena) {
-  new (&_impl_) Impl_(internal_visibility(), arena);
-}
-Ticket::~Ticket() {
-  // @@protoc_insertion_point(destructor:io.deephaven.proto.backplane.grpc.Ticket)
-  _internal_metadata_.Delete<::google::protobuf::UnknownFieldSet>();
-  SharedDtor();
-}
-inline void Ticket::SharedDtor() {
-  ABSL_DCHECK(GetArena() == nullptr);
-  _impl_.ticket_.Destroy();
-  _impl_.~Impl_();
-}
-
-PROTOBUF_NOINLINE void Ticket::Clear() {
-// @@protoc_insertion_point(message_clear_start:io.deephaven.proto.backplane.grpc.Ticket)
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  ::uint32_t cached_has_bits = 0;
-  // Prevent compiler warnings about cached_has_bits being unused
-  (void) cached_has_bits;
-
-  _impl_.ticket_.ClearToEmpty();
-  _internal_metadata_.Clear<::google::protobuf::UnknownFieldSet>();
-}
-
-const char* Ticket::_InternalParse(
-    const char* ptr, ::_pbi::ParseContext* ctx) {
-  ptr = ::_pbi::TcParser::ParseLoop(this, ptr, ctx, &_table_.header);
-  return ptr;
-}
-
-
-PROTOBUF_CONSTINIT PROTOBUF_ATTRIBUTE_INIT_PRIORITY1
-const ::_pbi::TcParseTable<0, 1, 0, 0, 2> Ticket::_table_ = {
-  {
-    0,  // no _has_bits_
-    0, // no _extensions_
-    1, 0,  // max_field_number, fast_idx_mask
-    offsetof(decltype(_table_), field_lookup_table),
-    4294967294,  // skipmap
-    offsetof(decltype(_table_), field_entries),
-    1,  // num_field_entries
-    0,  // num_aux_entries
-    offsetof(decltype(_table_), field_names),  // no aux_entries
-    &_Ticket_default_instance_._instance,
-    ::_pbi::TcParser::GenericFallback,  // fallback
-  }, {{
-    // bytes ticket = 1;
-    {::_pbi::TcParser::FastBS1,
-     {10, 63, 0, PROTOBUF_FIELD_OFFSET(Ticket, _impl_.ticket_)}},
-  }}, {{
-    65535, 65535
-  }}, {{
-    // bytes ticket = 1;
-    {PROTOBUF_FIELD_OFFSET(Ticket, _impl_.ticket_), 0, 0,
-    (0 | ::_fl::kFcSingular | ::_fl::kBytes | ::_fl::kRepAString)},
-  }},
-  // no aux_entries
-  {{
-  }},
-};
-
-::uint8_t* Ticket::_InternalSerialize(
-    ::uint8_t* target,
-    ::google::protobuf::io::EpsCopyOutputStream* stream) const {
-  // @@protoc_insertion_point(serialize_to_array_start:io.deephaven.proto.backplane.grpc.Ticket)
-  ::uint32_t cached_has_bits = 0;
-  (void)cached_has_bits;
-
-  // bytes ticket = 1;
-  if (!this->_internal_ticket().empty()) {
-    const std::string& _s = this->_internal_ticket();
-    target = stream->WriteBytesMaybeAliased(1, _s, target);
-  }
-
-  if (PROTOBUF_PREDICT_FALSE(_internal_metadata_.have_unknown_fields())) {
-    target =
-        ::_pbi::WireFormat::InternalSerializeUnknownFieldsToArray(
-            _internal_metadata_.unknown_fields<::google::protobuf::UnknownFieldSet>(::google::protobuf::UnknownFieldSet::default_instance), target, stream);
-  }
-  // @@protoc_insertion_point(serialize_to_array_end:io.deephaven.proto.backplane.grpc.Ticket)
-  return target;
-}
-
-::size_t Ticket::ByteSizeLong() const {
-// @@protoc_insertion_point(message_byte_size_start:io.deephaven.proto.backplane.grpc.Ticket)
-  ::size_t total_size = 0;
-
-  ::uint32_t cached_has_bits = 0;
-  // Prevent compiler warnings about cached_has_bits being unused
-  (void) cached_has_bits;
-
-  // bytes ticket = 1;
-  if (!this->_internal_ticket().empty()) {
-    total_size += 1 + ::google::protobuf::internal::WireFormatLite::BytesSize(
-                                    this->_internal_ticket());
-  }
-
-  return MaybeComputeUnknownFieldsSize(total_size, &_impl_._cached_size_);
-}
-
-const ::google::protobuf::Message::ClassData Ticket::_class_data_ = {
-    Ticket::MergeImpl,
-    nullptr,  // OnDemandRegisterArenaDtor
-};
-const ::google::protobuf::Message::ClassData* Ticket::GetClassData() const {
-  return &_class_data_;
-}
-
-void Ticket::MergeImpl(::google::protobuf::Message& to_msg, const ::google::protobuf::Message& from_msg) {
-  auto* const _this = static_cast<Ticket*>(&to_msg);
-  auto& from = static_cast<const Ticket&>(from_msg);
-  // @@protoc_insertion_point(class_specific_merge_from_start:io.deephaven.proto.backplane.grpc.Ticket)
-  ABSL_DCHECK_NE(&from, _this);
-  ::uint32_t cached_has_bits = 0;
-  (void) cached_has_bits;
-
-  if (!from._internal_ticket().empty()) {
-    _this->_internal_set_ticket(from._internal_ticket());
-  }
-  _this->_internal_metadata_.MergeFrom<::google::protobuf::UnknownFieldSet>(from._internal_metadata_);
-}
-
-void Ticket::CopyFrom(const Ticket& from) {
-// @@protoc_insertion_point(class_specific_copy_from_start:io.deephaven.proto.backplane.grpc.Ticket)
-  if (&from == this) return;
-  Clear();
-  MergeFrom(from);
-}
-
-PROTOBUF_NOINLINE bool Ticket::IsInitialized() const {
-  return true;
-}
-
-::_pbi::CachedSize* Ticket::AccessCachedSize() const {
-  return &_impl_._cached_size_;
-}
-void Ticket::InternalSwap(Ticket* PROTOBUF_RESTRICT other) {
-  using std::swap;
-  auto* arena = GetArena();
-  ABSL_DCHECK_EQ(arena, other->GetArena());
-  _internal_metadata_.InternalSwap(&other->_internal_metadata_);
-  ::_pbi::ArenaStringPtr::InternalSwap(&_impl_.ticket_, &other->_impl_.ticket_, arena);
-}
-
-::google::protobuf::Metadata Ticket::GetMetadata() const {
-  return ::_pbi::AssignDescriptors(
-      &descriptor_table_deephaven_2fproto_2fticket_2eproto_getter, &descriptor_table_deephaven_2fproto_2fticket_2eproto_once,
-      file_level_metadata_deephaven_2fproto_2fticket_2eproto[0]);
-}
-// ===================================================================
-
-class TypedTicket::_Internal {
- public:
-  using HasBits = decltype(std::declval<TypedTicket>()._impl_._has_bits_);
-  static constexpr ::int32_t kHasBitsOffset =
-    8 * PROTOBUF_FIELD_OFFSET(TypedTicket, _impl_._has_bits_);
-  static const ::io::deephaven::proto::backplane::grpc::Ticket& ticket(const TypedTicket* msg);
-  static void set_has_ticket(HasBits* has_bits) {
-    (*has_bits)[0] |= 1u;
-  }
-};
-
-const ::io::deephaven::proto::backplane::grpc::Ticket& TypedTicket::_Internal::ticket(const TypedTicket* msg) {
-  return *msg->_impl_.ticket_;
-}
-TypedTicket::TypedTicket(::google::protobuf::Arena* arena)
-    : ::google::protobuf::Message(arena) {
-  SharedCtor(arena);
-  // @@protoc_insertion_point(arena_constructor:io.deephaven.proto.backplane.grpc.TypedTicket)
-}
-inline PROTOBUF_NDEBUG_INLINE TypedTicket::Impl_::Impl_(
-    ::google::protobuf::internal::InternalVisibility visibility, ::google::protobuf::Arena* arena,
-    const Impl_& from)
-      : _has_bits_{from._has_bits_},
-        _cached_size_{0},
-        type_(arena, from.type_) {}
-
-TypedTicket::TypedTicket(
-    ::google::protobuf::Arena* arena,
-    const TypedTicket& from)
-    : ::google::protobuf::Message(arena) {
-  TypedTicket* const _this = this;
-  (void)_this;
-  _internal_metadata_.MergeFrom<::google::protobuf::UnknownFieldSet>(
-      from._internal_metadata_);
-  new (&_impl_) Impl_(internal_visibility(), arena, from._impl_);
-  ::uint32_t cached_has_bits = _impl_._has_bits_[0];
-  _impl_.ticket_ = (cached_has_bits & 0x00000001u)
-                ? CreateMaybeMessage<::io::deephaven::proto::backplane::grpc::Ticket>(arena, *from._impl_.ticket_)
-                : nullptr;
-
-  // @@protoc_insertion_point(copy_constructor:io.deephaven.proto.backplane.grpc.TypedTicket)
-}
-inline PROTOBUF_NDEBUG_INLINE TypedTicket::Impl_::Impl_(
-    ::google::protobuf::internal::InternalVisibility visibility,
-    ::google::protobuf::Arena* arena)
-      : _cached_size_{0},
-        type_(arena) {}
-
-inline void TypedTicket::SharedCtor(::_pb::Arena* arena) {
-  new (&_impl_) Impl_(internal_visibility(), arena);
-  _impl_.ticket_ = {};
-}
-TypedTicket::~TypedTicket() {
-  // @@protoc_insertion_point(destructor:io.deephaven.proto.backplane.grpc.TypedTicket)
-  _internal_metadata_.Delete<::google::protobuf::UnknownFieldSet>();
-  SharedDtor();
-}
-inline void TypedTicket::SharedDtor() {
-  ABSL_DCHECK(GetArena() == nullptr);
-  _impl_.type_.Destroy();
-  delete _impl_.ticket_;
-  _impl_.~Impl_();
-}
-
-PROTOBUF_NOINLINE void TypedTicket::Clear() {
-// @@protoc_insertion_point(message_clear_start:io.deephaven.proto.backplane.grpc.TypedTicket)
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  ::uint32_t cached_has_bits = 0;
-  // Prevent compiler warnings about cached_has_bits being unused
-  (void) cached_has_bits;
-
-  _impl_.type_.ClearToEmpty();
-  cached_has_bits = _impl_._has_bits_[0];
-  if (cached_has_bits & 0x00000001u) {
-    ABSL_DCHECK(_impl_.ticket_ != nullptr);
-    _impl_.ticket_->Clear();
-  }
-  _impl_._has_bits_.Clear();
-  _internal_metadata_.Clear<::google::protobuf::UnknownFieldSet>();
-}
-
-const char* TypedTicket::_InternalParse(
-    const char* ptr, ::_pbi::ParseContext* ctx) {
-  ptr = ::_pbi::TcParser::ParseLoop(this, ptr, ctx, &_table_.header);
-  return ptr;
-}
-
-
-PROTOBUF_CONSTINIT PROTOBUF_ATTRIBUTE_INIT_PRIORITY1
-const ::_pbi::TcParseTable<1, 2, 1, 58, 2> TypedTicket::_table_ = {
-  {
-    PROTOBUF_FIELD_OFFSET(TypedTicket, _impl_._has_bits_),
-    0, // no _extensions_
-    2, 8,  // max_field_number, fast_idx_mask
-    offsetof(decltype(_table_), field_lookup_table),
-    4294967292,  // skipmap
-    offsetof(decltype(_table_), field_entries),
-    2,  // num_field_entries
-    1,  // num_aux_entries
-    offsetof(decltype(_table_), aux_entries),
-    &_TypedTicket_default_instance_._instance,
-    ::_pbi::TcParser::GenericFallback,  // fallback
-  }, {{
-    // string type = 2;
-    {::_pbi::TcParser::FastUS1,
-     {18, 63, 0, PROTOBUF_FIELD_OFFSET(TypedTicket, _impl_.type_)}},
-    // .io.deephaven.proto.backplane.grpc.Ticket ticket = 1;
-    {::_pbi::TcParser::FastMtS1,
-     {10, 0, 0, PROTOBUF_FIELD_OFFSET(TypedTicket, _impl_.ticket_)}},
-  }}, {{
-    65535, 65535
-  }}, {{
-    // .io.deephaven.proto.backplane.grpc.Ticket ticket = 1;
-    {PROTOBUF_FIELD_OFFSET(TypedTicket, _impl_.ticket_), _Internal::kHasBitsOffset + 0, 0,
-    (0 | ::_fl::kFcOptional | ::_fl::kMessage | ::_fl::kTvTable)},
-    // string type = 2;
-    {PROTOBUF_FIELD_OFFSET(TypedTicket, _impl_.type_), -1, 0,
-    (0 | ::_fl::kFcSingular | ::_fl::kUtf8String | ::_fl::kRepAString)},
-  }}, {{
-    {::_pbi::TcParser::GetTable<::io::deephaven::proto::backplane::grpc::Ticket>()},
-  }}, {{
-    "\55\0\4\0\0\0\0\0"
-    "io.deephaven.proto.backplane.grpc.TypedTicket"
-    "type"
-  }},
-};
-
-::uint8_t* TypedTicket::_InternalSerialize(
-    ::uint8_t* target,
-    ::google::protobuf::io::EpsCopyOutputStream* stream) const {
-  // @@protoc_insertion_point(serialize_to_array_start:io.deephaven.proto.backplane.grpc.TypedTicket)
-  ::uint32_t cached_has_bits = 0;
-  (void)cached_has_bits;
-
-  cached_has_bits = _impl_._has_bits_[0];
-  // .io.deephaven.proto.backplane.grpc.Ticket ticket = 1;
-  if (cached_has_bits & 0x00000001u) {
-    target = ::google::protobuf::internal::WireFormatLite::InternalWriteMessage(
-        1, _Internal::ticket(this),
-        _Internal::ticket(this).GetCachedSize(), target, stream);
-  }
-
-  // string type = 2;
-  if (!this->_internal_type().empty()) {
-    const std::string& _s = this->_internal_type();
-    ::google::protobuf::internal::WireFormatLite::VerifyUtf8String(
-        _s.data(), static_cast<int>(_s.length()), ::google::protobuf::internal::WireFormatLite::SERIALIZE, "io.deephaven.proto.backplane.grpc.TypedTicket.type");
-    target = stream->WriteStringMaybeAliased(2, _s, target);
-  }
-
-  if (PROTOBUF_PREDICT_FALSE(_internal_metadata_.have_unknown_fields())) {
-    target =
-        ::_pbi::WireFormat::InternalSerializeUnknownFieldsToArray(
-            _internal_metadata_.unknown_fields<::google::protobuf::UnknownFieldSet>(::google::protobuf::UnknownFieldSet::default_instance), target, stream);
-  }
-  // @@protoc_insertion_point(serialize_to_array_end:io.deephaven.proto.backplane.grpc.TypedTicket)
-  return target;
-}
-
-::size_t TypedTicket::ByteSizeLong() const {
-// @@protoc_insertion_point(message_byte_size_start:io.deephaven.proto.backplane.grpc.TypedTicket)
-  ::size_t total_size = 0;
-
-  ::uint32_t cached_has_bits = 0;
-  // Prevent compiler warnings about cached_has_bits being unused
-  (void) cached_has_bits;
-
-  // string type = 2;
-  if (!this->_internal_type().empty()) {
-    total_size += 1 + ::google::protobuf::internal::WireFormatLite::StringSize(
-                                    this->_internal_type());
-  }
-
-  // .io.deephaven.proto.backplane.grpc.Ticket ticket = 1;
-  cached_has_bits = _impl_._has_bits_[0];
-  if (cached_has_bits & 0x00000001u) {
-    total_size +=
-        1 + ::google::protobuf::internal::WireFormatLite::MessageSize(*_impl_.ticket_);
-  }
-
-  return MaybeComputeUnknownFieldsSize(total_size, &_impl_._cached_size_);
-}
-
-const ::google::protobuf::Message::ClassData TypedTicket::_class_data_ = {
-    TypedTicket::MergeImpl,
-    nullptr,  // OnDemandRegisterArenaDtor
-};
-const ::google::protobuf::Message::ClassData* TypedTicket::GetClassData() const {
-  return &_class_data_;
-}
-
-void TypedTicket::MergeImpl(::google::protobuf::Message& to_msg, const ::google::protobuf::Message& from_msg) {
-  auto* const _this = static_cast<TypedTicket*>(&to_msg);
-  auto& from = static_cast<const TypedTicket&>(from_msg);
-  // @@protoc_insertion_point(class_specific_merge_from_start:io.deephaven.proto.backplane.grpc.TypedTicket)
-  ABSL_DCHECK_NE(&from, _this);
-  ::uint32_t cached_has_bits = 0;
-  (void) cached_has_bits;
-
-  if (!from._internal_type().empty()) {
-    _this->_internal_set_type(from._internal_type());
-  }
-  if ((from._impl_._has_bits_[0] & 0x00000001u) != 0) {
-    _this->_internal_mutable_ticket()->::io::deephaven::proto::backplane::grpc::Ticket::MergeFrom(
-        from._internal_ticket());
-  }
-  _this->_internal_metadata_.MergeFrom<::google::protobuf::UnknownFieldSet>(from._internal_metadata_);
-}
-
-void TypedTicket::CopyFrom(const TypedTicket& from) {
-// @@protoc_insertion_point(class_specific_copy_from_start:io.deephaven.proto.backplane.grpc.TypedTicket)
-  if (&from == this) return;
-  Clear();
-  MergeFrom(from);
-}
-
-PROTOBUF_NOINLINE bool TypedTicket::IsInitialized() const {
-  return true;
-}
-
-::_pbi::CachedSize* TypedTicket::AccessCachedSize() const {
-  return &_impl_._cached_size_;
-}
-void TypedTicket::InternalSwap(TypedTicket* PROTOBUF_RESTRICT other) {
-  using std::swap;
-  auto* arena = GetArena();
-  ABSL_DCHECK_EQ(arena, other->GetArena());
-  _internal_metadata_.InternalSwap(&other->_internal_metadata_);
-  swap(_impl_._has_bits_[0], other->_impl_._has_bits_[0]);
-  ::_pbi::ArenaStringPtr::InternalSwap(&_impl_.type_, &other->_impl_.type_, arena);
-  swap(_impl_.ticket_, other->_impl_.ticket_);
-}
-
-::google::protobuf::Metadata TypedTicket::GetMetadata() const {
-  return ::_pbi::AssignDescriptors(
-      &descriptor_table_deephaven_2fproto_2fticket_2eproto_getter, &descriptor_table_deephaven_2fproto_2fticket_2eproto_once,
-      file_level_metadata_deephaven_2fproto_2fticket_2eproto[1]);
-}
-// @@protoc_insertion_point(namespace_scope)
-}  // namespace grpc
-}  // namespace backplane
-}  // namespace proto
-}  // namespace deephaven
-}  // namespace io
-namespace google {
-namespace protobuf {
-}  // namespace protobuf
-}  // namespace google
-// @@protoc_insertion_point(global_scope)
-#include "google/protobuf/port_undef.inc"
diff --git a/cpp-client/deephaven/dhclient/proto/deephaven/proto/ticket.pb.h b/cpp-client/deephaven/dhclient/proto/deephaven/proto/ticket.pb.h
deleted file mode 100644
index 30855e48332..00000000000
--- a/cpp-client/deephaven/dhclient/proto/deephaven/proto/ticket.pb.h
+++ /dev/null
@@ -1,708 +0,0 @@
-// Generated by the protocol buffer compiler.  DO NOT EDIT!
-// source: deephaven/proto/ticket.proto
-// Protobuf C++ Version: 4.25.3
-
-#ifndef GOOGLE_PROTOBUF_INCLUDED_deephaven_2fproto_2fticket_2eproto_2epb_2eh
-#define GOOGLE_PROTOBUF_INCLUDED_deephaven_2fproto_2fticket_2eproto_2epb_2eh
-
-#include <limits>
-#include <string>
-#include <type_traits>
-#include <utility>
-
-#include "google/protobuf/port_def.inc"
-#if PROTOBUF_VERSION < 4025000
-#error "This file was generated by a newer version of protoc which is"
-#error "incompatible with your Protocol Buffer headers. Please update"
-#error "your headers."
-#endif  // PROTOBUF_VERSION
-
-#if 4025003 < PROTOBUF_MIN_PROTOC_VERSION
-#error "This file was generated by an older version of protoc which is"
-#error "incompatible with your Protocol Buffer headers. Please"
-#error "regenerate this file with a newer version of protoc."
-#endif  // PROTOBUF_MIN_PROTOC_VERSION
-#include "google/protobuf/port_undef.inc"
-#include "google/protobuf/io/coded_stream.h"
-#include "google/protobuf/arena.h"
-#include "google/protobuf/arenastring.h"
-#include "google/protobuf/generated_message_tctable_decl.h"
-#include "google/protobuf/generated_message_util.h"
-#include "google/protobuf/metadata_lite.h"
-#include "google/protobuf/generated_message_reflection.h"
-#include "google/protobuf/message.h"
-#include "google/protobuf/repeated_field.h"  // IWYU pragma: export
-#include "google/protobuf/extension_set.h"  // IWYU pragma: export
-#include "google/protobuf/unknown_field_set.h"
-// @@protoc_insertion_point(includes)
-
-// Must be included last.
-#include "google/protobuf/port_def.inc"
-
-#define PROTOBUF_INTERNAL_EXPORT_deephaven_2fproto_2fticket_2eproto
-
-namespace google {
-namespace protobuf {
-namespace internal {
-class AnyMetadata;
-}  // namespace internal
-}  // namespace protobuf
-}  // namespace google
-
-// Internal implementation detail -- do not use these members.
-struct TableStruct_deephaven_2fproto_2fticket_2eproto {
-  static const ::uint32_t offsets[];
-};
-extern const ::google::protobuf::internal::DescriptorTable
-    descriptor_table_deephaven_2fproto_2fticket_2eproto;
-namespace io {
-namespace deephaven {
-namespace proto {
-namespace backplane {
-namespace grpc {
-class Ticket;
-struct TicketDefaultTypeInternal;
-extern TicketDefaultTypeInternal _Ticket_default_instance_;
-class TypedTicket;
-struct TypedTicketDefaultTypeInternal;
-extern TypedTicketDefaultTypeInternal _TypedTicket_default_instance_;
-}  // namespace grpc
-}  // namespace backplane
-}  // namespace proto
-}  // namespace deephaven
-}  // namespace io
-namespace google {
-namespace protobuf {
-}  // namespace protobuf
-}  // namespace google
-
-namespace io {
-namespace deephaven {
-namespace proto {
-namespace backplane {
-namespace grpc {
-
-// ===================================================================
-
-
-// -------------------------------------------------------------------
-
-class Ticket final :
-    public ::google::protobuf::Message /* @@protoc_insertion_point(class_definition:io.deephaven.proto.backplane.grpc.Ticket) */ {
- public:
-  inline Ticket() : Ticket(nullptr) {}
-  ~Ticket() override;
-  template<typename = void>
-  explicit PROTOBUF_CONSTEXPR Ticket(::google::protobuf::internal::ConstantInitialized);
-
-  inline Ticket(const Ticket& from)
-      : Ticket(nullptr, from) {}
-  Ticket(Ticket&& from) noexcept
-    : Ticket() {
-    *this = ::std::move(from);
-  }
-
-  inline Ticket& operator=(const Ticket& from) {
-    CopyFrom(from);
-    return *this;
-  }
-  inline Ticket& operator=(Ticket&& from) noexcept {
-    if (this == &from) return *this;
-    if (GetArena() == from.GetArena()
-  #ifdef PROTOBUF_FORCE_COPY_IN_MOVE
-        && GetArena() != nullptr
-  #endif  // !PROTOBUF_FORCE_COPY_IN_MOVE
-    ) {
-      InternalSwap(&from);
-    } else {
-      CopyFrom(from);
-    }
-    return *this;
-  }
-
-  inline const ::google::protobuf::UnknownFieldSet& unknown_fields() const
-      ABSL_ATTRIBUTE_LIFETIME_BOUND {
-    return _internal_metadata_.unknown_fields<::google::protobuf::UnknownFieldSet>(::google::protobuf::UnknownFieldSet::default_instance);
-  }
-  inline ::google::protobuf::UnknownFieldSet* mutable_unknown_fields()
-      ABSL_ATTRIBUTE_LIFETIME_BOUND {
-    return _internal_metadata_.mutable_unknown_fields<::google::protobuf::UnknownFieldSet>();
-  }
-
-  static const ::google::protobuf::Descriptor* descriptor() {
-    return GetDescriptor();
-  }
-  static const ::google::protobuf::Descriptor* GetDescriptor() {
-    return default_instance().GetMetadata().descriptor;
-  }
-  static const ::google::protobuf::Reflection* GetReflection() {
-    return default_instance().GetMetadata().reflection;
-  }
-  static const Ticket& default_instance() {
-    return *internal_default_instance();
-  }
-  static inline const Ticket* internal_default_instance() {
-    return reinterpret_cast<const Ticket*>(
-               &_Ticket_default_instance_);
-  }
-  static constexpr int kIndexInFileMessages =
-    0;
-
-  friend void swap(Ticket& a, Ticket& b) {
-    a.Swap(&b);
-  }
-  inline void Swap(Ticket* other) {
-    if (other == this) return;
-  #ifdef PROTOBUF_FORCE_COPY_IN_SWAP
-    if (GetArena() != nullptr &&
-        GetArena() == other->GetArena()) {
-   #else  // PROTOBUF_FORCE_COPY_IN_SWAP
-    if (GetArena() == other->GetArena()) {
-  #endif  // !PROTOBUF_FORCE_COPY_IN_SWAP
-      InternalSwap(other);
-    } else {
-      ::google::protobuf::internal::GenericSwap(this, other);
-    }
-  }
-  void UnsafeArenaSwap(Ticket* other) {
-    if (other == this) return;
-    ABSL_DCHECK(GetArena() == other->GetArena());
-    InternalSwap(other);
-  }
-
-  // implements Message ----------------------------------------------
-
-  Ticket* New(::google::protobuf::Arena* arena = nullptr) const final {
-    return CreateMaybeMessage<Ticket>(arena);
-  }
-  using ::google::protobuf::Message::CopyFrom;
-  void CopyFrom(const Ticket& from);
-  using ::google::protobuf::Message::MergeFrom;
-  void MergeFrom( const Ticket& from) {
-    Ticket::MergeImpl(*this, from);
-  }
-  private:
-  static void MergeImpl(::google::protobuf::Message& to_msg, const ::google::protobuf::Message& from_msg);
-  public:
-  PROTOBUF_ATTRIBUTE_REINITIALIZES void Clear() final;
-  bool IsInitialized() const final;
-
-  ::size_t ByteSizeLong() const final;
-  const char* _InternalParse(const char* ptr, ::google::protobuf::internal::ParseContext* ctx) final;
-  ::uint8_t* _InternalSerialize(
-      ::uint8_t* target, ::google::protobuf::io::EpsCopyOutputStream* stream) const final;
-  int GetCachedSize() const { return _impl_._cached_size_.Get(); }
-
-  private:
-  ::google::protobuf::internal::CachedSize* AccessCachedSize() const final;
-  void SharedCtor(::google::protobuf::Arena* arena);
-  void SharedDtor();
-  void InternalSwap(Ticket* other);
-
-  private:
-  friend class ::google::protobuf::internal::AnyMetadata;
-  static ::absl::string_view FullMessageName() {
-    return "io.deephaven.proto.backplane.grpc.Ticket";
-  }
-  protected:
-  explicit Ticket(::google::protobuf::Arena* arena);
-  Ticket(::google::protobuf::Arena* arena, const Ticket& from);
-  public:
-
-  static const ClassData _class_data_;
-  const ::google::protobuf::Message::ClassData*GetClassData() const final;
-
-  ::google::protobuf::Metadata GetMetadata() const final;
-
-  // nested types ----------------------------------------------------
-
-  // accessors -------------------------------------------------------
-
-  enum : int {
-    kTicketFieldNumber = 1,
-  };
-  // bytes ticket = 1;
-  void clear_ticket() ;
-  const std::string& ticket() const;
-  template <typename Arg_ = const std::string&, typename... Args_>
-  void set_ticket(Arg_&& arg, Args_... args);
-  std::string* mutable_ticket();
-  PROTOBUF_NODISCARD std::string* release_ticket();
-  void set_allocated_ticket(std::string* value);
-
-  private:
-  const std::string& _internal_ticket() const;
-  inline PROTOBUF_ALWAYS_INLINE void _internal_set_ticket(
-      const std::string& value);
-  std::string* _internal_mutable_ticket();
-
-  public:
-  // @@protoc_insertion_point(class_scope:io.deephaven.proto.backplane.grpc.Ticket)
- private:
-  class _Internal;
-
-  friend class ::google::protobuf::internal::TcParser;
-  static const ::google::protobuf::internal::TcParseTable<
-      0, 1, 0,
-      0, 2>
-      _table_;
-  friend class ::google::protobuf::MessageLite;
-  friend class ::google::protobuf::Arena;
-  template <typename T>
-  friend class ::google::protobuf::Arena::InternalHelper;
-  using InternalArenaConstructable_ = void;
-  using DestructorSkippable_ = void;
-  struct Impl_ {
-
-        inline explicit constexpr Impl_(
-            ::google::protobuf::internal::ConstantInitialized) noexcept;
-        inline explicit Impl_(::google::protobuf::internal::InternalVisibility visibility,
-                              ::google::protobuf::Arena* arena);
-        inline explicit Impl_(::google::protobuf::internal::InternalVisibility visibility,
-                              ::google::protobuf::Arena* arena, const Impl_& from);
-    ::google::protobuf::internal::ArenaStringPtr ticket_;
-    mutable ::google::protobuf::internal::CachedSize _cached_size_;
-    PROTOBUF_TSAN_DECLARE_MEMBER
-  };
-  union { Impl_ _impl_; };
-  friend struct ::TableStruct_deephaven_2fproto_2fticket_2eproto;
-};// -------------------------------------------------------------------
-
-class TypedTicket final :
-    public ::google::protobuf::Message /* @@protoc_insertion_point(class_definition:io.deephaven.proto.backplane.grpc.TypedTicket) */ {
- public:
-  inline TypedTicket() : TypedTicket(nullptr) {}
-  ~TypedTicket() override;
-  template<typename = void>
-  explicit PROTOBUF_CONSTEXPR TypedTicket(::google::protobuf::internal::ConstantInitialized);
-
-  inline TypedTicket(const TypedTicket& from)
-      : TypedTicket(nullptr, from) {}
-  TypedTicket(TypedTicket&& from) noexcept
-    : TypedTicket() {
-    *this = ::std::move(from);
-  }
-
-  inline TypedTicket& operator=(const TypedTicket& from) {
-    CopyFrom(from);
-    return *this;
-  }
-  inline TypedTicket& operator=(TypedTicket&& from) noexcept {
-    if (this == &from) return *this;
-    if (GetArena() == from.GetArena()
-  #ifdef PROTOBUF_FORCE_COPY_IN_MOVE
-        && GetArena() != nullptr
-  #endif  // !PROTOBUF_FORCE_COPY_IN_MOVE
-    ) {
-      InternalSwap(&from);
-    } else {
-      CopyFrom(from);
-    }
-    return *this;
-  }
-
-  inline const ::google::protobuf::UnknownFieldSet& unknown_fields() const
-      ABSL_ATTRIBUTE_LIFETIME_BOUND {
-    return _internal_metadata_.unknown_fields<::google::protobuf::UnknownFieldSet>(::google::protobuf::UnknownFieldSet::default_instance);
-  }
-  inline ::google::protobuf::UnknownFieldSet* mutable_unknown_fields()
-      ABSL_ATTRIBUTE_LIFETIME_BOUND {
-    return _internal_metadata_.mutable_unknown_fields<::google::protobuf::UnknownFieldSet>();
-  }
-
-  static const ::google::protobuf::Descriptor* descriptor() {
-    return GetDescriptor();
-  }
-  static const ::google::protobuf::Descriptor* GetDescriptor() {
-    return default_instance().GetMetadata().descriptor;
-  }
-  static const ::google::protobuf::Reflection* GetReflection() {
-    return default_instance().GetMetadata().reflection;
-  }
-  static const TypedTicket& default_instance() {
-    return *internal_default_instance();
-  }
-  static inline const TypedTicket* internal_default_instance() {
-    return reinterpret_cast<const TypedTicket*>(
-               &_TypedTicket_default_instance_);
-  }
-  static constexpr int kIndexInFileMessages =
-    1;
-
-  friend void swap(TypedTicket& a, TypedTicket& b) {
-    a.Swap(&b);
-  }
-  inline void Swap(TypedTicket* other) {
-    if (other == this) return;
-  #ifdef PROTOBUF_FORCE_COPY_IN_SWAP
-    if (GetArena() != nullptr &&
-        GetArena() == other->GetArena()) {
-   #else  // PROTOBUF_FORCE_COPY_IN_SWAP
-    if (GetArena() == other->GetArena()) {
-  #endif  // !PROTOBUF_FORCE_COPY_IN_SWAP
-      InternalSwap(other);
-    } else {
-      ::google::protobuf::internal::GenericSwap(this, other);
-    }
-  }
-  void UnsafeArenaSwap(TypedTicket* other) {
-    if (other == this) return;
-    ABSL_DCHECK(GetArena() == other->GetArena());
-    InternalSwap(other);
-  }
-
-  // implements Message ----------------------------------------------
-
-  TypedTicket* New(::google::protobuf::Arena* arena = nullptr) const final {
-    return CreateMaybeMessage<TypedTicket>(arena);
-  }
-  using ::google::protobuf::Message::CopyFrom;
-  void CopyFrom(const TypedTicket& from);
-  using ::google::protobuf::Message::MergeFrom;
-  void MergeFrom( const TypedTicket& from) {
-    TypedTicket::MergeImpl(*this, from);
-  }
-  private:
-  static void MergeImpl(::google::protobuf::Message& to_msg, const ::google::protobuf::Message& from_msg);
-  public:
-  PROTOBUF_ATTRIBUTE_REINITIALIZES void Clear() final;
-  bool IsInitialized() const final;
-
-  ::size_t ByteSizeLong() const final;
-  const char* _InternalParse(const char* ptr, ::google::protobuf::internal::ParseContext* ctx) final;
-  ::uint8_t* _InternalSerialize(
-      ::uint8_t* target, ::google::protobuf::io::EpsCopyOutputStream* stream) const final;
-  int GetCachedSize() const { return _impl_._cached_size_.Get(); }
-
-  private:
-  ::google::protobuf::internal::CachedSize* AccessCachedSize() const final;
-  void SharedCtor(::google::protobuf::Arena* arena);
-  void SharedDtor();
-  void InternalSwap(TypedTicket* other);
-
-  private:
-  friend class ::google::protobuf::internal::AnyMetadata;
-  static ::absl::string_view FullMessageName() {
-    return "io.deephaven.proto.backplane.grpc.TypedTicket";
-  }
-  protected:
-  explicit TypedTicket(::google::protobuf::Arena* arena);
-  TypedTicket(::google::protobuf::Arena* arena, const TypedTicket& from);
-  public:
-
-  static const ClassData _class_data_;
-  const ::google::protobuf::Message::ClassData*GetClassData() const final;
-
-  ::google::protobuf::Metadata GetMetadata() const final;
-
-  // nested types ----------------------------------------------------
-
-  // accessors -------------------------------------------------------
-
-  enum : int {
-    kTypeFieldNumber = 2,
-    kTicketFieldNumber = 1,
-  };
-  // string type = 2;
-  void clear_type() ;
-  const std::string& type() const;
-  template <typename Arg_ = const std::string&, typename... Args_>
-  void set_type(Arg_&& arg, Args_... args);
-  std::string* mutable_type();
-  PROTOBUF_NODISCARD std::string* release_type();
-  void set_allocated_type(std::string* value);
-
-  private:
-  const std::string& _internal_type() const;
-  inline PROTOBUF_ALWAYS_INLINE void _internal_set_type(
-      const std::string& value);
-  std::string* _internal_mutable_type();
-
-  public:
-  // .io.deephaven.proto.backplane.grpc.Ticket ticket = 1;
-  bool has_ticket() const;
-  void clear_ticket() ;
-  const ::io::deephaven::proto::backplane::grpc::Ticket& ticket() const;
-  PROTOBUF_NODISCARD ::io::deephaven::proto::backplane::grpc::Ticket* release_ticket();
-  ::io::deephaven::proto::backplane::grpc::Ticket* mutable_ticket();
-  void set_allocated_ticket(::io::deephaven::proto::backplane::grpc::Ticket* value);
-  void unsafe_arena_set_allocated_ticket(::io::deephaven::proto::backplane::grpc::Ticket* value);
-  ::io::deephaven::proto::backplane::grpc::Ticket* unsafe_arena_release_ticket();
-
-  private:
-  const ::io::deephaven::proto::backplane::grpc::Ticket& _internal_ticket() const;
-  ::io::deephaven::proto::backplane::grpc::Ticket* _internal_mutable_ticket();
-
-  public:
-  // @@protoc_insertion_point(class_scope:io.deephaven.proto.backplane.grpc.TypedTicket)
- private:
-  class _Internal;
-
-  friend class ::google::protobuf::internal::TcParser;
-  static const ::google::protobuf::internal::TcParseTable<
-      1, 2, 1,
-      58, 2>
-      _table_;
-  friend class ::google::protobuf::MessageLite;
-  friend class ::google::protobuf::Arena;
-  template <typename T>
-  friend class ::google::protobuf::Arena::InternalHelper;
-  using InternalArenaConstructable_ = void;
-  using DestructorSkippable_ = void;
-  struct Impl_ {
-
-        inline explicit constexpr Impl_(
-            ::google::protobuf::internal::ConstantInitialized) noexcept;
-        inline explicit Impl_(::google::protobuf::internal::InternalVisibility visibility,
-                              ::google::protobuf::Arena* arena);
-        inline explicit Impl_(::google::protobuf::internal::InternalVisibility visibility,
-                              ::google::protobuf::Arena* arena, const Impl_& from);
-    ::google::protobuf::internal::HasBits<1> _has_bits_;
-    mutable ::google::protobuf::internal::CachedSize _cached_size_;
-    ::google::protobuf::internal::ArenaStringPtr type_;
-    ::io::deephaven::proto::backplane::grpc::Ticket* ticket_;
-    PROTOBUF_TSAN_DECLARE_MEMBER
-  };
-  union { Impl_ _impl_; };
-  friend struct ::TableStruct_deephaven_2fproto_2fticket_2eproto;
-};
-
-// ===================================================================
-
-
-
-
-// ===================================================================
-
-
-#ifdef __GNUC__
-#pragma GCC diagnostic push
-#pragma GCC diagnostic ignored "-Wstrict-aliasing"
-#endif  // __GNUC__
-// -------------------------------------------------------------------
-
-// Ticket
-
-// bytes ticket = 1;
-inline void Ticket::clear_ticket() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  _impl_.ticket_.ClearToEmpty();
-}
-inline const std::string& Ticket::ticket() const
-    ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  // @@protoc_insertion_point(field_get:io.deephaven.proto.backplane.grpc.Ticket.ticket)
-  return _internal_ticket();
-}
-template <typename Arg_, typename... Args_>
-inline PROTOBUF_ALWAYS_INLINE void Ticket::set_ticket(Arg_&& arg,
-                                                     Args_... args) {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  ;
-  _impl_.ticket_.SetBytes(static_cast<Arg_&&>(arg), args..., GetArena());
-  // @@protoc_insertion_point(field_set:io.deephaven.proto.backplane.grpc.Ticket.ticket)
-}
-inline std::string* Ticket::mutable_ticket() ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  std::string* _s = _internal_mutable_ticket();
-  // @@protoc_insertion_point(field_mutable:io.deephaven.proto.backplane.grpc.Ticket.ticket)
-  return _s;
-}
-inline const std::string& Ticket::_internal_ticket() const {
-  PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race);
-  return _impl_.ticket_.Get();
-}
-inline void Ticket::_internal_set_ticket(const std::string& value) {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  ;
-  _impl_.ticket_.Set(value, GetArena());
-}
-inline std::string* Ticket::_internal_mutable_ticket() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  ;
-  return _impl_.ticket_.Mutable( GetArena());
-}
-inline std::string* Ticket::release_ticket() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  // @@protoc_insertion_point(field_release:io.deephaven.proto.backplane.grpc.Ticket.ticket)
-  return _impl_.ticket_.Release();
-}
-inline void Ticket::set_allocated_ticket(std::string* value) {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  _impl_.ticket_.SetAllocated(value, GetArena());
-  #ifdef PROTOBUF_FORCE_COPY_DEFAULT_STRING
-        if (_impl_.ticket_.IsDefault()) {
-          _impl_.ticket_.Set("", GetArena());
-        }
-  #endif  // PROTOBUF_FORCE_COPY_DEFAULT_STRING
-  // @@protoc_insertion_point(field_set_allocated:io.deephaven.proto.backplane.grpc.Ticket.ticket)
-}
-
-// -------------------------------------------------------------------
-
-// TypedTicket
-
-// .io.deephaven.proto.backplane.grpc.Ticket ticket = 1;
-inline bool TypedTicket::has_ticket() const {
-  bool value = (_impl_._has_bits_[0] & 0x00000001u) != 0;
-  PROTOBUF_ASSUME(!value || _impl_.ticket_ != nullptr);
-  return value;
-}
-inline void TypedTicket::clear_ticket() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  if (_impl_.ticket_ != nullptr) _impl_.ticket_->Clear();
-  _impl_._has_bits_[0] &= ~0x00000001u;
-}
-inline const ::io::deephaven::proto::backplane::grpc::Ticket& TypedTicket::_internal_ticket() const {
-  PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race);
-  const ::io::deephaven::proto::backplane::grpc::Ticket* p = _impl_.ticket_;
-  return p != nullptr ? *p : reinterpret_cast<const ::io::deephaven::proto::backplane::grpc::Ticket&>(::io::deephaven::proto::backplane::grpc::_Ticket_default_instance_);
-}
-inline const ::io::deephaven::proto::backplane::grpc::Ticket& TypedTicket::ticket() const ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  // @@protoc_insertion_point(field_get:io.deephaven.proto.backplane.grpc.TypedTicket.ticket)
-  return _internal_ticket();
-}
-inline void TypedTicket::unsafe_arena_set_allocated_ticket(::io::deephaven::proto::backplane::grpc::Ticket* value) {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  if (GetArena() == nullptr) {
-    delete reinterpret_cast<::google::protobuf::MessageLite*>(_impl_.ticket_);
-  }
-  _impl_.ticket_ = reinterpret_cast<::io::deephaven::proto::backplane::grpc::Ticket*>(value);
-  if (value != nullptr) {
-    _impl_._has_bits_[0] |= 0x00000001u;
-  } else {
-    _impl_._has_bits_[0] &= ~0x00000001u;
-  }
-  // @@protoc_insertion_point(field_unsafe_arena_set_allocated:io.deephaven.proto.backplane.grpc.TypedTicket.ticket)
-}
-inline ::io::deephaven::proto::backplane::grpc::Ticket* TypedTicket::release_ticket() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-
-  _impl_._has_bits_[0] &= ~0x00000001u;
-  ::io::deephaven::proto::backplane::grpc::Ticket* released = _impl_.ticket_;
-  _impl_.ticket_ = nullptr;
-#ifdef PROTOBUF_FORCE_COPY_IN_RELEASE
-  auto* old = reinterpret_cast<::google::protobuf::MessageLite*>(released);
-  released = ::google::protobuf::internal::DuplicateIfNonNull(released);
-  if (GetArena() == nullptr) {
-    delete old;
-  }
-#else   // PROTOBUF_FORCE_COPY_IN_RELEASE
-  if (GetArena() != nullptr) {
-    released = ::google::protobuf::internal::DuplicateIfNonNull(released);
-  }
-#endif  // !PROTOBUF_FORCE_COPY_IN_RELEASE
-  return released;
-}
-inline ::io::deephaven::proto::backplane::grpc::Ticket* TypedTicket::unsafe_arena_release_ticket() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  // @@protoc_insertion_point(field_release:io.deephaven.proto.backplane.grpc.TypedTicket.ticket)
-
-  _impl_._has_bits_[0] &= ~0x00000001u;
-  ::io::deephaven::proto::backplane::grpc::Ticket* temp = _impl_.ticket_;
-  _impl_.ticket_ = nullptr;
-  return temp;
-}
-inline ::io::deephaven::proto::backplane::grpc::Ticket* TypedTicket::_internal_mutable_ticket() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  _impl_._has_bits_[0] |= 0x00000001u;
-  if (_impl_.ticket_ == nullptr) {
-    auto* p = CreateMaybeMessage<::io::deephaven::proto::backplane::grpc::Ticket>(GetArena());
-    _impl_.ticket_ = reinterpret_cast<::io::deephaven::proto::backplane::grpc::Ticket*>(p);
-  }
-  return _impl_.ticket_;
-}
-inline ::io::deephaven::proto::backplane::grpc::Ticket* TypedTicket::mutable_ticket() ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  ::io::deephaven::proto::backplane::grpc::Ticket* _msg = _internal_mutable_ticket();
-  // @@protoc_insertion_point(field_mutable:io.deephaven.proto.backplane.grpc.TypedTicket.ticket)
-  return _msg;
-}
-inline void TypedTicket::set_allocated_ticket(::io::deephaven::proto::backplane::grpc::Ticket* value) {
-  ::google::protobuf::Arena* message_arena = GetArena();
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  if (message_arena == nullptr) {
-    delete reinterpret_cast<::io::deephaven::proto::backplane::grpc::Ticket*>(_impl_.ticket_);
-  }
-
-  if (value != nullptr) {
-    ::google::protobuf::Arena* submessage_arena = reinterpret_cast<::io::deephaven::proto::backplane::grpc::Ticket*>(value)->GetArena();
-    if (message_arena != submessage_arena) {
-      value = ::google::protobuf::internal::GetOwnedMessage(message_arena, value, submessage_arena);
-    }
-    _impl_._has_bits_[0] |= 0x00000001u;
-  } else {
-    _impl_._has_bits_[0] &= ~0x00000001u;
-  }
-
-  _impl_.ticket_ = reinterpret_cast<::io::deephaven::proto::backplane::grpc::Ticket*>(value);
-  // @@protoc_insertion_point(field_set_allocated:io.deephaven.proto.backplane.grpc.TypedTicket.ticket)
-}
-
-// string type = 2;
-inline void TypedTicket::clear_type() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  _impl_.type_.ClearToEmpty();
-}
-inline const std::string& TypedTicket::type() const
-    ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  // @@protoc_insertion_point(field_get:io.deephaven.proto.backplane.grpc.TypedTicket.type)
-  return _internal_type();
-}
-template <typename Arg_, typename... Args_>
-inline PROTOBUF_ALWAYS_INLINE void TypedTicket::set_type(Arg_&& arg,
-                                                     Args_... args) {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  ;
-  _impl_.type_.Set(static_cast<Arg_&&>(arg), args..., GetArena());
-  // @@protoc_insertion_point(field_set:io.deephaven.proto.backplane.grpc.TypedTicket.type)
-}
-inline std::string* TypedTicket::mutable_type() ABSL_ATTRIBUTE_LIFETIME_BOUND {
-  std::string* _s = _internal_mutable_type();
-  // @@protoc_insertion_point(field_mutable:io.deephaven.proto.backplane.grpc.TypedTicket.type)
-  return _s;
-}
-inline const std::string& TypedTicket::_internal_type() const {
-  PROTOBUF_TSAN_READ(&_impl_._tsan_detect_race);
-  return _impl_.type_.Get();
-}
-inline void TypedTicket::_internal_set_type(const std::string& value) {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  ;
-  _impl_.type_.Set(value, GetArena());
-}
-inline std::string* TypedTicket::_internal_mutable_type() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  ;
-  return _impl_.type_.Mutable( GetArena());
-}
-inline std::string* TypedTicket::release_type() {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  // @@protoc_insertion_point(field_release:io.deephaven.proto.backplane.grpc.TypedTicket.type)
-  return _impl_.type_.Release();
-}
-inline void TypedTicket::set_allocated_type(std::string* value) {
-  PROTOBUF_TSAN_WRITE(&_impl_._tsan_detect_race);
-  _impl_.type_.SetAllocated(value, GetArena());
-  #ifdef PROTOBUF_FORCE_COPY_DEFAULT_STRING
-        if (_impl_.type_.IsDefault()) {
-          _impl_.type_.Set("", GetArena());
-        }
-  #endif  // PROTOBUF_FORCE_COPY_DEFAULT_STRING
-  // @@protoc_insertion_point(field_set_allocated:io.deephaven.proto.backplane.grpc.TypedTicket.type)
-}
-
-#ifdef __GNUC__
-#pragma GCC diagnostic pop
-#endif  // __GNUC__
-
-// @@protoc_insertion_point(namespace_scope)
-}  // namespace grpc
-}  // namespace backplane
-}  // namespace proto
-}  // namespace deephaven
-}  // namespace io
-
-
-// @@protoc_insertion_point(global_scope)
-
-#include "google/protobuf/port_undef.inc"
-
-#endif  // GOOGLE_PROTOBUF_INCLUDED_deephaven_2fproto_2fticket_2eproto_2epb_2eh
diff --git a/cpp-client/deephaven/dhclient/src/arrowutil/arrow_client_table.cc b/cpp-client/deephaven/dhclient/src/arrowutil/arrow_client_table.cc
index a1178f9ef97..1d574a3809a 100644
--- a/cpp-client/deephaven/dhclient/src/arrowutil/arrow_client_table.cc
+++ b/cpp-client/deephaven/dhclient/src/arrowutil/arrow_client_table.cc
@@ -168,6 +168,18 @@ struct Visitor final : public arrow::TypeVisitor {
     return arrow::Status::OK();
   }
 
+  arrow::Status Visit(const arrow::Date64Type &/*type*/) final {
+    auto arrays = DowncastChunks<arrow::Date64Array>(chunked_array_);
+    result_ = LocalDateArrowColumnSource::OfArrowArrayVec(std::move(arrays));
+    return arrow::Status::OK();
+  }
+
+  arrow::Status Visit(const arrow::Time64Type &/*type*/) final {
+    auto arrays = DowncastChunks<arrow::Time64Array>(chunked_array_);
+    result_ = LocalTimeArrowColumnSource::OfArrowArrayVec(std::move(arrays));
+    return arrow::Status::OK();
+  }
+
   const arrow::ChunkedArray &chunked_array_;
   std::shared_ptr<ColumnSource> result_;
 };
diff --git a/cpp-client/deephaven/dhclient/src/client.cc b/cpp-client/deephaven/dhclient/src/client.cc
index c6ee7a5c462..18eaf3f9e7e 100644
--- a/cpp-client/deephaven/dhclient/src/client.cc
+++ b/cpp-client/deephaven/dhclient/src/client.cc
@@ -180,9 +180,9 @@ Aggregate createAggForMatchPairs(ComboAggregateRequest::AggType aggregate_type,
 }  // namespace
 
 Aggregate::Aggregate() = default;
-Aggregate::Aggregate(const Aggregate &other) noexcept = default;
+Aggregate::Aggregate(const Aggregate &other) = default;
 Aggregate::Aggregate(Aggregate &&other) noexcept = default;
-Aggregate &Aggregate::operator=(const Aggregate &other) noexcept = default;
+Aggregate &Aggregate::operator=(const Aggregate &other) = default;
 Aggregate &Aggregate::operator=(Aggregate &&other) noexcept = default;
 Aggregate::~Aggregate() = default;
 
@@ -283,6 +283,8 @@ AggregateCombo AggregateCombo::Create(std::vector<Aggregate> vec) {
 }
 
 AggregateCombo::AggregateCombo(std::shared_ptr<impl::AggregateComboImpl> impl) : impl_(std::move(impl)) {}
+AggregateCombo::AggregateCombo(const deephaven::client::AggregateCombo &other) = default;
+AggregateCombo &AggregateCombo::operator=(const AggregateCombo &other) = default;
 AggregateCombo::AggregateCombo(AggregateCombo &&other) noexcept = default;
 AggregateCombo &AggregateCombo::operator=(AggregateCombo &&other) noexcept = default;
 AggregateCombo::~AggregateCombo() = default;
@@ -406,11 +408,6 @@ TableHandle TableHandle::PercentileBy(double percentile, bool avg_median,
   return TableHandle(std::move(qt_impl));
 }
 
-TableHandle TableHandle::PercentileBy(double percentile, std::vector<std::string> column_specs) const {
-  auto qt_impl = impl_->PercentileBy(percentile, std::move(column_specs));
-  return TableHandle(std::move(qt_impl));
-}
-
 TableHandle TableHandle::CountBy(std::string count_by_column,
     std::vector<std::string> column_specs) const {
   auto qt_impl = impl_->CountBy(std::move(count_by_column), std::move(column_specs));
@@ -571,8 +568,8 @@ TableHandle::Subscribe(onTickCallback_t on_tick, void *on_tick_user_data,
   return impl_->Subscribe(on_tick, on_tick_user_data, on_error, on_error_user_data);
 }
 
-void TableHandle::Unsubscribe(std::shared_ptr<SubscriptionHandle> callback) {
-  impl_->Unsubscribe(std::move(callback));
+void TableHandle::Unsubscribe(const std::shared_ptr<SubscriptionHandle> &handle) {
+  impl_->Unsubscribe(handle);
 }
 
 const std::string &TableHandle::GetTicketAsString() const {
diff --git a/cpp-client/deephaven/dhclient/src/impl/table_handle_impl.cc b/cpp-client/deephaven/dhclient/src/impl/table_handle_impl.cc
index 81d8251fc0a..7e7648c201f 100644
--- a/cpp-client/deephaven/dhclient/src/impl/table_handle_impl.cc
+++ b/cpp-client/deephaven/dhclient/src/impl/table_handle_impl.cc
@@ -278,11 +278,6 @@ std::shared_ptr<TableHandleImpl> TableHandleImpl::PercentileBy(double percentile
   return DefaultAggregateByDescriptor(std::move(descriptor), std::move(column_specs));
 }
 
-std::shared_ptr<TableHandleImpl> TableHandleImpl::PercentileBy(double percentile,
-    std::vector<std::string> column_specs) {
-  return PercentileBy(percentile, false, std::move(column_specs));
-}
-
 std::shared_ptr<TableHandleImpl> TableHandleImpl::CountBy(std::string count_by_column,
     std::vector<std::string> column_specs) {
   ComboAggregateRequest::Aggregate descriptor;
diff --git a/cpp-client/deephaven/dhclient/src/interop/client_interop.cc b/cpp-client/deephaven/dhclient/src/interop/client_interop.cc
new file mode 100644
index 00000000000..6b5a66d8e35
--- /dev/null
+++ b/cpp-client/deephaven/dhclient/src/interop/client_interop.cc
@@ -0,0 +1,1370 @@
+/*
+ * Copyright (c) 2016-2024 Deephaven Data Labs and Patent Pending
+ */
+#include "deephaven/client/interop/client_interop.h"
+
+#include <codecvt>
+#include <locale>
+#include <arrow/table.h>
+#include "deephaven/client/client.h"
+#include "deephaven/client/client_options.h"
+#include "deephaven/client/subscription/subscription_handle.h"
+#include "deephaven/client/update_by.h"
+#include "deephaven/client/utility/arrow_util.h"
+#include "deephaven/client/utility/table_maker.h"
+#include "deephaven/dhcore/interop/interop_util.h"
+#include "deephaven/dhcore/utility/utility.h"
+#include "deephaven/third_party/fmt/format.h"
+
+using deephaven::client::Aggregate;
+using deephaven::client::AggregateCombo;
+using deephaven::client::Client;
+using deephaven::client::ClientOptions;
+using deephaven::client::SortDirection;
+using deephaven::client::SortPair;
+using deephaven::client::TableHandle;
+using deephaven::client::TableHandleManager;
+using deephaven::client::UpdateByOperation;
+using deephaven::client::subscription::SubscriptionHandle;
+using deephaven::client::interop::ArrowTableSpWrapper;
+using deephaven::client::utility::ArrowUtil;
+using deephaven::client::interop::ClientTableSpWrapper;
+using deephaven::client::utility::DurationSpecifier;
+using deephaven::client::utility::TableMaker;
+using deephaven::client::utility::TimePointSpecifier;
+using deephaven::dhcore::DateTime;
+using deephaven::dhcore::chunk::BooleanChunk;
+using deephaven::dhcore::chunk::CharChunk;
+using deephaven::dhcore::chunk::Chunk;
+using deephaven::dhcore::chunk::DateTimeChunk;
+using deephaven::dhcore::chunk::DoubleChunk;
+using deephaven::dhcore::chunk::FloatChunk;
+using deephaven::dhcore::chunk::Int8Chunk;
+using deephaven::dhcore::chunk::Int16Chunk;
+using deephaven::dhcore::chunk::Int32Chunk;
+using deephaven::dhcore::chunk::Int64Chunk;
+using deephaven::dhcore::chunk::StringChunk;
+using deephaven::dhcore::interop::ErrorStatus;
+using deephaven::dhcore::interop::InteropBool;
+using deephaven::dhcore::interop::NativePtr;
+using deephaven::dhcore::interop::StringHandle;
+using deephaven::dhcore::interop::StringPoolBuilder;
+using deephaven::dhcore::interop::StringPoolHandle;
+using deephaven::dhcore::ticking::TickingCallback;
+using deephaven::dhcore::ticking::TickingUpdate;
+using deephaven::dhcore::utility::GetWhat;
+using deephaven::dhcore::utility::MakeReservedVector;
+
+namespace {
+void GetColumnHelper(ClientTableSpWrapper *self,
+    int32_t column_index,
+    Chunk *data_chunk, InteropBool *optional_dest_null_flags, int64_t num_rows) {
+  auto cs = self->table_->GetColumn(column_index);
+  std::unique_ptr<bool[]> null_data;
+  BooleanChunk null_chunk;
+  BooleanChunk *null_chunkp = nullptr;
+  if (optional_dest_null_flags != nullptr) {
+    null_data.reset(new bool[num_rows]);
+    null_chunk = BooleanChunk::CreateView(null_data.get(), num_rows);
+    null_chunkp = &null_chunk;
+  }
+
+  auto rows = self->table_->GetRowSequence();
+  cs->FillChunk(*rows, data_chunk, null_chunkp);
+
+  if (optional_dest_null_flags != nullptr) {
+    for (int64_t i = 0; i != num_rows; ++i) {
+      optional_dest_null_flags[i] = InteropBool(null_data[i]);
+    }
+  }
+}
+
+void JoinHelper(
+    NativePtr<TableHandle> self,
+    NativePtr<TableHandle> right_side,
+    const char **columns_to_match, int32_t num_columns_to_match,
+    const char **columns_to_add, int32_t num_columns_to_add,
+    NativePtr<TableHandle> *result,
+    ErrorStatus *status,
+    TableHandle (TableHandle::*invoker)(const TableHandle &, std::vector<std::string>,
+        std::vector<std::string>) const) {
+  status->Run([=]() {
+    std::vector<std::string> cols_to_match(columns_to_match,
+        columns_to_match + num_columns_to_match);
+    std::vector<std::string> cols_to_add(columns_to_add,
+        columns_to_add + num_columns_to_add);
+    auto table = (self->*invoker)(*right_side, std::move(cols_to_match), std::move(cols_to_add));
+    result->Reset(new TableHandle(std::move(table)));
+  });
+}
+
+void ByHelper(
+    NativePtr<TableHandle> self,
+    const char **column_specs, int32_t num_column_specs,
+    NativePtr<TableHandle> *result,
+    ErrorStatus *status,
+    TableHandle (TableHandle::*invoker)(std::vector<std::string>) const) {
+  status->Run([=]() {
+    std::vector<std::string> cols(column_specs, column_specs + num_column_specs);
+    auto table = (self->*invoker)(std::move(cols));
+    result->Reset(new TableHandle(std::move(table)));
+  });
+}
+}  // namespace
+
+extern "C" {
+// There is no TableHandleManager_ctor entry point because we don't need callers to invoke
+// the TableHandleManager ctor directly.
+void deephaven_client_TableHandleManager_dtor(NativePtr<TableHandleManager> self) {
+  delete self.Get();
+}
+
+void deephaven_client_TableHandleManager_EmptyTable(
+    NativePtr<TableHandleManager> self,
+    int64_t size,
+    NativePtr<TableHandle> *result,
+    ErrorStatus *status) {
+  status->Run([=]() {
+    auto table = self->EmptyTable(size);
+    result->Reset(new TableHandle(std::move(table)));
+  });
+}
+
+void deephaven_client_TableHandleManager_FetchTable(
+    NativePtr<TableHandleManager> self,
+    const char *table_name,
+    NativePtr<TableHandle> *result,
+    ErrorStatus *status) {
+  status->Run([=]() {
+    auto table = self->FetchTable(table_name);
+    result->Reset(new TableHandle(std::move(table)));
+  });
+}
+
+void deephaven_client_TableHandleManager_TimeTable(
+    NativePtr<TableHandleManager> self,
+    NativePtr<DurationSpecifier> period,
+    NativePtr<TimePointSpecifier> start_time,
+    InteropBool blink_table,
+    NativePtr<TableHandle> *result,
+    ErrorStatus *status) {
+  status->Run([=]() {
+    auto table = self->TimeTable(*period, *start_time, (bool)blink_table);
+    result->Reset(new TableHandle(std::move(table)));
+  });
+}
+
+void deephaven_client_TableHandleManager_InputTable(
+    NativePtr<TableHandleManager> self,
+    NativePtr<TableHandle> initial_table,
+    const char **key_columns, int32_t num_key_columns,
+    NativePtr<TableHandle> *result,
+    ErrorStatus *status) {
+  status->Run([=]() {
+    std::vector<std::string> kcs(key_columns, key_columns + num_key_columns);
+    auto table = self->InputTable(*initial_table, std::move(kcs));
+    result->Reset(new TableHandle(std::move(table)));
+  });
+}
+
+void deephaven_client_TableHandleManager_RunScript(
+    NativePtr<TableHandleManager> self,
+    const char *code,
+    ErrorStatus *status) {
+  status->Run([self, code]() {
+    self->RunScript(code);
+  });
+}
+
+void deephaven_client_Client_Connect(const char *target,
+    NativePtr<ClientOptions> options,
+    NativePtr<Client> *result,
+    ErrorStatus *status) {
+  status->Run([=]() {
+    auto res = Client::Connect(target, *options);
+    result->Reset(new Client(std::move(res)));
+  });
+}
+
+// There is no Client_ctor entry point because we don't need callers to invoke
+// the Client ctor directly.
+void deephaven_client_Client_dtor(NativePtr<Client> self) {
+  delete self;
+}
+
+
+void deephaven_client_Client_Close(NativePtr<Client> self,
+    ErrorStatus *status) {
+  status->Run([=]() {
+    self->Close();
+  });
+}
+
+void deephaven_client_Client_GetManager(NativePtr<Client> self,
+    NativePtr<TableHandleManager> *result,
+    ErrorStatus *status) {
+  status->Run([=]() {
+    auto res = self->GetManager();
+    result->Reset(new TableHandleManager(std::move(res)));
+  });
+}
+
+void deephaven_client_TableHandle_GetAttributes(
+    NativePtr<TableHandle> self,
+    int32_t *num_columns, int64_t *num_rows, InteropBool *is_static,
+    ErrorStatus *status) {
+  status->Run([=]() {
+    *num_columns = self->Schema()->NumCols();
+    *num_rows = self->NumRows();
+    *is_static = (InteropBool)self->IsStatic();
+  });
+}
+
+void deephaven_client_TableHandle_GetSchema(
+    NativePtr<TableHandle> self,
+    int32_t num_columns, StringHandle *column_handles, int32_t *column_types,
+    StringPoolHandle *string_pool_handle,
+    ErrorStatus *status) {
+  status->Run([=]() {
+    const auto &schema = self->Schema();
+
+    if (num_columns != schema->NumCols()) {
+      auto message = fmt::format("Expected {} columns, but schema has {}",
+          num_columns, schema->NumCols());
+      throw std::runtime_error(message);
+    }
+
+    StringPoolBuilder builder;
+    for (int32_t i = 0; i != num_columns; ++i) {
+      column_handles[i] = builder.Add(schema->Names()[i]);
+      column_types[i] = static_cast<int32_t>(schema->Types()[i]);
+    }
+    *string_pool_handle = builder.Build();
+  });
+}
+
+// There is no TableHandle_ctor entry point because we don't need callers to invoke
+// the TableHandle ctor directly.
+void deephaven_client_TableHandle_dtor(NativePtr<TableHandle> self) {
+  delete self.Get();
+}
+
+void deephaven_client_TableHandle_GetManager(
+    NativePtr<TableHandle> self,
+    NativePtr<TableHandleManager> *result,
+    ErrorStatus *status) {
+  status->Run([=]() {
+    auto manager = self->GetManager();
+    result->Reset(new TableHandleManager(std::move(manager)));
+  });
+}
+
+void deephaven_client_TableHandle_Where(
+    NativePtr<TableHandle> self,
+    const char *condition,
+    NativePtr<TableHandle> *result,
+    ErrorStatus *status) {
+  status->Run([=]() {
+    auto table = self->Where(condition);
+    result->Reset(new TableHandle(std::move(table)));
+  });
+}
+
+void deephaven_client_TableHandle_Ungroup(
+    NativePtr<TableHandle> self,
+    InteropBool null_fill,
+    const char **group_by_columns, int32_t num_group_by_columns,
+    NativePtr<TableHandle> *result,
+    ErrorStatus *status) {
+  status->Run([=]() {
+    std::vector<std::string> cols(group_by_columns, group_by_columns + num_group_by_columns);
+    auto table = self->Ungroup((bool)null_fill, std::move(cols));
+    result->Reset(new TableHandle(std::move(table)));
+  });
+}
+
+void deephaven_client_TableHandle_Sort(
+    NativePtr<TableHandle> self,
+    const char **columns,
+    const InteropBool *ascendings,
+    const InteropBool *abss,
+    int32_t num_sort_pairs,
+    NativePtr<TableHandle> *result,
+    ErrorStatus *status) {
+  status->Run([=]() {
+    auto sort_pairs = MakeReservedVector<SortPair>(num_sort_pairs);
+    for (int32_t i = 0; i != num_sort_pairs; ++i) {
+      sort_pairs.emplace_back(
+          columns[i],
+          ascendings[i] ? SortDirection::kAscending : SortDirection::kDescending,
+          (bool)abss[i]);
+    }
+    auto table = self->Sort(std::move(sort_pairs));
+    result->Reset(new TableHandle(std::move(table)));
+  });
+
+}
+
+void deephaven_client_TableHandle_Select(
+    NativePtr<TableHandle> self,
+    const char **column_specs, int32_t num_column_specs,
+    NativePtr<TableHandle> *result,
+    ErrorStatus *status) {
+  status->Run([=]() {
+    std::vector<std::string> cols(column_specs, column_specs + num_column_specs);
+    auto table = self->Select(cols);
+    result->Reset(new TableHandle(std::move(table)));
+  });
+}
+
+void deephaven_client_TableHandle_SelectDistinct(
+    NativePtr<TableHandle> self,
+    const char **column_specs, int32_t num_column_specs,
+    NativePtr<TableHandle> *result,
+    ErrorStatus *status) {
+  status->Run([=]() {
+    std::vector<std::string> cols(column_specs, column_specs + num_column_specs);
+    auto table = self->SelectDistinct(cols);
+    result->Reset(new TableHandle(std::move(table)));
+  });
+}
+
+void deephaven_client_TableHandle_View(
+    NativePtr<TableHandle> self,
+    const char **column_specs, int32_t num_column_specs,
+    NativePtr<TableHandle> *result,
+    ErrorStatus *status) {
+  status->Run([=]() {
+    std::vector<std::string> cols(column_specs, column_specs + num_column_specs);
+    auto table = self->View(cols);
+    result->Reset(new TableHandle(std::move(table)));
+  });
+}
+
+void deephaven_client_TableHandle_DropColumns(
+    NativePtr<TableHandle> self,
+    const char **column_specs, int32_t num_column_specs,
+    NativePtr<TableHandle> *result,
+    ErrorStatus *status) {
+  status->Run([=]() {
+    std::vector<std::string> cols(column_specs, column_specs + num_column_specs);
+    auto table = self->DropColumns(cols);
+    result->Reset(new TableHandle(std::move(table)));
+  });
+}
+
+void deephaven_client_TableHandle_Update(
+    NativePtr<TableHandle> self,
+    const char **column_specs, int32_t num_column_specs,
+    NativePtr<TableHandle> *result,
+    ErrorStatus *status) {
+  status->Run([=]() {
+    std::vector<std::string> cols(column_specs, column_specs + num_column_specs);
+    auto table = self->Update(cols);
+    result->Reset(new TableHandle(std::move(table)));
+  });
+}
+
+void deephaven_client_TableHandle_LazyUpdate(
+    NativePtr<TableHandle> self,
+    const char **column_specs, int32_t num_column_specs,
+    NativePtr<TableHandle> *result,
+    ErrorStatus *status) {
+  status->Run([=]() {
+    std::vector<std::string> cols(column_specs, column_specs + num_column_specs);
+    auto table = self->LazyUpdate(cols);
+    result->Reset(new TableHandle(std::move(table)));
+  });
+}
+
+void deephaven_client_TableHandle_MinBy(
+    NativePtr<TableHandle> self,
+    const char **column_specs, int32_t num_column_specs,
+    NativePtr<TableHandle> *result,
+    ErrorStatus *status) {
+  ByHelper(self, column_specs, num_column_specs, result, status, &TableHandle::MinBy);
+}
+
+void deephaven_client_TableHandle_SumBy(
+    NativePtr<TableHandle> self,
+    const char **column_specs, int32_t num_column_specs,
+    NativePtr<TableHandle> *result,
+    ErrorStatus *status) {
+  ByHelper(self, column_specs, num_column_specs, result, status, &TableHandle::SumBy);
+}
+
+void deephaven_client_TableHandle_AbsSumBy(
+    NativePtr<TableHandle> self,
+    const char **column_specs, int32_t num_column_specs,
+    NativePtr<TableHandle> *result,
+    ErrorStatus *status) {
+  ByHelper(self, column_specs, num_column_specs, result, status, &TableHandle::AbsSumBy);
+}
+
+void deephaven_client_TableHandle_VarBy(
+    NativePtr<TableHandle> self,
+    const char **column_specs, int32_t num_column_specs,
+    NativePtr<TableHandle> *result,
+    ErrorStatus *status) {
+  ByHelper(self, column_specs, num_column_specs, result, status, &TableHandle::VarBy);
+}
+
+void deephaven_client_TableHandle_StdBy(
+    NativePtr<TableHandle> self,
+    const char **column_specs, int32_t num_column_specs,
+    NativePtr<TableHandle> *result,
+    ErrorStatus *status) {
+  ByHelper(self, column_specs, num_column_specs, result, status, &TableHandle::StdBy);
+}
+
+void deephaven_client_TableHandle_AvgBy(
+    NativePtr<TableHandle> self,
+    const char **column_specs, int32_t num_column_specs,
+    NativePtr<TableHandle> *result,
+    ErrorStatus *status) {
+  ByHelper(self, column_specs, num_column_specs, result, status, &TableHandle::AvgBy);
+}
+
+void deephaven_client_TableHandle_LastBy(
+    NativePtr<TableHandle> self,
+    const char **column_specs, int32_t num_column_specs,
+    NativePtr<TableHandle> *result,
+    ErrorStatus *status) {
+  ByHelper(self, column_specs, num_column_specs, result, status, &TableHandle::LastBy);
+}
+
+void deephaven_client_TableHandle_FirstBy(
+    NativePtr<TableHandle> self,
+    const char **column_specs, int32_t num_column_specs,
+    NativePtr<TableHandle> *result,
+    ErrorStatus *status) {
+  ByHelper(self, column_specs, num_column_specs, result, status, &TableHandle::FirstBy);
+}
+
+void deephaven_client_TableHandle_MedianBy(
+    NativePtr<TableHandle> self,
+    const char **column_specs, int32_t num_column_specs,
+    NativePtr<TableHandle> *result,
+    ErrorStatus *status) {
+  ByHelper(self, column_specs, num_column_specs, result, status, &TableHandle::MedianBy);
+}
+
+void deephaven_client_TableHandle_PercentileBy(
+    NativePtr<TableHandle> self,
+    double percentile, deephaven::dhcore::interop::InteropBool avg_median,
+    const char **column_specs, int32_t num_column_specs,
+    NativePtr<TableHandle> *result,
+    ErrorStatus *status) {
+  status->Run([=]() {
+    std::vector<std::string> cols(column_specs, column_specs + num_column_specs);
+    auto table = self->PercentileBy(percentile, (bool)avg_median, std::move(cols));
+    result->Reset(new TableHandle(std::move(table)));
+  });
+}
+
+void deephaven_client_TableHandle_CountBy(
+    NativePtr<TableHandle> self,
+    const char *weight_column,
+    const char **column_specs, int32_t num_column_specs,
+    NativePtr<TableHandle> *result,
+    ErrorStatus *status) {
+  status->Run([=]() {
+    std::vector<std::string> cols(column_specs, column_specs + num_column_specs);
+    auto table = self->CountBy(weight_column, std::move(cols));
+    result->Reset(new TableHandle(std::move(table)));
+  });
+}
+
+void deephaven_client_TableHandle_WavgBy(
+    NativePtr<TableHandle> self,
+    const char *weight_column,
+    const char **column_specs, int32_t num_column_specs,
+    NativePtr<TableHandle> *result,
+    ErrorStatus *status) {
+  status->Run([=]() {
+    std::vector<std::string> cols(column_specs, column_specs + num_column_specs);
+    auto table = self->WAvgBy(weight_column, std::move(cols));
+    result->Reset(new TableHandle(std::move(table)));
+  });
+}
+
+void deephaven_client_TableHandle_WhereIn(
+    NativePtr<TableHandle> self,
+    NativePtr<TableHandle> filter_table,
+    const char **column_specs, int32_t num_column_specs,
+    NativePtr<TableHandle> *result,
+    ErrorStatus *status) {
+  status->Run([=]() {
+    std::vector<std::string> cols(column_specs, column_specs + num_column_specs);
+    auto table = self->WhereIn(*filter_table, cols);
+    result->Reset(new TableHandle(std::move(table)));
+  });
+}
+
+void deephaven_client_TableHandle_CrossJoin(
+    NativePtr<TableHandle> self,
+    NativePtr<TableHandle> right_side,
+    const char **columns_to_match, int32_t num_columns_to_match,
+    const char **columns_to_add, int32_t num_columns_to_add,
+    NativePtr<TableHandle> *result,
+    ErrorStatus *status) {
+  JoinHelper(self, right_side,
+      columns_to_match, num_columns_to_match,
+      columns_to_add, num_columns_to_add,
+      result, status,
+      &TableHandle::CrossJoin);
+}
+
+void deephaven_client_TableHandle_NaturalJoin(
+    NativePtr<TableHandle> self,
+    NativePtr<TableHandle> right_side,
+    const char **columns_to_match, int32_t num_columns_to_match,
+    const char **columns_to_add, int32_t num_columns_to_add,
+    NativePtr<TableHandle> *result,
+    ErrorStatus *status) {
+  JoinHelper(self, right_side,
+      columns_to_match, num_columns_to_match,
+      columns_to_add, num_columns_to_add,
+      result, status,
+      &TableHandle::NaturalJoin);
+}
+
+void deephaven_client_TableHandle_LeftOuterJoin(
+    NativePtr<TableHandle> self,
+    NativePtr<TableHandle> right_side,
+    const char **columns_to_match, int32_t num_columns_to_match,
+    const char **columns_to_add, int32_t num_columns_to_add,
+    NativePtr<TableHandle> *result,
+    ErrorStatus *status) {
+  JoinHelper(self, right_side,
+      columns_to_match, num_columns_to_match,
+      columns_to_add, num_columns_to_add,
+      result, status,
+      &TableHandle::LeftOuterJoin);
+}
+
+void deephaven_client_TableHandle_ExactJoin(
+    NativePtr<TableHandle> self,
+    NativePtr<TableHandle> right_side,
+    const char **columns_to_match, int32_t num_columns_to_match,
+    const char **columns_to_add, int32_t num_columns_to_add,
+    NativePtr<TableHandle> *result,
+    ErrorStatus *status) {
+  JoinHelper(self, right_side,
+      columns_to_match, num_columns_to_match,
+      columns_to_add, num_columns_to_add,
+      result, status,
+      &TableHandle::ExactJoin);
+}
+
+void deephaven_client_TableHandle_Aj(
+    NativePtr<TableHandle> self,
+    NativePtr<TableHandle> right_side,
+    const char **columns_to_match, int32_t num_columns_to_match,
+    const char **columns_to_add, int32_t num_columns_to_add,
+    NativePtr<TableHandle> *result,
+    ErrorStatus *status) {
+  JoinHelper(self, right_side,
+      columns_to_match, num_columns_to_match,
+      columns_to_add, num_columns_to_add,
+      result, status,
+      &TableHandle::Aj);
+}
+
+void deephaven_client_TableHandle_Raj(
+    NativePtr<TableHandle> self,
+    NativePtr<TableHandle> right_side,
+    const char **columns_to_match, int32_t num_columns_to_match,
+    const char **columns_to_add, int32_t num_columns_to_add,
+    NativePtr<TableHandle> *result,
+    ErrorStatus *status) {
+  JoinHelper(self, right_side,
+      columns_to_match, num_columns_to_match,
+      columns_to_add, num_columns_to_add,
+      result, status,
+      &TableHandle::Raj);
+}
+
+void deephaven_client_TableHandle_UpdateBy(
+    NativePtr<TableHandle> self,
+    const NativePtr<UpdateByOperation> *ops, int32_t num_ops,
+    const char **by, int32_t num_by,
+    NativePtr<TableHandle> *result,
+    ErrorStatus *status) {
+  status->Run([=]() {
+    auto ops_vec = MakeReservedVector<UpdateByOperation>(num_ops);
+    for (int32_t i = 0; i != num_ops; ++i) {
+      ops_vec.emplace_back(*ops[i].Get());
+    }
+    std::vector<std::string> by_vec(by, by + num_by);
+    auto res = self->UpdateBy(std::move(ops_vec), std::move(by_vec));
+    result->Reset(new TableHandle(std::move(res)));
+  });
+}
+
+void deephaven_client_TableHandle_AddTable(
+    NativePtr<TableHandle> self,
+    NativePtr<TableHandle> table_to_add,
+    ErrorStatus *status) {
+  status->Run([=]() {
+    self->AddTable(*table_to_add);
+  });
+}
+
+void deephaven_client_TableHandle_RemoveTable(
+    NativePtr<TableHandle> self,
+    NativePtr<TableHandle> table_to_remove,
+    ErrorStatus *status) {
+  status->Run([=]() {
+    self->RemoveTable(*table_to_remove);
+  });
+}
+
+void deephaven_client_TableHandle_By(
+    NativePtr<TableHandle> self,
+    NativePtr<AggregateCombo> aggregate_combo,
+    const char **column_specs, int32_t num_column_specs,
+    NativePtr<TableHandle> *result,
+    ErrorStatus *status) {
+  status->Run([=]() {
+    std::vector<std::string> cols(column_specs, column_specs + num_column_specs);
+    auto table = self->By(*aggregate_combo, std::move(cols));
+    result->Reset(new TableHandle(std::move(table)));
+  });
+}
+
+void deephaven_client_TableHandle_Head(
+    NativePtr<TableHandle> self,
+    int64_t num_rows,
+    NativePtr<TableHandle> *result,
+    ErrorStatus *status) {
+  status->Run([=]() {
+    auto table = self->Head(num_rows);
+    result->Reset(new TableHandle(std::move(table)));
+  });
+}
+
+void deephaven_client_TableHandle_Tail(
+    NativePtr<TableHandle> self,
+    int64_t num_rows,
+    NativePtr<TableHandle> *result,
+    ErrorStatus *status) {
+  status->Run([=]() {
+    auto table = self->Tail(num_rows);
+    result->Reset(new TableHandle(std::move(table)));
+  });
+}
+
+void deephaven_client_TableHandle_Merge(NativePtr<TableHandle> self,
+    const char *key_column,
+    NativePtr<TableHandle> *sources, int32_t num_sources,
+    NativePtr<TableHandle> *result,
+    ErrorStatus *status) {
+  status->Run([=]() {
+    // We need to make copies of the passed-in TableHandles because we're not
+    // allowed to modify or move them.
+    auto sources_copy = MakeReservedVector<TableHandle>(num_sources);
+    for (int32_t i = 0; i != num_sources; ++i) {
+      sources_copy.push_back(*sources[i]);
+    }
+    auto table = self->Merge(key_column, std::move(sources_copy));
+    result->Reset(new TableHandle(std::move(table)));
+  });
+}
+
+void deephaven_client_TableHandle_BindToVariable(
+    NativePtr<TableHandle> self,
+    const char *variable,
+    ErrorStatus *status) {
+  status->Run([=]() {
+    self->BindToVariable(variable);
+  });
+}
+
+void deephaven_client_TableHandle_ToString(
+    NativePtr<TableHandle> self,
+    InteropBool want_headers,
+    StringHandle *result_handle,
+    StringPoolHandle *string_pool_handle,
+    ErrorStatus *status) {
+  status->Run([=]() {
+    StringPoolBuilder builder;
+    *result_handle = builder.Add(self->ToString((bool)want_headers));
+    *string_pool_handle = builder.Build();
+  });
+}
+
+void deephaven_client_TableHandle_ToArrowTable(
+    NativePtr<TableHandle> self,
+    NativePtr<ArrowTableSpWrapper> *result,
+    ErrorStatus *status) {
+  status->Run([=]() {
+    auto at = self->ToArrowTable();
+    result->Reset(new ArrowTableSpWrapper(std::move(at)));
+  });
+}
+
+class WrappedTickingCallback final : public TickingCallback {
+public:
+  WrappedTickingCallback(NativeOnUpdate *on_update, NativeOnFailure *on_failure) :
+     on_update_(on_update), on_failure_(on_failure) {}
+
+  void OnTick(TickingUpdate update) final {
+    NativePtr<TickingUpdate> nptr(new TickingUpdate(std::move(update)));
+    (*on_update_)(nptr);
+  }
+
+  void OnFailure(std::exception_ptr eptr) final {
+    StringPoolBuilder builder;
+    auto string_handle = builder.Add(GetWhat(eptr));
+    auto pool_handle = builder.Build();
+    (*on_failure_)(string_handle, pool_handle);
+  }
+
+private:
+  NativeOnUpdate *on_update_ = nullptr;
+  NativeOnFailure *on_failure_ = nullptr;
+};
+
+void deephaven_client_TableHandle_Subscribe(
+    NativePtr<TableHandle> self,
+    NativePtr<NativeOnUpdate> native_on_update,
+    NativePtr<NativeOnFailure> native_on_failure,
+    NativePtr<std::shared_ptr<SubscriptionHandle>> *native_subscription_handle,
+    ErrorStatus *status) {
+  status->Run([=]() {
+    auto wtc = std::make_shared<WrappedTickingCallback>(native_on_update, native_on_failure);
+    auto handle = self->Subscribe(std::move(wtc));
+    native_subscription_handle->Reset(new std::shared_ptr<SubscriptionHandle>(std::move(handle)));
+  });
+}
+
+void deephaven_client_TableHandle_Unsubscribe(
+    NativePtr<deephaven::client::TableHandle> self,
+    NativePtr<std::shared_ptr<deephaven::client::subscription::SubscriptionHandle>> native_subscription_handle,
+    ErrorStatus *status) {
+  status->Run([=]() {
+    self->Unsubscribe(*native_subscription_handle);
+  });
+}
+
+void deephaven_client_SubscriptionHandle_dtor(
+    deephaven::dhcore::interop::NativePtr<std::shared_ptr<deephaven::client::subscription::SubscriptionHandle>> self) {
+  delete self.Get();
+}
+
+void deephaven_client_TableHandle_ToClientTable(
+    NativePtr<TableHandle> self,
+    NativePtr<ClientTableSpWrapper> *client_table,
+    ErrorStatus *status) {
+  status->Run([=]() {
+    auto ct = self->ToClientTable();
+    client_table->Reset(new ClientTableSpWrapper(std::move(ct)));
+  });
+}
+
+void deephaven_client_ArrowTable_dtor(
+    NativePtr<ArrowTableSpWrapper> self) {
+  delete self.Get();
+}
+
+void deephaven_client_ArrowTable_GetDimensions(
+    NativePtr<ArrowTableSpWrapper> self,
+    int32_t *num_columns, int64_t *num_rows,
+    ErrorStatus *status) {
+  status->Run([=]() {
+    *num_columns = self->table_->num_columns();
+    *num_rows = self->table_->num_rows();
+  });
+}
+
+void deephaven_client_ArrowTable_GetSchema(
+    NativePtr<ArrowTableSpWrapper> self,
+  int32_t num_columns, StringHandle *column_handles, int32_t *column_types,
+  StringPoolHandle *string_pool_handle, ErrorStatus *status) {
+  status->Run([=]() {
+    const auto &schema = self->table_->schema();
+    if (schema->num_fields() != num_columns) {
+      auto message = fmt::format("Expected schema->num_fields ({}) == num_columns ({})",
+          schema->num_fields(), num_columns);
+      throw std::runtime_error(DEEPHAVEN_LOCATION_STR(message));
+    }
+
+    StringPoolBuilder builder;
+    for (int32_t i = 0; i != num_columns; ++i) {
+      const auto &field = schema->fields()[i];
+      column_handles[i] = builder.Add(field->name());
+      auto element_type_id = *ArrowUtil::GetElementTypeId(*field->type(), true);
+      column_types[i] = static_cast<int32_t>(element_type_id);
+    }
+    *string_pool_handle = builder.Build();
+  });
+}
+
+void deephaven_client_TickingUpdate_dtor(NativePtr<TickingUpdate> self) {
+  delete self.Get();
+}
+
+void deephaven_client_TickingUpdate_Current(NativePtr<TickingUpdate> self,
+    NativePtr<ClientTableSpWrapper> *result,
+    ErrorStatus *status) {
+  status->Run([=]() {
+    result->Reset(new ClientTableSpWrapper(self->Current()));
+  });
+}
+
+void deephaven_client_ClientTable_GetDimensions(
+    NativePtr<ClientTableSpWrapper> self,
+    int32_t *num_columns, int64_t *num_rows,
+    ErrorStatus *status) {
+  status->Run([=]() {
+    *num_columns = static_cast<int32_t>(self->table_->NumColumns());
+    *num_rows = static_cast<int64_t>(self->table_->NumRows());
+  });
+}
+
+void deephaven_client_ClientTable_Schema(NativePtr<ClientTableSpWrapper> self,
+    int32_t num_columns, StringHandle *column_handles, int32_t *column_types,
+    StringPoolHandle *string_pool_handle,
+    ErrorStatus *status) {
+  status->Run([=]() {
+    const auto &schema = self->table_->Schema();
+    if (schema->NumCols() != num_columns) {
+      auto message = fmt::format("Expected schema->num_fields ({}) == num_columns ({})",
+          schema->NumCols(), num_columns);
+      throw std::runtime_error(DEEPHAVEN_LOCATION_STR(message));
+    }
+
+    StringPoolBuilder builder;
+    for (int32_t i = 0; i != num_columns; ++i) {
+      column_handles[i] = builder.Add(schema->Names()[i]);
+      column_types[i] = static_cast<int32_t>(schema->Types()[i]);
+    }
+    *string_pool_handle = builder.Build();
+  });
+}
+
+void deephaven_client_ClientTable_ToString(
+    NativePtr<ClientTableSpWrapper> self,
+    InteropBool want_headers,
+    InteropBool want_row_numbers,
+    StringHandle *text_handle,
+    StringPoolHandle *string_pool_handle,
+    ErrorStatus *status) {
+  status->Run([=]() {
+    StringPoolBuilder builder;
+    auto text = self->table_->ToString((bool)want_headers, (bool)want_row_numbers);
+    *text_handle = builder.Add(text);
+    *string_pool_handle = builder.Build();
+  });
+}
+
+void deephaven_client_ClientTable_dtor(NativePtr<ClientTableSpWrapper> self) {
+  delete self.Get();
+}
+
+void deephaven_client_ClientTableHelper_GetInt8Column(
+    NativePtr<ClientTableSpWrapper> self,
+    int32_t column_index,
+    int8_t *data, InteropBool *optional_dest_null_flags, int64_t num_rows,
+    StringPoolHandle *string_pool_handle,
+    ErrorStatus *status) {
+  status->Run([=]() {
+    auto data_chunk = Int8Chunk::CreateView(data, num_rows);
+    GetColumnHelper(self, column_index, &data_chunk, optional_dest_null_flags, num_rows);
+    // return default StringPoolHandle because this type doesn't need a string pool
+    *string_pool_handle = StringPoolHandle();
+  });
+}
+
+void deephaven_client_ClientTableHelper_GetInt16Column(
+    NativePtr<ClientTableSpWrapper> self,
+    int32_t column_index,
+    int16_t *data, InteropBool *optional_dest_null_flags, int64_t num_rows,
+    StringPoolHandle *string_pool_handle,
+    ErrorStatus *status) {
+  status->Run([=]() {
+    auto data_chunk = Int16Chunk::CreateView(data, num_rows);
+    GetColumnHelper(self, column_index, &data_chunk, optional_dest_null_flags, num_rows);
+    // return default StringPoolHandle because this type doesn't need a string pool
+    *string_pool_handle = StringPoolHandle();
+  });
+}
+
+void deephaven_client_ClientTableHelper_GetInt32Column(
+    NativePtr<ClientTableSpWrapper> self,
+    int32_t column_index,
+    int32_t *data, InteropBool *optional_dest_null_flags, int64_t num_rows,
+    StringPoolHandle *string_pool_handle,
+    ErrorStatus *status) {
+  status->Run([=]() {
+    auto data_chunk = Int32Chunk::CreateView(data, num_rows);
+    GetColumnHelper(self, column_index, &data_chunk, optional_dest_null_flags, num_rows);
+    // return default StringPoolHandle because this type doesn't need a string pool
+    *string_pool_handle = StringPoolHandle();
+  });
+}
+
+void deephaven_client_ClientTableHelper_GetInt64Column(
+    NativePtr<ClientTableSpWrapper> self,
+    int32_t column_index,
+    int64_t *data, InteropBool *optional_dest_null_flags, int64_t num_rows,
+    StringPoolHandle *string_pool_handle,
+    ErrorStatus *status) {
+  status->Run([=]() {
+    auto data_chunk = Int64Chunk::CreateView(data, num_rows);
+    GetColumnHelper(self, column_index, &data_chunk, optional_dest_null_flags, num_rows);
+    // return default StringPoolHandle because this type doesn't need a string pool
+    *string_pool_handle = StringPoolHandle();
+  });
+}
+
+void deephaven_client_ClientTableHelper_GetFloatColumn(
+    NativePtr<ClientTableSpWrapper> self,
+    int32_t column_index, float *data, InteropBool *optional_dest_null_flags, int64_t num_rows,
+    StringPoolHandle *string_pool_handle,
+    ErrorStatus *status) {
+  status->Run([=]() {
+    auto data_chunk = FloatChunk::CreateView(data, num_rows);
+    GetColumnHelper(self, column_index, &data_chunk, optional_dest_null_flags, num_rows);
+    // return default StringPoolHandle because this type doesn't need a string pool
+    *string_pool_handle = StringPoolHandle();
+  });
+}
+
+void deephaven_client_ClientTableHelper_GetDoubleColumn(
+    NativePtr<ClientTableSpWrapper> self,
+    int32_t column_index, double *data, InteropBool *optional_dest_null_flags, int64_t num_rows,
+    StringPoolHandle *string_pool_handle,
+    ErrorStatus *status) {
+  status->Run([=]() {
+    auto data_chunk = DoubleChunk::CreateView(data, num_rows);
+    GetColumnHelper(self, column_index, &data_chunk, optional_dest_null_flags, num_rows);
+    // return default StringPoolHandle because this type doesn't need a string pool
+    *string_pool_handle = StringPoolHandle();
+  });
+}
+
+void deephaven_client_ClientTableHelper_GetCharAsInt16Column(
+    NativePtr<ClientTableSpWrapper> self,
+    int32_t column_index, int16_t *data, InteropBool *optional_dest_null_flags, int64_t num_rows,
+    StringPoolHandle *string_pool_handle,
+    ErrorStatus *status) {
+  status->Run([=]() {
+    auto data_chunk = CharChunk::Create(num_rows);
+    GetColumnHelper(self, column_index, &data_chunk, optional_dest_null_flags, num_rows);
+    // For char, boolean, DateTime, and String we have to do a little data conversion.
+    for (int64_t i = 0; i != num_rows; ++i) {
+      data[i] = static_cast<int16_t>(data_chunk.data()[i]);
+    }
+    // return default StringPoolHandle because this type doesn't need a string pool
+    *string_pool_handle = StringPoolHandle();
+  });
+}
+
+void deephaven_client_ClientTableHelper_GetBooleanAsInteropBoolColumn(
+    NativePtr<ClientTableSpWrapper> self,
+    int32_t column_index, int8_t *data, InteropBool *optional_dest_null_flags, int64_t num_rows,
+    StringPoolHandle *string_pool_handle,
+    ErrorStatus *status) {
+  status->Run([=]() {
+    // For char, boolean, DateTime, and String we have to do a little data conversion.
+    auto data_chunk = BooleanChunk::Create(num_rows);
+    GetColumnHelper(self, column_index, &data_chunk, optional_dest_null_flags, num_rows);
+    for (int64_t i = 0; i != num_rows; ++i) {
+      data[i] = data_chunk.data()[i] ? 1 : 0;
+    }
+    // return default StringPoolHandle because this type doesn't need a string pool
+    *string_pool_handle = StringPoolHandle();
+  });
+}
+
+void deephaven_client_ClientTableHelper_GetStringColumn(
+    NativePtr<ClientTableSpWrapper> self,
+    int32_t column_index, StringHandle *data, InteropBool *optional_dest_null_flags,
+    int64_t num_rows,
+    StringPoolHandle *string_pool_handle,
+    ErrorStatus *status) {
+  status->Run([=]() {
+    // For char, boolean, DateTime, and String we have to do a little data conversion.
+    auto data_chunk = StringChunk::Create(num_rows);
+    GetColumnHelper(self, column_index, &data_chunk, optional_dest_null_flags, num_rows);
+    StringPoolBuilder builder;
+    for (int64_t i = 0; i != num_rows; ++i) {
+      data[i] = builder.Add(data_chunk.data()[i]);
+    }
+    *string_pool_handle = builder.Build();
+  });
+}
+
+void deephaven_client_ClientTableHelper_GetDateTimeAsInt64Column(
+    NativePtr<ClientTableSpWrapper> self,
+    int32_t column_index, int64_t *data, InteropBool *optional_dest_null_flags, int64_t num_rows,
+    StringPoolHandle *string_pool_handle,
+    ErrorStatus *status) {
+  status->Run([=]() {
+    // For char, boolean, DateTime, and String we have to do a little data conversion.
+    auto data_chunk = DateTimeChunk::Create(num_rows);
+    GetColumnHelper(self, column_index, &data_chunk, optional_dest_null_flags, num_rows);
+    for (int64_t i = 0; i != num_rows; ++i) {
+      data[i] = data_chunk.data()[i].Nanos();
+    }
+    // return default StringPoolHandle because this type doesn't need a string pool
+    *string_pool_handle = StringPoolHandle();
+  });
+}
+
+void deephaven_client_AggregateCombo_Create(
+    const NativePtr<Aggregate> *aggregate_ptrs,
+    int32_t num_aggregates,
+    NativePtr<AggregateCombo> *result,
+    ErrorStatus *status) {
+  status->Run([=]() {
+    auto agg_copies = MakeReservedVector<Aggregate>(num_aggregates);
+    for (int32_t i = 0; i != num_aggregates; ++i) {
+      agg_copies.push_back(*aggregate_ptrs[i]);
+    }
+    auto ac = AggregateCombo::Create(std::move(agg_copies));
+    result->Reset(new AggregateCombo(std::move(ac)));
+  });
+}
+
+void deephaven_client_AggregateCombo_dtor(NativePtr<AggregateCombo> self) {
+  delete self.Get();
+}
+
+void deephaven_client_Aggregate_dtor(NativePtr<Aggregate> self) {
+  delete self.Get();
+}
+
+void deephaven_client_Aggregate_AbsSum(
+    const char **columns, int32_t num_columns,
+    NativePtr<Aggregate> *result,
+    ErrorStatus *status) {
+  status->Run([=]() {
+    auto cols = std::vector<std::string>(columns, columns + num_columns);
+    result->Reset(new Aggregate(Aggregate::AbsSum(std::move(cols))));
+  });
+}
+
+void deephaven_client_Aggregate_Group(
+    const char **columns, int32_t num_columns,
+    NativePtr<Aggregate> *result,
+    ErrorStatus *status) {
+  status->Run([=]() {
+    auto cols = std::vector<std::string>(columns, columns + num_columns);
+    result->Reset(new Aggregate(Aggregate::Group(std::move(cols))));
+  });
+}
+
+void deephaven_client_Aggregate_Avg(
+    const char **columns, int32_t num_columns,
+    NativePtr<Aggregate> *result,
+    ErrorStatus *status) {
+  status->Run([=]() {
+    auto cols = std::vector<std::string>(columns, columns + num_columns);
+    result->Reset(new Aggregate(Aggregate::Avg(std::move(cols))));
+  });
+}
+
+void deephaven_client_Aggregate_Count(
+    const char *column,
+    NativePtr<Aggregate> *result,
+    ErrorStatus *status) {
+  status->Run([=]() {
+    result->Reset(new Aggregate(Aggregate::Count(column)));
+  });
+}
+
+void deephaven_client_Aggregate_First(
+    const char **columns, int32_t num_columns,
+    NativePtr<Aggregate> *result,
+    ErrorStatus *status) {
+  status->Run([=]() {
+    auto cols = std::vector<std::string>(columns, columns + num_columns);
+    result->Reset(new Aggregate(Aggregate::First(std::move(cols))));
+  });
+}
+
+void deephaven_client_Aggregate_Last(
+    const char **columns, int32_t num_columns,
+    NativePtr<Aggregate> *result,
+    ErrorStatus *status) {
+  status->Run([=]() {
+    auto cols = std::vector<std::string>(columns, columns + num_columns);
+    result->Reset(new Aggregate(Aggregate::Last(std::move(cols))));
+  });
+}
+
+void deephaven_client_Aggregate_Max(
+    const char **columns, int32_t num_columns,
+    NativePtr<Aggregate> *result,
+    ErrorStatus *status) {
+  status->Run([=]() {
+    auto cols = std::vector<std::string>(columns, columns + num_columns);
+    result->Reset(new Aggregate(Aggregate::Max(std::move(cols))));
+  });
+}
+
+void deephaven_client_Aggregate_Med(
+    const char **columns, int32_t num_columns,
+    NativePtr<Aggregate> *result,
+    ErrorStatus *status) {
+  status->Run([=]() {
+    auto cols = std::vector<std::string>(columns, columns + num_columns);
+    result->Reset(new Aggregate(Aggregate::Med(std::move(cols))));
+  });
+}
+
+void deephaven_client_Aggregate_Min(
+    const char **columns, int32_t num_columns,
+    NativePtr<Aggregate> *result,
+    ErrorStatus *status) {
+  status->Run([=]() {
+    auto cols = std::vector<std::string>(columns, columns + num_columns);
+    result->Reset(new Aggregate(Aggregate::Min(std::move(cols))));
+  });
+}
+
+void deephaven_client_Aggregate_Pct(
+    double percentile, InteropBool avg_median,
+    const char **columns, int32_t num_columns,
+    NativePtr<Aggregate> *result,
+    ErrorStatus *status) {
+  status->Run([=]() {
+    auto cols = std::vector<std::string>(columns, columns + num_columns);
+    result->Reset(new Aggregate(Aggregate::Pct(percentile, (bool)avg_median, std::move(cols))));
+  });
+}
+
+void deephaven_client_Aggregate_Std(
+    const char **columns, int32_t num_columns,
+    NativePtr<Aggregate> *result,
+    ErrorStatus *status) {
+  status->Run([=]() {
+    auto cols = std::vector<std::string>(columns, columns + num_columns);
+    result->Reset(new Aggregate(Aggregate::Std(std::move(cols))));
+  });
+}
+
+void deephaven_client_Aggregate_Sum(
+    const char **columns, int32_t num_columns,
+    NativePtr<Aggregate> *result,
+    ErrorStatus *status) {
+  status->Run([=]() {
+    auto cols = std::vector<std::string>(columns, columns + num_columns);
+    result->Reset(new Aggregate(Aggregate::Sum(std::move(cols))));
+  });
+}
+
+void deephaven_client_Aggregate_Var(
+    const char **columns, int32_t num_columns,
+    NativePtr<Aggregate> *result,
+    ErrorStatus *status) {
+  status->Run([=]() {
+    auto cols = std::vector<std::string>(columns, columns + num_columns);
+    result->Reset(new Aggregate(Aggregate::Var(std::move(cols))));
+  });
+}
+
+void deephaven_client_Aggregate_WAvg(const char *weight,
+    const char **columns, int32_t num_columns,
+    NativePtr<Aggregate> *result,
+    ErrorStatus *status) {
+  status->Run([=]() {
+    auto cols = std::vector<std::string>(columns, columns + num_columns);
+    result->Reset(new Aggregate(Aggregate::WAvg(std::string(weight), std::move(cols))));
+  });
+}
+
+void deephaven_client_utility_DurationSpecifier_ctor_nanos(int64_t nanos,
+    NativePtr<DurationSpecifier> *result,
+    ErrorStatus *status) {
+  status->Run([=] {
+    result->Reset(new DurationSpecifier(nanos));
+  });
+}
+
+void deephaven_client_utility_DurationSpecifier_ctor_durationstr(
+    const char *duration_str,
+    NativePtr<DurationSpecifier> *result,
+    ErrorStatus *status) {
+  status->Run([=] {
+    result->Reset(new DurationSpecifier(duration_str));
+  });
+}
+
+void deephaven_client_utility_DurationSpecifier_dtor(NativePtr<DurationSpecifier> self) {
+  delete self.Get();
+}
+
+void deephaven_client_utility_TimePointSpecifier_ctor_nanos(
+    int64_t nanos,
+    NativePtr<TimePointSpecifier> *result,
+    ErrorStatus *status) {
+  status->Run([=] {
+    result->Reset(new TimePointSpecifier(nanos));
+  });
+}
+
+void deephaven_client_utility_TimePointSpecifier_ctor_timepointstr(
+    const char *time_point_str,
+    NativePtr<TimePointSpecifier> *result,
+    ErrorStatus *status) {
+  status->Run([=] {
+    result->Reset(new TimePointSpecifier(time_point_str));
+  });
+}
+
+void deephaven_client_utility_TimePointSpecifier_dtor(NativePtr<TimePointSpecifier> self) {
+  delete self.Get();
+}
+
+void deephaven_dhclient_utility_TableMaker_ctor(
+    NativePtr<TableMaker> *result,
+    ErrorStatus *status) {
+  status->Run([=] {
+    result->Reset(new TableMaker());
+  });
+}
+
+void deephaven_dhclient_utility_TableMaker_dtor(NativePtr<TableMaker> self) {
+  delete self.Get();
+}
+
+void deephaven_dhclient_utility_TableMaker_MakeTable(
+    NativePtr<TableMaker> self,
+    NativePtr<TableHandleManager> manager,
+    NativePtr<TableHandle> *result,
+    ErrorStatus *status) {
+  status->Run([=] {
+    auto th = self->MakeTable(*manager);
+    result->Reset(new TableHandle(std::move(th)));
+  });
+}
+
+void deephaven_dhclient_utility_TableMaker_AddColumn__CharAsInt16(
+    NativePtr<TableMaker> self,
+    const char *name, const int16_t *data, int32_t length,
+    const InteropBool *optional_nulls,
+    ErrorStatus *status) {
+  status->Run([=] {
+    auto get_value = [=](size_t index) -> int16_t { return static_cast<int16_t>(data[index]); };
+    auto is_null = [=](size_t index) { return optional_nulls != nullptr && (bool)optional_nulls[index]; };
+    self->AddColumn<char16_t>(name, get_value, is_null, length);
+  });
+}
+
+void deephaven_dhclient_utility_TableMaker_AddColumn__Int8(
+    NativePtr<TableMaker> self,
+    const char *name, const int8_t *data, int32_t length,
+    const InteropBool *optional_nulls,
+    ErrorStatus *status) {
+  status->Run([=] {
+    auto get_value = [=](size_t index) { return data[index]; };
+    auto is_null = [=](size_t index) { return optional_nulls != nullptr && (bool)optional_nulls[index]; };
+    self->AddColumn<int8_t>(name, get_value, is_null, length);
+  });
+}
+
+void deephaven_dhclient_utility_TableMaker_AddColumn__Int16(
+    NativePtr<TableMaker> self,
+    const char *name, const int16_t *data, int32_t length,
+    const InteropBool *optional_nulls,
+    ErrorStatus *status) {
+  status->Run([=] {
+    auto get_value = [=](size_t index) { return data[index]; };
+    auto is_null = [=](size_t index) { return optional_nulls != nullptr && (bool)optional_nulls[index]; };
+    self->AddColumn<int16_t>(name, get_value, is_null, length);
+  });
+}
+
+void deephaven_dhclient_utility_TableMaker_AddColumn__Int32(
+    NativePtr<TableMaker> self,
+    const char *name, const int32_t *data, int32_t length,
+    const InteropBool *optional_nulls,
+    ErrorStatus *status) {
+  status->Run([=] {
+    auto get_value = [=](size_t index) { return data[index]; };
+    auto is_null = [=](size_t index) { return optional_nulls != nullptr && (bool)optional_nulls[index]; };
+    self->AddColumn<int32_t>(name, get_value, is_null, length);
+  });
+}
+
+void deephaven_dhclient_utility_TableMaker_AddColumn__Int64(
+    NativePtr<TableMaker> self,
+    const char *name, const int64_t *data, int32_t length,
+    const InteropBool *optional_nulls,
+    ErrorStatus *status) {
+  status->Run([=] {
+    auto get_value = [=](size_t index) { return data[index]; };
+    auto is_null = [=](size_t index) { return optional_nulls != nullptr && (bool)optional_nulls[index]; };
+    self->AddColumn<int64_t>(name, get_value, is_null, length);
+  });
+}
+
+void deephaven_dhclient_utility_TableMaker_AddColumn__Float(
+    NativePtr<TableMaker> self,
+    const char *name, const float *data, int32_t length,
+    const InteropBool *optional_nulls,
+    ErrorStatus *status) {
+  status->Run([=] {
+    auto get_value = [=](size_t index) { return data[index]; };
+    auto is_null = [=](size_t index) { return optional_nulls != nullptr && (bool)optional_nulls[index]; };
+    self->AddColumn<float>(name, get_value, is_null, length);
+  });
+}
+
+void deephaven_dhclient_utility_TableMaker_AddColumn__Double(
+    NativePtr<TableMaker> self,
+    const char *name, const double *data, int32_t length,
+    const InteropBool *optional_nulls,
+    ErrorStatus *status) {
+  status->Run([=] {
+    auto get_value = [=](size_t index) { return data[index]; };
+    auto is_null = [=](size_t index) { return optional_nulls != nullptr && (bool)optional_nulls[index]; };
+    self->AddColumn<double>(name, get_value, is_null, length);
+  });
+}
+
+void deephaven_dhclient_utility_TableMaker_AddColumn__BoolAsInteropBool(
+    NativePtr<TableMaker> self,
+    const char *name, const int8_t *data, int32_t length,
+    const InteropBool *optional_nulls,
+    ErrorStatus *status) {
+  status->Run([=] {
+    auto get_value = [=](size_t index) { return data[index] != 0; };
+    auto is_null = [=](size_t index) { return optional_nulls != nullptr && (bool)optional_nulls[index]; };
+    self->AddColumn<bool>(name, get_value, is_null, length);
+  });
+}
+
+void deephaven_dhclient_utility_TableMaker_AddColumn__DateTimeAsInt64(
+    NativePtr<TableMaker> self,
+    const char *name, const int64_t *data, int32_t length,
+    const InteropBool *optional_nulls,
+    ErrorStatus *status) {
+  status->Run([=] {
+    auto get_value = [=](size_t index) { return DateTime::FromNanos(data[index]); };
+    auto is_null = [=](size_t index) { return optional_nulls != nullptr && (bool)optional_nulls[index]; };
+    self->AddColumn<DateTime>(name, get_value, is_null, length);
+  });
+}
+
+void deephaven_dhclient_utility_TableMaker_AddColumn__String(
+    NativePtr<TableMaker> self,
+    const char *name, const char **data, int32_t length,
+    const InteropBool *optional_nulls,
+    ErrorStatus *status) {
+  status->Run([=] {
+    auto get_value = [=](size_t index) -> std::string {
+      if (data[index] == nullptr) {
+        return "";
+      }
+      return data[index];
+    };
+    auto is_null = [=](size_t index) { return optional_nulls != nullptr && (bool)optional_nulls[index]; };
+    self->AddColumn<std::string>(name, get_value, is_null, length);
+  });
+}
+}  // extern "C"
diff --git a/cpp-client/deephaven/dhclient/src/interop/client_options_interop.cc b/cpp-client/deephaven/dhclient/src/interop/client_options_interop.cc
new file mode 100644
index 00000000000..3a40e861d12
--- /dev/null
+++ b/cpp-client/deephaven/dhclient/src/interop/client_options_interop.cc
@@ -0,0 +1,118 @@
+/*
+ * Copyright (c) 2016-2024 Deephaven Data Labs and Patent Pending
+ */
+#include "deephaven/client/interop/client_options_interop.h"
+
+#include "deephaven/client/client.h"
+#include "deephaven/client/client_options.h"
+#include "deephaven/dhcore/interop/interop_util.h"
+
+using deephaven::dhcore::interop::ErrorStatus;
+using deephaven::dhcore::interop::InteropBool;
+using deephaven::dhcore::interop::NativePtr;
+
+using deephaven::client::ClientOptions;
+
+extern "C" {
+void deephaven_client_ClientOptions_ctor(NativePtr<ClientOptions> *result,
+    ErrorStatus *status) {
+  status->Run([=]() {
+    result->Reset(new ClientOptions());
+  });
+}
+
+void deephaven_client_ClientOptions_dtor(NativePtr<ClientOptions> self) {
+  delete self;
+}
+
+void deephaven_client_ClientOptions_SetDefaultAuthentication(NativePtr<ClientOptions> self,
+    ErrorStatus *status) {
+  status->Run([=]() {
+    self->SetDefaultAuthentication();
+  });
+}
+
+void deephaven_client_ClientOptions_SetBasicAuthentication(NativePtr<ClientOptions> self,
+    const char *username, const char *password,
+    ErrorStatus *status) {
+  status->Run([=]() {
+    self->SetBasicAuthentication(username, password);
+  });
+}
+
+void deephaven_client_ClientOptions_SetCustomAuthentication(NativePtr<ClientOptions> self,
+    const char *authentication_key, const char *authentication_value,
+    ErrorStatus *status) {
+  status->Run([=]() {
+    self->SetCustomAuthentication(authentication_key, authentication_value);
+  });
+}
+
+void deephaven_client_ClientOptions_SetSessionType(NativePtr<ClientOptions> self,
+    const char *session_type,
+    ErrorStatus *status) {
+  status->Run([=]() {
+    self->SetSessionType(session_type);
+  });
+}
+
+void deephaven_client_ClientOptions_SetUseTls(NativePtr<ClientOptions> self,
+    InteropBool use_tls,
+    ErrorStatus *status) {
+  status->Run([=]() {
+    self->SetUseTls((bool)use_tls);
+  });
+
+}
+
+void deephaven_client_ClientOptions_SetTlsRootCerts(NativePtr<ClientOptions> self,
+    const char *tls_root_certs,
+    ErrorStatus *status) {
+  status->Run([=]() {
+    self->SetTlsRootCerts(tls_root_certs);
+  });
+}
+
+void deephaven_client_ClientOptions_SetClientCertChain(NativePtr<ClientOptions> self,
+    const char *client_cert_chain,
+    ErrorStatus *status) {
+  status->Run([=]() {
+    self->SetClientCertChain(client_cert_chain);
+  });
+
+}
+
+void deephaven_client_ClientOptions_SetClientPrivateKey(NativePtr<ClientOptions> self,
+    const char *client_private_key,
+    ErrorStatus *status) {
+  status->Run([=]() {
+    self->SetClientPrivateKey(client_private_key);
+  });
+
+}
+
+void deephaven_client_ClientOptions_AddIntOption(NativePtr<ClientOptions> self,
+    const char *opt, int32_t val,
+    ErrorStatus *status) {
+  status->Run([=]() {
+    self->AddIntOption(opt, val);
+  });
+
+}
+
+void deephaven_client_ClientOptions_AddStringOption(NativePtr<ClientOptions> self,
+    const char *opt, const char *val,
+    ErrorStatus *status) {
+  status->Run([=]() {
+    self->AddStringOption(opt, val);
+  });
+}
+
+void deephaven_client_ClientOptions_AddExtraHeader(NativePtr<ClientOptions> self,
+    const char *header_name, const char *header_value,
+    ErrorStatus *status) {
+  status->Run([=]() {
+    self->AddExtraHeader(header_name, header_value);
+  });
+}
+}  // extern "C"
diff --git a/cpp-client/deephaven/dhclient/src/interop/update_by_interop.cc b/cpp-client/deephaven/dhclient/src/interop/update_by_interop.cc
new file mode 100644
index 00000000000..49c5c56ab0f
--- /dev/null
+++ b/cpp-client/deephaven/dhclient/src/interop/update_by_interop.cc
@@ -0,0 +1,435 @@
+/*
+ * Copyright (c) 2016-2024 Deephaven Data Labs and Patent Pending
+ */
+#include "deephaven/client/interop/update_by_interop.h"
+
+#include "deephaven/client/client.h"
+#include "deephaven/client/client_options.h"
+#include "deephaven/client/update_by.h"
+#include "deephaven/dhcore/interop/interop_util.h"
+
+using deephaven::dhcore::interop::ErrorStatus;
+using deephaven::dhcore::interop::InteropBool;
+using deephaven::dhcore::interop::NativePtr;
+
+using deephaven::client::ClientOptions;
+using deephaven::client::UpdateByOperation;
+using deephaven::client::update_by::DeltaControl;
+using deephaven::client::update_by::OperationControl;
+using deephaven::client::utility::DurationSpecifier;
+
+namespace {
+void WithColsHelper(const char **cols, int32_t num_cols,
+    NativePtr<UpdateByOperation> *result,
+    ErrorStatus *status,
+    UpdateByOperation (*fp)(std::vector<std::string>)) {
+  status->Run([=]() {
+    std::vector<std::string> columns(cols, cols + num_cols);
+    auto ubo = (*fp)(std::move(columns));
+    result->Reset(new UpdateByOperation(std::move(ubo)));
+  });
+}
+
+void WithTicksHelper(double decay_ticks,
+    const char **cols, int32_t num_cols,
+    const OperationControl *op_control,
+    NativePtr<UpdateByOperation> *result,
+    ErrorStatus *status,
+    UpdateByOperation (*fp)(double, std::vector<std::string>, const OperationControl &)) {
+  status->Run([=]() {
+    std::vector<std::string> columns(cols, cols + num_cols);
+    auto ubo = (*fp)(decay_ticks, std::move(columns), *op_control);
+    result->Reset(new UpdateByOperation(std::move(ubo)));
+  });
+}
+
+void WithTimeHelper(const char *timestamp_col,
+    NativePtr<DurationSpecifier> decay_time,
+    const char **cols, int32_t num_cols,
+    const OperationControl *op_control,
+    NativePtr<UpdateByOperation> *result,
+    ErrorStatus *status,
+    UpdateByOperation (*fp)(std::string, DurationSpecifier, std::vector<std::string>, const OperationControl &)) {
+  status->Run([=]() {
+    std::vector<std::string> columns(cols, cols + num_cols);
+    auto ubo = (*fp)(timestamp_col, *decay_time, std::move(columns), *op_control);
+    result->Reset(new UpdateByOperation(std::move(ubo)));
+  });
+}
+
+void WithRollingTicksHelper(
+    const char **cols, int32_t num_cols,
+    int32_t rev_ticks, int32_t fwd_ticks,
+    NativePtr<UpdateByOperation> *result,
+    ErrorStatus *status,
+    UpdateByOperation (*fp)(std::vector<std::string>, int32_t, int32_t)) {
+  status->Run([=]() {
+    std::vector<std::string> columns(cols, cols + num_cols);
+    auto ubo = (*fp)(std::move(columns), rev_ticks, fwd_ticks);
+    result->Reset(new UpdateByOperation(std::move(ubo)));
+  });
+}
+
+void WithRollingTimeHelper(const char *timestamp_col,
+    const char **cols, int32_t num_cols,
+    NativePtr<DurationSpecifier> rev_time,
+    NativePtr<DurationSpecifier> fwd_time,
+    NativePtr<UpdateByOperation> *result,
+    ErrorStatus *status,
+    UpdateByOperation (*fp)(std::string, std::vector<std::string>, DurationSpecifier, DurationSpecifier)) {
+  status->Run([=]() {
+    std::vector<std::string> columns(cols, cols + num_cols);
+    auto ubo = (*fp)(timestamp_col, std::move(columns), *rev_time, *fwd_time);
+    result->Reset(new UpdateByOperation(std::move(ubo)));
+  });
+}
+
+void WithRollingWavgTicksHelper(const char *weight_col,
+    const char **cols, int32_t num_cols,
+    int32_t rev_ticks, int32_t fwd_ticks,
+    NativePtr<UpdateByOperation> *result,
+    ErrorStatus *status,
+    UpdateByOperation (*fp)(std::string, std::vector<std::string>, int32_t, int32_t)) {
+  status->Run([=]() {
+    std::vector<std::string> columns(cols, cols + num_cols);
+    auto ubo = (*fp)(weight_col, std::move(columns), rev_ticks, fwd_ticks);
+    result->Reset(new UpdateByOperation(std::move(ubo)));
+  });
+}
+
+void WithRollingWavgTimeHelper(const char *timestamp_col, const char *weight_col,
+    const char **cols, int32_t num_cols,
+    NativePtr<DurationSpecifier> rev_time,
+    NativePtr<DurationSpecifier> fwd_time,
+    NativePtr<UpdateByOperation> *result,
+    ErrorStatus *status,
+    UpdateByOperation (*fp)(std::string, std::string, std::vector<std::string>, DurationSpecifier, DurationSpecifier)) {
+  status->Run([=]() {
+    std::vector<std::string> columns(cols, cols + num_cols);
+    auto ubo = (*fp)(timestamp_col, weight_col, std::move(columns), *rev_time, *fwd_time);
+    result->Reset(new UpdateByOperation(std::move(ubo)));
+  });
+}
+}  // namespace
+
+extern "C" {
+void deephaven_client_UpdateByOperation_dtor(
+    NativePtr<UpdateByOperation> self) {
+  delete self.Get();
+}
+
+void deephaven_client_update_by_cumSum(
+    const char **cols, int32_t num_cols,
+    NativePtr<UpdateByOperation> *result,
+    ErrorStatus *status) {
+  WithColsHelper(cols, num_cols, result, status, &deephaven::client::update_by::cumSum);
+}
+
+void deephaven_client_update_by_cumProd(
+    const char **cols, int32_t num_cols,
+    NativePtr<UpdateByOperation> *result,
+    ErrorStatus *status) {
+  WithColsHelper(cols, num_cols, result, status, &deephaven::client::update_by::cumProd);
+}
+
+void deephaven_client_update_by_cumMin(
+    const char **cols, int32_t num_cols,
+    NativePtr<UpdateByOperation> *result,
+    ErrorStatus *status) {
+  WithColsHelper(cols, num_cols, result, status, &deephaven::client::update_by::cumMin);
+}
+
+void deephaven_client_update_by_cumMax(
+    const char **cols, int32_t num_cols,
+    NativePtr<UpdateByOperation> *result,
+    ErrorStatus *status) {
+  WithColsHelper(cols, num_cols, result, status, &deephaven::client::update_by::cumMax);
+}
+
+void deephaven_client_update_by_forwardFill(
+    const char **cols, int32_t num_cols,
+    NativePtr<UpdateByOperation> *result,
+    ErrorStatus *status) {
+  WithColsHelper(cols, num_cols, result, status, &deephaven::client::update_by::forwardFill);
+}
+
+void deephaven_client_update_by_delta(
+    const char **cols, int32_t num_cols,
+    deephaven::client::update_by::DeltaControl delta_control,
+    NativePtr<UpdateByOperation> *result,
+    ErrorStatus *status) {
+  status->Run([=]() {
+    std::vector<std::string> columns(cols, cols + num_cols);
+    auto ubo = deephaven::client::update_by::delta(std::move(columns), delta_control);
+    result->Reset(new UpdateByOperation(std::move(ubo)));
+  });
+}
+
+void deephaven_client_update_by_emaTick(double decay_ticks,
+    const char **cols, int32_t num_cols,
+    const OperationControl *op_control,
+    NativePtr<UpdateByOperation> *result,
+    ErrorStatus *status) {
+  WithTicksHelper(decay_ticks, cols, num_cols, op_control, result, status,
+      &deephaven::client::update_by::emaTick);
+}
+
+void deephaven_client_update_by_emaTime(const char *timestamp_col,
+    NativePtr<DurationSpecifier> decay_time,
+    const char **cols, int32_t num_cols,
+    const OperationControl *op_control,
+    NativePtr<UpdateByOperation> *result,
+    ErrorStatus *status) {
+  WithTimeHelper(timestamp_col, decay_time, cols, num_cols, op_control, result, status,
+      &deephaven::client::update_by::emaTime);
+}
+
+void deephaven_client_update_by_emsTick(double decay_ticks,
+    const char **cols, int32_t num_cols,
+    const OperationControl *op_control,
+    NativePtr<UpdateByOperation> *result,
+    ErrorStatus *status) {
+  WithTicksHelper(decay_ticks, cols, num_cols, op_control, result, status,
+      &deephaven::client::update_by::emsTick);
+}
+
+void deephaven_client_update_by_emsTime(const char *timestamp_col,
+    deephaven::dhcore::interop::NativePtr<deephaven::client::utility::DurationSpecifier> decay_time,
+    const char **cols, int32_t num_cols,
+    const OperationControl *op_control,
+    NativePtr<UpdateByOperation> *result,
+    ErrorStatus *status) {
+  WithTimeHelper(timestamp_col, decay_time, cols, num_cols, op_control, result, status,
+      &deephaven::client::update_by::emsTime);
+}
+
+void deephaven_client_update_by_emminTick(double decay_ticks,
+    const char **cols, int32_t num_cols,
+    const OperationControl *op_control,
+    NativePtr<UpdateByOperation> *result,
+    ErrorStatus *status) {
+  WithTicksHelper(decay_ticks, cols, num_cols, op_control, result, status,
+      &deephaven::client::update_by::emminTick);
+}
+
+void deephaven_client_update_by_emminTime(const char *timestamp_col,
+    deephaven::dhcore::interop::NativePtr<deephaven::client::utility::DurationSpecifier> decay_time,
+    const char **cols, int32_t num_cols,
+    const OperationControl *op_control,
+    NativePtr<UpdateByOperation> *result,
+    ErrorStatus *status) {
+  WithTimeHelper(timestamp_col, decay_time, cols, num_cols, op_control, result, status,
+      &deephaven::client::update_by::emminTime);
+}
+
+void deephaven_client_update_by_emmaxTick(double decay_ticks,
+    const char **cols, int32_t num_cols,
+    const OperationControl *op_control,
+    NativePtr<UpdateByOperation> *result,
+    ErrorStatus *status) {
+  WithTicksHelper(decay_ticks, cols, num_cols, op_control, result, status,
+      &deephaven::client::update_by::emmaxTick);
+}
+
+void deephaven_client_update_by_emmaxTime(const char *timestamp_col,
+    deephaven::dhcore::interop::NativePtr<deephaven::client::utility::DurationSpecifier> decay_time,
+    const char **cols, int32_t num_cols,
+    const OperationControl *op_control,
+    NativePtr<UpdateByOperation> *result,
+    ErrorStatus *status) {
+  WithTimeHelper(timestamp_col, decay_time, cols, num_cols, op_control, result, status,
+      &deephaven::client::update_by::emmaxTime);
+}
+
+void deephaven_client_update_by_emstdTick(double decay_ticks,
+    const char **cols, int32_t num_cols,
+    const OperationControl *op_control,
+    NativePtr<UpdateByOperation> *result,
+    ErrorStatus *status) {
+  WithTicksHelper(decay_ticks, cols, num_cols, op_control, result, status,
+      &deephaven::client::update_by::emstdTick);
+}
+
+void deephaven_client_update_by_emstdTime(const char *timestamp_col,
+    deephaven::dhcore::interop::NativePtr<deephaven::client::utility::DurationSpecifier> decay_time,
+    const char **cols, int32_t num_cols,
+    const OperationControl *op_control,
+    NativePtr<UpdateByOperation> *result,
+    ErrorStatus *status) {
+  WithTimeHelper(timestamp_col, decay_time, cols, num_cols, op_control, result, status,
+      &deephaven::client::update_by::emstdTime);
+}
+
+void deephaven_client_update_by_rollingSumTick(
+    const char **cols, int32_t num_cols,
+    int32_t rev_ticks, int32_t fwd_ticks,
+    NativePtr<UpdateByOperation> *result,
+    ErrorStatus *status) {
+  WithRollingTicksHelper(cols, num_cols, rev_ticks, fwd_ticks, result, status,
+      &deephaven::client::update_by::rollingSumTick);
+}
+
+void deephaven_client_update_by_rollingSumTime(const char *timestamp_col,
+    const char **cols, int32_t num_cols,
+    NativePtr<DurationSpecifier> rev_time,
+    NativePtr<DurationSpecifier> fwd_time,
+    NativePtr<UpdateByOperation> *result,
+    ErrorStatus *status) {
+  WithRollingTimeHelper(timestamp_col, cols, num_cols, rev_time, fwd_time, result, status,
+      &deephaven::client::update_by::rollingSumTime);
+}
+
+void deephaven_client_update_by_rollingGroupTick(
+    const char **cols, int32_t num_cols,
+    int32_t rev_ticks, int32_t fwd_ticks,
+    NativePtr<UpdateByOperation> *result,
+    ErrorStatus *status) {
+  WithRollingTicksHelper(cols, num_cols, rev_ticks, fwd_ticks, result, status,
+      &deephaven::client::update_by::rollingGroupTick);
+}
+
+void deephaven_client_update_by_rollingGroupTime(const char *timestamp_col,
+    const char **cols, int32_t num_cols,
+    NativePtr<DurationSpecifier> rev_time,
+    NativePtr<DurationSpecifier> fwd_time,
+    NativePtr<UpdateByOperation> *result,
+    ErrorStatus *status) {
+  WithRollingTimeHelper(timestamp_col, cols, num_cols, rev_time, fwd_time, result, status,
+      &deephaven::client::update_by::rollingGroupTime);
+}
+
+void deephaven_client_update_by_rollingAvgTick(
+    const char **cols, int32_t num_cols,
+    int32_t rev_ticks, int32_t fwd_ticks,
+    NativePtr<UpdateByOperation> *result,
+    ErrorStatus *status) {
+  WithRollingTicksHelper(cols, num_cols, rev_ticks, fwd_ticks, result, status,
+      &deephaven::client::update_by::rollingAvgTick);
+}
+
+void deephaven_client_update_by_rollingAvgTime(const char *timestamp_col,
+    const char **cols, int32_t num_cols,
+    NativePtr<DurationSpecifier> rev_time,
+    NativePtr<DurationSpecifier> fwd_time,
+    NativePtr<UpdateByOperation> *result,
+    ErrorStatus *status) {
+  WithRollingTimeHelper(timestamp_col, cols, num_cols, rev_time, fwd_time, result, status,
+      &deephaven::client::update_by::rollingAvgTime);
+}
+
+void deephaven_client_update_by_rollingMinTick(
+    const char **cols, int32_t num_cols,
+    int32_t rev_ticks, int32_t fwd_ticks,
+    NativePtr<UpdateByOperation> *result,
+    ErrorStatus *status) {
+  WithRollingTicksHelper(cols, num_cols, rev_ticks, fwd_ticks, result, status,
+      &deephaven::client::update_by::rollingMinTick);
+}
+
+void deephaven_client_update_by_rollingMinTime(const char *timestamp_col,
+    const char **cols, int32_t num_cols,
+    NativePtr<DurationSpecifier> rev_time,
+    NativePtr<DurationSpecifier> fwd_time,
+    NativePtr<UpdateByOperation> *result,
+    ErrorStatus *status) {
+  WithRollingTimeHelper(timestamp_col, cols, num_cols, rev_time, fwd_time, result, status,
+      &deephaven::client::update_by::rollingMinTime);
+}
+
+void deephaven_client_update_by_rollingMaxTick(
+    const char **cols, int32_t num_cols,
+    int32_t rev_ticks, int32_t fwd_ticks,
+    NativePtr<UpdateByOperation> *result,
+    ErrorStatus *status) {
+  WithRollingTicksHelper(cols, num_cols, rev_ticks, fwd_ticks, result, status,
+      &deephaven::client::update_by::rollingMaxTick);
+}
+
+void deephaven_client_update_by_rollingMaxTime(const char *timestamp_col,
+    const char **cols, int32_t num_cols,
+    NativePtr<DurationSpecifier> rev_time,
+    NativePtr<DurationSpecifier> fwd_time,
+    NativePtr<UpdateByOperation> *result,
+    ErrorStatus *status) {
+  WithRollingTimeHelper(timestamp_col, cols, num_cols, rev_time, fwd_time, result, status,
+      &deephaven::client::update_by::rollingMaxTime);
+}
+
+void deephaven_client_update_by_rollingProdTick(
+    const char **cols, int32_t num_cols,
+    int32_t rev_ticks, int32_t fwd_ticks,
+    NativePtr<UpdateByOperation> *result,
+    ErrorStatus *status) {
+  WithRollingTicksHelper(cols, num_cols, rev_ticks, fwd_ticks, result, status,
+      &deephaven::client::update_by::rollingProdTick);
+}
+
+void deephaven_client_update_by_rollingProdTime(const char *timestamp_col,
+    const char **cols, int32_t num_cols,
+    NativePtr<DurationSpecifier> rev_time,
+    NativePtr<DurationSpecifier> fwd_time,
+    NativePtr<UpdateByOperation> *result,
+    ErrorStatus *status) {
+  WithRollingTimeHelper(timestamp_col, cols, num_cols, rev_time, fwd_time, result, status,
+      &deephaven::client::update_by::rollingProdTime);
+}
+
+void deephaven_client_update_by_rollingCountTick(
+    const char **cols, int32_t num_cols,
+    int32_t rev_ticks, int32_t fwd_ticks,
+    NativePtr<UpdateByOperation> *result,
+    ErrorStatus *status) {
+  WithRollingTicksHelper(cols, num_cols, rev_ticks, fwd_ticks, result, status,
+      &deephaven::client::update_by::rollingCountTick);
+}
+
+void deephaven_client_update_by_rollingCountTime(const char *timestamp_col,
+    const char **cols, int32_t num_cols,
+    NativePtr<DurationSpecifier> rev_time,
+    NativePtr<DurationSpecifier> fwd_time,
+    NativePtr<UpdateByOperation> *result,
+    ErrorStatus *status) {
+  WithRollingTimeHelper(timestamp_col, cols, num_cols, rev_time, fwd_time, result, status,
+      &deephaven::client::update_by::rollingCountTime);
+}
+
+void deephaven_client_update_by_rollingStdTick(
+    const char **cols, int32_t num_cols,
+    int32_t rev_ticks, int32_t fwd_ticks,
+    NativePtr<UpdateByOperation> *result,
+    ErrorStatus *status) {
+  WithRollingTicksHelper(cols, num_cols, rev_ticks, fwd_ticks, result, status,
+      &deephaven::client::update_by::rollingStdTick);
+}
+
+void deephaven_client_update_by_rollingStdTime(const char *timestamp_col,
+    const char **cols, int32_t num_cols,
+    NativePtr<DurationSpecifier> rev_time,
+    NativePtr<DurationSpecifier> fwd_time,
+    NativePtr<UpdateByOperation> *result,
+    ErrorStatus *status) {
+  WithRollingTimeHelper(timestamp_col, cols, num_cols, rev_time, fwd_time, result, status,
+      &deephaven::client::update_by::rollingStdTime);
+}
+
+void deephaven_client_update_by_rollingWavgTick(const char *weight_col,
+    const char **cols, int32_t num_cols,
+    int32_t rev_ticks, int32_t fwd_ticks,
+    NativePtr<UpdateByOperation> *result,
+    ErrorStatus *status) {
+  WithRollingWavgTicksHelper(weight_col, cols, num_cols, rev_ticks, fwd_ticks, result, status,
+      &deephaven::client::update_by::rollingWavgTick);
+}
+
+void deephaven_client_update_by_rollingWavgTime(const char *timestamp_col,
+    const char *weight_col,
+    const char **cols, int32_t num_cols,
+    NativePtr<DurationSpecifier> rev_time,
+    NativePtr<DurationSpecifier> fwd_time,
+    NativePtr<UpdateByOperation> *result,
+    ErrorStatus *status) {
+  WithRollingWavgTimeHelper(timestamp_col, weight_col, cols, num_cols, rev_time, fwd_time,
+      result, status,
+      &deephaven::client::update_by::rollingWavgTime);
+}
+}  // extern "C"
diff --git a/cpp-client/deephaven/dhclient/src/subscription/subscribe_thread.cc b/cpp-client/deephaven/dhclient/src/subscription/subscribe_thread.cc
index a364fed54ec..0bf6a25a4bb 100644
--- a/cpp-client/deephaven/dhclient/src/subscription/subscribe_thread.cc
+++ b/cpp-client/deephaven/dhclient/src/subscription/subscribe_thread.cc
@@ -33,6 +33,8 @@ using deephaven::client::arrowutil::Int8ArrowColumnSource;
 using deephaven::client::arrowutil::Int16ArrowColumnSource;
 using deephaven::client::arrowutil::Int32ArrowColumnSource;
 using deephaven::client::arrowutil::Int64ArrowColumnSource;
+using deephaven::client::arrowutil::LocalDateArrowColumnSource;
+using deephaven::client::arrowutil::LocalTimeArrowColumnSource;
 using deephaven::client::arrowutil::StringArrowColumnSource;
 using deephaven::client::utility::Executor;
 using deephaven::client::utility::OkOrThrow;
@@ -214,7 +216,7 @@ void UpdateProcessor::RunUntilCancelled(std::shared_ptr<UpdateProcessor> self) {
   try {
     self->RunForeverHelper();
   } catch (...) {
-    // If the thread was been cancelled via explicit user action, then swallow all errors.
+    // If the thread has been cancelled via explicit user action, then swallow all errors.
     if (!self->cancelled_) {
       self->callback_->OnFailure(std::current_exception());
     }
@@ -228,6 +230,11 @@ void UpdateProcessor::RunForeverHelper() {
   while (true) {
     auto chunk = fsr_->Next();
     OkOrThrow(DEEPHAVEN_LOCATION_EXPR(chunk));
+    if (chunk->data == nullptr) {
+      // Stream ended. This is abnormal for Deephaven.
+      const char *message = "Unexpected end of stream";
+      throw std::runtime_error(DEEPHAVEN_LOCATION_STR(message));
+    }
     const auto &cols = chunk->data->columns();
     auto column_sources = MakeReservedVector<std::shared_ptr<ColumnSource>>(cols.size());
     auto sizes = MakeReservedVector<size_t>(cols.size());
@@ -318,6 +325,18 @@ struct ArrayToColumnSourceVisitor final : public arrow::ArrayVisitor {
     return arrow::Status::OK();
   }
 
+  arrow::Status Visit(const arrow::Date64Array &/*array*/) final {
+    auto typed_array = std::dynamic_pointer_cast<arrow::Date64Array>(array_);
+    result_ = LocalDateArrowColumnSource::OfArrowArray(std::move(typed_array));
+    return arrow::Status::OK();
+  }
+
+  arrow::Status Visit(const arrow::Time64Array &/*array*/) final {
+    auto typed_array = std::dynamic_pointer_cast<arrow::Time64Array>(array_);
+    result_ = LocalTimeArrowColumnSource::OfArrowArray(std::move(typed_array));
+    return arrow::Status::OK();
+  }
+
   const std::shared_ptr<arrow::Array> &array_;
   std::shared_ptr<ColumnSource> result_;
 };
diff --git a/cpp-client/deephaven/dhclient/src/update_by.cc b/cpp-client/deephaven/dhclient/src/update_by.cc
index 23e5c01787a..d4be6c6e187 100644
--- a/cpp-client/deephaven/dhclient/src/update_by.cc
+++ b/cpp-client/deephaven/dhclient/src/update_by.cc
@@ -3,8 +3,8 @@
  */
 #include "deephaven/client/client.h"
 
-#include "deephaven/proto/table.pb.h"
-#include "deephaven/proto/table.grpc.pb.h"
+#include "deephaven_core/proto/table.pb.h"
+#include "deephaven_core/proto/table.grpc.pb.h"
 #include "deephaven/client/impl/update_by_operation_impl.h"
 #include "deephaven/client/impl/util.h"
 #include "deephaven/client/update_by.h"
diff --git a/cpp-client/deephaven/dhclient/src/utility/arrow_util.cc b/cpp-client/deephaven/dhclient/src/utility/arrow_util.cc
index 2a0a13870ee..e71848bafef 100644
--- a/cpp-client/deephaven/dhclient/src/utility/arrow_util.cc
+++ b/cpp-client/deephaven/dhclient/src/utility/arrow_util.cc
@@ -81,7 +81,12 @@ struct ArrowToElementTypeId final : public arrow::TypeVisitor {
     return arrow::Status::OK();
   }
 
-  arrow::Status Visit(const arrow::TimestampType &/*type*/) final {
+  arrow::Status Visit(const arrow::TimestampType &type) final {
+    if (type.unit() != arrow::TimeUnit::NANO) {
+      auto message = fmt::format("Expected TimestampType with nano units, got {}",
+          type.ToString());
+      throw std::runtime_error(DEEPHAVEN_LOCATION_STR(message));
+    }
     type_id_ = ElementTypeId::kTimestamp;
     return arrow::Status::OK();
   }
@@ -91,6 +96,26 @@ struct ArrowToElementTypeId final : public arrow::TypeVisitor {
     return arrow::Status::OK();
   }
 
+  arrow::Status Visit(const arrow::Time64Type &type) final {
+    if (type.unit() != arrow::TimeUnit::NANO) {
+      auto message = fmt::format("Expected Time64Type with nano units, got {}",
+          type.ToString());
+      throw std::runtime_error(DEEPHAVEN_LOCATION_STR(message));
+    }
+    type_id_ = ElementTypeId::kLocalTime;
+    return arrow::Status::OK();
+  }
+
+  arrow::Status Visit(const arrow::Date64Type &type) final {
+    if (type.unit() != arrow::DateUnit::MILLI) {
+      auto message = fmt::format("Expected Date64Type with milli units, got {}",
+          type.ToString());
+      throw std::runtime_error(DEEPHAVEN_LOCATION_STR(message));
+    }
+    type_id_ = ElementTypeId::kLocalDate;
+    return arrow::Status::OK();
+  }
+
   ElementTypeId::Enum type_id_ = ElementTypeId::kInt8;  // arbitrary initializer
 };
 }  // namespace
diff --git a/cpp-client/deephaven/dhcore/CMakeLists.txt b/cpp-client/deephaven/dhcore/CMakeLists.txt
index 90a850253a8..1a0626757a3 100644
--- a/cpp-client/deephaven/dhcore/CMakeLists.txt
+++ b/cpp-client/deephaven/dhcore/CMakeLists.txt
@@ -6,7 +6,7 @@ set(CMAKE_CXX_STANDARD 17)
 # for CMAKE_INSTALL_{dir}
 include(GNUInstallDirs)
 
-find_package(Immer REQUIRED)
+find_package(Immer CONFIG REQUIRED)
 
 set(ALL_FILES
     src/types.cc
@@ -21,6 +21,9 @@ set(ALL_FILES
     src/container/row_sequence.cc
     src/immerutil/abstract_flex_vector.cc
     src/immerutil/immer_column_source.cc
+    src/interop/testapi/basic_interop_interactions.cc
+    src/interop/interop_util.cc
+    src/interop/utility_interop.cc
     src/ticking/barrage_processor.cc
     src/ticking/immer_table_state.cc
     src/ticking/index_decoder.cc
@@ -29,6 +32,7 @@ set(ALL_FILES
     src/ticking/ticking.cc
     src/utility/cython_support.cc
     src/utility/utility.cc
+    src/utility/utility_platform_specific.cc
 
     include/private/deephaven/dhcore/ticking/immer_table_state.h
     include/private/deephaven/dhcore/ticking/index_decoder.h
@@ -47,6 +51,9 @@ set(ALL_FILES
     include/public/deephaven/dhcore/column/column_source_helpers.h
     include/public/deephaven/dhcore/column/column_source_utils.h
     include/public/deephaven/dhcore/container/row_sequence.h
+    include/public/deephaven/dhcore/interop/testapi/basic_interop_interactions.h
+    include/public/deephaven/dhcore/interop/interop_util.h
+    include/public/deephaven/dhcore/interop/utility_interop.h
     include/public/deephaven/dhcore/ticking/barrage_processor.h
     include/public/deephaven/dhcore/ticking/ticking.h
     include/public/deephaven/dhcore/utility/cython_support.h
@@ -129,6 +136,7 @@ foreach (whichlib dhcore dhcore_static)
     target_compile_options(${whichlib} PRIVATE /W3 /bigobj)
 
     target_compile_definitions(${whichlib} PRIVATE _SILENCE_CXX17_CODECVT_HEADER_DEPRECATION_WARNING)
+    target_link_libraries(${whichlib} PRIVATE ws2_32)
   endif()
 
   target_include_directories(${whichlib} PRIVATE include/private)
@@ -138,5 +146,5 @@ foreach (whichlib dhcore dhcore_static)
   target_include_directories(${whichlib} PRIVATE flatbuf)
   target_include_directories(${whichlib} PUBLIC $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include/public>)
 
-  target_link_libraries(${whichlib} PUBLIC immer)
+  target_link_libraries(${whichlib} PRIVATE immer)
 endforeach()
diff --git a/cpp-client/deephaven/dhcore/include/private/deephaven/dhcore/ticking/immer_table_state.h b/cpp-client/deephaven/dhcore/include/private/deephaven/dhcore/ticking/immer_table_state.h
index 7f064f171a5..8746465c5e3 100644
--- a/cpp-client/deephaven/dhcore/include/private/deephaven/dhcore/ticking/immer_table_state.h
+++ b/cpp-client/deephaven/dhcore/include/private/deephaven/dhcore/ticking/immer_table_state.h
@@ -32,32 +32,74 @@ class ImmerTableState final {
    * all at once, or perhaps in slices) to fill in the data. Once the caller is done, the keys
    * and data will be consistent once again. Note that AddKeys/AddData only support adding new keys.
    * It is an error to try to re-add any existing key.
+   * @param rows_to_add_key_space Keys to add, represented in key space
+   * @return Added keys, represented in index space
    */
   [[nodiscard]]
   std::shared_ptr<RowSequence> AddKeys(const RowSequence &rows_to_add_key_space);
 
-  void AddData(const std::vector<std::shared_ptr<ColumnSource>> &begin_index, const std::vector<size_t> &end_index,
+  /**
+   * For each column i, insert the interval of data [begins[i], ends[i]) taken from the column source
+   * sources[i], into the table at the index space positions indicated by 'rowsToAddIndexSpace'.
+   * </summary>
+   * @param sources The ColumnSources
+   * @param begins The array of start indices (inclusive) for each column
+   * @param ends The array of end indices (exclusive) for each column
+   * @param rows_to_add_index_space Index space positions where the data should be inserted
+   */
+  void AddData(const std::vector<std::shared_ptr<ColumnSource>> &sources, const std::vector<size_t> &begins,
                const std::vector<size_t> &ends, const RowSequence &rows_to_add_index_space);
 
+  /**
+   * Erases the data at the positions in 'rowsToEraseKeySpace'.
+   * @param rowsToEraseKeySpace The keys, represented in key space, to erase
+   * @return The keys, represented in index space, that were erased
+   */
   [[nodiscard]]
-  std::shared_ptr<RowSequence> Erase(const RowSequence &begin_key);
+  std::shared_ptr<RowSequence> Erase(const RowSequence &rows_to_erase_key_space);
 
   /**
-   * When the caller wants to modify data in the ImmerTableState, they do it in two steps:
-   * First, they call ConvertKeysToIndices, which gives them the
-   * (key space) -> (position space) mapping. Then, the caller calls ModifyData (perhaps all at
-   * once, perhaps in slices) to fill in the data. Note that ConvertKeysToIndices / ModifyData only support
-   * modifying rows. It is an error to try to use a key that is not already in the map.
+   * Converts a RowSequence of keys represented in key space to a RowSequence of keys represented in index space.
+   * It is an error to try to use a key that is not already in the map.
+   * @param keys_row_space Keys represented in key space
+   * @return Keys represented in index space
    */
   [[nodiscard]]
   std::shared_ptr<RowSequence> ConvertKeysToIndices(const RowSequence &keys_row_space) const;
 
-  void ModifyData(size_t begin_index, const ColumnSource &end_index, size_t begin, size_t end,
-                  const RowSequence &rows_to_modify);
 
-  void ApplyShifts(const RowSequence &start_index, const RowSequence &end_index,
+  /**
+   * Modifies column 'col_num' with the contiguous data sourced in 'src'
+   * at the half-open interval [begin, end), to be stored in the destination
+   * at the positions indicated by 'rows_to_modify_index_space'.
+   * @param col_num Index of the column to be modified
+   * @param src A ColumnSource containing the source data
+   * @param begin The start of the source range
+   * @param end One past the end of the source range
+   * @param rows_to_modify_index_space The positions to be modified in the destination,
+   * represented in index space.
+   */
+  void ModifyData(size_t col_num, const ColumnSource &src, size_t begin, size_t end,
+      const RowSequence &rows_to_modify_index_space);
+
+  /**
+   * Applies shifts to the keys in key space. This does not affect the ordering of the keys,
+   * nor will it cause keys to overlap with other keys. Logically there is a set of tuples
+   * (first_key, last_key, dest_key) which is to be interpreted as take all the existing keys
+   * in the *closed* range [first_key, last_key] and move them to the range starting at dest_key.
+   * These tuples have been "transposed" into three different RowSequence data structures
+   * for possible better compression.
+   * @param first_index The RowSequence containing the begin_keys
+   * @param last_index The RowSequence containing the end_keys
+   * @param dest_index The RowSequence containing the dest_indexes
+   */
+  void ApplyShifts(const RowSequence &first_index, const RowSequence &last_index,
       const RowSequence &dest_index);
 
+  /**
+   * Takes a snapshot of the current table state
+   * @return A ClientTable representing the current table state
+   */
   [[nodiscard]]
   std::shared_ptr<ClientTable> Snapshot() const;
 
diff --git a/cpp-client/deephaven/dhcore/include/private/deephaven/dhcore/ticking/space_mapper.h b/cpp-client/deephaven/dhcore/include/private/deephaven/dhcore/ticking/space_mapper.h
index 58c0fcf8513..ff25a2ba581 100644
--- a/cpp-client/deephaven/dhcore/include/private/deephaven/dhcore/ticking/space_mapper.h
+++ b/cpp-client/deephaven/dhcore/include/private/deephaven/dhcore/ticking/space_mapper.h
@@ -15,10 +15,40 @@ class SpaceMapper {
   SpaceMapper();
   ~SpaceMapper();
 
+  /**
+   * Adds the keys in the half-open interval [begin_key, end_key_) to the set.
+   * The keys must not already exist in the set. If they do, an exception is thrown.
+   * @param begin_key The first key to insert
+   * @param end_key One past the last key to insert
+   * @return The rank of begin_key
+   */
   [[nodiscard]]
   uint64_t AddRange(uint64_t begin_key, uint64_t end_key);
+
+
+  /**
+   * Removes the keys in the half-open interval [begin_key, end_key_) from the set.
+   * It is ok if some or all of the keys do not exist in the set.
+   * @param begin_key The first key to insert
+   * @param end_key One past the last key to insert
+   * @return The rank of begin_key, prior to the deletion
+   */
   [[nodiscard]]
   uint64_t EraseRange(uint64_t begin_key, uint64_t end_key);
+
+  /**
+   * Delete all the keys that currently exist in the range [begin_key, end_key).
+   * Call that set of deleted keys K. The cardinality of K might be smaller than
+   * (end_key - begin_key) because not all keys in that range are expected to be present.
+   *
+   * Calculate a new set of keys KNew = {k ∈ K | (k - begin_key + dest_key)}
+   * and insert this new set of keys into the map.
+   *
+   * This has the effect of offsetting all the existing keys by (dest_key - begin_key)
+   * @param begin_key The start of the range of keys
+   * @param end_key One past the end of the range of keys
+   * @param dest_key The start of the target range to move keys to.
+   */
   void ApplyShift(uint64_t begin_key, uint64_t end_key, uint64_t dest_key);
 
   /**
@@ -32,15 +62,17 @@ class SpaceMapper {
    *   AddKeys called with [1, 2, 200, 201, 400, 401]
    *   SpaceMapper final state is [1, 2, 100, 200, 201, 300, 400, 401]
    *   The returned result is [0, 1, 3, 4, 6, 7]
+   * @param keys The keys to add (represented in key space)
+   * @return The added keys (represented in position space)
    */
   [[nodiscard]]
-  std::shared_ptr<RowSequence> AddKeys(const RowSequence &begin_key);
+  std::shared_ptr<RowSequence> AddKeys(const RowSequence &keys);
   /**
    * Looks up 'keys' (specified in key space) in the map, and returns the positions (in position
    * space) of those keys.
    */
   [[nodiscard]]
-  std::shared_ptr<RowSequence> ConvertKeysToIndices(const RowSequence &begin_key) const;
+  std::shared_ptr<RowSequence> ConvertKeysToIndices(const RowSequence &keys) const;
 
   /**
    * Note: this call iterates over the Roaring64Map and is not constant-time.
diff --git a/cpp-client/deephaven/dhcore/include/public/deephaven/dhcore/chunk/chunk.h b/cpp-client/deephaven/dhcore/include/public/deephaven/dhcore/chunk/chunk.h
index c7284f79ecb..203eadbbdc7 100644
--- a/cpp-client/deephaven/dhcore/include/public/deephaven/dhcore/chunk/chunk.h
+++ b/cpp-client/deephaven/dhcore/include/public/deephaven/dhcore/chunk/chunk.h
@@ -160,61 +160,70 @@ class GenericChunk final : public Chunk {
 };
 
 /**
- * For convenience.
+ * Convenience using.
  */
 using CharChunk = GenericChunk<char16_t>;
 /**
- * Convenience typedef.
+ * Convenience using.
  */
 using Int8Chunk = GenericChunk<int8_t>;
 /**
- * Convenience typedef.
+ * Convenience using.
  */
 using UInt8Chunk = GenericChunk<uint8_t>;
 /**
- * Convenience typedef.
+ * Convenience using.
  */
 using Int16Chunk = GenericChunk<int16_t>;
 /**
- * Convenience typedef.
+ * Convenience using.
  */
 using UInt16Chunk = GenericChunk<uint16_t>;
 /**
- * Convenience typedef.
+ * Convenience using.
  */
 using Int32Chunk = GenericChunk<int32_t>;
 /**
- * Convenience typedef.
+ * Convenience using.
  */
 using UInt32Chunk = GenericChunk<uint32_t>;
 /**
- * Convenience typedef.
+ * Convenience using.
  */
 using Int64Chunk = GenericChunk<int64_t>;
 /**
- * Convenience typedef.
+ * Convenience using.
  */
 using UInt64Chunk = GenericChunk<uint64_t>;
 /**
- * Convenience typedef.
+ * Convenience using.
  */
 using FloatChunk = GenericChunk<float>;
 /**
- * Convenience typedef.
+ * Convenience using.
  */
 using DoubleChunk = GenericChunk<double>;
 /**
- * Convenience typedef.
+ * Convenience using.
  */
 using BooleanChunk = GenericChunk<bool>;
 /**
- * Convenience typedef.
+ * Convenience using.
  */
 using StringChunk = GenericChunk<std::string>;
 /**
- * Convenience typedef.
+ * Convenience using.
  */
 using DateTimeChunk = GenericChunk<deephaven::dhcore::DateTime>;
+/**
+ * Convenience using.
+ */
+using LocalDateChunk = GenericChunk<deephaven::dhcore::LocalDate>;
+/**
+ * Convenience using.
+ */
+using LocalTimeChunk = GenericChunk<deephaven::dhcore::LocalTime>;
+
 
 /**
  * Abstract base class that implements the visitor pattern for Chunk.
@@ -272,6 +281,11 @@ class ChunkVisitor {
   /**
    * Implements the visitor pattern.
    */
+  virtual void Visit(const LocalDateChunk &) = 0;
+  /**
+   * Implements the visitor pattern.
+   */
+  virtual void Visit(const LocalTimeChunk &) = 0;
 };
 
 template<typename T>
@@ -286,7 +300,8 @@ void GenericChunk<T>::AcceptVisitor(ChunkVisitor *visitor) const {
  */
 class AnyChunk {
   using variant_t = std::variant<CharChunk, Int8Chunk, Int16Chunk, Int32Chunk, Int64Chunk,
-     UInt64Chunk, FloatChunk, DoubleChunk, BooleanChunk, StringChunk, DateTimeChunk>;
+     UInt64Chunk, FloatChunk, DoubleChunk, BooleanChunk, StringChunk, DateTimeChunk,
+     LocalDateChunk, LocalTimeChunk>;
 
 public:
   /**
@@ -351,8 +366,8 @@ GenericChunk<T> GenericChunk<T>::Create(size_t size) {
 
 template<typename T>
 GenericChunk<T> GenericChunk<T>::CreateView(T *data, size_t size) {
-  // GenericChunks allocated by create() point to an underlying heap-allocated buffer. On the other
-  // hand, GenericChunks created by createView() point to the caller's buffer. In the former case
+  // GenericChunks allocated by Create() point to an underlying heap-allocated buffer. On the other
+  // hand, GenericChunks created by CreateView() point to the caller's buffer. In the former case
   // we own the buffer and need to delete it when there are no more shared_ptrs pointing to it. In
   // the latter case the caller owns the buffer, and we should not try to deallocate it.
   // One might think we have to use two different data structures to handle these two different
diff --git a/cpp-client/deephaven/dhcore/include/public/deephaven/dhcore/chunk/chunk_traits.h b/cpp-client/deephaven/dhcore/include/public/deephaven/dhcore/chunk/chunk_traits.h
index cae2c5bd053..83d893f7d02 100644
--- a/cpp-client/deephaven/dhcore/include/public/deephaven/dhcore/chunk/chunk_traits.h
+++ b/cpp-client/deephaven/dhcore/include/public/deephaven/dhcore/chunk/chunk_traits.h
@@ -64,4 +64,14 @@ template<>
 struct TypeToChunk<deephaven::dhcore::DateTime> {
   using type_t = deephaven::dhcore::chunk::DateTimeChunk;
 };
+
+template<>
+struct TypeToChunk<deephaven::dhcore::LocalDate> {
+  using type_t = deephaven::dhcore::chunk::LocalDateChunk;
+};
+
+template<>
+struct TypeToChunk<deephaven::dhcore::LocalTime> {
+  using type_t = deephaven::dhcore::chunk::LocalTimeChunk;
+};
 }  // namespace deephaven::client::chunk
diff --git a/cpp-client/deephaven/dhcore/include/public/deephaven/dhcore/clienttable/client_table.h b/cpp-client/deephaven/dhcore/include/public/deephaven/dhcore/clienttable/client_table.h
index 146b872ccfe..b3e9e54ae49 100644
--- a/cpp-client/deephaven/dhcore/include/public/deephaven/dhcore/clienttable/client_table.h
+++ b/cpp-client/deephaven/dhcore/include/public/deephaven/dhcore/clienttable/client_table.h
@@ -75,14 +75,14 @@ class ClientTable {
   [[nodiscard]]
   virtual std::shared_ptr<RowSequence> GetRowSequence() const = 0;
   /**
-   * Gets a ColumnSource from the clienttable by index.
+   * Gets a ColumnSource from the ClientTable by index.
    * @param column_index Must be in the half-open interval [0, NumColumns).
    */
   [[nodiscard]]
   virtual std::shared_ptr<ColumnSource> GetColumn(size_t column_index) const = 0;
 
   /**
-   * Gets a ColumnSource from the clienttable by name. 'strict' controls whether the method
+   * Gets a ColumnSource from the ClientTable by name. 'strict' controls whether the method
    * must succeed.
    * @param name The name of the column.
    * @param strict Whether the method must succeed.
@@ -92,7 +92,7 @@ class ClientTable {
   [[nodiscard]]
   std::shared_ptr<ColumnSource> GetColumn(std::string_view name, bool strict) const;
   /**
-   * Gets the index of a ColumnSource from the clienttable by name. 'strict' controls whether the method
+   * Gets the index of a ColumnSource from the ClientTable by name. 'strict' controls whether the method
    * must succeed.
    * @param name The name of the column.
    * @param strict Whether the method must succeed.
diff --git a/cpp-client/deephaven/dhcore/include/public/deephaven/dhcore/clienttable/schema.h b/cpp-client/deephaven/dhcore/include/public/deephaven/dhcore/clienttable/schema.h
index fca7665bcbb..bc0630a097a 100644
--- a/cpp-client/deephaven/dhcore/include/public/deephaven/dhcore/clienttable/schema.h
+++ b/cpp-client/deephaven/dhcore/include/public/deephaven/dhcore/clienttable/schema.h
@@ -38,7 +38,7 @@ class Schema {
   ~Schema();
 
   [[nodiscard]]
-  std::optional<size_t> GetColumnIndex(std::string_view name, bool strict) const;
+  std::optional<int32_t> GetColumnIndex(std::string_view name, bool strict) const;
 
   [[nodiscard]]
   const std::vector<std::string> &Names() const {
@@ -51,8 +51,8 @@ class Schema {
   }
 
   [[nodiscard]]
-  size_t NumCols() const {
-    return names_.size();
+  int32_t NumCols() const {
+    return static_cast<int32_t>(names_.size());
   }
 
 private:
diff --git a/cpp-client/deephaven/dhcore/include/public/deephaven/dhcore/column/array_column_source.h b/cpp-client/deephaven/dhcore/include/public/deephaven/dhcore/column/array_column_source.h
index 16e5bb5947b..19576e98dc4 100644
--- a/cpp-client/deephaven/dhcore/include/public/deephaven/dhcore/column/array_column_source.h
+++ b/cpp-client/deephaven/dhcore/include/public/deephaven/dhcore/column/array_column_source.h
@@ -247,4 +247,6 @@ class GenericArrayColumnSource final : public deephaven::dhcore::column::Mutable
 using BooleanArrayColumnSource = GenericArrayColumnSource<bool>;
 using StringArrayColumnSource = GenericArrayColumnSource<std::string>;
 using DateTimeArrayColumnSource = GenericArrayColumnSource<DateTime>;
+using LocalDateArrayColumnSource = GenericArrayColumnSource<LocalDate>;
+using LocalTimeArrayColumnSource = GenericArrayColumnSource<LocalTime>;
 }  // namespace deephaven::dhcore::column
diff --git a/cpp-client/deephaven/dhcore/include/public/deephaven/dhcore/column/column_source.h b/cpp-client/deephaven/dhcore/include/public/deephaven/dhcore/column/column_source.h
index 6322a4587de..eea1c94ea8e 100644
--- a/cpp-client/deephaven/dhcore/include/public/deephaven/dhcore/column/column_source.h
+++ b/cpp-client/deephaven/dhcore/include/public/deephaven/dhcore/column/column_source.h
@@ -174,6 +174,14 @@ using StringColumnSource = GenericColumnSource<std::string>;
  * Convenience using.
  */
 using DateTimeColumnSource = GenericColumnSource<deephaven::dhcore::DateTime>;
+/**
+ * Convenience using.
+ */
+using LocalDateColumnSource = GenericColumnSource<deephaven::dhcore::LocalDate>;
+/**
+ * Convenience using.
+ */
+using LocalTimeColumnSource = GenericColumnSource<deephaven::dhcore::LocalTime>;
 
 // the mutable per-type interfaces
 template<typename T>
@@ -229,5 +237,13 @@ class ColumnSourceVisitor {
    * Implements the visitor pattern.
    */
   virtual void Visit(const DateTimeColumnSource &) = 0;
+  /**
+   * Implements the visitor pattern.
+   */
+  virtual void Visit(const LocalDateColumnSource &) = 0;
+  /**
+   * Implements the visitor pattern.
+   */
+  virtual void Visit(const LocalTimeColumnSource &) = 0;
 };
 }  // namespace deephaven::dhcore::column
diff --git a/cpp-client/deephaven/dhcore/include/public/deephaven/dhcore/column/column_source_helpers.h b/cpp-client/deephaven/dhcore/include/public/deephaven/dhcore/column/column_source_helpers.h
index 7beb39dbcba..7432483b81c 100644
--- a/cpp-client/deephaven/dhcore/include/public/deephaven/dhcore/column/column_source_helpers.h
+++ b/cpp-client/deephaven/dhcore/include/public/deephaven/dhcore/column/column_source_helpers.h
@@ -21,6 +21,8 @@ class HumanReadableTypeNames {
   static const char kBoolName[];
   static const char kStringName[];
   static const char kDateTimeName[];
+  static const char kLocalDateName[];
+  static const char kLocalTimeName[];
 };
 
 struct ElementTypeVisitor : public ColumnSourceVisitor {
@@ -63,7 +65,15 @@ struct ElementTypeVisitor : public ColumnSourceVisitor {
   void Visit(const DateTimeColumnSource & /*source*/) final {
     value_ = HumanReadableTypeNames::kDateTimeName;
   }
-  
+
+  void Visit(const LocalDateColumnSource & /*source*/) final {
+    value_ = HumanReadableTypeNames::kLocalDateName;
+  }
+
+  void Visit(const LocalTimeColumnSource & /*source*/) final {
+    value_ = HumanReadableTypeNames::kLocalTimeName;
+  }
+
   const char *value_ = nullptr;
 };
 }  // namespace internal
@@ -124,4 +134,20 @@ template<>
 struct HumanReadableStaticTypeName<std::string> {
   static const char *GetName() { return internal::HumanReadableTypeNames::kStringName; }
 };
+
+template<>
+struct HumanReadableStaticTypeName<deephaven::dhcore::DateTime> {
+  static const char *GetName() { return internal::HumanReadableTypeNames::kDateTimeName; }
+};
+
+template<>
+struct HumanReadableStaticTypeName<deephaven::dhcore::LocalDate> {
+  static const char *GetName() { return internal::HumanReadableTypeNames::kLocalDateName; }
+};
+
+template<>
+struct HumanReadableStaticTypeName<deephaven::dhcore::LocalTime> {
+  static const char *GetName() { return internal::HumanReadableTypeNames::kLocalTimeName; }
+};
+
 }  // namespace deephaven::client::column
diff --git a/cpp-client/deephaven/dhcore/include/public/deephaven/dhcore/interop/interop_util.h b/cpp-client/deephaven/dhcore/include/public/deephaven/dhcore/interop/interop_util.h
new file mode 100644
index 00000000000..19b9cc2fc65
--- /dev/null
+++ b/cpp-client/deephaven/dhcore/include/public/deephaven/dhcore/interop/interop_util.h
@@ -0,0 +1,254 @@
+/*
+ * Copyright (c) 2016-2024 Deephaven Data Labs and Patent Pending
+ */
+#pragma once
+#include <cstdint>
+#include <exception>
+#include <iostream>
+#include <locale>
+#include <string>
+#include <string_view>
+#include <vector>
+
+namespace deephaven::dhcore::interop {
+/**
+ * This class simply wraps a pointer. It is meant to mirror a similar struct on the C# side, namely
+ *
+ * [StructLayout(LayoutKind.Sequential)]
+ * public struct NativePtr<T> {
+ *   public IntPtr ptr;
+ * }
+ *
+ * The purpose of all of this is to enable a little more type checking on the C# side.
+ * Rather than just dealing with IntPtr on the C# side (which is effectively equivalent to
+ * (void*) and has just as little typechecking, we use NativePtr<Foo> struct instead.
+ * This prevents us from making mistakes like passing a NativePtr<Foo> when we meant
+ * NativePtr<Bar>. Our protocol is that .NET passes us a NativePtr<Foo> by value, so
+ * in our C API, we receive a NativePtr<Foo> by value.
+ *
+ * There is a little cheat we use because the pointers aren't fully typechecked.
+ *
+ * On the C++ side, we will have a NativePtr<Client> which points to a deephaven::client::Client
+ * object. The C# side doesn't have access to the *actual* deephaven::client::Client, nor would
+ * we want it to. Instead, on the .NET side we have a static "proxy" class called "NativeClient" which
+ * has no instance or data members. It happens to be where we keep our (static) interop method
+ * definitions but it has no other function.
+ *
+ * In summary on the C++ side, we will have a Client*, which we will then wrap as NativePtr<Client>
+ * and return to C#.  C# will get this as NativePtr<NativeClient>. This is fine because it's an
+ * opaque pointer. The C# code can't do anything with it except pass it back to C++ at some future
+ * point, where it will be interpreted again as a NativePtr<Client>, and the internal Client* can
+ * be pulled back out of it.
+ */
+template<typename T>
+struct NativePtr {
+  explicit NativePtr(T *ptr) : ptr_(ptr) {}
+
+  [[nodiscard]]
+  T *Get() const { return ptr_; }
+
+  [[nodiscard]]
+  operator T*() const { return ptr_; }
+
+  [[nodiscard]]
+  T *operator ->() const { return ptr_; }
+
+  void Reset(T *new_ptr) { ptr_ = new_ptr; }
+
+private:
+  T *ptr_ = nullptr;
+};
+
+/**
+ * It is not safe to pass .NET bool over interop. Instead we pass a struct which wraps
+ * an int8_t. On the C++ side we have an explicit constructor and an explicit conversion
+ * operator, to make it a bit more pleasant to convert to/from.
+ */
+class InteropBool {
+public:
+  explicit InteropBool(bool value) : value_(value ? 1 : 0) {}
+
+  explicit operator bool() const { return value_ != 0; }
+
+private:
+  int8_t value_ = 0;
+};
+
+/**
+ * The following classes support our protocol for getting strings back from C++ to .NET.
+ * Here is some background:
+ *
+ * Getting strings in the forward direction (.NET to C++) is easy: we can just take a
+ * const char *. This is a UTF-8 formatted string, terminated by NUL, whose memory is owned
+ * by .NET. (So we can look at the strings or copy them, but we can't hold on to the pointer).
+ *
+ * Getting strings in the reverse direction (C++ to .NET) takes a little more effort.
+ * The technique we use is to pack the (UTF-8) string data to be returned into a "StringPool",
+ * and then the .NET caller makes a second call to copy over the string data.
+ *
+ * The following data structures participate in this protocol:
+ * StringPoolBuilder - helper class used on the C++ side to build a StringPool
+ * StringPool - the StringPool (still on the C++ side) that holds final set of packed strings
+ * StringHandle - Opaque "handle" to a string in the StringPool (implementation: a zero-based index).
+ *   This is passed back to the .NET side.
+ * StringPoolHandle - A "handle" to the StringPool. Contains a pointer to the StringPool on the C++
+ *   side, plus the total number of bytes in the packed strings, plus the number of strings
+ *   in the pool. This is passed back to the .NET side. Given this information, the .NET side will
+ *   allocate buffers and then call back into C++ side to populate those buffers.
+ *
+ * Rough example from C# side:
+ * void Doit() {
+ *   InvokeSomeCPlusPlusMethod(args, out StringHandle stringHandle0,
+ *     out StringHandle stringHandle1, out StringPoolHandle stringPoolHandle);
+ *   var packedText = new byte[stringPoolHandle.numBytes_];
+ *   var stringEnds = new Int32[stringPoolHandle.numStrings_];
+ *   // This is an interop call that does three things:
+ *   // it copies the "packedText" data into the array we just allocated on the C# side
+ *   // it copies the "stringEnds" data into the array we just allocated on the C# side
+ *   // Then it calls "delete" on the stringPoolHandle.stringPool_ pointer (so we can only
+ *   // call this entry point once).
+ *   var errorCode = deephaven_dhcore_interop_StringPool_ExportAndDestroy(
+ *     stringPoolHandle.stringPool_,
+ *     packedText, packedText.Length,
+ *     stringEnds, stringEnds.Length);
+ *
+ *   // Now we have our string data:
+ *   // The first byte of string[0] is at offset 0. The (exclusive) end byte is at stringEnds[0].
+ *   // The first byte of string[1] is at stringEnds[0]. The (exclusive) end byte is stringEnds[1].
+ *   // ...
+ *   // The first byte of string[N] is at stringEnds[N-1]. The (exclusive) end byte is stringEnds[N].
+ *
+ *   // The individual strings that the method wanted to return are referred to by index
+ *   // as "StringHandles". Their start and end text position is calculated by looking inside
+ *   // stringEnds_
+ *
+ *   var string0Begin = stringHandle0.index_ == 0 ? 0 : stringEnds[stringHandle0.index_ - 1];
+ *   var string0End = stringEnds[stringHandle0.index_];
+ *
+ *   var string1Begin = stringHandle1.index_ ==0 ? 0 : stringEnds[stringHandle1.index_ - 1];
+ *   var string1End = stringEnds[stringHandle1.index_];
+ *
+ *   var string0 = Encoding.UTF8.GetString(packedText, string0Begin, string0End - string0Begin);
+ *   var string1 = Encoding.UTF8.GetString(packedText, string1Begin, string1End - string1Begin);
+ *
+ * deephaven_dhcore_interop_StringPool_ExportAndDestroy should not fail, unless you call it
+ * with bad arguments. For completeness it returns an error code: 0 for success and nonzero for
+ * error. Getting a nonzero value should be considered a catastrophic programming error.
+ *
+ * In C# we have a class StringPoolHandle that implements the above interaction for us.
+ * It has the same data layout as the C++ class, but it has a method called ExportAndDestroy
+ * that does the above interaction and returns a C# StringPool. The C# StringPool does not
+ * have much to do with the C++ class of the same name, except that they both conceptually
+ * represent a pool of strings. On C#, it is very simple and contains an array of the digested
+ * strings:
+ *
+ * public sealed class StringPool {
+ *   public readonly string[] Strings;
+ *   public StringPool(string[] strings) => Strings = strings;
+ *   public string Get(StringHandle handle) {
+ *     return Strings[handle.Index];
+ *   }
+ * }
+ *
+ * On the C++ side, it contains the packed text and the string end positions.
+ */
+
+class StringPool {
+public:
+  static int32_t ExportAndDestroy(
+      StringPool *self,
+      uint8_t *bytes, int32_t bytes_length,
+      int32_t *ends, int32_t ends_length);
+
+  StringPool(std::vector<uint8_t> bytes, std::vector<int32_t> ends);
+  StringPool(const StringPool &other) = delete;
+  StringPool &operator=(const StringPool &other) = delete;
+  ~StringPool();
+
+private:
+  std::vector<uint8_t> bytes_;
+  std::vector<int32_t> ends_;
+};
+
+struct StringHandle {
+  explicit StringHandle(int32_t index) : index_(index) {}
+
+  int32_t index_ = 0;
+};
+
+struct StringPoolHandle {
+  StringPoolHandle() = default;
+  StringPoolHandle(StringPool *string_pool, int32_t num_bytes, int32_t num_strings) :
+      stringPool_(string_pool), numBytes_(num_bytes), numStrings_(num_strings) {}
+
+  StringPool *stringPool_ = nullptr;
+  int32_t numBytes_ = 0;
+  int32_t numStrings_ = 0;
+};
+
+class StringPoolBuilder {
+public:
+  StringPoolBuilder();
+  StringPoolBuilder(const StringPoolBuilder &other) = delete;
+  StringPoolBuilder &operator=(const StringPoolBuilder &other) = delete;
+  ~StringPoolBuilder();
+
+  [[nodiscard]]
+  StringHandle Add(std::string_view sv);
+  [[nodiscard]]
+  StringPoolHandle Build();
+
+private:
+  std::vector<uint8_t> bytes_;
+  std::vector<int32_t> ends_;
+};
+
+/**
+ * ErrorStatus is our "out" struct that returns error information to the caller. We represent
+ * error returns as strings (basically the stringified version of the C++ exception that was
+ * thrown).
+ *
+ * The ErrorStatus representation is fairly simple: just a handle to a string pool and a
+ * handle to a string. On success the StringPoolHandle will point to an empty StringPool.
+ * On failure, the StringPoolHandle will point to a StringPool containing one string, and the
+ * StringHandle will be a handle to that string. Careful readers will note that if there is
+ * an error, the StringHandle will always point to the first string, and therefore always
+ * have index 0. If we cared about saving a few bytes, we could eliminate this field, but
+ * there is no need to care about saving a few bytes at this point.
+ */
+class ErrorStatus {
+public:
+  /**
+   * This is a convenience method used by C++ code to wrap a lambda and catch exceptions.
+   * If the lambda completes, then the StringPoolBuilder will be empty. If the lambda
+   * fails with an exception, the exception text is stored in the StringPoolBuilder and
+   * the StringHandle is set. In either case the (empty or populated) StringPool is built.
+   */
+  template<typename T>
+  void Run(const T &callback) {
+    StringPoolBuilder builder;
+    try {
+      // Sanity check for this method's callers to make sure they're not returning a value
+      // which would be a programming mistake because it is ignored here.
+      static_assert(std::is_same_v<decltype(callback()), void>);
+      callback();
+    } catch (const std::exception &e) {
+      stringHandle_ = builder.Add(e.what());
+    } catch (...) {
+      stringHandle_ = builder.Add("Unknown exception");
+    }
+    stringPoolHandle_ = builder.Build();
+  }
+
+private:
+  StringHandle stringHandle_;
+  StringPoolHandle stringPoolHandle_;
+};
+}  // namespace deephaven::dhcore::interop
+
+extern "C" {
+int32_t deephaven_dhcore_interop_StringPool_ExportAndDestroy(
+    deephaven::dhcore::interop::NativePtr<deephaven::dhcore::interop::StringPool> string_pool,
+    uint8_t *bytes, int32_t bytes_length,
+    int32_t *ends, int32_t ends_length);
+}  // extern "C"
diff --git a/cpp-client/deephaven/dhcore/include/public/deephaven/dhcore/interop/testapi/basic_interop_interactions.h b/cpp-client/deephaven/dhcore/include/public/deephaven/dhcore/interop/testapi/basic_interop_interactions.h
new file mode 100644
index 00000000000..be4585f7a54
--- /dev/null
+++ b/cpp-client/deephaven/dhcore/include/public/deephaven/dhcore/interop/testapi/basic_interop_interactions.h
@@ -0,0 +1,143 @@
+/*
+ * Copyright (c) 2016-2024 Deephaven Data Labs and Patent Pending
+ */
+#pragma once
+
+#include <cstdint>
+#include "deephaven/dhcore/interop/interop_util.h"
+
+namespace deephaven::dhcore::interop::testapi {
+/**
+ * A simple struct that we use to confirm we can pass between C++ and C#.
+ */
+struct BasicStruct {
+  BasicStruct(int32_t i, double d) : i_(i), d_(d) {}
+
+  [[nodiscard]]
+  BasicStruct Add(const BasicStruct &other) const {
+    return BasicStruct(i_ + other.i_, d_ + other.d_);
+  }
+
+  int32_t i_;
+  double d_;
+};
+
+/**
+ * A nested struct that we use to confirm we can pass between C++ and C#.
+ */
+struct NestedStruct {
+  NestedStruct(const BasicStruct &a, const BasicStruct &b) : a_(a), b_(b) {}
+
+  [[nodiscard]]
+  NestedStruct Add(const NestedStruct &other) const {
+    return NestedStruct(a_.Add(other.a_), b_.Add(other.b_));
+  }
+
+  BasicStruct a_;
+  BasicStruct b_;
+};
+}
+
+extern "C" {
+/**
+ * Adds 'a' and 'b', stores a result in *result.
+ * Tests passing int32 back and forth.
+ * Note: although interop supports returning a value, we typically always
+ * return void and use "out" parameters for everything. We do this for simplicity
+ * and consistency: our style is to have zero or more 'out' parameters of simple types
+ * and typically one more 'out' parameter for the ErrorStatus struct which contains
+ * our exception/error information.
+ */
+void deephaven_dhcore_interop_testapi_BasicInteropInteractions_Add(
+    int32_t a, int32_t b, int32_t *result);
+
+/**
+ * Adds the arrays 'a' and 'b' elementwise, stores the results in *result. The caller
+ * needs to allocate an array of 'length' elements for 'result'.
+ */
+void deephaven_dhcore_interop_testapi_BasicInteropInteractions_AddArrays(
+    const int32_t *a, const int32_t *b, int32_t length, int32_t *result);
+
+/**
+ * Performs a XOR b, stores result in *result. Demonstrates our use of InteropBool,
+ * because regular C# bool doesn't interop with C++ bool.
+ */
+void deephaven_dhcore_interop_testapi_BasicInteropInteractions_Xor(
+    deephaven::dhcore::interop::InteropBool a,
+    deephaven::dhcore::interop::InteropBool b,
+    deephaven::dhcore::interop::InteropBool *result);
+
+/**
+ * Performs an elementwise XOR of the a and b arrays, stores result in *result.
+ * The caller needs to allocate an array of 'length' elements for 'result'.
+ */
+void deephaven_dhcore_interop_testapi_BasicInteropInteractions_XorArrays(
+    const deephaven::dhcore::interop::InteropBool *a,
+    const deephaven::dhcore::interop::InteropBool *b,
+    int32_t length,
+    deephaven::dhcore::interop::InteropBool *result);
+
+/**
+ * Concats strings a and b, stores the result in string_pool_handle and result_handle.
+ * Demonstrates our StringPool protocol.
+ */
+void deephaven_dhcore_interop_testapi_BasicInteropInteractions_Concat(
+    const char *a, const char *b,
+    deephaven::dhcore::interop::StringHandle *result_handle,
+    deephaven::dhcore::interop::StringPoolHandle *string_pool_handle);
+
+/**
+ * Concats arrays of strings a and b, elementwise, and stores the results in
+ * string_pool_handle and result_handles. The caller needs to allocate an array
+ * of 'length' elements for 'result_handles'.
+ */
+void deephaven_dhcore_interop_testapi_BasicInteropInteractions_ConcatArrays(const char **a,
+    const char **b, int32_t length,
+    deephaven::dhcore::interop::StringHandle *result_handles,
+    deephaven::dhcore::interop::StringPoolHandle *string_pool_handle);
+
+/**
+ * Adds the structs a and b, fieldwise, and stores the result in *result.
+ */
+void deephaven_dhcore_interop_testapi_BasicInteropInteractions_AddBasicStruct(
+    const deephaven::dhcore::interop::testapi::BasicStruct *a,
+    const deephaven::dhcore::interop::testapi::BasicStruct *b,
+    deephaven::dhcore::interop::testapi::BasicStruct *result);
+
+/**
+ * Adds arrays of the structs a and b, elementwise, and then fieldwise, and stores the result in
+ * *result. The caller needs to allocate an array of 'length' elements for 'result'.
+ */
+void deephaven_dhcore_interop_testapi_BasicInteropInteractions_AddBasicStructArrays(
+    const deephaven::dhcore::interop::testapi::BasicStruct *a,
+    const deephaven::dhcore::interop::testapi::BasicStruct *b,
+    int32_t length,
+    deephaven::dhcore::interop::testapi::BasicStruct *result);
+
+/**
+ * Adds the structs a and b, fieldwise, and stores the result in *result.
+ * a and b are "nested structs" containing other structs.
+ */
+void deephaven_dhcore_interop_testapi_BasicInteropInteractions_AddNestedStruct(
+    const deephaven::dhcore::interop::testapi::NestedStruct *a,
+    const deephaven::dhcore::interop::testapi::NestedStruct *b,
+    deephaven::dhcore::interop::testapi::NestedStruct *result);
+
+/**
+ * Adds arrays of the structs a and b, elementwise, and then fieldwise, and stores the result in
+ * *result. * a and b are "nested structs" containing other structs. The caller needs to
+ * allocate an array of 'length' elements for 'result'.
+ */
+void deephaven_dhcore_interop_testapi_BasicInteropInteractions_AddNestedStructArrays(
+    const deephaven::dhcore::interop::testapi::NestedStruct *a,
+    const deephaven::dhcore::interop::testapi::NestedStruct *b,
+    int32_t length,
+    deephaven::dhcore::interop::testapi::NestedStruct *result);
+
+/**
+ * Tests our error protocol. Sets an error if a < b.
+ */
+void deephaven_dhcore_interop_testapi_BasicInteropInteractions_SetErrorIfLessThan(
+    int32_t a, int32_t b,
+    deephaven::dhcore::interop::ErrorStatus *error_status);
+}  // extern "C"
diff --git a/cpp-client/deephaven/dhcore/include/public/deephaven/dhcore/interop/utility_interop.h b/cpp-client/deephaven/dhcore/include/public/deephaven/dhcore/interop/utility_interop.h
new file mode 100644
index 00000000000..4885b8cdfa5
--- /dev/null
+++ b/cpp-client/deephaven/dhcore/include/public/deephaven/dhcore/interop/utility_interop.h
@@ -0,0 +1,19 @@
+/*
+ * Copyright (c) 2016-2024 Deephaven Data Labs and Patent Pending
+ */
+#pragma once
+
+#include "deephaven/dhcore/interop/interop_util.h"
+
+extern "C" {
+void deephaven_dhcore_utility_GetEnv(const char *envname,
+    deephaven::dhcore::interop::StringHandle *string_handle,
+    deephaven::dhcore::interop::StringPoolHandle *string_pool_handle,
+    deephaven::dhcore::interop::ErrorStatus *status);
+
+void deephaven_dhcore_utility_SetEnv(const char *envname, const char *value,
+    deephaven::dhcore::interop::ErrorStatus *status);
+
+void deephaven_dhcore_utility_UnsetEnv(const char *envname,
+    deephaven::dhcore::interop::ErrorStatus *status);
+}  // extern "C"
diff --git a/cpp-client/deephaven/dhcore/include/public/deephaven/dhcore/types.h b/cpp-client/deephaven/dhcore/include/public/deephaven/dhcore/types.h
index 5869df0bd3c..1f5cd02763c 100644
--- a/cpp-client/deephaven/dhcore/include/public/deephaven/dhcore/types.h
+++ b/cpp-client/deephaven/dhcore/include/public/deephaven/dhcore/types.h
@@ -21,11 +21,14 @@ struct ElementTypeId {
     kInt8, kInt16, kInt32, kInt64,
     kFloat, kDouble,
     kBool, kString, kTimestamp,
-    kList
+    kList,
+    kLocalDate, kLocalTime
   };
 };
 
 class DateTime;
+class LocalDate;
+class LocalTime;
 
 template<typename T>
 void VisitElementTypeId(ElementTypeId::Enum type_id, T *visitor) {
@@ -70,6 +73,14 @@ void VisitElementTypeId(ElementTypeId::Enum type_id, T *visitor) {
       visitor->template operator()<deephaven::dhcore::DateTime>();
       break;
     }
+    case ElementTypeId::kLocalDate: {
+      visitor->template operator()<deephaven::dhcore::LocalDate>();
+      break;
+    }
+    case ElementTypeId::kLocalTime: {
+      visitor->template operator()<deephaven::dhcore::LocalTime>();
+      break;
+    }
     default: {
       auto message = fmt::format("Unrecognized ElementTypeId {}", static_cast<int>(type_id));
       throw std::runtime_error(message);
@@ -315,12 +326,37 @@ struct DeephavenTraits<DateTime> {
   static constexpr bool kIsNumeric = false;
 };
 
+template<>
+struct DeephavenTraits<LocalDate> {
+  static constexpr bool kIsNumeric = false;
+};
+
+template<>
+struct DeephavenTraits<LocalTime> {
+  static constexpr bool kIsNumeric = false;
+};
+
 /**
  * The Deephaven DateTime type. Records nanoseconds relative to the epoch (January 1, 1970) UTC.
  * Times before the epoch can be represented with negative nanosecond values.
  */
 class DateTime {
 public:
+  using rep_t = int64_t;
+
+  /**
+   * This method exists to document and enforce an assumption in Cython, namely that this
+   * class has the same representation as an int64_t. This constexpr method always returns
+   * true (or fails to compile).
+   */
+  static constexpr bool IsBlittableToInt64() {
+    static_assert(
+        std::is_trivially_copyable_v<DateTime> &&
+        std::has_unique_object_representations_v<DateTime> &&
+        std::is_same_v<rep_t, std::int64_t>);
+    return true;
+  }
+
   /**
    * Converts nanoseconds-since-UTC-epoch to DateTime. The Deephaven null value sentinel is
    * turned into DateTime(0).
@@ -401,6 +437,151 @@ class DateTime {
     return !(lhs == rhs);
   }
 };
+
+/**
+ * The Deephaven LocalDate type which corresponds to java.time.LocalDate.
+ * For consistency with the Arrow type we use, stores its value in units of milliseconds.
+ * However we do not allow fractional days, so only millisecond values that are an even
+ * number of days are permitted.
+ */
+class LocalDate {
+public:
+  using rep_t = int64_t;
+
+  /**
+   * This method exists to document and enforce an assumption in Cython, namely that this
+   * class has the same representation as an int64_t. This constexpr method always returns
+   * true (or fails to compile).
+   */
+  static constexpr bool IsBlittableToInt64() {
+    static_assert(
+        std::is_trivially_copyable_v<LocalDate> &&
+            std::has_unique_object_representations_v<LocalDate> &&
+            std::is_same_v<rep_t, std::int64_t>);
+    return true;
+  }
+
+  /**
+   * Creates an instance of LocalDate from the specified year, month, and day.
+   */
+  static LocalDate Of(int32_t year, int32_t month, int32_t day_of_month);
+
+  /**
+   * Creates an instance of LocalDate from milliseconds-since-UTC-epoch.
+   * The Deephaven null value sentinel is turned into LocalDate(0).
+   * @param millis Milliseconds since the epoch (January 1, 1970 UTC).
+   * An exception is thrown if millis is not an even number of days.
+   * @return The corresponding LocalDate
+   */
+  static LocalDate FromMillis(int64_t millis) {
+    if (millis == DeephavenConstants::kNullLong) {
+      return LocalDate(0);
+    }
+    return LocalDate(millis);
+  }
+
+  /**
+   * Default constructor. Sets the LocalDate equal to the null value.
+   */
+  LocalDate() = default;
+
+  /**
+   * Sets the DateTime to the specified number of milliseconds relative to the epoch.
+   * Currently we will throw an exception if millis is not an even number of days.
+   * @param millis Milliseconds since the epoch (January 1, 1970 UTC).
+   */
+  explicit LocalDate(int64_t millis);
+
+  /**
+   * The LocalDate as expressed in milliseconds since the epoch. Can be negative.
+   */
+  [[nodiscard]]
+  int64_t Millis() const { return millis_; }
+
+private:
+  int64_t millis_ = 0;
+
+  friend std::ostream &operator<<(std::ostream &s, const LocalDate &o);
+
+  friend bool operator==(const LocalDate &lhs, const LocalDate &rhs) {
+    return lhs.millis_ == rhs.millis_;
+  }
+
+  friend bool operator!=(const LocalDate &lhs, const LocalDate &rhs) {
+    return !(lhs == rhs);
+  }
+};
+
+/**
+ * The Deephaven LocalTime type which corresponds to java.time.LocalTime. Records
+ * nanoseconds since midnight (of some unspecified reference day).
+ */
+class LocalTime {
+public:
+  using rep_t = int64_t;
+
+  /**
+   * This method exists to document and enforce an assumption in Cython, namely that this
+   * class has the same representation as an int64_t. This constexpr method always returns
+   * true (or fails to compile).
+   */
+  static constexpr bool IsBlittableToInt64() {
+    static_assert(
+        std::is_trivially_copyable_v<LocalTime> &&
+            std::has_unique_object_representations_v<LocalTime> &&
+            std::is_same_v<rep_t, std::int64_t>);
+    return true;
+  }
+
+  /**
+   * Creates an instance of LocalTime from the specified hour, minute, and second.
+   */
+  static LocalTime Of(int32_t hour, int32_t minute, int32_t second);
+
+  /**
+   * Converts nanoseconds-since-start-of-day to LocalTime. The Deephaven null value sentinel is
+   * turned into LocalTime(0).
+   * TODO(kosak): find out null convention
+   * @param nanos Nanoseconds since the start of the day.
+   * @return The corresponding LocalTime.
+   */
+  static LocalTime FromNanos(int64_t nanos) {
+    if (nanos == DeephavenConstants::kNullLong) {
+      return LocalTime(0);
+    }
+    return LocalTime(nanos);
+  }
+
+  /**
+   * Default constructor. Sets the DateTime equal to the epoch.
+   */
+  LocalTime() = default;
+
+  /**
+   * Sets the LocalTime to the specified number of nanoseconds relative to the start of the day.
+   * @param nanos Nanoseconds since the start of the day.
+   */
+  explicit LocalTime(int64_t nanos);
+
+  [[nodiscard]]
+  int64_t Nanos() const { return nanos_; }
+
+private:
+  int64_t nanos_ = 0;
+
+  friend std::ostream &operator<<(std::ostream &s, const LocalTime &o);
+
+  friend bool operator==(const LocalTime &lhs, const LocalTime &rhs) {
+    return lhs.nanos_ == rhs.nanos_;
+  }
+
+  friend bool operator!=(const LocalTime &lhs, const LocalTime &rhs) {
+    return !(lhs == rhs);
+  }
+};
+
 }  // namespace deephaven::dhcore
 
 template<> struct fmt::formatter<deephaven::dhcore::DateTime> : ostream_formatter {};
+template<> struct fmt::formatter<deephaven::dhcore::LocalDate> : ostream_formatter {};
+template<> struct fmt::formatter<deephaven::dhcore::LocalTime> : ostream_formatter {};
diff --git a/cpp-client/deephaven/dhcore/include/public/deephaven/dhcore/utility/cython_support.h b/cpp-client/deephaven/dhcore/include/public/deephaven/dhcore/utility/cython_support.h
index a2718952636..39fcc885d41 100644
--- a/cpp-client/deephaven/dhcore/include/public/deephaven/dhcore/utility/cython_support.h
+++ b/cpp-client/deephaven/dhcore/include/public/deephaven/dhcore/utility/cython_support.h
@@ -20,6 +20,10 @@ class CythonSupport {
       const uint8_t *validity_begin, const uint8_t *validity_end, size_t num_elements);
   static std::shared_ptr<ColumnSource> CreateDateTimeColumnSource(const int64_t *data_begin, const int64_t *data_end,
       const uint8_t *validity_begin, const uint8_t *validity_end, size_t num_elements);
+  static std::shared_ptr<ColumnSource> CreateLocalDateColumnSource(const int64_t *data_begin, const int64_t *data_end,
+      const uint8_t *validity_begin, const uint8_t *validity_end, size_t num_elements);
+  static std::shared_ptr<ColumnSource> CreateLocalTimeColumnSource(const int64_t *data_begin, const int64_t *data_end,
+      const uint8_t *validity_begin, const uint8_t *validity_end, size_t num_elements);
 
   static ElementTypeId::Enum GetElementTypeId(const ColumnSource &column_source);
 };
diff --git a/cpp-client/deephaven/dhcore/include/public/deephaven/dhcore/utility/utility.h b/cpp-client/deephaven/dhcore/include/public/deephaven/dhcore/utility/utility.h
index 50b34c96cc6..574b6beeea0 100644
--- a/cpp-client/deephaven/dhcore/include/public/deephaven/dhcore/utility/utility.h
+++ b/cpp-client/deephaven/dhcore/include/public/deephaven/dhcore/utility/utility.h
@@ -8,6 +8,7 @@
 #include <cstdio>
 #include <iostream>
 #include <memory>
+#include <optional>
 #include <string>
 #include <thread>
 #include <typeinfo>
@@ -187,6 +188,60 @@ TimePointToEpochMillis(
 TimePointToStr(
     std::chrono::time_point<std::chrono::system_clock> time_point);
 
+/**
+ * This is a method that simply invokes std::filesystem::path(path).filename().string().
+ * We put it here because it is sometimes useful, to provide functionality
+ * similar to the POSIX basename() call. We deliberately do not inline it
+ * because is generates a surprising amount of code.
+ * @param path The path
+ * @return The basename of the path, as returned by std::filesystem::path(path).filename().string()
+ */
+std::string Basename(std::string_view path);
+
+/**
+ * Returns the current thread ID as a string.
+ * @return The current thread ID as a string.
+ */
+[[nodiscard]] std::string GetTidAsString();
+
+/**
+ * Gets the hostname.
+ * @return The hostname.
+ */
+[[nodiscard]] std::string GetHostname();
+
+/**
+ * Gets a value from the environment.
+ * @param envname the key
+ * @return If found, an optional set to the value. Otherwise (if not found), an empty optional.
+ */
+[[nodiscard]] std::optional<std::string> GetEnv(const std::string& envname);
+
+/**
+ * Sets a value in the environment.
+ * @param envname the key
+ * @param value the value to set in the environment
+ */
+void SetEnv(const std::string& envname, const std::string& value);
+
+/**
+ * Unsets a value in the environment.
+ * @param envname the key to unset
+ */
+void UnsetEnv(const std::string& envname);
+
+/**
+ * Enables or disables echo for stdin.
+ * @param enable true to enable, false to disable
+ */
+void SetStdinEcho(bool enable);
+
+/**
+ * Reads a password from stdin up to pressing 'Enter', without echoing the characters typed.
+ * @return the password read
+ */
+std::string ReadPasswordFromStdinNoEcho();
+
 template <class T> [[nodiscard]] std::string
 TypeName(const T& t) {
   return demangle(typeid(t).name());
diff --git a/cpp-client/deephaven/dhcore/src/chunk/chunk_maker.cc b/cpp-client/deephaven/dhcore/src/chunk/chunk_maker.cc
index e62cced69d8..2f7af942070 100644
--- a/cpp-client/deephaven/dhcore/src/chunk/chunk_maker.cc
+++ b/cpp-client/deephaven/dhcore/src/chunk/chunk_maker.cc
@@ -15,6 +15,8 @@ using deephaven::dhcore::column::Int8ColumnSource;
 using deephaven::dhcore::column::Int16ColumnSource;
 using deephaven::dhcore::column::Int32ColumnSource;
 using deephaven::dhcore::column::Int64ColumnSource;
+using deephaven::dhcore::column::LocalDateColumnSource;
+using deephaven::dhcore::column::LocalTimeColumnSource;
 using deephaven::dhcore::column::StringColumnSource;
 
 namespace deephaven::dhcore::chunk {
@@ -62,6 +64,14 @@ struct Visitor final : ColumnSourceVisitor {
     result_ = DateTimeChunk::Create(chunk_size_);
   }
 
+  void Visit(const LocalDateColumnSource &/*source*/) final {
+    result_ = LocalDateChunk::Create(chunk_size_);
+  }
+
+  void Visit(const LocalTimeColumnSource &/*source*/) final {
+    result_ = LocalTimeChunk::Create(chunk_size_);
+  }
+
   size_t chunk_size_;
   AnyChunk result_;
 };
diff --git a/cpp-client/deephaven/dhcore/src/clienttable/schema.cc b/cpp-client/deephaven/dhcore/src/clienttable/schema.cc
index f50660fc967..31ab8c95178 100644
--- a/cpp-client/deephaven/dhcore/src/clienttable/schema.cc
+++ b/cpp-client/deephaven/dhcore/src/clienttable/schema.cc
@@ -28,10 +28,10 @@ Schema::Schema(Private, std::vector<std::string> names, std::vector<ElementTypeI
      index_(std::move(index)) {}
 Schema::~Schema() = default;
 
-std::optional<size_t> Schema::GetColumnIndex(std::string_view name, bool strict) const {
+std::optional<int32_t> Schema::GetColumnIndex(std::string_view name, bool strict) const {
   auto ip = index_.find(name);
   if (ip != index_.end()) {
-    return ip->second;
+    return static_cast<int32_t>(ip->second);
   }
   // Not found: check strictness flag.
   if (!strict) {
diff --git a/cpp-client/deephaven/dhcore/src/column/column_source_helpers.cc b/cpp-client/deephaven/dhcore/src/column/column_source_helpers.cc
index 44020a85874..ac961edc11e 100644
--- a/cpp-client/deephaven/dhcore/src/column/column_source_helpers.cc
+++ b/cpp-client/deephaven/dhcore/src/column/column_source_helpers.cc
@@ -14,4 +14,6 @@ const char HumanReadableTypeNames::kDoubleName[] = "double";
 const char HumanReadableTypeNames::kBoolName[] = "bool";
 const char HumanReadableTypeNames::kStringName[] = "string";
 const char HumanReadableTypeNames::kDateTimeName[] = "DateTime";
+const char HumanReadableTypeNames::kLocalDateName[] = "LocalDate";
+const char HumanReadableTypeNames::kLocalTimeName[] = "LocalTime";
 }  // namespace deephaven::dhcore::column::internal
diff --git a/cpp-client/deephaven/dhcore/src/interop/interop_util.cc b/cpp-client/deephaven/dhcore/src/interop/interop_util.cc
new file mode 100644
index 00000000000..520a24c177f
--- /dev/null
+++ b/cpp-client/deephaven/dhcore/src/interop/interop_util.cc
@@ -0,0 +1,69 @@
+/*
+ * Copyright (c) 2016-2024 Deephaven Data Labs and Patent Pending
+ */
+#include "deephaven/dhcore/interop/interop_util.h"
+#include "deephaven/dhcore/utility/utility.h"
+
+#include <vector>
+
+using deephaven::dhcore::interop::NativePtr;
+using deephaven::dhcore::interop::StringPool;
+using deephaven::dhcore::utility::MakeReservedVector;
+
+namespace deephaven::dhcore::interop {
+int32_t StringPool::ExportAndDestroy(StringPool *self,
+    uint8_t *bytes, int32_t bytes_length,
+    int32_t *ends, int32_t ends_length) {
+  // StringPoolBuilder::Build is allowed to return null if there are no strings.
+  if (self == nullptr) {
+    if (bytes_length != 0 || ends_length != 0) {
+      // This arbitrary return code indicates that something has gone wrong.
+      return 1;
+    }
+    return 0;
+  }
+  if (bytes_length != static_cast<int32_t>(self->bytes_.size()) ||
+      ends_length != static_cast<int32_t>(self->ends_.size())) {
+    // This arbitrary return code indicates that something has gone wrong.
+    return 2;
+  }
+  std::copy(self->bytes_.begin(), self->bytes_.end(), bytes);
+  std::copy(self->ends_.begin(), self->ends_.end(), ends);
+  delete self;
+  return 0;
+}
+
+StringPool::StringPool(std::vector<uint8_t> bytes, std::vector<int32_t> ends) :
+   bytes_(std::move(bytes)), ends_(std::move(ends)) {}
+StringPool::~StringPool() = default;
+
+StringPoolBuilder::StringPoolBuilder() = default;
+StringPoolBuilder::~StringPoolBuilder() = default;
+
+StringHandle StringPoolBuilder::Add(std::string_view sv) {
+  StringHandle result(static_cast<int32_t>(ends_.size()));
+  bytes_.insert(bytes_.end(), sv.begin(), sv.end());
+  ends_.push_back(static_cast<int32_t>(bytes_.size()));
+  return result;
+}
+
+StringPoolHandle StringPoolBuilder::Build() {
+  auto num_bytes = bytes_.size();
+  auto num_strings = ends_.size();
+  if (num_strings == 0) {
+    return StringPoolHandle(nullptr, 0, 0);
+  }
+  auto *sp = new StringPool(std::move(bytes_), std::move(ends_));
+  return StringPoolHandle(sp, static_cast<int32_t>(num_bytes),
+      static_cast<int32_t>(num_strings));
+}
+}  // namespace deephaven::dhcore::interop
+
+extern "C" {
+int32_t deephaven_dhcore_interop_StringPool_ExportAndDestroy(
+    NativePtr<StringPool> string_pool,
+    uint8_t *bytes, int32_t bytes_length,
+    int32_t *ends, int32_t ends_length) {
+  return StringPool::ExportAndDestroy(string_pool.Get(), bytes, bytes_length, ends, ends_length);
+}
+}  // extern "C"
diff --git a/cpp-client/deephaven/dhcore/src/interop/testapi/basic_interop_interactions.cc b/cpp-client/deephaven/dhcore/src/interop/testapi/basic_interop_interactions.cc
new file mode 100644
index 00000000000..9c0c47013d1
--- /dev/null
+++ b/cpp-client/deephaven/dhcore/src/interop/testapi/basic_interop_interactions.cc
@@ -0,0 +1,99 @@
+/*
+ * Copyright (c) 2016-2024 Deephaven Data Labs and Patent Pending
+ */
+#include "deephaven/dhcore/interop/testapi/basic_interop_interactions.h"
+
+#include <string>
+#include "deephaven/dhcore/utility/utility.h"
+#include "deephaven/third_party/fmt/format.h"
+
+using deephaven::dhcore::interop::ErrorStatus;
+using deephaven::dhcore::interop::InteropBool;
+using deephaven::dhcore::interop::StringHandle;
+using deephaven::dhcore::interop::StringPool;
+using deephaven::dhcore::interop::StringPoolHandle;
+using deephaven::dhcore::interop::StringPoolBuilder;
+using deephaven::dhcore::interop::testapi::BasicStruct;
+using deephaven::dhcore::interop::testapi::NestedStruct;
+using deephaven::dhcore::utility::MakeReservedVector;
+
+extern "C" {
+void deephaven_dhcore_interop_testapi_BasicInteropInteractions_Add(
+    int32_t a, int32_t b, int32_t *result) {
+  *result = a + b;
+}
+
+void deephaven_dhcore_interop_testapi_BasicInteropInteractions_AddArrays(
+    const int32_t *a, const int32_t *b, int32_t length, int32_t *result) {
+  for (int32_t i = 0; i != length; ++i) {
+    result[i] = a[i] + b[i];
+  }
+}
+
+void deephaven_dhcore_interop_testapi_BasicInteropInteractions_Xor(
+    InteropBool a, InteropBool b, InteropBool *result) {
+  *result = InteropBool((bool)a ^ (bool)b);
+}
+
+void deephaven_dhcore_interop_testapi_BasicInteropInteractions_XorArrays(
+    const InteropBool *a, const InteropBool *b, int32_t length, InteropBool *result) {
+  for (int32_t i = 0; i != length; ++i) {
+    result[i] = InteropBool((bool)a[i] ^ (bool)b[i]);
+  }
+}
+
+void deephaven_dhcore_interop_testapi_BasicInteropInteractions_Concat(
+    const char *a, const char *b,
+    StringHandle *result_handle, StringPoolHandle *string_pool_handle) {
+  StringPoolBuilder builder;
+  auto text = std::string(a) + b;
+  *result_handle = builder.Add(text);
+  *string_pool_handle = builder.Build();
+}
+
+void deephaven_dhcore_interop_testapi_BasicInteropInteractions_ConcatArrays(
+    const char **a, const char **b, int32_t length,
+    deephaven::dhcore::interop::StringHandle *result_handles,
+    deephaven::dhcore::interop::StringPoolHandle *string_pool_handle) {
+  StringPoolBuilder builder;
+  for (int32_t i = 0; i != length; ++i) {
+    auto text = std::string(a[i]) + b[i];
+    result_handles[i] = builder.Add(text);
+  }
+  *string_pool_handle = builder.Build();
+}
+
+void deephaven_dhcore_interop_testapi_BasicInteropInteractions_AddBasicStruct(
+    const BasicStruct *a, const BasicStruct *b, BasicStruct *result) {
+  *result = a->Add(*b);
+}
+
+void deephaven_dhcore_interop_testapi_BasicInteropInteractions_AddBasicStructArrays(
+    const BasicStruct *a, const BasicStruct *b, int32_t length, BasicStruct *result) {
+  for (int32_t i = 0; i != length; ++i) {
+    result[i] = a[i].Add(b[i]);
+  }
+}
+
+void deephaven_dhcore_interop_testapi_BasicInteropInteractions_AddNestedStruct(
+    const NestedStruct *a, const NestedStruct *b, NestedStruct *result) {
+  *result = a->Add(*b);
+}
+
+void deephaven_dhcore_interop_testapi_BasicInteropInteractions_AddNestedStructArrays(
+    const NestedStruct *a, const NestedStruct *b, int32_t length, NestedStruct *result) {
+  for (int32_t i = 0; i != length; ++i) {
+    result[i] = a[i].Add(b[i]);
+  }
+}
+
+void deephaven_dhcore_interop_testapi_BasicInteropInteractions_SetErrorIfLessThan(
+    int32_t a, int32_t b, ErrorStatus *error_status) {
+  error_status->Run([=]() {
+    if (a < b) {
+      auto message = fmt::format("{} < {}, which is not allowed", a, b);
+      throw std::runtime_error(message);
+    }
+  });
+}
+}  // extern "C"
diff --git a/cpp-client/deephaven/dhcore/src/interop/utility_interop.cc b/cpp-client/deephaven/dhcore/src/interop/utility_interop.cc
new file mode 100644
index 00000000000..cb787dc1a5a
--- /dev/null
+++ b/cpp-client/deephaven/dhcore/src/interop/utility_interop.cc
@@ -0,0 +1,42 @@
+/*
+ * Copyright (c) 2016-2024 Deephaven Data Labs and Patent Pending
+ */
+#include "deephaven/dhcore/interop/utility_interop.h"
+
+#include "deephaven/dhcore/interop/interop_util.h"
+#include "deephaven/dhcore/utility/utility.h"
+
+using deephaven::dhcore::interop::ErrorStatus;
+using deephaven::dhcore::interop::StringHandle;
+using deephaven::dhcore::interop::StringPoolBuilder;
+using deephaven::dhcore::interop::StringPoolHandle;
+using deephaven::dhcore::utility::GetEnv;
+using deephaven::dhcore::utility::SetEnv;
+using deephaven::dhcore::utility::UnsetEnv;
+
+extern "C" {
+void deephaven_dhcore_utility_GetEnv(const char *envname,
+    StringHandle *string_handle, StringPoolHandle *string_pool_handle, ErrorStatus *status) {
+  status->Run([=]() {
+    StringPoolBuilder builder;
+    auto result = GetEnv(envname);
+    if (result.has_value()) {
+      *string_handle = builder.Add(*result);
+    }
+    // If envname is not found in the environment, caller will see an empty builder
+    *string_pool_handle = builder.Build();
+  });
+}
+
+void deephaven_dhcore_utility_SetEnv(const char *envname, const char *value, ErrorStatus *status) {
+  status->Run([=]() {
+    SetEnv(envname, value);
+  });
+}
+
+void deephaven_dhcore_utility_UnsetEnv(const char *envname, ErrorStatus *status) {
+  status->Run([=]() {
+    UnsetEnv(envname);
+  });
+}
+}  // extern "C"
diff --git a/cpp-client/deephaven/dhcore/src/ticking/barrage_processor.cc b/cpp-client/deephaven/dhcore/src/ticking/barrage_processor.cc
index 1820576879b..644f9bc931e 100644
--- a/cpp-client/deephaven/dhcore/src/ticking/barrage_processor.cc
+++ b/cpp-client/deephaven/dhcore/src/ticking/barrage_processor.cc
@@ -330,10 +330,10 @@ AwaitingMetadata::ProcessRemoves(const RowSequence &removed_rows) {
   std::shared_ptr<ClientTable> after_removes;
   if (removed_rows.Empty()) {
     removed_rows_index_space = RowSequence::CreateEmpty();
-      after_removes = prev;
+    after_removes = prev;
   } else {
     removed_rows_index_space = table_state_.Erase(removed_rows);
-      after_removes = table_state_.Snapshot();
+    after_removes = table_state_.Snapshot();
   }
   return {std::move(prev), std::move(removed_rows_index_space), std::move(after_removes)};
 }
@@ -511,7 +511,7 @@ std::optional<TickingUpdate> AwaitingModifies::ProcessNextChunk(BarrageProcessor
 
   for (const auto &mr : modified_rows_remaining_) {
     if (!mr->Empty()) {
-      // Need more data from caller.
+      // Return an indication that at least one column is hungry for more data
       return {};
     }
   }
diff --git a/cpp-client/deephaven/dhcore/src/ticking/immer_table_state.cc b/cpp-client/deephaven/dhcore/src/ticking/immer_table_state.cc
index 7b588731113..f65e7165d7b 100644
--- a/cpp-client/deephaven/dhcore/src/ticking/immer_table_state.cc
+++ b/cpp-client/deephaven/dhcore/src/ticking/immer_table_state.cc
@@ -97,19 +97,19 @@ std::shared_ptr<RowSequence> ImmerTableState::AddKeys(const RowSequence &rows_to
   return spaceMapper_.AddKeys(rows_to_add_key_space);
 }
 
-void ImmerTableState::AddData(const std::vector<std::shared_ptr<ColumnSource>> &src,
+void ImmerTableState::AddData(const std::vector<std::shared_ptr<ColumnSource>> &sources,
     const std::vector<size_t> &begins, const std::vector<size_t> &ends,
     const RowSequence &rows_to_add_index_space) {
-  auto ncols = src.size();
+  auto ncols = sources.size();
   auto nrows = rows_to_add_index_space.Size();
-    AssertAllSame(src.size(), begins.size(), ends.size());
-    AssertLeq(ncols, flexVectors_.size(), "More columns provided than was expected ({} vs {})");
+  AssertAllSame(sources.size(), begins.size(), ends.size());
+  AssertLeq(ncols, flexVectors_.size(), "More columns provided than was expected ({} vs {})");
   for (size_t i = 0; i != ncols; ++i) {
       AssertLeq(nrows, ends[i] - begins[i], "Sources contain insufficient data ({} vs {})");
   }
   auto added_data = MakeReservedVector<std::unique_ptr<AbstractFlexVectorBase>>(ncols);
   for (size_t i = 0; i != ncols; ++i) {
-    added_data.push_back(MakeFlexVectorFromColumnSource(*src[i], begins[i], begins[i] + nrows));
+    added_data.push_back(MakeFlexVectorFromColumnSource(*sources[i], begins[i], begins[i] + nrows));
   }
 
   auto add_chunk = [this, &added_data](uint64_t begin_index, uint64_t end_index) {
@@ -135,8 +135,8 @@ void ImmerTableState::AddData(const std::vector<std::shared_ptr<ColumnSource>> &
   rows_to_add_index_space.ForEachInterval(add_chunk);
 }
 
-std::shared_ptr<RowSequence> ImmerTableState::Erase(const RowSequence &rows_to_remove_key_space) {
-  auto result = spaceMapper_.ConvertKeysToIndices(rows_to_remove_key_space);
+std::shared_ptr<RowSequence> ImmerTableState::Erase(const RowSequence &rows_to_erase_key_space) {
+  auto result = spaceMapper_.ConvertKeysToIndices(rows_to_erase_key_space);
 
   auto erase_chunk = [this](uint64_t begin_key, uint64_t end_key) {
     auto size = end_key - begin_key;
@@ -150,7 +150,7 @@ std::shared_ptr<RowSequence> ImmerTableState::Erase(const RowSequence &rows_to_r
       fv->InPlaceAppend(std::move(fv_temp));
     }
   };
-  rows_to_remove_key_space.ForEachInterval(erase_chunk);
+  rows_to_erase_key_space.ForEachInterval(erase_chunk);
   return result;
 }
 
@@ -160,8 +160,8 @@ std::shared_ptr<RowSequence> ImmerTableState::ConvertKeysToIndices(
 }
 
 void ImmerTableState::ModifyData(size_t col_num, const ColumnSource &src, size_t begin, size_t end,
-    const RowSequence &rows_to_modify) {
-  auto nrows = rows_to_modify.Size();
+    const RowSequence &rows_to_modify_index_space) {
+  auto nrows = rows_to_modify_index_space.Size();
   auto source_size = end - begin;
     AssertLeq(nrows, source_size, "Insufficient data in source ({} vs {})");
   auto modified_data = MakeFlexVectorFromColumnSource(src, begin, begin + nrows);
@@ -182,10 +182,10 @@ void ImmerTableState::ModifyData(size_t col_num, const ColumnSource &src, size_t
     // Append the residual items back from 'fvTemp'.
     fv->InPlaceAppend(std::move(fv_temp));
   };
-  rows_to_modify.ForEachInterval(modify_chunk);
+  rows_to_modify_index_space.ForEachInterval(modify_chunk);
 }
 
-void ImmerTableState::ApplyShifts(const RowSequence &start_index, const RowSequence &end_index,
+void ImmerTableState::ApplyShifts(const RowSequence &first_index, const RowSequence &last_index,
     const RowSequence &dest_index) {
   auto process_shift = [this](int64_t first, int64_t last, int64_t dest) {
     uint64_t begin = first;
@@ -193,7 +193,7 @@ void ImmerTableState::ApplyShifts(const RowSequence &start_index, const RowSeque
     uint64_t dest_begin = dest;
     spaceMapper_.ApplyShift(begin, end, dest_begin);
   };
-  ShiftProcessor::ApplyShiftData(start_index, end_index, dest_index, process_shift);
+  ShiftProcessor::ApplyShiftData(first_index, last_index, dest_index, process_shift);
 }
 
 std::shared_ptr<ClientTable> ImmerTableState::Snapshot() const {
@@ -281,6 +281,14 @@ struct FlexVectorFromSourceMaker final : public ColumnSourceVisitor {
     result_ = std::make_unique<GenericAbstractFlexVector<DateTime>>();
   }
 
+  void Visit(const column::LocalDateColumnSource &/*source*/) final {
+    result_ = std::make_unique<GenericAbstractFlexVector<LocalDate>>();
+  }
+
+  void Visit(const column::LocalTimeColumnSource &/*source*/) final {
+    result_ = std::make_unique<GenericAbstractFlexVector<LocalTime>>();
+  }
+
   std::unique_ptr<AbstractFlexVectorBase> result_;
 };
 
diff --git a/cpp-client/deephaven/dhcore/src/types.cc b/cpp-client/deephaven/dhcore/src/types.cc
index 3f92f7051bc..c3e196a847f 100644
--- a/cpp-client/deephaven/dhcore/src/types.cc
+++ b/cpp-client/deephaven/dhcore/src/types.cc
@@ -105,4 +105,58 @@ std::ostream &operator<<(std::ostream &s, const DateTime &o) {
   fmt::print(s, "{:%FT%TZ}", tp);
   return s;
 }
-}  // namespace deephaven::client
+
+LocalDate LocalDate::Of(int32_t year, int32_t month, int32_t day_of_month) {
+  auto ymd = date::year_month_day(date::year(year), date::month(month), date::day(day_of_month));
+  auto as_sys_days = static_cast<date::sys_days>(ymd);
+  auto as_milliseconds = std::chrono::milliseconds(as_sys_days.time_since_epoch());
+  return LocalDate(as_milliseconds.count());
+}
+
+LocalDate::LocalDate(int64_t millis) : millis_(millis) {
+  std::chrono::milliseconds chrono_millis(millis);
+  std::chrono::time_point<std::chrono::system_clock, std::chrono::milliseconds> tp(chrono_millis);
+
+  auto truncated = date::floor<date::days>(tp);
+  auto difference = tp - truncated;
+  if (difference.count() == 0) {
+    return;
+  }
+
+  auto message = fmt::format("{} milliseconds is not an integral number of days", millis);
+  throw std::runtime_error(DEEPHAVEN_LOCATION_STR(message));
+}
+
+std::ostream &operator<<(std::ostream &s, const LocalDate &o) {
+  std::chrono::milliseconds millis(o.millis_);
+  std::chrono::time_point<std::chrono::system_clock, std::chrono::milliseconds> tp(millis);
+  fmt::print(s, "{:%F}", tp);
+  return s;
+}
+
+LocalTime LocalTime::Of(int32_t hour, int32_t minute, int32_t second) {
+  auto ns = std::chrono::nanoseconds(0);
+  ns += std::chrono::hours(hour);
+  ns += std::chrono::minutes(minute);
+  ns += std::chrono::seconds(second);
+  return LocalTime(ns.count());
+}
+
+LocalTime::LocalTime(int64_t nanos) : nanos_(nanos) {
+  if (nanos >= 0) {
+    return;
+  }
+
+  auto message = fmt::format("nanos argument ({}) cannot be negative", nanos);
+  throw std::runtime_error(DEEPHAVEN_LOCATION_STR(message));
+}
+
+std::ostream &operator<<(std::ostream &s, const LocalTime &o) {
+  std::chrono::nanoseconds ns(o.nanos_);
+  // Make a time point with nanosecond precision so we can print 9 digits of fractional second
+  // precision.
+  std::chrono::time_point<std::chrono::system_clock, std::chrono::nanoseconds> tp(ns);
+  fmt::print(s, "{:%T}", tp);
+  return s;
+}
+}  // namespace deephaven::dhcore
diff --git a/cpp-client/deephaven/dhcore/src/utility/cython_support.cc b/cpp-client/deephaven/dhcore/src/utility/cython_support.cc
index 2cde6fd972d..9863437083a 100644
--- a/cpp-client/deephaven/dhcore/src/utility/cython_support.cc
+++ b/cpp-client/deephaven/dhcore/src/utility/cython_support.cc
@@ -15,11 +15,14 @@ using deephaven::dhcore::column::BooleanArrayColumnSource;
 using deephaven::dhcore::column::ColumnSource;
 using deephaven::dhcore::column::ColumnSourceVisitor;
 using deephaven::dhcore::column::DateTimeArrayColumnSource;
+using deephaven::dhcore::column::LocalDateArrayColumnSource;
+using deephaven::dhcore::column::LocalTimeArrayColumnSource;
 using deephaven::dhcore::column::StringArrayColumnSource;
 
 namespace deephaven::dhcore::utility {
 namespace {
 void populateArrayFromPackedData(const uint8_t *src, bool *dest, size_t num_elements, bool invert);
+void populateNullsFromDeephavenConvention(const int64_t *data_begin, bool *dest, size_t num_elements);
 }  // namespace
 
 std::shared_ptr<ColumnSource>
@@ -59,13 +62,41 @@ CythonSupport::CreateDateTimeColumnSource(const int64_t *data_begin, const int64
   auto nulls = std::make_unique<bool[]>(num_elements);
 
   for (size_t i = 0; i != num_elements; ++i) {
-    elements[i] = DateTime(data_begin[i]);
+    elements[i] = DateTime::FromNanos(data_begin[i]);
   }
-  populateArrayFromPackedData(validity_begin, nulls.get(), num_elements, true);
+  populateNullsFromDeephavenConvention(data_begin, nulls.get(), num_elements);
   return DateTimeArrayColumnSource::CreateFromArrays(std::move(elements), std::move(nulls),
       num_elements);
 }
 
+std::shared_ptr<ColumnSource>
+CythonSupport::CreateLocalDateColumnSource(const int64_t *data_begin, const int64_t *data_end,
+    const uint8_t *validity_begin, const uint8_t *validity_end, size_t num_elements) {
+  auto elements = std::make_unique<LocalDate[]>(num_elements);
+  auto nulls = std::make_unique<bool[]>(num_elements);
+
+  for (size_t i = 0; i != num_elements; ++i) {
+    elements[i] = LocalDate::FromMillis(data_begin[i]);
+  }
+  populateNullsFromDeephavenConvention(data_begin, nulls.get(), num_elements);
+  return LocalDateArrayColumnSource::CreateFromArrays(std::move(elements), std::move(nulls),
+      num_elements);
+}
+
+std::shared_ptr<ColumnSource>
+CythonSupport::CreateLocalTimeColumnSource(const int64_t *data_begin, const int64_t *data_end,
+    const uint8_t *validity_begin, const uint8_t *validity_end, size_t num_elements) {
+  auto elements = std::make_unique<LocalTime[]>(num_elements);
+  auto nulls = std::make_unique<bool[]>(num_elements);
+
+  for (size_t i = 0; i != num_elements; ++i) {
+    elements[i] = LocalTime::FromNanos(data_begin[i]);
+  }
+  populateNullsFromDeephavenConvention(data_begin, nulls.get(), num_elements);
+  return LocalTimeArrayColumnSource::CreateFromArrays(std::move(elements), std::move(nulls),
+      num_elements);
+}
+
 namespace {
 struct ElementTypeIdVisitor final : ColumnSourceVisitor {
   void Visit(const column::CharColumnSource &/*source*/) final {
@@ -108,6 +139,14 @@ struct ElementTypeIdVisitor final : ColumnSourceVisitor {
     elementTypeId_ = ElementTypeId::kTimestamp;
   }
 
+  void Visit(const column::LocalDateColumnSource &/*source*/) final {
+    elementTypeId_ = ElementTypeId::kLocalDate;
+  }
+
+  void Visit(const column::LocalTimeColumnSource &/*source*/) final {
+    elementTypeId_ = ElementTypeId::kLocalTime;
+  }
+
   ElementTypeId::Enum elementTypeId_ = ElementTypeId::kChar;
 };
 }  // namespace
@@ -136,5 +175,11 @@ void populateArrayFromPackedData(const uint8_t *src, bool *dest, size_t num_elem
     --num_elements;
   }
 }
+
+void populateNullsFromDeephavenConvention(const int64_t *data_begin, bool *dest, size_t num_elements) {
+  for (size_t i = 0; i != num_elements; ++i) {
+    dest[i] = data_begin[i] == DeephavenConstants::kNullLong;
+  }
+}
 }  // namespace
 }  // namespace deephaven::dhcore::utility
diff --git a/cpp-client/deephaven/dhcore/src/utility/utility.cc b/cpp-client/deephaven/dhcore/src/utility/utility.cc
index 33f9948258f..ba0ca75e00c 100644
--- a/cpp-client/deephaven/dhcore/src/utility/utility.cc
+++ b/cpp-client/deephaven/dhcore/src/utility/utility.cc
@@ -3,6 +3,7 @@
  */
 #include "deephaven/dhcore/utility/utility.h"
 
+#include <filesystem>
 #include <ostream>
 #include <string>
 #include <vector>
@@ -22,6 +23,7 @@ static_assert(FMT_VERSION >= 100000);
 namespace deephaven::dhcore::utility {
 
 namespace {
+
 const char kEncodeLookup[] = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/";
 const char kPadCharacter = '=';
 }  // namespace
@@ -104,7 +106,7 @@ void TrueOrThrowHelper(const DebugInfo &debug_info) {
 
 std::string FormatDebugString(const char *func, const char *file, size_t line,
     const std::string &message) {
-  return fmt::format("{}@{}:{}: {}", func, file, line, message);
+  return fmt::format("{}: {}@{}:{}", message, func, file, line);
 }
 
 std::string GetWhat(std::exception_ptr eptr) {
@@ -144,6 +146,10 @@ TimePointToStr(
   return EpochMillisToStr(TimePointToEpochMillis(time_point));
 }
 
+std::string Basename(std::string_view path) {
+  return std::filesystem::path(path).filename().string();
+}
+
 #ifdef __GNUG__
 std::string demangle(const char *name) {
   int status = -1;
@@ -162,4 +168,13 @@ std::string demangle(const char* name) {
 std::string ObjectId(const std::string &class_short_name, void *this_ptr) {
   return fmt::format("{}({})", class_short_name, this_ptr);
 }
+
+std::string ReadPasswordFromStdinNoEcho() {
+  SetStdinEcho(false);
+  std::string password;
+  std::cin >> password;
+  SetStdinEcho(true);
+  return password;
+}
+
 }  // namespace deephaven::dhcore::utility
diff --git a/cpp-client/deephaven/dhcore/src/utility/utility_platform_specific.cc b/cpp-client/deephaven/dhcore/src/utility/utility_platform_specific.cc
new file mode 100644
index 00000000000..f0b83a74dd7
--- /dev/null
+++ b/cpp-client/deephaven/dhcore/src/utility/utility_platform_specific.cc
@@ -0,0 +1,232 @@
+/*
+ * Copyright (c) 2016-2024 Deephaven Data Labs and Patent Pending
+ */
+#include <climits>
+#include <mutex>
+#include <optional>
+#include <string>
+#include "deephaven/dhcore/utility/utility.h"
+
+#if defined(__unix__)
+#include <netdb.h>
+#include <termios.h>
+#include <unistd.h>
+#include <sys/syscall.h>
+#include <sys/socket.h>
+#elif defined(_WIN32)
+#include <windows.h>
+#include "winsock.h"
+#endif
+
+namespace deephaven::dhcore::utility {
+
+std::string GetTidAsString() {
+#if defined(__linux__)
+  const pid_t tid = syscall(__NR_gettid);  // this is more portable than gettid().
+  return std::to_string(tid);
+#elif defined(_WIN32)
+  auto tid = GetCurrentThreadId();
+  return std::to_string(tid);
+#else
+#error "Don't have a way to getting thread id on your platform"
+#endif
+}
+
+#if defined(_WIN32)
+namespace {
+// We need to call WSAStartup() before using other Winsock calls.
+// We only do this once during the lifetime of the program; and we
+// never bother to call WSACleanup().
+void EnsureWsaStartup() {
+  static std::mutex mutex;
+  static bool startupSucceeded = false;
+
+  std::unique_lock guard(mutex);
+  if (startupSucceeded) {
+    return;
+  }
+
+  int32_t versionRequested = 0x202;
+  WSADATA wsaData;
+  auto err = WSAStartup(versionRequested, &wsaData);
+  if (err != 0) {
+    auto message = fmt::format("WSAStartup failed with error: {}", err);
+    throw std::runtime_error(DEEPHAVEN_LOCATION_STR(message));
+  }
+  if (wsaData.wVersion != versionRequested) {
+    auto message = fmt::format("Got an unexpected version {:x} of winsock.dll", wsaData.wVersion);
+    throw std::runtime_error(DEEPHAVEN_LOCATION_STR(message));
+  }
+  startupSucceeded = true;
+}
+}  // namespace
+#endif
+
+std::string GetHostname() {
+#if defined(__unix__)
+  char hostname[HOST_NAME_MAX];
+  gethostname(hostname, HOST_NAME_MAX);
+  const addrinfo hints = { AI_ADDRCONFIG|AI_CANONNAME, AF_UNSPEC, 0, 0 };
+  addrinfo *info;
+  const int r = getaddrinfo(hostname, nullptr, &hints, &info);
+  if (r != 0 || info == nullptr) {
+    auto message = fmt::format("getaddrinfo failed: {}", gai_strerror(r));
+    throw std::runtime_error(DEEPHAVEN_LOCATION_STR(message));
+  }
+  // Of all the alternatives, pick the longest.
+  std::size_t maxlen = std::strlen(info->ai_canonname);
+  const addrinfo *maxinfo = info;
+  for (const addrinfo *p = info->ai_next; p != nullptr; p = p->ai_next) {
+    if (p->ai_canonname == nullptr) {
+      continue;
+    }
+    const std::size_t len = std::strlen(p->ai_canonname);
+    if (len > maxlen) {
+      maxlen = len;
+      maxinfo = p;
+    }
+  }
+  std::string result(maxinfo->ai_canonname);
+  freeaddrinfo(info);
+  return result;
+#elif defined(_WIN32)
+  EnsureWsaStartup();
+  char hostname[256];
+  const int r = gethostname(hostname, sizeof(hostname));
+  if (r != 0) {
+    int lasterr = WSAGetLastError();
+    auto message = fmt::format("gethostname failed: error code {}", lasterr);
+    throw std::runtime_error(DEEPHAVEN_LOCATION_STR(message));
+  }
+  return std::string(hostname);
+#else
+#error "Unsupported configuration"
+#endif
+}
+
+namespace {
+/**
+ * This method wraps a function-local static mutex. The purpose of this mutex is to
+ * synchronize the calls GetEnv(), SetEnv(), and UnsetEnv().
+ *
+ * The rationale for synchronizing these calls is that they are not guaranteed
+ * reentrant on either Linux or Windows. On Linux, "man getenv" says
+ *
+ *   The implementation of getenv() is not required to  be  reentrant.   The
+ *   string pointed to by the return value of getenv() may be statically al‐
+ *   located, and  can  be  modified  by  a  subsequent  call  to  getenv(),
+ *   putenv(3), setenv(3), or unsetenv(3).
+ *
+ * On Windows, https://learn.microsoft.com/en-us/cpp/c-runtime-library/reference/putenv-wputenv?view=msvc-170
+ * says
+ *
+ *   The _putenv and _getenv families of functions are not thread-safe.
+ *   _getenv could return a string pointer while _putenv is modifying the string,
+ *   causing random failures. Make sure that calls to these functions are synchronized.
+ *
+ * Finally, we use a function-local static rather than a global so we don't have to think about /
+ * worry about whether global initialization was done correctly on the mutex object.
+ * This "worry" might be unfounded.
+ */
+std::mutex &MutexForEnvInvocations() {
+  static std::mutex the_mutex;
+  return the_mutex;
+}
+}  // namespace
+
+std::optional<std::string> GetEnv(const std::string& envname) {
+#if defined(__unix__)
+  // Protect against concurrent XXXEnv() calls. See comment in MutexForEnvInvocations()
+  std::unique_lock guard(MutexForEnvInvocations());
+  const char* ret = getenv(envname.c_str());
+  if (ret != nullptr) {
+    return std::string(ret);
+  }
+  return {};
+#elif defined(_WIN32)
+  // Protect against concurrent XXXEnv() calls. See comment in MutexForEnvInvocations()
+  std::unique_lock guard(MutexForEnvInvocations());
+  static char ret[1024];
+  size_t len;
+  const errno_t err = getenv_s(&len, ret, sizeof(ret), envname.c_str());
+  // Return an unset optional if there's an error, or if the key is not found.
+  // len == 0 means "key not found" on Windows.
+  if (err != 0 || len == 0) {
+    return {};
+  }
+  return std::string(ret);
+#else
+#error "Unsupported configuration"
+#endif
+}
+
+void SetEnv(const std::string& envname, const std::string& value) {
+#if defined(__unix__)
+  // Protect against concurrent XXXEnv() calls. See comment in MutexForEnvInvocations()
+  std::unique_lock guard(MutexForEnvInvocations());
+
+  auto res = setenv(envname.c_str(), value.c_str(), 1);
+  if (res != 0) {
+    auto message = fmt::format("setenv failed, error={}", strerror(errno));
+    throw std::runtime_error(DEEPHAVEN_LOCATION_STR(message));
+  }
+#elif defined(_WIN32)
+  // Protect against concurrent XXXEnv() calls. See comment in MutexForEnvInvocations()
+  std::unique_lock guard(MutexForEnvInvocations());
+
+  auto res = _putenv_s(envname.c_str(), value.c_str());
+  if (res != 0) {
+    int lasterr = WSAGetLastError();
+    auto message = fmt::format("_putenv_s failed: error code {}", lasterr);
+    throw std::runtime_error(DEEPHAVEN_LOCATION_STR(message));
+  }
+#else
+#error "Unsupported configuration"
+#endif
+}
+
+void UnsetEnv(const std::string& envname) {
+#if defined(__unix__)
+  // Protect against concurrent XXXEnv() calls. See comment in MutexForEnvInvocations()
+  std::unique_lock guard(MutexForEnvInvocations());
+
+  auto res = unsetenv(envname.c_str());
+  if (res != 0) {
+    auto message = fmt::format("unsetenv failed, error={}", strerror(errno));
+    throw std::runtime_error(DEEPHAVEN_LOCATION_STR(message));
+  }
+#elif defined(_WIN32)
+  SetEnv(envname, "");
+#else
+#error "Unsupported configuration"
+#endif
+}
+
+// https://stackoverflow.com/questions/1413445/reading-a-password-from-stdcin
+void SetStdinEcho(const bool enable) {
+#if defined(__unix__)
+  struct termios tty;
+  tcgetattr(STDIN_FILENO, &tty);
+  if( !enable )
+    tty.c_lflag &= ~ECHO;
+  else
+    tty.c_lflag |= ECHO;
+
+  (void) tcsetattr(STDIN_FILENO, TCSANOW, &tty);
+#elif defined(_WIN32)
+  HANDLE hStdin = GetStdHandle(STD_INPUT_HANDLE);
+  DWORD mode;
+  GetConsoleMode(hStdin, &mode);
+
+  if( !enable )
+    mode &= ~ENABLE_ECHO_INPUT;
+  else
+    mode |= ENABLE_ECHO_INPUT;
+
+  SetConsoleMode(hStdin, mode );
+#else
+#error "Unsupported configuration"
+#endif
+}
+
+}  // namespace deephaven::dhcore::utility
diff --git a/cpp-client/deephaven/tests/src/add_drop_test.cc b/cpp-client/deephaven/tests/src/add_drop_test.cc
index 89901c09373..dbd2bce292f 100644
--- a/cpp-client/deephaven/tests/src/add_drop_test.cc
+++ b/cpp-client/deephaven/tests/src/add_drop_test.cc
@@ -6,7 +6,7 @@
 
 namespace deephaven::client::tests {
 
-TEST_CASE("Drop all columns", "[adddrop]") {
+TEST_CASE("Drop some columns", "[adddrop]") {
   auto tm = TableMakerForTests::Create();
   auto table = tm.Table();
   auto t = table.Update("II = ii").Where("Ticker == `AAPL`");
diff --git a/cpp-client/deephaven/tests/src/attributes_test.cc b/cpp-client/deephaven/tests/src/attributes_test.cc
index e0af4df9002..43684411a41 100644
--- a/cpp-client/deephaven/tests/src/attributes_test.cc
+++ b/cpp-client/deephaven/tests/src/attributes_test.cc
@@ -28,6 +28,6 @@ TEST_CASE("TableHandle Created By DoPut", "[attributes]") {
   CHECK(table.IsStatic());
   // The columns all have the same size, so look at the source data for any one of them and get its size
   auto expected_size = static_cast<int64_t>(tm.ColumnData().ImportDate().size());
-  CHECK(table.NumRows() == expected_size);
+  CHECK(expected_size == table.NumRows());
 }
 }  // namespace deephaven::client::tests
diff --git a/cpp-client/deephaven/tests/src/join_test.cc b/cpp-client/deephaven/tests/src/join_test.cc
index 0582991585a..fde79b7e481 100644
--- a/cpp-client/deephaven/tests/src/join_test.cc
+++ b/cpp-client/deephaven/tests/src/join_test.cc
@@ -135,8 +135,6 @@ TEST_CASE("Aj", "[join]") {
 
 TEST_CASE("Raj", "[join]") {
   auto tm = TableMakerForTests::Create();
-  auto q = arrow::timestamp(arrow::TimeUnit::NANO, "UTC");
-
   TableHandle trades;
   {
     std::vector<std::string> ticker_data = {"AAPL", "AAPL", "AAPL", "IBM", "IBM"};
@@ -206,15 +204,6 @@ TEST_CASE("Raj", "[join]") {
     std::vector<std::optional<int32_t>> bid_size_data = {10, {}, {}, 5, 13};
     std::vector<std::optional<double>> ask_data = {2.5, {}, {}, 105, 110};
     std::vector<std::optional<int32_t>> ask_size_data = {83, {}, {}, 47, 15};
-    TableMaker table_maker;
-    table_maker.AddColumn("Ticker", ticker_data);
-    table_maker.AddColumn("Timestamp", timestamp_data);
-    table_maker.AddColumn("Price", price_data);
-    table_maker.AddColumn("Size", size_data);
-    table_maker.AddColumn("Bid", bid_data);
-    table_maker.AddColumn("BidSize", bid_size_data);
-    table_maker.AddColumn("Ask", ask_data);
-    table_maker.AddColumn("AskSize", ask_size_data);
 
     CompareTable(
         result,
diff --git a/cpp-client/deephaven/tests/src/select_test.cc b/cpp-client/deephaven/tests/src/select_test.cc
index d9168d48bab..04a73f3db51 100644
--- a/cpp-client/deephaven/tests/src/select_test.cc
+++ b/cpp-client/deephaven/tests/src/select_test.cc
@@ -12,6 +12,8 @@ using deephaven::client::Client;
 using deephaven::client::TableHandle;
 using deephaven::client::utility::TableMaker;
 using deephaven::dhcore::DateTime;
+using deephaven::dhcore::LocalDate;
+using deephaven::dhcore::LocalTime;
 using deephaven::dhcore::DeephavenConstants;
 
 namespace deephaven::client::tests {
@@ -28,6 +30,8 @@ TEST_CASE("Support all types", "[select]") {
   std::vector<double> double_data;
   std::vector<std::string> string_data;
   std::vector<DateTime> date_time_data;
+  std::vector<LocalDate> local_date_data;
+  std::vector<LocalTime> local_time_data;
 
   const int start_value = -8;
   const int end_value = 8;
@@ -42,6 +46,8 @@ TEST_CASE("Support all types", "[select]") {
     double_data.push_back(i * 987654.321);
     string_data.push_back(fmt::format("test {}", i));
     date_time_data.push_back(DateTime::FromNanos(i));
+    local_date_data.push_back(LocalDate::FromMillis(i * 86400 * 1000));
+    local_time_data.push_back(LocalTime::FromNanos(1000 + i));  // nanos argument cannot be negative
   }
 
   TableMaker maker;
@@ -55,6 +61,8 @@ TEST_CASE("Support all types", "[select]") {
   maker.AddColumn("doubleData", double_data);
   maker.AddColumn("stringData", string_data);
   maker.AddColumn("dateTimeData", date_time_data);
+  maker.AddColumn("localDateData", local_date_data);
+  maker.AddColumn("localTimeData", local_time_data);
 
   auto t = maker.MakeTable(tm.Client().GetManager());
 
@@ -71,7 +79,9 @@ TEST_CASE("Support all types", "[select]") {
       "floatData", float_data,
       "doubleData", double_data,
       "stringData", string_data,
-      "dateTimeData", date_time_data
+      "dateTimeData", date_time_data,
+      "localDateData", local_date_data,
+      "localTimeData", local_time_data
   );
 }
 
diff --git a/cpp-client/deephaven/tests/src/sort_test.cc b/cpp-client/deephaven/tests/src/sort_test.cc
index 2c94ca72805..1bcf318c291 100644
--- a/cpp-client/deephaven/tests/src/sort_test.cc
+++ b/cpp-client/deephaven/tests/src/sort_test.cc
@@ -54,12 +54,6 @@ TEST_CASE("Sort temp Table", "[sort]") {
 
   auto sorted = temp_table.Sort(SortPair::Descending("IntValue3"), SortPair::Ascending("IntValue2"));
 
-  std::vector<std::string> import_date_data = {"2017-11-01", "2017-11-01", "2017-11-01"};
-  std::vector<std::string> ticker_data = {"AAPL", "AAPL", "AAPL"};
-  std::vector<double> open_data = {22.1, 26.8, 31.5};
-  std::vector<double> close_data = {23.5, 24.2, 26.7};
-  std::vector<int64_t> vol_data = {100000, 250000, 19000};
-
   std::vector<int32_t> sid0{8, 9, 10, 11, 12, 13, 14, 15, 0, 1, 2, 3, 4, 5, 6, 7};
   std::vector<int32_t> sid1{4, 4, 5, 5, 6, 6, 7, 7, 0, 0, 1, 1, 2, 2, 3, 3};
   std::vector<int32_t> sid2{2, 2, 2, 2, 3, 3, 3, 3, 0, 0, 0, 0, 1, 1, 1, 1};
diff --git a/cpp-client/deephaven/tests/src/table_test.cc b/cpp-client/deephaven/tests/src/table_test.cc
index 364965d2898..9f7dbdc71c8 100644
--- a/cpp-client/deephaven/tests/src/table_test.cc
+++ b/cpp-client/deephaven/tests/src/table_test.cc
@@ -19,6 +19,8 @@ using deephaven::dhcore::chunk::Int32Chunk;
 using deephaven::dhcore::chunk::Int64Chunk;
 using deephaven::dhcore::container::RowSequence;
 using deephaven::dhcore::DateTime;
+using deephaven::dhcore::LocalDate;
+using deephaven::dhcore::LocalTime;
 using deephaven::dhcore::DeephavenConstants;
 using deephaven::dhcore::utility::MakeReservedVector;
 
@@ -38,7 +40,9 @@ TEST_CASE("Fetch the entire table (small)", "[client_table]") {
         "Doubles = ii == 5 ? null : (double)(ii)",
         "Bools = ii == 5 ? null : ((ii % 2) == 0)",
         "Strings = ii == 5 ? null : `hello ` + i",
-        "DateTimes = ii == 5 ? null : '2001-03-01T12:34:56Z' + ii"
+        "DateTimes = ii == 5 ? null : '2001-03-01T12:34:56Z' + ii",
+        "LocalDates = ii == 5 ? null : '2001-03-01' + ((int)ii * 'P1D')",
+        "LocalTimes = ii == 5 ? null : '12:34:46'.plus((int)ii * 'PT1S')"
       });
   std::cout << th.Stream(true) << '\n';
 
@@ -55,6 +59,8 @@ TEST_CASE("Fetch the entire table (small)", "[client_table]") {
   auto bools = MakeReservedVector<std::optional<bool>>(target);
   auto strings = MakeReservedVector<std::optional<std::string>>(target);
   auto date_times = MakeReservedVector<std::optional<DateTime>>(target);
+  auto local_dates = MakeReservedVector<std::optional<LocalDate>>(target);
+  auto local_times = MakeReservedVector<std::optional<LocalTime>>(target);
 
   auto date_time_start = DateTime::Parse("2001-03-01T12:34:56Z");
 
@@ -69,6 +75,8 @@ TEST_CASE("Fetch the entire table (small)", "[client_table]") {
     bools.emplace_back((i % 2) == 0);
     strings.emplace_back(fmt::format("hello {}", i));
     date_times.emplace_back(DateTime::FromNanos(date_time_start.Nanos() + i));
+    local_dates.emplace_back(LocalDate::Of(2001, 3, i + 1));
+    local_times.emplace_back(LocalTime::Of(12, 34, 46 + i));
   }
 
   auto t2 = target / 2;
@@ -84,6 +92,8 @@ TEST_CASE("Fetch the entire table (small)", "[client_table]") {
   bools[t2] = {};
   strings[t2] = {};
   date_times[t2] = {};
+  local_dates[t2] = {};
+  local_times[t2] = {};
 
   CompareColumn(*ct, "Chars", chars);
   CompareColumn(*ct, "Bytes", int8s);
@@ -95,7 +105,7 @@ TEST_CASE("Fetch the entire table (small)", "[client_table]") {
   CompareColumn(*ct, "Bools", bools);
   CompareColumn(*ct, "Strings", strings);
   CompareColumn(*ct, "DateTimes", date_times);
-
-  tm.Client().Close();
+  CompareColumn(*ct, "LocalDates", local_dates);
+  CompareColumn(*ct, "LocalTimes", local_times);
 }
 }  // namespace deephaven::client::tests
diff --git a/cpp-client/deephaven/tests/src/ticking_test.cc b/cpp-client/deephaven/tests/src/ticking_test.cc
index 5d8ae0d6ae1..e722b06a8f1 100644
--- a/cpp-client/deephaven/tests/src/ticking_test.cc
+++ b/cpp-client/deephaven/tests/src/ticking_test.cc
@@ -14,6 +14,8 @@ using deephaven::client::Client;
 using deephaven::client::TableHandle;
 using deephaven::client::utility::TableMaker;
 using deephaven::dhcore::DateTime;
+using deephaven::dhcore::LocalDate;
+using deephaven::dhcore::LocalTime;
 using deephaven::dhcore::chunk::ChunkMaker;
 using deephaven::dhcore::chunk::BooleanChunk;
 using deephaven::dhcore::chunk::DateTimeChunk;
@@ -188,6 +190,8 @@ class WaitForPopulatedTableCallback final : public CommonBase {
     auto bools = MakeReservedVector<std::optional<bool>>(target_);
     auto strings = MakeReservedVector<std::optional<std::string>>(target_);
     auto date_times = MakeReservedVector<std::optional<DateTime>>(target_);
+    auto local_dates = MakeReservedVector<std::optional<LocalDate>>(target_);
+    auto local_times = MakeReservedVector<std::optional<LocalTime>>(target_);
 
     auto date_time_start = DateTime::Parse("2001-03-01T12:34:56Z");
 
@@ -202,6 +206,8 @@ class WaitForPopulatedTableCallback final : public CommonBase {
       bools.emplace_back((i % 2) == 0);
       strings.emplace_back(fmt::format("hello {}", i));
       date_times.emplace_back(DateTime::FromNanos(date_time_start.Nanos() + i));
+      local_dates.emplace_back(LocalDate::Of(2001, 3, i + 1));
+      local_times.emplace_back(LocalTime::Of(12, 34, 46 + i));
     }
 
     if (target_ == 0) {
@@ -220,6 +226,8 @@ class WaitForPopulatedTableCallback final : public CommonBase {
     bools[t2] = {};
     strings[t2] = {};
     date_times[t2] = {};
+    local_dates[t2] = {};
+    local_times[t2] = {};
 
     CompareColumn(*current, "Chars", chars);
     CompareColumn(*current, "Bytes", int8s);
@@ -231,6 +239,8 @@ class WaitForPopulatedTableCallback final : public CommonBase {
     CompareColumn(*current, "Bools", bools);
     CompareColumn(*current, "Strings", strings);
     CompareColumn(*current, "DateTimes", date_times);
+    CompareColumn(*current, "LocalDates", local_dates);
+    CompareColumn(*current, "LocalTimes", local_times);
 
     NotifyDone();
   }
@@ -255,7 +265,9 @@ TEST_CASE("Ticking Table: all the data is eventually present", "[ticking]") {
           "Doubles = II == 5 ? null : (double)II",
           "Bools = II == 5 ? null : ((II % 2) == 0)",
           "Strings = II == 5 ? null : (`hello ` + II)",
-          "DateTimes = II == 5 ? null : ('2001-03-01T12:34:56Z' + II)"
+          "DateTimes = II == 5 ? null : ('2001-03-01T12:34:56Z' + II)",
+          "LocalDates = ii == 5 ? null : '2001-03-01' + ((int)II * 'P1D')",
+          "LocalTimes = ii == 5 ? null : '12:34:46'.plus((int)II * 'PT1S')"
       })
       .LastBy("II")
       .Sort(SortPair::Ascending("II"));
diff --git a/cpp-client/deephaven/tests/src/ungroup_test.cc b/cpp-client/deephaven/tests/src/ungroup_test.cc
index 71621afe8bc..f946d171edc 100644
--- a/cpp-client/deephaven/tests/src/ungroup_test.cc
+++ b/cpp-client/deephaven/tests/src/ungroup_test.cc
@@ -5,15 +5,17 @@
 #include "deephaven/tests/test_util.h"
 
 namespace deephaven::client::tests {
-// TODO(kosak): This test is currently disabled (by membership in the [.] test group, because we
-//  don't yet deserialize the grouped column correctly.
+// TODO(kosak): This test is currently disabled (by membership in the [.] test group).
+// The reason is because each cell in the grouped column comes back as the Arrow type list<double>,
+// but the library does not currently know how to deserialize Arrow list types.
 TEST_CASE("Ungroup columns", "[.]") {
   auto tm = TableMakerForTests::Create();
   auto table = tm.Table();
 
   table = table.Where("ImportDate == `2017-11-01`");
 
-  auto by_table = table.Where("Ticker == `AAPL`").View("Ticker", "Close").View("Ticker");
+  auto by_table = table.Where("Ticker == `AAPL`").View("Ticker", "Close").By("Ticker");
+  std::cout << by_table.Stream(true) << '\n';
   auto ungrouped = by_table.Ungroup("Close");
 
   std::vector<std::string> ticker_data = {"AAPL"};
diff --git a/cpp-client/deephaven/tests/src/update_by_test.cc b/cpp-client/deephaven/tests/src/update_by_test.cc
index e371a96f4da..79a9fd32738 100644
--- a/cpp-client/deephaven/tests/src/update_by_test.cc
+++ b/cpp-client/deephaven/tests/src/update_by_test.cc
@@ -154,7 +154,6 @@ TEST_CASE("UpdateBy: Multiple Ops", "[update_by]") {
 
 namespace {
 std::vector<TableHandle> MakeTables(const Client &client) {
-  std::vector<TableHandle> result;
   auto tm = client.GetManager();
   auto static_table = MakeRandomTable(client).Update("Timestamp=now()");
   auto ticking_table = tm.TimeTable(std::chrono::seconds(1))
diff --git a/cpp-client/deephaven/tests/src/utility_test.cc b/cpp-client/deephaven/tests/src/utility_test.cc
index 9e1fdee5a42..aa81b68afc6 100644
--- a/cpp-client/deephaven/tests/src/utility_test.cc
+++ b/cpp-client/deephaven/tests/src/utility_test.cc
@@ -5,8 +5,14 @@
 #include "deephaven/dhcore/utility/utility.h"
 
 using deephaven::dhcore::utility::Base64Encode;
+using deephaven::dhcore::utility::Basename;
 using deephaven::dhcore::utility::EpochMillisToStr;
+using deephaven::dhcore::utility::GetEnv;
+using deephaven::dhcore::utility::GetTidAsString;
+using deephaven::dhcore::utility::GetHostname;
 using deephaven::dhcore::utility::ObjectId;
+using deephaven::dhcore::utility::SetEnv;
+using deephaven::dhcore::utility::UnsetEnv;
 
 namespace deephaven::client::tests {
 TEST_CASE("Base64encode", "[utility]") {
@@ -28,4 +34,77 @@ TEST_CASE("ObjectId", "[utility]") {
   auto id = ObjectId("hello", reinterpret_cast<void *>(p));
   CHECK(id == "hello(0xdeadbeef)");
 }
+
+TEST_CASE("Basename", "[utility]") {
+#ifdef __linux__
+  CHECK("file.txt" == Basename("/home/kosak/file.txt"));
+  CHECK(Basename("/home/kosak/").empty());
+#endif
+
+#ifdef _WIN32
+  CHECK("file.txt" == Basename(R"(C:\Users\kosak\file.txt)"));
+  CHECK(Basename(R"(C:\Users\kosak\)").empty());
+#endif
+}
+
+// This isn't much of a test, but if it can compile on all supported
+// platforms (Linux and Windows) then that is at least a sanity check
+// (that the entry point exists). For now we just visually spot-check
+// that ireturns the right value.
+TEST_CASE("ThreadId", "[utility]") {
+  auto tid = GetTidAsString();
+  fmt::println("This should be my thread id: {}", tid);
+}
+
+// This isn't much of a test, but if it can compile on all supported
+// platforms (Linux and Windows) then that is at least a sanity check
+// (that the entry point exists). For now we just visually spot-check
+// that ireturns the right value.
+TEST_CASE("GetHostname", "[utility]") {
+  auto hostname = GetHostname();
+  fmt::println("This should be the hostname: {}", hostname);
+}
+
+// This isn't much of a test, but if it can compile on all supported
+// platforms (Linux and Windows) then that is at least a sanity check
+// (that the entry point exists). For now we just visually spot-check
+// that it returns the right value.
+TEST_CASE("GetEnv", "[utility]") {
+#if defined(__unix__)
+  const char *expected_key = "PATH";
+#elif defined(_WIN32)
+  const char *expected_key = "OS";
+#else
+#error "Unsupported configuration"
+#endif
+
+  auto value = GetEnv(expected_key);
+  REQUIRE(value.has_value());
+  fmt::println("{} is: {}", expected_key, *value);
+}
+
+// Confirm that SetEnv leaves something that GetEnv can find.
+TEST_CASE("SetEnv", "[utility]") {
+  std::string unlikely_key = "Deephaven__serious_realtime_data_tools";
+  std::string unlikely_value = "query_engine_APIs_and_user_interfaces";
+  {
+    auto value = GetEnv(unlikely_key);
+    if (value.has_value()) {
+      fmt::println(std::cerr, "unexpected value is {}", *value);
+    }
+    REQUIRE(!value.has_value());
+  }
+
+  SetEnv(unlikely_key, unlikely_value);
+  {
+    auto value = GetEnv(unlikely_key);
+    REQUIRE(unlikely_value == value);
+  }
+
+  UnsetEnv(unlikely_key);
+  {
+    auto value = GetEnv(unlikely_key);
+    REQUIRE(!value.has_value());
+  }
+}
 }  // namespace deephaven::client::tests
diff --git a/cpp-client/deephaven/tests/src/validation_test.cc b/cpp-client/deephaven/tests/src/validation_test.cc
index dcc07d12ede..2b2062db121 100644
--- a/cpp-client/deephaven/tests/src/validation_test.cc
+++ b/cpp-client/deephaven/tests/src/validation_test.cc
@@ -15,8 +15,6 @@ using deephaven::dhcore::utility::separatedList;
 
 namespace deephaven::client::tests {
 namespace {
-void TestWheres(const TableHandleManager &scope);
-void TestSelects(const TableHandleManager &scope);
 void TestWheresHelper(std::string_view what, const TableHandle &table,
     const std::vector<std::string> &bad_wheres,
     const std::vector<std::string> &good_wheres);
@@ -26,19 +24,26 @@ void TestSelectsHelper(std::string_view what, const TableHandle &table,
 }  // namespace
 
 TEST_CASE("Validate selects", "[validation]") {
-  auto tm = TableMakerForTests::Create();
-  auto table = tm.Table();
-  TestSelects(tm.Client().GetManager());
-}
+  std::vector<std::vector<std::string>> bad_selects = {
+      { "X = 3)" },
+      { "S = `hello`", "T = java.util.regex.Pattern.quote(S)" }, // Pattern.quote not on whitelist
+      { "X = Math.min(3, 4)" } // Math.min not on whitelist
+  };
+  std::vector<std::vector<std::string>> good_selects = {
+      {"X = 3"},
+      {"S = `hello`", "T = S.length()"}, // instance methods of String ok
+      {"X = min(3, 4)"}, // "builtin" from GroovyStaticImports
+      {"X = isFinite(3)"}, // another builtin from GroovyStaticImports
+  };
 
-TEST_CASE("Validate wheres", "[validation]") {
   auto tm = TableMakerForTests::Create();
-  auto table = tm.Table();
-  TestWheres(tm.Client().GetManager());
+  auto thm = tm.Client().GetManager();
+  auto static_table = thm.EmptyTable(10)
+      .Update("X = 12", "S = `hello`");
+  TestSelectsHelper("static Table", static_table, bad_selects, good_selects);
 }
 
-namespace {
-void TestWheres(const TableHandleManager &scope) {
+TEST_CASE("Validate wheres", "[validation]") {
   std::vector<std::string> bad_wheres = {
       "X > 3)", // syntax error
       "S = new String(`hello`)", // new not allowed
@@ -55,11 +60,14 @@ void TestWheres(const TableHandleManager &scope) {
       "X in 3, 4, 5",
   };
 
-  auto static_table = scope.EmptyTable(10)
+  auto tm = TableMakerForTests::Create();
+  auto thm = tm.Client().GetManager();
+  auto static_table = thm.EmptyTable(10)
       .Update("X = 12", "S = `hello`");
   TestWheresHelper("static Table", static_table, bad_wheres, good_wheres);
 }
 
+namespace {
 void TestWheresHelper(std::string_view what, const TableHandle &table,
     const std::vector<std::string> &bad_wheres,
     const std::vector<std::string> &good_wheres) {
@@ -81,37 +89,18 @@ void TestWheresHelper(std::string_view what, const TableHandle &table,
   }
 }
 
-void TestSelects(const TableHandleManager &scope) {
-  std::vector<std::vector<std::string>> bad_selects = {
-      { "X = 3)" },
-      { "S = `hello`", "T = java.util.regex.Pattern.quote(S)" }, // Pattern.quote not on whitelist
-      { "X = Math.min(3, 4)" } // Math.min not on whitelist
-  };
-  std::vector<std::vector<std::string>> good_selects = {
-      {"X = 3"},
-      {"S = `hello`", "T = S.length()"}, // instance methods of String ok
-      {"X = min(3, 4)"}, // "builtin" from GroovyStaticImports
-      {"X = isFinite(3)"}, // another builtin from GroovyStaticImports
-  };
-  auto static_table = scope.EmptyTable(10)
-      .Update("X = 12", "S = `hello`");
-  TestSelectsHelper("static Table", static_table, bad_selects, good_selects);
-}
-
 void TestSelectsHelper(std::string_view what, const TableHandle &table,
     const std::vector<std::vector<std::string>> &bad_selects,
     const std::vector<std::vector<std::string>> &good_selects) {
   for (const auto &bs : bad_selects) {
-    SimpleOstringstream selection;
-    selection << separatedList(bs.begin(), bs.end());
     try {
       (void)table.Select(bs);
     } catch (const std::exception &e) {
-      fmt::print(std::cerr, "{}: {}: Failed as expected with: {}\n", what, selection.str(), e.what());
+      fmt::print(std::cerr, "{}: {}: Failed as expected with: {}\n", what, bs, e.what());
       continue;
     }
     throw std::runtime_error(fmt::format("{}: {}: Expected to fail, but succeeded",
-        what, selection.str()));
+        what, bs));
   }
 
   for (const auto &gs : good_selects) {
diff --git a/cpp-client/deephaven/vcpkg-configuration.json b/cpp-client/deephaven/vcpkg-configuration.json
index 1da16750d5f..e12dc32e3a6 100644
--- a/cpp-client/deephaven/vcpkg-configuration.json
+++ b/cpp-client/deephaven/vcpkg-configuration.json
@@ -1,7 +1,7 @@
 {
   "default-registry": {
     "kind": "git",
-    "baseline": "0dc005fb66801c8a8266e81bd2cedb4d5501f30e",
+    "baseline": "1b5f7346612cd63910567df714d867f5b3fa8e3b",
     "repository": "https://github.com/microsoft/vcpkg"
   },
   "registries": [
diff --git a/cpp-client/deephaven/vcpkg.json b/cpp-client/deephaven/vcpkg.json
index 1731d32195a..e52660ae681 100644
--- a/cpp-client/deephaven/vcpkg.json
+++ b/cpp-client/deephaven/vcpkg.json
@@ -11,7 +11,7 @@
   ],
 
   "overrides": [
-    { "name": "arrow", "version": "13.0.0#1" },
-    { "name": "protobuf", "version": "3.21.2" }
+    { "name": "arrow", "version": "16.1.0#1" },
+    { "name": "protobuf", "version": "4.25.1" }
   ]
 }
diff --git a/csharp/.gitignore b/csharp/.gitignore
new file mode 100644
index 00000000000..1c87228407c
--- /dev/null
+++ b/csharp/.gitignore
@@ -0,0 +1,4 @@
+*~
+.vs/
+bin/
+obj/
diff --git a/csharp/ExcelAddIn/DeephavenExcelFunctions.cs b/csharp/ExcelAddIn/DeephavenExcelFunctions.cs
new file mode 100644
index 00000000000..9aeab0ad654
--- /dev/null
+++ b/csharp/ExcelAddIn/DeephavenExcelFunctions.cs
@@ -0,0 +1,65 @@
+using System.Diagnostics.CodeAnalysis;
+using Deephaven.ExcelAddIn.ExcelDna;
+using Deephaven.ExcelAddIn.Factories;
+using Deephaven.ExcelAddIn.Models;
+using Deephaven.ExcelAddIn.Operations;
+using ExcelDna.Integration;
+
+namespace Deephaven.ExcelAddIn;
+
+public static class DeephavenExcelFunctions {
+  private static readonly StateManager StateManager = new();
+
+  [ExcelCommand(MenuName = "Deephaven", MenuText = "Connections")]
+  public static void ShowConnectionsDialog() {
+    ConnectionManagerDialogFactory.CreateAndShow(StateManager);
+  }
+
+  [ExcelFunction(Description = "Snapshots a table", IsThreadSafe = true)]
+  public static object DEEPHAVEN_SNAPSHOT(string tableDescriptor, object filter, object wantHeaders) {
+    if (!TryInterpretCommonArgs(tableDescriptor, filter, wantHeaders, out var tq, out var wh, out var errorText)) {
+      return errorText;
+    }
+
+    // These two are used by ExcelDNA to share results for identical invocations. The functionName is arbitary but unique.
+    const string functionName = "Deephaven.ExcelAddIn.DeephavenExcelFunctions.DEEPHAVEN_SNAPSHOT";
+    var parms = new[] { tableDescriptor, filter, wantHeaders };
+    ExcelObservableSource eos = () => new SnapshotOperation(tq, wh, StateManager);
+    return ExcelAsyncUtil.Observe(functionName, parms, eos);
+  }
+
+  [ExcelFunction(Description = "Subscribes to a table", IsThreadSafe = true)]
+  public static object DEEPHAVEN_SUBSCRIBE(string tableDescriptor, object filter, object wantHeaders) {
+    if (!TryInterpretCommonArgs(tableDescriptor, filter, wantHeaders, out var tq, out var wh, out string errorText)) {
+      return errorText;
+    }
+    // These two are used by ExcelDNA to share results for identical invocations. The functionName is arbitary but unique.
+    const string functionName = "Deephaven.ExcelAddIn.DeephavenExcelFunctions.DEEPHAVEN_SUBSCRIBE";
+    var parms = new[] { tableDescriptor, filter, wantHeaders };
+    ExcelObservableSource eos = () => new SubscribeOperation(tq, wh, StateManager);
+    return ExcelAsyncUtil.Observe(functionName, parms, eos);
+  }
+
+  private static bool TryInterpretCommonArgs(string tableDescriptor, object filter, object wantHeaders,
+    [NotNullWhen(true)]out TableQuad? tableQuadResult, out bool wantHeadersResult, out string errorText) {
+    tableQuadResult = null;
+    wantHeadersResult = false;
+    if (!TableTriple.TryParse(tableDescriptor, out var tt, out errorText)) {
+      return false;
+    }
+
+    if (!ExcelDnaHelpers.TryInterpretAs(filter, "", out var condition)) {
+      errorText = "Can't interpret FILTER argument";
+      return false;
+    }
+
+
+    if (!ExcelDnaHelpers.TryInterpretAs(wantHeaders, false, out wantHeadersResult)) {
+      errorText = "Can't interpret WANT_HEADERS argument";
+      return false;
+    }
+
+    tableQuadResult = new TableQuad(tt.EndpointId, tt.PersistentQueryId, tt.TableName, condition);
+    return true;
+  }
+}
diff --git a/csharp/ExcelAddIn/ExcelAddIn.csproj b/csharp/ExcelAddIn/ExcelAddIn.csproj
new file mode 100644
index 00000000000..3e629260d04
--- /dev/null
+++ b/csharp/ExcelAddIn/ExcelAddIn.csproj
@@ -0,0 +1,30 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+	<PropertyGroup>
+		<TargetFramework>net8.0-windows</TargetFramework>
+		<ImplicitUsings>enable</ImplicitUsings>
+		<Nullable>enable</Nullable>
+		<UseWindowsForms>true</UseWindowsForms>
+		<AllowUnsafeBlocks>True</AllowUnsafeBlocks>
+	</PropertyGroup>
+
+	<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
+	  <TreatWarningsAsErrors>True</TreatWarningsAsErrors>
+	</PropertyGroup>
+
+	<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|AnyCPU'">
+	  <TreatWarningsAsErrors>True</TreatWarningsAsErrors>
+	</PropertyGroup>
+	<ItemGroup>
+		<PackageReference Include="ExcelDna.Addin" Version="*-*" />
+	</ItemGroup>
+	<ItemGroup>
+		<ProjectReference Include="..\client\DeephavenClient\DeephavenClient.csproj" />
+	</ItemGroup>
+
+	<PropertyGroup>
+		<ExcelDnaCreate32BitAddIn>false</ExcelDnaCreate32BitAddIn>
+		<ExcelDnaPack64BitXllName>DeephavenExcelAddIn64</ExcelDnaPack64BitXllName>
+	</PropertyGroup>
+
+</Project>
diff --git a/csharp/ExcelAddIn/ExcelAddIn.csproj.user b/csharp/ExcelAddIn/ExcelAddIn.csproj.user
new file mode 100644
index 00000000000..476df3e2650
--- /dev/null
+++ b/csharp/ExcelAddIn/ExcelAddIn.csproj.user
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="Current" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup />
+  <ItemGroup>
+    <Compile Update="views\ConnectionManagerDialog.cs">
+      <SubType>Form</SubType>
+    </Compile>
+    <Compile Update="views\CredentialsDialog.cs">
+      <SubType>Form</SubType>
+    </Compile>
+    <Compile Update="views\DeephavenMessageBox.cs">
+      <SubType>Form</SubType>
+    </Compile>
+  </ItemGroup>
+</Project>
\ No newline at end of file
diff --git a/csharp/ExcelAddIn/ExcelAddIn.sln b/csharp/ExcelAddIn/ExcelAddIn.sln
new file mode 100644
index 00000000000..1b006efe92c
--- /dev/null
+++ b/csharp/ExcelAddIn/ExcelAddIn.sln
@@ -0,0 +1,31 @@
+
+Microsoft Visual Studio Solution File, Format Version 12.00
+# Visual Studio Version 17
+VisualStudioVersion = 17.7.34221.43
+MinimumVisualStudioVersion = 10.0.40219.1
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ExcelAddIn", "ExcelAddIn.csproj", "{08852A0D-DB96-404E-B3CE-BF30F2AD3F74}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DeephavenClient", "..\client\DeephavenClient\DeephavenClient.csproj", "{6848407D-1CEF-4433-92F4-6047AE3D2C52}"
+EndProject
+Global
+	GlobalSection(SolutionConfigurationPlatforms) = preSolution
+		Debug|Any CPU = Debug|Any CPU
+		Release|Any CPU = Release|Any CPU
+	EndGlobalSection
+	GlobalSection(ProjectConfigurationPlatforms) = postSolution
+		{08852A0D-DB96-404E-B3CE-BF30F2AD3F74}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{08852A0D-DB96-404E-B3CE-BF30F2AD3F74}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{08852A0D-DB96-404E-B3CE-BF30F2AD3F74}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{08852A0D-DB96-404E-B3CE-BF30F2AD3F74}.Release|Any CPU.Build.0 = Release|Any CPU
+		{6848407D-1CEF-4433-92F4-6047AE3D2C52}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{6848407D-1CEF-4433-92F4-6047AE3D2C52}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{6848407D-1CEF-4433-92F4-6047AE3D2C52}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{6848407D-1CEF-4433-92F4-6047AE3D2C52}.Release|Any CPU.Build.0 = Release|Any CPU
+	EndGlobalSection
+	GlobalSection(SolutionProperties) = preSolution
+		HideSolutionNode = FALSE
+	EndGlobalSection
+	GlobalSection(ExtensibilityGlobals) = postSolution
+		SolutionGuid = {A22A4DB3-DD84-46EB-96A6-7935E9E59356}
+	EndGlobalSection
+EndGlobal
diff --git a/csharp/ExcelAddIn/Properties/launchSettings.json b/csharp/ExcelAddIn/Properties/launchSettings.json
new file mode 100644
index 00000000000..5a0aac58161
--- /dev/null
+++ b/csharp/ExcelAddIn/Properties/launchSettings.json
@@ -0,0 +1,9 @@
+{
+  "profiles": {
+    "Excel": {
+      "commandName": "Executable",
+      "executablePath": "C:\\Program Files\\Microsoft Office\\root\\Office16\\EXCEL.EXE",
+      "commandLineArgs": "/x \"ExcelAddIn-AddIn64.xll\""
+    }
+  }
+}
\ No newline at end of file
diff --git a/csharp/ExcelAddIn/README.md b/csharp/ExcelAddIn/README.md
new file mode 100644
index 00000000000..324d4881159
--- /dev/null
+++ b/csharp/ExcelAddIn/README.md
@@ -0,0 +1,219 @@
+# Building the Excel Add-In on Windows 10 / 11.
+
+These instructions show how to install and run the Deephaven Excel Add-In
+on Windows. These instructions also happen to build the Deephaven C# Client as a
+side-effect. However if your goal is only to build the Deephaven C# Client,
+please see the instructions at %DHSRC%\csharp\client\README.md
+(does not exist yet).
+
+We have tested these instructions on Windows 10 and 11 with Visual Studio
+Community Edition.
+
+# Before using the Excel Add-In
+
+To actually use the Deephaven Excel Add-In, you will eventually need to have
+at least one Community Core or Enterprise Core+ server running. You don't need
+the server yet, and you can successfully follow these build instructions
+without a server. However, you will eventually need a server when you want to
+run it.
+
+If you don't have a Deephaven Community Core server installation,
+you can use these instructions to build one.
+https://deephaven.io/core/docs/getting-started/launch-build/
+
+Note that it is only possible to build a server on Linux. Building a server
+on Windows is not currently supported.
+
+For Deephaven Enterprise Core+, contact your IT administrator.
+
+# Building the Excel Add-In on Windows 10 / Windows 11
+
+## Prerequisites
+
+## Build machine specifications
+
+In our experience following this instructions on a fresh Windows 11 VM
+required a total of 125G of disk space to install and build everything.
+We recommend a machine with at least 200G of free disk space in order to
+leave a comfortable margin.
+
+Also, building the dependencies with vcpkg is very resource-intensive.
+A machine that has more cores will be able to finish faster.
+We recommend at least 16 cores for the build process. Note that *running*
+the Excel Add-In does not require that many cores.
+
+## Tooling
+
+### Excel
+
+You will need a recent version of Excel installed. We recommend Office 21
+or Office 365. Note that the Add-In only works with locally-installed
+versions of Excel (i.e. software installed on your computer). It does not
+work with the browser-based web version of Excel.
+
+### .NET
+
+Install the .NET Core SDK, version 8.0.
+Look for the "Windows | x64" link
+[here](https://dotnet.microsoft.com/en-us/download/dotnet/8.0)
+
+### Visual Studio
+
+Install Visual Studio 2022 Community Edition (or Professional, or Enterprise)
+from [here](https://visualstudio.microsoft.com/downloads/)
+
+When the installer runs, select both workloads
+"Desktop development with C++" and ".NET desktop development".
+
+If Visual Studio is already installed, use Tools -> Get Tools and Features
+to add those workloads if necessary.
+
+### git
+
+Use your preferred version of git, or install Git from
+[here](https://git-scm.com/download/win)
+
+## C++ client
+
+The Deephaven Excel Add-In relies on the Deephaven C# Client, which in turn
+requires the Deephaven C++ Client (Community Core version). Furthermore, if
+you want to use Enterprise Core+ features, you also need the Deephaven C++
+Client for Enterprise Core+.
+
+The instructions below describe how to build these libraries.
+
+### Build the Deephaven C++ Client (Community Core version)
+
+Follow the instructions at [repository root]/cpp-client/README.md under the
+section, under "Building the C++ client on Windows 10 / Windows 11".
+
+When that process is done, you will have C++ client binaries in the
+directory you specified in your DHINSTALL environment variable.
+
+### (Optional) build the Deephaven C++ Client (Enterprise Core+ version)
+
+To access Enterprise features, build the Enterprise Core+ version as well.
+It will also store its binaries in the same DHINSTALL directory.
+
+(instructions TODO)
+
+## Build the Excel Add-In and C# Add-In
+
+You can build the Add-In from inside Visual Studio or from the Visual Studio
+Command Prompt.
+
+### From within Visual Studio
+
+1. Open the Visual Studio solution file
+[repository root]\csharp\ExcelAddIn\ExcelAddIn.sln
+
+2. Click on BUILD -> Build solution
+
+### From the Visual Studio Command Prompt
+
+```
+cd [repository root]\csharp\ExcelAddIn
+devenv ExcelAddIn.sln /build Release
+```
+
+## Run the Add-In
+
+### Environment variables
+
+Set these variables (or keep them set from the above steps) to the locations
+of your Deephaven source directory and your Deephaven install directory.
+
+```
+set DHSRC=%HOMEDRIVE%%HOMEPATH%\dhsrc
+set DHINSTALL=%HOMEDRIVE%%HOMEPATH%\dhinstall
+```
+
+### Running from within Visual Studio
+
+1. In order to actually function, the Add-In requires the C++ Client binaries
+   built in the above steps. The easiest thing to do is simply copy all the
+   binaries into your Visual Studio build directory:
+
+Assuming a Debug build:
+
+copy /Y %DHINSTALL%\bin %DHSRC%\csharp\ExcelAddIn\bin\Debug\net8.0-windows
+
+If you are doing a Release build, change "Debug" to "Release" in the above path.
+
+2. Inside Visual Studio Select Debug -> Start Debugging
+
+Visual Studio will launch Excel automatically. Excel will launch with a
+Security Notice because the add-in is not signed. Click "Enable this add-in
+for this session only."
+
+### From standalone Excel
+
+To install the add-in into Excel, we need put the relevant files into a
+directory and then point Excel to that directory. These steps assume you
+have already built the C# project with Visual Studio.
+
+For simplicity, we will make a folder on the Desktop called "exceladdin".
+
+```
+set ADDINDIR=%HOMEDRIVE%%HOMEPATH%\Desktop\exceladdin
+mkdir %ADDINDIR%
+```
+
+Now copy the C++ files, the C# files, and the XLL file to this directory:
+```
+copy /Y %DHINSTALL%\bin\* %ADDINDIR%
+copy /Y %DHSRC%\csharp\ExcelAddIn\bin\Debug\net8.0-windows\* %ADDINDIR%
+copy /Y %DHSRC%\csharp\ExcelAddIn\bin\Debug\net8.0-windows\publish\ExcelAddIn-Addin64-packed.xll %ADDINDIR%
+```
+
+As above, if you happen to have done a Release build in C#, then change Debug to Release in the above paths.
+
+Then, run Excel and follow the following steps.
+
+1. Click on "Options" at the lower left of the window.
+2. Click on "Add-ins" on the left, second from the bottom.
+3. At the bottom of the screen click, near "Manage", select "Excel Add-ins"
+   from the pulldown, and then click "Go..."
+4. In the next screen click "Browse..." 
+5. Navigate to your %ADDINDIR% directory and click on the ExcelAddIn-Addin64-packed.xll file that you recently copied there
+6. Click OK
+
+
+## Test the add-in
+
+### Without connecting to a Deephaven server
+
+1. In Excel, click on Add-ins -> Deephaven -> Connections. This should bring
+   up a Connections form. If so, the C# code is functioning correctly.
+
+2. In the following steps we deliberately use nonsense connection settings
+   in order to quickly trigger an error. Even thought he connection settings
+   are nonsense, getting an error quickly confirms that the functionality
+   of the C++ code is working.
+
+3. Inside Connections, click the "New Connection" button. A "Credentials
+   Editor" window will pop up. Inside this window, enter "con1" for the
+   Connection ID, select the "Community Core" button, and enter a nonsense
+   endpoint address like "abc...def"
+
+4. Press Test Credentials. You should immediately see an error like
+   "Can't get configuration constants. Error 14: DNS resolution failed for
+   abc...def"
+
+5. Enterprise users can do a similar test by selecting the Enterprise Core+
+   button and putting the same nonsense address abc...def into the JSON URL
+   field.
+   
+### By connecting to a Deephaven server
+
+If the above tests pass, the add-in is probably installed correctly.
+
+To test the add-in with a Deephaven server, you will need the following
+information.
+
+1. For Community Core, you will need a Connection string in the form of
+   address:port. For example, 10.0.1.50:10000
+
+2. For Enterprise Core+, you will need a JSON URL that references your
+   Core+ installation. For example 
+   https://10.0.1.50:8123/iris/connection.json
diff --git a/csharp/ExcelAddIn/StateManager.cs b/csharp/ExcelAddIn/StateManager.cs
new file mode 100644
index 00000000000..9faa64a24ae
--- /dev/null
+++ b/csharp/ExcelAddIn/StateManager.cs
@@ -0,0 +1,178 @@
+using System.Diagnostics;
+using System.Net;
+using Deephaven.DeephavenClient;
+using Deephaven.ExcelAddIn.Models;
+using Deephaven.ExcelAddIn.Providers;
+using Deephaven.ExcelAddIn.Util;
+
+namespace Deephaven.ExcelAddIn;
+
+public class StateManager {
+  public readonly WorkerThread WorkerThread = WorkerThread.Create();
+  private readonly Dictionary<EndpointId, CredentialsProvider> _credentialsProviders = new();
+  private readonly Dictionary<EndpointId, SessionProvider> _sessionProviders = new();
+  private readonly Dictionary<PersistentQueryKey, PersistentQueryProvider> _persistentQueryProviders = new();
+  private readonly Dictionary<TableQuad, ITableProvider> _tableProviders = new();
+  private readonly ObserverContainer<AddOrRemove<EndpointId>> _credentialsPopulationObservers = new();
+  private readonly ObserverContainer<EndpointId?> _defaultEndpointSelectionObservers = new();
+
+  private EndpointId? _defaultEndpointId = null;
+
+  public IDisposable SubscribeToCredentialsPopulation(IObserver<AddOrRemove<EndpointId>> observer) {
+    WorkerThread.EnqueueOrRun(() => {
+      _credentialsPopulationObservers.Add(observer, out _);
+
+      // Give this observer the current set of endpoint ids.
+      var keys = _credentialsProviders.Keys.ToArray();
+      foreach (var endpointId in keys) {
+        observer.OnNext(AddOrRemove<EndpointId>.OfAdd(endpointId));
+      }
+    });
+
+    return WorkerThread.EnqueueOrRunWhenDisposed(
+      () => _credentialsPopulationObservers.Remove(observer, out _));
+  }
+
+  public IDisposable SubscribeToDefaultEndpointSelection(IObserver<EndpointId?> observer) {
+    WorkerThread.EnqueueOrRun(() => {
+      _defaultEndpointSelectionObservers.Add(observer, out _);
+      observer.OnNext(_defaultEndpointId);
+    });
+
+    return WorkerThread.EnqueueOrRunWhenDisposed(
+      () => _defaultEndpointSelectionObservers.Remove(observer, out _));
+  }
+
+  /// <summary>
+  /// The major difference between the credentials providers and the other providers
+  /// is that the credential providers don't remove themselves from the map
+  /// upon the last dispose of the subscriber. That is, they hang around until we
+  /// manually remove them.
+  /// </summary>
+  public IDisposable SubscribeToCredentials(EndpointId endpointId,
+    IObserver<StatusOr<CredentialsBase>> observer) {
+    IDisposable? disposer = null;
+    LookupOrCreateCredentialsProvider(endpointId,
+      cp => disposer = cp.Subscribe(observer));
+
+    return WorkerThread.EnqueueOrRunWhenDisposed(() =>
+      Utility.Exchange(ref disposer, null)?.Dispose());
+  }
+
+  public void SetCredentials(CredentialsBase credentials) {
+    LookupOrCreateCredentialsProvider(credentials.Id,
+      cp => cp.SetCredentials(credentials));
+  }
+
+  public void Reconnect(EndpointId id) {
+    // Quick-and-dirty trick for reconnect is to re-send the credentials to the observers.
+    LookupOrCreateCredentialsProvider(id, cp => cp.Resend());
+  }
+
+  public void TryDeleteCredentials(EndpointId id, Action onSuccess, Action<string> onFailure) {
+    if (WorkerThread.EnqueueOrNop(() => TryDeleteCredentials(id, onSuccess, onFailure))) {
+      return;
+    }
+
+    if (!_credentialsProviders.TryGetValue(id, out var cp)) {
+      onFailure($"{id} unknown");
+      return;
+    }
+
+    if (cp.ObserverCountUnsafe != 0) {
+      onFailure($"{id} is still active");
+      return;
+    }
+
+    if (id.Equals(_defaultEndpointId)) {
+      SetDefaultEndpointId(null);
+    }
+
+    _credentialsProviders.Remove(id);
+    _credentialsPopulationObservers.OnNext(AddOrRemove<EndpointId>.OfRemove(id));
+    onSuccess();
+  }
+
+  private void LookupOrCreateCredentialsProvider(EndpointId endpointId,
+    Action<CredentialsProvider> action) {
+    if (WorkerThread.EnqueueOrNop(() => LookupOrCreateCredentialsProvider(endpointId, action))) {
+      return;
+    }
+    if (!_credentialsProviders.TryGetValue(endpointId, out var cp)) {
+      cp = new CredentialsProvider(this);
+      _credentialsProviders.Add(endpointId, cp);
+      cp.Init();
+      _credentialsPopulationObservers.OnNext(AddOrRemove<EndpointId>.OfAdd(endpointId));
+    }
+
+    action(cp);
+  }
+
+  public IDisposable SubscribeToSession(EndpointId endpointId,
+    IObserver<StatusOr<SessionBase>> observer) {
+    IDisposable? disposer = null;
+    WorkerThread.EnqueueOrRun(() => {
+      if (!_sessionProviders.TryGetValue(endpointId, out var sp)) {
+        sp = new SessionProvider(this, endpointId, () => _sessionProviders.Remove(endpointId));
+        _sessionProviders.Add(endpointId, sp);
+        sp.Init();
+      }
+      disposer = sp.Subscribe(observer);
+    });
+
+    return WorkerThread.EnqueueOrRunWhenDisposed(() =>
+      Utility.Exchange(ref disposer, null)?.Dispose());
+  }
+
+  public IDisposable SubscribeToPersistentQuery(EndpointId endpointId, PersistentQueryId? pqId,
+    IObserver<StatusOr<Client>> observer) {
+
+    IDisposable? disposer = null;
+    WorkerThread.EnqueueOrRun(() => {
+      var key = new PersistentQueryKey(endpointId, pqId);
+      if (!_persistentQueryProviders.TryGetValue(key, out var pqp)) {
+        pqp = new PersistentQueryProvider(this, endpointId, pqId,
+          () => _persistentQueryProviders.Remove(key));
+        _persistentQueryProviders.Add(key, pqp);
+        pqp.Init();
+      }
+      disposer = pqp.Subscribe(observer);
+    });
+
+    return WorkerThread.EnqueueOrRunWhenDisposed(
+      () => Utility.Exchange(ref disposer, null)?.Dispose());
+  }
+
+  public IDisposable SubscribeToTable(TableQuad key, IObserver<StatusOr<TableHandle>> observer) {
+    IDisposable? disposer = null;
+    WorkerThread.EnqueueOrRun(() => {
+      if (!_tableProviders.TryGetValue(key, out var tp)) {
+        Action onDispose = () => _tableProviders.Remove(key);
+        if (key.EndpointId == null) {
+          tp = new DefaultEndpointTableProvider(this, key.PersistentQueryId, key.TableName, key.Condition,
+            onDispose);
+        } else if (key.Condition.Length != 0) {
+          tp = new FilteredTableProvider(this, key.EndpointId, key.PersistentQueryId, key.TableName,
+            key.Condition, onDispose);
+        } else {
+          tp = new TableProvider(this, key.EndpointId, key.PersistentQueryId, key.TableName, onDispose);
+        }
+        _tableProviders.Add(key, tp);
+        tp.Init();
+      }
+      disposer = tp.Subscribe(observer);
+    });
+
+    return WorkerThread.EnqueueOrRunWhenDisposed(
+      () => Utility.Exchange(ref disposer, null)?.Dispose());
+  }
+  
+  public void SetDefaultEndpointId(EndpointId? defaultEndpointId) {
+    if (WorkerThread.EnqueueOrNop(() => SetDefaultEndpointId(defaultEndpointId))) {
+      return;
+    }
+
+    _defaultEndpointId = defaultEndpointId;
+    _defaultEndpointSelectionObservers.OnNext(_defaultEndpointId);
+  }
+}
diff --git a/csharp/ExcelAddIn/exceldna/ExcelDnaHelpers.cs b/csharp/ExcelAddIn/exceldna/ExcelDnaHelpers.cs
new file mode 100644
index 00000000000..4ceb44805a3
--- /dev/null
+++ b/csharp/ExcelAddIn/exceldna/ExcelDnaHelpers.cs
@@ -0,0 +1,42 @@
+using Deephaven.ExcelAddIn.Util;
+using ExcelDna.Integration;
+
+namespace Deephaven.ExcelAddIn.ExcelDna;
+
+internal class ExcelDnaHelpers {
+  public static bool TryInterpretAs<T>(object value, T defaultValue, out T result) {
+    result = defaultValue;
+    if (value is ExcelMissing) {
+      return true;
+    }
+
+    if (value is T tValue) {
+      result = tValue;
+      return true;
+    }
+
+    return false;
+  }
+
+  public static IObserver<StatusOr<object?[,]>> WrapExcelObserver(IExcelObserver inner) {
+    return new ExcelObserverWrapper(inner);
+  }
+
+  private class ExcelObserverWrapper(IExcelObserver inner) : IObserver<StatusOr<object?[,]>> {
+    public void OnNext(StatusOr<object?[,]> sov) {
+      if (!sov.GetValueOrStatus(out var value, out var status)) {
+        // Reformat the status text as an object[,] 2D array so Excel renders it as 1x1 "table".
+        value = new object[,] { { status } };
+      }
+      inner.OnNext(value);
+    }
+
+    public void OnCompleted() {
+      inner.OnCompleted();
+    }
+
+    public void OnError(Exception error) {
+      inner.OnError(error);
+    }
+  }
+}
diff --git a/csharp/ExcelAddIn/factories/ConnectionManagerDialogFactory.cs b/csharp/ExcelAddIn/factories/ConnectionManagerDialogFactory.cs
new file mode 100644
index 00000000000..72441c93323
--- /dev/null
+++ b/csharp/ExcelAddIn/factories/ConnectionManagerDialogFactory.cs
@@ -0,0 +1,17 @@
+using Deephaven.ExcelAddIn.Managers;
+using Deephaven.ExcelAddIn.Util;
+using Deephaven.ExcelAddIn.Views;
+
+namespace Deephaven.ExcelAddIn.Factories;
+
+internal static class ConnectionManagerDialogFactory {
+  public static void CreateAndShow(StateManager stateManager) {
+    Utility.RunInBackground(() => {
+      var cmDialog = new ConnectionManagerDialog();
+      var dm = ConnectionManagerDialogManager.Create(stateManager, cmDialog);
+      cmDialog.Closed += (_, _) => dm.Dispose();
+      // Blocks forever (in this private thread)
+      cmDialog.ShowDialog(); 
+    });
+  }
+}
diff --git a/csharp/ExcelAddIn/factories/CredentialsDialogFactory.cs b/csharp/ExcelAddIn/factories/CredentialsDialogFactory.cs
new file mode 100644
index 00000000000..4c1e2694be7
--- /dev/null
+++ b/csharp/ExcelAddIn/factories/CredentialsDialogFactory.cs
@@ -0,0 +1,138 @@
+using Deephaven.ExcelAddIn.Models;
+using Deephaven.ExcelAddIn.Util;
+using Deephaven.ExcelAddIn.ViewModels;
+using ExcelAddIn.views;
+using static System.Windows.Forms.AxHost;
+
+namespace Deephaven.ExcelAddIn.Factories;
+
+internal static class CredentialsDialogFactory {
+  public static void CreateAndShow(StateManager stateManager, CredentialsDialogViewModel cvm,
+    EndpointId? whitelistId) {
+    Utility.RunInBackground(() => {
+      var cd = new CredentialsDialog(cvm);
+      var state = new CredentialsDialogState(stateManager, cd, cvm, whitelistId);
+
+
+      cd.OnSetCredentialsButtonClicked += state.OnSetCredentials;
+      cd.OnTestCredentialsButtonClicked += state.OnTestCredentials;
+
+      cd.Closed += (_, _) => state.Dispose();
+      // Blocks forever (in this private thread)
+      cd.ShowDialog();
+    });
+  }
+}
+
+internal class CredentialsDialogState : IObserver<AddOrRemove<EndpointId>>, IDisposable {
+  private readonly StateManager _stateManager;
+  private readonly CredentialsDialog _credentialsDialog;
+  private readonly CredentialsDialogViewModel _cvm;
+  private readonly EndpointId? _whitelistId;
+  private IDisposable? _disposer;
+  private readonly object _sync = new();
+  private readonly HashSet<EndpointId> _knownIds = new();
+  private readonly VersionTracker _versionTracker = new();
+
+  public CredentialsDialogState(
+    StateManager stateManager,
+    CredentialsDialog credentialsDialog,
+    CredentialsDialogViewModel cvm,
+    EndpointId? whitelistId) {
+    _stateManager = stateManager;
+    _credentialsDialog = credentialsDialog;
+    _cvm = cvm;
+    _whitelistId = whitelistId;
+    _disposer = stateManager.SubscribeToCredentialsPopulation(this);
+  }
+
+  public void Dispose() {
+    Utility.Exchange(ref _disposer, null)?.Dispose();
+  }
+
+  public void OnCompleted() {
+    throw new NotImplementedException();
+  }
+
+  public void OnError(Exception error) {
+    throw new NotImplementedException();
+  }
+
+  public void OnNext(AddOrRemove<EndpointId> value) {
+    lock (_sync) {
+      if (value.IsAdd) {
+        _knownIds.Add(value.Value);
+      } else {
+        _knownIds.Remove(value.Value);
+      }
+    }
+  }
+
+  public void OnSetCredentials() {
+    if (!_cvm.TryMakeCredentials(out var newCreds, out var error)) {
+      ShowMessageBox(error);
+      return;
+    }
+
+    bool isKnown;
+    lock (_sync) {
+      isKnown = _knownIds.Contains(newCreds.Id);
+    }
+
+    if (isKnown && !newCreds.Id.Equals(_whitelistId)) {
+      const string caption = "Modify existing connection?";
+      var text = $"Are you sure you want to modify connection \"{newCreds.Id}\"";
+      var dhm = new DeephavenMessageBox(caption, text, true);
+      var dialogResult = dhm.ShowDialog(_credentialsDialog);
+      if (dialogResult != DialogResult.OK) {
+        return;
+      }
+    }
+
+    _stateManager.SetCredentials(newCreds);
+    if (_cvm.IsDefault) {
+      _stateManager.SetDefaultEndpointId(newCreds.Id);
+    }
+
+    _credentialsDialog!.Close();
+  }
+
+  public void OnTestCredentials() {
+    if (!_cvm.TryMakeCredentials(out var newCreds, out var error)) {
+      ShowMessageBox(error);
+      return;
+    }
+
+    _credentialsDialog!.SetTestResultsBox("Checking credentials");
+    // Check credentials on its own thread
+    Utility.RunInBackground(() => TestCredentialsThreadFunc(newCreds));
+  }
+
+  private void TestCredentialsThreadFunc(CredentialsBase creds) {
+    var latestCookie = _versionTracker.SetNewVersion();
+
+    var state = "OK";
+    try {
+      // This operation might take some time.
+      var temp = SessionBaseFactory.Create(creds, _stateManager.WorkerThread);
+      temp.Dispose();
+    } catch (Exception ex) {
+      state = ex.Message;
+    }
+
+    if (!latestCookie.IsCurrent) {
+      // Our results are moot. Dispose of them.
+      return;
+    }
+
+    // Our results are valid. Keep them and tell everyone about it.
+    _credentialsDialog!.SetTestResultsBox(state);
+  }
+
+  private void ShowMessageBox(string error) {
+    _credentialsDialog.Invoke(() => {
+      var dhm = new DeephavenMessageBox("Please provide missing fields", error, false);
+      dhm.ShowDialog(_credentialsDialog);
+    });
+  }
+}
diff --git a/csharp/ExcelAddIn/factories/SessionBaseFactory.cs b/csharp/ExcelAddIn/factories/SessionBaseFactory.cs
new file mode 100644
index 00000000000..44886d6a16d
--- /dev/null
+++ b/csharp/ExcelAddIn/factories/SessionBaseFactory.cs
@@ -0,0 +1,34 @@
+using Deephaven.DeephavenClient;
+using Deephaven.DheClient.Session;
+using Deephaven.ExcelAddIn.Models;
+using Deephaven.ExcelAddIn.Util;
+
+namespace Deephaven.ExcelAddIn.Factories;
+
+internal static class SessionBaseFactory {
+  public static SessionBase Create(CredentialsBase credentials, WorkerThread workerThread) {
+    return credentials.AcceptVisitor<SessionBase>(
+      core => {
+        var options = new ClientOptions();
+        options.SetSessionType(core.SessionTypeIsPython ? "python" : "groovy");
+        var client = Client.Connect(core.ConnectionString, options);
+        return new CoreSession(client);
+      },
+
+      corePlus => {
+        var handler = new HttpClientHandler();
+        if (!corePlus.ValidateCertificate) {
+          handler.ClientCertificateOptions = ClientCertificateOption.Manual;
+          handler.ServerCertificateCustomValidationCallback = (_, _, _, _) => true;
+        }
+        var hc = new HttpClient(handler);
+        var json = hc.GetStringAsync(corePlus.JsonUrl).Result;
+        var session = SessionManager.FromJson("Deephaven Excel", json);
+        if (!session.PasswordAuthentication(corePlus.User, corePlus.Password, corePlus.OperateAs)) {
+          throw new Exception("Authentication failed");
+        }
+
+        return new CorePlusSession(session, workerThread);
+      });
+  }
+}
diff --git a/csharp/ExcelAddIn/managers/ConnectionManagerDialogManager.cs b/csharp/ExcelAddIn/managers/ConnectionManagerDialogManager.cs
new file mode 100644
index 00000000000..5ebcbc958f6
--- /dev/null
+++ b/csharp/ExcelAddIn/managers/ConnectionManagerDialogManager.cs
@@ -0,0 +1,197 @@
+using System.Collections.Concurrent;
+using Deephaven.ExcelAddIn.Models;
+using Deephaven.ExcelAddIn.Viewmodels;
+using Deephaven.ExcelAddIn.Views;
+using Deephaven.ExcelAddIn.Util;
+using Deephaven.ExcelAddIn.Factories;
+using Deephaven.ExcelAddIn.ViewModels;
+using ExcelAddIn.views;
+
+namespace Deephaven.ExcelAddIn.Managers;
+
+internal class ConnectionManagerDialogManager : IObserver<AddOrRemove<EndpointId>>, IDisposable {
+  //
+  // ConnectionManagerDialog cmDialog,
+  // ConcurrentDictionary<ConnectionManagerDialogRow, ConnectionManagerDialogRowManager> rowToManager,
+  // StateManager stateManager) 
+  public static ConnectionManagerDialogManager Create(StateManager stateManager,
+    ConnectionManagerDialog cmDialog) {
+    var result = new ConnectionManagerDialogManager(stateManager, cmDialog);
+    cmDialog.OnNewButtonClicked += result.OnNewButtonClicked;
+    cmDialog.OnDeleteButtonClicked += result.OnDeleteButtonClicked;
+    cmDialog.OnReconnectButtonClicked += result.OnReconnectButtonClicked;
+    cmDialog.OnMakeDefaultButtonClicked += result.OnMakeDefaultButtonClicked;
+    cmDialog.OnEditButtonClicked += result.OnEditButtonClicked;
+
+    var disp = stateManager.SubscribeToCredentialsPopulation(result);
+    result._disposables.Add(disp);
+    return result;
+  }
+
+  private readonly StateManager _stateManager;
+  private readonly WorkerThread _workerThread;
+  private readonly ConnectionManagerDialog _cmDialog;
+  private readonly Dictionary<EndpointId, ConnectionManagerDialogRow> _idToRow = new();
+  private readonly Dictionary<ConnectionManagerDialogRow, ConnectionManagerDialogRowManager> _rowToManager = new();
+  private readonly List<IDisposable> _disposables = new();
+
+  public ConnectionManagerDialogManager(StateManager stateManager, ConnectionManagerDialog cmDialog) {
+    _stateManager = stateManager;
+    _workerThread = stateManager.WorkerThread;
+    _cmDialog = cmDialog;
+  }
+
+  public void OnNext(AddOrRemove<EndpointId> aor) {
+    if (_workerThread.EnqueueOrNop(() => OnNext(aor))) {
+      return;
+    }
+
+    if (aor.IsAdd) {
+      var endpointId = aor.Value;
+      var row = new ConnectionManagerDialogRow(endpointId.Id);
+      var statusRowManager = ConnectionManagerDialogRowManager.Create(row, endpointId, _stateManager);
+      _rowToManager.Add(row, statusRowManager);
+      _idToRow.Add(endpointId, row);
+      _disposables.Add(statusRowManager);
+
+      _cmDialog.AddRow(row);
+      return;
+    }
+
+    // Remove!
+    if (!_idToRow.Remove(aor.Value, out var rowToDelete) ||
+        !_rowToManager.Remove(rowToDelete, out var rowManager)) {
+      return;
+    }
+
+    _cmDialog.RemoveRow(rowToDelete);
+    rowManager.Dispose();
+  }
+
+  public void Dispose() {
+    if (_workerThread.EnqueueOrNop(Dispose)) {
+      return;
+    }
+
+    var temp = _disposables.ToArray();
+    _disposables.Clear();
+    foreach (var disposable in temp) {
+      disposable.Dispose();
+    }
+  }
+
+  public void OnCompleted() {
+    // TODO(kosak)
+    throw new NotImplementedException();
+  }
+
+  public void OnError(Exception error) {
+    // TODO(kosak)
+    throw new NotImplementedException();
+  }
+
+  void OnNewButtonClicked() {
+    var cvm = CredentialsDialogViewModel.OfEmpty();
+    CredentialsDialogFactory.CreateAndShow(_stateManager, cvm, null);
+  }
+
+  private class FailureCollector {
+    private readonly ConnectionManagerDialog _cmDialog;
+    private readonly object _sync = new();
+    private int _rowsLeft = 0;
+    private readonly List<string> _failures = new();
+
+    public FailureCollector(ConnectionManagerDialog cmDialog, int rowsLeft) {
+      _cmDialog = cmDialog;
+      _rowsLeft = rowsLeft;
+    }
+
+    public void OnFailure(EndpointId id, string reason) {
+      lock (_sync) {
+        _failures.Add(reason);
+      }
+
+      FinalSteps();
+    }
+
+    public void OnSuccess(EndpointId id) {
+      FinalSteps();
+    }
+
+    private void FinalSteps() {
+      string text;
+      lock (_sync) {
+        --_rowsLeft;
+        if (_rowsLeft > 0 || _failures.Count == 0) {
+          return;
+        }
+
+        text = string.Join(Environment.NewLine, _failures);
+      }
+
+      const string caption = "Couldn't delete some selections";
+      _cmDialog.Invoke(() => {
+        var mbox = new DeephavenMessageBox(caption, text, false);
+        mbox.ShowDialog(_cmDialog);
+      });
+    }
+  }
+
+  void OnDeleteButtonClicked(ConnectionManagerDialogRow[] rows) {
+    if (_workerThread.EnqueueOrNop(() => OnDeleteButtonClicked(rows))) {
+      return;
+    }
+
+    var fc = new FailureCollector(_cmDialog, rows.Length);
+    foreach (var row in rows) {
+      if (!_rowToManager.TryGetValue(row, out var manager)) {
+        continue;
+      }
+      manager.DoDelete(fc.OnSuccess, fc.OnFailure);
+    }
+  }
+
+  void OnReconnectButtonClicked(ConnectionManagerDialogRow[] rows) {
+    if (_workerThread.EnqueueOrNop(() => OnReconnectButtonClicked(rows))) {
+      return;
+    }
+
+    foreach (var row in rows) {
+      if (!_rowToManager.TryGetValue(row, out var manager)) {
+        continue;
+      }
+      manager.DoReconnect();
+    }
+  }
+
+  void OnMakeDefaultButtonClicked(ConnectionManagerDialogRow[] rows) {
+    if (_workerThread.EnqueueOrNop(() => OnMakeDefaultButtonClicked(rows))) {
+      return;
+    }
+
+    // Make the last selected row the default
+    if (rows.Length == 0) {
+      return;
+    }
+
+    var row = rows[^1];
+    if (!_rowToManager.TryGetValue(row, out var manager)) {
+      return;
+    }
+
+    manager.DoSetAsDefault();
+  }
+
+  void OnEditButtonClicked(ConnectionManagerDialogRow[] rows) {
+    if (_workerThread.EnqueueOrNop(() => OnEditButtonClicked(rows))) {
+      return;
+    }
+
+    foreach (var row in rows) {
+      if (!_rowToManager.TryGetValue(row, out var manager)) {
+        continue;
+      }
+      manager.DoEdit();
+    }
+  }
+}
diff --git a/csharp/ExcelAddIn/managers/ConnectionManagerDialogRowManager.cs b/csharp/ExcelAddIn/managers/ConnectionManagerDialogRowManager.cs
new file mode 100644
index 00000000000..1b98da60e65
--- /dev/null
+++ b/csharp/ExcelAddIn/managers/ConnectionManagerDialogRowManager.cs
@@ -0,0 +1,132 @@
+using Deephaven.ExcelAddIn.Factories;
+using Deephaven.ExcelAddIn.Models;
+using Deephaven.ExcelAddIn.Util;
+using Deephaven.ExcelAddIn.Viewmodels;
+using Deephaven.ExcelAddIn.ViewModels;
+
+namespace Deephaven.ExcelAddIn.Managers;
+
+public sealed class ConnectionManagerDialogRowManager :
+  IObserver<StatusOr<CredentialsBase>>,
+  IObserver<StatusOr<SessionBase>>,
+  IObserver<EndpointId?>,
+  IDisposable {
+
+  public static ConnectionManagerDialogRowManager Create(ConnectionManagerDialogRow row,
+    EndpointId endpointId, StateManager stateManager) {
+    var result = new ConnectionManagerDialogRowManager(row, endpointId, stateManager);
+    result.Resubscribe();
+    return result;
+  }
+
+  private readonly ConnectionManagerDialogRow _row;
+  private readonly EndpointId _endpointId;
+  private readonly StateManager _stateManager;
+  private readonly WorkerThread _workerThread;
+  private readonly List<IDisposable> _disposables = new();
+
+  private ConnectionManagerDialogRowManager(ConnectionManagerDialogRow row, EndpointId endpointId,
+    StateManager stateManager) {
+    _row = row;
+    _endpointId = endpointId;
+    _stateManager = stateManager;
+    _workerThread = stateManager.WorkerThread;
+  }
+
+  public void Dispose() {
+    Unsubscribe();
+  }
+
+  private void Resubscribe() {
+    if (_workerThread.EnqueueOrNop(Resubscribe)) {
+      return;
+    }
+
+    if (_disposables.Count != 0) {
+      throw new Exception("State error: already subscribed");
+    }
+    // We watch for session and credential state changes in our ID
+    var d1 = _stateManager.SubscribeToSession(_endpointId, this);
+    var d2 = _stateManager.SubscribeToCredentials(_endpointId, this);
+    var d3 = _stateManager.SubscribeToDefaultEndpointSelection(this);
+    _disposables.AddRange(new[] { d1, d2, d3 });
+  }
+
+  private void Unsubscribe() {
+    if (_workerThread.EnqueueOrNop(Unsubscribe)) {
+      return;
+    }
+    var temp = _disposables.ToArray();
+    _disposables.Clear();
+
+    foreach (var disposable in temp) {
+      disposable.Dispose();
+    }
+  }
+
+  public void OnNext(StatusOr<CredentialsBase> value) {
+    _row.SetCredentialsSynced(value);
+  }
+
+  public void OnNext(StatusOr<SessionBase> value) {
+    _row.SetSessionSynced(value);
+  }
+
+  public void OnNext(EndpointId? value) {
+    _row.SetDefaultEndpointIdSynced(value);
+  }
+
+  public void DoEdit() {
+    var creds = _row.GetCredentialsSynced();
+    // If we have valid credentials, then make a populated viewmodel.
+    // If we don't, then make an empty viewmodel with only Id populated.
+    var cvm = creds.AcceptVisitor(
+      crs => CredentialsDialogViewModel.OfIdAndCredentials(_endpointId.Id, crs),
+      _ => CredentialsDialogViewModel.OfIdButOtherwiseEmpty(_endpointId.Id));
+    CredentialsDialogFactory.CreateAndShow(_stateManager, cvm, _endpointId);
+  }
+
+  public void DoDelete(Action<EndpointId> onSuccess, Action<EndpointId, string> onFailure) {
+    if (_workerThread.EnqueueOrNop(() => DoDelete(onSuccess, onFailure))) {
+      return;
+    }
+
+    // Strategy:
+    // 1. Unsubscribe to everything
+    // 2. If it turns out that we were the last subscriber to the credentials, then great, the
+    //    delete can proceed.
+    // 3. If the credentials we are deleting are the default credentials, then unset default credentials
+    // 4. Otherwise (there is some other subscriber to the credentials), then the delete operation
+    //    should be denied. In that case we restore our state by resubscribing to everything.
+    Unsubscribe();
+    _stateManager.TryDeleteCredentials(_endpointId,
+      () => onSuccess(_endpointId),
+      reason => {
+        Resubscribe();
+        onFailure(_endpointId, reason);
+      });
+  }
+
+  public void DoReconnect() {
+    _stateManager.Reconnect(_endpointId);
+  }
+
+  public void DoSetAsDefault() {
+    // If the connection is already the default, do nothing.
+    if (_row.IsDefault) {
+      return;
+    }
+
+    _stateManager.SetDefaultEndpointId(_endpointId);
+  }
+
+  public void OnCompleted() {
+    // TODO(kosak)
+    throw new NotImplementedException();
+  }
+
+  public void OnError(Exception error) {
+    // TODO(kosak)
+    throw new NotImplementedException();
+  }
+}
diff --git a/csharp/ExcelAddIn/models/Credentials.cs b/csharp/ExcelAddIn/models/Credentials.cs
new file mode 100644
index 00000000000..0a2ffdc6b60
--- /dev/null
+++ b/csharp/ExcelAddIn/models/Credentials.cs
@@ -0,0 +1,42 @@
+namespace Deephaven.ExcelAddIn.Models;
+
+public abstract class CredentialsBase(EndpointId id) {
+  public readonly EndpointId Id = id;
+
+  public static CredentialsBase OfCore(EndpointId id, string connectionString, bool sessionTypeIsPython) {
+    return new CoreCredentials(id, connectionString, sessionTypeIsPython);
+  }
+
+  public static CredentialsBase OfCorePlus(EndpointId id, string jsonUrl, string userId,
+    string password, string operateAs, bool validateCertificate) {
+    return new CorePlusCredentials(id, jsonUrl, userId, password, operateAs, validateCertificate);
+  }
+
+  public abstract T AcceptVisitor<T>(Func<CoreCredentials, T> ofCore,
+    Func<CorePlusCredentials, T> ofCorePlus);
+}
+
+public sealed class CoreCredentials(
+  EndpointId id,
+  string connectionString,
+  bool sessionTypeIsPython) : CredentialsBase(id) {
+  public readonly string ConnectionString = connectionString;
+  public readonly bool SessionTypeIsPython = sessionTypeIsPython;
+
+  public override T AcceptVisitor<T>(Func<CoreCredentials, T> ofCore, Func<CorePlusCredentials, T> ofCorePlus) {
+    return ofCore(this);
+  }
+}
+
+public sealed class CorePlusCredentials(EndpointId id, string jsonUrl, string user, string password,
+  string operateAs, bool validateCertificate) : CredentialsBase(id) {
+  public readonly string JsonUrl = jsonUrl;
+  public readonly string User = user;
+  public readonly string Password = password;
+  public readonly string OperateAs = operateAs;
+  public readonly bool ValidateCertificate = validateCertificate;
+
+  public override T AcceptVisitor<T>(Func<CoreCredentials, T> ofCore, Func<CorePlusCredentials, T> ofCorePlus) {
+    return ofCorePlus(this);
+  }
+}
diff --git a/csharp/ExcelAddIn/models/Session.cs b/csharp/ExcelAddIn/models/Session.cs
new file mode 100644
index 00000000000..5f3d34eb02a
--- /dev/null
+++ b/csharp/ExcelAddIn/models/Session.cs
@@ -0,0 +1,79 @@
+using Deephaven.DeephavenClient;
+using Deephaven.DheClient.Session;
+using Deephaven.ExcelAddIn.Util;
+
+namespace Deephaven.ExcelAddIn.Models;
+
+/// <summary>
+/// A "Session" is an abstraction meant to represent a Core or Core+ "session".
+/// For Core, this means having a valid Client.
+/// For Core+, this means having a SessionManager, through which you can subscribe to PQs and get Clients.
+/// </summary>
+public abstract class SessionBase : IDisposable {
+  /// <summary>
+  /// This is meant to act like a Visitor pattern with lambdas.
+  /// </summary>
+  public abstract T Visit<T>(Func<CoreSession, T> onCore, Func<CorePlusSession, T> onCorePlus);
+
+  public abstract void Dispose();
+}
+
+public sealed class CoreSession(Client client) : SessionBase {
+  private Client? _client = client;
+
+  public override T Visit<T>(Func<CoreSession, T> onCore, Func<CorePlusSession, T> onCorePlus) {
+    return onCore(this);
+  }
+
+  public override void Dispose() {
+    var temp = Utility.Exchange(ref _client, null);
+    if (temp == null) {
+      return;
+    }
+
+    // Do the actual dispose work on a helper thread.
+    Utility.RunInBackground(temp.Dispose);
+  }
+
+  public Client Client {
+    get {
+      if (_client == null) {
+        throw new Exception("Object is disposed");
+      }
+
+      return _client;
+    }
+  }
+}
+
+public sealed class CorePlusSession(SessionManager sessionManager, WorkerThread workerThread) : SessionBase {
+  private SessionManager? _sessionManager = sessionManager;
+
+  public override T Visit<T>(Func<CoreSession, T> onCore, Func<CorePlusSession, T> onCorePlus) {
+    return onCorePlus(this);
+  }
+
+  public override void Dispose() {
+    if (workerThread.EnqueueOrNop(Dispose)) {
+      return;
+    }
+
+    var temp = Utility.Exchange(ref _sessionManager, null);
+    if (temp == null) {
+      return;
+    }
+
+    // Do the actual dispose work on a helper thread.
+    Utility.RunInBackground(temp.Dispose);
+  }
+
+  public SessionManager SessionManager {
+    get {
+      if (_sessionManager == null) {
+        throw new Exception("Object is disposed");
+      }
+
+      return _sessionManager;
+    }
+  }
+}
diff --git a/csharp/ExcelAddIn/models/SimpleModels.cs b/csharp/ExcelAddIn/models/SimpleModels.cs
new file mode 100644
index 00000000000..4593e58fef9
--- /dev/null
+++ b/csharp/ExcelAddIn/models/SimpleModels.cs
@@ -0,0 +1,17 @@
+namespace Deephaven.ExcelAddIn.Models;
+
+public record AddOrRemove<T>(bool IsAdd, T Value) {
+  public static AddOrRemove<T> OfAdd(T value) {
+    return new AddOrRemove<T>(true, value);
+  }
+
+  public static AddOrRemove<T> OfRemove(T value) {
+    return new AddOrRemove<T>(false, value);
+  }
+}
+
+public record EndpointId(string Id) {
+  public override string ToString() => Id;
+}
+
+public record PersistentQueryId(string Id);
diff --git a/csharp/ExcelAddIn/models/TableTriple.cs b/csharp/ExcelAddIn/models/TableTriple.cs
new file mode 100644
index 00000000000..89a298dd350
--- /dev/null
+++ b/csharp/ExcelAddIn/models/TableTriple.cs
@@ -0,0 +1,49 @@
+namespace Deephaven.ExcelAddIn.Models;
+
+public record PersistentQueryKey(
+  EndpointId EndpointId,
+  PersistentQueryId? PersistentQueryId) {
+}
+
+public record TableTriple(
+  EndpointId? EndpointId,
+  PersistentQueryId? PersistentQueryId,
+  string TableName) {
+
+  public static bool TryParse(string text, out TableTriple result, out string errorText) {
+    // Accepts strings of the following form
+    // 1. "table" (becomes null, null, "table")
+    // 2. "endpoint:table" (becomes endpoint, null, table)
+    // 3. "pq/table" (becomes null, pq, table)
+    // 4. "endpoint:pq/table" (becomes endpoint, pq, table)
+    EndpointId? epId = null;
+    PersistentQueryId? pqid = null;
+    var tableName = "";
+    var colonIndex = text.IndexOf(':');
+    if (colonIndex > 0) {
+      // cases 2 and 4: pull out the endpointId, and then reduce to cases 1 and 3
+      epId = new EndpointId(text[..colonIndex]);
+      text = text[(colonIndex + 1)..];
+    }
+
+    var slashIndex = text.IndexOf('/');
+    if (slashIndex > 0) {
+      // case 3: pull out the slash, and reduce to case 1
+      pqid = new PersistentQueryId(text[..slashIndex]);
+      text = text[(slashIndex + 1)..];
+    }
+
+    tableName = text;
+    result = new TableTriple(epId, pqid, tableName);
+    errorText = "";
+    // This version never fails to parse, but we leave open the option in our API to do so.
+    return true;
+  }
+}
+
+public record TableQuad(
+  EndpointId? EndpointId,
+  PersistentQueryId? PersistentQueryId,
+  string TableName,
+  string Condition) {
+}
diff --git a/csharp/ExcelAddIn/operations/SnapshotOperation.cs b/csharp/ExcelAddIn/operations/SnapshotOperation.cs
new file mode 100644
index 00000000000..b9a299b8309
--- /dev/null
+++ b/csharp/ExcelAddIn/operations/SnapshotOperation.cs
@@ -0,0 +1,76 @@
+using Deephaven.DeephavenClient;
+using Deephaven.DeephavenClient.ExcelAddIn.Util;
+using Deephaven.ExcelAddIn.ExcelDna;
+using Deephaven.ExcelAddIn.Models;
+using Deephaven.ExcelAddIn.Util;
+using ExcelDna.Integration;
+
+namespace Deephaven.ExcelAddIn.Operations;
+
+internal class SnapshotOperation : IExcelObservable, IObserver<StatusOr<TableHandle>> {
+  private readonly TableQuad _tableQuad;
+  private readonly bool _wantHeaders;
+  private readonly StateManager _stateManager;
+  private readonly ObserverContainer<StatusOr<object?[,]>> _observers = new();
+  private readonly WorkerThread _workerThread;
+  private IDisposable? _filteredTableDisposer = null;
+
+  public SnapshotOperation(TableQuad tableQuad, bool wantHeaders, StateManager stateManager) {
+    _tableQuad = tableQuad;
+    _wantHeaders = wantHeaders;
+    _stateManager = stateManager;
+    // Convenience
+    _workerThread = _stateManager.WorkerThread;
+  }
+
+  public IDisposable Subscribe(IExcelObserver observer) {
+    var wrappedObserver = ExcelDnaHelpers.WrapExcelObserver(observer);
+    _workerThread.EnqueueOrRun(() => {
+      _observers.Add(wrappedObserver, out var isFirst);
+
+      if (isFirst) {
+        _filteredTableDisposer = _stateManager.SubscribeToTable(_tableQuad, this);
+      }
+    });
+
+    return _workerThread.EnqueueOrRunWhenDisposed(() => {
+      _observers.Remove(wrappedObserver, out var wasLast);
+      if (!wasLast) {
+        return;
+      }
+
+      Utility.Exchange(ref _filteredTableDisposer, null)?.Dispose();
+    });
+  }
+
+  public void OnNext(StatusOr<TableHandle> tableHandle) {
+    if (_workerThread.EnqueueOrNop(() => OnNext(tableHandle))) {
+      return;
+    }
+
+    if (!tableHandle.GetValueOrStatus(out var th, out var status)) {
+      _observers.SendStatus(status);
+      return;
+    }
+
+    _observers.SendStatus($"Snapshotting \"{_tableQuad.TableName}\"");
+
+    try {
+      using var ct = th.ToClientTable();
+      var rendered = Renderer.Render(ct, _wantHeaders);
+      _observers.SendValue(rendered);
+    } catch (Exception ex) {
+      _observers.SendStatus(ex.Message);
+    }
+  }
+
+  void IObserver<StatusOr<TableHandle>>.OnCompleted() {
+    // TODO(kosak): TODO
+    throw new NotImplementedException();
+  }
+
+  void IObserver<StatusOr<TableHandle>>.OnError(Exception error) {
+    // TODO(kosak): TODO
+    throw new NotImplementedException();
+  }
+}
diff --git a/csharp/ExcelAddIn/operations/SubscribeOperation.cs b/csharp/ExcelAddIn/operations/SubscribeOperation.cs
new file mode 100644
index 00000000000..f2478d67a53
--- /dev/null
+++ b/csharp/ExcelAddIn/operations/SubscribeOperation.cs
@@ -0,0 +1,118 @@
+using Deephaven.DeephavenClient;
+using Deephaven.DeephavenClient.ExcelAddIn.Util;
+using Deephaven.ExcelAddIn.ExcelDna;
+using Deephaven.ExcelAddIn.Models;
+using Deephaven.ExcelAddIn.Util;
+using ExcelDna.Integration;
+
+namespace Deephaven.ExcelAddIn.Operations;
+
+internal class SubscribeOperation : IExcelObservable, IObserver<StatusOr<TableHandle>> {
+  private readonly TableQuad _tableQuad;
+  private readonly bool _wantHeaders;
+  private readonly StateManager _stateManager;
+  private readonly ObserverContainer<StatusOr<object?[,]>> _observers = new();
+  private readonly WorkerThread _workerThread;
+  private IDisposable? _tableDisposer = null;
+  private TableHandle? _currentTableHandle = null;
+  private SubscriptionHandle? _currentSubHandle = null;
+
+  public SubscribeOperation(TableQuad tableQuad, bool wantHeaders, StateManager stateManager) {
+    _tableQuad = tableQuad;
+    _wantHeaders = wantHeaders;
+    _stateManager = stateManager;
+    // Convenience
+    _workerThread = _stateManager.WorkerThread;
+  }
+
+  public IDisposable Subscribe(IExcelObserver observer) {
+    var wrappedObserver = ExcelDnaHelpers.WrapExcelObserver(observer);
+    _workerThread.EnqueueOrRun(() => {
+      _observers.Add(wrappedObserver, out var isFirst);
+
+      if (isFirst) {
+        _tableDisposer = _stateManager.SubscribeToTable(_tableQuad, this);
+      }
+    });
+
+    return ActionAsDisposable.Create(() => {
+      _workerThread.EnqueueOrRun(() => {
+        _observers.Remove(wrappedObserver, out var wasLast);
+        if (!wasLast) {
+          return;
+        }
+
+        Utility.Exchange(ref _tableDisposer, null)?.Dispose();
+      });
+    });
+  }
+
+  public void OnNext(StatusOr<TableHandle> soth) {
+    if (_workerThread.EnqueueOrNop(() => OnNext(soth))) {
+      return;
+    }
+
+    // First tear down old state
+    if (_currentTableHandle != null) {
+      if (_currentSubHandle != null) {
+        _currentTableHandle.Unsubscribe(_currentSubHandle!);
+        _currentSubHandle!.Dispose();
+        _currentSubHandle = null;
+      }
+
+      _currentTableHandle = null;
+    }
+
+    if (!soth.GetValueOrStatus(out var tableHandle, out var status)) {
+      _observers.SendStatus(status);
+      return;
+    }
+
+    _observers.SendStatus($"Subscribing to \"{_tableQuad.TableName}\"");
+
+    _currentTableHandle = tableHandle;
+    _currentSubHandle = _currentTableHandle.Subscribe(new MyTickingCallback(_observers, _wantHeaders));
+
+    try {
+      using var ct = tableHandle.ToClientTable();
+      var result = Renderer.Render(ct, _wantHeaders);
+      _observers.SendValue(result);
+    } catch (Exception ex) {
+      _observers.SendStatus(ex.Message);
+    }
+  }
+
+  void IObserver<StatusOr<TableHandle>>.OnCompleted() {
+    // TODO(kosak): TODO
+    throw new NotImplementedException();
+  }
+
+  void IObserver<StatusOr<TableHandle>>.OnError(Exception error) {
+    // TODO(kosak): TODO
+    throw new NotImplementedException();
+  }
+
+  private class MyTickingCallback : ITickingCallback {
+    private readonly ObserverContainer<StatusOr<object?[,]>> _observers;
+    private readonly bool _wantHeaders;
+
+    public MyTickingCallback(ObserverContainer<StatusOr<object?[,]>> observers,
+      bool wantHeaders) {
+      _observers = observers;
+      _wantHeaders = wantHeaders;
+    }
+
+    public void OnTick(TickingUpdate update) {
+      try {
+        var results = Renderer.Render(update.Current, _wantHeaders);
+        _observers.SendValue(results);
+      } catch (Exception e) {
+        _observers.SendStatus(e.Message);
+      }
+    }
+
+    public void OnFailure(string errorText) {
+      _observers.SendStatus(errorText);
+    }
+  }
+}
diff --git a/csharp/ExcelAddIn/providers/CredentialsProvider.cs b/csharp/ExcelAddIn/providers/CredentialsProvider.cs
new file mode 100644
index 00000000000..9a2d8c2deee
--- /dev/null
+++ b/csharp/ExcelAddIn/providers/CredentialsProvider.cs
@@ -0,0 +1,37 @@
+using Deephaven.ExcelAddIn.Models;
+using Deephaven.ExcelAddIn.Util;
+
+namespace Deephaven.ExcelAddIn.Providers;
+
+internal class CredentialsProvider : IObservable<StatusOr<CredentialsBase>> {
+  private readonly WorkerThread _workerThread;
+  private readonly ObserverContainer<StatusOr<CredentialsBase>> _observers = new();
+  private StatusOr<CredentialsBase> _credentials = StatusOr<CredentialsBase>.OfStatus("[No Credentials]");
+
+  public CredentialsProvider(StateManager stateManager) {
+    _workerThread = stateManager.WorkerThread;
+  }
+
+  public void Init() {
+    // Do nothing
+  }
+
+  public IDisposable Subscribe(IObserver<StatusOr<CredentialsBase>> observer) {
+    _workerThread.EnqueueOrRun(() => {
+      _observers.Add(observer, out _);
+      observer.OnNext(_credentials);
+    });
+
+    return _workerThread.EnqueueOrRunWhenDisposed(() => _observers.Remove(observer, out _));
+  }
+
+  public void SetCredentials(CredentialsBase newCredentials) {
+    _observers.SetAndSendValue(ref _credentials, newCredentials);
+  }
+
+  public void Resend() {
+    _observers.OnNext(_credentials);
+  }
+
+  public int ObserverCountUnsafe => _observers.Count;
+}
diff --git a/csharp/ExcelAddIn/providers/DefaultEndpointTableProvider.cs b/csharp/ExcelAddIn/providers/DefaultEndpointTableProvider.cs
new file mode 100644
index 00000000000..26d1dab5f35
--- /dev/null
+++ b/csharp/ExcelAddIn/providers/DefaultEndpointTableProvider.cs
@@ -0,0 +1,83 @@
+using Deephaven.DeephavenClient;
+using Deephaven.ExcelAddIn.Models;
+using Deephaven.ExcelAddIn.Util;
+using System.Diagnostics;
+
+namespace Deephaven.ExcelAddIn.Providers;
+
+internal class DefaultEndpointTableProvider :
+  IObserver<StatusOr<TableHandle>>,
+  IObserver<EndpointId?>,
+  // IObservable<StatusOr<TableHandle>>, // redundant, part of ITableProvider
+  ITableProvider {
+  private const string UnsetTableHandleText = "[No Default Connection]";
+
+  private readonly StateManager _stateManager;
+  private readonly PersistentQueryId? _persistentQueryId;
+  private readonly string _tableName;
+  private readonly string _condition;
+  private readonly WorkerThread _workerThread;
+  private Action? _onDispose;
+  private IDisposable? _endpointSubscriptionDisposer = null;
+  private IDisposable? _upstreamSubscriptionDisposer = null;
+  private readonly ObserverContainer<StatusOr<TableHandle>> _observers = new();
+  private StatusOr<TableHandle> _tableHandle = StatusOr<TableHandle>.OfStatus(UnsetTableHandleText);
+
+  public DefaultEndpointTableProvider(StateManager stateManager,
+    PersistentQueryId? persistentQueryId, string tableName, string condition,
+    Action onDispose) {
+    _stateManager = stateManager;
+    _workerThread = stateManager.WorkerThread;
+    _persistentQueryId = persistentQueryId;
+    _tableName = tableName;
+    _condition = condition;
+    _onDispose = onDispose;
+  }
+
+  public void Init() {
+    _endpointSubscriptionDisposer = _stateManager.SubscribeToDefaultEndpointSelection(this);
+  }
+
+  public IDisposable Subscribe(IObserver<StatusOr<TableHandle>> observer) {
+    _workerThread.EnqueueOrRun(() => {
+      _observers.Add(observer, out _);
+      observer.OnNext(_tableHandle);
+    });
+
+    return _workerThread.EnqueueOrRunWhenDisposed(() => {
+      _observers.Remove(observer, out var isLast);
+      if (!isLast) {
+        return;
+      }
+
+      Utility.Exchange(ref _endpointSubscriptionDisposer, null)?.Dispose();
+      Utility.Exchange(ref _onDispose, null)?.Invoke();
+    });
+  }
+
+  public void OnNext(EndpointId? endpointId) {
+    // Unsubscribe from old upstream
+    Utility.Exchange(ref _upstreamSubscriptionDisposer, null)?.Dispose();
+
+    // If endpoint is null, then don't subscribe to anything.
+    if (endpointId == null) {
+      _observers.SetAndSendStatus(ref _tableHandle, UnsetTableHandleText);
+      return;
+    }
+
+    var tq = new TableQuad(endpointId, _persistentQueryId, _tableName, _condition);
+    _upstreamSubscriptionDisposer = _stateManager.SubscribeToTable(tq, this);
+  }
+
+  public void OnNext(StatusOr<TableHandle> value) {
+    _observers.SetAndSend(ref _tableHandle, value);
+  }
+
+  public void OnCompleted() {
+    throw new NotImplementedException();
+  }
+
+  public void OnError(Exception error) {
+    throw new NotImplementedException();
+  }
+}
diff --git a/csharp/ExcelAddIn/providers/FilteredTableProvider.cs b/csharp/ExcelAddIn/providers/FilteredTableProvider.cs
new file mode 100644
index 00000000000..2774ec31c94
--- /dev/null
+++ b/csharp/ExcelAddIn/providers/FilteredTableProvider.cs
@@ -0,0 +1,106 @@
+using System.Diagnostics;
+using Deephaven.DeephavenClient;
+using Deephaven.ExcelAddIn.Models;
+using Deephaven.ExcelAddIn.Util;
+
+namespace Deephaven.ExcelAddIn.Providers;
+
+internal class FilteredTableProvider :
+  IObserver<StatusOr<TableHandle>>,
+  // IObservable<StatusOr<TableHandle>>, // redundant, part of ITableProvider
+  ITableProvider {
+
+  private readonly StateManager _stateManager;
+  private readonly WorkerThread _workerThread;
+  private readonly EndpointId _endpointId;
+  private readonly PersistentQueryId? _persistentQueryId;
+  private readonly string _tableName;
+  private readonly string _condition;
+  private Action? _onDispose;
+  private IDisposable? _tableHandleSubscriptionDisposer = null;
+  private readonly ObserverContainer<StatusOr<TableHandle>> _observers = new();
+  private StatusOr<TableHandle> _filteredTableHandle = StatusOr<TableHandle>.OfStatus("[No Filtered Table]");
+
+  public FilteredTableProvider(StateManager stateManager,
+    EndpointId endpointId, PersistentQueryId? persistentQueryId, string tableName, string condition,
+    Action onDispose) {
+    _stateManager = stateManager;
+    _workerThread = stateManager.WorkerThread;
+    _endpointId = endpointId;
+    _persistentQueryId = persistentQueryId;
+    _tableName = tableName;
+    _condition = condition;
+    _onDispose = onDispose;
+  }
+
+  public void Init() {
+    // Subscribe to a condition-free table
+    var tq = new TableQuad(_endpointId, _persistentQueryId, _tableName, "");
+    Debug.WriteLine($"FTP is subscribing to TableHandle with {tq}");
+    _tableHandleSubscriptionDisposer = _stateManager.SubscribeToTable(tq, this);
+  }
+
+  public IDisposable Subscribe(IObserver<StatusOr<TableHandle>> observer) {
+    _workerThread.EnqueueOrRun(() => {
+      _observers.Add(observer, out _);
+      observer.OnNext(_filteredTableHandle);
+    });
+
+    return _workerThread.EnqueueOrRunWhenDisposed(() => {
+      _observers.Remove(observer, out var isLast);
+      if (!isLast) {
+        return;
+      }
+
+      Utility.Exchange(ref _tableHandleSubscriptionDisposer, null)?.Dispose();
+      Utility.Exchange(ref _onDispose, null)?.Invoke();
+      DisposeTableHandleState();
+    });
+  }
+
+  public void OnNext(StatusOr<TableHandle> tableHandle) {
+    // Get onto the worker thread if we're not already on it.
+    if (_workerThread.EnqueueOrNop(() => OnNext(tableHandle))) {
+      return;
+    }
+
+    DisposeTableHandleState();
+
+    // If the new state is just a status message, make that our state and transmit to our observers
+    if (!tableHandle.GetValueOrStatus(out var th, out var status)) {
+      _observers.SetAndSendStatus(ref _filteredTableHandle, status);
+      return;
+    }
+
+    // It's a real TableHandle so start fetching the table. First notify our observers.
+    _observers.SetAndSendStatus(ref _filteredTableHandle, "Filtering");
+
+    try {
+      var filtered = th.Where(_condition);
+      _observers.SetAndSendValue(ref _filteredTableHandle, filtered);
+    } catch (Exception ex) {
+      _observers.SetAndSendStatus(ref _filteredTableHandle, ex.Message);
+    }
+  }
+
+  private void DisposeTableHandleState() {
+    if (_workerThread.EnqueueOrNop(DisposeTableHandleState)) {
+      return;
+    }
+
+    _ = _filteredTableHandle.GetValueOrStatus(out var oldTh, out _);
+    _observers.SetAndSendStatus(ref _filteredTableHandle, "Disposing TableHandle");
+
+    if (oldTh != null) {
+      Utility.RunInBackground(oldTh.Dispose);
+    }
+  }
+
+  public void OnCompleted() {
+    throw new NotImplementedException();
+  }
+
+  public void OnError(Exception error) {
+    throw new NotImplementedException();
+  }
+}
diff --git a/csharp/ExcelAddIn/providers/ITableProvider.cs b/csharp/ExcelAddIn/providers/ITableProvider.cs
new file mode 100644
index 00000000000..f0af94f4caa
--- /dev/null
+++ b/csharp/ExcelAddIn/providers/ITableProvider.cs
@@ -0,0 +1,11 @@
+using Deephaven.DeephavenClient;
+using Deephaven.ExcelAddIn.Util;
+
+namespace Deephaven.ExcelAddIn.Providers;
+
+/// <summary>
+/// Common interface for TableProvider, FilteredTableProvider, and DefaultEndpointTableProvider
+/// </summary>
+public interface ITableProvider : IObservable<StatusOr<TableHandle>> {
+  void Init();
+}
diff --git a/csharp/ExcelAddIn/providers/PersistentQueryProvider.cs b/csharp/ExcelAddIn/providers/PersistentQueryProvider.cs
new file mode 100644
index 00000000000..11c240be9ff
--- /dev/null
+++ b/csharp/ExcelAddIn/providers/PersistentQueryProvider.cs
@@ -0,0 +1,110 @@
+using Deephaven.DeephavenClient;
+using Deephaven.ExcelAddIn.Models;
+using Deephaven.ExcelAddIn.Util;
+
+namespace Deephaven.ExcelAddIn.Providers;
+
+internal class PersistentQueryProvider :
+  IObserver<StatusOr<SessionBase>>, IObservable<StatusOr<Client>> {
+
+  private readonly StateManager _stateManager;
+  private readonly WorkerThread _workerThread;
+  private readonly EndpointId _endpointId;
+  private readonly PersistentQueryId? _pqId;
+  private Action? _onDispose;
+  private IDisposable? _upstreamSubscriptionDisposer = null;
+  private readonly ObserverContainer<StatusOr<Client>> _observers = new();
+  private StatusOr<Client> _client = StatusOr<Client>.OfStatus("[No Client]");
+  private Client? _ownedDndClient = null;
+
+  public PersistentQueryProvider(StateManager stateManager,
+    EndpointId endpointId, PersistentQueryId? pqId, Action onDispose) {
+    _stateManager = stateManager;
+    _workerThread = stateManager.WorkerThread;
+    _endpointId = endpointId;
+    _pqId = pqId;
+    _onDispose = onDispose;
+  }
+
+  public void Init() {
+    _upstreamSubscriptionDisposer = _stateManager.SubscribeToSession(_endpointId, this);
+  }
+
+  public IDisposable Subscribe(IObserver<StatusOr<Client>> observer) {
+    _workerThread.EnqueueOrRun(() => {
+      _observers.Add(observer, out _);
+      observer.OnNext(_client);
+    });
+
+    return _workerThread.EnqueueOrRunWhenDisposed(() => {
+      _observers.Remove(observer, out var isLast);
+      if (!isLast) {
+        return;
+      }
+
+      Utility.Exchange(ref _upstreamSubscriptionDisposer, null)?.Dispose();
+      Utility.Exchange(ref _onDispose, null)?.Invoke();
+      DisposeClientState();
+    });
+  }
+
+  public void OnNext(StatusOr<SessionBase> sessionBase) {
+    if (_workerThread.EnqueueOrNop(() => OnNext(sessionBase))) {
+      return;
+    }
+
+    DisposeClientState();
+
+    // If the new state is just a status message, make that our state and transmit to our observers
+    if (!sessionBase.GetValueOrStatus(out var sb, out var status)) {
+      _observers.SetAndSendStatus(ref _client, status);
+      return;
+    }
+
+    // It's a real Session so start fetching it. Also do some validity checking on the PQ id.
+    _ = sb.Visit(
+      core => {
+        var result = _pqId == null
+          ? StatusOr<Client>.OfValue(core.Client)
+          : StatusOr<Client>.OfStatus("PQ specified, but Community Core cannot connect to a PQ");
+        _observers.SetAndSend(ref _client, result);
+        return Unit.Instance;
+      },
+      corePlus => {
+        if (_pqId == null) {
+          _observers.SetAndSendStatus(ref _client, "Enterprise Core+ requires a PQ to be specified");
+          return Unit.Instance;
+        }
+
+        _observers.SetAndSendStatus(ref _client, $"Attaching to \"{_pqId}\"");
+
+        try {
+          _ownedDndClient = corePlus.SessionManager.ConnectToPqByName(_pqId.Id, false);
+          _observers.SetAndSendValue(ref _client, _ownedDndClient);
+        } catch (Exception ex) {
+          _observers.SetAndSendStatus(ref _client, ex.Message);
+        }
+        return Unit.Instance;
+      });
+  }
+
+  private void DisposeClientState() {
+    if (_workerThread.EnqueueOrNop(DisposeClientState)) {
+      return;
+    }
+
+    _observers.SetAndSendStatus(ref _client, "Disposing Client");
+    var oldClient = Utility.Exchange(ref _ownedDndClient, null);
+    if (oldClient != null) {
+      Utility.RunInBackground(oldClient.Dispose);
+    }
+  }
+
+  public void OnCompleted() {
+    throw new NotImplementedException();
+  }
+
+  public void OnError(Exception error) {
+    throw new NotImplementedException();
+  }
+}
diff --git a/csharp/ExcelAddIn/providers/SessionProvider.cs b/csharp/ExcelAddIn/providers/SessionProvider.cs
new file mode 100644
index 00000000000..f34fefdb6d8
--- /dev/null
+++ b/csharp/ExcelAddIn/providers/SessionProvider.cs
@@ -0,0 +1,111 @@
+using Deephaven.ExcelAddIn.Factories;
+using Deephaven.ExcelAddIn.Models;
+using Deephaven.ExcelAddIn.Util;
+
+namespace Deephaven.ExcelAddIn.Providers;
+
+internal class SessionProvider : IObserver<StatusOr<CredentialsBase>>, IObservable<StatusOr<SessionBase>> {
+  private readonly StateManager _stateManager;
+  private readonly WorkerThread _workerThread;
+  private readonly EndpointId _endpointId;
+  private Action? _onDispose;
+  private IDisposable? _upstreamSubscriptionDisposer = null;
+  private StatusOr<SessionBase> _session = StatusOr<SessionBase>.OfStatus("[Not connected]");
+  private readonly ObserverContainer<StatusOr<SessionBase>> _observers = new();
+  private readonly VersionTracker _versionTracker = new();
+
+  public SessionProvider(StateManager stateManager, EndpointId endpointId, Action onDispose) {
+    _stateManager = stateManager;
+    _workerThread = stateManager.WorkerThread;
+    _endpointId = endpointId;
+    _onDispose = onDispose;
+  }
+
+  public void Init() {
+    _upstreamSubscriptionDisposer = _stateManager.SubscribeToCredentials(_endpointId, this);
+  }
+
+  /// <summary>
+  /// Subscribe to session changes
+  /// </summary>
+  public IDisposable Subscribe(IObserver<StatusOr<SessionBase>> observer) {
+    _workerThread.EnqueueOrRun(() => {
+      _observers.Add(observer, out _);
+      observer.OnNext(_session);
+    });
+
+    return _workerThread.EnqueueOrRunWhenDisposed(() => {
+      _observers.Remove(observer, out var isLast);
+      if (!isLast) {
+        return;
+      }
+
+      Utility.Exchange(ref _upstreamSubscriptionDisposer, null)?.Dispose();
+      Utility.Exchange(ref _onDispose, null)?.Invoke();
+      DisposeSessionState();
+    });
+  }
+
+  public void OnNext(StatusOr<CredentialsBase> credentials) {
+    if (_workerThread.EnqueueOrNop(() => OnNext(credentials))) {
+      return;
+    }
+
+    DisposeSessionState();
+
+    if (!credentials.GetValueOrStatus(out var cbase, out var status)) {
+      _observers.SetAndSendStatus(ref _session, status);
+      return;
+    }
+
+    _observers.SetAndSendStatus(ref _session, "Trying to connect");
+
+    var cookie = _versionTracker.SetNewVersion();
+    Utility.RunInBackground(() => CreateSessionBaseInSeparateThread(cbase, cookie));
+  }
+
+  private void CreateSessionBaseInSeparateThread(CredentialsBase credentials, VersionTrackerCookie versionCookie) {
+    SessionBase? sb = null;
+    StatusOr<SessionBase> result;
+    try {
+      // This operation might take some time.
+      sb = SessionBaseFactory.Create(credentials, _workerThread);
+      result = StatusOr<SessionBase>.OfValue(sb);
+    } catch (Exception ex) {
+      result = StatusOr<SessionBase>.OfStatus(ex.Message);
+    }
+
+    // Some time has passed. It's possible that the VersionTracker has been reset
+    // with a newer version. If so, we should throw away our work and leave.
+    if (!versionCookie.IsCurrent) {
+      sb?.Dispose();
+      return;
+    }
+
+    // Our results are valid. Keep them and tell everyone about it (on the worker thread).
+    _workerThread.EnqueueOrRun(() => _observers.SetAndSend(ref _session, result));
+  }
+
+  private void DisposeSessionState() {
+    if (_workerThread.EnqueueOrNop(DisposeSessionState)) {
+      return;
+    }
+
+    _ = _session.GetValueOrStatus(out var oldSession, out _);
+    _observers.SetAndSendStatus(ref _session, "Disposing Session");
+
+    if (oldSession != null) {
+      Utility.RunInBackground(oldSession.Dispose);
+    }
+  }
+
+  public void OnCompleted() {
+    // TODO(kosak)
+    throw new NotImplementedException();
+  }
+
+  public void OnError(Exception error) {
+    // TODO(kosak)
+    throw new NotImplementedException();
+  }
+}
diff --git a/csharp/ExcelAddIn/providers/TableProvider.cs b/csharp/ExcelAddIn/providers/TableProvider.cs
new file mode 100644
index 00000000000..d4da46fef3a
--- /dev/null
+++ b/csharp/ExcelAddIn/providers/TableProvider.cs
@@ -0,0 +1,100 @@
+using Deephaven.DeephavenClient;
+using Deephaven.ExcelAddIn.Models;
+using Deephaven.ExcelAddIn.Util;
+
+namespace Deephaven.ExcelAddIn.Providers;
+
+internal class TableProvider :
+  IObserver<StatusOr<Client>>,
+  // IObservable<StatusOr<TableHandle>>, // redundant, part of ITableProvider
+  ITableProvider {
+  private const string UnsetTableHandleText = "[No Table]";
+
+  private readonly StateManager _stateManager;
+  private readonly WorkerThread _workerThread;
+  private readonly EndpointId _endpointId;
+  private readonly PersistentQueryId? _persistentQueryId;
+  private readonly string _tableName;
+  private Action? _onDispose;
+  private IDisposable? _pqSubscriptionDisposer = null;
+  private readonly ObserverContainer<StatusOr<TableHandle>> _observers = new();
+  private StatusOr<TableHandle> _tableHandle = StatusOr<TableHandle>.OfStatus(UnsetTableHandleText);
+
+  public TableProvider(StateManager stateManager, EndpointId endpointId,
+    PersistentQueryId? persistentQueryId, string tableName, Action onDispose) {
+    _stateManager = stateManager;
+    _workerThread = stateManager.WorkerThread;
+    _endpointId = endpointId;
+    _persistentQueryId = persistentQueryId;
+    _tableName = tableName;
+    _onDispose = onDispose;
+  }
+
+  public void Init() {
+    _pqSubscriptionDisposer = _stateManager.SubscribeToPersistentQuery(
+      _endpointId, _persistentQueryId, this);
+  }
+
+  public IDisposable Subscribe(IObserver<StatusOr<TableHandle>> observer) {
+    _workerThread.EnqueueOrRun(() => {
+      _observers.Add(observer, out _);
+      observer.OnNext(_tableHandle);
+    });
+
+    return _workerThread.EnqueueOrRunWhenDisposed(() => {
+      _observers.Remove(observer, out var isLast);
+      if (!isLast) {
+        return;
+      }
+
+      Utility.Exchange(ref _pqSubscriptionDisposer, null)?.Dispose();
+      Utility.Exchange(ref _onDispose, null)?.Invoke();
+      DisposeTableHandleState();
+    });
+  }
+
+  public void OnNext(StatusOr<Client> client) {
+    if (_workerThread.EnqueueOrNop(() => OnNext(client))) {
+      return;
+    }
+
+    DisposeTableHandleState();
+
+    // If the new state is just a status message, make that our state and transmit to our observers
+    if (!client.GetValueOrStatus(out var cli, out var status)) {
+      _observers.SetAndSendStatus(ref _tableHandle, status);
+      return;
+    }
+
+    // It's a real client so start fetching the table. First notify our observers.
+    _observers.SetAndSendStatus(ref _tableHandle, $"Fetching \"{_tableName}\"");
+
+    try {
+      var th = cli.Manager.FetchTable(_tableName);
+      _observers.SetAndSendValue(ref _tableHandle, th);
+    } catch (Exception ex) {
+      _observers.SetAndSendStatus(ref _tableHandle, ex.Message);
+    }
+  }
+
+  private void DisposeTableHandleState() {
+    if (_workerThread.EnqueueOrNop(DisposeTableHandleState)) {
+      return;
+    }
+
+    _ = _tableHandle.GetValueOrStatus(out var oldTh, out _);
+    _observers.SetAndSendStatus(ref _tableHandle, UnsetTableHandleText);
+
+    if (oldTh != null) {
+      Utility.RunInBackground(oldTh.Dispose);
+    }
+  }
+
+  public void OnCompleted() {
+    throw new NotImplementedException();
+  }
+
+  public void OnError(Exception error) {
+    throw new NotImplementedException();
+  }
+}
diff --git a/csharp/ExcelAddIn/util/ActionAsDisposable.cs b/csharp/ExcelAddIn/util/ActionAsDisposable.cs
new file mode 100644
index 00000000000..e195d2aa7f6
--- /dev/null
+++ b/csharp/ExcelAddIn/util/ActionAsDisposable.cs
@@ -0,0 +1,21 @@
+namespace Deephaven.DeephavenClient.ExcelAddIn.Util;
+
+internal class ActionAsDisposable : IDisposable {
+  public static IDisposable Create(Action action) {
+    return new ActionAsDisposable(action);
+  }
+
+  private Action? _action;
+
+  private ActionAsDisposable(Action action) => _action = action;
+
+  public void Dispose() {
+    var temp = _action;
+    if (temp == null) {
+      return;
+    }
+
+    _action = null;
+    temp();
+  }
+}
diff --git a/csharp/ExcelAddIn/util/ObservableConverter.cs b/csharp/ExcelAddIn/util/ObservableConverter.cs
new file mode 100644
index 00000000000..b31defc40ee
--- /dev/null
+++ b/csharp/ExcelAddIn/util/ObservableConverter.cs
@@ -0,0 +1,44 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using System.Windows.Forms;
+using Deephaven.DeephavenClient.ExcelAddIn.Util;
+
+namespace Deephaven.ExcelAddIn.Util;
+
+internal static class ObservableConverter {
+  public static ObservableConverter<TFrom, TTo> Create<TFrom, TTo>(
+    Func<TFrom, TTo> converter, WorkerThread workerThread) {
+    return new ObservableConverter<TFrom, TTo>(converter, workerThread);
+  }
+}
+
+internal class ObservableConverter<TFrom, TTo>(Func<TFrom, TTo> converter, WorkerThread workerThread) :
+  IObserver<TFrom>, IObservable<TTo> {
+  private readonly ObserverContainer<TTo> _observers = new();
+
+  public void OnNext(TFrom value) {
+    var converted = converter(value);
+    _observers.OnNext(converted);
+  }
+
+  public void OnCompleted() {
+    _observers.OnCompleted();
+  }
+
+  public void OnError(Exception error) {
+    _observers.OnError(error);
+  }
+
+  public IDisposable Subscribe(IObserver<TTo> observer) {
+    workerThread.EnqueueOrRun(() => _observers.Add(observer, out _));
+
+    return ActionAsDisposable.Create(() => {
+      workerThread.EnqueueOrRun(() => {
+        _observers.Remove(observer, out _);
+      });
+    });
+  }
+}
diff --git a/csharp/ExcelAddIn/util/ObserverContainer.cs b/csharp/ExcelAddIn/util/ObserverContainer.cs
new file mode 100644
index 00000000000..e1d0e98cf42
--- /dev/null
+++ b/csharp/ExcelAddIn/util/ObserverContainer.cs
@@ -0,0 +1,52 @@
+namespace Deephaven.ExcelAddIn.Util;
+
+public sealed class ObserverContainer<T> : IObserver<T> {
+  private readonly object _sync = new();
+  private readonly HashSet<IObserver<T>> _observers = new();
+
+  public int Count {
+    get {
+      lock (_sync) {
+        return _observers.Count;
+      }
+    }
+  }
+
+  public void Add(IObserver<T> observer, out bool isFirst) {
+    lock (_sync) {
+      isFirst = _observers.Count == 0;
+      _observers.Add(observer);
+    }
+  }
+
+  public void Remove(IObserver<T> observer, out bool wasLast) {
+    lock (_sync) {
+      var removed = _observers.Remove(observer);
+      wasLast = removed && _observers.Count == 0;
+    }
+  }
+
+  public void OnNext(T result) {
+    foreach (var observer in SafeCopyObservers()) {
+      observer.OnNext(result);
+    }
+  }
+
+  public void OnError(Exception ex) {
+    foreach (var observer in SafeCopyObservers()) {
+      observer.OnError(ex);
+    }
+  }
+
+  public void OnCompleted() {
+    foreach (var observer in SafeCopyObservers()) {
+      observer.OnCompleted();
+    }
+  }
+
+  private IObserver<T>[] SafeCopyObservers() {
+    lock (_sync) {
+      return _observers.ToArray();
+    }
+  }
+}
diff --git a/csharp/ExcelAddIn/util/Renderer.cs b/csharp/ExcelAddIn/util/Renderer.cs
new file mode 100644
index 00000000000..b0fba4fecc7
--- /dev/null
+++ b/csharp/ExcelAddIn/util/Renderer.cs
@@ -0,0 +1,33 @@
+using Deephaven.DeephavenClient;
+
+namespace Deephaven.ExcelAddIn.Util;
+
+internal static class Renderer {
+  public static object?[,] Render(ClientTable table, bool wantHeaders) {
+    var numRows = table.NumRows;
+    var numCols = table.NumCols;
+    var effectiveNumRows = wantHeaders ? numRows + 1 : numRows;
+    var result = new object?[effectiveNumRows, numCols];
+
+    var headers = table.Schema.Names;
+    for (var colIndex = 0; colIndex != numCols; ++colIndex) {
+      var destIndex = 0;
+      if (wantHeaders) {
+        result[destIndex++, colIndex] = headers[colIndex];
+      }
+
+      var (col, nulls) = table.GetColumn(colIndex);
+      for (var i = 0; i != numRows; ++i) {
+        var temp = nulls[i] ? null : col.GetValue(i);
+        // sad hack, wrong place, inefficient
+        if (temp is DhDateTime dh) {
+          temp = dh.DateTime.ToString("s", System.Globalization.CultureInfo.InvariantCulture);
+        }
+
+        result[destIndex++, colIndex] = temp;
+      }
+    }
+
+    return result;
+  }
+}
diff --git a/csharp/ExcelAddIn/util/StatusOr.cs b/csharp/ExcelAddIn/util/StatusOr.cs
new file mode 100644
index 00000000000..1de6f583af6
--- /dev/null
+++ b/csharp/ExcelAddIn/util/StatusOr.cs
@@ -0,0 +1,62 @@
+using System.Diagnostics.CodeAnalysis;
+using System.Windows.Forms;
+
+namespace Deephaven.ExcelAddIn.Util;
+
+public sealed class StatusOr<T> {
+  private readonly string? _status;
+  private readonly T? _value;
+
+  public static StatusOr<T> OfStatus(string status) {
+    return new StatusOr<T>(status, default);
+  }
+
+  public static StatusOr<T> OfValue(T value) {
+    return new StatusOr<T>(null, value);
+  }
+
+  private StatusOr(string? status, T? value) {
+    _status = status;
+    _value = value;
+  }
+
+  public bool GetValueOrStatus(
+    [NotNullWhen(true)]out T? value,
+    [NotNullWhen(false)]out string? status) {
+    status = _status;
+    value = _value;
+    return value != null;
+  }
+
+  public U AcceptVisitor<U>(Func<T, U> onValue, Func<string, U> onStatus) {
+    return _value != null ? onValue(_value) : onStatus(_status!);
+  }
+}
+
+public static class ObserverStatusOr_Extensions {
+  public static void SendStatus<T>(this IObserver<StatusOr<T>> observer, string message) {
+    var so = StatusOr<T>.OfStatus(message);
+    observer.OnNext(so);
+  }
+
+  public static void SendValue<T>(this IObserver<StatusOr<T>> observer, T value) {
+    var so = StatusOr<T>.OfValue(value);
+    observer.OnNext(so);
+  }
+
+  public static void SetAndSendStatus<T>(this IObserver<StatusOr<T>> observer, ref StatusOr<T> sor,
+    string message) {
+    SetAndSend(observer, ref sor, StatusOr<T>.OfStatus(message));
+  }
+
+  public static void SetAndSendValue<T>(this IObserver<StatusOr<T>> observer, ref StatusOr<T> sor,
+    T value) {
+    SetAndSend(observer, ref sor, StatusOr<T>.OfValue(value));
+  }
+
+  public static void SetAndSend<T>(this IObserver<StatusOr<T>> observer, ref StatusOr<T> sor,
+    StatusOr<T> newSor) {
+    sor = newSor;
+    observer.OnNext(newSor);
+  }
+}
diff --git a/csharp/ExcelAddIn/util/Utility.cs b/csharp/ExcelAddIn/util/Utility.cs
new file mode 100644
index 00000000000..4b9de77ca3a
--- /dev/null
+++ b/csharp/ExcelAddIn/util/Utility.cs
@@ -0,0 +1,45 @@
+
+using System.Diagnostics;
+
+namespace Deephaven.ExcelAddIn.Util;
+
+internal static class Utility {
+  public static T Exchange<T>(ref T item, T newValue) {
+    var result = item;
+    item = newValue;
+    return result;
+  }
+
+  public static void RunInBackground(Action a) {
+    void Doit() {
+      try {
+        a();
+      } catch (Exception e) {
+        Debug.WriteLine($"Ignoring exception {e}");
+      }
+    }
+    new Thread(Doit) { IsBackground = true }.Start();
+  }
+}
+
+public class Unit {
+  public static readonly Unit Instance = new ();
+
+  private Unit() {
+  }
+}
+
+public class ValueHolder<T> where T : class {
+  private T? _value = null;
+
+  public T Value {
+    get {
+      if (_value == null) {
+        throw new Exception("Value is unset");
+      }
+
+      return _value;
+    }
+    set => _value = value;
+  }
+}
diff --git a/csharp/ExcelAddIn/util/VersionTracker.cs b/csharp/ExcelAddIn/util/VersionTracker.cs
new file mode 100644
index 00000000000..a0fcbe48c71
--- /dev/null
+++ b/csharp/ExcelAddIn/util/VersionTracker.cs
@@ -0,0 +1,27 @@
+namespace Deephaven.ExcelAddIn.Util;
+
+internal class VersionTracker {
+  private readonly object _sync = new();
+  private VersionTrackerCookie _cookie;
+
+  public VersionTracker() {
+    _cookie = new VersionTrackerCookie(this);
+  }
+
+  public VersionTrackerCookie SetNewVersion() {
+    lock (_sync) {
+      _cookie = new VersionTrackerCookie(this);
+      return _cookie;
+    }
+  }
+
+  public bool HasCookie(VersionTrackerCookie cookie) {
+    lock (_sync) {
+      return ReferenceEquals(_cookie, cookie);
+    }
+  }
+}
+
+internal class VersionTrackerCookie(VersionTracker owner) {
+  public bool IsCurrent => owner.HasCookie(this);
+}
diff --git a/csharp/ExcelAddIn/util/WorkerThread.cs b/csharp/ExcelAddIn/util/WorkerThread.cs
new file mode 100644
index 00000000000..eceea724114
--- /dev/null
+++ b/csharp/ExcelAddIn/util/WorkerThread.cs
@@ -0,0 +1,71 @@
+using System.Diagnostics;
+using Deephaven.DeephavenClient.ExcelAddIn.Util;
+
+namespace Deephaven.ExcelAddIn.Util;
+
+public class WorkerThread {
+  public static WorkerThread Create() {
+    var result = new WorkerThread();
+    var t = new Thread(result.Doit) { IsBackground = true };
+    result._thisThread = t;
+    t.Start();
+    return result;
+  }
+
+  private readonly object _sync = new();
+  private readonly Queue<Action> _queue = new();
+  private Thread? _thisThread;
+
+  private WorkerThread() {
+  }
+
+  // enquee or run
+  public void EnqueueOrRun(Action action) {
+    if (!EnqueueOrNop(action)) {
+      action();
+    }
+  }
+
+  // conditionalenqueue
+  public bool EnqueueOrNop(Action action) {
+    if (ReferenceEquals(Thread.CurrentThread, _thisThread)) {
+      // Appending to thread queue was not required. Return false.
+      return false;
+    }
+
+    lock (_sync) {
+      _queue.Enqueue(action);
+      if (_queue.Count == 1) {
+        // Only need to pulse on transition from 0 to 1, because the
+        // Doit method only Waits if the queue is empty.
+        Monitor.PulseAll(_sync);
+      }
+    }
+
+    // Appending to thread queue was required.
+    return true;
+  }
+
+  public IDisposable EnqueueOrRunWhenDisposed(Action action) {
+    return ActionAsDisposable.Create(() => EnqueueOrRun(action));
+  }
+
+  private void Doit() {
+    while (true) {
+      Action action;
+      lock (_sync) {
+        while (_queue.Count == 0) {
+          Monitor.Wait(_sync);
+        }
+
+        action = _queue.Dequeue();
+      }
+
+      try {
+        action();
+      } catch (Exception ex) {
+        Debug.WriteLine($"Swallowing exception {ex}");
+      }
+    }
+  }
+}
diff --git a/csharp/ExcelAddIn/viewmodels/ConnectionManagerDialogRow.cs b/csharp/ExcelAddIn/viewmodels/ConnectionManagerDialogRow.cs
new file mode 100644
index 00000000000..a34b9a6fbdb
--- /dev/null
+++ b/csharp/ExcelAddIn/viewmodels/ConnectionManagerDialogRow.cs
@@ -0,0 +1,96 @@
+using System.ComponentModel;
+using Deephaven.ExcelAddIn.Models;
+using Deephaven.ExcelAddIn.Util;
+
+namespace Deephaven.ExcelAddIn.Viewmodels;
+
+public sealed class ConnectionManagerDialogRow(string id) : INotifyPropertyChanged {
+
+  public event PropertyChangedEventHandler? PropertyChanged;
+
+  private readonly object _sync = new();
+  private StatusOr<CredentialsBase> _credentials = StatusOr<CredentialsBase>.OfStatus("[Not set]");
+  private StatusOr<SessionBase> _session = StatusOr<SessionBase>.OfStatus("[Not connected]");
+  private EndpointId? _defaultEndpointId = null;
+
+  [DisplayName("Name")]
+  public string Id { get; init; } = id;
+
+  public string Status {
+    get {
+      var session = GetSessionSynced();
+      // If we have a valid session, return "[Connected]", otherwise pass through the status text we have.
+      return session.AcceptVisitor(
+        _ => "[Connected]",
+        status => status);
+    }
+  }
+
+  [DisplayName("Server Type")]
+  public string ServerType {
+    get {
+      var creds = GetCredentialsSynced();
+      // Nested AcceptVisitor!!
+      // If we have valid credentials, determine whether they are for Core or Core+ and return the appropriate string.
+      // Otherwise (if we have invalid credentials), ignore their status text and just say "[Unknown]".
+      return creds.AcceptVisitor(
+        crs => crs.AcceptVisitor(_ => "Core", _ => "Core+"),
+        _ => "[Unknown]");
+
+    }
+  }
+
+  [DisplayName("Default")]
+  public bool IsDefault {
+    get {
+      var id = Id;  // readonly so no synchronization needed.
+      var defaultEp = GetDefaultEndpointIdSynced();
+      return defaultEp != null && defaultEp.Id == id;
+    }
+  }
+
+  public StatusOr<CredentialsBase> GetCredentialsSynced() {
+    lock (_sync) {
+      return _credentials;
+    }
+  }
+
+  public void SetCredentialsSynced(StatusOr<CredentialsBase> value) {
+    lock (_sync) {
+      _credentials = value;
+    }
+
+    OnPropertyChanged(nameof(ServerType));
+    OnPropertyChanged(nameof(IsDefault));
+  }
+
+  public EndpointId? GetDefaultEndpointIdSynced() {
+    lock (_sync) {
+      return _defaultEndpointId;
+    }
+  }
+
+  public void SetDefaultEndpointIdSynced(EndpointId? value) {
+    lock (_sync) {
+      _defaultEndpointId = value;
+    }
+    OnPropertyChanged(nameof(IsDefault));
+  }
+
+  public StatusOr<SessionBase> GetSessionSynced() {
+    lock (_sync) {
+      return _session;
+    }
+  }
+
+  public void SetSessionSynced(StatusOr<SessionBase> value) {
+    lock (_sync) {
+      _session = value;
+    }
+    OnPropertyChanged(nameof(Status));
+  }
+
+  private void OnPropertyChanged(string name) {
+    PropertyChanged?.Invoke(this, new PropertyChangedEventArgs(name));
+  }
+}
diff --git a/csharp/ExcelAddIn/viewmodels/CredentialsDialogViewModel.cs b/csharp/ExcelAddIn/viewmodels/CredentialsDialogViewModel.cs
new file mode 100644
index 00000000000..86cae1c39e0
--- /dev/null
+++ b/csharp/ExcelAddIn/viewmodels/CredentialsDialogViewModel.cs
@@ -0,0 +1,252 @@
+using System.ComponentModel;
+using System.Diagnostics.CodeAnalysis;
+using System.Runtime.CompilerServices;
+using Deephaven.ExcelAddIn.Models;
+using Deephaven.ExcelAddIn.Util;
+
+namespace Deephaven.ExcelAddIn.ViewModels;
+
+public sealed class CredentialsDialogViewModel : INotifyPropertyChanged {
+  public static CredentialsDialogViewModel OfEmpty() {
+    return new CredentialsDialogViewModel();
+  }
+
+  public static CredentialsDialogViewModel OfIdButOtherwiseEmpty(string id) {
+    return new CredentialsDialogViewModel { Id = id };
+  }
+
+  public static CredentialsDialogViewModel OfIdAndCredentials(string id, CredentialsBase credentials) {
+    var result = new CredentialsDialogViewModel {
+      Id = credentials.Id.Id
+    };
+    _ = credentials.AcceptVisitor(
+      core => {
+        result._isCorePlus = false;
+        result.ConnectionString = core.ConnectionString;
+        result.SessionTypeIsPython = core.SessionTypeIsPython;
+        return Unit.Instance;
+      },
+      corePlus => {
+        result._isCorePlus = true;
+        result.JsonUrl = corePlus.JsonUrl;
+        result.UserId = corePlus.User;
+        result.Password = corePlus.Password;
+        result.OperateAs = corePlus.OperateAs.Equals(corePlus.User) ? "" : corePlus.OperateAs;
+        result.ValidateCertificate = corePlus.ValidateCertificate;
+        return Unit.Instance;
+      });
+
+    return result;
+  }
+
+  private string _id = "";
+  private bool _isDefault = false;
+  private bool _isCorePlus = true;
+  private bool _sessionTypeIsPython = true;
+
+  // Core properties
+  private string _connectionString = "";
+
+  // Core+ properties
+  private string _jsonUrl = "";
+  private bool _validateCertificate = true;
+  private string _userId = "";
+  private string _password = "";
+  private string _operateAs = "";
+
+  public event PropertyChangedEventHandler? PropertyChanged;
+
+  public bool TryMakeCredentials([NotNullWhen(true)] out CredentialsBase? result,
+    [NotNullWhen(false)] out string? errorText) {
+    result = null;
+    errorText = null;
+
+    var missingFields = new List<string>();
+    void CheckMissing(string field, string name) {
+      if (field.Length == 0) {
+        missingFields.Add(name);
+      }
+    }
+
+    CheckMissing(Id, "Connection Id");
+
+    if (!_isCorePlus) {
+      CheckMissing(ConnectionString, "Connection String");
+    } else {
+      CheckMissing(JsonUrl, "JSON URL");
+      CheckMissing(UserId, "User Id");
+      CheckMissing(Password, "Password");
+    }
+
+    if (missingFields.Count > 0) {
+      errorText = string.Join(Environment.NewLine, missingFields);
+      return false;
+    }
+
+    var epId = new EndpointId(_id);
+    result = _isCorePlus
+      ? CredentialsBase.OfCorePlus(epId, JsonUrl, UserId, Password, OperateAsToUse, ValidateCertificate)
+      : CredentialsBase.OfCore(epId, ConnectionString, SessionTypeIsPython);
+    return true;
+  }
+
+  public string Id {
+    get => _id;
+    set {
+      if (value == _id) {
+        return;
+      }
+
+      _id = value;
+      OnPropertyChanged();
+    }
+  }
+
+  public bool IsDefault {
+    get => _isDefault;
+    set {
+      if (value == _isDefault) {
+        return;
+      }
+
+      _isDefault = value;
+      OnPropertyChanged();
+    }
+  }
+
+  /**
+   * I don't know if I have to do it this way, but I bind IsCore and IsCorePlus to the
+   * same underlying variable. The property "IsCore" maps to the inverse of the variable
+   * _isCorePlus, meanwhile the property "IsCorePlus" maps to the normal sense of the
+   * variable. Setters on either one trigger property change events for both.
+   */
+  public bool IsCore {
+    get => !_isCorePlus;
+    set {
+      if (_isCorePlus == !value) {
+        return;
+      }
+
+      _isCorePlus = !value;
+      OnPropertyChanged();
+      OnPropertyChanged(nameof(IsCorePlus));
+    }
+  }
+
+  public bool IsCorePlus {
+    get => _isCorePlus;
+    set {
+      if (_isCorePlus == value) {
+        return;
+      }
+
+      _isCorePlus = value;
+      OnPropertyChanged();
+      OnPropertyChanged(nameof(IsCore));
+    }
+  }
+
+  public string ConnectionString {
+    get => _connectionString;
+    set {
+      if (_connectionString == value) {
+        return;
+      }
+
+      _connectionString = value;
+      OnPropertyChanged();
+    }
+  }
+
+  public string JsonUrl {
+    get => _jsonUrl;
+    set {
+      if (_jsonUrl == value) {
+        return;
+      }
+
+      _jsonUrl = value;
+      OnPropertyChanged();
+    }
+  }
+
+  public string UserId {
+    get => _userId;
+    set {
+      if (_userId == value) {
+        return;
+      }
+
+      _userId = value;
+      OnPropertyChanged();
+    }
+  }
+
+  public string Password {
+    get => _password;
+    set {
+      if (_password == value) {
+        return;
+      }
+
+      _password = value;
+      OnPropertyChanged();
+    }
+  }
+
+  public string OperateAs {
+    get => _operateAs;
+    set {
+      if (_operateAs == value) {
+        return;
+      }
+
+      _operateAs = value;
+      OnPropertyChanged();
+    }
+  }
+
+  public string OperateAsToUse => _operateAs.Length != 0 ? _operateAs : UserId;
+
+  public bool ValidateCertificate {
+    get => _validateCertificate;
+    set {
+      if (_validateCertificate == value) {
+        return;
+      }
+
+      _validateCertificate = value;
+      OnPropertyChanged();
+    }
+  }
+
+  public bool SessionTypeIsPython {
+    get => _sessionTypeIsPython;
+    set {
+      if (_sessionTypeIsPython == value) {
+        return;
+      }
+
+      _sessionTypeIsPython = value;
+      OnPropertyChanged();
+      OnPropertyChanged(nameof(SessionTypeIsGroovy));
+    }
+  }
+
+  public bool SessionTypeIsGroovy {
+    get => !_sessionTypeIsPython;
+    set {
+      if (!_sessionTypeIsPython == value) {
+        return;
+      }
+
+      _sessionTypeIsPython = !value;
+      OnPropertyChanged();
+      OnPropertyChanged(nameof(SessionTypeIsPython));
+    }
+  }
+
+  private void OnPropertyChanged([CallerMemberName] string? name = null) {
+    PropertyChanged?.Invoke(this, new PropertyChangedEventArgs(name));
+  }
+}
diff --git a/csharp/ExcelAddIn/views/ConnectionManagerDialog.Designer.cs b/csharp/ExcelAddIn/views/ConnectionManagerDialog.Designer.cs
new file mode 100644
index 00000000000..604c97b2d12
--- /dev/null
+++ b/csharp/ExcelAddIn/views/ConnectionManagerDialog.Designer.cs
@@ -0,0 +1,147 @@
+namespace Deephaven.ExcelAddIn.Views {
+  partial class ConnectionManagerDialog {
+    /// <summary>
+    /// Required designer variable.
+    /// </summary>
+    private System.ComponentModel.IContainer components = null;
+
+    /// <summary>
+    /// Clean up any resources being used.
+    /// </summary>
+    /// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
+    protected override void Dispose(bool disposing) {
+      if (disposing && (components != null)) {
+        components.Dispose();
+      }
+      base.Dispose(disposing);
+    }
+
+    #region Windows Form Designer generated code
+
+    /// <summary>
+    /// Required method for Designer support - do not modify
+    /// the contents of this method with the code editor.
+    /// </summary>
+    private void InitializeComponent() {
+      colorDialog1 = new ColorDialog();
+      dataGridView1 = new DataGridView();
+      newButton = new Button();
+      connectionsLabel = new Label();
+      editButton = new Button();
+      deleteButton = new Button();
+      reconnectButton = new Button();
+      makeDefaultButton = new Button();
+      ((System.ComponentModel.ISupportInitialize)dataGridView1).BeginInit();
+      SuspendLayout();
+      // 
+      // dataGridView1
+      // 
+      dataGridView1.AllowUserToAddRows = false;
+      dataGridView1.AllowUserToDeleteRows = false;
+      dataGridView1.Anchor = AnchorStyles.Top | AnchorStyles.Bottom | AnchorStyles.Left | AnchorStyles.Right;
+      dataGridView1.AutoSizeColumnsMode = DataGridViewAutoSizeColumnsMode.Fill;
+      dataGridView1.ColumnHeadersHeightSizeMode = DataGridViewColumnHeadersHeightSizeMode.AutoSize;
+      dataGridView1.Location = new Point(68, 83);
+      dataGridView1.Name = "dataGridView1";
+      dataGridView1.ReadOnly = true;
+      dataGridView1.RowHeadersWidth = 62;
+      dataGridView1.SelectionMode = DataGridViewSelectionMode.FullRowSelect;
+      dataGridView1.Size = new Size(979, 454);
+      dataGridView1.TabIndex = 0;
+      // 
+      // newButton
+      // 
+      newButton.Anchor = AnchorStyles.Bottom | AnchorStyles.Right;
+      newButton.Location = new Point(919, 560);
+      newButton.Name = "newButton";
+      newButton.Size = new Size(128, 34);
+      newButton.TabIndex = 5;
+      newButton.Text = "New...";
+      newButton.UseVisualStyleBackColor = true;
+      newButton.Click += newButton_Click;
+      // 
+      // connectionsLabel
+      // 
+      connectionsLabel.AutoSize = true;
+      connectionsLabel.Font = new Font("Segoe UI", 12F, FontStyle.Regular, GraphicsUnit.Point, 0);
+      connectionsLabel.Location = new Point(68, 33);
+      connectionsLabel.Name = "connectionsLabel";
+      connectionsLabel.Size = new Size(147, 32);
+      connectionsLabel.TabIndex = 2;
+      connectionsLabel.Text = "Connections";
+      // 
+      // editButton
+      // 
+      editButton.Anchor = AnchorStyles.Bottom | AnchorStyles.Right;
+      editButton.Location = new Point(776, 560);
+      editButton.Name = "editButton";
+      editButton.Size = new Size(112, 34);
+      editButton.TabIndex = 4;
+      editButton.Text = "Edit...";
+      editButton.UseVisualStyleBackColor = true;
+      editButton.Click += editButton_Click;
+      // 
+      // deleteButton
+      // 
+      deleteButton.Anchor = AnchorStyles.Bottom | AnchorStyles.Right;
+      deleteButton.Location = new Point(339, 560);
+      deleteButton.Name = "deleteButton";
+      deleteButton.Size = new Size(112, 34);
+      deleteButton.TabIndex = 1;
+      deleteButton.Text = "Delete";
+      deleteButton.UseVisualStyleBackColor = true;
+      deleteButton.Click += deleteButton_Click;
+      // 
+      // reconnectButton
+      // 
+      reconnectButton.Anchor = AnchorStyles.Bottom | AnchorStyles.Right;
+      reconnectButton.Location = new Point(636, 560);
+      reconnectButton.Name = "reconnectButton";
+      reconnectButton.Size = new Size(112, 34);
+      reconnectButton.TabIndex = 3;
+      reconnectButton.Text = "Reconnect";
+      reconnectButton.UseVisualStyleBackColor = true;
+      reconnectButton.Click += reconnectButton_Click;
+      // 
+      // makeDefaultButton
+      // 
+      makeDefaultButton.Anchor = AnchorStyles.Bottom | AnchorStyles.Right;
+      makeDefaultButton.Location = new Point(473, 560);
+      makeDefaultButton.Name = "makeDefaultButton";
+      makeDefaultButton.Size = new Size(139, 34);
+      makeDefaultButton.TabIndex = 2;
+      makeDefaultButton.Text = "Make Default";
+      makeDefaultButton.UseVisualStyleBackColor = true;
+      makeDefaultButton.Click += makeDefaultButton_Click;
+      // 
+      // ConnectionManagerDialog
+      // 
+      AutoScaleDimensions = new SizeF(10F, 25F);
+      AutoScaleMode = AutoScaleMode.Font;
+      ClientSize = new Size(1115, 615);
+      Controls.Add(makeDefaultButton);
+      Controls.Add(reconnectButton);
+      Controls.Add(deleteButton);
+      Controls.Add(editButton);
+      Controls.Add(connectionsLabel);
+      Controls.Add(newButton);
+      Controls.Add(dataGridView1);
+      Name = "ConnectionManagerDialog";
+      Text = "Connection Manager";
+      ((System.ComponentModel.ISupportInitialize)dataGridView1).EndInit();
+      ResumeLayout(false);
+      PerformLayout();
+    }
+
+    #endregion
+
+    private ColorDialog colorDialog1;
+    private DataGridView dataGridView1;
+    private Button newButton;
+    private Label connectionsLabel;
+    private Button editButton;
+    private Button deleteButton;
+    private Button reconnectButton;
+    private Button makeDefaultButton;
+  }
+}
\ No newline at end of file
diff --git a/csharp/ExcelAddIn/views/ConnectionManagerDialog.cs b/csharp/ExcelAddIn/views/ConnectionManagerDialog.cs
new file mode 100644
index 00000000000..d56b79f950a
--- /dev/null
+++ b/csharp/ExcelAddIn/views/ConnectionManagerDialog.cs
@@ -0,0 +1,73 @@
+using Deephaven.ExcelAddIn.Viewmodels;
+
+namespace Deephaven.ExcelAddIn.Views;
+
+using SelectedRowsAction = Action<ConnectionManagerDialogRow[]>;
+
+public partial class ConnectionManagerDialog : Form {
+  public event Action? OnNewButtonClicked;
+  public event SelectedRowsAction? OnDeleteButtonClicked;
+  public event SelectedRowsAction? OnReconnectButtonClicked;
+  public event SelectedRowsAction? OnMakeDefaultButtonClicked;
+  public event SelectedRowsAction? OnEditButtonClicked;
+
+  private readonly BindingSource _bindingSource = new();
+
+  public ConnectionManagerDialog() {
+    InitializeComponent();
+
+    _bindingSource.DataSource = typeof(ConnectionManagerDialogRow);
+    dataGridView1.DataSource = _bindingSource;
+  }
+
+  public void AddRow(ConnectionManagerDialogRow row) {
+    if (InvokeRequired) {
+      Invoke(() => AddRow(row));
+      return;
+    }
+    _bindingSource.Add(row);
+    dataGridView1.ClearSelection();
+  }
+
+  public void RemoveRow(ConnectionManagerDialogRow row) {
+    if (InvokeRequired) {
+      Invoke(() => RemoveRow(row));
+      return;
+    }
+    _bindingSource.Remove(row);
+  }
+
+  private void newButton_Click(object sender, EventArgs e) {
+    OnNewButtonClicked?.Invoke();
+  }
+
+  private void reconnectButton_Click(object sender, EventArgs e) {
+    var selections = GetSelectedRows();
+    OnReconnectButtonClicked?.Invoke(selections);
+  }
+
+  private void editButton_Click(object sender, EventArgs e) {
+    var selections = GetSelectedRows();
+    OnEditButtonClicked?.Invoke(selections);
+  }
+
+  private void deleteButton_Click(object sender, EventArgs e) {
+    var selections = GetSelectedRows();
+    OnDeleteButtonClicked?.Invoke(selections);
+  }
+
+  private void makeDefaultButton_Click(object sender, EventArgs e) {
+    var selections = GetSelectedRows();
+    OnMakeDefaultButtonClicked?.Invoke(selections);
+  }
+
+  private ConnectionManagerDialogRow[] GetSelectedRows() {
+    var result = new List<ConnectionManagerDialogRow>();
+    var sr = dataGridView1.SelectedRows;
+    var count = sr.Count;
+    for (var i = 0; i != count; ++i) {
+      result.Add((ConnectionManagerDialogRow)sr[i].DataBoundItem);
+    }
+    return result.ToArray();
+  }
+}
diff --git a/csharp/ExcelAddIn/views/ConnectionManagerDialog.resx b/csharp/ExcelAddIn/views/ConnectionManagerDialog.resx
new file mode 100644
index 00000000000..7f2cf2b8014
--- /dev/null
+++ b/csharp/ExcelAddIn/views/ConnectionManagerDialog.resx
@@ -0,0 +1,123 @@
+<?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>
+  <metadata name="colorDialog1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+    <value>17, 17</value>
+  </metadata>
+</root>
\ No newline at end of file
diff --git a/csharp/ExcelAddIn/views/CredentialsDialog.Designer.cs b/csharp/ExcelAddIn/views/CredentialsDialog.Designer.cs
new file mode 100644
index 00000000000..aca6db6b75a
--- /dev/null
+++ b/csharp/ExcelAddIn/views/CredentialsDialog.Designer.cs
@@ -0,0 +1,400 @@
+namespace ExcelAddIn.views {
+  partial class CredentialsDialog {
+    /// <summary>
+    /// Required designer variable.
+    /// </summary>
+    private System.ComponentModel.IContainer components = null;
+
+    /// <summary>
+    /// Clean up any resources being used.
+    /// </summary>
+    /// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
+    protected override void Dispose(bool disposing) {
+      if (disposing && (components != null)) {
+        components.Dispose();
+      }
+      base.Dispose(disposing);
+    }
+
+    #region Windows Form Designer generated code
+
+    /// <summary>
+    /// Required method for Designer support - do not modify
+    /// the contents of this method with the code editor.
+    /// </summary>
+    private void InitializeComponent() {
+      corePlusPanel = new Panel();
+      label1 = new Label();
+      validateCertCheckBox = new CheckBox();
+      operateAsBox = new TextBox();
+      passwordBox = new TextBox();
+      passwordLabel = new Label();
+      userIdBox = new TextBox();
+      userIdLabel = new Label();
+      jsonUrlBox = new TextBox();
+      jsonUrlLabel = new Label();
+      corePanel = new Panel();
+      connectionStringBox = new TextBox();
+      label2 = new Label();
+      groupBox1 = new GroupBox();
+      sessionTypeIsGroovyButton = new RadioButton();
+      sessionTypeIsPythonButton = new RadioButton();
+      finalPanel = new Panel();
+      makeDefaultCheckBox = new CheckBox();
+      testResultsTextBox = new TextBox();
+      testResultsLabel = new Label();
+      testCredentialsButton = new Button();
+      setCredentialsButton = new Button();
+      isCorePlusRadioButton = new RadioButton();
+      isCoreRadioButton = new RadioButton();
+      endpointIdBox = new TextBox();
+      connectionIdLabel = new Label();
+      connectionTypeGroup = new GroupBox();
+      connectionIdPanel = new Panel();
+      corePlusPanel.SuspendLayout();
+      corePanel.SuspendLayout();
+      groupBox1.SuspendLayout();
+      finalPanel.SuspendLayout();
+      connectionTypeGroup.SuspendLayout();
+      connectionIdPanel.SuspendLayout();
+      SuspendLayout();
+      // 
+      // corePlusPanel
+      // 
+      corePlusPanel.Controls.Add(label1);
+      corePlusPanel.Controls.Add(validateCertCheckBox);
+      corePlusPanel.Controls.Add(operateAsBox);
+      corePlusPanel.Controls.Add(passwordBox);
+      corePlusPanel.Controls.Add(passwordLabel);
+      corePlusPanel.Controls.Add(userIdBox);
+      corePlusPanel.Controls.Add(userIdLabel);
+      corePlusPanel.Controls.Add(jsonUrlBox);
+      corePlusPanel.Controls.Add(jsonUrlLabel);
+      corePlusPanel.Dock = DockStyle.Top;
+      corePlusPanel.Location = new Point(0, 191);
+      corePlusPanel.Name = "corePlusPanel";
+      corePlusPanel.Size = new Size(1054, 299);
+      corePlusPanel.TabIndex = 2;
+      // 
+      // label1
+      // 
+      label1.AutoSize = true;
+      label1.Location = new Point(75, 183);
+      label1.Name = "label1";
+      label1.Size = new Size(96, 25);
+      label1.TabIndex = 217;
+      label1.Text = "OperateAs";
+      // 
+      // validateCertCheckBox
+      // 
+      validateCertCheckBox.AutoSize = true;
+      validateCertCheckBox.Location = new Point(194, 237);
+      validateCertCheckBox.Name = "validateCertCheckBox";
+      validateCertCheckBox.RightToLeft = RightToLeft.No;
+      validateCertCheckBox.Size = new Size(183, 29);
+      validateCertCheckBox.TabIndex = 5;
+      validateCertCheckBox.Text = "Validate Certificate";
+      validateCertCheckBox.UseVisualStyleBackColor = true;
+      // 
+      // operateAsBox
+      // 
+      operateAsBox.Anchor = AnchorStyles.Top | AnchorStyles.Left | AnchorStyles.Right;
+      operateAsBox.Location = new Point(194, 180);
+      operateAsBox.Name = "operateAsBox";
+      operateAsBox.PlaceholderText = "Leave blank for default";
+      operateAsBox.Size = new Size(795, 31);
+      operateAsBox.TabIndex = 4;
+      // 
+      // passwordBox
+      // 
+      passwordBox.Anchor = AnchorStyles.Top | AnchorStyles.Left | AnchorStyles.Right;
+      passwordBox.Location = new Point(194, 130);
+      passwordBox.Name = "passwordBox";
+      passwordBox.PasswordChar = '●';
+      passwordBox.Size = new Size(795, 31);
+      passwordBox.TabIndex = 3;
+      // 
+      // passwordLabel
+      // 
+      passwordLabel.AutoSize = true;
+      passwordLabel.Location = new Point(84, 133);
+      passwordLabel.Name = "passwordLabel";
+      passwordLabel.Size = new Size(87, 25);
+      passwordLabel.TabIndex = 4;
+      passwordLabel.Text = "Password";
+      // 
+      // userIdBox
+      // 
+      userIdBox.Anchor = AnchorStyles.Top | AnchorStyles.Left | AnchorStyles.Right;
+      userIdBox.Location = new Point(194, 82);
+      userIdBox.Name = "userIdBox";
+      userIdBox.Size = new Size(795, 31);
+      userIdBox.TabIndex = 2;
+      // 
+      // userIdLabel
+      // 
+      userIdLabel.AutoSize = true;
+      userIdLabel.Location = new Point(108, 85);
+      userIdLabel.Name = "userIdLabel";
+      userIdLabel.Size = new Size(63, 25);
+      userIdLabel.TabIndex = 2;
+      userIdLabel.Text = "UserId";
+      // 
+      // jsonUrlBox
+      // 
+      jsonUrlBox.Anchor = AnchorStyles.Top | AnchorStyles.Left | AnchorStyles.Right;
+      jsonUrlBox.Location = new Point(194, 27);
+      jsonUrlBox.Name = "jsonUrlBox";
+      jsonUrlBox.Size = new Size(795, 31);
+      jsonUrlBox.TabIndex = 1;
+      // 
+      // jsonUrlLabel
+      // 
+      jsonUrlLabel.AutoSize = true;
+      jsonUrlLabel.Location = new Point(89, 30);
+      jsonUrlLabel.Name = "jsonUrlLabel";
+      jsonUrlLabel.Size = new Size(91, 25);
+      jsonUrlLabel.TabIndex = 0;
+      jsonUrlLabel.Text = "JSON URL";
+      // 
+      // corePanel
+      // 
+      corePanel.Controls.Add(connectionStringBox);
+      corePanel.Controls.Add(label2);
+      corePanel.Controls.Add(groupBox1);
+      corePanel.Dock = DockStyle.Top;
+      corePanel.Location = new Point(0, 490);
+      corePanel.Name = "corePanel";
+      corePanel.Size = new Size(1054, 170);
+      corePanel.TabIndex = 3;
+      // 
+      // connectionStringBox
+      // 
+      connectionStringBox.Anchor = AnchorStyles.Top | AnchorStyles.Left | AnchorStyles.Right;
+      connectionStringBox.Location = new Point(194, 20);
+      connectionStringBox.Name = "connectionStringBox";
+      connectionStringBox.Size = new Size(795, 31);
+      connectionStringBox.TabIndex = 1;
+      // 
+      // label2
+      // 
+      label2.AutoSize = true;
+      label2.Location = new Point(27, 23);
+      label2.Name = "label2";
+      label2.Size = new Size(153, 25);
+      label2.TabIndex = 0;
+      label2.Text = "Connection String";
+      // 
+      // groupBox1
+      // 
+      groupBox1.Controls.Add(sessionTypeIsGroovyButton);
+      groupBox1.Controls.Add(sessionTypeIsPythonButton);
+      groupBox1.Location = new Point(18, 80);
+      groupBox1.Name = "groupBox1";
+      groupBox1.Size = new Size(970, 71);
+      groupBox1.TabIndex = 2;
+      groupBox1.TabStop = false;
+      groupBox1.Text = "Session Type";
+      // 
+      // sessionTypeIsGroovyButton
+      // 
+      sessionTypeIsGroovyButton.AutoSize = true;
+      sessionTypeIsGroovyButton.Location = new Point(338, 30);
+      sessionTypeIsGroovyButton.Name = "sessionTypeIsGroovyButton";
+      sessionTypeIsGroovyButton.Size = new Size(95, 29);
+      sessionTypeIsGroovyButton.TabIndex = 2;
+      sessionTypeIsGroovyButton.TabStop = true;
+      sessionTypeIsGroovyButton.Text = "Groovy";
+      sessionTypeIsGroovyButton.UseVisualStyleBackColor = true;
+      // 
+      // sessionTypeIsPythonButton
+      // 
+      sessionTypeIsPythonButton.AutoSize = true;
+      sessionTypeIsPythonButton.Location = new Point(192, 30);
+      sessionTypeIsPythonButton.Name = "sessionTypeIsPythonButton";
+      sessionTypeIsPythonButton.Size = new Size(93, 29);
+      sessionTypeIsPythonButton.TabIndex = 1;
+      sessionTypeIsPythonButton.TabStop = true;
+      sessionTypeIsPythonButton.Text = "Python";
+      sessionTypeIsPythonButton.UseVisualStyleBackColor = true;
+      // 
+      // finalPanel
+      // 
+      finalPanel.Controls.Add(makeDefaultCheckBox);
+      finalPanel.Controls.Add(testResultsTextBox);
+      finalPanel.Controls.Add(testResultsLabel);
+      finalPanel.Controls.Add(testCredentialsButton);
+      finalPanel.Controls.Add(setCredentialsButton);
+      finalPanel.Dock = DockStyle.Bottom;
+      finalPanel.Location = new Point(0, 481);
+      finalPanel.Name = "finalPanel";
+      finalPanel.Size = new Size(1054, 106);
+      finalPanel.TabIndex = 4;
+      // 
+      // makeDefaultCheckBox
+      // 
+      makeDefaultCheckBox.Anchor = AnchorStyles.Top | AnchorStyles.Right;
+      makeDefaultCheckBox.AutoSize = true;
+      makeDefaultCheckBox.Location = new Point(616, 53);
+      makeDefaultCheckBox.Name = "makeDefaultCheckBox";
+      makeDefaultCheckBox.Size = new Size(143, 29);
+      makeDefaultCheckBox.TabIndex = 2;
+      makeDefaultCheckBox.Text = "Make Default";
+      makeDefaultCheckBox.UseVisualStyleBackColor = true;
+      // 
+      // testResultsTextBox
+      // 
+      testResultsTextBox.Anchor = AnchorStyles.Top | AnchorStyles.Left | AnchorStyles.Right;
+      testResultsTextBox.Location = new Point(188, 13);
+      testResultsTextBox.Name = "testResultsTextBox";
+      testResultsTextBox.ReadOnly = true;
+      testResultsTextBox.Size = new Size(801, 31);
+      testResultsTextBox.TabIndex = 7;
+      // 
+      // testResultsLabel
+      // 
+      testResultsLabel.AutoSize = true;
+      testResultsLabel.Location = new Point(157, 48);
+      testResultsLabel.Name = "testResultsLabel";
+      testResultsLabel.Size = new Size(0, 25);
+      testResultsLabel.TabIndex = 6;
+      // 
+      // testCredentialsButton
+      // 
+      testCredentialsButton.Location = new Point(46, 11);
+      testCredentialsButton.Name = "testCredentialsButton";
+      testCredentialsButton.Size = new Size(134, 34);
+      testCredentialsButton.TabIndex = 1;
+      testCredentialsButton.Text = "Test Creds";
+      testCredentialsButton.UseVisualStyleBackColor = true;
+      testCredentialsButton.Click += testCredentialsButton_Click;
+      // 
+      // setCredentialsButton
+      // 
+      setCredentialsButton.Anchor = AnchorStyles.Top | AnchorStyles.Right;
+      setCredentialsButton.Location = new Point(789, 48);
+      setCredentialsButton.Name = "setCredentialsButton";
+      setCredentialsButton.Size = new Size(200, 34);
+      setCredentialsButton.TabIndex = 3;
+      setCredentialsButton.Text = "Set Credentials";
+      setCredentialsButton.UseVisualStyleBackColor = true;
+      setCredentialsButton.Click += setCredentialsButton_Click;
+      // 
+      // isCorePlusRadioButton
+      // 
+      isCorePlusRadioButton.AutoSize = true;
+      isCorePlusRadioButton.Location = new Point(192, 30);
+      isCorePlusRadioButton.Name = "isCorePlusRadioButton";
+      isCorePlusRadioButton.Size = new Size(169, 29);
+      isCorePlusRadioButton.TabIndex = 3;
+      isCorePlusRadioButton.TabStop = true;
+      isCorePlusRadioButton.Text = "Enterprise Core+";
+      isCorePlusRadioButton.UseVisualStyleBackColor = true;
+      // 
+      // isCoreRadioButton
+      // 
+      isCoreRadioButton.AutoSize = true;
+      isCoreRadioButton.Location = new Point(388, 30);
+      isCoreRadioButton.Name = "isCoreRadioButton";
+      isCoreRadioButton.Size = new Size(172, 29);
+      isCoreRadioButton.TabIndex = 4;
+      isCoreRadioButton.TabStop = true;
+      isCoreRadioButton.Text = "Community Core";
+      isCoreRadioButton.UseVisualStyleBackColor = true;
+      // 
+      // endpointIdBox
+      // 
+      endpointIdBox.Anchor = AnchorStyles.Top | AnchorStyles.Left | AnchorStyles.Right;
+      endpointIdBox.Location = new Point(194, 29);
+      endpointIdBox.Name = "endpointIdBox";
+      endpointIdBox.Size = new Size(795, 31);
+      endpointIdBox.TabIndex = 1;
+      // 
+      // connectionIdLabel
+      // 
+      connectionIdLabel.AutoSize = true;
+      connectionIdLabel.Location = new Point(46, 29);
+      connectionIdLabel.Name = "connectionIdLabel";
+      connectionIdLabel.Size = new Size(125, 25);
+      connectionIdLabel.TabIndex = 5;
+      connectionIdLabel.Text = "Connection ID";
+      // 
+      // connectionTypeGroup
+      // 
+      connectionTypeGroup.Controls.Add(isCorePlusRadioButton);
+      connectionTypeGroup.Controls.Add(isCoreRadioButton);
+      connectionTypeGroup.Location = new Point(34, 84);
+      connectionTypeGroup.Name = "connectionTypeGroup";
+      connectionTypeGroup.Size = new Size(588, 80);
+      connectionTypeGroup.TabIndex = 2;
+      connectionTypeGroup.TabStop = false;
+      connectionTypeGroup.Text = "Connection Type";
+      // 
+      // connectionIdPanel
+      // 
+      connectionIdPanel.Controls.Add(connectionIdLabel);
+      connectionIdPanel.Controls.Add(endpointIdBox);
+      connectionIdPanel.Controls.Add(connectionTypeGroup);
+      connectionIdPanel.Dock = DockStyle.Top;
+      connectionIdPanel.Location = new Point(0, 0);
+      connectionIdPanel.Name = "connectionIdPanel";
+      connectionIdPanel.Size = new Size(1054, 191);
+      connectionIdPanel.TabIndex = 1;
+      // 
+      // CredentialsDialog
+      // 
+      AutoScaleDimensions = new SizeF(10F, 25F);
+      AutoScaleMode = AutoScaleMode.Font;
+      ClientSize = new Size(1054, 587);
+      Controls.Add(finalPanel);
+      Controls.Add(corePanel);
+      Controls.Add(corePlusPanel);
+      Controls.Add(connectionIdPanel);
+      Name = "CredentialsDialog";
+      Text = "Credentials Editor";
+      corePlusPanel.ResumeLayout(false);
+      corePlusPanel.PerformLayout();
+      corePanel.ResumeLayout(false);
+      corePanel.PerformLayout();
+      groupBox1.ResumeLayout(false);
+      groupBox1.PerformLayout();
+      finalPanel.ResumeLayout(false);
+      finalPanel.PerformLayout();
+      connectionTypeGroup.ResumeLayout(false);
+      connectionTypeGroup.PerformLayout();
+      connectionIdPanel.ResumeLayout(false);
+      connectionIdPanel.PerformLayout();
+      ResumeLayout(false);
+    }
+
+    #endregion
+    private RadioButton isCorePlusRadioButton;
+    private RadioButton isCoreRadioButton;
+    private Button setCredentialsButton;
+    private TextBox endpointIdBox;
+    private Label connectionIdLabel;
+    private GroupBox connectionTypeGroup;
+    private Panel corePlusPanel;
+    private Panel corePanel;
+    private Label jsonUrlLabel;
+    private Label label2;
+    private TextBox jsonUrlBox;
+    private TextBox connectionStringBox;
+    private Label passwordLabel;
+    private TextBox userIdBox;
+    private Label userIdLabel;
+    private TextBox operateAsBox;
+    private TextBox passwordBox;
+    private Panel finalPanel;
+    private Button testCredentialsButton;
+    private Label testResultsLabel;
+    private TextBox testResultsTextBox;
+    private CheckBox makeDefaultCheckBox;
+    private CheckBox validateCertCheckBox;
+    private GroupBox groupBox1;
+    private RadioButton sessionTypeIsGroovyButton;
+    private RadioButton sessionTypeIsPythonButton;
+    private Panel connectionIdPanel;
+    private Label label1;
+  }
+}
\ No newline at end of file
diff --git a/csharp/ExcelAddIn/views/CredentialsDialog.cs b/csharp/ExcelAddIn/views/CredentialsDialog.cs
new file mode 100644
index 00000000000..f3b664cab31
--- /dev/null
+++ b/csharp/ExcelAddIn/views/CredentialsDialog.cs
@@ -0,0 +1,76 @@
+using Deephaven.ExcelAddIn.ViewModels;
+
+namespace ExcelAddIn.views {
+  public partial class CredentialsDialog : Form {
+    public event Action? OnSetCredentialsButtonClicked = null;
+    public event Action? OnTestCredentialsButtonClicked = null;
+
+    public CredentialsDialog(CredentialsDialogViewModel vm) {
+      InitializeComponent();
+      // Need to fire these bindings on property changed rather than simply on validation,
+      // because on validation is not responsive enough. Also, painful technical note:
+      // being a member of connectionTypeGroup *also* ensures that at most one of these buttons
+      // are checked. So you might think databinding is not necessary. However being in
+      // a group does nothing for the initial conditions. So the group doesn't care if
+      // *neither* of them are checked.
+      isCorePlusRadioButton.DataBindings.Add(new Binding(nameof(isCorePlusRadioButton.Checked),
+        vm, nameof(vm.IsCorePlus), false, DataSourceUpdateMode.OnPropertyChanged));
+      isCoreRadioButton.DataBindings.Add(new Binding(nameof(isCorePlusRadioButton.Checked),
+        vm, nameof(vm.IsCore), false, DataSourceUpdateMode.OnPropertyChanged));
+
+      // Make one of the two panels visible, according to the setting of the radio box.
+      corePlusPanel.DataBindings.Add(nameof(corePlusPanel.Visible), vm, nameof(vm.IsCorePlus));
+      corePanel.DataBindings.Add(nameof(corePanel.Visible), vm, nameof(vm.IsCore));
+
+      // Bind the ID
+      endpointIdBox.DataBindings.Add(nameof(endpointIdBox.Text), vm, nameof(vm.Id));
+
+      // Bind the Core+ properties
+      jsonUrlBox.DataBindings.Add(nameof(jsonUrlBox.Text), vm, nameof(vm.JsonUrl));
+      userIdBox.DataBindings.Add(nameof(userIdBox.Text), vm, nameof(vm.UserId));
+      passwordBox.DataBindings.Add(nameof(passwordBox.Text), vm, nameof(vm.Password));
+
+      operateAsBox.DataBindings.Add(nameof(operateAsBox.Text), vm, nameof(vm.OperateAs));
+
+      validateCertCheckBox.DataBindings.Add(nameof(validateCertCheckBox.Checked), vm, nameof(vm.ValidateCertificate));
+
+      // Bind the Core property (there's just one)
+      connectionStringBox.DataBindings.Add(nameof(connectionStringBox.Text),
+        vm, nameof(vm.ConnectionString));
+
+      // Bind the SessionType checkboxes
+      sessionTypeIsPythonButton.DataBindings.Add(nameof(sessionTypeIsPythonButton.Checked),
+        vm, nameof(vm.SessionTypeIsPython));
+      sessionTypeIsGroovyButton.DataBindings.Add(nameof(sessionTypeIsGroovyButton.Checked),
+        vm, nameof(vm.SessionTypeIsGroovy));
+
+      // Bind the IsDefault property
+      makeDefaultCheckBox.DataBindings.Add(nameof(makeDefaultCheckBox.Checked),
+        vm, nameof(vm.IsDefault));
+    }
+
+    public void SetTestResultsBox(string testResultsState) {
+      if (InvokeRequired) {
+        try {
+          Invoke(() => SetTestResultsBox(testResultsState));
+        } catch (InvalidOperationException) {
+          // TODO(kosak): figure out a better way to handle this race
+          // Invoke will fail if it is called after the form was closed. There is a race
+          // here that is pretty hard to get rid of. For now we catch the exception and
+          // throw away the value.
+        }
+        return;
+      }
+
+      testResultsTextBox.Text = testResultsState;
+    }
+
+    private void setCredentialsButton_Click(object sender, EventArgs e) {
+      OnSetCredentialsButtonClicked?.Invoke();
+    }
+
+    private void testCredentialsButton_Click(object sender, EventArgs e) {
+      OnTestCredentialsButtonClicked?.Invoke();
+    }
+  }
+}
diff --git a/csharp/ExcelAddIn/views/CredentialsDialog.resx b/csharp/ExcelAddIn/views/CredentialsDialog.resx
new file mode 100644
index 00000000000..4f24d55cd6b
--- /dev/null
+++ b/csharp/ExcelAddIn/views/CredentialsDialog.resx
@@ -0,0 +1,120 @@
+<?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>
+</root>
\ No newline at end of file
diff --git a/csharp/ExcelAddIn/views/DeephavenMessageBox.Designer.cs b/csharp/ExcelAddIn/views/DeephavenMessageBox.Designer.cs
new file mode 100644
index 00000000000..624a860a9af
--- /dev/null
+++ b/csharp/ExcelAddIn/views/DeephavenMessageBox.Designer.cs
@@ -0,0 +1,111 @@
+namespace ExcelAddIn.views {
+  partial class DeephavenMessageBox {
+    /// <summary>
+    /// Required designer variable.
+    /// </summary>
+    private System.ComponentModel.IContainer components = null;
+
+    /// <summary>
+    /// Clean up any resources being used.
+    /// </summary>
+    /// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
+    protected override void Dispose(bool disposing) {
+      if (disposing && (components != null)) {
+        components.Dispose();
+      }
+      base.Dispose(disposing);
+    }
+
+    #region Windows Form Designer generated code
+
+    /// <summary>
+    /// Required method for Designer support - do not modify
+    /// the contents of this method with the code editor.
+    /// </summary>
+    private void InitializeComponent() {
+      captionLabel = new Label();
+      contentsBox = new TextBox();
+      okButton = new Button();
+      captionPanel = new Panel();
+      cancelButton = new Button();
+      captionPanel.SuspendLayout();
+      SuspendLayout();
+      // 
+      // captionLabel
+      // 
+      captionLabel.Dock = DockStyle.Fill;
+      captionLabel.Font = new Font("Segoe UI", 20F, FontStyle.Regular, GraphicsUnit.Point, 0);
+      captionLabel.Location = new Point(0, 0);
+      captionLabel.Name = "captionLabel";
+      captionLabel.Size = new Size(751, 73);
+      captionLabel.TabIndex = 0;
+      captionLabel.Text = "Caption";
+      captionLabel.TextAlign = ContentAlignment.MiddleCenter;
+      // 
+      // contentsBox
+      // 
+      contentsBox.Anchor = AnchorStyles.Top | AnchorStyles.Bottom | AnchorStyles.Left | AnchorStyles.Right;
+      contentsBox.Location = new Point(40, 105);
+      contentsBox.Multiline = true;
+      contentsBox.Name = "contentsBox";
+      contentsBox.ReadOnly = true;
+      contentsBox.Size = new Size(716, 207);
+      contentsBox.TabIndex = 1;
+      contentsBox.TabStop = false;
+      // 
+      // okButton
+      // 
+      okButton.Anchor = AnchorStyles.Bottom | AnchorStyles.Right;
+      okButton.Location = new Point(644, 343);
+      okButton.Name = "okButton";
+      okButton.Size = new Size(112, 34);
+      okButton.TabIndex = 2;
+      okButton.Text = "OK";
+      okButton.UseVisualStyleBackColor = true;
+      okButton.Click += okButton_Click;
+      // 
+      // captionPanel
+      // 
+      captionPanel.Anchor = AnchorStyles.Top | AnchorStyles.Left | AnchorStyles.Right;
+      captionPanel.Controls.Add(captionLabel);
+      captionPanel.Location = new Point(24, 12);
+      captionPanel.Name = "captionPanel";
+      captionPanel.Size = new Size(751, 73);
+      captionPanel.TabIndex = 3;
+      // 
+      // cancelButton
+      // 
+      cancelButton.Anchor = AnchorStyles.Bottom | AnchorStyles.Right;
+      cancelButton.Location = new Point(513, 343);
+      cancelButton.Name = "cancelButton";
+      cancelButton.Size = new Size(112, 34);
+      cancelButton.TabIndex = 4;
+      cancelButton.Text = "Cancel";
+      cancelButton.UseVisualStyleBackColor = true;
+      cancelButton.Click += cancelButton_Click;
+      // 
+      // DeephavenMessageBox
+      // 
+      AutoScaleDimensions = new SizeF(10F, 25F);
+      AutoScaleMode = AutoScaleMode.Font;
+      ClientSize = new Size(800, 401);
+      Controls.Add(cancelButton);
+      Controls.Add(captionPanel);
+      Controls.Add(okButton);
+      Controls.Add(contentsBox);
+      Name = "DeephavenMessageBox";
+      Text = "Deephaven Message";
+      captionPanel.ResumeLayout(false);
+      ResumeLayout(false);
+      PerformLayout();
+    }
+
+    #endregion
+
+    private Label captionLabel;
+    private TextBox contentsBox;
+    private Button okButton;
+    private Panel captionPanel;
+    private Button cancelButton;
+  }
+}
\ No newline at end of file
diff --git a/csharp/ExcelAddIn/views/DeephavenMessageBox.cs b/csharp/ExcelAddIn/views/DeephavenMessageBox.cs
new file mode 100644
index 00000000000..8476f689b05
--- /dev/null
+++ b/csharp/ExcelAddIn/views/DeephavenMessageBox.cs
@@ -0,0 +1,34 @@
+using System;
+using System.Collections.Generic;
+using System.ComponentModel;
+using System.Data;
+using System.Drawing;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using System.Windows.Forms;
+
+namespace ExcelAddIn.views {
+  public partial class DeephavenMessageBox : Form {
+    public DeephavenMessageBox(string caption, string text, bool cancelVisible) {
+      InitializeComponent();
+
+      captionLabel.Text = caption;
+      contentsBox.Text = text;
+      cancelButton.Visible = cancelVisible;
+
+      AcceptButton = AcceptButton;
+      CancelButton = cancelButton;
+    }
+
+    private void okButton_Click(object sender, EventArgs e) {
+      DialogResult = DialogResult.OK;
+      Close();
+    }
+
+    private void cancelButton_Click(object sender, EventArgs e) {
+      DialogResult = DialogResult.Cancel;
+      Close();
+    }
+  }
+}
diff --git a/csharp/ExcelAddIn/views/DeephavenMessageBox.resx b/csharp/ExcelAddIn/views/DeephavenMessageBox.resx
new file mode 100644
index 00000000000..4f24d55cd6b
--- /dev/null
+++ b/csharp/ExcelAddIn/views/DeephavenMessageBox.resx
@@ -0,0 +1,120 @@
+<?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>
+</root>
\ No newline at end of file
diff --git a/csharp/ExcelAddInInstaller/.gitignore b/csharp/ExcelAddInInstaller/.gitignore
new file mode 100644
index 00000000000..2addde44586
--- /dev/null
+++ b/csharp/ExcelAddInInstaller/.gitignore
@@ -0,0 +1,2 @@
+ExcelAddInInstaller-SetupFiles/
+ExcelAddInInstaller-cache/
diff --git a/csharp/ExcelAddInInstaller/CustomActions/CustomActions.cs b/csharp/ExcelAddInInstaller/CustomActions/CustomActions.cs
new file mode 100644
index 00000000000..b5d996e49d3
--- /dev/null
+++ b/csharp/ExcelAddInInstaller/CustomActions/CustomActions.cs
@@ -0,0 +1,58 @@
+using System;
+
+namespace Deephaven.ExcelAddInInstaller.CustomActions {
+  public static class ErrorCodes {
+    // There are many, many possible error codes.
+    public const int Success = 0;
+    public const int Failure = 1603;
+  }
+
+  public static class Functions {
+    public static int RegisterAddIn(string msiHandle) {
+      return RunHelper(msiHandle, "RegisterAddIn", sess => DoRegisterAddIn(sess, true));
+    }
+
+    public static int UnregisterAddIn(string msiHandle) {
+      return RunHelper(msiHandle, "UnregisterAddIn", sess => DoRegisterAddIn(sess, false));
+    }
+
+    private static int RunHelper(string msiHandle, string what, Action<MsiSession> action) {
+      // First try to get a session
+      MsiSession session;
+      try {
+        session = new MsiSession(msiHandle);
+      } catch (Exception) {
+        // Didn't get very far
+        return ErrorCodes.Failure;
+      }
+
+      // Now that we have a session, we can log failures to the session if we need to
+      try {
+        session.Log($"{what} starting", MsiSession.InstallMessage.INFO);
+        action(session);
+        session.Log($"{what} completed successfully", MsiSession.InstallMessage.INFO);
+        return ErrorCodes.Success;
+      } catch (Exception ex) {
+        session.Log(ex.Message, MsiSession.InstallMessage.ERROR);
+        session.Log($"{what} exited with error", MsiSession.InstallMessage.ERROR);
+        return ErrorCodes.Failure;
+      }
+    }
+
+    private static void DoRegisterAddIn(MsiSession session, bool wantAddIn) {
+      var addInName = session.CustomActionData;
+      session.Log($"DoRegisterAddIn({wantAddIn}) with addin={addInName}", MsiSession.InstallMessage.INFO);
+      if (string.IsNullOrEmpty(addInName)) {
+        throw new ArgumentException("Expected addin path, got null or empty");
+      }
+
+      Action<string> logger = s => session.Log(s, MsiSession.InstallMessage.INFO);
+
+      if (!RegistryManager.TryMakeAddInEntryFromPath(addInName, out var addInEntry, out var failureReason) ||
+          !RegistryManager.TryCreate(logger, out var rm, out failureReason) ||
+          !rm.TryUpdateAddInKeys(addInEntry, wantAddIn, out failureReason)) {
+        throw new Exception(failureReason);
+      }
+    }
+  }
+}
diff --git a/csharp/ExcelAddInInstaller/CustomActions/CustomActions.csproj b/csharp/ExcelAddInInstaller/CustomActions/CustomActions.csproj
new file mode 100644
index 00000000000..a4d0e175883
--- /dev/null
+++ b/csharp/ExcelAddInInstaller/CustomActions/CustomActions.csproj
@@ -0,0 +1,58 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="15.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup>
+    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+    <ProductVersion>8.0.30703</ProductVersion>
+    <SchemaVersion>2.0</SchemaVersion>
+    <ProjectGuid>{2E432229-2429-499B-A2AB-69AB78A7EB21}</ProjectGuid>
+    <OutputType>Library</OutputType>
+    <AppDesignerFolder>Properties</AppDesignerFolder>
+    <RootNamespace>CustomActions</RootNamespace>
+    <AssemblyName>CustomActions</AssemblyName>
+    <TargetFrameworkVersion>v4.8</TargetFrameworkVersion>
+    <FileAlignment>512</FileAlignment>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+    <DebugSymbols>true</DebugSymbols>
+    <DebugType>full</DebugType>
+    <Optimize>false</Optimize>
+    <OutputPath>bin\Debug\</OutputPath>
+    <DefineConstants>DEBUG;TRACE</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+    <DebugType>pdbonly</DebugType>
+    <Optimize>true</Optimize>
+    <OutputPath>bin\Release\</OutputPath>
+    <DefineConstants>TRACE</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+  </PropertyGroup>
+  <ItemGroup>
+    <Reference Include="System" />
+    <Reference Include="System.Core" />
+    <Reference Include="System.Windows.Forms" />
+    <Reference Include="System.Xml.Linq" />
+    <Reference Include="System.Data.DataSetExtensions" />
+    <Reference Include="Microsoft.CSharp" />
+    <Reference Include="System.Data" />
+    <Reference Include="System.Xml" />
+  </ItemGroup>
+  <ItemGroup>
+    <Compile Include="CustomActions.cs" />
+    <Compile Include="MsiSession.cs" />
+    <Compile Include="Properties\AssemblyInfo.cs" />
+    <Compile Include="RegistryKeys.cs" />
+    <Compile Include="RegistryManager.cs" />
+  </ItemGroup>
+  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
+       Other similar extension points exist, see Microsoft.Common.targets.
+  <Target Name="BeforeBuild">
+  </Target>
+  <Target Name="AfterBuild">
+  </Target>
+  -->
+</Project>
\ No newline at end of file
diff --git a/csharp/ExcelAddInInstaller/CustomActions/CustomActions.sln b/csharp/ExcelAddInInstaller/CustomActions/CustomActions.sln
new file mode 100644
index 00000000000..d4fa94ddb4d
--- /dev/null
+++ b/csharp/ExcelAddInInstaller/CustomActions/CustomActions.sln
@@ -0,0 +1,31 @@
+
+Microsoft Visual Studio Solution File, Format Version 12.00
+# Visual Studio Version 17
+VisualStudioVersion = 17.11.35222.181
+MinimumVisualStudioVersion = 10.0.40219.1
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CustomActions", "CustomActions.csproj", "{2E432229-2429-499B-A2AB-69AB78A7EB21}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TestCustomActions", "..\TestCustomActions\TestCustomActions.csproj", "{8DD17371-1835-49D6-A8D6-741B9AE504DC}"
+EndProject
+Global
+	GlobalSection(SolutionConfigurationPlatforms) = preSolution
+		Debug|Any CPU = Debug|Any CPU
+		Release|Any CPU = Release|Any CPU
+	EndGlobalSection
+	GlobalSection(ProjectConfigurationPlatforms) = postSolution
+		{2E432229-2429-499B-A2AB-69AB78A7EB21}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{2E432229-2429-499B-A2AB-69AB78A7EB21}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{2E432229-2429-499B-A2AB-69AB78A7EB21}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{2E432229-2429-499B-A2AB-69AB78A7EB21}.Release|Any CPU.Build.0 = Release|Any CPU
+		{8DD17371-1835-49D6-A8D6-741B9AE504DC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{8DD17371-1835-49D6-A8D6-741B9AE504DC}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{8DD17371-1835-49D6-A8D6-741B9AE504DC}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{8DD17371-1835-49D6-A8D6-741B9AE504DC}.Release|Any CPU.Build.0 = Release|Any CPU
+	EndGlobalSection
+	GlobalSection(SolutionProperties) = preSolution
+		HideSolutionNode = FALSE
+	EndGlobalSection
+	GlobalSection(ExtensibilityGlobals) = postSolution
+		SolutionGuid = {24CAE7D4-A5F6-4CEE-BA2A-03D290ED784F}
+	EndGlobalSection
+EndGlobal
diff --git a/csharp/ExcelAddInInstaller/CustomActions/MsiSession.cs b/csharp/ExcelAddInInstaller/CustomActions/MsiSession.cs
new file mode 100644
index 00000000000..e6f36343792
--- /dev/null
+++ b/csharp/ExcelAddInInstaller/CustomActions/MsiSession.cs
@@ -0,0 +1,136 @@
+using System;
+using System.Linq;
+using System.Runtime.InteropServices;
+using System.Text;
+
+namespace Deephaven.ExcelAddInInstaller.CustomActions {
+  public class MsiSession {
+    public class NativeMethods {
+      public const ulong WS_VISIBLE = 0x10000000L;
+
+      public const int GWL_STYLE = -16;
+
+      // Declare the delegate for EnumWindows callback
+      public delegate bool EnumWindowsCallback(IntPtr hwnd, int lParam);
+
+      // Import the user32.dll library
+      [DllImport("user32.dll")]
+      public static extern int EnumWindows(EnumWindowsCallback callback, int lParam);
+
+      [DllImport("user32.dll")]
+      public static extern uint GetWindowThreadProcessId(IntPtr hWnd, out uint lpdwProcessId);
+
+      [DllImport("user32.dll", SetLastError = true)]
+      public static extern UInt32 GetWindowLong(IntPtr hWnd, int nIndex);
+
+      [DllImport("msi.dll", CharSet = CharSet.Unicode)]
+      public static extern uint MsiGetProperty(
+        int hInstall,
+        string szName,
+        StringBuilder szValueBuf,
+        ref uint pcchValueBuf);
+
+      [DllImport("msi.dll", CharSet = CharSet.Unicode)]
+      public static extern uint MsiSetProperty(int hInstall, string szName, string szValue);
+
+      [DllImport("msi.dll", CharSet = CharSet.Unicode)]
+      public static extern int MsiCreateRecord(uint cParams);
+
+      [DllImport("msi.dll", CharSet = CharSet.Unicode)]
+      public static extern uint MsiRecordSetString(int hRecord, uint iField, string szValue);
+
+      [DllImport("msi.dll", CharSet = CharSet.Unicode)]
+      public static extern int MsiProcessMessage(int hInstall, uint eMessageType, int hRecord);
+    }
+
+    public enum InstallMessage : uint {
+      FATALEXIT = 0x00000000, // premature termination, possibly fatal OOM
+      ERROR = 0x01000000, // formatted error message
+      WARNING = 0x02000000, // formatted warning message
+      USER = 0x03000000, // user request message
+      INFO = 0x04000000, // informative message for log
+      FILESINUSE = 0x05000000, // list of files in use that need to be replaced
+      RESOLVESOURCE = 0x06000000, // request to determine a valid source location
+      OUTOFDISKSPACE = 0x07000000, // insufficient disk space message
+      ACTIONSTART = 0x08000000, // start of action: action name & description
+      ACTIONDATA = 0x09000000, // formatted data associated with individual action item
+      PROGRESS = 0x0A000000, // progress gauge info: units so far, total
+      COMMONDATA = 0x0B000000, // product info for dialog: language Id, dialog caption
+      INITIALIZE = 0x0C000000, // sent prior to UI initialization, no string data
+      TERMINATE = 0x0D000000, // sent after UI termination, no string data
+      SHOWDIALOG = 0x0E000000, // sent prior to display or authored dialog or wizard
+    }
+
+    private IntPtr mMsiWindowHandle = IntPtr.Zero;
+
+    private bool EnumWindowCallback(IntPtr hwnd, int lParam) {
+      uint wnd_proc = 0;
+      NativeMethods.GetWindowThreadProcessId(hwnd, out wnd_proc);
+
+      if (wnd_proc == lParam) {
+        UInt32 style = NativeMethods.GetWindowLong(hwnd, NativeMethods.GWL_STYLE);
+        if ((style & NativeMethods.WS_VISIBLE) != 0) {
+          mMsiWindowHandle = hwnd;
+          return false;
+        }
+      }
+
+      return true;
+    }
+
+    public IntPtr MsiHandle { get; private set; }
+
+    public string CustomActionData { get; private set; }
+
+    public MsiSession(string aMsiHandle) {
+      if (string.IsNullOrEmpty(aMsiHandle))
+        throw new ArgumentNullException();
+
+      int msiHandle = 0;
+      if (!int.TryParse(aMsiHandle, out msiHandle))
+        throw new ArgumentException("Invalid msi handle");
+
+      MsiHandle = new IntPtr(msiHandle);
+
+      string allData = GetProperty("CustomActionData");
+      CustomActionData = allData.Split(new char[] { '|' }).First();
+    }
+
+    public string GetProperty(string aProperty) {
+      // Get buffer size
+      uint pSize = 0;
+      StringBuilder valueBuffer = new StringBuilder();
+      NativeMethods.MsiGetProperty(MsiHandle.ToInt32(), aProperty, valueBuffer, ref pSize);
+
+      // Get property value
+      pSize++; // null terminated
+      valueBuffer.Capacity = (int)pSize;
+      NativeMethods.MsiGetProperty(MsiHandle.ToInt32(), aProperty, valueBuffer, ref pSize);
+
+      return valueBuffer.ToString();
+    }
+
+    public void SetProperty(string aProperty, string aValue) {
+      NativeMethods.MsiSetProperty(MsiHandle.ToInt32(), aProperty, aValue);
+    }
+
+    public void Log(string aMessage, InstallMessage aMessageType) {
+      int hRecord = NativeMethods.MsiCreateRecord(1);
+      NativeMethods.MsiRecordSetString(hRecord, 0, "[1]");
+      NativeMethods.MsiRecordSetString(hRecord, 1, aMessage);
+      NativeMethods.MsiProcessMessage(MsiHandle.ToInt32(), (uint)aMessageType, hRecord);
+    }
+
+    public IntPtr GetMsiWindowHandle() {
+      string msiProcId = GetProperty("CLIENTPROCESSID");
+      if (string.IsNullOrEmpty(msiProcId))
+        return IntPtr.Zero;
+
+      IntPtr handle = new IntPtr(Convert.ToInt32(msiProcId));
+      mMsiWindowHandle = IntPtr.Zero;
+      NativeMethods.EnumWindows(EnumWindowCallback, (int)handle);
+
+      return mMsiWindowHandle;
+    }
+  }
+}
diff --git a/csharp/ExcelAddInInstaller/CustomActions/Properties/AssemblyInfo.cs b/csharp/ExcelAddInInstaller/CustomActions/Properties/AssemblyInfo.cs
new file mode 100644
index 00000000000..f23beb552e2
--- /dev/null
+++ b/csharp/ExcelAddInInstaller/CustomActions/Properties/AssemblyInfo.cs
@@ -0,0 +1,36 @@
+using System.Reflection;
+using System.Runtime.CompilerServices;
+using System.Runtime.InteropServices;
+
+// General Information about an assembly is controlled through the following 
+// set of attributes. Change these attribute values to modify the information
+// associated with an assembly.
+[assembly: AssemblyTitle("CustomActions")]
+[assembly: AssemblyDescription("")]
+[assembly: AssemblyConfiguration("")]
+[assembly: AssemblyCompany("")]
+[assembly: AssemblyProduct("CustomActions")]
+[assembly: AssemblyCopyright("Copyright ©  2024")]
+[assembly: AssemblyTrademark("")]
+[assembly: AssemblyCulture("")]
+
+// Setting ComVisible to false makes the types in this assembly not visible 
+// to COM components.  If you need to access a type in this assembly from 
+// COM, set the ComVisible attribute to true on that type.
+[assembly: ComVisible(false)]
+
+// The following GUID is for the ID of the typelib if this project is exposed to COM
+[assembly: Guid("2e432229-2429-499b-a2ab-69ab78a7eb21")]
+
+// Version information for an assembly consists of the following four values:
+//
+//      Major Version
+//      Minor Version 
+//      Build Number
+//      Revision
+//
+// You can specify all the values or you can default the Build and Revision Numbers 
+// by using the '*' as shown below:
+// [assembly: AssemblyVersion("1.0.*")]
+[assembly: AssemblyVersion("1.0.0.0")]
+[assembly: AssemblyFileVersion("1.0.0.0")]
diff --git a/csharp/ExcelAddInInstaller/CustomActions/README.md b/csharp/ExcelAddInInstaller/CustomActions/README.md
new file mode 100644
index 00000000000..bb1b8840868
--- /dev/null
+++ b/csharp/ExcelAddInInstaller/CustomActions/README.md
@@ -0,0 +1,134 @@
+# Background
+
+The purpose of this library is to add a "Custom Action" to our
+Advanced Installer package. This custom action does the actions
+needed to manipulate the Windows Registry in order to do things like
+
+1. Detect whether the version of Office installed is 32 or 64 bit
+2. Add the special keys that tell Excel to open an Excel Add-In at startup
+
+# Information about this library
+
+This library is a .NET 4.8.0 Class Library with some special boilerplate
+code provided by Advanced Installer.
+
+.NET 4.8.0 is pretty old at this point, but it was chosen because
+it is guaranteed to be present on Windows 10/11 installations. Note that
+this is *not* the runtime used by the Excel Add-In itself; that add-in uses
+a much more modern runtime (.NET 8). This is just the runtime used to
+support the custom actions (registry manipulations) in the installer.
+
+This library and its boilerplate code were created by adding a
+Visual Studio Extension provided by Advanced Installer to Visual Studio.
+The process for adding the extension is documented here:
+
+https://www.advancedinstaller.com/user-guide/create-dot-net-ca.html
+
+The steps are:
+
+* Open Visual Studio and navigate to Extensions → Manage Extensions.
+* In the Browse tab, search for Advanced Installer for Visual Studio
+  and press the Install button
+* Close and reopen Visual Studio to finalize the installation.
+* Now navigate to File → New → Project
+* From the list of templates, you will find two very-similar looking
+  templates:
+  1. "C# Custom Action" with description ".Net Custom Action Project
+     for Advanced Installer"
+  2. "C# Custom Action (.NET Framework)" with description ".Net Framework
+     Custom Action Project for Advanced Installer"
+
+The difference between these two templates has to do with the
+evolution of .NET. The original application framework
+was called ".NET Framework" and it ran only on Windows. The modern,
+cross-platform application framework is called simply .NET.
+Because for our purposes here we have decided to target an old
+.NET Framework version (4.8.0, see above), we choose the second
+option: "C# Custom Action (.NET Framework)".
+
+# Windows Registry
+
+These are the reasons we need to access the Windows Registry
+
+## Determining Office bitness
+
+To determine the "bitness" (32 or 64) of the version of Office that is
+installed, we look at this registry key:
+
+```
+HKEY_LOCAL_MACHINE\Software\Microsoft\Office\${VERSION}\Outlook
+```
+
+Notably, this information is stored at the "Outlook" part of the path,
+not Excel. This key contains an entry with the name
+"Bitness" and the values "x86" or "x64".
+
+${VERSION} refers to one of the known versions of Office, namely one of
+the strings in the set 11.0, 12.0, 14.0, 15.0, 16.0
+
+Version 16.0 covers Office 2016, 2019, and 2021 and Office 365, so
+for Deephaven purposes we can hardcode this to 16.0 and ignore previous
+versions we might find.
+
+As Windows evolved, the registry was divided into a 32-bit partition
+and a 64-bit partition. Office itself is published in 32-bit and 64-bit versions.
+The only configuration we currently support is 64-bit Office on 64-bit Windows.
+
+Due to this registry organization, when we look up this key programmatically,
+we need to look it up in the "Registry Hive" that corresponds to the machine's
+operating system bitness. This is why we have code like
+
+```
+var regView = Environment.Is64BitOperatingSystem ? RegistryView.Registry64 : RegistryView.Registry32;
+var regBase = RegistryKey.OpenBaseKey(RegistryHive.LocalMachine, regView);
+...
+var bitnessValue = subKey.GetValue(RegistryKeys.Bitness.Name);
+```
+
+However, this code is needlessly general because at this time we only support 64-bit Windows.
+
+## Modifying the set of installed Excel Add-Ins
+
+The relevant registry key here is:
+
+```
+HKEY_CURRENT_USER\Software\Microsoft\Office\${VERSION}\Excel\Options
+```
+
+Again, VERSION is hardcoded to 16.0. Also, unlike the bitness step, we
+don't have to write special code to pick a specific registry hive. This
+is why we have code like
+
+```
+var subKey = Registry.CurrentUser.OpenSubKey(RegistryKeys.OpenEntries.Key, true);
+```
+
+This key contains zero or more entries indicating which addins Excel
+should load when it starts. These entries have the following names,
+which follow the almost-regular pattern:
+
+OPEN, OPEN1, OPEN2, OPEN3, ...
+
+We say "almost-regular" because the first name is OPEN when you might
+expect to to be named OPEN0.
+
+These names must be kept dense. That is, if you delete some name that is
+not at the end of the sequence, you will need to move the later entries
+down to fill in the gap (e.g. the entry keyed by OPEN2 becomes OPEN1 etc).
+
+The value of these entries is a string that looks like the pattern
+
+```
+/R "${FULLPATHTOXLL}"
+```
+
+including the space and the quotation marks. For example, for user "kosak" the
+installer would make an entry that looks like this:
+
+```
+/R "C:\Users\kosak\AppData\Local\Deephaven Data Labs LLC\Deephaven Excel Add-In\DeephavenExcelAddIn64.xll"
+```
+
+The entry created by the installer follows the above format. Of course when we
+have to move the entries installed by other software (e.g. if we have to
+change OPEN3 to OPEN2), we treat the values as opaque strings.
diff --git a/csharp/ExcelAddInInstaller/CustomActions/RegistryKeys.cs b/csharp/ExcelAddInInstaller/CustomActions/RegistryKeys.cs
new file mode 100644
index 00000000000..3cdf0cf390c
--- /dev/null
+++ b/csharp/ExcelAddInInstaller/CustomActions/RegistryKeys.cs
@@ -0,0 +1,16 @@
+namespace Deephaven.ExcelAddInInstaller.CustomActions {
+  public static class RegistryKeys {
+    public static class Bitness {
+      // Key is in HKEY_LOCAL_MACHINE
+      public const string Key = @"Software\Microsoft\Office\16.0\Outlook";
+      public const string Name = "Bitness";
+      public const string Value64 = "x64";
+      public const string Value32 = "x86";
+    }
+
+    public static class OpenEntries {
+      // Key is in HKEY_CURRENT_USER
+      public const string Key = @"Software\Microsoft\Office\16.0\Excel\Options";
+    }
+  }
+}
diff --git a/csharp/ExcelAddInInstaller/CustomActions/RegistryManager.cs b/csharp/ExcelAddInInstaller/CustomActions/RegistryManager.cs
new file mode 100644
index 00000000000..18ad0de2b37
--- /dev/null
+++ b/csharp/ExcelAddInInstaller/CustomActions/RegistryManager.cs
@@ -0,0 +1,233 @@
+using Microsoft.Win32;
+using System;
+using System.Collections.Generic;
+using System.Text.RegularExpressions;
+
+namespace Deephaven.ExcelAddInInstaller.CustomActions {
+  public class RegistryManager {
+    public static bool TryCreate(Action<string> logger, out RegistryManager result, out string failureReason) {
+      result = null;
+      failureReason = "";
+
+      var regView = Environment.Is64BitOperatingSystem ? RegistryView.Registry64 : RegistryView.Registry32;
+      var regBase = RegistryKey.OpenBaseKey(RegistryHive.LocalMachine, regView);
+
+      if (!TryOpenSubKey(regBase, RegistryKeys.Bitness.Key, false,
+            out var bitnessKey, out failureReason) ||
+          !TryOpenSubKey(Registry.CurrentUser, RegistryKeys.OpenEntries.Key, true,
+            out var openKey, out failureReason)) {
+        return false;
+      }
+
+      result = new RegistryManager(bitnessKey, openKey, logger);
+      return true;
+    }
+
+    private static bool TryOpenSubKey(RegistryKey baseKey, string key, bool writable, out RegistryKey result, out string failureReason) {
+      failureReason = "";
+      result = baseKey.OpenSubKey(key, writable);
+      if (result == null) {
+        failureReason = $"Couldn't find registry key {RegistryKeys.Bitness.Key}";
+        return false;
+      }
+
+      return true;
+    }
+
+
+    public static bool TryMakeAddInEntryFromPath(string path, out string result, out string failureReason) {
+      result = "";
+      failureReason = "";
+      if (path.Contains("\"")) {
+        failureReason = "Path contains illegal characters";
+        return false;
+      }
+      result = $"/R \"{path}\"";
+      return true;
+    }
+
+    private readonly RegistryKey _registryKeyForBitness;
+    private readonly RegistryKey _registryKeyForOpen;
+    private readonly Action<string> _logger;
+
+    public RegistryManager(RegistryKey registryKeyForBitness, RegistryKey registryKeyForOpen,
+      Action<string> logger) {
+      _registryKeyForBitness = registryKeyForBitness;
+      _registryKeyForOpen = registryKeyForOpen;
+      _logger = logger;
+    }
+
+    /// <summary>
+    /// Determine whether the installed version of Office is the 32-bit version or the 64-bit version.
+    /// It's possible for example that the 32-bit version of Office can be installed on a 64-bit OS.
+    /// </summary>
+    /// <param name="is64Bit"></param>
+    /// <param name="failureReason"></param>
+    /// <returns></returns>
+    public bool TryDetermineBitness(out bool is64Bit, out string failureReason) {
+      is64Bit = false;
+      failureReason = "";
+
+      var bitnessValue = _registryKeyForBitness.GetValue(RegistryKeys.Bitness.Name);
+      if (bitnessValue == null) {
+        failureReason = $"Couldn't find entry for {RegistryKeys.Bitness.Name}";
+        return false;
+      }
+
+      if (bitnessValue.Equals(RegistryKeys.Bitness.Value64)) {
+        is64Bit = true;
+        return true;
+      }
+
+      if (bitnessValue.Equals(RegistryKeys.Bitness.Value32)) {
+        is64Bit = false;
+        return true;
+      }
+
+      failureReason = $"Unexpected bitness value {bitnessValue}";
+      return false;
+    }
+
+    /// <summary>
+    /// The job of this method is to make whatever changes are needed so that the registry ends up in
+    /// the desired state. The caller can express one of two desired states:
+    /// 1. The caller wants the registry to end up with 0 instances of "addInEntry"
+    /// 2. The caller wants the registry to end up with 1 instance of "addInEntry".
+    ///
+    /// Basically #1 means "delete the key if it's there, otherwise do nothing", and
+    /// #2 means "add the key if it's not there, otherwise do nothing". This is true
+    /// except for the fact that we also do some clean-up logic... For example if there's
+    /// a gap between OPEN\d+ entries, we will close the gap, and if there are multiple
+    /// entries for "addInEntry" we will reduce the final state to whatever the caller asked
+    /// for (either 0 or 1 entries).
+    ///
+    /// Briefly if you want to install the addin, you can pass true for 'resultContainsAddInEntry'.
+    /// If you want to remove the addin, you can pass false.
+    /// </summary>
+    /// <param name="addInEntry">The registry value for the OPEN\d+ key. This is normally something like /R "C:\path\to\addin.xll"
+    /// including the space and quotation marks</param>
+    /// <param name="resultContainsAddInEntry">true if you want the addInEntry present in the final result.
+    /// False if you want it absent from the final result</param>
+    /// <param name="failureReason">The human-readable reason the operation failed, if the method returns false</param>
+    /// <returns>True if the operation succeeded. Otherwise, false</returns>
+    public bool TryUpdateAddInKeys(string addInEntry, bool resultContainsAddInEntry, out string failureReason) {
+      if (!TryGetOpenEntries(out var currentEntries, out failureReason)) {
+        return false;
+      }
+
+      var resultMap = new SortedDictionary<int, BeforeAndAfter>();
+      foreach (var kvp in currentEntries) {
+        resultMap.LookupOrCreate(kvp.Item1).Before = kvp.Item2;
+      }
+
+      // The canonicalization step
+      var allowOneEntry = resultContainsAddInEntry;
+      var destKey = 0;
+      foreach (var entry in currentEntries) {
+        if (entry.Item2.Equals(addInEntry)) {
+          if (!allowOneEntry) {
+            continue;
+          }
+
+          allowOneEntry = false;
+        }
+
+        resultMap.LookupOrCreate(destKey++).After = entry.Item2;
+      }
+
+      // If there was no existing entry matching addInEntry, and the
+      // caller asked for it, then we still need to add it.
+      if (allowOneEntry) {
+        resultMap.LookupOrCreate(destKey).After = addInEntry;
+      }
+
+      // The commit step
+      foreach (var entry in resultMap) {
+        var index = entry.Key;
+        var ba = entry.Value;
+        var valueName = IndexToKey(index);
+        if (ba.After == null) {
+          _logger($"Delete {valueName}");
+          _registryKeyForOpen.DeleteValue(valueName);
+          continue;
+        }
+
+        if (ba.Before == null) {
+          _logger($"Set {valueName}={ba.After}");
+          _registryKeyForOpen.SetValue(valueName, ba.After);
+          continue;
+        }
+
+        if (ba.Before.Equals(ba.After)) {
+          _logger($"Leave {valueName} alone: already set to {ba.Before}");
+          continue;
+        }
+
+        _logger($"Rewrite {valueName} from {ba.Before} to {ba.After}");
+        _registryKeyForOpen.SetValue(valueName, ba.After);
+      }
+
+      return true;
+    }
+
+    private bool TryGetOpenEntries(out List<Tuple<int, string>> entries, out string failureReason) {
+      failureReason = "";
+      entries = new List<Tuple<int, string>>();
+
+      var entryKeys = _registryKeyForOpen.GetValueNames();
+      foreach (var entryKey in entryKeys) {
+        var value = _registryKeyForOpen.GetValue(entryKey);
+        if (value == null) {
+          failureReason = $"Entry is null for value {entryKey}";
+          return false;
+        }
+
+        if (!TryParseKey(entryKey, out var key)) {
+          continue;
+        }
+
+        var svalue = value as string;
+        if (svalue == null) {
+          failureReason = $"Entry is not a string for value {entryKey}";
+          return false;
+        }
+
+        entries.Add(Tuple.Create(key, svalue));
+      }
+
+      return true;
+    }
+
+    public static bool TryParseKey(string key, out int index) {
+      index = 0;
+      var regex = new Regex(@"^OPEN(\d*)$", RegexOptions.Singleline);
+      var match = regex.Match(key);
+      if (!match.Success) {
+        return false;
+      }
+
+      var digits = match.Groups[1].Value;
+      index = digits.Length > 0 ? int.Parse(digits) : 0;
+      return true;
+    }
+
+    public static string IndexToKey(int index) {
+      return index == 0 ? "OPEN" : "OPEN" + index;
+    }
+
+    private class BeforeAndAfter {
+      public string Before;
+      public string After;
+    }
+  }
+}
+
+static class ExtensionMethods {
+  public static V LookupOrCreate<K, V>(this IDictionary<K, V> dict, K key) where V : new() {
+    if (!dict.TryGetValue(key, out var value)) {
+      value = new V();
+      dict[key] = value;
+    }
+    return value;
+  }
+}
diff --git a/csharp/ExcelAddInInstaller/ExcelAddInInstaller.aip b/csharp/ExcelAddInInstaller/ExcelAddInInstaller.aip
new file mode 100644
index 00000000000..e67e5d01d15
--- /dev/null
+++ b/csharp/ExcelAddInInstaller/ExcelAddInInstaller.aip
@@ -0,0 +1,365 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<DOCUMENT Type="Advanced Installer" CreateVersion="22.1" version="22.2" Modules="professional" RootPath="." Language="en" Id="{2542DD81-4259-4F0E-B21E-D66548A2D561}">
+  <COMPONENT cid="caphyon.advinst.msicomp.MsiPropsComponent">
+    <ROW Property="AI_BITMAP_DISPLAY_MODE" Value="0"/>
+    <ROW Property="AI_PREDEF_LCONDS_PROPS" Value="AI_DETECTED_OFFICE_EXCEL64_VERSION"/>
+    <ROW Property="AI_REQUIRED_OFFICE_APPNAME" MultiBuildValue="DefaultBuild:Microsoft Excel for 64-bit from" ValueLocId="-"/>
+    <ROW Property="AI_REQUIRED_OFFICE_VERSION" MultiBuildValue="DefaultBuild:2016" ValueLocId="-"/>
+    <ROW Property="AI_ThemeStyle" Value="aero" MultiBuildValue="DefaultBuild:style6blue" MsiKey="AI_ThemeStyle"/>
+    <ROW Property="ALLUSERS" Value="1" MultiBuildValue="DefaultBuild:"/>
+    <ROW Property="ARPCOMMENTS" Value="This installer database contains the logic and data required to install [|ProductName]." ValueLocId="*"/>
+    <ROW Property="ARPPRODUCTICON" Value="Icon.exe" Type="8"/>
+    <ROW Property="BannerBitmap" Value="banner.jpg" MultiBuildValue="DefaultBuild:Banner.jpg" Type="1" MsiKey="BannerBitmap"/>
+    <ROW Property="DialogBitmap" Value="dialog.jpg" MultiBuildValue="DefaultBuild:Dialog.jpg" Type="1" MsiKey="DialogBitmap"/>
+    <ROW Property="Manufacturer" Value="Deephaven Data Labs LLC"/>
+    <ROW Property="ProductCode" Value="1033:{5C1E1B63-CC23-4F4D-8564-A843AA5D7413} " Type="16"/>
+    <ROW Property="ProductLanguage" Value="1033"/>
+    <ROW Property="ProductName" Value="Deephaven Excel Add-In"/>
+    <ROW Property="ProductVersion" Value="1.0.0" Options="32"/>
+    <ROW Property="SecureCustomProperties" Value="OLDPRODUCTS;AI_NEWERPRODUCTFOUND"/>
+    <ROW Property="UpgradeCode" Value="{98EB9359-8BA3-44BA-A411-AED290E6EBD9}"/>
+    <ROW Property="WindowsType9X" MultiBuildValue="DefaultBuild:Windows 9x/ME" ValueLocId="-"/>
+    <ROW Property="WindowsType9XDisplay" MultiBuildValue="DefaultBuild:Windows 9x/ME" ValueLocId="-"/>
+    <ROW Property="WindowsTypeNT40" MultiBuildValue="DefaultBuild:Windows NT 4.0" ValueLocId="-"/>
+    <ROW Property="WindowsTypeNT40Display" MultiBuildValue="DefaultBuild:Windows NT 4.0" ValueLocId="-"/>
+    <ROW Property="WindowsTypeNT50" MultiBuildValue="DefaultBuild:Windows 2000" ValueLocId="-"/>
+    <ROW Property="WindowsTypeNT50Display" MultiBuildValue="DefaultBuild:Windows 2000" ValueLocId="-"/>
+    <ROW Property="WindowsTypeNT5X" MultiBuildValue="DefaultBuild:Windows XP/2003" ValueLocId="-"/>
+    <ROW Property="WindowsTypeNT5XDisplay" MultiBuildValue="DefaultBuild:Windows XP/2003" ValueLocId="-"/>
+    <ROW Property="WindowsTypeNT60" MultiBuildValue="DefaultBuild:Windows Vista/Server 2008" ValueLocId="-"/>
+    <ROW Property="WindowsTypeNT60Display" MultiBuildValue="DefaultBuild:Windows Vista/Server 2008" ValueLocId="-"/>
+  </COMPONENT>
+  <COMPONENT cid="caphyon.advinst.msicomp.MsiDirsComponent">
+    <ROW Directory="APPDIR" Directory_Parent="TARGETDIR" DefaultDir="APPDIR:." IsPseudoRoot="1"/>
+    <ROW Directory="LocalAppDataFolder" Directory_Parent="TARGETDIR" DefaultDir="LOCALA~1|LocalAppDataFolder" IsPseudoRoot="1"/>
+    <ROW Directory="ProductCode_Dir" Directory_Parent="TempFolder" DefaultDir="{A62EE~1|[|ProductCode]"/>
+    <ROW Directory="TARGETDIR" DefaultDir="SourceDir"/>
+    <ROW Directory="TempFolder" Directory_Parent="TARGETDIR" DefaultDir="TEMPFO~1|TempFolder" IsPseudoRoot="1"/>
+  </COMPONENT>
+  <COMPONENT cid="caphyon.advinst.msicomp.SideBySideGuidComponent">
+    <ROW Component="APPDIR" Value="{8E979EB8-436A-46EE-9EAA-85B439FF9FB1}"/>
+    <ROW Component="ProductInformation" Value="{29C82426-B735-49FE-ACCB-50C954DEAF1C}"/>
+  </COMPONENT>
+  <COMPONENT cid="caphyon.advinst.msicomp.MsiCompsComponent">
+    <ROW Component="A0BFC224E0E9125ADE0B2DBF343" ComponentId="{E1ADD312-FEAA-4B64-B0E8-083F28287442}" Directory_="APPDIR" Attributes="260" KeyPath="A0BFC224E0E9125ADE0B2DBF343" Options="2"/>
+    <ROW Component="APPDIR" ComponentId="{8E979EB8-436A-46EE-9EAA-85B439FF9FB1}" Directory_="APPDIR" Attributes="0"/>
+    <ROW Component="DeephavenExcelAddIn64.xll" ComponentId="{CF574125-3DCE-4858-BBCC-ECD6E32B781E}" Directory_="APPDIR" Attributes="256" KeyPath="DeephavenExcelAddIn64.xll" Type="0"/>
+    <ROW Component="ProductInformation" ComponentId="{29C82426-B735-49FE-ACCB-50C954DEAF1C}" Directory_="APPDIR" Attributes="260" KeyPath="Version"/>
+    <ROW Component="abseil_dll.dll" ComponentId="{7E56EC3A-BA00-43E6-8659-C10B6D58E53E}" Directory_="APPDIR" Attributes="256" KeyPath="abseil_dll.dll"/>
+    <ROW Component="arrow.dll" ComponentId="{6895D083-4D73-4654-B9F1-59715644668E}" Directory_="APPDIR" Attributes="256" KeyPath="arrow.dll"/>
+    <ROW Component="arrow_flight.dll" ComponentId="{F79A2509-CEDD-46E1-8B5E-8C9E735A3C6C}" Directory_="APPDIR" Attributes="256" KeyPath="arrow_flight.dll"/>
+    <ROW Component="brotlicommon.dll" ComponentId="{5D982FB9-8F2E-49BC-AF60-30D04AF57FA2}" Directory_="APPDIR" Attributes="256" KeyPath="brotlicommon.dll"/>
+    <ROW Component="brotlidec.dll" ComponentId="{6F74A593-2EC2-4E16-9458-966382689218}" Directory_="APPDIR" Attributes="256" KeyPath="brotlidec.dll"/>
+    <ROW Component="brotlienc.dll" ComponentId="{67FDEB0E-056B-41BF-BCA8-FB83A527C735}" Directory_="APPDIR" Attributes="256" KeyPath="brotlienc.dll"/>
+    <ROW Component="bz2.dll" ComponentId="{FBABD05F-C799-47AE-96DF-4C23FDFCF38C}" Directory_="APPDIR" Attributes="256" KeyPath="bz2.dll"/>
+    <ROW Component="cares.dll" ComponentId="{97888E6E-37B4-456F-BEAA-B0603839A0FA}" Directory_="APPDIR" Attributes="256" KeyPath="cares.dll"/>
+    <ROW Component="dhclient.dll" ComponentId="{9510FF7B-CB72-4C8A-B66F-05739F2CBEE2}" Directory_="APPDIR" Attributes="256" KeyPath="dhclient.dll"/>
+    <ROW Component="dhcore.dll" ComponentId="{1DF10FDE-2406-4DD0-AAA7-67A0DF94783B}" Directory_="APPDIR" Attributes="256" KeyPath="dhcore.dll"/>
+    <ROW Component="dhe_client.dll" ComponentId="{F613A5EE-73C5-4102-8B28-0AE2F823584E}" Directory_="APPDIR" Attributes="256" KeyPath="dhe_client.dll"/>
+    <ROW Component="libcrypto3x64.dll" ComponentId="{0FEE5E19-60A0-48CC-A4CD-6CB904C82B4E}" Directory_="APPDIR" Attributes="256" KeyPath="libcrypto3x64.dll"/>
+    <ROW Component="libcurl.dll" ComponentId="{CD92844F-BFFB-456F-80F8-2389EC8F3787}" Directory_="APPDIR" Attributes="256" KeyPath="libcurl.dll"/>
+    <ROW Component="libprotobuf.dll" ComponentId="{C9B88CBB-301E-4847-8D16-EF616BE157F8}" Directory_="APPDIR" Attributes="256" KeyPath="libprotobuf.dll"/>
+    <ROW Component="libssl3x64.dll" ComponentId="{F1CD4DBD-FE5E-4BA8-ADC1-941F87570DD0}" Directory_="APPDIR" Attributes="256" KeyPath="libssl3x64.dll"/>
+    <ROW Component="lz4.dll" ComponentId="{653A6DC4-609B-485A-A238-D65038505E63}" Directory_="APPDIR" Attributes="256" KeyPath="lz4.dll"/>
+    <ROW Component="re2.dll" ComponentId="{0BFC02DF-B472-471C-9C12-0A88F2DC04BC}" Directory_="APPDIR" Attributes="256" KeyPath="re2.dll"/>
+    <ROW Component="snappy.dll" ComponentId="{14E4CD7A-5C94-4F47-9EEF-1B03D93D02ED}" Directory_="APPDIR" Attributes="256" KeyPath="snappy.dll"/>
+    <ROW Component="zlib1.dll" ComponentId="{FD4F9A70-997B-4806-8650-35094065E98B}" Directory_="APPDIR" Attributes="256" KeyPath="zlib1.dll"/>
+    <ROW Component="zstd.dll" ComponentId="{4DE80229-9EDC-40D0-9B91-4E6BCECAC0C9}" Directory_="APPDIR" Attributes="256" KeyPath="zstd.dll"/>
+  </COMPONENT>
+  <COMPONENT cid="caphyon.advinst.msicomp.MsiFeatsComponent">
+    <ROW Feature="A0BFC224E0E9125ADE0B2DBF343" Title=".NET Desktop Runtime 8.0.8 x64" Description=".NET Desktop Runtime 8.0.8 x64" Display="3" Level="1" Attributes="0"/>
+    <ROW Feature="MainFeature" Title="MainFeature" Description="Description" Display="1" Level="1" Directory_="APPDIR" Attributes="0"/>
+    <ATTRIBUTE name="CurrentFeature" value="MainFeature"/>
+  </COMPONENT>
+  <COMPONENT cid="caphyon.advinst.msicomp.MsiFilesComponent">
+    <ROW File="DeephavenExcelAddIn64.xll" Component_="DeephavenExcelAddIn64.xll" FileName="DEEPHA~1.XLL|DeephavenExcelAddIn64.xll" Attributes="0" SourcePath="..\ExcelAddIn\bin\Debug\net8.0-windows\publish\DeephavenExcelAddIn64.xll" SelfReg="false" DigSign="true"/>
+    <ROW File="abseil_dll.dll" Component_="abseil_dll.dll" FileName="ABSEIL~1.DLL|abseil_dll.dll" Attributes="0" SourcePath="dhinstall\bin\abseil_dll.dll" SelfReg="false" DigSign="true"/>
+    <ROW File="arrow.dll" Component_="arrow.dll" FileName="arrow.dll" Attributes="0" SourcePath="dhinstall\bin\arrow.dll" SelfReg="false" DigSign="true"/>
+    <ROW File="arrow_flight.dll" Component_="arrow_flight.dll" FileName="ARROW_~1.DLL|arrow_flight.dll" Attributes="0" SourcePath="dhinstall\bin\arrow_flight.dll" SelfReg="false" DigSign="true"/>
+    <ROW File="brotlicommon.dll" Component_="brotlicommon.dll" FileName="BROTLI~1.DLL|brotlicommon.dll" Attributes="0" SourcePath="dhinstall\bin\brotlicommon.dll" SelfReg="false" DigSign="true"/>
+    <ROW File="brotlidec.dll" Component_="brotlidec.dll" FileName="BROTLI~2.DLL|brotlidec.dll" Attributes="0" SourcePath="dhinstall\bin\brotlidec.dll" SelfReg="false" DigSign="true"/>
+    <ROW File="brotlienc.dll" Component_="brotlienc.dll" FileName="BROTLI~3.DLL|brotlienc.dll" Attributes="0" SourcePath="dhinstall\bin\brotlienc.dll" SelfReg="false" DigSign="true"/>
+    <ROW File="bz2.dll" Component_="bz2.dll" FileName="bz2.dll" Attributes="0" SourcePath="dhinstall\bin\bz2.dll" SelfReg="false" DigSign="true"/>
+    <ROW File="cares.dll" Component_="cares.dll" FileName="cares.dll" Attributes="0" SourcePath="dhinstall\bin\cares.dll" SelfReg="false" DigSign="true"/>
+    <ROW File="dhclient.dll" Component_="dhclient.dll" FileName="dhclient.dll" Attributes="0" SourcePath="dhinstall\bin\dhclient.dll" SelfReg="false" DigSign="true"/>
+    <ROW File="dhcore.dll" Component_="dhcore.dll" FileName="dhcore.dll" Attributes="0" SourcePath="dhinstall\bin\dhcore.dll" SelfReg="false" DigSign="true"/>
+    <ROW File="dhe_client.dll" Component_="dhe_client.dll" FileName="DHE_CL~1.DLL|dhe_client.dll" Attributes="0" SourcePath="dhinstall\bin\dhe_client.dll" SelfReg="false" DigSign="true"/>
+    <ROW File="libcrypto3x64.dll" Component_="libcrypto3x64.dll" FileName="LIBCRY~1.DLL|libcrypto-3-x64.dll" Attributes="0" SourcePath="dhinstall\bin\libcrypto-3-x64.dll" SelfReg="false" DigSign="true"/>
+    <ROW File="libcurl.dll" Component_="libcurl.dll" FileName="libcurl.dll" Attributes="0" SourcePath="dhinstall\bin\libcurl.dll" SelfReg="false" DigSign="true"/>
+    <ROW File="libprotobuf.dll" Component_="libprotobuf.dll" FileName="LIBPRO~1.DLL|libprotobuf.dll" Attributes="0" SourcePath="dhinstall\bin\libprotobuf.dll" SelfReg="false" DigSign="true"/>
+    <ROW File="libssl3x64.dll" Component_="libssl3x64.dll" FileName="LIBSSL~1.DLL|libssl-3-x64.dll" Attributes="0" SourcePath="dhinstall\bin\libssl-3-x64.dll" SelfReg="false" DigSign="true"/>
+    <ROW File="lz4.dll" Component_="lz4.dll" FileName="lz4.dll" Attributes="0" SourcePath="dhinstall\bin\lz4.dll" SelfReg="false" DigSign="true"/>
+    <ROW File="re2.dll" Component_="re2.dll" FileName="re2.dll" Attributes="0" SourcePath="dhinstall\bin\re2.dll" SelfReg="false" DigSign="true"/>
+    <ROW File="snappy.dll" Component_="snappy.dll" FileName="snappy.dll" Attributes="0" SourcePath="dhinstall\bin\snappy.dll" SelfReg="false" DigSign="true"/>
+    <ROW File="zlib1.dll" Component_="zlib1.dll" FileName="zlib1.dll" Attributes="0" SourcePath="dhinstall\bin\zlib1.dll" SelfReg="false" DigSign="true"/>
+    <ROW File="zstd.dll" Component_="zstd.dll" FileName="zstd.dll" Attributes="0" SourcePath="dhinstall\bin\zstd.dll" SelfReg="false" DigSign="true"/>
+  </COMPONENT>
+  <COMPONENT cid="caphyon.advinst.msicomp.BootstrOptComponent">
+    <ROW BootstrOptKey="GlobalOptions" DownloadFolder="[AppDataFolder][|Manufacturer]\[|ProductName]\prerequisites" Options="2"/>
+  </COMPONENT>
+  <COMPONENT cid="caphyon.advinst.msicomp.BootstrapperUISequenceComponent">
+    <ROW Action="AI_BACKUP_AI_SETUPEXEPATH" Sequence="249"/>
+    <ROW Action="AI_RESTORE_AI_SETUPEXEPATH" Condition="AI_SETUPEXEPATH_ORIGINAL" Sequence="252"/>
+    <ROW Action="AI_DownloadPrereq" Condition="AI_BOOTSTRAPPER AND (NOT AI_PrereqsFulfilled)" Sequence="695"/>
+    <ROW Action="AI_ExtractPrereq" Condition="AI_BOOTSTRAPPER AND (NOT AI_PrereqsFulfilled)" Sequence="696"/>
+    <ROW Action="AI_InstallPrePrerequisite" Condition="AI_BOOTSTRAPPER AND (NOT AI_PrereqsFulfilled)" Sequence="697"/>
+    <ROW Action="AI_VerifyPrePrereq" Condition="AI_BOOTSTRAPPER AND (NOT AI_PrereqsFulfilled)" Sequence="698"/>
+    <ROW Action="AI_CleanPrePrereq" Condition="AI_BOOTSTRAPPER AND (NOT AI_PrereqsFulfilled)" Sequence="699"/>
+    <ROW Action="AI_AppSearchEx" Condition="AI_BOOTSTRAPPER" Sequence="251"/>
+    <ROW Action="AI_DetectSoftware" Sequence="151"/>
+  </COMPONENT>
+  <COMPONENT cid="caphyon.advinst.msicomp.BuildComponent">
+    <ROW BuildKey="DefaultBuild" BuildName="DefaultBuild" BuildOrder="1" BuildType="0" Languages="en" InstallationType="4" SummInfoMetadata="Page Count:450" ExtUI="true" UseLargeSchema="true" MsiPackageType="x64"/>
+  </COMPONENT>
+  <COMPONENT cid="caphyon.advinst.msicomp.DictionaryComponent">
+    <ROW Path="&lt;AI_DICTS&gt;ui.ail"/>
+    <ROW Path="&lt;AI_DICTS&gt;ui_en.ail"/>
+  </COMPONENT>
+  <COMPONENT cid="caphyon.advinst.msicomp.DigCertStoreComponent">
+    <ROW TimeStampUrl="http://timestamp.digicert.com" SignerDescription="[|ProductName]" SignOptions="7" SignTool="0" UseSha256="1" Subject="CN=Deephaven Data Labs LLC, O=Deephaven Data Labs LLC, L=Plymouth, S=Minnesota, C=US" Store="User\MY"/>
+  </COMPONENT>
+  <COMPONENT cid="caphyon.advinst.msicomp.FragmentComponent">
+    <ROW Fragment="CommonUI.aip" Path="&lt;AI_FRAGS&gt;CommonUI.aip"/>
+    <ROW Fragment="FolderDlg.aip" Path="&lt;AI_THEMES&gt;classic\fragments\FolderDlg.aip"/>
+    <ROW Fragment="MaintenanceTypeDlg.aip" Path="&lt;AI_THEMES&gt;classic\fragments\MaintenanceTypeDlg.aip"/>
+    <ROW Fragment="MaintenanceWelcomeDlg.aip" Path="&lt;AI_THEMES&gt;classic\fragments\MaintenanceWelcomeDlg.aip"/>
+    <ROW Fragment="SequenceDialogs.aip" Path="&lt;AI_THEMES&gt;classic\fragments\SequenceDialogs.aip"/>
+    <ROW Fragment="Sequences.aip" Path="&lt;AI_FRAGS&gt;Sequences.aip"/>
+    <ROW Fragment="StaticUIStrings.aip" Path="&lt;AI_FRAGS&gt;StaticUIStrings.aip"/>
+    <ROW Fragment="Themes.aip" Path="&lt;AI_FRAGS&gt;Themes.aip"/>
+    <ROW Fragment="UI.aip" Path="&lt;AI_THEMES&gt;classic\fragments\UI.aip"/>
+    <ROW Fragment="Validation.aip" Path="&lt;AI_FRAGS&gt;Validation.aip"/>
+    <ROW Fragment="VerifyRemoveDlg.aip" Path="&lt;AI_THEMES&gt;classic\fragments\VerifyRemoveDlg.aip"/>
+    <ROW Fragment="VerifyRepairDlg.aip" Path="&lt;AI_THEMES&gt;classic\fragments\VerifyRepairDlg.aip"/>
+    <ROW Fragment="WelcomeDlg.aip" Path="&lt;AI_THEMES&gt;classic\fragments\WelcomeDlg.aip"/>
+  </COMPONENT>
+  <COMPONENT cid="caphyon.advinst.msicomp.MsiActionTextComponent">
+    <ROW Action="AI_DownloadPrereq" Description="Downloading prerequisite software" DescriptionLocId="ActionText.Description.AI_DownloadPrereq" Template="[1]" TemplateLocId="ActionText.Template.AI_DownloadPrereq"/>
+    <ROW Action="AI_ExtractPrereq" Description="Extracting prerequisite software" DescriptionLocId="ActionText.Description.AI_ExtractPrereq" Template="[1]" TemplateLocId="ActionText.Template.AI_ExtractPrereq"/>
+    <ROW Action="AI_InstallPostPrerequisite" Description="Configuring prerequisite software" DescriptionLocId="ActionText.Description.AI_InstallPrerequisite" Template="[1]" TemplateLocId="ActionText.Template.AI_InstallPrerequisite"/>
+    <ROW Action="AI_InstallPrePrerequisite" Description="Configuring prerequisite software" DescriptionLocId="ActionText.Description.AI_InstallPrerequisite" Template="[1]" TemplateLocId="ActionText.Template.AI_InstallPrerequisite"/>
+    <ROW Action="AI_InstallPrerequisite" Description="Configuring prerequisite software" DescriptionLocId="ActionText.Description.AI_InstallPrerequisite" Template="[1]" TemplateLocId="ActionText.Template.AI_InstallPrerequisite"/>
+    <ROW Action="AI_VerifyPrePrereq" Description="Verifying prerequisites" DescriptionLocId="ActionText.Description.AI_VerifyPrereq" Template="[1] was not installed correctly." TemplateLocId="ActionText.Template.AI_VerifyPrereq"/>
+    <ROW Action="AI_VerifyPrereq" Description="Verifying prerequisites" DescriptionLocId="ActionText.Description.AI_VerifyPrereq" Template="[1] was not installed correctly." TemplateLocId="ActionText.Template.AI_VerifyPrereq"/>
+  </COMPONENT>
+  <COMPONENT cid="caphyon.advinst.msicomp.MsiBinaryComponent">
+    <ROW Name="Banner.jpg" SourcePath="resources\Banner.jpg"/>
+    <ROW Name="Dialog.jpg" SourcePath="resources\Dialog.jpg"/>
+    <ROW Name="DotNetMethodCaller.dll" SourcePath="&lt;AI_CUSTACTS&gt;DotNetMethodCaller.dll"/>
+    <ROW Name="DotNetMethodCaller.dll_1" SourcePath="&lt;AI_CUSTACTS64&gt;DotNetMethodCaller.dll"/>
+    <ROW Name="Prereq.dll" SourcePath="&lt;AI_CUSTACTS&gt;Prereq.dll"/>
+    <ROW Name="SoftwareDetector.dll" SourcePath="&lt;AI_CUSTACTS&gt;SoftwareDetector.dll"/>
+    <ROW Name="aicustact.dll" SourcePath="&lt;AI_CUSTACTS&gt;aicustact.dll"/>
+    <ROW Name="certificateinstaller.exe" SourcePath="&lt;AI_CUSTACTS&gt;certificateinstaller.exe"/>
+    <ROW Name="file_deleter.ps1" SourcePath="&lt;AI_SCRIPTS&gt;file_deleter.ps1"/>
+    <ROW Name="tempFiles.dll" SourcePath="&lt;AI_CUSTACTS&gt;tempFiles.dll"/>
+  </COMPONENT>
+  <COMPONENT cid="caphyon.advinst.msicomp.MsiControlEventComponent">
+    <ROW Dialog_="WelcomeDlg" Control_="Next" Event="NewDialog" Argument="FolderDlg" Condition="AI_INSTALL" Ordering="1"/>
+    <ROW Dialog_="FolderDlg" Control_="Next" Event="NewDialog" Argument="VerifyReadyDlg" Condition="AI_INSTALL" Ordering="201"/>
+    <ROW Dialog_="FolderDlg" Control_="Back" Event="NewDialog" Argument="WelcomeDlg" Condition="AI_INSTALL" Ordering="1"/>
+    <ROW Dialog_="VerifyReadyDlg" Control_="Install" Event="EndDialog" Argument="Return" Condition="AI_INSTALL" Ordering="197"/>
+    <ROW Dialog_="VerifyReadyDlg" Control_="Back" Event="NewDialog" Argument="FolderDlg" Condition="AI_INSTALL" Ordering="201"/>
+    <ROW Dialog_="MaintenanceWelcomeDlg" Control_="Next" Event="NewDialog" Argument="MaintenanceTypeDlg" Condition="AI_MAINT" Ordering="99"/>
+    <ROW Dialog_="CustomizeDlg" Control_="Next" Event="NewDialog" Argument="VerifyReadyDlg" Condition="AI_MAINT" Ordering="101"/>
+    <ROW Dialog_="CustomizeDlg" Control_="Back" Event="NewDialog" Argument="MaintenanceTypeDlg" Condition="AI_MAINT" Ordering="1"/>
+    <ROW Dialog_="VerifyReadyDlg" Control_="Install" Event="EndDialog" Argument="Return" Condition="AI_MAINT" Ordering="198"/>
+    <ROW Dialog_="VerifyReadyDlg" Control_="Back" Event="NewDialog" Argument="CustomizeDlg" Condition="AI_MAINT" Ordering="202"/>
+    <ROW Dialog_="MaintenanceTypeDlg" Control_="ChangeButton" Event="NewDialog" Argument="CustomizeDlg" Condition="AI_MAINT" Ordering="501"/>
+    <ROW Dialog_="MaintenanceTypeDlg" Control_="Back" Event="NewDialog" Argument="MaintenanceWelcomeDlg" Condition="AI_MAINT" Ordering="1"/>
+    <ROW Dialog_="MaintenanceTypeDlg" Control_="RemoveButton" Event="NewDialog" Argument="VerifyRemoveDlg" Condition="AI_MAINT AND InstallMode=&quot;Remove&quot;" Ordering="601"/>
+    <ROW Dialog_="VerifyRemoveDlg" Control_="Back" Event="NewDialog" Argument="MaintenanceTypeDlg" Condition="AI_MAINT AND InstallMode=&quot;Remove&quot;" Ordering="1"/>
+    <ROW Dialog_="MaintenanceTypeDlg" Control_="RepairButton" Event="NewDialog" Argument="VerifyRepairDlg" Condition="AI_MAINT AND InstallMode=&quot;Repair&quot;" Ordering="601"/>
+    <ROW Dialog_="VerifyRepairDlg" Control_="Back" Event="NewDialog" Argument="MaintenanceTypeDlg" Condition="AI_MAINT AND InstallMode=&quot;Repair&quot;" Ordering="1"/>
+    <ROW Dialog_="VerifyRepairDlg" Control_="Repair" Event="EndDialog" Argument="Return" Condition="AI_MAINT AND InstallMode=&quot;Repair&quot;" Ordering="399" Options="1"/>
+    <ROW Dialog_="VerifyRemoveDlg" Control_="Remove" Event="EndDialog" Argument="Return" Condition="AI_MAINT AND InstallMode=&quot;Remove&quot;" Ordering="299" Options="1"/>
+    <ROW Dialog_="PatchWelcomeDlg" Control_="Next" Event="NewDialog" Argument="VerifyReadyDlg" Condition="AI_PATCH" Ordering="201"/>
+    <ROW Dialog_="VerifyReadyDlg" Control_="Install" Event="EndDialog" Argument="Return" Condition="AI_PATCH" Ordering="199"/>
+    <ROW Dialog_="VerifyReadyDlg" Control_="Back" Event="NewDialog" Argument="PatchWelcomeDlg" Condition="AI_PATCH" Ordering="203"/>
+    <ROW Dialog_="ResumeDlg" Control_="Install" Event="EndDialog" Argument="Return" Condition="AI_RESUME" Ordering="299"/>
+    <ROW Dialog_="FatalError" Control_="Finish" Event="DoAction" Argument="AI_RemoveTempFiles" Condition="1" Ordering="102"/>
+    <ROW Dialog_="UserExit" Control_="Finish" Event="DoAction" Argument="AI_RemoveTempFiles" Condition="1" Ordering="101"/>
+    <ROW Dialog_="FatalError" Control_="Finish" Event="DoAction" Argument="AI_RollbackPrereq" Condition="1" Ordering="103"/>
+    <ROW Dialog_="ExitDialog" Control_="Finish" Event="DoAction" Argument="AI_CleanPrereq" Condition="1" Ordering="301"/>
+    <ROW Dialog_="FatalError" Control_="Finish" Event="DoAction" Argument="AI_CleanPrereq" Condition="1" Ordering="104"/>
+    <ROW Dialog_="UserExit" Control_="Finish" Event="DoAction" Argument="AI_CleanPrereq" Condition="1" Ordering="102"/>
+    <ROW Dialog_="FatalError" Control_="Finish" Event="DoAction" Argument="AI_RollbackPrePrereq" Condition="1" Ordering="105"/>
+    <ROW Dialog_="ExitDialog" Control_="Finish" Event="DoAction" Argument="AI_CleanPrePrereq" Condition="1" Ordering="302"/>
+    <ROW Dialog_="FatalError" Control_="Finish" Event="DoAction" Argument="AI_CleanPrePrereq" Condition="1" Ordering="106"/>
+    <ROW Dialog_="UserExit" Control_="Finish" Event="DoAction" Argument="AI_CleanPrePrereq" Condition="1" Ordering="103"/>
+  </COMPONENT>
+  <COMPONENT cid="caphyon.advinst.msicomp.MsiCreateFolderComponent">
+    <ROW Directory_="APPDIR" Component_="APPDIR" ManualDelete="true"/>
+  </COMPONENT>
+  <COMPONENT cid="caphyon.advinst.msicomp.MsiCustActComponent">
+    <ROW Action="AI_AppSearchEx" Type="1" Source="Prereq.dll" Target="DoAppSearchEx"/>
+    <ROW Action="AI_BACKUP_AI_SETUPEXEPATH" Type="51" Source="AI_SETUPEXEPATH_ORIGINAL" Target="[AI_SETUPEXEPATH]"/>
+    <ROW Action="AI_CleanPrePrereq" Type="65" Source="Prereq.dll" Target="CleanPrereq" WithoutSeq="true"/>
+    <ROW Action="AI_CleanPrereq" Type="65" Source="Prereq.dll" Target="CleanPrereq" WithoutSeq="true"/>
+    <ROW Action="AI_DATA_SETTER" Type="51" Source="AI_RemoveAllTempFiles" Target="[AI_TEMP_FILE_ROLLBACK_INFO]"/>
+    <ROW Action="AI_DATA_SETTER_1" Type="51" Source="CustomActionData" Target="excel.exe"/>
+    <ROW Action="AI_DATA_SETTER_2" Type="51" Source="CustomActionData" Target="[#DeephavenExcelAddIn64.xll]|[&amp;customactions.dll]|Deephaven.ExcelAddInInstaller.CustomActions.Functions.RegisterAddIn"/>
+    <ROW Action="AI_DATA_SETTER_3" Type="51" Source="CustomActionData" Target="A Running Instance of Excel has been detected.&#13;\n&#13;\nPlease save your work and close Excel. |A Running Instance of Excel has been detected. |MB_OK,MB_ICONINFORMATION,MB_DEFBUTTON1||[CLIENTPROCESSID]"/>
+    <ROW Action="AI_DATA_SETTER_4" Type="51" Source="CustomActionData" Target="[#DeephavenExcelAddIn64.xll]|[&amp;customactions.dll]|Deephaven.ExcelAddInInstaller.CustomActions.Functions.UnregisterAddIn"/>
+    <ROW Action="AI_DATA_SETTER_5" Type="51" Source="CustomActionData" Target="excel.exe"/>
+    <ROW Action="AI_DATA_SETTER_6" Type="51" Source="CustomActionData" Target="Do you want to add Deephaven to your list of Trusted Publishers? This may be required in your environment to succesfully run the Deephaven Excel Add-In.&#13;\n&#13;\nIf you select Yes, the Deephaven certificate will be added to the local user&apos;s list of Trusted Publishers.&#13;\n&#13;\nIf you select No, the certificate will not be added. In this case you may need to ask your IT administrator for assistance with adding the Deephaven certificate.&#13;\n |Add Deephaven as Trusted Publisher |MB_YESNO,MB_ICONINFORMATION,MB_DEFBUTTON1|OK_TO_ADD_TRUSTED_PUBLISHER|[CLIENTPROCESSID]"/>
+    <ROW Action="AI_DOWNGRADE" Type="19" Target="4010"/>
+    <ROW Action="AI_DetectSoftware" Type="257" Source="SoftwareDetector.dll" Target="OnDetectSoftware"/>
+    <ROW Action="AI_DownloadPrereq" Type="1" Source="Prereq.dll" Target="DownloadPrereq"/>
+    <ROW Action="AI_DpiContentScale" Type="1" Source="aicustact.dll" Target="DpiContentScale"/>
+    <ROW Action="AI_EnableDebugLog" Type="321" Source="aicustact.dll" Target="EnableDebugLog"/>
+    <ROW Action="AI_ExtractPrereq" Type="65" Source="Prereq.dll" Target="ExtractPrereq"/>
+    <ROW Action="AI_ExtractTempFiles" Type="1" Source="tempFiles.dll" Target="ExtractTempFiles"/>
+    <ROW Action="AI_InstallModeCheck" Type="1" Source="aicustact.dll" Target="UpdateInstallMode" WithoutSeq="true"/>
+    <ROW Action="AI_InstallPostPrerequisite" Type="1" Source="Prereq.dll" Target="InstallPostPrereq"/>
+    <ROW Action="AI_InstallPrePrerequisite" Type="65" Source="Prereq.dll" Target="InstallPrePrereq"/>
+    <ROW Action="AI_InstallPrerequisite" Type="1" Source="Prereq.dll" Target="InstallPrereq"/>
+    <ROW Action="AI_MigrateInstallerProps" Type="1" Source="aicustact.dll" Target="MigrateInstallerProps"/>
+    <ROW Action="AI_PREPARE_UPGRADE" Type="65" Source="aicustact.dll" Target="PrepareUpgrade"/>
+    <ROW Action="AI_PRESERVE_INSTALL_TYPE" Type="65" Source="aicustact.dll" Target="PreserveInstallType"/>
+    <ROW Action="AI_RESTORE_AI_SETUPEXEPATH" Type="51" Source="AI_SETUPEXEPATH" Target="[AI_SETUPEXEPATH_ORIGINAL]"/>
+    <ROW Action="AI_RESTORE_LOCATION" Type="65" Source="aicustact.dll" Target="RestoreLocation"/>
+    <ROW Action="AI_RemoveAllTempFiles" Type="1281" Source="tempFiles.dll" Target="RemoveAllTempFiles" AdditionalSeq="AI_DATA_SETTER"/>
+    <ROW Action="AI_RemoveTempFiles" Type="1" Source="tempFiles.dll" Target="RemoveTempFiles" WithoutSeq="true"/>
+    <ROW Action="AI_ResolveKnownFolders" Type="1" Source="aicustact.dll" Target="AI_ResolveKnownFolders"/>
+    <ROW Action="AI_RestoreInstallerProps" Type="1" Source="aicustact.dll" Target="RestoreInstallerProps" WithoutSeq="true"/>
+    <ROW Action="AI_RollbackPrePrereq" Type="65" Source="Prereq.dll" Target="RollbackPrePrereq" WithoutSeq="true"/>
+    <ROW Action="AI_RollbackPrereq" Type="65" Source="Prereq.dll" Target="RollbackPrereq" WithoutSeq="true"/>
+    <ROW Action="AI_SHOW_LOG" Type="65" Source="aicustact.dll" Target="LaunchLogFile" WithoutSeq="true"/>
+    <ROW Action="AI_STORE_LOCATION" Type="51" Source="ARPINSTALLLOCATION" Target="[APPDIR]"/>
+    <ROW Action="AI_VerifyPrePrereq" Type="1" Source="Prereq.dll" Target="VerifyPrePrereq"/>
+    <ROW Action="AI_VerifyPrereq" Type="1" Source="Prereq.dll" Target="VerifyPrereq"/>
+    <ROW Action="Detect_Excel_Running" Type="1" Source="aicustact.dll" Target="DetectProcess" Options="3" AdditionalSeq="AI_DATA_SETTER_1"/>
+    <ROW Action="Detect_Excel_Running_Again" Type="1" Source="aicustact.dll" Target="DetectProcess" Options="3" AdditionalSeq="AI_DATA_SETTER_5"/>
+    <ROW Action="Error_Excel_is_running" Type="19" Target="Excel is still open. The installer will now exit. Please close Excel before running the installer again."/>
+    <ROW Action="InstallCertificate" Type="1026" Source="certificateinstaller.exe" Target="/add &quot;[&amp;deephaven.cer]&quot; user TrustedPublisher" Options="1"/>
+    <ROW Action="InstallRegKeysWithDotnet" Type="1" Source="DotNetMethodCaller.dll_1" Target="CallDotNetMethod" AdditionalSeq="AI_DATA_SETTER_2"/>
+    <ROW Action="MsgBox_Excel_is_running" Type="1" Source="aicustact.dll" Target="MsgBox" Options="1" AdditionalSeq="AI_DATA_SETTER_3"/>
+    <ROW Action="MsgBox_Ok_to_add_Trusted_Publisher" Type="1" Source="aicustact.dll" Target="MsgBox" Options="1" AdditionalSeq="AI_DATA_SETTER_6"/>
+    <ROW Action="SET_APPDIR" Type="307" Source="APPDIR" Target="[ProgramFilesFolder][Manufacturer]\[ProductName]" MultiBuildTarget="DefaultBuild:[LocalAppDataFolder][Manufacturer]\[ProductName]"/>
+    <ROW Action="SET_SHORTCUTDIR" Type="307" Source="SHORTCUTDIR" Target="[ProgramMenuFolder][ProductName]"/>
+    <ROW Action="SET_TARGETDIR_TO_APPDIR" Type="51" Source="TARGETDIR" Target="[APPDIR]"/>
+    <ROW Action="UninstallCertificate" Type="1090" Source="certificateinstaller.exe" Target="/remove 4172A36937046B2ED600C9881852CD285891FFE2 user TrustedPublisher" Options="1"/>
+    <ROW Action="UninstallRegKeysWithDotnet" Type="1" Source="DotNetMethodCaller.dll" Target="CallDotNetMethod" AdditionalSeq="AI_DATA_SETTER_4"/>
+  </COMPONENT>
+  <COMPONENT cid="caphyon.advinst.msicomp.MsiFeatCompsComponent">
+    <ROW Feature_="MainFeature" Component_="APPDIR"/>
+    <ROW Feature_="MainFeature" Component_="ProductInformation"/>
+    <ROW Feature_="MainFeature" Component_="abseil_dll.dll"/>
+    <ROW Feature_="MainFeature" Component_="arrow.dll"/>
+    <ROW Feature_="MainFeature" Component_="arrow_flight.dll"/>
+    <ROW Feature_="MainFeature" Component_="brotlicommon.dll"/>
+    <ROW Feature_="MainFeature" Component_="brotlidec.dll"/>
+    <ROW Feature_="MainFeature" Component_="brotlienc.dll"/>
+    <ROW Feature_="MainFeature" Component_="bz2.dll"/>
+    <ROW Feature_="MainFeature" Component_="cares.dll"/>
+    <ROW Feature_="MainFeature" Component_="dhclient.dll"/>
+    <ROW Feature_="MainFeature" Component_="dhcore.dll"/>
+    <ROW Feature_="MainFeature" Component_="dhe_client.dll"/>
+    <ROW Feature_="MainFeature" Component_="libcrypto3x64.dll"/>
+    <ROW Feature_="MainFeature" Component_="libcurl.dll"/>
+    <ROW Feature_="MainFeature" Component_="libprotobuf.dll"/>
+    <ROW Feature_="MainFeature" Component_="libssl3x64.dll"/>
+    <ROW Feature_="MainFeature" Component_="lz4.dll"/>
+    <ROW Feature_="MainFeature" Component_="re2.dll"/>
+    <ROW Feature_="MainFeature" Component_="snappy.dll"/>
+    <ROW Feature_="MainFeature" Component_="DeephavenExcelAddIn64.xll"/>
+    <ROW Feature_="A0BFC224E0E9125ADE0B2DBF343" Component_="A0BFC224E0E9125ADE0B2DBF343"/>
+    <ROW Feature_="MainFeature" Component_="zlib1.dll"/>
+    <ROW Feature_="MainFeature" Component_="zstd.dll"/>
+  </COMPONENT>
+  <COMPONENT cid="caphyon.advinst.msicomp.MsiIconsComponent">
+    <ROW Name="Icon.exe" SourcePath="resources\Icon.ico" Index="0"/>
+  </COMPONENT>
+  <COMPONENT cid="caphyon.advinst.msicomp.MsiInstExSeqComponent">
+    <ROW Action="AI_DOWNGRADE" Condition="AI_NEWERPRODUCTFOUND AND (UILevel &lt;&gt; 5)" Sequence="210"/>
+    <ROW Action="AI_RESTORE_LOCATION" Condition="APPDIR=&quot;&quot;" Sequence="749"/>
+    <ROW Action="AI_STORE_LOCATION" Condition="(Not Installed) OR REINSTALL" Sequence="1503"/>
+    <ROW Action="AI_PREPARE_UPGRADE" Condition="AI_UPGRADE=&quot;No&quot; AND (Not Installed)" Sequence="1397"/>
+    <ROW Action="AI_ResolveKnownFolders" Sequence="52"/>
+    <ROW Action="AI_EnableDebugLog" Sequence="51"/>
+    <ROW Action="InstallRegKeysWithDotnet" Condition="( ( NOT Installed ) OR ( Installed AND REMOVE &lt;&gt; &quot;ALL&quot; AND AI_INSTALL_MODE &lt;&gt; &quot;Remove&quot; ) )" Sequence="6403"/>
+    <ROW Action="AI_DATA_SETTER_2" Condition="( ( NOT Installed ) OR ( Installed AND REMOVE &lt;&gt; &quot;ALL&quot; AND AI_INSTALL_MODE &lt;&gt; &quot;Remove&quot; ) )" Sequence="6402"/>
+    <ROW Action="AI_DETECT_MODERNWIN" Condition="(VersionNT &gt;= 603)" Sequence="53" MsiKey="AI_DETECT_MODERNWIN"/>
+    <ROW Action="AI_DETECT_WINTHEME" Condition="(VersionNT &gt;= 603)" Sequence="54" MsiKey="AI_DETECT_WINTHEME"/>
+    <ROW Action="Detect_Excel_Running" Sequence="202"/>
+    <ROW Action="AI_DATA_SETTER_1" Sequence="201"/>
+    <ROW Action="MsgBox_Excel_is_running" Condition="AI_PROCESS_STATE=&quot;Running&quot;" Sequence="204"/>
+    <ROW Action="AI_DATA_SETTER_3" Condition="AI_PROCESS_STATE=&quot;Running&quot;" Sequence="203"/>
+    <ROW Action="Detect_Excel_Running_Again" Sequence="206"/>
+    <ROW Action="AI_DATA_SETTER_5" Sequence="205"/>
+    <ROW Action="Error_Excel_is_running" Condition="AI_PROCESS_STATE=&quot;Running&quot;" Sequence="207"/>
+    <ROW Action="AI_ExtractTempFiles" Sequence="1001"/>
+    <ROW Action="AI_RemoveTempFiles" Sequence="6601"/>
+    <ROW Action="AI_RemoveAllTempFiles" Sequence="1502"/>
+    <ROW Action="AI_DATA_SETTER" Sequence="1501"/>
+    <ROW Action="UninstallRegKeysWithDotnet" Condition="( Installed AND ( REMOVE = &quot;ALL&quot; OR AI_INSTALL_MODE = &quot;Remove&quot; ) )" Sequence="6405"/>
+    <ROW Action="AI_DATA_SETTER_4" Condition="( Installed AND ( REMOVE = &quot;ALL&quot; OR AI_INSTALL_MODE = &quot;Remove&quot; ) )" Sequence="6404"/>
+    <ROW Action="AI_MigrateInstallerProps" Condition="SETUPEXEDIR AND ((UILevel = 2) OR (UILevel = 3))" Sequence="6599"/>
+    <ROW Action="AI_VerifyPrereq" Sequence="1101"/>
+    <ROW Action="AI_AppSearchEx" Sequence="102"/>
+    <ROW Action="AI_DetectSoftware" Sequence="101"/>
+    <ROW Action="InstallCertificate" Condition="( NOT Installed ) AND ( OK_TO_ADD_TRUSTED_PUBLISHER=&quot;IDYES&quot; )" Sequence="6401"/>
+    <ROW Action="UninstallCertificate" Condition="( Installed AND ( REMOVE = &quot;ALL&quot; OR AI_INSTALL_MODE = &quot;Remove&quot; ) )" Sequence="1626"/>
+    <ROW Action="MsgBox_Ok_to_add_Trusted_Publisher" Condition="( NOT Installed )" Sequence="209"/>
+    <ROW Action="AI_DATA_SETTER_6" Condition="( NOT Installed )" Sequence="208"/>
+  </COMPONENT>
+  <COMPONENT cid="caphyon.advinst.msicomp.MsiInstallUISequenceComponent">
+    <ROW Action="AI_PRESERVE_INSTALL_TYPE" Sequence="199"/>
+    <ROW Action="AI_RESTORE_LOCATION" Condition="APPDIR=&quot;&quot;" Sequence="749"/>
+    <ROW Action="AI_ResolveKnownFolders" Sequence="53"/>
+    <ROW Action="AI_DpiContentScale" Sequence="52"/>
+    <ROW Action="AI_EnableDebugLog" Sequence="51"/>
+    <ROW Action="AI_BACKUP_AI_SETUPEXEPATH" Sequence="99"/>
+    <ROW Action="AI_RESTORE_AI_SETUPEXEPATH" Condition="AI_SETUPEXEPATH_ORIGINAL" Sequence="103"/>
+    <ROW Action="AI_ExtractTempFiles" Sequence="1001"/>
+    <ROW Action="AI_DownloadPrereq" Sequence="1296"/>
+    <ROW Action="AI_ExtractPrereq" Sequence="1297"/>
+    <ROW Action="AI_InstallPrerequisite" Sequence="1298"/>
+    <ROW Action="AI_InstallPostPrerequisite" Sequence="1301"/>
+    <ROW Action="AI_CleanPrereq" Sequence="1302"/>
+    <ROW Action="AI_InstallPrePrerequisite" Condition="Installed" Sequence="1299"/>
+    <ROW Action="AI_AppSearchEx" Sequence="102"/>
+    <ROW Action="AI_DetectSoftware" Sequence="101"/>
+  </COMPONENT>
+  <COMPONENT cid="caphyon.advinst.msicomp.MsiLaunchConditionsComponent">
+    <ROW Condition="((VersionNT &lt;&gt; 501) AND (VersionNT &lt;&gt; 502))" Description="[ProductName] cannot be installed on [WindowsTypeNT5XDisplay]." DescriptionLocId="AI.LaunchCondition.NoNT5X" IsPredefined="true" Builds="DefaultBuild"/>
+    <ROW Condition="(VersionNT &lt;&gt; 400)" Description="[ProductName] cannot be installed on [WindowsTypeNT40Display]." DescriptionLocId="AI.LaunchCondition.NoNT40" IsPredefined="true" Builds="DefaultBuild"/>
+    <ROW Condition="(VersionNT &lt;&gt; 500)" Description="[ProductName] cannot be installed on [WindowsTypeNT50Display]." DescriptionLocId="AI.LaunchCondition.NoNT50" IsPredefined="true" Builds="DefaultBuild"/>
+    <ROW Condition="(VersionNT &lt;&gt; 600)" Description="[ProductName] cannot be installed on [WindowsTypeNT60Display]." DescriptionLocId="AI.LaunchCondition.NoNT60" IsPredefined="true" Builds="DefaultBuild"/>
+    <ROW Condition="AI_DETECTED_OFFICE_EXCEL64_VERSION &gt;= AI_REQUIRED_OFFICE_VERSION" Description="[ProductName] cannot be installed on systems without [AI_REQUIRED_OFFICE_APPNAME] 2016 or higher." DescriptionLocId="AI.LaunchCondition.Office2016" IsPredefined="true" Builds="DefaultBuild"/>
+    <ROW Condition="VersionNT" Description="[ProductName] cannot be installed on [WindowsType9XDisplay]." DescriptionLocId="AI.LaunchCondition.No9X" IsPredefined="true" Builds="DefaultBuild"/>
+  </COMPONENT>
+  <COMPONENT cid="caphyon.advinst.msicomp.MsiRegsComponent">
+    <ROW Registry="A0BFC224E0E9125ADE0B2DBF343" Root="-1" Key="Software\Caphyon\Advanced Installer\Prereqs\[ProductCode]\[ProductVersion]" Name="A0BFC224E0E9125ADE0B2DBF343" Value="1" Component_="A0BFC224E0E9125ADE0B2DBF343"/>
+    <ROW Registry="AdvancedInstaller" Root="-1" Key="Software\Caphyon\Advanced Installer" Name="\"/>
+    <ROW Registry="Caphyon" Root="-1" Key="Software\Caphyon" Name="\"/>
+    <ROW Registry="Manufacturer" Root="-1" Key="Software\[Manufacturer]" Name="\"/>
+    <ROW Registry="Path" Root="-1" Key="Software\[Manufacturer]\[ProductName]" Name="Path" Value="[APPDIR]" Component_="ProductInformation"/>
+    <ROW Registry="Prereqs" Root="-1" Key="Software\Caphyon\Advanced Installer\Prereqs" Name="\"/>
+    <ROW Registry="ProductCode" Root="-1" Key="Software\Caphyon\Advanced Installer\Prereqs\[ProductCode]" Name="\"/>
+    <ROW Registry="ProductName" Root="-1" Key="Software\[Manufacturer]\[ProductName]" Name="\"/>
+    <ROW Registry="ProductVersion" Root="-1" Key="Software\Caphyon\Advanced Installer\Prereqs\[ProductCode]\[ProductVersion]" Name="\"/>
+    <ROW Registry="Software" Root="-1" Key="Software" Name="\"/>
+    <ROW Registry="Version" Root="-1" Key="Software\[Manufacturer]\[ProductName]" Name="Version" Value="[ProductVersion]" Component_="ProductInformation"/>
+  </COMPONENT>
+  <COMPONENT cid="caphyon.advinst.msicomp.MsiThemeComponent">
+    <ATTRIBUTE name="UsedTheme" value="classic"/>
+  </COMPONENT>
+  <COMPONENT cid="caphyon.advinst.msicomp.MsiUpgradeComponent">
+    <ROW UpgradeCode="[|UpgradeCode]" VersionMin="0.0.1" VersionMax="[|ProductVersion]" Attributes="257" ActionProperty="OLDPRODUCTS"/>
+    <ROW UpgradeCode="[|UpgradeCode]" VersionMin="[|ProductVersion]" Attributes="2" ActionProperty="AI_NEWERPRODUCTFOUND"/>
+  </COMPONENT>
+  <COMPONENT cid="caphyon.advinst.msicomp.PreReqComponent">
+    <ROW PrereqKey="A0BFC224E0E9125ADE0B2DBF343" DisplayName=".NET Desktop Runtime 8.0.8 x64" VersionMin="8.0" SetupFileUrl="Prerequisites\.NET 8.0\windowsdesktop-runtime-8.0.8-win-x64.exe" Location="0" ExactSize="0" WinNTVersions="Windows 9x/ME/NT/2000/XP/Vista/Windows 7/Windows 8 x86/Windows 8.1 x86/Windows 10 x86" WinNT64Versions="Windows 7 RTM x64, Windows 8 x64, Windows Server 2012 x64, Windows 10 version 1507 x64, Windows 10 version 1511 x64" Operator="1" NoUiComLine="/q /norestart" Options="fx" TargetName=".NET 8.0\windowsdesktop-runtime-8.0.8-win-x64.exe" Feature="A0BFC224E0E9125ADE0B2DBF343"/>
+    <ATTRIBUTE name="PrereqsOrder" value="A0BFC224E0E9125ADE0B2DBF343"/>
+  </COMPONENT>
+  <COMPONENT cid="caphyon.advinst.msicomp.PreReqSearchComponent">
+    <ROW SearchKey="A0BFC224E0E9125ADE0B2DBF343SystemFo" Prereq="A0BFC224E0E9125ADE0B2DBF343" SearchType="14" SearchString="[ProgramFiles64Folder]dotnet\shared\Microsoft.WindowsDesktop.App" VerMin="8.0.8" Order="1" Property="PreReqSearch_A0BFC224E0E9125ADE0B2D"/>
+  </COMPONENT>
+  <COMPONENT cid="caphyon.advinst.msicomp.TempFileComponent">
+    <ROW FileId="customactions.dll" Name="CUSTOM~1.DLL|CustomActions.dll" Directory_="ProductCode_Dir" Property="AI_CUSTOMACTIONS.DLL" Options="0" Data="CustomActions\bin\Debug\CustomActions.dll"/>
+    <ROW FileId="customactions.pdb" Name="CUSTOM~1.PDB|CustomActions.pdb" Directory_="ProductCode_Dir" Property="AI_CUSTOMACTIONS.PDB" Options="0" Data="CustomActions\bin\Debug\CustomActions.pdb"/>
+    <ROW FileId="deephaven.cer" Name="DEEPHA~1.CER|deephaven.cer" Directory_="ProductCode_Dir" Property="AI_DEEPHAVEN.CER" Options="0" Data="certificates-public\deephaven.cer"/>
+  </COMPONENT>
+</DOCUMENT>
diff --git a/csharp/ExcelAddInInstaller/TestCustomActions/App.config b/csharp/ExcelAddInInstaller/TestCustomActions/App.config
new file mode 100644
index 00000000000..3916e0e4b4a
--- /dev/null
+++ b/csharp/ExcelAddInInstaller/TestCustomActions/App.config
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<configuration>
+    <startup> 
+        <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.8" />
+    </startup>
+</configuration>
\ No newline at end of file
diff --git a/csharp/ExcelAddInInstaller/TestCustomActions/Program.cs b/csharp/ExcelAddInInstaller/TestCustomActions/Program.cs
new file mode 100644
index 00000000000..6cafe5a119f
--- /dev/null
+++ b/csharp/ExcelAddInInstaller/TestCustomActions/Program.cs
@@ -0,0 +1,17 @@
+using System;
+using System.Diagnostics;
+
+namespace Deephaven.ExcelAddInInstaller.CustomActions {
+  public class Program {
+    static void Main(string[] args) {
+      Action<string> logger = Console.WriteLine;
+      if (!RegistryManager.TryCreate(logger, out var oem, out var failureReason) ||
+          !oem.TryUpdateAddInKeys("zamboni 666", false, out failureReason)) {
+        logger($"Sad because {failureReason}");
+        return;
+      }
+
+      logger("HAPPY");
+    }
+  }
+}
diff --git a/csharp/ExcelAddInInstaller/TestCustomActions/Properties/AssemblyInfo.cs b/csharp/ExcelAddInInstaller/TestCustomActions/Properties/AssemblyInfo.cs
new file mode 100644
index 00000000000..28caa89a675
--- /dev/null
+++ b/csharp/ExcelAddInInstaller/TestCustomActions/Properties/AssemblyInfo.cs
@@ -0,0 +1,33 @@
+using System.Reflection;
+using System.Runtime.CompilerServices;
+using System.Runtime.InteropServices;
+
+// General Information about an assembly is controlled through the following
+// set of attributes. Change these attribute values to modify the information
+// associated with an assembly.
+[assembly: AssemblyTitle("TestCustomActions")]
+[assembly: AssemblyDescription("")]
+[assembly: AssemblyConfiguration("")]
+[assembly: AssemblyCompany("")]
+[assembly: AssemblyProduct("TestCustomActions")]
+[assembly: AssemblyCopyright("Copyright ©  2024")]
+[assembly: AssemblyTrademark("")]
+[assembly: AssemblyCulture("")]
+
+// Setting ComVisible to false makes the types in this assembly not visible
+// to COM components.  If you need to access a type in this assembly from
+// COM, set the ComVisible attribute to true on that type.
+[assembly: ComVisible(false)]
+
+// The following GUID is for the ID of the typelib if this project is exposed to COM
+[assembly: Guid("8dd17371-1835-49d6-a8d6-741b9ae504dc")]
+
+// Version information for an assembly consists of the following four values:
+//
+//      Major Version
+//      Minor Version
+//      Build Number
+//      Revision
+//
+[assembly: AssemblyVersion("1.0.0.0")]
+[assembly: AssemblyFileVersion("1.0.0.0")]
diff --git a/csharp/ExcelAddInInstaller/TestCustomActions/TestCustomActions.csproj b/csharp/ExcelAddInInstaller/TestCustomActions/TestCustomActions.csproj
new file mode 100644
index 00000000000..bc0cc763758
--- /dev/null
+++ b/csharp/ExcelAddInInstaller/TestCustomActions/TestCustomActions.csproj
@@ -0,0 +1,59 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
+  <PropertyGroup>
+    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+    <ProjectGuid>{8DD17371-1835-49D6-A8D6-741B9AE504DC}</ProjectGuid>
+    <OutputType>Exe</OutputType>
+    <RootNamespace>TestCustomActions</RootNamespace>
+    <AssemblyName>TestCustomActions</AssemblyName>
+    <TargetFrameworkVersion>v4.8</TargetFrameworkVersion>
+    <FileAlignment>512</FileAlignment>
+    <AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
+    <Deterministic>true</Deterministic>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+    <PlatformTarget>AnyCPU</PlatformTarget>
+    <DebugSymbols>true</DebugSymbols>
+    <DebugType>full</DebugType>
+    <Optimize>false</Optimize>
+    <OutputPath>bin\Debug\</OutputPath>
+    <DefineConstants>DEBUG;TRACE</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+    <PlatformTarget>AnyCPU</PlatformTarget>
+    <DebugType>pdbonly</DebugType>
+    <Optimize>true</Optimize>
+    <OutputPath>bin\Release\</OutputPath>
+    <DefineConstants>TRACE</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+  </PropertyGroup>
+  <ItemGroup>
+    <Reference Include="System" />
+    <Reference Include="System.Core" />
+    <Reference Include="System.Xml.Linq" />
+    <Reference Include="System.Data.DataSetExtensions" />
+    <Reference Include="Microsoft.CSharp" />
+    <Reference Include="System.Data" />
+    <Reference Include="System.Net.Http" />
+    <Reference Include="System.Xml" />
+  </ItemGroup>
+  <ItemGroup>
+    <Compile Include="Program.cs" />
+    <Compile Include="Properties\AssemblyInfo.cs" />
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="App.config" />
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\CustomActions\CustomActions.csproj">
+      <Project>{2e432229-2429-499b-a2ab-69ab78a7eb21}</Project>
+      <Name>CustomActions</Name>
+    </ProjectReference>
+  </ItemGroup>
+  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+</Project>
\ No newline at end of file
diff --git a/csharp/ExcelAddInInstaller/certificates-public/README.md b/csharp/ExcelAddInInstaller/certificates-public/README.md
new file mode 100644
index 00000000000..aca8ef41810
--- /dev/null
+++ b/csharp/ExcelAddInInstaller/certificates-public/README.md
@@ -0,0 +1,11 @@
+The deephaven.cer file contains Deephaven's public key. Like all .cer files
+it contains only a public key (and not a private key). It therefore does not
+contain any secrets and does not need to be protected.
+
+This file can be obtained by exporting the certificate from an installer
+built by Advanced Installer (yes, that is a self-referential process), or
+by exporting it from the Windows Certificate manager (certmgr.msc).
+
+We store this file here so that (with the user's permission) Advanced Installer
+can install the Deephaven public key in the local user's "Trusted Publishers",
+which in turn allows Excel to trust the Deephaven Excel AddIn.
diff --git a/csharp/ExcelAddInInstaller/certificates-public/deephaven.cer b/csharp/ExcelAddInInstaller/certificates-public/deephaven.cer
new file mode 100644
index 00000000000..31cafb88d8b
Binary files /dev/null and b/csharp/ExcelAddInInstaller/certificates-public/deephaven.cer differ
diff --git a/csharp/ExcelAddInInstaller/dhinstall/.gitignore b/csharp/ExcelAddInInstaller/dhinstall/.gitignore
new file mode 100644
index 00000000000..8620bdd7442
--- /dev/null
+++ b/csharp/ExcelAddInInstaller/dhinstall/.gitignore
@@ -0,0 +1,2 @@
+*.dll
+*.exe
diff --git a/csharp/ExcelAddInInstaller/dhinstall/README.md b/csharp/ExcelAddInInstaller/dhinstall/README.md
new file mode 100644
index 00000000000..5fcd4f28b93
--- /dev/null
+++ b/csharp/ExcelAddInInstaller/dhinstall/README.md
@@ -0,0 +1,9 @@
+This file is a placeholder that creates this directory in source control.
+
+This directory is the install location (e.g. DHINSTALL) for the
+Community Core dll's and the Enterprise Core Plus dll's
+that get built for the installer.
+
+We put the build output for those builds here so they can be easily found
+by the installer, and they exist at a short relative location from the
+Advanced Installer project itself.
diff --git a/csharp/ExcelAddInInstaller/resources/Banner.jpg b/csharp/ExcelAddInInstaller/resources/Banner.jpg
new file mode 100644
index 00000000000..6b532a20133
Binary files /dev/null and b/csharp/ExcelAddInInstaller/resources/Banner.jpg differ
diff --git a/csharp/ExcelAddInInstaller/resources/Dialog.jpg b/csharp/ExcelAddInInstaller/resources/Dialog.jpg
new file mode 100644
index 00000000000..87363309312
Binary files /dev/null and b/csharp/ExcelAddInInstaller/resources/Dialog.jpg differ
diff --git a/csharp/ExcelAddInInstaller/resources/Icon.ico b/csharp/ExcelAddInInstaller/resources/Icon.ico
new file mode 100644
index 00000000000..bafb69cb572
Binary files /dev/null and b/csharp/ExcelAddInInstaller/resources/Icon.ico differ
diff --git a/csharp/client/DeephavenClient/AggregateCombo.cs b/csharp/client/DeephavenClient/AggregateCombo.cs
new file mode 100644
index 00000000000..2006e14f8c9
--- /dev/null
+++ b/csharp/client/DeephavenClient/AggregateCombo.cs
@@ -0,0 +1,64 @@
+using System;
+using System.Runtime.InteropServices;
+using Deephaven.DeephavenClient.Interop;
+
+namespace Deephaven.DeephavenClient;
+
+public class AggregateCombo {
+  private readonly Aggregate[] _aggregates;
+
+  public AggregateCombo(IEnumerable<Aggregate> aggregates) => _aggregates = aggregates.ToArray();
+
+  internal InternalAggregateCombo Invoke() {
+    return new InternalAggregateCombo(_aggregates);
+  }
+}
+
+internal class InternalAggregateCombo : IDisposable {
+  internal NativePtr<NativeAggregateCombo> Self;
+
+  internal InternalAggregateCombo(Aggregate[] aggregates) {
+    var internalAggregates = new List<InternalAggregate>();
+    try {
+      // Invoke the lazy method on the aggregate to get its C++ wrapper
+      foreach (var agg in aggregates) {
+        internalAggregates.Add(agg.Materialize());
+      }
+
+      var internalAggPtrs = internalAggregates.Select(ag => ag.Self).ToArray();
+      NativeAggregateCombo.deephaven_client_AggregateCombo_Create(
+        internalAggPtrs, internalAggPtrs.Length, out var result, out var status);
+      status.OkOrThrow();
+      Self = result;
+    } finally {
+      foreach (var agg in internalAggregates) {
+        agg.Dispose();
+      }
+    }
+  }
+
+  ~InternalAggregateCombo() {
+    ReleaseUnmanagedResources();
+  }
+
+  public void Dispose() {
+    ReleaseUnmanagedResources();
+    GC.SuppressFinalize(this);
+  }
+
+  private void ReleaseUnmanagedResources() {
+    if (!Self.TryRelease(out var old)) {
+      return;
+    }
+    NativeAggregateCombo.deephaven_client_AggregateCombo_dtor(old);
+  }
+}
+
+internal partial class NativeAggregateCombo {
+  [LibraryImport(LibraryPaths.Dhclient, StringMarshalling = StringMarshalling.Utf8)]
+  public static partial void deephaven_client_AggregateCombo_Create(
+    NativePtr<NativeAggregate>[] aggregates, Int32 numAggregates,
+    out NativePtr<NativeAggregateCombo> self, out ErrorStatus status);
+  [LibraryImport(LibraryPaths.Dhclient, StringMarshalling = StringMarshalling.Utf8)]
+  public static partial void deephaven_client_AggregateCombo_dtor(NativePtr<NativeAggregateCombo> self);
+}
diff --git a/csharp/client/DeephavenClient/Aggregates.cs b/csharp/client/DeephavenClient/Aggregates.cs
new file mode 100644
index 00000000000..0816aa9040b
--- /dev/null
+++ b/csharp/client/DeephavenClient/Aggregates.cs
@@ -0,0 +1,169 @@
+using System;
+using System.Runtime.InteropServices;
+using Deephaven.DeephavenClient.Interop;
+
+namespace Deephaven.DeephavenClient;
+
+public class Aggregate {
+  [UnmanagedFunctionPointer(CallingConvention.Cdecl, CharSet = CharSet.Unicode)]
+  private delegate void AggregateMethod(
+    string[] columns, Int32 numColumns, out NativePtr<NativeAggregate> result, out ErrorStatus status);
+
+  [UnmanagedFunctionPointer(CallingConvention.Cdecl, CharSet = CharSet.Unicode)]
+  private delegate void LazyMaterializer(out NativePtr<NativeAggregate> result, out ErrorStatus status);
+
+  public static Aggregate AbsSum(IEnumerable<string> columnSpecs) {
+    return CreateHelper(columnSpecs, NativeAggregate.deephaven_client_Aggregate_AbsSum);
+  }
+
+  public static Aggregate Group(IEnumerable<string> columnSpecs) {
+    return CreateHelper(columnSpecs, NativeAggregate.deephaven_client_Aggregate_Group);
+  }
+
+  public static Aggregate Avg(IEnumerable<string> columnSpecs) {
+    return CreateHelper(columnSpecs, NativeAggregate.deephaven_client_Aggregate_Avg);
+  }
+
+  public static Aggregate First(IEnumerable<string> columnSpecs) {
+    return CreateHelper(columnSpecs, NativeAggregate.deephaven_client_Aggregate_First);
+  }
+
+  public static Aggregate Last(IEnumerable<string> columnSpecs) {
+    return CreateHelper(columnSpecs, NativeAggregate.deephaven_client_Aggregate_Last);
+  }
+
+  public static Aggregate Max(IEnumerable<string> columnSpecs) {
+    return CreateHelper(columnSpecs, NativeAggregate.deephaven_client_Aggregate_Max);
+  }
+
+  public static Aggregate Med(IEnumerable<string> columnSpecs) {
+    return CreateHelper(columnSpecs, NativeAggregate.deephaven_client_Aggregate_Med);
+  }
+
+  public static Aggregate Min(IEnumerable<string> columnSpecs) {
+    return CreateHelper(columnSpecs, NativeAggregate.deephaven_client_Aggregate_Min);
+  }
+
+  public static Aggregate Std(IEnumerable<string> columnSpecs) {
+    return CreateHelper(columnSpecs, NativeAggregate.deephaven_client_Aggregate_Std);
+  }
+
+  public static Aggregate Sum(IEnumerable<string> columnSpecs) {
+    return CreateHelper(columnSpecs, NativeAggregate.deephaven_client_Aggregate_Sum);
+  }
+
+  public static Aggregate Var(IEnumerable<string> columnSpecs) {
+    return CreateHelper(columnSpecs, NativeAggregate.deephaven_client_Aggregate_Var);
+  }
+
+  public static Aggregate WAvg(IEnumerable<string> columnSpecs) {
+    return CreateHelper(columnSpecs, NativeAggregate.deephaven_client_Aggregate_WAvg);
+  }
+
+  public static Aggregate Count(string columnSpec) {
+    LazyMaterializer lazyMaterializer = (out NativePtr<NativeAggregate> result, out ErrorStatus status) =>
+      NativeAggregate.deephaven_client_Aggregate_Count(columnSpec, out result, out status);
+    return new Aggregate(lazyMaterializer);
+  }
+
+  public static Aggregate Pct(double percentile, bool avgMedian, IEnumerable<string> columnSpecs) {
+    var cols = columnSpecs.ToArray();
+    LazyMaterializer lazyMaterializer = (out NativePtr<NativeAggregate> result, out ErrorStatus status) =>
+      NativeAggregate.deephaven_client_Aggregate_Pct(percentile, (InteropBool)avgMedian,
+        cols, cols.Length, out result, out status);
+    return new Aggregate(lazyMaterializer);
+  }
+
+  /// <summary>
+  /// Helper method for all the Aggregate functions except Count, which is special because
+  /// it takes a string rather than an IEnumerable&lt;string&gt;
+  /// </summary>
+  private static Aggregate CreateHelper(IEnumerable<string> columnSpecs, AggregateMethod aggregateMethod) {
+    var cs = columnSpecs.ToArray();
+
+    LazyMaterializer lazyMaterializer = (out NativePtr<NativeAggregate> result, out ErrorStatus status) =>
+      aggregateMethod(cs, cs.Length, out result, out status);
+
+    return new Aggregate(lazyMaterializer);
+  }
+
+  private readonly LazyMaterializer _lazyMaterializer;
+
+  private Aggregate(LazyMaterializer lazyMaterializer) => _lazyMaterializer = lazyMaterializer;
+
+  internal InternalAggregate Materialize() {
+    _lazyMaterializer(out var result, out var status);
+    status.OkOrThrow();
+    return new InternalAggregate(result);
+  }
+}
+
+internal class InternalAggregate : IDisposable {
+  internal NativePtr<NativeAggregate> Self;
+
+  internal InternalAggregate(NativePtr<NativeAggregate> self) => Self = self;
+
+  ~InternalAggregate() {
+    ReleaseUnmanagedResources();
+  }
+
+  public void Dispose() {
+    ReleaseUnmanagedResources();
+    GC.SuppressFinalize(this);
+  }
+
+  private void ReleaseUnmanagedResources() {
+    if (!Self.TryRelease(out var old)) {
+      return;
+    }
+    NativeAggregate.deephaven_client_Aggregate_dtor(old);
+  }
+}
+
+internal partial class NativeAggregate {
+  [LibraryImport(LibraryPaths.Dhclient, StringMarshalling = StringMarshalling.Utf8)]
+  public static partial void deephaven_client_Aggregate_dtor(NativePtr<NativeAggregate> self);
+  [LibraryImport(LibraryPaths.Dhclient, StringMarshalling = StringMarshalling.Utf8)]
+  public static partial void deephaven_client_Aggregate_AbsSum(
+    string[] columns, Int32 numColumns, out NativePtr<NativeAggregate> result, out ErrorStatus status);
+  [LibraryImport(LibraryPaths.Dhclient, StringMarshalling = StringMarshalling.Utf8)]
+  public static partial void deephaven_client_Aggregate_Group(
+    string[] columns, Int32 numColumns, out NativePtr<NativeAggregate> result, out ErrorStatus status);
+  [LibraryImport(LibraryPaths.Dhclient, StringMarshalling = StringMarshalling.Utf8)]
+  public static partial void deephaven_client_Aggregate_Avg(
+    string[] columns, Int32 numColumns, out NativePtr<NativeAggregate> result, out ErrorStatus status);
+  [LibraryImport(LibraryPaths.Dhclient, StringMarshalling = StringMarshalling.Utf8)]
+  public static partial void deephaven_client_Aggregate_Count(
+    string column, out NativePtr<NativeAggregate> result, out ErrorStatus status);
+  [LibraryImport(LibraryPaths.Dhclient, StringMarshalling = StringMarshalling.Utf8)]
+  public static partial void deephaven_client_Aggregate_First(
+    string[] columns, Int32 numColumns, out NativePtr<NativeAggregate> result, out ErrorStatus status);
+  [LibraryImport(LibraryPaths.Dhclient, StringMarshalling = StringMarshalling.Utf8)]
+  public static partial void deephaven_client_Aggregate_Last(
+    string[] columns, Int32 numColumns, out NativePtr<NativeAggregate> result, out ErrorStatus status);
+  [LibraryImport(LibraryPaths.Dhclient, StringMarshalling = StringMarshalling.Utf8)]
+  public static partial void deephaven_client_Aggregate_Max(
+    string[] columns, Int32 numColumns, out NativePtr<NativeAggregate> result, out ErrorStatus status);
+  [LibraryImport(LibraryPaths.Dhclient, StringMarshalling = StringMarshalling.Utf8)]
+  public static partial void deephaven_client_Aggregate_Med(
+    string[] columns, Int32 numColumns, out NativePtr<NativeAggregate> result, out ErrorStatus status);
+  [LibraryImport(LibraryPaths.Dhclient, StringMarshalling = StringMarshalling.Utf8)]
+  public static partial void deephaven_client_Aggregate_Min(
+    string[] columns, Int32 numColumns, out NativePtr<NativeAggregate> result, out ErrorStatus status);
+  [LibraryImport(LibraryPaths.Dhclient, StringMarshalling = StringMarshalling.Utf8)]
+  public static partial void deephaven_client_Aggregate_Pct(
+    double percentile, InteropBool avgMedian,
+    string[] columns, Int32 numColumns, out NativePtr<NativeAggregate> result, out ErrorStatus status);
+  [LibraryImport(LibraryPaths.Dhclient, StringMarshalling = StringMarshalling.Utf8)]
+  public static partial void deephaven_client_Aggregate_Std(
+    string[] columns, Int32 numColumns, out NativePtr<NativeAggregate> result, out ErrorStatus status);
+  [LibraryImport(LibraryPaths.Dhclient, StringMarshalling = StringMarshalling.Utf8)]
+  public static partial void deephaven_client_Aggregate_Sum(
+    string[] columns, Int32 numColumns, out NativePtr<NativeAggregate> result, out ErrorStatus status);
+  [LibraryImport(LibraryPaths.Dhclient, StringMarshalling = StringMarshalling.Utf8)]
+  public static partial void deephaven_client_Aggregate_Var(
+    string[] columns, Int32 numColumns, out NativePtr<NativeAggregate> result, out ErrorStatus status);
+  [LibraryImport(LibraryPaths.Dhclient, StringMarshalling = StringMarshalling.Utf8)]
+  public static partial void deephaven_client_Aggregate_WAvg(
+    string[] columns, Int32 numColumns, out NativePtr<NativeAggregate> result, out ErrorStatus status);
+}
diff --git a/csharp/client/DeephavenClient/ArrowTable.cs b/csharp/client/DeephavenClient/ArrowTable.cs
new file mode 100644
index 00000000000..9f835c814a2
--- /dev/null
+++ b/csharp/client/DeephavenClient/ArrowTable.cs
@@ -0,0 +1,205 @@
+using Deephaven.DeephavenClient.Interop;
+using System.Runtime.InteropServices;
+using Deephaven.DeephavenClient.Utility;
+
+namespace Deephaven.DeephavenClient;
+
+public class ArrowTable : IDisposable {
+  internal NativePtr<NativeArrowTable> Self;
+  public readonly Int32 NumColumns;
+  public readonly Int64 NumRows;
+  private readonly string[] _columnNames;
+  private readonly ElementTypeId[] _columnElementTypes;
+
+  internal ArrowTable(NativePtr<NativeArrowTable> self) {
+    Self = self;
+    NativeArrowTable.deephaven_client_ArrowTable_GetDimensions(self, out NumColumns, out NumRows, out var status1);
+    status1.OkOrThrow();
+
+    var columnHandles = new StringHandle[NumColumns];
+    var elementTypesAsInt = new Int32[NumColumns];
+    NativeArrowTable.deephaven_client_ArrowTable_GetSchema(self, NumColumns, columnHandles, elementTypesAsInt, out var stringPoolHandle, out var status2);
+    status2.OkOrThrow();
+    var pool = stringPoolHandle.ExportAndDestroy();
+
+    _columnNames = new string[NumColumns];
+    _columnElementTypes = new ElementTypeId[NumColumns];
+    for (var i = 0; i != NumColumns; ++i) {
+      _columnNames[i] = pool.Get(columnHandles[i]);
+      _columnElementTypes[i] = (ElementTypeId)elementTypesAsInt[i];
+    }
+  }
+
+  ~ArrowTable() {
+    ReleaseUnmanagedResources();
+  }
+
+  public void Dispose() {
+    ReleaseUnmanagedResources();
+    GC.SuppressFinalize(this);
+  }
+
+  public (Array, bool[]) GetColumn(Int32 index) {
+    var elementType = _columnElementTypes[index];
+    var factory = ArrowTableColumnFactory.Of(elementType);
+    var (data, nulls) = factory.GetColumn(Self, index, NumRows);
+    return (data, nulls);
+  }
+
+  public Array GetNullableColumn(Int32 index) {
+    var elementType = _columnElementTypes[index];
+    var factory = ArrowTableColumnFactory.Of(elementType);
+    return factory.GetNullableColumn(Self, index, NumRows);
+  }
+
+  public void ReleaseUnmanagedResources() {
+    if (!Self.TryRelease(out var old)) {
+      return;
+    }
+    NativeArrowTable.deephaven_client_ArrowTable_dtor(old);
+  }
+}
+
+internal static class ArrowTableColumnFactory {
+  private static readonly ColumnFactory<NativeArrowTable>[] Factories = {
+    new ColumnFactory<NativeArrowTable>.ForChar(NativeArrowTable.deephaven_client_ArrowTable_GetCharAsInt16Column),
+    new ColumnFactory<NativeArrowTable>.ForOtherValueType<SByte>(NativeArrowTable.deephaven_client_ArrowTable_GetInt8Column),
+    new ColumnFactory<NativeArrowTable>.ForOtherValueType<Int16>(NativeArrowTable.deephaven_client_ArrowTable_GetInt16Column),
+    new ColumnFactory<NativeArrowTable>.ForOtherValueType<Int32>(NativeArrowTable.deephaven_client_ArrowTable_GetInt32Column),
+    new ColumnFactory<NativeArrowTable>.ForOtherValueType<Int64>(NativeArrowTable.deephaven_client_ArrowTable_GetInt64Column),
+    new ColumnFactory<NativeArrowTable>.ForOtherValueType<float>(NativeArrowTable.deephaven_client_ArrowTable_GetFloatColumn),
+    new ColumnFactory<NativeArrowTable>.ForOtherValueType<double>(NativeArrowTable.deephaven_client_ArrowTable_GetDoubleColumn),
+    new ColumnFactory<NativeArrowTable>.ForBool(NativeArrowTable.deephaven_client_ArrowTable_GetBooleanAsInteropBoolColumn),
+    new ColumnFactory<NativeArrowTable>.ForString(NativeArrowTable.deephaven_client_ArrowTable_GetStringColumn),
+    new ColumnFactory<NativeArrowTable>.ForDateTime(NativeArrowTable.deephaven_client_ArrowTable_GetDateTimeAsInt64Column),
+    // TODO(kosak): There is a whole family of types missing here, namely
+    // the Arrow list<T> types. These types arise in operations such as
+    // group_by. Each cell of a grouped column will contain a list of values,
+    // rather than a single value. Arrow supports this as list<T>. However
+    // the current version of the C++ library does not deserialize this
+    // properly. If such a column is received, the library will throw an
+    // exception. When the Deephaven library is updated to support list<T>,
+    // the factory methods here will need to be updated accordingly.
+  };
+
+  public static ColumnFactory<NativeArrowTable> Of(ElementTypeId typeId) {
+    return Factories[(int)typeId];
+  }
+}
+
+internal partial class NativeArrowTable {
+  [LibraryImport(LibraryPaths.Dhclient, StringMarshalling = StringMarshalling.Utf8)]
+  public static partial void deephaven_client_ArrowTable_dtor(NativePtr<NativeArrowTable> self);
+
+  [LibraryImport(LibraryPaths.Dhclient, StringMarshalling = StringMarshalling.Utf8)]
+  public static partial void deephaven_client_ArrowTable_GetDimensions(
+    NativePtr<NativeArrowTable> self, out Int32 numColumns, out Int64 numRows, out ErrorStatus status);
+
+  [LibraryImport(LibraryPaths.Dhclient, StringMarshalling = StringMarshalling.Utf8)]
+  public static partial void deephaven_client_ArrowTable_GetSchema(
+    NativePtr<NativeArrowTable> self, Int32 numColumns,
+    StringHandle[] columnHandles,
+    Int32[] columnTypes,
+    out StringPoolHandle stringPoolHandle,
+    out ErrorStatus status);
+
+  [LibraryImport(LibraryPaths.Dhclient, StringMarshalling = StringMarshalling.Utf8)]
+  public static partial void deephaven_client_ArrowTable_GetInt8Column(
+    NativePtr<NativeArrowTable> self,
+    Int32 numColumns,
+    SByte[] data,
+    InteropBool[]? nullFlags,
+    Int64 numRows,
+    out StringPoolHandle stringPoolHandle,
+    out ErrorStatus status);
+
+  [LibraryImport(LibraryPaths.Dhclient, StringMarshalling = StringMarshalling.Utf8)]
+  public static partial void deephaven_client_ArrowTable_GetInt16Column(
+    NativePtr<NativeArrowTable> self,
+    Int32 numColumns,
+    Int16[] data,
+    InteropBool[]? nullFlags,
+    Int64 numRows,
+    out StringPoolHandle stringPoolHandle,
+    out ErrorStatus status);
+
+  [LibraryImport(LibraryPaths.Dhclient, StringMarshalling = StringMarshalling.Utf8)]
+  public static partial void deephaven_client_ArrowTable_GetInt32Column(
+    NativePtr<NativeArrowTable> self,
+    Int32 numColumns,
+    Int32[] data,
+    InteropBool[]? nullFlags,
+    Int64 numRows,
+    out StringPoolHandle stringPoolHandle,
+    out ErrorStatus status);
+
+  [LibraryImport(LibraryPaths.Dhclient, StringMarshalling = StringMarshalling.Utf8)]
+  public static partial void deephaven_client_ArrowTable_GetInt64Column(
+    NativePtr<NativeArrowTable> self,
+    Int32 numColumns,
+    Int64[] data,
+    InteropBool[]? nullFlags,
+    Int64 numRows,
+    out StringPoolHandle stringPoolHandle,
+    out ErrorStatus status);
+
+  [LibraryImport(LibraryPaths.Dhclient, StringMarshalling = StringMarshalling.Utf8)]
+  public static partial void deephaven_client_ArrowTable_GetFloatColumn(
+    NativePtr<NativeArrowTable> self,
+    Int32 numColumns,
+    float[] data,
+    InteropBool[]? nullFlags,
+    Int64 numRows,
+    out StringPoolHandle stringPoolHandle,
+    out ErrorStatus status);
+
+  [LibraryImport(LibraryPaths.Dhclient, StringMarshalling = StringMarshalling.Utf8)]
+  public static partial void deephaven_client_ArrowTable_GetDoubleColumn(
+    NativePtr<NativeArrowTable> self,
+    Int32 numColumns,
+    double[] data,
+    InteropBool[]? nullFlags,
+    Int64 numRows,
+    out StringPoolHandle stringPoolHandle,
+    out ErrorStatus status);
+
+  [LibraryImport(LibraryPaths.Dhclient, StringMarshalling = StringMarshalling.Utf8)]
+  public static partial void deephaven_client_ArrowTable_GetBooleanAsInteropBoolColumn(
+    NativePtr<NativeArrowTable> self,
+    Int32 numColumns,
+    InteropBool[] data,
+    InteropBool[]? nullFlags,
+    Int64 numRows,
+    out StringPoolHandle stringPoolHandle,
+    out ErrorStatus status);
+
+  [LibraryImport(LibraryPaths.Dhclient, StringMarshalling = StringMarshalling.Utf8)]
+  public static partial void deephaven_client_ArrowTable_GetCharAsInt16Column(
+    NativePtr<NativeArrowTable> self,
+    Int32 numColumns,
+    Int16[] data,
+    InteropBool[]? nullFlags,
+    Int64 numRows,
+    out StringPoolHandle stringPoolHandle,
+    out ErrorStatus status);
+
+  [LibraryImport(LibraryPaths.Dhclient, StringMarshalling = StringMarshalling.Utf8)]
+  public static partial void deephaven_client_ArrowTable_GetStringColumn(
+    NativePtr<NativeArrowTable> self,
+    Int32 numColumns,
+    StringHandle[] data,
+    InteropBool[]? nullFlags,
+    Int64 numRows,
+    out StringPoolHandle stringPoolHandle,
+    out ErrorStatus status);
+
+  [LibraryImport(LibraryPaths.Dhclient, StringMarshalling = StringMarshalling.Utf8)]
+  public static partial void deephaven_client_ArrowTable_GetDateTimeAsInt64Column(
+    NativePtr<NativeArrowTable> self,
+    Int32 numColumns,
+    Int64[] data,
+    InteropBool[]? nullFlags,
+    Int64 numRows,
+    out StringPoolHandle stringPoolHandle,
+    out ErrorStatus status);
+}
diff --git a/csharp/client/DeephavenClient/Client.cs b/csharp/client/DeephavenClient/Client.cs
new file mode 100644
index 00000000000..887f51448e1
--- /dev/null
+++ b/csharp/client/DeephavenClient/Client.cs
@@ -0,0 +1,67 @@
+using Deephaven.DeephavenClient.Interop;
+using System;
+using System.Runtime.InteropServices;
+
+namespace Deephaven.DeephavenClient;
+
+public class Client : IDisposable {
+  internal NativePtr<NativeClient> Self;
+  public TableHandleManager Manager;
+
+  public static Client Connect(string target, ClientOptions options) {
+    NativeClient.deephaven_client_Client_Connect(target, options.Self, out var clientResult, out var status1);
+    status1.OkOrThrow();
+    NativeClient.deephaven_client_Client_GetManager(clientResult, out var managerResult, out var status2);
+    status2.OkOrThrow();
+    var manager = new TableHandleManager(managerResult);
+    return new Client(clientResult, manager);
+  }
+
+  private protected Client(NativePtr<NativeClient> self, TableHandleManager manager) {
+    Self = self;
+    Manager = manager;
+  }
+
+  ~Client() {
+    ReleaseUnmanagedResources(true);
+  }
+
+  public void Close() {
+    Dispose();
+  }
+
+  public void Dispose() {
+    ReleaseUnmanagedResources(true);
+    GC.SuppressFinalize(this);
+  }
+
+  protected virtual void ReleaseUnmanagedResources(bool destructSelf) {
+    if (!Self.TryRelease(out var old)) {
+      return;
+    }
+    if (!destructSelf) {
+      return;
+    }
+    NativeClient.deephaven_client_Client_dtor(old);
+  }
+}
+
+internal partial class NativeClient {
+  [LibraryImport(LibraryPaths.Dhclient, StringMarshalling = StringMarshalling.Utf8)]
+  public static partial void deephaven_client_Client_Connect(string target,
+    NativePtr<NativeClientOptions> options,
+    out NativePtr<NativeClient> result,
+    out ErrorStatus status);
+
+  [LibraryImport(LibraryPaths.Dhclient, StringMarshalling = StringMarshalling.Utf8)]
+  public static partial void deephaven_client_Client_dtor(NativePtr<NativeClient> self);
+
+  [LibraryImport(LibraryPaths.Dhclient, StringMarshalling = StringMarshalling.Utf8)]
+  public static partial void deephaven_client_Client_Close(NativePtr<NativeClient> self,
+    out ErrorStatus status);
+
+  [LibraryImport(LibraryPaths.Dhclient, StringMarshalling = StringMarshalling.Utf8)]
+  public static partial void deephaven_client_Client_GetManager(NativePtr<NativeClient> self,
+    out NativePtr<NativeTableHandleManager> result,
+    out ErrorStatus status);
+}
diff --git a/csharp/client/DeephavenClient/ClientOptions.cs b/csharp/client/DeephavenClient/ClientOptions.cs
new file mode 100644
index 00000000000..0c3187d96cd
--- /dev/null
+++ b/csharp/client/DeephavenClient/ClientOptions.cs
@@ -0,0 +1,161 @@
+using Deephaven.DeephavenClient.Interop;
+using System.Runtime.InteropServices;
+
+namespace Deephaven.DeephavenClient;
+
+public class ClientOptions : IDisposable {
+  internal NativePtr<NativeClientOptions> Self;
+
+  public ClientOptions() {
+    NativeClientOptions.deephaven_client_ClientOptions_ctor(out var result, out var status);
+    status.OkOrThrow();
+    Self = result;
+  }
+
+  ~ClientOptions() {
+    ReleaseUnmanagedResources();
+  }
+
+  public void Dispose() {
+    ReleaseUnmanagedResources();
+    GC.SuppressFinalize(this);
+  }
+
+  private void ReleaseUnmanagedResources() {
+    if (!Self.TryRelease(out var old)) {
+      return;
+    }
+    NativeClientOptions.deephaven_client_ClientOptions_dtor(old);
+  }
+
+  public ClientOptions SetDefaultAuthentication() {
+    NativeClientOptions.deephaven_client_ClientOptions_SetDefaultAuthentication(Self,
+      out var status);
+    status.OkOrThrow();
+    return this;
+  }
+
+  public ClientOptions SetBasicAuthentication(string username, string password) {
+    NativeClientOptions.deephaven_client_ClientOptions_SetBasicAuthentication(Self,
+      username, password, out var status);
+    status.OkOrThrow();
+    return this;
+  }
+
+  public ClientOptions SetCustomAuthentication(string authenticationKey, string authenticationValue) {
+    NativeClientOptions.deephaven_client_ClientOptions_SetCustomAuthentication(Self,
+      authenticationKey, authenticationValue, out var status);
+    status.OkOrThrow();
+    return this;
+  }
+
+  public ClientOptions SetSessionType(string sessionType) {
+    NativeClientOptions.deephaven_client_ClientOptions_SetSessionType(Self, sessionType,
+      out var status);
+    status.OkOrThrow();
+    return this;
+  }
+
+  public ClientOptions SetUseTls(bool useTls) {
+    NativeClientOptions.deephaven_client_ClientOptions_SetUseTls(Self, (InteropBool)useTls,
+      out var status);
+    status.OkOrThrow();
+    return this;
+  }
+
+  public ClientOptions SetTlsRootCerts(string tlsRootCerts) {
+    NativeClientOptions.deephaven_client_ClientOptions_SetTlsRootCerts(Self, tlsRootCerts,
+      out var status);
+    status.OkOrThrow();
+    return this;
+  }
+
+  public ClientOptions SetClientCertChain(string clientCertChain) {
+    NativeClientOptions.deephaven_client_ClientOptions_SetClientCertChain(Self, clientCertChain,
+      out var status);
+    status.OkOrThrow();
+    return this;
+  }
+
+  public ClientOptions SetClientPrivateKey(string clientPrivateKey) {
+    NativeClientOptions.deephaven_client_ClientOptions_SetClientPrivateKey(Self, clientPrivateKey,
+      out var status);
+    status.OkOrThrow();
+    return this;
+  }
+
+  public ClientOptions AddIntOption(string opt, Int32 val) {
+    NativeClientOptions.deephaven_client_ClientOptions_AddIntOption(Self, opt, val,
+      out var status);
+    status.OkOrThrow();
+    return this;
+  }
+
+  public ClientOptions AddStringOption(string opt, string val) {
+    NativeClientOptions.deephaven_client_ClientOptions_AddStringOption(Self, opt, val,
+      out var status);
+    status.OkOrThrow();
+    return this;
+  }
+
+  public ClientOptions AddExtraHeader(string headerName, string headerValue) {
+    NativeClientOptions.deephaven_client_ClientOptions_AddExtraHeader(Self, headerName, headerValue,
+      out var status);
+    status.OkOrThrow();
+    return this;
+  }
+}
+
+
+internal partial class NativeClientOptions {
+  [LibraryImport(LibraryPaths.Dhclient, StringMarshalling = StringMarshalling.Utf8)]
+  public static partial void deephaven_client_ClientOptions_ctor(
+    out NativePtr<NativeClientOptions> result, out ErrorStatus status);
+
+  [LibraryImport(LibraryPaths.Dhclient, StringMarshalling = StringMarshalling.Utf8)]
+  public static partial void deephaven_client_ClientOptions_dtor(NativePtr<NativeClientOptions> self);
+
+  [LibraryImport(LibraryPaths.Dhclient, StringMarshalling = StringMarshalling.Utf8)]
+  public static partial void deephaven_client_ClientOptions_SetDefaultAuthentication(NativePtr<NativeClientOptions> self,
+    out ErrorStatus status);
+
+  [LibraryImport(LibraryPaths.Dhclient, StringMarshalling = StringMarshalling.Utf8)]
+  public static partial void deephaven_client_ClientOptions_SetBasicAuthentication(NativePtr<NativeClientOptions> self,
+    string username, string password, out ErrorStatus status);
+
+  [LibraryImport(LibraryPaths.Dhclient, StringMarshalling = StringMarshalling.Utf8)]
+  public static partial void deephaven_client_ClientOptions_SetCustomAuthentication(NativePtr<NativeClientOptions> self,
+    string authentication_key, string authentication_value, out ErrorStatus status);
+
+  [LibraryImport(LibraryPaths.Dhclient, StringMarshalling = StringMarshalling.Utf8)]
+  public static partial void deephaven_client_ClientOptions_SetSessionType(NativePtr<NativeClientOptions> self,
+    string session_type, out ErrorStatus status);
+
+  [LibraryImport(LibraryPaths.Dhclient, StringMarshalling = StringMarshalling.Utf8)]
+  public static partial void deephaven_client_ClientOptions_SetUseTls(NativePtr<NativeClientOptions> self,
+    InteropBool use_tls, out ErrorStatus status);
+
+  [LibraryImport(LibraryPaths.Dhclient, StringMarshalling = StringMarshalling.Utf8)]
+  public static partial void deephaven_client_ClientOptions_SetTlsRootCerts(NativePtr<NativeClientOptions> self,
+    string tls_root_certs, out ErrorStatus status);
+
+  [LibraryImport(LibraryPaths.Dhclient, StringMarshalling = StringMarshalling.Utf8)]
+  public static partial void deephaven_client_ClientOptions_SetClientCertChain(NativePtr<NativeClientOptions> self,
+    string client_cert_chain, out ErrorStatus status);
+
+  [LibraryImport(LibraryPaths.Dhclient, StringMarshalling = StringMarshalling.Utf8)]
+  public static partial void deephaven_client_ClientOptions_SetClientPrivateKey(NativePtr<NativeClientOptions> self,
+    string client_private_key, out ErrorStatus status);
+
+  [LibraryImport(LibraryPaths.Dhclient, StringMarshalling = StringMarshalling.Utf8)]
+  public static partial void deephaven_client_ClientOptions_AddIntOption(NativePtr<NativeClientOptions> self,
+    string opt, Int32 val, out ErrorStatus status);
+
+  [LibraryImport(LibraryPaths.Dhclient, StringMarshalling = StringMarshalling.Utf8)]
+  public static partial void deephaven_client_ClientOptions_AddStringOption(NativePtr<NativeClientOptions> self,
+    string opt, string val, out ErrorStatus status);
+
+  [LibraryImport(LibraryPaths.Dhclient, StringMarshalling = StringMarshalling.Utf8)]
+  public static partial void deephaven_client_ClientOptions_AddExtraHeader(NativePtr<NativeClientOptions> self,
+    string header_name, string header_value, out ErrorStatus status);
+}
diff --git a/csharp/client/DeephavenClient/ClientTable.cs b/csharp/client/DeephavenClient/ClientTable.cs
new file mode 100644
index 00000000000..97aa74b4abe
--- /dev/null
+++ b/csharp/client/DeephavenClient/ClientTable.cs
@@ -0,0 +1,226 @@
+using Deephaven.DeephavenClient.Interop;
+using System.Runtime.InteropServices;
+using Deephaven.DeephavenClient.Utility;
+
+namespace Deephaven.DeephavenClient;
+
+public class ClientTable : IDisposable {
+  internal NativePtr<NativeClientTable> Self;
+  public readonly Schema Schema;
+
+  public Int32 NumCols => Schema.NumCols;
+  public Int64 NumRows => Schema.NumRows;
+
+  internal ClientTable(NativePtr<NativeClientTable> self) {
+    Self = self;
+    NativeClientTable.deephaven_client_ClientTable_GetDimensions(Self,
+      out var numColumns, out var numRows, out var status1);
+    status1.OkOrThrow();
+
+    var columnNameHandles = new StringHandle[numColumns];
+    var elementTypesAsInt = new Int32[numColumns];
+    NativeClientTable.deephaven_client_ClientTable_Schema(self, numColumns, columnNameHandles, elementTypesAsInt,
+      out var stringPoolHandle, out var status2);
+    status2.OkOrThrow();
+    var pool = stringPoolHandle.ExportAndDestroy();
+
+    var columnNames = columnNameHandles.Select(pool.Get).ToArray();
+    Schema = new Schema(columnNames, elementTypesAsInt, numRows);
+  }
+
+  ~ClientTable() {
+    ReleaseUnmanagedResources();
+  }
+
+  public void Dispose() {
+    ReleaseUnmanagedResources();
+    GC.SuppressFinalize(this);
+  }
+
+  private void ReleaseUnmanagedResources() {
+    if (!Self.TryRelease(out var old)) {
+      return;
+    }
+    NativeClientTable.deephaven_client_ClientTable_dtor(old);
+  }
+
+  public (Array, bool[]) GetColumn(Int32 index) {
+    var elementType = Schema.Types[index];
+    var factory = ClientTableColumnFactory.Of(elementType);
+    var (data, nulls) = factory.GetColumn(Self, index, Schema.NumRows);
+    return (data, nulls);
+  }
+
+  public (Array, bool[]) GetColumn(string name) {
+    var colIndex = Schema.GetColumnIndex(name);
+    return GetColumn(colIndex);
+  }
+
+  public Array GetNullableColumn(Int32 index) {
+    var elementType = Schema.Types[index];
+    var factory = ClientTableColumnFactory.Of(elementType);
+    return factory.GetNullableColumn(Self, index, Schema.NumRows);
+  }
+
+  public Array GetNullableColumn(string name) {
+    var colIndex = Schema.GetColumnIndex(name);
+    return GetNullableColumn(colIndex);
+  }
+
+  public string ToString(bool wantHeaders, bool wantLineNumbers) {
+    NativeClientTable.deephaven_client_ClientTable_ToString(Self,
+      (InteropBool)wantHeaders, (InteropBool)wantLineNumbers,
+      out var textHandle, out var poolHandle, out var status);
+    status.OkOrThrow();
+    var pool = poolHandle.ExportAndDestroy();
+    return pool.Get(textHandle);
+  }
+}
+
+internal abstract class ClientTableColumnFactory {
+  private static readonly ColumnFactory<NativeClientTable>[] Factories = {
+    new ColumnFactory<NativeClientTable>.ForChar(NativeClientTableHelper.deephaven_client_ClientTableHelper_GetCharAsInt16Column),
+    new ColumnFactory<NativeClientTable>.ForOtherValueType<SByte>(NativeClientTableHelper.deephaven_client_ClientTableHelper_GetInt8Column),
+    new ColumnFactory<NativeClientTable>.ForOtherValueType<Int16>(NativeClientTableHelper.deephaven_client_ClientTableHelper_GetInt16Column),
+    new ColumnFactory<NativeClientTable>.ForOtherValueType<Int32>(NativeClientTableHelper.deephaven_client_ClientTableHelper_GetInt32Column),
+    new ColumnFactory<NativeClientTable>.ForOtherValueType<Int64>(NativeClientTableHelper.deephaven_client_ClientTableHelper_GetInt64Column),
+    new ColumnFactory<NativeClientTable>.ForOtherValueType<float>(NativeClientTableHelper.deephaven_client_ClientTableHelper_GetFloatColumn),
+    new ColumnFactory<NativeClientTable>.ForOtherValueType<double>(NativeClientTableHelper.deephaven_client_ClientTableHelper_GetDoubleColumn),
+    new ColumnFactory<NativeClientTable>.ForBool(NativeClientTableHelper.deephaven_client_ClientTableHelper_GetBooleanAsInteropBoolColumn),
+    new ColumnFactory<NativeClientTable>.ForString(NativeClientTableHelper.deephaven_client_ClientTableHelper_GetStringColumn),
+    new ColumnFactory<NativeClientTable>.ForDateTime(NativeClientTableHelper.deephaven_client_ClientTableHelper_GetDateTimeAsInt64Column),
+    // List - TODO(kosak)
+  };
+
+  public static ColumnFactory<NativeClientTable> Of(ElementTypeId typeId) {
+    return Factories[(int)typeId];
+  }
+}
+
+internal partial class NativeClientTable {
+  [LibraryImport(LibraryPaths.Dhclient, StringMarshalling = StringMarshalling.Utf8)]
+  public static partial void deephaven_client_ClientTable_dtor(NativePtr<NativeClientTable> self);
+
+  [LibraryImport(LibraryPaths.Dhclient, StringMarshalling = StringMarshalling.Utf8)]
+  public static partial void deephaven_client_ClientTable_GetDimensions(
+    NativePtr<NativeClientTable> self, out Int32 numColumns, out Int64 numWRows, out ErrorStatus status);
+
+  [LibraryImport(LibraryPaths.Dhclient, StringMarshalling = StringMarshalling.Utf8)]
+  public static partial void deephaven_client_ClientTable_Schema(
+    NativePtr<NativeClientTable> self,
+    Int32 numColumns,
+    StringHandle[] columnHandles,
+    Int32[] columnTypes,
+    out StringPoolHandle stringPool,
+    out ErrorStatus status);
+
+  [LibraryImport(LibraryPaths.Dhclient, StringMarshalling = StringMarshalling.Utf8)]
+  public static partial void deephaven_client_ClientTable_ToString(
+    NativePtr<NativeClientTable> self,
+    InteropBool wantHeaders, InteropBool wantRowNumbers,
+    out StringHandle text,
+    out StringPoolHandle stringPool,
+    out ErrorStatus status);
+}
+
+internal partial class NativeClientTableHelper {
+  [LibraryImport(LibraryPaths.Dhclient, StringMarshalling = StringMarshalling.Utf8)]
+  public static partial void deephaven_client_ClientTableHelper_GetInt8Column(
+    NativePtr<NativeClientTable> self,
+    Int32 columnIndex,
+    sbyte[] data,
+    InteropBool[]? optionalDestNullFlags,
+    Int64 numRows,
+    out StringPoolHandle stringPoolHandle,
+    out ErrorStatus status);
+
+  [LibraryImport(LibraryPaths.Dhclient, StringMarshalling = StringMarshalling.Utf8)]
+  public static partial void deephaven_client_ClientTableHelper_GetInt16Column(
+    NativePtr<NativeClientTable> self,
+    Int32 columnIndex,
+    Int16[] data,
+    InteropBool[]? optionalDestNullFlags,
+    Int64 numRows,
+    out StringPoolHandle stringPoolHandle,
+    out ErrorStatus status);
+
+  [LibraryImport(LibraryPaths.Dhclient, StringMarshalling = StringMarshalling.Utf8)]
+  public static partial void deephaven_client_ClientTableHelper_GetInt32Column(
+    NativePtr<NativeClientTable> self,
+    Int32 columnIndex,
+    Int32[] data,
+    InteropBool[]? optionalDestNullFlags,
+    Int64 numRows,
+    out StringPoolHandle stringPoolHandle,
+    out ErrorStatus status);
+
+  [LibraryImport(LibraryPaths.Dhclient, StringMarshalling = StringMarshalling.Utf8)]
+  public static partial void deephaven_client_ClientTableHelper_GetInt64Column(
+    NativePtr<NativeClientTable> self,
+    Int32 columnIndex,
+    Int64[] data,
+    InteropBool[]? optionalDestNullFlags,
+    Int64 numRows,
+    out StringPoolHandle stringPoolHandle,
+    out ErrorStatus status);
+
+  [LibraryImport(LibraryPaths.Dhclient, StringMarshalling = StringMarshalling.Utf8)]
+  public static partial void deephaven_client_ClientTableHelper_GetFloatColumn(
+    NativePtr<NativeClientTable> self,
+    Int32 columnIndex,
+    float[] data,
+    InteropBool[]? optionalDestNullFlags,
+    Int64 numRows,
+    out StringPoolHandle stringPoolHandle,
+    out ErrorStatus status);
+
+  [LibraryImport(LibraryPaths.Dhclient, StringMarshalling = StringMarshalling.Utf8)]
+  public static partial void deephaven_client_ClientTableHelper_GetDoubleColumn(
+    NativePtr<NativeClientTable> self,
+    Int32 columnIndex,
+    double[] data,
+    InteropBool[]? optionalDestNullFlags,
+    Int64 numRows,
+    out StringPoolHandle stringPoolHandle,
+    out ErrorStatus status);
+
+  [LibraryImport(LibraryPaths.Dhclient, StringMarshalling = StringMarshalling.Utf8)]
+  public static partial void deephaven_client_ClientTableHelper_GetBooleanAsInteropBoolColumn(
+    NativePtr<NativeClientTable> self,
+    Int32 columnIndex,
+    InteropBool[] data,
+    InteropBool[]? optionalDestNullFlags,
+    Int64 numRows,
+    out StringPoolHandle stringPoolHandle,
+    out ErrorStatus status);
+
+  [LibraryImport(LibraryPaths.Dhclient, StringMarshalling = StringMarshalling.Utf8)]
+  public static partial void deephaven_client_ClientTableHelper_GetCharAsInt16Column(
+    NativePtr<NativeClientTable> self,
+    Int32 columnIndex,
+    Int16[] data,
+    InteropBool[]? optionalDestNullFlags,
+    Int64 numRows,
+    out StringPoolHandle stringPoolHandle,
+    out ErrorStatus status);
+
+  [LibraryImport(LibraryPaths.Dhclient, StringMarshalling = StringMarshalling.Utf8)]
+  public static partial void deephaven_client_ClientTableHelper_GetStringColumn(
+    NativePtr<NativeClientTable> self,
+    Int32 columnIndex,
+    StringHandle[] data,
+    InteropBool[]? optionalDestNullFlags,
+    Int64 numRows,
+    out StringPoolHandle stringPoolHandle,
+    out ErrorStatus status);
+
+  [LibraryImport(LibraryPaths.Dhclient, StringMarshalling = StringMarshalling.Utf8)]
+  public static partial void deephaven_client_ClientTableHelper_GetDateTimeAsInt64Column(
+    NativePtr<NativeClientTable> self,
+    Int32 columnIndex,
+    Int64[] data,
+    InteropBool[]? optionalDestNullFlags,
+    Int64 numRows,
+    out StringPoolHandle stringPoolHandle,
+    out ErrorStatus status);
+}
diff --git a/csharp/client/DeephavenClient/DeephavenClient.csproj b/csharp/client/DeephavenClient/DeephavenClient.csproj
new file mode 100644
index 00000000000..ac6d099d291
--- /dev/null
+++ b/csharp/client/DeephavenClient/DeephavenClient.csproj
@@ -0,0 +1,16 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <TargetFramework>net8.0</TargetFramework>
+    <ImplicitUsings>enable</ImplicitUsings>
+    <Nullable>enable</Nullable>
+    <AllowUnsafeBlocks>True</AllowUnsafeBlocks>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <Compile Remove="dh_client\**" />
+    <EmbeddedResource Remove="dh_client\**" />
+    <None Remove="dh_client\**" />
+  </ItemGroup>
+
+</Project>
diff --git a/csharp/client/DeephavenClient/DeephavenClient.sln b/csharp/client/DeephavenClient/DeephavenClient.sln
new file mode 100644
index 00000000000..cdbf96e90c3
--- /dev/null
+++ b/csharp/client/DeephavenClient/DeephavenClient.sln
@@ -0,0 +1,25 @@
+
+Microsoft Visual Studio Solution File, Format Version 12.00
+# Visual Studio Version 17
+VisualStudioVersion = 17.7.34221.43
+MinimumVisualStudioVersion = 10.0.40219.1
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "DeephavenClient", "DeephavenClient.csproj", "{60349B25-7FF1-477A-807A-EA1CEA019DA1}"
+EndProject
+Global
+	GlobalSection(SolutionConfigurationPlatforms) = preSolution
+		Debug|Any CPU = Debug|Any CPU
+		Release|Any CPU = Release|Any CPU
+	EndGlobalSection
+	GlobalSection(ProjectConfigurationPlatforms) = postSolution
+		{60349B25-7FF1-477A-807A-EA1CEA019DA1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{60349B25-7FF1-477A-807A-EA1CEA019DA1}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{60349B25-7FF1-477A-807A-EA1CEA019DA1}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{60349B25-7FF1-477A-807A-EA1CEA019DA1}.Release|Any CPU.Build.0 = Release|Any CPU
+	EndGlobalSection
+	GlobalSection(SolutionProperties) = preSolution
+		HideSolutionNode = FALSE
+	EndGlobalSection
+	GlobalSection(ExtensibilityGlobals) = postSolution
+		SolutionGuid = {DAE1D808-7E3F-4536-9AA5-6D88112C6B3A}
+	EndGlobalSection
+EndGlobal
diff --git a/csharp/client/DeephavenClient/DhDateTime.cs b/csharp/client/DeephavenClient/DhDateTime.cs
new file mode 100644
index 00000000000..be943b7fd15
--- /dev/null
+++ b/csharp/client/DeephavenClient/DhDateTime.cs
@@ -0,0 +1,37 @@
+using System;
+using Deephaven.DeephavenClient.Utility;
+
+namespace Deephaven.DeephavenClient;
+
+/// <summary>
+/// Deephaven's custom representation of DateTime, with full nanosecond resolution,
+/// unlike .NET's own System.DateTime which has 100ns resolution.
+/// </summary>
+public readonly struct DhDateTime {
+  public static DhDateTime Parse(string date) {
+    // TODO(kosak): do something about the extra nanosecond resolution
+    var dt = DateTime.Parse(date).ToUniversalTime();
+    var ts = dt - DateTime.UnixEpoch;
+
+    return new DhDateTime((Int64)ts.TotalNanoseconds);
+  }
+
+  public readonly Int64 Nanos;
+
+  public static DhDateTime FromNanos(Int64 nanos) => new (nanos);
+
+  public DhDateTime(int year, int month, int day, int hour, int minute = 0, int second = 0, int nanos = 0) {
+    var ts = new DateTime(year, month, day, hour, minute, second) - DateTime.UnixEpoch;
+    Nanos = (Int64)ts.TotalNanoseconds + nanos;
+  }
+
+  public DhDateTime(Int64 nanos) {
+    Nanos = nanos == DeephavenConstants.NullLong ? 0 : nanos;
+  }
+
+  public DateTime DateTime => DateTime.UnixEpoch.AddTicks(Nanos / 100);
+
+  public override string ToString() {
+    return $"[Nanos={Nanos}]";
+  }
+}
diff --git a/csharp/client/DeephavenClient/DurationSpecifier.cs b/csharp/client/DeephavenClient/DurationSpecifier.cs
new file mode 100644
index 00000000000..5bf1782b67a
--- /dev/null
+++ b/csharp/client/DeephavenClient/DurationSpecifier.cs
@@ -0,0 +1,66 @@
+using System;
+using System.Runtime.InteropServices;
+using Deephaven.DeephavenClient.Interop;
+
+namespace Deephaven.DeephavenClient;
+
+public class DurationSpecifier {
+  private readonly object _duration;
+
+  public DurationSpecifier(Int64 nanos) => _duration = nanos;
+  public DurationSpecifier(string duration) => _duration = duration;
+
+  public static implicit operator DurationSpecifier(Int64 nanos) => new (nanos);
+  public static implicit operator DurationSpecifier(string duration) => new (duration);
+  public static implicit operator DurationSpecifier(TimeSpan ts) => new((long)(ts.TotalMicroseconds * 1000));
+
+  internal InternalDurationSpecifier Materialize() => new (_duration);
+}
+
+internal class InternalDurationSpecifier : IDisposable {
+  internal NativePtr<NativeDurationSpecifier> Self;
+
+  public InternalDurationSpecifier(object duration) {
+    NativePtr<NativeDurationSpecifier> result;
+    ErrorStatus status;
+    if (duration is Int64 nanos) {
+      NativeDurationSpecifier.deephaven_client_utility_DurationSpecifier_ctor_nanos(nanos,
+        out result, out status);
+    } else if (duration is string dur) {
+      NativeDurationSpecifier.deephaven_client_utility_DurationSpecifier_ctor_durationstr(dur,
+        out result, out status);
+    } else {
+      throw new ArgumentException($"Unexpected type {duration.GetType().Name} for duration");
+    }
+    status.OkOrThrow();
+    Self = result;
+  }
+
+  ~InternalDurationSpecifier() {
+    ReleaseUnmanagedResources();
+  }
+
+  public void Dispose() {
+    ReleaseUnmanagedResources();
+    GC.SuppressFinalize(this);
+  }
+
+  private void ReleaseUnmanagedResources() {
+    if (!Self.TryRelease(out var old)) {
+      return;
+    }
+    NativeDurationSpecifier.deephaven_client_utility_DurationSpecifier_dtor(old);
+  }
+}
+
+
+internal partial class NativeDurationSpecifier {
+  [LibraryImport(LibraryPaths.Dhclient, StringMarshalling = StringMarshalling.Utf8)]
+  public static partial void deephaven_client_utility_DurationSpecifier_ctor_nanos(Int64 nanos,
+    out NativePtr<NativeDurationSpecifier> result, out ErrorStatus status);
+  [LibraryImport(LibraryPaths.Dhclient, StringMarshalling = StringMarshalling.Utf8)]
+  public static partial void deephaven_client_utility_DurationSpecifier_ctor_durationstr(string duration,
+    out NativePtr<NativeDurationSpecifier> result, out ErrorStatus status);
+  [LibraryImport(LibraryPaths.Dhclient, StringMarshalling = StringMarshalling.Utf8)]
+  public static partial void deephaven_client_utility_DurationSpecifier_dtor(NativePtr<NativeDurationSpecifier> self);
+}
diff --git a/csharp/client/DeephavenClient/SortPair.cs b/csharp/client/DeephavenClient/SortPair.cs
new file mode 100644
index 00000000000..dcd4a318a47
--- /dev/null
+++ b/csharp/client/DeephavenClient/SortPair.cs
@@ -0,0 +1,25 @@
+namespace Deephaven.DeephavenClient;
+
+public enum SortDirection {
+  Ascending = 0, Descending = 1
+};
+
+public class SortPair {
+  public readonly string Column;
+  public readonly SortDirection Direction;
+  public readonly bool Abs;
+
+  public static SortPair Ascending(string column, bool abs = false) {
+    return new SortPair(column, SortDirection.Ascending, abs);
+  }
+
+  public static SortPair Descending(string column, bool abs = false) {
+    return new SortPair(column, SortDirection.Descending, abs);
+  }
+
+  SortPair(string column, SortDirection sortDirection, bool abs) {
+    Column = column;
+    Direction = sortDirection;
+    Abs = abs;
+  }
+}
diff --git a/csharp/client/DeephavenClient/TableHandle.cs b/csharp/client/DeephavenClient/TableHandle.cs
new file mode 100644
index 00000000000..5df9b414f0b
--- /dev/null
+++ b/csharp/client/DeephavenClient/TableHandle.cs
@@ -0,0 +1,801 @@
+using System.Diagnostics;
+using Deephaven.DeephavenClient.Interop;
+using System.Runtime.InteropServices;
+using Deephaven.DeephavenClient.UpdateBy;
+using Deephaven.DeephavenClient.Utility;
+
+namespace Deephaven.DeephavenClient;
+
+public sealed class TableHandle : IDisposable {
+  internal NativePtr<NativeTableHandle> Self;
+  public TableHandleManager Manager;
+  public Schema Schema;
+  public Int32 NumCols => Schema.NumCols;
+  public Int64 NumRows => Schema.NumRows;
+  public readonly bool IsStatic;
+
+  internal TableHandle(NativePtr<NativeTableHandle> self, TableHandleManager manager) {
+    Self = self;
+    Manager = manager;
+
+    NativeTableHandle.deephaven_client_TableHandle_GetAttributes(Self,
+      out var numCols, out var numRows, out InteropBool isStatic, out var status1);
+    status1.OkOrThrow();
+    IsStatic = (bool)isStatic;
+
+    var columnHandles = new StringHandle[numCols];
+    var elementTypesAsInt = new Int32[numCols];
+    NativeTableHandle.deephaven_client_TableHandle_GetSchema(self, numCols, columnHandles,
+      elementTypesAsInt, out var stringPoolHandle, out var status2);
+    status2.OkOrThrow();
+
+    var pool = stringPoolHandle.ExportAndDestroy();
+    var columnNames = columnHandles.Select(pool.Get).ToArray();
+    Schema = new Schema(columnNames, elementTypesAsInt, numRows);
+  }
+
+  ~TableHandle() {
+    ReleaseUnmanagedResources();
+  }
+
+  public void Dispose() {
+    ReleaseUnmanagedResources();
+    GC.SuppressFinalize(this);
+  }
+
+  public TableHandle Where(string condition) {
+    NativeTableHandle.deephaven_client_TableHandle_Where(Self, condition, out var result,
+      out var status);
+    status.OkOrThrow();
+    return new TableHandle(result, Manager);
+  }
+
+  public TableHandle Sort(params SortPair[] sortPairs) {
+    var columns = new string[sortPairs.Length];
+    var ascendings = new InteropBool[sortPairs.Length];
+    var abss = new InteropBool[sortPairs.Length];
+    for (var i = 0; i != sortPairs.Length; ++i) {
+      var sp = sortPairs[i];
+      columns[i] = sp.Column;
+      ascendings[i] = (InteropBool)(sp.Direction == SortDirection.Ascending);
+      abss[i] = (InteropBool)sp.Abs;
+    }
+    NativeTableHandle.deephaven_client_TableHandle_Sort(Self, 
+      columns, ascendings, abss, sortPairs.Length,
+      out var result, out var status);
+    status.OkOrThrow();
+    return new TableHandle(result, Manager);
+  }
+
+  public TableHandle Select(params string[] columnSpecs) {
+    NativeTableHandle.deephaven_client_TableHandle_Select(Self,
+      columnSpecs, columnSpecs.Length, out var result, out var status);
+    status.OkOrThrow();
+    return new TableHandle(result, Manager);
+  }
+
+  public TableHandle View(params string[] columnSpecs) {
+    NativeTableHandle.deephaven_client_TableHandle_View(Self,
+      columnSpecs, columnSpecs.Length, out var result, out var status);
+    status.OkOrThrow();
+    return new TableHandle(result, Manager);
+  }
+
+  public TableHandle DropColumns(params string[] columns) {
+    NativeTableHandle.deephaven_client_TableHandle_DropColumns(Self,
+      columns, columns.Length, out var result, out var status);
+    status.OkOrThrow();
+    return new TableHandle(result, Manager);
+  }
+
+  public TableHandle Update(params string[] columnSpecs) {
+    NativeTableHandle.deephaven_client_TableHandle_Update(Self, columnSpecs, columnSpecs.Length,
+      out var result, out var status);
+    status.OkOrThrow();
+    return new TableHandle(result, Manager);
+  }
+
+  public TableHandle LazyUpdate(params string[] columnSpecs) {
+    NativeTableHandle.deephaven_client_TableHandle_LazyUpdate(Self, columnSpecs, columnSpecs.Length,
+      out var result, out var status);
+    status.OkOrThrow();
+    return new TableHandle(result, Manager);
+  }
+
+  public TableHandle SelectDistinct(params string[] columnSpecs) {
+    NativeTableHandle.deephaven_client_TableHandle_SelectDistinct(Self,
+      columnSpecs, columnSpecs.Length, out var result, out var status);
+    status.OkOrThrow();
+    return new TableHandle(result, Manager);
+  }
+
+  public TableHandle Head(Int64 numRows) {
+    NativeTableHandle.deephaven_client_TableHandle_Head(Self, numRows,
+      out var result, out var status);
+    status.OkOrThrow();
+    return new TableHandle(result, Manager);
+  }
+
+  public TableHandle Tail(Int64 numRows) {
+    NativeTableHandle.deephaven_client_TableHandle_Tail(Self, numRows,
+      out var result, out var status);
+    status.OkOrThrow();
+    return new TableHandle(result, Manager);
+  }
+
+  public TableHandle Ungroup(params string[] groupByColumns) {
+    return Ungroup(false, groupByColumns);
+  }
+
+  public TableHandle Ungroup(bool nullFill, params string[] groupByColumns) {
+    NativeTableHandle.deephaven_client_TableHandle_Ungroup(Self, (InteropBool)nullFill,
+      groupByColumns, groupByColumns.Length,
+      out var result, out var status);
+    status.OkOrThrow();
+    return new TableHandle(result, Manager);
+  }
+
+  public TableHandle Merge(string keyColumns, TableHandle[] sources) {
+    var tableHandlePtrs = sources.Select(s => s.Self).ToArray();
+    NativeTableHandle.deephaven_client_TableHandle_Merge(Self, keyColumns,
+      tableHandlePtrs, tableHandlePtrs.Length,
+      out var result, out var status);
+    status.OkOrThrow();
+    return new TableHandle(result, Manager);
+  }
+
+  public TableHandle Merge(TableHandle[] sources) {
+    return Merge("", sources);
+  }
+
+  public TableHandle CrossJoin(TableHandle rightSide, string[] columnsToMatch,
+    string[]? columnsToAdd = null) =>
+    JoinHelper(rightSide, columnsToMatch, columnsToAdd,
+      NativeTableHandle.deephaven_client_TableHandle_CrossJoin);
+
+  public TableHandle NaturalJoin(TableHandle rightSide, string[] columnsToMatch,
+    string[]? columnsToAdd = null) =>
+    JoinHelper(rightSide, columnsToMatch, columnsToAdd,
+      NativeTableHandle.deephaven_client_TableHandle_NaturalJoin);
+
+  public TableHandle LeftOuterJoin(TableHandle rightSide, string[] columnsToMatch,
+    string[]? columnsToAdd = null) =>
+    JoinHelper(rightSide, columnsToMatch, columnsToAdd,
+      NativeTableHandle.deephaven_client_TableHandle_LeftOuterJoin);
+
+  public TableHandle ExactJoin(TableHandle rightSide, string[] columnsToMatch,
+    string[]? columnsToAdd = null) =>
+    JoinHelper(rightSide, columnsToMatch, columnsToAdd,
+      NativeTableHandle.deephaven_client_TableHandle_ExactJoin);
+
+  public TableHandle UpdateBy(UpdateByOperation[] operations, string[] by) {
+    var internalOperations = new List<InternalUpdateByOperation>();
+    foreach (var operation in operations) {
+      internalOperations.Add(operation.MakeInternal());
+    }
+
+    try {
+      var internalOperationPtrs = internalOperations.Select(s => s.Self).ToArray();
+      NativeTableHandle.deephaven_client_TableHandle_UpdateBy(Self,
+        internalOperationPtrs, internalOperationPtrs.Length,
+        by, by.Length,
+        out var result, out var status);
+      status.OkOrThrow();
+      return new TableHandle(result, Manager);
+    } finally {
+      foreach (var intOp in internalOperations) {
+        intOp.Dispose();
+      }
+    }
+  }
+
+  public TableHandle Aj(TableHandle rightSide, string[] columnsToMatch,
+    string[]? columnsToAdd = null) =>
+    JoinHelper(rightSide, columnsToMatch, columnsToAdd,
+      NativeTableHandle.deephaven_client_TableHandle_Aj);
+
+  public TableHandle Raj(TableHandle rightSide, string[] columnsToMatch,
+    string[]? columnsToAdd = null) =>
+    JoinHelper(rightSide, columnsToMatch, columnsToAdd,
+      NativeTableHandle.deephaven_client_TableHandle_Raj);
+
+  private delegate void NativeJoinInvoker(
+    NativePtr<NativeTableHandle> self,
+    NativePtr<NativeTableHandle> rightSide,
+    string[] columnsToMatch, Int32 columnsToMatchLength,
+    string[] columnsToAdd, Int32 columnsToAddLength,
+    out NativePtr<NativeTableHandle> result,
+    out ErrorStatus status);
+
+  private TableHandle JoinHelper(TableHandle rightSide, string[] columnsToMatch,
+    string[]? columnsToAdd, NativeJoinInvoker invoker) { 
+    columnsToAdd ??= Array.Empty<string>();
+    invoker(Self, rightSide.Self, columnsToMatch, columnsToMatch.Length,
+      columnsToAdd, columnsToAdd.Length,
+      out var result, out var status);
+    status.OkOrThrow();
+    return new TableHandle(result, Manager);
+  }
+
+  public TableHandle MinBy(params string[] columnSpecs) {
+    NativeTableHandle.deephaven_client_TableHandle_MinBy(Self,
+      columnSpecs, columnSpecs.Length, out var result, out var status);
+    status.OkOrThrow();
+    return new TableHandle(result, Manager);
+  }
+
+  public TableHandle MaxBy(params string[] columnSpecs) {
+    NativeTableHandle.deephaven_client_TableHandle_MaxBy(Self,
+      columnSpecs, columnSpecs.Length, out var result, out var status);
+    status.OkOrThrow();
+    return new TableHandle(result, Manager);
+  }
+
+  public TableHandle SumBy(params string[] columnSpecs) {
+    NativeTableHandle.deephaven_client_TableHandle_SumBy(Self,
+      columnSpecs, columnSpecs.Length, out var result, out var status);
+    status.OkOrThrow();
+    return new TableHandle(result, Manager);
+  }
+
+  public TableHandle AbsSumBy(params string[] columnSpecs) {
+    NativeTableHandle.deephaven_client_TableHandle_AbsSumBy(Self,
+      columnSpecs, columnSpecs.Length, out var result, out var status);
+    status.OkOrThrow();
+    return new TableHandle(result, Manager);
+  }
+
+  public TableHandle VarBy(params string[] columnSpecs) {
+    NativeTableHandle.deephaven_client_TableHandle_VarBy(Self,
+      columnSpecs, columnSpecs.Length, out var result, out var status);
+    status.OkOrThrow();
+    return new TableHandle(result, Manager);
+  }
+
+  public TableHandle StdBy(params string[] columnSpecs) {
+    NativeTableHandle.deephaven_client_TableHandle_StdBy(Self,
+      columnSpecs, columnSpecs.Length, out var result, out var status);
+    status.OkOrThrow();
+    return new TableHandle(result, Manager);
+  }
+
+  public TableHandle AvgBy(params string[] columnSpecs) {
+    NativeTableHandle.deephaven_client_TableHandle_AvgBy(Self,
+      columnSpecs, columnSpecs.Length, out var result, out var status);
+    status.OkOrThrow();
+    return new TableHandle(result, Manager);
+  }
+
+  public TableHandle FirstBy(params string[] columnSpecs) {
+    NativeTableHandle.deephaven_client_TableHandle_FirstBy(Self,
+      columnSpecs, columnSpecs.Length, out var result, out var status);
+    status.OkOrThrow();
+    return new TableHandle(result, Manager);
+  }
+
+  public TableHandle LastBy(params string[] columnSpecs) {
+    NativeTableHandle.deephaven_client_TableHandle_LastBy(Self,
+      columnSpecs, columnSpecs.Length, out var result, out var status);
+    status.OkOrThrow();
+    return new TableHandle(result, Manager);
+  }
+
+  public TableHandle MedianBy(params string[] columnSpecs) {
+    NativeTableHandle.deephaven_client_TableHandle_MedianBy(Self,
+      columnSpecs, columnSpecs.Length, out var result, out var status);
+    status.OkOrThrow();
+    return new TableHandle(result, Manager);
+  }
+
+  public TableHandle PercentileBy(double percentile, bool avgMedian, params string[] columnSpecs) {
+    NativeTableHandle.deephaven_client_TableHandle_PercentileBy(Self,
+      percentile, (InteropBool)avgMedian, columnSpecs, columnSpecs.Length, out var result, out var status);
+    status.OkOrThrow();
+    return new TableHandle(result, Manager);
+  }
+
+  public TableHandle PercentileBy(double percentile, params string[] columnSpecs) {
+    NativeTableHandle.deephaven_client_TableHandle_PercentileBy(Self,
+      percentile, columnSpecs, columnSpecs.Length, out var result, out var status);
+    status.OkOrThrow();
+    return new TableHandle(result, Manager);
+  }
+
+  public TableHandle CountBy(params string[] columnSpecs) {
+    NativeTableHandle.deephaven_client_TableHandle_CountBy(Self,
+      columnSpecs, columnSpecs.Length, out var result, out var status);
+    status.OkOrThrow();
+    return new TableHandle(result, Manager);
+  }
+
+  public TableHandle WAvgBy(params string[] columnSpecs) {
+    NativeTableHandle.deephaven_client_TableHandle_WAvgBy(Self,
+      columnSpecs, columnSpecs.Length, out var result, out var status);
+    status.OkOrThrow();
+    return new TableHandle(result, Manager);
+  }
+
+  public TableHandle TailBy(Int64 n, params string[] columnSpecs) {
+    NativeTableHandle.deephaven_client_TableHandle_TailBy(Self,
+      n, columnSpecs, columnSpecs.Length, out var result, out var status);
+    status.OkOrThrow();
+    return new TableHandle(result, Manager);
+  }
+
+  public TableHandle HeadBy(Int64 n, params string[] columnSpecs) {
+    NativeTableHandle.deephaven_client_TableHandle_HeadBy(Self,
+      n, columnSpecs, columnSpecs.Length, out var result, out var status);
+    status.OkOrThrow();
+    return new TableHandle(result, Manager);
+  }
+
+  public TableHandle WhereIn(TableHandle filterTable, params string[] columnSpecs) {
+    NativeTableHandle.deephaven_client_TableHandle_WhereIn(Self,
+      filterTable.Self, columnSpecs, columnSpecs.Length, out var result, out var status);
+    status.OkOrThrow();
+    return new TableHandle(result, Manager);
+  }
+
+  public void AddTable(TableHandle tableToAdd) {
+    NativeTableHandle.deephaven_client_TableHandle_AddTable(Self, tableToAdd.Self, out var status);
+    status.OkOrThrow();
+  }
+
+  public void RemoveTable(TableHandle tableToRemove) {
+    NativeTableHandle.deephaven_client_TableHandle_RemoveTable(Self, tableToRemove.Self, out var status);
+    status.OkOrThrow();
+  }
+
+  public TableHandle By(AggregateCombo combo, params string[] groupByColumns) {
+    using var comboInternal = combo.Invoke();
+    NativeTableHandle.deephaven_client_TableHandle_By(Self,
+      comboInternal.Self, groupByColumns, groupByColumns.Length, out var result, out var status);
+    status.OkOrThrow();
+    return new TableHandle(result, Manager);
+  }
+
+  public void BindToVariable(string variable) {
+    NativeTableHandle.deephaven_client_TableHandle_BindToVariable(Self, variable, out var status);
+    status.OkOrThrow();
+  }
+
+  private class TickingWrapper {
+    private readonly ITickingCallback _callback;
+    /// <summary>
+    /// The point of these fields is to keep the delegates cached so they stay reachable
+    /// (so long as TickingWrapper is itself reachable) and are not garbage collected while
+    /// native code still holds a pointer to them.
+    /// </summary>
+    public NativeTableHandle.NativeOnUpdate NativeOnUpdate;
+    /// <summary>
+    /// The point of these fields is to keep the delegates cached so they stay reachable
+    /// (so long as TickingWrapper is itself reachable) and are not garbage collected while
+    /// native code still holds a pointer to them.
+    /// </summary>
+    public NativeTableHandle.NativeOnFailure NativeOnFailure;
+
+    public TickingWrapper(ITickingCallback callback) {
+      _callback = callback;
+      NativeOnUpdate = NativeOnUpdateImpl;
+      NativeOnFailure = NativeOnFailureImpl;
+    }
+
+    private void NativeOnUpdateImpl(NativePtr<NativeTickingUpdate> nativeTickingUpdate) {
+      using var tickingUpdate = new TickingUpdate(nativeTickingUpdate);
+      try {
+        _callback.OnTick(tickingUpdate);
+      } catch (Exception ex) {
+        _callback.OnFailure(ex.Message);
+      }
+    }
+
+    private void NativeOnFailureImpl(StringHandle errorHandle, StringPoolHandle stringPoolHandle) {
+      var pool = stringPoolHandle.ExportAndDestroy();
+      var errorText = pool.Get(errorHandle);
+      _callback.OnFailure(errorText);
+    }
+  }
+
+  public SubscriptionHandle Subscribe(ITickingCallback callback) {
+    var tw = new TickingWrapper(callback);
+    NativeTableHandle.deephaven_client_TableHandle_Subscribe(Self, tw.NativeOnUpdate,
+      tw.NativeOnFailure, out var nativeSusbcriptionHandle, out var status);
+    status.OkOrThrow();
+    var result = new SubscriptionHandle(nativeSusbcriptionHandle);
+    Manager.AddSubscription(result, tw);
+    return result;
+  }
+
+  public void Unsubscribe(SubscriptionHandle handle) {
+    Manager.RemoveSubscription(handle);
+    NativeTableHandle.deephaven_client_TableHandle_Unsubscribe(Self, handle.Self, out var status);
+    status.OkOrThrow();
+    handle.Dispose();
+  }
+
+  public ArrowTable ToArrowTable() {
+    NativeTableHandle.deephaven_client_TableHandle_ToArrowTable(Self, out var arrowTable, out var status);
+    status.OkOrThrow();
+    return new ArrowTable(arrowTable);
+  }
+
+  public ClientTable ToClientTable() {
+    NativeTableHandle.deephaven_client_TableHandle_ToClientTable(Self, out var clientTable, out var status);
+    status.OkOrThrow();
+    return new ClientTable(clientTable);
+  }
+
+  public string ToString(bool wantHeaders) {
+    NativeTableHandle.deephaven_client_TableHandle_ToString(Self, (InteropBool)wantHeaders, out var resultHandle,
+      out var stringPoolHandle, out var status);
+    status.OkOrThrow();
+    return stringPoolHandle.ExportAndDestroy().Get(resultHandle);
+  }
+
+  public void Stream(TextWriter textWriter, bool wantHeaders) {
+    var s = ToString(wantHeaders);
+    textWriter.Write(s);
+  }
+
+  private void ReleaseUnmanagedResources() {
+    if (!Self.TryRelease(out var old)) {
+      return;
+    }
+    NativeTableHandle.deephaven_client_TableHandle_dtor(old);
+  }
+}
+
+internal partial class NativeTableHandle {
+  [LibraryImport(LibraryPaths.Dhclient, StringMarshalling = StringMarshalling.Utf8)]
+  internal static partial void deephaven_client_TableHandle_dtor(NativePtr<NativeTableHandle> self);
+
+  [LibraryImport(LibraryPaths.Dhclient, StringMarshalling = StringMarshalling.Utf8)]
+  public static partial void deephaven_client_TableHandle_GetAttributes(
+    NativePtr<NativeTableHandle> self,
+    out Int32 numColumns, out Int64 numRows, out InteropBool isStatic,
+    out ErrorStatus status);
+
+  [LibraryImport(LibraryPaths.Dhclient, StringMarshalling = StringMarshalling.Utf8)]
+  public static partial void deephaven_client_TableHandle_GetSchema(
+    NativePtr<NativeTableHandle> self,
+    Int32 numColumns,
+    StringHandle[] columnHandles,
+    Int32[] columnTypes,
+    out StringPoolHandle stringPoolHandle,
+    out ErrorStatus status);
+
+  [LibraryImport(LibraryPaths.Dhclient, StringMarshalling = StringMarshalling.Utf8)]
+  internal static partial void deephaven_client_TableHandle_Where(
+    NativePtr<NativeTableHandle> self,
+    string condition,
+    out NativePtr<NativeTableHandle> result,
+    out ErrorStatus status);
+
+  [LibraryImport(LibraryPaths.Dhclient, StringMarshalling = StringMarshalling.Utf8)]
+  internal static partial void deephaven_client_TableHandle_Sort(
+    NativePtr<NativeTableHandle> self,
+    string[] columns, InteropBool[] ascendings, InteropBool[] abss, Int32 numSortPairs,
+    out NativePtr<NativeTableHandle> result,
+    out ErrorStatus status);
+
+  [LibraryImport(LibraryPaths.Dhclient, StringMarshalling = StringMarshalling.Utf8)]
+  internal static partial void deephaven_client_TableHandle_Select(
+    NativePtr<NativeTableHandle> self,
+    string[] columns, Int32 numColumns,
+    out NativePtr<NativeTableHandle> result,
+    out ErrorStatus status);
+
+  [LibraryImport(LibraryPaths.Dhclient, StringMarshalling = StringMarshalling.Utf8)]
+  internal static partial void deephaven_client_TableHandle_SelectDistinct(
+    NativePtr<NativeTableHandle> self,
+    string[] columns, Int32 numColumns,
+    out NativePtr<NativeTableHandle> result,
+    out ErrorStatus status);
+
+  [LibraryImport(LibraryPaths.Dhclient, StringMarshalling = StringMarshalling.Utf8)]
+  internal static partial void deephaven_client_TableHandle_View(
+    NativePtr<NativeTableHandle> self,
+    string[] columns, Int32 numColumns,
+    out NativePtr<NativeTableHandle> clientTable,
+    out ErrorStatus status);
+
+  [LibraryImport(LibraryPaths.Dhclient, StringMarshalling = StringMarshalling.Utf8)]
+  internal static partial void deephaven_client_TableHandle_MinBy(
+    NativePtr<NativeTableHandle> self,
+    string[] columns, Int32 numColumns,
+    out NativePtr<NativeTableHandle> result,
+    out ErrorStatus status);
+
+  [LibraryImport(LibraryPaths.Dhclient, StringMarshalling = StringMarshalling.Utf8)]
+  internal static partial void deephaven_client_TableHandle_MaxBy(
+    NativePtr<NativeTableHandle> self,
+    string[] columns, Int32 numColumns,
+    out NativePtr<NativeTableHandle> result,
+    out ErrorStatus status);
+
+  [LibraryImport(LibraryPaths.Dhclient, StringMarshalling = StringMarshalling.Utf8)]
+  internal static partial void deephaven_client_TableHandle_SumBy(
+    NativePtr<NativeTableHandle> self,
+    string[] columns, Int32 numColumns,
+    out NativePtr<NativeTableHandle> result,
+    out ErrorStatus status);
+
+  [LibraryImport(LibraryPaths.Dhclient, StringMarshalling = StringMarshalling.Utf8)]
+  internal static partial void deephaven_client_TableHandle_AbsSumBy(
+    NativePtr<NativeTableHandle> self,
+    string[] columns, Int32 numColumns,
+    out NativePtr<NativeTableHandle> result,
+    out ErrorStatus status);
+
+  [LibraryImport(LibraryPaths.Dhclient, StringMarshalling = StringMarshalling.Utf8)]
+  internal static partial void deephaven_client_TableHandle_VarBy(
+    NativePtr<NativeTableHandle> self,
+    string[] columns, Int32 numColumns,
+    out NativePtr<NativeTableHandle> result,
+    out ErrorStatus status);
+
+  [LibraryImport(LibraryPaths.Dhclient, StringMarshalling = StringMarshalling.Utf8)]
+  internal static partial void deephaven_client_TableHandle_StdBy(
+    NativePtr<NativeTableHandle> self,
+    string[] columns, Int32 numColumns,
+    out NativePtr<NativeTableHandle> result,
+    out ErrorStatus status);
+
+  [LibraryImport(LibraryPaths.Dhclient, StringMarshalling = StringMarshalling.Utf8)]
+  internal static partial void deephaven_client_TableHandle_AvgBy(
+    NativePtr<NativeTableHandle> self,
+    string[] columns, Int32 numColumns,
+    out NativePtr<NativeTableHandle> result,
+    out ErrorStatus status);
+
+  [LibraryImport(LibraryPaths.Dhclient, StringMarshalling = StringMarshalling.Utf8)]
+  internal static partial void deephaven_client_TableHandle_FirstBy(
+    NativePtr<NativeTableHandle> self,
+    string[] columns, Int32 numColumns,
+    out NativePtr<NativeTableHandle> result,
+    out ErrorStatus status);
+
+  [LibraryImport(LibraryPaths.Dhclient, StringMarshalling = StringMarshalling.Utf8)]
+  internal static partial void deephaven_client_TableHandle_LastBy(
+    NativePtr<NativeTableHandle> self,
+    string[] columns, Int32 numColumns,
+    out NativePtr<NativeTableHandle> result,
+    out ErrorStatus status);
+
+  [LibraryImport(LibraryPaths.Dhclient, StringMarshalling = StringMarshalling.Utf8)]
+  internal static partial void deephaven_client_TableHandle_MedianBy(
+    NativePtr<NativeTableHandle> self,
+    string[] columns, Int32 numColumns,
+    out NativePtr<NativeTableHandle> result,
+    out ErrorStatus status);
+
+  [LibraryImport(LibraryPaths.Dhclient, StringMarshalling = StringMarshalling.Utf8)]
+  internal static partial void deephaven_client_TableHandle_PercentileBy(
+    NativePtr<NativeTableHandle> self,
+    double percentile, InteropBool avgMedian,
+    string[] columns, Int32 numColumns,
+    out NativePtr<NativeTableHandle> result,
+    out ErrorStatus status);
+
+  [LibraryImport(LibraryPaths.Dhclient, StringMarshalling = StringMarshalling.Utf8)]
+  internal static partial void deephaven_client_TableHandle_PercentileBy(
+    NativePtr<NativeTableHandle> self,
+    double percentile,
+    string[] columns, Int32 numColumns,
+    out NativePtr<NativeTableHandle> result,
+    out ErrorStatus status);
+
+  [LibraryImport(LibraryPaths.Dhclient, StringMarshalling = StringMarshalling.Utf8)]
+  internal static partial void deephaven_client_TableHandle_CountBy(
+    NativePtr<NativeTableHandle> self,
+    string[] columns, Int32 numColumns,
+    out NativePtr<NativeTableHandle> result,
+    out ErrorStatus status);
+
+  [LibraryImport(LibraryPaths.Dhclient, StringMarshalling = StringMarshalling.Utf8)]
+  internal static partial void deephaven_client_TableHandle_WAvgBy(
+    NativePtr<NativeTableHandle> self,
+    string[] columns, Int32 numColumns,
+    out NativePtr<NativeTableHandle> result,
+    out ErrorStatus status);
+
+  [LibraryImport(LibraryPaths.Dhclient, StringMarshalling = StringMarshalling.Utf8)]
+  internal static partial void deephaven_client_TableHandle_TailBy(
+    NativePtr<NativeTableHandle> self,
+    Int64 n, string[] columns, Int32 numColumns,
+    out NativePtr<NativeTableHandle> result,
+    out ErrorStatus status);
+
+  [LibraryImport(LibraryPaths.Dhclient, StringMarshalling = StringMarshalling.Utf8)]
+  internal static partial void deephaven_client_TableHandle_HeadBy(
+    NativePtr<NativeTableHandle> self,
+    Int64 n, string[] columns, Int32 numColumns,
+    out NativePtr<NativeTableHandle> result,
+    out ErrorStatus status);
+
+  [LibraryImport(LibraryPaths.Dhclient, StringMarshalling = StringMarshalling.Utf8)]
+  internal static partial void deephaven_client_TableHandle_WhereIn(
+    NativePtr<NativeTableHandle> self,
+    NativePtr<NativeTableHandle> filterTable,
+    string[] columns, Int32 numColumns,
+    out NativePtr<NativeTableHandle> result,
+    out ErrorStatus status);
+
+  [LibraryImport(LibraryPaths.Dhclient, StringMarshalling = StringMarshalling.Utf8)]
+  internal static partial void deephaven_client_TableHandle_AddTable(
+    NativePtr<NativeTableHandle> self,
+    NativePtr<NativeTableHandle> tableToAdd,
+    out ErrorStatus status);
+
+  [LibraryImport(LibraryPaths.Dhclient, StringMarshalling = StringMarshalling.Utf8)]
+  internal static partial void deephaven_client_TableHandle_RemoveTable(
+    NativePtr<NativeTableHandle> self,
+    NativePtr<NativeTableHandle> tableToRemove,
+    out ErrorStatus status);
+
+  [LibraryImport(LibraryPaths.Dhclient, StringMarshalling = StringMarshalling.Utf8)]
+  internal static partial void deephaven_client_TableHandle_By(
+    NativePtr<NativeTableHandle> self,
+    NativePtr<NativeAggregateCombo> aggregateCombo,
+    string[] columns, Int32 numColumns,
+    out NativePtr<NativeTableHandle> result,
+    out ErrorStatus status);
+
+  [LibraryImport(LibraryPaths.Dhclient, StringMarshalling = StringMarshalling.Utf8)]
+  internal static partial void deephaven_client_TableHandle_DropColumns(
+    NativePtr<NativeTableHandle> self,
+    string[] columns, Int32 numColumns,
+    out NativePtr<NativeTableHandle> clientTable,
+    out ErrorStatus status);
+
+  [LibraryImport(LibraryPaths.Dhclient, StringMarshalling = StringMarshalling.Utf8)]
+  internal static partial void deephaven_client_TableHandle_Update(
+    NativePtr<NativeTableHandle> self,
+    string[] columns, Int32 numColumns,
+    out NativePtr<NativeTableHandle> result,
+    out ErrorStatus status);
+
+  [LibraryImport(LibraryPaths.Dhclient, StringMarshalling = StringMarshalling.Utf8)]
+  internal static partial void deephaven_client_TableHandle_LazyUpdate(
+    NativePtr<NativeTableHandle> self,
+    string[] columns, Int32 numColumns,
+    out NativePtr<NativeTableHandle> result,
+    out ErrorStatus status);
+
+  [LibraryImport(LibraryPaths.Dhclient, StringMarshalling = StringMarshalling.Utf8)]
+  internal static partial void deephaven_client_TableHandle_BindToVariable(
+    NativePtr<NativeTableHandle> self,
+    string variable,
+    out ErrorStatus status);
+
+  [LibraryImport(LibraryPaths.Dhclient, StringMarshalling = StringMarshalling.Utf8)]
+  internal static partial void deephaven_client_TableHandle_ToString(
+    NativePtr<NativeTableHandle> self,
+    InteropBool wantHeaders,
+    out StringHandle resulHandle,
+    out StringPoolHandle stringPoolHandle,
+    out ErrorStatus status);
+
+  [LibraryImport(LibraryPaths.Dhclient, StringMarshalling = StringMarshalling.Utf8)]
+  internal static partial void deephaven_client_TableHandle_ToArrowTable(
+    NativePtr<NativeTableHandle> self,
+    out NativePtr<NativeArrowTable> arrowTable,
+    out ErrorStatus status);
+
+  [LibraryImport(LibraryPaths.Dhclient, StringMarshalling = StringMarshalling.Utf8)]
+  internal static partial void deephaven_client_TableHandle_ToClientTable(
+    NativePtr<NativeTableHandle> self,
+    out NativePtr<NativeClientTable> clientTable,
+    out ErrorStatus status);
+
+  [LibraryImport(LibraryPaths.Dhclient, StringMarshalling = StringMarshalling.Utf8)]
+  internal static partial void deephaven_client_TableHandle_Head(
+    NativePtr<NativeTableHandle> self,
+    Int64 numRows,
+    out NativePtr<NativeTableHandle> result,
+    out ErrorStatus status);
+
+  [LibraryImport(LibraryPaths.Dhclient, StringMarshalling = StringMarshalling.Utf8)]
+  internal static partial void deephaven_client_TableHandle_Tail(
+    NativePtr<NativeTableHandle> self,
+    Int64 numRows,
+    out NativePtr<NativeTableHandle> result,
+    out ErrorStatus status);
+
+  [LibraryImport(LibraryPaths.Dhclient, StringMarshalling = StringMarshalling.Utf8)]
+  internal static partial void deephaven_client_TableHandle_Ungroup(
+    NativePtr<NativeTableHandle> self,
+    InteropBool nullFill,
+    string[] groupByColumns, Int32 numGroupByColumns,
+    out NativePtr<NativeTableHandle> result,
+    out ErrorStatus status);
+
+  [LibraryImport(LibraryPaths.Dhclient, StringMarshalling = StringMarshalling.Utf8)]
+  internal static partial void deephaven_client_TableHandle_Merge(
+    NativePtr<NativeTableHandle> self,
+    string keyColumn,
+    NativePtr<NativeTableHandle>[] tableHandles, Int32 numTableHandles,
+    out NativePtr<NativeTableHandle> result,
+    out ErrorStatus status);
+
+  [LibraryImport(LibraryPaths.Dhclient, StringMarshalling = StringMarshalling.Utf8)]
+  internal static partial void deephaven_client_TableHandle_CrossJoin(
+    NativePtr<NativeTableHandle> self,
+    NativePtr<NativeTableHandle> rightSide,
+    string[] columnsToMatch, Int32 numColumnsToMatch,
+    string[] columnsToAdd, Int32 numColumnsToAdd,
+    out NativePtr<NativeTableHandle> result,
+    out ErrorStatus status);
+
+  [LibraryImport(LibraryPaths.Dhclient, StringMarshalling = StringMarshalling.Utf8)]
+  internal static partial void deephaven_client_TableHandle_NaturalJoin(
+    NativePtr<NativeTableHandle> self,
+    NativePtr<NativeTableHandle> rightSide,
+    string[] columnsToMatch, Int32 numColumnsToMatch,
+    string[] columnsToAdd, Int32 numColumnsToAdd,
+    out NativePtr<NativeTableHandle> result,
+    out ErrorStatus status);
+
+  [LibraryImport(LibraryPaths.Dhclient, StringMarshalling = StringMarshalling.Utf8)]
+  internal static partial void deephaven_client_TableHandle_LeftOuterJoin(
+    NativePtr<NativeTableHandle> self,
+    NativePtr<NativeTableHandle> rightSide,
+    string[] columnsToMatch, Int32 numColumnsToMatch,
+    string[] columnsToAdd, Int32 numColumnsToAdd,
+    out NativePtr<NativeTableHandle> result,
+    out ErrorStatus status);
+
+  [LibraryImport(LibraryPaths.Dhclient, StringMarshalling = StringMarshalling.Utf8)]
+  internal static partial void deephaven_client_TableHandle_ExactJoin(
+    NativePtr<NativeTableHandle> self,
+    NativePtr<NativeTableHandle> rightSide,
+    string[] columnsToMatch, Int32 numColumnsToMatch,
+    string[] columnsToAdd, Int32 numColumnsToAdd,
+    out NativePtr<NativeTableHandle> result,
+    out ErrorStatus status);
+
+  [LibraryImport(LibraryPaths.Dhclient, StringMarshalling = StringMarshalling.Utf8)]
+  internal static partial void deephaven_client_TableHandle_UpdateBy(
+    NativePtr<NativeTableHandle> self,
+    NativePtr<NativeUpdateByOperation>[] ops, Int32 numOps,
+    string[] by, Int32 numBy,
+    out NativePtr<NativeTableHandle> result,
+    out ErrorStatus status);
+
+  [LibraryImport(LibraryPaths.Dhclient, StringMarshalling = StringMarshalling.Utf8)]
+  internal static partial void deephaven_client_TableHandle_Aj(
+    NativePtr<NativeTableHandle> self,
+    NativePtr<NativeTableHandle> rightSide,
+    string[] columnsToMatch, Int32 numColumnsToMatch,
+    string[] columnsToAdd, Int32 numColumnsToAdd,
+    out NativePtr<NativeTableHandle> result,
+    out ErrorStatus status);
+
+  [LibraryImport(LibraryPaths.Dhclient, StringMarshalling = StringMarshalling.Utf8)]
+  internal static partial void deephaven_client_TableHandle_Raj(
+    NativePtr<NativeTableHandle> self,
+    NativePtr<NativeTableHandle> rightSide,
+    string[] columnsToMatch, Int32 numColumnsToMatch,
+    string[] columnsToAdd, Int32 numColumnsToAdd,
+    out NativePtr<NativeTableHandle> result,
+    out ErrorStatus status);
+
+  [UnmanagedFunctionPointer(CallingConvention.Cdecl, CharSet = CharSet.Unicode)]
+  public delegate void NativeOnUpdate(NativePtr<NativeTickingUpdate> tickingUpdate);
+
+  [UnmanagedFunctionPointer(CallingConvention.Cdecl, CharSet = CharSet.Unicode)]
+  public delegate void NativeOnFailure(StringHandle errorHandle, StringPoolHandle stringPoolHandle);
+
+  [LibraryImport(LibraryPaths.Dhclient, StringMarshalling = StringMarshalling.Utf8)]
+  internal static partial void deephaven_client_TableHandle_Subscribe(
+    NativePtr<NativeTableHandle> self,
+    NativeOnUpdate nativeOnUpdate, NativeOnFailure nativeOnFailure,
+    out NativePtr<NativeSubscriptionHandle> nativeSubscriptionHandle,
+    out ErrorStatus status);
+
+  [LibraryImport(LibraryPaths.Dhclient, StringMarshalling = StringMarshalling.Utf8)]
+  internal static partial void deephaven_client_TableHandle_Unsubscribe(
+    NativePtr<NativeTableHandle> self,
+    NativePtr<NativeSubscriptionHandle> nativeSubscriptionHandle,
+    out ErrorStatus status);
+}
diff --git a/csharp/client/DeephavenClient/TableHandleManager.cs b/csharp/client/DeephavenClient/TableHandleManager.cs
new file mode 100644
index 00000000000..01dc64660b0
--- /dev/null
+++ b/csharp/client/DeephavenClient/TableHandleManager.cs
@@ -0,0 +1,107 @@
+using Deephaven.DeephavenClient.Interop;
+using System.Runtime.InteropServices;
+
+namespace Deephaven.DeephavenClient;
+
+public class TableHandleManager : IDisposable {
+  internal NativePtr<NativeTableHandleManager> Self;
+  private readonly Dictionary<SubscriptionHandle, object> _subscriptions;
+
+  internal TableHandleManager(NativePtr<NativeTableHandleManager> self) {
+    Self = self;
+    _subscriptions = new Dictionary<SubscriptionHandle, object>();
+  }
+
+  ~TableHandleManager() {
+    ReleaseUnmanagedResources(true);
+  }
+
+  public void Dispose() {
+    ReleaseUnmanagedResources(true);
+    GC.SuppressFinalize(this);
+  }
+
+  protected virtual void ReleaseUnmanagedResources(bool destructSelf) {
+    if (!Self.TryRelease(out var old)) {
+      return;
+    }
+    if (!destructSelf) {
+      return;
+    }
+    NativeTableHandleManager.deephaven_client_TableHandleManager_dtor(old);
+  }
+
+  public TableHandle EmptyTable(Int64 size) {
+    NativeTableHandleManager.deephaven_client_TableHandleManager_EmptyTable(Self, size,
+      out var result, out var status);
+    status.OkOrThrow();
+    return new TableHandle(result, this);
+  }
+
+  public TableHandle FetchTable(string tableName) {
+    NativeTableHandleManager.deephaven_client_TableHandleManager_FetchTable(Self, tableName,
+      out var result, out var status);
+    status.OkOrThrow();
+    return new TableHandle(result, this);
+  }
+
+  public TableHandle TimeTable(DurationSpecifier period, TimePointSpecifier? startTime = null,
+    bool blinkTable = false) {
+    startTime ??= 0;
+    using var per = period.Materialize();
+    using var st = startTime.Materialize();
+    NativeTableHandleManager.deephaven_client_TableHandleManager_TimeTable(Self, per.Self, st.Self,
+      (InteropBool)blinkTable, out var result, out var status);
+    status.OkOrThrow();
+    return new TableHandle(result, this);
+  }
+
+  public TableHandle InputTable(TableHandle initialTable, params string[] keyColumns) {
+    NativeTableHandleManager.deephaven_client_TableHandleManager_InputTable(Self, initialTable.Self,
+      keyColumns, keyColumns.Length, out var result, out var status);
+    status.OkOrThrow();
+    return new TableHandle(result, initialTable.Manager);
+  }
+
+  public void RunScript(string script) {
+    NativeTableHandleManager.deephaven_client_TableHandleManager_RunScript(Self, script,
+      out var status);
+    status.OkOrThrow();
+  }
+
+  internal void AddSubscription(SubscriptionHandle handle, object keepalive) {
+    _subscriptions.Add(handle, keepalive);
+  }
+
+  internal void RemoveSubscription(SubscriptionHandle handle) {
+    _subscriptions.Remove(handle);
+  }
+}
+
+internal partial class NativeTableHandleManager {
+  [LibraryImport(LibraryPaths.Dhclient, StringMarshalling = StringMarshalling.Utf8)]
+  public static partial void deephaven_client_TableHandleManager_dtor(NativePtr<NativeTableHandleManager> self);
+
+  [LibraryImport(LibraryPaths.Dhclient, StringMarshalling = StringMarshalling.Utf8)]
+  public static partial void deephaven_client_TableHandleManager_EmptyTable(NativePtr<NativeTableHandleManager> self,
+    Int64 size, out NativePtr<NativeTableHandle> result, out ErrorStatus status);
+
+  [LibraryImport(LibraryPaths.Dhclient, StringMarshalling = StringMarshalling.Utf8)]
+  public static partial void deephaven_client_TableHandleManager_FetchTable(NativePtr<NativeTableHandleManager> self,
+    string tableName, out NativePtr<NativeTableHandle> result, out ErrorStatus status);
+
+  [LibraryImport(LibraryPaths.Dhclient, StringMarshalling = StringMarshalling.Utf8)]
+  public static partial void deephaven_client_TableHandleManager_TimeTable(NativePtr<NativeTableHandleManager> self,
+    NativePtr<NativeDurationSpecifier> period, NativePtr<NativeTimePointSpecifier> startTime,
+    InteropBool blinkTable, out NativePtr<NativeTableHandle> result, out ErrorStatus status);
+
+  [LibraryImport(LibraryPaths.Dhclient, StringMarshalling = StringMarshalling.Utf8)]
+  public static partial void deephaven_client_TableHandleManager_InputTable(NativePtr<NativeTableHandleManager> self,
+    NativePtr<NativeTableHandle> initialTable, 
+    string[]keyColumns, Int32 numKeyColumns,
+    out NativePtr<NativeTableHandle> result, out ErrorStatus status);
+
+  [LibraryImport(LibraryPaths.Dhclient, StringMarshalling = StringMarshalling.Utf8)]
+  public static partial void deephaven_client_TableHandleManager_RunScript(NativePtr<NativeTableHandleManager> self,
+    string code, out ErrorStatus errorStatus);
+}
diff --git a/csharp/client/DeephavenClient/Ticking.cs b/csharp/client/DeephavenClient/Ticking.cs
new file mode 100644
index 00000000000..64680f2374b
--- /dev/null
+++ b/csharp/client/DeephavenClient/Ticking.cs
@@ -0,0 +1,89 @@
+using Deephaven.DeephavenClient.Interop;
+using System;
+using System.Collections.Generic;
+using System.Runtime.InteropServices;
+
+namespace Deephaven.DeephavenClient;
+
+public class SubscriptionHandle : IDisposable {
+  internal NativePtr<NativeSubscriptionHandle> Self;
+
+  internal SubscriptionHandle(NativePtr<NativeSubscriptionHandle> self) {
+    Self = self;
+  }
+
+  ~SubscriptionHandle() {
+    ReleaseUnmanagedResources();
+  }
+
+  public void Dispose() {
+    ReleaseUnmanagedResources();
+    GC.SuppressFinalize(this);
+  }
+
+  private void ReleaseUnmanagedResources() {
+    if (!Self.TryRelease(out var old)) {
+      return;
+    }
+    NativeSubscriptionHandle.deephaven_client_SubscriptionHandle_dtor(old);
+  }
+}
+
+public class TickingUpdate : IDisposable {
+  internal NativePtr<NativeTickingUpdate> Self;
+
+  internal TickingUpdate(NativePtr<NativeTickingUpdate> self) => this.Self = self;
+
+  public ClientTable Current {
+    get {
+      NativeTickingUpdate.deephaven_client_TickingUpdate_Current(Self,
+        out var ct, out var status);
+      status.OkOrThrow();
+      return new ClientTable(ct);
+    }
+  }
+  // public ClientTable BeforeRemoves { get;  }
+  // public RowSequence RemovedRows { get;  }
+
+  ~TickingUpdate() {
+    ReleaseUnmanagedResources();
+  }
+
+  public void Dispose() {
+    ReleaseUnmanagedResources();
+    GC.SuppressFinalize(this);
+  }
+
+  public void ReleaseUnmanagedResources() {
+    if (!Self.TryRelease(out var old)) {
+      return;
+    }
+    NativeTickingUpdate.deephaven_client_TickingUpdate_dtor(old);
+  }
+}
+
+public interface ITickingCallback {
+  /**
+   * Invoked on each update to the subscription.
+   */
+  void OnTick(TickingUpdate update);
+
+  /**
+   * Invoked if there is an error involving the subscription.
+   */
+  void OnFailure(string errorText);
+}
+
+internal partial class NativeSubscriptionHandle {
+  [LibraryImport(LibraryPaths.Dhclient, StringMarshalling = StringMarshalling.Utf8)]
+  public static partial void deephaven_client_SubscriptionHandle_dtor(NativePtr<NativeSubscriptionHandle> self);
+}
+
+internal partial class NativeTickingUpdate {
+  [LibraryImport(LibraryPaths.Dhclient, StringMarshalling = StringMarshalling.Utf8)]
+  public static partial void deephaven_client_TickingUpdate_dtor(NativePtr<NativeTickingUpdate> self);
+
+  [LibraryImport(LibraryPaths.Dhclient, StringMarshalling = StringMarshalling.Utf8)]
+  public static partial void deephaven_client_TickingUpdate_Current(NativePtr<NativeTickingUpdate> self,
+    out NativePtr<NativeClientTable> result, out ErrorStatus status);
+}
diff --git a/csharp/client/DeephavenClient/TimePointSpecifier.cs b/csharp/client/DeephavenClient/TimePointSpecifier.cs
new file mode 100644
index 00000000000..db703cb811c
--- /dev/null
+++ b/csharp/client/DeephavenClient/TimePointSpecifier.cs
@@ -0,0 +1,63 @@
+using Deephaven.DeephavenClient.Interop;
+using System.Runtime.InteropServices;
+
+namespace Deephaven.DeephavenClient;
+
+public class TimePointSpecifier {
+  private readonly object _timePoint;
+
+  public TimePointSpecifier(Int64 nanos) => _timePoint = nanos;
+  public TimePointSpecifier(string timePoint) => _timePoint = timePoint;
+
+  public static implicit operator TimePointSpecifier(Int64 nanos) => new(nanos);
+  public static implicit operator TimePointSpecifier(string timePoint) => new(timePoint);
+
+  internal InternalTimePointSpecifier Materialize() => new (_timePoint);
+}
+
+internal class InternalTimePointSpecifier : IDisposable {
+  internal NativePtr<NativeTimePointSpecifier> Self;
+
+  public InternalTimePointSpecifier(object duration) {
+    NativePtr<NativeTimePointSpecifier> result;
+    ErrorStatus status;
+    if (duration is Int64 nanos) {
+      NativeTimePointSpecifier.deephaven_client_utility_TimePointSpecifier_ctor_nanos(nanos,
+        out result, out status);
+    } else if (duration is string dur) {
+      NativeTimePointSpecifier.deephaven_client_utility_TimePointSpecifier_ctor_timepointstr(dur,
+        out result, out status);
+    } else {
+      throw new ArgumentException($"Unexpected type {duration.GetType().Name} for duration");
+    }
+    status.OkOrThrow();
+    Self = result;
+  }
+
+  ~InternalTimePointSpecifier() {
+    ReleaseUnmanagedResources();
+  }
+
+  public void Dispose() {
+    ReleaseUnmanagedResources();
+    GC.SuppressFinalize(this);
+  }
+
+  private void ReleaseUnmanagedResources() {
+    if (!Self.TryRelease(out var old)) {
+      return;
+    }
+    NativeTimePointSpecifier.deephaven_client_utility_TimePointSpecifier_dtor(old);
+  }
+}
+
+internal partial class NativeTimePointSpecifier {
+  [LibraryImport(LibraryPaths.Dhclient, StringMarshalling = StringMarshalling.Utf8)]
+  public static partial void deephaven_client_utility_TimePointSpecifier_ctor_nanos(Int64 nanos,
+    out NativePtr<NativeTimePointSpecifier> result, out ErrorStatus status);
+  [LibraryImport(LibraryPaths.Dhclient, StringMarshalling = StringMarshalling.Utf8)]
+  public static partial void deephaven_client_utility_TimePointSpecifier_ctor_timepointstr(
+    string timePointStr, out NativePtr<NativeTimePointSpecifier> result, out ErrorStatus status);
+  [LibraryImport(LibraryPaths.Dhclient, StringMarshalling = StringMarshalling.Utf8)]
+  public static partial void deephaven_client_utility_TimePointSpecifier_dtor(NativePtr<NativeTimePointSpecifier> self);
+}
diff --git a/csharp/client/DeephavenClient/UpdateBy.cs b/csharp/client/DeephavenClient/UpdateBy.cs
new file mode 100644
index 00000000000..ac60590764c
--- /dev/null
+++ b/csharp/client/DeephavenClient/UpdateBy.cs
@@ -0,0 +1,519 @@
+using System;
+using System.Runtime.InteropServices;
+using Deephaven.DeephavenClient.Interop;
+
+namespace Deephaven.DeephavenClient.UpdateBy;
+
+public enum MathContext : Int32 {
+  Unlimited, Decimal32, Decimal64, Decimal128
+};
+
+public enum BadDataBehavior : Int32 {
+  Reset, Skip, Throw, Poison
+};
+
+public enum DeltaControl : Int32 {
+  NullDominates, ValueDominates, ZeroDominates
+};
+
+public readonly struct OperationControl {
+  public readonly BadDataBehavior OnNull;
+  public readonly BadDataBehavior OnNaN;
+  public readonly MathContext BigValueContext;
+
+  public OperationControl(BadDataBehavior onNull = BadDataBehavior.Skip,
+    BadDataBehavior onNaN = BadDataBehavior.Skip,
+    MathContext bigValueContext = MathContext.Decimal128) {
+    OnNull = onNull;
+    OnNaN = onNaN;
+    BigValueContext = bigValueContext;
+  }
+}
+
+public abstract class UpdateByOperation {
+  internal abstract InternalUpdateByOperation MakeInternal();
+
+  private sealed class WithCols : UpdateByOperation {
+    public delegate void NativeInvoker(string[] cols, Int32 numCols,
+      out NativePtr<NativeUpdateByOperation> result, out ErrorStatus status);
+
+    private readonly string[] _cols;
+    private readonly NativeInvoker _invoker;
+
+    public WithCols(string[] cols, NativeInvoker invoker) {
+      _cols = cols;
+      _invoker = invoker;
+    }
+
+    internal override InternalUpdateByOperation MakeInternal() {
+      _invoker(_cols, _cols.Length, out var result, out var status);
+      status.OkOrThrow();
+      return new InternalUpdateByOperation(result);
+    }
+  }
+
+  private sealed class WithDelta : UpdateByOperation {
+    public delegate void NativeInvoker(string[] cols, Int32 numCols, DeltaControl deltaControl,
+      out NativePtr<NativeUpdateByOperation> result, out ErrorStatus status);
+
+    private readonly string[] _cols;
+    private readonly DeltaControl _deltaControl;
+    private readonly NativeInvoker _invoker;
+
+    public WithDelta(string[] cols, DeltaControl deltaControl, NativeInvoker invoker) {
+      _cols = cols;
+      _deltaControl = deltaControl;
+      _invoker = invoker;
+    }
+
+    internal override InternalUpdateByOperation MakeInternal() {
+      _invoker(_cols, _cols.Length, _deltaControl, out var result, out var status);
+      status.OkOrThrow();
+      return new InternalUpdateByOperation(result);
+    }
+  }
+
+  private sealed class WithTicks : UpdateByOperation {
+    public delegate void NativeInvoker(double decayTicks, string[] cols, Int32 numCols,
+      ref OperationControl operationControl,
+      out NativePtr<NativeUpdateByOperation> result, out ErrorStatus status);
+
+    private readonly double _decayTicks;
+    private readonly string[] _cols;
+    private OperationControl _operationControl;
+    private readonly NativeInvoker _invoker;
+
+    public WithTicks(double decayTicks, string[] cols, OperationControl? operationControl,
+      NativeInvoker invoker) {
+      _decayTicks = decayTicks;
+      _cols = cols;
+      _operationControl = operationControl ?? new OperationControl();
+      _invoker = invoker;
+    }
+
+    internal override InternalUpdateByOperation MakeInternal() {
+      _invoker(_decayTicks, _cols, _cols.Length, ref _operationControl, out var result, out var status);
+      status.OkOrThrow();
+      return new InternalUpdateByOperation(result);
+    }
+  }
+
+  private sealed class WithTime : UpdateByOperation {
+    public delegate void NativeInvoker(string timestampCol, 
+      NativePtr<NativeDurationSpecifier> decayTime, string[] cols, Int32 numCols,
+      ref OperationControl operationControl,
+      out NativePtr<NativeUpdateByOperation> result, out ErrorStatus status);
+
+    private readonly string _timestampCol;
+    private readonly DurationSpecifier _decayTime;
+    private readonly string[] _cols;
+    private OperationControl _operationControl;
+    private readonly NativeInvoker _invoker;
+
+    public WithTime(string timestampCol, DurationSpecifier decayTime, string[] cols, OperationControl? operationControl,
+      NativeInvoker invoker) {
+      _timestampCol = timestampCol;
+      _decayTime = decayTime;
+      _cols = cols;
+      _operationControl = operationControl ?? new OperationControl();
+      _invoker = invoker;
+    }
+
+    internal override InternalUpdateByOperation MakeInternal() {
+      using var dc = _decayTime.Materialize();
+      _invoker(_timestampCol, dc.Self, _cols, _cols.Length, ref _operationControl, out var result, out var status);
+      status.OkOrThrow();
+      return new InternalUpdateByOperation(result);
+    }
+  }
+
+  private sealed class WithRollingTicks : UpdateByOperation {
+    public delegate void NativeInvoker(string[] cols, Int32 numCols, Int32 revTicks, Int32 fwdTicks,
+      out NativePtr<NativeUpdateByOperation> result, out ErrorStatus status);
+
+    private readonly string[] _cols;
+    private readonly Int32 _revTicks;
+    private readonly Int32 _fwdTicks;
+    private readonly NativeInvoker _invoker;
+
+    public WithRollingTicks(string[] cols, Int32 revTicks, Int32 fwdTicks, NativeInvoker invoker) {
+      _cols = cols;
+      _revTicks = revTicks;
+      _fwdTicks = fwdTicks;
+      _invoker = invoker;
+    }
+
+    internal override InternalUpdateByOperation MakeInternal() {
+      _invoker(_cols, _cols.Length, _revTicks, _fwdTicks, out var result, out var status);
+      status.OkOrThrow();
+      return new InternalUpdateByOperation(result);
+    }
+  }
+
+  private sealed class WithRollingTime : UpdateByOperation {
+    public delegate void NativeInvoker(string timestampCol, string[] cols, Int32 numCols,
+      NativePtr<NativeDurationSpecifier> revTime,
+      NativePtr<NativeDurationSpecifier> fwdTime,
+      out NativePtr<NativeUpdateByOperation> result, out ErrorStatus status);
+
+    private readonly string _timestampCol;
+    private readonly string[] _cols;
+    private readonly DurationSpecifier _revTime;
+    private readonly DurationSpecifier _fwdTime;
+    private readonly NativeInvoker _invoker;
+
+    public WithRollingTime(string timestampCol, string[] cols,
+      DurationSpecifier revTime, DurationSpecifier? fwdTime, NativeInvoker invoker) {
+      _timestampCol = timestampCol;
+      _cols = cols;
+      _revTime = revTime;
+      _fwdTime = fwdTime ?? new DurationSpecifier(0);
+      _invoker = invoker;
+    }
+
+    internal override InternalUpdateByOperation MakeInternal() {
+      using var revNative = _revTime.Materialize();
+      using var fwdNative = _fwdTime.Materialize();
+      _invoker(_timestampCol, _cols, _cols.Length, revNative.Self, fwdNative.Self,
+        out var result, out var status);
+      status.OkOrThrow();
+      return new InternalUpdateByOperation(result);
+    }
+  }
+
+  private sealed class WithRollingWavgTicks : UpdateByOperation {
+    public delegate void NativeInvoker(string weightCol, string[] cols, Int32 numCols, Int32 revTicks, Int32 fwdTicks,
+      out NativePtr<NativeUpdateByOperation> result, out ErrorStatus status);
+
+    private readonly string _weightCol;
+    private readonly string[] _cols;
+    private readonly Int32 _revTicks;
+    private readonly Int32 _fwdTicks;
+    private readonly NativeInvoker _invoker;
+
+    public WithRollingWavgTicks(string weightCol, string[] cols, Int32 revTicks, Int32 fwdTicks, NativeInvoker invoker) {
+      _weightCol = weightCol;
+      _cols = cols;
+      _revTicks = revTicks;
+      _fwdTicks = fwdTicks;
+      _invoker = invoker;
+    }
+
+    internal override InternalUpdateByOperation MakeInternal() {
+      _invoker(_weightCol, _cols, _cols.Length, _revTicks, _fwdTicks, out var result, out var status);
+      status.OkOrThrow();
+      return new InternalUpdateByOperation(result);
+    }
+  }
+
+  private sealed class WithRollingWavgTime : UpdateByOperation {
+    public delegate void NativeInvoker(string timestampCol, string weightCol, string[] cols, Int32 numCols,
+      NativePtr<NativeDurationSpecifier> revTime,
+      NativePtr<NativeDurationSpecifier> fwdTime,
+      out NativePtr<NativeUpdateByOperation> result, out ErrorStatus status);
+
+    private readonly string _timestampCol;
+    private readonly string _weightCol;
+    private readonly string[] _cols;
+    private readonly DurationSpecifier _revTime;
+    private readonly DurationSpecifier _fwdTime;
+    private readonly NativeInvoker _invoker;
+
+    public WithRollingWavgTime(string timestampCol, string weightCol, string[] cols,
+      DurationSpecifier revTime, DurationSpecifier? fwdTime, NativeInvoker invoker) {
+      _timestampCol = timestampCol;
+      _weightCol = weightCol;
+      _cols = cols;
+      _revTime = revTime;
+      _fwdTime = fwdTime ?? new DurationSpecifier(0);
+      _invoker = invoker;
+    }
+
+    internal override InternalUpdateByOperation MakeInternal() {
+      using var revNative = _revTime.Materialize();
+      using var fwdNative = _fwdTime.Materialize();
+      _invoker(_timestampCol, _weightCol, _cols, _cols.Length, revNative.Self,
+        fwdNative.Self, out var result, out var status);
+      status.OkOrThrow();
+      return new InternalUpdateByOperation(result);
+    }
+  }
+
+  public static UpdateByOperation CumSum(string[] cols) =>
+    new WithCols(cols, NativeUpdateByOperation.deephaven_client_update_by_cumSum);
+  public static UpdateByOperation CumProd(string[] cols) =>
+    new WithCols(cols, NativeUpdateByOperation.deephaven_client_update_by_cumProd);
+  public static UpdateByOperation CumMin(string[] cols) =>
+    new WithCols(cols, NativeUpdateByOperation.deephaven_client_update_by_cumMin);
+  public static UpdateByOperation CumMax(string[] cols) =>
+    new WithCols(cols, NativeUpdateByOperation.deephaven_client_update_by_cumMin);
+  public static UpdateByOperation ForwardFill(string[] cols) =>
+    new WithCols(cols, NativeUpdateByOperation.deephaven_client_update_by_forwardFill);
+
+  public static UpdateByOperation Delta(string[] cols, DeltaControl deltaControl = DeltaControl.NullDominates) =>
+    new WithDelta(cols, deltaControl,
+      NativeUpdateByOperation.deephaven_client_update_by_delta);
+
+  public static UpdateByOperation EmaTick(double decayTicks, string[] cols, OperationControl? opControl = null) =>
+    new WithTicks(decayTicks, cols, opControl,
+      NativeUpdateByOperation.deephaven_client_update_by_emaTick);
+  public static UpdateByOperation EmaTime(string timestampCol, DurationSpecifier decayTime, string[] cols, OperationControl? opControl = null) =>
+    new WithTime(timestampCol, decayTime, cols, opControl,
+      NativeUpdateByOperation.deephaven_client_update_by_emaTime);
+  public static UpdateByOperation EmsTick(double decayTicks, string[] cols, OperationControl? opControl = null) =>
+    new WithTicks(decayTicks, cols, opControl,
+      NativeUpdateByOperation.deephaven_client_update_by_emsTick);
+  public static UpdateByOperation EmsTime(string timestampCol, DurationSpecifier decayTime, string[] cols, OperationControl? opControl = null) =>
+    new WithTime(timestampCol, decayTime, cols, opControl,
+      NativeUpdateByOperation.deephaven_client_update_by_emsTime);
+  public static UpdateByOperation EmminTick(double decayTicks, string[] cols, OperationControl? opControl = null) =>
+    new WithTicks(decayTicks, cols, opControl,
+      NativeUpdateByOperation.deephaven_client_update_by_emminTick);
+  public static UpdateByOperation EmminTime(string timestampCol, DurationSpecifier decayTime, string[] cols, OperationControl? opControl = null) =>
+    new WithTime(timestampCol, decayTime, cols, opControl,
+      NativeUpdateByOperation.deephaven_client_update_by_emminTime);
+  public static UpdateByOperation EmmaxTick(double decayTicks, string[] cols, OperationControl? opControl = null) =>
+    new WithTicks(decayTicks, cols, opControl,
+      NativeUpdateByOperation.deephaven_client_update_by_emmaxTick);
+  public static UpdateByOperation EmmaxTime(string timestampCol, DurationSpecifier decayTime, string[] cols, OperationControl? opControl = null) =>
+    new WithTime(timestampCol, decayTime, cols, opControl,
+      NativeUpdateByOperation.deephaven_client_update_by_emmaxTime);
+  public static UpdateByOperation EmstdTick(double decayTicks, string[] cols, OperationControl? opControl = null) =>
+    new WithTicks(decayTicks, cols, opControl,
+      NativeUpdateByOperation.deephaven_client_update_by_emstdTick);
+  public static UpdateByOperation EmstdTime(string timestampCol, DurationSpecifier decayTime, string[] cols, OperationControl? opControl = null) =>
+    new WithTime(timestampCol, decayTime, cols, opControl,
+      NativeUpdateByOperation.deephaven_client_update_by_emstdTime);
+
+  public static UpdateByOperation RollingSumTick(string[] cols, Int32 revTicks, Int32 fwdTicks = 0) =>
+    new WithRollingTicks(cols, revTicks, fwdTicks,
+      NativeUpdateByOperation.deephaven_client_update_by_rollingSumTick);
+  public static UpdateByOperation RollingSumTime(string timestampCol, string[] cols,
+    DurationSpecifier revTime, DurationSpecifier? fwdTime = null) =>
+    new WithRollingTime(timestampCol, cols, revTime, fwdTime,
+      NativeUpdateByOperation.deephaven_client_update_by_rollingSumTime);
+  public static UpdateByOperation RollingGroupTick(string[] cols, Int32 revTicks, Int32 fwdTicks = 0) =>
+    new WithRollingTicks(cols, revTicks, fwdTicks,
+      NativeUpdateByOperation.deephaven_client_update_by_rollingGroupTick);
+  public static UpdateByOperation RollingGroupTime(string timestampCol, string[] cols,
+    DurationSpecifier revTime, DurationSpecifier? fwdTime = null) =>
+    new WithRollingTime(timestampCol, cols, revTime, fwdTime,
+      NativeUpdateByOperation.deephaven_client_update_by_rollingGroupTime);
+  public static UpdateByOperation RollingAvgTick(string[] cols, Int32 revTicks, Int32 fwdTicks = 0) =>
+    new WithRollingTicks(cols, revTicks, fwdTicks,
+      NativeUpdateByOperation.deephaven_client_update_by_rollingAvgTick);
+  public static UpdateByOperation RollingAvgTime(string timestampCol, string[] cols,
+    DurationSpecifier revTime, DurationSpecifier? fwdTime = null) =>
+    new WithRollingTime(timestampCol, cols, revTime, fwdTime,
+      NativeUpdateByOperation.deephaven_client_update_by_rollingAvgTime);
+  public static UpdateByOperation RollingMinTick(string[] cols, Int32 revTicks, Int32 fwdTicks = 0) =>
+    new WithRollingTicks(cols, revTicks, fwdTicks,
+      NativeUpdateByOperation.deephaven_client_update_by_rollingMinTick);
+  public static UpdateByOperation RollingMinTime(string timestampCol, string[] cols,
+    DurationSpecifier revTime, DurationSpecifier? fwdTime = null) =>
+    new WithRollingTime(timestampCol, cols, revTime, fwdTime,
+      NativeUpdateByOperation.deephaven_client_update_by_rollingMinTime);
+  public static UpdateByOperation RollingMaxTick(string[] cols, Int32 revTicks, Int32 fwdTicks = 0) =>
+    new WithRollingTicks(cols, revTicks, fwdTicks,
+      NativeUpdateByOperation.deephaven_client_update_by_rollingMaxTick);
+  public static UpdateByOperation RollingMaxTime(string timestampCol, string[] cols,
+    DurationSpecifier revTime, DurationSpecifier? fwdTime = null) =>
+    new WithRollingTime(timestampCol, cols, revTime, fwdTime,
+      NativeUpdateByOperation.deephaven_client_update_by_rollingMaxTime);
+  public static UpdateByOperation RollingProdTick(string[] cols, Int32 revTicks, Int32 fwdTicks = 0) =>
+    new WithRollingTicks(cols, revTicks, fwdTicks,
+      NativeUpdateByOperation.deephaven_client_update_by_rollingProdTick);
+  public static UpdateByOperation RollingProdTime(string timestampCol, string[] cols,
+    DurationSpecifier revTime, DurationSpecifier? fwdTime = null) =>
+    new WithRollingTime(timestampCol, cols, revTime, fwdTime,
+      NativeUpdateByOperation.deephaven_client_update_by_rollingProdTime);
+  public static UpdateByOperation RollingCountTick(string[] cols, Int32 revTicks, Int32 fwdTicks = 0) =>
+    new WithRollingTicks(cols, revTicks, fwdTicks,
+      NativeUpdateByOperation.deephaven_client_update_by_rollingCountTick);
+  public static UpdateByOperation RollingCountTime(string timestampCol, string[] cols,
+    DurationSpecifier revTime, DurationSpecifier? fwdTime = null) =>
+    new WithRollingTime(timestampCol, cols, revTime, fwdTime,
+      NativeUpdateByOperation.deephaven_client_update_by_rollingCountTime);
+  public static UpdateByOperation RollingStdTick(string[] cols, Int32 revTicks, Int32 fwdTicks = 0) =>
+    new WithRollingTicks(cols, revTicks, fwdTicks,
+      NativeUpdateByOperation.deephaven_client_update_by_rollingStdTick);
+  public static UpdateByOperation RollingStdTime(string timestampCol, string[] cols,
+    DurationSpecifier revTime, DurationSpecifier? fwdTime = null) =>
+    new WithRollingTime(timestampCol, cols, revTime, fwdTime,
+      NativeUpdateByOperation.deephaven_client_update_by_rollingStdTime);
+
+  public static UpdateByOperation RollingWavgTick(string weightCol, string[] cols,
+    Int32 revTicks, Int32 fwdTicks = 0) =>
+      new WithRollingWavgTicks(weightCol, cols, revTicks, fwdTicks,
+      NativeUpdateByOperation.deephaven_client_update_by_rollingWavgTick);
+  public static UpdateByOperation RollingWavgTime(string timestampCol, string weightCol, string[] cols,
+    DurationSpecifier revTime, DurationSpecifier? fwdTime = null) =>
+    new WithRollingWavgTime(timestampCol, weightCol, cols, revTime, fwdTime,
+      NativeUpdateByOperation.deephaven_client_update_by_rollingWavgTime);
+}
+
+internal class InternalUpdateByOperation : IDisposable {
+  internal NativePtr<NativeUpdateByOperation> Self;
+
+  internal InternalUpdateByOperation(NativePtr<NativeUpdateByOperation> self) => Self = self;
+
+  ~InternalUpdateByOperation() {
+    ReleaseUnmanagedResources();
+  }
+
+  public void Dispose() {
+    ReleaseUnmanagedResources();
+    GC.SuppressFinalize(this);
+  }
+
+  private void ReleaseUnmanagedResources() {
+    if (!Self.TryRelease(out var old)) {
+      return;
+    }
+    NativeUpdateByOperation.deephaven_client_UpdateByOperation_dtor(old);
+  }
+}
+
+internal partial class NativeUpdateByOperation {
+  [LibraryImport(LibraryPaths.Dhclient, StringMarshalling = StringMarshalling.Utf8)]
+  public static partial void deephaven_client_UpdateByOperation_dtor(NativePtr<NativeUpdateByOperation> self);
+  [LibraryImport(LibraryPaths.Dhclient, StringMarshalling = StringMarshalling.Utf8)]
+  public static partial void deephaven_client_update_by_cumSum(string[] cols, Int32 numCols,
+    out NativePtr<NativeUpdateByOperation> result, out ErrorStatus status);
+  [LibraryImport(LibraryPaths.Dhclient, StringMarshalling = StringMarshalling.Utf8)]
+  public static partial void deephaven_client_update_by_cumProd(string[] cols, Int32 numCols,
+    out NativePtr<NativeUpdateByOperation> result, out ErrorStatus status);
+  [LibraryImport(LibraryPaths.Dhclient, StringMarshalling = StringMarshalling.Utf8)]
+  public static partial void deephaven_client_update_by_cumMin(string[] cols, Int32 numCols,
+    out NativePtr<NativeUpdateByOperation> result, out ErrorStatus status);
+  [LibraryImport(LibraryPaths.Dhclient, StringMarshalling = StringMarshalling.Utf8)]
+  public static partial void deephaven_client_update_by_cumMax(string[] cols, Int32 numCols,
+    out NativePtr<NativeUpdateByOperation> result, out ErrorStatus status);
+  [LibraryImport(LibraryPaths.Dhclient, StringMarshalling = StringMarshalling.Utf8)]
+  public static partial void deephaven_client_update_by_forwardFill(string[] cols, Int32 numCols,
+    out NativePtr<NativeUpdateByOperation> result, out ErrorStatus status);
+  [LibraryImport(LibraryPaths.Dhclient, StringMarshalling = StringMarshalling.Utf8)]
+  public static partial void deephaven_client_update_by_delta(string[] cols, Int32 numCols,
+    DeltaControl deltaControl, out NativePtr<NativeUpdateByOperation> result, out ErrorStatus status);
+  [LibraryImport(LibraryPaths.Dhclient, StringMarshalling = StringMarshalling.Utf8)]
+  public static partial void deephaven_client_update_by_emaTick(double decayTicks,
+    string[] cols, Int32 numCols, ref OperationControl opControl,
+    out NativePtr<NativeUpdateByOperation> result, out ErrorStatus status);
+  [LibraryImport(LibraryPaths.Dhclient, StringMarshalling = StringMarshalling.Utf8)]
+  public static partial void deephaven_client_update_by_emaTime(string timestampCol,
+    NativePtr<NativeDurationSpecifier> decayTime, string[] cols, Int32 numCols,
+  ref OperationControl opControl, out NativePtr<NativeUpdateByOperation> result, out ErrorStatus status);
+  [LibraryImport(LibraryPaths.Dhclient, StringMarshalling = StringMarshalling.Utf8)]
+  public static partial void deephaven_client_update_by_emsTick(double decayTicks,
+    string[] cols, Int32 numCols, ref OperationControl opControl,
+    out NativePtr<NativeUpdateByOperation> result, out ErrorStatus status);
+  [LibraryImport(LibraryPaths.Dhclient, StringMarshalling = StringMarshalling.Utf8)]
+  public static partial void deephaven_client_update_by_emsTime(string timestampCol,
+    NativePtr<NativeDurationSpecifier> decayTime, string[] cols, Int32 numCols,
+    ref OperationControl opControl, out NativePtr<NativeUpdateByOperation> result, out ErrorStatus status);
+  [LibraryImport(LibraryPaths.Dhclient, StringMarshalling = StringMarshalling.Utf8)]
+  public static partial void deephaven_client_update_by_emminTick(double decayTicks,
+    string[] cols, Int32 numCols, ref OperationControl opControl,
+    out NativePtr<NativeUpdateByOperation> result, out ErrorStatus status);
+  [LibraryImport(LibraryPaths.Dhclient, StringMarshalling = StringMarshalling.Utf8)]
+  public static partial void deephaven_client_update_by_emminTime(string timestampCol,
+    NativePtr<NativeDurationSpecifier> decayTime, string[] cols, Int32 numCols,
+    ref OperationControl opControl, out NativePtr<NativeUpdateByOperation> result, out ErrorStatus status);
+  [LibraryImport(LibraryPaths.Dhclient, StringMarshalling = StringMarshalling.Utf8)]
+  public static partial void deephaven_client_update_by_emmaxTick(double decayTicks,
+    string[] cols, Int32 numCols, ref OperationControl opControl,
+    out NativePtr<NativeUpdateByOperation> result, out ErrorStatus status);
+  [LibraryImport(LibraryPaths.Dhclient, StringMarshalling = StringMarshalling.Utf8)]
+  public static partial void deephaven_client_update_by_emmaxTime(string timestampCol,
+    NativePtr<NativeDurationSpecifier> decayTime, string[] cols, Int32 numCols,
+    ref OperationControl opControl, out NativePtr<NativeUpdateByOperation> result, out ErrorStatus status);
+  [LibraryImport(LibraryPaths.Dhclient, StringMarshalling = StringMarshalling.Utf8)]
+  public static partial void deephaven_client_update_by_emstdTick(double decayTicks,
+    string[] cols, Int32 numCols, ref OperationControl opControl,
+    out NativePtr<NativeUpdateByOperation> result, out ErrorStatus status);
+  [LibraryImport(LibraryPaths.Dhclient, StringMarshalling = StringMarshalling.Utf8)]
+  public static partial void deephaven_client_update_by_emstdTime(string timestampCol,
+    NativePtr<NativeDurationSpecifier> decayTime, string[] cols, Int32 numCols,
+    ref OperationControl opControl, out NativePtr<NativeUpdateByOperation> result, out ErrorStatus status);
+  [LibraryImport(LibraryPaths.Dhclient, StringMarshalling = StringMarshalling.Utf8)]
+  public static partial void deephaven_client_update_by_rollingSumTick(
+    string[] cols, Int32 numCols, Int32 revTicks, Int32 fwdTicks,
+    out NativePtr<NativeUpdateByOperation> result, out ErrorStatus status);
+  [LibraryImport(LibraryPaths.Dhclient, StringMarshalling = StringMarshalling.Utf8)]
+  public static partial void deephaven_client_update_by_rollingSumTime(string timestampCol,
+    string[] cols, Int32 numCols, NativePtr<NativeDurationSpecifier> revTime,
+    NativePtr<NativeDurationSpecifier> fwdTime,
+    out NativePtr<NativeUpdateByOperation> result, out ErrorStatus status);
+  [LibraryImport(LibraryPaths.Dhclient, StringMarshalling = StringMarshalling.Utf8)]
+  public static partial void deephaven_client_update_by_rollingGroupTick(
+    string[] cols, Int32 numCols, Int32 revTicks, Int32 fwdTicks,
+    out NativePtr<NativeUpdateByOperation> result, out ErrorStatus status);
+  [LibraryImport(LibraryPaths.Dhclient, StringMarshalling = StringMarshalling.Utf8)]
+  public static partial void deephaven_client_update_by_rollingGroupTime(string timestampCol,
+    string[] cols, Int32 numCols, NativePtr<NativeDurationSpecifier> revTime,
+    NativePtr<NativeDurationSpecifier> fwdTime,
+    out NativePtr<NativeUpdateByOperation> result, out ErrorStatus status);
+  [LibraryImport(LibraryPaths.Dhclient, StringMarshalling = StringMarshalling.Utf8)]
+  public static partial void deephaven_client_update_by_rollingAvgTick(
+    string[] cols, Int32 numCols, Int32 revTicks, Int32 fwdTicks,
+    out NativePtr<NativeUpdateByOperation> result, out ErrorStatus status);
+  [LibraryImport(LibraryPaths.Dhclient, StringMarshalling = StringMarshalling.Utf8)]
+  public static partial void deephaven_client_update_by_rollingAvgTime(string timestampCol,
+    string[] cols, Int32 numCols, NativePtr<NativeDurationSpecifier> revTime,
+    NativePtr<NativeDurationSpecifier> fwdTime,
+    out NativePtr<NativeUpdateByOperation> result, out ErrorStatus status);
+  [LibraryImport(LibraryPaths.Dhclient, StringMarshalling = StringMarshalling.Utf8)]
+  public static partial void deephaven_client_update_by_rollingMinTick(
+    string[] cols, Int32 numCols, Int32 revTicks, Int32 fwdTicks,
+    out NativePtr<NativeUpdateByOperation> result, out ErrorStatus status);
+  [LibraryImport(LibraryPaths.Dhclient, StringMarshalling = StringMarshalling.Utf8)]
+  public static partial void deephaven_client_update_by_rollingMinTime(string timestampCol,
+    string[] cols, Int32 numCols, NativePtr<NativeDurationSpecifier> revTime,
+    NativePtr<NativeDurationSpecifier> fwdTime,
+    out NativePtr<NativeUpdateByOperation> result, out ErrorStatus status);
+  [LibraryImport(LibraryPaths.Dhclient, StringMarshalling = StringMarshalling.Utf8)]
+  public static partial void deephaven_client_update_by_rollingMaxTick(
+    string[] cols, Int32 numCols, Int32 revTicks, Int32 fwdTicks,
+    out NativePtr<NativeUpdateByOperation> result, out ErrorStatus status);
+  [LibraryImport(LibraryPaths.Dhclient, StringMarshalling = StringMarshalling.Utf8)]
+  public static partial void deephaven_client_update_by_rollingMaxTime(string timestampCol,
+    string[] cols, Int32 numCols, NativePtr<NativeDurationSpecifier> revTime,
+    NativePtr<NativeDurationSpecifier> fwdTime,
+    out NativePtr<NativeUpdateByOperation> result, out ErrorStatus status);
+  [LibraryImport(LibraryPaths.Dhclient, StringMarshalling = StringMarshalling.Utf8)]
+  public static partial void deephaven_client_update_by_rollingProdTick(
+    string[] cols, Int32 numCols, Int32 revTicks, Int32 fwdTicks,
+    out NativePtr<NativeUpdateByOperation> result, out ErrorStatus status);
+  [LibraryImport(LibraryPaths.Dhclient, StringMarshalling = StringMarshalling.Utf8)]
+  public static partial void deephaven_client_update_by_rollingProdTime(string timestampCol,
+    string[] cols, Int32 numCols, NativePtr<NativeDurationSpecifier> revTime,
+    NativePtr<NativeDurationSpecifier> fwdTime,
+    out NativePtr<NativeUpdateByOperation> result, out ErrorStatus status);
+  [LibraryImport(LibraryPaths.Dhclient, StringMarshalling = StringMarshalling.Utf8)]
+  public static partial void deephaven_client_update_by_rollingCountTick(
+    string[] cols, Int32 numCols, Int32 revTicks, Int32 fwdTicks,
+    out NativePtr<NativeUpdateByOperation> result, out ErrorStatus status);
+  [LibraryImport(LibraryPaths.Dhclient, StringMarshalling = StringMarshalling.Utf8)]
+  public static partial void deephaven_client_update_by_rollingCountTime(string timestampCol,
+    string[] cols, Int32 numCols, NativePtr<NativeDurationSpecifier> revTime,
+    NativePtr<NativeDurationSpecifier> fwdTime,
+    out NativePtr<NativeUpdateByOperation> result, out ErrorStatus status);
+  [LibraryImport(LibraryPaths.Dhclient, StringMarshalling = StringMarshalling.Utf8)]
+  public static partial void deephaven_client_update_by_rollingStdTick(
+    string[] cols, Int32 numCols, Int32 revTicks, Int32 fwdTicks,
+    out NativePtr<NativeUpdateByOperation> result, out ErrorStatus status);
+  [LibraryImport(LibraryPaths.Dhclient, StringMarshalling = StringMarshalling.Utf8)]
+  public static partial void deephaven_client_update_by_rollingStdTime(string timestampCol,
+    string[] cols, Int32 numCols, NativePtr<NativeDurationSpecifier> revTime,
+    NativePtr<NativeDurationSpecifier> fwdTime,
+    out NativePtr<NativeUpdateByOperation> result, out ErrorStatus status);
+  [LibraryImport(LibraryPaths.Dhclient, StringMarshalling = StringMarshalling.Utf8)]
+  public static partial void deephaven_client_update_by_rollingWavgTick(
+    string weightCol, string[] cols, Int32 numCols, Int32 revTicks, Int32 fwdTicks,
+    out NativePtr<NativeUpdateByOperation> result, out ErrorStatus status);
+  [LibraryImport(LibraryPaths.Dhclient, StringMarshalling = StringMarshalling.Utf8)]
+  public static partial void deephaven_client_update_by_rollingWavgTime(string timestampCol,
+    string weightCol, string[] cols, Int32 numCols, NativePtr<NativeDurationSpecifier> revTime,
+    NativePtr<NativeDurationSpecifier> fwdTime,
+    out NativePtr<NativeUpdateByOperation> result, out ErrorStatus status);
+}
diff --git a/csharp/client/DeephavenClient/dhe_client/session/DndClient.cs b/csharp/client/DeephavenClient/dhe_client/session/DndClient.cs
new file mode 100644
index 00000000000..e6db330881e
--- /dev/null
+++ b/csharp/client/DeephavenClient/dhe_client/session/DndClient.cs
@@ -0,0 +1,57 @@
+using System.Runtime.InteropServices;
+using Deephaven.DeephavenClient;
+using Deephaven.DeephavenClient.Interop;
+
+namespace Deephaven.DheClient.Session;
+
+public sealed class DndClient : Client {
+  internal new NativePtr<NativeDndClient> Self;
+  public Int64 PqSerial;
+
+  internal static DndClient OfNativePtr(NativePtr<NativeDndClient> dndClient) {
+    NativeDndClient.deephaven_enterprise_session_DndClient_GetManager(dndClient,
+      out var dndManagerResult, out var status1);
+    status1.OkOrThrow();
+    NativeDndClient.deephaven_enterprise_session_DndClient_PqSerial(dndClient,
+      out var pqSerial, out var status2);
+    status2.OkOrThrow();
+    var dndManager = new DndTableHandleManager(dndManagerResult);
+
+    return new DndClient(dndClient, dndManager, pqSerial);
+  }
+
+  private DndClient(NativePtr<NativeDndClient> self, DndTableHandleManager manager,
+    Int64 pqSerial)
+    : base(self.UnsafeCast<NativeClient>(), manager) {
+    Self = self;
+    PqSerial = pqSerial;
+  }
+
+  protected override void ReleaseUnmanagedResources(bool destructSelf) {
+    base.ReleaseUnmanagedResources(false);
+    if (!Self.TryRelease(out var old)) {
+      return;
+    }
+    if (!destructSelf) {
+      return;
+    }
+    NativeDndClient.deephaven_enterprise_session_DndClient_dtor(old);
+  }
+}
+
+
+internal partial class NativeDndClient {
+  [LibraryImport(LibraryPaths.DhEnterprise, StringMarshalling = StringMarshalling.Utf8)]
+  public static partial void deephaven_enterprise_session_DndClient_dtor(
+    NativePtr<NativeDndClient> self);
+
+  [LibraryImport(LibraryPaths.DhEnterprise, StringMarshalling = StringMarshalling.Utf8)]
+  public static partial void deephaven_enterprise_session_DndClient_GetManager(
+    NativePtr<NativeDndClient> self,
+    out NativePtr<NativeDndTableHandleManager> result, out ErrorStatus status);
+
+  [LibraryImport(LibraryPaths.DhEnterprise, StringMarshalling = StringMarshalling.Utf8)]
+  public static partial void deephaven_enterprise_session_DndClient_PqSerial(
+    NativePtr<NativeDndClient> self,
+    out Int64 result, out ErrorStatus status);
+}
diff --git a/csharp/client/DeephavenClient/dhe_client/session/DndTableHandleManager.cs b/csharp/client/DeephavenClient/dhe_client/session/DndTableHandleManager.cs
new file mode 100644
index 00000000000..59c88df657e
--- /dev/null
+++ b/csharp/client/DeephavenClient/dhe_client/session/DndTableHandleManager.cs
@@ -0,0 +1,32 @@
+using System.Runtime.InteropServices;
+using Deephaven.DeephavenClient;
+using Deephaven.DeephavenClient.Interop;
+
+namespace Deephaven.DheClient.Session;
+
+public sealed class DndTableHandleManager : TableHandleManager {
+  internal new NativePtr<NativeDndTableHandleManager> Self;
+
+  internal DndTableHandleManager(NativePtr<NativeDndTableHandleManager> self) :
+    base(self.UnsafeCast<NativeTableHandleManager>()) {
+    Self = self;
+  }
+
+  protected override void ReleaseUnmanagedResources(bool destructSelf) {
+    base.ReleaseUnmanagedResources(false);
+    if (!Self.TryRelease(out var old)) {
+      return;
+    }
+    if (!destructSelf) {
+      return;
+    }
+    NativeDndTableHandleManager.deephaven_enterprise_session_DndTableHandleManager_dtor(old);
+  }
+
+}
+
+internal partial class NativeDndTableHandleManager {
+  [LibraryImport(LibraryPaths.DhEnterprise, StringMarshalling = StringMarshalling.Utf8)]
+  public static partial void deephaven_enterprise_session_DndTableHandleManager_dtor(
+    NativePtr<NativeDndTableHandleManager> self);
+}
diff --git a/csharp/client/DeephavenClient/dhe_client/session/SessionManager.cs b/csharp/client/DeephavenClient/dhe_client/session/SessionManager.cs
new file mode 100644
index 00000000000..e86f9d9903b
--- /dev/null
+++ b/csharp/client/DeephavenClient/dhe_client/session/SessionManager.cs
@@ -0,0 +1,84 @@
+using System.Runtime.InteropServices;
+using Deephaven.DeephavenClient.Interop;
+
+namespace Deephaven.DheClient.Session;
+
+public class SessionManager : IDisposable {
+  internal NativePtr<NativeSessionManager> Self;
+
+  public static SessionManager FromUrl(string descriptiveName, string jsonUrl) {
+    NativeSessionManager.deephaven_enterprise_session_SessionManager_FromUrl(descriptiveName,
+      jsonUrl, out var sessionResult, out var status);
+    status.OkOrThrow();
+    return new SessionManager(sessionResult);
+  }
+
+  public static SessionManager FromJson(string descriptiveName, string json) {
+    NativeSessionManager.deephaven_enterprise_session_SessionManager_FromJson(descriptiveName,
+      json, out var sessionResult, out var status);
+    status.OkOrThrow();
+    return new SessionManager(sessionResult);
+  }
+
+  private SessionManager(NativePtr<NativeSessionManager> self) {
+    Self = self;
+  }
+
+  ~SessionManager() {
+    ReleaseUnmanagedResources();
+  }
+
+  public void Close() {
+    Dispose();
+  }
+
+  public void Dispose() {
+    ReleaseUnmanagedResources();
+    GC.SuppressFinalize(this);
+  }
+
+  public bool PasswordAuthentication(string user, string password, string operateAs) {
+    NativeSessionManager.deephaven_enterprise_session_SessionManager_PasswordAuthentication(
+      Self, user, password, operateAs, out var result, out var status);
+    status.OkOrThrow();
+    return (bool)result;
+  }
+
+  public DndClient ConnectToPqByName(string pqName, bool removeOnClose) {
+    NativeSessionManager.deephaven_enterprise_session_SessionManager_ConnectToPqByName(
+      Self, pqName, (InteropBool)removeOnClose, out var result, out var status);
+    status.OkOrThrow();
+    return DndClient.OfNativePtr(result);
+  }
+
+  private void ReleaseUnmanagedResources() {
+    if (!Self.TryRelease(out var old)) {
+      return;
+    }
+    NativeSessionManager.deephaven_enterprise_session_SessionManager_dtor(old);
+  }
+}
+
+internal partial class NativeSessionManager {
+  [LibraryImport(LibraryPaths.DhEnterprise, StringMarshalling = StringMarshalling.Utf8)]
+  public static partial void deephaven_enterprise_session_SessionManager_dtor(
+    NativePtr<NativeSessionManager> self);
+
+  [LibraryImport(LibraryPaths.DhEnterprise, StringMarshalling = StringMarshalling.Utf8)]
+  public static partial void deephaven_enterprise_session_SessionManager_FromUrl(string descriptiveName,
+    string jsonUrl, out NativePtr<NativeSessionManager> result, out ErrorStatus status);
+
+  [LibraryImport(LibraryPaths.DhEnterprise, StringMarshalling = StringMarshalling.Utf8)]
+  public static partial void deephaven_enterprise_session_SessionManager_FromJson(string descriptiveName,
+    string json, out NativePtr<NativeSessionManager> result, out ErrorStatus status);
+
+  [LibraryImport(LibraryPaths.DhEnterprise, StringMarshalling = StringMarshalling.Utf8)]
+  public static partial void deephaven_enterprise_session_SessionManager_PasswordAuthentication(
+    NativePtr<NativeSessionManager> self, string user, string password, string operateAs,
+    out InteropBool result, out ErrorStatus status);
+
+  [LibraryImport(LibraryPaths.DhEnterprise, StringMarshalling = StringMarshalling.Utf8)]
+  public static partial void deephaven_enterprise_session_SessionManager_ConnectToPqByName(
+    NativePtr<NativeSessionManager> self, string pqName, InteropBool removeOnClose,
+    out NativePtr<NativeDndClient> result, out ErrorStatus status);
+}
diff --git a/csharp/client/DeephavenClient/interop/InteropSupport.cs b/csharp/client/DeephavenClient/interop/InteropSupport.cs
new file mode 100644
index 00000000000..f6e67a3a311
--- /dev/null
+++ b/csharp/client/DeephavenClient/interop/InteropSupport.cs
@@ -0,0 +1,158 @@
+using System;
+using System.Runtime.InteropServices;
+using System.Text;
+using System.Text.Unicode;
+
+namespace Deephaven.DeephavenClient.Interop;
+
+public class LibraryPaths {
+  public const string Dhcore = "dhcore";
+  public const string Dhclient = "dhclient";
+  // public const string DhEnterprise = @"dhe_client";  // does not work
+  public const string DhEnterprise = @"dhe_client.dll";  // works
+}
+
+/// <summary>
+/// This is simply a wrapper for an IntPtr. Its purpose is to give us more careful type checking.
+/// It basically turns IntPtr into a "strong" IntPtr that can only be assigned to IntPtrs of the
+/// same type. The T isn't really used otherwise. Note that for correctness, the C++ side needs
+/// to receive a struct with the same layout (i.e. a C++ struct containing a single pointer).
+/// </summary>
+[StructLayout(LayoutKind.Sequential)]
+public struct NativePtr<T> {
+  public IntPtr ptr;
+
+  public NativePtr(IntPtr ptr) => this.ptr = ptr;
+
+  public bool TryRelease(out NativePtr<T> oldPtr) {
+    oldPtr = new NativePtr<T>(ptr);
+    if (IsNull) {
+      return false;
+    }
+
+    ptr = IntPtr.Zero;
+    return true;
+  }
+
+  public NativePtr<T2> UnsafeCast<T2>() {
+    return new NativePtr<T2>(ptr);
+  }
+
+  public readonly bool IsNull => ptr == IntPtr.Zero;
+}
+
+/// <summary>
+/// This is a wrapper for a bool type. It is necessary because the managed and native sides
+/// don't agree on a representation for 'bool'.
+/// </summary>
+[StructLayout(LayoutKind.Sequential, CharSet = CharSet.Unicode)]
+public readonly struct InteropBool : IEquatable<InteropBool> {
+  private readonly sbyte _value;
+
+  public InteropBool(bool value) { _value = value ? (sbyte)1 : (sbyte)0; }
+
+  public bool BoolValue => _value != 0;
+
+  public override bool Equals(object? obj) {
+    return obj is InteropBool o && Equals(o);
+  }
+
+  public override int GetHashCode() {
+    return _value.GetHashCode();
+  }
+
+  public bool Equals(InteropBool other) {
+    return _value == other._value;
+  }
+
+  public static explicit operator bool(InteropBool ib) => ib.BoolValue;
+  public static explicit operator InteropBool(bool b) => new(b);
+}
+
+[StructLayout(LayoutKind.Sequential)]
+public struct StringHandle {
+  public Int32 Index;
+}
+
+[StructLayout(LayoutKind.Sequential)]
+public struct StringPoolHandle {
+  private NativePtr<NativeStringPool> _nativeStringPool;
+  public Int32 NumBytes;
+  public Int32 NumStrings;
+
+  public StringPool ExportAndDestroy() {
+    if (NumStrings == 0) {
+      // Optimization: if there are no strings, then there is no pool and there is nothing to destroy.
+      if (!_nativeStringPool.IsNull) {
+        throw new Exception("Programming error: 0 strings but non-null _nativeStringPool ptr");
+      }
+      return new StringPool(Array.Empty<string>());
+    }
+    if (!_nativeStringPool.TryRelease(out var old)) {
+      throw new InvalidOperationException("Can't run ExportAndDestroy twice");
+    }
+
+    var bytes = new byte[NumBytes];
+    var ends = new Int32[NumStrings];
+    var errorCode = NativeStringPool.deephaven_dhcore_interop_StringPool_ExportAndDestroy(old,
+      bytes, bytes.Length,
+      ends, ends.Length);
+    if (errorCode != 0) {
+      throw new InvalidOperationException(
+        $"Internal error {errorCode} in deephaven_dhcore_interop_StringPool_ExportAndDestroy");
+    }
+
+    var strings = new string[NumStrings];
+    for (var i = 0; i != NumStrings; ++i) {
+      var begin = i == 0 ? 0 : ends[i - 1];
+      var end = ends[i];
+      strings[i] = Encoding.UTF8.GetString(bytes, begin, end - begin);
+    }
+
+    return new StringPool(strings);
+  }
+}
+
+public sealed class StringPool {
+  public readonly string[] Strings;
+
+  public StringPool(string[] strings) => Strings = strings;
+
+  public string Get(StringHandle handle) {
+    return Strings[handle.Index];
+  }
+}
+
+[StructLayout(LayoutKind.Sequential)]
+public struct ErrorStatus {
+  internal StringHandle StringHandle;
+  internal StringPoolHandle StringPoolHandle;
+
+  /// <summary>
+  /// OkOrThrow and GetError are destructive and you can only call one of them, once.
+  /// </summary>
+  public void OkOrThrow() {
+    var error = GetError();
+    if (error != null) {
+      throw new Exception(error);
+    }
+  }
+
+  /// <summary>
+  /// OkOrThrow and GetError are destructive and you can only call one of them, once.
+  /// </summary>
+  public string? GetError() {
+    if (StringPoolHandle.NumStrings == 0) {
+      return null;
+    }
+
+    return StringPoolHandle.ExportAndDestroy().Get(StringHandle);
+  }
+}
+
+internal partial class NativeStringPool {
+  [LibraryImport(LibraryPaths.Dhcore, StringMarshalling = StringMarshalling.Utf8)]
+  public static partial Int32 deephaven_dhcore_interop_StringPool_ExportAndDestroy(NativePtr<NativeStringPool> self,
+    byte[] bytes, Int32 bytesLength,
+    Int32[] ends, Int32 endsLength);
+}
diff --git a/csharp/client/DeephavenClient/interop/TestApi/BasicInteropInteractions.cs b/csharp/client/DeephavenClient/interop/TestApi/BasicInteropInteractions.cs
new file mode 100644
index 00000000000..385e36ba006
--- /dev/null
+++ b/csharp/client/DeephavenClient/interop/TestApi/BasicInteropInteractions.cs
@@ -0,0 +1,82 @@
+using System;
+using System.Runtime.InteropServices;
+
+namespace Deephaven.DeephavenClient.Interop.TestApi;
+
+[StructLayout(LayoutKind.Sequential)]
+public readonly struct BasicStruct {
+  public readonly Int32 I;
+  public readonly double D;
+
+  public BasicStruct() {
+  }
+
+  public BasicStruct(Int32 i, double d) {
+    I = i;
+    D = d;
+  }
+
+  public BasicStruct Add(BasicStruct other) {
+    return new BasicStruct(I + other.I, D + other.D);
+  }
+}
+
+[StructLayout(LayoutKind.Sequential)]
+public readonly struct NestedStruct {
+  public readonly BasicStruct A;
+  public readonly BasicStruct B;
+
+  public NestedStruct(BasicStruct a, BasicStruct b) {
+    A = a;
+    B = b;
+  }
+
+  public NestedStruct Add(NestedStruct other) {
+    return new NestedStruct(A.Add(other.A), B.Add(other.B));
+  }
+}
+
+public partial class BasicInteropInteractions {
+  [LibraryImport(LibraryPaths.Dhcore, StringMarshalling = StringMarshalling.Utf8)]
+  public static partial void deephaven_dhcore_interop_testapi_BasicInteropInteractions_Add(Int32 a, Int32 b, out Int32 result);
+
+  [LibraryImport(LibraryPaths.Dhcore, StringMarshalling = StringMarshalling.Utf8)]
+  public static partial void deephaven_dhcore_interop_testapi_BasicInteropInteractions_AddArrays(Int32[] a, Int32[] b, Int32 length, Int32[] result);
+
+  [LibraryImport(LibraryPaths.Dhcore, StringMarshalling = StringMarshalling.Utf8)]
+  public static partial void deephaven_dhcore_interop_testapi_BasicInteropInteractions_Xor(InteropBool a, InteropBool b, out InteropBool result);
+
+  [LibraryImport(LibraryPaths.Dhcore, StringMarshalling = StringMarshalling.Utf8)]
+  public static partial void deephaven_dhcore_interop_testapi_BasicInteropInteractions_XorArrays(InteropBool[] a, InteropBool[] b, Int32 length, InteropBool[] result);
+
+  [LibraryImport(LibraryPaths.Dhcore, StringMarshalling = StringMarshalling.Utf8)]
+  public static partial void deephaven_dhcore_interop_testapi_BasicInteropInteractions_Concat(string a, string b,
+    out StringHandle resultHandle, out StringPoolHandle resultPoolHandle);
+
+  [LibraryImport(LibraryPaths.Dhcore, StringMarshalling = StringMarshalling.Utf8)]
+  public static partial void deephaven_dhcore_interop_testapi_BasicInteropInteractions_ConcatArrays(
+    string[] a,
+    string[] b,
+    Int32 numItems,
+    StringHandle[] resultHandles,
+    out StringPoolHandle resultPoolHandle);
+
+  [LibraryImport(LibraryPaths.Dhcore, StringMarshalling = StringMarshalling.Utf8)]
+  public static partial void deephaven_dhcore_interop_testapi_BasicInteropInteractions_AddBasicStruct(
+    ref BasicStruct a, ref BasicStruct b, out BasicStruct result);
+  [LibraryImport(LibraryPaths.Dhcore, StringMarshalling = StringMarshalling.Utf8)]
+  public static partial void deephaven_dhcore_interop_testapi_BasicInteropInteractions_AddBasicStructArrays(
+    BasicStruct[] a, BasicStruct[] b, Int32 length, BasicStruct[] result);
+
+  [LibraryImport(LibraryPaths.Dhcore, StringMarshalling = StringMarshalling.Utf8)]
+  public static partial void deephaven_dhcore_interop_testapi_BasicInteropInteractions_AddNestedStruct(
+    ref NestedStruct a, ref NestedStruct b, out NestedStruct result);
+
+  [LibraryImport(LibraryPaths.Dhcore, StringMarshalling = StringMarshalling.Utf8)]
+  public static partial void deephaven_dhcore_interop_testapi_BasicInteropInteractions_AddNestedStructArrays(
+    NestedStruct[] a, NestedStruct[] b, Int32 length, NestedStruct[] result);
+
+  [LibraryImport(LibraryPaths.Dhcore, StringMarshalling = StringMarshalling.Utf8)]
+  public static partial void deephaven_dhcore_interop_testapi_BasicInteropInteractions_SetErrorIfLessThan(
+    Int32 a, Int32 b, out ErrorStatus status);
+}
diff --git a/csharp/client/DeephavenClient/utility/ColumnFactory.cs b/csharp/client/DeephavenClient/utility/ColumnFactory.cs
new file mode 100644
index 00000000000..18c25a04530
--- /dev/null
+++ b/csharp/client/DeephavenClient/utility/ColumnFactory.cs
@@ -0,0 +1,129 @@
+using Deephaven.DeephavenClient.Interop;
+
+namespace Deephaven.DeephavenClient.Utility;
+
+internal abstract class ColumnFactory<TTableType> {
+  public abstract (Array, bool[]) GetColumn(NativePtr<TTableType> table, Int32 columnIndex,
+    Int64 numRows);
+
+  public abstract Array GetNullableColumn(NativePtr<TTableType> table, Int32 columnIndex,
+    Int64 numRows);
+
+  public delegate void NativeImpl<in T>(NativePtr<TTableType> table, Int32 columnIndex,
+    T[] data, InteropBool[]? nullFlags, Int64 numRows, out StringPoolHandle stringPoolHandle, out ErrorStatus status);
+
+  public abstract class ForType<TTarget, TNative> : ColumnFactory<TTableType> {
+    private readonly NativeImpl<TNative> _nativeImpl;
+
+    protected ForType(NativeImpl<TNative> nativeImpl) => _nativeImpl = nativeImpl;
+
+    public sealed override (Array, bool[]) GetColumn(NativePtr<TTableType> table, Int32 columnIndex,
+      Int64 numRows) {
+      return GetColumnInternal(table, columnIndex, numRows);
+    }
+
+    protected (TTarget[], bool[]) GetColumnInternal(NativePtr<TTableType> table, Int32 columnIndex,
+      Int64 numRows) {
+      var intermediate = new TNative[numRows];
+      var interopNulls = new InteropBool[numRows];
+      _nativeImpl(table, columnIndex, intermediate, interopNulls, numRows, out var stringPoolHandle, out var errorStatus);
+      errorStatus.OkOrThrow();
+      var pool = stringPoolHandle.ExportAndDestroy();
+      var nulls = new bool[numRows];
+      for (Int64 i = 0; i < numRows; ++i) {
+        nulls[i] = (bool)interopNulls[i];
+      }
+
+      var data = ConvertNativeToTarget(intermediate, nulls, pool);
+      return (data, nulls);
+    }
+
+    protected abstract TTarget[] ConvertNativeToTarget(TNative[] native, bool[] nulls, StringPool pool);
+  }
+
+  public sealed class ForString : ForType<string?, StringHandle> {
+    public ForString(NativeImpl<StringHandle> nativeImpl) : base(nativeImpl) {
+    }
+
+    public override Array GetNullableColumn(NativePtr<TTableType> table, int columnIndex, long numRows) {
+      // string is a reference type so there's no such thing as a Nullable<string>.
+      // For the case of string, the return value is the same as GetColumn().
+      return GetColumn(table, columnIndex, numRows).Item1;
+    }
+
+    protected override string?[] ConvertNativeToTarget(StringHandle[] native, bool[] nulls, StringPool pool) {
+      var result = new string?[native.Length];
+      for (Int64 i = 0; i != native.Length; ++i) {
+        result[i] = nulls[i] ? null : pool.Get(native[i]);
+      }
+
+      return result;
+    }
+  }
+
+  public abstract class ForValueTypes<TTarget, TNative> : ForType<TTarget, TNative>
+        where TTarget : struct where TNative : struct {
+    protected ForValueTypes(NativeImpl<TNative> nativeImpl) : base(nativeImpl) {
+    }
+
+    public sealed override Array GetNullableColumn(NativePtr<TTableType> table, int columnIndex, long numRows) {
+      var (data, nulls) = GetColumnInternal(table, columnIndex, numRows);
+      var result = new TTarget?[numRows];
+      for (var i = 0; i != numRows; ++i) {
+        if (!nulls[i]) {
+          result[i] = data[i];
+        }
+      }
+      return result;
+    }
+  }
+
+  public sealed class ForChar : ForValueTypes<char, Int16> {
+    public ForChar(NativeImpl<Int16> nativeImpl) : base(nativeImpl) {
+    }
+
+    protected override char[] ConvertNativeToTarget(Int16[] native, bool[] nulls, StringPool pool) {
+      var result = new char[native.Length];
+      for (var i = 0; i != native.Length; ++i) {
+        result[i] = (char)native[i];
+      }
+      return result;
+    }
+  }
+
+  public sealed class ForBool : ForValueTypes<bool, InteropBool> {
+    public ForBool(NativeImpl<InteropBool> nativeImpl) : base(nativeImpl) {
+    }
+
+    protected override bool[] ConvertNativeToTarget(InteropBool[] native, bool[] nulls, StringPool pool) {
+      var result = new bool[native.Length];
+      for (var i = 0; i != native.Length; ++i) {
+        result[i] = (bool)native[i];
+      }
+      return result;
+    }
+
+  }
+
+  public sealed class ForDateTime : ForValueTypes<DhDateTime, Int64> {
+    public ForDateTime(NativeImpl<Int64> nativeImpl) : base(nativeImpl) {
+    }
+
+    protected override DhDateTime[] ConvertNativeToTarget(Int64[] native, bool[] nulls, StringPool pool) {
+      var result = new DhDateTime[native.Length];
+      for (var i = 0; i != native.Length; ++i) {
+        result[i] = nulls[i] ? new DhDateTime(0) : new DhDateTime(native[i]);
+      }
+      return result;
+    }
+  }
+
+  public sealed class ForOtherValueType<T> : ForValueTypes<T, T> where T : struct {
+    public ForOtherValueType(NativeImpl<T> nativeImpl) : base(nativeImpl) {
+    }
+
+    protected override T[] ConvertNativeToTarget(T[] native, bool[] nulls, StringPool pool) {
+      return native;
+    }
+  }
+}
diff --git a/csharp/client/DeephavenClient/utility/DeephavenConstants.cs b/csharp/client/DeephavenClient/utility/DeephavenConstants.cs
new file mode 100644
index 00000000000..7b64d53edc4
--- /dev/null
+++ b/csharp/client/DeephavenClient/utility/DeephavenConstants.cs
@@ -0,0 +1,5 @@
+namespace Deephaven.DeephavenClient.Utility {
+  public class DeephavenConstants {
+    public const Int64 NullLong = Int64.MinValue;
+  }
+}
diff --git a/csharp/client/DeephavenClient/utility/Schema.cs b/csharp/client/DeephavenClient/utility/Schema.cs
new file mode 100644
index 00000000000..f9a46c4d0b2
--- /dev/null
+++ b/csharp/client/DeephavenClient/utility/Schema.cs
@@ -0,0 +1,55 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace Deephaven.DeephavenClient.Utility;
+
+/**
+ * These values need to be kept in sync with the corresponding values on the C++ side.
+ */
+internal enum ElementTypeId {
+  Char,
+  Int8,
+  Int16,
+  Int32,
+  Int64,
+  Float,
+  Double,
+  Bool,
+  String,
+  Timestamp,
+  List
+};
+
+public class Schema {
+  public Int32 NumCols => Names.Length;
+  public Int64 NumRows;
+  public string[] Names { get; }
+  internal ElementTypeId[] Types { get; }
+  private readonly Dictionary<string, Int32> _nameToIndex;
+
+  internal Schema(string[] names, int[] elementTypesAsInt, Int64 numRows) {
+    if (names.Length != elementTypesAsInt.Length) {
+      throw new ArgumentException($"names.Length ({names.Length}) != types.Length({elementTypesAsInt.Length})");
+    }
+    Names = names;
+    Types = elementTypesAsInt.Select(elt => (ElementTypeId)elt).ToArray();
+    _nameToIndex = Names.Select((name, idx) => new { name, idx })
+      .ToDictionary(elt => elt.name, elt => elt.idx);
+    NumRows = numRows;
+  }
+
+  public Int32 GetColumnIndex(string name) {
+    if (TryGetColumnIndex(name, out var result)) {
+      return result;
+    }
+
+    throw new ArgumentException($"""Column name "{name}" not found""");
+  }
+
+  public bool TryGetColumnIndex(string name, out Int32 result) {
+    return _nameToIndex.TryGetValue(name, out result);
+  }
+}
diff --git a/csharp/client/DeephavenClient/utility/TableMaker.cs b/csharp/client/DeephavenClient/utility/TableMaker.cs
new file mode 100644
index 00000000000..1c094fbb07a
--- /dev/null
+++ b/csharp/client/DeephavenClient/utility/TableMaker.cs
@@ -0,0 +1,338 @@
+using System.Buffers;
+using Deephaven.DeephavenClient.Interop;
+using System.Runtime.InteropServices;
+
+namespace Deephaven.DeephavenClient.Utility;
+
+public class TableMaker : IDisposable {
+  internal NativePtr<NativeTableMaker> Self;
+
+  public TableMaker() {
+    NativeTableMaker.deephaven_dhclient_utility_TableMaker_ctor(out Self, out var status);
+    status.OkOrThrow();
+  }
+
+  ~TableMaker() {
+    ReleaseUnmanagedResources();
+  }
+
+  public void Dispose() {
+    ReleaseUnmanagedResources();
+    GC.SuppressFinalize(this);
+  }
+
+  private void ReleaseUnmanagedResources() {
+    if (!Self.TryRelease(out var old)) {
+      return;
+    }
+    NativeTableMaker.deephaven_dhclient_utility_TableMaker_dtor(old);
+  }
+
+  public void AddColumn<T>(string name, IList<T> column) {
+    var array = column.ToArray();
+    var myVisitor = new MyVisitor(this, name);
+    ArrayDispatcher.AcceptVisitor(myVisitor, array);
+  }
+
+  public TableHandle MakeTable(TableHandleManager manager) {
+    NativeTableMaker.deephaven_dhclient_utility_TableMaker_MakeTable(Self, manager.Self, out var result, out var status);
+    status.OkOrThrow();
+    return new TableHandle(result, manager);
+  }
+
+  private static class ArrayDispatcher {
+    public static void AcceptVisitor<T>(IArrayVisitor visitor, T[] array) {
+      // TODO: make this faster
+      if (array is char[] chars) {
+        visitor.Visit(chars, null);
+        return;
+      }
+
+      if (array is char?[] optionalChars) {
+        ConvertOptional(optionalChars, out var data, out var nulls);
+        visitor.Visit(data, nulls);
+        return;
+      }
+
+      if (array is sbyte[] sbytes) {
+        visitor.Visit(sbytes, null);
+        return;
+      }
+
+      if (array is sbyte?[] optionalSbytes) {
+        ConvertOptional(optionalSbytes, out var data, out var nulls);
+        visitor.Visit(data, nulls);
+        return;
+      }
+
+      if (array is Int16[] int16s) {
+        visitor.Visit(int16s, null);
+        return;
+      }
+
+      if (array is Int16?[] optionalInt16s) {
+        ConvertOptional(optionalInt16s, out var data, out var nulls);
+        visitor.Visit(data, nulls);
+        return;
+      }
+
+      if (array is Int32[] int32s) {
+        visitor.Visit(int32s, null);
+        return;
+      }
+
+      if (array is Int32?[] optionalInt32s) {
+        ConvertOptional(optionalInt32s, out var data, out var nulls);
+        visitor.Visit(data, nulls);
+        return;
+      }
+
+      if (array is Int64[] int64s) {
+        visitor.Visit(int64s, null);
+        return;
+      }
+
+      if (array is Int64?[] optionalInt64s) {
+        ConvertOptional(optionalInt64s, out var data, out var nulls);
+        visitor.Visit(data, nulls);
+        return;
+      }
+
+      if (array is float[] floats) {
+        visitor.Visit(floats, null);
+        return;
+      }
+
+      if (array is float?[] optionalFloats) {
+        ConvertOptional(optionalFloats, out var data, out var nulls);
+        visitor.Visit(data, nulls);
+        return;
+      }
+
+      if (array is double[] doubles) {
+        visitor.Visit(doubles, null);
+        return;
+      }
+
+      if (array is float?[] optionalDoubles) {
+        ConvertOptional(optionalDoubles, out var data, out var nulls);
+        visitor.Visit(data, nulls);
+        return;
+      }
+
+      if (array is bool[] bools) {
+        visitor.Visit(bools, null);
+        return;
+      }
+
+      if (array is bool?[] optionalBools) {
+        ConvertOptional(optionalBools, out var data, out var nulls);
+        visitor.Visit(data, nulls);
+        return;
+      }
+
+      if (array is DhDateTime[] datetimes) {
+        visitor.Visit(datetimes, null);
+        return;
+      }
+
+      if (array is DhDateTime?[] optionalDateTimes) {
+        ConvertOptional(optionalDateTimes, out var data, out var nulls);
+        visitor.Visit(data, nulls);
+        return;
+      }
+
+      if (array is string[] strings) {
+        visitor.Visit(strings);
+        return;
+      }
+
+      throw new ArgumentException($"Don't know how to handle type {array.GetType().Name}");
+    }
+
+    private static void ConvertOptional<T>(T?[] input, out T[] data, out InteropBool[] nulls) where T : struct {
+      data = new T[input.Length];
+      nulls = new InteropBool[input.Length];
+      for (var i = 0; i != input.Length; ++i) {
+        if (input[i].HasValue) {
+          data[i] = input[i]!.Value;
+        } else {
+          nulls[i] = (InteropBool)true;
+        }
+      }
+    }
+
+  }
+
+  // put this somewhere
+  private interface IArrayVisitor {
+    public void Visit(char[] array, InteropBool[]? nulls);
+    public void Visit(sbyte[] array, InteropBool[]? nulls);
+    public void Visit(Int16[] array, InteropBool[]? nulls);
+    public void Visit(Int32[] array, InteropBool[]? nulls);
+    public void Visit(Int64[] array, InteropBool[]? nulls);
+    public void Visit(float[] array, InteropBool[]? nulls);
+    public void Visit(double[] array, InteropBool[]? nulls);
+    public void Visit(bool[] array, InteropBool[]? nulls);
+    public void Visit(DhDateTime[] array, InteropBool[]? nulls);
+    // No nulls array because string is a reference type
+    public void Visit(string[] array);
+  }
+
+  private class MyVisitor : IArrayVisitor {
+    private readonly TableMaker _owner;
+    private readonly string _name;
+
+    public MyVisitor(TableMaker owner, string name) {
+      _owner = owner;
+      _name = name;
+    }
+
+    public void Visit(char[] array, InteropBool[]? nulls) {
+      var nativeData = new Int16[array.Length];
+      for (var i = 0; i != array.Length; ++i) {
+        nativeData[i] = (Int16)array[i];
+      }
+
+      NativeTableMaker.deephaven_dhclient_utility_TableMaker_AddColumn__CharAsInt16(
+        _owner.Self, _name, nativeData, nativeData.Length, nulls, out var status);
+      status.OkOrThrow();
+    }
+
+    public void Visit(sbyte[] array, InteropBool[]? nulls) {
+      NativeTableMaker.deephaven_dhclient_utility_TableMaker_AddColumn__Int8(
+        _owner.Self, _name, array, array.Length, nulls, out var status);
+      status.OkOrThrow(); 
+    }
+
+    public void Visit(Int16[] array, InteropBool[]? nulls) {
+      NativeTableMaker.deephaven_dhclient_utility_TableMaker_AddColumn__Int16(
+        _owner.Self, _name, array, array.Length, nulls, out var status);
+      status.OkOrThrow();
+    }
+
+    public void Visit(Int32[] array, InteropBool[]? nulls) {
+      NativeTableMaker.deephaven_dhclient_utility_TableMaker_AddColumn__Int32(
+        _owner.Self, _name, array, array.Length, nulls, out var status);
+      status.OkOrThrow();
+    }
+
+    public void Visit(Int64[] array, InteropBool[]? nulls) {
+      NativeTableMaker.deephaven_dhclient_utility_TableMaker_AddColumn__Int64(
+        _owner.Self, _name, array, array.Length, nulls, out var status);
+      status.OkOrThrow();
+    }
+
+    public void Visit(float[] array, InteropBool[]? nulls) {
+      NativeTableMaker.deephaven_dhclient_utility_TableMaker_AddColumn__Float(
+        _owner.Self, _name, array, array.Length, nulls, out var status);
+      status.OkOrThrow();
+    }
+
+    public void Visit(double[] array, InteropBool[]? nulls) {
+      NativeTableMaker.deephaven_dhclient_utility_TableMaker_AddColumn__Double(
+        _owner.Self, _name, array, array.Length, nulls, out var status);
+      status.OkOrThrow();
+    }
+
+    public void Visit(bool[] array, InteropBool[]? nulls) {
+      var nativeData = new InteropBool[array.Length];
+      for (var i = 0; i != array.Length; ++i) {
+        nativeData[i] = (InteropBool)array[i];
+      }
+
+      NativeTableMaker.deephaven_dhclient_utility_TableMaker_AddColumn__BoolAsInteropBool(
+        _owner.Self, _name, nativeData, nativeData.Length, nulls, out var status);
+      status.OkOrThrow();
+    }
+
+    public void Visit(string?[] array) {
+      var nulls = new InteropBool[array.Length];
+      for (var i = 0; i != array.Length; ++i) {
+        nulls[i] = (InteropBool)(array[i] == null);
+      }
+
+      NativeTableMaker.deephaven_dhclient_utility_TableMaker_AddColumn__String(
+        _owner.Self, _name, array, array.Length, nulls, out var status);
+      status.OkOrThrow();
+    }
+
+    public void Visit(DhDateTime[] array, InteropBool[]? nulls) {
+      var nativeData = new Int64[array.Length];
+      for (var i = 0; i != array.Length; ++i) {
+        nativeData[i] = array[i].Nanos;
+      }
+
+      NativeTableMaker.deephaven_dhclient_utility_TableMaker_AddColumn__DateTimeAsInt64(
+        _owner.Self, _name, nativeData, nativeData.Length, nulls, out var status);
+      status.OkOrThrow();
+    }
+  }
+}
+
+internal partial class NativeTableMaker {
+  [LibraryImport(LibraryPaths.Dhclient, StringMarshalling = StringMarshalling.Utf8)]
+  internal static partial void deephaven_dhclient_utility_TableMaker_ctor(out NativePtr<NativeTableMaker> result,
+    out ErrorStatus status);
+
+  [LibraryImport(LibraryPaths.Dhclient, StringMarshalling = StringMarshalling.Utf8)]
+  internal static partial void deephaven_dhclient_utility_TableMaker_dtor(NativePtr<NativeTableMaker> self);
+
+  [LibraryImport(LibraryPaths.Dhclient, StringMarshalling = StringMarshalling.Utf8)]
+  internal static partial void deephaven_dhclient_utility_TableMaker_MakeTable(NativePtr<NativeTableMaker> self,
+    NativePtr<NativeTableHandleManager> manager,
+    out NativePtr<NativeTableHandle> result,
+    out ErrorStatus status);
+
+  [LibraryImport(LibraryPaths.Dhclient, StringMarshalling = StringMarshalling.Utf8)]
+  internal static partial void deephaven_dhclient_utility_TableMaker_AddColumn__CharAsInt16(
+    NativePtr<NativeTableMaker> self,
+    string name, Int16[] data, Int32 length, InteropBool[]? nulls,
+    out ErrorStatus status);
+
+  [LibraryImport(LibraryPaths.Dhclient, StringMarshalling = StringMarshalling.Utf8)]
+  internal static partial void deephaven_dhclient_utility_TableMaker_AddColumn__Int8(
+    NativePtr<NativeTableMaker> self,
+    string name, sbyte[] data, Int32 length, InteropBool[]? nulls,
+    out ErrorStatus status);
+
+  [LibraryImport(LibraryPaths.Dhclient, StringMarshalling = StringMarshalling.Utf8)]
+  internal static partial void deephaven_dhclient_utility_TableMaker_AddColumn__Int16(NativePtr<NativeTableMaker> self,
+    string name, Int16[] data, Int32 length, InteropBool[]? nulls,
+    out ErrorStatus status);
+
+  [LibraryImport(LibraryPaths.Dhclient, StringMarshalling = StringMarshalling.Utf8)]
+  internal static partial void deephaven_dhclient_utility_TableMaker_AddColumn__Int32(NativePtr<NativeTableMaker> self,
+    string name, Int32[] data,  Int32 length, InteropBool[]? nulls,
+    out ErrorStatus status);
+
+  [LibraryImport(LibraryPaths.Dhclient, StringMarshalling = StringMarshalling.Utf8)]
+  internal static partial void deephaven_dhclient_utility_TableMaker_AddColumn__Int64(NativePtr<NativeTableMaker> self,
+    string name, Int64[] data, Int32 length, InteropBool[]? nulls,
+    out ErrorStatus status);
+
+  [LibraryImport(LibraryPaths.Dhclient, StringMarshalling = StringMarshalling.Utf8)]
+  internal static partial void deephaven_dhclient_utility_TableMaker_AddColumn__Float(NativePtr<NativeTableMaker> self,
+    string name, float[] data, Int32 length, InteropBool[]? nulls,
+    out ErrorStatus status);
+
+  [LibraryImport(LibraryPaths.Dhclient, StringMarshalling = StringMarshalling.Utf8)]
+  internal static partial void deephaven_dhclient_utility_TableMaker_AddColumn__Double(NativePtr<NativeTableMaker> self,
+    string name, double[] data, Int32 length, InteropBool[]? nulls,
+    out ErrorStatus status);
+
+  [LibraryImport(LibraryPaths.Dhclient, StringMarshalling = StringMarshalling.Utf8)]
+  internal static partial void deephaven_dhclient_utility_TableMaker_AddColumn__BoolAsInteropBool(NativePtr<NativeTableMaker> self,
+    string name, InteropBool[] data, Int32 length, InteropBool[]? nulls,
+    out ErrorStatus status);
+
+  [LibraryImport(LibraryPaths.Dhclient, StringMarshalling = StringMarshalling.Utf8)]
+  internal static partial void deephaven_dhclient_utility_TableMaker_AddColumn__DateTimeAsInt64(NativePtr<NativeTableMaker> self,
+    string name, Int64[] data, Int32 length, InteropBool[]? nulls,
+    out ErrorStatus status);
+
+  [LibraryImport(LibraryPaths.Dhclient, StringMarshalling = StringMarshalling.Utf8)]
+  internal static partial void deephaven_dhclient_utility_TableMaker_AddColumn__String(NativePtr<NativeTableMaker> self,
+    string name, string?[] data, Int32 length, InteropBool[]? nulls,
+    out ErrorStatus status);
+}
diff --git a/csharp/client/DhClientTests/AddDropTest.cs b/csharp/client/DhClientTests/AddDropTest.cs
new file mode 100644
index 00000000000..9f53335bfa8
--- /dev/null
+++ b/csharp/client/DhClientTests/AddDropTest.cs
@@ -0,0 +1,32 @@
+using Deephaven.DeephavenClient.Interop;
+using Deephaven.DeephavenClient;
+using Xunit.Abstractions;
+
+namespace Deephaven.DhClientTests;
+
+public class AddDropTest {
+  private readonly ITestOutputHelper _output;
+
+  public AddDropTest(ITestOutputHelper output) {
+    _output = output;
+  }
+
+  [Fact]
+  public void TestDropSomeColumns() {
+    using var ctx = CommonContextForTests.Create(new ClientOptions());
+    var table = ctx.TestTable;
+
+    var t = table.Update("II = ii").Where("Ticker == `AAPL`");
+    var cn = ctx.ColumnNames;
+    var t2 = t.DropColumns(cn.ImportDate, cn.Ticker, cn.Open, cn.Close);
+    _output.WriteLine(t2.ToString(true));
+
+    var volData = new Int64[] { 100000, 250000, 19000 };
+    var iiData = new Int64[] { 5, 6, 7 };
+
+    var tc = new TableComparer();
+    tc.AddColumn("Volume", volData);
+    tc.AddColumn("II", iiData);
+    tc.AssertEqualTo(t2);
+  }
+}
diff --git a/csharp/client/DhClientTests/AggregatesTest.cs b/csharp/client/DhClientTests/AggregatesTest.cs
new file mode 100644
index 00000000000..e0e69db98b5
--- /dev/null
+++ b/csharp/client/DhClientTests/AggregatesTest.cs
@@ -0,0 +1,46 @@
+using Deephaven.DeephavenClient.Interop;
+using Deephaven.DeephavenClient;
+using Xunit.Abstractions;
+
+namespace Deephaven.DhClientTests;
+
+public class AggregatesTest {
+  private readonly ITestOutputHelper _output;
+
+  public AggregatesTest(ITestOutputHelper output) {
+    _output = output;
+  }
+
+  [Fact]
+  public void TestVariousAggregates() {
+    using var ctx = CommonContextForTests.Create(new ClientOptions());
+    var table = ctx.TestTable;
+
+    table = table.Where("ImportDate == `2017-11-01`");
+    var zngaTable = table.Where("Ticker == `ZNGA`");
+
+    var aggTable = zngaTable.View("Close")
+      .By(new AggregateCombo(new[] {
+        Aggregate.Avg(new []{"AvgClose=Close"}),
+        Aggregate.Sum(new []{"SumClose=Close"}),
+        Aggregate.Min(new [] {"MinClose=Close"}),
+        Aggregate.Max(new []{"MaxClose=Close"}),
+        Aggregate.Count("Count")
+      }));
+
+    var tickerData = new[]{ "AAPL", "AAPL", "AAPL"};
+    var avgCloseData = new[] { 541.55 };
+    var sumCloseData = new[] { 1083.1 };
+    var minCloseData = new[] { 538.2 };
+    var maxCloseData = new[] { 544.9 };
+    var countData = new Int64[] { 2 };
+
+    var tc = new TableComparer();
+    tc.AddColumn("AvgClose", avgCloseData);
+    tc.AddColumn("SumClose", sumCloseData);
+    tc.AddColumn("MinClose", minCloseData);
+    tc.AddColumn("MaxClose", maxCloseData);
+    tc.AddColumn("Count", countData);
+    tc.AssertEqualTo(aggTable);
+  }
+}
diff --git a/csharp/client/DhClientTests/BasicInteropInteractionsTest.cs b/csharp/client/DhClientTests/BasicInteropInteractionsTest.cs
new file mode 100644
index 00000000000..27cd2d1e1e0
--- /dev/null
+++ b/csharp/client/DhClientTests/BasicInteropInteractionsTest.cs
@@ -0,0 +1,172 @@
+using Deephaven.DeephavenClient.Interop;
+using Deephaven.DeephavenClient.Interop.TestApi;
+
+namespace Deephaven.DhClientTests;
+
+public class BasicInteropInteractionsTest {
+  [Fact]
+  public void TestInAndOutPrimitives() {
+    BasicInteropInteractions.deephaven_dhcore_interop_testapi_BasicInteropInteractions_Add(3, 4, out var result);
+    Assert.Equal(7, result);
+  }
+
+  [Fact]
+  public void TestInAndOutPrimitiveArrays() {
+    const int length = 3;
+    var a = new Int32[length] { 10, 20, 30 };
+    var b = new Int32[length] { -5, 10, -15 };
+    var actualResult = new Int32[length];
+    BasicInteropInteractions.deephaven_dhcore_interop_testapi_BasicInteropInteractions_AddArrays(a, b,
+      length, actualResult);
+    var expectedResult = new Int32[length] { 5, 30, 15 };
+    Assert.Equal(expectedResult, actualResult);
+  }
+
+  [Fact]
+  public void TestInAndOutBooleans() {
+    foreach (var a in new[] { false, true }) {
+      foreach (var b in new[] { false, true }) {
+        BasicInteropInteractions.deephaven_dhcore_interop_testapi_BasicInteropInteractions_Xor((InteropBool)a,
+          (InteropBool)b, out var actualResult);
+        var expectedResult = a ^ b;
+        Assert.Equal(expectedResult, (bool)actualResult);
+      }
+    }
+  }
+
+  [Fact]
+  public void TestInAndOutBooleanArrays() {
+    var aList = new List<bool>();
+    var bList = new List<bool>();
+    var expectedResult = new List<bool>();
+    foreach (var a in new[] { false, true }) {
+      foreach (var b in new[] { false, true }) {
+        aList.Add(a);
+        bList.Add(b);
+        expectedResult.Add(a ^ b);
+      }
+    }
+
+    var aArray = aList.Select(e => (InteropBool)e).ToArray();
+    var bArray = bList.Select(e => (InteropBool)e).ToArray();
+    var size = aArray.Length;
+    var actualResultArray = new InteropBool[size];
+    BasicInteropInteractions.deephaven_dhcore_interop_testapi_BasicInteropInteractions_XorArrays(
+      aArray, bArray, size, actualResultArray);
+
+    var expectedResultArray = expectedResult.Select(e => (InteropBool)e).ToArray();
+
+    Assert.Equal(expectedResultArray, actualResultArray);
+  }
+
+  [Fact]
+  public void TestInAndOutStrings() {
+    const string a = "Deep🎔";
+    const string b = "haven";
+    var expectedResult = a + b;
+    BasicInteropInteractions.deephaven_dhcore_interop_testapi_BasicInteropInteractions_Concat(a, b,
+      out var resultHandle, out var poolHandle);
+    var pool = poolHandle.ExportAndDestroy();
+    var actualResult = pool.Get(resultHandle);
+    Assert.Equal(expectedResult, actualResult);
+  }
+
+  [Fact]
+  public void TestInAndOutStringArrays() {
+    const int numItems = 30;
+    var prefixes = new string[numItems];
+    var suffixes = new string[numItems];
+    var expectedResult = new string[numItems];
+
+    for (int i = 0; i != numItems; ++i) {
+      prefixes[i] = $"Deep[{i}";
+      suffixes[i] = $"-🎔-{i}haven]";
+      expectedResult[i] = prefixes[i] + suffixes[i];
+    }
+
+    var resultHandles = new StringHandle[numItems];
+    BasicInteropInteractions.deephaven_dhcore_interop_testapi_BasicInteropInteractions_ConcatArrays(
+      prefixes, suffixes, numItems, resultHandles, out var poolHandle);
+    var pool = poolHandle.ExportAndDestroy();
+    var actualResult = resultHandles.Select(pool.Get).ToArray();
+    Assert.Equal(expectedResult, actualResult);
+  }
+
+  [Fact]
+  public void TestInAndOutStruct() {
+    var a = new BasicStruct(100, 33.25);
+    var b = new BasicStruct(12, 8.5);
+    BasicInteropInteractions.deephaven_dhcore_interop_testapi_BasicInteropInteractions_AddBasicStruct(ref a, ref b, out var actualResult);
+    var expectedResult = a.Add(b);
+    Assert.Equal(expectedResult, actualResult);
+  }
+
+  [Fact]
+  public void TestInAndOutStructArrays() {
+    const Int32 size = 37;
+    var a = new BasicStruct[size];
+    var b = new BasicStruct[size];
+    var expectedResult = new BasicStruct[size];
+
+    for (Int32 i = 0; i != size; ++i) {
+      a[i] = new BasicStruct(i, 1234.5 + i);
+      b[i] = new BasicStruct(100 + i, 824.3 + i);
+      expectedResult[i] = a[i].Add(b[i]);
+    }
+    var actualResult = new BasicStruct[size];
+    BasicInteropInteractions.deephaven_dhcore_interop_testapi_BasicInteropInteractions_AddBasicStructArrays(a, b, size, actualResult);
+
+    for (Int32 i = 0; i != size; ++i) {
+      Assert.Equal(expectedResult[i], actualResult[i]);
+    }
+    Assert.Equal(expectedResult, actualResult);
+  }
+
+  [Fact]
+  public void TestInAndOutNestedStruct() {
+    var a1 = new BasicStruct(11, 22.22);
+    var a2 = new BasicStruct(33, 44.44);
+    var a = new NestedStruct(a1, a2);
+
+    var b1 = new BasicStruct(55, 66.66);
+    var b2 = new BasicStruct(77, 88.88);
+    var b = new NestedStruct(b1, b2);
+
+    BasicInteropInteractions.deephaven_dhcore_interop_testapi_BasicInteropInteractions_AddNestedStruct(ref a, ref b, out var actualResult);
+    var expectedResult = a.Add(b);
+    Assert.Equal(expectedResult, actualResult);
+  }
+
+  [Fact]
+  public void TestInAndOutNestedStructArray() {
+    const Int32 size = 52;
+    var a = new NestedStruct[size];
+    var b = new NestedStruct[size];
+    var expectedResult = new NestedStruct[size];
+
+    for (Int32 i = 0; i != size; ++i) {
+      var aa = new BasicStruct(i * 100, i * 11.11);
+      var ab = new BasicStruct(i + 200, i * 22.22);
+      var ba = new BasicStruct(i + 300, i * 33.33);
+      var bb = new BasicStruct(i + 400, i * 44.44);
+      a[i] = new NestedStruct(aa, ab);
+      b[i] = new NestedStruct(ba, bb);
+      expectedResult[i] = a[i].Add(b[i]);
+    }
+
+    var actualResult = new NestedStruct[size];
+    BasicInteropInteractions.deephaven_dhcore_interop_testapi_BasicInteropInteractions_AddNestedStructArrays(a, b, size, actualResult);
+    Assert.Equal(expectedResult, actualResult);
+  }
+
+  [Fact]
+  public void TestErrorStatus() {
+    BasicInteropInteractions.deephaven_dhcore_interop_testapi_BasicInteropInteractions_SetErrorIfLessThan(10, 1, out var status1);
+    var error1 = status1.GetError();
+    Assert.Null(error1);
+
+    BasicInteropInteractions.deephaven_dhcore_interop_testapi_BasicInteropInteractions_SetErrorIfLessThan(1, 10, out var status2);
+    var error2 = status2.GetError();
+    Assert.NotNull(error2);
+  }
+}
diff --git a/csharp/client/DhClientTests/BasicTests.cs b/csharp/client/DhClientTests/BasicTests.cs
new file mode 100644
index 00000000000..7c89409120b
--- /dev/null
+++ b/csharp/client/DhClientTests/BasicTests.cs
@@ -0,0 +1,22 @@
+using Deephaven.DeephavenClient.Interop;
+using Deephaven.DeephavenClient;
+using Xunit.Abstractions;
+using System;
+
+namespace Deephaven.DhClientTests;
+
+public class BasicTests {
+  private readonly ITestOutputHelper _output;
+
+  public BasicTests(ITestOutputHelper output) {
+    _output = output;
+  }
+
+  [Fact]
+  public void TestClosePlaysNiceWithDispose() {
+    using var ctx = CommonContextForTests.Create(new ClientOptions());
+    var table = ctx.TestTable;
+    using var updated = table.Update("QQQ = i");
+    ctx.Client.Close();
+  }
+}
diff --git a/csharp/client/DhClientTests/CommonContextForTests.cs b/csharp/client/DhClientTests/CommonContextForTests.cs
new file mode 100644
index 00000000000..e173e9de1bb
--- /dev/null
+++ b/csharp/client/DhClientTests/CommonContextForTests.cs
@@ -0,0 +1,138 @@
+using System;
+using Deephaven.DeephavenClient;
+using Deephaven.DeephavenClient.Utility;
+
+namespace Deephaven.DhClientTests;
+
+public sealed class CommonContextForTests : IDisposable {
+  public readonly Client Client;
+  public readonly TableHandle TestTable;
+  public readonly ColumnNamesForTests ColumnNames;
+  public readonly ColumnDataForTests ColumnData;
+
+  public static CommonContextForTests Create(ClientOptions options) {
+    var client = CreateClient(options);
+    var manager = client.Manager;
+
+    var cn = new ColumnNamesForTests();
+    var cd = new ColumnDataForTests();
+
+    var maker = new TableMaker();
+    maker.AddColumn(cn.ImportDate, cd.ImportDate);
+    maker.AddColumn(cn.Ticker, cd.Ticker);
+    maker.AddColumn(cn.Open, cd.Open);
+    maker.AddColumn(cn.Close, cd.Close);
+    maker.AddColumn(cn.Volume, cd.Volume);
+
+    var testTable = maker.MakeTable(manager);
+    return new CommonContextForTests(client, testTable, cn, cd);
+  }
+
+  private CommonContextForTests(Client client, TableHandle testTable,
+    ColumnNamesForTests cn, ColumnDataForTests cd) {
+    Client = client;
+    TestTable = testTable;
+    ColumnNames = cn;
+    ColumnData = cd;
+  }
+
+  public void Dispose() {
+    TestTable.Dispose();
+    Client.Dispose();
+  }
+
+  private static Client CreateClient(ClientOptions clientOptions) {
+    var host = GlobalEnvironmentForTests.GetEnv("DH_HOST", "10.0.4.106");
+    var port = GlobalEnvironmentForTests.GetEnv("DH_PORT", "10000");
+    var connectionString = $"{host}:{port}";
+    var client = Client.Connect(connectionString, clientOptions);
+    return client;
+  }
+}
+
+// TODO(kosak): put this somewhere, and implement for real
+class GlobalEnvironmentForTests {
+  public static string GetEnv(string environmentVariable, string defaultValue) {
+    return defaultValue;
+  }
+}
+
+public class ColumnNamesForTests {
+  public string ImportDate = "ImportDate";
+  public string Ticker = "Ticker";
+  public string Open = "Open";
+  public string Close = "Close";
+  public string Volume = "Volume";
+}
+
+public class ColumnDataForTests {
+  public string[] ImportDate = {
+    "2017-11-01",
+    "2017-11-01",
+    "2017-11-01",
+    "2017-11-01",
+    "2017-11-01",
+    "2017-11-01",
+    "2017-11-01",
+    "2017-11-01",
+    "2017-11-01",
+    "2017-11-01",
+    "2017-11-02"
+  };
+
+  public string[] Ticker = {
+    "XRX",
+    "XRX",
+    "XYZZY",
+    "IBM",
+    "GME",
+    "AAPL",
+    "AAPL",
+    "AAPL",
+    "ZNGA",
+    "ZNGA",
+    "T"
+  };
+
+  public double[] Open = {
+    83.1,
+    50.5,
+    92.3,
+    40.1,
+    681.43,
+    22.1,
+    26.8,
+    31.5,
+    541.2,
+    685.3,
+    18.8
+  };
+
+  public double[] Close = {
+    88.2,
+    53.8,
+    88.5,
+    38.7,
+    453,
+    23.5,
+    24.2,
+    26.7,
+    538.2,
+    544.9,
+    13.4
+  };
+
+  public long[] Volume = {
+    345000,
+    87000,
+    6060842,
+    138000,
+    138000000,
+    100000,
+    250000,
+    19000,
+    46123,
+    48300,
+    1500
+  };
+}
diff --git a/csharp/client/DhClientTests/DateTimeTest.cs b/csharp/client/DhClientTests/DateTimeTest.cs
new file mode 100644
index 00000000000..ee2e3287fce
--- /dev/null
+++ b/csharp/client/DhClientTests/DateTimeTest.cs
@@ -0,0 +1,28 @@
+using Deephaven.DeephavenClient.Interop;
+using Deephaven.DeephavenClient;
+using Xunit.Abstractions;
+
+namespace Deephaven.DhClientTests;
+
+public class DateTimeTest {
+  private readonly ITestOutputHelper _output;
+
+  public DateTimeTest(ITestOutputHelper output) {
+    _output = output;
+  }
+
+  [Fact]
+  public void TestDhDateTimeConstructor() {
+    var dt0 = new DhDateTime(2001, 3, 1, 12, 34, 56);
+    Assert.Equal(983450096000000000, dt0.Nanos);
+    var dt1 = new DhDateTime(2001, 3, 1, 12, 34, 56, 987000000);
+    Assert.Equal(983450096987000000, dt1.Nanos);
+    var dt2 = new DhDateTime(2001, 3, 1, 12, 34, 56, 987654000);
+    Assert.Equal(983450096987654000, dt2.Nanos);
+    var dt3 = new DhDateTime(2001, 3, 1, 12, 34, 56, 987654321);
+    Assert.Equal(983450096987654321, dt3.Nanos);
+  }
+
+  // TODO(kosak): DhDateTime.Parse (including parsing full nanosecond resolution)
+  // and DhDateTime.Format
+}
diff --git a/csharp/client/DhClientTests/DhClientTests.csproj b/csharp/client/DhClientTests/DhClientTests.csproj
new file mode 100644
index 00000000000..f3891fe822b
--- /dev/null
+++ b/csharp/client/DhClientTests/DhClientTests.csproj
@@ -0,0 +1,29 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <TargetFramework>net7.0</TargetFramework>
+    <ImplicitUsings>enable</ImplicitUsings>
+    <Nullable>enable</Nullable>
+
+    <IsPackable>false</IsPackable>
+    <IsTestProject>true</IsTestProject>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.7.1" />
+    <PackageReference Include="xunit" Version="2.4.2" />
+    <PackageReference Include="xunit.runner.visualstudio" Version="2.4.5">
+      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+      <PrivateAssets>all</PrivateAssets>
+    </PackageReference>
+    <PackageReference Include="coverlet.collector" Version="3.2.0">
+      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+      <PrivateAssets>all</PrivateAssets>
+    </PackageReference>
+  </ItemGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="..\DeephavenClient\DeephavenClient.csproj" />
+  </ItemGroup>
+
+</Project>
diff --git a/csharp/client/DhClientTests/DhClientTests.sln b/csharp/client/DhClientTests/DhClientTests.sln
new file mode 100644
index 00000000000..b70b6047321
--- /dev/null
+++ b/csharp/client/DhClientTests/DhClientTests.sln
@@ -0,0 +1,31 @@
+
+Microsoft Visual Studio Solution File, Format Version 12.00
+# Visual Studio Version 17
+VisualStudioVersion = 17.7.34221.43
+MinimumVisualStudioVersion = 10.0.40219.1
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DhClientTests", "DhClientTests.csproj", "{3C5EE5FF-3DB8-42FF-B8CA-675F63929F51}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DeephavenClient", "..\DeephavenClient\DeephavenClient.csproj", "{1F55F88C-23E7-403A-8136-EAFA58E3CA19}"
+EndProject
+Global
+	GlobalSection(SolutionConfigurationPlatforms) = preSolution
+		Debug|Any CPU = Debug|Any CPU
+		Release|Any CPU = Release|Any CPU
+	EndGlobalSection
+	GlobalSection(ProjectConfigurationPlatforms) = postSolution
+		{3C5EE5FF-3DB8-42FF-B8CA-675F63929F51}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{3C5EE5FF-3DB8-42FF-B8CA-675F63929F51}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{3C5EE5FF-3DB8-42FF-B8CA-675F63929F51}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{3C5EE5FF-3DB8-42FF-B8CA-675F63929F51}.Release|Any CPU.Build.0 = Release|Any CPU
+		{1F55F88C-23E7-403A-8136-EAFA58E3CA19}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{1F55F88C-23E7-403A-8136-EAFA58E3CA19}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{1F55F88C-23E7-403A-8136-EAFA58E3CA19}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{1F55F88C-23E7-403A-8136-EAFA58E3CA19}.Release|Any CPU.Build.0 = Release|Any CPU
+	EndGlobalSection
+	GlobalSection(SolutionProperties) = preSolution
+		HideSolutionNode = FALSE
+	EndGlobalSection
+	GlobalSection(ExtensibilityGlobals) = postSolution
+		SolutionGuid = {78B771BA-9731-4321-A0A1-E711829D766F}
+	EndGlobalSection
+EndGlobal
diff --git a/csharp/client/DhClientTests/DhClientTests.sln.DotSettings.user b/csharp/client/DhClientTests/DhClientTests.sln.DotSettings.user
new file mode 100644
index 00000000000..09f18a46c5a
--- /dev/null
+++ b/csharp/client/DhClientTests/DhClientTests.sln.DotSettings.user
@@ -0,0 +1,17 @@
+<wpf:ResourceDictionary xml:space="preserve" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:s="clr-namespace:System;assembly=mscorlib" xmlns:ss="urn:shemas-jetbrains-com:settings-storage-xaml" xmlns:wpf="http://schemas.microsoft.com/winfx/2006/xaml/presentation">
+	<s:String x:Key="/Default/Environment/UnitTesting/UnitTestSessionStore/Sessions/=355855d1_002Dccc1_002D49c1_002D97ce_002Dec4208bb3a62/@EntryIndexedValue">&lt;SessionState ContinuousTestingMode="0" IsActive="True" Name="TestAdd" xmlns="urn:schemas-jetbrains-com:jetbrains-ut-session"&gt;&#xD;
+  &lt;TestAncestor&gt;&#xD;
+    &lt;TestId&gt;xUnit::3C5EE5FF-3DB8-42FF-B8CA-675F63929F51::net7.0::Deephaven.DhClientTests.BasicInteropTest.TestAdd&lt;/TestId&gt;&#xD;
+    &lt;TestId&gt;xUnit::3C5EE5FF-3DB8-42FF-B8CA-675F63929F51::net7.0::Deephaven.DhClientTests.BasicInteropTest.TestConcat&lt;/TestId&gt;&#xD;
+    &lt;TestId&gt;xUnit::3C5EE5FF-3DB8-42FF-B8CA-675F63929F51::net7.0::Deephaven.DhClientTests.BasicInteropTest.TestArrayRunningSum&lt;/TestId&gt;&#xD;
+    &lt;TestId&gt;xUnit::3C5EE5FF-3DB8-42FF-B8CA-675F63929F51::net7.0::Deephaven.DhClientTests.BasicInteropTest.TestArrayElementConcat&lt;/TestId&gt;&#xD;
+    &lt;TestId&gt;xUnit::3C5EE5FF-3DB8-42FF-B8CA-675F63929F51::net7.0::Deephaven.DhClientTests.BasicInteropTest.TestBasicStruct&lt;/TestId&gt;&#xD;
+    &lt;TestId&gt;xUnit::3C5EE5FF-3DB8-42FF-B8CA-675F63929F51::net7.0::Deephaven.DhClientTests.SelectTest.TestSupportAllTypes&lt;/TestId&gt;&#xD;
+    &lt;TestId&gt;xUnit::3C5EE5FF-3DB8-42FF-B8CA-675F63929F51::net7.0::Deephaven.DhClientTests.SelectTest.TestSimpleWhere&lt;/TestId&gt;&#xD;
+    &lt;TestId&gt;xUnit::3C5EE5FF-3DB8-42FF-B8CA-675F63929F51::net7.0::Deephaven.DhClientTests.SelectTest.TestSelectAFewColumns&lt;/TestId&gt;&#xD;
+    &lt;TestId&gt;xUnit::3C5EE5FF-3DB8-42FF-B8CA-675F63929F51::net7.0::Deephaven.DhClientTests.UngroupTest.UngroupColumns&lt;/TestId&gt;&#xD;
+    &lt;TestId&gt;xUnit::3C5EE5FF-3DB8-42FF-B8CA-675F63929F51::net7.0::Deephaven.DhClientTests.TickingTest.AllEventuallyGreaterThan10&lt;/TestId&gt;&#xD;
+    &lt;TestId&gt;xUnit::3C5EE5FF-3DB8-42FF-B8CA-675F63929F51::net7.0::Deephaven.DhClientTests.TickingTest.AllDataEventuallyPresent&lt;/TestId&gt;&#xD;
+    &lt;TestId&gt;xUnit::3C5EE5FF-3DB8-42FF-B8CA-675F63929F51::net7.0::Deephaven.DhClientTests.TickingTest.wtf&lt;/TestId&gt;&#xD;
+  &lt;/TestAncestor&gt;&#xD;
+&lt;/SessionState&gt;</s:String></wpf:ResourceDictionary>
\ No newline at end of file
diff --git a/csharp/client/DhClientTests/FilterTest.cs b/csharp/client/DhClientTests/FilterTest.cs
new file mode 100644
index 00000000000..64c032020d2
--- /dev/null
+++ b/csharp/client/DhClientTests/FilterTest.cs
@@ -0,0 +1,39 @@
+using Deephaven.DeephavenClient.Interop;
+using System;
+using Deephaven.DeephavenClient;
+using Deephaven.DeephavenClient.Utility;
+using Xunit.Abstractions;
+
+namespace Deephaven.DhClientTests;
+
+public class FilterTest {
+  private readonly ITestOutputHelper _output;
+
+  public FilterTest(ITestOutputHelper output) {
+    _output = output;
+  }
+
+  [Fact]
+  public void TestFilterATable() {
+    using var ctx = CommonContextForTests.Create(new ClientOptions());
+    var table = ctx.TestTable;
+
+    var t1 = table.Where(
+      "ImportDate == `2017-11-01` && Ticker == `AAPL` && (Close <= 120.0 || isNull(Close))");
+    _output.WriteLine(t1.ToString(true));
+
+    var importDateData = new[] { "2017-11-01", "2017-11-01", "2017-11-01"};
+    var tickerData = new []{ "AAPL", "AAPL", "AAPL"};
+    var openData = new[] { 22.1, 26.8, 31.5 };
+    var closeData = new[] { 23.5, 24.2, 26.7 };
+    var volData = new Int64[] { 100000, 250000, 19000 };
+
+    var tc = new TableComparer();
+    tc.AddColumn("ImportDate", importDateData);
+    tc.AddColumn("Ticker", tickerData);
+    tc.AddColumn("Open", openData);
+    tc.AddColumn("Close", closeData);
+    tc.AddColumn("Volume", volData);
+    tc.AssertEqualTo(t1);
+  }
+}
diff --git a/csharp/client/DhClientTests/GlobalUsings.cs b/csharp/client/DhClientTests/GlobalUsings.cs
new file mode 100644
index 00000000000..8c927eb747a
--- /dev/null
+++ b/csharp/client/DhClientTests/GlobalUsings.cs
@@ -0,0 +1 @@
+global using Xunit;
\ No newline at end of file
diff --git a/csharp/client/DhClientTests/HeadAndTailTest.cs b/csharp/client/DhClientTests/HeadAndTailTest.cs
new file mode 100644
index 00000000000..6b7b06af16c
--- /dev/null
+++ b/csharp/client/DhClientTests/HeadAndTailTest.cs
@@ -0,0 +1,44 @@
+using Deephaven.DeephavenClient.Interop;
+using Deephaven.DeephavenClient;
+using Xunit.Abstractions;
+
+namespace Deephaven.DhClientTests;
+
+public class HeadAndTailTest {
+  private readonly ITestOutputHelper _output;
+
+  public HeadAndTailTest(ITestOutputHelper output) {
+    _output = output;
+  }
+
+  [Fact]
+  public void TestHeadAndTail() {
+    using var ctx = CommonContextForTests.Create(new ClientOptions());
+    var table = ctx.TestTable;
+
+    table = table.Where("ImportDate == `2017-11-01`");
+
+    var th = table.Head(2).Select("Ticker", "Volume");
+    var tt = table.Tail(2).Select("Ticker", "Volume");
+
+    {
+      var tickerData = new[] { "XRX", "XRX" };
+      var volumeData = new Int64[] { 345000, 87000 };
+      var tc = new TableComparer();
+
+      tc.AddColumn("Ticker", tickerData);
+      tc.AddColumn("Volume", volumeData);
+      tc.AssertEqualTo(th);
+    }
+
+    {
+      var tickerData = new[] { "ZNGA", "ZNGA" };
+      var volumeData = new Int64[] { 46123, 48300 };
+      var tc = new TableComparer();
+
+      tc.AddColumn("Ticker", tickerData);
+      tc.AddColumn("Volume", volumeData);
+      tc.AssertEqualTo(tt);
+    }
+  }
+}
diff --git a/csharp/client/DhClientTests/InputTableTest.cs b/csharp/client/DhClientTests/InputTableTest.cs
new file mode 100644
index 00000000000..2f8f8cd6fa7
--- /dev/null
+++ b/csharp/client/DhClientTests/InputTableTest.cs
@@ -0,0 +1,81 @@
+using Deephaven.DeephavenClient;
+using Xunit.Abstractions;
+
+namespace Deephaven.DhClientTests;
+
+public class InputTableTest {
+  private readonly ITestOutputHelper _output;
+
+  public InputTableTest(ITestOutputHelper output) {
+    _output = output;
+  }
+
+  [Fact]
+  public void TestInputTableAppend() {
+    using var ctx = CommonContextForTests.Create(new ClientOptions());
+    var tm = ctx.Client.Manager;
+
+    var source = tm.EmptyTable(3).Update("A = ii", "B = ii + 100");
+    // No keys, so InputTable will be in append-only mode.
+    var inputTable = tm.InputTable(source);
+
+    // expect inputTable to be {0, 100}, {1, 101}, {2, 102}
+    {
+      var aData = new Int64[] { 0, 1, 2 };
+      var bData = new Int64[] { 100, 101, 102 };
+      var tc = new TableComparer();
+      tc.AddColumn("A", aData);
+      tc.AddColumn("B", bData);
+      tc.AssertEqualTo(inputTable);
+    }
+
+    var tableToAdd = tm.EmptyTable(2).Update("A = ii", "B = ii + 200");
+    inputTable.AddTable(tableToAdd);
+
+    // Because of append, expect input_table to be {0, 100}, {1, 101}, {2, 102}, {0, 200}, {1, 201}
+    {
+      var aData = new Int64[] { 0, 1, 2, 0, 1 };
+      var bData = new Int64[] { 100, 101, 102, 200, 201 };
+      var tc = new TableComparer();
+      tc.AddColumn("A", aData);
+      tc.AddColumn("B", bData);
+      tc.AssertEqualTo(inputTable);
+    }
+  }
+
+
+  [Fact]
+  public void TestInputTableKeyed() {
+    using var ctx = CommonContextForTests.Create(new ClientOptions());
+    var tm = ctx.Client.Manager;
+
+    var source = tm.EmptyTable(3).Update("A = ii", "B = ii + 100");
+    // Keys = {"A"}, so InputTable will be in keyed mode
+    var inputTable = tm.InputTable(source, "A");
+
+
+    // expect input_table to be {0, 100}, {1, 101}, {2, 102}
+    {
+      var aData = new Int64[] { 0, 1, 2 };
+      var bData = new Int64[] { 100, 101, 102 };
+      var tc = new TableComparer();
+      tc.AddColumn("A", aData);
+      tc.AddColumn("B", bData);
+      tc.AssertEqualTo(inputTable);
+    }
+
+
+    var tableToAdd = tm.EmptyTable(2).Update("A = ii", "B = ii + 200");
+    inputTable.AddTable(tableToAdd);
+
+    // Because key is "A", expect input_table to be {0, 200}, {1, 201}, {2, 102}
+    {
+      var aData = new Int64[] { 0, 1, 2 };
+      var bData = new Int64[] { 200, 201, 102 };
+      var tc = new TableComparer();
+      tc.AddColumn("A", aData);
+      tc.AddColumn("B", bData);
+      tc.AssertEqualTo(inputTable);
+    }
+  }
+}
diff --git a/csharp/client/DhClientTests/JoinTest.cs b/csharp/client/DhClientTests/JoinTest.cs
new file mode 100644
index 00000000000..f889a3b53db
--- /dev/null
+++ b/csharp/client/DhClientTests/JoinTest.cs
@@ -0,0 +1,200 @@
+using Deephaven.DeephavenClient;
+using Deephaven.DeephavenClient.Utility;
+using System;
+using Xunit.Abstractions;
+
+namespace Deephaven.DhClientTests;
+
+public class JoinTest {
+  private readonly ITestOutputHelper _output;
+
+  public JoinTest(ITestOutputHelper output) {
+    _output = output;
+  }
+
+  [Fact]
+  public void TestJoin() {
+    using var ctx = CommonContextForTests.Create(new ClientOptions());
+    var tm = ctx.Client.Manager;
+    var testTable = ctx.TestTable;
+
+    using var table = testTable.Where("ImportDate == `2017-11-01`");
+    using var lastClose = table.LastBy("Ticker");
+    using var avgView = table.View("Ticker", "Volume").AvgBy("Ticker");
+
+    using var joined = lastClose.NaturalJoin(avgView, new[] {"Ticker"}, new[]{ "ADV = Volume"});
+    using var filtered = joined.Select("Ticker", "Close", "ADV");
+
+    var tickerData = new[] { "XRX", "XYZZY", "IBM", "GME", "AAPL", "ZNGA" };
+    var closeData = new[] { 53.8, 88.5, 38.7, 453, 26.7, 544.9 };
+    var advData = new[] { 216000, 6060842, 138000, 138000000, 123000, 47211.50 };
+
+    var tc = new TableComparer();
+    tc.AddColumn("Ticker", tickerData);
+    tc.AddColumn("Close", closeData);
+    tc.AddColumn("ADV", advData);
+    tc.AssertEqualTo(filtered);
+  }
+
+  [Fact]
+  public void TestAj() {
+    using var ctx = CommonContextForTests.Create(new ClientOptions());
+    var tm = ctx.Client.Manager;
+
+    TableHandle trades;
+    {
+      var tickerData = new[] { "AAPL", "AAPL", "AAPL", "IBM", "IBM" };
+      var instantDdata = new[] {
+        DhDateTime.Parse("2021-04-05T09:10:00-0500"),
+        DhDateTime.Parse("2021-04-05T09:31:00-0500"),
+        DhDateTime.Parse("2021-04-05T16:00:00-0500"),
+        DhDateTime.Parse("2021-04-05T16:00:00-0500"),
+        DhDateTime.Parse("2021-04-05T16:30:00-0500")
+      };
+      var priceData = new[] { 2.5, 3.7, 3.0, 100.50, 110 };
+      var sizeData = new[] { 52, 14, 73, 11, 6 };
+      using var tableMaker = new TableMaker();
+      tableMaker.AddColumn("Ticker", tickerData);
+      tableMaker.AddColumn("Timestamp", instantDdata);
+      tableMaker.AddColumn("Price", priceData);
+      tableMaker.AddColumn("Size", sizeData);
+      trades = tableMaker.MakeTable(tm);
+    }
+
+    TableHandle quotes;
+    {
+      var tickerData = new[] { "AAPL", "AAPL", "IBM", "IBM", "IBM" };
+      var timeStampData = new[] {
+        DhDateTime.Parse("2021-04-05T09:11:00-0500"),
+        DhDateTime.Parse("2021-04-05T09:30:00-0500"),
+        DhDateTime.Parse("2021-04-05T16:00:00-0500"),
+        DhDateTime.Parse("2021-04-05T16:30:00-0500"),
+        DhDateTime.Parse("2021-04-05T17:00:00-0500")
+      };
+      var bidData = new[] { 2.5, 3.4, 97, 102, 108 };
+      var bidSizeData = new[] { 10, 20, 5, 13, 23 };
+      var askData = new[] { 2.5, 3.4, 105, 110, 111 };
+      var askSizeData = new[] { 83, 33, 47, 15, 5 };
+      var tableMaker = new TableMaker();
+      tableMaker.AddColumn("Ticker", tickerData);
+      tableMaker.AddColumn("Timestamp", timeStampData);
+      tableMaker.AddColumn("Bid", bidData);
+      tableMaker.AddColumn("BidSize", bidSizeData);
+      tableMaker.AddColumn("Ask", askData);
+      tableMaker.AddColumn("AskSize", askSizeData);
+      quotes = tableMaker.MakeTable(tm);
+    }
+
+    using var result = trades.Aj(quotes, new[] { "Ticker", "Timestamp" });
+
+    // Expected data
+    {
+      var tickerData = new[] { "AAPL", "AAPL", "AAPL", "IBM", "IBM" };
+      var timestampData = new[] {
+        DhDateTime.Parse("2021-04-05T09:10:00-0500"),
+        DhDateTime.Parse("2021-04-05T09:31:00-0500"),
+        DhDateTime.Parse("2021-04-05T16:00:00-0500"),
+        DhDateTime.Parse("2021-04-05T16:00:00-0500"),
+        DhDateTime.Parse("2021-04-05T16:30:00-0500")
+      };
+      var priceData = new[] { 2.5, 3.7, 3.0, 100.50, 110 };
+      var sizeData = new[] { 52, 14, 73, 11, 6 };
+      var bidData = new double?[] { null, 3.4, 3.4, 97, 102 };
+      var bidSizeData = new int?[] { null, 20, 20, 5, 13 };
+      var askData = new double?[] { null, 3.4, 3.4, 105, 110 };
+      var askSizeData = new int?[] { null, 33, 33, 47, 15 };
+
+      var tc = new TableComparer();
+      tc.AddColumn("Ticker", tickerData);
+      tc.AddColumn("Timestamp", timestampData);
+      tc.AddColumn("Price", priceData);
+      tc.AddColumn("Size", sizeData);
+      tc.AddColumn("Bid", bidData);
+      tc.AddColumn("BidSize", bidSizeData);
+      tc.AddColumn("Ask", askData);
+      tc.AddColumn("AskSize", askSizeData);
+      tc.AssertEqualTo(result);
+    }
+  }
+
+  [Fact]
+  public void TestRaj() {
+    using var ctx = CommonContextForTests.Create(new ClientOptions());
+    var tm = ctx.Client.Manager;
+
+    TableHandle trades;
+    {
+      var tickerData = new[] { "AAPL", "AAPL", "AAPL", "IBM", "IBM" };
+      var instantData = new[] {
+        DhDateTime.Parse("2021-04-05T09:10:00-0500"),
+        DhDateTime.Parse("2021-04-05T09:31:00-0500"),
+        DhDateTime.Parse("2021-04-05T16:00:00-0500"),
+        DhDateTime.Parse("2021-04-05T16:00:00-0500"),
+        DhDateTime.Parse("2021-04-05T16:30:00-0500")
+      };
+      var priceData = new[] { 2.5, 3.7, 3.0, 100.50, 110 };
+      var sizeData = new[] { 52, 14, 73, 11, 6 };
+      var tableMaker = new TableMaker();
+      tableMaker.AddColumn("Ticker", tickerData);
+      tableMaker.AddColumn("Timestamp", instantData);
+      tableMaker.AddColumn("Price", priceData);
+      tableMaker.AddColumn("Size", sizeData);
+      trades = tableMaker.MakeTable(tm);
+    }
+
+    TableHandle quotes;
+    {
+      var tickerData = new[] { "AAPL", "AAPL", "IBM", "IBM", "IBM"};
+      var timestampData = new[] {
+        DhDateTime.Parse("2021-04-05T09:11:00-0500"),
+        DhDateTime.Parse("2021-04-05T09:30:00-0500"),
+        DhDateTime.Parse("2021-04-05T16:00:00-0500"),
+        DhDateTime.Parse("2021-04-05T16:30:00-0500"),
+        DhDateTime.Parse("2021-04-05T17:00:00-0500")
+      };
+      var bidData = new[] { 2.5, 3.4, 97, 102, 108 };
+      var bidSizeData = new[] { 10, 20, 5, 13, 23 };
+      var askData = new[] { 2.5, 3.4, 105, 110, 111 };
+      var askSizeData = new[] { 83, 33, 47, 15, 5 };
+      var tableMaker = new TableMaker();
+      tableMaker.AddColumn("Ticker", tickerData);
+      tableMaker.AddColumn("Timestamp", timestampData);
+      tableMaker.AddColumn("Bid", bidData);
+      tableMaker.AddColumn("BidSize", bidSizeData);
+      tableMaker.AddColumn("Ask", askData);
+      tableMaker.AddColumn("AskSize", askSizeData);
+      quotes = tableMaker.MakeTable(tm);
+    }
+
+    var result = trades.Raj(quotes, new[] { "Ticker", "Timestamp"});
+
+    // Expected data
+    {
+      var tickerData = new[] { "AAPL", "AAPL", "AAPL", "IBM", "IBM"};
+      var timestampData = new[] {
+        DhDateTime.Parse("2021-04-05T09:10:00-0500"),
+        DhDateTime.Parse("2021-04-05T09:31:00-0500"),
+        DhDateTime.Parse("2021-04-05T16:00:00-0500"),
+        DhDateTime.Parse("2021-04-05T16:00:00-0500"),
+        DhDateTime.Parse("2021-04-05T16:30:00-0500")
+      };
+
+      var priceData = new[] { 2.5, 3.7, 3.0, 100.50, 110 };
+      var sizeData = new[] { 52, 14, 73, 11, 6 };
+      var bidData = new double?[] { 2.5, null, null, 97, 102 };
+      var bidSizeData = new int?[] { 10, null, null, 5, 13 };
+      var askData = new double?[] { 2.5, null, null, 105, 110 };
+      var askSizeData = new int?[] { 83, null, null, 47, 15 };
+      var tableComparer = new TableComparer();
+      tableComparer.AddColumn("Ticker", tickerData);
+      tableComparer.AddColumn("Timestamp", timestampData);
+      tableComparer.AddColumn("Price", priceData);
+      tableComparer.AddColumn("Size", sizeData);
+      tableComparer.AddColumn("Bid", bidData);
+      tableComparer.AddColumn("BidSize", bidSizeData);
+      tableComparer.AddColumn("Ask", askData);
+      tableComparer.AddColumn("AskSize", askSizeData);
+      tableComparer.AssertEqualTo(result);
+    }
+  }
+}
diff --git a/csharp/client/DhClientTests/LastByTest.cs b/csharp/client/DhClientTests/LastByTest.cs
new file mode 100644
index 00000000000..179d52b535f
--- /dev/null
+++ b/csharp/client/DhClientTests/LastByTest.cs
@@ -0,0 +1,35 @@
+using Deephaven.DeephavenClient;
+using Xunit.Abstractions;
+
+namespace Deephaven.DhClientTests;
+
+public class LastByTest {
+  private readonly ITestOutputHelper _output;
+
+  public LastByTest(ITestOutputHelper output) {
+    _output = output;
+  }
+
+  [Fact]
+  public void TestLastBy() {
+    using var ctx = CommonContextForTests.Create(new ClientOptions());
+    var tm = ctx.Client.Manager;
+    var testTable = ctx.TestTable;
+
+    using var lb = testTable.Where("ImportDate == `2017-11-01`")
+      .Select("Ticker", "Open", "Close")
+      .LastBy("Ticker");
+
+    var tickerData = new[] {
+      "XRX", "XYZZY", "IBM", "GME", "AAPL", "ZNGA"
+    };
+
+    var openData = new[] { 50.5, 92.3, 40.1, 681.43, 31.5, 685.3 };
+    var closeData = new[] { 53.8, 88.5, 38.7, 453, 26.7, 544.9 };
+    var tc = new TableComparer();
+    tc.AddColumn("Ticker", tickerData);
+    tc.AddColumn("Open", openData);
+    tc.AddColumn("Close", closeData);
+    tc.AssertEqualTo(lb);
+  }
+}
diff --git a/csharp/client/DhClientTests/MergeTest.cs b/csharp/client/DhClientTests/MergeTest.cs
new file mode 100644
index 00000000000..2e45f6f48b0
--- /dev/null
+++ b/csharp/client/DhClientTests/MergeTest.cs
@@ -0,0 +1,35 @@
+using Deephaven.DeephavenClient;
+
+namespace Deephaven.DhClientTests;
+
+public class MergeTest {
+  [Fact]
+  public void TestMerge() {
+    using var ctx = CommonContextForTests.Create(new ClientOptions());
+    var testTable = ctx.TestTable;
+
+    using var table = testTable.Where("ImportDate == `2017-11-01`");
+
+    // Run a merge by fetching two tables and them merging them
+    var aaplTable = table.Where("Ticker == `AAPL`").Tail(10);
+    var zngaTable = table.Where("Ticker == `ZNGA`").Tail(10);
+
+    var merged = aaplTable.Merge(new[] { zngaTable} );
+
+    var importDateData = new[] {
+      "2017-11-01", "2017-11-01", "2017-11-01",
+      "2017-11-01", "2017-11-01"};
+    var tickerData = new[] { "AAPL", "AAPL", "AAPL", "ZNGA", "ZNGA"};
+    var openData = new[] { 22.1, 26.8, 31.5, 541.2, 685.3 };
+    var closeData = new[] { 23.5, 24.2, 26.7, 538.2, 544.9 };
+    var volData = new Int64[] { 100000, 250000, 19000, 46123, 48300 };
+
+    var tc = new TableComparer();
+    tc.AddColumn("ImportDate", importDateData);
+    tc.AddColumn("Ticker", tickerData);
+    tc.AddColumn("Open", openData);
+    tc.AddColumn("Close", closeData);
+    tc.AddColumn("Volume", volData);
+    tc.AssertEqualTo(merged);
+  }
+}
\ No newline at end of file
diff --git a/csharp/client/DhClientTests/ScriptTest.cs b/csharp/client/DhClientTests/ScriptTest.cs
new file mode 100644
index 00000000000..3734d04d105
--- /dev/null
+++ b/csharp/client/DhClientTests/ScriptTest.cs
@@ -0,0 +1,44 @@
+using Deephaven.DeephavenClient;
+
+namespace Deephaven.DhClientTests;
+
+public class ScriptTest {
+  [Fact]
+  public void TestScriptSessionError() {
+    using var ctx = CommonContextForTests.Create(new ClientOptions().SetSessionType(""));
+    var m = ctx.Client.Manager;
+    const string script = "from deephaven import empty_table";
+    var ex = Record.Exception(() => m.RunScript(script));
+    Assert.NotNull(ex);
+    Assert.Contains("Client was created without specifying a script language", ex.Message);
+  }
+
+  [Fact]
+  public void TestScriptExecution() {
+    var intData = new List<Int32>();
+    var longData = new List<Int64>();
+
+    const int startValue = -8;
+    const int endValue = 8;
+    for (var i = startValue; i != endValue; ++i) {
+      intData.Add(i);
+      longData.Add(i * 100);
+    }
+
+    using var ctx = CommonContextForTests.Create(new ClientOptions());
+    var m = ctx.Client.Manager;
+
+    const string script = """
+      from deephaven import empty_table
+      mytable = empty_table(16).update(["intData = (int)(ii - 8)", "longData = (long)((ii - 8) * 100)"])
+      """;
+
+    m.RunScript(script);
+    var t = m.FetchTable("mytable");
+
+    var tc = new TableComparer();
+    tc.AddColumn("intData", intData);
+    tc.AddColumn("longData", longData);
+    tc.AssertEqualTo(t);
+  }
+}
diff --git a/csharp/client/DhClientTests/SelectTest.cs b/csharp/client/DhClientTests/SelectTest.cs
new file mode 100644
index 00000000000..2bfe28245a9
--- /dev/null
+++ b/csharp/client/DhClientTests/SelectTest.cs
@@ -0,0 +1,313 @@
+using Deephaven.DeephavenClient.Interop;
+using System;
+using Deephaven.DeephavenClient;
+using Deephaven.DeephavenClient.Utility;
+using Xunit.Abstractions;
+
+namespace Deephaven.DhClientTests;
+
+public class SelectTest {
+  private readonly ITestOutputHelper _output;
+
+  public SelectTest(ITestOutputHelper output) {
+    _output = output;
+  }
+
+  [Fact]
+  public void TestSupportAllTypes() {
+    using var ctx = CommonContextForTests.Create(new ClientOptions());
+
+    var boolData = new List<bool>();
+    var charData = new List<char>();
+    var byteData = new List<sbyte>();
+    var shortData = new List<short>();
+    var intData = new List<int>();
+    var longData = new List<long>();
+    var floatData = new List<float>();
+    var doubleData = new List<double>();
+    var stringData = new List<string>();
+    var dateTimeData = new List<DhDateTime>();
+
+    const int startValue = -8;
+    const int endValue = 8;
+    for (var i = startValue; i != endValue; ++i) {
+      boolData.Add((i % 2) == 0);
+      charData.Add((char)(i * 10));
+      byteData.Add((sbyte)(i * 11));
+      shortData.Add((short)(i * 1000));
+      intData.Add(i * 1_000_000);
+      longData.Add(i * (long)1_000_000_000);
+      floatData.Add(i * 123.456F);
+      doubleData.Add(i * 987654.321);
+      stringData.Add($"test {i}");
+      dateTimeData.Add(DhDateTime.FromNanos(i));
+    }
+
+    using var maker = new TableMaker();
+    maker.AddColumn("boolData", boolData);
+    maker.AddColumn("charData", charData);
+    maker.AddColumn("byteData", byteData);
+    maker.AddColumn("shortData", shortData);
+    maker.AddColumn("intData", intData);
+    maker.AddColumn("longData", longData);
+    maker.AddColumn("floatData", floatData);
+    maker.AddColumn("doubleData", doubleData);
+    maker.AddColumn("stringData", stringData);
+    maker.AddColumn("dateTimeData", dateTimeData);
+
+    var t = maker.MakeTable(ctx.Client.Manager);
+
+    _output.WriteLine(t.ToString(true));
+
+    var tc = new TableComparer();
+    tc.AddColumn("boolData", boolData);
+    tc.AddColumn("charData", charData);
+    tc.AddColumn("byteData", byteData);
+    tc.AddColumn("shortData", shortData);
+    tc.AddColumn("intData", intData);
+    tc.AddColumn("longData", longData);
+    tc.AddColumn("floatData", floatData);
+    tc.AddColumn("doubleData", doubleData);
+    tc.AddColumn("stringData", stringData);
+    tc.AddColumn("dateTimeData", dateTimeData);
+    tc.AssertEqualTo(t);
+  }
+
+  [Fact]
+  public void TestCreateUpdateFetchATable() {
+    using var ctx = CommonContextForTests.Create(new ClientOptions());
+
+    var intData = new[] { 0, 1, 2, 3, 4, 5, 6, 7, 8, 9 };
+    var doubleData = new[] { 0.0, 1.1, 2.2, 3.3, 4.4, 5.5, 6.6, 7.7, 8.8, 9.9 };
+    var stringData = new[] {
+      "zero", "one", "two", "three", "four", "five", "six", "seven",
+      "eight", "nine"
+    };
+
+    using var maker = new TableMaker();
+    maker.AddColumn("IntValue", intData);
+    maker.AddColumn("DoubleValue", doubleData);
+    maker.AddColumn("StringValue", stringData);
+    var t = maker.MakeTable(ctx.Client.Manager);
+    var t2 = t.Update("Q2 = IntValue * 100");
+    var t3 = t2.Update("Q3 = Q2 + 10");
+    var t4 = t3.Update("Q4 = Q2 + 100");
+
+    var q2Data = new[] { 0, 100, 200, 300, 400, 500, 600, 700, 800, 900 };
+    var q3Data = new[] { 10, 110, 210, 310, 410, 510, 610, 710, 810, 910 };
+    var q4Data = new[] { 100, 200, 300, 400, 500, 600, 700, 800, 900, 1000 };
+
+    var tc = new TableComparer();
+    tc.AddColumn("IntValue", intData);
+    tc.AddColumn("DoubleValue", doubleData);
+    tc.AddColumn("StringValue", stringData);
+    tc.AddColumn("Q2", q2Data);
+    tc.AddColumn("Q3", q3Data);
+    tc.AddColumn("Q4", q4Data);
+    tc.AssertEqualTo(t4);
+  }
+
+  [Fact]
+  public void TestSelectAFewColumns() {
+    using var ctx = CommonContextForTests.Create(new ClientOptions());
+    var table = ctx.TestTable;
+
+    var t1 = table.Where("ImportDate == `2017-11-01` && Ticker == `AAPL`")
+      .Select("Ticker", "Close", "Volume")
+      .Head(2);
+
+    var tickerData = new[] { "AAPL", "AAPL" };
+    var closeData = new[] { 23.5, 24.2 };
+    var volData = new Int64[] { 100000, 250000 };
+
+    var tc = new TableComparer();
+    tc.AddColumn("Ticker", tickerData);
+    tc.AddColumn("Close", closeData);
+    tc.AddColumn("Volume", volData);
+    tc.AssertEqualTo(t1);
+  }
+
+  [Fact]
+  public void TestLastByAndSelect() {
+    using var ctx = CommonContextForTests.Create(new ClientOptions());
+    var table = ctx.TestTable;
+
+    var t1 = table.Where("ImportDate == `2017-11-01` && Ticker == `AAPL`")
+      .LastBy("Ticker")
+      .Select("Ticker", "Close", "Volume");
+    _output.WriteLine(t1.ToString(true));
+
+    var tickerData = new[] { "AAPL" };
+    var closeData = new[] { 26.7 };
+    var volData = new Int64[] { 19000 };
+
+    var tc = new TableComparer();
+    tc.AddColumn("Ticker", tickerData);
+    tc.AddColumn("Close", closeData);
+    tc.AddColumn("Volume", volData);
+    tc.AssertEqualTo(t1);
+  }
+
+  [Fact]
+  public void TestNewColumns() {
+    using var ctx = CommonContextForTests.Create(new ClientOptions());
+    var table = ctx.TestTable;
+
+    // A formula expression
+    var t1 = table.Where("ImportDate == `2017-11-01` && Ticker == `AAPL`")
+      .Select("MV1 = Volume * Close", "V_plus_12 = Volume + 12");
+
+    var mv1Data = new double[] { 2350000, 6050000, 507300 };
+    var vp2Data = new long[] { 100012, 250012, 19012 };
+
+    var tc = new TableComparer();
+    tc.AddColumn("MV1", mv1Data);
+    tc.AddColumn("V_plus_12", vp2Data);
+    tc.AssertEqualTo(t1);
+  }
+
+  [Fact]
+  public void TestDropColumns() {
+    using var ctx = CommonContextForTests.Create(new ClientOptions());
+    var table = ctx.TestTable;
+
+    var t1 = table.DropColumns("ImportDate", "Open", "Close");
+    Assert.Equal(5, table.Schema.NumCols);
+    Assert.Equal(2, t1.Schema.NumCols);
+  }
+
+  [Fact]
+  public void TestSimpleWhere() {
+    using var ctx = CommonContextForTests.Create(new ClientOptions());
+    var table = ctx.TestTable;
+    var updated = table.Update("QQQ = i");
+
+    var t1 = updated.Where("ImportDate == `2017-11-01` && Ticker == `IBM`")
+      .Select("Ticker", "Volume");
+
+    var tickerData = new[] { "IBM" };
+    var volData = new Int64[] { 138000 };
+
+    var tc = new TableComparer();
+    tc.AddColumn("Ticker", tickerData);
+    tc.AddColumn("Volume", volData);
+    tc.AssertEqualTo(t1);
+  }
+
+  [Fact]
+  public void TestFormulaInTheWhereClause() {
+    using var ctx = CommonContextForTests.Create(new ClientOptions());
+    var table = ctx.TestTable;
+
+    var t1 = table.Where(
+        "ImportDate == `2017-11-01` && Ticker == `AAPL` && Volume % 10 == Volume % 100")
+      .Select("Ticker", "Volume");
+    _output.WriteLine(t1.ToString(true));
+
+    var tickerData = new[] { "AAPL", "AAPL", "AAPL" };
+    var volData = new Int64[] { 100000, 250000, 19000 };
+
+    var tc = new TableComparer();
+    tc.AddColumn("Ticker", tickerData);
+    tc.AddColumn("Volume", volData);
+    tc.AssertEqualTo(t1);
+  }
+
+  [Fact]
+  public void TestSimpleWhereWithSyntaxError() {
+    using var ctx = CommonContextForTests.Create(new ClientOptions());
+    var table = ctx.TestTable;
+
+    Assert.Throws<Exception>(() => {
+      var t1 = table.Where(")))))");
+      _output.WriteLine(t1.ToString(true));
+    });
+  }
+
+  [Fact]
+  public void TestWhereIn() {
+    using var ctx = CommonContextForTests.Create(new ClientOptions());
+
+    var letterData = new[] { "A", "C", "F", "B", "E", "D", "A" };
+    var numberData = new Int32?[] { null, 2, 1, null, 4, 5, 3 };
+    var colorData = new[] { "red", "blue", "orange", "purple", "yellow", "pink", "blue" };
+    var codeData = new Int32?[] { 12, 13, 11, null, 16, 14, null };
+
+    using var sourceMaker = new TableMaker();
+    sourceMaker.AddColumn("Letter", letterData);
+    sourceMaker.AddColumn("Number", numberData);
+    sourceMaker.AddColumn("Color", colorData);
+    sourceMaker.AddColumn("Code", codeData);
+
+    var source = sourceMaker.MakeTable(ctx.Client.Manager);
+
+    var filterColorData = new[] { "blue", "red", "purple", "white" };
+
+    using var filterMaker = new TableMaker();
+    filterMaker.AddColumn("Colors", filterColorData);
+    var filter = filterMaker.MakeTable(ctx.Client.Manager);
+
+    var result = source.WhereIn(filter, "Color = Colors");
+
+    var letterExpected = new[] { "A", "C", "B", "A" };
+    var numberExpected = new Int32?[] { null, 2, null, 3 };
+    var colorExpected = new[] { "red", "blue", "purple", "blue" };
+    var codeExpected = new Int32?[] { 12, 13, null, null };
+
+    var expected = new TableComparer();
+    expected.AddColumn("Letter", letterExpected);
+    expected.AddColumn("Number", numberExpected);
+    expected.AddColumn("Color", colorExpected);
+    expected.AddColumn("Code", codeExpected);
+
+    expected.AssertEqualTo(result);
+  }
+
+  [Fact]
+  public void TestLazyUpdate() {
+    using var ctx = CommonContextForTests.Create(new ClientOptions());
+
+    var aData = new[] { "The", "At", "Is", "On" };
+    var bData = new[] { 1, 2, 3, 4 };
+    var cData = new[] { 5, 2, 5, 5 };
+
+    using var sourceMaker = new TableMaker();
+    sourceMaker.AddColumn("A", aData);
+    sourceMaker.AddColumn("B", bData);
+    sourceMaker.AddColumn("C", cData);
+    var source = sourceMaker.MakeTable(ctx.Client.Manager);
+
+    var result = source.LazyUpdate("Y = sqrt(C)");
+
+    var sqrtData = new[] { Math.Sqrt(5), Math.Sqrt(2), Math.Sqrt(5), Math.Sqrt(5) };
+
+    var tc = new TableComparer();
+    tc.AddColumn("A", aData);
+    tc.AddColumn("B", bData);
+    tc.AddColumn("C", cData);
+    tc.AddColumn("Y", sqrtData);
+    tc.AssertEqualTo(result);
+  }
+
+  [Fact]
+  public void TestSelectDistinct() {
+    using var ctx = CommonContextForTests.Create(new ClientOptions());
+
+    var aData = new[] { "apple", "apple", "orange", "orange", "plum", "grape" };
+    var bData = new[] { 1, 1, 2, 2, 3, 3 };
+
+    using var sourceMaker = new TableMaker();
+    sourceMaker.AddColumn("A", aData);
+    sourceMaker.AddColumn("B", bData);
+    var source = sourceMaker.MakeTable(ctx.Client.Manager);
+
+    var result = source.SelectDistinct("A");
+    _output.WriteLine(result.ToString(true));
+
+    var expectedAData = new[] { "apple", "orange", "plum", "grape" };
+
+    var tc = new TableComparer();
+    tc.AddColumn("A", expectedAData);
+    tc.AssertEqualTo(result);
+  }
+}
diff --git a/csharp/client/DhClientTests/SortTest.cs b/csharp/client/DhClientTests/SortTest.cs
new file mode 100644
index 00000000000..d5fd185a7cf
--- /dev/null
+++ b/csharp/client/DhClientTests/SortTest.cs
@@ -0,0 +1,62 @@
+using Deephaven.DeephavenClient;
+using System;
+using Deephaven.DeephavenClient.Utility;
+
+namespace Deephaven.DhClientTests;
+
+public class SortTest {
+  [Fact]
+  public void SortDemoTable() {
+    using var ctx = CommonContextForTests.Create(new ClientOptions());
+    var testTable = ctx.TestTable;
+
+    // Limit by date and ticker
+    var filtered = testTable.Where("ImportDate == `2017-11-01`")
+      .Where("Ticker >= `X`")
+      .Select("Ticker", "Open", "Volume");
+
+    var table1 = filtered.Sort(SortPair.Descending("Ticker"), SortPair.Ascending("Volume"));
+
+    var tickerData = new[] { "ZNGA", "ZNGA", "XYZZY", "XRX", "XRX"};
+    var openData = new[] { 541.2, 685.3, 92.3, 50.5, 83.1 };
+    var volData = new Int64[] { 46123, 48300, 6060842, 87000, 345000 };
+
+    var tc = new TableComparer();
+    tc.AddColumn("Ticker", tickerData);
+    tc.AddColumn("Open", openData);
+    tc.AddColumn("Volume", volData);
+    tc.AssertEqualTo(table1);
+  }
+
+  [Fact]
+  public void SortTempTable() {
+    using var ctx = CommonContextForTests.Create(new ClientOptions());
+
+    var intData0 = new []{ 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15};
+    var intData1 = new []{ 0, 0, 1, 1, 2, 2, 3, 3, 4, 4, 5, 5, 6, 6, 7, 7};
+    var intData2 = new []{ 0, 0, 0, 0, 1, 1, 1, 1, 2, 2, 2, 2, 3, 3, 3, 3};
+    var intData3 = new []{ 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 1, 1, 1, 1};
+
+    var maker = new TableMaker();
+    maker.AddColumn("IntValue0", intData0);
+    maker.AddColumn("IntValue1", intData1);
+    maker.AddColumn("IntValue2", intData2);
+    maker.AddColumn("IntValue3", intData3);
+
+    var temp_table = maker.MakeTable(ctx.Client.Manager);
+
+    var sorted = temp_table.Sort(SortPair.Descending("IntValue3"), SortPair.Ascending("IntValue2"));
+
+    var sid0 = new[] { 8, 9, 10, 11, 12, 13, 14, 15, 0, 1, 2, 3, 4, 5, 6, 7};
+    var sid1 = new[] { 4, 4, 5, 5, 6, 6, 7, 7, 0, 0, 1, 1, 2, 2, 3, 3};
+    var sid2 = new[] { 2, 2, 2, 2, 3, 3, 3, 3, 0, 0, 0, 0, 1, 1, 1, 1};
+    var sid3 = new[] { 1, 1, 1, 1, 1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0};
+
+    var tc = new TableComparer();
+    tc.AddColumn("IntValue0", sid0);
+    tc.AddColumn("IntValue1", sid1);
+    tc.AddColumn("IntValue2", sid2);
+    tc.AddColumn("IntValue3", sid3);
+    tc.AssertEqualTo(sorted);
+  }
+}
diff --git a/csharp/client/DhClientTests/StringFilterTest.cs b/csharp/client/DhClientTests/StringFilterTest.cs
new file mode 100644
index 00000000000..ec8049e1079
--- /dev/null
+++ b/csharp/client/DhClientTests/StringFilterTest.cs
@@ -0,0 +1,49 @@
+using Deephaven.DeephavenClient;
+
+namespace Deephaven.DhClientTests;
+
+public class StringFilterTest {
+  [Fact]
+  public void StringFilter() {
+    using var ctx = CommonContextForTests.Create(new ClientOptions());
+    var testTable = ctx.TestTable;
+
+    var t2 = testTable.Where("ImportDate == `2017-11-01`").Select("Ticker", "Close");
+
+    {
+      var tickerData = new[] { "AAPL", "AAPL", "AAPL", "ZNGA", "ZNGA" };
+      var closeData = new[] { 23.5, 24.2, 26.7, 538.2, 544.9 };
+      TestFilter("Contains A", t2.Where("Ticker.contains(`A`)"),
+        tickerData, closeData);
+    }
+
+    {
+      var tickerData = new string[] { };
+      var closeData = new double[] { };
+      TestFilter("Starts with BL", t2.Where("Ticker.startsWith(`BL`)"),
+        tickerData, closeData);
+    }
+
+    {
+      var tickerData = new[] { "XRX", "XRX"};
+      var closeData = new[] { 88.2, 53.8 };
+      TestFilter("Ends with X", t2.Where("Ticker.endsWith(`X`)"),
+        tickerData, closeData);
+    }
+
+    {
+      var tickerData = new[] { "IBM" };
+      var closeData = new[] { 38.7 };
+      TestFilter("Matches ^I.*M$", t2.Where("Ticker.matches(`^I.*M$`)"),
+        tickerData, closeData);
+    }
+  }
+
+  private static void TestFilter(string description, TableHandle filteredTable,
+    string[] tickerData, double[] closeData) {
+    var tc = new TableComparer();
+    tc.AddColumn("Ticker", tickerData);
+    tc.AddColumn("Close", closeData);
+    tc.AssertEqualTo(filteredTable);
+  }
+}
diff --git a/csharp/client/DhClientTests/TableHandleAttributesTest.cs b/csharp/client/DhClientTests/TableHandleAttributesTest.cs
new file mode 100644
index 00000000000..47eb8d4f868
--- /dev/null
+++ b/csharp/client/DhClientTests/TableHandleAttributesTest.cs
@@ -0,0 +1,40 @@
+using Deephaven.DeephavenClient;
+using Xunit.Abstractions;
+
+namespace Deephaven.DhClientTests;
+
+public class TableHandleAttributesTest {
+  private readonly ITestOutputHelper _output;
+
+  public TableHandleAttributesTest(ITestOutputHelper output) {
+    _output = output;
+  }
+
+  [Fact]
+  public void TableHandleAttributes() {
+    using var ctx = CommonContextForTests.Create(new ClientOptions());
+    var thm = ctx.Client.Manager;
+    const Int64 numRows = 37;
+    var t = thm.EmptyTable(numRows).Update("II = ii");
+    Assert.Equal(numRows, t.NumRows);
+    Assert.True(t.IsStatic);
+  }
+
+  [Fact]
+  public void TableHandleDynamicAttributes() {
+    using var ctx = CommonContextForTests.Create(new ClientOptions());
+    var thm = ctx.Client.Manager;
+    var t = thm.TimeTable(1_000_000_000).Update("II = ii");
+    Assert.False(t.IsStatic);
+  }
+
+  [Fact]
+  public void TableHandleCreatedByDoPut() {
+    using var ctx = CommonContextForTests.Create(new ClientOptions());
+    var table = ctx.TestTable;
+    Assert.True(table.IsStatic);
+    // The columns all have the same size, so look at the source data for any one of them and get its size
+    var expectedSize = ctx.ColumnData.ImportDate.Length;
+    Assert.Equal(expectedSize, table.NumRows);
+  }
+}
diff --git a/csharp/client/DhClientTests/TableTest.cs b/csharp/client/DhClientTests/TableTest.cs
new file mode 100644
index 00000000000..ccb3344f847
--- /dev/null
+++ b/csharp/client/DhClientTests/TableTest.cs
@@ -0,0 +1,80 @@
+using Deephaven.DeephavenClient;
+using Deephaven.DeephavenClient.Utility;
+using System;
+using Xunit.Abstractions;
+
+namespace Deephaven.DhClientTests;
+
+public class TableTest {
+  [Fact]
+  public void FetchTheWholeTable() {
+    const int target = 10;
+    using var ctx = CommonContextForTests.Create(new ClientOptions());
+    var thm = ctx.Client.Manager;
+    var th = thm.EmptyTable(target)
+      .Update(
+        "Chars = ii == 5 ? null : (char)('a' + ii)",
+        "Bytes = ii == 5 ? null : (byte)(ii)",
+        "Shorts = ii == 5 ? null : (short)(ii)",
+        "Ints = ii == 5 ? null : (int)(ii)",
+        "Longs = ii == 5 ? null : (long)(ii)",
+        "Floats = ii == 5 ? null : (float)(ii)",
+        "Doubles = ii == 5 ? null : (double)(ii)",
+        "Bools = ii == 5 ? null : ((ii % 2) == 0)",
+        "Strings = ii == 5 ? null : `hello ` + i",
+        "DateTimes = ii == 5 ? null : '2001-03-01T12:34:56Z' + ii"
+      );
+
+    var chars = new List<char?>();
+    var int8s = new List<sbyte?>();
+    var int16s = new List<Int16?>();
+    var int32s = new List<Int32?>();
+    var int64s = new List<Int64?>();
+    var floats = new List<float?>();
+    var doubles = new List<double?>();
+    var bools = new List<bool?>();
+    var strings = new List<string?>();
+    var dateTimes = new List<DhDateTime?>();
+
+    var dateTimeStart = DhDateTime.Parse("2001-03-01T12:34:56Z");
+
+    for (var i = 0; i != target; ++i) {
+      chars.Add((char)('a' + i));
+      int8s.Add((sbyte)i);
+      int16s.Add((Int16)i);
+      int32s.Add((Int32)i);
+      int64s.Add((Int64)i);
+      floats.Add((float)i);
+      doubles.Add((double)i);
+      bools.Add((i % 2) == 0);
+      strings.Add($"hello {i}");
+      dateTimes.Add(DhDateTime.FromNanos(dateTimeStart.Nanos + i));
+    }
+
+    var t2 = target / 2;
+    // Set the middle element to the null
+    chars[t2] = null;
+    int8s[t2] = null;
+    int16s[t2] = null;
+    int32s[t2] = null;
+    int64s[t2] = null;
+    floats[t2] = null;
+    doubles[t2] = null;
+    bools[t2] = null;
+    strings[t2] = null;
+    dateTimes[t2] = null;
+
+    var tc = new TableComparer();
+    tc.AddColumn("Chars", chars);
+    tc.AddColumn("Bytes", int8s);
+    tc.AddColumn("Shorts", int16s);
+    tc.AddColumn("Ints", int32s);
+    tc.AddColumn("Longs", int64s);
+    tc.AddColumn("Floats", floats);
+    tc.AddColumn("Doubles", doubles);
+    tc.AddColumn("Bools", bools);
+    tc.AddColumn("Strings", strings);
+    tc.AddColumn("DateTimes", dateTimes);
+    tc.AssertEqualTo(th);
+  }
+}
diff --git a/csharp/client/DhClientTests/TestUtils.cs b/csharp/client/DhClientTests/TestUtils.cs
new file mode 100644
index 00000000000..2e4c6a98835
--- /dev/null
+++ b/csharp/client/DhClientTests/TestUtils.cs
@@ -0,0 +1,106 @@
+using Deephaven.DeephavenClient;
+using System.Collections;
+
+namespace Deephaven.DhClientTests;
+
+public static class TestUtils {
+  public static bool TryCompareEnumerables(IEnumerable expected, IEnumerable actual, out string failureReason) {
+    var nextIndex = 0;
+    var actualEnum = actual.GetEnumerator();
+    try {
+      foreach (var expectedItem in expected) {
+        if (!actualEnum.MoveNext()) {
+          failureReason = $"expected has more elements than actual, which has only {nextIndex} elements";
+          return false;
+        }
+
+        var actualItem = actualEnum.Current;
+        if (!object.Equals(expectedItem, actualItem)) {
+          failureReason =
+            $"Row {nextIndex}: expected is {ExplicitToString(expectedItem)}, actual is {ExplicitToString(actualItem)}";
+          return false;
+        }
+
+        ++nextIndex;
+      }
+
+      if (actualEnum.MoveNext()) {
+        failureReason = $"Actual has more elements than expected, which has only {nextIndex} elements";
+        return false;
+      }
+
+      failureReason = "";
+      return true;
+    } finally {
+      if (actualEnum is IDisposable id) {
+        id.Dispose();
+      }
+    }
+  }
+
+  private static string ExplicitToString(object? item) {
+    if (item == null) {
+      return "[null]";
+    }
+
+    return $"{item}[{item.GetType().Name}]";
+  }
+}
+
+class TableComparer {
+  private readonly Dictionary<string, IEnumerable> _columns = new();
+  private Int64 _numRows = 0;
+
+  /// <summary>
+  /// T can be a primitive type, Nullable&lt;T&gt; or string
+  /// </summary>
+  public void AddColumn<T>(string name, IList<T> data) {
+    if (_columns.Count == 0) {
+      _numRows = data.Count;
+    } else {
+      if (_numRows != data.Count) {
+        throw new ArgumentException($"Columns have inconsistent size: {_numRows} vs {data.Count}");
+      }
+    }
+
+    if (!_columns.TryAdd(name, data)) {
+      throw new ArgumentException($"Can't add duplicate column name \"{name}\"");
+    }
+  }
+
+  public void AddColumnWithNulls<T>(string name, IList<T> data, bool[]? nulls) where T : struct {
+    var nullableData = new T?[data.Count];
+    for (var i = 0; i < data.Count; ++i) {
+      if (nulls == null || !nulls[i]) {
+        nullableData[i] = data[i];
+      }
+    }
+    AddColumn(name, nullableData);
+  }
+
+  public void AssertEqualTo(TableHandle table) {
+    using var ct = table.ToClientTable();
+    AssertEqualTo(ct);
+  }
+
+  public void AssertEqualTo(ClientTable clientTable) {
+    if (_columns.Count == 0) {
+      throw new Exception("TableComparer doesn't have any columns");
+    }
+
+    if (_columns.Count != clientTable.Schema.NumCols) {
+      throw new Exception($"Expected number of columns is {_columns.Count}. Actual is {clientTable.Schema.NumCols}");
+    }
+
+    foreach (var (name, expectedColumn) in _columns) {
+      if (!clientTable.Schema.TryGetColumnIndex(name, out var actualColIndex)) {
+        throw new Exception($"Expected table has column named \"{name}\". Actual does not.");
+      }
+
+      var actualColumn = clientTable.GetNullableColumn(actualColIndex);
+      if (!TestUtils.TryCompareEnumerables(expectedColumn, actualColumn, out var failureReason)) {
+        throw new Exception($"While comparing column \"{name}\": {failureReason}");
+      }
+    }
+  }
+}
diff --git a/csharp/client/DhClientTests/TickingTest.cs b/csharp/client/DhClientTests/TickingTest.cs
new file mode 100644
index 00000000000..10cd6f9e3bf
--- /dev/null
+++ b/csharp/client/DhClientTests/TickingTest.cs
@@ -0,0 +1,277 @@
+using Deephaven.DeephavenClient;
+using Microsoft.VisualBasic;
+using System.Runtime.InteropServices;
+using System;
+using Xunit.Abstractions;
+using static System.Reflection.Metadata.BlobBuilder;
+
+namespace Deephaven.DhClientTests;
+
+public class TickingTest {
+  private readonly ITestOutputHelper _output;
+
+  public TickingTest(ITestOutputHelper output) {
+    _output = output;
+  }
+
+  [Fact]
+  public void EventuallyReaches10Rows() {
+    const Int64 maxRows = 10;
+    using var ctx = CommonContextForTests.Create(new ClientOptions());
+    var thm = ctx.Client.Manager;
+
+    using var table = thm.TimeTable(TimeSpan.FromMilliseconds(500)).Update("II = ii");
+    var callback = new ReachesNRowsCallback(_output, maxRows);
+    using var cookie = table.Subscribe(callback);
+
+    while (true) {
+      var (done, errorText) = callback.WaitForUpdate();
+      if (done) {
+        break;
+      }
+      if (errorText != null) {
+        throw new Exception(errorText);
+      }
+    }
+
+    table.Unsubscribe(cookie);
+  }
+
+  [Fact]
+  public void AFourthTest() {
+    Assert.Equal(7, 7);
+  }
+
+  [Fact]
+  public void AFifthTest() {
+    Assert.Equal(7, 7);
+  }
+
+  [Fact]
+  public void AllEventuallyGreaterThan10() {
+    const Int64 maxRows = 10;
+    using var ctx = CommonContextForTests.Create(new ClientOptions());
+    var thm = ctx.Client.Manager;
+
+    using var table = thm.TimeTable(TimeSpan.FromMilliseconds(500))
+      .View("Key = (long)(ii % 10)", "Value = ii")
+      .LastBy("Key");
+
+    var callback = new AllValuesGreaterThanNCallback(_output, maxRows);
+    using var cookie = table.Subscribe(callback);
+
+    while (true) {
+      var (done, errorText) = callback.WaitForUpdate();
+      if (done) {
+        break;
+      }
+      if (errorText != null) {
+        throw new Exception(errorText);
+      }
+    }
+
+    table.Unsubscribe(cookie);
+  }
+
+  [Fact]
+  public void AllDataEventuallyPresent() {
+    const Int64 maxRows = 10;
+    using var ctx = CommonContextForTests.Create(new ClientOptions());
+    var thm = ctx.Client.Manager;
+
+    using var table = thm.TimeTable("PT0:00:0.5")
+      .Update(
+        "II = (int)((ii * 7) % 10)",
+        "Chars = II == 5 ? null : (char)(II + 'a')",
+        "Bytes = II == 5 ? null : (byte)II",
+        "Shorts = II == 5 ? null : (short)II",
+        "Ints = II == 5 ? null : (int)II",
+        "Longs = II == 5 ? null : (long)II",
+        "Floats = II == 5 ? null : (float)II",
+        "Doubles = II == 5 ? null : (double)II",
+        "Bools = II == 5 ? null : ((II % 2) == 0)",
+        "Strings = II == 5 ? null : (`hello ` + II)",
+        "DateTimes = II == 5 ? null : ('2001-03-01T12:34:56Z' + II)")
+      .LastBy("II")
+      .Sort(SortPair.Ascending("II"))
+      .DropColumns("Timestamp", "II");
+
+    var callback = new WaitForPopulatedTableCallback(_output, maxRows);
+    using var cookie = table.Subscribe(callback);
+
+    while (true) {
+      var (done, errorText) = callback.WaitForUpdate();
+      if (done) {
+        break;
+      }
+      if (errorText != null) {
+        throw new Exception(errorText);
+      }
+    }
+
+    table.Unsubscribe(cookie);
+  }
+}
+
+public abstract class CommonBase : ITickingCallback {
+  private readonly object _sync = new();
+  private bool _done = false;
+  private string? _errorText = null;
+
+  public void OnFailure(string errorText) {
+    lock (_sync) {
+      _errorText = errorText;
+      Monitor.PulseAll(_sync);
+    }
+  }
+
+  public (bool, string?) WaitForUpdate() {
+    lock (_sync) {
+      while (true) {
+        if (_done || _errorText != null) {
+          return (_done, _errorText);
+        }
+
+        Monitor.Wait(_sync);
+      }
+    }
+  }
+
+  public abstract void OnTick(TickingUpdate update);
+
+  protected void NotifyDone() {
+    lock (_sync) {
+      _done = true;
+      Monitor.PulseAll(_sync);
+    }
+  }
+}
+
+public sealed class ReachesNRowsCallback : CommonBase {
+  private readonly ITestOutputHelper _output;
+  private readonly Int64 _targetRows;
+
+  public ReachesNRowsCallback(ITestOutputHelper output, Int64 targetRows) {
+    _output = output;
+    _targetRows = targetRows;
+  }
+
+  public override void OnTick(TickingUpdate update) {
+    _output.WriteLine($"=== The Full Table ===\n{update.Current.ToString(true, true)}");
+    if (update.Current.NumRows >= _targetRows) {
+      NotifyDone();
+    }
+  }
+}
+
+public sealed class WaitForPopulatedTableCallback : CommonBase {
+  private readonly ITestOutputHelper _output;
+  private readonly Int64 _target;
+
+  public WaitForPopulatedTableCallback(ITestOutputHelper output, Int64 target) {
+    _output = output;
+    _target = target;
+  }
+
+  public override void OnTick(TickingUpdate update) {
+    _output.WriteLine($"=== The Full Table ===\n{update.Current.ToString(true, true)}");
+
+    var current = update.Current;
+
+    if (current.NumRows < _target) {
+      return;
+    }
+
+    if (current.NumRows > _target) {
+      // table has more rows than expected.
+      var message = $"Expected table to have {_target} rows, got {current.NumRows}";
+      throw new Exception(message);
+    }
+
+    var charData = new List<char?>();
+    var int8Data = new List<sbyte?>();
+    var int16Data = new List<short?>();
+    var int32Data = new List<int?>();
+    var int64Data = new List<long?>();
+    var floatData = new List<float?>();
+    var doubleData = new List<double?>();
+    var boolData = new List<bool?>();
+    var stringData = new List<string?>();
+    var dateTimeData = new List<DhDateTime?>();
+
+    var dateTimeStart = DhDateTime.Parse("2001-03-01T12:34:56Z");
+
+    for (Int64 i = 0; i != _target; ++i) {
+      charData.Add((char)('a' + i));
+      int8Data.Add((sbyte)(i));
+      int16Data.Add((Int16)(i));
+      int32Data.Add((Int32)(i));
+      int64Data.Add((Int64)(i));
+      floatData.Add((float)(i));
+      doubleData.Add((double)(i));
+      boolData.Add((i % 2) == 0);
+      stringData.Add($"hello {i}");
+      dateTimeData.Add(DhDateTime.FromNanos(dateTimeStart.Nanos + i));
+    }
+
+    if (_target == 0) {
+      throw new Exception("Target should not be 0");
+    }
+
+    var t2 = (int)(_target / 2);
+    // Set the middle element to the unset optional, which for the purposes of this test is
+    // our representation of null.
+    charData[t2] = null;
+    int8Data[t2] = null;
+    int16Data[t2] = null;
+    int32Data[t2] = null;
+    int64Data[t2] = null;
+    floatData[t2] = null;
+    doubleData[t2] = null;
+    boolData[t2] = null;
+    stringData[t2] = null;
+    dateTimeData[t2] = null;
+
+    var tc = new TableComparer();
+    tc.AddColumn("Chars", charData);
+    tc.AddColumn("Bytes", int8Data);
+    tc.AddColumn("Shorts", int16Data);
+    tc.AddColumn("Ints", int32Data);
+    tc.AddColumn("Longs", int64Data);
+    tc.AddColumn("Floats", floatData);
+    tc.AddColumn("Doubles", doubleData);
+    tc.AddColumn("Bools", boolData);
+    tc.AddColumn("Strings", stringData);
+    tc.AddColumn("DateTimes", dateTimeData);
+
+    tc.AssertEqualTo(current);
+    NotifyDone();
+  }
+}
+
+public sealed class AllValuesGreaterThanNCallback : CommonBase {
+  private readonly ITestOutputHelper _output;
+  private readonly Int64 _target;
+
+  public AllValuesGreaterThanNCallback(ITestOutputHelper output, Int64 target) {
+    _output = output;
+    _target = target;
+  }
+
+  public override void OnTick(TickingUpdate update) {
+    _output.WriteLine($"=== The Full Table ===\n{update.Current.ToString(true, true)}");
+
+    var current = update.Current;
+
+    if (current.NumRows == 0) {
+      return;
+    }
+
+    var (values, nulls) = current.GetColumn("Value");
+    var data = (Int64[])values;
+    var allGreater = data.All(elt => elt > _target);
+    if (allGreater) {
+      NotifyDone();
+    }
+  }
+}
diff --git a/csharp/client/DhClientTests/UngroupTest.cs b/csharp/client/DhClientTests/UngroupTest.cs
new file mode 100644
index 00000000000..adeea94715b
--- /dev/null
+++ b/csharp/client/DhClientTests/UngroupTest.cs
@@ -0,0 +1,11 @@
+using Deephaven.DeephavenClient;
+using System;
+
+namespace Deephaven.DhClientTests;
+
+public class UngroupTest {
+  [Fact]
+  public void UngroupColumns() {
+    // This test is disabled. Get it working when the C++ side works
+  }
+}
diff --git a/csharp/client/DhClientTests/UpdateByTest.cs b/csharp/client/DhClientTests/UpdateByTest.cs
new file mode 100644
index 00000000000..42fee76c3cb
--- /dev/null
+++ b/csharp/client/DhClientTests/UpdateByTest.cs
@@ -0,0 +1,275 @@
+using Deephaven.DeephavenClient;
+using Deephaven.DeephavenClient.Utility;
+using System;
+using Deephaven.DeephavenClient.UpdateBy;
+using Xunit.Abstractions;
+using static Deephaven.DeephavenClient.UpdateBy.UpdateByOperation;
+
+namespace Deephaven.DhClientTests;
+
+public class UpdateByTest {
+  const int NumCols = 5;
+  const int NumRows = 1000;
+
+  private readonly ITestOutputHelper _output;
+
+  public UpdateByTest(ITestOutputHelper output) {
+    _output = output;
+  }
+
+  [Fact]
+  public void SimpleCumSum() {
+    using var ctx = CommonContextForTests.Create(new ClientOptions());
+    var tm = ctx.Client.Manager;
+
+    var source = tm.EmptyTable(10).Update("Letter = (i % 2 == 0) ? `A` : `B`", "X = i");
+    var result = source.UpdateBy(new[] { CumSum(new[] { "SumX = X" }) }, new[] { "Letter" });
+    var filtered = result.Select("SumX");
+    var tc = new TableComparer();
+    tc.AddColumn("SumX", new Int64[] { 0, 1, 2, 4, 6, 9, 12, 16, 20, 25 });
+    tc.AssertEqualTo(filtered);
+  }
+
+  [Fact]
+  public void SimpleOps() {
+    using var ctx = CommonContextForTests.Create(new ClientOptions());
+    var tm = ctx.Client.Manager;
+
+    var tables = MakeTables(tm);
+    var simpleOps = MakeSimpleOps();
+
+    for (var opIndex = 0; opIndex != simpleOps.Length; ++opIndex) {
+      var op = simpleOps[opIndex];
+      for (var tableIndex = 0; tableIndex != tables.Length; ++tableIndex) {
+        var table = tables[tableIndex];
+        _output.WriteLine($"Processing op {opIndex} on Table {tableIndex}");
+        using var result = table.UpdateBy(new[] { op }, new[] { "e" });
+        Assert.Equal(table.IsStatic, result.IsStatic);
+        Assert.Equal(2 + table.NumCols, result.NumCols);
+        Assert.True(result.NumRows >= table.NumRows);
+      }
+    }
+  }
+
+  [Fact]
+  public void EmOps() {
+    using var ctx = CommonContextForTests.Create(new ClientOptions());
+    var tm = ctx.Client.Manager;
+
+    var tables = MakeTables(tm);
+    var emOps = MakeEmOps();
+
+    for (var opIndex = 0; opIndex != emOps.Length; ++opIndex) {
+      var op = emOps[opIndex];
+      for (var tableIndex = 0; tableIndex != tables.Length; ++tableIndex) {
+        var table = tables[tableIndex];
+        _output.WriteLine($"Processing op {opIndex} on Table {tableIndex}");
+        using var result = table.UpdateBy(new[] { op }, new[] { "b" });
+        Assert.Equal(table.IsStatic, result.IsStatic);
+        Assert.Equal(1 + table.NumCols, result.NumCols);
+        if (result.IsStatic) {
+          Assert.Equal(result.NumRows, table.NumRows);
+        }
+      }
+    }
+  }
+
+  [Fact]
+  public void RollingOps() {
+    using var ctx = CommonContextForTests.Create(new ClientOptions());
+    var tm = ctx.Client.Manager;
+
+    var tables = MakeTables(tm);
+    var rollingOps = MakeRollingOps();
+
+    for (var opIndex = 0; opIndex != rollingOps.Length; ++opIndex) {
+      var op = rollingOps[opIndex];
+      for (var tableIndex = 0; tableIndex != tables.Length; ++tableIndex) {
+        var table = tables[tableIndex];
+        _output.WriteLine($"Processing op {opIndex} on Table {tableIndex}");
+        using var result = table.UpdateBy(new[] { op }, new[] { "c" });
+        Assert.Equal(table.IsStatic, result.IsStatic);
+        Assert.Equal(2 + table.NumCols, result.NumCols);
+        Assert.True(result.NumRows >= table.NumRows);
+      }
+    }
+  }
+
+  [Fact]
+  public void MultipleOps() {
+    using var ctx = CommonContextForTests.Create(new ClientOptions());
+    var tm = ctx.Client.Manager;
+
+    var tables = MakeTables(tm);
+    var multipleOps = new[] {
+      CumSum(new[] { "sum_a=a", "sum_b=b" }),
+      CumSum(new[] { "max_a=a", "max_d=d" }),
+      EmaTick(10, new[] { "ema_d=d", "ema_e=e" }),
+      EmaTime("Timestamp", "PT00:00:00.1", new[] { "ema_time_d=d", "ema_time_e=e" }),
+      RollingWavgTick("b", new[] { "rwavg_a = a", "rwavg_d = d" }, 10)
+    };
+
+    for (var tableIndex = 0; tableIndex != tables.Length; ++tableIndex) {
+      var table = tables[tableIndex];
+      _output.WriteLine($"Processing table {tableIndex}");
+      using var result = table.UpdateBy(multipleOps, new[] { "c" });
+      Assert.Equal(table.IsStatic, result.IsStatic);
+      Assert.Equal(10 + table.NumCols, result.NumCols);
+      if (result.IsStatic) {
+        Assert.Equal(result.NumRows, table.NumRows);
+      }
+    }
+  }
+
+  private TableHandle[] MakeTables(TableHandleManager tm) {
+    var staticTable = MakeRandomTable(tm).Update("Timestamp=now()");
+    var tickingTable = tm.TimeTable(TimeSpan.FromSeconds(1))
+      .Update("a = i", "b = i*i % 13", "c = i * 13 % 23", "d = a + b", "e = a - b");
+    return new[] { staticTable, tickingTable };
+  }
+
+  private static TableHandle MakeRandomTable(TableHandleManager tm) {
+    var rng = new Random(12345);
+
+    var maker = new TableMaker();
+    if (NumCols > 26) {
+      throw new ArgumentException("NumCols constant is too big for this test");
+    }
+
+    for (var col = 0; col != NumCols; ++col) {
+      var name = ((char)('a' + col)).ToString();
+      var values = new Int32[NumRows];
+      for (var i = 0; i != NumRows; ++i) {
+        values[i] = rng.Next(1000);
+      }
+
+      maker.AddColumn(name, values);
+    }
+
+    return maker.MakeTable(tm);
+  }
+
+  private static UpdateByOperation[] MakeSimpleOps() {
+    var simpleOpPairs = new[] { "UA=a", "UB=b" };
+    var result = new[] {
+      CumSum(simpleOpPairs),
+      CumProd(simpleOpPairs),
+      CumMin(simpleOpPairs),
+      CumMax(simpleOpPairs),
+      ForwardFill(simpleOpPairs),
+      Delta(simpleOpPairs),
+      Delta(simpleOpPairs, DeltaControl.NullDominates),
+      Delta(simpleOpPairs, DeltaControl.ValueDominates),
+      Delta(simpleOpPairs, DeltaControl.ZeroDominates)
+    };
+    return result;
+  }
+
+  private static UpdateByOperation[] MakeEmOps() {
+    var emOpControl = new OperationControl(BadDataBehavior.Throw, BadDataBehavior.Reset,
+      MathContext.Unlimited);
+
+    var result = new [] {
+      // exponential moving average
+      EmaTick(100, new[] { "ema_a = a" }),
+      EmaTick(100, new[] { "ema_a = a" }, emOpControl),
+      EmaTime("Timestamp", 10, new[] { "ema_a = a" }),
+      EmaTime("Timestamp", "PT00:00:00.001", new[] { "ema_c = c" }, emOpControl),
+      EmaTime("Timestamp", "PT1M", new[] { "ema_c = c" }),
+      EmaTime("Timestamp", "PT1M", new[] { "ema_c = c" }, emOpControl),
+      // exponential moving sum
+      EmsTick(100, new[] { "ems_a = a" }),
+      EmsTick(100, new[] { "ems_a = a" }, emOpControl),
+      EmsTime("Timestamp", 10,  new[] { "ems_a = a"}),
+      EmsTime("Timestamp", "PT00:00:00.001", new[] { "ems_c = c" }, emOpControl),
+      EmsTime("Timestamp", "PT1M", new[] { "ema_c = c" }),
+      EmsTime("Timestamp", "PT1M", new[] { "ema_c = c" }, emOpControl),
+      // exponential moving minimum
+      EmminTick(100, new[] { "emmin_a = a" }),
+      EmminTick(100, new[] { "emmin_a = a" }, emOpControl),
+      EmminTime("Timestamp", 10, new[] { "emmin_a = a" }),
+      EmminTime("Timestamp", "PT00:00:00.001", new[] { "emmin_c = c" }, emOpControl),
+      EmminTime("Timestamp", "PT1M", new[] { "ema_c = c" }),
+      EmminTime("Timestamp", "PT1M", new[] { "ema_c = c" }, emOpControl),
+      // exponential moving maximum
+      EmmaxTick(100, new[] { "emmax_a = a" }),
+      EmmaxTick(100, new[] { "emmax_a = a" }, emOpControl),
+      EmmaxTime("Timestamp", 10, new[] { "emmax_a = a" }),
+      EmmaxTime("Timestamp", "PT00:00:00.001", new[] { "emmax_c = c" }, emOpControl),
+      EmmaxTime("Timestamp", "PT1M", new[] { "ema_c = c" }),
+      EmmaxTime("Timestamp", "PT1M", new[] { "ema_c = c" }, emOpControl),
+      // exponential moving standard deviation
+      EmstdTick(100, new[] { "emstd_a = a" }),
+      EmstdTick(100, new[] { "emstd_a = a" }, emOpControl),
+      EmstdTime("Timestamp", 10, new[] { "emstd_a = a" }),
+      EmstdTime("Timestamp", "PT00:00:00.001", new[] { "emtd_c = c" }, emOpControl),
+      EmstdTime("Timestamp", "PT1M", new[] { "ema_c = c" }),
+      EmstdTime("Timestamp", "PT1M", new[] { "ema_c = c" }, emOpControl)
+    };
+
+    return result;
+  }
+
+  private static UpdateByOperation[] MakeRollingOps() {
+    static TimeSpan Secs(int s) => TimeSpan.FromSeconds(s);
+
+    // exponential moving average
+    var result = new UpdateByOperation[] {
+      // rolling sum
+      RollingSumTick(new[] {"rsum_a = a", "rsum_d = d"}, 10),
+      RollingSumTick(new[] { "rsum_a = a", "rsum_d = d"}, 10, 10),
+      RollingSumTime("Timestamp",  new[] { "rsum_b = b", "rsum_e = e"}, "PT00:00:10"),
+      RollingSumTime("Timestamp",  new[] { "rsum_b = b", "rsum_e = e"}, Secs(10), Secs(-10)),
+      RollingSumTime("Timestamp",  new[] { "rsum_b = b", "rsum_e = e"}, "PT30S", "-PT00:00:20"),
+      // rolling group
+      RollingGroupTick(new[] { "rgroup_a = a", "rgroup_d = d"}, 10),
+      RollingGroupTick(new[] { "rgroup_a = a", "rgroup_d = d"}, 10, 10),
+      RollingGroupTime("Timestamp", new[] { "rgroup_b = b", "rgroup_e = e"}, "PT00:00:10"),
+      RollingGroupTime("Timestamp", new[] { "rgroup_b = b", "rgroup_e = e"}, Secs(10), Secs(-10)),
+      RollingGroupTime("Timestamp",  new[] { "rgroup_b = b", "rgroup_e = e"}, "PT30S", "-PT00:00:20"),
+      // rolling average
+      RollingAvgTick(new[] { "ravg_a = a", "ravg_d = d"}, 10),
+      RollingAvgTick(new[] { "ravg_a = a", "ravg_d = d"}, 10, 10),
+      RollingAvgTime("Timestamp", new[] { "ravg_b = b", "ravg_e = e"}, "PT00:00:10"),
+      RollingAvgTime("Timestamp", new[] { "ravg_b = b", "ravg_e = e"}, Secs(10), Secs(-10)),
+      RollingAvgTime("Timestamp",  new[] { "ravg_b = b", "ravg_e = e"}, "PT30S", "-PT00:00:20"),
+      // rolling minimum
+      RollingMinTick(new[] { "rmin_a = a", "rmin_d = d"}, 10),
+      RollingMinTick(new[] { "rmin_a = a", "rmin_d = d"}, 10, 10),
+      RollingMinTime("Timestamp", new[] { "rmin_b = b", "rmin_e = e"}, "PT00:00:10"),
+      RollingMinTime("Timestamp", new[] { "rmin_b = b", "rmin_e = e"}, Secs(10), Secs(-10)),
+      RollingMinTime("Timestamp", new[] { "rmin_b = b", "rmin_e = e"}, "PT30S", "-PT00:00:20"),
+      // rolling maximum
+      RollingMaxTick(new[] { "rmax_a = a", "rmax_d = d"}, 10),
+      RollingMaxTick(new[] { "rmax_a = a", "rmax_d = d"}, 10, 10),
+      RollingMaxTime("Timestamp", new[] { "rmax_b = b", "rmax_e = e"}, "PT00:00:10"),
+      RollingMaxTime("Timestamp", new[] { "rmax_b = b", "rmax_e = e"}, Secs(10), Secs(-10)),
+      RollingMaxTime("Timestamp", new[] { "rmax_b = b", "rmax_e = e"}, "PT30S", "-PT00:00:20"),
+      // rolling product
+      RollingProdTick(new[] { "rprod_a = a", "rprod_d = d"}, 10),
+      RollingProdTick(new[] { "rprod_a = a", "rprod_d = d"}, 10, 10),
+      RollingProdTime("Timestamp", new[] { "rprod_b = b", "rprod_e = e"}, "PT00:00:10"),
+      RollingProdTime("Timestamp", new[] { "rprod_b = b", "rprod_e = e"}, Secs(10), Secs(-10)),
+      RollingProdTime("Timestamp",  new[] { "rprod_b = b", "rprod_e = e"}, "PT30S", "-PT00:00:20"),
+      // rolling count
+      RollingCountTick(new[] { "rcount_a = a", "rcount_d = d"}, 10),
+      RollingCountTick(new[] { "rcount_a = a", "rcount_d = d"}, 10, 10),
+      RollingCountTime("Timestamp", new[] { "rcount_b = b", "rcount_e = e"}, "PT00:00:10"),
+      RollingCountTime("Timestamp",  new[] { "rcount_b = b", "rcount_e = e"}, Secs(10), Secs(-10)),
+      RollingCountTime("Timestamp", new[] { "rcount_b = b", "rcount_e = e"}, "PT30S", "-PT00:00:20"),
+      // rolling standard deviation
+      RollingStdTick(new[] { "rstd_a = a", "rstd_d = d"}, 10),
+      RollingStdTick(new[] { "rstd_a = a", "rstd_d = d"}, 10, 10),
+      RollingStdTime("Timestamp", new[] { "rstd_b = b", "rstd_e = e"}, "PT00:00:10"),
+      RollingStdTime("Timestamp", new[] { "rstd_b = b", "rstd_e = e"}, Secs(10), Secs(-10)),
+      RollingStdTime("Timestamp", new[] { "rstd_b = b", "rstd_e = e"}, "PT30S", "-PT00:00:20"),
+      // rolling weighted average (using "b" as the weight column)
+      RollingWavgTick("b", new[] { "rwavg_a = a", "rwavg_d = d"}, 10),
+      RollingWavgTick("b", new[] { "rwavg_a = a", "rwavg_d = d"}, 10, 10),
+      RollingWavgTime("Timestamp", "b", new[] { "rwavg_b = b", "rwavg_e = e"}, "PT00:00:10"),
+      RollingWavgTime("Timestamp", "b", new[] { "rwavg_b = b", "rwavg_e = e"}, Secs(10), Secs(-10)),
+      RollingWavgTime("Timestamp", "b", new[] { "rwavg_b = b", "rwavg_e = e"}, "PT30S", "-PT00:00:20")
+    };
+    return result;
+  }
+}
diff --git a/csharp/client/DhClientTests/ValidationTest.cs b/csharp/client/DhClientTests/ValidationTest.cs
new file mode 100644
index 00000000000..edda3e13528
--- /dev/null
+++ b/csharp/client/DhClientTests/ValidationTest.cs
@@ -0,0 +1,101 @@
+using Deephaven.DeephavenClient;
+using Deephaven.DeephavenClient.Utility;
+using System;
+using Xunit.Abstractions;
+
+namespace Deephaven.DhClientTests;
+
+public class ValidationTest {
+  private readonly ITestOutputHelper _output;
+
+  public ValidationTest(ITestOutputHelper output) {
+    _output = output;
+  }
+
+  [Fact]
+  public void Select() {
+    var badSelects = new[] {
+      new[] { "X = 3)" },
+      new[] { "S = `hello`", "T = java.util.regex.Pattern.quote(S)" }, // Pattern.quote not on whitelist
+      new[] { "X = Math.min(3, 4)" } // Math.min not on whitelist
+    };
+    var goodSelects = new[] {
+      new[] { "X = 3" },
+      new[] { "S = `hello`", "T = S.length()" }, // instance methods of String ok
+      new[] { "X = min(3, 4)" }, // "builtin" from GroovyStaticImports
+      new[] { "X = isFinite(3)" }, // another builtin from GroovyStaticImports
+    };
+
+    using var ctx = CommonContextForTests.Create(new ClientOptions());
+    var thm = ctx.Client.Manager;
+    using var staticTable = thm.EmptyTable(10)
+      .Update("X = 12", "S = `hello`");
+    TestSelectsHelper("static Table", staticTable, badSelects, goodSelects);
+  }
+
+  [Fact]
+  public void Where() {
+    var badWheres = new[] {
+      "X > 3)", // syntax error
+      "S = new String(`hello`)", // new not allowed
+      "S = java.util.regex.Pattern.quote(S)", // Pattern.quote not on whitelist
+      "X = Math.min(3, 4)" // Math.min not on whitelist
+    };
+
+    var goodWheres = new[] {
+      "X = 3",
+      "S = `hello`",
+      "S.length() = 17", // instance methods of String ok
+      "X = min(3, 4)", // "builtin" from GroovyStaticImports
+      "X = isFinite(3)", // another builtin from GroovyStaticImports
+      "X in 3, 4, 5",
+    };
+
+    using var ctx = CommonContextForTests.Create(new ClientOptions());
+    var thm = ctx.Client.Manager;
+    using var staticTable = thm.EmptyTable(10)
+      .Update("X = 12", "S = `hello`");
+    TestWheresHelper("static Table", staticTable, badWheres, goodWheres);
+  }
+
+  private void TestWheresHelper(string what, TableHandle table,
+    IEnumerable<string> badWheres, IEnumerable<string> goodWheres) {
+    foreach (var bw in badWheres) {
+      try {
+        _output.WriteLine($"Trying {what} {bw}");
+        using var dummy = table.Where(bw);
+      } catch (Exception e) {
+        _output.WriteLine($"{what}: {bw}: Failed *as expected* with: {e.Message}");
+        continue;
+      }
+
+      throw new Exception($"{what}: {bw}: Expected to fail, but succeeded");
+    }
+
+    foreach (var gw in goodWheres) {
+      using var dummy = table.Where(gw);
+      _output.WriteLine($"{what}: {gw}: Succeeded as expected");
+    }
+  }
+
+  private void TestSelectsHelper(string what, TableHandle table,
+    IEnumerable<string[]> badSelects, IEnumerable<string[]> goodSelects) {
+    foreach (var bs in badSelects) {
+      var printable = string.Join(", ", bs);
+      try {
+        using var dummy = table.Select(bs);
+      } catch (Exception e) {
+        _output.WriteLine($"{what}: {printable}: Failed as expected with: {e.Message}");
+        continue;
+      }
+
+      throw new Exception($"{what}: {printable}: Expected to fail, but succeeded");
+    }
+
+    foreach (var gs in goodSelects) {
+      var printable = string.Join(", ", gs);
+      using var dummy = table.Select(gs);
+      _output.WriteLine($"{what}: {printable}: Succeeded as expected");
+    }
+  }
+}
diff --git a/csharp/client/DhClientTests/ViewTest.cs b/csharp/client/DhClientTests/ViewTest.cs
new file mode 100644
index 00000000000..3e12801b0c7
--- /dev/null
+++ b/csharp/client/DhClientTests/ViewTest.cs
@@ -0,0 +1,25 @@
+using Deephaven.DeephavenClient;
+using Xunit.Abstractions;
+
+namespace Deephaven.DhClientTests;
+
+public class ViewTest {
+  [Fact]
+  public void View() {
+    using var ctx = CommonContextForTests.Create(new ClientOptions());
+    var table = ctx.TestTable;
+
+    // literal strings
+    using var t1 = table.LastBy("Ticker").View("Ticker", "Close", "Volume");
+
+    var tickerData = new[] { "XRX", "XYZZY", "IBM", "GME", "AAPL", "ZNGA", "T" };
+    var closeData = new[] { 53.8, 88.5, 38.7, 453, 26.7, 544.9, 13.4 };
+    var volData = new Int64[] { 87000, 6060842, 138000, 138000000, 19000, 48300, 1500 };
+
+    var tc = new TableComparer();
+    tc.AddColumn("Ticker", tickerData);
+    tc.AddColumn("Close", closeData);
+    tc.AddColumn("Volume", volData);
+    tc.AssertEqualTo(t1);
+  }
+}
diff --git a/debezium/demo/README.md b/debezium/demo/README.md
index 8e2bb021894..0c3a668e0ec 100644
--- a/debezium/demo/README.md
+++ b/debezium/demo/README.md
@@ -29,9 +29,8 @@ How to run
 ==========
 
 First, if you are building from sources, follow the instructions
-in https://deephaven.io/core/docs/how-to-guides/launch-build,
-and ensure you can launch a regular version of Deephaven
-as per the instructions there.  Once that works, stop that
+[here](https://deephaven.io/core/docs/getting-started/launch-build/) and ensure you can launch a regular version of 
+Deephaven as per the instructions there.  Once that works, stop that
 Deephaven instance, and continue below.
 
 Start docker compose with the compose file in this
diff --git a/deephaven-changelog b/deephaven-changelog
new file mode 100644
index 00000000000..2b1048e34d5
--- /dev/null
+++ b/deephaven-changelog
@@ -0,0 +1,51 @@
+{# Tera templates are used to generate the changelog content -#}
+{# https://keats.github.io/tera/docs/ -#}
+{# Based on Cocogittos remote template, but adds breaking changes: https://github.com/cocogitto/cocogitto/blob/main/src/conventional/changelog/template/remote -#}
+{# First display all the breaking changes -#}
+{% set breaking_commits = commits | filter(attribute="breaking_change", value=true) -%}
+{% if breaking_commits | length > 0 -%}
+#### ⚠ Breaking Changes
+
+{% for commit in breaking_commits -%}
+{% set commit_link = repository_url ~ "/commit/" ~ commit.id -%}
+{% set shorthand = commit.id | truncate(length=7, end="") -%}
+{% for footer in commit.footer | filter(attribute="token", value="BREAKING CHANGE") -%}
+- {{ footer.content }} - ([{{shorthand}}]({{ commit_link }}))
+{% endfor -%}
+{% endfor -%}
+{% endif %}
+
+{# Now group the rest of the commits and display them -#}
+{% for type, typed_commits in commits | sort(attribute="type")| group_by(attribute="type") -%}
+#### {{ type | upper_first }}
+{% for scope, scoped_commits in typed_commits | group_by(attribute="scope") -%}
+
+{% for commit in scoped_commits | sort(attribute="scope") -%}
+    {% if commit.author and repository_url -%}
+        {% set author = "@" ~ commit.author -%}
+        {% set author_link = platform ~ "/" ~ commit.author -%}
+        {% set author = "[" ~ author ~ "](" ~ author_link ~ ")" -%}
+    {% else -%}
+        {% set author = commit.signature -%}
+    {% endif -%}
+    {% set commit_link = repository_url ~ "/commit/" ~ commit.id -%}
+    {% set shorthand = commit.id | truncate(length=7, end="") -%}
+    - **({{ scope }})** {{ commit.summary }} - ([{{shorthand}}]({{ commit_link }})) - {{ author }}
+{% endfor -%}
+
+{% endfor -%}
+
+{% for commit in typed_commits | unscoped -%}
+    {% if commit.author and repository_url -%}
+        {% set author = "@" ~ commit.author -%}
+        {% set author_link = platform ~ "/" ~ commit.author -%}
+        {% set author = "[" ~ author ~ "](" ~ author_link ~ ")" -%}
+    {% else -%}
+        {% set author = commit.signature -%}
+    {% endif -%}
+    {% set commit_link = repository_url ~ "/commit/" ~ commit.id -%}
+    {% set shorthand = commit.id | truncate(length=7, end="") -%}
+    - {{ commit.summary }} - ([{{shorthand}}]({{ commit_link }})) - {{ author }}
+{% endfor -%}
+
+{% endfor -%}
\ No newline at end of file
diff --git a/docker/registry/cpp-clients-multi-base/gradle.properties b/docker/registry/cpp-clients-multi-base/gradle.properties
index 871bfac533c..2f3feddc403 100644
--- a/docker/registry/cpp-clients-multi-base/gradle.properties
+++ b/docker/registry/cpp-clients-multi-base/gradle.properties
@@ -1,5 +1,5 @@
 io.deephaven.project.ProjectType=DOCKER_REGISTRY
 deephaven.registry.imageName=ghcr.io/deephaven/cpp-clients-multi-base:latest
 # When the image version changes, remember to update cpp-client/build-dependencies.sh to match the image's content
-deephaven.registry.imageId=ghcr.io/deephaven/cpp-clients-multi-base@sha256:30beb649401f189b41ddb35d0533879f43c3581ab6629b76283622fc27b84349
+deephaven.registry.imageId=ghcr.io/deephaven/cpp-clients-multi-base@sha256:9a5efc669bf239d9c9f2ad6f934201219efa0112b93864f1afaa8bf510dedf49
 deephaven.registry.platform=linux/amd64
diff --git a/docker/registry/fedora/gradle.properties b/docker/registry/fedora/gradle.properties
index 920e7a455b6..1d5d878ffbe 100644
--- a/docker/registry/fedora/gradle.properties
+++ b/docker/registry/fedora/gradle.properties
@@ -1,3 +1,3 @@
 io.deephaven.project.ProjectType=DOCKER_REGISTRY
 deephaven.registry.imageName=fedora:39
-deephaven.registry.imageId=fedora@sha256:ee042eb5527cfe117d279af0fff4461ad0c5441a8ef36deea9d98a2eb0130a90
+deephaven.registry.imageId=fedora@sha256:d63d63fe593749a5e8dbc8152427d40bbe0ece53d884e00e5f3b44859efa5077
diff --git a/docker/registry/go/gradle.properties b/docker/registry/go/gradle.properties
index b2e29b49d31..b10ac79995a 100644
--- a/docker/registry/go/gradle.properties
+++ b/docker/registry/go/gradle.properties
@@ -1,3 +1,3 @@
 io.deephaven.project.ProjectType=DOCKER_REGISTRY
 deephaven.registry.imageName=golang:1
-deephaven.registry.imageId=golang@sha256:b1e05e2c918f52c59d39ce7d5844f73b2f4511f7734add8bb98c9ecdd4443365
+deephaven.registry.imageId=golang@sha256:73f06be4578c9987ce560087e2e2ea6485fb605e3910542cadd8fa09fc5f3e31
diff --git a/docker/registry/localstack/gradle.properties b/docker/registry/localstack/gradle.properties
index 783af51a431..2d4b5705e9b 100644
--- a/docker/registry/localstack/gradle.properties
+++ b/docker/registry/localstack/gradle.properties
@@ -1,3 +1,3 @@
 io.deephaven.project.ProjectType=DOCKER_REGISTRY
 deephaven.registry.imageName=localstack/localstack:3
-deephaven.registry.imageId=localstack/localstack@sha256:54fcf172f6ff70909e1e26652c3bb4587282890aff0d02c20aa7695469476ac0
+deephaven.registry.imageId=localstack/localstack@sha256:b279c01f4cfb8f985a482e4014cabc1e2697b9d7a6c8c8db2e40f4d9f93687c7
diff --git a/docker/registry/manylinux2014_x86_64/gradle.properties b/docker/registry/manylinux2014_x86_64/gradle.properties
index 08cba2e2f76..591603c5813 100644
--- a/docker/registry/manylinux2014_x86_64/gradle.properties
+++ b/docker/registry/manylinux2014_x86_64/gradle.properties
@@ -1,4 +1,4 @@
 io.deephaven.project.ProjectType=DOCKER_REGISTRY
 deephaven.registry.imageName=quay.io/pypa/manylinux2014_x86_64:latest
-deephaven.registry.imageId=quay.io/pypa/manylinux2014_x86_64@sha256:69db66df471ef1431daf4bcbd625a563dc88281d11cc3e5389781ed6ca908529
+deephaven.registry.imageId=quay.io/pypa/manylinux2014_x86_64@sha256:24858373a047b97fd3a8fe2ee28709479a828fa0ed88719158b728947eb53270
 deephaven.registry.platform=linux/amd64
diff --git a/docker/registry/minio/gradle.properties b/docker/registry/minio/gradle.properties
index 79547ad9feb..81eee96edf9 100644
--- a/docker/registry/minio/gradle.properties
+++ b/docker/registry/minio/gradle.properties
@@ -1,3 +1,3 @@
 io.deephaven.project.ProjectType=DOCKER_REGISTRY
 deephaven.registry.imageName=minio/minio:latest
-deephaven.registry.imageId=minio/minio@sha256:c97dbb0238dbd650ebe3f57dda68984993f466abad70d36c6e3ca306ceec3f58
+deephaven.registry.imageId=minio/minio@sha256:ac591851803a79aee64bc37f66d77c56b0a4b6e12d9e5356380f4105510f2332
diff --git a/docker/registry/protoc-base/gradle.properties b/docker/registry/protoc-base/gradle.properties
index 14b2607b264..50feb88c208 100644
--- a/docker/registry/protoc-base/gradle.properties
+++ b/docker/registry/protoc-base/gradle.properties
@@ -1,5 +1,5 @@
 io.deephaven.project.ProjectType=DOCKER_REGISTRY
 deephaven.registry.imageName=ghcr.io/deephaven/protoc-base:latest
-deephaven.registry.imageId=ghcr.io/deephaven/protoc-base@sha256:10a013dbad7de0855231c406507bc2913269c57c581f7d5056aeb65ddb6b295d
+deephaven.registry.imageId=ghcr.io/deephaven/protoc-base@sha256:3cb04f768cfdb66b47154568a23772d42dcc55076c7cbb94ae950309d350a82a
 # TODO(deephaven-base-images#54): arm64 native image for cpp-client-base
 deephaven.registry.platform=linux/amd64
diff --git a/docker/registry/python/gradle.properties b/docker/registry/python/gradle.properties
index beef654b3bc..eb6c4cf53ef 100644
--- a/docker/registry/python/gradle.properties
+++ b/docker/registry/python/gradle.properties
@@ -1,3 +1,3 @@
 io.deephaven.project.ProjectType=DOCKER_REGISTRY
 deephaven.registry.imageName=python:3.10
-deephaven.registry.imageId=python@sha256:f75ded7bbc9b0318261c8abdc4501382a57f21b204e40af641eacd41cd8c8bfb
+deephaven.registry.imageId=python@sha256:941b0bfddbf17d809fd1f457acbf55dfca014e3e0e3d592b1c9070491681bc02
diff --git a/docker/registry/selenium/gradle.properties b/docker/registry/selenium/gradle.properties
index 9f3323a59cc..b930e284623 100644
--- a/docker/registry/selenium/gradle.properties
+++ b/docker/registry/selenium/gradle.properties
@@ -1,4 +1,3 @@
 io.deephaven.project.ProjectType=DOCKER_REGISTRY
-deephaven.registry.imageName=selenium/standalone-firefox:4.16.1-20231219
-deephaven.registry.imageId=selenium/standalone-firefox@sha256:a405fe92b3ce5d7eb31a07e1f99be3d628fdc0e5bdc81febd8dc11786edef024
-deephaven.registry.platform=linux/amd64
+deephaven.registry.imageName=selenium/standalone-firefox:4.27.0
+deephaven.registry.imageId=selenium/standalone-firefox@sha256:287cd73a59d241b7264fe5fab7dbd31f92d56b8ec81ba74f53ecc4997f218dff
diff --git a/docker/registry/server-base/gradle.properties b/docker/registry/server-base/gradle.properties
index 26505865665..7a11547386c 100644
--- a/docker/registry/server-base/gradle.properties
+++ b/docker/registry/server-base/gradle.properties
@@ -1,3 +1,3 @@
 io.deephaven.project.ProjectType=DOCKER_REGISTRY
 deephaven.registry.imageName=ghcr.io/deephaven/server-base:edge
-deephaven.registry.imageId=ghcr.io/deephaven/server-base@sha256:ccb2934e6e24c1c81a83daa81b68ddcf796cba74b2ccbd6b3aa9a34df214c6e1
+deephaven.registry.imageId=ghcr.io/deephaven/server-base@sha256:57096a26bb621a4eaf630ac555a4c08836820e029aa90c266765142c524419a4
diff --git a/docker/registry/slim-base/gradle.properties b/docker/registry/slim-base/gradle.properties
index 97fea4ac3cf..7625b2beb98 100644
--- a/docker/registry/slim-base/gradle.properties
+++ b/docker/registry/slim-base/gradle.properties
@@ -1,3 +1,3 @@
 io.deephaven.project.ProjectType=DOCKER_REGISTRY
 deephaven.registry.imageName=ghcr.io/deephaven/server-slim-base:edge
-deephaven.registry.imageId=ghcr.io/deephaven/server-slim-base@sha256:ca9b55d2e075dc12e220b8cb13fdd9cd4cb7fc8f68dfdaba99fc240f5a916266
+deephaven.registry.imageId=ghcr.io/deephaven/server-slim-base@sha256:941e783bde091416f4b0359cc2a9df893f8340ada9bf4681f84875a91dfcebd1
diff --git a/docker/server-jetty/src/main/server-jetty/requirements.txt b/docker/server-jetty/src/main/server-jetty/requirements.txt
index 2c8f2a5c262..7eb0af1edf0 100644
--- a/docker/server-jetty/src/main/server-jetty/requirements.txt
+++ b/docker/server-jetty/src/main/server-jetty/requirements.txt
@@ -1,19 +1,20 @@
-adbc-driver-manager==1.0.0
-adbc-driver-postgresql==1.0.0
-connectorx==0.3.3; platform.machine == 'x86_64'
+adbc-driver-manager==1.3.0
+adbc-driver-postgresql==1.3.0
+connectorx==0.4.0; platform.machine == 'x86_64'
 deephaven-plugin==0.6.0
-importlib_resources==6.4.0
+docstring_parser==0.16
+importlib_resources==6.4.5
 java-utilities==0.3.0
-jedi==0.18.2
-jpy==0.17.0
+jedi==0.19.1
+jpy==1.0.0
 llvmlite==0.43.0
 numba==0.60.0
-numpy==2.0.0
-pandas==2.2.2
+numpy==2.0.2
+pandas==2.2.3
 parso==0.8.4
-pyarrow==16.1.0
+pyarrow==18.1.0
 python-dateutil==2.9.0.post0
-pytz==2024.1
-six==1.16.0
+pytz==2024.2
+six==1.17.0
 typing_extensions==4.12.2
-tzdata==2024.1
+tzdata==2024.2
diff --git a/docker/server/src/main/server-netty/requirements.txt b/docker/server/src/main/server-netty/requirements.txt
index 2c8f2a5c262..7eb0af1edf0 100644
--- a/docker/server/src/main/server-netty/requirements.txt
+++ b/docker/server/src/main/server-netty/requirements.txt
@@ -1,19 +1,20 @@
-adbc-driver-manager==1.0.0
-adbc-driver-postgresql==1.0.0
-connectorx==0.3.3; platform.machine == 'x86_64'
+adbc-driver-manager==1.3.0
+adbc-driver-postgresql==1.3.0
+connectorx==0.4.0; platform.machine == 'x86_64'
 deephaven-plugin==0.6.0
-importlib_resources==6.4.0
+docstring_parser==0.16
+importlib_resources==6.4.5
 java-utilities==0.3.0
-jedi==0.18.2
-jpy==0.17.0
+jedi==0.19.1
+jpy==1.0.0
 llvmlite==0.43.0
 numba==0.60.0
-numpy==2.0.0
-pandas==2.2.2
+numpy==2.0.2
+pandas==2.2.3
 parso==0.8.4
-pyarrow==16.1.0
+pyarrow==18.1.0
 python-dateutil==2.9.0.post0
-pytz==2024.1
-six==1.16.0
+pytz==2024.2
+six==1.17.0
 typing_extensions==4.12.2
-tzdata==2024.1
+tzdata==2024.2
diff --git a/docker/web-plugin-packager/README.md b/docker/web-plugin-packager/README.md
index a9cab5dcaf1..0bbf38f3dc7 100644
--- a/docker/web-plugin-packager/README.md
+++ b/docker/web-plugin-packager/README.md
@@ -4,7 +4,7 @@ web-plugin-packager is a docker image used to package JS plugins for the Deephav
 
 ## Usage
 
-First, follow the instructions to [Launch Deephaven from pre-built images](https://deephaven.io/core/docs/tutorials/quickstart/#set-up-your-deephaven-deployment).
+First, follow the instructions to [Launch Deephaven from pre-built images](https://deephaven.io/core/docs/getting-started/quickstart/#set-up-your-deephaven-deployment).
 
 Once you have the `docker-compose.yml` file pulled down, define your own web docker image in `web/Dockerfile` that includes the plugins you would like to use. 
 
diff --git a/engine/api/build.gradle b/engine/api/build.gradle
index f6e10a07df2..5e39ec18ac3 100644
--- a/engine/api/build.gradle
+++ b/engine/api/build.gradle
@@ -17,22 +17,24 @@ dependencies {
     api project(':engine-rowset')
 
     implementation project(':DataStructures')
-    implementation depTrove3
+    implementation libs.trove
 
-    Classpaths.inheritImmutables(project)
-    Classpaths.inheritGuava(project)
+    compileOnly project(':util-immutables')
+    annotationProcessor libs.immutables.value
 
-    compileOnly 'com.google.code.findbugs:jsr305:3.0.2'
+    implementation libs.guava
+
+    compileOnly libs.google.findbugs.jsr305
 
     testImplementation project(':engine-test-utils')
     testImplementation TestTools.projectDependency(project, 'engine-table')
     testImplementation TestTools.projectDependency(project, 'engine-vector')
-    testImplementation depCommonsLang3
+    testImplementation libs.commons.lang3
 
-    Classpaths.inheritJUnitClassic(project, 'testImplementation')
+    testImplementation libs.junit4
 
     testRuntimeOnly project(':log-to-slf4j')
     testRuntimeOnly project(':configs')
     testRuntimeOnly project(':test-configs')
-    Classpaths.inheritSlf4j(project, 'slf4j-simple', 'testRuntimeOnly')
+    testRuntimeOnly libs.slf4j.simple
 }
diff --git a/engine/api/src/main/java/io/deephaven/engine/table/ColumnSource.java b/engine/api/src/main/java/io/deephaven/engine/table/ColumnSource.java
index c70c2fe65a0..2e469486904 100644
--- a/engine/api/src/main/java/io/deephaven/engine/table/ColumnSource.java
+++ b/engine/api/src/main/java/io/deephaven/engine/table/ColumnSource.java
@@ -177,8 +177,34 @@ default void exportAllTo(final Object @NotNull [] dest, @NotNull final T tuple)
      */
     @FinalDefault
     default <TYPE> ColumnSource<TYPE> cast(Class<? extends TYPE> clazz) {
+        return cast(clazz, (String) null);
+    }
+
+    /**
+     * Returns this {@code ColumnSource}, parameterized by {@code <TYPE>}, if the data type of this column (as given by
+     * {@link #getType()}) can be cast to {@code clazz}. This is analogous to casting the objects provided by this
+     * column source to {@code clazz}.
+     * <p>
+     * For example, the following code will throw an exception if the "MyString" column does not actually contain
+     * {@code String} data:
+     *
+     * <pre>
+     *     ColumnSource&lt;String&gt; colSource = table.getColumnSource("MyString").cast(String.class, "MyString")
+     * </pre>
+     * <p>
+     * Due to the nature of type erasure, the JVM will still insert an additional cast to {@code TYPE} when elements are
+     * retrieved from the column source, such as with {@code String myStr = colSource.get(0)}.
+     *
+     * @param clazz The target type.
+     * @param <TYPE> The target type, as a type parameter. Intended to be inferred from {@code clazz}.
+     * @param colName An optional column name, which will be included in exception messages.
+     * @return A {@code ColumnSource} parameterized by {@code TYPE}.
+     */
+    @FinalDefault
+    default <TYPE> ColumnSource<TYPE> cast(Class<? extends TYPE> clazz, @Nullable String colName) {
         Require.neqNull(clazz, "clazz");
-        TypeHelper.checkCastTo("ColumnSource", getType(), clazz);
+        final String castCheckPrefix = colName == null ? "ColumnSource" : "ColumnSource[" + colName + ']';
+        TypeHelper.checkCastTo(castCheckPrefix, getType(), clazz);
         // noinspection unchecked
         return (ColumnSource<TYPE>) this;
     }
@@ -208,8 +234,39 @@ default <TYPE> ColumnSource<TYPE> cast(Class<? extends TYPE> clazz) {
      */
     @FinalDefault
     default <TYPE> ColumnSource<TYPE> cast(Class<? extends TYPE> clazz, @Nullable Class<?> componentType) {
+        return cast(clazz, componentType, null);
+    }
+
+    /**
+     * Returns this {@code ColumnSource}, parameterized by {@code <TYPE>}, if the data type of this column (as given by
+     * {@link #getType()}) can be cast to {@code clazz}. This is analogous to casting the objects provided by this
+     * column source to {@code clazz}. Additionally, this checks that the component type of this column (as given by
+     * {@link #getComponentType()}) can be cast to {@code componentType} (both must be present and castable, or both
+     * must be {@code null}).
+     *
+     * <p>
+     * For example, the following code will throw an exception if the "MyString" column does not actually contain
+     * {@code String} data:
+     *
+     * <pre>
+     *     ColumnSource&lt;String&gt; colSource = table.getColumnSource("MyString").cast(String.class, null, "MyString")
+     * </pre>
+     * <p>
+     * Due to the nature of type erasure, the JVM will still insert an additional cast to {@code TYPE} when elements are
+     * retrieved from the column source, such as with {@code String myStr = colSource.get(0)}.
+     *
+     * @param clazz The target type.
+     * @param componentType The target component type, may be {@code null}.
+     * @param colName An optional column name, which will be included in exception messages.
+     * @param <TYPE> The target type, as a type parameter. Intended to be inferred from {@code clazz}.
+     * @return A {@code ColumnSource} parameterized by {@code TYPE}.
+     */
+    @FinalDefault
+    default <TYPE> ColumnSource<TYPE> cast(Class<? extends TYPE> clazz, @Nullable Class<?> componentType,
+            @Nullable String colName) {
         Require.neqNull(clazz, "clazz");
-        TypeHelper.checkCastTo("ColumnSource", getType(), getComponentType(), clazz, componentType);
+        final String castCheckPrefix = colName == null ? "ColumnSource" : "ColumnSource[" + colName + ']';
+        TypeHelper.checkCastTo(castCheckPrefix, getType(), getComponentType(), clazz, componentType);
         // noinspection unchecked
         return (ColumnSource<TYPE>) this;
     }
diff --git a/engine/api/src/main/java/io/deephaven/engine/table/ModifiedColumnSet.java b/engine/api/src/main/java/io/deephaven/engine/table/ModifiedColumnSet.java
index 394c5e9bd0b..0b7f8698eeb 100644
--- a/engine/api/src/main/java/io/deephaven/engine/table/ModifiedColumnSet.java
+++ b/engine/api/src/main/java/io/deephaven/engine/table/ModifiedColumnSet.java
@@ -7,7 +7,6 @@
 import gnu.trove.impl.Constants;
 import gnu.trove.map.hash.TObjectIntHashMap;
 import io.deephaven.base.verify.Assert;
-import io.deephaven.datastructures.util.CollectionUtil;
 import io.deephaven.util.type.ArrayTypeUtils;
 
 import java.util.BitSet;
@@ -264,7 +263,7 @@ default void transform(final ModifiedColumnSet input, final ModifiedColumnSet ou
      */
     public ModifiedColumnSet(final Map<String, ColumnSource<?>> columns) {
         this.columns = columns;
-        columnNames = columns.keySet().toArray(CollectionUtil.ZERO_LENGTH_STRING_ARRAY);
+        columnNames = columns.keySet().toArray(String[]::new);
         idMap = new TObjectIntHashMap<>(columnNames.length, Constants.DEFAULT_LOAD_FACTOR, -1);
         for (int i = 0; i < columnNames.length; ++i) {
             idMap.put(columnNames[i], i);
diff --git a/engine/api/src/main/java/io/deephaven/engine/table/Table.java b/engine/api/src/main/java/io/deephaven/engine/table/Table.java
index 2fe32eab3b7..c784a10fedb 100644
--- a/engine/api/src/main/java/io/deephaven/engine/table/Table.java
+++ b/engine/api/src/main/java/io/deephaven/engine/table/Table.java
@@ -44,8 +44,7 @@ public interface Table extends
     TableDefinition getDefinition();
 
     /**
-     * Provides column metadata in Table form. Convenience method, behaves exactly the same as
-     * getDefinition().getColumnDefinitionsTable().
+     * Provides column metadata in Table form.
      *
      * @return A Table of metadata about this Table's columns.
      */
@@ -302,6 +301,9 @@ public interface Table extends
 
     <DATA_TYPE> CloseableIterator<DATA_TYPE> objectColumnIterator(@NotNull String columnName);
 
+    <DATA_TYPE> CloseableIterator<DATA_TYPE> objectColumnIterator(@NotNull String columnName,
+            @NotNull Class<? extends DATA_TYPE> clazz);
+
     // -----------------------------------------------------------------------------------------------------------------
     // Filter Operations
     // -----------------------------------------------------------------------------------------------------------------
@@ -451,35 +453,6 @@ public interface Table extends
     // Slice Operations
     // -----------------------------------------------------------------------------------------------------------------
 
-    /**
-     * Extracts a subset of a table by row position.
-     * <p>
-     * If both firstPosition and lastPosition are positive, then the rows are counted from the beginning of the table.
-     * The firstPosition is inclusive, and the lastPosition is exclusive. The {@link #head}(N) call is equivalent to
-     * slice(0, N). The firstPosition must be less than or equal to the lastPosition.
-     * <p>
-     * If firstPosition is positive and lastPosition is negative, then the firstRow is counted from the beginning of the
-     * table, inclusively. The lastPosition is counted from the end of the table. For example, slice(1, -1) includes all
-     * rows but the first and last. If the lastPosition would be before the firstRow, the result is an emptyTable.
-     * <p>
-     * If firstPosition is negative, and lastPosition is zero, then the firstRow is counted from the end of the table,
-     * and the end of the slice is the size of the table. slice(-N, 0) is equivalent to {@link #tail}(N).
-     * <p>
-     * If the firstPosition is negative and the lastPosition is negative, they are both counted from the end of the
-     * table. For example, slice(-2, -1) returns the second to last row of the table.
-     * <p>
-     * If firstPosition is negative and lastPosition is positive, then firstPosition is counted from the end of the
-     * table, inclusively. The lastPosition is counted from the beginning of the table, exclusively. For example,
-     * slice(-3, 5) returns all rows starting from the third-last row to the fifth row of the table. If there are no
-     * rows between these positions, the function will return an empty table.
-     *
-     * @param firstPositionInclusive the first position to include in the result
-     * @param lastPositionExclusive the last position to include in the result
-     * @return a new Table, which is the request subset of rows from the original table
-     */
-    @ConcurrentMethod
-    Table slice(long firstPositionInclusive, long lastPositionExclusive);
-
     /**
      * Extracts a subset of a table by row percentages.
      * <p>
diff --git a/engine/base/src/main/java/io/deephaven/engine/table/impl/chunkboxer/ChunkBoxer.java b/engine/base/src/main/java/io/deephaven/engine/table/impl/chunkboxer/ChunkBoxer.java
index 0f295838f73..73c2799de7c 100644
--- a/engine/base/src/main/java/io/deephaven/engine/table/impl/chunkboxer/ChunkBoxer.java
+++ b/engine/base/src/main/java/io/deephaven/engine/table/impl/chunkboxer/ChunkBoxer.java
@@ -7,6 +7,7 @@
 import io.deephaven.chunk.attributes.Values;
 import io.deephaven.engine.table.Context;
 import io.deephaven.util.type.TypeUtils;
+import org.jetbrains.annotations.NotNull;
 
 /**
  * Convert an arbitrary chunk to a chunk of boxed objects.
@@ -14,17 +15,54 @@
 public class ChunkBoxer {
 
     /**
-     * Return a chunk that contains boxed Objects representing the primitive values in primitives.
+     * Return a chunk that contains boxed {@link Object Objects} representing the primitive values in {@code values}.
      */
     public interface BoxerKernel extends Context {
         /**
-         * Convert all primitives to an object.
+         * Box all values into {@link Object Objects} if they are not already {@code Objects}.
          *
-         * @param primitives the primitives to convert
+         * @param values the values to box
          *
-         * @return a chunk containing primitives as an object
+         * @return a chunk containing values as {@code Objects} (not owned by the caller)
          */
-        ObjectChunk<?, ? extends Values> box(Chunk<? extends Values> primitives);
+        ObjectChunk<?, ? extends Values> box(Chunk<? extends Values> values);
+    }
+
+    /**
+     * Box the value at {@code offset} in {@code values}.
+     * <p>
+     * Please use a {@link #getBoxer(ChunkType, int) ChunkBoxer} when boxing multiple values in order to amortize the
+     * cost of implementation lookup and avoid virtual dispatch.
+     *
+     * @param values The chunk containing the value to box
+     * @param offset The offset of the value to box
+     * @return The boxed value
+     * @param <BOXED_TYPE> The type of the boxed value
+     */
+    @SuppressWarnings("unchecked")
+    public static <BOXED_TYPE> BOXED_TYPE boxedGet(@NotNull final Chunk<? extends Values> values, int offset) {
+        final ChunkType type = values.getChunkType();
+        switch (type) {
+            case Boolean:
+                return (BOXED_TYPE) Boolean.valueOf(values.asBooleanChunk().get(offset));
+            case Char:
+                return (BOXED_TYPE) TypeUtils.box(values.asCharChunk().get(offset));
+            case Byte:
+                return (BOXED_TYPE) TypeUtils.box(values.asByteChunk().get(offset));
+            case Short:
+                return (BOXED_TYPE) TypeUtils.box(values.asShortChunk().get(offset));
+            case Int:
+                return (BOXED_TYPE) TypeUtils.box(values.asIntChunk().get(offset));
+            case Long:
+                return (BOXED_TYPE) TypeUtils.box(values.asLongChunk().get(offset));
+            case Float:
+                return (BOXED_TYPE) TypeUtils.box(values.asFloatChunk().get(offset));
+            case Double:
+                return (BOXED_TYPE) TypeUtils.box(values.asDoubleChunk().get(offset));
+            case Object:
+                return (BOXED_TYPE) values.asObjectChunk().get(offset);
+        }
+        throw new IllegalArgumentException("Unknown type: " + type);
     }
 
     public static BoxerKernel getBoxer(ChunkType type, int capacity) {
@@ -55,8 +93,8 @@ public static BoxerKernel getBoxer(ChunkType type, int capacity) {
 
     private static class ObjectBoxer implements BoxerKernel {
         @Override
-        public ObjectChunk<?, ? extends Values> box(Chunk<? extends Values> primitives) {
-            return primitives.asObjectChunk();
+        public ObjectChunk<?, ? extends Values> box(Chunk<? extends Values> values) {
+            return values.asObjectChunk();
         }
     }
 
@@ -79,13 +117,13 @@ private static class BooleanBoxer extends BoxerCommon {
         }
 
         @Override
-        public ObjectChunk<?, ? extends Values> box(Chunk<? extends Values> primitives) {
-            final BooleanChunk<? extends Values> booleanChunk = primitives.asBooleanChunk();
-            for (int ii = 0; ii < primitives.size(); ++ii) {
+        public ObjectChunk<?, ? extends Values> box(Chunk<? extends Values> values) {
+            final BooleanChunk<? extends Values> booleanChunk = values.asBooleanChunk();
+            for (int ii = 0; ii < values.size(); ++ii) {
                 // noinspection UnnecessaryBoxing
                 objectChunk.set(ii, Boolean.valueOf(booleanChunk.get(ii)));
             }
-            objectChunk.setSize(primitives.size());
+            objectChunk.setSize(values.size());
             return objectChunk;
         }
     }
@@ -96,12 +134,12 @@ private static class CharBoxer extends BoxerCommon {
         }
 
         @Override
-        public ObjectChunk<?, ? extends Values> box(Chunk<? extends Values> primitives) {
-            final CharChunk<? extends Values> charChunk = primitives.asCharChunk();
-            for (int ii = 0; ii < primitives.size(); ++ii) {
-                objectChunk.set(ii, io.deephaven.util.type.TypeUtils.box(charChunk.get(ii)));
+        public ObjectChunk<?, ? extends Values> box(Chunk<? extends Values> values) {
+            final CharChunk<? extends Values> charChunk = values.asCharChunk();
+            for (int ii = 0; ii < values.size(); ++ii) {
+                objectChunk.set(ii, TypeUtils.box(charChunk.get(ii)));
             }
-            objectChunk.setSize(primitives.size());
+            objectChunk.setSize(values.size());
             return objectChunk;
         }
     }
@@ -112,12 +150,12 @@ private static class ByteBoxer extends BoxerCommon {
         }
 
         @Override
-        public ObjectChunk<?, ? extends Values> box(Chunk<? extends Values> primitives) {
-            final ByteChunk<? extends Values> byteChunk = primitives.asByteChunk();
-            for (int ii = 0; ii < primitives.size(); ++ii) {
-                objectChunk.set(ii, io.deephaven.util.type.TypeUtils.box(byteChunk.get(ii)));
+        public ObjectChunk<?, ? extends Values> box(Chunk<? extends Values> values) {
+            final ByteChunk<? extends Values> byteChunk = values.asByteChunk();
+            for (int ii = 0; ii < values.size(); ++ii) {
+                objectChunk.set(ii, TypeUtils.box(byteChunk.get(ii)));
             }
-            objectChunk.setSize(primitives.size());
+            objectChunk.setSize(values.size());
             return objectChunk;
         }
     }
@@ -128,12 +166,12 @@ private static class ShortBoxer extends BoxerCommon {
         }
 
         @Override
-        public ObjectChunk<?, ? extends Values> box(Chunk<? extends Values> primitives) {
-            final ShortChunk<? extends Values> shortChunk = primitives.asShortChunk();
-            for (int ii = 0; ii < primitives.size(); ++ii) {
-                objectChunk.set(ii, io.deephaven.util.type.TypeUtils.box(shortChunk.get(ii)));
+        public ObjectChunk<?, ? extends Values> box(Chunk<? extends Values> values) {
+            final ShortChunk<? extends Values> shortChunk = values.asShortChunk();
+            for (int ii = 0; ii < values.size(); ++ii) {
+                objectChunk.set(ii, TypeUtils.box(shortChunk.get(ii)));
             }
-            objectChunk.setSize(primitives.size());
+            objectChunk.setSize(values.size());
             return objectChunk;
         }
     }
@@ -144,12 +182,12 @@ private static class IntBoxer extends BoxerCommon {
         }
 
         @Override
-        public ObjectChunk<?, ? extends Values> box(Chunk<? extends Values> primitives) {
-            final IntChunk<? extends Values> intChunk = primitives.asIntChunk();
-            for (int ii = 0; ii < primitives.size(); ++ii) {
-                objectChunk.set(ii, io.deephaven.util.type.TypeUtils.box(intChunk.get(ii)));
+        public ObjectChunk<?, ? extends Values> box(Chunk<? extends Values> values) {
+            final IntChunk<? extends Values> intChunk = values.asIntChunk();
+            for (int ii = 0; ii < values.size(); ++ii) {
+                objectChunk.set(ii, TypeUtils.box(intChunk.get(ii)));
             }
-            objectChunk.setSize(primitives.size());
+            objectChunk.setSize(values.size());
             return objectChunk;
         }
     }
@@ -160,12 +198,12 @@ private static class LongBoxer extends BoxerCommon {
         }
 
         @Override
-        public ObjectChunk<?, ? extends Values> box(Chunk<? extends Values> primitives) {
-            final LongChunk<? extends Values> longChunk = primitives.asLongChunk();
-            for (int ii = 0; ii < primitives.size(); ++ii) {
-                objectChunk.set(ii, io.deephaven.util.type.TypeUtils.box(longChunk.get(ii)));
+        public ObjectChunk<?, ? extends Values> box(Chunk<? extends Values> values) {
+            final LongChunk<? extends Values> longChunk = values.asLongChunk();
+            for (int ii = 0; ii < values.size(); ++ii) {
+                objectChunk.set(ii, TypeUtils.box(longChunk.get(ii)));
             }
-            objectChunk.setSize(primitives.size());
+            objectChunk.setSize(values.size());
             return objectChunk;
         }
     }
@@ -176,12 +214,12 @@ private static class FloatBoxer extends BoxerCommon {
         }
 
         @Override
-        public ObjectChunk<?, ? extends Values> box(Chunk<? extends Values> primitives) {
-            final FloatChunk<? extends Values> floatChunk = primitives.asFloatChunk();
-            for (int ii = 0; ii < primitives.size(); ++ii) {
-                objectChunk.set(ii, io.deephaven.util.type.TypeUtils.box(floatChunk.get(ii)));
+        public ObjectChunk<?, ? extends Values> box(Chunk<? extends Values> values) {
+            final FloatChunk<? extends Values> floatChunk = values.asFloatChunk();
+            for (int ii = 0; ii < values.size(); ++ii) {
+                objectChunk.set(ii, TypeUtils.box(floatChunk.get(ii)));
             }
-            objectChunk.setSize(primitives.size());
+            objectChunk.setSize(values.size());
             return objectChunk;
         }
     }
@@ -192,12 +230,12 @@ private static class DoubleBoxer extends BoxerCommon {
         }
 
         @Override
-        public ObjectChunk<?, ? extends Values> box(Chunk<? extends Values> primitives) {
-            final DoubleChunk<? extends Values> doubleChunk = primitives.asDoubleChunk();
-            for (int ii = 0; ii < primitives.size(); ++ii) {
+        public ObjectChunk<?, ? extends Values> box(Chunk<? extends Values> values) {
+            final DoubleChunk<? extends Values> doubleChunk = values.asDoubleChunk();
+            for (int ii = 0; ii < values.size(); ++ii) {
                 objectChunk.set(ii, TypeUtils.box(doubleChunk.get(ii)));
             }
-            objectChunk.setSize(primitives.size());
+            objectChunk.setSize(values.size());
             return objectChunk;
         }
     }
diff --git a/engine/benchmark/build.gradle b/engine/benchmark/build.gradle
index a05786cd526..1f782cf62c9 100644
--- a/engine/benchmark/build.gradle
+++ b/engine/benchmark/build.gradle
@@ -20,8 +20,8 @@ dependencies {
             TestTools.projectDependency(project, 'engine-rowset'),
             TestTools.projectDependency(project, 'engine-table')
 
-    testAnnotationProcessor 'org.openjdk.jmh:jmh-generator-annprocess:1.35'
-    testCompileOnly 'org.openjdk.jmh:jmh-generator-annprocess:1.35'
+    testAnnotationProcessor libs.jmh.generator.annprocess
+    testCompileOnly libs.jmh.generator.annprocess
 
     testRuntimeOnly project(path: ':configs')
     testRuntimeOnly project(path: ':test-configs')
diff --git a/engine/benchmark/src/benchmark/java/io/deephaven/benchmark/engine/LastByBenchmark.java b/engine/benchmark/src/benchmark/java/io/deephaven/benchmark/engine/LastByBenchmark.java
index 1c027af1612..c3dcc331c8e 100644
--- a/engine/benchmark/src/benchmark/java/io/deephaven/benchmark/engine/LastByBenchmark.java
+++ b/engine/benchmark/src/benchmark/java/io/deephaven/benchmark/engine/LastByBenchmark.java
@@ -4,7 +4,6 @@
 package io.deephaven.benchmark.engine;
 
 import io.deephaven.api.agg.Aggregation;
-import io.deephaven.datastructures.util.CollectionUtil;
 import io.deephaven.engine.context.ExecutionContext;
 import io.deephaven.engine.context.TestExecutionContext;
 import io.deephaven.engine.table.Table;
@@ -17,6 +16,7 @@
 import io.deephaven.benchmarking.generator.SequentialNumberGenerator;
 import io.deephaven.benchmarking.impl.PersistentBenchmarkTableBuilder;
 import io.deephaven.benchmarking.runner.TableBenchmarkState;
+import io.deephaven.util.type.ArrayTypeUtils;
 import org.jetbrains.annotations.NotNull;
 import org.openjdk.jmh.annotations.*;
 import org.openjdk.jmh.infra.BenchmarkParams;
@@ -137,7 +137,7 @@ public void setupEnv(BenchmarkParams params) {
             default:
                 throw new IllegalStateException("Unknown KeyType: " + keyType);
         }
-        keyColumnNames = keyCount > 0 ? keyName.split(",") : CollectionUtil.ZERO_LENGTH_STRING_ARRAY;
+        keyColumnNames = keyCount > 0 ? keyName.split(",") : ArrayTypeUtils.EMPTY_STRING_ARRAY;
 
         switch (valueCount) {
             case 8:
diff --git a/engine/benchmark/src/benchmark/java/io/deephaven/benchmark/engine/PercentileByBenchmark.java b/engine/benchmark/src/benchmark/java/io/deephaven/benchmark/engine/PercentileByBenchmark.java
index 4cde9742dc0..8e5b80e50b7 100644
--- a/engine/benchmark/src/benchmark/java/io/deephaven/benchmark/engine/PercentileByBenchmark.java
+++ b/engine/benchmark/src/benchmark/java/io/deephaven/benchmark/engine/PercentileByBenchmark.java
@@ -4,7 +4,6 @@
 package io.deephaven.benchmark.engine;
 
 import io.deephaven.api.agg.spec.AggSpec;
-import io.deephaven.datastructures.util.CollectionUtil;
 import io.deephaven.engine.context.ExecutionContext;
 import io.deephaven.engine.context.TestExecutionContext;
 import io.deephaven.engine.table.Table;
@@ -17,6 +16,7 @@
 import io.deephaven.benchmarking.generator.SequentialNumberGenerator;
 import io.deephaven.benchmarking.impl.PersistentBenchmarkTableBuilder;
 import io.deephaven.benchmarking.runner.TableBenchmarkState;
+import io.deephaven.util.type.ArrayTypeUtils;
 import org.jetbrains.annotations.NotNull;
 import org.openjdk.jmh.annotations.*;
 import org.openjdk.jmh.infra.BenchmarkParams;
@@ -133,7 +133,7 @@ public void setupEnv(BenchmarkParams params) {
             default:
                 throw new IllegalStateException("Unknown KeyType: " + keyType);
         }
-        keyColumnNames = keyCount > 0 ? keyName.split(",") : CollectionUtil.ZERO_LENGTH_STRING_ARRAY;
+        keyColumnNames = keyCount > 0 ? keyName.split(",") : ArrayTypeUtils.EMPTY_STRING_ARRAY;
 
         switch (valueCount) {
             case 8:
diff --git a/engine/benchmark/src/benchmark/java/io/deephaven/benchmark/engine/SumByBenchmark.java b/engine/benchmark/src/benchmark/java/io/deephaven/benchmark/engine/SumByBenchmark.java
index 3e64b8398b5..0e02152ecbc 100644
--- a/engine/benchmark/src/benchmark/java/io/deephaven/benchmark/engine/SumByBenchmark.java
+++ b/engine/benchmark/src/benchmark/java/io/deephaven/benchmark/engine/SumByBenchmark.java
@@ -4,7 +4,6 @@
 package io.deephaven.benchmark.engine;
 
 import io.deephaven.api.agg.Aggregation;
-import io.deephaven.datastructures.util.CollectionUtil;
 import io.deephaven.engine.context.ExecutionContext;
 import io.deephaven.engine.context.TestExecutionContext;
 import io.deephaven.engine.table.Table;
@@ -17,6 +16,7 @@
 import io.deephaven.benchmarking.generator.SequentialNumberGenerator;
 import io.deephaven.benchmarking.impl.PersistentBenchmarkTableBuilder;
 import io.deephaven.benchmarking.runner.TableBenchmarkState;
+import io.deephaven.util.type.ArrayTypeUtils;
 import org.jetbrains.annotations.NotNull;
 import org.openjdk.jmh.annotations.*;
 import org.openjdk.jmh.infra.BenchmarkParams;
@@ -133,7 +133,7 @@ public void setupEnv(BenchmarkParams params) {
             default:
                 throw new IllegalStateException("Unknown KeyType: " + keyType);
         }
-        keyColumnNames = keyCount > 0 ? keyName.split(",") : CollectionUtil.ZERO_LENGTH_STRING_ARRAY;
+        keyColumnNames = keyCount > 0 ? keyName.split(",") : ArrayTypeUtils.EMPTY_STRING_ARRAY;
 
         switch (valueCount) {
             case 8:
diff --git a/engine/chunk/build.gradle b/engine/chunk/build.gradle
index 16aca71378c..f359693611c 100644
--- a/engine/chunk/build.gradle
+++ b/engine/chunk/build.gradle
@@ -7,12 +7,13 @@ description 'Engine Chunks: Array-like data structures for dense, efficient data
 
 dependencies {
     api project(':Util')
+    api project(':codec-api:')
     implementation project(':Base')
 
-    Classpaths.inheritJUnitClassic(project, 'testImplementation')
+    testImplementation libs.junit4
 
-    testRuntimeOnly project(':log-to-slf4j'),
-            project(path: ':configs'),
-            project(path: ':test-configs')
-    Classpaths.inheritSlf4j(project, 'slf4j-simple', 'testRuntimeOnly')
+    testRuntimeOnly project(':log-to-slf4j')
+    testRuntimeOnly project(path: ':configs')
+    testRuntimeOnly project(path: ':test-configs')
+    testRuntimeOnly libs.slf4j.simple
 }
diff --git a/engine/chunk/src/main/java/io/deephaven/chunk/Chunk.java b/engine/chunk/src/main/java/io/deephaven/chunk/Chunk.java
index 7de68e126f9..35e152dcd0f 100644
--- a/engine/chunk/src/main/java/io/deephaven/chunk/Chunk.java
+++ b/engine/chunk/src/main/java/io/deephaven/chunk/Chunk.java
@@ -117,8 +117,7 @@ default void copyToBuffer(int srcOffset, @NotNull Buffer destBuffer, int destOff
     default void checkChunkType(ChunkType expected) {
         final ChunkType actual = getChunkType();
         if (actual != expected) {
-            throw new IllegalArgumentException(
-                    String.format("Expected chunk type '%s', but is '%s'.", expected, actual));
+            throw new IllegalArgumentException("Expected chunk type '" + expected + "', but is '" + actual + "'.");
         }
     }
 
diff --git a/engine/chunk/src/main/java/io/deephaven/chunk/ChunkBase.java b/engine/chunk/src/main/java/io/deephaven/chunk/ChunkBase.java
index 05bcfbd3b06..9d885f26720 100644
--- a/engine/chunk/src/main/java/io/deephaven/chunk/ChunkBase.java
+++ b/engine/chunk/src/main/java/io/deephaven/chunk/ChunkBase.java
@@ -44,8 +44,7 @@ public final void internalSetSize(int newSize, long password) {
                     "DO NOT CALL THIS INTERNAL METHOD. Instead call WritableChunk.setSize()");
         }
         if (newSize < 0 || newSize > capacity) {
-            throw new IllegalArgumentException(
-                    String.format("size %d is incompatible with capacity %d", newSize, capacity));
+            throw new IllegalArgumentException("size " + newSize + " is incompatible with capacity " + capacity);
         }
 
         this.size = newSize;
diff --git a/engine/chunk/src/main/java/io/deephaven/chunk/ChunkHelpers.java b/engine/chunk/src/main/java/io/deephaven/chunk/ChunkHelpers.java
index a212837abad..b18e9f59082 100644
--- a/engine/chunk/src/main/java/io/deephaven/chunk/ChunkHelpers.java
+++ b/engine/chunk/src/main/java/io/deephaven/chunk/ChunkHelpers.java
@@ -11,16 +11,14 @@ public class ChunkHelpers {
     static void checkSliceArgs(int size, int offset, int capacity) {
         if (offset < 0 || offset > size || capacity < 0 || capacity > size - offset) {
             throw new IllegalArgumentException(
-                    String.format("New slice offset %d, capacity %d is incompatible with size %d",
-                            offset, capacity, size));
+                    "New slice offset " + offset + ", capacity " + capacity + " is incompatible with size " + size);
         }
     }
 
     static void checkArrayArgs(int arrayLength, int offset, int capacity) {
         if (offset < 0 || capacity < 0 || capacity > arrayLength - offset) {
-            throw new IllegalArgumentException(
-                    String.format("offset %d, capacity %d is incompatible with array of length %d",
-                            offset, capacity, arrayLength));
+            throw new IllegalArgumentException("offset " + offset + ", capacity " + capacity
+                    + " is incompatible with array of length " + arrayLength);
         }
     }
 
diff --git a/engine/chunk/src/main/java/io/deephaven/chunk/sized/SizedBooleanChunk.java b/engine/chunk/src/main/java/io/deephaven/chunk/sized/SizedBooleanChunk.java
index 017a1067e6a..0bac993522f 100644
--- a/engine/chunk/src/main/java/io/deephaven/chunk/sized/SizedBooleanChunk.java
+++ b/engine/chunk/src/main/java/io/deephaven/chunk/sized/SizedBooleanChunk.java
@@ -10,6 +10,7 @@
 import io.deephaven.chunk.WritableBooleanChunk;
 import io.deephaven.chunk.attributes.Any;
 import io.deephaven.util.SafeCloseable;
+import org.jetbrains.annotations.Nullable;
 
 /**
  * A wrapper for a boolean chunk that allows you to resize the chunk to a capacity.
@@ -28,8 +29,9 @@ public SizedBooleanChunk(final int initialSize) {
     /**
      * Get the underlying chunk.
      *
-     * @return the underlying chunk.
+     * @return the underlying chunk. May be {@code null} if the chunk has not been initialized.
      */
+    @Nullable
     public WritableBooleanChunk<T> get() {
         return chunk;
     }
diff --git a/engine/chunk/src/main/java/io/deephaven/chunk/sized/SizedByteChunk.java b/engine/chunk/src/main/java/io/deephaven/chunk/sized/SizedByteChunk.java
index 3b7f13d418d..1159257af7a 100644
--- a/engine/chunk/src/main/java/io/deephaven/chunk/sized/SizedByteChunk.java
+++ b/engine/chunk/src/main/java/io/deephaven/chunk/sized/SizedByteChunk.java
@@ -10,6 +10,7 @@
 import io.deephaven.chunk.WritableByteChunk;
 import io.deephaven.chunk.attributes.Any;
 import io.deephaven.util.SafeCloseable;
+import org.jetbrains.annotations.Nullable;
 
 /**
  * A wrapper for a byte chunk that allows you to resize the chunk to a capacity.
@@ -28,8 +29,9 @@ public SizedByteChunk(final int initialSize) {
     /**
      * Get the underlying chunk.
      *
-     * @return the underlying chunk.
+     * @return the underlying chunk. May be {@code null} if the chunk has not been initialized.
      */
+    @Nullable
     public WritableByteChunk<T> get() {
         return chunk;
     }
diff --git a/engine/chunk/src/main/java/io/deephaven/chunk/sized/SizedCharChunk.java b/engine/chunk/src/main/java/io/deephaven/chunk/sized/SizedCharChunk.java
index 561c0fe751e..a0d5bb959e0 100644
--- a/engine/chunk/src/main/java/io/deephaven/chunk/sized/SizedCharChunk.java
+++ b/engine/chunk/src/main/java/io/deephaven/chunk/sized/SizedCharChunk.java
@@ -6,6 +6,7 @@
 import io.deephaven.chunk.WritableCharChunk;
 import io.deephaven.chunk.attributes.Any;
 import io.deephaven.util.SafeCloseable;
+import org.jetbrains.annotations.Nullable;
 
 /**
  * A wrapper for a char chunk that allows you to resize the chunk to a capacity.
@@ -24,8 +25,9 @@ public SizedCharChunk(final int initialSize) {
     /**
      * Get the underlying chunk.
      *
-     * @return the underlying chunk.
+     * @return the underlying chunk. May be {@code null} if the chunk has not been initialized.
      */
+    @Nullable
     public WritableCharChunk<T> get() {
         return chunk;
     }
diff --git a/engine/chunk/src/main/java/io/deephaven/chunk/sized/SizedDoubleChunk.java b/engine/chunk/src/main/java/io/deephaven/chunk/sized/SizedDoubleChunk.java
index 0e7dd168df3..014524f8ccf 100644
--- a/engine/chunk/src/main/java/io/deephaven/chunk/sized/SizedDoubleChunk.java
+++ b/engine/chunk/src/main/java/io/deephaven/chunk/sized/SizedDoubleChunk.java
@@ -10,6 +10,7 @@
 import io.deephaven.chunk.WritableDoubleChunk;
 import io.deephaven.chunk.attributes.Any;
 import io.deephaven.util.SafeCloseable;
+import org.jetbrains.annotations.Nullable;
 
 /**
  * A wrapper for a double chunk that allows you to resize the chunk to a capacity.
@@ -28,8 +29,9 @@ public SizedDoubleChunk(final int initialSize) {
     /**
      * Get the underlying chunk.
      *
-     * @return the underlying chunk.
+     * @return the underlying chunk. May be {@code null} if the chunk has not been initialized.
      */
+    @Nullable
     public WritableDoubleChunk<T> get() {
         return chunk;
     }
diff --git a/engine/chunk/src/main/java/io/deephaven/chunk/sized/SizedFloatChunk.java b/engine/chunk/src/main/java/io/deephaven/chunk/sized/SizedFloatChunk.java
index 6608a71e7fe..b84b1a2b302 100644
--- a/engine/chunk/src/main/java/io/deephaven/chunk/sized/SizedFloatChunk.java
+++ b/engine/chunk/src/main/java/io/deephaven/chunk/sized/SizedFloatChunk.java
@@ -10,6 +10,7 @@
 import io.deephaven.chunk.WritableFloatChunk;
 import io.deephaven.chunk.attributes.Any;
 import io.deephaven.util.SafeCloseable;
+import org.jetbrains.annotations.Nullable;
 
 /**
  * A wrapper for a float chunk that allows you to resize the chunk to a capacity.
@@ -28,8 +29,9 @@ public SizedFloatChunk(final int initialSize) {
     /**
      * Get the underlying chunk.
      *
-     * @return the underlying chunk.
+     * @return the underlying chunk. May be {@code null} if the chunk has not been initialized.
      */
+    @Nullable
     public WritableFloatChunk<T> get() {
         return chunk;
     }
diff --git a/engine/chunk/src/main/java/io/deephaven/chunk/sized/SizedIntChunk.java b/engine/chunk/src/main/java/io/deephaven/chunk/sized/SizedIntChunk.java
index 676fb93456d..a68293f79f0 100644
--- a/engine/chunk/src/main/java/io/deephaven/chunk/sized/SizedIntChunk.java
+++ b/engine/chunk/src/main/java/io/deephaven/chunk/sized/SizedIntChunk.java
@@ -10,6 +10,7 @@
 import io.deephaven.chunk.WritableIntChunk;
 import io.deephaven.chunk.attributes.Any;
 import io.deephaven.util.SafeCloseable;
+import org.jetbrains.annotations.Nullable;
 
 /**
  * A wrapper for a int chunk that allows you to resize the chunk to a capacity.
@@ -28,8 +29,9 @@ public SizedIntChunk(final int initialSize) {
     /**
      * Get the underlying chunk.
      *
-     * @return the underlying chunk.
+     * @return the underlying chunk. May be {@code null} if the chunk has not been initialized.
      */
+    @Nullable
     public WritableIntChunk<T> get() {
         return chunk;
     }
diff --git a/engine/chunk/src/main/java/io/deephaven/chunk/sized/SizedLongChunk.java b/engine/chunk/src/main/java/io/deephaven/chunk/sized/SizedLongChunk.java
index 68bcf288040..97f1ab928d5 100644
--- a/engine/chunk/src/main/java/io/deephaven/chunk/sized/SizedLongChunk.java
+++ b/engine/chunk/src/main/java/io/deephaven/chunk/sized/SizedLongChunk.java
@@ -10,6 +10,7 @@
 import io.deephaven.chunk.WritableLongChunk;
 import io.deephaven.chunk.attributes.Any;
 import io.deephaven.util.SafeCloseable;
+import org.jetbrains.annotations.Nullable;
 
 /**
  * A wrapper for a long chunk that allows you to resize the chunk to a capacity.
@@ -28,8 +29,9 @@ public SizedLongChunk(final int initialSize) {
     /**
      * Get the underlying chunk.
      *
-     * @return the underlying chunk.
+     * @return the underlying chunk. May be {@code null} if the chunk has not been initialized.
      */
+    @Nullable
     public WritableLongChunk<T> get() {
         return chunk;
     }
diff --git a/engine/chunk/src/main/java/io/deephaven/chunk/sized/SizedObjectChunk.java b/engine/chunk/src/main/java/io/deephaven/chunk/sized/SizedObjectChunk.java
index c5cd5e54b4b..b8742a964ce 100644
--- a/engine/chunk/src/main/java/io/deephaven/chunk/sized/SizedObjectChunk.java
+++ b/engine/chunk/src/main/java/io/deephaven/chunk/sized/SizedObjectChunk.java
@@ -10,6 +10,7 @@
 import io.deephaven.chunk.WritableObjectChunk;
 import io.deephaven.chunk.attributes.Any;
 import io.deephaven.util.SafeCloseable;
+import org.jetbrains.annotations.Nullable;
 
 /**
  * A wrapper for a Object chunk that allows you to resize the chunk to a capacity.
@@ -28,8 +29,9 @@ public SizedObjectChunk(final int initialSize) {
     /**
      * Get the underlying chunk.
      *
-     * @return the underlying chunk.
+     * @return the underlying chunk. May be {@code null} if the chunk has not been initialized.
      */
+    @Nullable
     public WritableObjectChunk<T, ATTR> get() {
         return chunk;
     }
diff --git a/engine/chunk/src/main/java/io/deephaven/chunk/sized/SizedShortChunk.java b/engine/chunk/src/main/java/io/deephaven/chunk/sized/SizedShortChunk.java
index 2c112f4f0f7..e27e5cb1a30 100644
--- a/engine/chunk/src/main/java/io/deephaven/chunk/sized/SizedShortChunk.java
+++ b/engine/chunk/src/main/java/io/deephaven/chunk/sized/SizedShortChunk.java
@@ -10,6 +10,7 @@
 import io.deephaven.chunk.WritableShortChunk;
 import io.deephaven.chunk.attributes.Any;
 import io.deephaven.util.SafeCloseable;
+import org.jetbrains.annotations.Nullable;
 
 /**
  * A wrapper for a short chunk that allows you to resize the chunk to a capacity.
@@ -28,8 +29,9 @@ public SizedShortChunk(final int initialSize) {
     /**
      * Get the underlying chunk.
      *
-     * @return the underlying chunk.
+     * @return the underlying chunk. May be {@code null} if the chunk has not been initialized.
      */
+    @Nullable
     public WritableShortChunk<T> get() {
         return chunk;
     }
diff --git a/engine/chunk/src/main/java/io/deephaven/chunk/util/hashing/BooleanChunkEquals.java b/engine/chunk/src/main/java/io/deephaven/chunk/util/hashing/BooleanChunkEquals.java
index 72d93282f9e..288026a803a 100644
--- a/engine/chunk/src/main/java/io/deephaven/chunk/util/hashing/BooleanChunkEquals.java
+++ b/engine/chunk/src/main/java/io/deephaven/chunk/util/hashing/BooleanChunkEquals.java
@@ -10,6 +10,7 @@
 import io.deephaven.chunk.*;
 import io.deephaven.chunk.attributes.Any;
 import io.deephaven.chunk.attributes.ChunkPositions;
+import io.deephaven.util.compare.BooleanComparisons;
 
 // region name
 public class BooleanChunkEquals implements ChunkEquals {
@@ -250,7 +251,7 @@ public void andEqualPairs(IntChunk<ChunkPositions> chunkPositionsToCheckForEqual
 
     // region eq
     static private boolean eq(boolean lhs, boolean rhs) {
-        return lhs == rhs;
+        return BooleanComparisons.eq(lhs, rhs);
     }
     // endregion eq
 
diff --git a/engine/chunk/src/main/java/io/deephaven/chunk/util/hashing/BooleanChunkHasher.java b/engine/chunk/src/main/java/io/deephaven/chunk/util/hashing/BooleanChunkHasher.java
index 99355911208..e399c815718 100644
--- a/engine/chunk/src/main/java/io/deephaven/chunk/util/hashing/BooleanChunkHasher.java
+++ b/engine/chunk/src/main/java/io/deephaven/chunk/util/hashing/BooleanChunkHasher.java
@@ -12,6 +12,7 @@
 import io.deephaven.chunk.WritableIntChunk;
 import io.deephaven.chunk.attributes.HashCodes;
 import io.deephaven.chunk.attributes.Values;
+import io.deephaven.util.compare.BooleanComparisons;
 import io.deephaven.util.type.TypeUtils;
 
 import static io.deephaven.chunk.util.hashing.ChunkHasher.scrambleHash;
@@ -35,7 +36,7 @@ private static void hashSecondary(BooleanChunk<Values> values, WritableIntChunk<
     }
 
     public static int hashInitialSingle(boolean value) {
-        return scrambleHash(Boolean.hashCode(value));
+        return scrambleHash(BooleanComparisons.hashCode(value));
     }
 
     public static int hashUpdateSingle(int existing, boolean newValue) {
diff --git a/engine/chunk/src/main/java/io/deephaven/chunk/util/hashing/ByteChunkEquals.java b/engine/chunk/src/main/java/io/deephaven/chunk/util/hashing/ByteChunkEquals.java
index 07061189ca3..84c55efb526 100644
--- a/engine/chunk/src/main/java/io/deephaven/chunk/util/hashing/ByteChunkEquals.java
+++ b/engine/chunk/src/main/java/io/deephaven/chunk/util/hashing/ByteChunkEquals.java
@@ -10,6 +10,7 @@
 import io.deephaven.chunk.*;
 import io.deephaven.chunk.attributes.Any;
 import io.deephaven.chunk.attributes.ChunkPositions;
+import io.deephaven.util.compare.ByteComparisons;
 
 // region name
 public class ByteChunkEquals implements ChunkEquals {
@@ -250,7 +251,7 @@ public void andEqualPairs(IntChunk<ChunkPositions> chunkPositionsToCheckForEqual
 
     // region eq
     static private boolean eq(byte lhs, byte rhs) {
-        return lhs == rhs;
+        return ByteComparisons.eq(lhs, rhs);
     }
     // endregion eq
 
diff --git a/engine/chunk/src/main/java/io/deephaven/chunk/util/hashing/ByteChunkHasher.java b/engine/chunk/src/main/java/io/deephaven/chunk/util/hashing/ByteChunkHasher.java
index b0a402acec9..06031ea68c7 100644
--- a/engine/chunk/src/main/java/io/deephaven/chunk/util/hashing/ByteChunkHasher.java
+++ b/engine/chunk/src/main/java/io/deephaven/chunk/util/hashing/ByteChunkHasher.java
@@ -12,6 +12,7 @@
 import io.deephaven.chunk.WritableIntChunk;
 import io.deephaven.chunk.attributes.HashCodes;
 import io.deephaven.chunk.attributes.Values;
+import io.deephaven.util.compare.ByteComparisons;
 import io.deephaven.util.type.TypeUtils;
 
 import static io.deephaven.chunk.util.hashing.ChunkHasher.scrambleHash;
@@ -35,7 +36,7 @@ private static void hashSecondary(ByteChunk<Values> values, WritableIntChunk<Has
     }
 
     public static int hashInitialSingle(byte value) {
-        return scrambleHash(Byte.hashCode(value));
+        return scrambleHash(ByteComparisons.hashCode(value));
     }
 
     public static int hashUpdateSingle(int existing, byte newValue) {
diff --git a/engine/chunk/src/main/java/io/deephaven/chunk/util/hashing/CharChunkEquals.java b/engine/chunk/src/main/java/io/deephaven/chunk/util/hashing/CharChunkEquals.java
index 83ff524a3f0..07ca2c8f704 100644
--- a/engine/chunk/src/main/java/io/deephaven/chunk/util/hashing/CharChunkEquals.java
+++ b/engine/chunk/src/main/java/io/deephaven/chunk/util/hashing/CharChunkEquals.java
@@ -6,6 +6,7 @@
 import io.deephaven.chunk.*;
 import io.deephaven.chunk.attributes.Any;
 import io.deephaven.chunk.attributes.ChunkPositions;
+import io.deephaven.util.compare.CharComparisons;
 
 // region name
 public class CharChunkEquals implements ChunkEquals {
@@ -246,7 +247,7 @@ public void andEqualPairs(IntChunk<ChunkPositions> chunkPositionsToCheckForEqual
 
     // region eq
     static private boolean eq(char lhs, char rhs) {
-        return lhs == rhs;
+        return CharComparisons.eq(lhs, rhs);
     }
     // endregion eq
 
diff --git a/engine/chunk/src/main/java/io/deephaven/chunk/util/hashing/CharChunkHasher.java b/engine/chunk/src/main/java/io/deephaven/chunk/util/hashing/CharChunkHasher.java
index 63f37712039..cd1f4fe4df6 100644
--- a/engine/chunk/src/main/java/io/deephaven/chunk/util/hashing/CharChunkHasher.java
+++ b/engine/chunk/src/main/java/io/deephaven/chunk/util/hashing/CharChunkHasher.java
@@ -8,6 +8,7 @@
 import io.deephaven.chunk.WritableIntChunk;
 import io.deephaven.chunk.attributes.HashCodes;
 import io.deephaven.chunk.attributes.Values;
+import io.deephaven.util.compare.CharComparisons;
 import io.deephaven.util.type.TypeUtils;
 
 import static io.deephaven.chunk.util.hashing.ChunkHasher.scrambleHash;
@@ -31,7 +32,7 @@ private static void hashSecondary(CharChunk<Values> values, WritableIntChunk<Has
     }
 
     public static int hashInitialSingle(char value) {
-        return scrambleHash(Character.hashCode(value));
+        return scrambleHash(CharComparisons.hashCode(value));
     }
 
     public static int hashUpdateSingle(int existing, char newValue) {
diff --git a/engine/chunk/src/main/java/io/deephaven/chunk/util/hashing/DoubleChunkEquals.java b/engine/chunk/src/main/java/io/deephaven/chunk/util/hashing/DoubleChunkEquals.java
index 5ebfeb66a5f..9084b2ac9c6 100644
--- a/engine/chunk/src/main/java/io/deephaven/chunk/util/hashing/DoubleChunkEquals.java
+++ b/engine/chunk/src/main/java/io/deephaven/chunk/util/hashing/DoubleChunkEquals.java
@@ -10,6 +10,7 @@
 import io.deephaven.chunk.*;
 import io.deephaven.chunk.attributes.Any;
 import io.deephaven.chunk.attributes.ChunkPositions;
+import io.deephaven.util.compare.DoubleComparisons;
 
 // region name
 public class DoubleChunkEquals implements ChunkEquals {
@@ -250,7 +251,7 @@ public void andEqualPairs(IntChunk<ChunkPositions> chunkPositionsToCheckForEqual
 
     // region eq
     static private boolean eq(double lhs, double rhs) {
-        return ((Double.isNaN(lhs) && Double.isNaN(rhs)) || lhs == rhs);
+        return DoubleComparisons.eq(lhs, rhs);
     }
     // endregion eq
 
diff --git a/engine/chunk/src/main/java/io/deephaven/chunk/util/hashing/DoubleChunkHasher.java b/engine/chunk/src/main/java/io/deephaven/chunk/util/hashing/DoubleChunkHasher.java
index 1f95d7fef57..dce7db26f1f 100644
--- a/engine/chunk/src/main/java/io/deephaven/chunk/util/hashing/DoubleChunkHasher.java
+++ b/engine/chunk/src/main/java/io/deephaven/chunk/util/hashing/DoubleChunkHasher.java
@@ -12,6 +12,7 @@
 import io.deephaven.chunk.WritableIntChunk;
 import io.deephaven.chunk.attributes.HashCodes;
 import io.deephaven.chunk.attributes.Values;
+import io.deephaven.util.compare.DoubleComparisons;
 import io.deephaven.util.type.TypeUtils;
 
 import static io.deephaven.chunk.util.hashing.ChunkHasher.scrambleHash;
@@ -35,7 +36,7 @@ private static void hashSecondary(DoubleChunk<Values> values, WritableIntChunk<H
     }
 
     public static int hashInitialSingle(double value) {
-        return scrambleHash(Double.hashCode(value));
+        return scrambleHash(DoubleComparisons.hashCode(value));
     }
 
     public static int hashUpdateSingle(int existing, double newValue) {
diff --git a/engine/chunk/src/main/java/io/deephaven/chunk/util/hashing/FloatChunkEquals.java b/engine/chunk/src/main/java/io/deephaven/chunk/util/hashing/FloatChunkEquals.java
index 86f72f83a1c..aa2c4cd4f21 100644
--- a/engine/chunk/src/main/java/io/deephaven/chunk/util/hashing/FloatChunkEquals.java
+++ b/engine/chunk/src/main/java/io/deephaven/chunk/util/hashing/FloatChunkEquals.java
@@ -10,6 +10,7 @@
 import io.deephaven.chunk.*;
 import io.deephaven.chunk.attributes.Any;
 import io.deephaven.chunk.attributes.ChunkPositions;
+import io.deephaven.util.compare.FloatComparisons;
 
 // region name
 public class FloatChunkEquals implements ChunkEquals {
@@ -250,7 +251,7 @@ public void andEqualPairs(IntChunk<ChunkPositions> chunkPositionsToCheckForEqual
 
     // region eq
     static private boolean eq(float lhs, float rhs) {
-        return ((Float.isNaN(lhs) && Float.isNaN(rhs)) || lhs == rhs);
+        return FloatComparisons.eq(lhs, rhs);
     }
     // endregion eq
 
diff --git a/engine/chunk/src/main/java/io/deephaven/chunk/util/hashing/FloatChunkHasher.java b/engine/chunk/src/main/java/io/deephaven/chunk/util/hashing/FloatChunkHasher.java
index 79cb8826827..22f0d446f81 100644
--- a/engine/chunk/src/main/java/io/deephaven/chunk/util/hashing/FloatChunkHasher.java
+++ b/engine/chunk/src/main/java/io/deephaven/chunk/util/hashing/FloatChunkHasher.java
@@ -12,6 +12,7 @@
 import io.deephaven.chunk.WritableIntChunk;
 import io.deephaven.chunk.attributes.HashCodes;
 import io.deephaven.chunk.attributes.Values;
+import io.deephaven.util.compare.FloatComparisons;
 import io.deephaven.util.type.TypeUtils;
 
 import static io.deephaven.chunk.util.hashing.ChunkHasher.scrambleHash;
@@ -35,7 +36,7 @@ private static void hashSecondary(FloatChunk<Values> values, WritableIntChunk<Ha
     }
 
     public static int hashInitialSingle(float value) {
-        return scrambleHash(Float.hashCode(value));
+        return scrambleHash(FloatComparisons.hashCode(value));
     }
 
     public static int hashUpdateSingle(int existing, float newValue) {
diff --git a/engine/chunk/src/main/java/io/deephaven/chunk/util/hashing/IntChunkEquals.java b/engine/chunk/src/main/java/io/deephaven/chunk/util/hashing/IntChunkEquals.java
index d07e9bdbe26..8fadea3fa4a 100644
--- a/engine/chunk/src/main/java/io/deephaven/chunk/util/hashing/IntChunkEquals.java
+++ b/engine/chunk/src/main/java/io/deephaven/chunk/util/hashing/IntChunkEquals.java
@@ -10,6 +10,7 @@
 import io.deephaven.chunk.*;
 import io.deephaven.chunk.attributes.Any;
 import io.deephaven.chunk.attributes.ChunkPositions;
+import io.deephaven.util.compare.IntComparisons;
 
 // region name
 public class IntChunkEquals implements ChunkEquals {
@@ -250,7 +251,7 @@ public void andEqualPairs(IntChunk<ChunkPositions> chunkPositionsToCheckForEqual
 
     // region eq
     static private boolean eq(int lhs, int rhs) {
-        return lhs == rhs;
+        return IntComparisons.eq(lhs, rhs);
     }
     // endregion eq
 
diff --git a/engine/chunk/src/main/java/io/deephaven/chunk/util/hashing/IntChunkHasher.java b/engine/chunk/src/main/java/io/deephaven/chunk/util/hashing/IntChunkHasher.java
index ea42f8993d6..816f29cf0e7 100644
--- a/engine/chunk/src/main/java/io/deephaven/chunk/util/hashing/IntChunkHasher.java
+++ b/engine/chunk/src/main/java/io/deephaven/chunk/util/hashing/IntChunkHasher.java
@@ -12,6 +12,7 @@
 import io.deephaven.chunk.WritableIntChunk;
 import io.deephaven.chunk.attributes.HashCodes;
 import io.deephaven.chunk.attributes.Values;
+import io.deephaven.util.compare.IntComparisons;
 import io.deephaven.util.type.TypeUtils;
 
 import static io.deephaven.chunk.util.hashing.ChunkHasher.scrambleHash;
@@ -35,7 +36,7 @@ private static void hashSecondary(IntChunk<Values> values, WritableIntChunk<Hash
     }
 
     public static int hashInitialSingle(int value) {
-        return scrambleHash(Integer.hashCode(value));
+        return scrambleHash(IntComparisons.hashCode(value));
     }
 
     public static int hashUpdateSingle(int existing, int newValue) {
diff --git a/engine/chunk/src/main/java/io/deephaven/chunk/util/hashing/LongChunkEquals.java b/engine/chunk/src/main/java/io/deephaven/chunk/util/hashing/LongChunkEquals.java
index 3ecb7643b04..c2fbf40dd21 100644
--- a/engine/chunk/src/main/java/io/deephaven/chunk/util/hashing/LongChunkEquals.java
+++ b/engine/chunk/src/main/java/io/deephaven/chunk/util/hashing/LongChunkEquals.java
@@ -10,6 +10,7 @@
 import io.deephaven.chunk.*;
 import io.deephaven.chunk.attributes.Any;
 import io.deephaven.chunk.attributes.ChunkPositions;
+import io.deephaven.util.compare.LongComparisons;
 
 // region name
 public class LongChunkEquals implements ChunkEquals {
@@ -250,7 +251,7 @@ public void andEqualPairs(IntChunk<ChunkPositions> chunkPositionsToCheckForEqual
 
     // region eq
     static private boolean eq(long lhs, long rhs) {
-        return lhs == rhs;
+        return LongComparisons.eq(lhs, rhs);
     }
     // endregion eq
 
diff --git a/engine/chunk/src/main/java/io/deephaven/chunk/util/hashing/LongChunkHasher.java b/engine/chunk/src/main/java/io/deephaven/chunk/util/hashing/LongChunkHasher.java
index fd652596f08..5914a681917 100644
--- a/engine/chunk/src/main/java/io/deephaven/chunk/util/hashing/LongChunkHasher.java
+++ b/engine/chunk/src/main/java/io/deephaven/chunk/util/hashing/LongChunkHasher.java
@@ -12,6 +12,7 @@
 import io.deephaven.chunk.WritableIntChunk;
 import io.deephaven.chunk.attributes.HashCodes;
 import io.deephaven.chunk.attributes.Values;
+import io.deephaven.util.compare.LongComparisons;
 import io.deephaven.util.type.TypeUtils;
 
 import static io.deephaven.chunk.util.hashing.ChunkHasher.scrambleHash;
@@ -35,7 +36,7 @@ private static void hashSecondary(LongChunk<Values> values, WritableIntChunk<Has
     }
 
     public static int hashInitialSingle(long value) {
-        return scrambleHash(Long.hashCode(value));
+        return scrambleHash(LongComparisons.hashCode(value));
     }
 
     public static int hashUpdateSingle(int existing, long newValue) {
diff --git a/engine/chunk/src/main/java/io/deephaven/chunk/util/hashing/ObjectChunkDeepEquals.java b/engine/chunk/src/main/java/io/deephaven/chunk/util/hashing/ObjectChunkDeepEquals.java
index 985aca636f1..6c820e34ea6 100644
--- a/engine/chunk/src/main/java/io/deephaven/chunk/util/hashing/ObjectChunkDeepEquals.java
+++ b/engine/chunk/src/main/java/io/deephaven/chunk/util/hashing/ObjectChunkDeepEquals.java
@@ -12,6 +12,7 @@
 import io.deephaven.chunk.*;
 import io.deephaven.chunk.attributes.Any;
 import io.deephaven.chunk.attributes.ChunkPositions;
+import io.deephaven.util.compare.ObjectComparisons;
 
 // region name
 public class ObjectChunkDeepEquals implements ChunkEquals {
diff --git a/engine/chunk/src/main/java/io/deephaven/chunk/util/hashing/ObjectChunkEquals.java b/engine/chunk/src/main/java/io/deephaven/chunk/util/hashing/ObjectChunkEquals.java
index fe2ae7964ae..5420ca7c5fb 100644
--- a/engine/chunk/src/main/java/io/deephaven/chunk/util/hashing/ObjectChunkEquals.java
+++ b/engine/chunk/src/main/java/io/deephaven/chunk/util/hashing/ObjectChunkEquals.java
@@ -12,6 +12,7 @@
 import io.deephaven.chunk.*;
 import io.deephaven.chunk.attributes.Any;
 import io.deephaven.chunk.attributes.ChunkPositions;
+import io.deephaven.util.compare.ObjectComparisons;
 
 // region name
 public class ObjectChunkEquals implements ChunkEquals {
@@ -252,7 +253,7 @@ public void andEqualPairs(IntChunk<ChunkPositions> chunkPositionsToCheckForEqual
 
     // region eq
     static private boolean eq(Object lhs, Object rhs) {
-        return Objects.equals(lhs, rhs);
+        return ObjectComparisons.eq(lhs, rhs);
     }
     // endregion eq
 
diff --git a/engine/chunk/src/main/java/io/deephaven/chunk/util/hashing/ObjectChunkHasher.java b/engine/chunk/src/main/java/io/deephaven/chunk/util/hashing/ObjectChunkHasher.java
index b9c3f968cd7..2d5c1d3fdb5 100644
--- a/engine/chunk/src/main/java/io/deephaven/chunk/util/hashing/ObjectChunkHasher.java
+++ b/engine/chunk/src/main/java/io/deephaven/chunk/util/hashing/ObjectChunkHasher.java
@@ -14,6 +14,7 @@
 import io.deephaven.chunk.WritableIntChunk;
 import io.deephaven.chunk.attributes.HashCodes;
 import io.deephaven.chunk.attributes.Values;
+import io.deephaven.util.compare.ObjectComparisons;
 import io.deephaven.util.type.TypeUtils;
 
 import static io.deephaven.chunk.util.hashing.ChunkHasher.scrambleHash;
@@ -37,7 +38,7 @@ private static void hashSecondary(ObjectChunk<Object, Values> values, WritableIn
     }
 
     public static int hashInitialSingle(Object value) {
-        return scrambleHash(Objects.hashCode(value));
+        return scrambleHash(ObjectComparisons.hashCode(value));
     }
 
     public static int hashUpdateSingle(int existing, Object newValue) {
diff --git a/engine/chunk/src/main/java/io/deephaven/chunk/util/hashing/ObjectChunkIdentityEquals.java b/engine/chunk/src/main/java/io/deephaven/chunk/util/hashing/ObjectChunkIdentityEquals.java
index 50e7c81433d..90a90ab2cf1 100644
--- a/engine/chunk/src/main/java/io/deephaven/chunk/util/hashing/ObjectChunkIdentityEquals.java
+++ b/engine/chunk/src/main/java/io/deephaven/chunk/util/hashing/ObjectChunkIdentityEquals.java
@@ -10,6 +10,7 @@
 import io.deephaven.chunk.*;
 import io.deephaven.chunk.attributes.Any;
 import io.deephaven.chunk.attributes.ChunkPositions;
+import io.deephaven.util.compare.ObjectComparisons;
 
 // region name
 public class ObjectChunkIdentityEquals implements ChunkEquals {
diff --git a/engine/chunk/src/main/java/io/deephaven/chunk/util/hashing/ShortChunkEquals.java b/engine/chunk/src/main/java/io/deephaven/chunk/util/hashing/ShortChunkEquals.java
index a7f9fbe0895..483b81d413f 100644
--- a/engine/chunk/src/main/java/io/deephaven/chunk/util/hashing/ShortChunkEquals.java
+++ b/engine/chunk/src/main/java/io/deephaven/chunk/util/hashing/ShortChunkEquals.java
@@ -10,6 +10,7 @@
 import io.deephaven.chunk.*;
 import io.deephaven.chunk.attributes.Any;
 import io.deephaven.chunk.attributes.ChunkPositions;
+import io.deephaven.util.compare.ShortComparisons;
 
 // region name
 public class ShortChunkEquals implements ChunkEquals {
@@ -250,7 +251,7 @@ public void andEqualPairs(IntChunk<ChunkPositions> chunkPositionsToCheckForEqual
 
     // region eq
     static private boolean eq(short lhs, short rhs) {
-        return lhs == rhs;
+        return ShortComparisons.eq(lhs, rhs);
     }
     // endregion eq
 
diff --git a/engine/chunk/src/main/java/io/deephaven/chunk/util/hashing/ShortChunkHasher.java b/engine/chunk/src/main/java/io/deephaven/chunk/util/hashing/ShortChunkHasher.java
index 3dd8dedd00a..ed4dea12357 100644
--- a/engine/chunk/src/main/java/io/deephaven/chunk/util/hashing/ShortChunkHasher.java
+++ b/engine/chunk/src/main/java/io/deephaven/chunk/util/hashing/ShortChunkHasher.java
@@ -12,6 +12,7 @@
 import io.deephaven.chunk.WritableIntChunk;
 import io.deephaven.chunk.attributes.HashCodes;
 import io.deephaven.chunk.attributes.Values;
+import io.deephaven.util.compare.ShortComparisons;
 import io.deephaven.util.type.TypeUtils;
 
 import static io.deephaven.chunk.util.hashing.ChunkHasher.scrambleHash;
@@ -35,7 +36,7 @@ private static void hashSecondary(ShortChunk<Values> values, WritableIntChunk<Ha
     }
 
     public static int hashInitialSingle(short value) {
-        return scrambleHash(Short.hashCode(value));
+        return scrambleHash(ShortComparisons.hashCode(value));
     }
 
     public static int hashUpdateSingle(int existing, short newValue) {
diff --git a/engine/chunk/src/main/resources/io/deephaven/chunk/Chunk.gwt.xml b/engine/chunk/src/main/resources/io/deephaven/chunk/Chunk.gwt.xml
new file mode 100644
index 00000000000..1f53956d9ae
--- /dev/null
+++ b/engine/chunk/src/main/resources/io/deephaven/chunk/Chunk.gwt.xml
@@ -0,0 +1,6 @@
+<module>
+    <inherits name="io.deephaven.base.Base" />
+    <inherits name="io.deephaven.Util" />
+    <source path="" />
+    <source path="util/pools" excludes="ChunkPoolReleaseTracking.java" />
+</module>
diff --git a/engine/context/build.gradle b/engine/context/build.gradle
index 2b6e72ce090..bd0718bb775 100644
--- a/engine/context/build.gradle
+++ b/engine/context/build.gradle
@@ -5,10 +5,6 @@ plugins {
 
 description 'Engine Context: QueryScope, QueryLibrary and QueryCompiler via ExecutionContext'
 
-configurations {
-    testCompile.extendsFrom junit
-}
-
 dependencies {
     api project(':authentication')
     api project(':Util')
@@ -21,15 +17,15 @@ dependencies {
     implementation project(':table-api')
     implementation project(':IO')
 
-    implementation 'com.github.f4b6a3:uuid-creator:5.2.0'
+    implementation libs.f4b6a3.uuid.creator
 
-    Classpaths.inheritCommonsText(project, 'implementation')
-    Classpaths.inheritImmutables(project)
+    compileOnly project(':util-immutables')
+    annotationProcessor libs.immutables.value
 
     testImplementation project(':engine-test-utils')
 
     testRuntimeOnly project(':log-to-slf4j'),
             project(path: ':configs'),
             project(path: ':test-configs')
-    Classpaths.inheritSlf4j(project, 'slf4j-simple', 'testRuntimeOnly')
+    testRuntimeOnly libs.slf4j.simple
 }
diff --git a/engine/context/src/test/java/io/deephaven/engine/context/TestQueryCompiler.java b/engine/context/src/test/java/io/deephaven/engine/context/TestQueryCompiler.java
index d9bca87a113..cddb86f2291 100644
--- a/engine/context/src/test/java/io/deephaven/engine/context/TestQueryCompiler.java
+++ b/engine/context/src/test/java/io/deephaven/engine/context/TestQueryCompiler.java
@@ -264,18 +264,17 @@ public void testCollidingCompile() throws Exception {
 
     @Test
     public void testMultiCompileWithFailure() throws ExecutionException, InterruptedException {
-        final String goodProgram = String.join(
-                "\n",
+        final String goodProgram = String.join("\n",
                 "public class GoodTest {",
                 "   public static void main (String [] args) {",
                 "   }",
                 "}");
-        final String badProgram = String.join(
-                "\n",
-                "public class BadTest {",
-                "   public static void main (String [] args) {",
-                "   }",
-                "}}");
+        final String badProgram = String.join("\n",
+                "public class Formula {",
+                "    public Formula() {",
+                "        S.badCall(0);",
+                "    }",
+                "}");
 
         QueryCompilerRequest[] requests = new QueryCompilerRequest[] {
                 QueryCompilerRequest.builder()
@@ -299,15 +298,53 @@ public void testMultiCompileWithFailure() throws ExecutionException, Interrupted
                         CompletionStageFuture.make(),
                 };
 
-        try {
-            ExecutionContext.getContext().getQueryCompiler().compile(requests, resolvers);
-            // noinspection DataFlowIssue
-            throw Assert.statementNeverExecuted();
-        } catch (Exception ignored) {
-        }
+        ExecutionContext.getContext().getQueryCompiler().compile(requests, resolvers);
 
         Assert.eqTrue(resolvers[0].getFuture().isDone(), "resolvers[0].getFuture().isDone()");
         Assert.eqTrue(resolvers[1].getFuture().isDone(), "resolvers[0].getFuture().isDone()");
         Assert.neqNull(resolvers[1].getFuture().get(), "resolvers[1].getFuture().get()");
     }
+
+    @Test
+    public void testMultiCompileWithFailureSecond() throws ExecutionException, InterruptedException {
+        final String badProgram = String.join("\n",
+                "public class Formula {",
+                "    public Formula() {",
+                "        S.badCall(0);",
+                "    }",
+                "}");
+        final String goodProgram = String.join("\n",
+                "public class Formula {",
+                "   public static void main (String [] args) {",
+                "   }",
+                "}");
+
+        QueryCompilerRequest[] requests = new QueryCompilerRequest[] {
+                QueryCompilerRequest.builder()
+                        .description("Test Good Compile")
+                        .className("Formula")
+                        .classBody(goodProgram)
+                        .packageNameRoot("com.deephaven.test")
+                        .build(),
+                QueryCompilerRequest.builder()
+                        .description("Test Bad Compile")
+                        .className("Formula")
+                        .classBody(badProgram)
+                        .packageNameRoot("com.deephaven.test")
+                        .build(),
+        };
+
+        // noinspection unchecked
+        CompletionStageFuture.Resolver<Class<?>>[] resolvers =
+                (CompletionStageFuture.Resolver<Class<?>>[]) new CompletionStageFuture.Resolver[] {
+                        CompletionStageFuture.make(),
+                        CompletionStageFuture.make(),
+                };
+
+        ExecutionContext.getContext().getQueryCompiler().compile(requests, resolvers);
+
+        Assert.eqTrue(resolvers[1].getFuture().isDone(), "resolvers[0].getFuture().isDone()");
+        Assert.eqTrue(resolvers[0].getFuture().isDone(), "resolvers[0].getFuture().isDone()");
+        Assert.neqNull(resolvers[0].getFuture().get(), "resolvers[1].getFuture().get()");
+    }
 }
diff --git a/engine/function/build.gradle b/engine/function/build.gradle
index b493bec2635..7e88ff177c4 100644
--- a/engine/function/build.gradle
+++ b/engine/function/build.gradle
@@ -7,19 +7,18 @@ description 'Engine Functions: Libraries for use in query expressions'
 
 configurations {
     primitiveCodegen
-    testImplementation.extendsFrom junit
 }
 
 dependencies {
     primitiveCodegen project(':codegen')
 
-    api 'net.sf.trove4j:trove4j:3.0.3'
+    api libs.trove
     api project(':Util')
     api project(':engine-vector')
     api project(':engine-primitive')
 
     implementation project(':Base')
-    implementation depCommonsLang3
+    implementation libs.commons.lang3
 
     testImplementation project(':base-test-utils')
 }
diff --git a/engine/function/src/templates/Numeric.ftl b/engine/function/src/templates/Numeric.ftl
index 8710a195b83..7724e221e81 100644
--- a/engine/function/src/templates/Numeric.ftl
+++ b/engine/function/src/templates/Numeric.ftl
@@ -10,6 +10,7 @@ import io.deephaven.engine.primitive.iterator.*;
 import io.deephaven.util.datastructures.LongSizedDataStructure;
 
 import java.util.Arrays;
+import java.lang.Math;
 
 import static io.deephaven.base.CompareUtils.compare;
 import static io.deephaven.util.QueryConstants.*;
@@ -23,6 +24,17 @@ import static io.deephaven.function.Cast.castDouble;
 @SuppressWarnings({"RedundantCast", "unused", "ManualMinMaxCalculation"})
 public class Numeric {
 
+    //////////////////////////// Constants ////////////////////////////
+
+    /**
+     * The double value that is closer than any other to e, the base of the natural logarithms.
+     */
+    static public final double E = Math.E;
+
+    /**
+     * The double value that is closer than any other to pi, the ratio of the circumference of a circle to its diameter.
+     */
+    static public final double PI = Math.PI;
 
     //////////////////////////// Object ////////////////////////////
 
@@ -3378,6 +3390,653 @@ public class Numeric {
         return compare(v1 == null ? ${pt.null} : v1, v2 == null ? ${pt.null} : v2);
     }
 
+    /**
+     * Returns the angle theta from the conversion of rectangular coordinates (x, y) to polar coordinates (r, theta).
+     * This method computes the phase theta by computing an arc tangent of y/x in the range of -pi to pi.
+     * Special cases:
+     * <ul>
+     *   <li>If either argument is NaN, then the result is NaN.</li>
+     *   <li>If the first argument is positive zero and the second argument is positive, or the first argument is positive and finite and the second argument is positive infinity, then the result is positive zero.</li>
+     *   <li>If the first argument is negative zero and the second argument is positive, or the first argument is negative and finite and the second argument is positive infinity, then the result is negative zero.</li>
+     *   <li>If the first argument is positive zero and the second argument is negative, or the first argument is positive and finite and the second argument is negative infinity, then the result is the double value closest to pi.</li>
+     *   <li>If the first argument is negative zero and the second argument is negative, or the first argument is negative and finite and the second argument is negative infinity, then the result is the double value closest to -pi.</li>
+     *   <li>If the first argument is positive and the second argument is positive zero or negative zero, or the first argument is positive infinity and the second argument is finite, then the result is the double value closest to pi/2.</li>
+     *   <li>If the first argument is negative and the second argument is positive zero or negative zero, or the first argument is negative infinity and the second argument is finite, then the result is the double value closest to -pi/2.</li>
+     *   <li>If both arguments are positive infinity, then the result is the double value closest to pi/4.</li>
+     *   <li>If the first argument is positive infinity and the second argument is negative infinity, then the result is the double value closest to 3*pi/4.</li>
+     *   <li>If the first argument is negative infinity and the second argument is positive infinity, then the result is the double value closest to -pi/4.</li>
+     *   <li>If both arguments are negative infinity, then the result is the double value closest to -3*pi/4.</li>
+     * </ul>
+     * The computed result must be within 2 ulps of the exact result. Results must be semi-monotonic.
+     *
+     * @param y the ordinate coordinate
+     * @param x the abscissa coordinate
+     * @return the theta component of the point (r, theta) in polar coordinates that corresponds to the point (x, y) in
+     *    Cartesian coordinates.  If either value is null, returns null.
+     */
+    static public double atan2(${pt.primitive} y, ${pt.primitive} x) {
+        if (isNull(x) || isNull(y)) {
+            return NULL_DOUBLE;
+        }
+
+        return Math.atan2(y, x);
+    }
+
+    /**
+     * Returns the cube root of a value.
+     *
+     * @param x the value
+     * @return the cube root of the value.  If the value is null, returns null.
+     */
+    static public double cbrt(${pt.primitive} x) {
+        if (isNull(x)) {
+            return NULL_DOUBLE;
+        }
+
+        return Math.cbrt(x);
+    }
+
+    /**
+     * Returns the hyperbolic cosine.
+     *
+     * @param x the value
+     * @return the hyperbolic cosine of the value.  If the value is null, returns null.
+     */
+    static public double cosh(${pt.primitive} x) {
+        if (isNull(x)) {
+            return NULL_DOUBLE;
+        }
+
+        return Math.cosh(x);
+    }
+
+    /**
+     * Returns e^x - 1.
+     *
+     * @param x the value
+     * @return e^x-1.  If the value is null, returns null.
+     */
+     static public double expm1(${pt.primitive} x) {
+        if (isNull(x)) {
+            return NULL_DOUBLE;
+        }
+
+        return Math.expm1(x);
+     }
+
+    /**
+     * Returns the hypotenuse of a right-angled triangle, sqrt(x^2 + y^2), without intermediate overflow or underflow.
+     *
+     * @param x the first value.
+     * @param y the second value.
+     * @return the hypotenuse of a right-angled triangle.  If either value is null, returns null.
+     */
+    static public double hypot(${pt.primitive} x, ${pt.primitive} y) {
+        if (isNull(x) || isNull(y)) {
+            return NULL_DOUBLE;
+        }
+
+        return Math.hypot(x, y);
+    }
+
+    /**
+     * Returns the base 10 logarithm of a value.
+     *
+     * @param x the value.
+     * @return the base 10 logarithm of the value.  If the value is null, returns null.
+     */
+     static public double log10(${pt.primitive} x) {
+        if (isNull(x)) {
+            return NULL_DOUBLE;
+        }
+
+        return Math.log10(x);
+     }
+
+     /**
+      * Returns the natural logarithm of the sum of the argument and 1.
+      *
+      * @param x the value.
+      * @return the natural logarithm of the sum of the argument and 1.  If the value is null, returns null.
+      */
+     static public double log1p(${pt.primitive} x) {
+        if (isNull(x)) {
+            return NULL_DOUBLE;
+        }
+
+        return Math.log1p(x);
+     }
+
+     <#if pt.valueType.isFloat >
+     /**
+      * Returns x × 2^scaleFactor rounded as if performed by a single correctly rounded floating-point multiply to a
+      * member of the ${pt.primitive} value set.
+      *
+      * @param x the value.
+      * @param scaleFactor the scale factor.
+      * @return x × 2scaleFactor rounded as if performed by a single correctly rounded floating-point multiply to a
+      *     member of the double value set.  If the either value is null, returns null.
+      */
+     static public ${pt.primitive} scalb(${pt.primitive} x, int scaleFactor) {
+        if (isNull(x) || isNull(scaleFactor)) {
+            return ${pt.null};
+        }
+
+        return Math.scalb(x, scaleFactor);
+     }
+     </#if>
+
+     /**
+      * Returns the hyperbolic sine of a value.
+      *
+      * @param x the value
+      * @return the hyperbolic sine of the value.  If the value is null, returns null.
+      */
+     static public double sinh(${pt.primitive} x) {
+        if (isNull(x)) {
+            return NULL_DOUBLE;
+        }
+
+        return Math.sinh(x);
+     }
+
+     /**
+      * Returns the hyperbolic tangent of a value.
+      *
+      * @param x the value
+      * @return the hyperbolic tangent of the value.  If the value is null, returns null.
+      */
+     static public double tanh(${pt.primitive} x) {
+        if (isNull(x)) {
+            return NULL_DOUBLE;
+        }
+
+        return Math.tanh(x);
+     }
+
+    /**
+     * Returns the first argument with the sign of the second argument.
+     *
+     * @param magnitude the value to return
+     * @param sign the sign for the return value
+     * @return the value with the magnitude of the first argument and the sign of the second argument.
+     *    If either value is null, returns null.
+     */
+    static public ${pt.primitive} copySign(${pt.primitive} magnitude, ${pt.primitive} sign) {
+        if (isNull(magnitude) || isNull(sign)) {
+            return ${pt.null};
+        }
+
+        <#if pt.valueType.isFloat >
+        return Math.copySign(magnitude, sign);
+        <#else>
+        return (${pt.primitive}) ((magnitude < 0 ? -magnitude : magnitude) * (sign < 0 ? -1 : 1));
+        </#if>
+    }
+
+    <#if pt.valueType.isInteger>
+    /**
+     * Returns the sum of its arguments, throwing an exception if the result overflows.
+     *
+     * @param x the first value.
+     * @param y the second value.
+     * @return the result of adding the arguments.  If either value is null, returns null.
+     * @throws ArithmeticException if the result overflows.
+     */
+    static public ${pt.primitive} addExact(${pt.primitive} x, ${pt.primitive} y) {
+        if (isNull(x) || isNull(y)) {
+            return ${pt.null};
+        }
+
+        <#if pt.primitive == "byte" || pt.primitive == "short">
+        int val = Math.addExact(x, y);
+
+        if ( val > ${pt.maxValue} || val < ${pt.minValue} || isNull(val) ) {
+            throw new ArithmeticException("Overflow: " + x + " + " + y);
+        }
+
+        return (${pt.primitive}) val;
+        <#else>
+        ${pt.primitive} val = Math.addExact(x, y);
+
+        if ( isNull(val) ) {
+            throw new ArithmeticException("Overflow: " + x + " + " + y);
+        }
+
+        return val;
+        </#if>
+    }
+    </#if>
+
+    <#if pt.valueType.isInteger>
+    /**
+     * Returns the difference of its arguments, throwing an exception if the result overflows.
+     *
+     * @param x the first value.
+     * @param y the second value.
+     * @return the result of subtracting the arguments.  If either value is null, returns null.
+     * @throws ArithmeticException if the result overflows.
+     */
+    static public ${pt.primitive} subtractExact(${pt.primitive} x, ${pt.primitive} y) {
+        if (isNull(x) || isNull(y)) {
+            return ${pt.null};
+        }
+
+        <#if pt.primitive == "byte" || pt.primitive == "short">
+        int val = Math.subtractExact(x, y);
+
+        if ( val > ${pt.maxValue} || val < ${pt.minValue} || isNull(val)) {
+            throw new ArithmeticException("Overflow: " + x + " - " + y);
+        }
+
+        return (${pt.primitive}) val;
+        <#else>
+        ${pt.primitive} val = Math.subtractExact(x, y);
+
+        if ( isNull(val) ) {
+            throw new ArithmeticException("Overflow: " + x + " - " + y);
+        }
+
+        return val;
+        </#if>
+    }
+    </#if>
+
+     <#if pt.valueType.isInteger>
+     /**
+      * Returns the product of the arguments, throwing an exception if the result overflows.
+      *
+      * @param x the first value.
+      * @param y the second value.
+      * @return the result of multiplying the arguments.  If either value is null, returns null.
+      * @throws ArithmeticException if the result overflows.
+      */
+     static public ${pt.primitive} multiplyExact(${pt.primitive} x, ${pt.primitive} y) {
+         if (isNull(x) || isNull(y)) {
+             return ${pt.null};
+         }
+
+         <#if pt.primitive == "byte" || pt.primitive == "short">
+         int val = Math.multiplyExact(x, y);
+
+         if ( val > ${pt.maxValue} || val < ${pt.minValue} || isNull(val) ) {
+            throw new ArithmeticException("Overflow: " + x + " * " + y);
+         }
+
+         return (${pt.primitive}) val;
+         <#else>
+        ${pt.primitive} val = Math.multiplyExact(x, y);
+
+        if ( isNull(val) ) {
+            throw new ArithmeticException("Overflow: " + x + " * " + y);
+        }
+
+        return val;
+         </#if>
+     }
+     </#if>
+
+    <#if pt.valueType.isInteger>
+    /**
+     * Returns the argument incremented by one, throwing an exception if the result overflows.
+     *
+     * @param x the value to increment.
+     * @return the result of increment by one.  If the value is null, returns null.
+     * @throws ArithmeticException if the result overflows.
+     */
+    static public ${pt.primitive} incrementExact(${pt.primitive} x) {
+        if (isNull(x)) {
+            return ${pt.null};
+        }
+
+        <#if pt.primitive == "byte" || pt.primitive == "short">
+        int val = Math.incrementExact(x);
+
+        if ( val > ${pt.maxValue} || val < ${pt.minValue} || isNull(val) ) {
+            throw new ArithmeticException("Overflow: " + x);
+        }
+
+        return (${pt.primitive}) val;
+        <#else>
+        if (x == ${pt.maxValue}) {
+            throw new ArithmeticException("Overflow: " + x);
+        }
+
+        ${pt.primitive} val = Math.incrementExact(x);
+
+        if ( isNull(val) ) {
+            throw new ArithmeticException("Overflow: " + x);
+        }
+
+        return val;
+        </#if>
+    }
+    </#if>
+
+    <#if pt.valueType.isInteger>
+    /**
+     * Returns the argument decremented by one, throwing an exception if the result overflows.
+     *
+     * @param x the value to decrement.
+     * @return the result of decrementing by one.  If the value is null, returns null.
+     * @throws ArithmeticException if the result overflows.
+     */
+    static public ${pt.primitive} decrementExact(${pt.primitive} x) {
+        if (isNull(x)) {
+            return ${pt.null};
+        }
+
+        <#if pt.primitive == "byte" || pt.primitive == "short">
+        int val = Math.decrementExact(x);
+
+        if ( val > ${pt.maxValue} || val < ${pt.minValue} || isNull(val) ) {
+            throw new ArithmeticException("Overflow: " + x);
+        }
+
+        return (${pt.primitive}) val;
+        <#else>
+        if (x == ${pt.minValue}) {
+            throw new ArithmeticException("Overflow: " + x);
+        }
+
+        ${pt.primitive} val = Math.decrementExact(x);
+
+        if ( isNull(val) ) {
+            throw new ArithmeticException("Overflow: " + x);
+        }
+
+        return val;
+        </#if>
+    }
+    </#if>
+
+     <#if pt.valueType.isInteger>
+     /**
+      * Returns the negation of the argument, throwing an exception if the result overflows.
+      *
+      * @param x the value to negate.
+      * @return the negation of the argument.  If the value is null, returns null.
+      * @throws ArithmeticException if the result overflows.
+      */
+     public static ${pt.primitive} negateExact(${pt.primitive} x) {
+         if (isNull(x)) {
+             return ${pt.null};
+         }
+
+         <#if pt.primitive == "byte" || pt.primitive == "short">
+         int val = Math.negateExact(x);
+
+         if ( val > ${pt.maxValue} || val < ${pt.minValue} || isNull(val) ) {
+            throw new ArithmeticException("Overflow: -" + x);
+         }
+
+         return (${pt.primitive}) val;
+         <#else>
+         ${pt.primitive} val = Math.negateExact(x);
+
+         if ( isNull(val) ) {
+             throw new ArithmeticException("Overflow: -" + x);
+         }
+
+         return val;
+         </#if>
+     }
+     </#if>
+
+    <#if pt.valueType.isInteger>
+     /**
+      * Returns the largest (closest to positive infinity) int value that is less than or equal to the
+      * algebraic quotient.
+      *
+      * @param x the dividend.
+      * @param y the divisor.
+      * @return the largest (closest to positive infinity) int value that is less than or equal to the
+      *    algebraic quotient.  If either value is null, returns null.
+      */
+    static public ${pt.primitive} floorDiv(${pt.primitive} x, ${pt.primitive} y) {
+        if (isNull(x) || isNull(y)) {
+            return ${pt.null};
+        }
+
+        return (${pt.primitive}) Math.floorDiv(x, y);
+    }
+    </#if>
+
+    <#if pt.valueType.isInteger>
+     /**
+      * Returns the floor modulus of the arguments.
+      *
+      * @param x the dividend.
+      * @param y the divisor.
+      * @return the floor modulus x.  If either value is null, returns null.
+      */
+    static public ${pt.primitive} floorMod(${pt.primitive} x, ${pt.primitive} y) {
+        if (isNull(x) || isNull(y)) {
+            return ${pt.null};
+        }
+
+        return (${pt.primitive}) Math.floorMod(x, y);
+    }
+    </#if>
+
+    <#if pt.valueType.isFloat>
+     /**
+      * Returns the unbiased exponent used in the representation of the argument.
+      *
+      * @param x the value.
+      * @return the unbiased exponent used in the representation of the argument.  If the value is null, returns null.
+      */
+    static public int getExponent(${pt.primitive} x) {
+        if (isNull(x)) {
+            return NULL_INT;
+        }
+
+        return Math.getExponent(x);
+    }
+    </#if>
+
+    <#if pt.valueType.isFloat>
+    /**
+     * Returns the IEEE 754 remainder of the division of the arguments.
+     *
+     * @param x the dividend.
+     * @param y the divisor.
+     * @return the IEEE 754 remainder of the division of the arguments.  If either value is null, returns null.
+     */
+    static public ${pt.primitive} IEEEremainder(${pt.primitive} x, ${pt.primitive} y) {
+        if (isNull(x) || isNull(y)) {
+            return ${pt.null};
+        }
+
+        return (${pt.primitive}) Math.IEEEremainder(x, y);
+    }
+    </#if>
+
+     <#if pt.valueType.isFloat>
+     /**
+      * Returns the floating-point number adjacent to the first argument in the direction of the second argument.
+      *
+      * @param start the starting value.
+      * @param direction the direction.
+      * @return the floating-point number adjacent to the first argument in the direction of the second argument.
+      *    If either value is null, returns null.
+      */
+     static public ${pt.primitive} nextAfter(${pt.primitive} start, ${pt.primitive} direction) {
+        if (isNull(start) || isNull(direction)) {
+            return ${pt.null};
+        }
+
+        // skip over nulls
+        ${pt.primitive} next = Math.nextAfter(start, direction);
+        return isNull(next) ? Math.nextAfter(next, direction) : next;
+     }
+     </#if>
+
+     <#if pt.valueType.isFloat>
+     /**
+      * Returns the floating-point number adjacent to the argument in the direction of positive infinity.
+      *
+      * @param x the value.
+      * @return the floating-point number adjacent to the argument in the direction of positive infinity.
+      *    If the value is null, returns null.
+      */
+     static public ${pt.primitive} nextUp(${pt.primitive} x) {
+        if (isNull(x)) {
+            return ${pt.null};
+        }
+
+        // skip over nulls
+        ${pt.primitive} next = Math.nextUp(x);
+        return isNull(next) ? Math.nextUp(next) : next;
+     }
+     </#if>
+
+     <#if pt.valueType.isFloat>
+     /**
+      * Returns the floating-point number adjacent to the argument in the direction of negative infinity.
+      *
+      * @param x the value.
+      * @return the floating-point number adjacent to the argument in the direction of negative infinity.
+      *    If the value is null, returns null.
+      */
+     static public ${pt.primitive} nextDown(${pt.primitive} x) {
+        if (isNull(x)) {
+            return ${pt.null};
+        }
+
+        // skip over nulls
+        ${pt.primitive} next = Math.nextDown(x);
+        return isNull(next) ? Math.nextDown(next) : next;
+     }
+     </#if>
+
+    /**
+     * Converts an angle measured in radians to an approximately equivalent angle measured in degrees.
+     *
+     * @param x the angle in radians
+     * @return the measurement of the angle x in degrees.  If the value is null, returns null.
+     */
+    static public double toDegrees(${pt.primitive} x) {
+        if (isNull(x)) {
+            return NULL_DOUBLE;
+        }
+
+        return Math.toDegrees(x);
+    }
+
+    /**
+     * Converts an angle measured in degrees to an approximately equivalent angle measured in radians.
+     *
+     * @param x the angle in degrees
+     * @return the measurement of the angle x in radians.  If the value is null, returns null.
+     */
+    static public double toRadians(${pt.primitive} x) {
+        if (isNull(x)) {
+            return NULL_DOUBLE;
+        }
+
+        return Math.toRadians(x);
+    }
+
+    <#if pt.valueType.isInteger>
+    /**
+     * Returns the value of the argument as an int, throwing an exception if the value overflows an int.
+     *
+     * @param x the value.
+     * @return the value as an int.  If either value is null, returns null.
+     * @throws ArithmeticException if the result overflows.
+     */
+    static public int toIntExact(${pt.primitive} x) {
+        if (isNull(x)) {
+            return NULL_INT;
+        }
+
+        <#if pt.primitive == "byte" || pt.primitive == "short" || pt.primitive == "int" >
+        return x;
+        <#else>
+        final int val = Math.toIntExact(x);
+
+        if ( isNull(val) ) {
+            throw new ArithmeticException("Overflow: ${pt.primitive} value will not fit in an int " + x);
+        }
+
+        return val;
+        </#if>
+    }
+    </#if>
+
+    <#if pt.valueType.isInteger>
+    /**
+     * Returns the value of the argument as a short, throwing an exception if the value overflows a short.
+     *
+     * @param x the value.
+     * @return the value as a short.  If either value is null, returns null.
+     * @throws ArithmeticException if the result overflows.
+     */
+    static public short toShortExact(${pt.primitive} x) {
+        if (isNull(x)) {
+            return NULL_SHORT;
+        }
+
+        <#if pt.primitive == "byte" || pt.primitive == "short" >
+        return x;
+        <#else>
+        final short val = (short) x;
+
+        if (x > Short.MAX_VALUE || x < Short.MIN_VALUE || isNull(val) ) {
+            throw new ArithmeticException("Overflow: ${pt.primitive} value will not fit in a short " + x);
+        }
+
+        return val;
+        </#if>
+    }
+    </#if>
+
+    <#if pt.valueType.isInteger>
+    /**
+     * Returns the value of the argument as a byte, throwing an exception if the value overflows a byte.
+     *
+     * @param x the value.
+     * @return the value as a byte.  If either value is null, returns null.
+     * @throws ArithmeticException if the result overflows.
+     */
+    static public short toByteExact(${pt.primitive} x) {
+        if (isNull(x)) {
+            return NULL_BYTE;
+        }
+
+        <#if pt.primitive == "byte" >
+        return x;
+        <#else>
+        final byte val = (byte) x;
+
+        if (x > Byte.MAX_VALUE || x < Byte.MIN_VALUE || isNull(val) ) {
+            throw new ArithmeticException("Overflow: ${pt.primitive} value will not fit in a byte " + x);
+        }
+
+        return val;
+        </#if>
+    }
+    </#if>
+
+    <#if pt.valueType.isFloat>
+    /**
+     * Returns the size of an ulp of the argument. An ulp, unit in the last place, of a value is the positive
+     * distance between this floating-point value and the value next larger in magnitude.
+     * Note that for non-NaN x, ulp(-x) == ulp(x).
+     *
+     * @param x the value.
+     * @return the size of an ulp of the argument.  If the value is null, returns null.
+     */
+    static public ${pt.primitive} ulp(${pt.primitive} x) {
+        if (isNull(x)) {
+            return ${pt.null};
+        }
+
+        return Math.ulp(x);
+    }
+    </#if>
+
     </#if>
     </#list>
 }
diff --git a/engine/function/src/templates/TestNumeric.ftl b/engine/function/src/templates/TestNumeric.ftl
index 5e51d5445cd..5c56ebc8691 100644
--- a/engine/function/src/templates/TestNumeric.ftl
+++ b/engine/function/src/templates/TestNumeric.ftl
@@ -19,6 +19,16 @@ import static io.deephaven.function.Numeric.*;
 @SuppressWarnings({"RedundantCast", "RedundantArrayCreation", "PointlessArithmeticExpression", "ConstantConditions", "SimplifiableAssertion", "Convert2Diamond"})
 public class TestNumeric extends BaseArrayTestCase {
 
+    //////////////////////////// Constants ////////////////////////////
+
+    public void testE() {
+        assertEquals(Math.E, E, 0.0);
+    }
+
+    public void testPI() {
+        assertEquals(Math.PI, PI, 0.0);
+    }
+
     //////////////////////////// Object ////////////////////////////
 
     public void testObjMin() {
@@ -1746,6 +1756,277 @@ public class TestNumeric extends BaseArrayTestCase {
 
     </#if>
 
+    public void test${pt.boxed}Atan2(){
+        assertEquals(Math.atan2((${pt.primitive})1, (${pt.primitive})2), atan2((${pt.primitive})1, (${pt.primitive})2));
+        assertEquals(NULL_DOUBLE, atan2(${pt.null}, (${pt.primitive})2));
+        assertEquals(NULL_DOUBLE, atan2((${pt.primitive})2, ${pt.null}));
+    }
+
+    public void test${pt.boxed}Cbrt(){
+        assertEquals(Math.cbrt((${pt.primitive})2), cbrt((${pt.primitive})2));
+        assertEquals(NULL_DOUBLE, cbrt(${pt.null}));
+    }
+
+    public void test${pt.boxed}Cosh(){
+        assertEquals(Math.cosh((${pt.primitive})2), cosh((${pt.primitive})2));
+        assertEquals(NULL_DOUBLE, cosh(${pt.null}));
+    }
+
+    public void test${pt.boxed}Expm1(){
+        assertEquals(Math.expm1((${pt.primitive})2), expm1((${pt.primitive})2));
+        assertEquals(NULL_DOUBLE, expm1(${pt.null}));
+    }
+
+    public void test${pt.boxed}Hypot(){
+        assertEquals(Math.hypot(7, 3), hypot((${pt.primitive})7, (${pt.primitive})3));
+        assertEquals(NULL_DOUBLE, hypot(${pt.null}, (${pt.primitive})3));
+        assertEquals(NULL_DOUBLE, hypot((${pt.primitive})7, ${pt.null}));
+    }
+
+    public void test${pt.boxed}Log10(){
+        assertEquals(Math.log10(7), log10((${pt.primitive})7));
+        assertEquals(NULL_DOUBLE, log10(${pt.null}));
+    }
+
+    public void test${pt.boxed}Log1p(){
+        assertEquals(Math.log1p(7), log1p((${pt.primitive})7));
+        assertEquals(NULL_DOUBLE, log1p(${pt.null}));
+    }
+
+    <#if pt.valueType.isFloat >
+    public void test${pt.boxed}Scalb(){
+        assertEquals(Math.scalb((${pt.primitive})7, 3), scalb((${pt.primitive})7, 3));
+        assertEquals(${pt.null}, scalb(${pt.null}, 3));
+        assertEquals(${pt.null}, scalb((${pt.primitive})7, NULL_INT));
+    }
+    </#if>
+
+    public void test${pt.boxed}Sinh(){
+        assertEquals(Math.sinh((${pt.primitive})7), sinh((${pt.primitive})7));
+        assertEquals(NULL_DOUBLE, sinh(${pt.null}));
+    }
+
+    public void test${pt.boxed}Tanh(){
+        assertEquals(Math.tanh((${pt.primitive})7), tanh((${pt.primitive})7));
+        assertEquals(NULL_DOUBLE, tanh(${pt.null}));
+    }
+
+    public void test${pt.boxed}CopySign() {
+        assertEquals((${pt.primitive})-9, copySign((${pt.primitive})9, (${pt.primitive})-2));
+        assertEquals((${pt.primitive})9, copySign((${pt.primitive})9, (${pt.primitive})2));
+        assertEquals((${pt.primitive})9, copySign((${pt.primitive})9, (${pt.primitive})0));
+        assertEquals((${pt.primitive})-9, copySign((${pt.primitive})-9, (${pt.primitive})-2));
+        assertEquals((${pt.primitive})9, copySign((${pt.primitive})-9, (${pt.primitive})2));
+        assertEquals((${pt.primitive})9, copySign((${pt.primitive})-9, (${pt.primitive})0));
+        assertEquals((${pt.null}), copySign(${pt.null}, (${pt.primitive})-2));
+        assertEquals((${pt.null}), copySign((${pt.primitive})1, ${pt.null}));
+    }
+
+    <#if pt.valueType.isInteger >
+    public void test${pt.boxed}AddExact(){
+        assertEquals((${pt.primitive})3, addExact((${pt.primitive})1, (${pt.primitive})2));
+        assertEquals(${pt.null}, addExact(${pt.null}, (${pt.primitive})2));
+        assertEquals(${pt.null}, addExact((${pt.primitive})2, ${pt.null}));
+
+        try {
+            addExact((${pt.primitive})${pt.maxValue}, (${pt.primitive})1);
+            fail("Overflow");
+        } catch(ArithmeticException e){
+            // pass
+        }
+    }
+    </#if>
+
+    <#if pt.valueType.isInteger >
+    public void test${pt.boxed}SubtractExact(){
+        assertEquals((${pt.primitive})1, subtractExact((${pt.primitive})3, (${pt.primitive})2));
+        assertEquals(${pt.null}, subtractExact(${pt.null}, (${pt.primitive})2));
+        assertEquals(${pt.null}, subtractExact((${pt.primitive})2, ${pt.null}));
+
+        try {
+        subtractExact((${pt.primitive})${pt.minValue}, (${pt.primitive})1);
+            fail("Overflow");
+        } catch(ArithmeticException e){
+            // pass
+        }
+    }
+    </#if>
+
+    <#if pt.valueType.isInteger >
+    public void test${pt.boxed}MultiplyExact(){
+        assertEquals((${pt.primitive})6, multiplyExact((${pt.primitive})3, (${pt.primitive})2));
+        assertEquals(${pt.null}, multiplyExact(${pt.null}, (${pt.primitive})2));
+        assertEquals(${pt.null}, multiplyExact((${pt.primitive})2, ${pt.null}));
+
+        try {
+            multiplyExact((${pt.primitive})${pt.maxValue}, (${pt.primitive})2);
+            fail("Overflow");
+        } catch(ArithmeticException e){
+            // pass
+        }
+    }
+    </#if>
+
+    <#if pt.valueType.isInteger >
+    public void test${pt.boxed}IncrementExact(){
+        assertEquals((${pt.primitive})3, incrementExact((${pt.primitive})2));
+        assertEquals(${pt.null}, incrementExact(${pt.null}));
+
+        try {
+            incrementExact((${pt.primitive})${pt.maxValue});
+            fail("Overflow");
+        } catch(ArithmeticException e){
+            // pass
+        }
+    }
+    </#if>
+
+    <#if pt.valueType.isInteger >
+    public void test${pt.boxed}DecrementExact(){
+        assertEquals((${pt.primitive})1, decrementExact((${pt.primitive})2));
+        assertEquals(${pt.null}, decrementExact(${pt.null}));
+
+        try {
+            decrementExact((${pt.primitive})${pt.minValue});
+            fail("Overflow");
+        } catch(ArithmeticException e){
+            // pass
+        }
+    }
+    </#if>
+
+    <#if pt.valueType.isInteger >
+    public void test${pt.boxed}NegateExact(){
+        assertEquals(Math.negateExact(7), negateExact((${pt.primitive})7));
+        assertEquals(${pt.null}, negateExact(${pt.null}));
+    }
+    </#if>
+
+    <#if pt.valueType.isInteger >
+    public void test${pt.boxed}FloorDiv(){
+        assertEquals(Math.floorDiv(7, 2), floorDiv((${pt.primitive})7, (${pt.primitive})2));
+        assertEquals(${pt.null}, floorDiv(${pt.null}, (${pt.primitive})2));
+        assertEquals(${pt.null}, floorDiv((${pt.primitive})7, ${pt.null}));
+    }
+    </#if>
+
+    <#if pt.valueType.isInteger >
+    public void test${pt.boxed}FloorMod(){
+        assertEquals(Math.floorMod(7, 2), floorMod((${pt.primitive})7, (${pt.primitive})2));
+        assertEquals(${pt.null}, floorMod(${pt.null}, (${pt.primitive})2));
+        assertEquals(${pt.null}, floorMod((${pt.primitive})7, ${pt.null}));
+    }
+    </#if>
+
+    <#if pt.valueType.isFloat >
+    public void test${pt.boxed}GetExponent(){
+        assertEquals(Math.getExponent(7), getExponent((${pt.primitive})7));
+        assertEquals(NULL_INT, getExponent(${pt.null}));
+    }
+    </#if>
+
+    <#if pt.valueType.isFloat >
+    public void test${pt.boxed}IEEEremainder(){
+        assertEquals((${pt.primitive}) Math.IEEEremainder(71, 3), IEEEremainder((${pt.primitive})71, (${pt.primitive})3));
+        assertEquals(${pt.null}, IEEEremainder(${pt.null}, (${pt.primitive})3));
+        assertEquals(${pt.null}, IEEEremainder((${pt.primitive})71, ${pt.null}));
+    }
+    </#if>
+
+    <#if pt.valueType.isFloat >
+    public void test${pt.boxed}NextAfter(){
+        assertEquals(Math.nextAfter((${pt.primitive})7, (${pt.primitive})8), nextAfter((${pt.primitive})7, (${pt.primitive})8));
+        assertEquals(Math.nextAfter((${pt.primitive})7, (${pt.primitive})-8), nextAfter((${pt.primitive})7, (${pt.primitive})-8));
+
+        assertEquals(Math.nextUp(${pt.null}), nextAfter(Math.nextDown(${pt.null}), (${pt.primitive})8));
+        assertEquals(Math.nextDown(${pt.null}), nextAfter(Math.nextUp(${pt.null}), ${pt.boxed}.NEGATIVE_INFINITY));
+
+        assertEquals(${pt.null}, nextAfter(${pt.null}, (${pt.primitive})8));
+        assertEquals(${pt.null}, nextAfter((${pt.primitive}) 7, ${pt.null}));
+    }
+    </#if>
+
+    <#if pt.valueType.isFloat >
+    public void test${pt.boxed}NextUp(){
+        assertEquals(Math.nextUp((${pt.primitive})7), nextUp((${pt.primitive})7));
+        assertEquals(Math.nextUp(${pt.null}), nextUp(Math.nextDown(${pt.null})));
+        assertEquals(${pt.null}, nextUp(${pt.null}));
+    }
+    </#if>
+
+    <#if pt.valueType.isFloat >
+    public void test${pt.boxed}NextDown(){
+        assertEquals(Math.nextDown((${pt.primitive})7), nextDown((${pt.primitive})7));
+        assertEquals(Math.nextDown(${pt.null}), nextDown(Math.nextUp(${pt.null})));
+        assertEquals(${pt.null}, nextDown(${pt.null}));
+    }
+    </#if>
+
+    public void test${pt.boxed}ToDegrees(){
+        assertEquals(Math.toDegrees((${pt.primitive})7), toDegrees((${pt.primitive})7));
+        assertEquals(NULL_DOUBLE, toDegrees(${pt.null}));
+    }
+
+    public void test${pt.boxed}ToRadians(){
+        assertEquals(Math.toRadians((${pt.primitive})7), toRadians((${pt.primitive})7));
+        assertEquals(NULL_DOUBLE, toRadians(${pt.null}));
+    }
+
+    <#if pt.valueType.isInteger >
+    public void test${pt.boxed}ToIntExact(){
+        assertEquals(Math.toIntExact((${pt.primitive})7), toIntExact((${pt.primitive})7));
+        assertEquals(NULL_INT, toIntExact(${pt.null}));
+
+        <#if pt.primitive == "long" >
+        try{
+            toIntExact((${pt.primitive})${pt.maxValue});
+            fail("Overflow");
+        } catch(ArithmeticException e){
+            // pass
+        }
+        </#if>
+    }
+    </#if>
+
+    <#if pt.valueType.isInteger >
+    public void test${pt.boxed}ToShortExact(){
+        assertEquals((short)7, toShortExact((${pt.primitive})7));
+        assertEquals(NULL_SHORT, toShortExact(${pt.null}));
+
+        <#if pt.primitive == "int" || pt.primitive == "long" >
+        try{
+            toShortExact((${pt.primitive})${pt.maxValue});
+            fail("Overflow");
+        } catch(ArithmeticException e){
+            // pass
+        }
+        </#if>
+    }
+    </#if>
+
+    <#if pt.valueType.isInteger >
+    public void test${pt.boxed}ToByteExact(){
+        assertEquals((byte)3, toByteExact((${pt.primitive})3));
+        assertEquals(NULL_BYTE, toByteExact(${pt.null}));
+
+        <#if pt.primitive == "short" || pt.primitive == "int" || pt.primitive == "long" >
+        try{
+            toByteExact((${pt.primitive})${pt.maxValue});
+            fail("Overflow");
+        } catch(ArithmeticException e){
+            // pass
+        }
+        </#if>
+    }
+    </#if>
+
+    <#if pt.valueType.isFloat >
+    public void test${pt.boxed}Ulp(){
+        assertEquals(Math.ulp((${pt.primitive})7), ulp((${pt.primitive})7));
+        assertEquals(${pt.null}, ulp(${pt.null}));
+    }
+    </#if>
+
     </#if>
     </#list>
 }
\ No newline at end of file
diff --git a/engine/primitive/build.gradle b/engine/primitive/build.gradle
index f51d401e900..a76885c049a 100644
--- a/engine/primitive/build.gradle
+++ b/engine/primitive/build.gradle
@@ -8,5 +8,5 @@ description 'Primitives: Expanding upon java.util.PrimitiveIterator and java.uti
 dependencies {
     implementation project(':Util')
 
-    compileOnly depAnnotations
+    compileOnly libs.jetbrains.annotations
 }
diff --git a/engine/primitive/src/main/java/io/deephaven/engine/primitive/iterator/CloseablePrimitiveIterator.java b/engine/primitive/src/main/java/io/deephaven/engine/primitive/iterator/CloseablePrimitiveIterator.java
index 7f29483e1e8..41fe961e769 100644
--- a/engine/primitive/src/main/java/io/deephaven/engine/primitive/iterator/CloseablePrimitiveIterator.java
+++ b/engine/primitive/src/main/java/io/deephaven/engine/primitive/iterator/CloseablePrimitiveIterator.java
@@ -5,13 +5,7 @@
 
 import io.deephaven.util.SafeCloseable;
 
-import java.util.Iterator;
 import java.util.PrimitiveIterator;
-import java.util.Spliterator;
-import java.util.Spliterators;
-import java.util.stream.IntStream;
-import java.util.stream.Stream;
-import java.util.stream.StreamSupport;
 
 /**
  * Interface for {@link SafeCloseable closeable} {@link PrimitiveIterator primitive iterators}.
diff --git a/engine/primitive/src/main/resources/io/deephaven/engine/primitive/function/Function.gwt.xml b/engine/primitive/src/main/resources/io/deephaven/engine/primitive/function/Function.gwt.xml
new file mode 100644
index 00000000000..c78151ef021
--- /dev/null
+++ b/engine/primitive/src/main/resources/io/deephaven/engine/primitive/function/Function.gwt.xml
@@ -0,0 +1,3 @@
+<module>
+    <source path="" />
+</module>
diff --git a/engine/processor-function/build.gradle b/engine/processor-function/build.gradle
index bffa74abfaf..e5bcbaf3957 100644
--- a/engine/processor-function/build.gradle
+++ b/engine/processor-function/build.gradle
@@ -10,11 +10,11 @@ dependencies {
 
     implementation project(':engine-time')
 
-    Classpaths.inheritJUnitPlatform(project)
-    Classpaths.inheritAssertJ(project)
-    testImplementation 'org.junit.jupiter:junit-jupiter'
-    testRuntimeOnly 'org.junit.jupiter:junit-jupiter-engine'
-    testRuntimeOnly 'org.junit.platform:junit-platform-launcher'
+    testImplementation libs.assertj
+    testImplementation platform(libs.junit.bom)
+    testImplementation libs.junit.jupiter
+    testRuntimeOnly libs.junit.jupiter.engine
+    testRuntimeOnly libs.junit.platform.launcher
 }
 
 test {
diff --git a/engine/processor/build.gradle b/engine/processor/build.gradle
index e83b218b6f7..8f300d28401 100644
--- a/engine/processor/build.gradle
+++ b/engine/processor/build.gradle
@@ -8,13 +8,14 @@ dependencies {
     api project(':qst-type')
     api project(':engine-chunk')
 
-    Classpaths.inheritImmutables(project)
+    compileOnly project(':util-immutables')
+    annotationProcessor libs.immutables.value
 
-    Classpaths.inheritJUnitPlatform(project)
-    Classpaths.inheritAssertJ(project)
-    testImplementation 'org.junit.jupiter:junit-jupiter'
-    testRuntimeOnly 'org.junit.jupiter:junit-jupiter-engine'
-    testRuntimeOnly 'org.junit.platform:junit-platform-launcher'
+    testImplementation libs.assertj
+    testImplementation platform(libs.junit.bom)
+    testImplementation libs.junit.jupiter
+    testRuntimeOnly libs.junit.jupiter.engine
+    testRuntimeOnly libs.junit.platform.launcher
 }
 
 test {
diff --git a/engine/query-constants/build.gradle b/engine/query-constants/build.gradle
index 76fdec1aa89..7691594d570 100644
--- a/engine/query-constants/build.gradle
+++ b/engine/query-constants/build.gradle
@@ -2,3 +2,7 @@ plugins {
     id 'java-library'
     id 'io.deephaven.project.register'
 }
+
+dependencies {
+    testImplementation libs.junit4
+}
\ No newline at end of file
diff --git a/engine/query-constants/src/main/java/io/deephaven/util/QueryConstants.java b/engine/query-constants/src/main/java/io/deephaven/util/QueryConstants.java
index fc25c64d5c1..dfd2d5b5f14 100644
--- a/engine/query-constants/src/main/java/io/deephaven/util/QueryConstants.java
+++ b/engine/query-constants/src/main/java/io/deephaven/util/QueryConstants.java
@@ -187,7 +187,13 @@ private QueryConstants() {}
     /**
      * Minimum finite value of type float.
      */
-    public static final float MIN_FINITE_FLOAT = Math.nextUp(-Float.MAX_VALUE);
+    /*
+     * Implemented as a constant so that it can be translated correctly to JS without needing a proper {@code
+     * Math.nextUp()} or {@code Math.nextAfter()} implementation that works in JavaScript. Value is generated by running
+     * {@code Float.toHexString(Math.nextUp(-Float.MAX_VALUE))} in jshell, and tests validate that this matches the
+     * expected expression.
+     */
+    public static final float MIN_FINITE_FLOAT = -0x1.fffffcp127f;
 
     /**
      * Maximum finite value of type float.
@@ -241,7 +247,13 @@ private QueryConstants() {}
     /**
      * Minimum finite value of type double.
      */
-    public static final double MIN_FINITE_DOUBLE = Math.nextUp(-Double.MAX_VALUE);
+    /*
+     * Implemented as a constant so that it can be translated correctly to JS without needing a proper {@code
+     * Math.nextUp()} or {@code Math.nextAfter()} implementation that works in JavaScript. Value is generated by running
+     * {@code Double.toHexString(Math.nextUp(-Double.MAX_VALUE))} in jshell, and tests validate that this matches the
+     * expected expression.
+     */
+    public static final double MIN_FINITE_DOUBLE = -0x1.ffffffffffffep1023;
 
     /**
      * Maximum finite value of type double.
diff --git a/engine/query-constants/src/test/java/io/deephaven/util/QueryConstantsTest.java b/engine/query-constants/src/test/java/io/deephaven/util/QueryConstantsTest.java
new file mode 100644
index 00000000000..01dca34d6f6
--- /dev/null
+++ b/engine/query-constants/src/test/java/io/deephaven/util/QueryConstantsTest.java
@@ -0,0 +1,31 @@
+//
+// Copyright (c) 2016-2024 Deephaven Data Labs and Patent Pending
+//
+package io.deephaven.util;
+
+import org.junit.Test;
+
+import static org.junit.Assert.*;
+
+public class QueryConstantsTest {
+
+    @Test
+    public void testMinFiniteFloat() {
+        final float calculated = Math.nextUp(-Float.MAX_VALUE);
+        // noinspection SimplifiableAssertion
+        assertTrue(calculated == QueryConstants.MIN_FINITE_FLOAT);
+        assertEquals(
+                Float.floatToIntBits(calculated),
+                Float.floatToIntBits(QueryConstants.MIN_FINITE_FLOAT));
+    }
+
+    @Test
+    public void testMinFiniteDouble() {
+        final double calculated = Math.nextUp(-Double.MAX_VALUE);
+        // noinspection SimplifiableAssertion
+        assertTrue(calculated == QueryConstants.MIN_FINITE_DOUBLE);
+        assertEquals(
+                Double.doubleToLongBits(calculated),
+                Double.doubleToLongBits(QueryConstants.MIN_FINITE_DOUBLE));
+    }
+}
diff --git a/engine/rowset-test-utils/build.gradle b/engine/rowset-test-utils/build.gradle
index 8e1c5108cdf..aa48913ac5c 100644
--- a/engine/rowset-test-utils/build.gradle
+++ b/engine/rowset-test-utils/build.gradle
@@ -8,8 +8,8 @@ description 'Test Utils for Engine RowSets'
 dependencies {
     api project(':engine-rowset')
 
-    implementation depCommonsLang3
-    implementation depTrove3
+    implementation libs.commons.lang3
+    implementation libs.trove
 
-    Classpaths.inheritJUnitClassic(project, 'implementation')
+    implementation libs.junit4
 }
diff --git a/engine/rowset/build.gradle b/engine/rowset/build.gradle
index dd836e0e552..98106f51682 100644
--- a/engine/rowset/build.gradle
+++ b/engine/rowset/build.gradle
@@ -8,18 +8,18 @@ description 'Engine RowSets: Data structures for working with row keys'
 dependencies {
     api project(':engine-chunk')
     api project(':Base')
-    api depTrove3
+    implementation libs.trove
 
     implementation project(':Container')
     implementation project(':engine-context')
     implementation project(':engine-updategraph')
     implementation project(':Configuration')
-    implementation depCommonsLang3
+    implementation libs.commons.lang3
 
-    compileOnly 'com.google.code.findbugs:jsr305:3.0.2'
-    compileOnly depAnnotations
+    compileOnly libs.google.findbugs.jsr305
+    compileOnly libs.jetbrains.annotations
 
-    Classpaths.inheritJUnitClassic(project, 'testImplementation')
+    testImplementation libs.junit4
 
     testImplementation project(':base-test-utils')
     testImplementation project(':engine-test-utils')
@@ -27,7 +27,7 @@ dependencies {
     testRuntimeOnly project(':log-to-slf4j'),
             project(path: ':configs'),
             project(path: ':test-configs')
-    Classpaths.inheritSlf4j(project, 'slf4j-simple', 'testRuntimeOnly')
+    testRuntimeOnly libs.slf4j.simple
 }
 
 TestTools.addEngineOutOfBandTest(project)
diff --git a/engine/rowset/src/main/java/io/deephaven/engine/rowset/RowKeyRangeShiftCallback.java b/engine/rowset/src/main/java/io/deephaven/engine/rowset/RowKeyRangeShiftCallback.java
new file mode 100644
index 00000000000..32b76b23994
--- /dev/null
+++ b/engine/rowset/src/main/java/io/deephaven/engine/rowset/RowKeyRangeShiftCallback.java
@@ -0,0 +1,20 @@
+//
+// Copyright (c) 2016-2024 Deephaven Data Labs and Patent Pending
+//
+package io.deephaven.engine.rowset;
+
+/**
+ * Functional interface to pass to {@link RowSetShiftData#apply(RowKeyRangeShiftCallback)} or
+ * {@link RowSetShiftData#unapply(RowKeyRangeShiftCallback)} to get information about each shift recorded.
+ */
+@FunctionalInterface
+public interface RowKeyRangeShiftCallback {
+    /**
+     * Process the shift.
+     *
+     * @param beginRange start of range (inclusive)
+     * @param endRange end of range (inclusive)
+     * @param shiftDelta amount range has moved by
+     */
+    void shift(long beginRange, long endRange, long shiftDelta);
+}
diff --git a/engine/rowset/src/main/java/io/deephaven/engine/rowset/RowSet.java b/engine/rowset/src/main/java/io/deephaven/engine/rowset/RowSet.java
index 1859a0f8c69..20eb6a7c3fc 100644
--- a/engine/rowset/src/main/java/io/deephaven/engine/rowset/RowSet.java
+++ b/engine/rowset/src/main/java/io/deephaven/engine/rowset/RowSet.java
@@ -3,7 +3,6 @@
 //
 package io.deephaven.engine.rowset;
 
-import gnu.trove.list.array.TLongArrayList;
 import io.deephaven.base.log.LogOutputAppendable;
 import io.deephaven.util.SafeCloseable;
 import io.deephaven.util.datastructures.LongAbortableConsumer;
@@ -116,15 +115,6 @@ default WritableRowSet invert(RowSet keys) {
      */
     WritableRowSet invert(RowSet keys, long maximumPosition);
 
-    /**
-     * For the given keys RowSet, under the assertion that none of them are present in the current RowSet, return the
-     * tentative insertion points in the current RowSet with the count for each of them
-     *
-     * @param keys the keys to identify insertion locations
-     * @return two TLongArrayLists; [0] contains the positions, [1] contains the counts.
-     */
-    TLongArrayList[] findMissing(RowSet keys);
-
     /**
      * Returns a new RowSet representing the intersection of the current RowSet with the input RowSet
      */
diff --git a/engine/rowset/src/main/java/io/deephaven/engine/rowset/RowSetBuilderSequential.java b/engine/rowset/src/main/java/io/deephaven/engine/rowset/RowSetBuilderSequential.java
index e678a514e51..aad8cad51ba 100644
--- a/engine/rowset/src/main/java/io/deephaven/engine/rowset/RowSetBuilderSequential.java
+++ b/engine/rowset/src/main/java/io/deephaven/engine/rowset/RowSetBuilderSequential.java
@@ -3,7 +3,6 @@
 //
 package io.deephaven.engine.rowset;
 
-import gnu.trove.procedure.TLongProcedure;
 import io.deephaven.engine.rowset.chunkattributes.OrderedRowKeyRanges;
 import io.deephaven.engine.rowset.chunkattributes.OrderedRowKeys;
 import io.deephaven.util.datastructures.LongRangeConsumer;
@@ -17,7 +16,7 @@
 /**
  * Builder interface for {@link RowSet} construction in strict sequential order.
  */
-public interface RowSetBuilderSequential extends TLongProcedure, LongRangeConsumer {
+public interface RowSetBuilderSequential extends LongRangeConsumer {
 
     /**
      * Hint to call, but if called, (a) should be called before providing any values, and (b) no value should be
@@ -61,12 +60,6 @@ default void appendOrderedRowKeyRangesChunk(final LongChunk<OrderedRowKeyRanges>
         appendRanges(new LongChunkRangeIterator(chunk));
     }
 
-    @Override
-    default boolean execute(final long value) {
-        appendKey(value);
-        return true;
-    }
-
     /**
      * Appends a {@link RowSequence} to this builder.
      *
diff --git a/engine/rowset/src/main/java/io/deephaven/engine/rowset/RowSetFactory.java b/engine/rowset/src/main/java/io/deephaven/engine/rowset/RowSetFactory.java
index 78c620c661b..a6b7d6dd91e 100644
--- a/engine/rowset/src/main/java/io/deephaven/engine/rowset/RowSetFactory.java
+++ b/engine/rowset/src/main/java/io/deephaven/engine/rowset/RowSetFactory.java
@@ -3,12 +3,10 @@
 //
 package io.deephaven.engine.rowset;
 
-import gnu.trove.list.TLongList;
 import io.deephaven.engine.rowset.impl.AdaptiveRowSetBuilderRandom;
 import io.deephaven.engine.rowset.impl.BasicRowSetBuilderSequential;
 import io.deephaven.engine.rowset.impl.WritableRowSetImpl;
 import io.deephaven.engine.rowset.impl.singlerange.SingleRange;
-import org.jetbrains.annotations.NotNull;
 
 /**
  * Repository of factory methods for constructing {@link WritableRowSet row sets}.
@@ -56,21 +54,6 @@ public static WritableRowSet fromKeys(final long rowKey) {
         return fromRange(rowKey, rowKey);
     }
 
-    /**
-     * Get a {@link WritableRowSet} containing the specified row keys.
-     * <p>
-     * The provided {@link TLongList} is sorted and then passed to a {@link RowSetBuilderSequential}.
-     *
-     * @param rowKeys A {@link TLongList}. Note that this list is mutated within the method!
-     * @return A new {@link WritableRowSet} containing the values from {@code rowKeys}
-     */
-    public static RowSet fromKeys(@NotNull final TLongList rowKeys) {
-        rowKeys.sort();
-        final RowSetBuilderSequential builder = builderSequential();
-        rowKeys.forEach(builder);
-        return builder.build();
-    }
-
     /**
      * Create a {@link WritableRowSet} containing the continuous range [firstRowKey, lastRowKey].
      *
diff --git a/engine/rowset/src/main/java/io/deephaven/engine/rowset/RowSetShiftCallback.java b/engine/rowset/src/main/java/io/deephaven/engine/rowset/RowSetShiftCallback.java
new file mode 100644
index 00000000000..08e0c7685b3
--- /dev/null
+++ b/engine/rowset/src/main/java/io/deephaven/engine/rowset/RowSetShiftCallback.java
@@ -0,0 +1,17 @@
+//
+// Copyright (c) 2016-2024 Deephaven Data Labs and Patent Pending
+//
+package io.deephaven.engine.rowset;
+
+/**
+ * Callback interface for propagating shifts over entire {@link RowSet RowSets}.
+ */
+public interface RowSetShiftCallback {
+    /**
+     * Signals that the row keys in {@code rowSet} should be shifted by the provided {@code shiftDelta}.
+     *
+     * @param rowSet The row keys to shift
+     * @param shiftDelta The shift delta to apply to each row key in {@code rowSet}
+     */
+    void shift(RowSet rowSet, long shiftDelta);
+}
diff --git a/engine/rowset/src/main/java/io/deephaven/engine/rowset/RowSetShiftData.java b/engine/rowset/src/main/java/io/deephaven/engine/rowset/RowSetShiftData.java
index 9e1c20247b1..c723a94c07c 100644
--- a/engine/rowset/src/main/java/io/deephaven/engine/rowset/RowSetShiftData.java
+++ b/engine/rowset/src/main/java/io/deephaven/engine/rowset/RowSetShiftData.java
@@ -18,10 +18,11 @@
 import java.io.Serializable;
 
 /**
- * A set of sorted shifts. To apply shifts without losing data, use {@link RowSetShiftData#apply(Callback)}. The
- * callback will be invoked with shifts in an order that will preserve data when applied immediately using memmove
- * semantics. Internally the shifts are ordered by rangeStart. The {@link RowSetShiftData.Builder} will verify that no
- * two ranges overlap before or after shifting and assert that the constructed {@code RowSetShiftData} will be valid.
+ * A set of sorted shifts. To apply shifts without losing data, use
+ * {@link RowSetShiftData#apply(RowKeyRangeShiftCallback)}. The callback will be invoked with shifts in an order that
+ * will preserve data when applied immediately using memmove semantics. Internally the shifts are ordered by rangeStart.
+ * The {@link RowSetShiftData.Builder} will verify that no two ranges overlap before or after shifting and assert that
+ * the constructed {@code RowSetShiftData} will be valid.
  */
 public final class RowSetShiftData implements Serializable, LogOutputAppendable {
 
@@ -224,18 +225,6 @@ public boolean equals(final Object obj) {
      */
     public static final RowSetShiftData EMPTY = new RowSetShiftData();
 
-    @FunctionalInterface
-    public interface Callback {
-        /**
-         * Process the shift.
-         *
-         * @param beginRange start of range (inclusive)
-         * @param endRange end of range (inclusive)
-         * @param shiftDelta amount range has moved by
-         */
-        void shift(long beginRange, long endRange, long shiftDelta);
-    }
-
     /**
      * Apply all shifts in a memmove-semantics-safe ordering through the provided {@code shiftCallback}.
      * <p>
@@ -243,7 +232,7 @@ public interface Callback {
      *
      * @param shiftCallback the callback that will process all shifts
      */
-    public void apply(final Callback shiftCallback) {
+    public void apply(final RowKeyRangeShiftCallback shiftCallback) {
         final int polaritySwapSize = polaritySwapIndices.size();
         for (int idx = 0; idx < polaritySwapSize; ++idx) {
             int start = (idx == 0) ? 0 : polaritySwapIndices.get(idx - 1);
@@ -267,7 +256,7 @@ public void apply(final Callback shiftCallback) {
      *
      * @param shiftCallback the callback that will process all reverse shifts
      */
-    public void unapply(final Callback shiftCallback) {
+    public void unapply(final RowKeyRangeShiftCallback shiftCallback) {
         final int polaritySwapSize = polaritySwapIndices.size();
         for (int idx = 0; idx < polaritySwapSize; ++idx) {
             int start = (idx == 0) ? 0 : polaritySwapIndices.get(idx - 1);
@@ -291,7 +280,7 @@ public void unapply(final Callback shiftCallback) {
      * @param rowSet The {@link WritableRowSet} to shift
      * @return {@code rowSet}
      */
-    public boolean apply(final WritableRowSet rowSet) {
+    public WritableRowSet apply(final WritableRowSet rowSet) {
         final RowSetBuilderSequential toRemove = RowSetFactory.builderSequential();
         final RowSetBuilderSequential toInsert = RowSetFactory.builderSequential();
         try (final RowSequence.Iterator rsIt = rowSet.getRowSequenceIterator()) {
@@ -326,7 +315,7 @@ public boolean apply(final WritableRowSet rowSet) {
             rowSet.remove(remove);
             rowSet.insert(insert);
 
-            return remove.isNonempty() || insert.isNonempty();
+            return rowSet;
         }
     }
 
diff --git a/engine/rowset/src/main/java/io/deephaven/engine/rowset/impl/ExternalizableRowSetUtils.java b/engine/rowset/src/main/java/io/deephaven/engine/rowset/impl/ExternalizableRowSetUtils.java
index fe93cb29379..3d849a084ea 100644
--- a/engine/rowset/src/main/java/io/deephaven/engine/rowset/impl/ExternalizableRowSetUtils.java
+++ b/engine/rowset/src/main/java/io/deephaven/engine/rowset/impl/ExternalizableRowSetUtils.java
@@ -20,19 +20,21 @@
  */
 public class ExternalizableRowSetUtils {
 
-    private static final byte SHORT_VALUE = 1;
-    private static final byte INT_VALUE = 2;
-    private static final byte LONG_VALUE = 3;
-    private static final byte BYTE_VALUE = 4;
+    // @formatter:off
+    private static final byte SHORT_VALUE = 0b00000001;
+    private static final byte INT_VALUE   = 0b00000010;
+    private static final byte LONG_VALUE  = 0b00000011;
+    private static final byte BYTE_VALUE  = 0b00000100;
 
-    private static final byte VALUE_MASK = 7;
+    private static final byte VALUE_MASK  = 0b00000111;
 
-    private static final byte OFFSET = 8;
-    private static final byte SHORT_ARRAY = 16;
-    private static final byte BYTE_ARRAY = 24;
-    private static final byte END = 32;
+    private static final byte OFFSET      = 0b00001000;
+    private static final byte SHORT_ARRAY = 0b00010000;
+    private static final byte BYTE_ARRAY  = 0b00011000;
+    private static final byte END         = 0b00100000;
 
-    private static final byte CMD_MASK = 0x78;
+    private static final byte CMD_MASK    = 0b00111000;
+    // @formatter:on
 
     /**
      * Write a {@link RowSet} to {@code out}.
@@ -62,78 +64,117 @@ public static void writeExternalCompressedDeltas(@NotNull final DataOutput out,
 
     private static long appendWithOffsetDelta(@NotNull final DataOutput out, @NotNull final TShortArrayList shorts,
             final long offset, final long value, final boolean negate) throws IOException {
-        if (value >= offset + Short.MAX_VALUE) {
+        final long delta = value - offset;
+        if (delta >= Short.MAX_VALUE) {
             flushShorts(out, shorts);
-
-            final long newValue = value - offset;
-            writeValue(out, OFFSET, negate ? -newValue : newValue);
+            writeValue(out, OFFSET, negate ? -delta : delta);
             return value;
         }
         if (negate) {
-            shorts.add((short) -(value - offset));
+            shorts.add((short) -delta);
         } else {
-            shorts.add((short) (value - offset));
+            shorts.add((short) delta);
         }
         return value;
     }
 
-
     private static void flushShorts(@NotNull final DataOutput out, @NotNull final TShortArrayList shorts)
             throws IOException {
-        for (int offset = 0; offset < shorts.size();) {
-            int byteCount = 0;
-            while (offset + byteCount < shorts.size() && (shorts.getQuick(offset + byteCount) < Byte.MAX_VALUE
-                    && shorts.getQuick(offset + byteCount) > Byte.MIN_VALUE)) {
-                byteCount++;
+        final int size = shorts.size();
+        int writtenCount = 0;
+        int consecutiveTrailingBytes = 0;
+        for (int nextShortIndex = 0; nextShortIndex < size; ++nextShortIndex) {
+            final short nextShort = shorts.getQuick(nextShortIndex);
+            if (nextShort <= Byte.MAX_VALUE && nextShort >= Byte.MIN_VALUE) {
+                // nextShort can fit into a byte
+                ++consecutiveTrailingBytes;
+                continue;
             }
-            if (byteCount > 3 || byteCount + offset == shorts.size()) {
-                if (byteCount == 1) {
-                    writeValue(out, OFFSET, shorts.getQuick(offset));
-                } else {
-                    writeValue(out, BYTE_ARRAY, byteCount);
-                    for (int ii = offset; ii < offset + byteCount; ++ii) {
-                        out.writeByte(shorts.getQuick(ii));
-                    }
-                }
-
-                offset += byteCount;
-            } else {
-                int shortCount = byteCount;
-                int consecutiveBytes = 0;
-                while (shortCount + consecutiveBytes + offset < shorts.size()) {
-                    final short shortValue = shorts.getQuick(offset + shortCount + consecutiveBytes);
-                    final boolean requiresShort = (shortValue >= Byte.MAX_VALUE || shortValue <= Byte.MIN_VALUE);
-                    if (!requiresShort) {
-                        consecutiveBytes++;
-                    } else {
-                        consecutiveBytes = 0;
-                        shortCount += consecutiveBytes;
-                        shortCount++;
-                    }
-                    if (consecutiveBytes > 3) {
-                        // switch to byte mode
-                        break;
-                    }
-                }
-                // if we have a small number of trailing bytes, tack them onto the end
-                if (consecutiveBytes > 0 && consecutiveBytes <= 3
-                        && (offset + shortCount + consecutiveBytes == shorts.size())) {
-                    shortCount += consecutiveBytes;
-                }
-                if (shortCount >= 2) {
-                    writeValue(out, SHORT_ARRAY, shortCount);
-                    for (int ii = offset; ii < offset + shortCount; ++ii) {
-                        out.writeShort(shorts.getQuick(ii));
-                    }
-                } else if (shortCount == 1) {
-                    writeValue(out, OFFSET, shorts.getQuick(offset));
-                }
-                offset += shortCount;
+            // nextShort doesn't fit into a byte, so we've found the end of a (possibly-empty) sequence of bytes
+            if (shouldWriteBytes(consecutiveTrailingBytes)) {
+                // Write a possibly-empty prefix of shorts, followed by the consecutive bytes we found. Note that we're
+                // not writing the short that triggered the end of the byte sequence; it will join the next sequence.
+                final int shortCount = nextShortIndex - writtenCount - consecutiveTrailingBytes;
+                writeShortsThenBytes(out, shorts, writtenCount, shortCount, consecutiveTrailingBytes);
+                writtenCount = nextShortIndex;
             }
+            // Now we have at least one short, and no trailing bytes
+            consecutiveTrailingBytes = 0;
         }
+
+        // Write the remaining possibly-empty sequence of shorts, followed by any trailing consecutive bytes
+        final int shortCount = size - writtenCount - consecutiveTrailingBytes;
+        writeShortsThenBytes(out, shorts, writtenCount, shortCount, consecutiveTrailingBytes);
         shorts.resetQuick();
     }
 
+    private static boolean shouldWriteBytes(final int byteCount) {
+        /*
+         * @formatter:off
+         * =============================================================================================================
+         * Why do we use 4 as the size cutoff for writing a byte sequence?
+         * =============================================================================================================
+         *
+         * First, we consider the direct cost savings by writing bytes instead of appending them to a sequence of
+         *  shorts:
+         *
+         * -------------------------------------------------------------------------------------------------------------
+         * byteCount | output bytes                                          | saved output bytes
+         * -------------------------------------------------------------------------------------------------------------
+         *         1 | 2 (1 command byte, 1 value byte)                      | 0
+         *         2 | 4 (1 command byte, 1 length byte, 2 value bytes)      | 0
+         *     N > 3 | 2 + N (1 command byte, 1 length byte, N values bytes) | 1 + N - 3
+         *     N = 3 | 2 + 3 (1 command byte, 1 length byte, 3 value bytes)  | 1
+         *     N = 4 | 2 + 4 (1 command byte, 1 length byte, 4 value bytes)  | 2
+         * -------------------------------------------------------------------------------------------------------------
+         *
+         * This would seem to argue for splitting at 3 bytes, but we need to consider the impact of splitting a
+         * sequence of shorts unless our byte sequence is at the beginning or end of the overall sequence. We need only
+         * "pay" for one side, since that's the "extra" cost imposed by writing our byte sequence as bytes:
+         *
+         * -------------------------------------------------------------------------------------------------------------
+         *        shortCount | extra output bytes (excludes value bytes)
+         * -------------------------------------------------------------------------------------------------------------
+         *                 1 | 1 (1 command byte)
+         *             2-127 | 2 (1 command byte, 1 length byte)
+         *         128-32767 | 3 (1 command byte, 2 length bytes)
+         *  32768-2147483647 | 5 (1 command byte, 4 length bytes)
+         *       2147483647+ | 9 (1 command byte, 8 length bytes)
+         * -------------------------------------------------------------------------------------------------------------
+         *
+         * We could build a complex checker that perfectly minimizes the total number of bytes written, but given the
+         * number of shorts we're amortizing over at 128+, I'm inclined to keep this simple and just split at 4 bytes.
+         *
+         * =============================================================================================================
+         * At the end of our overall sequence it's never worse to write bytes if we have them, so we always write bytes.
+         * =============================================================================================================
+         * @formatter:on
+         */
+        return byteCount >= 4;
+    }
+
+    private static void writeShortsThenBytes(@NotNull final DataOutput out, @NotNull final TShortArrayList shorts,
+            int index, final int shortCount, final int byteCount) throws IOException {
+        if (shortCount == 1) {
+            writeValue(out, OFFSET, shorts.getQuick(index++));
+        } else if (shortCount > 1) {
+            writeValue(out, SHORT_ARRAY, shortCount);
+            final int shortLimit = index + shortCount;
+            do {
+                out.writeShort(shorts.getQuick(index++));
+            } while (index < shortLimit);
+        }
+        if (byteCount == 1) {
+            writeValue(out, OFFSET, shorts.getQuick(index)); // Note, no increment, to avoid unused assignment
+        } else if (byteCount > 1) {
+            writeValue(out, BYTE_ARRAY, byteCount);
+            final int byteLimit = index + byteCount;
+            do {
+                out.writeByte(shorts.getQuick(index++));
+            } while (index < byteLimit);
+        }
+    }
+
     private static void writeValue(@NotNull final DataOutput out, final byte command, final long value)
             throws IOException {
         if (value > Integer.MAX_VALUE || value < Integer.MIN_VALUE) {
diff --git a/engine/rowset/src/main/java/io/deephaven/engine/rowset/impl/WritableRowSetImpl.java b/engine/rowset/src/main/java/io/deephaven/engine/rowset/impl/WritableRowSetImpl.java
index 1d4ced7aae8..487d9bae220 100644
--- a/engine/rowset/src/main/java/io/deephaven/engine/rowset/impl/WritableRowSetImpl.java
+++ b/engine/rowset/src/main/java/io/deephaven/engine/rowset/impl/WritableRowSetImpl.java
@@ -3,7 +3,6 @@
 //
 package io.deephaven.engine.rowset.impl;
 
-import gnu.trove.list.array.TLongArrayList;
 import io.deephaven.base.log.LogOutput;
 import io.deephaven.base.verify.Assert;
 import io.deephaven.engine.rowset.*;
@@ -260,11 +259,6 @@ public final WritableRowSet invert(final RowSet keys, final long maximumPosition
         return new WritableRowSetImpl(innerSet.ixInvertOnNew(getInnerSet(keys), maximumPosition));
     }
 
-    @Override
-    public final TLongArrayList[] findMissing(final RowSet keys) {
-        return RowSetUtils.findMissing(this, keys);
-    }
-
     @NotNull
     @Override
     public final WritableRowSet intersect(@NotNull final RowSet range) {
diff --git a/engine/rowset/src/main/java/io/deephaven/engine/rowset/impl/sortedranges/SortedRanges.java b/engine/rowset/src/main/java/io/deephaven/engine/rowset/impl/sortedranges/SortedRanges.java
index c4aef6a2535..b5331d58f28 100644
--- a/engine/rowset/src/main/java/io/deephaven/engine/rowset/impl/sortedranges/SortedRanges.java
+++ b/engine/rowset/src/main/java/io/deephaven/engine/rowset/impl/sortedranges/SortedRanges.java
@@ -43,7 +43,7 @@ public final SortedRanges self() {
             SortedRanges.class, "longDenseMaxCapacity", 256);
 
     public static final int LONG_SPARSE_MAX_CAPACITY = Configuration.getInstance().getIntegerForClassWithDefault(
-            SortedRanges.class, "longSparseCapacity", 4096);
+            SortedRanges.class, "longSparseMaxCapacity", 4096);
 
     public static final int INT_DENSE_MAX_CAPACITY = Configuration.getInstance().getIntegerForClassWithDefault(
             SortedRanges.class, "intDenseMaxCapacity", arraySizeRoundingInt(2 * LONG_DENSE_MAX_CAPACITY));
diff --git a/engine/sql/src/main/java/io/deephaven/engine/sql/Sql.java b/engine/sql/src/main/java/io/deephaven/engine/sql/Sql.java
index 665a4378ed8..fb87d365147 100644
--- a/engine/sql/src/main/java/io/deephaven/engine/sql/Sql.java
+++ b/engine/sql/src/main/java/io/deephaven/engine/sql/Sql.java
@@ -19,10 +19,12 @@
 import io.deephaven.qst.table.TableHeader.Builder;
 import io.deephaven.qst.table.TableSpec;
 import io.deephaven.qst.table.TicketTable;
+import io.deephaven.qst.type.Type;
 import io.deephaven.sql.Scope;
 import io.deephaven.sql.ScopeStaticImpl;
 import io.deephaven.sql.SqlAdapter;
 import io.deephaven.sql.TableInformation;
+import io.deephaven.util.annotations.InternalUseOnly;
 import io.deephaven.util.annotations.ScriptApi;
 
 import java.nio.charset.StandardCharsets;
@@ -30,6 +32,7 @@
 import java.util.List;
 import java.util.Map;
 import java.util.Map.Entry;
+import java.util.function.Function;
 
 /**
  * Experimental SQL execution. Subject to change.
@@ -47,35 +50,38 @@ public static TableSpec dryRun(String sql) {
         return dryRun(sql, currentScriptSessionNamedTables());
     }
 
+    @InternalUseOnly
+    public static TableSpec parseSql(String sql, Map<String, Table> scope, Function<String, TicketTable> ticketFunction,
+            Map<TicketTable, Table> out) {
+        return SqlAdapter.parseSql(sql, scope(scope, out, ticketFunction));
+    }
+
     private static Table evaluate(String sql, Map<String, Table> scope) {
         final Map<TicketTable, Table> map = new HashMap<>(scope.size());
-        final TableSpec tableSpec = parseSql(sql, scope, map);
+        final TableSpec tableSpec = parseSql(sql, scope, Sql::sqlref, map);
         log.debug().append("Executing. Graphviz representation:").nl().append(ToGraphvizDot.INSTANCE, tableSpec).endl();
         return tableSpec.logic().create(new TableCreatorTicketInterceptor(TableCreatorImpl.INSTANCE, map));
     }
 
     private static TableSpec dryRun(String sql, Map<String, Table> scope) {
-        final TableSpec tableSpec = parseSql(sql, scope, null);
+        final TableSpec tableSpec = parseSql(sql, scope, Sql::sqlref, null);
         log.info().append("Dry run. Graphviz representation:").nl().append(ToGraphvizDot.INSTANCE, tableSpec).endl();
         return tableSpec;
     }
 
-    private static TableSpec parseSql(String sql, Map<String, Table> scope, Map<TicketTable, Table> out) {
-        return SqlAdapter.parseSql(sql, scope(scope, out));
-    }
-
     private static TicketTable sqlref(String tableName) {
+        // The TicketTable can technically be anything unique (incrementing number, random, ...), but for
+        // visualization purposes it makes sense to use the (already unique) table name.
         return TicketTable.of(("sqlref/" + tableName).getBytes(StandardCharsets.UTF_8));
     }
 
-    private static Scope scope(Map<String, Table> scope, Map<TicketTable, Table> out) {
+    private static Scope scope(Map<String, Table> scope, Map<TicketTable, Table> out,
+            Function<String, TicketTable> ticketFunction) {
         final ScopeStaticImpl.Builder builder = ScopeStaticImpl.builder();
         for (Entry<String, Table> e : scope.entrySet()) {
             final String tableName = e.getKey();
             final Table table = e.getValue();
-            // The TicketTable can technically be anything unique (incrementing number, random, ...), but for
-            // visualization purposes it makes sense to use the (already unique) table name.
-            final TicketTable spec = sqlref(tableName);
+            final TicketTable spec = ticketFunction.apply(tableName);
             final List<String> qualifiedName = List.of(tableName);
             final TableHeader header = adapt(table.getDefinition());
             builder.addTables(TableInformation.of(qualifiedName, header, spec));
@@ -103,11 +109,7 @@ private static TableHeader adapt(TableDefinition tableDef) {
     }
 
     private static ColumnHeader<?> adapt(ColumnDefinition<?> columnDef) {
-        if (columnDef.getComponentType() == null) {
-            return ColumnHeader.of(columnDef.getName(), columnDef.getDataType());
-        }
-        // SQLTODO(array-type)
-        throw new UnsupportedOperationException("SQLTODO(array-type)");
+        return ColumnHeader.of(columnDef.getName(), Type.find(columnDef.getDataType()));
     }
 
     private enum ToGraphvizDot implements ObjFormatter<TableSpec> {
diff --git a/engine/sql/src/main/java/io/deephaven/engine/sql/TableCreatorTicketInterceptor.java b/engine/sql/src/main/java/io/deephaven/engine/sql/TableCreatorTicketInterceptor.java
index 3ef1534ceeb..a98d5da40b2 100644
--- a/engine/sql/src/main/java/io/deephaven/engine/sql/TableCreatorTicketInterceptor.java
+++ b/engine/sql/src/main/java/io/deephaven/engine/sql/TableCreatorTicketInterceptor.java
@@ -5,21 +5,17 @@
 
 import io.deephaven.engine.table.Table;
 import io.deephaven.qst.TableCreator;
-import io.deephaven.qst.table.EmptyTable;
-import io.deephaven.qst.table.InputTable;
-import io.deephaven.qst.table.NewTable;
+import io.deephaven.qst.TableCreatorDelegate;
 import io.deephaven.qst.table.TicketTable;
-import io.deephaven.qst.table.TimeTable;
 
 import java.util.Map;
 import java.util.Objects;
 
-class TableCreatorTicketInterceptor implements TableCreator<Table> {
-    private final TableCreator<Table> delegate;
+class TableCreatorTicketInterceptor extends TableCreatorDelegate<Table> {
     private final Map<TicketTable, Table> map;
 
     public TableCreatorTicketInterceptor(TableCreator<Table> delegate, Map<TicketTable, Table> map) {
-        this.delegate = Objects.requireNonNull(delegate);
+        super(delegate);
         this.map = Objects.requireNonNull(map);
     }
 
@@ -29,31 +25,6 @@ public Table of(TicketTable ticketTable) {
         if (table != null) {
             return table;
         }
-        return delegate.of(ticketTable);
-    }
-
-    @Override
-    public Table of(NewTable newTable) {
-        return delegate.of(newTable);
-    }
-
-    @Override
-    public Table of(EmptyTable emptyTable) {
-        return delegate.of(emptyTable);
-    }
-
-    @Override
-    public Table of(TimeTable timeTable) {
-        return delegate.of(timeTable);
-    }
-
-    @Override
-    public Table of(InputTable inputTable) {
-        return delegate.of(inputTable);
-    }
-
-    @Override
-    public Table merge(Iterable<Table> tables) {
-        return delegate.merge(tables);
+        return super.of(ticketTable);
     }
 }
diff --git a/engine/stringset/src/main/java/io/deephaven/stringset/HashStringSet.java b/engine/stringset/src/main/java/io/deephaven/stringset/HashStringSet.java
index f59e13a25ee..2aaec46914d 100644
--- a/engine/stringset/src/main/java/io/deephaven/stringset/HashStringSet.java
+++ b/engine/stringset/src/main/java/io/deephaven/stringset/HashStringSet.java
@@ -3,7 +3,6 @@
 //
 package io.deephaven.stringset;
 
-import io.deephaven.datastructures.util.CollectionUtil;
 import org.jetbrains.annotations.NotNull;
 
 import java.io.Serializable;
@@ -74,7 +73,7 @@ public int size() {
 
     @Override
     public String[] values() {
-        return innerSet.toArray(CollectionUtil.ZERO_LENGTH_STRING_ARRAY);
+        return innerSet.toArray(String[]::new);
     }
 
     @Override
diff --git a/engine/table/build.gradle b/engine/table/build.gradle
index 96e23dffa1e..171fb1e9731 100644
--- a/engine/table/build.gradle
+++ b/engine/table/build.gradle
@@ -21,37 +21,45 @@ dependencies {
     api project(':deephaven-jpy-ext')
     api project(':hotspot')
     api project(':IO')
+    api project(':codec-api')
 
+    implementation project(':util-processenvironment')
+    implementation project(':util-thread')
     implementation project(':DHProcess')
     implementation project(':engine-function')
     implementation project(':engine-tuple')
     implementation project(':Configuration')
     implementation project(':log-factory')
     implementation project(':Stats')
+    implementation project(':codec-builtin')
+    implementation project(':codec-cache')
 
-    implementation 'com.github.f4b6a3:uuid-creator:5.2.0'
+    implementation libs.f4b6a3.uuid.creator
     // TODO(deephaven-core#3204): t-digest 3.3 appears to have higher errors than 3.2
-    implementation 'com.tdunning:t-digest:3.2'
-    implementation 'com.squareup:javapoet:1.13.0'
-    implementation 'io.github.classgraph:classgraph:4.8.165'
-    implementation 'it.unimi.dsi:fastutil:8.5.13'
+    implementation libs.tdunning.t.digest
+    implementation libs.squareup.javapoet
+    implementation libs.classgraph
+    implementation libs.dsi.fastutil
 
     implementation project(':plugin')
-    implementation depCommonsLang3
-    Classpaths.inheritCommonsText(project, 'implementation')
+    implementation libs.commons.lang3
+    implementation libs.commons.text
+    implementation libs.commons.compress
 
-    Classpaths.inheritGroovy(project, 'groovy', 'implementation')
-    Classpaths.inheritGroovy(project, 'groovy-json', 'implementation')
-    Classpaths.inheritJavaParser(project, 'implementation')
-    Classpaths.inheritAutoService(project)
+    implementation libs.groovy
+    implementation libs.groovy.json
+    implementation libs.javaparser.core
+    compileOnly libs.autoservice
+    annotationProcessor libs.autoservice.compiler
 
-    Classpaths.inheritImmutables(project)
+    compileOnly project(':util-immutables')
+    annotationProcessor libs.immutables.value
 
-    compileOnly 'com.google.code.findbugs:jsr305:3.0.2'
+    compileOnly libs.google.findbugs.jsr305
 
     runtimeOnly project(':engine-tuplesource')
 
-    Classpaths.inheritGuava(project)
+    implementation libs.guava
 
     testImplementation TestTools.projectDependency(project, 'engine-chunk')
     testImplementation TestTools.projectDependency(project, 'engine-vector')
@@ -69,15 +77,15 @@ dependencies {
     testImplementation project(':Numerics')
     testImplementation project(':extensions-suanshu')
 
-    Classpaths.inheritJUnitClassic(project, 'testImplementation')
+    testImplementation libs.junit4
 
-    Classpaths.inheritJUnitPlatform(project)
-    Classpaths.inheritAssertJ(project)
+    testImplementation platform(libs.junit.bom)
+    testImplementation libs.assertj
 
     testRuntimeOnly project(':log-to-slf4j')
     testRuntimeOnly project(':configs')
     testRuntimeOnly project(':test-configs')
-    Classpaths.inheritSlf4j(project, 'slf4j-simple', 'testRuntimeOnly')
+    testRuntimeOnly libs.slf4j.simple
 }
 
 spotless {
@@ -115,7 +123,11 @@ tasks.testOutOfBand.maxHeapSize = maxHeapSize
 tasks.test.maxHeapSize = maxHeapSize
 
 jmh {
-    jmhVersion = '1.35'
+    jmhVersion = libs.versions.jmh.get()
+}
+
+jmhJar {
+    zip64 = true
 }
 
 // No need to assemble the jar by default on build
diff --git a/engine/table/src/main/java/io/deephaven/engine/context/QueryCompilerImpl.java b/engine/table/src/main/java/io/deephaven/engine/context/QueryCompilerImpl.java
index ce2f8882ab8..da433f5b6f4 100644
--- a/engine/table/src/main/java/io/deephaven/engine/context/QueryCompilerImpl.java
+++ b/engine/table/src/main/java/io/deephaven/engine/context/QueryCompilerImpl.java
@@ -10,7 +10,6 @@
 import io.deephaven.base.verify.Assert;
 import io.deephaven.configuration.Configuration;
 import io.deephaven.configuration.DataDir;
-import io.deephaven.datastructures.util.CollectionUtil;
 import io.deephaven.engine.context.util.SynchronizedJavaFileManager;
 import io.deephaven.engine.table.impl.perf.BasePerformanceEntry;
 import io.deephaven.engine.table.impl.perf.QueryPerformanceRecorder;
@@ -710,7 +709,7 @@ private static String[] splitByModifiedUtf8Encoding(final String originalString,
         // 1. there are one or more characters that still need to be added to splits
         // 2. originalString was empty and so splits is empty and we need to add a single empty string to splits
         splits.add(originalString.substring(previousEnd));
-        return splits.toArray(CollectionUtil.ZERO_LENGTH_STRING_ARRAY);
+        return splits.toArray(String[]::new);
     }
 
     private static int calcBytesConsumed(final char ch) {
@@ -1005,7 +1004,7 @@ private boolean doCreateClassesSingleRound(
             }
         });
 
-        return wantRetry;
+        return wantRetry && !toRetry.isEmpty();
     }
 
     /**
diff --git a/engine/table/src/main/java/io/deephaven/engine/exceptions/ColumnSnapshotUnsuccessfulException.java b/engine/table/src/main/java/io/deephaven/engine/exceptions/ColumnSnapshotUnsuccessfulException.java
new file mode 100644
index 00000000000..3714c543082
--- /dev/null
+++ b/engine/table/src/main/java/io/deephaven/engine/exceptions/ColumnSnapshotUnsuccessfulException.java
@@ -0,0 +1,17 @@
+//
+// Copyright (c) 2016-2024 Deephaven Data Labs and Patent Pending
+//
+package io.deephaven.engine.exceptions;
+
+import io.deephaven.UncheckedDeephavenException;
+import org.jetbrains.annotations.NotNull;
+
+/**
+ * This exception is thrown when {@link io.deephaven.engine.table.impl.remote.ConstructSnapshot} fails to successfully
+ * collect snapshot data for a column in parallel.
+ */
+public class ColumnSnapshotUnsuccessfulException extends UncheckedDeephavenException {
+    public ColumnSnapshotUnsuccessfulException(@NotNull final String message, @NotNull final Throwable cause) {
+        super(message, cause);
+    }
+}
diff --git a/engine/table/src/main/java/io/deephaven/engine/table/impl/AbstractFilterExecution.java b/engine/table/src/main/java/io/deephaven/engine/table/impl/AbstractFilterExecution.java
index 3659e8bb530..6c388b3ee7d 100644
--- a/engine/table/src/main/java/io/deephaven/engine/table/impl/AbstractFilterExecution.java
+++ b/engine/table/src/main/java/io/deephaven/engine/table/impl/AbstractFilterExecution.java
@@ -190,12 +190,12 @@ private void doFilterParallel(
                         // Clean up the row sets created by the filter.
                         try (final RowSet ignored = adds;
                                 final RowSet ignored2 = mods) {
-                            if (addedResult != null) {
+                            if (addedResult != null && adds != null) {
                                 synchronized (addedResult) {
                                     addedResult.insert(adds);
                                 }
                             }
-                            if (modifiedResult != null) {
+                            if (modifiedResult != null && mods != null) {
                                 synchronized (modifiedResult) {
                                     modifiedResult.insert(mods);
                                 }
diff --git a/engine/table/src/main/java/io/deephaven/engine/table/impl/AddOnlyToBlinkTableAdapter.java b/engine/table/src/main/java/io/deephaven/engine/table/impl/AddOnlyToBlinkTableAdapter.java
index a2053e29e1f..cee9a57a23a 100644
--- a/engine/table/src/main/java/io/deephaven/engine/table/impl/AddOnlyToBlinkTableAdapter.java
+++ b/engine/table/src/main/java/io/deephaven/engine/table/impl/AddOnlyToBlinkTableAdapter.java
@@ -14,8 +14,11 @@
 import org.apache.commons.lang3.mutable.MutableObject;
 import org.jetbrains.annotations.NotNull;
 
+import javax.annotation.OverridingMethodsMustInvokeSuper;
 import java.util.List;
+import java.util.Map;
 
+import static io.deephaven.engine.table.Table.APPEND_ONLY_TABLE_ATTRIBUTE;
 import static io.deephaven.engine.table.Table.BLINK_TABLE_ATTRIBUTE;
 
 /**
@@ -42,14 +45,17 @@ public static Table toBlink(@NotNull final Table table) {
             return table;
         }
 
+        final Table addOnlyTable;
         if (!Boolean.TRUE.equals(table.getAttribute(Table.ADD_ONLY_TABLE_ATTRIBUTE))
-                && !Boolean.TRUE.equals(table.getAttribute(Table.APPEND_ONLY_TABLE_ATTRIBUTE))) {
-            throw new IllegalArgumentException("Argument table is neither add-only nor append-only");
+                && !Boolean.TRUE.equals(table.getAttribute(APPEND_ONLY_TABLE_ATTRIBUTE))) {
+            addOnlyTable = table.withAttributes(Map.of(Table.ADD_ONLY_TABLE_ATTRIBUTE, Boolean.TRUE));
+        } else {
+            addOnlyTable = table;
         }
 
         final MutableObject<QueryTable> resultHolder = new MutableObject<>();
         final MutableObject<AddOnlyToBlinkListener> listenerHolder = new MutableObject<>();
-        final BaseTable<?> coalesced = (BaseTable<?>) table.coalesce();
+        final BaseTable<?> coalesced = (BaseTable<?>) addOnlyTable.coalesce();
         final OperationSnapshotControl snapshotControl =
                 coalesced.createSnapshotControlIfRefreshing(OperationSnapshotControl::new);
 
@@ -58,14 +64,14 @@ public static Table toBlink(@NotNull final Table table) {
                 (final boolean usePrev, final long beforeClockValue) -> {
                     // Start with the same rows as the original table
                     final TrackingRowSet resultRowSet = usePrev
-                            ? table.getRowSet().copyPrev().toTracking()
-                            : table.getRowSet().copy().toTracking();
-                    final QueryTable result = new QueryTable(resultRowSet, table.getColumnSourceMap());
+                            ? addOnlyTable.getRowSet().copyPrev().toTracking()
+                            : addOnlyTable.getRowSet().copy().toTracking();
+                    final QueryTable result = new QueryTable(resultRowSet, addOnlyTable.getColumnSourceMap());
                     result.setRefreshing(true);
                     result.setAttribute(BLINK_TABLE_ATTRIBUTE, true);
 
                     final ListenerRecorder recorder =
-                            new ListenerRecorder("AddOnlyToBlinkListenerRecorder", table, null);
+                            new ListenerRecorder("AddOnlyToBlinkListenerRecorder", addOnlyTable, null);
                     final AddOnlyToBlinkListener listener = new AddOnlyToBlinkListener(recorder, result);
                     recorder.setMergedListener(listener);
                     result.addParentReference(listener);
@@ -116,10 +122,11 @@ public void run() {
             }
         }
 
+        @OverridingMethodsMustInvokeSuper
         @Override
         protected void destroy() {
-            getUpdateGraph().removeSource(this);
             super.destroy();
+            getUpdateGraph().removeSource(this);
         }
     }
 }
diff --git a/engine/table/src/main/java/io/deephaven/engine/table/impl/AsOfJoinHelper.java b/engine/table/src/main/java/io/deephaven/engine/table/impl/AsOfJoinHelper.java
index b301024da74..47df5e98c26 100644
--- a/engine/table/src/main/java/io/deephaven/engine/table/impl/AsOfJoinHelper.java
+++ b/engine/table/src/main/java/io/deephaven/engine/table/impl/AsOfJoinHelper.java
@@ -38,6 +38,7 @@
 import io.deephaven.util.SafeCloseableList;
 import org.jetbrains.annotations.NotNull;
 
+import javax.annotation.OverridingMethodsMustInvokeSuper;
 import java.util.*;
 import java.util.function.Function;
 import java.util.function.Supplier;
@@ -1335,11 +1336,14 @@ public void onUpdate(TableUpdate upstream) {
                         result.notifyListeners(downstream);
                     }
 
+                    @OverridingMethodsMustInvokeSuper
                     @Override
                     protected void destroy() {
                         super.destroy();
-                        leftStampKeys.close();
-                        leftStampValues.close();
+                        getUpdateGraph().runWhenIdle(() -> {
+                            leftStampKeys.close();
+                            leftStampValues.close();
+                        });
                     }
                 });
 
@@ -1516,11 +1520,14 @@ public void onUpdate(TableUpdate upstream) {
                                     }
                                 }
 
+                                @OverridingMethodsMustInvokeSuper
                                 @Override
                                 protected void destroy() {
                                     super.destroy();
-                                    compactedRightStampKeys.close();
-                                    compactedRightStampValues.close();
+                                    getUpdateGraph().runWhenIdle(() -> {
+                                        compactedRightStampKeys.close();
+                                        compactedRightStampValues.close();
+                                    });
                                 }
                             });
 
diff --git a/engine/table/src/main/java/io/deephaven/engine/table/impl/BaseTable.java b/engine/table/src/main/java/io/deephaven/engine/table/impl/BaseTable.java
index a66ac84e0f9..e0a1e4d1102 100644
--- a/engine/table/src/main/java/io/deephaven/engine/table/impl/BaseTable.java
+++ b/engine/table/src/main/java/io/deephaven/engine/table/impl/BaseTable.java
@@ -44,6 +44,7 @@
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
+import javax.annotation.OverridingMethodsMustInvokeSuper;
 import java.io.*;
 import java.util.*;
 import java.util.concurrent.TimeUnit;
@@ -923,6 +924,7 @@ public boolean canExecute(final long step) {
             return parent.satisfied(step);
         }
 
+        @OverridingMethodsMustInvokeSuper
         @Override
         protected void destroy() {
             super.destroy();
@@ -980,6 +982,7 @@ public boolean canExecute(final long step) {
             return parent.satisfied(step);
         }
 
+        @OverridingMethodsMustInvokeSuper
         @Override
         protected void destroy() {
             super.destroy();
@@ -1321,6 +1324,7 @@ public <T extends OperationSnapshotControl> T createSnapshotControlIfRefreshing(
     // Reference Counting
     // ------------------------------------------------------------------------------------------------------------------
 
+    @OverridingMethodsMustInvokeSuper
     @Override
     protected void destroy() {
         super.destroy();
diff --git a/engine/table/src/main/java/io/deephaven/engine/table/impl/ColumnSourceManager.java b/engine/table/src/main/java/io/deephaven/engine/table/impl/ColumnSourceManager.java
index 1d5ba841b7a..3a03dd69a0c 100644
--- a/engine/table/src/main/java/io/deephaven/engine/table/impl/ColumnSourceManager.java
+++ b/engine/table/src/main/java/io/deephaven/engine/table/impl/ColumnSourceManager.java
@@ -3,14 +3,10 @@
 //
 package io.deephaven.engine.table.impl;
 
-import io.deephaven.engine.liveness.LivenessReferent;
+import io.deephaven.engine.liveness.LivenessNode;
 import io.deephaven.engine.rowset.RowSet;
 import io.deephaven.engine.rowset.TrackingWritableRowSet;
-import io.deephaven.engine.rowset.WritableRowSet;
-import io.deephaven.engine.table.ColumnSource;
-import io.deephaven.engine.table.DataIndex;
-import io.deephaven.engine.table.Table;
-import io.deephaven.engine.table.TableListener;
+import io.deephaven.engine.table.*;
 import io.deephaven.engine.table.impl.locations.ImmutableTableLocationKey;
 import io.deephaven.engine.table.impl.locations.TableLocation;
 import org.jetbrains.annotations.NotNull;
@@ -22,7 +18,7 @@
 /**
  * Manager for ColumnSources in a Table.
  */
-public interface ColumnSourceManager extends LivenessReferent {
+public interface ColumnSourceManager extends LivenessNode {
 
     /**
      * Get a map of name to {@link ColumnSource} for the column sources maintained by this manager.
@@ -53,7 +49,7 @@ public interface ColumnSourceManager extends LivenessReferent {
      *
      * @return The set of added row keys, to be owned by the caller
      */
-    WritableRowSet refresh();
+    TableUpdate refresh();
 
     /**
      * Advise this ColumnSourceManager that an error has occurred, and that it will no longer be {@link #refresh()
@@ -116,8 +112,18 @@ public interface ColumnSourceManager extends LivenessReferent {
     /**
      * Remove a table location key from the sources.
      *
-     * @return true if the location key was actually removed
      * @param tableLocationKey the location key being removed
      */
-    boolean removeLocationKey(@NotNull ImmutableTableLocationKey tableLocationKey);
+    void removeLocationKey(@NotNull ImmutableTableLocationKey tableLocationKey);
+
+    /**
+     * Get a map of Table attributes that can be applied to the output source table, given the update modes of the
+     * underlying table location provider.
+     *
+     * @param tableUpdateMode The update mode of the table location set
+     * @param tableLocationUpdateMode The update mode of the table location rows
+     */
+    Map<String, Object> getTableAttributes(
+            @NotNull TableUpdateMode tableUpdateMode,
+            @NotNull TableUpdateMode tableLocationUpdateMode);
 }
diff --git a/engine/table/src/main/java/io/deephaven/engine/table/impl/DeferredViewTable.java b/engine/table/src/main/java/io/deephaven/engine/table/impl/DeferredViewTable.java
index c6aaed349db..33992c41bc3 100644
--- a/engine/table/src/main/java/io/deephaven/engine/table/impl/DeferredViewTable.java
+++ b/engine/table/src/main/java/io/deephaven/engine/table/impl/DeferredViewTable.java
@@ -6,7 +6,6 @@
 import io.deephaven.api.Selectable;
 import io.deephaven.api.filter.Filter;
 import io.deephaven.base.verify.Assert;
-import io.deephaven.datastructures.util.CollectionUtil;
 import io.deephaven.engine.liveness.Liveness;
 import io.deephaven.engine.table.*;
 import io.deephaven.engine.table.impl.select.analyzers.SelectAndViewAnalyzer;
@@ -14,6 +13,7 @@
 import io.deephaven.engine.liveness.LivenessArtifact;
 import io.deephaven.engine.liveness.LivenessReferent;
 import io.deephaven.engine.table.impl.select.*;
+import io.deephaven.util.type.ArrayTypeUtils;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
@@ -41,7 +41,7 @@ public DeferredViewTable(@NotNull final TableDefinition definition,
         super(definition, description);
         this.tableReference = tableReference;
         this.deferredDropColumns =
-                deferredDropColumns == null ? CollectionUtil.ZERO_LENGTH_STRING_ARRAY : deferredDropColumns;
+                deferredDropColumns == null ? ArrayTypeUtils.EMPTY_STRING_ARRAY : deferredDropColumns;
         this.deferredViewColumns =
                 deferredViewColumns == null ? SelectColumn.ZERO_LENGTH_SELECT_COLUMN_ARRAY : deferredViewColumns;
         final TableDefinition parentDefinition = tableReference.getDefinition();
diff --git a/engine/table/src/main/java/io/deephaven/engine/table/impl/FlattenOperation.java b/engine/table/src/main/java/io/deephaven/engine/table/impl/FlattenOperation.java
index 10059e035ca..c77674d346b 100644
--- a/engine/table/src/main/java/io/deephaven/engine/table/impl/FlattenOperation.java
+++ b/engine/table/src/main/java/io/deephaven/engine/table/impl/FlattenOperation.java
@@ -12,6 +12,7 @@
 import io.deephaven.engine.table.impl.sources.RedirectedColumnSource;
 import io.deephaven.engine.table.impl.util.*;
 import org.apache.commons.lang3.mutable.MutableObject;
+import org.jetbrains.annotations.NotNull;
 
 import java.util.LinkedHashMap;
 import java.util.Map;
@@ -98,6 +99,34 @@ private void onUpdate(final TableUpdate upstream) {
         try (final RowSet prevRowSet = rowSet.copyPrev()) {
             downstream.removed = prevRowSet.invert(upstream.removed());
         }
+
+        if (newSize < prevSize) {
+            resultTable.getRowSet().writableCast().removeRange(newSize, prevSize - 1);
+        } else if (newSize > prevSize) {
+            resultTable.getRowSet().writableCast().insertRange(prevSize, newSize - 1);
+        }
+
+        downstream.shifted = computeFlattenedRowSetShiftData(downstream.removed(), downstream.added(), prevSize);
+        prevSize = newSize;
+        resultTable.notifyListeners(downstream);
+    }
+
+    /**
+     * Compute the shift data for a flattened row set given which rows were removed and which were added.
+     *
+     * @param removed the rows that were removed in the flattened pre-update key-space
+     * @param added the rows that were added in the flattened post-update key-space
+     * @param prevSize the size of the table before the update
+     * @return the shift data
+     */
+    public static RowSetShiftData computeFlattenedRowSetShiftData(
+            @NotNull final RowSet removed,
+            @NotNull final RowSet added,
+            final long prevSize) {
+        if (removed.isEmpty() && added.isEmpty()) {
+            return RowSetShiftData.EMPTY;
+        }
+
         final RowSetShiftData.Builder outShifted = new RowSetShiftData.Builder();
 
         // Helper to ensure that we can prime iterators and still detect the end.
@@ -110,8 +139,8 @@ private void onUpdate(final TableUpdate upstream) {
         };
 
         // Create our range iterators and prime them.
-        final MutableObject<RowSet.RangeIterator> rmIt = new MutableObject<>(downstream.removed().rangeIterator());
-        final MutableObject<RowSet.RangeIterator> addIt = new MutableObject<>(downstream.added().rangeIterator());
+        final MutableObject<RowSet.RangeIterator> rmIt = new MutableObject<>(removed.rangeIterator());
+        final MutableObject<RowSet.RangeIterator> addIt = new MutableObject<>(added.rangeIterator());
         updateIt.accept(rmIt);
         updateIt.accept(addIt);
 
@@ -163,14 +192,6 @@ private void onUpdate(final TableUpdate upstream) {
             outShifted.shiftRange(currMarker, prevSize - 1, currDelta);
         }
 
-        if (newSize < prevSize) {
-            resultTable.getRowSet().writableCast().removeRange(newSize, prevSize - 1);
-        } else if (newSize > prevSize) {
-            resultTable.getRowSet().writableCast().insertRange(prevSize, newSize - 1);
-        }
-
-        downstream.shifted = outShifted.build();
-        prevSize = newSize;
-        resultTable.notifyListeners(downstream);
+        return outShifted.build();
     }
 }
diff --git a/engine/table/src/main/java/io/deephaven/engine/table/impl/ForkJoinPoolOperationInitializer.java b/engine/table/src/main/java/io/deephaven/engine/table/impl/ForkJoinPoolOperationInitializer.java
new file mode 100644
index 00000000000..6954380db88
--- /dev/null
+++ b/engine/table/src/main/java/io/deephaven/engine/table/impl/ForkJoinPoolOperationInitializer.java
@@ -0,0 +1,94 @@
+//
+// Copyright (c) 2016-2024 Deephaven Data Labs and Patent Pending
+//
+package io.deephaven.engine.table.impl;
+
+import io.deephaven.engine.context.ExecutionContext;
+import io.deephaven.engine.updategraph.OperationInitializer;
+import org.jetbrains.annotations.NotNull;
+
+import java.util.Objects;
+import java.util.concurrent.ForkJoinPool;
+import java.util.concurrent.ForkJoinTask;
+import java.util.concurrent.Future;
+import java.util.function.Supplier;
+
+/**
+ * Implementation of {@link OperationInitializer} that delegates to a {@link ForkJoinPool}.
+ */
+public class ForkJoinPoolOperationInitializer implements OperationInitializer {
+
+    @NotNull
+    public static OperationInitializer fromCommonPool() {
+        return COMMON;
+    }
+
+    private static final ForkJoinPoolOperationInitializer COMMON =
+            new ForkJoinPoolOperationInitializer(ForkJoinPool.commonPool()) {
+
+                private final ExecutionContext executionContext = ExecutionContext.newBuilder()
+                        .setOperationInitializer(NON_PARALLELIZABLE)
+                        .build();
+
+                @Override
+                public @NotNull Future<?> submit(@NotNull final Runnable task) {
+                    return super.submit(() -> executionContext.apply(task));
+                }
+            };
+
+    private final ForkJoinPool pool;
+
+    private ForkJoinPoolOperationInitializer(@NotNull final ForkJoinPool pool) {
+        this.pool = Objects.requireNonNull(pool);
+    }
+
+    @Override
+    public boolean canParallelize() {
+        return parallelismFactor() > 1 && ForkJoinTask.getPool() != pool;
+    }
+
+    @Override
+    @NotNull
+    public Future<?> submit(@NotNull final Runnable taskRunnable) {
+        return pool.submit(taskRunnable);
+    }
+
+    @Override
+    public int parallelismFactor() {
+        return pool.getParallelism();
+    }
+
+    /**
+     * Ensure that {@code task} is parallelizable within the current {@link ExecutionContext}, by wrapping it with a new
+     * {@code ExecutionContext} that uses {@link #fromCommonPool()} if the current {@code ExecutionContext} does not
+     * {@link OperationInitializer#canParallelize() allow parallelization}.
+     *
+     * @param task The task to possible wrap
+     * @return The possibly-wrapped task
+     */
+    public static Runnable ensureParallelizable(@NotNull final Runnable task) {
+        if (ExecutionContext.getContext().getOperationInitializer().canParallelize()) {
+            return task;
+        }
+        return () -> ExecutionContext.getContext()
+                .withOperationInitializer(ForkJoinPoolOperationInitializer.fromCommonPool())
+                .apply(task);
+    }
+
+    /**
+     * Ensure that {@code task} is parallelizable within the current {@link ExecutionContext}, by wrapping it with a new
+     * {@code ExecutionContext} that uses {@link #fromCommonPool()} if the current {@code ExecutionContext} does not
+     * {@link OperationInitializer#canParallelize() allow parallelization}.
+     *
+     * @param task The task to possible wrap
+     * @return The possibly-wrapped task
+     */
+    public static <T> Supplier<T> ensureParallelizable(@NotNull final Supplier<T> task) {
+        if (ExecutionContext.getContext().getOperationInitializer().canParallelize()) {
+            return task;
+        }
+        return () -> ExecutionContext.getContext()
+                .withOperationInitializer(ForkJoinPoolOperationInitializer.fromCommonPool())
+                .apply(task);
+    }
+}
diff --git a/engine/table/src/main/java/io/deephaven/engine/table/impl/InstrumentedTableListenerBase.java b/engine/table/src/main/java/io/deephaven/engine/table/impl/InstrumentedTableListenerBase.java
index acdf3605ac6..c14d5eaf20f 100644
--- a/engine/table/src/main/java/io/deephaven/engine/table/impl/InstrumentedTableListenerBase.java
+++ b/engine/table/src/main/java/io/deephaven/engine/table/impl/InstrumentedTableListenerBase.java
@@ -50,7 +50,7 @@ public abstract class InstrumentedTableListenerBase extends LivenessArtifact
     private final PerformanceEntry entry;
     private final boolean terminalListener;
 
-    private boolean failed = false;
+    protected boolean failed = false;
     private static volatile boolean verboseLogging = Configuration
             .getInstance()
             .getBooleanWithDefault("InstrumentedTableListenerBase.verboseLogging", false);
diff --git a/engine/table/src/main/java/io/deephaven/engine/table/impl/InstrumentedTableUpdateListenerAdapter.java b/engine/table/src/main/java/io/deephaven/engine/table/impl/InstrumentedTableUpdateListenerAdapter.java
index 98def70706e..91a18e9f2d2 100644
--- a/engine/table/src/main/java/io/deephaven/engine/table/impl/InstrumentedTableUpdateListenerAdapter.java
+++ b/engine/table/src/main/java/io/deephaven/engine/table/impl/InstrumentedTableUpdateListenerAdapter.java
@@ -17,6 +17,7 @@
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
+import javax.annotation.OverridingMethodsMustInvokeSuper;
 import java.io.IOException;
 
 /**
@@ -92,8 +93,10 @@ public boolean canExecute(final long step) {
         return source.satisfied(step);
     }
 
+    @OverridingMethodsMustInvokeSuper
     @Override
     protected void destroy() {
+        super.destroy();
         source.removeUpdateListener(this);
         if (retain) {
             RETENTION_CACHE.forget(this);
diff --git a/engine/table/src/main/java/io/deephaven/engine/table/impl/JoinControl.java b/engine/table/src/main/java/io/deephaven/engine/table/impl/JoinControl.java
index 279aa73fc1d..57af02c692f 100644
--- a/engine/table/src/main/java/io/deephaven/engine/table/impl/JoinControl.java
+++ b/engine/table/src/main/java/io/deephaven/engine/table/impl/JoinControl.java
@@ -32,10 +32,21 @@ int initialBuildSize() {
         return MINIMUM_INITIAL_HASH_SIZE;
     }
 
-    int tableSize(final long initialCapacity) {
-        return Math.toIntExact(
-                Math.max(MINIMUM_INITIAL_HASH_SIZE,
-                        Math.min(MAX_TABLE_SIZE, Long.highestOneBit(initialCapacity) * 2)));
+    /**
+     * Determine the initial size of the hash table based on the expected number of entries. This is used for static
+     * cases where we won't rehash, or when we have a data index with a known size to start us off from. Other cases use
+     * {@link #initialBuildSize()}.
+     *
+     * @param expectedEntries The expected maximum number of entries that will be needed.
+     * @return The initial size of the hash table to use
+     */
+    int tableSize(final long expectedEntries) {
+        // Get the target capacity to contain expected entries at target load factor. This is optimizing for time, at
+        // the expense of some memory usage.
+        final long targetCapacity = (long) Math.ceil(expectedEntries / getTargetLoadFactor());
+        final long targetCapacityPowerOf2 = Long.highestOneBit(targetCapacity) << 1;
+        // We know the result fits in an int, since MINIMUM_INITIAL_HASH_SIZE and MAX_TABLE_SIZE are positive ints.
+        return (int) Math.max(MINIMUM_INITIAL_HASH_SIZE, Math.min(MAX_TABLE_SIZE, targetCapacityPowerOf2));
     }
 
     double getMaximumLoadFactor() {
diff --git a/engine/table/src/main/java/io/deephaven/engine/table/impl/KeyedTableListener.java b/engine/table/src/main/java/io/deephaven/engine/table/impl/KeyedTableListener.java
index 211b14e40e6..5429f16b9a1 100644
--- a/engine/table/src/main/java/io/deephaven/engine/table/impl/KeyedTableListener.java
+++ b/engine/table/src/main/java/io/deephaven/engine/table/impl/KeyedTableListener.java
@@ -4,7 +4,6 @@
 package io.deephaven.engine.table.impl;
 
 import io.deephaven.base.verify.Assert;
-import io.deephaven.datastructures.util.CollectionUtil;
 import io.deephaven.engine.table.ColumnSource;
 import io.deephaven.engine.rowset.RowSet;
 import gnu.trove.map.hash.TLongObjectHashMap;
@@ -58,7 +57,7 @@ public void onUpdate(final RowSet added, final RowSet removed, final RowSet modi
         };
 
         List<String> allColumnNames = table.getDefinition().getColumnNames();
-        this.allColumnNames = allColumnNames.toArray(CollectionUtil.ZERO_LENGTH_STRING_ARRAY);
+        this.allColumnNames = allColumnNames.toArray(String[]::new);
         this.parentColumnSourceMap = table.getColumnSourceMap();
     }
 
diff --git a/engine/table/src/main/java/io/deephaven/engine/table/impl/ListenerRecorder.java b/engine/table/src/main/java/io/deephaven/engine/table/impl/ListenerRecorder.java
index f0f5bcb1b22..84ac02ec539 100644
--- a/engine/table/src/main/java/io/deephaven/engine/table/impl/ListenerRecorder.java
+++ b/engine/table/src/main/java/io/deephaven/engine/table/impl/ListenerRecorder.java
@@ -14,6 +14,8 @@
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
+import javax.annotation.OverridingMethodsMustInvokeSuper;
+
 /**
  * A listener recorder stores references to added, removed, modified, and shifted indices; and then notifies a
  * {@link MergedListener} that a change has occurred. The combination of a {@link ListenerRecorder} and
@@ -90,6 +92,7 @@ public boolean canExecute(final long step) {
         return parent.satisfied(step);
     }
 
+    @OverridingMethodsMustInvokeSuper
     @Override
     protected void destroy() {
         super.destroy();
diff --git a/engine/table/src/main/java/io/deephaven/engine/table/impl/MemoizedOperationKey.java b/engine/table/src/main/java/io/deephaven/engine/table/impl/MemoizedOperationKey.java
index a6f3f272b74..df8244a2d68 100644
--- a/engine/table/src/main/java/io/deephaven/engine/table/impl/MemoizedOperationKey.java
+++ b/engine/table/src/main/java/io/deephaven/engine/table/impl/MemoizedOperationKey.java
@@ -8,7 +8,6 @@
 import io.deephaven.api.RangeJoinMatch;
 import io.deephaven.api.agg.Aggregation;
 import io.deephaven.engine.table.Table;
-import io.deephaven.engine.table.WouldMatchPair;
 import io.deephaven.engine.table.impl.select.*;
 import io.deephaven.engine.table.impl.sources.regioned.SymbolTableSource;
 import org.jetbrains.annotations.NotNull;
@@ -525,10 +524,12 @@ public int hashCode() {
     }
 
     private static final class WouldMatch extends AttributeAgnosticMemoizedOperationKey {
-        private final WouldMatchPair[] pairs;
+        private final String[] names;
+        private final WhereFilter[] filters;
 
-        private WouldMatch(WouldMatchPair[] pairs) {
-            this.pairs = pairs;
+        private WouldMatch(String[] names, WhereFilter[] filters) {
+            this.names = names;
+            this.filters = filters;
         }
 
         @Override
@@ -540,12 +541,12 @@ public boolean equals(final Object other) {
                 return false;
             }
             final WouldMatch wouldMatch = (WouldMatch) other;
-            return Arrays.equals(pairs, wouldMatch.pairs);
+            return Arrays.equals(names, wouldMatch.names) && Arrays.equals(filters, wouldMatch.filters);
         }
 
         @Override
         public int hashCode() {
-            return Arrays.hashCode(pairs);
+            return Arrays.hashCode(names) ^ Arrays.hashCode(filters);
         }
 
         @Override
@@ -554,8 +555,11 @@ BaseTable.CopyAttributeOperation copyType() {
         }
     }
 
-    public static MemoizedOperationKey wouldMatch(WouldMatchPair... pairs) {
-        return new WouldMatch(pairs);
+    public static MemoizedOperationKey wouldMatch(String[] names, WhereFilter... filters) {
+        if (Arrays.stream(filters).allMatch(WhereFilter::canMemoize)) {
+            return new WouldMatch(names, filters);
+        }
+        return null;
     }
 
     private static class CrossJoin extends AttributeAgnosticMemoizedOperationKey {
diff --git a/engine/table/src/main/java/io/deephaven/engine/table/impl/MergedListener.java b/engine/table/src/main/java/io/deephaven/engine/table/impl/MergedListener.java
index fd5a723736e..b4a2462f219 100644
--- a/engine/table/src/main/java/io/deephaven/engine/table/impl/MergedListener.java
+++ b/engine/table/src/main/java/io/deephaven/engine/table/impl/MergedListener.java
@@ -24,6 +24,7 @@
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
+import javax.annotation.OverridingMethodsMustInvokeSuper;
 import java.io.IOException;
 import java.lang.ref.WeakReference;
 import java.util.Collection;
@@ -48,6 +49,7 @@ public abstract class MergedListener extends LivenessArtifact implements Notific
             AtomicLongFieldUpdater.newUpdater(MergedListener.class, "lastCompletedStep");
 
     private final UpdateGraph updateGraph;
+
     private final Iterable<? extends ListenerRecorder> recorders;
     private final Iterable<NotificationQueue.Dependency> dependencies;
     private final String listenerDescription;
@@ -56,6 +58,9 @@ public abstract class MergedListener extends LivenessArtifact implements Notific
     protected final PerformanceEntry entry;
     private final String logPrefix;
 
+    private boolean failed;
+
+
     @SuppressWarnings("FieldMayBeFinal")
     private volatile long lastCompletedStep = NotificationStepReceiver.NULL_NOTIFICATION_STEP;
     private volatile long lastEnqueuedStep = NotificationStepReceiver.NULL_NOTIFICATION_STEP;
@@ -91,6 +96,14 @@ public UpdateGraph getUpdateGraph() {
         return updateGraph;
     }
 
+    protected Iterable<? extends ListenerRecorder> getRecorders() {
+        return recorders;
+    }
+
+    public boolean isFailed() {
+        return failed;
+    }
+
     public final void notifyOnUpstreamError(
             @NotNull final Throwable upstreamError, @Nullable final TableListener.Entry errorSourceEntry) {
         notifyInternal(upstreamError, errorSourceEntry);
@@ -102,6 +115,10 @@ public void notifyChanges() {
 
     private void notifyInternal(@Nullable final Throwable upstreamError,
             @Nullable final TableListener.Entry errorSourceEntry) {
+        if (failed) {
+            return;
+        }
+
         final long currentStep = getUpdateGraph().clock().currentStep();
 
         synchronized (this) {
@@ -145,6 +162,7 @@ protected void propagateError(
             final boolean uncaughtExceptionFromProcess,
             @NotNull final Throwable error,
             @Nullable final TableListener.Entry entry) {
+        failed = true;
         forceReferenceCountToZero();
         propagateErrorDownstream(uncaughtExceptionFromProcess, error, entry);
         try {
@@ -157,16 +175,21 @@ protected void propagateError(
     }
 
     protected boolean systemicResult() {
-        return SystemicObjectTracker.isSystemic(result);
+        return result != null && SystemicObjectTracker.isSystemic(result);
     }
 
+    @OverridingMethodsMustInvokeSuper
     @Override
     protected void destroy() {
+        super.destroy();
         recorders.forEach(ListenerRecorder::forceReferenceCountToZero);
     }
 
     protected void propagateErrorDownstream(
             final boolean fromProcess, @NotNull final Throwable error, @Nullable final TableListener.Entry entry) {
+        if (result == null) {
+            return;
+        }
         if (fromProcess && result.satisfied(getUpdateGraph().clock().currentStep())) {
             // If the result is already satisfied (because it managed to send its notification, or was otherwise
             // satisfied) we should not send our error notification on this cycle.
diff --git a/engine/table/src/main/java/io/deephaven/engine/table/impl/NaturalJoinHelper.java b/engine/table/src/main/java/io/deephaven/engine/table/impl/NaturalJoinHelper.java
index ae5aac7de31..ef8f2562b4b 100644
--- a/engine/table/src/main/java/io/deephaven/engine/table/impl/NaturalJoinHelper.java
+++ b/engine/table/src/main/java/io/deephaven/engine/table/impl/NaturalJoinHelper.java
@@ -4,7 +4,6 @@
 package io.deephaven.engine.table.impl;
 
 import io.deephaven.base.verify.Assert;
-import io.deephaven.datastructures.util.CollectionUtil;
 import io.deephaven.engine.rowset.*;
 import io.deephaven.engine.table.*;
 import io.deephaven.engine.table.impl.by.typed.TypedHasherFactory;
@@ -740,7 +739,7 @@ private ChunkedMergedJoinListener(QueryTable leftTable,
             allRightColumns = result.newModifiedColumnSet(MatchPair.getLeftColumns(columnsToAdd));
 
             leftTransformer = leftTable.newModifiedColumnSetTransformer(result,
-                    leftTable.getColumnSourceMap().keySet().toArray(CollectionUtil.ZERO_LENGTH_STRING_ARRAY));
+                    leftTable.getColumnSourceMap().keySet().toArray(String[]::new));
             rightTransformer = rightTable.newModifiedColumnSetTransformer(result, columnsToAdd);
             modifiedSlotTracker = new NaturalJoinModifiedSlotTracker();
         }
diff --git a/engine/table/src/main/java/io/deephaven/engine/table/impl/PartitionAwareSourceTable.java b/engine/table/src/main/java/io/deephaven/engine/table/impl/PartitionAwareSourceTable.java
index a43b6a88068..b1933919672 100644
--- a/engine/table/src/main/java/io/deephaven/engine/table/impl/PartitionAwareSourceTable.java
+++ b/engine/table/src/main/java/io/deephaven/engine/table/impl/PartitionAwareSourceTable.java
@@ -6,6 +6,7 @@
 import io.deephaven.api.Selectable;
 import io.deephaven.api.filter.Filter;
 import io.deephaven.base.verify.Assert;
+import io.deephaven.engine.liveness.LiveSupplier;
 import io.deephaven.engine.table.*;
 import io.deephaven.engine.table.impl.select.analyzers.SelectAndViewAnalyzer;
 import io.deephaven.engine.updategraph.UpdateSourceRegistrar;
@@ -204,7 +205,7 @@ protected final Table redefine(TableDefinition newDefinitionExternal, TableDefin
                 reference, null, viewColumns, null);
     }
 
-    private static final String LOCATION_KEY_COLUMN_NAME = "__PartitionAwareSourceTable_TableLocationKey__";
+    private static final String KEY_SUPPLIER_COLUMN_NAME = "__PartitionAwareSourceTable_KeySupplier__";
 
     private static <T> ColumnSource<? super T> makePartitionSource(@NotNull final ColumnDefinition<T> columnDefinition,
             @NotNull final Collection<ImmutableTableLocationKey> locationKeys) {
@@ -221,30 +222,42 @@ private static <T> ColumnSource<? super T> makePartitionSource(@NotNull final Co
     }
 
     @Override
-    protected final Collection<ImmutableTableLocationKey> filterLocationKeys(
-            @NotNull final Collection<ImmutableTableLocationKey> foundLocationKeys) {
+    protected final Collection<LiveSupplier<ImmutableTableLocationKey>> filterLocationKeys(
+            @NotNull final Collection<LiveSupplier<ImmutableTableLocationKey>> foundLocationKeys) {
         if (partitioningColumnFilters.length == 0) {
             return foundLocationKeys;
         }
+
+        final Collection<ImmutableTableLocationKey> immutableTableLocationKeys = foundLocationKeys.stream()
+                .map(LiveSupplier::get)
+                .collect(Collectors.toList());
+
         // TODO (https://github.com/deephaven/deephaven-core/issues/867): Refactor around a ticking partition table
         final List<String> partitionTableColumnNames = Stream.concat(
                 partitioningColumnDefinitions.keySet().stream(),
-                Stream.of(LOCATION_KEY_COLUMN_NAME)).collect(Collectors.toList());
+                Stream.of(KEY_SUPPLIER_COLUMN_NAME)).collect(Collectors.toList());
         final List<ColumnSource<?>> partitionTableColumnSources =
                 new ArrayList<>(partitioningColumnDefinitions.size() + 1);
         for (final ColumnDefinition<?> columnDefinition : partitioningColumnDefinitions.values()) {
-            partitionTableColumnSources.add(makePartitionSource(columnDefinition, foundLocationKeys));
+            partitionTableColumnSources.add(makePartitionSource(columnDefinition, immutableTableLocationKeys));
         }
-        partitionTableColumnSources.add(ArrayBackedColumnSource.getMemoryColumnSource(foundLocationKeys,
-                ImmutableTableLocationKey.class, null));
+        // Add the key suppliers to the table
+        // noinspection unchecked,rawtypes
+        partitionTableColumnSources.add(ArrayBackedColumnSource.getMemoryColumnSource(
+                (Collection<LiveSupplier>) (Collection) foundLocationKeys,
+                LiveSupplier.class,
+                null));
+
         final Table filteredColumnPartitionTable = TableTools
                 .newTable(foundLocationKeys.size(), partitionTableColumnNames, partitionTableColumnSources)
                 .where(Filter.and(partitioningColumnFilters));
         if (filteredColumnPartitionTable.size() == foundLocationKeys.size()) {
             return foundLocationKeys;
         }
-        final Iterable<ImmutableTableLocationKey> iterable =
-                () -> filteredColumnPartitionTable.columnIterator(LOCATION_KEY_COLUMN_NAME);
+
+        // Return the filtered keys
+        final Iterable<LiveSupplier<ImmutableTableLocationKey>> iterable =
+                () -> filteredColumnPartitionTable.columnIterator(KEY_SUPPLIER_COLUMN_NAME);
         return StreamSupport.stream(iterable.spliterator(), false).collect(Collectors.toList());
     }
 
diff --git a/engine/table/src/main/java/io/deephaven/engine/table/impl/QueryCompilerRequestProcessor.java b/engine/table/src/main/java/io/deephaven/engine/table/impl/QueryCompilerRequestProcessor.java
index ae321271be4..49e6e2e6b14 100644
--- a/engine/table/src/main/java/io/deephaven/engine/table/impl/QueryCompilerRequestProcessor.java
+++ b/engine/table/src/main/java/io/deephaven/engine/table/impl/QueryCompilerRequestProcessor.java
@@ -4,12 +4,11 @@
 package io.deephaven.engine.table.impl;
 
 import io.deephaven.UncheckedDeephavenException;
-import io.deephaven.api.util.NameValidator;
 import io.deephaven.engine.context.ExecutionContext;
 import io.deephaven.engine.context.QueryCompiler;
 import io.deephaven.engine.context.QueryCompilerRequest;
-import io.deephaven.engine.context.QueryScope;
 import io.deephaven.engine.table.impl.perf.QueryPerformanceRecorder;
+import io.deephaven.engine.table.impl.select.codegen.FormulaAnalyzer;
 import io.deephaven.util.MultiException;
 import io.deephaven.util.SafeCloseable;
 import io.deephaven.util.CompletionStageFuture;
@@ -18,43 +17,43 @@
 import org.jetbrains.annotations.VisibleForTesting;
 
 import java.util.ArrayList;
-import java.util.Collections;
 import java.util.List;
-import java.util.Map;
 import java.util.concurrent.ExecutionException;
 import java.util.concurrent.TimeUnit;
 import java.util.concurrent.TimeoutException;
 
-public interface QueryCompilerRequestProcessor {
+public abstract class QueryCompilerRequestProcessor {
 
     /**
      * @return An immediate QueryCompilerRequestProcessor
      */
-    static QueryCompilerRequestProcessor.ImmediateProcessor immediate() {
+    public static QueryCompilerRequestProcessor.ImmediateProcessor immediate() {
         return new ImmediateProcessor();
     }
 
     /**
      * @return A batch QueryCompilerRequestProcessor
      */
-    static QueryCompilerRequestProcessor.BatchProcessor batch() {
+    public static QueryCompilerRequestProcessor.BatchProcessor batch() {
         return new BatchProcessor();
     }
 
     /**
-     * @return a CachingSupplier that supplies a snapshot of the current query scope variables
+     * @return a CachingSupplier that supplies a snapshot of current query scope variables and query library imports
      */
     @VisibleForTesting
-    static CachingSupplier<Map<String, Object>> newQueryScopeVariableSupplier() {
-        final QueryScope queryScope = ExecutionContext.getContext().getQueryScope();
-        return new CachingSupplier<>(() -> Collections.unmodifiableMap(
-                queryScope.toMap((name, value) -> NameValidator.isValidQueryParameterName(name))));
+    public static CachingSupplier<FormulaAnalyzer.Imports> newFormulaImportsSupplier() {
+        return new CachingSupplier<>(FormulaAnalyzer.Imports::new);
     }
 
+    private final CachingSupplier<FormulaAnalyzer.Imports> formulaImportsSupplier = newFormulaImportsSupplier();
+
     /**
-     * @return a lazily cached snapshot of the current query scope variables
+     * @return a lazily cached snapshot of current query scope variables and query library imports
      */
-    Map<String, Object> getQueryScopeVariables();
+    public final FormulaAnalyzer.Imports getFormulaImports() {
+        return formulaImportsSupplier.get();
+    }
 
     /**
      * Submit a request for compilation. The QueryCompilerRequestProcessor is not required to immediately compile this
@@ -62,24 +61,16 @@ static CachingSupplier<Map<String, Object>> newQueryScopeVariableSupplier() {
      *
      * @param request the request to compile
      */
-    CompletionStageFuture<Class<?>> submit(@NotNull QueryCompilerRequest request);
+    public abstract CompletionStageFuture<Class<?>> submit(@NotNull QueryCompilerRequest request);
 
     /**
      * A QueryCompilerRequestProcessor that immediately compiles requests.
      */
-    class ImmediateProcessor implements QueryCompilerRequestProcessor {
-
-        private final CachingSupplier<Map<String, Object>> queryScopeVariableSupplier = newQueryScopeVariableSupplier();
-
+    public static class ImmediateProcessor extends QueryCompilerRequestProcessor {
         private ImmediateProcessor() {
             // force use of static factory method
         }
 
-        @Override
-        public Map<String, Object> getQueryScopeVariables() {
-            return queryScopeVariableSupplier.get();
-        }
-
         @Override
         public CompletionStageFuture<Class<?>> submit(@NotNull final QueryCompilerRequest request) {
             final String desc = "Compile: " + request.description();
@@ -108,20 +99,14 @@ public CompletionStageFuture<Class<?>> submit(@NotNull final QueryCompilerReques
      * <p>
      * The compile method must be called to actually compile the requests.
      */
-    class BatchProcessor implements QueryCompilerRequestProcessor {
+    public static class BatchProcessor extends QueryCompilerRequestProcessor {
         private final List<QueryCompilerRequest> requests = new ArrayList<>();
         private final List<CompletionStageFuture.Resolver<Class<?>>> resolvers = new ArrayList<>();
-        private final CachingSupplier<Map<String, Object>> queryScopeVariableSupplier = newQueryScopeVariableSupplier();
 
         private BatchProcessor() {
             // force use of static factory method
         }
 
-        @Override
-        public Map<String, Object> getQueryScopeVariables() {
-            return queryScopeVariableSupplier.get();
-        }
-
         @Override
         public CompletionStageFuture<Class<?>> submit(@NotNull final QueryCompilerRequest request) {
             final CompletionStageFuture.Resolver<Class<?>> resolver = CompletionStageFuture.make();
diff --git a/engine/table/src/main/java/io/deephaven/engine/table/impl/QueryTable.java b/engine/table/src/main/java/io/deephaven/engine/table/impl/QueryTable.java
index c83672a61fa..acb8e764e29 100644
--- a/engine/table/src/main/java/io/deephaven/engine/table/impl/QueryTable.java
+++ b/engine/table/src/main/java/io/deephaven/engine/table/impl/QueryTable.java
@@ -19,7 +19,6 @@
 import io.deephaven.base.verify.Require;
 import io.deephaven.chunk.attributes.Values;
 import io.deephaven.configuration.Configuration;
-import io.deephaven.datastructures.util.CollectionUtil;
 import io.deephaven.engine.context.ExecutionContext;
 import io.deephaven.engine.exceptions.CancellationException;
 import io.deephaven.engine.exceptions.TableInitializationException;
@@ -44,7 +43,6 @@
 import io.deephaven.engine.table.impl.remote.ConstructSnapshot;
 import io.deephaven.engine.table.impl.select.*;
 import io.deephaven.engine.table.impl.select.analyzers.SelectAndViewAnalyzer;
-import io.deephaven.engine.table.impl.select.analyzers.SelectAndViewAnalyzerWrapper;
 import io.deephaven.engine.table.impl.snapshot.SnapshotIncrementalListener;
 import io.deephaven.engine.table.impl.snapshot.SnapshotInternalListener;
 import io.deephaven.engine.table.impl.snapshot.SnapshotUtils;
@@ -70,6 +68,7 @@
 import io.deephaven.util.annotations.TestUseOnly;
 import io.deephaven.util.annotations.VisibleForTesting;
 import io.deephaven.util.mutable.MutableInt;
+import io.deephaven.util.type.ArrayTypeUtils;
 import io.deephaven.vector.Vector;
 import org.apache.commons.lang3.mutable.Mutable;
 import org.apache.commons.lang3.mutable.MutableObject;
@@ -89,7 +88,6 @@
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
 
-import static io.deephaven.datastructures.util.CollectionUtil.ZERO_LENGTH_STRING_ARRAY;
 import static io.deephaven.engine.table.impl.MatchPair.matchString;
 import static io.deephaven.engine.table.impl.partitioned.PartitionedTableCreatorImpl.CONSTITUENT;
 import static java.lang.Boolean.TRUE;
@@ -253,6 +251,18 @@ public interface MemoizableOperation<T extends DynamicNode & NotificationStepRec
     static boolean FORCE_PARALLEL_SELECT_AND_UPDATE =
             Configuration.getInstance().getBooleanWithDefault("QueryTable.forceParallelSelectAndUpdate", false);
 
+    /**
+     * You can choose to enable or disable the parallel snapshot.
+     */
+    public static boolean ENABLE_PARALLEL_SNAPSHOT =
+            Configuration.getInstance().getBooleanWithDefault("QueryTable.enableParallelSnapshot", true);
+
+    /**
+     * Minimum snapshot "chunk" size for parallel reading of columns, defaults to 1 million.
+     */
+    public static long MINIMUM_PARALLEL_SNAPSHOT_ROWS =
+            Configuration.getInstance().getLongWithDefault("QueryTable.minimumParallelSnapshotRows", 1L << 20);
+
     // Whether we should track the entire RowSet of firstBy and lastBy operations
     @VisibleForTesting
     public static boolean TRACKED_LAST_BY =
@@ -428,6 +438,12 @@ public <DATA_TYPE> CloseableIterator<DATA_TYPE> objectColumnIterator(@NotNull fi
         return new ChunkedObjectColumnIterator<>(getColumnSource(columnName, Object.class), getRowSet());
     }
 
+    @Override
+    public <DATA_TYPE> CloseableIterator<DATA_TYPE> objectColumnIterator(@NotNull final String columnName,
+            @NotNull Class<? extends DATA_TYPE> clazz) {
+        return new ChunkedObjectColumnIterator<>(getColumnSource(columnName, clazz), getRowSet());
+    }
+
     // endregion Column Iterators
 
     /**
@@ -964,6 +980,7 @@ public static class FilteredTable extends QueryTable implements WhereFilter.Reco
         private final QueryTable source;
         private boolean refilterMatchedRequested = false;
         private boolean refilterUnmatchedRequested = false;
+        private WritableRowSet refilterRequestedRowset = null;
         private MergedListener whereListener;
 
         @ReferentialIntegrity
@@ -996,6 +1013,16 @@ public void requestRecomputeMatched() {
             Require.neqNull(whereListener, "whereListener").notifyChanges();
         }
 
+        @Override
+        public void requestRecompute(RowSet rowSet) {
+            if (refilterRequestedRowset == null) {
+                refilterRequestedRowset = rowSet.copy();
+            } else {
+                refilterRequestedRowset.insert(rowSet);
+            }
+            Require.neqNull(whereListener, "whereListener").notifyChanges();
+        }
+
         /**
          * Note that refilterRequested is only accessible so that {@link WhereListener} can get to it and is not part of
          * the public API.
@@ -1004,7 +1031,7 @@ public void requestRecomputeMatched() {
          */
         @InternalUseOnly
         boolean refilterRequested() {
-            return refilterUnmatchedRequested || refilterMatchedRequested;
+            return refilterUnmatchedRequested || refilterMatchedRequested || refilterRequestedRowset != null;
         }
 
         @NotNull
@@ -1055,9 +1082,13 @@ void doRefilter(
                 final WhereListener.ListenerFilterExecution filterExecution =
                         listener.makeRefilterExecution(source.getRowSet().copy());
                 filterExecution.scheduleCompletion(
-                        (adds, mods) -> completeRefilterUpdate(listener, upstream, update, adds),
+                        (matchedRows, unusedMods) -> completeRefilterUpdate(listener, upstream, update, matchedRows),
                         exception -> errorRefilterUpdate(listener, exception, upstream));
                 refilterMatchedRequested = refilterUnmatchedRequested = false;
+                if (refilterRequestedRowset != null) {
+                    refilterRequestedRowset.close();
+                    refilterRequestedRowset = null;
+                }
             } else if (refilterUnmatchedRequested) {
                 // things that are added or removed are already reflected in source.getRowSet
                 final WritableRowSet unmatchedRows = source.getRowSet().minus(getRowSet());
@@ -1065,9 +1096,14 @@ void doRefilter(
                 if (upstream != null) {
                     unmatchedRows.insert(upstream.modified());
                 }
-                final RowSet unmatched = unmatchedRows.copy();
-                final WhereListener.ListenerFilterExecution filterExecution = listener.makeRefilterExecution(unmatched);
-                filterExecution.scheduleCompletion((adds, mods) -> {
+                if (refilterRequestedRowset != null) {
+                    unmatchedRows.insert(refilterRequestedRowset);
+                    refilterRequestedRowset.close();
+                    refilterRequestedRowset = null;
+                }
+                final WhereListener.ListenerFilterExecution filterExecution =
+                        listener.makeRefilterExecution(unmatchedRows);
+                filterExecution.scheduleCompletion((adds, unusedMods) -> {
                     final WritableRowSet newMapping = adds.writableCast();
                     // add back what we previously matched, but for modifications and removals
                     try (final WritableRowSet previouslyMatched = getRowSet().copy()) {
@@ -1088,14 +1124,40 @@ void doRefilter(
                     matchedRows.insert(upstream.added());
                     matchedRows.insert(upstream.modified());
                 }
-                final RowSet matchedClone = matchedRows.copy();
+                if (refilterRequestedRowset != null) {
+                    matchedRows.insert(refilterRequestedRowset);
+                    refilterRequestedRowset.close();
+                    refilterRequestedRowset = null;
+                }
 
                 final WhereListener.ListenerFilterExecution filterExecution =
-                        listener.makeRefilterExecution(matchedClone);
+                        listener.makeRefilterExecution(matchedRows);
                 filterExecution.scheduleCompletion(
-                        (adds, mods) -> completeRefilterUpdate(listener, upstream, update, adds),
+                        (adds, unusedMods) -> completeRefilterUpdate(listener, upstream, update, adds),
                         exception -> errorRefilterUpdate(listener, exception, upstream));
                 refilterMatchedRequested = false;
+            } else if (refilterRequestedRowset != null) {
+                final WritableRowSet rowsToFilter = refilterRequestedRowset;
+                if (upstream != null) {
+                    rowsToFilter.insert(upstream.added());
+                    rowsToFilter.insert(upstream.modified());
+                }
+
+                final WhereListener.ListenerFilterExecution filterExecution =
+                        listener.makeRefilterExecution(rowsToFilter);
+
+                filterExecution.scheduleCompletion((adds, unusedMods) -> {
+                    final WritableRowSet newMapping = adds.writableCast();
+                    // add back what we previously matched, except for modifications and removals
+                    try (final WritableRowSet previouslyMatched = getRowSet().copy()) {
+                        previouslyMatched.remove(rowsToFilter);
+                        newMapping.insert(previouslyMatched);
+                    }
+                    completeRefilterUpdate(listener, upstream, update, adds);
+                }, exception -> errorRefilterUpdate(listener, exception, upstream));
+
+
+                refilterRequestedRowset = null;
             } else {
                 throw new IllegalStateException("Refilter called when a refilter was not requested!");
             }
@@ -1108,22 +1170,21 @@ private void completeRefilterUpdate(
                 final RowSet newMapping) {
             // Compute added/removed in post-shift keyspace.
             update.added = newMapping.minus(getRowSet());
-            final WritableRowSet postShiftRemovals = getRowSet().minus(newMapping);
 
-            // Update our index in post-shift keyspace.
-            getRowSet().writableCast().remove(postShiftRemovals);
-            getRowSet().writableCast().insert(update.added);
+            try (final WritableRowSet postShiftRemovals = getRowSet().minus(newMapping)) {
+                getRowSet().writableCast().resetTo(newMapping);
 
-            // Note that removed must be propagated to listeners in pre-shift keyspace.
-            if (upstream != null) {
-                upstream.shifted().unapply(postShiftRemovals);
+                // Note that removed must be propagated to listeners in pre-shift keyspace.
+                if (upstream != null) {
+                    upstream.shifted().unapply(postShiftRemovals);
+                }
+                update.removed.writableCast().insert(postShiftRemovals);
             }
-            update.removed.writableCast().insert(postShiftRemovals);
 
             if (upstream == null || upstream.modified().isEmpty()) {
                 update.modified = RowSetFactory.empty();
             } else {
-                update.modified = upstream.modified().intersect(newMapping);
+                update.modified = upstream.modified().intersect(getRowSet());
                 update.modified.writableCast().remove(update.added);
             }
 
@@ -1183,7 +1244,7 @@ private void initializeAndPrioritizeFilters(@NotNull final WhereFilter... filter
             if (dataIndexer != null
                     && !(filter instanceof ReindexingFilter)
                     && filter.isSimpleFilter()
-                    && DataIndexer.hasDataIndex(this, filter.getColumns().toArray(ZERO_LENGTH_STRING_ARRAY))) {
+                    && DataIndexer.hasDataIndex(this, filter.getColumns().toArray(String[]::new))) {
                 priorityFilterIndexes.set(fi);
             }
         }
@@ -1487,10 +1548,9 @@ public Table update(final Collection<? extends Selectable> newColumns) {
      */
     public SelectValidationResult validateSelect(final SelectColumn... selectColumns) {
         final SelectColumn[] clones = SelectColumn.copyFrom(selectColumns);
-        SelectAndViewAnalyzerWrapper analyzerWrapper = SelectAndViewAnalyzer.create(
-                this, SelectAndViewAnalyzer.Mode.SELECT_STATIC, columns, rowSet, getModifiedColumnSetForUpdates(), true,
-                false, clones);
-        return new SelectValidationResult(analyzerWrapper.getAnalyzer(), clones);
+        SelectAndViewAnalyzer.AnalyzerContext analyzerContext = SelectAndViewAnalyzer.createContext(
+                this, SelectAndViewAnalyzer.Mode.SELECT_STATIC, true, false, clones);
+        return new SelectValidationResult(analyzerContext.createAnalyzer(), clones);
     }
 
     private Table selectOrUpdate(Flavor flavor, final SelectColumn... selectColumns) {
@@ -1515,18 +1575,16 @@ private Table selectOrUpdate(Flavor flavor, final SelectColumn... selectColumns)
                         }
                     }
                     final boolean publishTheseSources = flavor == Flavor.Update;
-                    final SelectAndViewAnalyzerWrapper analyzerWrapper = SelectAndViewAnalyzer.create(
-                            this, mode, columns, rowSet, getModifiedColumnSetForUpdates(), publishTheseSources, true,
-                            selectColumns);
+                    final SelectAndViewAnalyzer.AnalyzerContext analyzerContext = SelectAndViewAnalyzer.createContext(
+                            this, mode, publishTheseSources, true, selectColumns);
 
-                    final SelectAndViewAnalyzer analyzer = analyzerWrapper.getAnalyzer();
-                    final SelectColumn[] processedColumns = analyzerWrapper.getProcessedColumns()
+                    final SelectAndViewAnalyzer analyzer = analyzerContext.createAnalyzer();
+                    final SelectColumn[] processedColumns = analyzerContext.getProcessedColumns()
                             .toArray(SelectColumn[]::new);
 
                     // Init all the rows by cooking up a fake Update
                     final TableUpdate fakeUpdate = new TableUpdateImpl(
-                            analyzer.alreadyFlattenedSources() ? RowSetFactory.flat(rowSet.size()) : rowSet.copy(),
-                            RowSetFactory.empty(), RowSetFactory.empty(),
+                            rowSet.copy(), RowSetFactory.empty(), RowSetFactory.empty(),
                             RowSetShiftData.EMPTY, ModifiedColumnSet.ALL);
 
                     final CompletableFuture<Void> waitForResult = new CompletableFuture<>();
@@ -1547,8 +1605,10 @@ this, mode, columns, rowSet, getModifiedColumnSetForUpdates(), publishTheseSourc
                                         new SelectAndViewAnalyzer.UpdateHelper(emptyRowSet, fakeUpdate)) {
 
                             try {
-                                analyzer.applyUpdate(fakeUpdate, emptyRowSet, updateHelper, jobScheduler,
-                                        liveResultCapture, analyzer.futureCompletionHandler(waitForResult));
+                                analyzer.applyUpdate(
+                                        fakeUpdate, emptyRowSet, updateHelper, jobScheduler, liveResultCapture,
+                                        () -> waitForResult.complete(null),
+                                        waitForResult::completeExceptionally);
                             } catch (Exception e) {
                                 waitForResult.completeExceptionally(e);
                             }
@@ -1569,14 +1629,15 @@ this, mode, columns, rowSet, getModifiedColumnSetForUpdates(), publishTheseSourc
                             }
                         }
 
-                        final TrackingRowSet resultRowSet =
-                                analyzer.flattenedResult() ? RowSetFactory.flat(rowSet.size()).toTracking() : rowSet;
-                        resultTable = new QueryTable(resultRowSet, analyzerWrapper.getPublishedColumnResources());
+                        final TrackingRowSet resultRowSet = analyzer.flatResult() && !rowSet.isFlat()
+                                ? RowSetFactory.flat(rowSet.size()).toTracking()
+                                : rowSet;
+                        resultTable = new QueryTable(resultRowSet, analyzerContext.getPublishedColumnSources());
                         if (liveResultCapture != null) {
                             analyzer.startTrackingPrev();
-                            final Map<String, String[]> effects = analyzerWrapper.calcEffects();
-                            final SelectOrUpdateListener soul = new SelectOrUpdateListener(updateDescription, this,
-                                    resultTable, effects, analyzer);
+                            final Map<String, String[]> effects = analyzerContext.calcEffects();
+                            final SelectOrUpdateListener soul = new SelectOrUpdateListener(
+                                    updateDescription, this, resultTable, effects, analyzer);
                             liveResultCapture.transferTo(soul);
                             addUpdateListener(soul);
                             ConstituentDependency.install(resultTable, soul);
@@ -1585,11 +1646,6 @@ this, mode, columns, rowSet, getModifiedColumnSetForUpdates(), publishTheseSourc
                                 resultTable.setFlat();
                             }
                             propagateDataIndexes(processedColumns, resultTable);
-                            for (final ColumnSource<?> columnSource : analyzer.getNewColumnSources().values()) {
-                                if (columnSource instanceof PossiblyImmutableColumnSource) {
-                                    ((PossiblyImmutableColumnSource) columnSource).setImmutable();
-                                }
-                            }
                         }
                     }
                     propagateFlatness(resultTable);
@@ -1599,10 +1655,10 @@ this, mode, columns, rowSet, getModifiedColumnSetForUpdates(), publishTheseSourc
                     } else {
                         maybeCopyColumnDescriptions(resultTable);
                     }
-                    SelectAndViewAnalyzerWrapper.UpdateFlavor updateFlavor = flavor == Flavor.Update
-                            ? SelectAndViewAnalyzerWrapper.UpdateFlavor.Update
-                            : SelectAndViewAnalyzerWrapper.UpdateFlavor.Select;
-                    return analyzerWrapper.applyShiftsAndRemainingColumns(this, resultTable, updateFlavor);
+                    SelectAndViewAnalyzer.UpdateFlavor updateFlavor = flavor == Flavor.Update
+                            ? SelectAndViewAnalyzer.UpdateFlavor.Update
+                            : SelectAndViewAnalyzer.UpdateFlavor.Select;
+                    return analyzerContext.applyShiftsAndRemainingColumns(this, resultTable, updateFlavor);
                 }));
     }
 
@@ -1750,15 +1806,16 @@ updateDescription, sizeForInstrumentation(), () -> {
                                     createSnapshotControlIfRefreshing(OperationSnapshotControl::new);
                             initializeWithSnapshot(humanReadablePrefix, sc, (usePrev, beforeClockValue) -> {
                                 final boolean publishTheseSources = flavor == Flavor.UpdateView;
-                                final SelectAndViewAnalyzerWrapper analyzerWrapper = SelectAndViewAnalyzer.create(
-                                        this, SelectAndViewAnalyzer.Mode.VIEW_EAGER, columns, rowSet,
-                                        getModifiedColumnSetForUpdates(), publishTheseSources, true, viewColumns);
-                                final SelectColumn[] processedViewColumns = analyzerWrapper.getProcessedColumns()
+                                final SelectAndViewAnalyzer.AnalyzerContext analyzerContext =
+                                        SelectAndViewAnalyzer.createContext(
+                                                this, SelectAndViewAnalyzer.Mode.VIEW_EAGER,
+                                                publishTheseSources, true, viewColumns);
+                                final SelectColumn[] processedViewColumns = analyzerContext.getProcessedColumns()
                                         .toArray(SelectColumn[]::new);
                                 QueryTable queryTable = new QueryTable(
-                                        rowSet, analyzerWrapper.getPublishedColumnResources());
+                                        rowSet, analyzerContext.getPublishedColumnSources());
                                 if (sc != null) {
-                                    final Map<String, String[]> effects = analyzerWrapper.calcEffects();
+                                    final Map<String, String[]> effects = analyzerContext.calcEffects();
                                     final TableUpdateListener listener =
                                             new ViewOrUpdateViewListener(updateDescription, this, queryTable, effects);
                                     sc.setListenerAndResult(listener, queryTable);
@@ -1775,11 +1832,11 @@ updateDescription, sizeForInstrumentation(), () -> {
                                 } else {
                                     maybeCopyColumnDescriptions(queryTable);
                                 }
-                                final SelectAndViewAnalyzerWrapper.UpdateFlavor updateFlavor =
+                                final SelectAndViewAnalyzer.UpdateFlavor updateFlavor =
                                         flavor == Flavor.UpdateView
-                                                ? SelectAndViewAnalyzerWrapper.UpdateFlavor.UpdateView
-                                                : SelectAndViewAnalyzerWrapper.UpdateFlavor.View;
-                                queryTable = analyzerWrapper.applyShiftsAndRemainingColumns(
+                                                ? SelectAndViewAnalyzer.UpdateFlavor.UpdateView
+                                                : SelectAndViewAnalyzer.UpdateFlavor.View;
+                                queryTable = analyzerContext.applyShiftsAndRemainingColumns(
                                         this, queryTable, updateFlavor);
 
                                 result.setValue(queryTable);
@@ -1840,14 +1897,13 @@ public Table lazyUpdate(final Collection<? extends Selectable> newColumns) {
                     sizeForInstrumentation(), () -> {
                         checkInitiateOperation();
 
-                        final SelectAndViewAnalyzerWrapper analyzerWrapper = SelectAndViewAnalyzer.create(
-                                this, SelectAndViewAnalyzer.Mode.VIEW_LAZY, columns, rowSet,
-                                getModifiedColumnSetForUpdates(),
-                                true, true, selectColumns);
-                        final SelectColumn[] processedColumns = analyzerWrapper.getProcessedColumns()
+                        final SelectAndViewAnalyzer.AnalyzerContext analyzerContext =
+                                SelectAndViewAnalyzer.createContext(
+                                        this, SelectAndViewAnalyzer.Mode.VIEW_LAZY, true, true, selectColumns);
+                        final SelectColumn[] processedColumns = analyzerContext.getProcessedColumns()
                                 .toArray(SelectColumn[]::new);
                         final QueryTable result = new QueryTable(
-                                rowSet, analyzerWrapper.getPublishedColumnResources());
+                                rowSet, analyzerContext.getPublishedColumnSources());
                         if (isRefreshing()) {
                             addUpdateListener(new ListenerImpl(
                                     "lazyUpdate(" + Arrays.deepToString(processedColumns) + ')', this, result));
@@ -1857,8 +1913,8 @@ public Table lazyUpdate(final Collection<? extends Selectable> newColumns) {
                         copySortableColumns(result, processedColumns);
                         maybeCopyColumnDescriptions(result, processedColumns);
 
-                        return analyzerWrapper.applyShiftsAndRemainingColumns(
-                                this, result, SelectAndViewAnalyzerWrapper.UpdateFlavor.LazyUpdate);
+                        return analyzerContext.applyShiftsAndRemainingColumns(
+                                this, result, SelectAndViewAnalyzer.UpdateFlavor.LazyUpdate);
                     });
         }
     }
@@ -2323,7 +2379,7 @@ private Table joinNoMemo(
                     final Table naturalJoinResult = naturalJoinImpl(rightGrouped, columnsToMatch,
                             columnsToAddAfterRename.toArray(MatchPair.ZERO_LENGTH_MATCH_PAIR_ARRAY));
                     final QueryTable ungroupedResult = (QueryTable) naturalJoinResult
-                            .ungroup(columnsToUngroupBy.toArray(ZERO_LENGTH_STRING_ARRAY));
+                            .ungroup(columnsToUngroupBy.toArray(String[]::new));
 
                     maybeCopyColumnDescriptions(ungroupedResult, rightTable, columnsToMatch, realColumnsToAdd);
 
@@ -2390,7 +2446,9 @@ private static long snapshotHistoryInternal(
     private Table snapshotHistory(final String nuggetName, final Table baseTable,
             Collection<? extends JoinAddition> stampColumns) {
         return QueryPerformanceRecorder.withNugget(nuggetName, baseTable.sizeForInstrumentation(),
-                () -> maybeViewForSnapshot(stampColumns).snapshotHistoryInternal(baseTable));
+                () -> ((QueryTable) withAttributes(Map.of(APPEND_ONLY_TABLE_ATTRIBUTE, TRUE)))
+                        .maybeViewForSnapshot(stampColumns)
+                        .snapshotHistoryInternal(baseTable));
     }
 
     private Table snapshotHistoryInternal(final Table baseTable) {
@@ -3429,7 +3487,7 @@ public void propagateFlatness(QueryTable result) {
     public QueryTable getSubTable(@NotNull final TrackingRowSet rowSet) {
         final UpdateGraph updateGraph = getUpdateGraph();
         try (final SafeCloseable ignored = ExecutionContext.getContext().withUpdateGraph(updateGraph).open()) {
-            return getSubTable(rowSet, null, null, CollectionUtil.ZERO_LENGTH_OBJECT_ARRAY);
+            return getSubTable(rowSet, null, null, ArrayTypeUtils.EMPTY_OBJECT_ARRAY);
         }
     }
 
@@ -3783,7 +3841,9 @@ public <R> R apply(@NotNull final Function<Table, R> function) {
     public Table wouldMatch(WouldMatchPair... matchers) {
         final UpdateGraph updateGraph = getUpdateGraph();
         try (final SafeCloseable ignored = ExecutionContext.getContext().withUpdateGraph(updateGraph).open()) {
-            return getResult(new WouldMatchOperation(this, matchers));
+            final WouldMatchOperation operation = new WouldMatchOperation(this, matchers);
+            operation.initializeFilters(this);
+            return getResult(operation);
         }
     }
 
diff --git a/engine/table/src/main/java/io/deephaven/engine/table/impl/SelectOrUpdateListener.java b/engine/table/src/main/java/io/deephaven/engine/table/impl/SelectOrUpdateListener.java
index 285cdeabb94..d7236ce6010 100644
--- a/engine/table/src/main/java/io/deephaven/engine/table/impl/SelectOrUpdateListener.java
+++ b/engine/table/src/main/java/io/deephaven/engine/table/impl/SelectOrUpdateListener.java
@@ -15,8 +15,8 @@
 import io.deephaven.engine.table.impl.util.JobScheduler;
 import io.deephaven.engine.table.impl.util.UpdateGraphJobScheduler;
 
-import java.util.BitSet;
 import java.util.Map;
+import java.util.concurrent.atomic.AtomicBoolean;
 
 /**
  * A Shift-Aware listener for Select or Update. It uses the SelectAndViewAnalyzer to calculate how columns affect other
@@ -29,8 +29,6 @@ class SelectOrUpdateListener extends BaseTable.ListenerImpl {
     private final SelectAndViewAnalyzer analyzer;
 
     private volatile boolean updateInProgress = false;
-    private final BitSet completedColumns = new BitSet();
-    private final BitSet allNewColumns = new BitSet();
     private final boolean enableParallelUpdate;
 
     /**
@@ -61,7 +59,6 @@ class SelectOrUpdateListener extends BaseTable.ListenerImpl {
                         (QueryTable.ENABLE_PARALLEL_SELECT_AND_UPDATE
                                 && getUpdateGraph().parallelismFactor() > 1))
                         && analyzer.allowCrossColumnParallelization();
-        analyzer.setAllNewColumns(allNewColumns);
     }
 
     @Override
@@ -76,7 +73,6 @@ public void onUpdate(final TableUpdate upstream) {
         // - create parallel arrays of pre-shift-keys and post-shift-keys so we can move them in chunks
 
         updateInProgress = true;
-        completedColumns.clear();
         final TableUpdate acquiredUpdate = upstream.acquire();
 
         final WritableRowSet toClear = resultRowSet.copyPrev();
@@ -91,15 +87,16 @@ public void onUpdate(final TableUpdate upstream) {
             jobScheduler = new ImmediateJobScheduler();
         }
 
+        // do not allow a double-notify
+        final AtomicBoolean hasNotified = new AtomicBoolean();
         analyzer.applyUpdate(acquiredUpdate, toClear, updateHelper, jobScheduler, this,
-                new SelectAndViewAnalyzer.SelectLayerCompletionHandler(allNewColumns, completedColumns) {
-                    @Override
-                    public void onAllRequiredColumnsCompleted() {
+                () -> {
+                    if (!hasNotified.getAndSet(true)) {
                         completionRoutine(acquiredUpdate, jobScheduler, toClear, updateHelper);
                     }
-
-                    @Override
-                    protected void onError(Exception error) {
+                },
+                error -> {
+                    if (!hasNotified.getAndSet(true)) {
                         handleException(error);
                     }
                 });
diff --git a/engine/table/src/main/java/io/deephaven/engine/table/impl/ShiftObliviousInstrumentedListenerAdapter.java b/engine/table/src/main/java/io/deephaven/engine/table/impl/ShiftObliviousInstrumentedListenerAdapter.java
index 210af570042..fc94a599b97 100644
--- a/engine/table/src/main/java/io/deephaven/engine/table/impl/ShiftObliviousInstrumentedListenerAdapter.java
+++ b/engine/table/src/main/java/io/deephaven/engine/table/impl/ShiftObliviousInstrumentedListenerAdapter.java
@@ -16,6 +16,7 @@
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
+import javax.annotation.OverridingMethodsMustInvokeSuper;
 import java.io.IOException;
 
 /**
@@ -90,8 +91,10 @@ public boolean canExecute(final long step) {
         return source.satisfied(step);
     }
 
+    @OverridingMethodsMustInvokeSuper
     @Override
     protected void destroy() {
+        super.destroy();
         source.removeUpdateListener(this);
         if (retain) {
             RETENTION_CACHE.forget(this);
diff --git a/engine/table/src/main/java/io/deephaven/engine/table/impl/ShiftedColumnsFactory.java b/engine/table/src/main/java/io/deephaven/engine/table/impl/ShiftedColumnsFactory.java
index 4ab1c70248c..327beb50754 100644
--- a/engine/table/src/main/java/io/deephaven/engine/table/impl/ShiftedColumnsFactory.java
+++ b/engine/table/src/main/java/io/deephaven/engine/table/impl/ShiftedColumnsFactory.java
@@ -26,44 +26,7 @@
 import com.github.javaparser.ast.comments.BlockComment;
 import com.github.javaparser.ast.comments.JavadocComment;
 import com.github.javaparser.ast.comments.LineComment;
-import com.github.javaparser.ast.expr.ArrayAccessExpr;
-import com.github.javaparser.ast.expr.ArrayCreationExpr;
-import com.github.javaparser.ast.expr.ArrayInitializerExpr;
-import com.github.javaparser.ast.expr.AssignExpr;
-import com.github.javaparser.ast.expr.BinaryExpr;
-import com.github.javaparser.ast.expr.BooleanLiteralExpr;
-import com.github.javaparser.ast.expr.CastExpr;
-import com.github.javaparser.ast.expr.CharLiteralExpr;
-import com.github.javaparser.ast.expr.ClassExpr;
-import com.github.javaparser.ast.expr.ConditionalExpr;
-import com.github.javaparser.ast.expr.DoubleLiteralExpr;
-import com.github.javaparser.ast.expr.EnclosedExpr;
-import com.github.javaparser.ast.expr.Expression;
-import com.github.javaparser.ast.expr.FieldAccessExpr;
-import com.github.javaparser.ast.expr.InstanceOfExpr;
-import com.github.javaparser.ast.expr.IntegerLiteralExpr;
-import com.github.javaparser.ast.expr.LambdaExpr;
-import com.github.javaparser.ast.expr.LongLiteralExpr;
-import com.github.javaparser.ast.expr.MarkerAnnotationExpr;
-import com.github.javaparser.ast.expr.MemberValuePair;
-import com.github.javaparser.ast.expr.MethodCallExpr;
-import com.github.javaparser.ast.expr.MethodReferenceExpr;
-import com.github.javaparser.ast.expr.Name;
-import com.github.javaparser.ast.expr.NameExpr;
-import com.github.javaparser.ast.expr.NormalAnnotationExpr;
-import com.github.javaparser.ast.expr.NullLiteralExpr;
-import com.github.javaparser.ast.expr.ObjectCreationExpr;
-import com.github.javaparser.ast.expr.PatternExpr;
-import com.github.javaparser.ast.expr.SimpleName;
-import com.github.javaparser.ast.expr.SingleMemberAnnotationExpr;
-import com.github.javaparser.ast.expr.StringLiteralExpr;
-import com.github.javaparser.ast.expr.SuperExpr;
-import com.github.javaparser.ast.expr.SwitchExpr;
-import com.github.javaparser.ast.expr.TextBlockLiteralExpr;
-import com.github.javaparser.ast.expr.ThisExpr;
-import com.github.javaparser.ast.expr.TypeExpr;
-import com.github.javaparser.ast.expr.UnaryExpr;
-import com.github.javaparser.ast.expr.VariableDeclarationExpr;
+import com.github.javaparser.ast.expr.*;
 import com.github.javaparser.ast.modules.ModuleDeclaration;
 import com.github.javaparser.ast.modules.ModuleExportsDirective;
 import com.github.javaparser.ast.modules.ModuleOpensDirective;
@@ -117,7 +80,7 @@
 import io.deephaven.engine.table.impl.select.FormulaColumn;
 import io.deephaven.engine.table.impl.select.WhereFilter;
 import io.deephaven.engine.table.impl.select.WhereFilterFactory;
-import io.deephaven.engine.table.impl.select.analyzers.SelectAndViewAnalyzerWrapper;
+import io.deephaven.engine.table.impl.select.analyzers.SelectAndViewAnalyzer;
 import io.deephaven.util.mutable.MutableInt;
 import org.jetbrains.annotations.NotNull;
 
@@ -260,7 +223,7 @@ private static Pair<Table, Filter[]> getShiftedTableFilterPair(
     public static Table getShiftedColumnsTable(
             @NotNull final Table source,
             @NotNull FormulaColumn formulaColumn,
-            @NotNull SelectAndViewAnalyzerWrapper.UpdateFlavor updateFlavor) {
+            @NotNull SelectAndViewAnalyzer.UpdateFlavor updateFlavor) {
         String nuggetName = "getShiftedColumnsTable( " + formulaColumn + ", " + updateFlavor + ") ";
         return QueryPerformanceRecorder.withNugget(nuggetName, source.sizeForInstrumentation(), () -> {
             Table tableSoFar = source;
@@ -896,8 +859,13 @@ public void visit(YieldStmt n, ShiftedColumnAttributes arg) {
     }
 
     @Override
-    public void visit(PatternExpr n, ShiftedColumnAttributes arg) {
-        throw new UnsupportedOperationException("PatternExpr Operation not supported");
+    public void visit(TypePatternExpr n, ShiftedColumnAttributes arg) {
+        throw new UnsupportedOperationException("TypePatternExpr Operation not supported");
+    }
+
+    @Override
+    public void visit(RecordPatternExpr n, ShiftedColumnAttributes arg) {
+        throw new UnsupportedOperationException("RecordPatternExpr Operation not supported");
     }
 
     @Override
diff --git a/engine/table/src/main/java/io/deephaven/engine/table/impl/SortHelpers.java b/engine/table/src/main/java/io/deephaven/engine/table/impl/SortHelpers.java
index 76d0c398e2d..dda5cee50a2 100644
--- a/engine/table/src/main/java/io/deephaven/engine/table/impl/SortHelpers.java
+++ b/engine/table/src/main/java/io/deephaven/engine/table/impl/SortHelpers.java
@@ -11,7 +11,6 @@
 import io.deephaven.chunk.attributes.ChunkPositions;
 import io.deephaven.chunk.attributes.Values;
 import io.deephaven.configuration.Configuration;
-import io.deephaven.datastructures.util.CollectionUtil;
 import io.deephaven.engine.primitive.iterator.CloseableIterator;
 import io.deephaven.engine.rowset.RowSequence;
 import io.deephaven.engine.rowset.RowSequenceFactory;
@@ -37,6 +36,7 @@
 import io.deephaven.util.annotations.VisibleForTesting;
 import io.deephaven.util.datastructures.LongSizedDataStructure;
 import io.deephaven.util.mutable.MutableInt;
+import io.deephaven.util.type.ArrayTypeUtils;
 import org.jetbrains.annotations.NotNull;
 
 import java.util.Map;
@@ -215,7 +215,7 @@ public WritableRowRedirection makeHistoricalRowRedirection() {
         }
     }
 
-    static private final SortMapping EMPTY_SORT_MAPPING = new ArraySortMapping(CollectionUtil.ZERO_LENGTH_LONG_ARRAY);
+    static private final SortMapping EMPTY_SORT_MAPPING = new ArraySortMapping(ArrayTypeUtils.EMPTY_LONG_ARRAY);
 
     /**
      * Note that if usePrev is true, then rowSetToSort is the previous RowSet; not the current RowSet, and we should not
@@ -359,6 +359,11 @@ private static SortMapping doSymbolTableMapping(SortingOrder order, ColumnSource
         final ColumnSource<Long> reinterpreted = columnSource.reinterpret(long.class);
         final Table symbolTable = ((SymbolTableSource<?>) columnSource).getStaticSymbolTable(rowSet, true);
 
+        if (symbolTable.isEmpty()) {
+            // All nulls, so we can just return the row set as the sort mapping
+            return new IndexedSortMapping(rowSet.size(), new long[] {rowSet.size()}, new RowSet[] {rowSet});
+        }
+
         if (symbolTable.size() >= sortSize) {
             // the very first thing we will do is sort the symbol table, using a regular sort; if it is larger than the
             // actual table we care to sort, then it is wasteful to use the symbol table sorting
diff --git a/engine/table/src/main/java/io/deephaven/engine/table/impl/SortListener.java b/engine/table/src/main/java/io/deephaven/engine/table/impl/SortListener.java
index a60a4893863..984d3b5eda1 100644
--- a/engine/table/src/main/java/io/deephaven/engine/table/impl/SortListener.java
+++ b/engine/table/src/main/java/io/deephaven/engine/table/impl/SortListener.java
@@ -6,7 +6,6 @@
 import io.deephaven.base.ringbuffer.LongRingBuffer;
 import io.deephaven.base.verify.Assert;
 import io.deephaven.configuration.Configuration;
-import io.deephaven.datastructures.util.CollectionUtil;
 import io.deephaven.engine.rowset.*;
 import io.deephaven.engine.rowset.RowSequenceFactory;
 import io.deephaven.engine.rowset.RowSetFactory;
@@ -24,6 +23,7 @@
 import io.deephaven.util.SafeCloseableList;
 import io.deephaven.util.mutable.MutableInt;
 import gnu.trove.list.array.TLongArrayList;
+import io.deephaven.util.type.ArrayTypeUtils;
 
 import java.util.*;
 import java.util.function.LongUnaryOperator;
@@ -236,7 +236,7 @@ public void onUpdate(final TableUpdate upstream) {
                     null, addedAndModified, false, false).getArrayMapping();
             final long[] addedOutputKeys = new long[addedInputKeys.length];
             final long[] propagatedModOutputKeys = modifiedNeedsSorting ? new long[upstream.modified().intSize()]
-                    : CollectionUtil.ZERO_LENGTH_LONG_ARRAY;
+                    : ArrayTypeUtils.EMPTY_LONG_ARRAY;
 
             final RowSet.SearchIterator ait = resultRowSet.searchIterator();
             for (int ii = 0; ii < addedInputKeys.length; ++ii) {
diff --git a/engine/table/src/main/java/io/deephaven/engine/table/impl/SortOperation.java b/engine/table/src/main/java/io/deephaven/engine/table/impl/SortOperation.java
index 34f65b86f7a..6bb82d86e58 100644
--- a/engine/table/src/main/java/io/deephaven/engine/table/impl/SortOperation.java
+++ b/engine/table/src/main/java/io/deephaven/engine/table/impl/SortOperation.java
@@ -362,7 +362,6 @@ public static LongUnaryOperator getReverseLookup(@NotNull final Table parent, @N
             Assert.neqNull(value, "sort result reverse lookup");
         }
         if (value != null) {
-            Assert.instanceOf(value, "sort result reverse lookup", LongUnaryOperator.class);
             return (LongUnaryOperator) value;
         }
         final RowRedirection sortRedirection = getRowRedirection(sortResult);
diff --git a/engine/table/src/main/java/io/deephaven/engine/table/impl/SourcePartitionedTable.java b/engine/table/src/main/java/io/deephaven/engine/table/impl/SourcePartitionedTable.java
index e772241ca3a..77e0c5ca2c4 100644
--- a/engine/table/src/main/java/io/deephaven/engine/table/impl/SourcePartitionedTable.java
+++ b/engine/table/src/main/java/io/deephaven/engine/table/impl/SourcePartitionedTable.java
@@ -4,6 +4,7 @@
 package io.deephaven.engine.table.impl;
 
 import io.deephaven.base.verify.Assert;
+import io.deephaven.engine.liveness.*;
 import io.deephaven.engine.primitive.iterator.CloseableIterator;
 import io.deephaven.engine.rowset.*;
 import io.deephaven.engine.table.*;
@@ -15,7 +16,9 @@
 import io.deephaven.engine.table.impl.sources.ArrayBackedColumnSource;
 import io.deephaven.engine.table.impl.sources.regioned.RegionedTableComponentFactoryImpl;
 import io.deephaven.engine.table.iterators.ChunkedObjectColumnIterator;
+import io.deephaven.engine.updategraph.NotificationQueue;
 import io.deephaven.engine.updategraph.UpdateCommitter;
+import io.deephaven.engine.updategraph.UpdateGraph;
 import io.deephaven.engine.updategraph.UpdateSourceCombiner;
 import io.deephaven.util.datastructures.linked.IntrusiveDoublyLinkedNode;
 import io.deephaven.util.datastructures.linked.IntrusiveDoublyLinkedQueue;
@@ -73,7 +76,8 @@ public SourcePartitionedTable(
                 false);
     }
 
-    private static final class UnderlyingTableMaintainer {
+    private static final class UnderlyingTableMaintainer extends ReferenceCountedLivenessNode
+            implements NotificationQueue.Dependency {
 
         private final TableDefinition constituentDefinition;
         private final UnaryOperator<Table> applyTablePermissions;
@@ -103,13 +107,14 @@ private UnderlyingTableMaintainer(
                 final boolean refreshLocations,
                 final boolean refreshSizes,
                 @NotNull final Predicate<ImmutableTableLocationKey> locationKeyMatcher) {
+            super(false);
+
             this.constituentDefinition = constituentDefinition;
             this.applyTablePermissions = applyTablePermissions;
             this.tableLocationProvider = tableLocationProvider;
             this.refreshSizes = refreshSizes;
             this.locationKeyMatcher = locationKeyMatcher;
 
-            // noinspection resource
             resultRows = RowSetFactory.empty().toTracking();
             resultTableLocationKeys = ArrayBackedColumnSource.getMemoryColumnSource(TableLocationKey.class, null);
             resultLocationTables = ArrayBackedColumnSource.getMemoryColumnSource(Table.class, null);
@@ -123,13 +128,19 @@ private UnderlyingTableMaintainer(
             if (needToRefreshLocations || refreshSizes) {
                 result.setRefreshing(true);
                 refreshCombiner = new UpdateSourceCombiner(result.getUpdateGraph());
-                result.addParentReference(refreshCombiner);
+                result.addParentReference(this);
+                manage(refreshCombiner);
             } else {
                 refreshCombiner = null;
             }
 
             if (needToRefreshLocations) {
+                resultTableLocationKeys.startTrackingPrevValues();
+                resultLocationTables.startTrackingPrevValues();
+
                 subscriptionBuffer = new TableLocationSubscriptionBuffer(tableLocationProvider);
+                manage(subscriptionBuffer);
+
                 pendingLocationStates = new IntrusiveDoublyLinkedQueue<>(
                         IntrusiveDoublyLinkedNode.Adapter.<PendingLocationState>getInstance());
                 readyLocationStates = new IntrusiveDoublyLinkedQueue<>(
@@ -143,7 +154,6 @@ protected void instrumentedRefresh() {
                         processPendingLocations(true);
                     }
                 };
-                result.addParentReference(processNewLocationsUpdateRoot);
                 refreshCombiner.addSource(processNewLocationsUpdateRoot);
 
                 this.removedLocationsComitter = new UpdateCommitter<>(
@@ -154,7 +164,6 @@ protected void instrumentedRefresh() {
                             removedConstituents.forEach(result::unmanage);
                             removedConstituents = null;
                         });
-
                 processPendingLocations(false);
             } else {
                 subscriptionBuffer = null;
@@ -163,10 +172,22 @@ protected void instrumentedRefresh() {
                 processNewLocationsUpdateRoot = null;
                 removedLocationsComitter = null;
                 tableLocationProvider.refresh();
-                try (final RowSet added = sortAndAddLocations(tableLocationProvider.getTableLocationKeys().stream()
-                        .filter(locationKeyMatcher)
-                        .map(tableLocationProvider::getTableLocation))) {
-                    resultRows.insert(added);
+
+                final Collection<TableLocation> locations = new ArrayList<>();
+                try {
+                    retainReference();
+                    tableLocationProvider.getTableLocationKeys(
+                            (final LiveSupplier<ImmutableTableLocationKey> lstlk) -> {
+                                final TableLocation tableLocation = tableLocationProvider.getTableLocation(lstlk.get());
+                                manage(tableLocation);
+                                locations.add(tableLocation);
+                            },
+                            locationKeyMatcher);
+                    try (final RowSet added = sortAndAddLocations(locations.stream())) {
+                        resultRows.insert(added);
+                    }
+                } finally {
+                    dropReference();
                 }
             }
 
@@ -192,7 +213,9 @@ private RowSet sortAndAddLocations(@NotNull final Stream<TableLocation> location
                 resultLocationTables.ensureCapacity(constituentRowKey + 1);
                 resultLocationTables.set(constituentRowKey, constituentTable);
 
-                result.manage(constituentTable);
+                if (result.isRefreshing()) {
+                    result.manage(constituentTable);
+                }
             });
             return initialLastRowKey == lastInsertedRowKey.get()
                     ? RowSetFactory.empty()
@@ -204,18 +227,30 @@ private Table makeConstituentTable(@NotNull final TableLocation tableLocation) {
                     constituentDefinition,
                     "SingleLocationSourceTable-" + tableLocation,
                     RegionedTableComponentFactoryImpl.INSTANCE,
-                    new SingleTableLocationProvider(tableLocation),
+                    new SingleTableLocationProvider(tableLocation, refreshSizes
+                            ? tableLocationProvider.getLocationUpdateMode()
+                            : TableUpdateMode.STATIC),
                     refreshSizes ? refreshCombiner : null);
 
+            // Transfer management to the constituent CSM. NOTE: this is likely to end up double-managed
+            // after the CSM adds the location to the table, but that's acceptable.
+            constituent.columnSourceManager.manage(tableLocation);
+            unmanage(tableLocation);
+
             // Be careful to propagate the systemic attribute properly to child tables
             constituent.setAttribute(Table.SYSTEMIC_TABLE_ATTRIBUTE, result.isSystemicObject());
             return applyTablePermissions.apply(constituent);
         }
 
         private void processPendingLocations(final boolean notifyListeners) {
-            final TableLocationSubscriptionBuffer.LocationUpdate locationUpdate = subscriptionBuffer.processPending();
-            final RowSet removed = processRemovals(locationUpdate);
-            final RowSet added = processAdditions(locationUpdate);
+            final RowSet removed;
+            final RowSet added;
+
+            try (final TableLocationSubscriptionBuffer.LocationUpdate locationUpdate =
+                    subscriptionBuffer.processPending()) {
+                removed = processRemovals(locationUpdate);
+                added = processAdditions(locationUpdate);
+            }
 
             resultRows.update(added, removed);
             if (notifyListeners) {
@@ -242,8 +277,10 @@ private RowSet processAdditions(final TableLocationSubscriptionBuffer.LocationUp
              */
             // TODO (https://github.com/deephaven/deephaven-core/issues/867): Refactor around a ticking partition table
             locationUpdate.getPendingAddedLocationKeys().stream()
+                    .map(LiveSupplier::get)
                     .filter(locationKeyMatcher)
                     .map(tableLocationProvider::getTableLocation)
+                    .peek(this::manage)
                     .map(PendingLocationState::new)
                     .forEach(pendingLocationStates::offer);
             for (final Iterator<PendingLocationState> iter = pendingLocationStates.iterator(); iter.hasNext();) {
@@ -263,6 +300,7 @@ private RowSet processRemovals(final TableLocationSubscriptionBuffer.LocationUpd
             final Set<ImmutableTableLocationKey> relevantRemovedLocations =
                     locationUpdate.getPendingRemovedLocationKeys()
                             .stream()
+                            .map(LiveSupplier::get)
                             .filter(locationKeyMatcher)
                             .collect(Collectors.toSet());
 
@@ -270,6 +308,16 @@ private RowSet processRemovals(final TableLocationSubscriptionBuffer.LocationUpd
                 return RowSetFactory.empty();
             }
 
+            // Iterate through the pending locations and remove any that are in the removed set.
+            for (final Iterator<PendingLocationState> iter = pendingLocationStates.iterator(); iter.hasNext();) {
+                final PendingLocationState pendingLocationState = iter.next();
+                if (relevantRemovedLocations.contains(pendingLocationState.location.getKey())) {
+                    iter.remove();
+                    // Release the state and unmanage the location
+                    unmanage(pendingLocationState.release());
+                }
+            }
+
             // At the end of the cycle we need to make sure we unmanage any removed constituents.
             this.removedConstituents = new ArrayList<>(relevantRemovedLocations.size());
             final RowSetBuilderSequential deleteBuilder = RowSetFactory.builderSequential();
@@ -306,6 +354,22 @@ private RowSet processRemovals(final TableLocationSubscriptionBuffer.LocationUpd
             resultLocationTables.setNull(deletedRows);
             return deletedRows;
         }
+
+        @Override
+        public boolean satisfied(final long step) {
+            if (refreshCombiner == null) {
+                throw new UnsupportedOperationException("This method should not be called when result is static");
+            }
+            return refreshCombiner.satisfied(step);
+        }
+
+        @Override
+        public UpdateGraph getUpdateGraph() {
+            if (refreshCombiner == null) {
+                throw new UnsupportedOperationException("This method should not be called when result is static");
+            }
+            return refreshCombiner.getUpdateGraph();
+        }
     }
 
     private static final class PendingLocationState extends IntrusiveDoublyLinkedNode.Impl<PendingLocationState> {
diff --git a/engine/table/src/main/java/io/deephaven/engine/table/impl/SourceTable.java b/engine/table/src/main/java/io/deephaven/engine/table/impl/SourceTable.java
index e3508fc45c7..88dd71fc12f 100644
--- a/engine/table/src/main/java/io/deephaven/engine/table/impl/SourceTable.java
+++ b/engine/table/src/main/java/io/deephaven/engine/table/impl/SourceTable.java
@@ -5,10 +5,12 @@
 
 import io.deephaven.base.verify.Assert;
 import io.deephaven.base.verify.Require;
+import io.deephaven.engine.liveness.LiveSupplier;
+import io.deephaven.engine.liveness.LivenessReferent;
 import io.deephaven.engine.liveness.LivenessScopeStack;
 import io.deephaven.engine.rowset.TrackingWritableRowSet;
-import io.deephaven.engine.table.Table;
 import io.deephaven.engine.table.TableDefinition;
+import io.deephaven.engine.table.TableUpdate;
 import io.deephaven.engine.table.TableUpdateListener;
 import io.deephaven.engine.table.impl.locations.ImmutableTableLocationKey;
 import io.deephaven.engine.table.impl.locations.TableDataException;
@@ -17,14 +19,14 @@
 import io.deephaven.engine.updategraph.UpdateSourceRegistrar;
 import io.deephaven.engine.table.impl.perf.QueryPerformanceRecorder;
 import io.deephaven.engine.table.impl.locations.impl.TableLocationSubscriptionBuffer;
-import io.deephaven.engine.rowset.RowSet;
-import io.deephaven.engine.rowset.RowSetFactory;
 import io.deephaven.util.SafeCloseable;
 import io.deephaven.util.annotations.TestUseOnly;
 import org.apache.commons.lang3.mutable.Mutable;
 import org.apache.commons.lang3.mutable.MutableObject;
 import org.jetbrains.annotations.NotNull;
 
+import javax.annotation.OverridingMethodsMustInvokeSuper;
+import java.util.ArrayList;
 import java.util.Collection;
 
 /**
@@ -70,7 +72,7 @@ public abstract class SourceTable<IMPL_TYPE extends SourceTable<IMPL_TYPE>> exte
     /**
      * The update source object for refreshing locations and location sizes.
      */
-    private Runnable locationChangePoller;
+    private LocationChangePoller locationChangePoller;
 
     /**
      * Construct a new disk-backed table.
@@ -106,7 +108,10 @@ public abstract class SourceTable<IMPL_TYPE extends SourceTable<IMPL_TYPE>> exte
         }
 
         setRefreshing(isRefreshing);
-        setAttribute(Table.ADD_ONLY_TABLE_ATTRIBUTE, Boolean.TRUE);
+        // Given the location provider's update modes, retrieve and set applicable table attributes from the CSM
+        columnSourceManager.getTableAttributes(
+                locationProvider.getUpdateMode(),
+                locationProvider.getLocationUpdateMode()).forEach(this::setAttribute);
     }
 
     /**
@@ -144,39 +149,51 @@ private void initializeAvailableLocations() {
                 if (isRefreshing()) {
                     final TableLocationSubscriptionBuffer locationBuffer =
                             new TableLocationSubscriptionBuffer(locationProvider);
-                    final TableLocationSubscriptionBuffer.LocationUpdate locationUpdate =
-                            locationBuffer.processPending();
-
-                    maybeRemoveLocations(locationUpdate.getPendingRemovedLocationKeys());
-                    maybeAddLocations(locationUpdate.getPendingAddedLocationKeys());
+                    manage(locationBuffer);
+                    try (final TableLocationSubscriptionBuffer.LocationUpdate locationUpdate =
+                            locationBuffer.processPending()) {
+                        maybeRemoveLocations(locationUpdate.getPendingRemovedLocationKeys());
+                        maybeAddLocations(locationUpdate.getPendingAddedLocationKeys());
+                    }
                     updateSourceRegistrar.addSource(locationChangePoller = new LocationChangePoller(locationBuffer));
                 } else {
                     locationProvider.refresh();
-                    maybeAddLocations(locationProvider.getTableLocationKeys());
+                    final Collection<LiveSupplier<ImmutableTableLocationKey>> keySuppliers = new ArrayList<>();
+                    try {
+                        locationProvider.getTableLocationKeys(ttlk -> {
+                            // Retain each of the location key suppliers as we see them (since the TLP is not guaranteed
+                            // to retain them outside the callback).
+                            ttlk.retainReference();
+                            keySuppliers.add(ttlk);
+                        });
+                        maybeAddLocations(keySuppliers);
+                    } finally {
+                        // Now we can drop the location key supplier references.
+                        keySuppliers.forEach(LivenessReferent::dropReference);
+                    }
                 }
             });
             locationsInitialized = true;
         }
     }
 
-    private void maybeAddLocations(@NotNull final Collection<ImmutableTableLocationKey> locationKeys) {
+    private void maybeAddLocations(@NotNull final Collection<LiveSupplier<ImmutableTableLocationKey>> locationKeys) {
         if (locationKeys.isEmpty()) {
             return;
         }
         filterLocationKeys(locationKeys)
                 .parallelStream()
-                .forEach(lk -> columnSourceManager.addLocation(locationProvider.getTableLocation(lk)));
+                .forEach(lk -> columnSourceManager.addLocation(locationProvider.getTableLocation(lk.get())));
     }
 
-    private ImmutableTableLocationKey[] maybeRemoveLocations(
-            @NotNull final Collection<ImmutableTableLocationKey> removedKeys) {
+    private void maybeRemoveLocations(@NotNull final Collection<LiveSupplier<ImmutableTableLocationKey>> removedKeys) {
         if (removedKeys.isEmpty()) {
-            return ImmutableTableLocationKey.ZERO_LENGTH_IMMUTABLE_TABLE_LOCATION_KEY_ARRAY;
+            return;
         }
 
-        return filterLocationKeys(removedKeys).stream()
-                .filter(columnSourceManager::removeLocationKey)
-                .toArray(ImmutableTableLocationKey[]::new);
+        filterLocationKeys(removedKeys).stream()
+                .map(LiveSupplier::get)
+                .forEach(columnSourceManager::removeLocationKey);
     }
 
     private void initializeLocationSizes() {
@@ -216,14 +233,19 @@ private LocationChangePoller(@NotNull final TableLocationSubscriptionBuffer loca
 
         @Override
         protected void instrumentedRefresh() {
-            final TableLocationSubscriptionBuffer.LocationUpdate locationUpdate = locationBuffer.processPending();
-            final ImmutableTableLocationKey[] removedKeys =
-                    maybeRemoveLocations(locationUpdate.getPendingRemovedLocationKeys());
-            if (removedKeys.length > 0) {
-                throw new TableLocationRemovedException("Source table does not support removed locations",
-                        removedKeys);
+            try (final TableLocationSubscriptionBuffer.LocationUpdate locationUpdate =
+                    locationBuffer.processPending()) {
+                if (!locationProvider.getUpdateMode().removeAllowed()
+                        && !locationUpdate.getPendingRemovedLocationKeys().isEmpty()) {
+                    // This TLP doesn't support removed locations, we need to throw an exception.
+                    final ImmutableTableLocationKey[] keys = locationUpdate.getPendingRemovedLocationKeys().stream()
+                            .map(LiveSupplier::get).toArray(ImmutableTableLocationKey[]::new);
+                    throw new TableLocationRemovedException("Source table does not support removed locations", keys);
+                }
+
+                maybeRemoveLocations(locationUpdate.getPendingRemovedLocationKeys());
+                maybeAddLocations(locationUpdate.getPendingAddedLocationKeys());
             }
-            maybeAddLocations(locationUpdate.getPendingAddedLocationKeys());
 
             // This class previously had functionality to notify "location listeners", but it was never used.
             // Resurrect from git history if needed.
@@ -232,13 +254,16 @@ protected void instrumentedRefresh() {
                 return;
             }
 
-            final RowSet added = columnSourceManager.refresh();
-            if (added.isEmpty()) {
+            final TableUpdate update = columnSourceManager.refresh();
+            if (update.empty()) {
+                update.release();
                 return;
             }
 
-            rowSet.insert(added);
-            notifyListeners(added, RowSetFactory.empty(), RowSetFactory.empty());
+            Assert.assertion(update.shifted().empty(), "update.shifted().empty()");
+            rowSet.remove(update.removed());
+            rowSet.insert(update.added());
+            notifyListeners(update);
         }
 
         @Override
@@ -257,8 +282,8 @@ protected void onRefreshError(@NotNull final Exception error) {
      *        {@link TableLocationProvider}, but not yet incorporated into the table
      * @return A sub-collection of the input
      */
-    protected Collection<ImmutableTableLocationKey> filterLocationKeys(
-            @NotNull final Collection<ImmutableTableLocationKey> foundLocationKeys) {
+    protected Collection<LiveSupplier<ImmutableTableLocationKey>> filterLocationKeys(
+            @NotNull final Collection<LiveSupplier<ImmutableTableLocationKey>> foundLocationKeys) {
         return foundLocationKeys;
     }
 
@@ -286,9 +311,11 @@ public boolean subscribeForUpdates(@NotNull final TableUpdateListener listener)
             }
 
             if (snapshotControl != null) {
+                // noinspection MethodDoesntCallSuperMethod
                 final ListenerImpl listener =
                         new ListenerImpl("SourceTable.coalesce", this, resultTable) {
 
+                            @OverridingMethodsMustInvokeSuper
                             @Override
                             protected void destroy() {
                                 // This impl cannot call super.destroy() because we must unsubscribe from the actual
@@ -306,12 +333,16 @@ protected void destroy() {
         return result.getValue();
     }
 
+    @OverridingMethodsMustInvokeSuper
     @Override
     protected void destroy() {
         super.destroy();
         if (updateSourceRegistrar != null) {
             if (locationChangePoller != null) {
                 updateSourceRegistrar.removeSource(locationChangePoller);
+                // NB: we do not want to null out any locationChangePoller.locationBuffer here, as they may still be in
+                // use by a notification delivery running currently with this destroy.
+                locationChangePoller.locationBuffer.reset();
             }
         }
     }
diff --git a/engine/table/src/main/java/io/deephaven/engine/table/impl/SparseSelect.java b/engine/table/src/main/java/io/deephaven/engine/table/impl/SparseSelect.java
index af1b4838c68..fc0d3c50db1 100644
--- a/engine/table/src/main/java/io/deephaven/engine/table/impl/SparseSelect.java
+++ b/engine/table/src/main/java/io/deephaven/engine/table/impl/SparseSelect.java
@@ -4,7 +4,6 @@
 package io.deephaven.engine.table.impl;
 
 import io.deephaven.configuration.Configuration;
-import io.deephaven.datastructures.util.CollectionUtil;
 import io.deephaven.chunk.attributes.Values;
 import io.deephaven.chunk.Chunk;
 import io.deephaven.chunk.WritableChunk;
@@ -19,6 +18,7 @@
 import io.deephaven.util.SafeCloseableArray;
 import io.deephaven.util.SafeCloseablePair;
 import io.deephaven.util.thread.NamingThreadFactory;
+import io.deephaven.util.type.ArrayTypeUtils;
 
 import java.util.*;
 import java.util.concurrent.ExecutionException;
@@ -84,7 +84,7 @@ public static Table sparseSelect(Table source) {
      * @return a copy of the source table with materialized column
      */
     public static Table sparseSelect(Table source, String... columnNames) {
-        return sparseSelect((QueryTable) source.coalesce(), CollectionUtil.ZERO_LENGTH_STRING_ARRAY, columnNames);
+        return sparseSelect((QueryTable) source.coalesce(), ArrayTypeUtils.EMPTY_STRING_ARRAY, columnNames);
     }
 
     /**
@@ -96,8 +96,8 @@ public static Table sparseSelect(Table source, String... columnNames) {
      * @return a copy of the source table with materialized column
      */
     public static Table sparseSelect(Table source, Collection<String> columnNames) {
-        return sparseSelect((QueryTable) source.coalesce(), CollectionUtil.ZERO_LENGTH_STRING_ARRAY,
-                columnNames.toArray(CollectionUtil.ZERO_LENGTH_STRING_ARRAY));
+        return sparseSelect((QueryTable) source.coalesce(), ArrayTypeUtils.EMPTY_STRING_ARRAY,
+                columnNames.toArray(String[]::new));
     }
 
     /**
@@ -111,7 +111,7 @@ public static Table sparseSelect(Table source, Collection<String> columnNames) {
      * @return a copy of the source table with materialized columns
      */
     public static Table partialSparseSelect(Table source, Collection<String> columnNames) {
-        return partialSparseSelect(source, columnNames.toArray(CollectionUtil.ZERO_LENGTH_STRING_ARRAY));
+        return partialSparseSelect(source, columnNames.toArray(String[]::new));
     }
 
     /**
diff --git a/engine/table/src/main/java/io/deephaven/engine/table/impl/TableAdapter.java b/engine/table/src/main/java/io/deephaven/engine/table/impl/TableAdapter.java
index 770e5987cb2..171defa9953 100644
--- a/engine/table/src/main/java/io/deephaven/engine/table/impl/TableAdapter.java
+++ b/engine/table/src/main/java/io/deephaven/engine/table/impl/TableAdapter.java
@@ -206,6 +206,12 @@ default <DATA_TYPE> CloseableIterator<DATA_TYPE> objectColumnIterator(@NotNull S
         return throwUnsupported();
     }
 
+    @Override
+    default <DATA_TYPE> CloseableIterator<DATA_TYPE> objectColumnIterator(@NotNull String columnName,
+            @NotNull Class<? extends DATA_TYPE> clazz) {
+        return throwUnsupported();
+    }
+
     @Override
     default Table wouldMatch(WouldMatchPair... matchers) {
         return throwUnsupported();
diff --git a/engine/table/src/main/java/io/deephaven/engine/table/impl/TableCreatorImpl.java b/engine/table/src/main/java/io/deephaven/engine/table/impl/TableCreatorImpl.java
index 8753d531ae4..c1713ba7ff8 100644
--- a/engine/table/src/main/java/io/deephaven/engine/table/impl/TableCreatorImpl.java
+++ b/engine/table/src/main/java/io/deephaven/engine/table/impl/TableCreatorImpl.java
@@ -5,6 +5,8 @@
 
 import com.google.auto.service.AutoService;
 import io.deephaven.engine.context.ExecutionContext;
+import io.deephaven.engine.table.MultiJoinFactory;
+import io.deephaven.engine.table.MultiJoinInput;
 import io.deephaven.engine.table.Table;
 import io.deephaven.engine.table.TableDefinition;
 import io.deephaven.engine.table.TableFactory;
@@ -13,6 +15,8 @@
 import io.deephaven.engine.util.TableTools;
 import io.deephaven.qst.TableCreator;
 import io.deephaven.qst.table.BlinkInputTable;
+import io.deephaven.qst.table.Clock;
+import io.deephaven.qst.table.ClockSystem;
 import io.deephaven.qst.table.EmptyTable;
 import io.deephaven.qst.table.InMemoryAppendOnlyInputTable;
 import io.deephaven.qst.table.InMemoryKeyBackedInputTable;
@@ -22,12 +26,11 @@
 import io.deephaven.qst.table.TableSchema;
 import io.deephaven.qst.table.TableSpec;
 import io.deephaven.qst.table.TicketTable;
-import io.deephaven.qst.table.Clock;
-import io.deephaven.qst.table.ClockSystem;
 import io.deephaven.qst.table.TimeTable;
 import io.deephaven.stream.TablePublisher;
 
 import java.util.Arrays;
+import java.util.List;
 import java.util.concurrent.atomic.AtomicInteger;
 import java.util.stream.Stream;
 import java.util.stream.StreamSupport;
@@ -85,6 +88,15 @@ public final Table of(InputTable inputTable) {
         return InputTableAdapter.of(inputTable);
     }
 
+    @Override
+    public final Table multiJoin(List<io.deephaven.qst.table.MultiJoinInput<Table>> multiJoinInputs) {
+        return MultiJoinFactory.of(multiJoinInputs.stream().map(TableCreatorImpl::adapt).toArray(MultiJoinInput[]::new))
+                .table();
+    }
+
+    private static MultiJoinInput adapt(io.deephaven.qst.table.MultiJoinInput<Table> input) {
+        return MultiJoinInput.of(input.table(), input.matches(), input.additions());
+    }
 
     @Override
     public final Table merge(Iterable<Table> tables) {
diff --git a/engine/table/src/main/java/io/deephaven/engine/table/impl/TableDefaults.java b/engine/table/src/main/java/io/deephaven/engine/table/impl/TableDefaults.java
index 7ea30ae8394..d815bc5bd22 100644
--- a/engine/table/src/main/java/io/deephaven/engine/table/impl/TableDefaults.java
+++ b/engine/table/src/main/java/io/deephaven/engine/table/impl/TableDefaults.java
@@ -9,7 +9,6 @@
 import io.deephaven.api.agg.spec.AggSpec;
 import io.deephaven.api.snapshot.SnapshotWhenOptions;
 import io.deephaven.api.snapshot.SnapshotWhenOptions.Flag;
-import io.deephaven.datastructures.util.CollectionUtil;
 import io.deephaven.engine.table.*;
 import io.deephaven.engine.table.hierarchical.RollupTable;
 import io.deephaven.engine.table.impl.select.SelectColumn;
@@ -18,6 +17,7 @@
 import io.deephaven.api.util.ConcurrentMethod;
 import io.deephaven.engine.util.ColumnFormatting;
 import io.deephaven.engine.liveness.LivenessScopeStack;
+import io.deephaven.engine.util.TableTools;
 import io.deephaven.util.annotations.FinalDefault;
 
 import javax.annotation.Nullable;
@@ -48,27 +48,7 @@ default Table coalesce() {
     @ConcurrentMethod
     @FinalDefault
     default Table meta() {
-        List<String> columnNames = new ArrayList<>();
-        List<String> columnDataTypes = new ArrayList<>();
-        List<String> columnTypes = new ArrayList<>();
-        List<Boolean> columnPartitioning = new ArrayList<>();
-        for (ColumnDefinition<?> cDef : getDefinition().getColumns()) {
-            columnNames.add(cDef.getName());
-            final Class<?> dataType = cDef.getDataType();
-            final String dataTypeName = dataType.getCanonicalName();
-            columnDataTypes.add(dataTypeName == null ? dataType.getName() : dataTypeName);
-            columnTypes.add(cDef.getColumnType().name());
-            columnPartitioning.add(cDef.isPartitioning());
-        }
-        final String[] resultColumnNames = {"Name", "DataType", "ColumnType", "IsPartitioning"};
-        final Object[] resultValues = {
-                columnNames.toArray(CollectionUtil.ZERO_LENGTH_STRING_ARRAY),
-                columnDataTypes.toArray(CollectionUtil.ZERO_LENGTH_STRING_ARRAY),
-                columnTypes.toArray(CollectionUtil.ZERO_LENGTH_STRING_ARRAY),
-                columnPartitioning.toArray(new Boolean[0]),
-        };
-
-        return new InMemoryTable(resultColumnNames, resultValues);
+        return TableTools.metaTable(getDefinition());
     }
 
     @Override
@@ -119,7 +99,7 @@ default <T> ColumnSource<T> getColumnSource(String sourceName, Class<? extends T
         @SuppressWarnings("rawtypes")
         ColumnSource rawColumnSource = getColumnSource(sourceName);
         // noinspection unchecked
-        return rawColumnSource.cast(clazz);
+        return rawColumnSource.cast(clazz, sourceName);
     }
 
     @Override
@@ -129,7 +109,7 @@ default <T> ColumnSource<T> getColumnSource(String sourceName, Class<? extends T
         @SuppressWarnings("rawtypes")
         ColumnSource rawColumnSource = getColumnSource(sourceName);
         // noinspection unchecked
-        return rawColumnSource.cast(clazz, componentType);
+        return rawColumnSource.cast(clazz, componentType, sourceName);
     }
 
     // -----------------------------------------------------------------------------------------------------------------
@@ -265,13 +245,13 @@ default Table join(Table rightTable, Collection<? extends JoinMatch> columnsToMa
     @Override
     @FinalDefault
     default Table headBy(long nRows, Collection<String> groupByColumnNames) {
-        return headBy(nRows, groupByColumnNames.toArray(CollectionUtil.ZERO_LENGTH_STRING_ARRAY));
+        return headBy(nRows, groupByColumnNames.toArray(String[]::new));
     }
 
     @Override
     @FinalDefault
     default Table tailBy(long nRows, Collection<String> groupByColumnNames) {
-        return tailBy(nRows, groupByColumnNames.toArray(CollectionUtil.ZERO_LENGTH_STRING_ARRAY));
+        return tailBy(nRows, groupByColumnNames.toArray(String[]::new));
     }
 
     @Override
diff --git a/engine/table/src/main/java/io/deephaven/engine/table/impl/TableUpdateMode.java b/engine/table/src/main/java/io/deephaven/engine/table/impl/TableUpdateMode.java
new file mode 100644
index 00000000000..45de9453e69
--- /dev/null
+++ b/engine/table/src/main/java/io/deephaven/engine/table/impl/TableUpdateMode.java
@@ -0,0 +1,80 @@
+//
+// Copyright (c) 2016-2024 Deephaven Data Labs and Patent Pending
+//
+package io.deephaven.engine.table.impl;
+
+import org.apache.commons.lang3.mutable.MutableBoolean;
+
+import java.util.stream.Stream;
+
+/**
+ * Records the guarantees that the table offers regarding addition and removal of data elements. This can apply to
+ * {@link SourceTable source table} location additions and removals or row additions and removals within a location.
+ */
+public enum TableUpdateMode {
+    STATIC, APPEND_ONLY, ADD_ONLY, ADD_REMOVE;
+
+    /**
+     * Returns true if addition is allowed.
+     */
+    public boolean addAllowed() {
+        switch (this) {
+            case APPEND_ONLY:
+            case ADD_ONLY:
+            case ADD_REMOVE:
+                return true;
+
+            default:
+                return false;
+        }
+    }
+
+    /**
+     * Returns true if removal is allowed.
+     */
+    public boolean removeAllowed() {
+        switch (this) {
+            case ADD_REMOVE:
+                return true;
+
+            default:
+                return false;
+        }
+    }
+
+    /**
+     * Returns the most permissive mode from the given stream of modes. Permissiveness is ranked as follows (from most
+     * to least permissive):
+     * <ul>
+     * <li>{@link #ADD_REMOVE}</li>
+     * <li>{@link #ADD_ONLY}</li>
+     * <li>{@link #APPEND_ONLY}</li>
+     * <li>{@link #STATIC}</li>
+     * </ul>
+     *
+     * @param modes a stream of modes
+     * @return the most permissive mode encountered in the stream
+     */
+    public static TableUpdateMode mostPermissiveMode(Stream<TableUpdateMode> modes) {
+        final MutableBoolean anyRemoves = new MutableBoolean(false);
+        final MutableBoolean anyAdditions = new MutableBoolean(false);
+        final MutableBoolean anyAppends = new MutableBoolean(false);
+
+        modes.forEach(mode -> {
+            if (mode.removeAllowed()) {
+                anyRemoves.setTrue();
+            } else if (mode == TableUpdateMode.ADD_ONLY) {
+                anyAdditions.setTrue();
+            } else if (mode == TableUpdateMode.APPEND_ONLY) {
+                anyAppends.setTrue();
+            }
+        });
+        // @formatter:off
+        return
+              anyRemoves.booleanValue()   ? TableUpdateMode.ADD_REMOVE
+            : anyAdditions.booleanValue() ? TableUpdateMode.ADD_ONLY
+            : anyAppends.booleanValue()   ? TableUpdateMode.APPEND_ONLY
+            : TableUpdateMode.STATIC;
+        // @formatter:on
+    }
+}
diff --git a/engine/table/src/main/java/io/deephaven/engine/table/impl/TableUpdateValidator.java b/engine/table/src/main/java/io/deephaven/engine/table/impl/TableUpdateValidator.java
index c09fa9ce61d..b4f9b7e817b 100644
--- a/engine/table/src/main/java/io/deephaven/engine/table/impl/TableUpdateValidator.java
+++ b/engine/table/src/main/java/io/deephaven/engine/table/impl/TableUpdateValidator.java
@@ -10,14 +10,14 @@
 import io.deephaven.chunk.attributes.Values;
 import io.deephaven.chunk.util.hashing.ChunkEquals;
 import io.deephaven.configuration.Configuration;
+import io.deephaven.engine.rowset.RowKeyRangeShiftCallback;
 import io.deephaven.engine.rowset.RowSequence;
 import io.deephaven.engine.rowset.RowSet;
-import io.deephaven.engine.rowset.RowSetShiftData;
 import io.deephaven.engine.rowset.TrackingWritableRowSet;
 import io.deephaven.engine.table.*;
 import io.deephaven.engine.table.impl.sources.SparseArrayColumnSource;
 import io.deephaven.engine.table.impl.util.ChunkUtils;
-import io.deephaven.engine.table.impl.util.ShiftData;
+import io.deephaven.engine.rowset.RowSetShiftCallback;
 import io.deephaven.util.SafeCloseable;
 import io.deephaven.util.SafeCloseableList;
 import io.deephaven.vector.*;
@@ -325,7 +325,7 @@ public void dontValidateColumns(String[] columnNames) {
         columnInfos = ciBuilder.toArray(new ColumnInfo[0]);
     }
 
-    private class ColumnInfo implements RowSetShiftData.Callback, SafeCloseable {
+    private class ColumnInfo implements RowKeyRangeShiftCallback, SafeCloseable {
         final String name;
         final boolean isPrimitive;
         final ModifiedColumnSet modifiedColumnSet;
@@ -351,7 +351,7 @@ private ColumnInfo(QueryTable tableToValidate, String columnName) {
             this.isPrimitive = source.getType().isPrimitive();
             this.expectedSource =
                     SparseArrayColumnSource.getSparseMemoryColumnSource(source.getType(), source.getComponentType());
-            Assert.eqTrue(this.expectedSource instanceof ShiftData.RowSetShiftCallback,
+            Assert.eqTrue(this.expectedSource instanceof RowSetShiftCallback,
                     "expectedSource instanceof ShiftData.RowSetShiftCallback");
 
             this.chunkEquals = ChunkEquals.makeEqual(source.getChunkType());
@@ -401,8 +401,7 @@ private WritableBooleanChunk equalValuesDest() {
 
         @Override
         public void shift(final long beginRange, final long endRange, final long shiftDelta) {
-            ((ShiftData.RowSetShiftCallback) expectedSource).shift(
-                    rowSet.subSetByKeyRange(beginRange, endRange), shiftDelta);
+            ((RowSetShiftCallback) expectedSource).shift(rowSet.subSetByKeyRange(beginRange, endRange), shiftDelta);
         }
 
         public void remove(final RowSet toRemove) {
diff --git a/engine/table/src/main/java/io/deephaven/engine/table/impl/TimeTable.java b/engine/table/src/main/java/io/deephaven/engine/table/impl/TimeTable.java
index 0c78ff2ff21..44229f6adcd 100644
--- a/engine/table/src/main/java/io/deephaven/engine/table/impl/TimeTable.java
+++ b/engine/table/src/main/java/io/deephaven/engine/table/impl/TimeTable.java
@@ -29,6 +29,7 @@
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
+import javax.annotation.OverridingMethodsMustInvokeSuper;
 import java.time.Duration;
 import java.time.Instant;
 import java.util.Collections;
@@ -215,6 +216,7 @@ private void refresh(final boolean notifyListeners) {
         }
     }
 
+    @OverridingMethodsMustInvokeSuper
     @Override
     protected void destroy() {
         super.destroy();
diff --git a/engine/table/src/main/java/io/deephaven/engine/table/impl/UncoalescedTable.java b/engine/table/src/main/java/io/deephaven/engine/table/impl/UncoalescedTable.java
index 3caad808244..bbcd8ad0dd4 100644
--- a/engine/table/src/main/java/io/deephaven/engine/table/impl/UncoalescedTable.java
+++ b/engine/table/src/main/java/io/deephaven/engine/table/impl/UncoalescedTable.java
@@ -203,6 +203,12 @@ public <DATA_TYPE> CloseableIterator<DATA_TYPE> objectColumnIterator(@NotNull St
         return coalesce().objectColumnIterator(columnName);
     }
 
+    @Override
+    public <DATA_TYPE> CloseableIterator<DATA_TYPE> objectColumnIterator(@NotNull String columnName,
+            @NotNull Class<? extends DATA_TYPE> clazz) {
+        return coalesce().objectColumnIterator(columnName, clazz);
+    }
+
     @Override
     @ConcurrentMethod
     public Table where(Filter filter) {
diff --git a/engine/table/src/main/java/io/deephaven/engine/table/impl/UpdatableTable.java b/engine/table/src/main/java/io/deephaven/engine/table/impl/UpdatableTable.java
index aee39b19b48..eef937f0542 100644
--- a/engine/table/src/main/java/io/deephaven/engine/table/impl/UpdatableTable.java
+++ b/engine/table/src/main/java/io/deephaven/engine/table/impl/UpdatableTable.java
@@ -13,6 +13,7 @@
 import gnu.trove.set.hash.TLongHashSet;
 import org.jetbrains.annotations.NotNull;
 
+import javax.annotation.OverridingMethodsMustInvokeSuper;
 import java.util.Map;
 import java.util.function.Consumer;
 
@@ -144,6 +145,7 @@ protected void doNotifyListeners(TableUpdate update) {
         notifyListeners(update);
     }
 
+    @OverridingMethodsMustInvokeSuper
     @Override
     public void destroy() {
         super.destroy();
diff --git a/engine/table/src/main/java/io/deephaven/engine/table/impl/UpdateSourceQueryTable.java b/engine/table/src/main/java/io/deephaven/engine/table/impl/UpdateSourceQueryTable.java
index f4ea3c8f10c..a25d1817221 100644
--- a/engine/table/src/main/java/io/deephaven/engine/table/impl/UpdateSourceQueryTable.java
+++ b/engine/table/src/main/java/io/deephaven/engine/table/impl/UpdateSourceQueryTable.java
@@ -10,6 +10,7 @@
 import io.deephaven.engine.updategraph.impl.PeriodicUpdateGraph;
 import io.deephaven.engine.table.ColumnSource;
 
+import javax.annotation.OverridingMethodsMustInvokeSuper;
 import java.util.Map;
 
 /**
@@ -47,6 +48,7 @@ public synchronized void addRowKeyRange(final long firstRowKey, final long lastR
         additionsBuilder.addRange(firstRowKey, lastRowKey);
     }
 
+    @OverridingMethodsMustInvokeSuper
     @Override
     public void destroy() {
         super.destroy();
diff --git a/engine/table/src/main/java/io/deephaven/engine/table/impl/WhereListener.java b/engine/table/src/main/java/io/deephaven/engine/table/impl/WhereListener.java
index 8bf2354f70b..d9fc08e0511 100644
--- a/engine/table/src/main/java/io/deephaven/engine/table/impl/WhereListener.java
+++ b/engine/table/src/main/java/io/deephaven/engine/table/impl/WhereListener.java
@@ -4,7 +4,6 @@
 package io.deephaven.engine.table.impl;
 
 import io.deephaven.base.verify.Assert;
-import io.deephaven.datastructures.util.CollectionUtil;
 import io.deephaven.engine.liveness.LivenessReferent;
 import io.deephaven.engine.rowset.RowSet;
 import io.deephaven.engine.rowset.WritableRowSet;
@@ -91,7 +90,7 @@ class WhereListener extends MergedListener {
                 && (QueryTable.FORCE_PARALLEL_WHERE || getUpdateGraph().parallelismFactor() > 1);
         this.filterColumns = hasColumnArray ? null
                 : sourceTable.newModifiedColumnSet(
-                        filterColumnNames.toArray(CollectionUtil.ZERO_LENGTH_STRING_ARRAY));
+                        filterColumnNames.toArray(String[]::new));
     }
 
     @NotNull
diff --git a/engine/table/src/main/java/io/deephaven/engine/table/impl/WouldMatchOperation.java b/engine/table/src/main/java/io/deephaven/engine/table/impl/WouldMatchOperation.java
index 05ef6d8acd2..91dbc7e323b 100644
--- a/engine/table/src/main/java/io/deephaven/engine/table/impl/WouldMatchOperation.java
+++ b/engine/table/src/main/java/io/deephaven/engine/table/impl/WouldMatchOperation.java
@@ -5,7 +5,6 @@
 
 import io.deephaven.base.verify.Require;
 import io.deephaven.chunk.attributes.Values;
-import io.deephaven.datastructures.util.CollectionUtil;
 import io.deephaven.engine.exceptions.UncheckedTableException;
 import io.deephaven.engine.liveness.LivenessReferent;
 import io.deephaven.engine.rowset.*;
@@ -93,10 +92,6 @@ public String getLogPrefix() {
 
     @Override
     public SafeCloseable beginOperation(@NotNull final QueryTable parent) {
-        final QueryCompilerRequestProcessor.BatchProcessor compilationProcessor = QueryCompilerRequestProcessor.batch();
-        Arrays.stream(whereFilters).forEach(filter -> filter.init(parent.getDefinition(), compilationProcessor));
-        compilationProcessor.compile();
-
         return Arrays.stream(whereFilters)
                 .map((final WhereFilter filter) -> {
                     // Ensure we gather the correct dependencies when building a snapshot control.
@@ -104,6 +99,38 @@ public SafeCloseable beginOperation(@NotNull final QueryTable parent) {
                 }).collect(SafeCloseableList.COLLECTOR);
     }
 
+    /**
+     * Initialize the filters.
+     *
+     * <p>
+     * We must initialize our filters before the wouldMatch operation's call to QueryTable's getResult method, so that
+     * memoization processing can correctly compare them. MatchFilters do not properly implement memoization before
+     * initialization, and they are the most common filter to memoize.
+     * </p>
+     *
+     * @param parent the parent table to have wouldMatch applied
+     */
+    void initializeFilters(@NotNull QueryTable parent) {
+        final QueryCompilerRequestProcessor.BatchProcessor compilationProcessor = QueryCompilerRequestProcessor.batch();
+        Arrays.stream(whereFilters).forEach(filter -> filter.init(parent.getDefinition(), compilationProcessor));
+
+        final List<WhereFilter> disallowedRowVariables =
+                Arrays.stream(whereFilters).filter(WhereFilter::hasVirtualRowVariables).collect(Collectors.toList());
+        if (!disallowedRowVariables.isEmpty()) {
+            throw new UncheckedTableException(
+                    "wouldMatch filters cannot use virtual row variables (i, ii, and k): " + disallowedRowVariables);
+        }
+
+        final List<WhereFilter> disallowedColumnVectors =
+                Arrays.stream(whereFilters).filter(wf -> !wf.getColumnArrays().isEmpty()).collect(Collectors.toList());
+        if (!disallowedColumnVectors.isEmpty()) {
+            throw new UncheckedTableException(
+                    "wouldMatch filters cannot use column Vectors (_ syntax): " + disallowedColumnVectors);
+        }
+
+        compilationProcessor.compile();
+    }
+
     @Override
     public OperationSnapshotControl newSnapshotControl(@NotNull final QueryTable queryTable) {
         final List<NotificationQueue.Dependency> dependencies = WhereListener.extractDependencies(whereFilters);
@@ -181,7 +208,8 @@ public Result<QueryTable> initialize(boolean usePrev, long beforeClock) {
 
     @Override
     public MemoizedOperationKey getMemoizedOperationKey() {
-        return MemoizedOperationKey.wouldMatch();
+        return MemoizedOperationKey.wouldMatch(
+                matchColumns.stream().map(ColumnHolder::getColumnName).toArray(String[]::new), whereFilters);
     }
 
     /**
@@ -301,7 +329,7 @@ private static class IndexWrapperColumnSource extends AbstractColumnSource<Boole
             this.filter = filter;
             this.name = name;
             this.possibleUpstreamModified =
-                    parent.newModifiedColumnSet(filter.getColumns().toArray(CollectionUtil.ZERO_LENGTH_STRING_ARRAY));
+                    parent.newModifiedColumnSet(filter.getColumns().toArray(String[]::new));
         }
 
         @Override
@@ -433,14 +461,21 @@ public void requestRecompute() {
 
         @Override
         public void requestRecomputeUnmatched() {
-            // TODO: No need to recompute matched rows
+            // TODO: No need to recompute matched rows (https://github.com/deephaven/deephaven-core/issues/6083)
             doRecompute = true;
             Require.neqNull(mergedListener, "mergedListener").notifyChanges();
         }
 
         @Override
         public void requestRecomputeMatched() {
-            // TODO: No need to recompute unmatched rows
+            // TODO: No need to recompute unmatched rows (https://github.com/deephaven/deephaven-core/issues/6083)
+            doRecompute = true;
+            Require.neqNull(mergedListener, "mergedListener").notifyChanges();
+        }
+
+        @Override
+        public void requestRecompute(RowSet rowSet) {
+            // TODO: No need to recompute the remaining rows (https://github.com/deephaven/deephaven-core/issues/6083)
             doRecompute = true;
             Require.neqNull(mergedListener, "mergedListener").notifyChanges();
         }
@@ -497,13 +532,14 @@ private RowSet update(RowSet added, RowSet removed, RowSet modified,
 
             try (final SafeCloseableList toClose = new SafeCloseableList()) {
                 // Filter and add addeds
-                final WritableRowSet filteredAdded = toClose.add(filter.filter(added, source, table, false));
+                final WritableRowSet filteredAdded = toClose.add(filter.filter(added, table.getRowSet(), table, false));
                 RowSet keysToRemove = EMPTY_INDEX;
 
                 // If we were affected, recompute mods and re-add the ones that pass.
                 if (affected) {
                     downstreamModified.setAll(name);
-                    final RowSet filteredModified = toClose.add(filter.filter(modified, source, table, false));
+                    final RowSet filteredModified =
+                            toClose.add(filter.filter(modified, table.getRowSet(), table, false));
 
                     // Now apply the additions and remove any non-matching modifieds
                     filteredAdded.insert(filteredModified);
diff --git a/engine/table/src/main/java/io/deephaven/engine/table/impl/asofjoin/BucketedChunkedAjMergedListener.java b/engine/table/src/main/java/io/deephaven/engine/table/impl/asofjoin/BucketedChunkedAjMergedListener.java
index a01dd2442b9..ebc51824774 100644
--- a/engine/table/src/main/java/io/deephaven/engine/table/impl/asofjoin/BucketedChunkedAjMergedListener.java
+++ b/engine/table/src/main/java/io/deephaven/engine/table/impl/asofjoin/BucketedChunkedAjMergedListener.java
@@ -32,6 +32,7 @@
 import io.deephaven.util.SafeCloseable;
 import org.apache.commons.lang3.mutable.MutableObject;
 
+import javax.annotation.OverridingMethodsMustInvokeSuper;
 import java.util.Arrays;
 import java.util.Collections;
 
@@ -786,9 +787,13 @@ private RowSet indexFromBuilder(int slotIndex) {
         return rowSet;
     }
 
+    @OverridingMethodsMustInvokeSuper
     @Override
     protected void destroy() {
-        leftSsaFactory.close();
-        rightSsaFactory.close();
+        super.destroy();
+        getUpdateGraph().runWhenIdle(() -> {
+            leftSsaFactory.close();
+            rightSsaFactory.close();
+        });
     }
 }
diff --git a/engine/table/src/main/java/io/deephaven/engine/table/impl/asofjoin/RightIncrementalAsOfJoinStateManagerTypedBase.java b/engine/table/src/main/java/io/deephaven/engine/table/impl/asofjoin/RightIncrementalAsOfJoinStateManagerTypedBase.java
index 7d3c82649e0..b62b339c9d8 100644
--- a/engine/table/src/main/java/io/deephaven/engine/table/impl/asofjoin/RightIncrementalAsOfJoinStateManagerTypedBase.java
+++ b/engine/table/src/main/java/io/deephaven/engine/table/impl/asofjoin/RightIncrementalAsOfJoinStateManagerTypedBase.java
@@ -868,7 +868,26 @@ private SegmentedSortedArray makeSsaFromRowSet(int slot, Function<RowSet, Segmen
         return ssa;
     }
 
-    protected void newAlternate() {
+    /**
+     * After creating the new alternate key states, advise the derived classes, so they can cast them to the typed
+     * versions of the column source and adjust the derived class pointers.
+     */
+    protected abstract void adviseNewAlternate();
+
+    private void setupNewAlternate(int oldTableSize) {
+        Assert.eqZero(rehashPointer, "rehashPointer");
+
+        for (int ii = 0; ii < mainKeySources.length; ++ii) {
+            alternateKeySources[ii] = mainKeySources[ii];
+            mainKeySources[ii] = InMemoryColumnSource.getImmutableMemoryColumnSource(tableSize,
+                    alternateKeySources[ii].getType(), alternateKeySources[ii].getComponentType());
+            mainKeySources[ii].ensureCapacity(tableSize);
+        }
+        alternateTableSize = oldTableSize;
+        if (numEntries > 0) {
+            rehashPointer = alternateTableSize;
+        }
+
         alternateRightRowSetSource = rightRowSetSource;
         rightRowSetSource = new ImmutableObjectArraySource<>(Object.class, null);
         rightRowSetSource.ensureCapacity(tableSize);
@@ -951,20 +970,8 @@ public boolean doRehash(boolean fullRehash, MutableInt rehashCredits, int nextCh
             return false;
         }
 
-        Assert.eqZero(rehashPointer, "rehashPointer");
-
-        for (int ii = 0; ii < mainKeySources.length; ++ii) {
-            alternateKeySources[ii] = mainKeySources[ii];
-            mainKeySources[ii] = InMemoryColumnSource.getImmutableMemoryColumnSource(tableSize,
-                    alternateKeySources[ii].getType(), alternateKeySources[ii].getComponentType());
-            mainKeySources[ii].ensureCapacity(tableSize);
-        }
-        alternateTableSize = oldTableSize;
-        if (numEntries > 0) {
-            rehashPointer = alternateTableSize;
-        }
-
-        newAlternate();
+        setupNewAlternate(oldTableSize);
+        adviseNewAlternate();
 
         return true;
     }
diff --git a/engine/table/src/main/java/io/deephaven/engine/table/impl/asofjoin/typed/rightincopen/gen/RightIncrementalAsOfJoinHasherByte.java b/engine/table/src/main/java/io/deephaven/engine/table/impl/asofjoin/typed/rightincopen/gen/RightIncrementalAsOfJoinHasherByte.java
index 04ddeebbee9..4ea06dae871 100644
--- a/engine/table/src/main/java/io/deephaven/engine/table/impl/asofjoin/typed/rightincopen/gen/RightIncrementalAsOfJoinHasherByte.java
+++ b/engine/table/src/main/java/io/deephaven/engine/table/impl/asofjoin/typed/rightincopen/gen/RightIncrementalAsOfJoinHasherByte.java
@@ -58,12 +58,12 @@ protected void buildFromLeftSide(RowSequence rowSequence, Chunk[] sourceKeyChunk
             int tableLocation = firstTableLocation;
             MAIN_SEARCH: while (true) {
                 byte rowState = stateSource.getUnsafe(tableLocation);
-                if (rowState == ENTRY_EMPTY_STATE) {
+                if (isStateEmpty(rowState)) {
                     final int firstAlternateTableLocation = hashToTableLocationAlternate(hash);
                     int alternateTableLocation = firstAlternateTableLocation;
                     while (alternateTableLocation < rehashPointer) {
                         rowState = alternateStateSource.getUnsafe(alternateTableLocation);
-                        if (rowState == ENTRY_EMPTY_STATE) {
+                        if (isStateEmpty(rowState)) {
                             break;
                         } else if (eq(alternateKeySource0.getUnsafe(alternateTableLocation), k0)) {
                             final long cookie = getCookieAlternate(alternateTableLocation);
@@ -120,12 +120,12 @@ protected void buildFromRightSide(RowSequence rowSequence, Chunk[] sourceKeyChun
             int tableLocation = firstTableLocation;
             MAIN_SEARCH: while (true) {
                 byte rowState = stateSource.getUnsafe(tableLocation);
-                if (rowState == ENTRY_EMPTY_STATE) {
+                if (isStateEmpty(rowState)) {
                     final int firstAlternateTableLocation = hashToTableLocationAlternate(hash);
                     int alternateTableLocation = firstAlternateTableLocation;
                     while (alternateTableLocation < rehashPointer) {
                         rowState = alternateStateSource.getUnsafe(alternateTableLocation);
-                        if (rowState == ENTRY_EMPTY_STATE) {
+                        if (isStateEmpty(rowState)) {
                             break;
                         } else if (eq(alternateKeySource0.getUnsafe(alternateTableLocation), k0)) {
                             final long cookie = getCookieAlternate(alternateTableLocation);
@@ -181,7 +181,7 @@ protected void probeRightSide(RowSequence rowSequence, Chunk[] sourceKeyChunks,
             boolean found = false;
             int tableLocation = firstTableLocation;
             byte rowState;
-            while ((rowState = stateSource.getUnsafe(tableLocation)) != ENTRY_EMPTY_STATE) {
+            while (!isStateEmpty(rowState = stateSource.getUnsafe(tableLocation))) {
                 if (eq(mainKeySource0.getUnsafe(tableLocation), k0)) {
                     if (sequentialBuilders != null) {
                         final long cookie = getCookieMain(tableLocation);
@@ -200,7 +200,7 @@ protected void probeRightSide(RowSequence rowSequence, Chunk[] sourceKeyChunks,
                 final int firstAlternateTableLocation = hashToTableLocationAlternate(hash);
                 if (firstAlternateTableLocation < rehashPointer) {
                     int alternateTableLocation = firstAlternateTableLocation;
-                    while ((rowState = alternateStateSource.getUnsafe(alternateTableLocation)) != ENTRY_EMPTY_STATE) {
+                    while (!isStateEmpty(rowState = alternateStateSource.getUnsafe(alternateTableLocation))) {
                         if (eq(alternateKeySource0.getUnsafe(alternateTableLocation), k0)) {
                             if (sequentialBuilders != null) {
                                 final long cookie = getCookieAlternate(alternateTableLocation);
@@ -224,15 +224,19 @@ private static int hash(byte k0) {
         return hash;
     }
 
+    private static boolean isStateEmpty(byte state) {
+        return state == ENTRY_EMPTY_STATE;
+    }
+
     private boolean migrateOneLocation(int locationToMigrate) {
         final byte currentStateValue = alternateStateSource.getUnsafe(locationToMigrate);
-        if (currentStateValue == ENTRY_EMPTY_STATE) {
+        if (isStateEmpty(currentStateValue)) {
             return false;
         }
         final byte k0 = alternateKeySource0.getUnsafe(locationToMigrate);
         final int hash = hash(k0);
         int destinationTableLocation = hashToTableLocation(hash);
-        while (stateSource.getUnsafe(destinationTableLocation) != ENTRY_EMPTY_STATE) {
+        while (!isStateEmpty(stateSource.getUnsafe(destinationTableLocation))) {
             destinationTableLocation = nextTableLocation(destinationTableLocation);
         }
         mainKeySource0.set(destinationTableLocation, k0);
@@ -259,8 +263,7 @@ protected int rehashInternalPartial(int entriesToRehash) {
     }
 
     @Override
-    protected void newAlternate() {
-        super.newAlternate();
+    protected void adviseNewAlternate() {
         this.mainKeySource0 = (ImmutableByteArraySource)super.mainKeySources[0];
         this.alternateKeySource0 = (ImmutableByteArraySource)super.alternateKeySources[0];
     }
@@ -274,7 +277,7 @@ protected void clearAlternate() {
     @Override
     protected void migrateFront() {
         int location = 0;
-        while (migrateOneLocation(location++));
+        while (migrateOneLocation(location++) && location < alternateTableSize);
     }
 
     @Override
@@ -298,7 +301,7 @@ protected void rehashInternalFull(final int oldSize) {
         mainCookieSource.setArray(destModifiedCookie);
         for (int sourceBucket = 0; sourceBucket < oldSize; ++sourceBucket) {
             final byte currentStateValue = originalStateArray[sourceBucket];
-            if (currentStateValue == ENTRY_EMPTY_STATE) {
+            if (isStateEmpty(currentStateValue)) {
                 continue;
             }
             final byte k0 = originalKeyArray0[sourceBucket];
@@ -306,7 +309,7 @@ protected void rehashInternalFull(final int oldSize) {
             final int firstDestinationTableLocation = hashToTableLocation(hash);
             int destinationTableLocation = firstDestinationTableLocation;
             while (true) {
-                if (destState[destinationTableLocation] == ENTRY_EMPTY_STATE) {
+                if (isStateEmpty(destState[destinationTableLocation])) {
                     destKeyArray0[destinationTableLocation] = k0;
                     destState[destinationTableLocation] = originalStateArray[sourceBucket];
                     destLeftSource[destinationTableLocation] = oldLeftSource[sourceBucket];
diff --git a/engine/table/src/main/java/io/deephaven/engine/table/impl/asofjoin/typed/rightincopen/gen/RightIncrementalAsOfJoinHasherChar.java b/engine/table/src/main/java/io/deephaven/engine/table/impl/asofjoin/typed/rightincopen/gen/RightIncrementalAsOfJoinHasherChar.java
index b420de67043..0f8959745db 100644
--- a/engine/table/src/main/java/io/deephaven/engine/table/impl/asofjoin/typed/rightincopen/gen/RightIncrementalAsOfJoinHasherChar.java
+++ b/engine/table/src/main/java/io/deephaven/engine/table/impl/asofjoin/typed/rightincopen/gen/RightIncrementalAsOfJoinHasherChar.java
@@ -58,12 +58,12 @@ protected void buildFromLeftSide(RowSequence rowSequence, Chunk[] sourceKeyChunk
             int tableLocation = firstTableLocation;
             MAIN_SEARCH: while (true) {
                 byte rowState = stateSource.getUnsafe(tableLocation);
-                if (rowState == ENTRY_EMPTY_STATE) {
+                if (isStateEmpty(rowState)) {
                     final int firstAlternateTableLocation = hashToTableLocationAlternate(hash);
                     int alternateTableLocation = firstAlternateTableLocation;
                     while (alternateTableLocation < rehashPointer) {
                         rowState = alternateStateSource.getUnsafe(alternateTableLocation);
-                        if (rowState == ENTRY_EMPTY_STATE) {
+                        if (isStateEmpty(rowState)) {
                             break;
                         } else if (eq(alternateKeySource0.getUnsafe(alternateTableLocation), k0)) {
                             final long cookie = getCookieAlternate(alternateTableLocation);
@@ -120,12 +120,12 @@ protected void buildFromRightSide(RowSequence rowSequence, Chunk[] sourceKeyChun
             int tableLocation = firstTableLocation;
             MAIN_SEARCH: while (true) {
                 byte rowState = stateSource.getUnsafe(tableLocation);
-                if (rowState == ENTRY_EMPTY_STATE) {
+                if (isStateEmpty(rowState)) {
                     final int firstAlternateTableLocation = hashToTableLocationAlternate(hash);
                     int alternateTableLocation = firstAlternateTableLocation;
                     while (alternateTableLocation < rehashPointer) {
                         rowState = alternateStateSource.getUnsafe(alternateTableLocation);
-                        if (rowState == ENTRY_EMPTY_STATE) {
+                        if (isStateEmpty(rowState)) {
                             break;
                         } else if (eq(alternateKeySource0.getUnsafe(alternateTableLocation), k0)) {
                             final long cookie = getCookieAlternate(alternateTableLocation);
@@ -181,7 +181,7 @@ protected void probeRightSide(RowSequence rowSequence, Chunk[] sourceKeyChunks,
             boolean found = false;
             int tableLocation = firstTableLocation;
             byte rowState;
-            while ((rowState = stateSource.getUnsafe(tableLocation)) != ENTRY_EMPTY_STATE) {
+            while (!isStateEmpty(rowState = stateSource.getUnsafe(tableLocation))) {
                 if (eq(mainKeySource0.getUnsafe(tableLocation), k0)) {
                     if (sequentialBuilders != null) {
                         final long cookie = getCookieMain(tableLocation);
@@ -200,7 +200,7 @@ protected void probeRightSide(RowSequence rowSequence, Chunk[] sourceKeyChunks,
                 final int firstAlternateTableLocation = hashToTableLocationAlternate(hash);
                 if (firstAlternateTableLocation < rehashPointer) {
                     int alternateTableLocation = firstAlternateTableLocation;
-                    while ((rowState = alternateStateSource.getUnsafe(alternateTableLocation)) != ENTRY_EMPTY_STATE) {
+                    while (!isStateEmpty(rowState = alternateStateSource.getUnsafe(alternateTableLocation))) {
                         if (eq(alternateKeySource0.getUnsafe(alternateTableLocation), k0)) {
                             if (sequentialBuilders != null) {
                                 final long cookie = getCookieAlternate(alternateTableLocation);
@@ -224,15 +224,19 @@ private static int hash(char k0) {
         return hash;
     }
 
+    private static boolean isStateEmpty(byte state) {
+        return state == ENTRY_EMPTY_STATE;
+    }
+
     private boolean migrateOneLocation(int locationToMigrate) {
         final byte currentStateValue = alternateStateSource.getUnsafe(locationToMigrate);
-        if (currentStateValue == ENTRY_EMPTY_STATE) {
+        if (isStateEmpty(currentStateValue)) {
             return false;
         }
         final char k0 = alternateKeySource0.getUnsafe(locationToMigrate);
         final int hash = hash(k0);
         int destinationTableLocation = hashToTableLocation(hash);
-        while (stateSource.getUnsafe(destinationTableLocation) != ENTRY_EMPTY_STATE) {
+        while (!isStateEmpty(stateSource.getUnsafe(destinationTableLocation))) {
             destinationTableLocation = nextTableLocation(destinationTableLocation);
         }
         mainKeySource0.set(destinationTableLocation, k0);
@@ -259,8 +263,7 @@ protected int rehashInternalPartial(int entriesToRehash) {
     }
 
     @Override
-    protected void newAlternate() {
-        super.newAlternate();
+    protected void adviseNewAlternate() {
         this.mainKeySource0 = (ImmutableCharArraySource)super.mainKeySources[0];
         this.alternateKeySource0 = (ImmutableCharArraySource)super.alternateKeySources[0];
     }
@@ -274,7 +277,7 @@ protected void clearAlternate() {
     @Override
     protected void migrateFront() {
         int location = 0;
-        while (migrateOneLocation(location++));
+        while (migrateOneLocation(location++) && location < alternateTableSize);
     }
 
     @Override
@@ -298,7 +301,7 @@ protected void rehashInternalFull(final int oldSize) {
         mainCookieSource.setArray(destModifiedCookie);
         for (int sourceBucket = 0; sourceBucket < oldSize; ++sourceBucket) {
             final byte currentStateValue = originalStateArray[sourceBucket];
-            if (currentStateValue == ENTRY_EMPTY_STATE) {
+            if (isStateEmpty(currentStateValue)) {
                 continue;
             }
             final char k0 = originalKeyArray0[sourceBucket];
@@ -306,7 +309,7 @@ protected void rehashInternalFull(final int oldSize) {
             final int firstDestinationTableLocation = hashToTableLocation(hash);
             int destinationTableLocation = firstDestinationTableLocation;
             while (true) {
-                if (destState[destinationTableLocation] == ENTRY_EMPTY_STATE) {
+                if (isStateEmpty(destState[destinationTableLocation])) {
                     destKeyArray0[destinationTableLocation] = k0;
                     destState[destinationTableLocation] = originalStateArray[sourceBucket];
                     destLeftSource[destinationTableLocation] = oldLeftSource[sourceBucket];
diff --git a/engine/table/src/main/java/io/deephaven/engine/table/impl/asofjoin/typed/rightincopen/gen/RightIncrementalAsOfJoinHasherDouble.java b/engine/table/src/main/java/io/deephaven/engine/table/impl/asofjoin/typed/rightincopen/gen/RightIncrementalAsOfJoinHasherDouble.java
index b50d881023a..e304e799f1a 100644
--- a/engine/table/src/main/java/io/deephaven/engine/table/impl/asofjoin/typed/rightincopen/gen/RightIncrementalAsOfJoinHasherDouble.java
+++ b/engine/table/src/main/java/io/deephaven/engine/table/impl/asofjoin/typed/rightincopen/gen/RightIncrementalAsOfJoinHasherDouble.java
@@ -58,12 +58,12 @@ protected void buildFromLeftSide(RowSequence rowSequence, Chunk[] sourceKeyChunk
             int tableLocation = firstTableLocation;
             MAIN_SEARCH: while (true) {
                 byte rowState = stateSource.getUnsafe(tableLocation);
-                if (rowState == ENTRY_EMPTY_STATE) {
+                if (isStateEmpty(rowState)) {
                     final int firstAlternateTableLocation = hashToTableLocationAlternate(hash);
                     int alternateTableLocation = firstAlternateTableLocation;
                     while (alternateTableLocation < rehashPointer) {
                         rowState = alternateStateSource.getUnsafe(alternateTableLocation);
-                        if (rowState == ENTRY_EMPTY_STATE) {
+                        if (isStateEmpty(rowState)) {
                             break;
                         } else if (eq(alternateKeySource0.getUnsafe(alternateTableLocation), k0)) {
                             final long cookie = getCookieAlternate(alternateTableLocation);
@@ -120,12 +120,12 @@ protected void buildFromRightSide(RowSequence rowSequence, Chunk[] sourceKeyChun
             int tableLocation = firstTableLocation;
             MAIN_SEARCH: while (true) {
                 byte rowState = stateSource.getUnsafe(tableLocation);
-                if (rowState == ENTRY_EMPTY_STATE) {
+                if (isStateEmpty(rowState)) {
                     final int firstAlternateTableLocation = hashToTableLocationAlternate(hash);
                     int alternateTableLocation = firstAlternateTableLocation;
                     while (alternateTableLocation < rehashPointer) {
                         rowState = alternateStateSource.getUnsafe(alternateTableLocation);
-                        if (rowState == ENTRY_EMPTY_STATE) {
+                        if (isStateEmpty(rowState)) {
                             break;
                         } else if (eq(alternateKeySource0.getUnsafe(alternateTableLocation), k0)) {
                             final long cookie = getCookieAlternate(alternateTableLocation);
@@ -181,7 +181,7 @@ protected void probeRightSide(RowSequence rowSequence, Chunk[] sourceKeyChunks,
             boolean found = false;
             int tableLocation = firstTableLocation;
             byte rowState;
-            while ((rowState = stateSource.getUnsafe(tableLocation)) != ENTRY_EMPTY_STATE) {
+            while (!isStateEmpty(rowState = stateSource.getUnsafe(tableLocation))) {
                 if (eq(mainKeySource0.getUnsafe(tableLocation), k0)) {
                     if (sequentialBuilders != null) {
                         final long cookie = getCookieMain(tableLocation);
@@ -200,7 +200,7 @@ protected void probeRightSide(RowSequence rowSequence, Chunk[] sourceKeyChunks,
                 final int firstAlternateTableLocation = hashToTableLocationAlternate(hash);
                 if (firstAlternateTableLocation < rehashPointer) {
                     int alternateTableLocation = firstAlternateTableLocation;
-                    while ((rowState = alternateStateSource.getUnsafe(alternateTableLocation)) != ENTRY_EMPTY_STATE) {
+                    while (!isStateEmpty(rowState = alternateStateSource.getUnsafe(alternateTableLocation))) {
                         if (eq(alternateKeySource0.getUnsafe(alternateTableLocation), k0)) {
                             if (sequentialBuilders != null) {
                                 final long cookie = getCookieAlternate(alternateTableLocation);
@@ -224,15 +224,19 @@ private static int hash(double k0) {
         return hash;
     }
 
+    private static boolean isStateEmpty(byte state) {
+        return state == ENTRY_EMPTY_STATE;
+    }
+
     private boolean migrateOneLocation(int locationToMigrate) {
         final byte currentStateValue = alternateStateSource.getUnsafe(locationToMigrate);
-        if (currentStateValue == ENTRY_EMPTY_STATE) {
+        if (isStateEmpty(currentStateValue)) {
             return false;
         }
         final double k0 = alternateKeySource0.getUnsafe(locationToMigrate);
         final int hash = hash(k0);
         int destinationTableLocation = hashToTableLocation(hash);
-        while (stateSource.getUnsafe(destinationTableLocation) != ENTRY_EMPTY_STATE) {
+        while (!isStateEmpty(stateSource.getUnsafe(destinationTableLocation))) {
             destinationTableLocation = nextTableLocation(destinationTableLocation);
         }
         mainKeySource0.set(destinationTableLocation, k0);
@@ -259,8 +263,7 @@ protected int rehashInternalPartial(int entriesToRehash) {
     }
 
     @Override
-    protected void newAlternate() {
-        super.newAlternate();
+    protected void adviseNewAlternate() {
         this.mainKeySource0 = (ImmutableDoubleArraySource)super.mainKeySources[0];
         this.alternateKeySource0 = (ImmutableDoubleArraySource)super.alternateKeySources[0];
     }
@@ -274,7 +277,7 @@ protected void clearAlternate() {
     @Override
     protected void migrateFront() {
         int location = 0;
-        while (migrateOneLocation(location++));
+        while (migrateOneLocation(location++) && location < alternateTableSize);
     }
 
     @Override
@@ -298,7 +301,7 @@ protected void rehashInternalFull(final int oldSize) {
         mainCookieSource.setArray(destModifiedCookie);
         for (int sourceBucket = 0; sourceBucket < oldSize; ++sourceBucket) {
             final byte currentStateValue = originalStateArray[sourceBucket];
-            if (currentStateValue == ENTRY_EMPTY_STATE) {
+            if (isStateEmpty(currentStateValue)) {
                 continue;
             }
             final double k0 = originalKeyArray0[sourceBucket];
@@ -306,7 +309,7 @@ protected void rehashInternalFull(final int oldSize) {
             final int firstDestinationTableLocation = hashToTableLocation(hash);
             int destinationTableLocation = firstDestinationTableLocation;
             while (true) {
-                if (destState[destinationTableLocation] == ENTRY_EMPTY_STATE) {
+                if (isStateEmpty(destState[destinationTableLocation])) {
                     destKeyArray0[destinationTableLocation] = k0;
                     destState[destinationTableLocation] = originalStateArray[sourceBucket];
                     destLeftSource[destinationTableLocation] = oldLeftSource[sourceBucket];
diff --git a/engine/table/src/main/java/io/deephaven/engine/table/impl/asofjoin/typed/rightincopen/gen/RightIncrementalAsOfJoinHasherFloat.java b/engine/table/src/main/java/io/deephaven/engine/table/impl/asofjoin/typed/rightincopen/gen/RightIncrementalAsOfJoinHasherFloat.java
index 3358a812158..a4d4bd1d76f 100644
--- a/engine/table/src/main/java/io/deephaven/engine/table/impl/asofjoin/typed/rightincopen/gen/RightIncrementalAsOfJoinHasherFloat.java
+++ b/engine/table/src/main/java/io/deephaven/engine/table/impl/asofjoin/typed/rightincopen/gen/RightIncrementalAsOfJoinHasherFloat.java
@@ -58,12 +58,12 @@ protected void buildFromLeftSide(RowSequence rowSequence, Chunk[] sourceKeyChunk
             int tableLocation = firstTableLocation;
             MAIN_SEARCH: while (true) {
                 byte rowState = stateSource.getUnsafe(tableLocation);
-                if (rowState == ENTRY_EMPTY_STATE) {
+                if (isStateEmpty(rowState)) {
                     final int firstAlternateTableLocation = hashToTableLocationAlternate(hash);
                     int alternateTableLocation = firstAlternateTableLocation;
                     while (alternateTableLocation < rehashPointer) {
                         rowState = alternateStateSource.getUnsafe(alternateTableLocation);
-                        if (rowState == ENTRY_EMPTY_STATE) {
+                        if (isStateEmpty(rowState)) {
                             break;
                         } else if (eq(alternateKeySource0.getUnsafe(alternateTableLocation), k0)) {
                             final long cookie = getCookieAlternate(alternateTableLocation);
@@ -120,12 +120,12 @@ protected void buildFromRightSide(RowSequence rowSequence, Chunk[] sourceKeyChun
             int tableLocation = firstTableLocation;
             MAIN_SEARCH: while (true) {
                 byte rowState = stateSource.getUnsafe(tableLocation);
-                if (rowState == ENTRY_EMPTY_STATE) {
+                if (isStateEmpty(rowState)) {
                     final int firstAlternateTableLocation = hashToTableLocationAlternate(hash);
                     int alternateTableLocation = firstAlternateTableLocation;
                     while (alternateTableLocation < rehashPointer) {
                         rowState = alternateStateSource.getUnsafe(alternateTableLocation);
-                        if (rowState == ENTRY_EMPTY_STATE) {
+                        if (isStateEmpty(rowState)) {
                             break;
                         } else if (eq(alternateKeySource0.getUnsafe(alternateTableLocation), k0)) {
                             final long cookie = getCookieAlternate(alternateTableLocation);
@@ -181,7 +181,7 @@ protected void probeRightSide(RowSequence rowSequence, Chunk[] sourceKeyChunks,
             boolean found = false;
             int tableLocation = firstTableLocation;
             byte rowState;
-            while ((rowState = stateSource.getUnsafe(tableLocation)) != ENTRY_EMPTY_STATE) {
+            while (!isStateEmpty(rowState = stateSource.getUnsafe(tableLocation))) {
                 if (eq(mainKeySource0.getUnsafe(tableLocation), k0)) {
                     if (sequentialBuilders != null) {
                         final long cookie = getCookieMain(tableLocation);
@@ -200,7 +200,7 @@ protected void probeRightSide(RowSequence rowSequence, Chunk[] sourceKeyChunks,
                 final int firstAlternateTableLocation = hashToTableLocationAlternate(hash);
                 if (firstAlternateTableLocation < rehashPointer) {
                     int alternateTableLocation = firstAlternateTableLocation;
-                    while ((rowState = alternateStateSource.getUnsafe(alternateTableLocation)) != ENTRY_EMPTY_STATE) {
+                    while (!isStateEmpty(rowState = alternateStateSource.getUnsafe(alternateTableLocation))) {
                         if (eq(alternateKeySource0.getUnsafe(alternateTableLocation), k0)) {
                             if (sequentialBuilders != null) {
                                 final long cookie = getCookieAlternate(alternateTableLocation);
@@ -224,15 +224,19 @@ private static int hash(float k0) {
         return hash;
     }
 
+    private static boolean isStateEmpty(byte state) {
+        return state == ENTRY_EMPTY_STATE;
+    }
+
     private boolean migrateOneLocation(int locationToMigrate) {
         final byte currentStateValue = alternateStateSource.getUnsafe(locationToMigrate);
-        if (currentStateValue == ENTRY_EMPTY_STATE) {
+        if (isStateEmpty(currentStateValue)) {
             return false;
         }
         final float k0 = alternateKeySource0.getUnsafe(locationToMigrate);
         final int hash = hash(k0);
         int destinationTableLocation = hashToTableLocation(hash);
-        while (stateSource.getUnsafe(destinationTableLocation) != ENTRY_EMPTY_STATE) {
+        while (!isStateEmpty(stateSource.getUnsafe(destinationTableLocation))) {
             destinationTableLocation = nextTableLocation(destinationTableLocation);
         }
         mainKeySource0.set(destinationTableLocation, k0);
@@ -259,8 +263,7 @@ protected int rehashInternalPartial(int entriesToRehash) {
     }
 
     @Override
-    protected void newAlternate() {
-        super.newAlternate();
+    protected void adviseNewAlternate() {
         this.mainKeySource0 = (ImmutableFloatArraySource)super.mainKeySources[0];
         this.alternateKeySource0 = (ImmutableFloatArraySource)super.alternateKeySources[0];
     }
@@ -274,7 +277,7 @@ protected void clearAlternate() {
     @Override
     protected void migrateFront() {
         int location = 0;
-        while (migrateOneLocation(location++));
+        while (migrateOneLocation(location++) && location < alternateTableSize);
     }
 
     @Override
@@ -298,7 +301,7 @@ protected void rehashInternalFull(final int oldSize) {
         mainCookieSource.setArray(destModifiedCookie);
         for (int sourceBucket = 0; sourceBucket < oldSize; ++sourceBucket) {
             final byte currentStateValue = originalStateArray[sourceBucket];
-            if (currentStateValue == ENTRY_EMPTY_STATE) {
+            if (isStateEmpty(currentStateValue)) {
                 continue;
             }
             final float k0 = originalKeyArray0[sourceBucket];
@@ -306,7 +309,7 @@ protected void rehashInternalFull(final int oldSize) {
             final int firstDestinationTableLocation = hashToTableLocation(hash);
             int destinationTableLocation = firstDestinationTableLocation;
             while (true) {
-                if (destState[destinationTableLocation] == ENTRY_EMPTY_STATE) {
+                if (isStateEmpty(destState[destinationTableLocation])) {
                     destKeyArray0[destinationTableLocation] = k0;
                     destState[destinationTableLocation] = originalStateArray[sourceBucket];
                     destLeftSource[destinationTableLocation] = oldLeftSource[sourceBucket];
diff --git a/engine/table/src/main/java/io/deephaven/engine/table/impl/asofjoin/typed/rightincopen/gen/RightIncrementalAsOfJoinHasherInt.java b/engine/table/src/main/java/io/deephaven/engine/table/impl/asofjoin/typed/rightincopen/gen/RightIncrementalAsOfJoinHasherInt.java
index f478df8250b..03cf423a0ba 100644
--- a/engine/table/src/main/java/io/deephaven/engine/table/impl/asofjoin/typed/rightincopen/gen/RightIncrementalAsOfJoinHasherInt.java
+++ b/engine/table/src/main/java/io/deephaven/engine/table/impl/asofjoin/typed/rightincopen/gen/RightIncrementalAsOfJoinHasherInt.java
@@ -58,12 +58,12 @@ protected void buildFromLeftSide(RowSequence rowSequence, Chunk[] sourceKeyChunk
             int tableLocation = firstTableLocation;
             MAIN_SEARCH: while (true) {
                 byte rowState = stateSource.getUnsafe(tableLocation);
-                if (rowState == ENTRY_EMPTY_STATE) {
+                if (isStateEmpty(rowState)) {
                     final int firstAlternateTableLocation = hashToTableLocationAlternate(hash);
                     int alternateTableLocation = firstAlternateTableLocation;
                     while (alternateTableLocation < rehashPointer) {
                         rowState = alternateStateSource.getUnsafe(alternateTableLocation);
-                        if (rowState == ENTRY_EMPTY_STATE) {
+                        if (isStateEmpty(rowState)) {
                             break;
                         } else if (eq(alternateKeySource0.getUnsafe(alternateTableLocation), k0)) {
                             final long cookie = getCookieAlternate(alternateTableLocation);
@@ -120,12 +120,12 @@ protected void buildFromRightSide(RowSequence rowSequence, Chunk[] sourceKeyChun
             int tableLocation = firstTableLocation;
             MAIN_SEARCH: while (true) {
                 byte rowState = stateSource.getUnsafe(tableLocation);
-                if (rowState == ENTRY_EMPTY_STATE) {
+                if (isStateEmpty(rowState)) {
                     final int firstAlternateTableLocation = hashToTableLocationAlternate(hash);
                     int alternateTableLocation = firstAlternateTableLocation;
                     while (alternateTableLocation < rehashPointer) {
                         rowState = alternateStateSource.getUnsafe(alternateTableLocation);
-                        if (rowState == ENTRY_EMPTY_STATE) {
+                        if (isStateEmpty(rowState)) {
                             break;
                         } else if (eq(alternateKeySource0.getUnsafe(alternateTableLocation), k0)) {
                             final long cookie = getCookieAlternate(alternateTableLocation);
@@ -181,7 +181,7 @@ protected void probeRightSide(RowSequence rowSequence, Chunk[] sourceKeyChunks,
             boolean found = false;
             int tableLocation = firstTableLocation;
             byte rowState;
-            while ((rowState = stateSource.getUnsafe(tableLocation)) != ENTRY_EMPTY_STATE) {
+            while (!isStateEmpty(rowState = stateSource.getUnsafe(tableLocation))) {
                 if (eq(mainKeySource0.getUnsafe(tableLocation), k0)) {
                     if (sequentialBuilders != null) {
                         final long cookie = getCookieMain(tableLocation);
@@ -200,7 +200,7 @@ protected void probeRightSide(RowSequence rowSequence, Chunk[] sourceKeyChunks,
                 final int firstAlternateTableLocation = hashToTableLocationAlternate(hash);
                 if (firstAlternateTableLocation < rehashPointer) {
                     int alternateTableLocation = firstAlternateTableLocation;
-                    while ((rowState = alternateStateSource.getUnsafe(alternateTableLocation)) != ENTRY_EMPTY_STATE) {
+                    while (!isStateEmpty(rowState = alternateStateSource.getUnsafe(alternateTableLocation))) {
                         if (eq(alternateKeySource0.getUnsafe(alternateTableLocation), k0)) {
                             if (sequentialBuilders != null) {
                                 final long cookie = getCookieAlternate(alternateTableLocation);
@@ -224,15 +224,19 @@ private static int hash(int k0) {
         return hash;
     }
 
+    private static boolean isStateEmpty(byte state) {
+        return state == ENTRY_EMPTY_STATE;
+    }
+
     private boolean migrateOneLocation(int locationToMigrate) {
         final byte currentStateValue = alternateStateSource.getUnsafe(locationToMigrate);
-        if (currentStateValue == ENTRY_EMPTY_STATE) {
+        if (isStateEmpty(currentStateValue)) {
             return false;
         }
         final int k0 = alternateKeySource0.getUnsafe(locationToMigrate);
         final int hash = hash(k0);
         int destinationTableLocation = hashToTableLocation(hash);
-        while (stateSource.getUnsafe(destinationTableLocation) != ENTRY_EMPTY_STATE) {
+        while (!isStateEmpty(stateSource.getUnsafe(destinationTableLocation))) {
             destinationTableLocation = nextTableLocation(destinationTableLocation);
         }
         mainKeySource0.set(destinationTableLocation, k0);
@@ -259,8 +263,7 @@ protected int rehashInternalPartial(int entriesToRehash) {
     }
 
     @Override
-    protected void newAlternate() {
-        super.newAlternate();
+    protected void adviseNewAlternate() {
         this.mainKeySource0 = (ImmutableIntArraySource)super.mainKeySources[0];
         this.alternateKeySource0 = (ImmutableIntArraySource)super.alternateKeySources[0];
     }
@@ -274,7 +277,7 @@ protected void clearAlternate() {
     @Override
     protected void migrateFront() {
         int location = 0;
-        while (migrateOneLocation(location++));
+        while (migrateOneLocation(location++) && location < alternateTableSize);
     }
 
     @Override
@@ -298,7 +301,7 @@ protected void rehashInternalFull(final int oldSize) {
         mainCookieSource.setArray(destModifiedCookie);
         for (int sourceBucket = 0; sourceBucket < oldSize; ++sourceBucket) {
             final byte currentStateValue = originalStateArray[sourceBucket];
-            if (currentStateValue == ENTRY_EMPTY_STATE) {
+            if (isStateEmpty(currentStateValue)) {
                 continue;
             }
             final int k0 = originalKeyArray0[sourceBucket];
@@ -306,7 +309,7 @@ protected void rehashInternalFull(final int oldSize) {
             final int firstDestinationTableLocation = hashToTableLocation(hash);
             int destinationTableLocation = firstDestinationTableLocation;
             while (true) {
-                if (destState[destinationTableLocation] == ENTRY_EMPTY_STATE) {
+                if (isStateEmpty(destState[destinationTableLocation])) {
                     destKeyArray0[destinationTableLocation] = k0;
                     destState[destinationTableLocation] = originalStateArray[sourceBucket];
                     destLeftSource[destinationTableLocation] = oldLeftSource[sourceBucket];
diff --git a/engine/table/src/main/java/io/deephaven/engine/table/impl/asofjoin/typed/rightincopen/gen/RightIncrementalAsOfJoinHasherLong.java b/engine/table/src/main/java/io/deephaven/engine/table/impl/asofjoin/typed/rightincopen/gen/RightIncrementalAsOfJoinHasherLong.java
index 6ffb8cf79c8..3233d1ff2d7 100644
--- a/engine/table/src/main/java/io/deephaven/engine/table/impl/asofjoin/typed/rightincopen/gen/RightIncrementalAsOfJoinHasherLong.java
+++ b/engine/table/src/main/java/io/deephaven/engine/table/impl/asofjoin/typed/rightincopen/gen/RightIncrementalAsOfJoinHasherLong.java
@@ -57,12 +57,12 @@ protected void buildFromLeftSide(RowSequence rowSequence, Chunk[] sourceKeyChunk
             int tableLocation = firstTableLocation;
             MAIN_SEARCH: while (true) {
                 byte rowState = stateSource.getUnsafe(tableLocation);
-                if (rowState == ENTRY_EMPTY_STATE) {
+                if (isStateEmpty(rowState)) {
                     final int firstAlternateTableLocation = hashToTableLocationAlternate(hash);
                     int alternateTableLocation = firstAlternateTableLocation;
                     while (alternateTableLocation < rehashPointer) {
                         rowState = alternateStateSource.getUnsafe(alternateTableLocation);
-                        if (rowState == ENTRY_EMPTY_STATE) {
+                        if (isStateEmpty(rowState)) {
                             break;
                         } else if (eq(alternateKeySource0.getUnsafe(alternateTableLocation), k0)) {
                             final long cookie = getCookieAlternate(alternateTableLocation);
@@ -119,12 +119,12 @@ protected void buildFromRightSide(RowSequence rowSequence, Chunk[] sourceKeyChun
             int tableLocation = firstTableLocation;
             MAIN_SEARCH: while (true) {
                 byte rowState = stateSource.getUnsafe(tableLocation);
-                if (rowState == ENTRY_EMPTY_STATE) {
+                if (isStateEmpty(rowState)) {
                     final int firstAlternateTableLocation = hashToTableLocationAlternate(hash);
                     int alternateTableLocation = firstAlternateTableLocation;
                     while (alternateTableLocation < rehashPointer) {
                         rowState = alternateStateSource.getUnsafe(alternateTableLocation);
-                        if (rowState == ENTRY_EMPTY_STATE) {
+                        if (isStateEmpty(rowState)) {
                             break;
                         } else if (eq(alternateKeySource0.getUnsafe(alternateTableLocation), k0)) {
                             final long cookie = getCookieAlternate(alternateTableLocation);
@@ -180,7 +180,7 @@ protected void probeRightSide(RowSequence rowSequence, Chunk[] sourceKeyChunks,
             boolean found = false;
             int tableLocation = firstTableLocation;
             byte rowState;
-            while ((rowState = stateSource.getUnsafe(tableLocation)) != ENTRY_EMPTY_STATE) {
+            while (!isStateEmpty(rowState = stateSource.getUnsafe(tableLocation))) {
                 if (eq(mainKeySource0.getUnsafe(tableLocation), k0)) {
                     if (sequentialBuilders != null) {
                         final long cookie = getCookieMain(tableLocation);
@@ -199,7 +199,7 @@ protected void probeRightSide(RowSequence rowSequence, Chunk[] sourceKeyChunks,
                 final int firstAlternateTableLocation = hashToTableLocationAlternate(hash);
                 if (firstAlternateTableLocation < rehashPointer) {
                     int alternateTableLocation = firstAlternateTableLocation;
-                    while ((rowState = alternateStateSource.getUnsafe(alternateTableLocation)) != ENTRY_EMPTY_STATE) {
+                    while (!isStateEmpty(rowState = alternateStateSource.getUnsafe(alternateTableLocation))) {
                         if (eq(alternateKeySource0.getUnsafe(alternateTableLocation), k0)) {
                             if (sequentialBuilders != null) {
                                 final long cookie = getCookieAlternate(alternateTableLocation);
@@ -223,15 +223,19 @@ private static int hash(long k0) {
         return hash;
     }
 
+    private static boolean isStateEmpty(byte state) {
+        return state == ENTRY_EMPTY_STATE;
+    }
+
     private boolean migrateOneLocation(int locationToMigrate) {
         final byte currentStateValue = alternateStateSource.getUnsafe(locationToMigrate);
-        if (currentStateValue == ENTRY_EMPTY_STATE) {
+        if (isStateEmpty(currentStateValue)) {
             return false;
         }
         final long k0 = alternateKeySource0.getUnsafe(locationToMigrate);
         final int hash = hash(k0);
         int destinationTableLocation = hashToTableLocation(hash);
-        while (stateSource.getUnsafe(destinationTableLocation) != ENTRY_EMPTY_STATE) {
+        while (!isStateEmpty(stateSource.getUnsafe(destinationTableLocation))) {
             destinationTableLocation = nextTableLocation(destinationTableLocation);
         }
         mainKeySource0.set(destinationTableLocation, k0);
@@ -258,8 +262,7 @@ protected int rehashInternalPartial(int entriesToRehash) {
     }
 
     @Override
-    protected void newAlternate() {
-        super.newAlternate();
+    protected void adviseNewAlternate() {
         this.mainKeySource0 = (ImmutableLongArraySource)super.mainKeySources[0];
         this.alternateKeySource0 = (ImmutableLongArraySource)super.alternateKeySources[0];
     }
@@ -273,7 +276,7 @@ protected void clearAlternate() {
     @Override
     protected void migrateFront() {
         int location = 0;
-        while (migrateOneLocation(location++));
+        while (migrateOneLocation(location++) && location < alternateTableSize);
     }
 
     @Override
@@ -297,7 +300,7 @@ protected void rehashInternalFull(final int oldSize) {
         mainCookieSource.setArray(destModifiedCookie);
         for (int sourceBucket = 0; sourceBucket < oldSize; ++sourceBucket) {
             final byte currentStateValue = originalStateArray[sourceBucket];
-            if (currentStateValue == ENTRY_EMPTY_STATE) {
+            if (isStateEmpty(currentStateValue)) {
                 continue;
             }
             final long k0 = originalKeyArray0[sourceBucket];
@@ -305,7 +308,7 @@ protected void rehashInternalFull(final int oldSize) {
             final int firstDestinationTableLocation = hashToTableLocation(hash);
             int destinationTableLocation = firstDestinationTableLocation;
             while (true) {
-                if (destState[destinationTableLocation] == ENTRY_EMPTY_STATE) {
+                if (isStateEmpty(destState[destinationTableLocation])) {
                     destKeyArray0[destinationTableLocation] = k0;
                     destState[destinationTableLocation] = originalStateArray[sourceBucket];
                     destLeftSource[destinationTableLocation] = oldLeftSource[sourceBucket];
diff --git a/engine/table/src/main/java/io/deephaven/engine/table/impl/asofjoin/typed/rightincopen/gen/RightIncrementalAsOfJoinHasherObject.java b/engine/table/src/main/java/io/deephaven/engine/table/impl/asofjoin/typed/rightincopen/gen/RightIncrementalAsOfJoinHasherObject.java
index 1ccc5ff49f5..59106ff8f96 100644
--- a/engine/table/src/main/java/io/deephaven/engine/table/impl/asofjoin/typed/rightincopen/gen/RightIncrementalAsOfJoinHasherObject.java
+++ b/engine/table/src/main/java/io/deephaven/engine/table/impl/asofjoin/typed/rightincopen/gen/RightIncrementalAsOfJoinHasherObject.java
@@ -59,12 +59,12 @@ protected void buildFromLeftSide(RowSequence rowSequence, Chunk[] sourceKeyChunk
             int tableLocation = firstTableLocation;
             MAIN_SEARCH: while (true) {
                 byte rowState = stateSource.getUnsafe(tableLocation);
-                if (rowState == ENTRY_EMPTY_STATE) {
+                if (isStateEmpty(rowState)) {
                     final int firstAlternateTableLocation = hashToTableLocationAlternate(hash);
                     int alternateTableLocation = firstAlternateTableLocation;
                     while (alternateTableLocation < rehashPointer) {
                         rowState = alternateStateSource.getUnsafe(alternateTableLocation);
-                        if (rowState == ENTRY_EMPTY_STATE) {
+                        if (isStateEmpty(rowState)) {
                             break;
                         } else if (eq(alternateKeySource0.getUnsafe(alternateTableLocation), k0)) {
                             final long cookie = getCookieAlternate(alternateTableLocation);
@@ -121,12 +121,12 @@ protected void buildFromRightSide(RowSequence rowSequence, Chunk[] sourceKeyChun
             int tableLocation = firstTableLocation;
             MAIN_SEARCH: while (true) {
                 byte rowState = stateSource.getUnsafe(tableLocation);
-                if (rowState == ENTRY_EMPTY_STATE) {
+                if (isStateEmpty(rowState)) {
                     final int firstAlternateTableLocation = hashToTableLocationAlternate(hash);
                     int alternateTableLocation = firstAlternateTableLocation;
                     while (alternateTableLocation < rehashPointer) {
                         rowState = alternateStateSource.getUnsafe(alternateTableLocation);
-                        if (rowState == ENTRY_EMPTY_STATE) {
+                        if (isStateEmpty(rowState)) {
                             break;
                         } else if (eq(alternateKeySource0.getUnsafe(alternateTableLocation), k0)) {
                             final long cookie = getCookieAlternate(alternateTableLocation);
@@ -182,7 +182,7 @@ protected void probeRightSide(RowSequence rowSequence, Chunk[] sourceKeyChunks,
             boolean found = false;
             int tableLocation = firstTableLocation;
             byte rowState;
-            while ((rowState = stateSource.getUnsafe(tableLocation)) != ENTRY_EMPTY_STATE) {
+            while (!isStateEmpty(rowState = stateSource.getUnsafe(tableLocation))) {
                 if (eq(mainKeySource0.getUnsafe(tableLocation), k0)) {
                     if (sequentialBuilders != null) {
                         final long cookie = getCookieMain(tableLocation);
@@ -201,7 +201,7 @@ protected void probeRightSide(RowSequence rowSequence, Chunk[] sourceKeyChunks,
                 final int firstAlternateTableLocation = hashToTableLocationAlternate(hash);
                 if (firstAlternateTableLocation < rehashPointer) {
                     int alternateTableLocation = firstAlternateTableLocation;
-                    while ((rowState = alternateStateSource.getUnsafe(alternateTableLocation)) != ENTRY_EMPTY_STATE) {
+                    while (!isStateEmpty(rowState = alternateStateSource.getUnsafe(alternateTableLocation))) {
                         if (eq(alternateKeySource0.getUnsafe(alternateTableLocation), k0)) {
                             if (sequentialBuilders != null) {
                                 final long cookie = getCookieAlternate(alternateTableLocation);
@@ -225,15 +225,19 @@ private static int hash(Object k0) {
         return hash;
     }
 
+    private static boolean isStateEmpty(byte state) {
+        return state == ENTRY_EMPTY_STATE;
+    }
+
     private boolean migrateOneLocation(int locationToMigrate) {
         final byte currentStateValue = alternateStateSource.getUnsafe(locationToMigrate);
-        if (currentStateValue == ENTRY_EMPTY_STATE) {
+        if (isStateEmpty(currentStateValue)) {
             return false;
         }
         final Object k0 = alternateKeySource0.getUnsafe(locationToMigrate);
         final int hash = hash(k0);
         int destinationTableLocation = hashToTableLocation(hash);
-        while (stateSource.getUnsafe(destinationTableLocation) != ENTRY_EMPTY_STATE) {
+        while (!isStateEmpty(stateSource.getUnsafe(destinationTableLocation))) {
             destinationTableLocation = nextTableLocation(destinationTableLocation);
         }
         mainKeySource0.set(destinationTableLocation, k0);
@@ -261,8 +265,7 @@ protected int rehashInternalPartial(int entriesToRehash) {
     }
 
     @Override
-    protected void newAlternate() {
-        super.newAlternate();
+    protected void adviseNewAlternate() {
         this.mainKeySource0 = (ImmutableObjectArraySource)super.mainKeySources[0];
         this.alternateKeySource0 = (ImmutableObjectArraySource)super.alternateKeySources[0];
     }
@@ -276,7 +279,7 @@ protected void clearAlternate() {
     @Override
     protected void migrateFront() {
         int location = 0;
-        while (migrateOneLocation(location++));
+        while (migrateOneLocation(location++) && location < alternateTableSize);
     }
 
     @Override
@@ -300,7 +303,7 @@ protected void rehashInternalFull(final int oldSize) {
         mainCookieSource.setArray(destModifiedCookie);
         for (int sourceBucket = 0; sourceBucket < oldSize; ++sourceBucket) {
             final byte currentStateValue = originalStateArray[sourceBucket];
-            if (currentStateValue == ENTRY_EMPTY_STATE) {
+            if (isStateEmpty(currentStateValue)) {
                 continue;
             }
             final Object k0 = originalKeyArray0[sourceBucket];
@@ -308,7 +311,7 @@ protected void rehashInternalFull(final int oldSize) {
             final int firstDestinationTableLocation = hashToTableLocation(hash);
             int destinationTableLocation = firstDestinationTableLocation;
             while (true) {
-                if (destState[destinationTableLocation] == ENTRY_EMPTY_STATE) {
+                if (isStateEmpty(destState[destinationTableLocation])) {
                     destKeyArray0[destinationTableLocation] = k0;
                     destState[destinationTableLocation] = originalStateArray[sourceBucket];
                     destLeftSource[destinationTableLocation] = oldLeftSource[sourceBucket];
diff --git a/engine/table/src/main/java/io/deephaven/engine/table/impl/asofjoin/typed/rightincopen/gen/RightIncrementalAsOfJoinHasherShort.java b/engine/table/src/main/java/io/deephaven/engine/table/impl/asofjoin/typed/rightincopen/gen/RightIncrementalAsOfJoinHasherShort.java
index e577c0c46af..247839f2d30 100644
--- a/engine/table/src/main/java/io/deephaven/engine/table/impl/asofjoin/typed/rightincopen/gen/RightIncrementalAsOfJoinHasherShort.java
+++ b/engine/table/src/main/java/io/deephaven/engine/table/impl/asofjoin/typed/rightincopen/gen/RightIncrementalAsOfJoinHasherShort.java
@@ -58,12 +58,12 @@ protected void buildFromLeftSide(RowSequence rowSequence, Chunk[] sourceKeyChunk
             int tableLocation = firstTableLocation;
             MAIN_SEARCH: while (true) {
                 byte rowState = stateSource.getUnsafe(tableLocation);
-                if (rowState == ENTRY_EMPTY_STATE) {
+                if (isStateEmpty(rowState)) {
                     final int firstAlternateTableLocation = hashToTableLocationAlternate(hash);
                     int alternateTableLocation = firstAlternateTableLocation;
                     while (alternateTableLocation < rehashPointer) {
                         rowState = alternateStateSource.getUnsafe(alternateTableLocation);
-                        if (rowState == ENTRY_EMPTY_STATE) {
+                        if (isStateEmpty(rowState)) {
                             break;
                         } else if (eq(alternateKeySource0.getUnsafe(alternateTableLocation), k0)) {
                             final long cookie = getCookieAlternate(alternateTableLocation);
@@ -120,12 +120,12 @@ protected void buildFromRightSide(RowSequence rowSequence, Chunk[] sourceKeyChun
             int tableLocation = firstTableLocation;
             MAIN_SEARCH: while (true) {
                 byte rowState = stateSource.getUnsafe(tableLocation);
-                if (rowState == ENTRY_EMPTY_STATE) {
+                if (isStateEmpty(rowState)) {
                     final int firstAlternateTableLocation = hashToTableLocationAlternate(hash);
                     int alternateTableLocation = firstAlternateTableLocation;
                     while (alternateTableLocation < rehashPointer) {
                         rowState = alternateStateSource.getUnsafe(alternateTableLocation);
-                        if (rowState == ENTRY_EMPTY_STATE) {
+                        if (isStateEmpty(rowState)) {
                             break;
                         } else if (eq(alternateKeySource0.getUnsafe(alternateTableLocation), k0)) {
                             final long cookie = getCookieAlternate(alternateTableLocation);
@@ -181,7 +181,7 @@ protected void probeRightSide(RowSequence rowSequence, Chunk[] sourceKeyChunks,
             boolean found = false;
             int tableLocation = firstTableLocation;
             byte rowState;
-            while ((rowState = stateSource.getUnsafe(tableLocation)) != ENTRY_EMPTY_STATE) {
+            while (!isStateEmpty(rowState = stateSource.getUnsafe(tableLocation))) {
                 if (eq(mainKeySource0.getUnsafe(tableLocation), k0)) {
                     if (sequentialBuilders != null) {
                         final long cookie = getCookieMain(tableLocation);
@@ -200,7 +200,7 @@ protected void probeRightSide(RowSequence rowSequence, Chunk[] sourceKeyChunks,
                 final int firstAlternateTableLocation = hashToTableLocationAlternate(hash);
                 if (firstAlternateTableLocation < rehashPointer) {
                     int alternateTableLocation = firstAlternateTableLocation;
-                    while ((rowState = alternateStateSource.getUnsafe(alternateTableLocation)) != ENTRY_EMPTY_STATE) {
+                    while (!isStateEmpty(rowState = alternateStateSource.getUnsafe(alternateTableLocation))) {
                         if (eq(alternateKeySource0.getUnsafe(alternateTableLocation), k0)) {
                             if (sequentialBuilders != null) {
                                 final long cookie = getCookieAlternate(alternateTableLocation);
@@ -224,15 +224,19 @@ private static int hash(short k0) {
         return hash;
     }
 
+    private static boolean isStateEmpty(byte state) {
+        return state == ENTRY_EMPTY_STATE;
+    }
+
     private boolean migrateOneLocation(int locationToMigrate) {
         final byte currentStateValue = alternateStateSource.getUnsafe(locationToMigrate);
-        if (currentStateValue == ENTRY_EMPTY_STATE) {
+        if (isStateEmpty(currentStateValue)) {
             return false;
         }
         final short k0 = alternateKeySource0.getUnsafe(locationToMigrate);
         final int hash = hash(k0);
         int destinationTableLocation = hashToTableLocation(hash);
-        while (stateSource.getUnsafe(destinationTableLocation) != ENTRY_EMPTY_STATE) {
+        while (!isStateEmpty(stateSource.getUnsafe(destinationTableLocation))) {
             destinationTableLocation = nextTableLocation(destinationTableLocation);
         }
         mainKeySource0.set(destinationTableLocation, k0);
@@ -259,8 +263,7 @@ protected int rehashInternalPartial(int entriesToRehash) {
     }
 
     @Override
-    protected void newAlternate() {
-        super.newAlternate();
+    protected void adviseNewAlternate() {
         this.mainKeySource0 = (ImmutableShortArraySource)super.mainKeySources[0];
         this.alternateKeySource0 = (ImmutableShortArraySource)super.alternateKeySources[0];
     }
@@ -274,7 +277,7 @@ protected void clearAlternate() {
     @Override
     protected void migrateFront() {
         int location = 0;
-        while (migrateOneLocation(location++));
+        while (migrateOneLocation(location++) && location < alternateTableSize);
     }
 
     @Override
@@ -298,7 +301,7 @@ protected void rehashInternalFull(final int oldSize) {
         mainCookieSource.setArray(destModifiedCookie);
         for (int sourceBucket = 0; sourceBucket < oldSize; ++sourceBucket) {
             final byte currentStateValue = originalStateArray[sourceBucket];
-            if (currentStateValue == ENTRY_EMPTY_STATE) {
+            if (isStateEmpty(currentStateValue)) {
                 continue;
             }
             final short k0 = originalKeyArray0[sourceBucket];
@@ -306,7 +309,7 @@ protected void rehashInternalFull(final int oldSize) {
             final int firstDestinationTableLocation = hashToTableLocation(hash);
             int destinationTableLocation = firstDestinationTableLocation;
             while (true) {
-                if (destState[destinationTableLocation] == ENTRY_EMPTY_STATE) {
+                if (isStateEmpty(destState[destinationTableLocation])) {
                     destKeyArray0[destinationTableLocation] = k0;
                     destState[destinationTableLocation] = originalStateArray[sourceBucket];
                     destLeftSource[destinationTableLocation] = oldLeftSource[sourceBucket];
diff --git a/engine/table/src/main/java/io/deephaven/engine/table/impl/asofjoin/typed/staticopen/gen/StaticAsOfJoinHasherByte.java b/engine/table/src/main/java/io/deephaven/engine/table/impl/asofjoin/typed/staticopen/gen/StaticAsOfJoinHasherByte.java
index c0141c9909a..0e132f748c8 100644
--- a/engine/table/src/main/java/io/deephaven/engine/table/impl/asofjoin/typed/staticopen/gen/StaticAsOfJoinHasherByte.java
+++ b/engine/table/src/main/java/io/deephaven/engine/table/impl/asofjoin/typed/staticopen/gen/StaticAsOfJoinHasherByte.java
@@ -54,7 +54,7 @@ protected void buildFromLeftSide(RowSequence rowSequence, Chunk[] sourceKeyChunk
             int tableLocation = firstTableLocation;
             while (true) {
                 Object rightSideSentinel = rightRowSetSource.getUnsafe(tableLocation);
-                if (rightSideSentinel == EMPTY_RIGHT_STATE) {
+                if (isStateEmpty(rightSideSentinel)) {
                     numEntries++;
                     mainKeySource0.set(tableLocation, k0);
                     addLeftKey(tableLocation, rowKeyChunk.get(chunkPosition));
@@ -82,7 +82,7 @@ protected void buildFromRightSide(RowSequence rowSequence, Chunk[] sourceKeyChun
             int tableLocation = firstTableLocation;
             while (true) {
                 Object rightSideSentinel = rightRowSetSource.getUnsafe(tableLocation);
-                if (rightSideSentinel == EMPTY_RIGHT_STATE) {
+                if (isStateEmpty(rightSideSentinel)) {
                     numEntries++;
                     mainKeySource0.set(tableLocation, k0);
                     addRightKey(tableLocation, rowKeyChunk.get(chunkPosition));
@@ -109,7 +109,7 @@ protected void decorateLeftSide(RowSequence rowSequence, Chunk[] sourceKeyChunks
             final int hash = hash(k0);
             final int firstTableLocation = hashToTableLocation(hash);
             int tableLocation = firstTableLocation;
-            while (rightRowSetSource.getUnsafe(tableLocation) != EMPTY_RIGHT_STATE) {
+            while (!isStateEmpty(rightRowSetSource.getUnsafe(tableLocation))) {
                 if (eq(mainKeySource0.getUnsafe(tableLocation), k0)) {
                     final long indexKey = rowKeyChunk.get(chunkPosition);
                     if (addLeftKey(tableLocation, indexKey) && hashSlots != null) {
@@ -133,7 +133,7 @@ protected void decorateWithRightSide(RowSequence rowSequence, Chunk[] sourceKeyC
             final int hash = hash(k0);
             final int firstTableLocation = hashToTableLocation(hash);
             int tableLocation = firstTableLocation;
-            while (rightRowSetSource.getUnsafe(tableLocation) != EMPTY_RIGHT_STATE) {
+            while (!isStateEmpty(rightRowSetSource.getUnsafe(tableLocation))) {
                 if (eq(mainKeySource0.getUnsafe(tableLocation), k0)) {
                     addRightKey(tableLocation, rowKeyChunk.get(chunkPosition));
                     break;
@@ -149,6 +149,10 @@ private static int hash(byte k0) {
         return hash;
     }
 
+    private static boolean isStateEmpty(Object state) {
+        return state == EMPTY_RIGHT_STATE;
+    }
+
     @Override
     protected void rehashInternalFull(final int oldSize) {
         final byte[] destKeyArray0 = new byte[tableSize];
@@ -163,7 +167,7 @@ protected void rehashInternalFull(final int oldSize) {
         leftRowSetSource.setArray(destLeftState);
         for (int sourceBucket = 0; sourceBucket < oldSize; ++sourceBucket) {
             final Object currentStateValue = (Object)originalStateArray[sourceBucket];
-            if (currentStateValue == EMPTY_RIGHT_STATE) {
+            if (isStateEmpty(currentStateValue)) {
                 continue;
             }
             final byte k0 = originalKeyArray0[sourceBucket];
@@ -171,7 +175,7 @@ protected void rehashInternalFull(final int oldSize) {
             final int firstDestinationTableLocation = hashToTableLocation(hash);
             int destinationTableLocation = firstDestinationTableLocation;
             while (true) {
-                if (destState[destinationTableLocation] == EMPTY_RIGHT_STATE) {
+                if (isStateEmpty((Object)destState[destinationTableLocation])) {
                     destKeyArray0[destinationTableLocation] = k0;
                     destState[destinationTableLocation] = originalStateArray[sourceBucket];
                     destLeftState[destinationTableLocation] = oldLeftState[sourceBucket];
diff --git a/engine/table/src/main/java/io/deephaven/engine/table/impl/asofjoin/typed/staticopen/gen/StaticAsOfJoinHasherChar.java b/engine/table/src/main/java/io/deephaven/engine/table/impl/asofjoin/typed/staticopen/gen/StaticAsOfJoinHasherChar.java
index ff18cbdd395..ee1cbac9425 100644
--- a/engine/table/src/main/java/io/deephaven/engine/table/impl/asofjoin/typed/staticopen/gen/StaticAsOfJoinHasherChar.java
+++ b/engine/table/src/main/java/io/deephaven/engine/table/impl/asofjoin/typed/staticopen/gen/StaticAsOfJoinHasherChar.java
@@ -54,7 +54,7 @@ protected void buildFromLeftSide(RowSequence rowSequence, Chunk[] sourceKeyChunk
             int tableLocation = firstTableLocation;
             while (true) {
                 Object rightSideSentinel = rightRowSetSource.getUnsafe(tableLocation);
-                if (rightSideSentinel == EMPTY_RIGHT_STATE) {
+                if (isStateEmpty(rightSideSentinel)) {
                     numEntries++;
                     mainKeySource0.set(tableLocation, k0);
                     addLeftKey(tableLocation, rowKeyChunk.get(chunkPosition));
@@ -82,7 +82,7 @@ protected void buildFromRightSide(RowSequence rowSequence, Chunk[] sourceKeyChun
             int tableLocation = firstTableLocation;
             while (true) {
                 Object rightSideSentinel = rightRowSetSource.getUnsafe(tableLocation);
-                if (rightSideSentinel == EMPTY_RIGHT_STATE) {
+                if (isStateEmpty(rightSideSentinel)) {
                     numEntries++;
                     mainKeySource0.set(tableLocation, k0);
                     addRightKey(tableLocation, rowKeyChunk.get(chunkPosition));
@@ -109,7 +109,7 @@ protected void decorateLeftSide(RowSequence rowSequence, Chunk[] sourceKeyChunks
             final int hash = hash(k0);
             final int firstTableLocation = hashToTableLocation(hash);
             int tableLocation = firstTableLocation;
-            while (rightRowSetSource.getUnsafe(tableLocation) != EMPTY_RIGHT_STATE) {
+            while (!isStateEmpty(rightRowSetSource.getUnsafe(tableLocation))) {
                 if (eq(mainKeySource0.getUnsafe(tableLocation), k0)) {
                     final long indexKey = rowKeyChunk.get(chunkPosition);
                     if (addLeftKey(tableLocation, indexKey) && hashSlots != null) {
@@ -133,7 +133,7 @@ protected void decorateWithRightSide(RowSequence rowSequence, Chunk[] sourceKeyC
             final int hash = hash(k0);
             final int firstTableLocation = hashToTableLocation(hash);
             int tableLocation = firstTableLocation;
-            while (rightRowSetSource.getUnsafe(tableLocation) != EMPTY_RIGHT_STATE) {
+            while (!isStateEmpty(rightRowSetSource.getUnsafe(tableLocation))) {
                 if (eq(mainKeySource0.getUnsafe(tableLocation), k0)) {
                     addRightKey(tableLocation, rowKeyChunk.get(chunkPosition));
                     break;
@@ -149,6 +149,10 @@ private static int hash(char k0) {
         return hash;
     }
 
+    private static boolean isStateEmpty(Object state) {
+        return state == EMPTY_RIGHT_STATE;
+    }
+
     @Override
     protected void rehashInternalFull(final int oldSize) {
         final char[] destKeyArray0 = new char[tableSize];
@@ -163,7 +167,7 @@ protected void rehashInternalFull(final int oldSize) {
         leftRowSetSource.setArray(destLeftState);
         for (int sourceBucket = 0; sourceBucket < oldSize; ++sourceBucket) {
             final Object currentStateValue = (Object)originalStateArray[sourceBucket];
-            if (currentStateValue == EMPTY_RIGHT_STATE) {
+            if (isStateEmpty(currentStateValue)) {
                 continue;
             }
             final char k0 = originalKeyArray0[sourceBucket];
@@ -171,7 +175,7 @@ protected void rehashInternalFull(final int oldSize) {
             final int firstDestinationTableLocation = hashToTableLocation(hash);
             int destinationTableLocation = firstDestinationTableLocation;
             while (true) {
-                if (destState[destinationTableLocation] == EMPTY_RIGHT_STATE) {
+                if (isStateEmpty((Object)destState[destinationTableLocation])) {
                     destKeyArray0[destinationTableLocation] = k0;
                     destState[destinationTableLocation] = originalStateArray[sourceBucket];
                     destLeftState[destinationTableLocation] = oldLeftState[sourceBucket];
diff --git a/engine/table/src/main/java/io/deephaven/engine/table/impl/asofjoin/typed/staticopen/gen/StaticAsOfJoinHasherDouble.java b/engine/table/src/main/java/io/deephaven/engine/table/impl/asofjoin/typed/staticopen/gen/StaticAsOfJoinHasherDouble.java
index d005424db90..8c0bccc7e3a 100644
--- a/engine/table/src/main/java/io/deephaven/engine/table/impl/asofjoin/typed/staticopen/gen/StaticAsOfJoinHasherDouble.java
+++ b/engine/table/src/main/java/io/deephaven/engine/table/impl/asofjoin/typed/staticopen/gen/StaticAsOfJoinHasherDouble.java
@@ -54,7 +54,7 @@ protected void buildFromLeftSide(RowSequence rowSequence, Chunk[] sourceKeyChunk
             int tableLocation = firstTableLocation;
             while (true) {
                 Object rightSideSentinel = rightRowSetSource.getUnsafe(tableLocation);
-                if (rightSideSentinel == EMPTY_RIGHT_STATE) {
+                if (isStateEmpty(rightSideSentinel)) {
                     numEntries++;
                     mainKeySource0.set(tableLocation, k0);
                     addLeftKey(tableLocation, rowKeyChunk.get(chunkPosition));
@@ -82,7 +82,7 @@ protected void buildFromRightSide(RowSequence rowSequence, Chunk[] sourceKeyChun
             int tableLocation = firstTableLocation;
             while (true) {
                 Object rightSideSentinel = rightRowSetSource.getUnsafe(tableLocation);
-                if (rightSideSentinel == EMPTY_RIGHT_STATE) {
+                if (isStateEmpty(rightSideSentinel)) {
                     numEntries++;
                     mainKeySource0.set(tableLocation, k0);
                     addRightKey(tableLocation, rowKeyChunk.get(chunkPosition));
@@ -109,7 +109,7 @@ protected void decorateLeftSide(RowSequence rowSequence, Chunk[] sourceKeyChunks
             final int hash = hash(k0);
             final int firstTableLocation = hashToTableLocation(hash);
             int tableLocation = firstTableLocation;
-            while (rightRowSetSource.getUnsafe(tableLocation) != EMPTY_RIGHT_STATE) {
+            while (!isStateEmpty(rightRowSetSource.getUnsafe(tableLocation))) {
                 if (eq(mainKeySource0.getUnsafe(tableLocation), k0)) {
                     final long indexKey = rowKeyChunk.get(chunkPosition);
                     if (addLeftKey(tableLocation, indexKey) && hashSlots != null) {
@@ -133,7 +133,7 @@ protected void decorateWithRightSide(RowSequence rowSequence, Chunk[] sourceKeyC
             final int hash = hash(k0);
             final int firstTableLocation = hashToTableLocation(hash);
             int tableLocation = firstTableLocation;
-            while (rightRowSetSource.getUnsafe(tableLocation) != EMPTY_RIGHT_STATE) {
+            while (!isStateEmpty(rightRowSetSource.getUnsafe(tableLocation))) {
                 if (eq(mainKeySource0.getUnsafe(tableLocation), k0)) {
                     addRightKey(tableLocation, rowKeyChunk.get(chunkPosition));
                     break;
@@ -149,6 +149,10 @@ private static int hash(double k0) {
         return hash;
     }
 
+    private static boolean isStateEmpty(Object state) {
+        return state == EMPTY_RIGHT_STATE;
+    }
+
     @Override
     protected void rehashInternalFull(final int oldSize) {
         final double[] destKeyArray0 = new double[tableSize];
@@ -163,7 +167,7 @@ protected void rehashInternalFull(final int oldSize) {
         leftRowSetSource.setArray(destLeftState);
         for (int sourceBucket = 0; sourceBucket < oldSize; ++sourceBucket) {
             final Object currentStateValue = (Object)originalStateArray[sourceBucket];
-            if (currentStateValue == EMPTY_RIGHT_STATE) {
+            if (isStateEmpty(currentStateValue)) {
                 continue;
             }
             final double k0 = originalKeyArray0[sourceBucket];
@@ -171,7 +175,7 @@ protected void rehashInternalFull(final int oldSize) {
             final int firstDestinationTableLocation = hashToTableLocation(hash);
             int destinationTableLocation = firstDestinationTableLocation;
             while (true) {
-                if (destState[destinationTableLocation] == EMPTY_RIGHT_STATE) {
+                if (isStateEmpty((Object)destState[destinationTableLocation])) {
                     destKeyArray0[destinationTableLocation] = k0;
                     destState[destinationTableLocation] = originalStateArray[sourceBucket];
                     destLeftState[destinationTableLocation] = oldLeftState[sourceBucket];
diff --git a/engine/table/src/main/java/io/deephaven/engine/table/impl/asofjoin/typed/staticopen/gen/StaticAsOfJoinHasherFloat.java b/engine/table/src/main/java/io/deephaven/engine/table/impl/asofjoin/typed/staticopen/gen/StaticAsOfJoinHasherFloat.java
index fae4351fae3..d3097a156dc 100644
--- a/engine/table/src/main/java/io/deephaven/engine/table/impl/asofjoin/typed/staticopen/gen/StaticAsOfJoinHasherFloat.java
+++ b/engine/table/src/main/java/io/deephaven/engine/table/impl/asofjoin/typed/staticopen/gen/StaticAsOfJoinHasherFloat.java
@@ -54,7 +54,7 @@ protected void buildFromLeftSide(RowSequence rowSequence, Chunk[] sourceKeyChunk
             int tableLocation = firstTableLocation;
             while (true) {
                 Object rightSideSentinel = rightRowSetSource.getUnsafe(tableLocation);
-                if (rightSideSentinel == EMPTY_RIGHT_STATE) {
+                if (isStateEmpty(rightSideSentinel)) {
                     numEntries++;
                     mainKeySource0.set(tableLocation, k0);
                     addLeftKey(tableLocation, rowKeyChunk.get(chunkPosition));
@@ -82,7 +82,7 @@ protected void buildFromRightSide(RowSequence rowSequence, Chunk[] sourceKeyChun
             int tableLocation = firstTableLocation;
             while (true) {
                 Object rightSideSentinel = rightRowSetSource.getUnsafe(tableLocation);
-                if (rightSideSentinel == EMPTY_RIGHT_STATE) {
+                if (isStateEmpty(rightSideSentinel)) {
                     numEntries++;
                     mainKeySource0.set(tableLocation, k0);
                     addRightKey(tableLocation, rowKeyChunk.get(chunkPosition));
@@ -109,7 +109,7 @@ protected void decorateLeftSide(RowSequence rowSequence, Chunk[] sourceKeyChunks
             final int hash = hash(k0);
             final int firstTableLocation = hashToTableLocation(hash);
             int tableLocation = firstTableLocation;
-            while (rightRowSetSource.getUnsafe(tableLocation) != EMPTY_RIGHT_STATE) {
+            while (!isStateEmpty(rightRowSetSource.getUnsafe(tableLocation))) {
                 if (eq(mainKeySource0.getUnsafe(tableLocation), k0)) {
                     final long indexKey = rowKeyChunk.get(chunkPosition);
                     if (addLeftKey(tableLocation, indexKey) && hashSlots != null) {
@@ -133,7 +133,7 @@ protected void decorateWithRightSide(RowSequence rowSequence, Chunk[] sourceKeyC
             final int hash = hash(k0);
             final int firstTableLocation = hashToTableLocation(hash);
             int tableLocation = firstTableLocation;
-            while (rightRowSetSource.getUnsafe(tableLocation) != EMPTY_RIGHT_STATE) {
+            while (!isStateEmpty(rightRowSetSource.getUnsafe(tableLocation))) {
                 if (eq(mainKeySource0.getUnsafe(tableLocation), k0)) {
                     addRightKey(tableLocation, rowKeyChunk.get(chunkPosition));
                     break;
@@ -149,6 +149,10 @@ private static int hash(float k0) {
         return hash;
     }
 
+    private static boolean isStateEmpty(Object state) {
+        return state == EMPTY_RIGHT_STATE;
+    }
+
     @Override
     protected void rehashInternalFull(final int oldSize) {
         final float[] destKeyArray0 = new float[tableSize];
@@ -163,7 +167,7 @@ protected void rehashInternalFull(final int oldSize) {
         leftRowSetSource.setArray(destLeftState);
         for (int sourceBucket = 0; sourceBucket < oldSize; ++sourceBucket) {
             final Object currentStateValue = (Object)originalStateArray[sourceBucket];
-            if (currentStateValue == EMPTY_RIGHT_STATE) {
+            if (isStateEmpty(currentStateValue)) {
                 continue;
             }
             final float k0 = originalKeyArray0[sourceBucket];
@@ -171,7 +175,7 @@ protected void rehashInternalFull(final int oldSize) {
             final int firstDestinationTableLocation = hashToTableLocation(hash);
             int destinationTableLocation = firstDestinationTableLocation;
             while (true) {
-                if (destState[destinationTableLocation] == EMPTY_RIGHT_STATE) {
+                if (isStateEmpty((Object)destState[destinationTableLocation])) {
                     destKeyArray0[destinationTableLocation] = k0;
                     destState[destinationTableLocation] = originalStateArray[sourceBucket];
                     destLeftState[destinationTableLocation] = oldLeftState[sourceBucket];
diff --git a/engine/table/src/main/java/io/deephaven/engine/table/impl/asofjoin/typed/staticopen/gen/StaticAsOfJoinHasherInt.java b/engine/table/src/main/java/io/deephaven/engine/table/impl/asofjoin/typed/staticopen/gen/StaticAsOfJoinHasherInt.java
index 88f0a26f688..4faf3a9fa3a 100644
--- a/engine/table/src/main/java/io/deephaven/engine/table/impl/asofjoin/typed/staticopen/gen/StaticAsOfJoinHasherInt.java
+++ b/engine/table/src/main/java/io/deephaven/engine/table/impl/asofjoin/typed/staticopen/gen/StaticAsOfJoinHasherInt.java
@@ -54,7 +54,7 @@ protected void buildFromLeftSide(RowSequence rowSequence, Chunk[] sourceKeyChunk
             int tableLocation = firstTableLocation;
             while (true) {
                 Object rightSideSentinel = rightRowSetSource.getUnsafe(tableLocation);
-                if (rightSideSentinel == EMPTY_RIGHT_STATE) {
+                if (isStateEmpty(rightSideSentinel)) {
                     numEntries++;
                     mainKeySource0.set(tableLocation, k0);
                     addLeftKey(tableLocation, rowKeyChunk.get(chunkPosition));
@@ -82,7 +82,7 @@ protected void buildFromRightSide(RowSequence rowSequence, Chunk[] sourceKeyChun
             int tableLocation = firstTableLocation;
             while (true) {
                 Object rightSideSentinel = rightRowSetSource.getUnsafe(tableLocation);
-                if (rightSideSentinel == EMPTY_RIGHT_STATE) {
+                if (isStateEmpty(rightSideSentinel)) {
                     numEntries++;
                     mainKeySource0.set(tableLocation, k0);
                     addRightKey(tableLocation, rowKeyChunk.get(chunkPosition));
@@ -109,7 +109,7 @@ protected void decorateLeftSide(RowSequence rowSequence, Chunk[] sourceKeyChunks
             final int hash = hash(k0);
             final int firstTableLocation = hashToTableLocation(hash);
             int tableLocation = firstTableLocation;
-            while (rightRowSetSource.getUnsafe(tableLocation) != EMPTY_RIGHT_STATE) {
+            while (!isStateEmpty(rightRowSetSource.getUnsafe(tableLocation))) {
                 if (eq(mainKeySource0.getUnsafe(tableLocation), k0)) {
                     final long indexKey = rowKeyChunk.get(chunkPosition);
                     if (addLeftKey(tableLocation, indexKey) && hashSlots != null) {
@@ -133,7 +133,7 @@ protected void decorateWithRightSide(RowSequence rowSequence, Chunk[] sourceKeyC
             final int hash = hash(k0);
             final int firstTableLocation = hashToTableLocation(hash);
             int tableLocation = firstTableLocation;
-            while (rightRowSetSource.getUnsafe(tableLocation) != EMPTY_RIGHT_STATE) {
+            while (!isStateEmpty(rightRowSetSource.getUnsafe(tableLocation))) {
                 if (eq(mainKeySource0.getUnsafe(tableLocation), k0)) {
                     addRightKey(tableLocation, rowKeyChunk.get(chunkPosition));
                     break;
@@ -149,6 +149,10 @@ private static int hash(int k0) {
         return hash;
     }
 
+    private static boolean isStateEmpty(Object state) {
+        return state == EMPTY_RIGHT_STATE;
+    }
+
     @Override
     protected void rehashInternalFull(final int oldSize) {
         final int[] destKeyArray0 = new int[tableSize];
@@ -163,7 +167,7 @@ protected void rehashInternalFull(final int oldSize) {
         leftRowSetSource.setArray(destLeftState);
         for (int sourceBucket = 0; sourceBucket < oldSize; ++sourceBucket) {
             final Object currentStateValue = (Object)originalStateArray[sourceBucket];
-            if (currentStateValue == EMPTY_RIGHT_STATE) {
+            if (isStateEmpty(currentStateValue)) {
                 continue;
             }
             final int k0 = originalKeyArray0[sourceBucket];
@@ -171,7 +175,7 @@ protected void rehashInternalFull(final int oldSize) {
             final int firstDestinationTableLocation = hashToTableLocation(hash);
             int destinationTableLocation = firstDestinationTableLocation;
             while (true) {
-                if (destState[destinationTableLocation] == EMPTY_RIGHT_STATE) {
+                if (isStateEmpty((Object)destState[destinationTableLocation])) {
                     destKeyArray0[destinationTableLocation] = k0;
                     destState[destinationTableLocation] = originalStateArray[sourceBucket];
                     destLeftState[destinationTableLocation] = oldLeftState[sourceBucket];
diff --git a/engine/table/src/main/java/io/deephaven/engine/table/impl/asofjoin/typed/staticopen/gen/StaticAsOfJoinHasherLong.java b/engine/table/src/main/java/io/deephaven/engine/table/impl/asofjoin/typed/staticopen/gen/StaticAsOfJoinHasherLong.java
index afbca5f08c2..eb8d76071c6 100644
--- a/engine/table/src/main/java/io/deephaven/engine/table/impl/asofjoin/typed/staticopen/gen/StaticAsOfJoinHasherLong.java
+++ b/engine/table/src/main/java/io/deephaven/engine/table/impl/asofjoin/typed/staticopen/gen/StaticAsOfJoinHasherLong.java
@@ -53,7 +53,7 @@ protected void buildFromLeftSide(RowSequence rowSequence, Chunk[] sourceKeyChunk
             int tableLocation = firstTableLocation;
             while (true) {
                 Object rightSideSentinel = rightRowSetSource.getUnsafe(tableLocation);
-                if (rightSideSentinel == EMPTY_RIGHT_STATE) {
+                if (isStateEmpty(rightSideSentinel)) {
                     numEntries++;
                     mainKeySource0.set(tableLocation, k0);
                     addLeftKey(tableLocation, rowKeyChunk.get(chunkPosition));
@@ -81,7 +81,7 @@ protected void buildFromRightSide(RowSequence rowSequence, Chunk[] sourceKeyChun
             int tableLocation = firstTableLocation;
             while (true) {
                 Object rightSideSentinel = rightRowSetSource.getUnsafe(tableLocation);
-                if (rightSideSentinel == EMPTY_RIGHT_STATE) {
+                if (isStateEmpty(rightSideSentinel)) {
                     numEntries++;
                     mainKeySource0.set(tableLocation, k0);
                     addRightKey(tableLocation, rowKeyChunk.get(chunkPosition));
@@ -108,7 +108,7 @@ protected void decorateLeftSide(RowSequence rowSequence, Chunk[] sourceKeyChunks
             final int hash = hash(k0);
             final int firstTableLocation = hashToTableLocation(hash);
             int tableLocation = firstTableLocation;
-            while (rightRowSetSource.getUnsafe(tableLocation) != EMPTY_RIGHT_STATE) {
+            while (!isStateEmpty(rightRowSetSource.getUnsafe(tableLocation))) {
                 if (eq(mainKeySource0.getUnsafe(tableLocation), k0)) {
                     final long indexKey = rowKeyChunk.get(chunkPosition);
                     if (addLeftKey(tableLocation, indexKey) && hashSlots != null) {
@@ -132,7 +132,7 @@ protected void decorateWithRightSide(RowSequence rowSequence, Chunk[] sourceKeyC
             final int hash = hash(k0);
             final int firstTableLocation = hashToTableLocation(hash);
             int tableLocation = firstTableLocation;
-            while (rightRowSetSource.getUnsafe(tableLocation) != EMPTY_RIGHT_STATE) {
+            while (!isStateEmpty(rightRowSetSource.getUnsafe(tableLocation))) {
                 if (eq(mainKeySource0.getUnsafe(tableLocation), k0)) {
                     addRightKey(tableLocation, rowKeyChunk.get(chunkPosition));
                     break;
@@ -148,6 +148,10 @@ private static int hash(long k0) {
         return hash;
     }
 
+    private static boolean isStateEmpty(Object state) {
+        return state == EMPTY_RIGHT_STATE;
+    }
+
     @Override
     protected void rehashInternalFull(final int oldSize) {
         final long[] destKeyArray0 = new long[tableSize];
@@ -162,7 +166,7 @@ protected void rehashInternalFull(final int oldSize) {
         leftRowSetSource.setArray(destLeftState);
         for (int sourceBucket = 0; sourceBucket < oldSize; ++sourceBucket) {
             final Object currentStateValue = (Object)originalStateArray[sourceBucket];
-            if (currentStateValue == EMPTY_RIGHT_STATE) {
+            if (isStateEmpty(currentStateValue)) {
                 continue;
             }
             final long k0 = originalKeyArray0[sourceBucket];
@@ -170,7 +174,7 @@ protected void rehashInternalFull(final int oldSize) {
             final int firstDestinationTableLocation = hashToTableLocation(hash);
             int destinationTableLocation = firstDestinationTableLocation;
             while (true) {
-                if (destState[destinationTableLocation] == EMPTY_RIGHT_STATE) {
+                if (isStateEmpty((Object)destState[destinationTableLocation])) {
                     destKeyArray0[destinationTableLocation] = k0;
                     destState[destinationTableLocation] = originalStateArray[sourceBucket];
                     destLeftState[destinationTableLocation] = oldLeftState[sourceBucket];
diff --git a/engine/table/src/main/java/io/deephaven/engine/table/impl/asofjoin/typed/staticopen/gen/StaticAsOfJoinHasherObject.java b/engine/table/src/main/java/io/deephaven/engine/table/impl/asofjoin/typed/staticopen/gen/StaticAsOfJoinHasherObject.java
index 799e554dcff..6fb80e64345 100644
--- a/engine/table/src/main/java/io/deephaven/engine/table/impl/asofjoin/typed/staticopen/gen/StaticAsOfJoinHasherObject.java
+++ b/engine/table/src/main/java/io/deephaven/engine/table/impl/asofjoin/typed/staticopen/gen/StaticAsOfJoinHasherObject.java
@@ -54,7 +54,7 @@ protected void buildFromLeftSide(RowSequence rowSequence, Chunk[] sourceKeyChunk
             int tableLocation = firstTableLocation;
             while (true) {
                 Object rightSideSentinel = rightRowSetSource.getUnsafe(tableLocation);
-                if (rightSideSentinel == EMPTY_RIGHT_STATE) {
+                if (isStateEmpty(rightSideSentinel)) {
                     numEntries++;
                     mainKeySource0.set(tableLocation, k0);
                     addLeftKey(tableLocation, rowKeyChunk.get(chunkPosition));
@@ -82,7 +82,7 @@ protected void buildFromRightSide(RowSequence rowSequence, Chunk[] sourceKeyChun
             int tableLocation = firstTableLocation;
             while (true) {
                 Object rightSideSentinel = rightRowSetSource.getUnsafe(tableLocation);
-                if (rightSideSentinel == EMPTY_RIGHT_STATE) {
+                if (isStateEmpty(rightSideSentinel)) {
                     numEntries++;
                     mainKeySource0.set(tableLocation, k0);
                     addRightKey(tableLocation, rowKeyChunk.get(chunkPosition));
@@ -109,7 +109,7 @@ protected void decorateLeftSide(RowSequence rowSequence, Chunk[] sourceKeyChunks
             final int hash = hash(k0);
             final int firstTableLocation = hashToTableLocation(hash);
             int tableLocation = firstTableLocation;
-            while (rightRowSetSource.getUnsafe(tableLocation) != EMPTY_RIGHT_STATE) {
+            while (!isStateEmpty(rightRowSetSource.getUnsafe(tableLocation))) {
                 if (eq(mainKeySource0.getUnsafe(tableLocation), k0)) {
                     final long indexKey = rowKeyChunk.get(chunkPosition);
                     if (addLeftKey(tableLocation, indexKey) && hashSlots != null) {
@@ -133,7 +133,7 @@ protected void decorateWithRightSide(RowSequence rowSequence, Chunk[] sourceKeyC
             final int hash = hash(k0);
             final int firstTableLocation = hashToTableLocation(hash);
             int tableLocation = firstTableLocation;
-            while (rightRowSetSource.getUnsafe(tableLocation) != EMPTY_RIGHT_STATE) {
+            while (!isStateEmpty(rightRowSetSource.getUnsafe(tableLocation))) {
                 if (eq(mainKeySource0.getUnsafe(tableLocation), k0)) {
                     addRightKey(tableLocation, rowKeyChunk.get(chunkPosition));
                     break;
@@ -149,6 +149,10 @@ private static int hash(Object k0) {
         return hash;
     }
 
+    private static boolean isStateEmpty(Object state) {
+        return state == EMPTY_RIGHT_STATE;
+    }
+
     @Override
     protected void rehashInternalFull(final int oldSize) {
         final Object[] destKeyArray0 = new Object[tableSize];
@@ -163,7 +167,7 @@ protected void rehashInternalFull(final int oldSize) {
         leftRowSetSource.setArray(destLeftState);
         for (int sourceBucket = 0; sourceBucket < oldSize; ++sourceBucket) {
             final Object currentStateValue = (Object)originalStateArray[sourceBucket];
-            if (currentStateValue == EMPTY_RIGHT_STATE) {
+            if (isStateEmpty(currentStateValue)) {
                 continue;
             }
             final Object k0 = originalKeyArray0[sourceBucket];
@@ -171,7 +175,7 @@ protected void rehashInternalFull(final int oldSize) {
             final int firstDestinationTableLocation = hashToTableLocation(hash);
             int destinationTableLocation = firstDestinationTableLocation;
             while (true) {
-                if (destState[destinationTableLocation] == EMPTY_RIGHT_STATE) {
+                if (isStateEmpty((Object)destState[destinationTableLocation])) {
                     destKeyArray0[destinationTableLocation] = k0;
                     destState[destinationTableLocation] = originalStateArray[sourceBucket];
                     destLeftState[destinationTableLocation] = oldLeftState[sourceBucket];
diff --git a/engine/table/src/main/java/io/deephaven/engine/table/impl/asofjoin/typed/staticopen/gen/StaticAsOfJoinHasherShort.java b/engine/table/src/main/java/io/deephaven/engine/table/impl/asofjoin/typed/staticopen/gen/StaticAsOfJoinHasherShort.java
index ad858546fdb..8e7e0c11541 100644
--- a/engine/table/src/main/java/io/deephaven/engine/table/impl/asofjoin/typed/staticopen/gen/StaticAsOfJoinHasherShort.java
+++ b/engine/table/src/main/java/io/deephaven/engine/table/impl/asofjoin/typed/staticopen/gen/StaticAsOfJoinHasherShort.java
@@ -54,7 +54,7 @@ protected void buildFromLeftSide(RowSequence rowSequence, Chunk[] sourceKeyChunk
             int tableLocation = firstTableLocation;
             while (true) {
                 Object rightSideSentinel = rightRowSetSource.getUnsafe(tableLocation);
-                if (rightSideSentinel == EMPTY_RIGHT_STATE) {
+                if (isStateEmpty(rightSideSentinel)) {
                     numEntries++;
                     mainKeySource0.set(tableLocation, k0);
                     addLeftKey(tableLocation, rowKeyChunk.get(chunkPosition));
@@ -82,7 +82,7 @@ protected void buildFromRightSide(RowSequence rowSequence, Chunk[] sourceKeyChun
             int tableLocation = firstTableLocation;
             while (true) {
                 Object rightSideSentinel = rightRowSetSource.getUnsafe(tableLocation);
-                if (rightSideSentinel == EMPTY_RIGHT_STATE) {
+                if (isStateEmpty(rightSideSentinel)) {
                     numEntries++;
                     mainKeySource0.set(tableLocation, k0);
                     addRightKey(tableLocation, rowKeyChunk.get(chunkPosition));
@@ -109,7 +109,7 @@ protected void decorateLeftSide(RowSequence rowSequence, Chunk[] sourceKeyChunks
             final int hash = hash(k0);
             final int firstTableLocation = hashToTableLocation(hash);
             int tableLocation = firstTableLocation;
-            while (rightRowSetSource.getUnsafe(tableLocation) != EMPTY_RIGHT_STATE) {
+            while (!isStateEmpty(rightRowSetSource.getUnsafe(tableLocation))) {
                 if (eq(mainKeySource0.getUnsafe(tableLocation), k0)) {
                     final long indexKey = rowKeyChunk.get(chunkPosition);
                     if (addLeftKey(tableLocation, indexKey) && hashSlots != null) {
@@ -133,7 +133,7 @@ protected void decorateWithRightSide(RowSequence rowSequence, Chunk[] sourceKeyC
             final int hash = hash(k0);
             final int firstTableLocation = hashToTableLocation(hash);
             int tableLocation = firstTableLocation;
-            while (rightRowSetSource.getUnsafe(tableLocation) != EMPTY_RIGHT_STATE) {
+            while (!isStateEmpty(rightRowSetSource.getUnsafe(tableLocation))) {
                 if (eq(mainKeySource0.getUnsafe(tableLocation), k0)) {
                     addRightKey(tableLocation, rowKeyChunk.get(chunkPosition));
                     break;
@@ -149,6 +149,10 @@ private static int hash(short k0) {
         return hash;
     }
 
+    private static boolean isStateEmpty(Object state) {
+        return state == EMPTY_RIGHT_STATE;
+    }
+
     @Override
     protected void rehashInternalFull(final int oldSize) {
         final short[] destKeyArray0 = new short[tableSize];
@@ -163,7 +167,7 @@ protected void rehashInternalFull(final int oldSize) {
         leftRowSetSource.setArray(destLeftState);
         for (int sourceBucket = 0; sourceBucket < oldSize; ++sourceBucket) {
             final Object currentStateValue = (Object)originalStateArray[sourceBucket];
-            if (currentStateValue == EMPTY_RIGHT_STATE) {
+            if (isStateEmpty(currentStateValue)) {
                 continue;
             }
             final short k0 = originalKeyArray0[sourceBucket];
@@ -171,7 +175,7 @@ protected void rehashInternalFull(final int oldSize) {
             final int firstDestinationTableLocation = hashToTableLocation(hash);
             int destinationTableLocation = firstDestinationTableLocation;
             while (true) {
-                if (destState[destinationTableLocation] == EMPTY_RIGHT_STATE) {
+                if (isStateEmpty((Object)destState[destinationTableLocation])) {
                     destKeyArray0[destinationTableLocation] = k0;
                     destState[destinationTableLocation] = originalStateArray[sourceBucket];
                     destLeftState[destinationTableLocation] = oldLeftState[sourceBucket];
diff --git a/engine/table/src/main/java/io/deephaven/engine/table/impl/by/AggregationProcessor.java b/engine/table/src/main/java/io/deephaven/engine/table/impl/by/AggregationProcessor.java
index 7bf2a38008f..41b49a74c70 100644
--- a/engine/table/src/main/java/io/deephaven/engine/table/impl/by/AggregationProcessor.java
+++ b/engine/table/src/main/java/io/deephaven/engine/table/impl/by/AggregationProcessor.java
@@ -3,9 +3,7 @@
 //
 package io.deephaven.engine.table.impl.by;
 
-import io.deephaven.api.ColumnName;
-import io.deephaven.api.Pair;
-import io.deephaven.api.SortColumn;
+import io.deephaven.api.*;
 import io.deephaven.api.agg.*;
 import io.deephaven.api.agg.spec.AggSpec;
 import io.deephaven.api.agg.spec.AggSpecAbsSum;
@@ -93,12 +91,16 @@
 import io.deephaven.engine.table.impl.by.ssmcountdistinct.unique.ShortRollupUniqueOperator;
 import io.deephaven.engine.table.impl.by.ssmminmax.SsmChunkedMinMaxOperator;
 import io.deephaven.engine.table.impl.by.ssmpercentile.SsmChunkedPercentileOperator;
+import io.deephaven.engine.table.impl.select.SelectColumn;
+import io.deephaven.engine.table.impl.select.WhereFilter;
 import io.deephaven.engine.table.impl.sources.ReinterpretUtils;
 import io.deephaven.engine.table.impl.ssms.SegmentedSortedMultiSet;
 import io.deephaven.engine.table.impl.util.freezeby.FreezeByCountOperator;
 import io.deephaven.engine.table.impl.util.freezeby.FreezeByOperator;
 import io.deephaven.time.DateTimeUtils;
 import io.deephaven.util.annotations.FinalDefault;
+import io.deephaven.util.type.ArrayTypeUtils;
+import io.deephaven.vector.VectorFactory;
 import org.apache.commons.lang3.mutable.MutableBoolean;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
@@ -106,28 +108,20 @@
 import java.math.BigDecimal;
 import java.math.BigInteger;
 import java.time.Instant;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
 import java.util.function.BiFunction;
 import java.util.function.Function;
 import java.util.function.Supplier;
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
 
-import static io.deephaven.datastructures.util.CollectionUtil.ZERO_LENGTH_DOUBLE_ARRAY;
-import static io.deephaven.datastructures.util.CollectionUtil.ZERO_LENGTH_STRING_ARRAY;
-import static io.deephaven.datastructures.util.CollectionUtil.ZERO_LENGTH_STRING_ARRAY_ARRAY;
 import static io.deephaven.engine.table.ChunkSource.WithPrev.ZERO_LENGTH_CHUNK_SOURCE_WITH_PREV_ARRAY;
 import static io.deephaven.engine.table.Table.AGGREGATION_ROW_LOOKUP_ATTRIBUTE;
 import static io.deephaven.engine.table.impl.by.IterativeChunkedAggregationOperator.ZERO_LENGTH_ITERATIVE_CHUNKED_AGGREGATION_OPERATOR_ARRAY;
 import static io.deephaven.engine.table.impl.by.RollupConstants.*;
 import static io.deephaven.util.QueryConstants.*;
 import static io.deephaven.util.type.TypeUtils.getBoxedType;
-import static io.deephaven.util.type.TypeUtils.isNumeric;
+import static io.deephaven.util.type.NumericTypeUtils.isNumeric;
 
 /**
  * Conversion tool to generate an {@link AggregationContextFactory} for a collection of {@link Aggregation
@@ -155,6 +149,13 @@ private enum Type {
     private final Collection<? extends Aggregation> aggregations;
     private final Type type;
 
+    /**
+     * For {@link Formula formula} aggregations we need a representation of the table definition with the column data
+     * types converted to {@link io.deephaven.vector.Vector vectors}. This can be computed once and re-used across all
+     * formula aggregations.
+     */
+    private Map<String, ColumnDefinition<?>> vectorColumnDefinitions;
+
     /**
      * Convert a collection of {@link Aggregation aggregations} to an {@link AggregationContextFactory}.
      *
@@ -411,7 +412,7 @@ public final void visit(@NotNull final ColumnAggregations columnAggs) {
         // -------------------------------------------------------------------------------------------------------------
 
         void addNoInputOperator(@NotNull final IterativeChunkedAggregationOperator operator) {
-            addOperator(operator, null, ZERO_LENGTH_STRING_ARRAY);
+            addOperator(operator, null, ArrayTypeUtils.EMPTY_STRING_ARRAY);
         }
 
         @SafeVarargs
@@ -650,6 +651,55 @@ final void addWeightedAvgOrSumOperator(
                 addOperator(resultOperator, r.source, r.pair.input().name(), weightName);
             });
         }
+
+        final void addCountWhereOperator(@NotNull CountWhere countWhere) {
+            final WhereFilter[] whereFilters = WhereFilter.fromInternal(countWhere.filter());
+
+            final Map<String, RecordingInternalOperator> inputColumnRecorderMap = new HashMap<>();
+            final List<RecordingInternalOperator> recorderList = new ArrayList<>();
+            final List<RecordingInternalOperator[]> filterRecorderList = new ArrayList<>();
+
+            // Verify all the columns in the where filters are present in the table and valid for use.
+            for (final WhereFilter whereFilter : whereFilters) {
+                whereFilter.init(table.getDefinition());
+                if (whereFilter.isRefreshing()) {
+                    throw new UnsupportedOperationException("AggCountWhere does not support refreshing filters");
+                }
+
+                // Compute which recording operators this filter will use.
+                final List<String> inputColumnNames = whereFilter.getColumns();
+                final int inputColumnCount = whereFilter.getColumns().size();
+                final RecordingInternalOperator[] recorders = new RecordingInternalOperator[inputColumnCount];
+                for (int ii = 0; ii < inputColumnCount; ++ii) {
+                    final String inputColumnName = inputColumnNames.get(ii);
+                    final RecordingInternalOperator recorder =
+                            inputColumnRecorderMap.computeIfAbsent(inputColumnName, k -> {
+                                // Create a recording operator for the column and add it to the list of operators.
+                                final ColumnSource<?> inputSource = table.getColumnSource(inputColumnName);
+                                final RecordingInternalOperator newRecorder =
+                                        new RecordingInternalOperator(inputColumnName, inputSource);
+                                recorderList.add(newRecorder);
+                                return newRecorder;
+                            });
+                    recorders[ii] = recorder;
+                }
+                filterRecorderList.add(recorders);
+            }
+
+            final RecordingInternalOperator[] recorders = recorderList.toArray(RecordingInternalOperator[]::new);
+            final RecordingInternalOperator[][] filterRecorders =
+                    filterRecorderList.toArray(RecordingInternalOperator[][]::new);
+            final String[] inputColumnNames =
+                    inputColumnRecorderMap.keySet().toArray(ArrayTypeUtils.EMPTY_STRING_ARRAY);
+
+            // Add the recording operators, making them dependent on all input columns so they all are populated if any
+            // are modified
+            for (final RecordingInternalOperator recorder : recorders) {
+                addOperator(recorder, recorder.getInputColumnSource(), inputColumnNames);
+            }
+            addOperator(new CountWhereOperator(countWhere.column().name(), whereFilters, recorders, filterRecorders),
+                    null, inputColumnNames);
+        }
     }
 
     // -----------------------------------------------------------------------------------------------------------------
@@ -687,6 +737,11 @@ public void visit(@NotNull final Count count) {
             addNoInputOperator(new CountAggregationOperator(count.column().name()));
         }
 
+        @Override
+        public void visit(@NotNull final CountWhere countWhere) {
+            addCountWhereOperator(countWhere);
+        }
+
         @Override
         public void visit(@NotNull final FirstRowKey firstRowKey) {
             addFirstOrLastOperators(true, firstRowKey.column().name());
@@ -709,6 +764,50 @@ public void visit(@NotNull final Partition partition) {
                     groupByColumnNames));
         }
 
+        @Override
+        public void visit(@NotNull final Formula formula) {
+            final SelectColumn selectColumn = SelectColumn.of(formula.selectable());
+
+            // Get or create a column definition map composed of vectors of the original column types (or scalars when
+            // part of the key columns).
+            final Set<String> groupByColumnSet = Set.of(groupByColumnNames);
+            if (vectorColumnDefinitions == null) {
+                vectorColumnDefinitions = table.getDefinition().getColumnStream().collect(Collectors.toMap(
+                        ColumnDefinition::getName,
+                        (final ColumnDefinition<?> cd) -> groupByColumnSet.contains(cd.getName())
+                                ? cd
+                                : ColumnDefinition.fromGenericType(
+                                        cd.getName(),
+                                        VectorFactory.forElementType(cd.getDataType()).vectorType(),
+                                        cd.getDataType())));
+            }
+
+            // Get the input column names from the formula and provide them to the groupBy operator
+            final String[] allInputColumns =
+                    selectColumn.initDef(vectorColumnDefinitions, compilationProcessor).toArray(String[]::new);
+
+            final Map<Boolean, List<String>> partitioned = Arrays.stream(allInputColumns)
+                    .collect(Collectors.partitioningBy(groupByColumnSet::contains));
+            final String[] inputKeyColumns = partitioned.get(true).toArray(String[]::new);
+            final String[] inputNonKeyColumns = partitioned.get(false).toArray(String[]::new);
+
+            if (!selectColumn.getColumnArrays().isEmpty()) {
+                throw new IllegalArgumentException("AggFormula does not support column arrays ("
+                        + selectColumn.getColumnArrays() + ")");
+            }
+            if (selectColumn.hasVirtualRowVariables()) {
+                throw new IllegalArgumentException("AggFormula does not support virtual row variables");
+            }
+            // TODO: re-use shared groupBy operators (https://github.com/deephaven/deephaven-core/issues/6363)
+            final GroupByChunkedOperator groupByChunkedOperator = new GroupByChunkedOperator(table, false, null,
+                    Arrays.stream(inputNonKeyColumns).map(col -> MatchPair.of(Pair.parse(col)))
+                            .toArray(MatchPair[]::new));
+
+            final FormulaMultiColumnChunkedOperator op = new FormulaMultiColumnChunkedOperator(table,
+                    groupByChunkedOperator, true, selectColumn, inputKeyColumns);
+            addNoInputOperator(op);
+        }
+
         // -------------------------------------------------------------------------------------------------------------
         // AggSpec.Visitor
         // -------------------------------------------------------------------------------------------------------------
@@ -747,6 +846,7 @@ public void visit(@NotNull final AggSpecFirst first) {
         @Override
         public void visit(@NotNull final AggSpecFormula formula) {
             unsupportedForBlinkTables("Formula");
+            // TODO: re-use shared groupBy operators (https://github.com/deephaven/deephaven-core/issues/6363)
             final GroupByChunkedOperator groupByChunkedOperator = new GroupByChunkedOperator(table, false, null,
                     resultPairs.stream().map(pair -> MatchPair.of((Pair) pair.input())).toArray(MatchPair[]::new));
             final FormulaChunkedOperator formulaChunkedOperator = new FormulaChunkedOperator(groupByChunkedOperator,
@@ -815,7 +915,7 @@ public void visit(@NotNull final AggSpecSum sum) {
         public void visit(@NotNull final AggSpecTDigest tDigest) {
             addBasicOperators((t, n) -> new TDigestPercentileOperator(t,
                     tDigest.compression().orElse(TDigestPercentileOperator.COMPRESSION_DEFAULT), n,
-                    ZERO_LENGTH_DOUBLE_ARRAY, ZERO_LENGTH_STRING_ARRAY));
+                    ArrayTypeUtils.EMPTY_DOUBLE_ARRAY, ArrayTypeUtils.EMPTY_STRING_ARRAY));
         }
 
         @Override
@@ -862,6 +962,12 @@ default void visit(@NotNull final LastRowKey lastRowKey) {
             rollupUnsupported("LastRowKey");
         }
 
+        @Override
+        @FinalDefault
+        default void visit(@NotNull final Formula formula) {
+            rollupUnsupported("Formula");
+        }
+
         // -------------------------------------------------------------------------------------------------------------
         // AggSpec.Visitor for unsupported column aggregation specs
         // -------------------------------------------------------------------------------------------------------------
@@ -947,6 +1053,11 @@ public void visit(@NotNull final Count count) {
             addNoInputOperator(new CountAggregationOperator(count.column().name()));
         }
 
+        @Override
+        public void visit(@NotNull final CountWhere countWhere) {
+            addCountWhereOperator(countWhere);
+        }
+
         @Override
         public void visit(@NotNull final NullColumns nullColumns) {
             transformers.add(new NullColumnAggregationTransformer(nullColumns.resultColumns()));
@@ -1092,6 +1203,13 @@ public void visit(@NotNull final Count count) {
             addOperator(makeSumOperator(resultSource.getType(), resultName, false), resultSource, resultName);
         }
 
+        @Override
+        public void visit(@NotNull final CountWhere countWhere) {
+            final String resultName = countWhere.column().name();
+            final ColumnSource<?> resultSource = table.getColumnSource(resultName);
+            addOperator(makeSumOperator(resultSource.getType(), resultName, false), resultSource, resultName);
+        }
+
         @Override
         public void visit(@NotNull final NullColumns nullColumns) {
             transformers.add(new NullColumnAggregationTransformer(nullColumns.resultColumns()));
@@ -1405,7 +1523,7 @@ private static AggregationContext makeSourceRowLookupAggregationContext() {
         return new AggregationContext(
                 new IterativeChunkedAggregationOperator[] {
                         new UniqueRowKeyChunkedOperator(TreeConstants.SOURCE_ROW_LOOKUP_ROW_KEY_COLUMN.name())},
-                new String[][] {ZERO_LENGTH_STRING_ARRAY},
+                new String[][] {ArrayTypeUtils.EMPTY_STRING_ARRAY},
                 new ChunkSource.WithPrev[] {null},
                 new AggregationContextTransformer[] {new RowLookupAttributeSetter()});
     }
@@ -1415,13 +1533,13 @@ private static AggregationContext makeEmptyAggregationContext(final boolean requ
             // noinspection unchecked
             return new AggregationContext(
                     new IterativeChunkedAggregationOperator[] {new CountAggregationOperator(null)},
-                    new String[][] {ZERO_LENGTH_STRING_ARRAY},
+                    new String[][] {ArrayTypeUtils.EMPTY_STRING_ARRAY},
                     new ChunkSource.WithPrev[] {null});
         }
         // noinspection unchecked
         return new AggregationContext(
                 ZERO_LENGTH_ITERATIVE_CHUNKED_AGGREGATION_OPERATOR_ARRAY,
-                ZERO_LENGTH_STRING_ARRAY_ARRAY,
+                ArrayTypeUtils.EMPTY_STRING_ARRAY_ARRAY,
                 ZERO_LENGTH_CHUNK_SOURCE_WITH_PREV_ARRAY);
     }
 
@@ -1436,7 +1554,7 @@ private static AggregationContext makeExposedGroupRowSetAggregationContext(
                             new GroupByChunkedOperator(inputQueryTable, true, EXPOSED_GROUP_ROW_SETS.name()),
                             new CountAggregationOperator(null)
                     },
-                    new String[][] {ZERO_LENGTH_STRING_ARRAY, ZERO_LENGTH_STRING_ARRAY},
+                    new String[][] {ArrayTypeUtils.EMPTY_STRING_ARRAY, ArrayTypeUtils.EMPTY_STRING_ARRAY},
                     new ChunkSource.WithPrev[] {null, null},
                     new AggregationContextTransformer[] {new RowLookupAttributeSetter()});
         }
@@ -1445,7 +1563,7 @@ private static AggregationContext makeExposedGroupRowSetAggregationContext(
                 new IterativeChunkedAggregationOperator[] {
                         new GroupByChunkedOperator(inputQueryTable, true, EXPOSED_GROUP_ROW_SETS.name())
                 },
-                new String[][] {ZERO_LENGTH_STRING_ARRAY},
+                new String[][] {ArrayTypeUtils.EMPTY_STRING_ARRAY},
                 new ChunkSource.WithPrev[] {null},
                 new AggregationContextTransformer[] {new RowLookupAttributeSetter()});
     }
@@ -2007,7 +2125,6 @@ public void supplyRowLookup(@NotNull final Supplier<AggregationRowLookup> rowLoo
     public static AggregationRowLookup getRowLookup(@NotNull final Table aggregationResult) {
         final Object value = aggregationResult.getAttribute(AGGREGATION_ROW_LOOKUP_ATTRIBUTE);
         Assert.neqNull(value, "aggregation result row lookup");
-        Assert.instanceOf(value, "aggregation result row lookup", AggregationRowLookup.class);
         return (AggregationRowLookup) value;
     }
 }
diff --git a/engine/table/src/main/java/io/deephaven/engine/table/impl/by/ByteAddOnlySortedFirstOrLastChunkedOperator.java b/engine/table/src/main/java/io/deephaven/engine/table/impl/by/ByteAddOnlySortedFirstOrLastChunkedOperator.java
index 9e19360ec83..7e2960524c3 100644
--- a/engine/table/src/main/java/io/deephaven/engine/table/impl/by/ByteAddOnlySortedFirstOrLastChunkedOperator.java
+++ b/engine/table/src/main/java/io/deephaven/engine/table/impl/by/ByteAddOnlySortedFirstOrLastChunkedOperator.java
@@ -93,12 +93,16 @@ private boolean addChunk(@NotNull final ByteChunk<? extends Values> values,
         for (int ii = newDestination ? 1 : 0; ii < length; ++ii) {
             final long index = indices.get(start + ii);
             final byte value = values.get(start + ii);
-            final int comparison = ByteComparisons.compare(value, bestValue);
-            // @formatter:off
-            final boolean better =
-                    ( isFirst && (comparison < 0 || (comparison == 0 && index < bestIndex))) ||
-                    (!isFirst && (comparison > 0 || (comparison == 0 && index > bestIndex)))  ;
-            // @formatter:on
+            final boolean better;
+            if (isFirst) {
+                better = index < bestIndex
+                        ? ByteComparisons.leq(value, bestValue)
+                        : ByteComparisons.lt(value, bestValue);
+            } else {
+                better = index > bestIndex
+                        ? ByteComparisons.geq(value, bestValue)
+                        : ByteComparisons.gt(value, bestValue);
+            }
             if (better) {
                 bestIndex = index;
                 bestValue = value;
diff --git a/engine/table/src/main/java/io/deephaven/engine/table/impl/by/ByteBlinkSortedFirstOrLastChunkedOperator.java b/engine/table/src/main/java/io/deephaven/engine/table/impl/by/ByteBlinkSortedFirstOrLastChunkedOperator.java
index f8403b88371..d3cea66ef31 100644
--- a/engine/table/src/main/java/io/deephaven/engine/table/impl/by/ByteBlinkSortedFirstOrLastChunkedOperator.java
+++ b/engine/table/src/main/java/io/deephaven/engine/table/impl/by/ByteBlinkSortedFirstOrLastChunkedOperator.java
@@ -113,13 +113,10 @@ private boolean addChunk(@NotNull final ByteChunk<? extends Values> values,
         for (int ii = newDestination ? 1 : 0; ii < length; ++ii) {
             final int chunkPos = start + ii;
             final byte value = values.get(chunkPos);
-            final int comparison = ByteComparisons.compare(value, bestValue);
-            // @formatter:off
             // No need to compare relative row keys. A stream's logical row set is always monotonically increasing.
-            final boolean better =
-                    ( isFirst && comparison <  0) ||
-                    (!isFirst && comparison >= 0)  ;
-            // @formatter:on
+            final boolean better = isFirst
+                    ? ByteComparisons.lt(value, bestValue)
+                    : ByteComparisons.geq(value, bestValue);
             if (better) {
                 bestChunkPos = chunkPos;
                 bestValue = value;
diff --git a/engine/table/src/main/java/io/deephaven/engine/table/impl/by/CharAddOnlySortedFirstOrLastChunkedOperator.java b/engine/table/src/main/java/io/deephaven/engine/table/impl/by/CharAddOnlySortedFirstOrLastChunkedOperator.java
index 34c7a530c96..73fcdc25b0b 100644
--- a/engine/table/src/main/java/io/deephaven/engine/table/impl/by/CharAddOnlySortedFirstOrLastChunkedOperator.java
+++ b/engine/table/src/main/java/io/deephaven/engine/table/impl/by/CharAddOnlySortedFirstOrLastChunkedOperator.java
@@ -89,12 +89,16 @@ private boolean addChunk(@NotNull final CharChunk<? extends Values> values,
         for (int ii = newDestination ? 1 : 0; ii < length; ++ii) {
             final long index = indices.get(start + ii);
             final char value = values.get(start + ii);
-            final int comparison = CharComparisons.compare(value, bestValue);
-            // @formatter:off
-            final boolean better =
-                    ( isFirst && (comparison < 0 || (comparison == 0 && index < bestIndex))) ||
-                    (!isFirst && (comparison > 0 || (comparison == 0 && index > bestIndex)))  ;
-            // @formatter:on
+            final boolean better;
+            if (isFirst) {
+                better = index < bestIndex
+                        ? CharComparisons.leq(value, bestValue)
+                        : CharComparisons.lt(value, bestValue);
+            } else {
+                better = index > bestIndex
+                        ? CharComparisons.geq(value, bestValue)
+                        : CharComparisons.gt(value, bestValue);
+            }
             if (better) {
                 bestIndex = index;
                 bestValue = value;
diff --git a/engine/table/src/main/java/io/deephaven/engine/table/impl/by/CharBlinkSortedFirstOrLastChunkedOperator.java b/engine/table/src/main/java/io/deephaven/engine/table/impl/by/CharBlinkSortedFirstOrLastChunkedOperator.java
index 08f16401379..caece3644d1 100644
--- a/engine/table/src/main/java/io/deephaven/engine/table/impl/by/CharBlinkSortedFirstOrLastChunkedOperator.java
+++ b/engine/table/src/main/java/io/deephaven/engine/table/impl/by/CharBlinkSortedFirstOrLastChunkedOperator.java
@@ -109,13 +109,10 @@ private boolean addChunk(@NotNull final CharChunk<? extends Values> values,
         for (int ii = newDestination ? 1 : 0; ii < length; ++ii) {
             final int chunkPos = start + ii;
             final char value = values.get(chunkPos);
-            final int comparison = CharComparisons.compare(value, bestValue);
-            // @formatter:off
             // No need to compare relative row keys. A stream's logical row set is always monotonically increasing.
-            final boolean better =
-                    ( isFirst && comparison <  0) ||
-                    (!isFirst && comparison >= 0)  ;
-            // @formatter:on
+            final boolean better = isFirst
+                    ? CharComparisons.lt(value, bestValue)
+                    : CharComparisons.geq(value, bestValue);
             if (better) {
                 bestChunkPos = chunkPos;
                 bestValue = value;
diff --git a/engine/table/src/main/java/io/deephaven/engine/table/impl/by/ChunkedOperatorAggregationHelper.java b/engine/table/src/main/java/io/deephaven/engine/table/impl/by/ChunkedOperatorAggregationHelper.java
index 2839760febb..6df7b5a9e6f 100644
--- a/engine/table/src/main/java/io/deephaven/engine/table/impl/by/ChunkedOperatorAggregationHelper.java
+++ b/engine/table/src/main/java/io/deephaven/engine/table/impl/by/ChunkedOperatorAggregationHelper.java
@@ -60,10 +60,6 @@ public class ChunkedOperatorAggregationHelper {
             Configuration.getInstance().getBooleanWithDefault("ChunkedOperatorAggregationHelper.skipRunFind", false);
     static final boolean HASHED_RUN_FIND =
             Configuration.getInstance().getBooleanWithDefault("ChunkedOperatorAggregationHelper.hashedRunFind", true);
-    static boolean USE_OPEN_ADDRESSED_STATE_MANAGER =
-            Configuration.getInstance().getBooleanWithDefault(
-                    "ChunkedOperatorAggregationHelper.useOpenAddressedStateManager",
-                    true);
 
     public static QueryTable aggregation(
             @NotNull final AggregationContextFactory aggregationContextFactory,
@@ -167,14 +163,13 @@ private static QueryTable aggregation(
         final PermuteKernel[] permuteKernels = ac.makePermuteKernels();
 
         if (dataIndex != null && initialKeys == null && !input.isRefreshing()) {
-            return staticIndexedAggregation(dataIndex, keyNames, ac);
+            return staticIndexedAggregation(input, dataIndex, keyNames, ac);
         }
 
         final Table symbolTable;
         final boolean useSymbolTable;
         if (!input.isRefreshing() && control.considerSymbolTables(input, dataIndex != null, keySources)) {
             Assert.eq(keySources.length, "keySources.length", 1);
-
             symbolTable = ((SymbolTableSource<?>) keySources[0]).getStaticSymbolTable(input.getRowSet(),
                     control.useSymbolTableLookupCaching());
             useSymbolTable = control.useSymbolTables(input.size(), symbolTable.size());
@@ -317,33 +312,21 @@ private static OperatorAggregationStateManager makeStateManager(
             @Nullable final Table symbolTableToUse) {
         final OperatorAggregationStateManager stateManager;
         if (input.isRefreshing()) {
-            if (USE_OPEN_ADDRESSED_STATE_MANAGER) {
-                stateManager = TypedHasherFactory.make(
-                        IncrementalChunkedOperatorAggregationStateManagerOpenAddressedBase.class,
-                        reinterpretedKeySources,
-                        keySources, control.initialHashTableSize(input), control.getMaximumLoadFactor(),
-                        control.getTargetLoadFactor());
-            } else {
-                stateManager = TypedHasherFactory.make(
-                        IncrementalChunkedOperatorAggregationStateManagerTypedBase.class, reinterpretedKeySources,
-                        keySources, control.initialHashTableSize(input), control.getMaximumLoadFactor(),
-                        control.getTargetLoadFactor());
-            }
+            stateManager = TypedHasherFactory.make(
+                    IncrementalChunkedOperatorAggregationStateManagerOpenAddressedBase.class,
+                    reinterpretedKeySources,
+                    keySources, control.initialHashTableSize(input), control.getMaximumLoadFactor(),
+                    control.getTargetLoadFactor());
         } else {
             if (symbolTableToUse != null) {
                 stateManager = new StaticSymbolTableChunkedOperatorAggregationStateManager(reinterpretedKeySources[0],
                         symbolTableToUse);
-            } else if (USE_OPEN_ADDRESSED_STATE_MANAGER) {
+            } else {
                 stateManager = TypedHasherFactory.make(
                         StaticChunkedOperatorAggregationStateManagerOpenAddressedBase.class,
                         reinterpretedKeySources,
                         keySources, control.initialHashTableSize(input), control.getMaximumLoadFactor(),
                         control.getTargetLoadFactor());
-            } else {
-                stateManager = TypedHasherFactory.make(
-                        StaticChunkedOperatorAggregationStateManagerTypedBase.class, reinterpretedKeySources,
-                        keySources, control.initialHashTableSize(input), control.getMaximumLoadFactor(),
-                        control.getTargetLoadFactor());
             }
         }
         ac.supplyRowLookup(() -> stateManager::findPositionForKey);
@@ -1635,6 +1618,7 @@ private static void modifySlots(RowSetBuilderRandom modifiedBuilder, IntChunk<Ch
 
     @NotNull
     private static QueryTable staticIndexedAggregation(
+            final QueryTable input,
             final BasicDataIndex dataIndex,
             final String[] keyNames,
             final AggregationContext ac) {
@@ -1644,10 +1628,22 @@ private static QueryTable staticIndexedAggregation(
 
         final Map<String, ColumnSource<?>> resultColumnSourceMap = new LinkedHashMap<>();
 
-        // Add the index key columns directly to the result table.
-        final Table indexKeyTable = indexTable.flatten().select(keyNames);
-        for (final String keyName : keyNames) {
-            resultColumnSourceMap.put(keyName, indexKeyTable.getColumnSource(keyName));
+        // Add the index table's key columns directly to the result table (after flattening and selecting).
+        final Table indexKeyTable = indexTable.flatten().select(dataIndex.keyColumnNames().toArray(String[]::new));
+        // Index key names corresponding to the input key names in the order of the input key names
+        final String[] dataIndexKeyNames = new String[keyNames.length];
+        final Map<String, ColumnSource<?>> inputNamesToSources = input.getColumnSourceMap();
+        final Map<ColumnSource<?>, String> indexedSourcesToNames = dataIndex.keyColumnNamesByIndexedColumn();
+        for (int ki = 0; ki < keyNames.length; ki++) {
+            final String keyName = keyNames[ki];
+            // Note that we must be careful to find the index key column sources by indexed (input) column source, not
+            // by input key name, as the input key names may not match the indexed column names.
+            // We build dataIndexKeyNames as part of this mapping, so we can use them for the row lookup remapping.
+            final ColumnSource<?> keyColumnSource = inputNamesToSources.get(keyName);
+            final String dataIndexKeyName = indexedSourcesToNames.get(keyColumnSource);
+            dataIndexKeyNames[ki] = dataIndexKeyName;
+            final ColumnSource<?> indexKeyColumnSource = indexKeyTable.getColumnSource(dataIndexKeyName);
+            resultColumnSourceMap.put(keyName, indexKeyColumnSource);
         }
         ac.getResultColumns(resultColumnSourceMap);
 
@@ -1664,7 +1660,7 @@ private static QueryTable staticIndexedAggregation(
         // Create a lookup function from the index table
         ac.supplyRowLookup(() -> {
             final ToLongFunction<Object> lookupKeyToRowKey =
-                    DataIndexUtils.buildRowKeyMappingFunction(indexKeyTable, keyNames);
+                    DataIndexUtils.buildRowKeyMappingFunction(indexKeyTable, dataIndexKeyNames);
             return key -> (int) lookupKeyToRowKey.applyAsLong(key);
         });
 
diff --git a/engine/table/src/main/java/io/deephaven/engine/table/impl/by/CountWhereOperator.java b/engine/table/src/main/java/io/deephaven/engine/table/impl/by/CountWhereOperator.java
new file mode 100644
index 00000000000..07319b61642
--- /dev/null
+++ b/engine/table/src/main/java/io/deephaven/engine/table/impl/by/CountWhereOperator.java
@@ -0,0 +1,574 @@
+//
+// Copyright (c) 2016-2024 Deephaven Data Labs and Patent Pending
+//
+package io.deephaven.engine.table.impl.by;
+
+import io.deephaven.base.verify.Assert;
+import io.deephaven.chunk.*;
+import io.deephaven.chunk.attributes.ChunkLengths;
+import io.deephaven.chunk.attributes.ChunkPositions;
+import io.deephaven.chunk.attributes.Values;
+import io.deephaven.engine.rowset.*;
+import io.deephaven.engine.rowset.chunkattributes.RowKeys;
+import io.deephaven.engine.table.ColumnSource;
+import io.deephaven.engine.table.Table;
+import io.deephaven.engine.table.impl.QueryTable;
+import io.deephaven.engine.table.impl.chunkfilter.ChunkFilter;
+import io.deephaven.engine.table.impl.select.*;
+import io.deephaven.engine.table.impl.sources.LongArraySource;
+import io.deephaven.engine.table.impl.sources.chunkcolumnsource.ChunkColumnSource;
+import io.deephaven.util.SafeCloseable;
+import io.deephaven.util.SafeCloseableArray;
+import org.jetbrains.annotations.NotNull;
+
+import java.util.*;
+
+import static io.deephaven.engine.util.NullSafeAddition.plusLong;
+import static io.deephaven.engine.util.TableTools.emptyTable;
+
+/**
+ * Implements a counting operator that counts the number of rows that pass a set of filters. Chunk data is accessed
+ * through {@link RecordingInternalOperator recorder} instances.
+ */
+
+public class CountWhereOperator implements IterativeChunkedAggregationOperator {
+    /**
+     * The output column name in the result table.
+     */
+    private final String resultName;
+    /**
+     * The output column source in the result table.
+     */
+    private final LongArraySource resultColumnSource;
+    /**
+     * The filters to apply to the data.
+     */
+    private final CountFilter[] filters;
+    /**
+     * The recorder instances that provide the chunk data.
+     */
+    private final RecordingInternalOperator[] recorders;
+    /**
+     * A table constructed from chunk sources, populated with incoming chunk data and used to evaluate filters.
+     */
+    private final Table chunkSourceTable;
+    /**
+     * The chunk sources that populate the chunkSourceTable.
+     */
+    private final ChunkColumnSource<?>[] chunkColumnSources;
+    /**
+     * Track whether the chunkSourceTable needs to be updated with new data.
+     */
+    private final boolean updateChunkSourceTable;
+
+    /**
+     * Internal representation of the filter to apply to the data.
+     */
+    private static class CountFilter {
+        private final ChunkFilter chunkFilter;
+        private final AbstractConditionFilter.Filter conditionFilter;
+        private final WhereFilter whereFilter;
+        private final RecordingInternalOperator[] recorders;
+
+        public CountFilter(ChunkFilter chunkFilter, RecordingInternalOperator[] recorders) {
+            this.chunkFilter = chunkFilter;
+            this.conditionFilter = null;
+            this.whereFilter = null;
+            this.recorders = recorders;
+        }
+
+        public CountFilter(AbstractConditionFilter.Filter conditionFilter, RecordingInternalOperator[] recorders) {
+            this.chunkFilter = null;
+            this.conditionFilter = conditionFilter;
+            this.whereFilter = null;
+            this.recorders = recorders;
+        }
+
+        public CountFilter(WhereFilter whereFilter, RecordingInternalOperator[] recorders) {
+            this.chunkFilter = null;
+            this.conditionFilter = null;
+            this.whereFilter = whereFilter;
+            this.recorders = recorders;
+        }
+    }
+
+    static class BaseContext implements SafeCloseable {
+        /**
+         * ConditionFilter needs a context to store intermediate results.
+         */
+        final ConditionFilter.FilterKernel.Context[] conditionFilterContexts;
+        /**
+         * Contains the results of the filters as a boolean chunk, where true indicates a row passed all filters.
+         */
+        final WritableBooleanChunk<Values> resultsChunk;
+        /**
+         * The chunk data from the recorders to be used as input to the filters.
+         */
+        final Chunk<? extends Values>[][] filterChunks;
+
+        BaseContext(final int size, final CountFilter[] filters) {
+            conditionFilterContexts = new ConditionFilter.FilterKernel.Context[filters.length];
+            for (int ii = 0; ii < filters.length; ii++) {
+                if (filters[ii].conditionFilter != null) {
+                    conditionFilterContexts[ii] = filters[ii].conditionFilter.getContext(size);
+                }
+            }
+            resultsChunk = WritableBooleanChunk.makeWritableChunk(size);
+            // noinspection unchecked
+            filterChunks = new Chunk[filters.length][];
+            for (int ii = 0; ii < filters.length; ii++) {
+                // noinspection unchecked
+                filterChunks[ii] = new Chunk[filters[ii].recorders.length];
+            }
+        }
+
+        @Override
+        public void close() {
+            SafeCloseableArray.close(conditionFilterContexts);
+            resultsChunk.close();
+            // filterChunks are not owned by this context
+        }
+    }
+
+    static class CountWhereBucketedContext extends BaseContext implements BucketedContext {
+        /**
+         * How many rows passed the filters for each destination.
+         */
+        final WritableIntChunk<Values> countChunk;
+        /**
+         * How many previous rows passed the filters for each destination, only applies to modified rows.
+         */
+        final WritableIntChunk<Values> previousCountChunk;
+
+        private CountWhereBucketedContext(final int size, final CountFilter[] filters) {
+            super(size, filters);
+            countChunk = WritableIntChunk.makeWritableChunk(size);
+            previousCountChunk = WritableIntChunk.makeWritableChunk(size);
+        }
+
+        @Override
+        public void close() {
+            super.close();
+            countChunk.close();
+            previousCountChunk.close();
+        }
+    }
+
+    static class CountWhereSingletonContext extends BaseContext implements SingletonContext {
+        private CountWhereSingletonContext(final int size, final CountFilter[] filters) {
+            super(size, filters);
+        }
+    }
+
+    /**
+     * Construct a count aggregation operator that tests individual data values.
+     *
+     * @param resultName The name of the result column
+     */
+    CountWhereOperator(
+            @NotNull final String resultName,
+            final WhereFilter[] filters,
+            final RecordingInternalOperator[] recorders,
+            final RecordingInternalOperator[][] filterRecorders) {
+        this.resultName = resultName;
+        this.resultColumnSource = new LongArraySource();
+
+        // Build a dummy table for use by generic WhereFilters and ConditionFilters
+        if (recorders.length == 0) {
+            chunkColumnSources = null;
+            chunkSourceTable = emptyTable(0);
+        } else {
+            chunkColumnSources = new ChunkColumnSource[recorders.length];
+            final Map<String, ColumnSource<?>> columnSourceMap = new HashMap<>();
+            for (int ii = 0; ii < recorders.length; ii++) {
+                final ColumnSource<?> recorderSource = recorders[ii].getInputColumnSource();
+                chunkColumnSources[ii] = ChunkColumnSource.make(recorderSource.getChunkType(), recorderSource.getType(),
+                        recorderSource.getComponentType());
+                columnSourceMap.put(recorders[ii].getInputColumnName(), chunkColumnSources[ii]);
+            }
+            chunkSourceTable = new QueryTable(RowSetFactory.empty().toTracking(), columnSourceMap);
+        }
+
+        // Create the internal filters
+        final List<CountFilter> filterList = new ArrayList<>();
+        boolean forcedWhereFilter = false;
+        for (int fi = 0; fi < filters.length; fi++) {
+            final WhereFilter filter = filters[fi];
+            final CountWhereOperator.CountFilter countFilter;
+            if (!forcedWhereFilter && filter instanceof ConditionFilter) {
+                final ConditionFilter conditionFilter = (ConditionFilter) filter;
+                if (conditionFilter.hasVirtualRowVariables()) {
+                    throw new UnsupportedOperationException("AggCountWhere does not support refreshing filters");
+                }
+                try {
+                    countFilter = new CountWhereOperator.CountFilter(
+                            conditionFilter.getFilter(chunkSourceTable, RowSetFactory.empty()),
+                            filterRecorders[fi]);
+                } catch (final Exception e) {
+                    throw new IllegalArgumentException("Error creating condition filter in CountWhereOperator", e);
+                }
+            } else if (!forcedWhereFilter && filter instanceof ExposesChunkFilter
+                    && ((ExposesChunkFilter) filter).chunkFilter().isPresent()) {
+                final Optional<ChunkFilter> chunkFilter = ((ExposesChunkFilter) filter).chunkFilter();
+                countFilter = new CountWhereOperator.CountFilter(chunkFilter.get(), filterRecorders[fi]);
+            } else {
+                try (final SafeCloseable ignored = filter.beginOperation(chunkSourceTable)) {
+                    countFilter = new CountWhereOperator.CountFilter(filter, filterRecorders[fi]);
+                }
+                forcedWhereFilter = true;
+            }
+            filterList.add(countFilter);
+        }
+
+        this.updateChunkSourceTable = forcedWhereFilter;
+        this.filters = filterList.toArray(CountFilter[]::new);
+        this.recorders = recorders;
+    }
+
+    /**
+     * Count the number of rows that passed the filters in the given chunk.
+     */
+    private static int countChunk(final BooleanChunk<Values> values, final int start, final int len) {
+        int count = 0;
+        for (int ii = start; ii < start + len; ii++) {
+            if (values.get(ii)) {
+                count++;
+            }
+        }
+        return count;
+    }
+
+    /**
+     * Build a RowSet from a boolean chunk, including only the indices that are true.
+     */
+    private static WritableRowSet buildFromBooleanChunk(final BooleanChunk<Values> values, final int chunkSize) {
+        final RowSetBuilderSequential builder = RowSetFactory.builderSequential();
+        for (int ii = 0; ii < chunkSize; ii++) {
+            if (values.get(ii)) {
+                builder.appendKey(ii);
+            }
+        }
+        return builder.build();
+    }
+
+    /**
+     * Apply the filters to the data in the chunk, returning the number of rows that passed the filters. If
+     * {@code requiresPopulatedResultsChunk == true}, the results chunk will be populated with {@code true} for every
+     * row that passed the filters.
+     */
+    private int applyFilters(
+            final BaseContext ctx,
+            final int chunkSize,
+            final boolean requiresPopulatedResultsChunk) {
+
+        boolean initialized = false;
+        WritableRowSet remainingRows = null;
+        final RowSet flatRowSet = RowSetFactory.flat(chunkSize);
+
+        int count = 0;
+
+        // We must apply the filters in the order they were given.
+        for (int fi = 0; fi < filters.length; fi++) {
+            final CountFilter filter = filters[fi];
+            final Chunk<? extends Values>[] valueChunks = ctx.filterChunks[fi];
+            final ConditionFilter.FilterKernel.Context conditionalFilterContext = ctx.conditionFilterContexts[fi];
+
+            if (filter.chunkFilter != null) {
+                if (!initialized) {
+                    // Chunk filters only have one input.
+                    count = filter.chunkFilter.filter(valueChunks[0], ctx.resultsChunk);
+                    initialized = true;
+                } else {
+                    count = filter.chunkFilter.filterAnd(valueChunks[0], ctx.resultsChunk);
+                }
+                continue;
+            } else if (filter.conditionFilter != null) {
+                if (!initialized) {
+                    count = filter.conditionFilter.filter(conditionalFilterContext, valueChunks,
+                            chunkSize, ctx.resultsChunk);
+                    initialized = true;
+                } else {
+                    count = filter.conditionFilter.filterAnd(conditionalFilterContext, valueChunks,
+                            chunkSize, ctx.resultsChunk);
+                }
+                continue;
+            }
+
+            if (remainingRows == null) {
+                // This is the first WhereFilter to run, initialize the remainingRows RowSet
+                remainingRows = initialized
+                        ? buildFromBooleanChunk(ctx.resultsChunk, chunkSize)
+                        : RowSetFactory.flat(chunkSize);
+            }
+            try (final RowSet ignored = remainingRows) {
+                remainingRows = filter.whereFilter.filter(remainingRows, flatRowSet, chunkSourceTable, false);
+            }
+            initialized = true;
+        }
+
+        try (final RowSet ignored = remainingRows; final RowSet ignored2 = flatRowSet) {
+            if (remainingRows != null) {
+                // WhereFilters were used, so gather the info from remainingRows
+                if (requiresPopulatedResultsChunk) {
+                    ctx.resultsChunk.fillWithValue(0, chunkSize, false);
+                    remainingRows.forAllRowKeyRanges(
+                            (start, end) -> ctx.resultsChunk.fillWithValue((int) start, (int) end - (int) start + 1,
+                                    true));
+                }
+                return remainingRows.intSize();
+            }
+        }
+        return count;
+    }
+
+    /**
+     * Using current data, update the provided context to contain the chunks from the recording operators and update the
+     * chunk source table if needed.
+     */
+    private void updateChunkSources(final BaseContext ctx, final boolean usePrev) {
+        if (updateChunkSourceTable) {
+            for (int ii = 0; ii < chunkColumnSources.length; ii++) {
+                chunkColumnSources[ii].clear();
+                final Chunk<? extends Values> chunk = usePrev
+                        ? recorders[ii].getPrevValueChunk()
+                        : recorders[ii].getValueChunk();
+                // ChunkColumnSource releases the chunks it acquires, so give it a copy.
+                final WritableChunk<? extends Values> tmpValues =
+                        (WritableChunk<? extends Values>) chunk.slice(0, chunk.size());
+                chunkColumnSources[ii].addChunk(tmpValues);
+            }
+        }
+
+        // Grab the filter input chunks from the recorders
+        for (int fi = 0; fi < filters.length; fi++) {
+            for (int ri = 0; ri < filters[fi].recorders.length; ri++) {
+                final Chunk<? extends Values> chunk = usePrev
+                        ? filters[fi].recorders[ri].getPrevValueChunk()
+                        : filters[fi].recorders[ri].getValueChunk();
+                ctx.filterChunks[fi][ri] = chunk;
+            }
+        }
+    }
+
+    /**
+     * Count the number of rows for each destination that pass the filters and store into the {@code destCountChunk}.
+     */
+    private void doCountBucketed(
+            final CountWhereBucketedContext ctx,
+            final int chunkSize,
+            final IntChunk<RowKeys> destinations,
+            final IntChunk<ChunkPositions> startPositions,
+            final IntChunk<ChunkLengths> length,
+            final WritableIntChunk<Values> destCountChunk,
+            final boolean usePrev) {
+
+        updateChunkSources(ctx, usePrev);
+
+        applyFilters(ctx, chunkSize, true);
+
+        // fill the destination count chunk with the number of rows that passed the filter
+        for (int dest = 0; dest < startPositions.size(); dest++) {
+            final int start = startPositions.get(dest);
+            final int len = length.get(dest);
+            destCountChunk.set(dest, countChunk(ctx.resultsChunk, start, len));
+        }
+    }
+
+    /**
+     * Count the number of rows that pass the filters..
+     */
+    private int doCountSingleton(
+            final CountWhereSingletonContext ctx,
+            final int chunkSize,
+            final boolean usePrev) {
+        updateChunkSources(ctx, usePrev);
+
+        return applyFilters(ctx, chunkSize, false);
+    }
+
+    @Override
+    public void addChunk(
+            BucketedContext context,
+            Chunk<? extends Values> values,
+            LongChunk<? extends RowKeys> inputRowKeys,
+            IntChunk<RowKeys> destinations,
+            IntChunk<ChunkPositions> startPositions,
+            IntChunk<ChunkLengths> length,
+            WritableBooleanChunk<Values> stateModified) {
+        final CountWhereBucketedContext ctx = (CountWhereBucketedContext) context;
+
+        // Compute the chunk size from the startPositions and length
+        final int chunkSize = startPositions.get(startPositions.size() - 1) + length.get(length.size() - 1);
+
+        // Do the counting work and store the results in the count chunk
+        doCountBucketed(ctx, chunkSize, destinations, startPositions, length, ctx.countChunk, false);
+
+        // Update the result column source with the counts for each destination
+        for (int ii = 0; ii < startPositions.size(); ++ii) {
+            final int startPosition = startPositions.get(ii);
+            final int count = ctx.countChunk.get(ii);
+            final long destination = destinations.get(startPosition);
+            resultColumnSource.set(destination, plusLong(resultColumnSource.getUnsafe(destination), count));
+            stateModified.set(ii, true);
+        }
+    }
+
+    @Override
+    public boolean addChunk(
+            SingletonContext context,
+            int chunkSize,
+            Chunk<? extends Values> values,
+            LongChunk<? extends RowKeys> inputRowKeys, long destination) {
+        if (chunkSize == 0) {
+            return false;
+        }
+
+        final CountWhereSingletonContext ctx = (CountWhereSingletonContext) context;
+        final int count = doCountSingleton(ctx, chunkSize, false);
+        resultColumnSource.set(destination, plusLong(resultColumnSource.getUnsafe(destination), count));
+        return count > 0;
+    }
+
+    @Override
+    public void removeChunk(
+            BucketedContext context,
+            Chunk<? extends Values> values,
+            LongChunk<? extends RowKeys> inputRowKeys,
+            IntChunk<RowKeys> destinations,
+            IntChunk<ChunkPositions> startPositions,
+            IntChunk<ChunkLengths> length,
+            WritableBooleanChunk<Values> stateModified) {
+        final CountWhereBucketedContext ctx = (CountWhereBucketedContext) context;
+
+        // Compute the chunk size from the startPositions and length
+        final int chunkSize = startPositions.get(startPositions.size() - 1) + length.get(length.size() - 1);
+
+        // Do the counting work and store the results in the count chunk
+        doCountBucketed(ctx, chunkSize, destinations, startPositions, length, ctx.countChunk, false);
+
+        for (int ii = 0; ii < startPositions.size(); ++ii) {
+            final int count = ctx.countChunk.get(ii);
+            if (count > 0) {
+                final int startPosition = startPositions.get(ii);
+                final long destination = destinations.get(startPosition);
+                final long updatedCount = plusLong(resultColumnSource.getUnsafe(destination), -count);
+
+                Assert.geqZero(updatedCount, "updatedCount");
+                resultColumnSource.set(destination, updatedCount);
+                stateModified.set(ii, true);
+            } else {
+                stateModified.set(ii, false);
+            }
+        }
+    }
+
+    @Override
+    public boolean removeChunk(
+            SingletonContext context,
+            int chunkSize,
+            Chunk<? extends Values> values,
+            LongChunk<? extends RowKeys> inputRowKeys,
+            long destination) {
+        if (chunkSize == 0) {
+            return false;
+        }
+
+        final CountWhereSingletonContext ctx = (CountWhereSingletonContext) context;
+        final int count = doCountSingleton(ctx, chunkSize, false);
+        if (count > 0) {
+            final long updatedCount = plusLong(resultColumnSource.getUnsafe(destination), -count);
+            Assert.geqZero(updatedCount, "updatedCount");
+            resultColumnSource.set(destination, updatedCount);
+            return true;
+        }
+        return false;
+    }
+
+    @Override
+    public void modifyChunk(
+            BucketedContext context,
+            Chunk<? extends Values> previousValues,
+            Chunk<? extends Values> newValues,
+            LongChunk<? extends RowKeys> postShiftRowKeys,
+            IntChunk<RowKeys> destinations,
+            IntChunk<ChunkPositions> startPositions,
+            IntChunk<ChunkLengths> length,
+            WritableBooleanChunk<Values> stateModified) {
+        final CountWhereBucketedContext ctx = (CountWhereBucketedContext) context;
+
+        // Compute the chunk size from the startPositions and length
+        final int chunkSize = startPositions.get(startPositions.size() - 1) + length.get(length.size() - 1);
+
+        // Fill the context with previous chunk data
+        doCountBucketed(ctx, chunkSize, destinations, startPositions, length, ctx.previousCountChunk, true);
+        // Fill the context with current chunk data
+        doCountBucketed(ctx, chunkSize, destinations, startPositions, length, ctx.countChunk, false);
+
+        for (int ii = 0; ii < startPositions.size(); ++ii) {
+            final int oldCount = ctx.previousCountChunk.get(ii);
+            final int newCount = ctx.countChunk.get(ii);
+            final int count = newCount - oldCount;
+            if (count != 0) {
+                final int startPosition = startPositions.get(ii);
+                final long destination = destinations.get(startPosition);
+                final long updatedCount = plusLong(resultColumnSource.getUnsafe(destination), count);
+                Assert.geqZero(updatedCount, "updatedCount");
+                resultColumnSource.set(destination, updatedCount);
+                stateModified.set(ii, true);
+            } else {
+                stateModified.set(ii, false);
+            }
+        }
+    }
+
+    @Override
+    public boolean modifyChunk(
+            SingletonContext context,
+            int chunkSize,
+            Chunk<? extends Values> previousValues,
+            Chunk<? extends Values> newValues,
+            LongChunk<? extends RowKeys> postShiftRowKeys,
+            long destination) {
+        if (chunkSize == 0) {
+            return false;
+        }
+
+        final CountWhereSingletonContext ctx = (CountWhereSingletonContext) context;
+        final int prevCount = doCountSingleton(ctx, chunkSize, true);
+        final int newCount = doCountSingleton(ctx, chunkSize, false);
+
+        final int count = newCount - prevCount;
+        if (count != 0) {
+            final long updatedCount = plusLong(resultColumnSource.getUnsafe(destination), count);
+            Assert.geqZero(updatedCount, "updatedCount");
+            resultColumnSource.set(destination, updatedCount);
+            return true;
+        }
+        return false;
+    }
+
+    @Override
+    public void ensureCapacity(long tableSize) {
+        resultColumnSource.ensureCapacity(tableSize, false);
+    }
+
+    @Override
+    public Map<String, ? extends ColumnSource<?>> getResultColumns() {
+        return Collections.singletonMap(resultName, resultColumnSource);
+    }
+
+    @Override
+    public void startTrackingPrevValues() {
+        resultColumnSource.startTrackingPrevValues();
+    }
+
+    @Override
+    public BucketedContext makeBucketedContext(int size) {
+        return new CountWhereBucketedContext(size, filters);
+    }
+
+    @Override
+    public SingletonContext makeSingletonContext(int size) {
+        return new CountWhereSingletonContext(size, filters);
+    }
+}
diff --git a/engine/table/src/main/java/io/deephaven/engine/table/impl/by/DoubleAddOnlySortedFirstOrLastChunkedOperator.java b/engine/table/src/main/java/io/deephaven/engine/table/impl/by/DoubleAddOnlySortedFirstOrLastChunkedOperator.java
index 805be5ca54b..e4af29430ac 100644
--- a/engine/table/src/main/java/io/deephaven/engine/table/impl/by/DoubleAddOnlySortedFirstOrLastChunkedOperator.java
+++ b/engine/table/src/main/java/io/deephaven/engine/table/impl/by/DoubleAddOnlySortedFirstOrLastChunkedOperator.java
@@ -93,12 +93,16 @@ private boolean addChunk(@NotNull final DoubleChunk<? extends Values> values,
         for (int ii = newDestination ? 1 : 0; ii < length; ++ii) {
             final long index = indices.get(start + ii);
             final double value = values.get(start + ii);
-            final int comparison = DoubleComparisons.compare(value, bestValue);
-            // @formatter:off
-            final boolean better =
-                    ( isFirst && (comparison < 0 || (comparison == 0 && index < bestIndex))) ||
-                    (!isFirst && (comparison > 0 || (comparison == 0 && index > bestIndex)))  ;
-            // @formatter:on
+            final boolean better;
+            if (isFirst) {
+                better = index < bestIndex
+                        ? DoubleComparisons.leq(value, bestValue)
+                        : DoubleComparisons.lt(value, bestValue);
+            } else {
+                better = index > bestIndex
+                        ? DoubleComparisons.geq(value, bestValue)
+                        : DoubleComparisons.gt(value, bestValue);
+            }
             if (better) {
                 bestIndex = index;
                 bestValue = value;
diff --git a/engine/table/src/main/java/io/deephaven/engine/table/impl/by/DoubleBlinkSortedFirstOrLastChunkedOperator.java b/engine/table/src/main/java/io/deephaven/engine/table/impl/by/DoubleBlinkSortedFirstOrLastChunkedOperator.java
index e15d568055d..18175727ecd 100644
--- a/engine/table/src/main/java/io/deephaven/engine/table/impl/by/DoubleBlinkSortedFirstOrLastChunkedOperator.java
+++ b/engine/table/src/main/java/io/deephaven/engine/table/impl/by/DoubleBlinkSortedFirstOrLastChunkedOperator.java
@@ -113,13 +113,10 @@ private boolean addChunk(@NotNull final DoubleChunk<? extends Values> values,
         for (int ii = newDestination ? 1 : 0; ii < length; ++ii) {
             final int chunkPos = start + ii;
             final double value = values.get(chunkPos);
-            final int comparison = DoubleComparisons.compare(value, bestValue);
-            // @formatter:off
             // No need to compare relative row keys. A stream's logical row set is always monotonically increasing.
-            final boolean better =
-                    ( isFirst && comparison <  0) ||
-                    (!isFirst && comparison >= 0)  ;
-            // @formatter:on
+            final boolean better = isFirst
+                    ? DoubleComparisons.lt(value, bestValue)
+                    : DoubleComparisons.geq(value, bestValue);
             if (better) {
                 bestChunkPos = chunkPos;
                 bestValue = value;
diff --git a/engine/table/src/main/java/io/deephaven/engine/table/impl/by/FloatAddOnlySortedFirstOrLastChunkedOperator.java b/engine/table/src/main/java/io/deephaven/engine/table/impl/by/FloatAddOnlySortedFirstOrLastChunkedOperator.java
index f87670c4b3a..9891a1c3c0c 100644
--- a/engine/table/src/main/java/io/deephaven/engine/table/impl/by/FloatAddOnlySortedFirstOrLastChunkedOperator.java
+++ b/engine/table/src/main/java/io/deephaven/engine/table/impl/by/FloatAddOnlySortedFirstOrLastChunkedOperator.java
@@ -93,12 +93,16 @@ private boolean addChunk(@NotNull final FloatChunk<? extends Values> values,
         for (int ii = newDestination ? 1 : 0; ii < length; ++ii) {
             final long index = indices.get(start + ii);
             final float value = values.get(start + ii);
-            final int comparison = FloatComparisons.compare(value, bestValue);
-            // @formatter:off
-            final boolean better =
-                    ( isFirst && (comparison < 0 || (comparison == 0 && index < bestIndex))) ||
-                    (!isFirst && (comparison > 0 || (comparison == 0 && index > bestIndex)))  ;
-            // @formatter:on
+            final boolean better;
+            if (isFirst) {
+                better = index < bestIndex
+                        ? FloatComparisons.leq(value, bestValue)
+                        : FloatComparisons.lt(value, bestValue);
+            } else {
+                better = index > bestIndex
+                        ? FloatComparisons.geq(value, bestValue)
+                        : FloatComparisons.gt(value, bestValue);
+            }
             if (better) {
                 bestIndex = index;
                 bestValue = value;
diff --git a/engine/table/src/main/java/io/deephaven/engine/table/impl/by/FloatBlinkSortedFirstOrLastChunkedOperator.java b/engine/table/src/main/java/io/deephaven/engine/table/impl/by/FloatBlinkSortedFirstOrLastChunkedOperator.java
index a325f1fcc18..7d081b280b3 100644
--- a/engine/table/src/main/java/io/deephaven/engine/table/impl/by/FloatBlinkSortedFirstOrLastChunkedOperator.java
+++ b/engine/table/src/main/java/io/deephaven/engine/table/impl/by/FloatBlinkSortedFirstOrLastChunkedOperator.java
@@ -113,13 +113,10 @@ private boolean addChunk(@NotNull final FloatChunk<? extends Values> values,
         for (int ii = newDestination ? 1 : 0; ii < length; ++ii) {
             final int chunkPos = start + ii;
             final float value = values.get(chunkPos);
-            final int comparison = FloatComparisons.compare(value, bestValue);
-            // @formatter:off
             // No need to compare relative row keys. A stream's logical row set is always monotonically increasing.
-            final boolean better =
-                    ( isFirst && comparison <  0) ||
-                    (!isFirst && comparison >= 0)  ;
-            // @formatter:on
+            final boolean better = isFirst
+                    ? FloatComparisons.lt(value, bestValue)
+                    : FloatComparisons.geq(value, bestValue);
             if (better) {
                 bestChunkPos = chunkPos;
                 bestValue = value;
diff --git a/engine/table/src/main/java/io/deephaven/engine/table/impl/by/FormulaChunkedOperator.java b/engine/table/src/main/java/io/deephaven/engine/table/impl/by/FormulaChunkedOperator.java
index bdf69ed3a97..b0074d68ddc 100644
--- a/engine/table/src/main/java/io/deephaven/engine/table/impl/by/FormulaChunkedOperator.java
+++ b/engine/table/src/main/java/io/deephaven/engine/table/impl/by/FormulaChunkedOperator.java
@@ -291,9 +291,8 @@ public UnaryOperator<ModifiedColumnSet> initializeRefreshing(@NotNull final Quer
             resultColumnModifiedColumnSets[ci] = resultTable.newModifiedColumnSet(resultColumnNames[ci]);
         }
         if (delegateToBy) {
-            // We cannot use the groupBy's result MCS factory, because the result column names are not guaranteed to be
-            // the
-            // same.
+            // We cannot use the groupBy's result MCS factory, because the result column names are not guaranteed
+            // to be the same.
             groupBy.initializeRefreshing(resultTable, aggregationUpdateListener);
         }
         // Note that we also use the factory in propagateUpdates to identify the set of modified columns to handle.
@@ -379,7 +378,7 @@ private class DataFillerContext implements SafeCloseable {
         private final boolean[] columnsToFillMask;
         final FillFromContext[] fillFromContexts;
 
-        private DataFillerContext(@NotNull final boolean[] columnsToFillMask) {
+        private DataFillerContext(final boolean @NotNull [] columnsToFillMask) {
             this.columnsToFillMask = columnsToFillMask;
             fillFromContexts = new FillFromContext[resultColumnNames.length];
             for (int ci = 0; ci < resultColumnNames.length; ++ci) {
@@ -448,6 +447,7 @@ private void copyData(@NotNull final RowSequence rowSequence, @NotNull final boo
                                     rowSequenceSlice);
                         }
                     }
+                    sharedContext.reset();
                 }
             }
         }
diff --git a/engine/table/src/main/java/io/deephaven/engine/table/impl/by/FormulaMultiColumnChunkedOperator.java b/engine/table/src/main/java/io/deephaven/engine/table/impl/by/FormulaMultiColumnChunkedOperator.java
new file mode 100644
index 00000000000..0dd080c92e9
--- /dev/null
+++ b/engine/table/src/main/java/io/deephaven/engine/table/impl/by/FormulaMultiColumnChunkedOperator.java
@@ -0,0 +1,411 @@
+//
+// Copyright (c) 2016-2024 Deephaven Data Labs and Patent Pending
+//
+package io.deephaven.engine.table.impl.by;
+
+import io.deephaven.chunk.*;
+import io.deephaven.chunk.attributes.ChunkLengths;
+import io.deephaven.chunk.attributes.ChunkPositions;
+import io.deephaven.chunk.attributes.Values;
+import io.deephaven.engine.liveness.LivenessReferent;
+import io.deephaven.engine.rowset.RowSequence;
+import io.deephaven.engine.rowset.RowSet;
+import io.deephaven.engine.rowset.chunkattributes.RowKeys;
+import io.deephaven.engine.table.ChunkSink.FillFromContext;
+import io.deephaven.engine.table.*;
+import io.deephaven.engine.table.ChunkSource.GetContext;
+import io.deephaven.engine.table.impl.QueryTable;
+import io.deephaven.engine.table.impl.select.SelectColumn;
+import io.deephaven.engine.table.impl.sources.ArrayBackedColumnSource;
+import io.deephaven.util.SafeCloseable;
+import org.jetbrains.annotations.NotNull;
+
+import java.util.Arrays;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.function.UnaryOperator;
+
+import static io.deephaven.engine.table.impl.sources.ArrayBackedColumnSource.BLOCK_SIZE;
+
+/**
+ * An {@link IterativeChunkedAggregationOperator} used in the implementation of {@link Table#applyToAllBy}.
+ */
+class FormulaMultiColumnChunkedOperator implements IterativeChunkedAggregationOperator {
+
+    private final QueryTable inputTable;
+
+    private final GroupByChunkedOperator groupBy;
+    private final boolean delegateToBy;
+    private final SelectColumn selectColumn;
+    private final WritableColumnSource<?> resultColumn;
+    private final String[] inputKeyColumns;
+
+    private ChunkSource<Values> formulaDataSource;
+
+    /**
+     * Converts the upstream MCS to a downstream MCS.
+     */
+    private UnaryOperator<ModifiedColumnSet> inputToResultModifiedColumnSetFactory;
+
+    /**
+     * Captures the upstream MCS in resetForStep to use in propagateUpdates.
+     */
+    private ModifiedColumnSet updateUpstreamModifiedColumnSet;
+
+    /**
+     * Construct an operator for applying a formula to slot-vectors over an aggregated table..
+     *
+     * @param groupBy The {@link GroupByChunkedOperator} to use for tracking indices
+     * @param delegateToBy Whether this operator is responsible for passing methods through to {@code groupBy}. Should
+     *        be false if {@code groupBy} is updated by the helper, or if this is not the first operator sharing
+     *        {@code groupBy}.
+     * @param selectColumn The formula column that will produce the results
+     */
+    FormulaMultiColumnChunkedOperator(
+            @NotNull final QueryTable inputTable,
+            @NotNull final GroupByChunkedOperator groupBy,
+            final boolean delegateToBy,
+            @NotNull final SelectColumn selectColumn,
+            @NotNull final String[] inputKeyColumns) {
+        this.inputTable = inputTable;
+        this.groupBy = groupBy;
+        this.delegateToBy = delegateToBy;
+        this.selectColumn = selectColumn;
+        this.inputKeyColumns = inputKeyColumns;
+
+        resultColumn = ArrayBackedColumnSource.getMemoryColumnSource(
+                0, selectColumn.getReturnedType(), selectColumn.getReturnedComponentType());
+    }
+
+    @Override
+    public void addChunk(final BucketedContext bucketedContext, final Chunk<? extends Values> values,
+            @NotNull final LongChunk<? extends RowKeys> inputRowKeys,
+            @NotNull final IntChunk<RowKeys> destinations, @NotNull final IntChunk<ChunkPositions> startPositions,
+            @NotNull final IntChunk<ChunkLengths> length, @NotNull final WritableBooleanChunk<Values> stateModified) {
+        if (delegateToBy) {
+            groupBy.addChunk(bucketedContext, values, inputRowKeys, destinations, startPositions, length,
+                    stateModified);
+        }
+    }
+
+    @Override
+    public void removeChunk(final BucketedContext bucketedContext, final Chunk<? extends Values> values,
+            @NotNull final LongChunk<? extends RowKeys> inputRowKeys,
+            @NotNull final IntChunk<RowKeys> destinations, @NotNull final IntChunk<ChunkPositions> startPositions,
+            @NotNull final IntChunk<ChunkLengths> length, @NotNull final WritableBooleanChunk<Values> stateModified) {
+        if (delegateToBy) {
+            groupBy.removeChunk(bucketedContext, values, inputRowKeys, destinations, startPositions, length,
+                    stateModified);
+        }
+    }
+
+    @Override
+    public void modifyChunk(final BucketedContext bucketedContext, final Chunk<? extends Values> previousValues,
+            final Chunk<? extends Values> newValues,
+            @NotNull final LongChunk<? extends RowKeys> postShiftRowKeys,
+            @NotNull final IntChunk<RowKeys> destinations, @NotNull final IntChunk<ChunkPositions> startPositions,
+            @NotNull final IntChunk<ChunkLengths> length, @NotNull final WritableBooleanChunk<Values> stateModified) {
+        if (delegateToBy) {
+            groupBy.modifyChunk(bucketedContext, previousValues, newValues, postShiftRowKeys, destinations,
+                    startPositions,
+                    length, stateModified);
+        }
+    }
+
+    @Override
+    public void shiftChunk(final BucketedContext bucketedContext, final Chunk<? extends Values> previousValues,
+            final Chunk<? extends Values> newValues,
+            @NotNull final LongChunk<? extends RowKeys> preShiftRowKeys,
+            @NotNull final LongChunk<? extends RowKeys> postShiftRowKeys,
+            @NotNull final IntChunk<RowKeys> destinations,
+            @NotNull final IntChunk<ChunkPositions> startPositions,
+            @NotNull final IntChunk<ChunkLengths> length, @NotNull final WritableBooleanChunk<Values> stateModified) {
+        if (delegateToBy) {
+            groupBy.shiftChunk(bucketedContext, previousValues, newValues, preShiftRowKeys, postShiftRowKeys,
+                    destinations,
+                    startPositions, length, stateModified);
+        }
+    }
+
+    @Override
+    public void modifyRowKeys(final BucketedContext context,
+            @NotNull final LongChunk<? extends RowKeys> inputRowKeys,
+            @NotNull final IntChunk<RowKeys> destinations, @NotNull final IntChunk<ChunkPositions> startPositions,
+            @NotNull final IntChunk<ChunkLengths> length, @NotNull final WritableBooleanChunk<Values> stateModified) {
+        if (delegateToBy) {
+            groupBy.modifyRowKeys(context, inputRowKeys, destinations, startPositions, length, stateModified);
+        }
+    }
+
+    @Override
+    public boolean addChunk(final SingletonContext singletonContext, final int chunkSize,
+            final Chunk<? extends Values> values,
+            @NotNull final LongChunk<? extends RowKeys> inputRowKeys, final long destination) {
+        if (delegateToBy) {
+            return groupBy.addChunk(singletonContext, chunkSize, values, inputRowKeys, destination);
+        } else {
+            return false;
+        }
+    }
+
+    @Override
+    public boolean removeChunk(final SingletonContext singletonContext, final int chunkSize,
+            final Chunk<? extends Values> values,
+            @NotNull final LongChunk<? extends RowKeys> inputRowKeys, final long destination) {
+        if (delegateToBy) {
+            return groupBy.removeChunk(singletonContext, chunkSize, values, inputRowKeys, destination);
+        } else {
+            return false;
+        }
+    }
+
+    @Override
+    public boolean modifyChunk(final SingletonContext singletonContext, final int chunkSize,
+            final Chunk<? extends Values> previousValues, final Chunk<? extends Values> newValues,
+            @NotNull final LongChunk<? extends RowKeys> postShiftRowKeys,
+            final long destination) {
+        if (delegateToBy) {
+            return groupBy.modifyChunk(singletonContext, chunkSize, previousValues, newValues, postShiftRowKeys,
+                    destination);
+        } else {
+            return false;
+        }
+    }
+
+    @Override
+    public boolean shiftChunk(final SingletonContext singletonContext, final Chunk<? extends Values> previousValues,
+            final Chunk<? extends Values> newValues,
+            @NotNull final LongChunk<? extends RowKeys> preShiftRowKeys,
+            @NotNull final LongChunk<? extends RowKeys> postShiftRowKeys,
+            final long destination) {
+        if (delegateToBy) {
+            return groupBy.shiftChunk(singletonContext, previousValues, newValues, preShiftRowKeys, postShiftRowKeys,
+                    destination);
+        } else {
+            return false;
+        }
+    }
+
+    @Override
+    public boolean modifyRowKeys(final SingletonContext context,
+            @NotNull final LongChunk<? extends RowKeys> rowKeys,
+            final long destination) {
+        if (delegateToBy) {
+            return groupBy.modifyRowKeys(context, rowKeys, destination);
+        } else {
+            return false;
+        }
+    }
+
+    @Override
+    public boolean requiresRowKeys() {
+        return delegateToBy;
+    }
+
+    @Override
+    public void ensureCapacity(final long tableSize) {
+        if (delegateToBy) {
+            groupBy.ensureCapacity(tableSize);
+        }
+        resultColumn.ensureCapacity(tableSize);
+    }
+
+    @Override
+    public Map<String, ? extends ColumnSource<?>> getResultColumns() {
+        return Map.of(selectColumn.getName(), resultColumn);
+    }
+
+    @Override
+    public void propagateInitialState(@NotNull final QueryTable resultTable, int startingDestinationsCount) {
+        if (delegateToBy) {
+            groupBy.propagateInitialState(resultTable, startingDestinationsCount);
+        }
+
+        final Map<String, ColumnSource<?>> sourceColumns;
+        if (inputKeyColumns.length == 0) {
+            // noinspection unchecked
+            sourceColumns = (Map<String, ColumnSource<?>>) groupBy.getInputResultColumns();
+        } else {
+            final Map<String, ColumnSource<?>> columnSourceMap = resultTable.getColumnSourceMap();
+            sourceColumns = new HashMap<>(groupBy.getInputResultColumns());
+            Arrays.stream(inputKeyColumns).forEach(col -> sourceColumns.put(col, columnSourceMap.get(col)));
+        }
+        selectColumn.initInputs(resultTable.getRowSet(), sourceColumns);
+        formulaDataSource = selectColumn.getDataView();
+
+        try (final DataCopyContext dataCopyContext = new DataCopyContext()) {
+            dataCopyContext.copyData(resultTable.getRowSet());
+        }
+    }
+
+    @Override
+    public void startTrackingPrevValues() {
+        if (delegateToBy) {
+            groupBy.startTrackingPrevValues();
+        }
+        resultColumn.startTrackingPrevValues();
+    }
+
+    @Override
+    public UnaryOperator<ModifiedColumnSet> initializeRefreshing(@NotNull final QueryTable resultTable,
+            @NotNull final LivenessReferent aggregationUpdateListener) {
+        if (delegateToBy) {
+            // We cannot use the groupBy's result MCS factory, because the result column names are not
+            // guaranteed to be the same.
+            groupBy.initializeRefreshing(resultTable, aggregationUpdateListener);
+        }
+
+        // Note that we also use the factory in propagateUpdates to identify the set of modified columns to handle.
+        if (selectColumn.getColumns().isEmpty()) {
+            return inputToResultModifiedColumnSetFactory = input -> ModifiedColumnSet.EMPTY;
+        }
+        final ModifiedColumnSet resultMCS = resultTable.newModifiedColumnSet(selectColumn.getName());
+        final String[] inputColumnNames = selectColumn.getColumns().toArray(String[]::new);
+        final ModifiedColumnSet inputMCS = inputTable.newModifiedColumnSet(inputColumnNames);
+        return inputToResultModifiedColumnSetFactory = input -> {
+            if (groupBy.getSomeKeyHasAddsOrRemoves() ||
+                    (groupBy.getSomeKeyHasModifies() && input.containsAny(inputMCS))) {
+                return resultMCS;
+            }
+            return ModifiedColumnSet.EMPTY;
+        };
+    }
+
+    @Override
+    public void resetForStep(@NotNull final TableUpdate upstream, final int startingDestinationsCount) {
+        if (delegateToBy) {
+            groupBy.resetForStep(upstream, startingDestinationsCount);
+        }
+        updateUpstreamModifiedColumnSet =
+                upstream.modified().isEmpty() ? ModifiedColumnSet.EMPTY : upstream.modifiedColumnSet();
+    }
+
+    @Override
+    public void propagateUpdates(@NotNull final TableUpdate downstream,
+            @NotNull final RowSet newDestinations) {
+        if (delegateToBy) {
+            groupBy.propagateUpdates(downstream, newDestinations);
+        }
+        final ModifiedColumnSet resultModifiedColumnSet =
+                inputToResultModifiedColumnSetFactory.apply(updateUpstreamModifiedColumnSet);
+        updateUpstreamModifiedColumnSet = null;
+
+        final boolean addsToProcess = downstream.added().isNonempty();
+        final boolean modifiesToProcess = downstream.modified().isNonempty() && resultModifiedColumnSet.nonempty();
+        final boolean removesToProcess = downstream.removed().isNonempty();
+
+        if (!addsToProcess && !modifiesToProcess && !removesToProcess) {
+            // Nothing to do.
+            return;
+        }
+
+        if (!addsToProcess && !modifiesToProcess) {
+            // Only removes to handle, clear the removed objects.
+            if (!resultColumn.getType().isPrimitive()) {
+                try (final DataFillerContext dataFillerContext = new DataFillerContext()) {
+                    dataFillerContext.clearObjectColumnData(downstream.removed());
+                }
+            }
+            return;
+        }
+
+        try (final DataCopyContext dataCopyContext = new DataCopyContext()) {
+            // Clear removed objects from the result column.
+            if (removesToProcess && !resultColumn.getType().isPrimitive()) {
+                dataCopyContext.clearObjectColumnData(downstream.removed());
+            }
+            if (modifiesToProcess) {
+                dataCopyContext.copyData(downstream.modified());
+            }
+            if (addsToProcess) {
+                dataCopyContext.copyData(downstream.added());
+            }
+        }
+    }
+
+    @Override
+    public void propagateFailure(@NotNull final Throwable originalException,
+            @NotNull final TableListener.Entry sourceEntry) {
+        if (delegateToBy) {
+            groupBy.propagateFailure(originalException, sourceEntry);
+        }
+    }
+
+    @Override
+    public BucketedContext makeBucketedContext(final int size) {
+        return delegateToBy ? groupBy.makeBucketedContext(size) : null;
+    }
+
+    @Override
+    public SingletonContext makeSingletonContext(final int size) {
+        return delegateToBy ? groupBy.makeSingletonContext(size) : null;
+    }
+
+    /**
+     * Helper class to efficiently clear object data from the result columns.
+     */
+    private class DataFillerContext implements SafeCloseable {
+
+        final FillFromContext fillFromContext;
+
+        private DataFillerContext() {
+            fillFromContext = resultColumn.makeFillFromContext(BLOCK_SIZE);
+        }
+
+        void clearObjectColumnData(@NotNull final RowSequence rowSequence) {
+            try (final RowSequence.Iterator rowSequenceIterator = rowSequence.getRowSequenceIterator();
+                    final WritableObjectChunk<?, Values> nullValueChunk =
+                            WritableObjectChunk.makeWritableChunk(BLOCK_SIZE)) {
+                nullValueChunk.fillWithNullValue(0, BLOCK_SIZE);
+                while (rowSequenceIterator.hasMore()) {
+                    final RowSequence rowSequenceSlice = rowSequenceIterator.getNextRowSequenceThrough(
+                            calculateContainingBlockLastKey(rowSequenceIterator.peekNextKey()));
+                    nullValueChunk.setSize(rowSequenceSlice.intSize());
+                    resultColumn.fillFromChunk(fillFromContext, nullValueChunk, rowSequenceSlice);
+                }
+            }
+        }
+
+        @Override
+        public void close() {
+            fillFromContext.close();
+        }
+    }
+
+    /**
+     * Helper class to efficiently copy data from the formula data source to the result column.
+     */
+    private class DataCopyContext extends DataFillerContext {
+
+        private final SharedContext sharedContext;
+        private final GetContext getContext;
+
+        private DataCopyContext() {
+            sharedContext = SharedContext.makeSharedContext();
+            getContext = formulaDataSource.makeGetContext(BLOCK_SIZE, sharedContext);
+        }
+
+        private void copyData(@NotNull final RowSequence rowSequence) {
+            try (final RowSequence.Iterator rowSequenceIterator = rowSequence.getRowSequenceIterator()) {
+                while (rowSequenceIterator.hasMore()) {
+                    final RowSequence rowSequenceSlice = rowSequenceIterator.getNextRowSequenceThrough(
+                            calculateContainingBlockLastKey(rowSequenceIterator.peekNextKey()));
+                    resultColumn.fillFromChunk(fillFromContext,
+                            formulaDataSource.getChunk(getContext, rowSequenceSlice), rowSequenceSlice);
+                    sharedContext.reset();
+                }
+            }
+        }
+
+        @Override
+        public void close() {
+            super.close();
+            sharedContext.close();
+            getContext.close();
+        }
+    }
+
+    private static long calculateContainingBlockLastKey(final long firstKey) {
+        return (firstKey / BLOCK_SIZE) * BLOCK_SIZE + BLOCK_SIZE - 1;
+    }
+}
diff --git a/engine/table/src/main/java/io/deephaven/engine/table/impl/by/GroupByChunkedOperator.java b/engine/table/src/main/java/io/deephaven/engine/table/impl/by/GroupByChunkedOperator.java
index 97d5e6c1723..398a10cb074 100644
--- a/engine/table/src/main/java/io/deephaven/engine/table/impl/by/GroupByChunkedOperator.java
+++ b/engine/table/src/main/java/io/deephaven/engine/table/impl/by/GroupByChunkedOperator.java
@@ -7,7 +7,6 @@
 import io.deephaven.chunk.attributes.ChunkLengths;
 import io.deephaven.chunk.attributes.ChunkPositions;
 import io.deephaven.chunk.attributes.Values;
-import io.deephaven.datastructures.util.CollectionUtil;
 import io.deephaven.engine.rowset.RowSetFactory;
 import io.deephaven.engine.table.*;
 import io.deephaven.engine.rowset.*;
@@ -27,7 +26,6 @@
 import java.util.LinkedHashMap;
 import java.util.Map;
 import java.util.function.UnaryOperator;
-import java.util.stream.Collectors;
 
 import static io.deephaven.engine.table.impl.sources.ArrayBackedColumnSource.BLOCK_SIZE;
 
@@ -47,6 +45,7 @@ public final class GroupByChunkedOperator implements IterativeChunkedAggregation
     private final ObjectArraySource<Object> removedBuilders;
 
     private final String[] inputColumnNames;
+    private final Map<String, AggregateColumnSource<?, ?>> inputAggregatedColumns;
     private final Map<String, AggregateColumnSource<?, ?>> resultAggregatedColumns;
     private final ModifiedColumnSet aggregationInputsModifiedColumnSet;
 
@@ -69,10 +68,16 @@ public GroupByChunkedOperator(
         live = inputTable.isRefreshing();
         rowSets = new ObjectArraySource<>(WritableRowSet.class);
         addedBuilders = new ObjectArraySource<>(Object.class);
-        resultAggregatedColumns = Arrays.stream(aggregatedColumnPairs).collect(Collectors.toMap(MatchPair::leftColumn,
-                matchPair -> AggregateColumnSource
-                        .make(inputTable.getColumnSource(matchPair.rightColumn()), rowSets),
-                Assert::neverInvoked, LinkedHashMap::new));
+
+        inputAggregatedColumns = new LinkedHashMap<>(aggregatedColumnPairs.length);
+        resultAggregatedColumns = new LinkedHashMap<>(aggregatedColumnPairs.length);
+        Arrays.stream(aggregatedColumnPairs).forEach(pair -> {
+            final AggregateColumnSource<?, ?> aggregateColumnSource =
+                    AggregateColumnSource.make(inputTable.getColumnSource(pair.rightColumn()), rowSets);
+            inputAggregatedColumns.put(pair.rightColumn(), aggregateColumnSource);
+            resultAggregatedColumns.put(pair.leftColumn(), aggregateColumnSource);
+        });
+
         if (exposeRowSetsAs != null && resultAggregatedColumns.containsKey(exposeRowSetsAs)) {
             throw new IllegalArgumentException(String.format(
                     "Exposing group RowSets as %s, but this conflicts with a requested grouped output column name",
@@ -387,6 +392,13 @@ public void ensureCapacity(final long tableSize) {
         return resultAggregatedColumns;
     }
 
+    /**
+     * Get a map from input column names to the corresponding output {@link ColumnSource}.
+     */
+    public Map<String, ? extends ColumnSource<?>> getInputResultColumns() {
+        return inputAggregatedColumns;
+    }
+
     @Override
     public void startTrackingPrevValues() {
         // NB: We don't need previous tracking on the rowSets ColumnSource, even if it's exposed. It's in destination
@@ -404,7 +416,7 @@ public UnaryOperator<ModifiedColumnSet> initializeRefreshing(
         initializeNewRowSetPreviousValues(resultTable.getRowSet());
         return registeredWithHelper
                 ? new InputToResultModifiedColumnSetFactory(resultTable,
-                        resultAggregatedColumns.keySet().toArray(CollectionUtil.ZERO_LENGTH_STRING_ARRAY))
+                        resultAggregatedColumns.keySet().toArray(String[]::new))
                 : null;
     }
 
@@ -615,4 +627,12 @@ public boolean requiresRowKeys() {
     public boolean unchunkedRowSet() {
         return true;
     }
+
+    boolean getSomeKeyHasAddsOrRemoves() {
+        return someKeyHasAddsOrRemoves;
+    }
+
+    boolean getSomeKeyHasModifies() {
+        return someKeyHasModifies;
+    }
 }
diff --git a/engine/table/src/main/java/io/deephaven/engine/table/impl/by/IncrementalChunkedOperatorAggregationStateManagerOpenAddressedBase.java b/engine/table/src/main/java/io/deephaven/engine/table/impl/by/IncrementalChunkedOperatorAggregationStateManagerOpenAddressedBase.java
index 4d1251aea3c..cfc5efccad7 100644
--- a/engine/table/src/main/java/io/deephaven/engine/table/impl/by/IncrementalChunkedOperatorAggregationStateManagerOpenAddressedBase.java
+++ b/engine/table/src/main/java/io/deephaven/engine/table/impl/by/IncrementalChunkedOperatorAggregationStateManagerOpenAddressedBase.java
@@ -4,26 +4,66 @@
 package io.deephaven.engine.table.impl.by;
 
 import io.deephaven.base.verify.Assert;
+import io.deephaven.base.verify.Require;
 import io.deephaven.chunk.Chunk;
 import io.deephaven.chunk.WritableIntChunk;
+import io.deephaven.chunk.attributes.Values;
 import io.deephaven.engine.rowset.RowSequence;
 import io.deephaven.engine.rowset.chunkattributes.RowKeys;
 import io.deephaven.engine.table.ColumnSource;
+import io.deephaven.engine.table.WritableColumnSource;
 import io.deephaven.engine.table.impl.by.alternatingcolumnsource.AlternatingColumnSource;
+import io.deephaven.engine.table.impl.sources.InMemoryColumnSource;
 import io.deephaven.engine.table.impl.sources.IntegerArraySource;
 import io.deephaven.engine.table.impl.sources.RedirectedColumnSource;
 import io.deephaven.engine.table.impl.sources.immutable.ImmutableIntArraySource;
 import io.deephaven.engine.table.impl.util.IntColumnSourceWritableRowRedirection;
 import io.deephaven.engine.table.impl.util.RowRedirection;
+import io.deephaven.engine.table.impl.util.TypedHasherUtil;
+import io.deephaven.engine.table.impl.util.TypedHasherUtil.BuildOrProbeContext;
 import io.deephaven.engine.table.impl.util.TypedHasherUtil.BuildOrProbeContext.ProbeContext;
 import io.deephaven.util.QueryConstants;
 import io.deephaven.util.SafeCloseable;
 import io.deephaven.util.mutable.MutableInt;
 import org.jetbrains.annotations.NotNull;
 
+import static io.deephaven.engine.table.impl.util.TypedHasherUtil.getKeyChunks;
+import static io.deephaven.engine.table.impl.util.TypedHasherUtil.getPrevKeyChunks;
+
 public abstract class IncrementalChunkedOperatorAggregationStateManagerOpenAddressedBase
-        extends OperatorAggregationStateManagerOpenAddressedAlternateBase
         implements IncrementalOperatorAggregationStateManager {
+    public static final int CHUNK_SIZE = ChunkedOperatorAggregationHelper.CHUNK_SIZE;
+    private static final long MAX_TABLE_SIZE = 1 << 30; // maximum array size
+
+    /** The number of slots in our table. */
+    protected int tableSize;
+
+    /**
+     * The number of slots in our alternate table, to start with "1" is a lie, but rehashPointer is zero; so our
+     * location value is positive and can be compared against rehashPointer safely
+     */
+    protected int alternateTableSize = 1;
+
+    /** Should we rehash the entire table fully ({@code true}) or incrementally ({@code false})? */
+    protected boolean fullRehash = true;
+
+    /** How much of the alternate sources are necessary to rehash? */
+    protected int rehashPointer = 0;
+
+    protected long numEntries = 0;
+
+    /**
+     * The table will be rehashed to a load factor of targetLoadFactor if our loadFactor exceeds maximumLoadFactor or if
+     * it falls below minimum load factor we will instead contract the table.
+     */
+    private final double maximumLoadFactor;
+
+    /** The keys for our hash entries. */
+    protected final WritableColumnSource[] mainKeySources;
+
+    /** The keys for our hash entries, for the old alternative smaller table. */
+    protected final ColumnSource[] alternateKeySources;
+
 
     /** Our state value used when nothing is there. */
     protected static final int EMPTY_OUTPUT_POSITION = QueryConstants.NULL_INT;
@@ -62,12 +102,221 @@ protected IncrementalChunkedOperatorAggregationStateManagerOpenAddressedBase(
             ColumnSource<?>[] tableKeySources,
             int tableSize,
             double maximumLoadFactor) {
-        super(tableKeySources, tableSize, maximumLoadFactor);
+        this.tableSize = tableSize;
+        Require.inRange(tableSize, "tableSize", MAX_TABLE_SIZE + 1, "MAX_TABLE_SIZE + 1");
+        Require.eq(Integer.bitCount(tableSize), "Integer.bitCount(tableSize)", 1);
+        Require.inRange(maximumLoadFactor, 0.0, 0.95, "maximumLoadFactor");
+
+        mainKeySources = new WritableColumnSource[tableKeySources.length];
+        alternateKeySources = new ColumnSource[tableKeySources.length];
+
+        for (int ii = 0; ii < tableKeySources.length; ++ii) {
+            mainKeySources[ii] = InMemoryColumnSource.getImmutableMemoryColumnSource(tableSize,
+                    tableKeySources[ii].getType(), tableKeySources[ii].getComponentType());
+        }
+
+        this.maximumLoadFactor = maximumLoadFactor;
         mainOutputPosition.ensureCapacity(tableSize);
     }
 
     @Override
-    protected void newAlternate() {
+    public final int maxTableSize() {
+        return Math.toIntExact(MAX_TABLE_SIZE);
+    }
+
+    protected abstract void build(RowSequence rowSequence, Chunk<Values>[] sourceKeyChunks);
+
+    public static class BuildContext extends BuildOrProbeContext {
+        private BuildContext(ColumnSource<?>[] buildSources, int chunkSize) {
+            super(buildSources, chunkSize);
+        }
+
+        final MutableInt rehashCredits = new MutableInt(0);
+    }
+
+    BuildContext makeBuildContext(ColumnSource<?>[] buildSources, long maxSize) {
+        return new BuildContext(buildSources, (int) Math.min(CHUNK_SIZE, maxSize));
+    }
+
+    public ProbeContext makeProbeContext(ColumnSource<?>[] buildSources, long maxSize) {
+        return new ProbeContext(buildSources, (int) Math.min(CHUNK_SIZE, maxSize));
+    }
+
+    protected void buildTable(
+            final BuildContext bc,
+            final RowSequence buildRows,
+            final ColumnSource<?>[] buildSources,
+            final BuildHandler buildHandler) {
+        try (final RowSequence.Iterator rsIt = buildRows.getRowSequenceIterator()) {
+            // noinspection unchecked
+            final Chunk<Values>[] sourceKeyChunks = new Chunk[buildSources.length];
+
+            while (rsIt.hasMore()) {
+                final RowSequence chunkOk = rsIt.getNextRowSequenceWithLength(bc.chunkSize);
+                final int nextChunkSize = chunkOk.intSize();
+                outputPositionToHashSlot.ensureCapacity(nextOutputPosition.get() + nextChunkSize, false);
+                while (doRehash(bc.rehashCredits, nextChunkSize)) {
+                    migrateFront();
+                }
+
+                getKeyChunks(buildSources, bc.getContexts, sourceKeyChunks, chunkOk);
+
+                final long oldEntries = numEntries;
+                buildHandler.doBuild(chunkOk, sourceKeyChunks);
+                final long entriesAdded = numEntries - oldEntries;
+                // if we actually added anything, then take away from the "equity" we've built up rehashing, otherwise
+                // don't penalize this build call with additional rehashing
+                bc.rehashCredits.subtract(Math.toIntExact(entriesAdded));
+
+                bc.resetSharedContexts();
+            }
+        }
+    }
+
+    abstract protected void migrateFront();
+
+    protected void probeTable(
+            final ProbeContext pc,
+            final RowSequence probeRows,
+            final boolean usePrev,
+            final ColumnSource<?>[] probeSources,
+            final ProbeHandler handler) {
+        try (final RowSequence.Iterator rsIt = probeRows.getRowSequenceIterator()) {
+            // noinspection unchecked
+            final Chunk<Values>[] sourceKeyChunks = new Chunk[probeSources.length];
+
+            while (rsIt.hasMore()) {
+                final RowSequence chunkOk = rsIt.getNextRowSequenceWithLength(pc.chunkSize);
+
+                if (usePrev) {
+                    getPrevKeyChunks(probeSources, pc.getContexts, sourceKeyChunks, chunkOk);
+                } else {
+                    getKeyChunks(probeSources, pc.getContexts, sourceKeyChunks, chunkOk);
+                }
+
+                handler.doProbe(chunkOk, sourceKeyChunks);
+
+                pc.resetSharedContexts();
+            }
+        }
+    }
+
+    @FunctionalInterface
+    public interface ProbeHandler {
+        void doProbe(RowSequence chunkOk, Chunk<Values>[] sourceKeyChunks);
+    }
+
+    @FunctionalInterface
+    public interface BuildHandler {
+        void doBuild(RowSequence chunkOk, Chunk<Values>[] sourceKeyChunks);
+    }
+
+    /**
+     * @param rehashCredits the number of entries this operation has rehashed (input/output)
+     * @param nextChunkSize the size of the chunk we are processing
+     * @return true if a front migration is required
+     */
+    public boolean doRehash(MutableInt rehashCredits, int nextChunkSize) {
+        if (rehashPointer > 0) {
+            final int requiredRehash = nextChunkSize - rehashCredits.get();
+            if (requiredRehash <= 0) {
+                return false;
+            }
+
+            // before building, we need to do at least as much rehash work as we would do build work
+            rehashCredits.add(rehashInternalPartial(requiredRehash));
+            if (rehashPointer == 0) {
+                clearAlternate();
+            }
+        }
+
+        int oldTableSize = tableSize;
+        while (rehashRequired(nextChunkSize)) {
+            tableSize *= 2;
+
+            if (tableSize < 0 || tableSize > MAX_TABLE_SIZE) {
+                throw new UnsupportedOperationException("Hash table exceeds maximum size!");
+            }
+        }
+
+        if (oldTableSize == tableSize) {
+            return false;
+        }
+
+        // we can't give the caller credit for rehashes with the old table, we need to begin migrating things again
+        if (rehashCredits.get() > 0) {
+            rehashCredits.set(0);
+        }
+
+        if (fullRehash) {
+            // if we are doing a full rehash, we need to ditch the alternate
+            if (rehashPointer > 0) {
+                rehashInternalPartial((int) numEntries);
+                clearAlternate();
+            }
+
+            rehashInternalFull(oldTableSize);
+
+            return false;
+        }
+
+        setupNewAlternate(oldTableSize);
+        adviseNewAlternate();
+
+        return true;
+    }
+
+    /**
+     * After creating the new alternate key states, advise the derived classes, so they can cast them to the typed
+     * versions of the column source and adjust the derived class pointers.
+     */
+    protected abstract void adviseNewAlternate();
+
+    protected void clearAlternate() {
+        for (int ii = 0; ii < mainKeySources.length; ++ii) {
+            alternateKeySources[ii] = null;
+        }
+        this.alternateOutputPosition = null;
+    }
+
+    /**
+     * @param numEntriesToRehash number of entries to rehash into main table
+     * @return actual number of entries rehashed
+     */
+    protected abstract int rehashInternalPartial(int numEntriesToRehash);
+
+    // full rehashInternal
+    protected abstract void rehashInternalFull(int oldSize);
+
+    public boolean rehashRequired(int nextChunkSize) {
+        return (numEntries + nextChunkSize) > (tableSize * maximumLoadFactor);
+    }
+
+    protected int hashToTableLocation(int hash) {
+        return hash & (tableSize - 1);
+    }
+
+    protected int hashToTableLocationAlternate(int hash) {
+        return hash & (alternateTableSize - 1);
+    }
+
+    @Override
+    abstract public int findPositionForKey(Object key);
+
+    private void setupNewAlternate(int oldTableSize) {
+        Assert.eqZero(rehashPointer, "rehashPointer");
+
+        for (int ii = 0; ii < mainKeySources.length; ++ii) {
+            alternateKeySources[ii] = mainKeySources[ii];
+            mainKeySources[ii] = InMemoryColumnSource.getImmutableMemoryColumnSource(tableSize,
+                    alternateKeySources[ii].getType(), alternateKeySources[ii].getComponentType());
+            mainKeySources[ii].ensureCapacity(tableSize);
+        }
+        alternateTableSize = oldTableSize;
+        if (numEntries > 0) {
+            rehashPointer = alternateTableSize;
+        }
+
         alternateOutputPosition = mainOutputPosition;
         mainOutputPosition = new ImmutableIntArraySource();
         mainOutputPosition.ensureCapacity(tableSize);
@@ -88,12 +337,6 @@ protected void newAlternate() {
         }
     }
 
-    @Override
-    protected void clearAlternate() {
-        super.clearAlternate();
-        this.alternateOutputPosition = null;
-    }
-
     @Override
     public SafeCloseable makeAggregationStateBuildContext(ColumnSource<?>[] buildSources, long maxSize) {
         return makeBuildContext(buildSources, maxSize);
@@ -117,11 +360,6 @@ public void add(
         this.nextOutputPosition = null;
     }
 
-    @Override
-    public void onNextChunk(int size) {
-        outputPositionToHashSlot.ensureCapacity(nextOutputPosition.get() + size, false);
-    }
-
     @Override
     public ColumnSource[] getKeyHashTableSources() {
         final RowRedirection resultIndexToHashSlot =
diff --git a/engine/table/src/main/java/io/deephaven/engine/table/impl/by/IncrementalChunkedOperatorAggregationStateManagerTypedBase.java b/engine/table/src/main/java/io/deephaven/engine/table/impl/by/IncrementalChunkedOperatorAggregationStateManagerTypedBase.java
deleted file mode 100644
index 0ddfba9124a..00000000000
--- a/engine/table/src/main/java/io/deephaven/engine/table/impl/by/IncrementalChunkedOperatorAggregationStateManagerTypedBase.java
+++ /dev/null
@@ -1,259 +0,0 @@
-//
-// Copyright (c) 2016-2024 Deephaven Data Labs and Patent Pending
-//
-package io.deephaven.engine.table.impl.by;
-
-import io.deephaven.chunk.WritableIntChunk;
-import io.deephaven.engine.rowset.RowSequence;
-import io.deephaven.engine.rowset.chunkattributes.RowKeys;
-import io.deephaven.engine.table.ColumnSource;
-import io.deephaven.engine.table.impl.sources.IntegerArraySource;
-import io.deephaven.engine.table.impl.sources.RedirectedColumnSource;
-import io.deephaven.engine.table.impl.util.IntColumnSourceWritableRowRedirection;
-import io.deephaven.engine.table.impl.util.RowRedirection;
-import io.deephaven.engine.table.impl.util.TypedHasherUtil.BuildOrProbeContext.BuildContext;
-import io.deephaven.engine.table.impl.util.TypedHasherUtil.BuildOrProbeContext.ProbeContext;
-import io.deephaven.util.QueryConstants;
-import io.deephaven.util.SafeCloseable;
-import io.deephaven.util.mutable.MutableInt;
-import org.jetbrains.annotations.NotNull;
-
-/**
- * Incremental aggregation state manager that is extended by code generated typed hashers.
- */
-public abstract class IncrementalChunkedOperatorAggregationStateManagerTypedBase
-        extends OperatorAggregationStateManagerTypedBase
-        implements IncrementalOperatorAggregationStateManager {
-    // our state value used when nothing is there
-    protected static final int EMPTY_OUTPUT_POSITION = QueryConstants.NULL_INT;
-
-    // the state value for the bucket, parallel to mainKeySources (the state is an output row key for the aggregation)
-    protected final IntegerArraySource mainOutputPosition = new IntegerArraySource();
-
-    // the state value for an overflow entry, parallel with overflowKeySources (the state is an output row key for the
-    // aggregation)
-    protected final IntegerArraySource overflowOutputPosition = new IntegerArraySource();
-
-    // used as a row redirection for the output key sources
-    private final IntegerArraySource outputPositionToHashSlot = new IntegerArraySource();
-
-    // handlers for use during initialization and updates
-    private final AddHandler addHandler = new AddHandler();
-    private final RemoveHandler removeHandler = new RemoveHandler();
-    private final ModifyHandler modifyHandler = new ModifyHandler();
-
-    protected IncrementalChunkedOperatorAggregationStateManagerTypedBase(ColumnSource<?>[] tableKeySources,
-            int tableSize, double maximumLoadFactor, double targetLoadFactor) {
-        super(tableKeySources, tableSize, maximumLoadFactor, targetLoadFactor);
-        ensureCapacity(tableSize);
-    }
-
-    @Override
-    public SafeCloseable makeAggregationStateBuildContext(ColumnSource<?>[] buildSources, long maxSize) {
-        return makeBuildContext(buildSources, maxSize);
-    }
-
-    @Override
-    public void add(
-            @NotNull final SafeCloseable bc,
-            @NotNull final RowSequence rowSequence,
-            @NotNull final ColumnSource<?>[] sources,
-            @NotNull final MutableInt nextOutputPosition,
-            @NotNull final WritableIntChunk<RowKeys> outputPositions) {
-        outputPositions.setSize(rowSequence.intSize());
-        if (rowSequence.isEmpty()) {
-            return;
-        }
-        addHandler.reset(nextOutputPosition, outputPositions);
-        buildTable(addHandler, (BuildContext) bc, rowSequence, sources);
-        addHandler.reset();
-    }
-
-    @Override
-    public ColumnSource[] getKeyHashTableSources() {
-        final RowRedirection resultRowKeyToHashSlot =
-                new IntColumnSourceWritableRowRedirection(outputPositionToHashSlot);
-        final ColumnSource[] keyHashTableSources = new ColumnSource[mainKeySources.length];
-        for (int kci = 0; kci < mainKeySources.length; ++kci) {
-            // noinspection unchecked
-            keyHashTableSources[kci] = RedirectedColumnSource.maybeRedirect(resultRowKeyToHashSlot,
-                    new HashTableColumnSource(mainKeySources[kci], overflowKeySources[kci]));
-        }
-        return keyHashTableSources;
-    }
-
-    @Override
-    public void startTrackingPrevValues() {}
-
-    @Override
-    public void beginUpdateCycle() {}
-
-    @Override
-    public void remove(
-            @NotNull final SafeCloseable pc,
-            @NotNull final RowSequence rowSequence,
-            @NotNull final ColumnSource<?>[] sources,
-            @NotNull final WritableIntChunk<RowKeys> outputPositions) {
-        outputPositions.setSize(rowSequence.intSize());
-        if (rowSequence.isEmpty()) {
-            return;
-        }
-        removeHandler.reset(outputPositions);
-        probeTable(removeHandler, (ProbeContext) pc, rowSequence, true, sources);
-        removeHandler.reset();
-    }
-
-    @Override
-    public void findModifications(
-            @NotNull final SafeCloseable pc,
-            @NotNull final RowSequence rowSequence,
-            @NotNull final ColumnSource<?>[] sources,
-            @NotNull final WritableIntChunk<RowKeys> outputPositions) {
-        outputPositions.setSize(rowSequence.intSize());
-        if (rowSequence.isEmpty()) {
-            return;
-        }
-        modifyHandler.reset(outputPositions);
-        probeTable(modifyHandler, (ProbeContext) pc, rowSequence, false, sources);
-        modifyHandler.reset();
-    }
-
-    @Override
-    protected void ensureMainState(final int tableSize) {
-        mainOutputPosition.ensureCapacity(tableSize);
-    }
-
-    @Override
-    protected void ensureOverflowState(final int newCapacity) {
-        overflowOutputPosition.ensureCapacity(newCapacity);
-    }
-
-    private class AddHandler extends HashHandler.BuildHandler {
-
-        MutableInt outputPosition;
-        WritableIntChunk<RowKeys> outputPositions;
-
-        void reset(
-                @NotNull final MutableInt nextOutputPosition,
-                @NotNull final WritableIntChunk<RowKeys> outputPositions) {
-            this.outputPosition = nextOutputPosition;
-            this.outputPositions = outputPositions;
-        }
-
-        void reset() {
-            outputPosition = null;
-            outputPositions = null;
-        }
-
-        @Override
-        public void doMainInsert(final int tableLocation, final int chunkPosition) {
-            final int nextOutputPosition = outputPosition.getAndIncrement();
-            outputPositions.set(chunkPosition, nextOutputPosition);
-            mainOutputPosition.set(tableLocation, nextOutputPosition);
-            outputPositionToHashSlot.set(nextOutputPosition, tableLocation);
-        }
-
-        @Override
-        public void doMainFound(final int tableLocation, final int chunkPosition) {
-            final int outputPosition = mainOutputPosition.getUnsafe(tableLocation);
-            outputPositions.set(chunkPosition, outputPosition);
-        }
-
-        @Override
-        public void doMoveMain(final int oldTableLocation, final int newTableLocation) {
-            final int outputPosition = mainOutputPosition.getUnsafe(newTableLocation);
-            outputPositionToHashSlot.set(outputPosition, newTableLocation);
-        }
-
-        @Override
-        public void doPromoteOverflow(final int overflowLocation, final int mainInsertLocation) {
-            outputPositionToHashSlot.set(mainOutputPosition.getUnsafe(mainInsertLocation), mainInsertLocation);
-        }
-
-        @Override
-        public void onNextChunk(final int size) {
-            outputPositionToHashSlot.ensureCapacity(outputPosition.get() + size);
-        }
-
-        @Override
-        public void doOverflowInsert(final int overflowLocation, final int chunkPosition) {
-            final int nextOutputPosition = outputPosition.getAndIncrement();
-            outputPositions.set(chunkPosition, nextOutputPosition);
-            overflowOutputPosition.set(overflowLocation, nextOutputPosition);
-            outputPositionToHashSlot.set(nextOutputPosition,
-                    HashTableColumnSource.overflowLocationToHashLocation(overflowLocation));
-        }
-
-        @Override
-        public void doOverflowFound(final int overflowLocation, final int chunkPosition) {
-            final int outputPosition = overflowOutputPosition.getUnsafe(overflowLocation);
-            outputPositions.set(chunkPosition, outputPosition);
-        }
-    }
-
-    class RemoveHandler extends HashHandler.ProbeHandler {
-
-        private WritableIntChunk<RowKeys> outputPositions;
-
-        public void reset(@NotNull final WritableIntChunk<RowKeys> outputPositions) {
-            this.outputPositions = outputPositions;
-        }
-
-        public void reset() {
-            this.outputPositions = null;
-        }
-
-        @Override
-        public void doMainFound(final int tableLocation, final int chunkPosition) {
-            final int outputPosition = mainOutputPosition.getUnsafe(tableLocation);
-            outputPositions.set(chunkPosition, outputPosition);
-        }
-
-        @Override
-        public void doOverflowFound(final int overflowLocation, final int chunkPosition) {
-            final int outputPosition = overflowOutputPosition.getUnsafe(overflowLocation);
-            outputPositions.set(chunkPosition, outputPosition);
-        }
-
-        @Override
-        public void onNextChunk(final int size) {}
-
-        @Override
-        public void doMissing(final int chunkPosition) {
-            throw new IllegalStateException();
-        }
-    }
-
-    class ModifyHandler extends HashHandler.ProbeHandler {
-
-        private WritableIntChunk<RowKeys> outputPositions;
-
-        public void reset(@NotNull final WritableIntChunk<RowKeys> outputPositions) {
-            this.outputPositions = outputPositions;
-        }
-
-        public void reset() {
-            outputPositions = null;
-        }
-
-        @Override
-        public void doMainFound(final int tableLocation, final int chunkPosition) {
-            final int outputPosition = mainOutputPosition.getUnsafe(tableLocation);
-            outputPositions.set(chunkPosition, outputPosition);
-        }
-
-        @Override
-        public void doOverflowFound(final int overflowLocation, final int chunkPosition) {
-            final int outputPosition = overflowOutputPosition.getUnsafe(overflowLocation);
-            outputPositions.set(chunkPosition, outputPosition);
-        }
-
-        @Override
-        public void onNextChunk(final int size) {}
-
-        @Override
-        public void doMissing(final int chunkPosition) {
-            throw new IllegalStateException();
-        }
-    }
-}
diff --git a/engine/table/src/main/java/io/deephaven/engine/table/impl/by/IntAddOnlySortedFirstOrLastChunkedOperator.java b/engine/table/src/main/java/io/deephaven/engine/table/impl/by/IntAddOnlySortedFirstOrLastChunkedOperator.java
index 3426df6ea32..1526cacf7b3 100644
--- a/engine/table/src/main/java/io/deephaven/engine/table/impl/by/IntAddOnlySortedFirstOrLastChunkedOperator.java
+++ b/engine/table/src/main/java/io/deephaven/engine/table/impl/by/IntAddOnlySortedFirstOrLastChunkedOperator.java
@@ -93,12 +93,16 @@ private boolean addChunk(@NotNull final IntChunk<? extends Values> values,
         for (int ii = newDestination ? 1 : 0; ii < length; ++ii) {
             final long index = indices.get(start + ii);
             final int value = values.get(start + ii);
-            final int comparison = IntComparisons.compare(value, bestValue);
-            // @formatter:off
-            final boolean better =
-                    ( isFirst && (comparison < 0 || (comparison == 0 && index < bestIndex))) ||
-                    (!isFirst && (comparison > 0 || (comparison == 0 && index > bestIndex)))  ;
-            // @formatter:on
+            final boolean better;
+            if (isFirst) {
+                better = index < bestIndex
+                        ? IntComparisons.leq(value, bestValue)
+                        : IntComparisons.lt(value, bestValue);
+            } else {
+                better = index > bestIndex
+                        ? IntComparisons.geq(value, bestValue)
+                        : IntComparisons.gt(value, bestValue);
+            }
             if (better) {
                 bestIndex = index;
                 bestValue = value;
diff --git a/engine/table/src/main/java/io/deephaven/engine/table/impl/by/IntBlinkSortedFirstOrLastChunkedOperator.java b/engine/table/src/main/java/io/deephaven/engine/table/impl/by/IntBlinkSortedFirstOrLastChunkedOperator.java
index 87031877036..6eaccc38e52 100644
--- a/engine/table/src/main/java/io/deephaven/engine/table/impl/by/IntBlinkSortedFirstOrLastChunkedOperator.java
+++ b/engine/table/src/main/java/io/deephaven/engine/table/impl/by/IntBlinkSortedFirstOrLastChunkedOperator.java
@@ -113,13 +113,10 @@ private boolean addChunk(@NotNull final IntChunk<? extends Values> values,
         for (int ii = newDestination ? 1 : 0; ii < length; ++ii) {
             final int chunkPos = start + ii;
             final int value = values.get(chunkPos);
-            final int comparison = IntComparisons.compare(value, bestValue);
-            // @formatter:off
             // No need to compare relative row keys. A stream's logical row set is always monotonically increasing.
-            final boolean better =
-                    ( isFirst && comparison <  0) ||
-                    (!isFirst && comparison >= 0)  ;
-            // @formatter:on
+            final boolean better = isFirst
+                    ? IntComparisons.lt(value, bestValue)
+                    : IntComparisons.geq(value, bestValue);
             if (better) {
                 bestChunkPos = chunkPos;
                 bestValue = value;
diff --git a/engine/table/src/main/java/io/deephaven/engine/table/impl/by/IterativeChunkedAggregationOperator.java b/engine/table/src/main/java/io/deephaven/engine/table/impl/by/IterativeChunkedAggregationOperator.java
index 0b7a0262f62..32b70edab87 100644
--- a/engine/table/src/main/java/io/deephaven/engine/table/impl/by/IterativeChunkedAggregationOperator.java
+++ b/engine/table/src/main/java/io/deephaven/engine/table/impl/by/IterativeChunkedAggregationOperator.java
@@ -3,7 +3,6 @@
 //
 package io.deephaven.engine.table.impl.by;
 
-import io.deephaven.datastructures.util.CollectionUtil;
 import io.deephaven.chunk.*;
 import io.deephaven.chunk.attributes.ChunkLengths;
 import io.deephaven.chunk.attributes.ChunkPositions;
@@ -296,7 +295,7 @@ default void propagateInitialState(@NotNull final QueryTable resultTable, int st
     default UnaryOperator<ModifiedColumnSet> initializeRefreshing(@NotNull final QueryTable resultTable,
             @NotNull final LivenessReferent aggregationUpdateListener) {
         final ModifiedColumnSet resultModifiedColumnSet = resultTable
-                .newModifiedColumnSet(getResultColumns().keySet().toArray(CollectionUtil.ZERO_LENGTH_STRING_ARRAY));
+                .newModifiedColumnSet(getResultColumns().keySet().toArray(String[]::new));
         return upstreamModifiedColumnSet -> resultModifiedColumnSet;
     }
 
diff --git a/engine/table/src/main/java/io/deephaven/engine/table/impl/by/LongAddOnlySortedFirstOrLastChunkedOperator.java b/engine/table/src/main/java/io/deephaven/engine/table/impl/by/LongAddOnlySortedFirstOrLastChunkedOperator.java
index eaee99d5b23..d0810bbf05f 100644
--- a/engine/table/src/main/java/io/deephaven/engine/table/impl/by/LongAddOnlySortedFirstOrLastChunkedOperator.java
+++ b/engine/table/src/main/java/io/deephaven/engine/table/impl/by/LongAddOnlySortedFirstOrLastChunkedOperator.java
@@ -93,12 +93,16 @@ private boolean addChunk(@NotNull final LongChunk<? extends Values> values,
         for (int ii = newDestination ? 1 : 0; ii < length; ++ii) {
             final long index = indices.get(start + ii);
             final long value = values.get(start + ii);
-            final int comparison = LongComparisons.compare(value, bestValue);
-            // @formatter:off
-            final boolean better =
-                    ( isFirst && (comparison < 0 || (comparison == 0 && index < bestIndex))) ||
-                    (!isFirst && (comparison > 0 || (comparison == 0 && index > bestIndex)))  ;
-            // @formatter:on
+            final boolean better;
+            if (isFirst) {
+                better = index < bestIndex
+                        ? LongComparisons.leq(value, bestValue)
+                        : LongComparisons.lt(value, bestValue);
+            } else {
+                better = index > bestIndex
+                        ? LongComparisons.geq(value, bestValue)
+                        : LongComparisons.gt(value, bestValue);
+            }
             if (better) {
                 bestIndex = index;
                 bestValue = value;
diff --git a/engine/table/src/main/java/io/deephaven/engine/table/impl/by/LongBlinkSortedFirstOrLastChunkedOperator.java b/engine/table/src/main/java/io/deephaven/engine/table/impl/by/LongBlinkSortedFirstOrLastChunkedOperator.java
index a83eb63e3e3..fdca6a1dbc4 100644
--- a/engine/table/src/main/java/io/deephaven/engine/table/impl/by/LongBlinkSortedFirstOrLastChunkedOperator.java
+++ b/engine/table/src/main/java/io/deephaven/engine/table/impl/by/LongBlinkSortedFirstOrLastChunkedOperator.java
@@ -113,13 +113,10 @@ private boolean addChunk(@NotNull final LongChunk<? extends Values> values,
         for (int ii = newDestination ? 1 : 0; ii < length; ++ii) {
             final int chunkPos = start + ii;
             final long value = values.get(chunkPos);
-            final int comparison = LongComparisons.compare(value, bestValue);
-            // @formatter:off
             // No need to compare relative row keys. A stream's logical row set is always monotonically increasing.
-            final boolean better =
-                    ( isFirst && comparison <  0) ||
-                    (!isFirst && comparison >= 0)  ;
-            // @formatter:on
+            final boolean better = isFirst
+                    ? LongComparisons.lt(value, bestValue)
+                    : LongComparisons.geq(value, bestValue);
             if (better) {
                 bestChunkPos = chunkPos;
                 bestValue = value;
diff --git a/engine/table/src/main/java/io/deephaven/engine/table/impl/by/ObjectAddOnlySortedFirstOrLastChunkedOperator.java b/engine/table/src/main/java/io/deephaven/engine/table/impl/by/ObjectAddOnlySortedFirstOrLastChunkedOperator.java
index f7e59f1bd36..b9c1804c33c 100644
--- a/engine/table/src/main/java/io/deephaven/engine/table/impl/by/ObjectAddOnlySortedFirstOrLastChunkedOperator.java
+++ b/engine/table/src/main/java/io/deephaven/engine/table/impl/by/ObjectAddOnlySortedFirstOrLastChunkedOperator.java
@@ -93,12 +93,16 @@ private boolean addChunk(@NotNull final ObjectChunk<Object, ? extends Values> va
         for (int ii = newDestination ? 1 : 0; ii < length; ++ii) {
             final long index = indices.get(start + ii);
             final Object value = values.get(start + ii);
-            final int comparison = ObjectComparisons.compare(value, bestValue);
-            // @formatter:off
-            final boolean better =
-                    ( isFirst && (comparison < 0 || (comparison == 0 && index < bestIndex))) ||
-                    (!isFirst && (comparison > 0 || (comparison == 0 && index > bestIndex)))  ;
-            // @formatter:on
+            final boolean better;
+            if (isFirst) {
+                better = index < bestIndex
+                        ? ObjectComparisons.leq(value, bestValue)
+                        : ObjectComparisons.lt(value, bestValue);
+            } else {
+                better = index > bestIndex
+                        ? ObjectComparisons.geq(value, bestValue)
+                        : ObjectComparisons.gt(value, bestValue);
+            }
             if (better) {
                 bestIndex = index;
                 bestValue = value;
diff --git a/engine/table/src/main/java/io/deephaven/engine/table/impl/by/ObjectBlinkSortedFirstOrLastChunkedOperator.java b/engine/table/src/main/java/io/deephaven/engine/table/impl/by/ObjectBlinkSortedFirstOrLastChunkedOperator.java
index c5d7dfd2507..9e47ffe91d7 100644
--- a/engine/table/src/main/java/io/deephaven/engine/table/impl/by/ObjectBlinkSortedFirstOrLastChunkedOperator.java
+++ b/engine/table/src/main/java/io/deephaven/engine/table/impl/by/ObjectBlinkSortedFirstOrLastChunkedOperator.java
@@ -113,13 +113,10 @@ private boolean addChunk(@NotNull final ObjectChunk<Object, ? extends Values> va
         for (int ii = newDestination ? 1 : 0; ii < length; ++ii) {
             final int chunkPos = start + ii;
             final Object value = values.get(chunkPos);
-            final int comparison = ObjectComparisons.compare(value, bestValue);
-            // @formatter:off
             // No need to compare relative row keys. A stream's logical row set is always monotonically increasing.
-            final boolean better =
-                    ( isFirst && comparison <  0) ||
-                    (!isFirst && comparison >= 0)  ;
-            // @formatter:on
+            final boolean better = isFirst
+                    ? ObjectComparisons.lt(value, bestValue)
+                    : ObjectComparisons.geq(value, bestValue);
             if (better) {
                 bestChunkPos = chunkPos;
                 bestValue = value;
diff --git a/engine/table/src/main/java/io/deephaven/engine/table/impl/by/OperatorAggregationStateManagerOpenAddressedAlternateBase.java b/engine/table/src/main/java/io/deephaven/engine/table/impl/by/OperatorAggregationStateManagerOpenAddressedAlternateBase.java
deleted file mode 100644
index fdda408ab35..00000000000
--- a/engine/table/src/main/java/io/deephaven/engine/table/impl/by/OperatorAggregationStateManagerOpenAddressedAlternateBase.java
+++ /dev/null
@@ -1,263 +0,0 @@
-//
-// Copyright (c) 2016-2024 Deephaven Data Labs and Patent Pending
-//
-package io.deephaven.engine.table.impl.by;
-
-import io.deephaven.base.verify.Assert;
-import io.deephaven.base.verify.Require;
-import io.deephaven.chunk.Chunk;
-import io.deephaven.chunk.attributes.Values;
-import io.deephaven.engine.rowset.RowSequence;
-import io.deephaven.engine.table.*;
-import io.deephaven.engine.table.impl.sources.InMemoryColumnSource;
-import io.deephaven.engine.table.impl.util.TypedHasherUtil.BuildOrProbeContext.ProbeContext;
-import io.deephaven.util.mutable.MutableInt;
-
-import static io.deephaven.engine.table.impl.util.TypedHasherUtil.*;
-
-public abstract class OperatorAggregationStateManagerOpenAddressedAlternateBase
-        implements OperatorAggregationStateManager {
-    public static final int CHUNK_SIZE = ChunkedOperatorAggregationHelper.CHUNK_SIZE;
-    private static final long MAX_TABLE_SIZE = 1 << 30; // maximum array size
-
-    /** The number of slots in our table. */
-    protected int tableSize;
-
-    /**
-     * The number of slots in our alternate table, to start with "1" is a lie, but rehashPointer is zero; so our
-     * location value is positive and can be compared against rehashPointer safely
-     */
-    protected int alternateTableSize = 1;
-
-    /** Should we rehash the entire table fully ({@code true}) or incrementally ({@code false})? */
-    protected boolean fullRehash = true;
-
-    /** How much of the alternate sources are necessary to rehash? */
-    protected int rehashPointer = 0;
-
-    protected long numEntries = 0;
-
-    /**
-     * The table will be rehashed to a load factor of targetLoadFactor if our loadFactor exceeds maximumLoadFactor or if
-     * it falls below minimum load factor we will instead contract the table.
-     */
-    private final double maximumLoadFactor;
-
-    /** The keys for our hash entries. */
-    protected final WritableColumnSource[] mainKeySources;
-
-    /** The keys for our hash entries, for the old alternative smaller table. */
-    protected final ColumnSource[] alternateKeySources;
-
-    protected OperatorAggregationStateManagerOpenAddressedAlternateBase(ColumnSource<?>[] tableKeySources,
-            int tableSize,
-            double maximumLoadFactor) {
-        this.tableSize = tableSize;
-        Require.inRange(tableSize, "tableSize", MAX_TABLE_SIZE + 1, "MAX_TABLE_SIZE + 1");
-        Require.eq(Integer.bitCount(tableSize), "Integer.bitCount(tableSize)", 1);
-        Require.inRange(maximumLoadFactor, 0.0, 0.95, "maximumLoadFactor");
-
-        mainKeySources = new WritableColumnSource[tableKeySources.length];
-        alternateKeySources = new ColumnSource[tableKeySources.length];
-
-        for (int ii = 0; ii < tableKeySources.length; ++ii) {
-            mainKeySources[ii] = InMemoryColumnSource.getImmutableMemoryColumnSource(tableSize,
-                    tableKeySources[ii].getType(), tableKeySources[ii].getComponentType());
-        }
-
-        this.maximumLoadFactor = maximumLoadFactor;
-    }
-
-    @Override
-    public final int maxTableSize() {
-        return Math.toIntExact(MAX_TABLE_SIZE);
-    }
-
-    protected abstract void build(RowSequence rowSequence, Chunk<Values>[] sourceKeyChunks);
-
-    public static class BuildContext extends BuildOrProbeContext {
-        private BuildContext(ColumnSource<?>[] buildSources, int chunkSize) {
-            super(buildSources, chunkSize);
-        }
-
-        final MutableInt rehashCredits = new MutableInt(0);
-    }
-
-    BuildContext makeBuildContext(ColumnSource<?>[] buildSources, long maxSize) {
-        return new BuildContext(buildSources, (int) Math.min(CHUNK_SIZE, maxSize));
-    }
-
-    public ProbeContext makeProbeContext(ColumnSource<?>[] buildSources, long maxSize) {
-        return new ProbeContext(buildSources, (int) Math.min(CHUNK_SIZE, maxSize));
-    }
-
-    protected abstract void onNextChunk(int nextChunkSize);
-
-    protected void buildTable(
-            final BuildContext bc,
-            final RowSequence buildRows,
-            final ColumnSource<?>[] buildSources,
-            final BuildHandler buildHandler) {
-        try (final RowSequence.Iterator rsIt = buildRows.getRowSequenceIterator()) {
-            // noinspection unchecked
-            final Chunk<Values>[] sourceKeyChunks = new Chunk[buildSources.length];
-
-            while (rsIt.hasMore()) {
-                final RowSequence chunkOk = rsIt.getNextRowSequenceWithLength(bc.chunkSize);
-                final int nextChunkSize = chunkOk.intSize();
-                onNextChunk(nextChunkSize);
-                while (doRehash(bc.rehashCredits, nextChunkSize)) {
-                    migrateFront();
-                }
-
-                getKeyChunks(buildSources, bc.getContexts, sourceKeyChunks, chunkOk);
-
-                final long oldEntries = numEntries;
-                buildHandler.doBuild(chunkOk, sourceKeyChunks);
-                final long entriesAdded = numEntries - oldEntries;
-                // if we actually added anything, then take away from the "equity" we've built up rehashing, otherwise
-                // don't penalize this build call with additional rehashing
-                bc.rehashCredits.subtract(Math.toIntExact(entriesAdded));
-
-                bc.resetSharedContexts();
-            }
-        }
-    }
-
-    abstract protected void migrateFront();
-
-    protected void probeTable(
-            final ProbeContext pc,
-            final RowSequence probeRows,
-            final boolean usePrev,
-            final ColumnSource<?>[] probeSources,
-            final ProbeHandler handler) {
-        try (final RowSequence.Iterator rsIt = probeRows.getRowSequenceIterator()) {
-            // noinspection unchecked
-            final Chunk<Values>[] sourceKeyChunks = new Chunk[probeSources.length];
-
-            while (rsIt.hasMore()) {
-                final RowSequence chunkOk = rsIt.getNextRowSequenceWithLength(pc.chunkSize);
-
-                if (usePrev) {
-                    getPrevKeyChunks(probeSources, pc.getContexts, sourceKeyChunks, chunkOk);
-                } else {
-                    getKeyChunks(probeSources, pc.getContexts, sourceKeyChunks, chunkOk);
-                }
-
-                handler.doProbe(chunkOk, sourceKeyChunks);
-
-                pc.resetSharedContexts();
-            }
-        }
-    }
-
-    @FunctionalInterface
-    public interface ProbeHandler {
-        void doProbe(RowSequence chunkOk, Chunk<Values>[] sourceKeyChunks);
-    }
-
-    @FunctionalInterface
-    public interface BuildHandler {
-        void doBuild(RowSequence chunkOk, Chunk<Values>[] sourceKeyChunks);
-    }
-
-    /**
-     * @param rehashCredits the number of entries this operation has rehashed (input/output)
-     * @param nextChunkSize the size of the chunk we are processing
-     * @return true if a front migration is required
-     */
-    public boolean doRehash(MutableInt rehashCredits, int nextChunkSize) {
-        if (rehashPointer > 0) {
-            final int requiredRehash = nextChunkSize - rehashCredits.get();
-            if (requiredRehash <= 0) {
-                return false;
-            }
-
-            // before building, we need to do at least as much rehash work as we would do build work
-            rehashCredits.add(rehashInternalPartial(requiredRehash));
-            if (rehashPointer == 0) {
-                clearAlternate();
-            }
-        }
-
-        int oldTableSize = tableSize;
-        while (rehashRequired(nextChunkSize)) {
-            tableSize *= 2;
-
-            if (tableSize < 0 || tableSize > MAX_TABLE_SIZE) {
-                throw new UnsupportedOperationException("Hash table exceeds maximum size!");
-            }
-        }
-
-        if (oldTableSize == tableSize) {
-            return false;
-        }
-
-        // we can't give the caller credit for rehashes with the old table, we need to begin migrating things again
-        if (rehashCredits.get() > 0) {
-            rehashCredits.set(0);
-        }
-
-        if (fullRehash) {
-            // if we are doing a full rehash, we need to ditch the alternate
-            if (rehashPointer > 0) {
-                rehashInternalPartial((int) numEntries);
-                clearAlternate();
-            }
-
-            rehashInternalFull(oldTableSize);
-
-            return false;
-        }
-
-        Assert.eqZero(rehashPointer, "rehashPointer");
-
-        for (int ii = 0; ii < mainKeySources.length; ++ii) {
-            alternateKeySources[ii] = mainKeySources[ii];
-            mainKeySources[ii] = InMemoryColumnSource.getImmutableMemoryColumnSource(tableSize,
-                    alternateKeySources[ii].getType(), alternateKeySources[ii].getComponentType());
-            mainKeySources[ii].ensureCapacity(tableSize);
-        }
-        alternateTableSize = oldTableSize;
-        if (numEntries > 0) {
-            rehashPointer = alternateTableSize;
-        }
-
-        newAlternate();
-
-        return true;
-    }
-
-    protected abstract void newAlternate();
-
-    protected void clearAlternate() {
-        for (int ii = 0; ii < mainKeySources.length; ++ii) {
-            alternateKeySources[ii] = null;
-        }
-    }
-
-    /**
-     * @param numEntriesToRehash number of entries to rehash into main table
-     * @return actual number of entries rehashed
-     */
-    protected abstract int rehashInternalPartial(int numEntriesToRehash);
-
-    // full rehashInternal
-    protected abstract void rehashInternalFull(int oldSize);
-
-    public boolean rehashRequired(int nextChunkSize) {
-        return (numEntries + nextChunkSize) > (tableSize * maximumLoadFactor);
-    }
-
-    protected int hashToTableLocation(int hash) {
-        return hash & (tableSize - 1);
-    }
-
-    protected int hashToTableLocationAlternate(int hash) {
-        return hash & (alternateTableSize - 1);
-    }
-
-    @Override
-    abstract public int findPositionForKey(Object key);
-}
diff --git a/engine/table/src/main/java/io/deephaven/engine/table/impl/by/RecordingInternalOperator.java b/engine/table/src/main/java/io/deephaven/engine/table/impl/by/RecordingInternalOperator.java
new file mode 100644
index 00000000000..fadd17793a3
--- /dev/null
+++ b/engine/table/src/main/java/io/deephaven/engine/table/impl/by/RecordingInternalOperator.java
@@ -0,0 +1,162 @@
+//
+// Copyright (c) 2016-2024 Deephaven Data Labs and Patent Pending
+//
+package io.deephaven.engine.table.impl.by;
+
+import io.deephaven.base.verify.Assert;
+import io.deephaven.chunk.*;
+import io.deephaven.chunk.attributes.ChunkLengths;
+import io.deephaven.chunk.attributes.ChunkPositions;
+import io.deephaven.chunk.attributes.Values;
+import io.deephaven.engine.rowset.chunkattributes.RowKeys;
+import io.deephaven.engine.table.ColumnSource;
+
+import java.util.Collections;
+import java.util.Map;
+
+/**
+ * Implements a generic recording operator that stores a chunk for retrieval by other operators. This must be added to
+ * the operator chain before the operator that will use the chunk.
+ * <p>
+ * Recording operators are generally used to allow an operator to access more than one input column data.
+ */
+class RecordingInternalOperator implements IterativeChunkedAggregationOperator {
+    private Context currentContext = null;
+    private final String inputColumnName;
+    private final ColumnSource<?> inputColumnSource;
+
+    class Context implements SingletonContext, BucketedContext {
+        private Chunk<? extends Values> valuesChunk;
+        private Chunk<? extends Values> prevValuesChunk;
+
+        private Context(int size) {
+            Assert.eqNull(currentContext, "currentContext.getValue()");
+            currentContext = this;
+        }
+
+        void setValues(Chunk<? extends Values> values) {
+            valuesChunk = values;
+        }
+
+        void setPrevValues(Chunk<? extends Values> values) {
+            prevValuesChunk = values;
+        }
+
+        @Override
+        public void close() {
+            Assert.eq(currentContext, "currentContext", this, "this");
+            currentContext = null;
+        }
+    }
+
+    public RecordingInternalOperator(String inputColumnName, ColumnSource<?> inputColumnSource) {
+        this.inputColumnName = inputColumnName;
+        this.inputColumnSource = inputColumnSource;
+    }
+
+    @Override
+    public void addChunk(
+            final BucketedContext context, Chunk<? extends Values> values,
+            final LongChunk<? extends RowKeys> inputRowKeys, IntChunk<RowKeys> destinations,
+            final IntChunk<ChunkPositions> startPositions, IntChunk<ChunkLengths> length,
+            final WritableBooleanChunk<Values> stateModified) {
+        ((Context) context).setValues(values);
+    }
+
+    @Override
+    public boolean addChunk(
+            final SingletonContext context,
+            final int chunkSize,
+            final Chunk<? extends Values> values,
+            final LongChunk<? extends RowKeys> inputRowKeys, long destination) {
+        ((Context) context).setValues(values);
+        return false;
+    }
+
+    @Override
+    public void removeChunk(
+            final BucketedContext context,
+            final Chunk<? extends Values> values,
+            final LongChunk<? extends RowKeys> inputRowKeys,
+            final IntChunk<RowKeys> destinations,
+            final IntChunk<ChunkPositions> startPositions,
+            final IntChunk<ChunkLengths> length,
+            final WritableBooleanChunk<Values> stateModified) {
+        ((Context) context).setValues(values);
+    }
+
+    @Override
+    public boolean removeChunk(
+            final SingletonContext context,
+            final int chunkSize,
+            final Chunk<? extends Values> values,
+            final LongChunk<? extends RowKeys> inputRowKeys,
+            final long destination) {
+        ((Context) context).setValues(values);
+        return false;
+    }
+
+    @Override
+    public void modifyChunk(
+            final BucketedContext context,
+            final Chunk<? extends Values> previousValues,
+            final Chunk<? extends Values> newValues,
+            final LongChunk<? extends RowKeys> postShiftRowKeys,
+            final IntChunk<RowKeys> destinations,
+            final IntChunk<ChunkPositions> startPositions,
+            final IntChunk<ChunkLengths> length,
+            final WritableBooleanChunk<Values> stateModified) {
+        ((Context) context).setPrevValues(previousValues);
+        ((Context) context).setValues(newValues);
+    }
+
+    @Override
+    public boolean modifyChunk(
+            final SingletonContext context,
+            final int chunkSize,
+            final Chunk<? extends Values> previousValues,
+            final Chunk<? extends Values> newValues,
+            final LongChunk<? extends RowKeys> postShiftRowKeys,
+            final long destination) {
+        ((Context) context).setPrevValues(previousValues);
+        ((Context) context).setValues(newValues);
+        return false;
+    }
+
+    @Override
+    public void ensureCapacity(final long tableSize) {}
+
+    @Override
+    public Map<String, ? extends ColumnSource<?>> getResultColumns() {
+        return Collections.emptyMap();
+    }
+
+    @Override
+    public void startTrackingPrevValues() {}
+
+    public Chunk<? extends Values> getValueChunk() {
+        return currentContext.valuesChunk;
+    }
+
+    public Chunk<? extends Values> getPrevValueChunk() {
+        return currentContext.prevValuesChunk;
+    }
+
+    public String getInputColumnName() {
+        return inputColumnName;
+    }
+
+    public ColumnSource<?> getInputColumnSource() {
+        return inputColumnSource;
+    }
+
+    @Override
+    public BucketedContext makeBucketedContext(final int size) {
+        return new Context(size);
+    }
+
+    @Override
+    public SingletonContext makeSingletonContext(final int size) {
+        return new Context(size);
+    }
+}
diff --git a/engine/table/src/main/java/io/deephaven/engine/table/impl/by/ShortAddOnlySortedFirstOrLastChunkedOperator.java b/engine/table/src/main/java/io/deephaven/engine/table/impl/by/ShortAddOnlySortedFirstOrLastChunkedOperator.java
index 8f711660d94..378a2d5dc43 100644
--- a/engine/table/src/main/java/io/deephaven/engine/table/impl/by/ShortAddOnlySortedFirstOrLastChunkedOperator.java
+++ b/engine/table/src/main/java/io/deephaven/engine/table/impl/by/ShortAddOnlySortedFirstOrLastChunkedOperator.java
@@ -93,12 +93,16 @@ private boolean addChunk(@NotNull final ShortChunk<? extends Values> values,
         for (int ii = newDestination ? 1 : 0; ii < length; ++ii) {
             final long index = indices.get(start + ii);
             final short value = values.get(start + ii);
-            final int comparison = ShortComparisons.compare(value, bestValue);
-            // @formatter:off
-            final boolean better =
-                    ( isFirst && (comparison < 0 || (comparison == 0 && index < bestIndex))) ||
-                    (!isFirst && (comparison > 0 || (comparison == 0 && index > bestIndex)))  ;
-            // @formatter:on
+            final boolean better;
+            if (isFirst) {
+                better = index < bestIndex
+                        ? ShortComparisons.leq(value, bestValue)
+                        : ShortComparisons.lt(value, bestValue);
+            } else {
+                better = index > bestIndex
+                        ? ShortComparisons.geq(value, bestValue)
+                        : ShortComparisons.gt(value, bestValue);
+            }
             if (better) {
                 bestIndex = index;
                 bestValue = value;
diff --git a/engine/table/src/main/java/io/deephaven/engine/table/impl/by/ShortBlinkSortedFirstOrLastChunkedOperator.java b/engine/table/src/main/java/io/deephaven/engine/table/impl/by/ShortBlinkSortedFirstOrLastChunkedOperator.java
index 89e08011ed4..938cddfeeec 100644
--- a/engine/table/src/main/java/io/deephaven/engine/table/impl/by/ShortBlinkSortedFirstOrLastChunkedOperator.java
+++ b/engine/table/src/main/java/io/deephaven/engine/table/impl/by/ShortBlinkSortedFirstOrLastChunkedOperator.java
@@ -113,13 +113,10 @@ private boolean addChunk(@NotNull final ShortChunk<? extends Values> values,
         for (int ii = newDestination ? 1 : 0; ii < length; ++ii) {
             final int chunkPos = start + ii;
             final short value = values.get(chunkPos);
-            final int comparison = ShortComparisons.compare(value, bestValue);
-            // @formatter:off
             // No need to compare relative row keys. A stream's logical row set is always monotonically increasing.
-            final boolean better =
-                    ( isFirst && comparison <  0) ||
-                    (!isFirst && comparison >= 0)  ;
-            // @formatter:on
+            final boolean better = isFirst
+                    ? ShortComparisons.lt(value, bestValue)
+                    : ShortComparisons.geq(value, bestValue);
             if (better) {
                 bestChunkPos = chunkPos;
                 bestValue = value;
diff --git a/engine/table/src/main/java/io/deephaven/engine/table/impl/by/StaticChunkedOperatorAggregationStateManagerTypedBase.java b/engine/table/src/main/java/io/deephaven/engine/table/impl/by/StaticChunkedOperatorAggregationStateManagerTypedBase.java
deleted file mode 100644
index f666b81ec6e..00000000000
--- a/engine/table/src/main/java/io/deephaven/engine/table/impl/by/StaticChunkedOperatorAggregationStateManagerTypedBase.java
+++ /dev/null
@@ -1,131 +0,0 @@
-//
-// Copyright (c) 2016-2024 Deephaven Data Labs and Patent Pending
-//
-package io.deephaven.engine.table.impl.by;
-
-import io.deephaven.chunk.*;
-import io.deephaven.engine.rowset.RowSequence;
-import io.deephaven.engine.rowset.chunkattributes.RowKeys;
-import io.deephaven.engine.table.ColumnSource;
-import io.deephaven.engine.table.impl.sources.IntegerArraySource;
-import io.deephaven.engine.table.impl.sources.RedirectedColumnSource;
-import io.deephaven.engine.table.impl.util.IntColumnSourceWritableRowRedirection;
-import io.deephaven.engine.table.impl.util.RowRedirection;
-import io.deephaven.util.QueryConstants;
-import io.deephaven.util.SafeCloseable;
-import io.deephaven.util.mutable.MutableInt;
-import io.deephaven.engine.table.impl.util.TypedHasherUtil.BuildOrProbeContext.BuildContext;
-
-public abstract class StaticChunkedOperatorAggregationStateManagerTypedBase
-        extends OperatorAggregationStateManagerTypedBase implements HashHandler {
-    // our state value used when nothing is there
-    protected static final int EMPTY_OUTPUT_POSITION = QueryConstants.NULL_INT;
-
-    // the state value for the bucket, parallel to mainKeySources (the state is an output row key for the aggregation)
-    protected final IntegerArraySource mainOutputPosition = new IntegerArraySource();
-
-    // the state value for an overflow entry, parallel with overflowKeySources (the state is an output row key for the
-    // aggregation)
-    protected final IntegerArraySource overflowOutputPosition = new IntegerArraySource();
-
-    // used as a row redirection for the output key sources
-    private final IntegerArraySource outputPositionToHashSlot = new IntegerArraySource();
-
-    // state variables that exist as part of the update
-    private MutableInt outputPosition;
-    private WritableIntChunk<RowKeys> outputPositions;
-
-    protected StaticChunkedOperatorAggregationStateManagerTypedBase(ColumnSource<?>[] tableKeySources, int tableSize,
-            double maximumLoadFactor, double targetLoadFactor) {
-        super(tableKeySources, tableSize, maximumLoadFactor, targetLoadFactor);
-        ensureCapacity(tableSize);
-    }
-
-    @Override
-    public SafeCloseable makeAggregationStateBuildContext(ColumnSource<?>[] buildSources, long maxSize) {
-        return makeBuildContext(buildSources, maxSize);
-    }
-
-    @Override
-    public void add(final SafeCloseable bc, RowSequence rowSequence, ColumnSource<?>[] sources,
-            MutableInt nextOutputPosition, WritableIntChunk<RowKeys> outputPositions) {
-        outputPositions.setSize(rowSequence.intSize());
-        if (rowSequence.isEmpty()) {
-            return;
-        }
-        this.outputPosition = nextOutputPosition;
-        this.outputPositions = outputPositions;
-        buildTable(this, (BuildContext) bc, rowSequence, sources);
-    }
-
-    @Override
-    public void doMainInsert(int tableLocation, int chunkPosition) {
-        final int nextOutputPosition = outputPosition.getAndIncrement();
-        outputPositions.set(chunkPosition, nextOutputPosition);
-        mainOutputPosition.set(tableLocation, nextOutputPosition);
-        outputPositionToHashSlot.set(nextOutputPosition, tableLocation);
-    }
-
-    @Override
-    public void doMoveMain(int oldTableLocation, int newTableLocation) {
-        outputPositionToHashSlot.set(mainOutputPosition.getUnsafe(newTableLocation), newTableLocation);
-    }
-
-    @Override
-    public void doPromoteOverflow(int overflowLocation, int mainInsertLocation) {
-        outputPositionToHashSlot.set(mainOutputPosition.getUnsafe(mainInsertLocation), mainInsertLocation);
-    }
-
-    @Override
-    public void onNextChunk(int size) {
-        outputPositionToHashSlot.ensureCapacity(outputPosition.get() + size);
-    }
-
-    @Override
-    public void doMainFound(int tableLocation, int chunkPosition) {
-        outputPositions.set(chunkPosition, mainOutputPosition.getUnsafe(tableLocation));
-    }
-
-    @Override
-    public void doOverflowFound(int overflowLocation, int chunkPosition) {
-        outputPositions.set(chunkPosition, overflowOutputPosition.getUnsafe(overflowLocation));
-    }
-
-    @Override
-    public void doOverflowInsert(int overflowLocation, int chunkPosition) {
-        final int nextOutputPosition = outputPosition.getAndIncrement();
-        outputPositions.set(chunkPosition, nextOutputPosition);
-        overflowOutputPosition.set(overflowLocation, nextOutputPosition);
-        outputPositionToHashSlot.set(nextOutputPosition,
-                HashTableColumnSource.overflowLocationToHashLocation(overflowLocation));
-    }
-
-    @Override
-    public void doMissing(int chunkPosition) {
-        // we never probe
-        throw new IllegalStateException();
-    }
-
-    @Override
-    protected void ensureMainState(int tableSize) {
-        mainOutputPosition.ensureCapacity(tableSize);
-    }
-
-    @Override
-    protected void ensureOverflowState(int newCapacity) {
-        overflowOutputPosition.ensureCapacity(newCapacity);
-    }
-
-    @Override
-    public ColumnSource[] getKeyHashTableSources() {
-        final RowRedirection resultIndexToHashSlot =
-                new IntColumnSourceWritableRowRedirection(outputPositionToHashSlot);
-        final ColumnSource[] keyHashTableSources = new ColumnSource[mainKeySources.length];
-        for (int kci = 0; kci < mainKeySources.length; ++kci) {
-            // noinspection unchecked
-            keyHashTableSources[kci] = RedirectedColumnSource.maybeRedirect(resultIndexToHashSlot,
-                    new HashTableColumnSource(mainKeySources[kci], overflowKeySources[kci]));
-        }
-        return keyHashTableSources;
-    }
-}
diff --git a/engine/table/src/main/java/io/deephaven/engine/table/impl/by/ssmcountdistinct/ObjectSsmBackedSource.java b/engine/table/src/main/java/io/deephaven/engine/table/impl/by/ssmcountdistinct/ObjectSsmBackedSource.java
index 507f8d66b8c..6e91d781d7f 100644
--- a/engine/table/src/main/java/io/deephaven/engine/table/impl/by/ssmcountdistinct/ObjectSsmBackedSource.java
+++ b/engine/table/src/main/java/io/deephaven/engine/table/impl/by/ssmcountdistinct/ObjectSsmBackedSource.java
@@ -8,6 +8,7 @@
 package io.deephaven.engine.table.impl.by.ssmcountdistinct;
 
 import java.util.Objects;
+import io.deephaven.util.compare.ObjectComparisons;
 
 import io.deephaven.vector.ObjectVector;
 import io.deephaven.engine.table.impl.AbstractColumnSource;
diff --git a/engine/table/src/main/java/io/deephaven/engine/table/impl/by/ssmminmax/ObjectSetResult.java b/engine/table/src/main/java/io/deephaven/engine/table/impl/by/ssmminmax/ObjectSetResult.java
index e24f94c50b1..f1d20395d7e 100644
--- a/engine/table/src/main/java/io/deephaven/engine/table/impl/by/ssmminmax/ObjectSetResult.java
+++ b/engine/table/src/main/java/io/deephaven/engine/table/impl/by/ssmminmax/ObjectSetResult.java
@@ -8,6 +8,7 @@
 package io.deephaven.engine.table.impl.by.ssmminmax;
 
 import java.util.Objects;
+import io.deephaven.util.compare.ObjectComparisons;
 
 import io.deephaven.engine.table.WritableColumnSource;
 import io.deephaven.engine.table.impl.sources.ObjectArraySource;
diff --git a/engine/table/src/main/java/io/deephaven/engine/table/impl/by/ssmpercentile/BooleanPercentileTypeHelper.java b/engine/table/src/main/java/io/deephaven/engine/table/impl/by/ssmpercentile/BooleanPercentileTypeHelper.java
index 076f7c47fab..abc6881ba5f 100644
--- a/engine/table/src/main/java/io/deephaven/engine/table/impl/by/ssmpercentile/BooleanPercentileTypeHelper.java
+++ b/engine/table/src/main/java/io/deephaven/engine/table/impl/by/ssmpercentile/BooleanPercentileTypeHelper.java
@@ -104,7 +104,7 @@ private static int upperBound(ObjectChunk<Object, ? extends Values> valuesToSear
         while (lo < hi) {
             final int mid = (lo + hi) >>> 1;
             final Object testValue = valuesToSearch.get(mid);
-            final boolean moveHi = gt(testValue, searchValue);
+            final boolean moveHi = ObjectComparisons.gt(testValue, searchValue);
             if (moveHi) {
                 hi = mid;
             } else {
@@ -115,11 +115,4 @@ private static int upperBound(ObjectChunk<Object, ? extends Values> valuesToSear
         return hi;
     }
 
-    private static int doComparison(Object lhs, Object rhs) {
-        return ObjectComparisons.compare(lhs, rhs);
-    }
-
-    private static boolean gt(Object lhs, Object rhs) {
-        return doComparison(lhs, rhs) > 0;
-    }
 }
diff --git a/engine/table/src/main/java/io/deephaven/engine/table/impl/by/ssmpercentile/BytePercentileTypeHelper.java b/engine/table/src/main/java/io/deephaven/engine/table/impl/by/ssmpercentile/BytePercentileTypeHelper.java
index 2de610bd35a..b261df01518 100644
--- a/engine/table/src/main/java/io/deephaven/engine/table/impl/by/ssmpercentile/BytePercentileTypeHelper.java
+++ b/engine/table/src/main/java/io/deephaven/engine/table/impl/by/ssmpercentile/BytePercentileTypeHelper.java
@@ -107,7 +107,7 @@ private static int upperBound(ByteChunk<? extends Values> valuesToSearch, int lo
         while (lo < hi) {
             final int mid = (lo + hi) >>> 1;
             final byte testValue = valuesToSearch.get(mid);
-            final boolean moveHi = gt(testValue, searchValue);
+            final boolean moveHi = ByteComparisons.gt(testValue, searchValue);
             if (moveHi) {
                 hi = mid;
             } else {
@@ -117,12 +117,4 @@ private static int upperBound(ByteChunk<? extends Values> valuesToSearch, int lo
 
         return hi;
     }
-
-    private static int doComparison(byte lhs, byte rhs) {
-        return ByteComparisons.compare(lhs, rhs);
-    }
-
-    private static boolean gt(byte lhs, byte rhs) {
-        return doComparison(lhs, rhs) > 0;
-    }
 }
diff --git a/engine/table/src/main/java/io/deephaven/engine/table/impl/by/ssmpercentile/CharPercentileTypeHelper.java b/engine/table/src/main/java/io/deephaven/engine/table/impl/by/ssmpercentile/CharPercentileTypeHelper.java
index 06b9798b3a1..31ef71e0d83 100644
--- a/engine/table/src/main/java/io/deephaven/engine/table/impl/by/ssmpercentile/CharPercentileTypeHelper.java
+++ b/engine/table/src/main/java/io/deephaven/engine/table/impl/by/ssmpercentile/CharPercentileTypeHelper.java
@@ -103,7 +103,7 @@ private static int upperBound(CharChunk<? extends Values> valuesToSearch, int lo
         while (lo < hi) {
             final int mid = (lo + hi) >>> 1;
             final char testValue = valuesToSearch.get(mid);
-            final boolean moveHi = gt(testValue, searchValue);
+            final boolean moveHi = CharComparisons.gt(testValue, searchValue);
             if (moveHi) {
                 hi = mid;
             } else {
@@ -113,12 +113,4 @@ private static int upperBound(CharChunk<? extends Values> valuesToSearch, int lo
 
         return hi;
     }
-
-    private static int doComparison(char lhs, char rhs) {
-        return CharComparisons.compare(lhs, rhs);
-    }
-
-    private static boolean gt(char lhs, char rhs) {
-        return doComparison(lhs, rhs) > 0;
-    }
 }
diff --git a/engine/table/src/main/java/io/deephaven/engine/table/impl/by/ssmpercentile/DoublePercentileTypeHelper.java b/engine/table/src/main/java/io/deephaven/engine/table/impl/by/ssmpercentile/DoublePercentileTypeHelper.java
index 1dcef5a24d2..db055bc108b 100644
--- a/engine/table/src/main/java/io/deephaven/engine/table/impl/by/ssmpercentile/DoublePercentileTypeHelper.java
+++ b/engine/table/src/main/java/io/deephaven/engine/table/impl/by/ssmpercentile/DoublePercentileTypeHelper.java
@@ -107,7 +107,7 @@ private static int upperBound(DoubleChunk<? extends Values> valuesToSearch, int
         while (lo < hi) {
             final int mid = (lo + hi) >>> 1;
             final double testValue = valuesToSearch.get(mid);
-            final boolean moveHi = gt(testValue, searchValue);
+            final boolean moveHi = DoubleComparisons.gt(testValue, searchValue);
             if (moveHi) {
                 hi = mid;
             } else {
@@ -117,12 +117,4 @@ private static int upperBound(DoubleChunk<? extends Values> valuesToSearch, int
 
         return hi;
     }
-
-    private static int doComparison(double lhs, double rhs) {
-        return DoubleComparisons.compare(lhs, rhs);
-    }
-
-    private static boolean gt(double lhs, double rhs) {
-        return doComparison(lhs, rhs) > 0;
-    }
 }
diff --git a/engine/table/src/main/java/io/deephaven/engine/table/impl/by/ssmpercentile/FloatPercentileTypeHelper.java b/engine/table/src/main/java/io/deephaven/engine/table/impl/by/ssmpercentile/FloatPercentileTypeHelper.java
index e03aa518a04..384c7f0293e 100644
--- a/engine/table/src/main/java/io/deephaven/engine/table/impl/by/ssmpercentile/FloatPercentileTypeHelper.java
+++ b/engine/table/src/main/java/io/deephaven/engine/table/impl/by/ssmpercentile/FloatPercentileTypeHelper.java
@@ -107,7 +107,7 @@ private static int upperBound(FloatChunk<? extends Values> valuesToSearch, int l
         while (lo < hi) {
             final int mid = (lo + hi) >>> 1;
             final float testValue = valuesToSearch.get(mid);
-            final boolean moveHi = gt(testValue, searchValue);
+            final boolean moveHi = FloatComparisons.gt(testValue, searchValue);
             if (moveHi) {
                 hi = mid;
             } else {
@@ -117,12 +117,4 @@ private static int upperBound(FloatChunk<? extends Values> valuesToSearch, int l
 
         return hi;
     }
-
-    private static int doComparison(float lhs, float rhs) {
-        return FloatComparisons.compare(lhs, rhs);
-    }
-
-    private static boolean gt(float lhs, float rhs) {
-        return doComparison(lhs, rhs) > 0;
-    }
 }
diff --git a/engine/table/src/main/java/io/deephaven/engine/table/impl/by/ssmpercentile/InstantPercentileTypeHelper.java b/engine/table/src/main/java/io/deephaven/engine/table/impl/by/ssmpercentile/InstantPercentileTypeHelper.java
index ba1ea817fc1..0fc57cec337 100644
--- a/engine/table/src/main/java/io/deephaven/engine/table/impl/by/ssmpercentile/InstantPercentileTypeHelper.java
+++ b/engine/table/src/main/java/io/deephaven/engine/table/impl/by/ssmpercentile/InstantPercentileTypeHelper.java
@@ -102,7 +102,7 @@ private static int upperBound(LongChunk<? extends Values> valuesToSearch, int lo
         while (lo < hi) {
             final int mid = (lo + hi) >>> 1;
             final long testValue = valuesToSearch.get(mid);
-            final boolean moveHi = gt(testValue, searchValue);
+            final boolean moveHi = LongComparisons.gt(testValue, searchValue);
             if (moveHi) {
                 hi = mid;
             } else {
@@ -113,11 +113,4 @@ private static int upperBound(LongChunk<? extends Values> valuesToSearch, int lo
         return hi;
     }
 
-    private static int doComparison(long lhs, long rhs) {
-        return LongComparisons.compare(lhs, rhs);
-    }
-
-    private static boolean gt(long lhs, long rhs) {
-        return doComparison(lhs, rhs) > 0;
-    }
 }
diff --git a/engine/table/src/main/java/io/deephaven/engine/table/impl/by/ssmpercentile/IntPercentileTypeHelper.java b/engine/table/src/main/java/io/deephaven/engine/table/impl/by/ssmpercentile/IntPercentileTypeHelper.java
index 3fb20290005..63ca0d583b6 100644
--- a/engine/table/src/main/java/io/deephaven/engine/table/impl/by/ssmpercentile/IntPercentileTypeHelper.java
+++ b/engine/table/src/main/java/io/deephaven/engine/table/impl/by/ssmpercentile/IntPercentileTypeHelper.java
@@ -107,7 +107,7 @@ private static int upperBound(IntChunk<? extends Values> valuesToSearch, int lo,
         while (lo < hi) {
             final int mid = (lo + hi) >>> 1;
             final int testValue = valuesToSearch.get(mid);
-            final boolean moveHi = gt(testValue, searchValue);
+            final boolean moveHi = IntComparisons.gt(testValue, searchValue);
             if (moveHi) {
                 hi = mid;
             } else {
@@ -117,12 +117,4 @@ private static int upperBound(IntChunk<? extends Values> valuesToSearch, int lo,
 
         return hi;
     }
-
-    private static int doComparison(int lhs, int rhs) {
-        return IntComparisons.compare(lhs, rhs);
-    }
-
-    private static boolean gt(int lhs, int rhs) {
-        return doComparison(lhs, rhs) > 0;
-    }
 }
diff --git a/engine/table/src/main/java/io/deephaven/engine/table/impl/by/ssmpercentile/LongPercentileTypeHelper.java b/engine/table/src/main/java/io/deephaven/engine/table/impl/by/ssmpercentile/LongPercentileTypeHelper.java
index bac03a42801..0372b3c4e00 100644
--- a/engine/table/src/main/java/io/deephaven/engine/table/impl/by/ssmpercentile/LongPercentileTypeHelper.java
+++ b/engine/table/src/main/java/io/deephaven/engine/table/impl/by/ssmpercentile/LongPercentileTypeHelper.java
@@ -107,7 +107,7 @@ private static int upperBound(LongChunk<? extends Values> valuesToSearch, int lo
         while (lo < hi) {
             final int mid = (lo + hi) >>> 1;
             final long testValue = valuesToSearch.get(mid);
-            final boolean moveHi = gt(testValue, searchValue);
+            final boolean moveHi = LongComparisons.gt(testValue, searchValue);
             if (moveHi) {
                 hi = mid;
             } else {
@@ -117,12 +117,4 @@ private static int upperBound(LongChunk<? extends Values> valuesToSearch, int lo
 
         return hi;
     }
-
-    private static int doComparison(long lhs, long rhs) {
-        return LongComparisons.compare(lhs, rhs);
-    }
-
-    private static boolean gt(long lhs, long rhs) {
-        return doComparison(lhs, rhs) > 0;
-    }
 }
diff --git a/engine/table/src/main/java/io/deephaven/engine/table/impl/by/ssmpercentile/ObjectPercentileTypeHelper.java b/engine/table/src/main/java/io/deephaven/engine/table/impl/by/ssmpercentile/ObjectPercentileTypeHelper.java
index 542be9e039c..9ec8886fb3a 100644
--- a/engine/table/src/main/java/io/deephaven/engine/table/impl/by/ssmpercentile/ObjectPercentileTypeHelper.java
+++ b/engine/table/src/main/java/io/deephaven/engine/table/impl/by/ssmpercentile/ObjectPercentileTypeHelper.java
@@ -8,6 +8,7 @@
 package io.deephaven.engine.table.impl.by.ssmpercentile;
 
 import java.util.Objects;
+import io.deephaven.util.compare.ObjectComparisons;
 
 import io.deephaven.chunk.attributes.ChunkLengths;
 import io.deephaven.chunk.attributes.Values;
@@ -108,7 +109,7 @@ private static int upperBound(ObjectChunk<Object, ? extends Values> valuesToSear
         while (lo < hi) {
             final int mid = (lo + hi) >>> 1;
             final Object testValue = valuesToSearch.get(mid);
-            final boolean moveHi = gt(testValue, searchValue);
+            final boolean moveHi = ObjectComparisons.gt(testValue, searchValue);
             if (moveHi) {
                 hi = mid;
             } else {
@@ -118,12 +119,4 @@ private static int upperBound(ObjectChunk<Object, ? extends Values> valuesToSear
 
         return hi;
     }
-
-    private static int doComparison(Object lhs, Object rhs) {
-        return ObjectComparisons.compare(lhs, rhs);
-    }
-
-    private static boolean gt(Object lhs, Object rhs) {
-        return doComparison(lhs, rhs) > 0;
-    }
 }
diff --git a/engine/table/src/main/java/io/deephaven/engine/table/impl/by/ssmpercentile/ShortPercentileTypeHelper.java b/engine/table/src/main/java/io/deephaven/engine/table/impl/by/ssmpercentile/ShortPercentileTypeHelper.java
index 0a0a011c043..13062124bfb 100644
--- a/engine/table/src/main/java/io/deephaven/engine/table/impl/by/ssmpercentile/ShortPercentileTypeHelper.java
+++ b/engine/table/src/main/java/io/deephaven/engine/table/impl/by/ssmpercentile/ShortPercentileTypeHelper.java
@@ -107,7 +107,7 @@ private static int upperBound(ShortChunk<? extends Values> valuesToSearch, int l
         while (lo < hi) {
             final int mid = (lo + hi) >>> 1;
             final short testValue = valuesToSearch.get(mid);
-            final boolean moveHi = gt(testValue, searchValue);
+            final boolean moveHi = ShortComparisons.gt(testValue, searchValue);
             if (moveHi) {
                 hi = mid;
             } else {
@@ -117,12 +117,4 @@ private static int upperBound(ShortChunk<? extends Values> valuesToSearch, int l
 
         return hi;
     }
-
-    private static int doComparison(short lhs, short rhs) {
-        return ShortComparisons.compare(lhs, rhs);
-    }
-
-    private static boolean gt(short lhs, short rhs) {
-        return doComparison(lhs, rhs) > 0;
-    }
 }
diff --git a/engine/table/src/main/java/io/deephaven/engine/table/impl/by/typed/HasherConfig.java b/engine/table/src/main/java/io/deephaven/engine/table/impl/by/typed/HasherConfig.java
index 331cc32ab79..063bc30daf6 100644
--- a/engine/table/src/main/java/io/deephaven/engine/table/impl/by/typed/HasherConfig.java
+++ b/engine/table/src/main/java/io/deephaven/engine/table/impl/by/typed/HasherConfig.java
@@ -20,12 +20,13 @@ public class HasherConfig<T> {
     public final String classPrefix;
     public final String packageGroup;
     public final String packageMiddle;
-    final boolean openAddressed;
     final boolean openAddressedAlternate;
+    final boolean supportTombstones;
     final boolean alwaysMoveMain;
     final String mainStateName;
     final String overflowOrAlternateStateName;
     final String emptyStateName;
+    public final String tombstoneStateName;
     final Class<?> stateType;
     final Consumer<CodeBlock.Builder> moveMainFull;
     final Consumer<CodeBlock.Builder> moveMainAlternate;
@@ -38,13 +39,16 @@ public class HasherConfig<T> {
     final List<BuildSpec> builds;
 
     HasherConfig(Class<T> baseClass, String classPrefix, String packageGroup, String packageMiddle,
-            boolean openAddressed,
-            boolean openAddressedAlternate, boolean alwaysMoveMain,
+            boolean openAddressedAlternate,
+            boolean supportTombstones,
+            boolean alwaysMoveMain,
             boolean includeOriginalSources,
             boolean supportRehash,
             String mainStateName,
             String overflowOrAlternateStateName,
-            String emptyStateName, Class<?> stateType,
+            String emptyStateName,
+            String tombstoneStateName,
+            Class<?> stateType,
             Consumer<CodeBlock.Builder> moveMainFull,
             Consumer<CodeBlock.Builder> moveMainAlternate,
             Consumer<CodeBlock.Builder> rehashFullSetup,
@@ -56,14 +60,15 @@ public class HasherConfig<T> {
         this.classPrefix = classPrefix;
         this.packageGroup = packageGroup;
         this.packageMiddle = packageMiddle;
-        this.openAddressed = openAddressed;
         this.openAddressedAlternate = openAddressedAlternate;
+        this.supportTombstones = supportTombstones;
         this.alwaysMoveMain = alwaysMoveMain;
         this.includeOriginalSources = includeOriginalSources;
         this.supportRehash = supportRehash;
         this.mainStateName = mainStateName;
         this.overflowOrAlternateStateName = overflowOrAlternateStateName;
         this.emptyStateName = emptyStateName;
+        this.tombstoneStateName = tombstoneStateName;
         this.stateType = stateType;
         this.moveMainFull = moveMainFull;
         this.moveMainAlternate = moveMainAlternate;
@@ -113,31 +118,43 @@ public interface MethodBuilderWithChunkTypes {
         final String name;
         final String stateValueName;
         final boolean requiresRowKeyChunk;
+        /**
+         * In cases where we know that a partial rehash cannot be occurring; we can simplify the generated code by not
+         * checking for the alternate table.
+         */
         final boolean allowAlternates;
+        /**
+         * In cases where we know that an entry cannot possibly be deleted; we can simplify the generated code by not
+         * checking for tombstones.
+         */
+        final boolean checkDeletions;
         final FoundMethodBuilder found;
         final MethodBuilderWithChunkTypes insert;
         final ParameterSpec[] params;
 
         public BuildSpec(String name, String stateValueName, boolean requiresRowKeyChunk,
-                boolean allowAlternates, FoundMethodBuilder found,
+                boolean allowAlternates, boolean checkDeletions, FoundMethodBuilder found,
                 MethodBuilder insert, ParameterSpec... params) {
             // Convert the MethodBuilder to MethodBuilderWithChunkTypes.
             this(name,
                     stateValueName,
                     requiresRowKeyChunk,
                     allowAlternates,
+                    checkDeletions,
                     found,
                     (config, chunkTypes, builder) -> insert.accept(config, builder),
                     params);
         }
 
         public BuildSpec(String name, String stateValueName, boolean requiresRowKeyChunk,
-                boolean allowAlternates, FoundMethodBuilder found,
-                MethodBuilderWithChunkTypes insert, ParameterSpec... params) {
+                boolean allowAlternates, boolean checkDeletions, FoundMethodBuilder found,
+                MethodBuilderWithChunkTypes insert,
+                ParameterSpec... params) {
             this.name = name;
             this.stateValueName = stateValueName;
             this.requiresRowKeyChunk = requiresRowKeyChunk;
             this.allowAlternates = allowAlternates;
+            this.checkDeletions = checkDeletions;
             this.found = found;
             this.insert = insert;
             this.params = params;
@@ -149,7 +166,7 @@ public static class Builder<T> {
         private String classPrefix;
         private String packageGroup;
         private String packageMiddle;
-        private boolean openAddressed = true;
+        private boolean supportTombstones = false;
         private boolean openAddressedAlternate = true;
         private boolean alwaysMoveMain = false;
         private boolean includeOriginalSources = false;
@@ -157,6 +174,7 @@ public static class Builder<T> {
         private String mainStateName;
         private String overflowOrAlternateStateName;
         private String emptyStateName;
+        private String tombstoneStateName;
         private Class<?> stateType;
         private Consumer<CodeBlock.Builder> moveMainAlternate;
         private Consumer<CodeBlock.Builder> moveMainFull;
@@ -185,16 +203,13 @@ public Builder<T> packageMiddle(String packageMiddle) {
             return this;
         }
 
-        public Builder<T> openAddressed(boolean openAddressed) {
-            this.openAddressed = openAddressed;
-            if (!openAddressed) {
-                this.openAddressedAlternate = false;
-            }
+        public Builder<T> openAddressedAlternate(boolean openAddressedAlternate) {
+            this.openAddressedAlternate = openAddressedAlternate;
             return this;
         }
 
-        public Builder<T> openAddressedAlternate(boolean openAddressedAlternate) {
-            this.openAddressedAlternate = openAddressedAlternate;
+        public Builder<T> supportTombstones(boolean supportTombstones) {
+            this.supportTombstones = supportTombstones;
             return this;
         }
 
@@ -228,6 +243,11 @@ public Builder<T> emptyStateName(String emptyStateName) {
             return this;
         }
 
+        public Builder<T> tombstoneStateName(String tombstoneStateName) {
+            this.tombstoneStateName = tombstoneStateName;
+            return this;
+        }
+
         public Builder<T> stateType(Class<?> stateType) {
             this.stateType = stateType;
             return this;
@@ -273,15 +293,16 @@ HasherConfig<T> build() {
             Assert.neqNull(packageGroup, "packageGroup");
             Assert.neqNull(packageMiddle, "packageMiddle");
             Assert.neqNull(mainStateName, "mainStateName");
-            if (openAddressedAlternate || !openAddressed) {
+            if (openAddressedAlternate) {
                 Assert.neqNull(overflowOrAlternateStateName, "overflowOrAlternateStateName");
             }
             Assert.neqNull(emptyStateName, "emptyStateName");
             Assert.neqNull(stateType, "stateType");
 
-            return new HasherConfig<>(baseClass, classPrefix, packageGroup, packageMiddle, openAddressed,
-                    openAddressedAlternate, alwaysMoveMain, includeOriginalSources, supportRehash, mainStateName,
-                    overflowOrAlternateStateName, emptyStateName,
+            return new HasherConfig<>(baseClass, classPrefix, packageGroup, packageMiddle,
+                    openAddressedAlternate, supportTombstones, alwaysMoveMain, includeOriginalSources, supportRehash,
+                    mainStateName,
+                    overflowOrAlternateStateName, emptyStateName, tombstoneStateName,
                     stateType, moveMainFull, moveMainAlternate, rehashFullSetup, extraPartialRehashParameters, probes,
                     builds, extraMethods);
         }
diff --git a/engine/table/src/main/java/io/deephaven/engine/table/impl/by/typed/TypedAggregationFactory.java b/engine/table/src/main/java/io/deephaven/engine/table/impl/by/typed/TypedAggregationFactory.java
index dc70b0400b0..0af273bf9b1 100644
--- a/engine/table/src/main/java/io/deephaven/engine/table/impl/by/typed/TypedAggregationFactory.java
+++ b/engine/table/src/main/java/io/deephaven/engine/table/impl/by/typed/TypedAggregationFactory.java
@@ -71,11 +71,7 @@ public static MethodSpec createFindPositionForKey(HasherConfig<?> hasherConfig,
         builder.addStatement("int hash = hash("
                 + IntStream.range(0, chunkTypes.length).mapToObj(x -> "k" + x).collect(Collectors.joining(", ")) + ")");
 
-        if (hasherConfig.openAddressed) {
-            findPositionForKeyOpenAddressed(hasherConfig, chunkTypes, builder, false);
-        } else {
-            findPositionForKeyOverflow(hasherConfig, chunkTypes, builder);
-        }
+        findPositionForKeyOpenAddressed(hasherConfig, chunkTypes, builder, false);
         return builder.build();
     }
 
@@ -101,7 +97,7 @@ private static void findPositionForKeyOpenAddressed(HasherConfig<?> hasherConfig
         builder.addStatement("final int $L = $L.getUnsafe($L)", positionValueName,
                 alternate ? hasherConfig.overflowOrAlternateStateName : hasherConfig.mainStateName,
                 tableLocationName);
-        builder.beginControlFlow("if ($L == $L)", positionValueName, hasherConfig.emptyStateName);
+        builder.beginControlFlow("if (isStateEmpty($L))", positionValueName);
 
         if (hasherConfig.openAddressedAlternate && !alternate) {
             findPositionForKeyOpenAddressed(hasherConfig, chunkTypes, builder, true);
@@ -125,30 +121,6 @@ private static void findPositionForKeyOpenAddressed(HasherConfig<?> hasherConfig
         builder.endControlFlow();
     }
 
-    private static void findPositionForKeyOverflow(HasherConfig<?> hasherConfig, ChunkType[] chunkTypes,
-            MethodSpec.Builder builder) {
-        builder.addStatement("final int tableLocation = hashToTableLocation(tableHashPivot, hash)");
-        builder.addStatement("final int positionValue = $L.getUnsafe(tableLocation)", hasherConfig.mainStateName);
-        builder.beginControlFlow("if (positionValue == $L)", hasherConfig.emptyStateName);
-        builder.addStatement("return -1");
-        builder.endControlFlow();
-
-        builder.beginControlFlow("if (" + TypedHasherFactory.getEqualsStatement(chunkTypes) + ")");
-        builder.addStatement("return positionValue");
-        builder.endControlFlow();
-
-        builder.addStatement("int overflowLocation = mainOverflowLocationSource.getUnsafe(tableLocation)");
-
-        builder.beginControlFlow("while (overflowLocation != QueryConstants.NULL_INT)");
-        builder.beginControlFlow("if (" + TypedHasherFactory.getEqualsStatementOverflow(chunkTypes) + ")");
-        builder.addStatement("return $L.getUnsafe(overflowLocation)", hasherConfig.overflowOrAlternateStateName);
-        builder.endControlFlow();
-
-        builder.addStatement("overflowLocation = overflowOverflowLocationSource.getUnsafe(overflowLocation)");
-        builder.endControlFlow();
-        builder.addStatement("return -1");
-    }
-
     private static void unboxKey(MethodSpec.Builder builder, int ii, Class<?> element) {
         if (element == Object.class) {
             builder.addStatement("final $T k$L = ka[$L]", element, ii, ii);
diff --git a/engine/table/src/main/java/io/deephaven/engine/table/impl/by/typed/TypedHasherFactory.java b/engine/table/src/main/java/io/deephaven/engine/table/impl/by/typed/TypedHasherFactory.java
index e84c7d553cd..9d07ac42375 100644
--- a/engine/table/src/main/java/io/deephaven/engine/table/impl/by/typed/TypedHasherFactory.java
+++ b/engine/table/src/main/java/io/deephaven/engine/table/impl/by/typed/TypedHasherFactory.java
@@ -20,7 +20,6 @@
 import io.deephaven.engine.table.ColumnSource;
 import io.deephaven.engine.table.impl.MultiJoinModifiedSlotTracker;
 import io.deephaven.engine.table.impl.NaturalJoinModifiedSlotTracker;
-import io.deephaven.engine.table.impl.QueryCompilerRequestProcessor;
 import io.deephaven.engine.table.impl.asofjoin.RightIncrementalAsOfJoinStateManagerTypedBase;
 import io.deephaven.engine.table.impl.asofjoin.StaticAsOfJoinStateManagerTypedBase;
 import io.deephaven.engine.table.impl.asofjoin.TypedAsOfJoinFactory;
@@ -36,7 +35,6 @@
 import io.deephaven.engine.table.impl.sources.immutable.*;
 import io.deephaven.engine.table.impl.updateby.hashing.TypedUpdateByFactory;
 import io.deephaven.engine.table.impl.updateby.hashing.UpdateByStateManagerTypedBase;
-import io.deephaven.util.QueryConstants;
 import io.deephaven.util.compare.CharComparisons;
 import io.deephaven.util.mutable.MutableInt;
 import org.jetbrains.annotations.NotNull;
@@ -60,8 +58,8 @@ public class TypedHasherFactory {
      * Produce a hasher for the given base class and column sources.
      *
      * @param <T> the base class
-     * @param baseClass the base class (e.g. {@link StaticChunkedOperatorAggregationStateManagerTypedBase} that the
-     *        generated hasher extends from
+     * @param baseClass the base class (e.g. {@link IncrementalChunkedOperatorAggregationStateManagerOpenAddressedBase}
+     *        that the generated hasher extends from
      * @param tableKeySources the key sources
      * @param originalKeySources
      * @param tableSize the initial table size
@@ -80,25 +78,15 @@ public static <T> T make(Class<T> baseClass, ColumnSource<?>[] tableKeySources,
     public static <T> HasherConfig<T> hasherConfigForBase(Class<T> baseClass) {
         final HasherConfig.Builder<T> builder = new HasherConfig.Builder<>(baseClass);
 
-        if (baseClass.equals(StaticChunkedOperatorAggregationStateManagerTypedBase.class)) {
-            configureAggregation(builder);
-            builder.classPrefix("StaticAggHasher").packageMiddle("staticagg");
-            builder.overflowOrAlternateStateName("overflowOutputPosition");
-            builder.openAddressed(false);
-        } else if (baseClass.equals(StaticChunkedOperatorAggregationStateManagerOpenAddressedBase.class)) {
+        if (baseClass.equals(StaticChunkedOperatorAggregationStateManagerOpenAddressedBase.class)) {
             configureAggregation(builder);
             builder.classPrefix("StaticAggOpenHasher").packageMiddle("staticopenagg");
-            builder.openAddressed(true).openAddressedAlternate(false);
+            builder.openAddressedAlternate(false);
             builder.moveMainFull(TypedAggregationFactory::staticAggMoveMain);
             builder.addBuild(
                     new HasherConfig.BuildSpec("build", "outputPosition", false, true,
-                            TypedAggregationFactory::buildFound,
+                            true, TypedAggregationFactory::buildFound,
                             TypedAggregationFactory::buildInsert));
-        } else if (baseClass.equals(IncrementalChunkedOperatorAggregationStateManagerTypedBase.class)) {
-            configureAggregation(builder);
-            builder.classPrefix("IncrementalAggHasher").packageMiddle("incagg");
-            builder.openAddressed(false);
-            builder.overflowOrAlternateStateName("overflowOutputPosition");
         } else if (baseClass.equals(IncrementalChunkedOperatorAggregationStateManagerOpenAddressedBase.class)) {
             configureAggregation(builder);
             builder.classPrefix("IncrementalAggOpenHasher").packageMiddle("incopenagg");
@@ -107,15 +95,11 @@ public static <T> HasherConfig<T> hasherConfigForBase(Class<T> baseClass) {
             builder.moveMainAlternate(TypedAggregationFactory::incAggMoveMain);
             builder.alwaysMoveMain(true);
 
-            final ClassName rowKeyType = ClassName.get(RowKeys.class);
-            final ParameterizedTypeName emptiedChunkType =
-                    ParameterizedTypeName.get(ClassName.get(WritableIntChunk.class), rowKeyType);
-
             builder.addProbe(new HasherConfig.ProbeSpec("probe", "outputPosition", false,
                     TypedAggregationFactory::probeFound, TypedAggregationFactory::probeMissing));
 
             builder.addBuild(new HasherConfig.BuildSpec("build", "outputPosition", false, true,
-                    TypedAggregationFactory::buildFound, TypedAggregationFactory::buildInsertIncremental));
+                    true, TypedAggregationFactory::buildFound, TypedAggregationFactory::buildInsertIncremental));
         } else if (baseClass.equals(StaticNaturalJoinStateManagerTypedBase.class)) {
             builder.classPrefix("StaticNaturalJoinHasher").packageGroup("naturaljoin").packageMiddle("staticopen")
                     .openAddressedAlternate(false)
@@ -125,7 +109,7 @@ public static <T> HasherConfig<T> hasherConfigForBase(Class<T> baseClass) {
                     .supportRehash(false);
 
             builder.addBuild(new HasherConfig.BuildSpec("buildFromLeftSide", "rightSideSentinel",
-                    false, true, TypedNaturalJoinFactory::staticBuildLeftFound,
+                    false, true, true, TypedNaturalJoinFactory::staticBuildLeftFound,
                     TypedNaturalJoinFactory::staticBuildLeftInsert,
                     ParameterSpec.builder(TypeName.get(IntegerArraySource.class), "leftHashSlots").build(),
                     ParameterSpec.builder(long.class, "hashSlotOffset").build()));
@@ -137,7 +121,7 @@ public static <T> HasherConfig<T> hasherConfigForBase(Class<T> baseClass) {
                     ParameterSpec.builder(long.class, "redirectionOffset").build()));
 
             builder.addBuild(new HasherConfig.BuildSpec("buildFromRightSide", "rightSideSentinel",
-                    true, true, TypedNaturalJoinFactory::staticBuildRightFound,
+                    true, true, true, TypedNaturalJoinFactory::staticBuildRightFound,
                     TypedNaturalJoinFactory::staticBuildRightInsert));
 
             builder.addProbe(new HasherConfig.ProbeSpec("decorateWithRightSide", "existingStateValue",
@@ -157,7 +141,7 @@ public static <T> HasherConfig<T> hasherConfigForBase(Class<T> baseClass) {
                     .rehashFullSetup(TypedNaturalJoinFactory::rightIncrementalRehashSetup);
 
             builder.addBuild(new HasherConfig.BuildSpec("buildFromLeftSide", "leftRowSetForState",
-                    true, true, TypedNaturalJoinFactory::rightIncrementalBuildLeftFound,
+                    true, true, true, TypedNaturalJoinFactory::rightIncrementalBuildLeftFound,
                     TypedNaturalJoinFactory::rightIncrementalBuildLeftInsert));
 
             builder.addProbe(new HasherConfig.ProbeSpec("addRightSide", null, true,
@@ -196,9 +180,11 @@ public static <T> HasherConfig<T> hasherConfigForBase(Class<T> baseClass) {
             builder.classPrefix("IncrementalNaturalJoinHasher").packageGroup("naturaljoin")
                     .packageMiddle("incopen")
                     .openAddressedAlternate(true)
+                    .supportTombstones(true)
                     .stateType(long.class).mainStateName("mainRightRowKey")
                     .overflowOrAlternateStateName("alternateRightRowKey")
                     .emptyStateName("EMPTY_RIGHT_STATE")
+                    .tombstoneStateName("TOMBSTONE_RIGHT_STATE")
                     .includeOriginalSources(true)
                     .supportRehash(true)
                     .addExtraPartialRehashParameter(modifiedSlotTrackerParam)
@@ -208,21 +194,20 @@ public static <T> HasherConfig<T> hasherConfigForBase(Class<T> baseClass) {
                     .rehashFullSetup(TypedNaturalJoinFactory::incrementalRehashSetup);
 
             builder.addBuild(new HasherConfig.BuildSpec("buildFromLeftSide", "rightRowKeyForState",
-                    true, false, TypedNaturalJoinFactory::incrementalBuildLeftFound,
+                    true, false, false, TypedNaturalJoinFactory::incrementalBuildLeftFound,
                     TypedNaturalJoinFactory::incrementalBuildLeftInsert));
 
             builder.addBuild(new HasherConfig.BuildSpec("buildFromRightSide", "existingRightRowKey", true,
-                    false, TypedNaturalJoinFactory::incrementalRightFound,
+                    false, false, TypedNaturalJoinFactory::incrementalRightFound,
                     TypedNaturalJoinFactory::incrementalRightInsert));
 
-
             builder.addProbe(new HasherConfig.ProbeSpec("removeRight", "existingRightRowKey", true,
                     TypedNaturalJoinFactory::incrementalRemoveRightFound,
                     TypedNaturalJoinFactory::incrementalRemoveRightMissing,
                     modifiedSlotTrackerParam));
 
             builder.addBuild(new HasherConfig.BuildSpec("addRightSide", "existingRightRowKey", true,
-                    true, TypedNaturalJoinFactory::incrementalRightFoundUpdate,
+                    true, true, TypedNaturalJoinFactory::incrementalRightFoundUpdate,
                     TypedNaturalJoinFactory::incrementalRightInsertUpdate,
                     modifiedSlotTrackerParam));
 
@@ -240,12 +225,12 @@ public static <T> HasherConfig<T> hasherConfigForBase(Class<T> baseClass) {
                     modifiedSlotTrackerParam, probeContextParam));
 
             builder.addBuild(new HasherConfig.BuildSpec("addLeftSide", "rightRowKeyForState", true,
-                    true, TypedNaturalJoinFactory::incrementalLeftFoundUpdate,
+                    true, true, TypedNaturalJoinFactory::incrementalLeftFoundUpdate,
                     TypedNaturalJoinFactory::incrementalLeftInsertUpdate,
                     ParameterSpec.builder(TypeName.get(LongArraySource.class), "leftRedirections").build(),
                     ParameterSpec.builder(long.class, "leftRedirectionOffset").build()));
 
-            builder.addProbe(new HasherConfig.ProbeSpec("removeLeft", null, true,
+            builder.addProbe(new HasherConfig.ProbeSpec("removeLeft", "rightState", true,
                     TypedNaturalJoinFactory::incrementalRemoveLeftFound,
                     TypedNaturalJoinFactory::incrementalRemoveLeftMissing));
 
@@ -266,7 +251,7 @@ public static <T> HasherConfig<T> hasherConfigForBase(Class<T> baseClass) {
                     .rehashFullSetup(TypedAsOfJoinFactory::staticRehashSetup);
 
             builder.addBuild(new HasherConfig.BuildSpec("buildFromLeftSide", "rightSideSentinel",
-                    true, true, TypedAsOfJoinFactory::staticBuildLeftFound,
+                    true, true, true, TypedAsOfJoinFactory::staticBuildLeftFound,
                     TypedAsOfJoinFactory::staticBuildLeftInsert));
 
             builder.addProbe(new HasherConfig.ProbeSpec("decorateLeftSide", null, true,
@@ -276,7 +261,7 @@ public static <T> HasherConfig<T> hasherConfigForBase(Class<T> baseClass) {
                     ParameterSpec.builder(RowSetBuilderRandom.class, "foundBuilder").build()));
 
             builder.addBuild(new HasherConfig.BuildSpec("buildFromRightSide", "rightSideSentinel",
-                    true, true, TypedAsOfJoinFactory::staticBuildRightFound,
+                    true, true, true, TypedAsOfJoinFactory::staticBuildRightFound,
                     TypedAsOfJoinFactory::staticBuildRightInsert));
 
             builder.addProbe(new HasherConfig.ProbeSpec("decorateWithRightSide", null,
@@ -300,11 +285,11 @@ public static <T> HasherConfig<T> hasherConfigForBase(Class<T> baseClass) {
                     .rehashFullSetup(TypedAsOfJoinFactory::rightIncrementalRehashSetup);
 
             builder.addBuild(new HasherConfig.BuildSpec("buildFromLeftSide", "rowState",
-                    true, true, TypedAsOfJoinFactory::rightIncrementalBuildLeftFound,
+                    true, true, true, TypedAsOfJoinFactory::rightIncrementalBuildLeftFound,
                     TypedAsOfJoinFactory::rightIncrementalBuildLeftInsert, sequentialBuilders));
 
             builder.addBuild(new HasherConfig.BuildSpec("buildFromRightSide", "rowState", true,
-                    true, TypedAsOfJoinFactory::rightIncrementalRightFound,
+                    true, true, TypedAsOfJoinFactory::rightIncrementalRightFound,
                     TypedAsOfJoinFactory::rightIncrementalRightInsert, sequentialBuilders));
 
             builder.addProbe(new HasherConfig.ProbeSpec("probeRightSide", "rowState",
@@ -333,7 +318,7 @@ public static <T> HasherConfig<T> hasherConfigForBase(Class<T> baseClass) {
                     .rehashFullSetup(TypedUpdateByFactory::incrementalRehashSetup);
 
             builder.addBuild(new HasherConfig.BuildSpec("buildHashTable", "rowState",
-                    true, true, TypedUpdateByFactory::incrementalBuildLeftFound,
+                    true, true, true, TypedUpdateByFactory::incrementalBuildLeftFound,
                     TypedUpdateByFactory::incrementalBuildLeftInsert, outputPositionOffset, outputPositions));
 
             builder.addProbe(new HasherConfig.ProbeSpec("probeHashTable", "rowState",
@@ -352,7 +337,7 @@ public static <T> HasherConfig<T> hasherConfigForBase(Class<T> baseClass) {
 
 
             builder.addBuild(new HasherConfig.BuildSpec("buildFromTable", "slotValue",
-                    true, true, TypedMultiJoinFactory::staticBuildLeftFound,
+                    true, true, true, TypedMultiJoinFactory::staticBuildLeftFound,
                     TypedMultiJoinFactory::staticBuildLeftInsert,
                     ParameterSpec.builder(TypeName.get(LongArraySource.class), "tableRedirSource").build(),
                     ParameterSpec.builder(long.class, "tableNumber").build()));
@@ -381,7 +366,7 @@ public static <T> HasherConfig<T> hasherConfigForBase(Class<T> baseClass) {
 
             builder.addBuild(new HasherConfig.BuildSpec("buildFromTable", "slotValue",
                     true, true,
-                    TypedMultiJoinFactory::incrementalBuildLeftFound,
+                    true, TypedMultiJoinFactory::incrementalBuildLeftFound,
                     TypedMultiJoinFactory::incrementalBuildLeftInsert,
                     tableRedirSourceParam,
                     tableNumberParam,
@@ -443,14 +428,7 @@ public static <T> T make(HasherConfig<T> hasherConfig, ColumnSource<?>[] tableKe
             ColumnSource<?>[] originalKeySources, int tableSize,
             double maximumLoadFactor, double targetLoadFactor) {
         if (USE_PREGENERATED_HASHERS) {
-            if (hasherConfig.baseClass.equals(StaticChunkedOperatorAggregationStateManagerTypedBase.class)) {
-                // noinspection unchecked
-                T pregeneratedHasher = (T) io.deephaven.engine.table.impl.by.typed.staticagg.gen.TypedHashDispatcher
-                        .dispatch(tableKeySources, originalKeySources, tableSize, maximumLoadFactor, targetLoadFactor);
-                if (pregeneratedHasher != null) {
-                    return pregeneratedHasher;
-                }
-            } else if (hasherConfig.baseClass
+            if (hasherConfig.baseClass
                     .equals(StaticChunkedOperatorAggregationStateManagerOpenAddressedBase.class)) {
                 // noinspection unchecked
                 T pregeneratedHasher = (T) io.deephaven.engine.table.impl.by.typed.staticopenagg.gen.TypedHashDispatcher
@@ -458,14 +436,6 @@ public static <T> T make(HasherConfig<T> hasherConfig, ColumnSource<?>[] tableKe
                 if (pregeneratedHasher != null) {
                     return pregeneratedHasher;
                 }
-            } else if (hasherConfig.baseClass
-                    .equals(IncrementalChunkedOperatorAggregationStateManagerTypedBase.class)) {
-                // noinspection unchecked
-                T pregeneratedHasher = (T) io.deephaven.engine.table.impl.by.typed.incagg.gen.TypedHashDispatcher
-                        .dispatch(tableKeySources, originalKeySources, tableSize, maximumLoadFactor, targetLoadFactor);
-                if (pregeneratedHasher != null) {
-                    return pregeneratedHasher;
-                }
             } else if (hasherConfig.baseClass
                     .equals(IncrementalChunkedOperatorAggregationStateManagerOpenAddressedBase.class)) {
                 // noinspection unchecked
@@ -611,7 +581,7 @@ public static String hasherName(HasherConfig<?> hasherConfig, ChunkType[] chunkT
     public static <T> JavaFile generateHasher(final HasherConfig<T> hasherConfig,
             final ChunkType[] chunkTypes,
             final String className,
-            Optional<Modifier> visibility) {
+            final Optional<Modifier> visibility) {
         final String packageName = packageName(hasherConfig);
         final TypeSpec.Builder hasherBuilder =
                 TypeSpec.classBuilder(className).addModifiers(Modifier.FINAL).superclass(hasherConfig.baseClass);
@@ -619,40 +589,31 @@ public static <T> JavaFile generateHasher(final HasherConfig<T> hasherConfig,
 
         hasherBuilder.addMethod(createConstructor(hasherConfig, chunkTypes, hasherBuilder));
 
-        if (hasherConfig.openAddressed) {
-            hasherBuilder.addMethod(createNextTableLocationMethod(false));
-            if (hasherConfig.openAddressedAlternate) {
-                hasherBuilder.addMethod(createNextTableLocationMethod(true));
-            }
-            hasherConfig.builds.forEach(
-                    bs -> hasherBuilder.addMethod(createBuildMethodForOpenAddressed(hasherConfig, bs, chunkTypes)));
-            hasherConfig.probes.forEach(
-                    ps -> hasherBuilder.addMethod(createProbeMethodForOpenAddressed(hasherConfig, ps, chunkTypes)));
-        } else {
-            hasherBuilder.addMethod(createBuildMethodForOverflow(hasherConfig, chunkTypes));
-            hasherBuilder.addMethod(createProbeMethodForOverflow(hasherConfig, chunkTypes));
+        hasherBuilder.addMethod(createNextTableLocationMethod(false));
+        if (hasherConfig.openAddressedAlternate) {
+            hasherBuilder.addMethod(createNextTableLocationMethod(true));
         }
+        hasherConfig.builds.forEach(
+                bs -> hasherBuilder.addMethod(createBuildMethodForOpenAddressed(hasherConfig, bs, chunkTypes)));
+        hasherConfig.probes.forEach(
+                ps -> hasherBuilder.addMethod(createProbeMethodForOpenAddressed(hasherConfig, ps, chunkTypes)));
         hasherBuilder.addMethod(createHashMethod(chunkTypes));
 
-        if (hasherConfig.openAddressed) {
-            if (hasherConfig.openAddressedAlternate) {
-                hasherBuilder.addMethod(createMigrateLocationMethod(hasherConfig, chunkTypes));
-                hasherBuilder.addMethod(createRehashInternalPartialMethod(hasherConfig, chunkTypes));
-                hasherBuilder.addMethod(createNewAlternateMethod(hasherConfig, chunkTypes));
-                hasherBuilder.addMethod(createClearAlternateMethod(hasherConfig, chunkTypes));
-                hasherBuilder.addMethod(createMigrateFront(hasherConfig));
-            }
-            if (hasherConfig.supportRehash) {
-                hasherBuilder.addMethod(createRehashInternalFullMethod(hasherConfig, chunkTypes));
-            }
-        } else {
-            hasherBuilder.addMethod(createRehashBucketMethod(hasherConfig, chunkTypes));
-            hasherBuilder.addMethod(createMaybeMoveMainBucket(hasherConfig, chunkTypes));
+        hasherBuilder.addMethod(createIsEmptyMethod(hasherConfig));
+        if (hasherConfig.supportTombstones) {
+            hasherBuilder.addMethod(createIsDeletedMethod(hasherConfig));
         }
-
-        if (!hasherConfig.openAddressed) {
-            hasherBuilder.addMethod(createFindOverflow(chunkTypes));
+        if (hasherConfig.openAddressedAlternate) {
+            hasherBuilder.addMethod(createMigrateLocationMethod(hasherConfig, chunkTypes));
+            hasherBuilder.addMethod(createRehashInternalPartialMethod(hasherConfig, chunkTypes));
+            hasherBuilder.addMethod(createNewAlternateMethod(hasherConfig, chunkTypes));
+            hasherBuilder.addMethod(createClearAlternateMethod(hasherConfig, chunkTypes));
+            hasherBuilder.addMethod(createMigrateFront(hasherConfig));
         }
+        if (hasherConfig.supportRehash) {
+            hasherBuilder.addMethod(createRehashInternalFullMethod(hasherConfig, chunkTypes));
+        }
+
         hasherConfig.extraMethods.forEach(em -> hasherBuilder.addMethod(em.apply(hasherConfig, chunkTypes)));
 
         final TypeSpec hasher = hasherBuilder.build();
@@ -695,16 +656,11 @@ private static String nextTableLocationName(boolean alternate) {
     private static <T> MethodSpec createConstructor(HasherConfig<T> hasherConfig, ChunkType[] chunkTypes,
             TypeSpec.Builder hasherBuilder) {
         CodeBlock.Builder constructorCodeBuilder = CodeBlock.builder();
-        if (hasherConfig.openAddressed) {
-            if (hasherConfig.includeOriginalSources) {
-                constructorCodeBuilder
-                        .addStatement("super(tableKeySources, originalTableKeySources, tableSize, maximumLoadFactor)");
-            } else {
-                constructorCodeBuilder.addStatement("super(tableKeySources, tableSize, maximumLoadFactor)");
-            }
-        } else {
+        if (hasherConfig.includeOriginalSources) {
             constructorCodeBuilder
-                    .addStatement("super(tableKeySources, tableSize, maximumLoadFactor, targetLoadFactor)");
+                    .addStatement("super(tableKeySources, originalTableKeySources, tableSize, maximumLoadFactor)");
+        } else {
+            constructorCodeBuilder.addStatement("super(tableKeySources, tableSize, maximumLoadFactor)");
         }
         addKeySourceFields(hasherConfig, chunkTypes, hasherBuilder, constructorCodeBuilder);
 
@@ -725,143 +681,20 @@ private static void addKeySourceFields(HasherConfig<?> hasherConfig, ChunkType[]
 
         final List<FieldSpec> keySources = new ArrayList<>();
         for (int ii = 0; ii < chunkTypes.length; ++ii) {
-            final Class<?> type =
-                    hasherConfig.openAddressed ? flatSourceType(chunkTypes[ii]) : arraySourceType(chunkTypes[ii]);
+            final Class<?> type = flatSourceType(chunkTypes[ii]);
             keySources.add(
                     FieldSpec.builder(type, "mainKeySource" + ii).addModifiers(modifiers)
                             .build());
             constructorCodeBuilder.addStatement("this.mainKeySource$L = ($T) super.mainKeySources[$L]", ii, type, ii);
-            if (hasherConfig.openAddressed) {
-                constructorCodeBuilder.addStatement("this.mainKeySource$L.ensureCapacity(tableSize)", ii);
-                if (hasherConfig.openAddressedAlternate) {
-                    keySources.add(FieldSpec.builder(type, "alternateKeySource" + ii)
-                            .addModifiers(modifiers).build());
-                }
-            } else {
-                keySources.add(FieldSpec.builder(type, "overflowKeySource" + ii)
+            constructorCodeBuilder.addStatement("this.mainKeySource$L.ensureCapacity(tableSize)", ii);
+            if (hasherConfig.openAddressedAlternate) {
+                keySources.add(FieldSpec.builder(type, "alternateKeySource" + ii)
                         .addModifiers(modifiers).build());
-                constructorCodeBuilder.addStatement("this.overflowKeySource$L = ($T) super.overflowKeySources[$L]", ii,
-                        type, ii);
             }
         }
         keySources.forEach(hasherBuilder::addField);
     }
 
-    @NotNull
-    private static MethodSpec createFindOverflow(ChunkType[] chunkTypes) {
-        final MethodSpec.Builder builder =
-                MethodSpec.methodBuilder("findOverflow").addParameter(HashHandler.class, "handler");
-        for (int ii = 0; ii < chunkTypes.length; ++ii) {
-            builder.addParameter(elementType(chunkTypes[ii]), "k" + ii);
-        }
-
-        builder.addParameter(int.class, "chunkPosition").addParameter(int.class, "overflowLocation")
-                .returns(boolean.class).addModifiers(Modifier.PRIVATE)
-                .beginControlFlow("while (overflowLocation != $T.NULL_INT)", QueryConstants.class)
-                .beginControlFlow("if (" + getEqualsStatementOverflow(chunkTypes) + ")")
-                .addStatement("handler.doOverflowFound(overflowLocation, chunkPosition)")
-                .addStatement("return true")
-                .endControlFlow()
-                .addStatement("overflowLocation = overflowOverflowLocationSource.getUnsafe(overflowLocation)")
-                .endControlFlow()
-                .addStatement("return false");
-        return builder.build();
-    }
-
-    @NotNull
-    private static MethodSpec createMaybeMoveMainBucket(HasherConfig<?> hasherConfig, ChunkType[] chunkTypes) {
-        MethodSpec.Builder builder =
-                MethodSpec.methodBuilder("maybeMoveMainBucket").addParameter(HashHandler.class, "handler")
-                        .addParameter(int.class, "sourceBucket").addParameter(int.class, "destBucket")
-                        .addParameter(int.class, "bucketsToAdd").returns(int.class).addModifiers(Modifier.PRIVATE);
-
-        for (int ii = 0; ii < chunkTypes.length; ++ii) {
-            final Class<?> element = elementType(chunkTypes[ii]);
-            builder.addStatement("final $T k$L = mainKeySource$L.getUnsafe(sourceBucket)", element, ii, ii);
-        }
-        builder.addStatement("final int hash = hash("
-                + IntStream.range(0, chunkTypes.length).mapToObj(x -> "k" + x).collect(Collectors.joining(", ")) + ")");
-        builder.addStatement("final int location = hashToTableLocation(tableHashPivot + bucketsToAdd, hash)");
-        builder.addStatement("final int mainInsertLocation");
-        builder.beginControlFlow("if (location == sourceBucket)");
-        builder.addStatement("mainInsertLocation = destBucket");
-        builder.addStatement("$L.set(destBucket, $L)", hasherConfig.mainStateName, hasherConfig.emptyStateName);
-        builder.nextControlFlow("else");
-        builder.addStatement("mainInsertLocation = sourceBucket");
-        builder.addStatement("$L.set(destBucket, $L.getUnsafe(sourceBucket))", hasherConfig.mainStateName,
-                hasherConfig.mainStateName);
-        builder.addStatement("$L.set(sourceBucket, $L)", hasherConfig.mainStateName, hasherConfig.emptyStateName);
-        for (int ii = 0; ii < chunkTypes.length; ++ii) {
-            builder.addStatement("mainKeySource$L.set(destBucket, k$L)", ii, ii);
-            builder.addStatement("mainKeySource$L.set(sourceBucket, $L)", ii, elementNull(chunkTypes[ii]));
-        }
-        builder.addStatement("handler.doMoveMain(sourceBucket, destBucket)");
-        builder.endControlFlow();
-        builder.addStatement("return mainInsertLocation");
-
-        return builder
-                .build();
-    }
-
-    @NotNull
-    private static MethodSpec createRehashBucketMethod(HasherConfig<?> hasherConfig, ChunkType[] chunkTypes) {
-        final CodeBlock.Builder builder = CodeBlock.builder();
-
-        builder.addStatement("final int position = $L.getUnsafe(sourceBucket)", hasherConfig.mainStateName);
-        builder.beginControlFlow("if (position == $L)", hasherConfig.emptyStateName);
-        builder.addStatement("return");
-        builder.endControlFlow();
-
-        builder.addStatement(
-                "int mainInsertLocation = maybeMoveMainBucket(handler, sourceBucket, destBucket, bucketsToAdd)");
-        builder.addStatement("int overflowLocation = mainOverflowLocationSource.getUnsafe(sourceBucket)");
-        builder.addStatement("mainOverflowLocationSource.set(sourceBucket, QueryConstants.NULL_INT)");
-        builder.addStatement("mainOverflowLocationSource.set(destBucket, QueryConstants.NULL_INT)");
-
-        builder.beginControlFlow("while (overflowLocation != QueryConstants.NULL_INT)");
-        builder.addStatement(
-                "final int nextOverflowLocation = overflowOverflowLocationSource.getUnsafe(overflowLocation)");
-        for (int ii = 0; ii < chunkTypes.length; ++ii) {
-            builder.addStatement("final $T overflowKey$L = overflowKeySource$L.getUnsafe(overflowLocation)",
-                    elementType(chunkTypes[ii]), ii, ii);
-        }
-        builder.addStatement("final int overflowHash = hash(" + IntStream.range(0, chunkTypes.length)
-                .mapToObj(x -> "overflowKey" + x).collect(Collectors.joining(", ")) + ")");
-        builder.addStatement(
-                "final int overflowTableLocation = hashToTableLocation(tableHashPivot + bucketsToAdd, overflowHash)");
-        builder.beginControlFlow("if (overflowTableLocation == mainInsertLocation)");
-        for (int ii = 0; ii < chunkTypes.length; ++ii) {
-            builder.addStatement("mainKeySource$L.set(mainInsertLocation, overflowKey$L)", ii, ii);
-        }
-        builder.addStatement("$L.set(mainInsertLocation, $L.getUnsafe(overflowLocation))", hasherConfig.mainStateName,
-                hasherConfig.overflowOrAlternateStateName);
-        builder.addStatement("handler.doPromoteOverflow(overflowLocation, mainInsertLocation)");
-        builder.addStatement("$L.set(overflowLocation, QueryConstants.NULL_INT)",
-                hasherConfig.overflowOrAlternateStateName);
-
-        // key source loop
-        for (int ii = 0; ii < chunkTypes.length; ++ii) {
-            builder.addStatement("overflowKeySource$L.set(overflowLocation, $L)", ii, elementNull(chunkTypes[ii]));
-        }
-
-        builder.addStatement("freeOverflowLocation(overflowLocation)");
-        builder.addStatement("mainInsertLocation = -1");
-        builder.nextControlFlow("else");
-        builder.addStatement(
-                "final int oldOverflowLocation = mainOverflowLocationSource.getUnsafe(overflowTableLocation)");
-        builder.addStatement("mainOverflowLocationSource.set(overflowTableLocation, overflowLocation)");
-        builder.addStatement("overflowOverflowLocationSource.set(overflowLocation, oldOverflowLocation)");
-        builder.endControlFlow();
-        builder.addStatement("overflowLocation = nextOverflowLocation");
-        builder.endControlFlow();
-
-        return MethodSpec.methodBuilder("rehashBucket").addParameter(HashHandler.class, "handler")
-                .addParameter(int.class, "sourceBucket").addParameter(int.class, "destBucket")
-                .addParameter(int.class, "bucketsToAdd").returns(void.class).addModifiers(Modifier.PROTECTED)
-                .addCode(builder.build())
-                .addAnnotation(Override.class).build();
-    }
-
     // this rehash internal method is not incremental, which makes us nervous about using it for incremental updates
     // we are also using the old arrays as temporary space, so any moving of objects must be done inline (but the
     // single inheritor we have does not do that, so we are not adding that complexity at this instant)
@@ -908,7 +741,7 @@ private static MethodSpec createRehashInternalFullMethod(HasherConfig<?> hasherC
             builder.addStatement("final $T currentStateValue = ($T)originalStateArray[sourceBucket]",
                     hasherConfig.stateType, hasherConfig.stateType);
         }
-        builder.beginControlFlow("if (currentStateValue == $L)", hasherConfig.emptyStateName);
+        builder.beginControlFlow("if (isStateEmpty(currentStateValue))");
         builder.addStatement("continue");
         builder.endControlFlow();
 
@@ -921,7 +754,12 @@ private static MethodSpec createRehashInternalFullMethod(HasherConfig<?> hasherC
         builder.addStatement("final int firstDestinationTableLocation = hashToTableLocation(hash)");
         builder.addStatement("int destinationTableLocation = firstDestinationTableLocation");
         builder.beginControlFlow("while (true)");
-        builder.beginControlFlow("if (destState[destinationTableLocation] == $L)", hasherConfig.emptyStateName);
+        if (hasherConfig.stateType.isPrimitive()) {
+            builder.beginControlFlow("if (isStateEmpty(destState[destinationTableLocation]))");
+        } else {
+            builder.beginControlFlow("if (isStateEmpty(($T)destState[destinationTableLocation]))",
+                    hasherConfig.stateType);
+        }
         for (int ii = 0; ii < chunkTypes.length; ++ii) {
             builder.addStatement("destKeyArray$L[destinationTableLocation] = k$L", ii, ii);
         }
@@ -959,14 +797,10 @@ private static MethodSpec createRehashInternalPartialMethod(HasherConfig<?> hash
         // ensure the capacity for everything
         builder.addStatement("int rehashedEntries = 0");
         builder.beginControlFlow("while (rehashPointer > 0 && rehashedEntries < entriesToRehash)");
-        final String extraParamNames;
-        if (hasherConfig.extraPartialRehashParameters.size() > 0) {
-            extraParamNames = ", " + hasherConfig.extraPartialRehashParameters.stream().map(ps -> ps.name)
-                    .collect(Collectors.joining(", "));
-        } else {
-            extraParamNames = "";
-        }
-        builder.beginControlFlow("if (migrateOneLocation(--rehashPointer" + extraParamNames + "))");
+        final String extraParamNames = getExtraMigrateParams(hasherConfig.extraPartialRehashParameters);
+        final String deletedParam = hasherConfig.supportTombstones ? ", false" : "";
+
+        builder.beginControlFlow("if (migrateOneLocation(--rehashPointer" + deletedParam + extraParamNames + "))");
         builder.addStatement("rehashedEntries++");
         builder.endControlFlow();
         builder.endControlFlow();
@@ -986,15 +820,13 @@ private static MethodSpec createRehashInternalPartialMethod(HasherConfig<?> hash
     private static MethodSpec createNewAlternateMethod(HasherConfig<?> hasherConfig, ChunkType[] chunkTypes) {
         final CodeBlock.Builder builder = CodeBlock.builder();
 
-        builder.addStatement("super.newAlternate()");
-
         for (int ii = 0; ii < chunkTypes.length; ++ii) {
             final Class<?> sourceType = flatSourceType(chunkTypes[ii]);
             builder.addStatement("this.mainKeySource$L = ($T)super.mainKeySources[$L]", ii, sourceType, ii);
             builder.addStatement("this.alternateKeySource$L = ($T)super.alternateKeySources[$L]", ii, sourceType, ii);
         }
 
-        return MethodSpec.methodBuilder("newAlternate")
+        return MethodSpec.methodBuilder("adviseNewAlternate")
                 .returns(void.class).addModifiers(Modifier.PROTECTED)
                 .addCode(builder.build())
                 .addAnnotation(Override.class).build();
@@ -1023,9 +855,17 @@ private static MethodSpec createMigrateLocationMethod(HasherConfig<?> hasherConf
 
         builder.addStatement("final $T currentStateValue = $L.getUnsafe(locationToMigrate)", hasherConfig.stateType,
                 hasherConfig.overflowOrAlternateStateName);
-        builder.beginControlFlow("if (currentStateValue == $L)", hasherConfig.emptyStateName);
+        builder.beginControlFlow("if (isStateEmpty(currentStateValue))");
         builder.addStatement("return false");
         builder.endControlFlow();
+        if (hasherConfig.supportTombstones) {
+            builder.beginControlFlow("if (isStateDeleted(currentStateValue))");
+            builder.addStatement("alternateEntries--");
+            builder.addStatement("$L.set(locationToMigrate, $L)", hasherConfig.overflowOrAlternateStateName,
+                    hasherConfig.emptyStateName);
+            builder.addStatement("return trueOnDeletedEntry");
+            builder.endControlFlow();
+        }
 
         for (int ii = 0; ii < chunkTypes.length; ++ii) {
             final Class<?> element = elementType(chunkTypes[ii]);
@@ -1036,8 +876,15 @@ private static MethodSpec createMigrateLocationMethod(HasherConfig<?> hasherConf
 
         builder.addStatement("int destinationTableLocation = hashToTableLocation(hash)");
 
-        builder.beginControlFlow("while ($L.getUnsafe(destinationTableLocation) != $L)", hasherConfig.mainStateName,
-                hasherConfig.emptyStateName);
+        if (hasherConfig.supportTombstones) {
+            builder.addStatement("$T candidateState", hasherConfig.stateType);
+            builder.beginControlFlow(
+                    "while (!isStateEmpty(candidateState = $L.getUnsafe(destinationTableLocation)) && !isStateDeleted(candidateState))",
+                    hasherConfig.mainStateName);
+        } else {
+            builder.beginControlFlow("while (!isStateEmpty($L.getUnsafe(destinationTableLocation)))",
+                    hasherConfig.mainStateName);
+        }
         builder.addStatement("destinationTableLocation = nextTableLocation(destinationTableLocation)");
         builder.endControlFlow();
 
@@ -1046,9 +893,14 @@ private static MethodSpec createMigrateLocationMethod(HasherConfig<?> hasherConf
         builder.addStatement("return true");
 
         final MethodSpec.Builder methodBuilder = MethodSpec.methodBuilder("migrateOneLocation")
-                .returns(boolean.class).addModifiers(Modifier.PRIVATE).addParameter(int.class, "locationToMigrate")
+                .returns(boolean.class).addModifiers(Modifier.PRIVATE)
+                .addParameter(int.class, "locationToMigrate")
                 .addCode(builder.build());
 
+        if (hasherConfig.supportTombstones) {
+            methodBuilder.addParameter(boolean.class, "trueOnDeletedEntry");
+        }
+
         hasherConfig.extraPartialRehashParameters.forEach(methodBuilder::addParameter);
 
         return methodBuilder.build();
@@ -1060,22 +912,65 @@ private static MethodSpec createMigrateFront(HasherConfig<?> hasherConfig) {
 
         builder.addStatement("int location = 0");
 
+        final String extraParamNames = getExtraMigrateParams(hasherConfig.extraPartialRehashParameters);
+
+        final String deletedParam = hasherConfig.supportTombstones ? ", true" : "";
+
+        builder.addStatement(
+                "while (migrateOneLocation(location++" + deletedParam + extraParamNames
+                        + ") && location < alternateTableSize)");
+
+        final MethodSpec.Builder methodBuilder = MethodSpec.methodBuilder("migrateFront")
+                .addModifiers(Modifier.PROTECTED)
+                .addAnnotation(Override.class)
+                .addCode(builder.build());
+
+        hasherConfig.extraPartialRehashParameters.forEach(methodBuilder::addParameter);
+
+        return methodBuilder.build();
+    }
+
+    private static @NotNull String getExtraMigrateParams(List<ParameterSpec> hasherConfig) {
         final String extraParamNames;
-        if (hasherConfig.extraPartialRehashParameters.size() > 0) {
-            extraParamNames = ", " + hasherConfig.extraPartialRehashParameters.stream().map(ps -> ps.name)
+        if (!hasherConfig.isEmpty()) {
+            extraParamNames = ", " + hasherConfig.stream().map(ps -> ps.name)
                     .collect(Collectors.joining(", "));
         } else {
             extraParamNames = "";
         }
+        return extraParamNames;
+    }
+
+    /**
+     * The isStateEmpty method indicates that the state is empty, for probe iteration.
+     */
+    private static MethodSpec createIsEmptyMethod(HasherConfig<?> hasherConfig) {
+        final CodeBlock.Builder builder = CodeBlock.builder();
 
-        builder.addStatement("while (migrateOneLocation(location++" + extraParamNames + "))");
+        builder.addStatement("return state == $L", hasherConfig.emptyStateName);
 
-        final MethodSpec.Builder methodBuilder = MethodSpec.methodBuilder("migrateFront")
-                .addModifiers(Modifier.PROTECTED)
-                .addAnnotation(Override.class)
+        final MethodSpec.Builder methodBuilder = MethodSpec.methodBuilder("isStateEmpty")
+                .addModifiers(Modifier.STATIC, Modifier.PRIVATE)
+                .returns(boolean.class)
+                .addParameter(hasherConfig.stateType, "state")
                 .addCode(builder.build());
 
-        hasherConfig.extraPartialRehashParameters.forEach(methodBuilder::addParameter);
+        return methodBuilder.build();
+    }
+
+    /**
+     * The isStateDeleted method indicates that the state is deleted, for probe iteration.
+     */
+    private static MethodSpec createIsDeletedMethod(HasherConfig<?> hasherConfig) {
+        final CodeBlock.Builder builder = CodeBlock.builder();
+
+        builder.addStatement("return state == $L", hasherConfig.tombstoneStateName);
+
+        final MethodSpec.Builder methodBuilder = MethodSpec.methodBuilder("isStateDeleted")
+                .addModifiers(Modifier.STATIC, Modifier.PRIVATE)
+                .returns(boolean.class)
+                .addParameter(hasherConfig.stateType, "state")
+                .addCode(builder.build());
 
         return methodBuilder.build();
     }
@@ -1093,63 +988,13 @@ private static void doRehashMoveAlternateToMain(HasherConfig<?> hasherConfig, Ch
         hasherConfig.moveMainAlternate.accept(builder);
         builder.addStatement("$L.set($L, $L)", hasherConfig.overflowOrAlternateStateName, sourceLocation,
                 hasherConfig.emptyStateName);
-    }
-
-    @NotNull
-    private static MethodSpec createBuildMethodForOverflow(HasherConfig<?> hasherConfig, ChunkType[] chunkTypes) {
-        final CodeBlock.Builder builder = CodeBlock.builder();
-        for (int ii = 0; ii < chunkTypes.length; ++ii) {
-            final ClassName chunkName =
-                    ClassName.get(CharChunk.class.getPackageName(), chunkTypes[ii].name() + "Chunk");
-            final ClassName valuesName = ClassName.get(Values.class);
-            final ParameterizedTypeName chunkTypeName = chunkTypes[ii] == ChunkType.Object
-                    ? ParameterizedTypeName.get(chunkName, ClassName.get(Object.class), valuesName)
-                    : ParameterizedTypeName.get(chunkName, valuesName);
-            builder.addStatement("final $T keyChunk$L = sourceKeyChunks[$L].as$LChunk()", chunkTypeName, ii, ii,
-                    chunkTypes[ii].name());
-        }
-        builder.addStatement("final int chunkSize = keyChunk0.size()");
-        builder.beginControlFlow("for (int chunkPosition = 0; chunkPosition < chunkSize; ++chunkPosition)");
-        for (int ii = 0; ii < chunkTypes.length; ++ii) {
-            final Class<?> element = elementType(chunkTypes[ii]);
-            builder.addStatement("final $T k$L = keyChunk$L.get(chunkPosition)", element, ii, ii);
-        }
-        builder.addStatement("final int hash = hash("
-                + IntStream.range(0, chunkTypes.length).mapToObj(x -> "k" + x).collect(Collectors.joining(", ")) + ")");
-        builder.addStatement("final int tableLocation = hashToTableLocation(tableHashPivot, hash)");
-        builder.beginControlFlow("if ($L.getUnsafe(tableLocation) == $L)", hasherConfig.mainStateName,
-                hasherConfig.emptyStateName);
-        builder.addStatement("numEntries++");
-        for (int ii = 0; ii < chunkTypes.length; ++ii) {
-            builder.addStatement("mainKeySource$L.set(tableLocation, k$L)", ii, ii);
-        }
-        builder.addStatement("handler.doMainInsert(tableLocation, chunkPosition)");
-        builder.nextControlFlow("else if (" + getEqualsStatement(chunkTypes) + ")");
-        builder.addStatement("handler.doMainFound(tableLocation, chunkPosition)");
-        builder.nextControlFlow("else");
-        builder.addStatement("int overflowLocation = mainOverflowLocationSource.getUnsafe(tableLocation)");
-        builder.beginControlFlow("if (!findOverflow(handler, "
-                + IntStream.range(0, chunkTypes.length).mapToObj(x -> "k" + x).collect(Collectors.joining(", "))
-                + ", chunkPosition, overflowLocation))");
-        builder.addStatement("final int newOverflowLocation = allocateOverflowLocation()");
-        for (int ii = 0; ii < chunkTypes.length; ++ii) {
-            builder.addStatement("overflowKeySource$L.set(newOverflowLocation, k$L)", ii, ii);
+        // with tombstone support, we must track the entries and the alternateEntriest separately
+        if (hasherConfig.supportTombstones) {
+            builder.beginControlFlow("if (!isStateDeleted(candidateState))");
+            builder.addStatement("numEntries++");
+            builder.endControlFlow();
+            builder.addStatement("alternateEntries--");
         }
-        builder.addStatement("mainOverflowLocationSource.set(tableLocation, newOverflowLocation)");
-        builder.addStatement("overflowOverflowLocationSource.set(newOverflowLocation, overflowLocation)");
-        builder.addStatement("numEntries++");
-        builder.addStatement("handler.doOverflowInsert(newOverflowLocation, chunkPosition)");
-        builder.endControlFlow();
-        builder.endControlFlow();
-        builder.endControlFlow();
-
-
-        return MethodSpec.methodBuilder("build")
-                .addParameter(HashHandler.class, "handler")
-                .addParameter(RowSequence.class, "rowSequence")
-                .addParameter(Chunk[].class, "sourceKeyChunks")
-                .returns(void.class).addModifiers(Modifier.PROTECTED).addCode(builder.build())
-                .addAnnotation(Override.class).build();
     }
 
     @NotNull
@@ -1214,11 +1059,21 @@ private static void doBuildSearch(HasherConfig<?> hasherConfig, HasherConfig.Bui
             builder.addStatement("$L = $L.getUnsafe($L)", buildSpec.stateValueName,
                     hasherConfig.overflowOrAlternateStateName, tableLocationName);
         } else {
+            if (hasherConfig.supportTombstones && buildSpec.checkDeletions) {
+                builder.addStatement("int firstDeletedLocation = -1");
+            }
             builder.beginControlFlow((hasherConfig.openAddressedAlternate ? "MAIN_SEARCH: " : "") + "while (true)");
             builder.addStatement("$T $L = $L.getUnsafe($L)", hasherConfig.stateType, buildSpec.stateValueName,
                     hasherConfig.mainStateName, tableLocationName);
         }
-        builder.beginControlFlow("if ($L == $L)", buildSpec.stateValueName, hasherConfig.emptyStateName);
+
+        if (!alternate && hasherConfig.supportTombstones && buildSpec.checkDeletions) {
+            builder.beginControlFlow("if (firstDeletedLocation < 0 && isStateDeleted($L))", buildSpec.stateValueName);
+            builder.addStatement("firstDeletedLocation = $L", tableLocationName);
+            builder.endControlFlow();
+        }
+
+        builder.beginControlFlow("if (isStateEmpty($L))", buildSpec.stateValueName);
 
         if (hasherConfig.openAddressedAlternate && !alternate && buildSpec.allowAlternates) {
             // we might need to do an alternative build here
@@ -1226,15 +1081,21 @@ private static void doBuildSearch(HasherConfig<?> hasherConfig, HasherConfig.Bui
         }
 
         if (!alternate) {
-            builder.addStatement("numEntries++");
-            for (int ii = 0; ii < chunkTypes.length; ++ii) {
-                builder.addStatement("mainKeySource$L.set($L, k$L)", ii, tableLocationName, ii);
-            }
-            buildSpec.insert.accept(hasherConfig, chunkTypes, builder);
+            doInsertion(hasherConfig, buildSpec, chunkTypes, builder, tableLocationName, true);
         }
         builder.addStatement("break");
-        builder.nextControlFlow("else if ("
-                + (alternate ? getEqualsStatementAlternate(chunkTypes) : getEqualsStatement(chunkTypes)) + ")");
+        final String keyEqualsExpression =
+                alternate ? getEqualsStatementAlternate(chunkTypes) : getEqualsStatement(chunkTypes);
+        builder.nextControlFlow("else if (" + keyEqualsExpression + ")");
+        if (hasherConfig.supportTombstones && buildSpec.checkDeletions) {
+            builder.beginControlFlow("if (isStateDeleted($L))", buildSpec.stateValueName);
+            // we can terminate our probe here, and insert into the firstDeleted location (or here)
+            if (!alternate) {
+                doInsertion(hasherConfig, buildSpec, chunkTypes, builder, tableLocationName, false);
+            }
+            builder.addStatement("break");
+            builder.endControlFlow();
+        }
         buildSpec.found.accept(hasherConfig, alternate, builder);
         if (alternate) {
             builder.addStatement("break MAIN_SEARCH");
@@ -1253,6 +1114,51 @@ private static void doBuildSearch(HasherConfig<?> hasherConfig, HasherConfig.Bui
         builder.endControlFlow();
     }
 
+    /**
+     * @param hasherConfig the hasher spec
+     * @param buildSpec the spec for the specific builder
+     * @param chunkTypes the types of our chunks
+     * @param builder the method builder we are adding to
+     * @param tableLocationName the name of the table location
+     * @param checkForDeletedLocation true if we need to check the firstDeletedLocation variable, false if are sure that
+     *        it is set and we do not need to check it
+     */
+    private static void doInsertion(HasherConfig<?> hasherConfig,
+            HasherConfig.BuildSpec buildSpec,
+            ChunkType[] chunkTypes,
+            CodeBlock.Builder builder,
+            String tableLocationName,
+            boolean checkForDeletedLocation) {
+        if (hasherConfig.supportTombstones) {
+            // set to the first available location
+            if (buildSpec.checkDeletions) {
+                if (checkForDeletedLocation) {
+                    builder.beginControlFlow("if (firstDeletedLocation >= 0)");
+                }
+                builder.addStatement("tableLocation = firstDeletedLocation");
+                if (checkForDeletedLocation) {
+                    builder.nextControlFlow("else");
+                    builder.addStatement("numEntries++");
+                    builder.endControlFlow();
+                }
+            } else {
+                builder.addStatement("numEntries++");
+            }
+            builder.addStatement("liveEntries++");
+        } else {
+            builder.addStatement("numEntries++");
+        }
+        doInsertCommon(hasherConfig, buildSpec, chunkTypes, builder, tableLocationName);
+    }
+
+    private static void doInsertCommon(HasherConfig<?> hasherConfig, HasherConfig.BuildSpec buildSpec,
+            ChunkType[] chunkTypes, CodeBlock.Builder builder, String tableLocationName) {
+        for (int ii = 0; ii < chunkTypes.length; ++ii) {
+            builder.addStatement("mainKeySource$L.set($L, k$L)", ii, tableLocationName, ii);
+        }
+        buildSpec.insert.accept(hasherConfig, chunkTypes, builder);
+    }
+
     private static MethodSpec createProbeMethodForOpenAddressed(HasherConfig<?> hasherConfig, HasherConfig.ProbeSpec ps,
             ChunkType[] chunkTypes) {
         final CodeBlock.Builder builder = CodeBlock.builder();
@@ -1311,31 +1217,49 @@ private static void doProbeSearch(HasherConfig<?> hasherConfig, HasherConfig.Pro
         if (foundBlockRequired) {
             builder.addStatement("boolean $L = false", foundName);
         }
+        if (hasherConfig.supportTombstones && !alternate) {
+            builder.addStatement("boolean searchAlternate = true");
+        }
 
         if (alternate) {
             builder.beginControlFlow("if ($L < rehashPointer)", firstTableLocationName);
         }
         builder.addStatement("int $L = $L", tableLocationName, firstTableLocationName);
 
-
-        if (!alternate && ps.stateValueName != null) {
-            builder.addStatement("$T $L", hasherConfig.stateType, ps.stateValueName);
+        final String stateValueName;
+        if (ps.stateValueName != null) {
+            stateValueName = ps.stateValueName;
+        } else if (hasherConfig.supportTombstones) {
+            stateValueName = "stateValue";
+        } else {
+            stateValueName = null;
+        }
+        if (!alternate && stateValueName != null) {
+            builder.addStatement("$T $L", hasherConfig.stateType, stateValueName);
         }
 
         final String stateSourceName =
                 alternate ? hasherConfig.overflowOrAlternateStateName : hasherConfig.mainStateName;
-        if (ps.stateValueName == null) {
-            builder.beginControlFlow("while ($L.getUnsafe($L) != $L)",
-                    stateSourceName, tableLocationName,
-                    hasherConfig.emptyStateName);
+        if (stateValueName == null) {
+            builder.beginControlFlow("while (!isStateEmpty($L.getUnsafe($L)))",
+                    stateSourceName, tableLocationName);
         } else {
-            builder.beginControlFlow("while (($L = $L.getUnsafe($L)) != $L)", ps.stateValueName,
-                    stateSourceName, tableLocationName,
-                    hasherConfig.emptyStateName);
+            builder.beginControlFlow("while (!isStateEmpty($L = $L.getUnsafe($L)))", stateValueName,
+                    stateSourceName, tableLocationName);
+        }
+
+        final String equalsStatement =
+                alternate ? getEqualsStatementAlternate(chunkTypes) : getEqualsStatement(chunkTypes);
+        builder.beginControlFlow("if (" + equalsStatement + ")");
+        if (hasherConfig.supportTombstones) {
+            builder.beginControlFlow("if (isStateDeleted($L))", stateValueName);
+            if (!alternate) {
+                // never going to find it now
+                builder.addStatement("searchAlternate = false");
+            }
+            builder.addStatement("break");
+            builder.endControlFlow();
         }
-
-        builder.beginControlFlow(
-                "if (" + (alternate ? getEqualsStatementAlternate(chunkTypes) : getEqualsStatement(chunkTypes)) + ")");
         ps.found.accept(hasherConfig, alternate, builder);
         if (foundBlockRequired) {
             builder.addStatement("$L = true", foundName);
@@ -1352,62 +1276,23 @@ private static void doProbeSearch(HasherConfig<?> hasherConfig, HasherConfig.Pro
 
         if (foundBlockRequired) {
             builder.beginControlFlow("if (!$L)", foundName);
+            if (hasherConfig.supportTombstones && !alternate) {
+                builder.beginControlFlow("if (!searchAlternate)");
+                ps.missing.accept(builder);
+                builder.nextControlFlow("else");
+            }
             if (hasherConfig.openAddressedAlternate && !alternate) {
                 doProbeSearch(hasherConfig, ps, chunkTypes, builder, true);
             } else {
                 ps.missing.accept(builder);
             }
+            if (hasherConfig.supportTombstones && !alternate) {
+                builder.endControlFlow();
+            }
             builder.endControlFlow();
         }
     }
 
-    @NotNull
-    private static MethodSpec createProbeMethodForOverflow(HasherConfig<?> hasherConfig, ChunkType[] chunkTypes) {
-        final CodeBlock.Builder builder = CodeBlock.builder();
-        for (int ii = 0; ii < chunkTypes.length; ++ii) {
-            final ClassName chunkName =
-                    ClassName.get(CharChunk.class.getPackageName(), chunkTypes[ii].name() + "Chunk");
-            final ClassName valuesName = ClassName.get(Values.class);
-            final ParameterizedTypeName chunkTypeName = chunkTypes[ii] == ChunkType.Object
-                    ? ParameterizedTypeName.get(chunkName, ClassName.get(Object.class), valuesName)
-                    : ParameterizedTypeName.get(chunkName, valuesName);
-            builder.addStatement("final $T keyChunk$L = sourceKeyChunks[$L].as$LChunk()", chunkTypeName, ii, ii,
-                    chunkTypes[ii].name());
-        }
-        builder.addStatement("final int chunkSize = keyChunk0.size()");
-        builder.beginControlFlow("for (int chunkPosition = 0; chunkPosition < chunkSize; ++chunkPosition)");
-        for (int ii = 0; ii < chunkTypes.length; ++ii) {
-            final Class<?> element = elementType(chunkTypes[ii]);
-            builder.addStatement("final $T k$L = keyChunk$L.get(chunkPosition)", element, ii, ii);
-        }
-        builder.addStatement("final int hash = hash("
-                + IntStream.range(0, chunkTypes.length).mapToObj(x -> "k" + x).collect(Collectors.joining(", ")) + ")");
-        builder.addStatement("final int tableLocation = hashToTableLocation(tableHashPivot, hash)");
-        builder.beginControlFlow("if ($L.getUnsafe(tableLocation) == $L)", hasherConfig.mainStateName,
-                hasherConfig.emptyStateName);
-        builder.addStatement("handler.doMissing(chunkPosition)");
-        builder.nextControlFlow("else if (" + getEqualsStatement(chunkTypes) + ")");
-        builder.addStatement("handler.doMainFound(tableLocation, chunkPosition)");
-        builder.nextControlFlow("else");
-        builder.addStatement("int overflowLocation = mainOverflowLocationSource.getUnsafe(tableLocation)");
-        builder.beginControlFlow("if (!findOverflow(handler, "
-                + IntStream.range(0, chunkTypes.length).mapToObj(x -> "k" + x).collect(Collectors.joining(", "))
-                + ", chunkPosition, overflowLocation))");
-        builder.addStatement("handler.doMissing(chunkPosition)");
-        builder.endControlFlow();
-        builder.endControlFlow();
-        builder.endControlFlow();
-
-        return MethodSpec.methodBuilder("probe")
-                .addParameter(HashHandler.class, "handler")
-                .addParameter(RowSequence.class, "rowSequence")
-                .addParameter(Chunk[].class, "sourceKeyChunks")
-                .returns(void.class).addModifiers(Modifier.PROTECTED).addCode(builder.build())
-                .addAnnotation(Override.class).build();
-    }
-
-
-
     @NotNull
     private static MethodSpec createHashMethod(ChunkType[] chunkTypes) {
         final MethodSpec.Builder builder =
@@ -1441,41 +1326,10 @@ public static String getEqualsStatementAlternate(ChunkType[] chunkTypes) {
                 .collect(Collectors.joining(" && "));
     }
 
-    @NotNull
-    public static String getEqualsStatementOverflow(ChunkType[] chunkTypes) {
-        return IntStream.range(0, chunkTypes.length)
-                .mapToObj(x -> "eq(overflowKeySource" + x + ".getUnsafe(overflowLocation), k" + x + ")")
-                .collect(Collectors.joining(" && "));
-    }
-
     private static ClassName chunkHasherByChunkType(ChunkType chunkType) {
         return ClassName.get(CharChunkHasher.class.getPackageName(), chunkType.name() + "ChunkHasher");
     }
 
-    static Class<? extends ArrayBackedColumnSource> arraySourceType(ChunkType chunkType) {
-        switch (chunkType) {
-            default:
-            case Boolean:
-                throw new IllegalArgumentException();
-            case Char:
-                return CharacterArraySource.class;
-            case Byte:
-                return ByteArraySource.class;
-            case Short:
-                return ShortArraySource.class;
-            case Int:
-                return IntegerArraySource.class;
-            case Long:
-                return LongArraySource.class;
-            case Float:
-                return FloatArraySource.class;
-            case Double:
-                return DoubleArraySource.class;
-            case Object:
-                return ObjectArraySource.class;
-        }
-    }
-
     static Class<? extends ColumnSource> flatSourceType(ChunkType chunkType) {
         switch (chunkType) {
             default:
@@ -1523,22 +1377,4 @@ static Class<?> elementType(ChunkType chunkType) {
                 return Object.class;
         }
     }
-
-    private static String elementNull(ChunkType chunkType) {
-        switch (chunkType) {
-            default:
-            case Boolean:
-                throw new IllegalArgumentException();
-            case Char:
-            case Byte:
-            case Short:
-            case Int:
-            case Long:
-            case Float:
-            case Double:
-                return "QueryConstants.NULL_" + chunkType.name().toUpperCase();
-            case Object:
-                return "null";
-        }
-    }
 }
diff --git a/engine/table/src/main/java/io/deephaven/engine/table/impl/by/typed/incagg/gen/IncrementalAggHasherByte.java b/engine/table/src/main/java/io/deephaven/engine/table/impl/by/typed/incagg/gen/IncrementalAggHasherByte.java
deleted file mode 100644
index fc2d2960766..00000000000
--- a/engine/table/src/main/java/io/deephaven/engine/table/impl/by/typed/incagg/gen/IncrementalAggHasherByte.java
+++ /dev/null
@@ -1,180 +0,0 @@
-//
-// Copyright (c) 2016-2024 Deephaven Data Labs and Patent Pending
-//
-// ****** AUTO-GENERATED CLASS - DO NOT EDIT MANUALLY
-// ****** Run ReplicateTypedHashers or ./gradlew replicateTypedHashers to regenerate
-//
-// @formatter:off
-package io.deephaven.engine.table.impl.by.typed.incagg.gen;
-
-import static io.deephaven.util.compare.ByteComparisons.eq;
-
-import io.deephaven.chunk.ByteChunk;
-import io.deephaven.chunk.Chunk;
-import io.deephaven.chunk.attributes.Values;
-import io.deephaven.chunk.util.hashing.ByteChunkHasher;
-import io.deephaven.engine.rowset.RowSequence;
-import io.deephaven.engine.table.ColumnSource;
-import io.deephaven.engine.table.impl.by.HashHandler;
-import io.deephaven.engine.table.impl.by.IncrementalChunkedOperatorAggregationStateManagerTypedBase;
-import io.deephaven.engine.table.impl.sources.ByteArraySource;
-import io.deephaven.util.QueryConstants;
-import io.deephaven.util.type.TypeUtils;
-import java.lang.Byte;
-import java.lang.Object;
-import java.lang.Override;
-
-final class IncrementalAggHasherByte extends IncrementalChunkedOperatorAggregationStateManagerTypedBase {
-    private final ByteArraySource mainKeySource0;
-
-    private final ByteArraySource overflowKeySource0;
-
-    public IncrementalAggHasherByte(ColumnSource[] tableKeySources,
-            ColumnSource[] originalTableKeySources, int tableSize, double maximumLoadFactor,
-            double targetLoadFactor) {
-        super(tableKeySources, tableSize, maximumLoadFactor, targetLoadFactor);
-        this.mainKeySource0 = (ByteArraySource) super.mainKeySources[0];
-        this.overflowKeySource0 = (ByteArraySource) super.overflowKeySources[0];
-    }
-
-    @Override
-    protected void build(HashHandler handler, RowSequence rowSequence, Chunk[] sourceKeyChunks) {
-        final ByteChunk<Values> keyChunk0 = sourceKeyChunks[0].asByteChunk();
-        final int chunkSize = keyChunk0.size();
-        for (int chunkPosition = 0; chunkPosition < chunkSize; ++chunkPosition) {
-            final byte k0 = keyChunk0.get(chunkPosition);
-            final int hash = hash(k0);
-            final int tableLocation = hashToTableLocation(tableHashPivot, hash);
-            if (mainOutputPosition.getUnsafe(tableLocation) == EMPTY_OUTPUT_POSITION) {
-                numEntries++;
-                mainKeySource0.set(tableLocation, k0);
-                handler.doMainInsert(tableLocation, chunkPosition);
-            } else if (eq(mainKeySource0.getUnsafe(tableLocation), k0)) {
-                handler.doMainFound(tableLocation, chunkPosition);
-            } else {
-                int overflowLocation = mainOverflowLocationSource.getUnsafe(tableLocation);
-                if (!findOverflow(handler, k0, chunkPosition, overflowLocation)) {
-                    final int newOverflowLocation = allocateOverflowLocation();
-                    overflowKeySource0.set(newOverflowLocation, k0);
-                    mainOverflowLocationSource.set(tableLocation, newOverflowLocation);
-                    overflowOverflowLocationSource.set(newOverflowLocation, overflowLocation);
-                    numEntries++;
-                    handler.doOverflowInsert(newOverflowLocation, chunkPosition);
-                }
-            }
-        }
-    }
-
-    @Override
-    protected void probe(HashHandler handler, RowSequence rowSequence, Chunk[] sourceKeyChunks) {
-        final ByteChunk<Values> keyChunk0 = sourceKeyChunks[0].asByteChunk();
-        final int chunkSize = keyChunk0.size();
-        for (int chunkPosition = 0; chunkPosition < chunkSize; ++chunkPosition) {
-            final byte k0 = keyChunk0.get(chunkPosition);
-            final int hash = hash(k0);
-            final int tableLocation = hashToTableLocation(tableHashPivot, hash);
-            if (mainOutputPosition.getUnsafe(tableLocation) == EMPTY_OUTPUT_POSITION) {
-                handler.doMissing(chunkPosition);
-            } else if (eq(mainKeySource0.getUnsafe(tableLocation), k0)) {
-                handler.doMainFound(tableLocation, chunkPosition);
-            } else {
-                int overflowLocation = mainOverflowLocationSource.getUnsafe(tableLocation);
-                if (!findOverflow(handler, k0, chunkPosition, overflowLocation)) {
-                    handler.doMissing(chunkPosition);
-                }
-            }
-        }
-    }
-
-    private static int hash(byte k0) {
-        int hash = ByteChunkHasher.hashInitialSingle(k0);
-        return hash;
-    }
-
-    @Override
-    protected void rehashBucket(HashHandler handler, int sourceBucket, int destBucket,
-            int bucketsToAdd) {
-        final int position = mainOutputPosition.getUnsafe(sourceBucket);
-        if (position == EMPTY_OUTPUT_POSITION) {
-            return;
-        }
-        int mainInsertLocation = maybeMoveMainBucket(handler, sourceBucket, destBucket, bucketsToAdd);
-        int overflowLocation = mainOverflowLocationSource.getUnsafe(sourceBucket);
-        mainOverflowLocationSource.set(sourceBucket, QueryConstants.NULL_INT);
-        mainOverflowLocationSource.set(destBucket, QueryConstants.NULL_INT);
-        while (overflowLocation != QueryConstants.NULL_INT) {
-            final int nextOverflowLocation = overflowOverflowLocationSource.getUnsafe(overflowLocation);
-            final byte overflowKey0 = overflowKeySource0.getUnsafe(overflowLocation);
-            final int overflowHash = hash(overflowKey0);
-            final int overflowTableLocation = hashToTableLocation(tableHashPivot + bucketsToAdd, overflowHash);
-            if (overflowTableLocation == mainInsertLocation) {
-                mainKeySource0.set(mainInsertLocation, overflowKey0);
-                mainOutputPosition.set(mainInsertLocation, overflowOutputPosition.getUnsafe(overflowLocation));
-                handler.doPromoteOverflow(overflowLocation, mainInsertLocation);
-                overflowOutputPosition.set(overflowLocation, QueryConstants.NULL_INT);
-                overflowKeySource0.set(overflowLocation, QueryConstants.NULL_BYTE);
-                freeOverflowLocation(overflowLocation);
-                mainInsertLocation = -1;
-            } else {
-                final int oldOverflowLocation = mainOverflowLocationSource.getUnsafe(overflowTableLocation);
-                mainOverflowLocationSource.set(overflowTableLocation, overflowLocation);
-                overflowOverflowLocationSource.set(overflowLocation, oldOverflowLocation);
-            }
-            overflowLocation = nextOverflowLocation;
-        }
-    }
-
-    private int maybeMoveMainBucket(HashHandler handler, int sourceBucket, int destBucket,
-            int bucketsToAdd) {
-        final byte k0 = mainKeySource0.getUnsafe(sourceBucket);
-        final int hash = hash(k0);
-        final int location = hashToTableLocation(tableHashPivot + bucketsToAdd, hash);
-        final int mainInsertLocation;
-        if (location == sourceBucket) {
-            mainInsertLocation = destBucket;
-            mainOutputPosition.set(destBucket, EMPTY_OUTPUT_POSITION);
-        } else {
-            mainInsertLocation = sourceBucket;
-            mainOutputPosition.set(destBucket, mainOutputPosition.getUnsafe(sourceBucket));
-            mainOutputPosition.set(sourceBucket, EMPTY_OUTPUT_POSITION);
-            mainKeySource0.set(destBucket, k0);
-            mainKeySource0.set(sourceBucket, QueryConstants.NULL_BYTE);
-            handler.doMoveMain(sourceBucket, destBucket);
-        }
-        return mainInsertLocation;
-    }
-
-    private boolean findOverflow(HashHandler handler, byte k0, int chunkPosition,
-            int overflowLocation) {
-        while (overflowLocation != QueryConstants.NULL_INT) {
-            if (eq(overflowKeySource0.getUnsafe(overflowLocation), k0)) {
-                handler.doOverflowFound(overflowLocation, chunkPosition);
-                return true;
-            }
-            overflowLocation = overflowOverflowLocationSource.getUnsafe(overflowLocation);
-        }
-        return false;
-    }
-
-    @Override
-    public int findPositionForKey(Object key) {
-        final byte k0 = TypeUtils.unbox((Byte)key);
-        int hash = hash(k0);
-        final int tableLocation = hashToTableLocation(tableHashPivot, hash);
-        final int positionValue = mainOutputPosition.getUnsafe(tableLocation);
-        if (positionValue == EMPTY_OUTPUT_POSITION) {
-            return -1;
-        }
-        if (eq(mainKeySource0.getUnsafe(tableLocation), k0)) {
-            return positionValue;
-        }
-        int overflowLocation = mainOverflowLocationSource.getUnsafe(tableLocation);
-        while (overflowLocation != QueryConstants.NULL_INT) {
-            if (eq(overflowKeySource0.getUnsafe(overflowLocation), k0)) {
-                return overflowOutputPosition.getUnsafe(overflowLocation);
-            }
-            overflowLocation = overflowOverflowLocationSource.getUnsafe(overflowLocation);
-        }
-        return -1;
-    }
-}
diff --git a/engine/table/src/main/java/io/deephaven/engine/table/impl/by/typed/incagg/gen/IncrementalAggHasherByteByte.java b/engine/table/src/main/java/io/deephaven/engine/table/impl/by/typed/incagg/gen/IncrementalAggHasherByteByte.java
deleted file mode 100644
index 18ab83457cc..00000000000
--- a/engine/table/src/main/java/io/deephaven/engine/table/impl/by/typed/incagg/gen/IncrementalAggHasherByteByte.java
+++ /dev/null
@@ -1,201 +0,0 @@
-//
-// Copyright (c) 2016-2024 Deephaven Data Labs and Patent Pending
-//
-// ****** AUTO-GENERATED CLASS - DO NOT EDIT MANUALLY
-// ****** Run ReplicateTypedHashers or ./gradlew replicateTypedHashers to regenerate
-//
-// @formatter:off
-package io.deephaven.engine.table.impl.by.typed.incagg.gen;
-
-import static io.deephaven.util.compare.ByteComparisons.eq;
-
-import io.deephaven.chunk.ByteChunk;
-import io.deephaven.chunk.Chunk;
-import io.deephaven.chunk.attributes.Values;
-import io.deephaven.chunk.util.hashing.ByteChunkHasher;
-import io.deephaven.engine.rowset.RowSequence;
-import io.deephaven.engine.table.ColumnSource;
-import io.deephaven.engine.table.impl.by.HashHandler;
-import io.deephaven.engine.table.impl.by.IncrementalChunkedOperatorAggregationStateManagerTypedBase;
-import io.deephaven.engine.table.impl.sources.ByteArraySource;
-import io.deephaven.util.QueryConstants;
-import io.deephaven.util.type.TypeUtils;
-import java.lang.Byte;
-import java.lang.Object;
-import java.lang.Override;
-
-final class IncrementalAggHasherByteByte extends IncrementalChunkedOperatorAggregationStateManagerTypedBase {
-    private final ByteArraySource mainKeySource0;
-
-    private final ByteArraySource overflowKeySource0;
-
-    private final ByteArraySource mainKeySource1;
-
-    private final ByteArraySource overflowKeySource1;
-
-    public IncrementalAggHasherByteByte(ColumnSource[] tableKeySources,
-            ColumnSource[] originalTableKeySources, int tableSize, double maximumLoadFactor,
-            double targetLoadFactor) {
-        super(tableKeySources, tableSize, maximumLoadFactor, targetLoadFactor);
-        this.mainKeySource0 = (ByteArraySource) super.mainKeySources[0];
-        this.overflowKeySource0 = (ByteArraySource) super.overflowKeySources[0];
-        this.mainKeySource1 = (ByteArraySource) super.mainKeySources[1];
-        this.overflowKeySource1 = (ByteArraySource) super.overflowKeySources[1];
-    }
-
-    @Override
-    protected void build(HashHandler handler, RowSequence rowSequence, Chunk[] sourceKeyChunks) {
-        final ByteChunk<Values> keyChunk0 = sourceKeyChunks[0].asByteChunk();
-        final ByteChunk<Values> keyChunk1 = sourceKeyChunks[1].asByteChunk();
-        final int chunkSize = keyChunk0.size();
-        for (int chunkPosition = 0; chunkPosition < chunkSize; ++chunkPosition) {
-            final byte k0 = keyChunk0.get(chunkPosition);
-            final byte k1 = keyChunk1.get(chunkPosition);
-            final int hash = hash(k0, k1);
-            final int tableLocation = hashToTableLocation(tableHashPivot, hash);
-            if (mainOutputPosition.getUnsafe(tableLocation) == EMPTY_OUTPUT_POSITION) {
-                numEntries++;
-                mainKeySource0.set(tableLocation, k0);
-                mainKeySource1.set(tableLocation, k1);
-                handler.doMainInsert(tableLocation, chunkPosition);
-            } else if (eq(mainKeySource0.getUnsafe(tableLocation), k0) && eq(mainKeySource1.getUnsafe(tableLocation), k1)) {
-                handler.doMainFound(tableLocation, chunkPosition);
-            } else {
-                int overflowLocation = mainOverflowLocationSource.getUnsafe(tableLocation);
-                if (!findOverflow(handler, k0, k1, chunkPosition, overflowLocation)) {
-                    final int newOverflowLocation = allocateOverflowLocation();
-                    overflowKeySource0.set(newOverflowLocation, k0);
-                    overflowKeySource1.set(newOverflowLocation, k1);
-                    mainOverflowLocationSource.set(tableLocation, newOverflowLocation);
-                    overflowOverflowLocationSource.set(newOverflowLocation, overflowLocation);
-                    numEntries++;
-                    handler.doOverflowInsert(newOverflowLocation, chunkPosition);
-                }
-            }
-        }
-    }
-
-    @Override
-    protected void probe(HashHandler handler, RowSequence rowSequence, Chunk[] sourceKeyChunks) {
-        final ByteChunk<Values> keyChunk0 = sourceKeyChunks[0].asByteChunk();
-        final ByteChunk<Values> keyChunk1 = sourceKeyChunks[1].asByteChunk();
-        final int chunkSize = keyChunk0.size();
-        for (int chunkPosition = 0; chunkPosition < chunkSize; ++chunkPosition) {
-            final byte k0 = keyChunk0.get(chunkPosition);
-            final byte k1 = keyChunk1.get(chunkPosition);
-            final int hash = hash(k0, k1);
-            final int tableLocation = hashToTableLocation(tableHashPivot, hash);
-            if (mainOutputPosition.getUnsafe(tableLocation) == EMPTY_OUTPUT_POSITION) {
-                handler.doMissing(chunkPosition);
-            } else if (eq(mainKeySource0.getUnsafe(tableLocation), k0) && eq(mainKeySource1.getUnsafe(tableLocation), k1)) {
-                handler.doMainFound(tableLocation, chunkPosition);
-            } else {
-                int overflowLocation = mainOverflowLocationSource.getUnsafe(tableLocation);
-                if (!findOverflow(handler, k0, k1, chunkPosition, overflowLocation)) {
-                    handler.doMissing(chunkPosition);
-                }
-            }
-        }
-    }
-
-    private static int hash(byte k0, byte k1) {
-        int hash = ByteChunkHasher.hashInitialSingle(k0);
-        hash = ByteChunkHasher.hashUpdateSingle(hash, k1);
-        return hash;
-    }
-
-    @Override
-    protected void rehashBucket(HashHandler handler, int sourceBucket, int destBucket,
-            int bucketsToAdd) {
-        final int position = mainOutputPosition.getUnsafe(sourceBucket);
-        if (position == EMPTY_OUTPUT_POSITION) {
-            return;
-        }
-        int mainInsertLocation = maybeMoveMainBucket(handler, sourceBucket, destBucket, bucketsToAdd);
-        int overflowLocation = mainOverflowLocationSource.getUnsafe(sourceBucket);
-        mainOverflowLocationSource.set(sourceBucket, QueryConstants.NULL_INT);
-        mainOverflowLocationSource.set(destBucket, QueryConstants.NULL_INT);
-        while (overflowLocation != QueryConstants.NULL_INT) {
-            final int nextOverflowLocation = overflowOverflowLocationSource.getUnsafe(overflowLocation);
-            final byte overflowKey0 = overflowKeySource0.getUnsafe(overflowLocation);
-            final byte overflowKey1 = overflowKeySource1.getUnsafe(overflowLocation);
-            final int overflowHash = hash(overflowKey0, overflowKey1);
-            final int overflowTableLocation = hashToTableLocation(tableHashPivot + bucketsToAdd, overflowHash);
-            if (overflowTableLocation == mainInsertLocation) {
-                mainKeySource0.set(mainInsertLocation, overflowKey0);
-                mainKeySource1.set(mainInsertLocation, overflowKey1);
-                mainOutputPosition.set(mainInsertLocation, overflowOutputPosition.getUnsafe(overflowLocation));
-                handler.doPromoteOverflow(overflowLocation, mainInsertLocation);
-                overflowOutputPosition.set(overflowLocation, QueryConstants.NULL_INT);
-                overflowKeySource0.set(overflowLocation, QueryConstants.NULL_BYTE);
-                overflowKeySource1.set(overflowLocation, QueryConstants.NULL_BYTE);
-                freeOverflowLocation(overflowLocation);
-                mainInsertLocation = -1;
-            } else {
-                final int oldOverflowLocation = mainOverflowLocationSource.getUnsafe(overflowTableLocation);
-                mainOverflowLocationSource.set(overflowTableLocation, overflowLocation);
-                overflowOverflowLocationSource.set(overflowLocation, oldOverflowLocation);
-            }
-            overflowLocation = nextOverflowLocation;
-        }
-    }
-
-    private int maybeMoveMainBucket(HashHandler handler, int sourceBucket, int destBucket,
-            int bucketsToAdd) {
-        final byte k0 = mainKeySource0.getUnsafe(sourceBucket);
-        final byte k1 = mainKeySource1.getUnsafe(sourceBucket);
-        final int hash = hash(k0, k1);
-        final int location = hashToTableLocation(tableHashPivot + bucketsToAdd, hash);
-        final int mainInsertLocation;
-        if (location == sourceBucket) {
-            mainInsertLocation = destBucket;
-            mainOutputPosition.set(destBucket, EMPTY_OUTPUT_POSITION);
-        } else {
-            mainInsertLocation = sourceBucket;
-            mainOutputPosition.set(destBucket, mainOutputPosition.getUnsafe(sourceBucket));
-            mainOutputPosition.set(sourceBucket, EMPTY_OUTPUT_POSITION);
-            mainKeySource0.set(destBucket, k0);
-            mainKeySource0.set(sourceBucket, QueryConstants.NULL_BYTE);
-            mainKeySource1.set(destBucket, k1);
-            mainKeySource1.set(sourceBucket, QueryConstants.NULL_BYTE);
-            handler.doMoveMain(sourceBucket, destBucket);
-        }
-        return mainInsertLocation;
-    }
-
-    private boolean findOverflow(HashHandler handler, byte k0, byte k1, int chunkPosition,
-            int overflowLocation) {
-        while (overflowLocation != QueryConstants.NULL_INT) {
-            if (eq(overflowKeySource0.getUnsafe(overflowLocation), k0) && eq(overflowKeySource1.getUnsafe(overflowLocation), k1)) {
-                handler.doOverflowFound(overflowLocation, chunkPosition);
-                return true;
-            }
-            overflowLocation = overflowOverflowLocationSource.getUnsafe(overflowLocation);
-        }
-        return false;
-    }
-
-    @Override
-    public int findPositionForKey(Object key) {
-        final Object [] ka = (Object[])key;
-        final byte k0 = TypeUtils.unbox((Byte)ka[0]);
-        final byte k1 = TypeUtils.unbox((Byte)ka[1]);
-        int hash = hash(k0, k1);
-        final int tableLocation = hashToTableLocation(tableHashPivot, hash);
-        final int positionValue = mainOutputPosition.getUnsafe(tableLocation);
-        if (positionValue == EMPTY_OUTPUT_POSITION) {
-            return -1;
-        }
-        if (eq(mainKeySource0.getUnsafe(tableLocation), k0) && eq(mainKeySource1.getUnsafe(tableLocation), k1)) {
-            return positionValue;
-        }
-        int overflowLocation = mainOverflowLocationSource.getUnsafe(tableLocation);
-        while (overflowLocation != QueryConstants.NULL_INT) {
-            if (eq(overflowKeySource0.getUnsafe(overflowLocation), k0) && eq(overflowKeySource1.getUnsafe(overflowLocation), k1)) {
-                return overflowOutputPosition.getUnsafe(overflowLocation);
-            }
-            overflowLocation = overflowOverflowLocationSource.getUnsafe(overflowLocation);
-        }
-        return -1;
-    }
-}
diff --git a/engine/table/src/main/java/io/deephaven/engine/table/impl/by/typed/incagg/gen/IncrementalAggHasherByteChar.java b/engine/table/src/main/java/io/deephaven/engine/table/impl/by/typed/incagg/gen/IncrementalAggHasherByteChar.java
deleted file mode 100644
index 2cea7d80a54..00000000000
--- a/engine/table/src/main/java/io/deephaven/engine/table/impl/by/typed/incagg/gen/IncrementalAggHasherByteChar.java
+++ /dev/null
@@ -1,206 +0,0 @@
-//
-// Copyright (c) 2016-2024 Deephaven Data Labs and Patent Pending
-//
-// ****** AUTO-GENERATED CLASS - DO NOT EDIT MANUALLY
-// ****** Run ReplicateTypedHashers or ./gradlew replicateTypedHashers to regenerate
-//
-// @formatter:off
-package io.deephaven.engine.table.impl.by.typed.incagg.gen;
-
-import static io.deephaven.util.compare.ByteComparisons.eq;
-import static io.deephaven.util.compare.CharComparisons.eq;
-
-import io.deephaven.chunk.ByteChunk;
-import io.deephaven.chunk.CharChunk;
-import io.deephaven.chunk.Chunk;
-import io.deephaven.chunk.attributes.Values;
-import io.deephaven.chunk.util.hashing.ByteChunkHasher;
-import io.deephaven.chunk.util.hashing.CharChunkHasher;
-import io.deephaven.engine.rowset.RowSequence;
-import io.deephaven.engine.table.ColumnSource;
-import io.deephaven.engine.table.impl.by.HashHandler;
-import io.deephaven.engine.table.impl.by.IncrementalChunkedOperatorAggregationStateManagerTypedBase;
-import io.deephaven.engine.table.impl.sources.ByteArraySource;
-import io.deephaven.engine.table.impl.sources.CharacterArraySource;
-import io.deephaven.util.QueryConstants;
-import io.deephaven.util.type.TypeUtils;
-import java.lang.Byte;
-import java.lang.Character;
-import java.lang.Object;
-import java.lang.Override;
-
-final class IncrementalAggHasherByteChar extends IncrementalChunkedOperatorAggregationStateManagerTypedBase {
-    private final ByteArraySource mainKeySource0;
-
-    private final ByteArraySource overflowKeySource0;
-
-    private final CharacterArraySource mainKeySource1;
-
-    private final CharacterArraySource overflowKeySource1;
-
-    public IncrementalAggHasherByteChar(ColumnSource[] tableKeySources,
-            ColumnSource[] originalTableKeySources, int tableSize, double maximumLoadFactor,
-            double targetLoadFactor) {
-        super(tableKeySources, tableSize, maximumLoadFactor, targetLoadFactor);
-        this.mainKeySource0 = (ByteArraySource) super.mainKeySources[0];
-        this.overflowKeySource0 = (ByteArraySource) super.overflowKeySources[0];
-        this.mainKeySource1 = (CharacterArraySource) super.mainKeySources[1];
-        this.overflowKeySource1 = (CharacterArraySource) super.overflowKeySources[1];
-    }
-
-    @Override
-    protected void build(HashHandler handler, RowSequence rowSequence, Chunk[] sourceKeyChunks) {
-        final ByteChunk<Values> keyChunk0 = sourceKeyChunks[0].asByteChunk();
-        final CharChunk<Values> keyChunk1 = sourceKeyChunks[1].asCharChunk();
-        final int chunkSize = keyChunk0.size();
-        for (int chunkPosition = 0; chunkPosition < chunkSize; ++chunkPosition) {
-            final byte k0 = keyChunk0.get(chunkPosition);
-            final char k1 = keyChunk1.get(chunkPosition);
-            final int hash = hash(k0, k1);
-            final int tableLocation = hashToTableLocation(tableHashPivot, hash);
-            if (mainOutputPosition.getUnsafe(tableLocation) == EMPTY_OUTPUT_POSITION) {
-                numEntries++;
-                mainKeySource0.set(tableLocation, k0);
-                mainKeySource1.set(tableLocation, k1);
-                handler.doMainInsert(tableLocation, chunkPosition);
-            } else if (eq(mainKeySource0.getUnsafe(tableLocation), k0) && eq(mainKeySource1.getUnsafe(tableLocation), k1)) {
-                handler.doMainFound(tableLocation, chunkPosition);
-            } else {
-                int overflowLocation = mainOverflowLocationSource.getUnsafe(tableLocation);
-                if (!findOverflow(handler, k0, k1, chunkPosition, overflowLocation)) {
-                    final int newOverflowLocation = allocateOverflowLocation();
-                    overflowKeySource0.set(newOverflowLocation, k0);
-                    overflowKeySource1.set(newOverflowLocation, k1);
-                    mainOverflowLocationSource.set(tableLocation, newOverflowLocation);
-                    overflowOverflowLocationSource.set(newOverflowLocation, overflowLocation);
-                    numEntries++;
-                    handler.doOverflowInsert(newOverflowLocation, chunkPosition);
-                }
-            }
-        }
-    }
-
-    @Override
-    protected void probe(HashHandler handler, RowSequence rowSequence, Chunk[] sourceKeyChunks) {
-        final ByteChunk<Values> keyChunk0 = sourceKeyChunks[0].asByteChunk();
-        final CharChunk<Values> keyChunk1 = sourceKeyChunks[1].asCharChunk();
-        final int chunkSize = keyChunk0.size();
-        for (int chunkPosition = 0; chunkPosition < chunkSize; ++chunkPosition) {
-            final byte k0 = keyChunk0.get(chunkPosition);
-            final char k1 = keyChunk1.get(chunkPosition);
-            final int hash = hash(k0, k1);
-            final int tableLocation = hashToTableLocation(tableHashPivot, hash);
-            if (mainOutputPosition.getUnsafe(tableLocation) == EMPTY_OUTPUT_POSITION) {
-                handler.doMissing(chunkPosition);
-            } else if (eq(mainKeySource0.getUnsafe(tableLocation), k0) && eq(mainKeySource1.getUnsafe(tableLocation), k1)) {
-                handler.doMainFound(tableLocation, chunkPosition);
-            } else {
-                int overflowLocation = mainOverflowLocationSource.getUnsafe(tableLocation);
-                if (!findOverflow(handler, k0, k1, chunkPosition, overflowLocation)) {
-                    handler.doMissing(chunkPosition);
-                }
-            }
-        }
-    }
-
-    private static int hash(byte k0, char k1) {
-        int hash = ByteChunkHasher.hashInitialSingle(k0);
-        hash = CharChunkHasher.hashUpdateSingle(hash, k1);
-        return hash;
-    }
-
-    @Override
-    protected void rehashBucket(HashHandler handler, int sourceBucket, int destBucket,
-            int bucketsToAdd) {
-        final int position = mainOutputPosition.getUnsafe(sourceBucket);
-        if (position == EMPTY_OUTPUT_POSITION) {
-            return;
-        }
-        int mainInsertLocation = maybeMoveMainBucket(handler, sourceBucket, destBucket, bucketsToAdd);
-        int overflowLocation = mainOverflowLocationSource.getUnsafe(sourceBucket);
-        mainOverflowLocationSource.set(sourceBucket, QueryConstants.NULL_INT);
-        mainOverflowLocationSource.set(destBucket, QueryConstants.NULL_INT);
-        while (overflowLocation != QueryConstants.NULL_INT) {
-            final int nextOverflowLocation = overflowOverflowLocationSource.getUnsafe(overflowLocation);
-            final byte overflowKey0 = overflowKeySource0.getUnsafe(overflowLocation);
-            final char overflowKey1 = overflowKeySource1.getUnsafe(overflowLocation);
-            final int overflowHash = hash(overflowKey0, overflowKey1);
-            final int overflowTableLocation = hashToTableLocation(tableHashPivot + bucketsToAdd, overflowHash);
-            if (overflowTableLocation == mainInsertLocation) {
-                mainKeySource0.set(mainInsertLocation, overflowKey0);
-                mainKeySource1.set(mainInsertLocation, overflowKey1);
-                mainOutputPosition.set(mainInsertLocation, overflowOutputPosition.getUnsafe(overflowLocation));
-                handler.doPromoteOverflow(overflowLocation, mainInsertLocation);
-                overflowOutputPosition.set(overflowLocation, QueryConstants.NULL_INT);
-                overflowKeySource0.set(overflowLocation, QueryConstants.NULL_BYTE);
-                overflowKeySource1.set(overflowLocation, QueryConstants.NULL_CHAR);
-                freeOverflowLocation(overflowLocation);
-                mainInsertLocation = -1;
-            } else {
-                final int oldOverflowLocation = mainOverflowLocationSource.getUnsafe(overflowTableLocation);
-                mainOverflowLocationSource.set(overflowTableLocation, overflowLocation);
-                overflowOverflowLocationSource.set(overflowLocation, oldOverflowLocation);
-            }
-            overflowLocation = nextOverflowLocation;
-        }
-    }
-
-    private int maybeMoveMainBucket(HashHandler handler, int sourceBucket, int destBucket,
-            int bucketsToAdd) {
-        final byte k0 = mainKeySource0.getUnsafe(sourceBucket);
-        final char k1 = mainKeySource1.getUnsafe(sourceBucket);
-        final int hash = hash(k0, k1);
-        final int location = hashToTableLocation(tableHashPivot + bucketsToAdd, hash);
-        final int mainInsertLocation;
-        if (location == sourceBucket) {
-            mainInsertLocation = destBucket;
-            mainOutputPosition.set(destBucket, EMPTY_OUTPUT_POSITION);
-        } else {
-            mainInsertLocation = sourceBucket;
-            mainOutputPosition.set(destBucket, mainOutputPosition.getUnsafe(sourceBucket));
-            mainOutputPosition.set(sourceBucket, EMPTY_OUTPUT_POSITION);
-            mainKeySource0.set(destBucket, k0);
-            mainKeySource0.set(sourceBucket, QueryConstants.NULL_BYTE);
-            mainKeySource1.set(destBucket, k1);
-            mainKeySource1.set(sourceBucket, QueryConstants.NULL_CHAR);
-            handler.doMoveMain(sourceBucket, destBucket);
-        }
-        return mainInsertLocation;
-    }
-
-    private boolean findOverflow(HashHandler handler, byte k0, char k1, int chunkPosition,
-            int overflowLocation) {
-        while (overflowLocation != QueryConstants.NULL_INT) {
-            if (eq(overflowKeySource0.getUnsafe(overflowLocation), k0) && eq(overflowKeySource1.getUnsafe(overflowLocation), k1)) {
-                handler.doOverflowFound(overflowLocation, chunkPosition);
-                return true;
-            }
-            overflowLocation = overflowOverflowLocationSource.getUnsafe(overflowLocation);
-        }
-        return false;
-    }
-
-    @Override
-    public int findPositionForKey(Object key) {
-        final Object [] ka = (Object[])key;
-        final byte k0 = TypeUtils.unbox((Byte)ka[0]);
-        final char k1 = TypeUtils.unbox((Character)ka[1]);
-        int hash = hash(k0, k1);
-        final int tableLocation = hashToTableLocation(tableHashPivot, hash);
-        final int positionValue = mainOutputPosition.getUnsafe(tableLocation);
-        if (positionValue == EMPTY_OUTPUT_POSITION) {
-            return -1;
-        }
-        if (eq(mainKeySource0.getUnsafe(tableLocation), k0) && eq(mainKeySource1.getUnsafe(tableLocation), k1)) {
-            return positionValue;
-        }
-        int overflowLocation = mainOverflowLocationSource.getUnsafe(tableLocation);
-        while (overflowLocation != QueryConstants.NULL_INT) {
-            if (eq(overflowKeySource0.getUnsafe(overflowLocation), k0) && eq(overflowKeySource1.getUnsafe(overflowLocation), k1)) {
-                return overflowOutputPosition.getUnsafe(overflowLocation);
-            }
-            overflowLocation = overflowOverflowLocationSource.getUnsafe(overflowLocation);
-        }
-        return -1;
-    }
-}
diff --git a/engine/table/src/main/java/io/deephaven/engine/table/impl/by/typed/incagg/gen/IncrementalAggHasherByteDouble.java b/engine/table/src/main/java/io/deephaven/engine/table/impl/by/typed/incagg/gen/IncrementalAggHasherByteDouble.java
deleted file mode 100644
index f088557fa3f..00000000000
--- a/engine/table/src/main/java/io/deephaven/engine/table/impl/by/typed/incagg/gen/IncrementalAggHasherByteDouble.java
+++ /dev/null
@@ -1,206 +0,0 @@
-//
-// Copyright (c) 2016-2024 Deephaven Data Labs and Patent Pending
-//
-// ****** AUTO-GENERATED CLASS - DO NOT EDIT MANUALLY
-// ****** Run ReplicateTypedHashers or ./gradlew replicateTypedHashers to regenerate
-//
-// @formatter:off
-package io.deephaven.engine.table.impl.by.typed.incagg.gen;
-
-import static io.deephaven.util.compare.ByteComparisons.eq;
-import static io.deephaven.util.compare.DoubleComparisons.eq;
-
-import io.deephaven.chunk.ByteChunk;
-import io.deephaven.chunk.Chunk;
-import io.deephaven.chunk.DoubleChunk;
-import io.deephaven.chunk.attributes.Values;
-import io.deephaven.chunk.util.hashing.ByteChunkHasher;
-import io.deephaven.chunk.util.hashing.DoubleChunkHasher;
-import io.deephaven.engine.rowset.RowSequence;
-import io.deephaven.engine.table.ColumnSource;
-import io.deephaven.engine.table.impl.by.HashHandler;
-import io.deephaven.engine.table.impl.by.IncrementalChunkedOperatorAggregationStateManagerTypedBase;
-import io.deephaven.engine.table.impl.sources.ByteArraySource;
-import io.deephaven.engine.table.impl.sources.DoubleArraySource;
-import io.deephaven.util.QueryConstants;
-import io.deephaven.util.type.TypeUtils;
-import java.lang.Byte;
-import java.lang.Double;
-import java.lang.Object;
-import java.lang.Override;
-
-final class IncrementalAggHasherByteDouble extends IncrementalChunkedOperatorAggregationStateManagerTypedBase {
-    private final ByteArraySource mainKeySource0;
-
-    private final ByteArraySource overflowKeySource0;
-
-    private final DoubleArraySource mainKeySource1;
-
-    private final DoubleArraySource overflowKeySource1;
-
-    public IncrementalAggHasherByteDouble(ColumnSource[] tableKeySources,
-            ColumnSource[] originalTableKeySources, int tableSize, double maximumLoadFactor,
-            double targetLoadFactor) {
-        super(tableKeySources, tableSize, maximumLoadFactor, targetLoadFactor);
-        this.mainKeySource0 = (ByteArraySource) super.mainKeySources[0];
-        this.overflowKeySource0 = (ByteArraySource) super.overflowKeySources[0];
-        this.mainKeySource1 = (DoubleArraySource) super.mainKeySources[1];
-        this.overflowKeySource1 = (DoubleArraySource) super.overflowKeySources[1];
-    }
-
-    @Override
-    protected void build(HashHandler handler, RowSequence rowSequence, Chunk[] sourceKeyChunks) {
-        final ByteChunk<Values> keyChunk0 = sourceKeyChunks[0].asByteChunk();
-        final DoubleChunk<Values> keyChunk1 = sourceKeyChunks[1].asDoubleChunk();
-        final int chunkSize = keyChunk0.size();
-        for (int chunkPosition = 0; chunkPosition < chunkSize; ++chunkPosition) {
-            final byte k0 = keyChunk0.get(chunkPosition);
-            final double k1 = keyChunk1.get(chunkPosition);
-            final int hash = hash(k0, k1);
-            final int tableLocation = hashToTableLocation(tableHashPivot, hash);
-            if (mainOutputPosition.getUnsafe(tableLocation) == EMPTY_OUTPUT_POSITION) {
-                numEntries++;
-                mainKeySource0.set(tableLocation, k0);
-                mainKeySource1.set(tableLocation, k1);
-                handler.doMainInsert(tableLocation, chunkPosition);
-            } else if (eq(mainKeySource0.getUnsafe(tableLocation), k0) && eq(mainKeySource1.getUnsafe(tableLocation), k1)) {
-                handler.doMainFound(tableLocation, chunkPosition);
-            } else {
-                int overflowLocation = mainOverflowLocationSource.getUnsafe(tableLocation);
-                if (!findOverflow(handler, k0, k1, chunkPosition, overflowLocation)) {
-                    final int newOverflowLocation = allocateOverflowLocation();
-                    overflowKeySource0.set(newOverflowLocation, k0);
-                    overflowKeySource1.set(newOverflowLocation, k1);
-                    mainOverflowLocationSource.set(tableLocation, newOverflowLocation);
-                    overflowOverflowLocationSource.set(newOverflowLocation, overflowLocation);
-                    numEntries++;
-                    handler.doOverflowInsert(newOverflowLocation, chunkPosition);
-                }
-            }
-        }
-    }
-
-    @Override
-    protected void probe(HashHandler handler, RowSequence rowSequence, Chunk[] sourceKeyChunks) {
-        final ByteChunk<Values> keyChunk0 = sourceKeyChunks[0].asByteChunk();
-        final DoubleChunk<Values> keyChunk1 = sourceKeyChunks[1].asDoubleChunk();
-        final int chunkSize = keyChunk0.size();
-        for (int chunkPosition = 0; chunkPosition < chunkSize; ++chunkPosition) {
-            final byte k0 = keyChunk0.get(chunkPosition);
-            final double k1 = keyChunk1.get(chunkPosition);
-            final int hash = hash(k0, k1);
-            final int tableLocation = hashToTableLocation(tableHashPivot, hash);
-            if (mainOutputPosition.getUnsafe(tableLocation) == EMPTY_OUTPUT_POSITION) {
-                handler.doMissing(chunkPosition);
-            } else if (eq(mainKeySource0.getUnsafe(tableLocation), k0) && eq(mainKeySource1.getUnsafe(tableLocation), k1)) {
-                handler.doMainFound(tableLocation, chunkPosition);
-            } else {
-                int overflowLocation = mainOverflowLocationSource.getUnsafe(tableLocation);
-                if (!findOverflow(handler, k0, k1, chunkPosition, overflowLocation)) {
-                    handler.doMissing(chunkPosition);
-                }
-            }
-        }
-    }
-
-    private static int hash(byte k0, double k1) {
-        int hash = ByteChunkHasher.hashInitialSingle(k0);
-        hash = DoubleChunkHasher.hashUpdateSingle(hash, k1);
-        return hash;
-    }
-
-    @Override
-    protected void rehashBucket(HashHandler handler, int sourceBucket, int destBucket,
-            int bucketsToAdd) {
-        final int position = mainOutputPosition.getUnsafe(sourceBucket);
-        if (position == EMPTY_OUTPUT_POSITION) {
-            return;
-        }
-        int mainInsertLocation = maybeMoveMainBucket(handler, sourceBucket, destBucket, bucketsToAdd);
-        int overflowLocation = mainOverflowLocationSource.getUnsafe(sourceBucket);
-        mainOverflowLocationSource.set(sourceBucket, QueryConstants.NULL_INT);
-        mainOverflowLocationSource.set(destBucket, QueryConstants.NULL_INT);
-        while (overflowLocation != QueryConstants.NULL_INT) {
-            final int nextOverflowLocation = overflowOverflowLocationSource.getUnsafe(overflowLocation);
-            final byte overflowKey0 = overflowKeySource0.getUnsafe(overflowLocation);
-            final double overflowKey1 = overflowKeySource1.getUnsafe(overflowLocation);
-            final int overflowHash = hash(overflowKey0, overflowKey1);
-            final int overflowTableLocation = hashToTableLocation(tableHashPivot + bucketsToAdd, overflowHash);
-            if (overflowTableLocation == mainInsertLocation) {
-                mainKeySource0.set(mainInsertLocation, overflowKey0);
-                mainKeySource1.set(mainInsertLocation, overflowKey1);
-                mainOutputPosition.set(mainInsertLocation, overflowOutputPosition.getUnsafe(overflowLocation));
-                handler.doPromoteOverflow(overflowLocation, mainInsertLocation);
-                overflowOutputPosition.set(overflowLocation, QueryConstants.NULL_INT);
-                overflowKeySource0.set(overflowLocation, QueryConstants.NULL_BYTE);
-                overflowKeySource1.set(overflowLocation, QueryConstants.NULL_DOUBLE);
-                freeOverflowLocation(overflowLocation);
-                mainInsertLocation = -1;
-            } else {
-                final int oldOverflowLocation = mainOverflowLocationSource.getUnsafe(overflowTableLocation);
-                mainOverflowLocationSource.set(overflowTableLocation, overflowLocation);
-                overflowOverflowLocationSource.set(overflowLocation, oldOverflowLocation);
-            }
-            overflowLocation = nextOverflowLocation;
-        }
-    }
-
-    private int maybeMoveMainBucket(HashHandler handler, int sourceBucket, int destBucket,
-            int bucketsToAdd) {
-        final byte k0 = mainKeySource0.getUnsafe(sourceBucket);
-        final double k1 = mainKeySource1.getUnsafe(sourceBucket);
-        final int hash = hash(k0, k1);
-        final int location = hashToTableLocation(tableHashPivot + bucketsToAdd, hash);
-        final int mainInsertLocation;
-        if (location == sourceBucket) {
-            mainInsertLocation = destBucket;
-            mainOutputPosition.set(destBucket, EMPTY_OUTPUT_POSITION);
-        } else {
-            mainInsertLocation = sourceBucket;
-            mainOutputPosition.set(destBucket, mainOutputPosition.getUnsafe(sourceBucket));
-            mainOutputPosition.set(sourceBucket, EMPTY_OUTPUT_POSITION);
-            mainKeySource0.set(destBucket, k0);
-            mainKeySource0.set(sourceBucket, QueryConstants.NULL_BYTE);
-            mainKeySource1.set(destBucket, k1);
-            mainKeySource1.set(sourceBucket, QueryConstants.NULL_DOUBLE);
-            handler.doMoveMain(sourceBucket, destBucket);
-        }
-        return mainInsertLocation;
-    }
-
-    private boolean findOverflow(HashHandler handler, byte k0, double k1, int chunkPosition,
-            int overflowLocation) {
-        while (overflowLocation != QueryConstants.NULL_INT) {
-            if (eq(overflowKeySource0.getUnsafe(overflowLocation), k0) && eq(overflowKeySource1.getUnsafe(overflowLocation), k1)) {
-                handler.doOverflowFound(overflowLocation, chunkPosition);
-                return true;
-            }
-            overflowLocation = overflowOverflowLocationSource.getUnsafe(overflowLocation);
-        }
-        return false;
-    }
-
-    @Override
-    public int findPositionForKey(Object key) {
-        final Object [] ka = (Object[])key;
-        final byte k0 = TypeUtils.unbox((Byte)ka[0]);
-        final double k1 = TypeUtils.unbox((Double)ka[1]);
-        int hash = hash(k0, k1);
-        final int tableLocation = hashToTableLocation(tableHashPivot, hash);
-        final int positionValue = mainOutputPosition.getUnsafe(tableLocation);
-        if (positionValue == EMPTY_OUTPUT_POSITION) {
-            return -1;
-        }
-        if (eq(mainKeySource0.getUnsafe(tableLocation), k0) && eq(mainKeySource1.getUnsafe(tableLocation), k1)) {
-            return positionValue;
-        }
-        int overflowLocation = mainOverflowLocationSource.getUnsafe(tableLocation);
-        while (overflowLocation != QueryConstants.NULL_INT) {
-            if (eq(overflowKeySource0.getUnsafe(overflowLocation), k0) && eq(overflowKeySource1.getUnsafe(overflowLocation), k1)) {
-                return overflowOutputPosition.getUnsafe(overflowLocation);
-            }
-            overflowLocation = overflowOverflowLocationSource.getUnsafe(overflowLocation);
-        }
-        return -1;
-    }
-}
diff --git a/engine/table/src/main/java/io/deephaven/engine/table/impl/by/typed/incagg/gen/IncrementalAggHasherByteFloat.java b/engine/table/src/main/java/io/deephaven/engine/table/impl/by/typed/incagg/gen/IncrementalAggHasherByteFloat.java
deleted file mode 100644
index fe2465a7dd8..00000000000
--- a/engine/table/src/main/java/io/deephaven/engine/table/impl/by/typed/incagg/gen/IncrementalAggHasherByteFloat.java
+++ /dev/null
@@ -1,206 +0,0 @@
-//
-// Copyright (c) 2016-2024 Deephaven Data Labs and Patent Pending
-//
-// ****** AUTO-GENERATED CLASS - DO NOT EDIT MANUALLY
-// ****** Run ReplicateTypedHashers or ./gradlew replicateTypedHashers to regenerate
-//
-// @formatter:off
-package io.deephaven.engine.table.impl.by.typed.incagg.gen;
-
-import static io.deephaven.util.compare.ByteComparisons.eq;
-import static io.deephaven.util.compare.FloatComparisons.eq;
-
-import io.deephaven.chunk.ByteChunk;
-import io.deephaven.chunk.Chunk;
-import io.deephaven.chunk.FloatChunk;
-import io.deephaven.chunk.attributes.Values;
-import io.deephaven.chunk.util.hashing.ByteChunkHasher;
-import io.deephaven.chunk.util.hashing.FloatChunkHasher;
-import io.deephaven.engine.rowset.RowSequence;
-import io.deephaven.engine.table.ColumnSource;
-import io.deephaven.engine.table.impl.by.HashHandler;
-import io.deephaven.engine.table.impl.by.IncrementalChunkedOperatorAggregationStateManagerTypedBase;
-import io.deephaven.engine.table.impl.sources.ByteArraySource;
-import io.deephaven.engine.table.impl.sources.FloatArraySource;
-import io.deephaven.util.QueryConstants;
-import io.deephaven.util.type.TypeUtils;
-import java.lang.Byte;
-import java.lang.Float;
-import java.lang.Object;
-import java.lang.Override;
-
-final class IncrementalAggHasherByteFloat extends IncrementalChunkedOperatorAggregationStateManagerTypedBase {
-    private final ByteArraySource mainKeySource0;
-
-    private final ByteArraySource overflowKeySource0;
-
-    private final FloatArraySource mainKeySource1;
-
-    private final FloatArraySource overflowKeySource1;
-
-    public IncrementalAggHasherByteFloat(ColumnSource[] tableKeySources,
-            ColumnSource[] originalTableKeySources, int tableSize, double maximumLoadFactor,
-            double targetLoadFactor) {
-        super(tableKeySources, tableSize, maximumLoadFactor, targetLoadFactor);
-        this.mainKeySource0 = (ByteArraySource) super.mainKeySources[0];
-        this.overflowKeySource0 = (ByteArraySource) super.overflowKeySources[0];
-        this.mainKeySource1 = (FloatArraySource) super.mainKeySources[1];
-        this.overflowKeySource1 = (FloatArraySource) super.overflowKeySources[1];
-    }
-
-    @Override
-    protected void build(HashHandler handler, RowSequence rowSequence, Chunk[] sourceKeyChunks) {
-        final ByteChunk<Values> keyChunk0 = sourceKeyChunks[0].asByteChunk();
-        final FloatChunk<Values> keyChunk1 = sourceKeyChunks[1].asFloatChunk();
-        final int chunkSize = keyChunk0.size();
-        for (int chunkPosition = 0; chunkPosition < chunkSize; ++chunkPosition) {
-            final byte k0 = keyChunk0.get(chunkPosition);
-            final float k1 = keyChunk1.get(chunkPosition);
-            final int hash = hash(k0, k1);
-            final int tableLocation = hashToTableLocation(tableHashPivot, hash);
-            if (mainOutputPosition.getUnsafe(tableLocation) == EMPTY_OUTPUT_POSITION) {
-                numEntries++;
-                mainKeySource0.set(tableLocation, k0);
-                mainKeySource1.set(tableLocation, k1);
-                handler.doMainInsert(tableLocation, chunkPosition);
-            } else if (eq(mainKeySource0.getUnsafe(tableLocation), k0) && eq(mainKeySource1.getUnsafe(tableLocation), k1)) {
-                handler.doMainFound(tableLocation, chunkPosition);
-            } else {
-                int overflowLocation = mainOverflowLocationSource.getUnsafe(tableLocation);
-                if (!findOverflow(handler, k0, k1, chunkPosition, overflowLocation)) {
-                    final int newOverflowLocation = allocateOverflowLocation();
-                    overflowKeySource0.set(newOverflowLocation, k0);
-                    overflowKeySource1.set(newOverflowLocation, k1);
-                    mainOverflowLocationSource.set(tableLocation, newOverflowLocation);
-                    overflowOverflowLocationSource.set(newOverflowLocation, overflowLocation);
-                    numEntries++;
-                    handler.doOverflowInsert(newOverflowLocation, chunkPosition);
-                }
-            }
-        }
-    }
-
-    @Override
-    protected void probe(HashHandler handler, RowSequence rowSequence, Chunk[] sourceKeyChunks) {
-        final ByteChunk<Values> keyChunk0 = sourceKeyChunks[0].asByteChunk();
-        final FloatChunk<Values> keyChunk1 = sourceKeyChunks[1].asFloatChunk();
-        final int chunkSize = keyChunk0.size();
-        for (int chunkPosition = 0; chunkPosition < chunkSize; ++chunkPosition) {
-            final byte k0 = keyChunk0.get(chunkPosition);
-            final float k1 = keyChunk1.get(chunkPosition);
-            final int hash = hash(k0, k1);
-            final int tableLocation = hashToTableLocation(tableHashPivot, hash);
-            if (mainOutputPosition.getUnsafe(tableLocation) == EMPTY_OUTPUT_POSITION) {
-                handler.doMissing(chunkPosition);
-            } else if (eq(mainKeySource0.getUnsafe(tableLocation), k0) && eq(mainKeySource1.getUnsafe(tableLocation), k1)) {
-                handler.doMainFound(tableLocation, chunkPosition);
-            } else {
-                int overflowLocation = mainOverflowLocationSource.getUnsafe(tableLocation);
-                if (!findOverflow(handler, k0, k1, chunkPosition, overflowLocation)) {
-                    handler.doMissing(chunkPosition);
-                }
-            }
-        }
-    }
-
-    private static int hash(byte k0, float k1) {
-        int hash = ByteChunkHasher.hashInitialSingle(k0);
-        hash = FloatChunkHasher.hashUpdateSingle(hash, k1);
-        return hash;
-    }
-
-    @Override
-    protected void rehashBucket(HashHandler handler, int sourceBucket, int destBucket,
-            int bucketsToAdd) {
-        final int position = mainOutputPosition.getUnsafe(sourceBucket);
-        if (position == EMPTY_OUTPUT_POSITION) {
-            return;
-        }
-        int mainInsertLocation = maybeMoveMainBucket(handler, sourceBucket, destBucket, bucketsToAdd);
-        int overflowLocation = mainOverflowLocationSource.getUnsafe(sourceBucket);
-        mainOverflowLocationSource.set(sourceBucket, QueryConstants.NULL_INT);
-        mainOverflowLocationSource.set(destBucket, QueryConstants.NULL_INT);
-        while (overflowLocation != QueryConstants.NULL_INT) {
-            final int nextOverflowLocation = overflowOverflowLocationSource.getUnsafe(overflowLocation);
-            final byte overflowKey0 = overflowKeySource0.getUnsafe(overflowLocation);
-            final float overflowKey1 = overflowKeySource1.getUnsafe(overflowLocation);
-            final int overflowHash = hash(overflowKey0, overflowKey1);
-            final int overflowTableLocation = hashToTableLocation(tableHashPivot + bucketsToAdd, overflowHash);
-            if (overflowTableLocation == mainInsertLocation) {
-                mainKeySource0.set(mainInsertLocation, overflowKey0);
-                mainKeySource1.set(mainInsertLocation, overflowKey1);
-                mainOutputPosition.set(mainInsertLocation, overflowOutputPosition.getUnsafe(overflowLocation));
-                handler.doPromoteOverflow(overflowLocation, mainInsertLocation);
-                overflowOutputPosition.set(overflowLocation, QueryConstants.NULL_INT);
-                overflowKeySource0.set(overflowLocation, QueryConstants.NULL_BYTE);
-                overflowKeySource1.set(overflowLocation, QueryConstants.NULL_FLOAT);
-                freeOverflowLocation(overflowLocation);
-                mainInsertLocation = -1;
-            } else {
-                final int oldOverflowLocation = mainOverflowLocationSource.getUnsafe(overflowTableLocation);
-                mainOverflowLocationSource.set(overflowTableLocation, overflowLocation);
-                overflowOverflowLocationSource.set(overflowLocation, oldOverflowLocation);
-            }
-            overflowLocation = nextOverflowLocation;
-        }
-    }
-
-    private int maybeMoveMainBucket(HashHandler handler, int sourceBucket, int destBucket,
-            int bucketsToAdd) {
-        final byte k0 = mainKeySource0.getUnsafe(sourceBucket);
-        final float k1 = mainKeySource1.getUnsafe(sourceBucket);
-        final int hash = hash(k0, k1);
-        final int location = hashToTableLocation(tableHashPivot + bucketsToAdd, hash);
-        final int mainInsertLocation;
-        if (location == sourceBucket) {
-            mainInsertLocation = destBucket;
-            mainOutputPosition.set(destBucket, EMPTY_OUTPUT_POSITION);
-        } else {
-            mainInsertLocation = sourceBucket;
-            mainOutputPosition.set(destBucket, mainOutputPosition.getUnsafe(sourceBucket));
-            mainOutputPosition.set(sourceBucket, EMPTY_OUTPUT_POSITION);
-            mainKeySource0.set(destBucket, k0);
-            mainKeySource0.set(sourceBucket, QueryConstants.NULL_BYTE);
-            mainKeySource1.set(destBucket, k1);
-            mainKeySource1.set(sourceBucket, QueryConstants.NULL_FLOAT);
-            handler.doMoveMain(sourceBucket, destBucket);
-        }
-        return mainInsertLocation;
-    }
-
-    private boolean findOverflow(HashHandler handler, byte k0, float k1, int chunkPosition,
-            int overflowLocation) {
-        while (overflowLocation != QueryConstants.NULL_INT) {
-            if (eq(overflowKeySource0.getUnsafe(overflowLocation), k0) && eq(overflowKeySource1.getUnsafe(overflowLocation), k1)) {
-                handler.doOverflowFound(overflowLocation, chunkPosition);
-                return true;
-            }
-            overflowLocation = overflowOverflowLocationSource.getUnsafe(overflowLocation);
-        }
-        return false;
-    }
-
-    @Override
-    public int findPositionForKey(Object key) {
-        final Object [] ka = (Object[])key;
-        final byte k0 = TypeUtils.unbox((Byte)ka[0]);
-        final float k1 = TypeUtils.unbox((Float)ka[1]);
-        int hash = hash(k0, k1);
-        final int tableLocation = hashToTableLocation(tableHashPivot, hash);
-        final int positionValue = mainOutputPosition.getUnsafe(tableLocation);
-        if (positionValue == EMPTY_OUTPUT_POSITION) {
-            return -1;
-        }
-        if (eq(mainKeySource0.getUnsafe(tableLocation), k0) && eq(mainKeySource1.getUnsafe(tableLocation), k1)) {
-            return positionValue;
-        }
-        int overflowLocation = mainOverflowLocationSource.getUnsafe(tableLocation);
-        while (overflowLocation != QueryConstants.NULL_INT) {
-            if (eq(overflowKeySource0.getUnsafe(overflowLocation), k0) && eq(overflowKeySource1.getUnsafe(overflowLocation), k1)) {
-                return overflowOutputPosition.getUnsafe(overflowLocation);
-            }
-            overflowLocation = overflowOverflowLocationSource.getUnsafe(overflowLocation);
-        }
-        return -1;
-    }
-}
diff --git a/engine/table/src/main/java/io/deephaven/engine/table/impl/by/typed/incagg/gen/IncrementalAggHasherByteInt.java b/engine/table/src/main/java/io/deephaven/engine/table/impl/by/typed/incagg/gen/IncrementalAggHasherByteInt.java
deleted file mode 100644
index da24b0ce8de..00000000000
--- a/engine/table/src/main/java/io/deephaven/engine/table/impl/by/typed/incagg/gen/IncrementalAggHasherByteInt.java
+++ /dev/null
@@ -1,206 +0,0 @@
-//
-// Copyright (c) 2016-2024 Deephaven Data Labs and Patent Pending
-//
-// ****** AUTO-GENERATED CLASS - DO NOT EDIT MANUALLY
-// ****** Run ReplicateTypedHashers or ./gradlew replicateTypedHashers to regenerate
-//
-// @formatter:off
-package io.deephaven.engine.table.impl.by.typed.incagg.gen;
-
-import static io.deephaven.util.compare.ByteComparisons.eq;
-import static io.deephaven.util.compare.IntComparisons.eq;
-
-import io.deephaven.chunk.ByteChunk;
-import io.deephaven.chunk.Chunk;
-import io.deephaven.chunk.IntChunk;
-import io.deephaven.chunk.attributes.Values;
-import io.deephaven.chunk.util.hashing.ByteChunkHasher;
-import io.deephaven.chunk.util.hashing.IntChunkHasher;
-import io.deephaven.engine.rowset.RowSequence;
-import io.deephaven.engine.table.ColumnSource;
-import io.deephaven.engine.table.impl.by.HashHandler;
-import io.deephaven.engine.table.impl.by.IncrementalChunkedOperatorAggregationStateManagerTypedBase;
-import io.deephaven.engine.table.impl.sources.ByteArraySource;
-import io.deephaven.engine.table.impl.sources.IntegerArraySource;
-import io.deephaven.util.QueryConstants;
-import io.deephaven.util.type.TypeUtils;
-import java.lang.Byte;
-import java.lang.Integer;
-import java.lang.Object;
-import java.lang.Override;
-
-final class IncrementalAggHasherByteInt extends IncrementalChunkedOperatorAggregationStateManagerTypedBase {
-    private final ByteArraySource mainKeySource0;
-
-    private final ByteArraySource overflowKeySource0;
-
-    private final IntegerArraySource mainKeySource1;
-
-    private final IntegerArraySource overflowKeySource1;
-
-    public IncrementalAggHasherByteInt(ColumnSource[] tableKeySources,
-            ColumnSource[] originalTableKeySources, int tableSize, double maximumLoadFactor,
-            double targetLoadFactor) {
-        super(tableKeySources, tableSize, maximumLoadFactor, targetLoadFactor);
-        this.mainKeySource0 = (ByteArraySource) super.mainKeySources[0];
-        this.overflowKeySource0 = (ByteArraySource) super.overflowKeySources[0];
-        this.mainKeySource1 = (IntegerArraySource) super.mainKeySources[1];
-        this.overflowKeySource1 = (IntegerArraySource) super.overflowKeySources[1];
-    }
-
-    @Override
-    protected void build(HashHandler handler, RowSequence rowSequence, Chunk[] sourceKeyChunks) {
-        final ByteChunk<Values> keyChunk0 = sourceKeyChunks[0].asByteChunk();
-        final IntChunk<Values> keyChunk1 = sourceKeyChunks[1].asIntChunk();
-        final int chunkSize = keyChunk0.size();
-        for (int chunkPosition = 0; chunkPosition < chunkSize; ++chunkPosition) {
-            final byte k0 = keyChunk0.get(chunkPosition);
-            final int k1 = keyChunk1.get(chunkPosition);
-            final int hash = hash(k0, k1);
-            final int tableLocation = hashToTableLocation(tableHashPivot, hash);
-            if (mainOutputPosition.getUnsafe(tableLocation) == EMPTY_OUTPUT_POSITION) {
-                numEntries++;
-                mainKeySource0.set(tableLocation, k0);
-                mainKeySource1.set(tableLocation, k1);
-                handler.doMainInsert(tableLocation, chunkPosition);
-            } else if (eq(mainKeySource0.getUnsafe(tableLocation), k0) && eq(mainKeySource1.getUnsafe(tableLocation), k1)) {
-                handler.doMainFound(tableLocation, chunkPosition);
-            } else {
-                int overflowLocation = mainOverflowLocationSource.getUnsafe(tableLocation);
-                if (!findOverflow(handler, k0, k1, chunkPosition, overflowLocation)) {
-                    final int newOverflowLocation = allocateOverflowLocation();
-                    overflowKeySource0.set(newOverflowLocation, k0);
-                    overflowKeySource1.set(newOverflowLocation, k1);
-                    mainOverflowLocationSource.set(tableLocation, newOverflowLocation);
-                    overflowOverflowLocationSource.set(newOverflowLocation, overflowLocation);
-                    numEntries++;
-                    handler.doOverflowInsert(newOverflowLocation, chunkPosition);
-                }
-            }
-        }
-    }
-
-    @Override
-    protected void probe(HashHandler handler, RowSequence rowSequence, Chunk[] sourceKeyChunks) {
-        final ByteChunk<Values> keyChunk0 = sourceKeyChunks[0].asByteChunk();
-        final IntChunk<Values> keyChunk1 = sourceKeyChunks[1].asIntChunk();
-        final int chunkSize = keyChunk0.size();
-        for (int chunkPosition = 0; chunkPosition < chunkSize; ++chunkPosition) {
-            final byte k0 = keyChunk0.get(chunkPosition);
-            final int k1 = keyChunk1.get(chunkPosition);
-            final int hash = hash(k0, k1);
-            final int tableLocation = hashToTableLocation(tableHashPivot, hash);
-            if (mainOutputPosition.getUnsafe(tableLocation) == EMPTY_OUTPUT_POSITION) {
-                handler.doMissing(chunkPosition);
-            } else if (eq(mainKeySource0.getUnsafe(tableLocation), k0) && eq(mainKeySource1.getUnsafe(tableLocation), k1)) {
-                handler.doMainFound(tableLocation, chunkPosition);
-            } else {
-                int overflowLocation = mainOverflowLocationSource.getUnsafe(tableLocation);
-                if (!findOverflow(handler, k0, k1, chunkPosition, overflowLocation)) {
-                    handler.doMissing(chunkPosition);
-                }
-            }
-        }
-    }
-
-    private static int hash(byte k0, int k1) {
-        int hash = ByteChunkHasher.hashInitialSingle(k0);
-        hash = IntChunkHasher.hashUpdateSingle(hash, k1);
-        return hash;
-    }
-
-    @Override
-    protected void rehashBucket(HashHandler handler, int sourceBucket, int destBucket,
-            int bucketsToAdd) {
-        final int position = mainOutputPosition.getUnsafe(sourceBucket);
-        if (position == EMPTY_OUTPUT_POSITION) {
-            return;
-        }
-        int mainInsertLocation = maybeMoveMainBucket(handler, sourceBucket, destBucket, bucketsToAdd);
-        int overflowLocation = mainOverflowLocationSource.getUnsafe(sourceBucket);
-        mainOverflowLocationSource.set(sourceBucket, QueryConstants.NULL_INT);
-        mainOverflowLocationSource.set(destBucket, QueryConstants.NULL_INT);
-        while (overflowLocation != QueryConstants.NULL_INT) {
-            final int nextOverflowLocation = overflowOverflowLocationSource.getUnsafe(overflowLocation);
-            final byte overflowKey0 = overflowKeySource0.getUnsafe(overflowLocation);
-            final int overflowKey1 = overflowKeySource1.getUnsafe(overflowLocation);
-            final int overflowHash = hash(overflowKey0, overflowKey1);
-            final int overflowTableLocation = hashToTableLocation(tableHashPivot + bucketsToAdd, overflowHash);
-            if (overflowTableLocation == mainInsertLocation) {
-                mainKeySource0.set(mainInsertLocation, overflowKey0);
-                mainKeySource1.set(mainInsertLocation, overflowKey1);
-                mainOutputPosition.set(mainInsertLocation, overflowOutputPosition.getUnsafe(overflowLocation));
-                handler.doPromoteOverflow(overflowLocation, mainInsertLocation);
-                overflowOutputPosition.set(overflowLocation, QueryConstants.NULL_INT);
-                overflowKeySource0.set(overflowLocation, QueryConstants.NULL_BYTE);
-                overflowKeySource1.set(overflowLocation, QueryConstants.NULL_INT);
-                freeOverflowLocation(overflowLocation);
-                mainInsertLocation = -1;
-            } else {
-                final int oldOverflowLocation = mainOverflowLocationSource.getUnsafe(overflowTableLocation);
-                mainOverflowLocationSource.set(overflowTableLocation, overflowLocation);
-                overflowOverflowLocationSource.set(overflowLocation, oldOverflowLocation);
-            }
-            overflowLocation = nextOverflowLocation;
-        }
-    }
-
-    private int maybeMoveMainBucket(HashHandler handler, int sourceBucket, int destBucket,
-            int bucketsToAdd) {
-        final byte k0 = mainKeySource0.getUnsafe(sourceBucket);
-        final int k1 = mainKeySource1.getUnsafe(sourceBucket);
-        final int hash = hash(k0, k1);
-        final int location = hashToTableLocation(tableHashPivot + bucketsToAdd, hash);
-        final int mainInsertLocation;
-        if (location == sourceBucket) {
-            mainInsertLocation = destBucket;
-            mainOutputPosition.set(destBucket, EMPTY_OUTPUT_POSITION);
-        } else {
-            mainInsertLocation = sourceBucket;
-            mainOutputPosition.set(destBucket, mainOutputPosition.getUnsafe(sourceBucket));
-            mainOutputPosition.set(sourceBucket, EMPTY_OUTPUT_POSITION);
-            mainKeySource0.set(destBucket, k0);
-            mainKeySource0.set(sourceBucket, QueryConstants.NULL_BYTE);
-            mainKeySource1.set(destBucket, k1);
-            mainKeySource1.set(sourceBucket, QueryConstants.NULL_INT);
-            handler.doMoveMain(sourceBucket, destBucket);
-        }
-        return mainInsertLocation;
-    }
-
-    private boolean findOverflow(HashHandler handler, byte k0, int k1, int chunkPosition,
-            int overflowLocation) {
-        while (overflowLocation != QueryConstants.NULL_INT) {
-            if (eq(overflowKeySource0.getUnsafe(overflowLocation), k0) && eq(overflowKeySource1.getUnsafe(overflowLocation), k1)) {
-                handler.doOverflowFound(overflowLocation, chunkPosition);
-                return true;
-            }
-            overflowLocation = overflowOverflowLocationSource.getUnsafe(overflowLocation);
-        }
-        return false;
-    }
-
-    @Override
-    public int findPositionForKey(Object key) {
-        final Object [] ka = (Object[])key;
-        final byte k0 = TypeUtils.unbox((Byte)ka[0]);
-        final int k1 = TypeUtils.unbox((Integer)ka[1]);
-        int hash = hash(k0, k1);
-        final int tableLocation = hashToTableLocation(tableHashPivot, hash);
-        final int positionValue = mainOutputPosition.getUnsafe(tableLocation);
-        if (positionValue == EMPTY_OUTPUT_POSITION) {
-            return -1;
-        }
-        if (eq(mainKeySource0.getUnsafe(tableLocation), k0) && eq(mainKeySource1.getUnsafe(tableLocation), k1)) {
-            return positionValue;
-        }
-        int overflowLocation = mainOverflowLocationSource.getUnsafe(tableLocation);
-        while (overflowLocation != QueryConstants.NULL_INT) {
-            if (eq(overflowKeySource0.getUnsafe(overflowLocation), k0) && eq(overflowKeySource1.getUnsafe(overflowLocation), k1)) {
-                return overflowOutputPosition.getUnsafe(overflowLocation);
-            }
-            overflowLocation = overflowOverflowLocationSource.getUnsafe(overflowLocation);
-        }
-        return -1;
-    }
-}
diff --git a/engine/table/src/main/java/io/deephaven/engine/table/impl/by/typed/incagg/gen/IncrementalAggHasherByteLong.java b/engine/table/src/main/java/io/deephaven/engine/table/impl/by/typed/incagg/gen/IncrementalAggHasherByteLong.java
deleted file mode 100644
index 5fd0c4583dc..00000000000
--- a/engine/table/src/main/java/io/deephaven/engine/table/impl/by/typed/incagg/gen/IncrementalAggHasherByteLong.java
+++ /dev/null
@@ -1,206 +0,0 @@
-//
-// Copyright (c) 2016-2024 Deephaven Data Labs and Patent Pending
-//
-// ****** AUTO-GENERATED CLASS - DO NOT EDIT MANUALLY
-// ****** Run ReplicateTypedHashers or ./gradlew replicateTypedHashers to regenerate
-//
-// @formatter:off
-package io.deephaven.engine.table.impl.by.typed.incagg.gen;
-
-import static io.deephaven.util.compare.ByteComparisons.eq;
-import static io.deephaven.util.compare.LongComparisons.eq;
-
-import io.deephaven.chunk.ByteChunk;
-import io.deephaven.chunk.Chunk;
-import io.deephaven.chunk.LongChunk;
-import io.deephaven.chunk.attributes.Values;
-import io.deephaven.chunk.util.hashing.ByteChunkHasher;
-import io.deephaven.chunk.util.hashing.LongChunkHasher;
-import io.deephaven.engine.rowset.RowSequence;
-import io.deephaven.engine.table.ColumnSource;
-import io.deephaven.engine.table.impl.by.HashHandler;
-import io.deephaven.engine.table.impl.by.IncrementalChunkedOperatorAggregationStateManagerTypedBase;
-import io.deephaven.engine.table.impl.sources.ByteArraySource;
-import io.deephaven.engine.table.impl.sources.LongArraySource;
-import io.deephaven.util.QueryConstants;
-import io.deephaven.util.type.TypeUtils;
-import java.lang.Byte;
-import java.lang.Long;
-import java.lang.Object;
-import java.lang.Override;
-
-final class IncrementalAggHasherByteLong extends IncrementalChunkedOperatorAggregationStateManagerTypedBase {
-    private final ByteArraySource mainKeySource0;
-
-    private final ByteArraySource overflowKeySource0;
-
-    private final LongArraySource mainKeySource1;
-
-    private final LongArraySource overflowKeySource1;
-
-    public IncrementalAggHasherByteLong(ColumnSource[] tableKeySources,
-            ColumnSource[] originalTableKeySources, int tableSize, double maximumLoadFactor,
-            double targetLoadFactor) {
-        super(tableKeySources, tableSize, maximumLoadFactor, targetLoadFactor);
-        this.mainKeySource0 = (ByteArraySource) super.mainKeySources[0];
-        this.overflowKeySource0 = (ByteArraySource) super.overflowKeySources[0];
-        this.mainKeySource1 = (LongArraySource) super.mainKeySources[1];
-        this.overflowKeySource1 = (LongArraySource) super.overflowKeySources[1];
-    }
-
-    @Override
-    protected void build(HashHandler handler, RowSequence rowSequence, Chunk[] sourceKeyChunks) {
-        final ByteChunk<Values> keyChunk0 = sourceKeyChunks[0].asByteChunk();
-        final LongChunk<Values> keyChunk1 = sourceKeyChunks[1].asLongChunk();
-        final int chunkSize = keyChunk0.size();
-        for (int chunkPosition = 0; chunkPosition < chunkSize; ++chunkPosition) {
-            final byte k0 = keyChunk0.get(chunkPosition);
-            final long k1 = keyChunk1.get(chunkPosition);
-            final int hash = hash(k0, k1);
-            final int tableLocation = hashToTableLocation(tableHashPivot, hash);
-            if (mainOutputPosition.getUnsafe(tableLocation) == EMPTY_OUTPUT_POSITION) {
-                numEntries++;
-                mainKeySource0.set(tableLocation, k0);
-                mainKeySource1.set(tableLocation, k1);
-                handler.doMainInsert(tableLocation, chunkPosition);
-            } else if (eq(mainKeySource0.getUnsafe(tableLocation), k0) && eq(mainKeySource1.getUnsafe(tableLocation), k1)) {
-                handler.doMainFound(tableLocation, chunkPosition);
-            } else {
-                int overflowLocation = mainOverflowLocationSource.getUnsafe(tableLocation);
-                if (!findOverflow(handler, k0, k1, chunkPosition, overflowLocation)) {
-                    final int newOverflowLocation = allocateOverflowLocation();
-                    overflowKeySource0.set(newOverflowLocation, k0);
-                    overflowKeySource1.set(newOverflowLocation, k1);
-                    mainOverflowLocationSource.set(tableLocation, newOverflowLocation);
-                    overflowOverflowLocationSource.set(newOverflowLocation, overflowLocation);
-                    numEntries++;
-                    handler.doOverflowInsert(newOverflowLocation, chunkPosition);
-                }
-            }
-        }
-    }
-
-    @Override
-    protected void probe(HashHandler handler, RowSequence rowSequence, Chunk[] sourceKeyChunks) {
-        final ByteChunk<Values> keyChunk0 = sourceKeyChunks[0].asByteChunk();
-        final LongChunk<Values> keyChunk1 = sourceKeyChunks[1].asLongChunk();
-        final int chunkSize = keyChunk0.size();
-        for (int chunkPosition = 0; chunkPosition < chunkSize; ++chunkPosition) {
-            final byte k0 = keyChunk0.get(chunkPosition);
-            final long k1 = keyChunk1.get(chunkPosition);
-            final int hash = hash(k0, k1);
-            final int tableLocation = hashToTableLocation(tableHashPivot, hash);
-            if (mainOutputPosition.getUnsafe(tableLocation) == EMPTY_OUTPUT_POSITION) {
-                handler.doMissing(chunkPosition);
-            } else if (eq(mainKeySource0.getUnsafe(tableLocation), k0) && eq(mainKeySource1.getUnsafe(tableLocation), k1)) {
-                handler.doMainFound(tableLocation, chunkPosition);
-            } else {
-                int overflowLocation = mainOverflowLocationSource.getUnsafe(tableLocation);
-                if (!findOverflow(handler, k0, k1, chunkPosition, overflowLocation)) {
-                    handler.doMissing(chunkPosition);
-                }
-            }
-        }
-    }
-
-    private static int hash(byte k0, long k1) {
-        int hash = ByteChunkHasher.hashInitialSingle(k0);
-        hash = LongChunkHasher.hashUpdateSingle(hash, k1);
-        return hash;
-    }
-
-    @Override
-    protected void rehashBucket(HashHandler handler, int sourceBucket, int destBucket,
-            int bucketsToAdd) {
-        final int position = mainOutputPosition.getUnsafe(sourceBucket);
-        if (position == EMPTY_OUTPUT_POSITION) {
-            return;
-        }
-        int mainInsertLocation = maybeMoveMainBucket(handler, sourceBucket, destBucket, bucketsToAdd);
-        int overflowLocation = mainOverflowLocationSource.getUnsafe(sourceBucket);
-        mainOverflowLocationSource.set(sourceBucket, QueryConstants.NULL_INT);
-        mainOverflowLocationSource.set(destBucket, QueryConstants.NULL_INT);
-        while (overflowLocation != QueryConstants.NULL_INT) {
-            final int nextOverflowLocation = overflowOverflowLocationSource.getUnsafe(overflowLocation);
-            final byte overflowKey0 = overflowKeySource0.getUnsafe(overflowLocation);
-            final long overflowKey1 = overflowKeySource1.getUnsafe(overflowLocation);
-            final int overflowHash = hash(overflowKey0, overflowKey1);
-            final int overflowTableLocation = hashToTableLocation(tableHashPivot + bucketsToAdd, overflowHash);
-            if (overflowTableLocation == mainInsertLocation) {
-                mainKeySource0.set(mainInsertLocation, overflowKey0);
-                mainKeySource1.set(mainInsertLocation, overflowKey1);
-                mainOutputPosition.set(mainInsertLocation, overflowOutputPosition.getUnsafe(overflowLocation));
-                handler.doPromoteOverflow(overflowLocation, mainInsertLocation);
-                overflowOutputPosition.set(overflowLocation, QueryConstants.NULL_INT);
-                overflowKeySource0.set(overflowLocation, QueryConstants.NULL_BYTE);
-                overflowKeySource1.set(overflowLocation, QueryConstants.NULL_LONG);
-                freeOverflowLocation(overflowLocation);
-                mainInsertLocation = -1;
-            } else {
-                final int oldOverflowLocation = mainOverflowLocationSource.getUnsafe(overflowTableLocation);
-                mainOverflowLocationSource.set(overflowTableLocation, overflowLocation);
-                overflowOverflowLocationSource.set(overflowLocation, oldOverflowLocation);
-            }
-            overflowLocation = nextOverflowLocation;
-        }
-    }
-
-    private int maybeMoveMainBucket(HashHandler handler, int sourceBucket, int destBucket,
-            int bucketsToAdd) {
-        final byte k0 = mainKeySource0.getUnsafe(sourceBucket);
-        final long k1 = mainKeySource1.getUnsafe(sourceBucket);
-        final int hash = hash(k0, k1);
-        final int location = hashToTableLocation(tableHashPivot + bucketsToAdd, hash);
-        final int mainInsertLocation;
-        if (location == sourceBucket) {
-            mainInsertLocation = destBucket;
-            mainOutputPosition.set(destBucket, EMPTY_OUTPUT_POSITION);
-        } else {
-            mainInsertLocation = sourceBucket;
-            mainOutputPosition.set(destBucket, mainOutputPosition.getUnsafe(sourceBucket));
-            mainOutputPosition.set(sourceBucket, EMPTY_OUTPUT_POSITION);
-            mainKeySource0.set(destBucket, k0);
-            mainKeySource0.set(sourceBucket, QueryConstants.NULL_BYTE);
-            mainKeySource1.set(destBucket, k1);
-            mainKeySource1.set(sourceBucket, QueryConstants.NULL_LONG);
-            handler.doMoveMain(sourceBucket, destBucket);
-        }
-        return mainInsertLocation;
-    }
-
-    private boolean findOverflow(HashHandler handler, byte k0, long k1, int chunkPosition,
-            int overflowLocation) {
-        while (overflowLocation != QueryConstants.NULL_INT) {
-            if (eq(overflowKeySource0.getUnsafe(overflowLocation), k0) && eq(overflowKeySource1.getUnsafe(overflowLocation), k1)) {
-                handler.doOverflowFound(overflowLocation, chunkPosition);
-                return true;
-            }
-            overflowLocation = overflowOverflowLocationSource.getUnsafe(overflowLocation);
-        }
-        return false;
-    }
-
-    @Override
-    public int findPositionForKey(Object key) {
-        final Object [] ka = (Object[])key;
-        final byte k0 = TypeUtils.unbox((Byte)ka[0]);
-        final long k1 = TypeUtils.unbox((Long)ka[1]);
-        int hash = hash(k0, k1);
-        final int tableLocation = hashToTableLocation(tableHashPivot, hash);
-        final int positionValue = mainOutputPosition.getUnsafe(tableLocation);
-        if (positionValue == EMPTY_OUTPUT_POSITION) {
-            return -1;
-        }
-        if (eq(mainKeySource0.getUnsafe(tableLocation), k0) && eq(mainKeySource1.getUnsafe(tableLocation), k1)) {
-            return positionValue;
-        }
-        int overflowLocation = mainOverflowLocationSource.getUnsafe(tableLocation);
-        while (overflowLocation != QueryConstants.NULL_INT) {
-            if (eq(overflowKeySource0.getUnsafe(overflowLocation), k0) && eq(overflowKeySource1.getUnsafe(overflowLocation), k1)) {
-                return overflowOutputPosition.getUnsafe(overflowLocation);
-            }
-            overflowLocation = overflowOverflowLocationSource.getUnsafe(overflowLocation);
-        }
-        return -1;
-    }
-}
diff --git a/engine/table/src/main/java/io/deephaven/engine/table/impl/by/typed/incagg/gen/IncrementalAggHasherByteObject.java b/engine/table/src/main/java/io/deephaven/engine/table/impl/by/typed/incagg/gen/IncrementalAggHasherByteObject.java
deleted file mode 100644
index bb16de7fefd..00000000000
--- a/engine/table/src/main/java/io/deephaven/engine/table/impl/by/typed/incagg/gen/IncrementalAggHasherByteObject.java
+++ /dev/null
@@ -1,205 +0,0 @@
-//
-// Copyright (c) 2016-2024 Deephaven Data Labs and Patent Pending
-//
-// ****** AUTO-GENERATED CLASS - DO NOT EDIT MANUALLY
-// ****** Run ReplicateTypedHashers or ./gradlew replicateTypedHashers to regenerate
-//
-// @formatter:off
-package io.deephaven.engine.table.impl.by.typed.incagg.gen;
-
-import static io.deephaven.util.compare.ByteComparisons.eq;
-import static io.deephaven.util.compare.ObjectComparisons.eq;
-
-import io.deephaven.chunk.ByteChunk;
-import io.deephaven.chunk.Chunk;
-import io.deephaven.chunk.ObjectChunk;
-import io.deephaven.chunk.attributes.Values;
-import io.deephaven.chunk.util.hashing.ByteChunkHasher;
-import io.deephaven.chunk.util.hashing.ObjectChunkHasher;
-import io.deephaven.engine.rowset.RowSequence;
-import io.deephaven.engine.table.ColumnSource;
-import io.deephaven.engine.table.impl.by.HashHandler;
-import io.deephaven.engine.table.impl.by.IncrementalChunkedOperatorAggregationStateManagerTypedBase;
-import io.deephaven.engine.table.impl.sources.ByteArraySource;
-import io.deephaven.engine.table.impl.sources.ObjectArraySource;
-import io.deephaven.util.QueryConstants;
-import io.deephaven.util.type.TypeUtils;
-import java.lang.Byte;
-import java.lang.Object;
-import java.lang.Override;
-
-final class IncrementalAggHasherByteObject extends IncrementalChunkedOperatorAggregationStateManagerTypedBase {
-    private final ByteArraySource mainKeySource0;
-
-    private final ByteArraySource overflowKeySource0;
-
-    private final ObjectArraySource mainKeySource1;
-
-    private final ObjectArraySource overflowKeySource1;
-
-    public IncrementalAggHasherByteObject(ColumnSource[] tableKeySources,
-            ColumnSource[] originalTableKeySources, int tableSize, double maximumLoadFactor,
-            double targetLoadFactor) {
-        super(tableKeySources, tableSize, maximumLoadFactor, targetLoadFactor);
-        this.mainKeySource0 = (ByteArraySource) super.mainKeySources[0];
-        this.overflowKeySource0 = (ByteArraySource) super.overflowKeySources[0];
-        this.mainKeySource1 = (ObjectArraySource) super.mainKeySources[1];
-        this.overflowKeySource1 = (ObjectArraySource) super.overflowKeySources[1];
-    }
-
-    @Override
-    protected void build(HashHandler handler, RowSequence rowSequence, Chunk[] sourceKeyChunks) {
-        final ByteChunk<Values> keyChunk0 = sourceKeyChunks[0].asByteChunk();
-        final ObjectChunk<Object, Values> keyChunk1 = sourceKeyChunks[1].asObjectChunk();
-        final int chunkSize = keyChunk0.size();
-        for (int chunkPosition = 0; chunkPosition < chunkSize; ++chunkPosition) {
-            final byte k0 = keyChunk0.get(chunkPosition);
-            final Object k1 = keyChunk1.get(chunkPosition);
-            final int hash = hash(k0, k1);
-            final int tableLocation = hashToTableLocation(tableHashPivot, hash);
-            if (mainOutputPosition.getUnsafe(tableLocation) == EMPTY_OUTPUT_POSITION) {
-                numEntries++;
-                mainKeySource0.set(tableLocation, k0);
-                mainKeySource1.set(tableLocation, k1);
-                handler.doMainInsert(tableLocation, chunkPosition);
-            } else if (eq(mainKeySource0.getUnsafe(tableLocation), k0) && eq(mainKeySource1.getUnsafe(tableLocation), k1)) {
-                handler.doMainFound(tableLocation, chunkPosition);
-            } else {
-                int overflowLocation = mainOverflowLocationSource.getUnsafe(tableLocation);
-                if (!findOverflow(handler, k0, k1, chunkPosition, overflowLocation)) {
-                    final int newOverflowLocation = allocateOverflowLocation();
-                    overflowKeySource0.set(newOverflowLocation, k0);
-                    overflowKeySource1.set(newOverflowLocation, k1);
-                    mainOverflowLocationSource.set(tableLocation, newOverflowLocation);
-                    overflowOverflowLocationSource.set(newOverflowLocation, overflowLocation);
-                    numEntries++;
-                    handler.doOverflowInsert(newOverflowLocation, chunkPosition);
-                }
-            }
-        }
-    }
-
-    @Override
-    protected void probe(HashHandler handler, RowSequence rowSequence, Chunk[] sourceKeyChunks) {
-        final ByteChunk<Values> keyChunk0 = sourceKeyChunks[0].asByteChunk();
-        final ObjectChunk<Object, Values> keyChunk1 = sourceKeyChunks[1].asObjectChunk();
-        final int chunkSize = keyChunk0.size();
-        for (int chunkPosition = 0; chunkPosition < chunkSize; ++chunkPosition) {
-            final byte k0 = keyChunk0.get(chunkPosition);
-            final Object k1 = keyChunk1.get(chunkPosition);
-            final int hash = hash(k0, k1);
-            final int tableLocation = hashToTableLocation(tableHashPivot, hash);
-            if (mainOutputPosition.getUnsafe(tableLocation) == EMPTY_OUTPUT_POSITION) {
-                handler.doMissing(chunkPosition);
-            } else if (eq(mainKeySource0.getUnsafe(tableLocation), k0) && eq(mainKeySource1.getUnsafe(tableLocation), k1)) {
-                handler.doMainFound(tableLocation, chunkPosition);
-            } else {
-                int overflowLocation = mainOverflowLocationSource.getUnsafe(tableLocation);
-                if (!findOverflow(handler, k0, k1, chunkPosition, overflowLocation)) {
-                    handler.doMissing(chunkPosition);
-                }
-            }
-        }
-    }
-
-    private static int hash(byte k0, Object k1) {
-        int hash = ByteChunkHasher.hashInitialSingle(k0);
-        hash = ObjectChunkHasher.hashUpdateSingle(hash, k1);
-        return hash;
-    }
-
-    @Override
-    protected void rehashBucket(HashHandler handler, int sourceBucket, int destBucket,
-            int bucketsToAdd) {
-        final int position = mainOutputPosition.getUnsafe(sourceBucket);
-        if (position == EMPTY_OUTPUT_POSITION) {
-            return;
-        }
-        int mainInsertLocation = maybeMoveMainBucket(handler, sourceBucket, destBucket, bucketsToAdd);
-        int overflowLocation = mainOverflowLocationSource.getUnsafe(sourceBucket);
-        mainOverflowLocationSource.set(sourceBucket, QueryConstants.NULL_INT);
-        mainOverflowLocationSource.set(destBucket, QueryConstants.NULL_INT);
-        while (overflowLocation != QueryConstants.NULL_INT) {
-            final int nextOverflowLocation = overflowOverflowLocationSource.getUnsafe(overflowLocation);
-            final byte overflowKey0 = overflowKeySource0.getUnsafe(overflowLocation);
-            final Object overflowKey1 = overflowKeySource1.getUnsafe(overflowLocation);
-            final int overflowHash = hash(overflowKey0, overflowKey1);
-            final int overflowTableLocation = hashToTableLocation(tableHashPivot + bucketsToAdd, overflowHash);
-            if (overflowTableLocation == mainInsertLocation) {
-                mainKeySource0.set(mainInsertLocation, overflowKey0);
-                mainKeySource1.set(mainInsertLocation, overflowKey1);
-                mainOutputPosition.set(mainInsertLocation, overflowOutputPosition.getUnsafe(overflowLocation));
-                handler.doPromoteOverflow(overflowLocation, mainInsertLocation);
-                overflowOutputPosition.set(overflowLocation, QueryConstants.NULL_INT);
-                overflowKeySource0.set(overflowLocation, QueryConstants.NULL_BYTE);
-                overflowKeySource1.set(overflowLocation, null);
-                freeOverflowLocation(overflowLocation);
-                mainInsertLocation = -1;
-            } else {
-                final int oldOverflowLocation = mainOverflowLocationSource.getUnsafe(overflowTableLocation);
-                mainOverflowLocationSource.set(overflowTableLocation, overflowLocation);
-                overflowOverflowLocationSource.set(overflowLocation, oldOverflowLocation);
-            }
-            overflowLocation = nextOverflowLocation;
-        }
-    }
-
-    private int maybeMoveMainBucket(HashHandler handler, int sourceBucket, int destBucket,
-            int bucketsToAdd) {
-        final byte k0 = mainKeySource0.getUnsafe(sourceBucket);
-        final Object k1 = mainKeySource1.getUnsafe(sourceBucket);
-        final int hash = hash(k0, k1);
-        final int location = hashToTableLocation(tableHashPivot + bucketsToAdd, hash);
-        final int mainInsertLocation;
-        if (location == sourceBucket) {
-            mainInsertLocation = destBucket;
-            mainOutputPosition.set(destBucket, EMPTY_OUTPUT_POSITION);
-        } else {
-            mainInsertLocation = sourceBucket;
-            mainOutputPosition.set(destBucket, mainOutputPosition.getUnsafe(sourceBucket));
-            mainOutputPosition.set(sourceBucket, EMPTY_OUTPUT_POSITION);
-            mainKeySource0.set(destBucket, k0);
-            mainKeySource0.set(sourceBucket, QueryConstants.NULL_BYTE);
-            mainKeySource1.set(destBucket, k1);
-            mainKeySource1.set(sourceBucket, null);
-            handler.doMoveMain(sourceBucket, destBucket);
-        }
-        return mainInsertLocation;
-    }
-
-    private boolean findOverflow(HashHandler handler, byte k0, Object k1, int chunkPosition,
-            int overflowLocation) {
-        while (overflowLocation != QueryConstants.NULL_INT) {
-            if (eq(overflowKeySource0.getUnsafe(overflowLocation), k0) && eq(overflowKeySource1.getUnsafe(overflowLocation), k1)) {
-                handler.doOverflowFound(overflowLocation, chunkPosition);
-                return true;
-            }
-            overflowLocation = overflowOverflowLocationSource.getUnsafe(overflowLocation);
-        }
-        return false;
-    }
-
-    @Override
-    public int findPositionForKey(Object key) {
-        final Object [] ka = (Object[])key;
-        final byte k0 = TypeUtils.unbox((Byte)ka[0]);
-        final Object k1 = ka[1];
-        int hash = hash(k0, k1);
-        final int tableLocation = hashToTableLocation(tableHashPivot, hash);
-        final int positionValue = mainOutputPosition.getUnsafe(tableLocation);
-        if (positionValue == EMPTY_OUTPUT_POSITION) {
-            return -1;
-        }
-        if (eq(mainKeySource0.getUnsafe(tableLocation), k0) && eq(mainKeySource1.getUnsafe(tableLocation), k1)) {
-            return positionValue;
-        }
-        int overflowLocation = mainOverflowLocationSource.getUnsafe(tableLocation);
-        while (overflowLocation != QueryConstants.NULL_INT) {
-            if (eq(overflowKeySource0.getUnsafe(overflowLocation), k0) && eq(overflowKeySource1.getUnsafe(overflowLocation), k1)) {
-                return overflowOutputPosition.getUnsafe(overflowLocation);
-            }
-            overflowLocation = overflowOverflowLocationSource.getUnsafe(overflowLocation);
-        }
-        return -1;
-    }
-}
diff --git a/engine/table/src/main/java/io/deephaven/engine/table/impl/by/typed/incagg/gen/IncrementalAggHasherByteShort.java b/engine/table/src/main/java/io/deephaven/engine/table/impl/by/typed/incagg/gen/IncrementalAggHasherByteShort.java
deleted file mode 100644
index 4b57f3993b7..00000000000
--- a/engine/table/src/main/java/io/deephaven/engine/table/impl/by/typed/incagg/gen/IncrementalAggHasherByteShort.java
+++ /dev/null
@@ -1,206 +0,0 @@
-//
-// Copyright (c) 2016-2024 Deephaven Data Labs and Patent Pending
-//
-// ****** AUTO-GENERATED CLASS - DO NOT EDIT MANUALLY
-// ****** Run ReplicateTypedHashers or ./gradlew replicateTypedHashers to regenerate
-//
-// @formatter:off
-package io.deephaven.engine.table.impl.by.typed.incagg.gen;
-
-import static io.deephaven.util.compare.ByteComparisons.eq;
-import static io.deephaven.util.compare.ShortComparisons.eq;
-
-import io.deephaven.chunk.ByteChunk;
-import io.deephaven.chunk.Chunk;
-import io.deephaven.chunk.ShortChunk;
-import io.deephaven.chunk.attributes.Values;
-import io.deephaven.chunk.util.hashing.ByteChunkHasher;
-import io.deephaven.chunk.util.hashing.ShortChunkHasher;
-import io.deephaven.engine.rowset.RowSequence;
-import io.deephaven.engine.table.ColumnSource;
-import io.deephaven.engine.table.impl.by.HashHandler;
-import io.deephaven.engine.table.impl.by.IncrementalChunkedOperatorAggregationStateManagerTypedBase;
-import io.deephaven.engine.table.impl.sources.ByteArraySource;
-import io.deephaven.engine.table.impl.sources.ShortArraySource;
-import io.deephaven.util.QueryConstants;
-import io.deephaven.util.type.TypeUtils;
-import java.lang.Byte;
-import java.lang.Object;
-import java.lang.Override;
-import java.lang.Short;
-
-final class IncrementalAggHasherByteShort extends IncrementalChunkedOperatorAggregationStateManagerTypedBase {
-    private final ByteArraySource mainKeySource0;
-
-    private final ByteArraySource overflowKeySource0;
-
-    private final ShortArraySource mainKeySource1;
-
-    private final ShortArraySource overflowKeySource1;
-
-    public IncrementalAggHasherByteShort(ColumnSource[] tableKeySources,
-            ColumnSource[] originalTableKeySources, int tableSize, double maximumLoadFactor,
-            double targetLoadFactor) {
-        super(tableKeySources, tableSize, maximumLoadFactor, targetLoadFactor);
-        this.mainKeySource0 = (ByteArraySource) super.mainKeySources[0];
-        this.overflowKeySource0 = (ByteArraySource) super.overflowKeySources[0];
-        this.mainKeySource1 = (ShortArraySource) super.mainKeySources[1];
-        this.overflowKeySource1 = (ShortArraySource) super.overflowKeySources[1];
-    }
-
-    @Override
-    protected void build(HashHandler handler, RowSequence rowSequence, Chunk[] sourceKeyChunks) {
-        final ByteChunk<Values> keyChunk0 = sourceKeyChunks[0].asByteChunk();
-        final ShortChunk<Values> keyChunk1 = sourceKeyChunks[1].asShortChunk();
-        final int chunkSize = keyChunk0.size();
-        for (int chunkPosition = 0; chunkPosition < chunkSize; ++chunkPosition) {
-            final byte k0 = keyChunk0.get(chunkPosition);
-            final short k1 = keyChunk1.get(chunkPosition);
-            final int hash = hash(k0, k1);
-            final int tableLocation = hashToTableLocation(tableHashPivot, hash);
-            if (mainOutputPosition.getUnsafe(tableLocation) == EMPTY_OUTPUT_POSITION) {
-                numEntries++;
-                mainKeySource0.set(tableLocation, k0);
-                mainKeySource1.set(tableLocation, k1);
-                handler.doMainInsert(tableLocation, chunkPosition);
-            } else if (eq(mainKeySource0.getUnsafe(tableLocation), k0) && eq(mainKeySource1.getUnsafe(tableLocation), k1)) {
-                handler.doMainFound(tableLocation, chunkPosition);
-            } else {
-                int overflowLocation = mainOverflowLocationSource.getUnsafe(tableLocation);
-                if (!findOverflow(handler, k0, k1, chunkPosition, overflowLocation)) {
-                    final int newOverflowLocation = allocateOverflowLocation();
-                    overflowKeySource0.set(newOverflowLocation, k0);
-                    overflowKeySource1.set(newOverflowLocation, k1);
-                    mainOverflowLocationSource.set(tableLocation, newOverflowLocation);
-                    overflowOverflowLocationSource.set(newOverflowLocation, overflowLocation);
-                    numEntries++;
-                    handler.doOverflowInsert(newOverflowLocation, chunkPosition);
-                }
-            }
-        }
-    }
-
-    @Override
-    protected void probe(HashHandler handler, RowSequence rowSequence, Chunk[] sourceKeyChunks) {
-        final ByteChunk<Values> keyChunk0 = sourceKeyChunks[0].asByteChunk();
-        final ShortChunk<Values> keyChunk1 = sourceKeyChunks[1].asShortChunk();
-        final int chunkSize = keyChunk0.size();
-        for (int chunkPosition = 0; chunkPosition < chunkSize; ++chunkPosition) {
-            final byte k0 = keyChunk0.get(chunkPosition);
-            final short k1 = keyChunk1.get(chunkPosition);
-            final int hash = hash(k0, k1);
-            final int tableLocation = hashToTableLocation(tableHashPivot, hash);
-            if (mainOutputPosition.getUnsafe(tableLocation) == EMPTY_OUTPUT_POSITION) {
-                handler.doMissing(chunkPosition);
-            } else if (eq(mainKeySource0.getUnsafe(tableLocation), k0) && eq(mainKeySource1.getUnsafe(tableLocation), k1)) {
-                handler.doMainFound(tableLocation, chunkPosition);
-            } else {
-                int overflowLocation = mainOverflowLocationSource.getUnsafe(tableLocation);
-                if (!findOverflow(handler, k0, k1, chunkPosition, overflowLocation)) {
-                    handler.doMissing(chunkPosition);
-                }
-            }
-        }
-    }
-
-    private static int hash(byte k0, short k1) {
-        int hash = ByteChunkHasher.hashInitialSingle(k0);
-        hash = ShortChunkHasher.hashUpdateSingle(hash, k1);
-        return hash;
-    }
-
-    @Override
-    protected void rehashBucket(HashHandler handler, int sourceBucket, int destBucket,
-            int bucketsToAdd) {
-        final int position = mainOutputPosition.getUnsafe(sourceBucket);
-        if (position == EMPTY_OUTPUT_POSITION) {
-            return;
-        }
-        int mainInsertLocation = maybeMoveMainBucket(handler, sourceBucket, destBucket, bucketsToAdd);
-        int overflowLocation = mainOverflowLocationSource.getUnsafe(sourceBucket);
-        mainOverflowLocationSource.set(sourceBucket, QueryConstants.NULL_INT);
-        mainOverflowLocationSource.set(destBucket, QueryConstants.NULL_INT);
-        while (overflowLocation != QueryConstants.NULL_INT) {
-            final int nextOverflowLocation = overflowOverflowLocationSource.getUnsafe(overflowLocation);
-            final byte overflowKey0 = overflowKeySource0.getUnsafe(overflowLocation);
-            final short overflowKey1 = overflowKeySource1.getUnsafe(overflowLocation);
-            final int overflowHash = hash(overflowKey0, overflowKey1);
-            final int overflowTableLocation = hashToTableLocation(tableHashPivot + bucketsToAdd, overflowHash);
-            if (overflowTableLocation == mainInsertLocation) {
-                mainKeySource0.set(mainInsertLocation, overflowKey0);
-                mainKeySource1.set(mainInsertLocation, overflowKey1);
-                mainOutputPosition.set(mainInsertLocation, overflowOutputPosition.getUnsafe(overflowLocation));
-                handler.doPromoteOverflow(overflowLocation, mainInsertLocation);
-                overflowOutputPosition.set(overflowLocation, QueryConstants.NULL_INT);
-                overflowKeySource0.set(overflowLocation, QueryConstants.NULL_BYTE);
-                overflowKeySource1.set(overflowLocation, QueryConstants.NULL_SHORT);
-                freeOverflowLocation(overflowLocation);
-                mainInsertLocation = -1;
-            } else {
-                final int oldOverflowLocation = mainOverflowLocationSource.getUnsafe(overflowTableLocation);
-                mainOverflowLocationSource.set(overflowTableLocation, overflowLocation);
-                overflowOverflowLocationSource.set(overflowLocation, oldOverflowLocation);
-            }
-            overflowLocation = nextOverflowLocation;
-        }
-    }
-
-    private int maybeMoveMainBucket(HashHandler handler, int sourceBucket, int destBucket,
-            int bucketsToAdd) {
-        final byte k0 = mainKeySource0.getUnsafe(sourceBucket);
-        final short k1 = mainKeySource1.getUnsafe(sourceBucket);
-        final int hash = hash(k0, k1);
-        final int location = hashToTableLocation(tableHashPivot + bucketsToAdd, hash);
-        final int mainInsertLocation;
-        if (location == sourceBucket) {
-            mainInsertLocation = destBucket;
-            mainOutputPosition.set(destBucket, EMPTY_OUTPUT_POSITION);
-        } else {
-            mainInsertLocation = sourceBucket;
-            mainOutputPosition.set(destBucket, mainOutputPosition.getUnsafe(sourceBucket));
-            mainOutputPosition.set(sourceBucket, EMPTY_OUTPUT_POSITION);
-            mainKeySource0.set(destBucket, k0);
-            mainKeySource0.set(sourceBucket, QueryConstants.NULL_BYTE);
-            mainKeySource1.set(destBucket, k1);
-            mainKeySource1.set(sourceBucket, QueryConstants.NULL_SHORT);
-            handler.doMoveMain(sourceBucket, destBucket);
-        }
-        return mainInsertLocation;
-    }
-
-    private boolean findOverflow(HashHandler handler, byte k0, short k1, int chunkPosition,
-            int overflowLocation) {
-        while (overflowLocation != QueryConstants.NULL_INT) {
-            if (eq(overflowKeySource0.getUnsafe(overflowLocation), k0) && eq(overflowKeySource1.getUnsafe(overflowLocation), k1)) {
-                handler.doOverflowFound(overflowLocation, chunkPosition);
-                return true;
-            }
-            overflowLocation = overflowOverflowLocationSource.getUnsafe(overflowLocation);
-        }
-        return false;
-    }
-
-    @Override
-    public int findPositionForKey(Object key) {
-        final Object [] ka = (Object[])key;
-        final byte k0 = TypeUtils.unbox((Byte)ka[0]);
-        final short k1 = TypeUtils.unbox((Short)ka[1]);
-        int hash = hash(k0, k1);
-        final int tableLocation = hashToTableLocation(tableHashPivot, hash);
-        final int positionValue = mainOutputPosition.getUnsafe(tableLocation);
-        if (positionValue == EMPTY_OUTPUT_POSITION) {
-            return -1;
-        }
-        if (eq(mainKeySource0.getUnsafe(tableLocation), k0) && eq(mainKeySource1.getUnsafe(tableLocation), k1)) {
-            return positionValue;
-        }
-        int overflowLocation = mainOverflowLocationSource.getUnsafe(tableLocation);
-        while (overflowLocation != QueryConstants.NULL_INT) {
-            if (eq(overflowKeySource0.getUnsafe(overflowLocation), k0) && eq(overflowKeySource1.getUnsafe(overflowLocation), k1)) {
-                return overflowOutputPosition.getUnsafe(overflowLocation);
-            }
-            overflowLocation = overflowOverflowLocationSource.getUnsafe(overflowLocation);
-        }
-        return -1;
-    }
-}
diff --git a/engine/table/src/main/java/io/deephaven/engine/table/impl/by/typed/incagg/gen/IncrementalAggHasherChar.java b/engine/table/src/main/java/io/deephaven/engine/table/impl/by/typed/incagg/gen/IncrementalAggHasherChar.java
deleted file mode 100644
index 797442686aa..00000000000
--- a/engine/table/src/main/java/io/deephaven/engine/table/impl/by/typed/incagg/gen/IncrementalAggHasherChar.java
+++ /dev/null
@@ -1,180 +0,0 @@
-//
-// Copyright (c) 2016-2024 Deephaven Data Labs and Patent Pending
-//
-// ****** AUTO-GENERATED CLASS - DO NOT EDIT MANUALLY
-// ****** Run ReplicateTypedHashers or ./gradlew replicateTypedHashers to regenerate
-//
-// @formatter:off
-package io.deephaven.engine.table.impl.by.typed.incagg.gen;
-
-import static io.deephaven.util.compare.CharComparisons.eq;
-
-import io.deephaven.chunk.CharChunk;
-import io.deephaven.chunk.Chunk;
-import io.deephaven.chunk.attributes.Values;
-import io.deephaven.chunk.util.hashing.CharChunkHasher;
-import io.deephaven.engine.rowset.RowSequence;
-import io.deephaven.engine.table.ColumnSource;
-import io.deephaven.engine.table.impl.by.HashHandler;
-import io.deephaven.engine.table.impl.by.IncrementalChunkedOperatorAggregationStateManagerTypedBase;
-import io.deephaven.engine.table.impl.sources.CharacterArraySource;
-import io.deephaven.util.QueryConstants;
-import io.deephaven.util.type.TypeUtils;
-import java.lang.Character;
-import java.lang.Object;
-import java.lang.Override;
-
-final class IncrementalAggHasherChar extends IncrementalChunkedOperatorAggregationStateManagerTypedBase {
-    private final CharacterArraySource mainKeySource0;
-
-    private final CharacterArraySource overflowKeySource0;
-
-    public IncrementalAggHasherChar(ColumnSource[] tableKeySources,
-            ColumnSource[] originalTableKeySources, int tableSize, double maximumLoadFactor,
-            double targetLoadFactor) {
-        super(tableKeySources, tableSize, maximumLoadFactor, targetLoadFactor);
-        this.mainKeySource0 = (CharacterArraySource) super.mainKeySources[0];
-        this.overflowKeySource0 = (CharacterArraySource) super.overflowKeySources[0];
-    }
-
-    @Override
-    protected void build(HashHandler handler, RowSequence rowSequence, Chunk[] sourceKeyChunks) {
-        final CharChunk<Values> keyChunk0 = sourceKeyChunks[0].asCharChunk();
-        final int chunkSize = keyChunk0.size();
-        for (int chunkPosition = 0; chunkPosition < chunkSize; ++chunkPosition) {
-            final char k0 = keyChunk0.get(chunkPosition);
-            final int hash = hash(k0);
-            final int tableLocation = hashToTableLocation(tableHashPivot, hash);
-            if (mainOutputPosition.getUnsafe(tableLocation) == EMPTY_OUTPUT_POSITION) {
-                numEntries++;
-                mainKeySource0.set(tableLocation, k0);
-                handler.doMainInsert(tableLocation, chunkPosition);
-            } else if (eq(mainKeySource0.getUnsafe(tableLocation), k0)) {
-                handler.doMainFound(tableLocation, chunkPosition);
-            } else {
-                int overflowLocation = mainOverflowLocationSource.getUnsafe(tableLocation);
-                if (!findOverflow(handler, k0, chunkPosition, overflowLocation)) {
-                    final int newOverflowLocation = allocateOverflowLocation();
-                    overflowKeySource0.set(newOverflowLocation, k0);
-                    mainOverflowLocationSource.set(tableLocation, newOverflowLocation);
-                    overflowOverflowLocationSource.set(newOverflowLocation, overflowLocation);
-                    numEntries++;
-                    handler.doOverflowInsert(newOverflowLocation, chunkPosition);
-                }
-            }
-        }
-    }
-
-    @Override
-    protected void probe(HashHandler handler, RowSequence rowSequence, Chunk[] sourceKeyChunks) {
-        final CharChunk<Values> keyChunk0 = sourceKeyChunks[0].asCharChunk();
-        final int chunkSize = keyChunk0.size();
-        for (int chunkPosition = 0; chunkPosition < chunkSize; ++chunkPosition) {
-            final char k0 = keyChunk0.get(chunkPosition);
-            final int hash = hash(k0);
-            final int tableLocation = hashToTableLocation(tableHashPivot, hash);
-            if (mainOutputPosition.getUnsafe(tableLocation) == EMPTY_OUTPUT_POSITION) {
-                handler.doMissing(chunkPosition);
-            } else if (eq(mainKeySource0.getUnsafe(tableLocation), k0)) {
-                handler.doMainFound(tableLocation, chunkPosition);
-            } else {
-                int overflowLocation = mainOverflowLocationSource.getUnsafe(tableLocation);
-                if (!findOverflow(handler, k0, chunkPosition, overflowLocation)) {
-                    handler.doMissing(chunkPosition);
-                }
-            }
-        }
-    }
-
-    private static int hash(char k0) {
-        int hash = CharChunkHasher.hashInitialSingle(k0);
-        return hash;
-    }
-
-    @Override
-    protected void rehashBucket(HashHandler handler, int sourceBucket, int destBucket,
-            int bucketsToAdd) {
-        final int position = mainOutputPosition.getUnsafe(sourceBucket);
-        if (position == EMPTY_OUTPUT_POSITION) {
-            return;
-        }
-        int mainInsertLocation = maybeMoveMainBucket(handler, sourceBucket, destBucket, bucketsToAdd);
-        int overflowLocation = mainOverflowLocationSource.getUnsafe(sourceBucket);
-        mainOverflowLocationSource.set(sourceBucket, QueryConstants.NULL_INT);
-        mainOverflowLocationSource.set(destBucket, QueryConstants.NULL_INT);
-        while (overflowLocation != QueryConstants.NULL_INT) {
-            final int nextOverflowLocation = overflowOverflowLocationSource.getUnsafe(overflowLocation);
-            final char overflowKey0 = overflowKeySource0.getUnsafe(overflowLocation);
-            final int overflowHash = hash(overflowKey0);
-            final int overflowTableLocation = hashToTableLocation(tableHashPivot + bucketsToAdd, overflowHash);
-            if (overflowTableLocation == mainInsertLocation) {
-                mainKeySource0.set(mainInsertLocation, overflowKey0);
-                mainOutputPosition.set(mainInsertLocation, overflowOutputPosition.getUnsafe(overflowLocation));
-                handler.doPromoteOverflow(overflowLocation, mainInsertLocation);
-                overflowOutputPosition.set(overflowLocation, QueryConstants.NULL_INT);
-                overflowKeySource0.set(overflowLocation, QueryConstants.NULL_CHAR);
-                freeOverflowLocation(overflowLocation);
-                mainInsertLocation = -1;
-            } else {
-                final int oldOverflowLocation = mainOverflowLocationSource.getUnsafe(overflowTableLocation);
-                mainOverflowLocationSource.set(overflowTableLocation, overflowLocation);
-                overflowOverflowLocationSource.set(overflowLocation, oldOverflowLocation);
-            }
-            overflowLocation = nextOverflowLocation;
-        }
-    }
-
-    private int maybeMoveMainBucket(HashHandler handler, int sourceBucket, int destBucket,
-            int bucketsToAdd) {
-        final char k0 = mainKeySource0.getUnsafe(sourceBucket);
-        final int hash = hash(k0);
-        final int location = hashToTableLocation(tableHashPivot + bucketsToAdd, hash);
-        final int mainInsertLocation;
-        if (location == sourceBucket) {
-            mainInsertLocation = destBucket;
-            mainOutputPosition.set(destBucket, EMPTY_OUTPUT_POSITION);
-        } else {
-            mainInsertLocation = sourceBucket;
-            mainOutputPosition.set(destBucket, mainOutputPosition.getUnsafe(sourceBucket));
-            mainOutputPosition.set(sourceBucket, EMPTY_OUTPUT_POSITION);
-            mainKeySource0.set(destBucket, k0);
-            mainKeySource0.set(sourceBucket, QueryConstants.NULL_CHAR);
-            handler.doMoveMain(sourceBucket, destBucket);
-        }
-        return mainInsertLocation;
-    }
-
-    private boolean findOverflow(HashHandler handler, char k0, int chunkPosition,
-            int overflowLocation) {
-        while (overflowLocation != QueryConstants.NULL_INT) {
-            if (eq(overflowKeySource0.getUnsafe(overflowLocation), k0)) {
-                handler.doOverflowFound(overflowLocation, chunkPosition);
-                return true;
-            }
-            overflowLocation = overflowOverflowLocationSource.getUnsafe(overflowLocation);
-        }
-        return false;
-    }
-
-    @Override
-    public int findPositionForKey(Object key) {
-        final char k0 = TypeUtils.unbox((Character)key);
-        int hash = hash(k0);
-        final int tableLocation = hashToTableLocation(tableHashPivot, hash);
-        final int positionValue = mainOutputPosition.getUnsafe(tableLocation);
-        if (positionValue == EMPTY_OUTPUT_POSITION) {
-            return -1;
-        }
-        if (eq(mainKeySource0.getUnsafe(tableLocation), k0)) {
-            return positionValue;
-        }
-        int overflowLocation = mainOverflowLocationSource.getUnsafe(tableLocation);
-        while (overflowLocation != QueryConstants.NULL_INT) {
-            if (eq(overflowKeySource0.getUnsafe(overflowLocation), k0)) {
-                return overflowOutputPosition.getUnsafe(overflowLocation);
-            }
-            overflowLocation = overflowOverflowLocationSource.getUnsafe(overflowLocation);
-        }
-        return -1;
-    }
-}
diff --git a/engine/table/src/main/java/io/deephaven/engine/table/impl/by/typed/incagg/gen/IncrementalAggHasherCharByte.java b/engine/table/src/main/java/io/deephaven/engine/table/impl/by/typed/incagg/gen/IncrementalAggHasherCharByte.java
deleted file mode 100644
index 8204e5cf5b4..00000000000
--- a/engine/table/src/main/java/io/deephaven/engine/table/impl/by/typed/incagg/gen/IncrementalAggHasherCharByte.java
+++ /dev/null
@@ -1,206 +0,0 @@
-//
-// Copyright (c) 2016-2024 Deephaven Data Labs and Patent Pending
-//
-// ****** AUTO-GENERATED CLASS - DO NOT EDIT MANUALLY
-// ****** Run ReplicateTypedHashers or ./gradlew replicateTypedHashers to regenerate
-//
-// @formatter:off
-package io.deephaven.engine.table.impl.by.typed.incagg.gen;
-
-import static io.deephaven.util.compare.ByteComparisons.eq;
-import static io.deephaven.util.compare.CharComparisons.eq;
-
-import io.deephaven.chunk.ByteChunk;
-import io.deephaven.chunk.CharChunk;
-import io.deephaven.chunk.Chunk;
-import io.deephaven.chunk.attributes.Values;
-import io.deephaven.chunk.util.hashing.ByteChunkHasher;
-import io.deephaven.chunk.util.hashing.CharChunkHasher;
-import io.deephaven.engine.rowset.RowSequence;
-import io.deephaven.engine.table.ColumnSource;
-import io.deephaven.engine.table.impl.by.HashHandler;
-import io.deephaven.engine.table.impl.by.IncrementalChunkedOperatorAggregationStateManagerTypedBase;
-import io.deephaven.engine.table.impl.sources.ByteArraySource;
-import io.deephaven.engine.table.impl.sources.CharacterArraySource;
-import io.deephaven.util.QueryConstants;
-import io.deephaven.util.type.TypeUtils;
-import java.lang.Byte;
-import java.lang.Character;
-import java.lang.Object;
-import java.lang.Override;
-
-final class IncrementalAggHasherCharByte extends IncrementalChunkedOperatorAggregationStateManagerTypedBase {
-    private final CharacterArraySource mainKeySource0;
-
-    private final CharacterArraySource overflowKeySource0;
-
-    private final ByteArraySource mainKeySource1;
-
-    private final ByteArraySource overflowKeySource1;
-
-    public IncrementalAggHasherCharByte(ColumnSource[] tableKeySources,
-            ColumnSource[] originalTableKeySources, int tableSize, double maximumLoadFactor,
-            double targetLoadFactor) {
-        super(tableKeySources, tableSize, maximumLoadFactor, targetLoadFactor);
-        this.mainKeySource0 = (CharacterArraySource) super.mainKeySources[0];
-        this.overflowKeySource0 = (CharacterArraySource) super.overflowKeySources[0];
-        this.mainKeySource1 = (ByteArraySource) super.mainKeySources[1];
-        this.overflowKeySource1 = (ByteArraySource) super.overflowKeySources[1];
-    }
-
-    @Override
-    protected void build(HashHandler handler, RowSequence rowSequence, Chunk[] sourceKeyChunks) {
-        final CharChunk<Values> keyChunk0 = sourceKeyChunks[0].asCharChunk();
-        final ByteChunk<Values> keyChunk1 = sourceKeyChunks[1].asByteChunk();
-        final int chunkSize = keyChunk0.size();
-        for (int chunkPosition = 0; chunkPosition < chunkSize; ++chunkPosition) {
-            final char k0 = keyChunk0.get(chunkPosition);
-            final byte k1 = keyChunk1.get(chunkPosition);
-            final int hash = hash(k0, k1);
-            final int tableLocation = hashToTableLocation(tableHashPivot, hash);
-            if (mainOutputPosition.getUnsafe(tableLocation) == EMPTY_OUTPUT_POSITION) {
-                numEntries++;
-                mainKeySource0.set(tableLocation, k0);
-                mainKeySource1.set(tableLocation, k1);
-                handler.doMainInsert(tableLocation, chunkPosition);
-            } else if (eq(mainKeySource0.getUnsafe(tableLocation), k0) && eq(mainKeySource1.getUnsafe(tableLocation), k1)) {
-                handler.doMainFound(tableLocation, chunkPosition);
-            } else {
-                int overflowLocation = mainOverflowLocationSource.getUnsafe(tableLocation);
-                if (!findOverflow(handler, k0, k1, chunkPosition, overflowLocation)) {
-                    final int newOverflowLocation = allocateOverflowLocation();
-                    overflowKeySource0.set(newOverflowLocation, k0);
-                    overflowKeySource1.set(newOverflowLocation, k1);
-                    mainOverflowLocationSource.set(tableLocation, newOverflowLocation);
-                    overflowOverflowLocationSource.set(newOverflowLocation, overflowLocation);
-                    numEntries++;
-                    handler.doOverflowInsert(newOverflowLocation, chunkPosition);
-                }
-            }
-        }
-    }
-
-    @Override
-    protected void probe(HashHandler handler, RowSequence rowSequence, Chunk[] sourceKeyChunks) {
-        final CharChunk<Values> keyChunk0 = sourceKeyChunks[0].asCharChunk();
-        final ByteChunk<Values> keyChunk1 = sourceKeyChunks[1].asByteChunk();
-        final int chunkSize = keyChunk0.size();
-        for (int chunkPosition = 0; chunkPosition < chunkSize; ++chunkPosition) {
-            final char k0 = keyChunk0.get(chunkPosition);
-            final byte k1 = keyChunk1.get(chunkPosition);
-            final int hash = hash(k0, k1);
-            final int tableLocation = hashToTableLocation(tableHashPivot, hash);
-            if (mainOutputPosition.getUnsafe(tableLocation) == EMPTY_OUTPUT_POSITION) {
-                handler.doMissing(chunkPosition);
-            } else if (eq(mainKeySource0.getUnsafe(tableLocation), k0) && eq(mainKeySource1.getUnsafe(tableLocation), k1)) {
-                handler.doMainFound(tableLocation, chunkPosition);
-            } else {
-                int overflowLocation = mainOverflowLocationSource.getUnsafe(tableLocation);
-                if (!findOverflow(handler, k0, k1, chunkPosition, overflowLocation)) {
-                    handler.doMissing(chunkPosition);
-                }
-            }
-        }
-    }
-
-    private static int hash(char k0, byte k1) {
-        int hash = CharChunkHasher.hashInitialSingle(k0);
-        hash = ByteChunkHasher.hashUpdateSingle(hash, k1);
-        return hash;
-    }
-
-    @Override
-    protected void rehashBucket(HashHandler handler, int sourceBucket, int destBucket,
-            int bucketsToAdd) {
-        final int position = mainOutputPosition.getUnsafe(sourceBucket);
-        if (position == EMPTY_OUTPUT_POSITION) {
-            return;
-        }
-        int mainInsertLocation = maybeMoveMainBucket(handler, sourceBucket, destBucket, bucketsToAdd);
-        int overflowLocation = mainOverflowLocationSource.getUnsafe(sourceBucket);
-        mainOverflowLocationSource.set(sourceBucket, QueryConstants.NULL_INT);
-        mainOverflowLocationSource.set(destBucket, QueryConstants.NULL_INT);
-        while (overflowLocation != QueryConstants.NULL_INT) {
-            final int nextOverflowLocation = overflowOverflowLocationSource.getUnsafe(overflowLocation);
-            final char overflowKey0 = overflowKeySource0.getUnsafe(overflowLocation);
-            final byte overflowKey1 = overflowKeySource1.getUnsafe(overflowLocation);
-            final int overflowHash = hash(overflowKey0, overflowKey1);
-            final int overflowTableLocation = hashToTableLocation(tableHashPivot + bucketsToAdd, overflowHash);
-            if (overflowTableLocation == mainInsertLocation) {
-                mainKeySource0.set(mainInsertLocation, overflowKey0);
-                mainKeySource1.set(mainInsertLocation, overflowKey1);
-                mainOutputPosition.set(mainInsertLocation, overflowOutputPosition.getUnsafe(overflowLocation));
-                handler.doPromoteOverflow(overflowLocation, mainInsertLocation);
-                overflowOutputPosition.set(overflowLocation, QueryConstants.NULL_INT);
-                overflowKeySource0.set(overflowLocation, QueryConstants.NULL_CHAR);
-                overflowKeySource1.set(overflowLocation, QueryConstants.NULL_BYTE);
-                freeOverflowLocation(overflowLocation);
-                mainInsertLocation = -1;
-            } else {
-                final int oldOverflowLocation = mainOverflowLocationSource.getUnsafe(overflowTableLocation);
-                mainOverflowLocationSource.set(overflowTableLocation, overflowLocation);
-                overflowOverflowLocationSource.set(overflowLocation, oldOverflowLocation);
-            }
-            overflowLocation = nextOverflowLocation;
-        }
-    }
-
-    private int maybeMoveMainBucket(HashHandler handler, int sourceBucket, int destBucket,
-            int bucketsToAdd) {
-        final char k0 = mainKeySource0.getUnsafe(sourceBucket);
-        final byte k1 = mainKeySource1.getUnsafe(sourceBucket);
-        final int hash = hash(k0, k1);
-        final int location = hashToTableLocation(tableHashPivot + bucketsToAdd, hash);
-        final int mainInsertLocation;
-        if (location == sourceBucket) {
-            mainInsertLocation = destBucket;
-            mainOutputPosition.set(destBucket, EMPTY_OUTPUT_POSITION);
-        } else {
-            mainInsertLocation = sourceBucket;
-            mainOutputPosition.set(destBucket, mainOutputPosition.getUnsafe(sourceBucket));
-            mainOutputPosition.set(sourceBucket, EMPTY_OUTPUT_POSITION);
-            mainKeySource0.set(destBucket, k0);
-            mainKeySource0.set(sourceBucket, QueryConstants.NULL_CHAR);
-            mainKeySource1.set(destBucket, k1);
-            mainKeySource1.set(sourceBucket, QueryConstants.NULL_BYTE);
-            handler.doMoveMain(sourceBucket, destBucket);
-        }
-        return mainInsertLocation;
-    }
-
-    private boolean findOverflow(HashHandler handler, char k0, byte k1, int chunkPosition,
-            int overflowLocation) {
-        while (overflowLocation != QueryConstants.NULL_INT) {
-            if (eq(overflowKeySource0.getUnsafe(overflowLocation), k0) && eq(overflowKeySource1.getUnsafe(overflowLocation), k1)) {
-                handler.doOverflowFound(overflowLocation, chunkPosition);
-                return true;
-            }
-            overflowLocation = overflowOverflowLocationSource.getUnsafe(overflowLocation);
-        }
-        return false;
-    }
-
-    @Override
-    public int findPositionForKey(Object key) {
-        final Object [] ka = (Object[])key;
-        final char k0 = TypeUtils.unbox((Character)ka[0]);
-        final byte k1 = TypeUtils.unbox((Byte)ka[1]);
-        int hash = hash(k0, k1);
-        final int tableLocation = hashToTableLocation(tableHashPivot, hash);
-        final int positionValue = mainOutputPosition.getUnsafe(tableLocation);
-        if (positionValue == EMPTY_OUTPUT_POSITION) {
-            return -1;
-        }
-        if (eq(mainKeySource0.getUnsafe(tableLocation), k0) && eq(mainKeySource1.getUnsafe(tableLocation), k1)) {
-            return positionValue;
-        }
-        int overflowLocation = mainOverflowLocationSource.getUnsafe(tableLocation);
-        while (overflowLocation != QueryConstants.NULL_INT) {
-            if (eq(overflowKeySource0.getUnsafe(overflowLocation), k0) && eq(overflowKeySource1.getUnsafe(overflowLocation), k1)) {
-                return overflowOutputPosition.getUnsafe(overflowLocation);
-            }
-            overflowLocation = overflowOverflowLocationSource.getUnsafe(overflowLocation);
-        }
-        return -1;
-    }
-}
diff --git a/engine/table/src/main/java/io/deephaven/engine/table/impl/by/typed/incagg/gen/IncrementalAggHasherCharChar.java b/engine/table/src/main/java/io/deephaven/engine/table/impl/by/typed/incagg/gen/IncrementalAggHasherCharChar.java
deleted file mode 100644
index 1882b1e938a..00000000000
--- a/engine/table/src/main/java/io/deephaven/engine/table/impl/by/typed/incagg/gen/IncrementalAggHasherCharChar.java
+++ /dev/null
@@ -1,201 +0,0 @@
-//
-// Copyright (c) 2016-2024 Deephaven Data Labs and Patent Pending
-//
-// ****** AUTO-GENERATED CLASS - DO NOT EDIT MANUALLY
-// ****** Run ReplicateTypedHashers or ./gradlew replicateTypedHashers to regenerate
-//
-// @formatter:off
-package io.deephaven.engine.table.impl.by.typed.incagg.gen;
-
-import static io.deephaven.util.compare.CharComparisons.eq;
-
-import io.deephaven.chunk.CharChunk;
-import io.deephaven.chunk.Chunk;
-import io.deephaven.chunk.attributes.Values;
-import io.deephaven.chunk.util.hashing.CharChunkHasher;
-import io.deephaven.engine.rowset.RowSequence;
-import io.deephaven.engine.table.ColumnSource;
-import io.deephaven.engine.table.impl.by.HashHandler;
-import io.deephaven.engine.table.impl.by.IncrementalChunkedOperatorAggregationStateManagerTypedBase;
-import io.deephaven.engine.table.impl.sources.CharacterArraySource;
-import io.deephaven.util.QueryConstants;
-import io.deephaven.util.type.TypeUtils;
-import java.lang.Character;
-import java.lang.Object;
-import java.lang.Override;
-
-final class IncrementalAggHasherCharChar extends IncrementalChunkedOperatorAggregationStateManagerTypedBase {
-    private final CharacterArraySource mainKeySource0;
-
-    private final CharacterArraySource overflowKeySource0;
-
-    private final CharacterArraySource mainKeySource1;
-
-    private final CharacterArraySource overflowKeySource1;
-
-    public IncrementalAggHasherCharChar(ColumnSource[] tableKeySources,
-            ColumnSource[] originalTableKeySources, int tableSize, double maximumLoadFactor,
-            double targetLoadFactor) {
-        super(tableKeySources, tableSize, maximumLoadFactor, targetLoadFactor);
-        this.mainKeySource0 = (CharacterArraySource) super.mainKeySources[0];
-        this.overflowKeySource0 = (CharacterArraySource) super.overflowKeySources[0];
-        this.mainKeySource1 = (CharacterArraySource) super.mainKeySources[1];
-        this.overflowKeySource1 = (CharacterArraySource) super.overflowKeySources[1];
-    }
-
-    @Override
-    protected void build(HashHandler handler, RowSequence rowSequence, Chunk[] sourceKeyChunks) {
-        final CharChunk<Values> keyChunk0 = sourceKeyChunks[0].asCharChunk();
-        final CharChunk<Values> keyChunk1 = sourceKeyChunks[1].asCharChunk();
-        final int chunkSize = keyChunk0.size();
-        for (int chunkPosition = 0; chunkPosition < chunkSize; ++chunkPosition) {
-            final char k0 = keyChunk0.get(chunkPosition);
-            final char k1 = keyChunk1.get(chunkPosition);
-            final int hash = hash(k0, k1);
-            final int tableLocation = hashToTableLocation(tableHashPivot, hash);
-            if (mainOutputPosition.getUnsafe(tableLocation) == EMPTY_OUTPUT_POSITION) {
-                numEntries++;
-                mainKeySource0.set(tableLocation, k0);
-                mainKeySource1.set(tableLocation, k1);
-                handler.doMainInsert(tableLocation, chunkPosition);
-            } else if (eq(mainKeySource0.getUnsafe(tableLocation), k0) && eq(mainKeySource1.getUnsafe(tableLocation), k1)) {
-                handler.doMainFound(tableLocation, chunkPosition);
-            } else {
-                int overflowLocation = mainOverflowLocationSource.getUnsafe(tableLocation);
-                if (!findOverflow(handler, k0, k1, chunkPosition, overflowLocation)) {
-                    final int newOverflowLocation = allocateOverflowLocation();
-                    overflowKeySource0.set(newOverflowLocation, k0);
-                    overflowKeySource1.set(newOverflowLocation, k1);
-                    mainOverflowLocationSource.set(tableLocation, newOverflowLocation);
-                    overflowOverflowLocationSource.set(newOverflowLocation, overflowLocation);
-                    numEntries++;
-                    handler.doOverflowInsert(newOverflowLocation, chunkPosition);
-                }
-            }
-        }
-    }
-
-    @Override
-    protected void probe(HashHandler handler, RowSequence rowSequence, Chunk[] sourceKeyChunks) {
-        final CharChunk<Values> keyChunk0 = sourceKeyChunks[0].asCharChunk();
-        final CharChunk<Values> keyChunk1 = sourceKeyChunks[1].asCharChunk();
-        final int chunkSize = keyChunk0.size();
-        for (int chunkPosition = 0; chunkPosition < chunkSize; ++chunkPosition) {
-            final char k0 = keyChunk0.get(chunkPosition);
-            final char k1 = keyChunk1.get(chunkPosition);
-            final int hash = hash(k0, k1);
-            final int tableLocation = hashToTableLocation(tableHashPivot, hash);
-            if (mainOutputPosition.getUnsafe(tableLocation) == EMPTY_OUTPUT_POSITION) {
-                handler.doMissing(chunkPosition);
-            } else if (eq(mainKeySource0.getUnsafe(tableLocation), k0) && eq(mainKeySource1.getUnsafe(tableLocation), k1)) {
-                handler.doMainFound(tableLocation, chunkPosition);
-            } else {
-                int overflowLocation = mainOverflowLocationSource.getUnsafe(tableLocation);
-                if (!findOverflow(handler, k0, k1, chunkPosition, overflowLocation)) {
-                    handler.doMissing(chunkPosition);
-                }
-            }
-        }
-    }
-
-    private static int hash(char k0, char k1) {
-        int hash = CharChunkHasher.hashInitialSingle(k0);
-        hash = CharChunkHasher.hashUpdateSingle(hash, k1);
-        return hash;
-    }
-
-    @Override
-    protected void rehashBucket(HashHandler handler, int sourceBucket, int destBucket,
-            int bucketsToAdd) {
-        final int position = mainOutputPosition.getUnsafe(sourceBucket);
-        if (position == EMPTY_OUTPUT_POSITION) {
-            return;
-        }
-        int mainInsertLocation = maybeMoveMainBucket(handler, sourceBucket, destBucket, bucketsToAdd);
-        int overflowLocation = mainOverflowLocationSource.getUnsafe(sourceBucket);
-        mainOverflowLocationSource.set(sourceBucket, QueryConstants.NULL_INT);
-        mainOverflowLocationSource.set(destBucket, QueryConstants.NULL_INT);
-        while (overflowLocation != QueryConstants.NULL_INT) {
-            final int nextOverflowLocation = overflowOverflowLocationSource.getUnsafe(overflowLocation);
-            final char overflowKey0 = overflowKeySource0.getUnsafe(overflowLocation);
-            final char overflowKey1 = overflowKeySource1.getUnsafe(overflowLocation);
-            final int overflowHash = hash(overflowKey0, overflowKey1);
-            final int overflowTableLocation = hashToTableLocation(tableHashPivot + bucketsToAdd, overflowHash);
-            if (overflowTableLocation == mainInsertLocation) {
-                mainKeySource0.set(mainInsertLocation, overflowKey0);
-                mainKeySource1.set(mainInsertLocation, overflowKey1);
-                mainOutputPosition.set(mainInsertLocation, overflowOutputPosition.getUnsafe(overflowLocation));
-                handler.doPromoteOverflow(overflowLocation, mainInsertLocation);
-                overflowOutputPosition.set(overflowLocation, QueryConstants.NULL_INT);
-                overflowKeySource0.set(overflowLocation, QueryConstants.NULL_CHAR);
-                overflowKeySource1.set(overflowLocation, QueryConstants.NULL_CHAR);
-                freeOverflowLocation(overflowLocation);
-                mainInsertLocation = -1;
-            } else {
-                final int oldOverflowLocation = mainOverflowLocationSource.getUnsafe(overflowTableLocation);
-                mainOverflowLocationSource.set(overflowTableLocation, overflowLocation);
-                overflowOverflowLocationSource.set(overflowLocation, oldOverflowLocation);
-            }
-            overflowLocation = nextOverflowLocation;
-        }
-    }
-
-    private int maybeMoveMainBucket(HashHandler handler, int sourceBucket, int destBucket,
-            int bucketsToAdd) {
-        final char k0 = mainKeySource0.getUnsafe(sourceBucket);
-        final char k1 = mainKeySource1.getUnsafe(sourceBucket);
-        final int hash = hash(k0, k1);
-        final int location = hashToTableLocation(tableHashPivot + bucketsToAdd, hash);
-        final int mainInsertLocation;
-        if (location == sourceBucket) {
-            mainInsertLocation = destBucket;
-            mainOutputPosition.set(destBucket, EMPTY_OUTPUT_POSITION);
-        } else {
-            mainInsertLocation = sourceBucket;
-            mainOutputPosition.set(destBucket, mainOutputPosition.getUnsafe(sourceBucket));
-            mainOutputPosition.set(sourceBucket, EMPTY_OUTPUT_POSITION);
-            mainKeySource0.set(destBucket, k0);
-            mainKeySource0.set(sourceBucket, QueryConstants.NULL_CHAR);
-            mainKeySource1.set(destBucket, k1);
-            mainKeySource1.set(sourceBucket, QueryConstants.NULL_CHAR);
-            handler.doMoveMain(sourceBucket, destBucket);
-        }
-        return mainInsertLocation;
-    }
-
-    private boolean findOverflow(HashHandler handler, char k0, char k1, int chunkPosition,
-            int overflowLocation) {
-        while (overflowLocation != QueryConstants.NULL_INT) {
-            if (eq(overflowKeySource0.getUnsafe(overflowLocation), k0) && eq(overflowKeySource1.getUnsafe(overflowLocation), k1)) {
-                handler.doOverflowFound(overflowLocation, chunkPosition);
-                return true;
-            }
-            overflowLocation = overflowOverflowLocationSource.getUnsafe(overflowLocation);
-        }
-        return false;
-    }
-
-    @Override
-    public int findPositionForKey(Object key) {
-        final Object [] ka = (Object[])key;
-        final char k0 = TypeUtils.unbox((Character)ka[0]);
-        final char k1 = TypeUtils.unbox((Character)ka[1]);
-        int hash = hash(k0, k1);
-        final int tableLocation = hashToTableLocation(tableHashPivot, hash);
-        final int positionValue = mainOutputPosition.getUnsafe(tableLocation);
-        if (positionValue == EMPTY_OUTPUT_POSITION) {
-            return -1;
-        }
-        if (eq(mainKeySource0.getUnsafe(tableLocation), k0) && eq(mainKeySource1.getUnsafe(tableLocation), k1)) {
-            return positionValue;
-        }
-        int overflowLocation = mainOverflowLocationSource.getUnsafe(tableLocation);
-        while (overflowLocation != QueryConstants.NULL_INT) {
-            if (eq(overflowKeySource0.getUnsafe(overflowLocation), k0) && eq(overflowKeySource1.getUnsafe(overflowLocation), k1)) {
-                return overflowOutputPosition.getUnsafe(overflowLocation);
-            }
-            overflowLocation = overflowOverflowLocationSource.getUnsafe(overflowLocation);
-        }
-        return -1;
-    }
-}
diff --git a/engine/table/src/main/java/io/deephaven/engine/table/impl/by/typed/incagg/gen/IncrementalAggHasherCharDouble.java b/engine/table/src/main/java/io/deephaven/engine/table/impl/by/typed/incagg/gen/IncrementalAggHasherCharDouble.java
deleted file mode 100644
index a7ca34dd0ee..00000000000
--- a/engine/table/src/main/java/io/deephaven/engine/table/impl/by/typed/incagg/gen/IncrementalAggHasherCharDouble.java
+++ /dev/null
@@ -1,206 +0,0 @@
-//
-// Copyright (c) 2016-2024 Deephaven Data Labs and Patent Pending
-//
-// ****** AUTO-GENERATED CLASS - DO NOT EDIT MANUALLY
-// ****** Run ReplicateTypedHashers or ./gradlew replicateTypedHashers to regenerate
-//
-// @formatter:off
-package io.deephaven.engine.table.impl.by.typed.incagg.gen;
-
-import static io.deephaven.util.compare.CharComparisons.eq;
-import static io.deephaven.util.compare.DoubleComparisons.eq;
-
-import io.deephaven.chunk.CharChunk;
-import io.deephaven.chunk.Chunk;
-import io.deephaven.chunk.DoubleChunk;
-import io.deephaven.chunk.attributes.Values;
-import io.deephaven.chunk.util.hashing.CharChunkHasher;
-import io.deephaven.chunk.util.hashing.DoubleChunkHasher;
-import io.deephaven.engine.rowset.RowSequence;
-import io.deephaven.engine.table.ColumnSource;
-import io.deephaven.engine.table.impl.by.HashHandler;
-import io.deephaven.engine.table.impl.by.IncrementalChunkedOperatorAggregationStateManagerTypedBase;
-import io.deephaven.engine.table.impl.sources.CharacterArraySource;
-import io.deephaven.engine.table.impl.sources.DoubleArraySource;
-import io.deephaven.util.QueryConstants;
-import io.deephaven.util.type.TypeUtils;
-import java.lang.Character;
-import java.lang.Double;
-import java.lang.Object;
-import java.lang.Override;
-
-final class IncrementalAggHasherCharDouble extends IncrementalChunkedOperatorAggregationStateManagerTypedBase {
-    private final CharacterArraySource mainKeySource0;
-
-    private final CharacterArraySource overflowKeySource0;
-
-    private final DoubleArraySource mainKeySource1;
-
-    private final DoubleArraySource overflowKeySource1;
-
-    public IncrementalAggHasherCharDouble(ColumnSource[] tableKeySources,
-            ColumnSource[] originalTableKeySources, int tableSize, double maximumLoadFactor,
-            double targetLoadFactor) {
-        super(tableKeySources, tableSize, maximumLoadFactor, targetLoadFactor);
-        this.mainKeySource0 = (CharacterArraySource) super.mainKeySources[0];
-        this.overflowKeySource0 = (CharacterArraySource) super.overflowKeySources[0];
-        this.mainKeySource1 = (DoubleArraySource) super.mainKeySources[1];
-        this.overflowKeySource1 = (DoubleArraySource) super.overflowKeySources[1];
-    }
-
-    @Override
-    protected void build(HashHandler handler, RowSequence rowSequence, Chunk[] sourceKeyChunks) {
-        final CharChunk<Values> keyChunk0 = sourceKeyChunks[0].asCharChunk();
-        final DoubleChunk<Values> keyChunk1 = sourceKeyChunks[1].asDoubleChunk();
-        final int chunkSize = keyChunk0.size();
-        for (int chunkPosition = 0; chunkPosition < chunkSize; ++chunkPosition) {
-            final char k0 = keyChunk0.get(chunkPosition);
-            final double k1 = keyChunk1.get(chunkPosition);
-            final int hash = hash(k0, k1);
-            final int tableLocation = hashToTableLocation(tableHashPivot, hash);
-            if (mainOutputPosition.getUnsafe(tableLocation) == EMPTY_OUTPUT_POSITION) {
-                numEntries++;
-                mainKeySource0.set(tableLocation, k0);
-                mainKeySource1.set(tableLocation, k1);
-                handler.doMainInsert(tableLocation, chunkPosition);
-            } else if (eq(mainKeySource0.getUnsafe(tableLocation), k0) && eq(mainKeySource1.getUnsafe(tableLocation), k1)) {
-                handler.doMainFound(tableLocation, chunkPosition);
-            } else {
-                int overflowLocation = mainOverflowLocationSource.getUnsafe(tableLocation);
-                if (!findOverflow(handler, k0, k1, chunkPosition, overflowLocation)) {
-                    final int newOverflowLocation = allocateOverflowLocation();
-                    overflowKeySource0.set(newOverflowLocation, k0);
-                    overflowKeySource1.set(newOverflowLocation, k1);
-                    mainOverflowLocationSource.set(tableLocation, newOverflowLocation);
-                    overflowOverflowLocationSource.set(newOverflowLocation, overflowLocation);
-                    numEntries++;
-                    handler.doOverflowInsert(newOverflowLocation, chunkPosition);
-                }
-            }
-        }
-    }
-
-    @Override
-    protected void probe(HashHandler handler, RowSequence rowSequence, Chunk[] sourceKeyChunks) {
-        final CharChunk<Values> keyChunk0 = sourceKeyChunks[0].asCharChunk();
-        final DoubleChunk<Values> keyChunk1 = sourceKeyChunks[1].asDoubleChunk();
-        final int chunkSize = keyChunk0.size();
-        for (int chunkPosition = 0; chunkPosition < chunkSize; ++chunkPosition) {
-            final char k0 = keyChunk0.get(chunkPosition);
-            final double k1 = keyChunk1.get(chunkPosition);
-            final int hash = hash(k0, k1);
-            final int tableLocation = hashToTableLocation(tableHashPivot, hash);
-            if (mainOutputPosition.getUnsafe(tableLocation) == EMPTY_OUTPUT_POSITION) {
-                handler.doMissing(chunkPosition);
-            } else if (eq(mainKeySource0.getUnsafe(tableLocation), k0) && eq(mainKeySource1.getUnsafe(tableLocation), k1)) {
-                handler.doMainFound(tableLocation, chunkPosition);
-            } else {
-                int overflowLocation = mainOverflowLocationSource.getUnsafe(tableLocation);
-                if (!findOverflow(handler, k0, k1, chunkPosition, overflowLocation)) {
-                    handler.doMissing(chunkPosition);
-                }
-            }
-        }
-    }
-
-    private static int hash(char k0, double k1) {
-        int hash = CharChunkHasher.hashInitialSingle(k0);
-        hash = DoubleChunkHasher.hashUpdateSingle(hash, k1);
-        return hash;
-    }
-
-    @Override
-    protected void rehashBucket(HashHandler handler, int sourceBucket, int destBucket,
-            int bucketsToAdd) {
-        final int position = mainOutputPosition.getUnsafe(sourceBucket);
-        if (position == EMPTY_OUTPUT_POSITION) {
-            return;
-        }
-        int mainInsertLocation = maybeMoveMainBucket(handler, sourceBucket, destBucket, bucketsToAdd);
-        int overflowLocation = mainOverflowLocationSource.getUnsafe(sourceBucket);
-        mainOverflowLocationSource.set(sourceBucket, QueryConstants.NULL_INT);
-        mainOverflowLocationSource.set(destBucket, QueryConstants.NULL_INT);
-        while (overflowLocation != QueryConstants.NULL_INT) {
-            final int nextOverflowLocation = overflowOverflowLocationSource.getUnsafe(overflowLocation);
-            final char overflowKey0 = overflowKeySource0.getUnsafe(overflowLocation);
-            final double overflowKey1 = overflowKeySource1.getUnsafe(overflowLocation);
-            final int overflowHash = hash(overflowKey0, overflowKey1);
-            final int overflowTableLocation = hashToTableLocation(tableHashPivot + bucketsToAdd, overflowHash);
-            if (overflowTableLocation == mainInsertLocation) {
-                mainKeySource0.set(mainInsertLocation, overflowKey0);
-                mainKeySource1.set(mainInsertLocation, overflowKey1);
-                mainOutputPosition.set(mainInsertLocation, overflowOutputPosition.getUnsafe(overflowLocation));
-                handler.doPromoteOverflow(overflowLocation, mainInsertLocation);
-                overflowOutputPosition.set(overflowLocation, QueryConstants.NULL_INT);
-                overflowKeySource0.set(overflowLocation, QueryConstants.NULL_CHAR);
-                overflowKeySource1.set(overflowLocation, QueryConstants.NULL_DOUBLE);
-                freeOverflowLocation(overflowLocation);
-                mainInsertLocation = -1;
-            } else {
-                final int oldOverflowLocation = mainOverflowLocationSource.getUnsafe(overflowTableLocation);
-                mainOverflowLocationSource.set(overflowTableLocation, overflowLocation);
-                overflowOverflowLocationSource.set(overflowLocation, oldOverflowLocation);
-            }
-            overflowLocation = nextOverflowLocation;
-        }
-    }
-
-    private int maybeMoveMainBucket(HashHandler handler, int sourceBucket, int destBucket,
-            int bucketsToAdd) {
-        final char k0 = mainKeySource0.getUnsafe(sourceBucket);
-        final double k1 = mainKeySource1.getUnsafe(sourceBucket);
-        final int hash = hash(k0, k1);
-        final int location = hashToTableLocation(tableHashPivot + bucketsToAdd, hash);
-        final int mainInsertLocation;
-        if (location == sourceBucket) {
-            mainInsertLocation = destBucket;
-            mainOutputPosition.set(destBucket, EMPTY_OUTPUT_POSITION);
-        } else {
-            mainInsertLocation = sourceBucket;
-            mainOutputPosition.set(destBucket, mainOutputPosition.getUnsafe(sourceBucket));
-            mainOutputPosition.set(sourceBucket, EMPTY_OUTPUT_POSITION);
-            mainKeySource0.set(destBucket, k0);
-            mainKeySource0.set(sourceBucket, QueryConstants.NULL_CHAR);
-            mainKeySource1.set(destBucket, k1);
-            mainKeySource1.set(sourceBucket, QueryConstants.NULL_DOUBLE);
-            handler.doMoveMain(sourceBucket, destBucket);
-        }
-        return mainInsertLocation;
-    }
-
-    private boolean findOverflow(HashHandler handler, char k0, double k1, int chunkPosition,
-            int overflowLocation) {
-        while (overflowLocation != QueryConstants.NULL_INT) {
-            if (eq(overflowKeySource0.getUnsafe(overflowLocation), k0) && eq(overflowKeySource1.getUnsafe(overflowLocation), k1)) {
-                handler.doOverflowFound(overflowLocation, chunkPosition);
-                return true;
-            }
-            overflowLocation = overflowOverflowLocationSource.getUnsafe(overflowLocation);
-        }
-        return false;
-    }
-
-    @Override
-    public int findPositionForKey(Object key) {
-        final Object [] ka = (Object[])key;
-        final char k0 = TypeUtils.unbox((Character)ka[0]);
-        final double k1 = TypeUtils.unbox((Double)ka[1]);
-        int hash = hash(k0, k1);
-        final int tableLocation = hashToTableLocation(tableHashPivot, hash);
-        final int positionValue = mainOutputPosition.getUnsafe(tableLocation);
-        if (positionValue == EMPTY_OUTPUT_POSITION) {
-            return -1;
-        }
-        if (eq(mainKeySource0.getUnsafe(tableLocation), k0) && eq(mainKeySource1.getUnsafe(tableLocation), k1)) {
-            return positionValue;
-        }
-        int overflowLocation = mainOverflowLocationSource.getUnsafe(tableLocation);
-        while (overflowLocation != QueryConstants.NULL_INT) {
-            if (eq(overflowKeySource0.getUnsafe(overflowLocation), k0) && eq(overflowKeySource1.getUnsafe(overflowLocation), k1)) {
-                return overflowOutputPosition.getUnsafe(overflowLocation);
-            }
-            overflowLocation = overflowOverflowLocationSource.getUnsafe(overflowLocation);
-        }
-        return -1;
-    }
-}
diff --git a/engine/table/src/main/java/io/deephaven/engine/table/impl/by/typed/incagg/gen/IncrementalAggHasherCharFloat.java b/engine/table/src/main/java/io/deephaven/engine/table/impl/by/typed/incagg/gen/IncrementalAggHasherCharFloat.java
deleted file mode 100644
index 2128d647982..00000000000
--- a/engine/table/src/main/java/io/deephaven/engine/table/impl/by/typed/incagg/gen/IncrementalAggHasherCharFloat.java
+++ /dev/null
@@ -1,206 +0,0 @@
-//
-// Copyright (c) 2016-2024 Deephaven Data Labs and Patent Pending
-//
-// ****** AUTO-GENERATED CLASS - DO NOT EDIT MANUALLY
-// ****** Run ReplicateTypedHashers or ./gradlew replicateTypedHashers to regenerate
-//
-// @formatter:off
-package io.deephaven.engine.table.impl.by.typed.incagg.gen;
-
-import static io.deephaven.util.compare.CharComparisons.eq;
-import static io.deephaven.util.compare.FloatComparisons.eq;
-
-import io.deephaven.chunk.CharChunk;
-import io.deephaven.chunk.Chunk;
-import io.deephaven.chunk.FloatChunk;
-import io.deephaven.chunk.attributes.Values;
-import io.deephaven.chunk.util.hashing.CharChunkHasher;
-import io.deephaven.chunk.util.hashing.FloatChunkHasher;
-import io.deephaven.engine.rowset.RowSequence;
-import io.deephaven.engine.table.ColumnSource;
-import io.deephaven.engine.table.impl.by.HashHandler;
-import io.deephaven.engine.table.impl.by.IncrementalChunkedOperatorAggregationStateManagerTypedBase;
-import io.deephaven.engine.table.impl.sources.CharacterArraySource;
-import io.deephaven.engine.table.impl.sources.FloatArraySource;
-import io.deephaven.util.QueryConstants;
-import io.deephaven.util.type.TypeUtils;
-import java.lang.Character;
-import java.lang.Float;
-import java.lang.Object;
-import java.lang.Override;
-
-final class IncrementalAggHasherCharFloat extends IncrementalChunkedOperatorAggregationStateManagerTypedBase {
-    private final CharacterArraySource mainKeySource0;
-
-    private final CharacterArraySource overflowKeySource0;
-
-    private final FloatArraySource mainKeySource1;
-
-    private final FloatArraySource overflowKeySource1;
-
-    public IncrementalAggHasherCharFloat(ColumnSource[] tableKeySources,
-            ColumnSource[] originalTableKeySources, int tableSize, double maximumLoadFactor,
-            double targetLoadFactor) {
-        super(tableKeySources, tableSize, maximumLoadFactor, targetLoadFactor);
-        this.mainKeySource0 = (CharacterArraySource) super.mainKeySources[0];
-        this.overflowKeySource0 = (CharacterArraySource) super.overflowKeySources[0];
-        this.mainKeySource1 = (FloatArraySource) super.mainKeySources[1];
-        this.overflowKeySource1 = (FloatArraySource) super.overflowKeySources[1];
-    }
-
-    @Override
-    protected void build(HashHandler handler, RowSequence rowSequence, Chunk[] sourceKeyChunks) {
-        final CharChunk<Values> keyChunk0 = sourceKeyChunks[0].asCharChunk();
-        final FloatChunk<Values> keyChunk1 = sourceKeyChunks[1].asFloatChunk();
-        final int chunkSize = keyChunk0.size();
-        for (int chunkPosition = 0; chunkPosition < chunkSize; ++chunkPosition) {
-            final char k0 = keyChunk0.get(chunkPosition);
-            final float k1 = keyChunk1.get(chunkPosition);
-            final int hash = hash(k0, k1);
-            final int tableLocation = hashToTableLocation(tableHashPivot, hash);
-            if (mainOutputPosition.getUnsafe(tableLocation) == EMPTY_OUTPUT_POSITION) {
-                numEntries++;
-                mainKeySource0.set(tableLocation, k0);
-                mainKeySource1.set(tableLocation, k1);
-                handler.doMainInsert(tableLocation, chunkPosition);
-            } else if (eq(mainKeySource0.getUnsafe(tableLocation), k0) && eq(mainKeySource1.getUnsafe(tableLocation), k1)) {
-                handler.doMainFound(tableLocation, chunkPosition);
-            } else {
-                int overflowLocation = mainOverflowLocationSource.getUnsafe(tableLocation);
-                if (!findOverflow(handler, k0, k1, chunkPosition, overflowLocation)) {
-                    final int newOverflowLocation = allocateOverflowLocation();
-                    overflowKeySource0.set(newOverflowLocation, k0);
-                    overflowKeySource1.set(newOverflowLocation, k1);
-                    mainOverflowLocationSource.set(tableLocation, newOverflowLocation);
-                    overflowOverflowLocationSource.set(newOverflowLocation, overflowLocation);
-                    numEntries++;
-                    handler.doOverflowInsert(newOverflowLocation, chunkPosition);
-                }
-            }
-        }
-    }
-
-    @Override
-    protected void probe(HashHandler handler, RowSequence rowSequence, Chunk[] sourceKeyChunks) {
-        final CharChunk<Values> keyChunk0 = sourceKeyChunks[0].asCharChunk();
-        final FloatChunk<Values> keyChunk1 = sourceKeyChunks[1].asFloatChunk();
-        final int chunkSize = keyChunk0.size();
-        for (int chunkPosition = 0; chunkPosition < chunkSize; ++chunkPosition) {
-            final char k0 = keyChunk0.get(chunkPosition);
-            final float k1 = keyChunk1.get(chunkPosition);
-            final int hash = hash(k0, k1);
-            final int tableLocation = hashToTableLocation(tableHashPivot, hash);
-            if (mainOutputPosition.getUnsafe(tableLocation) == EMPTY_OUTPUT_POSITION) {
-                handler.doMissing(chunkPosition);
-            } else if (eq(mainKeySource0.getUnsafe(tableLocation), k0) && eq(mainKeySource1.getUnsafe(tableLocation), k1)) {
-                handler.doMainFound(tableLocation, chunkPosition);
-            } else {
-                int overflowLocation = mainOverflowLocationSource.getUnsafe(tableLocation);
-                if (!findOverflow(handler, k0, k1, chunkPosition, overflowLocation)) {
-                    handler.doMissing(chunkPosition);
-                }
-            }
-        }
-    }
-
-    private static int hash(char k0, float k1) {
-        int hash = CharChunkHasher.hashInitialSingle(k0);
-        hash = FloatChunkHasher.hashUpdateSingle(hash, k1);
-        return hash;
-    }
-
-    @Override
-    protected void rehashBucket(HashHandler handler, int sourceBucket, int destBucket,
-            int bucketsToAdd) {
-        final int position = mainOutputPosition.getUnsafe(sourceBucket);
-        if (position == EMPTY_OUTPUT_POSITION) {
-            return;
-        }
-        int mainInsertLocation = maybeMoveMainBucket(handler, sourceBucket, destBucket, bucketsToAdd);
-        int overflowLocation = mainOverflowLocationSource.getUnsafe(sourceBucket);
-        mainOverflowLocationSource.set(sourceBucket, QueryConstants.NULL_INT);
-        mainOverflowLocationSource.set(destBucket, QueryConstants.NULL_INT);
-        while (overflowLocation != QueryConstants.NULL_INT) {
-            final int nextOverflowLocation = overflowOverflowLocationSource.getUnsafe(overflowLocation);
-            final char overflowKey0 = overflowKeySource0.getUnsafe(overflowLocation);
-            final float overflowKey1 = overflowKeySource1.getUnsafe(overflowLocation);
-            final int overflowHash = hash(overflowKey0, overflowKey1);
-            final int overflowTableLocation = hashToTableLocation(tableHashPivot + bucketsToAdd, overflowHash);
-            if (overflowTableLocation == mainInsertLocation) {
-                mainKeySource0.set(mainInsertLocation, overflowKey0);
-                mainKeySource1.set(mainInsertLocation, overflowKey1);
-                mainOutputPosition.set(mainInsertLocation, overflowOutputPosition.getUnsafe(overflowLocation));
-                handler.doPromoteOverflow(overflowLocation, mainInsertLocation);
-                overflowOutputPosition.set(overflowLocation, QueryConstants.NULL_INT);
-                overflowKeySource0.set(overflowLocation, QueryConstants.NULL_CHAR);
-                overflowKeySource1.set(overflowLocation, QueryConstants.NULL_FLOAT);
-                freeOverflowLocation(overflowLocation);
-                mainInsertLocation = -1;
-            } else {
-                final int oldOverflowLocation = mainOverflowLocationSource.getUnsafe(overflowTableLocation);
-                mainOverflowLocationSource.set(overflowTableLocation, overflowLocation);
-                overflowOverflowLocationSource.set(overflowLocation, oldOverflowLocation);
-            }
-            overflowLocation = nextOverflowLocation;
-        }
-    }
-
-    private int maybeMoveMainBucket(HashHandler handler, int sourceBucket, int destBucket,
-            int bucketsToAdd) {
-        final char k0 = mainKeySource0.getUnsafe(sourceBucket);
-        final float k1 = mainKeySource1.getUnsafe(sourceBucket);
-        final int hash = hash(k0, k1);
-        final int location = hashToTableLocation(tableHashPivot + bucketsToAdd, hash);
-        final int mainInsertLocation;
-        if (location == sourceBucket) {
-            mainInsertLocation = destBucket;
-            mainOutputPosition.set(destBucket, EMPTY_OUTPUT_POSITION);
-        } else {
-            mainInsertLocation = sourceBucket;
-            mainOutputPosition.set(destBucket, mainOutputPosition.getUnsafe(sourceBucket));
-            mainOutputPosition.set(sourceBucket, EMPTY_OUTPUT_POSITION);
-            mainKeySource0.set(destBucket, k0);
-            mainKeySource0.set(sourceBucket, QueryConstants.NULL_CHAR);
-            mainKeySource1.set(destBucket, k1);
-            mainKeySource1.set(sourceBucket, QueryConstants.NULL_FLOAT);
-            handler.doMoveMain(sourceBucket, destBucket);
-        }
-        return mainInsertLocation;
-    }
-
-    private boolean findOverflow(HashHandler handler, char k0, float k1, int chunkPosition,
-            int overflowLocation) {
-        while (overflowLocation != QueryConstants.NULL_INT) {
-            if (eq(overflowKeySource0.getUnsafe(overflowLocation), k0) && eq(overflowKeySource1.getUnsafe(overflowLocation), k1)) {
-                handler.doOverflowFound(overflowLocation, chunkPosition);
-                return true;
-            }
-            overflowLocation = overflowOverflowLocationSource.getUnsafe(overflowLocation);
-        }
-        return false;
-    }
-
-    @Override
-    public int findPositionForKey(Object key) {
-        final Object [] ka = (Object[])key;
-        final char k0 = TypeUtils.unbox((Character)ka[0]);
-        final float k1 = TypeUtils.unbox((Float)ka[1]);
-        int hash = hash(k0, k1);
-        final int tableLocation = hashToTableLocation(tableHashPivot, hash);
-        final int positionValue = mainOutputPosition.getUnsafe(tableLocation);
-        if (positionValue == EMPTY_OUTPUT_POSITION) {
-            return -1;
-        }
-        if (eq(mainKeySource0.getUnsafe(tableLocation), k0) && eq(mainKeySource1.getUnsafe(tableLocation), k1)) {
-            return positionValue;
-        }
-        int overflowLocation = mainOverflowLocationSource.getUnsafe(tableLocation);
-        while (overflowLocation != QueryConstants.NULL_INT) {
-            if (eq(overflowKeySource0.getUnsafe(overflowLocation), k0) && eq(overflowKeySource1.getUnsafe(overflowLocation), k1)) {
-                return overflowOutputPosition.getUnsafe(overflowLocation);
-            }
-            overflowLocation = overflowOverflowLocationSource.getUnsafe(overflowLocation);
-        }
-        return -1;
-    }
-}
diff --git a/engine/table/src/main/java/io/deephaven/engine/table/impl/by/typed/incagg/gen/IncrementalAggHasherCharInt.java b/engine/table/src/main/java/io/deephaven/engine/table/impl/by/typed/incagg/gen/IncrementalAggHasherCharInt.java
deleted file mode 100644
index fb65c887244..00000000000
--- a/engine/table/src/main/java/io/deephaven/engine/table/impl/by/typed/incagg/gen/IncrementalAggHasherCharInt.java
+++ /dev/null
@@ -1,206 +0,0 @@
-//
-// Copyright (c) 2016-2024 Deephaven Data Labs and Patent Pending
-//
-// ****** AUTO-GENERATED CLASS - DO NOT EDIT MANUALLY
-// ****** Run ReplicateTypedHashers or ./gradlew replicateTypedHashers to regenerate
-//
-// @formatter:off
-package io.deephaven.engine.table.impl.by.typed.incagg.gen;
-
-import static io.deephaven.util.compare.CharComparisons.eq;
-import static io.deephaven.util.compare.IntComparisons.eq;
-
-import io.deephaven.chunk.CharChunk;
-import io.deephaven.chunk.Chunk;
-import io.deephaven.chunk.IntChunk;
-import io.deephaven.chunk.attributes.Values;
-import io.deephaven.chunk.util.hashing.CharChunkHasher;
-import io.deephaven.chunk.util.hashing.IntChunkHasher;
-import io.deephaven.engine.rowset.RowSequence;
-import io.deephaven.engine.table.ColumnSource;
-import io.deephaven.engine.table.impl.by.HashHandler;
-import io.deephaven.engine.table.impl.by.IncrementalChunkedOperatorAggregationStateManagerTypedBase;
-import io.deephaven.engine.table.impl.sources.CharacterArraySource;
-import io.deephaven.engine.table.impl.sources.IntegerArraySource;
-import io.deephaven.util.QueryConstants;
-import io.deephaven.util.type.TypeUtils;
-import java.lang.Character;
-import java.lang.Integer;
-import java.lang.Object;
-import java.lang.Override;
-
-final class IncrementalAggHasherCharInt extends IncrementalChunkedOperatorAggregationStateManagerTypedBase {
-    private final CharacterArraySource mainKeySource0;
-
-    private final CharacterArraySource overflowKeySource0;
-
-    private final IntegerArraySource mainKeySource1;
-
-    private final IntegerArraySource overflowKeySource1;
-
-    public IncrementalAggHasherCharInt(ColumnSource[] tableKeySources,
-            ColumnSource[] originalTableKeySources, int tableSize, double maximumLoadFactor,
-            double targetLoadFactor) {
-        super(tableKeySources, tableSize, maximumLoadFactor, targetLoadFactor);
-        this.mainKeySource0 = (CharacterArraySource) super.mainKeySources[0];
-        this.overflowKeySource0 = (CharacterArraySource) super.overflowKeySources[0];
-        this.mainKeySource1 = (IntegerArraySource) super.mainKeySources[1];
-        this.overflowKeySource1 = (IntegerArraySource) super.overflowKeySources[1];
-    }
-
-    @Override
-    protected void build(HashHandler handler, RowSequence rowSequence, Chunk[] sourceKeyChunks) {
-        final CharChunk<Values> keyChunk0 = sourceKeyChunks[0].asCharChunk();
-        final IntChunk<Values> keyChunk1 = sourceKeyChunks[1].asIntChunk();
-        final int chunkSize = keyChunk0.size();
-        for (int chunkPosition = 0; chunkPosition < chunkSize; ++chunkPosition) {
-            final char k0 = keyChunk0.get(chunkPosition);
-            final int k1 = keyChunk1.get(chunkPosition);
-            final int hash = hash(k0, k1);
-            final int tableLocation = hashToTableLocation(tableHashPivot, hash);
-            if (mainOutputPosition.getUnsafe(tableLocation) == EMPTY_OUTPUT_POSITION) {
-                numEntries++;
-                mainKeySource0.set(tableLocation, k0);
-                mainKeySource1.set(tableLocation, k1);
-                handler.doMainInsert(tableLocation, chunkPosition);
-            } else if (eq(mainKeySource0.getUnsafe(tableLocation), k0) && eq(mainKeySource1.getUnsafe(tableLocation), k1)) {
-                handler.doMainFound(tableLocation, chunkPosition);
-            } else {
-                int overflowLocation = mainOverflowLocationSource.getUnsafe(tableLocation);
-                if (!findOverflow(handler, k0, k1, chunkPosition, overflowLocation)) {
-                    final int newOverflowLocation = allocateOverflowLocation();
-                    overflowKeySource0.set(newOverflowLocation, k0);
-                    overflowKeySource1.set(newOverflowLocation, k1);
-                    mainOverflowLocationSource.set(tableLocation, newOverflowLocation);
-                    overflowOverflowLocationSource.set(newOverflowLocation, overflowLocation);
-                    numEntries++;
-                    handler.doOverflowInsert(newOverflowLocation, chunkPosition);
-                }
-            }
-        }
-    }
-
-    @Override
-    protected void probe(HashHandler handler, RowSequence rowSequence, Chunk[] sourceKeyChunks) {
-        final CharChunk<Values> keyChunk0 = sourceKeyChunks[0].asCharChunk();
-        final IntChunk<Values> keyChunk1 = sourceKeyChunks[1].asIntChunk();
-        final int chunkSize = keyChunk0.size();
-        for (int chunkPosition = 0; chunkPosition < chunkSize; ++chunkPosition) {
-            final char k0 = keyChunk0.get(chunkPosition);
-            final int k1 = keyChunk1.get(chunkPosition);
-            final int hash = hash(k0, k1);
-            final int tableLocation = hashToTableLocation(tableHashPivot, hash);
-            if (mainOutputPosition.getUnsafe(tableLocation) == EMPTY_OUTPUT_POSITION) {
-                handler.doMissing(chunkPosition);
-            } else if (eq(mainKeySource0.getUnsafe(tableLocation), k0) && eq(mainKeySource1.getUnsafe(tableLocation), k1)) {
-                handler.doMainFound(tableLocation, chunkPosition);
-            } else {
-                int overflowLocation = mainOverflowLocationSource.getUnsafe(tableLocation);
-                if (!findOverflow(handler, k0, k1, chunkPosition, overflowLocation)) {
-                    handler.doMissing(chunkPosition);
-                }
-            }
-        }
-    }
-
-    private static int hash(char k0, int k1) {
-        int hash = CharChunkHasher.hashInitialSingle(k0);
-        hash = IntChunkHasher.hashUpdateSingle(hash, k1);
-        return hash;
-    }
-
-    @Override
-    protected void rehashBucket(HashHandler handler, int sourceBucket, int destBucket,
-            int bucketsToAdd) {
-        final int position = mainOutputPosition.getUnsafe(sourceBucket);
-        if (position == EMPTY_OUTPUT_POSITION) {
-            return;
-        }
-        int mainInsertLocation = maybeMoveMainBucket(handler, sourceBucket, destBucket, bucketsToAdd);
-        int overflowLocation = mainOverflowLocationSource.getUnsafe(sourceBucket);
-        mainOverflowLocationSource.set(sourceBucket, QueryConstants.NULL_INT);
-        mainOverflowLocationSource.set(destBucket, QueryConstants.NULL_INT);
-        while (overflowLocation != QueryConstants.NULL_INT) {
-            final int nextOverflowLocation = overflowOverflowLocationSource.getUnsafe(overflowLocation);
-            final char overflowKey0 = overflowKeySource0.getUnsafe(overflowLocation);
-            final int overflowKey1 = overflowKeySource1.getUnsafe(overflowLocation);
-            final int overflowHash = hash(overflowKey0, overflowKey1);
-            final int overflowTableLocation = hashToTableLocation(tableHashPivot + bucketsToAdd, overflowHash);
-            if (overflowTableLocation == mainInsertLocation) {
-                mainKeySource0.set(mainInsertLocation, overflowKey0);
-                mainKeySource1.set(mainInsertLocation, overflowKey1);
-                mainOutputPosition.set(mainInsertLocation, overflowOutputPosition.getUnsafe(overflowLocation));
-                handler.doPromoteOverflow(overflowLocation, mainInsertLocation);
-                overflowOutputPosition.set(overflowLocation, QueryConstants.NULL_INT);
-                overflowKeySource0.set(overflowLocation, QueryConstants.NULL_CHAR);
-                overflowKeySource1.set(overflowLocation, QueryConstants.NULL_INT);
-                freeOverflowLocation(overflowLocation);
-                mainInsertLocation = -1;
-            } else {
-                final int oldOverflowLocation = mainOverflowLocationSource.getUnsafe(overflowTableLocation);
-                mainOverflowLocationSource.set(overflowTableLocation, overflowLocation);
-                overflowOverflowLocationSource.set(overflowLocation, oldOverflowLocation);
-            }
-            overflowLocation = nextOverflowLocation;
-        }
-    }
-
-    private int maybeMoveMainBucket(HashHandler handler, int sourceBucket, int destBucket,
-            int bucketsToAdd) {
-        final char k0 = mainKeySource0.getUnsafe(sourceBucket);
-        final int k1 = mainKeySource1.getUnsafe(sourceBucket);
-        final int hash = hash(k0, k1);
-        final int location = hashToTableLocation(tableHashPivot + bucketsToAdd, hash);
-        final int mainInsertLocation;
-        if (location == sourceBucket) {
-            mainInsertLocation = destBucket;
-            mainOutputPosition.set(destBucket, EMPTY_OUTPUT_POSITION);
-        } else {
-            mainInsertLocation = sourceBucket;
-            mainOutputPosition.set(destBucket, mainOutputPosition.getUnsafe(sourceBucket));
-            mainOutputPosition.set(sourceBucket, EMPTY_OUTPUT_POSITION);
-            mainKeySource0.set(destBucket, k0);
-            mainKeySource0.set(sourceBucket, QueryConstants.NULL_CHAR);
-            mainKeySource1.set(destBucket, k1);
-            mainKeySource1.set(sourceBucket, QueryConstants.NULL_INT);
-            handler.doMoveMain(sourceBucket, destBucket);
-        }
-        return mainInsertLocation;
-    }
-
-    private boolean findOverflow(HashHandler handler, char k0, int k1, int chunkPosition,
-            int overflowLocation) {
-        while (overflowLocation != QueryConstants.NULL_INT) {
-            if (eq(overflowKeySource0.getUnsafe(overflowLocation), k0) && eq(overflowKeySource1.getUnsafe(overflowLocation), k1)) {
-                handler.doOverflowFound(overflowLocation, chunkPosition);
-                return true;
-            }
-            overflowLocation = overflowOverflowLocationSource.getUnsafe(overflowLocation);
-        }
-        return false;
-    }
-
-    @Override
-    public int findPositionForKey(Object key) {
-        final Object [] ka = (Object[])key;
-        final char k0 = TypeUtils.unbox((Character)ka[0]);
-        final int k1 = TypeUtils.unbox((Integer)ka[1]);
-        int hash = hash(k0, k1);
-        final int tableLocation = hashToTableLocation(tableHashPivot, hash);
-        final int positionValue = mainOutputPosition.getUnsafe(tableLocation);
-        if (positionValue == EMPTY_OUTPUT_POSITION) {
-            return -1;
-        }
-        if (eq(mainKeySource0.getUnsafe(tableLocation), k0) && eq(mainKeySource1.getUnsafe(tableLocation), k1)) {
-            return positionValue;
-        }
-        int overflowLocation = mainOverflowLocationSource.getUnsafe(tableLocation);
-        while (overflowLocation != QueryConstants.NULL_INT) {
-            if (eq(overflowKeySource0.getUnsafe(overflowLocation), k0) && eq(overflowKeySource1.getUnsafe(overflowLocation), k1)) {
-                return overflowOutputPosition.getUnsafe(overflowLocation);
-            }
-            overflowLocation = overflowOverflowLocationSource.getUnsafe(overflowLocation);
-        }
-        return -1;
-    }
-}
diff --git a/engine/table/src/main/java/io/deephaven/engine/table/impl/by/typed/incagg/gen/IncrementalAggHasherCharLong.java b/engine/table/src/main/java/io/deephaven/engine/table/impl/by/typed/incagg/gen/IncrementalAggHasherCharLong.java
deleted file mode 100644
index 7f8dae4d1b1..00000000000
--- a/engine/table/src/main/java/io/deephaven/engine/table/impl/by/typed/incagg/gen/IncrementalAggHasherCharLong.java
+++ /dev/null
@@ -1,206 +0,0 @@
-//
-// Copyright (c) 2016-2024 Deephaven Data Labs and Patent Pending
-//
-// ****** AUTO-GENERATED CLASS - DO NOT EDIT MANUALLY
-// ****** Run ReplicateTypedHashers or ./gradlew replicateTypedHashers to regenerate
-//
-// @formatter:off
-package io.deephaven.engine.table.impl.by.typed.incagg.gen;
-
-import static io.deephaven.util.compare.CharComparisons.eq;
-import static io.deephaven.util.compare.LongComparisons.eq;
-
-import io.deephaven.chunk.CharChunk;
-import io.deephaven.chunk.Chunk;
-import io.deephaven.chunk.LongChunk;
-import io.deephaven.chunk.attributes.Values;
-import io.deephaven.chunk.util.hashing.CharChunkHasher;
-import io.deephaven.chunk.util.hashing.LongChunkHasher;
-import io.deephaven.engine.rowset.RowSequence;
-import io.deephaven.engine.table.ColumnSource;
-import io.deephaven.engine.table.impl.by.HashHandler;
-import io.deephaven.engine.table.impl.by.IncrementalChunkedOperatorAggregationStateManagerTypedBase;
-import io.deephaven.engine.table.impl.sources.CharacterArraySource;
-import io.deephaven.engine.table.impl.sources.LongArraySource;
-import io.deephaven.util.QueryConstants;
-import io.deephaven.util.type.TypeUtils;
-import java.lang.Character;
-import java.lang.Long;
-import java.lang.Object;
-import java.lang.Override;
-
-final class IncrementalAggHasherCharLong extends IncrementalChunkedOperatorAggregationStateManagerTypedBase {
-    private final CharacterArraySource mainKeySource0;
-
-    private final CharacterArraySource overflowKeySource0;
-
-    private final LongArraySource mainKeySource1;
-
-    private final LongArraySource overflowKeySource1;
-
-    public IncrementalAggHasherCharLong(ColumnSource[] tableKeySources,
-            ColumnSource[] originalTableKeySources, int tableSize, double maximumLoadFactor,
-            double targetLoadFactor) {
-        super(tableKeySources, tableSize, maximumLoadFactor, targetLoadFactor);
-        this.mainKeySource0 = (CharacterArraySource) super.mainKeySources[0];
-        this.overflowKeySource0 = (CharacterArraySource) super.overflowKeySources[0];
-        this.mainKeySource1 = (LongArraySource) super.mainKeySources[1];
-        this.overflowKeySource1 = (LongArraySource) super.overflowKeySources[1];
-    }
-
-    @Override
-    protected void build(HashHandler handler, RowSequence rowSequence, Chunk[] sourceKeyChunks) {
-        final CharChunk<Values> keyChunk0 = sourceKeyChunks[0].asCharChunk();
-        final LongChunk<Values> keyChunk1 = sourceKeyChunks[1].asLongChunk();
-        final int chunkSize = keyChunk0.size();
-        for (int chunkPosition = 0; chunkPosition < chunkSize; ++chunkPosition) {
-            final char k0 = keyChunk0.get(chunkPosition);
-            final long k1 = keyChunk1.get(chunkPosition);
-            final int hash = hash(k0, k1);
-            final int tableLocation = hashToTableLocation(tableHashPivot, hash);
-            if (mainOutputPosition.getUnsafe(tableLocation) == EMPTY_OUTPUT_POSITION) {
-                numEntries++;
-                mainKeySource0.set(tableLocation, k0);
-                mainKeySource1.set(tableLocation, k1);
-                handler.doMainInsert(tableLocation, chunkPosition);
-            } else if (eq(mainKeySource0.getUnsafe(tableLocation), k0) && eq(mainKeySource1.getUnsafe(tableLocation), k1)) {
-                handler.doMainFound(tableLocation, chunkPosition);
-            } else {
-                int overflowLocation = mainOverflowLocationSource.getUnsafe(tableLocation);
-                if (!findOverflow(handler, k0, k1, chunkPosition, overflowLocation)) {
-                    final int newOverflowLocation = allocateOverflowLocation();
-                    overflowKeySource0.set(newOverflowLocation, k0);
-                    overflowKeySource1.set(newOverflowLocation, k1);
-                    mainOverflowLocationSource.set(tableLocation, newOverflowLocation);
-                    overflowOverflowLocationSource.set(newOverflowLocation, overflowLocation);
-                    numEntries++;
-                    handler.doOverflowInsert(newOverflowLocation, chunkPosition);
-                }
-            }
-        }
-    }
-
-    @Override
-    protected void probe(HashHandler handler, RowSequence rowSequence, Chunk[] sourceKeyChunks) {
-        final CharChunk<Values> keyChunk0 = sourceKeyChunks[0].asCharChunk();
-        final LongChunk<Values> keyChunk1 = sourceKeyChunks[1].asLongChunk();
-        final int chunkSize = keyChunk0.size();
-        for (int chunkPosition = 0; chunkPosition < chunkSize; ++chunkPosition) {
-            final char k0 = keyChunk0.get(chunkPosition);
-            final long k1 = keyChunk1.get(chunkPosition);
-            final int hash = hash(k0, k1);
-            final int tableLocation = hashToTableLocation(tableHashPivot, hash);
-            if (mainOutputPosition.getUnsafe(tableLocation) == EMPTY_OUTPUT_POSITION) {
-                handler.doMissing(chunkPosition);
-            } else if (eq(mainKeySource0.getUnsafe(tableLocation), k0) && eq(mainKeySource1.getUnsafe(tableLocation), k1)) {
-                handler.doMainFound(tableLocation, chunkPosition);
-            } else {
-                int overflowLocation = mainOverflowLocationSource.getUnsafe(tableLocation);
-                if (!findOverflow(handler, k0, k1, chunkPosition, overflowLocation)) {
-                    handler.doMissing(chunkPosition);
-                }
-            }
-        }
-    }
-
-    private static int hash(char k0, long k1) {
-        int hash = CharChunkHasher.hashInitialSingle(k0);
-        hash = LongChunkHasher.hashUpdateSingle(hash, k1);
-        return hash;
-    }
-
-    @Override
-    protected void rehashBucket(HashHandler handler, int sourceBucket, int destBucket,
-            int bucketsToAdd) {
-        final int position = mainOutputPosition.getUnsafe(sourceBucket);
-        if (position == EMPTY_OUTPUT_POSITION) {
-            return;
-        }
-        int mainInsertLocation = maybeMoveMainBucket(handler, sourceBucket, destBucket, bucketsToAdd);
-        int overflowLocation = mainOverflowLocationSource.getUnsafe(sourceBucket);
-        mainOverflowLocationSource.set(sourceBucket, QueryConstants.NULL_INT);
-        mainOverflowLocationSource.set(destBucket, QueryConstants.NULL_INT);
-        while (overflowLocation != QueryConstants.NULL_INT) {
-            final int nextOverflowLocation = overflowOverflowLocationSource.getUnsafe(overflowLocation);
-            final char overflowKey0 = overflowKeySource0.getUnsafe(overflowLocation);
-            final long overflowKey1 = overflowKeySource1.getUnsafe(overflowLocation);
-            final int overflowHash = hash(overflowKey0, overflowKey1);
-            final int overflowTableLocation = hashToTableLocation(tableHashPivot + bucketsToAdd, overflowHash);
-            if (overflowTableLocation == mainInsertLocation) {
-                mainKeySource0.set(mainInsertLocation, overflowKey0);
-                mainKeySource1.set(mainInsertLocation, overflowKey1);
-                mainOutputPosition.set(mainInsertLocation, overflowOutputPosition.getUnsafe(overflowLocation));
-                handler.doPromoteOverflow(overflowLocation, mainInsertLocation);
-                overflowOutputPosition.set(overflowLocation, QueryConstants.NULL_INT);
-                overflowKeySource0.set(overflowLocation, QueryConstants.NULL_CHAR);
-                overflowKeySource1.set(overflowLocation, QueryConstants.NULL_LONG);
-                freeOverflowLocation(overflowLocation);
-                mainInsertLocation = -1;
-            } else {
-                final int oldOverflowLocation = mainOverflowLocationSource.getUnsafe(overflowTableLocation);
-                mainOverflowLocationSource.set(overflowTableLocation, overflowLocation);
-                overflowOverflowLocationSource.set(overflowLocation, oldOverflowLocation);
-            }
-            overflowLocation = nextOverflowLocation;
-        }
-    }
-
-    private int maybeMoveMainBucket(HashHandler handler, int sourceBucket, int destBucket,
-            int bucketsToAdd) {
-        final char k0 = mainKeySource0.getUnsafe(sourceBucket);
-        final long k1 = mainKeySource1.getUnsafe(sourceBucket);
-        final int hash = hash(k0, k1);
-        final int location = hashToTableLocation(tableHashPivot + bucketsToAdd, hash);
-        final int mainInsertLocation;
-        if (location == sourceBucket) {
-            mainInsertLocation = destBucket;
-            mainOutputPosition.set(destBucket, EMPTY_OUTPUT_POSITION);
-        } else {
-            mainInsertLocation = sourceBucket;
-            mainOutputPosition.set(destBucket, mainOutputPosition.getUnsafe(sourceBucket));
-            mainOutputPosition.set(sourceBucket, EMPTY_OUTPUT_POSITION);
-            mainKeySource0.set(destBucket, k0);
-            mainKeySource0.set(sourceBucket, QueryConstants.NULL_CHAR);
-            mainKeySource1.set(destBucket, k1);
-            mainKeySource1.set(sourceBucket, QueryConstants.NULL_LONG);
-            handler.doMoveMain(sourceBucket, destBucket);
-        }
-        return mainInsertLocation;
-    }
-
-    private boolean findOverflow(HashHandler handler, char k0, long k1, int chunkPosition,
-            int overflowLocation) {
-        while (overflowLocation != QueryConstants.NULL_INT) {
-            if (eq(overflowKeySource0.getUnsafe(overflowLocation), k0) && eq(overflowKeySource1.getUnsafe(overflowLocation), k1)) {
-                handler.doOverflowFound(overflowLocation, chunkPosition);
-                return true;
-            }
-            overflowLocation = overflowOverflowLocationSource.getUnsafe(overflowLocation);
-        }
-        return false;
-    }
-
-    @Override
-    public int findPositionForKey(Object key) {
-        final Object [] ka = (Object[])key;
-        final char k0 = TypeUtils.unbox((Character)ka[0]);
-        final long k1 = TypeUtils.unbox((Long)ka[1]);
-        int hash = hash(k0, k1);
-        final int tableLocation = hashToTableLocation(tableHashPivot, hash);
-        final int positionValue = mainOutputPosition.getUnsafe(tableLocation);
-        if (positionValue == EMPTY_OUTPUT_POSITION) {
-            return -1;
-        }
-        if (eq(mainKeySource0.getUnsafe(tableLocation), k0) && eq(mainKeySource1.getUnsafe(tableLocation), k1)) {
-            return positionValue;
-        }
-        int overflowLocation = mainOverflowLocationSource.getUnsafe(tableLocation);
-        while (overflowLocation != QueryConstants.NULL_INT) {
-            if (eq(overflowKeySource0.getUnsafe(overflowLocation), k0) && eq(overflowKeySource1.getUnsafe(overflowLocation), k1)) {
-                return overflowOutputPosition.getUnsafe(overflowLocation);
-            }
-            overflowLocation = overflowOverflowLocationSource.getUnsafe(overflowLocation);
-        }
-        return -1;
-    }
-}
diff --git a/engine/table/src/main/java/io/deephaven/engine/table/impl/by/typed/incagg/gen/IncrementalAggHasherCharObject.java b/engine/table/src/main/java/io/deephaven/engine/table/impl/by/typed/incagg/gen/IncrementalAggHasherCharObject.java
deleted file mode 100644
index ad66a6585d6..00000000000
--- a/engine/table/src/main/java/io/deephaven/engine/table/impl/by/typed/incagg/gen/IncrementalAggHasherCharObject.java
+++ /dev/null
@@ -1,205 +0,0 @@
-//
-// Copyright (c) 2016-2024 Deephaven Data Labs and Patent Pending
-//
-// ****** AUTO-GENERATED CLASS - DO NOT EDIT MANUALLY
-// ****** Run ReplicateTypedHashers or ./gradlew replicateTypedHashers to regenerate
-//
-// @formatter:off
-package io.deephaven.engine.table.impl.by.typed.incagg.gen;
-
-import static io.deephaven.util.compare.CharComparisons.eq;
-import static io.deephaven.util.compare.ObjectComparisons.eq;
-
-import io.deephaven.chunk.CharChunk;
-import io.deephaven.chunk.Chunk;
-import io.deephaven.chunk.ObjectChunk;
-import io.deephaven.chunk.attributes.Values;
-import io.deephaven.chunk.util.hashing.CharChunkHasher;
-import io.deephaven.chunk.util.hashing.ObjectChunkHasher;
-import io.deephaven.engine.rowset.RowSequence;
-import io.deephaven.engine.table.ColumnSource;
-import io.deephaven.engine.table.impl.by.HashHandler;
-import io.deephaven.engine.table.impl.by.IncrementalChunkedOperatorAggregationStateManagerTypedBase;
-import io.deephaven.engine.table.impl.sources.CharacterArraySource;
-import io.deephaven.engine.table.impl.sources.ObjectArraySource;
-import io.deephaven.util.QueryConstants;
-import io.deephaven.util.type.TypeUtils;
-import java.lang.Character;
-import java.lang.Object;
-import java.lang.Override;
-
-final class IncrementalAggHasherCharObject extends IncrementalChunkedOperatorAggregationStateManagerTypedBase {
-    private final CharacterArraySource mainKeySource0;
-
-    private final CharacterArraySource overflowKeySource0;
-
-    private final ObjectArraySource mainKeySource1;
-
-    private final ObjectArraySource overflowKeySource1;
-
-    public IncrementalAggHasherCharObject(ColumnSource[] tableKeySources,
-            ColumnSource[] originalTableKeySources, int tableSize, double maximumLoadFactor,
-            double targetLoadFactor) {
-        super(tableKeySources, tableSize, maximumLoadFactor, targetLoadFactor);
-        this.mainKeySource0 = (CharacterArraySource) super.mainKeySources[0];
-        this.overflowKeySource0 = (CharacterArraySource) super.overflowKeySources[0];
-        this.mainKeySource1 = (ObjectArraySource) super.mainKeySources[1];
-        this.overflowKeySource1 = (ObjectArraySource) super.overflowKeySources[1];
-    }
-
-    @Override
-    protected void build(HashHandler handler, RowSequence rowSequence, Chunk[] sourceKeyChunks) {
-        final CharChunk<Values> keyChunk0 = sourceKeyChunks[0].asCharChunk();
-        final ObjectChunk<Object, Values> keyChunk1 = sourceKeyChunks[1].asObjectChunk();
-        final int chunkSize = keyChunk0.size();
-        for (int chunkPosition = 0; chunkPosition < chunkSize; ++chunkPosition) {
-            final char k0 = keyChunk0.get(chunkPosition);
-            final Object k1 = keyChunk1.get(chunkPosition);
-            final int hash = hash(k0, k1);
-            final int tableLocation = hashToTableLocation(tableHashPivot, hash);
-            if (mainOutputPosition.getUnsafe(tableLocation) == EMPTY_OUTPUT_POSITION) {
-                numEntries++;
-                mainKeySource0.set(tableLocation, k0);
-                mainKeySource1.set(tableLocation, k1);
-                handler.doMainInsert(tableLocation, chunkPosition);
-            } else if (eq(mainKeySource0.getUnsafe(tableLocation), k0) && eq(mainKeySource1.getUnsafe(tableLocation), k1)) {
-                handler.doMainFound(tableLocation, chunkPosition);
-            } else {
-                int overflowLocation = mainOverflowLocationSource.getUnsafe(tableLocation);
-                if (!findOverflow(handler, k0, k1, chunkPosition, overflowLocation)) {
-                    final int newOverflowLocation = allocateOverflowLocation();
-                    overflowKeySource0.set(newOverflowLocation, k0);
-                    overflowKeySource1.set(newOverflowLocation, k1);
-                    mainOverflowLocationSource.set(tableLocation, newOverflowLocation);
-                    overflowOverflowLocationSource.set(newOverflowLocation, overflowLocation);
-                    numEntries++;
-                    handler.doOverflowInsert(newOverflowLocation, chunkPosition);
-                }
-            }
-        }
-    }
-
-    @Override
-    protected void probe(HashHandler handler, RowSequence rowSequence, Chunk[] sourceKeyChunks) {
-        final CharChunk<Values> keyChunk0 = sourceKeyChunks[0].asCharChunk();
-        final ObjectChunk<Object, Values> keyChunk1 = sourceKeyChunks[1].asObjectChunk();
-        final int chunkSize = keyChunk0.size();
-        for (int chunkPosition = 0; chunkPosition < chunkSize; ++chunkPosition) {
-            final char k0 = keyChunk0.get(chunkPosition);
-            final Object k1 = keyChunk1.get(chunkPosition);
-            final int hash = hash(k0, k1);
-            final int tableLocation = hashToTableLocation(tableHashPivot, hash);
-            if (mainOutputPosition.getUnsafe(tableLocation) == EMPTY_OUTPUT_POSITION) {
-                handler.doMissing(chunkPosition);
-            } else if (eq(mainKeySource0.getUnsafe(tableLocation), k0) && eq(mainKeySource1.getUnsafe(tableLocation), k1)) {
-                handler.doMainFound(tableLocation, chunkPosition);
-            } else {
-                int overflowLocation = mainOverflowLocationSource.getUnsafe(tableLocation);
-                if (!findOverflow(handler, k0, k1, chunkPosition, overflowLocation)) {
-                    handler.doMissing(chunkPosition);
-                }
-            }
-        }
-    }
-
-    private static int hash(char k0, Object k1) {
-        int hash = CharChunkHasher.hashInitialSingle(k0);
-        hash = ObjectChunkHasher.hashUpdateSingle(hash, k1);
-        return hash;
-    }
-
-    @Override
-    protected void rehashBucket(HashHandler handler, int sourceBucket, int destBucket,
-            int bucketsToAdd) {
-        final int position = mainOutputPosition.getUnsafe(sourceBucket);
-        if (position == EMPTY_OUTPUT_POSITION) {
-            return;
-        }
-        int mainInsertLocation = maybeMoveMainBucket(handler, sourceBucket, destBucket, bucketsToAdd);
-        int overflowLocation = mainOverflowLocationSource.getUnsafe(sourceBucket);
-        mainOverflowLocationSource.set(sourceBucket, QueryConstants.NULL_INT);
-        mainOverflowLocationSource.set(destBucket, QueryConstants.NULL_INT);
-        while (overflowLocation != QueryConstants.NULL_INT) {
-            final int nextOverflowLocation = overflowOverflowLocationSource.getUnsafe(overflowLocation);
-            final char overflowKey0 = overflowKeySource0.getUnsafe(overflowLocation);
-            final Object overflowKey1 = overflowKeySource1.getUnsafe(overflowLocation);
-            final int overflowHash = hash(overflowKey0, overflowKey1);
-            final int overflowTableLocation = hashToTableLocation(tableHashPivot + bucketsToAdd, overflowHash);
-            if (overflowTableLocation == mainInsertLocation) {
-                mainKeySource0.set(mainInsertLocation, overflowKey0);
-                mainKeySource1.set(mainInsertLocation, overflowKey1);
-                mainOutputPosition.set(mainInsertLocation, overflowOutputPosition.getUnsafe(overflowLocation));
-                handler.doPromoteOverflow(overflowLocation, mainInsertLocation);
-                overflowOutputPosition.set(overflowLocation, QueryConstants.NULL_INT);
-                overflowKeySource0.set(overflowLocation, QueryConstants.NULL_CHAR);
-                overflowKeySource1.set(overflowLocation, null);
-                freeOverflowLocation(overflowLocation);
-                mainInsertLocation = -1;
-            } else {
-                final int oldOverflowLocation = mainOverflowLocationSource.getUnsafe(overflowTableLocation);
-                mainOverflowLocationSource.set(overflowTableLocation, overflowLocation);
-                overflowOverflowLocationSource.set(overflowLocation, oldOverflowLocation);
-            }
-            overflowLocation = nextOverflowLocation;
-        }
-    }
-
-    private int maybeMoveMainBucket(HashHandler handler, int sourceBucket, int destBucket,
-            int bucketsToAdd) {
-        final char k0 = mainKeySource0.getUnsafe(sourceBucket);
-        final Object k1 = mainKeySource1.getUnsafe(sourceBucket);
-        final int hash = hash(k0, k1);
-        final int location = hashToTableLocation(tableHashPivot + bucketsToAdd, hash);
-        final int mainInsertLocation;
-        if (location == sourceBucket) {
-            mainInsertLocation = destBucket;
-            mainOutputPosition.set(destBucket, EMPTY_OUTPUT_POSITION);
-        } else {
-            mainInsertLocation = sourceBucket;
-            mainOutputPosition.set(destBucket, mainOutputPosition.getUnsafe(sourceBucket));
-            mainOutputPosition.set(sourceBucket, EMPTY_OUTPUT_POSITION);
-            mainKeySource0.set(destBucket, k0);
-            mainKeySource0.set(sourceBucket, QueryConstants.NULL_CHAR);
-            mainKeySource1.set(destBucket, k1);
-            mainKeySource1.set(sourceBucket, null);
-            handler.doMoveMain(sourceBucket, destBucket);
-        }
-        return mainInsertLocation;
-    }
-
-    private boolean findOverflow(HashHandler handler, char k0, Object k1, int chunkPosition,
-            int overflowLocation) {
-        while (overflowLocation != QueryConstants.NULL_INT) {
-            if (eq(overflowKeySource0.getUnsafe(overflowLocation), k0) && eq(overflowKeySource1.getUnsafe(overflowLocation), k1)) {
-                handler.doOverflowFound(overflowLocation, chunkPosition);
-                return true;
-            }
-            overflowLocation = overflowOverflowLocationSource.getUnsafe(overflowLocation);
-        }
-        return false;
-    }
-
-    @Override
-    public int findPositionForKey(Object key) {
-        final Object [] ka = (Object[])key;
-        final char k0 = TypeUtils.unbox((Character)ka[0]);
-        final Object k1 = ka[1];
-        int hash = hash(k0, k1);
-        final int tableLocation = hashToTableLocation(tableHashPivot, hash);
-        final int positionValue = mainOutputPosition.getUnsafe(tableLocation);
-        if (positionValue == EMPTY_OUTPUT_POSITION) {
-            return -1;
-        }
-        if (eq(mainKeySource0.getUnsafe(tableLocation), k0) && eq(mainKeySource1.getUnsafe(tableLocation), k1)) {
-            return positionValue;
-        }
-        int overflowLocation = mainOverflowLocationSource.getUnsafe(tableLocation);
-        while (overflowLocation != QueryConstants.NULL_INT) {
-            if (eq(overflowKeySource0.getUnsafe(overflowLocation), k0) && eq(overflowKeySource1.getUnsafe(overflowLocation), k1)) {
-                return overflowOutputPosition.getUnsafe(overflowLocation);
-            }
-            overflowLocation = overflowOverflowLocationSource.getUnsafe(overflowLocation);
-        }
-        return -1;
-    }
-}
diff --git a/engine/table/src/main/java/io/deephaven/engine/table/impl/by/typed/incagg/gen/IncrementalAggHasherCharShort.java b/engine/table/src/main/java/io/deephaven/engine/table/impl/by/typed/incagg/gen/IncrementalAggHasherCharShort.java
deleted file mode 100644
index 33d15720efb..00000000000
--- a/engine/table/src/main/java/io/deephaven/engine/table/impl/by/typed/incagg/gen/IncrementalAggHasherCharShort.java
+++ /dev/null
@@ -1,206 +0,0 @@
-//
-// Copyright (c) 2016-2024 Deephaven Data Labs and Patent Pending
-//
-// ****** AUTO-GENERATED CLASS - DO NOT EDIT MANUALLY
-// ****** Run ReplicateTypedHashers or ./gradlew replicateTypedHashers to regenerate
-//
-// @formatter:off
-package io.deephaven.engine.table.impl.by.typed.incagg.gen;
-
-import static io.deephaven.util.compare.CharComparisons.eq;
-import static io.deephaven.util.compare.ShortComparisons.eq;
-
-import io.deephaven.chunk.CharChunk;
-import io.deephaven.chunk.Chunk;
-import io.deephaven.chunk.ShortChunk;
-import io.deephaven.chunk.attributes.Values;
-import io.deephaven.chunk.util.hashing.CharChunkHasher;
-import io.deephaven.chunk.util.hashing.ShortChunkHasher;
-import io.deephaven.engine.rowset.RowSequence;
-import io.deephaven.engine.table.ColumnSource;
-import io.deephaven.engine.table.impl.by.HashHandler;
-import io.deephaven.engine.table.impl.by.IncrementalChunkedOperatorAggregationStateManagerTypedBase;
-import io.deephaven.engine.table.impl.sources.CharacterArraySource;
-import io.deephaven.engine.table.impl.sources.ShortArraySource;
-import io.deephaven.util.QueryConstants;
-import io.deephaven.util.type.TypeUtils;
-import java.lang.Character;
-import java.lang.Object;
-import java.lang.Override;
-import java.lang.Short;
-
-final class IncrementalAggHasherCharShort extends IncrementalChunkedOperatorAggregationStateManagerTypedBase {
-    private final CharacterArraySource mainKeySource0;
-
-    private final CharacterArraySource overflowKeySource0;
-
-    private final ShortArraySource mainKeySource1;
-
-    private final ShortArraySource overflowKeySource1;
-
-    public IncrementalAggHasherCharShort(ColumnSource[] tableKeySources,
-            ColumnSource[] originalTableKeySources, int tableSize, double maximumLoadFactor,
-            double targetLoadFactor) {
-        super(tableKeySources, tableSize, maximumLoadFactor, targetLoadFactor);
-        this.mainKeySource0 = (CharacterArraySource) super.mainKeySources[0];
-        this.overflowKeySource0 = (CharacterArraySource) super.overflowKeySources[0];
-        this.mainKeySource1 = (ShortArraySource) super.mainKeySources[1];
-        this.overflowKeySource1 = (ShortArraySource) super.overflowKeySources[1];
-    }
-
-    @Override
-    protected void build(HashHandler handler, RowSequence rowSequence, Chunk[] sourceKeyChunks) {
-        final CharChunk<Values> keyChunk0 = sourceKeyChunks[0].asCharChunk();
-        final ShortChunk<Values> keyChunk1 = sourceKeyChunks[1].asShortChunk();
-        final int chunkSize = keyChunk0.size();
-        for (int chunkPosition = 0; chunkPosition < chunkSize; ++chunkPosition) {
-            final char k0 = keyChunk0.get(chunkPosition);
-            final short k1 = keyChunk1.get(chunkPosition);
-            final int hash = hash(k0, k1);
-            final int tableLocation = hashToTableLocation(tableHashPivot, hash);
-            if (mainOutputPosition.getUnsafe(tableLocation) == EMPTY_OUTPUT_POSITION) {
-                numEntries++;
-                mainKeySource0.set(tableLocation, k0);
-                mainKeySource1.set(tableLocation, k1);
-                handler.doMainInsert(tableLocation, chunkPosition);
-            } else if (eq(mainKeySource0.getUnsafe(tableLocation), k0) && eq(mainKeySource1.getUnsafe(tableLocation), k1)) {
-                handler.doMainFound(tableLocation, chunkPosition);
-            } else {
-                int overflowLocation = mainOverflowLocationSource.getUnsafe(tableLocation);
-                if (!findOverflow(handler, k0, k1, chunkPosition, overflowLocation)) {
-                    final int newOverflowLocation = allocateOverflowLocation();
-                    overflowKeySource0.set(newOverflowLocation, k0);
-                    overflowKeySource1.set(newOverflowLocation, k1);
-                    mainOverflowLocationSource.set(tableLocation, newOverflowLocation);
-                    overflowOverflowLocationSource.set(newOverflowLocation, overflowLocation);
-                    numEntries++;
-                    handler.doOverflowInsert(newOverflowLocation, chunkPosition);
-                }
-            }
-        }
-    }
-
-    @Override
-    protected void probe(HashHandler handler, RowSequence rowSequence, Chunk[] sourceKeyChunks) {
-        final CharChunk<Values> keyChunk0 = sourceKeyChunks[0].asCharChunk();
-        final ShortChunk<Values> keyChunk1 = sourceKeyChunks[1].asShortChunk();
-        final int chunkSize = keyChunk0.size();
-        for (int chunkPosition = 0; chunkPosition < chunkSize; ++chunkPosition) {
-            final char k0 = keyChunk0.get(chunkPosition);
-            final short k1 = keyChunk1.get(chunkPosition);
-            final int hash = hash(k0, k1);
-            final int tableLocation = hashToTableLocation(tableHashPivot, hash);
-            if (mainOutputPosition.getUnsafe(tableLocation) == EMPTY_OUTPUT_POSITION) {
-                handler.doMissing(chunkPosition);
-            } else if (eq(mainKeySource0.getUnsafe(tableLocation), k0) && eq(mainKeySource1.getUnsafe(tableLocation), k1)) {
-                handler.doMainFound(tableLocation, chunkPosition);
-            } else {
-                int overflowLocation = mainOverflowLocationSource.getUnsafe(tableLocation);
-                if (!findOverflow(handler, k0, k1, chunkPosition, overflowLocation)) {
-                    handler.doMissing(chunkPosition);
-                }
-            }
-        }
-    }
-
-    private static int hash(char k0, short k1) {
-        int hash = CharChunkHasher.hashInitialSingle(k0);
-        hash = ShortChunkHasher.hashUpdateSingle(hash, k1);
-        return hash;
-    }
-
-    @Override
-    protected void rehashBucket(HashHandler handler, int sourceBucket, int destBucket,
-            int bucketsToAdd) {
-        final int position = mainOutputPosition.getUnsafe(sourceBucket);
-        if (position == EMPTY_OUTPUT_POSITION) {
-            return;
-        }
-        int mainInsertLocation = maybeMoveMainBucket(handler, sourceBucket, destBucket, bucketsToAdd);
-        int overflowLocation = mainOverflowLocationSource.getUnsafe(sourceBucket);
-        mainOverflowLocationSource.set(sourceBucket, QueryConstants.NULL_INT);
-        mainOverflowLocationSource.set(destBucket, QueryConstants.NULL_INT);
-        while (overflowLocation != QueryConstants.NULL_INT) {
-            final int nextOverflowLocation = overflowOverflowLocationSource.getUnsafe(overflowLocation);
-            final char overflowKey0 = overflowKeySource0.getUnsafe(overflowLocation);
-            final short overflowKey1 = overflowKeySource1.getUnsafe(overflowLocation);
-            final int overflowHash = hash(overflowKey0, overflowKey1);
-            final int overflowTableLocation = hashToTableLocation(tableHashPivot + bucketsToAdd, overflowHash);
-            if (overflowTableLocation == mainInsertLocation) {
-                mainKeySource0.set(mainInsertLocation, overflowKey0);
-                mainKeySource1.set(mainInsertLocation, overflowKey1);
-                mainOutputPosition.set(mainInsertLocation, overflowOutputPosition.getUnsafe(overflowLocation));
-                handler.doPromoteOverflow(overflowLocation, mainInsertLocation);
-                overflowOutputPosition.set(overflowLocation, QueryConstants.NULL_INT);
-                overflowKeySource0.set(overflowLocation, QueryConstants.NULL_CHAR);
-                overflowKeySource1.set(overflowLocation, QueryConstants.NULL_SHORT);
-                freeOverflowLocation(overflowLocation);
-                mainInsertLocation = -1;
-            } else {
-                final int oldOverflowLocation = mainOverflowLocationSource.getUnsafe(overflowTableLocation);
-                mainOverflowLocationSource.set(overflowTableLocation, overflowLocation);
-                overflowOverflowLocationSource.set(overflowLocation, oldOverflowLocation);
-            }
-            overflowLocation = nextOverflowLocation;
-        }
-    }
-
-    private int maybeMoveMainBucket(HashHandler handler, int sourceBucket, int destBucket,
-            int bucketsToAdd) {
-        final char k0 = mainKeySource0.getUnsafe(sourceBucket);
-        final short k1 = mainKeySource1.getUnsafe(sourceBucket);
-        final int hash = hash(k0, k1);
-        final int location = hashToTableLocation(tableHashPivot + bucketsToAdd, hash);
-        final int mainInsertLocation;
-        if (location == sourceBucket) {
-            mainInsertLocation = destBucket;
-            mainOutputPosition.set(destBucket, EMPTY_OUTPUT_POSITION);
-        } else {
-            mainInsertLocation = sourceBucket;
-            mainOutputPosition.set(destBucket, mainOutputPosition.getUnsafe(sourceBucket));
-            mainOutputPosition.set(sourceBucket, EMPTY_OUTPUT_POSITION);
-            mainKeySource0.set(destBucket, k0);
-            mainKeySource0.set(sourceBucket, QueryConstants.NULL_CHAR);
-            mainKeySource1.set(destBucket, k1);
-            mainKeySource1.set(sourceBucket, QueryConstants.NULL_SHORT);
-            handler.doMoveMain(sourceBucket, destBucket);
-        }
-        return mainInsertLocation;
-    }
-
-    private boolean findOverflow(HashHandler handler, char k0, short k1, int chunkPosition,
-            int overflowLocation) {
-        while (overflowLocation != QueryConstants.NULL_INT) {
-            if (eq(overflowKeySource0.getUnsafe(overflowLocation), k0) && eq(overflowKeySource1.getUnsafe(overflowLocation), k1)) {
-                handler.doOverflowFound(overflowLocation, chunkPosition);
-                return true;
-            }
-            overflowLocation = overflowOverflowLocationSource.getUnsafe(overflowLocation);
-        }
-        return false;
-    }
-
-    @Override
-    public int findPositionForKey(Object key) {
-        final Object [] ka = (Object[])key;
-        final char k0 = TypeUtils.unbox((Character)ka[0]);
-        final short k1 = TypeUtils.unbox((Short)ka[1]);
-        int hash = hash(k0, k1);
-        final int tableLocation = hashToTableLocation(tableHashPivot, hash);
-        final int positionValue = mainOutputPosition.getUnsafe(tableLocation);
-        if (positionValue == EMPTY_OUTPUT_POSITION) {
-            return -1;
-        }
-        if (eq(mainKeySource0.getUnsafe(tableLocation), k0) && eq(mainKeySource1.getUnsafe(tableLocation), k1)) {
-            return positionValue;
-        }
-        int overflowLocation = mainOverflowLocationSource.getUnsafe(tableLocation);
-        while (overflowLocation != QueryConstants.NULL_INT) {
-            if (eq(overflowKeySource0.getUnsafe(overflowLocation), k0) && eq(overflowKeySource1.getUnsafe(overflowLocation), k1)) {
-                return overflowOutputPosition.getUnsafe(overflowLocation);
-            }
-            overflowLocation = overflowOverflowLocationSource.getUnsafe(overflowLocation);
-        }
-        return -1;
-    }
-}
diff --git a/engine/table/src/main/java/io/deephaven/engine/table/impl/by/typed/incagg/gen/IncrementalAggHasherDouble.java b/engine/table/src/main/java/io/deephaven/engine/table/impl/by/typed/incagg/gen/IncrementalAggHasherDouble.java
deleted file mode 100644
index 13182576c08..00000000000
--- a/engine/table/src/main/java/io/deephaven/engine/table/impl/by/typed/incagg/gen/IncrementalAggHasherDouble.java
+++ /dev/null
@@ -1,180 +0,0 @@
-//
-// Copyright (c) 2016-2024 Deephaven Data Labs and Patent Pending
-//
-// ****** AUTO-GENERATED CLASS - DO NOT EDIT MANUALLY
-// ****** Run ReplicateTypedHashers or ./gradlew replicateTypedHashers to regenerate
-//
-// @formatter:off
-package io.deephaven.engine.table.impl.by.typed.incagg.gen;
-
-import static io.deephaven.util.compare.DoubleComparisons.eq;
-
-import io.deephaven.chunk.Chunk;
-import io.deephaven.chunk.DoubleChunk;
-import io.deephaven.chunk.attributes.Values;
-import io.deephaven.chunk.util.hashing.DoubleChunkHasher;
-import io.deephaven.engine.rowset.RowSequence;
-import io.deephaven.engine.table.ColumnSource;
-import io.deephaven.engine.table.impl.by.HashHandler;
-import io.deephaven.engine.table.impl.by.IncrementalChunkedOperatorAggregationStateManagerTypedBase;
-import io.deephaven.engine.table.impl.sources.DoubleArraySource;
-import io.deephaven.util.QueryConstants;
-import io.deephaven.util.type.TypeUtils;
-import java.lang.Double;
-import java.lang.Object;
-import java.lang.Override;
-
-final class IncrementalAggHasherDouble extends IncrementalChunkedOperatorAggregationStateManagerTypedBase {
-    private final DoubleArraySource mainKeySource0;
-
-    private final DoubleArraySource overflowKeySource0;
-
-    public IncrementalAggHasherDouble(ColumnSource[] tableKeySources,
-            ColumnSource[] originalTableKeySources, int tableSize, double maximumLoadFactor,
-            double targetLoadFactor) {
-        super(tableKeySources, tableSize, maximumLoadFactor, targetLoadFactor);
-        this.mainKeySource0 = (DoubleArraySource) super.mainKeySources[0];
-        this.overflowKeySource0 = (DoubleArraySource) super.overflowKeySources[0];
-    }
-
-    @Override
-    protected void build(HashHandler handler, RowSequence rowSequence, Chunk[] sourceKeyChunks) {
-        final DoubleChunk<Values> keyChunk0 = sourceKeyChunks[0].asDoubleChunk();
-        final int chunkSize = keyChunk0.size();
-        for (int chunkPosition = 0; chunkPosition < chunkSize; ++chunkPosition) {
-            final double k0 = keyChunk0.get(chunkPosition);
-            final int hash = hash(k0);
-            final int tableLocation = hashToTableLocation(tableHashPivot, hash);
-            if (mainOutputPosition.getUnsafe(tableLocation) == EMPTY_OUTPUT_POSITION) {
-                numEntries++;
-                mainKeySource0.set(tableLocation, k0);
-                handler.doMainInsert(tableLocation, chunkPosition);
-            } else if (eq(mainKeySource0.getUnsafe(tableLocation), k0)) {
-                handler.doMainFound(tableLocation, chunkPosition);
-            } else {
-                int overflowLocation = mainOverflowLocationSource.getUnsafe(tableLocation);
-                if (!findOverflow(handler, k0, chunkPosition, overflowLocation)) {
-                    final int newOverflowLocation = allocateOverflowLocation();
-                    overflowKeySource0.set(newOverflowLocation, k0);
-                    mainOverflowLocationSource.set(tableLocation, newOverflowLocation);
-                    overflowOverflowLocationSource.set(newOverflowLocation, overflowLocation);
-                    numEntries++;
-                    handler.doOverflowInsert(newOverflowLocation, chunkPosition);
-                }
-            }
-        }
-    }
-
-    @Override
-    protected void probe(HashHandler handler, RowSequence rowSequence, Chunk[] sourceKeyChunks) {
-        final DoubleChunk<Values> keyChunk0 = sourceKeyChunks[0].asDoubleChunk();
-        final int chunkSize = keyChunk0.size();
-        for (int chunkPosition = 0; chunkPosition < chunkSize; ++chunkPosition) {
-            final double k0 = keyChunk0.get(chunkPosition);
-            final int hash = hash(k0);
-            final int tableLocation = hashToTableLocation(tableHashPivot, hash);
-            if (mainOutputPosition.getUnsafe(tableLocation) == EMPTY_OUTPUT_POSITION) {
-                handler.doMissing(chunkPosition);
-            } else if (eq(mainKeySource0.getUnsafe(tableLocation), k0)) {
-                handler.doMainFound(tableLocation, chunkPosition);
-            } else {
-                int overflowLocation = mainOverflowLocationSource.getUnsafe(tableLocation);
-                if (!findOverflow(handler, k0, chunkPosition, overflowLocation)) {
-                    handler.doMissing(chunkPosition);
-                }
-            }
-        }
-    }
-
-    private static int hash(double k0) {
-        int hash = DoubleChunkHasher.hashInitialSingle(k0);
-        return hash;
-    }
-
-    @Override
-    protected void rehashBucket(HashHandler handler, int sourceBucket, int destBucket,
-            int bucketsToAdd) {
-        final int position = mainOutputPosition.getUnsafe(sourceBucket);
-        if (position == EMPTY_OUTPUT_POSITION) {
-            return;
-        }
-        int mainInsertLocation = maybeMoveMainBucket(handler, sourceBucket, destBucket, bucketsToAdd);
-        int overflowLocation = mainOverflowLocationSource.getUnsafe(sourceBucket);
-        mainOverflowLocationSource.set(sourceBucket, QueryConstants.NULL_INT);
-        mainOverflowLocationSource.set(destBucket, QueryConstants.NULL_INT);
-        while (overflowLocation != QueryConstants.NULL_INT) {
-            final int nextOverflowLocation = overflowOverflowLocationSource.getUnsafe(overflowLocation);
-            final double overflowKey0 = overflowKeySource0.getUnsafe(overflowLocation);
-            final int overflowHash = hash(overflowKey0);
-            final int overflowTableLocation = hashToTableLocation(tableHashPivot + bucketsToAdd, overflowHash);
-            if (overflowTableLocation == mainInsertLocation) {
-                mainKeySource0.set(mainInsertLocation, overflowKey0);
-                mainOutputPosition.set(mainInsertLocation, overflowOutputPosition.getUnsafe(overflowLocation));
-                handler.doPromoteOverflow(overflowLocation, mainInsertLocation);
-                overflowOutputPosition.set(overflowLocation, QueryConstants.NULL_INT);
-                overflowKeySource0.set(overflowLocation, QueryConstants.NULL_DOUBLE);
-                freeOverflowLocation(overflowLocation);
-                mainInsertLocation = -1;
-            } else {
-                final int oldOverflowLocation = mainOverflowLocationSource.getUnsafe(overflowTableLocation);
-                mainOverflowLocationSource.set(overflowTableLocation, overflowLocation);
-                overflowOverflowLocationSource.set(overflowLocation, oldOverflowLocation);
-            }
-            overflowLocation = nextOverflowLocation;
-        }
-    }
-
-    private int maybeMoveMainBucket(HashHandler handler, int sourceBucket, int destBucket,
-            int bucketsToAdd) {
-        final double k0 = mainKeySource0.getUnsafe(sourceBucket);
-        final int hash = hash(k0);
-        final int location = hashToTableLocation(tableHashPivot + bucketsToAdd, hash);
-        final int mainInsertLocation;
-        if (location == sourceBucket) {
-            mainInsertLocation = destBucket;
-            mainOutputPosition.set(destBucket, EMPTY_OUTPUT_POSITION);
-        } else {
-            mainInsertLocation = sourceBucket;
-            mainOutputPosition.set(destBucket, mainOutputPosition.getUnsafe(sourceBucket));
-            mainOutputPosition.set(sourceBucket, EMPTY_OUTPUT_POSITION);
-            mainKeySource0.set(destBucket, k0);
-            mainKeySource0.set(sourceBucket, QueryConstants.NULL_DOUBLE);
-            handler.doMoveMain(sourceBucket, destBucket);
-        }
-        return mainInsertLocation;
-    }
-
-    private boolean findOverflow(HashHandler handler, double k0, int chunkPosition,
-            int overflowLocation) {
-        while (overflowLocation != QueryConstants.NULL_INT) {
-            if (eq(overflowKeySource0.getUnsafe(overflowLocation), k0)) {
-                handler.doOverflowFound(overflowLocation, chunkPosition);
-                return true;
-            }
-            overflowLocation = overflowOverflowLocationSource.getUnsafe(overflowLocation);
-        }
-        return false;
-    }
-
-    @Override
-    public int findPositionForKey(Object key) {
-        final double k0 = TypeUtils.unbox((Double)key);
-        int hash = hash(k0);
-        final int tableLocation = hashToTableLocation(tableHashPivot, hash);
-        final int positionValue = mainOutputPosition.getUnsafe(tableLocation);
-        if (positionValue == EMPTY_OUTPUT_POSITION) {
-            return -1;
-        }
-        if (eq(mainKeySource0.getUnsafe(tableLocation), k0)) {
-            return positionValue;
-        }
-        int overflowLocation = mainOverflowLocationSource.getUnsafe(tableLocation);
-        while (overflowLocation != QueryConstants.NULL_INT) {
-            if (eq(overflowKeySource0.getUnsafe(overflowLocation), k0)) {
-                return overflowOutputPosition.getUnsafe(overflowLocation);
-            }
-            overflowLocation = overflowOverflowLocationSource.getUnsafe(overflowLocation);
-        }
-        return -1;
-    }
-}
diff --git a/engine/table/src/main/java/io/deephaven/engine/table/impl/by/typed/incagg/gen/IncrementalAggHasherDoubleByte.java b/engine/table/src/main/java/io/deephaven/engine/table/impl/by/typed/incagg/gen/IncrementalAggHasherDoubleByte.java
deleted file mode 100644
index 864a051e897..00000000000
--- a/engine/table/src/main/java/io/deephaven/engine/table/impl/by/typed/incagg/gen/IncrementalAggHasherDoubleByte.java
+++ /dev/null
@@ -1,206 +0,0 @@
-//
-// Copyright (c) 2016-2024 Deephaven Data Labs and Patent Pending
-//
-// ****** AUTO-GENERATED CLASS - DO NOT EDIT MANUALLY
-// ****** Run ReplicateTypedHashers or ./gradlew replicateTypedHashers to regenerate
-//
-// @formatter:off
-package io.deephaven.engine.table.impl.by.typed.incagg.gen;
-
-import static io.deephaven.util.compare.ByteComparisons.eq;
-import static io.deephaven.util.compare.DoubleComparisons.eq;
-
-import io.deephaven.chunk.ByteChunk;
-import io.deephaven.chunk.Chunk;
-import io.deephaven.chunk.DoubleChunk;
-import io.deephaven.chunk.attributes.Values;
-import io.deephaven.chunk.util.hashing.ByteChunkHasher;
-import io.deephaven.chunk.util.hashing.DoubleChunkHasher;
-import io.deephaven.engine.rowset.RowSequence;
-import io.deephaven.engine.table.ColumnSource;
-import io.deephaven.engine.table.impl.by.HashHandler;
-import io.deephaven.engine.table.impl.by.IncrementalChunkedOperatorAggregationStateManagerTypedBase;
-import io.deephaven.engine.table.impl.sources.ByteArraySource;
-import io.deephaven.engine.table.impl.sources.DoubleArraySource;
-import io.deephaven.util.QueryConstants;
-import io.deephaven.util.type.TypeUtils;
-import java.lang.Byte;
-import java.lang.Double;
-import java.lang.Object;
-import java.lang.Override;
-
-final class IncrementalAggHasherDoubleByte extends IncrementalChunkedOperatorAggregationStateManagerTypedBase {
-    private final DoubleArraySource mainKeySource0;
-
-    private final DoubleArraySource overflowKeySource0;
-
-    private final ByteArraySource mainKeySource1;
-
-    private final ByteArraySource overflowKeySource1;
-
-    public IncrementalAggHasherDoubleByte(ColumnSource[] tableKeySources,
-            ColumnSource[] originalTableKeySources, int tableSize, double maximumLoadFactor,
-            double targetLoadFactor) {
-        super(tableKeySources, tableSize, maximumLoadFactor, targetLoadFactor);
-        this.mainKeySource0 = (DoubleArraySource) super.mainKeySources[0];
-        this.overflowKeySource0 = (DoubleArraySource) super.overflowKeySources[0];
-        this.mainKeySource1 = (ByteArraySource) super.mainKeySources[1];
-        this.overflowKeySource1 = (ByteArraySource) super.overflowKeySources[1];
-    }
-
-    @Override
-    protected void build(HashHandler handler, RowSequence rowSequence, Chunk[] sourceKeyChunks) {
-        final DoubleChunk<Values> keyChunk0 = sourceKeyChunks[0].asDoubleChunk();
-        final ByteChunk<Values> keyChunk1 = sourceKeyChunks[1].asByteChunk();
-        final int chunkSize = keyChunk0.size();
-        for (int chunkPosition = 0; chunkPosition < chunkSize; ++chunkPosition) {
-            final double k0 = keyChunk0.get(chunkPosition);
-            final byte k1 = keyChunk1.get(chunkPosition);
-            final int hash = hash(k0, k1);
-            final int tableLocation = hashToTableLocation(tableHashPivot, hash);
-            if (mainOutputPosition.getUnsafe(tableLocation) == EMPTY_OUTPUT_POSITION) {
-                numEntries++;
-                mainKeySource0.set(tableLocation, k0);
-                mainKeySource1.set(tableLocation, k1);
-                handler.doMainInsert(tableLocation, chunkPosition);
-            } else if (eq(mainKeySource0.getUnsafe(tableLocation), k0) && eq(mainKeySource1.getUnsafe(tableLocation), k1)) {
-                handler.doMainFound(tableLocation, chunkPosition);
-            } else {
-                int overflowLocation = mainOverflowLocationSource.getUnsafe(tableLocation);
-                if (!findOverflow(handler, k0, k1, chunkPosition, overflowLocation)) {
-                    final int newOverflowLocation = allocateOverflowLocation();
-                    overflowKeySource0.set(newOverflowLocation, k0);
-                    overflowKeySource1.set(newOverflowLocation, k1);
-                    mainOverflowLocationSource.set(tableLocation, newOverflowLocation);
-                    overflowOverflowLocationSource.set(newOverflowLocation, overflowLocation);
-                    numEntries++;
-                    handler.doOverflowInsert(newOverflowLocation, chunkPosition);
-                }
-            }
-        }
-    }
-
-    @Override
-    protected void probe(HashHandler handler, RowSequence rowSequence, Chunk[] sourceKeyChunks) {
-        final DoubleChunk<Values> keyChunk0 = sourceKeyChunks[0].asDoubleChunk();
-        final ByteChunk<Values> keyChunk1 = sourceKeyChunks[1].asByteChunk();
-        final int chunkSize = keyChunk0.size();
-        for (int chunkPosition = 0; chunkPosition < chunkSize; ++chunkPosition) {
-            final double k0 = keyChunk0.get(chunkPosition);
-            final byte k1 = keyChunk1.get(chunkPosition);
-            final int hash = hash(k0, k1);
-            final int tableLocation = hashToTableLocation(tableHashPivot, hash);
-            if (mainOutputPosition.getUnsafe(tableLocation) == EMPTY_OUTPUT_POSITION) {
-                handler.doMissing(chunkPosition);
-            } else if (eq(mainKeySource0.getUnsafe(tableLocation), k0) && eq(mainKeySource1.getUnsafe(tableLocation), k1)) {
-                handler.doMainFound(tableLocation, chunkPosition);
-            } else {
-                int overflowLocation = mainOverflowLocationSource.getUnsafe(tableLocation);
-                if (!findOverflow(handler, k0, k1, chunkPosition, overflowLocation)) {
-                    handler.doMissing(chunkPosition);
-                }
-            }
-        }
-    }
-
-    private static int hash(double k0, byte k1) {
-        int hash = DoubleChunkHasher.hashInitialSingle(k0);
-        hash = ByteChunkHasher.hashUpdateSingle(hash, k1);
-        return hash;
-    }
-
-    @Override
-    protected void rehashBucket(HashHandler handler, int sourceBucket, int destBucket,
-            int bucketsToAdd) {
-        final int position = mainOutputPosition.getUnsafe(sourceBucket);
-        if (position == EMPTY_OUTPUT_POSITION) {
-            return;
-        }
-        int mainInsertLocation = maybeMoveMainBucket(handler, sourceBucket, destBucket, bucketsToAdd);
-        int overflowLocation = mainOverflowLocationSource.getUnsafe(sourceBucket);
-        mainOverflowLocationSource.set(sourceBucket, QueryConstants.NULL_INT);
-        mainOverflowLocationSource.set(destBucket, QueryConstants.NULL_INT);
-        while (overflowLocation != QueryConstants.NULL_INT) {
-            final int nextOverflowLocation = overflowOverflowLocationSource.getUnsafe(overflowLocation);
-            final double overflowKey0 = overflowKeySource0.getUnsafe(overflowLocation);
-            final byte overflowKey1 = overflowKeySource1.getUnsafe(overflowLocation);
-            final int overflowHash = hash(overflowKey0, overflowKey1);
-            final int overflowTableLocation = hashToTableLocation(tableHashPivot + bucketsToAdd, overflowHash);
-            if (overflowTableLocation == mainInsertLocation) {
-                mainKeySource0.set(mainInsertLocation, overflowKey0);
-                mainKeySource1.set(mainInsertLocation, overflowKey1);
-                mainOutputPosition.set(mainInsertLocation, overflowOutputPosition.getUnsafe(overflowLocation));
-                handler.doPromoteOverflow(overflowLocation, mainInsertLocation);
-                overflowOutputPosition.set(overflowLocation, QueryConstants.NULL_INT);
-                overflowKeySource0.set(overflowLocation, QueryConstants.NULL_DOUBLE);
-                overflowKeySource1.set(overflowLocation, QueryConstants.NULL_BYTE);
-                freeOverflowLocation(overflowLocation);
-                mainInsertLocation = -1;
-            } else {
-                final int oldOverflowLocation = mainOverflowLocationSource.getUnsafe(overflowTableLocation);
-                mainOverflowLocationSource.set(overflowTableLocation, overflowLocation);
-                overflowOverflowLocationSource.set(overflowLocation, oldOverflowLocation);
-            }
-            overflowLocation = nextOverflowLocation;
-        }
-    }
-
-    private int maybeMoveMainBucket(HashHandler handler, int sourceBucket, int destBucket,
-            int bucketsToAdd) {
-        final double k0 = mainKeySource0.getUnsafe(sourceBucket);
-        final byte k1 = mainKeySource1.getUnsafe(sourceBucket);
-        final int hash = hash(k0, k1);
-        final int location = hashToTableLocation(tableHashPivot + bucketsToAdd, hash);
-        final int mainInsertLocation;
-        if (location == sourceBucket) {
-            mainInsertLocation = destBucket;
-            mainOutputPosition.set(destBucket, EMPTY_OUTPUT_POSITION);
-        } else {
-            mainInsertLocation = sourceBucket;
-            mainOutputPosition.set(destBucket, mainOutputPosition.getUnsafe(sourceBucket));
-            mainOutputPosition.set(sourceBucket, EMPTY_OUTPUT_POSITION);
-            mainKeySource0.set(destBucket, k0);
-            mainKeySource0.set(sourceBucket, QueryConstants.NULL_DOUBLE);
-            mainKeySource1.set(destBucket, k1);
-            mainKeySource1.set(sourceBucket, QueryConstants.NULL_BYTE);
-            handler.doMoveMain(sourceBucket, destBucket);
-        }
-        return mainInsertLocation;
-    }
-
-    private boolean findOverflow(HashHandler handler, double k0, byte k1, int chunkPosition,
-            int overflowLocation) {
-        while (overflowLocation != QueryConstants.NULL_INT) {
-            if (eq(overflowKeySource0.getUnsafe(overflowLocation), k0) && eq(overflowKeySource1.getUnsafe(overflowLocation), k1)) {
-                handler.doOverflowFound(overflowLocation, chunkPosition);
-                return true;
-            }
-            overflowLocation = overflowOverflowLocationSource.getUnsafe(overflowLocation);
-        }
-        return false;
-    }
-
-    @Override
-    public int findPositionForKey(Object key) {
-        final Object [] ka = (Object[])key;
-        final double k0 = TypeUtils.unbox((Double)ka[0]);
-        final byte k1 = TypeUtils.unbox((Byte)ka[1]);
-        int hash = hash(k0, k1);
-        final int tableLocation = hashToTableLocation(tableHashPivot, hash);
-        final int positionValue = mainOutputPosition.getUnsafe(tableLocation);
-        if (positionValue == EMPTY_OUTPUT_POSITION) {
-            return -1;
-        }
-        if (eq(mainKeySource0.getUnsafe(tableLocation), k0) && eq(mainKeySource1.getUnsafe(tableLocation), k1)) {
-            return positionValue;
-        }
-        int overflowLocation = mainOverflowLocationSource.getUnsafe(tableLocation);
-        while (overflowLocation != QueryConstants.NULL_INT) {
-            if (eq(overflowKeySource0.getUnsafe(overflowLocation), k0) && eq(overflowKeySource1.getUnsafe(overflowLocation), k1)) {
-                return overflowOutputPosition.getUnsafe(overflowLocation);
-            }
-            overflowLocation = overflowOverflowLocationSource.getUnsafe(overflowLocation);
-        }
-        return -1;
-    }
-}
diff --git a/engine/table/src/main/java/io/deephaven/engine/table/impl/by/typed/incagg/gen/IncrementalAggHasherDoubleChar.java b/engine/table/src/main/java/io/deephaven/engine/table/impl/by/typed/incagg/gen/IncrementalAggHasherDoubleChar.java
deleted file mode 100644
index 09ecdbe0852..00000000000
--- a/engine/table/src/main/java/io/deephaven/engine/table/impl/by/typed/incagg/gen/IncrementalAggHasherDoubleChar.java
+++ /dev/null
@@ -1,206 +0,0 @@
-//
-// Copyright (c) 2016-2024 Deephaven Data Labs and Patent Pending
-//
-// ****** AUTO-GENERATED CLASS - DO NOT EDIT MANUALLY
-// ****** Run ReplicateTypedHashers or ./gradlew replicateTypedHashers to regenerate
-//
-// @formatter:off
-package io.deephaven.engine.table.impl.by.typed.incagg.gen;
-
-import static io.deephaven.util.compare.CharComparisons.eq;
-import static io.deephaven.util.compare.DoubleComparisons.eq;
-
-import io.deephaven.chunk.CharChunk;
-import io.deephaven.chunk.Chunk;
-import io.deephaven.chunk.DoubleChunk;
-import io.deephaven.chunk.attributes.Values;
-import io.deephaven.chunk.util.hashing.CharChunkHasher;
-import io.deephaven.chunk.util.hashing.DoubleChunkHasher;
-import io.deephaven.engine.rowset.RowSequence;
-import io.deephaven.engine.table.ColumnSource;
-import io.deephaven.engine.table.impl.by.HashHandler;
-import io.deephaven.engine.table.impl.by.IncrementalChunkedOperatorAggregationStateManagerTypedBase;
-import io.deephaven.engine.table.impl.sources.CharacterArraySource;
-import io.deephaven.engine.table.impl.sources.DoubleArraySource;
-import io.deephaven.util.QueryConstants;
-import io.deephaven.util.type.TypeUtils;
-import java.lang.Character;
-import java.lang.Double;
-import java.lang.Object;
-import java.lang.Override;
-
-final class IncrementalAggHasherDoubleChar extends IncrementalChunkedOperatorAggregationStateManagerTypedBase {
-    private final DoubleArraySource mainKeySource0;
-
-    private final DoubleArraySource overflowKeySource0;
-
-    private final CharacterArraySource mainKeySource1;
-
-    private final CharacterArraySource overflowKeySource1;
-
-    public IncrementalAggHasherDoubleChar(ColumnSource[] tableKeySources,
-            ColumnSource[] originalTableKeySources, int tableSize, double maximumLoadFactor,
-            double targetLoadFactor) {
-        super(tableKeySources, tableSize, maximumLoadFactor, targetLoadFactor);
-        this.mainKeySource0 = (DoubleArraySource) super.mainKeySources[0];
-        this.overflowKeySource0 = (DoubleArraySource) super.overflowKeySources[0];
-        this.mainKeySource1 = (CharacterArraySource) super.mainKeySources[1];
-        this.overflowKeySource1 = (CharacterArraySource) super.overflowKeySources[1];
-    }
-
-    @Override
-    protected void build(HashHandler handler, RowSequence rowSequence, Chunk[] sourceKeyChunks) {
-        final DoubleChunk<Values> keyChunk0 = sourceKeyChunks[0].asDoubleChunk();
-        final CharChunk<Values> keyChunk1 = sourceKeyChunks[1].asCharChunk();
-        final int chunkSize = keyChunk0.size();
-        for (int chunkPosition = 0; chunkPosition < chunkSize; ++chunkPosition) {
-            final double k0 = keyChunk0.get(chunkPosition);
-            final char k1 = keyChunk1.get(chunkPosition);
-            final int hash = hash(k0, k1);
-            final int tableLocation = hashToTableLocation(tableHashPivot, hash);
-            if (mainOutputPosition.getUnsafe(tableLocation) == EMPTY_OUTPUT_POSITION) {
-                numEntries++;
-                mainKeySource0.set(tableLocation, k0);
-                mainKeySource1.set(tableLocation, k1);
-                handler.doMainInsert(tableLocation, chunkPosition);
-            } else if (eq(mainKeySource0.getUnsafe(tableLocation), k0) && eq(mainKeySource1.getUnsafe(tableLocation), k1)) {
-                handler.doMainFound(tableLocation, chunkPosition);
-            } else {
-                int overflowLocation = mainOverflowLocationSource.getUnsafe(tableLocation);
-                if (!findOverflow(handler, k0, k1, chunkPosition, overflowLocation)) {
-                    final int newOverflowLocation = allocateOverflowLocation();
-                    overflowKeySource0.set(newOverflowLocation, k0);
-                    overflowKeySource1.set(newOverflowLocation, k1);
-                    mainOverflowLocationSource.set(tableLocation, newOverflowLocation);
-                    overflowOverflowLocationSource.set(newOverflowLocation, overflowLocation);
-                    numEntries++;
-                    handler.doOverflowInsert(newOverflowLocation, chunkPosition);
-                }
-            }
-        }
-    }
-
-    @Override
-    protected void probe(HashHandler handler, RowSequence rowSequence, Chunk[] sourceKeyChunks) {
-        final DoubleChunk<Values> keyChunk0 = sourceKeyChunks[0].asDoubleChunk();
-        final CharChunk<Values> keyChunk1 = sourceKeyChunks[1].asCharChunk();
-        final int chunkSize = keyChunk0.size();
-        for (int chunkPosition = 0; chunkPosition < chunkSize; ++chunkPosition) {
-            final double k0 = keyChunk0.get(chunkPosition);
-            final char k1 = keyChunk1.get(chunkPosition);
-            final int hash = hash(k0, k1);
-            final int tableLocation = hashToTableLocation(tableHashPivot, hash);
-            if (mainOutputPosition.getUnsafe(tableLocation) == EMPTY_OUTPUT_POSITION) {
-                handler.doMissing(chunkPosition);
-            } else if (eq(mainKeySource0.getUnsafe(tableLocation), k0) && eq(mainKeySource1.getUnsafe(tableLocation), k1)) {
-                handler.doMainFound(tableLocation, chunkPosition);
-            } else {
-                int overflowLocation = mainOverflowLocationSource.getUnsafe(tableLocation);
-                if (!findOverflow(handler, k0, k1, chunkPosition, overflowLocation)) {
-                    handler.doMissing(chunkPosition);
-                }
-            }
-        }
-    }
-
-    private static int hash(double k0, char k1) {
-        int hash = DoubleChunkHasher.hashInitialSingle(k0);
-        hash = CharChunkHasher.hashUpdateSingle(hash, k1);
-        return hash;
-    }
-
-    @Override
-    protected void rehashBucket(HashHandler handler, int sourceBucket, int destBucket,
-            int bucketsToAdd) {
-        final int position = mainOutputPosition.getUnsafe(sourceBucket);
-        if (position == EMPTY_OUTPUT_POSITION) {
-            return;
-        }
-        int mainInsertLocation = maybeMoveMainBucket(handler, sourceBucket, destBucket, bucketsToAdd);
-        int overflowLocation = mainOverflowLocationSource.getUnsafe(sourceBucket);
-        mainOverflowLocationSource.set(sourceBucket, QueryConstants.NULL_INT);
-        mainOverflowLocationSource.set(destBucket, QueryConstants.NULL_INT);
-        while (overflowLocation != QueryConstants.NULL_INT) {
-            final int nextOverflowLocation = overflowOverflowLocationSource.getUnsafe(overflowLocation);
-            final double overflowKey0 = overflowKeySource0.getUnsafe(overflowLocation);
-            final char overflowKey1 = overflowKeySource1.getUnsafe(overflowLocation);
-            final int overflowHash = hash(overflowKey0, overflowKey1);
-            final int overflowTableLocation = hashToTableLocation(tableHashPivot + bucketsToAdd, overflowHash);
-            if (overflowTableLocation == mainInsertLocation) {
-                mainKeySource0.set(mainInsertLocation, overflowKey0);
-                mainKeySource1.set(mainInsertLocation, overflowKey1);
-                mainOutputPosition.set(mainInsertLocation, overflowOutputPosition.getUnsafe(overflowLocation));
-                handler.doPromoteOverflow(overflowLocation, mainInsertLocation);
-                overflowOutputPosition.set(overflowLocation, QueryConstants.NULL_INT);
-                overflowKeySource0.set(overflowLocation, QueryConstants.NULL_DOUBLE);
-                overflowKeySource1.set(overflowLocation, QueryConstants.NULL_CHAR);
-                freeOverflowLocation(overflowLocation);
-                mainInsertLocation = -1;
-            } else {
-                final int oldOverflowLocation = mainOverflowLocationSource.getUnsafe(overflowTableLocation);
-                mainOverflowLocationSource.set(overflowTableLocation, overflowLocation);
-                overflowOverflowLocationSource.set(overflowLocation, oldOverflowLocation);
-            }
-            overflowLocation = nextOverflowLocation;
-        }
-    }
-
-    private int maybeMoveMainBucket(HashHandler handler, int sourceBucket, int destBucket,
-            int bucketsToAdd) {
-        final double k0 = mainKeySource0.getUnsafe(sourceBucket);
-        final char k1 = mainKeySource1.getUnsafe(sourceBucket);
-        final int hash = hash(k0, k1);
-        final int location = hashToTableLocation(tableHashPivot + bucketsToAdd, hash);
-        final int mainInsertLocation;
-        if (location == sourceBucket) {
-            mainInsertLocation = destBucket;
-            mainOutputPosition.set(destBucket, EMPTY_OUTPUT_POSITION);
-        } else {
-            mainInsertLocation = sourceBucket;
-            mainOutputPosition.set(destBucket, mainOutputPosition.getUnsafe(sourceBucket));
-            mainOutputPosition.set(sourceBucket, EMPTY_OUTPUT_POSITION);
-            mainKeySource0.set(destBucket, k0);
-            mainKeySource0.set(sourceBucket, QueryConstants.NULL_DOUBLE);
-            mainKeySource1.set(destBucket, k1);
-            mainKeySource1.set(sourceBucket, QueryConstants.NULL_CHAR);
-            handler.doMoveMain(sourceBucket, destBucket);
-        }
-        return mainInsertLocation;
-    }
-
-    private boolean findOverflow(HashHandler handler, double k0, char k1, int chunkPosition,
-            int overflowLocation) {
-        while (overflowLocation != QueryConstants.NULL_INT) {
-            if (eq(overflowKeySource0.getUnsafe(overflowLocation), k0) && eq(overflowKeySource1.getUnsafe(overflowLocation), k1)) {
-                handler.doOverflowFound(overflowLocation, chunkPosition);
-                return true;
-            }
-            overflowLocation = overflowOverflowLocationSource.getUnsafe(overflowLocation);
-        }
-        return false;
-    }
-
-    @Override
-    public int findPositionForKey(Object key) {
-        final Object [] ka = (Object[])key;
-        final double k0 = TypeUtils.unbox((Double)ka[0]);
-        final char k1 = TypeUtils.unbox((Character)ka[1]);
-        int hash = hash(k0, k1);
-        final int tableLocation = hashToTableLocation(tableHashPivot, hash);
-        final int positionValue = mainOutputPosition.getUnsafe(tableLocation);
-        if (positionValue == EMPTY_OUTPUT_POSITION) {
-            return -1;
-        }
-        if (eq(mainKeySource0.getUnsafe(tableLocation), k0) && eq(mainKeySource1.getUnsafe(tableLocation), k1)) {
-            return positionValue;
-        }
-        int overflowLocation = mainOverflowLocationSource.getUnsafe(tableLocation);
-        while (overflowLocation != QueryConstants.NULL_INT) {
-            if (eq(overflowKeySource0.getUnsafe(overflowLocation), k0) && eq(overflowKeySource1.getUnsafe(overflowLocation), k1)) {
-                return overflowOutputPosition.getUnsafe(overflowLocation);
-            }
-            overflowLocation = overflowOverflowLocationSource.getUnsafe(overflowLocation);
-        }
-        return -1;
-    }
-}
diff --git a/engine/table/src/main/java/io/deephaven/engine/table/impl/by/typed/incagg/gen/IncrementalAggHasherDoubleDouble.java b/engine/table/src/main/java/io/deephaven/engine/table/impl/by/typed/incagg/gen/IncrementalAggHasherDoubleDouble.java
deleted file mode 100644
index d85aa05899a..00000000000
--- a/engine/table/src/main/java/io/deephaven/engine/table/impl/by/typed/incagg/gen/IncrementalAggHasherDoubleDouble.java
+++ /dev/null
@@ -1,201 +0,0 @@
-//
-// Copyright (c) 2016-2024 Deephaven Data Labs and Patent Pending
-//
-// ****** AUTO-GENERATED CLASS - DO NOT EDIT MANUALLY
-// ****** Run ReplicateTypedHashers or ./gradlew replicateTypedHashers to regenerate
-//
-// @formatter:off
-package io.deephaven.engine.table.impl.by.typed.incagg.gen;
-
-import static io.deephaven.util.compare.DoubleComparisons.eq;
-
-import io.deephaven.chunk.Chunk;
-import io.deephaven.chunk.DoubleChunk;
-import io.deephaven.chunk.attributes.Values;
-import io.deephaven.chunk.util.hashing.DoubleChunkHasher;
-import io.deephaven.engine.rowset.RowSequence;
-import io.deephaven.engine.table.ColumnSource;
-import io.deephaven.engine.table.impl.by.HashHandler;
-import io.deephaven.engine.table.impl.by.IncrementalChunkedOperatorAggregationStateManagerTypedBase;
-import io.deephaven.engine.table.impl.sources.DoubleArraySource;
-import io.deephaven.util.QueryConstants;
-import io.deephaven.util.type.TypeUtils;
-import java.lang.Double;
-import java.lang.Object;
-import java.lang.Override;
-
-final class IncrementalAggHasherDoubleDouble extends IncrementalChunkedOperatorAggregationStateManagerTypedBase {
-    private final DoubleArraySource mainKeySource0;
-
-    private final DoubleArraySource overflowKeySource0;
-
-    private final DoubleArraySource mainKeySource1;
-
-    private final DoubleArraySource overflowKeySource1;
-
-    public IncrementalAggHasherDoubleDouble(ColumnSource[] tableKeySources,
-            ColumnSource[] originalTableKeySources, int tableSize, double maximumLoadFactor,
-            double targetLoadFactor) {
-        super(tableKeySources, tableSize, maximumLoadFactor, targetLoadFactor);
-        this.mainKeySource0 = (DoubleArraySource) super.mainKeySources[0];
-        this.overflowKeySource0 = (DoubleArraySource) super.overflowKeySources[0];
-        this.mainKeySource1 = (DoubleArraySource) super.mainKeySources[1];
-        this.overflowKeySource1 = (DoubleArraySource) super.overflowKeySources[1];
-    }
-
-    @Override
-    protected void build(HashHandler handler, RowSequence rowSequence, Chunk[] sourceKeyChunks) {
-        final DoubleChunk<Values> keyChunk0 = sourceKeyChunks[0].asDoubleChunk();
-        final DoubleChunk<Values> keyChunk1 = sourceKeyChunks[1].asDoubleChunk();
-        final int chunkSize = keyChunk0.size();
-        for (int chunkPosition = 0; chunkPosition < chunkSize; ++chunkPosition) {
-            final double k0 = keyChunk0.get(chunkPosition);
-            final double k1 = keyChunk1.get(chunkPosition);
-            final int hash = hash(k0, k1);
-            final int tableLocation = hashToTableLocation(tableHashPivot, hash);
-            if (mainOutputPosition.getUnsafe(tableLocation) == EMPTY_OUTPUT_POSITION) {
-                numEntries++;
-                mainKeySource0.set(tableLocation, k0);
-                mainKeySource1.set(tableLocation, k1);
-                handler.doMainInsert(tableLocation, chunkPosition);
-            } else if (eq(mainKeySource0.getUnsafe(tableLocation), k0) && eq(mainKeySource1.getUnsafe(tableLocation), k1)) {
-                handler.doMainFound(tableLocation, chunkPosition);
-            } else {
-                int overflowLocation = mainOverflowLocationSource.getUnsafe(tableLocation);
-                if (!findOverflow(handler, k0, k1, chunkPosition, overflowLocation)) {
-                    final int newOverflowLocation = allocateOverflowLocation();
-                    overflowKeySource0.set(newOverflowLocation, k0);
-                    overflowKeySource1.set(newOverflowLocation, k1);
-                    mainOverflowLocationSource.set(tableLocation, newOverflowLocation);
-                    overflowOverflowLocationSource.set(newOverflowLocation, overflowLocation);
-                    numEntries++;
-                    handler.doOverflowInsert(newOverflowLocation, chunkPosition);
-                }
-            }
-        }
-    }
-
-    @Override
-    protected void probe(HashHandler handler, RowSequence rowSequence, Chunk[] sourceKeyChunks) {
-        final DoubleChunk<Values> keyChunk0 = sourceKeyChunks[0].asDoubleChunk();
-        final DoubleChunk<Values> keyChunk1 = sourceKeyChunks[1].asDoubleChunk();
-        final int chunkSize = keyChunk0.size();
-        for (int chunkPosition = 0; chunkPosition < chunkSize; ++chunkPosition) {
-            final double k0 = keyChunk0.get(chunkPosition);
-            final double k1 = keyChunk1.get(chunkPosition);
-            final int hash = hash(k0, k1);
-            final int tableLocation = hashToTableLocation(tableHashPivot, hash);
-            if (mainOutputPosition.getUnsafe(tableLocation) == EMPTY_OUTPUT_POSITION) {
-                handler.doMissing(chunkPosition);
-            } else if (eq(mainKeySource0.getUnsafe(tableLocation), k0) && eq(mainKeySource1.getUnsafe(tableLocation), k1)) {
-                handler.doMainFound(tableLocation, chunkPosition);
-            } else {
-                int overflowLocation = mainOverflowLocationSource.getUnsafe(tableLocation);
-                if (!findOverflow(handler, k0, k1, chunkPosition, overflowLocation)) {
-                    handler.doMissing(chunkPosition);
-                }
-            }
-        }
-    }
-
-    private static int hash(double k0, double k1) {
-        int hash = DoubleChunkHasher.hashInitialSingle(k0);
-        hash = DoubleChunkHasher.hashUpdateSingle(hash, k1);
-        return hash;
-    }
-
-    @Override
-    protected void rehashBucket(HashHandler handler, int sourceBucket, int destBucket,
-            int bucketsToAdd) {
-        final int position = mainOutputPosition.getUnsafe(sourceBucket);
-        if (position == EMPTY_OUTPUT_POSITION) {
-            return;
-        }
-        int mainInsertLocation = maybeMoveMainBucket(handler, sourceBucket, destBucket, bucketsToAdd);
-        int overflowLocation = mainOverflowLocationSource.getUnsafe(sourceBucket);
-        mainOverflowLocationSource.set(sourceBucket, QueryConstants.NULL_INT);
-        mainOverflowLocationSource.set(destBucket, QueryConstants.NULL_INT);
-        while (overflowLocation != QueryConstants.NULL_INT) {
-            final int nextOverflowLocation = overflowOverflowLocationSource.getUnsafe(overflowLocation);
-            final double overflowKey0 = overflowKeySource0.getUnsafe(overflowLocation);
-            final double overflowKey1 = overflowKeySource1.getUnsafe(overflowLocation);
-            final int overflowHash = hash(overflowKey0, overflowKey1);
-            final int overflowTableLocation = hashToTableLocation(tableHashPivot + bucketsToAdd, overflowHash);
-            if (overflowTableLocation == mainInsertLocation) {
-                mainKeySource0.set(mainInsertLocation, overflowKey0);
-                mainKeySource1.set(mainInsertLocation, overflowKey1);
-                mainOutputPosition.set(mainInsertLocation, overflowOutputPosition.getUnsafe(overflowLocation));
-                handler.doPromoteOverflow(overflowLocation, mainInsertLocation);
-                overflowOutputPosition.set(overflowLocation, QueryConstants.NULL_INT);
-                overflowKeySource0.set(overflowLocation, QueryConstants.NULL_DOUBLE);
-                overflowKeySource1.set(overflowLocation, QueryConstants.NULL_DOUBLE);
-                freeOverflowLocation(overflowLocation);
-                mainInsertLocation = -1;
-            } else {
-                final int oldOverflowLocation = mainOverflowLocationSource.getUnsafe(overflowTableLocation);
-                mainOverflowLocationSource.set(overflowTableLocation, overflowLocation);
-                overflowOverflowLocationSource.set(overflowLocation, oldOverflowLocation);
-            }
-            overflowLocation = nextOverflowLocation;
-        }
-    }
-
-    private int maybeMoveMainBucket(HashHandler handler, int sourceBucket, int destBucket,
-            int bucketsToAdd) {
-        final double k0 = mainKeySource0.getUnsafe(sourceBucket);
-        final double k1 = mainKeySource1.getUnsafe(sourceBucket);
-        final int hash = hash(k0, k1);
-        final int location = hashToTableLocation(tableHashPivot + bucketsToAdd, hash);
-        final int mainInsertLocation;
-        if (location == sourceBucket) {
-            mainInsertLocation = destBucket;
-            mainOutputPosition.set(destBucket, EMPTY_OUTPUT_POSITION);
-        } else {
-            mainInsertLocation = sourceBucket;
-            mainOutputPosition.set(destBucket, mainOutputPosition.getUnsafe(sourceBucket));
-            mainOutputPosition.set(sourceBucket, EMPTY_OUTPUT_POSITION);
-            mainKeySource0.set(destBucket, k0);
-            mainKeySource0.set(sourceBucket, QueryConstants.NULL_DOUBLE);
-            mainKeySource1.set(destBucket, k1);
-            mainKeySource1.set(sourceBucket, QueryConstants.NULL_DOUBLE);
-            handler.doMoveMain(sourceBucket, destBucket);
-        }
-        return mainInsertLocation;
-    }
-
-    private boolean findOverflow(HashHandler handler, double k0, double k1, int chunkPosition,
-            int overflowLocation) {
-        while (overflowLocation != QueryConstants.NULL_INT) {
-            if (eq(overflowKeySource0.getUnsafe(overflowLocation), k0) && eq(overflowKeySource1.getUnsafe(overflowLocation), k1)) {
-                handler.doOverflowFound(overflowLocation, chunkPosition);
-                return true;
-            }
-            overflowLocation = overflowOverflowLocationSource.getUnsafe(overflowLocation);
-        }
-        return false;
-    }
-
-    @Override
-    public int findPositionForKey(Object key) {
-        final Object [] ka = (Object[])key;
-        final double k0 = TypeUtils.unbox((Double)ka[0]);
-        final double k1 = TypeUtils.unbox((Double)ka[1]);
-        int hash = hash(k0, k1);
-        final int tableLocation = hashToTableLocation(tableHashPivot, hash);
-        final int positionValue = mainOutputPosition.getUnsafe(tableLocation);
-        if (positionValue == EMPTY_OUTPUT_POSITION) {
-            return -1;
-        }
-        if (eq(mainKeySource0.getUnsafe(tableLocation), k0) && eq(mainKeySource1.getUnsafe(tableLocation), k1)) {
-            return positionValue;
-        }
-        int overflowLocation = mainOverflowLocationSource.getUnsafe(tableLocation);
-        while (overflowLocation != QueryConstants.NULL_INT) {
-            if (eq(overflowKeySource0.getUnsafe(overflowLocation), k0) && eq(overflowKeySource1.getUnsafe(overflowLocation), k1)) {
-                return overflowOutputPosition.getUnsafe(overflowLocation);
-            }
-            overflowLocation = overflowOverflowLocationSource.getUnsafe(overflowLocation);
-        }
-        return -1;
-    }
-}
diff --git a/engine/table/src/main/java/io/deephaven/engine/table/impl/by/typed/incagg/gen/IncrementalAggHasherDoubleFloat.java b/engine/table/src/main/java/io/deephaven/engine/table/impl/by/typed/incagg/gen/IncrementalAggHasherDoubleFloat.java
deleted file mode 100644
index 7521ef8bbff..00000000000
--- a/engine/table/src/main/java/io/deephaven/engine/table/impl/by/typed/incagg/gen/IncrementalAggHasherDoubleFloat.java
+++ /dev/null
@@ -1,206 +0,0 @@
-//
-// Copyright (c) 2016-2024 Deephaven Data Labs and Patent Pending
-//
-// ****** AUTO-GENERATED CLASS - DO NOT EDIT MANUALLY
-// ****** Run ReplicateTypedHashers or ./gradlew replicateTypedHashers to regenerate
-//
-// @formatter:off
-package io.deephaven.engine.table.impl.by.typed.incagg.gen;
-
-import static io.deephaven.util.compare.DoubleComparisons.eq;
-import static io.deephaven.util.compare.FloatComparisons.eq;
-
-import io.deephaven.chunk.Chunk;
-import io.deephaven.chunk.DoubleChunk;
-import io.deephaven.chunk.FloatChunk;
-import io.deephaven.chunk.attributes.Values;
-import io.deephaven.chunk.util.hashing.DoubleChunkHasher;
-import io.deephaven.chunk.util.hashing.FloatChunkHasher;
-import io.deephaven.engine.rowset.RowSequence;
-import io.deephaven.engine.table.ColumnSource;
-import io.deephaven.engine.table.impl.by.HashHandler;
-import io.deephaven.engine.table.impl.by.IncrementalChunkedOperatorAggregationStateManagerTypedBase;
-import io.deephaven.engine.table.impl.sources.DoubleArraySource;
-import io.deephaven.engine.table.impl.sources.FloatArraySource;
-import io.deephaven.util.QueryConstants;
-import io.deephaven.util.type.TypeUtils;
-import java.lang.Double;
-import java.lang.Float;
-import java.lang.Object;
-import java.lang.Override;
-
-final class IncrementalAggHasherDoubleFloat extends IncrementalChunkedOperatorAggregationStateManagerTypedBase {
-    private final DoubleArraySource mainKeySource0;
-
-    private final DoubleArraySource overflowKeySource0;
-
-    private final FloatArraySource mainKeySource1;
-
-    private final FloatArraySource overflowKeySource1;
-
-    public IncrementalAggHasherDoubleFloat(ColumnSource[] tableKeySources,
-            ColumnSource[] originalTableKeySources, int tableSize, double maximumLoadFactor,
-            double targetLoadFactor) {
-        super(tableKeySources, tableSize, maximumLoadFactor, targetLoadFactor);
-        this.mainKeySource0 = (DoubleArraySource) super.mainKeySources[0];
-        this.overflowKeySource0 = (DoubleArraySource) super.overflowKeySources[0];
-        this.mainKeySource1 = (FloatArraySource) super.mainKeySources[1];
-        this.overflowKeySource1 = (FloatArraySource) super.overflowKeySources[1];
-    }
-
-    @Override
-    protected void build(HashHandler handler, RowSequence rowSequence, Chunk[] sourceKeyChunks) {
-        final DoubleChunk<Values> keyChunk0 = sourceKeyChunks[0].asDoubleChunk();
-        final FloatChunk<Values> keyChunk1 = sourceKeyChunks[1].asFloatChunk();
-        final int chunkSize = keyChunk0.size();
-        for (int chunkPosition = 0; chunkPosition < chunkSize; ++chunkPosition) {
-            final double k0 = keyChunk0.get(chunkPosition);
-            final float k1 = keyChunk1.get(chunkPosition);
-            final int hash = hash(k0, k1);
-            final int tableLocation = hashToTableLocation(tableHashPivot, hash);
-            if (mainOutputPosition.getUnsafe(tableLocation) == EMPTY_OUTPUT_POSITION) {
-                numEntries++;
-                mainKeySource0.set(tableLocation, k0);
-                mainKeySource1.set(tableLocation, k1);
-                handler.doMainInsert(tableLocation, chunkPosition);
-            } else if (eq(mainKeySource0.getUnsafe(tableLocation), k0) && eq(mainKeySource1.getUnsafe(tableLocation), k1)) {
-                handler.doMainFound(tableLocation, chunkPosition);
-            } else {
-                int overflowLocation = mainOverflowLocationSource.getUnsafe(tableLocation);
-                if (!findOverflow(handler, k0, k1, chunkPosition, overflowLocation)) {
-                    final int newOverflowLocation = allocateOverflowLocation();
-                    overflowKeySource0.set(newOverflowLocation, k0);
-                    overflowKeySource1.set(newOverflowLocation, k1);
-                    mainOverflowLocationSource.set(tableLocation, newOverflowLocation);
-                    overflowOverflowLocationSource.set(newOverflowLocation, overflowLocation);
-                    numEntries++;
-                    handler.doOverflowInsert(newOverflowLocation, chunkPosition);
-                }
-            }
-        }
-    }
-
-    @Override
-    protected void probe(HashHandler handler, RowSequence rowSequence, Chunk[] sourceKeyChunks) {
-        final DoubleChunk<Values> keyChunk0 = sourceKeyChunks[0].asDoubleChunk();
-        final FloatChunk<Values> keyChunk1 = sourceKeyChunks[1].asFloatChunk();
-        final int chunkSize = keyChunk0.size();
-        for (int chunkPosition = 0; chunkPosition < chunkSize; ++chunkPosition) {
-            final double k0 = keyChunk0.get(chunkPosition);
-            final float k1 = keyChunk1.get(chunkPosition);
-            final int hash = hash(k0, k1);
-            final int tableLocation = hashToTableLocation(tableHashPivot, hash);
-            if (mainOutputPosition.getUnsafe(tableLocation) == EMPTY_OUTPUT_POSITION) {
-                handler.doMissing(chunkPosition);
-            } else if (eq(mainKeySource0.getUnsafe(tableLocation), k0) && eq(mainKeySource1.getUnsafe(tableLocation), k1)) {
-                handler.doMainFound(tableLocation, chunkPosition);
-            } else {
-                int overflowLocation = mainOverflowLocationSource.getUnsafe(tableLocation);
-                if (!findOverflow(handler, k0, k1, chunkPosition, overflowLocation)) {
-                    handler.doMissing(chunkPosition);
-                }
-            }
-        }
-    }
-
-    private static int hash(double k0, float k1) {
-        int hash = DoubleChunkHasher.hashInitialSingle(k0);
-        hash = FloatChunkHasher.hashUpdateSingle(hash, k1);
-        return hash;
-    }
-
-    @Override
-    protected void rehashBucket(HashHandler handler, int sourceBucket, int destBucket,
-            int bucketsToAdd) {
-        final int position = mainOutputPosition.getUnsafe(sourceBucket);
-        if (position == EMPTY_OUTPUT_POSITION) {
-            return;
-        }
-        int mainInsertLocation = maybeMoveMainBucket(handler, sourceBucket, destBucket, bucketsToAdd);
-        int overflowLocation = mainOverflowLocationSource.getUnsafe(sourceBucket);
-        mainOverflowLocationSource.set(sourceBucket, QueryConstants.NULL_INT);
-        mainOverflowLocationSource.set(destBucket, QueryConstants.NULL_INT);
-        while (overflowLocation != QueryConstants.NULL_INT) {
-            final int nextOverflowLocation = overflowOverflowLocationSource.getUnsafe(overflowLocation);
-            final double overflowKey0 = overflowKeySource0.getUnsafe(overflowLocation);
-            final float overflowKey1 = overflowKeySource1.getUnsafe(overflowLocation);
-            final int overflowHash = hash(overflowKey0, overflowKey1);
-            final int overflowTableLocation = hashToTableLocation(tableHashPivot + bucketsToAdd, overflowHash);
-            if (overflowTableLocation == mainInsertLocation) {
-                mainKeySource0.set(mainInsertLocation, overflowKey0);
-                mainKeySource1.set(mainInsertLocation, overflowKey1);
-                mainOutputPosition.set(mainInsertLocation, overflowOutputPosition.getUnsafe(overflowLocation));
-                handler.doPromoteOverflow(overflowLocation, mainInsertLocation);
-                overflowOutputPosition.set(overflowLocation, QueryConstants.NULL_INT);
-                overflowKeySource0.set(overflowLocation, QueryConstants.NULL_DOUBLE);
-                overflowKeySource1.set(overflowLocation, QueryConstants.NULL_FLOAT);
-                freeOverflowLocation(overflowLocation);
-                mainInsertLocation = -1;
-            } else {
-                final int oldOverflowLocation = mainOverflowLocationSource.getUnsafe(overflowTableLocation);
-                mainOverflowLocationSource.set(overflowTableLocation, overflowLocation);
-                overflowOverflowLocationSource.set(overflowLocation, oldOverflowLocation);
-            }
-            overflowLocation = nextOverflowLocation;
-        }
-    }
-
-    private int maybeMoveMainBucket(HashHandler handler, int sourceBucket, int destBucket,
-            int bucketsToAdd) {
-        final double k0 = mainKeySource0.getUnsafe(sourceBucket);
-        final float k1 = mainKeySource1.getUnsafe(sourceBucket);
-        final int hash = hash(k0, k1);
-        final int location = hashToTableLocation(tableHashPivot + bucketsToAdd, hash);
-        final int mainInsertLocation;
-        if (location == sourceBucket) {
-            mainInsertLocation = destBucket;
-            mainOutputPosition.set(destBucket, EMPTY_OUTPUT_POSITION);
-        } else {
-            mainInsertLocation = sourceBucket;
-            mainOutputPosition.set(destBucket, mainOutputPosition.getUnsafe(sourceBucket));
-            mainOutputPosition.set(sourceBucket, EMPTY_OUTPUT_POSITION);
-            mainKeySource0.set(destBucket, k0);
-            mainKeySource0.set(sourceBucket, QueryConstants.NULL_DOUBLE);
-            mainKeySource1.set(destBucket, k1);
-            mainKeySource1.set(sourceBucket, QueryConstants.NULL_FLOAT);
-            handler.doMoveMain(sourceBucket, destBucket);
-        }
-        return mainInsertLocation;
-    }
-
-    private boolean findOverflow(HashHandler handler, double k0, float k1, int chunkPosition,
-            int overflowLocation) {
-        while (overflowLocation != QueryConstants.NULL_INT) {
-            if (eq(overflowKeySource0.getUnsafe(overflowLocation), k0) && eq(overflowKeySource1.getUnsafe(overflowLocation), k1)) {
-                handler.doOverflowFound(overflowLocation, chunkPosition);
-                return true;
-            }
-            overflowLocation = overflowOverflowLocationSource.getUnsafe(overflowLocation);
-        }
-        return false;
-    }
-
-    @Override
-    public int findPositionForKey(Object key) {
-        final Object [] ka = (Object[])key;
-        final double k0 = TypeUtils.unbox((Double)ka[0]);
-        final float k1 = TypeUtils.unbox((Float)ka[1]);
-        int hash = hash(k0, k1);
-        final int tableLocation = hashToTableLocation(tableHashPivot, hash);
-        final int positionValue = mainOutputPosition.getUnsafe(tableLocation);
-        if (positionValue == EMPTY_OUTPUT_POSITION) {
-            return -1;
-        }
-        if (eq(mainKeySource0.getUnsafe(tableLocation), k0) && eq(mainKeySource1.getUnsafe(tableLocation), k1)) {
-            return positionValue;
-        }
-        int overflowLocation = mainOverflowLocationSource.getUnsafe(tableLocation);
-        while (overflowLocation != QueryConstants.NULL_INT) {
-            if (eq(overflowKeySource0.getUnsafe(overflowLocation), k0) && eq(overflowKeySource1.getUnsafe(overflowLocation), k1)) {
-                return overflowOutputPosition.getUnsafe(overflowLocation);
-            }
-            overflowLocation = overflowOverflowLocationSource.getUnsafe(overflowLocation);
-        }
-        return -1;
-    }
-}
diff --git a/engine/table/src/main/java/io/deephaven/engine/table/impl/by/typed/incagg/gen/IncrementalAggHasherDoubleInt.java b/engine/table/src/main/java/io/deephaven/engine/table/impl/by/typed/incagg/gen/IncrementalAggHasherDoubleInt.java
deleted file mode 100644
index 87300d021b7..00000000000
--- a/engine/table/src/main/java/io/deephaven/engine/table/impl/by/typed/incagg/gen/IncrementalAggHasherDoubleInt.java
+++ /dev/null
@@ -1,206 +0,0 @@
-//
-// Copyright (c) 2016-2024 Deephaven Data Labs and Patent Pending
-//
-// ****** AUTO-GENERATED CLASS - DO NOT EDIT MANUALLY
-// ****** Run ReplicateTypedHashers or ./gradlew replicateTypedHashers to regenerate
-//
-// @formatter:off
-package io.deephaven.engine.table.impl.by.typed.incagg.gen;
-
-import static io.deephaven.util.compare.DoubleComparisons.eq;
-import static io.deephaven.util.compare.IntComparisons.eq;
-
-import io.deephaven.chunk.Chunk;
-import io.deephaven.chunk.DoubleChunk;
-import io.deephaven.chunk.IntChunk;
-import io.deephaven.chunk.attributes.Values;
-import io.deephaven.chunk.util.hashing.DoubleChunkHasher;
-import io.deephaven.chunk.util.hashing.IntChunkHasher;
-import io.deephaven.engine.rowset.RowSequence;
-import io.deephaven.engine.table.ColumnSource;
-import io.deephaven.engine.table.impl.by.HashHandler;
-import io.deephaven.engine.table.impl.by.IncrementalChunkedOperatorAggregationStateManagerTypedBase;
-import io.deephaven.engine.table.impl.sources.DoubleArraySource;
-import io.deephaven.engine.table.impl.sources.IntegerArraySource;
-import io.deephaven.util.QueryConstants;
-import io.deephaven.util.type.TypeUtils;
-import java.lang.Double;
-import java.lang.Integer;
-import java.lang.Object;
-import java.lang.Override;
-
-final class IncrementalAggHasherDoubleInt extends IncrementalChunkedOperatorAggregationStateManagerTypedBase {
-    private final DoubleArraySource mainKeySource0;
-
-    private final DoubleArraySource overflowKeySource0;
-
-    private final IntegerArraySource mainKeySource1;
-
-    private final IntegerArraySource overflowKeySource1;
-
-    public IncrementalAggHasherDoubleInt(ColumnSource[] tableKeySources,
-            ColumnSource[] originalTableKeySources, int tableSize, double maximumLoadFactor,
-            double targetLoadFactor) {
-        super(tableKeySources, tableSize, maximumLoadFactor, targetLoadFactor);
-        this.mainKeySource0 = (DoubleArraySource) super.mainKeySources[0];
-        this.overflowKeySource0 = (DoubleArraySource) super.overflowKeySources[0];
-        this.mainKeySource1 = (IntegerArraySource) super.mainKeySources[1];
-        this.overflowKeySource1 = (IntegerArraySource) super.overflowKeySources[1];
-    }
-
-    @Override
-    protected void build(HashHandler handler, RowSequence rowSequence, Chunk[] sourceKeyChunks) {
-        final DoubleChunk<Values> keyChunk0 = sourceKeyChunks[0].asDoubleChunk();
-        final IntChunk<Values> keyChunk1 = sourceKeyChunks[1].asIntChunk();
-        final int chunkSize = keyChunk0.size();
-        for (int chunkPosition = 0; chunkPosition < chunkSize; ++chunkPosition) {
-            final double k0 = keyChunk0.get(chunkPosition);
-            final int k1 = keyChunk1.get(chunkPosition);
-            final int hash = hash(k0, k1);
-            final int tableLocation = hashToTableLocation(tableHashPivot, hash);
-            if (mainOutputPosition.getUnsafe(tableLocation) == EMPTY_OUTPUT_POSITION) {
-                numEntries++;
-                mainKeySource0.set(tableLocation, k0);
-                mainKeySource1.set(tableLocation, k1);
-                handler.doMainInsert(tableLocation, chunkPosition);
-            } else if (eq(mainKeySource0.getUnsafe(tableLocation), k0) && eq(mainKeySource1.getUnsafe(tableLocation), k1)) {
-                handler.doMainFound(tableLocation, chunkPosition);
-            } else {
-                int overflowLocation = mainOverflowLocationSource.getUnsafe(tableLocation);
-                if (!findOverflow(handler, k0, k1, chunkPosition, overflowLocation)) {
-                    final int newOverflowLocation = allocateOverflowLocation();
-                    overflowKeySource0.set(newOverflowLocation, k0);
-                    overflowKeySource1.set(newOverflowLocation, k1);
-                    mainOverflowLocationSource.set(tableLocation, newOverflowLocation);
-                    overflowOverflowLocationSource.set(newOverflowLocation, overflowLocation);
-                    numEntries++;
-                    handler.doOverflowInsert(newOverflowLocation, chunkPosition);
-                }
-            }
-        }
-    }
-
-    @Override
-    protected void probe(HashHandler handler, RowSequence rowSequence, Chunk[] sourceKeyChunks) {
-        final DoubleChunk<Values> keyChunk0 = sourceKeyChunks[0].asDoubleChunk();
-        final IntChunk<Values> keyChunk1 = sourceKeyChunks[1].asIntChunk();
-        final int chunkSize = keyChunk0.size();
-        for (int chunkPosition = 0; chunkPosition < chunkSize; ++chunkPosition) {
-            final double k0 = keyChunk0.get(chunkPosition);
-            final int k1 = keyChunk1.get(chunkPosition);
-            final int hash = hash(k0, k1);
-            final int tableLocation = hashToTableLocation(tableHashPivot, hash);
-            if (mainOutputPosition.getUnsafe(tableLocation) == EMPTY_OUTPUT_POSITION) {
-                handler.doMissing(chunkPosition);
-            } else if (eq(mainKeySource0.getUnsafe(tableLocation), k0) && eq(mainKeySource1.getUnsafe(tableLocation), k1)) {
-                handler.doMainFound(tableLocation, chunkPosition);
-            } else {
-                int overflowLocation = mainOverflowLocationSource.getUnsafe(tableLocation);
-                if (!findOverflow(handler, k0, k1, chunkPosition, overflowLocation)) {
-                    handler.doMissing(chunkPosition);
-                }
-            }
-        }
-    }
-
-    private static int hash(double k0, int k1) {
-        int hash = DoubleChunkHasher.hashInitialSingle(k0);
-        hash = IntChunkHasher.hashUpdateSingle(hash, k1);
-        return hash;
-    }
-
-    @Override
-    protected void rehashBucket(HashHandler handler, int sourceBucket, int destBucket,
-            int bucketsToAdd) {
-        final int position = mainOutputPosition.getUnsafe(sourceBucket);
-        if (position == EMPTY_OUTPUT_POSITION) {
-            return;
-        }
-        int mainInsertLocation = maybeMoveMainBucket(handler, sourceBucket, destBucket, bucketsToAdd);
-        int overflowLocation = mainOverflowLocationSource.getUnsafe(sourceBucket);
-        mainOverflowLocationSource.set(sourceBucket, QueryConstants.NULL_INT);
-        mainOverflowLocationSource.set(destBucket, QueryConstants.NULL_INT);
-        while (overflowLocation != QueryConstants.NULL_INT) {
-            final int nextOverflowLocation = overflowOverflowLocationSource.getUnsafe(overflowLocation);
-            final double overflowKey0 = overflowKeySource0.getUnsafe(overflowLocation);
-            final int overflowKey1 = overflowKeySource1.getUnsafe(overflowLocation);
-            final int overflowHash = hash(overflowKey0, overflowKey1);
-            final int overflowTableLocation = hashToTableLocation(tableHashPivot + bucketsToAdd, overflowHash);
-            if (overflowTableLocation == mainInsertLocation) {
-                mainKeySource0.set(mainInsertLocation, overflowKey0);
-                mainKeySource1.set(mainInsertLocation, overflowKey1);
-                mainOutputPosition.set(mainInsertLocation, overflowOutputPosition.getUnsafe(overflowLocation));
-                handler.doPromoteOverflow(overflowLocation, mainInsertLocation);
-                overflowOutputPosition.set(overflowLocation, QueryConstants.NULL_INT);
-                overflowKeySource0.set(overflowLocation, QueryConstants.NULL_DOUBLE);
-                overflowKeySource1.set(overflowLocation, QueryConstants.NULL_INT);
-                freeOverflowLocation(overflowLocation);
-                mainInsertLocation = -1;
-            } else {
-                final int oldOverflowLocation = mainOverflowLocationSource.getUnsafe(overflowTableLocation);
-                mainOverflowLocationSource.set(overflowTableLocation, overflowLocation);
-                overflowOverflowLocationSource.set(overflowLocation, oldOverflowLocation);
-            }
-            overflowLocation = nextOverflowLocation;
-        }
-    }
-
-    private int maybeMoveMainBucket(HashHandler handler, int sourceBucket, int destBucket,
-            int bucketsToAdd) {
-        final double k0 = mainKeySource0.getUnsafe(sourceBucket);
-        final int k1 = mainKeySource1.getUnsafe(sourceBucket);
-        final int hash = hash(k0, k1);
-        final int location = hashToTableLocation(tableHashPivot + bucketsToAdd, hash);
-        final int mainInsertLocation;
-        if (location == sourceBucket) {
-            mainInsertLocation = destBucket;
-            mainOutputPosition.set(destBucket, EMPTY_OUTPUT_POSITION);
-        } else {
-            mainInsertLocation = sourceBucket;
-            mainOutputPosition.set(destBucket, mainOutputPosition.getUnsafe(sourceBucket));
-            mainOutputPosition.set(sourceBucket, EMPTY_OUTPUT_POSITION);
-            mainKeySource0.set(destBucket, k0);
-            mainKeySource0.set(sourceBucket, QueryConstants.NULL_DOUBLE);
-            mainKeySource1.set(destBucket, k1);
-            mainKeySource1.set(sourceBucket, QueryConstants.NULL_INT);
-            handler.doMoveMain(sourceBucket, destBucket);
-        }
-        return mainInsertLocation;
-    }
-
-    private boolean findOverflow(HashHandler handler, double k0, int k1, int chunkPosition,
-            int overflowLocation) {
-        while (overflowLocation != QueryConstants.NULL_INT) {
-            if (eq(overflowKeySource0.getUnsafe(overflowLocation), k0) && eq(overflowKeySource1.getUnsafe(overflowLocation), k1)) {
-                handler.doOverflowFound(overflowLocation, chunkPosition);
-                return true;
-            }
-            overflowLocation = overflowOverflowLocationSource.getUnsafe(overflowLocation);
-        }
-        return false;
-    }
-
-    @Override
-    public int findPositionForKey(Object key) {
-        final Object [] ka = (Object[])key;
-        final double k0 = TypeUtils.unbox((Double)ka[0]);
-        final int k1 = TypeUtils.unbox((Integer)ka[1]);
-        int hash = hash(k0, k1);
-        final int tableLocation = hashToTableLocation(tableHashPivot, hash);
-        final int positionValue = mainOutputPosition.getUnsafe(tableLocation);
-        if (positionValue == EMPTY_OUTPUT_POSITION) {
-            return -1;
-        }
-        if (eq(mainKeySource0.getUnsafe(tableLocation), k0) && eq(mainKeySource1.getUnsafe(tableLocation), k1)) {
-            return positionValue;
-        }
-        int overflowLocation = mainOverflowLocationSource.getUnsafe(tableLocation);
-        while (overflowLocation != QueryConstants.NULL_INT) {
-            if (eq(overflowKeySource0.getUnsafe(overflowLocation), k0) && eq(overflowKeySource1.getUnsafe(overflowLocation), k1)) {
-                return overflowOutputPosition.getUnsafe(overflowLocation);
-            }
-            overflowLocation = overflowOverflowLocationSource.getUnsafe(overflowLocation);
-        }
-        return -1;
-    }
-}
diff --git a/engine/table/src/main/java/io/deephaven/engine/table/impl/by/typed/incagg/gen/IncrementalAggHasherDoubleLong.java b/engine/table/src/main/java/io/deephaven/engine/table/impl/by/typed/incagg/gen/IncrementalAggHasherDoubleLong.java
deleted file mode 100644
index c694fcb6f46..00000000000
--- a/engine/table/src/main/java/io/deephaven/engine/table/impl/by/typed/incagg/gen/IncrementalAggHasherDoubleLong.java
+++ /dev/null
@@ -1,206 +0,0 @@
-//
-// Copyright (c) 2016-2024 Deephaven Data Labs and Patent Pending
-//
-// ****** AUTO-GENERATED CLASS - DO NOT EDIT MANUALLY
-// ****** Run ReplicateTypedHashers or ./gradlew replicateTypedHashers to regenerate
-//
-// @formatter:off
-package io.deephaven.engine.table.impl.by.typed.incagg.gen;
-
-import static io.deephaven.util.compare.DoubleComparisons.eq;
-import static io.deephaven.util.compare.LongComparisons.eq;
-
-import io.deephaven.chunk.Chunk;
-import io.deephaven.chunk.DoubleChunk;
-import io.deephaven.chunk.LongChunk;
-import io.deephaven.chunk.attributes.Values;
-import io.deephaven.chunk.util.hashing.DoubleChunkHasher;
-import io.deephaven.chunk.util.hashing.LongChunkHasher;
-import io.deephaven.engine.rowset.RowSequence;
-import io.deephaven.engine.table.ColumnSource;
-import io.deephaven.engine.table.impl.by.HashHandler;
-import io.deephaven.engine.table.impl.by.IncrementalChunkedOperatorAggregationStateManagerTypedBase;
-import io.deephaven.engine.table.impl.sources.DoubleArraySource;
-import io.deephaven.engine.table.impl.sources.LongArraySource;
-import io.deephaven.util.QueryConstants;
-import io.deephaven.util.type.TypeUtils;
-import java.lang.Double;
-import java.lang.Long;
-import java.lang.Object;
-import java.lang.Override;
-
-final class IncrementalAggHasherDoubleLong extends IncrementalChunkedOperatorAggregationStateManagerTypedBase {
-    private final DoubleArraySource mainKeySource0;
-
-    private final DoubleArraySource overflowKeySource0;
-
-    private final LongArraySource mainKeySource1;
-
-    private final LongArraySource overflowKeySource1;
-
-    public IncrementalAggHasherDoubleLong(ColumnSource[] tableKeySources,
-            ColumnSource[] originalTableKeySources, int tableSize, double maximumLoadFactor,
-            double targetLoadFactor) {
-        super(tableKeySources, tableSize, maximumLoadFactor, targetLoadFactor);
-        this.mainKeySource0 = (DoubleArraySource) super.mainKeySources[0];
-        this.overflowKeySource0 = (DoubleArraySource) super.overflowKeySources[0];
-        this.mainKeySource1 = (LongArraySource) super.mainKeySources[1];
-        this.overflowKeySource1 = (LongArraySource) super.overflowKeySources[1];
-    }
-
-    @Override
-    protected void build(HashHandler handler, RowSequence rowSequence, Chunk[] sourceKeyChunks) {
-        final DoubleChunk<Values> keyChunk0 = sourceKeyChunks[0].asDoubleChunk();
-        final LongChunk<Values> keyChunk1 = sourceKeyChunks[1].asLongChunk();
-        final int chunkSize = keyChunk0.size();
-        for (int chunkPosition = 0; chunkPosition < chunkSize; ++chunkPosition) {
-            final double k0 = keyChunk0.get(chunkPosition);
-            final long k1 = keyChunk1.get(chunkPosition);
-            final int hash = hash(k0, k1);
-            final int tableLocation = hashToTableLocation(tableHashPivot, hash);
-            if (mainOutputPosition.getUnsafe(tableLocation) == EMPTY_OUTPUT_POSITION) {
-                numEntries++;
-                mainKeySource0.set(tableLocation, k0);
-                mainKeySource1.set(tableLocation, k1);
-                handler.doMainInsert(tableLocation, chunkPosition);
-            } else if (eq(mainKeySource0.getUnsafe(tableLocation), k0) && eq(mainKeySource1.getUnsafe(tableLocation), k1)) {
-                handler.doMainFound(tableLocation, chunkPosition);
-            } else {
-                int overflowLocation = mainOverflowLocationSource.getUnsafe(tableLocation);
-                if (!findOverflow(handler, k0, k1, chunkPosition, overflowLocation)) {
-                    final int newOverflowLocation = allocateOverflowLocation();
-                    overflowKeySource0.set(newOverflowLocation, k0);
-                    overflowKeySource1.set(newOverflowLocation, k1);
-                    mainOverflowLocationSource.set(tableLocation, newOverflowLocation);
-                    overflowOverflowLocationSource.set(newOverflowLocation, overflowLocation);
-                    numEntries++;
-                    handler.doOverflowInsert(newOverflowLocation, chunkPosition);
-                }
-            }
-        }
-    }
-
-    @Override
-    protected void probe(HashHandler handler, RowSequence rowSequence, Chunk[] sourceKeyChunks) {
-        final DoubleChunk<Values> keyChunk0 = sourceKeyChunks[0].asDoubleChunk();
-        final LongChunk<Values> keyChunk1 = sourceKeyChunks[1].asLongChunk();
-        final int chunkSize = keyChunk0.size();
-        for (int chunkPosition = 0; chunkPosition < chunkSize; ++chunkPosition) {
-            final double k0 = keyChunk0.get(chunkPosition);
-            final long k1 = keyChunk1.get(chunkPosition);
-            final int hash = hash(k0, k1);
-            final int tableLocation = hashToTableLocation(tableHashPivot, hash);
-            if (mainOutputPosition.getUnsafe(tableLocation) == EMPTY_OUTPUT_POSITION) {
-                handler.doMissing(chunkPosition);
-            } else if (eq(mainKeySource0.getUnsafe(tableLocation), k0) && eq(mainKeySource1.getUnsafe(tableLocation), k1)) {
-                handler.doMainFound(tableLocation, chunkPosition);
-            } else {
-                int overflowLocation = mainOverflowLocationSource.getUnsafe(tableLocation);
-                if (!findOverflow(handler, k0, k1, chunkPosition, overflowLocation)) {
-                    handler.doMissing(chunkPosition);
-                }
-            }
-        }
-    }
-
-    private static int hash(double k0, long k1) {
-        int hash = DoubleChunkHasher.hashInitialSingle(k0);
-        hash = LongChunkHasher.hashUpdateSingle(hash, k1);
-        return hash;
-    }
-
-    @Override
-    protected void rehashBucket(HashHandler handler, int sourceBucket, int destBucket,
-            int bucketsToAdd) {
-        final int position = mainOutputPosition.getUnsafe(sourceBucket);
-        if (position == EMPTY_OUTPUT_POSITION) {
-            return;
-        }
-        int mainInsertLocation = maybeMoveMainBucket(handler, sourceBucket, destBucket, bucketsToAdd);
-        int overflowLocation = mainOverflowLocationSource.getUnsafe(sourceBucket);
-        mainOverflowLocationSource.set(sourceBucket, QueryConstants.NULL_INT);
-        mainOverflowLocationSource.set(destBucket, QueryConstants.NULL_INT);
-        while (overflowLocation != QueryConstants.NULL_INT) {
-            final int nextOverflowLocation = overflowOverflowLocationSource.getUnsafe(overflowLocation);
-            final double overflowKey0 = overflowKeySource0.getUnsafe(overflowLocation);
-            final long overflowKey1 = overflowKeySource1.getUnsafe(overflowLocation);
-            final int overflowHash = hash(overflowKey0, overflowKey1);
-            final int overflowTableLocation = hashToTableLocation(tableHashPivot + bucketsToAdd, overflowHash);
-            if (overflowTableLocation == mainInsertLocation) {
-                mainKeySource0.set(mainInsertLocation, overflowKey0);
-                mainKeySource1.set(mainInsertLocation, overflowKey1);
-                mainOutputPosition.set(mainInsertLocation, overflowOutputPosition.getUnsafe(overflowLocation));
-                handler.doPromoteOverflow(overflowLocation, mainInsertLocation);
-                overflowOutputPosition.set(overflowLocation, QueryConstants.NULL_INT);
-                overflowKeySource0.set(overflowLocation, QueryConstants.NULL_DOUBLE);
-                overflowKeySource1.set(overflowLocation, QueryConstants.NULL_LONG);
-                freeOverflowLocation(overflowLocation);
-                mainInsertLocation = -1;
-            } else {
-                final int oldOverflowLocation = mainOverflowLocationSource.getUnsafe(overflowTableLocation);
-                mainOverflowLocationSource.set(overflowTableLocation, overflowLocation);
-                overflowOverflowLocationSource.set(overflowLocation, oldOverflowLocation);
-            }
-            overflowLocation = nextOverflowLocation;
-        }
-    }
-
-    private int maybeMoveMainBucket(HashHandler handler, int sourceBucket, int destBucket,
-            int bucketsToAdd) {
-        final double k0 = mainKeySource0.getUnsafe(sourceBucket);
-        final long k1 = mainKeySource1.getUnsafe(sourceBucket);
-        final int hash = hash(k0, k1);
-        final int location = hashToTableLocation(tableHashPivot + bucketsToAdd, hash);
-        final int mainInsertLocation;
-        if (location == sourceBucket) {
-            mainInsertLocation = destBucket;
-            mainOutputPosition.set(destBucket, EMPTY_OUTPUT_POSITION);
-        } else {
-            mainInsertLocation = sourceBucket;
-            mainOutputPosition.set(destBucket, mainOutputPosition.getUnsafe(sourceBucket));
-            mainOutputPosition.set(sourceBucket, EMPTY_OUTPUT_POSITION);
-            mainKeySource0.set(destBucket, k0);
-            mainKeySource0.set(sourceBucket, QueryConstants.NULL_DOUBLE);
-            mainKeySource1.set(destBucket, k1);
-            mainKeySource1.set(sourceBucket, QueryConstants.NULL_LONG);
-            handler.doMoveMain(sourceBucket, destBucket);
-        }
-        return mainInsertLocation;
-    }
-
-    private boolean findOverflow(HashHandler handler, double k0, long k1, int chunkPosition,
-            int overflowLocation) {
-        while (overflowLocation != QueryConstants.NULL_INT) {
-            if (eq(overflowKeySource0.getUnsafe(overflowLocation), k0) && eq(overflowKeySource1.getUnsafe(overflowLocation), k1)) {
-                handler.doOverflowFound(overflowLocation, chunkPosition);
-                return true;
-            }
-            overflowLocation = overflowOverflowLocationSource.getUnsafe(overflowLocation);
-        }
-        return false;
-    }
-
-    @Override
-    public int findPositionForKey(Object key) {
-        final Object [] ka = (Object[])key;
-        final double k0 = TypeUtils.unbox((Double)ka[0]);
-        final long k1 = TypeUtils.unbox((Long)ka[1]);
-        int hash = hash(k0, k1);
-        final int tableLocation = hashToTableLocation(tableHashPivot, hash);
-        final int positionValue = mainOutputPosition.getUnsafe(tableLocation);
-        if (positionValue == EMPTY_OUTPUT_POSITION) {
-            return -1;
-        }
-        if (eq(mainKeySource0.getUnsafe(tableLocation), k0) && eq(mainKeySource1.getUnsafe(tableLocation), k1)) {
-            return positionValue;
-        }
-        int overflowLocation = mainOverflowLocationSource.getUnsafe(tableLocation);
-        while (overflowLocation != QueryConstants.NULL_INT) {
-            if (eq(overflowKeySource0.getUnsafe(overflowLocation), k0) && eq(overflowKeySource1.getUnsafe(overflowLocation), k1)) {
-                return overflowOutputPosition.getUnsafe(overflowLocation);
-            }
-            overflowLocation = overflowOverflowLocationSource.getUnsafe(overflowLocation);
-        }
-        return -1;
-    }
-}
diff --git a/engine/table/src/main/java/io/deephaven/engine/table/impl/by/typed/incagg/gen/IncrementalAggHasherDoubleObject.java b/engine/table/src/main/java/io/deephaven/engine/table/impl/by/typed/incagg/gen/IncrementalAggHasherDoubleObject.java
deleted file mode 100644
index 6e94c382acc..00000000000
--- a/engine/table/src/main/java/io/deephaven/engine/table/impl/by/typed/incagg/gen/IncrementalAggHasherDoubleObject.java
+++ /dev/null
@@ -1,205 +0,0 @@
-//
-// Copyright (c) 2016-2024 Deephaven Data Labs and Patent Pending
-//
-// ****** AUTO-GENERATED CLASS - DO NOT EDIT MANUALLY
-// ****** Run ReplicateTypedHashers or ./gradlew replicateTypedHashers to regenerate
-//
-// @formatter:off
-package io.deephaven.engine.table.impl.by.typed.incagg.gen;
-
-import static io.deephaven.util.compare.DoubleComparisons.eq;
-import static io.deephaven.util.compare.ObjectComparisons.eq;
-
-import io.deephaven.chunk.Chunk;
-import io.deephaven.chunk.DoubleChunk;
-import io.deephaven.chunk.ObjectChunk;
-import io.deephaven.chunk.attributes.Values;
-import io.deephaven.chunk.util.hashing.DoubleChunkHasher;
-import io.deephaven.chunk.util.hashing.ObjectChunkHasher;
-import io.deephaven.engine.rowset.RowSequence;
-import io.deephaven.engine.table.ColumnSource;
-import io.deephaven.engine.table.impl.by.HashHandler;
-import io.deephaven.engine.table.impl.by.IncrementalChunkedOperatorAggregationStateManagerTypedBase;
-import io.deephaven.engine.table.impl.sources.DoubleArraySource;
-import io.deephaven.engine.table.impl.sources.ObjectArraySource;
-import io.deephaven.util.QueryConstants;
-import io.deephaven.util.type.TypeUtils;
-import java.lang.Double;
-import java.lang.Object;
-import java.lang.Override;
-
-final class IncrementalAggHasherDoubleObject extends IncrementalChunkedOperatorAggregationStateManagerTypedBase {
-    private final DoubleArraySource mainKeySource0;
-
-    private final DoubleArraySource overflowKeySource0;
-
-    private final ObjectArraySource mainKeySource1;
-
-    private final ObjectArraySource overflowKeySource1;
-
-    public IncrementalAggHasherDoubleObject(ColumnSource[] tableKeySources,
-            ColumnSource[] originalTableKeySources, int tableSize, double maximumLoadFactor,
-            double targetLoadFactor) {
-        super(tableKeySources, tableSize, maximumLoadFactor, targetLoadFactor);
-        this.mainKeySource0 = (DoubleArraySource) super.mainKeySources[0];
-        this.overflowKeySource0 = (DoubleArraySource) super.overflowKeySources[0];
-        this.mainKeySource1 = (ObjectArraySource) super.mainKeySources[1];
-        this.overflowKeySource1 = (ObjectArraySource) super.overflowKeySources[1];
-    }
-
-    @Override
-    protected void build(HashHandler handler, RowSequence rowSequence, Chunk[] sourceKeyChunks) {
-        final DoubleChunk<Values> keyChunk0 = sourceKeyChunks[0].asDoubleChunk();
-        final ObjectChunk<Object, Values> keyChunk1 = sourceKeyChunks[1].asObjectChunk();
-        final int chunkSize = keyChunk0.size();
-        for (int chunkPosition = 0; chunkPosition < chunkSize; ++chunkPosition) {
-            final double k0 = keyChunk0.get(chunkPosition);
-            final Object k1 = keyChunk1.get(chunkPosition);
-            final int hash = hash(k0, k1);
-            final int tableLocation = hashToTableLocation(tableHashPivot, hash);
-            if (mainOutputPosition.getUnsafe(tableLocation) == EMPTY_OUTPUT_POSITION) {
-                numEntries++;
-                mainKeySource0.set(tableLocation, k0);
-                mainKeySource1.set(tableLocation, k1);
-                handler.doMainInsert(tableLocation, chunkPosition);
-            } else if (eq(mainKeySource0.getUnsafe(tableLocation), k0) && eq(mainKeySource1.getUnsafe(tableLocation), k1)) {
-                handler.doMainFound(tableLocation, chunkPosition);
-            } else {
-                int overflowLocation = mainOverflowLocationSource.getUnsafe(tableLocation);
-                if (!findOverflow(handler, k0, k1, chunkPosition, overflowLocation)) {
-                    final int newOverflowLocation = allocateOverflowLocation();
-                    overflowKeySource0.set(newOverflowLocation, k0);
-                    overflowKeySource1.set(newOverflowLocation, k1);
-                    mainOverflowLocationSource.set(tableLocation, newOverflowLocation);
-                    overflowOverflowLocationSource.set(newOverflowLocation, overflowLocation);
-                    numEntries++;
-                    handler.doOverflowInsert(newOverflowLocation, chunkPosition);
-                }
-            }
-        }
-    }
-
-    @Override
-    protected void probe(HashHandler handler, RowSequence rowSequence, Chunk[] sourceKeyChunks) {
-        final DoubleChunk<Values> keyChunk0 = sourceKeyChunks[0].asDoubleChunk();
-        final ObjectChunk<Object, Values> keyChunk1 = sourceKeyChunks[1].asObjectChunk();
-        final int chunkSize = keyChunk0.size();
-        for (int chunkPosition = 0; chunkPosition < chunkSize; ++chunkPosition) {
-            final double k0 = keyChunk0.get(chunkPosition);
-            final Object k1 = keyChunk1.get(chunkPosition);
-            final int hash = hash(k0, k1);
-            final int tableLocation = hashToTableLocation(tableHashPivot, hash);
-            if (mainOutputPosition.getUnsafe(tableLocation) == EMPTY_OUTPUT_POSITION) {
-                handler.doMissing(chunkPosition);
-            } else if (eq(mainKeySource0.getUnsafe(tableLocation), k0) && eq(mainKeySource1.getUnsafe(tableLocation), k1)) {
-                handler.doMainFound(tableLocation, chunkPosition);
-            } else {
-                int overflowLocation = mainOverflowLocationSource.getUnsafe(tableLocation);
-                if (!findOverflow(handler, k0, k1, chunkPosition, overflowLocation)) {
-                    handler.doMissing(chunkPosition);
-                }
-            }
-        }
-    }
-
-    private static int hash(double k0, Object k1) {
-        int hash = DoubleChunkHasher.hashInitialSingle(k0);
-        hash = ObjectChunkHasher.hashUpdateSingle(hash, k1);
-        return hash;
-    }
-
-    @Override
-    protected void rehashBucket(HashHandler handler, int sourceBucket, int destBucket,
-            int bucketsToAdd) {
-        final int position = mainOutputPosition.getUnsafe(sourceBucket);
-        if (position == EMPTY_OUTPUT_POSITION) {
-            return;
-        }
-        int mainInsertLocation = maybeMoveMainBucket(handler, sourceBucket, destBucket, bucketsToAdd);
-        int overflowLocation = mainOverflowLocationSource.getUnsafe(sourceBucket);
-        mainOverflowLocationSource.set(sourceBucket, QueryConstants.NULL_INT);
-        mainOverflowLocationSource.set(destBucket, QueryConstants.NULL_INT);
-        while (overflowLocation != QueryConstants.NULL_INT) {
-            final int nextOverflowLocation = overflowOverflowLocationSource.getUnsafe(overflowLocation);
-            final double overflowKey0 = overflowKeySource0.getUnsafe(overflowLocation);
-            final Object overflowKey1 = overflowKeySource1.getUnsafe(overflowLocation);
-            final int overflowHash = hash(overflowKey0, overflowKey1);
-            final int overflowTableLocation = hashToTableLocation(tableHashPivot + bucketsToAdd, overflowHash);
-            if (overflowTableLocation == mainInsertLocation) {
-                mainKeySource0.set(mainInsertLocation, overflowKey0);
-                mainKeySource1.set(mainInsertLocation, overflowKey1);
-                mainOutputPosition.set(mainInsertLocation, overflowOutputPosition.getUnsafe(overflowLocation));
-                handler.doPromoteOverflow(overflowLocation, mainInsertLocation);
-                overflowOutputPosition.set(overflowLocation, QueryConstants.NULL_INT);
-                overflowKeySource0.set(overflowLocation, QueryConstants.NULL_DOUBLE);
-                overflowKeySource1.set(overflowLocation, null);
-                freeOverflowLocation(overflowLocation);
-                mainInsertLocation = -1;
-            } else {
-                final int oldOverflowLocation = mainOverflowLocationSource.getUnsafe(overflowTableLocation);
-                mainOverflowLocationSource.set(overflowTableLocation, overflowLocation);
-                overflowOverflowLocationSource.set(overflowLocation, oldOverflowLocation);
-            }
-            overflowLocation = nextOverflowLocation;
-        }
-    }
-
-    private int maybeMoveMainBucket(HashHandler handler, int sourceBucket, int destBucket,
-            int bucketsToAdd) {
-        final double k0 = mainKeySource0.getUnsafe(sourceBucket);
-        final Object k1 = mainKeySource1.getUnsafe(sourceBucket);
-        final int hash = hash(k0, k1);
-        final int location = hashToTableLocation(tableHashPivot + bucketsToAdd, hash);
-        final int mainInsertLocation;
-        if (location == sourceBucket) {
-            mainInsertLocation = destBucket;
-            mainOutputPosition.set(destBucket, EMPTY_OUTPUT_POSITION);
-        } else {
-            mainInsertLocation = sourceBucket;
-            mainOutputPosition.set(destBucket, mainOutputPosition.getUnsafe(sourceBucket));
-            mainOutputPosition.set(sourceBucket, EMPTY_OUTPUT_POSITION);
-            mainKeySource0.set(destBucket, k0);
-            mainKeySource0.set(sourceBucket, QueryConstants.NULL_DOUBLE);
-            mainKeySource1.set(destBucket, k1);
-            mainKeySource1.set(sourceBucket, null);
-            handler.doMoveMain(sourceBucket, destBucket);
-        }
-        return mainInsertLocation;
-    }
-
-    private boolean findOverflow(HashHandler handler, double k0, Object k1, int chunkPosition,
-            int overflowLocation) {
-        while (overflowLocation != QueryConstants.NULL_INT) {
-            if (eq(overflowKeySource0.getUnsafe(overflowLocation), k0) && eq(overflowKeySource1.getUnsafe(overflowLocation), k1)) {
-                handler.doOverflowFound(overflowLocation, chunkPosition);
-                return true;
-            }
-            overflowLocation = overflowOverflowLocationSource.getUnsafe(overflowLocation);
-        }
-        return false;
-    }
-
-    @Override
-    public int findPositionForKey(Object key) {
-        final Object [] ka = (Object[])key;
-        final double k0 = TypeUtils.unbox((Double)ka[0]);
-        final Object k1 = ka[1];
-        int hash = hash(k0, k1);
-        final int tableLocation = hashToTableLocation(tableHashPivot, hash);
-        final int positionValue = mainOutputPosition.getUnsafe(tableLocation);
-        if (positionValue == EMPTY_OUTPUT_POSITION) {
-            return -1;
-        }
-        if (eq(mainKeySource0.getUnsafe(tableLocation), k0) && eq(mainKeySource1.getUnsafe(tableLocation), k1)) {
-            return positionValue;
-        }
-        int overflowLocation = mainOverflowLocationSource.getUnsafe(tableLocation);
-        while (overflowLocation != QueryConstants.NULL_INT) {
-            if (eq(overflowKeySource0.getUnsafe(overflowLocation), k0) && eq(overflowKeySource1.getUnsafe(overflowLocation), k1)) {
-                return overflowOutputPosition.getUnsafe(overflowLocation);
-            }
-            overflowLocation = overflowOverflowLocationSource.getUnsafe(overflowLocation);
-        }
-        return -1;
-    }
-}
diff --git a/engine/table/src/main/java/io/deephaven/engine/table/impl/by/typed/incagg/gen/IncrementalAggHasherDoubleShort.java b/engine/table/src/main/java/io/deephaven/engine/table/impl/by/typed/incagg/gen/IncrementalAggHasherDoubleShort.java
deleted file mode 100644
index 0a3e5ffba21..00000000000
--- a/engine/table/src/main/java/io/deephaven/engine/table/impl/by/typed/incagg/gen/IncrementalAggHasherDoubleShort.java
+++ /dev/null
@@ -1,206 +0,0 @@
-//
-// Copyright (c) 2016-2024 Deephaven Data Labs and Patent Pending
-//
-// ****** AUTO-GENERATED CLASS - DO NOT EDIT MANUALLY
-// ****** Run ReplicateTypedHashers or ./gradlew replicateTypedHashers to regenerate
-//
-// @formatter:off
-package io.deephaven.engine.table.impl.by.typed.incagg.gen;
-
-import static io.deephaven.util.compare.DoubleComparisons.eq;
-import static io.deephaven.util.compare.ShortComparisons.eq;
-
-import io.deephaven.chunk.Chunk;
-import io.deephaven.chunk.DoubleChunk;
-import io.deephaven.chunk.ShortChunk;
-import io.deephaven.chunk.attributes.Values;
-import io.deephaven.chunk.util.hashing.DoubleChunkHasher;
-import io.deephaven.chunk.util.hashing.ShortChunkHasher;
-import io.deephaven.engine.rowset.RowSequence;
-import io.deephaven.engine.table.ColumnSource;
-import io.deephaven.engine.table.impl.by.HashHandler;
-import io.deephaven.engine.table.impl.by.IncrementalChunkedOperatorAggregationStateManagerTypedBase;
-import io.deephaven.engine.table.impl.sources.DoubleArraySource;
-import io.deephaven.engine.table.impl.sources.ShortArraySource;
-import io.deephaven.util.QueryConstants;
-import io.deephaven.util.type.TypeUtils;
-import java.lang.Double;
-import java.lang.Object;
-import java.lang.Override;
-import java.lang.Short;
-
-final class IncrementalAggHasherDoubleShort extends IncrementalChunkedOperatorAggregationStateManagerTypedBase {
-    private final DoubleArraySource mainKeySource0;
-
-    private final DoubleArraySource overflowKeySource0;
-
-    private final ShortArraySource mainKeySource1;
-
-    private final ShortArraySource overflowKeySource1;
-
-    public IncrementalAggHasherDoubleShort(ColumnSource[] tableKeySources,
-            ColumnSource[] originalTableKeySources, int tableSize, double maximumLoadFactor,
-            double targetLoadFactor) {
-        super(tableKeySources, tableSize, maximumLoadFactor, targetLoadFactor);
-        this.mainKeySource0 = (DoubleArraySource) super.mainKeySources[0];
-        this.overflowKeySource0 = (DoubleArraySource) super.overflowKeySources[0];
-        this.mainKeySource1 = (ShortArraySource) super.mainKeySources[1];
-        this.overflowKeySource1 = (ShortArraySource) super.overflowKeySources[1];
-    }
-
-    @Override
-    protected void build(HashHandler handler, RowSequence rowSequence, Chunk[] sourceKeyChunks) {
-        final DoubleChunk<Values> keyChunk0 = sourceKeyChunks[0].asDoubleChunk();
-        final ShortChunk<Values> keyChunk1 = sourceKeyChunks[1].asShortChunk();
-        final int chunkSize = keyChunk0.size();
-        for (int chunkPosition = 0; chunkPosition < chunkSize; ++chunkPosition) {
-            final double k0 = keyChunk0.get(chunkPosition);
-            final short k1 = keyChunk1.get(chunkPosition);
-            final int hash = hash(k0, k1);
-            final int tableLocation = hashToTableLocation(tableHashPivot, hash);
-            if (mainOutputPosition.getUnsafe(tableLocation) == EMPTY_OUTPUT_POSITION) {
-                numEntries++;
-                mainKeySource0.set(tableLocation, k0);
-                mainKeySource1.set(tableLocation, k1);
-                handler.doMainInsert(tableLocation, chunkPosition);
-            } else if (eq(mainKeySource0.getUnsafe(tableLocation), k0) && eq(mainKeySource1.getUnsafe(tableLocation), k1)) {
-                handler.doMainFound(tableLocation, chunkPosition);
-            } else {
-                int overflowLocation = mainOverflowLocationSource.getUnsafe(tableLocation);
-                if (!findOverflow(handler, k0, k1, chunkPosition, overflowLocation)) {
-                    final int newOverflowLocation = allocateOverflowLocation();
-                    overflowKeySource0.set(newOverflowLocation, k0);
-                    overflowKeySource1.set(newOverflowLocation, k1);
-                    mainOverflowLocationSource.set(tableLocation, newOverflowLocation);
-                    overflowOverflowLocationSource.set(newOverflowLocation, overflowLocation);
-                    numEntries++;
-                    handler.doOverflowInsert(newOverflowLocation, chunkPosition);
-                }
-            }
-        }
-    }
-
-    @Override
-    protected void probe(HashHandler handler, RowSequence rowSequence, Chunk[] sourceKeyChunks) {
-        final DoubleChunk<Values> keyChunk0 = sourceKeyChunks[0].asDoubleChunk();
-        final ShortChunk<Values> keyChunk1 = sourceKeyChunks[1].asShortChunk();
-        final int chunkSize = keyChunk0.size();
-        for (int chunkPosition = 0; chunkPosition < chunkSize; ++chunkPosition) {
-            final double k0 = keyChunk0.get(chunkPosition);
-            final short k1 = keyChunk1.get(chunkPosition);
-            final int hash = hash(k0, k1);
-            final int tableLocation = hashToTableLocation(tableHashPivot, hash);
-            if (mainOutputPosition.getUnsafe(tableLocation) == EMPTY_OUTPUT_POSITION) {
-                handler.doMissing(chunkPosition);
-            } else if (eq(mainKeySource0.getUnsafe(tableLocation), k0) && eq(mainKeySource1.getUnsafe(tableLocation), k1)) {
-                handler.doMainFound(tableLocation, chunkPosition);
-            } else {
-                int overflowLocation = mainOverflowLocationSource.getUnsafe(tableLocation);
-                if (!findOverflow(handler, k0, k1, chunkPosition, overflowLocation)) {
-                    handler.doMissing(chunkPosition);
-                }
-            }
-        }
-    }
-
-    private static int hash(double k0, short k1) {
-        int hash = DoubleChunkHasher.hashInitialSingle(k0);
-        hash = ShortChunkHasher.hashUpdateSingle(hash, k1);
-        return hash;
-    }
-
-    @Override
-    protected void rehashBucket(HashHandler handler, int sourceBucket, int destBucket,
-            int bucketsToAdd) {
-        final int position = mainOutputPosition.getUnsafe(sourceBucket);
-        if (position == EMPTY_OUTPUT_POSITION) {
-            return;
-        }
-        int mainInsertLocation = maybeMoveMainBucket(handler, sourceBucket, destBucket, bucketsToAdd);
-        int overflowLocation = mainOverflowLocationSource.getUnsafe(sourceBucket);
-        mainOverflowLocationSource.set(sourceBucket, QueryConstants.NULL_INT);
-        mainOverflowLocationSource.set(destBucket, QueryConstants.NULL_INT);
-        while (overflowLocation != QueryConstants.NULL_INT) {
-            final int nextOverflowLocation = overflowOverflowLocationSource.getUnsafe(overflowLocation);
-            final double overflowKey0 = overflowKeySource0.getUnsafe(overflowLocation);
-            final short overflowKey1 = overflowKeySource1.getUnsafe(overflowLocation);
-            final int overflowHash = hash(overflowKey0, overflowKey1);
-            final int overflowTableLocation = hashToTableLocation(tableHashPivot + bucketsToAdd, overflowHash);
-            if (overflowTableLocation == mainInsertLocation) {
-                mainKeySource0.set(mainInsertLocation, overflowKey0);
-                mainKeySource1.set(mainInsertLocation, overflowKey1);
-                mainOutputPosition.set(mainInsertLocation, overflowOutputPosition.getUnsafe(overflowLocation));
-                handler.doPromoteOverflow(overflowLocation, mainInsertLocation);
-                overflowOutputPosition.set(overflowLocation, QueryConstants.NULL_INT);
-                overflowKeySource0.set(overflowLocation, QueryConstants.NULL_DOUBLE);
-                overflowKeySource1.set(overflowLocation, QueryConstants.NULL_SHORT);
-                freeOverflowLocation(overflowLocation);
-                mainInsertLocation = -1;
-            } else {
-                final int oldOverflowLocation = mainOverflowLocationSource.getUnsafe(overflowTableLocation);
-                mainOverflowLocationSource.set(overflowTableLocation, overflowLocation);
-                overflowOverflowLocationSource.set(overflowLocation, oldOverflowLocation);
-            }
-            overflowLocation = nextOverflowLocation;
-        }
-    }
-
-    private int maybeMoveMainBucket(HashHandler handler, int sourceBucket, int destBucket,
-            int bucketsToAdd) {
-        final double k0 = mainKeySource0.getUnsafe(sourceBucket);
-        final short k1 = mainKeySource1.getUnsafe(sourceBucket);
-        final int hash = hash(k0, k1);
-        final int location = hashToTableLocation(tableHashPivot + bucketsToAdd, hash);
-        final int mainInsertLocation;
-        if (location == sourceBucket) {
-            mainInsertLocation = destBucket;
-            mainOutputPosition.set(destBucket, EMPTY_OUTPUT_POSITION);
-        } else {
-            mainInsertLocation = sourceBucket;
-            mainOutputPosition.set(destBucket, mainOutputPosition.getUnsafe(sourceBucket));
-            mainOutputPosition.set(sourceBucket, EMPTY_OUTPUT_POSITION);
-            mainKeySource0.set(destBucket, k0);
-            mainKeySource0.set(sourceBucket, QueryConstants.NULL_DOUBLE);
-            mainKeySource1.set(destBucket, k1);
-            mainKeySource1.set(sourceBucket, QueryConstants.NULL_SHORT);
-            handler.doMoveMain(sourceBucket, destBucket);
-        }
-        return mainInsertLocation;
-    }
-
-    private boolean findOverflow(HashHandler handler, double k0, short k1, int chunkPosition,
-            int overflowLocation) {
-        while (overflowLocation != QueryConstants.NULL_INT) {
-            if (eq(overflowKeySource0.getUnsafe(overflowLocation), k0) && eq(overflowKeySource1.getUnsafe(overflowLocation), k1)) {
-                handler.doOverflowFound(overflowLocation, chunkPosition);
-                return true;
-            }
-            overflowLocation = overflowOverflowLocationSource.getUnsafe(overflowLocation);
-        }
-        return false;
-    }
-
-    @Override
-    public int findPositionForKey(Object key) {
-        final Object [] ka = (Object[])key;
-        final double k0 = TypeUtils.unbox((Double)ka[0]);
-        final short k1 = TypeUtils.unbox((Short)ka[1]);
-        int hash = hash(k0, k1);
-        final int tableLocation = hashToTableLocation(tableHashPivot, hash);
-        final int positionValue = mainOutputPosition.getUnsafe(tableLocation);
-        if (positionValue == EMPTY_OUTPUT_POSITION) {
-            return -1;
-        }
-        if (eq(mainKeySource0.getUnsafe(tableLocation), k0) && eq(mainKeySource1.getUnsafe(tableLocation), k1)) {
-            return positionValue;
-        }
-        int overflowLocation = mainOverflowLocationSource.getUnsafe(tableLocation);
-        while (overflowLocation != QueryConstants.NULL_INT) {
-            if (eq(overflowKeySource0.getUnsafe(overflowLocation), k0) && eq(overflowKeySource1.getUnsafe(overflowLocation), k1)) {
-                return overflowOutputPosition.getUnsafe(overflowLocation);
-            }
-            overflowLocation = overflowOverflowLocationSource.getUnsafe(overflowLocation);
-        }
-        return -1;
-    }
-}
diff --git a/engine/table/src/main/java/io/deephaven/engine/table/impl/by/typed/incagg/gen/IncrementalAggHasherFloat.java b/engine/table/src/main/java/io/deephaven/engine/table/impl/by/typed/incagg/gen/IncrementalAggHasherFloat.java
deleted file mode 100644
index 0b297c82e28..00000000000
--- a/engine/table/src/main/java/io/deephaven/engine/table/impl/by/typed/incagg/gen/IncrementalAggHasherFloat.java
+++ /dev/null
@@ -1,180 +0,0 @@
-//
-// Copyright (c) 2016-2024 Deephaven Data Labs and Patent Pending
-//
-// ****** AUTO-GENERATED CLASS - DO NOT EDIT MANUALLY
-// ****** Run ReplicateTypedHashers or ./gradlew replicateTypedHashers to regenerate
-//
-// @formatter:off
-package io.deephaven.engine.table.impl.by.typed.incagg.gen;
-
-import static io.deephaven.util.compare.FloatComparisons.eq;
-
-import io.deephaven.chunk.Chunk;
-import io.deephaven.chunk.FloatChunk;
-import io.deephaven.chunk.attributes.Values;
-import io.deephaven.chunk.util.hashing.FloatChunkHasher;
-import io.deephaven.engine.rowset.RowSequence;
-import io.deephaven.engine.table.ColumnSource;
-import io.deephaven.engine.table.impl.by.HashHandler;
-import io.deephaven.engine.table.impl.by.IncrementalChunkedOperatorAggregationStateManagerTypedBase;
-import io.deephaven.engine.table.impl.sources.FloatArraySource;
-import io.deephaven.util.QueryConstants;
-import io.deephaven.util.type.TypeUtils;
-import java.lang.Float;
-import java.lang.Object;
-import java.lang.Override;
-
-final class IncrementalAggHasherFloat extends IncrementalChunkedOperatorAggregationStateManagerTypedBase {
-    private final FloatArraySource mainKeySource0;
-
-    private final FloatArraySource overflowKeySource0;
-
-    public IncrementalAggHasherFloat(ColumnSource[] tableKeySources,
-            ColumnSource[] originalTableKeySources, int tableSize, double maximumLoadFactor,
-            double targetLoadFactor) {
-        super(tableKeySources, tableSize, maximumLoadFactor, targetLoadFactor);
-        this.mainKeySource0 = (FloatArraySource) super.mainKeySources[0];
-        this.overflowKeySource0 = (FloatArraySource) super.overflowKeySources[0];
-    }
-
-    @Override
-    protected void build(HashHandler handler, RowSequence rowSequence, Chunk[] sourceKeyChunks) {
-        final FloatChunk<Values> keyChunk0 = sourceKeyChunks[0].asFloatChunk();
-        final int chunkSize = keyChunk0.size();
-        for (int chunkPosition = 0; chunkPosition < chunkSize; ++chunkPosition) {
-            final float k0 = keyChunk0.get(chunkPosition);
-            final int hash = hash(k0);
-            final int tableLocation = hashToTableLocation(tableHashPivot, hash);
-            if (mainOutputPosition.getUnsafe(tableLocation) == EMPTY_OUTPUT_POSITION) {
-                numEntries++;
-                mainKeySource0.set(tableLocation, k0);
-                handler.doMainInsert(tableLocation, chunkPosition);
-            } else if (eq(mainKeySource0.getUnsafe(tableLocation), k0)) {
-                handler.doMainFound(tableLocation, chunkPosition);
-            } else {
-                int overflowLocation = mainOverflowLocationSource.getUnsafe(tableLocation);
-                if (!findOverflow(handler, k0, chunkPosition, overflowLocation)) {
-                    final int newOverflowLocation = allocateOverflowLocation();
-                    overflowKeySource0.set(newOverflowLocation, k0);
-                    mainOverflowLocationSource.set(tableLocation, newOverflowLocation);
-                    overflowOverflowLocationSource.set(newOverflowLocation, overflowLocation);
-                    numEntries++;
-                    handler.doOverflowInsert(newOverflowLocation, chunkPosition);
-                }
-            }
-        }
-    }
-
-    @Override
-    protected void probe(HashHandler handler, RowSequence rowSequence, Chunk[] sourceKeyChunks) {
-        final FloatChunk<Values> keyChunk0 = sourceKeyChunks[0].asFloatChunk();
-        final int chunkSize = keyChunk0.size();
-        for (int chunkPosition = 0; chunkPosition < chunkSize; ++chunkPosition) {
-            final float k0 = keyChunk0.get(chunkPosition);
-            final int hash = hash(k0);
-            final int tableLocation = hashToTableLocation(tableHashPivot, hash);
-            if (mainOutputPosition.getUnsafe(tableLocation) == EMPTY_OUTPUT_POSITION) {
-                handler.doMissing(chunkPosition);
-            } else if (eq(mainKeySource0.getUnsafe(tableLocation), k0)) {
-                handler.doMainFound(tableLocation, chunkPosition);
-            } else {
-                int overflowLocation = mainOverflowLocationSource.getUnsafe(tableLocation);
-                if (!findOverflow(handler, k0, chunkPosition, overflowLocation)) {
-                    handler.doMissing(chunkPosition);
-                }
-            }
-        }
-    }
-
-    private static int hash(float k0) {
-        int hash = FloatChunkHasher.hashInitialSingle(k0);
-        return hash;
-    }
-
-    @Override
-    protected void rehashBucket(HashHandler handler, int sourceBucket, int destBucket,
-            int bucketsToAdd) {
-        final int position = mainOutputPosition.getUnsafe(sourceBucket);
-        if (position == EMPTY_OUTPUT_POSITION) {
-            return;
-        }
-        int mainInsertLocation = maybeMoveMainBucket(handler, sourceBucket, destBucket, bucketsToAdd);
-        int overflowLocation = mainOverflowLocationSource.getUnsafe(sourceBucket);
-        mainOverflowLocationSource.set(sourceBucket, QueryConstants.NULL_INT);
-        mainOverflowLocationSource.set(destBucket, QueryConstants.NULL_INT);
-        while (overflowLocation != QueryConstants.NULL_INT) {
-            final int nextOverflowLocation = overflowOverflowLocationSource.getUnsafe(overflowLocation);
-            final float overflowKey0 = overflowKeySource0.getUnsafe(overflowLocation);
-            final int overflowHash = hash(overflowKey0);
-            final int overflowTableLocation = hashToTableLocation(tableHashPivot + bucketsToAdd, overflowHash);
-            if (overflowTableLocation == mainInsertLocation) {
-                mainKeySource0.set(mainInsertLocation, overflowKey0);
-                mainOutputPosition.set(mainInsertLocation, overflowOutputPosition.getUnsafe(overflowLocation));
-                handler.doPromoteOverflow(overflowLocation, mainInsertLocation);
-                overflowOutputPosition.set(overflowLocation, QueryConstants.NULL_INT);
-                overflowKeySource0.set(overflowLocation, QueryConstants.NULL_FLOAT);
-                freeOverflowLocation(overflowLocation);
-                mainInsertLocation = -1;
-            } else {
-                final int oldOverflowLocation = mainOverflowLocationSource.getUnsafe(overflowTableLocation);
-                mainOverflowLocationSource.set(overflowTableLocation, overflowLocation);
-                overflowOverflowLocationSource.set(overflowLocation, oldOverflowLocation);
-            }
-            overflowLocation = nextOverflowLocation;
-        }
-    }
-
-    private int maybeMoveMainBucket(HashHandler handler, int sourceBucket, int destBucket,
-            int bucketsToAdd) {
-        final float k0 = mainKeySource0.getUnsafe(sourceBucket);
-        final int hash = hash(k0);
-        final int location = hashToTableLocation(tableHashPivot + bucketsToAdd, hash);
-        final int mainInsertLocation;
-        if (location == sourceBucket) {
-            mainInsertLocation = destBucket;
-            mainOutputPosition.set(destBucket, EMPTY_OUTPUT_POSITION);
-        } else {
-            mainInsertLocation = sourceBucket;
-            mainOutputPosition.set(destBucket, mainOutputPosition.getUnsafe(sourceBucket));
-            mainOutputPosition.set(sourceBucket, EMPTY_OUTPUT_POSITION);
-            mainKeySource0.set(destBucket, k0);
-            mainKeySource0.set(sourceBucket, QueryConstants.NULL_FLOAT);
-            handler.doMoveMain(sourceBucket, destBucket);
-        }
-        return mainInsertLocation;
-    }
-
-    private boolean findOverflow(HashHandler handler, float k0, int chunkPosition,
-            int overflowLocation) {
-        while (overflowLocation != QueryConstants.NULL_INT) {
-            if (eq(overflowKeySource0.getUnsafe(overflowLocation), k0)) {
-                handler.doOverflowFound(overflowLocation, chunkPosition);
-                return true;
-            }
-            overflowLocation = overflowOverflowLocationSource.getUnsafe(overflowLocation);
-        }
-        return false;
-    }
-
-    @Override
-    public int findPositionForKey(Object key) {
-        final float k0 = TypeUtils.unbox((Float)key);
-        int hash = hash(k0);
-        final int tableLocation = hashToTableLocation(tableHashPivot, hash);
-        final int positionValue = mainOutputPosition.getUnsafe(tableLocation);
-        if (positionValue == EMPTY_OUTPUT_POSITION) {
-            return -1;
-        }
-        if (eq(mainKeySource0.getUnsafe(tableLocation), k0)) {
-            return positionValue;
-        }
-        int overflowLocation = mainOverflowLocationSource.getUnsafe(tableLocation);
-        while (overflowLocation != QueryConstants.NULL_INT) {
-            if (eq(overflowKeySource0.getUnsafe(overflowLocation), k0)) {
-                return overflowOutputPosition.getUnsafe(overflowLocation);
-            }
-            overflowLocation = overflowOverflowLocationSource.getUnsafe(overflowLocation);
-        }
-        return -1;
-    }
-}
diff --git a/engine/table/src/main/java/io/deephaven/engine/table/impl/by/typed/incagg/gen/IncrementalAggHasherFloatByte.java b/engine/table/src/main/java/io/deephaven/engine/table/impl/by/typed/incagg/gen/IncrementalAggHasherFloatByte.java
deleted file mode 100644
index 95d6b0900f2..00000000000
--- a/engine/table/src/main/java/io/deephaven/engine/table/impl/by/typed/incagg/gen/IncrementalAggHasherFloatByte.java
+++ /dev/null
@@ -1,206 +0,0 @@
-//
-// Copyright (c) 2016-2024 Deephaven Data Labs and Patent Pending
-//
-// ****** AUTO-GENERATED CLASS - DO NOT EDIT MANUALLY
-// ****** Run ReplicateTypedHashers or ./gradlew replicateTypedHashers to regenerate
-//
-// @formatter:off
-package io.deephaven.engine.table.impl.by.typed.incagg.gen;
-
-import static io.deephaven.util.compare.ByteComparisons.eq;
-import static io.deephaven.util.compare.FloatComparisons.eq;
-
-import io.deephaven.chunk.ByteChunk;
-import io.deephaven.chunk.Chunk;
-import io.deephaven.chunk.FloatChunk;
-import io.deephaven.chunk.attributes.Values;
-import io.deephaven.chunk.util.hashing.ByteChunkHasher;
-import io.deephaven.chunk.util.hashing.FloatChunkHasher;
-import io.deephaven.engine.rowset.RowSequence;
-import io.deephaven.engine.table.ColumnSource;
-import io.deephaven.engine.table.impl.by.HashHandler;
-import io.deephaven.engine.table.impl.by.IncrementalChunkedOperatorAggregationStateManagerTypedBase;
-import io.deephaven.engine.table.impl.sources.ByteArraySource;
-import io.deephaven.engine.table.impl.sources.FloatArraySource;
-import io.deephaven.util.QueryConstants;
-import io.deephaven.util.type.TypeUtils;
-import java.lang.Byte;
-import java.lang.Float;
-import java.lang.Object;
-import java.lang.Override;
-
-final class IncrementalAggHasherFloatByte extends IncrementalChunkedOperatorAggregationStateManagerTypedBase {
-    private final FloatArraySource mainKeySource0;
-
-    private final FloatArraySource overflowKeySource0;
-
-    private final ByteArraySource mainKeySource1;
-
-    private final ByteArraySource overflowKeySource1;
-
-    public IncrementalAggHasherFloatByte(ColumnSource[] tableKeySources,
-            ColumnSource[] originalTableKeySources, int tableSize, double maximumLoadFactor,
-            double targetLoadFactor) {
-        super(tableKeySources, tableSize, maximumLoadFactor, targetLoadFactor);
-        this.mainKeySource0 = (FloatArraySource) super.mainKeySources[0];
-        this.overflowKeySource0 = (FloatArraySource) super.overflowKeySources[0];
-        this.mainKeySource1 = (ByteArraySource) super.mainKeySources[1];
-        this.overflowKeySource1 = (ByteArraySource) super.overflowKeySources[1];
-    }
-
-    @Override
-    protected void build(HashHandler handler, RowSequence rowSequence, Chunk[] sourceKeyChunks) {
-        final FloatChunk<Values> keyChunk0 = sourceKeyChunks[0].asFloatChunk();
-        final ByteChunk<Values> keyChunk1 = sourceKeyChunks[1].asByteChunk();
-        final int chunkSize = keyChunk0.size();
-        for (int chunkPosition = 0; chunkPosition < chunkSize; ++chunkPosition) {
-            final float k0 = keyChunk0.get(chunkPosition);
-            final byte k1 = keyChunk1.get(chunkPosition);
-            final int hash = hash(k0, k1);
-            final int tableLocation = hashToTableLocation(tableHashPivot, hash);
-            if (mainOutputPosition.getUnsafe(tableLocation) == EMPTY_OUTPUT_POSITION) {
-                numEntries++;
-                mainKeySource0.set(tableLocation, k0);
-                mainKeySource1.set(tableLocation, k1);
-                handler.doMainInsert(tableLocation, chunkPosition);
-            } else if (eq(mainKeySource0.getUnsafe(tableLocation), k0) && eq(mainKeySource1.getUnsafe(tableLocation), k1)) {
-                handler.doMainFound(tableLocation, chunkPosition);
-            } else {
-                int overflowLocation = mainOverflowLocationSource.getUnsafe(tableLocation);
-                if (!findOverflow(handler, k0, k1, chunkPosition, overflowLocation)) {
-                    final int newOverflowLocation = allocateOverflowLocation();
-                    overflowKeySource0.set(newOverflowLocation, k0);
-                    overflowKeySource1.set(newOverflowLocation, k1);
-                    mainOverflowLocationSource.set(tableLocation, newOverflowLocation);
-                    overflowOverflowLocationSource.set(newOverflowLocation, overflowLocation);
-                    numEntries++;
-                    handler.doOverflowInsert(newOverflowLocation, chunkPosition);
-                }
-            }
-        }
-    }
-
-    @Override
-    protected void probe(HashHandler handler, RowSequence rowSequence, Chunk[] sourceKeyChunks) {
-        final FloatChunk<Values> keyChunk0 = sourceKeyChunks[0].asFloatChunk();
-        final ByteChunk<Values> keyChunk1 = sourceKeyChunks[1].asByteChunk();
-        final int chunkSize = keyChunk0.size();
-        for (int chunkPosition = 0; chunkPosition < chunkSize; ++chunkPosition) {
-            final float k0 = keyChunk0.get(chunkPosition);
-            final byte k1 = keyChunk1.get(chunkPosition);
-            final int hash = hash(k0, k1);
-            final int tableLocation = hashToTableLocation(tableHashPivot, hash);
-            if (mainOutputPosition.getUnsafe(tableLocation) == EMPTY_OUTPUT_POSITION) {
-                handler.doMissing(chunkPosition);
-            } else if (eq(mainKeySource0.getUnsafe(tableLocation), k0) && eq(mainKeySource1.getUnsafe(tableLocation), k1)) {
-                handler.doMainFound(tableLocation, chunkPosition);
-            } else {
-                int overflowLocation = mainOverflowLocationSource.getUnsafe(tableLocation);
-                if (!findOverflow(handler, k0, k1, chunkPosition, overflowLocation)) {
-                    handler.doMissing(chunkPosition);
-                }
-            }
-        }
-    }
-
-    private static int hash(float k0, byte k1) {
-        int hash = FloatChunkHasher.hashInitialSingle(k0);
-        hash = ByteChunkHasher.hashUpdateSingle(hash, k1);
-        return hash;
-    }
-
-    @Override
-    protected void rehashBucket(HashHandler handler, int sourceBucket, int destBucket,
-            int bucketsToAdd) {
-        final int position = mainOutputPosition.getUnsafe(sourceBucket);
-        if (position == EMPTY_OUTPUT_POSITION) {
-            return;
-        }
-        int mainInsertLocation = maybeMoveMainBucket(handler, sourceBucket, destBucket, bucketsToAdd);
-        int overflowLocation = mainOverflowLocationSource.getUnsafe(sourceBucket);
-        mainOverflowLocationSource.set(sourceBucket, QueryConstants.NULL_INT);
-        mainOverflowLocationSource.set(destBucket, QueryConstants.NULL_INT);
-        while (overflowLocation != QueryConstants.NULL_INT) {
-            final int nextOverflowLocation = overflowOverflowLocationSource.getUnsafe(overflowLocation);
-            final float overflowKey0 = overflowKeySource0.getUnsafe(overflowLocation);
-            final byte overflowKey1 = overflowKeySource1.getUnsafe(overflowLocation);
-            final int overflowHash = hash(overflowKey0, overflowKey1);
-            final int overflowTableLocation = hashToTableLocation(tableHashPivot + bucketsToAdd, overflowHash);
-            if (overflowTableLocation == mainInsertLocation) {
-                mainKeySource0.set(mainInsertLocation, overflowKey0);
-                mainKeySource1.set(mainInsertLocation, overflowKey1);
-                mainOutputPosition.set(mainInsertLocation, overflowOutputPosition.getUnsafe(overflowLocation));
-                handler.doPromoteOverflow(overflowLocation, mainInsertLocation);
-                overflowOutputPosition.set(overflowLocation, QueryConstants.NULL_INT);
-                overflowKeySource0.set(overflowLocation, QueryConstants.NULL_FLOAT);
-                overflowKeySource1.set(overflowLocation, QueryConstants.NULL_BYTE);
-                freeOverflowLocation(overflowLocation);
-                mainInsertLocation = -1;
-            } else {
-                final int oldOverflowLocation = mainOverflowLocationSource.getUnsafe(overflowTableLocation);
-                mainOverflowLocationSource.set(overflowTableLocation, overflowLocation);
-                overflowOverflowLocationSource.set(overflowLocation, oldOverflowLocation);
-            }
-            overflowLocation = nextOverflowLocation;
-        }
-    }
-
-    private int maybeMoveMainBucket(HashHandler handler, int sourceBucket, int destBucket,
-            int bucketsToAdd) {
-        final float k0 = mainKeySource0.getUnsafe(sourceBucket);
-        final byte k1 = mainKeySource1.getUnsafe(sourceBucket);
-        final int hash = hash(k0, k1);
-        final int location = hashToTableLocation(tableHashPivot + bucketsToAdd, hash);
-        final int mainInsertLocation;
-        if (location == sourceBucket) {
-            mainInsertLocation = destBucket;
-            mainOutputPosition.set(destBucket, EMPTY_OUTPUT_POSITION);
-        } else {
-            mainInsertLocation = sourceBucket;
-            mainOutputPosition.set(destBucket, mainOutputPosition.getUnsafe(sourceBucket));
-            mainOutputPosition.set(sourceBucket, EMPTY_OUTPUT_POSITION);
-            mainKeySource0.set(destBucket, k0);
-            mainKeySource0.set(sourceBucket, QueryConstants.NULL_FLOAT);
-            mainKeySource1.set(destBucket, k1);
-            mainKeySource1.set(sourceBucket, QueryConstants.NULL_BYTE);
-            handler.doMoveMain(sourceBucket, destBucket);
-        }
-        return mainInsertLocation;
-    }
-
-    private boolean findOverflow(HashHandler handler, float k0, byte k1, int chunkPosition,
-            int overflowLocation) {
-        while (overflowLocation != QueryConstants.NULL_INT) {
-            if (eq(overflowKeySource0.getUnsafe(overflowLocation), k0) && eq(overflowKeySource1.getUnsafe(overflowLocation), k1)) {
-                handler.doOverflowFound(overflowLocation, chunkPosition);
-                return true;
-            }
-            overflowLocation = overflowOverflowLocationSource.getUnsafe(overflowLocation);
-        }
-        return false;
-    }
-
-    @Override
-    public int findPositionForKey(Object key) {
-        final Object [] ka = (Object[])key;
-        final float k0 = TypeUtils.unbox((Float)ka[0]);
-        final byte k1 = TypeUtils.unbox((Byte)ka[1]);
-        int hash = hash(k0, k1);
-        final int tableLocation = hashToTableLocation(tableHashPivot, hash);
-        final int positionValue = mainOutputPosition.getUnsafe(tableLocation);
-        if (positionValue == EMPTY_OUTPUT_POSITION) {
-            return -1;
-        }
-        if (eq(mainKeySource0.getUnsafe(tableLocation), k0) && eq(mainKeySource1.getUnsafe(tableLocation), k1)) {
-            return positionValue;
-        }
-        int overflowLocation = mainOverflowLocationSource.getUnsafe(tableLocation);
-        while (overflowLocation != QueryConstants.NULL_INT) {
-            if (eq(overflowKeySource0.getUnsafe(overflowLocation), k0) && eq(overflowKeySource1.getUnsafe(overflowLocation), k1)) {
-                return overflowOutputPosition.getUnsafe(overflowLocation);
-            }
-            overflowLocation = overflowOverflowLocationSource.getUnsafe(overflowLocation);
-        }
-        return -1;
-    }
-}
diff --git a/engine/table/src/main/java/io/deephaven/engine/table/impl/by/typed/incagg/gen/IncrementalAggHasherFloatChar.java b/engine/table/src/main/java/io/deephaven/engine/table/impl/by/typed/incagg/gen/IncrementalAggHasherFloatChar.java
deleted file mode 100644
index 0b52c0d4993..00000000000
--- a/engine/table/src/main/java/io/deephaven/engine/table/impl/by/typed/incagg/gen/IncrementalAggHasherFloatChar.java
+++ /dev/null
@@ -1,206 +0,0 @@
-//
-// Copyright (c) 2016-2024 Deephaven Data Labs and Patent Pending
-//
-// ****** AUTO-GENERATED CLASS - DO NOT EDIT MANUALLY
-// ****** Run ReplicateTypedHashers or ./gradlew replicateTypedHashers to regenerate
-//
-// @formatter:off
-package io.deephaven.engine.table.impl.by.typed.incagg.gen;
-
-import static io.deephaven.util.compare.CharComparisons.eq;
-import static io.deephaven.util.compare.FloatComparisons.eq;
-
-import io.deephaven.chunk.CharChunk;
-import io.deephaven.chunk.Chunk;
-import io.deephaven.chunk.FloatChunk;
-import io.deephaven.chunk.attributes.Values;
-import io.deephaven.chunk.util.hashing.CharChunkHasher;
-import io.deephaven.chunk.util.hashing.FloatChunkHasher;
-import io.deephaven.engine.rowset.RowSequence;
-import io.deephaven.engine.table.ColumnSource;
-import io.deephaven.engine.table.impl.by.HashHandler;
-import io.deephaven.engine.table.impl.by.IncrementalChunkedOperatorAggregationStateManagerTypedBase;
-import io.deephaven.engine.table.impl.sources.CharacterArraySource;
-import io.deephaven.engine.table.impl.sources.FloatArraySource;
-import io.deephaven.util.QueryConstants;
-import io.deephaven.util.type.TypeUtils;
-import java.lang.Character;
-import java.lang.Float;
-import java.lang.Object;
-import java.lang.Override;
-
-final class IncrementalAggHasherFloatChar extends IncrementalChunkedOperatorAggregationStateManagerTypedBase {
-    private final FloatArraySource mainKeySource0;
-
-    private final FloatArraySource overflowKeySource0;
-
-    private final CharacterArraySource mainKeySource1;
-
-    private final CharacterArraySource overflowKeySource1;
-
-    public IncrementalAggHasherFloatChar(ColumnSource[] tableKeySources,
-            ColumnSource[] originalTableKeySources, int tableSize, double maximumLoadFactor,
-            double targetLoadFactor) {
-        super(tableKeySources, tableSize, maximumLoadFactor, targetLoadFactor);
-        this.mainKeySource0 = (FloatArraySource) super.mainKeySources[0];
-        this.overflowKeySource0 = (FloatArraySource) super.overflowKeySources[0];
-        this.mainKeySource1 = (CharacterArraySource) super.mainKeySources[1];
-        this.overflowKeySource1 = (CharacterArraySource) super.overflowKeySources[1];
-    }
-
-    @Override
-    protected void build(HashHandler handler, RowSequence rowSequence, Chunk[] sourceKeyChunks) {
-        final FloatChunk<Values> keyChunk0 = sourceKeyChunks[0].asFloatChunk();
-        final CharChunk<Values> keyChunk1 = sourceKeyChunks[1].asCharChunk();
-        final int chunkSize = keyChunk0.size();
-        for (int chunkPosition = 0; chunkPosition < chunkSize; ++chunkPosition) {
-            final float k0 = keyChunk0.get(chunkPosition);
-            final char k1 = keyChunk1.get(chunkPosition);
-            final int hash = hash(k0, k1);
-            final int tableLocation = hashToTableLocation(tableHashPivot, hash);
-            if (mainOutputPosition.getUnsafe(tableLocation) == EMPTY_OUTPUT_POSITION) {
-                numEntries++;
-                mainKeySource0.set(tableLocation, k0);
-                mainKeySource1.set(tableLocation, k1);
-                handler.doMainInsert(tableLocation, chunkPosition);
-            } else if (eq(mainKeySource0.getUnsafe(tableLocation), k0) && eq(mainKeySource1.getUnsafe(tableLocation), k1)) {
-                handler.doMainFound(tableLocation, chunkPosition);
-            } else {
-                int overflowLocation = mainOverflowLocationSource.getUnsafe(tableLocation);
-                if (!findOverflow(handler, k0, k1, chunkPosition, overflowLocation)) {
-                    final int newOverflowLocation = allocateOverflowLocation();
-                    overflowKeySource0.set(newOverflowLocation, k0);
-                    overflowKeySource1.set(newOverflowLocation, k1);
-                    mainOverflowLocationSource.set(tableLocation, newOverflowLocation);
-                    overflowOverflowLocationSource.set(newOverflowLocation, overflowLocation);
-                    numEntries++;
-                    handler.doOverflowInsert(newOverflowLocation, chunkPosition);
-                }
-            }
-        }
-    }
-
-    @Override
-    protected void probe(HashHandler handler, RowSequence rowSequence, Chunk[] sourceKeyChunks) {
-        final FloatChunk<Values> keyChunk0 = sourceKeyChunks[0].asFloatChunk();
-        final CharChunk<Values> keyChunk1 = sourceKeyChunks[1].asCharChunk();
-        final int chunkSize = keyChunk0.size();
-        for (int chunkPosition = 0; chunkPosition < chunkSize; ++chunkPosition) {
-            final float k0 = keyChunk0.get(chunkPosition);
-            final char k1 = keyChunk1.get(chunkPosition);
-            final int hash = hash(k0, k1);
-            final int tableLocation = hashToTableLocation(tableHashPivot, hash);
-            if (mainOutputPosition.getUnsafe(tableLocation) == EMPTY_OUTPUT_POSITION) {
-                handler.doMissing(chunkPosition);
-            } else if (eq(mainKeySource0.getUnsafe(tableLocation), k0) && eq(mainKeySource1.getUnsafe(tableLocation), k1)) {
-                handler.doMainFound(tableLocation, chunkPosition);
-            } else {
-                int overflowLocation = mainOverflowLocationSource.getUnsafe(tableLocation);
-                if (!findOverflow(handler, k0, k1, chunkPosition, overflowLocation)) {
-                    handler.doMissing(chunkPosition);
-                }
-            }
-        }
-    }
-
-    private static int hash(float k0, char k1) {
-        int hash = FloatChunkHasher.hashInitialSingle(k0);
-        hash = CharChunkHasher.hashUpdateSingle(hash, k1);
-        return hash;
-    }
-
-    @Override
-    protected void rehashBucket(HashHandler handler, int sourceBucket, int destBucket,
-            int bucketsToAdd) {
-        final int position = mainOutputPosition.getUnsafe(sourceBucket);
-        if (position == EMPTY_OUTPUT_POSITION) {
-            return;
-        }
-        int mainInsertLocation = maybeMoveMainBucket(handler, sourceBucket, destBucket, bucketsToAdd);
-        int overflowLocation = mainOverflowLocationSource.getUnsafe(sourceBucket);
-        mainOverflowLocationSource.set(sourceBucket, QueryConstants.NULL_INT);
-        mainOverflowLocationSource.set(destBucket, QueryConstants.NULL_INT);
-        while (overflowLocation != QueryConstants.NULL_INT) {
-            final int nextOverflowLocation = overflowOverflowLocationSource.getUnsafe(overflowLocation);
-            final float overflowKey0 = overflowKeySource0.getUnsafe(overflowLocation);
-            final char overflowKey1 = overflowKeySource1.getUnsafe(overflowLocation);
-            final int overflowHash = hash(overflowKey0, overflowKey1);
-            final int overflowTableLocation = hashToTableLocation(tableHashPivot + bucketsToAdd, overflowHash);
-            if (overflowTableLocation == mainInsertLocation) {
-                mainKeySource0.set(mainInsertLocation, overflowKey0);
-                mainKeySource1.set(mainInsertLocation, overflowKey1);
-                mainOutputPosition.set(mainInsertLocation, overflowOutputPosition.getUnsafe(overflowLocation));
-                handler.doPromoteOverflow(overflowLocation, mainInsertLocation);
-                overflowOutputPosition.set(overflowLocation, QueryConstants.NULL_INT);
-                overflowKeySource0.set(overflowLocation, QueryConstants.NULL_FLOAT);
-                overflowKeySource1.set(overflowLocation, QueryConstants.NULL_CHAR);
-                freeOverflowLocation(overflowLocation);
-                mainInsertLocation = -1;
-            } else {
-                final int oldOverflowLocation = mainOverflowLocationSource.getUnsafe(overflowTableLocation);
-                mainOverflowLocationSource.set(overflowTableLocation, overflowLocation);
-                overflowOverflowLocationSource.set(overflowLocation, oldOverflowLocation);
-            }
-            overflowLocation = nextOverflowLocation;
-        }
-    }
-
-    private int maybeMoveMainBucket(HashHandler handler, int sourceBucket, int destBucket,
-            int bucketsToAdd) {
-        final float k0 = mainKeySource0.getUnsafe(sourceBucket);
-        final char k1 = mainKeySource1.getUnsafe(sourceBucket);
-        final int hash = hash(k0, k1);
-        final int location = hashToTableLocation(tableHashPivot + bucketsToAdd, hash);
-        final int mainInsertLocation;
-        if (location == sourceBucket) {
-            mainInsertLocation = destBucket;
-            mainOutputPosition.set(destBucket, EMPTY_OUTPUT_POSITION);
-        } else {
-            mainInsertLocation = sourceBucket;
-            mainOutputPosition.set(destBucket, mainOutputPosition.getUnsafe(sourceBucket));
-            mainOutputPosition.set(sourceBucket, EMPTY_OUTPUT_POSITION);
-            mainKeySource0.set(destBucket, k0);
-            mainKeySource0.set(sourceBucket, QueryConstants.NULL_FLOAT);
-            mainKeySource1.set(destBucket, k1);
-            mainKeySource1.set(sourceBucket, QueryConstants.NULL_CHAR);
-            handler.doMoveMain(sourceBucket, destBucket);
-        }
-        return mainInsertLocation;
-    }
-
-    private boolean findOverflow(HashHandler handler, float k0, char k1, int chunkPosition,
-            int overflowLocation) {
-        while (overflowLocation != QueryConstants.NULL_INT) {
-            if (eq(overflowKeySource0.getUnsafe(overflowLocation), k0) && eq(overflowKeySource1.getUnsafe(overflowLocation), k1)) {
-                handler.doOverflowFound(overflowLocation, chunkPosition);
-                return true;
-            }
-            overflowLocation = overflowOverflowLocationSource.getUnsafe(overflowLocation);
-        }
-        return false;
-    }
-
-    @Override
-    public int findPositionForKey(Object key) {
-        final Object [] ka = (Object[])key;
-        final float k0 = TypeUtils.unbox((Float)ka[0]);
-        final char k1 = TypeUtils.unbox((Character)ka[1]);
-        int hash = hash(k0, k1);
-        final int tableLocation = hashToTableLocation(tableHashPivot, hash);
-        final int positionValue = mainOutputPosition.getUnsafe(tableLocation);
-        if (positionValue == EMPTY_OUTPUT_POSITION) {
-            return -1;
-        }
-        if (eq(mainKeySource0.getUnsafe(tableLocation), k0) && eq(mainKeySource1.getUnsafe(tableLocation), k1)) {
-            return positionValue;
-        }
-        int overflowLocation = mainOverflowLocationSource.getUnsafe(tableLocation);
-        while (overflowLocation != QueryConstants.NULL_INT) {
-            if (eq(overflowKeySource0.getUnsafe(overflowLocation), k0) && eq(overflowKeySource1.getUnsafe(overflowLocation), k1)) {
-                return overflowOutputPosition.getUnsafe(overflowLocation);
-            }
-            overflowLocation = overflowOverflowLocationSource.getUnsafe(overflowLocation);
-        }
-        return -1;
-    }
-}
diff --git a/engine/table/src/main/java/io/deephaven/engine/table/impl/by/typed/incagg/gen/IncrementalAggHasherFloatDouble.java b/engine/table/src/main/java/io/deephaven/engine/table/impl/by/typed/incagg/gen/IncrementalAggHasherFloatDouble.java
deleted file mode 100644
index 45ac96dec4e..00000000000
--- a/engine/table/src/main/java/io/deephaven/engine/table/impl/by/typed/incagg/gen/IncrementalAggHasherFloatDouble.java
+++ /dev/null
@@ -1,206 +0,0 @@
-//
-// Copyright (c) 2016-2024 Deephaven Data Labs and Patent Pending
-//
-// ****** AUTO-GENERATED CLASS - DO NOT EDIT MANUALLY
-// ****** Run ReplicateTypedHashers or ./gradlew replicateTypedHashers to regenerate
-//
-// @formatter:off
-package io.deephaven.engine.table.impl.by.typed.incagg.gen;
-
-import static io.deephaven.util.compare.DoubleComparisons.eq;
-import static io.deephaven.util.compare.FloatComparisons.eq;
-
-import io.deephaven.chunk.Chunk;
-import io.deephaven.chunk.DoubleChunk;
-import io.deephaven.chunk.FloatChunk;
-import io.deephaven.chunk.attributes.Values;
-import io.deephaven.chunk.util.hashing.DoubleChunkHasher;
-import io.deephaven.chunk.util.hashing.FloatChunkHasher;
-import io.deephaven.engine.rowset.RowSequence;
-import io.deephaven.engine.table.ColumnSource;
-import io.deephaven.engine.table.impl.by.HashHandler;
-import io.deephaven.engine.table.impl.by.IncrementalChunkedOperatorAggregationStateManagerTypedBase;
-import io.deephaven.engine.table.impl.sources.DoubleArraySource;
-import io.deephaven.engine.table.impl.sources.FloatArraySource;
-import io.deephaven.util.QueryConstants;
-import io.deephaven.util.type.TypeUtils;
-import java.lang.Double;
-import java.lang.Float;
-import java.lang.Object;
-import java.lang.Override;
-
-final class IncrementalAggHasherFloatDouble extends IncrementalChunkedOperatorAggregationStateManagerTypedBase {
-    private final FloatArraySource mainKeySource0;
-
-    private final FloatArraySource overflowKeySource0;
-
-    private final DoubleArraySource mainKeySource1;
-
-    private final DoubleArraySource overflowKeySource1;
-
-    public IncrementalAggHasherFloatDouble(ColumnSource[] tableKeySources,
-            ColumnSource[] originalTableKeySources, int tableSize, double maximumLoadFactor,
-            double targetLoadFactor) {
-        super(tableKeySources, tableSize, maximumLoadFactor, targetLoadFactor);
-        this.mainKeySource0 = (FloatArraySource) super.mainKeySources[0];
-        this.overflowKeySource0 = (FloatArraySource) super.overflowKeySources[0];
-        this.mainKeySource1 = (DoubleArraySource) super.mainKeySources[1];
-        this.overflowKeySource1 = (DoubleArraySource) super.overflowKeySources[1];
-    }
-
-    @Override
-    protected void build(HashHandler handler, RowSequence rowSequence, Chunk[] sourceKeyChunks) {
-        final FloatChunk<Values> keyChunk0 = sourceKeyChunks[0].asFloatChunk();
-        final DoubleChunk<Values> keyChunk1 = sourceKeyChunks[1].asDoubleChunk();
-        final int chunkSize = keyChunk0.size();
-        for (int chunkPosition = 0; chunkPosition < chunkSize; ++chunkPosition) {
-            final float k0 = keyChunk0.get(chunkPosition);
-            final double k1 = keyChunk1.get(chunkPosition);
-            final int hash = hash(k0, k1);
-            final int tableLocation = hashToTableLocation(tableHashPivot, hash);
-            if (mainOutputPosition.getUnsafe(tableLocation) == EMPTY_OUTPUT_POSITION) {
-                numEntries++;
-                mainKeySource0.set(tableLocation, k0);
-                mainKeySource1.set(tableLocation, k1);
-                handler.doMainInsert(tableLocation, chunkPosition);
-            } else if (eq(mainKeySource0.getUnsafe(tableLocation), k0) && eq(mainKeySource1.getUnsafe(tableLocation), k1)) {
-                handler.doMainFound(tableLocation, chunkPosition);
-            } else {
-                int overflowLocation = mainOverflowLocationSource.getUnsafe(tableLocation);
-                if (!findOverflow(handler, k0, k1, chunkPosition, overflowLocation)) {
-                    final int newOverflowLocation = allocateOverflowLocation();
-                    overflowKeySource0.set(newOverflowLocation, k0);
-                    overflowKeySource1.set(newOverflowLocation, k1);
-                    mainOverflowLocationSource.set(tableLocation, newOverflowLocation);
-                    overflowOverflowLocationSource.set(newOverflowLocation, overflowLocation);
-                    numEntries++;
-                    handler.doOverflowInsert(newOverflowLocation, chunkPosition);
-                }
-            }
-        }
-    }
-
-    @Override
-    protected void probe(HashHandler handler, RowSequence rowSequence, Chunk[] sourceKeyChunks) {
-        final FloatChunk<Values> keyChunk0 = sourceKeyChunks[0].asFloatChunk();
-        final DoubleChunk<Values> keyChunk1 = sourceKeyChunks[1].asDoubleChunk();
-        final int chunkSize = keyChunk0.size();
-        for (int chunkPosition = 0; chunkPosition < chunkSize; ++chunkPosition) {
-            final float k0 = keyChunk0.get(chunkPosition);
-            final double k1 = keyChunk1.get(chunkPosition);
-            final int hash = hash(k0, k1);
-            final int tableLocation = hashToTableLocation(tableHashPivot, hash);
-            if (mainOutputPosition.getUnsafe(tableLocation) == EMPTY_OUTPUT_POSITION) {
-                handler.doMissing(chunkPosition);
-            } else if (eq(mainKeySource0.getUnsafe(tableLocation), k0) && eq(mainKeySource1.getUnsafe(tableLocation), k1)) {
-                handler.doMainFound(tableLocation, chunkPosition);
-            } else {
-                int overflowLocation = mainOverflowLocationSource.getUnsafe(tableLocation);
-                if (!findOverflow(handler, k0, k1, chunkPosition, overflowLocation)) {
-                    handler.doMissing(chunkPosition);
-                }
-            }
-        }
-    }
-
-    private static int hash(float k0, double k1) {
-        int hash = FloatChunkHasher.hashInitialSingle(k0);
-        hash = DoubleChunkHasher.hashUpdateSingle(hash, k1);
-        return hash;
-    }
-
-    @Override
-    protected void rehashBucket(HashHandler handler, int sourceBucket, int destBucket,
-            int bucketsToAdd) {
-        final int position = mainOutputPosition.getUnsafe(sourceBucket);
-        if (position == EMPTY_OUTPUT_POSITION) {
-            return;
-        }
-        int mainInsertLocation = maybeMoveMainBucket(handler, sourceBucket, destBucket, bucketsToAdd);
-        int overflowLocation = mainOverflowLocationSource.getUnsafe(sourceBucket);
-        mainOverflowLocationSource.set(sourceBucket, QueryConstants.NULL_INT);
-        mainOverflowLocationSource.set(destBucket, QueryConstants.NULL_INT);
-        while (overflowLocation != QueryConstants.NULL_INT) {
-            final int nextOverflowLocation = overflowOverflowLocationSource.getUnsafe(overflowLocation);
-            final float overflowKey0 = overflowKeySource0.getUnsafe(overflowLocation);
-            final double overflowKey1 = overflowKeySource1.getUnsafe(overflowLocation);
-            final int overflowHash = hash(overflowKey0, overflowKey1);
-            final int overflowTableLocation = hashToTableLocation(tableHashPivot + bucketsToAdd, overflowHash);
-            if (overflowTableLocation == mainInsertLocation) {
-                mainKeySource0.set(mainInsertLocation, overflowKey0);
-                mainKeySource1.set(mainInsertLocation, overflowKey1);
-                mainOutputPosition.set(mainInsertLocation, overflowOutputPosition.getUnsafe(overflowLocation));
-                handler.doPromoteOverflow(overflowLocation, mainInsertLocation);
-                overflowOutputPosition.set(overflowLocation, QueryConstants.NULL_INT);
-                overflowKeySource0.set(overflowLocation, QueryConstants.NULL_FLOAT);
-                overflowKeySource1.set(overflowLocation, QueryConstants.NULL_DOUBLE);
-                freeOverflowLocation(overflowLocation);
-                mainInsertLocation = -1;
-            } else {
-                final int oldOverflowLocation = mainOverflowLocationSource.getUnsafe(overflowTableLocation);
-                mainOverflowLocationSource.set(overflowTableLocation, overflowLocation);
-                overflowOverflowLocationSource.set(overflowLocation, oldOverflowLocation);
-            }
-            overflowLocation = nextOverflowLocation;
-        }
-    }
-
-    private int maybeMoveMainBucket(HashHandler handler, int sourceBucket, int destBucket,
-            int bucketsToAdd) {
-        final float k0 = mainKeySource0.getUnsafe(sourceBucket);
-        final double k1 = mainKeySource1.getUnsafe(sourceBucket);
-        final int hash = hash(k0, k1);
-        final int location = hashToTableLocation(tableHashPivot + bucketsToAdd, hash);
-        final int mainInsertLocation;
-        if (location == sourceBucket) {
-            mainInsertLocation = destBucket;
-            mainOutputPosition.set(destBucket, EMPTY_OUTPUT_POSITION);
-        } else {
-            mainInsertLocation = sourceBucket;
-            mainOutputPosition.set(destBucket, mainOutputPosition.getUnsafe(sourceBucket));
-            mainOutputPosition.set(sourceBucket, EMPTY_OUTPUT_POSITION);
-            mainKeySource0.set(destBucket, k0);
-            mainKeySource0.set(sourceBucket, QueryConstants.NULL_FLOAT);
-            mainKeySource1.set(destBucket, k1);
-            mainKeySource1.set(sourceBucket, QueryConstants.NULL_DOUBLE);
-            handler.doMoveMain(sourceBucket, destBucket);
-        }
-        return mainInsertLocation;
-    }
-
-    private boolean findOverflow(HashHandler handler, float k0, double k1, int chunkPosition,
-            int overflowLocation) {
-        while (overflowLocation != QueryConstants.NULL_INT) {
-            if (eq(overflowKeySource0.getUnsafe(overflowLocation), k0) && eq(overflowKeySource1.getUnsafe(overflowLocation), k1)) {
-                handler.doOverflowFound(overflowLocation, chunkPosition);
-                return true;
-            }
-            overflowLocation = overflowOverflowLocationSource.getUnsafe(overflowLocation);
-        }
-        return false;
-    }
-
-    @Override
-    public int findPositionForKey(Object key) {
-        final Object [] ka = (Object[])key;
-        final float k0 = TypeUtils.unbox((Float)ka[0]);
-        final double k1 = TypeUtils.unbox((Double)ka[1]);
-        int hash = hash(k0, k1);
-        final int tableLocation = hashToTableLocation(tableHashPivot, hash);
-        final int positionValue = mainOutputPosition.getUnsafe(tableLocation);
-        if (positionValue == EMPTY_OUTPUT_POSITION) {
-            return -1;
-        }
-        if (eq(mainKeySource0.getUnsafe(tableLocation), k0) && eq(mainKeySource1.getUnsafe(tableLocation), k1)) {
-            return positionValue;
-        }
-        int overflowLocation = mainOverflowLocationSource.getUnsafe(tableLocation);
-        while (overflowLocation != QueryConstants.NULL_INT) {
-            if (eq(overflowKeySource0.getUnsafe(overflowLocation), k0) && eq(overflowKeySource1.getUnsafe(overflowLocation), k1)) {
-                return overflowOutputPosition.getUnsafe(overflowLocation);
-            }
-            overflowLocation = overflowOverflowLocationSource.getUnsafe(overflowLocation);
-        }
-        return -1;
-    }
-}
diff --git a/engine/table/src/main/java/io/deephaven/engine/table/impl/by/typed/incagg/gen/IncrementalAggHasherFloatFloat.java b/engine/table/src/main/java/io/deephaven/engine/table/impl/by/typed/incagg/gen/IncrementalAggHasherFloatFloat.java
deleted file mode 100644
index 588729bf6bb..00000000000
--- a/engine/table/src/main/java/io/deephaven/engine/table/impl/by/typed/incagg/gen/IncrementalAggHasherFloatFloat.java
+++ /dev/null
@@ -1,201 +0,0 @@
-//
-// Copyright (c) 2016-2024 Deephaven Data Labs and Patent Pending
-//
-// ****** AUTO-GENERATED CLASS - DO NOT EDIT MANUALLY
-// ****** Run ReplicateTypedHashers or ./gradlew replicateTypedHashers to regenerate
-//
-// @formatter:off
-package io.deephaven.engine.table.impl.by.typed.incagg.gen;
-
-import static io.deephaven.util.compare.FloatComparisons.eq;
-
-import io.deephaven.chunk.Chunk;
-import io.deephaven.chunk.FloatChunk;
-import io.deephaven.chunk.attributes.Values;
-import io.deephaven.chunk.util.hashing.FloatChunkHasher;
-import io.deephaven.engine.rowset.RowSequence;
-import io.deephaven.engine.table.ColumnSource;
-import io.deephaven.engine.table.impl.by.HashHandler;
-import io.deephaven.engine.table.impl.by.IncrementalChunkedOperatorAggregationStateManagerTypedBase;
-import io.deephaven.engine.table.impl.sources.FloatArraySource;
-import io.deephaven.util.QueryConstants;
-import io.deephaven.util.type.TypeUtils;
-import java.lang.Float;
-import java.lang.Object;
-import java.lang.Override;
-
-final class IncrementalAggHasherFloatFloat extends IncrementalChunkedOperatorAggregationStateManagerTypedBase {
-    private final FloatArraySource mainKeySource0;
-
-    private final FloatArraySource overflowKeySource0;
-
-    private final FloatArraySource mainKeySource1;
-
-    private final FloatArraySource overflowKeySource1;
-
-    public IncrementalAggHasherFloatFloat(ColumnSource[] tableKeySources,
-            ColumnSource[] originalTableKeySources, int tableSize, double maximumLoadFactor,
-            double targetLoadFactor) {
-        super(tableKeySources, tableSize, maximumLoadFactor, targetLoadFactor);
-        this.mainKeySource0 = (FloatArraySource) super.mainKeySources[0];
-        this.overflowKeySource0 = (FloatArraySource) super.overflowKeySources[0];
-        this.mainKeySource1 = (FloatArraySource) super.mainKeySources[1];
-        this.overflowKeySource1 = (FloatArraySource) super.overflowKeySources[1];
-    }
-
-    @Override
-    protected void build(HashHandler handler, RowSequence rowSequence, Chunk[] sourceKeyChunks) {
-        final FloatChunk<Values> keyChunk0 = sourceKeyChunks[0].asFloatChunk();
-        final FloatChunk<Values> keyChunk1 = sourceKeyChunks[1].asFloatChunk();
-        final int chunkSize = keyChunk0.size();
-        for (int chunkPosition = 0; chunkPosition < chunkSize; ++chunkPosition) {
-            final float k0 = keyChunk0.get(chunkPosition);
-            final float k1 = keyChunk1.get(chunkPosition);
-            final int hash = hash(k0, k1);
-            final int tableLocation = hashToTableLocation(tableHashPivot, hash);
-            if (mainOutputPosition.getUnsafe(tableLocation) == EMPTY_OUTPUT_POSITION) {
-                numEntries++;
-                mainKeySource0.set(tableLocation, k0);
-                mainKeySource1.set(tableLocation, k1);
-                handler.doMainInsert(tableLocation, chunkPosition);
-            } else if (eq(mainKeySource0.getUnsafe(tableLocation), k0) && eq(mainKeySource1.getUnsafe(tableLocation), k1)) {
-                handler.doMainFound(tableLocation, chunkPosition);
-            } else {
-                int overflowLocation = mainOverflowLocationSource.getUnsafe(tableLocation);
-                if (!findOverflow(handler, k0, k1, chunkPosition, overflowLocation)) {
-                    final int newOverflowLocation = allocateOverflowLocation();
-                    overflowKeySource0.set(newOverflowLocation, k0);
-                    overflowKeySource1.set(newOverflowLocation, k1);
-                    mainOverflowLocationSource.set(tableLocation, newOverflowLocation);
-                    overflowOverflowLocationSource.set(newOverflowLocation, overflowLocation);
-                    numEntries++;
-                    handler.doOverflowInsert(newOverflowLocation, chunkPosition);
-                }
-            }
-        }
-    }
-
-    @Override
-    protected void probe(HashHandler handler, RowSequence rowSequence, Chunk[] sourceKeyChunks) {
-        final FloatChunk<Values> keyChunk0 = sourceKeyChunks[0].asFloatChunk();
-        final FloatChunk<Values> keyChunk1 = sourceKeyChunks[1].asFloatChunk();
-        final int chunkSize = keyChunk0.size();
-        for (int chunkPosition = 0; chunkPosition < chunkSize; ++chunkPosition) {
-            final float k0 = keyChunk0.get(chunkPosition);
-            final float k1 = keyChunk1.get(chunkPosition);
-            final int hash = hash(k0, k1);
-            final int tableLocation = hashToTableLocation(tableHashPivot, hash);
-            if (mainOutputPosition.getUnsafe(tableLocation) == EMPTY_OUTPUT_POSITION) {
-                handler.doMissing(chunkPosition);
-            } else if (eq(mainKeySource0.getUnsafe(tableLocation), k0) && eq(mainKeySource1.getUnsafe(tableLocation), k1)) {
-                handler.doMainFound(tableLocation, chunkPosition);
-            } else {
-                int overflowLocation = mainOverflowLocationSource.getUnsafe(tableLocation);
-                if (!findOverflow(handler, k0, k1, chunkPosition, overflowLocation)) {
-                    handler.doMissing(chunkPosition);
-                }
-            }
-        }
-    }
-
-    private static int hash(float k0, float k1) {
-        int hash = FloatChunkHasher.hashInitialSingle(k0);
-        hash = FloatChunkHasher.hashUpdateSingle(hash, k1);
-        return hash;
-    }
-
-    @Override
-    protected void rehashBucket(HashHandler handler, int sourceBucket, int destBucket,
-            int bucketsToAdd) {
-        final int position = mainOutputPosition.getUnsafe(sourceBucket);
-        if (position == EMPTY_OUTPUT_POSITION) {
-            return;
-        }
-        int mainInsertLocation = maybeMoveMainBucket(handler, sourceBucket, destBucket, bucketsToAdd);
-        int overflowLocation = mainOverflowLocationSource.getUnsafe(sourceBucket);
-        mainOverflowLocationSource.set(sourceBucket, QueryConstants.NULL_INT);
-        mainOverflowLocationSource.set(destBucket, QueryConstants.NULL_INT);
-        while (overflowLocation != QueryConstants.NULL_INT) {
-            final int nextOverflowLocation = overflowOverflowLocationSource.getUnsafe(overflowLocation);
-            final float overflowKey0 = overflowKeySource0.getUnsafe(overflowLocation);
-            final float overflowKey1 = overflowKeySource1.getUnsafe(overflowLocation);
-            final int overflowHash = hash(overflowKey0, overflowKey1);
-            final int overflowTableLocation = hashToTableLocation(tableHashPivot + bucketsToAdd, overflowHash);
-            if (overflowTableLocation == mainInsertLocation) {
-                mainKeySource0.set(mainInsertLocation, overflowKey0);
-                mainKeySource1.set(mainInsertLocation, overflowKey1);
-                mainOutputPosition.set(mainInsertLocation, overflowOutputPosition.getUnsafe(overflowLocation));
-                handler.doPromoteOverflow(overflowLocation, mainInsertLocation);
-                overflowOutputPosition.set(overflowLocation, QueryConstants.NULL_INT);
-                overflowKeySource0.set(overflowLocation, QueryConstants.NULL_FLOAT);
-                overflowKeySource1.set(overflowLocation, QueryConstants.NULL_FLOAT);
-                freeOverflowLocation(overflowLocation);
-                mainInsertLocation = -1;
-            } else {
-                final int oldOverflowLocation = mainOverflowLocationSource.getUnsafe(overflowTableLocation);
-                mainOverflowLocationSource.set(overflowTableLocation, overflowLocation);
-                overflowOverflowLocationSource.set(overflowLocation, oldOverflowLocation);
-            }
-            overflowLocation = nextOverflowLocation;
-        }
-    }
-
-    private int maybeMoveMainBucket(HashHandler handler, int sourceBucket, int destBucket,
-            int bucketsToAdd) {
-        final float k0 = mainKeySource0.getUnsafe(sourceBucket);
-        final float k1 = mainKeySource1.getUnsafe(sourceBucket);
-        final int hash = hash(k0, k1);
-        final int location = hashToTableLocation(tableHashPivot + bucketsToAdd, hash);
-        final int mainInsertLocation;
-        if (location == sourceBucket) {
-            mainInsertLocation = destBucket;
-            mainOutputPosition.set(destBucket, EMPTY_OUTPUT_POSITION);
-        } else {
-            mainInsertLocation = sourceBucket;
-            mainOutputPosition.set(destBucket, mainOutputPosition.getUnsafe(sourceBucket));
-            mainOutputPosition.set(sourceBucket, EMPTY_OUTPUT_POSITION);
-            mainKeySource0.set(destBucket, k0);
-            mainKeySource0.set(sourceBucket, QueryConstants.NULL_FLOAT);
-            mainKeySource1.set(destBucket, k1);
-            mainKeySource1.set(sourceBucket, QueryConstants.NULL_FLOAT);
-            handler.doMoveMain(sourceBucket, destBucket);
-        }
-        return mainInsertLocation;
-    }
-
-    private boolean findOverflow(HashHandler handler, float k0, float k1, int chunkPosition,
-            int overflowLocation) {
-        while (overflowLocation != QueryConstants.NULL_INT) {
-            if (eq(overflowKeySource0.getUnsafe(overflowLocation), k0) && eq(overflowKeySource1.getUnsafe(overflowLocation), k1)) {
-                handler.doOverflowFound(overflowLocation, chunkPosition);
-                return true;
-            }
-            overflowLocation = overflowOverflowLocationSource.getUnsafe(overflowLocation);
-        }
-        return false;
-    }
-
-    @Override
-    public int findPositionForKey(Object key) {
-        final Object [] ka = (Object[])key;
-        final float k0 = TypeUtils.unbox((Float)ka[0]);
-        final float k1 = TypeUtils.unbox((Float)ka[1]);
-        int hash = hash(k0, k1);
-        final int tableLocation = hashToTableLocation(tableHashPivot, hash);
-        final int positionValue = mainOutputPosition.getUnsafe(tableLocation);
-        if (positionValue == EMPTY_OUTPUT_POSITION) {
-            return -1;
-        }
-        if (eq(mainKeySource0.getUnsafe(tableLocation), k0) && eq(mainKeySource1.getUnsafe(tableLocation), k1)) {
-            return positionValue;
-        }
-        int overflowLocation = mainOverflowLocationSource.getUnsafe(tableLocation);
-        while (overflowLocation != QueryConstants.NULL_INT) {
-            if (eq(overflowKeySource0.getUnsafe(overflowLocation), k0) && eq(overflowKeySource1.getUnsafe(overflowLocation), k1)) {
-                return overflowOutputPosition.getUnsafe(overflowLocation);
-            }
-            overflowLocation = overflowOverflowLocationSource.getUnsafe(overflowLocation);
-        }
-        return -1;
-    }
-}
diff --git a/engine/table/src/main/java/io/deephaven/engine/table/impl/by/typed/incagg/gen/IncrementalAggHasherFloatInt.java b/engine/table/src/main/java/io/deephaven/engine/table/impl/by/typed/incagg/gen/IncrementalAggHasherFloatInt.java
deleted file mode 100644
index ade719c7d99..00000000000
--- a/engine/table/src/main/java/io/deephaven/engine/table/impl/by/typed/incagg/gen/IncrementalAggHasherFloatInt.java
+++ /dev/null
@@ -1,206 +0,0 @@
-//
-// Copyright (c) 2016-2024 Deephaven Data Labs and Patent Pending
-//
-// ****** AUTO-GENERATED CLASS - DO NOT EDIT MANUALLY
-// ****** Run ReplicateTypedHashers or ./gradlew replicateTypedHashers to regenerate
-//
-// @formatter:off
-package io.deephaven.engine.table.impl.by.typed.incagg.gen;
-
-import static io.deephaven.util.compare.FloatComparisons.eq;
-import static io.deephaven.util.compare.IntComparisons.eq;
-
-import io.deephaven.chunk.Chunk;
-import io.deephaven.chunk.FloatChunk;
-import io.deephaven.chunk.IntChunk;
-import io.deephaven.chunk.attributes.Values;
-import io.deephaven.chunk.util.hashing.FloatChunkHasher;
-import io.deephaven.chunk.util.hashing.IntChunkHasher;
-import io.deephaven.engine.rowset.RowSequence;
-import io.deephaven.engine.table.ColumnSource;
-import io.deephaven.engine.table.impl.by.HashHandler;
-import io.deephaven.engine.table.impl.by.IncrementalChunkedOperatorAggregationStateManagerTypedBase;
-import io.deephaven.engine.table.impl.sources.FloatArraySource;
-import io.deephaven.engine.table.impl.sources.IntegerArraySource;
-import io.deephaven.util.QueryConstants;
-import io.deephaven.util.type.TypeUtils;
-import java.lang.Float;
-import java.lang.Integer;
-import java.lang.Object;
-import java.lang.Override;
-
-final class IncrementalAggHasherFloatInt extends IncrementalChunkedOperatorAggregationStateManagerTypedBase {
-    private final FloatArraySource mainKeySource0;
-
-    private final FloatArraySource overflowKeySource0;
-
-    private final IntegerArraySource mainKeySource1;
-
-    private final IntegerArraySource overflowKeySource1;
-
-    public IncrementalAggHasherFloatInt(ColumnSource[] tableKeySources,
-            ColumnSource[] originalTableKeySources, int tableSize, double maximumLoadFactor,
-            double targetLoadFactor) {
-        super(tableKeySources, tableSize, maximumLoadFactor, targetLoadFactor);
-        this.mainKeySource0 = (FloatArraySource) super.mainKeySources[0];
-        this.overflowKeySource0 = (FloatArraySource) super.overflowKeySources[0];
-        this.mainKeySource1 = (IntegerArraySource) super.mainKeySources[1];
-        this.overflowKeySource1 = (IntegerArraySource) super.overflowKeySources[1];
-    }
-
-    @Override
-    protected void build(HashHandler handler, RowSequence rowSequence, Chunk[] sourceKeyChunks) {
-        final FloatChunk<Values> keyChunk0 = sourceKeyChunks[0].asFloatChunk();
-        final IntChunk<Values> keyChunk1 = sourceKeyChunks[1].asIntChunk();
-        final int chunkSize = keyChunk0.size();
-        for (int chunkPosition = 0; chunkPosition < chunkSize; ++chunkPosition) {
-            final float k0 = keyChunk0.get(chunkPosition);
-            final int k1 = keyChunk1.get(chunkPosition);
-            final int hash = hash(k0, k1);
-            final int tableLocation = hashToTableLocation(tableHashPivot, hash);
-            if (mainOutputPosition.getUnsafe(tableLocation) == EMPTY_OUTPUT_POSITION) {
-                numEntries++;
-                mainKeySource0.set(tableLocation, k0);
-                mainKeySource1.set(tableLocation, k1);
-                handler.doMainInsert(tableLocation, chunkPosition);
-            } else if (eq(mainKeySource0.getUnsafe(tableLocation), k0) && eq(mainKeySource1.getUnsafe(tableLocation), k1)) {
-                handler.doMainFound(tableLocation, chunkPosition);
-            } else {
-                int overflowLocation = mainOverflowLocationSource.getUnsafe(tableLocation);
-                if (!findOverflow(handler, k0, k1, chunkPosition, overflowLocation)) {
-                    final int newOverflowLocation = allocateOverflowLocation();
-                    overflowKeySource0.set(newOverflowLocation, k0);
-                    overflowKeySource1.set(newOverflowLocation, k1);
-                    mainOverflowLocationSource.set(tableLocation, newOverflowLocation);
-                    overflowOverflowLocationSource.set(newOverflowLocation, overflowLocation);
-                    numEntries++;
-                    handler.doOverflowInsert(newOverflowLocation, chunkPosition);
-                }
-            }
-        }
-    }
-
-    @Override
-    protected void probe(HashHandler handler, RowSequence rowSequence, Chunk[] sourceKeyChunks) {
-        final FloatChunk<Values> keyChunk0 = sourceKeyChunks[0].asFloatChunk();
-        final IntChunk<Values> keyChunk1 = sourceKeyChunks[1].asIntChunk();
-        final int chunkSize = keyChunk0.size();
-        for (int chunkPosition = 0; chunkPosition < chunkSize; ++chunkPosition) {
-            final float k0 = keyChunk0.get(chunkPosition);
-            final int k1 = keyChunk1.get(chunkPosition);
-            final int hash = hash(k0, k1);
-            final int tableLocation = hashToTableLocation(tableHashPivot, hash);
-            if (mainOutputPosition.getUnsafe(tableLocation) == EMPTY_OUTPUT_POSITION) {
-                handler.doMissing(chunkPosition);
-            } else if (eq(mainKeySource0.getUnsafe(tableLocation), k0) && eq(mainKeySource1.getUnsafe(tableLocation), k1)) {
-                handler.doMainFound(tableLocation, chunkPosition);
-            } else {
-                int overflowLocation = mainOverflowLocationSource.getUnsafe(tableLocation);
-                if (!findOverflow(handler, k0, k1, chunkPosition, overflowLocation)) {
-                    handler.doMissing(chunkPosition);
-                }
-            }
-        }
-    }
-
-    private static int hash(float k0, int k1) {
-        int hash = FloatChunkHasher.hashInitialSingle(k0);
-        hash = IntChunkHasher.hashUpdateSingle(hash, k1);
-        return hash;
-    }
-
-    @Override
-    protected void rehashBucket(HashHandler handler, int sourceBucket, int destBucket,
-            int bucketsToAdd) {
-        final int position = mainOutputPosition.getUnsafe(sourceBucket);
-        if (position == EMPTY_OUTPUT_POSITION) {
-            return;
-        }
-        int mainInsertLocation = maybeMoveMainBucket(handler, sourceBucket, destBucket, bucketsToAdd);
-        int overflowLocation = mainOverflowLocationSource.getUnsafe(sourceBucket);
-        mainOverflowLocationSource.set(sourceBucket, QueryConstants.NULL_INT);
-        mainOverflowLocationSource.set(destBucket, QueryConstants.NULL_INT);
-        while (overflowLocation != QueryConstants.NULL_INT) {
-            final int nextOverflowLocation = overflowOverflowLocationSource.getUnsafe(overflowLocation);
-            final float overflowKey0 = overflowKeySource0.getUnsafe(overflowLocation);
-            final int overflowKey1 = overflowKeySource1.getUnsafe(overflowLocation);
-            final int overflowHash = hash(overflowKey0, overflowKey1);
-            final int overflowTableLocation = hashToTableLocation(tableHashPivot + bucketsToAdd, overflowHash);
-            if (overflowTableLocation == mainInsertLocation) {
-                mainKeySource0.set(mainInsertLocation, overflowKey0);
-                mainKeySource1.set(mainInsertLocation, overflowKey1);
-                mainOutputPosition.set(mainInsertLocation, overflowOutputPosition.getUnsafe(overflowLocation));
-                handler.doPromoteOverflow(overflowLocation, mainInsertLocation);
-                overflowOutputPosition.set(overflowLocation, QueryConstants.NULL_INT);
-                overflowKeySource0.set(overflowLocation, QueryConstants.NULL_FLOAT);
-                overflowKeySource1.set(overflowLocation, QueryConstants.NULL_INT);
-                freeOverflowLocation(overflowLocation);
-                mainInsertLocation = -1;
-            } else {
-                final int oldOverflowLocation = mainOverflowLocationSource.getUnsafe(overflowTableLocation);
-                mainOverflowLocationSource.set(overflowTableLocation, overflowLocation);
-                overflowOverflowLocationSource.set(overflowLocation, oldOverflowLocation);
-            }
-            overflowLocation = nextOverflowLocation;
-        }
-    }
-
-    private int maybeMoveMainBucket(HashHandler handler, int sourceBucket, int destBucket,
-            int bucketsToAdd) {
-        final float k0 = mainKeySource0.getUnsafe(sourceBucket);
-        final int k1 = mainKeySource1.getUnsafe(sourceBucket);
-        final int hash = hash(k0, k1);
-        final int location = hashToTableLocation(tableHashPivot + bucketsToAdd, hash);
-        final int mainInsertLocation;
-        if (location == sourceBucket) {
-            mainInsertLocation = destBucket;
-            mainOutputPosition.set(destBucket, EMPTY_OUTPUT_POSITION);
-        } else {
-            mainInsertLocation = sourceBucket;
-            mainOutputPosition.set(destBucket, mainOutputPosition.getUnsafe(sourceBucket));
-            mainOutputPosition.set(sourceBucket, EMPTY_OUTPUT_POSITION);
-            mainKeySource0.set(destBucket, k0);
-            mainKeySource0.set(sourceBucket, QueryConstants.NULL_FLOAT);
-            mainKeySource1.set(destBucket, k1);
-            mainKeySource1.set(sourceBucket, QueryConstants.NULL_INT);
-            handler.doMoveMain(sourceBucket, destBucket);
-        }
-        return mainInsertLocation;
-    }
-
-    private boolean findOverflow(HashHandler handler, float k0, int k1, int chunkPosition,
-            int overflowLocation) {
-        while (overflowLocation != QueryConstants.NULL_INT) {
-            if (eq(overflowKeySource0.getUnsafe(overflowLocation), k0) && eq(overflowKeySource1.getUnsafe(overflowLocation), k1)) {
-                handler.doOverflowFound(overflowLocation, chunkPosition);
-                return true;
-            }
-            overflowLocation = overflowOverflowLocationSource.getUnsafe(overflowLocation);
-        }
-        return false;
-    }
-
-    @Override
-    public int findPositionForKey(Object key) {
-        final Object [] ka = (Object[])key;
-        final float k0 = TypeUtils.unbox((Float)ka[0]);
-        final int k1 = TypeUtils.unbox((Integer)ka[1]);
-        int hash = hash(k0, k1);
-        final int tableLocation = hashToTableLocation(tableHashPivot, hash);
-        final int positionValue = mainOutputPosition.getUnsafe(tableLocation);
-        if (positionValue == EMPTY_OUTPUT_POSITION) {
-            return -1;
-        }
-        if (eq(mainKeySource0.getUnsafe(tableLocation), k0) && eq(mainKeySource1.getUnsafe(tableLocation), k1)) {
-            return positionValue;
-        }
-        int overflowLocation = mainOverflowLocationSource.getUnsafe(tableLocation);
-        while (overflowLocation != QueryConstants.NULL_INT) {
-            if (eq(overflowKeySource0.getUnsafe(overflowLocation), k0) && eq(overflowKeySource1.getUnsafe(overflowLocation), k1)) {
-                return overflowOutputPosition.getUnsafe(overflowLocation);
-            }
-            overflowLocation = overflowOverflowLocationSource.getUnsafe(overflowLocation);
-        }
-        return -1;
-    }
-}
diff --git a/engine/table/src/main/java/io/deephaven/engine/table/impl/by/typed/incagg/gen/IncrementalAggHasherFloatLong.java b/engine/table/src/main/java/io/deephaven/engine/table/impl/by/typed/incagg/gen/IncrementalAggHasherFloatLong.java
deleted file mode 100644
index d53b9666cfa..00000000000
--- a/engine/table/src/main/java/io/deephaven/engine/table/impl/by/typed/incagg/gen/IncrementalAggHasherFloatLong.java
+++ /dev/null
@@ -1,206 +0,0 @@
-//
-// Copyright (c) 2016-2024 Deephaven Data Labs and Patent Pending
-//
-// ****** AUTO-GENERATED CLASS - DO NOT EDIT MANUALLY
-// ****** Run ReplicateTypedHashers or ./gradlew replicateTypedHashers to regenerate
-//
-// @formatter:off
-package io.deephaven.engine.table.impl.by.typed.incagg.gen;
-
-import static io.deephaven.util.compare.FloatComparisons.eq;
-import static io.deephaven.util.compare.LongComparisons.eq;
-
-import io.deephaven.chunk.Chunk;
-import io.deephaven.chunk.FloatChunk;
-import io.deephaven.chunk.LongChunk;
-import io.deephaven.chunk.attributes.Values;
-import io.deephaven.chunk.util.hashing.FloatChunkHasher;
-import io.deephaven.chunk.util.hashing.LongChunkHasher;
-import io.deephaven.engine.rowset.RowSequence;
-import io.deephaven.engine.table.ColumnSource;
-import io.deephaven.engine.table.impl.by.HashHandler;
-import io.deephaven.engine.table.impl.by.IncrementalChunkedOperatorAggregationStateManagerTypedBase;
-import io.deephaven.engine.table.impl.sources.FloatArraySource;
-import io.deephaven.engine.table.impl.sources.LongArraySource;
-import io.deephaven.util.QueryConstants;
-import io.deephaven.util.type.TypeUtils;
-import java.lang.Float;
-import java.lang.Long;
-import java.lang.Object;
-import java.lang.Override;
-
-final class IncrementalAggHasherFloatLong extends IncrementalChunkedOperatorAggregationStateManagerTypedBase {
-    private final FloatArraySource mainKeySource0;
-
-    private final FloatArraySource overflowKeySource0;
-
-    private final LongArraySource mainKeySource1;
-
-    private final LongArraySource overflowKeySource1;
-
-    public IncrementalAggHasherFloatLong(ColumnSource[] tableKeySources,
-            ColumnSource[] originalTableKeySources, int tableSize, double maximumLoadFactor,
-            double targetLoadFactor) {
-        super(tableKeySources, tableSize, maximumLoadFactor, targetLoadFactor);
-        this.mainKeySource0 = (FloatArraySource) super.mainKeySources[0];
-        this.overflowKeySource0 = (FloatArraySource) super.overflowKeySources[0];
-        this.mainKeySource1 = (LongArraySource) super.mainKeySources[1];
-        this.overflowKeySource1 = (LongArraySource) super.overflowKeySources[1];
-    }
-
-    @Override
-    protected void build(HashHandler handler, RowSequence rowSequence, Chunk[] sourceKeyChunks) {
-        final FloatChunk<Values> keyChunk0 = sourceKeyChunks[0].asFloatChunk();
-        final LongChunk<Values> keyChunk1 = sourceKeyChunks[1].asLongChunk();
-        final int chunkSize = keyChunk0.size();
-        for (int chunkPosition = 0; chunkPosition < chunkSize; ++chunkPosition) {
-            final float k0 = keyChunk0.get(chunkPosition);
-            final long k1 = keyChunk1.get(chunkPosition);
-            final int hash = hash(k0, k1);
-            final int tableLocation = hashToTableLocation(tableHashPivot, hash);
-            if (mainOutputPosition.getUnsafe(tableLocation) == EMPTY_OUTPUT_POSITION) {
-                numEntries++;
-                mainKeySource0.set(tableLocation, k0);
-                mainKeySource1.set(tableLocation, k1);
-                handler.doMainInsert(tableLocation, chunkPosition);
-            } else if (eq(mainKeySource0.getUnsafe(tableLocation), k0) && eq(mainKeySource1.getUnsafe(tableLocation), k1)) {
-                handler.doMainFound(tableLocation, chunkPosition);
-            } else {
-                int overflowLocation = mainOverflowLocationSource.getUnsafe(tableLocation);
-                if (!findOverflow(handler, k0, k1, chunkPosition, overflowLocation)) {
-                    final int newOverflowLocation = allocateOverflowLocation();
-                    overflowKeySource0.set(newOverflowLocation, k0);
-                    overflowKeySource1.set(newOverflowLocation, k1);
-                    mainOverflowLocationSource.set(tableLocation, newOverflowLocation);
-                    overflowOverflowLocationSource.set(newOverflowLocation, overflowLocation);
-                    numEntries++;
-                    handler.doOverflowInsert(newOverflowLocation, chunkPosition);
-                }
-            }
-        }
-    }
-
-    @Override
-    protected void probe(HashHandler handler, RowSequence rowSequence, Chunk[] sourceKeyChunks) {
-        final FloatChunk<Values> keyChunk0 = sourceKeyChunks[0].asFloatChunk();
-        final LongChunk<Values> keyChunk1 = sourceKeyChunks[1].asLongChunk();
-        final int chunkSize = keyChunk0.size();
-        for (int chunkPosition = 0; chunkPosition < chunkSize; ++chunkPosition) {
-            final float k0 = keyChunk0.get(chunkPosition);
-            final long k1 = keyChunk1.get(chunkPosition);
-            final int hash = hash(k0, k1);
-            final int tableLocation = hashToTableLocation(tableHashPivot, hash);
-            if (mainOutputPosition.getUnsafe(tableLocation) == EMPTY_OUTPUT_POSITION) {
-                handler.doMissing(chunkPosition);
-            } else if (eq(mainKeySource0.getUnsafe(tableLocation), k0) && eq(mainKeySource1.getUnsafe(tableLocation), k1)) {
-                handler.doMainFound(tableLocation, chunkPosition);
-            } else {
-                int overflowLocation = mainOverflowLocationSource.getUnsafe(tableLocation);
-                if (!findOverflow(handler, k0, k1, chunkPosition, overflowLocation)) {
-                    handler.doMissing(chunkPosition);
-                }
-            }
-        }
-    }
-
-    private static int hash(float k0, long k1) {
-        int hash = FloatChunkHasher.hashInitialSingle(k0);
-        hash = LongChunkHasher.hashUpdateSingle(hash, k1);
-        return hash;
-    }
-
-    @Override
-    protected void rehashBucket(HashHandler handler, int sourceBucket, int destBucket,
-            int bucketsToAdd) {
-        final int position = mainOutputPosition.getUnsafe(sourceBucket);
-        if (position == EMPTY_OUTPUT_POSITION) {
-            return;
-        }
-        int mainInsertLocation = maybeMoveMainBucket(handler, sourceBucket, destBucket, bucketsToAdd);
-        int overflowLocation = mainOverflowLocationSource.getUnsafe(sourceBucket);
-        mainOverflowLocationSource.set(sourceBucket, QueryConstants.NULL_INT);
-        mainOverflowLocationSource.set(destBucket, QueryConstants.NULL_INT);
-        while (overflowLocation != QueryConstants.NULL_INT) {
-            final int nextOverflowLocation = overflowOverflowLocationSource.getUnsafe(overflowLocation);
-            final float overflowKey0 = overflowKeySource0.getUnsafe(overflowLocation);
-            final long overflowKey1 = overflowKeySource1.getUnsafe(overflowLocation);
-            final int overflowHash = hash(overflowKey0, overflowKey1);
-            final int overflowTableLocation = hashToTableLocation(tableHashPivot + bucketsToAdd, overflowHash);
-            if (overflowTableLocation == mainInsertLocation) {
-                mainKeySource0.set(mainInsertLocation, overflowKey0);
-                mainKeySource1.set(mainInsertLocation, overflowKey1);
-                mainOutputPosition.set(mainInsertLocation, overflowOutputPosition.getUnsafe(overflowLocation));
-                handler.doPromoteOverflow(overflowLocation, mainInsertLocation);
-                overflowOutputPosition.set(overflowLocation, QueryConstants.NULL_INT);
-                overflowKeySource0.set(overflowLocation, QueryConstants.NULL_FLOAT);
-                overflowKeySource1.set(overflowLocation, QueryConstants.NULL_LONG);
-                freeOverflowLocation(overflowLocation);
-                mainInsertLocation = -1;
-            } else {
-                final int oldOverflowLocation = mainOverflowLocationSource.getUnsafe(overflowTableLocation);
-                mainOverflowLocationSource.set(overflowTableLocation, overflowLocation);
-                overflowOverflowLocationSource.set(overflowLocation, oldOverflowLocation);
-            }
-            overflowLocation = nextOverflowLocation;
-        }
-    }
-
-    private int maybeMoveMainBucket(HashHandler handler, int sourceBucket, int destBucket,
-            int bucketsToAdd) {
-        final float k0 = mainKeySource0.getUnsafe(sourceBucket);
-        final long k1 = mainKeySource1.getUnsafe(sourceBucket);
-        final int hash = hash(k0, k1);
-        final int location = hashToTableLocation(tableHashPivot + bucketsToAdd, hash);
-        final int mainInsertLocation;
-        if (location == sourceBucket) {
-            mainInsertLocation = destBucket;
-            mainOutputPosition.set(destBucket, EMPTY_OUTPUT_POSITION);
-        } else {
-            mainInsertLocation = sourceBucket;
-            mainOutputPosition.set(destBucket, mainOutputPosition.getUnsafe(sourceBucket));
-            mainOutputPosition.set(sourceBucket, EMPTY_OUTPUT_POSITION);
-            mainKeySource0.set(destBucket, k0);
-            mainKeySource0.set(sourceBucket, QueryConstants.NULL_FLOAT);
-            mainKeySource1.set(destBucket, k1);
-            mainKeySource1.set(sourceBucket, QueryConstants.NULL_LONG);
-            handler.doMoveMain(sourceBucket, destBucket);
-        }
-        return mainInsertLocation;
-    }
-
-    private boolean findOverflow(HashHandler handler, float k0, long k1, int chunkPosition,
-            int overflowLocation) {
-        while (overflowLocation != QueryConstants.NULL_INT) {
-            if (eq(overflowKeySource0.getUnsafe(overflowLocation), k0) && eq(overflowKeySource1.getUnsafe(overflowLocation), k1)) {
-                handler.doOverflowFound(overflowLocation, chunkPosition);
-                return true;
-            }
-            overflowLocation = overflowOverflowLocationSource.getUnsafe(overflowLocation);
-        }
-        return false;
-    }
-
-    @Override
-    public int findPositionForKey(Object key) {
-        final Object [] ka = (Object[])key;
-        final float k0 = TypeUtils.unbox((Float)ka[0]);
-        final long k1 = TypeUtils.unbox((Long)ka[1]);
-        int hash = hash(k0, k1);
-        final int tableLocation = hashToTableLocation(tableHashPivot, hash);
-        final int positionValue = mainOutputPosition.getUnsafe(tableLocation);
-        if (positionValue == EMPTY_OUTPUT_POSITION) {
-            return -1;
-        }
-        if (eq(mainKeySource0.getUnsafe(tableLocation), k0) && eq(mainKeySource1.getUnsafe(tableLocation), k1)) {
-            return positionValue;
-        }
-        int overflowLocation = mainOverflowLocationSource.getUnsafe(tableLocation);
-        while (overflowLocation != QueryConstants.NULL_INT) {
-            if (eq(overflowKeySource0.getUnsafe(overflowLocation), k0) && eq(overflowKeySource1.getUnsafe(overflowLocation), k1)) {
-                return overflowOutputPosition.getUnsafe(overflowLocation);
-            }
-            overflowLocation = overflowOverflowLocationSource.getUnsafe(overflowLocation);
-        }
-        return -1;
-    }
-}
diff --git a/engine/table/src/main/java/io/deephaven/engine/table/impl/by/typed/incagg/gen/IncrementalAggHasherFloatObject.java b/engine/table/src/main/java/io/deephaven/engine/table/impl/by/typed/incagg/gen/IncrementalAggHasherFloatObject.java
deleted file mode 100644
index 93c4d5ce75a..00000000000
--- a/engine/table/src/main/java/io/deephaven/engine/table/impl/by/typed/incagg/gen/IncrementalAggHasherFloatObject.java
+++ /dev/null
@@ -1,205 +0,0 @@
-//
-// Copyright (c) 2016-2024 Deephaven Data Labs and Patent Pending
-//
-// ****** AUTO-GENERATED CLASS - DO NOT EDIT MANUALLY
-// ****** Run ReplicateTypedHashers or ./gradlew replicateTypedHashers to regenerate
-//
-// @formatter:off
-package io.deephaven.engine.table.impl.by.typed.incagg.gen;
-
-import static io.deephaven.util.compare.FloatComparisons.eq;
-import static io.deephaven.util.compare.ObjectComparisons.eq;
-
-import io.deephaven.chunk.Chunk;
-import io.deephaven.chunk.FloatChunk;
-import io.deephaven.chunk.ObjectChunk;
-import io.deephaven.chunk.attributes.Values;
-import io.deephaven.chunk.util.hashing.FloatChunkHasher;
-import io.deephaven.chunk.util.hashing.ObjectChunkHasher;
-import io.deephaven.engine.rowset.RowSequence;
-import io.deephaven.engine.table.ColumnSource;
-import io.deephaven.engine.table.impl.by.HashHandler;
-import io.deephaven.engine.table.impl.by.IncrementalChunkedOperatorAggregationStateManagerTypedBase;
-import io.deephaven.engine.table.impl.sources.FloatArraySource;
-import io.deephaven.engine.table.impl.sources.ObjectArraySource;
-import io.deephaven.util.QueryConstants;
-import io.deephaven.util.type.TypeUtils;
-import java.lang.Float;
-import java.lang.Object;
-import java.lang.Override;
-
-final class IncrementalAggHasherFloatObject extends IncrementalChunkedOperatorAggregationStateManagerTypedBase {
-    private final FloatArraySource mainKeySource0;
-
-    private final FloatArraySource overflowKeySource0;
-
-    private final ObjectArraySource mainKeySource1;
-
-    private final ObjectArraySource overflowKeySource1;
-
-    public IncrementalAggHasherFloatObject(ColumnSource[] tableKeySources,
-            ColumnSource[] originalTableKeySources, int tableSize, double maximumLoadFactor,
-            double targetLoadFactor) {
-        super(tableKeySources, tableSize, maximumLoadFactor, targetLoadFactor);
-        this.mainKeySource0 = (FloatArraySource) super.mainKeySources[0];
-        this.overflowKeySource0 = (FloatArraySource) super.overflowKeySources[0];
-        this.mainKeySource1 = (ObjectArraySource) super.mainKeySources[1];
-        this.overflowKeySource1 = (ObjectArraySource) super.overflowKeySources[1];
-    }
-
-    @Override
-    protected void build(HashHandler handler, RowSequence rowSequence, Chunk[] sourceKeyChunks) {
-        final FloatChunk<Values> keyChunk0 = sourceKeyChunks[0].asFloatChunk();
-        final ObjectChunk<Object, Values> keyChunk1 = sourceKeyChunks[1].asObjectChunk();
-        final int chunkSize = keyChunk0.size();
-        for (int chunkPosition = 0; chunkPosition < chunkSize; ++chunkPosition) {
-            final float k0 = keyChunk0.get(chunkPosition);
-            final Object k1 = keyChunk1.get(chunkPosition);
-            final int hash = hash(k0, k1);
-            final int tableLocation = hashToTableLocation(tableHashPivot, hash);
-            if (mainOutputPosition.getUnsafe(tableLocation) == EMPTY_OUTPUT_POSITION) {
-                numEntries++;
-                mainKeySource0.set(tableLocation, k0);
-                mainKeySource1.set(tableLocation, k1);
-                handler.doMainInsert(tableLocation, chunkPosition);
-            } else if (eq(mainKeySource0.getUnsafe(tableLocation), k0) && eq(mainKeySource1.getUnsafe(tableLocation), k1)) {
-                handler.doMainFound(tableLocation, chunkPosition);
-            } else {
-                int overflowLocation = mainOverflowLocationSource.getUnsafe(tableLocation);
-                if (!findOverflow(handler, k0, k1, chunkPosition, overflowLocation)) {
-                    final int newOverflowLocation = allocateOverflowLocation();
-                    overflowKeySource0.set(newOverflowLocation, k0);
-                    overflowKeySource1.set(newOverflowLocation, k1);
-                    mainOverflowLocationSource.set(tableLocation, newOverflowLocation);
-                    overflowOverflowLocationSource.set(newOverflowLocation, overflowLocation);
-                    numEntries++;
-                    handler.doOverflowInsert(newOverflowLocation, chunkPosition);
-                }
-            }
-        }
-    }
-
-    @Override
-    protected void probe(HashHandler handler, RowSequence rowSequence, Chunk[] sourceKeyChunks) {
-        final FloatChunk<Values> keyChunk0 = sourceKeyChunks[0].asFloatChunk();
-        final ObjectChunk<Object, Values> keyChunk1 = sourceKeyChunks[1].asObjectChunk();
-        final int chunkSize = keyChunk0.size();
-        for (int chunkPosition = 0; chunkPosition < chunkSize; ++chunkPosition) {
-            final float k0 = keyChunk0.get(chunkPosition);
-            final Object k1 = keyChunk1.get(chunkPosition);
-            final int hash = hash(k0, k1);
-            final int tableLocation = hashToTableLocation(tableHashPivot, hash);
-            if (mainOutputPosition.getUnsafe(tableLocation) == EMPTY_OUTPUT_POSITION) {
-                handler.doMissing(chunkPosition);
-            } else if (eq(mainKeySource0.getUnsafe(tableLocation), k0) && eq(mainKeySource1.getUnsafe(tableLocation), k1)) {
-                handler.doMainFound(tableLocation, chunkPosition);
-            } else {
-                int overflowLocation = mainOverflowLocationSource.getUnsafe(tableLocation);
-                if (!findOverflow(handler, k0, k1, chunkPosition, overflowLocation)) {
-                    handler.doMissing(chunkPosition);
-                }
-            }
-        }
-    }
-
-    private static int hash(float k0, Object k1) {
-        int hash = FloatChunkHasher.hashInitialSingle(k0);
-        hash = ObjectChunkHasher.hashUpdateSingle(hash, k1);
-        return hash;
-    }
-
-    @Override
-    protected void rehashBucket(HashHandler handler, int sourceBucket, int destBucket,
-            int bucketsToAdd) {
-        final int position = mainOutputPosition.getUnsafe(sourceBucket);
-        if (position == EMPTY_OUTPUT_POSITION) {
-            return;
-        }
-        int mainInsertLocation = maybeMoveMainBucket(handler, sourceBucket, destBucket, bucketsToAdd);
-        int overflowLocation = mainOverflowLocationSource.getUnsafe(sourceBucket);
-        mainOverflowLocationSource.set(sourceBucket, QueryConstants.NULL_INT);
-        mainOverflowLocationSource.set(destBucket, QueryConstants.NULL_INT);
-        while (overflowLocation != QueryConstants.NULL_INT) {
-            final int nextOverflowLocation = overflowOverflowLocationSource.getUnsafe(overflowLocation);
-            final float overflowKey0 = overflowKeySource0.getUnsafe(overflowLocation);
-            final Object overflowKey1 = overflowKeySource1.getUnsafe(overflowLocation);
-            final int overflowHash = hash(overflowKey0, overflowKey1);
-            final int overflowTableLocation = hashToTableLocation(tableHashPivot + bucketsToAdd, overflowHash);
-            if (overflowTableLocation == mainInsertLocation) {
-                mainKeySource0.set(mainInsertLocation, overflowKey0);
-                mainKeySource1.set(mainInsertLocation, overflowKey1);
-                mainOutputPosition.set(mainInsertLocation, overflowOutputPosition.getUnsafe(overflowLocation));
-                handler.doPromoteOverflow(overflowLocation, mainInsertLocation);
-                overflowOutputPosition.set(overflowLocation, QueryConstants.NULL_INT);
-                overflowKeySource0.set(overflowLocation, QueryConstants.NULL_FLOAT);
-                overflowKeySource1.set(overflowLocation, null);
-                freeOverflowLocation(overflowLocation);
-                mainInsertLocation = -1;
-            } else {
-                final int oldOverflowLocation = mainOverflowLocationSource.getUnsafe(overflowTableLocation);
-                mainOverflowLocationSource.set(overflowTableLocation, overflowLocation);
-                overflowOverflowLocationSource.set(overflowLocation, oldOverflowLocation);
-            }
-            overflowLocation = nextOverflowLocation;
-        }
-    }
-
-    private int maybeMoveMainBucket(HashHandler handler, int sourceBucket, int destBucket,
-            int bucketsToAdd) {
-        final float k0 = mainKeySource0.getUnsafe(sourceBucket);
-        final Object k1 = mainKeySource1.getUnsafe(sourceBucket);
-        final int hash = hash(k0, k1);
-        final int location = hashToTableLocation(tableHashPivot + bucketsToAdd, hash);
-        final int mainInsertLocation;
-        if (location == sourceBucket) {
-            mainInsertLocation = destBucket;
-            mainOutputPosition.set(destBucket, EMPTY_OUTPUT_POSITION);
-        } else {
-            mainInsertLocation = sourceBucket;
-            mainOutputPosition.set(destBucket, mainOutputPosition.getUnsafe(sourceBucket));
-            mainOutputPosition.set(sourceBucket, EMPTY_OUTPUT_POSITION);
-            mainKeySource0.set(destBucket, k0);
-            mainKeySource0.set(sourceBucket, QueryConstants.NULL_FLOAT);
-            mainKeySource1.set(destBucket, k1);
-            mainKeySource1.set(sourceBucket, null);
-            handler.doMoveMain(sourceBucket, destBucket);
-        }
-        return mainInsertLocation;
-    }
-
-    private boolean findOverflow(HashHandler handler, float k0, Object k1, int chunkPosition,
-            int overflowLocation) {
-        while (overflowLocation != QueryConstants.NULL_INT) {
-            if (eq(overflowKeySource0.getUnsafe(overflowLocation), k0) && eq(overflowKeySource1.getUnsafe(overflowLocation), k1)) {
-                handler.doOverflowFound(overflowLocation, chunkPosition);
-                return true;
-            }
-            overflowLocation = overflowOverflowLocationSource.getUnsafe(overflowLocation);
-        }
-        return false;
-    }
-
-    @Override
-    public int findPositionForKey(Object key) {
-        final Object [] ka = (Object[])key;
-        final float k0 = TypeUtils.unbox((Float)ka[0]);
-        final Object k1 = ka[1];
-        int hash = hash(k0, k1);
-        final int tableLocation = hashToTableLocation(tableHashPivot, hash);
-        final int positionValue = mainOutputPosition.getUnsafe(tableLocation);
-        if (positionValue == EMPTY_OUTPUT_POSITION) {
-            return -1;
-        }
-        if (eq(mainKeySource0.getUnsafe(tableLocation), k0) && eq(mainKeySource1.getUnsafe(tableLocation), k1)) {
-            return positionValue;
-        }
-        int overflowLocation = mainOverflowLocationSource.getUnsafe(tableLocation);
-        while (overflowLocation != QueryConstants.NULL_INT) {
-            if (eq(overflowKeySource0.getUnsafe(overflowLocation), k0) && eq(overflowKeySource1.getUnsafe(overflowLocation), k1)) {
-                return overflowOutputPosition.getUnsafe(overflowLocation);
-            }
-            overflowLocation = overflowOverflowLocationSource.getUnsafe(overflowLocation);
-        }
-        return -1;
-    }
-}
diff --git a/engine/table/src/main/java/io/deephaven/engine/table/impl/by/typed/incagg/gen/IncrementalAggHasherFloatShort.java b/engine/table/src/main/java/io/deephaven/engine/table/impl/by/typed/incagg/gen/IncrementalAggHasherFloatShort.java
deleted file mode 100644
index ff115f86c8c..00000000000
--- a/engine/table/src/main/java/io/deephaven/engine/table/impl/by/typed/incagg/gen/IncrementalAggHasherFloatShort.java
+++ /dev/null
@@ -1,206 +0,0 @@
-//
-// Copyright (c) 2016-2024 Deephaven Data Labs and Patent Pending
-//
-// ****** AUTO-GENERATED CLASS - DO NOT EDIT MANUALLY
-// ****** Run ReplicateTypedHashers or ./gradlew replicateTypedHashers to regenerate
-//
-// @formatter:off
-package io.deephaven.engine.table.impl.by.typed.incagg.gen;
-
-import static io.deephaven.util.compare.FloatComparisons.eq;
-import static io.deephaven.util.compare.ShortComparisons.eq;
-
-import io.deephaven.chunk.Chunk;
-import io.deephaven.chunk.FloatChunk;
-import io.deephaven.chunk.ShortChunk;
-import io.deephaven.chunk.attributes.Values;
-import io.deephaven.chunk.util.hashing.FloatChunkHasher;
-import io.deephaven.chunk.util.hashing.ShortChunkHasher;
-import io.deephaven.engine.rowset.RowSequence;
-import io.deephaven.engine.table.ColumnSource;
-import io.deephaven.engine.table.impl.by.HashHandler;
-import io.deephaven.engine.table.impl.by.IncrementalChunkedOperatorAggregationStateManagerTypedBase;
-import io.deephaven.engine.table.impl.sources.FloatArraySource;
-import io.deephaven.engine.table.impl.sources.ShortArraySource;
-import io.deephaven.util.QueryConstants;
-import io.deephaven.util.type.TypeUtils;
-import java.lang.Float;
-import java.lang.Object;
-import java.lang.Override;
-import java.lang.Short;
-
-final class IncrementalAggHasherFloatShort extends IncrementalChunkedOperatorAggregationStateManagerTypedBase {
-    private final FloatArraySource mainKeySource0;
-
-    private final FloatArraySource overflowKeySource0;
-
-    private final ShortArraySource mainKeySource1;
-
-    private final ShortArraySource overflowKeySource1;
-
-    public IncrementalAggHasherFloatShort(ColumnSource[] tableKeySources,
-            ColumnSource[] originalTableKeySources, int tableSize, double maximumLoadFactor,
-            double targetLoadFactor) {
-        super(tableKeySources, tableSize, maximumLoadFactor, targetLoadFactor);
-        this.mainKeySource0 = (FloatArraySource) super.mainKeySources[0];
-        this.overflowKeySource0 = (FloatArraySource) super.overflowKeySources[0];
-        this.mainKeySource1 = (ShortArraySource) super.mainKeySources[1];
-        this.overflowKeySource1 = (ShortArraySource) super.overflowKeySources[1];
-    }
-
-    @Override
-    protected void build(HashHandler handler, RowSequence rowSequence, Chunk[] sourceKeyChunks) {
-        final FloatChunk<Values> keyChunk0 = sourceKeyChunks[0].asFloatChunk();
-        final ShortChunk<Values> keyChunk1 = sourceKeyChunks[1].asShortChunk();
-        final int chunkSize = keyChunk0.size();
-        for (int chunkPosition = 0; chunkPosition < chunkSize; ++chunkPosition) {
-            final float k0 = keyChunk0.get(chunkPosition);
-            final short k1 = keyChunk1.get(chunkPosition);
-            final int hash = hash(k0, k1);
-            final int tableLocation = hashToTableLocation(tableHashPivot, hash);
-            if (mainOutputPosition.getUnsafe(tableLocation) == EMPTY_OUTPUT_POSITION) {
-                numEntries++;
-                mainKeySource0.set(tableLocation, k0);
-                mainKeySource1.set(tableLocation, k1);
-                handler.doMainInsert(tableLocation, chunkPosition);
-            } else if (eq(mainKeySource0.getUnsafe(tableLocation), k0) && eq(mainKeySource1.getUnsafe(tableLocation), k1)) {
-                handler.doMainFound(tableLocation, chunkPosition);
-            } else {
-                int overflowLocation = mainOverflowLocationSource.getUnsafe(tableLocation);
-                if (!findOverflow(handler, k0, k1, chunkPosition, overflowLocation)) {
-                    final int newOverflowLocation = allocateOverflowLocation();
-                    overflowKeySource0.set(newOverflowLocation, k0);
-                    overflowKeySource1.set(newOverflowLocation, k1);
-                    mainOverflowLocationSource.set(tableLocation, newOverflowLocation);
-                    overflowOverflowLocationSource.set(newOverflowLocation, overflowLocation);
-                    numEntries++;
-                    handler.doOverflowInsert(newOverflowLocation, chunkPosition);
-                }
-            }
-        }
-    }
-
-    @Override
-    protected void probe(HashHandler handler, RowSequence rowSequence, Chunk[] sourceKeyChunks) {
-        final FloatChunk<Values> keyChunk0 = sourceKeyChunks[0].asFloatChunk();
-        final ShortChunk<Values> keyChunk1 = sourceKeyChunks[1].asShortChunk();
-        final int chunkSize = keyChunk0.size();
-        for (int chunkPosition = 0; chunkPosition < chunkSize; ++chunkPosition) {
-            final float k0 = keyChunk0.get(chunkPosition);
-            final short k1 = keyChunk1.get(chunkPosition);
-            final int hash = hash(k0, k1);
-            final int tableLocation = hashToTableLocation(tableHashPivot, hash);
-            if (mainOutputPosition.getUnsafe(tableLocation) == EMPTY_OUTPUT_POSITION) {
-                handler.doMissing(chunkPosition);
-            } else if (eq(mainKeySource0.getUnsafe(tableLocation), k0) && eq(mainKeySource1.getUnsafe(tableLocation), k1)) {
-                handler.doMainFound(tableLocation, chunkPosition);
-            } else {
-                int overflowLocation = mainOverflowLocationSource.getUnsafe(tableLocation);
-                if (!findOverflow(handler, k0, k1, chunkPosition, overflowLocation)) {
-                    handler.doMissing(chunkPosition);
-                }
-            }
-        }
-    }
-
-    private static int hash(float k0, short k1) {
-        int hash = FloatChunkHasher.hashInitialSingle(k0);
-        hash = ShortChunkHasher.hashUpdateSingle(hash, k1);
-        return hash;
-    }
-
-    @Override
-    protected void rehashBucket(HashHandler handler, int sourceBucket, int destBucket,
-            int bucketsToAdd) {
-        final int position = mainOutputPosition.getUnsafe(sourceBucket);
-        if (position == EMPTY_OUTPUT_POSITION) {
-            return;
-        }
-        int mainInsertLocation = maybeMoveMainBucket(handler, sourceBucket, destBucket, bucketsToAdd);
-        int overflowLocation = mainOverflowLocationSource.getUnsafe(sourceBucket);
-        mainOverflowLocationSource.set(sourceBucket, QueryConstants.NULL_INT);
-        mainOverflowLocationSource.set(destBucket, QueryConstants.NULL_INT);
-        while (overflowLocation != QueryConstants.NULL_INT) {
-            final int nextOverflowLocation = overflowOverflowLocationSource.getUnsafe(overflowLocation);
-            final float overflowKey0 = overflowKeySource0.getUnsafe(overflowLocation);
-            final short overflowKey1 = overflowKeySource1.getUnsafe(overflowLocation);
-            final int overflowHash = hash(overflowKey0, overflowKey1);
-            final int overflowTableLocation = hashToTableLocation(tableHashPivot + bucketsToAdd, overflowHash);
-            if (overflowTableLocation == mainInsertLocation) {
-                mainKeySource0.set(mainInsertLocation, overflowKey0);
-                mainKeySource1.set(mainInsertLocation, overflowKey1);
-                mainOutputPosition.set(mainInsertLocation, overflowOutputPosition.getUnsafe(overflowLocation));
-                handler.doPromoteOverflow(overflowLocation, mainInsertLocation);
-                overflowOutputPosition.set(overflowLocation, QueryConstants.NULL_INT);
-                overflowKeySource0.set(overflowLocation, QueryConstants.NULL_FLOAT);
-                overflowKeySource1.set(overflowLocation, QueryConstants.NULL_SHORT);
-                freeOverflowLocation(overflowLocation);
-                mainInsertLocation = -1;
-            } else {
-                final int oldOverflowLocation = mainOverflowLocationSource.getUnsafe(overflowTableLocation);
-                mainOverflowLocationSource.set(overflowTableLocation, overflowLocation);
-                overflowOverflowLocationSource.set(overflowLocation, oldOverflowLocation);
-            }
-            overflowLocation = nextOverflowLocation;
-        }
-    }
-
-    private int maybeMoveMainBucket(HashHandler handler, int sourceBucket, int destBucket,
-            int bucketsToAdd) {
-        final float k0 = mainKeySource0.getUnsafe(sourceBucket);
-        final short k1 = mainKeySource1.getUnsafe(sourceBucket);
-        final int hash = hash(k0, k1);
-        final int location = hashToTableLocation(tableHashPivot + bucketsToAdd, hash);
-        final int mainInsertLocation;
-        if (location == sourceBucket) {
-            mainInsertLocation = destBucket;
-            mainOutputPosition.set(destBucket, EMPTY_OUTPUT_POSITION);
-        } else {
-            mainInsertLocation = sourceBucket;
-            mainOutputPosition.set(destBucket, mainOutputPosition.getUnsafe(sourceBucket));
-            mainOutputPosition.set(sourceBucket, EMPTY_OUTPUT_POSITION);
-            mainKeySource0.set(destBucket, k0);
-            mainKeySource0.set(sourceBucket, QueryConstants.NULL_FLOAT);
-            mainKeySource1.set(destBucket, k1);
-            mainKeySource1.set(sourceBucket, QueryConstants.NULL_SHORT);
-            handler.doMoveMain(sourceBucket, destBucket);
-        }
-        return mainInsertLocation;
-    }
-
-    private boolean findOverflow(HashHandler handler, float k0, short k1, int chunkPosition,
-            int overflowLocation) {
-        while (overflowLocation != QueryConstants.NULL_INT) {
-            if (eq(overflowKeySource0.getUnsafe(overflowLocation), k0) && eq(overflowKeySource1.getUnsafe(overflowLocation), k1)) {
-                handler.doOverflowFound(overflowLocation, chunkPosition);
-                return true;
-            }
-            overflowLocation = overflowOverflowLocationSource.getUnsafe(overflowLocation);
-        }
-        return false;
-    }
-
-    @Override
-    public int findPositionForKey(Object key) {
-        final Object [] ka = (Object[])key;
-        final float k0 = TypeUtils.unbox((Float)ka[0]);
-        final short k1 = TypeUtils.unbox((Short)ka[1]);
-        int hash = hash(k0, k1);
-        final int tableLocation = hashToTableLocation(tableHashPivot, hash);
-        final int positionValue = mainOutputPosition.getUnsafe(tableLocation);
-        if (positionValue == EMPTY_OUTPUT_POSITION) {
-            return -1;
-        }
-        if (eq(mainKeySource0.getUnsafe(tableLocation), k0) && eq(mainKeySource1.getUnsafe(tableLocation), k1)) {
-            return positionValue;
-        }
-        int overflowLocation = mainOverflowLocationSource.getUnsafe(tableLocation);
-        while (overflowLocation != QueryConstants.NULL_INT) {
-            if (eq(overflowKeySource0.getUnsafe(overflowLocation), k0) && eq(overflowKeySource1.getUnsafe(overflowLocation), k1)) {
-                return overflowOutputPosition.getUnsafe(overflowLocation);
-            }
-            overflowLocation = overflowOverflowLocationSource.getUnsafe(overflowLocation);
-        }
-        return -1;
-    }
-}
diff --git a/engine/table/src/main/java/io/deephaven/engine/table/impl/by/typed/incagg/gen/IncrementalAggHasherInt.java b/engine/table/src/main/java/io/deephaven/engine/table/impl/by/typed/incagg/gen/IncrementalAggHasherInt.java
deleted file mode 100644
index 56722b58a95..00000000000
--- a/engine/table/src/main/java/io/deephaven/engine/table/impl/by/typed/incagg/gen/IncrementalAggHasherInt.java
+++ /dev/null
@@ -1,180 +0,0 @@
-//
-// Copyright (c) 2016-2024 Deephaven Data Labs and Patent Pending
-//
-// ****** AUTO-GENERATED CLASS - DO NOT EDIT MANUALLY
-// ****** Run ReplicateTypedHashers or ./gradlew replicateTypedHashers to regenerate
-//
-// @formatter:off
-package io.deephaven.engine.table.impl.by.typed.incagg.gen;
-
-import static io.deephaven.util.compare.IntComparisons.eq;
-
-import io.deephaven.chunk.Chunk;
-import io.deephaven.chunk.IntChunk;
-import io.deephaven.chunk.attributes.Values;
-import io.deephaven.chunk.util.hashing.IntChunkHasher;
-import io.deephaven.engine.rowset.RowSequence;
-import io.deephaven.engine.table.ColumnSource;
-import io.deephaven.engine.table.impl.by.HashHandler;
-import io.deephaven.engine.table.impl.by.IncrementalChunkedOperatorAggregationStateManagerTypedBase;
-import io.deephaven.engine.table.impl.sources.IntegerArraySource;
-import io.deephaven.util.QueryConstants;
-import io.deephaven.util.type.TypeUtils;
-import java.lang.Integer;
-import java.lang.Object;
-import java.lang.Override;
-
-final class IncrementalAggHasherInt extends IncrementalChunkedOperatorAggregationStateManagerTypedBase {
-    private final IntegerArraySource mainKeySource0;
-
-    private final IntegerArraySource overflowKeySource0;
-
-    public IncrementalAggHasherInt(ColumnSource[] tableKeySources,
-            ColumnSource[] originalTableKeySources, int tableSize, double maximumLoadFactor,
-            double targetLoadFactor) {
-        super(tableKeySources, tableSize, maximumLoadFactor, targetLoadFactor);
-        this.mainKeySource0 = (IntegerArraySource) super.mainKeySources[0];
-        this.overflowKeySource0 = (IntegerArraySource) super.overflowKeySources[0];
-    }
-
-    @Override
-    protected void build(HashHandler handler, RowSequence rowSequence, Chunk[] sourceKeyChunks) {
-        final IntChunk<Values> keyChunk0 = sourceKeyChunks[0].asIntChunk();
-        final int chunkSize = keyChunk0.size();
-        for (int chunkPosition = 0; chunkPosition < chunkSize; ++chunkPosition) {
-            final int k0 = keyChunk0.get(chunkPosition);
-            final int hash = hash(k0);
-            final int tableLocation = hashToTableLocation(tableHashPivot, hash);
-            if (mainOutputPosition.getUnsafe(tableLocation) == EMPTY_OUTPUT_POSITION) {
-                numEntries++;
-                mainKeySource0.set(tableLocation, k0);
-                handler.doMainInsert(tableLocation, chunkPosition);
-            } else if (eq(mainKeySource0.getUnsafe(tableLocation), k0)) {
-                handler.doMainFound(tableLocation, chunkPosition);
-            } else {
-                int overflowLocation = mainOverflowLocationSource.getUnsafe(tableLocation);
-                if (!findOverflow(handler, k0, chunkPosition, overflowLocation)) {
-                    final int newOverflowLocation = allocateOverflowLocation();
-                    overflowKeySource0.set(newOverflowLocation, k0);
-                    mainOverflowLocationSource.set(tableLocation, newOverflowLocation);
-                    overflowOverflowLocationSource.set(newOverflowLocation, overflowLocation);
-                    numEntries++;
-                    handler.doOverflowInsert(newOverflowLocation, chunkPosition);
-                }
-            }
-        }
-    }
-
-    @Override
-    protected void probe(HashHandler handler, RowSequence rowSequence, Chunk[] sourceKeyChunks) {
-        final IntChunk<Values> keyChunk0 = sourceKeyChunks[0].asIntChunk();
-        final int chunkSize = keyChunk0.size();
-        for (int chunkPosition = 0; chunkPosition < chunkSize; ++chunkPosition) {
-            final int k0 = keyChunk0.get(chunkPosition);
-            final int hash = hash(k0);
-            final int tableLocation = hashToTableLocation(tableHashPivot, hash);
-            if (mainOutputPosition.getUnsafe(tableLocation) == EMPTY_OUTPUT_POSITION) {
-                handler.doMissing(chunkPosition);
-            } else if (eq(mainKeySource0.getUnsafe(tableLocation), k0)) {
-                handler.doMainFound(tableLocation, chunkPosition);
-            } else {
-                int overflowLocation = mainOverflowLocationSource.getUnsafe(tableLocation);
-                if (!findOverflow(handler, k0, chunkPosition, overflowLocation)) {
-                    handler.doMissing(chunkPosition);
-                }
-            }
-        }
-    }
-
-    private static int hash(int k0) {
-        int hash = IntChunkHasher.hashInitialSingle(k0);
-        return hash;
-    }
-
-    @Override
-    protected void rehashBucket(HashHandler handler, int sourceBucket, int destBucket,
-            int bucketsToAdd) {
-        final int position = mainOutputPosition.getUnsafe(sourceBucket);
-        if (position == EMPTY_OUTPUT_POSITION) {
-            return;
-        }
-        int mainInsertLocation = maybeMoveMainBucket(handler, sourceBucket, destBucket, bucketsToAdd);
-        int overflowLocation = mainOverflowLocationSource.getUnsafe(sourceBucket);
-        mainOverflowLocationSource.set(sourceBucket, QueryConstants.NULL_INT);
-        mainOverflowLocationSource.set(destBucket, QueryConstants.NULL_INT);
-        while (overflowLocation != QueryConstants.NULL_INT) {
-            final int nextOverflowLocation = overflowOverflowLocationSource.getUnsafe(overflowLocation);
-            final int overflowKey0 = overflowKeySource0.getUnsafe(overflowLocation);
-            final int overflowHash = hash(overflowKey0);
-            final int overflowTableLocation = hashToTableLocation(tableHashPivot + bucketsToAdd, overflowHash);
-            if (overflowTableLocation == mainInsertLocation) {
-                mainKeySource0.set(mainInsertLocation, overflowKey0);
-                mainOutputPosition.set(mainInsertLocation, overflowOutputPosition.getUnsafe(overflowLocation));
-                handler.doPromoteOverflow(overflowLocation, mainInsertLocation);
-                overflowOutputPosition.set(overflowLocation, QueryConstants.NULL_INT);
-                overflowKeySource0.set(overflowLocation, QueryConstants.NULL_INT);
-                freeOverflowLocation(overflowLocation);
-                mainInsertLocation = -1;
-            } else {
-                final int oldOverflowLocation = mainOverflowLocationSource.getUnsafe(overflowTableLocation);
-                mainOverflowLocationSource.set(overflowTableLocation, overflowLocation);
-                overflowOverflowLocationSource.set(overflowLocation, oldOverflowLocation);
-            }
-            overflowLocation = nextOverflowLocation;
-        }
-    }
-
-    private int maybeMoveMainBucket(HashHandler handler, int sourceBucket, int destBucket,
-            int bucketsToAdd) {
-        final int k0 = mainKeySource0.getUnsafe(sourceBucket);
-        final int hash = hash(k0);
-        final int location = hashToTableLocation(tableHashPivot + bucketsToAdd, hash);
-        final int mainInsertLocation;
-        if (location == sourceBucket) {
-            mainInsertLocation = destBucket;
-            mainOutputPosition.set(destBucket, EMPTY_OUTPUT_POSITION);
-        } else {
-            mainInsertLocation = sourceBucket;
-            mainOutputPosition.set(destBucket, mainOutputPosition.getUnsafe(sourceBucket));
-            mainOutputPosition.set(sourceBucket, EMPTY_OUTPUT_POSITION);
-            mainKeySource0.set(destBucket, k0);
-            mainKeySource0.set(sourceBucket, QueryConstants.NULL_INT);
-            handler.doMoveMain(sourceBucket, destBucket);
-        }
-        return mainInsertLocation;
-    }
-
-    private boolean findOverflow(HashHandler handler, int k0, int chunkPosition,
-            int overflowLocation) {
-        while (overflowLocation != QueryConstants.NULL_INT) {
-            if (eq(overflowKeySource0.getUnsafe(overflowLocation), k0)) {
-                handler.doOverflowFound(overflowLocation, chunkPosition);
-                return true;
-            }
-            overflowLocation = overflowOverflowLocationSource.getUnsafe(overflowLocation);
-        }
-        return false;
-    }
-
-    @Override
-    public int findPositionForKey(Object key) {
-        final int k0 = TypeUtils.unbox((Integer)key);
-        int hash = hash(k0);
-        final int tableLocation = hashToTableLocation(tableHashPivot, hash);
-        final int positionValue = mainOutputPosition.getUnsafe(tableLocation);
-        if (positionValue == EMPTY_OUTPUT_POSITION) {
-            return -1;
-        }
-        if (eq(mainKeySource0.getUnsafe(tableLocation), k0)) {
-            return positionValue;
-        }
-        int overflowLocation = mainOverflowLocationSource.getUnsafe(tableLocation);
-        while (overflowLocation != QueryConstants.NULL_INT) {
-            if (eq(overflowKeySource0.getUnsafe(overflowLocation), k0)) {
-                return overflowOutputPosition.getUnsafe(overflowLocation);
-            }
-            overflowLocation = overflowOverflowLocationSource.getUnsafe(overflowLocation);
-        }
-        return -1;
-    }
-}
diff --git a/engine/table/src/main/java/io/deephaven/engine/table/impl/by/typed/incagg/gen/IncrementalAggHasherIntByte.java b/engine/table/src/main/java/io/deephaven/engine/table/impl/by/typed/incagg/gen/IncrementalAggHasherIntByte.java
deleted file mode 100644
index 9efb0d3addc..00000000000
--- a/engine/table/src/main/java/io/deephaven/engine/table/impl/by/typed/incagg/gen/IncrementalAggHasherIntByte.java
+++ /dev/null
@@ -1,206 +0,0 @@
-//
-// Copyright (c) 2016-2024 Deephaven Data Labs and Patent Pending
-//
-// ****** AUTO-GENERATED CLASS - DO NOT EDIT MANUALLY
-// ****** Run ReplicateTypedHashers or ./gradlew replicateTypedHashers to regenerate
-//
-// @formatter:off
-package io.deephaven.engine.table.impl.by.typed.incagg.gen;
-
-import static io.deephaven.util.compare.ByteComparisons.eq;
-import static io.deephaven.util.compare.IntComparisons.eq;
-
-import io.deephaven.chunk.ByteChunk;
-import io.deephaven.chunk.Chunk;
-import io.deephaven.chunk.IntChunk;
-import io.deephaven.chunk.attributes.Values;
-import io.deephaven.chunk.util.hashing.ByteChunkHasher;
-import io.deephaven.chunk.util.hashing.IntChunkHasher;
-import io.deephaven.engine.rowset.RowSequence;
-import io.deephaven.engine.table.ColumnSource;
-import io.deephaven.engine.table.impl.by.HashHandler;
-import io.deephaven.engine.table.impl.by.IncrementalChunkedOperatorAggregationStateManagerTypedBase;
-import io.deephaven.engine.table.impl.sources.ByteArraySource;
-import io.deephaven.engine.table.impl.sources.IntegerArraySource;
-import io.deephaven.util.QueryConstants;
-import io.deephaven.util.type.TypeUtils;
-import java.lang.Byte;
-import java.lang.Integer;
-import java.lang.Object;
-import java.lang.Override;
-
-final class IncrementalAggHasherIntByte extends IncrementalChunkedOperatorAggregationStateManagerTypedBase {
-    private final IntegerArraySource mainKeySource0;
-
-    private final IntegerArraySource overflowKeySource0;
-
-    private final ByteArraySource mainKeySource1;
-
-    private final ByteArraySource overflowKeySource1;
-
-    public IncrementalAggHasherIntByte(ColumnSource[] tableKeySources,
-            ColumnSource[] originalTableKeySources, int tableSize, double maximumLoadFactor,
-            double targetLoadFactor) {
-        super(tableKeySources, tableSize, maximumLoadFactor, targetLoadFactor);
-        this.mainKeySource0 = (IntegerArraySource) super.mainKeySources[0];
-        this.overflowKeySource0 = (IntegerArraySource) super.overflowKeySources[0];
-        this.mainKeySource1 = (ByteArraySource) super.mainKeySources[1];
-        this.overflowKeySource1 = (ByteArraySource) super.overflowKeySources[1];
-    }
-
-    @Override
-    protected void build(HashHandler handler, RowSequence rowSequence, Chunk[] sourceKeyChunks) {
-        final IntChunk<Values> keyChunk0 = sourceKeyChunks[0].asIntChunk();
-        final ByteChunk<Values> keyChunk1 = sourceKeyChunks[1].asByteChunk();
-        final int chunkSize = keyChunk0.size();
-        for (int chunkPosition = 0; chunkPosition < chunkSize; ++chunkPosition) {
-            final int k0 = keyChunk0.get(chunkPosition);
-            final byte k1 = keyChunk1.get(chunkPosition);
-            final int hash = hash(k0, k1);
-            final int tableLocation = hashToTableLocation(tableHashPivot, hash);
-            if (mainOutputPosition.getUnsafe(tableLocation) == EMPTY_OUTPUT_POSITION) {
-                numEntries++;
-                mainKeySource0.set(tableLocation, k0);
-                mainKeySource1.set(tableLocation, k1);
-                handler.doMainInsert(tableLocation, chunkPosition);
-            } else if (eq(mainKeySource0.getUnsafe(tableLocation), k0) && eq(mainKeySource1.getUnsafe(tableLocation), k1)) {
-                handler.doMainFound(tableLocation, chunkPosition);
-            } else {
-                int overflowLocation = mainOverflowLocationSource.getUnsafe(tableLocation);
-                if (!findOverflow(handler, k0, k1, chunkPosition, overflowLocation)) {
-                    final int newOverflowLocation = allocateOverflowLocation();
-                    overflowKeySource0.set(newOverflowLocation, k0);
-                    overflowKeySource1.set(newOverflowLocation, k1);
-                    mainOverflowLocationSource.set(tableLocation, newOverflowLocation);
-                    overflowOverflowLocationSource.set(newOverflowLocation, overflowLocation);
-                    numEntries++;
-                    handler.doOverflowInsert(newOverflowLocation, chunkPosition);
-                }
-            }
-        }
-    }
-
-    @Override
-    protected void probe(HashHandler handler, RowSequence rowSequence, Chunk[] sourceKeyChunks) {
-        final IntChunk<Values> keyChunk0 = sourceKeyChunks[0].asIntChunk();
-        final ByteChunk<Values> keyChunk1 = sourceKeyChunks[1].asByteChunk();
-        final int chunkSize = keyChunk0.size();
-        for (int chunkPosition = 0; chunkPosition < chunkSize; ++chunkPosition) {
-            final int k0 = keyChunk0.get(chunkPosition);
-            final byte k1 = keyChunk1.get(chunkPosition);
-            final int hash = hash(k0, k1);
-            final int tableLocation = hashToTableLocation(tableHashPivot, hash);
-            if (mainOutputPosition.getUnsafe(tableLocation) == EMPTY_OUTPUT_POSITION) {
-                handler.doMissing(chunkPosition);
-            } else if (eq(mainKeySource0.getUnsafe(tableLocation), k0) && eq(mainKeySource1.getUnsafe(tableLocation), k1)) {
-                handler.doMainFound(tableLocation, chunkPosition);
-            } else {
-                int overflowLocation = mainOverflowLocationSource.getUnsafe(tableLocation);
-                if (!findOverflow(handler, k0, k1, chunkPosition, overflowLocation)) {
-                    handler.doMissing(chunkPosition);
-                }
-            }
-        }
-    }
-
-    private static int hash(int k0, byte k1) {
-        int hash = IntChunkHasher.hashInitialSingle(k0);
-        hash = ByteChunkHasher.hashUpdateSingle(hash, k1);
-        return hash;
-    }
-
-    @Override
-    protected void rehashBucket(HashHandler handler, int sourceBucket, int destBucket,
-            int bucketsToAdd) {
-        final int position = mainOutputPosition.getUnsafe(sourceBucket);
-        if (position == EMPTY_OUTPUT_POSITION) {
-            return;
-        }
-        int mainInsertLocation = maybeMoveMainBucket(handler, sourceBucket, destBucket, bucketsToAdd);
-        int overflowLocation = mainOverflowLocationSource.getUnsafe(sourceBucket);
-        mainOverflowLocationSource.set(sourceBucket, QueryConstants.NULL_INT);
-        mainOverflowLocationSource.set(destBucket, QueryConstants.NULL_INT);
-        while (overflowLocation != QueryConstants.NULL_INT) {
-            final int nextOverflowLocation = overflowOverflowLocationSource.getUnsafe(overflowLocation);
-            final int overflowKey0 = overflowKeySource0.getUnsafe(overflowLocation);
-            final byte overflowKey1 = overflowKeySource1.getUnsafe(overflowLocation);
-            final int overflowHash = hash(overflowKey0, overflowKey1);
-            final int overflowTableLocation = hashToTableLocation(tableHashPivot + bucketsToAdd, overflowHash);
-            if (overflowTableLocation == mainInsertLocation) {
-                mainKeySource0.set(mainInsertLocation, overflowKey0);
-                mainKeySource1.set(mainInsertLocation, overflowKey1);
-                mainOutputPosition.set(mainInsertLocation, overflowOutputPosition.getUnsafe(overflowLocation));
-                handler.doPromoteOverflow(overflowLocation, mainInsertLocation);
-                overflowOutputPosition.set(overflowLocation, QueryConstants.NULL_INT);
-                overflowKeySource0.set(overflowLocation, QueryConstants.NULL_INT);
-                overflowKeySource1.set(overflowLocation, QueryConstants.NULL_BYTE);
-                freeOverflowLocation(overflowLocation);
-                mainInsertLocation = -1;
-            } else {
-                final int oldOverflowLocation = mainOverflowLocationSource.getUnsafe(overflowTableLocation);
-                mainOverflowLocationSource.set(overflowTableLocation, overflowLocation);
-                overflowOverflowLocationSource.set(overflowLocation, oldOverflowLocation);
-            }
-            overflowLocation = nextOverflowLocation;
-        }
-    }
-
-    private int maybeMoveMainBucket(HashHandler handler, int sourceBucket, int destBucket,
-            int bucketsToAdd) {
-        final int k0 = mainKeySource0.getUnsafe(sourceBucket);
-        final byte k1 = mainKeySource1.getUnsafe(sourceBucket);
-        final int hash = hash(k0, k1);
-        final int location = hashToTableLocation(tableHashPivot + bucketsToAdd, hash);
-        final int mainInsertLocation;
-        if (location == sourceBucket) {
-            mainInsertLocation = destBucket;
-            mainOutputPosition.set(destBucket, EMPTY_OUTPUT_POSITION);
-        } else {
-            mainInsertLocation = sourceBucket;
-            mainOutputPosition.set(destBucket, mainOutputPosition.getUnsafe(sourceBucket));
-            mainOutputPosition.set(sourceBucket, EMPTY_OUTPUT_POSITION);
-            mainKeySource0.set(destBucket, k0);
-            mainKeySource0.set(sourceBucket, QueryConstants.NULL_INT);
-            mainKeySource1.set(destBucket, k1);
-            mainKeySource1.set(sourceBucket, QueryConstants.NULL_BYTE);
-            handler.doMoveMain(sourceBucket, destBucket);
-        }
-        return mainInsertLocation;
-    }
-
-    private boolean findOverflow(HashHandler handler, int k0, byte k1, int chunkPosition,
-            int overflowLocation) {
-        while (overflowLocation != QueryConstants.NULL_INT) {
-            if (eq(overflowKeySource0.getUnsafe(overflowLocation), k0) && eq(overflowKeySource1.getUnsafe(overflowLocation), k1)) {
-                handler.doOverflowFound(overflowLocation, chunkPosition);
-                return true;
-            }
-            overflowLocation = overflowOverflowLocationSource.getUnsafe(overflowLocation);
-        }
-        return false;
-    }
-
-    @Override
-    public int findPositionForKey(Object key) {
-        final Object [] ka = (Object[])key;
-        final int k0 = TypeUtils.unbox((Integer)ka[0]);
-        final byte k1 = TypeUtils.unbox((Byte)ka[1]);
-        int hash = hash(k0, k1);
-        final int tableLocation = hashToTableLocation(tableHashPivot, hash);
-        final int positionValue = mainOutputPosition.getUnsafe(tableLocation);
-        if (positionValue == EMPTY_OUTPUT_POSITION) {
-            return -1;
-        }
-        if (eq(mainKeySource0.getUnsafe(tableLocation), k0) && eq(mainKeySource1.getUnsafe(tableLocation), k1)) {
-            return positionValue;
-        }
-        int overflowLocation = mainOverflowLocationSource.getUnsafe(tableLocation);
-        while (overflowLocation != QueryConstants.NULL_INT) {
-            if (eq(overflowKeySource0.getUnsafe(overflowLocation), k0) && eq(overflowKeySource1.getUnsafe(overflowLocation), k1)) {
-                return overflowOutputPosition.getUnsafe(overflowLocation);
-            }
-            overflowLocation = overflowOverflowLocationSource.getUnsafe(overflowLocation);
-        }
-        return -1;
-    }
-}
diff --git a/engine/table/src/main/java/io/deephaven/engine/table/impl/by/typed/incagg/gen/IncrementalAggHasherIntChar.java b/engine/table/src/main/java/io/deephaven/engine/table/impl/by/typed/incagg/gen/IncrementalAggHasherIntChar.java
deleted file mode 100644
index ecb1136488f..00000000000
--- a/engine/table/src/main/java/io/deephaven/engine/table/impl/by/typed/incagg/gen/IncrementalAggHasherIntChar.java
+++ /dev/null
@@ -1,206 +0,0 @@
-//
-// Copyright (c) 2016-2024 Deephaven Data Labs and Patent Pending
-//
-// ****** AUTO-GENERATED CLASS - DO NOT EDIT MANUALLY
-// ****** Run ReplicateTypedHashers or ./gradlew replicateTypedHashers to regenerate
-//
-// @formatter:off
-package io.deephaven.engine.table.impl.by.typed.incagg.gen;
-
-import static io.deephaven.util.compare.CharComparisons.eq;
-import static io.deephaven.util.compare.IntComparisons.eq;
-
-import io.deephaven.chunk.CharChunk;
-import io.deephaven.chunk.Chunk;
-import io.deephaven.chunk.IntChunk;
-import io.deephaven.chunk.attributes.Values;
-import io.deephaven.chunk.util.hashing.CharChunkHasher;
-import io.deephaven.chunk.util.hashing.IntChunkHasher;
-import io.deephaven.engine.rowset.RowSequence;
-import io.deephaven.engine.table.ColumnSource;
-import io.deephaven.engine.table.impl.by.HashHandler;
-import io.deephaven.engine.table.impl.by.IncrementalChunkedOperatorAggregationStateManagerTypedBase;
-import io.deephaven.engine.table.impl.sources.CharacterArraySource;
-import io.deephaven.engine.table.impl.sources.IntegerArraySource;
-import io.deephaven.util.QueryConstants;
-import io.deephaven.util.type.TypeUtils;
-import java.lang.Character;
-import java.lang.Integer;
-import java.lang.Object;
-import java.lang.Override;
-
-final class IncrementalAggHasherIntChar extends IncrementalChunkedOperatorAggregationStateManagerTypedBase {
-    private final IntegerArraySource mainKeySource0;
-
-    private final IntegerArraySource overflowKeySource0;
-
-    private final CharacterArraySource mainKeySource1;
-
-    private final CharacterArraySource overflowKeySource1;
-
-    public IncrementalAggHasherIntChar(ColumnSource[] tableKeySources,
-            ColumnSource[] originalTableKeySources, int tableSize, double maximumLoadFactor,
-            double targetLoadFactor) {
-        super(tableKeySources, tableSize, maximumLoadFactor, targetLoadFactor);
-        this.mainKeySource0 = (IntegerArraySource) super.mainKeySources[0];
-        this.overflowKeySource0 = (IntegerArraySource) super.overflowKeySources[0];
-        this.mainKeySource1 = (CharacterArraySource) super.mainKeySources[1];
-        this.overflowKeySource1 = (CharacterArraySource) super.overflowKeySources[1];
-    }
-
-    @Override
-    protected void build(HashHandler handler, RowSequence rowSequence, Chunk[] sourceKeyChunks) {
-        final IntChunk<Values> keyChunk0 = sourceKeyChunks[0].asIntChunk();
-        final CharChunk<Values> keyChunk1 = sourceKeyChunks[1].asCharChunk();
-        final int chunkSize = keyChunk0.size();
-        for (int chunkPosition = 0; chunkPosition < chunkSize; ++chunkPosition) {
-            final int k0 = keyChunk0.get(chunkPosition);
-            final char k1 = keyChunk1.get(chunkPosition);
-            final int hash = hash(k0, k1);
-            final int tableLocation = hashToTableLocation(tableHashPivot, hash);
-            if (mainOutputPosition.getUnsafe(tableLocation) == EMPTY_OUTPUT_POSITION) {
-                numEntries++;
-                mainKeySource0.set(tableLocation, k0);
-                mainKeySource1.set(tableLocation, k1);
-                handler.doMainInsert(tableLocation, chunkPosition);
-            } else if (eq(mainKeySource0.getUnsafe(tableLocation), k0) && eq(mainKeySource1.getUnsafe(tableLocation), k1)) {
-                handler.doMainFound(tableLocation, chunkPosition);
-            } else {
-                int overflowLocation = mainOverflowLocationSource.getUnsafe(tableLocation);
-                if (!findOverflow(handler, k0, k1, chunkPosition, overflowLocation)) {
-                    final int newOverflowLocation = allocateOverflowLocation();
-                    overflowKeySource0.set(newOverflowLocation, k0);
-                    overflowKeySource1.set(newOverflowLocation, k1);
-                    mainOverflowLocationSource.set(tableLocation, newOverflowLocation);
-                    overflowOverflowLocationSource.set(newOverflowLocation, overflowLocation);
-                    numEntries++;
-                    handler.doOverflowInsert(newOverflowLocation, chunkPosition);
-                }
-            }
-        }
-    }
-
-    @Override
-    protected void probe(HashHandler handler, RowSequence rowSequence, Chunk[] sourceKeyChunks) {
-        final IntChunk<Values> keyChunk0 = sourceKeyChunks[0].asIntChunk();
-        final CharChunk<Values> keyChunk1 = sourceKeyChunks[1].asCharChunk();
-        final int chunkSize = keyChunk0.size();
-        for (int chunkPosition = 0; chunkPosition < chunkSize; ++chunkPosition) {
-            final int k0 = keyChunk0.get(chunkPosition);
-            final char k1 = keyChunk1.get(chunkPosition);
-            final int hash = hash(k0, k1);
-            final int tableLocation = hashToTableLocation(tableHashPivot, hash);
-            if (mainOutputPosition.getUnsafe(tableLocation) == EMPTY_OUTPUT_POSITION) {
-                handler.doMissing(chunkPosition);
-            } else if (eq(mainKeySource0.getUnsafe(tableLocation), k0) && eq(mainKeySource1.getUnsafe(tableLocation), k1)) {
-                handler.doMainFound(tableLocation, chunkPosition);
-            } else {
-                int overflowLocation = mainOverflowLocationSource.getUnsafe(tableLocation);
-                if (!findOverflow(handler, k0, k1, chunkPosition, overflowLocation)) {
-                    handler.doMissing(chunkPosition);
-                }
-            }
-        }
-    }
-
-    private static int hash(int k0, char k1) {
-        int hash = IntChunkHasher.hashInitialSingle(k0);
-        hash = CharChunkHasher.hashUpdateSingle(hash, k1);
-        return hash;
-    }
-
-    @Override
-    protected void rehashBucket(HashHandler handler, int sourceBucket, int destBucket,
-            int bucketsToAdd) {
-        final int position = mainOutputPosition.getUnsafe(sourceBucket);
-        if (position == EMPTY_OUTPUT_POSITION) {
-            return;
-        }
-        int mainInsertLocation = maybeMoveMainBucket(handler, sourceBucket, destBucket, bucketsToAdd);
-        int overflowLocation = mainOverflowLocationSource.getUnsafe(sourceBucket);
-        mainOverflowLocationSource.set(sourceBucket, QueryConstants.NULL_INT);
-        mainOverflowLocationSource.set(destBucket, QueryConstants.NULL_INT);
-        while (overflowLocation != QueryConstants.NULL_INT) {
-            final int nextOverflowLocation = overflowOverflowLocationSource.getUnsafe(overflowLocation);
-            final int overflowKey0 = overflowKeySource0.getUnsafe(overflowLocation);
-            final char overflowKey1 = overflowKeySource1.getUnsafe(overflowLocation);
-            final int overflowHash = hash(overflowKey0, overflowKey1);
-            final int overflowTableLocation = hashToTableLocation(tableHashPivot + bucketsToAdd, overflowHash);
-            if (overflowTableLocation == mainInsertLocation) {
-                mainKeySource0.set(mainInsertLocation, overflowKey0);
-                mainKeySource1.set(mainInsertLocation, overflowKey1);
-                mainOutputPosition.set(mainInsertLocation, overflowOutputPosition.getUnsafe(overflowLocation));
-                handler.doPromoteOverflow(overflowLocation, mainInsertLocation);
-                overflowOutputPosition.set(overflowLocation, QueryConstants.NULL_INT);
-                overflowKeySource0.set(overflowLocation, QueryConstants.NULL_INT);
-                overflowKeySource1.set(overflowLocation, QueryConstants.NULL_CHAR);
-                freeOverflowLocation(overflowLocation);
-                mainInsertLocation = -1;
-            } else {
-                final int oldOverflowLocation = mainOverflowLocationSource.getUnsafe(overflowTableLocation);
-                mainOverflowLocationSource.set(overflowTableLocation, overflowLocation);
-                overflowOverflowLocationSource.set(overflowLocation, oldOverflowLocation);
-            }
-            overflowLocation = nextOverflowLocation;
-        }
-    }
-
-    private int maybeMoveMainBucket(HashHandler handler, int sourceBucket, int destBucket,
-            int bucketsToAdd) {
-        final int k0 = mainKeySource0.getUnsafe(sourceBucket);
-        final char k1 = mainKeySource1.getUnsafe(sourceBucket);
-        final int hash = hash(k0, k1);
-        final int location = hashToTableLocation(tableHashPivot + bucketsToAdd, hash);
-        final int mainInsertLocation;
-        if (location == sourceBucket) {
-            mainInsertLocation = destBucket;
-            mainOutputPosition.set(destBucket, EMPTY_OUTPUT_POSITION);
-        } else {
-            mainInsertLocation = sourceBucket;
-            mainOutputPosition.set(destBucket, mainOutputPosition.getUnsafe(sourceBucket));
-            mainOutputPosition.set(sourceBucket, EMPTY_OUTPUT_POSITION);
-            mainKeySource0.set(destBucket, k0);
-            mainKeySource0.set(sourceBucket, QueryConstants.NULL_INT);
-            mainKeySource1.set(destBucket, k1);
-            mainKeySource1.set(sourceBucket, QueryConstants.NULL_CHAR);
-            handler.doMoveMain(sourceBucket, destBucket);
-        }
-        return mainInsertLocation;
-    }
-
-    private boolean findOverflow(HashHandler handler, int k0, char k1, int chunkPosition,
-            int overflowLocation) {
-        while (overflowLocation != QueryConstants.NULL_INT) {
-            if (eq(overflowKeySource0.getUnsafe(overflowLocation), k0) && eq(overflowKeySource1.getUnsafe(overflowLocation), k1)) {
-                handler.doOverflowFound(overflowLocation, chunkPosition);
-                return true;
-            }
-            overflowLocation = overflowOverflowLocationSource.getUnsafe(overflowLocation);
-        }
-        return false;
-    }
-
-    @Override
-    public int findPositionForKey(Object key) {
-        final Object [] ka = (Object[])key;
-        final int k0 = TypeUtils.unbox((Integer)ka[0]);
-        final char k1 = TypeUtils.unbox((Character)ka[1]);
-        int hash = hash(k0, k1);
-        final int tableLocation = hashToTableLocation(tableHashPivot, hash);
-        final int positionValue = mainOutputPosition.getUnsafe(tableLocation);
-        if (positionValue == EMPTY_OUTPUT_POSITION) {
-            return -1;
-        }
-        if (eq(mainKeySource0.getUnsafe(tableLocation), k0) && eq(mainKeySource1.getUnsafe(tableLocation), k1)) {
-            return positionValue;
-        }
-        int overflowLocation = mainOverflowLocationSource.getUnsafe(tableLocation);
-        while (overflowLocation != QueryConstants.NULL_INT) {
-            if (eq(overflowKeySource0.getUnsafe(overflowLocation), k0) && eq(overflowKeySource1.getUnsafe(overflowLocation), k1)) {
-                return overflowOutputPosition.getUnsafe(overflowLocation);
-            }
-            overflowLocation = overflowOverflowLocationSource.getUnsafe(overflowLocation);
-        }
-        return -1;
-    }
-}
diff --git a/engine/table/src/main/java/io/deephaven/engine/table/impl/by/typed/incagg/gen/IncrementalAggHasherIntDouble.java b/engine/table/src/main/java/io/deephaven/engine/table/impl/by/typed/incagg/gen/IncrementalAggHasherIntDouble.java
deleted file mode 100644
index 3e31ade61cb..00000000000
--- a/engine/table/src/main/java/io/deephaven/engine/table/impl/by/typed/incagg/gen/IncrementalAggHasherIntDouble.java
+++ /dev/null
@@ -1,206 +0,0 @@
-//
-// Copyright (c) 2016-2024 Deephaven Data Labs and Patent Pending
-//
-// ****** AUTO-GENERATED CLASS - DO NOT EDIT MANUALLY
-// ****** Run ReplicateTypedHashers or ./gradlew replicateTypedHashers to regenerate
-//
-// @formatter:off
-package io.deephaven.engine.table.impl.by.typed.incagg.gen;
-
-import static io.deephaven.util.compare.DoubleComparisons.eq;
-import static io.deephaven.util.compare.IntComparisons.eq;
-
-import io.deephaven.chunk.Chunk;
-import io.deephaven.chunk.DoubleChunk;
-import io.deephaven.chunk.IntChunk;
-import io.deephaven.chunk.attributes.Values;
-import io.deephaven.chunk.util.hashing.DoubleChunkHasher;
-import io.deephaven.chunk.util.hashing.IntChunkHasher;
-import io.deephaven.engine.rowset.RowSequence;
-import io.deephaven.engine.table.ColumnSource;
-import io.deephaven.engine.table.impl.by.HashHandler;
-import io.deephaven.engine.table.impl.by.IncrementalChunkedOperatorAggregationStateManagerTypedBase;
-import io.deephaven.engine.table.impl.sources.DoubleArraySource;
-import io.deephaven.engine.table.impl.sources.IntegerArraySource;
-import io.deephaven.util.QueryConstants;
-import io.deephaven.util.type.TypeUtils;
-import java.lang.Double;
-import java.lang.Integer;
-import java.lang.Object;
-import java.lang.Override;
-
-final class IncrementalAggHasherIntDouble extends IncrementalChunkedOperatorAggregationStateManagerTypedBase {
-    private final IntegerArraySource mainKeySource0;
-
-    private final IntegerArraySource overflowKeySource0;
-
-    private final DoubleArraySource mainKeySource1;
-
-    private final DoubleArraySource overflowKeySource1;
-
-    public IncrementalAggHasherIntDouble(ColumnSource[] tableKeySources,
-            ColumnSource[] originalTableKeySources, int tableSize, double maximumLoadFactor,
-            double targetLoadFactor) {
-        super(tableKeySources, tableSize, maximumLoadFactor, targetLoadFactor);
-        this.mainKeySource0 = (IntegerArraySource) super.mainKeySources[0];
-        this.overflowKeySource0 = (IntegerArraySource) super.overflowKeySources[0];
-        this.mainKeySource1 = (DoubleArraySource) super.mainKeySources[1];
-        this.overflowKeySource1 = (DoubleArraySource) super.overflowKeySources[1];
-    }
-
-    @Override
-    protected void build(HashHandler handler, RowSequence rowSequence, Chunk[] sourceKeyChunks) {
-        final IntChunk<Values> keyChunk0 = sourceKeyChunks[0].asIntChunk();
-        final DoubleChunk<Values> keyChunk1 = sourceKeyChunks[1].asDoubleChunk();
-        final int chunkSize = keyChunk0.size();
-        for (int chunkPosition = 0; chunkPosition < chunkSize; ++chunkPosition) {
-            final int k0 = keyChunk0.get(chunkPosition);
-            final double k1 = keyChunk1.get(chunkPosition);
-            final int hash = hash(k0, k1);
-            final int tableLocation = hashToTableLocation(tableHashPivot, hash);
-            if (mainOutputPosition.getUnsafe(tableLocation) == EMPTY_OUTPUT_POSITION) {
-                numEntries++;
-                mainKeySource0.set(tableLocation, k0);
-                mainKeySource1.set(tableLocation, k1);
-                handler.doMainInsert(tableLocation, chunkPosition);
-            } else if (eq(mainKeySource0.getUnsafe(tableLocation), k0) && eq(mainKeySource1.getUnsafe(tableLocation), k1)) {
-                handler.doMainFound(tableLocation, chunkPosition);
-            } else {
-                int overflowLocation = mainOverflowLocationSource.getUnsafe(tableLocation);
-                if (!findOverflow(handler, k0, k1, chunkPosition, overflowLocation)) {
-                    final int newOverflowLocation = allocateOverflowLocation();
-                    overflowKeySource0.set(newOverflowLocation, k0);
-                    overflowKeySource1.set(newOverflowLocation, k1);
-                    mainOverflowLocationSource.set(tableLocation, newOverflowLocation);
-                    overflowOverflowLocationSource.set(newOverflowLocation, overflowLocation);
-                    numEntries++;
-                    handler.doOverflowInsert(newOverflowLocation, chunkPosition);
-                }
-            }
-        }
-    }
-
-    @Override
-    protected void probe(HashHandler handler, RowSequence rowSequence, Chunk[] sourceKeyChunks) {
-        final IntChunk<Values> keyChunk0 = sourceKeyChunks[0].asIntChunk();
-        final DoubleChunk<Values> keyChunk1 = sourceKeyChunks[1].asDoubleChunk();
-        final int chunkSize = keyChunk0.size();
-        for (int chunkPosition = 0; chunkPosition < chunkSize; ++chunkPosition) {
-            final int k0 = keyChunk0.get(chunkPosition);
-            final double k1 = keyChunk1.get(chunkPosition);
-            final int hash = hash(k0, k1);
-            final int tableLocation = hashToTableLocation(tableHashPivot, hash);
-            if (mainOutputPosition.getUnsafe(tableLocation) == EMPTY_OUTPUT_POSITION) {
-                handler.doMissing(chunkPosition);
-            } else if (eq(mainKeySource0.getUnsafe(tableLocation), k0) && eq(mainKeySource1.getUnsafe(tableLocation), k1)) {
-                handler.doMainFound(tableLocation, chunkPosition);
-            } else {
-                int overflowLocation = mainOverflowLocationSource.getUnsafe(tableLocation);
-                if (!findOverflow(handler, k0, k1, chunkPosition, overflowLocation)) {
-                    handler.doMissing(chunkPosition);
-                }
-            }
-        }
-    }
-
-    private static int hash(int k0, double k1) {
-        int hash = IntChunkHasher.hashInitialSingle(k0);
-        hash = DoubleChunkHasher.hashUpdateSingle(hash, k1);
-        return hash;
-    }
-
-    @Override
-    protected void rehashBucket(HashHandler handler, int sourceBucket, int destBucket,
-            int bucketsToAdd) {
-        final int position = mainOutputPosition.getUnsafe(sourceBucket);
-        if (position == EMPTY_OUTPUT_POSITION) {
-            return;
-        }
-        int mainInsertLocation = maybeMoveMainBucket(handler, sourceBucket, destBucket, bucketsToAdd);
-        int overflowLocation = mainOverflowLocationSource.getUnsafe(sourceBucket);
-        mainOverflowLocationSource.set(sourceBucket, QueryConstants.NULL_INT);
-        mainOverflowLocationSource.set(destBucket, QueryConstants.NULL_INT);
-        while (overflowLocation != QueryConstants.NULL_INT) {
-            final int nextOverflowLocation = overflowOverflowLocationSource.getUnsafe(overflowLocation);
-            final int overflowKey0 = overflowKeySource0.getUnsafe(overflowLocation);
-            final double overflowKey1 = overflowKeySource1.getUnsafe(overflowLocation);
-            final int overflowHash = hash(overflowKey0, overflowKey1);
-            final int overflowTableLocation = hashToTableLocation(tableHashPivot + bucketsToAdd, overflowHash);
-            if (overflowTableLocation == mainInsertLocation) {
-                mainKeySource0.set(mainInsertLocation, overflowKey0);
-                mainKeySource1.set(mainInsertLocation, overflowKey1);
-                mainOutputPosition.set(mainInsertLocation, overflowOutputPosition.getUnsafe(overflowLocation));
-                handler.doPromoteOverflow(overflowLocation, mainInsertLocation);
-                overflowOutputPosition.set(overflowLocation, QueryConstants.NULL_INT);
-                overflowKeySource0.set(overflowLocation, QueryConstants.NULL_INT);
-                overflowKeySource1.set(overflowLocation, QueryConstants.NULL_DOUBLE);
-                freeOverflowLocation(overflowLocation);
-                mainInsertLocation = -1;
-            } else {
-                final int oldOverflowLocation = mainOverflowLocationSource.getUnsafe(overflowTableLocation);
-                mainOverflowLocationSource.set(overflowTableLocation, overflowLocation);
-                overflowOverflowLocationSource.set(overflowLocation, oldOverflowLocation);
-            }
-            overflowLocation = nextOverflowLocation;
-        }
-    }
-
-    private int maybeMoveMainBucket(HashHandler handler, int sourceBucket, int destBucket,
-            int bucketsToAdd) {
-        final int k0 = mainKeySource0.getUnsafe(sourceBucket);
-        final double k1 = mainKeySource1.getUnsafe(sourceBucket);
-        final int hash = hash(k0, k1);
-        final int location = hashToTableLocation(tableHashPivot + bucketsToAdd, hash);
-        final int mainInsertLocation;
-        if (location == sourceBucket) {
-            mainInsertLocation = destBucket;
-            mainOutputPosition.set(destBucket, EMPTY_OUTPUT_POSITION);
-        } else {
-            mainInsertLocation = sourceBucket;
-            mainOutputPosition.set(destBucket, mainOutputPosition.getUnsafe(sourceBucket));
-            mainOutputPosition.set(sourceBucket, EMPTY_OUTPUT_POSITION);
-            mainKeySource0.set(destBucket, k0);
-            mainKeySource0.set(sourceBucket, QueryConstants.NULL_INT);
-            mainKeySource1.set(destBucket, k1);
-            mainKeySource1.set(sourceBucket, QueryConstants.NULL_DOUBLE);
-            handler.doMoveMain(sourceBucket, destBucket);
-        }
-        return mainInsertLocation;
-    }
-
-    private boolean findOverflow(HashHandler handler, int k0, double k1, int chunkPosition,
-            int overflowLocation) {
-        while (overflowLocation != QueryConstants.NULL_INT) {
-            if (eq(overflowKeySource0.getUnsafe(overflowLocation), k0) && eq(overflowKeySource1.getUnsafe(overflowLocation), k1)) {
-                handler.doOverflowFound(overflowLocation, chunkPosition);
-                return true;
-            }
-            overflowLocation = overflowOverflowLocationSource.getUnsafe(overflowLocation);
-        }
-        return false;
-    }
-
-    @Override
-    public int findPositionForKey(Object key) {
-        final Object [] ka = (Object[])key;
-        final int k0 = TypeUtils.unbox((Integer)ka[0]);
-        final double k1 = TypeUtils.unbox((Double)ka[1]);
-        int hash = hash(k0, k1);
-        final int tableLocation = hashToTableLocation(tableHashPivot, hash);
-        final int positionValue = mainOutputPosition.getUnsafe(tableLocation);
-        if (positionValue == EMPTY_OUTPUT_POSITION) {
-            return -1;
-        }
-        if (eq(mainKeySource0.getUnsafe(tableLocation), k0) && eq(mainKeySource1.getUnsafe(tableLocation), k1)) {
-            return positionValue;
-        }
-        int overflowLocation = mainOverflowLocationSource.getUnsafe(tableLocation);
-        while (overflowLocation != QueryConstants.NULL_INT) {
-            if (eq(overflowKeySource0.getUnsafe(overflowLocation), k0) && eq(overflowKeySource1.getUnsafe(overflowLocation), k1)) {
-                return overflowOutputPosition.getUnsafe(overflowLocation);
-            }
-            overflowLocation = overflowOverflowLocationSource.getUnsafe(overflowLocation);
-        }
-        return -1;
-    }
-}
diff --git a/engine/table/src/main/java/io/deephaven/engine/table/impl/by/typed/incagg/gen/IncrementalAggHasherIntFloat.java b/engine/table/src/main/java/io/deephaven/engine/table/impl/by/typed/incagg/gen/IncrementalAggHasherIntFloat.java
deleted file mode 100644
index db69359fa81..00000000000
--- a/engine/table/src/main/java/io/deephaven/engine/table/impl/by/typed/incagg/gen/IncrementalAggHasherIntFloat.java
+++ /dev/null
@@ -1,206 +0,0 @@
-//
-// Copyright (c) 2016-2024 Deephaven Data Labs and Patent Pending
-//
-// ****** AUTO-GENERATED CLASS - DO NOT EDIT MANUALLY
-// ****** Run ReplicateTypedHashers or ./gradlew replicateTypedHashers to regenerate
-//
-// @formatter:off
-package io.deephaven.engine.table.impl.by.typed.incagg.gen;
-
-import static io.deephaven.util.compare.FloatComparisons.eq;
-import static io.deephaven.util.compare.IntComparisons.eq;
-
-import io.deephaven.chunk.Chunk;
-import io.deephaven.chunk.FloatChunk;
-import io.deephaven.chunk.IntChunk;
-import io.deephaven.chunk.attributes.Values;
-import io.deephaven.chunk.util.hashing.FloatChunkHasher;
-import io.deephaven.chunk.util.hashing.IntChunkHasher;
-import io.deephaven.engine.rowset.RowSequence;
-import io.deephaven.engine.table.ColumnSource;
-import io.deephaven.engine.table.impl.by.HashHandler;
-import io.deephaven.engine.table.impl.by.IncrementalChunkedOperatorAggregationStateManagerTypedBase;
-import io.deephaven.engine.table.impl.sources.FloatArraySource;
-import io.deephaven.engine.table.impl.sources.IntegerArraySource;
-import io.deephaven.util.QueryConstants;
-import io.deephaven.util.type.TypeUtils;
-import java.lang.Float;
-import java.lang.Integer;
-import java.lang.Object;
-import java.lang.Override;
-
-final class IncrementalAggHasherIntFloat extends IncrementalChunkedOperatorAggregationStateManagerTypedBase {
-    private final IntegerArraySource mainKeySource0;
-
-    private final IntegerArraySource overflowKeySource0;
-
-    private final FloatArraySource mainKeySource1;
-
-    private final FloatArraySource overflowKeySource1;
-
-    public IncrementalAggHasherIntFloat(ColumnSource[] tableKeySources,
-            ColumnSource[] originalTableKeySources, int tableSize, double maximumLoadFactor,
-            double targetLoadFactor) {
-        super(tableKeySources, tableSize, maximumLoadFactor, targetLoadFactor);
-        this.mainKeySource0 = (IntegerArraySource) super.mainKeySources[0];
-        this.overflowKeySource0 = (IntegerArraySource) super.overflowKeySources[0];
-        this.mainKeySource1 = (FloatArraySource) super.mainKeySources[1];
-        this.overflowKeySource1 = (FloatArraySource) super.overflowKeySources[1];
-    }
-
-    @Override
-    protected void build(HashHandler handler, RowSequence rowSequence, Chunk[] sourceKeyChunks) {
-        final IntChunk<Values> keyChunk0 = sourceKeyChunks[0].asIntChunk();
-        final FloatChunk<Values> keyChunk1 = sourceKeyChunks[1].asFloatChunk();
-        final int chunkSize = keyChunk0.size();
-        for (int chunkPosition = 0; chunkPosition < chunkSize; ++chunkPosition) {
-            final int k0 = keyChunk0.get(chunkPosition);
-            final float k1 = keyChunk1.get(chunkPosition);
-            final int hash = hash(k0, k1);
-            final int tableLocation = hashToTableLocation(tableHashPivot, hash);
-            if (mainOutputPosition.getUnsafe(tableLocation) == EMPTY_OUTPUT_POSITION) {
-                numEntries++;
-                mainKeySource0.set(tableLocation, k0);
-                mainKeySource1.set(tableLocation, k1);
-                handler.doMainInsert(tableLocation, chunkPosition);
-            } else if (eq(mainKeySource0.getUnsafe(tableLocation), k0) && eq(mainKeySource1.getUnsafe(tableLocation), k1)) {
-                handler.doMainFound(tableLocation, chunkPosition);
-            } else {
-                int overflowLocation = mainOverflowLocationSource.getUnsafe(tableLocation);
-                if (!findOverflow(handler, k0, k1, chunkPosition, overflowLocation)) {
-                    final int newOverflowLocation = allocateOverflowLocation();
-                    overflowKeySource0.set(newOverflowLocation, k0);
-                    overflowKeySource1.set(newOverflowLocation, k1);
-                    mainOverflowLocationSource.set(tableLocation, newOverflowLocation);
-                    overflowOverflowLocationSource.set(newOverflowLocation, overflowLocation);
-                    numEntries++;
-                    handler.doOverflowInsert(newOverflowLocation, chunkPosition);
-                }
-            }
-        }
-    }
-
-    @Override
-    protected void probe(HashHandler handler, RowSequence rowSequence, Chunk[] sourceKeyChunks) {
-        final IntChunk<Values> keyChunk0 = sourceKeyChunks[0].asIntChunk();
-        final FloatChunk<Values> keyChunk1 = sourceKeyChunks[1].asFloatChunk();
-        final int chunkSize = keyChunk0.size();
-        for (int chunkPosition = 0; chunkPosition < chunkSize; ++chunkPosition) {
-            final int k0 = keyChunk0.get(chunkPosition);
-            final float k1 = keyChunk1.get(chunkPosition);
-            final int hash = hash(k0, k1);
-            final int tableLocation = hashToTableLocation(tableHashPivot, hash);
-            if (mainOutputPosition.getUnsafe(tableLocation) == EMPTY_OUTPUT_POSITION) {
-                handler.doMissing(chunkPosition);
-            } else if (eq(mainKeySource0.getUnsafe(tableLocation), k0) && eq(mainKeySource1.getUnsafe(tableLocation), k1)) {
-                handler.doMainFound(tableLocation, chunkPosition);
-            } else {
-                int overflowLocation = mainOverflowLocationSource.getUnsafe(tableLocation);
-                if (!findOverflow(handler, k0, k1, chunkPosition, overflowLocation)) {
-                    handler.doMissing(chunkPosition);
-                }
-            }
-        }
-    }
-
-    private static int hash(int k0, float k1) {
-        int hash = IntChunkHasher.hashInitialSingle(k0);
-        hash = FloatChunkHasher.hashUpdateSingle(hash, k1);
-        return hash;
-    }
-
-    @Override
-    protected void rehashBucket(HashHandler handler, int sourceBucket, int destBucket,
-            int bucketsToAdd) {
-        final int position = mainOutputPosition.getUnsafe(sourceBucket);
-        if (position == EMPTY_OUTPUT_POSITION) {
-            return;
-        }
-        int mainInsertLocation = maybeMoveMainBucket(handler, sourceBucket, destBucket, bucketsToAdd);
-        int overflowLocation = mainOverflowLocationSource.getUnsafe(sourceBucket);
-        mainOverflowLocationSource.set(sourceBucket, QueryConstants.NULL_INT);
-        mainOverflowLocationSource.set(destBucket, QueryConstants.NULL_INT);
-        while (overflowLocation != QueryConstants.NULL_INT) {
-            final int nextOverflowLocation = overflowOverflowLocationSource.getUnsafe(overflowLocation);
-            final int overflowKey0 = overflowKeySource0.getUnsafe(overflowLocation);
-            final float overflowKey1 = overflowKeySource1.getUnsafe(overflowLocation);
-            final int overflowHash = hash(overflowKey0, overflowKey1);
-            final int overflowTableLocation = hashToTableLocation(tableHashPivot + bucketsToAdd, overflowHash);
-            if (overflowTableLocation == mainInsertLocation) {
-                mainKeySource0.set(mainInsertLocation, overflowKey0);
-                mainKeySource1.set(mainInsertLocation, overflowKey1);
-                mainOutputPosition.set(mainInsertLocation, overflowOutputPosition.getUnsafe(overflowLocation));
-                handler.doPromoteOverflow(overflowLocation, mainInsertLocation);
-                overflowOutputPosition.set(overflowLocation, QueryConstants.NULL_INT);
-                overflowKeySource0.set(overflowLocation, QueryConstants.NULL_INT);
-                overflowKeySource1.set(overflowLocation, QueryConstants.NULL_FLOAT);
-                freeOverflowLocation(overflowLocation);
-                mainInsertLocation = -1;
-            } else {
-                final int oldOverflowLocation = mainOverflowLocationSource.getUnsafe(overflowTableLocation);
-                mainOverflowLocationSource.set(overflowTableLocation, overflowLocation);
-                overflowOverflowLocationSource.set(overflowLocation, oldOverflowLocation);
-            }
-            overflowLocation = nextOverflowLocation;
-        }
-    }
-
-    private int maybeMoveMainBucket(HashHandler handler, int sourceBucket, int destBucket,
-            int bucketsToAdd) {
-        final int k0 = mainKeySource0.getUnsafe(sourceBucket);
-        final float k1 = mainKeySource1.getUnsafe(sourceBucket);
-        final int hash = hash(k0, k1);
-        final int location = hashToTableLocation(tableHashPivot + bucketsToAdd, hash);
-        final int mainInsertLocation;
-        if (location == sourceBucket) {
-            mainInsertLocation = destBucket;
-            mainOutputPosition.set(destBucket, EMPTY_OUTPUT_POSITION);
-        } else {
-            mainInsertLocation = sourceBucket;
-            mainOutputPosition.set(destBucket, mainOutputPosition.getUnsafe(sourceBucket));
-            mainOutputPosition.set(sourceBucket, EMPTY_OUTPUT_POSITION);
-            mainKeySource0.set(destBucket, k0);
-            mainKeySource0.set(sourceBucket, QueryConstants.NULL_INT);
-            mainKeySource1.set(destBucket, k1);
-            mainKeySource1.set(sourceBucket, QueryConstants.NULL_FLOAT);
-            handler.doMoveMain(sourceBucket, destBucket);
-        }
-        return mainInsertLocation;
-    }
-
-    private boolean findOverflow(HashHandler handler, int k0, float k1, int chunkPosition,
-            int overflowLocation) {
-        while (overflowLocation != QueryConstants.NULL_INT) {
-            if (eq(overflowKeySource0.getUnsafe(overflowLocation), k0) && eq(overflowKeySource1.getUnsafe(overflowLocation), k1)) {
-                handler.doOverflowFound(overflowLocation, chunkPosition);
-                return true;
-            }
-            overflowLocation = overflowOverflowLocationSource.getUnsafe(overflowLocation);
-        }
-        return false;
-    }
-
-    @Override
-    public int findPositionForKey(Object key) {
-        final Object [] ka = (Object[])key;
-        final int k0 = TypeUtils.unbox((Integer)ka[0]);
-        final float k1 = TypeUtils.unbox((Float)ka[1]);
-        int hash = hash(k0, k1);
-        final int tableLocation = hashToTableLocation(tableHashPivot, hash);
-        final int positionValue = mainOutputPosition.getUnsafe(tableLocation);
-        if (positionValue == EMPTY_OUTPUT_POSITION) {
-            return -1;
-        }
-        if (eq(mainKeySource0.getUnsafe(tableLocation), k0) && eq(mainKeySource1.getUnsafe(tableLocation), k1)) {
-            return positionValue;
-        }
-        int overflowLocation = mainOverflowLocationSource.getUnsafe(tableLocation);
-        while (overflowLocation != QueryConstants.NULL_INT) {
-            if (eq(overflowKeySource0.getUnsafe(overflowLocation), k0) && eq(overflowKeySource1.getUnsafe(overflowLocation), k1)) {
-                return overflowOutputPosition.getUnsafe(overflowLocation);
-            }
-            overflowLocation = overflowOverflowLocationSource.getUnsafe(overflowLocation);
-        }
-        return -1;
-    }
-}
diff --git a/engine/table/src/main/java/io/deephaven/engine/table/impl/by/typed/incagg/gen/IncrementalAggHasherIntInt.java b/engine/table/src/main/java/io/deephaven/engine/table/impl/by/typed/incagg/gen/IncrementalAggHasherIntInt.java
deleted file mode 100644
index 7603037a445..00000000000
--- a/engine/table/src/main/java/io/deephaven/engine/table/impl/by/typed/incagg/gen/IncrementalAggHasherIntInt.java
+++ /dev/null
@@ -1,201 +0,0 @@
-//
-// Copyright (c) 2016-2024 Deephaven Data Labs and Patent Pending
-//
-// ****** AUTO-GENERATED CLASS - DO NOT EDIT MANUALLY
-// ****** Run ReplicateTypedHashers or ./gradlew replicateTypedHashers to regenerate
-//
-// @formatter:off
-package io.deephaven.engine.table.impl.by.typed.incagg.gen;
-
-import static io.deephaven.util.compare.IntComparisons.eq;
-
-import io.deephaven.chunk.Chunk;
-import io.deephaven.chunk.IntChunk;
-import io.deephaven.chunk.attributes.Values;
-import io.deephaven.chunk.util.hashing.IntChunkHasher;
-import io.deephaven.engine.rowset.RowSequence;
-import io.deephaven.engine.table.ColumnSource;
-import io.deephaven.engine.table.impl.by.HashHandler;
-import io.deephaven.engine.table.impl.by.IncrementalChunkedOperatorAggregationStateManagerTypedBase;
-import io.deephaven.engine.table.impl.sources.IntegerArraySource;
-import io.deephaven.util.QueryConstants;
-import io.deephaven.util.type.TypeUtils;
-import java.lang.Integer;
-import java.lang.Object;
-import java.lang.Override;
-
-final class IncrementalAggHasherIntInt extends IncrementalChunkedOperatorAggregationStateManagerTypedBase {
-    private final IntegerArraySource mainKeySource0;
-
-    private final IntegerArraySource overflowKeySource0;
-
-    private final IntegerArraySource mainKeySource1;
-
-    private final IntegerArraySource overflowKeySource1;
-
-    public IncrementalAggHasherIntInt(ColumnSource[] tableKeySources,
-            ColumnSource[] originalTableKeySources, int tableSize, double maximumLoadFactor,
-            double targetLoadFactor) {
-        super(tableKeySources, tableSize, maximumLoadFactor, targetLoadFactor);
-        this.mainKeySource0 = (IntegerArraySource) super.mainKeySources[0];
-        this.overflowKeySource0 = (IntegerArraySource) super.overflowKeySources[0];
-        this.mainKeySource1 = (IntegerArraySource) super.mainKeySources[1];
-        this.overflowKeySource1 = (IntegerArraySource) super.overflowKeySources[1];
-    }
-
-    @Override
-    protected void build(HashHandler handler, RowSequence rowSequence, Chunk[] sourceKeyChunks) {
-        final IntChunk<Values> keyChunk0 = sourceKeyChunks[0].asIntChunk();
-        final IntChunk<Values> keyChunk1 = sourceKeyChunks[1].asIntChunk();
-        final int chunkSize = keyChunk0.size();
-        for (int chunkPosition = 0; chunkPosition < chunkSize; ++chunkPosition) {
-            final int k0 = keyChunk0.get(chunkPosition);
-            final int k1 = keyChunk1.get(chunkPosition);
-            final int hash = hash(k0, k1);
-            final int tableLocation = hashToTableLocation(tableHashPivot, hash);
-            if (mainOutputPosition.getUnsafe(tableLocation) == EMPTY_OUTPUT_POSITION) {
-                numEntries++;
-                mainKeySource0.set(tableLocation, k0);
-                mainKeySource1.set(tableLocation, k1);
-                handler.doMainInsert(tableLocation, chunkPosition);
-            } else if (eq(mainKeySource0.getUnsafe(tableLocation), k0) && eq(mainKeySource1.getUnsafe(tableLocation), k1)) {
-                handler.doMainFound(tableLocation, chunkPosition);
-            } else {
-                int overflowLocation = mainOverflowLocationSource.getUnsafe(tableLocation);
-                if (!findOverflow(handler, k0, k1, chunkPosition, overflowLocation)) {
-                    final int newOverflowLocation = allocateOverflowLocation();
-                    overflowKeySource0.set(newOverflowLocation, k0);
-                    overflowKeySource1.set(newOverflowLocation, k1);
-                    mainOverflowLocationSource.set(tableLocation, newOverflowLocation);
-                    overflowOverflowLocationSource.set(newOverflowLocation, overflowLocation);
-                    numEntries++;
-                    handler.doOverflowInsert(newOverflowLocation, chunkPosition);
-                }
-            }
-        }
-    }
-
-    @Override
-    protected void probe(HashHandler handler, RowSequence rowSequence, Chunk[] sourceKeyChunks) {
-        final IntChunk<Values> keyChunk0 = sourceKeyChunks[0].asIntChunk();
-        final IntChunk<Values> keyChunk1 = sourceKeyChunks[1].asIntChunk();
-        final int chunkSize = keyChunk0.size();
-        for (int chunkPosition = 0; chunkPosition < chunkSize; ++chunkPosition) {
-            final int k0 = keyChunk0.get(chunkPosition);
-            final int k1 = keyChunk1.get(chunkPosition);
-            final int hash = hash(k0, k1);
-            final int tableLocation = hashToTableLocation(tableHashPivot, hash);
-            if (mainOutputPosition.getUnsafe(tableLocation) == EMPTY_OUTPUT_POSITION) {
-                handler.doMissing(chunkPosition);
-            } else if (eq(mainKeySource0.getUnsafe(tableLocation), k0) && eq(mainKeySource1.getUnsafe(tableLocation), k1)) {
-                handler.doMainFound(tableLocation, chunkPosition);
-            } else {
-                int overflowLocation = mainOverflowLocationSource.getUnsafe(tableLocation);
-                if (!findOverflow(handler, k0, k1, chunkPosition, overflowLocation)) {
-                    handler.doMissing(chunkPosition);
-                }
-            }
-        }
-    }
-
-    private static int hash(int k0, int k1) {
-        int hash = IntChunkHasher.hashInitialSingle(k0);
-        hash = IntChunkHasher.hashUpdateSingle(hash, k1);
-        return hash;
-    }
-
-    @Override
-    protected void rehashBucket(HashHandler handler, int sourceBucket, int destBucket,
-            int bucketsToAdd) {
-        final int position = mainOutputPosition.getUnsafe(sourceBucket);
-        if (position == EMPTY_OUTPUT_POSITION) {
-            return;
-        }
-        int mainInsertLocation = maybeMoveMainBucket(handler, sourceBucket, destBucket, bucketsToAdd);
-        int overflowLocation = mainOverflowLocationSource.getUnsafe(sourceBucket);
-        mainOverflowLocationSource.set(sourceBucket, QueryConstants.NULL_INT);
-        mainOverflowLocationSource.set(destBucket, QueryConstants.NULL_INT);
-        while (overflowLocation != QueryConstants.NULL_INT) {
-            final int nextOverflowLocation = overflowOverflowLocationSource.getUnsafe(overflowLocation);
-            final int overflowKey0 = overflowKeySource0.getUnsafe(overflowLocation);
-            final int overflowKey1 = overflowKeySource1.getUnsafe(overflowLocation);
-            final int overflowHash = hash(overflowKey0, overflowKey1);
-            final int overflowTableLocation = hashToTableLocation(tableHashPivot + bucketsToAdd, overflowHash);
-            if (overflowTableLocation == mainInsertLocation) {
-                mainKeySource0.set(mainInsertLocation, overflowKey0);
-                mainKeySource1.set(mainInsertLocation, overflowKey1);
-                mainOutputPosition.set(mainInsertLocation, overflowOutputPosition.getUnsafe(overflowLocation));
-                handler.doPromoteOverflow(overflowLocation, mainInsertLocation);
-                overflowOutputPosition.set(overflowLocation, QueryConstants.NULL_INT);
-                overflowKeySource0.set(overflowLocation, QueryConstants.NULL_INT);
-                overflowKeySource1.set(overflowLocation, QueryConstants.NULL_INT);
-                freeOverflowLocation(overflowLocation);
-                mainInsertLocation = -1;
-            } else {
-                final int oldOverflowLocation = mainOverflowLocationSource.getUnsafe(overflowTableLocation);
-                mainOverflowLocationSource.set(overflowTableLocation, overflowLocation);
-                overflowOverflowLocationSource.set(overflowLocation, oldOverflowLocation);
-            }
-            overflowLocation = nextOverflowLocation;
-        }
-    }
-
-    private int maybeMoveMainBucket(HashHandler handler, int sourceBucket, int destBucket,
-            int bucketsToAdd) {
-        final int k0 = mainKeySource0.getUnsafe(sourceBucket);
-        final int k1 = mainKeySource1.getUnsafe(sourceBucket);
-        final int hash = hash(k0, k1);
-        final int location = hashToTableLocation(tableHashPivot + bucketsToAdd, hash);
-        final int mainInsertLocation;
-        if (location == sourceBucket) {
-            mainInsertLocation = destBucket;
-            mainOutputPosition.set(destBucket, EMPTY_OUTPUT_POSITION);
-        } else {
-            mainInsertLocation = sourceBucket;
-            mainOutputPosition.set(destBucket, mainOutputPosition.getUnsafe(sourceBucket));
-            mainOutputPosition.set(sourceBucket, EMPTY_OUTPUT_POSITION);
-            mainKeySource0.set(destBucket, k0);
-            mainKeySource0.set(sourceBucket, QueryConstants.NULL_INT);
-            mainKeySource1.set(destBucket, k1);
-            mainKeySource1.set(sourceBucket, QueryConstants.NULL_INT);
-            handler.doMoveMain(sourceBucket, destBucket);
-        }
-        return mainInsertLocation;
-    }
-
-    private boolean findOverflow(HashHandler handler, int k0, int k1, int chunkPosition,
-            int overflowLocation) {
-        while (overflowLocation != QueryConstants.NULL_INT) {
-            if (eq(overflowKeySource0.getUnsafe(overflowLocation), k0) && eq(overflowKeySource1.getUnsafe(overflowLocation), k1)) {
-                handler.doOverflowFound(overflowLocation, chunkPosition);
-                return true;
-            }
-            overflowLocation = overflowOverflowLocationSource.getUnsafe(overflowLocation);
-        }
-        return false;
-    }
-
-    @Override
-    public int findPositionForKey(Object key) {
-        final Object [] ka = (Object[])key;
-        final int k0 = TypeUtils.unbox((Integer)ka[0]);
-        final int k1 = TypeUtils.unbox((Integer)ka[1]);
-        int hash = hash(k0, k1);
-        final int tableLocation = hashToTableLocation(tableHashPivot, hash);
-        final int positionValue = mainOutputPosition.getUnsafe(tableLocation);
-        if (positionValue == EMPTY_OUTPUT_POSITION) {
-            return -1;
-        }
-        if (eq(mainKeySource0.getUnsafe(tableLocation), k0) && eq(mainKeySource1.getUnsafe(tableLocation), k1)) {
-            return positionValue;
-        }
-        int overflowLocation = mainOverflowLocationSource.getUnsafe(tableLocation);
-        while (overflowLocation != QueryConstants.NULL_INT) {
-            if (eq(overflowKeySource0.getUnsafe(overflowLocation), k0) && eq(overflowKeySource1.getUnsafe(overflowLocation), k1)) {
-                return overflowOutputPosition.getUnsafe(overflowLocation);
-            }
-            overflowLocation = overflowOverflowLocationSource.getUnsafe(overflowLocation);
-        }
-        return -1;
-    }
-}
diff --git a/engine/table/src/main/java/io/deephaven/engine/table/impl/by/typed/incagg/gen/IncrementalAggHasherIntLong.java b/engine/table/src/main/java/io/deephaven/engine/table/impl/by/typed/incagg/gen/IncrementalAggHasherIntLong.java
deleted file mode 100644
index 1a5c872cb2e..00000000000
--- a/engine/table/src/main/java/io/deephaven/engine/table/impl/by/typed/incagg/gen/IncrementalAggHasherIntLong.java
+++ /dev/null
@@ -1,206 +0,0 @@
-//
-// Copyright (c) 2016-2024 Deephaven Data Labs and Patent Pending
-//
-// ****** AUTO-GENERATED CLASS - DO NOT EDIT MANUALLY
-// ****** Run ReplicateTypedHashers or ./gradlew replicateTypedHashers to regenerate
-//
-// @formatter:off
-package io.deephaven.engine.table.impl.by.typed.incagg.gen;
-
-import static io.deephaven.util.compare.IntComparisons.eq;
-import static io.deephaven.util.compare.LongComparisons.eq;
-
-import io.deephaven.chunk.Chunk;
-import io.deephaven.chunk.IntChunk;
-import io.deephaven.chunk.LongChunk;
-import io.deephaven.chunk.attributes.Values;
-import io.deephaven.chunk.util.hashing.IntChunkHasher;
-import io.deephaven.chunk.util.hashing.LongChunkHasher;
-import io.deephaven.engine.rowset.RowSequence;
-import io.deephaven.engine.table.ColumnSource;
-import io.deephaven.engine.table.impl.by.HashHandler;
-import io.deephaven.engine.table.impl.by.IncrementalChunkedOperatorAggregationStateManagerTypedBase;
-import io.deephaven.engine.table.impl.sources.IntegerArraySource;
-import io.deephaven.engine.table.impl.sources.LongArraySource;
-import io.deephaven.util.QueryConstants;
-import io.deephaven.util.type.TypeUtils;
-import java.lang.Integer;
-import java.lang.Long;
-import java.lang.Object;
-import java.lang.Override;
-
-final class IncrementalAggHasherIntLong extends IncrementalChunkedOperatorAggregationStateManagerTypedBase {
-    private final IntegerArraySource mainKeySource0;
-
-    private final IntegerArraySource overflowKeySource0;
-
-    private final LongArraySource mainKeySource1;
-
-    private final LongArraySource overflowKeySource1;
-
-    public IncrementalAggHasherIntLong(ColumnSource[] tableKeySources,
-            ColumnSource[] originalTableKeySources, int tableSize, double maximumLoadFactor,
-            double targetLoadFactor) {
-        super(tableKeySources, tableSize, maximumLoadFactor, targetLoadFactor);
-        this.mainKeySource0 = (IntegerArraySource) super.mainKeySources[0];
-        this.overflowKeySource0 = (IntegerArraySource) super.overflowKeySources[0];
-        this.mainKeySource1 = (LongArraySource) super.mainKeySources[1];
-        this.overflowKeySource1 = (LongArraySource) super.overflowKeySources[1];
-    }
-
-    @Override
-    protected void build(HashHandler handler, RowSequence rowSequence, Chunk[] sourceKeyChunks) {
-        final IntChunk<Values> keyChunk0 = sourceKeyChunks[0].asIntChunk();
-        final LongChunk<Values> keyChunk1 = sourceKeyChunks[1].asLongChunk();
-        final int chunkSize = keyChunk0.size();
-        for (int chunkPosition = 0; chunkPosition < chunkSize; ++chunkPosition) {
-            final int k0 = keyChunk0.get(chunkPosition);
-            final long k1 = keyChunk1.get(chunkPosition);
-            final int hash = hash(k0, k1);
-            final int tableLocation = hashToTableLocation(tableHashPivot, hash);
-            if (mainOutputPosition.getUnsafe(tableLocation) == EMPTY_OUTPUT_POSITION) {
-                numEntries++;
-                mainKeySource0.set(tableLocation, k0);
-                mainKeySource1.set(tableLocation, k1);
-                handler.doMainInsert(tableLocation, chunkPosition);
-            } else if (eq(mainKeySource0.getUnsafe(tableLocation), k0) && eq(mainKeySource1.getUnsafe(tableLocation), k1)) {
-                handler.doMainFound(tableLocation, chunkPosition);
-            } else {
-                int overflowLocation = mainOverflowLocationSource.getUnsafe(tableLocation);
-                if (!findOverflow(handler, k0, k1, chunkPosition, overflowLocation)) {
-                    final int newOverflowLocation = allocateOverflowLocation();
-                    overflowKeySource0.set(newOverflowLocation, k0);
-                    overflowKeySource1.set(newOverflowLocation, k1);
-                    mainOverflowLocationSource.set(tableLocation, newOverflowLocation);
-                    overflowOverflowLocationSource.set(newOverflowLocation, overflowLocation);
-                    numEntries++;
-                    handler.doOverflowInsert(newOverflowLocation, chunkPosition);
-                }
-            }
-        }
-    }
-
-    @Override
-    protected void probe(HashHandler handler, RowSequence rowSequence, Chunk[] sourceKeyChunks) {
-        final IntChunk<Values> keyChunk0 = sourceKeyChunks[0].asIntChunk();
-        final LongChunk<Values> keyChunk1 = sourceKeyChunks[1].asLongChunk();
-        final int chunkSize = keyChunk0.size();
-        for (int chunkPosition = 0; chunkPosition < chunkSize; ++chunkPosition) {
-            final int k0 = keyChunk0.get(chunkPosition);
-            final long k1 = keyChunk1.get(chunkPosition);
-            final int hash = hash(k0, k1);
-            final int tableLocation = hashToTableLocation(tableHashPivot, hash);
-            if (mainOutputPosition.getUnsafe(tableLocation) == EMPTY_OUTPUT_POSITION) {
-                handler.doMissing(chunkPosition);
-            } else if (eq(mainKeySource0.getUnsafe(tableLocation), k0) && eq(mainKeySource1.getUnsafe(tableLocation), k1)) {
-                handler.doMainFound(tableLocation, chunkPosition);
-            } else {
-                int overflowLocation = mainOverflowLocationSource.getUnsafe(tableLocation);
-                if (!findOverflow(handler, k0, k1, chunkPosition, overflowLocation)) {
-                    handler.doMissing(chunkPosition);
-                }
-            }
-        }
-    }
-
-    private static int hash(int k0, long k1) {
-        int hash = IntChunkHasher.hashInitialSingle(k0);
-        hash = LongChunkHasher.hashUpdateSingle(hash, k1);
-        return hash;
-    }
-
-    @Override
-    protected void rehashBucket(HashHandler handler, int sourceBucket, int destBucket,
-            int bucketsToAdd) {
-        final int position = mainOutputPosition.getUnsafe(sourceBucket);
-        if (position == EMPTY_OUTPUT_POSITION) {
-            return;
-        }
-        int mainInsertLocation = maybeMoveMainBucket(handler, sourceBucket, destBucket, bucketsToAdd);
-        int overflowLocation = mainOverflowLocationSource.getUnsafe(sourceBucket);
-        mainOverflowLocationSource.set(sourceBucket, QueryConstants.NULL_INT);
-        mainOverflowLocationSource.set(destBucket, QueryConstants.NULL_INT);
-        while (overflowLocation != QueryConstants.NULL_INT) {
-            final int nextOverflowLocation = overflowOverflowLocationSource.getUnsafe(overflowLocation);
-            final int overflowKey0 = overflowKeySource0.getUnsafe(overflowLocation);
-            final long overflowKey1 = overflowKeySource1.getUnsafe(overflowLocation);
-            final int overflowHash = hash(overflowKey0, overflowKey1);
-            final int overflowTableLocation = hashToTableLocation(tableHashPivot + bucketsToAdd, overflowHash);
-            if (overflowTableLocation == mainInsertLocation) {
-                mainKeySource0.set(mainInsertLocation, overflowKey0);
-                mainKeySource1.set(mainInsertLocation, overflowKey1);
-                mainOutputPosition.set(mainInsertLocation, overflowOutputPosition.getUnsafe(overflowLocation));
-                handler.doPromoteOverflow(overflowLocation, mainInsertLocation);
-                overflowOutputPosition.set(overflowLocation, QueryConstants.NULL_INT);
-                overflowKeySource0.set(overflowLocation, QueryConstants.NULL_INT);
-                overflowKeySource1.set(overflowLocation, QueryConstants.NULL_LONG);
-                freeOverflowLocation(overflowLocation);
-                mainInsertLocation = -1;
-            } else {
-                final int oldOverflowLocation = mainOverflowLocationSource.getUnsafe(overflowTableLocation);
-                mainOverflowLocationSource.set(overflowTableLocation, overflowLocation);
-                overflowOverflowLocationSource.set(overflowLocation, oldOverflowLocation);
-            }
-            overflowLocation = nextOverflowLocation;
-        }
-    }
-
-    private int maybeMoveMainBucket(HashHandler handler, int sourceBucket, int destBucket,
-            int bucketsToAdd) {
-        final int k0 = mainKeySource0.getUnsafe(sourceBucket);
-        final long k1 = mainKeySource1.getUnsafe(sourceBucket);
-        final int hash = hash(k0, k1);
-        final int location = hashToTableLocation(tableHashPivot + bucketsToAdd, hash);
-        final int mainInsertLocation;
-        if (location == sourceBucket) {
-            mainInsertLocation = destBucket;
-            mainOutputPosition.set(destBucket, EMPTY_OUTPUT_POSITION);
-        } else {
-            mainInsertLocation = sourceBucket;
-            mainOutputPosition.set(destBucket, mainOutputPosition.getUnsafe(sourceBucket));
-            mainOutputPosition.set(sourceBucket, EMPTY_OUTPUT_POSITION);
-            mainKeySource0.set(destBucket, k0);
-            mainKeySource0.set(sourceBucket, QueryConstants.NULL_INT);
-            mainKeySource1.set(destBucket, k1);
-            mainKeySource1.set(sourceBucket, QueryConstants.NULL_LONG);
-            handler.doMoveMain(sourceBucket, destBucket);
-        }
-        return mainInsertLocation;
-    }
-
-    private boolean findOverflow(HashHandler handler, int k0, long k1, int chunkPosition,
-            int overflowLocation) {
-        while (overflowLocation != QueryConstants.NULL_INT) {
-            if (eq(overflowKeySource0.getUnsafe(overflowLocation), k0) && eq(overflowKeySource1.getUnsafe(overflowLocation), k1)) {
-                handler.doOverflowFound(overflowLocation, chunkPosition);
-                return true;
-            }
-            overflowLocation = overflowOverflowLocationSource.getUnsafe(overflowLocation);
-        }
-        return false;
-    }
-
-    @Override
-    public int findPositionForKey(Object key) {
-        final Object [] ka = (Object[])key;
-        final int k0 = TypeUtils.unbox((Integer)ka[0]);
-        final long k1 = TypeUtils.unbox((Long)ka[1]);
-        int hash = hash(k0, k1);
-        final int tableLocation = hashToTableLocation(tableHashPivot, hash);
-        final int positionValue = mainOutputPosition.getUnsafe(tableLocation);
-        if (positionValue == EMPTY_OUTPUT_POSITION) {
-            return -1;
-        }
-        if (eq(mainKeySource0.getUnsafe(tableLocation), k0) && eq(mainKeySource1.getUnsafe(tableLocation), k1)) {
-            return positionValue;
-        }
-        int overflowLocation = mainOverflowLocationSource.getUnsafe(tableLocation);
-        while (overflowLocation != QueryConstants.NULL_INT) {
-            if (eq(overflowKeySource0.getUnsafe(overflowLocation), k0) && eq(overflowKeySource1.getUnsafe(overflowLocation), k1)) {
-                return overflowOutputPosition.getUnsafe(overflowLocation);
-            }
-            overflowLocation = overflowOverflowLocationSource.getUnsafe(overflowLocation);
-        }
-        return -1;
-    }
-}
diff --git a/engine/table/src/main/java/io/deephaven/engine/table/impl/by/typed/incagg/gen/IncrementalAggHasherIntObject.java b/engine/table/src/main/java/io/deephaven/engine/table/impl/by/typed/incagg/gen/IncrementalAggHasherIntObject.java
deleted file mode 100644
index f702859dd0f..00000000000
--- a/engine/table/src/main/java/io/deephaven/engine/table/impl/by/typed/incagg/gen/IncrementalAggHasherIntObject.java
+++ /dev/null
@@ -1,205 +0,0 @@
-//
-// Copyright (c) 2016-2024 Deephaven Data Labs and Patent Pending
-//
-// ****** AUTO-GENERATED CLASS - DO NOT EDIT MANUALLY
-// ****** Run ReplicateTypedHashers or ./gradlew replicateTypedHashers to regenerate
-//
-// @formatter:off
-package io.deephaven.engine.table.impl.by.typed.incagg.gen;
-
-import static io.deephaven.util.compare.IntComparisons.eq;
-import static io.deephaven.util.compare.ObjectComparisons.eq;
-
-import io.deephaven.chunk.Chunk;
-import io.deephaven.chunk.IntChunk;
-import io.deephaven.chunk.ObjectChunk;
-import io.deephaven.chunk.attributes.Values;
-import io.deephaven.chunk.util.hashing.IntChunkHasher;
-import io.deephaven.chunk.util.hashing.ObjectChunkHasher;
-import io.deephaven.engine.rowset.RowSequence;
-import io.deephaven.engine.table.ColumnSource;
-import io.deephaven.engine.table.impl.by.HashHandler;
-import io.deephaven.engine.table.impl.by.IncrementalChunkedOperatorAggregationStateManagerTypedBase;
-import io.deephaven.engine.table.impl.sources.IntegerArraySource;
-import io.deephaven.engine.table.impl.sources.ObjectArraySource;
-import io.deephaven.util.QueryConstants;
-import io.deephaven.util.type.TypeUtils;
-import java.lang.Integer;
-import java.lang.Object;
-import java.lang.Override;
-
-final class IncrementalAggHasherIntObject extends IncrementalChunkedOperatorAggregationStateManagerTypedBase {
-    private final IntegerArraySource mainKeySource0;
-
-    private final IntegerArraySource overflowKeySource0;
-
-    private final ObjectArraySource mainKeySource1;
-
-    private final ObjectArraySource overflowKeySource1;
-
-    public IncrementalAggHasherIntObject(ColumnSource[] tableKeySources,
-            ColumnSource[] originalTableKeySources, int tableSize, double maximumLoadFactor,
-            double targetLoadFactor) {
-        super(tableKeySources, tableSize, maximumLoadFactor, targetLoadFactor);
-        this.mainKeySource0 = (IntegerArraySource) super.mainKeySources[0];
-        this.overflowKeySource0 = (IntegerArraySource) super.overflowKeySources[0];
-        this.mainKeySource1 = (ObjectArraySource) super.mainKeySources[1];
-        this.overflowKeySource1 = (ObjectArraySource) super.overflowKeySources[1];
-    }
-
-    @Override
-    protected void build(HashHandler handler, RowSequence rowSequence, Chunk[] sourceKeyChunks) {
-        final IntChunk<Values> keyChunk0 = sourceKeyChunks[0].asIntChunk();
-        final ObjectChunk<Object, Values> keyChunk1 = sourceKeyChunks[1].asObjectChunk();
-        final int chunkSize = keyChunk0.size();
-        for (int chunkPosition = 0; chunkPosition < chunkSize; ++chunkPosition) {
-            final int k0 = keyChunk0.get(chunkPosition);
-            final Object k1 = keyChunk1.get(chunkPosition);
-            final int hash = hash(k0, k1);
-            final int tableLocation = hashToTableLocation(tableHashPivot, hash);
-            if (mainOutputPosition.getUnsafe(tableLocation) == EMPTY_OUTPUT_POSITION) {
-                numEntries++;
-                mainKeySource0.set(tableLocation, k0);
-                mainKeySource1.set(tableLocation, k1);
-                handler.doMainInsert(tableLocation, chunkPosition);
-            } else if (eq(mainKeySource0.getUnsafe(tableLocation), k0) && eq(mainKeySource1.getUnsafe(tableLocation), k1)) {
-                handler.doMainFound(tableLocation, chunkPosition);
-            } else {
-                int overflowLocation = mainOverflowLocationSource.getUnsafe(tableLocation);
-                if (!findOverflow(handler, k0, k1, chunkPosition, overflowLocation)) {
-                    final int newOverflowLocation = allocateOverflowLocation();
-                    overflowKeySource0.set(newOverflowLocation, k0);
-                    overflowKeySource1.set(newOverflowLocation, k1);
-                    mainOverflowLocationSource.set(tableLocation, newOverflowLocation);
-                    overflowOverflowLocationSource.set(newOverflowLocation, overflowLocation);
-                    numEntries++;
-                    handler.doOverflowInsert(newOverflowLocation, chunkPosition);
-                }
-            }
-        }
-    }
-
-    @Override
-    protected void probe(HashHandler handler, RowSequence rowSequence, Chunk[] sourceKeyChunks) {
-        final IntChunk<Values> keyChunk0 = sourceKeyChunks[0].asIntChunk();
-        final ObjectChunk<Object, Values> keyChunk1 = sourceKeyChunks[1].asObjectChunk();
-        final int chunkSize = keyChunk0.size();
-        for (int chunkPosition = 0; chunkPosition < chunkSize; ++chunkPosition) {
-            final int k0 = keyChunk0.get(chunkPosition);
-            final Object k1 = keyChunk1.get(chunkPosition);
-            final int hash = hash(k0, k1);
-            final int tableLocation = hashToTableLocation(tableHashPivot, hash);
-            if (mainOutputPosition.getUnsafe(tableLocation) == EMPTY_OUTPUT_POSITION) {
-                handler.doMissing(chunkPosition);
-            } else if (eq(mainKeySource0.getUnsafe(tableLocation), k0) && eq(mainKeySource1.getUnsafe(tableLocation), k1)) {
-                handler.doMainFound(tableLocation, chunkPosition);
-            } else {
-                int overflowLocation = mainOverflowLocationSource.getUnsafe(tableLocation);
-                if (!findOverflow(handler, k0, k1, chunkPosition, overflowLocation)) {
-                    handler.doMissing(chunkPosition);
-                }
-            }
-        }
-    }
-
-    private static int hash(int k0, Object k1) {
-        int hash = IntChunkHasher.hashInitialSingle(k0);
-        hash = ObjectChunkHasher.hashUpdateSingle(hash, k1);
-        return hash;
-    }
-
-    @Override
-    protected void rehashBucket(HashHandler handler, int sourceBucket, int destBucket,
-            int bucketsToAdd) {
-        final int position = mainOutputPosition.getUnsafe(sourceBucket);
-        if (position == EMPTY_OUTPUT_POSITION) {
-            return;
-        }
-        int mainInsertLocation = maybeMoveMainBucket(handler, sourceBucket, destBucket, bucketsToAdd);
-        int overflowLocation = mainOverflowLocationSource.getUnsafe(sourceBucket);
-        mainOverflowLocationSource.set(sourceBucket, QueryConstants.NULL_INT);
-        mainOverflowLocationSource.set(destBucket, QueryConstants.NULL_INT);
-        while (overflowLocation != QueryConstants.NULL_INT) {
-            final int nextOverflowLocation = overflowOverflowLocationSource.getUnsafe(overflowLocation);
-            final int overflowKey0 = overflowKeySource0.getUnsafe(overflowLocation);
-            final Object overflowKey1 = overflowKeySource1.getUnsafe(overflowLocation);
-            final int overflowHash = hash(overflowKey0, overflowKey1);
-            final int overflowTableLocation = hashToTableLocation(tableHashPivot + bucketsToAdd, overflowHash);
-            if (overflowTableLocation == mainInsertLocation) {
-                mainKeySource0.set(mainInsertLocation, overflowKey0);
-                mainKeySource1.set(mainInsertLocation, overflowKey1);
-                mainOutputPosition.set(mainInsertLocation, overflowOutputPosition.getUnsafe(overflowLocation));
-                handler.doPromoteOverflow(overflowLocation, mainInsertLocation);
-                overflowOutputPosition.set(overflowLocation, QueryConstants.NULL_INT);
-                overflowKeySource0.set(overflowLocation, QueryConstants.NULL_INT);
-                overflowKeySource1.set(overflowLocation, null);
-                freeOverflowLocation(overflowLocation);
-                mainInsertLocation = -1;
-            } else {
-                final int oldOverflowLocation = mainOverflowLocationSource.getUnsafe(overflowTableLocation);
-                mainOverflowLocationSource.set(overflowTableLocation, overflowLocation);
-                overflowOverflowLocationSource.set(overflowLocation, oldOverflowLocation);
-            }
-            overflowLocation = nextOverflowLocation;
-        }
-    }
-
-    private int maybeMoveMainBucket(HashHandler handler, int sourceBucket, int destBucket,
-            int bucketsToAdd) {
-        final int k0 = mainKeySource0.getUnsafe(sourceBucket);
-        final Object k1 = mainKeySource1.getUnsafe(sourceBucket);
-        final int hash = hash(k0, k1);
-        final int location = hashToTableLocation(tableHashPivot + bucketsToAdd, hash);
-        final int mainInsertLocation;
-        if (location == sourceBucket) {
-            mainInsertLocation = destBucket;
-            mainOutputPosition.set(destBucket, EMPTY_OUTPUT_POSITION);
-        } else {
-            mainInsertLocation = sourceBucket;
-            mainOutputPosition.set(destBucket, mainOutputPosition.getUnsafe(sourceBucket));
-            mainOutputPosition.set(sourceBucket, EMPTY_OUTPUT_POSITION);
-            mainKeySource0.set(destBucket, k0);
-            mainKeySource0.set(sourceBucket, QueryConstants.NULL_INT);
-            mainKeySource1.set(destBucket, k1);
-            mainKeySource1.set(sourceBucket, null);
-            handler.doMoveMain(sourceBucket, destBucket);
-        }
-        return mainInsertLocation;
-    }
-
-    private boolean findOverflow(HashHandler handler, int k0, Object k1, int chunkPosition,
-            int overflowLocation) {
-        while (overflowLocation != QueryConstants.NULL_INT) {
-            if (eq(overflowKeySource0.getUnsafe(overflowLocation), k0) && eq(overflowKeySource1.getUnsafe(overflowLocation), k1)) {
-                handler.doOverflowFound(overflowLocation, chunkPosition);
-                return true;
-            }
-            overflowLocation = overflowOverflowLocationSource.getUnsafe(overflowLocation);
-        }
-        return false;
-    }
-
-    @Override
-    public int findPositionForKey(Object key) {
-        final Object [] ka = (Object[])key;
-        final int k0 = TypeUtils.unbox((Integer)ka[0]);
-        final Object k1 = ka[1];
-        int hash = hash(k0, k1);
-        final int tableLocation = hashToTableLocation(tableHashPivot, hash);
-        final int positionValue = mainOutputPosition.getUnsafe(tableLocation);
-        if (positionValue == EMPTY_OUTPUT_POSITION) {
-            return -1;
-        }
-        if (eq(mainKeySource0.getUnsafe(tableLocation), k0) && eq(mainKeySource1.getUnsafe(tableLocation), k1)) {
-            return positionValue;
-        }
-        int overflowLocation = mainOverflowLocationSource.getUnsafe(tableLocation);
-        while (overflowLocation != QueryConstants.NULL_INT) {
-            if (eq(overflowKeySource0.getUnsafe(overflowLocation), k0) && eq(overflowKeySource1.getUnsafe(overflowLocation), k1)) {
-                return overflowOutputPosition.getUnsafe(overflowLocation);
-            }
-            overflowLocation = overflowOverflowLocationSource.getUnsafe(overflowLocation);
-        }
-        return -1;
-    }
-}
diff --git a/engine/table/src/main/java/io/deephaven/engine/table/impl/by/typed/incagg/gen/IncrementalAggHasherIntShort.java b/engine/table/src/main/java/io/deephaven/engine/table/impl/by/typed/incagg/gen/IncrementalAggHasherIntShort.java
deleted file mode 100644
index ce96c8dce56..00000000000
--- a/engine/table/src/main/java/io/deephaven/engine/table/impl/by/typed/incagg/gen/IncrementalAggHasherIntShort.java
+++ /dev/null
@@ -1,206 +0,0 @@
-//
-// Copyright (c) 2016-2024 Deephaven Data Labs and Patent Pending
-//
-// ****** AUTO-GENERATED CLASS - DO NOT EDIT MANUALLY
-// ****** Run ReplicateTypedHashers or ./gradlew replicateTypedHashers to regenerate
-//
-// @formatter:off
-package io.deephaven.engine.table.impl.by.typed.incagg.gen;
-
-import static io.deephaven.util.compare.IntComparisons.eq;
-import static io.deephaven.util.compare.ShortComparisons.eq;
-
-import io.deephaven.chunk.Chunk;
-import io.deephaven.chunk.IntChunk;
-import io.deephaven.chunk.ShortChunk;
-import io.deephaven.chunk.attributes.Values;
-import io.deephaven.chunk.util.hashing.IntChunkHasher;
-import io.deephaven.chunk.util.hashing.ShortChunkHasher;
-import io.deephaven.engine.rowset.RowSequence;
-import io.deephaven.engine.table.ColumnSource;
-import io.deephaven.engine.table.impl.by.HashHandler;
-import io.deephaven.engine.table.impl.by.IncrementalChunkedOperatorAggregationStateManagerTypedBase;
-import io.deephaven.engine.table.impl.sources.IntegerArraySource;
-import io.deephaven.engine.table.impl.sources.ShortArraySource;
-import io.deephaven.util.QueryConstants;
-import io.deephaven.util.type.TypeUtils;
-import java.lang.Integer;
-import java.lang.Object;
-import java.lang.Override;
-import java.lang.Short;
-
-final class IncrementalAggHasherIntShort extends IncrementalChunkedOperatorAggregationStateManagerTypedBase {
-    private final IntegerArraySource mainKeySource0;
-
-    private final IntegerArraySource overflowKeySource0;
-
-    private final ShortArraySource mainKeySource1;
-
-    private final ShortArraySource overflowKeySource1;
-
-    public IncrementalAggHasherIntShort(ColumnSource[] tableKeySources,
-            ColumnSource[] originalTableKeySources, int tableSize, double maximumLoadFactor,
-            double targetLoadFactor) {
-        super(tableKeySources, tableSize, maximumLoadFactor, targetLoadFactor);
-        this.mainKeySource0 = (IntegerArraySource) super.mainKeySources[0];
-        this.overflowKeySource0 = (IntegerArraySource) super.overflowKeySources[0];
-        this.mainKeySource1 = (ShortArraySource) super.mainKeySources[1];
-        this.overflowKeySource1 = (ShortArraySource) super.overflowKeySources[1];
-    }
-
-    @Override
-    protected void build(HashHandler handler, RowSequence rowSequence, Chunk[] sourceKeyChunks) {
-        final IntChunk<Values> keyChunk0 = sourceKeyChunks[0].asIntChunk();
-        final ShortChunk<Values> keyChunk1 = sourceKeyChunks[1].asShortChunk();
-        final int chunkSize = keyChunk0.size();
-        for (int chunkPosition = 0; chunkPosition < chunkSize; ++chunkPosition) {
-            final int k0 = keyChunk0.get(chunkPosition);
-            final short k1 = keyChunk1.get(chunkPosition);
-            final int hash = hash(k0, k1);
-            final int tableLocation = hashToTableLocation(tableHashPivot, hash);
-            if (mainOutputPosition.getUnsafe(tableLocation) == EMPTY_OUTPUT_POSITION) {
-                numEntries++;
-                mainKeySource0.set(tableLocation, k0);
-                mainKeySource1.set(tableLocation, k1);
-                handler.doMainInsert(tableLocation, chunkPosition);
-            } else if (eq(mainKeySource0.getUnsafe(tableLocation), k0) && eq(mainKeySource1.getUnsafe(tableLocation), k1)) {
-                handler.doMainFound(tableLocation, chunkPosition);
-            } else {
-                int overflowLocation = mainOverflowLocationSource.getUnsafe(tableLocation);
-                if (!findOverflow(handler, k0, k1, chunkPosition, overflowLocation)) {
-                    final int newOverflowLocation = allocateOverflowLocation();
-                    overflowKeySource0.set(newOverflowLocation, k0);
-                    overflowKeySource1.set(newOverflowLocation, k1);
-                    mainOverflowLocationSource.set(tableLocation, newOverflowLocation);
-                    overflowOverflowLocationSource.set(newOverflowLocation, overflowLocation);
-                    numEntries++;
-                    handler.doOverflowInsert(newOverflowLocation, chunkPosition);
-                }
-            }
-        }
-    }
-
-    @Override
-    protected void probe(HashHandler handler, RowSequence rowSequence, Chunk[] sourceKeyChunks) {
-        final IntChunk<Values> keyChunk0 = sourceKeyChunks[0].asIntChunk();
-        final ShortChunk<Values> keyChunk1 = sourceKeyChunks[1].asShortChunk();
-        final int chunkSize = keyChunk0.size();
-        for (int chunkPosition = 0; chunkPosition < chunkSize; ++chunkPosition) {
-            final int k0 = keyChunk0.get(chunkPosition);
-            final short k1 = keyChunk1.get(chunkPosition);
-            final int hash = hash(k0, k1);
-            final int tableLocation = hashToTableLocation(tableHashPivot, hash);
-            if (mainOutputPosition.getUnsafe(tableLocation) == EMPTY_OUTPUT_POSITION) {
-                handler.doMissing(chunkPosition);
-            } else if (eq(mainKeySource0.getUnsafe(tableLocation), k0) && eq(mainKeySource1.getUnsafe(tableLocation), k1)) {
-                handler.doMainFound(tableLocation, chunkPosition);
-            } else {
-                int overflowLocation = mainOverflowLocationSource.getUnsafe(tableLocation);
-                if (!findOverflow(handler, k0, k1, chunkPosition, overflowLocation)) {
-                    handler.doMissing(chunkPosition);
-                }
-            }
-        }
-    }
-
-    private static int hash(int k0, short k1) {
-        int hash = IntChunkHasher.hashInitialSingle(k0);
-        hash = ShortChunkHasher.hashUpdateSingle(hash, k1);
-        return hash;
-    }
-
-    @Override
-    protected void rehashBucket(HashHandler handler, int sourceBucket, int destBucket,
-            int bucketsToAdd) {
-        final int position = mainOutputPosition.getUnsafe(sourceBucket);
-        if (position == EMPTY_OUTPUT_POSITION) {
-            return;
-        }
-        int mainInsertLocation = maybeMoveMainBucket(handler, sourceBucket, destBucket, bucketsToAdd);
-        int overflowLocation = mainOverflowLocationSource.getUnsafe(sourceBucket);
-        mainOverflowLocationSource.set(sourceBucket, QueryConstants.NULL_INT);
-        mainOverflowLocationSource.set(destBucket, QueryConstants.NULL_INT);
-        while (overflowLocation != QueryConstants.NULL_INT) {
-            final int nextOverflowLocation = overflowOverflowLocationSource.getUnsafe(overflowLocation);
-            final int overflowKey0 = overflowKeySource0.getUnsafe(overflowLocation);
-            final short overflowKey1 = overflowKeySource1.getUnsafe(overflowLocation);
-            final int overflowHash = hash(overflowKey0, overflowKey1);
-            final int overflowTableLocation = hashToTableLocation(tableHashPivot + bucketsToAdd, overflowHash);
-            if (overflowTableLocation == mainInsertLocation) {
-                mainKeySource0.set(mainInsertLocation, overflowKey0);
-                mainKeySource1.set(mainInsertLocation, overflowKey1);
-                mainOutputPosition.set(mainInsertLocation, overflowOutputPosition.getUnsafe(overflowLocation));
-                handler.doPromoteOverflow(overflowLocation, mainInsertLocation);
-                overflowOutputPosition.set(overflowLocation, QueryConstants.NULL_INT);
-                overflowKeySource0.set(overflowLocation, QueryConstants.NULL_INT);
-                overflowKeySource1.set(overflowLocation, QueryConstants.NULL_SHORT);
-                freeOverflowLocation(overflowLocation);
-                mainInsertLocation = -1;
-            } else {
-                final int oldOverflowLocation = mainOverflowLocationSource.getUnsafe(overflowTableLocation);
-                mainOverflowLocationSource.set(overflowTableLocation, overflowLocation);
-                overflowOverflowLocationSource.set(overflowLocation, oldOverflowLocation);
-            }
-            overflowLocation = nextOverflowLocation;
-        }
-    }
-
-    private int maybeMoveMainBucket(HashHandler handler, int sourceBucket, int destBucket,
-            int bucketsToAdd) {
-        final int k0 = mainKeySource0.getUnsafe(sourceBucket);
-        final short k1 = mainKeySource1.getUnsafe(sourceBucket);
-        final int hash = hash(k0, k1);
-        final int location = hashToTableLocation(tableHashPivot + bucketsToAdd, hash);
-        final int mainInsertLocation;
-        if (location == sourceBucket) {
-            mainInsertLocation = destBucket;
-            mainOutputPosition.set(destBucket, EMPTY_OUTPUT_POSITION);
-        } else {
-            mainInsertLocation = sourceBucket;
-            mainOutputPosition.set(destBucket, mainOutputPosition.getUnsafe(sourceBucket));
-            mainOutputPosition.set(sourceBucket, EMPTY_OUTPUT_POSITION);
-            mainKeySource0.set(destBucket, k0);
-            mainKeySource0.set(sourceBucket, QueryConstants.NULL_INT);
-            mainKeySource1.set(destBucket, k1);
-            mainKeySource1.set(sourceBucket, QueryConstants.NULL_SHORT);
-            handler.doMoveMain(sourceBucket, destBucket);
-        }
-        return mainInsertLocation;
-    }
-
-    private boolean findOverflow(HashHandler handler, int k0, short k1, int chunkPosition,
-            int overflowLocation) {
-        while (overflowLocation != QueryConstants.NULL_INT) {
-            if (eq(overflowKeySource0.getUnsafe(overflowLocation), k0) && eq(overflowKeySource1.getUnsafe(overflowLocation), k1)) {
-                handler.doOverflowFound(overflowLocation, chunkPosition);
-                return true;
-            }
-            overflowLocation = overflowOverflowLocationSource.getUnsafe(overflowLocation);
-        }
-        return false;
-    }
-
-    @Override
-    public int findPositionForKey(Object key) {
-        final Object [] ka = (Object[])key;
-        final int k0 = TypeUtils.unbox((Integer)ka[0]);
-        final short k1 = TypeUtils.unbox((Short)ka[1]);
-        int hash = hash(k0, k1);
-        final int tableLocation = hashToTableLocation(tableHashPivot, hash);
-        final int positionValue = mainOutputPosition.getUnsafe(tableLocation);
-        if (positionValue == EMPTY_OUTPUT_POSITION) {
-            return -1;
-        }
-        if (eq(mainKeySource0.getUnsafe(tableLocation), k0) && eq(mainKeySource1.getUnsafe(tableLocation), k1)) {
-            return positionValue;
-        }
-        int overflowLocation = mainOverflowLocationSource.getUnsafe(tableLocation);
-        while (overflowLocation != QueryConstants.NULL_INT) {
-            if (eq(overflowKeySource0.getUnsafe(overflowLocation), k0) && eq(overflowKeySource1.getUnsafe(overflowLocation), k1)) {
-                return overflowOutputPosition.getUnsafe(overflowLocation);
-            }
-            overflowLocation = overflowOverflowLocationSource.getUnsafe(overflowLocation);
-        }
-        return -1;
-    }
-}
diff --git a/engine/table/src/main/java/io/deephaven/engine/table/impl/by/typed/incagg/gen/IncrementalAggHasherLong.java b/engine/table/src/main/java/io/deephaven/engine/table/impl/by/typed/incagg/gen/IncrementalAggHasherLong.java
deleted file mode 100644
index 58336962c88..00000000000
--- a/engine/table/src/main/java/io/deephaven/engine/table/impl/by/typed/incagg/gen/IncrementalAggHasherLong.java
+++ /dev/null
@@ -1,180 +0,0 @@
-//
-// Copyright (c) 2016-2024 Deephaven Data Labs and Patent Pending
-//
-// ****** AUTO-GENERATED CLASS - DO NOT EDIT MANUALLY
-// ****** Run ReplicateTypedHashers or ./gradlew replicateTypedHashers to regenerate
-//
-// @formatter:off
-package io.deephaven.engine.table.impl.by.typed.incagg.gen;
-
-import static io.deephaven.util.compare.LongComparisons.eq;
-
-import io.deephaven.chunk.Chunk;
-import io.deephaven.chunk.LongChunk;
-import io.deephaven.chunk.attributes.Values;
-import io.deephaven.chunk.util.hashing.LongChunkHasher;
-import io.deephaven.engine.rowset.RowSequence;
-import io.deephaven.engine.table.ColumnSource;
-import io.deephaven.engine.table.impl.by.HashHandler;
-import io.deephaven.engine.table.impl.by.IncrementalChunkedOperatorAggregationStateManagerTypedBase;
-import io.deephaven.engine.table.impl.sources.LongArraySource;
-import io.deephaven.util.QueryConstants;
-import io.deephaven.util.type.TypeUtils;
-import java.lang.Long;
-import java.lang.Object;
-import java.lang.Override;
-
-final class IncrementalAggHasherLong extends IncrementalChunkedOperatorAggregationStateManagerTypedBase {
-    private final LongArraySource mainKeySource0;
-
-    private final LongArraySource overflowKeySource0;
-
-    public IncrementalAggHasherLong(ColumnSource[] tableKeySources,
-            ColumnSource[] originalTableKeySources, int tableSize, double maximumLoadFactor,
-            double targetLoadFactor) {
-        super(tableKeySources, tableSize, maximumLoadFactor, targetLoadFactor);
-        this.mainKeySource0 = (LongArraySource) super.mainKeySources[0];
-        this.overflowKeySource0 = (LongArraySource) super.overflowKeySources[0];
-    }
-
-    @Override
-    protected void build(HashHandler handler, RowSequence rowSequence, Chunk[] sourceKeyChunks) {
-        final LongChunk<Values> keyChunk0 = sourceKeyChunks[0].asLongChunk();
-        final int chunkSize = keyChunk0.size();
-        for (int chunkPosition = 0; chunkPosition < chunkSize; ++chunkPosition) {
-            final long k0 = keyChunk0.get(chunkPosition);
-            final int hash = hash(k0);
-            final int tableLocation = hashToTableLocation(tableHashPivot, hash);
-            if (mainOutputPosition.getUnsafe(tableLocation) == EMPTY_OUTPUT_POSITION) {
-                numEntries++;
-                mainKeySource0.set(tableLocation, k0);
-                handler.doMainInsert(tableLocation, chunkPosition);
-            } else if (eq(mainKeySource0.getUnsafe(tableLocation), k0)) {
-                handler.doMainFound(tableLocation, chunkPosition);
-            } else {
-                int overflowLocation = mainOverflowLocationSource.getUnsafe(tableLocation);
-                if (!findOverflow(handler, k0, chunkPosition, overflowLocation)) {
-                    final int newOverflowLocation = allocateOverflowLocation();
-                    overflowKeySource0.set(newOverflowLocation, k0);
-                    mainOverflowLocationSource.set(tableLocation, newOverflowLocation);
-                    overflowOverflowLocationSource.set(newOverflowLocation, overflowLocation);
-                    numEntries++;
-                    handler.doOverflowInsert(newOverflowLocation, chunkPosition);
-                }
-            }
-        }
-    }
-
-    @Override
-    protected void probe(HashHandler handler, RowSequence rowSequence, Chunk[] sourceKeyChunks) {
-        final LongChunk<Values> keyChunk0 = sourceKeyChunks[0].asLongChunk();
-        final int chunkSize = keyChunk0.size();
-        for (int chunkPosition = 0; chunkPosition < chunkSize; ++chunkPosition) {
-            final long k0 = keyChunk0.get(chunkPosition);
-            final int hash = hash(k0);
-            final int tableLocation = hashToTableLocation(tableHashPivot, hash);
-            if (mainOutputPosition.getUnsafe(tableLocation) == EMPTY_OUTPUT_POSITION) {
-                handler.doMissing(chunkPosition);
-            } else if (eq(mainKeySource0.getUnsafe(tableLocation), k0)) {
-                handler.doMainFound(tableLocation, chunkPosition);
-            } else {
-                int overflowLocation = mainOverflowLocationSource.getUnsafe(tableLocation);
-                if (!findOverflow(handler, k0, chunkPosition, overflowLocation)) {
-                    handler.doMissing(chunkPosition);
-                }
-            }
-        }
-    }
-
-    private static int hash(long k0) {
-        int hash = LongChunkHasher.hashInitialSingle(k0);
-        return hash;
-    }
-
-    @Override
-    protected void rehashBucket(HashHandler handler, int sourceBucket, int destBucket,
-            int bucketsToAdd) {
-        final int position = mainOutputPosition.getUnsafe(sourceBucket);
-        if (position == EMPTY_OUTPUT_POSITION) {
-            return;
-        }
-        int mainInsertLocation = maybeMoveMainBucket(handler, sourceBucket, destBucket, bucketsToAdd);
-        int overflowLocation = mainOverflowLocationSource.getUnsafe(sourceBucket);
-        mainOverflowLocationSource.set(sourceBucket, QueryConstants.NULL_INT);
-        mainOverflowLocationSource.set(destBucket, QueryConstants.NULL_INT);
-        while (overflowLocation != QueryConstants.NULL_INT) {
-            final int nextOverflowLocation = overflowOverflowLocationSource.getUnsafe(overflowLocation);
-            final long overflowKey0 = overflowKeySource0.getUnsafe(overflowLocation);
-            final int overflowHash = hash(overflowKey0);
-            final int overflowTableLocation = hashToTableLocation(tableHashPivot + bucketsToAdd, overflowHash);
-            if (overflowTableLocation == mainInsertLocation) {
-                mainKeySource0.set(mainInsertLocation, overflowKey0);
-                mainOutputPosition.set(mainInsertLocation, overflowOutputPosition.getUnsafe(overflowLocation));
-                handler.doPromoteOverflow(overflowLocation, mainInsertLocation);
-                overflowOutputPosition.set(overflowLocation, QueryConstants.NULL_INT);
-                overflowKeySource0.set(overflowLocation, QueryConstants.NULL_LONG);
-                freeOverflowLocation(overflowLocation);
-                mainInsertLocation = -1;
-            } else {
-                final int oldOverflowLocation = mainOverflowLocationSource.getUnsafe(overflowTableLocation);
-                mainOverflowLocationSource.set(overflowTableLocation, overflowLocation);
-                overflowOverflowLocationSource.set(overflowLocation, oldOverflowLocation);
-            }
-            overflowLocation = nextOverflowLocation;
-        }
-    }
-
-    private int maybeMoveMainBucket(HashHandler handler, int sourceBucket, int destBucket,
-            int bucketsToAdd) {
-        final long k0 = mainKeySource0.getUnsafe(sourceBucket);
-        final int hash = hash(k0);
-        final int location = hashToTableLocation(tableHashPivot + bucketsToAdd, hash);
-        final int mainInsertLocation;
-        if (location == sourceBucket) {
-            mainInsertLocation = destBucket;
-            mainOutputPosition.set(destBucket, EMPTY_OUTPUT_POSITION);
-        } else {
-            mainInsertLocation = sourceBucket;
-            mainOutputPosition.set(destBucket, mainOutputPosition.getUnsafe(sourceBucket));
-            mainOutputPosition.set(sourceBucket, EMPTY_OUTPUT_POSITION);
-            mainKeySource0.set(destBucket, k0);
-            mainKeySource0.set(sourceBucket, QueryConstants.NULL_LONG);
-            handler.doMoveMain(sourceBucket, destBucket);
-        }
-        return mainInsertLocation;
-    }
-
-    private boolean findOverflow(HashHandler handler, long k0, int chunkPosition,
-            int overflowLocation) {
-        while (overflowLocation != QueryConstants.NULL_INT) {
-            if (eq(overflowKeySource0.getUnsafe(overflowLocation), k0)) {
-                handler.doOverflowFound(overflowLocation, chunkPosition);
-                return true;
-            }
-            overflowLocation = overflowOverflowLocationSource.getUnsafe(overflowLocation);
-        }
-        return false;
-    }
-
-    @Override
-    public int findPositionForKey(Object key) {
-        final long k0 = TypeUtils.unbox((Long)key);
-        int hash = hash(k0);
-        final int tableLocation = hashToTableLocation(tableHashPivot, hash);
-        final int positionValue = mainOutputPosition.getUnsafe(tableLocation);
-        if (positionValue == EMPTY_OUTPUT_POSITION) {
-            return -1;
-        }
-        if (eq(mainKeySource0.getUnsafe(tableLocation), k0)) {
-            return positionValue;
-        }
-        int overflowLocation = mainOverflowLocationSource.getUnsafe(tableLocation);
-        while (overflowLocation != QueryConstants.NULL_INT) {
-            if (eq(overflowKeySource0.getUnsafe(overflowLocation), k0)) {
-                return overflowOutputPosition.getUnsafe(overflowLocation);
-            }
-            overflowLocation = overflowOverflowLocationSource.getUnsafe(overflowLocation);
-        }
-        return -1;
-    }
-}
diff --git a/engine/table/src/main/java/io/deephaven/engine/table/impl/by/typed/incagg/gen/IncrementalAggHasherLongByte.java b/engine/table/src/main/java/io/deephaven/engine/table/impl/by/typed/incagg/gen/IncrementalAggHasherLongByte.java
deleted file mode 100644
index baff9009c34..00000000000
--- a/engine/table/src/main/java/io/deephaven/engine/table/impl/by/typed/incagg/gen/IncrementalAggHasherLongByte.java
+++ /dev/null
@@ -1,206 +0,0 @@
-//
-// Copyright (c) 2016-2024 Deephaven Data Labs and Patent Pending
-//
-// ****** AUTO-GENERATED CLASS - DO NOT EDIT MANUALLY
-// ****** Run ReplicateTypedHashers or ./gradlew replicateTypedHashers to regenerate
-//
-// @formatter:off
-package io.deephaven.engine.table.impl.by.typed.incagg.gen;
-
-import static io.deephaven.util.compare.ByteComparisons.eq;
-import static io.deephaven.util.compare.LongComparisons.eq;
-
-import io.deephaven.chunk.ByteChunk;
-import io.deephaven.chunk.Chunk;
-import io.deephaven.chunk.LongChunk;
-import io.deephaven.chunk.attributes.Values;
-import io.deephaven.chunk.util.hashing.ByteChunkHasher;
-import io.deephaven.chunk.util.hashing.LongChunkHasher;
-import io.deephaven.engine.rowset.RowSequence;
-import io.deephaven.engine.table.ColumnSource;
-import io.deephaven.engine.table.impl.by.HashHandler;
-import io.deephaven.engine.table.impl.by.IncrementalChunkedOperatorAggregationStateManagerTypedBase;
-import io.deephaven.engine.table.impl.sources.ByteArraySource;
-import io.deephaven.engine.table.impl.sources.LongArraySource;
-import io.deephaven.util.QueryConstants;
-import io.deephaven.util.type.TypeUtils;
-import java.lang.Byte;
-import java.lang.Long;
-import java.lang.Object;
-import java.lang.Override;
-
-final class IncrementalAggHasherLongByte extends IncrementalChunkedOperatorAggregationStateManagerTypedBase {
-    private final LongArraySource mainKeySource0;
-
-    private final LongArraySource overflowKeySource0;
-
-    private final ByteArraySource mainKeySource1;
-
-    private final ByteArraySource overflowKeySource1;
-
-    public IncrementalAggHasherLongByte(ColumnSource[] tableKeySources,
-            ColumnSource[] originalTableKeySources, int tableSize, double maximumLoadFactor,
-            double targetLoadFactor) {
-        super(tableKeySources, tableSize, maximumLoadFactor, targetLoadFactor);
-        this.mainKeySource0 = (LongArraySource) super.mainKeySources[0];
-        this.overflowKeySource0 = (LongArraySource) super.overflowKeySources[0];
-        this.mainKeySource1 = (ByteArraySource) super.mainKeySources[1];
-        this.overflowKeySource1 = (ByteArraySource) super.overflowKeySources[1];
-    }
-
-    @Override
-    protected void build(HashHandler handler, RowSequence rowSequence, Chunk[] sourceKeyChunks) {
-        final LongChunk<Values> keyChunk0 = sourceKeyChunks[0].asLongChunk();
-        final ByteChunk<Values> keyChunk1 = sourceKeyChunks[1].asByteChunk();
-        final int chunkSize = keyChunk0.size();
-        for (int chunkPosition = 0; chunkPosition < chunkSize; ++chunkPosition) {
-            final long k0 = keyChunk0.get(chunkPosition);
-            final byte k1 = keyChunk1.get(chunkPosition);
-            final int hash = hash(k0, k1);
-            final int tableLocation = hashToTableLocation(tableHashPivot, hash);
-            if (mainOutputPosition.getUnsafe(tableLocation) == EMPTY_OUTPUT_POSITION) {
-                numEntries++;
-                mainKeySource0.set(tableLocation, k0);
-                mainKeySource1.set(tableLocation, k1);
-                handler.doMainInsert(tableLocation, chunkPosition);
-            } else if (eq(mainKeySource0.getUnsafe(tableLocation), k0) && eq(mainKeySource1.getUnsafe(tableLocation), k1)) {
-                handler.doMainFound(tableLocation, chunkPosition);
-            } else {
-                int overflowLocation = mainOverflowLocationSource.getUnsafe(tableLocation);
-                if (!findOverflow(handler, k0, k1, chunkPosition, overflowLocation)) {
-                    final int newOverflowLocation = allocateOverflowLocation();
-                    overflowKeySource0.set(newOverflowLocation, k0);
-                    overflowKeySource1.set(newOverflowLocation, k1);
-                    mainOverflowLocationSource.set(tableLocation, newOverflowLocation);
-                    overflowOverflowLocationSource.set(newOverflowLocation, overflowLocation);
-                    numEntries++;
-                    handler.doOverflowInsert(newOverflowLocation, chunkPosition);
-                }
-            }
-        }
-    }
-
-    @Override
-    protected void probe(HashHandler handler, RowSequence rowSequence, Chunk[] sourceKeyChunks) {
-        final LongChunk<Values> keyChunk0 = sourceKeyChunks[0].asLongChunk();
-        final ByteChunk<Values> keyChunk1 = sourceKeyChunks[1].asByteChunk();
-        final int chunkSize = keyChunk0.size();
-        for (int chunkPosition = 0; chunkPosition < chunkSize; ++chunkPosition) {
-            final long k0 = keyChunk0.get(chunkPosition);
-            final byte k1 = keyChunk1.get(chunkPosition);
-            final int hash = hash(k0, k1);
-            final int tableLocation = hashToTableLocation(tableHashPivot, hash);
-            if (mainOutputPosition.getUnsafe(tableLocation) == EMPTY_OUTPUT_POSITION) {
-                handler.doMissing(chunkPosition);
-            } else if (eq(mainKeySource0.getUnsafe(tableLocation), k0) && eq(mainKeySource1.getUnsafe(tableLocation), k1)) {
-                handler.doMainFound(tableLocation, chunkPosition);
-            } else {
-                int overflowLocation = mainOverflowLocationSource.getUnsafe(tableLocation);
-                if (!findOverflow(handler, k0, k1, chunkPosition, overflowLocation)) {
-                    handler.doMissing(chunkPosition);
-                }
-            }
-        }
-    }
-
-    private static int hash(long k0, byte k1) {
-        int hash = LongChunkHasher.hashInitialSingle(k0);
-        hash = ByteChunkHasher.hashUpdateSingle(hash, k1);
-        return hash;
-    }
-
-    @Override
-    protected void rehashBucket(HashHandler handler, int sourceBucket, int destBucket,
-            int bucketsToAdd) {
-        final int position = mainOutputPosition.getUnsafe(sourceBucket);
-        if (position == EMPTY_OUTPUT_POSITION) {
-            return;
-        }
-        int mainInsertLocation = maybeMoveMainBucket(handler, sourceBucket, destBucket, bucketsToAdd);
-        int overflowLocation = mainOverflowLocationSource.getUnsafe(sourceBucket);
-        mainOverflowLocationSource.set(sourceBucket, QueryConstants.NULL_INT);
-        mainOverflowLocationSource.set(destBucket, QueryConstants.NULL_INT);
-        while (overflowLocation != QueryConstants.NULL_INT) {
-            final int nextOverflowLocation = overflowOverflowLocationSource.getUnsafe(overflowLocation);
-            final long overflowKey0 = overflowKeySource0.getUnsafe(overflowLocation);
-            final byte overflowKey1 = overflowKeySource1.getUnsafe(overflowLocation);
-            final int overflowHash = hash(overflowKey0, overflowKey1);
-            final int overflowTableLocation = hashToTableLocation(tableHashPivot + bucketsToAdd, overflowHash);
-            if (overflowTableLocation == mainInsertLocation) {
-                mainKeySource0.set(mainInsertLocation, overflowKey0);
-                mainKeySource1.set(mainInsertLocation, overflowKey1);
-                mainOutputPosition.set(mainInsertLocation, overflowOutputPosition.getUnsafe(overflowLocation));
-                handler.doPromoteOverflow(overflowLocation, mainInsertLocation);
-                overflowOutputPosition.set(overflowLocation, QueryConstants.NULL_INT);
-                overflowKeySource0.set(overflowLocation, QueryConstants.NULL_LONG);
-                overflowKeySource1.set(overflowLocation, QueryConstants.NULL_BYTE);
-                freeOverflowLocation(overflowLocation);
-                mainInsertLocation = -1;
-            } else {
-                final int oldOverflowLocation = mainOverflowLocationSource.getUnsafe(overflowTableLocation);
-                mainOverflowLocationSource.set(overflowTableLocation, overflowLocation);
-                overflowOverflowLocationSource.set(overflowLocation, oldOverflowLocation);
-            }
-            overflowLocation = nextOverflowLocation;
-        }
-    }
-
-    private int maybeMoveMainBucket(HashHandler handler, int sourceBucket, int destBucket,
-            int bucketsToAdd) {
-        final long k0 = mainKeySource0.getUnsafe(sourceBucket);
-        final byte k1 = mainKeySource1.getUnsafe(sourceBucket);
-        final int hash = hash(k0, k1);
-        final int location = hashToTableLocation(tableHashPivot + bucketsToAdd, hash);
-        final int mainInsertLocation;
-        if (location == sourceBucket) {
-            mainInsertLocation = destBucket;
-            mainOutputPosition.set(destBucket, EMPTY_OUTPUT_POSITION);
-        } else {
-            mainInsertLocation = sourceBucket;
-            mainOutputPosition.set(destBucket, mainOutputPosition.getUnsafe(sourceBucket));
-            mainOutputPosition.set(sourceBucket, EMPTY_OUTPUT_POSITION);
-            mainKeySource0.set(destBucket, k0);
-            mainKeySource0.set(sourceBucket, QueryConstants.NULL_LONG);
-            mainKeySource1.set(destBucket, k1);
-            mainKeySource1.set(sourceBucket, QueryConstants.NULL_BYTE);
-            handler.doMoveMain(sourceBucket, destBucket);
-        }
-        return mainInsertLocation;
-    }
-
-    private boolean findOverflow(HashHandler handler, long k0, byte k1, int chunkPosition,
-            int overflowLocation) {
-        while (overflowLocation != QueryConstants.NULL_INT) {
-            if (eq(overflowKeySource0.getUnsafe(overflowLocation), k0) && eq(overflowKeySource1.getUnsafe(overflowLocation), k1)) {
-                handler.doOverflowFound(overflowLocation, chunkPosition);
-                return true;
-            }
-            overflowLocation = overflowOverflowLocationSource.getUnsafe(overflowLocation);
-        }
-        return false;
-    }
-
-    @Override
-    public int findPositionForKey(Object key) {
-        final Object [] ka = (Object[])key;
-        final long k0 = TypeUtils.unbox((Long)ka[0]);
-        final byte k1 = TypeUtils.unbox((Byte)ka[1]);
-        int hash = hash(k0, k1);
-        final int tableLocation = hashToTableLocation(tableHashPivot, hash);
-        final int positionValue = mainOutputPosition.getUnsafe(tableLocation);
-        if (positionValue == EMPTY_OUTPUT_POSITION) {
-            return -1;
-        }
-        if (eq(mainKeySource0.getUnsafe(tableLocation), k0) && eq(mainKeySource1.getUnsafe(tableLocation), k1)) {
-            return positionValue;
-        }
-        int overflowLocation = mainOverflowLocationSource.getUnsafe(tableLocation);
-        while (overflowLocation != QueryConstants.NULL_INT) {
-            if (eq(overflowKeySource0.getUnsafe(overflowLocation), k0) && eq(overflowKeySource1.getUnsafe(overflowLocation), k1)) {
-                return overflowOutputPosition.getUnsafe(overflowLocation);
-            }
-            overflowLocation = overflowOverflowLocationSource.getUnsafe(overflowLocation);
-        }
-        return -1;
-    }
-}
diff --git a/engine/table/src/main/java/io/deephaven/engine/table/impl/by/typed/incagg/gen/IncrementalAggHasherLongChar.java b/engine/table/src/main/java/io/deephaven/engine/table/impl/by/typed/incagg/gen/IncrementalAggHasherLongChar.java
deleted file mode 100644
index bdb73cc21d1..00000000000
--- a/engine/table/src/main/java/io/deephaven/engine/table/impl/by/typed/incagg/gen/IncrementalAggHasherLongChar.java
+++ /dev/null
@@ -1,206 +0,0 @@
-//
-// Copyright (c) 2016-2024 Deephaven Data Labs and Patent Pending
-//
-// ****** AUTO-GENERATED CLASS - DO NOT EDIT MANUALLY
-// ****** Run ReplicateTypedHashers or ./gradlew replicateTypedHashers to regenerate
-//
-// @formatter:off
-package io.deephaven.engine.table.impl.by.typed.incagg.gen;
-
-import static io.deephaven.util.compare.CharComparisons.eq;
-import static io.deephaven.util.compare.LongComparisons.eq;
-
-import io.deephaven.chunk.CharChunk;
-import io.deephaven.chunk.Chunk;
-import io.deephaven.chunk.LongChunk;
-import io.deephaven.chunk.attributes.Values;
-import io.deephaven.chunk.util.hashing.CharChunkHasher;
-import io.deephaven.chunk.util.hashing.LongChunkHasher;
-import io.deephaven.engine.rowset.RowSequence;
-import io.deephaven.engine.table.ColumnSource;
-import io.deephaven.engine.table.impl.by.HashHandler;
-import io.deephaven.engine.table.impl.by.IncrementalChunkedOperatorAggregationStateManagerTypedBase;
-import io.deephaven.engine.table.impl.sources.CharacterArraySource;
-import io.deephaven.engine.table.impl.sources.LongArraySource;
-import io.deephaven.util.QueryConstants;
-import io.deephaven.util.type.TypeUtils;
-import java.lang.Character;
-import java.lang.Long;
-import java.lang.Object;
-import java.lang.Override;
-
-final class IncrementalAggHasherLongChar extends IncrementalChunkedOperatorAggregationStateManagerTypedBase {
-    private final LongArraySource mainKeySource0;
-
-    private final LongArraySource overflowKeySource0;
-
-    private final CharacterArraySource mainKeySource1;
-
-    private final CharacterArraySource overflowKeySource1;
-
-    public IncrementalAggHasherLongChar(ColumnSource[] tableKeySources,
-            ColumnSource[] originalTableKeySources, int tableSize, double maximumLoadFactor,
-            double targetLoadFactor) {
-        super(tableKeySources, tableSize, maximumLoadFactor, targetLoadFactor);
-        this.mainKeySource0 = (LongArraySource) super.mainKeySources[0];
-        this.overflowKeySource0 = (LongArraySource) super.overflowKeySources[0];
-        this.mainKeySource1 = (CharacterArraySource) super.mainKeySources[1];
-        this.overflowKeySource1 = (CharacterArraySource) super.overflowKeySources[1];
-    }
-
-    @Override
-    protected void build(HashHandler handler, RowSequence rowSequence, Chunk[] sourceKeyChunks) {
-        final LongChunk<Values> keyChunk0 = sourceKeyChunks[0].asLongChunk();
-        final CharChunk<Values> keyChunk1 = sourceKeyChunks[1].asCharChunk();
-        final int chunkSize = keyChunk0.size();
-        for (int chunkPosition = 0; chunkPosition < chunkSize; ++chunkPosition) {
-            final long k0 = keyChunk0.get(chunkPosition);
-            final char k1 = keyChunk1.get(chunkPosition);
-            final int hash = hash(k0, k1);
-            final int tableLocation = hashToTableLocation(tableHashPivot, hash);
-            if (mainOutputPosition.getUnsafe(tableLocation) == EMPTY_OUTPUT_POSITION) {
-                numEntries++;
-                mainKeySource0.set(tableLocation, k0);
-                mainKeySource1.set(tableLocation, k1);
-                handler.doMainInsert(tableLocation, chunkPosition);
-            } else if (eq(mainKeySource0.getUnsafe(tableLocation), k0) && eq(mainKeySource1.getUnsafe(tableLocation), k1)) {
-                handler.doMainFound(tableLocation, chunkPosition);
-            } else {
-                int overflowLocation = mainOverflowLocationSource.getUnsafe(tableLocation);
-                if (!findOverflow(handler, k0, k1, chunkPosition, overflowLocation)) {
-                    final int newOverflowLocation = allocateOverflowLocation();
-                    overflowKeySource0.set(newOverflowLocation, k0);
-                    overflowKeySource1.set(newOverflowLocation, k1);
-                    mainOverflowLocationSource.set(tableLocation, newOverflowLocation);
-                    overflowOverflowLocationSource.set(newOverflowLocation, overflowLocation);
-                    numEntries++;
-                    handler.doOverflowInsert(newOverflowLocation, chunkPosition);
-                }
-            }
-        }
-    }
-
-    @Override
-    protected void probe(HashHandler handler, RowSequence rowSequence, Chunk[] sourceKeyChunks) {
-        final LongChunk<Values> keyChunk0 = sourceKeyChunks[0].asLongChunk();
-        final CharChunk<Values> keyChunk1 = sourceKeyChunks[1].asCharChunk();
-        final int chunkSize = keyChunk0.size();
-        for (int chunkPosition = 0; chunkPosition < chunkSize; ++chunkPosition) {
-            final long k0 = keyChunk0.get(chunkPosition);
-            final char k1 = keyChunk1.get(chunkPosition);
-            final int hash = hash(k0, k1);
-            final int tableLocation = hashToTableLocation(tableHashPivot, hash);
-            if (mainOutputPosition.getUnsafe(tableLocation) == EMPTY_OUTPUT_POSITION) {
-                handler.doMissing(chunkPosition);
-            } else if (eq(mainKeySource0.getUnsafe(tableLocation), k0) && eq(mainKeySource1.getUnsafe(tableLocation), k1)) {
-                handler.doMainFound(tableLocation, chunkPosition);
-            } else {
-                int overflowLocation = mainOverflowLocationSource.getUnsafe(tableLocation);
-                if (!findOverflow(handler, k0, k1, chunkPosition, overflowLocation)) {
-                    handler.doMissing(chunkPosition);
-                }
-            }
-        }
-    }
-
-    private static int hash(long k0, char k1) {
-        int hash = LongChunkHasher.hashInitialSingle(k0);
-        hash = CharChunkHasher.hashUpdateSingle(hash, k1);
-        return hash;
-    }
-
-    @Override
-    protected void rehashBucket(HashHandler handler, int sourceBucket, int destBucket,
-            int bucketsToAdd) {
-        final int position = mainOutputPosition.getUnsafe(sourceBucket);
-        if (position == EMPTY_OUTPUT_POSITION) {
-            return;
-        }
-        int mainInsertLocation = maybeMoveMainBucket(handler, sourceBucket, destBucket, bucketsToAdd);
-        int overflowLocation = mainOverflowLocationSource.getUnsafe(sourceBucket);
-        mainOverflowLocationSource.set(sourceBucket, QueryConstants.NULL_INT);
-        mainOverflowLocationSource.set(destBucket, QueryConstants.NULL_INT);
-        while (overflowLocation != QueryConstants.NULL_INT) {
-            final int nextOverflowLocation = overflowOverflowLocationSource.getUnsafe(overflowLocation);
-            final long overflowKey0 = overflowKeySource0.getUnsafe(overflowLocation);
-            final char overflowKey1 = overflowKeySource1.getUnsafe(overflowLocation);
-            final int overflowHash = hash(overflowKey0, overflowKey1);
-            final int overflowTableLocation = hashToTableLocation(tableHashPivot + bucketsToAdd, overflowHash);
-            if (overflowTableLocation == mainInsertLocation) {
-                mainKeySource0.set(mainInsertLocation, overflowKey0);
-                mainKeySource1.set(mainInsertLocation, overflowKey1);
-                mainOutputPosition.set(mainInsertLocation, overflowOutputPosition.getUnsafe(overflowLocation));
-                handler.doPromoteOverflow(overflowLocation, mainInsertLocation);
-                overflowOutputPosition.set(overflowLocation, QueryConstants.NULL_INT);
-                overflowKeySource0.set(overflowLocation, QueryConstants.NULL_LONG);
-                overflowKeySource1.set(overflowLocation, QueryConstants.NULL_CHAR);
-                freeOverflowLocation(overflowLocation);
-                mainInsertLocation = -1;
-            } else {
-                final int oldOverflowLocation = mainOverflowLocationSource.getUnsafe(overflowTableLocation);
-                mainOverflowLocationSource.set(overflowTableLocation, overflowLocation);
-                overflowOverflowLocationSource.set(overflowLocation, oldOverflowLocation);
-            }
-            overflowLocation = nextOverflowLocation;
-        }
-    }
-
-    private int maybeMoveMainBucket(HashHandler handler, int sourceBucket, int destBucket,
-            int bucketsToAdd) {
-        final long k0 = mainKeySource0.getUnsafe(sourceBucket);
-        final char k1 = mainKeySource1.getUnsafe(sourceBucket);
-        final int hash = hash(k0, k1);
-        final int location = hashToTableLocation(tableHashPivot + bucketsToAdd, hash);
-        final int mainInsertLocation;
-        if (location == sourceBucket) {
-            mainInsertLocation = destBucket;
-            mainOutputPosition.set(destBucket, EMPTY_OUTPUT_POSITION);
-        } else {
-            mainInsertLocation = sourceBucket;
-            mainOutputPosition.set(destBucket, mainOutputPosition.getUnsafe(sourceBucket));
-            mainOutputPosition.set(sourceBucket, EMPTY_OUTPUT_POSITION);
-            mainKeySource0.set(destBucket, k0);
-            mainKeySource0.set(sourceBucket, QueryConstants.NULL_LONG);
-            mainKeySource1.set(destBucket, k1);
-            mainKeySource1.set(sourceBucket, QueryConstants.NULL_CHAR);
-            handler.doMoveMain(sourceBucket, destBucket);
-        }
-        return mainInsertLocation;
-    }
-
-    private boolean findOverflow(HashHandler handler, long k0, char k1, int chunkPosition,
-            int overflowLocation) {
-        while (overflowLocation != QueryConstants.NULL_INT) {
-            if (eq(overflowKeySource0.getUnsafe(overflowLocation), k0) && eq(overflowKeySource1.getUnsafe(overflowLocation), k1)) {
-                handler.doOverflowFound(overflowLocation, chunkPosition);
-                return true;
-            }
-            overflowLocation = overflowOverflowLocationSource.getUnsafe(overflowLocation);
-        }
-        return false;
-    }
-
-    @Override
-    public int findPositionForKey(Object key) {
-        final Object [] ka = (Object[])key;
-        final long k0 = TypeUtils.unbox((Long)ka[0]);
-        final char k1 = TypeUtils.unbox((Character)ka[1]);
-        int hash = hash(k0, k1);
-        final int tableLocation = hashToTableLocation(tableHashPivot, hash);
-        final int positionValue = mainOutputPosition.getUnsafe(tableLocation);
-        if (positionValue == EMPTY_OUTPUT_POSITION) {
-            return -1;
-        }
-        if (eq(mainKeySource0.getUnsafe(tableLocation), k0) && eq(mainKeySource1.getUnsafe(tableLocation), k1)) {
-            return positionValue;
-        }
-        int overflowLocation = mainOverflowLocationSource.getUnsafe(tableLocation);
-        while (overflowLocation != QueryConstants.NULL_INT) {
-            if (eq(overflowKeySource0.getUnsafe(overflowLocation), k0) && eq(overflowKeySource1.getUnsafe(overflowLocation), k1)) {
-                return overflowOutputPosition.getUnsafe(overflowLocation);
-            }
-            overflowLocation = overflowOverflowLocationSource.getUnsafe(overflowLocation);
-        }
-        return -1;
-    }
-}
diff --git a/engine/table/src/main/java/io/deephaven/engine/table/impl/by/typed/incagg/gen/IncrementalAggHasherLongDouble.java b/engine/table/src/main/java/io/deephaven/engine/table/impl/by/typed/incagg/gen/IncrementalAggHasherLongDouble.java
deleted file mode 100644
index e6e1d61ca9d..00000000000
--- a/engine/table/src/main/java/io/deephaven/engine/table/impl/by/typed/incagg/gen/IncrementalAggHasherLongDouble.java
+++ /dev/null
@@ -1,206 +0,0 @@
-//
-// Copyright (c) 2016-2024 Deephaven Data Labs and Patent Pending
-//
-// ****** AUTO-GENERATED CLASS - DO NOT EDIT MANUALLY
-// ****** Run ReplicateTypedHashers or ./gradlew replicateTypedHashers to regenerate
-//
-// @formatter:off
-package io.deephaven.engine.table.impl.by.typed.incagg.gen;
-
-import static io.deephaven.util.compare.DoubleComparisons.eq;
-import static io.deephaven.util.compare.LongComparisons.eq;
-
-import io.deephaven.chunk.Chunk;
-import io.deephaven.chunk.DoubleChunk;
-import io.deephaven.chunk.LongChunk;
-import io.deephaven.chunk.attributes.Values;
-import io.deephaven.chunk.util.hashing.DoubleChunkHasher;
-import io.deephaven.chunk.util.hashing.LongChunkHasher;
-import io.deephaven.engine.rowset.RowSequence;
-import io.deephaven.engine.table.ColumnSource;
-import io.deephaven.engine.table.impl.by.HashHandler;
-import io.deephaven.engine.table.impl.by.IncrementalChunkedOperatorAggregationStateManagerTypedBase;
-import io.deephaven.engine.table.impl.sources.DoubleArraySource;
-import io.deephaven.engine.table.impl.sources.LongArraySource;
-import io.deephaven.util.QueryConstants;
-import io.deephaven.util.type.TypeUtils;
-import java.lang.Double;
-import java.lang.Long;
-import java.lang.Object;
-import java.lang.Override;
-
-final class IncrementalAggHasherLongDouble extends IncrementalChunkedOperatorAggregationStateManagerTypedBase {
-    private final LongArraySource mainKeySource0;
-
-    private final LongArraySource overflowKeySource0;
-
-    private final DoubleArraySource mainKeySource1;
-
-    private final DoubleArraySource overflowKeySource1;
-
-    public IncrementalAggHasherLongDouble(ColumnSource[] tableKeySources,
-            ColumnSource[] originalTableKeySources, int tableSize, double maximumLoadFactor,
-            double targetLoadFactor) {
-        super(tableKeySources, tableSize, maximumLoadFactor, targetLoadFactor);
-        this.mainKeySource0 = (LongArraySource) super.mainKeySources[0];
-        this.overflowKeySource0 = (LongArraySource) super.overflowKeySources[0];
-        this.mainKeySource1 = (DoubleArraySource) super.mainKeySources[1];
-        this.overflowKeySource1 = (DoubleArraySource) super.overflowKeySources[1];
-    }
-
-    @Override
-    protected void build(HashHandler handler, RowSequence rowSequence, Chunk[] sourceKeyChunks) {
-        final LongChunk<Values> keyChunk0 = sourceKeyChunks[0].asLongChunk();
-        final DoubleChunk<Values> keyChunk1 = sourceKeyChunks[1].asDoubleChunk();
-        final int chunkSize = keyChunk0.size();
-        for (int chunkPosition = 0; chunkPosition < chunkSize; ++chunkPosition) {
-            final long k0 = keyChunk0.get(chunkPosition);
-            final double k1 = keyChunk1.get(chunkPosition);
-            final int hash = hash(k0, k1);
-            final int tableLocation = hashToTableLocation(tableHashPivot, hash);
-            if (mainOutputPosition.getUnsafe(tableLocation) == EMPTY_OUTPUT_POSITION) {
-                numEntries++;
-                mainKeySource0.set(tableLocation, k0);
-                mainKeySource1.set(tableLocation, k1);
-                handler.doMainInsert(tableLocation, chunkPosition);
-            } else if (eq(mainKeySource0.getUnsafe(tableLocation), k0) && eq(mainKeySource1.getUnsafe(tableLocation), k1)) {
-                handler.doMainFound(tableLocation, chunkPosition);
-            } else {
-                int overflowLocation = mainOverflowLocationSource.getUnsafe(tableLocation);
-                if (!findOverflow(handler, k0, k1, chunkPosition, overflowLocation)) {
-                    final int newOverflowLocation = allocateOverflowLocation();
-                    overflowKeySource0.set(newOverflowLocation, k0);
-                    overflowKeySource1.set(newOverflowLocation, k1);
-                    mainOverflowLocationSource.set(tableLocation, newOverflowLocation);
-                    overflowOverflowLocationSource.set(newOverflowLocation, overflowLocation);
-                    numEntries++;
-                    handler.doOverflowInsert(newOverflowLocation, chunkPosition);
-                }
-            }
-        }
-    }
-
-    @Override
-    protected void probe(HashHandler handler, RowSequence rowSequence, Chunk[] sourceKeyChunks) {
-        final LongChunk<Values> keyChunk0 = sourceKeyChunks[0].asLongChunk();
-        final DoubleChunk<Values> keyChunk1 = sourceKeyChunks[1].asDoubleChunk();
-        final int chunkSize = keyChunk0.size();
-        for (int chunkPosition = 0; chunkPosition < chunkSize; ++chunkPosition) {
-            final long k0 = keyChunk0.get(chunkPosition);
-            final double k1 = keyChunk1.get(chunkPosition);
-            final int hash = hash(k0, k1);
-            final int tableLocation = hashToTableLocation(tableHashPivot, hash);
-            if (mainOutputPosition.getUnsafe(tableLocation) == EMPTY_OUTPUT_POSITION) {
-                handler.doMissing(chunkPosition);
-            } else if (eq(mainKeySource0.getUnsafe(tableLocation), k0) && eq(mainKeySource1.getUnsafe(tableLocation), k1)) {
-                handler.doMainFound(tableLocation, chunkPosition);
-            } else {
-                int overflowLocation = mainOverflowLocationSource.getUnsafe(tableLocation);
-                if (!findOverflow(handler, k0, k1, chunkPosition, overflowLocation)) {
-                    handler.doMissing(chunkPosition);
-                }
-            }
-        }
-    }
-
-    private static int hash(long k0, double k1) {
-        int hash = LongChunkHasher.hashInitialSingle(k0);
-        hash = DoubleChunkHasher.hashUpdateSingle(hash, k1);
-        return hash;
-    }
-
-    @Override
-    protected void rehashBucket(HashHandler handler, int sourceBucket, int destBucket,
-            int bucketsToAdd) {
-        final int position = mainOutputPosition.getUnsafe(sourceBucket);
-        if (position == EMPTY_OUTPUT_POSITION) {
-            return;
-        }
-        int mainInsertLocation = maybeMoveMainBucket(handler, sourceBucket, destBucket, bucketsToAdd);
-        int overflowLocation = mainOverflowLocationSource.getUnsafe(sourceBucket);
-        mainOverflowLocationSource.set(sourceBucket, QueryConstants.NULL_INT);
-        mainOverflowLocationSource.set(destBucket, QueryConstants.NULL_INT);
-        while (overflowLocation != QueryConstants.NULL_INT) {
-            final int nextOverflowLocation = overflowOverflowLocationSource.getUnsafe(overflowLocation);
-            final long overflowKey0 = overflowKeySource0.getUnsafe(overflowLocation);
-            final double overflowKey1 = overflowKeySource1.getUnsafe(overflowLocation);
-            final int overflowHash = hash(overflowKey0, overflowKey1);
-            final int overflowTableLocation = hashToTableLocation(tableHashPivot + bucketsToAdd, overflowHash);
-            if (overflowTableLocation == mainInsertLocation) {
-                mainKeySource0.set(mainInsertLocation, overflowKey0);
-                mainKeySource1.set(mainInsertLocation, overflowKey1);
-                mainOutputPosition.set(mainInsertLocation, overflowOutputPosition.getUnsafe(overflowLocation));
-                handler.doPromoteOverflow(overflowLocation, mainInsertLocation);
-                overflowOutputPosition.set(overflowLocation, QueryConstants.NULL_INT);
-                overflowKeySource0.set(overflowLocation, QueryConstants.NULL_LONG);
-                overflowKeySource1.set(overflowLocation, QueryConstants.NULL_DOUBLE);
-                freeOverflowLocation(overflowLocation);
-                mainInsertLocation = -1;
-            } else {
-                final int oldOverflowLocation = mainOverflowLocationSource.getUnsafe(overflowTableLocation);
-                mainOverflowLocationSource.set(overflowTableLocation, overflowLocation);
-                overflowOverflowLocationSource.set(overflowLocation, oldOverflowLocation);
-            }
-            overflowLocation = nextOverflowLocation;
-        }
-    }
-
-    private int maybeMoveMainBucket(HashHandler handler, int sourceBucket, int destBucket,
-            int bucketsToAdd) {
-        final long k0 = mainKeySource0.getUnsafe(sourceBucket);
-        final double k1 = mainKeySource1.getUnsafe(sourceBucket);
-        final int hash = hash(k0, k1);
-        final int location = hashToTableLocation(tableHashPivot + bucketsToAdd, hash);
-        final int mainInsertLocation;
-        if (location == sourceBucket) {
-            mainInsertLocation = destBucket;
-            mainOutputPosition.set(destBucket, EMPTY_OUTPUT_POSITION);
-        } else {
-            mainInsertLocation = sourceBucket;
-            mainOutputPosition.set(destBucket, mainOutputPosition.getUnsafe(sourceBucket));
-            mainOutputPosition.set(sourceBucket, EMPTY_OUTPUT_POSITION);
-            mainKeySource0.set(destBucket, k0);
-            mainKeySource0.set(sourceBucket, QueryConstants.NULL_LONG);
-            mainKeySource1.set(destBucket, k1);
-            mainKeySource1.set(sourceBucket, QueryConstants.NULL_DOUBLE);
-            handler.doMoveMain(sourceBucket, destBucket);
-        }
-        return mainInsertLocation;
-    }
-
-    private boolean findOverflow(HashHandler handler, long k0, double k1, int chunkPosition,
-            int overflowLocation) {
-        while (overflowLocation != QueryConstants.NULL_INT) {
-            if (eq(overflowKeySource0.getUnsafe(overflowLocation), k0) && eq(overflowKeySource1.getUnsafe(overflowLocation), k1)) {
-                handler.doOverflowFound(overflowLocation, chunkPosition);
-                return true;
-            }
-            overflowLocation = overflowOverflowLocationSource.getUnsafe(overflowLocation);
-        }
-        return false;
-    }
-
-    @Override
-    public int findPositionForKey(Object key) {
-        final Object [] ka = (Object[])key;
-        final long k0 = TypeUtils.unbox((Long)ka[0]);
-        final double k1 = TypeUtils.unbox((Double)ka[1]);
-        int hash = hash(k0, k1);
-        final int tableLocation = hashToTableLocation(tableHashPivot, hash);
-        final int positionValue = mainOutputPosition.getUnsafe(tableLocation);
-        if (positionValue == EMPTY_OUTPUT_POSITION) {
-            return -1;
-        }
-        if (eq(mainKeySource0.getUnsafe(tableLocation), k0) && eq(mainKeySource1.getUnsafe(tableLocation), k1)) {
-            return positionValue;
-        }
-        int overflowLocation = mainOverflowLocationSource.getUnsafe(tableLocation);
-        while (overflowLocation != QueryConstants.NULL_INT) {
-            if (eq(overflowKeySource0.getUnsafe(overflowLocation), k0) && eq(overflowKeySource1.getUnsafe(overflowLocation), k1)) {
-                return overflowOutputPosition.getUnsafe(overflowLocation);
-            }
-            overflowLocation = overflowOverflowLocationSource.getUnsafe(overflowLocation);
-        }
-        return -1;
-    }
-}
diff --git a/engine/table/src/main/java/io/deephaven/engine/table/impl/by/typed/incagg/gen/IncrementalAggHasherLongFloat.java b/engine/table/src/main/java/io/deephaven/engine/table/impl/by/typed/incagg/gen/IncrementalAggHasherLongFloat.java
deleted file mode 100644
index 9b2b0973360..00000000000
--- a/engine/table/src/main/java/io/deephaven/engine/table/impl/by/typed/incagg/gen/IncrementalAggHasherLongFloat.java
+++ /dev/null
@@ -1,206 +0,0 @@
-//
-// Copyright (c) 2016-2024 Deephaven Data Labs and Patent Pending
-//
-// ****** AUTO-GENERATED CLASS - DO NOT EDIT MANUALLY
-// ****** Run ReplicateTypedHashers or ./gradlew replicateTypedHashers to regenerate
-//
-// @formatter:off
-package io.deephaven.engine.table.impl.by.typed.incagg.gen;
-
-import static io.deephaven.util.compare.FloatComparisons.eq;
-import static io.deephaven.util.compare.LongComparisons.eq;
-
-import io.deephaven.chunk.Chunk;
-import io.deephaven.chunk.FloatChunk;
-import io.deephaven.chunk.LongChunk;
-import io.deephaven.chunk.attributes.Values;
-import io.deephaven.chunk.util.hashing.FloatChunkHasher;
-import io.deephaven.chunk.util.hashing.LongChunkHasher;
-import io.deephaven.engine.rowset.RowSequence;
-import io.deephaven.engine.table.ColumnSource;
-import io.deephaven.engine.table.impl.by.HashHandler;
-import io.deephaven.engine.table.impl.by.IncrementalChunkedOperatorAggregationStateManagerTypedBase;
-import io.deephaven.engine.table.impl.sources.FloatArraySource;
-import io.deephaven.engine.table.impl.sources.LongArraySource;
-import io.deephaven.util.QueryConstants;
-import io.deephaven.util.type.TypeUtils;
-import java.lang.Float;
-import java.lang.Long;
-import java.lang.Object;
-import java.lang.Override;
-
-final class IncrementalAggHasherLongFloat extends IncrementalChunkedOperatorAggregationStateManagerTypedBase {
-    private final LongArraySource mainKeySource0;
-
-    private final LongArraySource overflowKeySource0;
-
-    private final FloatArraySource mainKeySource1;
-
-    private final FloatArraySource overflowKeySource1;
-
-    public IncrementalAggHasherLongFloat(ColumnSource[] tableKeySources,
-            ColumnSource[] originalTableKeySources, int tableSize, double maximumLoadFactor,
-            double targetLoadFactor) {
-        super(tableKeySources, tableSize, maximumLoadFactor, targetLoadFactor);
-        this.mainKeySource0 = (LongArraySource) super.mainKeySources[0];
-        this.overflowKeySource0 = (LongArraySource) super.overflowKeySources[0];
-        this.mainKeySource1 = (FloatArraySource) super.mainKeySources[1];
-        this.overflowKeySource1 = (FloatArraySource) super.overflowKeySources[1];
-    }
-
-    @Override
-    protected void build(HashHandler handler, RowSequence rowSequence, Chunk[] sourceKeyChunks) {
-        final LongChunk<Values> keyChunk0 = sourceKeyChunks[0].asLongChunk();
-        final FloatChunk<Values> keyChunk1 = sourceKeyChunks[1].asFloatChunk();
-        final int chunkSize = keyChunk0.size();
-        for (int chunkPosition = 0; chunkPosition < chunkSize; ++chunkPosition) {
-            final long k0 = keyChunk0.get(chunkPosition);
-            final float k1 = keyChunk1.get(chunkPosition);
-            final int hash = hash(k0, k1);
-            final int tableLocation = hashToTableLocation(tableHashPivot, hash);
-            if (mainOutputPosition.getUnsafe(tableLocation) == EMPTY_OUTPUT_POSITION) {
-                numEntries++;
-                mainKeySource0.set(tableLocation, k0);
-                mainKeySource1.set(tableLocation, k1);
-                handler.doMainInsert(tableLocation, chunkPosition);
-            } else if (eq(mainKeySource0.getUnsafe(tableLocation), k0) && eq(mainKeySource1.getUnsafe(tableLocation), k1)) {
-                handler.doMainFound(tableLocation, chunkPosition);
-            } else {
-                int overflowLocation = mainOverflowLocationSource.getUnsafe(tableLocation);
-                if (!findOverflow(handler, k0, k1, chunkPosition, overflowLocation)) {
-                    final int newOverflowLocation = allocateOverflowLocation();
-                    overflowKeySource0.set(newOverflowLocation, k0);
-                    overflowKeySource1.set(newOverflowLocation, k1);
-                    mainOverflowLocationSource.set(tableLocation, newOverflowLocation);
-                    overflowOverflowLocationSource.set(newOverflowLocation, overflowLocation);
-                    numEntries++;
-                    handler.doOverflowInsert(newOverflowLocation, chunkPosition);
-                }
-            }
-        }
-    }
-
-    @Override
-    protected void probe(HashHandler handler, RowSequence rowSequence, Chunk[] sourceKeyChunks) {
-        final LongChunk<Values> keyChunk0 = sourceKeyChunks[0].asLongChunk();
-        final FloatChunk<Values> keyChunk1 = sourceKeyChunks[1].asFloatChunk();
-        final int chunkSize = keyChunk0.size();
-        for (int chunkPosition = 0; chunkPosition < chunkSize; ++chunkPosition) {
-            final long k0 = keyChunk0.get(chunkPosition);
-            final float k1 = keyChunk1.get(chunkPosition);
-            final int hash = hash(k0, k1);
-            final int tableLocation = hashToTableLocation(tableHashPivot, hash);
-            if (mainOutputPosition.getUnsafe(tableLocation) == EMPTY_OUTPUT_POSITION) {
-                handler.doMissing(chunkPosition);
-            } else if (eq(mainKeySource0.getUnsafe(tableLocation), k0) && eq(mainKeySource1.getUnsafe(tableLocation), k1)) {
-                handler.doMainFound(tableLocation, chunkPosition);
-            } else {
-                int overflowLocation = mainOverflowLocationSource.getUnsafe(tableLocation);
-                if (!findOverflow(handler, k0, k1, chunkPosition, overflowLocation)) {
-                    handler.doMissing(chunkPosition);
-                }
-            }
-        }
-    }
-
-    private static int hash(long k0, float k1) {
-        int hash = LongChunkHasher.hashInitialSingle(k0);
-        hash = FloatChunkHasher.hashUpdateSingle(hash, k1);
-        return hash;
-    }
-
-    @Override
-    protected void rehashBucket(HashHandler handler, int sourceBucket, int destBucket,
-            int bucketsToAdd) {
-        final int position = mainOutputPosition.getUnsafe(sourceBucket);
-        if (position == EMPTY_OUTPUT_POSITION) {
-            return;
-        }
-        int mainInsertLocation = maybeMoveMainBucket(handler, sourceBucket, destBucket, bucketsToAdd);
-        int overflowLocation = mainOverflowLocationSource.getUnsafe(sourceBucket);
-        mainOverflowLocationSource.set(sourceBucket, QueryConstants.NULL_INT);
-        mainOverflowLocationSource.set(destBucket, QueryConstants.NULL_INT);
-        while (overflowLocation != QueryConstants.NULL_INT) {
-            final int nextOverflowLocation = overflowOverflowLocationSource.getUnsafe(overflowLocation);
-            final long overflowKey0 = overflowKeySource0.getUnsafe(overflowLocation);
-            final float overflowKey1 = overflowKeySource1.getUnsafe(overflowLocation);
-            final int overflowHash = hash(overflowKey0, overflowKey1);
-            final int overflowTableLocation = hashToTableLocation(tableHashPivot + bucketsToAdd, overflowHash);
-            if (overflowTableLocation == mainInsertLocation) {
-                mainKeySource0.set(mainInsertLocation, overflowKey0);
-                mainKeySource1.set(mainInsertLocation, overflowKey1);
-                mainOutputPosition.set(mainInsertLocation, overflowOutputPosition.getUnsafe(overflowLocation));
-                handler.doPromoteOverflow(overflowLocation, mainInsertLocation);
-                overflowOutputPosition.set(overflowLocation, QueryConstants.NULL_INT);
-                overflowKeySource0.set(overflowLocation, QueryConstants.NULL_LONG);
-                overflowKeySource1.set(overflowLocation, QueryConstants.NULL_FLOAT);
-                freeOverflowLocation(overflowLocation);
-                mainInsertLocation = -1;
-            } else {
-                final int oldOverflowLocation = mainOverflowLocationSource.getUnsafe(overflowTableLocation);
-                mainOverflowLocationSource.set(overflowTableLocation, overflowLocation);
-                overflowOverflowLocationSource.set(overflowLocation, oldOverflowLocation);
-            }
-            overflowLocation = nextOverflowLocation;
-        }
-    }
-
-    private int maybeMoveMainBucket(HashHandler handler, int sourceBucket, int destBucket,
-            int bucketsToAdd) {
-        final long k0 = mainKeySource0.getUnsafe(sourceBucket);
-        final float k1 = mainKeySource1.getUnsafe(sourceBucket);
-        final int hash = hash(k0, k1);
-        final int location = hashToTableLocation(tableHashPivot + bucketsToAdd, hash);
-        final int mainInsertLocation;
-        if (location == sourceBucket) {
-            mainInsertLocation = destBucket;
-            mainOutputPosition.set(destBucket, EMPTY_OUTPUT_POSITION);
-        } else {
-            mainInsertLocation = sourceBucket;
-            mainOutputPosition.set(destBucket, mainOutputPosition.getUnsafe(sourceBucket));
-            mainOutputPosition.set(sourceBucket, EMPTY_OUTPUT_POSITION);
-            mainKeySource0.set(destBucket, k0);
-            mainKeySource0.set(sourceBucket, QueryConstants.NULL_LONG);
-            mainKeySource1.set(destBucket, k1);
-            mainKeySource1.set(sourceBucket, QueryConstants.NULL_FLOAT);
-            handler.doMoveMain(sourceBucket, destBucket);
-        }
-        return mainInsertLocation;
-    }
-
-    private boolean findOverflow(HashHandler handler, long k0, float k1, int chunkPosition,
-            int overflowLocation) {
-        while (overflowLocation != QueryConstants.NULL_INT) {
-            if (eq(overflowKeySource0.getUnsafe(overflowLocation), k0) && eq(overflowKeySource1.getUnsafe(overflowLocation), k1)) {
-                handler.doOverflowFound(overflowLocation, chunkPosition);
-                return true;
-            }
-            overflowLocation = overflowOverflowLocationSource.getUnsafe(overflowLocation);
-        }
-        return false;
-    }
-
-    @Override
-    public int findPositionForKey(Object key) {
-        final Object [] ka = (Object[])key;
-        final long k0 = TypeUtils.unbox((Long)ka[0]);
-        final float k1 = TypeUtils.unbox((Float)ka[1]);
-        int hash = hash(k0, k1);
-        final int tableLocation = hashToTableLocation(tableHashPivot, hash);
-        final int positionValue = mainOutputPosition.getUnsafe(tableLocation);
-        if (positionValue == EMPTY_OUTPUT_POSITION) {
-            return -1;
-        }
-        if (eq(mainKeySource0.getUnsafe(tableLocation), k0) && eq(mainKeySource1.getUnsafe(tableLocation), k1)) {
-            return positionValue;
-        }
-        int overflowLocation = mainOverflowLocationSource.getUnsafe(tableLocation);
-        while (overflowLocation != QueryConstants.NULL_INT) {
-            if (eq(overflowKeySource0.getUnsafe(overflowLocation), k0) && eq(overflowKeySource1.getUnsafe(overflowLocation), k1)) {
-                return overflowOutputPosition.getUnsafe(overflowLocation);
-            }
-            overflowLocation = overflowOverflowLocationSource.getUnsafe(overflowLocation);
-        }
-        return -1;
-    }
-}
diff --git a/engine/table/src/main/java/io/deephaven/engine/table/impl/by/typed/incagg/gen/IncrementalAggHasherLongInt.java b/engine/table/src/main/java/io/deephaven/engine/table/impl/by/typed/incagg/gen/IncrementalAggHasherLongInt.java
deleted file mode 100644
index 4a1f669e901..00000000000
--- a/engine/table/src/main/java/io/deephaven/engine/table/impl/by/typed/incagg/gen/IncrementalAggHasherLongInt.java
+++ /dev/null
@@ -1,206 +0,0 @@
-//
-// Copyright (c) 2016-2024 Deephaven Data Labs and Patent Pending
-//
-// ****** AUTO-GENERATED CLASS - DO NOT EDIT MANUALLY
-// ****** Run ReplicateTypedHashers or ./gradlew replicateTypedHashers to regenerate
-//
-// @formatter:off
-package io.deephaven.engine.table.impl.by.typed.incagg.gen;
-
-import static io.deephaven.util.compare.IntComparisons.eq;
-import static io.deephaven.util.compare.LongComparisons.eq;
-
-import io.deephaven.chunk.Chunk;
-import io.deephaven.chunk.IntChunk;
-import io.deephaven.chunk.LongChunk;
-import io.deephaven.chunk.attributes.Values;
-import io.deephaven.chunk.util.hashing.IntChunkHasher;
-import io.deephaven.chunk.util.hashing.LongChunkHasher;
-import io.deephaven.engine.rowset.RowSequence;
-import io.deephaven.engine.table.ColumnSource;
-import io.deephaven.engine.table.impl.by.HashHandler;
-import io.deephaven.engine.table.impl.by.IncrementalChunkedOperatorAggregationStateManagerTypedBase;
-import io.deephaven.engine.table.impl.sources.IntegerArraySource;
-import io.deephaven.engine.table.impl.sources.LongArraySource;
-import io.deephaven.util.QueryConstants;
-import io.deephaven.util.type.TypeUtils;
-import java.lang.Integer;
-import java.lang.Long;
-import java.lang.Object;
-import java.lang.Override;
-
-final class IncrementalAggHasherLongInt extends IncrementalChunkedOperatorAggregationStateManagerTypedBase {
-    private final LongArraySource mainKeySource0;
-
-    private final LongArraySource overflowKeySource0;
-
-    private final IntegerArraySource mainKeySource1;
-
-    private final IntegerArraySource overflowKeySource1;
-
-    public IncrementalAggHasherLongInt(ColumnSource[] tableKeySources,
-            ColumnSource[] originalTableKeySources, int tableSize, double maximumLoadFactor,
-            double targetLoadFactor) {
-        super(tableKeySources, tableSize, maximumLoadFactor, targetLoadFactor);
-        this.mainKeySource0 = (LongArraySource) super.mainKeySources[0];
-        this.overflowKeySource0 = (LongArraySource) super.overflowKeySources[0];
-        this.mainKeySource1 = (IntegerArraySource) super.mainKeySources[1];
-        this.overflowKeySource1 = (IntegerArraySource) super.overflowKeySources[1];
-    }
-
-    @Override
-    protected void build(HashHandler handler, RowSequence rowSequence, Chunk[] sourceKeyChunks) {
-        final LongChunk<Values> keyChunk0 = sourceKeyChunks[0].asLongChunk();
-        final IntChunk<Values> keyChunk1 = sourceKeyChunks[1].asIntChunk();
-        final int chunkSize = keyChunk0.size();
-        for (int chunkPosition = 0; chunkPosition < chunkSize; ++chunkPosition) {
-            final long k0 = keyChunk0.get(chunkPosition);
-            final int k1 = keyChunk1.get(chunkPosition);
-            final int hash = hash(k0, k1);
-            final int tableLocation = hashToTableLocation(tableHashPivot, hash);
-            if (mainOutputPosition.getUnsafe(tableLocation) == EMPTY_OUTPUT_POSITION) {
-                numEntries++;
-                mainKeySource0.set(tableLocation, k0);
-                mainKeySource1.set(tableLocation, k1);
-                handler.doMainInsert(tableLocation, chunkPosition);
-            } else if (eq(mainKeySource0.getUnsafe(tableLocation), k0) && eq(mainKeySource1.getUnsafe(tableLocation), k1)) {
-                handler.doMainFound(tableLocation, chunkPosition);
-            } else {
-                int overflowLocation = mainOverflowLocationSource.getUnsafe(tableLocation);
-                if (!findOverflow(handler, k0, k1, chunkPosition, overflowLocation)) {
-                    final int newOverflowLocation = allocateOverflowLocation();
-                    overflowKeySource0.set(newOverflowLocation, k0);
-                    overflowKeySource1.set(newOverflowLocation, k1);
-                    mainOverflowLocationSource.set(tableLocation, newOverflowLocation);
-                    overflowOverflowLocationSource.set(newOverflowLocation, overflowLocation);
-                    numEntries++;
-                    handler.doOverflowInsert(newOverflowLocation, chunkPosition);
-                }
-            }
-        }
-    }
-
-    @Override
-    protected void probe(HashHandler handler, RowSequence rowSequence, Chunk[] sourceKeyChunks) {
-        final LongChunk<Values> keyChunk0 = sourceKeyChunks[0].asLongChunk();
-        final IntChunk<Values> keyChunk1 = sourceKeyChunks[1].asIntChunk();
-        final int chunkSize = keyChunk0.size();
-        for (int chunkPosition = 0; chunkPosition < chunkSize; ++chunkPosition) {
-            final long k0 = keyChunk0.get(chunkPosition);
-            final int k1 = keyChunk1.get(chunkPosition);
-            final int hash = hash(k0, k1);
-            final int tableLocation = hashToTableLocation(tableHashPivot, hash);
-            if (mainOutputPosition.getUnsafe(tableLocation) == EMPTY_OUTPUT_POSITION) {
-                handler.doMissing(chunkPosition);
-            } else if (eq(mainKeySource0.getUnsafe(tableLocation), k0) && eq(mainKeySource1.getUnsafe(tableLocation), k1)) {
-                handler.doMainFound(tableLocation, chunkPosition);
-            } else {
-                int overflowLocation = mainOverflowLocationSource.getUnsafe(tableLocation);
-                if (!findOverflow(handler, k0, k1, chunkPosition, overflowLocation)) {
-                    handler.doMissing(chunkPosition);
-                }
-            }
-        }
-    }
-
-    private static int hash(long k0, int k1) {
-        int hash = LongChunkHasher.hashInitialSingle(k0);
-        hash = IntChunkHasher.hashUpdateSingle(hash, k1);
-        return hash;
-    }
-
-    @Override
-    protected void rehashBucket(HashHandler handler, int sourceBucket, int destBucket,
-            int bucketsToAdd) {
-        final int position = mainOutputPosition.getUnsafe(sourceBucket);
-        if (position == EMPTY_OUTPUT_POSITION) {
-            return;
-        }
-        int mainInsertLocation = maybeMoveMainBucket(handler, sourceBucket, destBucket, bucketsToAdd);
-        int overflowLocation = mainOverflowLocationSource.getUnsafe(sourceBucket);
-        mainOverflowLocationSource.set(sourceBucket, QueryConstants.NULL_INT);
-        mainOverflowLocationSource.set(destBucket, QueryConstants.NULL_INT);
-        while (overflowLocation != QueryConstants.NULL_INT) {
-            final int nextOverflowLocation = overflowOverflowLocationSource.getUnsafe(overflowLocation);
-            final long overflowKey0 = overflowKeySource0.getUnsafe(overflowLocation);
-            final int overflowKey1 = overflowKeySource1.getUnsafe(overflowLocation);
-            final int overflowHash = hash(overflowKey0, overflowKey1);
-            final int overflowTableLocation = hashToTableLocation(tableHashPivot + bucketsToAdd, overflowHash);
-            if (overflowTableLocation == mainInsertLocation) {
-                mainKeySource0.set(mainInsertLocation, overflowKey0);
-                mainKeySource1.set(mainInsertLocation, overflowKey1);
-                mainOutputPosition.set(mainInsertLocation, overflowOutputPosition.getUnsafe(overflowLocation));
-                handler.doPromoteOverflow(overflowLocation, mainInsertLocation);
-                overflowOutputPosition.set(overflowLocation, QueryConstants.NULL_INT);
-                overflowKeySource0.set(overflowLocation, QueryConstants.NULL_LONG);
-                overflowKeySource1.set(overflowLocation, QueryConstants.NULL_INT);
-                freeOverflowLocation(overflowLocation);
-                mainInsertLocation = -1;
-            } else {
-                final int oldOverflowLocation = mainOverflowLocationSource.getUnsafe(overflowTableLocation);
-                mainOverflowLocationSource.set(overflowTableLocation, overflowLocation);
-                overflowOverflowLocationSource.set(overflowLocation, oldOverflowLocation);
-            }
-            overflowLocation = nextOverflowLocation;
-        }
-    }
-
-    private int maybeMoveMainBucket(HashHandler handler, int sourceBucket, int destBucket,
-            int bucketsToAdd) {
-        final long k0 = mainKeySource0.getUnsafe(sourceBucket);
-        final int k1 = mainKeySource1.getUnsafe(sourceBucket);
-        final int hash = hash(k0, k1);
-        final int location = hashToTableLocation(tableHashPivot + bucketsToAdd, hash);
-        final int mainInsertLocation;
-        if (location == sourceBucket) {
-            mainInsertLocation = destBucket;
-            mainOutputPosition.set(destBucket, EMPTY_OUTPUT_POSITION);
-        } else {
-            mainInsertLocation = sourceBucket;
-            mainOutputPosition.set(destBucket, mainOutputPosition.getUnsafe(sourceBucket));
-            mainOutputPosition.set(sourceBucket, EMPTY_OUTPUT_POSITION);
-            mainKeySource0.set(destBucket, k0);
-            mainKeySource0.set(sourceBucket, QueryConstants.NULL_LONG);
-            mainKeySource1.set(destBucket, k1);
-            mainKeySource1.set(sourceBucket, QueryConstants.NULL_INT);
-            handler.doMoveMain(sourceBucket, destBucket);
-        }
-        return mainInsertLocation;
-    }
-
-    private boolean findOverflow(HashHandler handler, long k0, int k1, int chunkPosition,
-            int overflowLocation) {
-        while (overflowLocation != QueryConstants.NULL_INT) {
-            if (eq(overflowKeySource0.getUnsafe(overflowLocation), k0) && eq(overflowKeySource1.getUnsafe(overflowLocation), k1)) {
-                handler.doOverflowFound(overflowLocation, chunkPosition);
-                return true;
-            }
-            overflowLocation = overflowOverflowLocationSource.getUnsafe(overflowLocation);
-        }
-        return false;
-    }
-
-    @Override
-    public int findPositionForKey(Object key) {
-        final Object [] ka = (Object[])key;
-        final long k0 = TypeUtils.unbox((Long)ka[0]);
-        final int k1 = TypeUtils.unbox((Integer)ka[1]);
-        int hash = hash(k0, k1);
-        final int tableLocation = hashToTableLocation(tableHashPivot, hash);
-        final int positionValue = mainOutputPosition.getUnsafe(tableLocation);
-        if (positionValue == EMPTY_OUTPUT_POSITION) {
-            return -1;
-        }
-        if (eq(mainKeySource0.getUnsafe(tableLocation), k0) && eq(mainKeySource1.getUnsafe(tableLocation), k1)) {
-            return positionValue;
-        }
-        int overflowLocation = mainOverflowLocationSource.getUnsafe(tableLocation);
-        while (overflowLocation != QueryConstants.NULL_INT) {
-            if (eq(overflowKeySource0.getUnsafe(overflowLocation), k0) && eq(overflowKeySource1.getUnsafe(overflowLocation), k1)) {
-                return overflowOutputPosition.getUnsafe(overflowLocation);
-            }
-            overflowLocation = overflowOverflowLocationSource.getUnsafe(overflowLocation);
-        }
-        return -1;
-    }
-}
diff --git a/engine/table/src/main/java/io/deephaven/engine/table/impl/by/typed/incagg/gen/IncrementalAggHasherLongLong.java b/engine/table/src/main/java/io/deephaven/engine/table/impl/by/typed/incagg/gen/IncrementalAggHasherLongLong.java
deleted file mode 100644
index 85935f632bf..00000000000
--- a/engine/table/src/main/java/io/deephaven/engine/table/impl/by/typed/incagg/gen/IncrementalAggHasherLongLong.java
+++ /dev/null
@@ -1,201 +0,0 @@
-//
-// Copyright (c) 2016-2024 Deephaven Data Labs and Patent Pending
-//
-// ****** AUTO-GENERATED CLASS - DO NOT EDIT MANUALLY
-// ****** Run ReplicateTypedHashers or ./gradlew replicateTypedHashers to regenerate
-//
-// @formatter:off
-package io.deephaven.engine.table.impl.by.typed.incagg.gen;
-
-import static io.deephaven.util.compare.LongComparisons.eq;
-
-import io.deephaven.chunk.Chunk;
-import io.deephaven.chunk.LongChunk;
-import io.deephaven.chunk.attributes.Values;
-import io.deephaven.chunk.util.hashing.LongChunkHasher;
-import io.deephaven.engine.rowset.RowSequence;
-import io.deephaven.engine.table.ColumnSource;
-import io.deephaven.engine.table.impl.by.HashHandler;
-import io.deephaven.engine.table.impl.by.IncrementalChunkedOperatorAggregationStateManagerTypedBase;
-import io.deephaven.engine.table.impl.sources.LongArraySource;
-import io.deephaven.util.QueryConstants;
-import io.deephaven.util.type.TypeUtils;
-import java.lang.Long;
-import java.lang.Object;
-import java.lang.Override;
-
-final class IncrementalAggHasherLongLong extends IncrementalChunkedOperatorAggregationStateManagerTypedBase {
-    private final LongArraySource mainKeySource0;
-
-    private final LongArraySource overflowKeySource0;
-
-    private final LongArraySource mainKeySource1;
-
-    private final LongArraySource overflowKeySource1;
-
-    public IncrementalAggHasherLongLong(ColumnSource[] tableKeySources,
-            ColumnSource[] originalTableKeySources, int tableSize, double maximumLoadFactor,
-            double targetLoadFactor) {
-        super(tableKeySources, tableSize, maximumLoadFactor, targetLoadFactor);
-        this.mainKeySource0 = (LongArraySource) super.mainKeySources[0];
-        this.overflowKeySource0 = (LongArraySource) super.overflowKeySources[0];
-        this.mainKeySource1 = (LongArraySource) super.mainKeySources[1];
-        this.overflowKeySource1 = (LongArraySource) super.overflowKeySources[1];
-    }
-
-    @Override
-    protected void build(HashHandler handler, RowSequence rowSequence, Chunk[] sourceKeyChunks) {
-        final LongChunk<Values> keyChunk0 = sourceKeyChunks[0].asLongChunk();
-        final LongChunk<Values> keyChunk1 = sourceKeyChunks[1].asLongChunk();
-        final int chunkSize = keyChunk0.size();
-        for (int chunkPosition = 0; chunkPosition < chunkSize; ++chunkPosition) {
-            final long k0 = keyChunk0.get(chunkPosition);
-            final long k1 = keyChunk1.get(chunkPosition);
-            final int hash = hash(k0, k1);
-            final int tableLocation = hashToTableLocation(tableHashPivot, hash);
-            if (mainOutputPosition.getUnsafe(tableLocation) == EMPTY_OUTPUT_POSITION) {
-                numEntries++;
-                mainKeySource0.set(tableLocation, k0);
-                mainKeySource1.set(tableLocation, k1);
-                handler.doMainInsert(tableLocation, chunkPosition);
-            } else if (eq(mainKeySource0.getUnsafe(tableLocation), k0) && eq(mainKeySource1.getUnsafe(tableLocation), k1)) {
-                handler.doMainFound(tableLocation, chunkPosition);
-            } else {
-                int overflowLocation = mainOverflowLocationSource.getUnsafe(tableLocation);
-                if (!findOverflow(handler, k0, k1, chunkPosition, overflowLocation)) {
-                    final int newOverflowLocation = allocateOverflowLocation();
-                    overflowKeySource0.set(newOverflowLocation, k0);
-                    overflowKeySource1.set(newOverflowLocation, k1);
-                    mainOverflowLocationSource.set(tableLocation, newOverflowLocation);
-                    overflowOverflowLocationSource.set(newOverflowLocation, overflowLocation);
-                    numEntries++;
-                    handler.doOverflowInsert(newOverflowLocation, chunkPosition);
-                }
-            }
-        }
-    }
-
-    @Override
-    protected void probe(HashHandler handler, RowSequence rowSequence, Chunk[] sourceKeyChunks) {
-        final LongChunk<Values> keyChunk0 = sourceKeyChunks[0].asLongChunk();
-        final LongChunk<Values> keyChunk1 = sourceKeyChunks[1].asLongChunk();
-        final int chunkSize = keyChunk0.size();
-        for (int chunkPosition = 0; chunkPosition < chunkSize; ++chunkPosition) {
-            final long k0 = keyChunk0.get(chunkPosition);
-            final long k1 = keyChunk1.get(chunkPosition);
-            final int hash = hash(k0, k1);
-            final int tableLocation = hashToTableLocation(tableHashPivot, hash);
-            if (mainOutputPosition.getUnsafe(tableLocation) == EMPTY_OUTPUT_POSITION) {
-                handler.doMissing(chunkPosition);
-            } else if (eq(mainKeySource0.getUnsafe(tableLocation), k0) && eq(mainKeySource1.getUnsafe(tableLocation), k1)) {
-                handler.doMainFound(tableLocation, chunkPosition);
-            } else {
-                int overflowLocation = mainOverflowLocationSource.getUnsafe(tableLocation);
-                if (!findOverflow(handler, k0, k1, chunkPosition, overflowLocation)) {
-                    handler.doMissing(chunkPosition);
-                }
-            }
-        }
-    }
-
-    private static int hash(long k0, long k1) {
-        int hash = LongChunkHasher.hashInitialSingle(k0);
-        hash = LongChunkHasher.hashUpdateSingle(hash, k1);
-        return hash;
-    }
-
-    @Override
-    protected void rehashBucket(HashHandler handler, int sourceBucket, int destBucket,
-            int bucketsToAdd) {
-        final int position = mainOutputPosition.getUnsafe(sourceBucket);
-        if (position == EMPTY_OUTPUT_POSITION) {
-            return;
-        }
-        int mainInsertLocation = maybeMoveMainBucket(handler, sourceBucket, destBucket, bucketsToAdd);
-        int overflowLocation = mainOverflowLocationSource.getUnsafe(sourceBucket);
-        mainOverflowLocationSource.set(sourceBucket, QueryConstants.NULL_INT);
-        mainOverflowLocationSource.set(destBucket, QueryConstants.NULL_INT);
-        while (overflowLocation != QueryConstants.NULL_INT) {
-            final int nextOverflowLocation = overflowOverflowLocationSource.getUnsafe(overflowLocation);
-            final long overflowKey0 = overflowKeySource0.getUnsafe(overflowLocation);
-            final long overflowKey1 = overflowKeySource1.getUnsafe(overflowLocation);
-            final int overflowHash = hash(overflowKey0, overflowKey1);
-            final int overflowTableLocation = hashToTableLocation(tableHashPivot + bucketsToAdd, overflowHash);
-            if (overflowTableLocation == mainInsertLocation) {
-                mainKeySource0.set(mainInsertLocation, overflowKey0);
-                mainKeySource1.set(mainInsertLocation, overflowKey1);
-                mainOutputPosition.set(mainInsertLocation, overflowOutputPosition.getUnsafe(overflowLocation));
-                handler.doPromoteOverflow(overflowLocation, mainInsertLocation);
-                overflowOutputPosition.set(overflowLocation, QueryConstants.NULL_INT);
-                overflowKeySource0.set(overflowLocation, QueryConstants.NULL_LONG);
-                overflowKeySource1.set(overflowLocation, QueryConstants.NULL_LONG);
-                freeOverflowLocation(overflowLocation);
-                mainInsertLocation = -1;
-            } else {
-                final int oldOverflowLocation = mainOverflowLocationSource.getUnsafe(overflowTableLocation);
-                mainOverflowLocationSource.set(overflowTableLocation, overflowLocation);
-                overflowOverflowLocationSource.set(overflowLocation, oldOverflowLocation);
-            }
-            overflowLocation = nextOverflowLocation;
-        }
-    }
-
-    private int maybeMoveMainBucket(HashHandler handler, int sourceBucket, int destBucket,
-            int bucketsToAdd) {
-        final long k0 = mainKeySource0.getUnsafe(sourceBucket);
-        final long k1 = mainKeySource1.getUnsafe(sourceBucket);
-        final int hash = hash(k0, k1);
-        final int location = hashToTableLocation(tableHashPivot + bucketsToAdd, hash);
-        final int mainInsertLocation;
-        if (location == sourceBucket) {
-            mainInsertLocation = destBucket;
-            mainOutputPosition.set(destBucket, EMPTY_OUTPUT_POSITION);
-        } else {
-            mainInsertLocation = sourceBucket;
-            mainOutputPosition.set(destBucket, mainOutputPosition.getUnsafe(sourceBucket));
-            mainOutputPosition.set(sourceBucket, EMPTY_OUTPUT_POSITION);
-            mainKeySource0.set(destBucket, k0);
-            mainKeySource0.set(sourceBucket, QueryConstants.NULL_LONG);
-            mainKeySource1.set(destBucket, k1);
-            mainKeySource1.set(sourceBucket, QueryConstants.NULL_LONG);
-            handler.doMoveMain(sourceBucket, destBucket);
-        }
-        return mainInsertLocation;
-    }
-
-    private boolean findOverflow(HashHandler handler, long k0, long k1, int chunkPosition,
-            int overflowLocation) {
-        while (overflowLocation != QueryConstants.NULL_INT) {
-            if (eq(overflowKeySource0.getUnsafe(overflowLocation), k0) && eq(overflowKeySource1.getUnsafe(overflowLocation), k1)) {
-                handler.doOverflowFound(overflowLocation, chunkPosition);
-                return true;
-            }
-            overflowLocation = overflowOverflowLocationSource.getUnsafe(overflowLocation);
-        }
-        return false;
-    }
-
-    @Override
-    public int findPositionForKey(Object key) {
-        final Object [] ka = (Object[])key;
-        final long k0 = TypeUtils.unbox((Long)ka[0]);
-        final long k1 = TypeUtils.unbox((Long)ka[1]);
-        int hash = hash(k0, k1);
-        final int tableLocation = hashToTableLocation(tableHashPivot, hash);
-        final int positionValue = mainOutputPosition.getUnsafe(tableLocation);
-        if (positionValue == EMPTY_OUTPUT_POSITION) {
-            return -1;
-        }
-        if (eq(mainKeySource0.getUnsafe(tableLocation), k0) && eq(mainKeySource1.getUnsafe(tableLocation), k1)) {
-            return positionValue;
-        }
-        int overflowLocation = mainOverflowLocationSource.getUnsafe(tableLocation);
-        while (overflowLocation != QueryConstants.NULL_INT) {
-            if (eq(overflowKeySource0.getUnsafe(overflowLocation), k0) && eq(overflowKeySource1.getUnsafe(overflowLocation), k1)) {
-                return overflowOutputPosition.getUnsafe(overflowLocation);
-            }
-            overflowLocation = overflowOverflowLocationSource.getUnsafe(overflowLocation);
-        }
-        return -1;
-    }
-}
diff --git a/engine/table/src/main/java/io/deephaven/engine/table/impl/by/typed/incagg/gen/IncrementalAggHasherLongObject.java b/engine/table/src/main/java/io/deephaven/engine/table/impl/by/typed/incagg/gen/IncrementalAggHasherLongObject.java
deleted file mode 100644
index ba0a9b63d77..00000000000
--- a/engine/table/src/main/java/io/deephaven/engine/table/impl/by/typed/incagg/gen/IncrementalAggHasherLongObject.java
+++ /dev/null
@@ -1,205 +0,0 @@
-//
-// Copyright (c) 2016-2024 Deephaven Data Labs and Patent Pending
-//
-// ****** AUTO-GENERATED CLASS - DO NOT EDIT MANUALLY
-// ****** Run ReplicateTypedHashers or ./gradlew replicateTypedHashers to regenerate
-//
-// @formatter:off
-package io.deephaven.engine.table.impl.by.typed.incagg.gen;
-
-import static io.deephaven.util.compare.LongComparisons.eq;
-import static io.deephaven.util.compare.ObjectComparisons.eq;
-
-import io.deephaven.chunk.Chunk;
-import io.deephaven.chunk.LongChunk;
-import io.deephaven.chunk.ObjectChunk;
-import io.deephaven.chunk.attributes.Values;
-import io.deephaven.chunk.util.hashing.LongChunkHasher;
-import io.deephaven.chunk.util.hashing.ObjectChunkHasher;
-import io.deephaven.engine.rowset.RowSequence;
-import io.deephaven.engine.table.ColumnSource;
-import io.deephaven.engine.table.impl.by.HashHandler;
-import io.deephaven.engine.table.impl.by.IncrementalChunkedOperatorAggregationStateManagerTypedBase;
-import io.deephaven.engine.table.impl.sources.LongArraySource;
-import io.deephaven.engine.table.impl.sources.ObjectArraySource;
-import io.deephaven.util.QueryConstants;
-import io.deephaven.util.type.TypeUtils;
-import java.lang.Long;
-import java.lang.Object;
-import java.lang.Override;
-
-final class IncrementalAggHasherLongObject extends IncrementalChunkedOperatorAggregationStateManagerTypedBase {
-    private final LongArraySource mainKeySource0;
-
-    private final LongArraySource overflowKeySource0;
-
-    private final ObjectArraySource mainKeySource1;
-
-    private final ObjectArraySource overflowKeySource1;
-
-    public IncrementalAggHasherLongObject(ColumnSource[] tableKeySources,
-            ColumnSource[] originalTableKeySources, int tableSize, double maximumLoadFactor,
-            double targetLoadFactor) {
-        super(tableKeySources, tableSize, maximumLoadFactor, targetLoadFactor);
-        this.mainKeySource0 = (LongArraySource) super.mainKeySources[0];
-        this.overflowKeySource0 = (LongArraySource) super.overflowKeySources[0];
-        this.mainKeySource1 = (ObjectArraySource) super.mainKeySources[1];
-        this.overflowKeySource1 = (ObjectArraySource) super.overflowKeySources[1];
-    }
-
-    @Override
-    protected void build(HashHandler handler, RowSequence rowSequence, Chunk[] sourceKeyChunks) {
-        final LongChunk<Values> keyChunk0 = sourceKeyChunks[0].asLongChunk();
-        final ObjectChunk<Object, Values> keyChunk1 = sourceKeyChunks[1].asObjectChunk();
-        final int chunkSize = keyChunk0.size();
-        for (int chunkPosition = 0; chunkPosition < chunkSize; ++chunkPosition) {
-            final long k0 = keyChunk0.get(chunkPosition);
-            final Object k1 = keyChunk1.get(chunkPosition);
-            final int hash = hash(k0, k1);
-            final int tableLocation = hashToTableLocation(tableHashPivot, hash);
-            if (mainOutputPosition.getUnsafe(tableLocation) == EMPTY_OUTPUT_POSITION) {
-                numEntries++;
-                mainKeySource0.set(tableLocation, k0);
-                mainKeySource1.set(tableLocation, k1);
-                handler.doMainInsert(tableLocation, chunkPosition);
-            } else if (eq(mainKeySource0.getUnsafe(tableLocation), k0) && eq(mainKeySource1.getUnsafe(tableLocation), k1)) {
-                handler.doMainFound(tableLocation, chunkPosition);
-            } else {
-                int overflowLocation = mainOverflowLocationSource.getUnsafe(tableLocation);
-                if (!findOverflow(handler, k0, k1, chunkPosition, overflowLocation)) {
-                    final int newOverflowLocation = allocateOverflowLocation();
-                    overflowKeySource0.set(newOverflowLocation, k0);
-                    overflowKeySource1.set(newOverflowLocation, k1);
-                    mainOverflowLocationSource.set(tableLocation, newOverflowLocation);
-                    overflowOverflowLocationSource.set(newOverflowLocation, overflowLocation);
-                    numEntries++;
-                    handler.doOverflowInsert(newOverflowLocation, chunkPosition);
-                }
-            }
-        }
-    }
-
-    @Override
-    protected void probe(HashHandler handler, RowSequence rowSequence, Chunk[] sourceKeyChunks) {
-        final LongChunk<Values> keyChunk0 = sourceKeyChunks[0].asLongChunk();
-        final ObjectChunk<Object, Values> keyChunk1 = sourceKeyChunks[1].asObjectChunk();
-        final int chunkSize = keyChunk0.size();
-        for (int chunkPosition = 0; chunkPosition < chunkSize; ++chunkPosition) {
-            final long k0 = keyChunk0.get(chunkPosition);
-            final Object k1 = keyChunk1.get(chunkPosition);
-            final int hash = hash(k0, k1);
-            final int tableLocation = hashToTableLocation(tableHashPivot, hash);
-            if (mainOutputPosition.getUnsafe(tableLocation) == EMPTY_OUTPUT_POSITION) {
-                handler.doMissing(chunkPosition);
-            } else if (eq(mainKeySource0.getUnsafe(tableLocation), k0) && eq(mainKeySource1.getUnsafe(tableLocation), k1)) {
-                handler.doMainFound(tableLocation, chunkPosition);
-            } else {
-                int overflowLocation = mainOverflowLocationSource.getUnsafe(tableLocation);
-                if (!findOverflow(handler, k0, k1, chunkPosition, overflowLocation)) {
-                    handler.doMissing(chunkPosition);
-                }
-            }
-        }
-    }
-
-    private static int hash(long k0, Object k1) {
-        int hash = LongChunkHasher.hashInitialSingle(k0);
-        hash = ObjectChunkHasher.hashUpdateSingle(hash, k1);
-        return hash;
-    }
-
-    @Override
-    protected void rehashBucket(HashHandler handler, int sourceBucket, int destBucket,
-            int bucketsToAdd) {
-        final int position = mainOutputPosition.getUnsafe(sourceBucket);
-        if (position == EMPTY_OUTPUT_POSITION) {
-            return;
-        }
-        int mainInsertLocation = maybeMoveMainBucket(handler, sourceBucket, destBucket, bucketsToAdd);
-        int overflowLocation = mainOverflowLocationSource.getUnsafe(sourceBucket);
-        mainOverflowLocationSource.set(sourceBucket, QueryConstants.NULL_INT);
-        mainOverflowLocationSource.set(destBucket, QueryConstants.NULL_INT);
-        while (overflowLocation != QueryConstants.NULL_INT) {
-            final int nextOverflowLocation = overflowOverflowLocationSource.getUnsafe(overflowLocation);
-            final long overflowKey0 = overflowKeySource0.getUnsafe(overflowLocation);
-            final Object overflowKey1 = overflowKeySource1.getUnsafe(overflowLocation);
-            final int overflowHash = hash(overflowKey0, overflowKey1);
-            final int overflowTableLocation = hashToTableLocation(tableHashPivot + bucketsToAdd, overflowHash);
-            if (overflowTableLocation == mainInsertLocation) {
-                mainKeySource0.set(mainInsertLocation, overflowKey0);
-                mainKeySource1.set(mainInsertLocation, overflowKey1);
-                mainOutputPosition.set(mainInsertLocation, overflowOutputPosition.getUnsafe(overflowLocation));
-                handler.doPromoteOverflow(overflowLocation, mainInsertLocation);
-                overflowOutputPosition.set(overflowLocation, QueryConstants.NULL_INT);
-                overflowKeySource0.set(overflowLocation, QueryConstants.NULL_LONG);
-                overflowKeySource1.set(overflowLocation, null);
-                freeOverflowLocation(overflowLocation);
-                mainInsertLocation = -1;
-            } else {
-                final int oldOverflowLocation = mainOverflowLocationSource.getUnsafe(overflowTableLocation);
-                mainOverflowLocationSource.set(overflowTableLocation, overflowLocation);
-                overflowOverflowLocationSource.set(overflowLocation, oldOverflowLocation);
-            }
-            overflowLocation = nextOverflowLocation;
-        }
-    }
-
-    private int maybeMoveMainBucket(HashHandler handler, int sourceBucket, int destBucket,
-            int bucketsToAdd) {
-        final long k0 = mainKeySource0.getUnsafe(sourceBucket);
-        final Object k1 = mainKeySource1.getUnsafe(sourceBucket);
-        final int hash = hash(k0, k1);
-        final int location = hashToTableLocation(tableHashPivot + bucketsToAdd, hash);
-        final int mainInsertLocation;
-        if (location == sourceBucket) {
-            mainInsertLocation = destBucket;
-            mainOutputPosition.set(destBucket, EMPTY_OUTPUT_POSITION);
-        } else {
-            mainInsertLocation = sourceBucket;
-            mainOutputPosition.set(destBucket, mainOutputPosition.getUnsafe(sourceBucket));
-            mainOutputPosition.set(sourceBucket, EMPTY_OUTPUT_POSITION);
-            mainKeySource0.set(destBucket, k0);
-            mainKeySource0.set(sourceBucket, QueryConstants.NULL_LONG);
-            mainKeySource1.set(destBucket, k1);
-            mainKeySource1.set(sourceBucket, null);
-            handler.doMoveMain(sourceBucket, destBucket);
-        }
-        return mainInsertLocation;
-    }
-
-    private boolean findOverflow(HashHandler handler, long k0, Object k1, int chunkPosition,
-            int overflowLocation) {
-        while (overflowLocation != QueryConstants.NULL_INT) {
-            if (eq(overflowKeySource0.getUnsafe(overflowLocation), k0) && eq(overflowKeySource1.getUnsafe(overflowLocation), k1)) {
-                handler.doOverflowFound(overflowLocation, chunkPosition);
-                return true;
-            }
-            overflowLocation = overflowOverflowLocationSource.getUnsafe(overflowLocation);
-        }
-        return false;
-    }
-
-    @Override
-    public int findPositionForKey(Object key) {
-        final Object [] ka = (Object[])key;
-        final long k0 = TypeUtils.unbox((Long)ka[0]);
-        final Object k1 = ka[1];
-        int hash = hash(k0, k1);
-        final int tableLocation = hashToTableLocation(tableHashPivot, hash);
-        final int positionValue = mainOutputPosition.getUnsafe(tableLocation);
-        if (positionValue == EMPTY_OUTPUT_POSITION) {
-            return -1;
-        }
-        if (eq(mainKeySource0.getUnsafe(tableLocation), k0) && eq(mainKeySource1.getUnsafe(tableLocation), k1)) {
-            return positionValue;
-        }
-        int overflowLocation = mainOverflowLocationSource.getUnsafe(tableLocation);
-        while (overflowLocation != QueryConstants.NULL_INT) {
-            if (eq(overflowKeySource0.getUnsafe(overflowLocation), k0) && eq(overflowKeySource1.getUnsafe(overflowLocation), k1)) {
-                return overflowOutputPosition.getUnsafe(overflowLocation);
-            }
-            overflowLocation = overflowOverflowLocationSource.getUnsafe(overflowLocation);
-        }
-        return -1;
-    }
-}
diff --git a/engine/table/src/main/java/io/deephaven/engine/table/impl/by/typed/incagg/gen/IncrementalAggHasherLongShort.java b/engine/table/src/main/java/io/deephaven/engine/table/impl/by/typed/incagg/gen/IncrementalAggHasherLongShort.java
deleted file mode 100644
index d5ef400c600..00000000000
--- a/engine/table/src/main/java/io/deephaven/engine/table/impl/by/typed/incagg/gen/IncrementalAggHasherLongShort.java
+++ /dev/null
@@ -1,206 +0,0 @@
-//
-// Copyright (c) 2016-2024 Deephaven Data Labs and Patent Pending
-//
-// ****** AUTO-GENERATED CLASS - DO NOT EDIT MANUALLY
-// ****** Run ReplicateTypedHashers or ./gradlew replicateTypedHashers to regenerate
-//
-// @formatter:off
-package io.deephaven.engine.table.impl.by.typed.incagg.gen;
-
-import static io.deephaven.util.compare.LongComparisons.eq;
-import static io.deephaven.util.compare.ShortComparisons.eq;
-
-import io.deephaven.chunk.Chunk;
-import io.deephaven.chunk.LongChunk;
-import io.deephaven.chunk.ShortChunk;
-import io.deephaven.chunk.attributes.Values;
-import io.deephaven.chunk.util.hashing.LongChunkHasher;
-import io.deephaven.chunk.util.hashing.ShortChunkHasher;
-import io.deephaven.engine.rowset.RowSequence;
-import io.deephaven.engine.table.ColumnSource;
-import io.deephaven.engine.table.impl.by.HashHandler;
-import io.deephaven.engine.table.impl.by.IncrementalChunkedOperatorAggregationStateManagerTypedBase;
-import io.deephaven.engine.table.impl.sources.LongArraySource;
-import io.deephaven.engine.table.impl.sources.ShortArraySource;
-import io.deephaven.util.QueryConstants;
-import io.deephaven.util.type.TypeUtils;
-import java.lang.Long;
-import java.lang.Object;
-import java.lang.Override;
-import java.lang.Short;
-
-final class IncrementalAggHasherLongShort extends IncrementalChunkedOperatorAggregationStateManagerTypedBase {
-    private final LongArraySource mainKeySource0;
-
-    private final LongArraySource overflowKeySource0;
-
-    private final ShortArraySource mainKeySource1;
-
-    private final ShortArraySource overflowKeySource1;
-
-    public IncrementalAggHasherLongShort(ColumnSource[] tableKeySources,
-            ColumnSource[] originalTableKeySources, int tableSize, double maximumLoadFactor,
-            double targetLoadFactor) {
-        super(tableKeySources, tableSize, maximumLoadFactor, targetLoadFactor);
-        this.mainKeySource0 = (LongArraySource) super.mainKeySources[0];
-        this.overflowKeySource0 = (LongArraySource) super.overflowKeySources[0];
-        this.mainKeySource1 = (ShortArraySource) super.mainKeySources[1];
-        this.overflowKeySource1 = (ShortArraySource) super.overflowKeySources[1];
-    }
-
-    @Override
-    protected void build(HashHandler handler, RowSequence rowSequence, Chunk[] sourceKeyChunks) {
-        final LongChunk<Values> keyChunk0 = sourceKeyChunks[0].asLongChunk();
-        final ShortChunk<Values> keyChunk1 = sourceKeyChunks[1].asShortChunk();
-        final int chunkSize = keyChunk0.size();
-        for (int chunkPosition = 0; chunkPosition < chunkSize; ++chunkPosition) {
-            final long k0 = keyChunk0.get(chunkPosition);
-            final short k1 = keyChunk1.get(chunkPosition);
-            final int hash = hash(k0, k1);
-            final int tableLocation = hashToTableLocation(tableHashPivot, hash);
-            if (mainOutputPosition.getUnsafe(tableLocation) == EMPTY_OUTPUT_POSITION) {
-                numEntries++;
-                mainKeySource0.set(tableLocation, k0);
-                mainKeySource1.set(tableLocation, k1);
-                handler.doMainInsert(tableLocation, chunkPosition);
-            } else if (eq(mainKeySource0.getUnsafe(tableLocation), k0) && eq(mainKeySource1.getUnsafe(tableLocation), k1)) {
-                handler.doMainFound(tableLocation, chunkPosition);
-            } else {
-                int overflowLocation = mainOverflowLocationSource.getUnsafe(tableLocation);
-                if (!findOverflow(handler, k0, k1, chunkPosition, overflowLocation)) {
-                    final int newOverflowLocation = allocateOverflowLocation();
-                    overflowKeySource0.set(newOverflowLocation, k0);
-                    overflowKeySource1.set(newOverflowLocation, k1);
-                    mainOverflowLocationSource.set(tableLocation, newOverflowLocation);
-                    overflowOverflowLocationSource.set(newOverflowLocation, overflowLocation);
-                    numEntries++;
-                    handler.doOverflowInsert(newOverflowLocation, chunkPosition);
-                }
-            }
-        }
-    }
-
-    @Override
-    protected void probe(HashHandler handler, RowSequence rowSequence, Chunk[] sourceKeyChunks) {
-        final LongChunk<Values> keyChunk0 = sourceKeyChunks[0].asLongChunk();
-        final ShortChunk<Values> keyChunk1 = sourceKeyChunks[1].asShortChunk();
-        final int chunkSize = keyChunk0.size();
-        for (int chunkPosition = 0; chunkPosition < chunkSize; ++chunkPosition) {
-            final long k0 = keyChunk0.get(chunkPosition);
-            final short k1 = keyChunk1.get(chunkPosition);
-            final int hash = hash(k0, k1);
-            final int tableLocation = hashToTableLocation(tableHashPivot, hash);
-            if (mainOutputPosition.getUnsafe(tableLocation) == EMPTY_OUTPUT_POSITION) {
-                handler.doMissing(chunkPosition);
-            } else if (eq(mainKeySource0.getUnsafe(tableLocation), k0) && eq(mainKeySource1.getUnsafe(tableLocation), k1)) {
-                handler.doMainFound(tableLocation, chunkPosition);
-            } else {
-                int overflowLocation = mainOverflowLocationSource.getUnsafe(tableLocation);
-                if (!findOverflow(handler, k0, k1, chunkPosition, overflowLocation)) {
-                    handler.doMissing(chunkPosition);
-                }
-            }
-        }
-    }
-
-    private static int hash(long k0, short k1) {
-        int hash = LongChunkHasher.hashInitialSingle(k0);
-        hash = ShortChunkHasher.hashUpdateSingle(hash, k1);
-        return hash;
-    }
-
-    @Override
-    protected void rehashBucket(HashHandler handler, int sourceBucket, int destBucket,
-            int bucketsToAdd) {
-        final int position = mainOutputPosition.getUnsafe(sourceBucket);
-        if (position == EMPTY_OUTPUT_POSITION) {
-            return;
-        }
-        int mainInsertLocation = maybeMoveMainBucket(handler, sourceBucket, destBucket, bucketsToAdd);
-        int overflowLocation = mainOverflowLocationSource.getUnsafe(sourceBucket);
-        mainOverflowLocationSource.set(sourceBucket, QueryConstants.NULL_INT);
-        mainOverflowLocationSource.set(destBucket, QueryConstants.NULL_INT);
-        while (overflowLocation != QueryConstants.NULL_INT) {
-            final int nextOverflowLocation = overflowOverflowLocationSource.getUnsafe(overflowLocation);
-            final long overflowKey0 = overflowKeySource0.getUnsafe(overflowLocation);
-            final short overflowKey1 = overflowKeySource1.getUnsafe(overflowLocation);
-            final int overflowHash = hash(overflowKey0, overflowKey1);
-            final int overflowTableLocation = hashToTableLocation(tableHashPivot + bucketsToAdd, overflowHash);
-            if (overflowTableLocation == mainInsertLocation) {
-                mainKeySource0.set(mainInsertLocation, overflowKey0);
-                mainKeySource1.set(mainInsertLocation, overflowKey1);
-                mainOutputPosition.set(mainInsertLocation, overflowOutputPosition.getUnsafe(overflowLocation));
-                handler.doPromoteOverflow(overflowLocation, mainInsertLocation);
-                overflowOutputPosition.set(overflowLocation, QueryConstants.NULL_INT);
-                overflowKeySource0.set(overflowLocation, QueryConstants.NULL_LONG);
-                overflowKeySource1.set(overflowLocation, QueryConstants.NULL_SHORT);
-                freeOverflowLocation(overflowLocation);
-                mainInsertLocation = -1;
-            } else {
-                final int oldOverflowLocation = mainOverflowLocationSource.getUnsafe(overflowTableLocation);
-                mainOverflowLocationSource.set(overflowTableLocation, overflowLocation);
-                overflowOverflowLocationSource.set(overflowLocation, oldOverflowLocation);
-            }
-            overflowLocation = nextOverflowLocation;
-        }
-    }
-
-    private int maybeMoveMainBucket(HashHandler handler, int sourceBucket, int destBucket,
-            int bucketsToAdd) {
-        final long k0 = mainKeySource0.getUnsafe(sourceBucket);
-        final short k1 = mainKeySource1.getUnsafe(sourceBucket);
-        final int hash = hash(k0, k1);
-        final int location = hashToTableLocation(tableHashPivot + bucketsToAdd, hash);
-        final int mainInsertLocation;
-        if (location == sourceBucket) {
-            mainInsertLocation = destBucket;
-            mainOutputPosition.set(destBucket, EMPTY_OUTPUT_POSITION);
-        } else {
-            mainInsertLocation = sourceBucket;
-            mainOutputPosition.set(destBucket, mainOutputPosition.getUnsafe(sourceBucket));
-            mainOutputPosition.set(sourceBucket, EMPTY_OUTPUT_POSITION);
-            mainKeySource0.set(destBucket, k0);
-            mainKeySource0.set(sourceBucket, QueryConstants.NULL_LONG);
-            mainKeySource1.set(destBucket, k1);
-            mainKeySource1.set(sourceBucket, QueryConstants.NULL_SHORT);
-            handler.doMoveMain(sourceBucket, destBucket);
-        }
-        return mainInsertLocation;
-    }
-
-    private boolean findOverflow(HashHandler handler, long k0, short k1, int chunkPosition,
-            int overflowLocation) {
-        while (overflowLocation != QueryConstants.NULL_INT) {
-            if (eq(overflowKeySource0.getUnsafe(overflowLocation), k0) && eq(overflowKeySource1.getUnsafe(overflowLocation), k1)) {
-                handler.doOverflowFound(overflowLocation, chunkPosition);
-                return true;
-            }
-            overflowLocation = overflowOverflowLocationSource.getUnsafe(overflowLocation);
-        }
-        return false;
-    }
-
-    @Override
-    public int findPositionForKey(Object key) {
-        final Object [] ka = (Object[])key;
-        final long k0 = TypeUtils.unbox((Long)ka[0]);
-        final short k1 = TypeUtils.unbox((Short)ka[1]);
-        int hash = hash(k0, k1);
-        final int tableLocation = hashToTableLocation(tableHashPivot, hash);
-        final int positionValue = mainOutputPosition.getUnsafe(tableLocation);
-        if (positionValue == EMPTY_OUTPUT_POSITION) {
-            return -1;
-        }
-        if (eq(mainKeySource0.getUnsafe(tableLocation), k0) && eq(mainKeySource1.getUnsafe(tableLocation), k1)) {
-            return positionValue;
-        }
-        int overflowLocation = mainOverflowLocationSource.getUnsafe(tableLocation);
-        while (overflowLocation != QueryConstants.NULL_INT) {
-            if (eq(overflowKeySource0.getUnsafe(overflowLocation), k0) && eq(overflowKeySource1.getUnsafe(overflowLocation), k1)) {
-                return overflowOutputPosition.getUnsafe(overflowLocation);
-            }
-            overflowLocation = overflowOverflowLocationSource.getUnsafe(overflowLocation);
-        }
-        return -1;
-    }
-}
diff --git a/engine/table/src/main/java/io/deephaven/engine/table/impl/by/typed/incagg/gen/IncrementalAggHasherObject.java b/engine/table/src/main/java/io/deephaven/engine/table/impl/by/typed/incagg/gen/IncrementalAggHasherObject.java
deleted file mode 100644
index fed83e882d3..00000000000
--- a/engine/table/src/main/java/io/deephaven/engine/table/impl/by/typed/incagg/gen/IncrementalAggHasherObject.java
+++ /dev/null
@@ -1,178 +0,0 @@
-//
-// Copyright (c) 2016-2024 Deephaven Data Labs and Patent Pending
-//
-// ****** AUTO-GENERATED CLASS - DO NOT EDIT MANUALLY
-// ****** Run ReplicateTypedHashers or ./gradlew replicateTypedHashers to regenerate
-//
-// @formatter:off
-package io.deephaven.engine.table.impl.by.typed.incagg.gen;
-
-import static io.deephaven.util.compare.ObjectComparisons.eq;
-
-import io.deephaven.chunk.Chunk;
-import io.deephaven.chunk.ObjectChunk;
-import io.deephaven.chunk.attributes.Values;
-import io.deephaven.chunk.util.hashing.ObjectChunkHasher;
-import io.deephaven.engine.rowset.RowSequence;
-import io.deephaven.engine.table.ColumnSource;
-import io.deephaven.engine.table.impl.by.HashHandler;
-import io.deephaven.engine.table.impl.by.IncrementalChunkedOperatorAggregationStateManagerTypedBase;
-import io.deephaven.engine.table.impl.sources.ObjectArraySource;
-import io.deephaven.util.QueryConstants;
-import java.lang.Object;
-import java.lang.Override;
-
-final class IncrementalAggHasherObject extends IncrementalChunkedOperatorAggregationStateManagerTypedBase {
-    private final ObjectArraySource mainKeySource0;
-
-    private final ObjectArraySource overflowKeySource0;
-
-    public IncrementalAggHasherObject(ColumnSource[] tableKeySources,
-            ColumnSource[] originalTableKeySources, int tableSize, double maximumLoadFactor,
-            double targetLoadFactor) {
-        super(tableKeySources, tableSize, maximumLoadFactor, targetLoadFactor);
-        this.mainKeySource0 = (ObjectArraySource) super.mainKeySources[0];
-        this.overflowKeySource0 = (ObjectArraySource) super.overflowKeySources[0];
-    }
-
-    @Override
-    protected void build(HashHandler handler, RowSequence rowSequence, Chunk[] sourceKeyChunks) {
-        final ObjectChunk<Object, Values> keyChunk0 = sourceKeyChunks[0].asObjectChunk();
-        final int chunkSize = keyChunk0.size();
-        for (int chunkPosition = 0; chunkPosition < chunkSize; ++chunkPosition) {
-            final Object k0 = keyChunk0.get(chunkPosition);
-            final int hash = hash(k0);
-            final int tableLocation = hashToTableLocation(tableHashPivot, hash);
-            if (mainOutputPosition.getUnsafe(tableLocation) == EMPTY_OUTPUT_POSITION) {
-                numEntries++;
-                mainKeySource0.set(tableLocation, k0);
-                handler.doMainInsert(tableLocation, chunkPosition);
-            } else if (eq(mainKeySource0.getUnsafe(tableLocation), k0)) {
-                handler.doMainFound(tableLocation, chunkPosition);
-            } else {
-                int overflowLocation = mainOverflowLocationSource.getUnsafe(tableLocation);
-                if (!findOverflow(handler, k0, chunkPosition, overflowLocation)) {
-                    final int newOverflowLocation = allocateOverflowLocation();
-                    overflowKeySource0.set(newOverflowLocation, k0);
-                    mainOverflowLocationSource.set(tableLocation, newOverflowLocation);
-                    overflowOverflowLocationSource.set(newOverflowLocation, overflowLocation);
-                    numEntries++;
-                    handler.doOverflowInsert(newOverflowLocation, chunkPosition);
-                }
-            }
-        }
-    }
-
-    @Override
-    protected void probe(HashHandler handler, RowSequence rowSequence, Chunk[] sourceKeyChunks) {
-        final ObjectChunk<Object, Values> keyChunk0 = sourceKeyChunks[0].asObjectChunk();
-        final int chunkSize = keyChunk0.size();
-        for (int chunkPosition = 0; chunkPosition < chunkSize; ++chunkPosition) {
-            final Object k0 = keyChunk0.get(chunkPosition);
-            final int hash = hash(k0);
-            final int tableLocation = hashToTableLocation(tableHashPivot, hash);
-            if (mainOutputPosition.getUnsafe(tableLocation) == EMPTY_OUTPUT_POSITION) {
-                handler.doMissing(chunkPosition);
-            } else if (eq(mainKeySource0.getUnsafe(tableLocation), k0)) {
-                handler.doMainFound(tableLocation, chunkPosition);
-            } else {
-                int overflowLocation = mainOverflowLocationSource.getUnsafe(tableLocation);
-                if (!findOverflow(handler, k0, chunkPosition, overflowLocation)) {
-                    handler.doMissing(chunkPosition);
-                }
-            }
-        }
-    }
-
-    private static int hash(Object k0) {
-        int hash = ObjectChunkHasher.hashInitialSingle(k0);
-        return hash;
-    }
-
-    @Override
-    protected void rehashBucket(HashHandler handler, int sourceBucket, int destBucket,
-            int bucketsToAdd) {
-        final int position = mainOutputPosition.getUnsafe(sourceBucket);
-        if (position == EMPTY_OUTPUT_POSITION) {
-            return;
-        }
-        int mainInsertLocation = maybeMoveMainBucket(handler, sourceBucket, destBucket, bucketsToAdd);
-        int overflowLocation = mainOverflowLocationSource.getUnsafe(sourceBucket);
-        mainOverflowLocationSource.set(sourceBucket, QueryConstants.NULL_INT);
-        mainOverflowLocationSource.set(destBucket, QueryConstants.NULL_INT);
-        while (overflowLocation != QueryConstants.NULL_INT) {
-            final int nextOverflowLocation = overflowOverflowLocationSource.getUnsafe(overflowLocation);
-            final Object overflowKey0 = overflowKeySource0.getUnsafe(overflowLocation);
-            final int overflowHash = hash(overflowKey0);
-            final int overflowTableLocation = hashToTableLocation(tableHashPivot + bucketsToAdd, overflowHash);
-            if (overflowTableLocation == mainInsertLocation) {
-                mainKeySource0.set(mainInsertLocation, overflowKey0);
-                mainOutputPosition.set(mainInsertLocation, overflowOutputPosition.getUnsafe(overflowLocation));
-                handler.doPromoteOverflow(overflowLocation, mainInsertLocation);
-                overflowOutputPosition.set(overflowLocation, QueryConstants.NULL_INT);
-                overflowKeySource0.set(overflowLocation, null);
-                freeOverflowLocation(overflowLocation);
-                mainInsertLocation = -1;
-            } else {
-                final int oldOverflowLocation = mainOverflowLocationSource.getUnsafe(overflowTableLocation);
-                mainOverflowLocationSource.set(overflowTableLocation, overflowLocation);
-                overflowOverflowLocationSource.set(overflowLocation, oldOverflowLocation);
-            }
-            overflowLocation = nextOverflowLocation;
-        }
-    }
-
-    private int maybeMoveMainBucket(HashHandler handler, int sourceBucket, int destBucket,
-            int bucketsToAdd) {
-        final Object k0 = mainKeySource0.getUnsafe(sourceBucket);
-        final int hash = hash(k0);
-        final int location = hashToTableLocation(tableHashPivot + bucketsToAdd, hash);
-        final int mainInsertLocation;
-        if (location == sourceBucket) {
-            mainInsertLocation = destBucket;
-            mainOutputPosition.set(destBucket, EMPTY_OUTPUT_POSITION);
-        } else {
-            mainInsertLocation = sourceBucket;
-            mainOutputPosition.set(destBucket, mainOutputPosition.getUnsafe(sourceBucket));
-            mainOutputPosition.set(sourceBucket, EMPTY_OUTPUT_POSITION);
-            mainKeySource0.set(destBucket, k0);
-            mainKeySource0.set(sourceBucket, null);
-            handler.doMoveMain(sourceBucket, destBucket);
-        }
-        return mainInsertLocation;
-    }
-
-    private boolean findOverflow(HashHandler handler, Object k0, int chunkPosition,
-            int overflowLocation) {
-        while (overflowLocation != QueryConstants.NULL_INT) {
-            if (eq(overflowKeySource0.getUnsafe(overflowLocation), k0)) {
-                handler.doOverflowFound(overflowLocation, chunkPosition);
-                return true;
-            }
-            overflowLocation = overflowOverflowLocationSource.getUnsafe(overflowLocation);
-        }
-        return false;
-    }
-
-    @Override
-    public int findPositionForKey(Object key) {
-        final Object k0 = key;
-        int hash = hash(k0);
-        final int tableLocation = hashToTableLocation(tableHashPivot, hash);
-        final int positionValue = mainOutputPosition.getUnsafe(tableLocation);
-        if (positionValue == EMPTY_OUTPUT_POSITION) {
-            return -1;
-        }
-        if (eq(mainKeySource0.getUnsafe(tableLocation), k0)) {
-            return positionValue;
-        }
-        int overflowLocation = mainOverflowLocationSource.getUnsafe(tableLocation);
-        while (overflowLocation != QueryConstants.NULL_INT) {
-            if (eq(overflowKeySource0.getUnsafe(overflowLocation), k0)) {
-                return overflowOutputPosition.getUnsafe(overflowLocation);
-            }
-            overflowLocation = overflowOverflowLocationSource.getUnsafe(overflowLocation);
-        }
-        return -1;
-    }
-}
diff --git a/engine/table/src/main/java/io/deephaven/engine/table/impl/by/typed/incagg/gen/IncrementalAggHasherObjectByte.java b/engine/table/src/main/java/io/deephaven/engine/table/impl/by/typed/incagg/gen/IncrementalAggHasherObjectByte.java
deleted file mode 100644
index a4024744a6e..00000000000
--- a/engine/table/src/main/java/io/deephaven/engine/table/impl/by/typed/incagg/gen/IncrementalAggHasherObjectByte.java
+++ /dev/null
@@ -1,205 +0,0 @@
-//
-// Copyright (c) 2016-2024 Deephaven Data Labs and Patent Pending
-//
-// ****** AUTO-GENERATED CLASS - DO NOT EDIT MANUALLY
-// ****** Run ReplicateTypedHashers or ./gradlew replicateTypedHashers to regenerate
-//
-// @formatter:off
-package io.deephaven.engine.table.impl.by.typed.incagg.gen;
-
-import static io.deephaven.util.compare.ByteComparisons.eq;
-import static io.deephaven.util.compare.ObjectComparisons.eq;
-
-import io.deephaven.chunk.ByteChunk;
-import io.deephaven.chunk.Chunk;
-import io.deephaven.chunk.ObjectChunk;
-import io.deephaven.chunk.attributes.Values;
-import io.deephaven.chunk.util.hashing.ByteChunkHasher;
-import io.deephaven.chunk.util.hashing.ObjectChunkHasher;
-import io.deephaven.engine.rowset.RowSequence;
-import io.deephaven.engine.table.ColumnSource;
-import io.deephaven.engine.table.impl.by.HashHandler;
-import io.deephaven.engine.table.impl.by.IncrementalChunkedOperatorAggregationStateManagerTypedBase;
-import io.deephaven.engine.table.impl.sources.ByteArraySource;
-import io.deephaven.engine.table.impl.sources.ObjectArraySource;
-import io.deephaven.util.QueryConstants;
-import io.deephaven.util.type.TypeUtils;
-import java.lang.Byte;
-import java.lang.Object;
-import java.lang.Override;
-
-final class IncrementalAggHasherObjectByte extends IncrementalChunkedOperatorAggregationStateManagerTypedBase {
-    private final ObjectArraySource mainKeySource0;
-
-    private final ObjectArraySource overflowKeySource0;
-
-    private final ByteArraySource mainKeySource1;
-
-    private final ByteArraySource overflowKeySource1;
-
-    public IncrementalAggHasherObjectByte(ColumnSource[] tableKeySources,
-            ColumnSource[] originalTableKeySources, int tableSize, double maximumLoadFactor,
-            double targetLoadFactor) {
-        super(tableKeySources, tableSize, maximumLoadFactor, targetLoadFactor);
-        this.mainKeySource0 = (ObjectArraySource) super.mainKeySources[0];
-        this.overflowKeySource0 = (ObjectArraySource) super.overflowKeySources[0];
-        this.mainKeySource1 = (ByteArraySource) super.mainKeySources[1];
-        this.overflowKeySource1 = (ByteArraySource) super.overflowKeySources[1];
-    }
-
-    @Override
-    protected void build(HashHandler handler, RowSequence rowSequence, Chunk[] sourceKeyChunks) {
-        final ObjectChunk<Object, Values> keyChunk0 = sourceKeyChunks[0].asObjectChunk();
-        final ByteChunk<Values> keyChunk1 = sourceKeyChunks[1].asByteChunk();
-        final int chunkSize = keyChunk0.size();
-        for (int chunkPosition = 0; chunkPosition < chunkSize; ++chunkPosition) {
-            final Object k0 = keyChunk0.get(chunkPosition);
-            final byte k1 = keyChunk1.get(chunkPosition);
-            final int hash = hash(k0, k1);
-            final int tableLocation = hashToTableLocation(tableHashPivot, hash);
-            if (mainOutputPosition.getUnsafe(tableLocation) == EMPTY_OUTPUT_POSITION) {
-                numEntries++;
-                mainKeySource0.set(tableLocation, k0);
-                mainKeySource1.set(tableLocation, k1);
-                handler.doMainInsert(tableLocation, chunkPosition);
-            } else if (eq(mainKeySource0.getUnsafe(tableLocation), k0) && eq(mainKeySource1.getUnsafe(tableLocation), k1)) {
-                handler.doMainFound(tableLocation, chunkPosition);
-            } else {
-                int overflowLocation = mainOverflowLocationSource.getUnsafe(tableLocation);
-                if (!findOverflow(handler, k0, k1, chunkPosition, overflowLocation)) {
-                    final int newOverflowLocation = allocateOverflowLocation();
-                    overflowKeySource0.set(newOverflowLocation, k0);
-                    overflowKeySource1.set(newOverflowLocation, k1);
-                    mainOverflowLocationSource.set(tableLocation, newOverflowLocation);
-                    overflowOverflowLocationSource.set(newOverflowLocation, overflowLocation);
-                    numEntries++;
-                    handler.doOverflowInsert(newOverflowLocation, chunkPosition);
-                }
-            }
-        }
-    }
-
-    @Override
-    protected void probe(HashHandler handler, RowSequence rowSequence, Chunk[] sourceKeyChunks) {
-        final ObjectChunk<Object, Values> keyChunk0 = sourceKeyChunks[0].asObjectChunk();
-        final ByteChunk<Values> keyChunk1 = sourceKeyChunks[1].asByteChunk();
-        final int chunkSize = keyChunk0.size();
-        for (int chunkPosition = 0; chunkPosition < chunkSize; ++chunkPosition) {
-            final Object k0 = keyChunk0.get(chunkPosition);
-            final byte k1 = keyChunk1.get(chunkPosition);
-            final int hash = hash(k0, k1);
-            final int tableLocation = hashToTableLocation(tableHashPivot, hash);
-            if (mainOutputPosition.getUnsafe(tableLocation) == EMPTY_OUTPUT_POSITION) {
-                handler.doMissing(chunkPosition);
-            } else if (eq(mainKeySource0.getUnsafe(tableLocation), k0) && eq(mainKeySource1.getUnsafe(tableLocation), k1)) {
-                handler.doMainFound(tableLocation, chunkPosition);
-            } else {
-                int overflowLocation = mainOverflowLocationSource.getUnsafe(tableLocation);
-                if (!findOverflow(handler, k0, k1, chunkPosition, overflowLocation)) {
-                    handler.doMissing(chunkPosition);
-                }
-            }
-        }
-    }
-
-    private static int hash(Object k0, byte k1) {
-        int hash = ObjectChunkHasher.hashInitialSingle(k0);
-        hash = ByteChunkHasher.hashUpdateSingle(hash, k1);
-        return hash;
-    }
-
-    @Override
-    protected void rehashBucket(HashHandler handler, int sourceBucket, int destBucket,
-            int bucketsToAdd) {
-        final int position = mainOutputPosition.getUnsafe(sourceBucket);
-        if (position == EMPTY_OUTPUT_POSITION) {
-            return;
-        }
-        int mainInsertLocation = maybeMoveMainBucket(handler, sourceBucket, destBucket, bucketsToAdd);
-        int overflowLocation = mainOverflowLocationSource.getUnsafe(sourceBucket);
-        mainOverflowLocationSource.set(sourceBucket, QueryConstants.NULL_INT);
-        mainOverflowLocationSource.set(destBucket, QueryConstants.NULL_INT);
-        while (overflowLocation != QueryConstants.NULL_INT) {
-            final int nextOverflowLocation = overflowOverflowLocationSource.getUnsafe(overflowLocation);
-            final Object overflowKey0 = overflowKeySource0.getUnsafe(overflowLocation);
-            final byte overflowKey1 = overflowKeySource1.getUnsafe(overflowLocation);
-            final int overflowHash = hash(overflowKey0, overflowKey1);
-            final int overflowTableLocation = hashToTableLocation(tableHashPivot + bucketsToAdd, overflowHash);
-            if (overflowTableLocation == mainInsertLocation) {
-                mainKeySource0.set(mainInsertLocation, overflowKey0);
-                mainKeySource1.set(mainInsertLocation, overflowKey1);
-                mainOutputPosition.set(mainInsertLocation, overflowOutputPosition.getUnsafe(overflowLocation));
-                handler.doPromoteOverflow(overflowLocation, mainInsertLocation);
-                overflowOutputPosition.set(overflowLocation, QueryConstants.NULL_INT);
-                overflowKeySource0.set(overflowLocation, null);
-                overflowKeySource1.set(overflowLocation, QueryConstants.NULL_BYTE);
-                freeOverflowLocation(overflowLocation);
-                mainInsertLocation = -1;
-            } else {
-                final int oldOverflowLocation = mainOverflowLocationSource.getUnsafe(overflowTableLocation);
-                mainOverflowLocationSource.set(overflowTableLocation, overflowLocation);
-                overflowOverflowLocationSource.set(overflowLocation, oldOverflowLocation);
-            }
-            overflowLocation = nextOverflowLocation;
-        }
-    }
-
-    private int maybeMoveMainBucket(HashHandler handler, int sourceBucket, int destBucket,
-            int bucketsToAdd) {
-        final Object k0 = mainKeySource0.getUnsafe(sourceBucket);
-        final byte k1 = mainKeySource1.getUnsafe(sourceBucket);
-        final int hash = hash(k0, k1);
-        final int location = hashToTableLocation(tableHashPivot + bucketsToAdd, hash);
-        final int mainInsertLocation;
-        if (location == sourceBucket) {
-            mainInsertLocation = destBucket;
-            mainOutputPosition.set(destBucket, EMPTY_OUTPUT_POSITION);
-        } else {
-            mainInsertLocation = sourceBucket;
-            mainOutputPosition.set(destBucket, mainOutputPosition.getUnsafe(sourceBucket));
-            mainOutputPosition.set(sourceBucket, EMPTY_OUTPUT_POSITION);
-            mainKeySource0.set(destBucket, k0);
-            mainKeySource0.set(sourceBucket, null);
-            mainKeySource1.set(destBucket, k1);
-            mainKeySource1.set(sourceBucket, QueryConstants.NULL_BYTE);
-            handler.doMoveMain(sourceBucket, destBucket);
-        }
-        return mainInsertLocation;
-    }
-
-    private boolean findOverflow(HashHandler handler, Object k0, byte k1, int chunkPosition,
-            int overflowLocation) {
-        while (overflowLocation != QueryConstants.NULL_INT) {
-            if (eq(overflowKeySource0.getUnsafe(overflowLocation), k0) && eq(overflowKeySource1.getUnsafe(overflowLocation), k1)) {
-                handler.doOverflowFound(overflowLocation, chunkPosition);
-                return true;
-            }
-            overflowLocation = overflowOverflowLocationSource.getUnsafe(overflowLocation);
-        }
-        return false;
-    }
-
-    @Override
-    public int findPositionForKey(Object key) {
-        final Object [] ka = (Object[])key;
-        final Object k0 = ka[0];
-        final byte k1 = TypeUtils.unbox((Byte)ka[1]);
-        int hash = hash(k0, k1);
-        final int tableLocation = hashToTableLocation(tableHashPivot, hash);
-        final int positionValue = mainOutputPosition.getUnsafe(tableLocation);
-        if (positionValue == EMPTY_OUTPUT_POSITION) {
-            return -1;
-        }
-        if (eq(mainKeySource0.getUnsafe(tableLocation), k0) && eq(mainKeySource1.getUnsafe(tableLocation), k1)) {
-            return positionValue;
-        }
-        int overflowLocation = mainOverflowLocationSource.getUnsafe(tableLocation);
-        while (overflowLocation != QueryConstants.NULL_INT) {
-            if (eq(overflowKeySource0.getUnsafe(overflowLocation), k0) && eq(overflowKeySource1.getUnsafe(overflowLocation), k1)) {
-                return overflowOutputPosition.getUnsafe(overflowLocation);
-            }
-            overflowLocation = overflowOverflowLocationSource.getUnsafe(overflowLocation);
-        }
-        return -1;
-    }
-}
diff --git a/engine/table/src/main/java/io/deephaven/engine/table/impl/by/typed/incagg/gen/IncrementalAggHasherObjectChar.java b/engine/table/src/main/java/io/deephaven/engine/table/impl/by/typed/incagg/gen/IncrementalAggHasherObjectChar.java
deleted file mode 100644
index 43a4a4bedaa..00000000000
--- a/engine/table/src/main/java/io/deephaven/engine/table/impl/by/typed/incagg/gen/IncrementalAggHasherObjectChar.java
+++ /dev/null
@@ -1,205 +0,0 @@
-//
-// Copyright (c) 2016-2024 Deephaven Data Labs and Patent Pending
-//
-// ****** AUTO-GENERATED CLASS - DO NOT EDIT MANUALLY
-// ****** Run ReplicateTypedHashers or ./gradlew replicateTypedHashers to regenerate
-//
-// @formatter:off
-package io.deephaven.engine.table.impl.by.typed.incagg.gen;
-
-import static io.deephaven.util.compare.CharComparisons.eq;
-import static io.deephaven.util.compare.ObjectComparisons.eq;
-
-import io.deephaven.chunk.CharChunk;
-import io.deephaven.chunk.Chunk;
-import io.deephaven.chunk.ObjectChunk;
-import io.deephaven.chunk.attributes.Values;
-import io.deephaven.chunk.util.hashing.CharChunkHasher;
-import io.deephaven.chunk.util.hashing.ObjectChunkHasher;
-import io.deephaven.engine.rowset.RowSequence;
-import io.deephaven.engine.table.ColumnSource;
-import io.deephaven.engine.table.impl.by.HashHandler;
-import io.deephaven.engine.table.impl.by.IncrementalChunkedOperatorAggregationStateManagerTypedBase;
-import io.deephaven.engine.table.impl.sources.CharacterArraySource;
-import io.deephaven.engine.table.impl.sources.ObjectArraySource;
-import io.deephaven.util.QueryConstants;
-import io.deephaven.util.type.TypeUtils;
-import java.lang.Character;
-import java.lang.Object;
-import java.lang.Override;
-
-final class IncrementalAggHasherObjectChar extends IncrementalChunkedOperatorAggregationStateManagerTypedBase {
-    private final ObjectArraySource mainKeySource0;
-
-    private final ObjectArraySource overflowKeySource0;
-
-    private final CharacterArraySource mainKeySource1;
-
-    private final CharacterArraySource overflowKeySource1;
-
-    public IncrementalAggHasherObjectChar(ColumnSource[] tableKeySources,
-            ColumnSource[] originalTableKeySources, int tableSize, double maximumLoadFactor,
-            double targetLoadFactor) {
-        super(tableKeySources, tableSize, maximumLoadFactor, targetLoadFactor);
-        this.mainKeySource0 = (ObjectArraySource) super.mainKeySources[0];
-        this.overflowKeySource0 = (ObjectArraySource) super.overflowKeySources[0];
-        this.mainKeySource1 = (CharacterArraySource) super.mainKeySources[1];
-        this.overflowKeySource1 = (CharacterArraySource) super.overflowKeySources[1];
-    }
-
-    @Override
-    protected void build(HashHandler handler, RowSequence rowSequence, Chunk[] sourceKeyChunks) {
-        final ObjectChunk<Object, Values> keyChunk0 = sourceKeyChunks[0].asObjectChunk();
-        final CharChunk<Values> keyChunk1 = sourceKeyChunks[1].asCharChunk();
-        final int chunkSize = keyChunk0.size();
-        for (int chunkPosition = 0; chunkPosition < chunkSize; ++chunkPosition) {
-            final Object k0 = keyChunk0.get(chunkPosition);
-            final char k1 = keyChunk1.get(chunkPosition);
-            final int hash = hash(k0, k1);
-            final int tableLocation = hashToTableLocation(tableHashPivot, hash);
-            if (mainOutputPosition.getUnsafe(tableLocation) == EMPTY_OUTPUT_POSITION) {
-                numEntries++;
-                mainKeySource0.set(tableLocation, k0);
-                mainKeySource1.set(tableLocation, k1);
-                handler.doMainInsert(tableLocation, chunkPosition);
-            } else if (eq(mainKeySource0.getUnsafe(tableLocation), k0) && eq(mainKeySource1.getUnsafe(tableLocation), k1)) {
-                handler.doMainFound(tableLocation, chunkPosition);
-            } else {
-                int overflowLocation = mainOverflowLocationSource.getUnsafe(tableLocation);
-                if (!findOverflow(handler, k0, k1, chunkPosition, overflowLocation)) {
-                    final int newOverflowLocation = allocateOverflowLocation();
-                    overflowKeySource0.set(newOverflowLocation, k0);
-                    overflowKeySource1.set(newOverflowLocation, k1);
-                    mainOverflowLocationSource.set(tableLocation, newOverflowLocation);
-                    overflowOverflowLocationSource.set(newOverflowLocation, overflowLocation);
-                    numEntries++;
-                    handler.doOverflowInsert(newOverflowLocation, chunkPosition);
-                }
-            }
-        }
-    }
-
-    @Override
-    protected void probe(HashHandler handler, RowSequence rowSequence, Chunk[] sourceKeyChunks) {
-        final ObjectChunk<Object, Values> keyChunk0 = sourceKeyChunks[0].asObjectChunk();
-        final CharChunk<Values> keyChunk1 = sourceKeyChunks[1].asCharChunk();
-        final int chunkSize = keyChunk0.size();
-        for (int chunkPosition = 0; chunkPosition < chunkSize; ++chunkPosition) {
-            final Object k0 = keyChunk0.get(chunkPosition);
-            final char k1 = keyChunk1.get(chunkPosition);
-            final int hash = hash(k0, k1);
-            final int tableLocation = hashToTableLocation(tableHashPivot, hash);
-            if (mainOutputPosition.getUnsafe(tableLocation) == EMPTY_OUTPUT_POSITION) {
-                handler.doMissing(chunkPosition);
-            } else if (eq(mainKeySource0.getUnsafe(tableLocation), k0) && eq(mainKeySource1.getUnsafe(tableLocation), k1)) {
-                handler.doMainFound(tableLocation, chunkPosition);
-            } else {
-                int overflowLocation = mainOverflowLocationSource.getUnsafe(tableLocation);
-                if (!findOverflow(handler, k0, k1, chunkPosition, overflowLocation)) {
-                    handler.doMissing(chunkPosition);
-                }
-            }
-        }
-    }
-
-    private static int hash(Object k0, char k1) {
-        int hash = ObjectChunkHasher.hashInitialSingle(k0);
-        hash = CharChunkHasher.hashUpdateSingle(hash, k1);
-        return hash;
-    }
-
-    @Override
-    protected void rehashBucket(HashHandler handler, int sourceBucket, int destBucket,
-            int bucketsToAdd) {
-        final int position = mainOutputPosition.getUnsafe(sourceBucket);
-        if (position == EMPTY_OUTPUT_POSITION) {
-            return;
-        }
-        int mainInsertLocation = maybeMoveMainBucket(handler, sourceBucket, destBucket, bucketsToAdd);
-        int overflowLocation = mainOverflowLocationSource.getUnsafe(sourceBucket);
-        mainOverflowLocationSource.set(sourceBucket, QueryConstants.NULL_INT);
-        mainOverflowLocationSource.set(destBucket, QueryConstants.NULL_INT);
-        while (overflowLocation != QueryConstants.NULL_INT) {
-            final int nextOverflowLocation = overflowOverflowLocationSource.getUnsafe(overflowLocation);
-            final Object overflowKey0 = overflowKeySource0.getUnsafe(overflowLocation);
-            final char overflowKey1 = overflowKeySource1.getUnsafe(overflowLocation);
-            final int overflowHash = hash(overflowKey0, overflowKey1);
-            final int overflowTableLocation = hashToTableLocation(tableHashPivot + bucketsToAdd, overflowHash);
-            if (overflowTableLocation == mainInsertLocation) {
-                mainKeySource0.set(mainInsertLocation, overflowKey0);
-                mainKeySource1.set(mainInsertLocation, overflowKey1);
-                mainOutputPosition.set(mainInsertLocation, overflowOutputPosition.getUnsafe(overflowLocation));
-                handler.doPromoteOverflow(overflowLocation, mainInsertLocation);
-                overflowOutputPosition.set(overflowLocation, QueryConstants.NULL_INT);
-                overflowKeySource0.set(overflowLocation, null);
-                overflowKeySource1.set(overflowLocation, QueryConstants.NULL_CHAR);
-                freeOverflowLocation(overflowLocation);
-                mainInsertLocation = -1;
-            } else {
-                final int oldOverflowLocation = mainOverflowLocationSource.getUnsafe(overflowTableLocation);
-                mainOverflowLocationSource.set(overflowTableLocation, overflowLocation);
-                overflowOverflowLocationSource.set(overflowLocation, oldOverflowLocation);
-            }
-            overflowLocation = nextOverflowLocation;
-        }
-    }
-
-    private int maybeMoveMainBucket(HashHandler handler, int sourceBucket, int destBucket,
-            int bucketsToAdd) {
-        final Object k0 = mainKeySource0.getUnsafe(sourceBucket);
-        final char k1 = mainKeySource1.getUnsafe(sourceBucket);
-        final int hash = hash(k0, k1);
-        final int location = hashToTableLocation(tableHashPivot + bucketsToAdd, hash);
-        final int mainInsertLocation;
-        if (location == sourceBucket) {
-            mainInsertLocation = destBucket;
-            mainOutputPosition.set(destBucket, EMPTY_OUTPUT_POSITION);
-        } else {
-            mainInsertLocation = sourceBucket;
-            mainOutputPosition.set(destBucket, mainOutputPosition.getUnsafe(sourceBucket));
-            mainOutputPosition.set(sourceBucket, EMPTY_OUTPUT_POSITION);
-            mainKeySource0.set(destBucket, k0);
-            mainKeySource0.set(sourceBucket, null);
-            mainKeySource1.set(destBucket, k1);
-            mainKeySource1.set(sourceBucket, QueryConstants.NULL_CHAR);
-            handler.doMoveMain(sourceBucket, destBucket);
-        }
-        return mainInsertLocation;
-    }
-
-    private boolean findOverflow(HashHandler handler, Object k0, char k1, int chunkPosition,
-            int overflowLocation) {
-        while (overflowLocation != QueryConstants.NULL_INT) {
-            if (eq(overflowKeySource0.getUnsafe(overflowLocation), k0) && eq(overflowKeySource1.getUnsafe(overflowLocation), k1)) {
-                handler.doOverflowFound(overflowLocation, chunkPosition);
-                return true;
-            }
-            overflowLocation = overflowOverflowLocationSource.getUnsafe(overflowLocation);
-        }
-        return false;
-    }
-
-    @Override
-    public int findPositionForKey(Object key) {
-        final Object [] ka = (Object[])key;
-        final Object k0 = ka[0];
-        final char k1 = TypeUtils.unbox((Character)ka[1]);
-        int hash = hash(k0, k1);
-        final int tableLocation = hashToTableLocation(tableHashPivot, hash);
-        final int positionValue = mainOutputPosition.getUnsafe(tableLocation);
-        if (positionValue == EMPTY_OUTPUT_POSITION) {
-            return -1;
-        }
-        if (eq(mainKeySource0.getUnsafe(tableLocation), k0) && eq(mainKeySource1.getUnsafe(tableLocation), k1)) {
-            return positionValue;
-        }
-        int overflowLocation = mainOverflowLocationSource.getUnsafe(tableLocation);
-        while (overflowLocation != QueryConstants.NULL_INT) {
-            if (eq(overflowKeySource0.getUnsafe(overflowLocation), k0) && eq(overflowKeySource1.getUnsafe(overflowLocation), k1)) {
-                return overflowOutputPosition.getUnsafe(overflowLocation);
-            }
-            overflowLocation = overflowOverflowLocationSource.getUnsafe(overflowLocation);
-        }
-        return -1;
-    }
-}
diff --git a/engine/table/src/main/java/io/deephaven/engine/table/impl/by/typed/incagg/gen/IncrementalAggHasherObjectDouble.java b/engine/table/src/main/java/io/deephaven/engine/table/impl/by/typed/incagg/gen/IncrementalAggHasherObjectDouble.java
deleted file mode 100644
index 81dbe34af5d..00000000000
--- a/engine/table/src/main/java/io/deephaven/engine/table/impl/by/typed/incagg/gen/IncrementalAggHasherObjectDouble.java
+++ /dev/null
@@ -1,205 +0,0 @@
-//
-// Copyright (c) 2016-2024 Deephaven Data Labs and Patent Pending
-//
-// ****** AUTO-GENERATED CLASS - DO NOT EDIT MANUALLY
-// ****** Run ReplicateTypedHashers or ./gradlew replicateTypedHashers to regenerate
-//
-// @formatter:off
-package io.deephaven.engine.table.impl.by.typed.incagg.gen;
-
-import static io.deephaven.util.compare.DoubleComparisons.eq;
-import static io.deephaven.util.compare.ObjectComparisons.eq;
-
-import io.deephaven.chunk.Chunk;
-import io.deephaven.chunk.DoubleChunk;
-import io.deephaven.chunk.ObjectChunk;
-import io.deephaven.chunk.attributes.Values;
-import io.deephaven.chunk.util.hashing.DoubleChunkHasher;
-import io.deephaven.chunk.util.hashing.ObjectChunkHasher;
-import io.deephaven.engine.rowset.RowSequence;
-import io.deephaven.engine.table.ColumnSource;
-import io.deephaven.engine.table.impl.by.HashHandler;
-import io.deephaven.engine.table.impl.by.IncrementalChunkedOperatorAggregationStateManagerTypedBase;
-import io.deephaven.engine.table.impl.sources.DoubleArraySource;
-import io.deephaven.engine.table.impl.sources.ObjectArraySource;
-import io.deephaven.util.QueryConstants;
-import io.deephaven.util.type.TypeUtils;
-import java.lang.Double;
-import java.lang.Object;
-import java.lang.Override;
-
-final class IncrementalAggHasherObjectDouble extends IncrementalChunkedOperatorAggregationStateManagerTypedBase {
-    private final ObjectArraySource mainKeySource0;
-
-    private final ObjectArraySource overflowKeySource0;
-
-    private final DoubleArraySource mainKeySource1;
-
-    private final DoubleArraySource overflowKeySource1;
-
-    public IncrementalAggHasherObjectDouble(ColumnSource[] tableKeySources,
-            ColumnSource[] originalTableKeySources, int tableSize, double maximumLoadFactor,
-            double targetLoadFactor) {
-        super(tableKeySources, tableSize, maximumLoadFactor, targetLoadFactor);
-        this.mainKeySource0 = (ObjectArraySource) super.mainKeySources[0];
-        this.overflowKeySource0 = (ObjectArraySource) super.overflowKeySources[0];
-        this.mainKeySource1 = (DoubleArraySource) super.mainKeySources[1];
-        this.overflowKeySource1 = (DoubleArraySource) super.overflowKeySources[1];
-    }
-
-    @Override
-    protected void build(HashHandler handler, RowSequence rowSequence, Chunk[] sourceKeyChunks) {
-        final ObjectChunk<Object, Values> keyChunk0 = sourceKeyChunks[0].asObjectChunk();
-        final DoubleChunk<Values> keyChunk1 = sourceKeyChunks[1].asDoubleChunk();
-        final int chunkSize = keyChunk0.size();
-        for (int chunkPosition = 0; chunkPosition < chunkSize; ++chunkPosition) {
-            final Object k0 = keyChunk0.get(chunkPosition);
-            final double k1 = keyChunk1.get(chunkPosition);
-            final int hash = hash(k0, k1);
-            final int tableLocation = hashToTableLocation(tableHashPivot, hash);
-            if (mainOutputPosition.getUnsafe(tableLocation) == EMPTY_OUTPUT_POSITION) {
-                numEntries++;
-                mainKeySource0.set(tableLocation, k0);
-                mainKeySource1.set(tableLocation, k1);
-                handler.doMainInsert(tableLocation, chunkPosition);
-            } else if (eq(mainKeySource0.getUnsafe(tableLocation), k0) && eq(mainKeySource1.getUnsafe(tableLocation), k1)) {
-                handler.doMainFound(tableLocation, chunkPosition);
-            } else {
-                int overflowLocation = mainOverflowLocationSource.getUnsafe(tableLocation);
-                if (!findOverflow(handler, k0, k1, chunkPosition, overflowLocation)) {
-                    final int newOverflowLocation = allocateOverflowLocation();
-                    overflowKeySource0.set(newOverflowLocation, k0);
-                    overflowKeySource1.set(newOverflowLocation, k1);
-                    mainOverflowLocationSource.set(tableLocation, newOverflowLocation);
-                    overflowOverflowLocationSource.set(newOverflowLocation, overflowLocation);
-                    numEntries++;
-                    handler.doOverflowInsert(newOverflowLocation, chunkPosition);
-                }
-            }
-        }
-    }
-
-    @Override
-    protected void probe(HashHandler handler, RowSequence rowSequence, Chunk[] sourceKeyChunks) {
-        final ObjectChunk<Object, Values> keyChunk0 = sourceKeyChunks[0].asObjectChunk();
-        final DoubleChunk<Values> keyChunk1 = sourceKeyChunks[1].asDoubleChunk();
-        final int chunkSize = keyChunk0.size();
-        for (int chunkPosition = 0; chunkPosition < chunkSize; ++chunkPosition) {
-            final Object k0 = keyChunk0.get(chunkPosition);
-            final double k1 = keyChunk1.get(chunkPosition);
-            final int hash = hash(k0, k1);
-            final int tableLocation = hashToTableLocation(tableHashPivot, hash);
-            if (mainOutputPosition.getUnsafe(tableLocation) == EMPTY_OUTPUT_POSITION) {
-                handler.doMissing(chunkPosition);
-            } else if (eq(mainKeySource0.getUnsafe(tableLocation), k0) && eq(mainKeySource1.getUnsafe(tableLocation), k1)) {
-                handler.doMainFound(tableLocation, chunkPosition);
-            } else {
-                int overflowLocation = mainOverflowLocationSource.getUnsafe(tableLocation);
-                if (!findOverflow(handler, k0, k1, chunkPosition, overflowLocation)) {
-                    handler.doMissing(chunkPosition);
-                }
-            }
-        }
-    }
-
-    private static int hash(Object k0, double k1) {
-        int hash = ObjectChunkHasher.hashInitialSingle(k0);
-        hash = DoubleChunkHasher.hashUpdateSingle(hash, k1);
-        return hash;
-    }
-
-    @Override
-    protected void rehashBucket(HashHandler handler, int sourceBucket, int destBucket,
-            int bucketsToAdd) {
-        final int position = mainOutputPosition.getUnsafe(sourceBucket);
-        if (position == EMPTY_OUTPUT_POSITION) {
-            return;
-        }
-        int mainInsertLocation = maybeMoveMainBucket(handler, sourceBucket, destBucket, bucketsToAdd);
-        int overflowLocation = mainOverflowLocationSource.getUnsafe(sourceBucket);
-        mainOverflowLocationSource.set(sourceBucket, QueryConstants.NULL_INT);
-        mainOverflowLocationSource.set(destBucket, QueryConstants.NULL_INT);
-        while (overflowLocation != QueryConstants.NULL_INT) {
-            final int nextOverflowLocation = overflowOverflowLocationSource.getUnsafe(overflowLocation);
-            final Object overflowKey0 = overflowKeySource0.getUnsafe(overflowLocation);
-            final double overflowKey1 = overflowKeySource1.getUnsafe(overflowLocation);
-            final int overflowHash = hash(overflowKey0, overflowKey1);
-            final int overflowTableLocation = hashToTableLocation(tableHashPivot + bucketsToAdd, overflowHash);
-            if (overflowTableLocation == mainInsertLocation) {
-                mainKeySource0.set(mainInsertLocation, overflowKey0);
-                mainKeySource1.set(mainInsertLocation, overflowKey1);
-                mainOutputPosition.set(mainInsertLocation, overflowOutputPosition.getUnsafe(overflowLocation));
-                handler.doPromoteOverflow(overflowLocation, mainInsertLocation);
-                overflowOutputPosition.set(overflowLocation, QueryConstants.NULL_INT);
-                overflowKeySource0.set(overflowLocation, null);
-                overflowKeySource1.set(overflowLocation, QueryConstants.NULL_DOUBLE);
-                freeOverflowLocation(overflowLocation);
-                mainInsertLocation = -1;
-            } else {
-                final int oldOverflowLocation = mainOverflowLocationSource.getUnsafe(overflowTableLocation);
-                mainOverflowLocationSource.set(overflowTableLocation, overflowLocation);
-                overflowOverflowLocationSource.set(overflowLocation, oldOverflowLocation);
-            }
-            overflowLocation = nextOverflowLocation;
-        }
-    }
-
-    private int maybeMoveMainBucket(HashHandler handler, int sourceBucket, int destBucket,
-            int bucketsToAdd) {
-        final Object k0 = mainKeySource0.getUnsafe(sourceBucket);
-        final double k1 = mainKeySource1.getUnsafe(sourceBucket);
-        final int hash = hash(k0, k1);
-        final int location = hashToTableLocation(tableHashPivot + bucketsToAdd, hash);
-        final int mainInsertLocation;
-        if (location == sourceBucket) {
-            mainInsertLocation = destBucket;
-            mainOutputPosition.set(destBucket, EMPTY_OUTPUT_POSITION);
-        } else {
-            mainInsertLocation = sourceBucket;
-            mainOutputPosition.set(destBucket, mainOutputPosition.getUnsafe(sourceBucket));
-            mainOutputPosition.set(sourceBucket, EMPTY_OUTPUT_POSITION);
-            mainKeySource0.set(destBucket, k0);
-            mainKeySource0.set(sourceBucket, null);
-            mainKeySource1.set(destBucket, k1);
-            mainKeySource1.set(sourceBucket, QueryConstants.NULL_DOUBLE);
-            handler.doMoveMain(sourceBucket, destBucket);
-        }
-        return mainInsertLocation;
-    }
-
-    private boolean findOverflow(HashHandler handler, Object k0, double k1, int chunkPosition,
-            int overflowLocation) {
-        while (overflowLocation != QueryConstants.NULL_INT) {
-            if (eq(overflowKeySource0.getUnsafe(overflowLocation), k0) && eq(overflowKeySource1.getUnsafe(overflowLocation), k1)) {
-                handler.doOverflowFound(overflowLocation, chunkPosition);
-                return true;
-            }
-            overflowLocation = overflowOverflowLocationSource.getUnsafe(overflowLocation);
-        }
-        return false;
-    }
-
-    @Override
-    public int findPositionForKey(Object key) {
-        final Object [] ka = (Object[])key;
-        final Object k0 = ka[0];
-        final double k1 = TypeUtils.unbox((Double)ka[1]);
-        int hash = hash(k0, k1);
-        final int tableLocation = hashToTableLocation(tableHashPivot, hash);
-        final int positionValue = mainOutputPosition.getUnsafe(tableLocation);
-        if (positionValue == EMPTY_OUTPUT_POSITION) {
-            return -1;
-        }
-        if (eq(mainKeySource0.getUnsafe(tableLocation), k0) && eq(mainKeySource1.getUnsafe(tableLocation), k1)) {
-            return positionValue;
-        }
-        int overflowLocation = mainOverflowLocationSource.getUnsafe(tableLocation);
-        while (overflowLocation != QueryConstants.NULL_INT) {
-            if (eq(overflowKeySource0.getUnsafe(overflowLocation), k0) && eq(overflowKeySource1.getUnsafe(overflowLocation), k1)) {
-                return overflowOutputPosition.getUnsafe(overflowLocation);
-            }
-            overflowLocation = overflowOverflowLocationSource.getUnsafe(overflowLocation);
-        }
-        return -1;
-    }
-}
diff --git a/engine/table/src/main/java/io/deephaven/engine/table/impl/by/typed/incagg/gen/IncrementalAggHasherObjectFloat.java b/engine/table/src/main/java/io/deephaven/engine/table/impl/by/typed/incagg/gen/IncrementalAggHasherObjectFloat.java
deleted file mode 100644
index 660ac226ce8..00000000000
--- a/engine/table/src/main/java/io/deephaven/engine/table/impl/by/typed/incagg/gen/IncrementalAggHasherObjectFloat.java
+++ /dev/null
@@ -1,205 +0,0 @@
-//
-// Copyright (c) 2016-2024 Deephaven Data Labs and Patent Pending
-//
-// ****** AUTO-GENERATED CLASS - DO NOT EDIT MANUALLY
-// ****** Run ReplicateTypedHashers or ./gradlew replicateTypedHashers to regenerate
-//
-// @formatter:off
-package io.deephaven.engine.table.impl.by.typed.incagg.gen;
-
-import static io.deephaven.util.compare.FloatComparisons.eq;
-import static io.deephaven.util.compare.ObjectComparisons.eq;
-
-import io.deephaven.chunk.Chunk;
-import io.deephaven.chunk.FloatChunk;
-import io.deephaven.chunk.ObjectChunk;
-import io.deephaven.chunk.attributes.Values;
-import io.deephaven.chunk.util.hashing.FloatChunkHasher;
-import io.deephaven.chunk.util.hashing.ObjectChunkHasher;
-import io.deephaven.engine.rowset.RowSequence;
-import io.deephaven.engine.table.ColumnSource;
-import io.deephaven.engine.table.impl.by.HashHandler;
-import io.deephaven.engine.table.impl.by.IncrementalChunkedOperatorAggregationStateManagerTypedBase;
-import io.deephaven.engine.table.impl.sources.FloatArraySource;
-import io.deephaven.engine.table.impl.sources.ObjectArraySource;
-import io.deephaven.util.QueryConstants;
-import io.deephaven.util.type.TypeUtils;
-import java.lang.Float;
-import java.lang.Object;
-import java.lang.Override;
-
-final class IncrementalAggHasherObjectFloat extends IncrementalChunkedOperatorAggregationStateManagerTypedBase {
-    private final ObjectArraySource mainKeySource0;
-
-    private final ObjectArraySource overflowKeySource0;
-
-    private final FloatArraySource mainKeySource1;
-
-    private final FloatArraySource overflowKeySource1;
-
-    public IncrementalAggHasherObjectFloat(ColumnSource[] tableKeySources,
-            ColumnSource[] originalTableKeySources, int tableSize, double maximumLoadFactor,
-            double targetLoadFactor) {
-        super(tableKeySources, tableSize, maximumLoadFactor, targetLoadFactor);
-        this.mainKeySource0 = (ObjectArraySource) super.mainKeySources[0];
-        this.overflowKeySource0 = (ObjectArraySource) super.overflowKeySources[0];
-        this.mainKeySource1 = (FloatArraySource) super.mainKeySources[1];
-        this.overflowKeySource1 = (FloatArraySource) super.overflowKeySources[1];
-    }
-
-    @Override
-    protected void build(HashHandler handler, RowSequence rowSequence, Chunk[] sourceKeyChunks) {
-        final ObjectChunk<Object, Values> keyChunk0 = sourceKeyChunks[0].asObjectChunk();
-        final FloatChunk<Values> keyChunk1 = sourceKeyChunks[1].asFloatChunk();
-        final int chunkSize = keyChunk0.size();
-        for (int chunkPosition = 0; chunkPosition < chunkSize; ++chunkPosition) {
-            final Object k0 = keyChunk0.get(chunkPosition);
-            final float k1 = keyChunk1.get(chunkPosition);
-            final int hash = hash(k0, k1);
-            final int tableLocation = hashToTableLocation(tableHashPivot, hash);
-            if (mainOutputPosition.getUnsafe(tableLocation) == EMPTY_OUTPUT_POSITION) {
-                numEntries++;
-                mainKeySource0.set(tableLocation, k0);
-                mainKeySource1.set(tableLocation, k1);
-                handler.doMainInsert(tableLocation, chunkPosition);
-            } else if (eq(mainKeySource0.getUnsafe(tableLocation), k0) && eq(mainKeySource1.getUnsafe(tableLocation), k1)) {
-                handler.doMainFound(tableLocation, chunkPosition);
-            } else {
-                int overflowLocation = mainOverflowLocationSource.getUnsafe(tableLocation);
-                if (!findOverflow(handler, k0, k1, chunkPosition, overflowLocation)) {
-                    final int newOverflowLocation = allocateOverflowLocation();
-                    overflowKeySource0.set(newOverflowLocation, k0);
-                    overflowKeySource1.set(newOverflowLocation, k1);
-                    mainOverflowLocationSource.set(tableLocation, newOverflowLocation);
-                    overflowOverflowLocationSource.set(newOverflowLocation, overflowLocation);
-                    numEntries++;
-                    handler.doOverflowInsert(newOverflowLocation, chunkPosition);
-                }
-            }
-        }
-    }
-
-    @Override
-    protected void probe(HashHandler handler, RowSequence rowSequence, Chunk[] sourceKeyChunks) {
-        final ObjectChunk<Object, Values> keyChunk0 = sourceKeyChunks[0].asObjectChunk();
-        final FloatChunk<Values> keyChunk1 = sourceKeyChunks[1].asFloatChunk();
-        final int chunkSize = keyChunk0.size();
-        for (int chunkPosition = 0; chunkPosition < chunkSize; ++chunkPosition) {
-            final Object k0 = keyChunk0.get(chunkPosition);
-            final float k1 = keyChunk1.get(chunkPosition);
-            final int hash = hash(k0, k1);
-            final int tableLocation = hashToTableLocation(tableHashPivot, hash);
-            if (mainOutputPosition.getUnsafe(tableLocation) == EMPTY_OUTPUT_POSITION) {
-                handler.doMissing(chunkPosition);
-            } else if (eq(mainKeySource0.getUnsafe(tableLocation), k0) && eq(mainKeySource1.getUnsafe(tableLocation), k1)) {
-                handler.doMainFound(tableLocation, chunkPosition);
-            } else {
-                int overflowLocation = mainOverflowLocationSource.getUnsafe(tableLocation);
-                if (!findOverflow(handler, k0, k1, chunkPosition, overflowLocation)) {
-                    handler.doMissing(chunkPosition);
-                }
-            }
-        }
-    }
-
-    private static int hash(Object k0, float k1) {
-        int hash = ObjectChunkHasher.hashInitialSingle(k0);
-        hash = FloatChunkHasher.hashUpdateSingle(hash, k1);
-        return hash;
-    }
-
-    @Override
-    protected void rehashBucket(HashHandler handler, int sourceBucket, int destBucket,
-            int bucketsToAdd) {
-        final int position = mainOutputPosition.getUnsafe(sourceBucket);
-        if (position == EMPTY_OUTPUT_POSITION) {
-            return;
-        }
-        int mainInsertLocation = maybeMoveMainBucket(handler, sourceBucket, destBucket, bucketsToAdd);
-        int overflowLocation = mainOverflowLocationSource.getUnsafe(sourceBucket);
-        mainOverflowLocationSource.set(sourceBucket, QueryConstants.NULL_INT);
-        mainOverflowLocationSource.set(destBucket, QueryConstants.NULL_INT);
-        while (overflowLocation != QueryConstants.NULL_INT) {
-            final int nextOverflowLocation = overflowOverflowLocationSource.getUnsafe(overflowLocation);
-            final Object overflowKey0 = overflowKeySource0.getUnsafe(overflowLocation);
-            final float overflowKey1 = overflowKeySource1.getUnsafe(overflowLocation);
-            final int overflowHash = hash(overflowKey0, overflowKey1);
-            final int overflowTableLocation = hashToTableLocation(tableHashPivot + bucketsToAdd, overflowHash);
-            if (overflowTableLocation == mainInsertLocation) {
-                mainKeySource0.set(mainInsertLocation, overflowKey0);
-                mainKeySource1.set(mainInsertLocation, overflowKey1);
-                mainOutputPosition.set(mainInsertLocation, overflowOutputPosition.getUnsafe(overflowLocation));
-                handler.doPromoteOverflow(overflowLocation, mainInsertLocation);
-                overflowOutputPosition.set(overflowLocation, QueryConstants.NULL_INT);
-                overflowKeySource0.set(overflowLocation, null);
-                overflowKeySource1.set(overflowLocation, QueryConstants.NULL_FLOAT);
-                freeOverflowLocation(overflowLocation);
-                mainInsertLocation = -1;
-            } else {
-                final int oldOverflowLocation = mainOverflowLocationSource.getUnsafe(overflowTableLocation);
-                mainOverflowLocationSource.set(overflowTableLocation, overflowLocation);
-                overflowOverflowLocationSource.set(overflowLocation, oldOverflowLocation);
-            }
-            overflowLocation = nextOverflowLocation;
-        }
-    }
-
-    private int maybeMoveMainBucket(HashHandler handler, int sourceBucket, int destBucket,
-            int bucketsToAdd) {
-        final Object k0 = mainKeySource0.getUnsafe(sourceBucket);
-        final float k1 = mainKeySource1.getUnsafe(sourceBucket);
-        final int hash = hash(k0, k1);
-        final int location = hashToTableLocation(tableHashPivot + bucketsToAdd, hash);
-        final int mainInsertLocation;
-        if (location == sourceBucket) {
-            mainInsertLocation = destBucket;
-            mainOutputPosition.set(destBucket, EMPTY_OUTPUT_POSITION);
-        } else {
-            mainInsertLocation = sourceBucket;
-            mainOutputPosition.set(destBucket, mainOutputPosition.getUnsafe(sourceBucket));
-            mainOutputPosition.set(sourceBucket, EMPTY_OUTPUT_POSITION);
-            mainKeySource0.set(destBucket, k0);
-            mainKeySource0.set(sourceBucket, null);
-            mainKeySource1.set(destBucket, k1);
-            mainKeySource1.set(sourceBucket, QueryConstants.NULL_FLOAT);
-            handler.doMoveMain(sourceBucket, destBucket);
-        }
-        return mainInsertLocation;
-    }
-
-    private boolean findOverflow(HashHandler handler, Object k0, float k1, int chunkPosition,
-            int overflowLocation) {
-        while (overflowLocation != QueryConstants.NULL_INT) {
-            if (eq(overflowKeySource0.getUnsafe(overflowLocation), k0) && eq(overflowKeySource1.getUnsafe(overflowLocation), k1)) {
-                handler.doOverflowFound(overflowLocation, chunkPosition);
-                return true;
-            }
-            overflowLocation = overflowOverflowLocationSource.getUnsafe(overflowLocation);
-        }
-        return false;
-    }
-
-    @Override
-    public int findPositionForKey(Object key) {
-        final Object [] ka = (Object[])key;
-        final Object k0 = ka[0];
-        final float k1 = TypeUtils.unbox((Float)ka[1]);
-        int hash = hash(k0, k1);
-        final int tableLocation = hashToTableLocation(tableHashPivot, hash);
-        final int positionValue = mainOutputPosition.getUnsafe(tableLocation);
-        if (positionValue == EMPTY_OUTPUT_POSITION) {
-            return -1;
-        }
-        if (eq(mainKeySource0.getUnsafe(tableLocation), k0) && eq(mainKeySource1.getUnsafe(tableLocation), k1)) {
-            return positionValue;
-        }
-        int overflowLocation = mainOverflowLocationSource.getUnsafe(tableLocation);
-        while (overflowLocation != QueryConstants.NULL_INT) {
-            if (eq(overflowKeySource0.getUnsafe(overflowLocation), k0) && eq(overflowKeySource1.getUnsafe(overflowLocation), k1)) {
-                return overflowOutputPosition.getUnsafe(overflowLocation);
-            }
-            overflowLocation = overflowOverflowLocationSource.getUnsafe(overflowLocation);
-        }
-        return -1;
-    }
-}
diff --git a/engine/table/src/main/java/io/deephaven/engine/table/impl/by/typed/incagg/gen/IncrementalAggHasherObjectInt.java b/engine/table/src/main/java/io/deephaven/engine/table/impl/by/typed/incagg/gen/IncrementalAggHasherObjectInt.java
deleted file mode 100644
index 10e854a075e..00000000000
--- a/engine/table/src/main/java/io/deephaven/engine/table/impl/by/typed/incagg/gen/IncrementalAggHasherObjectInt.java
+++ /dev/null
@@ -1,205 +0,0 @@
-//
-// Copyright (c) 2016-2024 Deephaven Data Labs and Patent Pending
-//
-// ****** AUTO-GENERATED CLASS - DO NOT EDIT MANUALLY
-// ****** Run ReplicateTypedHashers or ./gradlew replicateTypedHashers to regenerate
-//
-// @formatter:off
-package io.deephaven.engine.table.impl.by.typed.incagg.gen;
-
-import static io.deephaven.util.compare.IntComparisons.eq;
-import static io.deephaven.util.compare.ObjectComparisons.eq;
-
-import io.deephaven.chunk.Chunk;
-import io.deephaven.chunk.IntChunk;
-import io.deephaven.chunk.ObjectChunk;
-import io.deephaven.chunk.attributes.Values;
-import io.deephaven.chunk.util.hashing.IntChunkHasher;
-import io.deephaven.chunk.util.hashing.ObjectChunkHasher;
-import io.deephaven.engine.rowset.RowSequence;
-import io.deephaven.engine.table.ColumnSource;
-import io.deephaven.engine.table.impl.by.HashHandler;
-import io.deephaven.engine.table.impl.by.IncrementalChunkedOperatorAggregationStateManagerTypedBase;
-import io.deephaven.engine.table.impl.sources.IntegerArraySource;
-import io.deephaven.engine.table.impl.sources.ObjectArraySource;
-import io.deephaven.util.QueryConstants;
-import io.deephaven.util.type.TypeUtils;
-import java.lang.Integer;
-import java.lang.Object;
-import java.lang.Override;
-
-final class IncrementalAggHasherObjectInt extends IncrementalChunkedOperatorAggregationStateManagerTypedBase {
-    private final ObjectArraySource mainKeySource0;
-
-    private final ObjectArraySource overflowKeySource0;
-
-    private final IntegerArraySource mainKeySource1;
-
-    private final IntegerArraySource overflowKeySource1;
-
-    public IncrementalAggHasherObjectInt(ColumnSource[] tableKeySources,
-            ColumnSource[] originalTableKeySources, int tableSize, double maximumLoadFactor,
-            double targetLoadFactor) {
-        super(tableKeySources, tableSize, maximumLoadFactor, targetLoadFactor);
-        this.mainKeySource0 = (ObjectArraySource) super.mainKeySources[0];
-        this.overflowKeySource0 = (ObjectArraySource) super.overflowKeySources[0];
-        this.mainKeySource1 = (IntegerArraySource) super.mainKeySources[1];
-        this.overflowKeySource1 = (IntegerArraySource) super.overflowKeySources[1];
-    }
-
-    @Override
-    protected void build(HashHandler handler, RowSequence rowSequence, Chunk[] sourceKeyChunks) {
-        final ObjectChunk<Object, Values> keyChunk0 = sourceKeyChunks[0].asObjectChunk();
-        final IntChunk<Values> keyChunk1 = sourceKeyChunks[1].asIntChunk();
-        final int chunkSize = keyChunk0.size();
-        for (int chunkPosition = 0; chunkPosition < chunkSize; ++chunkPosition) {
-            final Object k0 = keyChunk0.get(chunkPosition);
-            final int k1 = keyChunk1.get(chunkPosition);
-            final int hash = hash(k0, k1);
-            final int tableLocation = hashToTableLocation(tableHashPivot, hash);
-            if (mainOutputPosition.getUnsafe(tableLocation) == EMPTY_OUTPUT_POSITION) {
-                numEntries++;
-                mainKeySource0.set(tableLocation, k0);
-                mainKeySource1.set(tableLocation, k1);
-                handler.doMainInsert(tableLocation, chunkPosition);
-            } else if (eq(mainKeySource0.getUnsafe(tableLocation), k0) && eq(mainKeySource1.getUnsafe(tableLocation), k1)) {
-                handler.doMainFound(tableLocation, chunkPosition);
-            } else {
-                int overflowLocation = mainOverflowLocationSource.getUnsafe(tableLocation);
-                if (!findOverflow(handler, k0, k1, chunkPosition, overflowLocation)) {
-                    final int newOverflowLocation = allocateOverflowLocation();
-                    overflowKeySource0.set(newOverflowLocation, k0);
-                    overflowKeySource1.set(newOverflowLocation, k1);
-                    mainOverflowLocationSource.set(tableLocation, newOverflowLocation);
-                    overflowOverflowLocationSource.set(newOverflowLocation, overflowLocation);
-                    numEntries++;
-                    handler.doOverflowInsert(newOverflowLocation, chunkPosition);
-                }
-            }
-        }
-    }
-
-    @Override
-    protected void probe(HashHandler handler, RowSequence rowSequence, Chunk[] sourceKeyChunks) {
-        final ObjectChunk<Object, Values> keyChunk0 = sourceKeyChunks[0].asObjectChunk();
-        final IntChunk<Values> keyChunk1 = sourceKeyChunks[1].asIntChunk();
-        final int chunkSize = keyChunk0.size();
-        for (int chunkPosition = 0; chunkPosition < chunkSize; ++chunkPosition) {
-            final Object k0 = keyChunk0.get(chunkPosition);
-            final int k1 = keyChunk1.get(chunkPosition);
-            final int hash = hash(k0, k1);
-            final int tableLocation = hashToTableLocation(tableHashPivot, hash);
-            if (mainOutputPosition.getUnsafe(tableLocation) == EMPTY_OUTPUT_POSITION) {
-                handler.doMissing(chunkPosition);
-            } else if (eq(mainKeySource0.getUnsafe(tableLocation), k0) && eq(mainKeySource1.getUnsafe(tableLocation), k1)) {
-                handler.doMainFound(tableLocation, chunkPosition);
-            } else {
-                int overflowLocation = mainOverflowLocationSource.getUnsafe(tableLocation);
-                if (!findOverflow(handler, k0, k1, chunkPosition, overflowLocation)) {
-                    handler.doMissing(chunkPosition);
-                }
-            }
-        }
-    }
-
-    private static int hash(Object k0, int k1) {
-        int hash = ObjectChunkHasher.hashInitialSingle(k0);
-        hash = IntChunkHasher.hashUpdateSingle(hash, k1);
-        return hash;
-    }
-
-    @Override
-    protected void rehashBucket(HashHandler handler, int sourceBucket, int destBucket,
-            int bucketsToAdd) {
-        final int position = mainOutputPosition.getUnsafe(sourceBucket);
-        if (position == EMPTY_OUTPUT_POSITION) {
-            return;
-        }
-        int mainInsertLocation = maybeMoveMainBucket(handler, sourceBucket, destBucket, bucketsToAdd);
-        int overflowLocation = mainOverflowLocationSource.getUnsafe(sourceBucket);
-        mainOverflowLocationSource.set(sourceBucket, QueryConstants.NULL_INT);
-        mainOverflowLocationSource.set(destBucket, QueryConstants.NULL_INT);
-        while (overflowLocation != QueryConstants.NULL_INT) {
-            final int nextOverflowLocation = overflowOverflowLocationSource.getUnsafe(overflowLocation);
-            final Object overflowKey0 = overflowKeySource0.getUnsafe(overflowLocation);
-            final int overflowKey1 = overflowKeySource1.getUnsafe(overflowLocation);
-            final int overflowHash = hash(overflowKey0, overflowKey1);
-            final int overflowTableLocation = hashToTableLocation(tableHashPivot + bucketsToAdd, overflowHash);
-            if (overflowTableLocation == mainInsertLocation) {
-                mainKeySource0.set(mainInsertLocation, overflowKey0);
-                mainKeySource1.set(mainInsertLocation, overflowKey1);
-                mainOutputPosition.set(mainInsertLocation, overflowOutputPosition.getUnsafe(overflowLocation));
-                handler.doPromoteOverflow(overflowLocation, mainInsertLocation);
-                overflowOutputPosition.set(overflowLocation, QueryConstants.NULL_INT);
-                overflowKeySource0.set(overflowLocation, null);
-                overflowKeySource1.set(overflowLocation, QueryConstants.NULL_INT);
-                freeOverflowLocation(overflowLocation);
-                mainInsertLocation = -1;
-            } else {
-                final int oldOverflowLocation = mainOverflowLocationSource.getUnsafe(overflowTableLocation);
-                mainOverflowLocationSource.set(overflowTableLocation, overflowLocation);
-                overflowOverflowLocationSource.set(overflowLocation, oldOverflowLocation);
-            }
-            overflowLocation = nextOverflowLocation;
-        }
-    }
-
-    private int maybeMoveMainBucket(HashHandler handler, int sourceBucket, int destBucket,
-            int bucketsToAdd) {
-        final Object k0 = mainKeySource0.getUnsafe(sourceBucket);
-        final int k1 = mainKeySource1.getUnsafe(sourceBucket);
-        final int hash = hash(k0, k1);
-        final int location = hashToTableLocation(tableHashPivot + bucketsToAdd, hash);
-        final int mainInsertLocation;
-        if (location == sourceBucket) {
-            mainInsertLocation = destBucket;
-            mainOutputPosition.set(destBucket, EMPTY_OUTPUT_POSITION);
-        } else {
-            mainInsertLocation = sourceBucket;
-            mainOutputPosition.set(destBucket, mainOutputPosition.getUnsafe(sourceBucket));
-            mainOutputPosition.set(sourceBucket, EMPTY_OUTPUT_POSITION);
-            mainKeySource0.set(destBucket, k0);
-            mainKeySource0.set(sourceBucket, null);
-            mainKeySource1.set(destBucket, k1);
-            mainKeySource1.set(sourceBucket, QueryConstants.NULL_INT);
-            handler.doMoveMain(sourceBucket, destBucket);
-        }
-        return mainInsertLocation;
-    }
-
-    private boolean findOverflow(HashHandler handler, Object k0, int k1, int chunkPosition,
-            int overflowLocation) {
-        while (overflowLocation != QueryConstants.NULL_INT) {
-            if (eq(overflowKeySource0.getUnsafe(overflowLocation), k0) && eq(overflowKeySource1.getUnsafe(overflowLocation), k1)) {
-                handler.doOverflowFound(overflowLocation, chunkPosition);
-                return true;
-            }
-            overflowLocation = overflowOverflowLocationSource.getUnsafe(overflowLocation);
-        }
-        return false;
-    }
-
-    @Override
-    public int findPositionForKey(Object key) {
-        final Object [] ka = (Object[])key;
-        final Object k0 = ka[0];
-        final int k1 = TypeUtils.unbox((Integer)ka[1]);
-        int hash = hash(k0, k1);
-        final int tableLocation = hashToTableLocation(tableHashPivot, hash);
-        final int positionValue = mainOutputPosition.getUnsafe(tableLocation);
-        if (positionValue == EMPTY_OUTPUT_POSITION) {
-            return -1;
-        }
-        if (eq(mainKeySource0.getUnsafe(tableLocation), k0) && eq(mainKeySource1.getUnsafe(tableLocation), k1)) {
-            return positionValue;
-        }
-        int overflowLocation = mainOverflowLocationSource.getUnsafe(tableLocation);
-        while (overflowLocation != QueryConstants.NULL_INT) {
-            if (eq(overflowKeySource0.getUnsafe(overflowLocation), k0) && eq(overflowKeySource1.getUnsafe(overflowLocation), k1)) {
-                return overflowOutputPosition.getUnsafe(overflowLocation);
-            }
-            overflowLocation = overflowOverflowLocationSource.getUnsafe(overflowLocation);
-        }
-        return -1;
-    }
-}
diff --git a/engine/table/src/main/java/io/deephaven/engine/table/impl/by/typed/incagg/gen/IncrementalAggHasherObjectLong.java b/engine/table/src/main/java/io/deephaven/engine/table/impl/by/typed/incagg/gen/IncrementalAggHasherObjectLong.java
deleted file mode 100644
index 15f0f25fcb7..00000000000
--- a/engine/table/src/main/java/io/deephaven/engine/table/impl/by/typed/incagg/gen/IncrementalAggHasherObjectLong.java
+++ /dev/null
@@ -1,205 +0,0 @@
-//
-// Copyright (c) 2016-2024 Deephaven Data Labs and Patent Pending
-//
-// ****** AUTO-GENERATED CLASS - DO NOT EDIT MANUALLY
-// ****** Run ReplicateTypedHashers or ./gradlew replicateTypedHashers to regenerate
-//
-// @formatter:off
-package io.deephaven.engine.table.impl.by.typed.incagg.gen;
-
-import static io.deephaven.util.compare.LongComparisons.eq;
-import static io.deephaven.util.compare.ObjectComparisons.eq;
-
-import io.deephaven.chunk.Chunk;
-import io.deephaven.chunk.LongChunk;
-import io.deephaven.chunk.ObjectChunk;
-import io.deephaven.chunk.attributes.Values;
-import io.deephaven.chunk.util.hashing.LongChunkHasher;
-import io.deephaven.chunk.util.hashing.ObjectChunkHasher;
-import io.deephaven.engine.rowset.RowSequence;
-import io.deephaven.engine.table.ColumnSource;
-import io.deephaven.engine.table.impl.by.HashHandler;
-import io.deephaven.engine.table.impl.by.IncrementalChunkedOperatorAggregationStateManagerTypedBase;
-import io.deephaven.engine.table.impl.sources.LongArraySource;
-import io.deephaven.engine.table.impl.sources.ObjectArraySource;
-import io.deephaven.util.QueryConstants;
-import io.deephaven.util.type.TypeUtils;
-import java.lang.Long;
-import java.lang.Object;
-import java.lang.Override;
-
-final class IncrementalAggHasherObjectLong extends IncrementalChunkedOperatorAggregationStateManagerTypedBase {
-    private final ObjectArraySource mainKeySource0;
-
-    private final ObjectArraySource overflowKeySource0;
-
-    private final LongArraySource mainKeySource1;
-
-    private final LongArraySource overflowKeySource1;
-
-    public IncrementalAggHasherObjectLong(ColumnSource[] tableKeySources,
-            ColumnSource[] originalTableKeySources, int tableSize, double maximumLoadFactor,
-            double targetLoadFactor) {
-        super(tableKeySources, tableSize, maximumLoadFactor, targetLoadFactor);
-        this.mainKeySource0 = (ObjectArraySource) super.mainKeySources[0];
-        this.overflowKeySource0 = (ObjectArraySource) super.overflowKeySources[0];
-        this.mainKeySource1 = (LongArraySource) super.mainKeySources[1];
-        this.overflowKeySource1 = (LongArraySource) super.overflowKeySources[1];
-    }
-
-    @Override
-    protected void build(HashHandler handler, RowSequence rowSequence, Chunk[] sourceKeyChunks) {
-        final ObjectChunk<Object, Values> keyChunk0 = sourceKeyChunks[0].asObjectChunk();
-        final LongChunk<Values> keyChunk1 = sourceKeyChunks[1].asLongChunk();
-        final int chunkSize = keyChunk0.size();
-        for (int chunkPosition = 0; chunkPosition < chunkSize; ++chunkPosition) {
-            final Object k0 = keyChunk0.get(chunkPosition);
-            final long k1 = keyChunk1.get(chunkPosition);
-            final int hash = hash(k0, k1);
-            final int tableLocation = hashToTableLocation(tableHashPivot, hash);
-            if (mainOutputPosition.getUnsafe(tableLocation) == EMPTY_OUTPUT_POSITION) {
-                numEntries++;
-                mainKeySource0.set(tableLocation, k0);
-                mainKeySource1.set(tableLocation, k1);
-                handler.doMainInsert(tableLocation, chunkPosition);
-            } else if (eq(mainKeySource0.getUnsafe(tableLocation), k0) && eq(mainKeySource1.getUnsafe(tableLocation), k1)) {
-                handler.doMainFound(tableLocation, chunkPosition);
-            } else {
-                int overflowLocation = mainOverflowLocationSource.getUnsafe(tableLocation);
-                if (!findOverflow(handler, k0, k1, chunkPosition, overflowLocation)) {
-                    final int newOverflowLocation = allocateOverflowLocation();
-                    overflowKeySource0.set(newOverflowLocation, k0);
-                    overflowKeySource1.set(newOverflowLocation, k1);
-                    mainOverflowLocationSource.set(tableLocation, newOverflowLocation);
-                    overflowOverflowLocationSource.set(newOverflowLocation, overflowLocation);
-                    numEntries++;
-                    handler.doOverflowInsert(newOverflowLocation, chunkPosition);
-                }
-            }
-        }
-    }
-
-    @Override
-    protected void probe(HashHandler handler, RowSequence rowSequence, Chunk[] sourceKeyChunks) {
-        final ObjectChunk<Object, Values> keyChunk0 = sourceKeyChunks[0].asObjectChunk();
-        final LongChunk<Values> keyChunk1 = sourceKeyChunks[1].asLongChunk();
-        final int chunkSize = keyChunk0.size();
-        for (int chunkPosition = 0; chunkPosition < chunkSize; ++chunkPosition) {
-            final Object k0 = keyChunk0.get(chunkPosition);
-            final long k1 = keyChunk1.get(chunkPosition);
-            final int hash = hash(k0, k1);
-            final int tableLocation = hashToTableLocation(tableHashPivot, hash);
-            if (mainOutputPosition.getUnsafe(tableLocation) == EMPTY_OUTPUT_POSITION) {
-                handler.doMissing(chunkPosition);
-            } else if (eq(mainKeySource0.getUnsafe(tableLocation), k0) && eq(mainKeySource1.getUnsafe(tableLocation), k1)) {
-                handler.doMainFound(tableLocation, chunkPosition);
-            } else {
-                int overflowLocation = mainOverflowLocationSource.getUnsafe(tableLocation);
-                if (!findOverflow(handler, k0, k1, chunkPosition, overflowLocation)) {
-                    handler.doMissing(chunkPosition);
-                }
-            }
-        }
-    }
-
-    private static int hash(Object k0, long k1) {
-        int hash = ObjectChunkHasher.hashInitialSingle(k0);
-        hash = LongChunkHasher.hashUpdateSingle(hash, k1);
-        return hash;
-    }
-
-    @Override
-    protected void rehashBucket(HashHandler handler, int sourceBucket, int destBucket,
-            int bucketsToAdd) {
-        final int position = mainOutputPosition.getUnsafe(sourceBucket);
-        if (position == EMPTY_OUTPUT_POSITION) {
-            return;
-        }
-        int mainInsertLocation = maybeMoveMainBucket(handler, sourceBucket, destBucket, bucketsToAdd);
-        int overflowLocation = mainOverflowLocationSource.getUnsafe(sourceBucket);
-        mainOverflowLocationSource.set(sourceBucket, QueryConstants.NULL_INT);
-        mainOverflowLocationSource.set(destBucket, QueryConstants.NULL_INT);
-        while (overflowLocation != QueryConstants.NULL_INT) {
-            final int nextOverflowLocation = overflowOverflowLocationSource.getUnsafe(overflowLocation);
-            final Object overflowKey0 = overflowKeySource0.getUnsafe(overflowLocation);
-            final long overflowKey1 = overflowKeySource1.getUnsafe(overflowLocation);
-            final int overflowHash = hash(overflowKey0, overflowKey1);
-            final int overflowTableLocation = hashToTableLocation(tableHashPivot + bucketsToAdd, overflowHash);
-            if (overflowTableLocation == mainInsertLocation) {
-                mainKeySource0.set(mainInsertLocation, overflowKey0);
-                mainKeySource1.set(mainInsertLocation, overflowKey1);
-                mainOutputPosition.set(mainInsertLocation, overflowOutputPosition.getUnsafe(overflowLocation));
-                handler.doPromoteOverflow(overflowLocation, mainInsertLocation);
-                overflowOutputPosition.set(overflowLocation, QueryConstants.NULL_INT);
-                overflowKeySource0.set(overflowLocation, null);
-                overflowKeySource1.set(overflowLocation, QueryConstants.NULL_LONG);
-                freeOverflowLocation(overflowLocation);
-                mainInsertLocation = -1;
-            } else {
-                final int oldOverflowLocation = mainOverflowLocationSource.getUnsafe(overflowTableLocation);
-                mainOverflowLocationSource.set(overflowTableLocation, overflowLocation);
-                overflowOverflowLocationSource.set(overflowLocation, oldOverflowLocation);
-            }
-            overflowLocation = nextOverflowLocation;
-        }
-    }
-
-    private int maybeMoveMainBucket(HashHandler handler, int sourceBucket, int destBucket,
-            int bucketsToAdd) {
-        final Object k0 = mainKeySource0.getUnsafe(sourceBucket);
-        final long k1 = mainKeySource1.getUnsafe(sourceBucket);
-        final int hash = hash(k0, k1);
-        final int location = hashToTableLocation(tableHashPivot + bucketsToAdd, hash);
-        final int mainInsertLocation;
-        if (location == sourceBucket) {
-            mainInsertLocation = destBucket;
-            mainOutputPosition.set(destBucket, EMPTY_OUTPUT_POSITION);
-        } else {
-            mainInsertLocation = sourceBucket;
-            mainOutputPosition.set(destBucket, mainOutputPosition.getUnsafe(sourceBucket));
-            mainOutputPosition.set(sourceBucket, EMPTY_OUTPUT_POSITION);
-            mainKeySource0.set(destBucket, k0);
-            mainKeySource0.set(sourceBucket, null);
-            mainKeySource1.set(destBucket, k1);
-            mainKeySource1.set(sourceBucket, QueryConstants.NULL_LONG);
-            handler.doMoveMain(sourceBucket, destBucket);
-        }
-        return mainInsertLocation;
-    }
-
-    private boolean findOverflow(HashHandler handler, Object k0, long k1, int chunkPosition,
-            int overflowLocation) {
-        while (overflowLocation != QueryConstants.NULL_INT) {
-            if (eq(overflowKeySource0.getUnsafe(overflowLocation), k0) && eq(overflowKeySource1.getUnsafe(overflowLocation), k1)) {
-                handler.doOverflowFound(overflowLocation, chunkPosition);
-                return true;
-            }
-            overflowLocation = overflowOverflowLocationSource.getUnsafe(overflowLocation);
-        }
-        return false;
-    }
-
-    @Override
-    public int findPositionForKey(Object key) {
-        final Object [] ka = (Object[])key;
-        final Object k0 = ka[0];
-        final long k1 = TypeUtils.unbox((Long)ka[1]);
-        int hash = hash(k0, k1);
-        final int tableLocation = hashToTableLocation(tableHashPivot, hash);
-        final int positionValue = mainOutputPosition.getUnsafe(tableLocation);
-        if (positionValue == EMPTY_OUTPUT_POSITION) {
-            return -1;
-        }
-        if (eq(mainKeySource0.getUnsafe(tableLocation), k0) && eq(mainKeySource1.getUnsafe(tableLocation), k1)) {
-            return positionValue;
-        }
-        int overflowLocation = mainOverflowLocationSource.getUnsafe(tableLocation);
-        while (overflowLocation != QueryConstants.NULL_INT) {
-            if (eq(overflowKeySource0.getUnsafe(overflowLocation), k0) && eq(overflowKeySource1.getUnsafe(overflowLocation), k1)) {
-                return overflowOutputPosition.getUnsafe(overflowLocation);
-            }
-            overflowLocation = overflowOverflowLocationSource.getUnsafe(overflowLocation);
-        }
-        return -1;
-    }
-}
diff --git a/engine/table/src/main/java/io/deephaven/engine/table/impl/by/typed/incagg/gen/IncrementalAggHasherObjectObject.java b/engine/table/src/main/java/io/deephaven/engine/table/impl/by/typed/incagg/gen/IncrementalAggHasherObjectObject.java
deleted file mode 100644
index f2a877369d4..00000000000
--- a/engine/table/src/main/java/io/deephaven/engine/table/impl/by/typed/incagg/gen/IncrementalAggHasherObjectObject.java
+++ /dev/null
@@ -1,199 +0,0 @@
-//
-// Copyright (c) 2016-2024 Deephaven Data Labs and Patent Pending
-//
-// ****** AUTO-GENERATED CLASS - DO NOT EDIT MANUALLY
-// ****** Run ReplicateTypedHashers or ./gradlew replicateTypedHashers to regenerate
-//
-// @formatter:off
-package io.deephaven.engine.table.impl.by.typed.incagg.gen;
-
-import static io.deephaven.util.compare.ObjectComparisons.eq;
-
-import io.deephaven.chunk.Chunk;
-import io.deephaven.chunk.ObjectChunk;
-import io.deephaven.chunk.attributes.Values;
-import io.deephaven.chunk.util.hashing.ObjectChunkHasher;
-import io.deephaven.engine.rowset.RowSequence;
-import io.deephaven.engine.table.ColumnSource;
-import io.deephaven.engine.table.impl.by.HashHandler;
-import io.deephaven.engine.table.impl.by.IncrementalChunkedOperatorAggregationStateManagerTypedBase;
-import io.deephaven.engine.table.impl.sources.ObjectArraySource;
-import io.deephaven.util.QueryConstants;
-import java.lang.Object;
-import java.lang.Override;
-
-final class IncrementalAggHasherObjectObject extends IncrementalChunkedOperatorAggregationStateManagerTypedBase {
-    private final ObjectArraySource mainKeySource0;
-
-    private final ObjectArraySource overflowKeySource0;
-
-    private final ObjectArraySource mainKeySource1;
-
-    private final ObjectArraySource overflowKeySource1;
-
-    public IncrementalAggHasherObjectObject(ColumnSource[] tableKeySources,
-            ColumnSource[] originalTableKeySources, int tableSize, double maximumLoadFactor,
-            double targetLoadFactor) {
-        super(tableKeySources, tableSize, maximumLoadFactor, targetLoadFactor);
-        this.mainKeySource0 = (ObjectArraySource) super.mainKeySources[0];
-        this.overflowKeySource0 = (ObjectArraySource) super.overflowKeySources[0];
-        this.mainKeySource1 = (ObjectArraySource) super.mainKeySources[1];
-        this.overflowKeySource1 = (ObjectArraySource) super.overflowKeySources[1];
-    }
-
-    @Override
-    protected void build(HashHandler handler, RowSequence rowSequence, Chunk[] sourceKeyChunks) {
-        final ObjectChunk<Object, Values> keyChunk0 = sourceKeyChunks[0].asObjectChunk();
-        final ObjectChunk<Object, Values> keyChunk1 = sourceKeyChunks[1].asObjectChunk();
-        final int chunkSize = keyChunk0.size();
-        for (int chunkPosition = 0; chunkPosition < chunkSize; ++chunkPosition) {
-            final Object k0 = keyChunk0.get(chunkPosition);
-            final Object k1 = keyChunk1.get(chunkPosition);
-            final int hash = hash(k0, k1);
-            final int tableLocation = hashToTableLocation(tableHashPivot, hash);
-            if (mainOutputPosition.getUnsafe(tableLocation) == EMPTY_OUTPUT_POSITION) {
-                numEntries++;
-                mainKeySource0.set(tableLocation, k0);
-                mainKeySource1.set(tableLocation, k1);
-                handler.doMainInsert(tableLocation, chunkPosition);
-            } else if (eq(mainKeySource0.getUnsafe(tableLocation), k0) && eq(mainKeySource1.getUnsafe(tableLocation), k1)) {
-                handler.doMainFound(tableLocation, chunkPosition);
-            } else {
-                int overflowLocation = mainOverflowLocationSource.getUnsafe(tableLocation);
-                if (!findOverflow(handler, k0, k1, chunkPosition, overflowLocation)) {
-                    final int newOverflowLocation = allocateOverflowLocation();
-                    overflowKeySource0.set(newOverflowLocation, k0);
-                    overflowKeySource1.set(newOverflowLocation, k1);
-                    mainOverflowLocationSource.set(tableLocation, newOverflowLocation);
-                    overflowOverflowLocationSource.set(newOverflowLocation, overflowLocation);
-                    numEntries++;
-                    handler.doOverflowInsert(newOverflowLocation, chunkPosition);
-                }
-            }
-        }
-    }
-
-    @Override
-    protected void probe(HashHandler handler, RowSequence rowSequence, Chunk[] sourceKeyChunks) {
-        final ObjectChunk<Object, Values> keyChunk0 = sourceKeyChunks[0].asObjectChunk();
-        final ObjectChunk<Object, Values> keyChunk1 = sourceKeyChunks[1].asObjectChunk();
-        final int chunkSize = keyChunk0.size();
-        for (int chunkPosition = 0; chunkPosition < chunkSize; ++chunkPosition) {
-            final Object k0 = keyChunk0.get(chunkPosition);
-            final Object k1 = keyChunk1.get(chunkPosition);
-            final int hash = hash(k0, k1);
-            final int tableLocation = hashToTableLocation(tableHashPivot, hash);
-            if (mainOutputPosition.getUnsafe(tableLocation) == EMPTY_OUTPUT_POSITION) {
-                handler.doMissing(chunkPosition);
-            } else if (eq(mainKeySource0.getUnsafe(tableLocation), k0) && eq(mainKeySource1.getUnsafe(tableLocation), k1)) {
-                handler.doMainFound(tableLocation, chunkPosition);
-            } else {
-                int overflowLocation = mainOverflowLocationSource.getUnsafe(tableLocation);
-                if (!findOverflow(handler, k0, k1, chunkPosition, overflowLocation)) {
-                    handler.doMissing(chunkPosition);
-                }
-            }
-        }
-    }
-
-    private static int hash(Object k0, Object k1) {
-        int hash = ObjectChunkHasher.hashInitialSingle(k0);
-        hash = ObjectChunkHasher.hashUpdateSingle(hash, k1);
-        return hash;
-    }
-
-    @Override
-    protected void rehashBucket(HashHandler handler, int sourceBucket, int destBucket,
-            int bucketsToAdd) {
-        final int position = mainOutputPosition.getUnsafe(sourceBucket);
-        if (position == EMPTY_OUTPUT_POSITION) {
-            return;
-        }
-        int mainInsertLocation = maybeMoveMainBucket(handler, sourceBucket, destBucket, bucketsToAdd);
-        int overflowLocation = mainOverflowLocationSource.getUnsafe(sourceBucket);
-        mainOverflowLocationSource.set(sourceBucket, QueryConstants.NULL_INT);
-        mainOverflowLocationSource.set(destBucket, QueryConstants.NULL_INT);
-        while (overflowLocation != QueryConstants.NULL_INT) {
-            final int nextOverflowLocation = overflowOverflowLocationSource.getUnsafe(overflowLocation);
-            final Object overflowKey0 = overflowKeySource0.getUnsafe(overflowLocation);
-            final Object overflowKey1 = overflowKeySource1.getUnsafe(overflowLocation);
-            final int overflowHash = hash(overflowKey0, overflowKey1);
-            final int overflowTableLocation = hashToTableLocation(tableHashPivot + bucketsToAdd, overflowHash);
-            if (overflowTableLocation == mainInsertLocation) {
-                mainKeySource0.set(mainInsertLocation, overflowKey0);
-                mainKeySource1.set(mainInsertLocation, overflowKey1);
-                mainOutputPosition.set(mainInsertLocation, overflowOutputPosition.getUnsafe(overflowLocation));
-                handler.doPromoteOverflow(overflowLocation, mainInsertLocation);
-                overflowOutputPosition.set(overflowLocation, QueryConstants.NULL_INT);
-                overflowKeySource0.set(overflowLocation, null);
-                overflowKeySource1.set(overflowLocation, null);
-                freeOverflowLocation(overflowLocation);
-                mainInsertLocation = -1;
-            } else {
-                final int oldOverflowLocation = mainOverflowLocationSource.getUnsafe(overflowTableLocation);
-                mainOverflowLocationSource.set(overflowTableLocation, overflowLocation);
-                overflowOverflowLocationSource.set(overflowLocation, oldOverflowLocation);
-            }
-            overflowLocation = nextOverflowLocation;
-        }
-    }
-
-    private int maybeMoveMainBucket(HashHandler handler, int sourceBucket, int destBucket,
-            int bucketsToAdd) {
-        final Object k0 = mainKeySource0.getUnsafe(sourceBucket);
-        final Object k1 = mainKeySource1.getUnsafe(sourceBucket);
-        final int hash = hash(k0, k1);
-        final int location = hashToTableLocation(tableHashPivot + bucketsToAdd, hash);
-        final int mainInsertLocation;
-        if (location == sourceBucket) {
-            mainInsertLocation = destBucket;
-            mainOutputPosition.set(destBucket, EMPTY_OUTPUT_POSITION);
-        } else {
-            mainInsertLocation = sourceBucket;
-            mainOutputPosition.set(destBucket, mainOutputPosition.getUnsafe(sourceBucket));
-            mainOutputPosition.set(sourceBucket, EMPTY_OUTPUT_POSITION);
-            mainKeySource0.set(destBucket, k0);
-            mainKeySource0.set(sourceBucket, null);
-            mainKeySource1.set(destBucket, k1);
-            mainKeySource1.set(sourceBucket, null);
-            handler.doMoveMain(sourceBucket, destBucket);
-        }
-        return mainInsertLocation;
-    }
-
-    private boolean findOverflow(HashHandler handler, Object k0, Object k1, int chunkPosition,
-            int overflowLocation) {
-        while (overflowLocation != QueryConstants.NULL_INT) {
-            if (eq(overflowKeySource0.getUnsafe(overflowLocation), k0) && eq(overflowKeySource1.getUnsafe(overflowLocation), k1)) {
-                handler.doOverflowFound(overflowLocation, chunkPosition);
-                return true;
-            }
-            overflowLocation = overflowOverflowLocationSource.getUnsafe(overflowLocation);
-        }
-        return false;
-    }
-
-    @Override
-    public int findPositionForKey(Object key) {
-        final Object [] ka = (Object[])key;
-        final Object k0 = ka[0];
-        final Object k1 = ka[1];
-        int hash = hash(k0, k1);
-        final int tableLocation = hashToTableLocation(tableHashPivot, hash);
-        final int positionValue = mainOutputPosition.getUnsafe(tableLocation);
-        if (positionValue == EMPTY_OUTPUT_POSITION) {
-            return -1;
-        }
-        if (eq(mainKeySource0.getUnsafe(tableLocation), k0) && eq(mainKeySource1.getUnsafe(tableLocation), k1)) {
-            return positionValue;
-        }
-        int overflowLocation = mainOverflowLocationSource.getUnsafe(tableLocation);
-        while (overflowLocation != QueryConstants.NULL_INT) {
-            if (eq(overflowKeySource0.getUnsafe(overflowLocation), k0) && eq(overflowKeySource1.getUnsafe(overflowLocation), k1)) {
-                return overflowOutputPosition.getUnsafe(overflowLocation);
-            }
-            overflowLocation = overflowOverflowLocationSource.getUnsafe(overflowLocation);
-        }
-        return -1;
-    }
-}
diff --git a/engine/table/src/main/java/io/deephaven/engine/table/impl/by/typed/incagg/gen/IncrementalAggHasherObjectShort.java b/engine/table/src/main/java/io/deephaven/engine/table/impl/by/typed/incagg/gen/IncrementalAggHasherObjectShort.java
deleted file mode 100644
index 31e3e53ccd7..00000000000
--- a/engine/table/src/main/java/io/deephaven/engine/table/impl/by/typed/incagg/gen/IncrementalAggHasherObjectShort.java
+++ /dev/null
@@ -1,205 +0,0 @@
-//
-// Copyright (c) 2016-2024 Deephaven Data Labs and Patent Pending
-//
-// ****** AUTO-GENERATED CLASS - DO NOT EDIT MANUALLY
-// ****** Run ReplicateTypedHashers or ./gradlew replicateTypedHashers to regenerate
-//
-// @formatter:off
-package io.deephaven.engine.table.impl.by.typed.incagg.gen;
-
-import static io.deephaven.util.compare.ObjectComparisons.eq;
-import static io.deephaven.util.compare.ShortComparisons.eq;
-
-import io.deephaven.chunk.Chunk;
-import io.deephaven.chunk.ObjectChunk;
-import io.deephaven.chunk.ShortChunk;
-import io.deephaven.chunk.attributes.Values;
-import io.deephaven.chunk.util.hashing.ObjectChunkHasher;
-import io.deephaven.chunk.util.hashing.ShortChunkHasher;
-import io.deephaven.engine.rowset.RowSequence;
-import io.deephaven.engine.table.ColumnSource;
-import io.deephaven.engine.table.impl.by.HashHandler;
-import io.deephaven.engine.table.impl.by.IncrementalChunkedOperatorAggregationStateManagerTypedBase;
-import io.deephaven.engine.table.impl.sources.ObjectArraySource;
-import io.deephaven.engine.table.impl.sources.ShortArraySource;
-import io.deephaven.util.QueryConstants;
-import io.deephaven.util.type.TypeUtils;
-import java.lang.Object;
-import java.lang.Override;
-import java.lang.Short;
-
-final class IncrementalAggHasherObjectShort extends IncrementalChunkedOperatorAggregationStateManagerTypedBase {
-    private final ObjectArraySource mainKeySource0;
-
-    private final ObjectArraySource overflowKeySource0;
-
-    private final ShortArraySource mainKeySource1;
-
-    private final ShortArraySource overflowKeySource1;
-
-    public IncrementalAggHasherObjectShort(ColumnSource[] tableKeySources,
-            ColumnSource[] originalTableKeySources, int tableSize, double maximumLoadFactor,
-            double targetLoadFactor) {
-        super(tableKeySources, tableSize, maximumLoadFactor, targetLoadFactor);
-        this.mainKeySource0 = (ObjectArraySource) super.mainKeySources[0];
-        this.overflowKeySource0 = (ObjectArraySource) super.overflowKeySources[0];
-        this.mainKeySource1 = (ShortArraySource) super.mainKeySources[1];
-        this.overflowKeySource1 = (ShortArraySource) super.overflowKeySources[1];
-    }
-
-    @Override
-    protected void build(HashHandler handler, RowSequence rowSequence, Chunk[] sourceKeyChunks) {
-        final ObjectChunk<Object, Values> keyChunk0 = sourceKeyChunks[0].asObjectChunk();
-        final ShortChunk<Values> keyChunk1 = sourceKeyChunks[1].asShortChunk();
-        final int chunkSize = keyChunk0.size();
-        for (int chunkPosition = 0; chunkPosition < chunkSize; ++chunkPosition) {
-            final Object k0 = keyChunk0.get(chunkPosition);
-            final short k1 = keyChunk1.get(chunkPosition);
-            final int hash = hash(k0, k1);
-            final int tableLocation = hashToTableLocation(tableHashPivot, hash);
-            if (mainOutputPosition.getUnsafe(tableLocation) == EMPTY_OUTPUT_POSITION) {
-                numEntries++;
-                mainKeySource0.set(tableLocation, k0);
-                mainKeySource1.set(tableLocation, k1);
-                handler.doMainInsert(tableLocation, chunkPosition);
-            } else if (eq(mainKeySource0.getUnsafe(tableLocation), k0) && eq(mainKeySource1.getUnsafe(tableLocation), k1)) {
-                handler.doMainFound(tableLocation, chunkPosition);
-            } else {
-                int overflowLocation = mainOverflowLocationSource.getUnsafe(tableLocation);
-                if (!findOverflow(handler, k0, k1, chunkPosition, overflowLocation)) {
-                    final int newOverflowLocation = allocateOverflowLocation();
-                    overflowKeySource0.set(newOverflowLocation, k0);
-                    overflowKeySource1.set(newOverflowLocation, k1);
-                    mainOverflowLocationSource.set(tableLocation, newOverflowLocation);
-                    overflowOverflowLocationSource.set(newOverflowLocation, overflowLocation);
-                    numEntries++;
-                    handler.doOverflowInsert(newOverflowLocation, chunkPosition);
-                }
-            }
-        }
-    }
-
-    @Override
-    protected void probe(HashHandler handler, RowSequence rowSequence, Chunk[] sourceKeyChunks) {
-        final ObjectChunk<Object, Values> keyChunk0 = sourceKeyChunks[0].asObjectChunk();
-        final ShortChunk<Values> keyChunk1 = sourceKeyChunks[1].asShortChunk();
-        final int chunkSize = keyChunk0.size();
-        for (int chunkPosition = 0; chunkPosition < chunkSize; ++chunkPosition) {
-            final Object k0 = keyChunk0.get(chunkPosition);
-            final short k1 = keyChunk1.get(chunkPosition);
-            final int hash = hash(k0, k1);
-            final int tableLocation = hashToTableLocation(tableHashPivot, hash);
-            if (mainOutputPosition.getUnsafe(tableLocation) == EMPTY_OUTPUT_POSITION) {
-                handler.doMissing(chunkPosition);
-            } else if (eq(mainKeySource0.getUnsafe(tableLocation), k0) && eq(mainKeySource1.getUnsafe(tableLocation), k1)) {
-                handler.doMainFound(tableLocation, chunkPosition);
-            } else {
-                int overflowLocation = mainOverflowLocationSource.getUnsafe(tableLocation);
-                if (!findOverflow(handler, k0, k1, chunkPosition, overflowLocation)) {
-                    handler.doMissing(chunkPosition);
-                }
-            }
-        }
-    }
-
-    private static int hash(Object k0, short k1) {
-        int hash = ObjectChunkHasher.hashInitialSingle(k0);
-        hash = ShortChunkHasher.hashUpdateSingle(hash, k1);
-        return hash;
-    }
-
-    @Override
-    protected void rehashBucket(HashHandler handler, int sourceBucket, int destBucket,
-            int bucketsToAdd) {
-        final int position = mainOutputPosition.getUnsafe(sourceBucket);
-        if (position == EMPTY_OUTPUT_POSITION) {
-            return;
-        }
-        int mainInsertLocation = maybeMoveMainBucket(handler, sourceBucket, destBucket, bucketsToAdd);
-        int overflowLocation = mainOverflowLocationSource.getUnsafe(sourceBucket);
-        mainOverflowLocationSource.set(sourceBucket, QueryConstants.NULL_INT);
-        mainOverflowLocationSource.set(destBucket, QueryConstants.NULL_INT);
-        while (overflowLocation != QueryConstants.NULL_INT) {
-            final int nextOverflowLocation = overflowOverflowLocationSource.getUnsafe(overflowLocation);
-            final Object overflowKey0 = overflowKeySource0.getUnsafe(overflowLocation);
-            final short overflowKey1 = overflowKeySource1.getUnsafe(overflowLocation);
-            final int overflowHash = hash(overflowKey0, overflowKey1);
-            final int overflowTableLocation = hashToTableLocation(tableHashPivot + bucketsToAdd, overflowHash);
-            if (overflowTableLocation == mainInsertLocation) {
-                mainKeySource0.set(mainInsertLocation, overflowKey0);
-                mainKeySource1.set(mainInsertLocation, overflowKey1);
-                mainOutputPosition.set(mainInsertLocation, overflowOutputPosition.getUnsafe(overflowLocation));
-                handler.doPromoteOverflow(overflowLocation, mainInsertLocation);
-                overflowOutputPosition.set(overflowLocation, QueryConstants.NULL_INT);
-                overflowKeySource0.set(overflowLocation, null);
-                overflowKeySource1.set(overflowLocation, QueryConstants.NULL_SHORT);
-                freeOverflowLocation(overflowLocation);
-                mainInsertLocation = -1;
-            } else {
-                final int oldOverflowLocation = mainOverflowLocationSource.getUnsafe(overflowTableLocation);
-                mainOverflowLocationSource.set(overflowTableLocation, overflowLocation);
-                overflowOverflowLocationSource.set(overflowLocation, oldOverflowLocation);
-            }
-            overflowLocation = nextOverflowLocation;
-        }
-    }
-
-    private int maybeMoveMainBucket(HashHandler handler, int sourceBucket, int destBucket,
-            int bucketsToAdd) {
-        final Object k0 = mainKeySource0.getUnsafe(sourceBucket);
-        final short k1 = mainKeySource1.getUnsafe(sourceBucket);
-        final int hash = hash(k0, k1);
-        final int location = hashToTableLocation(tableHashPivot + bucketsToAdd, hash);
-        final int mainInsertLocation;
-        if (location == sourceBucket) {
-            mainInsertLocation = destBucket;
-            mainOutputPosition.set(destBucket, EMPTY_OUTPUT_POSITION);
-        } else {
-            mainInsertLocation = sourceBucket;
-            mainOutputPosition.set(destBucket, mainOutputPosition.getUnsafe(sourceBucket));
-            mainOutputPosition.set(sourceBucket, EMPTY_OUTPUT_POSITION);
-            mainKeySource0.set(destBucket, k0);
-            mainKeySource0.set(sourceBucket, null);
-            mainKeySource1.set(destBucket, k1);
-            mainKeySource1.set(sourceBucket, QueryConstants.NULL_SHORT);
-            handler.doMoveMain(sourceBucket, destBucket);
-        }
-        return mainInsertLocation;
-    }
-
-    private boolean findOverflow(HashHandler handler, Object k0, short k1, int chunkPosition,
-            int overflowLocation) {
-        while (overflowLocation != QueryConstants.NULL_INT) {
-            if (eq(overflowKeySource0.getUnsafe(overflowLocation), k0) && eq(overflowKeySource1.getUnsafe(overflowLocation), k1)) {
-                handler.doOverflowFound(overflowLocation, chunkPosition);
-                return true;
-            }
-            overflowLocation = overflowOverflowLocationSource.getUnsafe(overflowLocation);
-        }
-        return false;
-    }
-
-    @Override
-    public int findPositionForKey(Object key) {
-        final Object [] ka = (Object[])key;
-        final Object k0 = ka[0];
-        final short k1 = TypeUtils.unbox((Short)ka[1]);
-        int hash = hash(k0, k1);
-        final int tableLocation = hashToTableLocation(tableHashPivot, hash);
-        final int positionValue = mainOutputPosition.getUnsafe(tableLocation);
-        if (positionValue == EMPTY_OUTPUT_POSITION) {
-            return -1;
-        }
-        if (eq(mainKeySource0.getUnsafe(tableLocation), k0) && eq(mainKeySource1.getUnsafe(tableLocation), k1)) {
-            return positionValue;
-        }
-        int overflowLocation = mainOverflowLocationSource.getUnsafe(tableLocation);
-        while (overflowLocation != QueryConstants.NULL_INT) {
-            if (eq(overflowKeySource0.getUnsafe(overflowLocation), k0) && eq(overflowKeySource1.getUnsafe(overflowLocation), k1)) {
-                return overflowOutputPosition.getUnsafe(overflowLocation);
-            }
-            overflowLocation = overflowOverflowLocationSource.getUnsafe(overflowLocation);
-        }
-        return -1;
-    }
-}
diff --git a/engine/table/src/main/java/io/deephaven/engine/table/impl/by/typed/incagg/gen/IncrementalAggHasherShort.java b/engine/table/src/main/java/io/deephaven/engine/table/impl/by/typed/incagg/gen/IncrementalAggHasherShort.java
deleted file mode 100644
index 83d8003b595..00000000000
--- a/engine/table/src/main/java/io/deephaven/engine/table/impl/by/typed/incagg/gen/IncrementalAggHasherShort.java
+++ /dev/null
@@ -1,180 +0,0 @@
-//
-// Copyright (c) 2016-2024 Deephaven Data Labs and Patent Pending
-//
-// ****** AUTO-GENERATED CLASS - DO NOT EDIT MANUALLY
-// ****** Run ReplicateTypedHashers or ./gradlew replicateTypedHashers to regenerate
-//
-// @formatter:off
-package io.deephaven.engine.table.impl.by.typed.incagg.gen;
-
-import static io.deephaven.util.compare.ShortComparisons.eq;
-
-import io.deephaven.chunk.Chunk;
-import io.deephaven.chunk.ShortChunk;
-import io.deephaven.chunk.attributes.Values;
-import io.deephaven.chunk.util.hashing.ShortChunkHasher;
-import io.deephaven.engine.rowset.RowSequence;
-import io.deephaven.engine.table.ColumnSource;
-import io.deephaven.engine.table.impl.by.HashHandler;
-import io.deephaven.engine.table.impl.by.IncrementalChunkedOperatorAggregationStateManagerTypedBase;
-import io.deephaven.engine.table.impl.sources.ShortArraySource;
-import io.deephaven.util.QueryConstants;
-import io.deephaven.util.type.TypeUtils;
-import java.lang.Object;
-import java.lang.Override;
-import java.lang.Short;
-
-final class IncrementalAggHasherShort extends IncrementalChunkedOperatorAggregationStateManagerTypedBase {
-    private final ShortArraySource mainKeySource0;
-
-    private final ShortArraySource overflowKeySource0;
-
-    public IncrementalAggHasherShort(ColumnSource[] tableKeySources,
-            ColumnSource[] originalTableKeySources, int tableSize, double maximumLoadFactor,
-            double targetLoadFactor) {
-        super(tableKeySources, tableSize, maximumLoadFactor, targetLoadFactor);
-        this.mainKeySource0 = (ShortArraySource) super.mainKeySources[0];
-        this.overflowKeySource0 = (ShortArraySource) super.overflowKeySources[0];
-    }
-
-    @Override
-    protected void build(HashHandler handler, RowSequence rowSequence, Chunk[] sourceKeyChunks) {
-        final ShortChunk<Values> keyChunk0 = sourceKeyChunks[0].asShortChunk();
-        final int chunkSize = keyChunk0.size();
-        for (int chunkPosition = 0; chunkPosition < chunkSize; ++chunkPosition) {
-            final short k0 = keyChunk0.get(chunkPosition);
-            final int hash = hash(k0);
-            final int tableLocation = hashToTableLocation(tableHashPivot, hash);
-            if (mainOutputPosition.getUnsafe(tableLocation) == EMPTY_OUTPUT_POSITION) {
-                numEntries++;
-                mainKeySource0.set(tableLocation, k0);
-                handler.doMainInsert(tableLocation, chunkPosition);
-            } else if (eq(mainKeySource0.getUnsafe(tableLocation), k0)) {
-                handler.doMainFound(tableLocation, chunkPosition);
-            } else {
-                int overflowLocation = mainOverflowLocationSource.getUnsafe(tableLocation);
-                if (!findOverflow(handler, k0, chunkPosition, overflowLocation)) {
-                    final int newOverflowLocation = allocateOverflowLocation();
-                    overflowKeySource0.set(newOverflowLocation, k0);
-                    mainOverflowLocationSource.set(tableLocation, newOverflowLocation);
-                    overflowOverflowLocationSource.set(newOverflowLocation, overflowLocation);
-                    numEntries++;
-                    handler.doOverflowInsert(newOverflowLocation, chunkPosition);
-                }
-            }
-        }
-    }
-
-    @Override
-    protected void probe(HashHandler handler, RowSequence rowSequence, Chunk[] sourceKeyChunks) {
-        final ShortChunk<Values> keyChunk0 = sourceKeyChunks[0].asShortChunk();
-        final int chunkSize = keyChunk0.size();
-        for (int chunkPosition = 0; chunkPosition < chunkSize; ++chunkPosition) {
-            final short k0 = keyChunk0.get(chunkPosition);
-            final int hash = hash(k0);
-            final int tableLocation = hashToTableLocation(tableHashPivot, hash);
-            if (mainOutputPosition.getUnsafe(tableLocation) == EMPTY_OUTPUT_POSITION) {
-                handler.doMissing(chunkPosition);
-            } else if (eq(mainKeySource0.getUnsafe(tableLocation), k0)) {
-                handler.doMainFound(tableLocation, chunkPosition);
-            } else {
-                int overflowLocation = mainOverflowLocationSource.getUnsafe(tableLocation);
-                if (!findOverflow(handler, k0, chunkPosition, overflowLocation)) {
-                    handler.doMissing(chunkPosition);
-                }
-            }
-        }
-    }
-
-    private static int hash(short k0) {
-        int hash = ShortChunkHasher.hashInitialSingle(k0);
-        return hash;
-    }
-
-    @Override
-    protected void rehashBucket(HashHandler handler, int sourceBucket, int destBucket,
-            int bucketsToAdd) {
-        final int position = mainOutputPosition.getUnsafe(sourceBucket);
-        if (position == EMPTY_OUTPUT_POSITION) {
-            return;
-        }
-        int mainInsertLocation = maybeMoveMainBucket(handler, sourceBucket, destBucket, bucketsToAdd);
-        int overflowLocation = mainOverflowLocationSource.getUnsafe(sourceBucket);
-        mainOverflowLocationSource.set(sourceBucket, QueryConstants.NULL_INT);
-        mainOverflowLocationSource.set(destBucket, QueryConstants.NULL_INT);
-        while (overflowLocation != QueryConstants.NULL_INT) {
-            final int nextOverflowLocation = overflowOverflowLocationSource.getUnsafe(overflowLocation);
-            final short overflowKey0 = overflowKeySource0.getUnsafe(overflowLocation);
-            final int overflowHash = hash(overflowKey0);
-            final int overflowTableLocation = hashToTableLocation(tableHashPivot + bucketsToAdd, overflowHash);
-            if (overflowTableLocation == mainInsertLocation) {
-                mainKeySource0.set(mainInsertLocation, overflowKey0);
-                mainOutputPosition.set(mainInsertLocation, overflowOutputPosition.getUnsafe(overflowLocation));
-                handler.doPromoteOverflow(overflowLocation, mainInsertLocation);
-                overflowOutputPosition.set(overflowLocation, QueryConstants.NULL_INT);
-                overflowKeySource0.set(overflowLocation, QueryConstants.NULL_SHORT);
-                freeOverflowLocation(overflowLocation);
-                mainInsertLocation = -1;
-            } else {
-                final int oldOverflowLocation = mainOverflowLocationSource.getUnsafe(overflowTableLocation);
-                mainOverflowLocationSource.set(overflowTableLocation, overflowLocation);
-                overflowOverflowLocationSource.set(overflowLocation, oldOverflowLocation);
-            }
-            overflowLocation = nextOverflowLocation;
-        }
-    }
-
-    private int maybeMoveMainBucket(HashHandler handler, int sourceBucket, int destBucket,
-            int bucketsToAdd) {
-        final short k0 = mainKeySource0.getUnsafe(sourceBucket);
-        final int hash = hash(k0);
-        final int location = hashToTableLocation(tableHashPivot + bucketsToAdd, hash);
-        final int mainInsertLocation;
-        if (location == sourceBucket) {
-            mainInsertLocation = destBucket;
-            mainOutputPosition.set(destBucket, EMPTY_OUTPUT_POSITION);
-        } else {
-            mainInsertLocation = sourceBucket;
-            mainOutputPosition.set(destBucket, mainOutputPosition.getUnsafe(sourceBucket));
-            mainOutputPosition.set(sourceBucket, EMPTY_OUTPUT_POSITION);
-            mainKeySource0.set(destBucket, k0);
-            mainKeySource0.set(sourceBucket, QueryConstants.NULL_SHORT);
-            handler.doMoveMain(sourceBucket, destBucket);
-        }
-        return mainInsertLocation;
-    }
-
-    private boolean findOverflow(HashHandler handler, short k0, int chunkPosition,
-            int overflowLocation) {
-        while (overflowLocation != QueryConstants.NULL_INT) {
-            if (eq(overflowKeySource0.getUnsafe(overflowLocation), k0)) {
-                handler.doOverflowFound(overflowLocation, chunkPosition);
-                return true;
-            }
-            overflowLocation = overflowOverflowLocationSource.getUnsafe(overflowLocation);
-        }
-        return false;
-    }
-
-    @Override
-    public int findPositionForKey(Object key) {
-        final short k0 = TypeUtils.unbox((Short)key);
-        int hash = hash(k0);
-        final int tableLocation = hashToTableLocation(tableHashPivot, hash);
-        final int positionValue = mainOutputPosition.getUnsafe(tableLocation);
-        if (positionValue == EMPTY_OUTPUT_POSITION) {
-            return -1;
-        }
-        if (eq(mainKeySource0.getUnsafe(tableLocation), k0)) {
-            return positionValue;
-        }
-        int overflowLocation = mainOverflowLocationSource.getUnsafe(tableLocation);
-        while (overflowLocation != QueryConstants.NULL_INT) {
-            if (eq(overflowKeySource0.getUnsafe(overflowLocation), k0)) {
-                return overflowOutputPosition.getUnsafe(overflowLocation);
-            }
-            overflowLocation = overflowOverflowLocationSource.getUnsafe(overflowLocation);
-        }
-        return -1;
-    }
-}
diff --git a/engine/table/src/main/java/io/deephaven/engine/table/impl/by/typed/incagg/gen/IncrementalAggHasherShortByte.java b/engine/table/src/main/java/io/deephaven/engine/table/impl/by/typed/incagg/gen/IncrementalAggHasherShortByte.java
deleted file mode 100644
index 5acffa9fb59..00000000000
--- a/engine/table/src/main/java/io/deephaven/engine/table/impl/by/typed/incagg/gen/IncrementalAggHasherShortByte.java
+++ /dev/null
@@ -1,206 +0,0 @@
-//
-// Copyright (c) 2016-2024 Deephaven Data Labs and Patent Pending
-//
-// ****** AUTO-GENERATED CLASS - DO NOT EDIT MANUALLY
-// ****** Run ReplicateTypedHashers or ./gradlew replicateTypedHashers to regenerate
-//
-// @formatter:off
-package io.deephaven.engine.table.impl.by.typed.incagg.gen;
-
-import static io.deephaven.util.compare.ByteComparisons.eq;
-import static io.deephaven.util.compare.ShortComparisons.eq;
-
-import io.deephaven.chunk.ByteChunk;
-import io.deephaven.chunk.Chunk;
-import io.deephaven.chunk.ShortChunk;
-import io.deephaven.chunk.attributes.Values;
-import io.deephaven.chunk.util.hashing.ByteChunkHasher;
-import io.deephaven.chunk.util.hashing.ShortChunkHasher;
-import io.deephaven.engine.rowset.RowSequence;
-import io.deephaven.engine.table.ColumnSource;
-import io.deephaven.engine.table.impl.by.HashHandler;
-import io.deephaven.engine.table.impl.by.IncrementalChunkedOperatorAggregationStateManagerTypedBase;
-import io.deephaven.engine.table.impl.sources.ByteArraySource;
-import io.deephaven.engine.table.impl.sources.ShortArraySource;
-import io.deephaven.util.QueryConstants;
-import io.deephaven.util.type.TypeUtils;
-import java.lang.Byte;
-import java.lang.Object;
-import java.lang.Override;
-import java.lang.Short;
-
-final class IncrementalAggHasherShortByte extends IncrementalChunkedOperatorAggregationStateManagerTypedBase {
-    private final ShortArraySource mainKeySource0;
-
-    private final ShortArraySource overflowKeySource0;
-
-    private final ByteArraySource mainKeySource1;
-
-    private final ByteArraySource overflowKeySource1;
-
-    public IncrementalAggHasherShortByte(ColumnSource[] tableKeySources,
-            ColumnSource[] originalTableKeySources, int tableSize, double maximumLoadFactor,
-            double targetLoadFactor) {
-        super(tableKeySources, tableSize, maximumLoadFactor, targetLoadFactor);
-        this.mainKeySource0 = (ShortArraySource) super.mainKeySources[0];
-        this.overflowKeySource0 = (ShortArraySource) super.overflowKeySources[0];
-        this.mainKeySource1 = (ByteArraySource) super.mainKeySources[1];
-        this.overflowKeySource1 = (ByteArraySource) super.overflowKeySources[1];
-    }
-
-    @Override
-    protected void build(HashHandler handler, RowSequence rowSequence, Chunk[] sourceKeyChunks) {
-        final ShortChunk<Values> keyChunk0 = sourceKeyChunks[0].asShortChunk();
-        final ByteChunk<Values> keyChunk1 = sourceKeyChunks[1].asByteChunk();
-        final int chunkSize = keyChunk0.size();
-        for (int chunkPosition = 0; chunkPosition < chunkSize; ++chunkPosition) {
-            final short k0 = keyChunk0.get(chunkPosition);
-            final byte k1 = keyChunk1.get(chunkPosition);
-            final int hash = hash(k0, k1);
-            final int tableLocation = hashToTableLocation(tableHashPivot, hash);
-            if (mainOutputPosition.getUnsafe(tableLocation) == EMPTY_OUTPUT_POSITION) {
-                numEntries++;
-                mainKeySource0.set(tableLocation, k0);
-                mainKeySource1.set(tableLocation, k1);
-                handler.doMainInsert(tableLocation, chunkPosition);
-            } else if (eq(mainKeySource0.getUnsafe(tableLocation), k0) && eq(mainKeySource1.getUnsafe(tableLocation), k1)) {
-                handler.doMainFound(tableLocation, chunkPosition);
-            } else {
-                int overflowLocation = mainOverflowLocationSource.getUnsafe(tableLocation);
-                if (!findOverflow(handler, k0, k1, chunkPosition, overflowLocation)) {
-                    final int newOverflowLocation = allocateOverflowLocation();
-                    overflowKeySource0.set(newOverflowLocation, k0);
-                    overflowKeySource1.set(newOverflowLocation, k1);
-                    mainOverflowLocationSource.set(tableLocation, newOverflowLocation);
-                    overflowOverflowLocationSource.set(newOverflowLocation, overflowLocation);
-                    numEntries++;
-                    handler.doOverflowInsert(newOverflowLocation, chunkPosition);
-                }
-            }
-        }
-    }
-
-    @Override
-    protected void probe(HashHandler handler, RowSequence rowSequence, Chunk[] sourceKeyChunks) {
-        final ShortChunk<Values> keyChunk0 = sourceKeyChunks[0].asShortChunk();
-        final ByteChunk<Values> keyChunk1 = sourceKeyChunks[1].asByteChunk();
-        final int chunkSize = keyChunk0.size();
-        for (int chunkPosition = 0; chunkPosition < chunkSize; ++chunkPosition) {
-            final short k0 = keyChunk0.get(chunkPosition);
-            final byte k1 = keyChunk1.get(chunkPosition);
-            final int hash = hash(k0, k1);
-            final int tableLocation = hashToTableLocation(tableHashPivot, hash);
-            if (mainOutputPosition.getUnsafe(tableLocation) == EMPTY_OUTPUT_POSITION) {
-                handler.doMissing(chunkPosition);
-            } else if (eq(mainKeySource0.getUnsafe(tableLocation), k0) && eq(mainKeySource1.getUnsafe(tableLocation), k1)) {
-                handler.doMainFound(tableLocation, chunkPosition);
-            } else {
-                int overflowLocation = mainOverflowLocationSource.getUnsafe(tableLocation);
-                if (!findOverflow(handler, k0, k1, chunkPosition, overflowLocation)) {
-                    handler.doMissing(chunkPosition);
-                }
-            }
-        }
-    }
-
-    private static int hash(short k0, byte k1) {
-        int hash = ShortChunkHasher.hashInitialSingle(k0);
-        hash = ByteChunkHasher.hashUpdateSingle(hash, k1);
-        return hash;
-    }
-
-    @Override
-    protected void rehashBucket(HashHandler handler, int sourceBucket, int destBucket,
-            int bucketsToAdd) {
-        final int position = mainOutputPosition.getUnsafe(sourceBucket);
-        if (position == EMPTY_OUTPUT_POSITION) {
-            return;
-        }
-        int mainInsertLocation = maybeMoveMainBucket(handler, sourceBucket, destBucket, bucketsToAdd);
-        int overflowLocation = mainOverflowLocationSource.getUnsafe(sourceBucket);
-        mainOverflowLocationSource.set(sourceBucket, QueryConstants.NULL_INT);
-        mainOverflowLocationSource.set(destBucket, QueryConstants.NULL_INT);
-        while (overflowLocation != QueryConstants.NULL_INT) {
-            final int nextOverflowLocation = overflowOverflowLocationSource.getUnsafe(overflowLocation);
-            final short overflowKey0 = overflowKeySource0.getUnsafe(overflowLocation);
-            final byte overflowKey1 = overflowKeySource1.getUnsafe(overflowLocation);
-            final int overflowHash = hash(overflowKey0, overflowKey1);
-            final int overflowTableLocation = hashToTableLocation(tableHashPivot + bucketsToAdd, overflowHash);
-            if (overflowTableLocation == mainInsertLocation) {
-                mainKeySource0.set(mainInsertLocation, overflowKey0);
-                mainKeySource1.set(mainInsertLocation, overflowKey1);
-                mainOutputPosition.set(mainInsertLocation, overflowOutputPosition.getUnsafe(overflowLocation));
-                handler.doPromoteOverflow(overflowLocation, mainInsertLocation);
-                overflowOutputPosition.set(overflowLocation, QueryConstants.NULL_INT);
-                overflowKeySource0.set(overflowLocation, QueryConstants.NULL_SHORT);
-                overflowKeySource1.set(overflowLocation, QueryConstants.NULL_BYTE);
-                freeOverflowLocation(overflowLocation);
-                mainInsertLocation = -1;
-            } else {
-                final int oldOverflowLocation = mainOverflowLocationSource.getUnsafe(overflowTableLocation);
-                mainOverflowLocationSource.set(overflowTableLocation, overflowLocation);
-                overflowOverflowLocationSource.set(overflowLocation, oldOverflowLocation);
-            }
-            overflowLocation = nextOverflowLocation;
-        }
-    }
-
-    private int maybeMoveMainBucket(HashHandler handler, int sourceBucket, int destBucket,
-            int bucketsToAdd) {
-        final short k0 = mainKeySource0.getUnsafe(sourceBucket);
-        final byte k1 = mainKeySource1.getUnsafe(sourceBucket);
-        final int hash = hash(k0, k1);
-        final int location = hashToTableLocation(tableHashPivot + bucketsToAdd, hash);
-        final int mainInsertLocation;
-        if (location == sourceBucket) {
-            mainInsertLocation = destBucket;
-            mainOutputPosition.set(destBucket, EMPTY_OUTPUT_POSITION);
-        } else {
-            mainInsertLocation = sourceBucket;
-            mainOutputPosition.set(destBucket, mainOutputPosition.getUnsafe(sourceBucket));
-            mainOutputPosition.set(sourceBucket, EMPTY_OUTPUT_POSITION);
-            mainKeySource0.set(destBucket, k0);
-            mainKeySource0.set(sourceBucket, QueryConstants.NULL_SHORT);
-            mainKeySource1.set(destBucket, k1);
-            mainKeySource1.set(sourceBucket, QueryConstants.NULL_BYTE);
-            handler.doMoveMain(sourceBucket, destBucket);
-        }
-        return mainInsertLocation;
-    }
-
-    private boolean findOverflow(HashHandler handler, short k0, byte k1, int chunkPosition,
-            int overflowLocation) {
-        while (overflowLocation != QueryConstants.NULL_INT) {
-            if (eq(overflowKeySource0.getUnsafe(overflowLocation), k0) && eq(overflowKeySource1.getUnsafe(overflowLocation), k1)) {
-                handler.doOverflowFound(overflowLocation, chunkPosition);
-                return true;
-            }
-            overflowLocation = overflowOverflowLocationSource.getUnsafe(overflowLocation);
-        }
-        return false;
-    }
-
-    @Override
-    public int findPositionForKey(Object key) {
-        final Object [] ka = (Object[])key;
-        final short k0 = TypeUtils.unbox((Short)ka[0]);
-        final byte k1 = TypeUtils.unbox((Byte)ka[1]);
-        int hash = hash(k0, k1);
-        final int tableLocation = hashToTableLocation(tableHashPivot, hash);
-        final int positionValue = mainOutputPosition.getUnsafe(tableLocation);
-        if (positionValue == EMPTY_OUTPUT_POSITION) {
-            return -1;
-        }
-        if (eq(mainKeySource0.getUnsafe(tableLocation), k0) && eq(mainKeySource1.getUnsafe(tableLocation), k1)) {
-            return positionValue;
-        }
-        int overflowLocation = mainOverflowLocationSource.getUnsafe(tableLocation);
-        while (overflowLocation != QueryConstants.NULL_INT) {
-            if (eq(overflowKeySource0.getUnsafe(overflowLocation), k0) && eq(overflowKeySource1.getUnsafe(overflowLocation), k1)) {
-                return overflowOutputPosition.getUnsafe(overflowLocation);
-            }
-            overflowLocation = overflowOverflowLocationSource.getUnsafe(overflowLocation);
-        }
-        return -1;
-    }
-}
diff --git a/engine/table/src/main/java/io/deephaven/engine/table/impl/by/typed/incagg/gen/IncrementalAggHasherShortChar.java b/engine/table/src/main/java/io/deephaven/engine/table/impl/by/typed/incagg/gen/IncrementalAggHasherShortChar.java
deleted file mode 100644
index d746d61ec23..00000000000
--- a/engine/table/src/main/java/io/deephaven/engine/table/impl/by/typed/incagg/gen/IncrementalAggHasherShortChar.java
+++ /dev/null
@@ -1,206 +0,0 @@
-//
-// Copyright (c) 2016-2024 Deephaven Data Labs and Patent Pending
-//
-// ****** AUTO-GENERATED CLASS - DO NOT EDIT MANUALLY
-// ****** Run ReplicateTypedHashers or ./gradlew replicateTypedHashers to regenerate
-//
-// @formatter:off
-package io.deephaven.engine.table.impl.by.typed.incagg.gen;
-
-import static io.deephaven.util.compare.CharComparisons.eq;
-import static io.deephaven.util.compare.ShortComparisons.eq;
-
-import io.deephaven.chunk.CharChunk;
-import io.deephaven.chunk.Chunk;
-import io.deephaven.chunk.ShortChunk;
-import io.deephaven.chunk.attributes.Values;
-import io.deephaven.chunk.util.hashing.CharChunkHasher;
-import io.deephaven.chunk.util.hashing.ShortChunkHasher;
-import io.deephaven.engine.rowset.RowSequence;
-import io.deephaven.engine.table.ColumnSource;
-import io.deephaven.engine.table.impl.by.HashHandler;
-import io.deephaven.engine.table.impl.by.IncrementalChunkedOperatorAggregationStateManagerTypedBase;
-import io.deephaven.engine.table.impl.sources.CharacterArraySource;
-import io.deephaven.engine.table.impl.sources.ShortArraySource;
-import io.deephaven.util.QueryConstants;
-import io.deephaven.util.type.TypeUtils;
-import java.lang.Character;
-import java.lang.Object;
-import java.lang.Override;
-import java.lang.Short;
-
-final class IncrementalAggHasherShortChar extends IncrementalChunkedOperatorAggregationStateManagerTypedBase {
-    private final ShortArraySource mainKeySource0;
-
-    private final ShortArraySource overflowKeySource0;
-
-    private final CharacterArraySource mainKeySource1;
-
-    private final CharacterArraySource overflowKeySource1;
-
-    public IncrementalAggHasherShortChar(ColumnSource[] tableKeySources,
-            ColumnSource[] originalTableKeySources, int tableSize, double maximumLoadFactor,
-            double targetLoadFactor) {
-        super(tableKeySources, tableSize, maximumLoadFactor, targetLoadFactor);
-        this.mainKeySource0 = (ShortArraySource) super.mainKeySources[0];
-        this.overflowKeySource0 = (ShortArraySource) super.overflowKeySources[0];
-        this.mainKeySource1 = (CharacterArraySource) super.mainKeySources[1];
-        this.overflowKeySource1 = (CharacterArraySource) super.overflowKeySources[1];
-    }
-
-    @Override
-    protected void build(HashHandler handler, RowSequence rowSequence, Chunk[] sourceKeyChunks) {
-        final ShortChunk<Values> keyChunk0 = sourceKeyChunks[0].asShortChunk();
-        final CharChunk<Values> keyChunk1 = sourceKeyChunks[1].asCharChunk();
-        final int chunkSize = keyChunk0.size();
-        for (int chunkPosition = 0; chunkPosition < chunkSize; ++chunkPosition) {
-            final short k0 = keyChunk0.get(chunkPosition);
-            final char k1 = keyChunk1.get(chunkPosition);
-            final int hash = hash(k0, k1);
-            final int tableLocation = hashToTableLocation(tableHashPivot, hash);
-            if (mainOutputPosition.getUnsafe(tableLocation) == EMPTY_OUTPUT_POSITION) {
-                numEntries++;
-                mainKeySource0.set(tableLocation, k0);
-                mainKeySource1.set(tableLocation, k1);
-                handler.doMainInsert(tableLocation, chunkPosition);
-            } else if (eq(mainKeySource0.getUnsafe(tableLocation), k0) && eq(mainKeySource1.getUnsafe(tableLocation), k1)) {
-                handler.doMainFound(tableLocation, chunkPosition);
-            } else {
-                int overflowLocation = mainOverflowLocationSource.getUnsafe(tableLocation);
-                if (!findOverflow(handler, k0, k1, chunkPosition, overflowLocation)) {
-                    final int newOverflowLocation = allocateOverflowLocation();
-                    overflowKeySource0.set(newOverflowLocation, k0);
-                    overflowKeySource1.set(newOverflowLocation, k1);
-                    mainOverflowLocationSource.set(tableLocation, newOverflowLocation);
-                    overflowOverflowLocationSource.set(newOverflowLocation, overflowLocation);
-                    numEntries++;
-                    handler.doOverflowInsert(newOverflowLocation, chunkPosition);
-                }
-            }
-        }
-    }
-
-    @Override
-    protected void probe(HashHandler handler, RowSequence rowSequence, Chunk[] sourceKeyChunks) {
-        final ShortChunk<Values> keyChunk0 = sourceKeyChunks[0].asShortChunk();
-        final CharChunk<Values> keyChunk1 = sourceKeyChunks[1].asCharChunk();
-        final int chunkSize = keyChunk0.size();
-        for (int chunkPosition = 0; chunkPosition < chunkSize; ++chunkPosition) {
-            final short k0 = keyChunk0.get(chunkPosition);
-            final char k1 = keyChunk1.get(chunkPosition);
-            final int hash = hash(k0, k1);
-            final int tableLocation = hashToTableLocation(tableHashPivot, hash);
-            if (mainOutputPosition.getUnsafe(tableLocation) == EMPTY_OUTPUT_POSITION) {
-                handler.doMissing(chunkPosition);
-            } else if (eq(mainKeySource0.getUnsafe(tableLocation), k0) && eq(mainKeySource1.getUnsafe(tableLocation), k1)) {
-                handler.doMainFound(tableLocation, chunkPosition);
-            } else {
-                int overflowLocation = mainOverflowLocationSource.getUnsafe(tableLocation);
-                if (!findOverflow(handler, k0, k1, chunkPosition, overflowLocation)) {
-                    handler.doMissing(chunkPosition);
-                }
-            }
-        }
-    }
-
-    private static int hash(short k0, char k1) {
-        int hash = ShortChunkHasher.hashInitialSingle(k0);
-        hash = CharChunkHasher.hashUpdateSingle(hash, k1);
-        return hash;
-    }
-
-    @Override
-    protected void rehashBucket(HashHandler handler, int sourceBucket, int destBucket,
-            int bucketsToAdd) {
-        final int position = mainOutputPosition.getUnsafe(sourceBucket);
-        if (position == EMPTY_OUTPUT_POSITION) {
-            return;
-        }
-        int mainInsertLocation = maybeMoveMainBucket(handler, sourceBucket, destBucket, bucketsToAdd);
-        int overflowLocation = mainOverflowLocationSource.getUnsafe(sourceBucket);
-        mainOverflowLocationSource.set(sourceBucket, QueryConstants.NULL_INT);
-        mainOverflowLocationSource.set(destBucket, QueryConstants.NULL_INT);
-        while (overflowLocation != QueryConstants.NULL_INT) {
-            final int nextOverflowLocation = overflowOverflowLocationSource.getUnsafe(overflowLocation);
-            final short overflowKey0 = overflowKeySource0.getUnsafe(overflowLocation);
-            final char overflowKey1 = overflowKeySource1.getUnsafe(overflowLocation);
-            final int overflowHash = hash(overflowKey0, overflowKey1);
-            final int overflowTableLocation = hashToTableLocation(tableHashPivot + bucketsToAdd, overflowHash);
-            if (overflowTableLocation == mainInsertLocation) {
-                mainKeySource0.set(mainInsertLocation, overflowKey0);
-                mainKeySource1.set(mainInsertLocation, overflowKey1);
-                mainOutputPosition.set(mainInsertLocation, overflowOutputPosition.getUnsafe(overflowLocation));
-                handler.doPromoteOverflow(overflowLocation, mainInsertLocation);
-                overflowOutputPosition.set(overflowLocation, QueryConstants.NULL_INT);
-                overflowKeySource0.set(overflowLocation, QueryConstants.NULL_SHORT);
-                overflowKeySource1.set(overflowLocation, QueryConstants.NULL_CHAR);
-                freeOverflowLocation(overflowLocation);
-                mainInsertLocation = -1;
-            } else {
-                final int oldOverflowLocation = mainOverflowLocationSource.getUnsafe(overflowTableLocation);
-                mainOverflowLocationSource.set(overflowTableLocation, overflowLocation);
-                overflowOverflowLocationSource.set(overflowLocation, oldOverflowLocation);
-            }
-            overflowLocation = nextOverflowLocation;
-        }
-    }
-
-    private int maybeMoveMainBucket(HashHandler handler, int sourceBucket, int destBucket,
-            int bucketsToAdd) {
-        final short k0 = mainKeySource0.getUnsafe(sourceBucket);
-        final char k1 = mainKeySource1.getUnsafe(sourceBucket);
-        final int hash = hash(k0, k1);
-        final int location = hashToTableLocation(tableHashPivot + bucketsToAdd, hash);
-        final int mainInsertLocation;
-        if (location == sourceBucket) {
-            mainInsertLocation = destBucket;
-            mainOutputPosition.set(destBucket, EMPTY_OUTPUT_POSITION);
-        } else {
-            mainInsertLocation = sourceBucket;
-            mainOutputPosition.set(destBucket, mainOutputPosition.getUnsafe(sourceBucket));
-            mainOutputPosition.set(sourceBucket, EMPTY_OUTPUT_POSITION);
-            mainKeySource0.set(destBucket, k0);
-            mainKeySource0.set(sourceBucket, QueryConstants.NULL_SHORT);
-            mainKeySource1.set(destBucket, k1);
-            mainKeySource1.set(sourceBucket, QueryConstants.NULL_CHAR);
-            handler.doMoveMain(sourceBucket, destBucket);
-        }
-        return mainInsertLocation;
-    }
-
-    private boolean findOverflow(HashHandler handler, short k0, char k1, int chunkPosition,
-            int overflowLocation) {
-        while (overflowLocation != QueryConstants.NULL_INT) {
-            if (eq(overflowKeySource0.getUnsafe(overflowLocation), k0) && eq(overflowKeySource1.getUnsafe(overflowLocation), k1)) {
-                handler.doOverflowFound(overflowLocation, chunkPosition);
-                return true;
-            }
-            overflowLocation = overflowOverflowLocationSource.getUnsafe(overflowLocation);
-        }
-        return false;
-    }
-
-    @Override
-    public int findPositionForKey(Object key) {
-        final Object [] ka = (Object[])key;
-        final short k0 = TypeUtils.unbox((Short)ka[0]);
-        final char k1 = TypeUtils.unbox((Character)ka[1]);
-        int hash = hash(k0, k1);
-        final int tableLocation = hashToTableLocation(tableHashPivot, hash);
-        final int positionValue = mainOutputPosition.getUnsafe(tableLocation);
-        if (positionValue == EMPTY_OUTPUT_POSITION) {
-            return -1;
-        }
-        if (eq(mainKeySource0.getUnsafe(tableLocation), k0) && eq(mainKeySource1.getUnsafe(tableLocation), k1)) {
-            return positionValue;
-        }
-        int overflowLocation = mainOverflowLocationSource.getUnsafe(tableLocation);
-        while (overflowLocation != QueryConstants.NULL_INT) {
-            if (eq(overflowKeySource0.getUnsafe(overflowLocation), k0) && eq(overflowKeySource1.getUnsafe(overflowLocation), k1)) {
-                return overflowOutputPosition.getUnsafe(overflowLocation);
-            }
-            overflowLocation = overflowOverflowLocationSource.getUnsafe(overflowLocation);
-        }
-        return -1;
-    }
-}
diff --git a/engine/table/src/main/java/io/deephaven/engine/table/impl/by/typed/incagg/gen/IncrementalAggHasherShortDouble.java b/engine/table/src/main/java/io/deephaven/engine/table/impl/by/typed/incagg/gen/IncrementalAggHasherShortDouble.java
deleted file mode 100644
index bebf4eef4a2..00000000000
--- a/engine/table/src/main/java/io/deephaven/engine/table/impl/by/typed/incagg/gen/IncrementalAggHasherShortDouble.java
+++ /dev/null
@@ -1,206 +0,0 @@
-//
-// Copyright (c) 2016-2024 Deephaven Data Labs and Patent Pending
-//
-// ****** AUTO-GENERATED CLASS - DO NOT EDIT MANUALLY
-// ****** Run ReplicateTypedHashers or ./gradlew replicateTypedHashers to regenerate
-//
-// @formatter:off
-package io.deephaven.engine.table.impl.by.typed.incagg.gen;
-
-import static io.deephaven.util.compare.DoubleComparisons.eq;
-import static io.deephaven.util.compare.ShortComparisons.eq;
-
-import io.deephaven.chunk.Chunk;
-import io.deephaven.chunk.DoubleChunk;
-import io.deephaven.chunk.ShortChunk;
-import io.deephaven.chunk.attributes.Values;
-import io.deephaven.chunk.util.hashing.DoubleChunkHasher;
-import io.deephaven.chunk.util.hashing.ShortChunkHasher;
-import io.deephaven.engine.rowset.RowSequence;
-import io.deephaven.engine.table.ColumnSource;
-import io.deephaven.engine.table.impl.by.HashHandler;
-import io.deephaven.engine.table.impl.by.IncrementalChunkedOperatorAggregationStateManagerTypedBase;
-import io.deephaven.engine.table.impl.sources.DoubleArraySource;
-import io.deephaven.engine.table.impl.sources.ShortArraySource;
-import io.deephaven.util.QueryConstants;
-import io.deephaven.util.type.TypeUtils;
-import java.lang.Double;
-import java.lang.Object;
-import java.lang.Override;
-import java.lang.Short;
-
-final class IncrementalAggHasherShortDouble extends IncrementalChunkedOperatorAggregationStateManagerTypedBase {
-    private final ShortArraySource mainKeySource0;
-
-    private final ShortArraySource overflowKeySource0;
-
-    private final DoubleArraySource mainKeySource1;
-
-    private final DoubleArraySource overflowKeySource1;
-
-    public IncrementalAggHasherShortDouble(ColumnSource[] tableKeySources,
-            ColumnSource[] originalTableKeySources, int tableSize, double maximumLoadFactor,
-            double targetLoadFactor) {
-        super(tableKeySources, tableSize, maximumLoadFactor, targetLoadFactor);
-        this.mainKeySource0 = (ShortArraySource) super.mainKeySources[0];
-        this.overflowKeySource0 = (ShortArraySource) super.overflowKeySources[0];
-        this.mainKeySource1 = (DoubleArraySource) super.mainKeySources[1];
-        this.overflowKeySource1 = (DoubleArraySource) super.overflowKeySources[1];
-    }
-
-    @Override
-    protected void build(HashHandler handler, RowSequence rowSequence, Chunk[] sourceKeyChunks) {
-        final ShortChunk<Values> keyChunk0 = sourceKeyChunks[0].asShortChunk();
-        final DoubleChunk<Values> keyChunk1 = sourceKeyChunks[1].asDoubleChunk();
-        final int chunkSize = keyChunk0.size();
-        for (int chunkPosition = 0; chunkPosition < chunkSize; ++chunkPosition) {
-            final short k0 = keyChunk0.get(chunkPosition);
-            final double k1 = keyChunk1.get(chunkPosition);
-            final int hash = hash(k0, k1);
-            final int tableLocation = hashToTableLocation(tableHashPivot, hash);
-            if (mainOutputPosition.getUnsafe(tableLocation) == EMPTY_OUTPUT_POSITION) {
-                numEntries++;
-                mainKeySource0.set(tableLocation, k0);
-                mainKeySource1.set(tableLocation, k1);
-                handler.doMainInsert(tableLocation, chunkPosition);
-            } else if (eq(mainKeySource0.getUnsafe(tableLocation), k0) && eq(mainKeySource1.getUnsafe(tableLocation), k1)) {
-                handler.doMainFound(tableLocation, chunkPosition);
-            } else {
-                int overflowLocation = mainOverflowLocationSource.getUnsafe(tableLocation);
-                if (!findOverflow(handler, k0, k1, chunkPosition, overflowLocation)) {
-                    final int newOverflowLocation = allocateOverflowLocation();
-                    overflowKeySource0.set(newOverflowLocation, k0);
-                    overflowKeySource1.set(newOverflowLocation, k1);
-                    mainOverflowLocationSource.set(tableLocation, newOverflowLocation);
-                    overflowOverflowLocationSource.set(newOverflowLocation, overflowLocation);
-                    numEntries++;
-                    handler.doOverflowInsert(newOverflowLocation, chunkPosition);
-                }
-            }
-        }
-    }
-
-    @Override
-    protected void probe(HashHandler handler, RowSequence rowSequence, Chunk[] sourceKeyChunks) {
-        final ShortChunk<Values> keyChunk0 = sourceKeyChunks[0].asShortChunk();
-        final DoubleChunk<Values> keyChunk1 = sourceKeyChunks[1].asDoubleChunk();
-        final int chunkSize = keyChunk0.size();
-        for (int chunkPosition = 0; chunkPosition < chunkSize; ++chunkPosition) {
-            final short k0 = keyChunk0.get(chunkPosition);
-            final double k1 = keyChunk1.get(chunkPosition);
-            final int hash = hash(k0, k1);
-            final int tableLocation = hashToTableLocation(tableHashPivot, hash);
-            if (mainOutputPosition.getUnsafe(tableLocation) == EMPTY_OUTPUT_POSITION) {
-                handler.doMissing(chunkPosition);
-            } else if (eq(mainKeySource0.getUnsafe(tableLocation), k0) && eq(mainKeySource1.getUnsafe(tableLocation), k1)) {
-                handler.doMainFound(tableLocation, chunkPosition);
-            } else {
-                int overflowLocation = mainOverflowLocationSource.getUnsafe(tableLocation);
-                if (!findOverflow(handler, k0, k1, chunkPosition, overflowLocation)) {
-                    handler.doMissing(chunkPosition);
-                }
-            }
-        }
-    }
-
-    private static int hash(short k0, double k1) {
-        int hash = ShortChunkHasher.hashInitialSingle(k0);
-        hash = DoubleChunkHasher.hashUpdateSingle(hash, k1);
-        return hash;
-    }
-
-    @Override
-    protected void rehashBucket(HashHandler handler, int sourceBucket, int destBucket,
-            int bucketsToAdd) {
-        final int position = mainOutputPosition.getUnsafe(sourceBucket);
-        if (position == EMPTY_OUTPUT_POSITION) {
-            return;
-        }
-        int mainInsertLocation = maybeMoveMainBucket(handler, sourceBucket, destBucket, bucketsToAdd);
-        int overflowLocation = mainOverflowLocationSource.getUnsafe(sourceBucket);
-        mainOverflowLocationSource.set(sourceBucket, QueryConstants.NULL_INT);
-        mainOverflowLocationSource.set(destBucket, QueryConstants.NULL_INT);
-        while (overflowLocation != QueryConstants.NULL_INT) {
-            final int nextOverflowLocation = overflowOverflowLocationSource.getUnsafe(overflowLocation);
-            final short overflowKey0 = overflowKeySource0.getUnsafe(overflowLocation);
-            final double overflowKey1 = overflowKeySource1.getUnsafe(overflowLocation);
-            final int overflowHash = hash(overflowKey0, overflowKey1);
-            final int overflowTableLocation = hashToTableLocation(tableHashPivot + bucketsToAdd, overflowHash);
-            if (overflowTableLocation == mainInsertLocation) {
-                mainKeySource0.set(mainInsertLocation, overflowKey0);
-                mainKeySource1.set(mainInsertLocation, overflowKey1);
-                mainOutputPosition.set(mainInsertLocation, overflowOutputPosition.getUnsafe(overflowLocation));
-                handler.doPromoteOverflow(overflowLocation, mainInsertLocation);
-                overflowOutputPosition.set(overflowLocation, QueryConstants.NULL_INT);
-                overflowKeySource0.set(overflowLocation, QueryConstants.NULL_SHORT);
-                overflowKeySource1.set(overflowLocation, QueryConstants.NULL_DOUBLE);
-                freeOverflowLocation(overflowLocation);
-                mainInsertLocation = -1;
-            } else {
-                final int oldOverflowLocation = mainOverflowLocationSource.getUnsafe(overflowTableLocation);
-                mainOverflowLocationSource.set(overflowTableLocation, overflowLocation);
-                overflowOverflowLocationSource.set(overflowLocation, oldOverflowLocation);
-            }
-            overflowLocation = nextOverflowLocation;
-        }
-    }
-
-    private int maybeMoveMainBucket(HashHandler handler, int sourceBucket, int destBucket,
-            int bucketsToAdd) {
-        final short k0 = mainKeySource0.getUnsafe(sourceBucket);
-        final double k1 = mainKeySource1.getUnsafe(sourceBucket);
-        final int hash = hash(k0, k1);
-        final int location = hashToTableLocation(tableHashPivot + bucketsToAdd, hash);
-        final int mainInsertLocation;
-        if (location == sourceBucket) {
-            mainInsertLocation = destBucket;
-            mainOutputPosition.set(destBucket, EMPTY_OUTPUT_POSITION);
-        } else {
-            mainInsertLocation = sourceBucket;
-            mainOutputPosition.set(destBucket, mainOutputPosition.getUnsafe(sourceBucket));
-            mainOutputPosition.set(sourceBucket, EMPTY_OUTPUT_POSITION);
-            mainKeySource0.set(destBucket, k0);
-            mainKeySource0.set(sourceBucket, QueryConstants.NULL_SHORT);
-            mainKeySource1.set(destBucket, k1);
-            mainKeySource1.set(sourceBucket, QueryConstants.NULL_DOUBLE);
-            handler.doMoveMain(sourceBucket, destBucket);
-        }
-        return mainInsertLocation;
-    }
-
-    private boolean findOverflow(HashHandler handler, short k0, double k1, int chunkPosition,
-            int overflowLocation) {
-        while (overflowLocation != QueryConstants.NULL_INT) {
-            if (eq(overflowKeySource0.getUnsafe(overflowLocation), k0) && eq(overflowKeySource1.getUnsafe(overflowLocation), k1)) {
-                handler.doOverflowFound(overflowLocation, chunkPosition);
-                return true;
-            }
-            overflowLocation = overflowOverflowLocationSource.getUnsafe(overflowLocation);
-        }
-        return false;
-    }
-
-    @Override
-    public int findPositionForKey(Object key) {
-        final Object [] ka = (Object[])key;
-        final short k0 = TypeUtils.unbox((Short)ka[0]);
-        final double k1 = TypeUtils.unbox((Double)ka[1]);
-        int hash = hash(k0, k1);
-        final int tableLocation = hashToTableLocation(tableHashPivot, hash);
-        final int positionValue = mainOutputPosition.getUnsafe(tableLocation);
-        if (positionValue == EMPTY_OUTPUT_POSITION) {
-            return -1;
-        }
-        if (eq(mainKeySource0.getUnsafe(tableLocation), k0) && eq(mainKeySource1.getUnsafe(tableLocation), k1)) {
-            return positionValue;
-        }
-        int overflowLocation = mainOverflowLocationSource.getUnsafe(tableLocation);
-        while (overflowLocation != QueryConstants.NULL_INT) {
-            if (eq(overflowKeySource0.getUnsafe(overflowLocation), k0) && eq(overflowKeySource1.getUnsafe(overflowLocation), k1)) {
-                return overflowOutputPosition.getUnsafe(overflowLocation);
-            }
-            overflowLocation = overflowOverflowLocationSource.getUnsafe(overflowLocation);
-        }
-        return -1;
-    }
-}
diff --git a/engine/table/src/main/java/io/deephaven/engine/table/impl/by/typed/incagg/gen/IncrementalAggHasherShortFloat.java b/engine/table/src/main/java/io/deephaven/engine/table/impl/by/typed/incagg/gen/IncrementalAggHasherShortFloat.java
deleted file mode 100644
index aa082b626fd..00000000000
--- a/engine/table/src/main/java/io/deephaven/engine/table/impl/by/typed/incagg/gen/IncrementalAggHasherShortFloat.java
+++ /dev/null
@@ -1,206 +0,0 @@
-//
-// Copyright (c) 2016-2024 Deephaven Data Labs and Patent Pending
-//
-// ****** AUTO-GENERATED CLASS - DO NOT EDIT MANUALLY
-// ****** Run ReplicateTypedHashers or ./gradlew replicateTypedHashers to regenerate
-//
-// @formatter:off
-package io.deephaven.engine.table.impl.by.typed.incagg.gen;
-
-import static io.deephaven.util.compare.FloatComparisons.eq;
-import static io.deephaven.util.compare.ShortComparisons.eq;
-
-import io.deephaven.chunk.Chunk;
-import io.deephaven.chunk.FloatChunk;
-import io.deephaven.chunk.ShortChunk;
-import io.deephaven.chunk.attributes.Values;
-import io.deephaven.chunk.util.hashing.FloatChunkHasher;
-import io.deephaven.chunk.util.hashing.ShortChunkHasher;
-import io.deephaven.engine.rowset.RowSequence;
-import io.deephaven.engine.table.ColumnSource;
-import io.deephaven.engine.table.impl.by.HashHandler;
-import io.deephaven.engine.table.impl.by.IncrementalChunkedOperatorAggregationStateManagerTypedBase;
-import io.deephaven.engine.table.impl.sources.FloatArraySource;
-import io.deephaven.engine.table.impl.sources.ShortArraySource;
-import io.deephaven.util.QueryConstants;
-import io.deephaven.util.type.TypeUtils;
-import java.lang.Float;
-import java.lang.Object;
-import java.lang.Override;
-import java.lang.Short;
-
-final class IncrementalAggHasherShortFloat extends IncrementalChunkedOperatorAggregationStateManagerTypedBase {
-    private final ShortArraySource mainKeySource0;
-
-    private final ShortArraySource overflowKeySource0;
-
-    private final FloatArraySource mainKeySource1;
-
-    private final FloatArraySource overflowKeySource1;
-
-    public IncrementalAggHasherShortFloat(ColumnSource[] tableKeySources,
-            ColumnSource[] originalTableKeySources, int tableSize, double maximumLoadFactor,
-            double targetLoadFactor) {
-        super(tableKeySources, tableSize, maximumLoadFactor, targetLoadFactor);
-        this.mainKeySource0 = (ShortArraySource) super.mainKeySources[0];
-        this.overflowKeySource0 = (ShortArraySource) super.overflowKeySources[0];
-        this.mainKeySource1 = (FloatArraySource) super.mainKeySources[1];
-        this.overflowKeySource1 = (FloatArraySource) super.overflowKeySources[1];
-    }
-
-    @Override
-    protected void build(HashHandler handler, RowSequence rowSequence, Chunk[] sourceKeyChunks) {
-        final ShortChunk<Values> keyChunk0 = sourceKeyChunks[0].asShortChunk();
-        final FloatChunk<Values> keyChunk1 = sourceKeyChunks[1].asFloatChunk();
-        final int chunkSize = keyChunk0.size();
-        for (int chunkPosition = 0; chunkPosition < chunkSize; ++chunkPosition) {
-            final short k0 = keyChunk0.get(chunkPosition);
-            final float k1 = keyChunk1.get(chunkPosition);
-            final int hash = hash(k0, k1);
-            final int tableLocation = hashToTableLocation(tableHashPivot, hash);
-            if (mainOutputPosition.getUnsafe(tableLocation) == EMPTY_OUTPUT_POSITION) {
-                numEntries++;
-                mainKeySource0.set(tableLocation, k0);
-                mainKeySource1.set(tableLocation, k1);
-                handler.doMainInsert(tableLocation, chunkPosition);
-            } else if (eq(mainKeySource0.getUnsafe(tableLocation), k0) && eq(mainKeySource1.getUnsafe(tableLocation), k1)) {
-                handler.doMainFound(tableLocation, chunkPosition);
-            } else {
-                int overflowLocation = mainOverflowLocationSource.getUnsafe(tableLocation);
-                if (!findOverflow(handler, k0, k1, chunkPosition, overflowLocation)) {
-                    final int newOverflowLocation = allocateOverflowLocation();
-                    overflowKeySource0.set(newOverflowLocation, k0);
-                    overflowKeySource1.set(newOverflowLocation, k1);
-                    mainOverflowLocationSource.set(tableLocation, newOverflowLocation);
-                    overflowOverflowLocationSource.set(newOverflowLocation, overflowLocation);
-                    numEntries++;
-                    handler.doOverflowInsert(newOverflowLocation, chunkPosition);
-                }
-            }
-        }
-    }
-
-    @Override
-    protected void probe(HashHandler handler, RowSequence rowSequence, Chunk[] sourceKeyChunks) {
-        final ShortChunk<Values> keyChunk0 = sourceKeyChunks[0].asShortChunk();
-        final FloatChunk<Values> keyChunk1 = sourceKeyChunks[1].asFloatChunk();
-        final int chunkSize = keyChunk0.size();
-        for (int chunkPosition = 0; chunkPosition < chunkSize; ++chunkPosition) {
-            final short k0 = keyChunk0.get(chunkPosition);
-            final float k1 = keyChunk1.get(chunkPosition);
-            final int hash = hash(k0, k1);
-            final int tableLocation = hashToTableLocation(tableHashPivot, hash);
-            if (mainOutputPosition.getUnsafe(tableLocation) == EMPTY_OUTPUT_POSITION) {
-                handler.doMissing(chunkPosition);
-            } else if (eq(mainKeySource0.getUnsafe(tableLocation), k0) && eq(mainKeySource1.getUnsafe(tableLocation), k1)) {
-                handler.doMainFound(tableLocation, chunkPosition);
-            } else {
-                int overflowLocation = mainOverflowLocationSource.getUnsafe(tableLocation);
-                if (!findOverflow(handler, k0, k1, chunkPosition, overflowLocation)) {
-                    handler.doMissing(chunkPosition);
-                }
-            }
-        }
-    }
-
-    private static int hash(short k0, float k1) {
-        int hash = ShortChunkHasher.hashInitialSingle(k0);
-        hash = FloatChunkHasher.hashUpdateSingle(hash, k1);
-        return hash;
-    }
-
-    @Override
-    protected void rehashBucket(HashHandler handler, int sourceBucket, int destBucket,
-            int bucketsToAdd) {
-        final int position = mainOutputPosition.getUnsafe(sourceBucket);
-        if (position == EMPTY_OUTPUT_POSITION) {
-            return;
-        }
-        int mainInsertLocation = maybeMoveMainBucket(handler, sourceBucket, destBucket, bucketsToAdd);
-        int overflowLocation = mainOverflowLocationSource.getUnsafe(sourceBucket);
-        mainOverflowLocationSource.set(sourceBucket, QueryConstants.NULL_INT);
-        mainOverflowLocationSource.set(destBucket, QueryConstants.NULL_INT);
-        while (overflowLocation != QueryConstants.NULL_INT) {
-            final int nextOverflowLocation = overflowOverflowLocationSource.getUnsafe(overflowLocation);
-            final short overflowKey0 = overflowKeySource0.getUnsafe(overflowLocation);
-            final float overflowKey1 = overflowKeySource1.getUnsafe(overflowLocation);
-            final int overflowHash = hash(overflowKey0, overflowKey1);
-            final int overflowTableLocation = hashToTableLocation(tableHashPivot + bucketsToAdd, overflowHash);
-            if (overflowTableLocation == mainInsertLocation) {
-                mainKeySource0.set(mainInsertLocation, overflowKey0);
-                mainKeySource1.set(mainInsertLocation, overflowKey1);
-                mainOutputPosition.set(mainInsertLocation, overflowOutputPosition.getUnsafe(overflowLocation));
-                handler.doPromoteOverflow(overflowLocation, mainInsertLocation);
-                overflowOutputPosition.set(overflowLocation, QueryConstants.NULL_INT);
-                overflowKeySource0.set(overflowLocation, QueryConstants.NULL_SHORT);
-                overflowKeySource1.set(overflowLocation, QueryConstants.NULL_FLOAT);
-                freeOverflowLocation(overflowLocation);
-                mainInsertLocation = -1;
-            } else {
-                final int oldOverflowLocation = mainOverflowLocationSource.getUnsafe(overflowTableLocation);
-                mainOverflowLocationSource.set(overflowTableLocation, overflowLocation);
-                overflowOverflowLocationSource.set(overflowLocation, oldOverflowLocation);
-            }
-            overflowLocation = nextOverflowLocation;
-        }
-    }
-
-    private int maybeMoveMainBucket(HashHandler handler, int sourceBucket, int destBucket,
-            int bucketsToAdd) {
-        final short k0 = mainKeySource0.getUnsafe(sourceBucket);
-        final float k1 = mainKeySource1.getUnsafe(sourceBucket);
-        final int hash = hash(k0, k1);
-        final int location = hashToTableLocation(tableHashPivot + bucketsToAdd, hash);
-        final int mainInsertLocation;
-        if (location == sourceBucket) {
-            mainInsertLocation = destBucket;
-            mainOutputPosition.set(destBucket, EMPTY_OUTPUT_POSITION);
-        } else {
-            mainInsertLocation = sourceBucket;
-            mainOutputPosition.set(destBucket, mainOutputPosition.getUnsafe(sourceBucket));
-            mainOutputPosition.set(sourceBucket, EMPTY_OUTPUT_POSITION);
-            mainKeySource0.set(destBucket, k0);
-            mainKeySource0.set(sourceBucket, QueryConstants.NULL_SHORT);
-            mainKeySource1.set(destBucket, k1);
-            mainKeySource1.set(sourceBucket, QueryConstants.NULL_FLOAT);
-            handler.doMoveMain(sourceBucket, destBucket);
-        }
-        return mainInsertLocation;
-    }
-
-    private boolean findOverflow(HashHandler handler, short k0, float k1, int chunkPosition,
-            int overflowLocation) {
-        while (overflowLocation != QueryConstants.NULL_INT) {
-            if (eq(overflowKeySource0.getUnsafe(overflowLocation), k0) && eq(overflowKeySource1.getUnsafe(overflowLocation), k1)) {
-                handler.doOverflowFound(overflowLocation, chunkPosition);
-                return true;
-            }
-            overflowLocation = overflowOverflowLocationSource.getUnsafe(overflowLocation);
-        }
-        return false;
-    }
-
-    @Override
-    public int findPositionForKey(Object key) {
-        final Object [] ka = (Object[])key;
-        final short k0 = TypeUtils.unbox((Short)ka[0]);
-        final float k1 = TypeUtils.unbox((Float)ka[1]);
-        int hash = hash(k0, k1);
-        final int tableLocation = hashToTableLocation(tableHashPivot, hash);
-        final int positionValue = mainOutputPosition.getUnsafe(tableLocation);
-        if (positionValue == EMPTY_OUTPUT_POSITION) {
-            return -1;
-        }
-        if (eq(mainKeySource0.getUnsafe(tableLocation), k0) && eq(mainKeySource1.getUnsafe(tableLocation), k1)) {
-            return positionValue;
-        }
-        int overflowLocation = mainOverflowLocationSource.getUnsafe(tableLocation);
-        while (overflowLocation != QueryConstants.NULL_INT) {
-            if (eq(overflowKeySource0.getUnsafe(overflowLocation), k0) && eq(overflowKeySource1.getUnsafe(overflowLocation), k1)) {
-                return overflowOutputPosition.getUnsafe(overflowLocation);
-            }
-            overflowLocation = overflowOverflowLocationSource.getUnsafe(overflowLocation);
-        }
-        return -1;
-    }
-}
diff --git a/engine/table/src/main/java/io/deephaven/engine/table/impl/by/typed/incagg/gen/IncrementalAggHasherShortInt.java b/engine/table/src/main/java/io/deephaven/engine/table/impl/by/typed/incagg/gen/IncrementalAggHasherShortInt.java
deleted file mode 100644
index 0d7ce727ea0..00000000000
--- a/engine/table/src/main/java/io/deephaven/engine/table/impl/by/typed/incagg/gen/IncrementalAggHasherShortInt.java
+++ /dev/null
@@ -1,206 +0,0 @@
-//
-// Copyright (c) 2016-2024 Deephaven Data Labs and Patent Pending
-//
-// ****** AUTO-GENERATED CLASS - DO NOT EDIT MANUALLY
-// ****** Run ReplicateTypedHashers or ./gradlew replicateTypedHashers to regenerate
-//
-// @formatter:off
-package io.deephaven.engine.table.impl.by.typed.incagg.gen;
-
-import static io.deephaven.util.compare.IntComparisons.eq;
-import static io.deephaven.util.compare.ShortComparisons.eq;
-
-import io.deephaven.chunk.Chunk;
-import io.deephaven.chunk.IntChunk;
-import io.deephaven.chunk.ShortChunk;
-import io.deephaven.chunk.attributes.Values;
-import io.deephaven.chunk.util.hashing.IntChunkHasher;
-import io.deephaven.chunk.util.hashing.ShortChunkHasher;
-import io.deephaven.engine.rowset.RowSequence;
-import io.deephaven.engine.table.ColumnSource;
-import io.deephaven.engine.table.impl.by.HashHandler;
-import io.deephaven.engine.table.impl.by.IncrementalChunkedOperatorAggregationStateManagerTypedBase;
-import io.deephaven.engine.table.impl.sources.IntegerArraySource;
-import io.deephaven.engine.table.impl.sources.ShortArraySource;
-import io.deephaven.util.QueryConstants;
-import io.deephaven.util.type.TypeUtils;
-import java.lang.Integer;
-import java.lang.Object;
-import java.lang.Override;
-import java.lang.Short;
-
-final class IncrementalAggHasherShortInt extends IncrementalChunkedOperatorAggregationStateManagerTypedBase {
-    private final ShortArraySource mainKeySource0;
-
-    private final ShortArraySource overflowKeySource0;
-
-    private final IntegerArraySource mainKeySource1;
-
-    private final IntegerArraySource overflowKeySource1;
-
-    public IncrementalAggHasherShortInt(ColumnSource[] tableKeySources,
-            ColumnSource[] originalTableKeySources, int tableSize, double maximumLoadFactor,
-            double targetLoadFactor) {
-        super(tableKeySources, tableSize, maximumLoadFactor, targetLoadFactor);
-        this.mainKeySource0 = (ShortArraySource) super.mainKeySources[0];
-        this.overflowKeySource0 = (ShortArraySource) super.overflowKeySources[0];
-        this.mainKeySource1 = (IntegerArraySource) super.mainKeySources[1];
-        this.overflowKeySource1 = (IntegerArraySource) super.overflowKeySources[1];
-    }
-
-    @Override
-    protected void build(HashHandler handler, RowSequence rowSequence, Chunk[] sourceKeyChunks) {
-        final ShortChunk<Values> keyChunk0 = sourceKeyChunks[0].asShortChunk();
-        final IntChunk<Values> keyChunk1 = sourceKeyChunks[1].asIntChunk();
-        final int chunkSize = keyChunk0.size();
-        for (int chunkPosition = 0; chunkPosition < chunkSize; ++chunkPosition) {
-            final short k0 = keyChunk0.get(chunkPosition);
-            final int k1 = keyChunk1.get(chunkPosition);
-            final int hash = hash(k0, k1);
-            final int tableLocation = hashToTableLocation(tableHashPivot, hash);
-            if (mainOutputPosition.getUnsafe(tableLocation) == EMPTY_OUTPUT_POSITION) {
-                numEntries++;
-                mainKeySource0.set(tableLocation, k0);
-                mainKeySource1.set(tableLocation, k1);
-                handler.doMainInsert(tableLocation, chunkPosition);
-            } else if (eq(mainKeySource0.getUnsafe(tableLocation), k0) && eq(mainKeySource1.getUnsafe(tableLocation), k1)) {
-                handler.doMainFound(tableLocation, chunkPosition);
-            } else {
-                int overflowLocation = mainOverflowLocationSource.getUnsafe(tableLocation);
-                if (!findOverflow(handler, k0, k1, chunkPosition, overflowLocation)) {
-                    final int newOverflowLocation = allocateOverflowLocation();
-                    overflowKeySource0.set(newOverflowLocation, k0);
-                    overflowKeySource1.set(newOverflowLocation, k1);
-                    mainOverflowLocationSource.set(tableLocation, newOverflowLocation);
-                    overflowOverflowLocationSource.set(newOverflowLocation, overflowLocation);
-                    numEntries++;
-                    handler.doOverflowInsert(newOverflowLocation, chunkPosition);
-                }
-            }
-        }
-    }
-
-    @Override
-    protected void probe(HashHandler handler, RowSequence rowSequence, Chunk[] sourceKeyChunks) {
-        final ShortChunk<Values> keyChunk0 = sourceKeyChunks[0].asShortChunk();
-        final IntChunk<Values> keyChunk1 = sourceKeyChunks[1].asIntChunk();
-        final int chunkSize = keyChunk0.size();
-        for (int chunkPosition = 0; chunkPosition < chunkSize; ++chunkPosition) {
-            final short k0 = keyChunk0.get(chunkPosition);
-            final int k1 = keyChunk1.get(chunkPosition);
-            final int hash = hash(k0, k1);
-            final int tableLocation = hashToTableLocation(tableHashPivot, hash);
-            if (mainOutputPosition.getUnsafe(tableLocation) == EMPTY_OUTPUT_POSITION) {
-                handler.doMissing(chunkPosition);
-            } else if (eq(mainKeySource0.getUnsafe(tableLocation), k0) && eq(mainKeySource1.getUnsafe(tableLocation), k1)) {
-                handler.doMainFound(tableLocation, chunkPosition);
-            } else {
-                int overflowLocation = mainOverflowLocationSource.getUnsafe(tableLocation);
-                if (!findOverflow(handler, k0, k1, chunkPosition, overflowLocation)) {
-                    handler.doMissing(chunkPosition);
-                }
-            }
-        }
-    }
-
-    private static int hash(short k0, int k1) {
-        int hash = ShortChunkHasher.hashInitialSingle(k0);
-        hash = IntChunkHasher.hashUpdateSingle(hash, k1);
-        return hash;
-    }
-
-    @Override
-    protected void rehashBucket(HashHandler handler, int sourceBucket, int destBucket,
-            int bucketsToAdd) {
-        final int position = mainOutputPosition.getUnsafe(sourceBucket);
-        if (position == EMPTY_OUTPUT_POSITION) {
-            return;
-        }
-        int mainInsertLocation = maybeMoveMainBucket(handler, sourceBucket, destBucket, bucketsToAdd);
-        int overflowLocation = mainOverflowLocationSource.getUnsafe(sourceBucket);
-        mainOverflowLocationSource.set(sourceBucket, QueryConstants.NULL_INT);
-        mainOverflowLocationSource.set(destBucket, QueryConstants.NULL_INT);
-        while (overflowLocation != QueryConstants.NULL_INT) {
-            final int nextOverflowLocation = overflowOverflowLocationSource.getUnsafe(overflowLocation);
-            final short overflowKey0 = overflowKeySource0.getUnsafe(overflowLocation);
-            final int overflowKey1 = overflowKeySource1.getUnsafe(overflowLocation);
-            final int overflowHash = hash(overflowKey0, overflowKey1);
-            final int overflowTableLocation = hashToTableLocation(tableHashPivot + bucketsToAdd, overflowHash);
-            if (overflowTableLocation == mainInsertLocation) {
-                mainKeySource0.set(mainInsertLocation, overflowKey0);
-                mainKeySource1.set(mainInsertLocation, overflowKey1);
-                mainOutputPosition.set(mainInsertLocation, overflowOutputPosition.getUnsafe(overflowLocation));
-                handler.doPromoteOverflow(overflowLocation, mainInsertLocation);
-                overflowOutputPosition.set(overflowLocation, QueryConstants.NULL_INT);
-                overflowKeySource0.set(overflowLocation, QueryConstants.NULL_SHORT);
-                overflowKeySource1.set(overflowLocation, QueryConstants.NULL_INT);
-                freeOverflowLocation(overflowLocation);
-                mainInsertLocation = -1;
-            } else {
-                final int oldOverflowLocation = mainOverflowLocationSource.getUnsafe(overflowTableLocation);
-                mainOverflowLocationSource.set(overflowTableLocation, overflowLocation);
-                overflowOverflowLocationSource.set(overflowLocation, oldOverflowLocation);
-            }
-            overflowLocation = nextOverflowLocation;
-        }
-    }
-
-    private int maybeMoveMainBucket(HashHandler handler, int sourceBucket, int destBucket,
-            int bucketsToAdd) {
-        final short k0 = mainKeySource0.getUnsafe(sourceBucket);
-        final int k1 = mainKeySource1.getUnsafe(sourceBucket);
-        final int hash = hash(k0, k1);
-        final int location = hashToTableLocation(tableHashPivot + bucketsToAdd, hash);
-        final int mainInsertLocation;
-        if (location == sourceBucket) {
-            mainInsertLocation = destBucket;
-            mainOutputPosition.set(destBucket, EMPTY_OUTPUT_POSITION);
-        } else {
-            mainInsertLocation = sourceBucket;
-            mainOutputPosition.set(destBucket, mainOutputPosition.getUnsafe(sourceBucket));
-            mainOutputPosition.set(sourceBucket, EMPTY_OUTPUT_POSITION);
-            mainKeySource0.set(destBucket, k0);
-            mainKeySource0.set(sourceBucket, QueryConstants.NULL_SHORT);
-            mainKeySource1.set(destBucket, k1);
-            mainKeySource1.set(sourceBucket, QueryConstants.NULL_INT);
-            handler.doMoveMain(sourceBucket, destBucket);
-        }
-        return mainInsertLocation;
-    }
-
-    private boolean findOverflow(HashHandler handler, short k0, int k1, int chunkPosition,
-            int overflowLocation) {
-        while (overflowLocation != QueryConstants.NULL_INT) {
-            if (eq(overflowKeySource0.getUnsafe(overflowLocation), k0) && eq(overflowKeySource1.getUnsafe(overflowLocation), k1)) {
-                handler.doOverflowFound(overflowLocation, chunkPosition);
-                return true;
-            }
-            overflowLocation = overflowOverflowLocationSource.getUnsafe(overflowLocation);
-        }
-        return false;
-    }
-
-    @Override
-    public int findPositionForKey(Object key) {
-        final Object [] ka = (Object[])key;
-        final short k0 = TypeUtils.unbox((Short)ka[0]);
-        final int k1 = TypeUtils.unbox((Integer)ka[1]);
-        int hash = hash(k0, k1);
-        final int tableLocation = hashToTableLocation(tableHashPivot, hash);
-        final int positionValue = mainOutputPosition.getUnsafe(tableLocation);
-        if (positionValue == EMPTY_OUTPUT_POSITION) {
-            return -1;
-        }
-        if (eq(mainKeySource0.getUnsafe(tableLocation), k0) && eq(mainKeySource1.getUnsafe(tableLocation), k1)) {
-            return positionValue;
-        }
-        int overflowLocation = mainOverflowLocationSource.getUnsafe(tableLocation);
-        while (overflowLocation != QueryConstants.NULL_INT) {
-            if (eq(overflowKeySource0.getUnsafe(overflowLocation), k0) && eq(overflowKeySource1.getUnsafe(overflowLocation), k1)) {
-                return overflowOutputPosition.getUnsafe(overflowLocation);
-            }
-            overflowLocation = overflowOverflowLocationSource.getUnsafe(overflowLocation);
-        }
-        return -1;
-    }
-}
diff --git a/engine/table/src/main/java/io/deephaven/engine/table/impl/by/typed/incagg/gen/IncrementalAggHasherShortLong.java b/engine/table/src/main/java/io/deephaven/engine/table/impl/by/typed/incagg/gen/IncrementalAggHasherShortLong.java
deleted file mode 100644
index 1b7d8ae2a49..00000000000
--- a/engine/table/src/main/java/io/deephaven/engine/table/impl/by/typed/incagg/gen/IncrementalAggHasherShortLong.java
+++ /dev/null
@@ -1,206 +0,0 @@
-//
-// Copyright (c) 2016-2024 Deephaven Data Labs and Patent Pending
-//
-// ****** AUTO-GENERATED CLASS - DO NOT EDIT MANUALLY
-// ****** Run ReplicateTypedHashers or ./gradlew replicateTypedHashers to regenerate
-//
-// @formatter:off
-package io.deephaven.engine.table.impl.by.typed.incagg.gen;
-
-import static io.deephaven.util.compare.LongComparisons.eq;
-import static io.deephaven.util.compare.ShortComparisons.eq;
-
-import io.deephaven.chunk.Chunk;
-import io.deephaven.chunk.LongChunk;
-import io.deephaven.chunk.ShortChunk;
-import io.deephaven.chunk.attributes.Values;
-import io.deephaven.chunk.util.hashing.LongChunkHasher;
-import io.deephaven.chunk.util.hashing.ShortChunkHasher;
-import io.deephaven.engine.rowset.RowSequence;
-import io.deephaven.engine.table.ColumnSource;
-import io.deephaven.engine.table.impl.by.HashHandler;
-import io.deephaven.engine.table.impl.by.IncrementalChunkedOperatorAggregationStateManagerTypedBase;
-import io.deephaven.engine.table.impl.sources.LongArraySource;
-import io.deephaven.engine.table.impl.sources.ShortArraySource;
-import io.deephaven.util.QueryConstants;
-import io.deephaven.util.type.TypeUtils;
-import java.lang.Long;
-import java.lang.Object;
-import java.lang.Override;
-import java.lang.Short;
-
-final class IncrementalAggHasherShortLong extends IncrementalChunkedOperatorAggregationStateManagerTypedBase {
-    private final ShortArraySource mainKeySource0;
-
-    private final ShortArraySource overflowKeySource0;
-
-    private final LongArraySource mainKeySource1;
-
-    private final LongArraySource overflowKeySource1;
-
-    public IncrementalAggHasherShortLong(ColumnSource[] tableKeySources,
-            ColumnSource[] originalTableKeySources, int tableSize, double maximumLoadFactor,
-            double targetLoadFactor) {
-        super(tableKeySources, tableSize, maximumLoadFactor, targetLoadFactor);
-        this.mainKeySource0 = (ShortArraySource) super.mainKeySources[0];
-        this.overflowKeySource0 = (ShortArraySource) super.overflowKeySources[0];
-        this.mainKeySource1 = (LongArraySource) super.mainKeySources[1];
-        this.overflowKeySource1 = (LongArraySource) super.overflowKeySources[1];
-    }
-
-    @Override
-    protected void build(HashHandler handler, RowSequence rowSequence, Chunk[] sourceKeyChunks) {
-        final ShortChunk<Values> keyChunk0 = sourceKeyChunks[0].asShortChunk();
-        final LongChunk<Values> keyChunk1 = sourceKeyChunks[1].asLongChunk();
-        final int chunkSize = keyChunk0.size();
-        for (int chunkPosition = 0; chunkPosition < chunkSize; ++chunkPosition) {
-            final short k0 = keyChunk0.get(chunkPosition);
-            final long k1 = keyChunk1.get(chunkPosition);
-            final int hash = hash(k0, k1);
-            final int tableLocation = hashToTableLocation(tableHashPivot, hash);
-            if (mainOutputPosition.getUnsafe(tableLocation) == EMPTY_OUTPUT_POSITION) {
-                numEntries++;
-                mainKeySource0.set(tableLocation, k0);
-                mainKeySource1.set(tableLocation, k1);
-                handler.doMainInsert(tableLocation, chunkPosition);
-            } else if (eq(mainKeySource0.getUnsafe(tableLocation), k0) && eq(mainKeySource1.getUnsafe(tableLocation), k1)) {
-                handler.doMainFound(tableLocation, chunkPosition);
-            } else {
-                int overflowLocation = mainOverflowLocationSource.getUnsafe(tableLocation);
-                if (!findOverflow(handler, k0, k1, chunkPosition, overflowLocation)) {
-                    final int newOverflowLocation = allocateOverflowLocation();
-                    overflowKeySource0.set(newOverflowLocation, k0);
-                    overflowKeySource1.set(newOverflowLocation, k1);
-                    mainOverflowLocationSource.set(tableLocation, newOverflowLocation);
-                    overflowOverflowLocationSource.set(newOverflowLocation, overflowLocation);
-                    numEntries++;
-                    handler.doOverflowInsert(newOverflowLocation, chunkPosition);
-                }
-            }
-        }
-    }
-
-    @Override
-    protected void probe(HashHandler handler, RowSequence rowSequence, Chunk[] sourceKeyChunks) {
-        final ShortChunk<Values> keyChunk0 = sourceKeyChunks[0].asShortChunk();
-        final LongChunk<Values> keyChunk1 = sourceKeyChunks[1].asLongChunk();
-        final int chunkSize = keyChunk0.size();
-        for (int chunkPosition = 0; chunkPosition < chunkSize; ++chunkPosition) {
-            final short k0 = keyChunk0.get(chunkPosition);
-            final long k1 = keyChunk1.get(chunkPosition);
-            final int hash = hash(k0, k1);
-            final int tableLocation = hashToTableLocation(tableHashPivot, hash);
-            if (mainOutputPosition.getUnsafe(tableLocation) == EMPTY_OUTPUT_POSITION) {
-                handler.doMissing(chunkPosition);
-            } else if (eq(mainKeySource0.getUnsafe(tableLocation), k0) && eq(mainKeySource1.getUnsafe(tableLocation), k1)) {
-                handler.doMainFound(tableLocation, chunkPosition);
-            } else {
-                int overflowLocation = mainOverflowLocationSource.getUnsafe(tableLocation);
-                if (!findOverflow(handler, k0, k1, chunkPosition, overflowLocation)) {
-                    handler.doMissing(chunkPosition);
-                }
-            }
-        }
-    }
-
-    private static int hash(short k0, long k1) {
-        int hash = ShortChunkHasher.hashInitialSingle(k0);
-        hash = LongChunkHasher.hashUpdateSingle(hash, k1);
-        return hash;
-    }
-
-    @Override
-    protected void rehashBucket(HashHandler handler, int sourceBucket, int destBucket,
-            int bucketsToAdd) {
-        final int position = mainOutputPosition.getUnsafe(sourceBucket);
-        if (position == EMPTY_OUTPUT_POSITION) {
-            return;
-        }
-        int mainInsertLocation = maybeMoveMainBucket(handler, sourceBucket, destBucket, bucketsToAdd);
-        int overflowLocation = mainOverflowLocationSource.getUnsafe(sourceBucket);
-        mainOverflowLocationSource.set(sourceBucket, QueryConstants.NULL_INT);
-        mainOverflowLocationSource.set(destBucket, QueryConstants.NULL_INT);
-        while (overflowLocation != QueryConstants.NULL_INT) {
-            final int nextOverflowLocation = overflowOverflowLocationSource.getUnsafe(overflowLocation);
-            final short overflowKey0 = overflowKeySource0.getUnsafe(overflowLocation);
-            final long overflowKey1 = overflowKeySource1.getUnsafe(overflowLocation);
-            final int overflowHash = hash(overflowKey0, overflowKey1);
-            final int overflowTableLocation = hashToTableLocation(tableHashPivot + bucketsToAdd, overflowHash);
-            if (overflowTableLocation == mainInsertLocation) {
-                mainKeySource0.set(mainInsertLocation, overflowKey0);
-                mainKeySource1.set(mainInsertLocation, overflowKey1);
-                mainOutputPosition.set(mainInsertLocation, overflowOutputPosition.getUnsafe(overflowLocation));
-                handler.doPromoteOverflow(overflowLocation, mainInsertLocation);
-                overflowOutputPosition.set(overflowLocation, QueryConstants.NULL_INT);
-                overflowKeySource0.set(overflowLocation, QueryConstants.NULL_SHORT);
-                overflowKeySource1.set(overflowLocation, QueryConstants.NULL_LONG);
-                freeOverflowLocation(overflowLocation);
-                mainInsertLocation = -1;
-            } else {
-                final int oldOverflowLocation = mainOverflowLocationSource.getUnsafe(overflowTableLocation);
-                mainOverflowLocationSource.set(overflowTableLocation, overflowLocation);
-                overflowOverflowLocationSource.set(overflowLocation, oldOverflowLocation);
-            }
-            overflowLocation = nextOverflowLocation;
-        }
-    }
-
-    private int maybeMoveMainBucket(HashHandler handler, int sourceBucket, int destBucket,
-            int bucketsToAdd) {
-        final short k0 = mainKeySource0.getUnsafe(sourceBucket);
-        final long k1 = mainKeySource1.getUnsafe(sourceBucket);
-        final int hash = hash(k0, k1);
-        final int location = hashToTableLocation(tableHashPivot + bucketsToAdd, hash);
-        final int mainInsertLocation;
-        if (location == sourceBucket) {
-            mainInsertLocation = destBucket;
-            mainOutputPosition.set(destBucket, EMPTY_OUTPUT_POSITION);
-        } else {
-            mainInsertLocation = sourceBucket;
-            mainOutputPosition.set(destBucket, mainOutputPosition.getUnsafe(sourceBucket));
-            mainOutputPosition.set(sourceBucket, EMPTY_OUTPUT_POSITION);
-            mainKeySource0.set(destBucket, k0);
-            mainKeySource0.set(sourceBucket, QueryConstants.NULL_SHORT);
-            mainKeySource1.set(destBucket, k1);
-            mainKeySource1.set(sourceBucket, QueryConstants.NULL_LONG);
-            handler.doMoveMain(sourceBucket, destBucket);
-        }
-        return mainInsertLocation;
-    }
-
-    private boolean findOverflow(HashHandler handler, short k0, long k1, int chunkPosition,
-            int overflowLocation) {
-        while (overflowLocation != QueryConstants.NULL_INT) {
-            if (eq(overflowKeySource0.getUnsafe(overflowLocation), k0) && eq(overflowKeySource1.getUnsafe(overflowLocation), k1)) {
-                handler.doOverflowFound(overflowLocation, chunkPosition);
-                return true;
-            }
-            overflowLocation = overflowOverflowLocationSource.getUnsafe(overflowLocation);
-        }
-        return false;
-    }
-
-    @Override
-    public int findPositionForKey(Object key) {
-        final Object [] ka = (Object[])key;
-        final short k0 = TypeUtils.unbox((Short)ka[0]);
-        final long k1 = TypeUtils.unbox((Long)ka[1]);
-        int hash = hash(k0, k1);
-        final int tableLocation = hashToTableLocation(tableHashPivot, hash);
-        final int positionValue = mainOutputPosition.getUnsafe(tableLocation);
-        if (positionValue == EMPTY_OUTPUT_POSITION) {
-            return -1;
-        }
-        if (eq(mainKeySource0.getUnsafe(tableLocation), k0) && eq(mainKeySource1.getUnsafe(tableLocation), k1)) {
-            return positionValue;
-        }
-        int overflowLocation = mainOverflowLocationSource.getUnsafe(tableLocation);
-        while (overflowLocation != QueryConstants.NULL_INT) {
-            if (eq(overflowKeySource0.getUnsafe(overflowLocation), k0) && eq(overflowKeySource1.getUnsafe(overflowLocation), k1)) {
-                return overflowOutputPosition.getUnsafe(overflowLocation);
-            }
-            overflowLocation = overflowOverflowLocationSource.getUnsafe(overflowLocation);
-        }
-        return -1;
-    }
-}
diff --git a/engine/table/src/main/java/io/deephaven/engine/table/impl/by/typed/incagg/gen/IncrementalAggHasherShortObject.java b/engine/table/src/main/java/io/deephaven/engine/table/impl/by/typed/incagg/gen/IncrementalAggHasherShortObject.java
deleted file mode 100644
index 0e6f5706cfd..00000000000
--- a/engine/table/src/main/java/io/deephaven/engine/table/impl/by/typed/incagg/gen/IncrementalAggHasherShortObject.java
+++ /dev/null
@@ -1,205 +0,0 @@
-//
-// Copyright (c) 2016-2024 Deephaven Data Labs and Patent Pending
-//
-// ****** AUTO-GENERATED CLASS - DO NOT EDIT MANUALLY
-// ****** Run ReplicateTypedHashers or ./gradlew replicateTypedHashers to regenerate
-//
-// @formatter:off
-package io.deephaven.engine.table.impl.by.typed.incagg.gen;
-
-import static io.deephaven.util.compare.ObjectComparisons.eq;
-import static io.deephaven.util.compare.ShortComparisons.eq;
-
-import io.deephaven.chunk.Chunk;
-import io.deephaven.chunk.ObjectChunk;
-import io.deephaven.chunk.ShortChunk;
-import io.deephaven.chunk.attributes.Values;
-import io.deephaven.chunk.util.hashing.ObjectChunkHasher;
-import io.deephaven.chunk.util.hashing.ShortChunkHasher;
-import io.deephaven.engine.rowset.RowSequence;
-import io.deephaven.engine.table.ColumnSource;
-import io.deephaven.engine.table.impl.by.HashHandler;
-import io.deephaven.engine.table.impl.by.IncrementalChunkedOperatorAggregationStateManagerTypedBase;
-import io.deephaven.engine.table.impl.sources.ObjectArraySource;
-import io.deephaven.engine.table.impl.sources.ShortArraySource;
-import io.deephaven.util.QueryConstants;
-import io.deephaven.util.type.TypeUtils;
-import java.lang.Object;
-import java.lang.Override;
-import java.lang.Short;
-
-final class IncrementalAggHasherShortObject extends IncrementalChunkedOperatorAggregationStateManagerTypedBase {
-    private final ShortArraySource mainKeySource0;
-
-    private final ShortArraySource overflowKeySource0;
-
-    private final ObjectArraySource mainKeySource1;
-
-    private final ObjectArraySource overflowKeySource1;
-
-    public IncrementalAggHasherShortObject(ColumnSource[] tableKeySources,
-            ColumnSource[] originalTableKeySources, int tableSize, double maximumLoadFactor,
-            double targetLoadFactor) {
-        super(tableKeySources, tableSize, maximumLoadFactor, targetLoadFactor);
-        this.mainKeySource0 = (ShortArraySource) super.mainKeySources[0];
-        this.overflowKeySource0 = (ShortArraySource) super.overflowKeySources[0];
-        this.mainKeySource1 = (ObjectArraySource) super.mainKeySources[1];
-        this.overflowKeySource1 = (ObjectArraySource) super.overflowKeySources[1];
-    }
-
-    @Override
-    protected void build(HashHandler handler, RowSequence rowSequence, Chunk[] sourceKeyChunks) {
-        final ShortChunk<Values> keyChunk0 = sourceKeyChunks[0].asShortChunk();
-        final ObjectChunk<Object, Values> keyChunk1 = sourceKeyChunks[1].asObjectChunk();
-        final int chunkSize = keyChunk0.size();
-        for (int chunkPosition = 0; chunkPosition < chunkSize; ++chunkPosition) {
-            final short k0 = keyChunk0.get(chunkPosition);
-            final Object k1 = keyChunk1.get(chunkPosition);
-            final int hash = hash(k0, k1);
-            final int tableLocation = hashToTableLocation(tableHashPivot, hash);
-            if (mainOutputPosition.getUnsafe(tableLocation) == EMPTY_OUTPUT_POSITION) {
-                numEntries++;
-                mainKeySource0.set(tableLocation, k0);
-                mainKeySource1.set(tableLocation, k1);
-                handler.doMainInsert(tableLocation, chunkPosition);
-            } else if (eq(mainKeySource0.getUnsafe(tableLocation), k0) && eq(mainKeySource1.getUnsafe(tableLocation), k1)) {
-                handler.doMainFound(tableLocation, chunkPosition);
-            } else {
-                int overflowLocation = mainOverflowLocationSource.getUnsafe(tableLocation);
-                if (!findOverflow(handler, k0, k1, chunkPosition, overflowLocation)) {
-                    final int newOverflowLocation = allocateOverflowLocation();
-                    overflowKeySource0.set(newOverflowLocation, k0);
-                    overflowKeySource1.set(newOverflowLocation, k1);
-                    mainOverflowLocationSource.set(tableLocation, newOverflowLocation);
-                    overflowOverflowLocationSource.set(newOverflowLocation, overflowLocation);
-                    numEntries++;
-                    handler.doOverflowInsert(newOverflowLocation, chunkPosition);
-                }
-            }
-        }
-    }
-
-    @Override
-    protected void probe(HashHandler handler, RowSequence rowSequence, Chunk[] sourceKeyChunks) {
-        final ShortChunk<Values> keyChunk0 = sourceKeyChunks[0].asShortChunk();
-        final ObjectChunk<Object, Values> keyChunk1 = sourceKeyChunks[1].asObjectChunk();
-        final int chunkSize = keyChunk0.size();
-        for (int chunkPosition = 0; chunkPosition < chunkSize; ++chunkPosition) {
-            final short k0 = keyChunk0.get(chunkPosition);
-            final Object k1 = keyChunk1.get(chunkPosition);
-            final int hash = hash(k0, k1);
-            final int tableLocation = hashToTableLocation(tableHashPivot, hash);
-            if (mainOutputPosition.getUnsafe(tableLocation) == EMPTY_OUTPUT_POSITION) {
-                handler.doMissing(chunkPosition);
-            } else if (eq(mainKeySource0.getUnsafe(tableLocation), k0) && eq(mainKeySource1.getUnsafe(tableLocation), k1)) {
-                handler.doMainFound(tableLocation, chunkPosition);
-            } else {
-                int overflowLocation = mainOverflowLocationSource.getUnsafe(tableLocation);
-                if (!findOverflow(handler, k0, k1, chunkPosition, overflowLocation)) {
-                    handler.doMissing(chunkPosition);
-                }
-            }
-        }
-    }
-
-    private static int hash(short k0, Object k1) {
-        int hash = ShortChunkHasher.hashInitialSingle(k0);
-        hash = ObjectChunkHasher.hashUpdateSingle(hash, k1);
-        return hash;
-    }
-
-    @Override
-    protected void rehashBucket(HashHandler handler, int sourceBucket, int destBucket,
-            int bucketsToAdd) {
-        final int position = mainOutputPosition.getUnsafe(sourceBucket);
-        if (position == EMPTY_OUTPUT_POSITION) {
-            return;
-        }
-        int mainInsertLocation = maybeMoveMainBucket(handler, sourceBucket, destBucket, bucketsToAdd);
-        int overflowLocation = mainOverflowLocationSource.getUnsafe(sourceBucket);
-        mainOverflowLocationSource.set(sourceBucket, QueryConstants.NULL_INT);
-        mainOverflowLocationSource.set(destBucket, QueryConstants.NULL_INT);
-        while (overflowLocation != QueryConstants.NULL_INT) {
-            final int nextOverflowLocation = overflowOverflowLocationSource.getUnsafe(overflowLocation);
-            final short overflowKey0 = overflowKeySource0.getUnsafe(overflowLocation);
-            final Object overflowKey1 = overflowKeySource1.getUnsafe(overflowLocation);
-            final int overflowHash = hash(overflowKey0, overflowKey1);
-            final int overflowTableLocation = hashToTableLocation(tableHashPivot + bucketsToAdd, overflowHash);
-            if (overflowTableLocation == mainInsertLocation) {
-                mainKeySource0.set(mainInsertLocation, overflowKey0);
-                mainKeySource1.set(mainInsertLocation, overflowKey1);
-                mainOutputPosition.set(mainInsertLocation, overflowOutputPosition.getUnsafe(overflowLocation));
-                handler.doPromoteOverflow(overflowLocation, mainInsertLocation);
-                overflowOutputPosition.set(overflowLocation, QueryConstants.NULL_INT);
-                overflowKeySource0.set(overflowLocation, QueryConstants.NULL_SHORT);
-                overflowKeySource1.set(overflowLocation, null);
-                freeOverflowLocation(overflowLocation);
-                mainInsertLocation = -1;
-            } else {
-                final int oldOverflowLocation = mainOverflowLocationSource.getUnsafe(overflowTableLocation);
-                mainOverflowLocationSource.set(overflowTableLocation, overflowLocation);
-                overflowOverflowLocationSource.set(overflowLocation, oldOverflowLocation);
-            }
-            overflowLocation = nextOverflowLocation;
-        }
-    }
-
-    private int maybeMoveMainBucket(HashHandler handler, int sourceBucket, int destBucket,
-            int bucketsToAdd) {
-        final short k0 = mainKeySource0.getUnsafe(sourceBucket);
-        final Object k1 = mainKeySource1.getUnsafe(sourceBucket);
-        final int hash = hash(k0, k1);
-        final int location = hashToTableLocation(tableHashPivot + bucketsToAdd, hash);
-        final int mainInsertLocation;
-        if (location == sourceBucket) {
-            mainInsertLocation = destBucket;
-            mainOutputPosition.set(destBucket, EMPTY_OUTPUT_POSITION);
-        } else {
-            mainInsertLocation = sourceBucket;
-            mainOutputPosition.set(destBucket, mainOutputPosition.getUnsafe(sourceBucket));
-            mainOutputPosition.set(sourceBucket, EMPTY_OUTPUT_POSITION);
-            mainKeySource0.set(destBucket, k0);
-            mainKeySource0.set(sourceBucket, QueryConstants.NULL_SHORT);
-            mainKeySource1.set(destBucket, k1);
-            mainKeySource1.set(sourceBucket, null);
-            handler.doMoveMain(sourceBucket, destBucket);
-        }
-        return mainInsertLocation;
-    }
-
-    private boolean findOverflow(HashHandler handler, short k0, Object k1, int chunkPosition,
-            int overflowLocation) {
-        while (overflowLocation != QueryConstants.NULL_INT) {
-            if (eq(overflowKeySource0.getUnsafe(overflowLocation), k0) && eq(overflowKeySource1.getUnsafe(overflowLocation), k1)) {
-                handler.doOverflowFound(overflowLocation, chunkPosition);
-                return true;
-            }
-            overflowLocation = overflowOverflowLocationSource.getUnsafe(overflowLocation);
-        }
-        return false;
-    }
-
-    @Override
-    public int findPositionForKey(Object key) {
-        final Object [] ka = (Object[])key;
-        final short k0 = TypeUtils.unbox((Short)ka[0]);
-        final Object k1 = ka[1];
-        int hash = hash(k0, k1);
-        final int tableLocation = hashToTableLocation(tableHashPivot, hash);
-        final int positionValue = mainOutputPosition.getUnsafe(tableLocation);
-        if (positionValue == EMPTY_OUTPUT_POSITION) {
-            return -1;
-        }
-        if (eq(mainKeySource0.getUnsafe(tableLocation), k0) && eq(mainKeySource1.getUnsafe(tableLocation), k1)) {
-            return positionValue;
-        }
-        int overflowLocation = mainOverflowLocationSource.getUnsafe(tableLocation);
-        while (overflowLocation != QueryConstants.NULL_INT) {
-            if (eq(overflowKeySource0.getUnsafe(overflowLocation), k0) && eq(overflowKeySource1.getUnsafe(overflowLocation), k1)) {
-                return overflowOutputPosition.getUnsafe(overflowLocation);
-            }
-            overflowLocation = overflowOverflowLocationSource.getUnsafe(overflowLocation);
-        }
-        return -1;
-    }
-}
diff --git a/engine/table/src/main/java/io/deephaven/engine/table/impl/by/typed/incagg/gen/IncrementalAggHasherShortShort.java b/engine/table/src/main/java/io/deephaven/engine/table/impl/by/typed/incagg/gen/IncrementalAggHasherShortShort.java
deleted file mode 100644
index 0967549677e..00000000000
--- a/engine/table/src/main/java/io/deephaven/engine/table/impl/by/typed/incagg/gen/IncrementalAggHasherShortShort.java
+++ /dev/null
@@ -1,201 +0,0 @@
-//
-// Copyright (c) 2016-2024 Deephaven Data Labs and Patent Pending
-//
-// ****** AUTO-GENERATED CLASS - DO NOT EDIT MANUALLY
-// ****** Run ReplicateTypedHashers or ./gradlew replicateTypedHashers to regenerate
-//
-// @formatter:off
-package io.deephaven.engine.table.impl.by.typed.incagg.gen;
-
-import static io.deephaven.util.compare.ShortComparisons.eq;
-
-import io.deephaven.chunk.Chunk;
-import io.deephaven.chunk.ShortChunk;
-import io.deephaven.chunk.attributes.Values;
-import io.deephaven.chunk.util.hashing.ShortChunkHasher;
-import io.deephaven.engine.rowset.RowSequence;
-import io.deephaven.engine.table.ColumnSource;
-import io.deephaven.engine.table.impl.by.HashHandler;
-import io.deephaven.engine.table.impl.by.IncrementalChunkedOperatorAggregationStateManagerTypedBase;
-import io.deephaven.engine.table.impl.sources.ShortArraySource;
-import io.deephaven.util.QueryConstants;
-import io.deephaven.util.type.TypeUtils;
-import java.lang.Object;
-import java.lang.Override;
-import java.lang.Short;
-
-final class IncrementalAggHasherShortShort extends IncrementalChunkedOperatorAggregationStateManagerTypedBase {
-    private final ShortArraySource mainKeySource0;
-
-    private final ShortArraySource overflowKeySource0;
-
-    private final ShortArraySource mainKeySource1;
-
-    private final ShortArraySource overflowKeySource1;
-
-    public IncrementalAggHasherShortShort(ColumnSource[] tableKeySources,
-            ColumnSource[] originalTableKeySources, int tableSize, double maximumLoadFactor,
-            double targetLoadFactor) {
-        super(tableKeySources, tableSize, maximumLoadFactor, targetLoadFactor);
-        this.mainKeySource0 = (ShortArraySource) super.mainKeySources[0];
-        this.overflowKeySource0 = (ShortArraySource) super.overflowKeySources[0];
-        this.mainKeySource1 = (ShortArraySource) super.mainKeySources[1];
-        this.overflowKeySource1 = (ShortArraySource) super.overflowKeySources[1];
-    }
-
-    @Override
-    protected void build(HashHandler handler, RowSequence rowSequence, Chunk[] sourceKeyChunks) {
-        final ShortChunk<Values> keyChunk0 = sourceKeyChunks[0].asShortChunk();
-        final ShortChunk<Values> keyChunk1 = sourceKeyChunks[1].asShortChunk();
-        final int chunkSize = keyChunk0.size();
-        for (int chunkPosition = 0; chunkPosition < chunkSize; ++chunkPosition) {
-            final short k0 = keyChunk0.get(chunkPosition);
-            final short k1 = keyChunk1.get(chunkPosition);
-            final int hash = hash(k0, k1);
-            final int tableLocation = hashToTableLocation(tableHashPivot, hash);
-            if (mainOutputPosition.getUnsafe(tableLocation) == EMPTY_OUTPUT_POSITION) {
-                numEntries++;
-                mainKeySource0.set(tableLocation, k0);
-                mainKeySource1.set(tableLocation, k1);
-                handler.doMainInsert(tableLocation, chunkPosition);
-            } else if (eq(mainKeySource0.getUnsafe(tableLocation), k0) && eq(mainKeySource1.getUnsafe(tableLocation), k1)) {
-                handler.doMainFound(tableLocation, chunkPosition);
-            } else {
-                int overflowLocation = mainOverflowLocationSource.getUnsafe(tableLocation);
-                if (!findOverflow(handler, k0, k1, chunkPosition, overflowLocation)) {
-                    final int newOverflowLocation = allocateOverflowLocation();
-                    overflowKeySource0.set(newOverflowLocation, k0);
-                    overflowKeySource1.set(newOverflowLocation, k1);
-                    mainOverflowLocationSource.set(tableLocation, newOverflowLocation);
-                    overflowOverflowLocationSource.set(newOverflowLocation, overflowLocation);
-                    numEntries++;
-                    handler.doOverflowInsert(newOverflowLocation, chunkPosition);
-                }
-            }
-        }
-    }
-
-    @Override
-    protected void probe(HashHandler handler, RowSequence rowSequence, Chunk[] sourceKeyChunks) {
-        final ShortChunk<Values> keyChunk0 = sourceKeyChunks[0].asShortChunk();
-        final ShortChunk<Values> keyChunk1 = sourceKeyChunks[1].asShortChunk();
-        final int chunkSize = keyChunk0.size();
-        for (int chunkPosition = 0; chunkPosition < chunkSize; ++chunkPosition) {
-            final short k0 = keyChunk0.get(chunkPosition);
-            final short k1 = keyChunk1.get(chunkPosition);
-            final int hash = hash(k0, k1);
-            final int tableLocation = hashToTableLocation(tableHashPivot, hash);
-            if (mainOutputPosition.getUnsafe(tableLocation) == EMPTY_OUTPUT_POSITION) {
-                handler.doMissing(chunkPosition);
-            } else if (eq(mainKeySource0.getUnsafe(tableLocation), k0) && eq(mainKeySource1.getUnsafe(tableLocation), k1)) {
-                handler.doMainFound(tableLocation, chunkPosition);
-            } else {
-                int overflowLocation = mainOverflowLocationSource.getUnsafe(tableLocation);
-                if (!findOverflow(handler, k0, k1, chunkPosition, overflowLocation)) {
-                    handler.doMissing(chunkPosition);
-                }
-            }
-        }
-    }
-
-    private static int hash(short k0, short k1) {
-        int hash = ShortChunkHasher.hashInitialSingle(k0);
-        hash = ShortChunkHasher.hashUpdateSingle(hash, k1);
-        return hash;
-    }
-
-    @Override
-    protected void rehashBucket(HashHandler handler, int sourceBucket, int destBucket,
-            int bucketsToAdd) {
-        final int position = mainOutputPosition.getUnsafe(sourceBucket);
-        if (position == EMPTY_OUTPUT_POSITION) {
-            return;
-        }
-        int mainInsertLocation = maybeMoveMainBucket(handler, sourceBucket, destBucket, bucketsToAdd);
-        int overflowLocation = mainOverflowLocationSource.getUnsafe(sourceBucket);
-        mainOverflowLocationSource.set(sourceBucket, QueryConstants.NULL_INT);
-        mainOverflowLocationSource.set(destBucket, QueryConstants.NULL_INT);
-        while (overflowLocation != QueryConstants.NULL_INT) {
-            final int nextOverflowLocation = overflowOverflowLocationSource.getUnsafe(overflowLocation);
-            final short overflowKey0 = overflowKeySource0.getUnsafe(overflowLocation);
-            final short overflowKey1 = overflowKeySource1.getUnsafe(overflowLocation);
-            final int overflowHash = hash(overflowKey0, overflowKey1);
-            final int overflowTableLocation = hashToTableLocation(tableHashPivot + bucketsToAdd, overflowHash);
-            if (overflowTableLocation == mainInsertLocation) {
-                mainKeySource0.set(mainInsertLocation, overflowKey0);
-                mainKeySource1.set(mainInsertLocation, overflowKey1);
-                mainOutputPosition.set(mainInsertLocation, overflowOutputPosition.getUnsafe(overflowLocation));
-                handler.doPromoteOverflow(overflowLocation, mainInsertLocation);
-                overflowOutputPosition.set(overflowLocation, QueryConstants.NULL_INT);
-                overflowKeySource0.set(overflowLocation, QueryConstants.NULL_SHORT);
-                overflowKeySource1.set(overflowLocation, QueryConstants.NULL_SHORT);
-                freeOverflowLocation(overflowLocation);
-                mainInsertLocation = -1;
-            } else {
-                final int oldOverflowLocation = mainOverflowLocationSource.getUnsafe(overflowTableLocation);
-                mainOverflowLocationSource.set(overflowTableLocation, overflowLocation);
-                overflowOverflowLocationSource.set(overflowLocation, oldOverflowLocation);
-            }
-            overflowLocation = nextOverflowLocation;
-        }
-    }
-
-    private int maybeMoveMainBucket(HashHandler handler, int sourceBucket, int destBucket,
-            int bucketsToAdd) {
-        final short k0 = mainKeySource0.getUnsafe(sourceBucket);
-        final short k1 = mainKeySource1.getUnsafe(sourceBucket);
-        final int hash = hash(k0, k1);
-        final int location = hashToTableLocation(tableHashPivot + bucketsToAdd, hash);
-        final int mainInsertLocation;
-        if (location == sourceBucket) {
-            mainInsertLocation = destBucket;
-            mainOutputPosition.set(destBucket, EMPTY_OUTPUT_POSITION);
-        } else {
-            mainInsertLocation = sourceBucket;
-            mainOutputPosition.set(destBucket, mainOutputPosition.getUnsafe(sourceBucket));
-            mainOutputPosition.set(sourceBucket, EMPTY_OUTPUT_POSITION);
-            mainKeySource0.set(destBucket, k0);
-            mainKeySource0.set(sourceBucket, QueryConstants.NULL_SHORT);
-            mainKeySource1.set(destBucket, k1);
-            mainKeySource1.set(sourceBucket, QueryConstants.NULL_SHORT);
-            handler.doMoveMain(sourceBucket, destBucket);
-        }
-        return mainInsertLocation;
-    }
-
-    private boolean findOverflow(HashHandler handler, short k0, short k1, int chunkPosition,
-            int overflowLocation) {
-        while (overflowLocation != QueryConstants.NULL_INT) {
-            if (eq(overflowKeySource0.getUnsafe(overflowLocation), k0) && eq(overflowKeySource1.getUnsafe(overflowLocation), k1)) {
-                handler.doOverflowFound(overflowLocation, chunkPosition);
-                return true;
-            }
-            overflowLocation = overflowOverflowLocationSource.getUnsafe(overflowLocation);
-        }
-        return false;
-    }
-
-    @Override
-    public int findPositionForKey(Object key) {
-        final Object [] ka = (Object[])key;
-        final short k0 = TypeUtils.unbox((Short)ka[0]);
-        final short k1 = TypeUtils.unbox((Short)ka[1]);
-        int hash = hash(k0, k1);
-        final int tableLocation = hashToTableLocation(tableHashPivot, hash);
-        final int positionValue = mainOutputPosition.getUnsafe(tableLocation);
-        if (positionValue == EMPTY_OUTPUT_POSITION) {
-            return -1;
-        }
-        if (eq(mainKeySource0.getUnsafe(tableLocation), k0) && eq(mainKeySource1.getUnsafe(tableLocation), k1)) {
-            return positionValue;
-        }
-        int overflowLocation = mainOverflowLocationSource.getUnsafe(tableLocation);
-        while (overflowLocation != QueryConstants.NULL_INT) {
-            if (eq(overflowKeySource0.getUnsafe(overflowLocation), k0) && eq(overflowKeySource1.getUnsafe(overflowLocation), k1)) {
-                return overflowOutputPosition.getUnsafe(overflowLocation);
-            }
-            overflowLocation = overflowOverflowLocationSource.getUnsafe(overflowLocation);
-        }
-        return -1;
-    }
-}
diff --git a/engine/table/src/main/java/io/deephaven/engine/table/impl/by/typed/incagg/gen/TypedHashDispatcher.java b/engine/table/src/main/java/io/deephaven/engine/table/impl/by/typed/incagg/gen/TypedHashDispatcher.java
deleted file mode 100644
index fd1dadb4089..00000000000
--- a/engine/table/src/main/java/io/deephaven/engine/table/impl/by/typed/incagg/gen/TypedHashDispatcher.java
+++ /dev/null
@@ -1,149 +0,0 @@
-//
-// Copyright (c) 2016-2024 Deephaven Data Labs and Patent Pending
-//
-// ****** AUTO-GENERATED CLASS - DO NOT EDIT MANUALLY
-// ****** Run ReplicateTypedHashers or ./gradlew replicateTypedHashers to regenerate
-//
-// @formatter:off
-package io.deephaven.engine.table.impl.by.typed.incagg.gen;
-
-import io.deephaven.chunk.ChunkType;
-import io.deephaven.engine.table.ColumnSource;
-import io.deephaven.engine.table.impl.by.IncrementalChunkedOperatorAggregationStateManagerTypedBase;
-import java.util.Arrays;
-
-/**
- * The TypedHashDispatcher returns a pre-generated and precompiled hasher instance suitable for the provided column sources, or null if there is not a precompiled hasher suitable for the specified sources.
- */
-public class TypedHashDispatcher {
-    private TypedHashDispatcher() {
-        // static use only
-    }
-
-    public static IncrementalChunkedOperatorAggregationStateManagerTypedBase dispatch(
-            ColumnSource[] tableKeySources, ColumnSource[] originalTableKeySources, int tableSize,
-            double maximumLoadFactor, double targetLoadFactor) {
-        final ChunkType[] chunkTypes = Arrays.stream(tableKeySources).map(ColumnSource::getChunkType).toArray(ChunkType[]::new);;
-        if (chunkTypes.length == 1) {
-            return dispatchSingle(chunkTypes[0], tableKeySources, originalTableKeySources, tableSize, maximumLoadFactor, targetLoadFactor);
-        }
-        if (chunkTypes.length == 2) {
-            return dispatchDouble(chunkTypes[0], chunkTypes[1], tableKeySources, originalTableKeySources, tableSize, maximumLoadFactor, targetLoadFactor);
-        }
-        return null;
-    }
-
-    private static IncrementalChunkedOperatorAggregationStateManagerTypedBase dispatchSingle(
-            ChunkType chunkType, ColumnSource[] tableKeySources,
-            ColumnSource[] originalTableKeySources, int tableSize, double maximumLoadFactor,
-            double targetLoadFactor) {
-        switch (chunkType) {
-            default: throw new UnsupportedOperationException("Invalid chunk type for typed hashers: " + chunkType);
-            case Char: return new IncrementalAggHasherChar(tableKeySources, originalTableKeySources, tableSize, maximumLoadFactor, targetLoadFactor);
-            case Byte: return new IncrementalAggHasherByte(tableKeySources, originalTableKeySources, tableSize, maximumLoadFactor, targetLoadFactor);
-            case Short: return new IncrementalAggHasherShort(tableKeySources, originalTableKeySources, tableSize, maximumLoadFactor, targetLoadFactor);
-            case Int: return new IncrementalAggHasherInt(tableKeySources, originalTableKeySources, tableSize, maximumLoadFactor, targetLoadFactor);
-            case Long: return new IncrementalAggHasherLong(tableKeySources, originalTableKeySources, tableSize, maximumLoadFactor, targetLoadFactor);
-            case Float: return new IncrementalAggHasherFloat(tableKeySources, originalTableKeySources, tableSize, maximumLoadFactor, targetLoadFactor);
-            case Double: return new IncrementalAggHasherDouble(tableKeySources, originalTableKeySources, tableSize, maximumLoadFactor, targetLoadFactor);
-            case Object: return new IncrementalAggHasherObject(tableKeySources, originalTableKeySources, tableSize, maximumLoadFactor, targetLoadFactor);
-        }
-    }
-
-    private static IncrementalChunkedOperatorAggregationStateManagerTypedBase dispatchDouble(
-            ChunkType chunkType0, ChunkType chunkType1, ColumnSource[] tableKeySources,
-            ColumnSource[] originalTableKeySources, int tableSize, double maximumLoadFactor,
-            double targetLoadFactor) {
-        switch (chunkType0) {
-            default: throw new UnsupportedOperationException("Invalid chunk type for typed hashers: " + chunkType0);
-            case Char:switch (chunkType1) {
-                default: throw new UnsupportedOperationException("Invalid chunk type for typed hashers: " + chunkType1);
-                case Char: return new IncrementalAggHasherCharChar(tableKeySources, originalTableKeySources, tableSize, maximumLoadFactor, targetLoadFactor);
-                case Byte: return new IncrementalAggHasherCharByte(tableKeySources, originalTableKeySources, tableSize, maximumLoadFactor, targetLoadFactor);
-                case Short: return new IncrementalAggHasherCharShort(tableKeySources, originalTableKeySources, tableSize, maximumLoadFactor, targetLoadFactor);
-                case Int: return new IncrementalAggHasherCharInt(tableKeySources, originalTableKeySources, tableSize, maximumLoadFactor, targetLoadFactor);
-                case Long: return new IncrementalAggHasherCharLong(tableKeySources, originalTableKeySources, tableSize, maximumLoadFactor, targetLoadFactor);
-                case Float: return new IncrementalAggHasherCharFloat(tableKeySources, originalTableKeySources, tableSize, maximumLoadFactor, targetLoadFactor);
-                case Double: return new IncrementalAggHasherCharDouble(tableKeySources, originalTableKeySources, tableSize, maximumLoadFactor, targetLoadFactor);
-                case Object: return new IncrementalAggHasherCharObject(tableKeySources, originalTableKeySources, tableSize, maximumLoadFactor, targetLoadFactor);
-            }
-            case Byte:switch (chunkType1) {
-                default: throw new UnsupportedOperationException("Invalid chunk type for typed hashers: " + chunkType1);
-                case Char: return new IncrementalAggHasherByteChar(tableKeySources, originalTableKeySources, tableSize, maximumLoadFactor, targetLoadFactor);
-                case Byte: return new IncrementalAggHasherByteByte(tableKeySources, originalTableKeySources, tableSize, maximumLoadFactor, targetLoadFactor);
-                case Short: return new IncrementalAggHasherByteShort(tableKeySources, originalTableKeySources, tableSize, maximumLoadFactor, targetLoadFactor);
-                case Int: return new IncrementalAggHasherByteInt(tableKeySources, originalTableKeySources, tableSize, maximumLoadFactor, targetLoadFactor);
-                case Long: return new IncrementalAggHasherByteLong(tableKeySources, originalTableKeySources, tableSize, maximumLoadFactor, targetLoadFactor);
-                case Float: return new IncrementalAggHasherByteFloat(tableKeySources, originalTableKeySources, tableSize, maximumLoadFactor, targetLoadFactor);
-                case Double: return new IncrementalAggHasherByteDouble(tableKeySources, originalTableKeySources, tableSize, maximumLoadFactor, targetLoadFactor);
-                case Object: return new IncrementalAggHasherByteObject(tableKeySources, originalTableKeySources, tableSize, maximumLoadFactor, targetLoadFactor);
-            }
-            case Short:switch (chunkType1) {
-                default: throw new UnsupportedOperationException("Invalid chunk type for typed hashers: " + chunkType1);
-                case Char: return new IncrementalAggHasherShortChar(tableKeySources, originalTableKeySources, tableSize, maximumLoadFactor, targetLoadFactor);
-                case Byte: return new IncrementalAggHasherShortByte(tableKeySources, originalTableKeySources, tableSize, maximumLoadFactor, targetLoadFactor);
-                case Short: return new IncrementalAggHasherShortShort(tableKeySources, originalTableKeySources, tableSize, maximumLoadFactor, targetLoadFactor);
-                case Int: return new IncrementalAggHasherShortInt(tableKeySources, originalTableKeySources, tableSize, maximumLoadFactor, targetLoadFactor);
-                case Long: return new IncrementalAggHasherShortLong(tableKeySources, originalTableKeySources, tableSize, maximumLoadFactor, targetLoadFactor);
-                case Float: return new IncrementalAggHasherShortFloat(tableKeySources, originalTableKeySources, tableSize, maximumLoadFactor, targetLoadFactor);
-                case Double: return new IncrementalAggHasherShortDouble(tableKeySources, originalTableKeySources, tableSize, maximumLoadFactor, targetLoadFactor);
-                case Object: return new IncrementalAggHasherShortObject(tableKeySources, originalTableKeySources, tableSize, maximumLoadFactor, targetLoadFactor);
-            }
-            case Int:switch (chunkType1) {
-                default: throw new UnsupportedOperationException("Invalid chunk type for typed hashers: " + chunkType1);
-                case Char: return new IncrementalAggHasherIntChar(tableKeySources, originalTableKeySources, tableSize, maximumLoadFactor, targetLoadFactor);
-                case Byte: return new IncrementalAggHasherIntByte(tableKeySources, originalTableKeySources, tableSize, maximumLoadFactor, targetLoadFactor);
-                case Short: return new IncrementalAggHasherIntShort(tableKeySources, originalTableKeySources, tableSize, maximumLoadFactor, targetLoadFactor);
-                case Int: return new IncrementalAggHasherIntInt(tableKeySources, originalTableKeySources, tableSize, maximumLoadFactor, targetLoadFactor);
-                case Long: return new IncrementalAggHasherIntLong(tableKeySources, originalTableKeySources, tableSize, maximumLoadFactor, targetLoadFactor);
-                case Float: return new IncrementalAggHasherIntFloat(tableKeySources, originalTableKeySources, tableSize, maximumLoadFactor, targetLoadFactor);
-                case Double: return new IncrementalAggHasherIntDouble(tableKeySources, originalTableKeySources, tableSize, maximumLoadFactor, targetLoadFactor);
-                case Object: return new IncrementalAggHasherIntObject(tableKeySources, originalTableKeySources, tableSize, maximumLoadFactor, targetLoadFactor);
-            }
-            case Long:switch (chunkType1) {
-                default: throw new UnsupportedOperationException("Invalid chunk type for typed hashers: " + chunkType1);
-                case Char: return new IncrementalAggHasherLongChar(tableKeySources, originalTableKeySources, tableSize, maximumLoadFactor, targetLoadFactor);
-                case Byte: return new IncrementalAggHasherLongByte(tableKeySources, originalTableKeySources, tableSize, maximumLoadFactor, targetLoadFactor);
-                case Short: return new IncrementalAggHasherLongShort(tableKeySources, originalTableKeySources, tableSize, maximumLoadFactor, targetLoadFactor);
-                case Int: return new IncrementalAggHasherLongInt(tableKeySources, originalTableKeySources, tableSize, maximumLoadFactor, targetLoadFactor);
-                case Long: return new IncrementalAggHasherLongLong(tableKeySources, originalTableKeySources, tableSize, maximumLoadFactor, targetLoadFactor);
-                case Float: return new IncrementalAggHasherLongFloat(tableKeySources, originalTableKeySources, tableSize, maximumLoadFactor, targetLoadFactor);
-                case Double: return new IncrementalAggHasherLongDouble(tableKeySources, originalTableKeySources, tableSize, maximumLoadFactor, targetLoadFactor);
-                case Object: return new IncrementalAggHasherLongObject(tableKeySources, originalTableKeySources, tableSize, maximumLoadFactor, targetLoadFactor);
-            }
-            case Float:switch (chunkType1) {
-                default: throw new UnsupportedOperationException("Invalid chunk type for typed hashers: " + chunkType1);
-                case Char: return new IncrementalAggHasherFloatChar(tableKeySources, originalTableKeySources, tableSize, maximumLoadFactor, targetLoadFactor);
-                case Byte: return new IncrementalAggHasherFloatByte(tableKeySources, originalTableKeySources, tableSize, maximumLoadFactor, targetLoadFactor);
-                case Short: return new IncrementalAggHasherFloatShort(tableKeySources, originalTableKeySources, tableSize, maximumLoadFactor, targetLoadFactor);
-                case Int: return new IncrementalAggHasherFloatInt(tableKeySources, originalTableKeySources, tableSize, maximumLoadFactor, targetLoadFactor);
-                case Long: return new IncrementalAggHasherFloatLong(tableKeySources, originalTableKeySources, tableSize, maximumLoadFactor, targetLoadFactor);
-                case Float: return new IncrementalAggHasherFloatFloat(tableKeySources, originalTableKeySources, tableSize, maximumLoadFactor, targetLoadFactor);
-                case Double: return new IncrementalAggHasherFloatDouble(tableKeySources, originalTableKeySources, tableSize, maximumLoadFactor, targetLoadFactor);
-                case Object: return new IncrementalAggHasherFloatObject(tableKeySources, originalTableKeySources, tableSize, maximumLoadFactor, targetLoadFactor);
-            }
-            case Double:switch (chunkType1) {
-                default: throw new UnsupportedOperationException("Invalid chunk type for typed hashers: " + chunkType1);
-                case Char: return new IncrementalAggHasherDoubleChar(tableKeySources, originalTableKeySources, tableSize, maximumLoadFactor, targetLoadFactor);
-                case Byte: return new IncrementalAggHasherDoubleByte(tableKeySources, originalTableKeySources, tableSize, maximumLoadFactor, targetLoadFactor);
-                case Short: return new IncrementalAggHasherDoubleShort(tableKeySources, originalTableKeySources, tableSize, maximumLoadFactor, targetLoadFactor);
-                case Int: return new IncrementalAggHasherDoubleInt(tableKeySources, originalTableKeySources, tableSize, maximumLoadFactor, targetLoadFactor);
-                case Long: return new IncrementalAggHasherDoubleLong(tableKeySources, originalTableKeySources, tableSize, maximumLoadFactor, targetLoadFactor);
-                case Float: return new IncrementalAggHasherDoubleFloat(tableKeySources, originalTableKeySources, tableSize, maximumLoadFactor, targetLoadFactor);
-                case Double: return new IncrementalAggHasherDoubleDouble(tableKeySources, originalTableKeySources, tableSize, maximumLoadFactor, targetLoadFactor);
-                case Object: return new IncrementalAggHasherDoubleObject(tableKeySources, originalTableKeySources, tableSize, maximumLoadFactor, targetLoadFactor);
-            }
-            case Object:switch (chunkType1) {
-                default: throw new UnsupportedOperationException("Invalid chunk type for typed hashers: " + chunkType1);
-                case Char: return new IncrementalAggHasherObjectChar(tableKeySources, originalTableKeySources, tableSize, maximumLoadFactor, targetLoadFactor);
-                case Byte: return new IncrementalAggHasherObjectByte(tableKeySources, originalTableKeySources, tableSize, maximumLoadFactor, targetLoadFactor);
-                case Short: return new IncrementalAggHasherObjectShort(tableKeySources, originalTableKeySources, tableSize, maximumLoadFactor, targetLoadFactor);
-                case Int: return new IncrementalAggHasherObjectInt(tableKeySources, originalTableKeySources, tableSize, maximumLoadFactor, targetLoadFactor);
-                case Long: return new IncrementalAggHasherObjectLong(tableKeySources, originalTableKeySources, tableSize, maximumLoadFactor, targetLoadFactor);
-                case Float: return new IncrementalAggHasherObjectFloat(tableKeySources, originalTableKeySources, tableSize, maximumLoadFactor, targetLoadFactor);
-                case Double: return new IncrementalAggHasherObjectDouble(tableKeySources, originalTableKeySources, tableSize, maximumLoadFactor, targetLoadFactor);
-                case Object: return new IncrementalAggHasherObjectObject(tableKeySources, originalTableKeySources, tableSize, maximumLoadFactor, targetLoadFactor);
-            }
-        }
-    }
-}
diff --git a/engine/table/src/main/java/io/deephaven/engine/table/impl/by/typed/incopenagg/gen/IncrementalAggOpenHasherByte.java b/engine/table/src/main/java/io/deephaven/engine/table/impl/by/typed/incopenagg/gen/IncrementalAggOpenHasherByte.java
index 1f724cc6334..aa212b87b2a 100644
--- a/engine/table/src/main/java/io/deephaven/engine/table/impl/by/typed/incopenagg/gen/IncrementalAggOpenHasherByte.java
+++ b/engine/table/src/main/java/io/deephaven/engine/table/impl/by/typed/incopenagg/gen/IncrementalAggOpenHasherByte.java
@@ -55,12 +55,12 @@ protected void build(RowSequence rowSequence, Chunk[] sourceKeyChunks) {
             int tableLocation = firstTableLocation;
             MAIN_SEARCH: while (true) {
                 int outputPosition = mainOutputPosition.getUnsafe(tableLocation);
-                if (outputPosition == EMPTY_OUTPUT_POSITION) {
+                if (isStateEmpty(outputPosition)) {
                     final int firstAlternateTableLocation = hashToTableLocationAlternate(hash);
                     int alternateTableLocation = firstAlternateTableLocation;
                     while (alternateTableLocation < rehashPointer) {
                         outputPosition = alternateOutputPosition.getUnsafe(alternateTableLocation);
-                        if (outputPosition == EMPTY_OUTPUT_POSITION) {
+                        if (isStateEmpty(outputPosition)) {
                             break;
                         } else if (eq(alternateKeySource0.getUnsafe(alternateTableLocation), k0)) {
                             outputPositions.set(chunkPosition, outputPosition);
@@ -98,7 +98,7 @@ protected void probe(RowSequence rowSequence, Chunk[] sourceKeyChunks) {
             boolean found = false;
             int tableLocation = firstTableLocation;
             int outputPosition;
-            while ((outputPosition = mainOutputPosition.getUnsafe(tableLocation)) != EMPTY_OUTPUT_POSITION) {
+            while (!isStateEmpty(outputPosition = mainOutputPosition.getUnsafe(tableLocation))) {
                 if (eq(mainKeySource0.getUnsafe(tableLocation), k0)) {
                     outputPositions.set(chunkPosition, outputPosition);
                     found = true;
@@ -112,7 +112,7 @@ protected void probe(RowSequence rowSequence, Chunk[] sourceKeyChunks) {
                 boolean alternateFound = false;
                 if (firstAlternateTableLocation < rehashPointer) {
                     int alternateTableLocation = firstAlternateTableLocation;
-                    while ((outputPosition = alternateOutputPosition.getUnsafe(alternateTableLocation)) != EMPTY_OUTPUT_POSITION) {
+                    while (!isStateEmpty(outputPosition = alternateOutputPosition.getUnsafe(alternateTableLocation))) {
                         if (eq(alternateKeySource0.getUnsafe(alternateTableLocation), k0)) {
                             outputPositions.set(chunkPosition, outputPosition);
                             alternateFound = true;
@@ -134,15 +134,19 @@ private static int hash(byte k0) {
         return hash;
     }
 
+    private static boolean isStateEmpty(int state) {
+        return state == EMPTY_OUTPUT_POSITION;
+    }
+
     private boolean migrateOneLocation(int locationToMigrate) {
         final int currentStateValue = alternateOutputPosition.getUnsafe(locationToMigrate);
-        if (currentStateValue == EMPTY_OUTPUT_POSITION) {
+        if (isStateEmpty(currentStateValue)) {
             return false;
         }
         final byte k0 = alternateKeySource0.getUnsafe(locationToMigrate);
         final int hash = hash(k0);
         int destinationTableLocation = hashToTableLocation(hash);
-        while (mainOutputPosition.getUnsafe(destinationTableLocation) != EMPTY_OUTPUT_POSITION) {
+        while (!isStateEmpty(mainOutputPosition.getUnsafe(destinationTableLocation))) {
             destinationTableLocation = nextTableLocation(destinationTableLocation);
         }
         mainKeySource0.set(destinationTableLocation, k0);
@@ -164,8 +168,7 @@ protected int rehashInternalPartial(int entriesToRehash) {
     }
 
     @Override
-    protected void newAlternate() {
-        super.newAlternate();
+    protected void adviseNewAlternate() {
         this.mainKeySource0 = (ImmutableByteArraySource)super.mainKeySources[0];
         this.alternateKeySource0 = (ImmutableByteArraySource)super.alternateKeySources[0];
     }
@@ -179,7 +182,7 @@ protected void clearAlternate() {
     @Override
     protected void migrateFront() {
         int location = 0;
-        while (migrateOneLocation(location++));
+        while (migrateOneLocation(location++) && location < alternateTableSize);
     }
 
     @Override
@@ -193,7 +196,7 @@ protected void rehashInternalFull(final int oldSize) {
         mainOutputPosition.setArray(destState);
         for (int sourceBucket = 0; sourceBucket < oldSize; ++sourceBucket) {
             final int currentStateValue = originalStateArray[sourceBucket];
-            if (currentStateValue == EMPTY_OUTPUT_POSITION) {
+            if (isStateEmpty(currentStateValue)) {
                 continue;
             }
             final byte k0 = originalKeyArray0[sourceBucket];
@@ -201,7 +204,7 @@ protected void rehashInternalFull(final int oldSize) {
             final int firstDestinationTableLocation = hashToTableLocation(hash);
             int destinationTableLocation = firstDestinationTableLocation;
             while (true) {
-                if (destState[destinationTableLocation] == EMPTY_OUTPUT_POSITION) {
+                if (isStateEmpty(destState[destinationTableLocation])) {
                     destKeyArray0[destinationTableLocation] = k0;
                     destState[destinationTableLocation] = originalStateArray[sourceBucket];
                     outputPositionToHashSlot.set(currentStateValue, mainInsertMask | destinationTableLocation);
@@ -221,7 +224,7 @@ public int findPositionForKey(Object key) {
         final int firstTableLocation = tableLocation;
         while (true) {
             final int positionValue = mainOutputPosition.getUnsafe(tableLocation);
-            if (positionValue == EMPTY_OUTPUT_POSITION) {
+            if (isStateEmpty(positionValue)) {
                 int alternateTableLocation = hashToTableLocationAlternate(hash);
                 if (alternateTableLocation >= rehashPointer) {
                     return UNKNOWN_ROW;
@@ -229,7 +232,7 @@ public int findPositionForKey(Object key) {
                 final int firstAlternateTableLocation = alternateTableLocation;
                 while (true) {
                     final int alternatePositionValue = alternateOutputPosition.getUnsafe(alternateTableLocation);
-                    if (alternatePositionValue == EMPTY_OUTPUT_POSITION) {
+                    if (isStateEmpty(alternatePositionValue)) {
                         return UNKNOWN_ROW;
                     }
                     if (eq(alternateKeySource0.getUnsafe(alternateTableLocation), k0)) {
diff --git a/engine/table/src/main/java/io/deephaven/engine/table/impl/by/typed/incopenagg/gen/IncrementalAggOpenHasherByteByte.java b/engine/table/src/main/java/io/deephaven/engine/table/impl/by/typed/incopenagg/gen/IncrementalAggOpenHasherByteByte.java
index 30f1b54a78c..bf798d37d94 100644
--- a/engine/table/src/main/java/io/deephaven/engine/table/impl/by/typed/incopenagg/gen/IncrementalAggOpenHasherByteByte.java
+++ b/engine/table/src/main/java/io/deephaven/engine/table/impl/by/typed/incopenagg/gen/IncrementalAggOpenHasherByteByte.java
@@ -63,12 +63,12 @@ protected void build(RowSequence rowSequence, Chunk[] sourceKeyChunks) {
             int tableLocation = firstTableLocation;
             MAIN_SEARCH: while (true) {
                 int outputPosition = mainOutputPosition.getUnsafe(tableLocation);
-                if (outputPosition == EMPTY_OUTPUT_POSITION) {
+                if (isStateEmpty(outputPosition)) {
                     final int firstAlternateTableLocation = hashToTableLocationAlternate(hash);
                     int alternateTableLocation = firstAlternateTableLocation;
                     while (alternateTableLocation < rehashPointer) {
                         outputPosition = alternateOutputPosition.getUnsafe(alternateTableLocation);
-                        if (outputPosition == EMPTY_OUTPUT_POSITION) {
+                        if (isStateEmpty(outputPosition)) {
                             break;
                         } else if (eq(alternateKeySource0.getUnsafe(alternateTableLocation), k0) && eq(alternateKeySource1.getUnsafe(alternateTableLocation), k1)) {
                             outputPositions.set(chunkPosition, outputPosition);
@@ -109,7 +109,7 @@ protected void probe(RowSequence rowSequence, Chunk[] sourceKeyChunks) {
             boolean found = false;
             int tableLocation = firstTableLocation;
             int outputPosition;
-            while ((outputPosition = mainOutputPosition.getUnsafe(tableLocation)) != EMPTY_OUTPUT_POSITION) {
+            while (!isStateEmpty(outputPosition = mainOutputPosition.getUnsafe(tableLocation))) {
                 if (eq(mainKeySource0.getUnsafe(tableLocation), k0) && eq(mainKeySource1.getUnsafe(tableLocation), k1)) {
                     outputPositions.set(chunkPosition, outputPosition);
                     found = true;
@@ -123,7 +123,7 @@ protected void probe(RowSequence rowSequence, Chunk[] sourceKeyChunks) {
                 boolean alternateFound = false;
                 if (firstAlternateTableLocation < rehashPointer) {
                     int alternateTableLocation = firstAlternateTableLocation;
-                    while ((outputPosition = alternateOutputPosition.getUnsafe(alternateTableLocation)) != EMPTY_OUTPUT_POSITION) {
+                    while (!isStateEmpty(outputPosition = alternateOutputPosition.getUnsafe(alternateTableLocation))) {
                         if (eq(alternateKeySource0.getUnsafe(alternateTableLocation), k0) && eq(alternateKeySource1.getUnsafe(alternateTableLocation), k1)) {
                             outputPositions.set(chunkPosition, outputPosition);
                             alternateFound = true;
@@ -146,16 +146,20 @@ private static int hash(byte k0, byte k1) {
         return hash;
     }
 
+    private static boolean isStateEmpty(int state) {
+        return state == EMPTY_OUTPUT_POSITION;
+    }
+
     private boolean migrateOneLocation(int locationToMigrate) {
         final int currentStateValue = alternateOutputPosition.getUnsafe(locationToMigrate);
-        if (currentStateValue == EMPTY_OUTPUT_POSITION) {
+        if (isStateEmpty(currentStateValue)) {
             return false;
         }
         final byte k0 = alternateKeySource0.getUnsafe(locationToMigrate);
         final byte k1 = alternateKeySource1.getUnsafe(locationToMigrate);
         final int hash = hash(k0, k1);
         int destinationTableLocation = hashToTableLocation(hash);
-        while (mainOutputPosition.getUnsafe(destinationTableLocation) != EMPTY_OUTPUT_POSITION) {
+        while (!isStateEmpty(mainOutputPosition.getUnsafe(destinationTableLocation))) {
             destinationTableLocation = nextTableLocation(destinationTableLocation);
         }
         mainKeySource0.set(destinationTableLocation, k0);
@@ -178,8 +182,7 @@ protected int rehashInternalPartial(int entriesToRehash) {
     }
 
     @Override
-    protected void newAlternate() {
-        super.newAlternate();
+    protected void adviseNewAlternate() {
         this.mainKeySource0 = (ImmutableByteArraySource)super.mainKeySources[0];
         this.alternateKeySource0 = (ImmutableByteArraySource)super.alternateKeySources[0];
         this.mainKeySource1 = (ImmutableByteArraySource)super.mainKeySources[1];
@@ -196,7 +199,7 @@ protected void clearAlternate() {
     @Override
     protected void migrateFront() {
         int location = 0;
-        while (migrateOneLocation(location++));
+        while (migrateOneLocation(location++) && location < alternateTableSize);
     }
 
     @Override
@@ -213,7 +216,7 @@ protected void rehashInternalFull(final int oldSize) {
         mainOutputPosition.setArray(destState);
         for (int sourceBucket = 0; sourceBucket < oldSize; ++sourceBucket) {
             final int currentStateValue = originalStateArray[sourceBucket];
-            if (currentStateValue == EMPTY_OUTPUT_POSITION) {
+            if (isStateEmpty(currentStateValue)) {
                 continue;
             }
             final byte k0 = originalKeyArray0[sourceBucket];
@@ -222,7 +225,7 @@ protected void rehashInternalFull(final int oldSize) {
             final int firstDestinationTableLocation = hashToTableLocation(hash);
             int destinationTableLocation = firstDestinationTableLocation;
             while (true) {
-                if (destState[destinationTableLocation] == EMPTY_OUTPUT_POSITION) {
+                if (isStateEmpty(destState[destinationTableLocation])) {
                     destKeyArray0[destinationTableLocation] = k0;
                     destKeyArray1[destinationTableLocation] = k1;
                     destState[destinationTableLocation] = originalStateArray[sourceBucket];
@@ -245,7 +248,7 @@ public int findPositionForKey(Object key) {
         final int firstTableLocation = tableLocation;
         while (true) {
             final int positionValue = mainOutputPosition.getUnsafe(tableLocation);
-            if (positionValue == EMPTY_OUTPUT_POSITION) {
+            if (isStateEmpty(positionValue)) {
                 int alternateTableLocation = hashToTableLocationAlternate(hash);
                 if (alternateTableLocation >= rehashPointer) {
                     return UNKNOWN_ROW;
@@ -253,7 +256,7 @@ public int findPositionForKey(Object key) {
                 final int firstAlternateTableLocation = alternateTableLocation;
                 while (true) {
                     final int alternatePositionValue = alternateOutputPosition.getUnsafe(alternateTableLocation);
-                    if (alternatePositionValue == EMPTY_OUTPUT_POSITION) {
+                    if (isStateEmpty(alternatePositionValue)) {
                         return UNKNOWN_ROW;
                     }
                     if (eq(alternateKeySource0.getUnsafe(alternateTableLocation), k0) && eq(alternateKeySource1.getUnsafe(alternateTableLocation), k1)) {
diff --git a/engine/table/src/main/java/io/deephaven/engine/table/impl/by/typed/incopenagg/gen/IncrementalAggOpenHasherByteChar.java b/engine/table/src/main/java/io/deephaven/engine/table/impl/by/typed/incopenagg/gen/IncrementalAggOpenHasherByteChar.java
index d140b8f95a1..a7142fc9fb1 100644
--- a/engine/table/src/main/java/io/deephaven/engine/table/impl/by/typed/incopenagg/gen/IncrementalAggOpenHasherByteChar.java
+++ b/engine/table/src/main/java/io/deephaven/engine/table/impl/by/typed/incopenagg/gen/IncrementalAggOpenHasherByteChar.java
@@ -68,12 +68,12 @@ protected void build(RowSequence rowSequence, Chunk[] sourceKeyChunks) {
             int tableLocation = firstTableLocation;
             MAIN_SEARCH: while (true) {
                 int outputPosition = mainOutputPosition.getUnsafe(tableLocation);
-                if (outputPosition == EMPTY_OUTPUT_POSITION) {
+                if (isStateEmpty(outputPosition)) {
                     final int firstAlternateTableLocation = hashToTableLocationAlternate(hash);
                     int alternateTableLocation = firstAlternateTableLocation;
                     while (alternateTableLocation < rehashPointer) {
                         outputPosition = alternateOutputPosition.getUnsafe(alternateTableLocation);
-                        if (outputPosition == EMPTY_OUTPUT_POSITION) {
+                        if (isStateEmpty(outputPosition)) {
                             break;
                         } else if (eq(alternateKeySource0.getUnsafe(alternateTableLocation), k0) && eq(alternateKeySource1.getUnsafe(alternateTableLocation), k1)) {
                             outputPositions.set(chunkPosition, outputPosition);
@@ -114,7 +114,7 @@ protected void probe(RowSequence rowSequence, Chunk[] sourceKeyChunks) {
             boolean found = false;
             int tableLocation = firstTableLocation;
             int outputPosition;
-            while ((outputPosition = mainOutputPosition.getUnsafe(tableLocation)) != EMPTY_OUTPUT_POSITION) {
+            while (!isStateEmpty(outputPosition = mainOutputPosition.getUnsafe(tableLocation))) {
                 if (eq(mainKeySource0.getUnsafe(tableLocation), k0) && eq(mainKeySource1.getUnsafe(tableLocation), k1)) {
                     outputPositions.set(chunkPosition, outputPosition);
                     found = true;
@@ -128,7 +128,7 @@ protected void probe(RowSequence rowSequence, Chunk[] sourceKeyChunks) {
                 boolean alternateFound = false;
                 if (firstAlternateTableLocation < rehashPointer) {
                     int alternateTableLocation = firstAlternateTableLocation;
-                    while ((outputPosition = alternateOutputPosition.getUnsafe(alternateTableLocation)) != EMPTY_OUTPUT_POSITION) {
+                    while (!isStateEmpty(outputPosition = alternateOutputPosition.getUnsafe(alternateTableLocation))) {
                         if (eq(alternateKeySource0.getUnsafe(alternateTableLocation), k0) && eq(alternateKeySource1.getUnsafe(alternateTableLocation), k1)) {
                             outputPositions.set(chunkPosition, outputPosition);
                             alternateFound = true;
@@ -151,16 +151,20 @@ private static int hash(byte k0, char k1) {
         return hash;
     }
 
+    private static boolean isStateEmpty(int state) {
+        return state == EMPTY_OUTPUT_POSITION;
+    }
+
     private boolean migrateOneLocation(int locationToMigrate) {
         final int currentStateValue = alternateOutputPosition.getUnsafe(locationToMigrate);
-        if (currentStateValue == EMPTY_OUTPUT_POSITION) {
+        if (isStateEmpty(currentStateValue)) {
             return false;
         }
         final byte k0 = alternateKeySource0.getUnsafe(locationToMigrate);
         final char k1 = alternateKeySource1.getUnsafe(locationToMigrate);
         final int hash = hash(k0, k1);
         int destinationTableLocation = hashToTableLocation(hash);
-        while (mainOutputPosition.getUnsafe(destinationTableLocation) != EMPTY_OUTPUT_POSITION) {
+        while (!isStateEmpty(mainOutputPosition.getUnsafe(destinationTableLocation))) {
             destinationTableLocation = nextTableLocation(destinationTableLocation);
         }
         mainKeySource0.set(destinationTableLocation, k0);
@@ -183,8 +187,7 @@ protected int rehashInternalPartial(int entriesToRehash) {
     }
 
     @Override
-    protected void newAlternate() {
-        super.newAlternate();
+    protected void adviseNewAlternate() {
         this.mainKeySource0 = (ImmutableByteArraySource)super.mainKeySources[0];
         this.alternateKeySource0 = (ImmutableByteArraySource)super.alternateKeySources[0];
         this.mainKeySource1 = (ImmutableCharArraySource)super.mainKeySources[1];
@@ -201,7 +204,7 @@ protected void clearAlternate() {
     @Override
     protected void migrateFront() {
         int location = 0;
-        while (migrateOneLocation(location++));
+        while (migrateOneLocation(location++) && location < alternateTableSize);
     }
 
     @Override
@@ -218,7 +221,7 @@ protected void rehashInternalFull(final int oldSize) {
         mainOutputPosition.setArray(destState);
         for (int sourceBucket = 0; sourceBucket < oldSize; ++sourceBucket) {
             final int currentStateValue = originalStateArray[sourceBucket];
-            if (currentStateValue == EMPTY_OUTPUT_POSITION) {
+            if (isStateEmpty(currentStateValue)) {
                 continue;
             }
             final byte k0 = originalKeyArray0[sourceBucket];
@@ -227,7 +230,7 @@ protected void rehashInternalFull(final int oldSize) {
             final int firstDestinationTableLocation = hashToTableLocation(hash);
             int destinationTableLocation = firstDestinationTableLocation;
             while (true) {
-                if (destState[destinationTableLocation] == EMPTY_OUTPUT_POSITION) {
+                if (isStateEmpty(destState[destinationTableLocation])) {
                     destKeyArray0[destinationTableLocation] = k0;
                     destKeyArray1[destinationTableLocation] = k1;
                     destState[destinationTableLocation] = originalStateArray[sourceBucket];
@@ -250,7 +253,7 @@ public int findPositionForKey(Object key) {
         final int firstTableLocation = tableLocation;
         while (true) {
             final int positionValue = mainOutputPosition.getUnsafe(tableLocation);
-            if (positionValue == EMPTY_OUTPUT_POSITION) {
+            if (isStateEmpty(positionValue)) {
                 int alternateTableLocation = hashToTableLocationAlternate(hash);
                 if (alternateTableLocation >= rehashPointer) {
                     return UNKNOWN_ROW;
@@ -258,7 +261,7 @@ public int findPositionForKey(Object key) {
                 final int firstAlternateTableLocation = alternateTableLocation;
                 while (true) {
                     final int alternatePositionValue = alternateOutputPosition.getUnsafe(alternateTableLocation);
-                    if (alternatePositionValue == EMPTY_OUTPUT_POSITION) {
+                    if (isStateEmpty(alternatePositionValue)) {
                         return UNKNOWN_ROW;
                     }
                     if (eq(alternateKeySource0.getUnsafe(alternateTableLocation), k0) && eq(alternateKeySource1.getUnsafe(alternateTableLocation), k1)) {
diff --git a/engine/table/src/main/java/io/deephaven/engine/table/impl/by/typed/incopenagg/gen/IncrementalAggOpenHasherByteDouble.java b/engine/table/src/main/java/io/deephaven/engine/table/impl/by/typed/incopenagg/gen/IncrementalAggOpenHasherByteDouble.java
index b6124a280d8..6d083bc9085 100644
--- a/engine/table/src/main/java/io/deephaven/engine/table/impl/by/typed/incopenagg/gen/IncrementalAggOpenHasherByteDouble.java
+++ b/engine/table/src/main/java/io/deephaven/engine/table/impl/by/typed/incopenagg/gen/IncrementalAggOpenHasherByteDouble.java
@@ -68,12 +68,12 @@ protected void build(RowSequence rowSequence, Chunk[] sourceKeyChunks) {
             int tableLocation = firstTableLocation;
             MAIN_SEARCH: while (true) {
                 int outputPosition = mainOutputPosition.getUnsafe(tableLocation);
-                if (outputPosition == EMPTY_OUTPUT_POSITION) {
+                if (isStateEmpty(outputPosition)) {
                     final int firstAlternateTableLocation = hashToTableLocationAlternate(hash);
                     int alternateTableLocation = firstAlternateTableLocation;
                     while (alternateTableLocation < rehashPointer) {
                         outputPosition = alternateOutputPosition.getUnsafe(alternateTableLocation);
-                        if (outputPosition == EMPTY_OUTPUT_POSITION) {
+                        if (isStateEmpty(outputPosition)) {
                             break;
                         } else if (eq(alternateKeySource0.getUnsafe(alternateTableLocation), k0) && eq(alternateKeySource1.getUnsafe(alternateTableLocation), k1)) {
                             outputPositions.set(chunkPosition, outputPosition);
@@ -114,7 +114,7 @@ protected void probe(RowSequence rowSequence, Chunk[] sourceKeyChunks) {
             boolean found = false;
             int tableLocation = firstTableLocation;
             int outputPosition;
-            while ((outputPosition = mainOutputPosition.getUnsafe(tableLocation)) != EMPTY_OUTPUT_POSITION) {
+            while (!isStateEmpty(outputPosition = mainOutputPosition.getUnsafe(tableLocation))) {
                 if (eq(mainKeySource0.getUnsafe(tableLocation), k0) && eq(mainKeySource1.getUnsafe(tableLocation), k1)) {
                     outputPositions.set(chunkPosition, outputPosition);
                     found = true;
@@ -128,7 +128,7 @@ protected void probe(RowSequence rowSequence, Chunk[] sourceKeyChunks) {
                 boolean alternateFound = false;
                 if (firstAlternateTableLocation < rehashPointer) {
                     int alternateTableLocation = firstAlternateTableLocation;
-                    while ((outputPosition = alternateOutputPosition.getUnsafe(alternateTableLocation)) != EMPTY_OUTPUT_POSITION) {
+                    while (!isStateEmpty(outputPosition = alternateOutputPosition.getUnsafe(alternateTableLocation))) {
                         if (eq(alternateKeySource0.getUnsafe(alternateTableLocation), k0) && eq(alternateKeySource1.getUnsafe(alternateTableLocation), k1)) {
                             outputPositions.set(chunkPosition, outputPosition);
                             alternateFound = true;
@@ -151,16 +151,20 @@ private static int hash(byte k0, double k1) {
         return hash;
     }
 
+    private static boolean isStateEmpty(int state) {
+        return state == EMPTY_OUTPUT_POSITION;
+    }
+
     private boolean migrateOneLocation(int locationToMigrate) {
         final int currentStateValue = alternateOutputPosition.getUnsafe(locationToMigrate);
-        if (currentStateValue == EMPTY_OUTPUT_POSITION) {
+        if (isStateEmpty(currentStateValue)) {
             return false;
         }
         final byte k0 = alternateKeySource0.getUnsafe(locationToMigrate);
         final double k1 = alternateKeySource1.getUnsafe(locationToMigrate);
         final int hash = hash(k0, k1);
         int destinationTableLocation = hashToTableLocation(hash);
-        while (mainOutputPosition.getUnsafe(destinationTableLocation) != EMPTY_OUTPUT_POSITION) {
+        while (!isStateEmpty(mainOutputPosition.getUnsafe(destinationTableLocation))) {
             destinationTableLocation = nextTableLocation(destinationTableLocation);
         }
         mainKeySource0.set(destinationTableLocation, k0);
@@ -183,8 +187,7 @@ protected int rehashInternalPartial(int entriesToRehash) {
     }
 
     @Override
-    protected void newAlternate() {
-        super.newAlternate();
+    protected void adviseNewAlternate() {
         this.mainKeySource0 = (ImmutableByteArraySource)super.mainKeySources[0];
         this.alternateKeySource0 = (ImmutableByteArraySource)super.alternateKeySources[0];
         this.mainKeySource1 = (ImmutableDoubleArraySource)super.mainKeySources[1];
@@ -201,7 +204,7 @@ protected void clearAlternate() {
     @Override
     protected void migrateFront() {
         int location = 0;
-        while (migrateOneLocation(location++));
+        while (migrateOneLocation(location++) && location < alternateTableSize);
     }
 
     @Override
@@ -218,7 +221,7 @@ protected void rehashInternalFull(final int oldSize) {
         mainOutputPosition.setArray(destState);
         for (int sourceBucket = 0; sourceBucket < oldSize; ++sourceBucket) {
             final int currentStateValue = originalStateArray[sourceBucket];
-            if (currentStateValue == EMPTY_OUTPUT_POSITION) {
+            if (isStateEmpty(currentStateValue)) {
                 continue;
             }
             final byte k0 = originalKeyArray0[sourceBucket];
@@ -227,7 +230,7 @@ protected void rehashInternalFull(final int oldSize) {
             final int firstDestinationTableLocation = hashToTableLocation(hash);
             int destinationTableLocation = firstDestinationTableLocation;
             while (true) {
-                if (destState[destinationTableLocation] == EMPTY_OUTPUT_POSITION) {
+                if (isStateEmpty(destState[destinationTableLocation])) {
                     destKeyArray0[destinationTableLocation] = k0;
                     destKeyArray1[destinationTableLocation] = k1;
                     destState[destinationTableLocation] = originalStateArray[sourceBucket];
@@ -250,7 +253,7 @@ public int findPositionForKey(Object key) {
         final int firstTableLocation = tableLocation;
         while (true) {
             final int positionValue = mainOutputPosition.getUnsafe(tableLocation);
-            if (positionValue == EMPTY_OUTPUT_POSITION) {
+            if (isStateEmpty(positionValue)) {
                 int alternateTableLocation = hashToTableLocationAlternate(hash);
                 if (alternateTableLocation >= rehashPointer) {
                     return UNKNOWN_ROW;
@@ -258,7 +261,7 @@ public int findPositionForKey(Object key) {
                 final int firstAlternateTableLocation = alternateTableLocation;
                 while (true) {
                     final int alternatePositionValue = alternateOutputPosition.getUnsafe(alternateTableLocation);
-                    if (alternatePositionValue == EMPTY_OUTPUT_POSITION) {
+                    if (isStateEmpty(alternatePositionValue)) {
                         return UNKNOWN_ROW;
                     }
                     if (eq(alternateKeySource0.getUnsafe(alternateTableLocation), k0) && eq(alternateKeySource1.getUnsafe(alternateTableLocation), k1)) {
diff --git a/engine/table/src/main/java/io/deephaven/engine/table/impl/by/typed/incopenagg/gen/IncrementalAggOpenHasherByteFloat.java b/engine/table/src/main/java/io/deephaven/engine/table/impl/by/typed/incopenagg/gen/IncrementalAggOpenHasherByteFloat.java
index 7cdfe32a962..8d1e1315ce7 100644
--- a/engine/table/src/main/java/io/deephaven/engine/table/impl/by/typed/incopenagg/gen/IncrementalAggOpenHasherByteFloat.java
+++ b/engine/table/src/main/java/io/deephaven/engine/table/impl/by/typed/incopenagg/gen/IncrementalAggOpenHasherByteFloat.java
@@ -68,12 +68,12 @@ protected void build(RowSequence rowSequence, Chunk[] sourceKeyChunks) {
             int tableLocation = firstTableLocation;
             MAIN_SEARCH: while (true) {
                 int outputPosition = mainOutputPosition.getUnsafe(tableLocation);
-                if (outputPosition == EMPTY_OUTPUT_POSITION) {
+                if (isStateEmpty(outputPosition)) {
                     final int firstAlternateTableLocation = hashToTableLocationAlternate(hash);
                     int alternateTableLocation = firstAlternateTableLocation;
                     while (alternateTableLocation < rehashPointer) {
                         outputPosition = alternateOutputPosition.getUnsafe(alternateTableLocation);
-                        if (outputPosition == EMPTY_OUTPUT_POSITION) {
+                        if (isStateEmpty(outputPosition)) {
                             break;
                         } else if (eq(alternateKeySource0.getUnsafe(alternateTableLocation), k0) && eq(alternateKeySource1.getUnsafe(alternateTableLocation), k1)) {
                             outputPositions.set(chunkPosition, outputPosition);
@@ -114,7 +114,7 @@ protected void probe(RowSequence rowSequence, Chunk[] sourceKeyChunks) {
             boolean found = false;
             int tableLocation = firstTableLocation;
             int outputPosition;
-            while ((outputPosition = mainOutputPosition.getUnsafe(tableLocation)) != EMPTY_OUTPUT_POSITION) {
+            while (!isStateEmpty(outputPosition = mainOutputPosition.getUnsafe(tableLocation))) {
                 if (eq(mainKeySource0.getUnsafe(tableLocation), k0) && eq(mainKeySource1.getUnsafe(tableLocation), k1)) {
                     outputPositions.set(chunkPosition, outputPosition);
                     found = true;
@@ -128,7 +128,7 @@ protected void probe(RowSequence rowSequence, Chunk[] sourceKeyChunks) {
                 boolean alternateFound = false;
                 if (firstAlternateTableLocation < rehashPointer) {
                     int alternateTableLocation = firstAlternateTableLocation;
-                    while ((outputPosition = alternateOutputPosition.getUnsafe(alternateTableLocation)) != EMPTY_OUTPUT_POSITION) {
+                    while (!isStateEmpty(outputPosition = alternateOutputPosition.getUnsafe(alternateTableLocation))) {
                         if (eq(alternateKeySource0.getUnsafe(alternateTableLocation), k0) && eq(alternateKeySource1.getUnsafe(alternateTableLocation), k1)) {
                             outputPositions.set(chunkPosition, outputPosition);
                             alternateFound = true;
@@ -151,16 +151,20 @@ private static int hash(byte k0, float k1) {
         return hash;
     }
 
+    private static boolean isStateEmpty(int state) {
+        return state == EMPTY_OUTPUT_POSITION;
+    }
+
     private boolean migrateOneLocation(int locationToMigrate) {
         final int currentStateValue = alternateOutputPosition.getUnsafe(locationToMigrate);
-        if (currentStateValue == EMPTY_OUTPUT_POSITION) {
+        if (isStateEmpty(currentStateValue)) {
             return false;
         }
         final byte k0 = alternateKeySource0.getUnsafe(locationToMigrate);
         final float k1 = alternateKeySource1.getUnsafe(locationToMigrate);
         final int hash = hash(k0, k1);
         int destinationTableLocation = hashToTableLocation(hash);
-        while (mainOutputPosition.getUnsafe(destinationTableLocation) != EMPTY_OUTPUT_POSITION) {
+        while (!isStateEmpty(mainOutputPosition.getUnsafe(destinationTableLocation))) {
             destinationTableLocation = nextTableLocation(destinationTableLocation);
         }
         mainKeySource0.set(destinationTableLocation, k0);
@@ -183,8 +187,7 @@ protected int rehashInternalPartial(int entriesToRehash) {
     }
 
     @Override
-    protected void newAlternate() {
-        super.newAlternate();
+    protected void adviseNewAlternate() {
         this.mainKeySource0 = (ImmutableByteArraySource)super.mainKeySources[0];
         this.alternateKeySource0 = (ImmutableByteArraySource)super.alternateKeySources[0];
         this.mainKeySource1 = (ImmutableFloatArraySource)super.mainKeySources[1];
@@ -201,7 +204,7 @@ protected void clearAlternate() {
     @Override
     protected void migrateFront() {
         int location = 0;
-        while (migrateOneLocation(location++));
+        while (migrateOneLocation(location++) && location < alternateTableSize);
     }
 
     @Override
@@ -218,7 +221,7 @@ protected void rehashInternalFull(final int oldSize) {
         mainOutputPosition.setArray(destState);
         for (int sourceBucket = 0; sourceBucket < oldSize; ++sourceBucket) {
             final int currentStateValue = originalStateArray[sourceBucket];
-            if (currentStateValue == EMPTY_OUTPUT_POSITION) {
+            if (isStateEmpty(currentStateValue)) {
                 continue;
             }
             final byte k0 = originalKeyArray0[sourceBucket];
@@ -227,7 +230,7 @@ protected void rehashInternalFull(final int oldSize) {
             final int firstDestinationTableLocation = hashToTableLocation(hash);
             int destinationTableLocation = firstDestinationTableLocation;
             while (true) {
-                if (destState[destinationTableLocation] == EMPTY_OUTPUT_POSITION) {
+                if (isStateEmpty(destState[destinationTableLocation])) {
                     destKeyArray0[destinationTableLocation] = k0;
                     destKeyArray1[destinationTableLocation] = k1;
                     destState[destinationTableLocation] = originalStateArray[sourceBucket];
@@ -250,7 +253,7 @@ public int findPositionForKey(Object key) {
         final int firstTableLocation = tableLocation;
         while (true) {
             final int positionValue = mainOutputPosition.getUnsafe(tableLocation);
-            if (positionValue == EMPTY_OUTPUT_POSITION) {
+            if (isStateEmpty(positionValue)) {
                 int alternateTableLocation = hashToTableLocationAlternate(hash);
                 if (alternateTableLocation >= rehashPointer) {
                     return UNKNOWN_ROW;
@@ -258,7 +261,7 @@ public int findPositionForKey(Object key) {
                 final int firstAlternateTableLocation = alternateTableLocation;
                 while (true) {
                     final int alternatePositionValue = alternateOutputPosition.getUnsafe(alternateTableLocation);
-                    if (alternatePositionValue == EMPTY_OUTPUT_POSITION) {
+                    if (isStateEmpty(alternatePositionValue)) {
                         return UNKNOWN_ROW;
                     }
                     if (eq(alternateKeySource0.getUnsafe(alternateTableLocation), k0) && eq(alternateKeySource1.getUnsafe(alternateTableLocation), k1)) {
diff --git a/engine/table/src/main/java/io/deephaven/engine/table/impl/by/typed/incopenagg/gen/IncrementalAggOpenHasherByteInt.java b/engine/table/src/main/java/io/deephaven/engine/table/impl/by/typed/incopenagg/gen/IncrementalAggOpenHasherByteInt.java
index 98d48e71b64..29da27b31a9 100644
--- a/engine/table/src/main/java/io/deephaven/engine/table/impl/by/typed/incopenagg/gen/IncrementalAggOpenHasherByteInt.java
+++ b/engine/table/src/main/java/io/deephaven/engine/table/impl/by/typed/incopenagg/gen/IncrementalAggOpenHasherByteInt.java
@@ -68,12 +68,12 @@ protected void build(RowSequence rowSequence, Chunk[] sourceKeyChunks) {
             int tableLocation = firstTableLocation;
             MAIN_SEARCH: while (true) {
                 int outputPosition = mainOutputPosition.getUnsafe(tableLocation);
-                if (outputPosition == EMPTY_OUTPUT_POSITION) {
+                if (isStateEmpty(outputPosition)) {
                     final int firstAlternateTableLocation = hashToTableLocationAlternate(hash);
                     int alternateTableLocation = firstAlternateTableLocation;
                     while (alternateTableLocation < rehashPointer) {
                         outputPosition = alternateOutputPosition.getUnsafe(alternateTableLocation);
-                        if (outputPosition == EMPTY_OUTPUT_POSITION) {
+                        if (isStateEmpty(outputPosition)) {
                             break;
                         } else if (eq(alternateKeySource0.getUnsafe(alternateTableLocation), k0) && eq(alternateKeySource1.getUnsafe(alternateTableLocation), k1)) {
                             outputPositions.set(chunkPosition, outputPosition);
@@ -114,7 +114,7 @@ protected void probe(RowSequence rowSequence, Chunk[] sourceKeyChunks) {
             boolean found = false;
             int tableLocation = firstTableLocation;
             int outputPosition;
-            while ((outputPosition = mainOutputPosition.getUnsafe(tableLocation)) != EMPTY_OUTPUT_POSITION) {
+            while (!isStateEmpty(outputPosition = mainOutputPosition.getUnsafe(tableLocation))) {
                 if (eq(mainKeySource0.getUnsafe(tableLocation), k0) && eq(mainKeySource1.getUnsafe(tableLocation), k1)) {
                     outputPositions.set(chunkPosition, outputPosition);
                     found = true;
@@ -128,7 +128,7 @@ protected void probe(RowSequence rowSequence, Chunk[] sourceKeyChunks) {
                 boolean alternateFound = false;
                 if (firstAlternateTableLocation < rehashPointer) {
                     int alternateTableLocation = firstAlternateTableLocation;
-                    while ((outputPosition = alternateOutputPosition.getUnsafe(alternateTableLocation)) != EMPTY_OUTPUT_POSITION) {
+                    while (!isStateEmpty(outputPosition = alternateOutputPosition.getUnsafe(alternateTableLocation))) {
                         if (eq(alternateKeySource0.getUnsafe(alternateTableLocation), k0) && eq(alternateKeySource1.getUnsafe(alternateTableLocation), k1)) {
                             outputPositions.set(chunkPosition, outputPosition);
                             alternateFound = true;
@@ -151,16 +151,20 @@ private static int hash(byte k0, int k1) {
         return hash;
     }
 
+    private static boolean isStateEmpty(int state) {
+        return state == EMPTY_OUTPUT_POSITION;
+    }
+
     private boolean migrateOneLocation(int locationToMigrate) {
         final int currentStateValue = alternateOutputPosition.getUnsafe(locationToMigrate);
-        if (currentStateValue == EMPTY_OUTPUT_POSITION) {
+        if (isStateEmpty(currentStateValue)) {
             return false;
         }
         final byte k0 = alternateKeySource0.getUnsafe(locationToMigrate);
         final int k1 = alternateKeySource1.getUnsafe(locationToMigrate);
         final int hash = hash(k0, k1);
         int destinationTableLocation = hashToTableLocation(hash);
-        while (mainOutputPosition.getUnsafe(destinationTableLocation) != EMPTY_OUTPUT_POSITION) {
+        while (!isStateEmpty(mainOutputPosition.getUnsafe(destinationTableLocation))) {
             destinationTableLocation = nextTableLocation(destinationTableLocation);
         }
         mainKeySource0.set(destinationTableLocation, k0);
@@ -183,8 +187,7 @@ protected int rehashInternalPartial(int entriesToRehash) {
     }
 
     @Override
-    protected void newAlternate() {
-        super.newAlternate();
+    protected void adviseNewAlternate() {
         this.mainKeySource0 = (ImmutableByteArraySource)super.mainKeySources[0];
         this.alternateKeySource0 = (ImmutableByteArraySource)super.alternateKeySources[0];
         this.mainKeySource1 = (ImmutableIntArraySource)super.mainKeySources[1];
@@ -201,7 +204,7 @@ protected void clearAlternate() {
     @Override
     protected void migrateFront() {
         int location = 0;
-        while (migrateOneLocation(location++));
+        while (migrateOneLocation(location++) && location < alternateTableSize);
     }
 
     @Override
@@ -218,7 +221,7 @@ protected void rehashInternalFull(final int oldSize) {
         mainOutputPosition.setArray(destState);
         for (int sourceBucket = 0; sourceBucket < oldSize; ++sourceBucket) {
             final int currentStateValue = originalStateArray[sourceBucket];
-            if (currentStateValue == EMPTY_OUTPUT_POSITION) {
+            if (isStateEmpty(currentStateValue)) {
                 continue;
             }
             final byte k0 = originalKeyArray0[sourceBucket];
@@ -227,7 +230,7 @@ protected void rehashInternalFull(final int oldSize) {
             final int firstDestinationTableLocation = hashToTableLocation(hash);
             int destinationTableLocation = firstDestinationTableLocation;
             while (true) {
-                if (destState[destinationTableLocation] == EMPTY_OUTPUT_POSITION) {
+                if (isStateEmpty(destState[destinationTableLocation])) {
                     destKeyArray0[destinationTableLocation] = k0;
                     destKeyArray1[destinationTableLocation] = k1;
                     destState[destinationTableLocation] = originalStateArray[sourceBucket];
@@ -250,7 +253,7 @@ public int findPositionForKey(Object key) {
         final int firstTableLocation = tableLocation;
         while (true) {
             final int positionValue = mainOutputPosition.getUnsafe(tableLocation);
-            if (positionValue == EMPTY_OUTPUT_POSITION) {
+            if (isStateEmpty(positionValue)) {
                 int alternateTableLocation = hashToTableLocationAlternate(hash);
                 if (alternateTableLocation >= rehashPointer) {
                     return UNKNOWN_ROW;
@@ -258,7 +261,7 @@ public int findPositionForKey(Object key) {
                 final int firstAlternateTableLocation = alternateTableLocation;
                 while (true) {
                     final int alternatePositionValue = alternateOutputPosition.getUnsafe(alternateTableLocation);
-                    if (alternatePositionValue == EMPTY_OUTPUT_POSITION) {
+                    if (isStateEmpty(alternatePositionValue)) {
                         return UNKNOWN_ROW;
                     }
                     if (eq(alternateKeySource0.getUnsafe(alternateTableLocation), k0) && eq(alternateKeySource1.getUnsafe(alternateTableLocation), k1)) {
diff --git a/engine/table/src/main/java/io/deephaven/engine/table/impl/by/typed/incopenagg/gen/IncrementalAggOpenHasherByteLong.java b/engine/table/src/main/java/io/deephaven/engine/table/impl/by/typed/incopenagg/gen/IncrementalAggOpenHasherByteLong.java
index aabe8933dbb..e2237465ea1 100644
--- a/engine/table/src/main/java/io/deephaven/engine/table/impl/by/typed/incopenagg/gen/IncrementalAggOpenHasherByteLong.java
+++ b/engine/table/src/main/java/io/deephaven/engine/table/impl/by/typed/incopenagg/gen/IncrementalAggOpenHasherByteLong.java
@@ -68,12 +68,12 @@ protected void build(RowSequence rowSequence, Chunk[] sourceKeyChunks) {
             int tableLocation = firstTableLocation;
             MAIN_SEARCH: while (true) {
                 int outputPosition = mainOutputPosition.getUnsafe(tableLocation);
-                if (outputPosition == EMPTY_OUTPUT_POSITION) {
+                if (isStateEmpty(outputPosition)) {
                     final int firstAlternateTableLocation = hashToTableLocationAlternate(hash);
                     int alternateTableLocation = firstAlternateTableLocation;
                     while (alternateTableLocation < rehashPointer) {
                         outputPosition = alternateOutputPosition.getUnsafe(alternateTableLocation);
-                        if (outputPosition == EMPTY_OUTPUT_POSITION) {
+                        if (isStateEmpty(outputPosition)) {
                             break;
                         } else if (eq(alternateKeySource0.getUnsafe(alternateTableLocation), k0) && eq(alternateKeySource1.getUnsafe(alternateTableLocation), k1)) {
                             outputPositions.set(chunkPosition, outputPosition);
@@ -114,7 +114,7 @@ protected void probe(RowSequence rowSequence, Chunk[] sourceKeyChunks) {
             boolean found = false;
             int tableLocation = firstTableLocation;
             int outputPosition;
-            while ((outputPosition = mainOutputPosition.getUnsafe(tableLocation)) != EMPTY_OUTPUT_POSITION) {
+            while (!isStateEmpty(outputPosition = mainOutputPosition.getUnsafe(tableLocation))) {
                 if (eq(mainKeySource0.getUnsafe(tableLocation), k0) && eq(mainKeySource1.getUnsafe(tableLocation), k1)) {
                     outputPositions.set(chunkPosition, outputPosition);
                     found = true;
@@ -128,7 +128,7 @@ protected void probe(RowSequence rowSequence, Chunk[] sourceKeyChunks) {
                 boolean alternateFound = false;
                 if (firstAlternateTableLocation < rehashPointer) {
                     int alternateTableLocation = firstAlternateTableLocation;
-                    while ((outputPosition = alternateOutputPosition.getUnsafe(alternateTableLocation)) != EMPTY_OUTPUT_POSITION) {
+                    while (!isStateEmpty(outputPosition = alternateOutputPosition.getUnsafe(alternateTableLocation))) {
                         if (eq(alternateKeySource0.getUnsafe(alternateTableLocation), k0) && eq(alternateKeySource1.getUnsafe(alternateTableLocation), k1)) {
                             outputPositions.set(chunkPosition, outputPosition);
                             alternateFound = true;
@@ -151,16 +151,20 @@ private static int hash(byte k0, long k1) {
         return hash;
     }
 
+    private static boolean isStateEmpty(int state) {
+        return state == EMPTY_OUTPUT_POSITION;
+    }
+
     private boolean migrateOneLocation(int locationToMigrate) {
         final int currentStateValue = alternateOutputPosition.getUnsafe(locationToMigrate);
-        if (currentStateValue == EMPTY_OUTPUT_POSITION) {
+        if (isStateEmpty(currentStateValue)) {
             return false;
         }
         final byte k0 = alternateKeySource0.getUnsafe(locationToMigrate);
         final long k1 = alternateKeySource1.getUnsafe(locationToMigrate);
         final int hash = hash(k0, k1);
         int destinationTableLocation = hashToTableLocation(hash);
-        while (mainOutputPosition.getUnsafe(destinationTableLocation) != EMPTY_OUTPUT_POSITION) {
+        while (!isStateEmpty(mainOutputPosition.getUnsafe(destinationTableLocation))) {
             destinationTableLocation = nextTableLocation(destinationTableLocation);
         }
         mainKeySource0.set(destinationTableLocation, k0);
@@ -183,8 +187,7 @@ protected int rehashInternalPartial(int entriesToRehash) {
     }
 
     @Override
-    protected void newAlternate() {
-        super.newAlternate();
+    protected void adviseNewAlternate() {
         this.mainKeySource0 = (ImmutableByteArraySource)super.mainKeySources[0];
         this.alternateKeySource0 = (ImmutableByteArraySource)super.alternateKeySources[0];
         this.mainKeySource1 = (ImmutableLongArraySource)super.mainKeySources[1];
@@ -201,7 +204,7 @@ protected void clearAlternate() {
     @Override
     protected void migrateFront() {
         int location = 0;
-        while (migrateOneLocation(location++));
+        while (migrateOneLocation(location++) && location < alternateTableSize);
     }
 
     @Override
@@ -218,7 +221,7 @@ protected void rehashInternalFull(final int oldSize) {
         mainOutputPosition.setArray(destState);
         for (int sourceBucket = 0; sourceBucket < oldSize; ++sourceBucket) {
             final int currentStateValue = originalStateArray[sourceBucket];
-            if (currentStateValue == EMPTY_OUTPUT_POSITION) {
+            if (isStateEmpty(currentStateValue)) {
                 continue;
             }
             final byte k0 = originalKeyArray0[sourceBucket];
@@ -227,7 +230,7 @@ protected void rehashInternalFull(final int oldSize) {
             final int firstDestinationTableLocation = hashToTableLocation(hash);
             int destinationTableLocation = firstDestinationTableLocation;
             while (true) {
-                if (destState[destinationTableLocation] == EMPTY_OUTPUT_POSITION) {
+                if (isStateEmpty(destState[destinationTableLocation])) {
                     destKeyArray0[destinationTableLocation] = k0;
                     destKeyArray1[destinationTableLocation] = k1;
                     destState[destinationTableLocation] = originalStateArray[sourceBucket];
@@ -250,7 +253,7 @@ public int findPositionForKey(Object key) {
         final int firstTableLocation = tableLocation;
         while (true) {
             final int positionValue = mainOutputPosition.getUnsafe(tableLocation);
-            if (positionValue == EMPTY_OUTPUT_POSITION) {
+            if (isStateEmpty(positionValue)) {
                 int alternateTableLocation = hashToTableLocationAlternate(hash);
                 if (alternateTableLocation >= rehashPointer) {
                     return UNKNOWN_ROW;
@@ -258,7 +261,7 @@ public int findPositionForKey(Object key) {
                 final int firstAlternateTableLocation = alternateTableLocation;
                 while (true) {
                     final int alternatePositionValue = alternateOutputPosition.getUnsafe(alternateTableLocation);
-                    if (alternatePositionValue == EMPTY_OUTPUT_POSITION) {
+                    if (isStateEmpty(alternatePositionValue)) {
                         return UNKNOWN_ROW;
                     }
                     if (eq(alternateKeySource0.getUnsafe(alternateTableLocation), k0) && eq(alternateKeySource1.getUnsafe(alternateTableLocation), k1)) {
diff --git a/engine/table/src/main/java/io/deephaven/engine/table/impl/by/typed/incopenagg/gen/IncrementalAggOpenHasherByteObject.java b/engine/table/src/main/java/io/deephaven/engine/table/impl/by/typed/incopenagg/gen/IncrementalAggOpenHasherByteObject.java
index 0d34c75328e..b67a605c678 100644
--- a/engine/table/src/main/java/io/deephaven/engine/table/impl/by/typed/incopenagg/gen/IncrementalAggOpenHasherByteObject.java
+++ b/engine/table/src/main/java/io/deephaven/engine/table/impl/by/typed/incopenagg/gen/IncrementalAggOpenHasherByteObject.java
@@ -67,12 +67,12 @@ protected void build(RowSequence rowSequence, Chunk[] sourceKeyChunks) {
             int tableLocation = firstTableLocation;
             MAIN_SEARCH: while (true) {
                 int outputPosition = mainOutputPosition.getUnsafe(tableLocation);
-                if (outputPosition == EMPTY_OUTPUT_POSITION) {
+                if (isStateEmpty(outputPosition)) {
                     final int firstAlternateTableLocation = hashToTableLocationAlternate(hash);
                     int alternateTableLocation = firstAlternateTableLocation;
                     while (alternateTableLocation < rehashPointer) {
                         outputPosition = alternateOutputPosition.getUnsafe(alternateTableLocation);
-                        if (outputPosition == EMPTY_OUTPUT_POSITION) {
+                        if (isStateEmpty(outputPosition)) {
                             break;
                         } else if (eq(alternateKeySource0.getUnsafe(alternateTableLocation), k0) && eq(alternateKeySource1.getUnsafe(alternateTableLocation), k1)) {
                             outputPositions.set(chunkPosition, outputPosition);
@@ -113,7 +113,7 @@ protected void probe(RowSequence rowSequence, Chunk[] sourceKeyChunks) {
             boolean found = false;
             int tableLocation = firstTableLocation;
             int outputPosition;
-            while ((outputPosition = mainOutputPosition.getUnsafe(tableLocation)) != EMPTY_OUTPUT_POSITION) {
+            while (!isStateEmpty(outputPosition = mainOutputPosition.getUnsafe(tableLocation))) {
                 if (eq(mainKeySource0.getUnsafe(tableLocation), k0) && eq(mainKeySource1.getUnsafe(tableLocation), k1)) {
                     outputPositions.set(chunkPosition, outputPosition);
                     found = true;
@@ -127,7 +127,7 @@ protected void probe(RowSequence rowSequence, Chunk[] sourceKeyChunks) {
                 boolean alternateFound = false;
                 if (firstAlternateTableLocation < rehashPointer) {
                     int alternateTableLocation = firstAlternateTableLocation;
-                    while ((outputPosition = alternateOutputPosition.getUnsafe(alternateTableLocation)) != EMPTY_OUTPUT_POSITION) {
+                    while (!isStateEmpty(outputPosition = alternateOutputPosition.getUnsafe(alternateTableLocation))) {
                         if (eq(alternateKeySource0.getUnsafe(alternateTableLocation), k0) && eq(alternateKeySource1.getUnsafe(alternateTableLocation), k1)) {
                             outputPositions.set(chunkPosition, outputPosition);
                             alternateFound = true;
@@ -150,16 +150,20 @@ private static int hash(byte k0, Object k1) {
         return hash;
     }
 
+    private static boolean isStateEmpty(int state) {
+        return state == EMPTY_OUTPUT_POSITION;
+    }
+
     private boolean migrateOneLocation(int locationToMigrate) {
         final int currentStateValue = alternateOutputPosition.getUnsafe(locationToMigrate);
-        if (currentStateValue == EMPTY_OUTPUT_POSITION) {
+        if (isStateEmpty(currentStateValue)) {
             return false;
         }
         final byte k0 = alternateKeySource0.getUnsafe(locationToMigrate);
         final Object k1 = alternateKeySource1.getUnsafe(locationToMigrate);
         final int hash = hash(k0, k1);
         int destinationTableLocation = hashToTableLocation(hash);
-        while (mainOutputPosition.getUnsafe(destinationTableLocation) != EMPTY_OUTPUT_POSITION) {
+        while (!isStateEmpty(mainOutputPosition.getUnsafe(destinationTableLocation))) {
             destinationTableLocation = nextTableLocation(destinationTableLocation);
         }
         mainKeySource0.set(destinationTableLocation, k0);
@@ -183,8 +187,7 @@ protected int rehashInternalPartial(int entriesToRehash) {
     }
 
     @Override
-    protected void newAlternate() {
-        super.newAlternate();
+    protected void adviseNewAlternate() {
         this.mainKeySource0 = (ImmutableByteArraySource)super.mainKeySources[0];
         this.alternateKeySource0 = (ImmutableByteArraySource)super.alternateKeySources[0];
         this.mainKeySource1 = (ImmutableObjectArraySource)super.mainKeySources[1];
@@ -201,7 +204,7 @@ protected void clearAlternate() {
     @Override
     protected void migrateFront() {
         int location = 0;
-        while (migrateOneLocation(location++));
+        while (migrateOneLocation(location++) && location < alternateTableSize);
     }
 
     @Override
@@ -218,7 +221,7 @@ protected void rehashInternalFull(final int oldSize) {
         mainOutputPosition.setArray(destState);
         for (int sourceBucket = 0; sourceBucket < oldSize; ++sourceBucket) {
             final int currentStateValue = originalStateArray[sourceBucket];
-            if (currentStateValue == EMPTY_OUTPUT_POSITION) {
+            if (isStateEmpty(currentStateValue)) {
                 continue;
             }
             final byte k0 = originalKeyArray0[sourceBucket];
@@ -227,7 +230,7 @@ protected void rehashInternalFull(final int oldSize) {
             final int firstDestinationTableLocation = hashToTableLocation(hash);
             int destinationTableLocation = firstDestinationTableLocation;
             while (true) {
-                if (destState[destinationTableLocation] == EMPTY_OUTPUT_POSITION) {
+                if (isStateEmpty(destState[destinationTableLocation])) {
                     destKeyArray0[destinationTableLocation] = k0;
                     destKeyArray1[destinationTableLocation] = k1;
                     destState[destinationTableLocation] = originalStateArray[sourceBucket];
@@ -250,7 +253,7 @@ public int findPositionForKey(Object key) {
         final int firstTableLocation = tableLocation;
         while (true) {
             final int positionValue = mainOutputPosition.getUnsafe(tableLocation);
-            if (positionValue == EMPTY_OUTPUT_POSITION) {
+            if (isStateEmpty(positionValue)) {
                 int alternateTableLocation = hashToTableLocationAlternate(hash);
                 if (alternateTableLocation >= rehashPointer) {
                     return UNKNOWN_ROW;
@@ -258,7 +261,7 @@ public int findPositionForKey(Object key) {
                 final int firstAlternateTableLocation = alternateTableLocation;
                 while (true) {
                     final int alternatePositionValue = alternateOutputPosition.getUnsafe(alternateTableLocation);
-                    if (alternatePositionValue == EMPTY_OUTPUT_POSITION) {
+                    if (isStateEmpty(alternatePositionValue)) {
                         return UNKNOWN_ROW;
                     }
                     if (eq(alternateKeySource0.getUnsafe(alternateTableLocation), k0) && eq(alternateKeySource1.getUnsafe(alternateTableLocation), k1)) {
diff --git a/engine/table/src/main/java/io/deephaven/engine/table/impl/by/typed/incopenagg/gen/IncrementalAggOpenHasherByteShort.java b/engine/table/src/main/java/io/deephaven/engine/table/impl/by/typed/incopenagg/gen/IncrementalAggOpenHasherByteShort.java
index 8832cb8da05..c94dfd5fc24 100644
--- a/engine/table/src/main/java/io/deephaven/engine/table/impl/by/typed/incopenagg/gen/IncrementalAggOpenHasherByteShort.java
+++ b/engine/table/src/main/java/io/deephaven/engine/table/impl/by/typed/incopenagg/gen/IncrementalAggOpenHasherByteShort.java
@@ -68,12 +68,12 @@ protected void build(RowSequence rowSequence, Chunk[] sourceKeyChunks) {
             int tableLocation = firstTableLocation;
             MAIN_SEARCH: while (true) {
                 int outputPosition = mainOutputPosition.getUnsafe(tableLocation);
-                if (outputPosition == EMPTY_OUTPUT_POSITION) {
+                if (isStateEmpty(outputPosition)) {
                     final int firstAlternateTableLocation = hashToTableLocationAlternate(hash);
                     int alternateTableLocation = firstAlternateTableLocation;
                     while (alternateTableLocation < rehashPointer) {
                         outputPosition = alternateOutputPosition.getUnsafe(alternateTableLocation);
-                        if (outputPosition == EMPTY_OUTPUT_POSITION) {
+                        if (isStateEmpty(outputPosition)) {
                             break;
                         } else if (eq(alternateKeySource0.getUnsafe(alternateTableLocation), k0) && eq(alternateKeySource1.getUnsafe(alternateTableLocation), k1)) {
                             outputPositions.set(chunkPosition, outputPosition);
@@ -114,7 +114,7 @@ protected void probe(RowSequence rowSequence, Chunk[] sourceKeyChunks) {
             boolean found = false;
             int tableLocation = firstTableLocation;
             int outputPosition;
-            while ((outputPosition = mainOutputPosition.getUnsafe(tableLocation)) != EMPTY_OUTPUT_POSITION) {
+            while (!isStateEmpty(outputPosition = mainOutputPosition.getUnsafe(tableLocation))) {
                 if (eq(mainKeySource0.getUnsafe(tableLocation), k0) && eq(mainKeySource1.getUnsafe(tableLocation), k1)) {
                     outputPositions.set(chunkPosition, outputPosition);
                     found = true;
@@ -128,7 +128,7 @@ protected void probe(RowSequence rowSequence, Chunk[] sourceKeyChunks) {
                 boolean alternateFound = false;
                 if (firstAlternateTableLocation < rehashPointer) {
                     int alternateTableLocation = firstAlternateTableLocation;
-                    while ((outputPosition = alternateOutputPosition.getUnsafe(alternateTableLocation)) != EMPTY_OUTPUT_POSITION) {
+                    while (!isStateEmpty(outputPosition = alternateOutputPosition.getUnsafe(alternateTableLocation))) {
                         if (eq(alternateKeySource0.getUnsafe(alternateTableLocation), k0) && eq(alternateKeySource1.getUnsafe(alternateTableLocation), k1)) {
                             outputPositions.set(chunkPosition, outputPosition);
                             alternateFound = true;
@@ -151,16 +151,20 @@ private static int hash(byte k0, short k1) {
         return hash;
     }
 
+    private static boolean isStateEmpty(int state) {
+        return state == EMPTY_OUTPUT_POSITION;
+    }
+
     private boolean migrateOneLocation(int locationToMigrate) {
         final int currentStateValue = alternateOutputPosition.getUnsafe(locationToMigrate);
-        if (currentStateValue == EMPTY_OUTPUT_POSITION) {
+        if (isStateEmpty(currentStateValue)) {
             return false;
         }
         final byte k0 = alternateKeySource0.getUnsafe(locationToMigrate);
         final short k1 = alternateKeySource1.getUnsafe(locationToMigrate);
         final int hash = hash(k0, k1);
         int destinationTableLocation = hashToTableLocation(hash);
-        while (mainOutputPosition.getUnsafe(destinationTableLocation) != EMPTY_OUTPUT_POSITION) {
+        while (!isStateEmpty(mainOutputPosition.getUnsafe(destinationTableLocation))) {
             destinationTableLocation = nextTableLocation(destinationTableLocation);
         }
         mainKeySource0.set(destinationTableLocation, k0);
@@ -183,8 +187,7 @@ protected int rehashInternalPartial(int entriesToRehash) {
     }
 
     @Override
-    protected void newAlternate() {
-        super.newAlternate();
+    protected void adviseNewAlternate() {
         this.mainKeySource0 = (ImmutableByteArraySource)super.mainKeySources[0];
         this.alternateKeySource0 = (ImmutableByteArraySource)super.alternateKeySources[0];
         this.mainKeySource1 = (ImmutableShortArraySource)super.mainKeySources[1];
@@ -201,7 +204,7 @@ protected void clearAlternate() {
     @Override
     protected void migrateFront() {
         int location = 0;
-        while (migrateOneLocation(location++));
+        while (migrateOneLocation(location++) && location < alternateTableSize);
     }
 
     @Override
@@ -218,7 +221,7 @@ protected void rehashInternalFull(final int oldSize) {
         mainOutputPosition.setArray(destState);
         for (int sourceBucket = 0; sourceBucket < oldSize; ++sourceBucket) {
             final int currentStateValue = originalStateArray[sourceBucket];
-            if (currentStateValue == EMPTY_OUTPUT_POSITION) {
+            if (isStateEmpty(currentStateValue)) {
                 continue;
             }
             final byte k0 = originalKeyArray0[sourceBucket];
@@ -227,7 +230,7 @@ protected void rehashInternalFull(final int oldSize) {
             final int firstDestinationTableLocation = hashToTableLocation(hash);
             int destinationTableLocation = firstDestinationTableLocation;
             while (true) {
-                if (destState[destinationTableLocation] == EMPTY_OUTPUT_POSITION) {
+                if (isStateEmpty(destState[destinationTableLocation])) {
                     destKeyArray0[destinationTableLocation] = k0;
                     destKeyArray1[destinationTableLocation] = k1;
                     destState[destinationTableLocation] = originalStateArray[sourceBucket];
@@ -250,7 +253,7 @@ public int findPositionForKey(Object key) {
         final int firstTableLocation = tableLocation;
         while (true) {
             final int positionValue = mainOutputPosition.getUnsafe(tableLocation);
-            if (positionValue == EMPTY_OUTPUT_POSITION) {
+            if (isStateEmpty(positionValue)) {
                 int alternateTableLocation = hashToTableLocationAlternate(hash);
                 if (alternateTableLocation >= rehashPointer) {
                     return UNKNOWN_ROW;
@@ -258,7 +261,7 @@ public int findPositionForKey(Object key) {
                 final int firstAlternateTableLocation = alternateTableLocation;
                 while (true) {
                     final int alternatePositionValue = alternateOutputPosition.getUnsafe(alternateTableLocation);
-                    if (alternatePositionValue == EMPTY_OUTPUT_POSITION) {
+                    if (isStateEmpty(alternatePositionValue)) {
                         return UNKNOWN_ROW;
                     }
                     if (eq(alternateKeySource0.getUnsafe(alternateTableLocation), k0) && eq(alternateKeySource1.getUnsafe(alternateTableLocation), k1)) {
diff --git a/engine/table/src/main/java/io/deephaven/engine/table/impl/by/typed/incopenagg/gen/IncrementalAggOpenHasherChar.java b/engine/table/src/main/java/io/deephaven/engine/table/impl/by/typed/incopenagg/gen/IncrementalAggOpenHasherChar.java
index 86820867e47..d9a90ea4f3c 100644
--- a/engine/table/src/main/java/io/deephaven/engine/table/impl/by/typed/incopenagg/gen/IncrementalAggOpenHasherChar.java
+++ b/engine/table/src/main/java/io/deephaven/engine/table/impl/by/typed/incopenagg/gen/IncrementalAggOpenHasherChar.java
@@ -55,12 +55,12 @@ protected void build(RowSequence rowSequence, Chunk[] sourceKeyChunks) {
             int tableLocation = firstTableLocation;
             MAIN_SEARCH: while (true) {
                 int outputPosition = mainOutputPosition.getUnsafe(tableLocation);
-                if (outputPosition == EMPTY_OUTPUT_POSITION) {
+                if (isStateEmpty(outputPosition)) {
                     final int firstAlternateTableLocation = hashToTableLocationAlternate(hash);
                     int alternateTableLocation = firstAlternateTableLocation;
                     while (alternateTableLocation < rehashPointer) {
                         outputPosition = alternateOutputPosition.getUnsafe(alternateTableLocation);
-                        if (outputPosition == EMPTY_OUTPUT_POSITION) {
+                        if (isStateEmpty(outputPosition)) {
                             break;
                         } else if (eq(alternateKeySource0.getUnsafe(alternateTableLocation), k0)) {
                             outputPositions.set(chunkPosition, outputPosition);
@@ -98,7 +98,7 @@ protected void probe(RowSequence rowSequence, Chunk[] sourceKeyChunks) {
             boolean found = false;
             int tableLocation = firstTableLocation;
             int outputPosition;
-            while ((outputPosition = mainOutputPosition.getUnsafe(tableLocation)) != EMPTY_OUTPUT_POSITION) {
+            while (!isStateEmpty(outputPosition = mainOutputPosition.getUnsafe(tableLocation))) {
                 if (eq(mainKeySource0.getUnsafe(tableLocation), k0)) {
                     outputPositions.set(chunkPosition, outputPosition);
                     found = true;
@@ -112,7 +112,7 @@ protected void probe(RowSequence rowSequence, Chunk[] sourceKeyChunks) {
                 boolean alternateFound = false;
                 if (firstAlternateTableLocation < rehashPointer) {
                     int alternateTableLocation = firstAlternateTableLocation;
-                    while ((outputPosition = alternateOutputPosition.getUnsafe(alternateTableLocation)) != EMPTY_OUTPUT_POSITION) {
+                    while (!isStateEmpty(outputPosition = alternateOutputPosition.getUnsafe(alternateTableLocation))) {
                         if (eq(alternateKeySource0.getUnsafe(alternateTableLocation), k0)) {
                             outputPositions.set(chunkPosition, outputPosition);
                             alternateFound = true;
@@ -134,15 +134,19 @@ private static int hash(char k0) {
         return hash;
     }
 
+    private static boolean isStateEmpty(int state) {
+        return state == EMPTY_OUTPUT_POSITION;
+    }
+
     private boolean migrateOneLocation(int locationToMigrate) {
         final int currentStateValue = alternateOutputPosition.getUnsafe(locationToMigrate);
-        if (currentStateValue == EMPTY_OUTPUT_POSITION) {
+        if (isStateEmpty(currentStateValue)) {
             return false;
         }
         final char k0 = alternateKeySource0.getUnsafe(locationToMigrate);
         final int hash = hash(k0);
         int destinationTableLocation = hashToTableLocation(hash);
-        while (mainOutputPosition.getUnsafe(destinationTableLocation) != EMPTY_OUTPUT_POSITION) {
+        while (!isStateEmpty(mainOutputPosition.getUnsafe(destinationTableLocation))) {
             destinationTableLocation = nextTableLocation(destinationTableLocation);
         }
         mainKeySource0.set(destinationTableLocation, k0);
@@ -164,8 +168,7 @@ protected int rehashInternalPartial(int entriesToRehash) {
     }
 
     @Override
-    protected void newAlternate() {
-        super.newAlternate();
+    protected void adviseNewAlternate() {
         this.mainKeySource0 = (ImmutableCharArraySource)super.mainKeySources[0];
         this.alternateKeySource0 = (ImmutableCharArraySource)super.alternateKeySources[0];
     }
@@ -179,7 +182,7 @@ protected void clearAlternate() {
     @Override
     protected void migrateFront() {
         int location = 0;
-        while (migrateOneLocation(location++));
+        while (migrateOneLocation(location++) && location < alternateTableSize);
     }
 
     @Override
@@ -193,7 +196,7 @@ protected void rehashInternalFull(final int oldSize) {
         mainOutputPosition.setArray(destState);
         for (int sourceBucket = 0; sourceBucket < oldSize; ++sourceBucket) {
             final int currentStateValue = originalStateArray[sourceBucket];
-            if (currentStateValue == EMPTY_OUTPUT_POSITION) {
+            if (isStateEmpty(currentStateValue)) {
                 continue;
             }
             final char k0 = originalKeyArray0[sourceBucket];
@@ -201,7 +204,7 @@ protected void rehashInternalFull(final int oldSize) {
             final int firstDestinationTableLocation = hashToTableLocation(hash);
             int destinationTableLocation = firstDestinationTableLocation;
             while (true) {
-                if (destState[destinationTableLocation] == EMPTY_OUTPUT_POSITION) {
+                if (isStateEmpty(destState[destinationTableLocation])) {
                     destKeyArray0[destinationTableLocation] = k0;
                     destState[destinationTableLocation] = originalStateArray[sourceBucket];
                     outputPositionToHashSlot.set(currentStateValue, mainInsertMask | destinationTableLocation);
@@ -221,7 +224,7 @@ public int findPositionForKey(Object key) {
         final int firstTableLocation = tableLocation;
         while (true) {
             final int positionValue = mainOutputPosition.getUnsafe(tableLocation);
-            if (positionValue == EMPTY_OUTPUT_POSITION) {
+            if (isStateEmpty(positionValue)) {
                 int alternateTableLocation = hashToTableLocationAlternate(hash);
                 if (alternateTableLocation >= rehashPointer) {
                     return UNKNOWN_ROW;
@@ -229,7 +232,7 @@ public int findPositionForKey(Object key) {
                 final int firstAlternateTableLocation = alternateTableLocation;
                 while (true) {
                     final int alternatePositionValue = alternateOutputPosition.getUnsafe(alternateTableLocation);
-                    if (alternatePositionValue == EMPTY_OUTPUT_POSITION) {
+                    if (isStateEmpty(alternatePositionValue)) {
                         return UNKNOWN_ROW;
                     }
                     if (eq(alternateKeySource0.getUnsafe(alternateTableLocation), k0)) {
diff --git a/engine/table/src/main/java/io/deephaven/engine/table/impl/by/typed/incopenagg/gen/IncrementalAggOpenHasherCharByte.java b/engine/table/src/main/java/io/deephaven/engine/table/impl/by/typed/incopenagg/gen/IncrementalAggOpenHasherCharByte.java
index 4d8dabdb0cc..f7999ed7e3a 100644
--- a/engine/table/src/main/java/io/deephaven/engine/table/impl/by/typed/incopenagg/gen/IncrementalAggOpenHasherCharByte.java
+++ b/engine/table/src/main/java/io/deephaven/engine/table/impl/by/typed/incopenagg/gen/IncrementalAggOpenHasherCharByte.java
@@ -68,12 +68,12 @@ protected void build(RowSequence rowSequence, Chunk[] sourceKeyChunks) {
             int tableLocation = firstTableLocation;
             MAIN_SEARCH: while (true) {
                 int outputPosition = mainOutputPosition.getUnsafe(tableLocation);
-                if (outputPosition == EMPTY_OUTPUT_POSITION) {
+                if (isStateEmpty(outputPosition)) {
                     final int firstAlternateTableLocation = hashToTableLocationAlternate(hash);
                     int alternateTableLocation = firstAlternateTableLocation;
                     while (alternateTableLocation < rehashPointer) {
                         outputPosition = alternateOutputPosition.getUnsafe(alternateTableLocation);
-                        if (outputPosition == EMPTY_OUTPUT_POSITION) {
+                        if (isStateEmpty(outputPosition)) {
                             break;
                         } else if (eq(alternateKeySource0.getUnsafe(alternateTableLocation), k0) && eq(alternateKeySource1.getUnsafe(alternateTableLocation), k1)) {
                             outputPositions.set(chunkPosition, outputPosition);
@@ -114,7 +114,7 @@ protected void probe(RowSequence rowSequence, Chunk[] sourceKeyChunks) {
             boolean found = false;
             int tableLocation = firstTableLocation;
             int outputPosition;
-            while ((outputPosition = mainOutputPosition.getUnsafe(tableLocation)) != EMPTY_OUTPUT_POSITION) {
+            while (!isStateEmpty(outputPosition = mainOutputPosition.getUnsafe(tableLocation))) {
                 if (eq(mainKeySource0.getUnsafe(tableLocation), k0) && eq(mainKeySource1.getUnsafe(tableLocation), k1)) {
                     outputPositions.set(chunkPosition, outputPosition);
                     found = true;
@@ -128,7 +128,7 @@ protected void probe(RowSequence rowSequence, Chunk[] sourceKeyChunks) {
                 boolean alternateFound = false;
                 if (firstAlternateTableLocation < rehashPointer) {
                     int alternateTableLocation = firstAlternateTableLocation;
-                    while ((outputPosition = alternateOutputPosition.getUnsafe(alternateTableLocation)) != EMPTY_OUTPUT_POSITION) {
+                    while (!isStateEmpty(outputPosition = alternateOutputPosition.getUnsafe(alternateTableLocation))) {
                         if (eq(alternateKeySource0.getUnsafe(alternateTableLocation), k0) && eq(alternateKeySource1.getUnsafe(alternateTableLocation), k1)) {
                             outputPositions.set(chunkPosition, outputPosition);
                             alternateFound = true;
@@ -151,16 +151,20 @@ private static int hash(char k0, byte k1) {
         return hash;
     }
 
+    private static boolean isStateEmpty(int state) {
+        return state == EMPTY_OUTPUT_POSITION;
+    }
+
     private boolean migrateOneLocation(int locationToMigrate) {
         final int currentStateValue = alternateOutputPosition.getUnsafe(locationToMigrate);
-        if (currentStateValue == EMPTY_OUTPUT_POSITION) {
+        if (isStateEmpty(currentStateValue)) {
             return false;
         }
         final char k0 = alternateKeySource0.getUnsafe(locationToMigrate);
         final byte k1 = alternateKeySource1.getUnsafe(locationToMigrate);
         final int hash = hash(k0, k1);
         int destinationTableLocation = hashToTableLocation(hash);
-        while (mainOutputPosition.getUnsafe(destinationTableLocation) != EMPTY_OUTPUT_POSITION) {
+        while (!isStateEmpty(mainOutputPosition.getUnsafe(destinationTableLocation))) {
             destinationTableLocation = nextTableLocation(destinationTableLocation);
         }
         mainKeySource0.set(destinationTableLocation, k0);
@@ -183,8 +187,7 @@ protected int rehashInternalPartial(int entriesToRehash) {
     }
 
     @Override
-    protected void newAlternate() {
-        super.newAlternate();
+    protected void adviseNewAlternate() {
         this.mainKeySource0 = (ImmutableCharArraySource)super.mainKeySources[0];
         this.alternateKeySource0 = (ImmutableCharArraySource)super.alternateKeySources[0];
         this.mainKeySource1 = (ImmutableByteArraySource)super.mainKeySources[1];
@@ -201,7 +204,7 @@ protected void clearAlternate() {
     @Override
     protected void migrateFront() {
         int location = 0;
-        while (migrateOneLocation(location++));
+        while (migrateOneLocation(location++) && location < alternateTableSize);
     }
 
     @Override
@@ -218,7 +221,7 @@ protected void rehashInternalFull(final int oldSize) {
         mainOutputPosition.setArray(destState);
         for (int sourceBucket = 0; sourceBucket < oldSize; ++sourceBucket) {
             final int currentStateValue = originalStateArray[sourceBucket];
-            if (currentStateValue == EMPTY_OUTPUT_POSITION) {
+            if (isStateEmpty(currentStateValue)) {
                 continue;
             }
             final char k0 = originalKeyArray0[sourceBucket];
@@ -227,7 +230,7 @@ protected void rehashInternalFull(final int oldSize) {
             final int firstDestinationTableLocation = hashToTableLocation(hash);
             int destinationTableLocation = firstDestinationTableLocation;
             while (true) {
-                if (destState[destinationTableLocation] == EMPTY_OUTPUT_POSITION) {
+                if (isStateEmpty(destState[destinationTableLocation])) {
                     destKeyArray0[destinationTableLocation] = k0;
                     destKeyArray1[destinationTableLocation] = k1;
                     destState[destinationTableLocation] = originalStateArray[sourceBucket];
@@ -250,7 +253,7 @@ public int findPositionForKey(Object key) {
         final int firstTableLocation = tableLocation;
         while (true) {
             final int positionValue = mainOutputPosition.getUnsafe(tableLocation);
-            if (positionValue == EMPTY_OUTPUT_POSITION) {
+            if (isStateEmpty(positionValue)) {
                 int alternateTableLocation = hashToTableLocationAlternate(hash);
                 if (alternateTableLocation >= rehashPointer) {
                     return UNKNOWN_ROW;
@@ -258,7 +261,7 @@ public int findPositionForKey(Object key) {
                 final int firstAlternateTableLocation = alternateTableLocation;
                 while (true) {
                     final int alternatePositionValue = alternateOutputPosition.getUnsafe(alternateTableLocation);
-                    if (alternatePositionValue == EMPTY_OUTPUT_POSITION) {
+                    if (isStateEmpty(alternatePositionValue)) {
                         return UNKNOWN_ROW;
                     }
                     if (eq(alternateKeySource0.getUnsafe(alternateTableLocation), k0) && eq(alternateKeySource1.getUnsafe(alternateTableLocation), k1)) {
diff --git a/engine/table/src/main/java/io/deephaven/engine/table/impl/by/typed/incopenagg/gen/IncrementalAggOpenHasherCharChar.java b/engine/table/src/main/java/io/deephaven/engine/table/impl/by/typed/incopenagg/gen/IncrementalAggOpenHasherCharChar.java
index 5041b5f671e..c3c64b75c8f 100644
--- a/engine/table/src/main/java/io/deephaven/engine/table/impl/by/typed/incopenagg/gen/IncrementalAggOpenHasherCharChar.java
+++ b/engine/table/src/main/java/io/deephaven/engine/table/impl/by/typed/incopenagg/gen/IncrementalAggOpenHasherCharChar.java
@@ -63,12 +63,12 @@ protected void build(RowSequence rowSequence, Chunk[] sourceKeyChunks) {
             int tableLocation = firstTableLocation;
             MAIN_SEARCH: while (true) {
                 int outputPosition = mainOutputPosition.getUnsafe(tableLocation);
-                if (outputPosition == EMPTY_OUTPUT_POSITION) {
+                if (isStateEmpty(outputPosition)) {
                     final int firstAlternateTableLocation = hashToTableLocationAlternate(hash);
                     int alternateTableLocation = firstAlternateTableLocation;
                     while (alternateTableLocation < rehashPointer) {
                         outputPosition = alternateOutputPosition.getUnsafe(alternateTableLocation);
-                        if (outputPosition == EMPTY_OUTPUT_POSITION) {
+                        if (isStateEmpty(outputPosition)) {
                             break;
                         } else if (eq(alternateKeySource0.getUnsafe(alternateTableLocation), k0) && eq(alternateKeySource1.getUnsafe(alternateTableLocation), k1)) {
                             outputPositions.set(chunkPosition, outputPosition);
@@ -109,7 +109,7 @@ protected void probe(RowSequence rowSequence, Chunk[] sourceKeyChunks) {
             boolean found = false;
             int tableLocation = firstTableLocation;
             int outputPosition;
-            while ((outputPosition = mainOutputPosition.getUnsafe(tableLocation)) != EMPTY_OUTPUT_POSITION) {
+            while (!isStateEmpty(outputPosition = mainOutputPosition.getUnsafe(tableLocation))) {
                 if (eq(mainKeySource0.getUnsafe(tableLocation), k0) && eq(mainKeySource1.getUnsafe(tableLocation), k1)) {
                     outputPositions.set(chunkPosition, outputPosition);
                     found = true;
@@ -123,7 +123,7 @@ protected void probe(RowSequence rowSequence, Chunk[] sourceKeyChunks) {
                 boolean alternateFound = false;
                 if (firstAlternateTableLocation < rehashPointer) {
                     int alternateTableLocation = firstAlternateTableLocation;
-                    while ((outputPosition = alternateOutputPosition.getUnsafe(alternateTableLocation)) != EMPTY_OUTPUT_POSITION) {
+                    while (!isStateEmpty(outputPosition = alternateOutputPosition.getUnsafe(alternateTableLocation))) {
                         if (eq(alternateKeySource0.getUnsafe(alternateTableLocation), k0) && eq(alternateKeySource1.getUnsafe(alternateTableLocation), k1)) {
                             outputPositions.set(chunkPosition, outputPosition);
                             alternateFound = true;
@@ -146,16 +146,20 @@ private static int hash(char k0, char k1) {
         return hash;
     }
 
+    private static boolean isStateEmpty(int state) {
+        return state == EMPTY_OUTPUT_POSITION;
+    }
+
     private boolean migrateOneLocation(int locationToMigrate) {
         final int currentStateValue = alternateOutputPosition.getUnsafe(locationToMigrate);
-        if (currentStateValue == EMPTY_OUTPUT_POSITION) {
+        if (isStateEmpty(currentStateValue)) {
             return false;
         }
         final char k0 = alternateKeySource0.getUnsafe(locationToMigrate);
         final char k1 = alternateKeySource1.getUnsafe(locationToMigrate);
         final int hash = hash(k0, k1);
         int destinationTableLocation = hashToTableLocation(hash);
-        while (mainOutputPosition.getUnsafe(destinationTableLocation) != EMPTY_OUTPUT_POSITION) {
+        while (!isStateEmpty(mainOutputPosition.getUnsafe(destinationTableLocation))) {
             destinationTableLocation = nextTableLocation(destinationTableLocation);
         }
         mainKeySource0.set(destinationTableLocation, k0);
@@ -178,8 +182,7 @@ protected int rehashInternalPartial(int entriesToRehash) {
     }
 
     @Override
-    protected void newAlternate() {
-        super.newAlternate();
+    protected void adviseNewAlternate() {
         this.mainKeySource0 = (ImmutableCharArraySource)super.mainKeySources[0];
         this.alternateKeySource0 = (ImmutableCharArraySource)super.alternateKeySources[0];
         this.mainKeySource1 = (ImmutableCharArraySource)super.mainKeySources[1];
@@ -196,7 +199,7 @@ protected void clearAlternate() {
     @Override
     protected void migrateFront() {
         int location = 0;
-        while (migrateOneLocation(location++));
+        while (migrateOneLocation(location++) && location < alternateTableSize);
     }
 
     @Override
@@ -213,7 +216,7 @@ protected void rehashInternalFull(final int oldSize) {
         mainOutputPosition.setArray(destState);
         for (int sourceBucket = 0; sourceBucket < oldSize; ++sourceBucket) {
             final int currentStateValue = originalStateArray[sourceBucket];
-            if (currentStateValue == EMPTY_OUTPUT_POSITION) {
+            if (isStateEmpty(currentStateValue)) {
                 continue;
             }
             final char k0 = originalKeyArray0[sourceBucket];
@@ -222,7 +225,7 @@ protected void rehashInternalFull(final int oldSize) {
             final int firstDestinationTableLocation = hashToTableLocation(hash);
             int destinationTableLocation = firstDestinationTableLocation;
             while (true) {
-                if (destState[destinationTableLocation] == EMPTY_OUTPUT_POSITION) {
+                if (isStateEmpty(destState[destinationTableLocation])) {
                     destKeyArray0[destinationTableLocation] = k0;
                     destKeyArray1[destinationTableLocation] = k1;
                     destState[destinationTableLocation] = originalStateArray[sourceBucket];
@@ -245,7 +248,7 @@ public int findPositionForKey(Object key) {
         final int firstTableLocation = tableLocation;
         while (true) {
             final int positionValue = mainOutputPosition.getUnsafe(tableLocation);
-            if (positionValue == EMPTY_OUTPUT_POSITION) {
+            if (isStateEmpty(positionValue)) {
                 int alternateTableLocation = hashToTableLocationAlternate(hash);
                 if (alternateTableLocation >= rehashPointer) {
                     return UNKNOWN_ROW;
@@ -253,7 +256,7 @@ public int findPositionForKey(Object key) {
                 final int firstAlternateTableLocation = alternateTableLocation;
                 while (true) {
                     final int alternatePositionValue = alternateOutputPosition.getUnsafe(alternateTableLocation);
-                    if (alternatePositionValue == EMPTY_OUTPUT_POSITION) {
+                    if (isStateEmpty(alternatePositionValue)) {
                         return UNKNOWN_ROW;
                     }
                     if (eq(alternateKeySource0.getUnsafe(alternateTableLocation), k0) && eq(alternateKeySource1.getUnsafe(alternateTableLocation), k1)) {
diff --git a/engine/table/src/main/java/io/deephaven/engine/table/impl/by/typed/incopenagg/gen/IncrementalAggOpenHasherCharDouble.java b/engine/table/src/main/java/io/deephaven/engine/table/impl/by/typed/incopenagg/gen/IncrementalAggOpenHasherCharDouble.java
index 23b290386e8..1758d43d583 100644
--- a/engine/table/src/main/java/io/deephaven/engine/table/impl/by/typed/incopenagg/gen/IncrementalAggOpenHasherCharDouble.java
+++ b/engine/table/src/main/java/io/deephaven/engine/table/impl/by/typed/incopenagg/gen/IncrementalAggOpenHasherCharDouble.java
@@ -68,12 +68,12 @@ protected void build(RowSequence rowSequence, Chunk[] sourceKeyChunks) {
             int tableLocation = firstTableLocation;
             MAIN_SEARCH: while (true) {
                 int outputPosition = mainOutputPosition.getUnsafe(tableLocation);
-                if (outputPosition == EMPTY_OUTPUT_POSITION) {
+                if (isStateEmpty(outputPosition)) {
                     final int firstAlternateTableLocation = hashToTableLocationAlternate(hash);
                     int alternateTableLocation = firstAlternateTableLocation;
                     while (alternateTableLocation < rehashPointer) {
                         outputPosition = alternateOutputPosition.getUnsafe(alternateTableLocation);
-                        if (outputPosition == EMPTY_OUTPUT_POSITION) {
+                        if (isStateEmpty(outputPosition)) {
                             break;
                         } else if (eq(alternateKeySource0.getUnsafe(alternateTableLocation), k0) && eq(alternateKeySource1.getUnsafe(alternateTableLocation), k1)) {
                             outputPositions.set(chunkPosition, outputPosition);
@@ -114,7 +114,7 @@ protected void probe(RowSequence rowSequence, Chunk[] sourceKeyChunks) {
             boolean found = false;
             int tableLocation = firstTableLocation;
             int outputPosition;
-            while ((outputPosition = mainOutputPosition.getUnsafe(tableLocation)) != EMPTY_OUTPUT_POSITION) {
+            while (!isStateEmpty(outputPosition = mainOutputPosition.getUnsafe(tableLocation))) {
                 if (eq(mainKeySource0.getUnsafe(tableLocation), k0) && eq(mainKeySource1.getUnsafe(tableLocation), k1)) {
                     outputPositions.set(chunkPosition, outputPosition);
                     found = true;
@@ -128,7 +128,7 @@ protected void probe(RowSequence rowSequence, Chunk[] sourceKeyChunks) {
                 boolean alternateFound = false;
                 if (firstAlternateTableLocation < rehashPointer) {
                     int alternateTableLocation = firstAlternateTableLocation;
-                    while ((outputPosition = alternateOutputPosition.getUnsafe(alternateTableLocation)) != EMPTY_OUTPUT_POSITION) {
+                    while (!isStateEmpty(outputPosition = alternateOutputPosition.getUnsafe(alternateTableLocation))) {
                         if (eq(alternateKeySource0.getUnsafe(alternateTableLocation), k0) && eq(alternateKeySource1.getUnsafe(alternateTableLocation), k1)) {
                             outputPositions.set(chunkPosition, outputPosition);
                             alternateFound = true;
@@ -151,16 +151,20 @@ private static int hash(char k0, double k1) {
         return hash;
     }
 
+    private static boolean isStateEmpty(int state) {
+        return state == EMPTY_OUTPUT_POSITION;
+    }
+
     private boolean migrateOneLocation(int locationToMigrate) {
         final int currentStateValue = alternateOutputPosition.getUnsafe(locationToMigrate);
-        if (currentStateValue == EMPTY_OUTPUT_POSITION) {
+        if (isStateEmpty(currentStateValue)) {
             return false;
         }
         final char k0 = alternateKeySource0.getUnsafe(locationToMigrate);
         final double k1 = alternateKeySource1.getUnsafe(locationToMigrate);
         final int hash = hash(k0, k1);
         int destinationTableLocation = hashToTableLocation(hash);
-        while (mainOutputPosition.getUnsafe(destinationTableLocation) != EMPTY_OUTPUT_POSITION) {
+        while (!isStateEmpty(mainOutputPosition.getUnsafe(destinationTableLocation))) {
             destinationTableLocation = nextTableLocation(destinationTableLocation);
         }
         mainKeySource0.set(destinationTableLocation, k0);
@@ -183,8 +187,7 @@ protected int rehashInternalPartial(int entriesToRehash) {
     }
 
     @Override
-    protected void newAlternate() {
-        super.newAlternate();
+    protected void adviseNewAlternate() {
         this.mainKeySource0 = (ImmutableCharArraySource)super.mainKeySources[0];
         this.alternateKeySource0 = (ImmutableCharArraySource)super.alternateKeySources[0];
         this.mainKeySource1 = (ImmutableDoubleArraySource)super.mainKeySources[1];
@@ -201,7 +204,7 @@ protected void clearAlternate() {
     @Override
     protected void migrateFront() {
         int location = 0;
-        while (migrateOneLocation(location++));
+        while (migrateOneLocation(location++) && location < alternateTableSize);
     }
 
     @Override
@@ -218,7 +221,7 @@ protected void rehashInternalFull(final int oldSize) {
         mainOutputPosition.setArray(destState);
         for (int sourceBucket = 0; sourceBucket < oldSize; ++sourceBucket) {
             final int currentStateValue = originalStateArray[sourceBucket];
-            if (currentStateValue == EMPTY_OUTPUT_POSITION) {
+            if (isStateEmpty(currentStateValue)) {
                 continue;
             }
             final char k0 = originalKeyArray0[sourceBucket];
@@ -227,7 +230,7 @@ protected void rehashInternalFull(final int oldSize) {
             final int firstDestinationTableLocation = hashToTableLocation(hash);
             int destinationTableLocation = firstDestinationTableLocation;
             while (true) {
-                if (destState[destinationTableLocation] == EMPTY_OUTPUT_POSITION) {
+                if (isStateEmpty(destState[destinationTableLocation])) {
                     destKeyArray0[destinationTableLocation] = k0;
                     destKeyArray1[destinationTableLocation] = k1;
                     destState[destinationTableLocation] = originalStateArray[sourceBucket];
@@ -250,7 +253,7 @@ public int findPositionForKey(Object key) {
         final int firstTableLocation = tableLocation;
         while (true) {
             final int positionValue = mainOutputPosition.getUnsafe(tableLocation);
-            if (positionValue == EMPTY_OUTPUT_POSITION) {
+            if (isStateEmpty(positionValue)) {
                 int alternateTableLocation = hashToTableLocationAlternate(hash);
                 if (alternateTableLocation >= rehashPointer) {
                     return UNKNOWN_ROW;
@@ -258,7 +261,7 @@ public int findPositionForKey(Object key) {
                 final int firstAlternateTableLocation = alternateTableLocation;
                 while (true) {
                     final int alternatePositionValue = alternateOutputPosition.getUnsafe(alternateTableLocation);
-                    if (alternatePositionValue == EMPTY_OUTPUT_POSITION) {
+                    if (isStateEmpty(alternatePositionValue)) {
                         return UNKNOWN_ROW;
                     }
                     if (eq(alternateKeySource0.getUnsafe(alternateTableLocation), k0) && eq(alternateKeySource1.getUnsafe(alternateTableLocation), k1)) {
diff --git a/engine/table/src/main/java/io/deephaven/engine/table/impl/by/typed/incopenagg/gen/IncrementalAggOpenHasherCharFloat.java b/engine/table/src/main/java/io/deephaven/engine/table/impl/by/typed/incopenagg/gen/IncrementalAggOpenHasherCharFloat.java
index dbc60659221..e3cb0e71fd6 100644
--- a/engine/table/src/main/java/io/deephaven/engine/table/impl/by/typed/incopenagg/gen/IncrementalAggOpenHasherCharFloat.java
+++ b/engine/table/src/main/java/io/deephaven/engine/table/impl/by/typed/incopenagg/gen/IncrementalAggOpenHasherCharFloat.java
@@ -68,12 +68,12 @@ protected void build(RowSequence rowSequence, Chunk[] sourceKeyChunks) {
             int tableLocation = firstTableLocation;
             MAIN_SEARCH: while (true) {
                 int outputPosition = mainOutputPosition.getUnsafe(tableLocation);
-                if (outputPosition == EMPTY_OUTPUT_POSITION) {
+                if (isStateEmpty(outputPosition)) {
                     final int firstAlternateTableLocation = hashToTableLocationAlternate(hash);
                     int alternateTableLocation = firstAlternateTableLocation;
                     while (alternateTableLocation < rehashPointer) {
                         outputPosition = alternateOutputPosition.getUnsafe(alternateTableLocation);
-                        if (outputPosition == EMPTY_OUTPUT_POSITION) {
+                        if (isStateEmpty(outputPosition)) {
                             break;
                         } else if (eq(alternateKeySource0.getUnsafe(alternateTableLocation), k0) && eq(alternateKeySource1.getUnsafe(alternateTableLocation), k1)) {
                             outputPositions.set(chunkPosition, outputPosition);
@@ -114,7 +114,7 @@ protected void probe(RowSequence rowSequence, Chunk[] sourceKeyChunks) {
             boolean found = false;
             int tableLocation = firstTableLocation;
             int outputPosition;
-            while ((outputPosition = mainOutputPosition.getUnsafe(tableLocation)) != EMPTY_OUTPUT_POSITION) {
+            while (!isStateEmpty(outputPosition = mainOutputPosition.getUnsafe(tableLocation))) {
                 if (eq(mainKeySource0.getUnsafe(tableLocation), k0) && eq(mainKeySource1.getUnsafe(tableLocation), k1)) {
                     outputPositions.set(chunkPosition, outputPosition);
                     found = true;
@@ -128,7 +128,7 @@ protected void probe(RowSequence rowSequence, Chunk[] sourceKeyChunks) {
                 boolean alternateFound = false;
                 if (firstAlternateTableLocation < rehashPointer) {
                     int alternateTableLocation = firstAlternateTableLocation;
-                    while ((outputPosition = alternateOutputPosition.getUnsafe(alternateTableLocation)) != EMPTY_OUTPUT_POSITION) {
+                    while (!isStateEmpty(outputPosition = alternateOutputPosition.getUnsafe(alternateTableLocation))) {
                         if (eq(alternateKeySource0.getUnsafe(alternateTableLocation), k0) && eq(alternateKeySource1.getUnsafe(alternateTableLocation), k1)) {
                             outputPositions.set(chunkPosition, outputPosition);
                             alternateFound = true;
@@ -151,16 +151,20 @@ private static int hash(char k0, float k1) {
         return hash;
     }
 
+    private static boolean isStateEmpty(int state) {
+        return state == EMPTY_OUTPUT_POSITION;
+    }
+
     private boolean migrateOneLocation(int locationToMigrate) {
         final int currentStateValue = alternateOutputPosition.getUnsafe(locationToMigrate);
-        if (currentStateValue == EMPTY_OUTPUT_POSITION) {
+        if (isStateEmpty(currentStateValue)) {
             return false;
         }
         final char k0 = alternateKeySource0.getUnsafe(locationToMigrate);
         final float k1 = alternateKeySource1.getUnsafe(locationToMigrate);
         final int hash = hash(k0, k1);
         int destinationTableLocation = hashToTableLocation(hash);
-        while (mainOutputPosition.getUnsafe(destinationTableLocation) != EMPTY_OUTPUT_POSITION) {
+        while (!isStateEmpty(mainOutputPosition.getUnsafe(destinationTableLocation))) {
             destinationTableLocation = nextTableLocation(destinationTableLocation);
         }
         mainKeySource0.set(destinationTableLocation, k0);
@@ -183,8 +187,7 @@ protected int rehashInternalPartial(int entriesToRehash) {
     }
 
     @Override
-    protected void newAlternate() {
-        super.newAlternate();
+    protected void adviseNewAlternate() {
         this.mainKeySource0 = (ImmutableCharArraySource)super.mainKeySources[0];
         this.alternateKeySource0 = (ImmutableCharArraySource)super.alternateKeySources[0];
         this.mainKeySource1 = (ImmutableFloatArraySource)super.mainKeySources[1];
@@ -201,7 +204,7 @@ protected void clearAlternate() {
     @Override
     protected void migrateFront() {
         int location = 0;
-        while (migrateOneLocation(location++));
+        while (migrateOneLocation(location++) && location < alternateTableSize);
     }
 
     @Override
@@ -218,7 +221,7 @@ protected void rehashInternalFull(final int oldSize) {
         mainOutputPosition.setArray(destState);
         for (int sourceBucket = 0; sourceBucket < oldSize; ++sourceBucket) {
             final int currentStateValue = originalStateArray[sourceBucket];
-            if (currentStateValue == EMPTY_OUTPUT_POSITION) {
+            if (isStateEmpty(currentStateValue)) {
                 continue;
             }
             final char k0 = originalKeyArray0[sourceBucket];
@@ -227,7 +230,7 @@ protected void rehashInternalFull(final int oldSize) {
             final int firstDestinationTableLocation = hashToTableLocation(hash);
             int destinationTableLocation = firstDestinationTableLocation;
             while (true) {
-                if (destState[destinationTableLocation] == EMPTY_OUTPUT_POSITION) {
+                if (isStateEmpty(destState[destinationTableLocation])) {
                     destKeyArray0[destinationTableLocation] = k0;
                     destKeyArray1[destinationTableLocation] = k1;
                     destState[destinationTableLocation] = originalStateArray[sourceBucket];
@@ -250,7 +253,7 @@ public int findPositionForKey(Object key) {
         final int firstTableLocation = tableLocation;
         while (true) {
             final int positionValue = mainOutputPosition.getUnsafe(tableLocation);
-            if (positionValue == EMPTY_OUTPUT_POSITION) {
+            if (isStateEmpty(positionValue)) {
                 int alternateTableLocation = hashToTableLocationAlternate(hash);
                 if (alternateTableLocation >= rehashPointer) {
                     return UNKNOWN_ROW;
@@ -258,7 +261,7 @@ public int findPositionForKey(Object key) {
                 final int firstAlternateTableLocation = alternateTableLocation;
                 while (true) {
                     final int alternatePositionValue = alternateOutputPosition.getUnsafe(alternateTableLocation);
-                    if (alternatePositionValue == EMPTY_OUTPUT_POSITION) {
+                    if (isStateEmpty(alternatePositionValue)) {
                         return UNKNOWN_ROW;
                     }
                     if (eq(alternateKeySource0.getUnsafe(alternateTableLocation), k0) && eq(alternateKeySource1.getUnsafe(alternateTableLocation), k1)) {
diff --git a/engine/table/src/main/java/io/deephaven/engine/table/impl/by/typed/incopenagg/gen/IncrementalAggOpenHasherCharInt.java b/engine/table/src/main/java/io/deephaven/engine/table/impl/by/typed/incopenagg/gen/IncrementalAggOpenHasherCharInt.java
index d19d496c961..c03c6a54871 100644
--- a/engine/table/src/main/java/io/deephaven/engine/table/impl/by/typed/incopenagg/gen/IncrementalAggOpenHasherCharInt.java
+++ b/engine/table/src/main/java/io/deephaven/engine/table/impl/by/typed/incopenagg/gen/IncrementalAggOpenHasherCharInt.java
@@ -68,12 +68,12 @@ protected void build(RowSequence rowSequence, Chunk[] sourceKeyChunks) {
             int tableLocation = firstTableLocation;
             MAIN_SEARCH: while (true) {
                 int outputPosition = mainOutputPosition.getUnsafe(tableLocation);
-                if (outputPosition == EMPTY_OUTPUT_POSITION) {
+                if (isStateEmpty(outputPosition)) {
                     final int firstAlternateTableLocation = hashToTableLocationAlternate(hash);
                     int alternateTableLocation = firstAlternateTableLocation;
                     while (alternateTableLocation < rehashPointer) {
                         outputPosition = alternateOutputPosition.getUnsafe(alternateTableLocation);
-                        if (outputPosition == EMPTY_OUTPUT_POSITION) {
+                        if (isStateEmpty(outputPosition)) {
                             break;
                         } else if (eq(alternateKeySource0.getUnsafe(alternateTableLocation), k0) && eq(alternateKeySource1.getUnsafe(alternateTableLocation), k1)) {
                             outputPositions.set(chunkPosition, outputPosition);
@@ -114,7 +114,7 @@ protected void probe(RowSequence rowSequence, Chunk[] sourceKeyChunks) {
             boolean found = false;
             int tableLocation = firstTableLocation;
             int outputPosition;
-            while ((outputPosition = mainOutputPosition.getUnsafe(tableLocation)) != EMPTY_OUTPUT_POSITION) {
+            while (!isStateEmpty(outputPosition = mainOutputPosition.getUnsafe(tableLocation))) {
                 if (eq(mainKeySource0.getUnsafe(tableLocation), k0) && eq(mainKeySource1.getUnsafe(tableLocation), k1)) {
                     outputPositions.set(chunkPosition, outputPosition);
                     found = true;
@@ -128,7 +128,7 @@ protected void probe(RowSequence rowSequence, Chunk[] sourceKeyChunks) {
                 boolean alternateFound = false;
                 if (firstAlternateTableLocation < rehashPointer) {
                     int alternateTableLocation = firstAlternateTableLocation;
-                    while ((outputPosition = alternateOutputPosition.getUnsafe(alternateTableLocation)) != EMPTY_OUTPUT_POSITION) {
+                    while (!isStateEmpty(outputPosition = alternateOutputPosition.getUnsafe(alternateTableLocation))) {
                         if (eq(alternateKeySource0.getUnsafe(alternateTableLocation), k0) && eq(alternateKeySource1.getUnsafe(alternateTableLocation), k1)) {
                             outputPositions.set(chunkPosition, outputPosition);
                             alternateFound = true;
@@ -151,16 +151,20 @@ private static int hash(char k0, int k1) {
         return hash;
     }
 
+    private static boolean isStateEmpty(int state) {
+        return state == EMPTY_OUTPUT_POSITION;
+    }
+
     private boolean migrateOneLocation(int locationToMigrate) {
         final int currentStateValue = alternateOutputPosition.getUnsafe(locationToMigrate);
-        if (currentStateValue == EMPTY_OUTPUT_POSITION) {
+        if (isStateEmpty(currentStateValue)) {
             return false;
         }
         final char k0 = alternateKeySource0.getUnsafe(locationToMigrate);
         final int k1 = alternateKeySource1.getUnsafe(locationToMigrate);
         final int hash = hash(k0, k1);
         int destinationTableLocation = hashToTableLocation(hash);
-        while (mainOutputPosition.getUnsafe(destinationTableLocation) != EMPTY_OUTPUT_POSITION) {
+        while (!isStateEmpty(mainOutputPosition.getUnsafe(destinationTableLocation))) {
             destinationTableLocation = nextTableLocation(destinationTableLocation);
         }
         mainKeySource0.set(destinationTableLocation, k0);
@@ -183,8 +187,7 @@ protected int rehashInternalPartial(int entriesToRehash) {
     }
 
     @Override
-    protected void newAlternate() {
-        super.newAlternate();
+    protected void adviseNewAlternate() {
         this.mainKeySource0 = (ImmutableCharArraySource)super.mainKeySources[0];
         this.alternateKeySource0 = (ImmutableCharArraySource)super.alternateKeySources[0];
         this.mainKeySource1 = (ImmutableIntArraySource)super.mainKeySources[1];
@@ -201,7 +204,7 @@ protected void clearAlternate() {
     @Override
     protected void migrateFront() {
         int location = 0;
-        while (migrateOneLocation(location++));
+        while (migrateOneLocation(location++) && location < alternateTableSize);
     }
 
     @Override
@@ -218,7 +221,7 @@ protected void rehashInternalFull(final int oldSize) {
         mainOutputPosition.setArray(destState);
         for (int sourceBucket = 0; sourceBucket < oldSize; ++sourceBucket) {
             final int currentStateValue = originalStateArray[sourceBucket];
-            if (currentStateValue == EMPTY_OUTPUT_POSITION) {
+            if (isStateEmpty(currentStateValue)) {
                 continue;
             }
             final char k0 = originalKeyArray0[sourceBucket];
@@ -227,7 +230,7 @@ protected void rehashInternalFull(final int oldSize) {
             final int firstDestinationTableLocation = hashToTableLocation(hash);
             int destinationTableLocation = firstDestinationTableLocation;
             while (true) {
-                if (destState[destinationTableLocation] == EMPTY_OUTPUT_POSITION) {
+                if (isStateEmpty(destState[destinationTableLocation])) {
                     destKeyArray0[destinationTableLocation] = k0;
                     destKeyArray1[destinationTableLocation] = k1;
                     destState[destinationTableLocation] = originalStateArray[sourceBucket];
@@ -250,7 +253,7 @@ public int findPositionForKey(Object key) {
         final int firstTableLocation = tableLocation;
         while (true) {
             final int positionValue = mainOutputPosition.getUnsafe(tableLocation);
-            if (positionValue == EMPTY_OUTPUT_POSITION) {
+            if (isStateEmpty(positionValue)) {
                 int alternateTableLocation = hashToTableLocationAlternate(hash);
                 if (alternateTableLocation >= rehashPointer) {
                     return UNKNOWN_ROW;
@@ -258,7 +261,7 @@ public int findPositionForKey(Object key) {
                 final int firstAlternateTableLocation = alternateTableLocation;
                 while (true) {
                     final int alternatePositionValue = alternateOutputPosition.getUnsafe(alternateTableLocation);
-                    if (alternatePositionValue == EMPTY_OUTPUT_POSITION) {
+                    if (isStateEmpty(alternatePositionValue)) {
                         return UNKNOWN_ROW;
                     }
                     if (eq(alternateKeySource0.getUnsafe(alternateTableLocation), k0) && eq(alternateKeySource1.getUnsafe(alternateTableLocation), k1)) {
diff --git a/engine/table/src/main/java/io/deephaven/engine/table/impl/by/typed/incopenagg/gen/IncrementalAggOpenHasherCharLong.java b/engine/table/src/main/java/io/deephaven/engine/table/impl/by/typed/incopenagg/gen/IncrementalAggOpenHasherCharLong.java
index 1e3ae83a1c0..6a478ef5f2d 100644
--- a/engine/table/src/main/java/io/deephaven/engine/table/impl/by/typed/incopenagg/gen/IncrementalAggOpenHasherCharLong.java
+++ b/engine/table/src/main/java/io/deephaven/engine/table/impl/by/typed/incopenagg/gen/IncrementalAggOpenHasherCharLong.java
@@ -68,12 +68,12 @@ protected void build(RowSequence rowSequence, Chunk[] sourceKeyChunks) {
             int tableLocation = firstTableLocation;
             MAIN_SEARCH: while (true) {
                 int outputPosition = mainOutputPosition.getUnsafe(tableLocation);
-                if (outputPosition == EMPTY_OUTPUT_POSITION) {
+                if (isStateEmpty(outputPosition)) {
                     final int firstAlternateTableLocation = hashToTableLocationAlternate(hash);
                     int alternateTableLocation = firstAlternateTableLocation;
                     while (alternateTableLocation < rehashPointer) {
                         outputPosition = alternateOutputPosition.getUnsafe(alternateTableLocation);
-                        if (outputPosition == EMPTY_OUTPUT_POSITION) {
+                        if (isStateEmpty(outputPosition)) {
                             break;
                         } else if (eq(alternateKeySource0.getUnsafe(alternateTableLocation), k0) && eq(alternateKeySource1.getUnsafe(alternateTableLocation), k1)) {
                             outputPositions.set(chunkPosition, outputPosition);
@@ -114,7 +114,7 @@ protected void probe(RowSequence rowSequence, Chunk[] sourceKeyChunks) {
             boolean found = false;
             int tableLocation = firstTableLocation;
             int outputPosition;
-            while ((outputPosition = mainOutputPosition.getUnsafe(tableLocation)) != EMPTY_OUTPUT_POSITION) {
+            while (!isStateEmpty(outputPosition = mainOutputPosition.getUnsafe(tableLocation))) {
                 if (eq(mainKeySource0.getUnsafe(tableLocation), k0) && eq(mainKeySource1.getUnsafe(tableLocation), k1)) {
                     outputPositions.set(chunkPosition, outputPosition);
                     found = true;
@@ -128,7 +128,7 @@ protected void probe(RowSequence rowSequence, Chunk[] sourceKeyChunks) {
                 boolean alternateFound = false;
                 if (firstAlternateTableLocation < rehashPointer) {
                     int alternateTableLocation = firstAlternateTableLocation;
-                    while ((outputPosition = alternateOutputPosition.getUnsafe(alternateTableLocation)) != EMPTY_OUTPUT_POSITION) {
+                    while (!isStateEmpty(outputPosition = alternateOutputPosition.getUnsafe(alternateTableLocation))) {
                         if (eq(alternateKeySource0.getUnsafe(alternateTableLocation), k0) && eq(alternateKeySource1.getUnsafe(alternateTableLocation), k1)) {
                             outputPositions.set(chunkPosition, outputPosition);
                             alternateFound = true;
@@ -151,16 +151,20 @@ private static int hash(char k0, long k1) {
         return hash;
     }
 
+    private static boolean isStateEmpty(int state) {
+        return state == EMPTY_OUTPUT_POSITION;
+    }
+
     private boolean migrateOneLocation(int locationToMigrate) {
         final int currentStateValue = alternateOutputPosition.getUnsafe(locationToMigrate);
-        if (currentStateValue == EMPTY_OUTPUT_POSITION) {
+        if (isStateEmpty(currentStateValue)) {
             return false;
         }
         final char k0 = alternateKeySource0.getUnsafe(locationToMigrate);
         final long k1 = alternateKeySource1.getUnsafe(locationToMigrate);
         final int hash = hash(k0, k1);
         int destinationTableLocation = hashToTableLocation(hash);
-        while (mainOutputPosition.getUnsafe(destinationTableLocation) != EMPTY_OUTPUT_POSITION) {
+        while (!isStateEmpty(mainOutputPosition.getUnsafe(destinationTableLocation))) {
             destinationTableLocation = nextTableLocation(destinationTableLocation);
         }
         mainKeySource0.set(destinationTableLocation, k0);
@@ -183,8 +187,7 @@ protected int rehashInternalPartial(int entriesToRehash) {
     }
 
     @Override
-    protected void newAlternate() {
-        super.newAlternate();
+    protected void adviseNewAlternate() {
         this.mainKeySource0 = (ImmutableCharArraySource)super.mainKeySources[0];
         this.alternateKeySource0 = (ImmutableCharArraySource)super.alternateKeySources[0];
         this.mainKeySource1 = (ImmutableLongArraySource)super.mainKeySources[1];
@@ -201,7 +204,7 @@ protected void clearAlternate() {
     @Override
     protected void migrateFront() {
         int location = 0;
-        while (migrateOneLocation(location++));
+        while (migrateOneLocation(location++) && location < alternateTableSize);
     }
 
     @Override
@@ -218,7 +221,7 @@ protected void rehashInternalFull(final int oldSize) {
         mainOutputPosition.setArray(destState);
         for (int sourceBucket = 0; sourceBucket < oldSize; ++sourceBucket) {
             final int currentStateValue = originalStateArray[sourceBucket];
-            if (currentStateValue == EMPTY_OUTPUT_POSITION) {
+            if (isStateEmpty(currentStateValue)) {
                 continue;
             }
             final char k0 = originalKeyArray0[sourceBucket];
@@ -227,7 +230,7 @@ protected void rehashInternalFull(final int oldSize) {
             final int firstDestinationTableLocation = hashToTableLocation(hash);
             int destinationTableLocation = firstDestinationTableLocation;
             while (true) {
-                if (destState[destinationTableLocation] == EMPTY_OUTPUT_POSITION) {
+                if (isStateEmpty(destState[destinationTableLocation])) {
                     destKeyArray0[destinationTableLocation] = k0;
                     destKeyArray1[destinationTableLocation] = k1;
                     destState[destinationTableLocation] = originalStateArray[sourceBucket];
@@ -250,7 +253,7 @@ public int findPositionForKey(Object key) {
         final int firstTableLocation = tableLocation;
         while (true) {
             final int positionValue = mainOutputPosition.getUnsafe(tableLocation);
-            if (positionValue == EMPTY_OUTPUT_POSITION) {
+            if (isStateEmpty(positionValue)) {
                 int alternateTableLocation = hashToTableLocationAlternate(hash);
                 if (alternateTableLocation >= rehashPointer) {
                     return UNKNOWN_ROW;
@@ -258,7 +261,7 @@ public int findPositionForKey(Object key) {
                 final int firstAlternateTableLocation = alternateTableLocation;
                 while (true) {
                     final int alternatePositionValue = alternateOutputPosition.getUnsafe(alternateTableLocation);
-                    if (alternatePositionValue == EMPTY_OUTPUT_POSITION) {
+                    if (isStateEmpty(alternatePositionValue)) {
                         return UNKNOWN_ROW;
                     }
                     if (eq(alternateKeySource0.getUnsafe(alternateTableLocation), k0) && eq(alternateKeySource1.getUnsafe(alternateTableLocation), k1)) {
diff --git a/engine/table/src/main/java/io/deephaven/engine/table/impl/by/typed/incopenagg/gen/IncrementalAggOpenHasherCharObject.java b/engine/table/src/main/java/io/deephaven/engine/table/impl/by/typed/incopenagg/gen/IncrementalAggOpenHasherCharObject.java
index e7710a4b0d6..c305152b11a 100644
--- a/engine/table/src/main/java/io/deephaven/engine/table/impl/by/typed/incopenagg/gen/IncrementalAggOpenHasherCharObject.java
+++ b/engine/table/src/main/java/io/deephaven/engine/table/impl/by/typed/incopenagg/gen/IncrementalAggOpenHasherCharObject.java
@@ -67,12 +67,12 @@ protected void build(RowSequence rowSequence, Chunk[] sourceKeyChunks) {
             int tableLocation = firstTableLocation;
             MAIN_SEARCH: while (true) {
                 int outputPosition = mainOutputPosition.getUnsafe(tableLocation);
-                if (outputPosition == EMPTY_OUTPUT_POSITION) {
+                if (isStateEmpty(outputPosition)) {
                     final int firstAlternateTableLocation = hashToTableLocationAlternate(hash);
                     int alternateTableLocation = firstAlternateTableLocation;
                     while (alternateTableLocation < rehashPointer) {
                         outputPosition = alternateOutputPosition.getUnsafe(alternateTableLocation);
-                        if (outputPosition == EMPTY_OUTPUT_POSITION) {
+                        if (isStateEmpty(outputPosition)) {
                             break;
                         } else if (eq(alternateKeySource0.getUnsafe(alternateTableLocation), k0) && eq(alternateKeySource1.getUnsafe(alternateTableLocation), k1)) {
                             outputPositions.set(chunkPosition, outputPosition);
@@ -113,7 +113,7 @@ protected void probe(RowSequence rowSequence, Chunk[] sourceKeyChunks) {
             boolean found = false;
             int tableLocation = firstTableLocation;
             int outputPosition;
-            while ((outputPosition = mainOutputPosition.getUnsafe(tableLocation)) != EMPTY_OUTPUT_POSITION) {
+            while (!isStateEmpty(outputPosition = mainOutputPosition.getUnsafe(tableLocation))) {
                 if (eq(mainKeySource0.getUnsafe(tableLocation), k0) && eq(mainKeySource1.getUnsafe(tableLocation), k1)) {
                     outputPositions.set(chunkPosition, outputPosition);
                     found = true;
@@ -127,7 +127,7 @@ protected void probe(RowSequence rowSequence, Chunk[] sourceKeyChunks) {
                 boolean alternateFound = false;
                 if (firstAlternateTableLocation < rehashPointer) {
                     int alternateTableLocation = firstAlternateTableLocation;
-                    while ((outputPosition = alternateOutputPosition.getUnsafe(alternateTableLocation)) != EMPTY_OUTPUT_POSITION) {
+                    while (!isStateEmpty(outputPosition = alternateOutputPosition.getUnsafe(alternateTableLocation))) {
                         if (eq(alternateKeySource0.getUnsafe(alternateTableLocation), k0) && eq(alternateKeySource1.getUnsafe(alternateTableLocation), k1)) {
                             outputPositions.set(chunkPosition, outputPosition);
                             alternateFound = true;
@@ -150,16 +150,20 @@ private static int hash(char k0, Object k1) {
         return hash;
     }
 
+    private static boolean isStateEmpty(int state) {
+        return state == EMPTY_OUTPUT_POSITION;
+    }
+
     private boolean migrateOneLocation(int locationToMigrate) {
         final int currentStateValue = alternateOutputPosition.getUnsafe(locationToMigrate);
-        if (currentStateValue == EMPTY_OUTPUT_POSITION) {
+        if (isStateEmpty(currentStateValue)) {
             return false;
         }
         final char k0 = alternateKeySource0.getUnsafe(locationToMigrate);
         final Object k1 = alternateKeySource1.getUnsafe(locationToMigrate);
         final int hash = hash(k0, k1);
         int destinationTableLocation = hashToTableLocation(hash);
-        while (mainOutputPosition.getUnsafe(destinationTableLocation) != EMPTY_OUTPUT_POSITION) {
+        while (!isStateEmpty(mainOutputPosition.getUnsafe(destinationTableLocation))) {
             destinationTableLocation = nextTableLocation(destinationTableLocation);
         }
         mainKeySource0.set(destinationTableLocation, k0);
@@ -183,8 +187,7 @@ protected int rehashInternalPartial(int entriesToRehash) {
     }
 
     @Override
-    protected void newAlternate() {
-        super.newAlternate();
+    protected void adviseNewAlternate() {
         this.mainKeySource0 = (ImmutableCharArraySource)super.mainKeySources[0];
         this.alternateKeySource0 = (ImmutableCharArraySource)super.alternateKeySources[0];
         this.mainKeySource1 = (ImmutableObjectArraySource)super.mainKeySources[1];
@@ -201,7 +204,7 @@ protected void clearAlternate() {
     @Override
     protected void migrateFront() {
         int location = 0;
-        while (migrateOneLocation(location++));
+        while (migrateOneLocation(location++) && location < alternateTableSize);
     }
 
     @Override
@@ -218,7 +221,7 @@ protected void rehashInternalFull(final int oldSize) {
         mainOutputPosition.setArray(destState);
         for (int sourceBucket = 0; sourceBucket < oldSize; ++sourceBucket) {
             final int currentStateValue = originalStateArray[sourceBucket];
-            if (currentStateValue == EMPTY_OUTPUT_POSITION) {
+            if (isStateEmpty(currentStateValue)) {
                 continue;
             }
             final char k0 = originalKeyArray0[sourceBucket];
@@ -227,7 +230,7 @@ protected void rehashInternalFull(final int oldSize) {
             final int firstDestinationTableLocation = hashToTableLocation(hash);
             int destinationTableLocation = firstDestinationTableLocation;
             while (true) {
-                if (destState[destinationTableLocation] == EMPTY_OUTPUT_POSITION) {
+                if (isStateEmpty(destState[destinationTableLocation])) {
                     destKeyArray0[destinationTableLocation] = k0;
                     destKeyArray1[destinationTableLocation] = k1;
                     destState[destinationTableLocation] = originalStateArray[sourceBucket];
@@ -250,7 +253,7 @@ public int findPositionForKey(Object key) {
         final int firstTableLocation = tableLocation;
         while (true) {
             final int positionValue = mainOutputPosition.getUnsafe(tableLocation);
-            if (positionValue == EMPTY_OUTPUT_POSITION) {
+            if (isStateEmpty(positionValue)) {
                 int alternateTableLocation = hashToTableLocationAlternate(hash);
                 if (alternateTableLocation >= rehashPointer) {
                     return UNKNOWN_ROW;
@@ -258,7 +261,7 @@ public int findPositionForKey(Object key) {
                 final int firstAlternateTableLocation = alternateTableLocation;
                 while (true) {
                     final int alternatePositionValue = alternateOutputPosition.getUnsafe(alternateTableLocation);
-                    if (alternatePositionValue == EMPTY_OUTPUT_POSITION) {
+                    if (isStateEmpty(alternatePositionValue)) {
                         return UNKNOWN_ROW;
                     }
                     if (eq(alternateKeySource0.getUnsafe(alternateTableLocation), k0) && eq(alternateKeySource1.getUnsafe(alternateTableLocation), k1)) {
diff --git a/engine/table/src/main/java/io/deephaven/engine/table/impl/by/typed/incopenagg/gen/IncrementalAggOpenHasherCharShort.java b/engine/table/src/main/java/io/deephaven/engine/table/impl/by/typed/incopenagg/gen/IncrementalAggOpenHasherCharShort.java
index b3cf032ce82..b2ca3659b25 100644
--- a/engine/table/src/main/java/io/deephaven/engine/table/impl/by/typed/incopenagg/gen/IncrementalAggOpenHasherCharShort.java
+++ b/engine/table/src/main/java/io/deephaven/engine/table/impl/by/typed/incopenagg/gen/IncrementalAggOpenHasherCharShort.java
@@ -68,12 +68,12 @@ protected void build(RowSequence rowSequence, Chunk[] sourceKeyChunks) {
             int tableLocation = firstTableLocation;
             MAIN_SEARCH: while (true) {
                 int outputPosition = mainOutputPosition.getUnsafe(tableLocation);
-                if (outputPosition == EMPTY_OUTPUT_POSITION) {
+                if (isStateEmpty(outputPosition)) {
                     final int firstAlternateTableLocation = hashToTableLocationAlternate(hash);
                     int alternateTableLocation = firstAlternateTableLocation;
                     while (alternateTableLocation < rehashPointer) {
                         outputPosition = alternateOutputPosition.getUnsafe(alternateTableLocation);
-                        if (outputPosition == EMPTY_OUTPUT_POSITION) {
+                        if (isStateEmpty(outputPosition)) {
                             break;
                         } else if (eq(alternateKeySource0.getUnsafe(alternateTableLocation), k0) && eq(alternateKeySource1.getUnsafe(alternateTableLocation), k1)) {
                             outputPositions.set(chunkPosition, outputPosition);
@@ -114,7 +114,7 @@ protected void probe(RowSequence rowSequence, Chunk[] sourceKeyChunks) {
             boolean found = false;
             int tableLocation = firstTableLocation;
             int outputPosition;
-            while ((outputPosition = mainOutputPosition.getUnsafe(tableLocation)) != EMPTY_OUTPUT_POSITION) {
+            while (!isStateEmpty(outputPosition = mainOutputPosition.getUnsafe(tableLocation))) {
                 if (eq(mainKeySource0.getUnsafe(tableLocation), k0) && eq(mainKeySource1.getUnsafe(tableLocation), k1)) {
                     outputPositions.set(chunkPosition, outputPosition);
                     found = true;
@@ -128,7 +128,7 @@ protected void probe(RowSequence rowSequence, Chunk[] sourceKeyChunks) {
                 boolean alternateFound = false;
                 if (firstAlternateTableLocation < rehashPointer) {
                     int alternateTableLocation = firstAlternateTableLocation;
-                    while ((outputPosition = alternateOutputPosition.getUnsafe(alternateTableLocation)) != EMPTY_OUTPUT_POSITION) {
+                    while (!isStateEmpty(outputPosition = alternateOutputPosition.getUnsafe(alternateTableLocation))) {
                         if (eq(alternateKeySource0.getUnsafe(alternateTableLocation), k0) && eq(alternateKeySource1.getUnsafe(alternateTableLocation), k1)) {
                             outputPositions.set(chunkPosition, outputPosition);
                             alternateFound = true;
@@ -151,16 +151,20 @@ private static int hash(char k0, short k1) {
         return hash;
     }
 
+    private static boolean isStateEmpty(int state) {
+        return state == EMPTY_OUTPUT_POSITION;
+    }
+
     private boolean migrateOneLocation(int locationToMigrate) {
         final int currentStateValue = alternateOutputPosition.getUnsafe(locationToMigrate);
-        if (currentStateValue == EMPTY_OUTPUT_POSITION) {
+        if (isStateEmpty(currentStateValue)) {
             return false;
         }
         final char k0 = alternateKeySource0.getUnsafe(locationToMigrate);
         final short k1 = alternateKeySource1.getUnsafe(locationToMigrate);
         final int hash = hash(k0, k1);
         int destinationTableLocation = hashToTableLocation(hash);
-        while (mainOutputPosition.getUnsafe(destinationTableLocation) != EMPTY_OUTPUT_POSITION) {
+        while (!isStateEmpty(mainOutputPosition.getUnsafe(destinationTableLocation))) {
             destinationTableLocation = nextTableLocation(destinationTableLocation);
         }
         mainKeySource0.set(destinationTableLocation, k0);
@@ -183,8 +187,7 @@ protected int rehashInternalPartial(int entriesToRehash) {
     }
 
     @Override
-    protected void newAlternate() {
-        super.newAlternate();
+    protected void adviseNewAlternate() {
         this.mainKeySource0 = (ImmutableCharArraySource)super.mainKeySources[0];
         this.alternateKeySource0 = (ImmutableCharArraySource)super.alternateKeySources[0];
         this.mainKeySource1 = (ImmutableShortArraySource)super.mainKeySources[1];
@@ -201,7 +204,7 @@ protected void clearAlternate() {
     @Override
     protected void migrateFront() {
         int location = 0;
-        while (migrateOneLocation(location++));
+        while (migrateOneLocation(location++) && location < alternateTableSize);
     }
 
     @Override
@@ -218,7 +221,7 @@ protected void rehashInternalFull(final int oldSize) {
         mainOutputPosition.setArray(destState);
         for (int sourceBucket = 0; sourceBucket < oldSize; ++sourceBucket) {
             final int currentStateValue = originalStateArray[sourceBucket];
-            if (currentStateValue == EMPTY_OUTPUT_POSITION) {
+            if (isStateEmpty(currentStateValue)) {
                 continue;
             }
             final char k0 = originalKeyArray0[sourceBucket];
@@ -227,7 +230,7 @@ protected void rehashInternalFull(final int oldSize) {
             final int firstDestinationTableLocation = hashToTableLocation(hash);
             int destinationTableLocation = firstDestinationTableLocation;
             while (true) {
-                if (destState[destinationTableLocation] == EMPTY_OUTPUT_POSITION) {
+                if (isStateEmpty(destState[destinationTableLocation])) {
                     destKeyArray0[destinationTableLocation] = k0;
                     destKeyArray1[destinationTableLocation] = k1;
                     destState[destinationTableLocation] = originalStateArray[sourceBucket];
@@ -250,7 +253,7 @@ public int findPositionForKey(Object key) {
         final int firstTableLocation = tableLocation;
         while (true) {
             final int positionValue = mainOutputPosition.getUnsafe(tableLocation);
-            if (positionValue == EMPTY_OUTPUT_POSITION) {
+            if (isStateEmpty(positionValue)) {
                 int alternateTableLocation = hashToTableLocationAlternate(hash);
                 if (alternateTableLocation >= rehashPointer) {
                     return UNKNOWN_ROW;
@@ -258,7 +261,7 @@ public int findPositionForKey(Object key) {
                 final int firstAlternateTableLocation = alternateTableLocation;
                 while (true) {
                     final int alternatePositionValue = alternateOutputPosition.getUnsafe(alternateTableLocation);
-                    if (alternatePositionValue == EMPTY_OUTPUT_POSITION) {
+                    if (isStateEmpty(alternatePositionValue)) {
                         return UNKNOWN_ROW;
                     }
                     if (eq(alternateKeySource0.getUnsafe(alternateTableLocation), k0) && eq(alternateKeySource1.getUnsafe(alternateTableLocation), k1)) {
diff --git a/engine/table/src/main/java/io/deephaven/engine/table/impl/by/typed/incopenagg/gen/IncrementalAggOpenHasherDouble.java b/engine/table/src/main/java/io/deephaven/engine/table/impl/by/typed/incopenagg/gen/IncrementalAggOpenHasherDouble.java
index 82416fd1852..68293caa7eb 100644
--- a/engine/table/src/main/java/io/deephaven/engine/table/impl/by/typed/incopenagg/gen/IncrementalAggOpenHasherDouble.java
+++ b/engine/table/src/main/java/io/deephaven/engine/table/impl/by/typed/incopenagg/gen/IncrementalAggOpenHasherDouble.java
@@ -55,12 +55,12 @@ protected void build(RowSequence rowSequence, Chunk[] sourceKeyChunks) {
             int tableLocation = firstTableLocation;
             MAIN_SEARCH: while (true) {
                 int outputPosition = mainOutputPosition.getUnsafe(tableLocation);
-                if (outputPosition == EMPTY_OUTPUT_POSITION) {
+                if (isStateEmpty(outputPosition)) {
                     final int firstAlternateTableLocation = hashToTableLocationAlternate(hash);
                     int alternateTableLocation = firstAlternateTableLocation;
                     while (alternateTableLocation < rehashPointer) {
                         outputPosition = alternateOutputPosition.getUnsafe(alternateTableLocation);
-                        if (outputPosition == EMPTY_OUTPUT_POSITION) {
+                        if (isStateEmpty(outputPosition)) {
                             break;
                         } else if (eq(alternateKeySource0.getUnsafe(alternateTableLocation), k0)) {
                             outputPositions.set(chunkPosition, outputPosition);
@@ -98,7 +98,7 @@ protected void probe(RowSequence rowSequence, Chunk[] sourceKeyChunks) {
             boolean found = false;
             int tableLocation = firstTableLocation;
             int outputPosition;
-            while ((outputPosition = mainOutputPosition.getUnsafe(tableLocation)) != EMPTY_OUTPUT_POSITION) {
+            while (!isStateEmpty(outputPosition = mainOutputPosition.getUnsafe(tableLocation))) {
                 if (eq(mainKeySource0.getUnsafe(tableLocation), k0)) {
                     outputPositions.set(chunkPosition, outputPosition);
                     found = true;
@@ -112,7 +112,7 @@ protected void probe(RowSequence rowSequence, Chunk[] sourceKeyChunks) {
                 boolean alternateFound = false;
                 if (firstAlternateTableLocation < rehashPointer) {
                     int alternateTableLocation = firstAlternateTableLocation;
-                    while ((outputPosition = alternateOutputPosition.getUnsafe(alternateTableLocation)) != EMPTY_OUTPUT_POSITION) {
+                    while (!isStateEmpty(outputPosition = alternateOutputPosition.getUnsafe(alternateTableLocation))) {
                         if (eq(alternateKeySource0.getUnsafe(alternateTableLocation), k0)) {
                             outputPositions.set(chunkPosition, outputPosition);
                             alternateFound = true;
@@ -134,15 +134,19 @@ private static int hash(double k0) {
         return hash;
     }
 
+    private static boolean isStateEmpty(int state) {
+        return state == EMPTY_OUTPUT_POSITION;
+    }
+
     private boolean migrateOneLocation(int locationToMigrate) {
         final int currentStateValue = alternateOutputPosition.getUnsafe(locationToMigrate);
-        if (currentStateValue == EMPTY_OUTPUT_POSITION) {
+        if (isStateEmpty(currentStateValue)) {
             return false;
         }
         final double k0 = alternateKeySource0.getUnsafe(locationToMigrate);
         final int hash = hash(k0);
         int destinationTableLocation = hashToTableLocation(hash);
-        while (mainOutputPosition.getUnsafe(destinationTableLocation) != EMPTY_OUTPUT_POSITION) {
+        while (!isStateEmpty(mainOutputPosition.getUnsafe(destinationTableLocation))) {
             destinationTableLocation = nextTableLocation(destinationTableLocation);
         }
         mainKeySource0.set(destinationTableLocation, k0);
@@ -164,8 +168,7 @@ protected int rehashInternalPartial(int entriesToRehash) {
     }
 
     @Override
-    protected void newAlternate() {
-        super.newAlternate();
+    protected void adviseNewAlternate() {
         this.mainKeySource0 = (ImmutableDoubleArraySource)super.mainKeySources[0];
         this.alternateKeySource0 = (ImmutableDoubleArraySource)super.alternateKeySources[0];
     }
@@ -179,7 +182,7 @@ protected void clearAlternate() {
     @Override
     protected void migrateFront() {
         int location = 0;
-        while (migrateOneLocation(location++));
+        while (migrateOneLocation(location++) && location < alternateTableSize);
     }
 
     @Override
@@ -193,7 +196,7 @@ protected void rehashInternalFull(final int oldSize) {
         mainOutputPosition.setArray(destState);
         for (int sourceBucket = 0; sourceBucket < oldSize; ++sourceBucket) {
             final int currentStateValue = originalStateArray[sourceBucket];
-            if (currentStateValue == EMPTY_OUTPUT_POSITION) {
+            if (isStateEmpty(currentStateValue)) {
                 continue;
             }
             final double k0 = originalKeyArray0[sourceBucket];
@@ -201,7 +204,7 @@ protected void rehashInternalFull(final int oldSize) {
             final int firstDestinationTableLocation = hashToTableLocation(hash);
             int destinationTableLocation = firstDestinationTableLocation;
             while (true) {
-                if (destState[destinationTableLocation] == EMPTY_OUTPUT_POSITION) {
+                if (isStateEmpty(destState[destinationTableLocation])) {
                     destKeyArray0[destinationTableLocation] = k0;
                     destState[destinationTableLocation] = originalStateArray[sourceBucket];
                     outputPositionToHashSlot.set(currentStateValue, mainInsertMask | destinationTableLocation);
@@ -221,7 +224,7 @@ public int findPositionForKey(Object key) {
         final int firstTableLocation = tableLocation;
         while (true) {
             final int positionValue = mainOutputPosition.getUnsafe(tableLocation);
-            if (positionValue == EMPTY_OUTPUT_POSITION) {
+            if (isStateEmpty(positionValue)) {
                 int alternateTableLocation = hashToTableLocationAlternate(hash);
                 if (alternateTableLocation >= rehashPointer) {
                     return UNKNOWN_ROW;
@@ -229,7 +232,7 @@ public int findPositionForKey(Object key) {
                 final int firstAlternateTableLocation = alternateTableLocation;
                 while (true) {
                     final int alternatePositionValue = alternateOutputPosition.getUnsafe(alternateTableLocation);
-                    if (alternatePositionValue == EMPTY_OUTPUT_POSITION) {
+                    if (isStateEmpty(alternatePositionValue)) {
                         return UNKNOWN_ROW;
                     }
                     if (eq(alternateKeySource0.getUnsafe(alternateTableLocation), k0)) {
diff --git a/engine/table/src/main/java/io/deephaven/engine/table/impl/by/typed/incopenagg/gen/IncrementalAggOpenHasherDoubleByte.java b/engine/table/src/main/java/io/deephaven/engine/table/impl/by/typed/incopenagg/gen/IncrementalAggOpenHasherDoubleByte.java
index 769b6150595..94671f2672d 100644
--- a/engine/table/src/main/java/io/deephaven/engine/table/impl/by/typed/incopenagg/gen/IncrementalAggOpenHasherDoubleByte.java
+++ b/engine/table/src/main/java/io/deephaven/engine/table/impl/by/typed/incopenagg/gen/IncrementalAggOpenHasherDoubleByte.java
@@ -68,12 +68,12 @@ protected void build(RowSequence rowSequence, Chunk[] sourceKeyChunks) {
             int tableLocation = firstTableLocation;
             MAIN_SEARCH: while (true) {
                 int outputPosition = mainOutputPosition.getUnsafe(tableLocation);
-                if (outputPosition == EMPTY_OUTPUT_POSITION) {
+                if (isStateEmpty(outputPosition)) {
                     final int firstAlternateTableLocation = hashToTableLocationAlternate(hash);
                     int alternateTableLocation = firstAlternateTableLocation;
                     while (alternateTableLocation < rehashPointer) {
                         outputPosition = alternateOutputPosition.getUnsafe(alternateTableLocation);
-                        if (outputPosition == EMPTY_OUTPUT_POSITION) {
+                        if (isStateEmpty(outputPosition)) {
                             break;
                         } else if (eq(alternateKeySource0.getUnsafe(alternateTableLocation), k0) && eq(alternateKeySource1.getUnsafe(alternateTableLocation), k1)) {
                             outputPositions.set(chunkPosition, outputPosition);
@@ -114,7 +114,7 @@ protected void probe(RowSequence rowSequence, Chunk[] sourceKeyChunks) {
             boolean found = false;
             int tableLocation = firstTableLocation;
             int outputPosition;
-            while ((outputPosition = mainOutputPosition.getUnsafe(tableLocation)) != EMPTY_OUTPUT_POSITION) {
+            while (!isStateEmpty(outputPosition = mainOutputPosition.getUnsafe(tableLocation))) {
                 if (eq(mainKeySource0.getUnsafe(tableLocation), k0) && eq(mainKeySource1.getUnsafe(tableLocation), k1)) {
                     outputPositions.set(chunkPosition, outputPosition);
                     found = true;
@@ -128,7 +128,7 @@ protected void probe(RowSequence rowSequence, Chunk[] sourceKeyChunks) {
                 boolean alternateFound = false;
                 if (firstAlternateTableLocation < rehashPointer) {
                     int alternateTableLocation = firstAlternateTableLocation;
-                    while ((outputPosition = alternateOutputPosition.getUnsafe(alternateTableLocation)) != EMPTY_OUTPUT_POSITION) {
+                    while (!isStateEmpty(outputPosition = alternateOutputPosition.getUnsafe(alternateTableLocation))) {
                         if (eq(alternateKeySource0.getUnsafe(alternateTableLocation), k0) && eq(alternateKeySource1.getUnsafe(alternateTableLocation), k1)) {
                             outputPositions.set(chunkPosition, outputPosition);
                             alternateFound = true;
@@ -151,16 +151,20 @@ private static int hash(double k0, byte k1) {
         return hash;
     }
 
+    private static boolean isStateEmpty(int state) {
+        return state == EMPTY_OUTPUT_POSITION;
+    }
+
     private boolean migrateOneLocation(int locationToMigrate) {
         final int currentStateValue = alternateOutputPosition.getUnsafe(locationToMigrate);
-        if (currentStateValue == EMPTY_OUTPUT_POSITION) {
+        if (isStateEmpty(currentStateValue)) {
             return false;
         }
         final double k0 = alternateKeySource0.getUnsafe(locationToMigrate);
         final byte k1 = alternateKeySource1.getUnsafe(locationToMigrate);
         final int hash = hash(k0, k1);
         int destinationTableLocation = hashToTableLocation(hash);
-        while (mainOutputPosition.getUnsafe(destinationTableLocation) != EMPTY_OUTPUT_POSITION) {
+        while (!isStateEmpty(mainOutputPosition.getUnsafe(destinationTableLocation))) {
             destinationTableLocation = nextTableLocation(destinationTableLocation);
         }
         mainKeySource0.set(destinationTableLocation, k0);
@@ -183,8 +187,7 @@ protected int rehashInternalPartial(int entriesToRehash) {
     }
 
     @Override
-    protected void newAlternate() {
-        super.newAlternate();
+    protected void adviseNewAlternate() {
         this.mainKeySource0 = (ImmutableDoubleArraySource)super.mainKeySources[0];
         this.alternateKeySource0 = (ImmutableDoubleArraySource)super.alternateKeySources[0];
         this.mainKeySource1 = (ImmutableByteArraySource)super.mainKeySources[1];
@@ -201,7 +204,7 @@ protected void clearAlternate() {
     @Override
     protected void migrateFront() {
         int location = 0;
-        while (migrateOneLocation(location++));
+        while (migrateOneLocation(location++) && location < alternateTableSize);
     }
 
     @Override
@@ -218,7 +221,7 @@ protected void rehashInternalFull(final int oldSize) {
         mainOutputPosition.setArray(destState);
         for (int sourceBucket = 0; sourceBucket < oldSize; ++sourceBucket) {
             final int currentStateValue = originalStateArray[sourceBucket];
-            if (currentStateValue == EMPTY_OUTPUT_POSITION) {
+            if (isStateEmpty(currentStateValue)) {
                 continue;
             }
             final double k0 = originalKeyArray0[sourceBucket];
@@ -227,7 +230,7 @@ protected void rehashInternalFull(final int oldSize) {
             final int firstDestinationTableLocation = hashToTableLocation(hash);
             int destinationTableLocation = firstDestinationTableLocation;
             while (true) {
-                if (destState[destinationTableLocation] == EMPTY_OUTPUT_POSITION) {
+                if (isStateEmpty(destState[destinationTableLocation])) {
                     destKeyArray0[destinationTableLocation] = k0;
                     destKeyArray1[destinationTableLocation] = k1;
                     destState[destinationTableLocation] = originalStateArray[sourceBucket];
@@ -250,7 +253,7 @@ public int findPositionForKey(Object key) {
         final int firstTableLocation = tableLocation;
         while (true) {
             final int positionValue = mainOutputPosition.getUnsafe(tableLocation);
-            if (positionValue == EMPTY_OUTPUT_POSITION) {
+            if (isStateEmpty(positionValue)) {
                 int alternateTableLocation = hashToTableLocationAlternate(hash);
                 if (alternateTableLocation >= rehashPointer) {
                     return UNKNOWN_ROW;
@@ -258,7 +261,7 @@ public int findPositionForKey(Object key) {
                 final int firstAlternateTableLocation = alternateTableLocation;
                 while (true) {
                     final int alternatePositionValue = alternateOutputPosition.getUnsafe(alternateTableLocation);
-                    if (alternatePositionValue == EMPTY_OUTPUT_POSITION) {
+                    if (isStateEmpty(alternatePositionValue)) {
                         return UNKNOWN_ROW;
                     }
                     if (eq(alternateKeySource0.getUnsafe(alternateTableLocation), k0) && eq(alternateKeySource1.getUnsafe(alternateTableLocation), k1)) {
diff --git a/engine/table/src/main/java/io/deephaven/engine/table/impl/by/typed/incopenagg/gen/IncrementalAggOpenHasherDoubleChar.java b/engine/table/src/main/java/io/deephaven/engine/table/impl/by/typed/incopenagg/gen/IncrementalAggOpenHasherDoubleChar.java
index 12a0ac3860b..28fb07e6d57 100644
--- a/engine/table/src/main/java/io/deephaven/engine/table/impl/by/typed/incopenagg/gen/IncrementalAggOpenHasherDoubleChar.java
+++ b/engine/table/src/main/java/io/deephaven/engine/table/impl/by/typed/incopenagg/gen/IncrementalAggOpenHasherDoubleChar.java
@@ -68,12 +68,12 @@ protected void build(RowSequence rowSequence, Chunk[] sourceKeyChunks) {
             int tableLocation = firstTableLocation;
             MAIN_SEARCH: while (true) {
                 int outputPosition = mainOutputPosition.getUnsafe(tableLocation);
-                if (outputPosition == EMPTY_OUTPUT_POSITION) {
+                if (isStateEmpty(outputPosition)) {
                     final int firstAlternateTableLocation = hashToTableLocationAlternate(hash);
                     int alternateTableLocation = firstAlternateTableLocation;
                     while (alternateTableLocation < rehashPointer) {
                         outputPosition = alternateOutputPosition.getUnsafe(alternateTableLocation);
-                        if (outputPosition == EMPTY_OUTPUT_POSITION) {
+                        if (isStateEmpty(outputPosition)) {
                             break;
                         } else if (eq(alternateKeySource0.getUnsafe(alternateTableLocation), k0) && eq(alternateKeySource1.getUnsafe(alternateTableLocation), k1)) {
                             outputPositions.set(chunkPosition, outputPosition);
@@ -114,7 +114,7 @@ protected void probe(RowSequence rowSequence, Chunk[] sourceKeyChunks) {
             boolean found = false;
             int tableLocation = firstTableLocation;
             int outputPosition;
-            while ((outputPosition = mainOutputPosition.getUnsafe(tableLocation)) != EMPTY_OUTPUT_POSITION) {
+            while (!isStateEmpty(outputPosition = mainOutputPosition.getUnsafe(tableLocation))) {
                 if (eq(mainKeySource0.getUnsafe(tableLocation), k0) && eq(mainKeySource1.getUnsafe(tableLocation), k1)) {
                     outputPositions.set(chunkPosition, outputPosition);
                     found = true;
@@ -128,7 +128,7 @@ protected void probe(RowSequence rowSequence, Chunk[] sourceKeyChunks) {
                 boolean alternateFound = false;
                 if (firstAlternateTableLocation < rehashPointer) {
                     int alternateTableLocation = firstAlternateTableLocation;
-                    while ((outputPosition = alternateOutputPosition.getUnsafe(alternateTableLocation)) != EMPTY_OUTPUT_POSITION) {
+                    while (!isStateEmpty(outputPosition = alternateOutputPosition.getUnsafe(alternateTableLocation))) {
                         if (eq(alternateKeySource0.getUnsafe(alternateTableLocation), k0) && eq(alternateKeySource1.getUnsafe(alternateTableLocation), k1)) {
                             outputPositions.set(chunkPosition, outputPosition);
                             alternateFound = true;
@@ -151,16 +151,20 @@ private static int hash(double k0, char k1) {
         return hash;
     }
 
+    private static boolean isStateEmpty(int state) {
+        return state == EMPTY_OUTPUT_POSITION;
+    }
+
     private boolean migrateOneLocation(int locationToMigrate) {
         final int currentStateValue = alternateOutputPosition.getUnsafe(locationToMigrate);
-        if (currentStateValue == EMPTY_OUTPUT_POSITION) {
+        if (isStateEmpty(currentStateValue)) {
             return false;
         }
         final double k0 = alternateKeySource0.getUnsafe(locationToMigrate);
         final char k1 = alternateKeySource1.getUnsafe(locationToMigrate);
         final int hash = hash(k0, k1);
         int destinationTableLocation = hashToTableLocation(hash);
-        while (mainOutputPosition.getUnsafe(destinationTableLocation) != EMPTY_OUTPUT_POSITION) {
+        while (!isStateEmpty(mainOutputPosition.getUnsafe(destinationTableLocation))) {
             destinationTableLocation = nextTableLocation(destinationTableLocation);
         }
         mainKeySource0.set(destinationTableLocation, k0);
@@ -183,8 +187,7 @@ protected int rehashInternalPartial(int entriesToRehash) {
     }
 
     @Override
-    protected void newAlternate() {
-        super.newAlternate();
+    protected void adviseNewAlternate() {
         this.mainKeySource0 = (ImmutableDoubleArraySource)super.mainKeySources[0];
         this.alternateKeySource0 = (ImmutableDoubleArraySource)super.alternateKeySources[0];
         this.mainKeySource1 = (ImmutableCharArraySource)super.mainKeySources[1];
@@ -201,7 +204,7 @@ protected void clearAlternate() {
     @Override
     protected void migrateFront() {
         int location = 0;
-        while (migrateOneLocation(location++));
+        while (migrateOneLocation(location++) && location < alternateTableSize);
     }
 
     @Override
@@ -218,7 +221,7 @@ protected void rehashInternalFull(final int oldSize) {
         mainOutputPosition.setArray(destState);
         for (int sourceBucket = 0; sourceBucket < oldSize; ++sourceBucket) {
             final int currentStateValue = originalStateArray[sourceBucket];
-            if (currentStateValue == EMPTY_OUTPUT_POSITION) {
+            if (isStateEmpty(currentStateValue)) {
                 continue;
             }
             final double k0 = originalKeyArray0[sourceBucket];
@@ -227,7 +230,7 @@ protected void rehashInternalFull(final int oldSize) {
             final int firstDestinationTableLocation = hashToTableLocation(hash);
             int destinationTableLocation = firstDestinationTableLocation;
             while (true) {
-                if (destState[destinationTableLocation] == EMPTY_OUTPUT_POSITION) {
+                if (isStateEmpty(destState[destinationTableLocation])) {
                     destKeyArray0[destinationTableLocation] = k0;
                     destKeyArray1[destinationTableLocation] = k1;
                     destState[destinationTableLocation] = originalStateArray[sourceBucket];
@@ -250,7 +253,7 @@ public int findPositionForKey(Object key) {
         final int firstTableLocation = tableLocation;
         while (true) {
             final int positionValue = mainOutputPosition.getUnsafe(tableLocation);
-            if (positionValue == EMPTY_OUTPUT_POSITION) {
+            if (isStateEmpty(positionValue)) {
                 int alternateTableLocation = hashToTableLocationAlternate(hash);
                 if (alternateTableLocation >= rehashPointer) {
                     return UNKNOWN_ROW;
@@ -258,7 +261,7 @@ public int findPositionForKey(Object key) {
                 final int firstAlternateTableLocation = alternateTableLocation;
                 while (true) {
                     final int alternatePositionValue = alternateOutputPosition.getUnsafe(alternateTableLocation);
-                    if (alternatePositionValue == EMPTY_OUTPUT_POSITION) {
+                    if (isStateEmpty(alternatePositionValue)) {
                         return UNKNOWN_ROW;
                     }
                     if (eq(alternateKeySource0.getUnsafe(alternateTableLocation), k0) && eq(alternateKeySource1.getUnsafe(alternateTableLocation), k1)) {
diff --git a/engine/table/src/main/java/io/deephaven/engine/table/impl/by/typed/incopenagg/gen/IncrementalAggOpenHasherDoubleDouble.java b/engine/table/src/main/java/io/deephaven/engine/table/impl/by/typed/incopenagg/gen/IncrementalAggOpenHasherDoubleDouble.java
index 2df6f8839d3..85483ebaae5 100644
--- a/engine/table/src/main/java/io/deephaven/engine/table/impl/by/typed/incopenagg/gen/IncrementalAggOpenHasherDoubleDouble.java
+++ b/engine/table/src/main/java/io/deephaven/engine/table/impl/by/typed/incopenagg/gen/IncrementalAggOpenHasherDoubleDouble.java
@@ -63,12 +63,12 @@ protected void build(RowSequence rowSequence, Chunk[] sourceKeyChunks) {
             int tableLocation = firstTableLocation;
             MAIN_SEARCH: while (true) {
                 int outputPosition = mainOutputPosition.getUnsafe(tableLocation);
-                if (outputPosition == EMPTY_OUTPUT_POSITION) {
+                if (isStateEmpty(outputPosition)) {
                     final int firstAlternateTableLocation = hashToTableLocationAlternate(hash);
                     int alternateTableLocation = firstAlternateTableLocation;
                     while (alternateTableLocation < rehashPointer) {
                         outputPosition = alternateOutputPosition.getUnsafe(alternateTableLocation);
-                        if (outputPosition == EMPTY_OUTPUT_POSITION) {
+                        if (isStateEmpty(outputPosition)) {
                             break;
                         } else if (eq(alternateKeySource0.getUnsafe(alternateTableLocation), k0) && eq(alternateKeySource1.getUnsafe(alternateTableLocation), k1)) {
                             outputPositions.set(chunkPosition, outputPosition);
@@ -109,7 +109,7 @@ protected void probe(RowSequence rowSequence, Chunk[] sourceKeyChunks) {
             boolean found = false;
             int tableLocation = firstTableLocation;
             int outputPosition;
-            while ((outputPosition = mainOutputPosition.getUnsafe(tableLocation)) != EMPTY_OUTPUT_POSITION) {
+            while (!isStateEmpty(outputPosition = mainOutputPosition.getUnsafe(tableLocation))) {
                 if (eq(mainKeySource0.getUnsafe(tableLocation), k0) && eq(mainKeySource1.getUnsafe(tableLocation), k1)) {
                     outputPositions.set(chunkPosition, outputPosition);
                     found = true;
@@ -123,7 +123,7 @@ protected void probe(RowSequence rowSequence, Chunk[] sourceKeyChunks) {
                 boolean alternateFound = false;
                 if (firstAlternateTableLocation < rehashPointer) {
                     int alternateTableLocation = firstAlternateTableLocation;
-                    while ((outputPosition = alternateOutputPosition.getUnsafe(alternateTableLocation)) != EMPTY_OUTPUT_POSITION) {
+                    while (!isStateEmpty(outputPosition = alternateOutputPosition.getUnsafe(alternateTableLocation))) {
                         if (eq(alternateKeySource0.getUnsafe(alternateTableLocation), k0) && eq(alternateKeySource1.getUnsafe(alternateTableLocation), k1)) {
                             outputPositions.set(chunkPosition, outputPosition);
                             alternateFound = true;
@@ -146,16 +146,20 @@ private static int hash(double k0, double k1) {
         return hash;
     }
 
+    private static boolean isStateEmpty(int state) {
+        return state == EMPTY_OUTPUT_POSITION;
+    }
+
     private boolean migrateOneLocation(int locationToMigrate) {
         final int currentStateValue = alternateOutputPosition.getUnsafe(locationToMigrate);
-        if (currentStateValue == EMPTY_OUTPUT_POSITION) {
+        if (isStateEmpty(currentStateValue)) {
             return false;
         }
         final double k0 = alternateKeySource0.getUnsafe(locationToMigrate);
         final double k1 = alternateKeySource1.getUnsafe(locationToMigrate);
         final int hash = hash(k0, k1);
         int destinationTableLocation = hashToTableLocation(hash);
-        while (mainOutputPosition.getUnsafe(destinationTableLocation) != EMPTY_OUTPUT_POSITION) {
+        while (!isStateEmpty(mainOutputPosition.getUnsafe(destinationTableLocation))) {
             destinationTableLocation = nextTableLocation(destinationTableLocation);
         }
         mainKeySource0.set(destinationTableLocation, k0);
@@ -178,8 +182,7 @@ protected int rehashInternalPartial(int entriesToRehash) {
     }
 
     @Override
-    protected void newAlternate() {
-        super.newAlternate();
+    protected void adviseNewAlternate() {
         this.mainKeySource0 = (ImmutableDoubleArraySource)super.mainKeySources[0];
         this.alternateKeySource0 = (ImmutableDoubleArraySource)super.alternateKeySources[0];
         this.mainKeySource1 = (ImmutableDoubleArraySource)super.mainKeySources[1];
@@ -196,7 +199,7 @@ protected void clearAlternate() {
     @Override
     protected void migrateFront() {
         int location = 0;
-        while (migrateOneLocation(location++));
+        while (migrateOneLocation(location++) && location < alternateTableSize);
     }
 
     @Override
@@ -213,7 +216,7 @@ protected void rehashInternalFull(final int oldSize) {
         mainOutputPosition.setArray(destState);
         for (int sourceBucket = 0; sourceBucket < oldSize; ++sourceBucket) {
             final int currentStateValue = originalStateArray[sourceBucket];
-            if (currentStateValue == EMPTY_OUTPUT_POSITION) {
+            if (isStateEmpty(currentStateValue)) {
                 continue;
             }
             final double k0 = originalKeyArray0[sourceBucket];
@@ -222,7 +225,7 @@ protected void rehashInternalFull(final int oldSize) {
             final int firstDestinationTableLocation = hashToTableLocation(hash);
             int destinationTableLocation = firstDestinationTableLocation;
             while (true) {
-                if (destState[destinationTableLocation] == EMPTY_OUTPUT_POSITION) {
+                if (isStateEmpty(destState[destinationTableLocation])) {
                     destKeyArray0[destinationTableLocation] = k0;
                     destKeyArray1[destinationTableLocation] = k1;
                     destState[destinationTableLocation] = originalStateArray[sourceBucket];
@@ -245,7 +248,7 @@ public int findPositionForKey(Object key) {
         final int firstTableLocation = tableLocation;
         while (true) {
             final int positionValue = mainOutputPosition.getUnsafe(tableLocation);
-            if (positionValue == EMPTY_OUTPUT_POSITION) {
+            if (isStateEmpty(positionValue)) {
                 int alternateTableLocation = hashToTableLocationAlternate(hash);
                 if (alternateTableLocation >= rehashPointer) {
                     return UNKNOWN_ROW;
@@ -253,7 +256,7 @@ public int findPositionForKey(Object key) {
                 final int firstAlternateTableLocation = alternateTableLocation;
                 while (true) {
                     final int alternatePositionValue = alternateOutputPosition.getUnsafe(alternateTableLocation);
-                    if (alternatePositionValue == EMPTY_OUTPUT_POSITION) {
+                    if (isStateEmpty(alternatePositionValue)) {
                         return UNKNOWN_ROW;
                     }
                     if (eq(alternateKeySource0.getUnsafe(alternateTableLocation), k0) && eq(alternateKeySource1.getUnsafe(alternateTableLocation), k1)) {
diff --git a/engine/table/src/main/java/io/deephaven/engine/table/impl/by/typed/incopenagg/gen/IncrementalAggOpenHasherDoubleFloat.java b/engine/table/src/main/java/io/deephaven/engine/table/impl/by/typed/incopenagg/gen/IncrementalAggOpenHasherDoubleFloat.java
index c02187b1102..4d15d167f9f 100644
--- a/engine/table/src/main/java/io/deephaven/engine/table/impl/by/typed/incopenagg/gen/IncrementalAggOpenHasherDoubleFloat.java
+++ b/engine/table/src/main/java/io/deephaven/engine/table/impl/by/typed/incopenagg/gen/IncrementalAggOpenHasherDoubleFloat.java
@@ -68,12 +68,12 @@ protected void build(RowSequence rowSequence, Chunk[] sourceKeyChunks) {
             int tableLocation = firstTableLocation;
             MAIN_SEARCH: while (true) {
                 int outputPosition = mainOutputPosition.getUnsafe(tableLocation);
-                if (outputPosition == EMPTY_OUTPUT_POSITION) {
+                if (isStateEmpty(outputPosition)) {
                     final int firstAlternateTableLocation = hashToTableLocationAlternate(hash);
                     int alternateTableLocation = firstAlternateTableLocation;
                     while (alternateTableLocation < rehashPointer) {
                         outputPosition = alternateOutputPosition.getUnsafe(alternateTableLocation);
-                        if (outputPosition == EMPTY_OUTPUT_POSITION) {
+                        if (isStateEmpty(outputPosition)) {
                             break;
                         } else if (eq(alternateKeySource0.getUnsafe(alternateTableLocation), k0) && eq(alternateKeySource1.getUnsafe(alternateTableLocation), k1)) {
                             outputPositions.set(chunkPosition, outputPosition);
@@ -114,7 +114,7 @@ protected void probe(RowSequence rowSequence, Chunk[] sourceKeyChunks) {
             boolean found = false;
             int tableLocation = firstTableLocation;
             int outputPosition;
-            while ((outputPosition = mainOutputPosition.getUnsafe(tableLocation)) != EMPTY_OUTPUT_POSITION) {
+            while (!isStateEmpty(outputPosition = mainOutputPosition.getUnsafe(tableLocation))) {
                 if (eq(mainKeySource0.getUnsafe(tableLocation), k0) && eq(mainKeySource1.getUnsafe(tableLocation), k1)) {
                     outputPositions.set(chunkPosition, outputPosition);
                     found = true;
@@ -128,7 +128,7 @@ protected void probe(RowSequence rowSequence, Chunk[] sourceKeyChunks) {
                 boolean alternateFound = false;
                 if (firstAlternateTableLocation < rehashPointer) {
                     int alternateTableLocation = firstAlternateTableLocation;
-                    while ((outputPosition = alternateOutputPosition.getUnsafe(alternateTableLocation)) != EMPTY_OUTPUT_POSITION) {
+                    while (!isStateEmpty(outputPosition = alternateOutputPosition.getUnsafe(alternateTableLocation))) {
                         if (eq(alternateKeySource0.getUnsafe(alternateTableLocation), k0) && eq(alternateKeySource1.getUnsafe(alternateTableLocation), k1)) {
                             outputPositions.set(chunkPosition, outputPosition);
                             alternateFound = true;
@@ -151,16 +151,20 @@ private static int hash(double k0, float k1) {
         return hash;
     }
 
+    private static boolean isStateEmpty(int state) {
+        return state == EMPTY_OUTPUT_POSITION;
+    }
+
     private boolean migrateOneLocation(int locationToMigrate) {
         final int currentStateValue = alternateOutputPosition.getUnsafe(locationToMigrate);
-        if (currentStateValue == EMPTY_OUTPUT_POSITION) {
+        if (isStateEmpty(currentStateValue)) {
             return false;
         }
         final double k0 = alternateKeySource0.getUnsafe(locationToMigrate);
         final float k1 = alternateKeySource1.getUnsafe(locationToMigrate);
         final int hash = hash(k0, k1);
         int destinationTableLocation = hashToTableLocation(hash);
-        while (mainOutputPosition.getUnsafe(destinationTableLocation) != EMPTY_OUTPUT_POSITION) {
+        while (!isStateEmpty(mainOutputPosition.getUnsafe(destinationTableLocation))) {
             destinationTableLocation = nextTableLocation(destinationTableLocation);
         }
         mainKeySource0.set(destinationTableLocation, k0);
@@ -183,8 +187,7 @@ protected int rehashInternalPartial(int entriesToRehash) {
     }
 
     @Override
-    protected void newAlternate() {
-        super.newAlternate();
+    protected void adviseNewAlternate() {
         this.mainKeySource0 = (ImmutableDoubleArraySource)super.mainKeySources[0];
         this.alternateKeySource0 = (ImmutableDoubleArraySource)super.alternateKeySources[0];
         this.mainKeySource1 = (ImmutableFloatArraySource)super.mainKeySources[1];
@@ -201,7 +204,7 @@ protected void clearAlternate() {
     @Override
     protected void migrateFront() {
         int location = 0;
-        while (migrateOneLocation(location++));
+        while (migrateOneLocation(location++) && location < alternateTableSize);
     }
 
     @Override
@@ -218,7 +221,7 @@ protected void rehashInternalFull(final int oldSize) {
         mainOutputPosition.setArray(destState);
         for (int sourceBucket = 0; sourceBucket < oldSize; ++sourceBucket) {
             final int currentStateValue = originalStateArray[sourceBucket];
-            if (currentStateValue == EMPTY_OUTPUT_POSITION) {
+            if (isStateEmpty(currentStateValue)) {
                 continue;
             }
             final double k0 = originalKeyArray0[sourceBucket];
@@ -227,7 +230,7 @@ protected void rehashInternalFull(final int oldSize) {
             final int firstDestinationTableLocation = hashToTableLocation(hash);
             int destinationTableLocation = firstDestinationTableLocation;
             while (true) {
-                if (destState[destinationTableLocation] == EMPTY_OUTPUT_POSITION) {
+                if (isStateEmpty(destState[destinationTableLocation])) {
                     destKeyArray0[destinationTableLocation] = k0;
                     destKeyArray1[destinationTableLocation] = k1;
                     destState[destinationTableLocation] = originalStateArray[sourceBucket];
@@ -250,7 +253,7 @@ public int findPositionForKey(Object key) {
         final int firstTableLocation = tableLocation;
         while (true) {
             final int positionValue = mainOutputPosition.getUnsafe(tableLocation);
-            if (positionValue == EMPTY_OUTPUT_POSITION) {
+            if (isStateEmpty(positionValue)) {
                 int alternateTableLocation = hashToTableLocationAlternate(hash);
                 if (alternateTableLocation >= rehashPointer) {
                     return UNKNOWN_ROW;
@@ -258,7 +261,7 @@ public int findPositionForKey(Object key) {
                 final int firstAlternateTableLocation = alternateTableLocation;
                 while (true) {
                     final int alternatePositionValue = alternateOutputPosition.getUnsafe(alternateTableLocation);
-                    if (alternatePositionValue == EMPTY_OUTPUT_POSITION) {
+                    if (isStateEmpty(alternatePositionValue)) {
                         return UNKNOWN_ROW;
                     }
                     if (eq(alternateKeySource0.getUnsafe(alternateTableLocation), k0) && eq(alternateKeySource1.getUnsafe(alternateTableLocation), k1)) {
diff --git a/engine/table/src/main/java/io/deephaven/engine/table/impl/by/typed/incopenagg/gen/IncrementalAggOpenHasherDoubleInt.java b/engine/table/src/main/java/io/deephaven/engine/table/impl/by/typed/incopenagg/gen/IncrementalAggOpenHasherDoubleInt.java
index 1561e34009f..f0670065578 100644
--- a/engine/table/src/main/java/io/deephaven/engine/table/impl/by/typed/incopenagg/gen/IncrementalAggOpenHasherDoubleInt.java
+++ b/engine/table/src/main/java/io/deephaven/engine/table/impl/by/typed/incopenagg/gen/IncrementalAggOpenHasherDoubleInt.java
@@ -68,12 +68,12 @@ protected void build(RowSequence rowSequence, Chunk[] sourceKeyChunks) {
             int tableLocation = firstTableLocation;
             MAIN_SEARCH: while (true) {
                 int outputPosition = mainOutputPosition.getUnsafe(tableLocation);
-                if (outputPosition == EMPTY_OUTPUT_POSITION) {
+                if (isStateEmpty(outputPosition)) {
                     final int firstAlternateTableLocation = hashToTableLocationAlternate(hash);
                     int alternateTableLocation = firstAlternateTableLocation;
                     while (alternateTableLocation < rehashPointer) {
                         outputPosition = alternateOutputPosition.getUnsafe(alternateTableLocation);
-                        if (outputPosition == EMPTY_OUTPUT_POSITION) {
+                        if (isStateEmpty(outputPosition)) {
                             break;
                         } else if (eq(alternateKeySource0.getUnsafe(alternateTableLocation), k0) && eq(alternateKeySource1.getUnsafe(alternateTableLocation), k1)) {
                             outputPositions.set(chunkPosition, outputPosition);
@@ -114,7 +114,7 @@ protected void probe(RowSequence rowSequence, Chunk[] sourceKeyChunks) {
             boolean found = false;
             int tableLocation = firstTableLocation;
             int outputPosition;
-            while ((outputPosition = mainOutputPosition.getUnsafe(tableLocation)) != EMPTY_OUTPUT_POSITION) {
+            while (!isStateEmpty(outputPosition = mainOutputPosition.getUnsafe(tableLocation))) {
                 if (eq(mainKeySource0.getUnsafe(tableLocation), k0) && eq(mainKeySource1.getUnsafe(tableLocation), k1)) {
                     outputPositions.set(chunkPosition, outputPosition);
                     found = true;
@@ -128,7 +128,7 @@ protected void probe(RowSequence rowSequence, Chunk[] sourceKeyChunks) {
                 boolean alternateFound = false;
                 if (firstAlternateTableLocation < rehashPointer) {
                     int alternateTableLocation = firstAlternateTableLocation;
-                    while ((outputPosition = alternateOutputPosition.getUnsafe(alternateTableLocation)) != EMPTY_OUTPUT_POSITION) {
+                    while (!isStateEmpty(outputPosition = alternateOutputPosition.getUnsafe(alternateTableLocation))) {
                         if (eq(alternateKeySource0.getUnsafe(alternateTableLocation), k0) && eq(alternateKeySource1.getUnsafe(alternateTableLocation), k1)) {
                             outputPositions.set(chunkPosition, outputPosition);
                             alternateFound = true;
@@ -151,16 +151,20 @@ private static int hash(double k0, int k1) {
         return hash;
     }
 
+    private static boolean isStateEmpty(int state) {
+        return state == EMPTY_OUTPUT_POSITION;
+    }
+
     private boolean migrateOneLocation(int locationToMigrate) {
         final int currentStateValue = alternateOutputPosition.getUnsafe(locationToMigrate);
-        if (currentStateValue == EMPTY_OUTPUT_POSITION) {
+        if (isStateEmpty(currentStateValue)) {
             return false;
         }
         final double k0 = alternateKeySource0.getUnsafe(locationToMigrate);
         final int k1 = alternateKeySource1.getUnsafe(locationToMigrate);
         final int hash = hash(k0, k1);
         int destinationTableLocation = hashToTableLocation(hash);
-        while (mainOutputPosition.getUnsafe(destinationTableLocation) != EMPTY_OUTPUT_POSITION) {
+        while (!isStateEmpty(mainOutputPosition.getUnsafe(destinationTableLocation))) {
             destinationTableLocation = nextTableLocation(destinationTableLocation);
         }
         mainKeySource0.set(destinationTableLocation, k0);
@@ -183,8 +187,7 @@ protected int rehashInternalPartial(int entriesToRehash) {
     }
 
     @Override
-    protected void newAlternate() {
-        super.newAlternate();
+    protected void adviseNewAlternate() {
         this.mainKeySource0 = (ImmutableDoubleArraySource)super.mainKeySources[0];
         this.alternateKeySource0 = (ImmutableDoubleArraySource)super.alternateKeySources[0];
         this.mainKeySource1 = (ImmutableIntArraySource)super.mainKeySources[1];
@@ -201,7 +204,7 @@ protected void clearAlternate() {
     @Override
     protected void migrateFront() {
         int location = 0;
-        while (migrateOneLocation(location++));
+        while (migrateOneLocation(location++) && location < alternateTableSize);
     }
 
     @Override
@@ -218,7 +221,7 @@ protected void rehashInternalFull(final int oldSize) {
         mainOutputPosition.setArray(destState);
         for (int sourceBucket = 0; sourceBucket < oldSize; ++sourceBucket) {
             final int currentStateValue = originalStateArray[sourceBucket];
-            if (currentStateValue == EMPTY_OUTPUT_POSITION) {
+            if (isStateEmpty(currentStateValue)) {
                 continue;
             }
             final double k0 = originalKeyArray0[sourceBucket];
@@ -227,7 +230,7 @@ protected void rehashInternalFull(final int oldSize) {
             final int firstDestinationTableLocation = hashToTableLocation(hash);
             int destinationTableLocation = firstDestinationTableLocation;
             while (true) {
-                if (destState[destinationTableLocation] == EMPTY_OUTPUT_POSITION) {
+                if (isStateEmpty(destState[destinationTableLocation])) {
                     destKeyArray0[destinationTableLocation] = k0;
                     destKeyArray1[destinationTableLocation] = k1;
                     destState[destinationTableLocation] = originalStateArray[sourceBucket];
@@ -250,7 +253,7 @@ public int findPositionForKey(Object key) {
         final int firstTableLocation = tableLocation;
         while (true) {
             final int positionValue = mainOutputPosition.getUnsafe(tableLocation);
-            if (positionValue == EMPTY_OUTPUT_POSITION) {
+            if (isStateEmpty(positionValue)) {
                 int alternateTableLocation = hashToTableLocationAlternate(hash);
                 if (alternateTableLocation >= rehashPointer) {
                     return UNKNOWN_ROW;
@@ -258,7 +261,7 @@ public int findPositionForKey(Object key) {
                 final int firstAlternateTableLocation = alternateTableLocation;
                 while (true) {
                     final int alternatePositionValue = alternateOutputPosition.getUnsafe(alternateTableLocation);
-                    if (alternatePositionValue == EMPTY_OUTPUT_POSITION) {
+                    if (isStateEmpty(alternatePositionValue)) {
                         return UNKNOWN_ROW;
                     }
                     if (eq(alternateKeySource0.getUnsafe(alternateTableLocation), k0) && eq(alternateKeySource1.getUnsafe(alternateTableLocation), k1)) {
diff --git a/engine/table/src/main/java/io/deephaven/engine/table/impl/by/typed/incopenagg/gen/IncrementalAggOpenHasherDoubleLong.java b/engine/table/src/main/java/io/deephaven/engine/table/impl/by/typed/incopenagg/gen/IncrementalAggOpenHasherDoubleLong.java
index c4f05d68b9a..37626b27b85 100644
--- a/engine/table/src/main/java/io/deephaven/engine/table/impl/by/typed/incopenagg/gen/IncrementalAggOpenHasherDoubleLong.java
+++ b/engine/table/src/main/java/io/deephaven/engine/table/impl/by/typed/incopenagg/gen/IncrementalAggOpenHasherDoubleLong.java
@@ -68,12 +68,12 @@ protected void build(RowSequence rowSequence, Chunk[] sourceKeyChunks) {
             int tableLocation = firstTableLocation;
             MAIN_SEARCH: while (true) {
                 int outputPosition = mainOutputPosition.getUnsafe(tableLocation);
-                if (outputPosition == EMPTY_OUTPUT_POSITION) {
+                if (isStateEmpty(outputPosition)) {
                     final int firstAlternateTableLocation = hashToTableLocationAlternate(hash);
                     int alternateTableLocation = firstAlternateTableLocation;
                     while (alternateTableLocation < rehashPointer) {
                         outputPosition = alternateOutputPosition.getUnsafe(alternateTableLocation);
-                        if (outputPosition == EMPTY_OUTPUT_POSITION) {
+                        if (isStateEmpty(outputPosition)) {
                             break;
                         } else if (eq(alternateKeySource0.getUnsafe(alternateTableLocation), k0) && eq(alternateKeySource1.getUnsafe(alternateTableLocation), k1)) {
                             outputPositions.set(chunkPosition, outputPosition);
@@ -114,7 +114,7 @@ protected void probe(RowSequence rowSequence, Chunk[] sourceKeyChunks) {
             boolean found = false;
             int tableLocation = firstTableLocation;
             int outputPosition;
-            while ((outputPosition = mainOutputPosition.getUnsafe(tableLocation)) != EMPTY_OUTPUT_POSITION) {
+            while (!isStateEmpty(outputPosition = mainOutputPosition.getUnsafe(tableLocation))) {
                 if (eq(mainKeySource0.getUnsafe(tableLocation), k0) && eq(mainKeySource1.getUnsafe(tableLocation), k1)) {
                     outputPositions.set(chunkPosition, outputPosition);
                     found = true;
@@ -128,7 +128,7 @@ protected void probe(RowSequence rowSequence, Chunk[] sourceKeyChunks) {
                 boolean alternateFound = false;
                 if (firstAlternateTableLocation < rehashPointer) {
                     int alternateTableLocation = firstAlternateTableLocation;
-                    while ((outputPosition = alternateOutputPosition.getUnsafe(alternateTableLocation)) != EMPTY_OUTPUT_POSITION) {
+                    while (!isStateEmpty(outputPosition = alternateOutputPosition.getUnsafe(alternateTableLocation))) {
                         if (eq(alternateKeySource0.getUnsafe(alternateTableLocation), k0) && eq(alternateKeySource1.getUnsafe(alternateTableLocation), k1)) {
                             outputPositions.set(chunkPosition, outputPosition);
                             alternateFound = true;
@@ -151,16 +151,20 @@ private static int hash(double k0, long k1) {
         return hash;
     }
 
+    private static boolean isStateEmpty(int state) {
+        return state == EMPTY_OUTPUT_POSITION;
+    }
+
     private boolean migrateOneLocation(int locationToMigrate) {
         final int currentStateValue = alternateOutputPosition.getUnsafe(locationToMigrate);
-        if (currentStateValue == EMPTY_OUTPUT_POSITION) {
+        if (isStateEmpty(currentStateValue)) {
             return false;
         }
         final double k0 = alternateKeySource0.getUnsafe(locationToMigrate);
         final long k1 = alternateKeySource1.getUnsafe(locationToMigrate);
         final int hash = hash(k0, k1);
         int destinationTableLocation = hashToTableLocation(hash);
-        while (mainOutputPosition.getUnsafe(destinationTableLocation) != EMPTY_OUTPUT_POSITION) {
+        while (!isStateEmpty(mainOutputPosition.getUnsafe(destinationTableLocation))) {
             destinationTableLocation = nextTableLocation(destinationTableLocation);
         }
         mainKeySource0.set(destinationTableLocation, k0);
@@ -183,8 +187,7 @@ protected int rehashInternalPartial(int entriesToRehash) {
     }
 
     @Override
-    protected void newAlternate() {
-        super.newAlternate();
+    protected void adviseNewAlternate() {
         this.mainKeySource0 = (ImmutableDoubleArraySource)super.mainKeySources[0];
         this.alternateKeySource0 = (ImmutableDoubleArraySource)super.alternateKeySources[0];
         this.mainKeySource1 = (ImmutableLongArraySource)super.mainKeySources[1];
@@ -201,7 +204,7 @@ protected void clearAlternate() {
     @Override
     protected void migrateFront() {
         int location = 0;
-        while (migrateOneLocation(location++));
+        while (migrateOneLocation(location++) && location < alternateTableSize);
     }
 
     @Override
@@ -218,7 +221,7 @@ protected void rehashInternalFull(final int oldSize) {
         mainOutputPosition.setArray(destState);
         for (int sourceBucket = 0; sourceBucket < oldSize; ++sourceBucket) {
             final int currentStateValue = originalStateArray[sourceBucket];
-            if (currentStateValue == EMPTY_OUTPUT_POSITION) {
+            if (isStateEmpty(currentStateValue)) {
                 continue;
             }
             final double k0 = originalKeyArray0[sourceBucket];
@@ -227,7 +230,7 @@ protected void rehashInternalFull(final int oldSize) {
             final int firstDestinationTableLocation = hashToTableLocation(hash);
             int destinationTableLocation = firstDestinationTableLocation;
             while (true) {
-                if (destState[destinationTableLocation] == EMPTY_OUTPUT_POSITION) {
+                if (isStateEmpty(destState[destinationTableLocation])) {
                     destKeyArray0[destinationTableLocation] = k0;
                     destKeyArray1[destinationTableLocation] = k1;
                     destState[destinationTableLocation] = originalStateArray[sourceBucket];
@@ -250,7 +253,7 @@ public int findPositionForKey(Object key) {
         final int firstTableLocation = tableLocation;
         while (true) {
             final int positionValue = mainOutputPosition.getUnsafe(tableLocation);
-            if (positionValue == EMPTY_OUTPUT_POSITION) {
+            if (isStateEmpty(positionValue)) {
                 int alternateTableLocation = hashToTableLocationAlternate(hash);
                 if (alternateTableLocation >= rehashPointer) {
                     return UNKNOWN_ROW;
@@ -258,7 +261,7 @@ public int findPositionForKey(Object key) {
                 final int firstAlternateTableLocation = alternateTableLocation;
                 while (true) {
                     final int alternatePositionValue = alternateOutputPosition.getUnsafe(alternateTableLocation);
-                    if (alternatePositionValue == EMPTY_OUTPUT_POSITION) {
+                    if (isStateEmpty(alternatePositionValue)) {
                         return UNKNOWN_ROW;
                     }
                     if (eq(alternateKeySource0.getUnsafe(alternateTableLocation), k0) && eq(alternateKeySource1.getUnsafe(alternateTableLocation), k1)) {
diff --git a/engine/table/src/main/java/io/deephaven/engine/table/impl/by/typed/incopenagg/gen/IncrementalAggOpenHasherDoubleObject.java b/engine/table/src/main/java/io/deephaven/engine/table/impl/by/typed/incopenagg/gen/IncrementalAggOpenHasherDoubleObject.java
index 537c6673a1d..8f36bf9f6be 100644
--- a/engine/table/src/main/java/io/deephaven/engine/table/impl/by/typed/incopenagg/gen/IncrementalAggOpenHasherDoubleObject.java
+++ b/engine/table/src/main/java/io/deephaven/engine/table/impl/by/typed/incopenagg/gen/IncrementalAggOpenHasherDoubleObject.java
@@ -67,12 +67,12 @@ protected void build(RowSequence rowSequence, Chunk[] sourceKeyChunks) {
             int tableLocation = firstTableLocation;
             MAIN_SEARCH: while (true) {
                 int outputPosition = mainOutputPosition.getUnsafe(tableLocation);
-                if (outputPosition == EMPTY_OUTPUT_POSITION) {
+                if (isStateEmpty(outputPosition)) {
                     final int firstAlternateTableLocation = hashToTableLocationAlternate(hash);
                     int alternateTableLocation = firstAlternateTableLocation;
                     while (alternateTableLocation < rehashPointer) {
                         outputPosition = alternateOutputPosition.getUnsafe(alternateTableLocation);
-                        if (outputPosition == EMPTY_OUTPUT_POSITION) {
+                        if (isStateEmpty(outputPosition)) {
                             break;
                         } else if (eq(alternateKeySource0.getUnsafe(alternateTableLocation), k0) && eq(alternateKeySource1.getUnsafe(alternateTableLocation), k1)) {
                             outputPositions.set(chunkPosition, outputPosition);
@@ -113,7 +113,7 @@ protected void probe(RowSequence rowSequence, Chunk[] sourceKeyChunks) {
             boolean found = false;
             int tableLocation = firstTableLocation;
             int outputPosition;
-            while ((outputPosition = mainOutputPosition.getUnsafe(tableLocation)) != EMPTY_OUTPUT_POSITION) {
+            while (!isStateEmpty(outputPosition = mainOutputPosition.getUnsafe(tableLocation))) {
                 if (eq(mainKeySource0.getUnsafe(tableLocation), k0) && eq(mainKeySource1.getUnsafe(tableLocation), k1)) {
                     outputPositions.set(chunkPosition, outputPosition);
                     found = true;
@@ -127,7 +127,7 @@ protected void probe(RowSequence rowSequence, Chunk[] sourceKeyChunks) {
                 boolean alternateFound = false;
                 if (firstAlternateTableLocation < rehashPointer) {
                     int alternateTableLocation = firstAlternateTableLocation;
-                    while ((outputPosition = alternateOutputPosition.getUnsafe(alternateTableLocation)) != EMPTY_OUTPUT_POSITION) {
+                    while (!isStateEmpty(outputPosition = alternateOutputPosition.getUnsafe(alternateTableLocation))) {
                         if (eq(alternateKeySource0.getUnsafe(alternateTableLocation), k0) && eq(alternateKeySource1.getUnsafe(alternateTableLocation), k1)) {
                             outputPositions.set(chunkPosition, outputPosition);
                             alternateFound = true;
@@ -150,16 +150,20 @@ private static int hash(double k0, Object k1) {
         return hash;
     }
 
+    private static boolean isStateEmpty(int state) {
+        return state == EMPTY_OUTPUT_POSITION;
+    }
+
     private boolean migrateOneLocation(int locationToMigrate) {
         final int currentStateValue = alternateOutputPosition.getUnsafe(locationToMigrate);
-        if (currentStateValue == EMPTY_OUTPUT_POSITION) {
+        if (isStateEmpty(currentStateValue)) {
             return false;
         }
         final double k0 = alternateKeySource0.getUnsafe(locationToMigrate);
         final Object k1 = alternateKeySource1.getUnsafe(locationToMigrate);
         final int hash = hash(k0, k1);
         int destinationTableLocation = hashToTableLocation(hash);
-        while (mainOutputPosition.getUnsafe(destinationTableLocation) != EMPTY_OUTPUT_POSITION) {
+        while (!isStateEmpty(mainOutputPosition.getUnsafe(destinationTableLocation))) {
             destinationTableLocation = nextTableLocation(destinationTableLocation);
         }
         mainKeySource0.set(destinationTableLocation, k0);
@@ -183,8 +187,7 @@ protected int rehashInternalPartial(int entriesToRehash) {
     }
 
     @Override
-    protected void newAlternate() {
-        super.newAlternate();
+    protected void adviseNewAlternate() {
         this.mainKeySource0 = (ImmutableDoubleArraySource)super.mainKeySources[0];
         this.alternateKeySource0 = (ImmutableDoubleArraySource)super.alternateKeySources[0];
         this.mainKeySource1 = (ImmutableObjectArraySource)super.mainKeySources[1];
@@ -201,7 +204,7 @@ protected void clearAlternate() {
     @Override
     protected void migrateFront() {
         int location = 0;
-        while (migrateOneLocation(location++));
+        while (migrateOneLocation(location++) && location < alternateTableSize);
     }
 
     @Override
@@ -218,7 +221,7 @@ protected void rehashInternalFull(final int oldSize) {
         mainOutputPosition.setArray(destState);
         for (int sourceBucket = 0; sourceBucket < oldSize; ++sourceBucket) {
             final int currentStateValue = originalStateArray[sourceBucket];
-            if (currentStateValue == EMPTY_OUTPUT_POSITION) {
+            if (isStateEmpty(currentStateValue)) {
                 continue;
             }
             final double k0 = originalKeyArray0[sourceBucket];
@@ -227,7 +230,7 @@ protected void rehashInternalFull(final int oldSize) {
             final int firstDestinationTableLocation = hashToTableLocation(hash);
             int destinationTableLocation = firstDestinationTableLocation;
             while (true) {
-                if (destState[destinationTableLocation] == EMPTY_OUTPUT_POSITION) {
+                if (isStateEmpty(destState[destinationTableLocation])) {
                     destKeyArray0[destinationTableLocation] = k0;
                     destKeyArray1[destinationTableLocation] = k1;
                     destState[destinationTableLocation] = originalStateArray[sourceBucket];
@@ -250,7 +253,7 @@ public int findPositionForKey(Object key) {
         final int firstTableLocation = tableLocation;
         while (true) {
             final int positionValue = mainOutputPosition.getUnsafe(tableLocation);
-            if (positionValue == EMPTY_OUTPUT_POSITION) {
+            if (isStateEmpty(positionValue)) {
                 int alternateTableLocation = hashToTableLocationAlternate(hash);
                 if (alternateTableLocation >= rehashPointer) {
                     return UNKNOWN_ROW;
@@ -258,7 +261,7 @@ public int findPositionForKey(Object key) {
                 final int firstAlternateTableLocation = alternateTableLocation;
                 while (true) {
                     final int alternatePositionValue = alternateOutputPosition.getUnsafe(alternateTableLocation);
-                    if (alternatePositionValue == EMPTY_OUTPUT_POSITION) {
+                    if (isStateEmpty(alternatePositionValue)) {
                         return UNKNOWN_ROW;
                     }
                     if (eq(alternateKeySource0.getUnsafe(alternateTableLocation), k0) && eq(alternateKeySource1.getUnsafe(alternateTableLocation), k1)) {
diff --git a/engine/table/src/main/java/io/deephaven/engine/table/impl/by/typed/incopenagg/gen/IncrementalAggOpenHasherDoubleShort.java b/engine/table/src/main/java/io/deephaven/engine/table/impl/by/typed/incopenagg/gen/IncrementalAggOpenHasherDoubleShort.java
index 0a65e73c58c..d68f3ac9671 100644
--- a/engine/table/src/main/java/io/deephaven/engine/table/impl/by/typed/incopenagg/gen/IncrementalAggOpenHasherDoubleShort.java
+++ b/engine/table/src/main/java/io/deephaven/engine/table/impl/by/typed/incopenagg/gen/IncrementalAggOpenHasherDoubleShort.java
@@ -68,12 +68,12 @@ protected void build(RowSequence rowSequence, Chunk[] sourceKeyChunks) {
             int tableLocation = firstTableLocation;
             MAIN_SEARCH: while (true) {
                 int outputPosition = mainOutputPosition.getUnsafe(tableLocation);
-                if (outputPosition == EMPTY_OUTPUT_POSITION) {
+                if (isStateEmpty(outputPosition)) {
                     final int firstAlternateTableLocation = hashToTableLocationAlternate(hash);
                     int alternateTableLocation = firstAlternateTableLocation;
                     while (alternateTableLocation < rehashPointer) {
                         outputPosition = alternateOutputPosition.getUnsafe(alternateTableLocation);
-                        if (outputPosition == EMPTY_OUTPUT_POSITION) {
+                        if (isStateEmpty(outputPosition)) {
                             break;
                         } else if (eq(alternateKeySource0.getUnsafe(alternateTableLocation), k0) && eq(alternateKeySource1.getUnsafe(alternateTableLocation), k1)) {
                             outputPositions.set(chunkPosition, outputPosition);
@@ -114,7 +114,7 @@ protected void probe(RowSequence rowSequence, Chunk[] sourceKeyChunks) {
             boolean found = false;
             int tableLocation = firstTableLocation;
             int outputPosition;
-            while ((outputPosition = mainOutputPosition.getUnsafe(tableLocation)) != EMPTY_OUTPUT_POSITION) {
+            while (!isStateEmpty(outputPosition = mainOutputPosition.getUnsafe(tableLocation))) {
                 if (eq(mainKeySource0.getUnsafe(tableLocation), k0) && eq(mainKeySource1.getUnsafe(tableLocation), k1)) {
                     outputPositions.set(chunkPosition, outputPosition);
                     found = true;
@@ -128,7 +128,7 @@ protected void probe(RowSequence rowSequence, Chunk[] sourceKeyChunks) {
                 boolean alternateFound = false;
                 if (firstAlternateTableLocation < rehashPointer) {
                     int alternateTableLocation = firstAlternateTableLocation;
-                    while ((outputPosition = alternateOutputPosition.getUnsafe(alternateTableLocation)) != EMPTY_OUTPUT_POSITION) {
+                    while (!isStateEmpty(outputPosition = alternateOutputPosition.getUnsafe(alternateTableLocation))) {
                         if (eq(alternateKeySource0.getUnsafe(alternateTableLocation), k0) && eq(alternateKeySource1.getUnsafe(alternateTableLocation), k1)) {
                             outputPositions.set(chunkPosition, outputPosition);
                             alternateFound = true;
@@ -151,16 +151,20 @@ private static int hash(double k0, short k1) {
         return hash;
     }
 
+    private static boolean isStateEmpty(int state) {
+        return state == EMPTY_OUTPUT_POSITION;
+    }
+
     private boolean migrateOneLocation(int locationToMigrate) {
         final int currentStateValue = alternateOutputPosition.getUnsafe(locationToMigrate);
-        if (currentStateValue == EMPTY_OUTPUT_POSITION) {
+        if (isStateEmpty(currentStateValue)) {
             return false;
         }
         final double k0 = alternateKeySource0.getUnsafe(locationToMigrate);
         final short k1 = alternateKeySource1.getUnsafe(locationToMigrate);
         final int hash = hash(k0, k1);
         int destinationTableLocation = hashToTableLocation(hash);
-        while (mainOutputPosition.getUnsafe(destinationTableLocation) != EMPTY_OUTPUT_POSITION) {
+        while (!isStateEmpty(mainOutputPosition.getUnsafe(destinationTableLocation))) {
             destinationTableLocation = nextTableLocation(destinationTableLocation);
         }
         mainKeySource0.set(destinationTableLocation, k0);
@@ -183,8 +187,7 @@ protected int rehashInternalPartial(int entriesToRehash) {
     }
 
     @Override
-    protected void newAlternate() {
-        super.newAlternate();
+    protected void adviseNewAlternate() {
         this.mainKeySource0 = (ImmutableDoubleArraySource)super.mainKeySources[0];
         this.alternateKeySource0 = (ImmutableDoubleArraySource)super.alternateKeySources[0];
         this.mainKeySource1 = (ImmutableShortArraySource)super.mainKeySources[1];
@@ -201,7 +204,7 @@ protected void clearAlternate() {
     @Override
     protected void migrateFront() {
         int location = 0;
-        while (migrateOneLocation(location++));
+        while (migrateOneLocation(location++) && location < alternateTableSize);
     }
 
     @Override
@@ -218,7 +221,7 @@ protected void rehashInternalFull(final int oldSize) {
         mainOutputPosition.setArray(destState);
         for (int sourceBucket = 0; sourceBucket < oldSize; ++sourceBucket) {
             final int currentStateValue = originalStateArray[sourceBucket];
-            if (currentStateValue == EMPTY_OUTPUT_POSITION) {
+            if (isStateEmpty(currentStateValue)) {
                 continue;
             }
             final double k0 = originalKeyArray0[sourceBucket];
@@ -227,7 +230,7 @@ protected void rehashInternalFull(final int oldSize) {
             final int firstDestinationTableLocation = hashToTableLocation(hash);
             int destinationTableLocation = firstDestinationTableLocation;
             while (true) {
-                if (destState[destinationTableLocation] == EMPTY_OUTPUT_POSITION) {
+                if (isStateEmpty(destState[destinationTableLocation])) {
                     destKeyArray0[destinationTableLocation] = k0;
                     destKeyArray1[destinationTableLocation] = k1;
                     destState[destinationTableLocation] = originalStateArray[sourceBucket];
@@ -250,7 +253,7 @@ public int findPositionForKey(Object key) {
         final int firstTableLocation = tableLocation;
         while (true) {
             final int positionValue = mainOutputPosition.getUnsafe(tableLocation);
-            if (positionValue == EMPTY_OUTPUT_POSITION) {
+            if (isStateEmpty(positionValue)) {
                 int alternateTableLocation = hashToTableLocationAlternate(hash);
                 if (alternateTableLocation >= rehashPointer) {
                     return UNKNOWN_ROW;
@@ -258,7 +261,7 @@ public int findPositionForKey(Object key) {
                 final int firstAlternateTableLocation = alternateTableLocation;
                 while (true) {
                     final int alternatePositionValue = alternateOutputPosition.getUnsafe(alternateTableLocation);
-                    if (alternatePositionValue == EMPTY_OUTPUT_POSITION) {
+                    if (isStateEmpty(alternatePositionValue)) {
                         return UNKNOWN_ROW;
                     }
                     if (eq(alternateKeySource0.getUnsafe(alternateTableLocation), k0) && eq(alternateKeySource1.getUnsafe(alternateTableLocation), k1)) {
diff --git a/engine/table/src/main/java/io/deephaven/engine/table/impl/by/typed/incopenagg/gen/IncrementalAggOpenHasherFloat.java b/engine/table/src/main/java/io/deephaven/engine/table/impl/by/typed/incopenagg/gen/IncrementalAggOpenHasherFloat.java
index e81809cc7b6..0d08783bb6d 100644
--- a/engine/table/src/main/java/io/deephaven/engine/table/impl/by/typed/incopenagg/gen/IncrementalAggOpenHasherFloat.java
+++ b/engine/table/src/main/java/io/deephaven/engine/table/impl/by/typed/incopenagg/gen/IncrementalAggOpenHasherFloat.java
@@ -55,12 +55,12 @@ protected void build(RowSequence rowSequence, Chunk[] sourceKeyChunks) {
             int tableLocation = firstTableLocation;
             MAIN_SEARCH: while (true) {
                 int outputPosition = mainOutputPosition.getUnsafe(tableLocation);
-                if (outputPosition == EMPTY_OUTPUT_POSITION) {
+                if (isStateEmpty(outputPosition)) {
                     final int firstAlternateTableLocation = hashToTableLocationAlternate(hash);
                     int alternateTableLocation = firstAlternateTableLocation;
                     while (alternateTableLocation < rehashPointer) {
                         outputPosition = alternateOutputPosition.getUnsafe(alternateTableLocation);
-                        if (outputPosition == EMPTY_OUTPUT_POSITION) {
+                        if (isStateEmpty(outputPosition)) {
                             break;
                         } else if (eq(alternateKeySource0.getUnsafe(alternateTableLocation), k0)) {
                             outputPositions.set(chunkPosition, outputPosition);
@@ -98,7 +98,7 @@ protected void probe(RowSequence rowSequence, Chunk[] sourceKeyChunks) {
             boolean found = false;
             int tableLocation = firstTableLocation;
             int outputPosition;
-            while ((outputPosition = mainOutputPosition.getUnsafe(tableLocation)) != EMPTY_OUTPUT_POSITION) {
+            while (!isStateEmpty(outputPosition = mainOutputPosition.getUnsafe(tableLocation))) {
                 if (eq(mainKeySource0.getUnsafe(tableLocation), k0)) {
                     outputPositions.set(chunkPosition, outputPosition);
                     found = true;
@@ -112,7 +112,7 @@ protected void probe(RowSequence rowSequence, Chunk[] sourceKeyChunks) {
                 boolean alternateFound = false;
                 if (firstAlternateTableLocation < rehashPointer) {
                     int alternateTableLocation = firstAlternateTableLocation;
-                    while ((outputPosition = alternateOutputPosition.getUnsafe(alternateTableLocation)) != EMPTY_OUTPUT_POSITION) {
+                    while (!isStateEmpty(outputPosition = alternateOutputPosition.getUnsafe(alternateTableLocation))) {
                         if (eq(alternateKeySource0.getUnsafe(alternateTableLocation), k0)) {
                             outputPositions.set(chunkPosition, outputPosition);
                             alternateFound = true;
@@ -134,15 +134,19 @@ private static int hash(float k0) {
         return hash;
     }
 
+    private static boolean isStateEmpty(int state) {
+        return state == EMPTY_OUTPUT_POSITION;
+    }
+
     private boolean migrateOneLocation(int locationToMigrate) {
         final int currentStateValue = alternateOutputPosition.getUnsafe(locationToMigrate);
-        if (currentStateValue == EMPTY_OUTPUT_POSITION) {
+        if (isStateEmpty(currentStateValue)) {
             return false;
         }
         final float k0 = alternateKeySource0.getUnsafe(locationToMigrate);
         final int hash = hash(k0);
         int destinationTableLocation = hashToTableLocation(hash);
-        while (mainOutputPosition.getUnsafe(destinationTableLocation) != EMPTY_OUTPUT_POSITION) {
+        while (!isStateEmpty(mainOutputPosition.getUnsafe(destinationTableLocation))) {
             destinationTableLocation = nextTableLocation(destinationTableLocation);
         }
         mainKeySource0.set(destinationTableLocation, k0);
@@ -164,8 +168,7 @@ protected int rehashInternalPartial(int entriesToRehash) {
     }
 
     @Override
-    protected void newAlternate() {
-        super.newAlternate();
+    protected void adviseNewAlternate() {
         this.mainKeySource0 = (ImmutableFloatArraySource)super.mainKeySources[0];
         this.alternateKeySource0 = (ImmutableFloatArraySource)super.alternateKeySources[0];
     }
@@ -179,7 +182,7 @@ protected void clearAlternate() {
     @Override
     protected void migrateFront() {
         int location = 0;
-        while (migrateOneLocation(location++));
+        while (migrateOneLocation(location++) && location < alternateTableSize);
     }
 
     @Override
@@ -193,7 +196,7 @@ protected void rehashInternalFull(final int oldSize) {
         mainOutputPosition.setArray(destState);
         for (int sourceBucket = 0; sourceBucket < oldSize; ++sourceBucket) {
             final int currentStateValue = originalStateArray[sourceBucket];
-            if (currentStateValue == EMPTY_OUTPUT_POSITION) {
+            if (isStateEmpty(currentStateValue)) {
                 continue;
             }
             final float k0 = originalKeyArray0[sourceBucket];
@@ -201,7 +204,7 @@ protected void rehashInternalFull(final int oldSize) {
             final int firstDestinationTableLocation = hashToTableLocation(hash);
             int destinationTableLocation = firstDestinationTableLocation;
             while (true) {
-                if (destState[destinationTableLocation] == EMPTY_OUTPUT_POSITION) {
+                if (isStateEmpty(destState[destinationTableLocation])) {
                     destKeyArray0[destinationTableLocation] = k0;
                     destState[destinationTableLocation] = originalStateArray[sourceBucket];
                     outputPositionToHashSlot.set(currentStateValue, mainInsertMask | destinationTableLocation);
@@ -221,7 +224,7 @@ public int findPositionForKey(Object key) {
         final int firstTableLocation = tableLocation;
         while (true) {
             final int positionValue = mainOutputPosition.getUnsafe(tableLocation);
-            if (positionValue == EMPTY_OUTPUT_POSITION) {
+            if (isStateEmpty(positionValue)) {
                 int alternateTableLocation = hashToTableLocationAlternate(hash);
                 if (alternateTableLocation >= rehashPointer) {
                     return UNKNOWN_ROW;
@@ -229,7 +232,7 @@ public int findPositionForKey(Object key) {
                 final int firstAlternateTableLocation = alternateTableLocation;
                 while (true) {
                     final int alternatePositionValue = alternateOutputPosition.getUnsafe(alternateTableLocation);
-                    if (alternatePositionValue == EMPTY_OUTPUT_POSITION) {
+                    if (isStateEmpty(alternatePositionValue)) {
                         return UNKNOWN_ROW;
                     }
                     if (eq(alternateKeySource0.getUnsafe(alternateTableLocation), k0)) {
diff --git a/engine/table/src/main/java/io/deephaven/engine/table/impl/by/typed/incopenagg/gen/IncrementalAggOpenHasherFloatByte.java b/engine/table/src/main/java/io/deephaven/engine/table/impl/by/typed/incopenagg/gen/IncrementalAggOpenHasherFloatByte.java
index 0cffb9f4c2e..50551ab63a0 100644
--- a/engine/table/src/main/java/io/deephaven/engine/table/impl/by/typed/incopenagg/gen/IncrementalAggOpenHasherFloatByte.java
+++ b/engine/table/src/main/java/io/deephaven/engine/table/impl/by/typed/incopenagg/gen/IncrementalAggOpenHasherFloatByte.java
@@ -68,12 +68,12 @@ protected void build(RowSequence rowSequence, Chunk[] sourceKeyChunks) {
             int tableLocation = firstTableLocation;
             MAIN_SEARCH: while (true) {
                 int outputPosition = mainOutputPosition.getUnsafe(tableLocation);
-                if (outputPosition == EMPTY_OUTPUT_POSITION) {
+                if (isStateEmpty(outputPosition)) {
                     final int firstAlternateTableLocation = hashToTableLocationAlternate(hash);
                     int alternateTableLocation = firstAlternateTableLocation;
                     while (alternateTableLocation < rehashPointer) {
                         outputPosition = alternateOutputPosition.getUnsafe(alternateTableLocation);
-                        if (outputPosition == EMPTY_OUTPUT_POSITION) {
+                        if (isStateEmpty(outputPosition)) {
                             break;
                         } else if (eq(alternateKeySource0.getUnsafe(alternateTableLocation), k0) && eq(alternateKeySource1.getUnsafe(alternateTableLocation), k1)) {
                             outputPositions.set(chunkPosition, outputPosition);
@@ -114,7 +114,7 @@ protected void probe(RowSequence rowSequence, Chunk[] sourceKeyChunks) {
             boolean found = false;
             int tableLocation = firstTableLocation;
             int outputPosition;
-            while ((outputPosition = mainOutputPosition.getUnsafe(tableLocation)) != EMPTY_OUTPUT_POSITION) {
+            while (!isStateEmpty(outputPosition = mainOutputPosition.getUnsafe(tableLocation))) {
                 if (eq(mainKeySource0.getUnsafe(tableLocation), k0) && eq(mainKeySource1.getUnsafe(tableLocation), k1)) {
                     outputPositions.set(chunkPosition, outputPosition);
                     found = true;
@@ -128,7 +128,7 @@ protected void probe(RowSequence rowSequence, Chunk[] sourceKeyChunks) {
                 boolean alternateFound = false;
                 if (firstAlternateTableLocation < rehashPointer) {
                     int alternateTableLocation = firstAlternateTableLocation;
-                    while ((outputPosition = alternateOutputPosition.getUnsafe(alternateTableLocation)) != EMPTY_OUTPUT_POSITION) {
+                    while (!isStateEmpty(outputPosition = alternateOutputPosition.getUnsafe(alternateTableLocation))) {
                         if (eq(alternateKeySource0.getUnsafe(alternateTableLocation), k0) && eq(alternateKeySource1.getUnsafe(alternateTableLocation), k1)) {
                             outputPositions.set(chunkPosition, outputPosition);
                             alternateFound = true;
@@ -151,16 +151,20 @@ private static int hash(float k0, byte k1) {
         return hash;
     }
 
+    private static boolean isStateEmpty(int state) {
+        return state == EMPTY_OUTPUT_POSITION;
+    }
+
     private boolean migrateOneLocation(int locationToMigrate) {
         final int currentStateValue = alternateOutputPosition.getUnsafe(locationToMigrate);
-        if (currentStateValue == EMPTY_OUTPUT_POSITION) {
+        if (isStateEmpty(currentStateValue)) {
             return false;
         }
         final float k0 = alternateKeySource0.getUnsafe(locationToMigrate);
         final byte k1 = alternateKeySource1.getUnsafe(locationToMigrate);
         final int hash = hash(k0, k1);
         int destinationTableLocation = hashToTableLocation(hash);
-        while (mainOutputPosition.getUnsafe(destinationTableLocation) != EMPTY_OUTPUT_POSITION) {
+        while (!isStateEmpty(mainOutputPosition.getUnsafe(destinationTableLocation))) {
             destinationTableLocation = nextTableLocation(destinationTableLocation);
         }
         mainKeySource0.set(destinationTableLocation, k0);
@@ -183,8 +187,7 @@ protected int rehashInternalPartial(int entriesToRehash) {
     }
 
     @Override
-    protected void newAlternate() {
-        super.newAlternate();
+    protected void adviseNewAlternate() {
         this.mainKeySource0 = (ImmutableFloatArraySource)super.mainKeySources[0];
         this.alternateKeySource0 = (ImmutableFloatArraySource)super.alternateKeySources[0];
         this.mainKeySource1 = (ImmutableByteArraySource)super.mainKeySources[1];
@@ -201,7 +204,7 @@ protected void clearAlternate() {
     @Override
     protected void migrateFront() {
         int location = 0;
-        while (migrateOneLocation(location++));
+        while (migrateOneLocation(location++) && location < alternateTableSize);
     }
 
     @Override
@@ -218,7 +221,7 @@ protected void rehashInternalFull(final int oldSize) {
         mainOutputPosition.setArray(destState);
         for (int sourceBucket = 0; sourceBucket < oldSize; ++sourceBucket) {
             final int currentStateValue = originalStateArray[sourceBucket];
-            if (currentStateValue == EMPTY_OUTPUT_POSITION) {
+            if (isStateEmpty(currentStateValue)) {
                 continue;
             }
             final float k0 = originalKeyArray0[sourceBucket];
@@ -227,7 +230,7 @@ protected void rehashInternalFull(final int oldSize) {
             final int firstDestinationTableLocation = hashToTableLocation(hash);
             int destinationTableLocation = firstDestinationTableLocation;
             while (true) {
-                if (destState[destinationTableLocation] == EMPTY_OUTPUT_POSITION) {
+                if (isStateEmpty(destState[destinationTableLocation])) {
                     destKeyArray0[destinationTableLocation] = k0;
                     destKeyArray1[destinationTableLocation] = k1;
                     destState[destinationTableLocation] = originalStateArray[sourceBucket];
@@ -250,7 +253,7 @@ public int findPositionForKey(Object key) {
         final int firstTableLocation = tableLocation;
         while (true) {
             final int positionValue = mainOutputPosition.getUnsafe(tableLocation);
-            if (positionValue == EMPTY_OUTPUT_POSITION) {
+            if (isStateEmpty(positionValue)) {
                 int alternateTableLocation = hashToTableLocationAlternate(hash);
                 if (alternateTableLocation >= rehashPointer) {
                     return UNKNOWN_ROW;
@@ -258,7 +261,7 @@ public int findPositionForKey(Object key) {
                 final int firstAlternateTableLocation = alternateTableLocation;
                 while (true) {
                     final int alternatePositionValue = alternateOutputPosition.getUnsafe(alternateTableLocation);
-                    if (alternatePositionValue == EMPTY_OUTPUT_POSITION) {
+                    if (isStateEmpty(alternatePositionValue)) {
                         return UNKNOWN_ROW;
                     }
                     if (eq(alternateKeySource0.getUnsafe(alternateTableLocation), k0) && eq(alternateKeySource1.getUnsafe(alternateTableLocation), k1)) {
diff --git a/engine/table/src/main/java/io/deephaven/engine/table/impl/by/typed/incopenagg/gen/IncrementalAggOpenHasherFloatChar.java b/engine/table/src/main/java/io/deephaven/engine/table/impl/by/typed/incopenagg/gen/IncrementalAggOpenHasherFloatChar.java
index 8b7012d578d..3defe71aa53 100644
--- a/engine/table/src/main/java/io/deephaven/engine/table/impl/by/typed/incopenagg/gen/IncrementalAggOpenHasherFloatChar.java
+++ b/engine/table/src/main/java/io/deephaven/engine/table/impl/by/typed/incopenagg/gen/IncrementalAggOpenHasherFloatChar.java
@@ -68,12 +68,12 @@ protected void build(RowSequence rowSequence, Chunk[] sourceKeyChunks) {
             int tableLocation = firstTableLocation;
             MAIN_SEARCH: while (true) {
                 int outputPosition = mainOutputPosition.getUnsafe(tableLocation);
-                if (outputPosition == EMPTY_OUTPUT_POSITION) {
+                if (isStateEmpty(outputPosition)) {
                     final int firstAlternateTableLocation = hashToTableLocationAlternate(hash);
                     int alternateTableLocation = firstAlternateTableLocation;
                     while (alternateTableLocation < rehashPointer) {
                         outputPosition = alternateOutputPosition.getUnsafe(alternateTableLocation);
-                        if (outputPosition == EMPTY_OUTPUT_POSITION) {
+                        if (isStateEmpty(outputPosition)) {
                             break;
                         } else if (eq(alternateKeySource0.getUnsafe(alternateTableLocation), k0) && eq(alternateKeySource1.getUnsafe(alternateTableLocation), k1)) {
                             outputPositions.set(chunkPosition, outputPosition);
@@ -114,7 +114,7 @@ protected void probe(RowSequence rowSequence, Chunk[] sourceKeyChunks) {
             boolean found = false;
             int tableLocation = firstTableLocation;
             int outputPosition;
-            while ((outputPosition = mainOutputPosition.getUnsafe(tableLocation)) != EMPTY_OUTPUT_POSITION) {
+            while (!isStateEmpty(outputPosition = mainOutputPosition.getUnsafe(tableLocation))) {
                 if (eq(mainKeySource0.getUnsafe(tableLocation), k0) && eq(mainKeySource1.getUnsafe(tableLocation), k1)) {
                     outputPositions.set(chunkPosition, outputPosition);
                     found = true;
@@ -128,7 +128,7 @@ protected void probe(RowSequence rowSequence, Chunk[] sourceKeyChunks) {
                 boolean alternateFound = false;
                 if (firstAlternateTableLocation < rehashPointer) {
                     int alternateTableLocation = firstAlternateTableLocation;
-                    while ((outputPosition = alternateOutputPosition.getUnsafe(alternateTableLocation)) != EMPTY_OUTPUT_POSITION) {
+                    while (!isStateEmpty(outputPosition = alternateOutputPosition.getUnsafe(alternateTableLocation))) {
                         if (eq(alternateKeySource0.getUnsafe(alternateTableLocation), k0) && eq(alternateKeySource1.getUnsafe(alternateTableLocation), k1)) {
                             outputPositions.set(chunkPosition, outputPosition);
                             alternateFound = true;
@@ -151,16 +151,20 @@ private static int hash(float k0, char k1) {
         return hash;
     }
 
+    private static boolean isStateEmpty(int state) {
+        return state == EMPTY_OUTPUT_POSITION;
+    }
+
     private boolean migrateOneLocation(int locationToMigrate) {
         final int currentStateValue = alternateOutputPosition.getUnsafe(locationToMigrate);
-        if (currentStateValue == EMPTY_OUTPUT_POSITION) {
+        if (isStateEmpty(currentStateValue)) {
             return false;
         }
         final float k0 = alternateKeySource0.getUnsafe(locationToMigrate);
         final char k1 = alternateKeySource1.getUnsafe(locationToMigrate);
         final int hash = hash(k0, k1);
         int destinationTableLocation = hashToTableLocation(hash);
-        while (mainOutputPosition.getUnsafe(destinationTableLocation) != EMPTY_OUTPUT_POSITION) {
+        while (!isStateEmpty(mainOutputPosition.getUnsafe(destinationTableLocation))) {
             destinationTableLocation = nextTableLocation(destinationTableLocation);
         }
         mainKeySource0.set(destinationTableLocation, k0);
@@ -183,8 +187,7 @@ protected int rehashInternalPartial(int entriesToRehash) {
     }
 
     @Override
-    protected void newAlternate() {
-        super.newAlternate();
+    protected void adviseNewAlternate() {
         this.mainKeySource0 = (ImmutableFloatArraySource)super.mainKeySources[0];
         this.alternateKeySource0 = (ImmutableFloatArraySource)super.alternateKeySources[0];
         this.mainKeySource1 = (ImmutableCharArraySource)super.mainKeySources[1];
@@ -201,7 +204,7 @@ protected void clearAlternate() {
     @Override
     protected void migrateFront() {
         int location = 0;
-        while (migrateOneLocation(location++));
+        while (migrateOneLocation(location++) && location < alternateTableSize);
     }
 
     @Override
@@ -218,7 +221,7 @@ protected void rehashInternalFull(final int oldSize) {
         mainOutputPosition.setArray(destState);
         for (int sourceBucket = 0; sourceBucket < oldSize; ++sourceBucket) {
             final int currentStateValue = originalStateArray[sourceBucket];
-            if (currentStateValue == EMPTY_OUTPUT_POSITION) {
+            if (isStateEmpty(currentStateValue)) {
                 continue;
             }
             final float k0 = originalKeyArray0[sourceBucket];
@@ -227,7 +230,7 @@ protected void rehashInternalFull(final int oldSize) {
             final int firstDestinationTableLocation = hashToTableLocation(hash);
             int destinationTableLocation = firstDestinationTableLocation;
             while (true) {
-                if (destState[destinationTableLocation] == EMPTY_OUTPUT_POSITION) {
+                if (isStateEmpty(destState[destinationTableLocation])) {
                     destKeyArray0[destinationTableLocation] = k0;
                     destKeyArray1[destinationTableLocation] = k1;
                     destState[destinationTableLocation] = originalStateArray[sourceBucket];
@@ -250,7 +253,7 @@ public int findPositionForKey(Object key) {
         final int firstTableLocation = tableLocation;
         while (true) {
             final int positionValue = mainOutputPosition.getUnsafe(tableLocation);
-            if (positionValue == EMPTY_OUTPUT_POSITION) {
+            if (isStateEmpty(positionValue)) {
                 int alternateTableLocation = hashToTableLocationAlternate(hash);
                 if (alternateTableLocation >= rehashPointer) {
                     return UNKNOWN_ROW;
@@ -258,7 +261,7 @@ public int findPositionForKey(Object key) {
                 final int firstAlternateTableLocation = alternateTableLocation;
                 while (true) {
                     final int alternatePositionValue = alternateOutputPosition.getUnsafe(alternateTableLocation);
-                    if (alternatePositionValue == EMPTY_OUTPUT_POSITION) {
+                    if (isStateEmpty(alternatePositionValue)) {
                         return UNKNOWN_ROW;
                     }
                     if (eq(alternateKeySource0.getUnsafe(alternateTableLocation), k0) && eq(alternateKeySource1.getUnsafe(alternateTableLocation), k1)) {
diff --git a/engine/table/src/main/java/io/deephaven/engine/table/impl/by/typed/incopenagg/gen/IncrementalAggOpenHasherFloatDouble.java b/engine/table/src/main/java/io/deephaven/engine/table/impl/by/typed/incopenagg/gen/IncrementalAggOpenHasherFloatDouble.java
index 03742ed989b..822948f35c3 100644
--- a/engine/table/src/main/java/io/deephaven/engine/table/impl/by/typed/incopenagg/gen/IncrementalAggOpenHasherFloatDouble.java
+++ b/engine/table/src/main/java/io/deephaven/engine/table/impl/by/typed/incopenagg/gen/IncrementalAggOpenHasherFloatDouble.java
@@ -68,12 +68,12 @@ protected void build(RowSequence rowSequence, Chunk[] sourceKeyChunks) {
             int tableLocation = firstTableLocation;
             MAIN_SEARCH: while (true) {
                 int outputPosition = mainOutputPosition.getUnsafe(tableLocation);
-                if (outputPosition == EMPTY_OUTPUT_POSITION) {
+                if (isStateEmpty(outputPosition)) {
                     final int firstAlternateTableLocation = hashToTableLocationAlternate(hash);
                     int alternateTableLocation = firstAlternateTableLocation;
                     while (alternateTableLocation < rehashPointer) {
                         outputPosition = alternateOutputPosition.getUnsafe(alternateTableLocation);
-                        if (outputPosition == EMPTY_OUTPUT_POSITION) {
+                        if (isStateEmpty(outputPosition)) {
                             break;
                         } else if (eq(alternateKeySource0.getUnsafe(alternateTableLocation), k0) && eq(alternateKeySource1.getUnsafe(alternateTableLocation), k1)) {
                             outputPositions.set(chunkPosition, outputPosition);
@@ -114,7 +114,7 @@ protected void probe(RowSequence rowSequence, Chunk[] sourceKeyChunks) {
             boolean found = false;
             int tableLocation = firstTableLocation;
             int outputPosition;
-            while ((outputPosition = mainOutputPosition.getUnsafe(tableLocation)) != EMPTY_OUTPUT_POSITION) {
+            while (!isStateEmpty(outputPosition = mainOutputPosition.getUnsafe(tableLocation))) {
                 if (eq(mainKeySource0.getUnsafe(tableLocation), k0) && eq(mainKeySource1.getUnsafe(tableLocation), k1)) {
                     outputPositions.set(chunkPosition, outputPosition);
                     found = true;
@@ -128,7 +128,7 @@ protected void probe(RowSequence rowSequence, Chunk[] sourceKeyChunks) {
                 boolean alternateFound = false;
                 if (firstAlternateTableLocation < rehashPointer) {
                     int alternateTableLocation = firstAlternateTableLocation;
-                    while ((outputPosition = alternateOutputPosition.getUnsafe(alternateTableLocation)) != EMPTY_OUTPUT_POSITION) {
+                    while (!isStateEmpty(outputPosition = alternateOutputPosition.getUnsafe(alternateTableLocation))) {
                         if (eq(alternateKeySource0.getUnsafe(alternateTableLocation), k0) && eq(alternateKeySource1.getUnsafe(alternateTableLocation), k1)) {
                             outputPositions.set(chunkPosition, outputPosition);
                             alternateFound = true;
@@ -151,16 +151,20 @@ private static int hash(float k0, double k1) {
         return hash;
     }
 
+    private static boolean isStateEmpty(int state) {
+        return state == EMPTY_OUTPUT_POSITION;
+    }
+
     private boolean migrateOneLocation(int locationToMigrate) {
         final int currentStateValue = alternateOutputPosition.getUnsafe(locationToMigrate);
-        if (currentStateValue == EMPTY_OUTPUT_POSITION) {
+        if (isStateEmpty(currentStateValue)) {
             return false;
         }
         final float k0 = alternateKeySource0.getUnsafe(locationToMigrate);
         final double k1 = alternateKeySource1.getUnsafe(locationToMigrate);
         final int hash = hash(k0, k1);
         int destinationTableLocation = hashToTableLocation(hash);
-        while (mainOutputPosition.getUnsafe(destinationTableLocation) != EMPTY_OUTPUT_POSITION) {
+        while (!isStateEmpty(mainOutputPosition.getUnsafe(destinationTableLocation))) {
             destinationTableLocation = nextTableLocation(destinationTableLocation);
         }
         mainKeySource0.set(destinationTableLocation, k0);
@@ -183,8 +187,7 @@ protected int rehashInternalPartial(int entriesToRehash) {
     }
 
     @Override
-    protected void newAlternate() {
-        super.newAlternate();
+    protected void adviseNewAlternate() {
         this.mainKeySource0 = (ImmutableFloatArraySource)super.mainKeySources[0];
         this.alternateKeySource0 = (ImmutableFloatArraySource)super.alternateKeySources[0];
         this.mainKeySource1 = (ImmutableDoubleArraySource)super.mainKeySources[1];
@@ -201,7 +204,7 @@ protected void clearAlternate() {
     @Override
     protected void migrateFront() {
         int location = 0;
-        while (migrateOneLocation(location++));
+        while (migrateOneLocation(location++) && location < alternateTableSize);
     }
 
     @Override
@@ -218,7 +221,7 @@ protected void rehashInternalFull(final int oldSize) {
         mainOutputPosition.setArray(destState);
         for (int sourceBucket = 0; sourceBucket < oldSize; ++sourceBucket) {
             final int currentStateValue = originalStateArray[sourceBucket];
-            if (currentStateValue == EMPTY_OUTPUT_POSITION) {
+            if (isStateEmpty(currentStateValue)) {
                 continue;
             }
             final float k0 = originalKeyArray0[sourceBucket];
@@ -227,7 +230,7 @@ protected void rehashInternalFull(final int oldSize) {
             final int firstDestinationTableLocation = hashToTableLocation(hash);
             int destinationTableLocation = firstDestinationTableLocation;
             while (true) {
-                if (destState[destinationTableLocation] == EMPTY_OUTPUT_POSITION) {
+                if (isStateEmpty(destState[destinationTableLocation])) {
                     destKeyArray0[destinationTableLocation] = k0;
                     destKeyArray1[destinationTableLocation] = k1;
                     destState[destinationTableLocation] = originalStateArray[sourceBucket];
@@ -250,7 +253,7 @@ public int findPositionForKey(Object key) {
         final int firstTableLocation = tableLocation;
         while (true) {
             final int positionValue = mainOutputPosition.getUnsafe(tableLocation);
-            if (positionValue == EMPTY_OUTPUT_POSITION) {
+            if (isStateEmpty(positionValue)) {
                 int alternateTableLocation = hashToTableLocationAlternate(hash);
                 if (alternateTableLocation >= rehashPointer) {
                     return UNKNOWN_ROW;
@@ -258,7 +261,7 @@ public int findPositionForKey(Object key) {
                 final int firstAlternateTableLocation = alternateTableLocation;
                 while (true) {
                     final int alternatePositionValue = alternateOutputPosition.getUnsafe(alternateTableLocation);
-                    if (alternatePositionValue == EMPTY_OUTPUT_POSITION) {
+                    if (isStateEmpty(alternatePositionValue)) {
                         return UNKNOWN_ROW;
                     }
                     if (eq(alternateKeySource0.getUnsafe(alternateTableLocation), k0) && eq(alternateKeySource1.getUnsafe(alternateTableLocation), k1)) {
diff --git a/engine/table/src/main/java/io/deephaven/engine/table/impl/by/typed/incopenagg/gen/IncrementalAggOpenHasherFloatFloat.java b/engine/table/src/main/java/io/deephaven/engine/table/impl/by/typed/incopenagg/gen/IncrementalAggOpenHasherFloatFloat.java
index cad9c25a45c..5ceeddcee31 100644
--- a/engine/table/src/main/java/io/deephaven/engine/table/impl/by/typed/incopenagg/gen/IncrementalAggOpenHasherFloatFloat.java
+++ b/engine/table/src/main/java/io/deephaven/engine/table/impl/by/typed/incopenagg/gen/IncrementalAggOpenHasherFloatFloat.java
@@ -63,12 +63,12 @@ protected void build(RowSequence rowSequence, Chunk[] sourceKeyChunks) {
             int tableLocation = firstTableLocation;
             MAIN_SEARCH: while (true) {
                 int outputPosition = mainOutputPosition.getUnsafe(tableLocation);
-                if (outputPosition == EMPTY_OUTPUT_POSITION) {
+                if (isStateEmpty(outputPosition)) {
                     final int firstAlternateTableLocation = hashToTableLocationAlternate(hash);
                     int alternateTableLocation = firstAlternateTableLocation;
                     while (alternateTableLocation < rehashPointer) {
                         outputPosition = alternateOutputPosition.getUnsafe(alternateTableLocation);
-                        if (outputPosition == EMPTY_OUTPUT_POSITION) {
+                        if (isStateEmpty(outputPosition)) {
                             break;
                         } else if (eq(alternateKeySource0.getUnsafe(alternateTableLocation), k0) && eq(alternateKeySource1.getUnsafe(alternateTableLocation), k1)) {
                             outputPositions.set(chunkPosition, outputPosition);
@@ -109,7 +109,7 @@ protected void probe(RowSequence rowSequence, Chunk[] sourceKeyChunks) {
             boolean found = false;
             int tableLocation = firstTableLocation;
             int outputPosition;
-            while ((outputPosition = mainOutputPosition.getUnsafe(tableLocation)) != EMPTY_OUTPUT_POSITION) {
+            while (!isStateEmpty(outputPosition = mainOutputPosition.getUnsafe(tableLocation))) {
                 if (eq(mainKeySource0.getUnsafe(tableLocation), k0) && eq(mainKeySource1.getUnsafe(tableLocation), k1)) {
                     outputPositions.set(chunkPosition, outputPosition);
                     found = true;
@@ -123,7 +123,7 @@ protected void probe(RowSequence rowSequence, Chunk[] sourceKeyChunks) {
                 boolean alternateFound = false;
                 if (firstAlternateTableLocation < rehashPointer) {
                     int alternateTableLocation = firstAlternateTableLocation;
-                    while ((outputPosition = alternateOutputPosition.getUnsafe(alternateTableLocation)) != EMPTY_OUTPUT_POSITION) {
+                    while (!isStateEmpty(outputPosition = alternateOutputPosition.getUnsafe(alternateTableLocation))) {
                         if (eq(alternateKeySource0.getUnsafe(alternateTableLocation), k0) && eq(alternateKeySource1.getUnsafe(alternateTableLocation), k1)) {
                             outputPositions.set(chunkPosition, outputPosition);
                             alternateFound = true;
@@ -146,16 +146,20 @@ private static int hash(float k0, float k1) {
         return hash;
     }
 
+    private static boolean isStateEmpty(int state) {
+        return state == EMPTY_OUTPUT_POSITION;
+    }
+
     private boolean migrateOneLocation(int locationToMigrate) {
         final int currentStateValue = alternateOutputPosition.getUnsafe(locationToMigrate);
-        if (currentStateValue == EMPTY_OUTPUT_POSITION) {
+        if (isStateEmpty(currentStateValue)) {
             return false;
         }
         final float k0 = alternateKeySource0.getUnsafe(locationToMigrate);
         final float k1 = alternateKeySource1.getUnsafe(locationToMigrate);
         final int hash = hash(k0, k1);
         int destinationTableLocation = hashToTableLocation(hash);
-        while (mainOutputPosition.getUnsafe(destinationTableLocation) != EMPTY_OUTPUT_POSITION) {
+        while (!isStateEmpty(mainOutputPosition.getUnsafe(destinationTableLocation))) {
             destinationTableLocation = nextTableLocation(destinationTableLocation);
         }
         mainKeySource0.set(destinationTableLocation, k0);
@@ -178,8 +182,7 @@ protected int rehashInternalPartial(int entriesToRehash) {
     }
 
     @Override
-    protected void newAlternate() {
-        super.newAlternate();
+    protected void adviseNewAlternate() {
         this.mainKeySource0 = (ImmutableFloatArraySource)super.mainKeySources[0];
         this.alternateKeySource0 = (ImmutableFloatArraySource)super.alternateKeySources[0];
         this.mainKeySource1 = (ImmutableFloatArraySource)super.mainKeySources[1];
@@ -196,7 +199,7 @@ protected void clearAlternate() {
     @Override
     protected void migrateFront() {
         int location = 0;
-        while (migrateOneLocation(location++));
+        while (migrateOneLocation(location++) && location < alternateTableSize);
     }
 
     @Override
@@ -213,7 +216,7 @@ protected void rehashInternalFull(final int oldSize) {
         mainOutputPosition.setArray(destState);
         for (int sourceBucket = 0; sourceBucket < oldSize; ++sourceBucket) {
             final int currentStateValue = originalStateArray[sourceBucket];
-            if (currentStateValue == EMPTY_OUTPUT_POSITION) {
+            if (isStateEmpty(currentStateValue)) {
                 continue;
             }
             final float k0 = originalKeyArray0[sourceBucket];
@@ -222,7 +225,7 @@ protected void rehashInternalFull(final int oldSize) {
             final int firstDestinationTableLocation = hashToTableLocation(hash);
             int destinationTableLocation = firstDestinationTableLocation;
             while (true) {
-                if (destState[destinationTableLocation] == EMPTY_OUTPUT_POSITION) {
+                if (isStateEmpty(destState[destinationTableLocation])) {
                     destKeyArray0[destinationTableLocation] = k0;
                     destKeyArray1[destinationTableLocation] = k1;
                     destState[destinationTableLocation] = originalStateArray[sourceBucket];
@@ -245,7 +248,7 @@ public int findPositionForKey(Object key) {
         final int firstTableLocation = tableLocation;
         while (true) {
             final int positionValue = mainOutputPosition.getUnsafe(tableLocation);
-            if (positionValue == EMPTY_OUTPUT_POSITION) {
+            if (isStateEmpty(positionValue)) {
                 int alternateTableLocation = hashToTableLocationAlternate(hash);
                 if (alternateTableLocation >= rehashPointer) {
                     return UNKNOWN_ROW;
@@ -253,7 +256,7 @@ public int findPositionForKey(Object key) {
                 final int firstAlternateTableLocation = alternateTableLocation;
                 while (true) {
                     final int alternatePositionValue = alternateOutputPosition.getUnsafe(alternateTableLocation);
-                    if (alternatePositionValue == EMPTY_OUTPUT_POSITION) {
+                    if (isStateEmpty(alternatePositionValue)) {
                         return UNKNOWN_ROW;
                     }
                     if (eq(alternateKeySource0.getUnsafe(alternateTableLocation), k0) && eq(alternateKeySource1.getUnsafe(alternateTableLocation), k1)) {
diff --git a/engine/table/src/main/java/io/deephaven/engine/table/impl/by/typed/incopenagg/gen/IncrementalAggOpenHasherFloatInt.java b/engine/table/src/main/java/io/deephaven/engine/table/impl/by/typed/incopenagg/gen/IncrementalAggOpenHasherFloatInt.java
index 0b229295c60..c5fa1cd015d 100644
--- a/engine/table/src/main/java/io/deephaven/engine/table/impl/by/typed/incopenagg/gen/IncrementalAggOpenHasherFloatInt.java
+++ b/engine/table/src/main/java/io/deephaven/engine/table/impl/by/typed/incopenagg/gen/IncrementalAggOpenHasherFloatInt.java
@@ -68,12 +68,12 @@ protected void build(RowSequence rowSequence, Chunk[] sourceKeyChunks) {
             int tableLocation = firstTableLocation;
             MAIN_SEARCH: while (true) {
                 int outputPosition = mainOutputPosition.getUnsafe(tableLocation);
-                if (outputPosition == EMPTY_OUTPUT_POSITION) {
+                if (isStateEmpty(outputPosition)) {
                     final int firstAlternateTableLocation = hashToTableLocationAlternate(hash);
                     int alternateTableLocation = firstAlternateTableLocation;
                     while (alternateTableLocation < rehashPointer) {
                         outputPosition = alternateOutputPosition.getUnsafe(alternateTableLocation);
-                        if (outputPosition == EMPTY_OUTPUT_POSITION) {
+                        if (isStateEmpty(outputPosition)) {
                             break;
                         } else if (eq(alternateKeySource0.getUnsafe(alternateTableLocation), k0) && eq(alternateKeySource1.getUnsafe(alternateTableLocation), k1)) {
                             outputPositions.set(chunkPosition, outputPosition);
@@ -114,7 +114,7 @@ protected void probe(RowSequence rowSequence, Chunk[] sourceKeyChunks) {
             boolean found = false;
             int tableLocation = firstTableLocation;
             int outputPosition;
-            while ((outputPosition = mainOutputPosition.getUnsafe(tableLocation)) != EMPTY_OUTPUT_POSITION) {
+            while (!isStateEmpty(outputPosition = mainOutputPosition.getUnsafe(tableLocation))) {
                 if (eq(mainKeySource0.getUnsafe(tableLocation), k0) && eq(mainKeySource1.getUnsafe(tableLocation), k1)) {
                     outputPositions.set(chunkPosition, outputPosition);
                     found = true;
@@ -128,7 +128,7 @@ protected void probe(RowSequence rowSequence, Chunk[] sourceKeyChunks) {
                 boolean alternateFound = false;
                 if (firstAlternateTableLocation < rehashPointer) {
                     int alternateTableLocation = firstAlternateTableLocation;
-                    while ((outputPosition = alternateOutputPosition.getUnsafe(alternateTableLocation)) != EMPTY_OUTPUT_POSITION) {
+                    while (!isStateEmpty(outputPosition = alternateOutputPosition.getUnsafe(alternateTableLocation))) {
                         if (eq(alternateKeySource0.getUnsafe(alternateTableLocation), k0) && eq(alternateKeySource1.getUnsafe(alternateTableLocation), k1)) {
                             outputPositions.set(chunkPosition, outputPosition);
                             alternateFound = true;
@@ -151,16 +151,20 @@ private static int hash(float k0, int k1) {
         return hash;
     }
 
+    private static boolean isStateEmpty(int state) {
+        return state == EMPTY_OUTPUT_POSITION;
+    }
+
     private boolean migrateOneLocation(int locationToMigrate) {
         final int currentStateValue = alternateOutputPosition.getUnsafe(locationToMigrate);
-        if (currentStateValue == EMPTY_OUTPUT_POSITION) {
+        if (isStateEmpty(currentStateValue)) {
             return false;
         }
         final float k0 = alternateKeySource0.getUnsafe(locationToMigrate);
         final int k1 = alternateKeySource1.getUnsafe(locationToMigrate);
         final int hash = hash(k0, k1);
         int destinationTableLocation = hashToTableLocation(hash);
-        while (mainOutputPosition.getUnsafe(destinationTableLocation) != EMPTY_OUTPUT_POSITION) {
+        while (!isStateEmpty(mainOutputPosition.getUnsafe(destinationTableLocation))) {
             destinationTableLocation = nextTableLocation(destinationTableLocation);
         }
         mainKeySource0.set(destinationTableLocation, k0);
@@ -183,8 +187,7 @@ protected int rehashInternalPartial(int entriesToRehash) {
     }
 
     @Override
-    protected void newAlternate() {
-        super.newAlternate();
+    protected void adviseNewAlternate() {
         this.mainKeySource0 = (ImmutableFloatArraySource)super.mainKeySources[0];
         this.alternateKeySource0 = (ImmutableFloatArraySource)super.alternateKeySources[0];
         this.mainKeySource1 = (ImmutableIntArraySource)super.mainKeySources[1];
@@ -201,7 +204,7 @@ protected void clearAlternate() {
     @Override
     protected void migrateFront() {
         int location = 0;
-        while (migrateOneLocation(location++));
+        while (migrateOneLocation(location++) && location < alternateTableSize);
     }
 
     @Override
@@ -218,7 +221,7 @@ protected void rehashInternalFull(final int oldSize) {
         mainOutputPosition.setArray(destState);
         for (int sourceBucket = 0; sourceBucket < oldSize; ++sourceBucket) {
             final int currentStateValue = originalStateArray[sourceBucket];
-            if (currentStateValue == EMPTY_OUTPUT_POSITION) {
+            if (isStateEmpty(currentStateValue)) {
                 continue;
             }
             final float k0 = originalKeyArray0[sourceBucket];
@@ -227,7 +230,7 @@ protected void rehashInternalFull(final int oldSize) {
             final int firstDestinationTableLocation = hashToTableLocation(hash);
             int destinationTableLocation = firstDestinationTableLocation;
             while (true) {
-                if (destState[destinationTableLocation] == EMPTY_OUTPUT_POSITION) {
+                if (isStateEmpty(destState[destinationTableLocation])) {
                     destKeyArray0[destinationTableLocation] = k0;
                     destKeyArray1[destinationTableLocation] = k1;
                     destState[destinationTableLocation] = originalStateArray[sourceBucket];
@@ -250,7 +253,7 @@ public int findPositionForKey(Object key) {
         final int firstTableLocation = tableLocation;
         while (true) {
             final int positionValue = mainOutputPosition.getUnsafe(tableLocation);
-            if (positionValue == EMPTY_OUTPUT_POSITION) {
+            if (isStateEmpty(positionValue)) {
                 int alternateTableLocation = hashToTableLocationAlternate(hash);
                 if (alternateTableLocation >= rehashPointer) {
                     return UNKNOWN_ROW;
@@ -258,7 +261,7 @@ public int findPositionForKey(Object key) {
                 final int firstAlternateTableLocation = alternateTableLocation;
                 while (true) {
                     final int alternatePositionValue = alternateOutputPosition.getUnsafe(alternateTableLocation);
-                    if (alternatePositionValue == EMPTY_OUTPUT_POSITION) {
+                    if (isStateEmpty(alternatePositionValue)) {
                         return UNKNOWN_ROW;
                     }
                     if (eq(alternateKeySource0.getUnsafe(alternateTableLocation), k0) && eq(alternateKeySource1.getUnsafe(alternateTableLocation), k1)) {
diff --git a/engine/table/src/main/java/io/deephaven/engine/table/impl/by/typed/incopenagg/gen/IncrementalAggOpenHasherFloatLong.java b/engine/table/src/main/java/io/deephaven/engine/table/impl/by/typed/incopenagg/gen/IncrementalAggOpenHasherFloatLong.java
index 93e4d930f7e..a93b332957b 100644
--- a/engine/table/src/main/java/io/deephaven/engine/table/impl/by/typed/incopenagg/gen/IncrementalAggOpenHasherFloatLong.java
+++ b/engine/table/src/main/java/io/deephaven/engine/table/impl/by/typed/incopenagg/gen/IncrementalAggOpenHasherFloatLong.java
@@ -68,12 +68,12 @@ protected void build(RowSequence rowSequence, Chunk[] sourceKeyChunks) {
             int tableLocation = firstTableLocation;
             MAIN_SEARCH: while (true) {
                 int outputPosition = mainOutputPosition.getUnsafe(tableLocation);
-                if (outputPosition == EMPTY_OUTPUT_POSITION) {
+                if (isStateEmpty(outputPosition)) {
                     final int firstAlternateTableLocation = hashToTableLocationAlternate(hash);
                     int alternateTableLocation = firstAlternateTableLocation;
                     while (alternateTableLocation < rehashPointer) {
                         outputPosition = alternateOutputPosition.getUnsafe(alternateTableLocation);
-                        if (outputPosition == EMPTY_OUTPUT_POSITION) {
+                        if (isStateEmpty(outputPosition)) {
                             break;
                         } else if (eq(alternateKeySource0.getUnsafe(alternateTableLocation), k0) && eq(alternateKeySource1.getUnsafe(alternateTableLocation), k1)) {
                             outputPositions.set(chunkPosition, outputPosition);
@@ -114,7 +114,7 @@ protected void probe(RowSequence rowSequence, Chunk[] sourceKeyChunks) {
             boolean found = false;
             int tableLocation = firstTableLocation;
             int outputPosition;
-            while ((outputPosition = mainOutputPosition.getUnsafe(tableLocation)) != EMPTY_OUTPUT_POSITION) {
+            while (!isStateEmpty(outputPosition = mainOutputPosition.getUnsafe(tableLocation))) {
                 if (eq(mainKeySource0.getUnsafe(tableLocation), k0) && eq(mainKeySource1.getUnsafe(tableLocation), k1)) {
                     outputPositions.set(chunkPosition, outputPosition);
                     found = true;
@@ -128,7 +128,7 @@ protected void probe(RowSequence rowSequence, Chunk[] sourceKeyChunks) {
                 boolean alternateFound = false;
                 if (firstAlternateTableLocation < rehashPointer) {
                     int alternateTableLocation = firstAlternateTableLocation;
-                    while ((outputPosition = alternateOutputPosition.getUnsafe(alternateTableLocation)) != EMPTY_OUTPUT_POSITION) {
+                    while (!isStateEmpty(outputPosition = alternateOutputPosition.getUnsafe(alternateTableLocation))) {
                         if (eq(alternateKeySource0.getUnsafe(alternateTableLocation), k0) && eq(alternateKeySource1.getUnsafe(alternateTableLocation), k1)) {
                             outputPositions.set(chunkPosition, outputPosition);
                             alternateFound = true;
@@ -151,16 +151,20 @@ private static int hash(float k0, long k1) {
         return hash;
     }
 
+    private static boolean isStateEmpty(int state) {
+        return state == EMPTY_OUTPUT_POSITION;
+    }
+
     private boolean migrateOneLocation(int locationToMigrate) {
         final int currentStateValue = alternateOutputPosition.getUnsafe(locationToMigrate);
-        if (currentStateValue == EMPTY_OUTPUT_POSITION) {
+        if (isStateEmpty(currentStateValue)) {
             return false;
         }
         final float k0 = alternateKeySource0.getUnsafe(locationToMigrate);
         final long k1 = alternateKeySource1.getUnsafe(locationToMigrate);
         final int hash = hash(k0, k1);
         int destinationTableLocation = hashToTableLocation(hash);
-        while (mainOutputPosition.getUnsafe(destinationTableLocation) != EMPTY_OUTPUT_POSITION) {
+        while (!isStateEmpty(mainOutputPosition.getUnsafe(destinationTableLocation))) {
             destinationTableLocation = nextTableLocation(destinationTableLocation);
         }
         mainKeySource0.set(destinationTableLocation, k0);
@@ -183,8 +187,7 @@ protected int rehashInternalPartial(int entriesToRehash) {
     }
 
     @Override
-    protected void newAlternate() {
-        super.newAlternate();
+    protected void adviseNewAlternate() {
         this.mainKeySource0 = (ImmutableFloatArraySource)super.mainKeySources[0];
         this.alternateKeySource0 = (ImmutableFloatArraySource)super.alternateKeySources[0];
         this.mainKeySource1 = (ImmutableLongArraySource)super.mainKeySources[1];
@@ -201,7 +204,7 @@ protected void clearAlternate() {
     @Override
     protected void migrateFront() {
         int location = 0;
-        while (migrateOneLocation(location++));
+        while (migrateOneLocation(location++) && location < alternateTableSize);
     }
 
     @Override
@@ -218,7 +221,7 @@ protected void rehashInternalFull(final int oldSize) {
         mainOutputPosition.setArray(destState);
         for (int sourceBucket = 0; sourceBucket < oldSize; ++sourceBucket) {
             final int currentStateValue = originalStateArray[sourceBucket];
-            if (currentStateValue == EMPTY_OUTPUT_POSITION) {
+            if (isStateEmpty(currentStateValue)) {
                 continue;
             }
             final float k0 = originalKeyArray0[sourceBucket];
@@ -227,7 +230,7 @@ protected void rehashInternalFull(final int oldSize) {
             final int firstDestinationTableLocation = hashToTableLocation(hash);
             int destinationTableLocation = firstDestinationTableLocation;
             while (true) {
-                if (destState[destinationTableLocation] == EMPTY_OUTPUT_POSITION) {
+                if (isStateEmpty(destState[destinationTableLocation])) {
                     destKeyArray0[destinationTableLocation] = k0;
                     destKeyArray1[destinationTableLocation] = k1;
                     destState[destinationTableLocation] = originalStateArray[sourceBucket];
@@ -250,7 +253,7 @@ public int findPositionForKey(Object key) {
         final int firstTableLocation = tableLocation;
         while (true) {
             final int positionValue = mainOutputPosition.getUnsafe(tableLocation);
-            if (positionValue == EMPTY_OUTPUT_POSITION) {
+            if (isStateEmpty(positionValue)) {
                 int alternateTableLocation = hashToTableLocationAlternate(hash);
                 if (alternateTableLocation >= rehashPointer) {
                     return UNKNOWN_ROW;
@@ -258,7 +261,7 @@ public int findPositionForKey(Object key) {
                 final int firstAlternateTableLocation = alternateTableLocation;
                 while (true) {
                     final int alternatePositionValue = alternateOutputPosition.getUnsafe(alternateTableLocation);
-                    if (alternatePositionValue == EMPTY_OUTPUT_POSITION) {
+                    if (isStateEmpty(alternatePositionValue)) {
                         return UNKNOWN_ROW;
                     }
                     if (eq(alternateKeySource0.getUnsafe(alternateTableLocation), k0) && eq(alternateKeySource1.getUnsafe(alternateTableLocation), k1)) {
diff --git a/engine/table/src/main/java/io/deephaven/engine/table/impl/by/typed/incopenagg/gen/IncrementalAggOpenHasherFloatObject.java b/engine/table/src/main/java/io/deephaven/engine/table/impl/by/typed/incopenagg/gen/IncrementalAggOpenHasherFloatObject.java
index b7df7dcd58b..76bbe9a0979 100644
--- a/engine/table/src/main/java/io/deephaven/engine/table/impl/by/typed/incopenagg/gen/IncrementalAggOpenHasherFloatObject.java
+++ b/engine/table/src/main/java/io/deephaven/engine/table/impl/by/typed/incopenagg/gen/IncrementalAggOpenHasherFloatObject.java
@@ -67,12 +67,12 @@ protected void build(RowSequence rowSequence, Chunk[] sourceKeyChunks) {
             int tableLocation = firstTableLocation;
             MAIN_SEARCH: while (true) {
                 int outputPosition = mainOutputPosition.getUnsafe(tableLocation);
-                if (outputPosition == EMPTY_OUTPUT_POSITION) {
+                if (isStateEmpty(outputPosition)) {
                     final int firstAlternateTableLocation = hashToTableLocationAlternate(hash);
                     int alternateTableLocation = firstAlternateTableLocation;
                     while (alternateTableLocation < rehashPointer) {
                         outputPosition = alternateOutputPosition.getUnsafe(alternateTableLocation);
-                        if (outputPosition == EMPTY_OUTPUT_POSITION) {
+                        if (isStateEmpty(outputPosition)) {
                             break;
                         } else if (eq(alternateKeySource0.getUnsafe(alternateTableLocation), k0) && eq(alternateKeySource1.getUnsafe(alternateTableLocation), k1)) {
                             outputPositions.set(chunkPosition, outputPosition);
@@ -113,7 +113,7 @@ protected void probe(RowSequence rowSequence, Chunk[] sourceKeyChunks) {
             boolean found = false;
             int tableLocation = firstTableLocation;
             int outputPosition;
-            while ((outputPosition = mainOutputPosition.getUnsafe(tableLocation)) != EMPTY_OUTPUT_POSITION) {
+            while (!isStateEmpty(outputPosition = mainOutputPosition.getUnsafe(tableLocation))) {
                 if (eq(mainKeySource0.getUnsafe(tableLocation), k0) && eq(mainKeySource1.getUnsafe(tableLocation), k1)) {
                     outputPositions.set(chunkPosition, outputPosition);
                     found = true;
@@ -127,7 +127,7 @@ protected void probe(RowSequence rowSequence, Chunk[] sourceKeyChunks) {
                 boolean alternateFound = false;
                 if (firstAlternateTableLocation < rehashPointer) {
                     int alternateTableLocation = firstAlternateTableLocation;
-                    while ((outputPosition = alternateOutputPosition.getUnsafe(alternateTableLocation)) != EMPTY_OUTPUT_POSITION) {
+                    while (!isStateEmpty(outputPosition = alternateOutputPosition.getUnsafe(alternateTableLocation))) {
                         if (eq(alternateKeySource0.getUnsafe(alternateTableLocation), k0) && eq(alternateKeySource1.getUnsafe(alternateTableLocation), k1)) {
                             outputPositions.set(chunkPosition, outputPosition);
                             alternateFound = true;
@@ -150,16 +150,20 @@ private static int hash(float k0, Object k1) {
         return hash;
     }
 
+    private static boolean isStateEmpty(int state) {
+        return state == EMPTY_OUTPUT_POSITION;
+    }
+
     private boolean migrateOneLocation(int locationToMigrate) {
         final int currentStateValue = alternateOutputPosition.getUnsafe(locationToMigrate);
-        if (currentStateValue == EMPTY_OUTPUT_POSITION) {
+        if (isStateEmpty(currentStateValue)) {
             return false;
         }
         final float k0 = alternateKeySource0.getUnsafe(locationToMigrate);
         final Object k1 = alternateKeySource1.getUnsafe(locationToMigrate);
         final int hash = hash(k0, k1);
         int destinationTableLocation = hashToTableLocation(hash);
-        while (mainOutputPosition.getUnsafe(destinationTableLocation) != EMPTY_OUTPUT_POSITION) {
+        while (!isStateEmpty(mainOutputPosition.getUnsafe(destinationTableLocation))) {
             destinationTableLocation = nextTableLocation(destinationTableLocation);
         }
         mainKeySource0.set(destinationTableLocation, k0);
@@ -183,8 +187,7 @@ protected int rehashInternalPartial(int entriesToRehash) {
     }
 
     @Override
-    protected void newAlternate() {
-        super.newAlternate();
+    protected void adviseNewAlternate() {
         this.mainKeySource0 = (ImmutableFloatArraySource)super.mainKeySources[0];
         this.alternateKeySource0 = (ImmutableFloatArraySource)super.alternateKeySources[0];
         this.mainKeySource1 = (ImmutableObjectArraySource)super.mainKeySources[1];
@@ -201,7 +204,7 @@ protected void clearAlternate() {
     @Override
     protected void migrateFront() {
         int location = 0;
-        while (migrateOneLocation(location++));
+        while (migrateOneLocation(location++) && location < alternateTableSize);
     }
 
     @Override
@@ -218,7 +221,7 @@ protected void rehashInternalFull(final int oldSize) {
         mainOutputPosition.setArray(destState);
         for (int sourceBucket = 0; sourceBucket < oldSize; ++sourceBucket) {
             final int currentStateValue = originalStateArray[sourceBucket];
-            if (currentStateValue == EMPTY_OUTPUT_POSITION) {
+            if (isStateEmpty(currentStateValue)) {
                 continue;
             }
             final float k0 = originalKeyArray0[sourceBucket];
@@ -227,7 +230,7 @@ protected void rehashInternalFull(final int oldSize) {
             final int firstDestinationTableLocation = hashToTableLocation(hash);
             int destinationTableLocation = firstDestinationTableLocation;
             while (true) {
-                if (destState[destinationTableLocation] == EMPTY_OUTPUT_POSITION) {
+                if (isStateEmpty(destState[destinationTableLocation])) {
                     destKeyArray0[destinationTableLocation] = k0;
                     destKeyArray1[destinationTableLocation] = k1;
                     destState[destinationTableLocation] = originalStateArray[sourceBucket];
@@ -250,7 +253,7 @@ public int findPositionForKey(Object key) {
         final int firstTableLocation = tableLocation;
         while (true) {
             final int positionValue = mainOutputPosition.getUnsafe(tableLocation);
-            if (positionValue == EMPTY_OUTPUT_POSITION) {
+            if (isStateEmpty(positionValue)) {
                 int alternateTableLocation = hashToTableLocationAlternate(hash);
                 if (alternateTableLocation >= rehashPointer) {
                     return UNKNOWN_ROW;
@@ -258,7 +261,7 @@ public int findPositionForKey(Object key) {
                 final int firstAlternateTableLocation = alternateTableLocation;
                 while (true) {
                     final int alternatePositionValue = alternateOutputPosition.getUnsafe(alternateTableLocation);
-                    if (alternatePositionValue == EMPTY_OUTPUT_POSITION) {
+                    if (isStateEmpty(alternatePositionValue)) {
                         return UNKNOWN_ROW;
                     }
                     if (eq(alternateKeySource0.getUnsafe(alternateTableLocation), k0) && eq(alternateKeySource1.getUnsafe(alternateTableLocation), k1)) {
diff --git a/engine/table/src/main/java/io/deephaven/engine/table/impl/by/typed/incopenagg/gen/IncrementalAggOpenHasherFloatShort.java b/engine/table/src/main/java/io/deephaven/engine/table/impl/by/typed/incopenagg/gen/IncrementalAggOpenHasherFloatShort.java
index e2953ce48fa..a4df3b84c35 100644
--- a/engine/table/src/main/java/io/deephaven/engine/table/impl/by/typed/incopenagg/gen/IncrementalAggOpenHasherFloatShort.java
+++ b/engine/table/src/main/java/io/deephaven/engine/table/impl/by/typed/incopenagg/gen/IncrementalAggOpenHasherFloatShort.java
@@ -68,12 +68,12 @@ protected void build(RowSequence rowSequence, Chunk[] sourceKeyChunks) {
             int tableLocation = firstTableLocation;
             MAIN_SEARCH: while (true) {
                 int outputPosition = mainOutputPosition.getUnsafe(tableLocation);
-                if (outputPosition == EMPTY_OUTPUT_POSITION) {
+                if (isStateEmpty(outputPosition)) {
                     final int firstAlternateTableLocation = hashToTableLocationAlternate(hash);
                     int alternateTableLocation = firstAlternateTableLocation;
                     while (alternateTableLocation < rehashPointer) {
                         outputPosition = alternateOutputPosition.getUnsafe(alternateTableLocation);
-                        if (outputPosition == EMPTY_OUTPUT_POSITION) {
+                        if (isStateEmpty(outputPosition)) {
                             break;
                         } else if (eq(alternateKeySource0.getUnsafe(alternateTableLocation), k0) && eq(alternateKeySource1.getUnsafe(alternateTableLocation), k1)) {
                             outputPositions.set(chunkPosition, outputPosition);
@@ -114,7 +114,7 @@ protected void probe(RowSequence rowSequence, Chunk[] sourceKeyChunks) {
             boolean found = false;
             int tableLocation = firstTableLocation;
             int outputPosition;
-            while ((outputPosition = mainOutputPosition.getUnsafe(tableLocation)) != EMPTY_OUTPUT_POSITION) {
+            while (!isStateEmpty(outputPosition = mainOutputPosition.getUnsafe(tableLocation))) {
                 if (eq(mainKeySource0.getUnsafe(tableLocation), k0) && eq(mainKeySource1.getUnsafe(tableLocation), k1)) {
                     outputPositions.set(chunkPosition, outputPosition);
                     found = true;
@@ -128,7 +128,7 @@ protected void probe(RowSequence rowSequence, Chunk[] sourceKeyChunks) {
                 boolean alternateFound = false;
                 if (firstAlternateTableLocation < rehashPointer) {
                     int alternateTableLocation = firstAlternateTableLocation;
-                    while ((outputPosition = alternateOutputPosition.getUnsafe(alternateTableLocation)) != EMPTY_OUTPUT_POSITION) {
+                    while (!isStateEmpty(outputPosition = alternateOutputPosition.getUnsafe(alternateTableLocation))) {
                         if (eq(alternateKeySource0.getUnsafe(alternateTableLocation), k0) && eq(alternateKeySource1.getUnsafe(alternateTableLocation), k1)) {
                             outputPositions.set(chunkPosition, outputPosition);
                             alternateFound = true;
@@ -151,16 +151,20 @@ private static int hash(float k0, short k1) {
         return hash;
     }
 
+    private static boolean isStateEmpty(int state) {
+        return state == EMPTY_OUTPUT_POSITION;
+    }
+
     private boolean migrateOneLocation(int locationToMigrate) {
         final int currentStateValue = alternateOutputPosition.getUnsafe(locationToMigrate);
-        if (currentStateValue == EMPTY_OUTPUT_POSITION) {
+        if (isStateEmpty(currentStateValue)) {
             return false;
         }
         final float k0 = alternateKeySource0.getUnsafe(locationToMigrate);
         final short k1 = alternateKeySource1.getUnsafe(locationToMigrate);
         final int hash = hash(k0, k1);
         int destinationTableLocation = hashToTableLocation(hash);
-        while (mainOutputPosition.getUnsafe(destinationTableLocation) != EMPTY_OUTPUT_POSITION) {
+        while (!isStateEmpty(mainOutputPosition.getUnsafe(destinationTableLocation))) {
             destinationTableLocation = nextTableLocation(destinationTableLocation);
         }
         mainKeySource0.set(destinationTableLocation, k0);
@@ -183,8 +187,7 @@ protected int rehashInternalPartial(int entriesToRehash) {
     }
 
     @Override
-    protected void newAlternate() {
-        super.newAlternate();
+    protected void adviseNewAlternate() {
         this.mainKeySource0 = (ImmutableFloatArraySource)super.mainKeySources[0];
         this.alternateKeySource0 = (ImmutableFloatArraySource)super.alternateKeySources[0];
         this.mainKeySource1 = (ImmutableShortArraySource)super.mainKeySources[1];
@@ -201,7 +204,7 @@ protected void clearAlternate() {
     @Override
     protected void migrateFront() {
         int location = 0;
-        while (migrateOneLocation(location++));
+        while (migrateOneLocation(location++) && location < alternateTableSize);
     }
 
     @Override
@@ -218,7 +221,7 @@ protected void rehashInternalFull(final int oldSize) {
         mainOutputPosition.setArray(destState);
         for (int sourceBucket = 0; sourceBucket < oldSize; ++sourceBucket) {
             final int currentStateValue = originalStateArray[sourceBucket];
-            if (currentStateValue == EMPTY_OUTPUT_POSITION) {
+            if (isStateEmpty(currentStateValue)) {
                 continue;
             }
             final float k0 = originalKeyArray0[sourceBucket];
@@ -227,7 +230,7 @@ protected void rehashInternalFull(final int oldSize) {
             final int firstDestinationTableLocation = hashToTableLocation(hash);
             int destinationTableLocation = firstDestinationTableLocation;
             while (true) {
-                if (destState[destinationTableLocation] == EMPTY_OUTPUT_POSITION) {
+                if (isStateEmpty(destState[destinationTableLocation])) {
                     destKeyArray0[destinationTableLocation] = k0;
                     destKeyArray1[destinationTableLocation] = k1;
                     destState[destinationTableLocation] = originalStateArray[sourceBucket];
@@ -250,7 +253,7 @@ public int findPositionForKey(Object key) {
         final int firstTableLocation = tableLocation;
         while (true) {
             final int positionValue = mainOutputPosition.getUnsafe(tableLocation);
-            if (positionValue == EMPTY_OUTPUT_POSITION) {
+            if (isStateEmpty(positionValue)) {
                 int alternateTableLocation = hashToTableLocationAlternate(hash);
                 if (alternateTableLocation >= rehashPointer) {
                     return UNKNOWN_ROW;
@@ -258,7 +261,7 @@ public int findPositionForKey(Object key) {
                 final int firstAlternateTableLocation = alternateTableLocation;
                 while (true) {
                     final int alternatePositionValue = alternateOutputPosition.getUnsafe(alternateTableLocation);
-                    if (alternatePositionValue == EMPTY_OUTPUT_POSITION) {
+                    if (isStateEmpty(alternatePositionValue)) {
                         return UNKNOWN_ROW;
                     }
                     if (eq(alternateKeySource0.getUnsafe(alternateTableLocation), k0) && eq(alternateKeySource1.getUnsafe(alternateTableLocation), k1)) {
diff --git a/engine/table/src/main/java/io/deephaven/engine/table/impl/by/typed/incopenagg/gen/IncrementalAggOpenHasherInt.java b/engine/table/src/main/java/io/deephaven/engine/table/impl/by/typed/incopenagg/gen/IncrementalAggOpenHasherInt.java
index bccff0bdeaa..443630cd972 100644
--- a/engine/table/src/main/java/io/deephaven/engine/table/impl/by/typed/incopenagg/gen/IncrementalAggOpenHasherInt.java
+++ b/engine/table/src/main/java/io/deephaven/engine/table/impl/by/typed/incopenagg/gen/IncrementalAggOpenHasherInt.java
@@ -55,12 +55,12 @@ protected void build(RowSequence rowSequence, Chunk[] sourceKeyChunks) {
             int tableLocation = firstTableLocation;
             MAIN_SEARCH: while (true) {
                 int outputPosition = mainOutputPosition.getUnsafe(tableLocation);
-                if (outputPosition == EMPTY_OUTPUT_POSITION) {
+                if (isStateEmpty(outputPosition)) {
                     final int firstAlternateTableLocation = hashToTableLocationAlternate(hash);
                     int alternateTableLocation = firstAlternateTableLocation;
                     while (alternateTableLocation < rehashPointer) {
                         outputPosition = alternateOutputPosition.getUnsafe(alternateTableLocation);
-                        if (outputPosition == EMPTY_OUTPUT_POSITION) {
+                        if (isStateEmpty(outputPosition)) {
                             break;
                         } else if (eq(alternateKeySource0.getUnsafe(alternateTableLocation), k0)) {
                             outputPositions.set(chunkPosition, outputPosition);
@@ -98,7 +98,7 @@ protected void probe(RowSequence rowSequence, Chunk[] sourceKeyChunks) {
             boolean found = false;
             int tableLocation = firstTableLocation;
             int outputPosition;
-            while ((outputPosition = mainOutputPosition.getUnsafe(tableLocation)) != EMPTY_OUTPUT_POSITION) {
+            while (!isStateEmpty(outputPosition = mainOutputPosition.getUnsafe(tableLocation))) {
                 if (eq(mainKeySource0.getUnsafe(tableLocation), k0)) {
                     outputPositions.set(chunkPosition, outputPosition);
                     found = true;
@@ -112,7 +112,7 @@ protected void probe(RowSequence rowSequence, Chunk[] sourceKeyChunks) {
                 boolean alternateFound = false;
                 if (firstAlternateTableLocation < rehashPointer) {
                     int alternateTableLocation = firstAlternateTableLocation;
-                    while ((outputPosition = alternateOutputPosition.getUnsafe(alternateTableLocation)) != EMPTY_OUTPUT_POSITION) {
+                    while (!isStateEmpty(outputPosition = alternateOutputPosition.getUnsafe(alternateTableLocation))) {
                         if (eq(alternateKeySource0.getUnsafe(alternateTableLocation), k0)) {
                             outputPositions.set(chunkPosition, outputPosition);
                             alternateFound = true;
@@ -134,15 +134,19 @@ private static int hash(int k0) {
         return hash;
     }
 
+    private static boolean isStateEmpty(int state) {
+        return state == EMPTY_OUTPUT_POSITION;
+    }
+
     private boolean migrateOneLocation(int locationToMigrate) {
         final int currentStateValue = alternateOutputPosition.getUnsafe(locationToMigrate);
-        if (currentStateValue == EMPTY_OUTPUT_POSITION) {
+        if (isStateEmpty(currentStateValue)) {
             return false;
         }
         final int k0 = alternateKeySource0.getUnsafe(locationToMigrate);
         final int hash = hash(k0);
         int destinationTableLocation = hashToTableLocation(hash);
-        while (mainOutputPosition.getUnsafe(destinationTableLocation) != EMPTY_OUTPUT_POSITION) {
+        while (!isStateEmpty(mainOutputPosition.getUnsafe(destinationTableLocation))) {
             destinationTableLocation = nextTableLocation(destinationTableLocation);
         }
         mainKeySource0.set(destinationTableLocation, k0);
@@ -164,8 +168,7 @@ protected int rehashInternalPartial(int entriesToRehash) {
     }
 
     @Override
-    protected void newAlternate() {
-        super.newAlternate();
+    protected void adviseNewAlternate() {
         this.mainKeySource0 = (ImmutableIntArraySource)super.mainKeySources[0];
         this.alternateKeySource0 = (ImmutableIntArraySource)super.alternateKeySources[0];
     }
@@ -179,7 +182,7 @@ protected void clearAlternate() {
     @Override
     protected void migrateFront() {
         int location = 0;
-        while (migrateOneLocation(location++));
+        while (migrateOneLocation(location++) && location < alternateTableSize);
     }
 
     @Override
@@ -193,7 +196,7 @@ protected void rehashInternalFull(final int oldSize) {
         mainOutputPosition.setArray(destState);
         for (int sourceBucket = 0; sourceBucket < oldSize; ++sourceBucket) {
             final int currentStateValue = originalStateArray[sourceBucket];
-            if (currentStateValue == EMPTY_OUTPUT_POSITION) {
+            if (isStateEmpty(currentStateValue)) {
                 continue;
             }
             final int k0 = originalKeyArray0[sourceBucket];
@@ -201,7 +204,7 @@ protected void rehashInternalFull(final int oldSize) {
             final int firstDestinationTableLocation = hashToTableLocation(hash);
             int destinationTableLocation = firstDestinationTableLocation;
             while (true) {
-                if (destState[destinationTableLocation] == EMPTY_OUTPUT_POSITION) {
+                if (isStateEmpty(destState[destinationTableLocation])) {
                     destKeyArray0[destinationTableLocation] = k0;
                     destState[destinationTableLocation] = originalStateArray[sourceBucket];
                     outputPositionToHashSlot.set(currentStateValue, mainInsertMask | destinationTableLocation);
@@ -221,7 +224,7 @@ public int findPositionForKey(Object key) {
         final int firstTableLocation = tableLocation;
         while (true) {
             final int positionValue = mainOutputPosition.getUnsafe(tableLocation);
-            if (positionValue == EMPTY_OUTPUT_POSITION) {
+            if (isStateEmpty(positionValue)) {
                 int alternateTableLocation = hashToTableLocationAlternate(hash);
                 if (alternateTableLocation >= rehashPointer) {
                     return UNKNOWN_ROW;
@@ -229,7 +232,7 @@ public int findPositionForKey(Object key) {
                 final int firstAlternateTableLocation = alternateTableLocation;
                 while (true) {
                     final int alternatePositionValue = alternateOutputPosition.getUnsafe(alternateTableLocation);
-                    if (alternatePositionValue == EMPTY_OUTPUT_POSITION) {
+                    if (isStateEmpty(alternatePositionValue)) {
                         return UNKNOWN_ROW;
                     }
                     if (eq(alternateKeySource0.getUnsafe(alternateTableLocation), k0)) {
diff --git a/engine/table/src/main/java/io/deephaven/engine/table/impl/by/typed/incopenagg/gen/IncrementalAggOpenHasherIntByte.java b/engine/table/src/main/java/io/deephaven/engine/table/impl/by/typed/incopenagg/gen/IncrementalAggOpenHasherIntByte.java
index 03e29753624..7ca9d819da5 100644
--- a/engine/table/src/main/java/io/deephaven/engine/table/impl/by/typed/incopenagg/gen/IncrementalAggOpenHasherIntByte.java
+++ b/engine/table/src/main/java/io/deephaven/engine/table/impl/by/typed/incopenagg/gen/IncrementalAggOpenHasherIntByte.java
@@ -68,12 +68,12 @@ protected void build(RowSequence rowSequence, Chunk[] sourceKeyChunks) {
             int tableLocation = firstTableLocation;
             MAIN_SEARCH: while (true) {
                 int outputPosition = mainOutputPosition.getUnsafe(tableLocation);
-                if (outputPosition == EMPTY_OUTPUT_POSITION) {
+                if (isStateEmpty(outputPosition)) {
                     final int firstAlternateTableLocation = hashToTableLocationAlternate(hash);
                     int alternateTableLocation = firstAlternateTableLocation;
                     while (alternateTableLocation < rehashPointer) {
                         outputPosition = alternateOutputPosition.getUnsafe(alternateTableLocation);
-                        if (outputPosition == EMPTY_OUTPUT_POSITION) {
+                        if (isStateEmpty(outputPosition)) {
                             break;
                         } else if (eq(alternateKeySource0.getUnsafe(alternateTableLocation), k0) && eq(alternateKeySource1.getUnsafe(alternateTableLocation), k1)) {
                             outputPositions.set(chunkPosition, outputPosition);
@@ -114,7 +114,7 @@ protected void probe(RowSequence rowSequence, Chunk[] sourceKeyChunks) {
             boolean found = false;
             int tableLocation = firstTableLocation;
             int outputPosition;
-            while ((outputPosition = mainOutputPosition.getUnsafe(tableLocation)) != EMPTY_OUTPUT_POSITION) {
+            while (!isStateEmpty(outputPosition = mainOutputPosition.getUnsafe(tableLocation))) {
                 if (eq(mainKeySource0.getUnsafe(tableLocation), k0) && eq(mainKeySource1.getUnsafe(tableLocation), k1)) {
                     outputPositions.set(chunkPosition, outputPosition);
                     found = true;
@@ -128,7 +128,7 @@ protected void probe(RowSequence rowSequence, Chunk[] sourceKeyChunks) {
                 boolean alternateFound = false;
                 if (firstAlternateTableLocation < rehashPointer) {
                     int alternateTableLocation = firstAlternateTableLocation;
-                    while ((outputPosition = alternateOutputPosition.getUnsafe(alternateTableLocation)) != EMPTY_OUTPUT_POSITION) {
+                    while (!isStateEmpty(outputPosition = alternateOutputPosition.getUnsafe(alternateTableLocation))) {
                         if (eq(alternateKeySource0.getUnsafe(alternateTableLocation), k0) && eq(alternateKeySource1.getUnsafe(alternateTableLocation), k1)) {
                             outputPositions.set(chunkPosition, outputPosition);
                             alternateFound = true;
@@ -151,16 +151,20 @@ private static int hash(int k0, byte k1) {
         return hash;
     }
 
+    private static boolean isStateEmpty(int state) {
+        return state == EMPTY_OUTPUT_POSITION;
+    }
+
     private boolean migrateOneLocation(int locationToMigrate) {
         final int currentStateValue = alternateOutputPosition.getUnsafe(locationToMigrate);
-        if (currentStateValue == EMPTY_OUTPUT_POSITION) {
+        if (isStateEmpty(currentStateValue)) {
             return false;
         }
         final int k0 = alternateKeySource0.getUnsafe(locationToMigrate);
         final byte k1 = alternateKeySource1.getUnsafe(locationToMigrate);
         final int hash = hash(k0, k1);
         int destinationTableLocation = hashToTableLocation(hash);
-        while (mainOutputPosition.getUnsafe(destinationTableLocation) != EMPTY_OUTPUT_POSITION) {
+        while (!isStateEmpty(mainOutputPosition.getUnsafe(destinationTableLocation))) {
             destinationTableLocation = nextTableLocation(destinationTableLocation);
         }
         mainKeySource0.set(destinationTableLocation, k0);
@@ -183,8 +187,7 @@ protected int rehashInternalPartial(int entriesToRehash) {
     }
 
     @Override
-    protected void newAlternate() {
-        super.newAlternate();
+    protected void adviseNewAlternate() {
         this.mainKeySource0 = (ImmutableIntArraySource)super.mainKeySources[0];
         this.alternateKeySource0 = (ImmutableIntArraySource)super.alternateKeySources[0];
         this.mainKeySource1 = (ImmutableByteArraySource)super.mainKeySources[1];
@@ -201,7 +204,7 @@ protected void clearAlternate() {
     @Override
     protected void migrateFront() {
         int location = 0;
-        while (migrateOneLocation(location++));
+        while (migrateOneLocation(location++) && location < alternateTableSize);
     }
 
     @Override
@@ -218,7 +221,7 @@ protected void rehashInternalFull(final int oldSize) {
         mainOutputPosition.setArray(destState);
         for (int sourceBucket = 0; sourceBucket < oldSize; ++sourceBucket) {
             final int currentStateValue = originalStateArray[sourceBucket];
-            if (currentStateValue == EMPTY_OUTPUT_POSITION) {
+            if (isStateEmpty(currentStateValue)) {
                 continue;
             }
             final int k0 = originalKeyArray0[sourceBucket];
@@ -227,7 +230,7 @@ protected void rehashInternalFull(final int oldSize) {
             final int firstDestinationTableLocation = hashToTableLocation(hash);
             int destinationTableLocation = firstDestinationTableLocation;
             while (true) {
-                if (destState[destinationTableLocation] == EMPTY_OUTPUT_POSITION) {
+                if (isStateEmpty(destState[destinationTableLocation])) {
                     destKeyArray0[destinationTableLocation] = k0;
                     destKeyArray1[destinationTableLocation] = k1;
                     destState[destinationTableLocation] = originalStateArray[sourceBucket];
@@ -250,7 +253,7 @@ public int findPositionForKey(Object key) {
         final int firstTableLocation = tableLocation;
         while (true) {
             final int positionValue = mainOutputPosition.getUnsafe(tableLocation);
-            if (positionValue == EMPTY_OUTPUT_POSITION) {
+            if (isStateEmpty(positionValue)) {
                 int alternateTableLocation = hashToTableLocationAlternate(hash);
                 if (alternateTableLocation >= rehashPointer) {
                     return UNKNOWN_ROW;
@@ -258,7 +261,7 @@ public int findPositionForKey(Object key) {
                 final int firstAlternateTableLocation = alternateTableLocation;
                 while (true) {
                     final int alternatePositionValue = alternateOutputPosition.getUnsafe(alternateTableLocation);
-                    if (alternatePositionValue == EMPTY_OUTPUT_POSITION) {
+                    if (isStateEmpty(alternatePositionValue)) {
                         return UNKNOWN_ROW;
                     }
                     if (eq(alternateKeySource0.getUnsafe(alternateTableLocation), k0) && eq(alternateKeySource1.getUnsafe(alternateTableLocation), k1)) {
diff --git a/engine/table/src/main/java/io/deephaven/engine/table/impl/by/typed/incopenagg/gen/IncrementalAggOpenHasherIntChar.java b/engine/table/src/main/java/io/deephaven/engine/table/impl/by/typed/incopenagg/gen/IncrementalAggOpenHasherIntChar.java
index 9f36e6e9f23..582109b8fbd 100644
--- a/engine/table/src/main/java/io/deephaven/engine/table/impl/by/typed/incopenagg/gen/IncrementalAggOpenHasherIntChar.java
+++ b/engine/table/src/main/java/io/deephaven/engine/table/impl/by/typed/incopenagg/gen/IncrementalAggOpenHasherIntChar.java
@@ -68,12 +68,12 @@ protected void build(RowSequence rowSequence, Chunk[] sourceKeyChunks) {
             int tableLocation = firstTableLocation;
             MAIN_SEARCH: while (true) {
                 int outputPosition = mainOutputPosition.getUnsafe(tableLocation);
-                if (outputPosition == EMPTY_OUTPUT_POSITION) {
+                if (isStateEmpty(outputPosition)) {
                     final int firstAlternateTableLocation = hashToTableLocationAlternate(hash);
                     int alternateTableLocation = firstAlternateTableLocation;
                     while (alternateTableLocation < rehashPointer) {
                         outputPosition = alternateOutputPosition.getUnsafe(alternateTableLocation);
-                        if (outputPosition == EMPTY_OUTPUT_POSITION) {
+                        if (isStateEmpty(outputPosition)) {
                             break;
                         } else if (eq(alternateKeySource0.getUnsafe(alternateTableLocation), k0) && eq(alternateKeySource1.getUnsafe(alternateTableLocation), k1)) {
                             outputPositions.set(chunkPosition, outputPosition);
@@ -114,7 +114,7 @@ protected void probe(RowSequence rowSequence, Chunk[] sourceKeyChunks) {
             boolean found = false;
             int tableLocation = firstTableLocation;
             int outputPosition;
-            while ((outputPosition = mainOutputPosition.getUnsafe(tableLocation)) != EMPTY_OUTPUT_POSITION) {
+            while (!isStateEmpty(outputPosition = mainOutputPosition.getUnsafe(tableLocation))) {
                 if (eq(mainKeySource0.getUnsafe(tableLocation), k0) && eq(mainKeySource1.getUnsafe(tableLocation), k1)) {
                     outputPositions.set(chunkPosition, outputPosition);
                     found = true;
@@ -128,7 +128,7 @@ protected void probe(RowSequence rowSequence, Chunk[] sourceKeyChunks) {
                 boolean alternateFound = false;
                 if (firstAlternateTableLocation < rehashPointer) {
                     int alternateTableLocation = firstAlternateTableLocation;
-                    while ((outputPosition = alternateOutputPosition.getUnsafe(alternateTableLocation)) != EMPTY_OUTPUT_POSITION) {
+                    while (!isStateEmpty(outputPosition = alternateOutputPosition.getUnsafe(alternateTableLocation))) {
                         if (eq(alternateKeySource0.getUnsafe(alternateTableLocation), k0) && eq(alternateKeySource1.getUnsafe(alternateTableLocation), k1)) {
                             outputPositions.set(chunkPosition, outputPosition);
                             alternateFound = true;
@@ -151,16 +151,20 @@ private static int hash(int k0, char k1) {
         return hash;
     }
 
+    private static boolean isStateEmpty(int state) {
+        return state == EMPTY_OUTPUT_POSITION;
+    }
+
     private boolean migrateOneLocation(int locationToMigrate) {
         final int currentStateValue = alternateOutputPosition.getUnsafe(locationToMigrate);
-        if (currentStateValue == EMPTY_OUTPUT_POSITION) {
+        if (isStateEmpty(currentStateValue)) {
             return false;
         }
         final int k0 = alternateKeySource0.getUnsafe(locationToMigrate);
         final char k1 = alternateKeySource1.getUnsafe(locationToMigrate);
         final int hash = hash(k0, k1);
         int destinationTableLocation = hashToTableLocation(hash);
-        while (mainOutputPosition.getUnsafe(destinationTableLocation) != EMPTY_OUTPUT_POSITION) {
+        while (!isStateEmpty(mainOutputPosition.getUnsafe(destinationTableLocation))) {
             destinationTableLocation = nextTableLocation(destinationTableLocation);
         }
         mainKeySource0.set(destinationTableLocation, k0);
@@ -183,8 +187,7 @@ protected int rehashInternalPartial(int entriesToRehash) {
     }
 
     @Override
-    protected void newAlternate() {
-        super.newAlternate();
+    protected void adviseNewAlternate() {
         this.mainKeySource0 = (ImmutableIntArraySource)super.mainKeySources[0];
         this.alternateKeySource0 = (ImmutableIntArraySource)super.alternateKeySources[0];
         this.mainKeySource1 = (ImmutableCharArraySource)super.mainKeySources[1];
@@ -201,7 +204,7 @@ protected void clearAlternate() {
     @Override
     protected void migrateFront() {
         int location = 0;
-        while (migrateOneLocation(location++));
+        while (migrateOneLocation(location++) && location < alternateTableSize);
     }
 
     @Override
@@ -218,7 +221,7 @@ protected void rehashInternalFull(final int oldSize) {
         mainOutputPosition.setArray(destState);
         for (int sourceBucket = 0; sourceBucket < oldSize; ++sourceBucket) {
             final int currentStateValue = originalStateArray[sourceBucket];
-            if (currentStateValue == EMPTY_OUTPUT_POSITION) {
+            if (isStateEmpty(currentStateValue)) {
                 continue;
             }
             final int k0 = originalKeyArray0[sourceBucket];
@@ -227,7 +230,7 @@ protected void rehashInternalFull(final int oldSize) {
             final int firstDestinationTableLocation = hashToTableLocation(hash);
             int destinationTableLocation = firstDestinationTableLocation;
             while (true) {
-                if (destState[destinationTableLocation] == EMPTY_OUTPUT_POSITION) {
+                if (isStateEmpty(destState[destinationTableLocation])) {
                     destKeyArray0[destinationTableLocation] = k0;
                     destKeyArray1[destinationTableLocation] = k1;
                     destState[destinationTableLocation] = originalStateArray[sourceBucket];
@@ -250,7 +253,7 @@ public int findPositionForKey(Object key) {
         final int firstTableLocation = tableLocation;
         while (true) {
             final int positionValue = mainOutputPosition.getUnsafe(tableLocation);
-            if (positionValue == EMPTY_OUTPUT_POSITION) {
+            if (isStateEmpty(positionValue)) {
                 int alternateTableLocation = hashToTableLocationAlternate(hash);
                 if (alternateTableLocation >= rehashPointer) {
                     return UNKNOWN_ROW;
@@ -258,7 +261,7 @@ public int findPositionForKey(Object key) {
                 final int firstAlternateTableLocation = alternateTableLocation;
                 while (true) {
                     final int alternatePositionValue = alternateOutputPosition.getUnsafe(alternateTableLocation);
-                    if (alternatePositionValue == EMPTY_OUTPUT_POSITION) {
+                    if (isStateEmpty(alternatePositionValue)) {
                         return UNKNOWN_ROW;
                     }
                     if (eq(alternateKeySource0.getUnsafe(alternateTableLocation), k0) && eq(alternateKeySource1.getUnsafe(alternateTableLocation), k1)) {
diff --git a/engine/table/src/main/java/io/deephaven/engine/table/impl/by/typed/incopenagg/gen/IncrementalAggOpenHasherIntDouble.java b/engine/table/src/main/java/io/deephaven/engine/table/impl/by/typed/incopenagg/gen/IncrementalAggOpenHasherIntDouble.java
index 21bd128f42c..2638dd3bc35 100644
--- a/engine/table/src/main/java/io/deephaven/engine/table/impl/by/typed/incopenagg/gen/IncrementalAggOpenHasherIntDouble.java
+++ b/engine/table/src/main/java/io/deephaven/engine/table/impl/by/typed/incopenagg/gen/IncrementalAggOpenHasherIntDouble.java
@@ -68,12 +68,12 @@ protected void build(RowSequence rowSequence, Chunk[] sourceKeyChunks) {
             int tableLocation = firstTableLocation;
             MAIN_SEARCH: while (true) {
                 int outputPosition = mainOutputPosition.getUnsafe(tableLocation);
-                if (outputPosition == EMPTY_OUTPUT_POSITION) {
+                if (isStateEmpty(outputPosition)) {
                     final int firstAlternateTableLocation = hashToTableLocationAlternate(hash);
                     int alternateTableLocation = firstAlternateTableLocation;
                     while (alternateTableLocation < rehashPointer) {
                         outputPosition = alternateOutputPosition.getUnsafe(alternateTableLocation);
-                        if (outputPosition == EMPTY_OUTPUT_POSITION) {
+                        if (isStateEmpty(outputPosition)) {
                             break;
                         } else if (eq(alternateKeySource0.getUnsafe(alternateTableLocation), k0) && eq(alternateKeySource1.getUnsafe(alternateTableLocation), k1)) {
                             outputPositions.set(chunkPosition, outputPosition);
@@ -114,7 +114,7 @@ protected void probe(RowSequence rowSequence, Chunk[] sourceKeyChunks) {
             boolean found = false;
             int tableLocation = firstTableLocation;
             int outputPosition;
-            while ((outputPosition = mainOutputPosition.getUnsafe(tableLocation)) != EMPTY_OUTPUT_POSITION) {
+            while (!isStateEmpty(outputPosition = mainOutputPosition.getUnsafe(tableLocation))) {
                 if (eq(mainKeySource0.getUnsafe(tableLocation), k0) && eq(mainKeySource1.getUnsafe(tableLocation), k1)) {
                     outputPositions.set(chunkPosition, outputPosition);
                     found = true;
@@ -128,7 +128,7 @@ protected void probe(RowSequence rowSequence, Chunk[] sourceKeyChunks) {
                 boolean alternateFound = false;
                 if (firstAlternateTableLocation < rehashPointer) {
                     int alternateTableLocation = firstAlternateTableLocation;
-                    while ((outputPosition = alternateOutputPosition.getUnsafe(alternateTableLocation)) != EMPTY_OUTPUT_POSITION) {
+                    while (!isStateEmpty(outputPosition = alternateOutputPosition.getUnsafe(alternateTableLocation))) {
                         if (eq(alternateKeySource0.getUnsafe(alternateTableLocation), k0) && eq(alternateKeySource1.getUnsafe(alternateTableLocation), k1)) {
                             outputPositions.set(chunkPosition, outputPosition);
                             alternateFound = true;
@@ -151,16 +151,20 @@ private static int hash(int k0, double k1) {
         return hash;
     }
 
+    private static boolean isStateEmpty(int state) {
+        return state == EMPTY_OUTPUT_POSITION;
+    }
+
     private boolean migrateOneLocation(int locationToMigrate) {
         final int currentStateValue = alternateOutputPosition.getUnsafe(locationToMigrate);
-        if (currentStateValue == EMPTY_OUTPUT_POSITION) {
+        if (isStateEmpty(currentStateValue)) {
             return false;
         }
         final int k0 = alternateKeySource0.getUnsafe(locationToMigrate);
         final double k1 = alternateKeySource1.getUnsafe(locationToMigrate);
         final int hash = hash(k0, k1);
         int destinationTableLocation = hashToTableLocation(hash);
-        while (mainOutputPosition.getUnsafe(destinationTableLocation) != EMPTY_OUTPUT_POSITION) {
+        while (!isStateEmpty(mainOutputPosition.getUnsafe(destinationTableLocation))) {
             destinationTableLocation = nextTableLocation(destinationTableLocation);
         }
         mainKeySource0.set(destinationTableLocation, k0);
@@ -183,8 +187,7 @@ protected int rehashInternalPartial(int entriesToRehash) {
     }
 
     @Override
-    protected void newAlternate() {
-        super.newAlternate();
+    protected void adviseNewAlternate() {
         this.mainKeySource0 = (ImmutableIntArraySource)super.mainKeySources[0];
         this.alternateKeySource0 = (ImmutableIntArraySource)super.alternateKeySources[0];
         this.mainKeySource1 = (ImmutableDoubleArraySource)super.mainKeySources[1];
@@ -201,7 +204,7 @@ protected void clearAlternate() {
     @Override
     protected void migrateFront() {
         int location = 0;
-        while (migrateOneLocation(location++));
+        while (migrateOneLocation(location++) && location < alternateTableSize);
     }
 
     @Override
@@ -218,7 +221,7 @@ protected void rehashInternalFull(final int oldSize) {
         mainOutputPosition.setArray(destState);
         for (int sourceBucket = 0; sourceBucket < oldSize; ++sourceBucket) {
             final int currentStateValue = originalStateArray[sourceBucket];
-            if (currentStateValue == EMPTY_OUTPUT_POSITION) {
+            if (isStateEmpty(currentStateValue)) {
                 continue;
             }
             final int k0 = originalKeyArray0[sourceBucket];
@@ -227,7 +230,7 @@ protected void rehashInternalFull(final int oldSize) {
             final int firstDestinationTableLocation = hashToTableLocation(hash);
             int destinationTableLocation = firstDestinationTableLocation;
             while (true) {
-                if (destState[destinationTableLocation] == EMPTY_OUTPUT_POSITION) {
+                if (isStateEmpty(destState[destinationTableLocation])) {
                     destKeyArray0[destinationTableLocation] = k0;
                     destKeyArray1[destinationTableLocation] = k1;
                     destState[destinationTableLocation] = originalStateArray[sourceBucket];
@@ -250,7 +253,7 @@ public int findPositionForKey(Object key) {
         final int firstTableLocation = tableLocation;
         while (true) {
             final int positionValue = mainOutputPosition.getUnsafe(tableLocation);
-            if (positionValue == EMPTY_OUTPUT_POSITION) {
+            if (isStateEmpty(positionValue)) {
                 int alternateTableLocation = hashToTableLocationAlternate(hash);
                 if (alternateTableLocation >= rehashPointer) {
                     return UNKNOWN_ROW;
@@ -258,7 +261,7 @@ public int findPositionForKey(Object key) {
                 final int firstAlternateTableLocation = alternateTableLocation;
                 while (true) {
                     final int alternatePositionValue = alternateOutputPosition.getUnsafe(alternateTableLocation);
-                    if (alternatePositionValue == EMPTY_OUTPUT_POSITION) {
+                    if (isStateEmpty(alternatePositionValue)) {
                         return UNKNOWN_ROW;
                     }
                     if (eq(alternateKeySource0.getUnsafe(alternateTableLocation), k0) && eq(alternateKeySource1.getUnsafe(alternateTableLocation), k1)) {
diff --git a/engine/table/src/main/java/io/deephaven/engine/table/impl/by/typed/incopenagg/gen/IncrementalAggOpenHasherIntFloat.java b/engine/table/src/main/java/io/deephaven/engine/table/impl/by/typed/incopenagg/gen/IncrementalAggOpenHasherIntFloat.java
index 271410951c0..c5ccc024ae7 100644
--- a/engine/table/src/main/java/io/deephaven/engine/table/impl/by/typed/incopenagg/gen/IncrementalAggOpenHasherIntFloat.java
+++ b/engine/table/src/main/java/io/deephaven/engine/table/impl/by/typed/incopenagg/gen/IncrementalAggOpenHasherIntFloat.java
@@ -68,12 +68,12 @@ protected void build(RowSequence rowSequence, Chunk[] sourceKeyChunks) {
             int tableLocation = firstTableLocation;
             MAIN_SEARCH: while (true) {
                 int outputPosition = mainOutputPosition.getUnsafe(tableLocation);
-                if (outputPosition == EMPTY_OUTPUT_POSITION) {
+                if (isStateEmpty(outputPosition)) {
                     final int firstAlternateTableLocation = hashToTableLocationAlternate(hash);
                     int alternateTableLocation = firstAlternateTableLocation;
                     while (alternateTableLocation < rehashPointer) {
                         outputPosition = alternateOutputPosition.getUnsafe(alternateTableLocation);
-                        if (outputPosition == EMPTY_OUTPUT_POSITION) {
+                        if (isStateEmpty(outputPosition)) {
                             break;
                         } else if (eq(alternateKeySource0.getUnsafe(alternateTableLocation), k0) && eq(alternateKeySource1.getUnsafe(alternateTableLocation), k1)) {
                             outputPositions.set(chunkPosition, outputPosition);
@@ -114,7 +114,7 @@ protected void probe(RowSequence rowSequence, Chunk[] sourceKeyChunks) {
             boolean found = false;
             int tableLocation = firstTableLocation;
             int outputPosition;
-            while ((outputPosition = mainOutputPosition.getUnsafe(tableLocation)) != EMPTY_OUTPUT_POSITION) {
+            while (!isStateEmpty(outputPosition = mainOutputPosition.getUnsafe(tableLocation))) {
                 if (eq(mainKeySource0.getUnsafe(tableLocation), k0) && eq(mainKeySource1.getUnsafe(tableLocation), k1)) {
                     outputPositions.set(chunkPosition, outputPosition);
                     found = true;
@@ -128,7 +128,7 @@ protected void probe(RowSequence rowSequence, Chunk[] sourceKeyChunks) {
                 boolean alternateFound = false;
                 if (firstAlternateTableLocation < rehashPointer) {
                     int alternateTableLocation = firstAlternateTableLocation;
-                    while ((outputPosition = alternateOutputPosition.getUnsafe(alternateTableLocation)) != EMPTY_OUTPUT_POSITION) {
+                    while (!isStateEmpty(outputPosition = alternateOutputPosition.getUnsafe(alternateTableLocation))) {
                         if (eq(alternateKeySource0.getUnsafe(alternateTableLocation), k0) && eq(alternateKeySource1.getUnsafe(alternateTableLocation), k1)) {
                             outputPositions.set(chunkPosition, outputPosition);
                             alternateFound = true;
@@ -151,16 +151,20 @@ private static int hash(int k0, float k1) {
         return hash;
     }
 
+    private static boolean isStateEmpty(int state) {
+        return state == EMPTY_OUTPUT_POSITION;
+    }
+
     private boolean migrateOneLocation(int locationToMigrate) {
         final int currentStateValue = alternateOutputPosition.getUnsafe(locationToMigrate);
-        if (currentStateValue == EMPTY_OUTPUT_POSITION) {
+        if (isStateEmpty(currentStateValue)) {
             return false;
         }
         final int k0 = alternateKeySource0.getUnsafe(locationToMigrate);
         final float k1 = alternateKeySource1.getUnsafe(locationToMigrate);
         final int hash = hash(k0, k1);
         int destinationTableLocation = hashToTableLocation(hash);
-        while (mainOutputPosition.getUnsafe(destinationTableLocation) != EMPTY_OUTPUT_POSITION) {
+        while (!isStateEmpty(mainOutputPosition.getUnsafe(destinationTableLocation))) {
             destinationTableLocation = nextTableLocation(destinationTableLocation);
         }
         mainKeySource0.set(destinationTableLocation, k0);
@@ -183,8 +187,7 @@ protected int rehashInternalPartial(int entriesToRehash) {
     }
 
     @Override
-    protected void newAlternate() {
-        super.newAlternate();
+    protected void adviseNewAlternate() {
         this.mainKeySource0 = (ImmutableIntArraySource)super.mainKeySources[0];
         this.alternateKeySource0 = (ImmutableIntArraySource)super.alternateKeySources[0];
         this.mainKeySource1 = (ImmutableFloatArraySource)super.mainKeySources[1];
@@ -201,7 +204,7 @@ protected void clearAlternate() {
     @Override
     protected void migrateFront() {
         int location = 0;
-        while (migrateOneLocation(location++));
+        while (migrateOneLocation(location++) && location < alternateTableSize);
     }
 
     @Override
@@ -218,7 +221,7 @@ protected void rehashInternalFull(final int oldSize) {
         mainOutputPosition.setArray(destState);
         for (int sourceBucket = 0; sourceBucket < oldSize; ++sourceBucket) {
             final int currentStateValue = originalStateArray[sourceBucket];
-            if (currentStateValue == EMPTY_OUTPUT_POSITION) {
+            if (isStateEmpty(currentStateValue)) {
                 continue;
             }
             final int k0 = originalKeyArray0[sourceBucket];
@@ -227,7 +230,7 @@ protected void rehashInternalFull(final int oldSize) {
             final int firstDestinationTableLocation = hashToTableLocation(hash);
             int destinationTableLocation = firstDestinationTableLocation;
             while (true) {
-                if (destState[destinationTableLocation] == EMPTY_OUTPUT_POSITION) {
+                if (isStateEmpty(destState[destinationTableLocation])) {
                     destKeyArray0[destinationTableLocation] = k0;
                     destKeyArray1[destinationTableLocation] = k1;
                     destState[destinationTableLocation] = originalStateArray[sourceBucket];
@@ -250,7 +253,7 @@ public int findPositionForKey(Object key) {
         final int firstTableLocation = tableLocation;
         while (true) {
             final int positionValue = mainOutputPosition.getUnsafe(tableLocation);
-            if (positionValue == EMPTY_OUTPUT_POSITION) {
+            if (isStateEmpty(positionValue)) {
                 int alternateTableLocation = hashToTableLocationAlternate(hash);
                 if (alternateTableLocation >= rehashPointer) {
                     return UNKNOWN_ROW;
@@ -258,7 +261,7 @@ public int findPositionForKey(Object key) {
                 final int firstAlternateTableLocation = alternateTableLocation;
                 while (true) {
                     final int alternatePositionValue = alternateOutputPosition.getUnsafe(alternateTableLocation);
-                    if (alternatePositionValue == EMPTY_OUTPUT_POSITION) {
+                    if (isStateEmpty(alternatePositionValue)) {
                         return UNKNOWN_ROW;
                     }
                     if (eq(alternateKeySource0.getUnsafe(alternateTableLocation), k0) && eq(alternateKeySource1.getUnsafe(alternateTableLocation), k1)) {
diff --git a/engine/table/src/main/java/io/deephaven/engine/table/impl/by/typed/incopenagg/gen/IncrementalAggOpenHasherIntInt.java b/engine/table/src/main/java/io/deephaven/engine/table/impl/by/typed/incopenagg/gen/IncrementalAggOpenHasherIntInt.java
index 1b8245da12d..2cb4cfbc3b8 100644
--- a/engine/table/src/main/java/io/deephaven/engine/table/impl/by/typed/incopenagg/gen/IncrementalAggOpenHasherIntInt.java
+++ b/engine/table/src/main/java/io/deephaven/engine/table/impl/by/typed/incopenagg/gen/IncrementalAggOpenHasherIntInt.java
@@ -63,12 +63,12 @@ protected void build(RowSequence rowSequence, Chunk[] sourceKeyChunks) {
             int tableLocation = firstTableLocation;
             MAIN_SEARCH: while (true) {
                 int outputPosition = mainOutputPosition.getUnsafe(tableLocation);
-                if (outputPosition == EMPTY_OUTPUT_POSITION) {
+                if (isStateEmpty(outputPosition)) {
                     final int firstAlternateTableLocation = hashToTableLocationAlternate(hash);
                     int alternateTableLocation = firstAlternateTableLocation;
                     while (alternateTableLocation < rehashPointer) {
                         outputPosition = alternateOutputPosition.getUnsafe(alternateTableLocation);
-                        if (outputPosition == EMPTY_OUTPUT_POSITION) {
+                        if (isStateEmpty(outputPosition)) {
                             break;
                         } else if (eq(alternateKeySource0.getUnsafe(alternateTableLocation), k0) && eq(alternateKeySource1.getUnsafe(alternateTableLocation), k1)) {
                             outputPositions.set(chunkPosition, outputPosition);
@@ -109,7 +109,7 @@ protected void probe(RowSequence rowSequence, Chunk[] sourceKeyChunks) {
             boolean found = false;
             int tableLocation = firstTableLocation;
             int outputPosition;
-            while ((outputPosition = mainOutputPosition.getUnsafe(tableLocation)) != EMPTY_OUTPUT_POSITION) {
+            while (!isStateEmpty(outputPosition = mainOutputPosition.getUnsafe(tableLocation))) {
                 if (eq(mainKeySource0.getUnsafe(tableLocation), k0) && eq(mainKeySource1.getUnsafe(tableLocation), k1)) {
                     outputPositions.set(chunkPosition, outputPosition);
                     found = true;
@@ -123,7 +123,7 @@ protected void probe(RowSequence rowSequence, Chunk[] sourceKeyChunks) {
                 boolean alternateFound = false;
                 if (firstAlternateTableLocation < rehashPointer) {
                     int alternateTableLocation = firstAlternateTableLocation;
-                    while ((outputPosition = alternateOutputPosition.getUnsafe(alternateTableLocation)) != EMPTY_OUTPUT_POSITION) {
+                    while (!isStateEmpty(outputPosition = alternateOutputPosition.getUnsafe(alternateTableLocation))) {
                         if (eq(alternateKeySource0.getUnsafe(alternateTableLocation), k0) && eq(alternateKeySource1.getUnsafe(alternateTableLocation), k1)) {
                             outputPositions.set(chunkPosition, outputPosition);
                             alternateFound = true;
@@ -146,16 +146,20 @@ private static int hash(int k0, int k1) {
         return hash;
     }
 
+    private static boolean isStateEmpty(int state) {
+        return state == EMPTY_OUTPUT_POSITION;
+    }
+
     private boolean migrateOneLocation(int locationToMigrate) {
         final int currentStateValue = alternateOutputPosition.getUnsafe(locationToMigrate);
-        if (currentStateValue == EMPTY_OUTPUT_POSITION) {
+        if (isStateEmpty(currentStateValue)) {
             return false;
         }
         final int k0 = alternateKeySource0.getUnsafe(locationToMigrate);
         final int k1 = alternateKeySource1.getUnsafe(locationToMigrate);
         final int hash = hash(k0, k1);
         int destinationTableLocation = hashToTableLocation(hash);
-        while (mainOutputPosition.getUnsafe(destinationTableLocation) != EMPTY_OUTPUT_POSITION) {
+        while (!isStateEmpty(mainOutputPosition.getUnsafe(destinationTableLocation))) {
             destinationTableLocation = nextTableLocation(destinationTableLocation);
         }
         mainKeySource0.set(destinationTableLocation, k0);
@@ -178,8 +182,7 @@ protected int rehashInternalPartial(int entriesToRehash) {
     }
 
     @Override
-    protected void newAlternate() {
-        super.newAlternate();
+    protected void adviseNewAlternate() {
         this.mainKeySource0 = (ImmutableIntArraySource)super.mainKeySources[0];
         this.alternateKeySource0 = (ImmutableIntArraySource)super.alternateKeySources[0];
         this.mainKeySource1 = (ImmutableIntArraySource)super.mainKeySources[1];
@@ -196,7 +199,7 @@ protected void clearAlternate() {
     @Override
     protected void migrateFront() {
         int location = 0;
-        while (migrateOneLocation(location++));
+        while (migrateOneLocation(location++) && location < alternateTableSize);
     }
 
     @Override
@@ -213,7 +216,7 @@ protected void rehashInternalFull(final int oldSize) {
         mainOutputPosition.setArray(destState);
         for (int sourceBucket = 0; sourceBucket < oldSize; ++sourceBucket) {
             final int currentStateValue = originalStateArray[sourceBucket];
-            if (currentStateValue == EMPTY_OUTPUT_POSITION) {
+            if (isStateEmpty(currentStateValue)) {
                 continue;
             }
             final int k0 = originalKeyArray0[sourceBucket];
@@ -222,7 +225,7 @@ protected void rehashInternalFull(final int oldSize) {
             final int firstDestinationTableLocation = hashToTableLocation(hash);
             int destinationTableLocation = firstDestinationTableLocation;
             while (true) {
-                if (destState[destinationTableLocation] == EMPTY_OUTPUT_POSITION) {
+                if (isStateEmpty(destState[destinationTableLocation])) {
                     destKeyArray0[destinationTableLocation] = k0;
                     destKeyArray1[destinationTableLocation] = k1;
                     destState[destinationTableLocation] = originalStateArray[sourceBucket];
@@ -245,7 +248,7 @@ public int findPositionForKey(Object key) {
         final int firstTableLocation = tableLocation;
         while (true) {
             final int positionValue = mainOutputPosition.getUnsafe(tableLocation);
-            if (positionValue == EMPTY_OUTPUT_POSITION) {
+            if (isStateEmpty(positionValue)) {
                 int alternateTableLocation = hashToTableLocationAlternate(hash);
                 if (alternateTableLocation >= rehashPointer) {
                     return UNKNOWN_ROW;
@@ -253,7 +256,7 @@ public int findPositionForKey(Object key) {
                 final int firstAlternateTableLocation = alternateTableLocation;
                 while (true) {
                     final int alternatePositionValue = alternateOutputPosition.getUnsafe(alternateTableLocation);
-                    if (alternatePositionValue == EMPTY_OUTPUT_POSITION) {
+                    if (isStateEmpty(alternatePositionValue)) {
                         return UNKNOWN_ROW;
                     }
                     if (eq(alternateKeySource0.getUnsafe(alternateTableLocation), k0) && eq(alternateKeySource1.getUnsafe(alternateTableLocation), k1)) {
diff --git a/engine/table/src/main/java/io/deephaven/engine/table/impl/by/typed/incopenagg/gen/IncrementalAggOpenHasherIntLong.java b/engine/table/src/main/java/io/deephaven/engine/table/impl/by/typed/incopenagg/gen/IncrementalAggOpenHasherIntLong.java
index ee7c762b4d8..1622e473fcf 100644
--- a/engine/table/src/main/java/io/deephaven/engine/table/impl/by/typed/incopenagg/gen/IncrementalAggOpenHasherIntLong.java
+++ b/engine/table/src/main/java/io/deephaven/engine/table/impl/by/typed/incopenagg/gen/IncrementalAggOpenHasherIntLong.java
@@ -68,12 +68,12 @@ protected void build(RowSequence rowSequence, Chunk[] sourceKeyChunks) {
             int tableLocation = firstTableLocation;
             MAIN_SEARCH: while (true) {
                 int outputPosition = mainOutputPosition.getUnsafe(tableLocation);
-                if (outputPosition == EMPTY_OUTPUT_POSITION) {
+                if (isStateEmpty(outputPosition)) {
                     final int firstAlternateTableLocation = hashToTableLocationAlternate(hash);
                     int alternateTableLocation = firstAlternateTableLocation;
                     while (alternateTableLocation < rehashPointer) {
                         outputPosition = alternateOutputPosition.getUnsafe(alternateTableLocation);
-                        if (outputPosition == EMPTY_OUTPUT_POSITION) {
+                        if (isStateEmpty(outputPosition)) {
                             break;
                         } else if (eq(alternateKeySource0.getUnsafe(alternateTableLocation), k0) && eq(alternateKeySource1.getUnsafe(alternateTableLocation), k1)) {
                             outputPositions.set(chunkPosition, outputPosition);
@@ -114,7 +114,7 @@ protected void probe(RowSequence rowSequence, Chunk[] sourceKeyChunks) {
             boolean found = false;
             int tableLocation = firstTableLocation;
             int outputPosition;
-            while ((outputPosition = mainOutputPosition.getUnsafe(tableLocation)) != EMPTY_OUTPUT_POSITION) {
+            while (!isStateEmpty(outputPosition = mainOutputPosition.getUnsafe(tableLocation))) {
                 if (eq(mainKeySource0.getUnsafe(tableLocation), k0) && eq(mainKeySource1.getUnsafe(tableLocation), k1)) {
                     outputPositions.set(chunkPosition, outputPosition);
                     found = true;
@@ -128,7 +128,7 @@ protected void probe(RowSequence rowSequence, Chunk[] sourceKeyChunks) {
                 boolean alternateFound = false;
                 if (firstAlternateTableLocation < rehashPointer) {
                     int alternateTableLocation = firstAlternateTableLocation;
-                    while ((outputPosition = alternateOutputPosition.getUnsafe(alternateTableLocation)) != EMPTY_OUTPUT_POSITION) {
+                    while (!isStateEmpty(outputPosition = alternateOutputPosition.getUnsafe(alternateTableLocation))) {
                         if (eq(alternateKeySource0.getUnsafe(alternateTableLocation), k0) && eq(alternateKeySource1.getUnsafe(alternateTableLocation), k1)) {
                             outputPositions.set(chunkPosition, outputPosition);
                             alternateFound = true;
@@ -151,16 +151,20 @@ private static int hash(int k0, long k1) {
         return hash;
     }
 
+    private static boolean isStateEmpty(int state) {
+        return state == EMPTY_OUTPUT_POSITION;
+    }
+
     private boolean migrateOneLocation(int locationToMigrate) {
         final int currentStateValue = alternateOutputPosition.getUnsafe(locationToMigrate);
-        if (currentStateValue == EMPTY_OUTPUT_POSITION) {
+        if (isStateEmpty(currentStateValue)) {
             return false;
         }
         final int k0 = alternateKeySource0.getUnsafe(locationToMigrate);
         final long k1 = alternateKeySource1.getUnsafe(locationToMigrate);
         final int hash = hash(k0, k1);
         int destinationTableLocation = hashToTableLocation(hash);
-        while (mainOutputPosition.getUnsafe(destinationTableLocation) != EMPTY_OUTPUT_POSITION) {
+        while (!isStateEmpty(mainOutputPosition.getUnsafe(destinationTableLocation))) {
             destinationTableLocation = nextTableLocation(destinationTableLocation);
         }
         mainKeySource0.set(destinationTableLocation, k0);
@@ -183,8 +187,7 @@ protected int rehashInternalPartial(int entriesToRehash) {
     }
 
     @Override
-    protected void newAlternate() {
-        super.newAlternate();
+    protected void adviseNewAlternate() {
         this.mainKeySource0 = (ImmutableIntArraySource)super.mainKeySources[0];
         this.alternateKeySource0 = (ImmutableIntArraySource)super.alternateKeySources[0];
         this.mainKeySource1 = (ImmutableLongArraySource)super.mainKeySources[1];
@@ -201,7 +204,7 @@ protected void clearAlternate() {
     @Override
     protected void migrateFront() {
         int location = 0;
-        while (migrateOneLocation(location++));
+        while (migrateOneLocation(location++) && location < alternateTableSize);
     }
 
     @Override
@@ -218,7 +221,7 @@ protected void rehashInternalFull(final int oldSize) {
         mainOutputPosition.setArray(destState);
         for (int sourceBucket = 0; sourceBucket < oldSize; ++sourceBucket) {
             final int currentStateValue = originalStateArray[sourceBucket];
-            if (currentStateValue == EMPTY_OUTPUT_POSITION) {
+            if (isStateEmpty(currentStateValue)) {
                 continue;
             }
             final int k0 = originalKeyArray0[sourceBucket];
@@ -227,7 +230,7 @@ protected void rehashInternalFull(final int oldSize) {
             final int firstDestinationTableLocation = hashToTableLocation(hash);
             int destinationTableLocation = firstDestinationTableLocation;
             while (true) {
-                if (destState[destinationTableLocation] == EMPTY_OUTPUT_POSITION) {
+                if (isStateEmpty(destState[destinationTableLocation])) {
                     destKeyArray0[destinationTableLocation] = k0;
                     destKeyArray1[destinationTableLocation] = k1;
                     destState[destinationTableLocation] = originalStateArray[sourceBucket];
@@ -250,7 +253,7 @@ public int findPositionForKey(Object key) {
         final int firstTableLocation = tableLocation;
         while (true) {
             final int positionValue = mainOutputPosition.getUnsafe(tableLocation);
-            if (positionValue == EMPTY_OUTPUT_POSITION) {
+            if (isStateEmpty(positionValue)) {
                 int alternateTableLocation = hashToTableLocationAlternate(hash);
                 if (alternateTableLocation >= rehashPointer) {
                     return UNKNOWN_ROW;
@@ -258,7 +261,7 @@ public int findPositionForKey(Object key) {
                 final int firstAlternateTableLocation = alternateTableLocation;
                 while (true) {
                     final int alternatePositionValue = alternateOutputPosition.getUnsafe(alternateTableLocation);
-                    if (alternatePositionValue == EMPTY_OUTPUT_POSITION) {
+                    if (isStateEmpty(alternatePositionValue)) {
                         return UNKNOWN_ROW;
                     }
                     if (eq(alternateKeySource0.getUnsafe(alternateTableLocation), k0) && eq(alternateKeySource1.getUnsafe(alternateTableLocation), k1)) {
diff --git a/engine/table/src/main/java/io/deephaven/engine/table/impl/by/typed/incopenagg/gen/IncrementalAggOpenHasherIntObject.java b/engine/table/src/main/java/io/deephaven/engine/table/impl/by/typed/incopenagg/gen/IncrementalAggOpenHasherIntObject.java
index 3db9edc2a12..3bd30fd17aa 100644
--- a/engine/table/src/main/java/io/deephaven/engine/table/impl/by/typed/incopenagg/gen/IncrementalAggOpenHasherIntObject.java
+++ b/engine/table/src/main/java/io/deephaven/engine/table/impl/by/typed/incopenagg/gen/IncrementalAggOpenHasherIntObject.java
@@ -67,12 +67,12 @@ protected void build(RowSequence rowSequence, Chunk[] sourceKeyChunks) {
             int tableLocation = firstTableLocation;
             MAIN_SEARCH: while (true) {
                 int outputPosition = mainOutputPosition.getUnsafe(tableLocation);
-                if (outputPosition == EMPTY_OUTPUT_POSITION) {
+                if (isStateEmpty(outputPosition)) {
                     final int firstAlternateTableLocation = hashToTableLocationAlternate(hash);
                     int alternateTableLocation = firstAlternateTableLocation;
                     while (alternateTableLocation < rehashPointer) {
                         outputPosition = alternateOutputPosition.getUnsafe(alternateTableLocation);
-                        if (outputPosition == EMPTY_OUTPUT_POSITION) {
+                        if (isStateEmpty(outputPosition)) {
                             break;
                         } else if (eq(alternateKeySource0.getUnsafe(alternateTableLocation), k0) && eq(alternateKeySource1.getUnsafe(alternateTableLocation), k1)) {
                             outputPositions.set(chunkPosition, outputPosition);
@@ -113,7 +113,7 @@ protected void probe(RowSequence rowSequence, Chunk[] sourceKeyChunks) {
             boolean found = false;
             int tableLocation = firstTableLocation;
             int outputPosition;
-            while ((outputPosition = mainOutputPosition.getUnsafe(tableLocation)) != EMPTY_OUTPUT_POSITION) {
+            while (!isStateEmpty(outputPosition = mainOutputPosition.getUnsafe(tableLocation))) {
                 if (eq(mainKeySource0.getUnsafe(tableLocation), k0) && eq(mainKeySource1.getUnsafe(tableLocation), k1)) {
                     outputPositions.set(chunkPosition, outputPosition);
                     found = true;
@@ -127,7 +127,7 @@ protected void probe(RowSequence rowSequence, Chunk[] sourceKeyChunks) {
                 boolean alternateFound = false;
                 if (firstAlternateTableLocation < rehashPointer) {
                     int alternateTableLocation = firstAlternateTableLocation;
-                    while ((outputPosition = alternateOutputPosition.getUnsafe(alternateTableLocation)) != EMPTY_OUTPUT_POSITION) {
+                    while (!isStateEmpty(outputPosition = alternateOutputPosition.getUnsafe(alternateTableLocation))) {
                         if (eq(alternateKeySource0.getUnsafe(alternateTableLocation), k0) && eq(alternateKeySource1.getUnsafe(alternateTableLocation), k1)) {
                             outputPositions.set(chunkPosition, outputPosition);
                             alternateFound = true;
@@ -150,16 +150,20 @@ private static int hash(int k0, Object k1) {
         return hash;
     }
 
+    private static boolean isStateEmpty(int state) {
+        return state == EMPTY_OUTPUT_POSITION;
+    }
+
     private boolean migrateOneLocation(int locationToMigrate) {
         final int currentStateValue = alternateOutputPosition.getUnsafe(locationToMigrate);
-        if (currentStateValue == EMPTY_OUTPUT_POSITION) {
+        if (isStateEmpty(currentStateValue)) {
             return false;
         }
         final int k0 = alternateKeySource0.getUnsafe(locationToMigrate);
         final Object k1 = alternateKeySource1.getUnsafe(locationToMigrate);
         final int hash = hash(k0, k1);
         int destinationTableLocation = hashToTableLocation(hash);
-        while (mainOutputPosition.getUnsafe(destinationTableLocation) != EMPTY_OUTPUT_POSITION) {
+        while (!isStateEmpty(mainOutputPosition.getUnsafe(destinationTableLocation))) {
             destinationTableLocation = nextTableLocation(destinationTableLocation);
         }
         mainKeySource0.set(destinationTableLocation, k0);
@@ -183,8 +187,7 @@ protected int rehashInternalPartial(int entriesToRehash) {
     }
 
     @Override
-    protected void newAlternate() {
-        super.newAlternate();
+    protected void adviseNewAlternate() {
         this.mainKeySource0 = (ImmutableIntArraySource)super.mainKeySources[0];
         this.alternateKeySource0 = (ImmutableIntArraySource)super.alternateKeySources[0];
         this.mainKeySource1 = (ImmutableObjectArraySource)super.mainKeySources[1];
@@ -201,7 +204,7 @@ protected void clearAlternate() {
     @Override
     protected void migrateFront() {
         int location = 0;
-        while (migrateOneLocation(location++));
+        while (migrateOneLocation(location++) && location < alternateTableSize);
     }
 
     @Override
@@ -218,7 +221,7 @@ protected void rehashInternalFull(final int oldSize) {
         mainOutputPosition.setArray(destState);
         for (int sourceBucket = 0; sourceBucket < oldSize; ++sourceBucket) {
             final int currentStateValue = originalStateArray[sourceBucket];
-            if (currentStateValue == EMPTY_OUTPUT_POSITION) {
+            if (isStateEmpty(currentStateValue)) {
                 continue;
             }
             final int k0 = originalKeyArray0[sourceBucket];
@@ -227,7 +230,7 @@ protected void rehashInternalFull(final int oldSize) {
             final int firstDestinationTableLocation = hashToTableLocation(hash);
             int destinationTableLocation = firstDestinationTableLocation;
             while (true) {
-                if (destState[destinationTableLocation] == EMPTY_OUTPUT_POSITION) {
+                if (isStateEmpty(destState[destinationTableLocation])) {
                     destKeyArray0[destinationTableLocation] = k0;
                     destKeyArray1[destinationTableLocation] = k1;
                     destState[destinationTableLocation] = originalStateArray[sourceBucket];
@@ -250,7 +253,7 @@ public int findPositionForKey(Object key) {
         final int firstTableLocation = tableLocation;
         while (true) {
             final int positionValue = mainOutputPosition.getUnsafe(tableLocation);
-            if (positionValue == EMPTY_OUTPUT_POSITION) {
+            if (isStateEmpty(positionValue)) {
                 int alternateTableLocation = hashToTableLocationAlternate(hash);
                 if (alternateTableLocation >= rehashPointer) {
                     return UNKNOWN_ROW;
@@ -258,7 +261,7 @@ public int findPositionForKey(Object key) {
                 final int firstAlternateTableLocation = alternateTableLocation;
                 while (true) {
                     final int alternatePositionValue = alternateOutputPosition.getUnsafe(alternateTableLocation);
-                    if (alternatePositionValue == EMPTY_OUTPUT_POSITION) {
+                    if (isStateEmpty(alternatePositionValue)) {
                         return UNKNOWN_ROW;
                     }
                     if (eq(alternateKeySource0.getUnsafe(alternateTableLocation), k0) && eq(alternateKeySource1.getUnsafe(alternateTableLocation), k1)) {
diff --git a/engine/table/src/main/java/io/deephaven/engine/table/impl/by/typed/incopenagg/gen/IncrementalAggOpenHasherIntShort.java b/engine/table/src/main/java/io/deephaven/engine/table/impl/by/typed/incopenagg/gen/IncrementalAggOpenHasherIntShort.java
index 97b85021a71..fd94802ea94 100644
--- a/engine/table/src/main/java/io/deephaven/engine/table/impl/by/typed/incopenagg/gen/IncrementalAggOpenHasherIntShort.java
+++ b/engine/table/src/main/java/io/deephaven/engine/table/impl/by/typed/incopenagg/gen/IncrementalAggOpenHasherIntShort.java
@@ -68,12 +68,12 @@ protected void build(RowSequence rowSequence, Chunk[] sourceKeyChunks) {
             int tableLocation = firstTableLocation;
             MAIN_SEARCH: while (true) {
                 int outputPosition = mainOutputPosition.getUnsafe(tableLocation);
-                if (outputPosition == EMPTY_OUTPUT_POSITION) {
+                if (isStateEmpty(outputPosition)) {
                     final int firstAlternateTableLocation = hashToTableLocationAlternate(hash);
                     int alternateTableLocation = firstAlternateTableLocation;
                     while (alternateTableLocation < rehashPointer) {
                         outputPosition = alternateOutputPosition.getUnsafe(alternateTableLocation);
-                        if (outputPosition == EMPTY_OUTPUT_POSITION) {
+                        if (isStateEmpty(outputPosition)) {
                             break;
                         } else if (eq(alternateKeySource0.getUnsafe(alternateTableLocation), k0) && eq(alternateKeySource1.getUnsafe(alternateTableLocation), k1)) {
                             outputPositions.set(chunkPosition, outputPosition);
@@ -114,7 +114,7 @@ protected void probe(RowSequence rowSequence, Chunk[] sourceKeyChunks) {
             boolean found = false;
             int tableLocation = firstTableLocation;
             int outputPosition;
-            while ((outputPosition = mainOutputPosition.getUnsafe(tableLocation)) != EMPTY_OUTPUT_POSITION) {
+            while (!isStateEmpty(outputPosition = mainOutputPosition.getUnsafe(tableLocation))) {
                 if (eq(mainKeySource0.getUnsafe(tableLocation), k0) && eq(mainKeySource1.getUnsafe(tableLocation), k1)) {
                     outputPositions.set(chunkPosition, outputPosition);
                     found = true;
@@ -128,7 +128,7 @@ protected void probe(RowSequence rowSequence, Chunk[] sourceKeyChunks) {
                 boolean alternateFound = false;
                 if (firstAlternateTableLocation < rehashPointer) {
                     int alternateTableLocation = firstAlternateTableLocation;
-                    while ((outputPosition = alternateOutputPosition.getUnsafe(alternateTableLocation)) != EMPTY_OUTPUT_POSITION) {
+                    while (!isStateEmpty(outputPosition = alternateOutputPosition.getUnsafe(alternateTableLocation))) {
                         if (eq(alternateKeySource0.getUnsafe(alternateTableLocation), k0) && eq(alternateKeySource1.getUnsafe(alternateTableLocation), k1)) {
                             outputPositions.set(chunkPosition, outputPosition);
                             alternateFound = true;
@@ -151,16 +151,20 @@ private static int hash(int k0, short k1) {
         return hash;
     }
 
+    private static boolean isStateEmpty(int state) {
+        return state == EMPTY_OUTPUT_POSITION;
+    }
+
     private boolean migrateOneLocation(int locationToMigrate) {
         final int currentStateValue = alternateOutputPosition.getUnsafe(locationToMigrate);
-        if (currentStateValue == EMPTY_OUTPUT_POSITION) {
+        if (isStateEmpty(currentStateValue)) {
             return false;
         }
         final int k0 = alternateKeySource0.getUnsafe(locationToMigrate);
         final short k1 = alternateKeySource1.getUnsafe(locationToMigrate);
         final int hash = hash(k0, k1);
         int destinationTableLocation = hashToTableLocation(hash);
-        while (mainOutputPosition.getUnsafe(destinationTableLocation) != EMPTY_OUTPUT_POSITION) {
+        while (!isStateEmpty(mainOutputPosition.getUnsafe(destinationTableLocation))) {
             destinationTableLocation = nextTableLocation(destinationTableLocation);
         }
         mainKeySource0.set(destinationTableLocation, k0);
@@ -183,8 +187,7 @@ protected int rehashInternalPartial(int entriesToRehash) {
     }
 
     @Override
-    protected void newAlternate() {
-        super.newAlternate();
+    protected void adviseNewAlternate() {
         this.mainKeySource0 = (ImmutableIntArraySource)super.mainKeySources[0];
         this.alternateKeySource0 = (ImmutableIntArraySource)super.alternateKeySources[0];
         this.mainKeySource1 = (ImmutableShortArraySource)super.mainKeySources[1];
@@ -201,7 +204,7 @@ protected void clearAlternate() {
     @Override
     protected void migrateFront() {
         int location = 0;
-        while (migrateOneLocation(location++));
+        while (migrateOneLocation(location++) && location < alternateTableSize);
     }
 
     @Override
@@ -218,7 +221,7 @@ protected void rehashInternalFull(final int oldSize) {
         mainOutputPosition.setArray(destState);
         for (int sourceBucket = 0; sourceBucket < oldSize; ++sourceBucket) {
             final int currentStateValue = originalStateArray[sourceBucket];
-            if (currentStateValue == EMPTY_OUTPUT_POSITION) {
+            if (isStateEmpty(currentStateValue)) {
                 continue;
             }
             final int k0 = originalKeyArray0[sourceBucket];
@@ -227,7 +230,7 @@ protected void rehashInternalFull(final int oldSize) {
             final int firstDestinationTableLocation = hashToTableLocation(hash);
             int destinationTableLocation = firstDestinationTableLocation;
             while (true) {
-                if (destState[destinationTableLocation] == EMPTY_OUTPUT_POSITION) {
+                if (isStateEmpty(destState[destinationTableLocation])) {
                     destKeyArray0[destinationTableLocation] = k0;
                     destKeyArray1[destinationTableLocation] = k1;
                     destState[destinationTableLocation] = originalStateArray[sourceBucket];
@@ -250,7 +253,7 @@ public int findPositionForKey(Object key) {
         final int firstTableLocation = tableLocation;
         while (true) {
             final int positionValue = mainOutputPosition.getUnsafe(tableLocation);
-            if (positionValue == EMPTY_OUTPUT_POSITION) {
+            if (isStateEmpty(positionValue)) {
                 int alternateTableLocation = hashToTableLocationAlternate(hash);
                 if (alternateTableLocation >= rehashPointer) {
                     return UNKNOWN_ROW;
@@ -258,7 +261,7 @@ public int findPositionForKey(Object key) {
                 final int firstAlternateTableLocation = alternateTableLocation;
                 while (true) {
                     final int alternatePositionValue = alternateOutputPosition.getUnsafe(alternateTableLocation);
-                    if (alternatePositionValue == EMPTY_OUTPUT_POSITION) {
+                    if (isStateEmpty(alternatePositionValue)) {
                         return UNKNOWN_ROW;
                     }
                     if (eq(alternateKeySource0.getUnsafe(alternateTableLocation), k0) && eq(alternateKeySource1.getUnsafe(alternateTableLocation), k1)) {
diff --git a/engine/table/src/main/java/io/deephaven/engine/table/impl/by/typed/incopenagg/gen/IncrementalAggOpenHasherLong.java b/engine/table/src/main/java/io/deephaven/engine/table/impl/by/typed/incopenagg/gen/IncrementalAggOpenHasherLong.java
index ff959fd558c..e3cedd3bcfc 100644
--- a/engine/table/src/main/java/io/deephaven/engine/table/impl/by/typed/incopenagg/gen/IncrementalAggOpenHasherLong.java
+++ b/engine/table/src/main/java/io/deephaven/engine/table/impl/by/typed/incopenagg/gen/IncrementalAggOpenHasherLong.java
@@ -55,12 +55,12 @@ protected void build(RowSequence rowSequence, Chunk[] sourceKeyChunks) {
             int tableLocation = firstTableLocation;
             MAIN_SEARCH: while (true) {
                 int outputPosition = mainOutputPosition.getUnsafe(tableLocation);
-                if (outputPosition == EMPTY_OUTPUT_POSITION) {
+                if (isStateEmpty(outputPosition)) {
                     final int firstAlternateTableLocation = hashToTableLocationAlternate(hash);
                     int alternateTableLocation = firstAlternateTableLocation;
                     while (alternateTableLocation < rehashPointer) {
                         outputPosition = alternateOutputPosition.getUnsafe(alternateTableLocation);
-                        if (outputPosition == EMPTY_OUTPUT_POSITION) {
+                        if (isStateEmpty(outputPosition)) {
                             break;
                         } else if (eq(alternateKeySource0.getUnsafe(alternateTableLocation), k0)) {
                             outputPositions.set(chunkPosition, outputPosition);
@@ -98,7 +98,7 @@ protected void probe(RowSequence rowSequence, Chunk[] sourceKeyChunks) {
             boolean found = false;
             int tableLocation = firstTableLocation;
             int outputPosition;
-            while ((outputPosition = mainOutputPosition.getUnsafe(tableLocation)) != EMPTY_OUTPUT_POSITION) {
+            while (!isStateEmpty(outputPosition = mainOutputPosition.getUnsafe(tableLocation))) {
                 if (eq(mainKeySource0.getUnsafe(tableLocation), k0)) {
                     outputPositions.set(chunkPosition, outputPosition);
                     found = true;
@@ -112,7 +112,7 @@ protected void probe(RowSequence rowSequence, Chunk[] sourceKeyChunks) {
                 boolean alternateFound = false;
                 if (firstAlternateTableLocation < rehashPointer) {
                     int alternateTableLocation = firstAlternateTableLocation;
-                    while ((outputPosition = alternateOutputPosition.getUnsafe(alternateTableLocation)) != EMPTY_OUTPUT_POSITION) {
+                    while (!isStateEmpty(outputPosition = alternateOutputPosition.getUnsafe(alternateTableLocation))) {
                         if (eq(alternateKeySource0.getUnsafe(alternateTableLocation), k0)) {
                             outputPositions.set(chunkPosition, outputPosition);
                             alternateFound = true;
@@ -134,15 +134,19 @@ private static int hash(long k0) {
         return hash;
     }
 
+    private static boolean isStateEmpty(int state) {
+        return state == EMPTY_OUTPUT_POSITION;
+    }
+
     private boolean migrateOneLocation(int locationToMigrate) {
         final int currentStateValue = alternateOutputPosition.getUnsafe(locationToMigrate);
-        if (currentStateValue == EMPTY_OUTPUT_POSITION) {
+        if (isStateEmpty(currentStateValue)) {
             return false;
         }
         final long k0 = alternateKeySource0.getUnsafe(locationToMigrate);
         final int hash = hash(k0);
         int destinationTableLocation = hashToTableLocation(hash);
-        while (mainOutputPosition.getUnsafe(destinationTableLocation) != EMPTY_OUTPUT_POSITION) {
+        while (!isStateEmpty(mainOutputPosition.getUnsafe(destinationTableLocation))) {
             destinationTableLocation = nextTableLocation(destinationTableLocation);
         }
         mainKeySource0.set(destinationTableLocation, k0);
@@ -164,8 +168,7 @@ protected int rehashInternalPartial(int entriesToRehash) {
     }
 
     @Override
-    protected void newAlternate() {
-        super.newAlternate();
+    protected void adviseNewAlternate() {
         this.mainKeySource0 = (ImmutableLongArraySource)super.mainKeySources[0];
         this.alternateKeySource0 = (ImmutableLongArraySource)super.alternateKeySources[0];
     }
@@ -179,7 +182,7 @@ protected void clearAlternate() {
     @Override
     protected void migrateFront() {
         int location = 0;
-        while (migrateOneLocation(location++));
+        while (migrateOneLocation(location++) && location < alternateTableSize);
     }
 
     @Override
@@ -193,7 +196,7 @@ protected void rehashInternalFull(final int oldSize) {
         mainOutputPosition.setArray(destState);
         for (int sourceBucket = 0; sourceBucket < oldSize; ++sourceBucket) {
             final int currentStateValue = originalStateArray[sourceBucket];
-            if (currentStateValue == EMPTY_OUTPUT_POSITION) {
+            if (isStateEmpty(currentStateValue)) {
                 continue;
             }
             final long k0 = originalKeyArray0[sourceBucket];
@@ -201,7 +204,7 @@ protected void rehashInternalFull(final int oldSize) {
             final int firstDestinationTableLocation = hashToTableLocation(hash);
             int destinationTableLocation = firstDestinationTableLocation;
             while (true) {
-                if (destState[destinationTableLocation] == EMPTY_OUTPUT_POSITION) {
+                if (isStateEmpty(destState[destinationTableLocation])) {
                     destKeyArray0[destinationTableLocation] = k0;
                     destState[destinationTableLocation] = originalStateArray[sourceBucket];
                     outputPositionToHashSlot.set(currentStateValue, mainInsertMask | destinationTableLocation);
@@ -221,7 +224,7 @@ public int findPositionForKey(Object key) {
         final int firstTableLocation = tableLocation;
         while (true) {
             final int positionValue = mainOutputPosition.getUnsafe(tableLocation);
-            if (positionValue == EMPTY_OUTPUT_POSITION) {
+            if (isStateEmpty(positionValue)) {
                 int alternateTableLocation = hashToTableLocationAlternate(hash);
                 if (alternateTableLocation >= rehashPointer) {
                     return UNKNOWN_ROW;
@@ -229,7 +232,7 @@ public int findPositionForKey(Object key) {
                 final int firstAlternateTableLocation = alternateTableLocation;
                 while (true) {
                     final int alternatePositionValue = alternateOutputPosition.getUnsafe(alternateTableLocation);
-                    if (alternatePositionValue == EMPTY_OUTPUT_POSITION) {
+                    if (isStateEmpty(alternatePositionValue)) {
                         return UNKNOWN_ROW;
                     }
                     if (eq(alternateKeySource0.getUnsafe(alternateTableLocation), k0)) {
diff --git a/engine/table/src/main/java/io/deephaven/engine/table/impl/by/typed/incopenagg/gen/IncrementalAggOpenHasherLongByte.java b/engine/table/src/main/java/io/deephaven/engine/table/impl/by/typed/incopenagg/gen/IncrementalAggOpenHasherLongByte.java
index 859953e1673..af383210dc6 100644
--- a/engine/table/src/main/java/io/deephaven/engine/table/impl/by/typed/incopenagg/gen/IncrementalAggOpenHasherLongByte.java
+++ b/engine/table/src/main/java/io/deephaven/engine/table/impl/by/typed/incopenagg/gen/IncrementalAggOpenHasherLongByte.java
@@ -68,12 +68,12 @@ protected void build(RowSequence rowSequence, Chunk[] sourceKeyChunks) {
             int tableLocation = firstTableLocation;
             MAIN_SEARCH: while (true) {
                 int outputPosition = mainOutputPosition.getUnsafe(tableLocation);
-                if (outputPosition == EMPTY_OUTPUT_POSITION) {
+                if (isStateEmpty(outputPosition)) {
                     final int firstAlternateTableLocation = hashToTableLocationAlternate(hash);
                     int alternateTableLocation = firstAlternateTableLocation;
                     while (alternateTableLocation < rehashPointer) {
                         outputPosition = alternateOutputPosition.getUnsafe(alternateTableLocation);
-                        if (outputPosition == EMPTY_OUTPUT_POSITION) {
+                        if (isStateEmpty(outputPosition)) {
                             break;
                         } else if (eq(alternateKeySource0.getUnsafe(alternateTableLocation), k0) && eq(alternateKeySource1.getUnsafe(alternateTableLocation), k1)) {
                             outputPositions.set(chunkPosition, outputPosition);
@@ -114,7 +114,7 @@ protected void probe(RowSequence rowSequence, Chunk[] sourceKeyChunks) {
             boolean found = false;
             int tableLocation = firstTableLocation;
             int outputPosition;
-            while ((outputPosition = mainOutputPosition.getUnsafe(tableLocation)) != EMPTY_OUTPUT_POSITION) {
+            while (!isStateEmpty(outputPosition = mainOutputPosition.getUnsafe(tableLocation))) {
                 if (eq(mainKeySource0.getUnsafe(tableLocation), k0) && eq(mainKeySource1.getUnsafe(tableLocation), k1)) {
                     outputPositions.set(chunkPosition, outputPosition);
                     found = true;
@@ -128,7 +128,7 @@ protected void probe(RowSequence rowSequence, Chunk[] sourceKeyChunks) {
                 boolean alternateFound = false;
                 if (firstAlternateTableLocation < rehashPointer) {
                     int alternateTableLocation = firstAlternateTableLocation;
-                    while ((outputPosition = alternateOutputPosition.getUnsafe(alternateTableLocation)) != EMPTY_OUTPUT_POSITION) {
+                    while (!isStateEmpty(outputPosition = alternateOutputPosition.getUnsafe(alternateTableLocation))) {
                         if (eq(alternateKeySource0.getUnsafe(alternateTableLocation), k0) && eq(alternateKeySource1.getUnsafe(alternateTableLocation), k1)) {
                             outputPositions.set(chunkPosition, outputPosition);
                             alternateFound = true;
@@ -151,16 +151,20 @@ private static int hash(long k0, byte k1) {
         return hash;
     }
 
+    private static boolean isStateEmpty(int state) {
+        return state == EMPTY_OUTPUT_POSITION;
+    }
+
     private boolean migrateOneLocation(int locationToMigrate) {
         final int currentStateValue = alternateOutputPosition.getUnsafe(locationToMigrate);
-        if (currentStateValue == EMPTY_OUTPUT_POSITION) {
+        if (isStateEmpty(currentStateValue)) {
             return false;
         }
         final long k0 = alternateKeySource0.getUnsafe(locationToMigrate);
         final byte k1 = alternateKeySource1.getUnsafe(locationToMigrate);
         final int hash = hash(k0, k1);
         int destinationTableLocation = hashToTableLocation(hash);
-        while (mainOutputPosition.getUnsafe(destinationTableLocation) != EMPTY_OUTPUT_POSITION) {
+        while (!isStateEmpty(mainOutputPosition.getUnsafe(destinationTableLocation))) {
             destinationTableLocation = nextTableLocation(destinationTableLocation);
         }
         mainKeySource0.set(destinationTableLocation, k0);
@@ -183,8 +187,7 @@ protected int rehashInternalPartial(int entriesToRehash) {
     }
 
     @Override
-    protected void newAlternate() {
-        super.newAlternate();
+    protected void adviseNewAlternate() {
         this.mainKeySource0 = (ImmutableLongArraySource)super.mainKeySources[0];
         this.alternateKeySource0 = (ImmutableLongArraySource)super.alternateKeySources[0];
         this.mainKeySource1 = (ImmutableByteArraySource)super.mainKeySources[1];
@@ -201,7 +204,7 @@ protected void clearAlternate() {
     @Override
     protected void migrateFront() {
         int location = 0;
-        while (migrateOneLocation(location++));
+        while (migrateOneLocation(location++) && location < alternateTableSize);
     }
 
     @Override
@@ -218,7 +221,7 @@ protected void rehashInternalFull(final int oldSize) {
         mainOutputPosition.setArray(destState);
         for (int sourceBucket = 0; sourceBucket < oldSize; ++sourceBucket) {
             final int currentStateValue = originalStateArray[sourceBucket];
-            if (currentStateValue == EMPTY_OUTPUT_POSITION) {
+            if (isStateEmpty(currentStateValue)) {
                 continue;
             }
             final long k0 = originalKeyArray0[sourceBucket];
@@ -227,7 +230,7 @@ protected void rehashInternalFull(final int oldSize) {
             final int firstDestinationTableLocation = hashToTableLocation(hash);
             int destinationTableLocation = firstDestinationTableLocation;
             while (true) {
-                if (destState[destinationTableLocation] == EMPTY_OUTPUT_POSITION) {
+                if (isStateEmpty(destState[destinationTableLocation])) {
                     destKeyArray0[destinationTableLocation] = k0;
                     destKeyArray1[destinationTableLocation] = k1;
                     destState[destinationTableLocation] = originalStateArray[sourceBucket];
@@ -250,7 +253,7 @@ public int findPositionForKey(Object key) {
         final int firstTableLocation = tableLocation;
         while (true) {
             final int positionValue = mainOutputPosition.getUnsafe(tableLocation);
-            if (positionValue == EMPTY_OUTPUT_POSITION) {
+            if (isStateEmpty(positionValue)) {
                 int alternateTableLocation = hashToTableLocationAlternate(hash);
                 if (alternateTableLocation >= rehashPointer) {
                     return UNKNOWN_ROW;
@@ -258,7 +261,7 @@ public int findPositionForKey(Object key) {
                 final int firstAlternateTableLocation = alternateTableLocation;
                 while (true) {
                     final int alternatePositionValue = alternateOutputPosition.getUnsafe(alternateTableLocation);
-                    if (alternatePositionValue == EMPTY_OUTPUT_POSITION) {
+                    if (isStateEmpty(alternatePositionValue)) {
                         return UNKNOWN_ROW;
                     }
                     if (eq(alternateKeySource0.getUnsafe(alternateTableLocation), k0) && eq(alternateKeySource1.getUnsafe(alternateTableLocation), k1)) {
diff --git a/engine/table/src/main/java/io/deephaven/engine/table/impl/by/typed/incopenagg/gen/IncrementalAggOpenHasherLongChar.java b/engine/table/src/main/java/io/deephaven/engine/table/impl/by/typed/incopenagg/gen/IncrementalAggOpenHasherLongChar.java
index 559e8cae2b4..0283a6e3d12 100644
--- a/engine/table/src/main/java/io/deephaven/engine/table/impl/by/typed/incopenagg/gen/IncrementalAggOpenHasherLongChar.java
+++ b/engine/table/src/main/java/io/deephaven/engine/table/impl/by/typed/incopenagg/gen/IncrementalAggOpenHasherLongChar.java
@@ -68,12 +68,12 @@ protected void build(RowSequence rowSequence, Chunk[] sourceKeyChunks) {
             int tableLocation = firstTableLocation;
             MAIN_SEARCH: while (true) {
                 int outputPosition = mainOutputPosition.getUnsafe(tableLocation);
-                if (outputPosition == EMPTY_OUTPUT_POSITION) {
+                if (isStateEmpty(outputPosition)) {
                     final int firstAlternateTableLocation = hashToTableLocationAlternate(hash);
                     int alternateTableLocation = firstAlternateTableLocation;
                     while (alternateTableLocation < rehashPointer) {
                         outputPosition = alternateOutputPosition.getUnsafe(alternateTableLocation);
-                        if (outputPosition == EMPTY_OUTPUT_POSITION) {
+                        if (isStateEmpty(outputPosition)) {
                             break;
                         } else if (eq(alternateKeySource0.getUnsafe(alternateTableLocation), k0) && eq(alternateKeySource1.getUnsafe(alternateTableLocation), k1)) {
                             outputPositions.set(chunkPosition, outputPosition);
@@ -114,7 +114,7 @@ protected void probe(RowSequence rowSequence, Chunk[] sourceKeyChunks) {
             boolean found = false;
             int tableLocation = firstTableLocation;
             int outputPosition;
-            while ((outputPosition = mainOutputPosition.getUnsafe(tableLocation)) != EMPTY_OUTPUT_POSITION) {
+            while (!isStateEmpty(outputPosition = mainOutputPosition.getUnsafe(tableLocation))) {
                 if (eq(mainKeySource0.getUnsafe(tableLocation), k0) && eq(mainKeySource1.getUnsafe(tableLocation), k1)) {
                     outputPositions.set(chunkPosition, outputPosition);
                     found = true;
@@ -128,7 +128,7 @@ protected void probe(RowSequence rowSequence, Chunk[] sourceKeyChunks) {
                 boolean alternateFound = false;
                 if (firstAlternateTableLocation < rehashPointer) {
                     int alternateTableLocation = firstAlternateTableLocation;
-                    while ((outputPosition = alternateOutputPosition.getUnsafe(alternateTableLocation)) != EMPTY_OUTPUT_POSITION) {
+                    while (!isStateEmpty(outputPosition = alternateOutputPosition.getUnsafe(alternateTableLocation))) {
                         if (eq(alternateKeySource0.getUnsafe(alternateTableLocation), k0) && eq(alternateKeySource1.getUnsafe(alternateTableLocation), k1)) {
                             outputPositions.set(chunkPosition, outputPosition);
                             alternateFound = true;
@@ -151,16 +151,20 @@ private static int hash(long k0, char k1) {
         return hash;
     }
 
+    private static boolean isStateEmpty(int state) {
+        return state == EMPTY_OUTPUT_POSITION;
+    }
+
     private boolean migrateOneLocation(int locationToMigrate) {
         final int currentStateValue = alternateOutputPosition.getUnsafe(locationToMigrate);
-        if (currentStateValue == EMPTY_OUTPUT_POSITION) {
+        if (isStateEmpty(currentStateValue)) {
             return false;
         }
         final long k0 = alternateKeySource0.getUnsafe(locationToMigrate);
         final char k1 = alternateKeySource1.getUnsafe(locationToMigrate);
         final int hash = hash(k0, k1);
         int destinationTableLocation = hashToTableLocation(hash);
-        while (mainOutputPosition.getUnsafe(destinationTableLocation) != EMPTY_OUTPUT_POSITION) {
+        while (!isStateEmpty(mainOutputPosition.getUnsafe(destinationTableLocation))) {
             destinationTableLocation = nextTableLocation(destinationTableLocation);
         }
         mainKeySource0.set(destinationTableLocation, k0);
@@ -183,8 +187,7 @@ protected int rehashInternalPartial(int entriesToRehash) {
     }
 
     @Override
-    protected void newAlternate() {
-        super.newAlternate();
+    protected void adviseNewAlternate() {
         this.mainKeySource0 = (ImmutableLongArraySource)super.mainKeySources[0];
         this.alternateKeySource0 = (ImmutableLongArraySource)super.alternateKeySources[0];
         this.mainKeySource1 = (ImmutableCharArraySource)super.mainKeySources[1];
@@ -201,7 +204,7 @@ protected void clearAlternate() {
     @Override
     protected void migrateFront() {
         int location = 0;
-        while (migrateOneLocation(location++));
+        while (migrateOneLocation(location++) && location < alternateTableSize);
     }
 
     @Override
@@ -218,7 +221,7 @@ protected void rehashInternalFull(final int oldSize) {
         mainOutputPosition.setArray(destState);
         for (int sourceBucket = 0; sourceBucket < oldSize; ++sourceBucket) {
             final int currentStateValue = originalStateArray[sourceBucket];
-            if (currentStateValue == EMPTY_OUTPUT_POSITION) {
+            if (isStateEmpty(currentStateValue)) {
                 continue;
             }
             final long k0 = originalKeyArray0[sourceBucket];
@@ -227,7 +230,7 @@ protected void rehashInternalFull(final int oldSize) {
             final int firstDestinationTableLocation = hashToTableLocation(hash);
             int destinationTableLocation = firstDestinationTableLocation;
             while (true) {
-                if (destState[destinationTableLocation] == EMPTY_OUTPUT_POSITION) {
+                if (isStateEmpty(destState[destinationTableLocation])) {
                     destKeyArray0[destinationTableLocation] = k0;
                     destKeyArray1[destinationTableLocation] = k1;
                     destState[destinationTableLocation] = originalStateArray[sourceBucket];
@@ -250,7 +253,7 @@ public int findPositionForKey(Object key) {
         final int firstTableLocation = tableLocation;
         while (true) {
             final int positionValue = mainOutputPosition.getUnsafe(tableLocation);
-            if (positionValue == EMPTY_OUTPUT_POSITION) {
+            if (isStateEmpty(positionValue)) {
                 int alternateTableLocation = hashToTableLocationAlternate(hash);
                 if (alternateTableLocation >= rehashPointer) {
                     return UNKNOWN_ROW;
@@ -258,7 +261,7 @@ public int findPositionForKey(Object key) {
                 final int firstAlternateTableLocation = alternateTableLocation;
                 while (true) {
                     final int alternatePositionValue = alternateOutputPosition.getUnsafe(alternateTableLocation);
-                    if (alternatePositionValue == EMPTY_OUTPUT_POSITION) {
+                    if (isStateEmpty(alternatePositionValue)) {
                         return UNKNOWN_ROW;
                     }
                     if (eq(alternateKeySource0.getUnsafe(alternateTableLocation), k0) && eq(alternateKeySource1.getUnsafe(alternateTableLocation), k1)) {
diff --git a/engine/table/src/main/java/io/deephaven/engine/table/impl/by/typed/incopenagg/gen/IncrementalAggOpenHasherLongDouble.java b/engine/table/src/main/java/io/deephaven/engine/table/impl/by/typed/incopenagg/gen/IncrementalAggOpenHasherLongDouble.java
index bd89eb1e23a..c8b5fbb8516 100644
--- a/engine/table/src/main/java/io/deephaven/engine/table/impl/by/typed/incopenagg/gen/IncrementalAggOpenHasherLongDouble.java
+++ b/engine/table/src/main/java/io/deephaven/engine/table/impl/by/typed/incopenagg/gen/IncrementalAggOpenHasherLongDouble.java
@@ -68,12 +68,12 @@ protected void build(RowSequence rowSequence, Chunk[] sourceKeyChunks) {
             int tableLocation = firstTableLocation;
             MAIN_SEARCH: while (true) {
                 int outputPosition = mainOutputPosition.getUnsafe(tableLocation);
-                if (outputPosition == EMPTY_OUTPUT_POSITION) {
+                if (isStateEmpty(outputPosition)) {
                     final int firstAlternateTableLocation = hashToTableLocationAlternate(hash);
                     int alternateTableLocation = firstAlternateTableLocation;
                     while (alternateTableLocation < rehashPointer) {
                         outputPosition = alternateOutputPosition.getUnsafe(alternateTableLocation);
-                        if (outputPosition == EMPTY_OUTPUT_POSITION) {
+                        if (isStateEmpty(outputPosition)) {
                             break;
                         } else if (eq(alternateKeySource0.getUnsafe(alternateTableLocation), k0) && eq(alternateKeySource1.getUnsafe(alternateTableLocation), k1)) {
                             outputPositions.set(chunkPosition, outputPosition);
@@ -114,7 +114,7 @@ protected void probe(RowSequence rowSequence, Chunk[] sourceKeyChunks) {
             boolean found = false;
             int tableLocation = firstTableLocation;
             int outputPosition;
-            while ((outputPosition = mainOutputPosition.getUnsafe(tableLocation)) != EMPTY_OUTPUT_POSITION) {
+            while (!isStateEmpty(outputPosition = mainOutputPosition.getUnsafe(tableLocation))) {
                 if (eq(mainKeySource0.getUnsafe(tableLocation), k0) && eq(mainKeySource1.getUnsafe(tableLocation), k1)) {
                     outputPositions.set(chunkPosition, outputPosition);
                     found = true;
@@ -128,7 +128,7 @@ protected void probe(RowSequence rowSequence, Chunk[] sourceKeyChunks) {
                 boolean alternateFound = false;
                 if (firstAlternateTableLocation < rehashPointer) {
                     int alternateTableLocation = firstAlternateTableLocation;
-                    while ((outputPosition = alternateOutputPosition.getUnsafe(alternateTableLocation)) != EMPTY_OUTPUT_POSITION) {
+                    while (!isStateEmpty(outputPosition = alternateOutputPosition.getUnsafe(alternateTableLocation))) {
                         if (eq(alternateKeySource0.getUnsafe(alternateTableLocation), k0) && eq(alternateKeySource1.getUnsafe(alternateTableLocation), k1)) {
                             outputPositions.set(chunkPosition, outputPosition);
                             alternateFound = true;
@@ -151,16 +151,20 @@ private static int hash(long k0, double k1) {
         return hash;
     }
 
+    private static boolean isStateEmpty(int state) {
+        return state == EMPTY_OUTPUT_POSITION;
+    }
+
     private boolean migrateOneLocation(int locationToMigrate) {
         final int currentStateValue = alternateOutputPosition.getUnsafe(locationToMigrate);
-        if (currentStateValue == EMPTY_OUTPUT_POSITION) {
+        if (isStateEmpty(currentStateValue)) {
             return false;
         }
         final long k0 = alternateKeySource0.getUnsafe(locationToMigrate);
         final double k1 = alternateKeySource1.getUnsafe(locationToMigrate);
         final int hash = hash(k0, k1);
         int destinationTableLocation = hashToTableLocation(hash);
-        while (mainOutputPosition.getUnsafe(destinationTableLocation) != EMPTY_OUTPUT_POSITION) {
+        while (!isStateEmpty(mainOutputPosition.getUnsafe(destinationTableLocation))) {
             destinationTableLocation = nextTableLocation(destinationTableLocation);
         }
         mainKeySource0.set(destinationTableLocation, k0);
@@ -183,8 +187,7 @@ protected int rehashInternalPartial(int entriesToRehash) {
     }
 
     @Override
-    protected void newAlternate() {
-        super.newAlternate();
+    protected void adviseNewAlternate() {
         this.mainKeySource0 = (ImmutableLongArraySource)super.mainKeySources[0];
         this.alternateKeySource0 = (ImmutableLongArraySource)super.alternateKeySources[0];
         this.mainKeySource1 = (ImmutableDoubleArraySource)super.mainKeySources[1];
@@ -201,7 +204,7 @@ protected void clearAlternate() {
     @Override
     protected void migrateFront() {
         int location = 0;
-        while (migrateOneLocation(location++));
+        while (migrateOneLocation(location++) && location < alternateTableSize);
     }
 
     @Override
@@ -218,7 +221,7 @@ protected void rehashInternalFull(final int oldSize) {
         mainOutputPosition.setArray(destState);
         for (int sourceBucket = 0; sourceBucket < oldSize; ++sourceBucket) {
             final int currentStateValue = originalStateArray[sourceBucket];
-            if (currentStateValue == EMPTY_OUTPUT_POSITION) {
+            if (isStateEmpty(currentStateValue)) {
                 continue;
             }
             final long k0 = originalKeyArray0[sourceBucket];
@@ -227,7 +230,7 @@ protected void rehashInternalFull(final int oldSize) {
             final int firstDestinationTableLocation = hashToTableLocation(hash);
             int destinationTableLocation = firstDestinationTableLocation;
             while (true) {
-                if (destState[destinationTableLocation] == EMPTY_OUTPUT_POSITION) {
+                if (isStateEmpty(destState[destinationTableLocation])) {
                     destKeyArray0[destinationTableLocation] = k0;
                     destKeyArray1[destinationTableLocation] = k1;
                     destState[destinationTableLocation] = originalStateArray[sourceBucket];
@@ -250,7 +253,7 @@ public int findPositionForKey(Object key) {
         final int firstTableLocation = tableLocation;
         while (true) {
             final int positionValue = mainOutputPosition.getUnsafe(tableLocation);
-            if (positionValue == EMPTY_OUTPUT_POSITION) {
+            if (isStateEmpty(positionValue)) {
                 int alternateTableLocation = hashToTableLocationAlternate(hash);
                 if (alternateTableLocation >= rehashPointer) {
                     return UNKNOWN_ROW;
@@ -258,7 +261,7 @@ public int findPositionForKey(Object key) {
                 final int firstAlternateTableLocation = alternateTableLocation;
                 while (true) {
                     final int alternatePositionValue = alternateOutputPosition.getUnsafe(alternateTableLocation);
-                    if (alternatePositionValue == EMPTY_OUTPUT_POSITION) {
+                    if (isStateEmpty(alternatePositionValue)) {
                         return UNKNOWN_ROW;
                     }
                     if (eq(alternateKeySource0.getUnsafe(alternateTableLocation), k0) && eq(alternateKeySource1.getUnsafe(alternateTableLocation), k1)) {
diff --git a/engine/table/src/main/java/io/deephaven/engine/table/impl/by/typed/incopenagg/gen/IncrementalAggOpenHasherLongFloat.java b/engine/table/src/main/java/io/deephaven/engine/table/impl/by/typed/incopenagg/gen/IncrementalAggOpenHasherLongFloat.java
index 334f56633fa..149f097920b 100644
--- a/engine/table/src/main/java/io/deephaven/engine/table/impl/by/typed/incopenagg/gen/IncrementalAggOpenHasherLongFloat.java
+++ b/engine/table/src/main/java/io/deephaven/engine/table/impl/by/typed/incopenagg/gen/IncrementalAggOpenHasherLongFloat.java
@@ -68,12 +68,12 @@ protected void build(RowSequence rowSequence, Chunk[] sourceKeyChunks) {
             int tableLocation = firstTableLocation;
             MAIN_SEARCH: while (true) {
                 int outputPosition = mainOutputPosition.getUnsafe(tableLocation);
-                if (outputPosition == EMPTY_OUTPUT_POSITION) {
+                if (isStateEmpty(outputPosition)) {
                     final int firstAlternateTableLocation = hashToTableLocationAlternate(hash);
                     int alternateTableLocation = firstAlternateTableLocation;
                     while (alternateTableLocation < rehashPointer) {
                         outputPosition = alternateOutputPosition.getUnsafe(alternateTableLocation);
-                        if (outputPosition == EMPTY_OUTPUT_POSITION) {
+                        if (isStateEmpty(outputPosition)) {
                             break;
                         } else if (eq(alternateKeySource0.getUnsafe(alternateTableLocation), k0) && eq(alternateKeySource1.getUnsafe(alternateTableLocation), k1)) {
                             outputPositions.set(chunkPosition, outputPosition);
@@ -114,7 +114,7 @@ protected void probe(RowSequence rowSequence, Chunk[] sourceKeyChunks) {
             boolean found = false;
             int tableLocation = firstTableLocation;
             int outputPosition;
-            while ((outputPosition = mainOutputPosition.getUnsafe(tableLocation)) != EMPTY_OUTPUT_POSITION) {
+            while (!isStateEmpty(outputPosition = mainOutputPosition.getUnsafe(tableLocation))) {
                 if (eq(mainKeySource0.getUnsafe(tableLocation), k0) && eq(mainKeySource1.getUnsafe(tableLocation), k1)) {
                     outputPositions.set(chunkPosition, outputPosition);
                     found = true;
@@ -128,7 +128,7 @@ protected void probe(RowSequence rowSequence, Chunk[] sourceKeyChunks) {
                 boolean alternateFound = false;
                 if (firstAlternateTableLocation < rehashPointer) {
                     int alternateTableLocation = firstAlternateTableLocation;
-                    while ((outputPosition = alternateOutputPosition.getUnsafe(alternateTableLocation)) != EMPTY_OUTPUT_POSITION) {
+                    while (!isStateEmpty(outputPosition = alternateOutputPosition.getUnsafe(alternateTableLocation))) {
                         if (eq(alternateKeySource0.getUnsafe(alternateTableLocation), k0) && eq(alternateKeySource1.getUnsafe(alternateTableLocation), k1)) {
                             outputPositions.set(chunkPosition, outputPosition);
                             alternateFound = true;
@@ -151,16 +151,20 @@ private static int hash(long k0, float k1) {
         return hash;
     }
 
+    private static boolean isStateEmpty(int state) {
+        return state == EMPTY_OUTPUT_POSITION;
+    }
+
     private boolean migrateOneLocation(int locationToMigrate) {
         final int currentStateValue = alternateOutputPosition.getUnsafe(locationToMigrate);
-        if (currentStateValue == EMPTY_OUTPUT_POSITION) {
+        if (isStateEmpty(currentStateValue)) {
             return false;
         }
         final long k0 = alternateKeySource0.getUnsafe(locationToMigrate);
         final float k1 = alternateKeySource1.getUnsafe(locationToMigrate);
         final int hash = hash(k0, k1);
         int destinationTableLocation = hashToTableLocation(hash);
-        while (mainOutputPosition.getUnsafe(destinationTableLocation) != EMPTY_OUTPUT_POSITION) {
+        while (!isStateEmpty(mainOutputPosition.getUnsafe(destinationTableLocation))) {
             destinationTableLocation = nextTableLocation(destinationTableLocation);
         }
         mainKeySource0.set(destinationTableLocation, k0);
@@ -183,8 +187,7 @@ protected int rehashInternalPartial(int entriesToRehash) {
     }
 
     @Override
-    protected void newAlternate() {
-        super.newAlternate();
+    protected void adviseNewAlternate() {
         this.mainKeySource0 = (ImmutableLongArraySource)super.mainKeySources[0];
         this.alternateKeySource0 = (ImmutableLongArraySource)super.alternateKeySources[0];
         this.mainKeySource1 = (ImmutableFloatArraySource)super.mainKeySources[1];
@@ -201,7 +204,7 @@ protected void clearAlternate() {
     @Override
     protected void migrateFront() {
         int location = 0;
-        while (migrateOneLocation(location++));
+        while (migrateOneLocation(location++) && location < alternateTableSize);
     }
 
     @Override
@@ -218,7 +221,7 @@ protected void rehashInternalFull(final int oldSize) {
         mainOutputPosition.setArray(destState);
         for (int sourceBucket = 0; sourceBucket < oldSize; ++sourceBucket) {
             final int currentStateValue = originalStateArray[sourceBucket];
-            if (currentStateValue == EMPTY_OUTPUT_POSITION) {
+            if (isStateEmpty(currentStateValue)) {
                 continue;
             }
             final long k0 = originalKeyArray0[sourceBucket];
@@ -227,7 +230,7 @@ protected void rehashInternalFull(final int oldSize) {
             final int firstDestinationTableLocation = hashToTableLocation(hash);
             int destinationTableLocation = firstDestinationTableLocation;
             while (true) {
-                if (destState[destinationTableLocation] == EMPTY_OUTPUT_POSITION) {
+                if (isStateEmpty(destState[destinationTableLocation])) {
                     destKeyArray0[destinationTableLocation] = k0;
                     destKeyArray1[destinationTableLocation] = k1;
                     destState[destinationTableLocation] = originalStateArray[sourceBucket];
@@ -250,7 +253,7 @@ public int findPositionForKey(Object key) {
         final int firstTableLocation = tableLocation;
         while (true) {
             final int positionValue = mainOutputPosition.getUnsafe(tableLocation);
-            if (positionValue == EMPTY_OUTPUT_POSITION) {
+            if (isStateEmpty(positionValue)) {
                 int alternateTableLocation = hashToTableLocationAlternate(hash);
                 if (alternateTableLocation >= rehashPointer) {
                     return UNKNOWN_ROW;
@@ -258,7 +261,7 @@ public int findPositionForKey(Object key) {
                 final int firstAlternateTableLocation = alternateTableLocation;
                 while (true) {
                     final int alternatePositionValue = alternateOutputPosition.getUnsafe(alternateTableLocation);
-                    if (alternatePositionValue == EMPTY_OUTPUT_POSITION) {
+                    if (isStateEmpty(alternatePositionValue)) {
                         return UNKNOWN_ROW;
                     }
                     if (eq(alternateKeySource0.getUnsafe(alternateTableLocation), k0) && eq(alternateKeySource1.getUnsafe(alternateTableLocation), k1)) {
diff --git a/engine/table/src/main/java/io/deephaven/engine/table/impl/by/typed/incopenagg/gen/IncrementalAggOpenHasherLongInt.java b/engine/table/src/main/java/io/deephaven/engine/table/impl/by/typed/incopenagg/gen/IncrementalAggOpenHasherLongInt.java
index 5260c3530ad..37036e5549b 100644
--- a/engine/table/src/main/java/io/deephaven/engine/table/impl/by/typed/incopenagg/gen/IncrementalAggOpenHasherLongInt.java
+++ b/engine/table/src/main/java/io/deephaven/engine/table/impl/by/typed/incopenagg/gen/IncrementalAggOpenHasherLongInt.java
@@ -68,12 +68,12 @@ protected void build(RowSequence rowSequence, Chunk[] sourceKeyChunks) {
             int tableLocation = firstTableLocation;
             MAIN_SEARCH: while (true) {
                 int outputPosition = mainOutputPosition.getUnsafe(tableLocation);
-                if (outputPosition == EMPTY_OUTPUT_POSITION) {
+                if (isStateEmpty(outputPosition)) {
                     final int firstAlternateTableLocation = hashToTableLocationAlternate(hash);
                     int alternateTableLocation = firstAlternateTableLocation;
                     while (alternateTableLocation < rehashPointer) {
                         outputPosition = alternateOutputPosition.getUnsafe(alternateTableLocation);
-                        if (outputPosition == EMPTY_OUTPUT_POSITION) {
+                        if (isStateEmpty(outputPosition)) {
                             break;
                         } else if (eq(alternateKeySource0.getUnsafe(alternateTableLocation), k0) && eq(alternateKeySource1.getUnsafe(alternateTableLocation), k1)) {
                             outputPositions.set(chunkPosition, outputPosition);
@@ -114,7 +114,7 @@ protected void probe(RowSequence rowSequence, Chunk[] sourceKeyChunks) {
             boolean found = false;
             int tableLocation = firstTableLocation;
             int outputPosition;
-            while ((outputPosition = mainOutputPosition.getUnsafe(tableLocation)) != EMPTY_OUTPUT_POSITION) {
+            while (!isStateEmpty(outputPosition = mainOutputPosition.getUnsafe(tableLocation))) {
                 if (eq(mainKeySource0.getUnsafe(tableLocation), k0) && eq(mainKeySource1.getUnsafe(tableLocation), k1)) {
                     outputPositions.set(chunkPosition, outputPosition);
                     found = true;
@@ -128,7 +128,7 @@ protected void probe(RowSequence rowSequence, Chunk[] sourceKeyChunks) {
                 boolean alternateFound = false;
                 if (firstAlternateTableLocation < rehashPointer) {
                     int alternateTableLocation = firstAlternateTableLocation;
-                    while ((outputPosition = alternateOutputPosition.getUnsafe(alternateTableLocation)) != EMPTY_OUTPUT_POSITION) {
+                    while (!isStateEmpty(outputPosition = alternateOutputPosition.getUnsafe(alternateTableLocation))) {
                         if (eq(alternateKeySource0.getUnsafe(alternateTableLocation), k0) && eq(alternateKeySource1.getUnsafe(alternateTableLocation), k1)) {
                             outputPositions.set(chunkPosition, outputPosition);
                             alternateFound = true;
@@ -151,16 +151,20 @@ private static int hash(long k0, int k1) {
         return hash;
     }
 
+    private static boolean isStateEmpty(int state) {
+        return state == EMPTY_OUTPUT_POSITION;
+    }
+
     private boolean migrateOneLocation(int locationToMigrate) {
         final int currentStateValue = alternateOutputPosition.getUnsafe(locationToMigrate);
-        if (currentStateValue == EMPTY_OUTPUT_POSITION) {
+        if (isStateEmpty(currentStateValue)) {
             return false;
         }
         final long k0 = alternateKeySource0.getUnsafe(locationToMigrate);
         final int k1 = alternateKeySource1.getUnsafe(locationToMigrate);
         final int hash = hash(k0, k1);
         int destinationTableLocation = hashToTableLocation(hash);
-        while (mainOutputPosition.getUnsafe(destinationTableLocation) != EMPTY_OUTPUT_POSITION) {
+        while (!isStateEmpty(mainOutputPosition.getUnsafe(destinationTableLocation))) {
             destinationTableLocation = nextTableLocation(destinationTableLocation);
         }
         mainKeySource0.set(destinationTableLocation, k0);
@@ -183,8 +187,7 @@ protected int rehashInternalPartial(int entriesToRehash) {
     }
 
     @Override
-    protected void newAlternate() {
-        super.newAlternate();
+    protected void adviseNewAlternate() {
         this.mainKeySource0 = (ImmutableLongArraySource)super.mainKeySources[0];
         this.alternateKeySource0 = (ImmutableLongArraySource)super.alternateKeySources[0];
         this.mainKeySource1 = (ImmutableIntArraySource)super.mainKeySources[1];
@@ -201,7 +204,7 @@ protected void clearAlternate() {
     @Override
     protected void migrateFront() {
         int location = 0;
-        while (migrateOneLocation(location++));
+        while (migrateOneLocation(location++) && location < alternateTableSize);
     }
 
     @Override
@@ -218,7 +221,7 @@ protected void rehashInternalFull(final int oldSize) {
         mainOutputPosition.setArray(destState);
         for (int sourceBucket = 0; sourceBucket < oldSize; ++sourceBucket) {
             final int currentStateValue = originalStateArray[sourceBucket];
-            if (currentStateValue == EMPTY_OUTPUT_POSITION) {
+            if (isStateEmpty(currentStateValue)) {
                 continue;
             }
             final long k0 = originalKeyArray0[sourceBucket];
@@ -227,7 +230,7 @@ protected void rehashInternalFull(final int oldSize) {
             final int firstDestinationTableLocation = hashToTableLocation(hash);
             int destinationTableLocation = firstDestinationTableLocation;
             while (true) {
-                if (destState[destinationTableLocation] == EMPTY_OUTPUT_POSITION) {
+                if (isStateEmpty(destState[destinationTableLocation])) {
                     destKeyArray0[destinationTableLocation] = k0;
                     destKeyArray1[destinationTableLocation] = k1;
                     destState[destinationTableLocation] = originalStateArray[sourceBucket];
@@ -250,7 +253,7 @@ public int findPositionForKey(Object key) {
         final int firstTableLocation = tableLocation;
         while (true) {
             final int positionValue = mainOutputPosition.getUnsafe(tableLocation);
-            if (positionValue == EMPTY_OUTPUT_POSITION) {
+            if (isStateEmpty(positionValue)) {
                 int alternateTableLocation = hashToTableLocationAlternate(hash);
                 if (alternateTableLocation >= rehashPointer) {
                     return UNKNOWN_ROW;
@@ -258,7 +261,7 @@ public int findPositionForKey(Object key) {
                 final int firstAlternateTableLocation = alternateTableLocation;
                 while (true) {
                     final int alternatePositionValue = alternateOutputPosition.getUnsafe(alternateTableLocation);
-                    if (alternatePositionValue == EMPTY_OUTPUT_POSITION) {
+                    if (isStateEmpty(alternatePositionValue)) {
                         return UNKNOWN_ROW;
                     }
                     if (eq(alternateKeySource0.getUnsafe(alternateTableLocation), k0) && eq(alternateKeySource1.getUnsafe(alternateTableLocation), k1)) {
diff --git a/engine/table/src/main/java/io/deephaven/engine/table/impl/by/typed/incopenagg/gen/IncrementalAggOpenHasherLongLong.java b/engine/table/src/main/java/io/deephaven/engine/table/impl/by/typed/incopenagg/gen/IncrementalAggOpenHasherLongLong.java
index 945218677ff..22e817763b8 100644
--- a/engine/table/src/main/java/io/deephaven/engine/table/impl/by/typed/incopenagg/gen/IncrementalAggOpenHasherLongLong.java
+++ b/engine/table/src/main/java/io/deephaven/engine/table/impl/by/typed/incopenagg/gen/IncrementalAggOpenHasherLongLong.java
@@ -63,12 +63,12 @@ protected void build(RowSequence rowSequence, Chunk[] sourceKeyChunks) {
             int tableLocation = firstTableLocation;
             MAIN_SEARCH: while (true) {
                 int outputPosition = mainOutputPosition.getUnsafe(tableLocation);
-                if (outputPosition == EMPTY_OUTPUT_POSITION) {
+                if (isStateEmpty(outputPosition)) {
                     final int firstAlternateTableLocation = hashToTableLocationAlternate(hash);
                     int alternateTableLocation = firstAlternateTableLocation;
                     while (alternateTableLocation < rehashPointer) {
                         outputPosition = alternateOutputPosition.getUnsafe(alternateTableLocation);
-                        if (outputPosition == EMPTY_OUTPUT_POSITION) {
+                        if (isStateEmpty(outputPosition)) {
                             break;
                         } else if (eq(alternateKeySource0.getUnsafe(alternateTableLocation), k0) && eq(alternateKeySource1.getUnsafe(alternateTableLocation), k1)) {
                             outputPositions.set(chunkPosition, outputPosition);
@@ -109,7 +109,7 @@ protected void probe(RowSequence rowSequence, Chunk[] sourceKeyChunks) {
             boolean found = false;
             int tableLocation = firstTableLocation;
             int outputPosition;
-            while ((outputPosition = mainOutputPosition.getUnsafe(tableLocation)) != EMPTY_OUTPUT_POSITION) {
+            while (!isStateEmpty(outputPosition = mainOutputPosition.getUnsafe(tableLocation))) {
                 if (eq(mainKeySource0.getUnsafe(tableLocation), k0) && eq(mainKeySource1.getUnsafe(tableLocation), k1)) {
                     outputPositions.set(chunkPosition, outputPosition);
                     found = true;
@@ -123,7 +123,7 @@ protected void probe(RowSequence rowSequence, Chunk[] sourceKeyChunks) {
                 boolean alternateFound = false;
                 if (firstAlternateTableLocation < rehashPointer) {
                     int alternateTableLocation = firstAlternateTableLocation;
-                    while ((outputPosition = alternateOutputPosition.getUnsafe(alternateTableLocation)) != EMPTY_OUTPUT_POSITION) {
+                    while (!isStateEmpty(outputPosition = alternateOutputPosition.getUnsafe(alternateTableLocation))) {
                         if (eq(alternateKeySource0.getUnsafe(alternateTableLocation), k0) && eq(alternateKeySource1.getUnsafe(alternateTableLocation), k1)) {
                             outputPositions.set(chunkPosition, outputPosition);
                             alternateFound = true;
@@ -146,16 +146,20 @@ private static int hash(long k0, long k1) {
         return hash;
     }
 
+    private static boolean isStateEmpty(int state) {
+        return state == EMPTY_OUTPUT_POSITION;
+    }
+
     private boolean migrateOneLocation(int locationToMigrate) {
         final int currentStateValue = alternateOutputPosition.getUnsafe(locationToMigrate);
-        if (currentStateValue == EMPTY_OUTPUT_POSITION) {
+        if (isStateEmpty(currentStateValue)) {
             return false;
         }
         final long k0 = alternateKeySource0.getUnsafe(locationToMigrate);
         final long k1 = alternateKeySource1.getUnsafe(locationToMigrate);
         final int hash = hash(k0, k1);
         int destinationTableLocation = hashToTableLocation(hash);
-        while (mainOutputPosition.getUnsafe(destinationTableLocation) != EMPTY_OUTPUT_POSITION) {
+        while (!isStateEmpty(mainOutputPosition.getUnsafe(destinationTableLocation))) {
             destinationTableLocation = nextTableLocation(destinationTableLocation);
         }
         mainKeySource0.set(destinationTableLocation, k0);
@@ -178,8 +182,7 @@ protected int rehashInternalPartial(int entriesToRehash) {
     }
 
     @Override
-    protected void newAlternate() {
-        super.newAlternate();
+    protected void adviseNewAlternate() {
         this.mainKeySource0 = (ImmutableLongArraySource)super.mainKeySources[0];
         this.alternateKeySource0 = (ImmutableLongArraySource)super.alternateKeySources[0];
         this.mainKeySource1 = (ImmutableLongArraySource)super.mainKeySources[1];
@@ -196,7 +199,7 @@ protected void clearAlternate() {
     @Override
     protected void migrateFront() {
         int location = 0;
-        while (migrateOneLocation(location++));
+        while (migrateOneLocation(location++) && location < alternateTableSize);
     }
 
     @Override
@@ -213,7 +216,7 @@ protected void rehashInternalFull(final int oldSize) {
         mainOutputPosition.setArray(destState);
         for (int sourceBucket = 0; sourceBucket < oldSize; ++sourceBucket) {
             final int currentStateValue = originalStateArray[sourceBucket];
-            if (currentStateValue == EMPTY_OUTPUT_POSITION) {
+            if (isStateEmpty(currentStateValue)) {
                 continue;
             }
             final long k0 = originalKeyArray0[sourceBucket];
@@ -222,7 +225,7 @@ protected void rehashInternalFull(final int oldSize) {
             final int firstDestinationTableLocation = hashToTableLocation(hash);
             int destinationTableLocation = firstDestinationTableLocation;
             while (true) {
-                if (destState[destinationTableLocation] == EMPTY_OUTPUT_POSITION) {
+                if (isStateEmpty(destState[destinationTableLocation])) {
                     destKeyArray0[destinationTableLocation] = k0;
                     destKeyArray1[destinationTableLocation] = k1;
                     destState[destinationTableLocation] = originalStateArray[sourceBucket];
@@ -245,7 +248,7 @@ public int findPositionForKey(Object key) {
         final int firstTableLocation = tableLocation;
         while (true) {
             final int positionValue = mainOutputPosition.getUnsafe(tableLocation);
-            if (positionValue == EMPTY_OUTPUT_POSITION) {
+            if (isStateEmpty(positionValue)) {
                 int alternateTableLocation = hashToTableLocationAlternate(hash);
                 if (alternateTableLocation >= rehashPointer) {
                     return UNKNOWN_ROW;
@@ -253,7 +256,7 @@ public int findPositionForKey(Object key) {
                 final int firstAlternateTableLocation = alternateTableLocation;
                 while (true) {
                     final int alternatePositionValue = alternateOutputPosition.getUnsafe(alternateTableLocation);
-                    if (alternatePositionValue == EMPTY_OUTPUT_POSITION) {
+                    if (isStateEmpty(alternatePositionValue)) {
                         return UNKNOWN_ROW;
                     }
                     if (eq(alternateKeySource0.getUnsafe(alternateTableLocation), k0) && eq(alternateKeySource1.getUnsafe(alternateTableLocation), k1)) {
diff --git a/engine/table/src/main/java/io/deephaven/engine/table/impl/by/typed/incopenagg/gen/IncrementalAggOpenHasherLongObject.java b/engine/table/src/main/java/io/deephaven/engine/table/impl/by/typed/incopenagg/gen/IncrementalAggOpenHasherLongObject.java
index ee1c19331e6..daf39f5eab8 100644
--- a/engine/table/src/main/java/io/deephaven/engine/table/impl/by/typed/incopenagg/gen/IncrementalAggOpenHasherLongObject.java
+++ b/engine/table/src/main/java/io/deephaven/engine/table/impl/by/typed/incopenagg/gen/IncrementalAggOpenHasherLongObject.java
@@ -67,12 +67,12 @@ protected void build(RowSequence rowSequence, Chunk[] sourceKeyChunks) {
             int tableLocation = firstTableLocation;
             MAIN_SEARCH: while (true) {
                 int outputPosition = mainOutputPosition.getUnsafe(tableLocation);
-                if (outputPosition == EMPTY_OUTPUT_POSITION) {
+                if (isStateEmpty(outputPosition)) {
                     final int firstAlternateTableLocation = hashToTableLocationAlternate(hash);
                     int alternateTableLocation = firstAlternateTableLocation;
                     while (alternateTableLocation < rehashPointer) {
                         outputPosition = alternateOutputPosition.getUnsafe(alternateTableLocation);
-                        if (outputPosition == EMPTY_OUTPUT_POSITION) {
+                        if (isStateEmpty(outputPosition)) {
                             break;
                         } else if (eq(alternateKeySource0.getUnsafe(alternateTableLocation), k0) && eq(alternateKeySource1.getUnsafe(alternateTableLocation), k1)) {
                             outputPositions.set(chunkPosition, outputPosition);
@@ -113,7 +113,7 @@ protected void probe(RowSequence rowSequence, Chunk[] sourceKeyChunks) {
             boolean found = false;
             int tableLocation = firstTableLocation;
             int outputPosition;
-            while ((outputPosition = mainOutputPosition.getUnsafe(tableLocation)) != EMPTY_OUTPUT_POSITION) {
+            while (!isStateEmpty(outputPosition = mainOutputPosition.getUnsafe(tableLocation))) {
                 if (eq(mainKeySource0.getUnsafe(tableLocation), k0) && eq(mainKeySource1.getUnsafe(tableLocation), k1)) {
                     outputPositions.set(chunkPosition, outputPosition);
                     found = true;
@@ -127,7 +127,7 @@ protected void probe(RowSequence rowSequence, Chunk[] sourceKeyChunks) {
                 boolean alternateFound = false;
                 if (firstAlternateTableLocation < rehashPointer) {
                     int alternateTableLocation = firstAlternateTableLocation;
-                    while ((outputPosition = alternateOutputPosition.getUnsafe(alternateTableLocation)) != EMPTY_OUTPUT_POSITION) {
+                    while (!isStateEmpty(outputPosition = alternateOutputPosition.getUnsafe(alternateTableLocation))) {
                         if (eq(alternateKeySource0.getUnsafe(alternateTableLocation), k0) && eq(alternateKeySource1.getUnsafe(alternateTableLocation), k1)) {
                             outputPositions.set(chunkPosition, outputPosition);
                             alternateFound = true;
@@ -150,16 +150,20 @@ private static int hash(long k0, Object k1) {
         return hash;
     }
 
+    private static boolean isStateEmpty(int state) {
+        return state == EMPTY_OUTPUT_POSITION;
+    }
+
     private boolean migrateOneLocation(int locationToMigrate) {
         final int currentStateValue = alternateOutputPosition.getUnsafe(locationToMigrate);
-        if (currentStateValue == EMPTY_OUTPUT_POSITION) {
+        if (isStateEmpty(currentStateValue)) {
             return false;
         }
         final long k0 = alternateKeySource0.getUnsafe(locationToMigrate);
         final Object k1 = alternateKeySource1.getUnsafe(locationToMigrate);
         final int hash = hash(k0, k1);
         int destinationTableLocation = hashToTableLocation(hash);
-        while (mainOutputPosition.getUnsafe(destinationTableLocation) != EMPTY_OUTPUT_POSITION) {
+        while (!isStateEmpty(mainOutputPosition.getUnsafe(destinationTableLocation))) {
             destinationTableLocation = nextTableLocation(destinationTableLocation);
         }
         mainKeySource0.set(destinationTableLocation, k0);
@@ -183,8 +187,7 @@ protected int rehashInternalPartial(int entriesToRehash) {
     }
 
     @Override
-    protected void newAlternate() {
-        super.newAlternate();
+    protected void adviseNewAlternate() {
         this.mainKeySource0 = (ImmutableLongArraySource)super.mainKeySources[0];
         this.alternateKeySource0 = (ImmutableLongArraySource)super.alternateKeySources[0];
         this.mainKeySource1 = (ImmutableObjectArraySource)super.mainKeySources[1];
@@ -201,7 +204,7 @@ protected void clearAlternate() {
     @Override
     protected void migrateFront() {
         int location = 0;
-        while (migrateOneLocation(location++));
+        while (migrateOneLocation(location++) && location < alternateTableSize);
     }
 
     @Override
@@ -218,7 +221,7 @@ protected void rehashInternalFull(final int oldSize) {
         mainOutputPosition.setArray(destState);
         for (int sourceBucket = 0; sourceBucket < oldSize; ++sourceBucket) {
             final int currentStateValue = originalStateArray[sourceBucket];
-            if (currentStateValue == EMPTY_OUTPUT_POSITION) {
+            if (isStateEmpty(currentStateValue)) {
                 continue;
             }
             final long k0 = originalKeyArray0[sourceBucket];
@@ -227,7 +230,7 @@ protected void rehashInternalFull(final int oldSize) {
             final int firstDestinationTableLocation = hashToTableLocation(hash);
             int destinationTableLocation = firstDestinationTableLocation;
             while (true) {
-                if (destState[destinationTableLocation] == EMPTY_OUTPUT_POSITION) {
+                if (isStateEmpty(destState[destinationTableLocation])) {
                     destKeyArray0[destinationTableLocation] = k0;
                     destKeyArray1[destinationTableLocation] = k1;
                     destState[destinationTableLocation] = originalStateArray[sourceBucket];
@@ -250,7 +253,7 @@ public int findPositionForKey(Object key) {
         final int firstTableLocation = tableLocation;
         while (true) {
             final int positionValue = mainOutputPosition.getUnsafe(tableLocation);
-            if (positionValue == EMPTY_OUTPUT_POSITION) {
+            if (isStateEmpty(positionValue)) {
                 int alternateTableLocation = hashToTableLocationAlternate(hash);
                 if (alternateTableLocation >= rehashPointer) {
                     return UNKNOWN_ROW;
@@ -258,7 +261,7 @@ public int findPositionForKey(Object key) {
                 final int firstAlternateTableLocation = alternateTableLocation;
                 while (true) {
                     final int alternatePositionValue = alternateOutputPosition.getUnsafe(alternateTableLocation);
-                    if (alternatePositionValue == EMPTY_OUTPUT_POSITION) {
+                    if (isStateEmpty(alternatePositionValue)) {
                         return UNKNOWN_ROW;
                     }
                     if (eq(alternateKeySource0.getUnsafe(alternateTableLocation), k0) && eq(alternateKeySource1.getUnsafe(alternateTableLocation), k1)) {
diff --git a/engine/table/src/main/java/io/deephaven/engine/table/impl/by/typed/incopenagg/gen/IncrementalAggOpenHasherLongShort.java b/engine/table/src/main/java/io/deephaven/engine/table/impl/by/typed/incopenagg/gen/IncrementalAggOpenHasherLongShort.java
index 75cb9076d69..d6adb137f6f 100644
--- a/engine/table/src/main/java/io/deephaven/engine/table/impl/by/typed/incopenagg/gen/IncrementalAggOpenHasherLongShort.java
+++ b/engine/table/src/main/java/io/deephaven/engine/table/impl/by/typed/incopenagg/gen/IncrementalAggOpenHasherLongShort.java
@@ -68,12 +68,12 @@ protected void build(RowSequence rowSequence, Chunk[] sourceKeyChunks) {
             int tableLocation = firstTableLocation;
             MAIN_SEARCH: while (true) {
                 int outputPosition = mainOutputPosition.getUnsafe(tableLocation);
-                if (outputPosition == EMPTY_OUTPUT_POSITION) {
+                if (isStateEmpty(outputPosition)) {
                     final int firstAlternateTableLocation = hashToTableLocationAlternate(hash);
                     int alternateTableLocation = firstAlternateTableLocation;
                     while (alternateTableLocation < rehashPointer) {
                         outputPosition = alternateOutputPosition.getUnsafe(alternateTableLocation);
-                        if (outputPosition == EMPTY_OUTPUT_POSITION) {
+                        if (isStateEmpty(outputPosition)) {
                             break;
                         } else if (eq(alternateKeySource0.getUnsafe(alternateTableLocation), k0) && eq(alternateKeySource1.getUnsafe(alternateTableLocation), k1)) {
                             outputPositions.set(chunkPosition, outputPosition);
@@ -114,7 +114,7 @@ protected void probe(RowSequence rowSequence, Chunk[] sourceKeyChunks) {
             boolean found = false;
             int tableLocation = firstTableLocation;
             int outputPosition;
-            while ((outputPosition = mainOutputPosition.getUnsafe(tableLocation)) != EMPTY_OUTPUT_POSITION) {
+            while (!isStateEmpty(outputPosition = mainOutputPosition.getUnsafe(tableLocation))) {
                 if (eq(mainKeySource0.getUnsafe(tableLocation), k0) && eq(mainKeySource1.getUnsafe(tableLocation), k1)) {
                     outputPositions.set(chunkPosition, outputPosition);
                     found = true;
@@ -128,7 +128,7 @@ protected void probe(RowSequence rowSequence, Chunk[] sourceKeyChunks) {
                 boolean alternateFound = false;
                 if (firstAlternateTableLocation < rehashPointer) {
                     int alternateTableLocation = firstAlternateTableLocation;
-                    while ((outputPosition = alternateOutputPosition.getUnsafe(alternateTableLocation)) != EMPTY_OUTPUT_POSITION) {
+                    while (!isStateEmpty(outputPosition = alternateOutputPosition.getUnsafe(alternateTableLocation))) {
                         if (eq(alternateKeySource0.getUnsafe(alternateTableLocation), k0) && eq(alternateKeySource1.getUnsafe(alternateTableLocation), k1)) {
                             outputPositions.set(chunkPosition, outputPosition);
                             alternateFound = true;
@@ -151,16 +151,20 @@ private static int hash(long k0, short k1) {
         return hash;
     }
 
+    private static boolean isStateEmpty(int state) {
+        return state == EMPTY_OUTPUT_POSITION;
+    }
+
     private boolean migrateOneLocation(int locationToMigrate) {
         final int currentStateValue = alternateOutputPosition.getUnsafe(locationToMigrate);
-        if (currentStateValue == EMPTY_OUTPUT_POSITION) {
+        if (isStateEmpty(currentStateValue)) {
             return false;
         }
         final long k0 = alternateKeySource0.getUnsafe(locationToMigrate);
         final short k1 = alternateKeySource1.getUnsafe(locationToMigrate);
         final int hash = hash(k0, k1);
         int destinationTableLocation = hashToTableLocation(hash);
-        while (mainOutputPosition.getUnsafe(destinationTableLocation) != EMPTY_OUTPUT_POSITION) {
+        while (!isStateEmpty(mainOutputPosition.getUnsafe(destinationTableLocation))) {
             destinationTableLocation = nextTableLocation(destinationTableLocation);
         }
         mainKeySource0.set(destinationTableLocation, k0);
@@ -183,8 +187,7 @@ protected int rehashInternalPartial(int entriesToRehash) {
     }
 
     @Override
-    protected void newAlternate() {
-        super.newAlternate();
+    protected void adviseNewAlternate() {
         this.mainKeySource0 = (ImmutableLongArraySource)super.mainKeySources[0];
         this.alternateKeySource0 = (ImmutableLongArraySource)super.alternateKeySources[0];
         this.mainKeySource1 = (ImmutableShortArraySource)super.mainKeySources[1];
@@ -201,7 +204,7 @@ protected void clearAlternate() {
     @Override
     protected void migrateFront() {
         int location = 0;
-        while (migrateOneLocation(location++));
+        while (migrateOneLocation(location++) && location < alternateTableSize);
     }
 
     @Override
@@ -218,7 +221,7 @@ protected void rehashInternalFull(final int oldSize) {
         mainOutputPosition.setArray(destState);
         for (int sourceBucket = 0; sourceBucket < oldSize; ++sourceBucket) {
             final int currentStateValue = originalStateArray[sourceBucket];
-            if (currentStateValue == EMPTY_OUTPUT_POSITION) {
+            if (isStateEmpty(currentStateValue)) {
                 continue;
             }
             final long k0 = originalKeyArray0[sourceBucket];
@@ -227,7 +230,7 @@ protected void rehashInternalFull(final int oldSize) {
             final int firstDestinationTableLocation = hashToTableLocation(hash);
             int destinationTableLocation = firstDestinationTableLocation;
             while (true) {
-                if (destState[destinationTableLocation] == EMPTY_OUTPUT_POSITION) {
+                if (isStateEmpty(destState[destinationTableLocation])) {
                     destKeyArray0[destinationTableLocation] = k0;
                     destKeyArray1[destinationTableLocation] = k1;
                     destState[destinationTableLocation] = originalStateArray[sourceBucket];
@@ -250,7 +253,7 @@ public int findPositionForKey(Object key) {
         final int firstTableLocation = tableLocation;
         while (true) {
             final int positionValue = mainOutputPosition.getUnsafe(tableLocation);
-            if (positionValue == EMPTY_OUTPUT_POSITION) {
+            if (isStateEmpty(positionValue)) {
                 int alternateTableLocation = hashToTableLocationAlternate(hash);
                 if (alternateTableLocation >= rehashPointer) {
                     return UNKNOWN_ROW;
@@ -258,7 +261,7 @@ public int findPositionForKey(Object key) {
                 final int firstAlternateTableLocation = alternateTableLocation;
                 while (true) {
                     final int alternatePositionValue = alternateOutputPosition.getUnsafe(alternateTableLocation);
-                    if (alternatePositionValue == EMPTY_OUTPUT_POSITION) {
+                    if (isStateEmpty(alternatePositionValue)) {
                         return UNKNOWN_ROW;
                     }
                     if (eq(alternateKeySource0.getUnsafe(alternateTableLocation), k0) && eq(alternateKeySource1.getUnsafe(alternateTableLocation), k1)) {
diff --git a/engine/table/src/main/java/io/deephaven/engine/table/impl/by/typed/incopenagg/gen/IncrementalAggOpenHasherObject.java b/engine/table/src/main/java/io/deephaven/engine/table/impl/by/typed/incopenagg/gen/IncrementalAggOpenHasherObject.java
index d78b96ef955..9aa33ed8445 100644
--- a/engine/table/src/main/java/io/deephaven/engine/table/impl/by/typed/incopenagg/gen/IncrementalAggOpenHasherObject.java
+++ b/engine/table/src/main/java/io/deephaven/engine/table/impl/by/typed/incopenagg/gen/IncrementalAggOpenHasherObject.java
@@ -53,12 +53,12 @@ protected void build(RowSequence rowSequence, Chunk[] sourceKeyChunks) {
             int tableLocation = firstTableLocation;
             MAIN_SEARCH: while (true) {
                 int outputPosition = mainOutputPosition.getUnsafe(tableLocation);
-                if (outputPosition == EMPTY_OUTPUT_POSITION) {
+                if (isStateEmpty(outputPosition)) {
                     final int firstAlternateTableLocation = hashToTableLocationAlternate(hash);
                     int alternateTableLocation = firstAlternateTableLocation;
                     while (alternateTableLocation < rehashPointer) {
                         outputPosition = alternateOutputPosition.getUnsafe(alternateTableLocation);
-                        if (outputPosition == EMPTY_OUTPUT_POSITION) {
+                        if (isStateEmpty(outputPosition)) {
                             break;
                         } else if (eq(alternateKeySource0.getUnsafe(alternateTableLocation), k0)) {
                             outputPositions.set(chunkPosition, outputPosition);
@@ -96,7 +96,7 @@ protected void probe(RowSequence rowSequence, Chunk[] sourceKeyChunks) {
             boolean found = false;
             int tableLocation = firstTableLocation;
             int outputPosition;
-            while ((outputPosition = mainOutputPosition.getUnsafe(tableLocation)) != EMPTY_OUTPUT_POSITION) {
+            while (!isStateEmpty(outputPosition = mainOutputPosition.getUnsafe(tableLocation))) {
                 if (eq(mainKeySource0.getUnsafe(tableLocation), k0)) {
                     outputPositions.set(chunkPosition, outputPosition);
                     found = true;
@@ -110,7 +110,7 @@ protected void probe(RowSequence rowSequence, Chunk[] sourceKeyChunks) {
                 boolean alternateFound = false;
                 if (firstAlternateTableLocation < rehashPointer) {
                     int alternateTableLocation = firstAlternateTableLocation;
-                    while ((outputPosition = alternateOutputPosition.getUnsafe(alternateTableLocation)) != EMPTY_OUTPUT_POSITION) {
+                    while (!isStateEmpty(outputPosition = alternateOutputPosition.getUnsafe(alternateTableLocation))) {
                         if (eq(alternateKeySource0.getUnsafe(alternateTableLocation), k0)) {
                             outputPositions.set(chunkPosition, outputPosition);
                             alternateFound = true;
@@ -132,15 +132,19 @@ private static int hash(Object k0) {
         return hash;
     }
 
+    private static boolean isStateEmpty(int state) {
+        return state == EMPTY_OUTPUT_POSITION;
+    }
+
     private boolean migrateOneLocation(int locationToMigrate) {
         final int currentStateValue = alternateOutputPosition.getUnsafe(locationToMigrate);
-        if (currentStateValue == EMPTY_OUTPUT_POSITION) {
+        if (isStateEmpty(currentStateValue)) {
             return false;
         }
         final Object k0 = alternateKeySource0.getUnsafe(locationToMigrate);
         final int hash = hash(k0);
         int destinationTableLocation = hashToTableLocation(hash);
-        while (mainOutputPosition.getUnsafe(destinationTableLocation) != EMPTY_OUTPUT_POSITION) {
+        while (!isStateEmpty(mainOutputPosition.getUnsafe(destinationTableLocation))) {
             destinationTableLocation = nextTableLocation(destinationTableLocation);
         }
         mainKeySource0.set(destinationTableLocation, k0);
@@ -163,8 +167,7 @@ protected int rehashInternalPartial(int entriesToRehash) {
     }
 
     @Override
-    protected void newAlternate() {
-        super.newAlternate();
+    protected void adviseNewAlternate() {
         this.mainKeySource0 = (ImmutableObjectArraySource)super.mainKeySources[0];
         this.alternateKeySource0 = (ImmutableObjectArraySource)super.alternateKeySources[0];
     }
@@ -178,7 +181,7 @@ protected void clearAlternate() {
     @Override
     protected void migrateFront() {
         int location = 0;
-        while (migrateOneLocation(location++));
+        while (migrateOneLocation(location++) && location < alternateTableSize);
     }
 
     @Override
@@ -192,7 +195,7 @@ protected void rehashInternalFull(final int oldSize) {
         mainOutputPosition.setArray(destState);
         for (int sourceBucket = 0; sourceBucket < oldSize; ++sourceBucket) {
             final int currentStateValue = originalStateArray[sourceBucket];
-            if (currentStateValue == EMPTY_OUTPUT_POSITION) {
+            if (isStateEmpty(currentStateValue)) {
                 continue;
             }
             final Object k0 = originalKeyArray0[sourceBucket];
@@ -200,7 +203,7 @@ protected void rehashInternalFull(final int oldSize) {
             final int firstDestinationTableLocation = hashToTableLocation(hash);
             int destinationTableLocation = firstDestinationTableLocation;
             while (true) {
-                if (destState[destinationTableLocation] == EMPTY_OUTPUT_POSITION) {
+                if (isStateEmpty(destState[destinationTableLocation])) {
                     destKeyArray0[destinationTableLocation] = k0;
                     destState[destinationTableLocation] = originalStateArray[sourceBucket];
                     outputPositionToHashSlot.set(currentStateValue, mainInsertMask | destinationTableLocation);
@@ -220,7 +223,7 @@ public int findPositionForKey(Object key) {
         final int firstTableLocation = tableLocation;
         while (true) {
             final int positionValue = mainOutputPosition.getUnsafe(tableLocation);
-            if (positionValue == EMPTY_OUTPUT_POSITION) {
+            if (isStateEmpty(positionValue)) {
                 int alternateTableLocation = hashToTableLocationAlternate(hash);
                 if (alternateTableLocation >= rehashPointer) {
                     return UNKNOWN_ROW;
@@ -228,7 +231,7 @@ public int findPositionForKey(Object key) {
                 final int firstAlternateTableLocation = alternateTableLocation;
                 while (true) {
                     final int alternatePositionValue = alternateOutputPosition.getUnsafe(alternateTableLocation);
-                    if (alternatePositionValue == EMPTY_OUTPUT_POSITION) {
+                    if (isStateEmpty(alternatePositionValue)) {
                         return UNKNOWN_ROW;
                     }
                     if (eq(alternateKeySource0.getUnsafe(alternateTableLocation), k0)) {
diff --git a/engine/table/src/main/java/io/deephaven/engine/table/impl/by/typed/incopenagg/gen/IncrementalAggOpenHasherObjectByte.java b/engine/table/src/main/java/io/deephaven/engine/table/impl/by/typed/incopenagg/gen/IncrementalAggOpenHasherObjectByte.java
index b1e71bab170..ef1fe49fed6 100644
--- a/engine/table/src/main/java/io/deephaven/engine/table/impl/by/typed/incopenagg/gen/IncrementalAggOpenHasherObjectByte.java
+++ b/engine/table/src/main/java/io/deephaven/engine/table/impl/by/typed/incopenagg/gen/IncrementalAggOpenHasherObjectByte.java
@@ -67,12 +67,12 @@ protected void build(RowSequence rowSequence, Chunk[] sourceKeyChunks) {
             int tableLocation = firstTableLocation;
             MAIN_SEARCH: while (true) {
                 int outputPosition = mainOutputPosition.getUnsafe(tableLocation);
-                if (outputPosition == EMPTY_OUTPUT_POSITION) {
+                if (isStateEmpty(outputPosition)) {
                     final int firstAlternateTableLocation = hashToTableLocationAlternate(hash);
                     int alternateTableLocation = firstAlternateTableLocation;
                     while (alternateTableLocation < rehashPointer) {
                         outputPosition = alternateOutputPosition.getUnsafe(alternateTableLocation);
-                        if (outputPosition == EMPTY_OUTPUT_POSITION) {
+                        if (isStateEmpty(outputPosition)) {
                             break;
                         } else if (eq(alternateKeySource0.getUnsafe(alternateTableLocation), k0) && eq(alternateKeySource1.getUnsafe(alternateTableLocation), k1)) {
                             outputPositions.set(chunkPosition, outputPosition);
@@ -113,7 +113,7 @@ protected void probe(RowSequence rowSequence, Chunk[] sourceKeyChunks) {
             boolean found = false;
             int tableLocation = firstTableLocation;
             int outputPosition;
-            while ((outputPosition = mainOutputPosition.getUnsafe(tableLocation)) != EMPTY_OUTPUT_POSITION) {
+            while (!isStateEmpty(outputPosition = mainOutputPosition.getUnsafe(tableLocation))) {
                 if (eq(mainKeySource0.getUnsafe(tableLocation), k0) && eq(mainKeySource1.getUnsafe(tableLocation), k1)) {
                     outputPositions.set(chunkPosition, outputPosition);
                     found = true;
@@ -127,7 +127,7 @@ protected void probe(RowSequence rowSequence, Chunk[] sourceKeyChunks) {
                 boolean alternateFound = false;
                 if (firstAlternateTableLocation < rehashPointer) {
                     int alternateTableLocation = firstAlternateTableLocation;
-                    while ((outputPosition = alternateOutputPosition.getUnsafe(alternateTableLocation)) != EMPTY_OUTPUT_POSITION) {
+                    while (!isStateEmpty(outputPosition = alternateOutputPosition.getUnsafe(alternateTableLocation))) {
                         if (eq(alternateKeySource0.getUnsafe(alternateTableLocation), k0) && eq(alternateKeySource1.getUnsafe(alternateTableLocation), k1)) {
                             outputPositions.set(chunkPosition, outputPosition);
                             alternateFound = true;
@@ -150,16 +150,20 @@ private static int hash(Object k0, byte k1) {
         return hash;
     }
 
+    private static boolean isStateEmpty(int state) {
+        return state == EMPTY_OUTPUT_POSITION;
+    }
+
     private boolean migrateOneLocation(int locationToMigrate) {
         final int currentStateValue = alternateOutputPosition.getUnsafe(locationToMigrate);
-        if (currentStateValue == EMPTY_OUTPUT_POSITION) {
+        if (isStateEmpty(currentStateValue)) {
             return false;
         }
         final Object k0 = alternateKeySource0.getUnsafe(locationToMigrate);
         final byte k1 = alternateKeySource1.getUnsafe(locationToMigrate);
         final int hash = hash(k0, k1);
         int destinationTableLocation = hashToTableLocation(hash);
-        while (mainOutputPosition.getUnsafe(destinationTableLocation) != EMPTY_OUTPUT_POSITION) {
+        while (!isStateEmpty(mainOutputPosition.getUnsafe(destinationTableLocation))) {
             destinationTableLocation = nextTableLocation(destinationTableLocation);
         }
         mainKeySource0.set(destinationTableLocation, k0);
@@ -183,8 +187,7 @@ protected int rehashInternalPartial(int entriesToRehash) {
     }
 
     @Override
-    protected void newAlternate() {
-        super.newAlternate();
+    protected void adviseNewAlternate() {
         this.mainKeySource0 = (ImmutableObjectArraySource)super.mainKeySources[0];
         this.alternateKeySource0 = (ImmutableObjectArraySource)super.alternateKeySources[0];
         this.mainKeySource1 = (ImmutableByteArraySource)super.mainKeySources[1];
@@ -201,7 +204,7 @@ protected void clearAlternate() {
     @Override
     protected void migrateFront() {
         int location = 0;
-        while (migrateOneLocation(location++));
+        while (migrateOneLocation(location++) && location < alternateTableSize);
     }
 
     @Override
@@ -218,7 +221,7 @@ protected void rehashInternalFull(final int oldSize) {
         mainOutputPosition.setArray(destState);
         for (int sourceBucket = 0; sourceBucket < oldSize; ++sourceBucket) {
             final int currentStateValue = originalStateArray[sourceBucket];
-            if (currentStateValue == EMPTY_OUTPUT_POSITION) {
+            if (isStateEmpty(currentStateValue)) {
                 continue;
             }
             final Object k0 = originalKeyArray0[sourceBucket];
@@ -227,7 +230,7 @@ protected void rehashInternalFull(final int oldSize) {
             final int firstDestinationTableLocation = hashToTableLocation(hash);
             int destinationTableLocation = firstDestinationTableLocation;
             while (true) {
-                if (destState[destinationTableLocation] == EMPTY_OUTPUT_POSITION) {
+                if (isStateEmpty(destState[destinationTableLocation])) {
                     destKeyArray0[destinationTableLocation] = k0;
                     destKeyArray1[destinationTableLocation] = k1;
                     destState[destinationTableLocation] = originalStateArray[sourceBucket];
@@ -250,7 +253,7 @@ public int findPositionForKey(Object key) {
         final int firstTableLocation = tableLocation;
         while (true) {
             final int positionValue = mainOutputPosition.getUnsafe(tableLocation);
-            if (positionValue == EMPTY_OUTPUT_POSITION) {
+            if (isStateEmpty(positionValue)) {
                 int alternateTableLocation = hashToTableLocationAlternate(hash);
                 if (alternateTableLocation >= rehashPointer) {
                     return UNKNOWN_ROW;
@@ -258,7 +261,7 @@ public int findPositionForKey(Object key) {
                 final int firstAlternateTableLocation = alternateTableLocation;
                 while (true) {
                     final int alternatePositionValue = alternateOutputPosition.getUnsafe(alternateTableLocation);
-                    if (alternatePositionValue == EMPTY_OUTPUT_POSITION) {
+                    if (isStateEmpty(alternatePositionValue)) {
                         return UNKNOWN_ROW;
                     }
                     if (eq(alternateKeySource0.getUnsafe(alternateTableLocation), k0) && eq(alternateKeySource1.getUnsafe(alternateTableLocation), k1)) {
diff --git a/engine/table/src/main/java/io/deephaven/engine/table/impl/by/typed/incopenagg/gen/IncrementalAggOpenHasherObjectChar.java b/engine/table/src/main/java/io/deephaven/engine/table/impl/by/typed/incopenagg/gen/IncrementalAggOpenHasherObjectChar.java
index ce15e231891..c5bea6fdf24 100644
--- a/engine/table/src/main/java/io/deephaven/engine/table/impl/by/typed/incopenagg/gen/IncrementalAggOpenHasherObjectChar.java
+++ b/engine/table/src/main/java/io/deephaven/engine/table/impl/by/typed/incopenagg/gen/IncrementalAggOpenHasherObjectChar.java
@@ -67,12 +67,12 @@ protected void build(RowSequence rowSequence, Chunk[] sourceKeyChunks) {
             int tableLocation = firstTableLocation;
             MAIN_SEARCH: while (true) {
                 int outputPosition = mainOutputPosition.getUnsafe(tableLocation);
-                if (outputPosition == EMPTY_OUTPUT_POSITION) {
+                if (isStateEmpty(outputPosition)) {
                     final int firstAlternateTableLocation = hashToTableLocationAlternate(hash);
                     int alternateTableLocation = firstAlternateTableLocation;
                     while (alternateTableLocation < rehashPointer) {
                         outputPosition = alternateOutputPosition.getUnsafe(alternateTableLocation);
-                        if (outputPosition == EMPTY_OUTPUT_POSITION) {
+                        if (isStateEmpty(outputPosition)) {
                             break;
                         } else if (eq(alternateKeySource0.getUnsafe(alternateTableLocation), k0) && eq(alternateKeySource1.getUnsafe(alternateTableLocation), k1)) {
                             outputPositions.set(chunkPosition, outputPosition);
@@ -113,7 +113,7 @@ protected void probe(RowSequence rowSequence, Chunk[] sourceKeyChunks) {
             boolean found = false;
             int tableLocation = firstTableLocation;
             int outputPosition;
-            while ((outputPosition = mainOutputPosition.getUnsafe(tableLocation)) != EMPTY_OUTPUT_POSITION) {
+            while (!isStateEmpty(outputPosition = mainOutputPosition.getUnsafe(tableLocation))) {
                 if (eq(mainKeySource0.getUnsafe(tableLocation), k0) && eq(mainKeySource1.getUnsafe(tableLocation), k1)) {
                     outputPositions.set(chunkPosition, outputPosition);
                     found = true;
@@ -127,7 +127,7 @@ protected void probe(RowSequence rowSequence, Chunk[] sourceKeyChunks) {
                 boolean alternateFound = false;
                 if (firstAlternateTableLocation < rehashPointer) {
                     int alternateTableLocation = firstAlternateTableLocation;
-                    while ((outputPosition = alternateOutputPosition.getUnsafe(alternateTableLocation)) != EMPTY_OUTPUT_POSITION) {
+                    while (!isStateEmpty(outputPosition = alternateOutputPosition.getUnsafe(alternateTableLocation))) {
                         if (eq(alternateKeySource0.getUnsafe(alternateTableLocation), k0) && eq(alternateKeySource1.getUnsafe(alternateTableLocation), k1)) {
                             outputPositions.set(chunkPosition, outputPosition);
                             alternateFound = true;
@@ -150,16 +150,20 @@ private static int hash(Object k0, char k1) {
         return hash;
     }
 
+    private static boolean isStateEmpty(int state) {
+        return state == EMPTY_OUTPUT_POSITION;
+    }
+
     private boolean migrateOneLocation(int locationToMigrate) {
         final int currentStateValue = alternateOutputPosition.getUnsafe(locationToMigrate);
-        if (currentStateValue == EMPTY_OUTPUT_POSITION) {
+        if (isStateEmpty(currentStateValue)) {
             return false;
         }
         final Object k0 = alternateKeySource0.getUnsafe(locationToMigrate);
         final char k1 = alternateKeySource1.getUnsafe(locationToMigrate);
         final int hash = hash(k0, k1);
         int destinationTableLocation = hashToTableLocation(hash);
-        while (mainOutputPosition.getUnsafe(destinationTableLocation) != EMPTY_OUTPUT_POSITION) {
+        while (!isStateEmpty(mainOutputPosition.getUnsafe(destinationTableLocation))) {
             destinationTableLocation = nextTableLocation(destinationTableLocation);
         }
         mainKeySource0.set(destinationTableLocation, k0);
@@ -183,8 +187,7 @@ protected int rehashInternalPartial(int entriesToRehash) {
     }
 
     @Override
-    protected void newAlternate() {
-        super.newAlternate();
+    protected void adviseNewAlternate() {
         this.mainKeySource0 = (ImmutableObjectArraySource)super.mainKeySources[0];
         this.alternateKeySource0 = (ImmutableObjectArraySource)super.alternateKeySources[0];
         this.mainKeySource1 = (ImmutableCharArraySource)super.mainKeySources[1];
@@ -201,7 +204,7 @@ protected void clearAlternate() {
     @Override
     protected void migrateFront() {
         int location = 0;
-        while (migrateOneLocation(location++));
+        while (migrateOneLocation(location++) && location < alternateTableSize);
     }
 
     @Override
@@ -218,7 +221,7 @@ protected void rehashInternalFull(final int oldSize) {
         mainOutputPosition.setArray(destState);
         for (int sourceBucket = 0; sourceBucket < oldSize; ++sourceBucket) {
             final int currentStateValue = originalStateArray[sourceBucket];
-            if (currentStateValue == EMPTY_OUTPUT_POSITION) {
+            if (isStateEmpty(currentStateValue)) {
                 continue;
             }
             final Object k0 = originalKeyArray0[sourceBucket];
@@ -227,7 +230,7 @@ protected void rehashInternalFull(final int oldSize) {
             final int firstDestinationTableLocation = hashToTableLocation(hash);
             int destinationTableLocation = firstDestinationTableLocation;
             while (true) {
-                if (destState[destinationTableLocation] == EMPTY_OUTPUT_POSITION) {
+                if (isStateEmpty(destState[destinationTableLocation])) {
                     destKeyArray0[destinationTableLocation] = k0;
                     destKeyArray1[destinationTableLocation] = k1;
                     destState[destinationTableLocation] = originalStateArray[sourceBucket];
@@ -250,7 +253,7 @@ public int findPositionForKey(Object key) {
         final int firstTableLocation = tableLocation;
         while (true) {
             final int positionValue = mainOutputPosition.getUnsafe(tableLocation);
-            if (positionValue == EMPTY_OUTPUT_POSITION) {
+            if (isStateEmpty(positionValue)) {
                 int alternateTableLocation = hashToTableLocationAlternate(hash);
                 if (alternateTableLocation >= rehashPointer) {
                     return UNKNOWN_ROW;
@@ -258,7 +261,7 @@ public int findPositionForKey(Object key) {
                 final int firstAlternateTableLocation = alternateTableLocation;
                 while (true) {
                     final int alternatePositionValue = alternateOutputPosition.getUnsafe(alternateTableLocation);
-                    if (alternatePositionValue == EMPTY_OUTPUT_POSITION) {
+                    if (isStateEmpty(alternatePositionValue)) {
                         return UNKNOWN_ROW;
                     }
                     if (eq(alternateKeySource0.getUnsafe(alternateTableLocation), k0) && eq(alternateKeySource1.getUnsafe(alternateTableLocation), k1)) {
diff --git a/engine/table/src/main/java/io/deephaven/engine/table/impl/by/typed/incopenagg/gen/IncrementalAggOpenHasherObjectDouble.java b/engine/table/src/main/java/io/deephaven/engine/table/impl/by/typed/incopenagg/gen/IncrementalAggOpenHasherObjectDouble.java
index 1936315fdc7..727519e13fe 100644
--- a/engine/table/src/main/java/io/deephaven/engine/table/impl/by/typed/incopenagg/gen/IncrementalAggOpenHasherObjectDouble.java
+++ b/engine/table/src/main/java/io/deephaven/engine/table/impl/by/typed/incopenagg/gen/IncrementalAggOpenHasherObjectDouble.java
@@ -67,12 +67,12 @@ protected void build(RowSequence rowSequence, Chunk[] sourceKeyChunks) {
             int tableLocation = firstTableLocation;
             MAIN_SEARCH: while (true) {
                 int outputPosition = mainOutputPosition.getUnsafe(tableLocation);
-                if (outputPosition == EMPTY_OUTPUT_POSITION) {
+                if (isStateEmpty(outputPosition)) {
                     final int firstAlternateTableLocation = hashToTableLocationAlternate(hash);
                     int alternateTableLocation = firstAlternateTableLocation;
                     while (alternateTableLocation < rehashPointer) {
                         outputPosition = alternateOutputPosition.getUnsafe(alternateTableLocation);
-                        if (outputPosition == EMPTY_OUTPUT_POSITION) {
+                        if (isStateEmpty(outputPosition)) {
                             break;
                         } else if (eq(alternateKeySource0.getUnsafe(alternateTableLocation), k0) && eq(alternateKeySource1.getUnsafe(alternateTableLocation), k1)) {
                             outputPositions.set(chunkPosition, outputPosition);
@@ -113,7 +113,7 @@ protected void probe(RowSequence rowSequence, Chunk[] sourceKeyChunks) {
             boolean found = false;
             int tableLocation = firstTableLocation;
             int outputPosition;
-            while ((outputPosition = mainOutputPosition.getUnsafe(tableLocation)) != EMPTY_OUTPUT_POSITION) {
+            while (!isStateEmpty(outputPosition = mainOutputPosition.getUnsafe(tableLocation))) {
                 if (eq(mainKeySource0.getUnsafe(tableLocation), k0) && eq(mainKeySource1.getUnsafe(tableLocation), k1)) {
                     outputPositions.set(chunkPosition, outputPosition);
                     found = true;
@@ -127,7 +127,7 @@ protected void probe(RowSequence rowSequence, Chunk[] sourceKeyChunks) {
                 boolean alternateFound = false;
                 if (firstAlternateTableLocation < rehashPointer) {
                     int alternateTableLocation = firstAlternateTableLocation;
-                    while ((outputPosition = alternateOutputPosition.getUnsafe(alternateTableLocation)) != EMPTY_OUTPUT_POSITION) {
+                    while (!isStateEmpty(outputPosition = alternateOutputPosition.getUnsafe(alternateTableLocation))) {
                         if (eq(alternateKeySource0.getUnsafe(alternateTableLocation), k0) && eq(alternateKeySource1.getUnsafe(alternateTableLocation), k1)) {
                             outputPositions.set(chunkPosition, outputPosition);
                             alternateFound = true;
@@ -150,16 +150,20 @@ private static int hash(Object k0, double k1) {
         return hash;
     }
 
+    private static boolean isStateEmpty(int state) {
+        return state == EMPTY_OUTPUT_POSITION;
+    }
+
     private boolean migrateOneLocation(int locationToMigrate) {
         final int currentStateValue = alternateOutputPosition.getUnsafe(locationToMigrate);
-        if (currentStateValue == EMPTY_OUTPUT_POSITION) {
+        if (isStateEmpty(currentStateValue)) {
             return false;
         }
         final Object k0 = alternateKeySource0.getUnsafe(locationToMigrate);
         final double k1 = alternateKeySource1.getUnsafe(locationToMigrate);
         final int hash = hash(k0, k1);
         int destinationTableLocation = hashToTableLocation(hash);
-        while (mainOutputPosition.getUnsafe(destinationTableLocation) != EMPTY_OUTPUT_POSITION) {
+        while (!isStateEmpty(mainOutputPosition.getUnsafe(destinationTableLocation))) {
             destinationTableLocation = nextTableLocation(destinationTableLocation);
         }
         mainKeySource0.set(destinationTableLocation, k0);
@@ -183,8 +187,7 @@ protected int rehashInternalPartial(int entriesToRehash) {
     }
 
     @Override
-    protected void newAlternate() {
-        super.newAlternate();
+    protected void adviseNewAlternate() {
         this.mainKeySource0 = (ImmutableObjectArraySource)super.mainKeySources[0];
         this.alternateKeySource0 = (ImmutableObjectArraySource)super.alternateKeySources[0];
         this.mainKeySource1 = (ImmutableDoubleArraySource)super.mainKeySources[1];
@@ -201,7 +204,7 @@ protected void clearAlternate() {
     @Override
     protected void migrateFront() {
         int location = 0;
-        while (migrateOneLocation(location++));
+        while (migrateOneLocation(location++) && location < alternateTableSize);
     }
 
     @Override
@@ -218,7 +221,7 @@ protected void rehashInternalFull(final int oldSize) {
         mainOutputPosition.setArray(destState);
         for (int sourceBucket = 0; sourceBucket < oldSize; ++sourceBucket) {
             final int currentStateValue = originalStateArray[sourceBucket];
-            if (currentStateValue == EMPTY_OUTPUT_POSITION) {
+            if (isStateEmpty(currentStateValue)) {
                 continue;
             }
             final Object k0 = originalKeyArray0[sourceBucket];
@@ -227,7 +230,7 @@ protected void rehashInternalFull(final int oldSize) {
             final int firstDestinationTableLocation = hashToTableLocation(hash);
             int destinationTableLocation = firstDestinationTableLocation;
             while (true) {
-                if (destState[destinationTableLocation] == EMPTY_OUTPUT_POSITION) {
+                if (isStateEmpty(destState[destinationTableLocation])) {
                     destKeyArray0[destinationTableLocation] = k0;
                     destKeyArray1[destinationTableLocation] = k1;
                     destState[destinationTableLocation] = originalStateArray[sourceBucket];
@@ -250,7 +253,7 @@ public int findPositionForKey(Object key) {
         final int firstTableLocation = tableLocation;
         while (true) {
             final int positionValue = mainOutputPosition.getUnsafe(tableLocation);
-            if (positionValue == EMPTY_OUTPUT_POSITION) {
+            if (isStateEmpty(positionValue)) {
                 int alternateTableLocation = hashToTableLocationAlternate(hash);
                 if (alternateTableLocation >= rehashPointer) {
                     return UNKNOWN_ROW;
@@ -258,7 +261,7 @@ public int findPositionForKey(Object key) {
                 final int firstAlternateTableLocation = alternateTableLocation;
                 while (true) {
                     final int alternatePositionValue = alternateOutputPosition.getUnsafe(alternateTableLocation);
-                    if (alternatePositionValue == EMPTY_OUTPUT_POSITION) {
+                    if (isStateEmpty(alternatePositionValue)) {
                         return UNKNOWN_ROW;
                     }
                     if (eq(alternateKeySource0.getUnsafe(alternateTableLocation), k0) && eq(alternateKeySource1.getUnsafe(alternateTableLocation), k1)) {
diff --git a/engine/table/src/main/java/io/deephaven/engine/table/impl/by/typed/incopenagg/gen/IncrementalAggOpenHasherObjectFloat.java b/engine/table/src/main/java/io/deephaven/engine/table/impl/by/typed/incopenagg/gen/IncrementalAggOpenHasherObjectFloat.java
index 5b64643f229..00be3bcbd9b 100644
--- a/engine/table/src/main/java/io/deephaven/engine/table/impl/by/typed/incopenagg/gen/IncrementalAggOpenHasherObjectFloat.java
+++ b/engine/table/src/main/java/io/deephaven/engine/table/impl/by/typed/incopenagg/gen/IncrementalAggOpenHasherObjectFloat.java
@@ -67,12 +67,12 @@ protected void build(RowSequence rowSequence, Chunk[] sourceKeyChunks) {
             int tableLocation = firstTableLocation;
             MAIN_SEARCH: while (true) {
                 int outputPosition = mainOutputPosition.getUnsafe(tableLocation);
-                if (outputPosition == EMPTY_OUTPUT_POSITION) {
+                if (isStateEmpty(outputPosition)) {
                     final int firstAlternateTableLocation = hashToTableLocationAlternate(hash);
                     int alternateTableLocation = firstAlternateTableLocation;
                     while (alternateTableLocation < rehashPointer) {
                         outputPosition = alternateOutputPosition.getUnsafe(alternateTableLocation);
-                        if (outputPosition == EMPTY_OUTPUT_POSITION) {
+                        if (isStateEmpty(outputPosition)) {
                             break;
                         } else if (eq(alternateKeySource0.getUnsafe(alternateTableLocation), k0) && eq(alternateKeySource1.getUnsafe(alternateTableLocation), k1)) {
                             outputPositions.set(chunkPosition, outputPosition);
@@ -113,7 +113,7 @@ protected void probe(RowSequence rowSequence, Chunk[] sourceKeyChunks) {
             boolean found = false;
             int tableLocation = firstTableLocation;
             int outputPosition;
-            while ((outputPosition = mainOutputPosition.getUnsafe(tableLocation)) != EMPTY_OUTPUT_POSITION) {
+            while (!isStateEmpty(outputPosition = mainOutputPosition.getUnsafe(tableLocation))) {
                 if (eq(mainKeySource0.getUnsafe(tableLocation), k0) && eq(mainKeySource1.getUnsafe(tableLocation), k1)) {
                     outputPositions.set(chunkPosition, outputPosition);
                     found = true;
@@ -127,7 +127,7 @@ protected void probe(RowSequence rowSequence, Chunk[] sourceKeyChunks) {
                 boolean alternateFound = false;
                 if (firstAlternateTableLocation < rehashPointer) {
                     int alternateTableLocation = firstAlternateTableLocation;
-                    while ((outputPosition = alternateOutputPosition.getUnsafe(alternateTableLocation)) != EMPTY_OUTPUT_POSITION) {
+                    while (!isStateEmpty(outputPosition = alternateOutputPosition.getUnsafe(alternateTableLocation))) {
                         if (eq(alternateKeySource0.getUnsafe(alternateTableLocation), k0) && eq(alternateKeySource1.getUnsafe(alternateTableLocation), k1)) {
                             outputPositions.set(chunkPosition, outputPosition);
                             alternateFound = true;
@@ -150,16 +150,20 @@ private static int hash(Object k0, float k1) {
         return hash;
     }
 
+    private static boolean isStateEmpty(int state) {
+        return state == EMPTY_OUTPUT_POSITION;
+    }
+
     private boolean migrateOneLocation(int locationToMigrate) {
         final int currentStateValue = alternateOutputPosition.getUnsafe(locationToMigrate);
-        if (currentStateValue == EMPTY_OUTPUT_POSITION) {
+        if (isStateEmpty(currentStateValue)) {
             return false;
         }
         final Object k0 = alternateKeySource0.getUnsafe(locationToMigrate);
         final float k1 = alternateKeySource1.getUnsafe(locationToMigrate);
         final int hash = hash(k0, k1);
         int destinationTableLocation = hashToTableLocation(hash);
-        while (mainOutputPosition.getUnsafe(destinationTableLocation) != EMPTY_OUTPUT_POSITION) {
+        while (!isStateEmpty(mainOutputPosition.getUnsafe(destinationTableLocation))) {
             destinationTableLocation = nextTableLocation(destinationTableLocation);
         }
         mainKeySource0.set(destinationTableLocation, k0);
@@ -183,8 +187,7 @@ protected int rehashInternalPartial(int entriesToRehash) {
     }
 
     @Override
-    protected void newAlternate() {
-        super.newAlternate();
+    protected void adviseNewAlternate() {
         this.mainKeySource0 = (ImmutableObjectArraySource)super.mainKeySources[0];
         this.alternateKeySource0 = (ImmutableObjectArraySource)super.alternateKeySources[0];
         this.mainKeySource1 = (ImmutableFloatArraySource)super.mainKeySources[1];
@@ -201,7 +204,7 @@ protected void clearAlternate() {
     @Override
     protected void migrateFront() {
         int location = 0;
-        while (migrateOneLocation(location++));
+        while (migrateOneLocation(location++) && location < alternateTableSize);
     }
 
     @Override
@@ -218,7 +221,7 @@ protected void rehashInternalFull(final int oldSize) {
         mainOutputPosition.setArray(destState);
         for (int sourceBucket = 0; sourceBucket < oldSize; ++sourceBucket) {
             final int currentStateValue = originalStateArray[sourceBucket];
-            if (currentStateValue == EMPTY_OUTPUT_POSITION) {
+            if (isStateEmpty(currentStateValue)) {
                 continue;
             }
             final Object k0 = originalKeyArray0[sourceBucket];
@@ -227,7 +230,7 @@ protected void rehashInternalFull(final int oldSize) {
             final int firstDestinationTableLocation = hashToTableLocation(hash);
             int destinationTableLocation = firstDestinationTableLocation;
             while (true) {
-                if (destState[destinationTableLocation] == EMPTY_OUTPUT_POSITION) {
+                if (isStateEmpty(destState[destinationTableLocation])) {
                     destKeyArray0[destinationTableLocation] = k0;
                     destKeyArray1[destinationTableLocation] = k1;
                     destState[destinationTableLocation] = originalStateArray[sourceBucket];
@@ -250,7 +253,7 @@ public int findPositionForKey(Object key) {
         final int firstTableLocation = tableLocation;
         while (true) {
             final int positionValue = mainOutputPosition.getUnsafe(tableLocation);
-            if (positionValue == EMPTY_OUTPUT_POSITION) {
+            if (isStateEmpty(positionValue)) {
                 int alternateTableLocation = hashToTableLocationAlternate(hash);
                 if (alternateTableLocation >= rehashPointer) {
                     return UNKNOWN_ROW;
@@ -258,7 +261,7 @@ public int findPositionForKey(Object key) {
                 final int firstAlternateTableLocation = alternateTableLocation;
                 while (true) {
                     final int alternatePositionValue = alternateOutputPosition.getUnsafe(alternateTableLocation);
-                    if (alternatePositionValue == EMPTY_OUTPUT_POSITION) {
+                    if (isStateEmpty(alternatePositionValue)) {
                         return UNKNOWN_ROW;
                     }
                     if (eq(alternateKeySource0.getUnsafe(alternateTableLocation), k0) && eq(alternateKeySource1.getUnsafe(alternateTableLocation), k1)) {
diff --git a/engine/table/src/main/java/io/deephaven/engine/table/impl/by/typed/incopenagg/gen/IncrementalAggOpenHasherObjectInt.java b/engine/table/src/main/java/io/deephaven/engine/table/impl/by/typed/incopenagg/gen/IncrementalAggOpenHasherObjectInt.java
index 889aaff30c7..4a2469db12a 100644
--- a/engine/table/src/main/java/io/deephaven/engine/table/impl/by/typed/incopenagg/gen/IncrementalAggOpenHasherObjectInt.java
+++ b/engine/table/src/main/java/io/deephaven/engine/table/impl/by/typed/incopenagg/gen/IncrementalAggOpenHasherObjectInt.java
@@ -67,12 +67,12 @@ protected void build(RowSequence rowSequence, Chunk[] sourceKeyChunks) {
             int tableLocation = firstTableLocation;
             MAIN_SEARCH: while (true) {
                 int outputPosition = mainOutputPosition.getUnsafe(tableLocation);
-                if (outputPosition == EMPTY_OUTPUT_POSITION) {
+                if (isStateEmpty(outputPosition)) {
                     final int firstAlternateTableLocation = hashToTableLocationAlternate(hash);
                     int alternateTableLocation = firstAlternateTableLocation;
                     while (alternateTableLocation < rehashPointer) {
                         outputPosition = alternateOutputPosition.getUnsafe(alternateTableLocation);
-                        if (outputPosition == EMPTY_OUTPUT_POSITION) {
+                        if (isStateEmpty(outputPosition)) {
                             break;
                         } else if (eq(alternateKeySource0.getUnsafe(alternateTableLocation), k0) && eq(alternateKeySource1.getUnsafe(alternateTableLocation), k1)) {
                             outputPositions.set(chunkPosition, outputPosition);
@@ -113,7 +113,7 @@ protected void probe(RowSequence rowSequence, Chunk[] sourceKeyChunks) {
             boolean found = false;
             int tableLocation = firstTableLocation;
             int outputPosition;
-            while ((outputPosition = mainOutputPosition.getUnsafe(tableLocation)) != EMPTY_OUTPUT_POSITION) {
+            while (!isStateEmpty(outputPosition = mainOutputPosition.getUnsafe(tableLocation))) {
                 if (eq(mainKeySource0.getUnsafe(tableLocation), k0) && eq(mainKeySource1.getUnsafe(tableLocation), k1)) {
                     outputPositions.set(chunkPosition, outputPosition);
                     found = true;
@@ -127,7 +127,7 @@ protected void probe(RowSequence rowSequence, Chunk[] sourceKeyChunks) {
                 boolean alternateFound = false;
                 if (firstAlternateTableLocation < rehashPointer) {
                     int alternateTableLocation = firstAlternateTableLocation;
-                    while ((outputPosition = alternateOutputPosition.getUnsafe(alternateTableLocation)) != EMPTY_OUTPUT_POSITION) {
+                    while (!isStateEmpty(outputPosition = alternateOutputPosition.getUnsafe(alternateTableLocation))) {
                         if (eq(alternateKeySource0.getUnsafe(alternateTableLocation), k0) && eq(alternateKeySource1.getUnsafe(alternateTableLocation), k1)) {
                             outputPositions.set(chunkPosition, outputPosition);
                             alternateFound = true;
@@ -150,16 +150,20 @@ private static int hash(Object k0, int k1) {
         return hash;
     }
 
+    private static boolean isStateEmpty(int state) {
+        return state == EMPTY_OUTPUT_POSITION;
+    }
+
     private boolean migrateOneLocation(int locationToMigrate) {
         final int currentStateValue = alternateOutputPosition.getUnsafe(locationToMigrate);
-        if (currentStateValue == EMPTY_OUTPUT_POSITION) {
+        if (isStateEmpty(currentStateValue)) {
             return false;
         }
         final Object k0 = alternateKeySource0.getUnsafe(locationToMigrate);
         final int k1 = alternateKeySource1.getUnsafe(locationToMigrate);
         final int hash = hash(k0, k1);
         int destinationTableLocation = hashToTableLocation(hash);
-        while (mainOutputPosition.getUnsafe(destinationTableLocation) != EMPTY_OUTPUT_POSITION) {
+        while (!isStateEmpty(mainOutputPosition.getUnsafe(destinationTableLocation))) {
             destinationTableLocation = nextTableLocation(destinationTableLocation);
         }
         mainKeySource0.set(destinationTableLocation, k0);
@@ -183,8 +187,7 @@ protected int rehashInternalPartial(int entriesToRehash) {
     }
 
     @Override
-    protected void newAlternate() {
-        super.newAlternate();
+    protected void adviseNewAlternate() {
         this.mainKeySource0 = (ImmutableObjectArraySource)super.mainKeySources[0];
         this.alternateKeySource0 = (ImmutableObjectArraySource)super.alternateKeySources[0];
         this.mainKeySource1 = (ImmutableIntArraySource)super.mainKeySources[1];
@@ -201,7 +204,7 @@ protected void clearAlternate() {
     @Override
     protected void migrateFront() {
         int location = 0;
-        while (migrateOneLocation(location++));
+        while (migrateOneLocation(location++) && location < alternateTableSize);
     }
 
     @Override
@@ -218,7 +221,7 @@ protected void rehashInternalFull(final int oldSize) {
         mainOutputPosition.setArray(destState);
         for (int sourceBucket = 0; sourceBucket < oldSize; ++sourceBucket) {
             final int currentStateValue = originalStateArray[sourceBucket];
-            if (currentStateValue == EMPTY_OUTPUT_POSITION) {
+            if (isStateEmpty(currentStateValue)) {
                 continue;
             }
             final Object k0 = originalKeyArray0[sourceBucket];
@@ -227,7 +230,7 @@ protected void rehashInternalFull(final int oldSize) {
             final int firstDestinationTableLocation = hashToTableLocation(hash);
             int destinationTableLocation = firstDestinationTableLocation;
             while (true) {
-                if (destState[destinationTableLocation] == EMPTY_OUTPUT_POSITION) {
+                if (isStateEmpty(destState[destinationTableLocation])) {
                     destKeyArray0[destinationTableLocation] = k0;
                     destKeyArray1[destinationTableLocation] = k1;
                     destState[destinationTableLocation] = originalStateArray[sourceBucket];
@@ -250,7 +253,7 @@ public int findPositionForKey(Object key) {
         final int firstTableLocation = tableLocation;
         while (true) {
             final int positionValue = mainOutputPosition.getUnsafe(tableLocation);
-            if (positionValue == EMPTY_OUTPUT_POSITION) {
+            if (isStateEmpty(positionValue)) {
                 int alternateTableLocation = hashToTableLocationAlternate(hash);
                 if (alternateTableLocation >= rehashPointer) {
                     return UNKNOWN_ROW;
@@ -258,7 +261,7 @@ public int findPositionForKey(Object key) {
                 final int firstAlternateTableLocation = alternateTableLocation;
                 while (true) {
                     final int alternatePositionValue = alternateOutputPosition.getUnsafe(alternateTableLocation);
-                    if (alternatePositionValue == EMPTY_OUTPUT_POSITION) {
+                    if (isStateEmpty(alternatePositionValue)) {
                         return UNKNOWN_ROW;
                     }
                     if (eq(alternateKeySource0.getUnsafe(alternateTableLocation), k0) && eq(alternateKeySource1.getUnsafe(alternateTableLocation), k1)) {
diff --git a/engine/table/src/main/java/io/deephaven/engine/table/impl/by/typed/incopenagg/gen/IncrementalAggOpenHasherObjectLong.java b/engine/table/src/main/java/io/deephaven/engine/table/impl/by/typed/incopenagg/gen/IncrementalAggOpenHasherObjectLong.java
index 035277c8366..3bbd63d3b57 100644
--- a/engine/table/src/main/java/io/deephaven/engine/table/impl/by/typed/incopenagg/gen/IncrementalAggOpenHasherObjectLong.java
+++ b/engine/table/src/main/java/io/deephaven/engine/table/impl/by/typed/incopenagg/gen/IncrementalAggOpenHasherObjectLong.java
@@ -67,12 +67,12 @@ protected void build(RowSequence rowSequence, Chunk[] sourceKeyChunks) {
             int tableLocation = firstTableLocation;
             MAIN_SEARCH: while (true) {
                 int outputPosition = mainOutputPosition.getUnsafe(tableLocation);
-                if (outputPosition == EMPTY_OUTPUT_POSITION) {
+                if (isStateEmpty(outputPosition)) {
                     final int firstAlternateTableLocation = hashToTableLocationAlternate(hash);
                     int alternateTableLocation = firstAlternateTableLocation;
                     while (alternateTableLocation < rehashPointer) {
                         outputPosition = alternateOutputPosition.getUnsafe(alternateTableLocation);
-                        if (outputPosition == EMPTY_OUTPUT_POSITION) {
+                        if (isStateEmpty(outputPosition)) {
                             break;
                         } else if (eq(alternateKeySource0.getUnsafe(alternateTableLocation), k0) && eq(alternateKeySource1.getUnsafe(alternateTableLocation), k1)) {
                             outputPositions.set(chunkPosition, outputPosition);
@@ -113,7 +113,7 @@ protected void probe(RowSequence rowSequence, Chunk[] sourceKeyChunks) {
             boolean found = false;
             int tableLocation = firstTableLocation;
             int outputPosition;
-            while ((outputPosition = mainOutputPosition.getUnsafe(tableLocation)) != EMPTY_OUTPUT_POSITION) {
+            while (!isStateEmpty(outputPosition = mainOutputPosition.getUnsafe(tableLocation))) {
                 if (eq(mainKeySource0.getUnsafe(tableLocation), k0) && eq(mainKeySource1.getUnsafe(tableLocation), k1)) {
                     outputPositions.set(chunkPosition, outputPosition);
                     found = true;
@@ -127,7 +127,7 @@ protected void probe(RowSequence rowSequence, Chunk[] sourceKeyChunks) {
                 boolean alternateFound = false;
                 if (firstAlternateTableLocation < rehashPointer) {
                     int alternateTableLocation = firstAlternateTableLocation;
-                    while ((outputPosition = alternateOutputPosition.getUnsafe(alternateTableLocation)) != EMPTY_OUTPUT_POSITION) {
+                    while (!isStateEmpty(outputPosition = alternateOutputPosition.getUnsafe(alternateTableLocation))) {
                         if (eq(alternateKeySource0.getUnsafe(alternateTableLocation), k0) && eq(alternateKeySource1.getUnsafe(alternateTableLocation), k1)) {
                             outputPositions.set(chunkPosition, outputPosition);
                             alternateFound = true;
@@ -150,16 +150,20 @@ private static int hash(Object k0, long k1) {
         return hash;
     }
 
+    private static boolean isStateEmpty(int state) {
+        return state == EMPTY_OUTPUT_POSITION;
+    }
+
     private boolean migrateOneLocation(int locationToMigrate) {
         final int currentStateValue = alternateOutputPosition.getUnsafe(locationToMigrate);
-        if (currentStateValue == EMPTY_OUTPUT_POSITION) {
+        if (isStateEmpty(currentStateValue)) {
             return false;
         }
         final Object k0 = alternateKeySource0.getUnsafe(locationToMigrate);
         final long k1 = alternateKeySource1.getUnsafe(locationToMigrate);
         final int hash = hash(k0, k1);
         int destinationTableLocation = hashToTableLocation(hash);
-        while (mainOutputPosition.getUnsafe(destinationTableLocation) != EMPTY_OUTPUT_POSITION) {
+        while (!isStateEmpty(mainOutputPosition.getUnsafe(destinationTableLocation))) {
             destinationTableLocation = nextTableLocation(destinationTableLocation);
         }
         mainKeySource0.set(destinationTableLocation, k0);
@@ -183,8 +187,7 @@ protected int rehashInternalPartial(int entriesToRehash) {
     }
 
     @Override
-    protected void newAlternate() {
-        super.newAlternate();
+    protected void adviseNewAlternate() {
         this.mainKeySource0 = (ImmutableObjectArraySource)super.mainKeySources[0];
         this.alternateKeySource0 = (ImmutableObjectArraySource)super.alternateKeySources[0];
         this.mainKeySource1 = (ImmutableLongArraySource)super.mainKeySources[1];
@@ -201,7 +204,7 @@ protected void clearAlternate() {
     @Override
     protected void migrateFront() {
         int location = 0;
-        while (migrateOneLocation(location++));
+        while (migrateOneLocation(location++) && location < alternateTableSize);
     }
 
     @Override
@@ -218,7 +221,7 @@ protected void rehashInternalFull(final int oldSize) {
         mainOutputPosition.setArray(destState);
         for (int sourceBucket = 0; sourceBucket < oldSize; ++sourceBucket) {
             final int currentStateValue = originalStateArray[sourceBucket];
-            if (currentStateValue == EMPTY_OUTPUT_POSITION) {
+            if (isStateEmpty(currentStateValue)) {
                 continue;
             }
             final Object k0 = originalKeyArray0[sourceBucket];
@@ -227,7 +230,7 @@ protected void rehashInternalFull(final int oldSize) {
             final int firstDestinationTableLocation = hashToTableLocation(hash);
             int destinationTableLocation = firstDestinationTableLocation;
             while (true) {
-                if (destState[destinationTableLocation] == EMPTY_OUTPUT_POSITION) {
+                if (isStateEmpty(destState[destinationTableLocation])) {
                     destKeyArray0[destinationTableLocation] = k0;
                     destKeyArray1[destinationTableLocation] = k1;
                     destState[destinationTableLocation] = originalStateArray[sourceBucket];
@@ -250,7 +253,7 @@ public int findPositionForKey(Object key) {
         final int firstTableLocation = tableLocation;
         while (true) {
             final int positionValue = mainOutputPosition.getUnsafe(tableLocation);
-            if (positionValue == EMPTY_OUTPUT_POSITION) {
+            if (isStateEmpty(positionValue)) {
                 int alternateTableLocation = hashToTableLocationAlternate(hash);
                 if (alternateTableLocation >= rehashPointer) {
                     return UNKNOWN_ROW;
@@ -258,7 +261,7 @@ public int findPositionForKey(Object key) {
                 final int firstAlternateTableLocation = alternateTableLocation;
                 while (true) {
                     final int alternatePositionValue = alternateOutputPosition.getUnsafe(alternateTableLocation);
-                    if (alternatePositionValue == EMPTY_OUTPUT_POSITION) {
+                    if (isStateEmpty(alternatePositionValue)) {
                         return UNKNOWN_ROW;
                     }
                     if (eq(alternateKeySource0.getUnsafe(alternateTableLocation), k0) && eq(alternateKeySource1.getUnsafe(alternateTableLocation), k1)) {
diff --git a/engine/table/src/main/java/io/deephaven/engine/table/impl/by/typed/incopenagg/gen/IncrementalAggOpenHasherObjectObject.java b/engine/table/src/main/java/io/deephaven/engine/table/impl/by/typed/incopenagg/gen/IncrementalAggOpenHasherObjectObject.java
index 36599e283dc..8e82f082e97 100644
--- a/engine/table/src/main/java/io/deephaven/engine/table/impl/by/typed/incopenagg/gen/IncrementalAggOpenHasherObjectObject.java
+++ b/engine/table/src/main/java/io/deephaven/engine/table/impl/by/typed/incopenagg/gen/IncrementalAggOpenHasherObjectObject.java
@@ -61,12 +61,12 @@ protected void build(RowSequence rowSequence, Chunk[] sourceKeyChunks) {
             int tableLocation = firstTableLocation;
             MAIN_SEARCH: while (true) {
                 int outputPosition = mainOutputPosition.getUnsafe(tableLocation);
-                if (outputPosition == EMPTY_OUTPUT_POSITION) {
+                if (isStateEmpty(outputPosition)) {
                     final int firstAlternateTableLocation = hashToTableLocationAlternate(hash);
                     int alternateTableLocation = firstAlternateTableLocation;
                     while (alternateTableLocation < rehashPointer) {
                         outputPosition = alternateOutputPosition.getUnsafe(alternateTableLocation);
-                        if (outputPosition == EMPTY_OUTPUT_POSITION) {
+                        if (isStateEmpty(outputPosition)) {
                             break;
                         } else if (eq(alternateKeySource0.getUnsafe(alternateTableLocation), k0) && eq(alternateKeySource1.getUnsafe(alternateTableLocation), k1)) {
                             outputPositions.set(chunkPosition, outputPosition);
@@ -107,7 +107,7 @@ protected void probe(RowSequence rowSequence, Chunk[] sourceKeyChunks) {
             boolean found = false;
             int tableLocation = firstTableLocation;
             int outputPosition;
-            while ((outputPosition = mainOutputPosition.getUnsafe(tableLocation)) != EMPTY_OUTPUT_POSITION) {
+            while (!isStateEmpty(outputPosition = mainOutputPosition.getUnsafe(tableLocation))) {
                 if (eq(mainKeySource0.getUnsafe(tableLocation), k0) && eq(mainKeySource1.getUnsafe(tableLocation), k1)) {
                     outputPositions.set(chunkPosition, outputPosition);
                     found = true;
@@ -121,7 +121,7 @@ protected void probe(RowSequence rowSequence, Chunk[] sourceKeyChunks) {
                 boolean alternateFound = false;
                 if (firstAlternateTableLocation < rehashPointer) {
                     int alternateTableLocation = firstAlternateTableLocation;
-                    while ((outputPosition = alternateOutputPosition.getUnsafe(alternateTableLocation)) != EMPTY_OUTPUT_POSITION) {
+                    while (!isStateEmpty(outputPosition = alternateOutputPosition.getUnsafe(alternateTableLocation))) {
                         if (eq(alternateKeySource0.getUnsafe(alternateTableLocation), k0) && eq(alternateKeySource1.getUnsafe(alternateTableLocation), k1)) {
                             outputPositions.set(chunkPosition, outputPosition);
                             alternateFound = true;
@@ -144,16 +144,20 @@ private static int hash(Object k0, Object k1) {
         return hash;
     }
 
+    private static boolean isStateEmpty(int state) {
+        return state == EMPTY_OUTPUT_POSITION;
+    }
+
     private boolean migrateOneLocation(int locationToMigrate) {
         final int currentStateValue = alternateOutputPosition.getUnsafe(locationToMigrate);
-        if (currentStateValue == EMPTY_OUTPUT_POSITION) {
+        if (isStateEmpty(currentStateValue)) {
             return false;
         }
         final Object k0 = alternateKeySource0.getUnsafe(locationToMigrate);
         final Object k1 = alternateKeySource1.getUnsafe(locationToMigrate);
         final int hash = hash(k0, k1);
         int destinationTableLocation = hashToTableLocation(hash);
-        while (mainOutputPosition.getUnsafe(destinationTableLocation) != EMPTY_OUTPUT_POSITION) {
+        while (!isStateEmpty(mainOutputPosition.getUnsafe(destinationTableLocation))) {
             destinationTableLocation = nextTableLocation(destinationTableLocation);
         }
         mainKeySource0.set(destinationTableLocation, k0);
@@ -178,8 +182,7 @@ protected int rehashInternalPartial(int entriesToRehash) {
     }
 
     @Override
-    protected void newAlternate() {
-        super.newAlternate();
+    protected void adviseNewAlternate() {
         this.mainKeySource0 = (ImmutableObjectArraySource)super.mainKeySources[0];
         this.alternateKeySource0 = (ImmutableObjectArraySource)super.alternateKeySources[0];
         this.mainKeySource1 = (ImmutableObjectArraySource)super.mainKeySources[1];
@@ -196,7 +199,7 @@ protected void clearAlternate() {
     @Override
     protected void migrateFront() {
         int location = 0;
-        while (migrateOneLocation(location++));
+        while (migrateOneLocation(location++) && location < alternateTableSize);
     }
 
     @Override
@@ -213,7 +216,7 @@ protected void rehashInternalFull(final int oldSize) {
         mainOutputPosition.setArray(destState);
         for (int sourceBucket = 0; sourceBucket < oldSize; ++sourceBucket) {
             final int currentStateValue = originalStateArray[sourceBucket];
-            if (currentStateValue == EMPTY_OUTPUT_POSITION) {
+            if (isStateEmpty(currentStateValue)) {
                 continue;
             }
             final Object k0 = originalKeyArray0[sourceBucket];
@@ -222,7 +225,7 @@ protected void rehashInternalFull(final int oldSize) {
             final int firstDestinationTableLocation = hashToTableLocation(hash);
             int destinationTableLocation = firstDestinationTableLocation;
             while (true) {
-                if (destState[destinationTableLocation] == EMPTY_OUTPUT_POSITION) {
+                if (isStateEmpty(destState[destinationTableLocation])) {
                     destKeyArray0[destinationTableLocation] = k0;
                     destKeyArray1[destinationTableLocation] = k1;
                     destState[destinationTableLocation] = originalStateArray[sourceBucket];
@@ -245,7 +248,7 @@ public int findPositionForKey(Object key) {
         final int firstTableLocation = tableLocation;
         while (true) {
             final int positionValue = mainOutputPosition.getUnsafe(tableLocation);
-            if (positionValue == EMPTY_OUTPUT_POSITION) {
+            if (isStateEmpty(positionValue)) {
                 int alternateTableLocation = hashToTableLocationAlternate(hash);
                 if (alternateTableLocation >= rehashPointer) {
                     return UNKNOWN_ROW;
@@ -253,7 +256,7 @@ public int findPositionForKey(Object key) {
                 final int firstAlternateTableLocation = alternateTableLocation;
                 while (true) {
                     final int alternatePositionValue = alternateOutputPosition.getUnsafe(alternateTableLocation);
-                    if (alternatePositionValue == EMPTY_OUTPUT_POSITION) {
+                    if (isStateEmpty(alternatePositionValue)) {
                         return UNKNOWN_ROW;
                     }
                     if (eq(alternateKeySource0.getUnsafe(alternateTableLocation), k0) && eq(alternateKeySource1.getUnsafe(alternateTableLocation), k1)) {
diff --git a/engine/table/src/main/java/io/deephaven/engine/table/impl/by/typed/incopenagg/gen/IncrementalAggOpenHasherObjectShort.java b/engine/table/src/main/java/io/deephaven/engine/table/impl/by/typed/incopenagg/gen/IncrementalAggOpenHasherObjectShort.java
index 09e4f6f4341..9bdd35e3847 100644
--- a/engine/table/src/main/java/io/deephaven/engine/table/impl/by/typed/incopenagg/gen/IncrementalAggOpenHasherObjectShort.java
+++ b/engine/table/src/main/java/io/deephaven/engine/table/impl/by/typed/incopenagg/gen/IncrementalAggOpenHasherObjectShort.java
@@ -67,12 +67,12 @@ protected void build(RowSequence rowSequence, Chunk[] sourceKeyChunks) {
             int tableLocation = firstTableLocation;
             MAIN_SEARCH: while (true) {
                 int outputPosition = mainOutputPosition.getUnsafe(tableLocation);
-                if (outputPosition == EMPTY_OUTPUT_POSITION) {
+                if (isStateEmpty(outputPosition)) {
                     final int firstAlternateTableLocation = hashToTableLocationAlternate(hash);
                     int alternateTableLocation = firstAlternateTableLocation;
                     while (alternateTableLocation < rehashPointer) {
                         outputPosition = alternateOutputPosition.getUnsafe(alternateTableLocation);
-                        if (outputPosition == EMPTY_OUTPUT_POSITION) {
+                        if (isStateEmpty(outputPosition)) {
                             break;
                         } else if (eq(alternateKeySource0.getUnsafe(alternateTableLocation), k0) && eq(alternateKeySource1.getUnsafe(alternateTableLocation), k1)) {
                             outputPositions.set(chunkPosition, outputPosition);
@@ -113,7 +113,7 @@ protected void probe(RowSequence rowSequence, Chunk[] sourceKeyChunks) {
             boolean found = false;
             int tableLocation = firstTableLocation;
             int outputPosition;
-            while ((outputPosition = mainOutputPosition.getUnsafe(tableLocation)) != EMPTY_OUTPUT_POSITION) {
+            while (!isStateEmpty(outputPosition = mainOutputPosition.getUnsafe(tableLocation))) {
                 if (eq(mainKeySource0.getUnsafe(tableLocation), k0) && eq(mainKeySource1.getUnsafe(tableLocation), k1)) {
                     outputPositions.set(chunkPosition, outputPosition);
                     found = true;
@@ -127,7 +127,7 @@ protected void probe(RowSequence rowSequence, Chunk[] sourceKeyChunks) {
                 boolean alternateFound = false;
                 if (firstAlternateTableLocation < rehashPointer) {
                     int alternateTableLocation = firstAlternateTableLocation;
-                    while ((outputPosition = alternateOutputPosition.getUnsafe(alternateTableLocation)) != EMPTY_OUTPUT_POSITION) {
+                    while (!isStateEmpty(outputPosition = alternateOutputPosition.getUnsafe(alternateTableLocation))) {
                         if (eq(alternateKeySource0.getUnsafe(alternateTableLocation), k0) && eq(alternateKeySource1.getUnsafe(alternateTableLocation), k1)) {
                             outputPositions.set(chunkPosition, outputPosition);
                             alternateFound = true;
@@ -150,16 +150,20 @@ private static int hash(Object k0, short k1) {
         return hash;
     }
 
+    private static boolean isStateEmpty(int state) {
+        return state == EMPTY_OUTPUT_POSITION;
+    }
+
     private boolean migrateOneLocation(int locationToMigrate) {
         final int currentStateValue = alternateOutputPosition.getUnsafe(locationToMigrate);
-        if (currentStateValue == EMPTY_OUTPUT_POSITION) {
+        if (isStateEmpty(currentStateValue)) {
             return false;
         }
         final Object k0 = alternateKeySource0.getUnsafe(locationToMigrate);
         final short k1 = alternateKeySource1.getUnsafe(locationToMigrate);
         final int hash = hash(k0, k1);
         int destinationTableLocation = hashToTableLocation(hash);
-        while (mainOutputPosition.getUnsafe(destinationTableLocation) != EMPTY_OUTPUT_POSITION) {
+        while (!isStateEmpty(mainOutputPosition.getUnsafe(destinationTableLocation))) {
             destinationTableLocation = nextTableLocation(destinationTableLocation);
         }
         mainKeySource0.set(destinationTableLocation, k0);
@@ -183,8 +187,7 @@ protected int rehashInternalPartial(int entriesToRehash) {
     }
 
     @Override
-    protected void newAlternate() {
-        super.newAlternate();
+    protected void adviseNewAlternate() {
         this.mainKeySource0 = (ImmutableObjectArraySource)super.mainKeySources[0];
         this.alternateKeySource0 = (ImmutableObjectArraySource)super.alternateKeySources[0];
         this.mainKeySource1 = (ImmutableShortArraySource)super.mainKeySources[1];
@@ -201,7 +204,7 @@ protected void clearAlternate() {
     @Override
     protected void migrateFront() {
         int location = 0;
-        while (migrateOneLocation(location++));
+        while (migrateOneLocation(location++) && location < alternateTableSize);
     }
 
     @Override
@@ -218,7 +221,7 @@ protected void rehashInternalFull(final int oldSize) {
         mainOutputPosition.setArray(destState);
         for (int sourceBucket = 0; sourceBucket < oldSize; ++sourceBucket) {
             final int currentStateValue = originalStateArray[sourceBucket];
-            if (currentStateValue == EMPTY_OUTPUT_POSITION) {
+            if (isStateEmpty(currentStateValue)) {
                 continue;
             }
             final Object k0 = originalKeyArray0[sourceBucket];
@@ -227,7 +230,7 @@ protected void rehashInternalFull(final int oldSize) {
             final int firstDestinationTableLocation = hashToTableLocation(hash);
             int destinationTableLocation = firstDestinationTableLocation;
             while (true) {
-                if (destState[destinationTableLocation] == EMPTY_OUTPUT_POSITION) {
+                if (isStateEmpty(destState[destinationTableLocation])) {
                     destKeyArray0[destinationTableLocation] = k0;
                     destKeyArray1[destinationTableLocation] = k1;
                     destState[destinationTableLocation] = originalStateArray[sourceBucket];
@@ -250,7 +253,7 @@ public int findPositionForKey(Object key) {
         final int firstTableLocation = tableLocation;
         while (true) {
             final int positionValue = mainOutputPosition.getUnsafe(tableLocation);
-            if (positionValue == EMPTY_OUTPUT_POSITION) {
+            if (isStateEmpty(positionValue)) {
                 int alternateTableLocation = hashToTableLocationAlternate(hash);
                 if (alternateTableLocation >= rehashPointer) {
                     return UNKNOWN_ROW;
@@ -258,7 +261,7 @@ public int findPositionForKey(Object key) {
                 final int firstAlternateTableLocation = alternateTableLocation;
                 while (true) {
                     final int alternatePositionValue = alternateOutputPosition.getUnsafe(alternateTableLocation);
-                    if (alternatePositionValue == EMPTY_OUTPUT_POSITION) {
+                    if (isStateEmpty(alternatePositionValue)) {
                         return UNKNOWN_ROW;
                     }
                     if (eq(alternateKeySource0.getUnsafe(alternateTableLocation), k0) && eq(alternateKeySource1.getUnsafe(alternateTableLocation), k1)) {
diff --git a/engine/table/src/main/java/io/deephaven/engine/table/impl/by/typed/incopenagg/gen/IncrementalAggOpenHasherShort.java b/engine/table/src/main/java/io/deephaven/engine/table/impl/by/typed/incopenagg/gen/IncrementalAggOpenHasherShort.java
index 33a1def09e9..58c31331b25 100644
--- a/engine/table/src/main/java/io/deephaven/engine/table/impl/by/typed/incopenagg/gen/IncrementalAggOpenHasherShort.java
+++ b/engine/table/src/main/java/io/deephaven/engine/table/impl/by/typed/incopenagg/gen/IncrementalAggOpenHasherShort.java
@@ -55,12 +55,12 @@ protected void build(RowSequence rowSequence, Chunk[] sourceKeyChunks) {
             int tableLocation = firstTableLocation;
             MAIN_SEARCH: while (true) {
                 int outputPosition = mainOutputPosition.getUnsafe(tableLocation);
-                if (outputPosition == EMPTY_OUTPUT_POSITION) {
+                if (isStateEmpty(outputPosition)) {
                     final int firstAlternateTableLocation = hashToTableLocationAlternate(hash);
                     int alternateTableLocation = firstAlternateTableLocation;
                     while (alternateTableLocation < rehashPointer) {
                         outputPosition = alternateOutputPosition.getUnsafe(alternateTableLocation);
-                        if (outputPosition == EMPTY_OUTPUT_POSITION) {
+                        if (isStateEmpty(outputPosition)) {
                             break;
                         } else if (eq(alternateKeySource0.getUnsafe(alternateTableLocation), k0)) {
                             outputPositions.set(chunkPosition, outputPosition);
@@ -98,7 +98,7 @@ protected void probe(RowSequence rowSequence, Chunk[] sourceKeyChunks) {
             boolean found = false;
             int tableLocation = firstTableLocation;
             int outputPosition;
-            while ((outputPosition = mainOutputPosition.getUnsafe(tableLocation)) != EMPTY_OUTPUT_POSITION) {
+            while (!isStateEmpty(outputPosition = mainOutputPosition.getUnsafe(tableLocation))) {
                 if (eq(mainKeySource0.getUnsafe(tableLocation), k0)) {
                     outputPositions.set(chunkPosition, outputPosition);
                     found = true;
@@ -112,7 +112,7 @@ protected void probe(RowSequence rowSequence, Chunk[] sourceKeyChunks) {
                 boolean alternateFound = false;
                 if (firstAlternateTableLocation < rehashPointer) {
                     int alternateTableLocation = firstAlternateTableLocation;
-                    while ((outputPosition = alternateOutputPosition.getUnsafe(alternateTableLocation)) != EMPTY_OUTPUT_POSITION) {
+                    while (!isStateEmpty(outputPosition = alternateOutputPosition.getUnsafe(alternateTableLocation))) {
                         if (eq(alternateKeySource0.getUnsafe(alternateTableLocation), k0)) {
                             outputPositions.set(chunkPosition, outputPosition);
                             alternateFound = true;
@@ -134,15 +134,19 @@ private static int hash(short k0) {
         return hash;
     }
 
+    private static boolean isStateEmpty(int state) {
+        return state == EMPTY_OUTPUT_POSITION;
+    }
+
     private boolean migrateOneLocation(int locationToMigrate) {
         final int currentStateValue = alternateOutputPosition.getUnsafe(locationToMigrate);
-        if (currentStateValue == EMPTY_OUTPUT_POSITION) {
+        if (isStateEmpty(currentStateValue)) {
             return false;
         }
         final short k0 = alternateKeySource0.getUnsafe(locationToMigrate);
         final int hash = hash(k0);
         int destinationTableLocation = hashToTableLocation(hash);
-        while (mainOutputPosition.getUnsafe(destinationTableLocation) != EMPTY_OUTPUT_POSITION) {
+        while (!isStateEmpty(mainOutputPosition.getUnsafe(destinationTableLocation))) {
             destinationTableLocation = nextTableLocation(destinationTableLocation);
         }
         mainKeySource0.set(destinationTableLocation, k0);
@@ -164,8 +168,7 @@ protected int rehashInternalPartial(int entriesToRehash) {
     }
 
     @Override
-    protected void newAlternate() {
-        super.newAlternate();
+    protected void adviseNewAlternate() {
         this.mainKeySource0 = (ImmutableShortArraySource)super.mainKeySources[0];
         this.alternateKeySource0 = (ImmutableShortArraySource)super.alternateKeySources[0];
     }
@@ -179,7 +182,7 @@ protected void clearAlternate() {
     @Override
     protected void migrateFront() {
         int location = 0;
-        while (migrateOneLocation(location++));
+        while (migrateOneLocation(location++) && location < alternateTableSize);
     }
 
     @Override
@@ -193,7 +196,7 @@ protected void rehashInternalFull(final int oldSize) {
         mainOutputPosition.setArray(destState);
         for (int sourceBucket = 0; sourceBucket < oldSize; ++sourceBucket) {
             final int currentStateValue = originalStateArray[sourceBucket];
-            if (currentStateValue == EMPTY_OUTPUT_POSITION) {
+            if (isStateEmpty(currentStateValue)) {
                 continue;
             }
             final short k0 = originalKeyArray0[sourceBucket];
@@ -201,7 +204,7 @@ protected void rehashInternalFull(final int oldSize) {
             final int firstDestinationTableLocation = hashToTableLocation(hash);
             int destinationTableLocation = firstDestinationTableLocation;
             while (true) {
-                if (destState[destinationTableLocation] == EMPTY_OUTPUT_POSITION) {
+                if (isStateEmpty(destState[destinationTableLocation])) {
                     destKeyArray0[destinationTableLocation] = k0;
                     destState[destinationTableLocation] = originalStateArray[sourceBucket];
                     outputPositionToHashSlot.set(currentStateValue, mainInsertMask | destinationTableLocation);
@@ -221,7 +224,7 @@ public int findPositionForKey(Object key) {
         final int firstTableLocation = tableLocation;
         while (true) {
             final int positionValue = mainOutputPosition.getUnsafe(tableLocation);
-            if (positionValue == EMPTY_OUTPUT_POSITION) {
+            if (isStateEmpty(positionValue)) {
                 int alternateTableLocation = hashToTableLocationAlternate(hash);
                 if (alternateTableLocation >= rehashPointer) {
                     return UNKNOWN_ROW;
@@ -229,7 +232,7 @@ public int findPositionForKey(Object key) {
                 final int firstAlternateTableLocation = alternateTableLocation;
                 while (true) {
                     final int alternatePositionValue = alternateOutputPosition.getUnsafe(alternateTableLocation);
-                    if (alternatePositionValue == EMPTY_OUTPUT_POSITION) {
+                    if (isStateEmpty(alternatePositionValue)) {
                         return UNKNOWN_ROW;
                     }
                     if (eq(alternateKeySource0.getUnsafe(alternateTableLocation), k0)) {
diff --git a/engine/table/src/main/java/io/deephaven/engine/table/impl/by/typed/incopenagg/gen/IncrementalAggOpenHasherShortByte.java b/engine/table/src/main/java/io/deephaven/engine/table/impl/by/typed/incopenagg/gen/IncrementalAggOpenHasherShortByte.java
index 23e3f21a867..e5f2b595e2a 100644
--- a/engine/table/src/main/java/io/deephaven/engine/table/impl/by/typed/incopenagg/gen/IncrementalAggOpenHasherShortByte.java
+++ b/engine/table/src/main/java/io/deephaven/engine/table/impl/by/typed/incopenagg/gen/IncrementalAggOpenHasherShortByte.java
@@ -68,12 +68,12 @@ protected void build(RowSequence rowSequence, Chunk[] sourceKeyChunks) {
             int tableLocation = firstTableLocation;
             MAIN_SEARCH: while (true) {
                 int outputPosition = mainOutputPosition.getUnsafe(tableLocation);
-                if (outputPosition == EMPTY_OUTPUT_POSITION) {
+                if (isStateEmpty(outputPosition)) {
                     final int firstAlternateTableLocation = hashToTableLocationAlternate(hash);
                     int alternateTableLocation = firstAlternateTableLocation;
                     while (alternateTableLocation < rehashPointer) {
                         outputPosition = alternateOutputPosition.getUnsafe(alternateTableLocation);
-                        if (outputPosition == EMPTY_OUTPUT_POSITION) {
+                        if (isStateEmpty(outputPosition)) {
                             break;
                         } else if (eq(alternateKeySource0.getUnsafe(alternateTableLocation), k0) && eq(alternateKeySource1.getUnsafe(alternateTableLocation), k1)) {
                             outputPositions.set(chunkPosition, outputPosition);
@@ -114,7 +114,7 @@ protected void probe(RowSequence rowSequence, Chunk[] sourceKeyChunks) {
             boolean found = false;
             int tableLocation = firstTableLocation;
             int outputPosition;
-            while ((outputPosition = mainOutputPosition.getUnsafe(tableLocation)) != EMPTY_OUTPUT_POSITION) {
+            while (!isStateEmpty(outputPosition = mainOutputPosition.getUnsafe(tableLocation))) {
                 if (eq(mainKeySource0.getUnsafe(tableLocation), k0) && eq(mainKeySource1.getUnsafe(tableLocation), k1)) {
                     outputPositions.set(chunkPosition, outputPosition);
                     found = true;
@@ -128,7 +128,7 @@ protected void probe(RowSequence rowSequence, Chunk[] sourceKeyChunks) {
                 boolean alternateFound = false;
                 if (firstAlternateTableLocation < rehashPointer) {
                     int alternateTableLocation = firstAlternateTableLocation;
-                    while ((outputPosition = alternateOutputPosition.getUnsafe(alternateTableLocation)) != EMPTY_OUTPUT_POSITION) {
+                    while (!isStateEmpty(outputPosition = alternateOutputPosition.getUnsafe(alternateTableLocation))) {
                         if (eq(alternateKeySource0.getUnsafe(alternateTableLocation), k0) && eq(alternateKeySource1.getUnsafe(alternateTableLocation), k1)) {
                             outputPositions.set(chunkPosition, outputPosition);
                             alternateFound = true;
@@ -151,16 +151,20 @@ private static int hash(short k0, byte k1) {
         return hash;
     }
 
+    private static boolean isStateEmpty(int state) {
+        return state == EMPTY_OUTPUT_POSITION;
+    }
+
     private boolean migrateOneLocation(int locationToMigrate) {
         final int currentStateValue = alternateOutputPosition.getUnsafe(locationToMigrate);
-        if (currentStateValue == EMPTY_OUTPUT_POSITION) {
+        if (isStateEmpty(currentStateValue)) {
             return false;
         }
         final short k0 = alternateKeySource0.getUnsafe(locationToMigrate);
         final byte k1 = alternateKeySource1.getUnsafe(locationToMigrate);
         final int hash = hash(k0, k1);
         int destinationTableLocation = hashToTableLocation(hash);
-        while (mainOutputPosition.getUnsafe(destinationTableLocation) != EMPTY_OUTPUT_POSITION) {
+        while (!isStateEmpty(mainOutputPosition.getUnsafe(destinationTableLocation))) {
             destinationTableLocation = nextTableLocation(destinationTableLocation);
         }
         mainKeySource0.set(destinationTableLocation, k0);
@@ -183,8 +187,7 @@ protected int rehashInternalPartial(int entriesToRehash) {
     }
 
     @Override
-    protected void newAlternate() {
-        super.newAlternate();
+    protected void adviseNewAlternate() {
         this.mainKeySource0 = (ImmutableShortArraySource)super.mainKeySources[0];
         this.alternateKeySource0 = (ImmutableShortArraySource)super.alternateKeySources[0];
         this.mainKeySource1 = (ImmutableByteArraySource)super.mainKeySources[1];
@@ -201,7 +204,7 @@ protected void clearAlternate() {
     @Override
     protected void migrateFront() {
         int location = 0;
-        while (migrateOneLocation(location++));
+        while (migrateOneLocation(location++) && location < alternateTableSize);
     }
 
     @Override
@@ -218,7 +221,7 @@ protected void rehashInternalFull(final int oldSize) {
         mainOutputPosition.setArray(destState);
         for (int sourceBucket = 0; sourceBucket < oldSize; ++sourceBucket) {
             final int currentStateValue = originalStateArray[sourceBucket];
-            if (currentStateValue == EMPTY_OUTPUT_POSITION) {
+            if (isStateEmpty(currentStateValue)) {
                 continue;
             }
             final short k0 = originalKeyArray0[sourceBucket];
@@ -227,7 +230,7 @@ protected void rehashInternalFull(final int oldSize) {
             final int firstDestinationTableLocation = hashToTableLocation(hash);
             int destinationTableLocation = firstDestinationTableLocation;
             while (true) {
-                if (destState[destinationTableLocation] == EMPTY_OUTPUT_POSITION) {
+                if (isStateEmpty(destState[destinationTableLocation])) {
                     destKeyArray0[destinationTableLocation] = k0;
                     destKeyArray1[destinationTableLocation] = k1;
                     destState[destinationTableLocation] = originalStateArray[sourceBucket];
@@ -250,7 +253,7 @@ public int findPositionForKey(Object key) {
         final int firstTableLocation = tableLocation;
         while (true) {
             final int positionValue = mainOutputPosition.getUnsafe(tableLocation);
-            if (positionValue == EMPTY_OUTPUT_POSITION) {
+            if (isStateEmpty(positionValue)) {
                 int alternateTableLocation = hashToTableLocationAlternate(hash);
                 if (alternateTableLocation >= rehashPointer) {
                     return UNKNOWN_ROW;
@@ -258,7 +261,7 @@ public int findPositionForKey(Object key) {
                 final int firstAlternateTableLocation = alternateTableLocation;
                 while (true) {
                     final int alternatePositionValue = alternateOutputPosition.getUnsafe(alternateTableLocation);
-                    if (alternatePositionValue == EMPTY_OUTPUT_POSITION) {
+                    if (isStateEmpty(alternatePositionValue)) {
                         return UNKNOWN_ROW;
                     }
                     if (eq(alternateKeySource0.getUnsafe(alternateTableLocation), k0) && eq(alternateKeySource1.getUnsafe(alternateTableLocation), k1)) {
diff --git a/engine/table/src/main/java/io/deephaven/engine/table/impl/by/typed/incopenagg/gen/IncrementalAggOpenHasherShortChar.java b/engine/table/src/main/java/io/deephaven/engine/table/impl/by/typed/incopenagg/gen/IncrementalAggOpenHasherShortChar.java
index 6fd86c7d427..a9786b6cb8b 100644
--- a/engine/table/src/main/java/io/deephaven/engine/table/impl/by/typed/incopenagg/gen/IncrementalAggOpenHasherShortChar.java
+++ b/engine/table/src/main/java/io/deephaven/engine/table/impl/by/typed/incopenagg/gen/IncrementalAggOpenHasherShortChar.java
@@ -68,12 +68,12 @@ protected void build(RowSequence rowSequence, Chunk[] sourceKeyChunks) {
             int tableLocation = firstTableLocation;
             MAIN_SEARCH: while (true) {
                 int outputPosition = mainOutputPosition.getUnsafe(tableLocation);
-                if (outputPosition == EMPTY_OUTPUT_POSITION) {
+                if (isStateEmpty(outputPosition)) {
                     final int firstAlternateTableLocation = hashToTableLocationAlternate(hash);
                     int alternateTableLocation = firstAlternateTableLocation;
                     while (alternateTableLocation < rehashPointer) {
                         outputPosition = alternateOutputPosition.getUnsafe(alternateTableLocation);
-                        if (outputPosition == EMPTY_OUTPUT_POSITION) {
+                        if (isStateEmpty(outputPosition)) {
                             break;
                         } else if (eq(alternateKeySource0.getUnsafe(alternateTableLocation), k0) && eq(alternateKeySource1.getUnsafe(alternateTableLocation), k1)) {
                             outputPositions.set(chunkPosition, outputPosition);
@@ -114,7 +114,7 @@ protected void probe(RowSequence rowSequence, Chunk[] sourceKeyChunks) {
             boolean found = false;
             int tableLocation = firstTableLocation;
             int outputPosition;
-            while ((outputPosition = mainOutputPosition.getUnsafe(tableLocation)) != EMPTY_OUTPUT_POSITION) {
+            while (!isStateEmpty(outputPosition = mainOutputPosition.getUnsafe(tableLocation))) {
                 if (eq(mainKeySource0.getUnsafe(tableLocation), k0) && eq(mainKeySource1.getUnsafe(tableLocation), k1)) {
                     outputPositions.set(chunkPosition, outputPosition);
                     found = true;
@@ -128,7 +128,7 @@ protected void probe(RowSequence rowSequence, Chunk[] sourceKeyChunks) {
                 boolean alternateFound = false;
                 if (firstAlternateTableLocation < rehashPointer) {
                     int alternateTableLocation = firstAlternateTableLocation;
-                    while ((outputPosition = alternateOutputPosition.getUnsafe(alternateTableLocation)) != EMPTY_OUTPUT_POSITION) {
+                    while (!isStateEmpty(outputPosition = alternateOutputPosition.getUnsafe(alternateTableLocation))) {
                         if (eq(alternateKeySource0.getUnsafe(alternateTableLocation), k0) && eq(alternateKeySource1.getUnsafe(alternateTableLocation), k1)) {
                             outputPositions.set(chunkPosition, outputPosition);
                             alternateFound = true;
@@ -151,16 +151,20 @@ private static int hash(short k0, char k1) {
         return hash;
     }
 
+    private static boolean isStateEmpty(int state) {
+        return state == EMPTY_OUTPUT_POSITION;
+    }
+
     private boolean migrateOneLocation(int locationToMigrate) {
         final int currentStateValue = alternateOutputPosition.getUnsafe(locationToMigrate);
-        if (currentStateValue == EMPTY_OUTPUT_POSITION) {
+        if (isStateEmpty(currentStateValue)) {
             return false;
         }
         final short k0 = alternateKeySource0.getUnsafe(locationToMigrate);
         final char k1 = alternateKeySource1.getUnsafe(locationToMigrate);
         final int hash = hash(k0, k1);
         int destinationTableLocation = hashToTableLocation(hash);
-        while (mainOutputPosition.getUnsafe(destinationTableLocation) != EMPTY_OUTPUT_POSITION) {
+        while (!isStateEmpty(mainOutputPosition.getUnsafe(destinationTableLocation))) {
             destinationTableLocation = nextTableLocation(destinationTableLocation);
         }
         mainKeySource0.set(destinationTableLocation, k0);
@@ -183,8 +187,7 @@ protected int rehashInternalPartial(int entriesToRehash) {
     }
 
     @Override
-    protected void newAlternate() {
-        super.newAlternate();
+    protected void adviseNewAlternate() {
         this.mainKeySource0 = (ImmutableShortArraySource)super.mainKeySources[0];
         this.alternateKeySource0 = (ImmutableShortArraySource)super.alternateKeySources[0];
         this.mainKeySource1 = (ImmutableCharArraySource)super.mainKeySources[1];
@@ -201,7 +204,7 @@ protected void clearAlternate() {
     @Override
     protected void migrateFront() {
         int location = 0;
-        while (migrateOneLocation(location++));
+        while (migrateOneLocation(location++) && location < alternateTableSize);
     }
 
     @Override
@@ -218,7 +221,7 @@ protected void rehashInternalFull(final int oldSize) {
         mainOutputPosition.setArray(destState);
         for (int sourceBucket = 0; sourceBucket < oldSize; ++sourceBucket) {
             final int currentStateValue = originalStateArray[sourceBucket];
-            if (currentStateValue == EMPTY_OUTPUT_POSITION) {
+            if (isStateEmpty(currentStateValue)) {
                 continue;
             }
             final short k0 = originalKeyArray0[sourceBucket];
@@ -227,7 +230,7 @@ protected void rehashInternalFull(final int oldSize) {
             final int firstDestinationTableLocation = hashToTableLocation(hash);
             int destinationTableLocation = firstDestinationTableLocation;
             while (true) {
-                if (destState[destinationTableLocation] == EMPTY_OUTPUT_POSITION) {
+                if (isStateEmpty(destState[destinationTableLocation])) {
                     destKeyArray0[destinationTableLocation] = k0;
                     destKeyArray1[destinationTableLocation] = k1;
                     destState[destinationTableLocation] = originalStateArray[sourceBucket];
@@ -250,7 +253,7 @@ public int findPositionForKey(Object key) {
         final int firstTableLocation = tableLocation;
         while (true) {
             final int positionValue = mainOutputPosition.getUnsafe(tableLocation);
-            if (positionValue == EMPTY_OUTPUT_POSITION) {
+            if (isStateEmpty(positionValue)) {
                 int alternateTableLocation = hashToTableLocationAlternate(hash);
                 if (alternateTableLocation >= rehashPointer) {
                     return UNKNOWN_ROW;
@@ -258,7 +261,7 @@ public int findPositionForKey(Object key) {
                 final int firstAlternateTableLocation = alternateTableLocation;
                 while (true) {
                     final int alternatePositionValue = alternateOutputPosition.getUnsafe(alternateTableLocation);
-                    if (alternatePositionValue == EMPTY_OUTPUT_POSITION) {
+                    if (isStateEmpty(alternatePositionValue)) {
                         return UNKNOWN_ROW;
                     }
                     if (eq(alternateKeySource0.getUnsafe(alternateTableLocation), k0) && eq(alternateKeySource1.getUnsafe(alternateTableLocation), k1)) {
diff --git a/engine/table/src/main/java/io/deephaven/engine/table/impl/by/typed/incopenagg/gen/IncrementalAggOpenHasherShortDouble.java b/engine/table/src/main/java/io/deephaven/engine/table/impl/by/typed/incopenagg/gen/IncrementalAggOpenHasherShortDouble.java
index 73882d2f9f4..b4f643a358e 100644
--- a/engine/table/src/main/java/io/deephaven/engine/table/impl/by/typed/incopenagg/gen/IncrementalAggOpenHasherShortDouble.java
+++ b/engine/table/src/main/java/io/deephaven/engine/table/impl/by/typed/incopenagg/gen/IncrementalAggOpenHasherShortDouble.java
@@ -68,12 +68,12 @@ protected void build(RowSequence rowSequence, Chunk[] sourceKeyChunks) {
             int tableLocation = firstTableLocation;
             MAIN_SEARCH: while (true) {
                 int outputPosition = mainOutputPosition.getUnsafe(tableLocation);
-                if (outputPosition == EMPTY_OUTPUT_POSITION) {
+                if (isStateEmpty(outputPosition)) {
                     final int firstAlternateTableLocation = hashToTableLocationAlternate(hash);
                     int alternateTableLocation = firstAlternateTableLocation;
                     while (alternateTableLocation < rehashPointer) {
                         outputPosition = alternateOutputPosition.getUnsafe(alternateTableLocation);
-                        if (outputPosition == EMPTY_OUTPUT_POSITION) {
+                        if (isStateEmpty(outputPosition)) {
                             break;
                         } else if (eq(alternateKeySource0.getUnsafe(alternateTableLocation), k0) && eq(alternateKeySource1.getUnsafe(alternateTableLocation), k1)) {
                             outputPositions.set(chunkPosition, outputPosition);
@@ -114,7 +114,7 @@ protected void probe(RowSequence rowSequence, Chunk[] sourceKeyChunks) {
             boolean found = false;
             int tableLocation = firstTableLocation;
             int outputPosition;
-            while ((outputPosition = mainOutputPosition.getUnsafe(tableLocation)) != EMPTY_OUTPUT_POSITION) {
+            while (!isStateEmpty(outputPosition = mainOutputPosition.getUnsafe(tableLocation))) {
                 if (eq(mainKeySource0.getUnsafe(tableLocation), k0) && eq(mainKeySource1.getUnsafe(tableLocation), k1)) {
                     outputPositions.set(chunkPosition, outputPosition);
                     found = true;
@@ -128,7 +128,7 @@ protected void probe(RowSequence rowSequence, Chunk[] sourceKeyChunks) {
                 boolean alternateFound = false;
                 if (firstAlternateTableLocation < rehashPointer) {
                     int alternateTableLocation = firstAlternateTableLocation;
-                    while ((outputPosition = alternateOutputPosition.getUnsafe(alternateTableLocation)) != EMPTY_OUTPUT_POSITION) {
+                    while (!isStateEmpty(outputPosition = alternateOutputPosition.getUnsafe(alternateTableLocation))) {
                         if (eq(alternateKeySource0.getUnsafe(alternateTableLocation), k0) && eq(alternateKeySource1.getUnsafe(alternateTableLocation), k1)) {
                             outputPositions.set(chunkPosition, outputPosition);
                             alternateFound = true;
@@ -151,16 +151,20 @@ private static int hash(short k0, double k1) {
         return hash;
     }
 
+    private static boolean isStateEmpty(int state) {
+        return state == EMPTY_OUTPUT_POSITION;
+    }
+
     private boolean migrateOneLocation(int locationToMigrate) {
         final int currentStateValue = alternateOutputPosition.getUnsafe(locationToMigrate);
-        if (currentStateValue == EMPTY_OUTPUT_POSITION) {
+        if (isStateEmpty(currentStateValue)) {
             return false;
         }
         final short k0 = alternateKeySource0.getUnsafe(locationToMigrate);
         final double k1 = alternateKeySource1.getUnsafe(locationToMigrate);
         final int hash = hash(k0, k1);
         int destinationTableLocation = hashToTableLocation(hash);
-        while (mainOutputPosition.getUnsafe(destinationTableLocation) != EMPTY_OUTPUT_POSITION) {
+        while (!isStateEmpty(mainOutputPosition.getUnsafe(destinationTableLocation))) {
             destinationTableLocation = nextTableLocation(destinationTableLocation);
         }
         mainKeySource0.set(destinationTableLocation, k0);
@@ -183,8 +187,7 @@ protected int rehashInternalPartial(int entriesToRehash) {
     }
 
     @Override
-    protected void newAlternate() {
-        super.newAlternate();
+    protected void adviseNewAlternate() {
         this.mainKeySource0 = (ImmutableShortArraySource)super.mainKeySources[0];
         this.alternateKeySource0 = (ImmutableShortArraySource)super.alternateKeySources[0];
         this.mainKeySource1 = (ImmutableDoubleArraySource)super.mainKeySources[1];
@@ -201,7 +204,7 @@ protected void clearAlternate() {
     @Override
     protected void migrateFront() {
         int location = 0;
-        while (migrateOneLocation(location++));
+        while (migrateOneLocation(location++) && location < alternateTableSize);
     }
 
     @Override
@@ -218,7 +221,7 @@ protected void rehashInternalFull(final int oldSize) {
         mainOutputPosition.setArray(destState);
         for (int sourceBucket = 0; sourceBucket < oldSize; ++sourceBucket) {
             final int currentStateValue = originalStateArray[sourceBucket];
-            if (currentStateValue == EMPTY_OUTPUT_POSITION) {
+            if (isStateEmpty(currentStateValue)) {
                 continue;
             }
             final short k0 = originalKeyArray0[sourceBucket];
@@ -227,7 +230,7 @@ protected void rehashInternalFull(final int oldSize) {
             final int firstDestinationTableLocation = hashToTableLocation(hash);
             int destinationTableLocation = firstDestinationTableLocation;
             while (true) {
-                if (destState[destinationTableLocation] == EMPTY_OUTPUT_POSITION) {
+                if (isStateEmpty(destState[destinationTableLocation])) {
                     destKeyArray0[destinationTableLocation] = k0;
                     destKeyArray1[destinationTableLocation] = k1;
                     destState[destinationTableLocation] = originalStateArray[sourceBucket];
@@ -250,7 +253,7 @@ public int findPositionForKey(Object key) {
         final int firstTableLocation = tableLocation;
         while (true) {
             final int positionValue = mainOutputPosition.getUnsafe(tableLocation);
-            if (positionValue == EMPTY_OUTPUT_POSITION) {
+            if (isStateEmpty(positionValue)) {
                 int alternateTableLocation = hashToTableLocationAlternate(hash);
                 if (alternateTableLocation >= rehashPointer) {
                     return UNKNOWN_ROW;
@@ -258,7 +261,7 @@ public int findPositionForKey(Object key) {
                 final int firstAlternateTableLocation = alternateTableLocation;
                 while (true) {
                     final int alternatePositionValue = alternateOutputPosition.getUnsafe(alternateTableLocation);
-                    if (alternatePositionValue == EMPTY_OUTPUT_POSITION) {
+                    if (isStateEmpty(alternatePositionValue)) {
                         return UNKNOWN_ROW;
                     }
                     if (eq(alternateKeySource0.getUnsafe(alternateTableLocation), k0) && eq(alternateKeySource1.getUnsafe(alternateTableLocation), k1)) {
diff --git a/engine/table/src/main/java/io/deephaven/engine/table/impl/by/typed/incopenagg/gen/IncrementalAggOpenHasherShortFloat.java b/engine/table/src/main/java/io/deephaven/engine/table/impl/by/typed/incopenagg/gen/IncrementalAggOpenHasherShortFloat.java
index 7d63ed8fc08..1274282fc88 100644
--- a/engine/table/src/main/java/io/deephaven/engine/table/impl/by/typed/incopenagg/gen/IncrementalAggOpenHasherShortFloat.java
+++ b/engine/table/src/main/java/io/deephaven/engine/table/impl/by/typed/incopenagg/gen/IncrementalAggOpenHasherShortFloat.java
@@ -68,12 +68,12 @@ protected void build(RowSequence rowSequence, Chunk[] sourceKeyChunks) {
             int tableLocation = firstTableLocation;
             MAIN_SEARCH: while (true) {
                 int outputPosition = mainOutputPosition.getUnsafe(tableLocation);
-                if (outputPosition == EMPTY_OUTPUT_POSITION) {
+                if (isStateEmpty(outputPosition)) {
                     final int firstAlternateTableLocation = hashToTableLocationAlternate(hash);
                     int alternateTableLocation = firstAlternateTableLocation;
                     while (alternateTableLocation < rehashPointer) {
                         outputPosition = alternateOutputPosition.getUnsafe(alternateTableLocation);
-                        if (outputPosition == EMPTY_OUTPUT_POSITION) {
+                        if (isStateEmpty(outputPosition)) {
                             break;
                         } else if (eq(alternateKeySource0.getUnsafe(alternateTableLocation), k0) && eq(alternateKeySource1.getUnsafe(alternateTableLocation), k1)) {
                             outputPositions.set(chunkPosition, outputPosition);
@@ -114,7 +114,7 @@ protected void probe(RowSequence rowSequence, Chunk[] sourceKeyChunks) {
             boolean found = false;
             int tableLocation = firstTableLocation;
             int outputPosition;
-            while ((outputPosition = mainOutputPosition.getUnsafe(tableLocation)) != EMPTY_OUTPUT_POSITION) {
+            while (!isStateEmpty(outputPosition = mainOutputPosition.getUnsafe(tableLocation))) {
                 if (eq(mainKeySource0.getUnsafe(tableLocation), k0) && eq(mainKeySource1.getUnsafe(tableLocation), k1)) {
                     outputPositions.set(chunkPosition, outputPosition);
                     found = true;
@@ -128,7 +128,7 @@ protected void probe(RowSequence rowSequence, Chunk[] sourceKeyChunks) {
                 boolean alternateFound = false;
                 if (firstAlternateTableLocation < rehashPointer) {
                     int alternateTableLocation = firstAlternateTableLocation;
-                    while ((outputPosition = alternateOutputPosition.getUnsafe(alternateTableLocation)) != EMPTY_OUTPUT_POSITION) {
+                    while (!isStateEmpty(outputPosition = alternateOutputPosition.getUnsafe(alternateTableLocation))) {
                         if (eq(alternateKeySource0.getUnsafe(alternateTableLocation), k0) && eq(alternateKeySource1.getUnsafe(alternateTableLocation), k1)) {
                             outputPositions.set(chunkPosition, outputPosition);
                             alternateFound = true;
@@ -151,16 +151,20 @@ private static int hash(short k0, float k1) {
         return hash;
     }
 
+    private static boolean isStateEmpty(int state) {
+        return state == EMPTY_OUTPUT_POSITION;
+    }
+
     private boolean migrateOneLocation(int locationToMigrate) {
         final int currentStateValue = alternateOutputPosition.getUnsafe(locationToMigrate);
-        if (currentStateValue == EMPTY_OUTPUT_POSITION) {
+        if (isStateEmpty(currentStateValue)) {
             return false;
         }
         final short k0 = alternateKeySource0.getUnsafe(locationToMigrate);
         final float k1 = alternateKeySource1.getUnsafe(locationToMigrate);
         final int hash = hash(k0, k1);
         int destinationTableLocation = hashToTableLocation(hash);
-        while (mainOutputPosition.getUnsafe(destinationTableLocation) != EMPTY_OUTPUT_POSITION) {
+        while (!isStateEmpty(mainOutputPosition.getUnsafe(destinationTableLocation))) {
             destinationTableLocation = nextTableLocation(destinationTableLocation);
         }
         mainKeySource0.set(destinationTableLocation, k0);
@@ -183,8 +187,7 @@ protected int rehashInternalPartial(int entriesToRehash) {
     }
 
     @Override
-    protected void newAlternate() {
-        super.newAlternate();
+    protected void adviseNewAlternate() {
         this.mainKeySource0 = (ImmutableShortArraySource)super.mainKeySources[0];
         this.alternateKeySource0 = (ImmutableShortArraySource)super.alternateKeySources[0];
         this.mainKeySource1 = (ImmutableFloatArraySource)super.mainKeySources[1];
@@ -201,7 +204,7 @@ protected void clearAlternate() {
     @Override
     protected void migrateFront() {
         int location = 0;
-        while (migrateOneLocation(location++));
+        while (migrateOneLocation(location++) && location < alternateTableSize);
     }
 
     @Override
@@ -218,7 +221,7 @@ protected void rehashInternalFull(final int oldSize) {
         mainOutputPosition.setArray(destState);
         for (int sourceBucket = 0; sourceBucket < oldSize; ++sourceBucket) {
             final int currentStateValue = originalStateArray[sourceBucket];
-            if (currentStateValue == EMPTY_OUTPUT_POSITION) {
+            if (isStateEmpty(currentStateValue)) {
                 continue;
             }
             final short k0 = originalKeyArray0[sourceBucket];
@@ -227,7 +230,7 @@ protected void rehashInternalFull(final int oldSize) {
             final int firstDestinationTableLocation = hashToTableLocation(hash);
             int destinationTableLocation = firstDestinationTableLocation;
             while (true) {
-                if (destState[destinationTableLocation] == EMPTY_OUTPUT_POSITION) {
+                if (isStateEmpty(destState[destinationTableLocation])) {
                     destKeyArray0[destinationTableLocation] = k0;
                     destKeyArray1[destinationTableLocation] = k1;
                     destState[destinationTableLocation] = originalStateArray[sourceBucket];
@@ -250,7 +253,7 @@ public int findPositionForKey(Object key) {
         final int firstTableLocation = tableLocation;
         while (true) {
             final int positionValue = mainOutputPosition.getUnsafe(tableLocation);
-            if (positionValue == EMPTY_OUTPUT_POSITION) {
+            if (isStateEmpty(positionValue)) {
                 int alternateTableLocation = hashToTableLocationAlternate(hash);
                 if (alternateTableLocation >= rehashPointer) {
                     return UNKNOWN_ROW;
@@ -258,7 +261,7 @@ public int findPositionForKey(Object key) {
                 final int firstAlternateTableLocation = alternateTableLocation;
                 while (true) {
                     final int alternatePositionValue = alternateOutputPosition.getUnsafe(alternateTableLocation);
-                    if (alternatePositionValue == EMPTY_OUTPUT_POSITION) {
+                    if (isStateEmpty(alternatePositionValue)) {
                         return UNKNOWN_ROW;
                     }
                     if (eq(alternateKeySource0.getUnsafe(alternateTableLocation), k0) && eq(alternateKeySource1.getUnsafe(alternateTableLocation), k1)) {
diff --git a/engine/table/src/main/java/io/deephaven/engine/table/impl/by/typed/incopenagg/gen/IncrementalAggOpenHasherShortInt.java b/engine/table/src/main/java/io/deephaven/engine/table/impl/by/typed/incopenagg/gen/IncrementalAggOpenHasherShortInt.java
index bc5e061adae..1681d72937b 100644
--- a/engine/table/src/main/java/io/deephaven/engine/table/impl/by/typed/incopenagg/gen/IncrementalAggOpenHasherShortInt.java
+++ b/engine/table/src/main/java/io/deephaven/engine/table/impl/by/typed/incopenagg/gen/IncrementalAggOpenHasherShortInt.java
@@ -68,12 +68,12 @@ protected void build(RowSequence rowSequence, Chunk[] sourceKeyChunks) {
             int tableLocation = firstTableLocation;
             MAIN_SEARCH: while (true) {
                 int outputPosition = mainOutputPosition.getUnsafe(tableLocation);
-                if (outputPosition == EMPTY_OUTPUT_POSITION) {
+                if (isStateEmpty(outputPosition)) {
                     final int firstAlternateTableLocation = hashToTableLocationAlternate(hash);
                     int alternateTableLocation = firstAlternateTableLocation;
                     while (alternateTableLocation < rehashPointer) {
                         outputPosition = alternateOutputPosition.getUnsafe(alternateTableLocation);
-                        if (outputPosition == EMPTY_OUTPUT_POSITION) {
+                        if (isStateEmpty(outputPosition)) {
                             break;
                         } else if (eq(alternateKeySource0.getUnsafe(alternateTableLocation), k0) && eq(alternateKeySource1.getUnsafe(alternateTableLocation), k1)) {
                             outputPositions.set(chunkPosition, outputPosition);
@@ -114,7 +114,7 @@ protected void probe(RowSequence rowSequence, Chunk[] sourceKeyChunks) {
             boolean found = false;
             int tableLocation = firstTableLocation;
             int outputPosition;
-            while ((outputPosition = mainOutputPosition.getUnsafe(tableLocation)) != EMPTY_OUTPUT_POSITION) {
+            while (!isStateEmpty(outputPosition = mainOutputPosition.getUnsafe(tableLocation))) {
                 if (eq(mainKeySource0.getUnsafe(tableLocation), k0) && eq(mainKeySource1.getUnsafe(tableLocation), k1)) {
                     outputPositions.set(chunkPosition, outputPosition);
                     found = true;
@@ -128,7 +128,7 @@ protected void probe(RowSequence rowSequence, Chunk[] sourceKeyChunks) {
                 boolean alternateFound = false;
                 if (firstAlternateTableLocation < rehashPointer) {
                     int alternateTableLocation = firstAlternateTableLocation;
-                    while ((outputPosition = alternateOutputPosition.getUnsafe(alternateTableLocation)) != EMPTY_OUTPUT_POSITION) {
+                    while (!isStateEmpty(outputPosition = alternateOutputPosition.getUnsafe(alternateTableLocation))) {
                         if (eq(alternateKeySource0.getUnsafe(alternateTableLocation), k0) && eq(alternateKeySource1.getUnsafe(alternateTableLocation), k1)) {
                             outputPositions.set(chunkPosition, outputPosition);
                             alternateFound = true;
@@ -151,16 +151,20 @@ private static int hash(short k0, int k1) {
         return hash;
     }
 
+    private static boolean isStateEmpty(int state) {
+        return state == EMPTY_OUTPUT_POSITION;
+    }
+
     private boolean migrateOneLocation(int locationToMigrate) {
         final int currentStateValue = alternateOutputPosition.getUnsafe(locationToMigrate);
-        if (currentStateValue == EMPTY_OUTPUT_POSITION) {
+        if (isStateEmpty(currentStateValue)) {
             return false;
         }
         final short k0 = alternateKeySource0.getUnsafe(locationToMigrate);
         final int k1 = alternateKeySource1.getUnsafe(locationToMigrate);
         final int hash = hash(k0, k1);
         int destinationTableLocation = hashToTableLocation(hash);
-        while (mainOutputPosition.getUnsafe(destinationTableLocation) != EMPTY_OUTPUT_POSITION) {
+        while (!isStateEmpty(mainOutputPosition.getUnsafe(destinationTableLocation))) {
             destinationTableLocation = nextTableLocation(destinationTableLocation);
         }
         mainKeySource0.set(destinationTableLocation, k0);
@@ -183,8 +187,7 @@ protected int rehashInternalPartial(int entriesToRehash) {
     }
 
     @Override
-    protected void newAlternate() {
-        super.newAlternate();
+    protected void adviseNewAlternate() {
         this.mainKeySource0 = (ImmutableShortArraySource)super.mainKeySources[0];
         this.alternateKeySource0 = (ImmutableShortArraySource)super.alternateKeySources[0];
         this.mainKeySource1 = (ImmutableIntArraySource)super.mainKeySources[1];
@@ -201,7 +204,7 @@ protected void clearAlternate() {
     @Override
     protected void migrateFront() {
         int location = 0;
-        while (migrateOneLocation(location++));
+        while (migrateOneLocation(location++) && location < alternateTableSize);
     }
 
     @Override
@@ -218,7 +221,7 @@ protected void rehashInternalFull(final int oldSize) {
         mainOutputPosition.setArray(destState);
         for (int sourceBucket = 0; sourceBucket < oldSize; ++sourceBucket) {
             final int currentStateValue = originalStateArray[sourceBucket];
-            if (currentStateValue == EMPTY_OUTPUT_POSITION) {
+            if (isStateEmpty(currentStateValue)) {
                 continue;
             }
             final short k0 = originalKeyArray0[sourceBucket];
@@ -227,7 +230,7 @@ protected void rehashInternalFull(final int oldSize) {
             final int firstDestinationTableLocation = hashToTableLocation(hash);
             int destinationTableLocation = firstDestinationTableLocation;
             while (true) {
-                if (destState[destinationTableLocation] == EMPTY_OUTPUT_POSITION) {
+                if (isStateEmpty(destState[destinationTableLocation])) {
                     destKeyArray0[destinationTableLocation] = k0;
                     destKeyArray1[destinationTableLocation] = k1;
                     destState[destinationTableLocation] = originalStateArray[sourceBucket];
@@ -250,7 +253,7 @@ public int findPositionForKey(Object key) {
         final int firstTableLocation = tableLocation;
         while (true) {
             final int positionValue = mainOutputPosition.getUnsafe(tableLocation);
-            if (positionValue == EMPTY_OUTPUT_POSITION) {
+            if (isStateEmpty(positionValue)) {
                 int alternateTableLocation = hashToTableLocationAlternate(hash);
                 if (alternateTableLocation >= rehashPointer) {
                     return UNKNOWN_ROW;
@@ -258,7 +261,7 @@ public int findPositionForKey(Object key) {
                 final int firstAlternateTableLocation = alternateTableLocation;
                 while (true) {
                     final int alternatePositionValue = alternateOutputPosition.getUnsafe(alternateTableLocation);
-                    if (alternatePositionValue == EMPTY_OUTPUT_POSITION) {
+                    if (isStateEmpty(alternatePositionValue)) {
                         return UNKNOWN_ROW;
                     }
                     if (eq(alternateKeySource0.getUnsafe(alternateTableLocation), k0) && eq(alternateKeySource1.getUnsafe(alternateTableLocation), k1)) {
diff --git a/engine/table/src/main/java/io/deephaven/engine/table/impl/by/typed/incopenagg/gen/IncrementalAggOpenHasherShortLong.java b/engine/table/src/main/java/io/deephaven/engine/table/impl/by/typed/incopenagg/gen/IncrementalAggOpenHasherShortLong.java
index b41c099ff12..4f8bcb16577 100644
--- a/engine/table/src/main/java/io/deephaven/engine/table/impl/by/typed/incopenagg/gen/IncrementalAggOpenHasherShortLong.java
+++ b/engine/table/src/main/java/io/deephaven/engine/table/impl/by/typed/incopenagg/gen/IncrementalAggOpenHasherShortLong.java
@@ -68,12 +68,12 @@ protected void build(RowSequence rowSequence, Chunk[] sourceKeyChunks) {
             int tableLocation = firstTableLocation;
             MAIN_SEARCH: while (true) {
                 int outputPosition = mainOutputPosition.getUnsafe(tableLocation);
-                if (outputPosition == EMPTY_OUTPUT_POSITION) {
+                if (isStateEmpty(outputPosition)) {
                     final int firstAlternateTableLocation = hashToTableLocationAlternate(hash);
                     int alternateTableLocation = firstAlternateTableLocation;
                     while (alternateTableLocation < rehashPointer) {
                         outputPosition = alternateOutputPosition.getUnsafe(alternateTableLocation);
-                        if (outputPosition == EMPTY_OUTPUT_POSITION) {
+                        if (isStateEmpty(outputPosition)) {
                             break;
                         } else if (eq(alternateKeySource0.getUnsafe(alternateTableLocation), k0) && eq(alternateKeySource1.getUnsafe(alternateTableLocation), k1)) {
                             outputPositions.set(chunkPosition, outputPosition);
@@ -114,7 +114,7 @@ protected void probe(RowSequence rowSequence, Chunk[] sourceKeyChunks) {
             boolean found = false;
             int tableLocation = firstTableLocation;
             int outputPosition;
-            while ((outputPosition = mainOutputPosition.getUnsafe(tableLocation)) != EMPTY_OUTPUT_POSITION) {
+            while (!isStateEmpty(outputPosition = mainOutputPosition.getUnsafe(tableLocation))) {
                 if (eq(mainKeySource0.getUnsafe(tableLocation), k0) && eq(mainKeySource1.getUnsafe(tableLocation), k1)) {
                     outputPositions.set(chunkPosition, outputPosition);
                     found = true;
@@ -128,7 +128,7 @@ protected void probe(RowSequence rowSequence, Chunk[] sourceKeyChunks) {
                 boolean alternateFound = false;
                 if (firstAlternateTableLocation < rehashPointer) {
                     int alternateTableLocation = firstAlternateTableLocation;
-                    while ((outputPosition = alternateOutputPosition.getUnsafe(alternateTableLocation)) != EMPTY_OUTPUT_POSITION) {
+                    while (!isStateEmpty(outputPosition = alternateOutputPosition.getUnsafe(alternateTableLocation))) {
                         if (eq(alternateKeySource0.getUnsafe(alternateTableLocation), k0) && eq(alternateKeySource1.getUnsafe(alternateTableLocation), k1)) {
                             outputPositions.set(chunkPosition, outputPosition);
                             alternateFound = true;
@@ -151,16 +151,20 @@ private static int hash(short k0, long k1) {
         return hash;
     }
 
+    private static boolean isStateEmpty(int state) {
+        return state == EMPTY_OUTPUT_POSITION;
+    }
+
     private boolean migrateOneLocation(int locationToMigrate) {
         final int currentStateValue = alternateOutputPosition.getUnsafe(locationToMigrate);
-        if (currentStateValue == EMPTY_OUTPUT_POSITION) {
+        if (isStateEmpty(currentStateValue)) {
             return false;
         }
         final short k0 = alternateKeySource0.getUnsafe(locationToMigrate);
         final long k1 = alternateKeySource1.getUnsafe(locationToMigrate);
         final int hash = hash(k0, k1);
         int destinationTableLocation = hashToTableLocation(hash);
-        while (mainOutputPosition.getUnsafe(destinationTableLocation) != EMPTY_OUTPUT_POSITION) {
+        while (!isStateEmpty(mainOutputPosition.getUnsafe(destinationTableLocation))) {
             destinationTableLocation = nextTableLocation(destinationTableLocation);
         }
         mainKeySource0.set(destinationTableLocation, k0);
@@ -183,8 +187,7 @@ protected int rehashInternalPartial(int entriesToRehash) {
     }
 
     @Override
-    protected void newAlternate() {
-        super.newAlternate();
+    protected void adviseNewAlternate() {
         this.mainKeySource0 = (ImmutableShortArraySource)super.mainKeySources[0];
         this.alternateKeySource0 = (ImmutableShortArraySource)super.alternateKeySources[0];
         this.mainKeySource1 = (ImmutableLongArraySource)super.mainKeySources[1];
@@ -201,7 +204,7 @@ protected void clearAlternate() {
     @Override
     protected void migrateFront() {
         int location = 0;
-        while (migrateOneLocation(location++));
+        while (migrateOneLocation(location++) && location < alternateTableSize);
     }
 
     @Override
@@ -218,7 +221,7 @@ protected void rehashInternalFull(final int oldSize) {
         mainOutputPosition.setArray(destState);
         for (int sourceBucket = 0; sourceBucket < oldSize; ++sourceBucket) {
             final int currentStateValue = originalStateArray[sourceBucket];
-            if (currentStateValue == EMPTY_OUTPUT_POSITION) {
+            if (isStateEmpty(currentStateValue)) {
                 continue;
             }
             final short k0 = originalKeyArray0[sourceBucket];
@@ -227,7 +230,7 @@ protected void rehashInternalFull(final int oldSize) {
             final int firstDestinationTableLocation = hashToTableLocation(hash);
             int destinationTableLocation = firstDestinationTableLocation;
             while (true) {
-                if (destState[destinationTableLocation] == EMPTY_OUTPUT_POSITION) {
+                if (isStateEmpty(destState[destinationTableLocation])) {
                     destKeyArray0[destinationTableLocation] = k0;
                     destKeyArray1[destinationTableLocation] = k1;
                     destState[destinationTableLocation] = originalStateArray[sourceBucket];
@@ -250,7 +253,7 @@ public int findPositionForKey(Object key) {
         final int firstTableLocation = tableLocation;
         while (true) {
             final int positionValue = mainOutputPosition.getUnsafe(tableLocation);
-            if (positionValue == EMPTY_OUTPUT_POSITION) {
+            if (isStateEmpty(positionValue)) {
                 int alternateTableLocation = hashToTableLocationAlternate(hash);
                 if (alternateTableLocation >= rehashPointer) {
                     return UNKNOWN_ROW;
@@ -258,7 +261,7 @@ public int findPositionForKey(Object key) {
                 final int firstAlternateTableLocation = alternateTableLocation;
                 while (true) {
                     final int alternatePositionValue = alternateOutputPosition.getUnsafe(alternateTableLocation);
-                    if (alternatePositionValue == EMPTY_OUTPUT_POSITION) {
+                    if (isStateEmpty(alternatePositionValue)) {
                         return UNKNOWN_ROW;
                     }
                     if (eq(alternateKeySource0.getUnsafe(alternateTableLocation), k0) && eq(alternateKeySource1.getUnsafe(alternateTableLocation), k1)) {
diff --git a/engine/table/src/main/java/io/deephaven/engine/table/impl/by/typed/incopenagg/gen/IncrementalAggOpenHasherShortObject.java b/engine/table/src/main/java/io/deephaven/engine/table/impl/by/typed/incopenagg/gen/IncrementalAggOpenHasherShortObject.java
index ad30ab7d49a..e3f246b2bfd 100644
--- a/engine/table/src/main/java/io/deephaven/engine/table/impl/by/typed/incopenagg/gen/IncrementalAggOpenHasherShortObject.java
+++ b/engine/table/src/main/java/io/deephaven/engine/table/impl/by/typed/incopenagg/gen/IncrementalAggOpenHasherShortObject.java
@@ -67,12 +67,12 @@ protected void build(RowSequence rowSequence, Chunk[] sourceKeyChunks) {
             int tableLocation = firstTableLocation;
             MAIN_SEARCH: while (true) {
                 int outputPosition = mainOutputPosition.getUnsafe(tableLocation);
-                if (outputPosition == EMPTY_OUTPUT_POSITION) {
+                if (isStateEmpty(outputPosition)) {
                     final int firstAlternateTableLocation = hashToTableLocationAlternate(hash);
                     int alternateTableLocation = firstAlternateTableLocation;
                     while (alternateTableLocation < rehashPointer) {
                         outputPosition = alternateOutputPosition.getUnsafe(alternateTableLocation);
-                        if (outputPosition == EMPTY_OUTPUT_POSITION) {
+                        if (isStateEmpty(outputPosition)) {
                             break;
                         } else if (eq(alternateKeySource0.getUnsafe(alternateTableLocation), k0) && eq(alternateKeySource1.getUnsafe(alternateTableLocation), k1)) {
                             outputPositions.set(chunkPosition, outputPosition);
@@ -113,7 +113,7 @@ protected void probe(RowSequence rowSequence, Chunk[] sourceKeyChunks) {
             boolean found = false;
             int tableLocation = firstTableLocation;
             int outputPosition;
-            while ((outputPosition = mainOutputPosition.getUnsafe(tableLocation)) != EMPTY_OUTPUT_POSITION) {
+            while (!isStateEmpty(outputPosition = mainOutputPosition.getUnsafe(tableLocation))) {
                 if (eq(mainKeySource0.getUnsafe(tableLocation), k0) && eq(mainKeySource1.getUnsafe(tableLocation), k1)) {
                     outputPositions.set(chunkPosition, outputPosition);
                     found = true;
@@ -127,7 +127,7 @@ protected void probe(RowSequence rowSequence, Chunk[] sourceKeyChunks) {
                 boolean alternateFound = false;
                 if (firstAlternateTableLocation < rehashPointer) {
                     int alternateTableLocation = firstAlternateTableLocation;
-                    while ((outputPosition = alternateOutputPosition.getUnsafe(alternateTableLocation)) != EMPTY_OUTPUT_POSITION) {
+                    while (!isStateEmpty(outputPosition = alternateOutputPosition.getUnsafe(alternateTableLocation))) {
                         if (eq(alternateKeySource0.getUnsafe(alternateTableLocation), k0) && eq(alternateKeySource1.getUnsafe(alternateTableLocation), k1)) {
                             outputPositions.set(chunkPosition, outputPosition);
                             alternateFound = true;
@@ -150,16 +150,20 @@ private static int hash(short k0, Object k1) {
         return hash;
     }
 
+    private static boolean isStateEmpty(int state) {
+        return state == EMPTY_OUTPUT_POSITION;
+    }
+
     private boolean migrateOneLocation(int locationToMigrate) {
         final int currentStateValue = alternateOutputPosition.getUnsafe(locationToMigrate);
-        if (currentStateValue == EMPTY_OUTPUT_POSITION) {
+        if (isStateEmpty(currentStateValue)) {
             return false;
         }
         final short k0 = alternateKeySource0.getUnsafe(locationToMigrate);
         final Object k1 = alternateKeySource1.getUnsafe(locationToMigrate);
         final int hash = hash(k0, k1);
         int destinationTableLocation = hashToTableLocation(hash);
-        while (mainOutputPosition.getUnsafe(destinationTableLocation) != EMPTY_OUTPUT_POSITION) {
+        while (!isStateEmpty(mainOutputPosition.getUnsafe(destinationTableLocation))) {
             destinationTableLocation = nextTableLocation(destinationTableLocation);
         }
         mainKeySource0.set(destinationTableLocation, k0);
@@ -183,8 +187,7 @@ protected int rehashInternalPartial(int entriesToRehash) {
     }
 
     @Override
-    protected void newAlternate() {
-        super.newAlternate();
+    protected void adviseNewAlternate() {
         this.mainKeySource0 = (ImmutableShortArraySource)super.mainKeySources[0];
         this.alternateKeySource0 = (ImmutableShortArraySource)super.alternateKeySources[0];
         this.mainKeySource1 = (ImmutableObjectArraySource)super.mainKeySources[1];
@@ -201,7 +204,7 @@ protected void clearAlternate() {
     @Override
     protected void migrateFront() {
         int location = 0;
-        while (migrateOneLocation(location++));
+        while (migrateOneLocation(location++) && location < alternateTableSize);
     }
 
     @Override
@@ -218,7 +221,7 @@ protected void rehashInternalFull(final int oldSize) {
         mainOutputPosition.setArray(destState);
         for (int sourceBucket = 0; sourceBucket < oldSize; ++sourceBucket) {
             final int currentStateValue = originalStateArray[sourceBucket];
-            if (currentStateValue == EMPTY_OUTPUT_POSITION) {
+            if (isStateEmpty(currentStateValue)) {
                 continue;
             }
             final short k0 = originalKeyArray0[sourceBucket];
@@ -227,7 +230,7 @@ protected void rehashInternalFull(final int oldSize) {
             final int firstDestinationTableLocation = hashToTableLocation(hash);
             int destinationTableLocation = firstDestinationTableLocation;
             while (true) {
-                if (destState[destinationTableLocation] == EMPTY_OUTPUT_POSITION) {
+                if (isStateEmpty(destState[destinationTableLocation])) {
                     destKeyArray0[destinationTableLocation] = k0;
                     destKeyArray1[destinationTableLocation] = k1;
                     destState[destinationTableLocation] = originalStateArray[sourceBucket];
@@ -250,7 +253,7 @@ public int findPositionForKey(Object key) {
         final int firstTableLocation = tableLocation;
         while (true) {
             final int positionValue = mainOutputPosition.getUnsafe(tableLocation);
-            if (positionValue == EMPTY_OUTPUT_POSITION) {
+            if (isStateEmpty(positionValue)) {
                 int alternateTableLocation = hashToTableLocationAlternate(hash);
                 if (alternateTableLocation >= rehashPointer) {
                     return UNKNOWN_ROW;
@@ -258,7 +261,7 @@ public int findPositionForKey(Object key) {
                 final int firstAlternateTableLocation = alternateTableLocation;
                 while (true) {
                     final int alternatePositionValue = alternateOutputPosition.getUnsafe(alternateTableLocation);
-                    if (alternatePositionValue == EMPTY_OUTPUT_POSITION) {
+                    if (isStateEmpty(alternatePositionValue)) {
                         return UNKNOWN_ROW;
                     }
                     if (eq(alternateKeySource0.getUnsafe(alternateTableLocation), k0) && eq(alternateKeySource1.getUnsafe(alternateTableLocation), k1)) {
diff --git a/engine/table/src/main/java/io/deephaven/engine/table/impl/by/typed/incopenagg/gen/IncrementalAggOpenHasherShortShort.java b/engine/table/src/main/java/io/deephaven/engine/table/impl/by/typed/incopenagg/gen/IncrementalAggOpenHasherShortShort.java
index 5b17636ce27..32690734493 100644
--- a/engine/table/src/main/java/io/deephaven/engine/table/impl/by/typed/incopenagg/gen/IncrementalAggOpenHasherShortShort.java
+++ b/engine/table/src/main/java/io/deephaven/engine/table/impl/by/typed/incopenagg/gen/IncrementalAggOpenHasherShortShort.java
@@ -63,12 +63,12 @@ protected void build(RowSequence rowSequence, Chunk[] sourceKeyChunks) {
             int tableLocation = firstTableLocation;
             MAIN_SEARCH: while (true) {
                 int outputPosition = mainOutputPosition.getUnsafe(tableLocation);
-                if (outputPosition == EMPTY_OUTPUT_POSITION) {
+                if (isStateEmpty(outputPosition)) {
                     final int firstAlternateTableLocation = hashToTableLocationAlternate(hash);
                     int alternateTableLocation = firstAlternateTableLocation;
                     while (alternateTableLocation < rehashPointer) {
                         outputPosition = alternateOutputPosition.getUnsafe(alternateTableLocation);
-                        if (outputPosition == EMPTY_OUTPUT_POSITION) {
+                        if (isStateEmpty(outputPosition)) {
                             break;
                         } else if (eq(alternateKeySource0.getUnsafe(alternateTableLocation), k0) && eq(alternateKeySource1.getUnsafe(alternateTableLocation), k1)) {
                             outputPositions.set(chunkPosition, outputPosition);
@@ -109,7 +109,7 @@ protected void probe(RowSequence rowSequence, Chunk[] sourceKeyChunks) {
             boolean found = false;
             int tableLocation = firstTableLocation;
             int outputPosition;
-            while ((outputPosition = mainOutputPosition.getUnsafe(tableLocation)) != EMPTY_OUTPUT_POSITION) {
+            while (!isStateEmpty(outputPosition = mainOutputPosition.getUnsafe(tableLocation))) {
                 if (eq(mainKeySource0.getUnsafe(tableLocation), k0) && eq(mainKeySource1.getUnsafe(tableLocation), k1)) {
                     outputPositions.set(chunkPosition, outputPosition);
                     found = true;
@@ -123,7 +123,7 @@ protected void probe(RowSequence rowSequence, Chunk[] sourceKeyChunks) {
                 boolean alternateFound = false;
                 if (firstAlternateTableLocation < rehashPointer) {
                     int alternateTableLocation = firstAlternateTableLocation;
-                    while ((outputPosition = alternateOutputPosition.getUnsafe(alternateTableLocation)) != EMPTY_OUTPUT_POSITION) {
+                    while (!isStateEmpty(outputPosition = alternateOutputPosition.getUnsafe(alternateTableLocation))) {
                         if (eq(alternateKeySource0.getUnsafe(alternateTableLocation), k0) && eq(alternateKeySource1.getUnsafe(alternateTableLocation), k1)) {
                             outputPositions.set(chunkPosition, outputPosition);
                             alternateFound = true;
@@ -146,16 +146,20 @@ private static int hash(short k0, short k1) {
         return hash;
     }
 
+    private static boolean isStateEmpty(int state) {
+        return state == EMPTY_OUTPUT_POSITION;
+    }
+
     private boolean migrateOneLocation(int locationToMigrate) {
         final int currentStateValue = alternateOutputPosition.getUnsafe(locationToMigrate);
-        if (currentStateValue == EMPTY_OUTPUT_POSITION) {
+        if (isStateEmpty(currentStateValue)) {
             return false;
         }
         final short k0 = alternateKeySource0.getUnsafe(locationToMigrate);
         final short k1 = alternateKeySource1.getUnsafe(locationToMigrate);
         final int hash = hash(k0, k1);
         int destinationTableLocation = hashToTableLocation(hash);
-        while (mainOutputPosition.getUnsafe(destinationTableLocation) != EMPTY_OUTPUT_POSITION) {
+        while (!isStateEmpty(mainOutputPosition.getUnsafe(destinationTableLocation))) {
             destinationTableLocation = nextTableLocation(destinationTableLocation);
         }
         mainKeySource0.set(destinationTableLocation, k0);
@@ -178,8 +182,7 @@ protected int rehashInternalPartial(int entriesToRehash) {
     }
 
     @Override
-    protected void newAlternate() {
-        super.newAlternate();
+    protected void adviseNewAlternate() {
         this.mainKeySource0 = (ImmutableShortArraySource)super.mainKeySources[0];
         this.alternateKeySource0 = (ImmutableShortArraySource)super.alternateKeySources[0];
         this.mainKeySource1 = (ImmutableShortArraySource)super.mainKeySources[1];
@@ -196,7 +199,7 @@ protected void clearAlternate() {
     @Override
     protected void migrateFront() {
         int location = 0;
-        while (migrateOneLocation(location++));
+        while (migrateOneLocation(location++) && location < alternateTableSize);
     }
 
     @Override
@@ -213,7 +216,7 @@ protected void rehashInternalFull(final int oldSize) {
         mainOutputPosition.setArray(destState);
         for (int sourceBucket = 0; sourceBucket < oldSize; ++sourceBucket) {
             final int currentStateValue = originalStateArray[sourceBucket];
-            if (currentStateValue == EMPTY_OUTPUT_POSITION) {
+            if (isStateEmpty(currentStateValue)) {
                 continue;
             }
             final short k0 = originalKeyArray0[sourceBucket];
@@ -222,7 +225,7 @@ protected void rehashInternalFull(final int oldSize) {
             final int firstDestinationTableLocation = hashToTableLocation(hash);
             int destinationTableLocation = firstDestinationTableLocation;
             while (true) {
-                if (destState[destinationTableLocation] == EMPTY_OUTPUT_POSITION) {
+                if (isStateEmpty(destState[destinationTableLocation])) {
                     destKeyArray0[destinationTableLocation] = k0;
                     destKeyArray1[destinationTableLocation] = k1;
                     destState[destinationTableLocation] = originalStateArray[sourceBucket];
@@ -245,7 +248,7 @@ public int findPositionForKey(Object key) {
         final int firstTableLocation = tableLocation;
         while (true) {
             final int positionValue = mainOutputPosition.getUnsafe(tableLocation);
-            if (positionValue == EMPTY_OUTPUT_POSITION) {
+            if (isStateEmpty(positionValue)) {
                 int alternateTableLocation = hashToTableLocationAlternate(hash);
                 if (alternateTableLocation >= rehashPointer) {
                     return UNKNOWN_ROW;
@@ -253,7 +256,7 @@ public int findPositionForKey(Object key) {
                 final int firstAlternateTableLocation = alternateTableLocation;
                 while (true) {
                     final int alternatePositionValue = alternateOutputPosition.getUnsafe(alternateTableLocation);
-                    if (alternatePositionValue == EMPTY_OUTPUT_POSITION) {
+                    if (isStateEmpty(alternatePositionValue)) {
                         return UNKNOWN_ROW;
                     }
                     if (eq(alternateKeySource0.getUnsafe(alternateTableLocation), k0) && eq(alternateKeySource1.getUnsafe(alternateTableLocation), k1)) {
diff --git a/engine/table/src/main/java/io/deephaven/engine/table/impl/by/typed/staticagg/gen/StaticAggHasherByte.java b/engine/table/src/main/java/io/deephaven/engine/table/impl/by/typed/staticagg/gen/StaticAggHasherByte.java
deleted file mode 100644
index 57abad3bcbf..00000000000
--- a/engine/table/src/main/java/io/deephaven/engine/table/impl/by/typed/staticagg/gen/StaticAggHasherByte.java
+++ /dev/null
@@ -1,180 +0,0 @@
-//
-// Copyright (c) 2016-2024 Deephaven Data Labs and Patent Pending
-//
-// ****** AUTO-GENERATED CLASS - DO NOT EDIT MANUALLY
-// ****** Run ReplicateTypedHashers or ./gradlew replicateTypedHashers to regenerate
-//
-// @formatter:off
-package io.deephaven.engine.table.impl.by.typed.staticagg.gen;
-
-import static io.deephaven.util.compare.ByteComparisons.eq;
-
-import io.deephaven.chunk.ByteChunk;
-import io.deephaven.chunk.Chunk;
-import io.deephaven.chunk.attributes.Values;
-import io.deephaven.chunk.util.hashing.ByteChunkHasher;
-import io.deephaven.engine.rowset.RowSequence;
-import io.deephaven.engine.table.ColumnSource;
-import io.deephaven.engine.table.impl.by.HashHandler;
-import io.deephaven.engine.table.impl.by.StaticChunkedOperatorAggregationStateManagerTypedBase;
-import io.deephaven.engine.table.impl.sources.ByteArraySource;
-import io.deephaven.util.QueryConstants;
-import io.deephaven.util.type.TypeUtils;
-import java.lang.Byte;
-import java.lang.Object;
-import java.lang.Override;
-
-final class StaticAggHasherByte extends StaticChunkedOperatorAggregationStateManagerTypedBase {
-    private final ByteArraySource mainKeySource0;
-
-    private final ByteArraySource overflowKeySource0;
-
-    public StaticAggHasherByte(ColumnSource[] tableKeySources,
-            ColumnSource[] originalTableKeySources, int tableSize, double maximumLoadFactor,
-            double targetLoadFactor) {
-        super(tableKeySources, tableSize, maximumLoadFactor, targetLoadFactor);
-        this.mainKeySource0 = (ByteArraySource) super.mainKeySources[0];
-        this.overflowKeySource0 = (ByteArraySource) super.overflowKeySources[0];
-    }
-
-    @Override
-    protected void build(HashHandler handler, RowSequence rowSequence, Chunk[] sourceKeyChunks) {
-        final ByteChunk<Values> keyChunk0 = sourceKeyChunks[0].asByteChunk();
-        final int chunkSize = keyChunk0.size();
-        for (int chunkPosition = 0; chunkPosition < chunkSize; ++chunkPosition) {
-            final byte k0 = keyChunk0.get(chunkPosition);
-            final int hash = hash(k0);
-            final int tableLocation = hashToTableLocation(tableHashPivot, hash);
-            if (mainOutputPosition.getUnsafe(tableLocation) == EMPTY_OUTPUT_POSITION) {
-                numEntries++;
-                mainKeySource0.set(tableLocation, k0);
-                handler.doMainInsert(tableLocation, chunkPosition);
-            } else if (eq(mainKeySource0.getUnsafe(tableLocation), k0)) {
-                handler.doMainFound(tableLocation, chunkPosition);
-            } else {
-                int overflowLocation = mainOverflowLocationSource.getUnsafe(tableLocation);
-                if (!findOverflow(handler, k0, chunkPosition, overflowLocation)) {
-                    final int newOverflowLocation = allocateOverflowLocation();
-                    overflowKeySource0.set(newOverflowLocation, k0);
-                    mainOverflowLocationSource.set(tableLocation, newOverflowLocation);
-                    overflowOverflowLocationSource.set(newOverflowLocation, overflowLocation);
-                    numEntries++;
-                    handler.doOverflowInsert(newOverflowLocation, chunkPosition);
-                }
-            }
-        }
-    }
-
-    @Override
-    protected void probe(HashHandler handler, RowSequence rowSequence, Chunk[] sourceKeyChunks) {
-        final ByteChunk<Values> keyChunk0 = sourceKeyChunks[0].asByteChunk();
-        final int chunkSize = keyChunk0.size();
-        for (int chunkPosition = 0; chunkPosition < chunkSize; ++chunkPosition) {
-            final byte k0 = keyChunk0.get(chunkPosition);
-            final int hash = hash(k0);
-            final int tableLocation = hashToTableLocation(tableHashPivot, hash);
-            if (mainOutputPosition.getUnsafe(tableLocation) == EMPTY_OUTPUT_POSITION) {
-                handler.doMissing(chunkPosition);
-            } else if (eq(mainKeySource0.getUnsafe(tableLocation), k0)) {
-                handler.doMainFound(tableLocation, chunkPosition);
-            } else {
-                int overflowLocation = mainOverflowLocationSource.getUnsafe(tableLocation);
-                if (!findOverflow(handler, k0, chunkPosition, overflowLocation)) {
-                    handler.doMissing(chunkPosition);
-                }
-            }
-        }
-    }
-
-    private static int hash(byte k0) {
-        int hash = ByteChunkHasher.hashInitialSingle(k0);
-        return hash;
-    }
-
-    @Override
-    protected void rehashBucket(HashHandler handler, int sourceBucket, int destBucket,
-            int bucketsToAdd) {
-        final int position = mainOutputPosition.getUnsafe(sourceBucket);
-        if (position == EMPTY_OUTPUT_POSITION) {
-            return;
-        }
-        int mainInsertLocation = maybeMoveMainBucket(handler, sourceBucket, destBucket, bucketsToAdd);
-        int overflowLocation = mainOverflowLocationSource.getUnsafe(sourceBucket);
-        mainOverflowLocationSource.set(sourceBucket, QueryConstants.NULL_INT);
-        mainOverflowLocationSource.set(destBucket, QueryConstants.NULL_INT);
-        while (overflowLocation != QueryConstants.NULL_INT) {
-            final int nextOverflowLocation = overflowOverflowLocationSource.getUnsafe(overflowLocation);
-            final byte overflowKey0 = overflowKeySource0.getUnsafe(overflowLocation);
-            final int overflowHash = hash(overflowKey0);
-            final int overflowTableLocation = hashToTableLocation(tableHashPivot + bucketsToAdd, overflowHash);
-            if (overflowTableLocation == mainInsertLocation) {
-                mainKeySource0.set(mainInsertLocation, overflowKey0);
-                mainOutputPosition.set(mainInsertLocation, overflowOutputPosition.getUnsafe(overflowLocation));
-                handler.doPromoteOverflow(overflowLocation, mainInsertLocation);
-                overflowOutputPosition.set(overflowLocation, QueryConstants.NULL_INT);
-                overflowKeySource0.set(overflowLocation, QueryConstants.NULL_BYTE);
-                freeOverflowLocation(overflowLocation);
-                mainInsertLocation = -1;
-            } else {
-                final int oldOverflowLocation = mainOverflowLocationSource.getUnsafe(overflowTableLocation);
-                mainOverflowLocationSource.set(overflowTableLocation, overflowLocation);
-                overflowOverflowLocationSource.set(overflowLocation, oldOverflowLocation);
-            }
-            overflowLocation = nextOverflowLocation;
-        }
-    }
-
-    private int maybeMoveMainBucket(HashHandler handler, int sourceBucket, int destBucket,
-            int bucketsToAdd) {
-        final byte k0 = mainKeySource0.getUnsafe(sourceBucket);
-        final int hash = hash(k0);
-        final int location = hashToTableLocation(tableHashPivot + bucketsToAdd, hash);
-        final int mainInsertLocation;
-        if (location == sourceBucket) {
-            mainInsertLocation = destBucket;
-            mainOutputPosition.set(destBucket, EMPTY_OUTPUT_POSITION);
-        } else {
-            mainInsertLocation = sourceBucket;
-            mainOutputPosition.set(destBucket, mainOutputPosition.getUnsafe(sourceBucket));
-            mainOutputPosition.set(sourceBucket, EMPTY_OUTPUT_POSITION);
-            mainKeySource0.set(destBucket, k0);
-            mainKeySource0.set(sourceBucket, QueryConstants.NULL_BYTE);
-            handler.doMoveMain(sourceBucket, destBucket);
-        }
-        return mainInsertLocation;
-    }
-
-    private boolean findOverflow(HashHandler handler, byte k0, int chunkPosition,
-            int overflowLocation) {
-        while (overflowLocation != QueryConstants.NULL_INT) {
-            if (eq(overflowKeySource0.getUnsafe(overflowLocation), k0)) {
-                handler.doOverflowFound(overflowLocation, chunkPosition);
-                return true;
-            }
-            overflowLocation = overflowOverflowLocationSource.getUnsafe(overflowLocation);
-        }
-        return false;
-    }
-
-    @Override
-    public int findPositionForKey(Object key) {
-        final byte k0 = TypeUtils.unbox((Byte)key);
-        int hash = hash(k0);
-        final int tableLocation = hashToTableLocation(tableHashPivot, hash);
-        final int positionValue = mainOutputPosition.getUnsafe(tableLocation);
-        if (positionValue == EMPTY_OUTPUT_POSITION) {
-            return -1;
-        }
-        if (eq(mainKeySource0.getUnsafe(tableLocation), k0)) {
-            return positionValue;
-        }
-        int overflowLocation = mainOverflowLocationSource.getUnsafe(tableLocation);
-        while (overflowLocation != QueryConstants.NULL_INT) {
-            if (eq(overflowKeySource0.getUnsafe(overflowLocation), k0)) {
-                return overflowOutputPosition.getUnsafe(overflowLocation);
-            }
-            overflowLocation = overflowOverflowLocationSource.getUnsafe(overflowLocation);
-        }
-        return -1;
-    }
-}
diff --git a/engine/table/src/main/java/io/deephaven/engine/table/impl/by/typed/staticagg/gen/StaticAggHasherByteByte.java b/engine/table/src/main/java/io/deephaven/engine/table/impl/by/typed/staticagg/gen/StaticAggHasherByteByte.java
deleted file mode 100644
index 60c91420987..00000000000
--- a/engine/table/src/main/java/io/deephaven/engine/table/impl/by/typed/staticagg/gen/StaticAggHasherByteByte.java
+++ /dev/null
@@ -1,201 +0,0 @@
-//
-// Copyright (c) 2016-2024 Deephaven Data Labs and Patent Pending
-//
-// ****** AUTO-GENERATED CLASS - DO NOT EDIT MANUALLY
-// ****** Run ReplicateTypedHashers or ./gradlew replicateTypedHashers to regenerate
-//
-// @formatter:off
-package io.deephaven.engine.table.impl.by.typed.staticagg.gen;
-
-import static io.deephaven.util.compare.ByteComparisons.eq;
-
-import io.deephaven.chunk.ByteChunk;
-import io.deephaven.chunk.Chunk;
-import io.deephaven.chunk.attributes.Values;
-import io.deephaven.chunk.util.hashing.ByteChunkHasher;
-import io.deephaven.engine.rowset.RowSequence;
-import io.deephaven.engine.table.ColumnSource;
-import io.deephaven.engine.table.impl.by.HashHandler;
-import io.deephaven.engine.table.impl.by.StaticChunkedOperatorAggregationStateManagerTypedBase;
-import io.deephaven.engine.table.impl.sources.ByteArraySource;
-import io.deephaven.util.QueryConstants;
-import io.deephaven.util.type.TypeUtils;
-import java.lang.Byte;
-import java.lang.Object;
-import java.lang.Override;
-
-final class StaticAggHasherByteByte extends StaticChunkedOperatorAggregationStateManagerTypedBase {
-    private final ByteArraySource mainKeySource0;
-
-    private final ByteArraySource overflowKeySource0;
-
-    private final ByteArraySource mainKeySource1;
-
-    private final ByteArraySource overflowKeySource1;
-
-    public StaticAggHasherByteByte(ColumnSource[] tableKeySources,
-            ColumnSource[] originalTableKeySources, int tableSize, double maximumLoadFactor,
-            double targetLoadFactor) {
-        super(tableKeySources, tableSize, maximumLoadFactor, targetLoadFactor);
-        this.mainKeySource0 = (ByteArraySource) super.mainKeySources[0];
-        this.overflowKeySource0 = (ByteArraySource) super.overflowKeySources[0];
-        this.mainKeySource1 = (ByteArraySource) super.mainKeySources[1];
-        this.overflowKeySource1 = (ByteArraySource) super.overflowKeySources[1];
-    }
-
-    @Override
-    protected void build(HashHandler handler, RowSequence rowSequence, Chunk[] sourceKeyChunks) {
-        final ByteChunk<Values> keyChunk0 = sourceKeyChunks[0].asByteChunk();
-        final ByteChunk<Values> keyChunk1 = sourceKeyChunks[1].asByteChunk();
-        final int chunkSize = keyChunk0.size();
-        for (int chunkPosition = 0; chunkPosition < chunkSize; ++chunkPosition) {
-            final byte k0 = keyChunk0.get(chunkPosition);
-            final byte k1 = keyChunk1.get(chunkPosition);
-            final int hash = hash(k0, k1);
-            final int tableLocation = hashToTableLocation(tableHashPivot, hash);
-            if (mainOutputPosition.getUnsafe(tableLocation) == EMPTY_OUTPUT_POSITION) {
-                numEntries++;
-                mainKeySource0.set(tableLocation, k0);
-                mainKeySource1.set(tableLocation, k1);
-                handler.doMainInsert(tableLocation, chunkPosition);
-            } else if (eq(mainKeySource0.getUnsafe(tableLocation), k0) && eq(mainKeySource1.getUnsafe(tableLocation), k1)) {
-                handler.doMainFound(tableLocation, chunkPosition);
-            } else {
-                int overflowLocation = mainOverflowLocationSource.getUnsafe(tableLocation);
-                if (!findOverflow(handler, k0, k1, chunkPosition, overflowLocation)) {
-                    final int newOverflowLocation = allocateOverflowLocation();
-                    overflowKeySource0.set(newOverflowLocation, k0);
-                    overflowKeySource1.set(newOverflowLocation, k1);
-                    mainOverflowLocationSource.set(tableLocation, newOverflowLocation);
-                    overflowOverflowLocationSource.set(newOverflowLocation, overflowLocation);
-                    numEntries++;
-                    handler.doOverflowInsert(newOverflowLocation, chunkPosition);
-                }
-            }
-        }
-    }
-
-    @Override
-    protected void probe(HashHandler handler, RowSequence rowSequence, Chunk[] sourceKeyChunks) {
-        final ByteChunk<Values> keyChunk0 = sourceKeyChunks[0].asByteChunk();
-        final ByteChunk<Values> keyChunk1 = sourceKeyChunks[1].asByteChunk();
-        final int chunkSize = keyChunk0.size();
-        for (int chunkPosition = 0; chunkPosition < chunkSize; ++chunkPosition) {
-            final byte k0 = keyChunk0.get(chunkPosition);
-            final byte k1 = keyChunk1.get(chunkPosition);
-            final int hash = hash(k0, k1);
-            final int tableLocation = hashToTableLocation(tableHashPivot, hash);
-            if (mainOutputPosition.getUnsafe(tableLocation) == EMPTY_OUTPUT_POSITION) {
-                handler.doMissing(chunkPosition);
-            } else if (eq(mainKeySource0.getUnsafe(tableLocation), k0) && eq(mainKeySource1.getUnsafe(tableLocation), k1)) {
-                handler.doMainFound(tableLocation, chunkPosition);
-            } else {
-                int overflowLocation = mainOverflowLocationSource.getUnsafe(tableLocation);
-                if (!findOverflow(handler, k0, k1, chunkPosition, overflowLocation)) {
-                    handler.doMissing(chunkPosition);
-                }
-            }
-        }
-    }
-
-    private static int hash(byte k0, byte k1) {
-        int hash = ByteChunkHasher.hashInitialSingle(k0);
-        hash = ByteChunkHasher.hashUpdateSingle(hash, k1);
-        return hash;
-    }
-
-    @Override
-    protected void rehashBucket(HashHandler handler, int sourceBucket, int destBucket,
-            int bucketsToAdd) {
-        final int position = mainOutputPosition.getUnsafe(sourceBucket);
-        if (position == EMPTY_OUTPUT_POSITION) {
-            return;
-        }
-        int mainInsertLocation = maybeMoveMainBucket(handler, sourceBucket, destBucket, bucketsToAdd);
-        int overflowLocation = mainOverflowLocationSource.getUnsafe(sourceBucket);
-        mainOverflowLocationSource.set(sourceBucket, QueryConstants.NULL_INT);
-        mainOverflowLocationSource.set(destBucket, QueryConstants.NULL_INT);
-        while (overflowLocation != QueryConstants.NULL_INT) {
-            final int nextOverflowLocation = overflowOverflowLocationSource.getUnsafe(overflowLocation);
-            final byte overflowKey0 = overflowKeySource0.getUnsafe(overflowLocation);
-            final byte overflowKey1 = overflowKeySource1.getUnsafe(overflowLocation);
-            final int overflowHash = hash(overflowKey0, overflowKey1);
-            final int overflowTableLocation = hashToTableLocation(tableHashPivot + bucketsToAdd, overflowHash);
-            if (overflowTableLocation == mainInsertLocation) {
-                mainKeySource0.set(mainInsertLocation, overflowKey0);
-                mainKeySource1.set(mainInsertLocation, overflowKey1);
-                mainOutputPosition.set(mainInsertLocation, overflowOutputPosition.getUnsafe(overflowLocation));
-                handler.doPromoteOverflow(overflowLocation, mainInsertLocation);
-                overflowOutputPosition.set(overflowLocation, QueryConstants.NULL_INT);
-                overflowKeySource0.set(overflowLocation, QueryConstants.NULL_BYTE);
-                overflowKeySource1.set(overflowLocation, QueryConstants.NULL_BYTE);
-                freeOverflowLocation(overflowLocation);
-                mainInsertLocation = -1;
-            } else {
-                final int oldOverflowLocation = mainOverflowLocationSource.getUnsafe(overflowTableLocation);
-                mainOverflowLocationSource.set(overflowTableLocation, overflowLocation);
-                overflowOverflowLocationSource.set(overflowLocation, oldOverflowLocation);
-            }
-            overflowLocation = nextOverflowLocation;
-        }
-    }
-
-    private int maybeMoveMainBucket(HashHandler handler, int sourceBucket, int destBucket,
-            int bucketsToAdd) {
-        final byte k0 = mainKeySource0.getUnsafe(sourceBucket);
-        final byte k1 = mainKeySource1.getUnsafe(sourceBucket);
-        final int hash = hash(k0, k1);
-        final int location = hashToTableLocation(tableHashPivot + bucketsToAdd, hash);
-        final int mainInsertLocation;
-        if (location == sourceBucket) {
-            mainInsertLocation = destBucket;
-            mainOutputPosition.set(destBucket, EMPTY_OUTPUT_POSITION);
-        } else {
-            mainInsertLocation = sourceBucket;
-            mainOutputPosition.set(destBucket, mainOutputPosition.getUnsafe(sourceBucket));
-            mainOutputPosition.set(sourceBucket, EMPTY_OUTPUT_POSITION);
-            mainKeySource0.set(destBucket, k0);
-            mainKeySource0.set(sourceBucket, QueryConstants.NULL_BYTE);
-            mainKeySource1.set(destBucket, k1);
-            mainKeySource1.set(sourceBucket, QueryConstants.NULL_BYTE);
-            handler.doMoveMain(sourceBucket, destBucket);
-        }
-        return mainInsertLocation;
-    }
-
-    private boolean findOverflow(HashHandler handler, byte k0, byte k1, int chunkPosition,
-            int overflowLocation) {
-        while (overflowLocation != QueryConstants.NULL_INT) {
-            if (eq(overflowKeySource0.getUnsafe(overflowLocation), k0) && eq(overflowKeySource1.getUnsafe(overflowLocation), k1)) {
-                handler.doOverflowFound(overflowLocation, chunkPosition);
-                return true;
-            }
-            overflowLocation = overflowOverflowLocationSource.getUnsafe(overflowLocation);
-        }
-        return false;
-    }
-
-    @Override
-    public int findPositionForKey(Object key) {
-        final Object [] ka = (Object[])key;
-        final byte k0 = TypeUtils.unbox((Byte)ka[0]);
-        final byte k1 = TypeUtils.unbox((Byte)ka[1]);
-        int hash = hash(k0, k1);
-        final int tableLocation = hashToTableLocation(tableHashPivot, hash);
-        final int positionValue = mainOutputPosition.getUnsafe(tableLocation);
-        if (positionValue == EMPTY_OUTPUT_POSITION) {
-            return -1;
-        }
-        if (eq(mainKeySource0.getUnsafe(tableLocation), k0) && eq(mainKeySource1.getUnsafe(tableLocation), k1)) {
-            return positionValue;
-        }
-        int overflowLocation = mainOverflowLocationSource.getUnsafe(tableLocation);
-        while (overflowLocation != QueryConstants.NULL_INT) {
-            if (eq(overflowKeySource0.getUnsafe(overflowLocation), k0) && eq(overflowKeySource1.getUnsafe(overflowLocation), k1)) {
-                return overflowOutputPosition.getUnsafe(overflowLocation);
-            }
-            overflowLocation = overflowOverflowLocationSource.getUnsafe(overflowLocation);
-        }
-        return -1;
-    }
-}
diff --git a/engine/table/src/main/java/io/deephaven/engine/table/impl/by/typed/staticagg/gen/StaticAggHasherByteChar.java b/engine/table/src/main/java/io/deephaven/engine/table/impl/by/typed/staticagg/gen/StaticAggHasherByteChar.java
deleted file mode 100644
index 8e6d3e43238..00000000000
--- a/engine/table/src/main/java/io/deephaven/engine/table/impl/by/typed/staticagg/gen/StaticAggHasherByteChar.java
+++ /dev/null
@@ -1,206 +0,0 @@
-//
-// Copyright (c) 2016-2024 Deephaven Data Labs and Patent Pending
-//
-// ****** AUTO-GENERATED CLASS - DO NOT EDIT MANUALLY
-// ****** Run ReplicateTypedHashers or ./gradlew replicateTypedHashers to regenerate
-//
-// @formatter:off
-package io.deephaven.engine.table.impl.by.typed.staticagg.gen;
-
-import static io.deephaven.util.compare.ByteComparisons.eq;
-import static io.deephaven.util.compare.CharComparisons.eq;
-
-import io.deephaven.chunk.ByteChunk;
-import io.deephaven.chunk.CharChunk;
-import io.deephaven.chunk.Chunk;
-import io.deephaven.chunk.attributes.Values;
-import io.deephaven.chunk.util.hashing.ByteChunkHasher;
-import io.deephaven.chunk.util.hashing.CharChunkHasher;
-import io.deephaven.engine.rowset.RowSequence;
-import io.deephaven.engine.table.ColumnSource;
-import io.deephaven.engine.table.impl.by.HashHandler;
-import io.deephaven.engine.table.impl.by.StaticChunkedOperatorAggregationStateManagerTypedBase;
-import io.deephaven.engine.table.impl.sources.ByteArraySource;
-import io.deephaven.engine.table.impl.sources.CharacterArraySource;
-import io.deephaven.util.QueryConstants;
-import io.deephaven.util.type.TypeUtils;
-import java.lang.Byte;
-import java.lang.Character;
-import java.lang.Object;
-import java.lang.Override;
-
-final class StaticAggHasherByteChar extends StaticChunkedOperatorAggregationStateManagerTypedBase {
-    private final ByteArraySource mainKeySource0;
-
-    private final ByteArraySource overflowKeySource0;
-
-    private final CharacterArraySource mainKeySource1;
-
-    private final CharacterArraySource overflowKeySource1;
-
-    public StaticAggHasherByteChar(ColumnSource[] tableKeySources,
-            ColumnSource[] originalTableKeySources, int tableSize, double maximumLoadFactor,
-            double targetLoadFactor) {
-        super(tableKeySources, tableSize, maximumLoadFactor, targetLoadFactor);
-        this.mainKeySource0 = (ByteArraySource) super.mainKeySources[0];
-        this.overflowKeySource0 = (ByteArraySource) super.overflowKeySources[0];
-        this.mainKeySource1 = (CharacterArraySource) super.mainKeySources[1];
-        this.overflowKeySource1 = (CharacterArraySource) super.overflowKeySources[1];
-    }
-
-    @Override
-    protected void build(HashHandler handler, RowSequence rowSequence, Chunk[] sourceKeyChunks) {
-        final ByteChunk<Values> keyChunk0 = sourceKeyChunks[0].asByteChunk();
-        final CharChunk<Values> keyChunk1 = sourceKeyChunks[1].asCharChunk();
-        final int chunkSize = keyChunk0.size();
-        for (int chunkPosition = 0; chunkPosition < chunkSize; ++chunkPosition) {
-            final byte k0 = keyChunk0.get(chunkPosition);
-            final char k1 = keyChunk1.get(chunkPosition);
-            final int hash = hash(k0, k1);
-            final int tableLocation = hashToTableLocation(tableHashPivot, hash);
-            if (mainOutputPosition.getUnsafe(tableLocation) == EMPTY_OUTPUT_POSITION) {
-                numEntries++;
-                mainKeySource0.set(tableLocation, k0);
-                mainKeySource1.set(tableLocation, k1);
-                handler.doMainInsert(tableLocation, chunkPosition);
-            } else if (eq(mainKeySource0.getUnsafe(tableLocation), k0) && eq(mainKeySource1.getUnsafe(tableLocation), k1)) {
-                handler.doMainFound(tableLocation, chunkPosition);
-            } else {
-                int overflowLocation = mainOverflowLocationSource.getUnsafe(tableLocation);
-                if (!findOverflow(handler, k0, k1, chunkPosition, overflowLocation)) {
-                    final int newOverflowLocation = allocateOverflowLocation();
-                    overflowKeySource0.set(newOverflowLocation, k0);
-                    overflowKeySource1.set(newOverflowLocation, k1);
-                    mainOverflowLocationSource.set(tableLocation, newOverflowLocation);
-                    overflowOverflowLocationSource.set(newOverflowLocation, overflowLocation);
-                    numEntries++;
-                    handler.doOverflowInsert(newOverflowLocation, chunkPosition);
-                }
-            }
-        }
-    }
-
-    @Override
-    protected void probe(HashHandler handler, RowSequence rowSequence, Chunk[] sourceKeyChunks) {
-        final ByteChunk<Values> keyChunk0 = sourceKeyChunks[0].asByteChunk();
-        final CharChunk<Values> keyChunk1 = sourceKeyChunks[1].asCharChunk();
-        final int chunkSize = keyChunk0.size();
-        for (int chunkPosition = 0; chunkPosition < chunkSize; ++chunkPosition) {
-            final byte k0 = keyChunk0.get(chunkPosition);
-            final char k1 = keyChunk1.get(chunkPosition);
-            final int hash = hash(k0, k1);
-            final int tableLocation = hashToTableLocation(tableHashPivot, hash);
-            if (mainOutputPosition.getUnsafe(tableLocation) == EMPTY_OUTPUT_POSITION) {
-                handler.doMissing(chunkPosition);
-            } else if (eq(mainKeySource0.getUnsafe(tableLocation), k0) && eq(mainKeySource1.getUnsafe(tableLocation), k1)) {
-                handler.doMainFound(tableLocation, chunkPosition);
-            } else {
-                int overflowLocation = mainOverflowLocationSource.getUnsafe(tableLocation);
-                if (!findOverflow(handler, k0, k1, chunkPosition, overflowLocation)) {
-                    handler.doMissing(chunkPosition);
-                }
-            }
-        }
-    }
-
-    private static int hash(byte k0, char k1) {
-        int hash = ByteChunkHasher.hashInitialSingle(k0);
-        hash = CharChunkHasher.hashUpdateSingle(hash, k1);
-        return hash;
-    }
-
-    @Override
-    protected void rehashBucket(HashHandler handler, int sourceBucket, int destBucket,
-            int bucketsToAdd) {
-        final int position = mainOutputPosition.getUnsafe(sourceBucket);
-        if (position == EMPTY_OUTPUT_POSITION) {
-            return;
-        }
-        int mainInsertLocation = maybeMoveMainBucket(handler, sourceBucket, destBucket, bucketsToAdd);
-        int overflowLocation = mainOverflowLocationSource.getUnsafe(sourceBucket);
-        mainOverflowLocationSource.set(sourceBucket, QueryConstants.NULL_INT);
-        mainOverflowLocationSource.set(destBucket, QueryConstants.NULL_INT);
-        while (overflowLocation != QueryConstants.NULL_INT) {
-            final int nextOverflowLocation = overflowOverflowLocationSource.getUnsafe(overflowLocation);
-            final byte overflowKey0 = overflowKeySource0.getUnsafe(overflowLocation);
-            final char overflowKey1 = overflowKeySource1.getUnsafe(overflowLocation);
-            final int overflowHash = hash(overflowKey0, overflowKey1);
-            final int overflowTableLocation = hashToTableLocation(tableHashPivot + bucketsToAdd, overflowHash);
-            if (overflowTableLocation == mainInsertLocation) {
-                mainKeySource0.set(mainInsertLocation, overflowKey0);
-                mainKeySource1.set(mainInsertLocation, overflowKey1);
-                mainOutputPosition.set(mainInsertLocation, overflowOutputPosition.getUnsafe(overflowLocation));
-                handler.doPromoteOverflow(overflowLocation, mainInsertLocation);
-                overflowOutputPosition.set(overflowLocation, QueryConstants.NULL_INT);
-                overflowKeySource0.set(overflowLocation, QueryConstants.NULL_BYTE);
-                overflowKeySource1.set(overflowLocation, QueryConstants.NULL_CHAR);
-                freeOverflowLocation(overflowLocation);
-                mainInsertLocation = -1;
-            } else {
-                final int oldOverflowLocation = mainOverflowLocationSource.getUnsafe(overflowTableLocation);
-                mainOverflowLocationSource.set(overflowTableLocation, overflowLocation);
-                overflowOverflowLocationSource.set(overflowLocation, oldOverflowLocation);
-            }
-            overflowLocation = nextOverflowLocation;
-        }
-    }
-
-    private int maybeMoveMainBucket(HashHandler handler, int sourceBucket, int destBucket,
-            int bucketsToAdd) {
-        final byte k0 = mainKeySource0.getUnsafe(sourceBucket);
-        final char k1 = mainKeySource1.getUnsafe(sourceBucket);
-        final int hash = hash(k0, k1);
-        final int location = hashToTableLocation(tableHashPivot + bucketsToAdd, hash);
-        final int mainInsertLocation;
-        if (location == sourceBucket) {
-            mainInsertLocation = destBucket;
-            mainOutputPosition.set(destBucket, EMPTY_OUTPUT_POSITION);
-        } else {
-            mainInsertLocation = sourceBucket;
-            mainOutputPosition.set(destBucket, mainOutputPosition.getUnsafe(sourceBucket));
-            mainOutputPosition.set(sourceBucket, EMPTY_OUTPUT_POSITION);
-            mainKeySource0.set(destBucket, k0);
-            mainKeySource0.set(sourceBucket, QueryConstants.NULL_BYTE);
-            mainKeySource1.set(destBucket, k1);
-            mainKeySource1.set(sourceBucket, QueryConstants.NULL_CHAR);
-            handler.doMoveMain(sourceBucket, destBucket);
-        }
-        return mainInsertLocation;
-    }
-
-    private boolean findOverflow(HashHandler handler, byte k0, char k1, int chunkPosition,
-            int overflowLocation) {
-        while (overflowLocation != QueryConstants.NULL_INT) {
-            if (eq(overflowKeySource0.getUnsafe(overflowLocation), k0) && eq(overflowKeySource1.getUnsafe(overflowLocation), k1)) {
-                handler.doOverflowFound(overflowLocation, chunkPosition);
-                return true;
-            }
-            overflowLocation = overflowOverflowLocationSource.getUnsafe(overflowLocation);
-        }
-        return false;
-    }
-
-    @Override
-    public int findPositionForKey(Object key) {
-        final Object [] ka = (Object[])key;
-        final byte k0 = TypeUtils.unbox((Byte)ka[0]);
-        final char k1 = TypeUtils.unbox((Character)ka[1]);
-        int hash = hash(k0, k1);
-        final int tableLocation = hashToTableLocation(tableHashPivot, hash);
-        final int positionValue = mainOutputPosition.getUnsafe(tableLocation);
-        if (positionValue == EMPTY_OUTPUT_POSITION) {
-            return -1;
-        }
-        if (eq(mainKeySource0.getUnsafe(tableLocation), k0) && eq(mainKeySource1.getUnsafe(tableLocation), k1)) {
-            return positionValue;
-        }
-        int overflowLocation = mainOverflowLocationSource.getUnsafe(tableLocation);
-        while (overflowLocation != QueryConstants.NULL_INT) {
-            if (eq(overflowKeySource0.getUnsafe(overflowLocation), k0) && eq(overflowKeySource1.getUnsafe(overflowLocation), k1)) {
-                return overflowOutputPosition.getUnsafe(overflowLocation);
-            }
-            overflowLocation = overflowOverflowLocationSource.getUnsafe(overflowLocation);
-        }
-        return -1;
-    }
-}
diff --git a/engine/table/src/main/java/io/deephaven/engine/table/impl/by/typed/staticagg/gen/StaticAggHasherByteDouble.java b/engine/table/src/main/java/io/deephaven/engine/table/impl/by/typed/staticagg/gen/StaticAggHasherByteDouble.java
deleted file mode 100644
index f3cba389c39..00000000000
--- a/engine/table/src/main/java/io/deephaven/engine/table/impl/by/typed/staticagg/gen/StaticAggHasherByteDouble.java
+++ /dev/null
@@ -1,206 +0,0 @@
-//
-// Copyright (c) 2016-2024 Deephaven Data Labs and Patent Pending
-//
-// ****** AUTO-GENERATED CLASS - DO NOT EDIT MANUALLY
-// ****** Run ReplicateTypedHashers or ./gradlew replicateTypedHashers to regenerate
-//
-// @formatter:off
-package io.deephaven.engine.table.impl.by.typed.staticagg.gen;
-
-import static io.deephaven.util.compare.ByteComparisons.eq;
-import static io.deephaven.util.compare.DoubleComparisons.eq;
-
-import io.deephaven.chunk.ByteChunk;
-import io.deephaven.chunk.Chunk;
-import io.deephaven.chunk.DoubleChunk;
-import io.deephaven.chunk.attributes.Values;
-import io.deephaven.chunk.util.hashing.ByteChunkHasher;
-import io.deephaven.chunk.util.hashing.DoubleChunkHasher;
-import io.deephaven.engine.rowset.RowSequence;
-import io.deephaven.engine.table.ColumnSource;
-import io.deephaven.engine.table.impl.by.HashHandler;
-import io.deephaven.engine.table.impl.by.StaticChunkedOperatorAggregationStateManagerTypedBase;
-import io.deephaven.engine.table.impl.sources.ByteArraySource;
-import io.deephaven.engine.table.impl.sources.DoubleArraySource;
-import io.deephaven.util.QueryConstants;
-import io.deephaven.util.type.TypeUtils;
-import java.lang.Byte;
-import java.lang.Double;
-import java.lang.Object;
-import java.lang.Override;
-
-final class StaticAggHasherByteDouble extends StaticChunkedOperatorAggregationStateManagerTypedBase {
-    private final ByteArraySource mainKeySource0;
-
-    private final ByteArraySource overflowKeySource0;
-
-    private final DoubleArraySource mainKeySource1;
-
-    private final DoubleArraySource overflowKeySource1;
-
-    public StaticAggHasherByteDouble(ColumnSource[] tableKeySources,
-            ColumnSource[] originalTableKeySources, int tableSize, double maximumLoadFactor,
-            double targetLoadFactor) {
-        super(tableKeySources, tableSize, maximumLoadFactor, targetLoadFactor);
-        this.mainKeySource0 = (ByteArraySource) super.mainKeySources[0];
-        this.overflowKeySource0 = (ByteArraySource) super.overflowKeySources[0];
-        this.mainKeySource1 = (DoubleArraySource) super.mainKeySources[1];
-        this.overflowKeySource1 = (DoubleArraySource) super.overflowKeySources[1];
-    }
-
-    @Override
-    protected void build(HashHandler handler, RowSequence rowSequence, Chunk[] sourceKeyChunks) {
-        final ByteChunk<Values> keyChunk0 = sourceKeyChunks[0].asByteChunk();
-        final DoubleChunk<Values> keyChunk1 = sourceKeyChunks[1].asDoubleChunk();
-        final int chunkSize = keyChunk0.size();
-        for (int chunkPosition = 0; chunkPosition < chunkSize; ++chunkPosition) {
-            final byte k0 = keyChunk0.get(chunkPosition);
-            final double k1 = keyChunk1.get(chunkPosition);
-            final int hash = hash(k0, k1);
-            final int tableLocation = hashToTableLocation(tableHashPivot, hash);
-            if (mainOutputPosition.getUnsafe(tableLocation) == EMPTY_OUTPUT_POSITION) {
-                numEntries++;
-                mainKeySource0.set(tableLocation, k0);
-                mainKeySource1.set(tableLocation, k1);
-                handler.doMainInsert(tableLocation, chunkPosition);
-            } else if (eq(mainKeySource0.getUnsafe(tableLocation), k0) && eq(mainKeySource1.getUnsafe(tableLocation), k1)) {
-                handler.doMainFound(tableLocation, chunkPosition);
-            } else {
-                int overflowLocation = mainOverflowLocationSource.getUnsafe(tableLocation);
-                if (!findOverflow(handler, k0, k1, chunkPosition, overflowLocation)) {
-                    final int newOverflowLocation = allocateOverflowLocation();
-                    overflowKeySource0.set(newOverflowLocation, k0);
-                    overflowKeySource1.set(newOverflowLocation, k1);
-                    mainOverflowLocationSource.set(tableLocation, newOverflowLocation);
-                    overflowOverflowLocationSource.set(newOverflowLocation, overflowLocation);
-                    numEntries++;
-                    handler.doOverflowInsert(newOverflowLocation, chunkPosition);
-                }
-            }
-        }
-    }
-
-    @Override
-    protected void probe(HashHandler handler, RowSequence rowSequence, Chunk[] sourceKeyChunks) {
-        final ByteChunk<Values> keyChunk0 = sourceKeyChunks[0].asByteChunk();
-        final DoubleChunk<Values> keyChunk1 = sourceKeyChunks[1].asDoubleChunk();
-        final int chunkSize = keyChunk0.size();
-        for (int chunkPosition = 0; chunkPosition < chunkSize; ++chunkPosition) {
-            final byte k0 = keyChunk0.get(chunkPosition);
-            final double k1 = keyChunk1.get(chunkPosition);
-            final int hash = hash(k0, k1);
-            final int tableLocation = hashToTableLocation(tableHashPivot, hash);
-            if (mainOutputPosition.getUnsafe(tableLocation) == EMPTY_OUTPUT_POSITION) {
-                handler.doMissing(chunkPosition);
-            } else if (eq(mainKeySource0.getUnsafe(tableLocation), k0) && eq(mainKeySource1.getUnsafe(tableLocation), k1)) {
-                handler.doMainFound(tableLocation, chunkPosition);
-            } else {
-                int overflowLocation = mainOverflowLocationSource.getUnsafe(tableLocation);
-                if (!findOverflow(handler, k0, k1, chunkPosition, overflowLocation)) {
-                    handler.doMissing(chunkPosition);
-                }
-            }
-        }
-    }
-
-    private static int hash(byte k0, double k1) {
-        int hash = ByteChunkHasher.hashInitialSingle(k0);
-        hash = DoubleChunkHasher.hashUpdateSingle(hash, k1);
-        return hash;
-    }
-
-    @Override
-    protected void rehashBucket(HashHandler handler, int sourceBucket, int destBucket,
-            int bucketsToAdd) {
-        final int position = mainOutputPosition.getUnsafe(sourceBucket);
-        if (position == EMPTY_OUTPUT_POSITION) {
-            return;
-        }
-        int mainInsertLocation = maybeMoveMainBucket(handler, sourceBucket, destBucket, bucketsToAdd);
-        int overflowLocation = mainOverflowLocationSource.getUnsafe(sourceBucket);
-        mainOverflowLocationSource.set(sourceBucket, QueryConstants.NULL_INT);
-        mainOverflowLocationSource.set(destBucket, QueryConstants.NULL_INT);
-        while (overflowLocation != QueryConstants.NULL_INT) {
-            final int nextOverflowLocation = overflowOverflowLocationSource.getUnsafe(overflowLocation);
-            final byte overflowKey0 = overflowKeySource0.getUnsafe(overflowLocation);
-            final double overflowKey1 = overflowKeySource1.getUnsafe(overflowLocation);
-            final int overflowHash = hash(overflowKey0, overflowKey1);
-            final int overflowTableLocation = hashToTableLocation(tableHashPivot + bucketsToAdd, overflowHash);
-            if (overflowTableLocation == mainInsertLocation) {
-                mainKeySource0.set(mainInsertLocation, overflowKey0);
-                mainKeySource1.set(mainInsertLocation, overflowKey1);
-                mainOutputPosition.set(mainInsertLocation, overflowOutputPosition.getUnsafe(overflowLocation));
-                handler.doPromoteOverflow(overflowLocation, mainInsertLocation);
-                overflowOutputPosition.set(overflowLocation, QueryConstants.NULL_INT);
-                overflowKeySource0.set(overflowLocation, QueryConstants.NULL_BYTE);
-                overflowKeySource1.set(overflowLocation, QueryConstants.NULL_DOUBLE);
-                freeOverflowLocation(overflowLocation);
-                mainInsertLocation = -1;
-            } else {
-                final int oldOverflowLocation = mainOverflowLocationSource.getUnsafe(overflowTableLocation);
-                mainOverflowLocationSource.set(overflowTableLocation, overflowLocation);
-                overflowOverflowLocationSource.set(overflowLocation, oldOverflowLocation);
-            }
-            overflowLocation = nextOverflowLocation;
-        }
-    }
-
-    private int maybeMoveMainBucket(HashHandler handler, int sourceBucket, int destBucket,
-            int bucketsToAdd) {
-        final byte k0 = mainKeySource0.getUnsafe(sourceBucket);
-        final double k1 = mainKeySource1.getUnsafe(sourceBucket);
-        final int hash = hash(k0, k1);
-        final int location = hashToTableLocation(tableHashPivot + bucketsToAdd, hash);
-        final int mainInsertLocation;
-        if (location == sourceBucket) {
-            mainInsertLocation = destBucket;
-            mainOutputPosition.set(destBucket, EMPTY_OUTPUT_POSITION);
-        } else {
-            mainInsertLocation = sourceBucket;
-            mainOutputPosition.set(destBucket, mainOutputPosition.getUnsafe(sourceBucket));
-            mainOutputPosition.set(sourceBucket, EMPTY_OUTPUT_POSITION);
-            mainKeySource0.set(destBucket, k0);
-            mainKeySource0.set(sourceBucket, QueryConstants.NULL_BYTE);
-            mainKeySource1.set(destBucket, k1);
-            mainKeySource1.set(sourceBucket, QueryConstants.NULL_DOUBLE);
-            handler.doMoveMain(sourceBucket, destBucket);
-        }
-        return mainInsertLocation;
-    }
-
-    private boolean findOverflow(HashHandler handler, byte k0, double k1, int chunkPosition,
-            int overflowLocation) {
-        while (overflowLocation != QueryConstants.NULL_INT) {
-            if (eq(overflowKeySource0.getUnsafe(overflowLocation), k0) && eq(overflowKeySource1.getUnsafe(overflowLocation), k1)) {
-                handler.doOverflowFound(overflowLocation, chunkPosition);
-                return true;
-            }
-            overflowLocation = overflowOverflowLocationSource.getUnsafe(overflowLocation);
-        }
-        return false;
-    }
-
-    @Override
-    public int findPositionForKey(Object key) {
-        final Object [] ka = (Object[])key;
-        final byte k0 = TypeUtils.unbox((Byte)ka[0]);
-        final double k1 = TypeUtils.unbox((Double)ka[1]);
-        int hash = hash(k0, k1);
-        final int tableLocation = hashToTableLocation(tableHashPivot, hash);
-        final int positionValue = mainOutputPosition.getUnsafe(tableLocation);
-        if (positionValue == EMPTY_OUTPUT_POSITION) {
-            return -1;
-        }
-        if (eq(mainKeySource0.getUnsafe(tableLocation), k0) && eq(mainKeySource1.getUnsafe(tableLocation), k1)) {
-            return positionValue;
-        }
-        int overflowLocation = mainOverflowLocationSource.getUnsafe(tableLocation);
-        while (overflowLocation != QueryConstants.NULL_INT) {
-            if (eq(overflowKeySource0.getUnsafe(overflowLocation), k0) && eq(overflowKeySource1.getUnsafe(overflowLocation), k1)) {
-                return overflowOutputPosition.getUnsafe(overflowLocation);
-            }
-            overflowLocation = overflowOverflowLocationSource.getUnsafe(overflowLocation);
-        }
-        return -1;
-    }
-}
diff --git a/engine/table/src/main/java/io/deephaven/engine/table/impl/by/typed/staticagg/gen/StaticAggHasherByteFloat.java b/engine/table/src/main/java/io/deephaven/engine/table/impl/by/typed/staticagg/gen/StaticAggHasherByteFloat.java
deleted file mode 100644
index 3cb87198501..00000000000
--- a/engine/table/src/main/java/io/deephaven/engine/table/impl/by/typed/staticagg/gen/StaticAggHasherByteFloat.java
+++ /dev/null
@@ -1,206 +0,0 @@
-//
-// Copyright (c) 2016-2024 Deephaven Data Labs and Patent Pending
-//
-// ****** AUTO-GENERATED CLASS - DO NOT EDIT MANUALLY
-// ****** Run ReplicateTypedHashers or ./gradlew replicateTypedHashers to regenerate
-//
-// @formatter:off
-package io.deephaven.engine.table.impl.by.typed.staticagg.gen;
-
-import static io.deephaven.util.compare.ByteComparisons.eq;
-import static io.deephaven.util.compare.FloatComparisons.eq;
-
-import io.deephaven.chunk.ByteChunk;
-import io.deephaven.chunk.Chunk;
-import io.deephaven.chunk.FloatChunk;
-import io.deephaven.chunk.attributes.Values;
-import io.deephaven.chunk.util.hashing.ByteChunkHasher;
-import io.deephaven.chunk.util.hashing.FloatChunkHasher;
-import io.deephaven.engine.rowset.RowSequence;
-import io.deephaven.engine.table.ColumnSource;
-import io.deephaven.engine.table.impl.by.HashHandler;
-import io.deephaven.engine.table.impl.by.StaticChunkedOperatorAggregationStateManagerTypedBase;
-import io.deephaven.engine.table.impl.sources.ByteArraySource;
-import io.deephaven.engine.table.impl.sources.FloatArraySource;
-import io.deephaven.util.QueryConstants;
-import io.deephaven.util.type.TypeUtils;
-import java.lang.Byte;
-import java.lang.Float;
-import java.lang.Object;
-import java.lang.Override;
-
-final class StaticAggHasherByteFloat extends StaticChunkedOperatorAggregationStateManagerTypedBase {
-    private final ByteArraySource mainKeySource0;
-
-    private final ByteArraySource overflowKeySource0;
-
-    private final FloatArraySource mainKeySource1;
-
-    private final FloatArraySource overflowKeySource1;
-
-    public StaticAggHasherByteFloat(ColumnSource[] tableKeySources,
-            ColumnSource[] originalTableKeySources, int tableSize, double maximumLoadFactor,
-            double targetLoadFactor) {
-        super(tableKeySources, tableSize, maximumLoadFactor, targetLoadFactor);
-        this.mainKeySource0 = (ByteArraySource) super.mainKeySources[0];
-        this.overflowKeySource0 = (ByteArraySource) super.overflowKeySources[0];
-        this.mainKeySource1 = (FloatArraySource) super.mainKeySources[1];
-        this.overflowKeySource1 = (FloatArraySource) super.overflowKeySources[1];
-    }
-
-    @Override
-    protected void build(HashHandler handler, RowSequence rowSequence, Chunk[] sourceKeyChunks) {
-        final ByteChunk<Values> keyChunk0 = sourceKeyChunks[0].asByteChunk();
-        final FloatChunk<Values> keyChunk1 = sourceKeyChunks[1].asFloatChunk();
-        final int chunkSize = keyChunk0.size();
-        for (int chunkPosition = 0; chunkPosition < chunkSize; ++chunkPosition) {
-            final byte k0 = keyChunk0.get(chunkPosition);
-            final float k1 = keyChunk1.get(chunkPosition);
-            final int hash = hash(k0, k1);
-            final int tableLocation = hashToTableLocation(tableHashPivot, hash);
-            if (mainOutputPosition.getUnsafe(tableLocation) == EMPTY_OUTPUT_POSITION) {
-                numEntries++;
-                mainKeySource0.set(tableLocation, k0);
-                mainKeySource1.set(tableLocation, k1);
-                handler.doMainInsert(tableLocation, chunkPosition);
-            } else if (eq(mainKeySource0.getUnsafe(tableLocation), k0) && eq(mainKeySource1.getUnsafe(tableLocation), k1)) {
-                handler.doMainFound(tableLocation, chunkPosition);
-            } else {
-                int overflowLocation = mainOverflowLocationSource.getUnsafe(tableLocation);
-                if (!findOverflow(handler, k0, k1, chunkPosition, overflowLocation)) {
-                    final int newOverflowLocation = allocateOverflowLocation();
-                    overflowKeySource0.set(newOverflowLocation, k0);
-                    overflowKeySource1.set(newOverflowLocation, k1);
-                    mainOverflowLocationSource.set(tableLocation, newOverflowLocation);
-                    overflowOverflowLocationSource.set(newOverflowLocation, overflowLocation);
-                    numEntries++;
-                    handler.doOverflowInsert(newOverflowLocation, chunkPosition);
-                }
-            }
-        }
-    }
-
-    @Override
-    protected void probe(HashHandler handler, RowSequence rowSequence, Chunk[] sourceKeyChunks) {
-        final ByteChunk<Values> keyChunk0 = sourceKeyChunks[0].asByteChunk();
-        final FloatChunk<Values> keyChunk1 = sourceKeyChunks[1].asFloatChunk();
-        final int chunkSize = keyChunk0.size();
-        for (int chunkPosition = 0; chunkPosition < chunkSize; ++chunkPosition) {
-            final byte k0 = keyChunk0.get(chunkPosition);
-            final float k1 = keyChunk1.get(chunkPosition);
-            final int hash = hash(k0, k1);
-            final int tableLocation = hashToTableLocation(tableHashPivot, hash);
-            if (mainOutputPosition.getUnsafe(tableLocation) == EMPTY_OUTPUT_POSITION) {
-                handler.doMissing(chunkPosition);
-            } else if (eq(mainKeySource0.getUnsafe(tableLocation), k0) && eq(mainKeySource1.getUnsafe(tableLocation), k1)) {
-                handler.doMainFound(tableLocation, chunkPosition);
-            } else {
-                int overflowLocation = mainOverflowLocationSource.getUnsafe(tableLocation);
-                if (!findOverflow(handler, k0, k1, chunkPosition, overflowLocation)) {
-                    handler.doMissing(chunkPosition);
-                }
-            }
-        }
-    }
-
-    private static int hash(byte k0, float k1) {
-        int hash = ByteChunkHasher.hashInitialSingle(k0);
-        hash = FloatChunkHasher.hashUpdateSingle(hash, k1);
-        return hash;
-    }
-
-    @Override
-    protected void rehashBucket(HashHandler handler, int sourceBucket, int destBucket,
-            int bucketsToAdd) {
-        final int position = mainOutputPosition.getUnsafe(sourceBucket);
-        if (position == EMPTY_OUTPUT_POSITION) {
-            return;
-        }
-        int mainInsertLocation = maybeMoveMainBucket(handler, sourceBucket, destBucket, bucketsToAdd);
-        int overflowLocation = mainOverflowLocationSource.getUnsafe(sourceBucket);
-        mainOverflowLocationSource.set(sourceBucket, QueryConstants.NULL_INT);
-        mainOverflowLocationSource.set(destBucket, QueryConstants.NULL_INT);
-        while (overflowLocation != QueryConstants.NULL_INT) {
-            final int nextOverflowLocation = overflowOverflowLocationSource.getUnsafe(overflowLocation);
-            final byte overflowKey0 = overflowKeySource0.getUnsafe(overflowLocation);
-            final float overflowKey1 = overflowKeySource1.getUnsafe(overflowLocation);
-            final int overflowHash = hash(overflowKey0, overflowKey1);
-            final int overflowTableLocation = hashToTableLocation(tableHashPivot + bucketsToAdd, overflowHash);
-            if (overflowTableLocation == mainInsertLocation) {
-                mainKeySource0.set(mainInsertLocation, overflowKey0);
-                mainKeySource1.set(mainInsertLocation, overflowKey1);
-                mainOutputPosition.set(mainInsertLocation, overflowOutputPosition.getUnsafe(overflowLocation));
-                handler.doPromoteOverflow(overflowLocation, mainInsertLocation);
-                overflowOutputPosition.set(overflowLocation, QueryConstants.NULL_INT);
-                overflowKeySource0.set(overflowLocation, QueryConstants.NULL_BYTE);
-                overflowKeySource1.set(overflowLocation, QueryConstants.NULL_FLOAT);
-                freeOverflowLocation(overflowLocation);
-                mainInsertLocation = -1;
-            } else {
-                final int oldOverflowLocation = mainOverflowLocationSource.getUnsafe(overflowTableLocation);
-                mainOverflowLocationSource.set(overflowTableLocation, overflowLocation);
-                overflowOverflowLocationSource.set(overflowLocation, oldOverflowLocation);
-            }
-            overflowLocation = nextOverflowLocation;
-        }
-    }
-
-    private int maybeMoveMainBucket(HashHandler handler, int sourceBucket, int destBucket,
-            int bucketsToAdd) {
-        final byte k0 = mainKeySource0.getUnsafe(sourceBucket);
-        final float k1 = mainKeySource1.getUnsafe(sourceBucket);
-        final int hash = hash(k0, k1);
-        final int location = hashToTableLocation(tableHashPivot + bucketsToAdd, hash);
-        final int mainInsertLocation;
-        if (location == sourceBucket) {
-            mainInsertLocation = destBucket;
-            mainOutputPosition.set(destBucket, EMPTY_OUTPUT_POSITION);
-        } else {
-            mainInsertLocation = sourceBucket;
-            mainOutputPosition.set(destBucket, mainOutputPosition.getUnsafe(sourceBucket));
-            mainOutputPosition.set(sourceBucket, EMPTY_OUTPUT_POSITION);
-            mainKeySource0.set(destBucket, k0);
-            mainKeySource0.set(sourceBucket, QueryConstants.NULL_BYTE);
-            mainKeySource1.set(destBucket, k1);
-            mainKeySource1.set(sourceBucket, QueryConstants.NULL_FLOAT);
-            handler.doMoveMain(sourceBucket, destBucket);
-        }
-        return mainInsertLocation;
-    }
-
-    private boolean findOverflow(HashHandler handler, byte k0, float k1, int chunkPosition,
-            int overflowLocation) {
-        while (overflowLocation != QueryConstants.NULL_INT) {
-            if (eq(overflowKeySource0.getUnsafe(overflowLocation), k0) && eq(overflowKeySource1.getUnsafe(overflowLocation), k1)) {
-                handler.doOverflowFound(overflowLocation, chunkPosition);
-                return true;
-            }
-            overflowLocation = overflowOverflowLocationSource.getUnsafe(overflowLocation);
-        }
-        return false;
-    }
-
-    @Override
-    public int findPositionForKey(Object key) {
-        final Object [] ka = (Object[])key;
-        final byte k0 = TypeUtils.unbox((Byte)ka[0]);
-        final float k1 = TypeUtils.unbox((Float)ka[1]);
-        int hash = hash(k0, k1);
-        final int tableLocation = hashToTableLocation(tableHashPivot, hash);
-        final int positionValue = mainOutputPosition.getUnsafe(tableLocation);
-        if (positionValue == EMPTY_OUTPUT_POSITION) {
-            return -1;
-        }
-        if (eq(mainKeySource0.getUnsafe(tableLocation), k0) && eq(mainKeySource1.getUnsafe(tableLocation), k1)) {
-            return positionValue;
-        }
-        int overflowLocation = mainOverflowLocationSource.getUnsafe(tableLocation);
-        while (overflowLocation != QueryConstants.NULL_INT) {
-            if (eq(overflowKeySource0.getUnsafe(overflowLocation), k0) && eq(overflowKeySource1.getUnsafe(overflowLocation), k1)) {
-                return overflowOutputPosition.getUnsafe(overflowLocation);
-            }
-            overflowLocation = overflowOverflowLocationSource.getUnsafe(overflowLocation);
-        }
-        return -1;
-    }
-}
diff --git a/engine/table/src/main/java/io/deephaven/engine/table/impl/by/typed/staticagg/gen/StaticAggHasherByteInt.java b/engine/table/src/main/java/io/deephaven/engine/table/impl/by/typed/staticagg/gen/StaticAggHasherByteInt.java
deleted file mode 100644
index 25b96e2f9da..00000000000
--- a/engine/table/src/main/java/io/deephaven/engine/table/impl/by/typed/staticagg/gen/StaticAggHasherByteInt.java
+++ /dev/null
@@ -1,206 +0,0 @@
-//
-// Copyright (c) 2016-2024 Deephaven Data Labs and Patent Pending
-//
-// ****** AUTO-GENERATED CLASS - DO NOT EDIT MANUALLY
-// ****** Run ReplicateTypedHashers or ./gradlew replicateTypedHashers to regenerate
-//
-// @formatter:off
-package io.deephaven.engine.table.impl.by.typed.staticagg.gen;
-
-import static io.deephaven.util.compare.ByteComparisons.eq;
-import static io.deephaven.util.compare.IntComparisons.eq;
-
-import io.deephaven.chunk.ByteChunk;
-import io.deephaven.chunk.Chunk;
-import io.deephaven.chunk.IntChunk;
-import io.deephaven.chunk.attributes.Values;
-import io.deephaven.chunk.util.hashing.ByteChunkHasher;
-import io.deephaven.chunk.util.hashing.IntChunkHasher;
-import io.deephaven.engine.rowset.RowSequence;
-import io.deephaven.engine.table.ColumnSource;
-import io.deephaven.engine.table.impl.by.HashHandler;
-import io.deephaven.engine.table.impl.by.StaticChunkedOperatorAggregationStateManagerTypedBase;
-import io.deephaven.engine.table.impl.sources.ByteArraySource;
-import io.deephaven.engine.table.impl.sources.IntegerArraySource;
-import io.deephaven.util.QueryConstants;
-import io.deephaven.util.type.TypeUtils;
-import java.lang.Byte;
-import java.lang.Integer;
-import java.lang.Object;
-import java.lang.Override;
-
-final class StaticAggHasherByteInt extends StaticChunkedOperatorAggregationStateManagerTypedBase {
-    private final ByteArraySource mainKeySource0;
-
-    private final ByteArraySource overflowKeySource0;
-
-    private final IntegerArraySource mainKeySource1;
-
-    private final IntegerArraySource overflowKeySource1;
-
-    public StaticAggHasherByteInt(ColumnSource[] tableKeySources,
-            ColumnSource[] originalTableKeySources, int tableSize, double maximumLoadFactor,
-            double targetLoadFactor) {
-        super(tableKeySources, tableSize, maximumLoadFactor, targetLoadFactor);
-        this.mainKeySource0 = (ByteArraySource) super.mainKeySources[0];
-        this.overflowKeySource0 = (ByteArraySource) super.overflowKeySources[0];
-        this.mainKeySource1 = (IntegerArraySource) super.mainKeySources[1];
-        this.overflowKeySource1 = (IntegerArraySource) super.overflowKeySources[1];
-    }
-
-    @Override
-    protected void build(HashHandler handler, RowSequence rowSequence, Chunk[] sourceKeyChunks) {
-        final ByteChunk<Values> keyChunk0 = sourceKeyChunks[0].asByteChunk();
-        final IntChunk<Values> keyChunk1 = sourceKeyChunks[1].asIntChunk();
-        final int chunkSize = keyChunk0.size();
-        for (int chunkPosition = 0; chunkPosition < chunkSize; ++chunkPosition) {
-            final byte k0 = keyChunk0.get(chunkPosition);
-            final int k1 = keyChunk1.get(chunkPosition);
-            final int hash = hash(k0, k1);
-            final int tableLocation = hashToTableLocation(tableHashPivot, hash);
-            if (mainOutputPosition.getUnsafe(tableLocation) == EMPTY_OUTPUT_POSITION) {
-                numEntries++;
-                mainKeySource0.set(tableLocation, k0);
-                mainKeySource1.set(tableLocation, k1);
-                handler.doMainInsert(tableLocation, chunkPosition);
-            } else if (eq(mainKeySource0.getUnsafe(tableLocation), k0) && eq(mainKeySource1.getUnsafe(tableLocation), k1)) {
-                handler.doMainFound(tableLocation, chunkPosition);
-            } else {
-                int overflowLocation = mainOverflowLocationSource.getUnsafe(tableLocation);
-                if (!findOverflow(handler, k0, k1, chunkPosition, overflowLocation)) {
-                    final int newOverflowLocation = allocateOverflowLocation();
-                    overflowKeySource0.set(newOverflowLocation, k0);
-                    overflowKeySource1.set(newOverflowLocation, k1);
-                    mainOverflowLocationSource.set(tableLocation, newOverflowLocation);
-                    overflowOverflowLocationSource.set(newOverflowLocation, overflowLocation);
-                    numEntries++;
-                    handler.doOverflowInsert(newOverflowLocation, chunkPosition);
-                }
-            }
-        }
-    }
-
-    @Override
-    protected void probe(HashHandler handler, RowSequence rowSequence, Chunk[] sourceKeyChunks) {
-        final ByteChunk<Values> keyChunk0 = sourceKeyChunks[0].asByteChunk();
-        final IntChunk<Values> keyChunk1 = sourceKeyChunks[1].asIntChunk();
-        final int chunkSize = keyChunk0.size();
-        for (int chunkPosition = 0; chunkPosition < chunkSize; ++chunkPosition) {
-            final byte k0 = keyChunk0.get(chunkPosition);
-            final int k1 = keyChunk1.get(chunkPosition);
-            final int hash = hash(k0, k1);
-            final int tableLocation = hashToTableLocation(tableHashPivot, hash);
-            if (mainOutputPosition.getUnsafe(tableLocation) == EMPTY_OUTPUT_POSITION) {
-                handler.doMissing(chunkPosition);
-            } else if (eq(mainKeySource0.getUnsafe(tableLocation), k0) && eq(mainKeySource1.getUnsafe(tableLocation), k1)) {
-                handler.doMainFound(tableLocation, chunkPosition);
-            } else {
-                int overflowLocation = mainOverflowLocationSource.getUnsafe(tableLocation);
-                if (!findOverflow(handler, k0, k1, chunkPosition, overflowLocation)) {
-                    handler.doMissing(chunkPosition);
-                }
-            }
-        }
-    }
-
-    private static int hash(byte k0, int k1) {
-        int hash = ByteChunkHasher.hashInitialSingle(k0);
-        hash = IntChunkHasher.hashUpdateSingle(hash, k1);
-        return hash;
-    }
-
-    @Override
-    protected void rehashBucket(HashHandler handler, int sourceBucket, int destBucket,
-            int bucketsToAdd) {
-        final int position = mainOutputPosition.getUnsafe(sourceBucket);
-        if (position == EMPTY_OUTPUT_POSITION) {
-            return;
-        }
-        int mainInsertLocation = maybeMoveMainBucket(handler, sourceBucket, destBucket, bucketsToAdd);
-        int overflowLocation = mainOverflowLocationSource.getUnsafe(sourceBucket);
-        mainOverflowLocationSource.set(sourceBucket, QueryConstants.NULL_INT);
-        mainOverflowLocationSource.set(destBucket, QueryConstants.NULL_INT);
-        while (overflowLocation != QueryConstants.NULL_INT) {
-            final int nextOverflowLocation = overflowOverflowLocationSource.getUnsafe(overflowLocation);
-            final byte overflowKey0 = overflowKeySource0.getUnsafe(overflowLocation);
-            final int overflowKey1 = overflowKeySource1.getUnsafe(overflowLocation);
-            final int overflowHash = hash(overflowKey0, overflowKey1);
-            final int overflowTableLocation = hashToTableLocation(tableHashPivot + bucketsToAdd, overflowHash);
-            if (overflowTableLocation == mainInsertLocation) {
-                mainKeySource0.set(mainInsertLocation, overflowKey0);
-                mainKeySource1.set(mainInsertLocation, overflowKey1);
-                mainOutputPosition.set(mainInsertLocation, overflowOutputPosition.getUnsafe(overflowLocation));
-                handler.doPromoteOverflow(overflowLocation, mainInsertLocation);
-                overflowOutputPosition.set(overflowLocation, QueryConstants.NULL_INT);
-                overflowKeySource0.set(overflowLocation, QueryConstants.NULL_BYTE);
-                overflowKeySource1.set(overflowLocation, QueryConstants.NULL_INT);
-                freeOverflowLocation(overflowLocation);
-                mainInsertLocation = -1;
-            } else {
-                final int oldOverflowLocation = mainOverflowLocationSource.getUnsafe(overflowTableLocation);
-                mainOverflowLocationSource.set(overflowTableLocation, overflowLocation);
-                overflowOverflowLocationSource.set(overflowLocation, oldOverflowLocation);
-            }
-            overflowLocation = nextOverflowLocation;
-        }
-    }
-
-    private int maybeMoveMainBucket(HashHandler handler, int sourceBucket, int destBucket,
-            int bucketsToAdd) {
-        final byte k0 = mainKeySource0.getUnsafe(sourceBucket);
-        final int k1 = mainKeySource1.getUnsafe(sourceBucket);
-        final int hash = hash(k0, k1);
-        final int location = hashToTableLocation(tableHashPivot + bucketsToAdd, hash);
-        final int mainInsertLocation;
-        if (location == sourceBucket) {
-            mainInsertLocation = destBucket;
-            mainOutputPosition.set(destBucket, EMPTY_OUTPUT_POSITION);
-        } else {
-            mainInsertLocation = sourceBucket;
-            mainOutputPosition.set(destBucket, mainOutputPosition.getUnsafe(sourceBucket));
-            mainOutputPosition.set(sourceBucket, EMPTY_OUTPUT_POSITION);
-            mainKeySource0.set(destBucket, k0);
-            mainKeySource0.set(sourceBucket, QueryConstants.NULL_BYTE);
-            mainKeySource1.set(destBucket, k1);
-            mainKeySource1.set(sourceBucket, QueryConstants.NULL_INT);
-            handler.doMoveMain(sourceBucket, destBucket);
-        }
-        return mainInsertLocation;
-    }
-
-    private boolean findOverflow(HashHandler handler, byte k0, int k1, int chunkPosition,
-            int overflowLocation) {
-        while (overflowLocation != QueryConstants.NULL_INT) {
-            if (eq(overflowKeySource0.getUnsafe(overflowLocation), k0) && eq(overflowKeySource1.getUnsafe(overflowLocation), k1)) {
-                handler.doOverflowFound(overflowLocation, chunkPosition);
-                return true;
-            }
-            overflowLocation = overflowOverflowLocationSource.getUnsafe(overflowLocation);
-        }
-        return false;
-    }
-
-    @Override
-    public int findPositionForKey(Object key) {
-        final Object [] ka = (Object[])key;
-        final byte k0 = TypeUtils.unbox((Byte)ka[0]);
-        final int k1 = TypeUtils.unbox((Integer)ka[1]);
-        int hash = hash(k0, k1);
-        final int tableLocation = hashToTableLocation(tableHashPivot, hash);
-        final int positionValue = mainOutputPosition.getUnsafe(tableLocation);
-        if (positionValue == EMPTY_OUTPUT_POSITION) {
-            return -1;
-        }
-        if (eq(mainKeySource0.getUnsafe(tableLocation), k0) && eq(mainKeySource1.getUnsafe(tableLocation), k1)) {
-            return positionValue;
-        }
-        int overflowLocation = mainOverflowLocationSource.getUnsafe(tableLocation);
-        while (overflowLocation != QueryConstants.NULL_INT) {
-            if (eq(overflowKeySource0.getUnsafe(overflowLocation), k0) && eq(overflowKeySource1.getUnsafe(overflowLocation), k1)) {
-                return overflowOutputPosition.getUnsafe(overflowLocation);
-            }
-            overflowLocation = overflowOverflowLocationSource.getUnsafe(overflowLocation);
-        }
-        return -1;
-    }
-}
diff --git a/engine/table/src/main/java/io/deephaven/engine/table/impl/by/typed/staticagg/gen/StaticAggHasherByteLong.java b/engine/table/src/main/java/io/deephaven/engine/table/impl/by/typed/staticagg/gen/StaticAggHasherByteLong.java
deleted file mode 100644
index 7eda5602deb..00000000000
--- a/engine/table/src/main/java/io/deephaven/engine/table/impl/by/typed/staticagg/gen/StaticAggHasherByteLong.java
+++ /dev/null
@@ -1,206 +0,0 @@
-//
-// Copyright (c) 2016-2024 Deephaven Data Labs and Patent Pending
-//
-// ****** AUTO-GENERATED CLASS - DO NOT EDIT MANUALLY
-// ****** Run ReplicateTypedHashers or ./gradlew replicateTypedHashers to regenerate
-//
-// @formatter:off
-package io.deephaven.engine.table.impl.by.typed.staticagg.gen;
-
-import static io.deephaven.util.compare.ByteComparisons.eq;
-import static io.deephaven.util.compare.LongComparisons.eq;
-
-import io.deephaven.chunk.ByteChunk;
-import io.deephaven.chunk.Chunk;
-import io.deephaven.chunk.LongChunk;
-import io.deephaven.chunk.attributes.Values;
-import io.deephaven.chunk.util.hashing.ByteChunkHasher;
-import io.deephaven.chunk.util.hashing.LongChunkHasher;
-import io.deephaven.engine.rowset.RowSequence;
-import io.deephaven.engine.table.ColumnSource;
-import io.deephaven.engine.table.impl.by.HashHandler;
-import io.deephaven.engine.table.impl.by.StaticChunkedOperatorAggregationStateManagerTypedBase;
-import io.deephaven.engine.table.impl.sources.ByteArraySource;
-import io.deephaven.engine.table.impl.sources.LongArraySource;
-import io.deephaven.util.QueryConstants;
-import io.deephaven.util.type.TypeUtils;
-import java.lang.Byte;
-import java.lang.Long;
-import java.lang.Object;
-import java.lang.Override;
-
-final class StaticAggHasherByteLong extends StaticChunkedOperatorAggregationStateManagerTypedBase {
-    private final ByteArraySource mainKeySource0;
-
-    private final ByteArraySource overflowKeySource0;
-
-    private final LongArraySource mainKeySource1;
-
-    private final LongArraySource overflowKeySource1;
-
-    public StaticAggHasherByteLong(ColumnSource[] tableKeySources,
-            ColumnSource[] originalTableKeySources, int tableSize, double maximumLoadFactor,
-            double targetLoadFactor) {
-        super(tableKeySources, tableSize, maximumLoadFactor, targetLoadFactor);
-        this.mainKeySource0 = (ByteArraySource) super.mainKeySources[0];
-        this.overflowKeySource0 = (ByteArraySource) super.overflowKeySources[0];
-        this.mainKeySource1 = (LongArraySource) super.mainKeySources[1];
-        this.overflowKeySource1 = (LongArraySource) super.overflowKeySources[1];
-    }
-
-    @Override
-    protected void build(HashHandler handler, RowSequence rowSequence, Chunk[] sourceKeyChunks) {
-        final ByteChunk<Values> keyChunk0 = sourceKeyChunks[0].asByteChunk();
-        final LongChunk<Values> keyChunk1 = sourceKeyChunks[1].asLongChunk();
-        final int chunkSize = keyChunk0.size();
-        for (int chunkPosition = 0; chunkPosition < chunkSize; ++chunkPosition) {
-            final byte k0 = keyChunk0.get(chunkPosition);
-            final long k1 = keyChunk1.get(chunkPosition);
-            final int hash = hash(k0, k1);
-            final int tableLocation = hashToTableLocation(tableHashPivot, hash);
-            if (mainOutputPosition.getUnsafe(tableLocation) == EMPTY_OUTPUT_POSITION) {
-                numEntries++;
-                mainKeySource0.set(tableLocation, k0);
-                mainKeySource1.set(tableLocation, k1);
-                handler.doMainInsert(tableLocation, chunkPosition);
-            } else if (eq(mainKeySource0.getUnsafe(tableLocation), k0) && eq(mainKeySource1.getUnsafe(tableLocation), k1)) {
-                handler.doMainFound(tableLocation, chunkPosition);
-            } else {
-                int overflowLocation = mainOverflowLocationSource.getUnsafe(tableLocation);
-                if (!findOverflow(handler, k0, k1, chunkPosition, overflowLocation)) {
-                    final int newOverflowLocation = allocateOverflowLocation();
-                    overflowKeySource0.set(newOverflowLocation, k0);
-                    overflowKeySource1.set(newOverflowLocation, k1);
-                    mainOverflowLocationSource.set(tableLocation, newOverflowLocation);
-                    overflowOverflowLocationSource.set(newOverflowLocation, overflowLocation);
-                    numEntries++;
-                    handler.doOverflowInsert(newOverflowLocation, chunkPosition);
-                }
-            }
-        }
-    }
-
-    @Override
-    protected void probe(HashHandler handler, RowSequence rowSequence, Chunk[] sourceKeyChunks) {
-        final ByteChunk<Values> keyChunk0 = sourceKeyChunks[0].asByteChunk();
-        final LongChunk<Values> keyChunk1 = sourceKeyChunks[1].asLongChunk();
-        final int chunkSize = keyChunk0.size();
-        for (int chunkPosition = 0; chunkPosition < chunkSize; ++chunkPosition) {
-            final byte k0 = keyChunk0.get(chunkPosition);
-            final long k1 = keyChunk1.get(chunkPosition);
-            final int hash = hash(k0, k1);
-            final int tableLocation = hashToTableLocation(tableHashPivot, hash);
-            if (mainOutputPosition.getUnsafe(tableLocation) == EMPTY_OUTPUT_POSITION) {
-                handler.doMissing(chunkPosition);
-            } else if (eq(mainKeySource0.getUnsafe(tableLocation), k0) && eq(mainKeySource1.getUnsafe(tableLocation), k1)) {
-                handler.doMainFound(tableLocation, chunkPosition);
-            } else {
-                int overflowLocation = mainOverflowLocationSource.getUnsafe(tableLocation);
-                if (!findOverflow(handler, k0, k1, chunkPosition, overflowLocation)) {
-                    handler.doMissing(chunkPosition);
-                }
-            }
-        }
-    }
-
-    private static int hash(byte k0, long k1) {
-        int hash = ByteChunkHasher.hashInitialSingle(k0);
-        hash = LongChunkHasher.hashUpdateSingle(hash, k1);
-        return hash;
-    }
-
-    @Override
-    protected void rehashBucket(HashHandler handler, int sourceBucket, int destBucket,
-            int bucketsToAdd) {
-        final int position = mainOutputPosition.getUnsafe(sourceBucket);
-        if (position == EMPTY_OUTPUT_POSITION) {
-            return;
-        }
-        int mainInsertLocation = maybeMoveMainBucket(handler, sourceBucket, destBucket, bucketsToAdd);
-        int overflowLocation = mainOverflowLocationSource.getUnsafe(sourceBucket);
-        mainOverflowLocationSource.set(sourceBucket, QueryConstants.NULL_INT);
-        mainOverflowLocationSource.set(destBucket, QueryConstants.NULL_INT);
-        while (overflowLocation != QueryConstants.NULL_INT) {
-            final int nextOverflowLocation = overflowOverflowLocationSource.getUnsafe(overflowLocation);
-            final byte overflowKey0 = overflowKeySource0.getUnsafe(overflowLocation);
-            final long overflowKey1 = overflowKeySource1.getUnsafe(overflowLocation);
-            final int overflowHash = hash(overflowKey0, overflowKey1);
-            final int overflowTableLocation = hashToTableLocation(tableHashPivot + bucketsToAdd, overflowHash);
-            if (overflowTableLocation == mainInsertLocation) {
-                mainKeySource0.set(mainInsertLocation, overflowKey0);
-                mainKeySource1.set(mainInsertLocation, overflowKey1);
-                mainOutputPosition.set(mainInsertLocation, overflowOutputPosition.getUnsafe(overflowLocation));
-                handler.doPromoteOverflow(overflowLocation, mainInsertLocation);
-                overflowOutputPosition.set(overflowLocation, QueryConstants.NULL_INT);
-                overflowKeySource0.set(overflowLocation, QueryConstants.NULL_BYTE);
-                overflowKeySource1.set(overflowLocation, QueryConstants.NULL_LONG);
-                freeOverflowLocation(overflowLocation);
-                mainInsertLocation = -1;
-            } else {
-                final int oldOverflowLocation = mainOverflowLocationSource.getUnsafe(overflowTableLocation);
-                mainOverflowLocationSource.set(overflowTableLocation, overflowLocation);
-                overflowOverflowLocationSource.set(overflowLocation, oldOverflowLocation);
-            }
-            overflowLocation = nextOverflowLocation;
-        }
-    }
-
-    private int maybeMoveMainBucket(HashHandler handler, int sourceBucket, int destBucket,
-            int bucketsToAdd) {
-        final byte k0 = mainKeySource0.getUnsafe(sourceBucket);
-        final long k1 = mainKeySource1.getUnsafe(sourceBucket);
-        final int hash = hash(k0, k1);
-        final int location = hashToTableLocation(tableHashPivot + bucketsToAdd, hash);
-        final int mainInsertLocation;
-        if (location == sourceBucket) {
-            mainInsertLocation = destBucket;
-            mainOutputPosition.set(destBucket, EMPTY_OUTPUT_POSITION);
-        } else {
-            mainInsertLocation = sourceBucket;
-            mainOutputPosition.set(destBucket, mainOutputPosition.getUnsafe(sourceBucket));
-            mainOutputPosition.set(sourceBucket, EMPTY_OUTPUT_POSITION);
-            mainKeySource0.set(destBucket, k0);
-            mainKeySource0.set(sourceBucket, QueryConstants.NULL_BYTE);
-            mainKeySource1.set(destBucket, k1);
-            mainKeySource1.set(sourceBucket, QueryConstants.NULL_LONG);
-            handler.doMoveMain(sourceBucket, destBucket);
-        }
-        return mainInsertLocation;
-    }
-
-    private boolean findOverflow(HashHandler handler, byte k0, long k1, int chunkPosition,
-            int overflowLocation) {
-        while (overflowLocation != QueryConstants.NULL_INT) {
-            if (eq(overflowKeySource0.getUnsafe(overflowLocation), k0) && eq(overflowKeySource1.getUnsafe(overflowLocation), k1)) {
-                handler.doOverflowFound(overflowLocation, chunkPosition);
-                return true;
-            }
-            overflowLocation = overflowOverflowLocationSource.getUnsafe(overflowLocation);
-        }
-        return false;
-    }
-
-    @Override
-    public int findPositionForKey(Object key) {
-        final Object [] ka = (Object[])key;
-        final byte k0 = TypeUtils.unbox((Byte)ka[0]);
-        final long k1 = TypeUtils.unbox((Long)ka[1]);
-        int hash = hash(k0, k1);
-        final int tableLocation = hashToTableLocation(tableHashPivot, hash);
-        final int positionValue = mainOutputPosition.getUnsafe(tableLocation);
-        if (positionValue == EMPTY_OUTPUT_POSITION) {
-            return -1;
-        }
-        if (eq(mainKeySource0.getUnsafe(tableLocation), k0) && eq(mainKeySource1.getUnsafe(tableLocation), k1)) {
-            return positionValue;
-        }
-        int overflowLocation = mainOverflowLocationSource.getUnsafe(tableLocation);
-        while (overflowLocation != QueryConstants.NULL_INT) {
-            if (eq(overflowKeySource0.getUnsafe(overflowLocation), k0) && eq(overflowKeySource1.getUnsafe(overflowLocation), k1)) {
-                return overflowOutputPosition.getUnsafe(overflowLocation);
-            }
-            overflowLocation = overflowOverflowLocationSource.getUnsafe(overflowLocation);
-        }
-        return -1;
-    }
-}
diff --git a/engine/table/src/main/java/io/deephaven/engine/table/impl/by/typed/staticagg/gen/StaticAggHasherByteObject.java b/engine/table/src/main/java/io/deephaven/engine/table/impl/by/typed/staticagg/gen/StaticAggHasherByteObject.java
deleted file mode 100644
index 9cbf6909a14..00000000000
--- a/engine/table/src/main/java/io/deephaven/engine/table/impl/by/typed/staticagg/gen/StaticAggHasherByteObject.java
+++ /dev/null
@@ -1,205 +0,0 @@
-//
-// Copyright (c) 2016-2024 Deephaven Data Labs and Patent Pending
-//
-// ****** AUTO-GENERATED CLASS - DO NOT EDIT MANUALLY
-// ****** Run ReplicateTypedHashers or ./gradlew replicateTypedHashers to regenerate
-//
-// @formatter:off
-package io.deephaven.engine.table.impl.by.typed.staticagg.gen;
-
-import static io.deephaven.util.compare.ByteComparisons.eq;
-import static io.deephaven.util.compare.ObjectComparisons.eq;
-
-import io.deephaven.chunk.ByteChunk;
-import io.deephaven.chunk.Chunk;
-import io.deephaven.chunk.ObjectChunk;
-import io.deephaven.chunk.attributes.Values;
-import io.deephaven.chunk.util.hashing.ByteChunkHasher;
-import io.deephaven.chunk.util.hashing.ObjectChunkHasher;
-import io.deephaven.engine.rowset.RowSequence;
-import io.deephaven.engine.table.ColumnSource;
-import io.deephaven.engine.table.impl.by.HashHandler;
-import io.deephaven.engine.table.impl.by.StaticChunkedOperatorAggregationStateManagerTypedBase;
-import io.deephaven.engine.table.impl.sources.ByteArraySource;
-import io.deephaven.engine.table.impl.sources.ObjectArraySource;
-import io.deephaven.util.QueryConstants;
-import io.deephaven.util.type.TypeUtils;
-import java.lang.Byte;
-import java.lang.Object;
-import java.lang.Override;
-
-final class StaticAggHasherByteObject extends StaticChunkedOperatorAggregationStateManagerTypedBase {
-    private final ByteArraySource mainKeySource0;
-
-    private final ByteArraySource overflowKeySource0;
-
-    private final ObjectArraySource mainKeySource1;
-
-    private final ObjectArraySource overflowKeySource1;
-
-    public StaticAggHasherByteObject(ColumnSource[] tableKeySources,
-            ColumnSource[] originalTableKeySources, int tableSize, double maximumLoadFactor,
-            double targetLoadFactor) {
-        super(tableKeySources, tableSize, maximumLoadFactor, targetLoadFactor);
-        this.mainKeySource0 = (ByteArraySource) super.mainKeySources[0];
-        this.overflowKeySource0 = (ByteArraySource) super.overflowKeySources[0];
-        this.mainKeySource1 = (ObjectArraySource) super.mainKeySources[1];
-        this.overflowKeySource1 = (ObjectArraySource) super.overflowKeySources[1];
-    }
-
-    @Override
-    protected void build(HashHandler handler, RowSequence rowSequence, Chunk[] sourceKeyChunks) {
-        final ByteChunk<Values> keyChunk0 = sourceKeyChunks[0].asByteChunk();
-        final ObjectChunk<Object, Values> keyChunk1 = sourceKeyChunks[1].asObjectChunk();
-        final int chunkSize = keyChunk0.size();
-        for (int chunkPosition = 0; chunkPosition < chunkSize; ++chunkPosition) {
-            final byte k0 = keyChunk0.get(chunkPosition);
-            final Object k1 = keyChunk1.get(chunkPosition);
-            final int hash = hash(k0, k1);
-            final int tableLocation = hashToTableLocation(tableHashPivot, hash);
-            if (mainOutputPosition.getUnsafe(tableLocation) == EMPTY_OUTPUT_POSITION) {
-                numEntries++;
-                mainKeySource0.set(tableLocation, k0);
-                mainKeySource1.set(tableLocation, k1);
-                handler.doMainInsert(tableLocation, chunkPosition);
-            } else if (eq(mainKeySource0.getUnsafe(tableLocation), k0) && eq(mainKeySource1.getUnsafe(tableLocation), k1)) {
-                handler.doMainFound(tableLocation, chunkPosition);
-            } else {
-                int overflowLocation = mainOverflowLocationSource.getUnsafe(tableLocation);
-                if (!findOverflow(handler, k0, k1, chunkPosition, overflowLocation)) {
-                    final int newOverflowLocation = allocateOverflowLocation();
-                    overflowKeySource0.set(newOverflowLocation, k0);
-                    overflowKeySource1.set(newOverflowLocation, k1);
-                    mainOverflowLocationSource.set(tableLocation, newOverflowLocation);
-                    overflowOverflowLocationSource.set(newOverflowLocation, overflowLocation);
-                    numEntries++;
-                    handler.doOverflowInsert(newOverflowLocation, chunkPosition);
-                }
-            }
-        }
-    }
-
-    @Override
-    protected void probe(HashHandler handler, RowSequence rowSequence, Chunk[] sourceKeyChunks) {
-        final ByteChunk<Values> keyChunk0 = sourceKeyChunks[0].asByteChunk();
-        final ObjectChunk<Object, Values> keyChunk1 = sourceKeyChunks[1].asObjectChunk();
-        final int chunkSize = keyChunk0.size();
-        for (int chunkPosition = 0; chunkPosition < chunkSize; ++chunkPosition) {
-            final byte k0 = keyChunk0.get(chunkPosition);
-            final Object k1 = keyChunk1.get(chunkPosition);
-            final int hash = hash(k0, k1);
-            final int tableLocation = hashToTableLocation(tableHashPivot, hash);
-            if (mainOutputPosition.getUnsafe(tableLocation) == EMPTY_OUTPUT_POSITION) {
-                handler.doMissing(chunkPosition);
-            } else if (eq(mainKeySource0.getUnsafe(tableLocation), k0) && eq(mainKeySource1.getUnsafe(tableLocation), k1)) {
-                handler.doMainFound(tableLocation, chunkPosition);
-            } else {
-                int overflowLocation = mainOverflowLocationSource.getUnsafe(tableLocation);
-                if (!findOverflow(handler, k0, k1, chunkPosition, overflowLocation)) {
-                    handler.doMissing(chunkPosition);
-                }
-            }
-        }
-    }
-
-    private static int hash(byte k0, Object k1) {
-        int hash = ByteChunkHasher.hashInitialSingle(k0);
-        hash = ObjectChunkHasher.hashUpdateSingle(hash, k1);
-        return hash;
-    }
-
-    @Override
-    protected void rehashBucket(HashHandler handler, int sourceBucket, int destBucket,
-            int bucketsToAdd) {
-        final int position = mainOutputPosition.getUnsafe(sourceBucket);
-        if (position == EMPTY_OUTPUT_POSITION) {
-            return;
-        }
-        int mainInsertLocation = maybeMoveMainBucket(handler, sourceBucket, destBucket, bucketsToAdd);
-        int overflowLocation = mainOverflowLocationSource.getUnsafe(sourceBucket);
-        mainOverflowLocationSource.set(sourceBucket, QueryConstants.NULL_INT);
-        mainOverflowLocationSource.set(destBucket, QueryConstants.NULL_INT);
-        while (overflowLocation != QueryConstants.NULL_INT) {
-            final int nextOverflowLocation = overflowOverflowLocationSource.getUnsafe(overflowLocation);
-            final byte overflowKey0 = overflowKeySource0.getUnsafe(overflowLocation);
-            final Object overflowKey1 = overflowKeySource1.getUnsafe(overflowLocation);
-            final int overflowHash = hash(overflowKey0, overflowKey1);
-            final int overflowTableLocation = hashToTableLocation(tableHashPivot + bucketsToAdd, overflowHash);
-            if (overflowTableLocation == mainInsertLocation) {
-                mainKeySource0.set(mainInsertLocation, overflowKey0);
-                mainKeySource1.set(mainInsertLocation, overflowKey1);
-                mainOutputPosition.set(mainInsertLocation, overflowOutputPosition.getUnsafe(overflowLocation));
-                handler.doPromoteOverflow(overflowLocation, mainInsertLocation);
-                overflowOutputPosition.set(overflowLocation, QueryConstants.NULL_INT);
-                overflowKeySource0.set(overflowLocation, QueryConstants.NULL_BYTE);
-                overflowKeySource1.set(overflowLocation, null);
-                freeOverflowLocation(overflowLocation);
-                mainInsertLocation = -1;
-            } else {
-                final int oldOverflowLocation = mainOverflowLocationSource.getUnsafe(overflowTableLocation);
-                mainOverflowLocationSource.set(overflowTableLocation, overflowLocation);
-                overflowOverflowLocationSource.set(overflowLocation, oldOverflowLocation);
-            }
-            overflowLocation = nextOverflowLocation;
-        }
-    }
-
-    private int maybeMoveMainBucket(HashHandler handler, int sourceBucket, int destBucket,
-            int bucketsToAdd) {
-        final byte k0 = mainKeySource0.getUnsafe(sourceBucket);
-        final Object k1 = mainKeySource1.getUnsafe(sourceBucket);
-        final int hash = hash(k0, k1);
-        final int location = hashToTableLocation(tableHashPivot + bucketsToAdd, hash);
-        final int mainInsertLocation;
-        if (location == sourceBucket) {
-            mainInsertLocation = destBucket;
-            mainOutputPosition.set(destBucket, EMPTY_OUTPUT_POSITION);
-        } else {
-            mainInsertLocation = sourceBucket;
-            mainOutputPosition.set(destBucket, mainOutputPosition.getUnsafe(sourceBucket));
-            mainOutputPosition.set(sourceBucket, EMPTY_OUTPUT_POSITION);
-            mainKeySource0.set(destBucket, k0);
-            mainKeySource0.set(sourceBucket, QueryConstants.NULL_BYTE);
-            mainKeySource1.set(destBucket, k1);
-            mainKeySource1.set(sourceBucket, null);
-            handler.doMoveMain(sourceBucket, destBucket);
-        }
-        return mainInsertLocation;
-    }
-
-    private boolean findOverflow(HashHandler handler, byte k0, Object k1, int chunkPosition,
-            int overflowLocation) {
-        while (overflowLocation != QueryConstants.NULL_INT) {
-            if (eq(overflowKeySource0.getUnsafe(overflowLocation), k0) && eq(overflowKeySource1.getUnsafe(overflowLocation), k1)) {
-                handler.doOverflowFound(overflowLocation, chunkPosition);
-                return true;
-            }
-            overflowLocation = overflowOverflowLocationSource.getUnsafe(overflowLocation);
-        }
-        return false;
-    }
-
-    @Override
-    public int findPositionForKey(Object key) {
-        final Object [] ka = (Object[])key;
-        final byte k0 = TypeUtils.unbox((Byte)ka[0]);
-        final Object k1 = ka[1];
-        int hash = hash(k0, k1);
-        final int tableLocation = hashToTableLocation(tableHashPivot, hash);
-        final int positionValue = mainOutputPosition.getUnsafe(tableLocation);
-        if (positionValue == EMPTY_OUTPUT_POSITION) {
-            return -1;
-        }
-        if (eq(mainKeySource0.getUnsafe(tableLocation), k0) && eq(mainKeySource1.getUnsafe(tableLocation), k1)) {
-            return positionValue;
-        }
-        int overflowLocation = mainOverflowLocationSource.getUnsafe(tableLocation);
-        while (overflowLocation != QueryConstants.NULL_INT) {
-            if (eq(overflowKeySource0.getUnsafe(overflowLocation), k0) && eq(overflowKeySource1.getUnsafe(overflowLocation), k1)) {
-                return overflowOutputPosition.getUnsafe(overflowLocation);
-            }
-            overflowLocation = overflowOverflowLocationSource.getUnsafe(overflowLocation);
-        }
-        return -1;
-    }
-}
diff --git a/engine/table/src/main/java/io/deephaven/engine/table/impl/by/typed/staticagg/gen/StaticAggHasherByteShort.java b/engine/table/src/main/java/io/deephaven/engine/table/impl/by/typed/staticagg/gen/StaticAggHasherByteShort.java
deleted file mode 100644
index 628ea08d34f..00000000000
--- a/engine/table/src/main/java/io/deephaven/engine/table/impl/by/typed/staticagg/gen/StaticAggHasherByteShort.java
+++ /dev/null
@@ -1,206 +0,0 @@
-//
-// Copyright (c) 2016-2024 Deephaven Data Labs and Patent Pending
-//
-// ****** AUTO-GENERATED CLASS - DO NOT EDIT MANUALLY
-// ****** Run ReplicateTypedHashers or ./gradlew replicateTypedHashers to regenerate
-//
-// @formatter:off
-package io.deephaven.engine.table.impl.by.typed.staticagg.gen;
-
-import static io.deephaven.util.compare.ByteComparisons.eq;
-import static io.deephaven.util.compare.ShortComparisons.eq;
-
-import io.deephaven.chunk.ByteChunk;
-import io.deephaven.chunk.Chunk;
-import io.deephaven.chunk.ShortChunk;
-import io.deephaven.chunk.attributes.Values;
-import io.deephaven.chunk.util.hashing.ByteChunkHasher;
-import io.deephaven.chunk.util.hashing.ShortChunkHasher;
-import io.deephaven.engine.rowset.RowSequence;
-import io.deephaven.engine.table.ColumnSource;
-import io.deephaven.engine.table.impl.by.HashHandler;
-import io.deephaven.engine.table.impl.by.StaticChunkedOperatorAggregationStateManagerTypedBase;
-import io.deephaven.engine.table.impl.sources.ByteArraySource;
-import io.deephaven.engine.table.impl.sources.ShortArraySource;
-import io.deephaven.util.QueryConstants;
-import io.deephaven.util.type.TypeUtils;
-import java.lang.Byte;
-import java.lang.Object;
-import java.lang.Override;
-import java.lang.Short;
-
-final class StaticAggHasherByteShort extends StaticChunkedOperatorAggregationStateManagerTypedBase {
-    private final ByteArraySource mainKeySource0;
-
-    private final ByteArraySource overflowKeySource0;
-
-    private final ShortArraySource mainKeySource1;
-
-    private final ShortArraySource overflowKeySource1;
-
-    public StaticAggHasherByteShort(ColumnSource[] tableKeySources,
-            ColumnSource[] originalTableKeySources, int tableSize, double maximumLoadFactor,
-            double targetLoadFactor) {
-        super(tableKeySources, tableSize, maximumLoadFactor, targetLoadFactor);
-        this.mainKeySource0 = (ByteArraySource) super.mainKeySources[0];
-        this.overflowKeySource0 = (ByteArraySource) super.overflowKeySources[0];
-        this.mainKeySource1 = (ShortArraySource) super.mainKeySources[1];
-        this.overflowKeySource1 = (ShortArraySource) super.overflowKeySources[1];
-    }
-
-    @Override
-    protected void build(HashHandler handler, RowSequence rowSequence, Chunk[] sourceKeyChunks) {
-        final ByteChunk<Values> keyChunk0 = sourceKeyChunks[0].asByteChunk();
-        final ShortChunk<Values> keyChunk1 = sourceKeyChunks[1].asShortChunk();
-        final int chunkSize = keyChunk0.size();
-        for (int chunkPosition = 0; chunkPosition < chunkSize; ++chunkPosition) {
-            final byte k0 = keyChunk0.get(chunkPosition);
-            final short k1 = keyChunk1.get(chunkPosition);
-            final int hash = hash(k0, k1);
-            final int tableLocation = hashToTableLocation(tableHashPivot, hash);
-            if (mainOutputPosition.getUnsafe(tableLocation) == EMPTY_OUTPUT_POSITION) {
-                numEntries++;
-                mainKeySource0.set(tableLocation, k0);
-                mainKeySource1.set(tableLocation, k1);
-                handler.doMainInsert(tableLocation, chunkPosition);
-            } else if (eq(mainKeySource0.getUnsafe(tableLocation), k0) && eq(mainKeySource1.getUnsafe(tableLocation), k1)) {
-                handler.doMainFound(tableLocation, chunkPosition);
-            } else {
-                int overflowLocation = mainOverflowLocationSource.getUnsafe(tableLocation);
-                if (!findOverflow(handler, k0, k1, chunkPosition, overflowLocation)) {
-                    final int newOverflowLocation = allocateOverflowLocation();
-                    overflowKeySource0.set(newOverflowLocation, k0);
-                    overflowKeySource1.set(newOverflowLocation, k1);
-                    mainOverflowLocationSource.set(tableLocation, newOverflowLocation);
-                    overflowOverflowLocationSource.set(newOverflowLocation, overflowLocation);
-                    numEntries++;
-                    handler.doOverflowInsert(newOverflowLocation, chunkPosition);
-                }
-            }
-        }
-    }
-
-    @Override
-    protected void probe(HashHandler handler, RowSequence rowSequence, Chunk[] sourceKeyChunks) {
-        final ByteChunk<Values> keyChunk0 = sourceKeyChunks[0].asByteChunk();
-        final ShortChunk<Values> keyChunk1 = sourceKeyChunks[1].asShortChunk();
-        final int chunkSize = keyChunk0.size();
-        for (int chunkPosition = 0; chunkPosition < chunkSize; ++chunkPosition) {
-            final byte k0 = keyChunk0.get(chunkPosition);
-            final short k1 = keyChunk1.get(chunkPosition);
-            final int hash = hash(k0, k1);
-            final int tableLocation = hashToTableLocation(tableHashPivot, hash);
-            if (mainOutputPosition.getUnsafe(tableLocation) == EMPTY_OUTPUT_POSITION) {
-                handler.doMissing(chunkPosition);
-            } else if (eq(mainKeySource0.getUnsafe(tableLocation), k0) && eq(mainKeySource1.getUnsafe(tableLocation), k1)) {
-                handler.doMainFound(tableLocation, chunkPosition);
-            } else {
-                int overflowLocation = mainOverflowLocationSource.getUnsafe(tableLocation);
-                if (!findOverflow(handler, k0, k1, chunkPosition, overflowLocation)) {
-                    handler.doMissing(chunkPosition);
-                }
-            }
-        }
-    }
-
-    private static int hash(byte k0, short k1) {
-        int hash = ByteChunkHasher.hashInitialSingle(k0);
-        hash = ShortChunkHasher.hashUpdateSingle(hash, k1);
-        return hash;
-    }
-
-    @Override
-    protected void rehashBucket(HashHandler handler, int sourceBucket, int destBucket,
-            int bucketsToAdd) {
-        final int position = mainOutputPosition.getUnsafe(sourceBucket);
-        if (position == EMPTY_OUTPUT_POSITION) {
-            return;
-        }
-        int mainInsertLocation = maybeMoveMainBucket(handler, sourceBucket, destBucket, bucketsToAdd);
-        int overflowLocation = mainOverflowLocationSource.getUnsafe(sourceBucket);
-        mainOverflowLocationSource.set(sourceBucket, QueryConstants.NULL_INT);
-        mainOverflowLocationSource.set(destBucket, QueryConstants.NULL_INT);
-        while (overflowLocation != QueryConstants.NULL_INT) {
-            final int nextOverflowLocation = overflowOverflowLocationSource.getUnsafe(overflowLocation);
-            final byte overflowKey0 = overflowKeySource0.getUnsafe(overflowLocation);
-            final short overflowKey1 = overflowKeySource1.getUnsafe(overflowLocation);
-            final int overflowHash = hash(overflowKey0, overflowKey1);
-            final int overflowTableLocation = hashToTableLocation(tableHashPivot + bucketsToAdd, overflowHash);
-            if (overflowTableLocation == mainInsertLocation) {
-                mainKeySource0.set(mainInsertLocation, overflowKey0);
-                mainKeySource1.set(mainInsertLocation, overflowKey1);
-                mainOutputPosition.set(mainInsertLocation, overflowOutputPosition.getUnsafe(overflowLocation));
-                handler.doPromoteOverflow(overflowLocation, mainInsertLocation);
-                overflowOutputPosition.set(overflowLocation, QueryConstants.NULL_INT);
-                overflowKeySource0.set(overflowLocation, QueryConstants.NULL_BYTE);
-                overflowKeySource1.set(overflowLocation, QueryConstants.NULL_SHORT);
-                freeOverflowLocation(overflowLocation);
-                mainInsertLocation = -1;
-            } else {
-                final int oldOverflowLocation = mainOverflowLocationSource.getUnsafe(overflowTableLocation);
-                mainOverflowLocationSource.set(overflowTableLocation, overflowLocation);
-                overflowOverflowLocationSource.set(overflowLocation, oldOverflowLocation);
-            }
-            overflowLocation = nextOverflowLocation;
-        }
-    }
-
-    private int maybeMoveMainBucket(HashHandler handler, int sourceBucket, int destBucket,
-            int bucketsToAdd) {
-        final byte k0 = mainKeySource0.getUnsafe(sourceBucket);
-        final short k1 = mainKeySource1.getUnsafe(sourceBucket);
-        final int hash = hash(k0, k1);
-        final int location = hashToTableLocation(tableHashPivot + bucketsToAdd, hash);
-        final int mainInsertLocation;
-        if (location == sourceBucket) {
-            mainInsertLocation = destBucket;
-            mainOutputPosition.set(destBucket, EMPTY_OUTPUT_POSITION);
-        } else {
-            mainInsertLocation = sourceBucket;
-            mainOutputPosition.set(destBucket, mainOutputPosition.getUnsafe(sourceBucket));
-            mainOutputPosition.set(sourceBucket, EMPTY_OUTPUT_POSITION);
-            mainKeySource0.set(destBucket, k0);
-            mainKeySource0.set(sourceBucket, QueryConstants.NULL_BYTE);
-            mainKeySource1.set(destBucket, k1);
-            mainKeySource1.set(sourceBucket, QueryConstants.NULL_SHORT);
-            handler.doMoveMain(sourceBucket, destBucket);
-        }
-        return mainInsertLocation;
-    }
-
-    private boolean findOverflow(HashHandler handler, byte k0, short k1, int chunkPosition,
-            int overflowLocation) {
-        while (overflowLocation != QueryConstants.NULL_INT) {
-            if (eq(overflowKeySource0.getUnsafe(overflowLocation), k0) && eq(overflowKeySource1.getUnsafe(overflowLocation), k1)) {
-                handler.doOverflowFound(overflowLocation, chunkPosition);
-                return true;
-            }
-            overflowLocation = overflowOverflowLocationSource.getUnsafe(overflowLocation);
-        }
-        return false;
-    }
-
-    @Override
-    public int findPositionForKey(Object key) {
-        final Object [] ka = (Object[])key;
-        final byte k0 = TypeUtils.unbox((Byte)ka[0]);
-        final short k1 = TypeUtils.unbox((Short)ka[1]);
-        int hash = hash(k0, k1);
-        final int tableLocation = hashToTableLocation(tableHashPivot, hash);
-        final int positionValue = mainOutputPosition.getUnsafe(tableLocation);
-        if (positionValue == EMPTY_OUTPUT_POSITION) {
-            return -1;
-        }
-        if (eq(mainKeySource0.getUnsafe(tableLocation), k0) && eq(mainKeySource1.getUnsafe(tableLocation), k1)) {
-            return positionValue;
-        }
-        int overflowLocation = mainOverflowLocationSource.getUnsafe(tableLocation);
-        while (overflowLocation != QueryConstants.NULL_INT) {
-            if (eq(overflowKeySource0.getUnsafe(overflowLocation), k0) && eq(overflowKeySource1.getUnsafe(overflowLocation), k1)) {
-                return overflowOutputPosition.getUnsafe(overflowLocation);
-            }
-            overflowLocation = overflowOverflowLocationSource.getUnsafe(overflowLocation);
-        }
-        return -1;
-    }
-}
diff --git a/engine/table/src/main/java/io/deephaven/engine/table/impl/by/typed/staticagg/gen/StaticAggHasherChar.java b/engine/table/src/main/java/io/deephaven/engine/table/impl/by/typed/staticagg/gen/StaticAggHasherChar.java
deleted file mode 100644
index 24c510a616e..00000000000
--- a/engine/table/src/main/java/io/deephaven/engine/table/impl/by/typed/staticagg/gen/StaticAggHasherChar.java
+++ /dev/null
@@ -1,180 +0,0 @@
-//
-// Copyright (c) 2016-2024 Deephaven Data Labs and Patent Pending
-//
-// ****** AUTO-GENERATED CLASS - DO NOT EDIT MANUALLY
-// ****** Run ReplicateTypedHashers or ./gradlew replicateTypedHashers to regenerate
-//
-// @formatter:off
-package io.deephaven.engine.table.impl.by.typed.staticagg.gen;
-
-import static io.deephaven.util.compare.CharComparisons.eq;
-
-import io.deephaven.chunk.CharChunk;
-import io.deephaven.chunk.Chunk;
-import io.deephaven.chunk.attributes.Values;
-import io.deephaven.chunk.util.hashing.CharChunkHasher;
-import io.deephaven.engine.rowset.RowSequence;
-import io.deephaven.engine.table.ColumnSource;
-import io.deephaven.engine.table.impl.by.HashHandler;
-import io.deephaven.engine.table.impl.by.StaticChunkedOperatorAggregationStateManagerTypedBase;
-import io.deephaven.engine.table.impl.sources.CharacterArraySource;
-import io.deephaven.util.QueryConstants;
-import io.deephaven.util.type.TypeUtils;
-import java.lang.Character;
-import java.lang.Object;
-import java.lang.Override;
-
-final class StaticAggHasherChar extends StaticChunkedOperatorAggregationStateManagerTypedBase {
-    private final CharacterArraySource mainKeySource0;
-
-    private final CharacterArraySource overflowKeySource0;
-
-    public StaticAggHasherChar(ColumnSource[] tableKeySources,
-            ColumnSource[] originalTableKeySources, int tableSize, double maximumLoadFactor,
-            double targetLoadFactor) {
-        super(tableKeySources, tableSize, maximumLoadFactor, targetLoadFactor);
-        this.mainKeySource0 = (CharacterArraySource) super.mainKeySources[0];
-        this.overflowKeySource0 = (CharacterArraySource) super.overflowKeySources[0];
-    }
-
-    @Override
-    protected void build(HashHandler handler, RowSequence rowSequence, Chunk[] sourceKeyChunks) {
-        final CharChunk<Values> keyChunk0 = sourceKeyChunks[0].asCharChunk();
-        final int chunkSize = keyChunk0.size();
-        for (int chunkPosition = 0; chunkPosition < chunkSize; ++chunkPosition) {
-            final char k0 = keyChunk0.get(chunkPosition);
-            final int hash = hash(k0);
-            final int tableLocation = hashToTableLocation(tableHashPivot, hash);
-            if (mainOutputPosition.getUnsafe(tableLocation) == EMPTY_OUTPUT_POSITION) {
-                numEntries++;
-                mainKeySource0.set(tableLocation, k0);
-                handler.doMainInsert(tableLocation, chunkPosition);
-            } else if (eq(mainKeySource0.getUnsafe(tableLocation), k0)) {
-                handler.doMainFound(tableLocation, chunkPosition);
-            } else {
-                int overflowLocation = mainOverflowLocationSource.getUnsafe(tableLocation);
-                if (!findOverflow(handler, k0, chunkPosition, overflowLocation)) {
-                    final int newOverflowLocation = allocateOverflowLocation();
-                    overflowKeySource0.set(newOverflowLocation, k0);
-                    mainOverflowLocationSource.set(tableLocation, newOverflowLocation);
-                    overflowOverflowLocationSource.set(newOverflowLocation, overflowLocation);
-                    numEntries++;
-                    handler.doOverflowInsert(newOverflowLocation, chunkPosition);
-                }
-            }
-        }
-    }
-
-    @Override
-    protected void probe(HashHandler handler, RowSequence rowSequence, Chunk[] sourceKeyChunks) {
-        final CharChunk<Values> keyChunk0 = sourceKeyChunks[0].asCharChunk();
-        final int chunkSize = keyChunk0.size();
-        for (int chunkPosition = 0; chunkPosition < chunkSize; ++chunkPosition) {
-            final char k0 = keyChunk0.get(chunkPosition);
-            final int hash = hash(k0);
-            final int tableLocation = hashToTableLocation(tableHashPivot, hash);
-            if (mainOutputPosition.getUnsafe(tableLocation) == EMPTY_OUTPUT_POSITION) {
-                handler.doMissing(chunkPosition);
-            } else if (eq(mainKeySource0.getUnsafe(tableLocation), k0)) {
-                handler.doMainFound(tableLocation, chunkPosition);
-            } else {
-                int overflowLocation = mainOverflowLocationSource.getUnsafe(tableLocation);
-                if (!findOverflow(handler, k0, chunkPosition, overflowLocation)) {
-                    handler.doMissing(chunkPosition);
-                }
-            }
-        }
-    }
-
-    private static int hash(char k0) {
-        int hash = CharChunkHasher.hashInitialSingle(k0);
-        return hash;
-    }
-
-    @Override
-    protected void rehashBucket(HashHandler handler, int sourceBucket, int destBucket,
-            int bucketsToAdd) {
-        final int position = mainOutputPosition.getUnsafe(sourceBucket);
-        if (position == EMPTY_OUTPUT_POSITION) {
-            return;
-        }
-        int mainInsertLocation = maybeMoveMainBucket(handler, sourceBucket, destBucket, bucketsToAdd);
-        int overflowLocation = mainOverflowLocationSource.getUnsafe(sourceBucket);
-        mainOverflowLocationSource.set(sourceBucket, QueryConstants.NULL_INT);
-        mainOverflowLocationSource.set(destBucket, QueryConstants.NULL_INT);
-        while (overflowLocation != QueryConstants.NULL_INT) {
-            final int nextOverflowLocation = overflowOverflowLocationSource.getUnsafe(overflowLocation);
-            final char overflowKey0 = overflowKeySource0.getUnsafe(overflowLocation);
-            final int overflowHash = hash(overflowKey0);
-            final int overflowTableLocation = hashToTableLocation(tableHashPivot + bucketsToAdd, overflowHash);
-            if (overflowTableLocation == mainInsertLocation) {
-                mainKeySource0.set(mainInsertLocation, overflowKey0);
-                mainOutputPosition.set(mainInsertLocation, overflowOutputPosition.getUnsafe(overflowLocation));
-                handler.doPromoteOverflow(overflowLocation, mainInsertLocation);
-                overflowOutputPosition.set(overflowLocation, QueryConstants.NULL_INT);
-                overflowKeySource0.set(overflowLocation, QueryConstants.NULL_CHAR);
-                freeOverflowLocation(overflowLocation);
-                mainInsertLocation = -1;
-            } else {
-                final int oldOverflowLocation = mainOverflowLocationSource.getUnsafe(overflowTableLocation);
-                mainOverflowLocationSource.set(overflowTableLocation, overflowLocation);
-                overflowOverflowLocationSource.set(overflowLocation, oldOverflowLocation);
-            }
-            overflowLocation = nextOverflowLocation;
-        }
-    }
-
-    private int maybeMoveMainBucket(HashHandler handler, int sourceBucket, int destBucket,
-            int bucketsToAdd) {
-        final char k0 = mainKeySource0.getUnsafe(sourceBucket);
-        final int hash = hash(k0);
-        final int location = hashToTableLocation(tableHashPivot + bucketsToAdd, hash);
-        final int mainInsertLocation;
-        if (location == sourceBucket) {
-            mainInsertLocation = destBucket;
-            mainOutputPosition.set(destBucket, EMPTY_OUTPUT_POSITION);
-        } else {
-            mainInsertLocation = sourceBucket;
-            mainOutputPosition.set(destBucket, mainOutputPosition.getUnsafe(sourceBucket));
-            mainOutputPosition.set(sourceBucket, EMPTY_OUTPUT_POSITION);
-            mainKeySource0.set(destBucket, k0);
-            mainKeySource0.set(sourceBucket, QueryConstants.NULL_CHAR);
-            handler.doMoveMain(sourceBucket, destBucket);
-        }
-        return mainInsertLocation;
-    }
-
-    private boolean findOverflow(HashHandler handler, char k0, int chunkPosition,
-            int overflowLocation) {
-        while (overflowLocation != QueryConstants.NULL_INT) {
-            if (eq(overflowKeySource0.getUnsafe(overflowLocation), k0)) {
-                handler.doOverflowFound(overflowLocation, chunkPosition);
-                return true;
-            }
-            overflowLocation = overflowOverflowLocationSource.getUnsafe(overflowLocation);
-        }
-        return false;
-    }
-
-    @Override
-    public int findPositionForKey(Object key) {
-        final char k0 = TypeUtils.unbox((Character)key);
-        int hash = hash(k0);
-        final int tableLocation = hashToTableLocation(tableHashPivot, hash);
-        final int positionValue = mainOutputPosition.getUnsafe(tableLocation);
-        if (positionValue == EMPTY_OUTPUT_POSITION) {
-            return -1;
-        }
-        if (eq(mainKeySource0.getUnsafe(tableLocation), k0)) {
-            return positionValue;
-        }
-        int overflowLocation = mainOverflowLocationSource.getUnsafe(tableLocation);
-        while (overflowLocation != QueryConstants.NULL_INT) {
-            if (eq(overflowKeySource0.getUnsafe(overflowLocation), k0)) {
-                return overflowOutputPosition.getUnsafe(overflowLocation);
-            }
-            overflowLocation = overflowOverflowLocationSource.getUnsafe(overflowLocation);
-        }
-        return -1;
-    }
-}
diff --git a/engine/table/src/main/java/io/deephaven/engine/table/impl/by/typed/staticagg/gen/StaticAggHasherCharByte.java b/engine/table/src/main/java/io/deephaven/engine/table/impl/by/typed/staticagg/gen/StaticAggHasherCharByte.java
deleted file mode 100644
index 6ac2608c971..00000000000
--- a/engine/table/src/main/java/io/deephaven/engine/table/impl/by/typed/staticagg/gen/StaticAggHasherCharByte.java
+++ /dev/null
@@ -1,206 +0,0 @@
-//
-// Copyright (c) 2016-2024 Deephaven Data Labs and Patent Pending
-//
-// ****** AUTO-GENERATED CLASS - DO NOT EDIT MANUALLY
-// ****** Run ReplicateTypedHashers or ./gradlew replicateTypedHashers to regenerate
-//
-// @formatter:off
-package io.deephaven.engine.table.impl.by.typed.staticagg.gen;
-
-import static io.deephaven.util.compare.ByteComparisons.eq;
-import static io.deephaven.util.compare.CharComparisons.eq;
-
-import io.deephaven.chunk.ByteChunk;
-import io.deephaven.chunk.CharChunk;
-import io.deephaven.chunk.Chunk;
-import io.deephaven.chunk.attributes.Values;
-import io.deephaven.chunk.util.hashing.ByteChunkHasher;
-import io.deephaven.chunk.util.hashing.CharChunkHasher;
-import io.deephaven.engine.rowset.RowSequence;
-import io.deephaven.engine.table.ColumnSource;
-import io.deephaven.engine.table.impl.by.HashHandler;
-import io.deephaven.engine.table.impl.by.StaticChunkedOperatorAggregationStateManagerTypedBase;
-import io.deephaven.engine.table.impl.sources.ByteArraySource;
-import io.deephaven.engine.table.impl.sources.CharacterArraySource;
-import io.deephaven.util.QueryConstants;
-import io.deephaven.util.type.TypeUtils;
-import java.lang.Byte;
-import java.lang.Character;
-import java.lang.Object;
-import java.lang.Override;
-
-final class StaticAggHasherCharByte extends StaticChunkedOperatorAggregationStateManagerTypedBase {
-    private final CharacterArraySource mainKeySource0;
-
-    private final CharacterArraySource overflowKeySource0;
-
-    private final ByteArraySource mainKeySource1;
-
-    private final ByteArraySource overflowKeySource1;
-
-    public StaticAggHasherCharByte(ColumnSource[] tableKeySources,
-            ColumnSource[] originalTableKeySources, int tableSize, double maximumLoadFactor,
-            double targetLoadFactor) {
-        super(tableKeySources, tableSize, maximumLoadFactor, targetLoadFactor);
-        this.mainKeySource0 = (CharacterArraySource) super.mainKeySources[0];
-        this.overflowKeySource0 = (CharacterArraySource) super.overflowKeySources[0];
-        this.mainKeySource1 = (ByteArraySource) super.mainKeySources[1];
-        this.overflowKeySource1 = (ByteArraySource) super.overflowKeySources[1];
-    }
-
-    @Override
-    protected void build(HashHandler handler, RowSequence rowSequence, Chunk[] sourceKeyChunks) {
-        final CharChunk<Values> keyChunk0 = sourceKeyChunks[0].asCharChunk();
-        final ByteChunk<Values> keyChunk1 = sourceKeyChunks[1].asByteChunk();
-        final int chunkSize = keyChunk0.size();
-        for (int chunkPosition = 0; chunkPosition < chunkSize; ++chunkPosition) {
-            final char k0 = keyChunk0.get(chunkPosition);
-            final byte k1 = keyChunk1.get(chunkPosition);
-            final int hash = hash(k0, k1);
-            final int tableLocation = hashToTableLocation(tableHashPivot, hash);
-            if (mainOutputPosition.getUnsafe(tableLocation) == EMPTY_OUTPUT_POSITION) {
-                numEntries++;
-                mainKeySource0.set(tableLocation, k0);
-                mainKeySource1.set(tableLocation, k1);
-                handler.doMainInsert(tableLocation, chunkPosition);
-            } else if (eq(mainKeySource0.getUnsafe(tableLocation), k0) && eq(mainKeySource1.getUnsafe(tableLocation), k1)) {
-                handler.doMainFound(tableLocation, chunkPosition);
-            } else {
-                int overflowLocation = mainOverflowLocationSource.getUnsafe(tableLocation);
-                if (!findOverflow(handler, k0, k1, chunkPosition, overflowLocation)) {
-                    final int newOverflowLocation = allocateOverflowLocation();
-                    overflowKeySource0.set(newOverflowLocation, k0);
-                    overflowKeySource1.set(newOverflowLocation, k1);
-                    mainOverflowLocationSource.set(tableLocation, newOverflowLocation);
-                    overflowOverflowLocationSource.set(newOverflowLocation, overflowLocation);
-                    numEntries++;
-                    handler.doOverflowInsert(newOverflowLocation, chunkPosition);
-                }
-            }
-        }
-    }
-
-    @Override
-    protected void probe(HashHandler handler, RowSequence rowSequence, Chunk[] sourceKeyChunks) {
-        final CharChunk<Values> keyChunk0 = sourceKeyChunks[0].asCharChunk();
-        final ByteChunk<Values> keyChunk1 = sourceKeyChunks[1].asByteChunk();
-        final int chunkSize = keyChunk0.size();
-        for (int chunkPosition = 0; chunkPosition < chunkSize; ++chunkPosition) {
-            final char k0 = keyChunk0.get(chunkPosition);
-            final byte k1 = keyChunk1.get(chunkPosition);
-            final int hash = hash(k0, k1);
-            final int tableLocation = hashToTableLocation(tableHashPivot, hash);
-            if (mainOutputPosition.getUnsafe(tableLocation) == EMPTY_OUTPUT_POSITION) {
-                handler.doMissing(chunkPosition);
-            } else if (eq(mainKeySource0.getUnsafe(tableLocation), k0) && eq(mainKeySource1.getUnsafe(tableLocation), k1)) {
-                handler.doMainFound(tableLocation, chunkPosition);
-            } else {
-                int overflowLocation = mainOverflowLocationSource.getUnsafe(tableLocation);
-                if (!findOverflow(handler, k0, k1, chunkPosition, overflowLocation)) {
-                    handler.doMissing(chunkPosition);
-                }
-            }
-        }
-    }
-
-    private static int hash(char k0, byte k1) {
-        int hash = CharChunkHasher.hashInitialSingle(k0);
-        hash = ByteChunkHasher.hashUpdateSingle(hash, k1);
-        return hash;
-    }
-
-    @Override
-    protected void rehashBucket(HashHandler handler, int sourceBucket, int destBucket,
-            int bucketsToAdd) {
-        final int position = mainOutputPosition.getUnsafe(sourceBucket);
-        if (position == EMPTY_OUTPUT_POSITION) {
-            return;
-        }
-        int mainInsertLocation = maybeMoveMainBucket(handler, sourceBucket, destBucket, bucketsToAdd);
-        int overflowLocation = mainOverflowLocationSource.getUnsafe(sourceBucket);
-        mainOverflowLocationSource.set(sourceBucket, QueryConstants.NULL_INT);
-        mainOverflowLocationSource.set(destBucket, QueryConstants.NULL_INT);
-        while (overflowLocation != QueryConstants.NULL_INT) {
-            final int nextOverflowLocation = overflowOverflowLocationSource.getUnsafe(overflowLocation);
-            final char overflowKey0 = overflowKeySource0.getUnsafe(overflowLocation);
-            final byte overflowKey1 = overflowKeySource1.getUnsafe(overflowLocation);
-            final int overflowHash = hash(overflowKey0, overflowKey1);
-            final int overflowTableLocation = hashToTableLocation(tableHashPivot + bucketsToAdd, overflowHash);
-            if (overflowTableLocation == mainInsertLocation) {
-                mainKeySource0.set(mainInsertLocation, overflowKey0);
-                mainKeySource1.set(mainInsertLocation, overflowKey1);
-                mainOutputPosition.set(mainInsertLocation, overflowOutputPosition.getUnsafe(overflowLocation));
-                handler.doPromoteOverflow(overflowLocation, mainInsertLocation);
-                overflowOutputPosition.set(overflowLocation, QueryConstants.NULL_INT);
-                overflowKeySource0.set(overflowLocation, QueryConstants.NULL_CHAR);
-                overflowKeySource1.set(overflowLocation, QueryConstants.NULL_BYTE);
-                freeOverflowLocation(overflowLocation);
-                mainInsertLocation = -1;
-            } else {
-                final int oldOverflowLocation = mainOverflowLocationSource.getUnsafe(overflowTableLocation);
-                mainOverflowLocationSource.set(overflowTableLocation, overflowLocation);
-                overflowOverflowLocationSource.set(overflowLocation, oldOverflowLocation);
-            }
-            overflowLocation = nextOverflowLocation;
-        }
-    }
-
-    private int maybeMoveMainBucket(HashHandler handler, int sourceBucket, int destBucket,
-            int bucketsToAdd) {
-        final char k0 = mainKeySource0.getUnsafe(sourceBucket);
-        final byte k1 = mainKeySource1.getUnsafe(sourceBucket);
-        final int hash = hash(k0, k1);
-        final int location = hashToTableLocation(tableHashPivot + bucketsToAdd, hash);
-        final int mainInsertLocation;
-        if (location == sourceBucket) {
-            mainInsertLocation = destBucket;
-            mainOutputPosition.set(destBucket, EMPTY_OUTPUT_POSITION);
-        } else {
-            mainInsertLocation = sourceBucket;
-            mainOutputPosition.set(destBucket, mainOutputPosition.getUnsafe(sourceBucket));
-            mainOutputPosition.set(sourceBucket, EMPTY_OUTPUT_POSITION);
-            mainKeySource0.set(destBucket, k0);
-            mainKeySource0.set(sourceBucket, QueryConstants.NULL_CHAR);
-            mainKeySource1.set(destBucket, k1);
-            mainKeySource1.set(sourceBucket, QueryConstants.NULL_BYTE);
-            handler.doMoveMain(sourceBucket, destBucket);
-        }
-        return mainInsertLocation;
-    }
-
-    private boolean findOverflow(HashHandler handler, char k0, byte k1, int chunkPosition,
-            int overflowLocation) {
-        while (overflowLocation != QueryConstants.NULL_INT) {
-            if (eq(overflowKeySource0.getUnsafe(overflowLocation), k0) && eq(overflowKeySource1.getUnsafe(overflowLocation), k1)) {
-                handler.doOverflowFound(overflowLocation, chunkPosition);
-                return true;
-            }
-            overflowLocation = overflowOverflowLocationSource.getUnsafe(overflowLocation);
-        }
-        return false;
-    }
-
-    @Override
-    public int findPositionForKey(Object key) {
-        final Object [] ka = (Object[])key;
-        final char k0 = TypeUtils.unbox((Character)ka[0]);
-        final byte k1 = TypeUtils.unbox((Byte)ka[1]);
-        int hash = hash(k0, k1);
-        final int tableLocation = hashToTableLocation(tableHashPivot, hash);
-        final int positionValue = mainOutputPosition.getUnsafe(tableLocation);
-        if (positionValue == EMPTY_OUTPUT_POSITION) {
-            return -1;
-        }
-        if (eq(mainKeySource0.getUnsafe(tableLocation), k0) && eq(mainKeySource1.getUnsafe(tableLocation), k1)) {
-            return positionValue;
-        }
-        int overflowLocation = mainOverflowLocationSource.getUnsafe(tableLocation);
-        while (overflowLocation != QueryConstants.NULL_INT) {
-            if (eq(overflowKeySource0.getUnsafe(overflowLocation), k0) && eq(overflowKeySource1.getUnsafe(overflowLocation), k1)) {
-                return overflowOutputPosition.getUnsafe(overflowLocation);
-            }
-            overflowLocation = overflowOverflowLocationSource.getUnsafe(overflowLocation);
-        }
-        return -1;
-    }
-}
diff --git a/engine/table/src/main/java/io/deephaven/engine/table/impl/by/typed/staticagg/gen/StaticAggHasherCharChar.java b/engine/table/src/main/java/io/deephaven/engine/table/impl/by/typed/staticagg/gen/StaticAggHasherCharChar.java
deleted file mode 100644
index e521bd21b25..00000000000
--- a/engine/table/src/main/java/io/deephaven/engine/table/impl/by/typed/staticagg/gen/StaticAggHasherCharChar.java
+++ /dev/null
@@ -1,201 +0,0 @@
-//
-// Copyright (c) 2016-2024 Deephaven Data Labs and Patent Pending
-//
-// ****** AUTO-GENERATED CLASS - DO NOT EDIT MANUALLY
-// ****** Run ReplicateTypedHashers or ./gradlew replicateTypedHashers to regenerate
-//
-// @formatter:off
-package io.deephaven.engine.table.impl.by.typed.staticagg.gen;
-
-import static io.deephaven.util.compare.CharComparisons.eq;
-
-import io.deephaven.chunk.CharChunk;
-import io.deephaven.chunk.Chunk;
-import io.deephaven.chunk.attributes.Values;
-import io.deephaven.chunk.util.hashing.CharChunkHasher;
-import io.deephaven.engine.rowset.RowSequence;
-import io.deephaven.engine.table.ColumnSource;
-import io.deephaven.engine.table.impl.by.HashHandler;
-import io.deephaven.engine.table.impl.by.StaticChunkedOperatorAggregationStateManagerTypedBase;
-import io.deephaven.engine.table.impl.sources.CharacterArraySource;
-import io.deephaven.util.QueryConstants;
-import io.deephaven.util.type.TypeUtils;
-import java.lang.Character;
-import java.lang.Object;
-import java.lang.Override;
-
-final class StaticAggHasherCharChar extends StaticChunkedOperatorAggregationStateManagerTypedBase {
-    private final CharacterArraySource mainKeySource0;
-
-    private final CharacterArraySource overflowKeySource0;
-
-    private final CharacterArraySource mainKeySource1;
-
-    private final CharacterArraySource overflowKeySource1;
-
-    public StaticAggHasherCharChar(ColumnSource[] tableKeySources,
-            ColumnSource[] originalTableKeySources, int tableSize, double maximumLoadFactor,
-            double targetLoadFactor) {
-        super(tableKeySources, tableSize, maximumLoadFactor, targetLoadFactor);
-        this.mainKeySource0 = (CharacterArraySource) super.mainKeySources[0];
-        this.overflowKeySource0 = (CharacterArraySource) super.overflowKeySources[0];
-        this.mainKeySource1 = (CharacterArraySource) super.mainKeySources[1];
-        this.overflowKeySource1 = (CharacterArraySource) super.overflowKeySources[1];
-    }
-
-    @Override
-    protected void build(HashHandler handler, RowSequence rowSequence, Chunk[] sourceKeyChunks) {
-        final CharChunk<Values> keyChunk0 = sourceKeyChunks[0].asCharChunk();
-        final CharChunk<Values> keyChunk1 = sourceKeyChunks[1].asCharChunk();
-        final int chunkSize = keyChunk0.size();
-        for (int chunkPosition = 0; chunkPosition < chunkSize; ++chunkPosition) {
-            final char k0 = keyChunk0.get(chunkPosition);
-            final char k1 = keyChunk1.get(chunkPosition);
-            final int hash = hash(k0, k1);
-            final int tableLocation = hashToTableLocation(tableHashPivot, hash);
-            if (mainOutputPosition.getUnsafe(tableLocation) == EMPTY_OUTPUT_POSITION) {
-                numEntries++;
-                mainKeySource0.set(tableLocation, k0);
-                mainKeySource1.set(tableLocation, k1);
-                handler.doMainInsert(tableLocation, chunkPosition);
-            } else if (eq(mainKeySource0.getUnsafe(tableLocation), k0) && eq(mainKeySource1.getUnsafe(tableLocation), k1)) {
-                handler.doMainFound(tableLocation, chunkPosition);
-            } else {
-                int overflowLocation = mainOverflowLocationSource.getUnsafe(tableLocation);
-                if (!findOverflow(handler, k0, k1, chunkPosition, overflowLocation)) {
-                    final int newOverflowLocation = allocateOverflowLocation();
-                    overflowKeySource0.set(newOverflowLocation, k0);
-                    overflowKeySource1.set(newOverflowLocation, k1);
-                    mainOverflowLocationSource.set(tableLocation, newOverflowLocation);
-                    overflowOverflowLocationSource.set(newOverflowLocation, overflowLocation);
-                    numEntries++;
-                    handler.doOverflowInsert(newOverflowLocation, chunkPosition);
-                }
-            }
-        }
-    }
-
-    @Override
-    protected void probe(HashHandler handler, RowSequence rowSequence, Chunk[] sourceKeyChunks) {
-        final CharChunk<Values> keyChunk0 = sourceKeyChunks[0].asCharChunk();
-        final CharChunk<Values> keyChunk1 = sourceKeyChunks[1].asCharChunk();
-        final int chunkSize = keyChunk0.size();
-        for (int chunkPosition = 0; chunkPosition < chunkSize; ++chunkPosition) {
-            final char k0 = keyChunk0.get(chunkPosition);
-            final char k1 = keyChunk1.get(chunkPosition);
-            final int hash = hash(k0, k1);
-            final int tableLocation = hashToTableLocation(tableHashPivot, hash);
-            if (mainOutputPosition.getUnsafe(tableLocation) == EMPTY_OUTPUT_POSITION) {
-                handler.doMissing(chunkPosition);
-            } else if (eq(mainKeySource0.getUnsafe(tableLocation), k0) && eq(mainKeySource1.getUnsafe(tableLocation), k1)) {
-                handler.doMainFound(tableLocation, chunkPosition);
-            } else {
-                int overflowLocation = mainOverflowLocationSource.getUnsafe(tableLocation);
-                if (!findOverflow(handler, k0, k1, chunkPosition, overflowLocation)) {
-                    handler.doMissing(chunkPosition);
-                }
-            }
-        }
-    }
-
-    private static int hash(char k0, char k1) {
-        int hash = CharChunkHasher.hashInitialSingle(k0);
-        hash = CharChunkHasher.hashUpdateSingle(hash, k1);
-        return hash;
-    }
-
-    @Override
-    protected void rehashBucket(HashHandler handler, int sourceBucket, int destBucket,
-            int bucketsToAdd) {
-        final int position = mainOutputPosition.getUnsafe(sourceBucket);
-        if (position == EMPTY_OUTPUT_POSITION) {
-            return;
-        }
-        int mainInsertLocation = maybeMoveMainBucket(handler, sourceBucket, destBucket, bucketsToAdd);
-        int overflowLocation = mainOverflowLocationSource.getUnsafe(sourceBucket);
-        mainOverflowLocationSource.set(sourceBucket, QueryConstants.NULL_INT);
-        mainOverflowLocationSource.set(destBucket, QueryConstants.NULL_INT);
-        while (overflowLocation != QueryConstants.NULL_INT) {
-            final int nextOverflowLocation = overflowOverflowLocationSource.getUnsafe(overflowLocation);
-            final char overflowKey0 = overflowKeySource0.getUnsafe(overflowLocation);
-            final char overflowKey1 = overflowKeySource1.getUnsafe(overflowLocation);
-            final int overflowHash = hash(overflowKey0, overflowKey1);
-            final int overflowTableLocation = hashToTableLocation(tableHashPivot + bucketsToAdd, overflowHash);
-            if (overflowTableLocation == mainInsertLocation) {
-                mainKeySource0.set(mainInsertLocation, overflowKey0);
-                mainKeySource1.set(mainInsertLocation, overflowKey1);
-                mainOutputPosition.set(mainInsertLocation, overflowOutputPosition.getUnsafe(overflowLocation));
-                handler.doPromoteOverflow(overflowLocation, mainInsertLocation);
-                overflowOutputPosition.set(overflowLocation, QueryConstants.NULL_INT);
-                overflowKeySource0.set(overflowLocation, QueryConstants.NULL_CHAR);
-                overflowKeySource1.set(overflowLocation, QueryConstants.NULL_CHAR);
-                freeOverflowLocation(overflowLocation);
-                mainInsertLocation = -1;
-            } else {
-                final int oldOverflowLocation = mainOverflowLocationSource.getUnsafe(overflowTableLocation);
-                mainOverflowLocationSource.set(overflowTableLocation, overflowLocation);
-                overflowOverflowLocationSource.set(overflowLocation, oldOverflowLocation);
-            }
-            overflowLocation = nextOverflowLocation;
-        }
-    }
-
-    private int maybeMoveMainBucket(HashHandler handler, int sourceBucket, int destBucket,
-            int bucketsToAdd) {
-        final char k0 = mainKeySource0.getUnsafe(sourceBucket);
-        final char k1 = mainKeySource1.getUnsafe(sourceBucket);
-        final int hash = hash(k0, k1);
-        final int location = hashToTableLocation(tableHashPivot + bucketsToAdd, hash);
-        final int mainInsertLocation;
-        if (location == sourceBucket) {
-            mainInsertLocation = destBucket;
-            mainOutputPosition.set(destBucket, EMPTY_OUTPUT_POSITION);
-        } else {
-            mainInsertLocation = sourceBucket;
-            mainOutputPosition.set(destBucket, mainOutputPosition.getUnsafe(sourceBucket));
-            mainOutputPosition.set(sourceBucket, EMPTY_OUTPUT_POSITION);
-            mainKeySource0.set(destBucket, k0);
-            mainKeySource0.set(sourceBucket, QueryConstants.NULL_CHAR);
-            mainKeySource1.set(destBucket, k1);
-            mainKeySource1.set(sourceBucket, QueryConstants.NULL_CHAR);
-            handler.doMoveMain(sourceBucket, destBucket);
-        }
-        return mainInsertLocation;
-    }
-
-    private boolean findOverflow(HashHandler handler, char k0, char k1, int chunkPosition,
-            int overflowLocation) {
-        while (overflowLocation != QueryConstants.NULL_INT) {
-            if (eq(overflowKeySource0.getUnsafe(overflowLocation), k0) && eq(overflowKeySource1.getUnsafe(overflowLocation), k1)) {
-                handler.doOverflowFound(overflowLocation, chunkPosition);
-                return true;
-            }
-            overflowLocation = overflowOverflowLocationSource.getUnsafe(overflowLocation);
-        }
-        return false;
-    }
-
-    @Override
-    public int findPositionForKey(Object key) {
-        final Object [] ka = (Object[])key;
-        final char k0 = TypeUtils.unbox((Character)ka[0]);
-        final char k1 = TypeUtils.unbox((Character)ka[1]);
-        int hash = hash(k0, k1);
-        final int tableLocation = hashToTableLocation(tableHashPivot, hash);
-        final int positionValue = mainOutputPosition.getUnsafe(tableLocation);
-        if (positionValue == EMPTY_OUTPUT_POSITION) {
-            return -1;
-        }
-        if (eq(mainKeySource0.getUnsafe(tableLocation), k0) && eq(mainKeySource1.getUnsafe(tableLocation), k1)) {
-            return positionValue;
-        }
-        int overflowLocation = mainOverflowLocationSource.getUnsafe(tableLocation);
-        while (overflowLocation != QueryConstants.NULL_INT) {
-            if (eq(overflowKeySource0.getUnsafe(overflowLocation), k0) && eq(overflowKeySource1.getUnsafe(overflowLocation), k1)) {
-                return overflowOutputPosition.getUnsafe(overflowLocation);
-            }
-            overflowLocation = overflowOverflowLocationSource.getUnsafe(overflowLocation);
-        }
-        return -1;
-    }
-}
diff --git a/engine/table/src/main/java/io/deephaven/engine/table/impl/by/typed/staticagg/gen/StaticAggHasherCharDouble.java b/engine/table/src/main/java/io/deephaven/engine/table/impl/by/typed/staticagg/gen/StaticAggHasherCharDouble.java
deleted file mode 100644
index c334aadb70e..00000000000
--- a/engine/table/src/main/java/io/deephaven/engine/table/impl/by/typed/staticagg/gen/StaticAggHasherCharDouble.java
+++ /dev/null
@@ -1,206 +0,0 @@
-//
-// Copyright (c) 2016-2024 Deephaven Data Labs and Patent Pending
-//
-// ****** AUTO-GENERATED CLASS - DO NOT EDIT MANUALLY
-// ****** Run ReplicateTypedHashers or ./gradlew replicateTypedHashers to regenerate
-//
-// @formatter:off
-package io.deephaven.engine.table.impl.by.typed.staticagg.gen;
-
-import static io.deephaven.util.compare.CharComparisons.eq;
-import static io.deephaven.util.compare.DoubleComparisons.eq;
-
-import io.deephaven.chunk.CharChunk;
-import io.deephaven.chunk.Chunk;
-import io.deephaven.chunk.DoubleChunk;
-import io.deephaven.chunk.attributes.Values;
-import io.deephaven.chunk.util.hashing.CharChunkHasher;
-import io.deephaven.chunk.util.hashing.DoubleChunkHasher;
-import io.deephaven.engine.rowset.RowSequence;
-import io.deephaven.engine.table.ColumnSource;
-import io.deephaven.engine.table.impl.by.HashHandler;
-import io.deephaven.engine.table.impl.by.StaticChunkedOperatorAggregationStateManagerTypedBase;
-import io.deephaven.engine.table.impl.sources.CharacterArraySource;
-import io.deephaven.engine.table.impl.sources.DoubleArraySource;
-import io.deephaven.util.QueryConstants;
-import io.deephaven.util.type.TypeUtils;
-import java.lang.Character;
-import java.lang.Double;
-import java.lang.Object;
-import java.lang.Override;
-
-final class StaticAggHasherCharDouble extends StaticChunkedOperatorAggregationStateManagerTypedBase {
-    private final CharacterArraySource mainKeySource0;
-
-    private final CharacterArraySource overflowKeySource0;
-
-    private final DoubleArraySource mainKeySource1;
-
-    private final DoubleArraySource overflowKeySource1;
-
-    public StaticAggHasherCharDouble(ColumnSource[] tableKeySources,
-            ColumnSource[] originalTableKeySources, int tableSize, double maximumLoadFactor,
-            double targetLoadFactor) {
-        super(tableKeySources, tableSize, maximumLoadFactor, targetLoadFactor);
-        this.mainKeySource0 = (CharacterArraySource) super.mainKeySources[0];
-        this.overflowKeySource0 = (CharacterArraySource) super.overflowKeySources[0];
-        this.mainKeySource1 = (DoubleArraySource) super.mainKeySources[1];
-        this.overflowKeySource1 = (DoubleArraySource) super.overflowKeySources[1];
-    }
-
-    @Override
-    protected void build(HashHandler handler, RowSequence rowSequence, Chunk[] sourceKeyChunks) {
-        final CharChunk<Values> keyChunk0 = sourceKeyChunks[0].asCharChunk();
-        final DoubleChunk<Values> keyChunk1 = sourceKeyChunks[1].asDoubleChunk();
-        final int chunkSize = keyChunk0.size();
-        for (int chunkPosition = 0; chunkPosition < chunkSize; ++chunkPosition) {
-            final char k0 = keyChunk0.get(chunkPosition);
-            final double k1 = keyChunk1.get(chunkPosition);
-            final int hash = hash(k0, k1);
-            final int tableLocation = hashToTableLocation(tableHashPivot, hash);
-            if (mainOutputPosition.getUnsafe(tableLocation) == EMPTY_OUTPUT_POSITION) {
-                numEntries++;
-                mainKeySource0.set(tableLocation, k0);
-                mainKeySource1.set(tableLocation, k1);
-                handler.doMainInsert(tableLocation, chunkPosition);
-            } else if (eq(mainKeySource0.getUnsafe(tableLocation), k0) && eq(mainKeySource1.getUnsafe(tableLocation), k1)) {
-                handler.doMainFound(tableLocation, chunkPosition);
-            } else {
-                int overflowLocation = mainOverflowLocationSource.getUnsafe(tableLocation);
-                if (!findOverflow(handler, k0, k1, chunkPosition, overflowLocation)) {
-                    final int newOverflowLocation = allocateOverflowLocation();
-                    overflowKeySource0.set(newOverflowLocation, k0);
-                    overflowKeySource1.set(newOverflowLocation, k1);
-                    mainOverflowLocationSource.set(tableLocation, newOverflowLocation);
-                    overflowOverflowLocationSource.set(newOverflowLocation, overflowLocation);
-                    numEntries++;
-                    handler.doOverflowInsert(newOverflowLocation, chunkPosition);
-                }
-            }
-        }
-    }
-
-    @Override
-    protected void probe(HashHandler handler, RowSequence rowSequence, Chunk[] sourceKeyChunks) {
-        final CharChunk<Values> keyChunk0 = sourceKeyChunks[0].asCharChunk();
-        final DoubleChunk<Values> keyChunk1 = sourceKeyChunks[1].asDoubleChunk();
-        final int chunkSize = keyChunk0.size();
-        for (int chunkPosition = 0; chunkPosition < chunkSize; ++chunkPosition) {
-            final char k0 = keyChunk0.get(chunkPosition);
-            final double k1 = keyChunk1.get(chunkPosition);
-            final int hash = hash(k0, k1);
-            final int tableLocation = hashToTableLocation(tableHashPivot, hash);
-            if (mainOutputPosition.getUnsafe(tableLocation) == EMPTY_OUTPUT_POSITION) {
-                handler.doMissing(chunkPosition);
-            } else if (eq(mainKeySource0.getUnsafe(tableLocation), k0) && eq(mainKeySource1.getUnsafe(tableLocation), k1)) {
-                handler.doMainFound(tableLocation, chunkPosition);
-            } else {
-                int overflowLocation = mainOverflowLocationSource.getUnsafe(tableLocation);
-                if (!findOverflow(handler, k0, k1, chunkPosition, overflowLocation)) {
-                    handler.doMissing(chunkPosition);
-                }
-            }
-        }
-    }
-
-    private static int hash(char k0, double k1) {
-        int hash = CharChunkHasher.hashInitialSingle(k0);
-        hash = DoubleChunkHasher.hashUpdateSingle(hash, k1);
-        return hash;
-    }
-
-    @Override
-    protected void rehashBucket(HashHandler handler, int sourceBucket, int destBucket,
-            int bucketsToAdd) {
-        final int position = mainOutputPosition.getUnsafe(sourceBucket);
-        if (position == EMPTY_OUTPUT_POSITION) {
-            return;
-        }
-        int mainInsertLocation = maybeMoveMainBucket(handler, sourceBucket, destBucket, bucketsToAdd);
-        int overflowLocation = mainOverflowLocationSource.getUnsafe(sourceBucket);
-        mainOverflowLocationSource.set(sourceBucket, QueryConstants.NULL_INT);
-        mainOverflowLocationSource.set(destBucket, QueryConstants.NULL_INT);
-        while (overflowLocation != QueryConstants.NULL_INT) {
-            final int nextOverflowLocation = overflowOverflowLocationSource.getUnsafe(overflowLocation);
-            final char overflowKey0 = overflowKeySource0.getUnsafe(overflowLocation);
-            final double overflowKey1 = overflowKeySource1.getUnsafe(overflowLocation);
-            final int overflowHash = hash(overflowKey0, overflowKey1);
-            final int overflowTableLocation = hashToTableLocation(tableHashPivot + bucketsToAdd, overflowHash);
-            if (overflowTableLocation == mainInsertLocation) {
-                mainKeySource0.set(mainInsertLocation, overflowKey0);
-                mainKeySource1.set(mainInsertLocation, overflowKey1);
-                mainOutputPosition.set(mainInsertLocation, overflowOutputPosition.getUnsafe(overflowLocation));
-                handler.doPromoteOverflow(overflowLocation, mainInsertLocation);
-                overflowOutputPosition.set(overflowLocation, QueryConstants.NULL_INT);
-                overflowKeySource0.set(overflowLocation, QueryConstants.NULL_CHAR);
-                overflowKeySource1.set(overflowLocation, QueryConstants.NULL_DOUBLE);
-                freeOverflowLocation(overflowLocation);
-                mainInsertLocation = -1;
-            } else {
-                final int oldOverflowLocation = mainOverflowLocationSource.getUnsafe(overflowTableLocation);
-                mainOverflowLocationSource.set(overflowTableLocation, overflowLocation);
-                overflowOverflowLocationSource.set(overflowLocation, oldOverflowLocation);
-            }
-            overflowLocation = nextOverflowLocation;
-        }
-    }
-
-    private int maybeMoveMainBucket(HashHandler handler, int sourceBucket, int destBucket,
-            int bucketsToAdd) {
-        final char k0 = mainKeySource0.getUnsafe(sourceBucket);
-        final double k1 = mainKeySource1.getUnsafe(sourceBucket);
-        final int hash = hash(k0, k1);
-        final int location = hashToTableLocation(tableHashPivot + bucketsToAdd, hash);
-        final int mainInsertLocation;
-        if (location == sourceBucket) {
-            mainInsertLocation = destBucket;
-            mainOutputPosition.set(destBucket, EMPTY_OUTPUT_POSITION);
-        } else {
-            mainInsertLocation = sourceBucket;
-            mainOutputPosition.set(destBucket, mainOutputPosition.getUnsafe(sourceBucket));
-            mainOutputPosition.set(sourceBucket, EMPTY_OUTPUT_POSITION);
-            mainKeySource0.set(destBucket, k0);
-            mainKeySource0.set(sourceBucket, QueryConstants.NULL_CHAR);
-            mainKeySource1.set(destBucket, k1);
-            mainKeySource1.set(sourceBucket, QueryConstants.NULL_DOUBLE);
-            handler.doMoveMain(sourceBucket, destBucket);
-        }
-        return mainInsertLocation;
-    }
-
-    private boolean findOverflow(HashHandler handler, char k0, double k1, int chunkPosition,
-            int overflowLocation) {
-        while (overflowLocation != QueryConstants.NULL_INT) {
-            if (eq(overflowKeySource0.getUnsafe(overflowLocation), k0) && eq(overflowKeySource1.getUnsafe(overflowLocation), k1)) {
-                handler.doOverflowFound(overflowLocation, chunkPosition);
-                return true;
-            }
-            overflowLocation = overflowOverflowLocationSource.getUnsafe(overflowLocation);
-        }
-        return false;
-    }
-
-    @Override
-    public int findPositionForKey(Object key) {
-        final Object [] ka = (Object[])key;
-        final char k0 = TypeUtils.unbox((Character)ka[0]);
-        final double k1 = TypeUtils.unbox((Double)ka[1]);
-        int hash = hash(k0, k1);
-        final int tableLocation = hashToTableLocation(tableHashPivot, hash);
-        final int positionValue = mainOutputPosition.getUnsafe(tableLocation);
-        if (positionValue == EMPTY_OUTPUT_POSITION) {
-            return -1;
-        }
-        if (eq(mainKeySource0.getUnsafe(tableLocation), k0) && eq(mainKeySource1.getUnsafe(tableLocation), k1)) {
-            return positionValue;
-        }
-        int overflowLocation = mainOverflowLocationSource.getUnsafe(tableLocation);
-        while (overflowLocation != QueryConstants.NULL_INT) {
-            if (eq(overflowKeySource0.getUnsafe(overflowLocation), k0) && eq(overflowKeySource1.getUnsafe(overflowLocation), k1)) {
-                return overflowOutputPosition.getUnsafe(overflowLocation);
-            }
-            overflowLocation = overflowOverflowLocationSource.getUnsafe(overflowLocation);
-        }
-        return -1;
-    }
-}
diff --git a/engine/table/src/main/java/io/deephaven/engine/table/impl/by/typed/staticagg/gen/StaticAggHasherCharFloat.java b/engine/table/src/main/java/io/deephaven/engine/table/impl/by/typed/staticagg/gen/StaticAggHasherCharFloat.java
deleted file mode 100644
index f17864211e6..00000000000
--- a/engine/table/src/main/java/io/deephaven/engine/table/impl/by/typed/staticagg/gen/StaticAggHasherCharFloat.java
+++ /dev/null
@@ -1,206 +0,0 @@
-//
-// Copyright (c) 2016-2024 Deephaven Data Labs and Patent Pending
-//
-// ****** AUTO-GENERATED CLASS - DO NOT EDIT MANUALLY
-// ****** Run ReplicateTypedHashers or ./gradlew replicateTypedHashers to regenerate
-//
-// @formatter:off
-package io.deephaven.engine.table.impl.by.typed.staticagg.gen;
-
-import static io.deephaven.util.compare.CharComparisons.eq;
-import static io.deephaven.util.compare.FloatComparisons.eq;
-
-import io.deephaven.chunk.CharChunk;
-import io.deephaven.chunk.Chunk;
-import io.deephaven.chunk.FloatChunk;
-import io.deephaven.chunk.attributes.Values;
-import io.deephaven.chunk.util.hashing.CharChunkHasher;
-import io.deephaven.chunk.util.hashing.FloatChunkHasher;
-import io.deephaven.engine.rowset.RowSequence;
-import io.deephaven.engine.table.ColumnSource;
-import io.deephaven.engine.table.impl.by.HashHandler;
-import io.deephaven.engine.table.impl.by.StaticChunkedOperatorAggregationStateManagerTypedBase;
-import io.deephaven.engine.table.impl.sources.CharacterArraySource;
-import io.deephaven.engine.table.impl.sources.FloatArraySource;
-import io.deephaven.util.QueryConstants;
-import io.deephaven.util.type.TypeUtils;
-import java.lang.Character;
-import java.lang.Float;
-import java.lang.Object;
-import java.lang.Override;
-
-final class StaticAggHasherCharFloat extends StaticChunkedOperatorAggregationStateManagerTypedBase {
-    private final CharacterArraySource mainKeySource0;
-
-    private final CharacterArraySource overflowKeySource0;
-
-    private final FloatArraySource mainKeySource1;
-
-    private final FloatArraySource overflowKeySource1;
-
-    public StaticAggHasherCharFloat(ColumnSource[] tableKeySources,
-            ColumnSource[] originalTableKeySources, int tableSize, double maximumLoadFactor,
-            double targetLoadFactor) {
-        super(tableKeySources, tableSize, maximumLoadFactor, targetLoadFactor);
-        this.mainKeySource0 = (CharacterArraySource) super.mainKeySources[0];
-        this.overflowKeySource0 = (CharacterArraySource) super.overflowKeySources[0];
-        this.mainKeySource1 = (FloatArraySource) super.mainKeySources[1];
-        this.overflowKeySource1 = (FloatArraySource) super.overflowKeySources[1];
-    }
-
-    @Override
-    protected void build(HashHandler handler, RowSequence rowSequence, Chunk[] sourceKeyChunks) {
-        final CharChunk<Values> keyChunk0 = sourceKeyChunks[0].asCharChunk();
-        final FloatChunk<Values> keyChunk1 = sourceKeyChunks[1].asFloatChunk();
-        final int chunkSize = keyChunk0.size();
-        for (int chunkPosition = 0; chunkPosition < chunkSize; ++chunkPosition) {
-            final char k0 = keyChunk0.get(chunkPosition);
-            final float k1 = keyChunk1.get(chunkPosition);
-            final int hash = hash(k0, k1);
-            final int tableLocation = hashToTableLocation(tableHashPivot, hash);
-            if (mainOutputPosition.getUnsafe(tableLocation) == EMPTY_OUTPUT_POSITION) {
-                numEntries++;
-                mainKeySource0.set(tableLocation, k0);
-                mainKeySource1.set(tableLocation, k1);
-                handler.doMainInsert(tableLocation, chunkPosition);
-            } else if (eq(mainKeySource0.getUnsafe(tableLocation), k0) && eq(mainKeySource1.getUnsafe(tableLocation), k1)) {
-                handler.doMainFound(tableLocation, chunkPosition);
-            } else {
-                int overflowLocation = mainOverflowLocationSource.getUnsafe(tableLocation);
-                if (!findOverflow(handler, k0, k1, chunkPosition, overflowLocation)) {
-                    final int newOverflowLocation = allocateOverflowLocation();
-                    overflowKeySource0.set(newOverflowLocation, k0);
-                    overflowKeySource1.set(newOverflowLocation, k1);
-                    mainOverflowLocationSource.set(tableLocation, newOverflowLocation);
-                    overflowOverflowLocationSource.set(newOverflowLocation, overflowLocation);
-                    numEntries++;
-                    handler.doOverflowInsert(newOverflowLocation, chunkPosition);
-                }
-            }
-        }
-    }
-
-    @Override
-    protected void probe(HashHandler handler, RowSequence rowSequence, Chunk[] sourceKeyChunks) {
-        final CharChunk<Values> keyChunk0 = sourceKeyChunks[0].asCharChunk();
-        final FloatChunk<Values> keyChunk1 = sourceKeyChunks[1].asFloatChunk();
-        final int chunkSize = keyChunk0.size();
-        for (int chunkPosition = 0; chunkPosition < chunkSize; ++chunkPosition) {
-            final char k0 = keyChunk0.get(chunkPosition);
-            final float k1 = keyChunk1.get(chunkPosition);
-            final int hash = hash(k0, k1);
-            final int tableLocation = hashToTableLocation(tableHashPivot, hash);
-            if (mainOutputPosition.getUnsafe(tableLocation) == EMPTY_OUTPUT_POSITION) {
-                handler.doMissing(chunkPosition);
-            } else if (eq(mainKeySource0.getUnsafe(tableLocation), k0) && eq(mainKeySource1.getUnsafe(tableLocation), k1)) {
-                handler.doMainFound(tableLocation, chunkPosition);
-            } else {
-                int overflowLocation = mainOverflowLocationSource.getUnsafe(tableLocation);
-                if (!findOverflow(handler, k0, k1, chunkPosition, overflowLocation)) {
-                    handler.doMissing(chunkPosition);
-                }
-            }
-        }
-    }
-
-    private static int hash(char k0, float k1) {
-        int hash = CharChunkHasher.hashInitialSingle(k0);
-        hash = FloatChunkHasher.hashUpdateSingle(hash, k1);
-        return hash;
-    }
-
-    @Override
-    protected void rehashBucket(HashHandler handler, int sourceBucket, int destBucket,
-            int bucketsToAdd) {
-        final int position = mainOutputPosition.getUnsafe(sourceBucket);
-        if (position == EMPTY_OUTPUT_POSITION) {
-            return;
-        }
-        int mainInsertLocation = maybeMoveMainBucket(handler, sourceBucket, destBucket, bucketsToAdd);
-        int overflowLocation = mainOverflowLocationSource.getUnsafe(sourceBucket);
-        mainOverflowLocationSource.set(sourceBucket, QueryConstants.NULL_INT);
-        mainOverflowLocationSource.set(destBucket, QueryConstants.NULL_INT);
-        while (overflowLocation != QueryConstants.NULL_INT) {
-            final int nextOverflowLocation = overflowOverflowLocationSource.getUnsafe(overflowLocation);
-            final char overflowKey0 = overflowKeySource0.getUnsafe(overflowLocation);
-            final float overflowKey1 = overflowKeySource1.getUnsafe(overflowLocation);
-            final int overflowHash = hash(overflowKey0, overflowKey1);
-            final int overflowTableLocation = hashToTableLocation(tableHashPivot + bucketsToAdd, overflowHash);
-            if (overflowTableLocation == mainInsertLocation) {
-                mainKeySource0.set(mainInsertLocation, overflowKey0);
-                mainKeySource1.set(mainInsertLocation, overflowKey1);
-                mainOutputPosition.set(mainInsertLocation, overflowOutputPosition.getUnsafe(overflowLocation));
-                handler.doPromoteOverflow(overflowLocation, mainInsertLocation);
-                overflowOutputPosition.set(overflowLocation, QueryConstants.NULL_INT);
-                overflowKeySource0.set(overflowLocation, QueryConstants.NULL_CHAR);
-                overflowKeySource1.set(overflowLocation, QueryConstants.NULL_FLOAT);
-                freeOverflowLocation(overflowLocation);
-                mainInsertLocation = -1;
-            } else {
-                final int oldOverflowLocation = mainOverflowLocationSource.getUnsafe(overflowTableLocation);
-                mainOverflowLocationSource.set(overflowTableLocation, overflowLocation);
-                overflowOverflowLocationSource.set(overflowLocation, oldOverflowLocation);
-            }
-            overflowLocation = nextOverflowLocation;
-        }
-    }
-
-    private int maybeMoveMainBucket(HashHandler handler, int sourceBucket, int destBucket,
-            int bucketsToAdd) {
-        final char k0 = mainKeySource0.getUnsafe(sourceBucket);
-        final float k1 = mainKeySource1.getUnsafe(sourceBucket);
-        final int hash = hash(k0, k1);
-        final int location = hashToTableLocation(tableHashPivot + bucketsToAdd, hash);
-        final int mainInsertLocation;
-        if (location == sourceBucket) {
-            mainInsertLocation = destBucket;
-            mainOutputPosition.set(destBucket, EMPTY_OUTPUT_POSITION);
-        } else {
-            mainInsertLocation = sourceBucket;
-            mainOutputPosition.set(destBucket, mainOutputPosition.getUnsafe(sourceBucket));
-            mainOutputPosition.set(sourceBucket, EMPTY_OUTPUT_POSITION);
-            mainKeySource0.set(destBucket, k0);
-            mainKeySource0.set(sourceBucket, QueryConstants.NULL_CHAR);
-            mainKeySource1.set(destBucket, k1);
-            mainKeySource1.set(sourceBucket, QueryConstants.NULL_FLOAT);
-            handler.doMoveMain(sourceBucket, destBucket);
-        }
-        return mainInsertLocation;
-    }
-
-    private boolean findOverflow(HashHandler handler, char k0, float k1, int chunkPosition,
-            int overflowLocation) {
-        while (overflowLocation != QueryConstants.NULL_INT) {
-            if (eq(overflowKeySource0.getUnsafe(overflowLocation), k0) && eq(overflowKeySource1.getUnsafe(overflowLocation), k1)) {
-                handler.doOverflowFound(overflowLocation, chunkPosition);
-                return true;
-            }
-            overflowLocation = overflowOverflowLocationSource.getUnsafe(overflowLocation);
-        }
-        return false;
-    }
-
-    @Override
-    public int findPositionForKey(Object key) {
-        final Object [] ka = (Object[])key;
-        final char k0 = TypeUtils.unbox((Character)ka[0]);
-        final float k1 = TypeUtils.unbox((Float)ka[1]);
-        int hash = hash(k0, k1);
-        final int tableLocation = hashToTableLocation(tableHashPivot, hash);
-        final int positionValue = mainOutputPosition.getUnsafe(tableLocation);
-        if (positionValue == EMPTY_OUTPUT_POSITION) {
-            return -1;
-        }
-        if (eq(mainKeySource0.getUnsafe(tableLocation), k0) && eq(mainKeySource1.getUnsafe(tableLocation), k1)) {
-            return positionValue;
-        }
-        int overflowLocation = mainOverflowLocationSource.getUnsafe(tableLocation);
-        while (overflowLocation != QueryConstants.NULL_INT) {
-            if (eq(overflowKeySource0.getUnsafe(overflowLocation), k0) && eq(overflowKeySource1.getUnsafe(overflowLocation), k1)) {
-                return overflowOutputPosition.getUnsafe(overflowLocation);
-            }
-            overflowLocation = overflowOverflowLocationSource.getUnsafe(overflowLocation);
-        }
-        return -1;
-    }
-}
diff --git a/engine/table/src/main/java/io/deephaven/engine/table/impl/by/typed/staticagg/gen/StaticAggHasherCharInt.java b/engine/table/src/main/java/io/deephaven/engine/table/impl/by/typed/staticagg/gen/StaticAggHasherCharInt.java
deleted file mode 100644
index d755e6652c3..00000000000
--- a/engine/table/src/main/java/io/deephaven/engine/table/impl/by/typed/staticagg/gen/StaticAggHasherCharInt.java
+++ /dev/null
@@ -1,206 +0,0 @@
-//
-// Copyright (c) 2016-2024 Deephaven Data Labs and Patent Pending
-//
-// ****** AUTO-GENERATED CLASS - DO NOT EDIT MANUALLY
-// ****** Run ReplicateTypedHashers or ./gradlew replicateTypedHashers to regenerate
-//
-// @formatter:off
-package io.deephaven.engine.table.impl.by.typed.staticagg.gen;
-
-import static io.deephaven.util.compare.CharComparisons.eq;
-import static io.deephaven.util.compare.IntComparisons.eq;
-
-import io.deephaven.chunk.CharChunk;
-import io.deephaven.chunk.Chunk;
-import io.deephaven.chunk.IntChunk;
-import io.deephaven.chunk.attributes.Values;
-import io.deephaven.chunk.util.hashing.CharChunkHasher;
-import io.deephaven.chunk.util.hashing.IntChunkHasher;
-import io.deephaven.engine.rowset.RowSequence;
-import io.deephaven.engine.table.ColumnSource;
-import io.deephaven.engine.table.impl.by.HashHandler;
-import io.deephaven.engine.table.impl.by.StaticChunkedOperatorAggregationStateManagerTypedBase;
-import io.deephaven.engine.table.impl.sources.CharacterArraySource;
-import io.deephaven.engine.table.impl.sources.IntegerArraySource;
-import io.deephaven.util.QueryConstants;
-import io.deephaven.util.type.TypeUtils;
-import java.lang.Character;
-import java.lang.Integer;
-import java.lang.Object;
-import java.lang.Override;
-
-final class StaticAggHasherCharInt extends StaticChunkedOperatorAggregationStateManagerTypedBase {
-    private final CharacterArraySource mainKeySource0;
-
-    private final CharacterArraySource overflowKeySource0;
-
-    private final IntegerArraySource mainKeySource1;
-
-    private final IntegerArraySource overflowKeySource1;
-
-    public StaticAggHasherCharInt(ColumnSource[] tableKeySources,
-            ColumnSource[] originalTableKeySources, int tableSize, double maximumLoadFactor,
-            double targetLoadFactor) {
-        super(tableKeySources, tableSize, maximumLoadFactor, targetLoadFactor);
-        this.mainKeySource0 = (CharacterArraySource) super.mainKeySources[0];
-        this.overflowKeySource0 = (CharacterArraySource) super.overflowKeySources[0];
-        this.mainKeySource1 = (IntegerArraySource) super.mainKeySources[1];
-        this.overflowKeySource1 = (IntegerArraySource) super.overflowKeySources[1];
-    }
-
-    @Override
-    protected void build(HashHandler handler, RowSequence rowSequence, Chunk[] sourceKeyChunks) {
-        final CharChunk<Values> keyChunk0 = sourceKeyChunks[0].asCharChunk();
-        final IntChunk<Values> keyChunk1 = sourceKeyChunks[1].asIntChunk();
-        final int chunkSize = keyChunk0.size();
-        for (int chunkPosition = 0; chunkPosition < chunkSize; ++chunkPosition) {
-            final char k0 = keyChunk0.get(chunkPosition);
-            final int k1 = keyChunk1.get(chunkPosition);
-            final int hash = hash(k0, k1);
-            final int tableLocation = hashToTableLocation(tableHashPivot, hash);
-            if (mainOutputPosition.getUnsafe(tableLocation) == EMPTY_OUTPUT_POSITION) {
-                numEntries++;
-                mainKeySource0.set(tableLocation, k0);
-                mainKeySource1.set(tableLocation, k1);
-                handler.doMainInsert(tableLocation, chunkPosition);
-            } else if (eq(mainKeySource0.getUnsafe(tableLocation), k0) && eq(mainKeySource1.getUnsafe(tableLocation), k1)) {
-                handler.doMainFound(tableLocation, chunkPosition);
-            } else {
-                int overflowLocation = mainOverflowLocationSource.getUnsafe(tableLocation);
-                if (!findOverflow(handler, k0, k1, chunkPosition, overflowLocation)) {
-                    final int newOverflowLocation = allocateOverflowLocation();
-                    overflowKeySource0.set(newOverflowLocation, k0);
-                    overflowKeySource1.set(newOverflowLocation, k1);
-                    mainOverflowLocationSource.set(tableLocation, newOverflowLocation);
-                    overflowOverflowLocationSource.set(newOverflowLocation, overflowLocation);
-                    numEntries++;
-                    handler.doOverflowInsert(newOverflowLocation, chunkPosition);
-                }
-            }
-        }
-    }
-
-    @Override
-    protected void probe(HashHandler handler, RowSequence rowSequence, Chunk[] sourceKeyChunks) {
-        final CharChunk<Values> keyChunk0 = sourceKeyChunks[0].asCharChunk();
-        final IntChunk<Values> keyChunk1 = sourceKeyChunks[1].asIntChunk();
-        final int chunkSize = keyChunk0.size();
-        for (int chunkPosition = 0; chunkPosition < chunkSize; ++chunkPosition) {
-            final char k0 = keyChunk0.get(chunkPosition);
-            final int k1 = keyChunk1.get(chunkPosition);
-            final int hash = hash(k0, k1);
-            final int tableLocation = hashToTableLocation(tableHashPivot, hash);
-            if (mainOutputPosition.getUnsafe(tableLocation) == EMPTY_OUTPUT_POSITION) {
-                handler.doMissing(chunkPosition);
-            } else if (eq(mainKeySource0.getUnsafe(tableLocation), k0) && eq(mainKeySource1.getUnsafe(tableLocation), k1)) {
-                handler.doMainFound(tableLocation, chunkPosition);
-            } else {
-                int overflowLocation = mainOverflowLocationSource.getUnsafe(tableLocation);
-                if (!findOverflow(handler, k0, k1, chunkPosition, overflowLocation)) {
-                    handler.doMissing(chunkPosition);
-                }
-            }
-        }
-    }
-
-    private static int hash(char k0, int k1) {
-        int hash = CharChunkHasher.hashInitialSingle(k0);
-        hash = IntChunkHasher.hashUpdateSingle(hash, k1);
-        return hash;
-    }
-
-    @Override
-    protected void rehashBucket(HashHandler handler, int sourceBucket, int destBucket,
-            int bucketsToAdd) {
-        final int position = mainOutputPosition.getUnsafe(sourceBucket);
-        if (position == EMPTY_OUTPUT_POSITION) {
-            return;
-        }
-        int mainInsertLocation = maybeMoveMainBucket(handler, sourceBucket, destBucket, bucketsToAdd);
-        int overflowLocation = mainOverflowLocationSource.getUnsafe(sourceBucket);
-        mainOverflowLocationSource.set(sourceBucket, QueryConstants.NULL_INT);
-        mainOverflowLocationSource.set(destBucket, QueryConstants.NULL_INT);
-        while (overflowLocation != QueryConstants.NULL_INT) {
-            final int nextOverflowLocation = overflowOverflowLocationSource.getUnsafe(overflowLocation);
-            final char overflowKey0 = overflowKeySource0.getUnsafe(overflowLocation);
-            final int overflowKey1 = overflowKeySource1.getUnsafe(overflowLocation);
-            final int overflowHash = hash(overflowKey0, overflowKey1);
-            final int overflowTableLocation = hashToTableLocation(tableHashPivot + bucketsToAdd, overflowHash);
-            if (overflowTableLocation == mainInsertLocation) {
-                mainKeySource0.set(mainInsertLocation, overflowKey0);
-                mainKeySource1.set(mainInsertLocation, overflowKey1);
-                mainOutputPosition.set(mainInsertLocation, overflowOutputPosition.getUnsafe(overflowLocation));
-                handler.doPromoteOverflow(overflowLocation, mainInsertLocation);
-                overflowOutputPosition.set(overflowLocation, QueryConstants.NULL_INT);
-                overflowKeySource0.set(overflowLocation, QueryConstants.NULL_CHAR);
-                overflowKeySource1.set(overflowLocation, QueryConstants.NULL_INT);
-                freeOverflowLocation(overflowLocation);
-                mainInsertLocation = -1;
-            } else {
-                final int oldOverflowLocation = mainOverflowLocationSource.getUnsafe(overflowTableLocation);
-                mainOverflowLocationSource.set(overflowTableLocation, overflowLocation);
-                overflowOverflowLocationSource.set(overflowLocation, oldOverflowLocation);
-            }
-            overflowLocation = nextOverflowLocation;
-        }
-    }
-
-    private int maybeMoveMainBucket(HashHandler handler, int sourceBucket, int destBucket,
-            int bucketsToAdd) {
-        final char k0 = mainKeySource0.getUnsafe(sourceBucket);
-        final int k1 = mainKeySource1.getUnsafe(sourceBucket);
-        final int hash = hash(k0, k1);
-        final int location = hashToTableLocation(tableHashPivot + bucketsToAdd, hash);
-        final int mainInsertLocation;
-        if (location == sourceBucket) {
-            mainInsertLocation = destBucket;
-            mainOutputPosition.set(destBucket, EMPTY_OUTPUT_POSITION);
-        } else {
-            mainInsertLocation = sourceBucket;
-            mainOutputPosition.set(destBucket, mainOutputPosition.getUnsafe(sourceBucket));
-            mainOutputPosition.set(sourceBucket, EMPTY_OUTPUT_POSITION);
-            mainKeySource0.set(destBucket, k0);
-            mainKeySource0.set(sourceBucket, QueryConstants.NULL_CHAR);
-            mainKeySource1.set(destBucket, k1);
-            mainKeySource1.set(sourceBucket, QueryConstants.NULL_INT);
-            handler.doMoveMain(sourceBucket, destBucket);
-        }
-        return mainInsertLocation;
-    }
-
-    private boolean findOverflow(HashHandler handler, char k0, int k1, int chunkPosition,
-            int overflowLocation) {
-        while (overflowLocation != QueryConstants.NULL_INT) {
-            if (eq(overflowKeySource0.getUnsafe(overflowLocation), k0) && eq(overflowKeySource1.getUnsafe(overflowLocation), k1)) {
-                handler.doOverflowFound(overflowLocation, chunkPosition);
-                return true;
-            }
-            overflowLocation = overflowOverflowLocationSource.getUnsafe(overflowLocation);
-        }
-        return false;
-    }
-
-    @Override
-    public int findPositionForKey(Object key) {
-        final Object [] ka = (Object[])key;
-        final char k0 = TypeUtils.unbox((Character)ka[0]);
-        final int k1 = TypeUtils.unbox((Integer)ka[1]);
-        int hash = hash(k0, k1);
-        final int tableLocation = hashToTableLocation(tableHashPivot, hash);
-        final int positionValue = mainOutputPosition.getUnsafe(tableLocation);
-        if (positionValue == EMPTY_OUTPUT_POSITION) {
-            return -1;
-        }
-        if (eq(mainKeySource0.getUnsafe(tableLocation), k0) && eq(mainKeySource1.getUnsafe(tableLocation), k1)) {
-            return positionValue;
-        }
-        int overflowLocation = mainOverflowLocationSource.getUnsafe(tableLocation);
-        while (overflowLocation != QueryConstants.NULL_INT) {
-            if (eq(overflowKeySource0.getUnsafe(overflowLocation), k0) && eq(overflowKeySource1.getUnsafe(overflowLocation), k1)) {
-                return overflowOutputPosition.getUnsafe(overflowLocation);
-            }
-            overflowLocation = overflowOverflowLocationSource.getUnsafe(overflowLocation);
-        }
-        return -1;
-    }
-}
diff --git a/engine/table/src/main/java/io/deephaven/engine/table/impl/by/typed/staticagg/gen/StaticAggHasherCharLong.java b/engine/table/src/main/java/io/deephaven/engine/table/impl/by/typed/staticagg/gen/StaticAggHasherCharLong.java
deleted file mode 100644
index 96e770a2868..00000000000
--- a/engine/table/src/main/java/io/deephaven/engine/table/impl/by/typed/staticagg/gen/StaticAggHasherCharLong.java
+++ /dev/null
@@ -1,206 +0,0 @@
-//
-// Copyright (c) 2016-2024 Deephaven Data Labs and Patent Pending
-//
-// ****** AUTO-GENERATED CLASS - DO NOT EDIT MANUALLY
-// ****** Run ReplicateTypedHashers or ./gradlew replicateTypedHashers to regenerate
-//
-// @formatter:off
-package io.deephaven.engine.table.impl.by.typed.staticagg.gen;
-
-import static io.deephaven.util.compare.CharComparisons.eq;
-import static io.deephaven.util.compare.LongComparisons.eq;
-
-import io.deephaven.chunk.CharChunk;
-import io.deephaven.chunk.Chunk;
-import io.deephaven.chunk.LongChunk;
-import io.deephaven.chunk.attributes.Values;
-import io.deephaven.chunk.util.hashing.CharChunkHasher;
-import io.deephaven.chunk.util.hashing.LongChunkHasher;
-import io.deephaven.engine.rowset.RowSequence;
-import io.deephaven.engine.table.ColumnSource;
-import io.deephaven.engine.table.impl.by.HashHandler;
-import io.deephaven.engine.table.impl.by.StaticChunkedOperatorAggregationStateManagerTypedBase;
-import io.deephaven.engine.table.impl.sources.CharacterArraySource;
-import io.deephaven.engine.table.impl.sources.LongArraySource;
-import io.deephaven.util.QueryConstants;
-import io.deephaven.util.type.TypeUtils;
-import java.lang.Character;
-import java.lang.Long;
-import java.lang.Object;
-import java.lang.Override;
-
-final class StaticAggHasherCharLong extends StaticChunkedOperatorAggregationStateManagerTypedBase {
-    private final CharacterArraySource mainKeySource0;
-
-    private final CharacterArraySource overflowKeySource0;
-
-    private final LongArraySource mainKeySource1;
-
-    private final LongArraySource overflowKeySource1;
-
-    public StaticAggHasherCharLong(ColumnSource[] tableKeySources,
-            ColumnSource[] originalTableKeySources, int tableSize, double maximumLoadFactor,
-            double targetLoadFactor) {
-        super(tableKeySources, tableSize, maximumLoadFactor, targetLoadFactor);
-        this.mainKeySource0 = (CharacterArraySource) super.mainKeySources[0];
-        this.overflowKeySource0 = (CharacterArraySource) super.overflowKeySources[0];
-        this.mainKeySource1 = (LongArraySource) super.mainKeySources[1];
-        this.overflowKeySource1 = (LongArraySource) super.overflowKeySources[1];
-    }
-
-    @Override
-    protected void build(HashHandler handler, RowSequence rowSequence, Chunk[] sourceKeyChunks) {
-        final CharChunk<Values> keyChunk0 = sourceKeyChunks[0].asCharChunk();
-        final LongChunk<Values> keyChunk1 = sourceKeyChunks[1].asLongChunk();
-        final int chunkSize = keyChunk0.size();
-        for (int chunkPosition = 0; chunkPosition < chunkSize; ++chunkPosition) {
-            final char k0 = keyChunk0.get(chunkPosition);
-            final long k1 = keyChunk1.get(chunkPosition);
-            final int hash = hash(k0, k1);
-            final int tableLocation = hashToTableLocation(tableHashPivot, hash);
-            if (mainOutputPosition.getUnsafe(tableLocation) == EMPTY_OUTPUT_POSITION) {
-                numEntries++;
-                mainKeySource0.set(tableLocation, k0);
-                mainKeySource1.set(tableLocation, k1);
-                handler.doMainInsert(tableLocation, chunkPosition);
-            } else if (eq(mainKeySource0.getUnsafe(tableLocation), k0) && eq(mainKeySource1.getUnsafe(tableLocation), k1)) {
-                handler.doMainFound(tableLocation, chunkPosition);
-            } else {
-                int overflowLocation = mainOverflowLocationSource.getUnsafe(tableLocation);
-                if (!findOverflow(handler, k0, k1, chunkPosition, overflowLocation)) {
-                    final int newOverflowLocation = allocateOverflowLocation();
-                    overflowKeySource0.set(newOverflowLocation, k0);
-                    overflowKeySource1.set(newOverflowLocation, k1);
-                    mainOverflowLocationSource.set(tableLocation, newOverflowLocation);
-                    overflowOverflowLocationSource.set(newOverflowLocation, overflowLocation);
-                    numEntries++;
-                    handler.doOverflowInsert(newOverflowLocation, chunkPosition);
-                }
-            }
-        }
-    }
-
-    @Override
-    protected void probe(HashHandler handler, RowSequence rowSequence, Chunk[] sourceKeyChunks) {
-        final CharChunk<Values> keyChunk0 = sourceKeyChunks[0].asCharChunk();
-        final LongChunk<Values> keyChunk1 = sourceKeyChunks[1].asLongChunk();
-        final int chunkSize = keyChunk0.size();
-        for (int chunkPosition = 0; chunkPosition < chunkSize; ++chunkPosition) {
-            final char k0 = keyChunk0.get(chunkPosition);
-            final long k1 = keyChunk1.get(chunkPosition);
-            final int hash = hash(k0, k1);
-            final int tableLocation = hashToTableLocation(tableHashPivot, hash);
-            if (mainOutputPosition.getUnsafe(tableLocation) == EMPTY_OUTPUT_POSITION) {
-                handler.doMissing(chunkPosition);
-            } else if (eq(mainKeySource0.getUnsafe(tableLocation), k0) && eq(mainKeySource1.getUnsafe(tableLocation), k1)) {
-                handler.doMainFound(tableLocation, chunkPosition);
-            } else {
-                int overflowLocation = mainOverflowLocationSource.getUnsafe(tableLocation);
-                if (!findOverflow(handler, k0, k1, chunkPosition, overflowLocation)) {
-                    handler.doMissing(chunkPosition);
-                }
-            }
-        }
-    }
-
-    private static int hash(char k0, long k1) {
-        int hash = CharChunkHasher.hashInitialSingle(k0);
-        hash = LongChunkHasher.hashUpdateSingle(hash, k1);
-        return hash;
-    }
-
-    @Override
-    protected void rehashBucket(HashHandler handler, int sourceBucket, int destBucket,
-            int bucketsToAdd) {
-        final int position = mainOutputPosition.getUnsafe(sourceBucket);
-        if (position == EMPTY_OUTPUT_POSITION) {
-            return;
-        }
-        int mainInsertLocation = maybeMoveMainBucket(handler, sourceBucket, destBucket, bucketsToAdd);
-        int overflowLocation = mainOverflowLocationSource.getUnsafe(sourceBucket);
-        mainOverflowLocationSource.set(sourceBucket, QueryConstants.NULL_INT);
-        mainOverflowLocationSource.set(destBucket, QueryConstants.NULL_INT);
-        while (overflowLocation != QueryConstants.NULL_INT) {
-            final int nextOverflowLocation = overflowOverflowLocationSource.getUnsafe(overflowLocation);
-            final char overflowKey0 = overflowKeySource0.getUnsafe(overflowLocation);
-            final long overflowKey1 = overflowKeySource1.getUnsafe(overflowLocation);
-            final int overflowHash = hash(overflowKey0, overflowKey1);
-            final int overflowTableLocation = hashToTableLocation(tableHashPivot + bucketsToAdd, overflowHash);
-            if (overflowTableLocation == mainInsertLocation) {
-                mainKeySource0.set(mainInsertLocation, overflowKey0);
-                mainKeySource1.set(mainInsertLocation, overflowKey1);
-                mainOutputPosition.set(mainInsertLocation, overflowOutputPosition.getUnsafe(overflowLocation));
-                handler.doPromoteOverflow(overflowLocation, mainInsertLocation);
-                overflowOutputPosition.set(overflowLocation, QueryConstants.NULL_INT);
-                overflowKeySource0.set(overflowLocation, QueryConstants.NULL_CHAR);
-                overflowKeySource1.set(overflowLocation, QueryConstants.NULL_LONG);
-                freeOverflowLocation(overflowLocation);
-                mainInsertLocation = -1;
-            } else {
-                final int oldOverflowLocation = mainOverflowLocationSource.getUnsafe(overflowTableLocation);
-                mainOverflowLocationSource.set(overflowTableLocation, overflowLocation);
-                overflowOverflowLocationSource.set(overflowLocation, oldOverflowLocation);
-            }
-            overflowLocation = nextOverflowLocation;
-        }
-    }
-
-    private int maybeMoveMainBucket(HashHandler handler, int sourceBucket, int destBucket,
-            int bucketsToAdd) {
-        final char k0 = mainKeySource0.getUnsafe(sourceBucket);
-        final long k1 = mainKeySource1.getUnsafe(sourceBucket);
-        final int hash = hash(k0, k1);
-        final int location = hashToTableLocation(tableHashPivot + bucketsToAdd, hash);
-        final int mainInsertLocation;
-        if (location == sourceBucket) {
-            mainInsertLocation = destBucket;
-            mainOutputPosition.set(destBucket, EMPTY_OUTPUT_POSITION);
-        } else {
-            mainInsertLocation = sourceBucket;
-            mainOutputPosition.set(destBucket, mainOutputPosition.getUnsafe(sourceBucket));
-            mainOutputPosition.set(sourceBucket, EMPTY_OUTPUT_POSITION);
-            mainKeySource0.set(destBucket, k0);
-            mainKeySource0.set(sourceBucket, QueryConstants.NULL_CHAR);
-            mainKeySource1.set(destBucket, k1);
-            mainKeySource1.set(sourceBucket, QueryConstants.NULL_LONG);
-            handler.doMoveMain(sourceBucket, destBucket);
-        }
-        return mainInsertLocation;
-    }
-
-    private boolean findOverflow(HashHandler handler, char k0, long k1, int chunkPosition,
-            int overflowLocation) {
-        while (overflowLocation != QueryConstants.NULL_INT) {
-            if (eq(overflowKeySource0.getUnsafe(overflowLocation), k0) && eq(overflowKeySource1.getUnsafe(overflowLocation), k1)) {
-                handler.doOverflowFound(overflowLocation, chunkPosition);
-                return true;
-            }
-            overflowLocation = overflowOverflowLocationSource.getUnsafe(overflowLocation);
-        }
-        return false;
-    }
-
-    @Override
-    public int findPositionForKey(Object key) {
-        final Object [] ka = (Object[])key;
-        final char k0 = TypeUtils.unbox((Character)ka[0]);
-        final long k1 = TypeUtils.unbox((Long)ka[1]);
-        int hash = hash(k0, k1);
-        final int tableLocation = hashToTableLocation(tableHashPivot, hash);
-        final int positionValue = mainOutputPosition.getUnsafe(tableLocation);
-        if (positionValue == EMPTY_OUTPUT_POSITION) {
-            return -1;
-        }
-        if (eq(mainKeySource0.getUnsafe(tableLocation), k0) && eq(mainKeySource1.getUnsafe(tableLocation), k1)) {
-            return positionValue;
-        }
-        int overflowLocation = mainOverflowLocationSource.getUnsafe(tableLocation);
-        while (overflowLocation != QueryConstants.NULL_INT) {
-            if (eq(overflowKeySource0.getUnsafe(overflowLocation), k0) && eq(overflowKeySource1.getUnsafe(overflowLocation), k1)) {
-                return overflowOutputPosition.getUnsafe(overflowLocation);
-            }
-            overflowLocation = overflowOverflowLocationSource.getUnsafe(overflowLocation);
-        }
-        return -1;
-    }
-}
diff --git a/engine/table/src/main/java/io/deephaven/engine/table/impl/by/typed/staticagg/gen/StaticAggHasherCharObject.java b/engine/table/src/main/java/io/deephaven/engine/table/impl/by/typed/staticagg/gen/StaticAggHasherCharObject.java
deleted file mode 100644
index 4adfd2016ca..00000000000
--- a/engine/table/src/main/java/io/deephaven/engine/table/impl/by/typed/staticagg/gen/StaticAggHasherCharObject.java
+++ /dev/null
@@ -1,205 +0,0 @@
-//
-// Copyright (c) 2016-2024 Deephaven Data Labs and Patent Pending
-//
-// ****** AUTO-GENERATED CLASS - DO NOT EDIT MANUALLY
-// ****** Run ReplicateTypedHashers or ./gradlew replicateTypedHashers to regenerate
-//
-// @formatter:off
-package io.deephaven.engine.table.impl.by.typed.staticagg.gen;
-
-import static io.deephaven.util.compare.CharComparisons.eq;
-import static io.deephaven.util.compare.ObjectComparisons.eq;
-
-import io.deephaven.chunk.CharChunk;
-import io.deephaven.chunk.Chunk;
-import io.deephaven.chunk.ObjectChunk;
-import io.deephaven.chunk.attributes.Values;
-import io.deephaven.chunk.util.hashing.CharChunkHasher;
-import io.deephaven.chunk.util.hashing.ObjectChunkHasher;
-import io.deephaven.engine.rowset.RowSequence;
-import io.deephaven.engine.table.ColumnSource;
-import io.deephaven.engine.table.impl.by.HashHandler;
-import io.deephaven.engine.table.impl.by.StaticChunkedOperatorAggregationStateManagerTypedBase;
-import io.deephaven.engine.table.impl.sources.CharacterArraySource;
-import io.deephaven.engine.table.impl.sources.ObjectArraySource;
-import io.deephaven.util.QueryConstants;
-import io.deephaven.util.type.TypeUtils;
-import java.lang.Character;
-import java.lang.Object;
-import java.lang.Override;
-
-final class StaticAggHasherCharObject extends StaticChunkedOperatorAggregationStateManagerTypedBase {
-    private final CharacterArraySource mainKeySource0;
-
-    private final CharacterArraySource overflowKeySource0;
-
-    private final ObjectArraySource mainKeySource1;
-
-    private final ObjectArraySource overflowKeySource1;
-
-    public StaticAggHasherCharObject(ColumnSource[] tableKeySources,
-            ColumnSource[] originalTableKeySources, int tableSize, double maximumLoadFactor,
-            double targetLoadFactor) {
-        super(tableKeySources, tableSize, maximumLoadFactor, targetLoadFactor);
-        this.mainKeySource0 = (CharacterArraySource) super.mainKeySources[0];
-        this.overflowKeySource0 = (CharacterArraySource) super.overflowKeySources[0];
-        this.mainKeySource1 = (ObjectArraySource) super.mainKeySources[1];
-        this.overflowKeySource1 = (ObjectArraySource) super.overflowKeySources[1];
-    }
-
-    @Override
-    protected void build(HashHandler handler, RowSequence rowSequence, Chunk[] sourceKeyChunks) {
-        final CharChunk<Values> keyChunk0 = sourceKeyChunks[0].asCharChunk();
-        final ObjectChunk<Object, Values> keyChunk1 = sourceKeyChunks[1].asObjectChunk();
-        final int chunkSize = keyChunk0.size();
-        for (int chunkPosition = 0; chunkPosition < chunkSize; ++chunkPosition) {
-            final char k0 = keyChunk0.get(chunkPosition);
-            final Object k1 = keyChunk1.get(chunkPosition);
-            final int hash = hash(k0, k1);
-            final int tableLocation = hashToTableLocation(tableHashPivot, hash);
-            if (mainOutputPosition.getUnsafe(tableLocation) == EMPTY_OUTPUT_POSITION) {
-                numEntries++;
-                mainKeySource0.set(tableLocation, k0);
-                mainKeySource1.set(tableLocation, k1);
-                handler.doMainInsert(tableLocation, chunkPosition);
-            } else if (eq(mainKeySource0.getUnsafe(tableLocation), k0) && eq(mainKeySource1.getUnsafe(tableLocation), k1)) {
-                handler.doMainFound(tableLocation, chunkPosition);
-            } else {
-                int overflowLocation = mainOverflowLocationSource.getUnsafe(tableLocation);
-                if (!findOverflow(handler, k0, k1, chunkPosition, overflowLocation)) {
-                    final int newOverflowLocation = allocateOverflowLocation();
-                    overflowKeySource0.set(newOverflowLocation, k0);
-                    overflowKeySource1.set(newOverflowLocation, k1);
-                    mainOverflowLocationSource.set(tableLocation, newOverflowLocation);
-                    overflowOverflowLocationSource.set(newOverflowLocation, overflowLocation);
-                    numEntries++;
-                    handler.doOverflowInsert(newOverflowLocation, chunkPosition);
-                }
-            }
-        }
-    }
-
-    @Override
-    protected void probe(HashHandler handler, RowSequence rowSequence, Chunk[] sourceKeyChunks) {
-        final CharChunk<Values> keyChunk0 = sourceKeyChunks[0].asCharChunk();
-        final ObjectChunk<Object, Values> keyChunk1 = sourceKeyChunks[1].asObjectChunk();
-        final int chunkSize = keyChunk0.size();
-        for (int chunkPosition = 0; chunkPosition < chunkSize; ++chunkPosition) {
-            final char k0 = keyChunk0.get(chunkPosition);
-            final Object k1 = keyChunk1.get(chunkPosition);
-            final int hash = hash(k0, k1);
-            final int tableLocation = hashToTableLocation(tableHashPivot, hash);
-            if (mainOutputPosition.getUnsafe(tableLocation) == EMPTY_OUTPUT_POSITION) {
-                handler.doMissing(chunkPosition);
-            } else if (eq(mainKeySource0.getUnsafe(tableLocation), k0) && eq(mainKeySource1.getUnsafe(tableLocation), k1)) {
-                handler.doMainFound(tableLocation, chunkPosition);
-            } else {
-                int overflowLocation = mainOverflowLocationSource.getUnsafe(tableLocation);
-                if (!findOverflow(handler, k0, k1, chunkPosition, overflowLocation)) {
-                    handler.doMissing(chunkPosition);
-                }
-            }
-        }
-    }
-
-    private static int hash(char k0, Object k1) {
-        int hash = CharChunkHasher.hashInitialSingle(k0);
-        hash = ObjectChunkHasher.hashUpdateSingle(hash, k1);
-        return hash;
-    }
-
-    @Override
-    protected void rehashBucket(HashHandler handler, int sourceBucket, int destBucket,
-            int bucketsToAdd) {
-        final int position = mainOutputPosition.getUnsafe(sourceBucket);
-        if (position == EMPTY_OUTPUT_POSITION) {
-            return;
-        }
-        int mainInsertLocation = maybeMoveMainBucket(handler, sourceBucket, destBucket, bucketsToAdd);
-        int overflowLocation = mainOverflowLocationSource.getUnsafe(sourceBucket);
-        mainOverflowLocationSource.set(sourceBucket, QueryConstants.NULL_INT);
-        mainOverflowLocationSource.set(destBucket, QueryConstants.NULL_INT);
-        while (overflowLocation != QueryConstants.NULL_INT) {
-            final int nextOverflowLocation = overflowOverflowLocationSource.getUnsafe(overflowLocation);
-            final char overflowKey0 = overflowKeySource0.getUnsafe(overflowLocation);
-            final Object overflowKey1 = overflowKeySource1.getUnsafe(overflowLocation);
-            final int overflowHash = hash(overflowKey0, overflowKey1);
-            final int overflowTableLocation = hashToTableLocation(tableHashPivot + bucketsToAdd, overflowHash);
-            if (overflowTableLocation == mainInsertLocation) {
-                mainKeySource0.set(mainInsertLocation, overflowKey0);
-                mainKeySource1.set(mainInsertLocation, overflowKey1);
-                mainOutputPosition.set(mainInsertLocation, overflowOutputPosition.getUnsafe(overflowLocation));
-                handler.doPromoteOverflow(overflowLocation, mainInsertLocation);
-                overflowOutputPosition.set(overflowLocation, QueryConstants.NULL_INT);
-                overflowKeySource0.set(overflowLocation, QueryConstants.NULL_CHAR);
-                overflowKeySource1.set(overflowLocation, null);
-                freeOverflowLocation(overflowLocation);
-                mainInsertLocation = -1;
-            } else {
-                final int oldOverflowLocation = mainOverflowLocationSource.getUnsafe(overflowTableLocation);
-                mainOverflowLocationSource.set(overflowTableLocation, overflowLocation);
-                overflowOverflowLocationSource.set(overflowLocation, oldOverflowLocation);
-            }
-            overflowLocation = nextOverflowLocation;
-        }
-    }
-
-    private int maybeMoveMainBucket(HashHandler handler, int sourceBucket, int destBucket,
-            int bucketsToAdd) {
-        final char k0 = mainKeySource0.getUnsafe(sourceBucket);
-        final Object k1 = mainKeySource1.getUnsafe(sourceBucket);
-        final int hash = hash(k0, k1);
-        final int location = hashToTableLocation(tableHashPivot + bucketsToAdd, hash);
-        final int mainInsertLocation;
-        if (location == sourceBucket) {
-            mainInsertLocation = destBucket;
-            mainOutputPosition.set(destBucket, EMPTY_OUTPUT_POSITION);
-        } else {
-            mainInsertLocation = sourceBucket;
-            mainOutputPosition.set(destBucket, mainOutputPosition.getUnsafe(sourceBucket));
-            mainOutputPosition.set(sourceBucket, EMPTY_OUTPUT_POSITION);
-            mainKeySource0.set(destBucket, k0);
-            mainKeySource0.set(sourceBucket, QueryConstants.NULL_CHAR);
-            mainKeySource1.set(destBucket, k1);
-            mainKeySource1.set(sourceBucket, null);
-            handler.doMoveMain(sourceBucket, destBucket);
-        }
-        return mainInsertLocation;
-    }
-
-    private boolean findOverflow(HashHandler handler, char k0, Object k1, int chunkPosition,
-            int overflowLocation) {
-        while (overflowLocation != QueryConstants.NULL_INT) {
-            if (eq(overflowKeySource0.getUnsafe(overflowLocation), k0) && eq(overflowKeySource1.getUnsafe(overflowLocation), k1)) {
-                handler.doOverflowFound(overflowLocation, chunkPosition);
-                return true;
-            }
-            overflowLocation = overflowOverflowLocationSource.getUnsafe(overflowLocation);
-        }
-        return false;
-    }
-
-    @Override
-    public int findPositionForKey(Object key) {
-        final Object [] ka = (Object[])key;
-        final char k0 = TypeUtils.unbox((Character)ka[0]);
-        final Object k1 = ka[1];
-        int hash = hash(k0, k1);
-        final int tableLocation = hashToTableLocation(tableHashPivot, hash);
-        final int positionValue = mainOutputPosition.getUnsafe(tableLocation);
-        if (positionValue == EMPTY_OUTPUT_POSITION) {
-            return -1;
-        }
-        if (eq(mainKeySource0.getUnsafe(tableLocation), k0) && eq(mainKeySource1.getUnsafe(tableLocation), k1)) {
-            return positionValue;
-        }
-        int overflowLocation = mainOverflowLocationSource.getUnsafe(tableLocation);
-        while (overflowLocation != QueryConstants.NULL_INT) {
-            if (eq(overflowKeySource0.getUnsafe(overflowLocation), k0) && eq(overflowKeySource1.getUnsafe(overflowLocation), k1)) {
-                return overflowOutputPosition.getUnsafe(overflowLocation);
-            }
-            overflowLocation = overflowOverflowLocationSource.getUnsafe(overflowLocation);
-        }
-        return -1;
-    }
-}
diff --git a/engine/table/src/main/java/io/deephaven/engine/table/impl/by/typed/staticagg/gen/StaticAggHasherCharShort.java b/engine/table/src/main/java/io/deephaven/engine/table/impl/by/typed/staticagg/gen/StaticAggHasherCharShort.java
deleted file mode 100644
index 51cee4a789d..00000000000
--- a/engine/table/src/main/java/io/deephaven/engine/table/impl/by/typed/staticagg/gen/StaticAggHasherCharShort.java
+++ /dev/null
@@ -1,206 +0,0 @@
-//
-// Copyright (c) 2016-2024 Deephaven Data Labs and Patent Pending
-//
-// ****** AUTO-GENERATED CLASS - DO NOT EDIT MANUALLY
-// ****** Run ReplicateTypedHashers or ./gradlew replicateTypedHashers to regenerate
-//
-// @formatter:off
-package io.deephaven.engine.table.impl.by.typed.staticagg.gen;
-
-import static io.deephaven.util.compare.CharComparisons.eq;
-import static io.deephaven.util.compare.ShortComparisons.eq;
-
-import io.deephaven.chunk.CharChunk;
-import io.deephaven.chunk.Chunk;
-import io.deephaven.chunk.ShortChunk;
-import io.deephaven.chunk.attributes.Values;
-import io.deephaven.chunk.util.hashing.CharChunkHasher;
-import io.deephaven.chunk.util.hashing.ShortChunkHasher;
-import io.deephaven.engine.rowset.RowSequence;
-import io.deephaven.engine.table.ColumnSource;
-import io.deephaven.engine.table.impl.by.HashHandler;
-import io.deephaven.engine.table.impl.by.StaticChunkedOperatorAggregationStateManagerTypedBase;
-import io.deephaven.engine.table.impl.sources.CharacterArraySource;
-import io.deephaven.engine.table.impl.sources.ShortArraySource;
-import io.deephaven.util.QueryConstants;
-import io.deephaven.util.type.TypeUtils;
-import java.lang.Character;
-import java.lang.Object;
-import java.lang.Override;
-import java.lang.Short;
-
-final class StaticAggHasherCharShort extends StaticChunkedOperatorAggregationStateManagerTypedBase {
-    private final CharacterArraySource mainKeySource0;
-
-    private final CharacterArraySource overflowKeySource0;
-
-    private final ShortArraySource mainKeySource1;
-
-    private final ShortArraySource overflowKeySource1;
-
-    public StaticAggHasherCharShort(ColumnSource[] tableKeySources,
-            ColumnSource[] originalTableKeySources, int tableSize, double maximumLoadFactor,
-            double targetLoadFactor) {
-        super(tableKeySources, tableSize, maximumLoadFactor, targetLoadFactor);
-        this.mainKeySource0 = (CharacterArraySource) super.mainKeySources[0];
-        this.overflowKeySource0 = (CharacterArraySource) super.overflowKeySources[0];
-        this.mainKeySource1 = (ShortArraySource) super.mainKeySources[1];
-        this.overflowKeySource1 = (ShortArraySource) super.overflowKeySources[1];
-    }
-
-    @Override
-    protected void build(HashHandler handler, RowSequence rowSequence, Chunk[] sourceKeyChunks) {
-        final CharChunk<Values> keyChunk0 = sourceKeyChunks[0].asCharChunk();
-        final ShortChunk<Values> keyChunk1 = sourceKeyChunks[1].asShortChunk();
-        final int chunkSize = keyChunk0.size();
-        for (int chunkPosition = 0; chunkPosition < chunkSize; ++chunkPosition) {
-            final char k0 = keyChunk0.get(chunkPosition);
-            final short k1 = keyChunk1.get(chunkPosition);
-            final int hash = hash(k0, k1);
-            final int tableLocation = hashToTableLocation(tableHashPivot, hash);
-            if (mainOutputPosition.getUnsafe(tableLocation) == EMPTY_OUTPUT_POSITION) {
-                numEntries++;
-                mainKeySource0.set(tableLocation, k0);
-                mainKeySource1.set(tableLocation, k1);
-                handler.doMainInsert(tableLocation, chunkPosition);
-            } else if (eq(mainKeySource0.getUnsafe(tableLocation), k0) && eq(mainKeySource1.getUnsafe(tableLocation), k1)) {
-                handler.doMainFound(tableLocation, chunkPosition);
-            } else {
-                int overflowLocation = mainOverflowLocationSource.getUnsafe(tableLocation);
-                if (!findOverflow(handler, k0, k1, chunkPosition, overflowLocation)) {
-                    final int newOverflowLocation = allocateOverflowLocation();
-                    overflowKeySource0.set(newOverflowLocation, k0);
-                    overflowKeySource1.set(newOverflowLocation, k1);
-                    mainOverflowLocationSource.set(tableLocation, newOverflowLocation);
-                    overflowOverflowLocationSource.set(newOverflowLocation, overflowLocation);
-                    numEntries++;
-                    handler.doOverflowInsert(newOverflowLocation, chunkPosition);
-                }
-            }
-        }
-    }
-
-    @Override
-    protected void probe(HashHandler handler, RowSequence rowSequence, Chunk[] sourceKeyChunks) {
-        final CharChunk<Values> keyChunk0 = sourceKeyChunks[0].asCharChunk();
-        final ShortChunk<Values> keyChunk1 = sourceKeyChunks[1].asShortChunk();
-        final int chunkSize = keyChunk0.size();
-        for (int chunkPosition = 0; chunkPosition < chunkSize; ++chunkPosition) {
-            final char k0 = keyChunk0.get(chunkPosition);
-            final short k1 = keyChunk1.get(chunkPosition);
-            final int hash = hash(k0, k1);
-            final int tableLocation = hashToTableLocation(tableHashPivot, hash);
-            if (mainOutputPosition.getUnsafe(tableLocation) == EMPTY_OUTPUT_POSITION) {
-                handler.doMissing(chunkPosition);
-            } else if (eq(mainKeySource0.getUnsafe(tableLocation), k0) && eq(mainKeySource1.getUnsafe(tableLocation), k1)) {
-                handler.doMainFound(tableLocation, chunkPosition);
-            } else {
-                int overflowLocation = mainOverflowLocationSource.getUnsafe(tableLocation);
-                if (!findOverflow(handler, k0, k1, chunkPosition, overflowLocation)) {
-                    handler.doMissing(chunkPosition);
-                }
-            }
-        }
-    }
-
-    private static int hash(char k0, short k1) {
-        int hash = CharChunkHasher.hashInitialSingle(k0);
-        hash = ShortChunkHasher.hashUpdateSingle(hash, k1);
-        return hash;
-    }
-
-    @Override
-    protected void rehashBucket(HashHandler handler, int sourceBucket, int destBucket,
-            int bucketsToAdd) {
-        final int position = mainOutputPosition.getUnsafe(sourceBucket);
-        if (position == EMPTY_OUTPUT_POSITION) {
-            return;
-        }
-        int mainInsertLocation = maybeMoveMainBucket(handler, sourceBucket, destBucket, bucketsToAdd);
-        int overflowLocation = mainOverflowLocationSource.getUnsafe(sourceBucket);
-        mainOverflowLocationSource.set(sourceBucket, QueryConstants.NULL_INT);
-        mainOverflowLocationSource.set(destBucket, QueryConstants.NULL_INT);
-        while (overflowLocation != QueryConstants.NULL_INT) {
-            final int nextOverflowLocation = overflowOverflowLocationSource.getUnsafe(overflowLocation);
-            final char overflowKey0 = overflowKeySource0.getUnsafe(overflowLocation);
-            final short overflowKey1 = overflowKeySource1.getUnsafe(overflowLocation);
-            final int overflowHash = hash(overflowKey0, overflowKey1);
-            final int overflowTableLocation = hashToTableLocation(tableHashPivot + bucketsToAdd, overflowHash);
-            if (overflowTableLocation == mainInsertLocation) {
-                mainKeySource0.set(mainInsertLocation, overflowKey0);
-                mainKeySource1.set(mainInsertLocation, overflowKey1);
-                mainOutputPosition.set(mainInsertLocation, overflowOutputPosition.getUnsafe(overflowLocation));
-                handler.doPromoteOverflow(overflowLocation, mainInsertLocation);
-                overflowOutputPosition.set(overflowLocation, QueryConstants.NULL_INT);
-                overflowKeySource0.set(overflowLocation, QueryConstants.NULL_CHAR);
-                overflowKeySource1.set(overflowLocation, QueryConstants.NULL_SHORT);
-                freeOverflowLocation(overflowLocation);
-                mainInsertLocation = -1;
-            } else {
-                final int oldOverflowLocation = mainOverflowLocationSource.getUnsafe(overflowTableLocation);
-                mainOverflowLocationSource.set(overflowTableLocation, overflowLocation);
-                overflowOverflowLocationSource.set(overflowLocation, oldOverflowLocation);
-            }
-            overflowLocation = nextOverflowLocation;
-        }
-    }
-
-    private int maybeMoveMainBucket(HashHandler handler, int sourceBucket, int destBucket,
-            int bucketsToAdd) {
-        final char k0 = mainKeySource0.getUnsafe(sourceBucket);
-        final short k1 = mainKeySource1.getUnsafe(sourceBucket);
-        final int hash = hash(k0, k1);
-        final int location = hashToTableLocation(tableHashPivot + bucketsToAdd, hash);
-        final int mainInsertLocation;
-        if (location == sourceBucket) {
-            mainInsertLocation = destBucket;
-            mainOutputPosition.set(destBucket, EMPTY_OUTPUT_POSITION);
-        } else {
-            mainInsertLocation = sourceBucket;
-            mainOutputPosition.set(destBucket, mainOutputPosition.getUnsafe(sourceBucket));
-            mainOutputPosition.set(sourceBucket, EMPTY_OUTPUT_POSITION);
-            mainKeySource0.set(destBucket, k0);
-            mainKeySource0.set(sourceBucket, QueryConstants.NULL_CHAR);
-            mainKeySource1.set(destBucket, k1);
-            mainKeySource1.set(sourceBucket, QueryConstants.NULL_SHORT);
-            handler.doMoveMain(sourceBucket, destBucket);
-        }
-        return mainInsertLocation;
-    }
-
-    private boolean findOverflow(HashHandler handler, char k0, short k1, int chunkPosition,
-            int overflowLocation) {
-        while (overflowLocation != QueryConstants.NULL_INT) {
-            if (eq(overflowKeySource0.getUnsafe(overflowLocation), k0) && eq(overflowKeySource1.getUnsafe(overflowLocation), k1)) {
-                handler.doOverflowFound(overflowLocation, chunkPosition);
-                return true;
-            }
-            overflowLocation = overflowOverflowLocationSource.getUnsafe(overflowLocation);
-        }
-        return false;
-    }
-
-    @Override
-    public int findPositionForKey(Object key) {
-        final Object [] ka = (Object[])key;
-        final char k0 = TypeUtils.unbox((Character)ka[0]);
-        final short k1 = TypeUtils.unbox((Short)ka[1]);
-        int hash = hash(k0, k1);
-        final int tableLocation = hashToTableLocation(tableHashPivot, hash);
-        final int positionValue = mainOutputPosition.getUnsafe(tableLocation);
-        if (positionValue == EMPTY_OUTPUT_POSITION) {
-            return -1;
-        }
-        if (eq(mainKeySource0.getUnsafe(tableLocation), k0) && eq(mainKeySource1.getUnsafe(tableLocation), k1)) {
-            return positionValue;
-        }
-        int overflowLocation = mainOverflowLocationSource.getUnsafe(tableLocation);
-        while (overflowLocation != QueryConstants.NULL_INT) {
-            if (eq(overflowKeySource0.getUnsafe(overflowLocation), k0) && eq(overflowKeySource1.getUnsafe(overflowLocation), k1)) {
-                return overflowOutputPosition.getUnsafe(overflowLocation);
-            }
-            overflowLocation = overflowOverflowLocationSource.getUnsafe(overflowLocation);
-        }
-        return -1;
-    }
-}
diff --git a/engine/table/src/main/java/io/deephaven/engine/table/impl/by/typed/staticagg/gen/StaticAggHasherDouble.java b/engine/table/src/main/java/io/deephaven/engine/table/impl/by/typed/staticagg/gen/StaticAggHasherDouble.java
deleted file mode 100644
index efbc7428c9d..00000000000
--- a/engine/table/src/main/java/io/deephaven/engine/table/impl/by/typed/staticagg/gen/StaticAggHasherDouble.java
+++ /dev/null
@@ -1,180 +0,0 @@
-//
-// Copyright (c) 2016-2024 Deephaven Data Labs and Patent Pending
-//
-// ****** AUTO-GENERATED CLASS - DO NOT EDIT MANUALLY
-// ****** Run ReplicateTypedHashers or ./gradlew replicateTypedHashers to regenerate
-//
-// @formatter:off
-package io.deephaven.engine.table.impl.by.typed.staticagg.gen;
-
-import static io.deephaven.util.compare.DoubleComparisons.eq;
-
-import io.deephaven.chunk.Chunk;
-import io.deephaven.chunk.DoubleChunk;
-import io.deephaven.chunk.attributes.Values;
-import io.deephaven.chunk.util.hashing.DoubleChunkHasher;
-import io.deephaven.engine.rowset.RowSequence;
-import io.deephaven.engine.table.ColumnSource;
-import io.deephaven.engine.table.impl.by.HashHandler;
-import io.deephaven.engine.table.impl.by.StaticChunkedOperatorAggregationStateManagerTypedBase;
-import io.deephaven.engine.table.impl.sources.DoubleArraySource;
-import io.deephaven.util.QueryConstants;
-import io.deephaven.util.type.TypeUtils;
-import java.lang.Double;
-import java.lang.Object;
-import java.lang.Override;
-
-final class StaticAggHasherDouble extends StaticChunkedOperatorAggregationStateManagerTypedBase {
-    private final DoubleArraySource mainKeySource0;
-
-    private final DoubleArraySource overflowKeySource0;
-
-    public StaticAggHasherDouble(ColumnSource[] tableKeySources,
-            ColumnSource[] originalTableKeySources, int tableSize, double maximumLoadFactor,
-            double targetLoadFactor) {
-        super(tableKeySources, tableSize, maximumLoadFactor, targetLoadFactor);
-        this.mainKeySource0 = (DoubleArraySource) super.mainKeySources[0];
-        this.overflowKeySource0 = (DoubleArraySource) super.overflowKeySources[0];
-    }
-
-    @Override
-    protected void build(HashHandler handler, RowSequence rowSequence, Chunk[] sourceKeyChunks) {
-        final DoubleChunk<Values> keyChunk0 = sourceKeyChunks[0].asDoubleChunk();
-        final int chunkSize = keyChunk0.size();
-        for (int chunkPosition = 0; chunkPosition < chunkSize; ++chunkPosition) {
-            final double k0 = keyChunk0.get(chunkPosition);
-            final int hash = hash(k0);
-            final int tableLocation = hashToTableLocation(tableHashPivot, hash);
-            if (mainOutputPosition.getUnsafe(tableLocation) == EMPTY_OUTPUT_POSITION) {
-                numEntries++;
-                mainKeySource0.set(tableLocation, k0);
-                handler.doMainInsert(tableLocation, chunkPosition);
-            } else if (eq(mainKeySource0.getUnsafe(tableLocation), k0)) {
-                handler.doMainFound(tableLocation, chunkPosition);
-            } else {
-                int overflowLocation = mainOverflowLocationSource.getUnsafe(tableLocation);
-                if (!findOverflow(handler, k0, chunkPosition, overflowLocation)) {
-                    final int newOverflowLocation = allocateOverflowLocation();
-                    overflowKeySource0.set(newOverflowLocation, k0);
-                    mainOverflowLocationSource.set(tableLocation, newOverflowLocation);
-                    overflowOverflowLocationSource.set(newOverflowLocation, overflowLocation);
-                    numEntries++;
-                    handler.doOverflowInsert(newOverflowLocation, chunkPosition);
-                }
-            }
-        }
-    }
-
-    @Override
-    protected void probe(HashHandler handler, RowSequence rowSequence, Chunk[] sourceKeyChunks) {
-        final DoubleChunk<Values> keyChunk0 = sourceKeyChunks[0].asDoubleChunk();
-        final int chunkSize = keyChunk0.size();
-        for (int chunkPosition = 0; chunkPosition < chunkSize; ++chunkPosition) {
-            final double k0 = keyChunk0.get(chunkPosition);
-            final int hash = hash(k0);
-            final int tableLocation = hashToTableLocation(tableHashPivot, hash);
-            if (mainOutputPosition.getUnsafe(tableLocation) == EMPTY_OUTPUT_POSITION) {
-                handler.doMissing(chunkPosition);
-            } else if (eq(mainKeySource0.getUnsafe(tableLocation), k0)) {
-                handler.doMainFound(tableLocation, chunkPosition);
-            } else {
-                int overflowLocation = mainOverflowLocationSource.getUnsafe(tableLocation);
-                if (!findOverflow(handler, k0, chunkPosition, overflowLocation)) {
-                    handler.doMissing(chunkPosition);
-                }
-            }
-        }
-    }
-
-    private static int hash(double k0) {
-        int hash = DoubleChunkHasher.hashInitialSingle(k0);
-        return hash;
-    }
-
-    @Override
-    protected void rehashBucket(HashHandler handler, int sourceBucket, int destBucket,
-            int bucketsToAdd) {
-        final int position = mainOutputPosition.getUnsafe(sourceBucket);
-        if (position == EMPTY_OUTPUT_POSITION) {
-            return;
-        }
-        int mainInsertLocation = maybeMoveMainBucket(handler, sourceBucket, destBucket, bucketsToAdd);
-        int overflowLocation = mainOverflowLocationSource.getUnsafe(sourceBucket);
-        mainOverflowLocationSource.set(sourceBucket, QueryConstants.NULL_INT);
-        mainOverflowLocationSource.set(destBucket, QueryConstants.NULL_INT);
-        while (overflowLocation != QueryConstants.NULL_INT) {
-            final int nextOverflowLocation = overflowOverflowLocationSource.getUnsafe(overflowLocation);
-            final double overflowKey0 = overflowKeySource0.getUnsafe(overflowLocation);
-            final int overflowHash = hash(overflowKey0);
-            final int overflowTableLocation = hashToTableLocation(tableHashPivot + bucketsToAdd, overflowHash);
-            if (overflowTableLocation == mainInsertLocation) {
-                mainKeySource0.set(mainInsertLocation, overflowKey0);
-                mainOutputPosition.set(mainInsertLocation, overflowOutputPosition.getUnsafe(overflowLocation));
-                handler.doPromoteOverflow(overflowLocation, mainInsertLocation);
-                overflowOutputPosition.set(overflowLocation, QueryConstants.NULL_INT);
-                overflowKeySource0.set(overflowLocation, QueryConstants.NULL_DOUBLE);
-                freeOverflowLocation(overflowLocation);
-                mainInsertLocation = -1;
-            } else {
-                final int oldOverflowLocation = mainOverflowLocationSource.getUnsafe(overflowTableLocation);
-                mainOverflowLocationSource.set(overflowTableLocation, overflowLocation);
-                overflowOverflowLocationSource.set(overflowLocation, oldOverflowLocation);
-            }
-            overflowLocation = nextOverflowLocation;
-        }
-    }
-
-    private int maybeMoveMainBucket(HashHandler handler, int sourceBucket, int destBucket,
-            int bucketsToAdd) {
-        final double k0 = mainKeySource0.getUnsafe(sourceBucket);
-        final int hash = hash(k0);
-        final int location = hashToTableLocation(tableHashPivot + bucketsToAdd, hash);
-        final int mainInsertLocation;
-        if (location == sourceBucket) {
-            mainInsertLocation = destBucket;
-            mainOutputPosition.set(destBucket, EMPTY_OUTPUT_POSITION);
-        } else {
-            mainInsertLocation = sourceBucket;
-            mainOutputPosition.set(destBucket, mainOutputPosition.getUnsafe(sourceBucket));
-            mainOutputPosition.set(sourceBucket, EMPTY_OUTPUT_POSITION);
-            mainKeySource0.set(destBucket, k0);
-            mainKeySource0.set(sourceBucket, QueryConstants.NULL_DOUBLE);
-            handler.doMoveMain(sourceBucket, destBucket);
-        }
-        return mainInsertLocation;
-    }
-
-    private boolean findOverflow(HashHandler handler, double k0, int chunkPosition,
-            int overflowLocation) {
-        while (overflowLocation != QueryConstants.NULL_INT) {
-            if (eq(overflowKeySource0.getUnsafe(overflowLocation), k0)) {
-                handler.doOverflowFound(overflowLocation, chunkPosition);
-                return true;
-            }
-            overflowLocation = overflowOverflowLocationSource.getUnsafe(overflowLocation);
-        }
-        return false;
-    }
-
-    @Override
-    public int findPositionForKey(Object key) {
-        final double k0 = TypeUtils.unbox((Double)key);
-        int hash = hash(k0);
-        final int tableLocation = hashToTableLocation(tableHashPivot, hash);
-        final int positionValue = mainOutputPosition.getUnsafe(tableLocation);
-        if (positionValue == EMPTY_OUTPUT_POSITION) {
-            return -1;
-        }
-        if (eq(mainKeySource0.getUnsafe(tableLocation), k0)) {
-            return positionValue;
-        }
-        int overflowLocation = mainOverflowLocationSource.getUnsafe(tableLocation);
-        while (overflowLocation != QueryConstants.NULL_INT) {
-            if (eq(overflowKeySource0.getUnsafe(overflowLocation), k0)) {
-                return overflowOutputPosition.getUnsafe(overflowLocation);
-            }
-            overflowLocation = overflowOverflowLocationSource.getUnsafe(overflowLocation);
-        }
-        return -1;
-    }
-}
diff --git a/engine/table/src/main/java/io/deephaven/engine/table/impl/by/typed/staticagg/gen/StaticAggHasherDoubleByte.java b/engine/table/src/main/java/io/deephaven/engine/table/impl/by/typed/staticagg/gen/StaticAggHasherDoubleByte.java
deleted file mode 100644
index db099a225ae..00000000000
--- a/engine/table/src/main/java/io/deephaven/engine/table/impl/by/typed/staticagg/gen/StaticAggHasherDoubleByte.java
+++ /dev/null
@@ -1,206 +0,0 @@
-//
-// Copyright (c) 2016-2024 Deephaven Data Labs and Patent Pending
-//
-// ****** AUTO-GENERATED CLASS - DO NOT EDIT MANUALLY
-// ****** Run ReplicateTypedHashers or ./gradlew replicateTypedHashers to regenerate
-//
-// @formatter:off
-package io.deephaven.engine.table.impl.by.typed.staticagg.gen;
-
-import static io.deephaven.util.compare.ByteComparisons.eq;
-import static io.deephaven.util.compare.DoubleComparisons.eq;
-
-import io.deephaven.chunk.ByteChunk;
-import io.deephaven.chunk.Chunk;
-import io.deephaven.chunk.DoubleChunk;
-import io.deephaven.chunk.attributes.Values;
-import io.deephaven.chunk.util.hashing.ByteChunkHasher;
-import io.deephaven.chunk.util.hashing.DoubleChunkHasher;
-import io.deephaven.engine.rowset.RowSequence;
-import io.deephaven.engine.table.ColumnSource;
-import io.deephaven.engine.table.impl.by.HashHandler;
-import io.deephaven.engine.table.impl.by.StaticChunkedOperatorAggregationStateManagerTypedBase;
-import io.deephaven.engine.table.impl.sources.ByteArraySource;
-import io.deephaven.engine.table.impl.sources.DoubleArraySource;
-import io.deephaven.util.QueryConstants;
-import io.deephaven.util.type.TypeUtils;
-import java.lang.Byte;
-import java.lang.Double;
-import java.lang.Object;
-import java.lang.Override;
-
-final class StaticAggHasherDoubleByte extends StaticChunkedOperatorAggregationStateManagerTypedBase {
-    private final DoubleArraySource mainKeySource0;
-
-    private final DoubleArraySource overflowKeySource0;
-
-    private final ByteArraySource mainKeySource1;
-
-    private final ByteArraySource overflowKeySource1;
-
-    public StaticAggHasherDoubleByte(ColumnSource[] tableKeySources,
-            ColumnSource[] originalTableKeySources, int tableSize, double maximumLoadFactor,
-            double targetLoadFactor) {
-        super(tableKeySources, tableSize, maximumLoadFactor, targetLoadFactor);
-        this.mainKeySource0 = (DoubleArraySource) super.mainKeySources[0];
-        this.overflowKeySource0 = (DoubleArraySource) super.overflowKeySources[0];
-        this.mainKeySource1 = (ByteArraySource) super.mainKeySources[1];
-        this.overflowKeySource1 = (ByteArraySource) super.overflowKeySources[1];
-    }
-
-    @Override
-    protected void build(HashHandler handler, RowSequence rowSequence, Chunk[] sourceKeyChunks) {
-        final DoubleChunk<Values> keyChunk0 = sourceKeyChunks[0].asDoubleChunk();
-        final ByteChunk<Values> keyChunk1 = sourceKeyChunks[1].asByteChunk();
-        final int chunkSize = keyChunk0.size();
-        for (int chunkPosition = 0; chunkPosition < chunkSize; ++chunkPosition) {
-            final double k0 = keyChunk0.get(chunkPosition);
-            final byte k1 = keyChunk1.get(chunkPosition);
-            final int hash = hash(k0, k1);
-            final int tableLocation = hashToTableLocation(tableHashPivot, hash);
-            if (mainOutputPosition.getUnsafe(tableLocation) == EMPTY_OUTPUT_POSITION) {
-                numEntries++;
-                mainKeySource0.set(tableLocation, k0);
-                mainKeySource1.set(tableLocation, k1);
-                handler.doMainInsert(tableLocation, chunkPosition);
-            } else if (eq(mainKeySource0.getUnsafe(tableLocation), k0) && eq(mainKeySource1.getUnsafe(tableLocation), k1)) {
-                handler.doMainFound(tableLocation, chunkPosition);
-            } else {
-                int overflowLocation = mainOverflowLocationSource.getUnsafe(tableLocation);
-                if (!findOverflow(handler, k0, k1, chunkPosition, overflowLocation)) {
-                    final int newOverflowLocation = allocateOverflowLocation();
-                    overflowKeySource0.set(newOverflowLocation, k0);
-                    overflowKeySource1.set(newOverflowLocation, k1);
-                    mainOverflowLocationSource.set(tableLocation, newOverflowLocation);
-                    overflowOverflowLocationSource.set(newOverflowLocation, overflowLocation);
-                    numEntries++;
-                    handler.doOverflowInsert(newOverflowLocation, chunkPosition);
-                }
-            }
-        }
-    }
-
-    @Override
-    protected void probe(HashHandler handler, RowSequence rowSequence, Chunk[] sourceKeyChunks) {
-        final DoubleChunk<Values> keyChunk0 = sourceKeyChunks[0].asDoubleChunk();
-        final ByteChunk<Values> keyChunk1 = sourceKeyChunks[1].asByteChunk();
-        final int chunkSize = keyChunk0.size();
-        for (int chunkPosition = 0; chunkPosition < chunkSize; ++chunkPosition) {
-            final double k0 = keyChunk0.get(chunkPosition);
-            final byte k1 = keyChunk1.get(chunkPosition);
-            final int hash = hash(k0, k1);
-            final int tableLocation = hashToTableLocation(tableHashPivot, hash);
-            if (mainOutputPosition.getUnsafe(tableLocation) == EMPTY_OUTPUT_POSITION) {
-                handler.doMissing(chunkPosition);
-            } else if (eq(mainKeySource0.getUnsafe(tableLocation), k0) && eq(mainKeySource1.getUnsafe(tableLocation), k1)) {
-                handler.doMainFound(tableLocation, chunkPosition);
-            } else {
-                int overflowLocation = mainOverflowLocationSource.getUnsafe(tableLocation);
-                if (!findOverflow(handler, k0, k1, chunkPosition, overflowLocation)) {
-                    handler.doMissing(chunkPosition);
-                }
-            }
-        }
-    }
-
-    private static int hash(double k0, byte k1) {
-        int hash = DoubleChunkHasher.hashInitialSingle(k0);
-        hash = ByteChunkHasher.hashUpdateSingle(hash, k1);
-        return hash;
-    }
-
-    @Override
-    protected void rehashBucket(HashHandler handler, int sourceBucket, int destBucket,
-            int bucketsToAdd) {
-        final int position = mainOutputPosition.getUnsafe(sourceBucket);
-        if (position == EMPTY_OUTPUT_POSITION) {
-            return;
-        }
-        int mainInsertLocation = maybeMoveMainBucket(handler, sourceBucket, destBucket, bucketsToAdd);
-        int overflowLocation = mainOverflowLocationSource.getUnsafe(sourceBucket);
-        mainOverflowLocationSource.set(sourceBucket, QueryConstants.NULL_INT);
-        mainOverflowLocationSource.set(destBucket, QueryConstants.NULL_INT);
-        while (overflowLocation != QueryConstants.NULL_INT) {
-            final int nextOverflowLocation = overflowOverflowLocationSource.getUnsafe(overflowLocation);
-            final double overflowKey0 = overflowKeySource0.getUnsafe(overflowLocation);
-            final byte overflowKey1 = overflowKeySource1.getUnsafe(overflowLocation);
-            final int overflowHash = hash(overflowKey0, overflowKey1);
-            final int overflowTableLocation = hashToTableLocation(tableHashPivot + bucketsToAdd, overflowHash);
-            if (overflowTableLocation == mainInsertLocation) {
-                mainKeySource0.set(mainInsertLocation, overflowKey0);
-                mainKeySource1.set(mainInsertLocation, overflowKey1);
-                mainOutputPosition.set(mainInsertLocation, overflowOutputPosition.getUnsafe(overflowLocation));
-                handler.doPromoteOverflow(overflowLocation, mainInsertLocation);
-                overflowOutputPosition.set(overflowLocation, QueryConstants.NULL_INT);
-                overflowKeySource0.set(overflowLocation, QueryConstants.NULL_DOUBLE);
-                overflowKeySource1.set(overflowLocation, QueryConstants.NULL_BYTE);
-                freeOverflowLocation(overflowLocation);
-                mainInsertLocation = -1;
-            } else {
-                final int oldOverflowLocation = mainOverflowLocationSource.getUnsafe(overflowTableLocation);
-                mainOverflowLocationSource.set(overflowTableLocation, overflowLocation);
-                overflowOverflowLocationSource.set(overflowLocation, oldOverflowLocation);
-            }
-            overflowLocation = nextOverflowLocation;
-        }
-    }
-
-    private int maybeMoveMainBucket(HashHandler handler, int sourceBucket, int destBucket,
-            int bucketsToAdd) {
-        final double k0 = mainKeySource0.getUnsafe(sourceBucket);
-        final byte k1 = mainKeySource1.getUnsafe(sourceBucket);
-        final int hash = hash(k0, k1);
-        final int location = hashToTableLocation(tableHashPivot + bucketsToAdd, hash);
-        final int mainInsertLocation;
-        if (location == sourceBucket) {
-            mainInsertLocation = destBucket;
-            mainOutputPosition.set(destBucket, EMPTY_OUTPUT_POSITION);
-        } else {
-            mainInsertLocation = sourceBucket;
-            mainOutputPosition.set(destBucket, mainOutputPosition.getUnsafe(sourceBucket));
-            mainOutputPosition.set(sourceBucket, EMPTY_OUTPUT_POSITION);
-            mainKeySource0.set(destBucket, k0);
-            mainKeySource0.set(sourceBucket, QueryConstants.NULL_DOUBLE);
-            mainKeySource1.set(destBucket, k1);
-            mainKeySource1.set(sourceBucket, QueryConstants.NULL_BYTE);
-            handler.doMoveMain(sourceBucket, destBucket);
-        }
-        return mainInsertLocation;
-    }
-
-    private boolean findOverflow(HashHandler handler, double k0, byte k1, int chunkPosition,
-            int overflowLocation) {
-        while (overflowLocation != QueryConstants.NULL_INT) {
-            if (eq(overflowKeySource0.getUnsafe(overflowLocation), k0) && eq(overflowKeySource1.getUnsafe(overflowLocation), k1)) {
-                handler.doOverflowFound(overflowLocation, chunkPosition);
-                return true;
-            }
-            overflowLocation = overflowOverflowLocationSource.getUnsafe(overflowLocation);
-        }
-        return false;
-    }
-
-    @Override
-    public int findPositionForKey(Object key) {
-        final Object [] ka = (Object[])key;
-        final double k0 = TypeUtils.unbox((Double)ka[0]);
-        final byte k1 = TypeUtils.unbox((Byte)ka[1]);
-        int hash = hash(k0, k1);
-        final int tableLocation = hashToTableLocation(tableHashPivot, hash);
-        final int positionValue = mainOutputPosition.getUnsafe(tableLocation);
-        if (positionValue == EMPTY_OUTPUT_POSITION) {
-            return -1;
-        }
-        if (eq(mainKeySource0.getUnsafe(tableLocation), k0) && eq(mainKeySource1.getUnsafe(tableLocation), k1)) {
-            return positionValue;
-        }
-        int overflowLocation = mainOverflowLocationSource.getUnsafe(tableLocation);
-        while (overflowLocation != QueryConstants.NULL_INT) {
-            if (eq(overflowKeySource0.getUnsafe(overflowLocation), k0) && eq(overflowKeySource1.getUnsafe(overflowLocation), k1)) {
-                return overflowOutputPosition.getUnsafe(overflowLocation);
-            }
-            overflowLocation = overflowOverflowLocationSource.getUnsafe(overflowLocation);
-        }
-        return -1;
-    }
-}
diff --git a/engine/table/src/main/java/io/deephaven/engine/table/impl/by/typed/staticagg/gen/StaticAggHasherDoubleChar.java b/engine/table/src/main/java/io/deephaven/engine/table/impl/by/typed/staticagg/gen/StaticAggHasherDoubleChar.java
deleted file mode 100644
index ad978961c19..00000000000
--- a/engine/table/src/main/java/io/deephaven/engine/table/impl/by/typed/staticagg/gen/StaticAggHasherDoubleChar.java
+++ /dev/null
@@ -1,206 +0,0 @@
-//
-// Copyright (c) 2016-2024 Deephaven Data Labs and Patent Pending
-//
-// ****** AUTO-GENERATED CLASS - DO NOT EDIT MANUALLY
-// ****** Run ReplicateTypedHashers or ./gradlew replicateTypedHashers to regenerate
-//
-// @formatter:off
-package io.deephaven.engine.table.impl.by.typed.staticagg.gen;
-
-import static io.deephaven.util.compare.CharComparisons.eq;
-import static io.deephaven.util.compare.DoubleComparisons.eq;
-
-import io.deephaven.chunk.CharChunk;
-import io.deephaven.chunk.Chunk;
-import io.deephaven.chunk.DoubleChunk;
-import io.deephaven.chunk.attributes.Values;
-import io.deephaven.chunk.util.hashing.CharChunkHasher;
-import io.deephaven.chunk.util.hashing.DoubleChunkHasher;
-import io.deephaven.engine.rowset.RowSequence;
-import io.deephaven.engine.table.ColumnSource;
-import io.deephaven.engine.table.impl.by.HashHandler;
-import io.deephaven.engine.table.impl.by.StaticChunkedOperatorAggregationStateManagerTypedBase;
-import io.deephaven.engine.table.impl.sources.CharacterArraySource;
-import io.deephaven.engine.table.impl.sources.DoubleArraySource;
-import io.deephaven.util.QueryConstants;
-import io.deephaven.util.type.TypeUtils;
-import java.lang.Character;
-import java.lang.Double;
-import java.lang.Object;
-import java.lang.Override;
-
-final class StaticAggHasherDoubleChar extends StaticChunkedOperatorAggregationStateManagerTypedBase {
-    private final DoubleArraySource mainKeySource0;
-
-    private final DoubleArraySource overflowKeySource0;
-
-    private final CharacterArraySource mainKeySource1;
-
-    private final CharacterArraySource overflowKeySource1;
-
-    public StaticAggHasherDoubleChar(ColumnSource[] tableKeySources,
-            ColumnSource[] originalTableKeySources, int tableSize, double maximumLoadFactor,
-            double targetLoadFactor) {
-        super(tableKeySources, tableSize, maximumLoadFactor, targetLoadFactor);
-        this.mainKeySource0 = (DoubleArraySource) super.mainKeySources[0];
-        this.overflowKeySource0 = (DoubleArraySource) super.overflowKeySources[0];
-        this.mainKeySource1 = (CharacterArraySource) super.mainKeySources[1];
-        this.overflowKeySource1 = (CharacterArraySource) super.overflowKeySources[1];
-    }
-
-    @Override
-    protected void build(HashHandler handler, RowSequence rowSequence, Chunk[] sourceKeyChunks) {
-        final DoubleChunk<Values> keyChunk0 = sourceKeyChunks[0].asDoubleChunk();
-        final CharChunk<Values> keyChunk1 = sourceKeyChunks[1].asCharChunk();
-        final int chunkSize = keyChunk0.size();
-        for (int chunkPosition = 0; chunkPosition < chunkSize; ++chunkPosition) {
-            final double k0 = keyChunk0.get(chunkPosition);
-            final char k1 = keyChunk1.get(chunkPosition);
-            final int hash = hash(k0, k1);
-            final int tableLocation = hashToTableLocation(tableHashPivot, hash);
-            if (mainOutputPosition.getUnsafe(tableLocation) == EMPTY_OUTPUT_POSITION) {
-                numEntries++;
-                mainKeySource0.set(tableLocation, k0);
-                mainKeySource1.set(tableLocation, k1);
-                handler.doMainInsert(tableLocation, chunkPosition);
-            } else if (eq(mainKeySource0.getUnsafe(tableLocation), k0) && eq(mainKeySource1.getUnsafe(tableLocation), k1)) {
-                handler.doMainFound(tableLocation, chunkPosition);
-            } else {
-                int overflowLocation = mainOverflowLocationSource.getUnsafe(tableLocation);
-                if (!findOverflow(handler, k0, k1, chunkPosition, overflowLocation)) {
-                    final int newOverflowLocation = allocateOverflowLocation();
-                    overflowKeySource0.set(newOverflowLocation, k0);
-                    overflowKeySource1.set(newOverflowLocation, k1);
-                    mainOverflowLocationSource.set(tableLocation, newOverflowLocation);
-                    overflowOverflowLocationSource.set(newOverflowLocation, overflowLocation);
-                    numEntries++;
-                    handler.doOverflowInsert(newOverflowLocation, chunkPosition);
-                }
-            }
-        }
-    }
-
-    @Override
-    protected void probe(HashHandler handler, RowSequence rowSequence, Chunk[] sourceKeyChunks) {
-        final DoubleChunk<Values> keyChunk0 = sourceKeyChunks[0].asDoubleChunk();
-        final CharChunk<Values> keyChunk1 = sourceKeyChunks[1].asCharChunk();
-        final int chunkSize = keyChunk0.size();
-        for (int chunkPosition = 0; chunkPosition < chunkSize; ++chunkPosition) {
-            final double k0 = keyChunk0.get(chunkPosition);
-            final char k1 = keyChunk1.get(chunkPosition);
-            final int hash = hash(k0, k1);
-            final int tableLocation = hashToTableLocation(tableHashPivot, hash);
-            if (mainOutputPosition.getUnsafe(tableLocation) == EMPTY_OUTPUT_POSITION) {
-                handler.doMissing(chunkPosition);
-            } else if (eq(mainKeySource0.getUnsafe(tableLocation), k0) && eq(mainKeySource1.getUnsafe(tableLocation), k1)) {
-                handler.doMainFound(tableLocation, chunkPosition);
-            } else {
-                int overflowLocation = mainOverflowLocationSource.getUnsafe(tableLocation);
-                if (!findOverflow(handler, k0, k1, chunkPosition, overflowLocation)) {
-                    handler.doMissing(chunkPosition);
-                }
-            }
-        }
-    }
-
-    private static int hash(double k0, char k1) {
-        int hash = DoubleChunkHasher.hashInitialSingle(k0);
-        hash = CharChunkHasher.hashUpdateSingle(hash, k1);
-        return hash;
-    }
-
-    @Override
-    protected void rehashBucket(HashHandler handler, int sourceBucket, int destBucket,
-            int bucketsToAdd) {
-        final int position = mainOutputPosition.getUnsafe(sourceBucket);
-        if (position == EMPTY_OUTPUT_POSITION) {
-            return;
-        }
-        int mainInsertLocation = maybeMoveMainBucket(handler, sourceBucket, destBucket, bucketsToAdd);
-        int overflowLocation = mainOverflowLocationSource.getUnsafe(sourceBucket);
-        mainOverflowLocationSource.set(sourceBucket, QueryConstants.NULL_INT);
-        mainOverflowLocationSource.set(destBucket, QueryConstants.NULL_INT);
-        while (overflowLocation != QueryConstants.NULL_INT) {
-            final int nextOverflowLocation = overflowOverflowLocationSource.getUnsafe(overflowLocation);
-            final double overflowKey0 = overflowKeySource0.getUnsafe(overflowLocation);
-            final char overflowKey1 = overflowKeySource1.getUnsafe(overflowLocation);
-            final int overflowHash = hash(overflowKey0, overflowKey1);
-            final int overflowTableLocation = hashToTableLocation(tableHashPivot + bucketsToAdd, overflowHash);
-            if (overflowTableLocation == mainInsertLocation) {
-                mainKeySource0.set(mainInsertLocation, overflowKey0);
-                mainKeySource1.set(mainInsertLocation, overflowKey1);
-                mainOutputPosition.set(mainInsertLocation, overflowOutputPosition.getUnsafe(overflowLocation));
-                handler.doPromoteOverflow(overflowLocation, mainInsertLocation);
-                overflowOutputPosition.set(overflowLocation, QueryConstants.NULL_INT);
-                overflowKeySource0.set(overflowLocation, QueryConstants.NULL_DOUBLE);
-                overflowKeySource1.set(overflowLocation, QueryConstants.NULL_CHAR);
-                freeOverflowLocation(overflowLocation);
-                mainInsertLocation = -1;
-            } else {
-                final int oldOverflowLocation = mainOverflowLocationSource.getUnsafe(overflowTableLocation);
-                mainOverflowLocationSource.set(overflowTableLocation, overflowLocation);
-                overflowOverflowLocationSource.set(overflowLocation, oldOverflowLocation);
-            }
-            overflowLocation = nextOverflowLocation;
-        }
-    }
-
-    private int maybeMoveMainBucket(HashHandler handler, int sourceBucket, int destBucket,
-            int bucketsToAdd) {
-        final double k0 = mainKeySource0.getUnsafe(sourceBucket);
-        final char k1 = mainKeySource1.getUnsafe(sourceBucket);
-        final int hash = hash(k0, k1);
-        final int location = hashToTableLocation(tableHashPivot + bucketsToAdd, hash);
-        final int mainInsertLocation;
-        if (location == sourceBucket) {
-            mainInsertLocation = destBucket;
-            mainOutputPosition.set(destBucket, EMPTY_OUTPUT_POSITION);
-        } else {
-            mainInsertLocation = sourceBucket;
-            mainOutputPosition.set(destBucket, mainOutputPosition.getUnsafe(sourceBucket));
-            mainOutputPosition.set(sourceBucket, EMPTY_OUTPUT_POSITION);
-            mainKeySource0.set(destBucket, k0);
-            mainKeySource0.set(sourceBucket, QueryConstants.NULL_DOUBLE);
-            mainKeySource1.set(destBucket, k1);
-            mainKeySource1.set(sourceBucket, QueryConstants.NULL_CHAR);
-            handler.doMoveMain(sourceBucket, destBucket);
-        }
-        return mainInsertLocation;
-    }
-
-    private boolean findOverflow(HashHandler handler, double k0, char k1, int chunkPosition,
-            int overflowLocation) {
-        while (overflowLocation != QueryConstants.NULL_INT) {
-            if (eq(overflowKeySource0.getUnsafe(overflowLocation), k0) && eq(overflowKeySource1.getUnsafe(overflowLocation), k1)) {
-                handler.doOverflowFound(overflowLocation, chunkPosition);
-                return true;
-            }
-            overflowLocation = overflowOverflowLocationSource.getUnsafe(overflowLocation);
-        }
-        return false;
-    }
-
-    @Override
-    public int findPositionForKey(Object key) {
-        final Object [] ka = (Object[])key;
-        final double k0 = TypeUtils.unbox((Double)ka[0]);
-        final char k1 = TypeUtils.unbox((Character)ka[1]);
-        int hash = hash(k0, k1);
-        final int tableLocation = hashToTableLocation(tableHashPivot, hash);
-        final int positionValue = mainOutputPosition.getUnsafe(tableLocation);
-        if (positionValue == EMPTY_OUTPUT_POSITION) {
-            return -1;
-        }
-        if (eq(mainKeySource0.getUnsafe(tableLocation), k0) && eq(mainKeySource1.getUnsafe(tableLocation), k1)) {
-            return positionValue;
-        }
-        int overflowLocation = mainOverflowLocationSource.getUnsafe(tableLocation);
-        while (overflowLocation != QueryConstants.NULL_INT) {
-            if (eq(overflowKeySource0.getUnsafe(overflowLocation), k0) && eq(overflowKeySource1.getUnsafe(overflowLocation), k1)) {
-                return overflowOutputPosition.getUnsafe(overflowLocation);
-            }
-            overflowLocation = overflowOverflowLocationSource.getUnsafe(overflowLocation);
-        }
-        return -1;
-    }
-}
diff --git a/engine/table/src/main/java/io/deephaven/engine/table/impl/by/typed/staticagg/gen/StaticAggHasherDoubleDouble.java b/engine/table/src/main/java/io/deephaven/engine/table/impl/by/typed/staticagg/gen/StaticAggHasherDoubleDouble.java
deleted file mode 100644
index 337f1381a67..00000000000
--- a/engine/table/src/main/java/io/deephaven/engine/table/impl/by/typed/staticagg/gen/StaticAggHasherDoubleDouble.java
+++ /dev/null
@@ -1,201 +0,0 @@
-//
-// Copyright (c) 2016-2024 Deephaven Data Labs and Patent Pending
-//
-// ****** AUTO-GENERATED CLASS - DO NOT EDIT MANUALLY
-// ****** Run ReplicateTypedHashers or ./gradlew replicateTypedHashers to regenerate
-//
-// @formatter:off
-package io.deephaven.engine.table.impl.by.typed.staticagg.gen;
-
-import static io.deephaven.util.compare.DoubleComparisons.eq;
-
-import io.deephaven.chunk.Chunk;
-import io.deephaven.chunk.DoubleChunk;
-import io.deephaven.chunk.attributes.Values;
-import io.deephaven.chunk.util.hashing.DoubleChunkHasher;
-import io.deephaven.engine.rowset.RowSequence;
-import io.deephaven.engine.table.ColumnSource;
-import io.deephaven.engine.table.impl.by.HashHandler;
-import io.deephaven.engine.table.impl.by.StaticChunkedOperatorAggregationStateManagerTypedBase;
-import io.deephaven.engine.table.impl.sources.DoubleArraySource;
-import io.deephaven.util.QueryConstants;
-import io.deephaven.util.type.TypeUtils;
-import java.lang.Double;
-import java.lang.Object;
-import java.lang.Override;
-
-final class StaticAggHasherDoubleDouble extends StaticChunkedOperatorAggregationStateManagerTypedBase {
-    private final DoubleArraySource mainKeySource0;
-
-    private final DoubleArraySource overflowKeySource0;
-
-    private final DoubleArraySource mainKeySource1;
-
-    private final DoubleArraySource overflowKeySource1;
-
-    public StaticAggHasherDoubleDouble(ColumnSource[] tableKeySources,
-            ColumnSource[] originalTableKeySources, int tableSize, double maximumLoadFactor,
-            double targetLoadFactor) {
-        super(tableKeySources, tableSize, maximumLoadFactor, targetLoadFactor);
-        this.mainKeySource0 = (DoubleArraySource) super.mainKeySources[0];
-        this.overflowKeySource0 = (DoubleArraySource) super.overflowKeySources[0];
-        this.mainKeySource1 = (DoubleArraySource) super.mainKeySources[1];
-        this.overflowKeySource1 = (DoubleArraySource) super.overflowKeySources[1];
-    }
-
-    @Override
-    protected void build(HashHandler handler, RowSequence rowSequence, Chunk[] sourceKeyChunks) {
-        final DoubleChunk<Values> keyChunk0 = sourceKeyChunks[0].asDoubleChunk();
-        final DoubleChunk<Values> keyChunk1 = sourceKeyChunks[1].asDoubleChunk();
-        final int chunkSize = keyChunk0.size();
-        for (int chunkPosition = 0; chunkPosition < chunkSize; ++chunkPosition) {
-            final double k0 = keyChunk0.get(chunkPosition);
-            final double k1 = keyChunk1.get(chunkPosition);
-            final int hash = hash(k0, k1);
-            final int tableLocation = hashToTableLocation(tableHashPivot, hash);
-            if (mainOutputPosition.getUnsafe(tableLocation) == EMPTY_OUTPUT_POSITION) {
-                numEntries++;
-                mainKeySource0.set(tableLocation, k0);
-                mainKeySource1.set(tableLocation, k1);
-                handler.doMainInsert(tableLocation, chunkPosition);
-            } else if (eq(mainKeySource0.getUnsafe(tableLocation), k0) && eq(mainKeySource1.getUnsafe(tableLocation), k1)) {
-                handler.doMainFound(tableLocation, chunkPosition);
-            } else {
-                int overflowLocation = mainOverflowLocationSource.getUnsafe(tableLocation);
-                if (!findOverflow(handler, k0, k1, chunkPosition, overflowLocation)) {
-                    final int newOverflowLocation = allocateOverflowLocation();
-                    overflowKeySource0.set(newOverflowLocation, k0);
-                    overflowKeySource1.set(newOverflowLocation, k1);
-                    mainOverflowLocationSource.set(tableLocation, newOverflowLocation);
-                    overflowOverflowLocationSource.set(newOverflowLocation, overflowLocation);
-                    numEntries++;
-                    handler.doOverflowInsert(newOverflowLocation, chunkPosition);
-                }
-            }
-        }
-    }
-
-    @Override
-    protected void probe(HashHandler handler, RowSequence rowSequence, Chunk[] sourceKeyChunks) {
-        final DoubleChunk<Values> keyChunk0 = sourceKeyChunks[0].asDoubleChunk();
-        final DoubleChunk<Values> keyChunk1 = sourceKeyChunks[1].asDoubleChunk();
-        final int chunkSize = keyChunk0.size();
-        for (int chunkPosition = 0; chunkPosition < chunkSize; ++chunkPosition) {
-            final double k0 = keyChunk0.get(chunkPosition);
-            final double k1 = keyChunk1.get(chunkPosition);
-            final int hash = hash(k0, k1);
-            final int tableLocation = hashToTableLocation(tableHashPivot, hash);
-            if (mainOutputPosition.getUnsafe(tableLocation) == EMPTY_OUTPUT_POSITION) {
-                handler.doMissing(chunkPosition);
-            } else if (eq(mainKeySource0.getUnsafe(tableLocation), k0) && eq(mainKeySource1.getUnsafe(tableLocation), k1)) {
-                handler.doMainFound(tableLocation, chunkPosition);
-            } else {
-                int overflowLocation = mainOverflowLocationSource.getUnsafe(tableLocation);
-                if (!findOverflow(handler, k0, k1, chunkPosition, overflowLocation)) {
-                    handler.doMissing(chunkPosition);
-                }
-            }
-        }
-    }
-
-    private static int hash(double k0, double k1) {
-        int hash = DoubleChunkHasher.hashInitialSingle(k0);
-        hash = DoubleChunkHasher.hashUpdateSingle(hash, k1);
-        return hash;
-    }
-
-    @Override
-    protected void rehashBucket(HashHandler handler, int sourceBucket, int destBucket,
-            int bucketsToAdd) {
-        final int position = mainOutputPosition.getUnsafe(sourceBucket);
-        if (position == EMPTY_OUTPUT_POSITION) {
-            return;
-        }
-        int mainInsertLocation = maybeMoveMainBucket(handler, sourceBucket, destBucket, bucketsToAdd);
-        int overflowLocation = mainOverflowLocationSource.getUnsafe(sourceBucket);
-        mainOverflowLocationSource.set(sourceBucket, QueryConstants.NULL_INT);
-        mainOverflowLocationSource.set(destBucket, QueryConstants.NULL_INT);
-        while (overflowLocation != QueryConstants.NULL_INT) {
-            final int nextOverflowLocation = overflowOverflowLocationSource.getUnsafe(overflowLocation);
-            final double overflowKey0 = overflowKeySource0.getUnsafe(overflowLocation);
-            final double overflowKey1 = overflowKeySource1.getUnsafe(overflowLocation);
-            final int overflowHash = hash(overflowKey0, overflowKey1);
-            final int overflowTableLocation = hashToTableLocation(tableHashPivot + bucketsToAdd, overflowHash);
-            if (overflowTableLocation == mainInsertLocation) {
-                mainKeySource0.set(mainInsertLocation, overflowKey0);
-                mainKeySource1.set(mainInsertLocation, overflowKey1);
-                mainOutputPosition.set(mainInsertLocation, overflowOutputPosition.getUnsafe(overflowLocation));
-                handler.doPromoteOverflow(overflowLocation, mainInsertLocation);
-                overflowOutputPosition.set(overflowLocation, QueryConstants.NULL_INT);
-                overflowKeySource0.set(overflowLocation, QueryConstants.NULL_DOUBLE);
-                overflowKeySource1.set(overflowLocation, QueryConstants.NULL_DOUBLE);
-                freeOverflowLocation(overflowLocation);
-                mainInsertLocation = -1;
-            } else {
-                final int oldOverflowLocation = mainOverflowLocationSource.getUnsafe(overflowTableLocation);
-                mainOverflowLocationSource.set(overflowTableLocation, overflowLocation);
-                overflowOverflowLocationSource.set(overflowLocation, oldOverflowLocation);
-            }
-            overflowLocation = nextOverflowLocation;
-        }
-    }
-
-    private int maybeMoveMainBucket(HashHandler handler, int sourceBucket, int destBucket,
-            int bucketsToAdd) {
-        final double k0 = mainKeySource0.getUnsafe(sourceBucket);
-        final double k1 = mainKeySource1.getUnsafe(sourceBucket);
-        final int hash = hash(k0, k1);
-        final int location = hashToTableLocation(tableHashPivot + bucketsToAdd, hash);
-        final int mainInsertLocation;
-        if (location == sourceBucket) {
-            mainInsertLocation = destBucket;
-            mainOutputPosition.set(destBucket, EMPTY_OUTPUT_POSITION);
-        } else {
-            mainInsertLocation = sourceBucket;
-            mainOutputPosition.set(destBucket, mainOutputPosition.getUnsafe(sourceBucket));
-            mainOutputPosition.set(sourceBucket, EMPTY_OUTPUT_POSITION);
-            mainKeySource0.set(destBucket, k0);
-            mainKeySource0.set(sourceBucket, QueryConstants.NULL_DOUBLE);
-            mainKeySource1.set(destBucket, k1);
-            mainKeySource1.set(sourceBucket, QueryConstants.NULL_DOUBLE);
-            handler.doMoveMain(sourceBucket, destBucket);
-        }
-        return mainInsertLocation;
-    }
-
-    private boolean findOverflow(HashHandler handler, double k0, double k1, int chunkPosition,
-            int overflowLocation) {
-        while (overflowLocation != QueryConstants.NULL_INT) {
-            if (eq(overflowKeySource0.getUnsafe(overflowLocation), k0) && eq(overflowKeySource1.getUnsafe(overflowLocation), k1)) {
-                handler.doOverflowFound(overflowLocation, chunkPosition);
-                return true;
-            }
-            overflowLocation = overflowOverflowLocationSource.getUnsafe(overflowLocation);
-        }
-        return false;
-    }
-
-    @Override
-    public int findPositionForKey(Object key) {
-        final Object [] ka = (Object[])key;
-        final double k0 = TypeUtils.unbox((Double)ka[0]);
-        final double k1 = TypeUtils.unbox((Double)ka[1]);
-        int hash = hash(k0, k1);
-        final int tableLocation = hashToTableLocation(tableHashPivot, hash);
-        final int positionValue = mainOutputPosition.getUnsafe(tableLocation);
-        if (positionValue == EMPTY_OUTPUT_POSITION) {
-            return -1;
-        }
-        if (eq(mainKeySource0.getUnsafe(tableLocation), k0) && eq(mainKeySource1.getUnsafe(tableLocation), k1)) {
-            return positionValue;
-        }
-        int overflowLocation = mainOverflowLocationSource.getUnsafe(tableLocation);
-        while (overflowLocation != QueryConstants.NULL_INT) {
-            if (eq(overflowKeySource0.getUnsafe(overflowLocation), k0) && eq(overflowKeySource1.getUnsafe(overflowLocation), k1)) {
-                return overflowOutputPosition.getUnsafe(overflowLocation);
-            }
-            overflowLocation = overflowOverflowLocationSource.getUnsafe(overflowLocation);
-        }
-        return -1;
-    }
-}
diff --git a/engine/table/src/main/java/io/deephaven/engine/table/impl/by/typed/staticagg/gen/StaticAggHasherDoubleFloat.java b/engine/table/src/main/java/io/deephaven/engine/table/impl/by/typed/staticagg/gen/StaticAggHasherDoubleFloat.java
deleted file mode 100644
index 4d81a56d51a..00000000000
--- a/engine/table/src/main/java/io/deephaven/engine/table/impl/by/typed/staticagg/gen/StaticAggHasherDoubleFloat.java
+++ /dev/null
@@ -1,206 +0,0 @@
-//
-// Copyright (c) 2016-2024 Deephaven Data Labs and Patent Pending
-//
-// ****** AUTO-GENERATED CLASS - DO NOT EDIT MANUALLY
-// ****** Run ReplicateTypedHashers or ./gradlew replicateTypedHashers to regenerate
-//
-// @formatter:off
-package io.deephaven.engine.table.impl.by.typed.staticagg.gen;
-
-import static io.deephaven.util.compare.DoubleComparisons.eq;
-import static io.deephaven.util.compare.FloatComparisons.eq;
-
-import io.deephaven.chunk.Chunk;
-import io.deephaven.chunk.DoubleChunk;
-import io.deephaven.chunk.FloatChunk;
-import io.deephaven.chunk.attributes.Values;
-import io.deephaven.chunk.util.hashing.DoubleChunkHasher;
-import io.deephaven.chunk.util.hashing.FloatChunkHasher;
-import io.deephaven.engine.rowset.RowSequence;
-import io.deephaven.engine.table.ColumnSource;
-import io.deephaven.engine.table.impl.by.HashHandler;
-import io.deephaven.engine.table.impl.by.StaticChunkedOperatorAggregationStateManagerTypedBase;
-import io.deephaven.engine.table.impl.sources.DoubleArraySource;
-import io.deephaven.engine.table.impl.sources.FloatArraySource;
-import io.deephaven.util.QueryConstants;
-import io.deephaven.util.type.TypeUtils;
-import java.lang.Double;
-import java.lang.Float;
-import java.lang.Object;
-import java.lang.Override;
-
-final class StaticAggHasherDoubleFloat extends StaticChunkedOperatorAggregationStateManagerTypedBase {
-    private final DoubleArraySource mainKeySource0;
-
-    private final DoubleArraySource overflowKeySource0;
-
-    private final FloatArraySource mainKeySource1;
-
-    private final FloatArraySource overflowKeySource1;
-
-    public StaticAggHasherDoubleFloat(ColumnSource[] tableKeySources,
-            ColumnSource[] originalTableKeySources, int tableSize, double maximumLoadFactor,
-            double targetLoadFactor) {
-        super(tableKeySources, tableSize, maximumLoadFactor, targetLoadFactor);
-        this.mainKeySource0 = (DoubleArraySource) super.mainKeySources[0];
-        this.overflowKeySource0 = (DoubleArraySource) super.overflowKeySources[0];
-        this.mainKeySource1 = (FloatArraySource) super.mainKeySources[1];
-        this.overflowKeySource1 = (FloatArraySource) super.overflowKeySources[1];
-    }
-
-    @Override
-    protected void build(HashHandler handler, RowSequence rowSequence, Chunk[] sourceKeyChunks) {
-        final DoubleChunk<Values> keyChunk0 = sourceKeyChunks[0].asDoubleChunk();
-        final FloatChunk<Values> keyChunk1 = sourceKeyChunks[1].asFloatChunk();
-        final int chunkSize = keyChunk0.size();
-        for (int chunkPosition = 0; chunkPosition < chunkSize; ++chunkPosition) {
-            final double k0 = keyChunk0.get(chunkPosition);
-            final float k1 = keyChunk1.get(chunkPosition);
-            final int hash = hash(k0, k1);
-            final int tableLocation = hashToTableLocation(tableHashPivot, hash);
-            if (mainOutputPosition.getUnsafe(tableLocation) == EMPTY_OUTPUT_POSITION) {
-                numEntries++;
-                mainKeySource0.set(tableLocation, k0);
-                mainKeySource1.set(tableLocation, k1);
-                handler.doMainInsert(tableLocation, chunkPosition);
-            } else if (eq(mainKeySource0.getUnsafe(tableLocation), k0) && eq(mainKeySource1.getUnsafe(tableLocation), k1)) {
-                handler.doMainFound(tableLocation, chunkPosition);
-            } else {
-                int overflowLocation = mainOverflowLocationSource.getUnsafe(tableLocation);
-                if (!findOverflow(handler, k0, k1, chunkPosition, overflowLocation)) {
-                    final int newOverflowLocation = allocateOverflowLocation();
-                    overflowKeySource0.set(newOverflowLocation, k0);
-                    overflowKeySource1.set(newOverflowLocation, k1);
-                    mainOverflowLocationSource.set(tableLocation, newOverflowLocation);
-                    overflowOverflowLocationSource.set(newOverflowLocation, overflowLocation);
-                    numEntries++;
-                    handler.doOverflowInsert(newOverflowLocation, chunkPosition);
-                }
-            }
-        }
-    }
-
-    @Override
-    protected void probe(HashHandler handler, RowSequence rowSequence, Chunk[] sourceKeyChunks) {
-        final DoubleChunk<Values> keyChunk0 = sourceKeyChunks[0].asDoubleChunk();
-        final FloatChunk<Values> keyChunk1 = sourceKeyChunks[1].asFloatChunk();
-        final int chunkSize = keyChunk0.size();
-        for (int chunkPosition = 0; chunkPosition < chunkSize; ++chunkPosition) {
-            final double k0 = keyChunk0.get(chunkPosition);
-            final float k1 = keyChunk1.get(chunkPosition);
-            final int hash = hash(k0, k1);
-            final int tableLocation = hashToTableLocation(tableHashPivot, hash);
-            if (mainOutputPosition.getUnsafe(tableLocation) == EMPTY_OUTPUT_POSITION) {
-                handler.doMissing(chunkPosition);
-            } else if (eq(mainKeySource0.getUnsafe(tableLocation), k0) && eq(mainKeySource1.getUnsafe(tableLocation), k1)) {
-                handler.doMainFound(tableLocation, chunkPosition);
-            } else {
-                int overflowLocation = mainOverflowLocationSource.getUnsafe(tableLocation);
-                if (!findOverflow(handler, k0, k1, chunkPosition, overflowLocation)) {
-                    handler.doMissing(chunkPosition);
-                }
-            }
-        }
-    }
-
-    private static int hash(double k0, float k1) {
-        int hash = DoubleChunkHasher.hashInitialSingle(k0);
-        hash = FloatChunkHasher.hashUpdateSingle(hash, k1);
-        return hash;
-    }
-
-    @Override
-    protected void rehashBucket(HashHandler handler, int sourceBucket, int destBucket,
-            int bucketsToAdd) {
-        final int position = mainOutputPosition.getUnsafe(sourceBucket);
-        if (position == EMPTY_OUTPUT_POSITION) {
-            return;
-        }
-        int mainInsertLocation = maybeMoveMainBucket(handler, sourceBucket, destBucket, bucketsToAdd);
-        int overflowLocation = mainOverflowLocationSource.getUnsafe(sourceBucket);
-        mainOverflowLocationSource.set(sourceBucket, QueryConstants.NULL_INT);
-        mainOverflowLocationSource.set(destBucket, QueryConstants.NULL_INT);
-        while (overflowLocation != QueryConstants.NULL_INT) {
-            final int nextOverflowLocation = overflowOverflowLocationSource.getUnsafe(overflowLocation);
-            final double overflowKey0 = overflowKeySource0.getUnsafe(overflowLocation);
-            final float overflowKey1 = overflowKeySource1.getUnsafe(overflowLocation);
-            final int overflowHash = hash(overflowKey0, overflowKey1);
-            final int overflowTableLocation = hashToTableLocation(tableHashPivot + bucketsToAdd, overflowHash);
-            if (overflowTableLocation == mainInsertLocation) {
-                mainKeySource0.set(mainInsertLocation, overflowKey0);
-                mainKeySource1.set(mainInsertLocation, overflowKey1);
-                mainOutputPosition.set(mainInsertLocation, overflowOutputPosition.getUnsafe(overflowLocation));
-                handler.doPromoteOverflow(overflowLocation, mainInsertLocation);
-                overflowOutputPosition.set(overflowLocation, QueryConstants.NULL_INT);
-                overflowKeySource0.set(overflowLocation, QueryConstants.NULL_DOUBLE);
-                overflowKeySource1.set(overflowLocation, QueryConstants.NULL_FLOAT);
-                freeOverflowLocation(overflowLocation);
-                mainInsertLocation = -1;
-            } else {
-                final int oldOverflowLocation = mainOverflowLocationSource.getUnsafe(overflowTableLocation);
-                mainOverflowLocationSource.set(overflowTableLocation, overflowLocation);
-                overflowOverflowLocationSource.set(overflowLocation, oldOverflowLocation);
-            }
-            overflowLocation = nextOverflowLocation;
-        }
-    }
-
-    private int maybeMoveMainBucket(HashHandler handler, int sourceBucket, int destBucket,
-            int bucketsToAdd) {
-        final double k0 = mainKeySource0.getUnsafe(sourceBucket);
-        final float k1 = mainKeySource1.getUnsafe(sourceBucket);
-        final int hash = hash(k0, k1);
-        final int location = hashToTableLocation(tableHashPivot + bucketsToAdd, hash);
-        final int mainInsertLocation;
-        if (location == sourceBucket) {
-            mainInsertLocation = destBucket;
-            mainOutputPosition.set(destBucket, EMPTY_OUTPUT_POSITION);
-        } else {
-            mainInsertLocation = sourceBucket;
-            mainOutputPosition.set(destBucket, mainOutputPosition.getUnsafe(sourceBucket));
-            mainOutputPosition.set(sourceBucket, EMPTY_OUTPUT_POSITION);
-            mainKeySource0.set(destBucket, k0);
-            mainKeySource0.set(sourceBucket, QueryConstants.NULL_DOUBLE);
-            mainKeySource1.set(destBucket, k1);
-            mainKeySource1.set(sourceBucket, QueryConstants.NULL_FLOAT);
-            handler.doMoveMain(sourceBucket, destBucket);
-        }
-        return mainInsertLocation;
-    }
-
-    private boolean findOverflow(HashHandler handler, double k0, float k1, int chunkPosition,
-            int overflowLocation) {
-        while (overflowLocation != QueryConstants.NULL_INT) {
-            if (eq(overflowKeySource0.getUnsafe(overflowLocation), k0) && eq(overflowKeySource1.getUnsafe(overflowLocation), k1)) {
-                handler.doOverflowFound(overflowLocation, chunkPosition);
-                return true;
-            }
-            overflowLocation = overflowOverflowLocationSource.getUnsafe(overflowLocation);
-        }
-        return false;
-    }
-
-    @Override
-    public int findPositionForKey(Object key) {
-        final Object [] ka = (Object[])key;
-        final double k0 = TypeUtils.unbox((Double)ka[0]);
-        final float k1 = TypeUtils.unbox((Float)ka[1]);
-        int hash = hash(k0, k1);
-        final int tableLocation = hashToTableLocation(tableHashPivot, hash);
-        final int positionValue = mainOutputPosition.getUnsafe(tableLocation);
-        if (positionValue == EMPTY_OUTPUT_POSITION) {
-            return -1;
-        }
-        if (eq(mainKeySource0.getUnsafe(tableLocation), k0) && eq(mainKeySource1.getUnsafe(tableLocation), k1)) {
-            return positionValue;
-        }
-        int overflowLocation = mainOverflowLocationSource.getUnsafe(tableLocation);
-        while (overflowLocation != QueryConstants.NULL_INT) {
-            if (eq(overflowKeySource0.getUnsafe(overflowLocation), k0) && eq(overflowKeySource1.getUnsafe(overflowLocation), k1)) {
-                return overflowOutputPosition.getUnsafe(overflowLocation);
-            }
-            overflowLocation = overflowOverflowLocationSource.getUnsafe(overflowLocation);
-        }
-        return -1;
-    }
-}
diff --git a/engine/table/src/main/java/io/deephaven/engine/table/impl/by/typed/staticagg/gen/StaticAggHasherDoubleInt.java b/engine/table/src/main/java/io/deephaven/engine/table/impl/by/typed/staticagg/gen/StaticAggHasherDoubleInt.java
deleted file mode 100644
index 77d61b1b239..00000000000
--- a/engine/table/src/main/java/io/deephaven/engine/table/impl/by/typed/staticagg/gen/StaticAggHasherDoubleInt.java
+++ /dev/null
@@ -1,206 +0,0 @@
-//
-// Copyright (c) 2016-2024 Deephaven Data Labs and Patent Pending
-//
-// ****** AUTO-GENERATED CLASS - DO NOT EDIT MANUALLY
-// ****** Run ReplicateTypedHashers or ./gradlew replicateTypedHashers to regenerate
-//
-// @formatter:off
-package io.deephaven.engine.table.impl.by.typed.staticagg.gen;
-
-import static io.deephaven.util.compare.DoubleComparisons.eq;
-import static io.deephaven.util.compare.IntComparisons.eq;
-
-import io.deephaven.chunk.Chunk;
-import io.deephaven.chunk.DoubleChunk;
-import io.deephaven.chunk.IntChunk;
-import io.deephaven.chunk.attributes.Values;
-import io.deephaven.chunk.util.hashing.DoubleChunkHasher;
-import io.deephaven.chunk.util.hashing.IntChunkHasher;
-import io.deephaven.engine.rowset.RowSequence;
-import io.deephaven.engine.table.ColumnSource;
-import io.deephaven.engine.table.impl.by.HashHandler;
-import io.deephaven.engine.table.impl.by.StaticChunkedOperatorAggregationStateManagerTypedBase;
-import io.deephaven.engine.table.impl.sources.DoubleArraySource;
-import io.deephaven.engine.table.impl.sources.IntegerArraySource;
-import io.deephaven.util.QueryConstants;
-import io.deephaven.util.type.TypeUtils;
-import java.lang.Double;
-import java.lang.Integer;
-import java.lang.Object;
-import java.lang.Override;
-
-final class StaticAggHasherDoubleInt extends StaticChunkedOperatorAggregationStateManagerTypedBase {
-    private final DoubleArraySource mainKeySource0;
-
-    private final DoubleArraySource overflowKeySource0;
-
-    private final IntegerArraySource mainKeySource1;
-
-    private final IntegerArraySource overflowKeySource1;
-
-    public StaticAggHasherDoubleInt(ColumnSource[] tableKeySources,
-            ColumnSource[] originalTableKeySources, int tableSize, double maximumLoadFactor,
-            double targetLoadFactor) {
-        super(tableKeySources, tableSize, maximumLoadFactor, targetLoadFactor);
-        this.mainKeySource0 = (DoubleArraySource) super.mainKeySources[0];
-        this.overflowKeySource0 = (DoubleArraySource) super.overflowKeySources[0];
-        this.mainKeySource1 = (IntegerArraySource) super.mainKeySources[1];
-        this.overflowKeySource1 = (IntegerArraySource) super.overflowKeySources[1];
-    }
-
-    @Override
-    protected void build(HashHandler handler, RowSequence rowSequence, Chunk[] sourceKeyChunks) {
-        final DoubleChunk<Values> keyChunk0 = sourceKeyChunks[0].asDoubleChunk();
-        final IntChunk<Values> keyChunk1 = sourceKeyChunks[1].asIntChunk();
-        final int chunkSize = keyChunk0.size();
-        for (int chunkPosition = 0; chunkPosition < chunkSize; ++chunkPosition) {
-            final double k0 = keyChunk0.get(chunkPosition);
-            final int k1 = keyChunk1.get(chunkPosition);
-            final int hash = hash(k0, k1);
-            final int tableLocation = hashToTableLocation(tableHashPivot, hash);
-            if (mainOutputPosition.getUnsafe(tableLocation) == EMPTY_OUTPUT_POSITION) {
-                numEntries++;
-                mainKeySource0.set(tableLocation, k0);
-                mainKeySource1.set(tableLocation, k1);
-                handler.doMainInsert(tableLocation, chunkPosition);
-            } else if (eq(mainKeySource0.getUnsafe(tableLocation), k0) && eq(mainKeySource1.getUnsafe(tableLocation), k1)) {
-                handler.doMainFound(tableLocation, chunkPosition);
-            } else {
-                int overflowLocation = mainOverflowLocationSource.getUnsafe(tableLocation);
-                if (!findOverflow(handler, k0, k1, chunkPosition, overflowLocation)) {
-                    final int newOverflowLocation = allocateOverflowLocation();
-                    overflowKeySource0.set(newOverflowLocation, k0);
-                    overflowKeySource1.set(newOverflowLocation, k1);
-                    mainOverflowLocationSource.set(tableLocation, newOverflowLocation);
-                    overflowOverflowLocationSource.set(newOverflowLocation, overflowLocation);
-                    numEntries++;
-                    handler.doOverflowInsert(newOverflowLocation, chunkPosition);
-                }
-            }
-        }
-    }
-
-    @Override
-    protected void probe(HashHandler handler, RowSequence rowSequence, Chunk[] sourceKeyChunks) {
-        final DoubleChunk<Values> keyChunk0 = sourceKeyChunks[0].asDoubleChunk();
-        final IntChunk<Values> keyChunk1 = sourceKeyChunks[1].asIntChunk();
-        final int chunkSize = keyChunk0.size();
-        for (int chunkPosition = 0; chunkPosition < chunkSize; ++chunkPosition) {
-            final double k0 = keyChunk0.get(chunkPosition);
-            final int k1 = keyChunk1.get(chunkPosition);
-            final int hash = hash(k0, k1);
-            final int tableLocation = hashToTableLocation(tableHashPivot, hash);
-            if (mainOutputPosition.getUnsafe(tableLocation) == EMPTY_OUTPUT_POSITION) {
-                handler.doMissing(chunkPosition);
-            } else if (eq(mainKeySource0.getUnsafe(tableLocation), k0) && eq(mainKeySource1.getUnsafe(tableLocation), k1)) {
-                handler.doMainFound(tableLocation, chunkPosition);
-            } else {
-                int overflowLocation = mainOverflowLocationSource.getUnsafe(tableLocation);
-                if (!findOverflow(handler, k0, k1, chunkPosition, overflowLocation)) {
-                    handler.doMissing(chunkPosition);
-                }
-            }
-        }
-    }
-
-    private static int hash(double k0, int k1) {
-        int hash = DoubleChunkHasher.hashInitialSingle(k0);
-        hash = IntChunkHasher.hashUpdateSingle(hash, k1);
-        return hash;
-    }
-
-    @Override
-    protected void rehashBucket(HashHandler handler, int sourceBucket, int destBucket,
-            int bucketsToAdd) {
-        final int position = mainOutputPosition.getUnsafe(sourceBucket);
-        if (position == EMPTY_OUTPUT_POSITION) {
-            return;
-        }
-        int mainInsertLocation = maybeMoveMainBucket(handler, sourceBucket, destBucket, bucketsToAdd);
-        int overflowLocation = mainOverflowLocationSource.getUnsafe(sourceBucket);
-        mainOverflowLocationSource.set(sourceBucket, QueryConstants.NULL_INT);
-        mainOverflowLocationSource.set(destBucket, QueryConstants.NULL_INT);
-        while (overflowLocation != QueryConstants.NULL_INT) {
-            final int nextOverflowLocation = overflowOverflowLocationSource.getUnsafe(overflowLocation);
-            final double overflowKey0 = overflowKeySource0.getUnsafe(overflowLocation);
-            final int overflowKey1 = overflowKeySource1.getUnsafe(overflowLocation);
-            final int overflowHash = hash(overflowKey0, overflowKey1);
-            final int overflowTableLocation = hashToTableLocation(tableHashPivot + bucketsToAdd, overflowHash);
-            if (overflowTableLocation == mainInsertLocation) {
-                mainKeySource0.set(mainInsertLocation, overflowKey0);
-                mainKeySource1.set(mainInsertLocation, overflowKey1);
-                mainOutputPosition.set(mainInsertLocation, overflowOutputPosition.getUnsafe(overflowLocation));
-                handler.doPromoteOverflow(overflowLocation, mainInsertLocation);
-                overflowOutputPosition.set(overflowLocation, QueryConstants.NULL_INT);
-                overflowKeySource0.set(overflowLocation, QueryConstants.NULL_DOUBLE);
-                overflowKeySource1.set(overflowLocation, QueryConstants.NULL_INT);
-                freeOverflowLocation(overflowLocation);
-                mainInsertLocation = -1;
-            } else {
-                final int oldOverflowLocation = mainOverflowLocationSource.getUnsafe(overflowTableLocation);
-                mainOverflowLocationSource.set(overflowTableLocation, overflowLocation);
-                overflowOverflowLocationSource.set(overflowLocation, oldOverflowLocation);
-            }
-            overflowLocation = nextOverflowLocation;
-        }
-    }
-
-    private int maybeMoveMainBucket(HashHandler handler, int sourceBucket, int destBucket,
-            int bucketsToAdd) {
-        final double k0 = mainKeySource0.getUnsafe(sourceBucket);
-        final int k1 = mainKeySource1.getUnsafe(sourceBucket);
-        final int hash = hash(k0, k1);
-        final int location = hashToTableLocation(tableHashPivot + bucketsToAdd, hash);
-        final int mainInsertLocation;
-        if (location == sourceBucket) {
-            mainInsertLocation = destBucket;
-            mainOutputPosition.set(destBucket, EMPTY_OUTPUT_POSITION);
-        } else {
-            mainInsertLocation = sourceBucket;
-            mainOutputPosition.set(destBucket, mainOutputPosition.getUnsafe(sourceBucket));
-            mainOutputPosition.set(sourceBucket, EMPTY_OUTPUT_POSITION);
-            mainKeySource0.set(destBucket, k0);
-            mainKeySource0.set(sourceBucket, QueryConstants.NULL_DOUBLE);
-            mainKeySource1.set(destBucket, k1);
-            mainKeySource1.set(sourceBucket, QueryConstants.NULL_INT);
-            handler.doMoveMain(sourceBucket, destBucket);
-        }
-        return mainInsertLocation;
-    }
-
-    private boolean findOverflow(HashHandler handler, double k0, int k1, int chunkPosition,
-            int overflowLocation) {
-        while (overflowLocation != QueryConstants.NULL_INT) {
-            if (eq(overflowKeySource0.getUnsafe(overflowLocation), k0) && eq(overflowKeySource1.getUnsafe(overflowLocation), k1)) {
-                handler.doOverflowFound(overflowLocation, chunkPosition);
-                return true;
-            }
-            overflowLocation = overflowOverflowLocationSource.getUnsafe(overflowLocation);
-        }
-        return false;
-    }
-
-    @Override
-    public int findPositionForKey(Object key) {
-        final Object [] ka = (Object[])key;
-        final double k0 = TypeUtils.unbox((Double)ka[0]);
-        final int k1 = TypeUtils.unbox((Integer)ka[1]);
-        int hash = hash(k0, k1);
-        final int tableLocation = hashToTableLocation(tableHashPivot, hash);
-        final int positionValue = mainOutputPosition.getUnsafe(tableLocation);
-        if (positionValue == EMPTY_OUTPUT_POSITION) {
-            return -1;
-        }
-        if (eq(mainKeySource0.getUnsafe(tableLocation), k0) && eq(mainKeySource1.getUnsafe(tableLocation), k1)) {
-            return positionValue;
-        }
-        int overflowLocation = mainOverflowLocationSource.getUnsafe(tableLocation);
-        while (overflowLocation != QueryConstants.NULL_INT) {
-            if (eq(overflowKeySource0.getUnsafe(overflowLocation), k0) && eq(overflowKeySource1.getUnsafe(overflowLocation), k1)) {
-                return overflowOutputPosition.getUnsafe(overflowLocation);
-            }
-            overflowLocation = overflowOverflowLocationSource.getUnsafe(overflowLocation);
-        }
-        return -1;
-    }
-}
diff --git a/engine/table/src/main/java/io/deephaven/engine/table/impl/by/typed/staticagg/gen/StaticAggHasherDoubleLong.java b/engine/table/src/main/java/io/deephaven/engine/table/impl/by/typed/staticagg/gen/StaticAggHasherDoubleLong.java
deleted file mode 100644
index d1b845ff430..00000000000
--- a/engine/table/src/main/java/io/deephaven/engine/table/impl/by/typed/staticagg/gen/StaticAggHasherDoubleLong.java
+++ /dev/null
@@ -1,206 +0,0 @@
-//
-// Copyright (c) 2016-2024 Deephaven Data Labs and Patent Pending
-//
-// ****** AUTO-GENERATED CLASS - DO NOT EDIT MANUALLY
-// ****** Run ReplicateTypedHashers or ./gradlew replicateTypedHashers to regenerate
-//
-// @formatter:off
-package io.deephaven.engine.table.impl.by.typed.staticagg.gen;
-
-import static io.deephaven.util.compare.DoubleComparisons.eq;
-import static io.deephaven.util.compare.LongComparisons.eq;
-
-import io.deephaven.chunk.Chunk;
-import io.deephaven.chunk.DoubleChunk;
-import io.deephaven.chunk.LongChunk;
-import io.deephaven.chunk.attributes.Values;
-import io.deephaven.chunk.util.hashing.DoubleChunkHasher;
-import io.deephaven.chunk.util.hashing.LongChunkHasher;
-import io.deephaven.engine.rowset.RowSequence;
-import io.deephaven.engine.table.ColumnSource;
-import io.deephaven.engine.table.impl.by.HashHandler;
-import io.deephaven.engine.table.impl.by.StaticChunkedOperatorAggregationStateManagerTypedBase;
-import io.deephaven.engine.table.impl.sources.DoubleArraySource;
-import io.deephaven.engine.table.impl.sources.LongArraySource;
-import io.deephaven.util.QueryConstants;
-import io.deephaven.util.type.TypeUtils;
-import java.lang.Double;
-import java.lang.Long;
-import java.lang.Object;
-import java.lang.Override;
-
-final class StaticAggHasherDoubleLong extends StaticChunkedOperatorAggregationStateManagerTypedBase {
-    private final DoubleArraySource mainKeySource0;
-
-    private final DoubleArraySource overflowKeySource0;
-
-    private final LongArraySource mainKeySource1;
-
-    private final LongArraySource overflowKeySource1;
-
-    public StaticAggHasherDoubleLong(ColumnSource[] tableKeySources,
-            ColumnSource[] originalTableKeySources, int tableSize, double maximumLoadFactor,
-            double targetLoadFactor) {
-        super(tableKeySources, tableSize, maximumLoadFactor, targetLoadFactor);
-        this.mainKeySource0 = (DoubleArraySource) super.mainKeySources[0];
-        this.overflowKeySource0 = (DoubleArraySource) super.overflowKeySources[0];
-        this.mainKeySource1 = (LongArraySource) super.mainKeySources[1];
-        this.overflowKeySource1 = (LongArraySource) super.overflowKeySources[1];
-    }
-
-    @Override
-    protected void build(HashHandler handler, RowSequence rowSequence, Chunk[] sourceKeyChunks) {
-        final DoubleChunk<Values> keyChunk0 = sourceKeyChunks[0].asDoubleChunk();
-        final LongChunk<Values> keyChunk1 = sourceKeyChunks[1].asLongChunk();
-        final int chunkSize = keyChunk0.size();
-        for (int chunkPosition = 0; chunkPosition < chunkSize; ++chunkPosition) {
-            final double k0 = keyChunk0.get(chunkPosition);
-            final long k1 = keyChunk1.get(chunkPosition);
-            final int hash = hash(k0, k1);
-            final int tableLocation = hashToTableLocation(tableHashPivot, hash);
-            if (mainOutputPosition.getUnsafe(tableLocation) == EMPTY_OUTPUT_POSITION) {
-                numEntries++;
-                mainKeySource0.set(tableLocation, k0);
-                mainKeySource1.set(tableLocation, k1);
-                handler.doMainInsert(tableLocation, chunkPosition);
-            } else if (eq(mainKeySource0.getUnsafe(tableLocation), k0) && eq(mainKeySource1.getUnsafe(tableLocation), k1)) {
-                handler.doMainFound(tableLocation, chunkPosition);
-            } else {
-                int overflowLocation = mainOverflowLocationSource.getUnsafe(tableLocation);
-                if (!findOverflow(handler, k0, k1, chunkPosition, overflowLocation)) {
-                    final int newOverflowLocation = allocateOverflowLocation();
-                    overflowKeySource0.set(newOverflowLocation, k0);
-                    overflowKeySource1.set(newOverflowLocation, k1);
-                    mainOverflowLocationSource.set(tableLocation, newOverflowLocation);
-                    overflowOverflowLocationSource.set(newOverflowLocation, overflowLocation);
-                    numEntries++;
-                    handler.doOverflowInsert(newOverflowLocation, chunkPosition);
-                }
-            }
-        }
-    }
-
-    @Override
-    protected void probe(HashHandler handler, RowSequence rowSequence, Chunk[] sourceKeyChunks) {
-        final DoubleChunk<Values> keyChunk0 = sourceKeyChunks[0].asDoubleChunk();
-        final LongChunk<Values> keyChunk1 = sourceKeyChunks[1].asLongChunk();
-        final int chunkSize = keyChunk0.size();
-        for (int chunkPosition = 0; chunkPosition < chunkSize; ++chunkPosition) {
-            final double k0 = keyChunk0.get(chunkPosition);
-            final long k1 = keyChunk1.get(chunkPosition);
-            final int hash = hash(k0, k1);
-            final int tableLocation = hashToTableLocation(tableHashPivot, hash);
-            if (mainOutputPosition.getUnsafe(tableLocation) == EMPTY_OUTPUT_POSITION) {
-                handler.doMissing(chunkPosition);
-            } else if (eq(mainKeySource0.getUnsafe(tableLocation), k0) && eq(mainKeySource1.getUnsafe(tableLocation), k1)) {
-                handler.doMainFound(tableLocation, chunkPosition);
-            } else {
-                int overflowLocation = mainOverflowLocationSource.getUnsafe(tableLocation);
-                if (!findOverflow(handler, k0, k1, chunkPosition, overflowLocation)) {
-                    handler.doMissing(chunkPosition);
-                }
-            }
-        }
-    }
-
-    private static int hash(double k0, long k1) {
-        int hash = DoubleChunkHasher.hashInitialSingle(k0);
-        hash = LongChunkHasher.hashUpdateSingle(hash, k1);
-        return hash;
-    }
-
-    @Override
-    protected void rehashBucket(HashHandler handler, int sourceBucket, int destBucket,
-            int bucketsToAdd) {
-        final int position = mainOutputPosition.getUnsafe(sourceBucket);
-        if (position == EMPTY_OUTPUT_POSITION) {
-            return;
-        }
-        int mainInsertLocation = maybeMoveMainBucket(handler, sourceBucket, destBucket, bucketsToAdd);
-        int overflowLocation = mainOverflowLocationSource.getUnsafe(sourceBucket);
-        mainOverflowLocationSource.set(sourceBucket, QueryConstants.NULL_INT);
-        mainOverflowLocationSource.set(destBucket, QueryConstants.NULL_INT);
-        while (overflowLocation != QueryConstants.NULL_INT) {
-            final int nextOverflowLocation = overflowOverflowLocationSource.getUnsafe(overflowLocation);
-            final double overflowKey0 = overflowKeySource0.getUnsafe(overflowLocation);
-            final long overflowKey1 = overflowKeySource1.getUnsafe(overflowLocation);
-            final int overflowHash = hash(overflowKey0, overflowKey1);
-            final int overflowTableLocation = hashToTableLocation(tableHashPivot + bucketsToAdd, overflowHash);
-            if (overflowTableLocation == mainInsertLocation) {
-                mainKeySource0.set(mainInsertLocation, overflowKey0);
-                mainKeySource1.set(mainInsertLocation, overflowKey1);
-                mainOutputPosition.set(mainInsertLocation, overflowOutputPosition.getUnsafe(overflowLocation));
-                handler.doPromoteOverflow(overflowLocation, mainInsertLocation);
-                overflowOutputPosition.set(overflowLocation, QueryConstants.NULL_INT);
-                overflowKeySource0.set(overflowLocation, QueryConstants.NULL_DOUBLE);
-                overflowKeySource1.set(overflowLocation, QueryConstants.NULL_LONG);
-                freeOverflowLocation(overflowLocation);
-                mainInsertLocation = -1;
-            } else {
-                final int oldOverflowLocation = mainOverflowLocationSource.getUnsafe(overflowTableLocation);
-                mainOverflowLocationSource.set(overflowTableLocation, overflowLocation);
-                overflowOverflowLocationSource.set(overflowLocation, oldOverflowLocation);
-            }
-            overflowLocation = nextOverflowLocation;
-        }
-    }
-
-    private int maybeMoveMainBucket(HashHandler handler, int sourceBucket, int destBucket,
-            int bucketsToAdd) {
-        final double k0 = mainKeySource0.getUnsafe(sourceBucket);
-        final long k1 = mainKeySource1.getUnsafe(sourceBucket);
-        final int hash = hash(k0, k1);
-        final int location = hashToTableLocation(tableHashPivot + bucketsToAdd, hash);
-        final int mainInsertLocation;
-        if (location == sourceBucket) {
-            mainInsertLocation = destBucket;
-            mainOutputPosition.set(destBucket, EMPTY_OUTPUT_POSITION);
-        } else {
-            mainInsertLocation = sourceBucket;
-            mainOutputPosition.set(destBucket, mainOutputPosition.getUnsafe(sourceBucket));
-            mainOutputPosition.set(sourceBucket, EMPTY_OUTPUT_POSITION);
-            mainKeySource0.set(destBucket, k0);
-            mainKeySource0.set(sourceBucket, QueryConstants.NULL_DOUBLE);
-            mainKeySource1.set(destBucket, k1);
-            mainKeySource1.set(sourceBucket, QueryConstants.NULL_LONG);
-            handler.doMoveMain(sourceBucket, destBucket);
-        }
-        return mainInsertLocation;
-    }
-
-    private boolean findOverflow(HashHandler handler, double k0, long k1, int chunkPosition,
-            int overflowLocation) {
-        while (overflowLocation != QueryConstants.NULL_INT) {
-            if (eq(overflowKeySource0.getUnsafe(overflowLocation), k0) && eq(overflowKeySource1.getUnsafe(overflowLocation), k1)) {
-                handler.doOverflowFound(overflowLocation, chunkPosition);
-                return true;
-            }
-            overflowLocation = overflowOverflowLocationSource.getUnsafe(overflowLocation);
-        }
-        return false;
-    }
-
-    @Override
-    public int findPositionForKey(Object key) {
-        final Object [] ka = (Object[])key;
-        final double k0 = TypeUtils.unbox((Double)ka[0]);
-        final long k1 = TypeUtils.unbox((Long)ka[1]);
-        int hash = hash(k0, k1);
-        final int tableLocation = hashToTableLocation(tableHashPivot, hash);
-        final int positionValue = mainOutputPosition.getUnsafe(tableLocation);
-        if (positionValue == EMPTY_OUTPUT_POSITION) {
-            return -1;
-        }
-        if (eq(mainKeySource0.getUnsafe(tableLocation), k0) && eq(mainKeySource1.getUnsafe(tableLocation), k1)) {
-            return positionValue;
-        }
-        int overflowLocation = mainOverflowLocationSource.getUnsafe(tableLocation);
-        while (overflowLocation != QueryConstants.NULL_INT) {
-            if (eq(overflowKeySource0.getUnsafe(overflowLocation), k0) && eq(overflowKeySource1.getUnsafe(overflowLocation), k1)) {
-                return overflowOutputPosition.getUnsafe(overflowLocation);
-            }
-            overflowLocation = overflowOverflowLocationSource.getUnsafe(overflowLocation);
-        }
-        return -1;
-    }
-}
diff --git a/engine/table/src/main/java/io/deephaven/engine/table/impl/by/typed/staticagg/gen/StaticAggHasherDoubleObject.java b/engine/table/src/main/java/io/deephaven/engine/table/impl/by/typed/staticagg/gen/StaticAggHasherDoubleObject.java
deleted file mode 100644
index 43847e122ea..00000000000
--- a/engine/table/src/main/java/io/deephaven/engine/table/impl/by/typed/staticagg/gen/StaticAggHasherDoubleObject.java
+++ /dev/null
@@ -1,205 +0,0 @@
-//
-// Copyright (c) 2016-2024 Deephaven Data Labs and Patent Pending
-//
-// ****** AUTO-GENERATED CLASS - DO NOT EDIT MANUALLY
-// ****** Run ReplicateTypedHashers or ./gradlew replicateTypedHashers to regenerate
-//
-// @formatter:off
-package io.deephaven.engine.table.impl.by.typed.staticagg.gen;
-
-import static io.deephaven.util.compare.DoubleComparisons.eq;
-import static io.deephaven.util.compare.ObjectComparisons.eq;
-
-import io.deephaven.chunk.Chunk;
-import io.deephaven.chunk.DoubleChunk;
-import io.deephaven.chunk.ObjectChunk;
-import io.deephaven.chunk.attributes.Values;
-import io.deephaven.chunk.util.hashing.DoubleChunkHasher;
-import io.deephaven.chunk.util.hashing.ObjectChunkHasher;
-import io.deephaven.engine.rowset.RowSequence;
-import io.deephaven.engine.table.ColumnSource;
-import io.deephaven.engine.table.impl.by.HashHandler;
-import io.deephaven.engine.table.impl.by.StaticChunkedOperatorAggregationStateManagerTypedBase;
-import io.deephaven.engine.table.impl.sources.DoubleArraySource;
-import io.deephaven.engine.table.impl.sources.ObjectArraySource;
-import io.deephaven.util.QueryConstants;
-import io.deephaven.util.type.TypeUtils;
-import java.lang.Double;
-import java.lang.Object;
-import java.lang.Override;
-
-final class StaticAggHasherDoubleObject extends StaticChunkedOperatorAggregationStateManagerTypedBase {
-    private final DoubleArraySource mainKeySource0;
-
-    private final DoubleArraySource overflowKeySource0;
-
-    private final ObjectArraySource mainKeySource1;
-
-    private final ObjectArraySource overflowKeySource1;
-
-    public StaticAggHasherDoubleObject(ColumnSource[] tableKeySources,
-            ColumnSource[] originalTableKeySources, int tableSize, double maximumLoadFactor,
-            double targetLoadFactor) {
-        super(tableKeySources, tableSize, maximumLoadFactor, targetLoadFactor);
-        this.mainKeySource0 = (DoubleArraySource) super.mainKeySources[0];
-        this.overflowKeySource0 = (DoubleArraySource) super.overflowKeySources[0];
-        this.mainKeySource1 = (ObjectArraySource) super.mainKeySources[1];
-        this.overflowKeySource1 = (ObjectArraySource) super.overflowKeySources[1];
-    }
-
-    @Override
-    protected void build(HashHandler handler, RowSequence rowSequence, Chunk[] sourceKeyChunks) {
-        final DoubleChunk<Values> keyChunk0 = sourceKeyChunks[0].asDoubleChunk();
-        final ObjectChunk<Object, Values> keyChunk1 = sourceKeyChunks[1].asObjectChunk();
-        final int chunkSize = keyChunk0.size();
-        for (int chunkPosition = 0; chunkPosition < chunkSize; ++chunkPosition) {
-            final double k0 = keyChunk0.get(chunkPosition);
-            final Object k1 = keyChunk1.get(chunkPosition);
-            final int hash = hash(k0, k1);
-            final int tableLocation = hashToTableLocation(tableHashPivot, hash);
-            if (mainOutputPosition.getUnsafe(tableLocation) == EMPTY_OUTPUT_POSITION) {
-                numEntries++;
-                mainKeySource0.set(tableLocation, k0);
-                mainKeySource1.set(tableLocation, k1);
-                handler.doMainInsert(tableLocation, chunkPosition);
-            } else if (eq(mainKeySource0.getUnsafe(tableLocation), k0) && eq(mainKeySource1.getUnsafe(tableLocation), k1)) {
-                handler.doMainFound(tableLocation, chunkPosition);
-            } else {
-                int overflowLocation = mainOverflowLocationSource.getUnsafe(tableLocation);
-                if (!findOverflow(handler, k0, k1, chunkPosition, overflowLocation)) {
-                    final int newOverflowLocation = allocateOverflowLocation();
-                    overflowKeySource0.set(newOverflowLocation, k0);
-                    overflowKeySource1.set(newOverflowLocation, k1);
-                    mainOverflowLocationSource.set(tableLocation, newOverflowLocation);
-                    overflowOverflowLocationSource.set(newOverflowLocation, overflowLocation);
-                    numEntries++;
-                    handler.doOverflowInsert(newOverflowLocation, chunkPosition);
-                }
-            }
-        }
-    }
-
-    @Override
-    protected void probe(HashHandler handler, RowSequence rowSequence, Chunk[] sourceKeyChunks) {
-        final DoubleChunk<Values> keyChunk0 = sourceKeyChunks[0].asDoubleChunk();
-        final ObjectChunk<Object, Values> keyChunk1 = sourceKeyChunks[1].asObjectChunk();
-        final int chunkSize = keyChunk0.size();
-        for (int chunkPosition = 0; chunkPosition < chunkSize; ++chunkPosition) {
-            final double k0 = keyChunk0.get(chunkPosition);
-            final Object k1 = keyChunk1.get(chunkPosition);
-            final int hash = hash(k0, k1);
-            final int tableLocation = hashToTableLocation(tableHashPivot, hash);
-            if (mainOutputPosition.getUnsafe(tableLocation) == EMPTY_OUTPUT_POSITION) {
-                handler.doMissing(chunkPosition);
-            } else if (eq(mainKeySource0.getUnsafe(tableLocation), k0) && eq(mainKeySource1.getUnsafe(tableLocation), k1)) {
-                handler.doMainFound(tableLocation, chunkPosition);
-            } else {
-                int overflowLocation = mainOverflowLocationSource.getUnsafe(tableLocation);
-                if (!findOverflow(handler, k0, k1, chunkPosition, overflowLocation)) {
-                    handler.doMissing(chunkPosition);
-                }
-            }
-        }
-    }
-
-    private static int hash(double k0, Object k1) {
-        int hash = DoubleChunkHasher.hashInitialSingle(k0);
-        hash = ObjectChunkHasher.hashUpdateSingle(hash, k1);
-        return hash;
-    }
-
-    @Override
-    protected void rehashBucket(HashHandler handler, int sourceBucket, int destBucket,
-            int bucketsToAdd) {
-        final int position = mainOutputPosition.getUnsafe(sourceBucket);
-        if (position == EMPTY_OUTPUT_POSITION) {
-            return;
-        }
-        int mainInsertLocation = maybeMoveMainBucket(handler, sourceBucket, destBucket, bucketsToAdd);
-        int overflowLocation = mainOverflowLocationSource.getUnsafe(sourceBucket);
-        mainOverflowLocationSource.set(sourceBucket, QueryConstants.NULL_INT);
-        mainOverflowLocationSource.set(destBucket, QueryConstants.NULL_INT);
-        while (overflowLocation != QueryConstants.NULL_INT) {
-            final int nextOverflowLocation = overflowOverflowLocationSource.getUnsafe(overflowLocation);
-            final double overflowKey0 = overflowKeySource0.getUnsafe(overflowLocation);
-            final Object overflowKey1 = overflowKeySource1.getUnsafe(overflowLocation);
-            final int overflowHash = hash(overflowKey0, overflowKey1);
-            final int overflowTableLocation = hashToTableLocation(tableHashPivot + bucketsToAdd, overflowHash);
-            if (overflowTableLocation == mainInsertLocation) {
-                mainKeySource0.set(mainInsertLocation, overflowKey0);
-                mainKeySource1.set(mainInsertLocation, overflowKey1);
-                mainOutputPosition.set(mainInsertLocation, overflowOutputPosition.getUnsafe(overflowLocation));
-                handler.doPromoteOverflow(overflowLocation, mainInsertLocation);
-                overflowOutputPosition.set(overflowLocation, QueryConstants.NULL_INT);
-                overflowKeySource0.set(overflowLocation, QueryConstants.NULL_DOUBLE);
-                overflowKeySource1.set(overflowLocation, null);
-                freeOverflowLocation(overflowLocation);
-                mainInsertLocation = -1;
-            } else {
-                final int oldOverflowLocation = mainOverflowLocationSource.getUnsafe(overflowTableLocation);
-                mainOverflowLocationSource.set(overflowTableLocation, overflowLocation);
-                overflowOverflowLocationSource.set(overflowLocation, oldOverflowLocation);
-            }
-            overflowLocation = nextOverflowLocation;
-        }
-    }
-
-    private int maybeMoveMainBucket(HashHandler handler, int sourceBucket, int destBucket,
-            int bucketsToAdd) {
-        final double k0 = mainKeySource0.getUnsafe(sourceBucket);
-        final Object k1 = mainKeySource1.getUnsafe(sourceBucket);
-        final int hash = hash(k0, k1);
-        final int location = hashToTableLocation(tableHashPivot + bucketsToAdd, hash);
-        final int mainInsertLocation;
-        if (location == sourceBucket) {
-            mainInsertLocation = destBucket;
-            mainOutputPosition.set(destBucket, EMPTY_OUTPUT_POSITION);
-        } else {
-            mainInsertLocation = sourceBucket;
-            mainOutputPosition.set(destBucket, mainOutputPosition.getUnsafe(sourceBucket));
-            mainOutputPosition.set(sourceBucket, EMPTY_OUTPUT_POSITION);
-            mainKeySource0.set(destBucket, k0);
-            mainKeySource0.set(sourceBucket, QueryConstants.NULL_DOUBLE);
-            mainKeySource1.set(destBucket, k1);
-            mainKeySource1.set(sourceBucket, null);
-            handler.doMoveMain(sourceBucket, destBucket);
-        }
-        return mainInsertLocation;
-    }
-
-    private boolean findOverflow(HashHandler handler, double k0, Object k1, int chunkPosition,
-            int overflowLocation) {
-        while (overflowLocation != QueryConstants.NULL_INT) {
-            if (eq(overflowKeySource0.getUnsafe(overflowLocation), k0) && eq(overflowKeySource1.getUnsafe(overflowLocation), k1)) {
-                handler.doOverflowFound(overflowLocation, chunkPosition);
-                return true;
-            }
-            overflowLocation = overflowOverflowLocationSource.getUnsafe(overflowLocation);
-        }
-        return false;
-    }
-
-    @Override
-    public int findPositionForKey(Object key) {
-        final Object [] ka = (Object[])key;
-        final double k0 = TypeUtils.unbox((Double)ka[0]);
-        final Object k1 = ka[1];
-        int hash = hash(k0, k1);
-        final int tableLocation = hashToTableLocation(tableHashPivot, hash);
-        final int positionValue = mainOutputPosition.getUnsafe(tableLocation);
-        if (positionValue == EMPTY_OUTPUT_POSITION) {
-            return -1;
-        }
-        if (eq(mainKeySource0.getUnsafe(tableLocation), k0) && eq(mainKeySource1.getUnsafe(tableLocation), k1)) {
-            return positionValue;
-        }
-        int overflowLocation = mainOverflowLocationSource.getUnsafe(tableLocation);
-        while (overflowLocation != QueryConstants.NULL_INT) {
-            if (eq(overflowKeySource0.getUnsafe(overflowLocation), k0) && eq(overflowKeySource1.getUnsafe(overflowLocation), k1)) {
-                return overflowOutputPosition.getUnsafe(overflowLocation);
-            }
-            overflowLocation = overflowOverflowLocationSource.getUnsafe(overflowLocation);
-        }
-        return -1;
-    }
-}
diff --git a/engine/table/src/main/java/io/deephaven/engine/table/impl/by/typed/staticagg/gen/StaticAggHasherDoubleShort.java b/engine/table/src/main/java/io/deephaven/engine/table/impl/by/typed/staticagg/gen/StaticAggHasherDoubleShort.java
deleted file mode 100644
index 1f2a1f23499..00000000000
--- a/engine/table/src/main/java/io/deephaven/engine/table/impl/by/typed/staticagg/gen/StaticAggHasherDoubleShort.java
+++ /dev/null
@@ -1,206 +0,0 @@
-//
-// Copyright (c) 2016-2024 Deephaven Data Labs and Patent Pending
-//
-// ****** AUTO-GENERATED CLASS - DO NOT EDIT MANUALLY
-// ****** Run ReplicateTypedHashers or ./gradlew replicateTypedHashers to regenerate
-//
-// @formatter:off
-package io.deephaven.engine.table.impl.by.typed.staticagg.gen;
-
-import static io.deephaven.util.compare.DoubleComparisons.eq;
-import static io.deephaven.util.compare.ShortComparisons.eq;
-
-import io.deephaven.chunk.Chunk;
-import io.deephaven.chunk.DoubleChunk;
-import io.deephaven.chunk.ShortChunk;
-import io.deephaven.chunk.attributes.Values;
-import io.deephaven.chunk.util.hashing.DoubleChunkHasher;
-import io.deephaven.chunk.util.hashing.ShortChunkHasher;
-import io.deephaven.engine.rowset.RowSequence;
-import io.deephaven.engine.table.ColumnSource;
-import io.deephaven.engine.table.impl.by.HashHandler;
-import io.deephaven.engine.table.impl.by.StaticChunkedOperatorAggregationStateManagerTypedBase;
-import io.deephaven.engine.table.impl.sources.DoubleArraySource;
-import io.deephaven.engine.table.impl.sources.ShortArraySource;
-import io.deephaven.util.QueryConstants;
-import io.deephaven.util.type.TypeUtils;
-import java.lang.Double;
-import java.lang.Object;
-import java.lang.Override;
-import java.lang.Short;
-
-final class StaticAggHasherDoubleShort extends StaticChunkedOperatorAggregationStateManagerTypedBase {
-    private final DoubleArraySource mainKeySource0;
-
-    private final DoubleArraySource overflowKeySource0;
-
-    private final ShortArraySource mainKeySource1;
-
-    private final ShortArraySource overflowKeySource1;
-
-    public StaticAggHasherDoubleShort(ColumnSource[] tableKeySources,
-            ColumnSource[] originalTableKeySources, int tableSize, double maximumLoadFactor,
-            double targetLoadFactor) {
-        super(tableKeySources, tableSize, maximumLoadFactor, targetLoadFactor);
-        this.mainKeySource0 = (DoubleArraySource) super.mainKeySources[0];
-        this.overflowKeySource0 = (DoubleArraySource) super.overflowKeySources[0];
-        this.mainKeySource1 = (ShortArraySource) super.mainKeySources[1];
-        this.overflowKeySource1 = (ShortArraySource) super.overflowKeySources[1];
-    }
-
-    @Override
-    protected void build(HashHandler handler, RowSequence rowSequence, Chunk[] sourceKeyChunks) {
-        final DoubleChunk<Values> keyChunk0 = sourceKeyChunks[0].asDoubleChunk();
-        final ShortChunk<Values> keyChunk1 = sourceKeyChunks[1].asShortChunk();
-        final int chunkSize = keyChunk0.size();
-        for (int chunkPosition = 0; chunkPosition < chunkSize; ++chunkPosition) {
-            final double k0 = keyChunk0.get(chunkPosition);
-            final short k1 = keyChunk1.get(chunkPosition);
-            final int hash = hash(k0, k1);
-            final int tableLocation = hashToTableLocation(tableHashPivot, hash);
-            if (mainOutputPosition.getUnsafe(tableLocation) == EMPTY_OUTPUT_POSITION) {
-                numEntries++;
-                mainKeySource0.set(tableLocation, k0);
-                mainKeySource1.set(tableLocation, k1);
-                handler.doMainInsert(tableLocation, chunkPosition);
-            } else if (eq(mainKeySource0.getUnsafe(tableLocation), k0) && eq(mainKeySource1.getUnsafe(tableLocation), k1)) {
-                handler.doMainFound(tableLocation, chunkPosition);
-            } else {
-                int overflowLocation = mainOverflowLocationSource.getUnsafe(tableLocation);
-                if (!findOverflow(handler, k0, k1, chunkPosition, overflowLocation)) {
-                    final int newOverflowLocation = allocateOverflowLocation();
-                    overflowKeySource0.set(newOverflowLocation, k0);
-                    overflowKeySource1.set(newOverflowLocation, k1);
-                    mainOverflowLocationSource.set(tableLocation, newOverflowLocation);
-                    overflowOverflowLocationSource.set(newOverflowLocation, overflowLocation);
-                    numEntries++;
-                    handler.doOverflowInsert(newOverflowLocation, chunkPosition);
-                }
-            }
-        }
-    }
-
-    @Override
-    protected void probe(HashHandler handler, RowSequence rowSequence, Chunk[] sourceKeyChunks) {
-        final DoubleChunk<Values> keyChunk0 = sourceKeyChunks[0].asDoubleChunk();
-        final ShortChunk<Values> keyChunk1 = sourceKeyChunks[1].asShortChunk();
-        final int chunkSize = keyChunk0.size();
-        for (int chunkPosition = 0; chunkPosition < chunkSize; ++chunkPosition) {
-            final double k0 = keyChunk0.get(chunkPosition);
-            final short k1 = keyChunk1.get(chunkPosition);
-            final int hash = hash(k0, k1);
-            final int tableLocation = hashToTableLocation(tableHashPivot, hash);
-            if (mainOutputPosition.getUnsafe(tableLocation) == EMPTY_OUTPUT_POSITION) {
-                handler.doMissing(chunkPosition);
-            } else if (eq(mainKeySource0.getUnsafe(tableLocation), k0) && eq(mainKeySource1.getUnsafe(tableLocation), k1)) {
-                handler.doMainFound(tableLocation, chunkPosition);
-            } else {
-                int overflowLocation = mainOverflowLocationSource.getUnsafe(tableLocation);
-                if (!findOverflow(handler, k0, k1, chunkPosition, overflowLocation)) {
-                    handler.doMissing(chunkPosition);
-                }
-            }
-        }
-    }
-
-    private static int hash(double k0, short k1) {
-        int hash = DoubleChunkHasher.hashInitialSingle(k0);
-        hash = ShortChunkHasher.hashUpdateSingle(hash, k1);
-        return hash;
-    }
-
-    @Override
-    protected void rehashBucket(HashHandler handler, int sourceBucket, int destBucket,
-            int bucketsToAdd) {
-        final int position = mainOutputPosition.getUnsafe(sourceBucket);
-        if (position == EMPTY_OUTPUT_POSITION) {
-            return;
-        }
-        int mainInsertLocation = maybeMoveMainBucket(handler, sourceBucket, destBucket, bucketsToAdd);
-        int overflowLocation = mainOverflowLocationSource.getUnsafe(sourceBucket);
-        mainOverflowLocationSource.set(sourceBucket, QueryConstants.NULL_INT);
-        mainOverflowLocationSource.set(destBucket, QueryConstants.NULL_INT);
-        while (overflowLocation != QueryConstants.NULL_INT) {
-            final int nextOverflowLocation = overflowOverflowLocationSource.getUnsafe(overflowLocation);
-            final double overflowKey0 = overflowKeySource0.getUnsafe(overflowLocation);
-            final short overflowKey1 = overflowKeySource1.getUnsafe(overflowLocation);
-            final int overflowHash = hash(overflowKey0, overflowKey1);
-            final int overflowTableLocation = hashToTableLocation(tableHashPivot + bucketsToAdd, overflowHash);
-            if (overflowTableLocation == mainInsertLocation) {
-                mainKeySource0.set(mainInsertLocation, overflowKey0);
-                mainKeySource1.set(mainInsertLocation, overflowKey1);
-                mainOutputPosition.set(mainInsertLocation, overflowOutputPosition.getUnsafe(overflowLocation));
-                handler.doPromoteOverflow(overflowLocation, mainInsertLocation);
-                overflowOutputPosition.set(overflowLocation, QueryConstants.NULL_INT);
-                overflowKeySource0.set(overflowLocation, QueryConstants.NULL_DOUBLE);
-                overflowKeySource1.set(overflowLocation, QueryConstants.NULL_SHORT);
-                freeOverflowLocation(overflowLocation);
-                mainInsertLocation = -1;
-            } else {
-                final int oldOverflowLocation = mainOverflowLocationSource.getUnsafe(overflowTableLocation);
-                mainOverflowLocationSource.set(overflowTableLocation, overflowLocation);
-                overflowOverflowLocationSource.set(overflowLocation, oldOverflowLocation);
-            }
-            overflowLocation = nextOverflowLocation;
-        }
-    }
-
-    private int maybeMoveMainBucket(HashHandler handler, int sourceBucket, int destBucket,
-            int bucketsToAdd) {
-        final double k0 = mainKeySource0.getUnsafe(sourceBucket);
-        final short k1 = mainKeySource1.getUnsafe(sourceBucket);
-        final int hash = hash(k0, k1);
-        final int location = hashToTableLocation(tableHashPivot + bucketsToAdd, hash);
-        final int mainInsertLocation;
-        if (location == sourceBucket) {
-            mainInsertLocation = destBucket;
-            mainOutputPosition.set(destBucket, EMPTY_OUTPUT_POSITION);
-        } else {
-            mainInsertLocation = sourceBucket;
-            mainOutputPosition.set(destBucket, mainOutputPosition.getUnsafe(sourceBucket));
-            mainOutputPosition.set(sourceBucket, EMPTY_OUTPUT_POSITION);
-            mainKeySource0.set(destBucket, k0);
-            mainKeySource0.set(sourceBucket, QueryConstants.NULL_DOUBLE);
-            mainKeySource1.set(destBucket, k1);
-            mainKeySource1.set(sourceBucket, QueryConstants.NULL_SHORT);
-            handler.doMoveMain(sourceBucket, destBucket);
-        }
-        return mainInsertLocation;
-    }
-
-    private boolean findOverflow(HashHandler handler, double k0, short k1, int chunkPosition,
-            int overflowLocation) {
-        while (overflowLocation != QueryConstants.NULL_INT) {
-            if (eq(overflowKeySource0.getUnsafe(overflowLocation), k0) && eq(overflowKeySource1.getUnsafe(overflowLocation), k1)) {
-                handler.doOverflowFound(overflowLocation, chunkPosition);
-                return true;
-            }
-            overflowLocation = overflowOverflowLocationSource.getUnsafe(overflowLocation);
-        }
-        return false;
-    }
-
-    @Override
-    public int findPositionForKey(Object key) {
-        final Object [] ka = (Object[])key;
-        final double k0 = TypeUtils.unbox((Double)ka[0]);
-        final short k1 = TypeUtils.unbox((Short)ka[1]);
-        int hash = hash(k0, k1);
-        final int tableLocation = hashToTableLocation(tableHashPivot, hash);
-        final int positionValue = mainOutputPosition.getUnsafe(tableLocation);
-        if (positionValue == EMPTY_OUTPUT_POSITION) {
-            return -1;
-        }
-        if (eq(mainKeySource0.getUnsafe(tableLocation), k0) && eq(mainKeySource1.getUnsafe(tableLocation), k1)) {
-            return positionValue;
-        }
-        int overflowLocation = mainOverflowLocationSource.getUnsafe(tableLocation);
-        while (overflowLocation != QueryConstants.NULL_INT) {
-            if (eq(overflowKeySource0.getUnsafe(overflowLocation), k0) && eq(overflowKeySource1.getUnsafe(overflowLocation), k1)) {
-                return overflowOutputPosition.getUnsafe(overflowLocation);
-            }
-            overflowLocation = overflowOverflowLocationSource.getUnsafe(overflowLocation);
-        }
-        return -1;
-    }
-}
diff --git a/engine/table/src/main/java/io/deephaven/engine/table/impl/by/typed/staticagg/gen/StaticAggHasherFloat.java b/engine/table/src/main/java/io/deephaven/engine/table/impl/by/typed/staticagg/gen/StaticAggHasherFloat.java
deleted file mode 100644
index a5f76e2a48b..00000000000
--- a/engine/table/src/main/java/io/deephaven/engine/table/impl/by/typed/staticagg/gen/StaticAggHasherFloat.java
+++ /dev/null
@@ -1,180 +0,0 @@
-//
-// Copyright (c) 2016-2024 Deephaven Data Labs and Patent Pending
-//
-// ****** AUTO-GENERATED CLASS - DO NOT EDIT MANUALLY
-// ****** Run ReplicateTypedHashers or ./gradlew replicateTypedHashers to regenerate
-//
-// @formatter:off
-package io.deephaven.engine.table.impl.by.typed.staticagg.gen;
-
-import static io.deephaven.util.compare.FloatComparisons.eq;
-
-import io.deephaven.chunk.Chunk;
-import io.deephaven.chunk.FloatChunk;
-import io.deephaven.chunk.attributes.Values;
-import io.deephaven.chunk.util.hashing.FloatChunkHasher;
-import io.deephaven.engine.rowset.RowSequence;
-import io.deephaven.engine.table.ColumnSource;
-import io.deephaven.engine.table.impl.by.HashHandler;
-import io.deephaven.engine.table.impl.by.StaticChunkedOperatorAggregationStateManagerTypedBase;
-import io.deephaven.engine.table.impl.sources.FloatArraySource;
-import io.deephaven.util.QueryConstants;
-import io.deephaven.util.type.TypeUtils;
-import java.lang.Float;
-import java.lang.Object;
-import java.lang.Override;
-
-final class StaticAggHasherFloat extends StaticChunkedOperatorAggregationStateManagerTypedBase {
-    private final FloatArraySource mainKeySource0;
-
-    private final FloatArraySource overflowKeySource0;
-
-    public StaticAggHasherFloat(ColumnSource[] tableKeySources,
-            ColumnSource[] originalTableKeySources, int tableSize, double maximumLoadFactor,
-            double targetLoadFactor) {
-        super(tableKeySources, tableSize, maximumLoadFactor, targetLoadFactor);
-        this.mainKeySource0 = (FloatArraySource) super.mainKeySources[0];
-        this.overflowKeySource0 = (FloatArraySource) super.overflowKeySources[0];
-    }
-
-    @Override
-    protected void build(HashHandler handler, RowSequence rowSequence, Chunk[] sourceKeyChunks) {
-        final FloatChunk<Values> keyChunk0 = sourceKeyChunks[0].asFloatChunk();
-        final int chunkSize = keyChunk0.size();
-        for (int chunkPosition = 0; chunkPosition < chunkSize; ++chunkPosition) {
-            final float k0 = keyChunk0.get(chunkPosition);
-            final int hash = hash(k0);
-            final int tableLocation = hashToTableLocation(tableHashPivot, hash);
-            if (mainOutputPosition.getUnsafe(tableLocation) == EMPTY_OUTPUT_POSITION) {
-                numEntries++;
-                mainKeySource0.set(tableLocation, k0);
-                handler.doMainInsert(tableLocation, chunkPosition);
-            } else if (eq(mainKeySource0.getUnsafe(tableLocation), k0)) {
-                handler.doMainFound(tableLocation, chunkPosition);
-            } else {
-                int overflowLocation = mainOverflowLocationSource.getUnsafe(tableLocation);
-                if (!findOverflow(handler, k0, chunkPosition, overflowLocation)) {
-                    final int newOverflowLocation = allocateOverflowLocation();
-                    overflowKeySource0.set(newOverflowLocation, k0);
-                    mainOverflowLocationSource.set(tableLocation, newOverflowLocation);
-                    overflowOverflowLocationSource.set(newOverflowLocation, overflowLocation);
-                    numEntries++;
-                    handler.doOverflowInsert(newOverflowLocation, chunkPosition);
-                }
-            }
-        }
-    }
-
-    @Override
-    protected void probe(HashHandler handler, RowSequence rowSequence, Chunk[] sourceKeyChunks) {
-        final FloatChunk<Values> keyChunk0 = sourceKeyChunks[0].asFloatChunk();
-        final int chunkSize = keyChunk0.size();
-        for (int chunkPosition = 0; chunkPosition < chunkSize; ++chunkPosition) {
-            final float k0 = keyChunk0.get(chunkPosition);
-            final int hash = hash(k0);
-            final int tableLocation = hashToTableLocation(tableHashPivot, hash);
-            if (mainOutputPosition.getUnsafe(tableLocation) == EMPTY_OUTPUT_POSITION) {
-                handler.doMissing(chunkPosition);
-            } else if (eq(mainKeySource0.getUnsafe(tableLocation), k0)) {
-                handler.doMainFound(tableLocation, chunkPosition);
-            } else {
-                int overflowLocation = mainOverflowLocationSource.getUnsafe(tableLocation);
-                if (!findOverflow(handler, k0, chunkPosition, overflowLocation)) {
-                    handler.doMissing(chunkPosition);
-                }
-            }
-        }
-    }
-
-    private static int hash(float k0) {
-        int hash = FloatChunkHasher.hashInitialSingle(k0);
-        return hash;
-    }
-
-    @Override
-    protected void rehashBucket(HashHandler handler, int sourceBucket, int destBucket,
-            int bucketsToAdd) {
-        final int position = mainOutputPosition.getUnsafe(sourceBucket);
-        if (position == EMPTY_OUTPUT_POSITION) {
-            return;
-        }
-        int mainInsertLocation = maybeMoveMainBucket(handler, sourceBucket, destBucket, bucketsToAdd);
-        int overflowLocation = mainOverflowLocationSource.getUnsafe(sourceBucket);
-        mainOverflowLocationSource.set(sourceBucket, QueryConstants.NULL_INT);
-        mainOverflowLocationSource.set(destBucket, QueryConstants.NULL_INT);
-        while (overflowLocation != QueryConstants.NULL_INT) {
-            final int nextOverflowLocation = overflowOverflowLocationSource.getUnsafe(overflowLocation);
-            final float overflowKey0 = overflowKeySource0.getUnsafe(overflowLocation);
-            final int overflowHash = hash(overflowKey0);
-            final int overflowTableLocation = hashToTableLocation(tableHashPivot + bucketsToAdd, overflowHash);
-            if (overflowTableLocation == mainInsertLocation) {
-                mainKeySource0.set(mainInsertLocation, overflowKey0);
-                mainOutputPosition.set(mainInsertLocation, overflowOutputPosition.getUnsafe(overflowLocation));
-                handler.doPromoteOverflow(overflowLocation, mainInsertLocation);
-                overflowOutputPosition.set(overflowLocation, QueryConstants.NULL_INT);
-                overflowKeySource0.set(overflowLocation, QueryConstants.NULL_FLOAT);
-                freeOverflowLocation(overflowLocation);
-                mainInsertLocation = -1;
-            } else {
-                final int oldOverflowLocation = mainOverflowLocationSource.getUnsafe(overflowTableLocation);
-                mainOverflowLocationSource.set(overflowTableLocation, overflowLocation);
-                overflowOverflowLocationSource.set(overflowLocation, oldOverflowLocation);
-            }
-            overflowLocation = nextOverflowLocation;
-        }
-    }
-
-    private int maybeMoveMainBucket(HashHandler handler, int sourceBucket, int destBucket,
-            int bucketsToAdd) {
-        final float k0 = mainKeySource0.getUnsafe(sourceBucket);
-        final int hash = hash(k0);
-        final int location = hashToTableLocation(tableHashPivot + bucketsToAdd, hash);
-        final int mainInsertLocation;
-        if (location == sourceBucket) {
-            mainInsertLocation = destBucket;
-            mainOutputPosition.set(destBucket, EMPTY_OUTPUT_POSITION);
-        } else {
-            mainInsertLocation = sourceBucket;
-            mainOutputPosition.set(destBucket, mainOutputPosition.getUnsafe(sourceBucket));
-            mainOutputPosition.set(sourceBucket, EMPTY_OUTPUT_POSITION);
-            mainKeySource0.set(destBucket, k0);
-            mainKeySource0.set(sourceBucket, QueryConstants.NULL_FLOAT);
-            handler.doMoveMain(sourceBucket, destBucket);
-        }
-        return mainInsertLocation;
-    }
-
-    private boolean findOverflow(HashHandler handler, float k0, int chunkPosition,
-            int overflowLocation) {
-        while (overflowLocation != QueryConstants.NULL_INT) {
-            if (eq(overflowKeySource0.getUnsafe(overflowLocation), k0)) {
-                handler.doOverflowFound(overflowLocation, chunkPosition);
-                return true;
-            }
-            overflowLocation = overflowOverflowLocationSource.getUnsafe(overflowLocation);
-        }
-        return false;
-    }
-
-    @Override
-    public int findPositionForKey(Object key) {
-        final float k0 = TypeUtils.unbox((Float)key);
-        int hash = hash(k0);
-        final int tableLocation = hashToTableLocation(tableHashPivot, hash);
-        final int positionValue = mainOutputPosition.getUnsafe(tableLocation);
-        if (positionValue == EMPTY_OUTPUT_POSITION) {
-            return -1;
-        }
-        if (eq(mainKeySource0.getUnsafe(tableLocation), k0)) {
-            return positionValue;
-        }
-        int overflowLocation = mainOverflowLocationSource.getUnsafe(tableLocation);
-        while (overflowLocation != QueryConstants.NULL_INT) {
-            if (eq(overflowKeySource0.getUnsafe(overflowLocation), k0)) {
-                return overflowOutputPosition.getUnsafe(overflowLocation);
-            }
-            overflowLocation = overflowOverflowLocationSource.getUnsafe(overflowLocation);
-        }
-        return -1;
-    }
-}
diff --git a/engine/table/src/main/java/io/deephaven/engine/table/impl/by/typed/staticagg/gen/StaticAggHasherFloatByte.java b/engine/table/src/main/java/io/deephaven/engine/table/impl/by/typed/staticagg/gen/StaticAggHasherFloatByte.java
deleted file mode 100644
index 5d8c9af9ec3..00000000000
--- a/engine/table/src/main/java/io/deephaven/engine/table/impl/by/typed/staticagg/gen/StaticAggHasherFloatByte.java
+++ /dev/null
@@ -1,206 +0,0 @@
-//
-// Copyright (c) 2016-2024 Deephaven Data Labs and Patent Pending
-//
-// ****** AUTO-GENERATED CLASS - DO NOT EDIT MANUALLY
-// ****** Run ReplicateTypedHashers or ./gradlew replicateTypedHashers to regenerate
-//
-// @formatter:off
-package io.deephaven.engine.table.impl.by.typed.staticagg.gen;
-
-import static io.deephaven.util.compare.ByteComparisons.eq;
-import static io.deephaven.util.compare.FloatComparisons.eq;
-
-import io.deephaven.chunk.ByteChunk;
-import io.deephaven.chunk.Chunk;
-import io.deephaven.chunk.FloatChunk;
-import io.deephaven.chunk.attributes.Values;
-import io.deephaven.chunk.util.hashing.ByteChunkHasher;
-import io.deephaven.chunk.util.hashing.FloatChunkHasher;
-import io.deephaven.engine.rowset.RowSequence;
-import io.deephaven.engine.table.ColumnSource;
-import io.deephaven.engine.table.impl.by.HashHandler;
-import io.deephaven.engine.table.impl.by.StaticChunkedOperatorAggregationStateManagerTypedBase;
-import io.deephaven.engine.table.impl.sources.ByteArraySource;
-import io.deephaven.engine.table.impl.sources.FloatArraySource;
-import io.deephaven.util.QueryConstants;
-import io.deephaven.util.type.TypeUtils;
-import java.lang.Byte;
-import java.lang.Float;
-import java.lang.Object;
-import java.lang.Override;
-
-final class StaticAggHasherFloatByte extends StaticChunkedOperatorAggregationStateManagerTypedBase {
-    private final FloatArraySource mainKeySource0;
-
-    private final FloatArraySource overflowKeySource0;
-
-    private final ByteArraySource mainKeySource1;
-
-    private final ByteArraySource overflowKeySource1;
-
-    public StaticAggHasherFloatByte(ColumnSource[] tableKeySources,
-            ColumnSource[] originalTableKeySources, int tableSize, double maximumLoadFactor,
-            double targetLoadFactor) {
-        super(tableKeySources, tableSize, maximumLoadFactor, targetLoadFactor);
-        this.mainKeySource0 = (FloatArraySource) super.mainKeySources[0];
-        this.overflowKeySource0 = (FloatArraySource) super.overflowKeySources[0];
-        this.mainKeySource1 = (ByteArraySource) super.mainKeySources[1];
-        this.overflowKeySource1 = (ByteArraySource) super.overflowKeySources[1];
-    }
-
-    @Override
-    protected void build(HashHandler handler, RowSequence rowSequence, Chunk[] sourceKeyChunks) {
-        final FloatChunk<Values> keyChunk0 = sourceKeyChunks[0].asFloatChunk();
-        final ByteChunk<Values> keyChunk1 = sourceKeyChunks[1].asByteChunk();
-        final int chunkSize = keyChunk0.size();
-        for (int chunkPosition = 0; chunkPosition < chunkSize; ++chunkPosition) {
-            final float k0 = keyChunk0.get(chunkPosition);
-            final byte k1 = keyChunk1.get(chunkPosition);
-            final int hash = hash(k0, k1);
-            final int tableLocation = hashToTableLocation(tableHashPivot, hash);
-            if (mainOutputPosition.getUnsafe(tableLocation) == EMPTY_OUTPUT_POSITION) {
-                numEntries++;
-                mainKeySource0.set(tableLocation, k0);
-                mainKeySource1.set(tableLocation, k1);
-                handler.doMainInsert(tableLocation, chunkPosition);
-            } else if (eq(mainKeySource0.getUnsafe(tableLocation), k0) && eq(mainKeySource1.getUnsafe(tableLocation), k1)) {
-                handler.doMainFound(tableLocation, chunkPosition);
-            } else {
-                int overflowLocation = mainOverflowLocationSource.getUnsafe(tableLocation);
-                if (!findOverflow(handler, k0, k1, chunkPosition, overflowLocation)) {
-                    final int newOverflowLocation = allocateOverflowLocation();
-                    overflowKeySource0.set(newOverflowLocation, k0);
-                    overflowKeySource1.set(newOverflowLocation, k1);
-                    mainOverflowLocationSource.set(tableLocation, newOverflowLocation);
-                    overflowOverflowLocationSource.set(newOverflowLocation, overflowLocation);
-                    numEntries++;
-                    handler.doOverflowInsert(newOverflowLocation, chunkPosition);
-                }
-            }
-        }
-    }
-
-    @Override
-    protected void probe(HashHandler handler, RowSequence rowSequence, Chunk[] sourceKeyChunks) {
-        final FloatChunk<Values> keyChunk0 = sourceKeyChunks[0].asFloatChunk();
-        final ByteChunk<Values> keyChunk1 = sourceKeyChunks[1].asByteChunk();
-        final int chunkSize = keyChunk0.size();
-        for (int chunkPosition = 0; chunkPosition < chunkSize; ++chunkPosition) {
-            final float k0 = keyChunk0.get(chunkPosition);
-            final byte k1 = keyChunk1.get(chunkPosition);
-            final int hash = hash(k0, k1);
-            final int tableLocation = hashToTableLocation(tableHashPivot, hash);
-            if (mainOutputPosition.getUnsafe(tableLocation) == EMPTY_OUTPUT_POSITION) {
-                handler.doMissing(chunkPosition);
-            } else if (eq(mainKeySource0.getUnsafe(tableLocation), k0) && eq(mainKeySource1.getUnsafe(tableLocation), k1)) {
-                handler.doMainFound(tableLocation, chunkPosition);
-            } else {
-                int overflowLocation = mainOverflowLocationSource.getUnsafe(tableLocation);
-                if (!findOverflow(handler, k0, k1, chunkPosition, overflowLocation)) {
-                    handler.doMissing(chunkPosition);
-                }
-            }
-        }
-    }
-
-    private static int hash(float k0, byte k1) {
-        int hash = FloatChunkHasher.hashInitialSingle(k0);
-        hash = ByteChunkHasher.hashUpdateSingle(hash, k1);
-        return hash;
-    }
-
-    @Override
-    protected void rehashBucket(HashHandler handler, int sourceBucket, int destBucket,
-            int bucketsToAdd) {
-        final int position = mainOutputPosition.getUnsafe(sourceBucket);
-        if (position == EMPTY_OUTPUT_POSITION) {
-            return;
-        }
-        int mainInsertLocation = maybeMoveMainBucket(handler, sourceBucket, destBucket, bucketsToAdd);
-        int overflowLocation = mainOverflowLocationSource.getUnsafe(sourceBucket);
-        mainOverflowLocationSource.set(sourceBucket, QueryConstants.NULL_INT);
-        mainOverflowLocationSource.set(destBucket, QueryConstants.NULL_INT);
-        while (overflowLocation != QueryConstants.NULL_INT) {
-            final int nextOverflowLocation = overflowOverflowLocationSource.getUnsafe(overflowLocation);
-            final float overflowKey0 = overflowKeySource0.getUnsafe(overflowLocation);
-            final byte overflowKey1 = overflowKeySource1.getUnsafe(overflowLocation);
-            final int overflowHash = hash(overflowKey0, overflowKey1);
-            final int overflowTableLocation = hashToTableLocation(tableHashPivot + bucketsToAdd, overflowHash);
-            if (overflowTableLocation == mainInsertLocation) {
-                mainKeySource0.set(mainInsertLocation, overflowKey0);
-                mainKeySource1.set(mainInsertLocation, overflowKey1);
-                mainOutputPosition.set(mainInsertLocation, overflowOutputPosition.getUnsafe(overflowLocation));
-                handler.doPromoteOverflow(overflowLocation, mainInsertLocation);
-                overflowOutputPosition.set(overflowLocation, QueryConstants.NULL_INT);
-                overflowKeySource0.set(overflowLocation, QueryConstants.NULL_FLOAT);
-                overflowKeySource1.set(overflowLocation, QueryConstants.NULL_BYTE);
-                freeOverflowLocation(overflowLocation);
-                mainInsertLocation = -1;
-            } else {
-                final int oldOverflowLocation = mainOverflowLocationSource.getUnsafe(overflowTableLocation);
-                mainOverflowLocationSource.set(overflowTableLocation, overflowLocation);
-                overflowOverflowLocationSource.set(overflowLocation, oldOverflowLocation);
-            }
-            overflowLocation = nextOverflowLocation;
-        }
-    }
-
-    private int maybeMoveMainBucket(HashHandler handler, int sourceBucket, int destBucket,
-            int bucketsToAdd) {
-        final float k0 = mainKeySource0.getUnsafe(sourceBucket);
-        final byte k1 = mainKeySource1.getUnsafe(sourceBucket);
-        final int hash = hash(k0, k1);
-        final int location = hashToTableLocation(tableHashPivot + bucketsToAdd, hash);
-        final int mainInsertLocation;
-        if (location == sourceBucket) {
-            mainInsertLocation = destBucket;
-            mainOutputPosition.set(destBucket, EMPTY_OUTPUT_POSITION);
-        } else {
-            mainInsertLocation = sourceBucket;
-            mainOutputPosition.set(destBucket, mainOutputPosition.getUnsafe(sourceBucket));
-            mainOutputPosition.set(sourceBucket, EMPTY_OUTPUT_POSITION);
-            mainKeySource0.set(destBucket, k0);
-            mainKeySource0.set(sourceBucket, QueryConstants.NULL_FLOAT);
-            mainKeySource1.set(destBucket, k1);
-            mainKeySource1.set(sourceBucket, QueryConstants.NULL_BYTE);
-            handler.doMoveMain(sourceBucket, destBucket);
-        }
-        return mainInsertLocation;
-    }
-
-    private boolean findOverflow(HashHandler handler, float k0, byte k1, int chunkPosition,
-            int overflowLocation) {
-        while (overflowLocation != QueryConstants.NULL_INT) {
-            if (eq(overflowKeySource0.getUnsafe(overflowLocation), k0) && eq(overflowKeySource1.getUnsafe(overflowLocation), k1)) {
-                handler.doOverflowFound(overflowLocation, chunkPosition);
-                return true;
-            }
-            overflowLocation = overflowOverflowLocationSource.getUnsafe(overflowLocation);
-        }
-        return false;
-    }
-
-    @Override
-    public int findPositionForKey(Object key) {
-        final Object [] ka = (Object[])key;
-        final float k0 = TypeUtils.unbox((Float)ka[0]);
-        final byte k1 = TypeUtils.unbox((Byte)ka[1]);
-        int hash = hash(k0, k1);
-        final int tableLocation = hashToTableLocation(tableHashPivot, hash);
-        final int positionValue = mainOutputPosition.getUnsafe(tableLocation);
-        if (positionValue == EMPTY_OUTPUT_POSITION) {
-            return -1;
-        }
-        if (eq(mainKeySource0.getUnsafe(tableLocation), k0) && eq(mainKeySource1.getUnsafe(tableLocation), k1)) {
-            return positionValue;
-        }
-        int overflowLocation = mainOverflowLocationSource.getUnsafe(tableLocation);
-        while (overflowLocation != QueryConstants.NULL_INT) {
-            if (eq(overflowKeySource0.getUnsafe(overflowLocation), k0) && eq(overflowKeySource1.getUnsafe(overflowLocation), k1)) {
-                return overflowOutputPosition.getUnsafe(overflowLocation);
-            }
-            overflowLocation = overflowOverflowLocationSource.getUnsafe(overflowLocation);
-        }
-        return -1;
-    }
-}
diff --git a/engine/table/src/main/java/io/deephaven/engine/table/impl/by/typed/staticagg/gen/StaticAggHasherFloatChar.java b/engine/table/src/main/java/io/deephaven/engine/table/impl/by/typed/staticagg/gen/StaticAggHasherFloatChar.java
deleted file mode 100644
index 1f0fe2a2d02..00000000000
--- a/engine/table/src/main/java/io/deephaven/engine/table/impl/by/typed/staticagg/gen/StaticAggHasherFloatChar.java
+++ /dev/null
@@ -1,206 +0,0 @@
-//
-// Copyright (c) 2016-2024 Deephaven Data Labs and Patent Pending
-//
-// ****** AUTO-GENERATED CLASS - DO NOT EDIT MANUALLY
-// ****** Run ReplicateTypedHashers or ./gradlew replicateTypedHashers to regenerate
-//
-// @formatter:off
-package io.deephaven.engine.table.impl.by.typed.staticagg.gen;
-
-import static io.deephaven.util.compare.CharComparisons.eq;
-import static io.deephaven.util.compare.FloatComparisons.eq;
-
-import io.deephaven.chunk.CharChunk;
-import io.deephaven.chunk.Chunk;
-import io.deephaven.chunk.FloatChunk;
-import io.deephaven.chunk.attributes.Values;
-import io.deephaven.chunk.util.hashing.CharChunkHasher;
-import io.deephaven.chunk.util.hashing.FloatChunkHasher;
-import io.deephaven.engine.rowset.RowSequence;
-import io.deephaven.engine.table.ColumnSource;
-import io.deephaven.engine.table.impl.by.HashHandler;
-import io.deephaven.engine.table.impl.by.StaticChunkedOperatorAggregationStateManagerTypedBase;
-import io.deephaven.engine.table.impl.sources.CharacterArraySource;
-import io.deephaven.engine.table.impl.sources.FloatArraySource;
-import io.deephaven.util.QueryConstants;
-import io.deephaven.util.type.TypeUtils;
-import java.lang.Character;
-import java.lang.Float;
-import java.lang.Object;
-import java.lang.Override;
-
-final class StaticAggHasherFloatChar extends StaticChunkedOperatorAggregationStateManagerTypedBase {
-    private final FloatArraySource mainKeySource0;
-
-    private final FloatArraySource overflowKeySource0;
-
-    private final CharacterArraySource mainKeySource1;
-
-    private final CharacterArraySource overflowKeySource1;
-
-    public StaticAggHasherFloatChar(ColumnSource[] tableKeySources,
-            ColumnSource[] originalTableKeySources, int tableSize, double maximumLoadFactor,
-            double targetLoadFactor) {
-        super(tableKeySources, tableSize, maximumLoadFactor, targetLoadFactor);
-        this.mainKeySource0 = (FloatArraySource) super.mainKeySources[0];
-        this.overflowKeySource0 = (FloatArraySource) super.overflowKeySources[0];
-        this.mainKeySource1 = (CharacterArraySource) super.mainKeySources[1];
-        this.overflowKeySource1 = (CharacterArraySource) super.overflowKeySources[1];
-    }
-
-    @Override
-    protected void build(HashHandler handler, RowSequence rowSequence, Chunk[] sourceKeyChunks) {
-        final FloatChunk<Values> keyChunk0 = sourceKeyChunks[0].asFloatChunk();
-        final CharChunk<Values> keyChunk1 = sourceKeyChunks[1].asCharChunk();
-        final int chunkSize = keyChunk0.size();
-        for (int chunkPosition = 0; chunkPosition < chunkSize; ++chunkPosition) {
-            final float k0 = keyChunk0.get(chunkPosition);
-            final char k1 = keyChunk1.get(chunkPosition);
-            final int hash = hash(k0, k1);
-            final int tableLocation = hashToTableLocation(tableHashPivot, hash);
-            if (mainOutputPosition.getUnsafe(tableLocation) == EMPTY_OUTPUT_POSITION) {
-                numEntries++;
-                mainKeySource0.set(tableLocation, k0);
-                mainKeySource1.set(tableLocation, k1);
-                handler.doMainInsert(tableLocation, chunkPosition);
-            } else if (eq(mainKeySource0.getUnsafe(tableLocation), k0) && eq(mainKeySource1.getUnsafe(tableLocation), k1)) {
-                handler.doMainFound(tableLocation, chunkPosition);
-            } else {
-                int overflowLocation = mainOverflowLocationSource.getUnsafe(tableLocation);
-                if (!findOverflow(handler, k0, k1, chunkPosition, overflowLocation)) {
-                    final int newOverflowLocation = allocateOverflowLocation();
-                    overflowKeySource0.set(newOverflowLocation, k0);
-                    overflowKeySource1.set(newOverflowLocation, k1);
-                    mainOverflowLocationSource.set(tableLocation, newOverflowLocation);
-                    overflowOverflowLocationSource.set(newOverflowLocation, overflowLocation);
-                    numEntries++;
-                    handler.doOverflowInsert(newOverflowLocation, chunkPosition);
-                }
-            }
-        }
-    }
-
-    @Override
-    protected void probe(HashHandler handler, RowSequence rowSequence, Chunk[] sourceKeyChunks) {
-        final FloatChunk<Values> keyChunk0 = sourceKeyChunks[0].asFloatChunk();
-        final CharChunk<Values> keyChunk1 = sourceKeyChunks[1].asCharChunk();
-        final int chunkSize = keyChunk0.size();
-        for (int chunkPosition = 0; chunkPosition < chunkSize; ++chunkPosition) {
-            final float k0 = keyChunk0.get(chunkPosition);
-            final char k1 = keyChunk1.get(chunkPosition);
-            final int hash = hash(k0, k1);
-            final int tableLocation = hashToTableLocation(tableHashPivot, hash);
-            if (mainOutputPosition.getUnsafe(tableLocation) == EMPTY_OUTPUT_POSITION) {
-                handler.doMissing(chunkPosition);
-            } else if (eq(mainKeySource0.getUnsafe(tableLocation), k0) && eq(mainKeySource1.getUnsafe(tableLocation), k1)) {
-                handler.doMainFound(tableLocation, chunkPosition);
-            } else {
-                int overflowLocation = mainOverflowLocationSource.getUnsafe(tableLocation);
-                if (!findOverflow(handler, k0, k1, chunkPosition, overflowLocation)) {
-                    handler.doMissing(chunkPosition);
-                }
-            }
-        }
-    }
-
-    private static int hash(float k0, char k1) {
-        int hash = FloatChunkHasher.hashInitialSingle(k0);
-        hash = CharChunkHasher.hashUpdateSingle(hash, k1);
-        return hash;
-    }
-
-    @Override
-    protected void rehashBucket(HashHandler handler, int sourceBucket, int destBucket,
-            int bucketsToAdd) {
-        final int position = mainOutputPosition.getUnsafe(sourceBucket);
-        if (position == EMPTY_OUTPUT_POSITION) {
-            return;
-        }
-        int mainInsertLocation = maybeMoveMainBucket(handler, sourceBucket, destBucket, bucketsToAdd);
-        int overflowLocation = mainOverflowLocationSource.getUnsafe(sourceBucket);
-        mainOverflowLocationSource.set(sourceBucket, QueryConstants.NULL_INT);
-        mainOverflowLocationSource.set(destBucket, QueryConstants.NULL_INT);
-        while (overflowLocation != QueryConstants.NULL_INT) {
-            final int nextOverflowLocation = overflowOverflowLocationSource.getUnsafe(overflowLocation);
-            final float overflowKey0 = overflowKeySource0.getUnsafe(overflowLocation);
-            final char overflowKey1 = overflowKeySource1.getUnsafe(overflowLocation);
-            final int overflowHash = hash(overflowKey0, overflowKey1);
-            final int overflowTableLocation = hashToTableLocation(tableHashPivot + bucketsToAdd, overflowHash);
-            if (overflowTableLocation == mainInsertLocation) {
-                mainKeySource0.set(mainInsertLocation, overflowKey0);
-                mainKeySource1.set(mainInsertLocation, overflowKey1);
-                mainOutputPosition.set(mainInsertLocation, overflowOutputPosition.getUnsafe(overflowLocation));
-                handler.doPromoteOverflow(overflowLocation, mainInsertLocation);
-                overflowOutputPosition.set(overflowLocation, QueryConstants.NULL_INT);
-                overflowKeySource0.set(overflowLocation, QueryConstants.NULL_FLOAT);
-                overflowKeySource1.set(overflowLocation, QueryConstants.NULL_CHAR);
-                freeOverflowLocation(overflowLocation);
-                mainInsertLocation = -1;
-            } else {
-                final int oldOverflowLocation = mainOverflowLocationSource.getUnsafe(overflowTableLocation);
-                mainOverflowLocationSource.set(overflowTableLocation, overflowLocation);
-                overflowOverflowLocationSource.set(overflowLocation, oldOverflowLocation);
-            }
-            overflowLocation = nextOverflowLocation;
-        }
-    }
-
-    private int maybeMoveMainBucket(HashHandler handler, int sourceBucket, int destBucket,
-            int bucketsToAdd) {
-        final float k0 = mainKeySource0.getUnsafe(sourceBucket);
-        final char k1 = mainKeySource1.getUnsafe(sourceBucket);
-        final int hash = hash(k0, k1);
-        final int location = hashToTableLocation(tableHashPivot + bucketsToAdd, hash);
-        final int mainInsertLocation;
-        if (location == sourceBucket) {
-            mainInsertLocation = destBucket;
-            mainOutputPosition.set(destBucket, EMPTY_OUTPUT_POSITION);
-        } else {
-            mainInsertLocation = sourceBucket;
-            mainOutputPosition.set(destBucket, mainOutputPosition.getUnsafe(sourceBucket));
-            mainOutputPosition.set(sourceBucket, EMPTY_OUTPUT_POSITION);
-            mainKeySource0.set(destBucket, k0);
-            mainKeySource0.set(sourceBucket, QueryConstants.NULL_FLOAT);
-            mainKeySource1.set(destBucket, k1);
-            mainKeySource1.set(sourceBucket, QueryConstants.NULL_CHAR);
-            handler.doMoveMain(sourceBucket, destBucket);
-        }
-        return mainInsertLocation;
-    }
-
-    private boolean findOverflow(HashHandler handler, float k0, char k1, int chunkPosition,
-            int overflowLocation) {
-        while (overflowLocation != QueryConstants.NULL_INT) {
-            if (eq(overflowKeySource0.getUnsafe(overflowLocation), k0) && eq(overflowKeySource1.getUnsafe(overflowLocation), k1)) {
-                handler.doOverflowFound(overflowLocation, chunkPosition);
-                return true;
-            }
-            overflowLocation = overflowOverflowLocationSource.getUnsafe(overflowLocation);
-        }
-        return false;
-    }
-
-    @Override
-    public int findPositionForKey(Object key) {
-        final Object [] ka = (Object[])key;
-        final float k0 = TypeUtils.unbox((Float)ka[0]);
-        final char k1 = TypeUtils.unbox((Character)ka[1]);
-        int hash = hash(k0, k1);
-        final int tableLocation = hashToTableLocation(tableHashPivot, hash);
-        final int positionValue = mainOutputPosition.getUnsafe(tableLocation);
-        if (positionValue == EMPTY_OUTPUT_POSITION) {
-            return -1;
-        }
-        if (eq(mainKeySource0.getUnsafe(tableLocation), k0) && eq(mainKeySource1.getUnsafe(tableLocation), k1)) {
-            return positionValue;
-        }
-        int overflowLocation = mainOverflowLocationSource.getUnsafe(tableLocation);
-        while (overflowLocation != QueryConstants.NULL_INT) {
-            if (eq(overflowKeySource0.getUnsafe(overflowLocation), k0) && eq(overflowKeySource1.getUnsafe(overflowLocation), k1)) {
-                return overflowOutputPosition.getUnsafe(overflowLocation);
-            }
-            overflowLocation = overflowOverflowLocationSource.getUnsafe(overflowLocation);
-        }
-        return -1;
-    }
-}
diff --git a/engine/table/src/main/java/io/deephaven/engine/table/impl/by/typed/staticagg/gen/StaticAggHasherFloatDouble.java b/engine/table/src/main/java/io/deephaven/engine/table/impl/by/typed/staticagg/gen/StaticAggHasherFloatDouble.java
deleted file mode 100644
index dc6aed0e187..00000000000
--- a/engine/table/src/main/java/io/deephaven/engine/table/impl/by/typed/staticagg/gen/StaticAggHasherFloatDouble.java
+++ /dev/null
@@ -1,206 +0,0 @@
-//
-// Copyright (c) 2016-2024 Deephaven Data Labs and Patent Pending
-//
-// ****** AUTO-GENERATED CLASS - DO NOT EDIT MANUALLY
-// ****** Run ReplicateTypedHashers or ./gradlew replicateTypedHashers to regenerate
-//
-// @formatter:off
-package io.deephaven.engine.table.impl.by.typed.staticagg.gen;
-
-import static io.deephaven.util.compare.DoubleComparisons.eq;
-import static io.deephaven.util.compare.FloatComparisons.eq;
-
-import io.deephaven.chunk.Chunk;
-import io.deephaven.chunk.DoubleChunk;
-import io.deephaven.chunk.FloatChunk;
-import io.deephaven.chunk.attributes.Values;
-import io.deephaven.chunk.util.hashing.DoubleChunkHasher;
-import io.deephaven.chunk.util.hashing.FloatChunkHasher;
-import io.deephaven.engine.rowset.RowSequence;
-import io.deephaven.engine.table.ColumnSource;
-import io.deephaven.engine.table.impl.by.HashHandler;
-import io.deephaven.engine.table.impl.by.StaticChunkedOperatorAggregationStateManagerTypedBase;
-import io.deephaven.engine.table.impl.sources.DoubleArraySource;
-import io.deephaven.engine.table.impl.sources.FloatArraySource;
-import io.deephaven.util.QueryConstants;
-import io.deephaven.util.type.TypeUtils;
-import java.lang.Double;
-import java.lang.Float;
-import java.lang.Object;
-import java.lang.Override;
-
-final class StaticAggHasherFloatDouble extends StaticChunkedOperatorAggregationStateManagerTypedBase {
-    private final FloatArraySource mainKeySource0;
-
-    private final FloatArraySource overflowKeySource0;
-
-    private final DoubleArraySource mainKeySource1;
-
-    private final DoubleArraySource overflowKeySource1;
-
-    public StaticAggHasherFloatDouble(ColumnSource[] tableKeySources,
-            ColumnSource[] originalTableKeySources, int tableSize, double maximumLoadFactor,
-            double targetLoadFactor) {
-        super(tableKeySources, tableSize, maximumLoadFactor, targetLoadFactor);
-        this.mainKeySource0 = (FloatArraySource) super.mainKeySources[0];
-        this.overflowKeySource0 = (FloatArraySource) super.overflowKeySources[0];
-        this.mainKeySource1 = (DoubleArraySource) super.mainKeySources[1];
-        this.overflowKeySource1 = (DoubleArraySource) super.overflowKeySources[1];
-    }
-
-    @Override
-    protected void build(HashHandler handler, RowSequence rowSequence, Chunk[] sourceKeyChunks) {
-        final FloatChunk<Values> keyChunk0 = sourceKeyChunks[0].asFloatChunk();
-        final DoubleChunk<Values> keyChunk1 = sourceKeyChunks[1].asDoubleChunk();
-        final int chunkSize = keyChunk0.size();
-        for (int chunkPosition = 0; chunkPosition < chunkSize; ++chunkPosition) {
-            final float k0 = keyChunk0.get(chunkPosition);
-            final double k1 = keyChunk1.get(chunkPosition);
-            final int hash = hash(k0, k1);
-            final int tableLocation = hashToTableLocation(tableHashPivot, hash);
-            if (mainOutputPosition.getUnsafe(tableLocation) == EMPTY_OUTPUT_POSITION) {
-                numEntries++;
-                mainKeySource0.set(tableLocation, k0);
-                mainKeySource1.set(tableLocation, k1);
-                handler.doMainInsert(tableLocation, chunkPosition);
-            } else if (eq(mainKeySource0.getUnsafe(tableLocation), k0) && eq(mainKeySource1.getUnsafe(tableLocation), k1)) {
-                handler.doMainFound(tableLocation, chunkPosition);
-            } else {
-                int overflowLocation = mainOverflowLocationSource.getUnsafe(tableLocation);
-                if (!findOverflow(handler, k0, k1, chunkPosition, overflowLocation)) {
-                    final int newOverflowLocation = allocateOverflowLocation();
-                    overflowKeySource0.set(newOverflowLocation, k0);
-                    overflowKeySource1.set(newOverflowLocation, k1);
-                    mainOverflowLocationSource.set(tableLocation, newOverflowLocation);
-                    overflowOverflowLocationSource.set(newOverflowLocation, overflowLocation);
-                    numEntries++;
-                    handler.doOverflowInsert(newOverflowLocation, chunkPosition);
-                }
-            }
-        }
-    }
-
-    @Override
-    protected void probe(HashHandler handler, RowSequence rowSequence, Chunk[] sourceKeyChunks) {
-        final FloatChunk<Values> keyChunk0 = sourceKeyChunks[0].asFloatChunk();
-        final DoubleChunk<Values> keyChunk1 = sourceKeyChunks[1].asDoubleChunk();
-        final int chunkSize = keyChunk0.size();
-        for (int chunkPosition = 0; chunkPosition < chunkSize; ++chunkPosition) {
-            final float k0 = keyChunk0.get(chunkPosition);
-            final double k1 = keyChunk1.get(chunkPosition);
-            final int hash = hash(k0, k1);
-            final int tableLocation = hashToTableLocation(tableHashPivot, hash);
-            if (mainOutputPosition.getUnsafe(tableLocation) == EMPTY_OUTPUT_POSITION) {
-                handler.doMissing(chunkPosition);
-            } else if (eq(mainKeySource0.getUnsafe(tableLocation), k0) && eq(mainKeySource1.getUnsafe(tableLocation), k1)) {
-                handler.doMainFound(tableLocation, chunkPosition);
-            } else {
-                int overflowLocation = mainOverflowLocationSource.getUnsafe(tableLocation);
-                if (!findOverflow(handler, k0, k1, chunkPosition, overflowLocation)) {
-                    handler.doMissing(chunkPosition);
-                }
-            }
-        }
-    }
-
-    private static int hash(float k0, double k1) {
-        int hash = FloatChunkHasher.hashInitialSingle(k0);
-        hash = DoubleChunkHasher.hashUpdateSingle(hash, k1);
-        return hash;
-    }
-
-    @Override
-    protected void rehashBucket(HashHandler handler, int sourceBucket, int destBucket,
-            int bucketsToAdd) {
-        final int position = mainOutputPosition.getUnsafe(sourceBucket);
-        if (position == EMPTY_OUTPUT_POSITION) {
-            return;
-        }
-        int mainInsertLocation = maybeMoveMainBucket(handler, sourceBucket, destBucket, bucketsToAdd);
-        int overflowLocation = mainOverflowLocationSource.getUnsafe(sourceBucket);
-        mainOverflowLocationSource.set(sourceBucket, QueryConstants.NULL_INT);
-        mainOverflowLocationSource.set(destBucket, QueryConstants.NULL_INT);
-        while (overflowLocation != QueryConstants.NULL_INT) {
-            final int nextOverflowLocation = overflowOverflowLocationSource.getUnsafe(overflowLocation);
-            final float overflowKey0 = overflowKeySource0.getUnsafe(overflowLocation);
-            final double overflowKey1 = overflowKeySource1.getUnsafe(overflowLocation);
-            final int overflowHash = hash(overflowKey0, overflowKey1);
-            final int overflowTableLocation = hashToTableLocation(tableHashPivot + bucketsToAdd, overflowHash);
-            if (overflowTableLocation == mainInsertLocation) {
-                mainKeySource0.set(mainInsertLocation, overflowKey0);
-                mainKeySource1.set(mainInsertLocation, overflowKey1);
-                mainOutputPosition.set(mainInsertLocation, overflowOutputPosition.getUnsafe(overflowLocation));
-                handler.doPromoteOverflow(overflowLocation, mainInsertLocation);
-                overflowOutputPosition.set(overflowLocation, QueryConstants.NULL_INT);
-                overflowKeySource0.set(overflowLocation, QueryConstants.NULL_FLOAT);
-                overflowKeySource1.set(overflowLocation, QueryConstants.NULL_DOUBLE);
-                freeOverflowLocation(overflowLocation);
-                mainInsertLocation = -1;
-            } else {
-                final int oldOverflowLocation = mainOverflowLocationSource.getUnsafe(overflowTableLocation);
-                mainOverflowLocationSource.set(overflowTableLocation, overflowLocation);
-                overflowOverflowLocationSource.set(overflowLocation, oldOverflowLocation);
-            }
-            overflowLocation = nextOverflowLocation;
-        }
-    }
-
-    private int maybeMoveMainBucket(HashHandler handler, int sourceBucket, int destBucket,
-            int bucketsToAdd) {
-        final float k0 = mainKeySource0.getUnsafe(sourceBucket);
-        final double k1 = mainKeySource1.getUnsafe(sourceBucket);
-        final int hash = hash(k0, k1);
-        final int location = hashToTableLocation(tableHashPivot + bucketsToAdd, hash);
-        final int mainInsertLocation;
-        if (location == sourceBucket) {
-            mainInsertLocation = destBucket;
-            mainOutputPosition.set(destBucket, EMPTY_OUTPUT_POSITION);
-        } else {
-            mainInsertLocation = sourceBucket;
-            mainOutputPosition.set(destBucket, mainOutputPosition.getUnsafe(sourceBucket));
-            mainOutputPosition.set(sourceBucket, EMPTY_OUTPUT_POSITION);
-            mainKeySource0.set(destBucket, k0);
-            mainKeySource0.set(sourceBucket, QueryConstants.NULL_FLOAT);
-            mainKeySource1.set(destBucket, k1);
-            mainKeySource1.set(sourceBucket, QueryConstants.NULL_DOUBLE);
-            handler.doMoveMain(sourceBucket, destBucket);
-        }
-        return mainInsertLocation;
-    }
-
-    private boolean findOverflow(HashHandler handler, float k0, double k1, int chunkPosition,
-            int overflowLocation) {
-        while (overflowLocation != QueryConstants.NULL_INT) {
-            if (eq(overflowKeySource0.getUnsafe(overflowLocation), k0) && eq(overflowKeySource1.getUnsafe(overflowLocation), k1)) {
-                handler.doOverflowFound(overflowLocation, chunkPosition);
-                return true;
-            }
-            overflowLocation = overflowOverflowLocationSource.getUnsafe(overflowLocation);
-        }
-        return false;
-    }
-
-    @Override
-    public int findPositionForKey(Object key) {
-        final Object [] ka = (Object[])key;
-        final float k0 = TypeUtils.unbox((Float)ka[0]);
-        final double k1 = TypeUtils.unbox((Double)ka[1]);
-        int hash = hash(k0, k1);
-        final int tableLocation = hashToTableLocation(tableHashPivot, hash);
-        final int positionValue = mainOutputPosition.getUnsafe(tableLocation);
-        if (positionValue == EMPTY_OUTPUT_POSITION) {
-            return -1;
-        }
-        if (eq(mainKeySource0.getUnsafe(tableLocation), k0) && eq(mainKeySource1.getUnsafe(tableLocation), k1)) {
-            return positionValue;
-        }
-        int overflowLocation = mainOverflowLocationSource.getUnsafe(tableLocation);
-        while (overflowLocation != QueryConstants.NULL_INT) {
-            if (eq(overflowKeySource0.getUnsafe(overflowLocation), k0) && eq(overflowKeySource1.getUnsafe(overflowLocation), k1)) {
-                return overflowOutputPosition.getUnsafe(overflowLocation);
-            }
-            overflowLocation = overflowOverflowLocationSource.getUnsafe(overflowLocation);
-        }
-        return -1;
-    }
-}
diff --git a/engine/table/src/main/java/io/deephaven/engine/table/impl/by/typed/staticagg/gen/StaticAggHasherFloatFloat.java b/engine/table/src/main/java/io/deephaven/engine/table/impl/by/typed/staticagg/gen/StaticAggHasherFloatFloat.java
deleted file mode 100644
index 45f46a8f7d6..00000000000
--- a/engine/table/src/main/java/io/deephaven/engine/table/impl/by/typed/staticagg/gen/StaticAggHasherFloatFloat.java
+++ /dev/null
@@ -1,201 +0,0 @@
-//
-// Copyright (c) 2016-2024 Deephaven Data Labs and Patent Pending
-//
-// ****** AUTO-GENERATED CLASS - DO NOT EDIT MANUALLY
-// ****** Run ReplicateTypedHashers or ./gradlew replicateTypedHashers to regenerate
-//
-// @formatter:off
-package io.deephaven.engine.table.impl.by.typed.staticagg.gen;
-
-import static io.deephaven.util.compare.FloatComparisons.eq;
-
-import io.deephaven.chunk.Chunk;
-import io.deephaven.chunk.FloatChunk;
-import io.deephaven.chunk.attributes.Values;
-import io.deephaven.chunk.util.hashing.FloatChunkHasher;
-import io.deephaven.engine.rowset.RowSequence;
-import io.deephaven.engine.table.ColumnSource;
-import io.deephaven.engine.table.impl.by.HashHandler;
-import io.deephaven.engine.table.impl.by.StaticChunkedOperatorAggregationStateManagerTypedBase;
-import io.deephaven.engine.table.impl.sources.FloatArraySource;
-import io.deephaven.util.QueryConstants;
-import io.deephaven.util.type.TypeUtils;
-import java.lang.Float;
-import java.lang.Object;
-import java.lang.Override;
-
-final class StaticAggHasherFloatFloat extends StaticChunkedOperatorAggregationStateManagerTypedBase {
-    private final FloatArraySource mainKeySource0;
-
-    private final FloatArraySource overflowKeySource0;
-
-    private final FloatArraySource mainKeySource1;
-
-    private final FloatArraySource overflowKeySource1;
-
-    public StaticAggHasherFloatFloat(ColumnSource[] tableKeySources,
-            ColumnSource[] originalTableKeySources, int tableSize, double maximumLoadFactor,
-            double targetLoadFactor) {
-        super(tableKeySources, tableSize, maximumLoadFactor, targetLoadFactor);
-        this.mainKeySource0 = (FloatArraySource) super.mainKeySources[0];
-        this.overflowKeySource0 = (FloatArraySource) super.overflowKeySources[0];
-        this.mainKeySource1 = (FloatArraySource) super.mainKeySources[1];
-        this.overflowKeySource1 = (FloatArraySource) super.overflowKeySources[1];
-    }
-
-    @Override
-    protected void build(HashHandler handler, RowSequence rowSequence, Chunk[] sourceKeyChunks) {
-        final FloatChunk<Values> keyChunk0 = sourceKeyChunks[0].asFloatChunk();
-        final FloatChunk<Values> keyChunk1 = sourceKeyChunks[1].asFloatChunk();
-        final int chunkSize = keyChunk0.size();
-        for (int chunkPosition = 0; chunkPosition < chunkSize; ++chunkPosition) {
-            final float k0 = keyChunk0.get(chunkPosition);
-            final float k1 = keyChunk1.get(chunkPosition);
-            final int hash = hash(k0, k1);
-            final int tableLocation = hashToTableLocation(tableHashPivot, hash);
-            if (mainOutputPosition.getUnsafe(tableLocation) == EMPTY_OUTPUT_POSITION) {
-                numEntries++;
-                mainKeySource0.set(tableLocation, k0);
-                mainKeySource1.set(tableLocation, k1);
-                handler.doMainInsert(tableLocation, chunkPosition);
-            } else if (eq(mainKeySource0.getUnsafe(tableLocation), k0) && eq(mainKeySource1.getUnsafe(tableLocation), k1)) {
-                handler.doMainFound(tableLocation, chunkPosition);
-            } else {
-                int overflowLocation = mainOverflowLocationSource.getUnsafe(tableLocation);
-                if (!findOverflow(handler, k0, k1, chunkPosition, overflowLocation)) {
-                    final int newOverflowLocation = allocateOverflowLocation();
-                    overflowKeySource0.set(newOverflowLocation, k0);
-                    overflowKeySource1.set(newOverflowLocation, k1);
-                    mainOverflowLocationSource.set(tableLocation, newOverflowLocation);
-                    overflowOverflowLocationSource.set(newOverflowLocation, overflowLocation);
-                    numEntries++;
-                    handler.doOverflowInsert(newOverflowLocation, chunkPosition);
-                }
-            }
-        }
-    }
-
-    @Override
-    protected void probe(HashHandler handler, RowSequence rowSequence, Chunk[] sourceKeyChunks) {
-        final FloatChunk<Values> keyChunk0 = sourceKeyChunks[0].asFloatChunk();
-        final FloatChunk<Values> keyChunk1 = sourceKeyChunks[1].asFloatChunk();
-        final int chunkSize = keyChunk0.size();
-        for (int chunkPosition = 0; chunkPosition < chunkSize; ++chunkPosition) {
-            final float k0 = keyChunk0.get(chunkPosition);
-            final float k1 = keyChunk1.get(chunkPosition);
-            final int hash = hash(k0, k1);
-            final int tableLocation = hashToTableLocation(tableHashPivot, hash);
-            if (mainOutputPosition.getUnsafe(tableLocation) == EMPTY_OUTPUT_POSITION) {
-                handler.doMissing(chunkPosition);
-            } else if (eq(mainKeySource0.getUnsafe(tableLocation), k0) && eq(mainKeySource1.getUnsafe(tableLocation), k1)) {
-                handler.doMainFound(tableLocation, chunkPosition);
-            } else {
-                int overflowLocation = mainOverflowLocationSource.getUnsafe(tableLocation);
-                if (!findOverflow(handler, k0, k1, chunkPosition, overflowLocation)) {
-                    handler.doMissing(chunkPosition);
-                }
-            }
-        }
-    }
-
-    private static int hash(float k0, float k1) {
-        int hash = FloatChunkHasher.hashInitialSingle(k0);
-        hash = FloatChunkHasher.hashUpdateSingle(hash, k1);
-        return hash;
-    }
-
-    @Override
-    protected void rehashBucket(HashHandler handler, int sourceBucket, int destBucket,
-            int bucketsToAdd) {
-        final int position = mainOutputPosition.getUnsafe(sourceBucket);
-        if (position == EMPTY_OUTPUT_POSITION) {
-            return;
-        }
-        int mainInsertLocation = maybeMoveMainBucket(handler, sourceBucket, destBucket, bucketsToAdd);
-        int overflowLocation = mainOverflowLocationSource.getUnsafe(sourceBucket);
-        mainOverflowLocationSource.set(sourceBucket, QueryConstants.NULL_INT);
-        mainOverflowLocationSource.set(destBucket, QueryConstants.NULL_INT);
-        while (overflowLocation != QueryConstants.NULL_INT) {
-            final int nextOverflowLocation = overflowOverflowLocationSource.getUnsafe(overflowLocation);
-            final float overflowKey0 = overflowKeySource0.getUnsafe(overflowLocation);
-            final float overflowKey1 = overflowKeySource1.getUnsafe(overflowLocation);
-            final int overflowHash = hash(overflowKey0, overflowKey1);
-            final int overflowTableLocation = hashToTableLocation(tableHashPivot + bucketsToAdd, overflowHash);
-            if (overflowTableLocation == mainInsertLocation) {
-                mainKeySource0.set(mainInsertLocation, overflowKey0);
-                mainKeySource1.set(mainInsertLocation, overflowKey1);
-                mainOutputPosition.set(mainInsertLocation, overflowOutputPosition.getUnsafe(overflowLocation));
-                handler.doPromoteOverflow(overflowLocation, mainInsertLocation);
-                overflowOutputPosition.set(overflowLocation, QueryConstants.NULL_INT);
-                overflowKeySource0.set(overflowLocation, QueryConstants.NULL_FLOAT);
-                overflowKeySource1.set(overflowLocation, QueryConstants.NULL_FLOAT);
-                freeOverflowLocation(overflowLocation);
-                mainInsertLocation = -1;
-            } else {
-                final int oldOverflowLocation = mainOverflowLocationSource.getUnsafe(overflowTableLocation);
-                mainOverflowLocationSource.set(overflowTableLocation, overflowLocation);
-                overflowOverflowLocationSource.set(overflowLocation, oldOverflowLocation);
-            }
-            overflowLocation = nextOverflowLocation;
-        }
-    }
-
-    private int maybeMoveMainBucket(HashHandler handler, int sourceBucket, int destBucket,
-            int bucketsToAdd) {
-        final float k0 = mainKeySource0.getUnsafe(sourceBucket);
-        final float k1 = mainKeySource1.getUnsafe(sourceBucket);
-        final int hash = hash(k0, k1);
-        final int location = hashToTableLocation(tableHashPivot + bucketsToAdd, hash);
-        final int mainInsertLocation;
-        if (location == sourceBucket) {
-            mainInsertLocation = destBucket;
-            mainOutputPosition.set(destBucket, EMPTY_OUTPUT_POSITION);
-        } else {
-            mainInsertLocation = sourceBucket;
-            mainOutputPosition.set(destBucket, mainOutputPosition.getUnsafe(sourceBucket));
-            mainOutputPosition.set(sourceBucket, EMPTY_OUTPUT_POSITION);
-            mainKeySource0.set(destBucket, k0);
-            mainKeySource0.set(sourceBucket, QueryConstants.NULL_FLOAT);
-            mainKeySource1.set(destBucket, k1);
-            mainKeySource1.set(sourceBucket, QueryConstants.NULL_FLOAT);
-            handler.doMoveMain(sourceBucket, destBucket);
-        }
-        return mainInsertLocation;
-    }
-
-    private boolean findOverflow(HashHandler handler, float k0, float k1, int chunkPosition,
-            int overflowLocation) {
-        while (overflowLocation != QueryConstants.NULL_INT) {
-            if (eq(overflowKeySource0.getUnsafe(overflowLocation), k0) && eq(overflowKeySource1.getUnsafe(overflowLocation), k1)) {
-                handler.doOverflowFound(overflowLocation, chunkPosition);
-                return true;
-            }
-            overflowLocation = overflowOverflowLocationSource.getUnsafe(overflowLocation);
-        }
-        return false;
-    }
-
-    @Override
-    public int findPositionForKey(Object key) {
-        final Object [] ka = (Object[])key;
-        final float k0 = TypeUtils.unbox((Float)ka[0]);
-        final float k1 = TypeUtils.unbox((Float)ka[1]);
-        int hash = hash(k0, k1);
-        final int tableLocation = hashToTableLocation(tableHashPivot, hash);
-        final int positionValue = mainOutputPosition.getUnsafe(tableLocation);
-        if (positionValue == EMPTY_OUTPUT_POSITION) {
-            return -1;
-        }
-        if (eq(mainKeySource0.getUnsafe(tableLocation), k0) && eq(mainKeySource1.getUnsafe(tableLocation), k1)) {
-            return positionValue;
-        }
-        int overflowLocation = mainOverflowLocationSource.getUnsafe(tableLocation);
-        while (overflowLocation != QueryConstants.NULL_INT) {
-            if (eq(overflowKeySource0.getUnsafe(overflowLocation), k0) && eq(overflowKeySource1.getUnsafe(overflowLocation), k1)) {
-                return overflowOutputPosition.getUnsafe(overflowLocation);
-            }
-            overflowLocation = overflowOverflowLocationSource.getUnsafe(overflowLocation);
-        }
-        return -1;
-    }
-}
diff --git a/engine/table/src/main/java/io/deephaven/engine/table/impl/by/typed/staticagg/gen/StaticAggHasherFloatInt.java b/engine/table/src/main/java/io/deephaven/engine/table/impl/by/typed/staticagg/gen/StaticAggHasherFloatInt.java
deleted file mode 100644
index 5c1afcd9063..00000000000
--- a/engine/table/src/main/java/io/deephaven/engine/table/impl/by/typed/staticagg/gen/StaticAggHasherFloatInt.java
+++ /dev/null
@@ -1,206 +0,0 @@
-//
-// Copyright (c) 2016-2024 Deephaven Data Labs and Patent Pending
-//
-// ****** AUTO-GENERATED CLASS - DO NOT EDIT MANUALLY
-// ****** Run ReplicateTypedHashers or ./gradlew replicateTypedHashers to regenerate
-//
-// @formatter:off
-package io.deephaven.engine.table.impl.by.typed.staticagg.gen;
-
-import static io.deephaven.util.compare.FloatComparisons.eq;
-import static io.deephaven.util.compare.IntComparisons.eq;
-
-import io.deephaven.chunk.Chunk;
-import io.deephaven.chunk.FloatChunk;
-import io.deephaven.chunk.IntChunk;
-import io.deephaven.chunk.attributes.Values;
-import io.deephaven.chunk.util.hashing.FloatChunkHasher;
-import io.deephaven.chunk.util.hashing.IntChunkHasher;
-import io.deephaven.engine.rowset.RowSequence;
-import io.deephaven.engine.table.ColumnSource;
-import io.deephaven.engine.table.impl.by.HashHandler;
-import io.deephaven.engine.table.impl.by.StaticChunkedOperatorAggregationStateManagerTypedBase;
-import io.deephaven.engine.table.impl.sources.FloatArraySource;
-import io.deephaven.engine.table.impl.sources.IntegerArraySource;
-import io.deephaven.util.QueryConstants;
-import io.deephaven.util.type.TypeUtils;
-import java.lang.Float;
-import java.lang.Integer;
-import java.lang.Object;
-import java.lang.Override;
-
-final class StaticAggHasherFloatInt extends StaticChunkedOperatorAggregationStateManagerTypedBase {
-    private final FloatArraySource mainKeySource0;
-
-    private final FloatArraySource overflowKeySource0;
-
-    private final IntegerArraySource mainKeySource1;
-
-    private final IntegerArraySource overflowKeySource1;
-
-    public StaticAggHasherFloatInt(ColumnSource[] tableKeySources,
-            ColumnSource[] originalTableKeySources, int tableSize, double maximumLoadFactor,
-            double targetLoadFactor) {
-        super(tableKeySources, tableSize, maximumLoadFactor, targetLoadFactor);
-        this.mainKeySource0 = (FloatArraySource) super.mainKeySources[0];
-        this.overflowKeySource0 = (FloatArraySource) super.overflowKeySources[0];
-        this.mainKeySource1 = (IntegerArraySource) super.mainKeySources[1];
-        this.overflowKeySource1 = (IntegerArraySource) super.overflowKeySources[1];
-    }
-
-    @Override
-    protected void build(HashHandler handler, RowSequence rowSequence, Chunk[] sourceKeyChunks) {
-        final FloatChunk<Values> keyChunk0 = sourceKeyChunks[0].asFloatChunk();
-        final IntChunk<Values> keyChunk1 = sourceKeyChunks[1].asIntChunk();
-        final int chunkSize = keyChunk0.size();
-        for (int chunkPosition = 0; chunkPosition < chunkSize; ++chunkPosition) {
-            final float k0 = keyChunk0.get(chunkPosition);
-            final int k1 = keyChunk1.get(chunkPosition);
-            final int hash = hash(k0, k1);
-            final int tableLocation = hashToTableLocation(tableHashPivot, hash);
-            if (mainOutputPosition.getUnsafe(tableLocation) == EMPTY_OUTPUT_POSITION) {
-                numEntries++;
-                mainKeySource0.set(tableLocation, k0);
-                mainKeySource1.set(tableLocation, k1);
-                handler.doMainInsert(tableLocation, chunkPosition);
-            } else if (eq(mainKeySource0.getUnsafe(tableLocation), k0) && eq(mainKeySource1.getUnsafe(tableLocation), k1)) {
-                handler.doMainFound(tableLocation, chunkPosition);
-            } else {
-                int overflowLocation = mainOverflowLocationSource.getUnsafe(tableLocation);
-                if (!findOverflow(handler, k0, k1, chunkPosition, overflowLocation)) {
-                    final int newOverflowLocation = allocateOverflowLocation();
-                    overflowKeySource0.set(newOverflowLocation, k0);
-                    overflowKeySource1.set(newOverflowLocation, k1);
-                    mainOverflowLocationSource.set(tableLocation, newOverflowLocation);
-                    overflowOverflowLocationSource.set(newOverflowLocation, overflowLocation);
-                    numEntries++;
-                    handler.doOverflowInsert(newOverflowLocation, chunkPosition);
-                }
-            }
-        }
-    }
-
-    @Override
-    protected void probe(HashHandler handler, RowSequence rowSequence, Chunk[] sourceKeyChunks) {
-        final FloatChunk<Values> keyChunk0 = sourceKeyChunks[0].asFloatChunk();
-        final IntChunk<Values> keyChunk1 = sourceKeyChunks[1].asIntChunk();
-        final int chunkSize = keyChunk0.size();
-        for (int chunkPosition = 0; chunkPosition < chunkSize; ++chunkPosition) {
-            final float k0 = keyChunk0.get(chunkPosition);
-            final int k1 = keyChunk1.get(chunkPosition);
-            final int hash = hash(k0, k1);
-            final int tableLocation = hashToTableLocation(tableHashPivot, hash);
-            if (mainOutputPosition.getUnsafe(tableLocation) == EMPTY_OUTPUT_POSITION) {
-                handler.doMissing(chunkPosition);
-            } else if (eq(mainKeySource0.getUnsafe(tableLocation), k0) && eq(mainKeySource1.getUnsafe(tableLocation), k1)) {
-                handler.doMainFound(tableLocation, chunkPosition);
-            } else {
-                int overflowLocation = mainOverflowLocationSource.getUnsafe(tableLocation);
-                if (!findOverflow(handler, k0, k1, chunkPosition, overflowLocation)) {
-                    handler.doMissing(chunkPosition);
-                }
-            }
-        }
-    }
-
-    private static int hash(float k0, int k1) {
-        int hash = FloatChunkHasher.hashInitialSingle(k0);
-        hash = IntChunkHasher.hashUpdateSingle(hash, k1);
-        return hash;
-    }
-
-    @Override
-    protected void rehashBucket(HashHandler handler, int sourceBucket, int destBucket,
-            int bucketsToAdd) {
-        final int position = mainOutputPosition.getUnsafe(sourceBucket);
-        if (position == EMPTY_OUTPUT_POSITION) {
-            return;
-        }
-        int mainInsertLocation = maybeMoveMainBucket(handler, sourceBucket, destBucket, bucketsToAdd);
-        int overflowLocation = mainOverflowLocationSource.getUnsafe(sourceBucket);
-        mainOverflowLocationSource.set(sourceBucket, QueryConstants.NULL_INT);
-        mainOverflowLocationSource.set(destBucket, QueryConstants.NULL_INT);
-        while (overflowLocation != QueryConstants.NULL_INT) {
-            final int nextOverflowLocation = overflowOverflowLocationSource.getUnsafe(overflowLocation);
-            final float overflowKey0 = overflowKeySource0.getUnsafe(overflowLocation);
-            final int overflowKey1 = overflowKeySource1.getUnsafe(overflowLocation);
-            final int overflowHash = hash(overflowKey0, overflowKey1);
-            final int overflowTableLocation = hashToTableLocation(tableHashPivot + bucketsToAdd, overflowHash);
-            if (overflowTableLocation == mainInsertLocation) {
-                mainKeySource0.set(mainInsertLocation, overflowKey0);
-                mainKeySource1.set(mainInsertLocation, overflowKey1);
-                mainOutputPosition.set(mainInsertLocation, overflowOutputPosition.getUnsafe(overflowLocation));
-                handler.doPromoteOverflow(overflowLocation, mainInsertLocation);
-                overflowOutputPosition.set(overflowLocation, QueryConstants.NULL_INT);
-                overflowKeySource0.set(overflowLocation, QueryConstants.NULL_FLOAT);
-                overflowKeySource1.set(overflowLocation, QueryConstants.NULL_INT);
-                freeOverflowLocation(overflowLocation);
-                mainInsertLocation = -1;
-            } else {
-                final int oldOverflowLocation = mainOverflowLocationSource.getUnsafe(overflowTableLocation);
-                mainOverflowLocationSource.set(overflowTableLocation, overflowLocation);
-                overflowOverflowLocationSource.set(overflowLocation, oldOverflowLocation);
-            }
-            overflowLocation = nextOverflowLocation;
-        }
-    }
-
-    private int maybeMoveMainBucket(HashHandler handler, int sourceBucket, int destBucket,
-            int bucketsToAdd) {
-        final float k0 = mainKeySource0.getUnsafe(sourceBucket);
-        final int k1 = mainKeySource1.getUnsafe(sourceBucket);
-        final int hash = hash(k0, k1);
-        final int location = hashToTableLocation(tableHashPivot + bucketsToAdd, hash);
-        final int mainInsertLocation;
-        if (location == sourceBucket) {
-            mainInsertLocation = destBucket;
-            mainOutputPosition.set(destBucket, EMPTY_OUTPUT_POSITION);
-        } else {
-            mainInsertLocation = sourceBucket;
-            mainOutputPosition.set(destBucket, mainOutputPosition.getUnsafe(sourceBucket));
-            mainOutputPosition.set(sourceBucket, EMPTY_OUTPUT_POSITION);
-            mainKeySource0.set(destBucket, k0);
-            mainKeySource0.set(sourceBucket, QueryConstants.NULL_FLOAT);
-            mainKeySource1.set(destBucket, k1);
-            mainKeySource1.set(sourceBucket, QueryConstants.NULL_INT);
-            handler.doMoveMain(sourceBucket, destBucket);
-        }
-        return mainInsertLocation;
-    }
-
-    private boolean findOverflow(HashHandler handler, float k0, int k1, int chunkPosition,
-            int overflowLocation) {
-        while (overflowLocation != QueryConstants.NULL_INT) {
-            if (eq(overflowKeySource0.getUnsafe(overflowLocation), k0) && eq(overflowKeySource1.getUnsafe(overflowLocation), k1)) {
-                handler.doOverflowFound(overflowLocation, chunkPosition);
-                return true;
-            }
-            overflowLocation = overflowOverflowLocationSource.getUnsafe(overflowLocation);
-        }
-        return false;
-    }
-
-    @Override
-    public int findPositionForKey(Object key) {
-        final Object [] ka = (Object[])key;
-        final float k0 = TypeUtils.unbox((Float)ka[0]);
-        final int k1 = TypeUtils.unbox((Integer)ka[1]);
-        int hash = hash(k0, k1);
-        final int tableLocation = hashToTableLocation(tableHashPivot, hash);
-        final int positionValue = mainOutputPosition.getUnsafe(tableLocation);
-        if (positionValue == EMPTY_OUTPUT_POSITION) {
-            return -1;
-        }
-        if (eq(mainKeySource0.getUnsafe(tableLocation), k0) && eq(mainKeySource1.getUnsafe(tableLocation), k1)) {
-            return positionValue;
-        }
-        int overflowLocation = mainOverflowLocationSource.getUnsafe(tableLocation);
-        while (overflowLocation != QueryConstants.NULL_INT) {
-            if (eq(overflowKeySource0.getUnsafe(overflowLocation), k0) && eq(overflowKeySource1.getUnsafe(overflowLocation), k1)) {
-                return overflowOutputPosition.getUnsafe(overflowLocation);
-            }
-            overflowLocation = overflowOverflowLocationSource.getUnsafe(overflowLocation);
-        }
-        return -1;
-    }
-}
diff --git a/engine/table/src/main/java/io/deephaven/engine/table/impl/by/typed/staticagg/gen/StaticAggHasherFloatLong.java b/engine/table/src/main/java/io/deephaven/engine/table/impl/by/typed/staticagg/gen/StaticAggHasherFloatLong.java
deleted file mode 100644
index d9382e0f0c8..00000000000
--- a/engine/table/src/main/java/io/deephaven/engine/table/impl/by/typed/staticagg/gen/StaticAggHasherFloatLong.java
+++ /dev/null
@@ -1,206 +0,0 @@
-//
-// Copyright (c) 2016-2024 Deephaven Data Labs and Patent Pending
-//
-// ****** AUTO-GENERATED CLASS - DO NOT EDIT MANUALLY
-// ****** Run ReplicateTypedHashers or ./gradlew replicateTypedHashers to regenerate
-//
-// @formatter:off
-package io.deephaven.engine.table.impl.by.typed.staticagg.gen;
-
-import static io.deephaven.util.compare.FloatComparisons.eq;
-import static io.deephaven.util.compare.LongComparisons.eq;
-
-import io.deephaven.chunk.Chunk;
-import io.deephaven.chunk.FloatChunk;
-import io.deephaven.chunk.LongChunk;
-import io.deephaven.chunk.attributes.Values;
-import io.deephaven.chunk.util.hashing.FloatChunkHasher;
-import io.deephaven.chunk.util.hashing.LongChunkHasher;
-import io.deephaven.engine.rowset.RowSequence;
-import io.deephaven.engine.table.ColumnSource;
-import io.deephaven.engine.table.impl.by.HashHandler;
-import io.deephaven.engine.table.impl.by.StaticChunkedOperatorAggregationStateManagerTypedBase;
-import io.deephaven.engine.table.impl.sources.FloatArraySource;
-import io.deephaven.engine.table.impl.sources.LongArraySource;
-import io.deephaven.util.QueryConstants;
-import io.deephaven.util.type.TypeUtils;
-import java.lang.Float;
-import java.lang.Long;
-import java.lang.Object;
-import java.lang.Override;
-
-final class StaticAggHasherFloatLong extends StaticChunkedOperatorAggregationStateManagerTypedBase {
-    private final FloatArraySource mainKeySource0;
-
-    private final FloatArraySource overflowKeySource0;
-
-    private final LongArraySource mainKeySource1;
-
-    private final LongArraySource overflowKeySource1;
-
-    public StaticAggHasherFloatLong(ColumnSource[] tableKeySources,
-            ColumnSource[] originalTableKeySources, int tableSize, double maximumLoadFactor,
-            double targetLoadFactor) {
-        super(tableKeySources, tableSize, maximumLoadFactor, targetLoadFactor);
-        this.mainKeySource0 = (FloatArraySource) super.mainKeySources[0];
-        this.overflowKeySource0 = (FloatArraySource) super.overflowKeySources[0];
-        this.mainKeySource1 = (LongArraySource) super.mainKeySources[1];
-        this.overflowKeySource1 = (LongArraySource) super.overflowKeySources[1];
-    }
-
-    @Override
-    protected void build(HashHandler handler, RowSequence rowSequence, Chunk[] sourceKeyChunks) {
-        final FloatChunk<Values> keyChunk0 = sourceKeyChunks[0].asFloatChunk();
-        final LongChunk<Values> keyChunk1 = sourceKeyChunks[1].asLongChunk();
-        final int chunkSize = keyChunk0.size();
-        for (int chunkPosition = 0; chunkPosition < chunkSize; ++chunkPosition) {
-            final float k0 = keyChunk0.get(chunkPosition);
-            final long k1 = keyChunk1.get(chunkPosition);
-            final int hash = hash(k0, k1);
-            final int tableLocation = hashToTableLocation(tableHashPivot, hash);
-            if (mainOutputPosition.getUnsafe(tableLocation) == EMPTY_OUTPUT_POSITION) {
-                numEntries++;
-                mainKeySource0.set(tableLocation, k0);
-                mainKeySource1.set(tableLocation, k1);
-                handler.doMainInsert(tableLocation, chunkPosition);
-            } else if (eq(mainKeySource0.getUnsafe(tableLocation), k0) && eq(mainKeySource1.getUnsafe(tableLocation), k1)) {
-                handler.doMainFound(tableLocation, chunkPosition);
-            } else {
-                int overflowLocation = mainOverflowLocationSource.getUnsafe(tableLocation);
-                if (!findOverflow(handler, k0, k1, chunkPosition, overflowLocation)) {
-                    final int newOverflowLocation = allocateOverflowLocation();
-                    overflowKeySource0.set(newOverflowLocation, k0);
-                    overflowKeySource1.set(newOverflowLocation, k1);
-                    mainOverflowLocationSource.set(tableLocation, newOverflowLocation);
-                    overflowOverflowLocationSource.set(newOverflowLocation, overflowLocation);
-                    numEntries++;
-                    handler.doOverflowInsert(newOverflowLocation, chunkPosition);
-                }
-            }
-        }
-    }
-
-    @Override
-    protected void probe(HashHandler handler, RowSequence rowSequence, Chunk[] sourceKeyChunks) {
-        final FloatChunk<Values> keyChunk0 = sourceKeyChunks[0].asFloatChunk();
-        final LongChunk<Values> keyChunk1 = sourceKeyChunks[1].asLongChunk();
-        final int chunkSize = keyChunk0.size();
-        for (int chunkPosition = 0; chunkPosition < chunkSize; ++chunkPosition) {
-            final float k0 = keyChunk0.get(chunkPosition);
-            final long k1 = keyChunk1.get(chunkPosition);
-            final int hash = hash(k0, k1);
-            final int tableLocation = hashToTableLocation(tableHashPivot, hash);
-            if (mainOutputPosition.getUnsafe(tableLocation) == EMPTY_OUTPUT_POSITION) {
-                handler.doMissing(chunkPosition);
-            } else if (eq(mainKeySource0.getUnsafe(tableLocation), k0) && eq(mainKeySource1.getUnsafe(tableLocation), k1)) {
-                handler.doMainFound(tableLocation, chunkPosition);
-            } else {
-                int overflowLocation = mainOverflowLocationSource.getUnsafe(tableLocation);
-                if (!findOverflow(handler, k0, k1, chunkPosition, overflowLocation)) {
-                    handler.doMissing(chunkPosition);
-                }
-            }
-        }
-    }
-
-    private static int hash(float k0, long k1) {
-        int hash = FloatChunkHasher.hashInitialSingle(k0);
-        hash = LongChunkHasher.hashUpdateSingle(hash, k1);
-        return hash;
-    }
-
-    @Override
-    protected void rehashBucket(HashHandler handler, int sourceBucket, int destBucket,
-            int bucketsToAdd) {
-        final int position = mainOutputPosition.getUnsafe(sourceBucket);
-        if (position == EMPTY_OUTPUT_POSITION) {
-            return;
-        }
-        int mainInsertLocation = maybeMoveMainBucket(handler, sourceBucket, destBucket, bucketsToAdd);
-        int overflowLocation = mainOverflowLocationSource.getUnsafe(sourceBucket);
-        mainOverflowLocationSource.set(sourceBucket, QueryConstants.NULL_INT);
-        mainOverflowLocationSource.set(destBucket, QueryConstants.NULL_INT);
-        while (overflowLocation != QueryConstants.NULL_INT) {
-            final int nextOverflowLocation = overflowOverflowLocationSource.getUnsafe(overflowLocation);
-            final float overflowKey0 = overflowKeySource0.getUnsafe(overflowLocation);
-            final long overflowKey1 = overflowKeySource1.getUnsafe(overflowLocation);
-            final int overflowHash = hash(overflowKey0, overflowKey1);
-            final int overflowTableLocation = hashToTableLocation(tableHashPivot + bucketsToAdd, overflowHash);
-            if (overflowTableLocation == mainInsertLocation) {
-                mainKeySource0.set(mainInsertLocation, overflowKey0);
-                mainKeySource1.set(mainInsertLocation, overflowKey1);
-                mainOutputPosition.set(mainInsertLocation, overflowOutputPosition.getUnsafe(overflowLocation));
-                handler.doPromoteOverflow(overflowLocation, mainInsertLocation);
-                overflowOutputPosition.set(overflowLocation, QueryConstants.NULL_INT);
-                overflowKeySource0.set(overflowLocation, QueryConstants.NULL_FLOAT);
-                overflowKeySource1.set(overflowLocation, QueryConstants.NULL_LONG);
-                freeOverflowLocation(overflowLocation);
-                mainInsertLocation = -1;
-            } else {
-                final int oldOverflowLocation = mainOverflowLocationSource.getUnsafe(overflowTableLocation);
-                mainOverflowLocationSource.set(overflowTableLocation, overflowLocation);
-                overflowOverflowLocationSource.set(overflowLocation, oldOverflowLocation);
-            }
-            overflowLocation = nextOverflowLocation;
-        }
-    }
-
-    private int maybeMoveMainBucket(HashHandler handler, int sourceBucket, int destBucket,
-            int bucketsToAdd) {
-        final float k0 = mainKeySource0.getUnsafe(sourceBucket);
-        final long k1 = mainKeySource1.getUnsafe(sourceBucket);
-        final int hash = hash(k0, k1);
-        final int location = hashToTableLocation(tableHashPivot + bucketsToAdd, hash);
-        final int mainInsertLocation;
-        if (location == sourceBucket) {
-            mainInsertLocation = destBucket;
-            mainOutputPosition.set(destBucket, EMPTY_OUTPUT_POSITION);
-        } else {
-            mainInsertLocation = sourceBucket;
-            mainOutputPosition.set(destBucket, mainOutputPosition.getUnsafe(sourceBucket));
-            mainOutputPosition.set(sourceBucket, EMPTY_OUTPUT_POSITION);
-            mainKeySource0.set(destBucket, k0);
-            mainKeySource0.set(sourceBucket, QueryConstants.NULL_FLOAT);
-            mainKeySource1.set(destBucket, k1);
-            mainKeySource1.set(sourceBucket, QueryConstants.NULL_LONG);
-            handler.doMoveMain(sourceBucket, destBucket);
-        }
-        return mainInsertLocation;
-    }
-
-    private boolean findOverflow(HashHandler handler, float k0, long k1, int chunkPosition,
-            int overflowLocation) {
-        while (overflowLocation != QueryConstants.NULL_INT) {
-            if (eq(overflowKeySource0.getUnsafe(overflowLocation), k0) && eq(overflowKeySource1.getUnsafe(overflowLocation), k1)) {
-                handler.doOverflowFound(overflowLocation, chunkPosition);
-                return true;
-            }
-            overflowLocation = overflowOverflowLocationSource.getUnsafe(overflowLocation);
-        }
-        return false;
-    }
-
-    @Override
-    public int findPositionForKey(Object key) {
-        final Object [] ka = (Object[])key;
-        final float k0 = TypeUtils.unbox((Float)ka[0]);
-        final long k1 = TypeUtils.unbox((Long)ka[1]);
-        int hash = hash(k0, k1);
-        final int tableLocation = hashToTableLocation(tableHashPivot, hash);
-        final int positionValue = mainOutputPosition.getUnsafe(tableLocation);
-        if (positionValue == EMPTY_OUTPUT_POSITION) {
-            return -1;
-        }
-        if (eq(mainKeySource0.getUnsafe(tableLocation), k0) && eq(mainKeySource1.getUnsafe(tableLocation), k1)) {
-            return positionValue;
-        }
-        int overflowLocation = mainOverflowLocationSource.getUnsafe(tableLocation);
-        while (overflowLocation != QueryConstants.NULL_INT) {
-            if (eq(overflowKeySource0.getUnsafe(overflowLocation), k0) && eq(overflowKeySource1.getUnsafe(overflowLocation), k1)) {
-                return overflowOutputPosition.getUnsafe(overflowLocation);
-            }
-            overflowLocation = overflowOverflowLocationSource.getUnsafe(overflowLocation);
-        }
-        return -1;
-    }
-}
diff --git a/engine/table/src/main/java/io/deephaven/engine/table/impl/by/typed/staticagg/gen/StaticAggHasherFloatObject.java b/engine/table/src/main/java/io/deephaven/engine/table/impl/by/typed/staticagg/gen/StaticAggHasherFloatObject.java
deleted file mode 100644
index 40f5a130559..00000000000
--- a/engine/table/src/main/java/io/deephaven/engine/table/impl/by/typed/staticagg/gen/StaticAggHasherFloatObject.java
+++ /dev/null
@@ -1,205 +0,0 @@
-//
-// Copyright (c) 2016-2024 Deephaven Data Labs and Patent Pending
-//
-// ****** AUTO-GENERATED CLASS - DO NOT EDIT MANUALLY
-// ****** Run ReplicateTypedHashers or ./gradlew replicateTypedHashers to regenerate
-//
-// @formatter:off
-package io.deephaven.engine.table.impl.by.typed.staticagg.gen;
-
-import static io.deephaven.util.compare.FloatComparisons.eq;
-import static io.deephaven.util.compare.ObjectComparisons.eq;
-
-import io.deephaven.chunk.Chunk;
-import io.deephaven.chunk.FloatChunk;
-import io.deephaven.chunk.ObjectChunk;
-import io.deephaven.chunk.attributes.Values;
-import io.deephaven.chunk.util.hashing.FloatChunkHasher;
-import io.deephaven.chunk.util.hashing.ObjectChunkHasher;
-import io.deephaven.engine.rowset.RowSequence;
-import io.deephaven.engine.table.ColumnSource;
-import io.deephaven.engine.table.impl.by.HashHandler;
-import io.deephaven.engine.table.impl.by.StaticChunkedOperatorAggregationStateManagerTypedBase;
-import io.deephaven.engine.table.impl.sources.FloatArraySource;
-import io.deephaven.engine.table.impl.sources.ObjectArraySource;
-import io.deephaven.util.QueryConstants;
-import io.deephaven.util.type.TypeUtils;
-import java.lang.Float;
-import java.lang.Object;
-import java.lang.Override;
-
-final class StaticAggHasherFloatObject extends StaticChunkedOperatorAggregationStateManagerTypedBase {
-    private final FloatArraySource mainKeySource0;
-
-    private final FloatArraySource overflowKeySource0;
-
-    private final ObjectArraySource mainKeySource1;
-
-    private final ObjectArraySource overflowKeySource1;
-
-    public StaticAggHasherFloatObject(ColumnSource[] tableKeySources,
-            ColumnSource[] originalTableKeySources, int tableSize, double maximumLoadFactor,
-            double targetLoadFactor) {
-        super(tableKeySources, tableSize, maximumLoadFactor, targetLoadFactor);
-        this.mainKeySource0 = (FloatArraySource) super.mainKeySources[0];
-        this.overflowKeySource0 = (FloatArraySource) super.overflowKeySources[0];
-        this.mainKeySource1 = (ObjectArraySource) super.mainKeySources[1];
-        this.overflowKeySource1 = (ObjectArraySource) super.overflowKeySources[1];
-    }
-
-    @Override
-    protected void build(HashHandler handler, RowSequence rowSequence, Chunk[] sourceKeyChunks) {
-        final FloatChunk<Values> keyChunk0 = sourceKeyChunks[0].asFloatChunk();
-        final ObjectChunk<Object, Values> keyChunk1 = sourceKeyChunks[1].asObjectChunk();
-        final int chunkSize = keyChunk0.size();
-        for (int chunkPosition = 0; chunkPosition < chunkSize; ++chunkPosition) {
-            final float k0 = keyChunk0.get(chunkPosition);
-            final Object k1 = keyChunk1.get(chunkPosition);
-            final int hash = hash(k0, k1);
-            final int tableLocation = hashToTableLocation(tableHashPivot, hash);
-            if (mainOutputPosition.getUnsafe(tableLocation) == EMPTY_OUTPUT_POSITION) {
-                numEntries++;
-                mainKeySource0.set(tableLocation, k0);
-                mainKeySource1.set(tableLocation, k1);
-                handler.doMainInsert(tableLocation, chunkPosition);
-            } else if (eq(mainKeySource0.getUnsafe(tableLocation), k0) && eq(mainKeySource1.getUnsafe(tableLocation), k1)) {
-                handler.doMainFound(tableLocation, chunkPosition);
-            } else {
-                int overflowLocation = mainOverflowLocationSource.getUnsafe(tableLocation);
-                if (!findOverflow(handler, k0, k1, chunkPosition, overflowLocation)) {
-                    final int newOverflowLocation = allocateOverflowLocation();
-                    overflowKeySource0.set(newOverflowLocation, k0);
-                    overflowKeySource1.set(newOverflowLocation, k1);
-                    mainOverflowLocationSource.set(tableLocation, newOverflowLocation);
-                    overflowOverflowLocationSource.set(newOverflowLocation, overflowLocation);
-                    numEntries++;
-                    handler.doOverflowInsert(newOverflowLocation, chunkPosition);
-                }
-            }
-        }
-    }
-
-    @Override
-    protected void probe(HashHandler handler, RowSequence rowSequence, Chunk[] sourceKeyChunks) {
-        final FloatChunk<Values> keyChunk0 = sourceKeyChunks[0].asFloatChunk();
-        final ObjectChunk<Object, Values> keyChunk1 = sourceKeyChunks[1].asObjectChunk();
-        final int chunkSize = keyChunk0.size();
-        for (int chunkPosition = 0; chunkPosition < chunkSize; ++chunkPosition) {
-            final float k0 = keyChunk0.get(chunkPosition);
-            final Object k1 = keyChunk1.get(chunkPosition);
-            final int hash = hash(k0, k1);
-            final int tableLocation = hashToTableLocation(tableHashPivot, hash);
-            if (mainOutputPosition.getUnsafe(tableLocation) == EMPTY_OUTPUT_POSITION) {
-                handler.doMissing(chunkPosition);
-            } else if (eq(mainKeySource0.getUnsafe(tableLocation), k0) && eq(mainKeySource1.getUnsafe(tableLocation), k1)) {
-                handler.doMainFound(tableLocation, chunkPosition);
-            } else {
-                int overflowLocation = mainOverflowLocationSource.getUnsafe(tableLocation);
-                if (!findOverflow(handler, k0, k1, chunkPosition, overflowLocation)) {
-                    handler.doMissing(chunkPosition);
-                }
-            }
-        }
-    }
-
-    private static int hash(float k0, Object k1) {
-        int hash = FloatChunkHasher.hashInitialSingle(k0);
-        hash = ObjectChunkHasher.hashUpdateSingle(hash, k1);
-        return hash;
-    }
-
-    @Override
-    protected void rehashBucket(HashHandler handler, int sourceBucket, int destBucket,
-            int bucketsToAdd) {
-        final int position = mainOutputPosition.getUnsafe(sourceBucket);
-        if (position == EMPTY_OUTPUT_POSITION) {
-            return;
-        }
-        int mainInsertLocation = maybeMoveMainBucket(handler, sourceBucket, destBucket, bucketsToAdd);
-        int overflowLocation = mainOverflowLocationSource.getUnsafe(sourceBucket);
-        mainOverflowLocationSource.set(sourceBucket, QueryConstants.NULL_INT);
-        mainOverflowLocationSource.set(destBucket, QueryConstants.NULL_INT);
-        while (overflowLocation != QueryConstants.NULL_INT) {
-            final int nextOverflowLocation = overflowOverflowLocationSource.getUnsafe(overflowLocation);
-            final float overflowKey0 = overflowKeySource0.getUnsafe(overflowLocation);
-            final Object overflowKey1 = overflowKeySource1.getUnsafe(overflowLocation);
-            final int overflowHash = hash(overflowKey0, overflowKey1);
-            final int overflowTableLocation = hashToTableLocation(tableHashPivot + bucketsToAdd, overflowHash);
-            if (overflowTableLocation == mainInsertLocation) {
-                mainKeySource0.set(mainInsertLocation, overflowKey0);
-                mainKeySource1.set(mainInsertLocation, overflowKey1);
-                mainOutputPosition.set(mainInsertLocation, overflowOutputPosition.getUnsafe(overflowLocation));
-                handler.doPromoteOverflow(overflowLocation, mainInsertLocation);
-                overflowOutputPosition.set(overflowLocation, QueryConstants.NULL_INT);
-                overflowKeySource0.set(overflowLocation, QueryConstants.NULL_FLOAT);
-                overflowKeySource1.set(overflowLocation, null);
-                freeOverflowLocation(overflowLocation);
-                mainInsertLocation = -1;
-            } else {
-                final int oldOverflowLocation = mainOverflowLocationSource.getUnsafe(overflowTableLocation);
-                mainOverflowLocationSource.set(overflowTableLocation, overflowLocation);
-                overflowOverflowLocationSource.set(overflowLocation, oldOverflowLocation);
-            }
-            overflowLocation = nextOverflowLocation;
-        }
-    }
-
-    private int maybeMoveMainBucket(HashHandler handler, int sourceBucket, int destBucket,
-            int bucketsToAdd) {
-        final float k0 = mainKeySource0.getUnsafe(sourceBucket);
-        final Object k1 = mainKeySource1.getUnsafe(sourceBucket);
-        final int hash = hash(k0, k1);
-        final int location = hashToTableLocation(tableHashPivot + bucketsToAdd, hash);
-        final int mainInsertLocation;
-        if (location == sourceBucket) {
-            mainInsertLocation = destBucket;
-            mainOutputPosition.set(destBucket, EMPTY_OUTPUT_POSITION);
-        } else {
-            mainInsertLocation = sourceBucket;
-            mainOutputPosition.set(destBucket, mainOutputPosition.getUnsafe(sourceBucket));
-            mainOutputPosition.set(sourceBucket, EMPTY_OUTPUT_POSITION);
-            mainKeySource0.set(destBucket, k0);
-            mainKeySource0.set(sourceBucket, QueryConstants.NULL_FLOAT);
-            mainKeySource1.set(destBucket, k1);
-            mainKeySource1.set(sourceBucket, null);
-            handler.doMoveMain(sourceBucket, destBucket);
-        }
-        return mainInsertLocation;
-    }
-
-    private boolean findOverflow(HashHandler handler, float k0, Object k1, int chunkPosition,
-            int overflowLocation) {
-        while (overflowLocation != QueryConstants.NULL_INT) {
-            if (eq(overflowKeySource0.getUnsafe(overflowLocation), k0) && eq(overflowKeySource1.getUnsafe(overflowLocation), k1)) {
-                handler.doOverflowFound(overflowLocation, chunkPosition);
-                return true;
-            }
-            overflowLocation = overflowOverflowLocationSource.getUnsafe(overflowLocation);
-        }
-        return false;
-    }
-
-    @Override
-    public int findPositionForKey(Object key) {
-        final Object [] ka = (Object[])key;
-        final float k0 = TypeUtils.unbox((Float)ka[0]);
-        final Object k1 = ka[1];
-        int hash = hash(k0, k1);
-        final int tableLocation = hashToTableLocation(tableHashPivot, hash);
-        final int positionValue = mainOutputPosition.getUnsafe(tableLocation);
-        if (positionValue == EMPTY_OUTPUT_POSITION) {
-            return -1;
-        }
-        if (eq(mainKeySource0.getUnsafe(tableLocation), k0) && eq(mainKeySource1.getUnsafe(tableLocation), k1)) {
-            return positionValue;
-        }
-        int overflowLocation = mainOverflowLocationSource.getUnsafe(tableLocation);
-        while (overflowLocation != QueryConstants.NULL_INT) {
-            if (eq(overflowKeySource0.getUnsafe(overflowLocation), k0) && eq(overflowKeySource1.getUnsafe(overflowLocation), k1)) {
-                return overflowOutputPosition.getUnsafe(overflowLocation);
-            }
-            overflowLocation = overflowOverflowLocationSource.getUnsafe(overflowLocation);
-        }
-        return -1;
-    }
-}
diff --git a/engine/table/src/main/java/io/deephaven/engine/table/impl/by/typed/staticagg/gen/StaticAggHasherFloatShort.java b/engine/table/src/main/java/io/deephaven/engine/table/impl/by/typed/staticagg/gen/StaticAggHasherFloatShort.java
deleted file mode 100644
index e67e8d8985b..00000000000
--- a/engine/table/src/main/java/io/deephaven/engine/table/impl/by/typed/staticagg/gen/StaticAggHasherFloatShort.java
+++ /dev/null
@@ -1,206 +0,0 @@
-//
-// Copyright (c) 2016-2024 Deephaven Data Labs and Patent Pending
-//
-// ****** AUTO-GENERATED CLASS - DO NOT EDIT MANUALLY
-// ****** Run ReplicateTypedHashers or ./gradlew replicateTypedHashers to regenerate
-//
-// @formatter:off
-package io.deephaven.engine.table.impl.by.typed.staticagg.gen;
-
-import static io.deephaven.util.compare.FloatComparisons.eq;
-import static io.deephaven.util.compare.ShortComparisons.eq;
-
-import io.deephaven.chunk.Chunk;
-import io.deephaven.chunk.FloatChunk;
-import io.deephaven.chunk.ShortChunk;
-import io.deephaven.chunk.attributes.Values;
-import io.deephaven.chunk.util.hashing.FloatChunkHasher;
-import io.deephaven.chunk.util.hashing.ShortChunkHasher;
-import io.deephaven.engine.rowset.RowSequence;
-import io.deephaven.engine.table.ColumnSource;
-import io.deephaven.engine.table.impl.by.HashHandler;
-import io.deephaven.engine.table.impl.by.StaticChunkedOperatorAggregationStateManagerTypedBase;
-import io.deephaven.engine.table.impl.sources.FloatArraySource;
-import io.deephaven.engine.table.impl.sources.ShortArraySource;
-import io.deephaven.util.QueryConstants;
-import io.deephaven.util.type.TypeUtils;
-import java.lang.Float;
-import java.lang.Object;
-import java.lang.Override;
-import java.lang.Short;
-
-final class StaticAggHasherFloatShort extends StaticChunkedOperatorAggregationStateManagerTypedBase {
-    private final FloatArraySource mainKeySource0;
-
-    private final FloatArraySource overflowKeySource0;
-
-    private final ShortArraySource mainKeySource1;
-
-    private final ShortArraySource overflowKeySource1;
-
-    public StaticAggHasherFloatShort(ColumnSource[] tableKeySources,
-            ColumnSource[] originalTableKeySources, int tableSize, double maximumLoadFactor,
-            double targetLoadFactor) {
-        super(tableKeySources, tableSize, maximumLoadFactor, targetLoadFactor);
-        this.mainKeySource0 = (FloatArraySource) super.mainKeySources[0];
-        this.overflowKeySource0 = (FloatArraySource) super.overflowKeySources[0];
-        this.mainKeySource1 = (ShortArraySource) super.mainKeySources[1];
-        this.overflowKeySource1 = (ShortArraySource) super.overflowKeySources[1];
-    }
-
-    @Override
-    protected void build(HashHandler handler, RowSequence rowSequence, Chunk[] sourceKeyChunks) {
-        final FloatChunk<Values> keyChunk0 = sourceKeyChunks[0].asFloatChunk();
-        final ShortChunk<Values> keyChunk1 = sourceKeyChunks[1].asShortChunk();
-        final int chunkSize = keyChunk0.size();
-        for (int chunkPosition = 0; chunkPosition < chunkSize; ++chunkPosition) {
-            final float k0 = keyChunk0.get(chunkPosition);
-            final short k1 = keyChunk1.get(chunkPosition);
-            final int hash = hash(k0, k1);
-            final int tableLocation = hashToTableLocation(tableHashPivot, hash);
-            if (mainOutputPosition.getUnsafe(tableLocation) == EMPTY_OUTPUT_POSITION) {
-                numEntries++;
-                mainKeySource0.set(tableLocation, k0);
-                mainKeySource1.set(tableLocation, k1);
-                handler.doMainInsert(tableLocation, chunkPosition);
-            } else if (eq(mainKeySource0.getUnsafe(tableLocation), k0) && eq(mainKeySource1.getUnsafe(tableLocation), k1)) {
-                handler.doMainFound(tableLocation, chunkPosition);
-            } else {
-                int overflowLocation = mainOverflowLocationSource.getUnsafe(tableLocation);
-                if (!findOverflow(handler, k0, k1, chunkPosition, overflowLocation)) {
-                    final int newOverflowLocation = allocateOverflowLocation();
-                    overflowKeySource0.set(newOverflowLocation, k0);
-                    overflowKeySource1.set(newOverflowLocation, k1);
-                    mainOverflowLocationSource.set(tableLocation, newOverflowLocation);
-                    overflowOverflowLocationSource.set(newOverflowLocation, overflowLocation);
-                    numEntries++;
-                    handler.doOverflowInsert(newOverflowLocation, chunkPosition);
-                }
-            }
-        }
-    }
-
-    @Override
-    protected void probe(HashHandler handler, RowSequence rowSequence, Chunk[] sourceKeyChunks) {
-        final FloatChunk<Values> keyChunk0 = sourceKeyChunks[0].asFloatChunk();
-        final ShortChunk<Values> keyChunk1 = sourceKeyChunks[1].asShortChunk();
-        final int chunkSize = keyChunk0.size();
-        for (int chunkPosition = 0; chunkPosition < chunkSize; ++chunkPosition) {
-            final float k0 = keyChunk0.get(chunkPosition);
-            final short k1 = keyChunk1.get(chunkPosition);
-            final int hash = hash(k0, k1);
-            final int tableLocation = hashToTableLocation(tableHashPivot, hash);
-            if (mainOutputPosition.getUnsafe(tableLocation) == EMPTY_OUTPUT_POSITION) {
-                handler.doMissing(chunkPosition);
-            } else if (eq(mainKeySource0.getUnsafe(tableLocation), k0) && eq(mainKeySource1.getUnsafe(tableLocation), k1)) {
-                handler.doMainFound(tableLocation, chunkPosition);
-            } else {
-                int overflowLocation = mainOverflowLocationSource.getUnsafe(tableLocation);
-                if (!findOverflow(handler, k0, k1, chunkPosition, overflowLocation)) {
-                    handler.doMissing(chunkPosition);
-                }
-            }
-        }
-    }
-
-    private static int hash(float k0, short k1) {
-        int hash = FloatChunkHasher.hashInitialSingle(k0);
-        hash = ShortChunkHasher.hashUpdateSingle(hash, k1);
-        return hash;
-    }
-
-    @Override
-    protected void rehashBucket(HashHandler handler, int sourceBucket, int destBucket,
-            int bucketsToAdd) {
-        final int position = mainOutputPosition.getUnsafe(sourceBucket);
-        if (position == EMPTY_OUTPUT_POSITION) {
-            return;
-        }
-        int mainInsertLocation = maybeMoveMainBucket(handler, sourceBucket, destBucket, bucketsToAdd);
-        int overflowLocation = mainOverflowLocationSource.getUnsafe(sourceBucket);
-        mainOverflowLocationSource.set(sourceBucket, QueryConstants.NULL_INT);
-        mainOverflowLocationSource.set(destBucket, QueryConstants.NULL_INT);
-        while (overflowLocation != QueryConstants.NULL_INT) {
-            final int nextOverflowLocation = overflowOverflowLocationSource.getUnsafe(overflowLocation);
-            final float overflowKey0 = overflowKeySource0.getUnsafe(overflowLocation);
-            final short overflowKey1 = overflowKeySource1.getUnsafe(overflowLocation);
-            final int overflowHash = hash(overflowKey0, overflowKey1);
-            final int overflowTableLocation = hashToTableLocation(tableHashPivot + bucketsToAdd, overflowHash);
-            if (overflowTableLocation == mainInsertLocation) {
-                mainKeySource0.set(mainInsertLocation, overflowKey0);
-                mainKeySource1.set(mainInsertLocation, overflowKey1);
-                mainOutputPosition.set(mainInsertLocation, overflowOutputPosition.getUnsafe(overflowLocation));
-                handler.doPromoteOverflow(overflowLocation, mainInsertLocation);
-                overflowOutputPosition.set(overflowLocation, QueryConstants.NULL_INT);
-                overflowKeySource0.set(overflowLocation, QueryConstants.NULL_FLOAT);
-                overflowKeySource1.set(overflowLocation, QueryConstants.NULL_SHORT);
-                freeOverflowLocation(overflowLocation);
-                mainInsertLocation = -1;
-            } else {
-                final int oldOverflowLocation = mainOverflowLocationSource.getUnsafe(overflowTableLocation);
-                mainOverflowLocationSource.set(overflowTableLocation, overflowLocation);
-                overflowOverflowLocationSource.set(overflowLocation, oldOverflowLocation);
-            }
-            overflowLocation = nextOverflowLocation;
-        }
-    }
-
-    private int maybeMoveMainBucket(HashHandler handler, int sourceBucket, int destBucket,
-            int bucketsToAdd) {
-        final float k0 = mainKeySource0.getUnsafe(sourceBucket);
-        final short k1 = mainKeySource1.getUnsafe(sourceBucket);
-        final int hash = hash(k0, k1);
-        final int location = hashToTableLocation(tableHashPivot + bucketsToAdd, hash);
-        final int mainInsertLocation;
-        if (location == sourceBucket) {
-            mainInsertLocation = destBucket;
-            mainOutputPosition.set(destBucket, EMPTY_OUTPUT_POSITION);
-        } else {
-            mainInsertLocation = sourceBucket;
-            mainOutputPosition.set(destBucket, mainOutputPosition.getUnsafe(sourceBucket));
-            mainOutputPosition.set(sourceBucket, EMPTY_OUTPUT_POSITION);
-            mainKeySource0.set(destBucket, k0);
-            mainKeySource0.set(sourceBucket, QueryConstants.NULL_FLOAT);
-            mainKeySource1.set(destBucket, k1);
-            mainKeySource1.set(sourceBucket, QueryConstants.NULL_SHORT);
-            handler.doMoveMain(sourceBucket, destBucket);
-        }
-        return mainInsertLocation;
-    }
-
-    private boolean findOverflow(HashHandler handler, float k0, short k1, int chunkPosition,
-            int overflowLocation) {
-        while (overflowLocation != QueryConstants.NULL_INT) {
-            if (eq(overflowKeySource0.getUnsafe(overflowLocation), k0) && eq(overflowKeySource1.getUnsafe(overflowLocation), k1)) {
-                handler.doOverflowFound(overflowLocation, chunkPosition);
-                return true;
-            }
-            overflowLocation = overflowOverflowLocationSource.getUnsafe(overflowLocation);
-        }
-        return false;
-    }
-
-    @Override
-    public int findPositionForKey(Object key) {
-        final Object [] ka = (Object[])key;
-        final float k0 = TypeUtils.unbox((Float)ka[0]);
-        final short k1 = TypeUtils.unbox((Short)ka[1]);
-        int hash = hash(k0, k1);
-        final int tableLocation = hashToTableLocation(tableHashPivot, hash);
-        final int positionValue = mainOutputPosition.getUnsafe(tableLocation);
-        if (positionValue == EMPTY_OUTPUT_POSITION) {
-            return -1;
-        }
-        if (eq(mainKeySource0.getUnsafe(tableLocation), k0) && eq(mainKeySource1.getUnsafe(tableLocation), k1)) {
-            return positionValue;
-        }
-        int overflowLocation = mainOverflowLocationSource.getUnsafe(tableLocation);
-        while (overflowLocation != QueryConstants.NULL_INT) {
-            if (eq(overflowKeySource0.getUnsafe(overflowLocation), k0) && eq(overflowKeySource1.getUnsafe(overflowLocation), k1)) {
-                return overflowOutputPosition.getUnsafe(overflowLocation);
-            }
-            overflowLocation = overflowOverflowLocationSource.getUnsafe(overflowLocation);
-        }
-        return -1;
-    }
-}
diff --git a/engine/table/src/main/java/io/deephaven/engine/table/impl/by/typed/staticagg/gen/StaticAggHasherInt.java b/engine/table/src/main/java/io/deephaven/engine/table/impl/by/typed/staticagg/gen/StaticAggHasherInt.java
deleted file mode 100644
index e11ed42dc3b..00000000000
--- a/engine/table/src/main/java/io/deephaven/engine/table/impl/by/typed/staticagg/gen/StaticAggHasherInt.java
+++ /dev/null
@@ -1,180 +0,0 @@
-//
-// Copyright (c) 2016-2024 Deephaven Data Labs and Patent Pending
-//
-// ****** AUTO-GENERATED CLASS - DO NOT EDIT MANUALLY
-// ****** Run ReplicateTypedHashers or ./gradlew replicateTypedHashers to regenerate
-//
-// @formatter:off
-package io.deephaven.engine.table.impl.by.typed.staticagg.gen;
-
-import static io.deephaven.util.compare.IntComparisons.eq;
-
-import io.deephaven.chunk.Chunk;
-import io.deephaven.chunk.IntChunk;
-import io.deephaven.chunk.attributes.Values;
-import io.deephaven.chunk.util.hashing.IntChunkHasher;
-import io.deephaven.engine.rowset.RowSequence;
-import io.deephaven.engine.table.ColumnSource;
-import io.deephaven.engine.table.impl.by.HashHandler;
-import io.deephaven.engine.table.impl.by.StaticChunkedOperatorAggregationStateManagerTypedBase;
-import io.deephaven.engine.table.impl.sources.IntegerArraySource;
-import io.deephaven.util.QueryConstants;
-import io.deephaven.util.type.TypeUtils;
-import java.lang.Integer;
-import java.lang.Object;
-import java.lang.Override;
-
-final class StaticAggHasherInt extends StaticChunkedOperatorAggregationStateManagerTypedBase {
-    private final IntegerArraySource mainKeySource0;
-
-    private final IntegerArraySource overflowKeySource0;
-
-    public StaticAggHasherInt(ColumnSource[] tableKeySources,
-            ColumnSource[] originalTableKeySources, int tableSize, double maximumLoadFactor,
-            double targetLoadFactor) {
-        super(tableKeySources, tableSize, maximumLoadFactor, targetLoadFactor);
-        this.mainKeySource0 = (IntegerArraySource) super.mainKeySources[0];
-        this.overflowKeySource0 = (IntegerArraySource) super.overflowKeySources[0];
-    }
-
-    @Override
-    protected void build(HashHandler handler, RowSequence rowSequence, Chunk[] sourceKeyChunks) {
-        final IntChunk<Values> keyChunk0 = sourceKeyChunks[0].asIntChunk();
-        final int chunkSize = keyChunk0.size();
-        for (int chunkPosition = 0; chunkPosition < chunkSize; ++chunkPosition) {
-            final int k0 = keyChunk0.get(chunkPosition);
-            final int hash = hash(k0);
-            final int tableLocation = hashToTableLocation(tableHashPivot, hash);
-            if (mainOutputPosition.getUnsafe(tableLocation) == EMPTY_OUTPUT_POSITION) {
-                numEntries++;
-                mainKeySource0.set(tableLocation, k0);
-                handler.doMainInsert(tableLocation, chunkPosition);
-            } else if (eq(mainKeySource0.getUnsafe(tableLocation), k0)) {
-                handler.doMainFound(tableLocation, chunkPosition);
-            } else {
-                int overflowLocation = mainOverflowLocationSource.getUnsafe(tableLocation);
-                if (!findOverflow(handler, k0, chunkPosition, overflowLocation)) {
-                    final int newOverflowLocation = allocateOverflowLocation();
-                    overflowKeySource0.set(newOverflowLocation, k0);
-                    mainOverflowLocationSource.set(tableLocation, newOverflowLocation);
-                    overflowOverflowLocationSource.set(newOverflowLocation, overflowLocation);
-                    numEntries++;
-                    handler.doOverflowInsert(newOverflowLocation, chunkPosition);
-                }
-            }
-        }
-    }
-
-    @Override
-    protected void probe(HashHandler handler, RowSequence rowSequence, Chunk[] sourceKeyChunks) {
-        final IntChunk<Values> keyChunk0 = sourceKeyChunks[0].asIntChunk();
-        final int chunkSize = keyChunk0.size();
-        for (int chunkPosition = 0; chunkPosition < chunkSize; ++chunkPosition) {
-            final int k0 = keyChunk0.get(chunkPosition);
-            final int hash = hash(k0);
-            final int tableLocation = hashToTableLocation(tableHashPivot, hash);
-            if (mainOutputPosition.getUnsafe(tableLocation) == EMPTY_OUTPUT_POSITION) {
-                handler.doMissing(chunkPosition);
-            } else if (eq(mainKeySource0.getUnsafe(tableLocation), k0)) {
-                handler.doMainFound(tableLocation, chunkPosition);
-            } else {
-                int overflowLocation = mainOverflowLocationSource.getUnsafe(tableLocation);
-                if (!findOverflow(handler, k0, chunkPosition, overflowLocation)) {
-                    handler.doMissing(chunkPosition);
-                }
-            }
-        }
-    }
-
-    private static int hash(int k0) {
-        int hash = IntChunkHasher.hashInitialSingle(k0);
-        return hash;
-    }
-
-    @Override
-    protected void rehashBucket(HashHandler handler, int sourceBucket, int destBucket,
-            int bucketsToAdd) {
-        final int position = mainOutputPosition.getUnsafe(sourceBucket);
-        if (position == EMPTY_OUTPUT_POSITION) {
-            return;
-        }
-        int mainInsertLocation = maybeMoveMainBucket(handler, sourceBucket, destBucket, bucketsToAdd);
-        int overflowLocation = mainOverflowLocationSource.getUnsafe(sourceBucket);
-        mainOverflowLocationSource.set(sourceBucket, QueryConstants.NULL_INT);
-        mainOverflowLocationSource.set(destBucket, QueryConstants.NULL_INT);
-        while (overflowLocation != QueryConstants.NULL_INT) {
-            final int nextOverflowLocation = overflowOverflowLocationSource.getUnsafe(overflowLocation);
-            final int overflowKey0 = overflowKeySource0.getUnsafe(overflowLocation);
-            final int overflowHash = hash(overflowKey0);
-            final int overflowTableLocation = hashToTableLocation(tableHashPivot + bucketsToAdd, overflowHash);
-            if (overflowTableLocation == mainInsertLocation) {
-                mainKeySource0.set(mainInsertLocation, overflowKey0);
-                mainOutputPosition.set(mainInsertLocation, overflowOutputPosition.getUnsafe(overflowLocation));
-                handler.doPromoteOverflow(overflowLocation, mainInsertLocation);
-                overflowOutputPosition.set(overflowLocation, QueryConstants.NULL_INT);
-                overflowKeySource0.set(overflowLocation, QueryConstants.NULL_INT);
-                freeOverflowLocation(overflowLocation);
-                mainInsertLocation = -1;
-            } else {
-                final int oldOverflowLocation = mainOverflowLocationSource.getUnsafe(overflowTableLocation);
-                mainOverflowLocationSource.set(overflowTableLocation, overflowLocation);
-                overflowOverflowLocationSource.set(overflowLocation, oldOverflowLocation);
-            }
-            overflowLocation = nextOverflowLocation;
-        }
-    }
-
-    private int maybeMoveMainBucket(HashHandler handler, int sourceBucket, int destBucket,
-            int bucketsToAdd) {
-        final int k0 = mainKeySource0.getUnsafe(sourceBucket);
-        final int hash = hash(k0);
-        final int location = hashToTableLocation(tableHashPivot + bucketsToAdd, hash);
-        final int mainInsertLocation;
-        if (location == sourceBucket) {
-            mainInsertLocation = destBucket;
-            mainOutputPosition.set(destBucket, EMPTY_OUTPUT_POSITION);
-        } else {
-            mainInsertLocation = sourceBucket;
-            mainOutputPosition.set(destBucket, mainOutputPosition.getUnsafe(sourceBucket));
-            mainOutputPosition.set(sourceBucket, EMPTY_OUTPUT_POSITION);
-            mainKeySource0.set(destBucket, k0);
-            mainKeySource0.set(sourceBucket, QueryConstants.NULL_INT);
-            handler.doMoveMain(sourceBucket, destBucket);
-        }
-        return mainInsertLocation;
-    }
-
-    private boolean findOverflow(HashHandler handler, int k0, int chunkPosition,
-            int overflowLocation) {
-        while (overflowLocation != QueryConstants.NULL_INT) {
-            if (eq(overflowKeySource0.getUnsafe(overflowLocation), k0)) {
-                handler.doOverflowFound(overflowLocation, chunkPosition);
-                return true;
-            }
-            overflowLocation = overflowOverflowLocationSource.getUnsafe(overflowLocation);
-        }
-        return false;
-    }
-
-    @Override
-    public int findPositionForKey(Object key) {
-        final int k0 = TypeUtils.unbox((Integer)key);
-        int hash = hash(k0);
-        final int tableLocation = hashToTableLocation(tableHashPivot, hash);
-        final int positionValue = mainOutputPosition.getUnsafe(tableLocation);
-        if (positionValue == EMPTY_OUTPUT_POSITION) {
-            return -1;
-        }
-        if (eq(mainKeySource0.getUnsafe(tableLocation), k0)) {
-            return positionValue;
-        }
-        int overflowLocation = mainOverflowLocationSource.getUnsafe(tableLocation);
-        while (overflowLocation != QueryConstants.NULL_INT) {
-            if (eq(overflowKeySource0.getUnsafe(overflowLocation), k0)) {
-                return overflowOutputPosition.getUnsafe(overflowLocation);
-            }
-            overflowLocation = overflowOverflowLocationSource.getUnsafe(overflowLocation);
-        }
-        return -1;
-    }
-}
diff --git a/engine/table/src/main/java/io/deephaven/engine/table/impl/by/typed/staticagg/gen/StaticAggHasherIntByte.java b/engine/table/src/main/java/io/deephaven/engine/table/impl/by/typed/staticagg/gen/StaticAggHasherIntByte.java
deleted file mode 100644
index 0b00f035df1..00000000000
--- a/engine/table/src/main/java/io/deephaven/engine/table/impl/by/typed/staticagg/gen/StaticAggHasherIntByte.java
+++ /dev/null
@@ -1,206 +0,0 @@
-//
-// Copyright (c) 2016-2024 Deephaven Data Labs and Patent Pending
-//
-// ****** AUTO-GENERATED CLASS - DO NOT EDIT MANUALLY
-// ****** Run ReplicateTypedHashers or ./gradlew replicateTypedHashers to regenerate
-//
-// @formatter:off
-package io.deephaven.engine.table.impl.by.typed.staticagg.gen;
-
-import static io.deephaven.util.compare.ByteComparisons.eq;
-import static io.deephaven.util.compare.IntComparisons.eq;
-
-import io.deephaven.chunk.ByteChunk;
-import io.deephaven.chunk.Chunk;
-import io.deephaven.chunk.IntChunk;
-import io.deephaven.chunk.attributes.Values;
-import io.deephaven.chunk.util.hashing.ByteChunkHasher;
-import io.deephaven.chunk.util.hashing.IntChunkHasher;
-import io.deephaven.engine.rowset.RowSequence;
-import io.deephaven.engine.table.ColumnSource;
-import io.deephaven.engine.table.impl.by.HashHandler;
-import io.deephaven.engine.table.impl.by.StaticChunkedOperatorAggregationStateManagerTypedBase;
-import io.deephaven.engine.table.impl.sources.ByteArraySource;
-import io.deephaven.engine.table.impl.sources.IntegerArraySource;
-import io.deephaven.util.QueryConstants;
-import io.deephaven.util.type.TypeUtils;
-import java.lang.Byte;
-import java.lang.Integer;
-import java.lang.Object;
-import java.lang.Override;
-
-final class StaticAggHasherIntByte extends StaticChunkedOperatorAggregationStateManagerTypedBase {
-    private final IntegerArraySource mainKeySource0;
-
-    private final IntegerArraySource overflowKeySource0;
-
-    private final ByteArraySource mainKeySource1;
-
-    private final ByteArraySource overflowKeySource1;
-
-    public StaticAggHasherIntByte(ColumnSource[] tableKeySources,
-            ColumnSource[] originalTableKeySources, int tableSize, double maximumLoadFactor,
-            double targetLoadFactor) {
-        super(tableKeySources, tableSize, maximumLoadFactor, targetLoadFactor);
-        this.mainKeySource0 = (IntegerArraySource) super.mainKeySources[0];
-        this.overflowKeySource0 = (IntegerArraySource) super.overflowKeySources[0];
-        this.mainKeySource1 = (ByteArraySource) super.mainKeySources[1];
-        this.overflowKeySource1 = (ByteArraySource) super.overflowKeySources[1];
-    }
-
-    @Override
-    protected void build(HashHandler handler, RowSequence rowSequence, Chunk[] sourceKeyChunks) {
-        final IntChunk<Values> keyChunk0 = sourceKeyChunks[0].asIntChunk();
-        final ByteChunk<Values> keyChunk1 = sourceKeyChunks[1].asByteChunk();
-        final int chunkSize = keyChunk0.size();
-        for (int chunkPosition = 0; chunkPosition < chunkSize; ++chunkPosition) {
-            final int k0 = keyChunk0.get(chunkPosition);
-            final byte k1 = keyChunk1.get(chunkPosition);
-            final int hash = hash(k0, k1);
-            final int tableLocation = hashToTableLocation(tableHashPivot, hash);
-            if (mainOutputPosition.getUnsafe(tableLocation) == EMPTY_OUTPUT_POSITION) {
-                numEntries++;
-                mainKeySource0.set(tableLocation, k0);
-                mainKeySource1.set(tableLocation, k1);
-                handler.doMainInsert(tableLocation, chunkPosition);
-            } else if (eq(mainKeySource0.getUnsafe(tableLocation), k0) && eq(mainKeySource1.getUnsafe(tableLocation), k1)) {
-                handler.doMainFound(tableLocation, chunkPosition);
-            } else {
-                int overflowLocation = mainOverflowLocationSource.getUnsafe(tableLocation);
-                if (!findOverflow(handler, k0, k1, chunkPosition, overflowLocation)) {
-                    final int newOverflowLocation = allocateOverflowLocation();
-                    overflowKeySource0.set(newOverflowLocation, k0);
-                    overflowKeySource1.set(newOverflowLocation, k1);
-                    mainOverflowLocationSource.set(tableLocation, newOverflowLocation);
-                    overflowOverflowLocationSource.set(newOverflowLocation, overflowLocation);
-                    numEntries++;
-                    handler.doOverflowInsert(newOverflowLocation, chunkPosition);
-                }
-            }
-        }
-    }
-
-    @Override
-    protected void probe(HashHandler handler, RowSequence rowSequence, Chunk[] sourceKeyChunks) {
-        final IntChunk<Values> keyChunk0 = sourceKeyChunks[0].asIntChunk();
-        final ByteChunk<Values> keyChunk1 = sourceKeyChunks[1].asByteChunk();
-        final int chunkSize = keyChunk0.size();
-        for (int chunkPosition = 0; chunkPosition < chunkSize; ++chunkPosition) {
-            final int k0 = keyChunk0.get(chunkPosition);
-            final byte k1 = keyChunk1.get(chunkPosition);
-            final int hash = hash(k0, k1);
-            final int tableLocation = hashToTableLocation(tableHashPivot, hash);
-            if (mainOutputPosition.getUnsafe(tableLocation) == EMPTY_OUTPUT_POSITION) {
-                handler.doMissing(chunkPosition);
-            } else if (eq(mainKeySource0.getUnsafe(tableLocation), k0) && eq(mainKeySource1.getUnsafe(tableLocation), k1)) {
-                handler.doMainFound(tableLocation, chunkPosition);
-            } else {
-                int overflowLocation = mainOverflowLocationSource.getUnsafe(tableLocation);
-                if (!findOverflow(handler, k0, k1, chunkPosition, overflowLocation)) {
-                    handler.doMissing(chunkPosition);
-                }
-            }
-        }
-    }
-
-    private static int hash(int k0, byte k1) {
-        int hash = IntChunkHasher.hashInitialSingle(k0);
-        hash = ByteChunkHasher.hashUpdateSingle(hash, k1);
-        return hash;
-    }
-
-    @Override
-    protected void rehashBucket(HashHandler handler, int sourceBucket, int destBucket,
-            int bucketsToAdd) {
-        final int position = mainOutputPosition.getUnsafe(sourceBucket);
-        if (position == EMPTY_OUTPUT_POSITION) {
-            return;
-        }
-        int mainInsertLocation = maybeMoveMainBucket(handler, sourceBucket, destBucket, bucketsToAdd);
-        int overflowLocation = mainOverflowLocationSource.getUnsafe(sourceBucket);
-        mainOverflowLocationSource.set(sourceBucket, QueryConstants.NULL_INT);
-        mainOverflowLocationSource.set(destBucket, QueryConstants.NULL_INT);
-        while (overflowLocation != QueryConstants.NULL_INT) {
-            final int nextOverflowLocation = overflowOverflowLocationSource.getUnsafe(overflowLocation);
-            final int overflowKey0 = overflowKeySource0.getUnsafe(overflowLocation);
-            final byte overflowKey1 = overflowKeySource1.getUnsafe(overflowLocation);
-            final int overflowHash = hash(overflowKey0, overflowKey1);
-            final int overflowTableLocation = hashToTableLocation(tableHashPivot + bucketsToAdd, overflowHash);
-            if (overflowTableLocation == mainInsertLocation) {
-                mainKeySource0.set(mainInsertLocation, overflowKey0);
-                mainKeySource1.set(mainInsertLocation, overflowKey1);
-                mainOutputPosition.set(mainInsertLocation, overflowOutputPosition.getUnsafe(overflowLocation));
-                handler.doPromoteOverflow(overflowLocation, mainInsertLocation);
-                overflowOutputPosition.set(overflowLocation, QueryConstants.NULL_INT);
-                overflowKeySource0.set(overflowLocation, QueryConstants.NULL_INT);
-                overflowKeySource1.set(overflowLocation, QueryConstants.NULL_BYTE);
-                freeOverflowLocation(overflowLocation);
-                mainInsertLocation = -1;
-            } else {
-                final int oldOverflowLocation = mainOverflowLocationSource.getUnsafe(overflowTableLocation);
-                mainOverflowLocationSource.set(overflowTableLocation, overflowLocation);
-                overflowOverflowLocationSource.set(overflowLocation, oldOverflowLocation);
-            }
-            overflowLocation = nextOverflowLocation;
-        }
-    }
-
-    private int maybeMoveMainBucket(HashHandler handler, int sourceBucket, int destBucket,
-            int bucketsToAdd) {
-        final int k0 = mainKeySource0.getUnsafe(sourceBucket);
-        final byte k1 = mainKeySource1.getUnsafe(sourceBucket);
-        final int hash = hash(k0, k1);
-        final int location = hashToTableLocation(tableHashPivot + bucketsToAdd, hash);
-        final int mainInsertLocation;
-        if (location == sourceBucket) {
-            mainInsertLocation = destBucket;
-            mainOutputPosition.set(destBucket, EMPTY_OUTPUT_POSITION);
-        } else {
-            mainInsertLocation = sourceBucket;
-            mainOutputPosition.set(destBucket, mainOutputPosition.getUnsafe(sourceBucket));
-            mainOutputPosition.set(sourceBucket, EMPTY_OUTPUT_POSITION);
-            mainKeySource0.set(destBucket, k0);
-            mainKeySource0.set(sourceBucket, QueryConstants.NULL_INT);
-            mainKeySource1.set(destBucket, k1);
-            mainKeySource1.set(sourceBucket, QueryConstants.NULL_BYTE);
-            handler.doMoveMain(sourceBucket, destBucket);
-        }
-        return mainInsertLocation;
-    }
-
-    private boolean findOverflow(HashHandler handler, int k0, byte k1, int chunkPosition,
-            int overflowLocation) {
-        while (overflowLocation != QueryConstants.NULL_INT) {
-            if (eq(overflowKeySource0.getUnsafe(overflowLocation), k0) && eq(overflowKeySource1.getUnsafe(overflowLocation), k1)) {
-                handler.doOverflowFound(overflowLocation, chunkPosition);
-                return true;
-            }
-            overflowLocation = overflowOverflowLocationSource.getUnsafe(overflowLocation);
-        }
-        return false;
-    }
-
-    @Override
-    public int findPositionForKey(Object key) {
-        final Object [] ka = (Object[])key;
-        final int k0 = TypeUtils.unbox((Integer)ka[0]);
-        final byte k1 = TypeUtils.unbox((Byte)ka[1]);
-        int hash = hash(k0, k1);
-        final int tableLocation = hashToTableLocation(tableHashPivot, hash);
-        final int positionValue = mainOutputPosition.getUnsafe(tableLocation);
-        if (positionValue == EMPTY_OUTPUT_POSITION) {
-            return -1;
-        }
-        if (eq(mainKeySource0.getUnsafe(tableLocation), k0) && eq(mainKeySource1.getUnsafe(tableLocation), k1)) {
-            return positionValue;
-        }
-        int overflowLocation = mainOverflowLocationSource.getUnsafe(tableLocation);
-        while (overflowLocation != QueryConstants.NULL_INT) {
-            if (eq(overflowKeySource0.getUnsafe(overflowLocation), k0) && eq(overflowKeySource1.getUnsafe(overflowLocation), k1)) {
-                return overflowOutputPosition.getUnsafe(overflowLocation);
-            }
-            overflowLocation = overflowOverflowLocationSource.getUnsafe(overflowLocation);
-        }
-        return -1;
-    }
-}
diff --git a/engine/table/src/main/java/io/deephaven/engine/table/impl/by/typed/staticagg/gen/StaticAggHasherIntChar.java b/engine/table/src/main/java/io/deephaven/engine/table/impl/by/typed/staticagg/gen/StaticAggHasherIntChar.java
deleted file mode 100644
index 97d8c88d703..00000000000
--- a/engine/table/src/main/java/io/deephaven/engine/table/impl/by/typed/staticagg/gen/StaticAggHasherIntChar.java
+++ /dev/null
@@ -1,206 +0,0 @@
-//
-// Copyright (c) 2016-2024 Deephaven Data Labs and Patent Pending
-//
-// ****** AUTO-GENERATED CLASS - DO NOT EDIT MANUALLY
-// ****** Run ReplicateTypedHashers or ./gradlew replicateTypedHashers to regenerate
-//
-// @formatter:off
-package io.deephaven.engine.table.impl.by.typed.staticagg.gen;
-
-import static io.deephaven.util.compare.CharComparisons.eq;
-import static io.deephaven.util.compare.IntComparisons.eq;
-
-import io.deephaven.chunk.CharChunk;
-import io.deephaven.chunk.Chunk;
-import io.deephaven.chunk.IntChunk;
-import io.deephaven.chunk.attributes.Values;
-import io.deephaven.chunk.util.hashing.CharChunkHasher;
-import io.deephaven.chunk.util.hashing.IntChunkHasher;
-import io.deephaven.engine.rowset.RowSequence;
-import io.deephaven.engine.table.ColumnSource;
-import io.deephaven.engine.table.impl.by.HashHandler;
-import io.deephaven.engine.table.impl.by.StaticChunkedOperatorAggregationStateManagerTypedBase;
-import io.deephaven.engine.table.impl.sources.CharacterArraySource;
-import io.deephaven.engine.table.impl.sources.IntegerArraySource;
-import io.deephaven.util.QueryConstants;
-import io.deephaven.util.type.TypeUtils;
-import java.lang.Character;
-import java.lang.Integer;
-import java.lang.Object;
-import java.lang.Override;
-
-final class StaticAggHasherIntChar extends StaticChunkedOperatorAggregationStateManagerTypedBase {
-    private final IntegerArraySource mainKeySource0;
-
-    private final IntegerArraySource overflowKeySource0;
-
-    private final CharacterArraySource mainKeySource1;
-
-    private final CharacterArraySource overflowKeySource1;
-
-    public StaticAggHasherIntChar(ColumnSource[] tableKeySources,
-            ColumnSource[] originalTableKeySources, int tableSize, double maximumLoadFactor,
-            double targetLoadFactor) {
-        super(tableKeySources, tableSize, maximumLoadFactor, targetLoadFactor);
-        this.mainKeySource0 = (IntegerArraySource) super.mainKeySources[0];
-        this.overflowKeySource0 = (IntegerArraySource) super.overflowKeySources[0];
-        this.mainKeySource1 = (CharacterArraySource) super.mainKeySources[1];
-        this.overflowKeySource1 = (CharacterArraySource) super.overflowKeySources[1];
-    }
-
-    @Override
-    protected void build(HashHandler handler, RowSequence rowSequence, Chunk[] sourceKeyChunks) {
-        final IntChunk<Values> keyChunk0 = sourceKeyChunks[0].asIntChunk();
-        final CharChunk<Values> keyChunk1 = sourceKeyChunks[1].asCharChunk();
-        final int chunkSize = keyChunk0.size();
-        for (int chunkPosition = 0; chunkPosition < chunkSize; ++chunkPosition) {
-            final int k0 = keyChunk0.get(chunkPosition);
-            final char k1 = keyChunk1.get(chunkPosition);
-            final int hash = hash(k0, k1);
-            final int tableLocation = hashToTableLocation(tableHashPivot, hash);
-            if (mainOutputPosition.getUnsafe(tableLocation) == EMPTY_OUTPUT_POSITION) {
-                numEntries++;
-                mainKeySource0.set(tableLocation, k0);
-                mainKeySource1.set(tableLocation, k1);
-                handler.doMainInsert(tableLocation, chunkPosition);
-            } else if (eq(mainKeySource0.getUnsafe(tableLocation), k0) && eq(mainKeySource1.getUnsafe(tableLocation), k1)) {
-                handler.doMainFound(tableLocation, chunkPosition);
-            } else {
-                int overflowLocation = mainOverflowLocationSource.getUnsafe(tableLocation);
-                if (!findOverflow(handler, k0, k1, chunkPosition, overflowLocation)) {
-                    final int newOverflowLocation = allocateOverflowLocation();
-                    overflowKeySource0.set(newOverflowLocation, k0);
-                    overflowKeySource1.set(newOverflowLocation, k1);
-                    mainOverflowLocationSource.set(tableLocation, newOverflowLocation);
-                    overflowOverflowLocationSource.set(newOverflowLocation, overflowLocation);
-                    numEntries++;
-                    handler.doOverflowInsert(newOverflowLocation, chunkPosition);
-                }
-            }
-        }
-    }
-
-    @Override
-    protected void probe(HashHandler handler, RowSequence rowSequence, Chunk[] sourceKeyChunks) {
-        final IntChunk<Values> keyChunk0 = sourceKeyChunks[0].asIntChunk();
-        final CharChunk<Values> keyChunk1 = sourceKeyChunks[1].asCharChunk();
-        final int chunkSize = keyChunk0.size();
-        for (int chunkPosition = 0; chunkPosition < chunkSize; ++chunkPosition) {
-            final int k0 = keyChunk0.get(chunkPosition);
-            final char k1 = keyChunk1.get(chunkPosition);
-            final int hash = hash(k0, k1);
-            final int tableLocation = hashToTableLocation(tableHashPivot, hash);
-            if (mainOutputPosition.getUnsafe(tableLocation) == EMPTY_OUTPUT_POSITION) {
-                handler.doMissing(chunkPosition);
-            } else if (eq(mainKeySource0.getUnsafe(tableLocation), k0) && eq(mainKeySource1.getUnsafe(tableLocation), k1)) {
-                handler.doMainFound(tableLocation, chunkPosition);
-            } else {
-                int overflowLocation = mainOverflowLocationSource.getUnsafe(tableLocation);
-                if (!findOverflow(handler, k0, k1, chunkPosition, overflowLocation)) {
-                    handler.doMissing(chunkPosition);
-                }
-            }
-        }
-    }
-
-    private static int hash(int k0, char k1) {
-        int hash = IntChunkHasher.hashInitialSingle(k0);
-        hash = CharChunkHasher.hashUpdateSingle(hash, k1);
-        return hash;
-    }
-
-    @Override
-    protected void rehashBucket(HashHandler handler, int sourceBucket, int destBucket,
-            int bucketsToAdd) {
-        final int position = mainOutputPosition.getUnsafe(sourceBucket);
-        if (position == EMPTY_OUTPUT_POSITION) {
-            return;
-        }
-        int mainInsertLocation = maybeMoveMainBucket(handler, sourceBucket, destBucket, bucketsToAdd);
-        int overflowLocation = mainOverflowLocationSource.getUnsafe(sourceBucket);
-        mainOverflowLocationSource.set(sourceBucket, QueryConstants.NULL_INT);
-        mainOverflowLocationSource.set(destBucket, QueryConstants.NULL_INT);
-        while (overflowLocation != QueryConstants.NULL_INT) {
-            final int nextOverflowLocation = overflowOverflowLocationSource.getUnsafe(overflowLocation);
-            final int overflowKey0 = overflowKeySource0.getUnsafe(overflowLocation);
-            final char overflowKey1 = overflowKeySource1.getUnsafe(overflowLocation);
-            final int overflowHash = hash(overflowKey0, overflowKey1);
-            final int overflowTableLocation = hashToTableLocation(tableHashPivot + bucketsToAdd, overflowHash);
-            if (overflowTableLocation == mainInsertLocation) {
-                mainKeySource0.set(mainInsertLocation, overflowKey0);
-                mainKeySource1.set(mainInsertLocation, overflowKey1);
-                mainOutputPosition.set(mainInsertLocation, overflowOutputPosition.getUnsafe(overflowLocation));
-                handler.doPromoteOverflow(overflowLocation, mainInsertLocation);
-                overflowOutputPosition.set(overflowLocation, QueryConstants.NULL_INT);
-                overflowKeySource0.set(overflowLocation, QueryConstants.NULL_INT);
-                overflowKeySource1.set(overflowLocation, QueryConstants.NULL_CHAR);
-                freeOverflowLocation(overflowLocation);
-                mainInsertLocation = -1;
-            } else {
-                final int oldOverflowLocation = mainOverflowLocationSource.getUnsafe(overflowTableLocation);
-                mainOverflowLocationSource.set(overflowTableLocation, overflowLocation);
-                overflowOverflowLocationSource.set(overflowLocation, oldOverflowLocation);
-            }
-            overflowLocation = nextOverflowLocation;
-        }
-    }
-
-    private int maybeMoveMainBucket(HashHandler handler, int sourceBucket, int destBucket,
-            int bucketsToAdd) {
-        final int k0 = mainKeySource0.getUnsafe(sourceBucket);
-        final char k1 = mainKeySource1.getUnsafe(sourceBucket);
-        final int hash = hash(k0, k1);
-        final int location = hashToTableLocation(tableHashPivot + bucketsToAdd, hash);
-        final int mainInsertLocation;
-        if (location == sourceBucket) {
-            mainInsertLocation = destBucket;
-            mainOutputPosition.set(destBucket, EMPTY_OUTPUT_POSITION);
-        } else {
-            mainInsertLocation = sourceBucket;
-            mainOutputPosition.set(destBucket, mainOutputPosition.getUnsafe(sourceBucket));
-            mainOutputPosition.set(sourceBucket, EMPTY_OUTPUT_POSITION);
-            mainKeySource0.set(destBucket, k0);
-            mainKeySource0.set(sourceBucket, QueryConstants.NULL_INT);
-            mainKeySource1.set(destBucket, k1);
-            mainKeySource1.set(sourceBucket, QueryConstants.NULL_CHAR);
-            handler.doMoveMain(sourceBucket, destBucket);
-        }
-        return mainInsertLocation;
-    }
-
-    private boolean findOverflow(HashHandler handler, int k0, char k1, int chunkPosition,
-            int overflowLocation) {
-        while (overflowLocation != QueryConstants.NULL_INT) {
-            if (eq(overflowKeySource0.getUnsafe(overflowLocation), k0) && eq(overflowKeySource1.getUnsafe(overflowLocation), k1)) {
-                handler.doOverflowFound(overflowLocation, chunkPosition);
-                return true;
-            }
-            overflowLocation = overflowOverflowLocationSource.getUnsafe(overflowLocation);
-        }
-        return false;
-    }
-
-    @Override
-    public int findPositionForKey(Object key) {
-        final Object [] ka = (Object[])key;
-        final int k0 = TypeUtils.unbox((Integer)ka[0]);
-        final char k1 = TypeUtils.unbox((Character)ka[1]);
-        int hash = hash(k0, k1);
-        final int tableLocation = hashToTableLocation(tableHashPivot, hash);
-        final int positionValue = mainOutputPosition.getUnsafe(tableLocation);
-        if (positionValue == EMPTY_OUTPUT_POSITION) {
-            return -1;
-        }
-        if (eq(mainKeySource0.getUnsafe(tableLocation), k0) && eq(mainKeySource1.getUnsafe(tableLocation), k1)) {
-            return positionValue;
-        }
-        int overflowLocation = mainOverflowLocationSource.getUnsafe(tableLocation);
-        while (overflowLocation != QueryConstants.NULL_INT) {
-            if (eq(overflowKeySource0.getUnsafe(overflowLocation), k0) && eq(overflowKeySource1.getUnsafe(overflowLocation), k1)) {
-                return overflowOutputPosition.getUnsafe(overflowLocation);
-            }
-            overflowLocation = overflowOverflowLocationSource.getUnsafe(overflowLocation);
-        }
-        return -1;
-    }
-}
diff --git a/engine/table/src/main/java/io/deephaven/engine/table/impl/by/typed/staticagg/gen/StaticAggHasherIntDouble.java b/engine/table/src/main/java/io/deephaven/engine/table/impl/by/typed/staticagg/gen/StaticAggHasherIntDouble.java
deleted file mode 100644
index fe19bc1c369..00000000000
--- a/engine/table/src/main/java/io/deephaven/engine/table/impl/by/typed/staticagg/gen/StaticAggHasherIntDouble.java
+++ /dev/null
@@ -1,206 +0,0 @@
-//
-// Copyright (c) 2016-2024 Deephaven Data Labs and Patent Pending
-//
-// ****** AUTO-GENERATED CLASS - DO NOT EDIT MANUALLY
-// ****** Run ReplicateTypedHashers or ./gradlew replicateTypedHashers to regenerate
-//
-// @formatter:off
-package io.deephaven.engine.table.impl.by.typed.staticagg.gen;
-
-import static io.deephaven.util.compare.DoubleComparisons.eq;
-import static io.deephaven.util.compare.IntComparisons.eq;
-
-import io.deephaven.chunk.Chunk;
-import io.deephaven.chunk.DoubleChunk;
-import io.deephaven.chunk.IntChunk;
-import io.deephaven.chunk.attributes.Values;
-import io.deephaven.chunk.util.hashing.DoubleChunkHasher;
-import io.deephaven.chunk.util.hashing.IntChunkHasher;
-import io.deephaven.engine.rowset.RowSequence;
-import io.deephaven.engine.table.ColumnSource;
-import io.deephaven.engine.table.impl.by.HashHandler;
-import io.deephaven.engine.table.impl.by.StaticChunkedOperatorAggregationStateManagerTypedBase;
-import io.deephaven.engine.table.impl.sources.DoubleArraySource;
-import io.deephaven.engine.table.impl.sources.IntegerArraySource;
-import io.deephaven.util.QueryConstants;
-import io.deephaven.util.type.TypeUtils;
-import java.lang.Double;
-import java.lang.Integer;
-import java.lang.Object;
-import java.lang.Override;
-
-final class StaticAggHasherIntDouble extends StaticChunkedOperatorAggregationStateManagerTypedBase {
-    private final IntegerArraySource mainKeySource0;
-
-    private final IntegerArraySource overflowKeySource0;
-
-    private final DoubleArraySource mainKeySource1;
-
-    private final DoubleArraySource overflowKeySource1;
-
-    public StaticAggHasherIntDouble(ColumnSource[] tableKeySources,
-            ColumnSource[] originalTableKeySources, int tableSize, double maximumLoadFactor,
-            double targetLoadFactor) {
-        super(tableKeySources, tableSize, maximumLoadFactor, targetLoadFactor);
-        this.mainKeySource0 = (IntegerArraySource) super.mainKeySources[0];
-        this.overflowKeySource0 = (IntegerArraySource) super.overflowKeySources[0];
-        this.mainKeySource1 = (DoubleArraySource) super.mainKeySources[1];
-        this.overflowKeySource1 = (DoubleArraySource) super.overflowKeySources[1];
-    }
-
-    @Override
-    protected void build(HashHandler handler, RowSequence rowSequence, Chunk[] sourceKeyChunks) {
-        final IntChunk<Values> keyChunk0 = sourceKeyChunks[0].asIntChunk();
-        final DoubleChunk<Values> keyChunk1 = sourceKeyChunks[1].asDoubleChunk();
-        final int chunkSize = keyChunk0.size();
-        for (int chunkPosition = 0; chunkPosition < chunkSize; ++chunkPosition) {
-            final int k0 = keyChunk0.get(chunkPosition);
-            final double k1 = keyChunk1.get(chunkPosition);
-            final int hash = hash(k0, k1);
-            final int tableLocation = hashToTableLocation(tableHashPivot, hash);
-            if (mainOutputPosition.getUnsafe(tableLocation) == EMPTY_OUTPUT_POSITION) {
-                numEntries++;
-                mainKeySource0.set(tableLocation, k0);
-                mainKeySource1.set(tableLocation, k1);
-                handler.doMainInsert(tableLocation, chunkPosition);
-            } else if (eq(mainKeySource0.getUnsafe(tableLocation), k0) && eq(mainKeySource1.getUnsafe(tableLocation), k1)) {
-                handler.doMainFound(tableLocation, chunkPosition);
-            } else {
-                int overflowLocation = mainOverflowLocationSource.getUnsafe(tableLocation);
-                if (!findOverflow(handler, k0, k1, chunkPosition, overflowLocation)) {
-                    final int newOverflowLocation = allocateOverflowLocation();
-                    overflowKeySource0.set(newOverflowLocation, k0);
-                    overflowKeySource1.set(newOverflowLocation, k1);
-                    mainOverflowLocationSource.set(tableLocation, newOverflowLocation);
-                    overflowOverflowLocationSource.set(newOverflowLocation, overflowLocation);
-                    numEntries++;
-                    handler.doOverflowInsert(newOverflowLocation, chunkPosition);
-                }
-            }
-        }
-    }
-
-    @Override
-    protected void probe(HashHandler handler, RowSequence rowSequence, Chunk[] sourceKeyChunks) {
-        final IntChunk<Values> keyChunk0 = sourceKeyChunks[0].asIntChunk();
-        final DoubleChunk<Values> keyChunk1 = sourceKeyChunks[1].asDoubleChunk();
-        final int chunkSize = keyChunk0.size();
-        for (int chunkPosition = 0; chunkPosition < chunkSize; ++chunkPosition) {
-            final int k0 = keyChunk0.get(chunkPosition);
-            final double k1 = keyChunk1.get(chunkPosition);
-            final int hash = hash(k0, k1);
-            final int tableLocation = hashToTableLocation(tableHashPivot, hash);
-            if (mainOutputPosition.getUnsafe(tableLocation) == EMPTY_OUTPUT_POSITION) {
-                handler.doMissing(chunkPosition);
-            } else if (eq(mainKeySource0.getUnsafe(tableLocation), k0) && eq(mainKeySource1.getUnsafe(tableLocation), k1)) {
-                handler.doMainFound(tableLocation, chunkPosition);
-            } else {
-                int overflowLocation = mainOverflowLocationSource.getUnsafe(tableLocation);
-                if (!findOverflow(handler, k0, k1, chunkPosition, overflowLocation)) {
-                    handler.doMissing(chunkPosition);
-                }
-            }
-        }
-    }
-
-    private static int hash(int k0, double k1) {
-        int hash = IntChunkHasher.hashInitialSingle(k0);
-        hash = DoubleChunkHasher.hashUpdateSingle(hash, k1);
-        return hash;
-    }
-
-    @Override
-    protected void rehashBucket(HashHandler handler, int sourceBucket, int destBucket,
-            int bucketsToAdd) {
-        final int position = mainOutputPosition.getUnsafe(sourceBucket);
-        if (position == EMPTY_OUTPUT_POSITION) {
-            return;
-        }
-        int mainInsertLocation = maybeMoveMainBucket(handler, sourceBucket, destBucket, bucketsToAdd);
-        int overflowLocation = mainOverflowLocationSource.getUnsafe(sourceBucket);
-        mainOverflowLocationSource.set(sourceBucket, QueryConstants.NULL_INT);
-        mainOverflowLocationSource.set(destBucket, QueryConstants.NULL_INT);
-        while (overflowLocation != QueryConstants.NULL_INT) {
-            final int nextOverflowLocation = overflowOverflowLocationSource.getUnsafe(overflowLocation);
-            final int overflowKey0 = overflowKeySource0.getUnsafe(overflowLocation);
-            final double overflowKey1 = overflowKeySource1.getUnsafe(overflowLocation);
-            final int overflowHash = hash(overflowKey0, overflowKey1);
-            final int overflowTableLocation = hashToTableLocation(tableHashPivot + bucketsToAdd, overflowHash);
-            if (overflowTableLocation == mainInsertLocation) {
-                mainKeySource0.set(mainInsertLocation, overflowKey0);
-                mainKeySource1.set(mainInsertLocation, overflowKey1);
-                mainOutputPosition.set(mainInsertLocation, overflowOutputPosition.getUnsafe(overflowLocation));
-                handler.doPromoteOverflow(overflowLocation, mainInsertLocation);
-                overflowOutputPosition.set(overflowLocation, QueryConstants.NULL_INT);
-                overflowKeySource0.set(overflowLocation, QueryConstants.NULL_INT);
-                overflowKeySource1.set(overflowLocation, QueryConstants.NULL_DOUBLE);
-                freeOverflowLocation(overflowLocation);
-                mainInsertLocation = -1;
-            } else {
-                final int oldOverflowLocation = mainOverflowLocationSource.getUnsafe(overflowTableLocation);
-                mainOverflowLocationSource.set(overflowTableLocation, overflowLocation);
-                overflowOverflowLocationSource.set(overflowLocation, oldOverflowLocation);
-            }
-            overflowLocation = nextOverflowLocation;
-        }
-    }
-
-    private int maybeMoveMainBucket(HashHandler handler, int sourceBucket, int destBucket,
-            int bucketsToAdd) {
-        final int k0 = mainKeySource0.getUnsafe(sourceBucket);
-        final double k1 = mainKeySource1.getUnsafe(sourceBucket);
-        final int hash = hash(k0, k1);
-        final int location = hashToTableLocation(tableHashPivot + bucketsToAdd, hash);
-        final int mainInsertLocation;
-        if (location == sourceBucket) {
-            mainInsertLocation = destBucket;
-            mainOutputPosition.set(destBucket, EMPTY_OUTPUT_POSITION);
-        } else {
-            mainInsertLocation = sourceBucket;
-            mainOutputPosition.set(destBucket, mainOutputPosition.getUnsafe(sourceBucket));
-            mainOutputPosition.set(sourceBucket, EMPTY_OUTPUT_POSITION);
-            mainKeySource0.set(destBucket, k0);
-            mainKeySource0.set(sourceBucket, QueryConstants.NULL_INT);
-            mainKeySource1.set(destBucket, k1);
-            mainKeySource1.set(sourceBucket, QueryConstants.NULL_DOUBLE);
-            handler.doMoveMain(sourceBucket, destBucket);
-        }
-        return mainInsertLocation;
-    }
-
-    private boolean findOverflow(HashHandler handler, int k0, double k1, int chunkPosition,
-            int overflowLocation) {
-        while (overflowLocation != QueryConstants.NULL_INT) {
-            if (eq(overflowKeySource0.getUnsafe(overflowLocation), k0) && eq(overflowKeySource1.getUnsafe(overflowLocation), k1)) {
-                handler.doOverflowFound(overflowLocation, chunkPosition);
-                return true;
-            }
-            overflowLocation = overflowOverflowLocationSource.getUnsafe(overflowLocation);
-        }
-        return false;
-    }
-
-    @Override
-    public int findPositionForKey(Object key) {
-        final Object [] ka = (Object[])key;
-        final int k0 = TypeUtils.unbox((Integer)ka[0]);
-        final double k1 = TypeUtils.unbox((Double)ka[1]);
-        int hash = hash(k0, k1);
-        final int tableLocation = hashToTableLocation(tableHashPivot, hash);
-        final int positionValue = mainOutputPosition.getUnsafe(tableLocation);
-        if (positionValue == EMPTY_OUTPUT_POSITION) {
-            return -1;
-        }
-        if (eq(mainKeySource0.getUnsafe(tableLocation), k0) && eq(mainKeySource1.getUnsafe(tableLocation), k1)) {
-            return positionValue;
-        }
-        int overflowLocation = mainOverflowLocationSource.getUnsafe(tableLocation);
-        while (overflowLocation != QueryConstants.NULL_INT) {
-            if (eq(overflowKeySource0.getUnsafe(overflowLocation), k0) && eq(overflowKeySource1.getUnsafe(overflowLocation), k1)) {
-                return overflowOutputPosition.getUnsafe(overflowLocation);
-            }
-            overflowLocation = overflowOverflowLocationSource.getUnsafe(overflowLocation);
-        }
-        return -1;
-    }
-}
diff --git a/engine/table/src/main/java/io/deephaven/engine/table/impl/by/typed/staticagg/gen/StaticAggHasherIntFloat.java b/engine/table/src/main/java/io/deephaven/engine/table/impl/by/typed/staticagg/gen/StaticAggHasherIntFloat.java
deleted file mode 100644
index 5397bf83296..00000000000
--- a/engine/table/src/main/java/io/deephaven/engine/table/impl/by/typed/staticagg/gen/StaticAggHasherIntFloat.java
+++ /dev/null
@@ -1,206 +0,0 @@
-//
-// Copyright (c) 2016-2024 Deephaven Data Labs and Patent Pending
-//
-// ****** AUTO-GENERATED CLASS - DO NOT EDIT MANUALLY
-// ****** Run ReplicateTypedHashers or ./gradlew replicateTypedHashers to regenerate
-//
-// @formatter:off
-package io.deephaven.engine.table.impl.by.typed.staticagg.gen;
-
-import static io.deephaven.util.compare.FloatComparisons.eq;
-import static io.deephaven.util.compare.IntComparisons.eq;
-
-import io.deephaven.chunk.Chunk;
-import io.deephaven.chunk.FloatChunk;
-import io.deephaven.chunk.IntChunk;
-import io.deephaven.chunk.attributes.Values;
-import io.deephaven.chunk.util.hashing.FloatChunkHasher;
-import io.deephaven.chunk.util.hashing.IntChunkHasher;
-import io.deephaven.engine.rowset.RowSequence;
-import io.deephaven.engine.table.ColumnSource;
-import io.deephaven.engine.table.impl.by.HashHandler;
-import io.deephaven.engine.table.impl.by.StaticChunkedOperatorAggregationStateManagerTypedBase;
-import io.deephaven.engine.table.impl.sources.FloatArraySource;
-import io.deephaven.engine.table.impl.sources.IntegerArraySource;
-import io.deephaven.util.QueryConstants;
-import io.deephaven.util.type.TypeUtils;
-import java.lang.Float;
-import java.lang.Integer;
-import java.lang.Object;
-import java.lang.Override;
-
-final class StaticAggHasherIntFloat extends StaticChunkedOperatorAggregationStateManagerTypedBase {
-    private final IntegerArraySource mainKeySource0;
-
-    private final IntegerArraySource overflowKeySource0;
-
-    private final FloatArraySource mainKeySource1;
-
-    private final FloatArraySource overflowKeySource1;
-
-    public StaticAggHasherIntFloat(ColumnSource[] tableKeySources,
-            ColumnSource[] originalTableKeySources, int tableSize, double maximumLoadFactor,
-            double targetLoadFactor) {
-        super(tableKeySources, tableSize, maximumLoadFactor, targetLoadFactor);
-        this.mainKeySource0 = (IntegerArraySource) super.mainKeySources[0];
-        this.overflowKeySource0 = (IntegerArraySource) super.overflowKeySources[0];
-        this.mainKeySource1 = (FloatArraySource) super.mainKeySources[1];
-        this.overflowKeySource1 = (FloatArraySource) super.overflowKeySources[1];
-    }
-
-    @Override
-    protected void build(HashHandler handler, RowSequence rowSequence, Chunk[] sourceKeyChunks) {
-        final IntChunk<Values> keyChunk0 = sourceKeyChunks[0].asIntChunk();
-        final FloatChunk<Values> keyChunk1 = sourceKeyChunks[1].asFloatChunk();
-        final int chunkSize = keyChunk0.size();
-        for (int chunkPosition = 0; chunkPosition < chunkSize; ++chunkPosition) {
-            final int k0 = keyChunk0.get(chunkPosition);
-            final float k1 = keyChunk1.get(chunkPosition);
-            final int hash = hash(k0, k1);
-            final int tableLocation = hashToTableLocation(tableHashPivot, hash);
-            if (mainOutputPosition.getUnsafe(tableLocation) == EMPTY_OUTPUT_POSITION) {
-                numEntries++;
-                mainKeySource0.set(tableLocation, k0);
-                mainKeySource1.set(tableLocation, k1);
-                handler.doMainInsert(tableLocation, chunkPosition);
-            } else if (eq(mainKeySource0.getUnsafe(tableLocation), k0) && eq(mainKeySource1.getUnsafe(tableLocation), k1)) {
-                handler.doMainFound(tableLocation, chunkPosition);
-            } else {
-                int overflowLocation = mainOverflowLocationSource.getUnsafe(tableLocation);
-                if (!findOverflow(handler, k0, k1, chunkPosition, overflowLocation)) {
-                    final int newOverflowLocation = allocateOverflowLocation();
-                    overflowKeySource0.set(newOverflowLocation, k0);
-                    overflowKeySource1.set(newOverflowLocation, k1);
-                    mainOverflowLocationSource.set(tableLocation, newOverflowLocation);
-                    overflowOverflowLocationSource.set(newOverflowLocation, overflowLocation);
-                    numEntries++;
-                    handler.doOverflowInsert(newOverflowLocation, chunkPosition);
-                }
-            }
-        }
-    }
-
-    @Override
-    protected void probe(HashHandler handler, RowSequence rowSequence, Chunk[] sourceKeyChunks) {
-        final IntChunk<Values> keyChunk0 = sourceKeyChunks[0].asIntChunk();
-        final FloatChunk<Values> keyChunk1 = sourceKeyChunks[1].asFloatChunk();
-        final int chunkSize = keyChunk0.size();
-        for (int chunkPosition = 0; chunkPosition < chunkSize; ++chunkPosition) {
-            final int k0 = keyChunk0.get(chunkPosition);
-            final float k1 = keyChunk1.get(chunkPosition);
-            final int hash = hash(k0, k1);
-            final int tableLocation = hashToTableLocation(tableHashPivot, hash);
-            if (mainOutputPosition.getUnsafe(tableLocation) == EMPTY_OUTPUT_POSITION) {
-                handler.doMissing(chunkPosition);
-            } else if (eq(mainKeySource0.getUnsafe(tableLocation), k0) && eq(mainKeySource1.getUnsafe(tableLocation), k1)) {
-                handler.doMainFound(tableLocation, chunkPosition);
-            } else {
-                int overflowLocation = mainOverflowLocationSource.getUnsafe(tableLocation);
-                if (!findOverflow(handler, k0, k1, chunkPosition, overflowLocation)) {
-                    handler.doMissing(chunkPosition);
-                }
-            }
-        }
-    }
-
-    private static int hash(int k0, float k1) {
-        int hash = IntChunkHasher.hashInitialSingle(k0);
-        hash = FloatChunkHasher.hashUpdateSingle(hash, k1);
-        return hash;
-    }
-
-    @Override
-    protected void rehashBucket(HashHandler handler, int sourceBucket, int destBucket,
-            int bucketsToAdd) {
-        final int position = mainOutputPosition.getUnsafe(sourceBucket);
-        if (position == EMPTY_OUTPUT_POSITION) {
-            return;
-        }
-        int mainInsertLocation = maybeMoveMainBucket(handler, sourceBucket, destBucket, bucketsToAdd);
-        int overflowLocation = mainOverflowLocationSource.getUnsafe(sourceBucket);
-        mainOverflowLocationSource.set(sourceBucket, QueryConstants.NULL_INT);
-        mainOverflowLocationSource.set(destBucket, QueryConstants.NULL_INT);
-        while (overflowLocation != QueryConstants.NULL_INT) {
-            final int nextOverflowLocation = overflowOverflowLocationSource.getUnsafe(overflowLocation);
-            final int overflowKey0 = overflowKeySource0.getUnsafe(overflowLocation);
-            final float overflowKey1 = overflowKeySource1.getUnsafe(overflowLocation);
-            final int overflowHash = hash(overflowKey0, overflowKey1);
-            final int overflowTableLocation = hashToTableLocation(tableHashPivot + bucketsToAdd, overflowHash);
-            if (overflowTableLocation == mainInsertLocation) {
-                mainKeySource0.set(mainInsertLocation, overflowKey0);
-                mainKeySource1.set(mainInsertLocation, overflowKey1);
-                mainOutputPosition.set(mainInsertLocation, overflowOutputPosition.getUnsafe(overflowLocation));
-                handler.doPromoteOverflow(overflowLocation, mainInsertLocation);
-                overflowOutputPosition.set(overflowLocation, QueryConstants.NULL_INT);
-                overflowKeySource0.set(overflowLocation, QueryConstants.NULL_INT);
-                overflowKeySource1.set(overflowLocation, QueryConstants.NULL_FLOAT);
-                freeOverflowLocation(overflowLocation);
-                mainInsertLocation = -1;
-            } else {
-                final int oldOverflowLocation = mainOverflowLocationSource.getUnsafe(overflowTableLocation);
-                mainOverflowLocationSource.set(overflowTableLocation, overflowLocation);
-                overflowOverflowLocationSource.set(overflowLocation, oldOverflowLocation);
-            }
-            overflowLocation = nextOverflowLocation;
-        }
-    }
-
-    private int maybeMoveMainBucket(HashHandler handler, int sourceBucket, int destBucket,
-            int bucketsToAdd) {
-        final int k0 = mainKeySource0.getUnsafe(sourceBucket);
-        final float k1 = mainKeySource1.getUnsafe(sourceBucket);
-        final int hash = hash(k0, k1);
-        final int location = hashToTableLocation(tableHashPivot + bucketsToAdd, hash);
-        final int mainInsertLocation;
-        if (location == sourceBucket) {
-            mainInsertLocation = destBucket;
-            mainOutputPosition.set(destBucket, EMPTY_OUTPUT_POSITION);
-        } else {
-            mainInsertLocation = sourceBucket;
-            mainOutputPosition.set(destBucket, mainOutputPosition.getUnsafe(sourceBucket));
-            mainOutputPosition.set(sourceBucket, EMPTY_OUTPUT_POSITION);
-            mainKeySource0.set(destBucket, k0);
-            mainKeySource0.set(sourceBucket, QueryConstants.NULL_INT);
-            mainKeySource1.set(destBucket, k1);
-            mainKeySource1.set(sourceBucket, QueryConstants.NULL_FLOAT);
-            handler.doMoveMain(sourceBucket, destBucket);
-        }
-        return mainInsertLocation;
-    }
-
-    private boolean findOverflow(HashHandler handler, int k0, float k1, int chunkPosition,
-            int overflowLocation) {
-        while (overflowLocation != QueryConstants.NULL_INT) {
-            if (eq(overflowKeySource0.getUnsafe(overflowLocation), k0) && eq(overflowKeySource1.getUnsafe(overflowLocation), k1)) {
-                handler.doOverflowFound(overflowLocation, chunkPosition);
-                return true;
-            }
-            overflowLocation = overflowOverflowLocationSource.getUnsafe(overflowLocation);
-        }
-        return false;
-    }
-
-    @Override
-    public int findPositionForKey(Object key) {
-        final Object [] ka = (Object[])key;
-        final int k0 = TypeUtils.unbox((Integer)ka[0]);
-        final float k1 = TypeUtils.unbox((Float)ka[1]);
-        int hash = hash(k0, k1);
-        final int tableLocation = hashToTableLocation(tableHashPivot, hash);
-        final int positionValue = mainOutputPosition.getUnsafe(tableLocation);
-        if (positionValue == EMPTY_OUTPUT_POSITION) {
-            return -1;
-        }
-        if (eq(mainKeySource0.getUnsafe(tableLocation), k0) && eq(mainKeySource1.getUnsafe(tableLocation), k1)) {
-            return positionValue;
-        }
-        int overflowLocation = mainOverflowLocationSource.getUnsafe(tableLocation);
-        while (overflowLocation != QueryConstants.NULL_INT) {
-            if (eq(overflowKeySource0.getUnsafe(overflowLocation), k0) && eq(overflowKeySource1.getUnsafe(overflowLocation), k1)) {
-                return overflowOutputPosition.getUnsafe(overflowLocation);
-            }
-            overflowLocation = overflowOverflowLocationSource.getUnsafe(overflowLocation);
-        }
-        return -1;
-    }
-}
diff --git a/engine/table/src/main/java/io/deephaven/engine/table/impl/by/typed/staticagg/gen/StaticAggHasherIntInt.java b/engine/table/src/main/java/io/deephaven/engine/table/impl/by/typed/staticagg/gen/StaticAggHasherIntInt.java
deleted file mode 100644
index ef0a4d48054..00000000000
--- a/engine/table/src/main/java/io/deephaven/engine/table/impl/by/typed/staticagg/gen/StaticAggHasherIntInt.java
+++ /dev/null
@@ -1,201 +0,0 @@
-//
-// Copyright (c) 2016-2024 Deephaven Data Labs and Patent Pending
-//
-// ****** AUTO-GENERATED CLASS - DO NOT EDIT MANUALLY
-// ****** Run ReplicateTypedHashers or ./gradlew replicateTypedHashers to regenerate
-//
-// @formatter:off
-package io.deephaven.engine.table.impl.by.typed.staticagg.gen;
-
-import static io.deephaven.util.compare.IntComparisons.eq;
-
-import io.deephaven.chunk.Chunk;
-import io.deephaven.chunk.IntChunk;
-import io.deephaven.chunk.attributes.Values;
-import io.deephaven.chunk.util.hashing.IntChunkHasher;
-import io.deephaven.engine.rowset.RowSequence;
-import io.deephaven.engine.table.ColumnSource;
-import io.deephaven.engine.table.impl.by.HashHandler;
-import io.deephaven.engine.table.impl.by.StaticChunkedOperatorAggregationStateManagerTypedBase;
-import io.deephaven.engine.table.impl.sources.IntegerArraySource;
-import io.deephaven.util.QueryConstants;
-import io.deephaven.util.type.TypeUtils;
-import java.lang.Integer;
-import java.lang.Object;
-import java.lang.Override;
-
-final class StaticAggHasherIntInt extends StaticChunkedOperatorAggregationStateManagerTypedBase {
-    private final IntegerArraySource mainKeySource0;
-
-    private final IntegerArraySource overflowKeySource0;
-
-    private final IntegerArraySource mainKeySource1;
-
-    private final IntegerArraySource overflowKeySource1;
-
-    public StaticAggHasherIntInt(ColumnSource[] tableKeySources,
-            ColumnSource[] originalTableKeySources, int tableSize, double maximumLoadFactor,
-            double targetLoadFactor) {
-        super(tableKeySources, tableSize, maximumLoadFactor, targetLoadFactor);
-        this.mainKeySource0 = (IntegerArraySource) super.mainKeySources[0];
-        this.overflowKeySource0 = (IntegerArraySource) super.overflowKeySources[0];
-        this.mainKeySource1 = (IntegerArraySource) super.mainKeySources[1];
-        this.overflowKeySource1 = (IntegerArraySource) super.overflowKeySources[1];
-    }
-
-    @Override
-    protected void build(HashHandler handler, RowSequence rowSequence, Chunk[] sourceKeyChunks) {
-        final IntChunk<Values> keyChunk0 = sourceKeyChunks[0].asIntChunk();
-        final IntChunk<Values> keyChunk1 = sourceKeyChunks[1].asIntChunk();
-        final int chunkSize = keyChunk0.size();
-        for (int chunkPosition = 0; chunkPosition < chunkSize; ++chunkPosition) {
-            final int k0 = keyChunk0.get(chunkPosition);
-            final int k1 = keyChunk1.get(chunkPosition);
-            final int hash = hash(k0, k1);
-            final int tableLocation = hashToTableLocation(tableHashPivot, hash);
-            if (mainOutputPosition.getUnsafe(tableLocation) == EMPTY_OUTPUT_POSITION) {
-                numEntries++;
-                mainKeySource0.set(tableLocation, k0);
-                mainKeySource1.set(tableLocation, k1);
-                handler.doMainInsert(tableLocation, chunkPosition);
-            } else if (eq(mainKeySource0.getUnsafe(tableLocation), k0) && eq(mainKeySource1.getUnsafe(tableLocation), k1)) {
-                handler.doMainFound(tableLocation, chunkPosition);
-            } else {
-                int overflowLocation = mainOverflowLocationSource.getUnsafe(tableLocation);
-                if (!findOverflow(handler, k0, k1, chunkPosition, overflowLocation)) {
-                    final int newOverflowLocation = allocateOverflowLocation();
-                    overflowKeySource0.set(newOverflowLocation, k0);
-                    overflowKeySource1.set(newOverflowLocation, k1);
-                    mainOverflowLocationSource.set(tableLocation, newOverflowLocation);
-                    overflowOverflowLocationSource.set(newOverflowLocation, overflowLocation);
-                    numEntries++;
-                    handler.doOverflowInsert(newOverflowLocation, chunkPosition);
-                }
-            }
-        }
-    }
-
-    @Override
-    protected void probe(HashHandler handler, RowSequence rowSequence, Chunk[] sourceKeyChunks) {
-        final IntChunk<Values> keyChunk0 = sourceKeyChunks[0].asIntChunk();
-        final IntChunk<Values> keyChunk1 = sourceKeyChunks[1].asIntChunk();
-        final int chunkSize = keyChunk0.size();
-        for (int chunkPosition = 0; chunkPosition < chunkSize; ++chunkPosition) {
-            final int k0 = keyChunk0.get(chunkPosition);
-            final int k1 = keyChunk1.get(chunkPosition);
-            final int hash = hash(k0, k1);
-            final int tableLocation = hashToTableLocation(tableHashPivot, hash);
-            if (mainOutputPosition.getUnsafe(tableLocation) == EMPTY_OUTPUT_POSITION) {
-                handler.doMissing(chunkPosition);
-            } else if (eq(mainKeySource0.getUnsafe(tableLocation), k0) && eq(mainKeySource1.getUnsafe(tableLocation), k1)) {
-                handler.doMainFound(tableLocation, chunkPosition);
-            } else {
-                int overflowLocation = mainOverflowLocationSource.getUnsafe(tableLocation);
-                if (!findOverflow(handler, k0, k1, chunkPosition, overflowLocation)) {
-                    handler.doMissing(chunkPosition);
-                }
-            }
-        }
-    }
-
-    private static int hash(int k0, int k1) {
-        int hash = IntChunkHasher.hashInitialSingle(k0);
-        hash = IntChunkHasher.hashUpdateSingle(hash, k1);
-        return hash;
-    }
-
-    @Override
-    protected void rehashBucket(HashHandler handler, int sourceBucket, int destBucket,
-            int bucketsToAdd) {
-        final int position = mainOutputPosition.getUnsafe(sourceBucket);
-        if (position == EMPTY_OUTPUT_POSITION) {
-            return;
-        }
-        int mainInsertLocation = maybeMoveMainBucket(handler, sourceBucket, destBucket, bucketsToAdd);
-        int overflowLocation = mainOverflowLocationSource.getUnsafe(sourceBucket);
-        mainOverflowLocationSource.set(sourceBucket, QueryConstants.NULL_INT);
-        mainOverflowLocationSource.set(destBucket, QueryConstants.NULL_INT);
-        while (overflowLocation != QueryConstants.NULL_INT) {
-            final int nextOverflowLocation = overflowOverflowLocationSource.getUnsafe(overflowLocation);
-            final int overflowKey0 = overflowKeySource0.getUnsafe(overflowLocation);
-            final int overflowKey1 = overflowKeySource1.getUnsafe(overflowLocation);
-            final int overflowHash = hash(overflowKey0, overflowKey1);
-            final int overflowTableLocation = hashToTableLocation(tableHashPivot + bucketsToAdd, overflowHash);
-            if (overflowTableLocation == mainInsertLocation) {
-                mainKeySource0.set(mainInsertLocation, overflowKey0);
-                mainKeySource1.set(mainInsertLocation, overflowKey1);
-                mainOutputPosition.set(mainInsertLocation, overflowOutputPosition.getUnsafe(overflowLocation));
-                handler.doPromoteOverflow(overflowLocation, mainInsertLocation);
-                overflowOutputPosition.set(overflowLocation, QueryConstants.NULL_INT);
-                overflowKeySource0.set(overflowLocation, QueryConstants.NULL_INT);
-                overflowKeySource1.set(overflowLocation, QueryConstants.NULL_INT);
-                freeOverflowLocation(overflowLocation);
-                mainInsertLocation = -1;
-            } else {
-                final int oldOverflowLocation = mainOverflowLocationSource.getUnsafe(overflowTableLocation);
-                mainOverflowLocationSource.set(overflowTableLocation, overflowLocation);
-                overflowOverflowLocationSource.set(overflowLocation, oldOverflowLocation);
-            }
-            overflowLocation = nextOverflowLocation;
-        }
-    }
-
-    private int maybeMoveMainBucket(HashHandler handler, int sourceBucket, int destBucket,
-            int bucketsToAdd) {
-        final int k0 = mainKeySource0.getUnsafe(sourceBucket);
-        final int k1 = mainKeySource1.getUnsafe(sourceBucket);
-        final int hash = hash(k0, k1);
-        final int location = hashToTableLocation(tableHashPivot + bucketsToAdd, hash);
-        final int mainInsertLocation;
-        if (location == sourceBucket) {
-            mainInsertLocation = destBucket;
-            mainOutputPosition.set(destBucket, EMPTY_OUTPUT_POSITION);
-        } else {
-            mainInsertLocation = sourceBucket;
-            mainOutputPosition.set(destBucket, mainOutputPosition.getUnsafe(sourceBucket));
-            mainOutputPosition.set(sourceBucket, EMPTY_OUTPUT_POSITION);
-            mainKeySource0.set(destBucket, k0);
-            mainKeySource0.set(sourceBucket, QueryConstants.NULL_INT);
-            mainKeySource1.set(destBucket, k1);
-            mainKeySource1.set(sourceBucket, QueryConstants.NULL_INT);
-            handler.doMoveMain(sourceBucket, destBucket);
-        }
-        return mainInsertLocation;
-    }
-
-    private boolean findOverflow(HashHandler handler, int k0, int k1, int chunkPosition,
-            int overflowLocation) {
-        while (overflowLocation != QueryConstants.NULL_INT) {
-            if (eq(overflowKeySource0.getUnsafe(overflowLocation), k0) && eq(overflowKeySource1.getUnsafe(overflowLocation), k1)) {
-                handler.doOverflowFound(overflowLocation, chunkPosition);
-                return true;
-            }
-            overflowLocation = overflowOverflowLocationSource.getUnsafe(overflowLocation);
-        }
-        return false;
-    }
-
-    @Override
-    public int findPositionForKey(Object key) {
-        final Object [] ka = (Object[])key;
-        final int k0 = TypeUtils.unbox((Integer)ka[0]);
-        final int k1 = TypeUtils.unbox((Integer)ka[1]);
-        int hash = hash(k0, k1);
-        final int tableLocation = hashToTableLocation(tableHashPivot, hash);
-        final int positionValue = mainOutputPosition.getUnsafe(tableLocation);
-        if (positionValue == EMPTY_OUTPUT_POSITION) {
-            return -1;
-        }
-        if (eq(mainKeySource0.getUnsafe(tableLocation), k0) && eq(mainKeySource1.getUnsafe(tableLocation), k1)) {
-            return positionValue;
-        }
-        int overflowLocation = mainOverflowLocationSource.getUnsafe(tableLocation);
-        while (overflowLocation != QueryConstants.NULL_INT) {
-            if (eq(overflowKeySource0.getUnsafe(overflowLocation), k0) && eq(overflowKeySource1.getUnsafe(overflowLocation), k1)) {
-                return overflowOutputPosition.getUnsafe(overflowLocation);
-            }
-            overflowLocation = overflowOverflowLocationSource.getUnsafe(overflowLocation);
-        }
-        return -1;
-    }
-}
diff --git a/engine/table/src/main/java/io/deephaven/engine/table/impl/by/typed/staticagg/gen/StaticAggHasherIntLong.java b/engine/table/src/main/java/io/deephaven/engine/table/impl/by/typed/staticagg/gen/StaticAggHasherIntLong.java
deleted file mode 100644
index 569be4e3f27..00000000000
--- a/engine/table/src/main/java/io/deephaven/engine/table/impl/by/typed/staticagg/gen/StaticAggHasherIntLong.java
+++ /dev/null
@@ -1,206 +0,0 @@
-//
-// Copyright (c) 2016-2024 Deephaven Data Labs and Patent Pending
-//
-// ****** AUTO-GENERATED CLASS - DO NOT EDIT MANUALLY
-// ****** Run ReplicateTypedHashers or ./gradlew replicateTypedHashers to regenerate
-//
-// @formatter:off
-package io.deephaven.engine.table.impl.by.typed.staticagg.gen;
-
-import static io.deephaven.util.compare.IntComparisons.eq;
-import static io.deephaven.util.compare.LongComparisons.eq;
-
-import io.deephaven.chunk.Chunk;
-import io.deephaven.chunk.IntChunk;
-import io.deephaven.chunk.LongChunk;
-import io.deephaven.chunk.attributes.Values;
-import io.deephaven.chunk.util.hashing.IntChunkHasher;
-import io.deephaven.chunk.util.hashing.LongChunkHasher;
-import io.deephaven.engine.rowset.RowSequence;
-import io.deephaven.engine.table.ColumnSource;
-import io.deephaven.engine.table.impl.by.HashHandler;
-import io.deephaven.engine.table.impl.by.StaticChunkedOperatorAggregationStateManagerTypedBase;
-import io.deephaven.engine.table.impl.sources.IntegerArraySource;
-import io.deephaven.engine.table.impl.sources.LongArraySource;
-import io.deephaven.util.QueryConstants;
-import io.deephaven.util.type.TypeUtils;
-import java.lang.Integer;
-import java.lang.Long;
-import java.lang.Object;
-import java.lang.Override;
-
-final class StaticAggHasherIntLong extends StaticChunkedOperatorAggregationStateManagerTypedBase {
-    private final IntegerArraySource mainKeySource0;
-
-    private final IntegerArraySource overflowKeySource0;
-
-    private final LongArraySource mainKeySource1;
-
-    private final LongArraySource overflowKeySource1;
-
-    public StaticAggHasherIntLong(ColumnSource[] tableKeySources,
-            ColumnSource[] originalTableKeySources, int tableSize, double maximumLoadFactor,
-            double targetLoadFactor) {
-        super(tableKeySources, tableSize, maximumLoadFactor, targetLoadFactor);
-        this.mainKeySource0 = (IntegerArraySource) super.mainKeySources[0];
-        this.overflowKeySource0 = (IntegerArraySource) super.overflowKeySources[0];
-        this.mainKeySource1 = (LongArraySource) super.mainKeySources[1];
-        this.overflowKeySource1 = (LongArraySource) super.overflowKeySources[1];
-    }
-
-    @Override
-    protected void build(HashHandler handler, RowSequence rowSequence, Chunk[] sourceKeyChunks) {
-        final IntChunk<Values> keyChunk0 = sourceKeyChunks[0].asIntChunk();
-        final LongChunk<Values> keyChunk1 = sourceKeyChunks[1].asLongChunk();
-        final int chunkSize = keyChunk0.size();
-        for (int chunkPosition = 0; chunkPosition < chunkSize; ++chunkPosition) {
-            final int k0 = keyChunk0.get(chunkPosition);
-            final long k1 = keyChunk1.get(chunkPosition);
-            final int hash = hash(k0, k1);
-            final int tableLocation = hashToTableLocation(tableHashPivot, hash);
-            if (mainOutputPosition.getUnsafe(tableLocation) == EMPTY_OUTPUT_POSITION) {
-                numEntries++;
-                mainKeySource0.set(tableLocation, k0);
-                mainKeySource1.set(tableLocation, k1);
-                handler.doMainInsert(tableLocation, chunkPosition);
-            } else if (eq(mainKeySource0.getUnsafe(tableLocation), k0) && eq(mainKeySource1.getUnsafe(tableLocation), k1)) {
-                handler.doMainFound(tableLocation, chunkPosition);
-            } else {
-                int overflowLocation = mainOverflowLocationSource.getUnsafe(tableLocation);
-                if (!findOverflow(handler, k0, k1, chunkPosition, overflowLocation)) {
-                    final int newOverflowLocation = allocateOverflowLocation();
-                    overflowKeySource0.set(newOverflowLocation, k0);
-                    overflowKeySource1.set(newOverflowLocation, k1);
-                    mainOverflowLocationSource.set(tableLocation, newOverflowLocation);
-                    overflowOverflowLocationSource.set(newOverflowLocation, overflowLocation);
-                    numEntries++;
-                    handler.doOverflowInsert(newOverflowLocation, chunkPosition);
-                }
-            }
-        }
-    }
-
-    @Override
-    protected void probe(HashHandler handler, RowSequence rowSequence, Chunk[] sourceKeyChunks) {
-        final IntChunk<Values> keyChunk0 = sourceKeyChunks[0].asIntChunk();
-        final LongChunk<Values> keyChunk1 = sourceKeyChunks[1].asLongChunk();
-        final int chunkSize = keyChunk0.size();
-        for (int chunkPosition = 0; chunkPosition < chunkSize; ++chunkPosition) {
-            final int k0 = keyChunk0.get(chunkPosition);
-            final long k1 = keyChunk1.get(chunkPosition);
-            final int hash = hash(k0, k1);
-            final int tableLocation = hashToTableLocation(tableHashPivot, hash);
-            if (mainOutputPosition.getUnsafe(tableLocation) == EMPTY_OUTPUT_POSITION) {
-                handler.doMissing(chunkPosition);
-            } else if (eq(mainKeySource0.getUnsafe(tableLocation), k0) && eq(mainKeySource1.getUnsafe(tableLocation), k1)) {
-                handler.doMainFound(tableLocation, chunkPosition);
-            } else {
-                int overflowLocation = mainOverflowLocationSource.getUnsafe(tableLocation);
-                if (!findOverflow(handler, k0, k1, chunkPosition, overflowLocation)) {
-                    handler.doMissing(chunkPosition);
-                }
-            }
-        }
-    }
-
-    private static int hash(int k0, long k1) {
-        int hash = IntChunkHasher.hashInitialSingle(k0);
-        hash = LongChunkHasher.hashUpdateSingle(hash, k1);
-        return hash;
-    }
-
-    @Override
-    protected void rehashBucket(HashHandler handler, int sourceBucket, int destBucket,
-            int bucketsToAdd) {
-        final int position = mainOutputPosition.getUnsafe(sourceBucket);
-        if (position == EMPTY_OUTPUT_POSITION) {
-            return;
-        }
-        int mainInsertLocation = maybeMoveMainBucket(handler, sourceBucket, destBucket, bucketsToAdd);
-        int overflowLocation = mainOverflowLocationSource.getUnsafe(sourceBucket);
-        mainOverflowLocationSource.set(sourceBucket, QueryConstants.NULL_INT);
-        mainOverflowLocationSource.set(destBucket, QueryConstants.NULL_INT);
-        while (overflowLocation != QueryConstants.NULL_INT) {
-            final int nextOverflowLocation = overflowOverflowLocationSource.getUnsafe(overflowLocation);
-            final int overflowKey0 = overflowKeySource0.getUnsafe(overflowLocation);
-            final long overflowKey1 = overflowKeySource1.getUnsafe(overflowLocation);
-            final int overflowHash = hash(overflowKey0, overflowKey1);
-            final int overflowTableLocation = hashToTableLocation(tableHashPivot + bucketsToAdd, overflowHash);
-            if (overflowTableLocation == mainInsertLocation) {
-                mainKeySource0.set(mainInsertLocation, overflowKey0);
-                mainKeySource1.set(mainInsertLocation, overflowKey1);
-                mainOutputPosition.set(mainInsertLocation, overflowOutputPosition.getUnsafe(overflowLocation));
-                handler.doPromoteOverflow(overflowLocation, mainInsertLocation);
-                overflowOutputPosition.set(overflowLocation, QueryConstants.NULL_INT);
-                overflowKeySource0.set(overflowLocation, QueryConstants.NULL_INT);
-                overflowKeySource1.set(overflowLocation, QueryConstants.NULL_LONG);
-                freeOverflowLocation(overflowLocation);
-                mainInsertLocation = -1;
-            } else {
-                final int oldOverflowLocation = mainOverflowLocationSource.getUnsafe(overflowTableLocation);
-                mainOverflowLocationSource.set(overflowTableLocation, overflowLocation);
-                overflowOverflowLocationSource.set(overflowLocation, oldOverflowLocation);
-            }
-            overflowLocation = nextOverflowLocation;
-        }
-    }
-
-    private int maybeMoveMainBucket(HashHandler handler, int sourceBucket, int destBucket,
-            int bucketsToAdd) {
-        final int k0 = mainKeySource0.getUnsafe(sourceBucket);
-        final long k1 = mainKeySource1.getUnsafe(sourceBucket);
-        final int hash = hash(k0, k1);
-        final int location = hashToTableLocation(tableHashPivot + bucketsToAdd, hash);
-        final int mainInsertLocation;
-        if (location == sourceBucket) {
-            mainInsertLocation = destBucket;
-            mainOutputPosition.set(destBucket, EMPTY_OUTPUT_POSITION);
-        } else {
-            mainInsertLocation = sourceBucket;
-            mainOutputPosition.set(destBucket, mainOutputPosition.getUnsafe(sourceBucket));
-            mainOutputPosition.set(sourceBucket, EMPTY_OUTPUT_POSITION);
-            mainKeySource0.set(destBucket, k0);
-            mainKeySource0.set(sourceBucket, QueryConstants.NULL_INT);
-            mainKeySource1.set(destBucket, k1);
-            mainKeySource1.set(sourceBucket, QueryConstants.NULL_LONG);
-            handler.doMoveMain(sourceBucket, destBucket);
-        }
-        return mainInsertLocation;
-    }
-
-    private boolean findOverflow(HashHandler handler, int k0, long k1, int chunkPosition,
-            int overflowLocation) {
-        while (overflowLocation != QueryConstants.NULL_INT) {
-            if (eq(overflowKeySource0.getUnsafe(overflowLocation), k0) && eq(overflowKeySource1.getUnsafe(overflowLocation), k1)) {
-                handler.doOverflowFound(overflowLocation, chunkPosition);
-                return true;
-            }
-            overflowLocation = overflowOverflowLocationSource.getUnsafe(overflowLocation);
-        }
-        return false;
-    }
-
-    @Override
-    public int findPositionForKey(Object key) {
-        final Object [] ka = (Object[])key;
-        final int k0 = TypeUtils.unbox((Integer)ka[0]);
-        final long k1 = TypeUtils.unbox((Long)ka[1]);
-        int hash = hash(k0, k1);
-        final int tableLocation = hashToTableLocation(tableHashPivot, hash);
-        final int positionValue = mainOutputPosition.getUnsafe(tableLocation);
-        if (positionValue == EMPTY_OUTPUT_POSITION) {
-            return -1;
-        }
-        if (eq(mainKeySource0.getUnsafe(tableLocation), k0) && eq(mainKeySource1.getUnsafe(tableLocation), k1)) {
-            return positionValue;
-        }
-        int overflowLocation = mainOverflowLocationSource.getUnsafe(tableLocation);
-        while (overflowLocation != QueryConstants.NULL_INT) {
-            if (eq(overflowKeySource0.getUnsafe(overflowLocation), k0) && eq(overflowKeySource1.getUnsafe(overflowLocation), k1)) {
-                return overflowOutputPosition.getUnsafe(overflowLocation);
-            }
-            overflowLocation = overflowOverflowLocationSource.getUnsafe(overflowLocation);
-        }
-        return -1;
-    }
-}
diff --git a/engine/table/src/main/java/io/deephaven/engine/table/impl/by/typed/staticagg/gen/StaticAggHasherIntObject.java b/engine/table/src/main/java/io/deephaven/engine/table/impl/by/typed/staticagg/gen/StaticAggHasherIntObject.java
deleted file mode 100644
index eedb8c2809c..00000000000
--- a/engine/table/src/main/java/io/deephaven/engine/table/impl/by/typed/staticagg/gen/StaticAggHasherIntObject.java
+++ /dev/null
@@ -1,205 +0,0 @@
-//
-// Copyright (c) 2016-2024 Deephaven Data Labs and Patent Pending
-//
-// ****** AUTO-GENERATED CLASS - DO NOT EDIT MANUALLY
-// ****** Run ReplicateTypedHashers or ./gradlew replicateTypedHashers to regenerate
-//
-// @formatter:off
-package io.deephaven.engine.table.impl.by.typed.staticagg.gen;
-
-import static io.deephaven.util.compare.IntComparisons.eq;
-import static io.deephaven.util.compare.ObjectComparisons.eq;
-
-import io.deephaven.chunk.Chunk;
-import io.deephaven.chunk.IntChunk;
-import io.deephaven.chunk.ObjectChunk;
-import io.deephaven.chunk.attributes.Values;
-import io.deephaven.chunk.util.hashing.IntChunkHasher;
-import io.deephaven.chunk.util.hashing.ObjectChunkHasher;
-import io.deephaven.engine.rowset.RowSequence;
-import io.deephaven.engine.table.ColumnSource;
-import io.deephaven.engine.table.impl.by.HashHandler;
-import io.deephaven.engine.table.impl.by.StaticChunkedOperatorAggregationStateManagerTypedBase;
-import io.deephaven.engine.table.impl.sources.IntegerArraySource;
-import io.deephaven.engine.table.impl.sources.ObjectArraySource;
-import io.deephaven.util.QueryConstants;
-import io.deephaven.util.type.TypeUtils;
-import java.lang.Integer;
-import java.lang.Object;
-import java.lang.Override;
-
-final class StaticAggHasherIntObject extends StaticChunkedOperatorAggregationStateManagerTypedBase {
-    private final IntegerArraySource mainKeySource0;
-
-    private final IntegerArraySource overflowKeySource0;
-
-    private final ObjectArraySource mainKeySource1;
-
-    private final ObjectArraySource overflowKeySource1;
-
-    public StaticAggHasherIntObject(ColumnSource[] tableKeySources,
-            ColumnSource[] originalTableKeySources, int tableSize, double maximumLoadFactor,
-            double targetLoadFactor) {
-        super(tableKeySources, tableSize, maximumLoadFactor, targetLoadFactor);
-        this.mainKeySource0 = (IntegerArraySource) super.mainKeySources[0];
-        this.overflowKeySource0 = (IntegerArraySource) super.overflowKeySources[0];
-        this.mainKeySource1 = (ObjectArraySource) super.mainKeySources[1];
-        this.overflowKeySource1 = (ObjectArraySource) super.overflowKeySources[1];
-    }
-
-    @Override
-    protected void build(HashHandler handler, RowSequence rowSequence, Chunk[] sourceKeyChunks) {
-        final IntChunk<Values> keyChunk0 = sourceKeyChunks[0].asIntChunk();
-        final ObjectChunk<Object, Values> keyChunk1 = sourceKeyChunks[1].asObjectChunk();
-        final int chunkSize = keyChunk0.size();
-        for (int chunkPosition = 0; chunkPosition < chunkSize; ++chunkPosition) {
-            final int k0 = keyChunk0.get(chunkPosition);
-            final Object k1 = keyChunk1.get(chunkPosition);
-            final int hash = hash(k0, k1);
-            final int tableLocation = hashToTableLocation(tableHashPivot, hash);
-            if (mainOutputPosition.getUnsafe(tableLocation) == EMPTY_OUTPUT_POSITION) {
-                numEntries++;
-                mainKeySource0.set(tableLocation, k0);
-                mainKeySource1.set(tableLocation, k1);
-                handler.doMainInsert(tableLocation, chunkPosition);
-            } else if (eq(mainKeySource0.getUnsafe(tableLocation), k0) && eq(mainKeySource1.getUnsafe(tableLocation), k1)) {
-                handler.doMainFound(tableLocation, chunkPosition);
-            } else {
-                int overflowLocation = mainOverflowLocationSource.getUnsafe(tableLocation);
-                if (!findOverflow(handler, k0, k1, chunkPosition, overflowLocation)) {
-                    final int newOverflowLocation = allocateOverflowLocation();
-                    overflowKeySource0.set(newOverflowLocation, k0);
-                    overflowKeySource1.set(newOverflowLocation, k1);
-                    mainOverflowLocationSource.set(tableLocation, newOverflowLocation);
-                    overflowOverflowLocationSource.set(newOverflowLocation, overflowLocation);
-                    numEntries++;
-                    handler.doOverflowInsert(newOverflowLocation, chunkPosition);
-                }
-            }
-        }
-    }
-
-    @Override
-    protected void probe(HashHandler handler, RowSequence rowSequence, Chunk[] sourceKeyChunks) {
-        final IntChunk<Values> keyChunk0 = sourceKeyChunks[0].asIntChunk();
-        final ObjectChunk<Object, Values> keyChunk1 = sourceKeyChunks[1].asObjectChunk();
-        final int chunkSize = keyChunk0.size();
-        for (int chunkPosition = 0; chunkPosition < chunkSize; ++chunkPosition) {
-            final int k0 = keyChunk0.get(chunkPosition);
-            final Object k1 = keyChunk1.get(chunkPosition);
-            final int hash = hash(k0, k1);
-            final int tableLocation = hashToTableLocation(tableHashPivot, hash);
-            if (mainOutputPosition.getUnsafe(tableLocation) == EMPTY_OUTPUT_POSITION) {
-                handler.doMissing(chunkPosition);
-            } else if (eq(mainKeySource0.getUnsafe(tableLocation), k0) && eq(mainKeySource1.getUnsafe(tableLocation), k1)) {
-                handler.doMainFound(tableLocation, chunkPosition);
-            } else {
-                int overflowLocation = mainOverflowLocationSource.getUnsafe(tableLocation);
-                if (!findOverflow(handler, k0, k1, chunkPosition, overflowLocation)) {
-                    handler.doMissing(chunkPosition);
-                }
-            }
-        }
-    }
-
-    private static int hash(int k0, Object k1) {
-        int hash = IntChunkHasher.hashInitialSingle(k0);
-        hash = ObjectChunkHasher.hashUpdateSingle(hash, k1);
-        return hash;
-    }
-
-    @Override
-    protected void rehashBucket(HashHandler handler, int sourceBucket, int destBucket,
-            int bucketsToAdd) {
-        final int position = mainOutputPosition.getUnsafe(sourceBucket);
-        if (position == EMPTY_OUTPUT_POSITION) {
-            return;
-        }
-        int mainInsertLocation = maybeMoveMainBucket(handler, sourceBucket, destBucket, bucketsToAdd);
-        int overflowLocation = mainOverflowLocationSource.getUnsafe(sourceBucket);
-        mainOverflowLocationSource.set(sourceBucket, QueryConstants.NULL_INT);
-        mainOverflowLocationSource.set(destBucket, QueryConstants.NULL_INT);
-        while (overflowLocation != QueryConstants.NULL_INT) {
-            final int nextOverflowLocation = overflowOverflowLocationSource.getUnsafe(overflowLocation);
-            final int overflowKey0 = overflowKeySource0.getUnsafe(overflowLocation);
-            final Object overflowKey1 = overflowKeySource1.getUnsafe(overflowLocation);
-            final int overflowHash = hash(overflowKey0, overflowKey1);
-            final int overflowTableLocation = hashToTableLocation(tableHashPivot + bucketsToAdd, overflowHash);
-            if (overflowTableLocation == mainInsertLocation) {
-                mainKeySource0.set(mainInsertLocation, overflowKey0);
-                mainKeySource1.set(mainInsertLocation, overflowKey1);
-                mainOutputPosition.set(mainInsertLocation, overflowOutputPosition.getUnsafe(overflowLocation));
-                handler.doPromoteOverflow(overflowLocation, mainInsertLocation);
-                overflowOutputPosition.set(overflowLocation, QueryConstants.NULL_INT);
-                overflowKeySource0.set(overflowLocation, QueryConstants.NULL_INT);
-                overflowKeySource1.set(overflowLocation, null);
-                freeOverflowLocation(overflowLocation);
-                mainInsertLocation = -1;
-            } else {
-                final int oldOverflowLocation = mainOverflowLocationSource.getUnsafe(overflowTableLocation);
-                mainOverflowLocationSource.set(overflowTableLocation, overflowLocation);
-                overflowOverflowLocationSource.set(overflowLocation, oldOverflowLocation);
-            }
-            overflowLocation = nextOverflowLocation;
-        }
-    }
-
-    private int maybeMoveMainBucket(HashHandler handler, int sourceBucket, int destBucket,
-            int bucketsToAdd) {
-        final int k0 = mainKeySource0.getUnsafe(sourceBucket);
-        final Object k1 = mainKeySource1.getUnsafe(sourceBucket);
-        final int hash = hash(k0, k1);
-        final int location = hashToTableLocation(tableHashPivot + bucketsToAdd, hash);
-        final int mainInsertLocation;
-        if (location == sourceBucket) {
-            mainInsertLocation = destBucket;
-            mainOutputPosition.set(destBucket, EMPTY_OUTPUT_POSITION);
-        } else {
-            mainInsertLocation = sourceBucket;
-            mainOutputPosition.set(destBucket, mainOutputPosition.getUnsafe(sourceBucket));
-            mainOutputPosition.set(sourceBucket, EMPTY_OUTPUT_POSITION);
-            mainKeySource0.set(destBucket, k0);
-            mainKeySource0.set(sourceBucket, QueryConstants.NULL_INT);
-            mainKeySource1.set(destBucket, k1);
-            mainKeySource1.set(sourceBucket, null);
-            handler.doMoveMain(sourceBucket, destBucket);
-        }
-        return mainInsertLocation;
-    }
-
-    private boolean findOverflow(HashHandler handler, int k0, Object k1, int chunkPosition,
-            int overflowLocation) {
-        while (overflowLocation != QueryConstants.NULL_INT) {
-            if (eq(overflowKeySource0.getUnsafe(overflowLocation), k0) && eq(overflowKeySource1.getUnsafe(overflowLocation), k1)) {
-                handler.doOverflowFound(overflowLocation, chunkPosition);
-                return true;
-            }
-            overflowLocation = overflowOverflowLocationSource.getUnsafe(overflowLocation);
-        }
-        return false;
-    }
-
-    @Override
-    public int findPositionForKey(Object key) {
-        final Object [] ka = (Object[])key;
-        final int k0 = TypeUtils.unbox((Integer)ka[0]);
-        final Object k1 = ka[1];
-        int hash = hash(k0, k1);
-        final int tableLocation = hashToTableLocation(tableHashPivot, hash);
-        final int positionValue = mainOutputPosition.getUnsafe(tableLocation);
-        if (positionValue == EMPTY_OUTPUT_POSITION) {
-            return -1;
-        }
-        if (eq(mainKeySource0.getUnsafe(tableLocation), k0) && eq(mainKeySource1.getUnsafe(tableLocation), k1)) {
-            return positionValue;
-        }
-        int overflowLocation = mainOverflowLocationSource.getUnsafe(tableLocation);
-        while (overflowLocation != QueryConstants.NULL_INT) {
-            if (eq(overflowKeySource0.getUnsafe(overflowLocation), k0) && eq(overflowKeySource1.getUnsafe(overflowLocation), k1)) {
-                return overflowOutputPosition.getUnsafe(overflowLocation);
-            }
-            overflowLocation = overflowOverflowLocationSource.getUnsafe(overflowLocation);
-        }
-        return -1;
-    }
-}
diff --git a/engine/table/src/main/java/io/deephaven/engine/table/impl/by/typed/staticagg/gen/StaticAggHasherIntShort.java b/engine/table/src/main/java/io/deephaven/engine/table/impl/by/typed/staticagg/gen/StaticAggHasherIntShort.java
deleted file mode 100644
index cd45a264d9b..00000000000
--- a/engine/table/src/main/java/io/deephaven/engine/table/impl/by/typed/staticagg/gen/StaticAggHasherIntShort.java
+++ /dev/null
@@ -1,206 +0,0 @@
-//
-// Copyright (c) 2016-2024 Deephaven Data Labs and Patent Pending
-//
-// ****** AUTO-GENERATED CLASS - DO NOT EDIT MANUALLY
-// ****** Run ReplicateTypedHashers or ./gradlew replicateTypedHashers to regenerate
-//
-// @formatter:off
-package io.deephaven.engine.table.impl.by.typed.staticagg.gen;
-
-import static io.deephaven.util.compare.IntComparisons.eq;
-import static io.deephaven.util.compare.ShortComparisons.eq;
-
-import io.deephaven.chunk.Chunk;
-import io.deephaven.chunk.IntChunk;
-import io.deephaven.chunk.ShortChunk;
-import io.deephaven.chunk.attributes.Values;
-import io.deephaven.chunk.util.hashing.IntChunkHasher;
-import io.deephaven.chunk.util.hashing.ShortChunkHasher;
-import io.deephaven.engine.rowset.RowSequence;
-import io.deephaven.engine.table.ColumnSource;
-import io.deephaven.engine.table.impl.by.HashHandler;
-import io.deephaven.engine.table.impl.by.StaticChunkedOperatorAggregationStateManagerTypedBase;
-import io.deephaven.engine.table.impl.sources.IntegerArraySource;
-import io.deephaven.engine.table.impl.sources.ShortArraySource;
-import io.deephaven.util.QueryConstants;
-import io.deephaven.util.type.TypeUtils;
-import java.lang.Integer;
-import java.lang.Object;
-import java.lang.Override;
-import java.lang.Short;
-
-final class StaticAggHasherIntShort extends StaticChunkedOperatorAggregationStateManagerTypedBase {
-    private final IntegerArraySource mainKeySource0;
-
-    private final IntegerArraySource overflowKeySource0;
-
-    private final ShortArraySource mainKeySource1;
-
-    private final ShortArraySource overflowKeySource1;
-
-    public StaticAggHasherIntShort(ColumnSource[] tableKeySources,
-            ColumnSource[] originalTableKeySources, int tableSize, double maximumLoadFactor,
-            double targetLoadFactor) {
-        super(tableKeySources, tableSize, maximumLoadFactor, targetLoadFactor);
-        this.mainKeySource0 = (IntegerArraySource) super.mainKeySources[0];
-        this.overflowKeySource0 = (IntegerArraySource) super.overflowKeySources[0];
-        this.mainKeySource1 = (ShortArraySource) super.mainKeySources[1];
-        this.overflowKeySource1 = (ShortArraySource) super.overflowKeySources[1];
-    }
-
-    @Override
-    protected void build(HashHandler handler, RowSequence rowSequence, Chunk[] sourceKeyChunks) {
-        final IntChunk<Values> keyChunk0 = sourceKeyChunks[0].asIntChunk();
-        final ShortChunk<Values> keyChunk1 = sourceKeyChunks[1].asShortChunk();
-        final int chunkSize = keyChunk0.size();
-        for (int chunkPosition = 0; chunkPosition < chunkSize; ++chunkPosition) {
-            final int k0 = keyChunk0.get(chunkPosition);
-            final short k1 = keyChunk1.get(chunkPosition);
-            final int hash = hash(k0, k1);
-            final int tableLocation = hashToTableLocation(tableHashPivot, hash);
-            if (mainOutputPosition.getUnsafe(tableLocation) == EMPTY_OUTPUT_POSITION) {
-                numEntries++;
-                mainKeySource0.set(tableLocation, k0);
-                mainKeySource1.set(tableLocation, k1);
-                handler.doMainInsert(tableLocation, chunkPosition);
-            } else if (eq(mainKeySource0.getUnsafe(tableLocation), k0) && eq(mainKeySource1.getUnsafe(tableLocation), k1)) {
-                handler.doMainFound(tableLocation, chunkPosition);
-            } else {
-                int overflowLocation = mainOverflowLocationSource.getUnsafe(tableLocation);
-                if (!findOverflow(handler, k0, k1, chunkPosition, overflowLocation)) {
-                    final int newOverflowLocation = allocateOverflowLocation();
-                    overflowKeySource0.set(newOverflowLocation, k0);
-                    overflowKeySource1.set(newOverflowLocation, k1);
-                    mainOverflowLocationSource.set(tableLocation, newOverflowLocation);
-                    overflowOverflowLocationSource.set(newOverflowLocation, overflowLocation);
-                    numEntries++;
-                    handler.doOverflowInsert(newOverflowLocation, chunkPosition);
-                }
-            }
-        }
-    }
-
-    @Override
-    protected void probe(HashHandler handler, RowSequence rowSequence, Chunk[] sourceKeyChunks) {
-        final IntChunk<Values> keyChunk0 = sourceKeyChunks[0].asIntChunk();
-        final ShortChunk<Values> keyChunk1 = sourceKeyChunks[1].asShortChunk();
-        final int chunkSize = keyChunk0.size();
-        for (int chunkPosition = 0; chunkPosition < chunkSize; ++chunkPosition) {
-            final int k0 = keyChunk0.get(chunkPosition);
-            final short k1 = keyChunk1.get(chunkPosition);
-            final int hash = hash(k0, k1);
-            final int tableLocation = hashToTableLocation(tableHashPivot, hash);
-            if (mainOutputPosition.getUnsafe(tableLocation) == EMPTY_OUTPUT_POSITION) {
-                handler.doMissing(chunkPosition);
-            } else if (eq(mainKeySource0.getUnsafe(tableLocation), k0) && eq(mainKeySource1.getUnsafe(tableLocation), k1)) {
-                handler.doMainFound(tableLocation, chunkPosition);
-            } else {
-                int overflowLocation = mainOverflowLocationSource.getUnsafe(tableLocation);
-                if (!findOverflow(handler, k0, k1, chunkPosition, overflowLocation)) {
-                    handler.doMissing(chunkPosition);
-                }
-            }
-        }
-    }
-
-    private static int hash(int k0, short k1) {
-        int hash = IntChunkHasher.hashInitialSingle(k0);
-        hash = ShortChunkHasher.hashUpdateSingle(hash, k1);
-        return hash;
-    }
-
-    @Override
-    protected void rehashBucket(HashHandler handler, int sourceBucket, int destBucket,
-            int bucketsToAdd) {
-        final int position = mainOutputPosition.getUnsafe(sourceBucket);
-        if (position == EMPTY_OUTPUT_POSITION) {
-            return;
-        }
-        int mainInsertLocation = maybeMoveMainBucket(handler, sourceBucket, destBucket, bucketsToAdd);
-        int overflowLocation = mainOverflowLocationSource.getUnsafe(sourceBucket);
-        mainOverflowLocationSource.set(sourceBucket, QueryConstants.NULL_INT);
-        mainOverflowLocationSource.set(destBucket, QueryConstants.NULL_INT);
-        while (overflowLocation != QueryConstants.NULL_INT) {
-            final int nextOverflowLocation = overflowOverflowLocationSource.getUnsafe(overflowLocation);
-            final int overflowKey0 = overflowKeySource0.getUnsafe(overflowLocation);
-            final short overflowKey1 = overflowKeySource1.getUnsafe(overflowLocation);
-            final int overflowHash = hash(overflowKey0, overflowKey1);
-            final int overflowTableLocation = hashToTableLocation(tableHashPivot + bucketsToAdd, overflowHash);
-            if (overflowTableLocation == mainInsertLocation) {
-                mainKeySource0.set(mainInsertLocation, overflowKey0);
-                mainKeySource1.set(mainInsertLocation, overflowKey1);
-                mainOutputPosition.set(mainInsertLocation, overflowOutputPosition.getUnsafe(overflowLocation));
-                handler.doPromoteOverflow(overflowLocation, mainInsertLocation);
-                overflowOutputPosition.set(overflowLocation, QueryConstants.NULL_INT);
-                overflowKeySource0.set(overflowLocation, QueryConstants.NULL_INT);
-                overflowKeySource1.set(overflowLocation, QueryConstants.NULL_SHORT);
-                freeOverflowLocation(overflowLocation);
-                mainInsertLocation = -1;
-            } else {
-                final int oldOverflowLocation = mainOverflowLocationSource.getUnsafe(overflowTableLocation);
-                mainOverflowLocationSource.set(overflowTableLocation, overflowLocation);
-                overflowOverflowLocationSource.set(overflowLocation, oldOverflowLocation);
-            }
-            overflowLocation = nextOverflowLocation;
-        }
-    }
-
-    private int maybeMoveMainBucket(HashHandler handler, int sourceBucket, int destBucket,
-            int bucketsToAdd) {
-        final int k0 = mainKeySource0.getUnsafe(sourceBucket);
-        final short k1 = mainKeySource1.getUnsafe(sourceBucket);
-        final int hash = hash(k0, k1);
-        final int location = hashToTableLocation(tableHashPivot + bucketsToAdd, hash);
-        final int mainInsertLocation;
-        if (location == sourceBucket) {
-            mainInsertLocation = destBucket;
-            mainOutputPosition.set(destBucket, EMPTY_OUTPUT_POSITION);
-        } else {
-            mainInsertLocation = sourceBucket;
-            mainOutputPosition.set(destBucket, mainOutputPosition.getUnsafe(sourceBucket));
-            mainOutputPosition.set(sourceBucket, EMPTY_OUTPUT_POSITION);
-            mainKeySource0.set(destBucket, k0);
-            mainKeySource0.set(sourceBucket, QueryConstants.NULL_INT);
-            mainKeySource1.set(destBucket, k1);
-            mainKeySource1.set(sourceBucket, QueryConstants.NULL_SHORT);
-            handler.doMoveMain(sourceBucket, destBucket);
-        }
-        return mainInsertLocation;
-    }
-
-    private boolean findOverflow(HashHandler handler, int k0, short k1, int chunkPosition,
-            int overflowLocation) {
-        while (overflowLocation != QueryConstants.NULL_INT) {
-            if (eq(overflowKeySource0.getUnsafe(overflowLocation), k0) && eq(overflowKeySource1.getUnsafe(overflowLocation), k1)) {
-                handler.doOverflowFound(overflowLocation, chunkPosition);
-                return true;
-            }
-            overflowLocation = overflowOverflowLocationSource.getUnsafe(overflowLocation);
-        }
-        return false;
-    }
-
-    @Override
-    public int findPositionForKey(Object key) {
-        final Object [] ka = (Object[])key;
-        final int k0 = TypeUtils.unbox((Integer)ka[0]);
-        final short k1 = TypeUtils.unbox((Short)ka[1]);
-        int hash = hash(k0, k1);
-        final int tableLocation = hashToTableLocation(tableHashPivot, hash);
-        final int positionValue = mainOutputPosition.getUnsafe(tableLocation);
-        if (positionValue == EMPTY_OUTPUT_POSITION) {
-            return -1;
-        }
-        if (eq(mainKeySource0.getUnsafe(tableLocation), k0) && eq(mainKeySource1.getUnsafe(tableLocation), k1)) {
-            return positionValue;
-        }
-        int overflowLocation = mainOverflowLocationSource.getUnsafe(tableLocation);
-        while (overflowLocation != QueryConstants.NULL_INT) {
-            if (eq(overflowKeySource0.getUnsafe(overflowLocation), k0) && eq(overflowKeySource1.getUnsafe(overflowLocation), k1)) {
-                return overflowOutputPosition.getUnsafe(overflowLocation);
-            }
-            overflowLocation = overflowOverflowLocationSource.getUnsafe(overflowLocation);
-        }
-        return -1;
-    }
-}
diff --git a/engine/table/src/main/java/io/deephaven/engine/table/impl/by/typed/staticagg/gen/StaticAggHasherLong.java b/engine/table/src/main/java/io/deephaven/engine/table/impl/by/typed/staticagg/gen/StaticAggHasherLong.java
deleted file mode 100644
index 92abdba418c..00000000000
--- a/engine/table/src/main/java/io/deephaven/engine/table/impl/by/typed/staticagg/gen/StaticAggHasherLong.java
+++ /dev/null
@@ -1,180 +0,0 @@
-//
-// Copyright (c) 2016-2024 Deephaven Data Labs and Patent Pending
-//
-// ****** AUTO-GENERATED CLASS - DO NOT EDIT MANUALLY
-// ****** Run ReplicateTypedHashers or ./gradlew replicateTypedHashers to regenerate
-//
-// @formatter:off
-package io.deephaven.engine.table.impl.by.typed.staticagg.gen;
-
-import static io.deephaven.util.compare.LongComparisons.eq;
-
-import io.deephaven.chunk.Chunk;
-import io.deephaven.chunk.LongChunk;
-import io.deephaven.chunk.attributes.Values;
-import io.deephaven.chunk.util.hashing.LongChunkHasher;
-import io.deephaven.engine.rowset.RowSequence;
-import io.deephaven.engine.table.ColumnSource;
-import io.deephaven.engine.table.impl.by.HashHandler;
-import io.deephaven.engine.table.impl.by.StaticChunkedOperatorAggregationStateManagerTypedBase;
-import io.deephaven.engine.table.impl.sources.LongArraySource;
-import io.deephaven.util.QueryConstants;
-import io.deephaven.util.type.TypeUtils;
-import java.lang.Long;
-import java.lang.Object;
-import java.lang.Override;
-
-final class StaticAggHasherLong extends StaticChunkedOperatorAggregationStateManagerTypedBase {
-    private final LongArraySource mainKeySource0;
-
-    private final LongArraySource overflowKeySource0;
-
-    public StaticAggHasherLong(ColumnSource[] tableKeySources,
-            ColumnSource[] originalTableKeySources, int tableSize, double maximumLoadFactor,
-            double targetLoadFactor) {
-        super(tableKeySources, tableSize, maximumLoadFactor, targetLoadFactor);
-        this.mainKeySource0 = (LongArraySource) super.mainKeySources[0];
-        this.overflowKeySource0 = (LongArraySource) super.overflowKeySources[0];
-    }
-
-    @Override
-    protected void build(HashHandler handler, RowSequence rowSequence, Chunk[] sourceKeyChunks) {
-        final LongChunk<Values> keyChunk0 = sourceKeyChunks[0].asLongChunk();
-        final int chunkSize = keyChunk0.size();
-        for (int chunkPosition = 0; chunkPosition < chunkSize; ++chunkPosition) {
-            final long k0 = keyChunk0.get(chunkPosition);
-            final int hash = hash(k0);
-            final int tableLocation = hashToTableLocation(tableHashPivot, hash);
-            if (mainOutputPosition.getUnsafe(tableLocation) == EMPTY_OUTPUT_POSITION) {
-                numEntries++;
-                mainKeySource0.set(tableLocation, k0);
-                handler.doMainInsert(tableLocation, chunkPosition);
-            } else if (eq(mainKeySource0.getUnsafe(tableLocation), k0)) {
-                handler.doMainFound(tableLocation, chunkPosition);
-            } else {
-                int overflowLocation = mainOverflowLocationSource.getUnsafe(tableLocation);
-                if (!findOverflow(handler, k0, chunkPosition, overflowLocation)) {
-                    final int newOverflowLocation = allocateOverflowLocation();
-                    overflowKeySource0.set(newOverflowLocation, k0);
-                    mainOverflowLocationSource.set(tableLocation, newOverflowLocation);
-                    overflowOverflowLocationSource.set(newOverflowLocation, overflowLocation);
-                    numEntries++;
-                    handler.doOverflowInsert(newOverflowLocation, chunkPosition);
-                }
-            }
-        }
-    }
-
-    @Override
-    protected void probe(HashHandler handler, RowSequence rowSequence, Chunk[] sourceKeyChunks) {
-        final LongChunk<Values> keyChunk0 = sourceKeyChunks[0].asLongChunk();
-        final int chunkSize = keyChunk0.size();
-        for (int chunkPosition = 0; chunkPosition < chunkSize; ++chunkPosition) {
-            final long k0 = keyChunk0.get(chunkPosition);
-            final int hash = hash(k0);
-            final int tableLocation = hashToTableLocation(tableHashPivot, hash);
-            if (mainOutputPosition.getUnsafe(tableLocation) == EMPTY_OUTPUT_POSITION) {
-                handler.doMissing(chunkPosition);
-            } else if (eq(mainKeySource0.getUnsafe(tableLocation), k0)) {
-                handler.doMainFound(tableLocation, chunkPosition);
-            } else {
-                int overflowLocation = mainOverflowLocationSource.getUnsafe(tableLocation);
-                if (!findOverflow(handler, k0, chunkPosition, overflowLocation)) {
-                    handler.doMissing(chunkPosition);
-                }
-            }
-        }
-    }
-
-    private static int hash(long k0) {
-        int hash = LongChunkHasher.hashInitialSingle(k0);
-        return hash;
-    }
-
-    @Override
-    protected void rehashBucket(HashHandler handler, int sourceBucket, int destBucket,
-            int bucketsToAdd) {
-        final int position = mainOutputPosition.getUnsafe(sourceBucket);
-        if (position == EMPTY_OUTPUT_POSITION) {
-            return;
-        }
-        int mainInsertLocation = maybeMoveMainBucket(handler, sourceBucket, destBucket, bucketsToAdd);
-        int overflowLocation = mainOverflowLocationSource.getUnsafe(sourceBucket);
-        mainOverflowLocationSource.set(sourceBucket, QueryConstants.NULL_INT);
-        mainOverflowLocationSource.set(destBucket, QueryConstants.NULL_INT);
-        while (overflowLocation != QueryConstants.NULL_INT) {
-            final int nextOverflowLocation = overflowOverflowLocationSource.getUnsafe(overflowLocation);
-            final long overflowKey0 = overflowKeySource0.getUnsafe(overflowLocation);
-            final int overflowHash = hash(overflowKey0);
-            final int overflowTableLocation = hashToTableLocation(tableHashPivot + bucketsToAdd, overflowHash);
-            if (overflowTableLocation == mainInsertLocation) {
-                mainKeySource0.set(mainInsertLocation, overflowKey0);
-                mainOutputPosition.set(mainInsertLocation, overflowOutputPosition.getUnsafe(overflowLocation));
-                handler.doPromoteOverflow(overflowLocation, mainInsertLocation);
-                overflowOutputPosition.set(overflowLocation, QueryConstants.NULL_INT);
-                overflowKeySource0.set(overflowLocation, QueryConstants.NULL_LONG);
-                freeOverflowLocation(overflowLocation);
-                mainInsertLocation = -1;
-            } else {
-                final int oldOverflowLocation = mainOverflowLocationSource.getUnsafe(overflowTableLocation);
-                mainOverflowLocationSource.set(overflowTableLocation, overflowLocation);
-                overflowOverflowLocationSource.set(overflowLocation, oldOverflowLocation);
-            }
-            overflowLocation = nextOverflowLocation;
-        }
-    }
-
-    private int maybeMoveMainBucket(HashHandler handler, int sourceBucket, int destBucket,
-            int bucketsToAdd) {
-        final long k0 = mainKeySource0.getUnsafe(sourceBucket);
-        final int hash = hash(k0);
-        final int location = hashToTableLocation(tableHashPivot + bucketsToAdd, hash);
-        final int mainInsertLocation;
-        if (location == sourceBucket) {
-            mainInsertLocation = destBucket;
-            mainOutputPosition.set(destBucket, EMPTY_OUTPUT_POSITION);
-        } else {
-            mainInsertLocation = sourceBucket;
-            mainOutputPosition.set(destBucket, mainOutputPosition.getUnsafe(sourceBucket));
-            mainOutputPosition.set(sourceBucket, EMPTY_OUTPUT_POSITION);
-            mainKeySource0.set(destBucket, k0);
-            mainKeySource0.set(sourceBucket, QueryConstants.NULL_LONG);
-            handler.doMoveMain(sourceBucket, destBucket);
-        }
-        return mainInsertLocation;
-    }
-
-    private boolean findOverflow(HashHandler handler, long k0, int chunkPosition,
-            int overflowLocation) {
-        while (overflowLocation != QueryConstants.NULL_INT) {
-            if (eq(overflowKeySource0.getUnsafe(overflowLocation), k0)) {
-                handler.doOverflowFound(overflowLocation, chunkPosition);
-                return true;
-            }
-            overflowLocation = overflowOverflowLocationSource.getUnsafe(overflowLocation);
-        }
-        return false;
-    }
-
-    @Override
-    public int findPositionForKey(Object key) {
-        final long k0 = TypeUtils.unbox((Long)key);
-        int hash = hash(k0);
-        final int tableLocation = hashToTableLocation(tableHashPivot, hash);
-        final int positionValue = mainOutputPosition.getUnsafe(tableLocation);
-        if (positionValue == EMPTY_OUTPUT_POSITION) {
-            return -1;
-        }
-        if (eq(mainKeySource0.getUnsafe(tableLocation), k0)) {
-            return positionValue;
-        }
-        int overflowLocation = mainOverflowLocationSource.getUnsafe(tableLocation);
-        while (overflowLocation != QueryConstants.NULL_INT) {
-            if (eq(overflowKeySource0.getUnsafe(overflowLocation), k0)) {
-                return overflowOutputPosition.getUnsafe(overflowLocation);
-            }
-            overflowLocation = overflowOverflowLocationSource.getUnsafe(overflowLocation);
-        }
-        return -1;
-    }
-}
diff --git a/engine/table/src/main/java/io/deephaven/engine/table/impl/by/typed/staticagg/gen/StaticAggHasherLongByte.java b/engine/table/src/main/java/io/deephaven/engine/table/impl/by/typed/staticagg/gen/StaticAggHasherLongByte.java
deleted file mode 100644
index 6fde7896651..00000000000
--- a/engine/table/src/main/java/io/deephaven/engine/table/impl/by/typed/staticagg/gen/StaticAggHasherLongByte.java
+++ /dev/null
@@ -1,206 +0,0 @@
-//
-// Copyright (c) 2016-2024 Deephaven Data Labs and Patent Pending
-//
-// ****** AUTO-GENERATED CLASS - DO NOT EDIT MANUALLY
-// ****** Run ReplicateTypedHashers or ./gradlew replicateTypedHashers to regenerate
-//
-// @formatter:off
-package io.deephaven.engine.table.impl.by.typed.staticagg.gen;
-
-import static io.deephaven.util.compare.ByteComparisons.eq;
-import static io.deephaven.util.compare.LongComparisons.eq;
-
-import io.deephaven.chunk.ByteChunk;
-import io.deephaven.chunk.Chunk;
-import io.deephaven.chunk.LongChunk;
-import io.deephaven.chunk.attributes.Values;
-import io.deephaven.chunk.util.hashing.ByteChunkHasher;
-import io.deephaven.chunk.util.hashing.LongChunkHasher;
-import io.deephaven.engine.rowset.RowSequence;
-import io.deephaven.engine.table.ColumnSource;
-import io.deephaven.engine.table.impl.by.HashHandler;
-import io.deephaven.engine.table.impl.by.StaticChunkedOperatorAggregationStateManagerTypedBase;
-import io.deephaven.engine.table.impl.sources.ByteArraySource;
-import io.deephaven.engine.table.impl.sources.LongArraySource;
-import io.deephaven.util.QueryConstants;
-import io.deephaven.util.type.TypeUtils;
-import java.lang.Byte;
-import java.lang.Long;
-import java.lang.Object;
-import java.lang.Override;
-
-final class StaticAggHasherLongByte extends StaticChunkedOperatorAggregationStateManagerTypedBase {
-    private final LongArraySource mainKeySource0;
-
-    private final LongArraySource overflowKeySource0;
-
-    private final ByteArraySource mainKeySource1;
-
-    private final ByteArraySource overflowKeySource1;
-
-    public StaticAggHasherLongByte(ColumnSource[] tableKeySources,
-            ColumnSource[] originalTableKeySources, int tableSize, double maximumLoadFactor,
-            double targetLoadFactor) {
-        super(tableKeySources, tableSize, maximumLoadFactor, targetLoadFactor);
-        this.mainKeySource0 = (LongArraySource) super.mainKeySources[0];
-        this.overflowKeySource0 = (LongArraySource) super.overflowKeySources[0];
-        this.mainKeySource1 = (ByteArraySource) super.mainKeySources[1];
-        this.overflowKeySource1 = (ByteArraySource) super.overflowKeySources[1];
-    }
-
-    @Override
-    protected void build(HashHandler handler, RowSequence rowSequence, Chunk[] sourceKeyChunks) {
-        final LongChunk<Values> keyChunk0 = sourceKeyChunks[0].asLongChunk();
-        final ByteChunk<Values> keyChunk1 = sourceKeyChunks[1].asByteChunk();
-        final int chunkSize = keyChunk0.size();
-        for (int chunkPosition = 0; chunkPosition < chunkSize; ++chunkPosition) {
-            final long k0 = keyChunk0.get(chunkPosition);
-            final byte k1 = keyChunk1.get(chunkPosition);
-            final int hash = hash(k0, k1);
-            final int tableLocation = hashToTableLocation(tableHashPivot, hash);
-            if (mainOutputPosition.getUnsafe(tableLocation) == EMPTY_OUTPUT_POSITION) {
-                numEntries++;
-                mainKeySource0.set(tableLocation, k0);
-                mainKeySource1.set(tableLocation, k1);
-                handler.doMainInsert(tableLocation, chunkPosition);
-            } else if (eq(mainKeySource0.getUnsafe(tableLocation), k0) && eq(mainKeySource1.getUnsafe(tableLocation), k1)) {
-                handler.doMainFound(tableLocation, chunkPosition);
-            } else {
-                int overflowLocation = mainOverflowLocationSource.getUnsafe(tableLocation);
-                if (!findOverflow(handler, k0, k1, chunkPosition, overflowLocation)) {
-                    final int newOverflowLocation = allocateOverflowLocation();
-                    overflowKeySource0.set(newOverflowLocation, k0);
-                    overflowKeySource1.set(newOverflowLocation, k1);
-                    mainOverflowLocationSource.set(tableLocation, newOverflowLocation);
-                    overflowOverflowLocationSource.set(newOverflowLocation, overflowLocation);
-                    numEntries++;
-                    handler.doOverflowInsert(newOverflowLocation, chunkPosition);
-                }
-            }
-        }
-    }
-
-    @Override
-    protected void probe(HashHandler handler, RowSequence rowSequence, Chunk[] sourceKeyChunks) {
-        final LongChunk<Values> keyChunk0 = sourceKeyChunks[0].asLongChunk();
-        final ByteChunk<Values> keyChunk1 = sourceKeyChunks[1].asByteChunk();
-        final int chunkSize = keyChunk0.size();
-        for (int chunkPosition = 0; chunkPosition < chunkSize; ++chunkPosition) {
-            final long k0 = keyChunk0.get(chunkPosition);
-            final byte k1 = keyChunk1.get(chunkPosition);
-            final int hash = hash(k0, k1);
-            final int tableLocation = hashToTableLocation(tableHashPivot, hash);
-            if (mainOutputPosition.getUnsafe(tableLocation) == EMPTY_OUTPUT_POSITION) {
-                handler.doMissing(chunkPosition);
-            } else if (eq(mainKeySource0.getUnsafe(tableLocation), k0) && eq(mainKeySource1.getUnsafe(tableLocation), k1)) {
-                handler.doMainFound(tableLocation, chunkPosition);
-            } else {
-                int overflowLocation = mainOverflowLocationSource.getUnsafe(tableLocation);
-                if (!findOverflow(handler, k0, k1, chunkPosition, overflowLocation)) {
-                    handler.doMissing(chunkPosition);
-                }
-            }
-        }
-    }
-
-    private static int hash(long k0, byte k1) {
-        int hash = LongChunkHasher.hashInitialSingle(k0);
-        hash = ByteChunkHasher.hashUpdateSingle(hash, k1);
-        return hash;
-    }
-
-    @Override
-    protected void rehashBucket(HashHandler handler, int sourceBucket, int destBucket,
-            int bucketsToAdd) {
-        final int position = mainOutputPosition.getUnsafe(sourceBucket);
-        if (position == EMPTY_OUTPUT_POSITION) {
-            return;
-        }
-        int mainInsertLocation = maybeMoveMainBucket(handler, sourceBucket, destBucket, bucketsToAdd);
-        int overflowLocation = mainOverflowLocationSource.getUnsafe(sourceBucket);
-        mainOverflowLocationSource.set(sourceBucket, QueryConstants.NULL_INT);
-        mainOverflowLocationSource.set(destBucket, QueryConstants.NULL_INT);
-        while (overflowLocation != QueryConstants.NULL_INT) {
-            final int nextOverflowLocation = overflowOverflowLocationSource.getUnsafe(overflowLocation);
-            final long overflowKey0 = overflowKeySource0.getUnsafe(overflowLocation);
-            final byte overflowKey1 = overflowKeySource1.getUnsafe(overflowLocation);
-            final int overflowHash = hash(overflowKey0, overflowKey1);
-            final int overflowTableLocation = hashToTableLocation(tableHashPivot + bucketsToAdd, overflowHash);
-            if (overflowTableLocation == mainInsertLocation) {
-                mainKeySource0.set(mainInsertLocation, overflowKey0);
-                mainKeySource1.set(mainInsertLocation, overflowKey1);
-                mainOutputPosition.set(mainInsertLocation, overflowOutputPosition.getUnsafe(overflowLocation));
-                handler.doPromoteOverflow(overflowLocation, mainInsertLocation);
-                overflowOutputPosition.set(overflowLocation, QueryConstants.NULL_INT);
-                overflowKeySource0.set(overflowLocation, QueryConstants.NULL_LONG);
-                overflowKeySource1.set(overflowLocation, QueryConstants.NULL_BYTE);
-                freeOverflowLocation(overflowLocation);
-                mainInsertLocation = -1;
-            } else {
-                final int oldOverflowLocation = mainOverflowLocationSource.getUnsafe(overflowTableLocation);
-                mainOverflowLocationSource.set(overflowTableLocation, overflowLocation);
-                overflowOverflowLocationSource.set(overflowLocation, oldOverflowLocation);
-            }
-            overflowLocation = nextOverflowLocation;
-        }
-    }
-
-    private int maybeMoveMainBucket(HashHandler handler, int sourceBucket, int destBucket,
-            int bucketsToAdd) {
-        final long k0 = mainKeySource0.getUnsafe(sourceBucket);
-        final byte k1 = mainKeySource1.getUnsafe(sourceBucket);
-        final int hash = hash(k0, k1);
-        final int location = hashToTableLocation(tableHashPivot + bucketsToAdd, hash);
-        final int mainInsertLocation;
-        if (location == sourceBucket) {
-            mainInsertLocation = destBucket;
-            mainOutputPosition.set(destBucket, EMPTY_OUTPUT_POSITION);
-        } else {
-            mainInsertLocation = sourceBucket;
-            mainOutputPosition.set(destBucket, mainOutputPosition.getUnsafe(sourceBucket));
-            mainOutputPosition.set(sourceBucket, EMPTY_OUTPUT_POSITION);
-            mainKeySource0.set(destBucket, k0);
-            mainKeySource0.set(sourceBucket, QueryConstants.NULL_LONG);
-            mainKeySource1.set(destBucket, k1);
-            mainKeySource1.set(sourceBucket, QueryConstants.NULL_BYTE);
-            handler.doMoveMain(sourceBucket, destBucket);
-        }
-        return mainInsertLocation;
-    }
-
-    private boolean findOverflow(HashHandler handler, long k0, byte k1, int chunkPosition,
-            int overflowLocation) {
-        while (overflowLocation != QueryConstants.NULL_INT) {
-            if (eq(overflowKeySource0.getUnsafe(overflowLocation), k0) && eq(overflowKeySource1.getUnsafe(overflowLocation), k1)) {
-                handler.doOverflowFound(overflowLocation, chunkPosition);
-                return true;
-            }
-            overflowLocation = overflowOverflowLocationSource.getUnsafe(overflowLocation);
-        }
-        return false;
-    }
-
-    @Override
-    public int findPositionForKey(Object key) {
-        final Object [] ka = (Object[])key;
-        final long k0 = TypeUtils.unbox((Long)ka[0]);
-        final byte k1 = TypeUtils.unbox((Byte)ka[1]);
-        int hash = hash(k0, k1);
-        final int tableLocation = hashToTableLocation(tableHashPivot, hash);
-        final int positionValue = mainOutputPosition.getUnsafe(tableLocation);
-        if (positionValue == EMPTY_OUTPUT_POSITION) {
-            return -1;
-        }
-        if (eq(mainKeySource0.getUnsafe(tableLocation), k0) && eq(mainKeySource1.getUnsafe(tableLocation), k1)) {
-            return positionValue;
-        }
-        int overflowLocation = mainOverflowLocationSource.getUnsafe(tableLocation);
-        while (overflowLocation != QueryConstants.NULL_INT) {
-            if (eq(overflowKeySource0.getUnsafe(overflowLocation), k0) && eq(overflowKeySource1.getUnsafe(overflowLocation), k1)) {
-                return overflowOutputPosition.getUnsafe(overflowLocation);
-            }
-            overflowLocation = overflowOverflowLocationSource.getUnsafe(overflowLocation);
-        }
-        return -1;
-    }
-}
diff --git a/engine/table/src/main/java/io/deephaven/engine/table/impl/by/typed/staticagg/gen/StaticAggHasherLongChar.java b/engine/table/src/main/java/io/deephaven/engine/table/impl/by/typed/staticagg/gen/StaticAggHasherLongChar.java
deleted file mode 100644
index e4e31942bac..00000000000
--- a/engine/table/src/main/java/io/deephaven/engine/table/impl/by/typed/staticagg/gen/StaticAggHasherLongChar.java
+++ /dev/null
@@ -1,206 +0,0 @@
-//
-// Copyright (c) 2016-2024 Deephaven Data Labs and Patent Pending
-//
-// ****** AUTO-GENERATED CLASS - DO NOT EDIT MANUALLY
-// ****** Run ReplicateTypedHashers or ./gradlew replicateTypedHashers to regenerate
-//
-// @formatter:off
-package io.deephaven.engine.table.impl.by.typed.staticagg.gen;
-
-import static io.deephaven.util.compare.CharComparisons.eq;
-import static io.deephaven.util.compare.LongComparisons.eq;
-
-import io.deephaven.chunk.CharChunk;
-import io.deephaven.chunk.Chunk;
-import io.deephaven.chunk.LongChunk;
-import io.deephaven.chunk.attributes.Values;
-import io.deephaven.chunk.util.hashing.CharChunkHasher;
-import io.deephaven.chunk.util.hashing.LongChunkHasher;
-import io.deephaven.engine.rowset.RowSequence;
-import io.deephaven.engine.table.ColumnSource;
-import io.deephaven.engine.table.impl.by.HashHandler;
-import io.deephaven.engine.table.impl.by.StaticChunkedOperatorAggregationStateManagerTypedBase;
-import io.deephaven.engine.table.impl.sources.CharacterArraySource;
-import io.deephaven.engine.table.impl.sources.LongArraySource;
-import io.deephaven.util.QueryConstants;
-import io.deephaven.util.type.TypeUtils;
-import java.lang.Character;
-import java.lang.Long;
-import java.lang.Object;
-import java.lang.Override;
-
-final class StaticAggHasherLongChar extends StaticChunkedOperatorAggregationStateManagerTypedBase {
-    private final LongArraySource mainKeySource0;
-
-    private final LongArraySource overflowKeySource0;
-
-    private final CharacterArraySource mainKeySource1;
-
-    private final CharacterArraySource overflowKeySource1;
-
-    public StaticAggHasherLongChar(ColumnSource[] tableKeySources,
-            ColumnSource[] originalTableKeySources, int tableSize, double maximumLoadFactor,
-            double targetLoadFactor) {
-        super(tableKeySources, tableSize, maximumLoadFactor, targetLoadFactor);
-        this.mainKeySource0 = (LongArraySource) super.mainKeySources[0];
-        this.overflowKeySource0 = (LongArraySource) super.overflowKeySources[0];
-        this.mainKeySource1 = (CharacterArraySource) super.mainKeySources[1];
-        this.overflowKeySource1 = (CharacterArraySource) super.overflowKeySources[1];
-    }
-
-    @Override
-    protected void build(HashHandler handler, RowSequence rowSequence, Chunk[] sourceKeyChunks) {
-        final LongChunk<Values> keyChunk0 = sourceKeyChunks[0].asLongChunk();
-        final CharChunk<Values> keyChunk1 = sourceKeyChunks[1].asCharChunk();
-        final int chunkSize = keyChunk0.size();
-        for (int chunkPosition = 0; chunkPosition < chunkSize; ++chunkPosition) {
-            final long k0 = keyChunk0.get(chunkPosition);
-            final char k1 = keyChunk1.get(chunkPosition);
-            final int hash = hash(k0, k1);
-            final int tableLocation = hashToTableLocation(tableHashPivot, hash);
-            if (mainOutputPosition.getUnsafe(tableLocation) == EMPTY_OUTPUT_POSITION) {
-                numEntries++;
-                mainKeySource0.set(tableLocation, k0);
-                mainKeySource1.set(tableLocation, k1);
-                handler.doMainInsert(tableLocation, chunkPosition);
-            } else if (eq(mainKeySource0.getUnsafe(tableLocation), k0) && eq(mainKeySource1.getUnsafe(tableLocation), k1)) {
-                handler.doMainFound(tableLocation, chunkPosition);
-            } else {
-                int overflowLocation = mainOverflowLocationSource.getUnsafe(tableLocation);
-                if (!findOverflow(handler, k0, k1, chunkPosition, overflowLocation)) {
-                    final int newOverflowLocation = allocateOverflowLocation();
-                    overflowKeySource0.set(newOverflowLocation, k0);
-                    overflowKeySource1.set(newOverflowLocation, k1);
-                    mainOverflowLocationSource.set(tableLocation, newOverflowLocation);
-                    overflowOverflowLocationSource.set(newOverflowLocation, overflowLocation);
-                    numEntries++;
-                    handler.doOverflowInsert(newOverflowLocation, chunkPosition);
-                }
-            }
-        }
-    }
-
-    @Override
-    protected void probe(HashHandler handler, RowSequence rowSequence, Chunk[] sourceKeyChunks) {
-        final LongChunk<Values> keyChunk0 = sourceKeyChunks[0].asLongChunk();
-        final CharChunk<Values> keyChunk1 = sourceKeyChunks[1].asCharChunk();
-        final int chunkSize = keyChunk0.size();
-        for (int chunkPosition = 0; chunkPosition < chunkSize; ++chunkPosition) {
-            final long k0 = keyChunk0.get(chunkPosition);
-            final char k1 = keyChunk1.get(chunkPosition);
-            final int hash = hash(k0, k1);
-            final int tableLocation = hashToTableLocation(tableHashPivot, hash);
-            if (mainOutputPosition.getUnsafe(tableLocation) == EMPTY_OUTPUT_POSITION) {
-                handler.doMissing(chunkPosition);
-            } else if (eq(mainKeySource0.getUnsafe(tableLocation), k0) && eq(mainKeySource1.getUnsafe(tableLocation), k1)) {
-                handler.doMainFound(tableLocation, chunkPosition);
-            } else {
-                int overflowLocation = mainOverflowLocationSource.getUnsafe(tableLocation);
-                if (!findOverflow(handler, k0, k1, chunkPosition, overflowLocation)) {
-                    handler.doMissing(chunkPosition);
-                }
-            }
-        }
-    }
-
-    private static int hash(long k0, char k1) {
-        int hash = LongChunkHasher.hashInitialSingle(k0);
-        hash = CharChunkHasher.hashUpdateSingle(hash, k1);
-        return hash;
-    }
-
-    @Override
-    protected void rehashBucket(HashHandler handler, int sourceBucket, int destBucket,
-            int bucketsToAdd) {
-        final int position = mainOutputPosition.getUnsafe(sourceBucket);
-        if (position == EMPTY_OUTPUT_POSITION) {
-            return;
-        }
-        int mainInsertLocation = maybeMoveMainBucket(handler, sourceBucket, destBucket, bucketsToAdd);
-        int overflowLocation = mainOverflowLocationSource.getUnsafe(sourceBucket);
-        mainOverflowLocationSource.set(sourceBucket, QueryConstants.NULL_INT);
-        mainOverflowLocationSource.set(destBucket, QueryConstants.NULL_INT);
-        while (overflowLocation != QueryConstants.NULL_INT) {
-            final int nextOverflowLocation = overflowOverflowLocationSource.getUnsafe(overflowLocation);
-            final long overflowKey0 = overflowKeySource0.getUnsafe(overflowLocation);
-            final char overflowKey1 = overflowKeySource1.getUnsafe(overflowLocation);
-            final int overflowHash = hash(overflowKey0, overflowKey1);
-            final int overflowTableLocation = hashToTableLocation(tableHashPivot + bucketsToAdd, overflowHash);
-            if (overflowTableLocation == mainInsertLocation) {
-                mainKeySource0.set(mainInsertLocation, overflowKey0);
-                mainKeySource1.set(mainInsertLocation, overflowKey1);
-                mainOutputPosition.set(mainInsertLocation, overflowOutputPosition.getUnsafe(overflowLocation));
-                handler.doPromoteOverflow(overflowLocation, mainInsertLocation);
-                overflowOutputPosition.set(overflowLocation, QueryConstants.NULL_INT);
-                overflowKeySource0.set(overflowLocation, QueryConstants.NULL_LONG);
-                overflowKeySource1.set(overflowLocation, QueryConstants.NULL_CHAR);
-                freeOverflowLocation(overflowLocation);
-                mainInsertLocation = -1;
-            } else {
-                final int oldOverflowLocation = mainOverflowLocationSource.getUnsafe(overflowTableLocation);
-                mainOverflowLocationSource.set(overflowTableLocation, overflowLocation);
-                overflowOverflowLocationSource.set(overflowLocation, oldOverflowLocation);
-            }
-            overflowLocation = nextOverflowLocation;
-        }
-    }
-
-    private int maybeMoveMainBucket(HashHandler handler, int sourceBucket, int destBucket,
-            int bucketsToAdd) {
-        final long k0 = mainKeySource0.getUnsafe(sourceBucket);
-        final char k1 = mainKeySource1.getUnsafe(sourceBucket);
-        final int hash = hash(k0, k1);
-        final int location = hashToTableLocation(tableHashPivot + bucketsToAdd, hash);
-        final int mainInsertLocation;
-        if (location == sourceBucket) {
-            mainInsertLocation = destBucket;
-            mainOutputPosition.set(destBucket, EMPTY_OUTPUT_POSITION);
-        } else {
-            mainInsertLocation = sourceBucket;
-            mainOutputPosition.set(destBucket, mainOutputPosition.getUnsafe(sourceBucket));
-            mainOutputPosition.set(sourceBucket, EMPTY_OUTPUT_POSITION);
-            mainKeySource0.set(destBucket, k0);
-            mainKeySource0.set(sourceBucket, QueryConstants.NULL_LONG);
-            mainKeySource1.set(destBucket, k1);
-            mainKeySource1.set(sourceBucket, QueryConstants.NULL_CHAR);
-            handler.doMoveMain(sourceBucket, destBucket);
-        }
-        return mainInsertLocation;
-    }
-
-    private boolean findOverflow(HashHandler handler, long k0, char k1, int chunkPosition,
-            int overflowLocation) {
-        while (overflowLocation != QueryConstants.NULL_INT) {
-            if (eq(overflowKeySource0.getUnsafe(overflowLocation), k0) && eq(overflowKeySource1.getUnsafe(overflowLocation), k1)) {
-                handler.doOverflowFound(overflowLocation, chunkPosition);
-                return true;
-            }
-            overflowLocation = overflowOverflowLocationSource.getUnsafe(overflowLocation);
-        }
-        return false;
-    }
-
-    @Override
-    public int findPositionForKey(Object key) {
-        final Object [] ka = (Object[])key;
-        final long k0 = TypeUtils.unbox((Long)ka[0]);
-        final char k1 = TypeUtils.unbox((Character)ka[1]);
-        int hash = hash(k0, k1);
-        final int tableLocation = hashToTableLocation(tableHashPivot, hash);
-        final int positionValue = mainOutputPosition.getUnsafe(tableLocation);
-        if (positionValue == EMPTY_OUTPUT_POSITION) {
-            return -1;
-        }
-        if (eq(mainKeySource0.getUnsafe(tableLocation), k0) && eq(mainKeySource1.getUnsafe(tableLocation), k1)) {
-            return positionValue;
-        }
-        int overflowLocation = mainOverflowLocationSource.getUnsafe(tableLocation);
-        while (overflowLocation != QueryConstants.NULL_INT) {
-            if (eq(overflowKeySource0.getUnsafe(overflowLocation), k0) && eq(overflowKeySource1.getUnsafe(overflowLocation), k1)) {
-                return overflowOutputPosition.getUnsafe(overflowLocation);
-            }
-            overflowLocation = overflowOverflowLocationSource.getUnsafe(overflowLocation);
-        }
-        return -1;
-    }
-}
diff --git a/engine/table/src/main/java/io/deephaven/engine/table/impl/by/typed/staticagg/gen/StaticAggHasherLongDouble.java b/engine/table/src/main/java/io/deephaven/engine/table/impl/by/typed/staticagg/gen/StaticAggHasherLongDouble.java
deleted file mode 100644
index b78abaa3948..00000000000
--- a/engine/table/src/main/java/io/deephaven/engine/table/impl/by/typed/staticagg/gen/StaticAggHasherLongDouble.java
+++ /dev/null
@@ -1,206 +0,0 @@
-//
-// Copyright (c) 2016-2024 Deephaven Data Labs and Patent Pending
-//
-// ****** AUTO-GENERATED CLASS - DO NOT EDIT MANUALLY
-// ****** Run ReplicateTypedHashers or ./gradlew replicateTypedHashers to regenerate
-//
-// @formatter:off
-package io.deephaven.engine.table.impl.by.typed.staticagg.gen;
-
-import static io.deephaven.util.compare.DoubleComparisons.eq;
-import static io.deephaven.util.compare.LongComparisons.eq;
-
-import io.deephaven.chunk.Chunk;
-import io.deephaven.chunk.DoubleChunk;
-import io.deephaven.chunk.LongChunk;
-import io.deephaven.chunk.attributes.Values;
-import io.deephaven.chunk.util.hashing.DoubleChunkHasher;
-import io.deephaven.chunk.util.hashing.LongChunkHasher;
-import io.deephaven.engine.rowset.RowSequence;
-import io.deephaven.engine.table.ColumnSource;
-import io.deephaven.engine.table.impl.by.HashHandler;
-import io.deephaven.engine.table.impl.by.StaticChunkedOperatorAggregationStateManagerTypedBase;
-import io.deephaven.engine.table.impl.sources.DoubleArraySource;
-import io.deephaven.engine.table.impl.sources.LongArraySource;
-import io.deephaven.util.QueryConstants;
-import io.deephaven.util.type.TypeUtils;
-import java.lang.Double;
-import java.lang.Long;
-import java.lang.Object;
-import java.lang.Override;
-
-final class StaticAggHasherLongDouble extends StaticChunkedOperatorAggregationStateManagerTypedBase {
-    private final LongArraySource mainKeySource0;
-
-    private final LongArraySource overflowKeySource0;
-
-    private final DoubleArraySource mainKeySource1;
-
-    private final DoubleArraySource overflowKeySource1;
-
-    public StaticAggHasherLongDouble(ColumnSource[] tableKeySources,
-            ColumnSource[] originalTableKeySources, int tableSize, double maximumLoadFactor,
-            double targetLoadFactor) {
-        super(tableKeySources, tableSize, maximumLoadFactor, targetLoadFactor);
-        this.mainKeySource0 = (LongArraySource) super.mainKeySources[0];
-        this.overflowKeySource0 = (LongArraySource) super.overflowKeySources[0];
-        this.mainKeySource1 = (DoubleArraySource) super.mainKeySources[1];
-        this.overflowKeySource1 = (DoubleArraySource) super.overflowKeySources[1];
-    }
-
-    @Override
-    protected void build(HashHandler handler, RowSequence rowSequence, Chunk[] sourceKeyChunks) {
-        final LongChunk<Values> keyChunk0 = sourceKeyChunks[0].asLongChunk();
-        final DoubleChunk<Values> keyChunk1 = sourceKeyChunks[1].asDoubleChunk();
-        final int chunkSize = keyChunk0.size();
-        for (int chunkPosition = 0; chunkPosition < chunkSize; ++chunkPosition) {
-            final long k0 = keyChunk0.get(chunkPosition);
-            final double k1 = keyChunk1.get(chunkPosition);
-            final int hash = hash(k0, k1);
-            final int tableLocation = hashToTableLocation(tableHashPivot, hash);
-            if (mainOutputPosition.getUnsafe(tableLocation) == EMPTY_OUTPUT_POSITION) {
-                numEntries++;
-                mainKeySource0.set(tableLocation, k0);
-                mainKeySource1.set(tableLocation, k1);
-                handler.doMainInsert(tableLocation, chunkPosition);
-            } else if (eq(mainKeySource0.getUnsafe(tableLocation), k0) && eq(mainKeySource1.getUnsafe(tableLocation), k1)) {
-                handler.doMainFound(tableLocation, chunkPosition);
-            } else {
-                int overflowLocation = mainOverflowLocationSource.getUnsafe(tableLocation);
-                if (!findOverflow(handler, k0, k1, chunkPosition, overflowLocation)) {
-                    final int newOverflowLocation = allocateOverflowLocation();
-                    overflowKeySource0.set(newOverflowLocation, k0);
-                    overflowKeySource1.set(newOverflowLocation, k1);
-                    mainOverflowLocationSource.set(tableLocation, newOverflowLocation);
-                    overflowOverflowLocationSource.set(newOverflowLocation, overflowLocation);
-                    numEntries++;
-                    handler.doOverflowInsert(newOverflowLocation, chunkPosition);
-                }
-            }
-        }
-    }
-
-    @Override
-    protected void probe(HashHandler handler, RowSequence rowSequence, Chunk[] sourceKeyChunks) {
-        final LongChunk<Values> keyChunk0 = sourceKeyChunks[0].asLongChunk();
-        final DoubleChunk<Values> keyChunk1 = sourceKeyChunks[1].asDoubleChunk();
-        final int chunkSize = keyChunk0.size();
-        for (int chunkPosition = 0; chunkPosition < chunkSize; ++chunkPosition) {
-            final long k0 = keyChunk0.get(chunkPosition);
-            final double k1 = keyChunk1.get(chunkPosition);
-            final int hash = hash(k0, k1);
-            final int tableLocation = hashToTableLocation(tableHashPivot, hash);
-            if (mainOutputPosition.getUnsafe(tableLocation) == EMPTY_OUTPUT_POSITION) {
-                handler.doMissing(chunkPosition);
-            } else if (eq(mainKeySource0.getUnsafe(tableLocation), k0) && eq(mainKeySource1.getUnsafe(tableLocation), k1)) {
-                handler.doMainFound(tableLocation, chunkPosition);
-            } else {
-                int overflowLocation = mainOverflowLocationSource.getUnsafe(tableLocation);
-                if (!findOverflow(handler, k0, k1, chunkPosition, overflowLocation)) {
-                    handler.doMissing(chunkPosition);
-                }
-            }
-        }
-    }
-
-    private static int hash(long k0, double k1) {
-        int hash = LongChunkHasher.hashInitialSingle(k0);
-        hash = DoubleChunkHasher.hashUpdateSingle(hash, k1);
-        return hash;
-    }
-
-    @Override
-    protected void rehashBucket(HashHandler handler, int sourceBucket, int destBucket,
-            int bucketsToAdd) {
-        final int position = mainOutputPosition.getUnsafe(sourceBucket);
-        if (position == EMPTY_OUTPUT_POSITION) {
-            return;
-        }
-        int mainInsertLocation = maybeMoveMainBucket(handler, sourceBucket, destBucket, bucketsToAdd);
-        int overflowLocation = mainOverflowLocationSource.getUnsafe(sourceBucket);
-        mainOverflowLocationSource.set(sourceBucket, QueryConstants.NULL_INT);
-        mainOverflowLocationSource.set(destBucket, QueryConstants.NULL_INT);
-        while (overflowLocation != QueryConstants.NULL_INT) {
-            final int nextOverflowLocation = overflowOverflowLocationSource.getUnsafe(overflowLocation);
-            final long overflowKey0 = overflowKeySource0.getUnsafe(overflowLocation);
-            final double overflowKey1 = overflowKeySource1.getUnsafe(overflowLocation);
-            final int overflowHash = hash(overflowKey0, overflowKey1);
-            final int overflowTableLocation = hashToTableLocation(tableHashPivot + bucketsToAdd, overflowHash);
-            if (overflowTableLocation == mainInsertLocation) {
-                mainKeySource0.set(mainInsertLocation, overflowKey0);
-                mainKeySource1.set(mainInsertLocation, overflowKey1);
-                mainOutputPosition.set(mainInsertLocation, overflowOutputPosition.getUnsafe(overflowLocation));
-                handler.doPromoteOverflow(overflowLocation, mainInsertLocation);
-                overflowOutputPosition.set(overflowLocation, QueryConstants.NULL_INT);
-                overflowKeySource0.set(overflowLocation, QueryConstants.NULL_LONG);
-                overflowKeySource1.set(overflowLocation, QueryConstants.NULL_DOUBLE);
-                freeOverflowLocation(overflowLocation);
-                mainInsertLocation = -1;
-            } else {
-                final int oldOverflowLocation = mainOverflowLocationSource.getUnsafe(overflowTableLocation);
-                mainOverflowLocationSource.set(overflowTableLocation, overflowLocation);
-                overflowOverflowLocationSource.set(overflowLocation, oldOverflowLocation);
-            }
-            overflowLocation = nextOverflowLocation;
-        }
-    }
-
-    private int maybeMoveMainBucket(HashHandler handler, int sourceBucket, int destBucket,
-            int bucketsToAdd) {
-        final long k0 = mainKeySource0.getUnsafe(sourceBucket);
-        final double k1 = mainKeySource1.getUnsafe(sourceBucket);
-        final int hash = hash(k0, k1);
-        final int location = hashToTableLocation(tableHashPivot + bucketsToAdd, hash);
-        final int mainInsertLocation;
-        if (location == sourceBucket) {
-            mainInsertLocation = destBucket;
-            mainOutputPosition.set(destBucket, EMPTY_OUTPUT_POSITION);
-        } else {
-            mainInsertLocation = sourceBucket;
-            mainOutputPosition.set(destBucket, mainOutputPosition.getUnsafe(sourceBucket));
-            mainOutputPosition.set(sourceBucket, EMPTY_OUTPUT_POSITION);
-            mainKeySource0.set(destBucket, k0);
-            mainKeySource0.set(sourceBucket, QueryConstants.NULL_LONG);
-            mainKeySource1.set(destBucket, k1);
-            mainKeySource1.set(sourceBucket, QueryConstants.NULL_DOUBLE);
-            handler.doMoveMain(sourceBucket, destBucket);
-        }
-        return mainInsertLocation;
-    }
-
-    private boolean findOverflow(HashHandler handler, long k0, double k1, int chunkPosition,
-            int overflowLocation) {
-        while (overflowLocation != QueryConstants.NULL_INT) {
-            if (eq(overflowKeySource0.getUnsafe(overflowLocation), k0) && eq(overflowKeySource1.getUnsafe(overflowLocation), k1)) {
-                handler.doOverflowFound(overflowLocation, chunkPosition);
-                return true;
-            }
-            overflowLocation = overflowOverflowLocationSource.getUnsafe(overflowLocation);
-        }
-        return false;
-    }
-
-    @Override
-    public int findPositionForKey(Object key) {
-        final Object [] ka = (Object[])key;
-        final long k0 = TypeUtils.unbox((Long)ka[0]);
-        final double k1 = TypeUtils.unbox((Double)ka[1]);
-        int hash = hash(k0, k1);
-        final int tableLocation = hashToTableLocation(tableHashPivot, hash);
-        final int positionValue = mainOutputPosition.getUnsafe(tableLocation);
-        if (positionValue == EMPTY_OUTPUT_POSITION) {
-            return -1;
-        }
-        if (eq(mainKeySource0.getUnsafe(tableLocation), k0) && eq(mainKeySource1.getUnsafe(tableLocation), k1)) {
-            return positionValue;
-        }
-        int overflowLocation = mainOverflowLocationSource.getUnsafe(tableLocation);
-        while (overflowLocation != QueryConstants.NULL_INT) {
-            if (eq(overflowKeySource0.getUnsafe(overflowLocation), k0) && eq(overflowKeySource1.getUnsafe(overflowLocation), k1)) {
-                return overflowOutputPosition.getUnsafe(overflowLocation);
-            }
-            overflowLocation = overflowOverflowLocationSource.getUnsafe(overflowLocation);
-        }
-        return -1;
-    }
-}
diff --git a/engine/table/src/main/java/io/deephaven/engine/table/impl/by/typed/staticagg/gen/StaticAggHasherLongFloat.java b/engine/table/src/main/java/io/deephaven/engine/table/impl/by/typed/staticagg/gen/StaticAggHasherLongFloat.java
deleted file mode 100644
index fa7eb31c02c..00000000000
--- a/engine/table/src/main/java/io/deephaven/engine/table/impl/by/typed/staticagg/gen/StaticAggHasherLongFloat.java
+++ /dev/null
@@ -1,206 +0,0 @@
-//
-// Copyright (c) 2016-2024 Deephaven Data Labs and Patent Pending
-//
-// ****** AUTO-GENERATED CLASS - DO NOT EDIT MANUALLY
-// ****** Run ReplicateTypedHashers or ./gradlew replicateTypedHashers to regenerate
-//
-// @formatter:off
-package io.deephaven.engine.table.impl.by.typed.staticagg.gen;
-
-import static io.deephaven.util.compare.FloatComparisons.eq;
-import static io.deephaven.util.compare.LongComparisons.eq;
-
-import io.deephaven.chunk.Chunk;
-import io.deephaven.chunk.FloatChunk;
-import io.deephaven.chunk.LongChunk;
-import io.deephaven.chunk.attributes.Values;
-import io.deephaven.chunk.util.hashing.FloatChunkHasher;
-import io.deephaven.chunk.util.hashing.LongChunkHasher;
-import io.deephaven.engine.rowset.RowSequence;
-import io.deephaven.engine.table.ColumnSource;
-import io.deephaven.engine.table.impl.by.HashHandler;
-import io.deephaven.engine.table.impl.by.StaticChunkedOperatorAggregationStateManagerTypedBase;
-import io.deephaven.engine.table.impl.sources.FloatArraySource;
-import io.deephaven.engine.table.impl.sources.LongArraySource;
-import io.deephaven.util.QueryConstants;
-import io.deephaven.util.type.TypeUtils;
-import java.lang.Float;
-import java.lang.Long;
-import java.lang.Object;
-import java.lang.Override;
-
-final class StaticAggHasherLongFloat extends StaticChunkedOperatorAggregationStateManagerTypedBase {
-    private final LongArraySource mainKeySource0;
-
-    private final LongArraySource overflowKeySource0;
-
-    private final FloatArraySource mainKeySource1;
-
-    private final FloatArraySource overflowKeySource1;
-
-    public StaticAggHasherLongFloat(ColumnSource[] tableKeySources,
-            ColumnSource[] originalTableKeySources, int tableSize, double maximumLoadFactor,
-            double targetLoadFactor) {
-        super(tableKeySources, tableSize, maximumLoadFactor, targetLoadFactor);
-        this.mainKeySource0 = (LongArraySource) super.mainKeySources[0];
-        this.overflowKeySource0 = (LongArraySource) super.overflowKeySources[0];
-        this.mainKeySource1 = (FloatArraySource) super.mainKeySources[1];
-        this.overflowKeySource1 = (FloatArraySource) super.overflowKeySources[1];
-    }
-
-    @Override
-    protected void build(HashHandler handler, RowSequence rowSequence, Chunk[] sourceKeyChunks) {
-        final LongChunk<Values> keyChunk0 = sourceKeyChunks[0].asLongChunk();
-        final FloatChunk<Values> keyChunk1 = sourceKeyChunks[1].asFloatChunk();
-        final int chunkSize = keyChunk0.size();
-        for (int chunkPosition = 0; chunkPosition < chunkSize; ++chunkPosition) {
-            final long k0 = keyChunk0.get(chunkPosition);
-            final float k1 = keyChunk1.get(chunkPosition);
-            final int hash = hash(k0, k1);
-            final int tableLocation = hashToTableLocation(tableHashPivot, hash);
-            if (mainOutputPosition.getUnsafe(tableLocation) == EMPTY_OUTPUT_POSITION) {
-                numEntries++;
-                mainKeySource0.set(tableLocation, k0);
-                mainKeySource1.set(tableLocation, k1);
-                handler.doMainInsert(tableLocation, chunkPosition);
-            } else if (eq(mainKeySource0.getUnsafe(tableLocation), k0) && eq(mainKeySource1.getUnsafe(tableLocation), k1)) {
-                handler.doMainFound(tableLocation, chunkPosition);
-            } else {
-                int overflowLocation = mainOverflowLocationSource.getUnsafe(tableLocation);
-                if (!findOverflow(handler, k0, k1, chunkPosition, overflowLocation)) {
-                    final int newOverflowLocation = allocateOverflowLocation();
-                    overflowKeySource0.set(newOverflowLocation, k0);
-                    overflowKeySource1.set(newOverflowLocation, k1);
-                    mainOverflowLocationSource.set(tableLocation, newOverflowLocation);
-                    overflowOverflowLocationSource.set(newOverflowLocation, overflowLocation);
-                    numEntries++;
-                    handler.doOverflowInsert(newOverflowLocation, chunkPosition);
-                }
-            }
-        }
-    }
-
-    @Override
-    protected void probe(HashHandler handler, RowSequence rowSequence, Chunk[] sourceKeyChunks) {
-        final LongChunk<Values> keyChunk0 = sourceKeyChunks[0].asLongChunk();
-        final FloatChunk<Values> keyChunk1 = sourceKeyChunks[1].asFloatChunk();
-        final int chunkSize = keyChunk0.size();
-        for (int chunkPosition = 0; chunkPosition < chunkSize; ++chunkPosition) {
-            final long k0 = keyChunk0.get(chunkPosition);
-            final float k1 = keyChunk1.get(chunkPosition);
-            final int hash = hash(k0, k1);
-            final int tableLocation = hashToTableLocation(tableHashPivot, hash);
-            if (mainOutputPosition.getUnsafe(tableLocation) == EMPTY_OUTPUT_POSITION) {
-                handler.doMissing(chunkPosition);
-            } else if (eq(mainKeySource0.getUnsafe(tableLocation), k0) && eq(mainKeySource1.getUnsafe(tableLocation), k1)) {
-                handler.doMainFound(tableLocation, chunkPosition);
-            } else {
-                int overflowLocation = mainOverflowLocationSource.getUnsafe(tableLocation);
-                if (!findOverflow(handler, k0, k1, chunkPosition, overflowLocation)) {
-                    handler.doMissing(chunkPosition);
-                }
-            }
-        }
-    }
-
-    private static int hash(long k0, float k1) {
-        int hash = LongChunkHasher.hashInitialSingle(k0);
-        hash = FloatChunkHasher.hashUpdateSingle(hash, k1);
-        return hash;
-    }
-
-    @Override
-    protected void rehashBucket(HashHandler handler, int sourceBucket, int destBucket,
-            int bucketsToAdd) {
-        final int position = mainOutputPosition.getUnsafe(sourceBucket);
-        if (position == EMPTY_OUTPUT_POSITION) {
-            return;
-        }
-        int mainInsertLocation = maybeMoveMainBucket(handler, sourceBucket, destBucket, bucketsToAdd);
-        int overflowLocation = mainOverflowLocationSource.getUnsafe(sourceBucket);
-        mainOverflowLocationSource.set(sourceBucket, QueryConstants.NULL_INT);
-        mainOverflowLocationSource.set(destBucket, QueryConstants.NULL_INT);
-        while (overflowLocation != QueryConstants.NULL_INT) {
-            final int nextOverflowLocation = overflowOverflowLocationSource.getUnsafe(overflowLocation);
-            final long overflowKey0 = overflowKeySource0.getUnsafe(overflowLocation);
-            final float overflowKey1 = overflowKeySource1.getUnsafe(overflowLocation);
-            final int overflowHash = hash(overflowKey0, overflowKey1);
-            final int overflowTableLocation = hashToTableLocation(tableHashPivot + bucketsToAdd, overflowHash);
-            if (overflowTableLocation == mainInsertLocation) {
-                mainKeySource0.set(mainInsertLocation, overflowKey0);
-                mainKeySource1.set(mainInsertLocation, overflowKey1);
-                mainOutputPosition.set(mainInsertLocation, overflowOutputPosition.getUnsafe(overflowLocation));
-                handler.doPromoteOverflow(overflowLocation, mainInsertLocation);
-                overflowOutputPosition.set(overflowLocation, QueryConstants.NULL_INT);
-                overflowKeySource0.set(overflowLocation, QueryConstants.NULL_LONG);
-                overflowKeySource1.set(overflowLocation, QueryConstants.NULL_FLOAT);
-                freeOverflowLocation(overflowLocation);
-                mainInsertLocation = -1;
-            } else {
-                final int oldOverflowLocation = mainOverflowLocationSource.getUnsafe(overflowTableLocation);
-                mainOverflowLocationSource.set(overflowTableLocation, overflowLocation);
-                overflowOverflowLocationSource.set(overflowLocation, oldOverflowLocation);
-            }
-            overflowLocation = nextOverflowLocation;
-        }
-    }
-
-    private int maybeMoveMainBucket(HashHandler handler, int sourceBucket, int destBucket,
-            int bucketsToAdd) {
-        final long k0 = mainKeySource0.getUnsafe(sourceBucket);
-        final float k1 = mainKeySource1.getUnsafe(sourceBucket);
-        final int hash = hash(k0, k1);
-        final int location = hashToTableLocation(tableHashPivot + bucketsToAdd, hash);
-        final int mainInsertLocation;
-        if (location == sourceBucket) {
-            mainInsertLocation = destBucket;
-            mainOutputPosition.set(destBucket, EMPTY_OUTPUT_POSITION);
-        } else {
-            mainInsertLocation = sourceBucket;
-            mainOutputPosition.set(destBucket, mainOutputPosition.getUnsafe(sourceBucket));
-            mainOutputPosition.set(sourceBucket, EMPTY_OUTPUT_POSITION);
-            mainKeySource0.set(destBucket, k0);
-            mainKeySource0.set(sourceBucket, QueryConstants.NULL_LONG);
-            mainKeySource1.set(destBucket, k1);
-            mainKeySource1.set(sourceBucket, QueryConstants.NULL_FLOAT);
-            handler.doMoveMain(sourceBucket, destBucket);
-        }
-        return mainInsertLocation;
-    }
-
-    private boolean findOverflow(HashHandler handler, long k0, float k1, int chunkPosition,
-            int overflowLocation) {
-        while (overflowLocation != QueryConstants.NULL_INT) {
-            if (eq(overflowKeySource0.getUnsafe(overflowLocation), k0) && eq(overflowKeySource1.getUnsafe(overflowLocation), k1)) {
-                handler.doOverflowFound(overflowLocation, chunkPosition);
-                return true;
-            }
-            overflowLocation = overflowOverflowLocationSource.getUnsafe(overflowLocation);
-        }
-        return false;
-    }
-
-    @Override
-    public int findPositionForKey(Object key) {
-        final Object [] ka = (Object[])key;
-        final long k0 = TypeUtils.unbox((Long)ka[0]);
-        final float k1 = TypeUtils.unbox((Float)ka[1]);
-        int hash = hash(k0, k1);
-        final int tableLocation = hashToTableLocation(tableHashPivot, hash);
-        final int positionValue = mainOutputPosition.getUnsafe(tableLocation);
-        if (positionValue == EMPTY_OUTPUT_POSITION) {
-            return -1;
-        }
-        if (eq(mainKeySource0.getUnsafe(tableLocation), k0) && eq(mainKeySource1.getUnsafe(tableLocation), k1)) {
-            return positionValue;
-        }
-        int overflowLocation = mainOverflowLocationSource.getUnsafe(tableLocation);
-        while (overflowLocation != QueryConstants.NULL_INT) {
-            if (eq(overflowKeySource0.getUnsafe(overflowLocation), k0) && eq(overflowKeySource1.getUnsafe(overflowLocation), k1)) {
-                return overflowOutputPosition.getUnsafe(overflowLocation);
-            }
-            overflowLocation = overflowOverflowLocationSource.getUnsafe(overflowLocation);
-        }
-        return -1;
-    }
-}
diff --git a/engine/table/src/main/java/io/deephaven/engine/table/impl/by/typed/staticagg/gen/StaticAggHasherLongInt.java b/engine/table/src/main/java/io/deephaven/engine/table/impl/by/typed/staticagg/gen/StaticAggHasherLongInt.java
deleted file mode 100644
index 42ead289abd..00000000000
--- a/engine/table/src/main/java/io/deephaven/engine/table/impl/by/typed/staticagg/gen/StaticAggHasherLongInt.java
+++ /dev/null
@@ -1,206 +0,0 @@
-//
-// Copyright (c) 2016-2024 Deephaven Data Labs and Patent Pending
-//
-// ****** AUTO-GENERATED CLASS - DO NOT EDIT MANUALLY
-// ****** Run ReplicateTypedHashers or ./gradlew replicateTypedHashers to regenerate
-//
-// @formatter:off
-package io.deephaven.engine.table.impl.by.typed.staticagg.gen;
-
-import static io.deephaven.util.compare.IntComparisons.eq;
-import static io.deephaven.util.compare.LongComparisons.eq;
-
-import io.deephaven.chunk.Chunk;
-import io.deephaven.chunk.IntChunk;
-import io.deephaven.chunk.LongChunk;
-import io.deephaven.chunk.attributes.Values;
-import io.deephaven.chunk.util.hashing.IntChunkHasher;
-import io.deephaven.chunk.util.hashing.LongChunkHasher;
-import io.deephaven.engine.rowset.RowSequence;
-import io.deephaven.engine.table.ColumnSource;
-import io.deephaven.engine.table.impl.by.HashHandler;
-import io.deephaven.engine.table.impl.by.StaticChunkedOperatorAggregationStateManagerTypedBase;
-import io.deephaven.engine.table.impl.sources.IntegerArraySource;
-import io.deephaven.engine.table.impl.sources.LongArraySource;
-import io.deephaven.util.QueryConstants;
-import io.deephaven.util.type.TypeUtils;
-import java.lang.Integer;
-import java.lang.Long;
-import java.lang.Object;
-import java.lang.Override;
-
-final class StaticAggHasherLongInt extends StaticChunkedOperatorAggregationStateManagerTypedBase {
-    private final LongArraySource mainKeySource0;
-
-    private final LongArraySource overflowKeySource0;
-
-    private final IntegerArraySource mainKeySource1;
-
-    private final IntegerArraySource overflowKeySource1;
-
-    public StaticAggHasherLongInt(ColumnSource[] tableKeySources,
-            ColumnSource[] originalTableKeySources, int tableSize, double maximumLoadFactor,
-            double targetLoadFactor) {
-        super(tableKeySources, tableSize, maximumLoadFactor, targetLoadFactor);
-        this.mainKeySource0 = (LongArraySource) super.mainKeySources[0];
-        this.overflowKeySource0 = (LongArraySource) super.overflowKeySources[0];
-        this.mainKeySource1 = (IntegerArraySource) super.mainKeySources[1];
-        this.overflowKeySource1 = (IntegerArraySource) super.overflowKeySources[1];
-    }
-
-    @Override
-    protected void build(HashHandler handler, RowSequence rowSequence, Chunk[] sourceKeyChunks) {
-        final LongChunk<Values> keyChunk0 = sourceKeyChunks[0].asLongChunk();
-        final IntChunk<Values> keyChunk1 = sourceKeyChunks[1].asIntChunk();
-        final int chunkSize = keyChunk0.size();
-        for (int chunkPosition = 0; chunkPosition < chunkSize; ++chunkPosition) {
-            final long k0 = keyChunk0.get(chunkPosition);
-            final int k1 = keyChunk1.get(chunkPosition);
-            final int hash = hash(k0, k1);
-            final int tableLocation = hashToTableLocation(tableHashPivot, hash);
-            if (mainOutputPosition.getUnsafe(tableLocation) == EMPTY_OUTPUT_POSITION) {
-                numEntries++;
-                mainKeySource0.set(tableLocation, k0);
-                mainKeySource1.set(tableLocation, k1);
-                handler.doMainInsert(tableLocation, chunkPosition);
-            } else if (eq(mainKeySource0.getUnsafe(tableLocation), k0) && eq(mainKeySource1.getUnsafe(tableLocation), k1)) {
-                handler.doMainFound(tableLocation, chunkPosition);
-            } else {
-                int overflowLocation = mainOverflowLocationSource.getUnsafe(tableLocation);
-                if (!findOverflow(handler, k0, k1, chunkPosition, overflowLocation)) {
-                    final int newOverflowLocation = allocateOverflowLocation();
-                    overflowKeySource0.set(newOverflowLocation, k0);
-                    overflowKeySource1.set(newOverflowLocation, k1);
-                    mainOverflowLocationSource.set(tableLocation, newOverflowLocation);
-                    overflowOverflowLocationSource.set(newOverflowLocation, overflowLocation);
-                    numEntries++;
-                    handler.doOverflowInsert(newOverflowLocation, chunkPosition);
-                }
-            }
-        }
-    }
-
-    @Override
-    protected void probe(HashHandler handler, RowSequence rowSequence, Chunk[] sourceKeyChunks) {
-        final LongChunk<Values> keyChunk0 = sourceKeyChunks[0].asLongChunk();
-        final IntChunk<Values> keyChunk1 = sourceKeyChunks[1].asIntChunk();
-        final int chunkSize = keyChunk0.size();
-        for (int chunkPosition = 0; chunkPosition < chunkSize; ++chunkPosition) {
-            final long k0 = keyChunk0.get(chunkPosition);
-            final int k1 = keyChunk1.get(chunkPosition);
-            final int hash = hash(k0, k1);
-            final int tableLocation = hashToTableLocation(tableHashPivot, hash);
-            if (mainOutputPosition.getUnsafe(tableLocation) == EMPTY_OUTPUT_POSITION) {
-                handler.doMissing(chunkPosition);
-            } else if (eq(mainKeySource0.getUnsafe(tableLocation), k0) && eq(mainKeySource1.getUnsafe(tableLocation), k1)) {
-                handler.doMainFound(tableLocation, chunkPosition);
-            } else {
-                int overflowLocation = mainOverflowLocationSource.getUnsafe(tableLocation);
-                if (!findOverflow(handler, k0, k1, chunkPosition, overflowLocation)) {
-                    handler.doMissing(chunkPosition);
-                }
-            }
-        }
-    }
-
-    private static int hash(long k0, int k1) {
-        int hash = LongChunkHasher.hashInitialSingle(k0);
-        hash = IntChunkHasher.hashUpdateSingle(hash, k1);
-        return hash;
-    }
-
-    @Override
-    protected void rehashBucket(HashHandler handler, int sourceBucket, int destBucket,
-            int bucketsToAdd) {
-        final int position = mainOutputPosition.getUnsafe(sourceBucket);
-        if (position == EMPTY_OUTPUT_POSITION) {
-            return;
-        }
-        int mainInsertLocation = maybeMoveMainBucket(handler, sourceBucket, destBucket, bucketsToAdd);
-        int overflowLocation = mainOverflowLocationSource.getUnsafe(sourceBucket);
-        mainOverflowLocationSource.set(sourceBucket, QueryConstants.NULL_INT);
-        mainOverflowLocationSource.set(destBucket, QueryConstants.NULL_INT);
-        while (overflowLocation != QueryConstants.NULL_INT) {
-            final int nextOverflowLocation = overflowOverflowLocationSource.getUnsafe(overflowLocation);
-            final long overflowKey0 = overflowKeySource0.getUnsafe(overflowLocation);
-            final int overflowKey1 = overflowKeySource1.getUnsafe(overflowLocation);
-            final int overflowHash = hash(overflowKey0, overflowKey1);
-            final int overflowTableLocation = hashToTableLocation(tableHashPivot + bucketsToAdd, overflowHash);
-            if (overflowTableLocation == mainInsertLocation) {
-                mainKeySource0.set(mainInsertLocation, overflowKey0);
-                mainKeySource1.set(mainInsertLocation, overflowKey1);
-                mainOutputPosition.set(mainInsertLocation, overflowOutputPosition.getUnsafe(overflowLocation));
-                handler.doPromoteOverflow(overflowLocation, mainInsertLocation);
-                overflowOutputPosition.set(overflowLocation, QueryConstants.NULL_INT);
-                overflowKeySource0.set(overflowLocation, QueryConstants.NULL_LONG);
-                overflowKeySource1.set(overflowLocation, QueryConstants.NULL_INT);
-                freeOverflowLocation(overflowLocation);
-                mainInsertLocation = -1;
-            } else {
-                final int oldOverflowLocation = mainOverflowLocationSource.getUnsafe(overflowTableLocation);
-                mainOverflowLocationSource.set(overflowTableLocation, overflowLocation);
-                overflowOverflowLocationSource.set(overflowLocation, oldOverflowLocation);
-            }
-            overflowLocation = nextOverflowLocation;
-        }
-    }
-
-    private int maybeMoveMainBucket(HashHandler handler, int sourceBucket, int destBucket,
-            int bucketsToAdd) {
-        final long k0 = mainKeySource0.getUnsafe(sourceBucket);
-        final int k1 = mainKeySource1.getUnsafe(sourceBucket);
-        final int hash = hash(k0, k1);
-        final int location = hashToTableLocation(tableHashPivot + bucketsToAdd, hash);
-        final int mainInsertLocation;
-        if (location == sourceBucket) {
-            mainInsertLocation = destBucket;
-            mainOutputPosition.set(destBucket, EMPTY_OUTPUT_POSITION);
-        } else {
-            mainInsertLocation = sourceBucket;
-            mainOutputPosition.set(destBucket, mainOutputPosition.getUnsafe(sourceBucket));
-            mainOutputPosition.set(sourceBucket, EMPTY_OUTPUT_POSITION);
-            mainKeySource0.set(destBucket, k0);
-            mainKeySource0.set(sourceBucket, QueryConstants.NULL_LONG);
-            mainKeySource1.set(destBucket, k1);
-            mainKeySource1.set(sourceBucket, QueryConstants.NULL_INT);
-            handler.doMoveMain(sourceBucket, destBucket);
-        }
-        return mainInsertLocation;
-    }
-
-    private boolean findOverflow(HashHandler handler, long k0, int k1, int chunkPosition,
-            int overflowLocation) {
-        while (overflowLocation != QueryConstants.NULL_INT) {
-            if (eq(overflowKeySource0.getUnsafe(overflowLocation), k0) && eq(overflowKeySource1.getUnsafe(overflowLocation), k1)) {
-                handler.doOverflowFound(overflowLocation, chunkPosition);
-                return true;
-            }
-            overflowLocation = overflowOverflowLocationSource.getUnsafe(overflowLocation);
-        }
-        return false;
-    }
-
-    @Override
-    public int findPositionForKey(Object key) {
-        final Object [] ka = (Object[])key;
-        final long k0 = TypeUtils.unbox((Long)ka[0]);
-        final int k1 = TypeUtils.unbox((Integer)ka[1]);
-        int hash = hash(k0, k1);
-        final int tableLocation = hashToTableLocation(tableHashPivot, hash);
-        final int positionValue = mainOutputPosition.getUnsafe(tableLocation);
-        if (positionValue == EMPTY_OUTPUT_POSITION) {
-            return -1;
-        }
-        if (eq(mainKeySource0.getUnsafe(tableLocation), k0) && eq(mainKeySource1.getUnsafe(tableLocation), k1)) {
-            return positionValue;
-        }
-        int overflowLocation = mainOverflowLocationSource.getUnsafe(tableLocation);
-        while (overflowLocation != QueryConstants.NULL_INT) {
-            if (eq(overflowKeySource0.getUnsafe(overflowLocation), k0) && eq(overflowKeySource1.getUnsafe(overflowLocation), k1)) {
-                return overflowOutputPosition.getUnsafe(overflowLocation);
-            }
-            overflowLocation = overflowOverflowLocationSource.getUnsafe(overflowLocation);
-        }
-        return -1;
-    }
-}
diff --git a/engine/table/src/main/java/io/deephaven/engine/table/impl/by/typed/staticagg/gen/StaticAggHasherLongLong.java b/engine/table/src/main/java/io/deephaven/engine/table/impl/by/typed/staticagg/gen/StaticAggHasherLongLong.java
deleted file mode 100644
index 8a5972d0714..00000000000
--- a/engine/table/src/main/java/io/deephaven/engine/table/impl/by/typed/staticagg/gen/StaticAggHasherLongLong.java
+++ /dev/null
@@ -1,201 +0,0 @@
-//
-// Copyright (c) 2016-2024 Deephaven Data Labs and Patent Pending
-//
-// ****** AUTO-GENERATED CLASS - DO NOT EDIT MANUALLY
-// ****** Run ReplicateTypedHashers or ./gradlew replicateTypedHashers to regenerate
-//
-// @formatter:off
-package io.deephaven.engine.table.impl.by.typed.staticagg.gen;
-
-import static io.deephaven.util.compare.LongComparisons.eq;
-
-import io.deephaven.chunk.Chunk;
-import io.deephaven.chunk.LongChunk;
-import io.deephaven.chunk.attributes.Values;
-import io.deephaven.chunk.util.hashing.LongChunkHasher;
-import io.deephaven.engine.rowset.RowSequence;
-import io.deephaven.engine.table.ColumnSource;
-import io.deephaven.engine.table.impl.by.HashHandler;
-import io.deephaven.engine.table.impl.by.StaticChunkedOperatorAggregationStateManagerTypedBase;
-import io.deephaven.engine.table.impl.sources.LongArraySource;
-import io.deephaven.util.QueryConstants;
-import io.deephaven.util.type.TypeUtils;
-import java.lang.Long;
-import java.lang.Object;
-import java.lang.Override;
-
-final class StaticAggHasherLongLong extends StaticChunkedOperatorAggregationStateManagerTypedBase {
-    private final LongArraySource mainKeySource0;
-
-    private final LongArraySource overflowKeySource0;
-
-    private final LongArraySource mainKeySource1;
-
-    private final LongArraySource overflowKeySource1;
-
-    public StaticAggHasherLongLong(ColumnSource[] tableKeySources,
-            ColumnSource[] originalTableKeySources, int tableSize, double maximumLoadFactor,
-            double targetLoadFactor) {
-        super(tableKeySources, tableSize, maximumLoadFactor, targetLoadFactor);
-        this.mainKeySource0 = (LongArraySource) super.mainKeySources[0];
-        this.overflowKeySource0 = (LongArraySource) super.overflowKeySources[0];
-        this.mainKeySource1 = (LongArraySource) super.mainKeySources[1];
-        this.overflowKeySource1 = (LongArraySource) super.overflowKeySources[1];
-    }
-
-    @Override
-    protected void build(HashHandler handler, RowSequence rowSequence, Chunk[] sourceKeyChunks) {
-        final LongChunk<Values> keyChunk0 = sourceKeyChunks[0].asLongChunk();
-        final LongChunk<Values> keyChunk1 = sourceKeyChunks[1].asLongChunk();
-        final int chunkSize = keyChunk0.size();
-        for (int chunkPosition = 0; chunkPosition < chunkSize; ++chunkPosition) {
-            final long k0 = keyChunk0.get(chunkPosition);
-            final long k1 = keyChunk1.get(chunkPosition);
-            final int hash = hash(k0, k1);
-            final int tableLocation = hashToTableLocation(tableHashPivot, hash);
-            if (mainOutputPosition.getUnsafe(tableLocation) == EMPTY_OUTPUT_POSITION) {
-                numEntries++;
-                mainKeySource0.set(tableLocation, k0);
-                mainKeySource1.set(tableLocation, k1);
-                handler.doMainInsert(tableLocation, chunkPosition);
-            } else if (eq(mainKeySource0.getUnsafe(tableLocation), k0) && eq(mainKeySource1.getUnsafe(tableLocation), k1)) {
-                handler.doMainFound(tableLocation, chunkPosition);
-            } else {
-                int overflowLocation = mainOverflowLocationSource.getUnsafe(tableLocation);
-                if (!findOverflow(handler, k0, k1, chunkPosition, overflowLocation)) {
-                    final int newOverflowLocation = allocateOverflowLocation();
-                    overflowKeySource0.set(newOverflowLocation, k0);
-                    overflowKeySource1.set(newOverflowLocation, k1);
-                    mainOverflowLocationSource.set(tableLocation, newOverflowLocation);
-                    overflowOverflowLocationSource.set(newOverflowLocation, overflowLocation);
-                    numEntries++;
-                    handler.doOverflowInsert(newOverflowLocation, chunkPosition);
-                }
-            }
-        }
-    }
-
-    @Override
-    protected void probe(HashHandler handler, RowSequence rowSequence, Chunk[] sourceKeyChunks) {
-        final LongChunk<Values> keyChunk0 = sourceKeyChunks[0].asLongChunk();
-        final LongChunk<Values> keyChunk1 = sourceKeyChunks[1].asLongChunk();
-        final int chunkSize = keyChunk0.size();
-        for (int chunkPosition = 0; chunkPosition < chunkSize; ++chunkPosition) {
-            final long k0 = keyChunk0.get(chunkPosition);
-            final long k1 = keyChunk1.get(chunkPosition);
-            final int hash = hash(k0, k1);
-            final int tableLocation = hashToTableLocation(tableHashPivot, hash);
-            if (mainOutputPosition.getUnsafe(tableLocation) == EMPTY_OUTPUT_POSITION) {
-                handler.doMissing(chunkPosition);
-            } else if (eq(mainKeySource0.getUnsafe(tableLocation), k0) && eq(mainKeySource1.getUnsafe(tableLocation), k1)) {
-                handler.doMainFound(tableLocation, chunkPosition);
-            } else {
-                int overflowLocation = mainOverflowLocationSource.getUnsafe(tableLocation);
-                if (!findOverflow(handler, k0, k1, chunkPosition, overflowLocation)) {
-                    handler.doMissing(chunkPosition);
-                }
-            }
-        }
-    }
-
-    private static int hash(long k0, long k1) {
-        int hash = LongChunkHasher.hashInitialSingle(k0);
-        hash = LongChunkHasher.hashUpdateSingle(hash, k1);
-        return hash;
-    }
-
-    @Override
-    protected void rehashBucket(HashHandler handler, int sourceBucket, int destBucket,
-            int bucketsToAdd) {
-        final int position = mainOutputPosition.getUnsafe(sourceBucket);
-        if (position == EMPTY_OUTPUT_POSITION) {
-            return;
-        }
-        int mainInsertLocation = maybeMoveMainBucket(handler, sourceBucket, destBucket, bucketsToAdd);
-        int overflowLocation = mainOverflowLocationSource.getUnsafe(sourceBucket);
-        mainOverflowLocationSource.set(sourceBucket, QueryConstants.NULL_INT);
-        mainOverflowLocationSource.set(destBucket, QueryConstants.NULL_INT);
-        while (overflowLocation != QueryConstants.NULL_INT) {
-            final int nextOverflowLocation = overflowOverflowLocationSource.getUnsafe(overflowLocation);
-            final long overflowKey0 = overflowKeySource0.getUnsafe(overflowLocation);
-            final long overflowKey1 = overflowKeySource1.getUnsafe(overflowLocation);
-            final int overflowHash = hash(overflowKey0, overflowKey1);
-            final int overflowTableLocation = hashToTableLocation(tableHashPivot + bucketsToAdd, overflowHash);
-            if (overflowTableLocation == mainInsertLocation) {
-                mainKeySource0.set(mainInsertLocation, overflowKey0);
-                mainKeySource1.set(mainInsertLocation, overflowKey1);
-                mainOutputPosition.set(mainInsertLocation, overflowOutputPosition.getUnsafe(overflowLocation));
-                handler.doPromoteOverflow(overflowLocation, mainInsertLocation);
-                overflowOutputPosition.set(overflowLocation, QueryConstants.NULL_INT);
-                overflowKeySource0.set(overflowLocation, QueryConstants.NULL_LONG);
-                overflowKeySource1.set(overflowLocation, QueryConstants.NULL_LONG);
-                freeOverflowLocation(overflowLocation);
-                mainInsertLocation = -1;
-            } else {
-                final int oldOverflowLocation = mainOverflowLocationSource.getUnsafe(overflowTableLocation);
-                mainOverflowLocationSource.set(overflowTableLocation, overflowLocation);
-                overflowOverflowLocationSource.set(overflowLocation, oldOverflowLocation);
-            }
-            overflowLocation = nextOverflowLocation;
-        }
-    }
-
-    private int maybeMoveMainBucket(HashHandler handler, int sourceBucket, int destBucket,
-            int bucketsToAdd) {
-        final long k0 = mainKeySource0.getUnsafe(sourceBucket);
-        final long k1 = mainKeySource1.getUnsafe(sourceBucket);
-        final int hash = hash(k0, k1);
-        final int location = hashToTableLocation(tableHashPivot + bucketsToAdd, hash);
-        final int mainInsertLocation;
-        if (location == sourceBucket) {
-            mainInsertLocation = destBucket;
-            mainOutputPosition.set(destBucket, EMPTY_OUTPUT_POSITION);
-        } else {
-            mainInsertLocation = sourceBucket;
-            mainOutputPosition.set(destBucket, mainOutputPosition.getUnsafe(sourceBucket));
-            mainOutputPosition.set(sourceBucket, EMPTY_OUTPUT_POSITION);
-            mainKeySource0.set(destBucket, k0);
-            mainKeySource0.set(sourceBucket, QueryConstants.NULL_LONG);
-            mainKeySource1.set(destBucket, k1);
-            mainKeySource1.set(sourceBucket, QueryConstants.NULL_LONG);
-            handler.doMoveMain(sourceBucket, destBucket);
-        }
-        return mainInsertLocation;
-    }
-
-    private boolean findOverflow(HashHandler handler, long k0, long k1, int chunkPosition,
-            int overflowLocation) {
-        while (overflowLocation != QueryConstants.NULL_INT) {
-            if (eq(overflowKeySource0.getUnsafe(overflowLocation), k0) && eq(overflowKeySource1.getUnsafe(overflowLocation), k1)) {
-                handler.doOverflowFound(overflowLocation, chunkPosition);
-                return true;
-            }
-            overflowLocation = overflowOverflowLocationSource.getUnsafe(overflowLocation);
-        }
-        return false;
-    }
-
-    @Override
-    public int findPositionForKey(Object key) {
-        final Object [] ka = (Object[])key;
-        final long k0 = TypeUtils.unbox((Long)ka[0]);
-        final long k1 = TypeUtils.unbox((Long)ka[1]);
-        int hash = hash(k0, k1);
-        final int tableLocation = hashToTableLocation(tableHashPivot, hash);
-        final int positionValue = mainOutputPosition.getUnsafe(tableLocation);
-        if (positionValue == EMPTY_OUTPUT_POSITION) {
-            return -1;
-        }
-        if (eq(mainKeySource0.getUnsafe(tableLocation), k0) && eq(mainKeySource1.getUnsafe(tableLocation), k1)) {
-            return positionValue;
-        }
-        int overflowLocation = mainOverflowLocationSource.getUnsafe(tableLocation);
-        while (overflowLocation != QueryConstants.NULL_INT) {
-            if (eq(overflowKeySource0.getUnsafe(overflowLocation), k0) && eq(overflowKeySource1.getUnsafe(overflowLocation), k1)) {
-                return overflowOutputPosition.getUnsafe(overflowLocation);
-            }
-            overflowLocation = overflowOverflowLocationSource.getUnsafe(overflowLocation);
-        }
-        return -1;
-    }
-}
diff --git a/engine/table/src/main/java/io/deephaven/engine/table/impl/by/typed/staticagg/gen/StaticAggHasherLongObject.java b/engine/table/src/main/java/io/deephaven/engine/table/impl/by/typed/staticagg/gen/StaticAggHasherLongObject.java
deleted file mode 100644
index 1e96dac4dd8..00000000000
--- a/engine/table/src/main/java/io/deephaven/engine/table/impl/by/typed/staticagg/gen/StaticAggHasherLongObject.java
+++ /dev/null
@@ -1,205 +0,0 @@
-//
-// Copyright (c) 2016-2024 Deephaven Data Labs and Patent Pending
-//
-// ****** AUTO-GENERATED CLASS - DO NOT EDIT MANUALLY
-// ****** Run ReplicateTypedHashers or ./gradlew replicateTypedHashers to regenerate
-//
-// @formatter:off
-package io.deephaven.engine.table.impl.by.typed.staticagg.gen;
-
-import static io.deephaven.util.compare.LongComparisons.eq;
-import static io.deephaven.util.compare.ObjectComparisons.eq;
-
-import io.deephaven.chunk.Chunk;
-import io.deephaven.chunk.LongChunk;
-import io.deephaven.chunk.ObjectChunk;
-import io.deephaven.chunk.attributes.Values;
-import io.deephaven.chunk.util.hashing.LongChunkHasher;
-import io.deephaven.chunk.util.hashing.ObjectChunkHasher;
-import io.deephaven.engine.rowset.RowSequence;
-import io.deephaven.engine.table.ColumnSource;
-import io.deephaven.engine.table.impl.by.HashHandler;
-import io.deephaven.engine.table.impl.by.StaticChunkedOperatorAggregationStateManagerTypedBase;
-import io.deephaven.engine.table.impl.sources.LongArraySource;
-import io.deephaven.engine.table.impl.sources.ObjectArraySource;
-import io.deephaven.util.QueryConstants;
-import io.deephaven.util.type.TypeUtils;
-import java.lang.Long;
-import java.lang.Object;
-import java.lang.Override;
-
-final class StaticAggHasherLongObject extends StaticChunkedOperatorAggregationStateManagerTypedBase {
-    private final LongArraySource mainKeySource0;
-
-    private final LongArraySource overflowKeySource0;
-
-    private final ObjectArraySource mainKeySource1;
-
-    private final ObjectArraySource overflowKeySource1;
-
-    public StaticAggHasherLongObject(ColumnSource[] tableKeySources,
-            ColumnSource[] originalTableKeySources, int tableSize, double maximumLoadFactor,
-            double targetLoadFactor) {
-        super(tableKeySources, tableSize, maximumLoadFactor, targetLoadFactor);
-        this.mainKeySource0 = (LongArraySource) super.mainKeySources[0];
-        this.overflowKeySource0 = (LongArraySource) super.overflowKeySources[0];
-        this.mainKeySource1 = (ObjectArraySource) super.mainKeySources[1];
-        this.overflowKeySource1 = (ObjectArraySource) super.overflowKeySources[1];
-    }
-
-    @Override
-    protected void build(HashHandler handler, RowSequence rowSequence, Chunk[] sourceKeyChunks) {
-        final LongChunk<Values> keyChunk0 = sourceKeyChunks[0].asLongChunk();
-        final ObjectChunk<Object, Values> keyChunk1 = sourceKeyChunks[1].asObjectChunk();
-        final int chunkSize = keyChunk0.size();
-        for (int chunkPosition = 0; chunkPosition < chunkSize; ++chunkPosition) {
-            final long k0 = keyChunk0.get(chunkPosition);
-            final Object k1 = keyChunk1.get(chunkPosition);
-            final int hash = hash(k0, k1);
-            final int tableLocation = hashToTableLocation(tableHashPivot, hash);
-            if (mainOutputPosition.getUnsafe(tableLocation) == EMPTY_OUTPUT_POSITION) {
-                numEntries++;
-                mainKeySource0.set(tableLocation, k0);
-                mainKeySource1.set(tableLocation, k1);
-                handler.doMainInsert(tableLocation, chunkPosition);
-            } else if (eq(mainKeySource0.getUnsafe(tableLocation), k0) && eq(mainKeySource1.getUnsafe(tableLocation), k1)) {
-                handler.doMainFound(tableLocation, chunkPosition);
-            } else {
-                int overflowLocation = mainOverflowLocationSource.getUnsafe(tableLocation);
-                if (!findOverflow(handler, k0, k1, chunkPosition, overflowLocation)) {
-                    final int newOverflowLocation = allocateOverflowLocation();
-                    overflowKeySource0.set(newOverflowLocation, k0);
-                    overflowKeySource1.set(newOverflowLocation, k1);
-                    mainOverflowLocationSource.set(tableLocation, newOverflowLocation);
-                    overflowOverflowLocationSource.set(newOverflowLocation, overflowLocation);
-                    numEntries++;
-                    handler.doOverflowInsert(newOverflowLocation, chunkPosition);
-                }
-            }
-        }
-    }
-
-    @Override
-    protected void probe(HashHandler handler, RowSequence rowSequence, Chunk[] sourceKeyChunks) {
-        final LongChunk<Values> keyChunk0 = sourceKeyChunks[0].asLongChunk();
-        final ObjectChunk<Object, Values> keyChunk1 = sourceKeyChunks[1].asObjectChunk();
-        final int chunkSize = keyChunk0.size();
-        for (int chunkPosition = 0; chunkPosition < chunkSize; ++chunkPosition) {
-            final long k0 = keyChunk0.get(chunkPosition);
-            final Object k1 = keyChunk1.get(chunkPosition);
-            final int hash = hash(k0, k1);
-            final int tableLocation = hashToTableLocation(tableHashPivot, hash);
-            if (mainOutputPosition.getUnsafe(tableLocation) == EMPTY_OUTPUT_POSITION) {
-                handler.doMissing(chunkPosition);
-            } else if (eq(mainKeySource0.getUnsafe(tableLocation), k0) && eq(mainKeySource1.getUnsafe(tableLocation), k1)) {
-                handler.doMainFound(tableLocation, chunkPosition);
-            } else {
-                int overflowLocation = mainOverflowLocationSource.getUnsafe(tableLocation);
-                if (!findOverflow(handler, k0, k1, chunkPosition, overflowLocation)) {
-                    handler.doMissing(chunkPosition);
-                }
-            }
-        }
-    }
-
-    private static int hash(long k0, Object k1) {
-        int hash = LongChunkHasher.hashInitialSingle(k0);
-        hash = ObjectChunkHasher.hashUpdateSingle(hash, k1);
-        return hash;
-    }
-
-    @Override
-    protected void rehashBucket(HashHandler handler, int sourceBucket, int destBucket,
-            int bucketsToAdd) {
-        final int position = mainOutputPosition.getUnsafe(sourceBucket);
-        if (position == EMPTY_OUTPUT_POSITION) {
-            return;
-        }
-        int mainInsertLocation = maybeMoveMainBucket(handler, sourceBucket, destBucket, bucketsToAdd);
-        int overflowLocation = mainOverflowLocationSource.getUnsafe(sourceBucket);
-        mainOverflowLocationSource.set(sourceBucket, QueryConstants.NULL_INT);
-        mainOverflowLocationSource.set(destBucket, QueryConstants.NULL_INT);
-        while (overflowLocation != QueryConstants.NULL_INT) {
-            final int nextOverflowLocation = overflowOverflowLocationSource.getUnsafe(overflowLocation);
-            final long overflowKey0 = overflowKeySource0.getUnsafe(overflowLocation);
-            final Object overflowKey1 = overflowKeySource1.getUnsafe(overflowLocation);
-            final int overflowHash = hash(overflowKey0, overflowKey1);
-            final int overflowTableLocation = hashToTableLocation(tableHashPivot + bucketsToAdd, overflowHash);
-            if (overflowTableLocation == mainInsertLocation) {
-                mainKeySource0.set(mainInsertLocation, overflowKey0);
-                mainKeySource1.set(mainInsertLocation, overflowKey1);
-                mainOutputPosition.set(mainInsertLocation, overflowOutputPosition.getUnsafe(overflowLocation));
-                handler.doPromoteOverflow(overflowLocation, mainInsertLocation);
-                overflowOutputPosition.set(overflowLocation, QueryConstants.NULL_INT);
-                overflowKeySource0.set(overflowLocation, QueryConstants.NULL_LONG);
-                overflowKeySource1.set(overflowLocation, null);
-                freeOverflowLocation(overflowLocation);
-                mainInsertLocation = -1;
-            } else {
-                final int oldOverflowLocation = mainOverflowLocationSource.getUnsafe(overflowTableLocation);
-                mainOverflowLocationSource.set(overflowTableLocation, overflowLocation);
-                overflowOverflowLocationSource.set(overflowLocation, oldOverflowLocation);
-            }
-            overflowLocation = nextOverflowLocation;
-        }
-    }
-
-    private int maybeMoveMainBucket(HashHandler handler, int sourceBucket, int destBucket,
-            int bucketsToAdd) {
-        final long k0 = mainKeySource0.getUnsafe(sourceBucket);
-        final Object k1 = mainKeySource1.getUnsafe(sourceBucket);
-        final int hash = hash(k0, k1);
-        final int location = hashToTableLocation(tableHashPivot + bucketsToAdd, hash);
-        final int mainInsertLocation;
-        if (location == sourceBucket) {
-            mainInsertLocation = destBucket;
-            mainOutputPosition.set(destBucket, EMPTY_OUTPUT_POSITION);
-        } else {
-            mainInsertLocation = sourceBucket;
-            mainOutputPosition.set(destBucket, mainOutputPosition.getUnsafe(sourceBucket));
-            mainOutputPosition.set(sourceBucket, EMPTY_OUTPUT_POSITION);
-            mainKeySource0.set(destBucket, k0);
-            mainKeySource0.set(sourceBucket, QueryConstants.NULL_LONG);
-            mainKeySource1.set(destBucket, k1);
-            mainKeySource1.set(sourceBucket, null);
-            handler.doMoveMain(sourceBucket, destBucket);
-        }
-        return mainInsertLocation;
-    }
-
-    private boolean findOverflow(HashHandler handler, long k0, Object k1, int chunkPosition,
-            int overflowLocation) {
-        while (overflowLocation != QueryConstants.NULL_INT) {
-            if (eq(overflowKeySource0.getUnsafe(overflowLocation), k0) && eq(overflowKeySource1.getUnsafe(overflowLocation), k1)) {
-                handler.doOverflowFound(overflowLocation, chunkPosition);
-                return true;
-            }
-            overflowLocation = overflowOverflowLocationSource.getUnsafe(overflowLocation);
-        }
-        return false;
-    }
-
-    @Override
-    public int findPositionForKey(Object key) {
-        final Object [] ka = (Object[])key;
-        final long k0 = TypeUtils.unbox((Long)ka[0]);
-        final Object k1 = ka[1];
-        int hash = hash(k0, k1);
-        final int tableLocation = hashToTableLocation(tableHashPivot, hash);
-        final int positionValue = mainOutputPosition.getUnsafe(tableLocation);
-        if (positionValue == EMPTY_OUTPUT_POSITION) {
-            return -1;
-        }
-        if (eq(mainKeySource0.getUnsafe(tableLocation), k0) && eq(mainKeySource1.getUnsafe(tableLocation), k1)) {
-            return positionValue;
-        }
-        int overflowLocation = mainOverflowLocationSource.getUnsafe(tableLocation);
-        while (overflowLocation != QueryConstants.NULL_INT) {
-            if (eq(overflowKeySource0.getUnsafe(overflowLocation), k0) && eq(overflowKeySource1.getUnsafe(overflowLocation), k1)) {
-                return overflowOutputPosition.getUnsafe(overflowLocation);
-            }
-            overflowLocation = overflowOverflowLocationSource.getUnsafe(overflowLocation);
-        }
-        return -1;
-    }
-}
diff --git a/engine/table/src/main/java/io/deephaven/engine/table/impl/by/typed/staticagg/gen/StaticAggHasherLongShort.java b/engine/table/src/main/java/io/deephaven/engine/table/impl/by/typed/staticagg/gen/StaticAggHasherLongShort.java
deleted file mode 100644
index 777f8802038..00000000000
--- a/engine/table/src/main/java/io/deephaven/engine/table/impl/by/typed/staticagg/gen/StaticAggHasherLongShort.java
+++ /dev/null
@@ -1,206 +0,0 @@
-//
-// Copyright (c) 2016-2024 Deephaven Data Labs and Patent Pending
-//
-// ****** AUTO-GENERATED CLASS - DO NOT EDIT MANUALLY
-// ****** Run ReplicateTypedHashers or ./gradlew replicateTypedHashers to regenerate
-//
-// @formatter:off
-package io.deephaven.engine.table.impl.by.typed.staticagg.gen;
-
-import static io.deephaven.util.compare.LongComparisons.eq;
-import static io.deephaven.util.compare.ShortComparisons.eq;
-
-import io.deephaven.chunk.Chunk;
-import io.deephaven.chunk.LongChunk;
-import io.deephaven.chunk.ShortChunk;
-import io.deephaven.chunk.attributes.Values;
-import io.deephaven.chunk.util.hashing.LongChunkHasher;
-import io.deephaven.chunk.util.hashing.ShortChunkHasher;
-import io.deephaven.engine.rowset.RowSequence;
-import io.deephaven.engine.table.ColumnSource;
-import io.deephaven.engine.table.impl.by.HashHandler;
-import io.deephaven.engine.table.impl.by.StaticChunkedOperatorAggregationStateManagerTypedBase;
-import io.deephaven.engine.table.impl.sources.LongArraySource;
-import io.deephaven.engine.table.impl.sources.ShortArraySource;
-import io.deephaven.util.QueryConstants;
-import io.deephaven.util.type.TypeUtils;
-import java.lang.Long;
-import java.lang.Object;
-import java.lang.Override;
-import java.lang.Short;
-
-final class StaticAggHasherLongShort extends StaticChunkedOperatorAggregationStateManagerTypedBase {
-    private final LongArraySource mainKeySource0;
-
-    private final LongArraySource overflowKeySource0;
-
-    private final ShortArraySource mainKeySource1;
-
-    private final ShortArraySource overflowKeySource1;
-
-    public StaticAggHasherLongShort(ColumnSource[] tableKeySources,
-            ColumnSource[] originalTableKeySources, int tableSize, double maximumLoadFactor,
-            double targetLoadFactor) {
-        super(tableKeySources, tableSize, maximumLoadFactor, targetLoadFactor);
-        this.mainKeySource0 = (LongArraySource) super.mainKeySources[0];
-        this.overflowKeySource0 = (LongArraySource) super.overflowKeySources[0];
-        this.mainKeySource1 = (ShortArraySource) super.mainKeySources[1];
-        this.overflowKeySource1 = (ShortArraySource) super.overflowKeySources[1];
-    }
-
-    @Override
-    protected void build(HashHandler handler, RowSequence rowSequence, Chunk[] sourceKeyChunks) {
-        final LongChunk<Values> keyChunk0 = sourceKeyChunks[0].asLongChunk();
-        final ShortChunk<Values> keyChunk1 = sourceKeyChunks[1].asShortChunk();
-        final int chunkSize = keyChunk0.size();
-        for (int chunkPosition = 0; chunkPosition < chunkSize; ++chunkPosition) {
-            final long k0 = keyChunk0.get(chunkPosition);
-            final short k1 = keyChunk1.get(chunkPosition);
-            final int hash = hash(k0, k1);
-            final int tableLocation = hashToTableLocation(tableHashPivot, hash);
-            if (mainOutputPosition.getUnsafe(tableLocation) == EMPTY_OUTPUT_POSITION) {
-                numEntries++;
-                mainKeySource0.set(tableLocation, k0);
-                mainKeySource1.set(tableLocation, k1);
-                handler.doMainInsert(tableLocation, chunkPosition);
-            } else if (eq(mainKeySource0.getUnsafe(tableLocation), k0) && eq(mainKeySource1.getUnsafe(tableLocation), k1)) {
-                handler.doMainFound(tableLocation, chunkPosition);
-            } else {
-                int overflowLocation = mainOverflowLocationSource.getUnsafe(tableLocation);
-                if (!findOverflow(handler, k0, k1, chunkPosition, overflowLocation)) {
-                    final int newOverflowLocation = allocateOverflowLocation();
-                    overflowKeySource0.set(newOverflowLocation, k0);
-                    overflowKeySource1.set(newOverflowLocation, k1);
-                    mainOverflowLocationSource.set(tableLocation, newOverflowLocation);
-                    overflowOverflowLocationSource.set(newOverflowLocation, overflowLocation);
-                    numEntries++;
-                    handler.doOverflowInsert(newOverflowLocation, chunkPosition);
-                }
-            }
-        }
-    }
-
-    @Override
-    protected void probe(HashHandler handler, RowSequence rowSequence, Chunk[] sourceKeyChunks) {
-        final LongChunk<Values> keyChunk0 = sourceKeyChunks[0].asLongChunk();
-        final ShortChunk<Values> keyChunk1 = sourceKeyChunks[1].asShortChunk();
-        final int chunkSize = keyChunk0.size();
-        for (int chunkPosition = 0; chunkPosition < chunkSize; ++chunkPosition) {
-            final long k0 = keyChunk0.get(chunkPosition);
-            final short k1 = keyChunk1.get(chunkPosition);
-            final int hash = hash(k0, k1);
-            final int tableLocation = hashToTableLocation(tableHashPivot, hash);
-            if (mainOutputPosition.getUnsafe(tableLocation) == EMPTY_OUTPUT_POSITION) {
-                handler.doMissing(chunkPosition);
-            } else if (eq(mainKeySource0.getUnsafe(tableLocation), k0) && eq(mainKeySource1.getUnsafe(tableLocation), k1)) {
-                handler.doMainFound(tableLocation, chunkPosition);
-            } else {
-                int overflowLocation = mainOverflowLocationSource.getUnsafe(tableLocation);
-                if (!findOverflow(handler, k0, k1, chunkPosition, overflowLocation)) {
-                    handler.doMissing(chunkPosition);
-                }
-            }
-        }
-    }
-
-    private static int hash(long k0, short k1) {
-        int hash = LongChunkHasher.hashInitialSingle(k0);
-        hash = ShortChunkHasher.hashUpdateSingle(hash, k1);
-        return hash;
-    }
-
-    @Override
-    protected void rehashBucket(HashHandler handler, int sourceBucket, int destBucket,
-            int bucketsToAdd) {
-        final int position = mainOutputPosition.getUnsafe(sourceBucket);
-        if (position == EMPTY_OUTPUT_POSITION) {
-            return;
-        }
-        int mainInsertLocation = maybeMoveMainBucket(handler, sourceBucket, destBucket, bucketsToAdd);
-        int overflowLocation = mainOverflowLocationSource.getUnsafe(sourceBucket);
-        mainOverflowLocationSource.set(sourceBucket, QueryConstants.NULL_INT);
-        mainOverflowLocationSource.set(destBucket, QueryConstants.NULL_INT);
-        while (overflowLocation != QueryConstants.NULL_INT) {
-            final int nextOverflowLocation = overflowOverflowLocationSource.getUnsafe(overflowLocation);
-            final long overflowKey0 = overflowKeySource0.getUnsafe(overflowLocation);
-            final short overflowKey1 = overflowKeySource1.getUnsafe(overflowLocation);
-            final int overflowHash = hash(overflowKey0, overflowKey1);
-            final int overflowTableLocation = hashToTableLocation(tableHashPivot + bucketsToAdd, overflowHash);
-            if (overflowTableLocation == mainInsertLocation) {
-                mainKeySource0.set(mainInsertLocation, overflowKey0);
-                mainKeySource1.set(mainInsertLocation, overflowKey1);
-                mainOutputPosition.set(mainInsertLocation, overflowOutputPosition.getUnsafe(overflowLocation));
-                handler.doPromoteOverflow(overflowLocation, mainInsertLocation);
-                overflowOutputPosition.set(overflowLocation, QueryConstants.NULL_INT);
-                overflowKeySource0.set(overflowLocation, QueryConstants.NULL_LONG);
-                overflowKeySource1.set(overflowLocation, QueryConstants.NULL_SHORT);
-                freeOverflowLocation(overflowLocation);
-                mainInsertLocation = -1;
-            } else {
-                final int oldOverflowLocation = mainOverflowLocationSource.getUnsafe(overflowTableLocation);
-                mainOverflowLocationSource.set(overflowTableLocation, overflowLocation);
-                overflowOverflowLocationSource.set(overflowLocation, oldOverflowLocation);
-            }
-            overflowLocation = nextOverflowLocation;
-        }
-    }
-
-    private int maybeMoveMainBucket(HashHandler handler, int sourceBucket, int destBucket,
-            int bucketsToAdd) {
-        final long k0 = mainKeySource0.getUnsafe(sourceBucket);
-        final short k1 = mainKeySource1.getUnsafe(sourceBucket);
-        final int hash = hash(k0, k1);
-        final int location = hashToTableLocation(tableHashPivot + bucketsToAdd, hash);
-        final int mainInsertLocation;
-        if (location == sourceBucket) {
-            mainInsertLocation = destBucket;
-            mainOutputPosition.set(destBucket, EMPTY_OUTPUT_POSITION);
-        } else {
-            mainInsertLocation = sourceBucket;
-            mainOutputPosition.set(destBucket, mainOutputPosition.getUnsafe(sourceBucket));
-            mainOutputPosition.set(sourceBucket, EMPTY_OUTPUT_POSITION);
-            mainKeySource0.set(destBucket, k0);
-            mainKeySource0.set(sourceBucket, QueryConstants.NULL_LONG);
-            mainKeySource1.set(destBucket, k1);
-            mainKeySource1.set(sourceBucket, QueryConstants.NULL_SHORT);
-            handler.doMoveMain(sourceBucket, destBucket);
-        }
-        return mainInsertLocation;
-    }
-
-    private boolean findOverflow(HashHandler handler, long k0, short k1, int chunkPosition,
-            int overflowLocation) {
-        while (overflowLocation != QueryConstants.NULL_INT) {
-            if (eq(overflowKeySource0.getUnsafe(overflowLocation), k0) && eq(overflowKeySource1.getUnsafe(overflowLocation), k1)) {
-                handler.doOverflowFound(overflowLocation, chunkPosition);
-                return true;
-            }
-            overflowLocation = overflowOverflowLocationSource.getUnsafe(overflowLocation);
-        }
-        return false;
-    }
-
-    @Override
-    public int findPositionForKey(Object key) {
-        final Object [] ka = (Object[])key;
-        final long k0 = TypeUtils.unbox((Long)ka[0]);
-        final short k1 = TypeUtils.unbox((Short)ka[1]);
-        int hash = hash(k0, k1);
-        final int tableLocation = hashToTableLocation(tableHashPivot, hash);
-        final int positionValue = mainOutputPosition.getUnsafe(tableLocation);
-        if (positionValue == EMPTY_OUTPUT_POSITION) {
-            return -1;
-        }
-        if (eq(mainKeySource0.getUnsafe(tableLocation), k0) && eq(mainKeySource1.getUnsafe(tableLocation), k1)) {
-            return positionValue;
-        }
-        int overflowLocation = mainOverflowLocationSource.getUnsafe(tableLocation);
-        while (overflowLocation != QueryConstants.NULL_INT) {
-            if (eq(overflowKeySource0.getUnsafe(overflowLocation), k0) && eq(overflowKeySource1.getUnsafe(overflowLocation), k1)) {
-                return overflowOutputPosition.getUnsafe(overflowLocation);
-            }
-            overflowLocation = overflowOverflowLocationSource.getUnsafe(overflowLocation);
-        }
-        return -1;
-    }
-}
diff --git a/engine/table/src/main/java/io/deephaven/engine/table/impl/by/typed/staticagg/gen/StaticAggHasherObject.java b/engine/table/src/main/java/io/deephaven/engine/table/impl/by/typed/staticagg/gen/StaticAggHasherObject.java
deleted file mode 100644
index 4ebe22c1533..00000000000
--- a/engine/table/src/main/java/io/deephaven/engine/table/impl/by/typed/staticagg/gen/StaticAggHasherObject.java
+++ /dev/null
@@ -1,178 +0,0 @@
-//
-// Copyright (c) 2016-2024 Deephaven Data Labs and Patent Pending
-//
-// ****** AUTO-GENERATED CLASS - DO NOT EDIT MANUALLY
-// ****** Run ReplicateTypedHashers or ./gradlew replicateTypedHashers to regenerate
-//
-// @formatter:off
-package io.deephaven.engine.table.impl.by.typed.staticagg.gen;
-
-import static io.deephaven.util.compare.ObjectComparisons.eq;
-
-import io.deephaven.chunk.Chunk;
-import io.deephaven.chunk.ObjectChunk;
-import io.deephaven.chunk.attributes.Values;
-import io.deephaven.chunk.util.hashing.ObjectChunkHasher;
-import io.deephaven.engine.rowset.RowSequence;
-import io.deephaven.engine.table.ColumnSource;
-import io.deephaven.engine.table.impl.by.HashHandler;
-import io.deephaven.engine.table.impl.by.StaticChunkedOperatorAggregationStateManagerTypedBase;
-import io.deephaven.engine.table.impl.sources.ObjectArraySource;
-import io.deephaven.util.QueryConstants;
-import java.lang.Object;
-import java.lang.Override;
-
-final class StaticAggHasherObject extends StaticChunkedOperatorAggregationStateManagerTypedBase {
-    private final ObjectArraySource mainKeySource0;
-
-    private final ObjectArraySource overflowKeySource0;
-
-    public StaticAggHasherObject(ColumnSource[] tableKeySources,
-            ColumnSource[] originalTableKeySources, int tableSize, double maximumLoadFactor,
-            double targetLoadFactor) {
-        super(tableKeySources, tableSize, maximumLoadFactor, targetLoadFactor);
-        this.mainKeySource0 = (ObjectArraySource) super.mainKeySources[0];
-        this.overflowKeySource0 = (ObjectArraySource) super.overflowKeySources[0];
-    }
-
-    @Override
-    protected void build(HashHandler handler, RowSequence rowSequence, Chunk[] sourceKeyChunks) {
-        final ObjectChunk<Object, Values> keyChunk0 = sourceKeyChunks[0].asObjectChunk();
-        final int chunkSize = keyChunk0.size();
-        for (int chunkPosition = 0; chunkPosition < chunkSize; ++chunkPosition) {
-            final Object k0 = keyChunk0.get(chunkPosition);
-            final int hash = hash(k0);
-            final int tableLocation = hashToTableLocation(tableHashPivot, hash);
-            if (mainOutputPosition.getUnsafe(tableLocation) == EMPTY_OUTPUT_POSITION) {
-                numEntries++;
-                mainKeySource0.set(tableLocation, k0);
-                handler.doMainInsert(tableLocation, chunkPosition);
-            } else if (eq(mainKeySource0.getUnsafe(tableLocation), k0)) {
-                handler.doMainFound(tableLocation, chunkPosition);
-            } else {
-                int overflowLocation = mainOverflowLocationSource.getUnsafe(tableLocation);
-                if (!findOverflow(handler, k0, chunkPosition, overflowLocation)) {
-                    final int newOverflowLocation = allocateOverflowLocation();
-                    overflowKeySource0.set(newOverflowLocation, k0);
-                    mainOverflowLocationSource.set(tableLocation, newOverflowLocation);
-                    overflowOverflowLocationSource.set(newOverflowLocation, overflowLocation);
-                    numEntries++;
-                    handler.doOverflowInsert(newOverflowLocation, chunkPosition);
-                }
-            }
-        }
-    }
-
-    @Override
-    protected void probe(HashHandler handler, RowSequence rowSequence, Chunk[] sourceKeyChunks) {
-        final ObjectChunk<Object, Values> keyChunk0 = sourceKeyChunks[0].asObjectChunk();
-        final int chunkSize = keyChunk0.size();
-        for (int chunkPosition = 0; chunkPosition < chunkSize; ++chunkPosition) {
-            final Object k0 = keyChunk0.get(chunkPosition);
-            final int hash = hash(k0);
-            final int tableLocation = hashToTableLocation(tableHashPivot, hash);
-            if (mainOutputPosition.getUnsafe(tableLocation) == EMPTY_OUTPUT_POSITION) {
-                handler.doMissing(chunkPosition);
-            } else if (eq(mainKeySource0.getUnsafe(tableLocation), k0)) {
-                handler.doMainFound(tableLocation, chunkPosition);
-            } else {
-                int overflowLocation = mainOverflowLocationSource.getUnsafe(tableLocation);
-                if (!findOverflow(handler, k0, chunkPosition, overflowLocation)) {
-                    handler.doMissing(chunkPosition);
-                }
-            }
-        }
-    }
-
-    private static int hash(Object k0) {
-        int hash = ObjectChunkHasher.hashInitialSingle(k0);
-        return hash;
-    }
-
-    @Override
-    protected void rehashBucket(HashHandler handler, int sourceBucket, int destBucket,
-            int bucketsToAdd) {
-        final int position = mainOutputPosition.getUnsafe(sourceBucket);
-        if (position == EMPTY_OUTPUT_POSITION) {
-            return;
-        }
-        int mainInsertLocation = maybeMoveMainBucket(handler, sourceBucket, destBucket, bucketsToAdd);
-        int overflowLocation = mainOverflowLocationSource.getUnsafe(sourceBucket);
-        mainOverflowLocationSource.set(sourceBucket, QueryConstants.NULL_INT);
-        mainOverflowLocationSource.set(destBucket, QueryConstants.NULL_INT);
-        while (overflowLocation != QueryConstants.NULL_INT) {
-            final int nextOverflowLocation = overflowOverflowLocationSource.getUnsafe(overflowLocation);
-            final Object overflowKey0 = overflowKeySource0.getUnsafe(overflowLocation);
-            final int overflowHash = hash(overflowKey0);
-            final int overflowTableLocation = hashToTableLocation(tableHashPivot + bucketsToAdd, overflowHash);
-            if (overflowTableLocation == mainInsertLocation) {
-                mainKeySource0.set(mainInsertLocation, overflowKey0);
-                mainOutputPosition.set(mainInsertLocation, overflowOutputPosition.getUnsafe(overflowLocation));
-                handler.doPromoteOverflow(overflowLocation, mainInsertLocation);
-                overflowOutputPosition.set(overflowLocation, QueryConstants.NULL_INT);
-                overflowKeySource0.set(overflowLocation, null);
-                freeOverflowLocation(overflowLocation);
-                mainInsertLocation = -1;
-            } else {
-                final int oldOverflowLocation = mainOverflowLocationSource.getUnsafe(overflowTableLocation);
-                mainOverflowLocationSource.set(overflowTableLocation, overflowLocation);
-                overflowOverflowLocationSource.set(overflowLocation, oldOverflowLocation);
-            }
-            overflowLocation = nextOverflowLocation;
-        }
-    }
-
-    private int maybeMoveMainBucket(HashHandler handler, int sourceBucket, int destBucket,
-            int bucketsToAdd) {
-        final Object k0 = mainKeySource0.getUnsafe(sourceBucket);
-        final int hash = hash(k0);
-        final int location = hashToTableLocation(tableHashPivot + bucketsToAdd, hash);
-        final int mainInsertLocation;
-        if (location == sourceBucket) {
-            mainInsertLocation = destBucket;
-            mainOutputPosition.set(destBucket, EMPTY_OUTPUT_POSITION);
-        } else {
-            mainInsertLocation = sourceBucket;
-            mainOutputPosition.set(destBucket, mainOutputPosition.getUnsafe(sourceBucket));
-            mainOutputPosition.set(sourceBucket, EMPTY_OUTPUT_POSITION);
-            mainKeySource0.set(destBucket, k0);
-            mainKeySource0.set(sourceBucket, null);
-            handler.doMoveMain(sourceBucket, destBucket);
-        }
-        return mainInsertLocation;
-    }
-
-    private boolean findOverflow(HashHandler handler, Object k0, int chunkPosition,
-            int overflowLocation) {
-        while (overflowLocation != QueryConstants.NULL_INT) {
-            if (eq(overflowKeySource0.getUnsafe(overflowLocation), k0)) {
-                handler.doOverflowFound(overflowLocation, chunkPosition);
-                return true;
-            }
-            overflowLocation = overflowOverflowLocationSource.getUnsafe(overflowLocation);
-        }
-        return false;
-    }
-
-    @Override
-    public int findPositionForKey(Object key) {
-        final Object k0 = key;
-        int hash = hash(k0);
-        final int tableLocation = hashToTableLocation(tableHashPivot, hash);
-        final int positionValue = mainOutputPosition.getUnsafe(tableLocation);
-        if (positionValue == EMPTY_OUTPUT_POSITION) {
-            return -1;
-        }
-        if (eq(mainKeySource0.getUnsafe(tableLocation), k0)) {
-            return positionValue;
-        }
-        int overflowLocation = mainOverflowLocationSource.getUnsafe(tableLocation);
-        while (overflowLocation != QueryConstants.NULL_INT) {
-            if (eq(overflowKeySource0.getUnsafe(overflowLocation), k0)) {
-                return overflowOutputPosition.getUnsafe(overflowLocation);
-            }
-            overflowLocation = overflowOverflowLocationSource.getUnsafe(overflowLocation);
-        }
-        return -1;
-    }
-}
diff --git a/engine/table/src/main/java/io/deephaven/engine/table/impl/by/typed/staticagg/gen/StaticAggHasherObjectByte.java b/engine/table/src/main/java/io/deephaven/engine/table/impl/by/typed/staticagg/gen/StaticAggHasherObjectByte.java
deleted file mode 100644
index 8f9d45a493e..00000000000
--- a/engine/table/src/main/java/io/deephaven/engine/table/impl/by/typed/staticagg/gen/StaticAggHasherObjectByte.java
+++ /dev/null
@@ -1,205 +0,0 @@
-//
-// Copyright (c) 2016-2024 Deephaven Data Labs and Patent Pending
-//
-// ****** AUTO-GENERATED CLASS - DO NOT EDIT MANUALLY
-// ****** Run ReplicateTypedHashers or ./gradlew replicateTypedHashers to regenerate
-//
-// @formatter:off
-package io.deephaven.engine.table.impl.by.typed.staticagg.gen;
-
-import static io.deephaven.util.compare.ByteComparisons.eq;
-import static io.deephaven.util.compare.ObjectComparisons.eq;
-
-import io.deephaven.chunk.ByteChunk;
-import io.deephaven.chunk.Chunk;
-import io.deephaven.chunk.ObjectChunk;
-import io.deephaven.chunk.attributes.Values;
-import io.deephaven.chunk.util.hashing.ByteChunkHasher;
-import io.deephaven.chunk.util.hashing.ObjectChunkHasher;
-import io.deephaven.engine.rowset.RowSequence;
-import io.deephaven.engine.table.ColumnSource;
-import io.deephaven.engine.table.impl.by.HashHandler;
-import io.deephaven.engine.table.impl.by.StaticChunkedOperatorAggregationStateManagerTypedBase;
-import io.deephaven.engine.table.impl.sources.ByteArraySource;
-import io.deephaven.engine.table.impl.sources.ObjectArraySource;
-import io.deephaven.util.QueryConstants;
-import io.deephaven.util.type.TypeUtils;
-import java.lang.Byte;
-import java.lang.Object;
-import java.lang.Override;
-
-final class StaticAggHasherObjectByte extends StaticChunkedOperatorAggregationStateManagerTypedBase {
-    private final ObjectArraySource mainKeySource0;
-
-    private final ObjectArraySource overflowKeySource0;
-
-    private final ByteArraySource mainKeySource1;
-
-    private final ByteArraySource overflowKeySource1;
-
-    public StaticAggHasherObjectByte(ColumnSource[] tableKeySources,
-            ColumnSource[] originalTableKeySources, int tableSize, double maximumLoadFactor,
-            double targetLoadFactor) {
-        super(tableKeySources, tableSize, maximumLoadFactor, targetLoadFactor);
-        this.mainKeySource0 = (ObjectArraySource) super.mainKeySources[0];
-        this.overflowKeySource0 = (ObjectArraySource) super.overflowKeySources[0];
-        this.mainKeySource1 = (ByteArraySource) super.mainKeySources[1];
-        this.overflowKeySource1 = (ByteArraySource) super.overflowKeySources[1];
-    }
-
-    @Override
-    protected void build(HashHandler handler, RowSequence rowSequence, Chunk[] sourceKeyChunks) {
-        final ObjectChunk<Object, Values> keyChunk0 = sourceKeyChunks[0].asObjectChunk();
-        final ByteChunk<Values> keyChunk1 = sourceKeyChunks[1].asByteChunk();
-        final int chunkSize = keyChunk0.size();
-        for (int chunkPosition = 0; chunkPosition < chunkSize; ++chunkPosition) {
-            final Object k0 = keyChunk0.get(chunkPosition);
-            final byte k1 = keyChunk1.get(chunkPosition);
-            final int hash = hash(k0, k1);
-            final int tableLocation = hashToTableLocation(tableHashPivot, hash);
-            if (mainOutputPosition.getUnsafe(tableLocation) == EMPTY_OUTPUT_POSITION) {
-                numEntries++;
-                mainKeySource0.set(tableLocation, k0);
-                mainKeySource1.set(tableLocation, k1);
-                handler.doMainInsert(tableLocation, chunkPosition);
-            } else if (eq(mainKeySource0.getUnsafe(tableLocation), k0) && eq(mainKeySource1.getUnsafe(tableLocation), k1)) {
-                handler.doMainFound(tableLocation, chunkPosition);
-            } else {
-                int overflowLocation = mainOverflowLocationSource.getUnsafe(tableLocation);
-                if (!findOverflow(handler, k0, k1, chunkPosition, overflowLocation)) {
-                    final int newOverflowLocation = allocateOverflowLocation();
-                    overflowKeySource0.set(newOverflowLocation, k0);
-                    overflowKeySource1.set(newOverflowLocation, k1);
-                    mainOverflowLocationSource.set(tableLocation, newOverflowLocation);
-                    overflowOverflowLocationSource.set(newOverflowLocation, overflowLocation);
-                    numEntries++;
-                    handler.doOverflowInsert(newOverflowLocation, chunkPosition);
-                }
-            }
-        }
-    }
-
-    @Override
-    protected void probe(HashHandler handler, RowSequence rowSequence, Chunk[] sourceKeyChunks) {
-        final ObjectChunk<Object, Values> keyChunk0 = sourceKeyChunks[0].asObjectChunk();
-        final ByteChunk<Values> keyChunk1 = sourceKeyChunks[1].asByteChunk();
-        final int chunkSize = keyChunk0.size();
-        for (int chunkPosition = 0; chunkPosition < chunkSize; ++chunkPosition) {
-            final Object k0 = keyChunk0.get(chunkPosition);
-            final byte k1 = keyChunk1.get(chunkPosition);
-            final int hash = hash(k0, k1);
-            final int tableLocation = hashToTableLocation(tableHashPivot, hash);
-            if (mainOutputPosition.getUnsafe(tableLocation) == EMPTY_OUTPUT_POSITION) {
-                handler.doMissing(chunkPosition);
-            } else if (eq(mainKeySource0.getUnsafe(tableLocation), k0) && eq(mainKeySource1.getUnsafe(tableLocation), k1)) {
-                handler.doMainFound(tableLocation, chunkPosition);
-            } else {
-                int overflowLocation = mainOverflowLocationSource.getUnsafe(tableLocation);
-                if (!findOverflow(handler, k0, k1, chunkPosition, overflowLocation)) {
-                    handler.doMissing(chunkPosition);
-                }
-            }
-        }
-    }
-
-    private static int hash(Object k0, byte k1) {
-        int hash = ObjectChunkHasher.hashInitialSingle(k0);
-        hash = ByteChunkHasher.hashUpdateSingle(hash, k1);
-        return hash;
-    }
-
-    @Override
-    protected void rehashBucket(HashHandler handler, int sourceBucket, int destBucket,
-            int bucketsToAdd) {
-        final int position = mainOutputPosition.getUnsafe(sourceBucket);
-        if (position == EMPTY_OUTPUT_POSITION) {
-            return;
-        }
-        int mainInsertLocation = maybeMoveMainBucket(handler, sourceBucket, destBucket, bucketsToAdd);
-        int overflowLocation = mainOverflowLocationSource.getUnsafe(sourceBucket);
-        mainOverflowLocationSource.set(sourceBucket, QueryConstants.NULL_INT);
-        mainOverflowLocationSource.set(destBucket, QueryConstants.NULL_INT);
-        while (overflowLocation != QueryConstants.NULL_INT) {
-            final int nextOverflowLocation = overflowOverflowLocationSource.getUnsafe(overflowLocation);
-            final Object overflowKey0 = overflowKeySource0.getUnsafe(overflowLocation);
-            final byte overflowKey1 = overflowKeySource1.getUnsafe(overflowLocation);
-            final int overflowHash = hash(overflowKey0, overflowKey1);
-            final int overflowTableLocation = hashToTableLocation(tableHashPivot + bucketsToAdd, overflowHash);
-            if (overflowTableLocation == mainInsertLocation) {
-                mainKeySource0.set(mainInsertLocation, overflowKey0);
-                mainKeySource1.set(mainInsertLocation, overflowKey1);
-                mainOutputPosition.set(mainInsertLocation, overflowOutputPosition.getUnsafe(overflowLocation));
-                handler.doPromoteOverflow(overflowLocation, mainInsertLocation);
-                overflowOutputPosition.set(overflowLocation, QueryConstants.NULL_INT);
-                overflowKeySource0.set(overflowLocation, null);
-                overflowKeySource1.set(overflowLocation, QueryConstants.NULL_BYTE);
-                freeOverflowLocation(overflowLocation);
-                mainInsertLocation = -1;
-            } else {
-                final int oldOverflowLocation = mainOverflowLocationSource.getUnsafe(overflowTableLocation);
-                mainOverflowLocationSource.set(overflowTableLocation, overflowLocation);
-                overflowOverflowLocationSource.set(overflowLocation, oldOverflowLocation);
-            }
-            overflowLocation = nextOverflowLocation;
-        }
-    }
-
-    private int maybeMoveMainBucket(HashHandler handler, int sourceBucket, int destBucket,
-            int bucketsToAdd) {
-        final Object k0 = mainKeySource0.getUnsafe(sourceBucket);
-        final byte k1 = mainKeySource1.getUnsafe(sourceBucket);
-        final int hash = hash(k0, k1);
-        final int location = hashToTableLocation(tableHashPivot + bucketsToAdd, hash);
-        final int mainInsertLocation;
-        if (location == sourceBucket) {
-            mainInsertLocation = destBucket;
-            mainOutputPosition.set(destBucket, EMPTY_OUTPUT_POSITION);
-        } else {
-            mainInsertLocation = sourceBucket;
-            mainOutputPosition.set(destBucket, mainOutputPosition.getUnsafe(sourceBucket));
-            mainOutputPosition.set(sourceBucket, EMPTY_OUTPUT_POSITION);
-            mainKeySource0.set(destBucket, k0);
-            mainKeySource0.set(sourceBucket, null);
-            mainKeySource1.set(destBucket, k1);
-            mainKeySource1.set(sourceBucket, QueryConstants.NULL_BYTE);
-            handler.doMoveMain(sourceBucket, destBucket);
-        }
-        return mainInsertLocation;
-    }
-
-    private boolean findOverflow(HashHandler handler, Object k0, byte k1, int chunkPosition,
-            int overflowLocation) {
-        while (overflowLocation != QueryConstants.NULL_INT) {
-            if (eq(overflowKeySource0.getUnsafe(overflowLocation), k0) && eq(overflowKeySource1.getUnsafe(overflowLocation), k1)) {
-                handler.doOverflowFound(overflowLocation, chunkPosition);
-                return true;
-            }
-            overflowLocation = overflowOverflowLocationSource.getUnsafe(overflowLocation);
-        }
-        return false;
-    }
-
-    @Override
-    public int findPositionForKey(Object key) {
-        final Object [] ka = (Object[])key;
-        final Object k0 = ka[0];
-        final byte k1 = TypeUtils.unbox((Byte)ka[1]);
-        int hash = hash(k0, k1);
-        final int tableLocation = hashToTableLocation(tableHashPivot, hash);
-        final int positionValue = mainOutputPosition.getUnsafe(tableLocation);
-        if (positionValue == EMPTY_OUTPUT_POSITION) {
-            return -1;
-        }
-        if (eq(mainKeySource0.getUnsafe(tableLocation), k0) && eq(mainKeySource1.getUnsafe(tableLocation), k1)) {
-            return positionValue;
-        }
-        int overflowLocation = mainOverflowLocationSource.getUnsafe(tableLocation);
-        while (overflowLocation != QueryConstants.NULL_INT) {
-            if (eq(overflowKeySource0.getUnsafe(overflowLocation), k0) && eq(overflowKeySource1.getUnsafe(overflowLocation), k1)) {
-                return overflowOutputPosition.getUnsafe(overflowLocation);
-            }
-            overflowLocation = overflowOverflowLocationSource.getUnsafe(overflowLocation);
-        }
-        return -1;
-    }
-}
diff --git a/engine/table/src/main/java/io/deephaven/engine/table/impl/by/typed/staticagg/gen/StaticAggHasherObjectChar.java b/engine/table/src/main/java/io/deephaven/engine/table/impl/by/typed/staticagg/gen/StaticAggHasherObjectChar.java
deleted file mode 100644
index 5baf6d6815e..00000000000
--- a/engine/table/src/main/java/io/deephaven/engine/table/impl/by/typed/staticagg/gen/StaticAggHasherObjectChar.java
+++ /dev/null
@@ -1,205 +0,0 @@
-//
-// Copyright (c) 2016-2024 Deephaven Data Labs and Patent Pending
-//
-// ****** AUTO-GENERATED CLASS - DO NOT EDIT MANUALLY
-// ****** Run ReplicateTypedHashers or ./gradlew replicateTypedHashers to regenerate
-//
-// @formatter:off
-package io.deephaven.engine.table.impl.by.typed.staticagg.gen;
-
-import static io.deephaven.util.compare.CharComparisons.eq;
-import static io.deephaven.util.compare.ObjectComparisons.eq;
-
-import io.deephaven.chunk.CharChunk;
-import io.deephaven.chunk.Chunk;
-import io.deephaven.chunk.ObjectChunk;
-import io.deephaven.chunk.attributes.Values;
-import io.deephaven.chunk.util.hashing.CharChunkHasher;
-import io.deephaven.chunk.util.hashing.ObjectChunkHasher;
-import io.deephaven.engine.rowset.RowSequence;
-import io.deephaven.engine.table.ColumnSource;
-import io.deephaven.engine.table.impl.by.HashHandler;
-import io.deephaven.engine.table.impl.by.StaticChunkedOperatorAggregationStateManagerTypedBase;
-import io.deephaven.engine.table.impl.sources.CharacterArraySource;
-import io.deephaven.engine.table.impl.sources.ObjectArraySource;
-import io.deephaven.util.QueryConstants;
-import io.deephaven.util.type.TypeUtils;
-import java.lang.Character;
-import java.lang.Object;
-import java.lang.Override;
-
-final class StaticAggHasherObjectChar extends StaticChunkedOperatorAggregationStateManagerTypedBase {
-    private final ObjectArraySource mainKeySource0;
-
-    private final ObjectArraySource overflowKeySource0;
-
-    private final CharacterArraySource mainKeySource1;
-
-    private final CharacterArraySource overflowKeySource1;
-
-    public StaticAggHasherObjectChar(ColumnSource[] tableKeySources,
-            ColumnSource[] originalTableKeySources, int tableSize, double maximumLoadFactor,
-            double targetLoadFactor) {
-        super(tableKeySources, tableSize, maximumLoadFactor, targetLoadFactor);
-        this.mainKeySource0 = (ObjectArraySource) super.mainKeySources[0];
-        this.overflowKeySource0 = (ObjectArraySource) super.overflowKeySources[0];
-        this.mainKeySource1 = (CharacterArraySource) super.mainKeySources[1];
-        this.overflowKeySource1 = (CharacterArraySource) super.overflowKeySources[1];
-    }
-
-    @Override
-    protected void build(HashHandler handler, RowSequence rowSequence, Chunk[] sourceKeyChunks) {
-        final ObjectChunk<Object, Values> keyChunk0 = sourceKeyChunks[0].asObjectChunk();
-        final CharChunk<Values> keyChunk1 = sourceKeyChunks[1].asCharChunk();
-        final int chunkSize = keyChunk0.size();
-        for (int chunkPosition = 0; chunkPosition < chunkSize; ++chunkPosition) {
-            final Object k0 = keyChunk0.get(chunkPosition);
-            final char k1 = keyChunk1.get(chunkPosition);
-            final int hash = hash(k0, k1);
-            final int tableLocation = hashToTableLocation(tableHashPivot, hash);
-            if (mainOutputPosition.getUnsafe(tableLocation) == EMPTY_OUTPUT_POSITION) {
-                numEntries++;
-                mainKeySource0.set(tableLocation, k0);
-                mainKeySource1.set(tableLocation, k1);
-                handler.doMainInsert(tableLocation, chunkPosition);
-            } else if (eq(mainKeySource0.getUnsafe(tableLocation), k0) && eq(mainKeySource1.getUnsafe(tableLocation), k1)) {
-                handler.doMainFound(tableLocation, chunkPosition);
-            } else {
-                int overflowLocation = mainOverflowLocationSource.getUnsafe(tableLocation);
-                if (!findOverflow(handler, k0, k1, chunkPosition, overflowLocation)) {
-                    final int newOverflowLocation = allocateOverflowLocation();
-                    overflowKeySource0.set(newOverflowLocation, k0);
-                    overflowKeySource1.set(newOverflowLocation, k1);
-                    mainOverflowLocationSource.set(tableLocation, newOverflowLocation);
-                    overflowOverflowLocationSource.set(newOverflowLocation, overflowLocation);
-                    numEntries++;
-                    handler.doOverflowInsert(newOverflowLocation, chunkPosition);
-                }
-            }
-        }
-    }
-
-    @Override
-    protected void probe(HashHandler handler, RowSequence rowSequence, Chunk[] sourceKeyChunks) {
-        final ObjectChunk<Object, Values> keyChunk0 = sourceKeyChunks[0].asObjectChunk();
-        final CharChunk<Values> keyChunk1 = sourceKeyChunks[1].asCharChunk();
-        final int chunkSize = keyChunk0.size();
-        for (int chunkPosition = 0; chunkPosition < chunkSize; ++chunkPosition) {
-            final Object k0 = keyChunk0.get(chunkPosition);
-            final char k1 = keyChunk1.get(chunkPosition);
-            final int hash = hash(k0, k1);
-            final int tableLocation = hashToTableLocation(tableHashPivot, hash);
-            if (mainOutputPosition.getUnsafe(tableLocation) == EMPTY_OUTPUT_POSITION) {
-                handler.doMissing(chunkPosition);
-            } else if (eq(mainKeySource0.getUnsafe(tableLocation), k0) && eq(mainKeySource1.getUnsafe(tableLocation), k1)) {
-                handler.doMainFound(tableLocation, chunkPosition);
-            } else {
-                int overflowLocation = mainOverflowLocationSource.getUnsafe(tableLocation);
-                if (!findOverflow(handler, k0, k1, chunkPosition, overflowLocation)) {
-                    handler.doMissing(chunkPosition);
-                }
-            }
-        }
-    }
-
-    private static int hash(Object k0, char k1) {
-        int hash = ObjectChunkHasher.hashInitialSingle(k0);
-        hash = CharChunkHasher.hashUpdateSingle(hash, k1);
-        return hash;
-    }
-
-    @Override
-    protected void rehashBucket(HashHandler handler, int sourceBucket, int destBucket,
-            int bucketsToAdd) {
-        final int position = mainOutputPosition.getUnsafe(sourceBucket);
-        if (position == EMPTY_OUTPUT_POSITION) {
-            return;
-        }
-        int mainInsertLocation = maybeMoveMainBucket(handler, sourceBucket, destBucket, bucketsToAdd);
-        int overflowLocation = mainOverflowLocationSource.getUnsafe(sourceBucket);
-        mainOverflowLocationSource.set(sourceBucket, QueryConstants.NULL_INT);
-        mainOverflowLocationSource.set(destBucket, QueryConstants.NULL_INT);
-        while (overflowLocation != QueryConstants.NULL_INT) {
-            final int nextOverflowLocation = overflowOverflowLocationSource.getUnsafe(overflowLocation);
-            final Object overflowKey0 = overflowKeySource0.getUnsafe(overflowLocation);
-            final char overflowKey1 = overflowKeySource1.getUnsafe(overflowLocation);
-            final int overflowHash = hash(overflowKey0, overflowKey1);
-            final int overflowTableLocation = hashToTableLocation(tableHashPivot + bucketsToAdd, overflowHash);
-            if (overflowTableLocation == mainInsertLocation) {
-                mainKeySource0.set(mainInsertLocation, overflowKey0);
-                mainKeySource1.set(mainInsertLocation, overflowKey1);
-                mainOutputPosition.set(mainInsertLocation, overflowOutputPosition.getUnsafe(overflowLocation));
-                handler.doPromoteOverflow(overflowLocation, mainInsertLocation);
-                overflowOutputPosition.set(overflowLocation, QueryConstants.NULL_INT);
-                overflowKeySource0.set(overflowLocation, null);
-                overflowKeySource1.set(overflowLocation, QueryConstants.NULL_CHAR);
-                freeOverflowLocation(overflowLocation);
-                mainInsertLocation = -1;
-            } else {
-                final int oldOverflowLocation = mainOverflowLocationSource.getUnsafe(overflowTableLocation);
-                mainOverflowLocationSource.set(overflowTableLocation, overflowLocation);
-                overflowOverflowLocationSource.set(overflowLocation, oldOverflowLocation);
-            }
-            overflowLocation = nextOverflowLocation;
-        }
-    }
-
-    private int maybeMoveMainBucket(HashHandler handler, int sourceBucket, int destBucket,
-            int bucketsToAdd) {
-        final Object k0 = mainKeySource0.getUnsafe(sourceBucket);
-        final char k1 = mainKeySource1.getUnsafe(sourceBucket);
-        final int hash = hash(k0, k1);
-        final int location = hashToTableLocation(tableHashPivot + bucketsToAdd, hash);
-        final int mainInsertLocation;
-        if (location == sourceBucket) {
-            mainInsertLocation = destBucket;
-            mainOutputPosition.set(destBucket, EMPTY_OUTPUT_POSITION);
-        } else {
-            mainInsertLocation = sourceBucket;
-            mainOutputPosition.set(destBucket, mainOutputPosition.getUnsafe(sourceBucket));
-            mainOutputPosition.set(sourceBucket, EMPTY_OUTPUT_POSITION);
-            mainKeySource0.set(destBucket, k0);
-            mainKeySource0.set(sourceBucket, null);
-            mainKeySource1.set(destBucket, k1);
-            mainKeySource1.set(sourceBucket, QueryConstants.NULL_CHAR);
-            handler.doMoveMain(sourceBucket, destBucket);
-        }
-        return mainInsertLocation;
-    }
-
-    private boolean findOverflow(HashHandler handler, Object k0, char k1, int chunkPosition,
-            int overflowLocation) {
-        while (overflowLocation != QueryConstants.NULL_INT) {
-            if (eq(overflowKeySource0.getUnsafe(overflowLocation), k0) && eq(overflowKeySource1.getUnsafe(overflowLocation), k1)) {
-                handler.doOverflowFound(overflowLocation, chunkPosition);
-                return true;
-            }
-            overflowLocation = overflowOverflowLocationSource.getUnsafe(overflowLocation);
-        }
-        return false;
-    }
-
-    @Override
-    public int findPositionForKey(Object key) {
-        final Object [] ka = (Object[])key;
-        final Object k0 = ka[0];
-        final char k1 = TypeUtils.unbox((Character)ka[1]);
-        int hash = hash(k0, k1);
-        final int tableLocation = hashToTableLocation(tableHashPivot, hash);
-        final int positionValue = mainOutputPosition.getUnsafe(tableLocation);
-        if (positionValue == EMPTY_OUTPUT_POSITION) {
-            return -1;
-        }
-        if (eq(mainKeySource0.getUnsafe(tableLocation), k0) && eq(mainKeySource1.getUnsafe(tableLocation), k1)) {
-            return positionValue;
-        }
-        int overflowLocation = mainOverflowLocationSource.getUnsafe(tableLocation);
-        while (overflowLocation != QueryConstants.NULL_INT) {
-            if (eq(overflowKeySource0.getUnsafe(overflowLocation), k0) && eq(overflowKeySource1.getUnsafe(overflowLocation), k1)) {
-                return overflowOutputPosition.getUnsafe(overflowLocation);
-            }
-            overflowLocation = overflowOverflowLocationSource.getUnsafe(overflowLocation);
-        }
-        return -1;
-    }
-}
diff --git a/engine/table/src/main/java/io/deephaven/engine/table/impl/by/typed/staticagg/gen/StaticAggHasherObjectDouble.java b/engine/table/src/main/java/io/deephaven/engine/table/impl/by/typed/staticagg/gen/StaticAggHasherObjectDouble.java
deleted file mode 100644
index 836e70e5e1a..00000000000
--- a/engine/table/src/main/java/io/deephaven/engine/table/impl/by/typed/staticagg/gen/StaticAggHasherObjectDouble.java
+++ /dev/null
@@ -1,205 +0,0 @@
-//
-// Copyright (c) 2016-2024 Deephaven Data Labs and Patent Pending
-//
-// ****** AUTO-GENERATED CLASS - DO NOT EDIT MANUALLY
-// ****** Run ReplicateTypedHashers or ./gradlew replicateTypedHashers to regenerate
-//
-// @formatter:off
-package io.deephaven.engine.table.impl.by.typed.staticagg.gen;
-
-import static io.deephaven.util.compare.DoubleComparisons.eq;
-import static io.deephaven.util.compare.ObjectComparisons.eq;
-
-import io.deephaven.chunk.Chunk;
-import io.deephaven.chunk.DoubleChunk;
-import io.deephaven.chunk.ObjectChunk;
-import io.deephaven.chunk.attributes.Values;
-import io.deephaven.chunk.util.hashing.DoubleChunkHasher;
-import io.deephaven.chunk.util.hashing.ObjectChunkHasher;
-import io.deephaven.engine.rowset.RowSequence;
-import io.deephaven.engine.table.ColumnSource;
-import io.deephaven.engine.table.impl.by.HashHandler;
-import io.deephaven.engine.table.impl.by.StaticChunkedOperatorAggregationStateManagerTypedBase;
-import io.deephaven.engine.table.impl.sources.DoubleArraySource;
-import io.deephaven.engine.table.impl.sources.ObjectArraySource;
-import io.deephaven.util.QueryConstants;
-import io.deephaven.util.type.TypeUtils;
-import java.lang.Double;
-import java.lang.Object;
-import java.lang.Override;
-
-final class StaticAggHasherObjectDouble extends StaticChunkedOperatorAggregationStateManagerTypedBase {
-    private final ObjectArraySource mainKeySource0;
-
-    private final ObjectArraySource overflowKeySource0;
-
-    private final DoubleArraySource mainKeySource1;
-
-    private final DoubleArraySource overflowKeySource1;
-
-    public StaticAggHasherObjectDouble(ColumnSource[] tableKeySources,
-            ColumnSource[] originalTableKeySources, int tableSize, double maximumLoadFactor,
-            double targetLoadFactor) {
-        super(tableKeySources, tableSize, maximumLoadFactor, targetLoadFactor);
-        this.mainKeySource0 = (ObjectArraySource) super.mainKeySources[0];
-        this.overflowKeySource0 = (ObjectArraySource) super.overflowKeySources[0];
-        this.mainKeySource1 = (DoubleArraySource) super.mainKeySources[1];
-        this.overflowKeySource1 = (DoubleArraySource) super.overflowKeySources[1];
-    }
-
-    @Override
-    protected void build(HashHandler handler, RowSequence rowSequence, Chunk[] sourceKeyChunks) {
-        final ObjectChunk<Object, Values> keyChunk0 = sourceKeyChunks[0].asObjectChunk();
-        final DoubleChunk<Values> keyChunk1 = sourceKeyChunks[1].asDoubleChunk();
-        final int chunkSize = keyChunk0.size();
-        for (int chunkPosition = 0; chunkPosition < chunkSize; ++chunkPosition) {
-            final Object k0 = keyChunk0.get(chunkPosition);
-            final double k1 = keyChunk1.get(chunkPosition);
-            final int hash = hash(k0, k1);
-            final int tableLocation = hashToTableLocation(tableHashPivot, hash);
-            if (mainOutputPosition.getUnsafe(tableLocation) == EMPTY_OUTPUT_POSITION) {
-                numEntries++;
-                mainKeySource0.set(tableLocation, k0);
-                mainKeySource1.set(tableLocation, k1);
-                handler.doMainInsert(tableLocation, chunkPosition);
-            } else if (eq(mainKeySource0.getUnsafe(tableLocation), k0) && eq(mainKeySource1.getUnsafe(tableLocation), k1)) {
-                handler.doMainFound(tableLocation, chunkPosition);
-            } else {
-                int overflowLocation = mainOverflowLocationSource.getUnsafe(tableLocation);
-                if (!findOverflow(handler, k0, k1, chunkPosition, overflowLocation)) {
-                    final int newOverflowLocation = allocateOverflowLocation();
-                    overflowKeySource0.set(newOverflowLocation, k0);
-                    overflowKeySource1.set(newOverflowLocation, k1);
-                    mainOverflowLocationSource.set(tableLocation, newOverflowLocation);
-                    overflowOverflowLocationSource.set(newOverflowLocation, overflowLocation);
-                    numEntries++;
-                    handler.doOverflowInsert(newOverflowLocation, chunkPosition);
-                }
-            }
-        }
-    }
-
-    @Override
-    protected void probe(HashHandler handler, RowSequence rowSequence, Chunk[] sourceKeyChunks) {
-        final ObjectChunk<Object, Values> keyChunk0 = sourceKeyChunks[0].asObjectChunk();
-        final DoubleChunk<Values> keyChunk1 = sourceKeyChunks[1].asDoubleChunk();
-        final int chunkSize = keyChunk0.size();
-        for (int chunkPosition = 0; chunkPosition < chunkSize; ++chunkPosition) {
-            final Object k0 = keyChunk0.get(chunkPosition);
-            final double k1 = keyChunk1.get(chunkPosition);
-            final int hash = hash(k0, k1);
-            final int tableLocation = hashToTableLocation(tableHashPivot, hash);
-            if (mainOutputPosition.getUnsafe(tableLocation) == EMPTY_OUTPUT_POSITION) {
-                handler.doMissing(chunkPosition);
-            } else if (eq(mainKeySource0.getUnsafe(tableLocation), k0) && eq(mainKeySource1.getUnsafe(tableLocation), k1)) {
-                handler.doMainFound(tableLocation, chunkPosition);
-            } else {
-                int overflowLocation = mainOverflowLocationSource.getUnsafe(tableLocation);
-                if (!findOverflow(handler, k0, k1, chunkPosition, overflowLocation)) {
-                    handler.doMissing(chunkPosition);
-                }
-            }
-        }
-    }
-
-    private static int hash(Object k0, double k1) {
-        int hash = ObjectChunkHasher.hashInitialSingle(k0);
-        hash = DoubleChunkHasher.hashUpdateSingle(hash, k1);
-        return hash;
-    }
-
-    @Override
-    protected void rehashBucket(HashHandler handler, int sourceBucket, int destBucket,
-            int bucketsToAdd) {
-        final int position = mainOutputPosition.getUnsafe(sourceBucket);
-        if (position == EMPTY_OUTPUT_POSITION) {
-            return;
-        }
-        int mainInsertLocation = maybeMoveMainBucket(handler, sourceBucket, destBucket, bucketsToAdd);
-        int overflowLocation = mainOverflowLocationSource.getUnsafe(sourceBucket);
-        mainOverflowLocationSource.set(sourceBucket, QueryConstants.NULL_INT);
-        mainOverflowLocationSource.set(destBucket, QueryConstants.NULL_INT);
-        while (overflowLocation != QueryConstants.NULL_INT) {
-            final int nextOverflowLocation = overflowOverflowLocationSource.getUnsafe(overflowLocation);
-            final Object overflowKey0 = overflowKeySource0.getUnsafe(overflowLocation);
-            final double overflowKey1 = overflowKeySource1.getUnsafe(overflowLocation);
-            final int overflowHash = hash(overflowKey0, overflowKey1);
-            final int overflowTableLocation = hashToTableLocation(tableHashPivot + bucketsToAdd, overflowHash);
-            if (overflowTableLocation == mainInsertLocation) {
-                mainKeySource0.set(mainInsertLocation, overflowKey0);
-                mainKeySource1.set(mainInsertLocation, overflowKey1);
-                mainOutputPosition.set(mainInsertLocation, overflowOutputPosition.getUnsafe(overflowLocation));
-                handler.doPromoteOverflow(overflowLocation, mainInsertLocation);
-                overflowOutputPosition.set(overflowLocation, QueryConstants.NULL_INT);
-                overflowKeySource0.set(overflowLocation, null);
-                overflowKeySource1.set(overflowLocation, QueryConstants.NULL_DOUBLE);
-                freeOverflowLocation(overflowLocation);
-                mainInsertLocation = -1;
-            } else {
-                final int oldOverflowLocation = mainOverflowLocationSource.getUnsafe(overflowTableLocation);
-                mainOverflowLocationSource.set(overflowTableLocation, overflowLocation);
-                overflowOverflowLocationSource.set(overflowLocation, oldOverflowLocation);
-            }
-            overflowLocation = nextOverflowLocation;
-        }
-    }
-
-    private int maybeMoveMainBucket(HashHandler handler, int sourceBucket, int destBucket,
-            int bucketsToAdd) {
-        final Object k0 = mainKeySource0.getUnsafe(sourceBucket);
-        final double k1 = mainKeySource1.getUnsafe(sourceBucket);
-        final int hash = hash(k0, k1);
-        final int location = hashToTableLocation(tableHashPivot + bucketsToAdd, hash);
-        final int mainInsertLocation;
-        if (location == sourceBucket) {
-            mainInsertLocation = destBucket;
-            mainOutputPosition.set(destBucket, EMPTY_OUTPUT_POSITION);
-        } else {
-            mainInsertLocation = sourceBucket;
-            mainOutputPosition.set(destBucket, mainOutputPosition.getUnsafe(sourceBucket));
-            mainOutputPosition.set(sourceBucket, EMPTY_OUTPUT_POSITION);
-            mainKeySource0.set(destBucket, k0);
-            mainKeySource0.set(sourceBucket, null);
-            mainKeySource1.set(destBucket, k1);
-            mainKeySource1.set(sourceBucket, QueryConstants.NULL_DOUBLE);
-            handler.doMoveMain(sourceBucket, destBucket);
-        }
-        return mainInsertLocation;
-    }
-
-    private boolean findOverflow(HashHandler handler, Object k0, double k1, int chunkPosition,
-            int overflowLocation) {
-        while (overflowLocation != QueryConstants.NULL_INT) {
-            if (eq(overflowKeySource0.getUnsafe(overflowLocation), k0) && eq(overflowKeySource1.getUnsafe(overflowLocation), k1)) {
-                handler.doOverflowFound(overflowLocation, chunkPosition);
-                return true;
-            }
-            overflowLocation = overflowOverflowLocationSource.getUnsafe(overflowLocation);
-        }
-        return false;
-    }
-
-    @Override
-    public int findPositionForKey(Object key) {
-        final Object [] ka = (Object[])key;
-        final Object k0 = ka[0];
-        final double k1 = TypeUtils.unbox((Double)ka[1]);
-        int hash = hash(k0, k1);
-        final int tableLocation = hashToTableLocation(tableHashPivot, hash);
-        final int positionValue = mainOutputPosition.getUnsafe(tableLocation);
-        if (positionValue == EMPTY_OUTPUT_POSITION) {
-            return -1;
-        }
-        if (eq(mainKeySource0.getUnsafe(tableLocation), k0) && eq(mainKeySource1.getUnsafe(tableLocation), k1)) {
-            return positionValue;
-        }
-        int overflowLocation = mainOverflowLocationSource.getUnsafe(tableLocation);
-        while (overflowLocation != QueryConstants.NULL_INT) {
-            if (eq(overflowKeySource0.getUnsafe(overflowLocation), k0) && eq(overflowKeySource1.getUnsafe(overflowLocation), k1)) {
-                return overflowOutputPosition.getUnsafe(overflowLocation);
-            }
-            overflowLocation = overflowOverflowLocationSource.getUnsafe(overflowLocation);
-        }
-        return -1;
-    }
-}
diff --git a/engine/table/src/main/java/io/deephaven/engine/table/impl/by/typed/staticagg/gen/StaticAggHasherObjectFloat.java b/engine/table/src/main/java/io/deephaven/engine/table/impl/by/typed/staticagg/gen/StaticAggHasherObjectFloat.java
deleted file mode 100644
index 00d40164755..00000000000
--- a/engine/table/src/main/java/io/deephaven/engine/table/impl/by/typed/staticagg/gen/StaticAggHasherObjectFloat.java
+++ /dev/null
@@ -1,205 +0,0 @@
-//
-// Copyright (c) 2016-2024 Deephaven Data Labs and Patent Pending
-//
-// ****** AUTO-GENERATED CLASS - DO NOT EDIT MANUALLY
-// ****** Run ReplicateTypedHashers or ./gradlew replicateTypedHashers to regenerate
-//
-// @formatter:off
-package io.deephaven.engine.table.impl.by.typed.staticagg.gen;
-
-import static io.deephaven.util.compare.FloatComparisons.eq;
-import static io.deephaven.util.compare.ObjectComparisons.eq;
-
-import io.deephaven.chunk.Chunk;
-import io.deephaven.chunk.FloatChunk;
-import io.deephaven.chunk.ObjectChunk;
-import io.deephaven.chunk.attributes.Values;
-import io.deephaven.chunk.util.hashing.FloatChunkHasher;
-import io.deephaven.chunk.util.hashing.ObjectChunkHasher;
-import io.deephaven.engine.rowset.RowSequence;
-import io.deephaven.engine.table.ColumnSource;
-import io.deephaven.engine.table.impl.by.HashHandler;
-import io.deephaven.engine.table.impl.by.StaticChunkedOperatorAggregationStateManagerTypedBase;
-import io.deephaven.engine.table.impl.sources.FloatArraySource;
-import io.deephaven.engine.table.impl.sources.ObjectArraySource;
-import io.deephaven.util.QueryConstants;
-import io.deephaven.util.type.TypeUtils;
-import java.lang.Float;
-import java.lang.Object;
-import java.lang.Override;
-
-final class StaticAggHasherObjectFloat extends StaticChunkedOperatorAggregationStateManagerTypedBase {
-    private final ObjectArraySource mainKeySource0;
-
-    private final ObjectArraySource overflowKeySource0;
-
-    private final FloatArraySource mainKeySource1;
-
-    private final FloatArraySource overflowKeySource1;
-
-    public StaticAggHasherObjectFloat(ColumnSource[] tableKeySources,
-            ColumnSource[] originalTableKeySources, int tableSize, double maximumLoadFactor,
-            double targetLoadFactor) {
-        super(tableKeySources, tableSize, maximumLoadFactor, targetLoadFactor);
-        this.mainKeySource0 = (ObjectArraySource) super.mainKeySources[0];
-        this.overflowKeySource0 = (ObjectArraySource) super.overflowKeySources[0];
-        this.mainKeySource1 = (FloatArraySource) super.mainKeySources[1];
-        this.overflowKeySource1 = (FloatArraySource) super.overflowKeySources[1];
-    }
-
-    @Override
-    protected void build(HashHandler handler, RowSequence rowSequence, Chunk[] sourceKeyChunks) {
-        final ObjectChunk<Object, Values> keyChunk0 = sourceKeyChunks[0].asObjectChunk();
-        final FloatChunk<Values> keyChunk1 = sourceKeyChunks[1].asFloatChunk();
-        final int chunkSize = keyChunk0.size();
-        for (int chunkPosition = 0; chunkPosition < chunkSize; ++chunkPosition) {
-            final Object k0 = keyChunk0.get(chunkPosition);
-            final float k1 = keyChunk1.get(chunkPosition);
-            final int hash = hash(k0, k1);
-            final int tableLocation = hashToTableLocation(tableHashPivot, hash);
-            if (mainOutputPosition.getUnsafe(tableLocation) == EMPTY_OUTPUT_POSITION) {
-                numEntries++;
-                mainKeySource0.set(tableLocation, k0);
-                mainKeySource1.set(tableLocation, k1);
-                handler.doMainInsert(tableLocation, chunkPosition);
-            } else if (eq(mainKeySource0.getUnsafe(tableLocation), k0) && eq(mainKeySource1.getUnsafe(tableLocation), k1)) {
-                handler.doMainFound(tableLocation, chunkPosition);
-            } else {
-                int overflowLocation = mainOverflowLocationSource.getUnsafe(tableLocation);
-                if (!findOverflow(handler, k0, k1, chunkPosition, overflowLocation)) {
-                    final int newOverflowLocation = allocateOverflowLocation();
-                    overflowKeySource0.set(newOverflowLocation, k0);
-                    overflowKeySource1.set(newOverflowLocation, k1);
-                    mainOverflowLocationSource.set(tableLocation, newOverflowLocation);
-                    overflowOverflowLocationSource.set(newOverflowLocation, overflowLocation);
-                    numEntries++;
-                    handler.doOverflowInsert(newOverflowLocation, chunkPosition);
-                }
-            }
-        }
-    }
-
-    @Override
-    protected void probe(HashHandler handler, RowSequence rowSequence, Chunk[] sourceKeyChunks) {
-        final ObjectChunk<Object, Values> keyChunk0 = sourceKeyChunks[0].asObjectChunk();
-        final FloatChunk<Values> keyChunk1 = sourceKeyChunks[1].asFloatChunk();
-        final int chunkSize = keyChunk0.size();
-        for (int chunkPosition = 0; chunkPosition < chunkSize; ++chunkPosition) {
-            final Object k0 = keyChunk0.get(chunkPosition);
-            final float k1 = keyChunk1.get(chunkPosition);
-            final int hash = hash(k0, k1);
-            final int tableLocation = hashToTableLocation(tableHashPivot, hash);
-            if (mainOutputPosition.getUnsafe(tableLocation) == EMPTY_OUTPUT_POSITION) {
-                handler.doMissing(chunkPosition);
-            } else if (eq(mainKeySource0.getUnsafe(tableLocation), k0) && eq(mainKeySource1.getUnsafe(tableLocation), k1)) {
-                handler.doMainFound(tableLocation, chunkPosition);
-            } else {
-                int overflowLocation = mainOverflowLocationSource.getUnsafe(tableLocation);
-                if (!findOverflow(handler, k0, k1, chunkPosition, overflowLocation)) {
-                    handler.doMissing(chunkPosition);
-                }
-            }
-        }
-    }
-
-    private static int hash(Object k0, float k1) {
-        int hash = ObjectChunkHasher.hashInitialSingle(k0);
-        hash = FloatChunkHasher.hashUpdateSingle(hash, k1);
-        return hash;
-    }
-
-    @Override
-    protected void rehashBucket(HashHandler handler, int sourceBucket, int destBucket,
-            int bucketsToAdd) {
-        final int position = mainOutputPosition.getUnsafe(sourceBucket);
-        if (position == EMPTY_OUTPUT_POSITION) {
-            return;
-        }
-        int mainInsertLocation = maybeMoveMainBucket(handler, sourceBucket, destBucket, bucketsToAdd);
-        int overflowLocation = mainOverflowLocationSource.getUnsafe(sourceBucket);
-        mainOverflowLocationSource.set(sourceBucket, QueryConstants.NULL_INT);
-        mainOverflowLocationSource.set(destBucket, QueryConstants.NULL_INT);
-        while (overflowLocation != QueryConstants.NULL_INT) {
-            final int nextOverflowLocation = overflowOverflowLocationSource.getUnsafe(overflowLocation);
-            final Object overflowKey0 = overflowKeySource0.getUnsafe(overflowLocation);
-            final float overflowKey1 = overflowKeySource1.getUnsafe(overflowLocation);
-            final int overflowHash = hash(overflowKey0, overflowKey1);
-            final int overflowTableLocation = hashToTableLocation(tableHashPivot + bucketsToAdd, overflowHash);
-            if (overflowTableLocation == mainInsertLocation) {
-                mainKeySource0.set(mainInsertLocation, overflowKey0);
-                mainKeySource1.set(mainInsertLocation, overflowKey1);
-                mainOutputPosition.set(mainInsertLocation, overflowOutputPosition.getUnsafe(overflowLocation));
-                handler.doPromoteOverflow(overflowLocation, mainInsertLocation);
-                overflowOutputPosition.set(overflowLocation, QueryConstants.NULL_INT);
-                overflowKeySource0.set(overflowLocation, null);
-                overflowKeySource1.set(overflowLocation, QueryConstants.NULL_FLOAT);
-                freeOverflowLocation(overflowLocation);
-                mainInsertLocation = -1;
-            } else {
-                final int oldOverflowLocation = mainOverflowLocationSource.getUnsafe(overflowTableLocation);
-                mainOverflowLocationSource.set(overflowTableLocation, overflowLocation);
-                overflowOverflowLocationSource.set(overflowLocation, oldOverflowLocation);
-            }
-            overflowLocation = nextOverflowLocation;
-        }
-    }
-
-    private int maybeMoveMainBucket(HashHandler handler, int sourceBucket, int destBucket,
-            int bucketsToAdd) {
-        final Object k0 = mainKeySource0.getUnsafe(sourceBucket);
-        final float k1 = mainKeySource1.getUnsafe(sourceBucket);
-        final int hash = hash(k0, k1);
-        final int location = hashToTableLocation(tableHashPivot + bucketsToAdd, hash);
-        final int mainInsertLocation;
-        if (location == sourceBucket) {
-            mainInsertLocation = destBucket;
-            mainOutputPosition.set(destBucket, EMPTY_OUTPUT_POSITION);
-        } else {
-            mainInsertLocation = sourceBucket;
-            mainOutputPosition.set(destBucket, mainOutputPosition.getUnsafe(sourceBucket));
-            mainOutputPosition.set(sourceBucket, EMPTY_OUTPUT_POSITION);
-            mainKeySource0.set(destBucket, k0);
-            mainKeySource0.set(sourceBucket, null);
-            mainKeySource1.set(destBucket, k1);
-            mainKeySource1.set(sourceBucket, QueryConstants.NULL_FLOAT);
-            handler.doMoveMain(sourceBucket, destBucket);
-        }
-        return mainInsertLocation;
-    }
-
-    private boolean findOverflow(HashHandler handler, Object k0, float k1, int chunkPosition,
-            int overflowLocation) {
-        while (overflowLocation != QueryConstants.NULL_INT) {
-            if (eq(overflowKeySource0.getUnsafe(overflowLocation), k0) && eq(overflowKeySource1.getUnsafe(overflowLocation), k1)) {
-                handler.doOverflowFound(overflowLocation, chunkPosition);
-                return true;
-            }
-            overflowLocation = overflowOverflowLocationSource.getUnsafe(overflowLocation);
-        }
-        return false;
-    }
-
-    @Override
-    public int findPositionForKey(Object key) {
-        final Object [] ka = (Object[])key;
-        final Object k0 = ka[0];
-        final float k1 = TypeUtils.unbox((Float)ka[1]);
-        int hash = hash(k0, k1);
-        final int tableLocation = hashToTableLocation(tableHashPivot, hash);
-        final int positionValue = mainOutputPosition.getUnsafe(tableLocation);
-        if (positionValue == EMPTY_OUTPUT_POSITION) {
-            return -1;
-        }
-        if (eq(mainKeySource0.getUnsafe(tableLocation), k0) && eq(mainKeySource1.getUnsafe(tableLocation), k1)) {
-            return positionValue;
-        }
-        int overflowLocation = mainOverflowLocationSource.getUnsafe(tableLocation);
-        while (overflowLocation != QueryConstants.NULL_INT) {
-            if (eq(overflowKeySource0.getUnsafe(overflowLocation), k0) && eq(overflowKeySource1.getUnsafe(overflowLocation), k1)) {
-                return overflowOutputPosition.getUnsafe(overflowLocation);
-            }
-            overflowLocation = overflowOverflowLocationSource.getUnsafe(overflowLocation);
-        }
-        return -1;
-    }
-}
diff --git a/engine/table/src/main/java/io/deephaven/engine/table/impl/by/typed/staticagg/gen/StaticAggHasherObjectInt.java b/engine/table/src/main/java/io/deephaven/engine/table/impl/by/typed/staticagg/gen/StaticAggHasherObjectInt.java
deleted file mode 100644
index c67751a26a7..00000000000
--- a/engine/table/src/main/java/io/deephaven/engine/table/impl/by/typed/staticagg/gen/StaticAggHasherObjectInt.java
+++ /dev/null
@@ -1,205 +0,0 @@
-//
-// Copyright (c) 2016-2024 Deephaven Data Labs and Patent Pending
-//
-// ****** AUTO-GENERATED CLASS - DO NOT EDIT MANUALLY
-// ****** Run ReplicateTypedHashers or ./gradlew replicateTypedHashers to regenerate
-//
-// @formatter:off
-package io.deephaven.engine.table.impl.by.typed.staticagg.gen;
-
-import static io.deephaven.util.compare.IntComparisons.eq;
-import static io.deephaven.util.compare.ObjectComparisons.eq;
-
-import io.deephaven.chunk.Chunk;
-import io.deephaven.chunk.IntChunk;
-import io.deephaven.chunk.ObjectChunk;
-import io.deephaven.chunk.attributes.Values;
-import io.deephaven.chunk.util.hashing.IntChunkHasher;
-import io.deephaven.chunk.util.hashing.ObjectChunkHasher;
-import io.deephaven.engine.rowset.RowSequence;
-import io.deephaven.engine.table.ColumnSource;
-import io.deephaven.engine.table.impl.by.HashHandler;
-import io.deephaven.engine.table.impl.by.StaticChunkedOperatorAggregationStateManagerTypedBase;
-import io.deephaven.engine.table.impl.sources.IntegerArraySource;
-import io.deephaven.engine.table.impl.sources.ObjectArraySource;
-import io.deephaven.util.QueryConstants;
-import io.deephaven.util.type.TypeUtils;
-import java.lang.Integer;
-import java.lang.Object;
-import java.lang.Override;
-
-final class StaticAggHasherObjectInt extends StaticChunkedOperatorAggregationStateManagerTypedBase {
-    private final ObjectArraySource mainKeySource0;
-
-    private final ObjectArraySource overflowKeySource0;
-
-    private final IntegerArraySource mainKeySource1;
-
-    private final IntegerArraySource overflowKeySource1;
-
-    public StaticAggHasherObjectInt(ColumnSource[] tableKeySources,
-            ColumnSource[] originalTableKeySources, int tableSize, double maximumLoadFactor,
-            double targetLoadFactor) {
-        super(tableKeySources, tableSize, maximumLoadFactor, targetLoadFactor);
-        this.mainKeySource0 = (ObjectArraySource) super.mainKeySources[0];
-        this.overflowKeySource0 = (ObjectArraySource) super.overflowKeySources[0];
-        this.mainKeySource1 = (IntegerArraySource) super.mainKeySources[1];
-        this.overflowKeySource1 = (IntegerArraySource) super.overflowKeySources[1];
-    }
-
-    @Override
-    protected void build(HashHandler handler, RowSequence rowSequence, Chunk[] sourceKeyChunks) {
-        final ObjectChunk<Object, Values> keyChunk0 = sourceKeyChunks[0].asObjectChunk();
-        final IntChunk<Values> keyChunk1 = sourceKeyChunks[1].asIntChunk();
-        final int chunkSize = keyChunk0.size();
-        for (int chunkPosition = 0; chunkPosition < chunkSize; ++chunkPosition) {
-            final Object k0 = keyChunk0.get(chunkPosition);
-            final int k1 = keyChunk1.get(chunkPosition);
-            final int hash = hash(k0, k1);
-            final int tableLocation = hashToTableLocation(tableHashPivot, hash);
-            if (mainOutputPosition.getUnsafe(tableLocation) == EMPTY_OUTPUT_POSITION) {
-                numEntries++;
-                mainKeySource0.set(tableLocation, k0);
-                mainKeySource1.set(tableLocation, k1);
-                handler.doMainInsert(tableLocation, chunkPosition);
-            } else if (eq(mainKeySource0.getUnsafe(tableLocation), k0) && eq(mainKeySource1.getUnsafe(tableLocation), k1)) {
-                handler.doMainFound(tableLocation, chunkPosition);
-            } else {
-                int overflowLocation = mainOverflowLocationSource.getUnsafe(tableLocation);
-                if (!findOverflow(handler, k0, k1, chunkPosition, overflowLocation)) {
-                    final int newOverflowLocation = allocateOverflowLocation();
-                    overflowKeySource0.set(newOverflowLocation, k0);
-                    overflowKeySource1.set(newOverflowLocation, k1);
-                    mainOverflowLocationSource.set(tableLocation, newOverflowLocation);
-                    overflowOverflowLocationSource.set(newOverflowLocation, overflowLocation);
-                    numEntries++;
-                    handler.doOverflowInsert(newOverflowLocation, chunkPosition);
-                }
-            }
-        }
-    }
-
-    @Override
-    protected void probe(HashHandler handler, RowSequence rowSequence, Chunk[] sourceKeyChunks) {
-        final ObjectChunk<Object, Values> keyChunk0 = sourceKeyChunks[0].asObjectChunk();
-        final IntChunk<Values> keyChunk1 = sourceKeyChunks[1].asIntChunk();
-        final int chunkSize = keyChunk0.size();
-        for (int chunkPosition = 0; chunkPosition < chunkSize; ++chunkPosition) {
-            final Object k0 = keyChunk0.get(chunkPosition);
-            final int k1 = keyChunk1.get(chunkPosition);
-            final int hash = hash(k0, k1);
-            final int tableLocation = hashToTableLocation(tableHashPivot, hash);
-            if (mainOutputPosition.getUnsafe(tableLocation) == EMPTY_OUTPUT_POSITION) {
-                handler.doMissing(chunkPosition);
-            } else if (eq(mainKeySource0.getUnsafe(tableLocation), k0) && eq(mainKeySource1.getUnsafe(tableLocation), k1)) {
-                handler.doMainFound(tableLocation, chunkPosition);
-            } else {
-                int overflowLocation = mainOverflowLocationSource.getUnsafe(tableLocation);
-                if (!findOverflow(handler, k0, k1, chunkPosition, overflowLocation)) {
-                    handler.doMissing(chunkPosition);
-                }
-            }
-        }
-    }
-
-    private static int hash(Object k0, int k1) {
-        int hash = ObjectChunkHasher.hashInitialSingle(k0);
-        hash = IntChunkHasher.hashUpdateSingle(hash, k1);
-        return hash;
-    }
-
-    @Override
-    protected void rehashBucket(HashHandler handler, int sourceBucket, int destBucket,
-            int bucketsToAdd) {
-        final int position = mainOutputPosition.getUnsafe(sourceBucket);
-        if (position == EMPTY_OUTPUT_POSITION) {
-            return;
-        }
-        int mainInsertLocation = maybeMoveMainBucket(handler, sourceBucket, destBucket, bucketsToAdd);
-        int overflowLocation = mainOverflowLocationSource.getUnsafe(sourceBucket);
-        mainOverflowLocationSource.set(sourceBucket, QueryConstants.NULL_INT);
-        mainOverflowLocationSource.set(destBucket, QueryConstants.NULL_INT);
-        while (overflowLocation != QueryConstants.NULL_INT) {
-            final int nextOverflowLocation = overflowOverflowLocationSource.getUnsafe(overflowLocation);
-            final Object overflowKey0 = overflowKeySource0.getUnsafe(overflowLocation);
-            final int overflowKey1 = overflowKeySource1.getUnsafe(overflowLocation);
-            final int overflowHash = hash(overflowKey0, overflowKey1);
-            final int overflowTableLocation = hashToTableLocation(tableHashPivot + bucketsToAdd, overflowHash);
-            if (overflowTableLocation == mainInsertLocation) {
-                mainKeySource0.set(mainInsertLocation, overflowKey0);
-                mainKeySource1.set(mainInsertLocation, overflowKey1);
-                mainOutputPosition.set(mainInsertLocation, overflowOutputPosition.getUnsafe(overflowLocation));
-                handler.doPromoteOverflow(overflowLocation, mainInsertLocation);
-                overflowOutputPosition.set(overflowLocation, QueryConstants.NULL_INT);
-                overflowKeySource0.set(overflowLocation, null);
-                overflowKeySource1.set(overflowLocation, QueryConstants.NULL_INT);
-                freeOverflowLocation(overflowLocation);
-                mainInsertLocation = -1;
-            } else {
-                final int oldOverflowLocation = mainOverflowLocationSource.getUnsafe(overflowTableLocation);
-                mainOverflowLocationSource.set(overflowTableLocation, overflowLocation);
-                overflowOverflowLocationSource.set(overflowLocation, oldOverflowLocation);
-            }
-            overflowLocation = nextOverflowLocation;
-        }
-    }
-
-    private int maybeMoveMainBucket(HashHandler handler, int sourceBucket, int destBucket,
-            int bucketsToAdd) {
-        final Object k0 = mainKeySource0.getUnsafe(sourceBucket);
-        final int k1 = mainKeySource1.getUnsafe(sourceBucket);
-        final int hash = hash(k0, k1);
-        final int location = hashToTableLocation(tableHashPivot + bucketsToAdd, hash);
-        final int mainInsertLocation;
-        if (location == sourceBucket) {
-            mainInsertLocation = destBucket;
-            mainOutputPosition.set(destBucket, EMPTY_OUTPUT_POSITION);
-        } else {
-            mainInsertLocation = sourceBucket;
-            mainOutputPosition.set(destBucket, mainOutputPosition.getUnsafe(sourceBucket));
-            mainOutputPosition.set(sourceBucket, EMPTY_OUTPUT_POSITION);
-            mainKeySource0.set(destBucket, k0);
-            mainKeySource0.set(sourceBucket, null);
-            mainKeySource1.set(destBucket, k1);
-            mainKeySource1.set(sourceBucket, QueryConstants.NULL_INT);
-            handler.doMoveMain(sourceBucket, destBucket);
-        }
-        return mainInsertLocation;
-    }
-
-    private boolean findOverflow(HashHandler handler, Object k0, int k1, int chunkPosition,
-            int overflowLocation) {
-        while (overflowLocation != QueryConstants.NULL_INT) {
-            if (eq(overflowKeySource0.getUnsafe(overflowLocation), k0) && eq(overflowKeySource1.getUnsafe(overflowLocation), k1)) {
-                handler.doOverflowFound(overflowLocation, chunkPosition);
-                return true;
-            }
-            overflowLocation = overflowOverflowLocationSource.getUnsafe(overflowLocation);
-        }
-        return false;
-    }
-
-    @Override
-    public int findPositionForKey(Object key) {
-        final Object [] ka = (Object[])key;
-        final Object k0 = ka[0];
-        final int k1 = TypeUtils.unbox((Integer)ka[1]);
-        int hash = hash(k0, k1);
-        final int tableLocation = hashToTableLocation(tableHashPivot, hash);
-        final int positionValue = mainOutputPosition.getUnsafe(tableLocation);
-        if (positionValue == EMPTY_OUTPUT_POSITION) {
-            return -1;
-        }
-        if (eq(mainKeySource0.getUnsafe(tableLocation), k0) && eq(mainKeySource1.getUnsafe(tableLocation), k1)) {
-            return positionValue;
-        }
-        int overflowLocation = mainOverflowLocationSource.getUnsafe(tableLocation);
-        while (overflowLocation != QueryConstants.NULL_INT) {
-            if (eq(overflowKeySource0.getUnsafe(overflowLocation), k0) && eq(overflowKeySource1.getUnsafe(overflowLocation), k1)) {
-                return overflowOutputPosition.getUnsafe(overflowLocation);
-            }
-            overflowLocation = overflowOverflowLocationSource.getUnsafe(overflowLocation);
-        }
-        return -1;
-    }
-}
diff --git a/engine/table/src/main/java/io/deephaven/engine/table/impl/by/typed/staticagg/gen/StaticAggHasherObjectLong.java b/engine/table/src/main/java/io/deephaven/engine/table/impl/by/typed/staticagg/gen/StaticAggHasherObjectLong.java
deleted file mode 100644
index 3cdaa4da9b2..00000000000
--- a/engine/table/src/main/java/io/deephaven/engine/table/impl/by/typed/staticagg/gen/StaticAggHasherObjectLong.java
+++ /dev/null
@@ -1,205 +0,0 @@
-//
-// Copyright (c) 2016-2024 Deephaven Data Labs and Patent Pending
-//
-// ****** AUTO-GENERATED CLASS - DO NOT EDIT MANUALLY
-// ****** Run ReplicateTypedHashers or ./gradlew replicateTypedHashers to regenerate
-//
-// @formatter:off
-package io.deephaven.engine.table.impl.by.typed.staticagg.gen;
-
-import static io.deephaven.util.compare.LongComparisons.eq;
-import static io.deephaven.util.compare.ObjectComparisons.eq;
-
-import io.deephaven.chunk.Chunk;
-import io.deephaven.chunk.LongChunk;
-import io.deephaven.chunk.ObjectChunk;
-import io.deephaven.chunk.attributes.Values;
-import io.deephaven.chunk.util.hashing.LongChunkHasher;
-import io.deephaven.chunk.util.hashing.ObjectChunkHasher;
-import io.deephaven.engine.rowset.RowSequence;
-import io.deephaven.engine.table.ColumnSource;
-import io.deephaven.engine.table.impl.by.HashHandler;
-import io.deephaven.engine.table.impl.by.StaticChunkedOperatorAggregationStateManagerTypedBase;
-import io.deephaven.engine.table.impl.sources.LongArraySource;
-import io.deephaven.engine.table.impl.sources.ObjectArraySource;
-import io.deephaven.util.QueryConstants;
-import io.deephaven.util.type.TypeUtils;
-import java.lang.Long;
-import java.lang.Object;
-import java.lang.Override;
-
-final class StaticAggHasherObjectLong extends StaticChunkedOperatorAggregationStateManagerTypedBase {
-    private final ObjectArraySource mainKeySource0;
-
-    private final ObjectArraySource overflowKeySource0;
-
-    private final LongArraySource mainKeySource1;
-
-    private final LongArraySource overflowKeySource1;
-
-    public StaticAggHasherObjectLong(ColumnSource[] tableKeySources,
-            ColumnSource[] originalTableKeySources, int tableSize, double maximumLoadFactor,
-            double targetLoadFactor) {
-        super(tableKeySources, tableSize, maximumLoadFactor, targetLoadFactor);
-        this.mainKeySource0 = (ObjectArraySource) super.mainKeySources[0];
-        this.overflowKeySource0 = (ObjectArraySource) super.overflowKeySources[0];
-        this.mainKeySource1 = (LongArraySource) super.mainKeySources[1];
-        this.overflowKeySource1 = (LongArraySource) super.overflowKeySources[1];
-    }
-
-    @Override
-    protected void build(HashHandler handler, RowSequence rowSequence, Chunk[] sourceKeyChunks) {
-        final ObjectChunk<Object, Values> keyChunk0 = sourceKeyChunks[0].asObjectChunk();
-        final LongChunk<Values> keyChunk1 = sourceKeyChunks[1].asLongChunk();
-        final int chunkSize = keyChunk0.size();
-        for (int chunkPosition = 0; chunkPosition < chunkSize; ++chunkPosition) {
-            final Object k0 = keyChunk0.get(chunkPosition);
-            final long k1 = keyChunk1.get(chunkPosition);
-            final int hash = hash(k0, k1);
-            final int tableLocation = hashToTableLocation(tableHashPivot, hash);
-            if (mainOutputPosition.getUnsafe(tableLocation) == EMPTY_OUTPUT_POSITION) {
-                numEntries++;
-                mainKeySource0.set(tableLocation, k0);
-                mainKeySource1.set(tableLocation, k1);
-                handler.doMainInsert(tableLocation, chunkPosition);
-            } else if (eq(mainKeySource0.getUnsafe(tableLocation), k0) && eq(mainKeySource1.getUnsafe(tableLocation), k1)) {
-                handler.doMainFound(tableLocation, chunkPosition);
-            } else {
-                int overflowLocation = mainOverflowLocationSource.getUnsafe(tableLocation);
-                if (!findOverflow(handler, k0, k1, chunkPosition, overflowLocation)) {
-                    final int newOverflowLocation = allocateOverflowLocation();
-                    overflowKeySource0.set(newOverflowLocation, k0);
-                    overflowKeySource1.set(newOverflowLocation, k1);
-                    mainOverflowLocationSource.set(tableLocation, newOverflowLocation);
-                    overflowOverflowLocationSource.set(newOverflowLocation, overflowLocation);
-                    numEntries++;
-                    handler.doOverflowInsert(newOverflowLocation, chunkPosition);
-                }
-            }
-        }
-    }
-
-    @Override
-    protected void probe(HashHandler handler, RowSequence rowSequence, Chunk[] sourceKeyChunks) {
-        final ObjectChunk<Object, Values> keyChunk0 = sourceKeyChunks[0].asObjectChunk();
-        final LongChunk<Values> keyChunk1 = sourceKeyChunks[1].asLongChunk();
-        final int chunkSize = keyChunk0.size();
-        for (int chunkPosition = 0; chunkPosition < chunkSize; ++chunkPosition) {
-            final Object k0 = keyChunk0.get(chunkPosition);
-            final long k1 = keyChunk1.get(chunkPosition);
-            final int hash = hash(k0, k1);
-            final int tableLocation = hashToTableLocation(tableHashPivot, hash);
-            if (mainOutputPosition.getUnsafe(tableLocation) == EMPTY_OUTPUT_POSITION) {
-                handler.doMissing(chunkPosition);
-            } else if (eq(mainKeySource0.getUnsafe(tableLocation), k0) && eq(mainKeySource1.getUnsafe(tableLocation), k1)) {
-                handler.doMainFound(tableLocation, chunkPosition);
-            } else {
-                int overflowLocation = mainOverflowLocationSource.getUnsafe(tableLocation);
-                if (!findOverflow(handler, k0, k1, chunkPosition, overflowLocation)) {
-                    handler.doMissing(chunkPosition);
-                }
-            }
-        }
-    }
-
-    private static int hash(Object k0, long k1) {
-        int hash = ObjectChunkHasher.hashInitialSingle(k0);
-        hash = LongChunkHasher.hashUpdateSingle(hash, k1);
-        return hash;
-    }
-
-    @Override
-    protected void rehashBucket(HashHandler handler, int sourceBucket, int destBucket,
-            int bucketsToAdd) {
-        final int position = mainOutputPosition.getUnsafe(sourceBucket);
-        if (position == EMPTY_OUTPUT_POSITION) {
-            return;
-        }
-        int mainInsertLocation = maybeMoveMainBucket(handler, sourceBucket, destBucket, bucketsToAdd);
-        int overflowLocation = mainOverflowLocationSource.getUnsafe(sourceBucket);
-        mainOverflowLocationSource.set(sourceBucket, QueryConstants.NULL_INT);
-        mainOverflowLocationSource.set(destBucket, QueryConstants.NULL_INT);
-        while (overflowLocation != QueryConstants.NULL_INT) {
-            final int nextOverflowLocation = overflowOverflowLocationSource.getUnsafe(overflowLocation);
-            final Object overflowKey0 = overflowKeySource0.getUnsafe(overflowLocation);
-            final long overflowKey1 = overflowKeySource1.getUnsafe(overflowLocation);
-            final int overflowHash = hash(overflowKey0, overflowKey1);
-            final int overflowTableLocation = hashToTableLocation(tableHashPivot + bucketsToAdd, overflowHash);
-            if (overflowTableLocation == mainInsertLocation) {
-                mainKeySource0.set(mainInsertLocation, overflowKey0);
-                mainKeySource1.set(mainInsertLocation, overflowKey1);
-                mainOutputPosition.set(mainInsertLocation, overflowOutputPosition.getUnsafe(overflowLocation));
-                handler.doPromoteOverflow(overflowLocation, mainInsertLocation);
-                overflowOutputPosition.set(overflowLocation, QueryConstants.NULL_INT);
-                overflowKeySource0.set(overflowLocation, null);
-                overflowKeySource1.set(overflowLocation, QueryConstants.NULL_LONG);
-                freeOverflowLocation(overflowLocation);
-                mainInsertLocation = -1;
-            } else {
-                final int oldOverflowLocation = mainOverflowLocationSource.getUnsafe(overflowTableLocation);
-                mainOverflowLocationSource.set(overflowTableLocation, overflowLocation);
-                overflowOverflowLocationSource.set(overflowLocation, oldOverflowLocation);
-            }
-            overflowLocation = nextOverflowLocation;
-        }
-    }
-
-    private int maybeMoveMainBucket(HashHandler handler, int sourceBucket, int destBucket,
-            int bucketsToAdd) {
-        final Object k0 = mainKeySource0.getUnsafe(sourceBucket);
-        final long k1 = mainKeySource1.getUnsafe(sourceBucket);
-        final int hash = hash(k0, k1);
-        final int location = hashToTableLocation(tableHashPivot + bucketsToAdd, hash);
-        final int mainInsertLocation;
-        if (location == sourceBucket) {
-            mainInsertLocation = destBucket;
-            mainOutputPosition.set(destBucket, EMPTY_OUTPUT_POSITION);
-        } else {
-            mainInsertLocation = sourceBucket;
-            mainOutputPosition.set(destBucket, mainOutputPosition.getUnsafe(sourceBucket));
-            mainOutputPosition.set(sourceBucket, EMPTY_OUTPUT_POSITION);
-            mainKeySource0.set(destBucket, k0);
-            mainKeySource0.set(sourceBucket, null);
-            mainKeySource1.set(destBucket, k1);
-            mainKeySource1.set(sourceBucket, QueryConstants.NULL_LONG);
-            handler.doMoveMain(sourceBucket, destBucket);
-        }
-        return mainInsertLocation;
-    }
-
-    private boolean findOverflow(HashHandler handler, Object k0, long k1, int chunkPosition,
-            int overflowLocation) {
-        while (overflowLocation != QueryConstants.NULL_INT) {
-            if (eq(overflowKeySource0.getUnsafe(overflowLocation), k0) && eq(overflowKeySource1.getUnsafe(overflowLocation), k1)) {
-                handler.doOverflowFound(overflowLocation, chunkPosition);
-                return true;
-            }
-            overflowLocation = overflowOverflowLocationSource.getUnsafe(overflowLocation);
-        }
-        return false;
-    }
-
-    @Override
-    public int findPositionForKey(Object key) {
-        final Object [] ka = (Object[])key;
-        final Object k0 = ka[0];
-        final long k1 = TypeUtils.unbox((Long)ka[1]);
-        int hash = hash(k0, k1);
-        final int tableLocation = hashToTableLocation(tableHashPivot, hash);
-        final int positionValue = mainOutputPosition.getUnsafe(tableLocation);
-        if (positionValue == EMPTY_OUTPUT_POSITION) {
-            return -1;
-        }
-        if (eq(mainKeySource0.getUnsafe(tableLocation), k0) && eq(mainKeySource1.getUnsafe(tableLocation), k1)) {
-            return positionValue;
-        }
-        int overflowLocation = mainOverflowLocationSource.getUnsafe(tableLocation);
-        while (overflowLocation != QueryConstants.NULL_INT) {
-            if (eq(overflowKeySource0.getUnsafe(overflowLocation), k0) && eq(overflowKeySource1.getUnsafe(overflowLocation), k1)) {
-                return overflowOutputPosition.getUnsafe(overflowLocation);
-            }
-            overflowLocation = overflowOverflowLocationSource.getUnsafe(overflowLocation);
-        }
-        return -1;
-    }
-}
diff --git a/engine/table/src/main/java/io/deephaven/engine/table/impl/by/typed/staticagg/gen/StaticAggHasherObjectObject.java b/engine/table/src/main/java/io/deephaven/engine/table/impl/by/typed/staticagg/gen/StaticAggHasherObjectObject.java
deleted file mode 100644
index bf1ed405048..00000000000
--- a/engine/table/src/main/java/io/deephaven/engine/table/impl/by/typed/staticagg/gen/StaticAggHasherObjectObject.java
+++ /dev/null
@@ -1,199 +0,0 @@
-//
-// Copyright (c) 2016-2024 Deephaven Data Labs and Patent Pending
-//
-// ****** AUTO-GENERATED CLASS - DO NOT EDIT MANUALLY
-// ****** Run ReplicateTypedHashers or ./gradlew replicateTypedHashers to regenerate
-//
-// @formatter:off
-package io.deephaven.engine.table.impl.by.typed.staticagg.gen;
-
-import static io.deephaven.util.compare.ObjectComparisons.eq;
-
-import io.deephaven.chunk.Chunk;
-import io.deephaven.chunk.ObjectChunk;
-import io.deephaven.chunk.attributes.Values;
-import io.deephaven.chunk.util.hashing.ObjectChunkHasher;
-import io.deephaven.engine.rowset.RowSequence;
-import io.deephaven.engine.table.ColumnSource;
-import io.deephaven.engine.table.impl.by.HashHandler;
-import io.deephaven.engine.table.impl.by.StaticChunkedOperatorAggregationStateManagerTypedBase;
-import io.deephaven.engine.table.impl.sources.ObjectArraySource;
-import io.deephaven.util.QueryConstants;
-import java.lang.Object;
-import java.lang.Override;
-
-final class StaticAggHasherObjectObject extends StaticChunkedOperatorAggregationStateManagerTypedBase {
-    private final ObjectArraySource mainKeySource0;
-
-    private final ObjectArraySource overflowKeySource0;
-
-    private final ObjectArraySource mainKeySource1;
-
-    private final ObjectArraySource overflowKeySource1;
-
-    public StaticAggHasherObjectObject(ColumnSource[] tableKeySources,
-            ColumnSource[] originalTableKeySources, int tableSize, double maximumLoadFactor,
-            double targetLoadFactor) {
-        super(tableKeySources, tableSize, maximumLoadFactor, targetLoadFactor);
-        this.mainKeySource0 = (ObjectArraySource) super.mainKeySources[0];
-        this.overflowKeySource0 = (ObjectArraySource) super.overflowKeySources[0];
-        this.mainKeySource1 = (ObjectArraySource) super.mainKeySources[1];
-        this.overflowKeySource1 = (ObjectArraySource) super.overflowKeySources[1];
-    }
-
-    @Override
-    protected void build(HashHandler handler, RowSequence rowSequence, Chunk[] sourceKeyChunks) {
-        final ObjectChunk<Object, Values> keyChunk0 = sourceKeyChunks[0].asObjectChunk();
-        final ObjectChunk<Object, Values> keyChunk1 = sourceKeyChunks[1].asObjectChunk();
-        final int chunkSize = keyChunk0.size();
-        for (int chunkPosition = 0; chunkPosition < chunkSize; ++chunkPosition) {
-            final Object k0 = keyChunk0.get(chunkPosition);
-            final Object k1 = keyChunk1.get(chunkPosition);
-            final int hash = hash(k0, k1);
-            final int tableLocation = hashToTableLocation(tableHashPivot, hash);
-            if (mainOutputPosition.getUnsafe(tableLocation) == EMPTY_OUTPUT_POSITION) {
-                numEntries++;
-                mainKeySource0.set(tableLocation, k0);
-                mainKeySource1.set(tableLocation, k1);
-                handler.doMainInsert(tableLocation, chunkPosition);
-            } else if (eq(mainKeySource0.getUnsafe(tableLocation), k0) && eq(mainKeySource1.getUnsafe(tableLocation), k1)) {
-                handler.doMainFound(tableLocation, chunkPosition);
-            } else {
-                int overflowLocation = mainOverflowLocationSource.getUnsafe(tableLocation);
-                if (!findOverflow(handler, k0, k1, chunkPosition, overflowLocation)) {
-                    final int newOverflowLocation = allocateOverflowLocation();
-                    overflowKeySource0.set(newOverflowLocation, k0);
-                    overflowKeySource1.set(newOverflowLocation, k1);
-                    mainOverflowLocationSource.set(tableLocation, newOverflowLocation);
-                    overflowOverflowLocationSource.set(newOverflowLocation, overflowLocation);
-                    numEntries++;
-                    handler.doOverflowInsert(newOverflowLocation, chunkPosition);
-                }
-            }
-        }
-    }
-
-    @Override
-    protected void probe(HashHandler handler, RowSequence rowSequence, Chunk[] sourceKeyChunks) {
-        final ObjectChunk<Object, Values> keyChunk0 = sourceKeyChunks[0].asObjectChunk();
-        final ObjectChunk<Object, Values> keyChunk1 = sourceKeyChunks[1].asObjectChunk();
-        final int chunkSize = keyChunk0.size();
-        for (int chunkPosition = 0; chunkPosition < chunkSize; ++chunkPosition) {
-            final Object k0 = keyChunk0.get(chunkPosition);
-            final Object k1 = keyChunk1.get(chunkPosition);
-            final int hash = hash(k0, k1);
-            final int tableLocation = hashToTableLocation(tableHashPivot, hash);
-            if (mainOutputPosition.getUnsafe(tableLocation) == EMPTY_OUTPUT_POSITION) {
-                handler.doMissing(chunkPosition);
-            } else if (eq(mainKeySource0.getUnsafe(tableLocation), k0) && eq(mainKeySource1.getUnsafe(tableLocation), k1)) {
-                handler.doMainFound(tableLocation, chunkPosition);
-            } else {
-                int overflowLocation = mainOverflowLocationSource.getUnsafe(tableLocation);
-                if (!findOverflow(handler, k0, k1, chunkPosition, overflowLocation)) {
-                    handler.doMissing(chunkPosition);
-                }
-            }
-        }
-    }
-
-    private static int hash(Object k0, Object k1) {
-        int hash = ObjectChunkHasher.hashInitialSingle(k0);
-        hash = ObjectChunkHasher.hashUpdateSingle(hash, k1);
-        return hash;
-    }
-
-    @Override
-    protected void rehashBucket(HashHandler handler, int sourceBucket, int destBucket,
-            int bucketsToAdd) {
-        final int position = mainOutputPosition.getUnsafe(sourceBucket);
-        if (position == EMPTY_OUTPUT_POSITION) {
-            return;
-        }
-        int mainInsertLocation = maybeMoveMainBucket(handler, sourceBucket, destBucket, bucketsToAdd);
-        int overflowLocation = mainOverflowLocationSource.getUnsafe(sourceBucket);
-        mainOverflowLocationSource.set(sourceBucket, QueryConstants.NULL_INT);
-        mainOverflowLocationSource.set(destBucket, QueryConstants.NULL_INT);
-        while (overflowLocation != QueryConstants.NULL_INT) {
-            final int nextOverflowLocation = overflowOverflowLocationSource.getUnsafe(overflowLocation);
-            final Object overflowKey0 = overflowKeySource0.getUnsafe(overflowLocation);
-            final Object overflowKey1 = overflowKeySource1.getUnsafe(overflowLocation);
-            final int overflowHash = hash(overflowKey0, overflowKey1);
-            final int overflowTableLocation = hashToTableLocation(tableHashPivot + bucketsToAdd, overflowHash);
-            if (overflowTableLocation == mainInsertLocation) {
-                mainKeySource0.set(mainInsertLocation, overflowKey0);
-                mainKeySource1.set(mainInsertLocation, overflowKey1);
-                mainOutputPosition.set(mainInsertLocation, overflowOutputPosition.getUnsafe(overflowLocation));
-                handler.doPromoteOverflow(overflowLocation, mainInsertLocation);
-                overflowOutputPosition.set(overflowLocation, QueryConstants.NULL_INT);
-                overflowKeySource0.set(overflowLocation, null);
-                overflowKeySource1.set(overflowLocation, null);
-                freeOverflowLocation(overflowLocation);
-                mainInsertLocation = -1;
-            } else {
-                final int oldOverflowLocation = mainOverflowLocationSource.getUnsafe(overflowTableLocation);
-                mainOverflowLocationSource.set(overflowTableLocation, overflowLocation);
-                overflowOverflowLocationSource.set(overflowLocation, oldOverflowLocation);
-            }
-            overflowLocation = nextOverflowLocation;
-        }
-    }
-
-    private int maybeMoveMainBucket(HashHandler handler, int sourceBucket, int destBucket,
-            int bucketsToAdd) {
-        final Object k0 = mainKeySource0.getUnsafe(sourceBucket);
-        final Object k1 = mainKeySource1.getUnsafe(sourceBucket);
-        final int hash = hash(k0, k1);
-        final int location = hashToTableLocation(tableHashPivot + bucketsToAdd, hash);
-        final int mainInsertLocation;
-        if (location == sourceBucket) {
-            mainInsertLocation = destBucket;
-            mainOutputPosition.set(destBucket, EMPTY_OUTPUT_POSITION);
-        } else {
-            mainInsertLocation = sourceBucket;
-            mainOutputPosition.set(destBucket, mainOutputPosition.getUnsafe(sourceBucket));
-            mainOutputPosition.set(sourceBucket, EMPTY_OUTPUT_POSITION);
-            mainKeySource0.set(destBucket, k0);
-            mainKeySource0.set(sourceBucket, null);
-            mainKeySource1.set(destBucket, k1);
-            mainKeySource1.set(sourceBucket, null);
-            handler.doMoveMain(sourceBucket, destBucket);
-        }
-        return mainInsertLocation;
-    }
-
-    private boolean findOverflow(HashHandler handler, Object k0, Object k1, int chunkPosition,
-            int overflowLocation) {
-        while (overflowLocation != QueryConstants.NULL_INT) {
-            if (eq(overflowKeySource0.getUnsafe(overflowLocation), k0) && eq(overflowKeySource1.getUnsafe(overflowLocation), k1)) {
-                handler.doOverflowFound(overflowLocation, chunkPosition);
-                return true;
-            }
-            overflowLocation = overflowOverflowLocationSource.getUnsafe(overflowLocation);
-        }
-        return false;
-    }
-
-    @Override
-    public int findPositionForKey(Object key) {
-        final Object [] ka = (Object[])key;
-        final Object k0 = ka[0];
-        final Object k1 = ka[1];
-        int hash = hash(k0, k1);
-        final int tableLocation = hashToTableLocation(tableHashPivot, hash);
-        final int positionValue = mainOutputPosition.getUnsafe(tableLocation);
-        if (positionValue == EMPTY_OUTPUT_POSITION) {
-            return -1;
-        }
-        if (eq(mainKeySource0.getUnsafe(tableLocation), k0) && eq(mainKeySource1.getUnsafe(tableLocation), k1)) {
-            return positionValue;
-        }
-        int overflowLocation = mainOverflowLocationSource.getUnsafe(tableLocation);
-        while (overflowLocation != QueryConstants.NULL_INT) {
-            if (eq(overflowKeySource0.getUnsafe(overflowLocation), k0) && eq(overflowKeySource1.getUnsafe(overflowLocation), k1)) {
-                return overflowOutputPosition.getUnsafe(overflowLocation);
-            }
-            overflowLocation = overflowOverflowLocationSource.getUnsafe(overflowLocation);
-        }
-        return -1;
-    }
-}
diff --git a/engine/table/src/main/java/io/deephaven/engine/table/impl/by/typed/staticagg/gen/StaticAggHasherObjectShort.java b/engine/table/src/main/java/io/deephaven/engine/table/impl/by/typed/staticagg/gen/StaticAggHasherObjectShort.java
deleted file mode 100644
index fc42aa1754d..00000000000
--- a/engine/table/src/main/java/io/deephaven/engine/table/impl/by/typed/staticagg/gen/StaticAggHasherObjectShort.java
+++ /dev/null
@@ -1,205 +0,0 @@
-//
-// Copyright (c) 2016-2024 Deephaven Data Labs and Patent Pending
-//
-// ****** AUTO-GENERATED CLASS - DO NOT EDIT MANUALLY
-// ****** Run ReplicateTypedHashers or ./gradlew replicateTypedHashers to regenerate
-//
-// @formatter:off
-package io.deephaven.engine.table.impl.by.typed.staticagg.gen;
-
-import static io.deephaven.util.compare.ObjectComparisons.eq;
-import static io.deephaven.util.compare.ShortComparisons.eq;
-
-import io.deephaven.chunk.Chunk;
-import io.deephaven.chunk.ObjectChunk;
-import io.deephaven.chunk.ShortChunk;
-import io.deephaven.chunk.attributes.Values;
-import io.deephaven.chunk.util.hashing.ObjectChunkHasher;
-import io.deephaven.chunk.util.hashing.ShortChunkHasher;
-import io.deephaven.engine.rowset.RowSequence;
-import io.deephaven.engine.table.ColumnSource;
-import io.deephaven.engine.table.impl.by.HashHandler;
-import io.deephaven.engine.table.impl.by.StaticChunkedOperatorAggregationStateManagerTypedBase;
-import io.deephaven.engine.table.impl.sources.ObjectArraySource;
-import io.deephaven.engine.table.impl.sources.ShortArraySource;
-import io.deephaven.util.QueryConstants;
-import io.deephaven.util.type.TypeUtils;
-import java.lang.Object;
-import java.lang.Override;
-import java.lang.Short;
-
-final class StaticAggHasherObjectShort extends StaticChunkedOperatorAggregationStateManagerTypedBase {
-    private final ObjectArraySource mainKeySource0;
-
-    private final ObjectArraySource overflowKeySource0;
-
-    private final ShortArraySource mainKeySource1;
-
-    private final ShortArraySource overflowKeySource1;
-
-    public StaticAggHasherObjectShort(ColumnSource[] tableKeySources,
-            ColumnSource[] originalTableKeySources, int tableSize, double maximumLoadFactor,
-            double targetLoadFactor) {
-        super(tableKeySources, tableSize, maximumLoadFactor, targetLoadFactor);
-        this.mainKeySource0 = (ObjectArraySource) super.mainKeySources[0];
-        this.overflowKeySource0 = (ObjectArraySource) super.overflowKeySources[0];
-        this.mainKeySource1 = (ShortArraySource) super.mainKeySources[1];
-        this.overflowKeySource1 = (ShortArraySource) super.overflowKeySources[1];
-    }
-
-    @Override
-    protected void build(HashHandler handler, RowSequence rowSequence, Chunk[] sourceKeyChunks) {
-        final ObjectChunk<Object, Values> keyChunk0 = sourceKeyChunks[0].asObjectChunk();
-        final ShortChunk<Values> keyChunk1 = sourceKeyChunks[1].asShortChunk();
-        final int chunkSize = keyChunk0.size();
-        for (int chunkPosition = 0; chunkPosition < chunkSize; ++chunkPosition) {
-            final Object k0 = keyChunk0.get(chunkPosition);
-            final short k1 = keyChunk1.get(chunkPosition);
-            final int hash = hash(k0, k1);
-            final int tableLocation = hashToTableLocation(tableHashPivot, hash);
-            if (mainOutputPosition.getUnsafe(tableLocation) == EMPTY_OUTPUT_POSITION) {
-                numEntries++;
-                mainKeySource0.set(tableLocation, k0);
-                mainKeySource1.set(tableLocation, k1);
-                handler.doMainInsert(tableLocation, chunkPosition);
-            } else if (eq(mainKeySource0.getUnsafe(tableLocation), k0) && eq(mainKeySource1.getUnsafe(tableLocation), k1)) {
-                handler.doMainFound(tableLocation, chunkPosition);
-            } else {
-                int overflowLocation = mainOverflowLocationSource.getUnsafe(tableLocation);
-                if (!findOverflow(handler, k0, k1, chunkPosition, overflowLocation)) {
-                    final int newOverflowLocation = allocateOverflowLocation();
-                    overflowKeySource0.set(newOverflowLocation, k0);
-                    overflowKeySource1.set(newOverflowLocation, k1);
-                    mainOverflowLocationSource.set(tableLocation, newOverflowLocation);
-                    overflowOverflowLocationSource.set(newOverflowLocation, overflowLocation);
-                    numEntries++;
-                    handler.doOverflowInsert(newOverflowLocation, chunkPosition);
-                }
-            }
-        }
-    }
-
-    @Override
-    protected void probe(HashHandler handler, RowSequence rowSequence, Chunk[] sourceKeyChunks) {
-        final ObjectChunk<Object, Values> keyChunk0 = sourceKeyChunks[0].asObjectChunk();
-        final ShortChunk<Values> keyChunk1 = sourceKeyChunks[1].asShortChunk();
-        final int chunkSize = keyChunk0.size();
-        for (int chunkPosition = 0; chunkPosition < chunkSize; ++chunkPosition) {
-            final Object k0 = keyChunk0.get(chunkPosition);
-            final short k1 = keyChunk1.get(chunkPosition);
-            final int hash = hash(k0, k1);
-            final int tableLocation = hashToTableLocation(tableHashPivot, hash);
-            if (mainOutputPosition.getUnsafe(tableLocation) == EMPTY_OUTPUT_POSITION) {
-                handler.doMissing(chunkPosition);
-            } else if (eq(mainKeySource0.getUnsafe(tableLocation), k0) && eq(mainKeySource1.getUnsafe(tableLocation), k1)) {
-                handler.doMainFound(tableLocation, chunkPosition);
-            } else {
-                int overflowLocation = mainOverflowLocationSource.getUnsafe(tableLocation);
-                if (!findOverflow(handler, k0, k1, chunkPosition, overflowLocation)) {
-                    handler.doMissing(chunkPosition);
-                }
-            }
-        }
-    }
-
-    private static int hash(Object k0, short k1) {
-        int hash = ObjectChunkHasher.hashInitialSingle(k0);
-        hash = ShortChunkHasher.hashUpdateSingle(hash, k1);
-        return hash;
-    }
-
-    @Override
-    protected void rehashBucket(HashHandler handler, int sourceBucket, int destBucket,
-            int bucketsToAdd) {
-        final int position = mainOutputPosition.getUnsafe(sourceBucket);
-        if (position == EMPTY_OUTPUT_POSITION) {
-            return;
-        }
-        int mainInsertLocation = maybeMoveMainBucket(handler, sourceBucket, destBucket, bucketsToAdd);
-        int overflowLocation = mainOverflowLocationSource.getUnsafe(sourceBucket);
-        mainOverflowLocationSource.set(sourceBucket, QueryConstants.NULL_INT);
-        mainOverflowLocationSource.set(destBucket, QueryConstants.NULL_INT);
-        while (overflowLocation != QueryConstants.NULL_INT) {
-            final int nextOverflowLocation = overflowOverflowLocationSource.getUnsafe(overflowLocation);
-            final Object overflowKey0 = overflowKeySource0.getUnsafe(overflowLocation);
-            final short overflowKey1 = overflowKeySource1.getUnsafe(overflowLocation);
-            final int overflowHash = hash(overflowKey0, overflowKey1);
-            final int overflowTableLocation = hashToTableLocation(tableHashPivot + bucketsToAdd, overflowHash);
-            if (overflowTableLocation == mainInsertLocation) {
-                mainKeySource0.set(mainInsertLocation, overflowKey0);
-                mainKeySource1.set(mainInsertLocation, overflowKey1);
-                mainOutputPosition.set(mainInsertLocation, overflowOutputPosition.getUnsafe(overflowLocation));
-                handler.doPromoteOverflow(overflowLocation, mainInsertLocation);
-                overflowOutputPosition.set(overflowLocation, QueryConstants.NULL_INT);
-                overflowKeySource0.set(overflowLocation, null);
-                overflowKeySource1.set(overflowLocation, QueryConstants.NULL_SHORT);
-                freeOverflowLocation(overflowLocation);
-                mainInsertLocation = -1;
-            } else {
-                final int oldOverflowLocation = mainOverflowLocationSource.getUnsafe(overflowTableLocation);
-                mainOverflowLocationSource.set(overflowTableLocation, overflowLocation);
-                overflowOverflowLocationSource.set(overflowLocation, oldOverflowLocation);
-            }
-            overflowLocation = nextOverflowLocation;
-        }
-    }
-
-    private int maybeMoveMainBucket(HashHandler handler, int sourceBucket, int destBucket,
-            int bucketsToAdd) {
-        final Object k0 = mainKeySource0.getUnsafe(sourceBucket);
-        final short k1 = mainKeySource1.getUnsafe(sourceBucket);
-        final int hash = hash(k0, k1);
-        final int location = hashToTableLocation(tableHashPivot + bucketsToAdd, hash);
-        final int mainInsertLocation;
-        if (location == sourceBucket) {
-            mainInsertLocation = destBucket;
-            mainOutputPosition.set(destBucket, EMPTY_OUTPUT_POSITION);
-        } else {
-            mainInsertLocation = sourceBucket;
-            mainOutputPosition.set(destBucket, mainOutputPosition.getUnsafe(sourceBucket));
-            mainOutputPosition.set(sourceBucket, EMPTY_OUTPUT_POSITION);
-            mainKeySource0.set(destBucket, k0);
-            mainKeySource0.set(sourceBucket, null);
-            mainKeySource1.set(destBucket, k1);
-            mainKeySource1.set(sourceBucket, QueryConstants.NULL_SHORT);
-            handler.doMoveMain(sourceBucket, destBucket);
-        }
-        return mainInsertLocation;
-    }
-
-    private boolean findOverflow(HashHandler handler, Object k0, short k1, int chunkPosition,
-            int overflowLocation) {
-        while (overflowLocation != QueryConstants.NULL_INT) {
-            if (eq(overflowKeySource0.getUnsafe(overflowLocation), k0) && eq(overflowKeySource1.getUnsafe(overflowLocation), k1)) {
-                handler.doOverflowFound(overflowLocation, chunkPosition);
-                return true;
-            }
-            overflowLocation = overflowOverflowLocationSource.getUnsafe(overflowLocation);
-        }
-        return false;
-    }
-
-    @Override
-    public int findPositionForKey(Object key) {
-        final Object [] ka = (Object[])key;
-        final Object k0 = ka[0];
-        final short k1 = TypeUtils.unbox((Short)ka[1]);
-        int hash = hash(k0, k1);
-        final int tableLocation = hashToTableLocation(tableHashPivot, hash);
-        final int positionValue = mainOutputPosition.getUnsafe(tableLocation);
-        if (positionValue == EMPTY_OUTPUT_POSITION) {
-            return -1;
-        }
-        if (eq(mainKeySource0.getUnsafe(tableLocation), k0) && eq(mainKeySource1.getUnsafe(tableLocation), k1)) {
-            return positionValue;
-        }
-        int overflowLocation = mainOverflowLocationSource.getUnsafe(tableLocation);
-        while (overflowLocation != QueryConstants.NULL_INT) {
-            if (eq(overflowKeySource0.getUnsafe(overflowLocation), k0) && eq(overflowKeySource1.getUnsafe(overflowLocation), k1)) {
-                return overflowOutputPosition.getUnsafe(overflowLocation);
-            }
-            overflowLocation = overflowOverflowLocationSource.getUnsafe(overflowLocation);
-        }
-        return -1;
-    }
-}
diff --git a/engine/table/src/main/java/io/deephaven/engine/table/impl/by/typed/staticagg/gen/StaticAggHasherShort.java b/engine/table/src/main/java/io/deephaven/engine/table/impl/by/typed/staticagg/gen/StaticAggHasherShort.java
deleted file mode 100644
index 1e40b00382d..00000000000
--- a/engine/table/src/main/java/io/deephaven/engine/table/impl/by/typed/staticagg/gen/StaticAggHasherShort.java
+++ /dev/null
@@ -1,180 +0,0 @@
-//
-// Copyright (c) 2016-2024 Deephaven Data Labs and Patent Pending
-//
-// ****** AUTO-GENERATED CLASS - DO NOT EDIT MANUALLY
-// ****** Run ReplicateTypedHashers or ./gradlew replicateTypedHashers to regenerate
-//
-// @formatter:off
-package io.deephaven.engine.table.impl.by.typed.staticagg.gen;
-
-import static io.deephaven.util.compare.ShortComparisons.eq;
-
-import io.deephaven.chunk.Chunk;
-import io.deephaven.chunk.ShortChunk;
-import io.deephaven.chunk.attributes.Values;
-import io.deephaven.chunk.util.hashing.ShortChunkHasher;
-import io.deephaven.engine.rowset.RowSequence;
-import io.deephaven.engine.table.ColumnSource;
-import io.deephaven.engine.table.impl.by.HashHandler;
-import io.deephaven.engine.table.impl.by.StaticChunkedOperatorAggregationStateManagerTypedBase;
-import io.deephaven.engine.table.impl.sources.ShortArraySource;
-import io.deephaven.util.QueryConstants;
-import io.deephaven.util.type.TypeUtils;
-import java.lang.Object;
-import java.lang.Override;
-import java.lang.Short;
-
-final class StaticAggHasherShort extends StaticChunkedOperatorAggregationStateManagerTypedBase {
-    private final ShortArraySource mainKeySource0;
-
-    private final ShortArraySource overflowKeySource0;
-
-    public StaticAggHasherShort(ColumnSource[] tableKeySources,
-            ColumnSource[] originalTableKeySources, int tableSize, double maximumLoadFactor,
-            double targetLoadFactor) {
-        super(tableKeySources, tableSize, maximumLoadFactor, targetLoadFactor);
-        this.mainKeySource0 = (ShortArraySource) super.mainKeySources[0];
-        this.overflowKeySource0 = (ShortArraySource) super.overflowKeySources[0];
-    }
-
-    @Override
-    protected void build(HashHandler handler, RowSequence rowSequence, Chunk[] sourceKeyChunks) {
-        final ShortChunk<Values> keyChunk0 = sourceKeyChunks[0].asShortChunk();
-        final int chunkSize = keyChunk0.size();
-        for (int chunkPosition = 0; chunkPosition < chunkSize; ++chunkPosition) {
-            final short k0 = keyChunk0.get(chunkPosition);
-            final int hash = hash(k0);
-            final int tableLocation = hashToTableLocation(tableHashPivot, hash);
-            if (mainOutputPosition.getUnsafe(tableLocation) == EMPTY_OUTPUT_POSITION) {
-                numEntries++;
-                mainKeySource0.set(tableLocation, k0);
-                handler.doMainInsert(tableLocation, chunkPosition);
-            } else if (eq(mainKeySource0.getUnsafe(tableLocation), k0)) {
-                handler.doMainFound(tableLocation, chunkPosition);
-            } else {
-                int overflowLocation = mainOverflowLocationSource.getUnsafe(tableLocation);
-                if (!findOverflow(handler, k0, chunkPosition, overflowLocation)) {
-                    final int newOverflowLocation = allocateOverflowLocation();
-                    overflowKeySource0.set(newOverflowLocation, k0);
-                    mainOverflowLocationSource.set(tableLocation, newOverflowLocation);
-                    overflowOverflowLocationSource.set(newOverflowLocation, overflowLocation);
-                    numEntries++;
-                    handler.doOverflowInsert(newOverflowLocation, chunkPosition);
-                }
-            }
-        }
-    }
-
-    @Override
-    protected void probe(HashHandler handler, RowSequence rowSequence, Chunk[] sourceKeyChunks) {
-        final ShortChunk<Values> keyChunk0 = sourceKeyChunks[0].asShortChunk();
-        final int chunkSize = keyChunk0.size();
-        for (int chunkPosition = 0; chunkPosition < chunkSize; ++chunkPosition) {
-            final short k0 = keyChunk0.get(chunkPosition);
-            final int hash = hash(k0);
-            final int tableLocation = hashToTableLocation(tableHashPivot, hash);
-            if (mainOutputPosition.getUnsafe(tableLocation) == EMPTY_OUTPUT_POSITION) {
-                handler.doMissing(chunkPosition);
-            } else if (eq(mainKeySource0.getUnsafe(tableLocation), k0)) {
-                handler.doMainFound(tableLocation, chunkPosition);
-            } else {
-                int overflowLocation = mainOverflowLocationSource.getUnsafe(tableLocation);
-                if (!findOverflow(handler, k0, chunkPosition, overflowLocation)) {
-                    handler.doMissing(chunkPosition);
-                }
-            }
-        }
-    }
-
-    private static int hash(short k0) {
-        int hash = ShortChunkHasher.hashInitialSingle(k0);
-        return hash;
-    }
-
-    @Override
-    protected void rehashBucket(HashHandler handler, int sourceBucket, int destBucket,
-            int bucketsToAdd) {
-        final int position = mainOutputPosition.getUnsafe(sourceBucket);
-        if (position == EMPTY_OUTPUT_POSITION) {
-            return;
-        }
-        int mainInsertLocation = maybeMoveMainBucket(handler, sourceBucket, destBucket, bucketsToAdd);
-        int overflowLocation = mainOverflowLocationSource.getUnsafe(sourceBucket);
-        mainOverflowLocationSource.set(sourceBucket, QueryConstants.NULL_INT);
-        mainOverflowLocationSource.set(destBucket, QueryConstants.NULL_INT);
-        while (overflowLocation != QueryConstants.NULL_INT) {
-            final int nextOverflowLocation = overflowOverflowLocationSource.getUnsafe(overflowLocation);
-            final short overflowKey0 = overflowKeySource0.getUnsafe(overflowLocation);
-            final int overflowHash = hash(overflowKey0);
-            final int overflowTableLocation = hashToTableLocation(tableHashPivot + bucketsToAdd, overflowHash);
-            if (overflowTableLocation == mainInsertLocation) {
-                mainKeySource0.set(mainInsertLocation, overflowKey0);
-                mainOutputPosition.set(mainInsertLocation, overflowOutputPosition.getUnsafe(overflowLocation));
-                handler.doPromoteOverflow(overflowLocation, mainInsertLocation);
-                overflowOutputPosition.set(overflowLocation, QueryConstants.NULL_INT);
-                overflowKeySource0.set(overflowLocation, QueryConstants.NULL_SHORT);
-                freeOverflowLocation(overflowLocation);
-                mainInsertLocation = -1;
-            } else {
-                final int oldOverflowLocation = mainOverflowLocationSource.getUnsafe(overflowTableLocation);
-                mainOverflowLocationSource.set(overflowTableLocation, overflowLocation);
-                overflowOverflowLocationSource.set(overflowLocation, oldOverflowLocation);
-            }
-            overflowLocation = nextOverflowLocation;
-        }
-    }
-
-    private int maybeMoveMainBucket(HashHandler handler, int sourceBucket, int destBucket,
-            int bucketsToAdd) {
-        final short k0 = mainKeySource0.getUnsafe(sourceBucket);
-        final int hash = hash(k0);
-        final int location = hashToTableLocation(tableHashPivot + bucketsToAdd, hash);
-        final int mainInsertLocation;
-        if (location == sourceBucket) {
-            mainInsertLocation = destBucket;
-            mainOutputPosition.set(destBucket, EMPTY_OUTPUT_POSITION);
-        } else {
-            mainInsertLocation = sourceBucket;
-            mainOutputPosition.set(destBucket, mainOutputPosition.getUnsafe(sourceBucket));
-            mainOutputPosition.set(sourceBucket, EMPTY_OUTPUT_POSITION);
-            mainKeySource0.set(destBucket, k0);
-            mainKeySource0.set(sourceBucket, QueryConstants.NULL_SHORT);
-            handler.doMoveMain(sourceBucket, destBucket);
-        }
-        return mainInsertLocation;
-    }
-
-    private boolean findOverflow(HashHandler handler, short k0, int chunkPosition,
-            int overflowLocation) {
-        while (overflowLocation != QueryConstants.NULL_INT) {
-            if (eq(overflowKeySource0.getUnsafe(overflowLocation), k0)) {
-                handler.doOverflowFound(overflowLocation, chunkPosition);
-                return true;
-            }
-            overflowLocation = overflowOverflowLocationSource.getUnsafe(overflowLocation);
-        }
-        return false;
-    }
-
-    @Override
-    public int findPositionForKey(Object key) {
-        final short k0 = TypeUtils.unbox((Short)key);
-        int hash = hash(k0);
-        final int tableLocation = hashToTableLocation(tableHashPivot, hash);
-        final int positionValue = mainOutputPosition.getUnsafe(tableLocation);
-        if (positionValue == EMPTY_OUTPUT_POSITION) {
-            return -1;
-        }
-        if (eq(mainKeySource0.getUnsafe(tableLocation), k0)) {
-            return positionValue;
-        }
-        int overflowLocation = mainOverflowLocationSource.getUnsafe(tableLocation);
-        while (overflowLocation != QueryConstants.NULL_INT) {
-            if (eq(overflowKeySource0.getUnsafe(overflowLocation), k0)) {
-                return overflowOutputPosition.getUnsafe(overflowLocation);
-            }
-            overflowLocation = overflowOverflowLocationSource.getUnsafe(overflowLocation);
-        }
-        return -1;
-    }
-}
diff --git a/engine/table/src/main/java/io/deephaven/engine/table/impl/by/typed/staticagg/gen/StaticAggHasherShortByte.java b/engine/table/src/main/java/io/deephaven/engine/table/impl/by/typed/staticagg/gen/StaticAggHasherShortByte.java
deleted file mode 100644
index 2e92c5a816e..00000000000
--- a/engine/table/src/main/java/io/deephaven/engine/table/impl/by/typed/staticagg/gen/StaticAggHasherShortByte.java
+++ /dev/null
@@ -1,206 +0,0 @@
-//
-// Copyright (c) 2016-2024 Deephaven Data Labs and Patent Pending
-//
-// ****** AUTO-GENERATED CLASS - DO NOT EDIT MANUALLY
-// ****** Run ReplicateTypedHashers or ./gradlew replicateTypedHashers to regenerate
-//
-// @formatter:off
-package io.deephaven.engine.table.impl.by.typed.staticagg.gen;
-
-import static io.deephaven.util.compare.ByteComparisons.eq;
-import static io.deephaven.util.compare.ShortComparisons.eq;
-
-import io.deephaven.chunk.ByteChunk;
-import io.deephaven.chunk.Chunk;
-import io.deephaven.chunk.ShortChunk;
-import io.deephaven.chunk.attributes.Values;
-import io.deephaven.chunk.util.hashing.ByteChunkHasher;
-import io.deephaven.chunk.util.hashing.ShortChunkHasher;
-import io.deephaven.engine.rowset.RowSequence;
-import io.deephaven.engine.table.ColumnSource;
-import io.deephaven.engine.table.impl.by.HashHandler;
-import io.deephaven.engine.table.impl.by.StaticChunkedOperatorAggregationStateManagerTypedBase;
-import io.deephaven.engine.table.impl.sources.ByteArraySource;
-import io.deephaven.engine.table.impl.sources.ShortArraySource;
-import io.deephaven.util.QueryConstants;
-import io.deephaven.util.type.TypeUtils;
-import java.lang.Byte;
-import java.lang.Object;
-import java.lang.Override;
-import java.lang.Short;
-
-final class StaticAggHasherShortByte extends StaticChunkedOperatorAggregationStateManagerTypedBase {
-    private final ShortArraySource mainKeySource0;
-
-    private final ShortArraySource overflowKeySource0;
-
-    private final ByteArraySource mainKeySource1;
-
-    private final ByteArraySource overflowKeySource1;
-
-    public StaticAggHasherShortByte(ColumnSource[] tableKeySources,
-            ColumnSource[] originalTableKeySources, int tableSize, double maximumLoadFactor,
-            double targetLoadFactor) {
-        super(tableKeySources, tableSize, maximumLoadFactor, targetLoadFactor);
-        this.mainKeySource0 = (ShortArraySource) super.mainKeySources[0];
-        this.overflowKeySource0 = (ShortArraySource) super.overflowKeySources[0];
-        this.mainKeySource1 = (ByteArraySource) super.mainKeySources[1];
-        this.overflowKeySource1 = (ByteArraySource) super.overflowKeySources[1];
-    }
-
-    @Override
-    protected void build(HashHandler handler, RowSequence rowSequence, Chunk[] sourceKeyChunks) {
-        final ShortChunk<Values> keyChunk0 = sourceKeyChunks[0].asShortChunk();
-        final ByteChunk<Values> keyChunk1 = sourceKeyChunks[1].asByteChunk();
-        final int chunkSize = keyChunk0.size();
-        for (int chunkPosition = 0; chunkPosition < chunkSize; ++chunkPosition) {
-            final short k0 = keyChunk0.get(chunkPosition);
-            final byte k1 = keyChunk1.get(chunkPosition);
-            final int hash = hash(k0, k1);
-            final int tableLocation = hashToTableLocation(tableHashPivot, hash);
-            if (mainOutputPosition.getUnsafe(tableLocation) == EMPTY_OUTPUT_POSITION) {
-                numEntries++;
-                mainKeySource0.set(tableLocation, k0);
-                mainKeySource1.set(tableLocation, k1);
-                handler.doMainInsert(tableLocation, chunkPosition);
-            } else if (eq(mainKeySource0.getUnsafe(tableLocation), k0) && eq(mainKeySource1.getUnsafe(tableLocation), k1)) {
-                handler.doMainFound(tableLocation, chunkPosition);
-            } else {
-                int overflowLocation = mainOverflowLocationSource.getUnsafe(tableLocation);
-                if (!findOverflow(handler, k0, k1, chunkPosition, overflowLocation)) {
-                    final int newOverflowLocation = allocateOverflowLocation();
-                    overflowKeySource0.set(newOverflowLocation, k0);
-                    overflowKeySource1.set(newOverflowLocation, k1);
-                    mainOverflowLocationSource.set(tableLocation, newOverflowLocation);
-                    overflowOverflowLocationSource.set(newOverflowLocation, overflowLocation);
-                    numEntries++;
-                    handler.doOverflowInsert(newOverflowLocation, chunkPosition);
-                }
-            }
-        }
-    }
-
-    @Override
-    protected void probe(HashHandler handler, RowSequence rowSequence, Chunk[] sourceKeyChunks) {
-        final ShortChunk<Values> keyChunk0 = sourceKeyChunks[0].asShortChunk();
-        final ByteChunk<Values> keyChunk1 = sourceKeyChunks[1].asByteChunk();
-        final int chunkSize = keyChunk0.size();
-        for (int chunkPosition = 0; chunkPosition < chunkSize; ++chunkPosition) {
-            final short k0 = keyChunk0.get(chunkPosition);
-            final byte k1 = keyChunk1.get(chunkPosition);
-            final int hash = hash(k0, k1);
-            final int tableLocation = hashToTableLocation(tableHashPivot, hash);
-            if (mainOutputPosition.getUnsafe(tableLocation) == EMPTY_OUTPUT_POSITION) {
-                handler.doMissing(chunkPosition);
-            } else if (eq(mainKeySource0.getUnsafe(tableLocation), k0) && eq(mainKeySource1.getUnsafe(tableLocation), k1)) {
-                handler.doMainFound(tableLocation, chunkPosition);
-            } else {
-                int overflowLocation = mainOverflowLocationSource.getUnsafe(tableLocation);
-                if (!findOverflow(handler, k0, k1, chunkPosition, overflowLocation)) {
-                    handler.doMissing(chunkPosition);
-                }
-            }
-        }
-    }
-
-    private static int hash(short k0, byte k1) {
-        int hash = ShortChunkHasher.hashInitialSingle(k0);
-        hash = ByteChunkHasher.hashUpdateSingle(hash, k1);
-        return hash;
-    }
-
-    @Override
-    protected void rehashBucket(HashHandler handler, int sourceBucket, int destBucket,
-            int bucketsToAdd) {
-        final int position = mainOutputPosition.getUnsafe(sourceBucket);
-        if (position == EMPTY_OUTPUT_POSITION) {
-            return;
-        }
-        int mainInsertLocation = maybeMoveMainBucket(handler, sourceBucket, destBucket, bucketsToAdd);
-        int overflowLocation = mainOverflowLocationSource.getUnsafe(sourceBucket);
-        mainOverflowLocationSource.set(sourceBucket, QueryConstants.NULL_INT);
-        mainOverflowLocationSource.set(destBucket, QueryConstants.NULL_INT);
-        while (overflowLocation != QueryConstants.NULL_INT) {
-            final int nextOverflowLocation = overflowOverflowLocationSource.getUnsafe(overflowLocation);
-            final short overflowKey0 = overflowKeySource0.getUnsafe(overflowLocation);
-            final byte overflowKey1 = overflowKeySource1.getUnsafe(overflowLocation);
-            final int overflowHash = hash(overflowKey0, overflowKey1);
-            final int overflowTableLocation = hashToTableLocation(tableHashPivot + bucketsToAdd, overflowHash);
-            if (overflowTableLocation == mainInsertLocation) {
-                mainKeySource0.set(mainInsertLocation, overflowKey0);
-                mainKeySource1.set(mainInsertLocation, overflowKey1);
-                mainOutputPosition.set(mainInsertLocation, overflowOutputPosition.getUnsafe(overflowLocation));
-                handler.doPromoteOverflow(overflowLocation, mainInsertLocation);
-                overflowOutputPosition.set(overflowLocation, QueryConstants.NULL_INT);
-                overflowKeySource0.set(overflowLocation, QueryConstants.NULL_SHORT);
-                overflowKeySource1.set(overflowLocation, QueryConstants.NULL_BYTE);
-                freeOverflowLocation(overflowLocation);
-                mainInsertLocation = -1;
-            } else {
-                final int oldOverflowLocation = mainOverflowLocationSource.getUnsafe(overflowTableLocation);
-                mainOverflowLocationSource.set(overflowTableLocation, overflowLocation);
-                overflowOverflowLocationSource.set(overflowLocation, oldOverflowLocation);
-            }
-            overflowLocation = nextOverflowLocation;
-        }
-    }
-
-    private int maybeMoveMainBucket(HashHandler handler, int sourceBucket, int destBucket,
-            int bucketsToAdd) {
-        final short k0 = mainKeySource0.getUnsafe(sourceBucket);
-        final byte k1 = mainKeySource1.getUnsafe(sourceBucket);
-        final int hash = hash(k0, k1);
-        final int location = hashToTableLocation(tableHashPivot + bucketsToAdd, hash);
-        final int mainInsertLocation;
-        if (location == sourceBucket) {
-            mainInsertLocation = destBucket;
-            mainOutputPosition.set(destBucket, EMPTY_OUTPUT_POSITION);
-        } else {
-            mainInsertLocation = sourceBucket;
-            mainOutputPosition.set(destBucket, mainOutputPosition.getUnsafe(sourceBucket));
-            mainOutputPosition.set(sourceBucket, EMPTY_OUTPUT_POSITION);
-            mainKeySource0.set(destBucket, k0);
-            mainKeySource0.set(sourceBucket, QueryConstants.NULL_SHORT);
-            mainKeySource1.set(destBucket, k1);
-            mainKeySource1.set(sourceBucket, QueryConstants.NULL_BYTE);
-            handler.doMoveMain(sourceBucket, destBucket);
-        }
-        return mainInsertLocation;
-    }
-
-    private boolean findOverflow(HashHandler handler, short k0, byte k1, int chunkPosition,
-            int overflowLocation) {
-        while (overflowLocation != QueryConstants.NULL_INT) {
-            if (eq(overflowKeySource0.getUnsafe(overflowLocation), k0) && eq(overflowKeySource1.getUnsafe(overflowLocation), k1)) {
-                handler.doOverflowFound(overflowLocation, chunkPosition);
-                return true;
-            }
-            overflowLocation = overflowOverflowLocationSource.getUnsafe(overflowLocation);
-        }
-        return false;
-    }
-
-    @Override
-    public int findPositionForKey(Object key) {
-        final Object [] ka = (Object[])key;
-        final short k0 = TypeUtils.unbox((Short)ka[0]);
-        final byte k1 = TypeUtils.unbox((Byte)ka[1]);
-        int hash = hash(k0, k1);
-        final int tableLocation = hashToTableLocation(tableHashPivot, hash);
-        final int positionValue = mainOutputPosition.getUnsafe(tableLocation);
-        if (positionValue == EMPTY_OUTPUT_POSITION) {
-            return -1;
-        }
-        if (eq(mainKeySource0.getUnsafe(tableLocation), k0) && eq(mainKeySource1.getUnsafe(tableLocation), k1)) {
-            return positionValue;
-        }
-        int overflowLocation = mainOverflowLocationSource.getUnsafe(tableLocation);
-        while (overflowLocation != QueryConstants.NULL_INT) {
-            if (eq(overflowKeySource0.getUnsafe(overflowLocation), k0) && eq(overflowKeySource1.getUnsafe(overflowLocation), k1)) {
-                return overflowOutputPosition.getUnsafe(overflowLocation);
-            }
-            overflowLocation = overflowOverflowLocationSource.getUnsafe(overflowLocation);
-        }
-        return -1;
-    }
-}
diff --git a/engine/table/src/main/java/io/deephaven/engine/table/impl/by/typed/staticagg/gen/StaticAggHasherShortChar.java b/engine/table/src/main/java/io/deephaven/engine/table/impl/by/typed/staticagg/gen/StaticAggHasherShortChar.java
deleted file mode 100644
index 037ec7fb999..00000000000
--- a/engine/table/src/main/java/io/deephaven/engine/table/impl/by/typed/staticagg/gen/StaticAggHasherShortChar.java
+++ /dev/null
@@ -1,206 +0,0 @@
-//
-// Copyright (c) 2016-2024 Deephaven Data Labs and Patent Pending
-//
-// ****** AUTO-GENERATED CLASS - DO NOT EDIT MANUALLY
-// ****** Run ReplicateTypedHashers or ./gradlew replicateTypedHashers to regenerate
-//
-// @formatter:off
-package io.deephaven.engine.table.impl.by.typed.staticagg.gen;
-
-import static io.deephaven.util.compare.CharComparisons.eq;
-import static io.deephaven.util.compare.ShortComparisons.eq;
-
-import io.deephaven.chunk.CharChunk;
-import io.deephaven.chunk.Chunk;
-import io.deephaven.chunk.ShortChunk;
-import io.deephaven.chunk.attributes.Values;
-import io.deephaven.chunk.util.hashing.CharChunkHasher;
-import io.deephaven.chunk.util.hashing.ShortChunkHasher;
-import io.deephaven.engine.rowset.RowSequence;
-import io.deephaven.engine.table.ColumnSource;
-import io.deephaven.engine.table.impl.by.HashHandler;
-import io.deephaven.engine.table.impl.by.StaticChunkedOperatorAggregationStateManagerTypedBase;
-import io.deephaven.engine.table.impl.sources.CharacterArraySource;
-import io.deephaven.engine.table.impl.sources.ShortArraySource;
-import io.deephaven.util.QueryConstants;
-import io.deephaven.util.type.TypeUtils;
-import java.lang.Character;
-import java.lang.Object;
-import java.lang.Override;
-import java.lang.Short;
-
-final class StaticAggHasherShortChar extends StaticChunkedOperatorAggregationStateManagerTypedBase {
-    private final ShortArraySource mainKeySource0;
-
-    private final ShortArraySource overflowKeySource0;
-
-    private final CharacterArraySource mainKeySource1;
-
-    private final CharacterArraySource overflowKeySource1;
-
-    public StaticAggHasherShortChar(ColumnSource[] tableKeySources,
-            ColumnSource[] originalTableKeySources, int tableSize, double maximumLoadFactor,
-            double targetLoadFactor) {
-        super(tableKeySources, tableSize, maximumLoadFactor, targetLoadFactor);
-        this.mainKeySource0 = (ShortArraySource) super.mainKeySources[0];
-        this.overflowKeySource0 = (ShortArraySource) super.overflowKeySources[0];
-        this.mainKeySource1 = (CharacterArraySource) super.mainKeySources[1];
-        this.overflowKeySource1 = (CharacterArraySource) super.overflowKeySources[1];
-    }
-
-    @Override
-    protected void build(HashHandler handler, RowSequence rowSequence, Chunk[] sourceKeyChunks) {
-        final ShortChunk<Values> keyChunk0 = sourceKeyChunks[0].asShortChunk();
-        final CharChunk<Values> keyChunk1 = sourceKeyChunks[1].asCharChunk();
-        final int chunkSize = keyChunk0.size();
-        for (int chunkPosition = 0; chunkPosition < chunkSize; ++chunkPosition) {
-            final short k0 = keyChunk0.get(chunkPosition);
-            final char k1 = keyChunk1.get(chunkPosition);
-            final int hash = hash(k0, k1);
-            final int tableLocation = hashToTableLocation(tableHashPivot, hash);
-            if (mainOutputPosition.getUnsafe(tableLocation) == EMPTY_OUTPUT_POSITION) {
-                numEntries++;
-                mainKeySource0.set(tableLocation, k0);
-                mainKeySource1.set(tableLocation, k1);
-                handler.doMainInsert(tableLocation, chunkPosition);
-            } else if (eq(mainKeySource0.getUnsafe(tableLocation), k0) && eq(mainKeySource1.getUnsafe(tableLocation), k1)) {
-                handler.doMainFound(tableLocation, chunkPosition);
-            } else {
-                int overflowLocation = mainOverflowLocationSource.getUnsafe(tableLocation);
-                if (!findOverflow(handler, k0, k1, chunkPosition, overflowLocation)) {
-                    final int newOverflowLocation = allocateOverflowLocation();
-                    overflowKeySource0.set(newOverflowLocation, k0);
-                    overflowKeySource1.set(newOverflowLocation, k1);
-                    mainOverflowLocationSource.set(tableLocation, newOverflowLocation);
-                    overflowOverflowLocationSource.set(newOverflowLocation, overflowLocation);
-                    numEntries++;
-                    handler.doOverflowInsert(newOverflowLocation, chunkPosition);
-                }
-            }
-        }
-    }
-
-    @Override
-    protected void probe(HashHandler handler, RowSequence rowSequence, Chunk[] sourceKeyChunks) {
-        final ShortChunk<Values> keyChunk0 = sourceKeyChunks[0].asShortChunk();
-        final CharChunk<Values> keyChunk1 = sourceKeyChunks[1].asCharChunk();
-        final int chunkSize = keyChunk0.size();
-        for (int chunkPosition = 0; chunkPosition < chunkSize; ++chunkPosition) {
-            final short k0 = keyChunk0.get(chunkPosition);
-            final char k1 = keyChunk1.get(chunkPosition);
-            final int hash = hash(k0, k1);
-            final int tableLocation = hashToTableLocation(tableHashPivot, hash);
-            if (mainOutputPosition.getUnsafe(tableLocation) == EMPTY_OUTPUT_POSITION) {
-                handler.doMissing(chunkPosition);
-            } else if (eq(mainKeySource0.getUnsafe(tableLocation), k0) && eq(mainKeySource1.getUnsafe(tableLocation), k1)) {
-                handler.doMainFound(tableLocation, chunkPosition);
-            } else {
-                int overflowLocation = mainOverflowLocationSource.getUnsafe(tableLocation);
-                if (!findOverflow(handler, k0, k1, chunkPosition, overflowLocation)) {
-                    handler.doMissing(chunkPosition);
-                }
-            }
-        }
-    }
-
-    private static int hash(short k0, char k1) {
-        int hash = ShortChunkHasher.hashInitialSingle(k0);
-        hash = CharChunkHasher.hashUpdateSingle(hash, k1);
-        return hash;
-    }
-
-    @Override
-    protected void rehashBucket(HashHandler handler, int sourceBucket, int destBucket,
-            int bucketsToAdd) {
-        final int position = mainOutputPosition.getUnsafe(sourceBucket);
-        if (position == EMPTY_OUTPUT_POSITION) {
-            return;
-        }
-        int mainInsertLocation = maybeMoveMainBucket(handler, sourceBucket, destBucket, bucketsToAdd);
-        int overflowLocation = mainOverflowLocationSource.getUnsafe(sourceBucket);
-        mainOverflowLocationSource.set(sourceBucket, QueryConstants.NULL_INT);
-        mainOverflowLocationSource.set(destBucket, QueryConstants.NULL_INT);
-        while (overflowLocation != QueryConstants.NULL_INT) {
-            final int nextOverflowLocation = overflowOverflowLocationSource.getUnsafe(overflowLocation);
-            final short overflowKey0 = overflowKeySource0.getUnsafe(overflowLocation);
-            final char overflowKey1 = overflowKeySource1.getUnsafe(overflowLocation);
-            final int overflowHash = hash(overflowKey0, overflowKey1);
-            final int overflowTableLocation = hashToTableLocation(tableHashPivot + bucketsToAdd, overflowHash);
-            if (overflowTableLocation == mainInsertLocation) {
-                mainKeySource0.set(mainInsertLocation, overflowKey0);
-                mainKeySource1.set(mainInsertLocation, overflowKey1);
-                mainOutputPosition.set(mainInsertLocation, overflowOutputPosition.getUnsafe(overflowLocation));
-                handler.doPromoteOverflow(overflowLocation, mainInsertLocation);
-                overflowOutputPosition.set(overflowLocation, QueryConstants.NULL_INT);
-                overflowKeySource0.set(overflowLocation, QueryConstants.NULL_SHORT);
-                overflowKeySource1.set(overflowLocation, QueryConstants.NULL_CHAR);
-                freeOverflowLocation(overflowLocation);
-                mainInsertLocation = -1;
-            } else {
-                final int oldOverflowLocation = mainOverflowLocationSource.getUnsafe(overflowTableLocation);
-                mainOverflowLocationSource.set(overflowTableLocation, overflowLocation);
-                overflowOverflowLocationSource.set(overflowLocation, oldOverflowLocation);
-            }
-            overflowLocation = nextOverflowLocation;
-        }
-    }
-
-    private int maybeMoveMainBucket(HashHandler handler, int sourceBucket, int destBucket,
-            int bucketsToAdd) {
-        final short k0 = mainKeySource0.getUnsafe(sourceBucket);
-        final char k1 = mainKeySource1.getUnsafe(sourceBucket);
-        final int hash = hash(k0, k1);
-        final int location = hashToTableLocation(tableHashPivot + bucketsToAdd, hash);
-        final int mainInsertLocation;
-        if (location == sourceBucket) {
-            mainInsertLocation = destBucket;
-            mainOutputPosition.set(destBucket, EMPTY_OUTPUT_POSITION);
-        } else {
-            mainInsertLocation = sourceBucket;
-            mainOutputPosition.set(destBucket, mainOutputPosition.getUnsafe(sourceBucket));
-            mainOutputPosition.set(sourceBucket, EMPTY_OUTPUT_POSITION);
-            mainKeySource0.set(destBucket, k0);
-            mainKeySource0.set(sourceBucket, QueryConstants.NULL_SHORT);
-            mainKeySource1.set(destBucket, k1);
-            mainKeySource1.set(sourceBucket, QueryConstants.NULL_CHAR);
-            handler.doMoveMain(sourceBucket, destBucket);
-        }
-        return mainInsertLocation;
-    }
-
-    private boolean findOverflow(HashHandler handler, short k0, char k1, int chunkPosition,
-            int overflowLocation) {
-        while (overflowLocation != QueryConstants.NULL_INT) {
-            if (eq(overflowKeySource0.getUnsafe(overflowLocation), k0) && eq(overflowKeySource1.getUnsafe(overflowLocation), k1)) {
-                handler.doOverflowFound(overflowLocation, chunkPosition);
-                return true;
-            }
-            overflowLocation = overflowOverflowLocationSource.getUnsafe(overflowLocation);
-        }
-        return false;
-    }
-
-    @Override
-    public int findPositionForKey(Object key) {
-        final Object [] ka = (Object[])key;
-        final short k0 = TypeUtils.unbox((Short)ka[0]);
-        final char k1 = TypeUtils.unbox((Character)ka[1]);
-        int hash = hash(k0, k1);
-        final int tableLocation = hashToTableLocation(tableHashPivot, hash);
-        final int positionValue = mainOutputPosition.getUnsafe(tableLocation);
-        if (positionValue == EMPTY_OUTPUT_POSITION) {
-            return -1;
-        }
-        if (eq(mainKeySource0.getUnsafe(tableLocation), k0) && eq(mainKeySource1.getUnsafe(tableLocation), k1)) {
-            return positionValue;
-        }
-        int overflowLocation = mainOverflowLocationSource.getUnsafe(tableLocation);
-        while (overflowLocation != QueryConstants.NULL_INT) {
-            if (eq(overflowKeySource0.getUnsafe(overflowLocation), k0) && eq(overflowKeySource1.getUnsafe(overflowLocation), k1)) {
-                return overflowOutputPosition.getUnsafe(overflowLocation);
-            }
-            overflowLocation = overflowOverflowLocationSource.getUnsafe(overflowLocation);
-        }
-        return -1;
-    }
-}
diff --git a/engine/table/src/main/java/io/deephaven/engine/table/impl/by/typed/staticagg/gen/StaticAggHasherShortDouble.java b/engine/table/src/main/java/io/deephaven/engine/table/impl/by/typed/staticagg/gen/StaticAggHasherShortDouble.java
deleted file mode 100644
index a306ed33f0a..00000000000
--- a/engine/table/src/main/java/io/deephaven/engine/table/impl/by/typed/staticagg/gen/StaticAggHasherShortDouble.java
+++ /dev/null
@@ -1,206 +0,0 @@
-//
-// Copyright (c) 2016-2024 Deephaven Data Labs and Patent Pending
-//
-// ****** AUTO-GENERATED CLASS - DO NOT EDIT MANUALLY
-// ****** Run ReplicateTypedHashers or ./gradlew replicateTypedHashers to regenerate
-//
-// @formatter:off
-package io.deephaven.engine.table.impl.by.typed.staticagg.gen;
-
-import static io.deephaven.util.compare.DoubleComparisons.eq;
-import static io.deephaven.util.compare.ShortComparisons.eq;
-
-import io.deephaven.chunk.Chunk;
-import io.deephaven.chunk.DoubleChunk;
-import io.deephaven.chunk.ShortChunk;
-import io.deephaven.chunk.attributes.Values;
-import io.deephaven.chunk.util.hashing.DoubleChunkHasher;
-import io.deephaven.chunk.util.hashing.ShortChunkHasher;
-import io.deephaven.engine.rowset.RowSequence;
-import io.deephaven.engine.table.ColumnSource;
-import io.deephaven.engine.table.impl.by.HashHandler;
-import io.deephaven.engine.table.impl.by.StaticChunkedOperatorAggregationStateManagerTypedBase;
-import io.deephaven.engine.table.impl.sources.DoubleArraySource;
-import io.deephaven.engine.table.impl.sources.ShortArraySource;
-import io.deephaven.util.QueryConstants;
-import io.deephaven.util.type.TypeUtils;
-import java.lang.Double;
-import java.lang.Object;
-import java.lang.Override;
-import java.lang.Short;
-
-final class StaticAggHasherShortDouble extends StaticChunkedOperatorAggregationStateManagerTypedBase {
-    private final ShortArraySource mainKeySource0;
-
-    private final ShortArraySource overflowKeySource0;
-
-    private final DoubleArraySource mainKeySource1;
-
-    private final DoubleArraySource overflowKeySource1;
-
-    public StaticAggHasherShortDouble(ColumnSource[] tableKeySources,
-            ColumnSource[] originalTableKeySources, int tableSize, double maximumLoadFactor,
-            double targetLoadFactor) {
-        super(tableKeySources, tableSize, maximumLoadFactor, targetLoadFactor);
-        this.mainKeySource0 = (ShortArraySource) super.mainKeySources[0];
-        this.overflowKeySource0 = (ShortArraySource) super.overflowKeySources[0];
-        this.mainKeySource1 = (DoubleArraySource) super.mainKeySources[1];
-        this.overflowKeySource1 = (DoubleArraySource) super.overflowKeySources[1];
-    }
-
-    @Override
-    protected void build(HashHandler handler, RowSequence rowSequence, Chunk[] sourceKeyChunks) {
-        final ShortChunk<Values> keyChunk0 = sourceKeyChunks[0].asShortChunk();
-        final DoubleChunk<Values> keyChunk1 = sourceKeyChunks[1].asDoubleChunk();
-        final int chunkSize = keyChunk0.size();
-        for (int chunkPosition = 0; chunkPosition < chunkSize; ++chunkPosition) {
-            final short k0 = keyChunk0.get(chunkPosition);
-            final double k1 = keyChunk1.get(chunkPosition);
-            final int hash = hash(k0, k1);
-            final int tableLocation = hashToTableLocation(tableHashPivot, hash);
-            if (mainOutputPosition.getUnsafe(tableLocation) == EMPTY_OUTPUT_POSITION) {
-                numEntries++;
-                mainKeySource0.set(tableLocation, k0);
-                mainKeySource1.set(tableLocation, k1);
-                handler.doMainInsert(tableLocation, chunkPosition);
-            } else if (eq(mainKeySource0.getUnsafe(tableLocation), k0) && eq(mainKeySource1.getUnsafe(tableLocation), k1)) {
-                handler.doMainFound(tableLocation, chunkPosition);
-            } else {
-                int overflowLocation = mainOverflowLocationSource.getUnsafe(tableLocation);
-                if (!findOverflow(handler, k0, k1, chunkPosition, overflowLocation)) {
-                    final int newOverflowLocation = allocateOverflowLocation();
-                    overflowKeySource0.set(newOverflowLocation, k0);
-                    overflowKeySource1.set(newOverflowLocation, k1);
-                    mainOverflowLocationSource.set(tableLocation, newOverflowLocation);
-                    overflowOverflowLocationSource.set(newOverflowLocation, overflowLocation);
-                    numEntries++;
-                    handler.doOverflowInsert(newOverflowLocation, chunkPosition);
-                }
-            }
-        }
-    }
-
-    @Override
-    protected void probe(HashHandler handler, RowSequence rowSequence, Chunk[] sourceKeyChunks) {
-        final ShortChunk<Values> keyChunk0 = sourceKeyChunks[0].asShortChunk();
-        final DoubleChunk<Values> keyChunk1 = sourceKeyChunks[1].asDoubleChunk();
-        final int chunkSize = keyChunk0.size();
-        for (int chunkPosition = 0; chunkPosition < chunkSize; ++chunkPosition) {
-            final short k0 = keyChunk0.get(chunkPosition);
-            final double k1 = keyChunk1.get(chunkPosition);
-            final int hash = hash(k0, k1);
-            final int tableLocation = hashToTableLocation(tableHashPivot, hash);
-            if (mainOutputPosition.getUnsafe(tableLocation) == EMPTY_OUTPUT_POSITION) {
-                handler.doMissing(chunkPosition);
-            } else if (eq(mainKeySource0.getUnsafe(tableLocation), k0) && eq(mainKeySource1.getUnsafe(tableLocation), k1)) {
-                handler.doMainFound(tableLocation, chunkPosition);
-            } else {
-                int overflowLocation = mainOverflowLocationSource.getUnsafe(tableLocation);
-                if (!findOverflow(handler, k0, k1, chunkPosition, overflowLocation)) {
-                    handler.doMissing(chunkPosition);
-                }
-            }
-        }
-    }
-
-    private static int hash(short k0, double k1) {
-        int hash = ShortChunkHasher.hashInitialSingle(k0);
-        hash = DoubleChunkHasher.hashUpdateSingle(hash, k1);
-        return hash;
-    }
-
-    @Override
-    protected void rehashBucket(HashHandler handler, int sourceBucket, int destBucket,
-            int bucketsToAdd) {
-        final int position = mainOutputPosition.getUnsafe(sourceBucket);
-        if (position == EMPTY_OUTPUT_POSITION) {
-            return;
-        }
-        int mainInsertLocation = maybeMoveMainBucket(handler, sourceBucket, destBucket, bucketsToAdd);
-        int overflowLocation = mainOverflowLocationSource.getUnsafe(sourceBucket);
-        mainOverflowLocationSource.set(sourceBucket, QueryConstants.NULL_INT);
-        mainOverflowLocationSource.set(destBucket, QueryConstants.NULL_INT);
-        while (overflowLocation != QueryConstants.NULL_INT) {
-            final int nextOverflowLocation = overflowOverflowLocationSource.getUnsafe(overflowLocation);
-            final short overflowKey0 = overflowKeySource0.getUnsafe(overflowLocation);
-            final double overflowKey1 = overflowKeySource1.getUnsafe(overflowLocation);
-            final int overflowHash = hash(overflowKey0, overflowKey1);
-            final int overflowTableLocation = hashToTableLocation(tableHashPivot + bucketsToAdd, overflowHash);
-            if (overflowTableLocation == mainInsertLocation) {
-                mainKeySource0.set(mainInsertLocation, overflowKey0);
-                mainKeySource1.set(mainInsertLocation, overflowKey1);
-                mainOutputPosition.set(mainInsertLocation, overflowOutputPosition.getUnsafe(overflowLocation));
-                handler.doPromoteOverflow(overflowLocation, mainInsertLocation);
-                overflowOutputPosition.set(overflowLocation, QueryConstants.NULL_INT);
-                overflowKeySource0.set(overflowLocation, QueryConstants.NULL_SHORT);
-                overflowKeySource1.set(overflowLocation, QueryConstants.NULL_DOUBLE);
-                freeOverflowLocation(overflowLocation);
-                mainInsertLocation = -1;
-            } else {
-                final int oldOverflowLocation = mainOverflowLocationSource.getUnsafe(overflowTableLocation);
-                mainOverflowLocationSource.set(overflowTableLocation, overflowLocation);
-                overflowOverflowLocationSource.set(overflowLocation, oldOverflowLocation);
-            }
-            overflowLocation = nextOverflowLocation;
-        }
-    }
-
-    private int maybeMoveMainBucket(HashHandler handler, int sourceBucket, int destBucket,
-            int bucketsToAdd) {
-        final short k0 = mainKeySource0.getUnsafe(sourceBucket);
-        final double k1 = mainKeySource1.getUnsafe(sourceBucket);
-        final int hash = hash(k0, k1);
-        final int location = hashToTableLocation(tableHashPivot + bucketsToAdd, hash);
-        final int mainInsertLocation;
-        if (location == sourceBucket) {
-            mainInsertLocation = destBucket;
-            mainOutputPosition.set(destBucket, EMPTY_OUTPUT_POSITION);
-        } else {
-            mainInsertLocation = sourceBucket;
-            mainOutputPosition.set(destBucket, mainOutputPosition.getUnsafe(sourceBucket));
-            mainOutputPosition.set(sourceBucket, EMPTY_OUTPUT_POSITION);
-            mainKeySource0.set(destBucket, k0);
-            mainKeySource0.set(sourceBucket, QueryConstants.NULL_SHORT);
-            mainKeySource1.set(destBucket, k1);
-            mainKeySource1.set(sourceBucket, QueryConstants.NULL_DOUBLE);
-            handler.doMoveMain(sourceBucket, destBucket);
-        }
-        return mainInsertLocation;
-    }
-
-    private boolean findOverflow(HashHandler handler, short k0, double k1, int chunkPosition,
-            int overflowLocation) {
-        while (overflowLocation != QueryConstants.NULL_INT) {
-            if (eq(overflowKeySource0.getUnsafe(overflowLocation), k0) && eq(overflowKeySource1.getUnsafe(overflowLocation), k1)) {
-                handler.doOverflowFound(overflowLocation, chunkPosition);
-                return true;
-            }
-            overflowLocation = overflowOverflowLocationSource.getUnsafe(overflowLocation);
-        }
-        return false;
-    }
-
-    @Override
-    public int findPositionForKey(Object key) {
-        final Object [] ka = (Object[])key;
-        final short k0 = TypeUtils.unbox((Short)ka[0]);
-        final double k1 = TypeUtils.unbox((Double)ka[1]);
-        int hash = hash(k0, k1);
-        final int tableLocation = hashToTableLocation(tableHashPivot, hash);
-        final int positionValue = mainOutputPosition.getUnsafe(tableLocation);
-        if (positionValue == EMPTY_OUTPUT_POSITION) {
-            return -1;
-        }
-        if (eq(mainKeySource0.getUnsafe(tableLocation), k0) && eq(mainKeySource1.getUnsafe(tableLocation), k1)) {
-            return positionValue;
-        }
-        int overflowLocation = mainOverflowLocationSource.getUnsafe(tableLocation);
-        while (overflowLocation != QueryConstants.NULL_INT) {
-            if (eq(overflowKeySource0.getUnsafe(overflowLocation), k0) && eq(overflowKeySource1.getUnsafe(overflowLocation), k1)) {
-                return overflowOutputPosition.getUnsafe(overflowLocation);
-            }
-            overflowLocation = overflowOverflowLocationSource.getUnsafe(overflowLocation);
-        }
-        return -1;
-    }
-}
diff --git a/engine/table/src/main/java/io/deephaven/engine/table/impl/by/typed/staticagg/gen/StaticAggHasherShortFloat.java b/engine/table/src/main/java/io/deephaven/engine/table/impl/by/typed/staticagg/gen/StaticAggHasherShortFloat.java
deleted file mode 100644
index 97030c9c239..00000000000
--- a/engine/table/src/main/java/io/deephaven/engine/table/impl/by/typed/staticagg/gen/StaticAggHasherShortFloat.java
+++ /dev/null
@@ -1,206 +0,0 @@
-//
-// Copyright (c) 2016-2024 Deephaven Data Labs and Patent Pending
-//
-// ****** AUTO-GENERATED CLASS - DO NOT EDIT MANUALLY
-// ****** Run ReplicateTypedHashers or ./gradlew replicateTypedHashers to regenerate
-//
-// @formatter:off
-package io.deephaven.engine.table.impl.by.typed.staticagg.gen;
-
-import static io.deephaven.util.compare.FloatComparisons.eq;
-import static io.deephaven.util.compare.ShortComparisons.eq;
-
-import io.deephaven.chunk.Chunk;
-import io.deephaven.chunk.FloatChunk;
-import io.deephaven.chunk.ShortChunk;
-import io.deephaven.chunk.attributes.Values;
-import io.deephaven.chunk.util.hashing.FloatChunkHasher;
-import io.deephaven.chunk.util.hashing.ShortChunkHasher;
-import io.deephaven.engine.rowset.RowSequence;
-import io.deephaven.engine.table.ColumnSource;
-import io.deephaven.engine.table.impl.by.HashHandler;
-import io.deephaven.engine.table.impl.by.StaticChunkedOperatorAggregationStateManagerTypedBase;
-import io.deephaven.engine.table.impl.sources.FloatArraySource;
-import io.deephaven.engine.table.impl.sources.ShortArraySource;
-import io.deephaven.util.QueryConstants;
-import io.deephaven.util.type.TypeUtils;
-import java.lang.Float;
-import java.lang.Object;
-import java.lang.Override;
-import java.lang.Short;
-
-final class StaticAggHasherShortFloat extends StaticChunkedOperatorAggregationStateManagerTypedBase {
-    private final ShortArraySource mainKeySource0;
-
-    private final ShortArraySource overflowKeySource0;
-
-    private final FloatArraySource mainKeySource1;
-
-    private final FloatArraySource overflowKeySource1;
-
-    public StaticAggHasherShortFloat(ColumnSource[] tableKeySources,
-            ColumnSource[] originalTableKeySources, int tableSize, double maximumLoadFactor,
-            double targetLoadFactor) {
-        super(tableKeySources, tableSize, maximumLoadFactor, targetLoadFactor);
-        this.mainKeySource0 = (ShortArraySource) super.mainKeySources[0];
-        this.overflowKeySource0 = (ShortArraySource) super.overflowKeySources[0];
-        this.mainKeySource1 = (FloatArraySource) super.mainKeySources[1];
-        this.overflowKeySource1 = (FloatArraySource) super.overflowKeySources[1];
-    }
-
-    @Override
-    protected void build(HashHandler handler, RowSequence rowSequence, Chunk[] sourceKeyChunks) {
-        final ShortChunk<Values> keyChunk0 = sourceKeyChunks[0].asShortChunk();
-        final FloatChunk<Values> keyChunk1 = sourceKeyChunks[1].asFloatChunk();
-        final int chunkSize = keyChunk0.size();
-        for (int chunkPosition = 0; chunkPosition < chunkSize; ++chunkPosition) {
-            final short k0 = keyChunk0.get(chunkPosition);
-            final float k1 = keyChunk1.get(chunkPosition);
-            final int hash = hash(k0, k1);
-            final int tableLocation = hashToTableLocation(tableHashPivot, hash);
-            if (mainOutputPosition.getUnsafe(tableLocation) == EMPTY_OUTPUT_POSITION) {
-                numEntries++;
-                mainKeySource0.set(tableLocation, k0);
-                mainKeySource1.set(tableLocation, k1);
-                handler.doMainInsert(tableLocation, chunkPosition);
-            } else if (eq(mainKeySource0.getUnsafe(tableLocation), k0) && eq(mainKeySource1.getUnsafe(tableLocation), k1)) {
-                handler.doMainFound(tableLocation, chunkPosition);
-            } else {
-                int overflowLocation = mainOverflowLocationSource.getUnsafe(tableLocation);
-                if (!findOverflow(handler, k0, k1, chunkPosition, overflowLocation)) {
-                    final int newOverflowLocation = allocateOverflowLocation();
-                    overflowKeySource0.set(newOverflowLocation, k0);
-                    overflowKeySource1.set(newOverflowLocation, k1);
-                    mainOverflowLocationSource.set(tableLocation, newOverflowLocation);
-                    overflowOverflowLocationSource.set(newOverflowLocation, overflowLocation);
-                    numEntries++;
-                    handler.doOverflowInsert(newOverflowLocation, chunkPosition);
-                }
-            }
-        }
-    }
-
-    @Override
-    protected void probe(HashHandler handler, RowSequence rowSequence, Chunk[] sourceKeyChunks) {
-        final ShortChunk<Values> keyChunk0 = sourceKeyChunks[0].asShortChunk();
-        final FloatChunk<Values> keyChunk1 = sourceKeyChunks[1].asFloatChunk();
-        final int chunkSize = keyChunk0.size();
-        for (int chunkPosition = 0; chunkPosition < chunkSize; ++chunkPosition) {
-            final short k0 = keyChunk0.get(chunkPosition);
-            final float k1 = keyChunk1.get(chunkPosition);
-            final int hash = hash(k0, k1);
-            final int tableLocation = hashToTableLocation(tableHashPivot, hash);
-            if (mainOutputPosition.getUnsafe(tableLocation) == EMPTY_OUTPUT_POSITION) {
-                handler.doMissing(chunkPosition);
-            } else if (eq(mainKeySource0.getUnsafe(tableLocation), k0) && eq(mainKeySource1.getUnsafe(tableLocation), k1)) {
-                handler.doMainFound(tableLocation, chunkPosition);
-            } else {
-                int overflowLocation = mainOverflowLocationSource.getUnsafe(tableLocation);
-                if (!findOverflow(handler, k0, k1, chunkPosition, overflowLocation)) {
-                    handler.doMissing(chunkPosition);
-                }
-            }
-        }
-    }
-
-    private static int hash(short k0, float k1) {
-        int hash = ShortChunkHasher.hashInitialSingle(k0);
-        hash = FloatChunkHasher.hashUpdateSingle(hash, k1);
-        return hash;
-    }
-
-    @Override
-    protected void rehashBucket(HashHandler handler, int sourceBucket, int destBucket,
-            int bucketsToAdd) {
-        final int position = mainOutputPosition.getUnsafe(sourceBucket);
-        if (position == EMPTY_OUTPUT_POSITION) {
-            return;
-        }
-        int mainInsertLocation = maybeMoveMainBucket(handler, sourceBucket, destBucket, bucketsToAdd);
-        int overflowLocation = mainOverflowLocationSource.getUnsafe(sourceBucket);
-        mainOverflowLocationSource.set(sourceBucket, QueryConstants.NULL_INT);
-        mainOverflowLocationSource.set(destBucket, QueryConstants.NULL_INT);
-        while (overflowLocation != QueryConstants.NULL_INT) {
-            final int nextOverflowLocation = overflowOverflowLocationSource.getUnsafe(overflowLocation);
-            final short overflowKey0 = overflowKeySource0.getUnsafe(overflowLocation);
-            final float overflowKey1 = overflowKeySource1.getUnsafe(overflowLocation);
-            final int overflowHash = hash(overflowKey0, overflowKey1);
-            final int overflowTableLocation = hashToTableLocation(tableHashPivot + bucketsToAdd, overflowHash);
-            if (overflowTableLocation == mainInsertLocation) {
-                mainKeySource0.set(mainInsertLocation, overflowKey0);
-                mainKeySource1.set(mainInsertLocation, overflowKey1);
-                mainOutputPosition.set(mainInsertLocation, overflowOutputPosition.getUnsafe(overflowLocation));
-                handler.doPromoteOverflow(overflowLocation, mainInsertLocation);
-                overflowOutputPosition.set(overflowLocation, QueryConstants.NULL_INT);
-                overflowKeySource0.set(overflowLocation, QueryConstants.NULL_SHORT);
-                overflowKeySource1.set(overflowLocation, QueryConstants.NULL_FLOAT);
-                freeOverflowLocation(overflowLocation);
-                mainInsertLocation = -1;
-            } else {
-                final int oldOverflowLocation = mainOverflowLocationSource.getUnsafe(overflowTableLocation);
-                mainOverflowLocationSource.set(overflowTableLocation, overflowLocation);
-                overflowOverflowLocationSource.set(overflowLocation, oldOverflowLocation);
-            }
-            overflowLocation = nextOverflowLocation;
-        }
-    }
-
-    private int maybeMoveMainBucket(HashHandler handler, int sourceBucket, int destBucket,
-            int bucketsToAdd) {
-        final short k0 = mainKeySource0.getUnsafe(sourceBucket);
-        final float k1 = mainKeySource1.getUnsafe(sourceBucket);
-        final int hash = hash(k0, k1);
-        final int location = hashToTableLocation(tableHashPivot + bucketsToAdd, hash);
-        final int mainInsertLocation;
-        if (location == sourceBucket) {
-            mainInsertLocation = destBucket;
-            mainOutputPosition.set(destBucket, EMPTY_OUTPUT_POSITION);
-        } else {
-            mainInsertLocation = sourceBucket;
-            mainOutputPosition.set(destBucket, mainOutputPosition.getUnsafe(sourceBucket));
-            mainOutputPosition.set(sourceBucket, EMPTY_OUTPUT_POSITION);
-            mainKeySource0.set(destBucket, k0);
-            mainKeySource0.set(sourceBucket, QueryConstants.NULL_SHORT);
-            mainKeySource1.set(destBucket, k1);
-            mainKeySource1.set(sourceBucket, QueryConstants.NULL_FLOAT);
-            handler.doMoveMain(sourceBucket, destBucket);
-        }
-        return mainInsertLocation;
-    }
-
-    private boolean findOverflow(HashHandler handler, short k0, float k1, int chunkPosition,
-            int overflowLocation) {
-        while (overflowLocation != QueryConstants.NULL_INT) {
-            if (eq(overflowKeySource0.getUnsafe(overflowLocation), k0) && eq(overflowKeySource1.getUnsafe(overflowLocation), k1)) {
-                handler.doOverflowFound(overflowLocation, chunkPosition);
-                return true;
-            }
-            overflowLocation = overflowOverflowLocationSource.getUnsafe(overflowLocation);
-        }
-        return false;
-    }
-
-    @Override
-    public int findPositionForKey(Object key) {
-        final Object [] ka = (Object[])key;
-        final short k0 = TypeUtils.unbox((Short)ka[0]);
-        final float k1 = TypeUtils.unbox((Float)ka[1]);
-        int hash = hash(k0, k1);
-        final int tableLocation = hashToTableLocation(tableHashPivot, hash);
-        final int positionValue = mainOutputPosition.getUnsafe(tableLocation);
-        if (positionValue == EMPTY_OUTPUT_POSITION) {
-            return -1;
-        }
-        if (eq(mainKeySource0.getUnsafe(tableLocation), k0) && eq(mainKeySource1.getUnsafe(tableLocation), k1)) {
-            return positionValue;
-        }
-        int overflowLocation = mainOverflowLocationSource.getUnsafe(tableLocation);
-        while (overflowLocation != QueryConstants.NULL_INT) {
-            if (eq(overflowKeySource0.getUnsafe(overflowLocation), k0) && eq(overflowKeySource1.getUnsafe(overflowLocation), k1)) {
-                return overflowOutputPosition.getUnsafe(overflowLocation);
-            }
-            overflowLocation = overflowOverflowLocationSource.getUnsafe(overflowLocation);
-        }
-        return -1;
-    }
-}
diff --git a/engine/table/src/main/java/io/deephaven/engine/table/impl/by/typed/staticagg/gen/StaticAggHasherShortInt.java b/engine/table/src/main/java/io/deephaven/engine/table/impl/by/typed/staticagg/gen/StaticAggHasherShortInt.java
deleted file mode 100644
index e4692aa41f6..00000000000
--- a/engine/table/src/main/java/io/deephaven/engine/table/impl/by/typed/staticagg/gen/StaticAggHasherShortInt.java
+++ /dev/null
@@ -1,206 +0,0 @@
-//
-// Copyright (c) 2016-2024 Deephaven Data Labs and Patent Pending
-//
-// ****** AUTO-GENERATED CLASS - DO NOT EDIT MANUALLY
-// ****** Run ReplicateTypedHashers or ./gradlew replicateTypedHashers to regenerate
-//
-// @formatter:off
-package io.deephaven.engine.table.impl.by.typed.staticagg.gen;
-
-import static io.deephaven.util.compare.IntComparisons.eq;
-import static io.deephaven.util.compare.ShortComparisons.eq;
-
-import io.deephaven.chunk.Chunk;
-import io.deephaven.chunk.IntChunk;
-import io.deephaven.chunk.ShortChunk;
-import io.deephaven.chunk.attributes.Values;
-import io.deephaven.chunk.util.hashing.IntChunkHasher;
-import io.deephaven.chunk.util.hashing.ShortChunkHasher;
-import io.deephaven.engine.rowset.RowSequence;
-import io.deephaven.engine.table.ColumnSource;
-import io.deephaven.engine.table.impl.by.HashHandler;
-import io.deephaven.engine.table.impl.by.StaticChunkedOperatorAggregationStateManagerTypedBase;
-import io.deephaven.engine.table.impl.sources.IntegerArraySource;
-import io.deephaven.engine.table.impl.sources.ShortArraySource;
-import io.deephaven.util.QueryConstants;
-import io.deephaven.util.type.TypeUtils;
-import java.lang.Integer;
-import java.lang.Object;
-import java.lang.Override;
-import java.lang.Short;
-
-final class StaticAggHasherShortInt extends StaticChunkedOperatorAggregationStateManagerTypedBase {
-    private final ShortArraySource mainKeySource0;
-
-    private final ShortArraySource overflowKeySource0;
-
-    private final IntegerArraySource mainKeySource1;
-
-    private final IntegerArraySource overflowKeySource1;
-
-    public StaticAggHasherShortInt(ColumnSource[] tableKeySources,
-            ColumnSource[] originalTableKeySources, int tableSize, double maximumLoadFactor,
-            double targetLoadFactor) {
-        super(tableKeySources, tableSize, maximumLoadFactor, targetLoadFactor);
-        this.mainKeySource0 = (ShortArraySource) super.mainKeySources[0];
-        this.overflowKeySource0 = (ShortArraySource) super.overflowKeySources[0];
-        this.mainKeySource1 = (IntegerArraySource) super.mainKeySources[1];
-        this.overflowKeySource1 = (IntegerArraySource) super.overflowKeySources[1];
-    }
-
-    @Override
-    protected void build(HashHandler handler, RowSequence rowSequence, Chunk[] sourceKeyChunks) {
-        final ShortChunk<Values> keyChunk0 = sourceKeyChunks[0].asShortChunk();
-        final IntChunk<Values> keyChunk1 = sourceKeyChunks[1].asIntChunk();
-        final int chunkSize = keyChunk0.size();
-        for (int chunkPosition = 0; chunkPosition < chunkSize; ++chunkPosition) {
-            final short k0 = keyChunk0.get(chunkPosition);
-            final int k1 = keyChunk1.get(chunkPosition);
-            final int hash = hash(k0, k1);
-            final int tableLocation = hashToTableLocation(tableHashPivot, hash);
-            if (mainOutputPosition.getUnsafe(tableLocation) == EMPTY_OUTPUT_POSITION) {
-                numEntries++;
-                mainKeySource0.set(tableLocation, k0);
-                mainKeySource1.set(tableLocation, k1);
-                handler.doMainInsert(tableLocation, chunkPosition);
-            } else if (eq(mainKeySource0.getUnsafe(tableLocation), k0) && eq(mainKeySource1.getUnsafe(tableLocation), k1)) {
-                handler.doMainFound(tableLocation, chunkPosition);
-            } else {
-                int overflowLocation = mainOverflowLocationSource.getUnsafe(tableLocation);
-                if (!findOverflow(handler, k0, k1, chunkPosition, overflowLocation)) {
-                    final int newOverflowLocation = allocateOverflowLocation();
-                    overflowKeySource0.set(newOverflowLocation, k0);
-                    overflowKeySource1.set(newOverflowLocation, k1);
-                    mainOverflowLocationSource.set(tableLocation, newOverflowLocation);
-                    overflowOverflowLocationSource.set(newOverflowLocation, overflowLocation);
-                    numEntries++;
-                    handler.doOverflowInsert(newOverflowLocation, chunkPosition);
-                }
-            }
-        }
-    }
-
-    @Override
-    protected void probe(HashHandler handler, RowSequence rowSequence, Chunk[] sourceKeyChunks) {
-        final ShortChunk<Values> keyChunk0 = sourceKeyChunks[0].asShortChunk();
-        final IntChunk<Values> keyChunk1 = sourceKeyChunks[1].asIntChunk();
-        final int chunkSize = keyChunk0.size();
-        for (int chunkPosition = 0; chunkPosition < chunkSize; ++chunkPosition) {
-            final short k0 = keyChunk0.get(chunkPosition);
-            final int k1 = keyChunk1.get(chunkPosition);
-            final int hash = hash(k0, k1);
-            final int tableLocation = hashToTableLocation(tableHashPivot, hash);
-            if (mainOutputPosition.getUnsafe(tableLocation) == EMPTY_OUTPUT_POSITION) {
-                handler.doMissing(chunkPosition);
-            } else if (eq(mainKeySource0.getUnsafe(tableLocation), k0) && eq(mainKeySource1.getUnsafe(tableLocation), k1)) {
-                handler.doMainFound(tableLocation, chunkPosition);
-            } else {
-                int overflowLocation = mainOverflowLocationSource.getUnsafe(tableLocation);
-                if (!findOverflow(handler, k0, k1, chunkPosition, overflowLocation)) {
-                    handler.doMissing(chunkPosition);
-                }
-            }
-        }
-    }
-
-    private static int hash(short k0, int k1) {
-        int hash = ShortChunkHasher.hashInitialSingle(k0);
-        hash = IntChunkHasher.hashUpdateSingle(hash, k1);
-        return hash;
-    }
-
-    @Override
-    protected void rehashBucket(HashHandler handler, int sourceBucket, int destBucket,
-            int bucketsToAdd) {
-        final int position = mainOutputPosition.getUnsafe(sourceBucket);
-        if (position == EMPTY_OUTPUT_POSITION) {
-            return;
-        }
-        int mainInsertLocation = maybeMoveMainBucket(handler, sourceBucket, destBucket, bucketsToAdd);
-        int overflowLocation = mainOverflowLocationSource.getUnsafe(sourceBucket);
-        mainOverflowLocationSource.set(sourceBucket, QueryConstants.NULL_INT);
-        mainOverflowLocationSource.set(destBucket, QueryConstants.NULL_INT);
-        while (overflowLocation != QueryConstants.NULL_INT) {
-            final int nextOverflowLocation = overflowOverflowLocationSource.getUnsafe(overflowLocation);
-            final short overflowKey0 = overflowKeySource0.getUnsafe(overflowLocation);
-            final int overflowKey1 = overflowKeySource1.getUnsafe(overflowLocation);
-            final int overflowHash = hash(overflowKey0, overflowKey1);
-            final int overflowTableLocation = hashToTableLocation(tableHashPivot + bucketsToAdd, overflowHash);
-            if (overflowTableLocation == mainInsertLocation) {
-                mainKeySource0.set(mainInsertLocation, overflowKey0);
-                mainKeySource1.set(mainInsertLocation, overflowKey1);
-                mainOutputPosition.set(mainInsertLocation, overflowOutputPosition.getUnsafe(overflowLocation));
-                handler.doPromoteOverflow(overflowLocation, mainInsertLocation);
-                overflowOutputPosition.set(overflowLocation, QueryConstants.NULL_INT);
-                overflowKeySource0.set(overflowLocation, QueryConstants.NULL_SHORT);
-                overflowKeySource1.set(overflowLocation, QueryConstants.NULL_INT);
-                freeOverflowLocation(overflowLocation);
-                mainInsertLocation = -1;
-            } else {
-                final int oldOverflowLocation = mainOverflowLocationSource.getUnsafe(overflowTableLocation);
-                mainOverflowLocationSource.set(overflowTableLocation, overflowLocation);
-                overflowOverflowLocationSource.set(overflowLocation, oldOverflowLocation);
-            }
-            overflowLocation = nextOverflowLocation;
-        }
-    }
-
-    private int maybeMoveMainBucket(HashHandler handler, int sourceBucket, int destBucket,
-            int bucketsToAdd) {
-        final short k0 = mainKeySource0.getUnsafe(sourceBucket);
-        final int k1 = mainKeySource1.getUnsafe(sourceBucket);
-        final int hash = hash(k0, k1);
-        final int location = hashToTableLocation(tableHashPivot + bucketsToAdd, hash);
-        final int mainInsertLocation;
-        if (location == sourceBucket) {
-            mainInsertLocation = destBucket;
-            mainOutputPosition.set(destBucket, EMPTY_OUTPUT_POSITION);
-        } else {
-            mainInsertLocation = sourceBucket;
-            mainOutputPosition.set(destBucket, mainOutputPosition.getUnsafe(sourceBucket));
-            mainOutputPosition.set(sourceBucket, EMPTY_OUTPUT_POSITION);
-            mainKeySource0.set(destBucket, k0);
-            mainKeySource0.set(sourceBucket, QueryConstants.NULL_SHORT);
-            mainKeySource1.set(destBucket, k1);
-            mainKeySource1.set(sourceBucket, QueryConstants.NULL_INT);
-            handler.doMoveMain(sourceBucket, destBucket);
-        }
-        return mainInsertLocation;
-    }
-
-    private boolean findOverflow(HashHandler handler, short k0, int k1, int chunkPosition,
-            int overflowLocation) {
-        while (overflowLocation != QueryConstants.NULL_INT) {
-            if (eq(overflowKeySource0.getUnsafe(overflowLocation), k0) && eq(overflowKeySource1.getUnsafe(overflowLocation), k1)) {
-                handler.doOverflowFound(overflowLocation, chunkPosition);
-                return true;
-            }
-            overflowLocation = overflowOverflowLocationSource.getUnsafe(overflowLocation);
-        }
-        return false;
-    }
-
-    @Override
-    public int findPositionForKey(Object key) {
-        final Object [] ka = (Object[])key;
-        final short k0 = TypeUtils.unbox((Short)ka[0]);
-        final int k1 = TypeUtils.unbox((Integer)ka[1]);
-        int hash = hash(k0, k1);
-        final int tableLocation = hashToTableLocation(tableHashPivot, hash);
-        final int positionValue = mainOutputPosition.getUnsafe(tableLocation);
-        if (positionValue == EMPTY_OUTPUT_POSITION) {
-            return -1;
-        }
-        if (eq(mainKeySource0.getUnsafe(tableLocation), k0) && eq(mainKeySource1.getUnsafe(tableLocation), k1)) {
-            return positionValue;
-        }
-        int overflowLocation = mainOverflowLocationSource.getUnsafe(tableLocation);
-        while (overflowLocation != QueryConstants.NULL_INT) {
-            if (eq(overflowKeySource0.getUnsafe(overflowLocation), k0) && eq(overflowKeySource1.getUnsafe(overflowLocation), k1)) {
-                return overflowOutputPosition.getUnsafe(overflowLocation);
-            }
-            overflowLocation = overflowOverflowLocationSource.getUnsafe(overflowLocation);
-        }
-        return -1;
-    }
-}
diff --git a/engine/table/src/main/java/io/deephaven/engine/table/impl/by/typed/staticagg/gen/StaticAggHasherShortLong.java b/engine/table/src/main/java/io/deephaven/engine/table/impl/by/typed/staticagg/gen/StaticAggHasherShortLong.java
deleted file mode 100644
index 6742c9d7191..00000000000
--- a/engine/table/src/main/java/io/deephaven/engine/table/impl/by/typed/staticagg/gen/StaticAggHasherShortLong.java
+++ /dev/null
@@ -1,206 +0,0 @@
-//
-// Copyright (c) 2016-2024 Deephaven Data Labs and Patent Pending
-//
-// ****** AUTO-GENERATED CLASS - DO NOT EDIT MANUALLY
-// ****** Run ReplicateTypedHashers or ./gradlew replicateTypedHashers to regenerate
-//
-// @formatter:off
-package io.deephaven.engine.table.impl.by.typed.staticagg.gen;
-
-import static io.deephaven.util.compare.LongComparisons.eq;
-import static io.deephaven.util.compare.ShortComparisons.eq;
-
-import io.deephaven.chunk.Chunk;
-import io.deephaven.chunk.LongChunk;
-import io.deephaven.chunk.ShortChunk;
-import io.deephaven.chunk.attributes.Values;
-import io.deephaven.chunk.util.hashing.LongChunkHasher;
-import io.deephaven.chunk.util.hashing.ShortChunkHasher;
-import io.deephaven.engine.rowset.RowSequence;
-import io.deephaven.engine.table.ColumnSource;
-import io.deephaven.engine.table.impl.by.HashHandler;
-import io.deephaven.engine.table.impl.by.StaticChunkedOperatorAggregationStateManagerTypedBase;
-import io.deephaven.engine.table.impl.sources.LongArraySource;
-import io.deephaven.engine.table.impl.sources.ShortArraySource;
-import io.deephaven.util.QueryConstants;
-import io.deephaven.util.type.TypeUtils;
-import java.lang.Long;
-import java.lang.Object;
-import java.lang.Override;
-import java.lang.Short;
-
-final class StaticAggHasherShortLong extends StaticChunkedOperatorAggregationStateManagerTypedBase {
-    private final ShortArraySource mainKeySource0;
-
-    private final ShortArraySource overflowKeySource0;
-
-    private final LongArraySource mainKeySource1;
-
-    private final LongArraySource overflowKeySource1;
-
-    public StaticAggHasherShortLong(ColumnSource[] tableKeySources,
-            ColumnSource[] originalTableKeySources, int tableSize, double maximumLoadFactor,
-            double targetLoadFactor) {
-        super(tableKeySources, tableSize, maximumLoadFactor, targetLoadFactor);
-        this.mainKeySource0 = (ShortArraySource) super.mainKeySources[0];
-        this.overflowKeySource0 = (ShortArraySource) super.overflowKeySources[0];
-        this.mainKeySource1 = (LongArraySource) super.mainKeySources[1];
-        this.overflowKeySource1 = (LongArraySource) super.overflowKeySources[1];
-    }
-
-    @Override
-    protected void build(HashHandler handler, RowSequence rowSequence, Chunk[] sourceKeyChunks) {
-        final ShortChunk<Values> keyChunk0 = sourceKeyChunks[0].asShortChunk();
-        final LongChunk<Values> keyChunk1 = sourceKeyChunks[1].asLongChunk();
-        final int chunkSize = keyChunk0.size();
-        for (int chunkPosition = 0; chunkPosition < chunkSize; ++chunkPosition) {
-            final short k0 = keyChunk0.get(chunkPosition);
-            final long k1 = keyChunk1.get(chunkPosition);
-            final int hash = hash(k0, k1);
-            final int tableLocation = hashToTableLocation(tableHashPivot, hash);
-            if (mainOutputPosition.getUnsafe(tableLocation) == EMPTY_OUTPUT_POSITION) {
-                numEntries++;
-                mainKeySource0.set(tableLocation, k0);
-                mainKeySource1.set(tableLocation, k1);
-                handler.doMainInsert(tableLocation, chunkPosition);
-            } else if (eq(mainKeySource0.getUnsafe(tableLocation), k0) && eq(mainKeySource1.getUnsafe(tableLocation), k1)) {
-                handler.doMainFound(tableLocation, chunkPosition);
-            } else {
-                int overflowLocation = mainOverflowLocationSource.getUnsafe(tableLocation);
-                if (!findOverflow(handler, k0, k1, chunkPosition, overflowLocation)) {
-                    final int newOverflowLocation = allocateOverflowLocation();
-                    overflowKeySource0.set(newOverflowLocation, k0);
-                    overflowKeySource1.set(newOverflowLocation, k1);
-                    mainOverflowLocationSource.set(tableLocation, newOverflowLocation);
-                    overflowOverflowLocationSource.set(newOverflowLocation, overflowLocation);
-                    numEntries++;
-                    handler.doOverflowInsert(newOverflowLocation, chunkPosition);
-                }
-            }
-        }
-    }
-
-    @Override
-    protected void probe(HashHandler handler, RowSequence rowSequence, Chunk[] sourceKeyChunks) {
-        final ShortChunk<Values> keyChunk0 = sourceKeyChunks[0].asShortChunk();
-        final LongChunk<Values> keyChunk1 = sourceKeyChunks[1].asLongChunk();
-        final int chunkSize = keyChunk0.size();
-        for (int chunkPosition = 0; chunkPosition < chunkSize; ++chunkPosition) {
-            final short k0 = keyChunk0.get(chunkPosition);
-            final long k1 = keyChunk1.get(chunkPosition);
-            final int hash = hash(k0, k1);
-            final int tableLocation = hashToTableLocation(tableHashPivot, hash);
-            if (mainOutputPosition.getUnsafe(tableLocation) == EMPTY_OUTPUT_POSITION) {
-                handler.doMissing(chunkPosition);
-            } else if (eq(mainKeySource0.getUnsafe(tableLocation), k0) && eq(mainKeySource1.getUnsafe(tableLocation), k1)) {
-                handler.doMainFound(tableLocation, chunkPosition);
-            } else {
-                int overflowLocation = mainOverflowLocationSource.getUnsafe(tableLocation);
-                if (!findOverflow(handler, k0, k1, chunkPosition, overflowLocation)) {
-                    handler.doMissing(chunkPosition);
-                }
-            }
-        }
-    }
-
-    private static int hash(short k0, long k1) {
-        int hash = ShortChunkHasher.hashInitialSingle(k0);
-        hash = LongChunkHasher.hashUpdateSingle(hash, k1);
-        return hash;
-    }
-
-    @Override
-    protected void rehashBucket(HashHandler handler, int sourceBucket, int destBucket,
-            int bucketsToAdd) {
-        final int position = mainOutputPosition.getUnsafe(sourceBucket);
-        if (position == EMPTY_OUTPUT_POSITION) {
-            return;
-        }
-        int mainInsertLocation = maybeMoveMainBucket(handler, sourceBucket, destBucket, bucketsToAdd);
-        int overflowLocation = mainOverflowLocationSource.getUnsafe(sourceBucket);
-        mainOverflowLocationSource.set(sourceBucket, QueryConstants.NULL_INT);
-        mainOverflowLocationSource.set(destBucket, QueryConstants.NULL_INT);
-        while (overflowLocation != QueryConstants.NULL_INT) {
-            final int nextOverflowLocation = overflowOverflowLocationSource.getUnsafe(overflowLocation);
-            final short overflowKey0 = overflowKeySource0.getUnsafe(overflowLocation);
-            final long overflowKey1 = overflowKeySource1.getUnsafe(overflowLocation);
-            final int overflowHash = hash(overflowKey0, overflowKey1);
-            final int overflowTableLocation = hashToTableLocation(tableHashPivot + bucketsToAdd, overflowHash);
-            if (overflowTableLocation == mainInsertLocation) {
-                mainKeySource0.set(mainInsertLocation, overflowKey0);
-                mainKeySource1.set(mainInsertLocation, overflowKey1);
-                mainOutputPosition.set(mainInsertLocation, overflowOutputPosition.getUnsafe(overflowLocation));
-                handler.doPromoteOverflow(overflowLocation, mainInsertLocation);
-                overflowOutputPosition.set(overflowLocation, QueryConstants.NULL_INT);
-                overflowKeySource0.set(overflowLocation, QueryConstants.NULL_SHORT);
-                overflowKeySource1.set(overflowLocation, QueryConstants.NULL_LONG);
-                freeOverflowLocation(overflowLocation);
-                mainInsertLocation = -1;
-            } else {
-                final int oldOverflowLocation = mainOverflowLocationSource.getUnsafe(overflowTableLocation);
-                mainOverflowLocationSource.set(overflowTableLocation, overflowLocation);
-                overflowOverflowLocationSource.set(overflowLocation, oldOverflowLocation);
-            }
-            overflowLocation = nextOverflowLocation;
-        }
-    }
-
-    private int maybeMoveMainBucket(HashHandler handler, int sourceBucket, int destBucket,
-            int bucketsToAdd) {
-        final short k0 = mainKeySource0.getUnsafe(sourceBucket);
-        final long k1 = mainKeySource1.getUnsafe(sourceBucket);
-        final int hash = hash(k0, k1);
-        final int location = hashToTableLocation(tableHashPivot + bucketsToAdd, hash);
-        final int mainInsertLocation;
-        if (location == sourceBucket) {
-            mainInsertLocation = destBucket;
-            mainOutputPosition.set(destBucket, EMPTY_OUTPUT_POSITION);
-        } else {
-            mainInsertLocation = sourceBucket;
-            mainOutputPosition.set(destBucket, mainOutputPosition.getUnsafe(sourceBucket));
-            mainOutputPosition.set(sourceBucket, EMPTY_OUTPUT_POSITION);
-            mainKeySource0.set(destBucket, k0);
-            mainKeySource0.set(sourceBucket, QueryConstants.NULL_SHORT);
-            mainKeySource1.set(destBucket, k1);
-            mainKeySource1.set(sourceBucket, QueryConstants.NULL_LONG);
-            handler.doMoveMain(sourceBucket, destBucket);
-        }
-        return mainInsertLocation;
-    }
-
-    private boolean findOverflow(HashHandler handler, short k0, long k1, int chunkPosition,
-            int overflowLocation) {
-        while (overflowLocation != QueryConstants.NULL_INT) {
-            if (eq(overflowKeySource0.getUnsafe(overflowLocation), k0) && eq(overflowKeySource1.getUnsafe(overflowLocation), k1)) {
-                handler.doOverflowFound(overflowLocation, chunkPosition);
-                return true;
-            }
-            overflowLocation = overflowOverflowLocationSource.getUnsafe(overflowLocation);
-        }
-        return false;
-    }
-
-    @Override
-    public int findPositionForKey(Object key) {
-        final Object [] ka = (Object[])key;
-        final short k0 = TypeUtils.unbox((Short)ka[0]);
-        final long k1 = TypeUtils.unbox((Long)ka[1]);
-        int hash = hash(k0, k1);
-        final int tableLocation = hashToTableLocation(tableHashPivot, hash);
-        final int positionValue = mainOutputPosition.getUnsafe(tableLocation);
-        if (positionValue == EMPTY_OUTPUT_POSITION) {
-            return -1;
-        }
-        if (eq(mainKeySource0.getUnsafe(tableLocation), k0) && eq(mainKeySource1.getUnsafe(tableLocation), k1)) {
-            return positionValue;
-        }
-        int overflowLocation = mainOverflowLocationSource.getUnsafe(tableLocation);
-        while (overflowLocation != QueryConstants.NULL_INT) {
-            if (eq(overflowKeySource0.getUnsafe(overflowLocation), k0) && eq(overflowKeySource1.getUnsafe(overflowLocation), k1)) {
-                return overflowOutputPosition.getUnsafe(overflowLocation);
-            }
-            overflowLocation = overflowOverflowLocationSource.getUnsafe(overflowLocation);
-        }
-        return -1;
-    }
-}
diff --git a/engine/table/src/main/java/io/deephaven/engine/table/impl/by/typed/staticagg/gen/StaticAggHasherShortObject.java b/engine/table/src/main/java/io/deephaven/engine/table/impl/by/typed/staticagg/gen/StaticAggHasherShortObject.java
deleted file mode 100644
index f0c2963d01b..00000000000
--- a/engine/table/src/main/java/io/deephaven/engine/table/impl/by/typed/staticagg/gen/StaticAggHasherShortObject.java
+++ /dev/null
@@ -1,205 +0,0 @@
-//
-// Copyright (c) 2016-2024 Deephaven Data Labs and Patent Pending
-//
-// ****** AUTO-GENERATED CLASS - DO NOT EDIT MANUALLY
-// ****** Run ReplicateTypedHashers or ./gradlew replicateTypedHashers to regenerate
-//
-// @formatter:off
-package io.deephaven.engine.table.impl.by.typed.staticagg.gen;
-
-import static io.deephaven.util.compare.ObjectComparisons.eq;
-import static io.deephaven.util.compare.ShortComparisons.eq;
-
-import io.deephaven.chunk.Chunk;
-import io.deephaven.chunk.ObjectChunk;
-import io.deephaven.chunk.ShortChunk;
-import io.deephaven.chunk.attributes.Values;
-import io.deephaven.chunk.util.hashing.ObjectChunkHasher;
-import io.deephaven.chunk.util.hashing.ShortChunkHasher;
-import io.deephaven.engine.rowset.RowSequence;
-import io.deephaven.engine.table.ColumnSource;
-import io.deephaven.engine.table.impl.by.HashHandler;
-import io.deephaven.engine.table.impl.by.StaticChunkedOperatorAggregationStateManagerTypedBase;
-import io.deephaven.engine.table.impl.sources.ObjectArraySource;
-import io.deephaven.engine.table.impl.sources.ShortArraySource;
-import io.deephaven.util.QueryConstants;
-import io.deephaven.util.type.TypeUtils;
-import java.lang.Object;
-import java.lang.Override;
-import java.lang.Short;
-
-final class StaticAggHasherShortObject extends StaticChunkedOperatorAggregationStateManagerTypedBase {
-    private final ShortArraySource mainKeySource0;
-
-    private final ShortArraySource overflowKeySource0;
-
-    private final ObjectArraySource mainKeySource1;
-
-    private final ObjectArraySource overflowKeySource1;
-
-    public StaticAggHasherShortObject(ColumnSource[] tableKeySources,
-            ColumnSource[] originalTableKeySources, int tableSize, double maximumLoadFactor,
-            double targetLoadFactor) {
-        super(tableKeySources, tableSize, maximumLoadFactor, targetLoadFactor);
-        this.mainKeySource0 = (ShortArraySource) super.mainKeySources[0];
-        this.overflowKeySource0 = (ShortArraySource) super.overflowKeySources[0];
-        this.mainKeySource1 = (ObjectArraySource) super.mainKeySources[1];
-        this.overflowKeySource1 = (ObjectArraySource) super.overflowKeySources[1];
-    }
-
-    @Override
-    protected void build(HashHandler handler, RowSequence rowSequence, Chunk[] sourceKeyChunks) {
-        final ShortChunk<Values> keyChunk0 = sourceKeyChunks[0].asShortChunk();
-        final ObjectChunk<Object, Values> keyChunk1 = sourceKeyChunks[1].asObjectChunk();
-        final int chunkSize = keyChunk0.size();
-        for (int chunkPosition = 0; chunkPosition < chunkSize; ++chunkPosition) {
-            final short k0 = keyChunk0.get(chunkPosition);
-            final Object k1 = keyChunk1.get(chunkPosition);
-            final int hash = hash(k0, k1);
-            final int tableLocation = hashToTableLocation(tableHashPivot, hash);
-            if (mainOutputPosition.getUnsafe(tableLocation) == EMPTY_OUTPUT_POSITION) {
-                numEntries++;
-                mainKeySource0.set(tableLocation, k0);
-                mainKeySource1.set(tableLocation, k1);
-                handler.doMainInsert(tableLocation, chunkPosition);
-            } else if (eq(mainKeySource0.getUnsafe(tableLocation), k0) && eq(mainKeySource1.getUnsafe(tableLocation), k1)) {
-                handler.doMainFound(tableLocation, chunkPosition);
-            } else {
-                int overflowLocation = mainOverflowLocationSource.getUnsafe(tableLocation);
-                if (!findOverflow(handler, k0, k1, chunkPosition, overflowLocation)) {
-                    final int newOverflowLocation = allocateOverflowLocation();
-                    overflowKeySource0.set(newOverflowLocation, k0);
-                    overflowKeySource1.set(newOverflowLocation, k1);
-                    mainOverflowLocationSource.set(tableLocation, newOverflowLocation);
-                    overflowOverflowLocationSource.set(newOverflowLocation, overflowLocation);
-                    numEntries++;
-                    handler.doOverflowInsert(newOverflowLocation, chunkPosition);
-                }
-            }
-        }
-    }
-
-    @Override
-    protected void probe(HashHandler handler, RowSequence rowSequence, Chunk[] sourceKeyChunks) {
-        final ShortChunk<Values> keyChunk0 = sourceKeyChunks[0].asShortChunk();
-        final ObjectChunk<Object, Values> keyChunk1 = sourceKeyChunks[1].asObjectChunk();
-        final int chunkSize = keyChunk0.size();
-        for (int chunkPosition = 0; chunkPosition < chunkSize; ++chunkPosition) {
-            final short k0 = keyChunk0.get(chunkPosition);
-            final Object k1 = keyChunk1.get(chunkPosition);
-            final int hash = hash(k0, k1);
-            final int tableLocation = hashToTableLocation(tableHashPivot, hash);
-            if (mainOutputPosition.getUnsafe(tableLocation) == EMPTY_OUTPUT_POSITION) {
-                handler.doMissing(chunkPosition);
-            } else if (eq(mainKeySource0.getUnsafe(tableLocation), k0) && eq(mainKeySource1.getUnsafe(tableLocation), k1)) {
-                handler.doMainFound(tableLocation, chunkPosition);
-            } else {
-                int overflowLocation = mainOverflowLocationSource.getUnsafe(tableLocation);
-                if (!findOverflow(handler, k0, k1, chunkPosition, overflowLocation)) {
-                    handler.doMissing(chunkPosition);
-                }
-            }
-        }
-    }
-
-    private static int hash(short k0, Object k1) {
-        int hash = ShortChunkHasher.hashInitialSingle(k0);
-        hash = ObjectChunkHasher.hashUpdateSingle(hash, k1);
-        return hash;
-    }
-
-    @Override
-    protected void rehashBucket(HashHandler handler, int sourceBucket, int destBucket,
-            int bucketsToAdd) {
-        final int position = mainOutputPosition.getUnsafe(sourceBucket);
-        if (position == EMPTY_OUTPUT_POSITION) {
-            return;
-        }
-        int mainInsertLocation = maybeMoveMainBucket(handler, sourceBucket, destBucket, bucketsToAdd);
-        int overflowLocation = mainOverflowLocationSource.getUnsafe(sourceBucket);
-        mainOverflowLocationSource.set(sourceBucket, QueryConstants.NULL_INT);
-        mainOverflowLocationSource.set(destBucket, QueryConstants.NULL_INT);
-        while (overflowLocation != QueryConstants.NULL_INT) {
-            final int nextOverflowLocation = overflowOverflowLocationSource.getUnsafe(overflowLocation);
-            final short overflowKey0 = overflowKeySource0.getUnsafe(overflowLocation);
-            final Object overflowKey1 = overflowKeySource1.getUnsafe(overflowLocation);
-            final int overflowHash = hash(overflowKey0, overflowKey1);
-            final int overflowTableLocation = hashToTableLocation(tableHashPivot + bucketsToAdd, overflowHash);
-            if (overflowTableLocation == mainInsertLocation) {
-                mainKeySource0.set(mainInsertLocation, overflowKey0);
-                mainKeySource1.set(mainInsertLocation, overflowKey1);
-                mainOutputPosition.set(mainInsertLocation, overflowOutputPosition.getUnsafe(overflowLocation));
-                handler.doPromoteOverflow(overflowLocation, mainInsertLocation);
-                overflowOutputPosition.set(overflowLocation, QueryConstants.NULL_INT);
-                overflowKeySource0.set(overflowLocation, QueryConstants.NULL_SHORT);
-                overflowKeySource1.set(overflowLocation, null);
-                freeOverflowLocation(overflowLocation);
-                mainInsertLocation = -1;
-            } else {
-                final int oldOverflowLocation = mainOverflowLocationSource.getUnsafe(overflowTableLocation);
-                mainOverflowLocationSource.set(overflowTableLocation, overflowLocation);
-                overflowOverflowLocationSource.set(overflowLocation, oldOverflowLocation);
-            }
-            overflowLocation = nextOverflowLocation;
-        }
-    }
-
-    private int maybeMoveMainBucket(HashHandler handler, int sourceBucket, int destBucket,
-            int bucketsToAdd) {
-        final short k0 = mainKeySource0.getUnsafe(sourceBucket);
-        final Object k1 = mainKeySource1.getUnsafe(sourceBucket);
-        final int hash = hash(k0, k1);
-        final int location = hashToTableLocation(tableHashPivot + bucketsToAdd, hash);
-        final int mainInsertLocation;
-        if (location == sourceBucket) {
-            mainInsertLocation = destBucket;
-            mainOutputPosition.set(destBucket, EMPTY_OUTPUT_POSITION);
-        } else {
-            mainInsertLocation = sourceBucket;
-            mainOutputPosition.set(destBucket, mainOutputPosition.getUnsafe(sourceBucket));
-            mainOutputPosition.set(sourceBucket, EMPTY_OUTPUT_POSITION);
-            mainKeySource0.set(destBucket, k0);
-            mainKeySource0.set(sourceBucket, QueryConstants.NULL_SHORT);
-            mainKeySource1.set(destBucket, k1);
-            mainKeySource1.set(sourceBucket, null);
-            handler.doMoveMain(sourceBucket, destBucket);
-        }
-        return mainInsertLocation;
-    }
-
-    private boolean findOverflow(HashHandler handler, short k0, Object k1, int chunkPosition,
-            int overflowLocation) {
-        while (overflowLocation != QueryConstants.NULL_INT) {
-            if (eq(overflowKeySource0.getUnsafe(overflowLocation), k0) && eq(overflowKeySource1.getUnsafe(overflowLocation), k1)) {
-                handler.doOverflowFound(overflowLocation, chunkPosition);
-                return true;
-            }
-            overflowLocation = overflowOverflowLocationSource.getUnsafe(overflowLocation);
-        }
-        return false;
-    }
-
-    @Override
-    public int findPositionForKey(Object key) {
-        final Object [] ka = (Object[])key;
-        final short k0 = TypeUtils.unbox((Short)ka[0]);
-        final Object k1 = ka[1];
-        int hash = hash(k0, k1);
-        final int tableLocation = hashToTableLocation(tableHashPivot, hash);
-        final int positionValue = mainOutputPosition.getUnsafe(tableLocation);
-        if (positionValue == EMPTY_OUTPUT_POSITION) {
-            return -1;
-        }
-        if (eq(mainKeySource0.getUnsafe(tableLocation), k0) && eq(mainKeySource1.getUnsafe(tableLocation), k1)) {
-            return positionValue;
-        }
-        int overflowLocation = mainOverflowLocationSource.getUnsafe(tableLocation);
-        while (overflowLocation != QueryConstants.NULL_INT) {
-            if (eq(overflowKeySource0.getUnsafe(overflowLocation), k0) && eq(overflowKeySource1.getUnsafe(overflowLocation), k1)) {
-                return overflowOutputPosition.getUnsafe(overflowLocation);
-            }
-            overflowLocation = overflowOverflowLocationSource.getUnsafe(overflowLocation);
-        }
-        return -1;
-    }
-}
diff --git a/engine/table/src/main/java/io/deephaven/engine/table/impl/by/typed/staticagg/gen/StaticAggHasherShortShort.java b/engine/table/src/main/java/io/deephaven/engine/table/impl/by/typed/staticagg/gen/StaticAggHasherShortShort.java
deleted file mode 100644
index 56b69b43491..00000000000
--- a/engine/table/src/main/java/io/deephaven/engine/table/impl/by/typed/staticagg/gen/StaticAggHasherShortShort.java
+++ /dev/null
@@ -1,201 +0,0 @@
-//
-// Copyright (c) 2016-2024 Deephaven Data Labs and Patent Pending
-//
-// ****** AUTO-GENERATED CLASS - DO NOT EDIT MANUALLY
-// ****** Run ReplicateTypedHashers or ./gradlew replicateTypedHashers to regenerate
-//
-// @formatter:off
-package io.deephaven.engine.table.impl.by.typed.staticagg.gen;
-
-import static io.deephaven.util.compare.ShortComparisons.eq;
-
-import io.deephaven.chunk.Chunk;
-import io.deephaven.chunk.ShortChunk;
-import io.deephaven.chunk.attributes.Values;
-import io.deephaven.chunk.util.hashing.ShortChunkHasher;
-import io.deephaven.engine.rowset.RowSequence;
-import io.deephaven.engine.table.ColumnSource;
-import io.deephaven.engine.table.impl.by.HashHandler;
-import io.deephaven.engine.table.impl.by.StaticChunkedOperatorAggregationStateManagerTypedBase;
-import io.deephaven.engine.table.impl.sources.ShortArraySource;
-import io.deephaven.util.QueryConstants;
-import io.deephaven.util.type.TypeUtils;
-import java.lang.Object;
-import java.lang.Override;
-import java.lang.Short;
-
-final class StaticAggHasherShortShort extends StaticChunkedOperatorAggregationStateManagerTypedBase {
-    private final ShortArraySource mainKeySource0;
-
-    private final ShortArraySource overflowKeySource0;
-
-    private final ShortArraySource mainKeySource1;
-
-    private final ShortArraySource overflowKeySource1;
-
-    public StaticAggHasherShortShort(ColumnSource[] tableKeySources,
-            ColumnSource[] originalTableKeySources, int tableSize, double maximumLoadFactor,
-            double targetLoadFactor) {
-        super(tableKeySources, tableSize, maximumLoadFactor, targetLoadFactor);
-        this.mainKeySource0 = (ShortArraySource) super.mainKeySources[0];
-        this.overflowKeySource0 = (ShortArraySource) super.overflowKeySources[0];
-        this.mainKeySource1 = (ShortArraySource) super.mainKeySources[1];
-        this.overflowKeySource1 = (ShortArraySource) super.overflowKeySources[1];
-    }
-
-    @Override
-    protected void build(HashHandler handler, RowSequence rowSequence, Chunk[] sourceKeyChunks) {
-        final ShortChunk<Values> keyChunk0 = sourceKeyChunks[0].asShortChunk();
-        final ShortChunk<Values> keyChunk1 = sourceKeyChunks[1].asShortChunk();
-        final int chunkSize = keyChunk0.size();
-        for (int chunkPosition = 0; chunkPosition < chunkSize; ++chunkPosition) {
-            final short k0 = keyChunk0.get(chunkPosition);
-            final short k1 = keyChunk1.get(chunkPosition);
-            final int hash = hash(k0, k1);
-            final int tableLocation = hashToTableLocation(tableHashPivot, hash);
-            if (mainOutputPosition.getUnsafe(tableLocation) == EMPTY_OUTPUT_POSITION) {
-                numEntries++;
-                mainKeySource0.set(tableLocation, k0);
-                mainKeySource1.set(tableLocation, k1);
-                handler.doMainInsert(tableLocation, chunkPosition);
-            } else if (eq(mainKeySource0.getUnsafe(tableLocation), k0) && eq(mainKeySource1.getUnsafe(tableLocation), k1)) {
-                handler.doMainFound(tableLocation, chunkPosition);
-            } else {
-                int overflowLocation = mainOverflowLocationSource.getUnsafe(tableLocation);
-                if (!findOverflow(handler, k0, k1, chunkPosition, overflowLocation)) {
-                    final int newOverflowLocation = allocateOverflowLocation();
-                    overflowKeySource0.set(newOverflowLocation, k0);
-                    overflowKeySource1.set(newOverflowLocation, k1);
-                    mainOverflowLocationSource.set(tableLocation, newOverflowLocation);
-                    overflowOverflowLocationSource.set(newOverflowLocation, overflowLocation);
-                    numEntries++;
-                    handler.doOverflowInsert(newOverflowLocation, chunkPosition);
-                }
-            }
-        }
-    }
-
-    @Override
-    protected void probe(HashHandler handler, RowSequence rowSequence, Chunk[] sourceKeyChunks) {
-        final ShortChunk<Values> keyChunk0 = sourceKeyChunks[0].asShortChunk();
-        final ShortChunk<Values> keyChunk1 = sourceKeyChunks[1].asShortChunk();
-        final int chunkSize = keyChunk0.size();
-        for (int chunkPosition = 0; chunkPosition < chunkSize; ++chunkPosition) {
-            final short k0 = keyChunk0.get(chunkPosition);
-            final short k1 = keyChunk1.get(chunkPosition);
-            final int hash = hash(k0, k1);
-            final int tableLocation = hashToTableLocation(tableHashPivot, hash);
-            if (mainOutputPosition.getUnsafe(tableLocation) == EMPTY_OUTPUT_POSITION) {
-                handler.doMissing(chunkPosition);
-            } else if (eq(mainKeySource0.getUnsafe(tableLocation), k0) && eq(mainKeySource1.getUnsafe(tableLocation), k1)) {
-                handler.doMainFound(tableLocation, chunkPosition);
-            } else {
-                int overflowLocation = mainOverflowLocationSource.getUnsafe(tableLocation);
-                if (!findOverflow(handler, k0, k1, chunkPosition, overflowLocation)) {
-                    handler.doMissing(chunkPosition);
-                }
-            }
-        }
-    }
-
-    private static int hash(short k0, short k1) {
-        int hash = ShortChunkHasher.hashInitialSingle(k0);
-        hash = ShortChunkHasher.hashUpdateSingle(hash, k1);
-        return hash;
-    }
-
-    @Override
-    protected void rehashBucket(HashHandler handler, int sourceBucket, int destBucket,
-            int bucketsToAdd) {
-        final int position = mainOutputPosition.getUnsafe(sourceBucket);
-        if (position == EMPTY_OUTPUT_POSITION) {
-            return;
-        }
-        int mainInsertLocation = maybeMoveMainBucket(handler, sourceBucket, destBucket, bucketsToAdd);
-        int overflowLocation = mainOverflowLocationSource.getUnsafe(sourceBucket);
-        mainOverflowLocationSource.set(sourceBucket, QueryConstants.NULL_INT);
-        mainOverflowLocationSource.set(destBucket, QueryConstants.NULL_INT);
-        while (overflowLocation != QueryConstants.NULL_INT) {
-            final int nextOverflowLocation = overflowOverflowLocationSource.getUnsafe(overflowLocation);
-            final short overflowKey0 = overflowKeySource0.getUnsafe(overflowLocation);
-            final short overflowKey1 = overflowKeySource1.getUnsafe(overflowLocation);
-            final int overflowHash = hash(overflowKey0, overflowKey1);
-            final int overflowTableLocation = hashToTableLocation(tableHashPivot + bucketsToAdd, overflowHash);
-            if (overflowTableLocation == mainInsertLocation) {
-                mainKeySource0.set(mainInsertLocation, overflowKey0);
-                mainKeySource1.set(mainInsertLocation, overflowKey1);
-                mainOutputPosition.set(mainInsertLocation, overflowOutputPosition.getUnsafe(overflowLocation));
-                handler.doPromoteOverflow(overflowLocation, mainInsertLocation);
-                overflowOutputPosition.set(overflowLocation, QueryConstants.NULL_INT);
-                overflowKeySource0.set(overflowLocation, QueryConstants.NULL_SHORT);
-                overflowKeySource1.set(overflowLocation, QueryConstants.NULL_SHORT);
-                freeOverflowLocation(overflowLocation);
-                mainInsertLocation = -1;
-            } else {
-                final int oldOverflowLocation = mainOverflowLocationSource.getUnsafe(overflowTableLocation);
-                mainOverflowLocationSource.set(overflowTableLocation, overflowLocation);
-                overflowOverflowLocationSource.set(overflowLocation, oldOverflowLocation);
-            }
-            overflowLocation = nextOverflowLocation;
-        }
-    }
-
-    private int maybeMoveMainBucket(HashHandler handler, int sourceBucket, int destBucket,
-            int bucketsToAdd) {
-        final short k0 = mainKeySource0.getUnsafe(sourceBucket);
-        final short k1 = mainKeySource1.getUnsafe(sourceBucket);
-        final int hash = hash(k0, k1);
-        final int location = hashToTableLocation(tableHashPivot + bucketsToAdd, hash);
-        final int mainInsertLocation;
-        if (location == sourceBucket) {
-            mainInsertLocation = destBucket;
-            mainOutputPosition.set(destBucket, EMPTY_OUTPUT_POSITION);
-        } else {
-            mainInsertLocation = sourceBucket;
-            mainOutputPosition.set(destBucket, mainOutputPosition.getUnsafe(sourceBucket));
-            mainOutputPosition.set(sourceBucket, EMPTY_OUTPUT_POSITION);
-            mainKeySource0.set(destBucket, k0);
-            mainKeySource0.set(sourceBucket, QueryConstants.NULL_SHORT);
-            mainKeySource1.set(destBucket, k1);
-            mainKeySource1.set(sourceBucket, QueryConstants.NULL_SHORT);
-            handler.doMoveMain(sourceBucket, destBucket);
-        }
-        return mainInsertLocation;
-    }
-
-    private boolean findOverflow(HashHandler handler, short k0, short k1, int chunkPosition,
-            int overflowLocation) {
-        while (overflowLocation != QueryConstants.NULL_INT) {
-            if (eq(overflowKeySource0.getUnsafe(overflowLocation), k0) && eq(overflowKeySource1.getUnsafe(overflowLocation), k1)) {
-                handler.doOverflowFound(overflowLocation, chunkPosition);
-                return true;
-            }
-            overflowLocation = overflowOverflowLocationSource.getUnsafe(overflowLocation);
-        }
-        return false;
-    }
-
-    @Override
-    public int findPositionForKey(Object key) {
-        final Object [] ka = (Object[])key;
-        final short k0 = TypeUtils.unbox((Short)ka[0]);
-        final short k1 = TypeUtils.unbox((Short)ka[1]);
-        int hash = hash(k0, k1);
-        final int tableLocation = hashToTableLocation(tableHashPivot, hash);
-        final int positionValue = mainOutputPosition.getUnsafe(tableLocation);
-        if (positionValue == EMPTY_OUTPUT_POSITION) {
-            return -1;
-        }
-        if (eq(mainKeySource0.getUnsafe(tableLocation), k0) && eq(mainKeySource1.getUnsafe(tableLocation), k1)) {
-            return positionValue;
-        }
-        int overflowLocation = mainOverflowLocationSource.getUnsafe(tableLocation);
-        while (overflowLocation != QueryConstants.NULL_INT) {
-            if (eq(overflowKeySource0.getUnsafe(overflowLocation), k0) && eq(overflowKeySource1.getUnsafe(overflowLocation), k1)) {
-                return overflowOutputPosition.getUnsafe(overflowLocation);
-            }
-            overflowLocation = overflowOverflowLocationSource.getUnsafe(overflowLocation);
-        }
-        return -1;
-    }
-}
diff --git a/engine/table/src/main/java/io/deephaven/engine/table/impl/by/typed/staticagg/gen/TypedHashDispatcher.java b/engine/table/src/main/java/io/deephaven/engine/table/impl/by/typed/staticagg/gen/TypedHashDispatcher.java
deleted file mode 100644
index dbad18d91f1..00000000000
--- a/engine/table/src/main/java/io/deephaven/engine/table/impl/by/typed/staticagg/gen/TypedHashDispatcher.java
+++ /dev/null
@@ -1,149 +0,0 @@
-//
-// Copyright (c) 2016-2024 Deephaven Data Labs and Patent Pending
-//
-// ****** AUTO-GENERATED CLASS - DO NOT EDIT MANUALLY
-// ****** Run ReplicateTypedHashers or ./gradlew replicateTypedHashers to regenerate
-//
-// @formatter:off
-package io.deephaven.engine.table.impl.by.typed.staticagg.gen;
-
-import io.deephaven.chunk.ChunkType;
-import io.deephaven.engine.table.ColumnSource;
-import io.deephaven.engine.table.impl.by.StaticChunkedOperatorAggregationStateManagerTypedBase;
-import java.util.Arrays;
-
-/**
- * The TypedHashDispatcher returns a pre-generated and precompiled hasher instance suitable for the provided column sources, or null if there is not a precompiled hasher suitable for the specified sources.
- */
-public class TypedHashDispatcher {
-    private TypedHashDispatcher() {
-        // static use only
-    }
-
-    public static StaticChunkedOperatorAggregationStateManagerTypedBase dispatch(
-            ColumnSource[] tableKeySources, ColumnSource[] originalTableKeySources, int tableSize,
-            double maximumLoadFactor, double targetLoadFactor) {
-        final ChunkType[] chunkTypes = Arrays.stream(tableKeySources).map(ColumnSource::getChunkType).toArray(ChunkType[]::new);;
-        if (chunkTypes.length == 1) {
-            return dispatchSingle(chunkTypes[0], tableKeySources, originalTableKeySources, tableSize, maximumLoadFactor, targetLoadFactor);
-        }
-        if (chunkTypes.length == 2) {
-            return dispatchDouble(chunkTypes[0], chunkTypes[1], tableKeySources, originalTableKeySources, tableSize, maximumLoadFactor, targetLoadFactor);
-        }
-        return null;
-    }
-
-    private static StaticChunkedOperatorAggregationStateManagerTypedBase dispatchSingle(
-            ChunkType chunkType, ColumnSource[] tableKeySources,
-            ColumnSource[] originalTableKeySources, int tableSize, double maximumLoadFactor,
-            double targetLoadFactor) {
-        switch (chunkType) {
-            default: throw new UnsupportedOperationException("Invalid chunk type for typed hashers: " + chunkType);
-            case Char: return new StaticAggHasherChar(tableKeySources, originalTableKeySources, tableSize, maximumLoadFactor, targetLoadFactor);
-            case Byte: return new StaticAggHasherByte(tableKeySources, originalTableKeySources, tableSize, maximumLoadFactor, targetLoadFactor);
-            case Short: return new StaticAggHasherShort(tableKeySources, originalTableKeySources, tableSize, maximumLoadFactor, targetLoadFactor);
-            case Int: return new StaticAggHasherInt(tableKeySources, originalTableKeySources, tableSize, maximumLoadFactor, targetLoadFactor);
-            case Long: return new StaticAggHasherLong(tableKeySources, originalTableKeySources, tableSize, maximumLoadFactor, targetLoadFactor);
-            case Float: return new StaticAggHasherFloat(tableKeySources, originalTableKeySources, tableSize, maximumLoadFactor, targetLoadFactor);
-            case Double: return new StaticAggHasherDouble(tableKeySources, originalTableKeySources, tableSize, maximumLoadFactor, targetLoadFactor);
-            case Object: return new StaticAggHasherObject(tableKeySources, originalTableKeySources, tableSize, maximumLoadFactor, targetLoadFactor);
-        }
-    }
-
-    private static StaticChunkedOperatorAggregationStateManagerTypedBase dispatchDouble(
-            ChunkType chunkType0, ChunkType chunkType1, ColumnSource[] tableKeySources,
-            ColumnSource[] originalTableKeySources, int tableSize, double maximumLoadFactor,
-            double targetLoadFactor) {
-        switch (chunkType0) {
-            default: throw new UnsupportedOperationException("Invalid chunk type for typed hashers: " + chunkType0);
-            case Char:switch (chunkType1) {
-                default: throw new UnsupportedOperationException("Invalid chunk type for typed hashers: " + chunkType1);
-                case Char: return new StaticAggHasherCharChar(tableKeySources, originalTableKeySources, tableSize, maximumLoadFactor, targetLoadFactor);
-                case Byte: return new StaticAggHasherCharByte(tableKeySources, originalTableKeySources, tableSize, maximumLoadFactor, targetLoadFactor);
-                case Short: return new StaticAggHasherCharShort(tableKeySources, originalTableKeySources, tableSize, maximumLoadFactor, targetLoadFactor);
-                case Int: return new StaticAggHasherCharInt(tableKeySources, originalTableKeySources, tableSize, maximumLoadFactor, targetLoadFactor);
-                case Long: return new StaticAggHasherCharLong(tableKeySources, originalTableKeySources, tableSize, maximumLoadFactor, targetLoadFactor);
-                case Float: return new StaticAggHasherCharFloat(tableKeySources, originalTableKeySources, tableSize, maximumLoadFactor, targetLoadFactor);
-                case Double: return new StaticAggHasherCharDouble(tableKeySources, originalTableKeySources, tableSize, maximumLoadFactor, targetLoadFactor);
-                case Object: return new StaticAggHasherCharObject(tableKeySources, originalTableKeySources, tableSize, maximumLoadFactor, targetLoadFactor);
-            }
-            case Byte:switch (chunkType1) {
-                default: throw new UnsupportedOperationException("Invalid chunk type for typed hashers: " + chunkType1);
-                case Char: return new StaticAggHasherByteChar(tableKeySources, originalTableKeySources, tableSize, maximumLoadFactor, targetLoadFactor);
-                case Byte: return new StaticAggHasherByteByte(tableKeySources, originalTableKeySources, tableSize, maximumLoadFactor, targetLoadFactor);
-                case Short: return new StaticAggHasherByteShort(tableKeySources, originalTableKeySources, tableSize, maximumLoadFactor, targetLoadFactor);
-                case Int: return new StaticAggHasherByteInt(tableKeySources, originalTableKeySources, tableSize, maximumLoadFactor, targetLoadFactor);
-                case Long: return new StaticAggHasherByteLong(tableKeySources, originalTableKeySources, tableSize, maximumLoadFactor, targetLoadFactor);
-                case Float: return new StaticAggHasherByteFloat(tableKeySources, originalTableKeySources, tableSize, maximumLoadFactor, targetLoadFactor);
-                case Double: return new StaticAggHasherByteDouble(tableKeySources, originalTableKeySources, tableSize, maximumLoadFactor, targetLoadFactor);
-                case Object: return new StaticAggHasherByteObject(tableKeySources, originalTableKeySources, tableSize, maximumLoadFactor, targetLoadFactor);
-            }
-            case Short:switch (chunkType1) {
-                default: throw new UnsupportedOperationException("Invalid chunk type for typed hashers: " + chunkType1);
-                case Char: return new StaticAggHasherShortChar(tableKeySources, originalTableKeySources, tableSize, maximumLoadFactor, targetLoadFactor);
-                case Byte: return new StaticAggHasherShortByte(tableKeySources, originalTableKeySources, tableSize, maximumLoadFactor, targetLoadFactor);
-                case Short: return new StaticAggHasherShortShort(tableKeySources, originalTableKeySources, tableSize, maximumLoadFactor, targetLoadFactor);
-                case Int: return new StaticAggHasherShortInt(tableKeySources, originalTableKeySources, tableSize, maximumLoadFactor, targetLoadFactor);
-                case Long: return new StaticAggHasherShortLong(tableKeySources, originalTableKeySources, tableSize, maximumLoadFactor, targetLoadFactor);
-                case Float: return new StaticAggHasherShortFloat(tableKeySources, originalTableKeySources, tableSize, maximumLoadFactor, targetLoadFactor);
-                case Double: return new StaticAggHasherShortDouble(tableKeySources, originalTableKeySources, tableSize, maximumLoadFactor, targetLoadFactor);
-                case Object: return new StaticAggHasherShortObject(tableKeySources, originalTableKeySources, tableSize, maximumLoadFactor, targetLoadFactor);
-            }
-            case Int:switch (chunkType1) {
-                default: throw new UnsupportedOperationException("Invalid chunk type for typed hashers: " + chunkType1);
-                case Char: return new StaticAggHasherIntChar(tableKeySources, originalTableKeySources, tableSize, maximumLoadFactor, targetLoadFactor);
-                case Byte: return new StaticAggHasherIntByte(tableKeySources, originalTableKeySources, tableSize, maximumLoadFactor, targetLoadFactor);
-                case Short: return new StaticAggHasherIntShort(tableKeySources, originalTableKeySources, tableSize, maximumLoadFactor, targetLoadFactor);
-                case Int: return new StaticAggHasherIntInt(tableKeySources, originalTableKeySources, tableSize, maximumLoadFactor, targetLoadFactor);
-                case Long: return new StaticAggHasherIntLong(tableKeySources, originalTableKeySources, tableSize, maximumLoadFactor, targetLoadFactor);
-                case Float: return new StaticAggHasherIntFloat(tableKeySources, originalTableKeySources, tableSize, maximumLoadFactor, targetLoadFactor);
-                case Double: return new StaticAggHasherIntDouble(tableKeySources, originalTableKeySources, tableSize, maximumLoadFactor, targetLoadFactor);
-                case Object: return new StaticAggHasherIntObject(tableKeySources, originalTableKeySources, tableSize, maximumLoadFactor, targetLoadFactor);
-            }
-            case Long:switch (chunkType1) {
-                default: throw new UnsupportedOperationException("Invalid chunk type for typed hashers: " + chunkType1);
-                case Char: return new StaticAggHasherLongChar(tableKeySources, originalTableKeySources, tableSize, maximumLoadFactor, targetLoadFactor);
-                case Byte: return new StaticAggHasherLongByte(tableKeySources, originalTableKeySources, tableSize, maximumLoadFactor, targetLoadFactor);
-                case Short: return new StaticAggHasherLongShort(tableKeySources, originalTableKeySources, tableSize, maximumLoadFactor, targetLoadFactor);
-                case Int: return new StaticAggHasherLongInt(tableKeySources, originalTableKeySources, tableSize, maximumLoadFactor, targetLoadFactor);
-                case Long: return new StaticAggHasherLongLong(tableKeySources, originalTableKeySources, tableSize, maximumLoadFactor, targetLoadFactor);
-                case Float: return new StaticAggHasherLongFloat(tableKeySources, originalTableKeySources, tableSize, maximumLoadFactor, targetLoadFactor);
-                case Double: return new StaticAggHasherLongDouble(tableKeySources, originalTableKeySources, tableSize, maximumLoadFactor, targetLoadFactor);
-                case Object: return new StaticAggHasherLongObject(tableKeySources, originalTableKeySources, tableSize, maximumLoadFactor, targetLoadFactor);
-            }
-            case Float:switch (chunkType1) {
-                default: throw new UnsupportedOperationException("Invalid chunk type for typed hashers: " + chunkType1);
-                case Char: return new StaticAggHasherFloatChar(tableKeySources, originalTableKeySources, tableSize, maximumLoadFactor, targetLoadFactor);
-                case Byte: return new StaticAggHasherFloatByte(tableKeySources, originalTableKeySources, tableSize, maximumLoadFactor, targetLoadFactor);
-                case Short: return new StaticAggHasherFloatShort(tableKeySources, originalTableKeySources, tableSize, maximumLoadFactor, targetLoadFactor);
-                case Int: return new StaticAggHasherFloatInt(tableKeySources, originalTableKeySources, tableSize, maximumLoadFactor, targetLoadFactor);
-                case Long: return new StaticAggHasherFloatLong(tableKeySources, originalTableKeySources, tableSize, maximumLoadFactor, targetLoadFactor);
-                case Float: return new StaticAggHasherFloatFloat(tableKeySources, originalTableKeySources, tableSize, maximumLoadFactor, targetLoadFactor);
-                case Double: return new StaticAggHasherFloatDouble(tableKeySources, originalTableKeySources, tableSize, maximumLoadFactor, targetLoadFactor);
-                case Object: return new StaticAggHasherFloatObject(tableKeySources, originalTableKeySources, tableSize, maximumLoadFactor, targetLoadFactor);
-            }
-            case Double:switch (chunkType1) {
-                default: throw new UnsupportedOperationException("Invalid chunk type for typed hashers: " + chunkType1);
-                case Char: return new StaticAggHasherDoubleChar(tableKeySources, originalTableKeySources, tableSize, maximumLoadFactor, targetLoadFactor);
-                case Byte: return new StaticAggHasherDoubleByte(tableKeySources, originalTableKeySources, tableSize, maximumLoadFactor, targetLoadFactor);
-                case Short: return new StaticAggHasherDoubleShort(tableKeySources, originalTableKeySources, tableSize, maximumLoadFactor, targetLoadFactor);
-                case Int: return new StaticAggHasherDoubleInt(tableKeySources, originalTableKeySources, tableSize, maximumLoadFactor, targetLoadFactor);
-                case Long: return new StaticAggHasherDoubleLong(tableKeySources, originalTableKeySources, tableSize, maximumLoadFactor, targetLoadFactor);
-                case Float: return new StaticAggHasherDoubleFloat(tableKeySources, originalTableKeySources, tableSize, maximumLoadFactor, targetLoadFactor);
-                case Double: return new StaticAggHasherDoubleDouble(tableKeySources, originalTableKeySources, tableSize, maximumLoadFactor, targetLoadFactor);
-                case Object: return new StaticAggHasherDoubleObject(tableKeySources, originalTableKeySources, tableSize, maximumLoadFactor, targetLoadFactor);
-            }
-            case Object:switch (chunkType1) {
-                default: throw new UnsupportedOperationException("Invalid chunk type for typed hashers: " + chunkType1);
-                case Char: return new StaticAggHasherObjectChar(tableKeySources, originalTableKeySources, tableSize, maximumLoadFactor, targetLoadFactor);
-                case Byte: return new StaticAggHasherObjectByte(tableKeySources, originalTableKeySources, tableSize, maximumLoadFactor, targetLoadFactor);
-                case Short: return new StaticAggHasherObjectShort(tableKeySources, originalTableKeySources, tableSize, maximumLoadFactor, targetLoadFactor);
-                case Int: return new StaticAggHasherObjectInt(tableKeySources, originalTableKeySources, tableSize, maximumLoadFactor, targetLoadFactor);
-                case Long: return new StaticAggHasherObjectLong(tableKeySources, originalTableKeySources, tableSize, maximumLoadFactor, targetLoadFactor);
-                case Float: return new StaticAggHasherObjectFloat(tableKeySources, originalTableKeySources, tableSize, maximumLoadFactor, targetLoadFactor);
-                case Double: return new StaticAggHasherObjectDouble(tableKeySources, originalTableKeySources, tableSize, maximumLoadFactor, targetLoadFactor);
-                case Object: return new StaticAggHasherObjectObject(tableKeySources, originalTableKeySources, tableSize, maximumLoadFactor, targetLoadFactor);
-            }
-        }
-    }
-}
diff --git a/engine/table/src/main/java/io/deephaven/engine/table/impl/by/typed/staticopenagg/gen/StaticAggOpenHasherByte.java b/engine/table/src/main/java/io/deephaven/engine/table/impl/by/typed/staticopenagg/gen/StaticAggOpenHasherByte.java
index fd482cfe325..ca9f8c507ba 100644
--- a/engine/table/src/main/java/io/deephaven/engine/table/impl/by/typed/staticopenagg/gen/StaticAggOpenHasherByte.java
+++ b/engine/table/src/main/java/io/deephaven/engine/table/impl/by/typed/staticopenagg/gen/StaticAggOpenHasherByte.java
@@ -49,7 +49,7 @@ protected void build(RowSequence rowSequence, Chunk[] sourceKeyChunks) {
             int tableLocation = firstTableLocation;
             while (true) {
                 int outputPosition = mainOutputPosition.getUnsafe(tableLocation);
-                if (outputPosition == EMPTY_OUTPUT_POSITION) {
+                if (isStateEmpty(outputPosition)) {
                     numEntries++;
                     mainKeySource0.set(tableLocation, k0);
                     outputPosition = nextOutputPosition.getAndIncrement();
@@ -73,6 +73,10 @@ private static int hash(byte k0) {
         return hash;
     }
 
+    private static boolean isStateEmpty(int state) {
+        return state == EMPTY_OUTPUT_POSITION;
+    }
+
     @Override
     protected void rehashInternalFull(final int oldSize) {
         final byte[] destKeyArray0 = new byte[tableSize];
@@ -84,7 +88,7 @@ protected void rehashInternalFull(final int oldSize) {
         mainOutputPosition.setArray(destState);
         for (int sourceBucket = 0; sourceBucket < oldSize; ++sourceBucket) {
             final int currentStateValue = originalStateArray[sourceBucket];
-            if (currentStateValue == EMPTY_OUTPUT_POSITION) {
+            if (isStateEmpty(currentStateValue)) {
                 continue;
             }
             final byte k0 = originalKeyArray0[sourceBucket];
@@ -92,7 +96,7 @@ protected void rehashInternalFull(final int oldSize) {
             final int firstDestinationTableLocation = hashToTableLocation(hash);
             int destinationTableLocation = firstDestinationTableLocation;
             while (true) {
-                if (destState[destinationTableLocation] == EMPTY_OUTPUT_POSITION) {
+                if (isStateEmpty(destState[destinationTableLocation])) {
                     destKeyArray0[destinationTableLocation] = k0;
                     destState[destinationTableLocation] = originalStateArray[sourceBucket];
                     if (sourceBucket != destinationTableLocation) {
@@ -114,7 +118,7 @@ public int findPositionForKey(Object key) {
         final int firstTableLocation = tableLocation;
         while (true) {
             final int positionValue = mainOutputPosition.getUnsafe(tableLocation);
-            if (positionValue == EMPTY_OUTPUT_POSITION) {
+            if (isStateEmpty(positionValue)) {
                 return UNKNOWN_ROW;
             }
             if (eq(mainKeySource0.getUnsafe(tableLocation), k0)) {
diff --git a/engine/table/src/main/java/io/deephaven/engine/table/impl/by/typed/staticopenagg/gen/StaticAggOpenHasherByteByte.java b/engine/table/src/main/java/io/deephaven/engine/table/impl/by/typed/staticopenagg/gen/StaticAggOpenHasherByteByte.java
index 484ea59addd..a03e19899bf 100644
--- a/engine/table/src/main/java/io/deephaven/engine/table/impl/by/typed/staticopenagg/gen/StaticAggOpenHasherByteByte.java
+++ b/engine/table/src/main/java/io/deephaven/engine/table/impl/by/typed/staticopenagg/gen/StaticAggOpenHasherByteByte.java
@@ -55,7 +55,7 @@ protected void build(RowSequence rowSequence, Chunk[] sourceKeyChunks) {
             int tableLocation = firstTableLocation;
             while (true) {
                 int outputPosition = mainOutputPosition.getUnsafe(tableLocation);
-                if (outputPosition == EMPTY_OUTPUT_POSITION) {
+                if (isStateEmpty(outputPosition)) {
                     numEntries++;
                     mainKeySource0.set(tableLocation, k0);
                     mainKeySource1.set(tableLocation, k1);
@@ -81,6 +81,10 @@ private static int hash(byte k0, byte k1) {
         return hash;
     }
 
+    private static boolean isStateEmpty(int state) {
+        return state == EMPTY_OUTPUT_POSITION;
+    }
+
     @Override
     protected void rehashInternalFull(final int oldSize) {
         final byte[] destKeyArray0 = new byte[tableSize];
@@ -95,7 +99,7 @@ protected void rehashInternalFull(final int oldSize) {
         mainOutputPosition.setArray(destState);
         for (int sourceBucket = 0; sourceBucket < oldSize; ++sourceBucket) {
             final int currentStateValue = originalStateArray[sourceBucket];
-            if (currentStateValue == EMPTY_OUTPUT_POSITION) {
+            if (isStateEmpty(currentStateValue)) {
                 continue;
             }
             final byte k0 = originalKeyArray0[sourceBucket];
@@ -104,7 +108,7 @@ protected void rehashInternalFull(final int oldSize) {
             final int firstDestinationTableLocation = hashToTableLocation(hash);
             int destinationTableLocation = firstDestinationTableLocation;
             while (true) {
-                if (destState[destinationTableLocation] == EMPTY_OUTPUT_POSITION) {
+                if (isStateEmpty(destState[destinationTableLocation])) {
                     destKeyArray0[destinationTableLocation] = k0;
                     destKeyArray1[destinationTableLocation] = k1;
                     destState[destinationTableLocation] = originalStateArray[sourceBucket];
@@ -129,7 +133,7 @@ public int findPositionForKey(Object key) {
         final int firstTableLocation = tableLocation;
         while (true) {
             final int positionValue = mainOutputPosition.getUnsafe(tableLocation);
-            if (positionValue == EMPTY_OUTPUT_POSITION) {
+            if (isStateEmpty(positionValue)) {
                 return UNKNOWN_ROW;
             }
             if (eq(mainKeySource0.getUnsafe(tableLocation), k0) && eq(mainKeySource1.getUnsafe(tableLocation), k1)) {
diff --git a/engine/table/src/main/java/io/deephaven/engine/table/impl/by/typed/staticopenagg/gen/StaticAggOpenHasherByteChar.java b/engine/table/src/main/java/io/deephaven/engine/table/impl/by/typed/staticopenagg/gen/StaticAggOpenHasherByteChar.java
index 04150716116..12637dd09ca 100644
--- a/engine/table/src/main/java/io/deephaven/engine/table/impl/by/typed/staticopenagg/gen/StaticAggOpenHasherByteChar.java
+++ b/engine/table/src/main/java/io/deephaven/engine/table/impl/by/typed/staticopenagg/gen/StaticAggOpenHasherByteChar.java
@@ -60,7 +60,7 @@ protected void build(RowSequence rowSequence, Chunk[] sourceKeyChunks) {
             int tableLocation = firstTableLocation;
             while (true) {
                 int outputPosition = mainOutputPosition.getUnsafe(tableLocation);
-                if (outputPosition == EMPTY_OUTPUT_POSITION) {
+                if (isStateEmpty(outputPosition)) {
                     numEntries++;
                     mainKeySource0.set(tableLocation, k0);
                     mainKeySource1.set(tableLocation, k1);
@@ -86,6 +86,10 @@ private static int hash(byte k0, char k1) {
         return hash;
     }
 
+    private static boolean isStateEmpty(int state) {
+        return state == EMPTY_OUTPUT_POSITION;
+    }
+
     @Override
     protected void rehashInternalFull(final int oldSize) {
         final byte[] destKeyArray0 = new byte[tableSize];
@@ -100,7 +104,7 @@ protected void rehashInternalFull(final int oldSize) {
         mainOutputPosition.setArray(destState);
         for (int sourceBucket = 0; sourceBucket < oldSize; ++sourceBucket) {
             final int currentStateValue = originalStateArray[sourceBucket];
-            if (currentStateValue == EMPTY_OUTPUT_POSITION) {
+            if (isStateEmpty(currentStateValue)) {
                 continue;
             }
             final byte k0 = originalKeyArray0[sourceBucket];
@@ -109,7 +113,7 @@ protected void rehashInternalFull(final int oldSize) {
             final int firstDestinationTableLocation = hashToTableLocation(hash);
             int destinationTableLocation = firstDestinationTableLocation;
             while (true) {
-                if (destState[destinationTableLocation] == EMPTY_OUTPUT_POSITION) {
+                if (isStateEmpty(destState[destinationTableLocation])) {
                     destKeyArray0[destinationTableLocation] = k0;
                     destKeyArray1[destinationTableLocation] = k1;
                     destState[destinationTableLocation] = originalStateArray[sourceBucket];
@@ -134,7 +138,7 @@ public int findPositionForKey(Object key) {
         final int firstTableLocation = tableLocation;
         while (true) {
             final int positionValue = mainOutputPosition.getUnsafe(tableLocation);
-            if (positionValue == EMPTY_OUTPUT_POSITION) {
+            if (isStateEmpty(positionValue)) {
                 return UNKNOWN_ROW;
             }
             if (eq(mainKeySource0.getUnsafe(tableLocation), k0) && eq(mainKeySource1.getUnsafe(tableLocation), k1)) {
diff --git a/engine/table/src/main/java/io/deephaven/engine/table/impl/by/typed/staticopenagg/gen/StaticAggOpenHasherByteDouble.java b/engine/table/src/main/java/io/deephaven/engine/table/impl/by/typed/staticopenagg/gen/StaticAggOpenHasherByteDouble.java
index 3092884c546..ce3d92b6da4 100644
--- a/engine/table/src/main/java/io/deephaven/engine/table/impl/by/typed/staticopenagg/gen/StaticAggOpenHasherByteDouble.java
+++ b/engine/table/src/main/java/io/deephaven/engine/table/impl/by/typed/staticopenagg/gen/StaticAggOpenHasherByteDouble.java
@@ -60,7 +60,7 @@ protected void build(RowSequence rowSequence, Chunk[] sourceKeyChunks) {
             int tableLocation = firstTableLocation;
             while (true) {
                 int outputPosition = mainOutputPosition.getUnsafe(tableLocation);
-                if (outputPosition == EMPTY_OUTPUT_POSITION) {
+                if (isStateEmpty(outputPosition)) {
                     numEntries++;
                     mainKeySource0.set(tableLocation, k0);
                     mainKeySource1.set(tableLocation, k1);
@@ -86,6 +86,10 @@ private static int hash(byte k0, double k1) {
         return hash;
     }
 
+    private static boolean isStateEmpty(int state) {
+        return state == EMPTY_OUTPUT_POSITION;
+    }
+
     @Override
     protected void rehashInternalFull(final int oldSize) {
         final byte[] destKeyArray0 = new byte[tableSize];
@@ -100,7 +104,7 @@ protected void rehashInternalFull(final int oldSize) {
         mainOutputPosition.setArray(destState);
         for (int sourceBucket = 0; sourceBucket < oldSize; ++sourceBucket) {
             final int currentStateValue = originalStateArray[sourceBucket];
-            if (currentStateValue == EMPTY_OUTPUT_POSITION) {
+            if (isStateEmpty(currentStateValue)) {
                 continue;
             }
             final byte k0 = originalKeyArray0[sourceBucket];
@@ -109,7 +113,7 @@ protected void rehashInternalFull(final int oldSize) {
             final int firstDestinationTableLocation = hashToTableLocation(hash);
             int destinationTableLocation = firstDestinationTableLocation;
             while (true) {
-                if (destState[destinationTableLocation] == EMPTY_OUTPUT_POSITION) {
+                if (isStateEmpty(destState[destinationTableLocation])) {
                     destKeyArray0[destinationTableLocation] = k0;
                     destKeyArray1[destinationTableLocation] = k1;
                     destState[destinationTableLocation] = originalStateArray[sourceBucket];
@@ -134,7 +138,7 @@ public int findPositionForKey(Object key) {
         final int firstTableLocation = tableLocation;
         while (true) {
             final int positionValue = mainOutputPosition.getUnsafe(tableLocation);
-            if (positionValue == EMPTY_OUTPUT_POSITION) {
+            if (isStateEmpty(positionValue)) {
                 return UNKNOWN_ROW;
             }
             if (eq(mainKeySource0.getUnsafe(tableLocation), k0) && eq(mainKeySource1.getUnsafe(tableLocation), k1)) {
diff --git a/engine/table/src/main/java/io/deephaven/engine/table/impl/by/typed/staticopenagg/gen/StaticAggOpenHasherByteFloat.java b/engine/table/src/main/java/io/deephaven/engine/table/impl/by/typed/staticopenagg/gen/StaticAggOpenHasherByteFloat.java
index 5316c57d195..22334c1237e 100644
--- a/engine/table/src/main/java/io/deephaven/engine/table/impl/by/typed/staticopenagg/gen/StaticAggOpenHasherByteFloat.java
+++ b/engine/table/src/main/java/io/deephaven/engine/table/impl/by/typed/staticopenagg/gen/StaticAggOpenHasherByteFloat.java
@@ -60,7 +60,7 @@ protected void build(RowSequence rowSequence, Chunk[] sourceKeyChunks) {
             int tableLocation = firstTableLocation;
             while (true) {
                 int outputPosition = mainOutputPosition.getUnsafe(tableLocation);
-                if (outputPosition == EMPTY_OUTPUT_POSITION) {
+                if (isStateEmpty(outputPosition)) {
                     numEntries++;
                     mainKeySource0.set(tableLocation, k0);
                     mainKeySource1.set(tableLocation, k1);
@@ -86,6 +86,10 @@ private static int hash(byte k0, float k1) {
         return hash;
     }
 
+    private static boolean isStateEmpty(int state) {
+        return state == EMPTY_OUTPUT_POSITION;
+    }
+
     @Override
     protected void rehashInternalFull(final int oldSize) {
         final byte[] destKeyArray0 = new byte[tableSize];
@@ -100,7 +104,7 @@ protected void rehashInternalFull(final int oldSize) {
         mainOutputPosition.setArray(destState);
         for (int sourceBucket = 0; sourceBucket < oldSize; ++sourceBucket) {
             final int currentStateValue = originalStateArray[sourceBucket];
-            if (currentStateValue == EMPTY_OUTPUT_POSITION) {
+            if (isStateEmpty(currentStateValue)) {
                 continue;
             }
             final byte k0 = originalKeyArray0[sourceBucket];
@@ -109,7 +113,7 @@ protected void rehashInternalFull(final int oldSize) {
             final int firstDestinationTableLocation = hashToTableLocation(hash);
             int destinationTableLocation = firstDestinationTableLocation;
             while (true) {
-                if (destState[destinationTableLocation] == EMPTY_OUTPUT_POSITION) {
+                if (isStateEmpty(destState[destinationTableLocation])) {
                     destKeyArray0[destinationTableLocation] = k0;
                     destKeyArray1[destinationTableLocation] = k1;
                     destState[destinationTableLocation] = originalStateArray[sourceBucket];
@@ -134,7 +138,7 @@ public int findPositionForKey(Object key) {
         final int firstTableLocation = tableLocation;
         while (true) {
             final int positionValue = mainOutputPosition.getUnsafe(tableLocation);
-            if (positionValue == EMPTY_OUTPUT_POSITION) {
+            if (isStateEmpty(positionValue)) {
                 return UNKNOWN_ROW;
             }
             if (eq(mainKeySource0.getUnsafe(tableLocation), k0) && eq(mainKeySource1.getUnsafe(tableLocation), k1)) {
diff --git a/engine/table/src/main/java/io/deephaven/engine/table/impl/by/typed/staticopenagg/gen/StaticAggOpenHasherByteInt.java b/engine/table/src/main/java/io/deephaven/engine/table/impl/by/typed/staticopenagg/gen/StaticAggOpenHasherByteInt.java
index c6501199148..0b2b90753eb 100644
--- a/engine/table/src/main/java/io/deephaven/engine/table/impl/by/typed/staticopenagg/gen/StaticAggOpenHasherByteInt.java
+++ b/engine/table/src/main/java/io/deephaven/engine/table/impl/by/typed/staticopenagg/gen/StaticAggOpenHasherByteInt.java
@@ -60,7 +60,7 @@ protected void build(RowSequence rowSequence, Chunk[] sourceKeyChunks) {
             int tableLocation = firstTableLocation;
             while (true) {
                 int outputPosition = mainOutputPosition.getUnsafe(tableLocation);
-                if (outputPosition == EMPTY_OUTPUT_POSITION) {
+                if (isStateEmpty(outputPosition)) {
                     numEntries++;
                     mainKeySource0.set(tableLocation, k0);
                     mainKeySource1.set(tableLocation, k1);
@@ -86,6 +86,10 @@ private static int hash(byte k0, int k1) {
         return hash;
     }
 
+    private static boolean isStateEmpty(int state) {
+        return state == EMPTY_OUTPUT_POSITION;
+    }
+
     @Override
     protected void rehashInternalFull(final int oldSize) {
         final byte[] destKeyArray0 = new byte[tableSize];
@@ -100,7 +104,7 @@ protected void rehashInternalFull(final int oldSize) {
         mainOutputPosition.setArray(destState);
         for (int sourceBucket = 0; sourceBucket < oldSize; ++sourceBucket) {
             final int currentStateValue = originalStateArray[sourceBucket];
-            if (currentStateValue == EMPTY_OUTPUT_POSITION) {
+            if (isStateEmpty(currentStateValue)) {
                 continue;
             }
             final byte k0 = originalKeyArray0[sourceBucket];
@@ -109,7 +113,7 @@ protected void rehashInternalFull(final int oldSize) {
             final int firstDestinationTableLocation = hashToTableLocation(hash);
             int destinationTableLocation = firstDestinationTableLocation;
             while (true) {
-                if (destState[destinationTableLocation] == EMPTY_OUTPUT_POSITION) {
+                if (isStateEmpty(destState[destinationTableLocation])) {
                     destKeyArray0[destinationTableLocation] = k0;
                     destKeyArray1[destinationTableLocation] = k1;
                     destState[destinationTableLocation] = originalStateArray[sourceBucket];
@@ -134,7 +138,7 @@ public int findPositionForKey(Object key) {
         final int firstTableLocation = tableLocation;
         while (true) {
             final int positionValue = mainOutputPosition.getUnsafe(tableLocation);
-            if (positionValue == EMPTY_OUTPUT_POSITION) {
+            if (isStateEmpty(positionValue)) {
                 return UNKNOWN_ROW;
             }
             if (eq(mainKeySource0.getUnsafe(tableLocation), k0) && eq(mainKeySource1.getUnsafe(tableLocation), k1)) {
diff --git a/engine/table/src/main/java/io/deephaven/engine/table/impl/by/typed/staticopenagg/gen/StaticAggOpenHasherByteLong.java b/engine/table/src/main/java/io/deephaven/engine/table/impl/by/typed/staticopenagg/gen/StaticAggOpenHasherByteLong.java
index 42fb55a9ba8..7876c059767 100644
--- a/engine/table/src/main/java/io/deephaven/engine/table/impl/by/typed/staticopenagg/gen/StaticAggOpenHasherByteLong.java
+++ b/engine/table/src/main/java/io/deephaven/engine/table/impl/by/typed/staticopenagg/gen/StaticAggOpenHasherByteLong.java
@@ -60,7 +60,7 @@ protected void build(RowSequence rowSequence, Chunk[] sourceKeyChunks) {
             int tableLocation = firstTableLocation;
             while (true) {
                 int outputPosition = mainOutputPosition.getUnsafe(tableLocation);
-                if (outputPosition == EMPTY_OUTPUT_POSITION) {
+                if (isStateEmpty(outputPosition)) {
                     numEntries++;
                     mainKeySource0.set(tableLocation, k0);
                     mainKeySource1.set(tableLocation, k1);
@@ -86,6 +86,10 @@ private static int hash(byte k0, long k1) {
         return hash;
     }
 
+    private static boolean isStateEmpty(int state) {
+        return state == EMPTY_OUTPUT_POSITION;
+    }
+
     @Override
     protected void rehashInternalFull(final int oldSize) {
         final byte[] destKeyArray0 = new byte[tableSize];
@@ -100,7 +104,7 @@ protected void rehashInternalFull(final int oldSize) {
         mainOutputPosition.setArray(destState);
         for (int sourceBucket = 0; sourceBucket < oldSize; ++sourceBucket) {
             final int currentStateValue = originalStateArray[sourceBucket];
-            if (currentStateValue == EMPTY_OUTPUT_POSITION) {
+            if (isStateEmpty(currentStateValue)) {
                 continue;
             }
             final byte k0 = originalKeyArray0[sourceBucket];
@@ -109,7 +113,7 @@ protected void rehashInternalFull(final int oldSize) {
             final int firstDestinationTableLocation = hashToTableLocation(hash);
             int destinationTableLocation = firstDestinationTableLocation;
             while (true) {
-                if (destState[destinationTableLocation] == EMPTY_OUTPUT_POSITION) {
+                if (isStateEmpty(destState[destinationTableLocation])) {
                     destKeyArray0[destinationTableLocation] = k0;
                     destKeyArray1[destinationTableLocation] = k1;
                     destState[destinationTableLocation] = originalStateArray[sourceBucket];
@@ -134,7 +138,7 @@ public int findPositionForKey(Object key) {
         final int firstTableLocation = tableLocation;
         while (true) {
             final int positionValue = mainOutputPosition.getUnsafe(tableLocation);
-            if (positionValue == EMPTY_OUTPUT_POSITION) {
+            if (isStateEmpty(positionValue)) {
                 return UNKNOWN_ROW;
             }
             if (eq(mainKeySource0.getUnsafe(tableLocation), k0) && eq(mainKeySource1.getUnsafe(tableLocation), k1)) {
diff --git a/engine/table/src/main/java/io/deephaven/engine/table/impl/by/typed/staticopenagg/gen/StaticAggOpenHasherByteObject.java b/engine/table/src/main/java/io/deephaven/engine/table/impl/by/typed/staticopenagg/gen/StaticAggOpenHasherByteObject.java
index ef4210e9057..95982af0865 100644
--- a/engine/table/src/main/java/io/deephaven/engine/table/impl/by/typed/staticopenagg/gen/StaticAggOpenHasherByteObject.java
+++ b/engine/table/src/main/java/io/deephaven/engine/table/impl/by/typed/staticopenagg/gen/StaticAggOpenHasherByteObject.java
@@ -59,7 +59,7 @@ protected void build(RowSequence rowSequence, Chunk[] sourceKeyChunks) {
             int tableLocation = firstTableLocation;
             while (true) {
                 int outputPosition = mainOutputPosition.getUnsafe(tableLocation);
-                if (outputPosition == EMPTY_OUTPUT_POSITION) {
+                if (isStateEmpty(outputPosition)) {
                     numEntries++;
                     mainKeySource0.set(tableLocation, k0);
                     mainKeySource1.set(tableLocation, k1);
@@ -85,6 +85,10 @@ private static int hash(byte k0, Object k1) {
         return hash;
     }
 
+    private static boolean isStateEmpty(int state) {
+        return state == EMPTY_OUTPUT_POSITION;
+    }
+
     @Override
     protected void rehashInternalFull(final int oldSize) {
         final byte[] destKeyArray0 = new byte[tableSize];
@@ -99,7 +103,7 @@ protected void rehashInternalFull(final int oldSize) {
         mainOutputPosition.setArray(destState);
         for (int sourceBucket = 0; sourceBucket < oldSize; ++sourceBucket) {
             final int currentStateValue = originalStateArray[sourceBucket];
-            if (currentStateValue == EMPTY_OUTPUT_POSITION) {
+            if (isStateEmpty(currentStateValue)) {
                 continue;
             }
             final byte k0 = originalKeyArray0[sourceBucket];
@@ -108,7 +112,7 @@ protected void rehashInternalFull(final int oldSize) {
             final int firstDestinationTableLocation = hashToTableLocation(hash);
             int destinationTableLocation = firstDestinationTableLocation;
             while (true) {
-                if (destState[destinationTableLocation] == EMPTY_OUTPUT_POSITION) {
+                if (isStateEmpty(destState[destinationTableLocation])) {
                     destKeyArray0[destinationTableLocation] = k0;
                     destKeyArray1[destinationTableLocation] = k1;
                     destState[destinationTableLocation] = originalStateArray[sourceBucket];
@@ -133,7 +137,7 @@ public int findPositionForKey(Object key) {
         final int firstTableLocation = tableLocation;
         while (true) {
             final int positionValue = mainOutputPosition.getUnsafe(tableLocation);
-            if (positionValue == EMPTY_OUTPUT_POSITION) {
+            if (isStateEmpty(positionValue)) {
                 return UNKNOWN_ROW;
             }
             if (eq(mainKeySource0.getUnsafe(tableLocation), k0) && eq(mainKeySource1.getUnsafe(tableLocation), k1)) {
diff --git a/engine/table/src/main/java/io/deephaven/engine/table/impl/by/typed/staticopenagg/gen/StaticAggOpenHasherByteShort.java b/engine/table/src/main/java/io/deephaven/engine/table/impl/by/typed/staticopenagg/gen/StaticAggOpenHasherByteShort.java
index ea0e940da9d..9c0140ae1fd 100644
--- a/engine/table/src/main/java/io/deephaven/engine/table/impl/by/typed/staticopenagg/gen/StaticAggOpenHasherByteShort.java
+++ b/engine/table/src/main/java/io/deephaven/engine/table/impl/by/typed/staticopenagg/gen/StaticAggOpenHasherByteShort.java
@@ -60,7 +60,7 @@ protected void build(RowSequence rowSequence, Chunk[] sourceKeyChunks) {
             int tableLocation = firstTableLocation;
             while (true) {
                 int outputPosition = mainOutputPosition.getUnsafe(tableLocation);
-                if (outputPosition == EMPTY_OUTPUT_POSITION) {
+                if (isStateEmpty(outputPosition)) {
                     numEntries++;
                     mainKeySource0.set(tableLocation, k0);
                     mainKeySource1.set(tableLocation, k1);
@@ -86,6 +86,10 @@ private static int hash(byte k0, short k1) {
         return hash;
     }
 
+    private static boolean isStateEmpty(int state) {
+        return state == EMPTY_OUTPUT_POSITION;
+    }
+
     @Override
     protected void rehashInternalFull(final int oldSize) {
         final byte[] destKeyArray0 = new byte[tableSize];
@@ -100,7 +104,7 @@ protected void rehashInternalFull(final int oldSize) {
         mainOutputPosition.setArray(destState);
         for (int sourceBucket = 0; sourceBucket < oldSize; ++sourceBucket) {
             final int currentStateValue = originalStateArray[sourceBucket];
-            if (currentStateValue == EMPTY_OUTPUT_POSITION) {
+            if (isStateEmpty(currentStateValue)) {
                 continue;
             }
             final byte k0 = originalKeyArray0[sourceBucket];
@@ -109,7 +113,7 @@ protected void rehashInternalFull(final int oldSize) {
             final int firstDestinationTableLocation = hashToTableLocation(hash);
             int destinationTableLocation = firstDestinationTableLocation;
             while (true) {
-                if (destState[destinationTableLocation] == EMPTY_OUTPUT_POSITION) {
+                if (isStateEmpty(destState[destinationTableLocation])) {
                     destKeyArray0[destinationTableLocation] = k0;
                     destKeyArray1[destinationTableLocation] = k1;
                     destState[destinationTableLocation] = originalStateArray[sourceBucket];
@@ -134,7 +138,7 @@ public int findPositionForKey(Object key) {
         final int firstTableLocation = tableLocation;
         while (true) {
             final int positionValue = mainOutputPosition.getUnsafe(tableLocation);
-            if (positionValue == EMPTY_OUTPUT_POSITION) {
+            if (isStateEmpty(positionValue)) {
                 return UNKNOWN_ROW;
             }
             if (eq(mainKeySource0.getUnsafe(tableLocation), k0) && eq(mainKeySource1.getUnsafe(tableLocation), k1)) {
diff --git a/engine/table/src/main/java/io/deephaven/engine/table/impl/by/typed/staticopenagg/gen/StaticAggOpenHasherChar.java b/engine/table/src/main/java/io/deephaven/engine/table/impl/by/typed/staticopenagg/gen/StaticAggOpenHasherChar.java
index 8b7f73c0115..30e2dec74b8 100644
--- a/engine/table/src/main/java/io/deephaven/engine/table/impl/by/typed/staticopenagg/gen/StaticAggOpenHasherChar.java
+++ b/engine/table/src/main/java/io/deephaven/engine/table/impl/by/typed/staticopenagg/gen/StaticAggOpenHasherChar.java
@@ -49,7 +49,7 @@ protected void build(RowSequence rowSequence, Chunk[] sourceKeyChunks) {
             int tableLocation = firstTableLocation;
             while (true) {
                 int outputPosition = mainOutputPosition.getUnsafe(tableLocation);
-                if (outputPosition == EMPTY_OUTPUT_POSITION) {
+                if (isStateEmpty(outputPosition)) {
                     numEntries++;
                     mainKeySource0.set(tableLocation, k0);
                     outputPosition = nextOutputPosition.getAndIncrement();
@@ -73,6 +73,10 @@ private static int hash(char k0) {
         return hash;
     }
 
+    private static boolean isStateEmpty(int state) {
+        return state == EMPTY_OUTPUT_POSITION;
+    }
+
     @Override
     protected void rehashInternalFull(final int oldSize) {
         final char[] destKeyArray0 = new char[tableSize];
@@ -84,7 +88,7 @@ protected void rehashInternalFull(final int oldSize) {
         mainOutputPosition.setArray(destState);
         for (int sourceBucket = 0; sourceBucket < oldSize; ++sourceBucket) {
             final int currentStateValue = originalStateArray[sourceBucket];
-            if (currentStateValue == EMPTY_OUTPUT_POSITION) {
+            if (isStateEmpty(currentStateValue)) {
                 continue;
             }
             final char k0 = originalKeyArray0[sourceBucket];
@@ -92,7 +96,7 @@ protected void rehashInternalFull(final int oldSize) {
             final int firstDestinationTableLocation = hashToTableLocation(hash);
             int destinationTableLocation = firstDestinationTableLocation;
             while (true) {
-                if (destState[destinationTableLocation] == EMPTY_OUTPUT_POSITION) {
+                if (isStateEmpty(destState[destinationTableLocation])) {
                     destKeyArray0[destinationTableLocation] = k0;
                     destState[destinationTableLocation] = originalStateArray[sourceBucket];
                     if (sourceBucket != destinationTableLocation) {
@@ -114,7 +118,7 @@ public int findPositionForKey(Object key) {
         final int firstTableLocation = tableLocation;
         while (true) {
             final int positionValue = mainOutputPosition.getUnsafe(tableLocation);
-            if (positionValue == EMPTY_OUTPUT_POSITION) {
+            if (isStateEmpty(positionValue)) {
                 return UNKNOWN_ROW;
             }
             if (eq(mainKeySource0.getUnsafe(tableLocation), k0)) {
diff --git a/engine/table/src/main/java/io/deephaven/engine/table/impl/by/typed/staticopenagg/gen/StaticAggOpenHasherCharByte.java b/engine/table/src/main/java/io/deephaven/engine/table/impl/by/typed/staticopenagg/gen/StaticAggOpenHasherCharByte.java
index 4ab1664c640..4b87a8829bd 100644
--- a/engine/table/src/main/java/io/deephaven/engine/table/impl/by/typed/staticopenagg/gen/StaticAggOpenHasherCharByte.java
+++ b/engine/table/src/main/java/io/deephaven/engine/table/impl/by/typed/staticopenagg/gen/StaticAggOpenHasherCharByte.java
@@ -60,7 +60,7 @@ protected void build(RowSequence rowSequence, Chunk[] sourceKeyChunks) {
             int tableLocation = firstTableLocation;
             while (true) {
                 int outputPosition = mainOutputPosition.getUnsafe(tableLocation);
-                if (outputPosition == EMPTY_OUTPUT_POSITION) {
+                if (isStateEmpty(outputPosition)) {
                     numEntries++;
                     mainKeySource0.set(tableLocation, k0);
                     mainKeySource1.set(tableLocation, k1);
@@ -86,6 +86,10 @@ private static int hash(char k0, byte k1) {
         return hash;
     }
 
+    private static boolean isStateEmpty(int state) {
+        return state == EMPTY_OUTPUT_POSITION;
+    }
+
     @Override
     protected void rehashInternalFull(final int oldSize) {
         final char[] destKeyArray0 = new char[tableSize];
@@ -100,7 +104,7 @@ protected void rehashInternalFull(final int oldSize) {
         mainOutputPosition.setArray(destState);
         for (int sourceBucket = 0; sourceBucket < oldSize; ++sourceBucket) {
             final int currentStateValue = originalStateArray[sourceBucket];
-            if (currentStateValue == EMPTY_OUTPUT_POSITION) {
+            if (isStateEmpty(currentStateValue)) {
                 continue;
             }
             final char k0 = originalKeyArray0[sourceBucket];
@@ -109,7 +113,7 @@ protected void rehashInternalFull(final int oldSize) {
             final int firstDestinationTableLocation = hashToTableLocation(hash);
             int destinationTableLocation = firstDestinationTableLocation;
             while (true) {
-                if (destState[destinationTableLocation] == EMPTY_OUTPUT_POSITION) {
+                if (isStateEmpty(destState[destinationTableLocation])) {
                     destKeyArray0[destinationTableLocation] = k0;
                     destKeyArray1[destinationTableLocation] = k1;
                     destState[destinationTableLocation] = originalStateArray[sourceBucket];
@@ -134,7 +138,7 @@ public int findPositionForKey(Object key) {
         final int firstTableLocation = tableLocation;
         while (true) {
             final int positionValue = mainOutputPosition.getUnsafe(tableLocation);
-            if (positionValue == EMPTY_OUTPUT_POSITION) {
+            if (isStateEmpty(positionValue)) {
                 return UNKNOWN_ROW;
             }
             if (eq(mainKeySource0.getUnsafe(tableLocation), k0) && eq(mainKeySource1.getUnsafe(tableLocation), k1)) {
diff --git a/engine/table/src/main/java/io/deephaven/engine/table/impl/by/typed/staticopenagg/gen/StaticAggOpenHasherCharChar.java b/engine/table/src/main/java/io/deephaven/engine/table/impl/by/typed/staticopenagg/gen/StaticAggOpenHasherCharChar.java
index 5ba7970ae1e..058720c1744 100644
--- a/engine/table/src/main/java/io/deephaven/engine/table/impl/by/typed/staticopenagg/gen/StaticAggOpenHasherCharChar.java
+++ b/engine/table/src/main/java/io/deephaven/engine/table/impl/by/typed/staticopenagg/gen/StaticAggOpenHasherCharChar.java
@@ -55,7 +55,7 @@ protected void build(RowSequence rowSequence, Chunk[] sourceKeyChunks) {
             int tableLocation = firstTableLocation;
             while (true) {
                 int outputPosition = mainOutputPosition.getUnsafe(tableLocation);
-                if (outputPosition == EMPTY_OUTPUT_POSITION) {
+                if (isStateEmpty(outputPosition)) {
                     numEntries++;
                     mainKeySource0.set(tableLocation, k0);
                     mainKeySource1.set(tableLocation, k1);
@@ -81,6 +81,10 @@ private static int hash(char k0, char k1) {
         return hash;
     }
 
+    private static boolean isStateEmpty(int state) {
+        return state == EMPTY_OUTPUT_POSITION;
+    }
+
     @Override
     protected void rehashInternalFull(final int oldSize) {
         final char[] destKeyArray0 = new char[tableSize];
@@ -95,7 +99,7 @@ protected void rehashInternalFull(final int oldSize) {
         mainOutputPosition.setArray(destState);
         for (int sourceBucket = 0; sourceBucket < oldSize; ++sourceBucket) {
             final int currentStateValue = originalStateArray[sourceBucket];
-            if (currentStateValue == EMPTY_OUTPUT_POSITION) {
+            if (isStateEmpty(currentStateValue)) {
                 continue;
             }
             final char k0 = originalKeyArray0[sourceBucket];
@@ -104,7 +108,7 @@ protected void rehashInternalFull(final int oldSize) {
             final int firstDestinationTableLocation = hashToTableLocation(hash);
             int destinationTableLocation = firstDestinationTableLocation;
             while (true) {
-                if (destState[destinationTableLocation] == EMPTY_OUTPUT_POSITION) {
+                if (isStateEmpty(destState[destinationTableLocation])) {
                     destKeyArray0[destinationTableLocation] = k0;
                     destKeyArray1[destinationTableLocation] = k1;
                     destState[destinationTableLocation] = originalStateArray[sourceBucket];
@@ -129,7 +133,7 @@ public int findPositionForKey(Object key) {
         final int firstTableLocation = tableLocation;
         while (true) {
             final int positionValue = mainOutputPosition.getUnsafe(tableLocation);
-            if (positionValue == EMPTY_OUTPUT_POSITION) {
+            if (isStateEmpty(positionValue)) {
                 return UNKNOWN_ROW;
             }
             if (eq(mainKeySource0.getUnsafe(tableLocation), k0) && eq(mainKeySource1.getUnsafe(tableLocation), k1)) {
diff --git a/engine/table/src/main/java/io/deephaven/engine/table/impl/by/typed/staticopenagg/gen/StaticAggOpenHasherCharDouble.java b/engine/table/src/main/java/io/deephaven/engine/table/impl/by/typed/staticopenagg/gen/StaticAggOpenHasherCharDouble.java
index 61cd6e47e8d..afd7af2ee23 100644
--- a/engine/table/src/main/java/io/deephaven/engine/table/impl/by/typed/staticopenagg/gen/StaticAggOpenHasherCharDouble.java
+++ b/engine/table/src/main/java/io/deephaven/engine/table/impl/by/typed/staticopenagg/gen/StaticAggOpenHasherCharDouble.java
@@ -60,7 +60,7 @@ protected void build(RowSequence rowSequence, Chunk[] sourceKeyChunks) {
             int tableLocation = firstTableLocation;
             while (true) {
                 int outputPosition = mainOutputPosition.getUnsafe(tableLocation);
-                if (outputPosition == EMPTY_OUTPUT_POSITION) {
+                if (isStateEmpty(outputPosition)) {
                     numEntries++;
                     mainKeySource0.set(tableLocation, k0);
                     mainKeySource1.set(tableLocation, k1);
@@ -86,6 +86,10 @@ private static int hash(char k0, double k1) {
         return hash;
     }
 
+    private static boolean isStateEmpty(int state) {
+        return state == EMPTY_OUTPUT_POSITION;
+    }
+
     @Override
     protected void rehashInternalFull(final int oldSize) {
         final char[] destKeyArray0 = new char[tableSize];
@@ -100,7 +104,7 @@ protected void rehashInternalFull(final int oldSize) {
         mainOutputPosition.setArray(destState);
         for (int sourceBucket = 0; sourceBucket < oldSize; ++sourceBucket) {
             final int currentStateValue = originalStateArray[sourceBucket];
-            if (currentStateValue == EMPTY_OUTPUT_POSITION) {
+            if (isStateEmpty(currentStateValue)) {
                 continue;
             }
             final char k0 = originalKeyArray0[sourceBucket];
@@ -109,7 +113,7 @@ protected void rehashInternalFull(final int oldSize) {
             final int firstDestinationTableLocation = hashToTableLocation(hash);
             int destinationTableLocation = firstDestinationTableLocation;
             while (true) {
-                if (destState[destinationTableLocation] == EMPTY_OUTPUT_POSITION) {
+                if (isStateEmpty(destState[destinationTableLocation])) {
                     destKeyArray0[destinationTableLocation] = k0;
                     destKeyArray1[destinationTableLocation] = k1;
                     destState[destinationTableLocation] = originalStateArray[sourceBucket];
@@ -134,7 +138,7 @@ public int findPositionForKey(Object key) {
         final int firstTableLocation = tableLocation;
         while (true) {
             final int positionValue = mainOutputPosition.getUnsafe(tableLocation);
-            if (positionValue == EMPTY_OUTPUT_POSITION) {
+            if (isStateEmpty(positionValue)) {
                 return UNKNOWN_ROW;
             }
             if (eq(mainKeySource0.getUnsafe(tableLocation), k0) && eq(mainKeySource1.getUnsafe(tableLocation), k1)) {
diff --git a/engine/table/src/main/java/io/deephaven/engine/table/impl/by/typed/staticopenagg/gen/StaticAggOpenHasherCharFloat.java b/engine/table/src/main/java/io/deephaven/engine/table/impl/by/typed/staticopenagg/gen/StaticAggOpenHasherCharFloat.java
index f446dbe134d..a453a2faf68 100644
--- a/engine/table/src/main/java/io/deephaven/engine/table/impl/by/typed/staticopenagg/gen/StaticAggOpenHasherCharFloat.java
+++ b/engine/table/src/main/java/io/deephaven/engine/table/impl/by/typed/staticopenagg/gen/StaticAggOpenHasherCharFloat.java
@@ -60,7 +60,7 @@ protected void build(RowSequence rowSequence, Chunk[] sourceKeyChunks) {
             int tableLocation = firstTableLocation;
             while (true) {
                 int outputPosition = mainOutputPosition.getUnsafe(tableLocation);
-                if (outputPosition == EMPTY_OUTPUT_POSITION) {
+                if (isStateEmpty(outputPosition)) {
                     numEntries++;
                     mainKeySource0.set(tableLocation, k0);
                     mainKeySource1.set(tableLocation, k1);
@@ -86,6 +86,10 @@ private static int hash(char k0, float k1) {
         return hash;
     }
 
+    private static boolean isStateEmpty(int state) {
+        return state == EMPTY_OUTPUT_POSITION;
+    }
+
     @Override
     protected void rehashInternalFull(final int oldSize) {
         final char[] destKeyArray0 = new char[tableSize];
@@ -100,7 +104,7 @@ protected void rehashInternalFull(final int oldSize) {
         mainOutputPosition.setArray(destState);
         for (int sourceBucket = 0; sourceBucket < oldSize; ++sourceBucket) {
             final int currentStateValue = originalStateArray[sourceBucket];
-            if (currentStateValue == EMPTY_OUTPUT_POSITION) {
+            if (isStateEmpty(currentStateValue)) {
                 continue;
             }
             final char k0 = originalKeyArray0[sourceBucket];
@@ -109,7 +113,7 @@ protected void rehashInternalFull(final int oldSize) {
             final int firstDestinationTableLocation = hashToTableLocation(hash);
             int destinationTableLocation = firstDestinationTableLocation;
             while (true) {
-                if (destState[destinationTableLocation] == EMPTY_OUTPUT_POSITION) {
+                if (isStateEmpty(destState[destinationTableLocation])) {
                     destKeyArray0[destinationTableLocation] = k0;
                     destKeyArray1[destinationTableLocation] = k1;
                     destState[destinationTableLocation] = originalStateArray[sourceBucket];
@@ -134,7 +138,7 @@ public int findPositionForKey(Object key) {
         final int firstTableLocation = tableLocation;
         while (true) {
             final int positionValue = mainOutputPosition.getUnsafe(tableLocation);
-            if (positionValue == EMPTY_OUTPUT_POSITION) {
+            if (isStateEmpty(positionValue)) {
                 return UNKNOWN_ROW;
             }
             if (eq(mainKeySource0.getUnsafe(tableLocation), k0) && eq(mainKeySource1.getUnsafe(tableLocation), k1)) {
diff --git a/engine/table/src/main/java/io/deephaven/engine/table/impl/by/typed/staticopenagg/gen/StaticAggOpenHasherCharInt.java b/engine/table/src/main/java/io/deephaven/engine/table/impl/by/typed/staticopenagg/gen/StaticAggOpenHasherCharInt.java
index 851fecc4760..37ea07f4af7 100644
--- a/engine/table/src/main/java/io/deephaven/engine/table/impl/by/typed/staticopenagg/gen/StaticAggOpenHasherCharInt.java
+++ b/engine/table/src/main/java/io/deephaven/engine/table/impl/by/typed/staticopenagg/gen/StaticAggOpenHasherCharInt.java
@@ -60,7 +60,7 @@ protected void build(RowSequence rowSequence, Chunk[] sourceKeyChunks) {
             int tableLocation = firstTableLocation;
             while (true) {
                 int outputPosition = mainOutputPosition.getUnsafe(tableLocation);
-                if (outputPosition == EMPTY_OUTPUT_POSITION) {
+                if (isStateEmpty(outputPosition)) {
                     numEntries++;
                     mainKeySource0.set(tableLocation, k0);
                     mainKeySource1.set(tableLocation, k1);
@@ -86,6 +86,10 @@ private static int hash(char k0, int k1) {
         return hash;
     }
 
+    private static boolean isStateEmpty(int state) {
+        return state == EMPTY_OUTPUT_POSITION;
+    }
+
     @Override
     protected void rehashInternalFull(final int oldSize) {
         final char[] destKeyArray0 = new char[tableSize];
@@ -100,7 +104,7 @@ protected void rehashInternalFull(final int oldSize) {
         mainOutputPosition.setArray(destState);
         for (int sourceBucket = 0; sourceBucket < oldSize; ++sourceBucket) {
             final int currentStateValue = originalStateArray[sourceBucket];
-            if (currentStateValue == EMPTY_OUTPUT_POSITION) {
+            if (isStateEmpty(currentStateValue)) {
                 continue;
             }
             final char k0 = originalKeyArray0[sourceBucket];
@@ -109,7 +113,7 @@ protected void rehashInternalFull(final int oldSize) {
             final int firstDestinationTableLocation = hashToTableLocation(hash);
             int destinationTableLocation = firstDestinationTableLocation;
             while (true) {
-                if (destState[destinationTableLocation] == EMPTY_OUTPUT_POSITION) {
+                if (isStateEmpty(destState[destinationTableLocation])) {
                     destKeyArray0[destinationTableLocation] = k0;
                     destKeyArray1[destinationTableLocation] = k1;
                     destState[destinationTableLocation] = originalStateArray[sourceBucket];
@@ -134,7 +138,7 @@ public int findPositionForKey(Object key) {
         final int firstTableLocation = tableLocation;
         while (true) {
             final int positionValue = mainOutputPosition.getUnsafe(tableLocation);
-            if (positionValue == EMPTY_OUTPUT_POSITION) {
+            if (isStateEmpty(positionValue)) {
                 return UNKNOWN_ROW;
             }
             if (eq(mainKeySource0.getUnsafe(tableLocation), k0) && eq(mainKeySource1.getUnsafe(tableLocation), k1)) {
diff --git a/engine/table/src/main/java/io/deephaven/engine/table/impl/by/typed/staticopenagg/gen/StaticAggOpenHasherCharLong.java b/engine/table/src/main/java/io/deephaven/engine/table/impl/by/typed/staticopenagg/gen/StaticAggOpenHasherCharLong.java
index cc4e31ca18f..fc733c69c0a 100644
--- a/engine/table/src/main/java/io/deephaven/engine/table/impl/by/typed/staticopenagg/gen/StaticAggOpenHasherCharLong.java
+++ b/engine/table/src/main/java/io/deephaven/engine/table/impl/by/typed/staticopenagg/gen/StaticAggOpenHasherCharLong.java
@@ -60,7 +60,7 @@ protected void build(RowSequence rowSequence, Chunk[] sourceKeyChunks) {
             int tableLocation = firstTableLocation;
             while (true) {
                 int outputPosition = mainOutputPosition.getUnsafe(tableLocation);
-                if (outputPosition == EMPTY_OUTPUT_POSITION) {
+                if (isStateEmpty(outputPosition)) {
                     numEntries++;
                     mainKeySource0.set(tableLocation, k0);
                     mainKeySource1.set(tableLocation, k1);
@@ -86,6 +86,10 @@ private static int hash(char k0, long k1) {
         return hash;
     }
 
+    private static boolean isStateEmpty(int state) {
+        return state == EMPTY_OUTPUT_POSITION;
+    }
+
     @Override
     protected void rehashInternalFull(final int oldSize) {
         final char[] destKeyArray0 = new char[tableSize];
@@ -100,7 +104,7 @@ protected void rehashInternalFull(final int oldSize) {
         mainOutputPosition.setArray(destState);
         for (int sourceBucket = 0; sourceBucket < oldSize; ++sourceBucket) {
             final int currentStateValue = originalStateArray[sourceBucket];
-            if (currentStateValue == EMPTY_OUTPUT_POSITION) {
+            if (isStateEmpty(currentStateValue)) {
                 continue;
             }
             final char k0 = originalKeyArray0[sourceBucket];
@@ -109,7 +113,7 @@ protected void rehashInternalFull(final int oldSize) {
             final int firstDestinationTableLocation = hashToTableLocation(hash);
             int destinationTableLocation = firstDestinationTableLocation;
             while (true) {
-                if (destState[destinationTableLocation] == EMPTY_OUTPUT_POSITION) {
+                if (isStateEmpty(destState[destinationTableLocation])) {
                     destKeyArray0[destinationTableLocation] = k0;
                     destKeyArray1[destinationTableLocation] = k1;
                     destState[destinationTableLocation] = originalStateArray[sourceBucket];
@@ -134,7 +138,7 @@ public int findPositionForKey(Object key) {
         final int firstTableLocation = tableLocation;
         while (true) {
             final int positionValue = mainOutputPosition.getUnsafe(tableLocation);
-            if (positionValue == EMPTY_OUTPUT_POSITION) {
+            if (isStateEmpty(positionValue)) {
                 return UNKNOWN_ROW;
             }
             if (eq(mainKeySource0.getUnsafe(tableLocation), k0) && eq(mainKeySource1.getUnsafe(tableLocation), k1)) {
diff --git a/engine/table/src/main/java/io/deephaven/engine/table/impl/by/typed/staticopenagg/gen/StaticAggOpenHasherCharObject.java b/engine/table/src/main/java/io/deephaven/engine/table/impl/by/typed/staticopenagg/gen/StaticAggOpenHasherCharObject.java
index 0138edd9402..fb1373e5c62 100644
--- a/engine/table/src/main/java/io/deephaven/engine/table/impl/by/typed/staticopenagg/gen/StaticAggOpenHasherCharObject.java
+++ b/engine/table/src/main/java/io/deephaven/engine/table/impl/by/typed/staticopenagg/gen/StaticAggOpenHasherCharObject.java
@@ -59,7 +59,7 @@ protected void build(RowSequence rowSequence, Chunk[] sourceKeyChunks) {
             int tableLocation = firstTableLocation;
             while (true) {
                 int outputPosition = mainOutputPosition.getUnsafe(tableLocation);
-                if (outputPosition == EMPTY_OUTPUT_POSITION) {
+                if (isStateEmpty(outputPosition)) {
                     numEntries++;
                     mainKeySource0.set(tableLocation, k0);
                     mainKeySource1.set(tableLocation, k1);
@@ -85,6 +85,10 @@ private static int hash(char k0, Object k1) {
         return hash;
     }
 
+    private static boolean isStateEmpty(int state) {
+        return state == EMPTY_OUTPUT_POSITION;
+    }
+
     @Override
     protected void rehashInternalFull(final int oldSize) {
         final char[] destKeyArray0 = new char[tableSize];
@@ -99,7 +103,7 @@ protected void rehashInternalFull(final int oldSize) {
         mainOutputPosition.setArray(destState);
         for (int sourceBucket = 0; sourceBucket < oldSize; ++sourceBucket) {
             final int currentStateValue = originalStateArray[sourceBucket];
-            if (currentStateValue == EMPTY_OUTPUT_POSITION) {
+            if (isStateEmpty(currentStateValue)) {
                 continue;
             }
             final char k0 = originalKeyArray0[sourceBucket];
@@ -108,7 +112,7 @@ protected void rehashInternalFull(final int oldSize) {
             final int firstDestinationTableLocation = hashToTableLocation(hash);
             int destinationTableLocation = firstDestinationTableLocation;
             while (true) {
-                if (destState[destinationTableLocation] == EMPTY_OUTPUT_POSITION) {
+                if (isStateEmpty(destState[destinationTableLocation])) {
                     destKeyArray0[destinationTableLocation] = k0;
                     destKeyArray1[destinationTableLocation] = k1;
                     destState[destinationTableLocation] = originalStateArray[sourceBucket];
@@ -133,7 +137,7 @@ public int findPositionForKey(Object key) {
         final int firstTableLocation = tableLocation;
         while (true) {
             final int positionValue = mainOutputPosition.getUnsafe(tableLocation);
-            if (positionValue == EMPTY_OUTPUT_POSITION) {
+            if (isStateEmpty(positionValue)) {
                 return UNKNOWN_ROW;
             }
             if (eq(mainKeySource0.getUnsafe(tableLocation), k0) && eq(mainKeySource1.getUnsafe(tableLocation), k1)) {
diff --git a/engine/table/src/main/java/io/deephaven/engine/table/impl/by/typed/staticopenagg/gen/StaticAggOpenHasherCharShort.java b/engine/table/src/main/java/io/deephaven/engine/table/impl/by/typed/staticopenagg/gen/StaticAggOpenHasherCharShort.java
index 5fe895eb9d5..a85900f09ea 100644
--- a/engine/table/src/main/java/io/deephaven/engine/table/impl/by/typed/staticopenagg/gen/StaticAggOpenHasherCharShort.java
+++ b/engine/table/src/main/java/io/deephaven/engine/table/impl/by/typed/staticopenagg/gen/StaticAggOpenHasherCharShort.java
@@ -60,7 +60,7 @@ protected void build(RowSequence rowSequence, Chunk[] sourceKeyChunks) {
             int tableLocation = firstTableLocation;
             while (true) {
                 int outputPosition = mainOutputPosition.getUnsafe(tableLocation);
-                if (outputPosition == EMPTY_OUTPUT_POSITION) {
+                if (isStateEmpty(outputPosition)) {
                     numEntries++;
                     mainKeySource0.set(tableLocation, k0);
                     mainKeySource1.set(tableLocation, k1);
@@ -86,6 +86,10 @@ private static int hash(char k0, short k1) {
         return hash;
     }
 
+    private static boolean isStateEmpty(int state) {
+        return state == EMPTY_OUTPUT_POSITION;
+    }
+
     @Override
     protected void rehashInternalFull(final int oldSize) {
         final char[] destKeyArray0 = new char[tableSize];
@@ -100,7 +104,7 @@ protected void rehashInternalFull(final int oldSize) {
         mainOutputPosition.setArray(destState);
         for (int sourceBucket = 0; sourceBucket < oldSize; ++sourceBucket) {
             final int currentStateValue = originalStateArray[sourceBucket];
-            if (currentStateValue == EMPTY_OUTPUT_POSITION) {
+            if (isStateEmpty(currentStateValue)) {
                 continue;
             }
             final char k0 = originalKeyArray0[sourceBucket];
@@ -109,7 +113,7 @@ protected void rehashInternalFull(final int oldSize) {
             final int firstDestinationTableLocation = hashToTableLocation(hash);
             int destinationTableLocation = firstDestinationTableLocation;
             while (true) {
-                if (destState[destinationTableLocation] == EMPTY_OUTPUT_POSITION) {
+                if (isStateEmpty(destState[destinationTableLocation])) {
                     destKeyArray0[destinationTableLocation] = k0;
                     destKeyArray1[destinationTableLocation] = k1;
                     destState[destinationTableLocation] = originalStateArray[sourceBucket];
@@ -134,7 +138,7 @@ public int findPositionForKey(Object key) {
         final int firstTableLocation = tableLocation;
         while (true) {
             final int positionValue = mainOutputPosition.getUnsafe(tableLocation);
-            if (positionValue == EMPTY_OUTPUT_POSITION) {
+            if (isStateEmpty(positionValue)) {
                 return UNKNOWN_ROW;
             }
             if (eq(mainKeySource0.getUnsafe(tableLocation), k0) && eq(mainKeySource1.getUnsafe(tableLocation), k1)) {
diff --git a/engine/table/src/main/java/io/deephaven/engine/table/impl/by/typed/staticopenagg/gen/StaticAggOpenHasherDouble.java b/engine/table/src/main/java/io/deephaven/engine/table/impl/by/typed/staticopenagg/gen/StaticAggOpenHasherDouble.java
index 21da31085e8..1845fb2e41b 100644
--- a/engine/table/src/main/java/io/deephaven/engine/table/impl/by/typed/staticopenagg/gen/StaticAggOpenHasherDouble.java
+++ b/engine/table/src/main/java/io/deephaven/engine/table/impl/by/typed/staticopenagg/gen/StaticAggOpenHasherDouble.java
@@ -49,7 +49,7 @@ protected void build(RowSequence rowSequence, Chunk[] sourceKeyChunks) {
             int tableLocation = firstTableLocation;
             while (true) {
                 int outputPosition = mainOutputPosition.getUnsafe(tableLocation);
-                if (outputPosition == EMPTY_OUTPUT_POSITION) {
+                if (isStateEmpty(outputPosition)) {
                     numEntries++;
                     mainKeySource0.set(tableLocation, k0);
                     outputPosition = nextOutputPosition.getAndIncrement();
@@ -73,6 +73,10 @@ private static int hash(double k0) {
         return hash;
     }
 
+    private static boolean isStateEmpty(int state) {
+        return state == EMPTY_OUTPUT_POSITION;
+    }
+
     @Override
     protected void rehashInternalFull(final int oldSize) {
         final double[] destKeyArray0 = new double[tableSize];
@@ -84,7 +88,7 @@ protected void rehashInternalFull(final int oldSize) {
         mainOutputPosition.setArray(destState);
         for (int sourceBucket = 0; sourceBucket < oldSize; ++sourceBucket) {
             final int currentStateValue = originalStateArray[sourceBucket];
-            if (currentStateValue == EMPTY_OUTPUT_POSITION) {
+            if (isStateEmpty(currentStateValue)) {
                 continue;
             }
             final double k0 = originalKeyArray0[sourceBucket];
@@ -92,7 +96,7 @@ protected void rehashInternalFull(final int oldSize) {
             final int firstDestinationTableLocation = hashToTableLocation(hash);
             int destinationTableLocation = firstDestinationTableLocation;
             while (true) {
-                if (destState[destinationTableLocation] == EMPTY_OUTPUT_POSITION) {
+                if (isStateEmpty(destState[destinationTableLocation])) {
                     destKeyArray0[destinationTableLocation] = k0;
                     destState[destinationTableLocation] = originalStateArray[sourceBucket];
                     if (sourceBucket != destinationTableLocation) {
@@ -114,7 +118,7 @@ public int findPositionForKey(Object key) {
         final int firstTableLocation = tableLocation;
         while (true) {
             final int positionValue = mainOutputPosition.getUnsafe(tableLocation);
-            if (positionValue == EMPTY_OUTPUT_POSITION) {
+            if (isStateEmpty(positionValue)) {
                 return UNKNOWN_ROW;
             }
             if (eq(mainKeySource0.getUnsafe(tableLocation), k0)) {
diff --git a/engine/table/src/main/java/io/deephaven/engine/table/impl/by/typed/staticopenagg/gen/StaticAggOpenHasherDoubleByte.java b/engine/table/src/main/java/io/deephaven/engine/table/impl/by/typed/staticopenagg/gen/StaticAggOpenHasherDoubleByte.java
index 259096a8f6c..ae9df31c55c 100644
--- a/engine/table/src/main/java/io/deephaven/engine/table/impl/by/typed/staticopenagg/gen/StaticAggOpenHasherDoubleByte.java
+++ b/engine/table/src/main/java/io/deephaven/engine/table/impl/by/typed/staticopenagg/gen/StaticAggOpenHasherDoubleByte.java
@@ -60,7 +60,7 @@ protected void build(RowSequence rowSequence, Chunk[] sourceKeyChunks) {
             int tableLocation = firstTableLocation;
             while (true) {
                 int outputPosition = mainOutputPosition.getUnsafe(tableLocation);
-                if (outputPosition == EMPTY_OUTPUT_POSITION) {
+                if (isStateEmpty(outputPosition)) {
                     numEntries++;
                     mainKeySource0.set(tableLocation, k0);
                     mainKeySource1.set(tableLocation, k1);
@@ -86,6 +86,10 @@ private static int hash(double k0, byte k1) {
         return hash;
     }
 
+    private static boolean isStateEmpty(int state) {
+        return state == EMPTY_OUTPUT_POSITION;
+    }
+
     @Override
     protected void rehashInternalFull(final int oldSize) {
         final double[] destKeyArray0 = new double[tableSize];
@@ -100,7 +104,7 @@ protected void rehashInternalFull(final int oldSize) {
         mainOutputPosition.setArray(destState);
         for (int sourceBucket = 0; sourceBucket < oldSize; ++sourceBucket) {
             final int currentStateValue = originalStateArray[sourceBucket];
-            if (currentStateValue == EMPTY_OUTPUT_POSITION) {
+            if (isStateEmpty(currentStateValue)) {
                 continue;
             }
             final double k0 = originalKeyArray0[sourceBucket];
@@ -109,7 +113,7 @@ protected void rehashInternalFull(final int oldSize) {
             final int firstDestinationTableLocation = hashToTableLocation(hash);
             int destinationTableLocation = firstDestinationTableLocation;
             while (true) {
-                if (destState[destinationTableLocation] == EMPTY_OUTPUT_POSITION) {
+                if (isStateEmpty(destState[destinationTableLocation])) {
                     destKeyArray0[destinationTableLocation] = k0;
                     destKeyArray1[destinationTableLocation] = k1;
                     destState[destinationTableLocation] = originalStateArray[sourceBucket];
@@ -134,7 +138,7 @@ public int findPositionForKey(Object key) {
         final int firstTableLocation = tableLocation;
         while (true) {
             final int positionValue = mainOutputPosition.getUnsafe(tableLocation);
-            if (positionValue == EMPTY_OUTPUT_POSITION) {
+            if (isStateEmpty(positionValue)) {
                 return UNKNOWN_ROW;
             }
             if (eq(mainKeySource0.getUnsafe(tableLocation), k0) && eq(mainKeySource1.getUnsafe(tableLocation), k1)) {
diff --git a/engine/table/src/main/java/io/deephaven/engine/table/impl/by/typed/staticopenagg/gen/StaticAggOpenHasherDoubleChar.java b/engine/table/src/main/java/io/deephaven/engine/table/impl/by/typed/staticopenagg/gen/StaticAggOpenHasherDoubleChar.java
index 0558bda424e..5cb1a66ee0f 100644
--- a/engine/table/src/main/java/io/deephaven/engine/table/impl/by/typed/staticopenagg/gen/StaticAggOpenHasherDoubleChar.java
+++ b/engine/table/src/main/java/io/deephaven/engine/table/impl/by/typed/staticopenagg/gen/StaticAggOpenHasherDoubleChar.java
@@ -60,7 +60,7 @@ protected void build(RowSequence rowSequence, Chunk[] sourceKeyChunks) {
             int tableLocation = firstTableLocation;
             while (true) {
                 int outputPosition = mainOutputPosition.getUnsafe(tableLocation);
-                if (outputPosition == EMPTY_OUTPUT_POSITION) {
+                if (isStateEmpty(outputPosition)) {
                     numEntries++;
                     mainKeySource0.set(tableLocation, k0);
                     mainKeySource1.set(tableLocation, k1);
@@ -86,6 +86,10 @@ private static int hash(double k0, char k1) {
         return hash;
     }
 
+    private static boolean isStateEmpty(int state) {
+        return state == EMPTY_OUTPUT_POSITION;
+    }
+
     @Override
     protected void rehashInternalFull(final int oldSize) {
         final double[] destKeyArray0 = new double[tableSize];
@@ -100,7 +104,7 @@ protected void rehashInternalFull(final int oldSize) {
         mainOutputPosition.setArray(destState);
         for (int sourceBucket = 0; sourceBucket < oldSize; ++sourceBucket) {
             final int currentStateValue = originalStateArray[sourceBucket];
-            if (currentStateValue == EMPTY_OUTPUT_POSITION) {
+            if (isStateEmpty(currentStateValue)) {
                 continue;
             }
             final double k0 = originalKeyArray0[sourceBucket];
@@ -109,7 +113,7 @@ protected void rehashInternalFull(final int oldSize) {
             final int firstDestinationTableLocation = hashToTableLocation(hash);
             int destinationTableLocation = firstDestinationTableLocation;
             while (true) {
-                if (destState[destinationTableLocation] == EMPTY_OUTPUT_POSITION) {
+                if (isStateEmpty(destState[destinationTableLocation])) {
                     destKeyArray0[destinationTableLocation] = k0;
                     destKeyArray1[destinationTableLocation] = k1;
                     destState[destinationTableLocation] = originalStateArray[sourceBucket];
@@ -134,7 +138,7 @@ public int findPositionForKey(Object key) {
         final int firstTableLocation = tableLocation;
         while (true) {
             final int positionValue = mainOutputPosition.getUnsafe(tableLocation);
-            if (positionValue == EMPTY_OUTPUT_POSITION) {
+            if (isStateEmpty(positionValue)) {
                 return UNKNOWN_ROW;
             }
             if (eq(mainKeySource0.getUnsafe(tableLocation), k0) && eq(mainKeySource1.getUnsafe(tableLocation), k1)) {
diff --git a/engine/table/src/main/java/io/deephaven/engine/table/impl/by/typed/staticopenagg/gen/StaticAggOpenHasherDoubleDouble.java b/engine/table/src/main/java/io/deephaven/engine/table/impl/by/typed/staticopenagg/gen/StaticAggOpenHasherDoubleDouble.java
index 26ad5e9bea0..93defe22279 100644
--- a/engine/table/src/main/java/io/deephaven/engine/table/impl/by/typed/staticopenagg/gen/StaticAggOpenHasherDoubleDouble.java
+++ b/engine/table/src/main/java/io/deephaven/engine/table/impl/by/typed/staticopenagg/gen/StaticAggOpenHasherDoubleDouble.java
@@ -55,7 +55,7 @@ protected void build(RowSequence rowSequence, Chunk[] sourceKeyChunks) {
             int tableLocation = firstTableLocation;
             while (true) {
                 int outputPosition = mainOutputPosition.getUnsafe(tableLocation);
-                if (outputPosition == EMPTY_OUTPUT_POSITION) {
+                if (isStateEmpty(outputPosition)) {
                     numEntries++;
                     mainKeySource0.set(tableLocation, k0);
                     mainKeySource1.set(tableLocation, k1);
@@ -81,6 +81,10 @@ private static int hash(double k0, double k1) {
         return hash;
     }
 
+    private static boolean isStateEmpty(int state) {
+        return state == EMPTY_OUTPUT_POSITION;
+    }
+
     @Override
     protected void rehashInternalFull(final int oldSize) {
         final double[] destKeyArray0 = new double[tableSize];
@@ -95,7 +99,7 @@ protected void rehashInternalFull(final int oldSize) {
         mainOutputPosition.setArray(destState);
         for (int sourceBucket = 0; sourceBucket < oldSize; ++sourceBucket) {
             final int currentStateValue = originalStateArray[sourceBucket];
-            if (currentStateValue == EMPTY_OUTPUT_POSITION) {
+            if (isStateEmpty(currentStateValue)) {
                 continue;
             }
             final double k0 = originalKeyArray0[sourceBucket];
@@ -104,7 +108,7 @@ protected void rehashInternalFull(final int oldSize) {
             final int firstDestinationTableLocation = hashToTableLocation(hash);
             int destinationTableLocation = firstDestinationTableLocation;
             while (true) {
-                if (destState[destinationTableLocation] == EMPTY_OUTPUT_POSITION) {
+                if (isStateEmpty(destState[destinationTableLocation])) {
                     destKeyArray0[destinationTableLocation] = k0;
                     destKeyArray1[destinationTableLocation] = k1;
                     destState[destinationTableLocation] = originalStateArray[sourceBucket];
@@ -129,7 +133,7 @@ public int findPositionForKey(Object key) {
         final int firstTableLocation = tableLocation;
         while (true) {
             final int positionValue = mainOutputPosition.getUnsafe(tableLocation);
-            if (positionValue == EMPTY_OUTPUT_POSITION) {
+            if (isStateEmpty(positionValue)) {
                 return UNKNOWN_ROW;
             }
             if (eq(mainKeySource0.getUnsafe(tableLocation), k0) && eq(mainKeySource1.getUnsafe(tableLocation), k1)) {
diff --git a/engine/table/src/main/java/io/deephaven/engine/table/impl/by/typed/staticopenagg/gen/StaticAggOpenHasherDoubleFloat.java b/engine/table/src/main/java/io/deephaven/engine/table/impl/by/typed/staticopenagg/gen/StaticAggOpenHasherDoubleFloat.java
index 78c0e59666a..2692c1d328b 100644
--- a/engine/table/src/main/java/io/deephaven/engine/table/impl/by/typed/staticopenagg/gen/StaticAggOpenHasherDoubleFloat.java
+++ b/engine/table/src/main/java/io/deephaven/engine/table/impl/by/typed/staticopenagg/gen/StaticAggOpenHasherDoubleFloat.java
@@ -60,7 +60,7 @@ protected void build(RowSequence rowSequence, Chunk[] sourceKeyChunks) {
             int tableLocation = firstTableLocation;
             while (true) {
                 int outputPosition = mainOutputPosition.getUnsafe(tableLocation);
-                if (outputPosition == EMPTY_OUTPUT_POSITION) {
+                if (isStateEmpty(outputPosition)) {
                     numEntries++;
                     mainKeySource0.set(tableLocation, k0);
                     mainKeySource1.set(tableLocation, k1);
@@ -86,6 +86,10 @@ private static int hash(double k0, float k1) {
         return hash;
     }
 
+    private static boolean isStateEmpty(int state) {
+        return state == EMPTY_OUTPUT_POSITION;
+    }
+
     @Override
     protected void rehashInternalFull(final int oldSize) {
         final double[] destKeyArray0 = new double[tableSize];
@@ -100,7 +104,7 @@ protected void rehashInternalFull(final int oldSize) {
         mainOutputPosition.setArray(destState);
         for (int sourceBucket = 0; sourceBucket < oldSize; ++sourceBucket) {
             final int currentStateValue = originalStateArray[sourceBucket];
-            if (currentStateValue == EMPTY_OUTPUT_POSITION) {
+            if (isStateEmpty(currentStateValue)) {
                 continue;
             }
             final double k0 = originalKeyArray0[sourceBucket];
@@ -109,7 +113,7 @@ protected void rehashInternalFull(final int oldSize) {
             final int firstDestinationTableLocation = hashToTableLocation(hash);
             int destinationTableLocation = firstDestinationTableLocation;
             while (true) {
-                if (destState[destinationTableLocation] == EMPTY_OUTPUT_POSITION) {
+                if (isStateEmpty(destState[destinationTableLocation])) {
                     destKeyArray0[destinationTableLocation] = k0;
                     destKeyArray1[destinationTableLocation] = k1;
                     destState[destinationTableLocation] = originalStateArray[sourceBucket];
@@ -134,7 +138,7 @@ public int findPositionForKey(Object key) {
         final int firstTableLocation = tableLocation;
         while (true) {
             final int positionValue = mainOutputPosition.getUnsafe(tableLocation);
-            if (positionValue == EMPTY_OUTPUT_POSITION) {
+            if (isStateEmpty(positionValue)) {
                 return UNKNOWN_ROW;
             }
             if (eq(mainKeySource0.getUnsafe(tableLocation), k0) && eq(mainKeySource1.getUnsafe(tableLocation), k1)) {
diff --git a/engine/table/src/main/java/io/deephaven/engine/table/impl/by/typed/staticopenagg/gen/StaticAggOpenHasherDoubleInt.java b/engine/table/src/main/java/io/deephaven/engine/table/impl/by/typed/staticopenagg/gen/StaticAggOpenHasherDoubleInt.java
index 2f38445600d..684931a7c51 100644
--- a/engine/table/src/main/java/io/deephaven/engine/table/impl/by/typed/staticopenagg/gen/StaticAggOpenHasherDoubleInt.java
+++ b/engine/table/src/main/java/io/deephaven/engine/table/impl/by/typed/staticopenagg/gen/StaticAggOpenHasherDoubleInt.java
@@ -60,7 +60,7 @@ protected void build(RowSequence rowSequence, Chunk[] sourceKeyChunks) {
             int tableLocation = firstTableLocation;
             while (true) {
                 int outputPosition = mainOutputPosition.getUnsafe(tableLocation);
-                if (outputPosition == EMPTY_OUTPUT_POSITION) {
+                if (isStateEmpty(outputPosition)) {
                     numEntries++;
                     mainKeySource0.set(tableLocation, k0);
                     mainKeySource1.set(tableLocation, k1);
@@ -86,6 +86,10 @@ private static int hash(double k0, int k1) {
         return hash;
     }
 
+    private static boolean isStateEmpty(int state) {
+        return state == EMPTY_OUTPUT_POSITION;
+    }
+
     @Override
     protected void rehashInternalFull(final int oldSize) {
         final double[] destKeyArray0 = new double[tableSize];
@@ -100,7 +104,7 @@ protected void rehashInternalFull(final int oldSize) {
         mainOutputPosition.setArray(destState);
         for (int sourceBucket = 0; sourceBucket < oldSize; ++sourceBucket) {
             final int currentStateValue = originalStateArray[sourceBucket];
-            if (currentStateValue == EMPTY_OUTPUT_POSITION) {
+            if (isStateEmpty(currentStateValue)) {
                 continue;
             }
             final double k0 = originalKeyArray0[sourceBucket];
@@ -109,7 +113,7 @@ protected void rehashInternalFull(final int oldSize) {
             final int firstDestinationTableLocation = hashToTableLocation(hash);
             int destinationTableLocation = firstDestinationTableLocation;
             while (true) {
-                if (destState[destinationTableLocation] == EMPTY_OUTPUT_POSITION) {
+                if (isStateEmpty(destState[destinationTableLocation])) {
                     destKeyArray0[destinationTableLocation] = k0;
                     destKeyArray1[destinationTableLocation] = k1;
                     destState[destinationTableLocation] = originalStateArray[sourceBucket];
@@ -134,7 +138,7 @@ public int findPositionForKey(Object key) {
         final int firstTableLocation = tableLocation;
         while (true) {
             final int positionValue = mainOutputPosition.getUnsafe(tableLocation);
-            if (positionValue == EMPTY_OUTPUT_POSITION) {
+            if (isStateEmpty(positionValue)) {
                 return UNKNOWN_ROW;
             }
             if (eq(mainKeySource0.getUnsafe(tableLocation), k0) && eq(mainKeySource1.getUnsafe(tableLocation), k1)) {
diff --git a/engine/table/src/main/java/io/deephaven/engine/table/impl/by/typed/staticopenagg/gen/StaticAggOpenHasherDoubleLong.java b/engine/table/src/main/java/io/deephaven/engine/table/impl/by/typed/staticopenagg/gen/StaticAggOpenHasherDoubleLong.java
index 0774e8ef94c..414fda28dad 100644
--- a/engine/table/src/main/java/io/deephaven/engine/table/impl/by/typed/staticopenagg/gen/StaticAggOpenHasherDoubleLong.java
+++ b/engine/table/src/main/java/io/deephaven/engine/table/impl/by/typed/staticopenagg/gen/StaticAggOpenHasherDoubleLong.java
@@ -60,7 +60,7 @@ protected void build(RowSequence rowSequence, Chunk[] sourceKeyChunks) {
             int tableLocation = firstTableLocation;
             while (true) {
                 int outputPosition = mainOutputPosition.getUnsafe(tableLocation);
-                if (outputPosition == EMPTY_OUTPUT_POSITION) {
+                if (isStateEmpty(outputPosition)) {
                     numEntries++;
                     mainKeySource0.set(tableLocation, k0);
                     mainKeySource1.set(tableLocation, k1);
@@ -86,6 +86,10 @@ private static int hash(double k0, long k1) {
         return hash;
     }
 
+    private static boolean isStateEmpty(int state) {
+        return state == EMPTY_OUTPUT_POSITION;
+    }
+
     @Override
     protected void rehashInternalFull(final int oldSize) {
         final double[] destKeyArray0 = new double[tableSize];
@@ -100,7 +104,7 @@ protected void rehashInternalFull(final int oldSize) {
         mainOutputPosition.setArray(destState);
         for (int sourceBucket = 0; sourceBucket < oldSize; ++sourceBucket) {
             final int currentStateValue = originalStateArray[sourceBucket];
-            if (currentStateValue == EMPTY_OUTPUT_POSITION) {
+            if (isStateEmpty(currentStateValue)) {
                 continue;
             }
             final double k0 = originalKeyArray0[sourceBucket];
@@ -109,7 +113,7 @@ protected void rehashInternalFull(final int oldSize) {
             final int firstDestinationTableLocation = hashToTableLocation(hash);
             int destinationTableLocation = firstDestinationTableLocation;
             while (true) {
-                if (destState[destinationTableLocation] == EMPTY_OUTPUT_POSITION) {
+                if (isStateEmpty(destState[destinationTableLocation])) {
                     destKeyArray0[destinationTableLocation] = k0;
                     destKeyArray1[destinationTableLocation] = k1;
                     destState[destinationTableLocation] = originalStateArray[sourceBucket];
@@ -134,7 +138,7 @@ public int findPositionForKey(Object key) {
         final int firstTableLocation = tableLocation;
         while (true) {
             final int positionValue = mainOutputPosition.getUnsafe(tableLocation);
-            if (positionValue == EMPTY_OUTPUT_POSITION) {
+            if (isStateEmpty(positionValue)) {
                 return UNKNOWN_ROW;
             }
             if (eq(mainKeySource0.getUnsafe(tableLocation), k0) && eq(mainKeySource1.getUnsafe(tableLocation), k1)) {
diff --git a/engine/table/src/main/java/io/deephaven/engine/table/impl/by/typed/staticopenagg/gen/StaticAggOpenHasherDoubleObject.java b/engine/table/src/main/java/io/deephaven/engine/table/impl/by/typed/staticopenagg/gen/StaticAggOpenHasherDoubleObject.java
index 7d93eef50bf..6479012896b 100644
--- a/engine/table/src/main/java/io/deephaven/engine/table/impl/by/typed/staticopenagg/gen/StaticAggOpenHasherDoubleObject.java
+++ b/engine/table/src/main/java/io/deephaven/engine/table/impl/by/typed/staticopenagg/gen/StaticAggOpenHasherDoubleObject.java
@@ -59,7 +59,7 @@ protected void build(RowSequence rowSequence, Chunk[] sourceKeyChunks) {
             int tableLocation = firstTableLocation;
             while (true) {
                 int outputPosition = mainOutputPosition.getUnsafe(tableLocation);
-                if (outputPosition == EMPTY_OUTPUT_POSITION) {
+                if (isStateEmpty(outputPosition)) {
                     numEntries++;
                     mainKeySource0.set(tableLocation, k0);
                     mainKeySource1.set(tableLocation, k1);
@@ -85,6 +85,10 @@ private static int hash(double k0, Object k1) {
         return hash;
     }
 
+    private static boolean isStateEmpty(int state) {
+        return state == EMPTY_OUTPUT_POSITION;
+    }
+
     @Override
     protected void rehashInternalFull(final int oldSize) {
         final double[] destKeyArray0 = new double[tableSize];
@@ -99,7 +103,7 @@ protected void rehashInternalFull(final int oldSize) {
         mainOutputPosition.setArray(destState);
         for (int sourceBucket = 0; sourceBucket < oldSize; ++sourceBucket) {
             final int currentStateValue = originalStateArray[sourceBucket];
-            if (currentStateValue == EMPTY_OUTPUT_POSITION) {
+            if (isStateEmpty(currentStateValue)) {
                 continue;
             }
             final double k0 = originalKeyArray0[sourceBucket];
@@ -108,7 +112,7 @@ protected void rehashInternalFull(final int oldSize) {
             final int firstDestinationTableLocation = hashToTableLocation(hash);
             int destinationTableLocation = firstDestinationTableLocation;
             while (true) {
-                if (destState[destinationTableLocation] == EMPTY_OUTPUT_POSITION) {
+                if (isStateEmpty(destState[destinationTableLocation])) {
                     destKeyArray0[destinationTableLocation] = k0;
                     destKeyArray1[destinationTableLocation] = k1;
                     destState[destinationTableLocation] = originalStateArray[sourceBucket];
@@ -133,7 +137,7 @@ public int findPositionForKey(Object key) {
         final int firstTableLocation = tableLocation;
         while (true) {
             final int positionValue = mainOutputPosition.getUnsafe(tableLocation);
-            if (positionValue == EMPTY_OUTPUT_POSITION) {
+            if (isStateEmpty(positionValue)) {
                 return UNKNOWN_ROW;
             }
             if (eq(mainKeySource0.getUnsafe(tableLocation), k0) && eq(mainKeySource1.getUnsafe(tableLocation), k1)) {
diff --git a/engine/table/src/main/java/io/deephaven/engine/table/impl/by/typed/staticopenagg/gen/StaticAggOpenHasherDoubleShort.java b/engine/table/src/main/java/io/deephaven/engine/table/impl/by/typed/staticopenagg/gen/StaticAggOpenHasherDoubleShort.java
index ddc3ce7a977..5a8daf23f58 100644
--- a/engine/table/src/main/java/io/deephaven/engine/table/impl/by/typed/staticopenagg/gen/StaticAggOpenHasherDoubleShort.java
+++ b/engine/table/src/main/java/io/deephaven/engine/table/impl/by/typed/staticopenagg/gen/StaticAggOpenHasherDoubleShort.java
@@ -60,7 +60,7 @@ protected void build(RowSequence rowSequence, Chunk[] sourceKeyChunks) {
             int tableLocation = firstTableLocation;
             while (true) {
                 int outputPosition = mainOutputPosition.getUnsafe(tableLocation);
-                if (outputPosition == EMPTY_OUTPUT_POSITION) {
+                if (isStateEmpty(outputPosition)) {
                     numEntries++;
                     mainKeySource0.set(tableLocation, k0);
                     mainKeySource1.set(tableLocation, k1);
@@ -86,6 +86,10 @@ private static int hash(double k0, short k1) {
         return hash;
     }
 
+    private static boolean isStateEmpty(int state) {
+        return state == EMPTY_OUTPUT_POSITION;
+    }
+
     @Override
     protected void rehashInternalFull(final int oldSize) {
         final double[] destKeyArray0 = new double[tableSize];
@@ -100,7 +104,7 @@ protected void rehashInternalFull(final int oldSize) {
         mainOutputPosition.setArray(destState);
         for (int sourceBucket = 0; sourceBucket < oldSize; ++sourceBucket) {
             final int currentStateValue = originalStateArray[sourceBucket];
-            if (currentStateValue == EMPTY_OUTPUT_POSITION) {
+            if (isStateEmpty(currentStateValue)) {
                 continue;
             }
             final double k0 = originalKeyArray0[sourceBucket];
@@ -109,7 +113,7 @@ protected void rehashInternalFull(final int oldSize) {
             final int firstDestinationTableLocation = hashToTableLocation(hash);
             int destinationTableLocation = firstDestinationTableLocation;
             while (true) {
-                if (destState[destinationTableLocation] == EMPTY_OUTPUT_POSITION) {
+                if (isStateEmpty(destState[destinationTableLocation])) {
                     destKeyArray0[destinationTableLocation] = k0;
                     destKeyArray1[destinationTableLocation] = k1;
                     destState[destinationTableLocation] = originalStateArray[sourceBucket];
@@ -134,7 +138,7 @@ public int findPositionForKey(Object key) {
         final int firstTableLocation = tableLocation;
         while (true) {
             final int positionValue = mainOutputPosition.getUnsafe(tableLocation);
-            if (positionValue == EMPTY_OUTPUT_POSITION) {
+            if (isStateEmpty(positionValue)) {
                 return UNKNOWN_ROW;
             }
             if (eq(mainKeySource0.getUnsafe(tableLocation), k0) && eq(mainKeySource1.getUnsafe(tableLocation), k1)) {
diff --git a/engine/table/src/main/java/io/deephaven/engine/table/impl/by/typed/staticopenagg/gen/StaticAggOpenHasherFloat.java b/engine/table/src/main/java/io/deephaven/engine/table/impl/by/typed/staticopenagg/gen/StaticAggOpenHasherFloat.java
index 21aa6744e73..b22c18e5b2d 100644
--- a/engine/table/src/main/java/io/deephaven/engine/table/impl/by/typed/staticopenagg/gen/StaticAggOpenHasherFloat.java
+++ b/engine/table/src/main/java/io/deephaven/engine/table/impl/by/typed/staticopenagg/gen/StaticAggOpenHasherFloat.java
@@ -49,7 +49,7 @@ protected void build(RowSequence rowSequence, Chunk[] sourceKeyChunks) {
             int tableLocation = firstTableLocation;
             while (true) {
                 int outputPosition = mainOutputPosition.getUnsafe(tableLocation);
-                if (outputPosition == EMPTY_OUTPUT_POSITION) {
+                if (isStateEmpty(outputPosition)) {
                     numEntries++;
                     mainKeySource0.set(tableLocation, k0);
                     outputPosition = nextOutputPosition.getAndIncrement();
@@ -73,6 +73,10 @@ private static int hash(float k0) {
         return hash;
     }
 
+    private static boolean isStateEmpty(int state) {
+        return state == EMPTY_OUTPUT_POSITION;
+    }
+
     @Override
     protected void rehashInternalFull(final int oldSize) {
         final float[] destKeyArray0 = new float[tableSize];
@@ -84,7 +88,7 @@ protected void rehashInternalFull(final int oldSize) {
         mainOutputPosition.setArray(destState);
         for (int sourceBucket = 0; sourceBucket < oldSize; ++sourceBucket) {
             final int currentStateValue = originalStateArray[sourceBucket];
-            if (currentStateValue == EMPTY_OUTPUT_POSITION) {
+            if (isStateEmpty(currentStateValue)) {
                 continue;
             }
             final float k0 = originalKeyArray0[sourceBucket];
@@ -92,7 +96,7 @@ protected void rehashInternalFull(final int oldSize) {
             final int firstDestinationTableLocation = hashToTableLocation(hash);
             int destinationTableLocation = firstDestinationTableLocation;
             while (true) {
-                if (destState[destinationTableLocation] == EMPTY_OUTPUT_POSITION) {
+                if (isStateEmpty(destState[destinationTableLocation])) {
                     destKeyArray0[destinationTableLocation] = k0;
                     destState[destinationTableLocation] = originalStateArray[sourceBucket];
                     if (sourceBucket != destinationTableLocation) {
@@ -114,7 +118,7 @@ public int findPositionForKey(Object key) {
         final int firstTableLocation = tableLocation;
         while (true) {
             final int positionValue = mainOutputPosition.getUnsafe(tableLocation);
-            if (positionValue == EMPTY_OUTPUT_POSITION) {
+            if (isStateEmpty(positionValue)) {
                 return UNKNOWN_ROW;
             }
             if (eq(mainKeySource0.getUnsafe(tableLocation), k0)) {
diff --git a/engine/table/src/main/java/io/deephaven/engine/table/impl/by/typed/staticopenagg/gen/StaticAggOpenHasherFloatByte.java b/engine/table/src/main/java/io/deephaven/engine/table/impl/by/typed/staticopenagg/gen/StaticAggOpenHasherFloatByte.java
index e2ca9259a89..65f3d6bc073 100644
--- a/engine/table/src/main/java/io/deephaven/engine/table/impl/by/typed/staticopenagg/gen/StaticAggOpenHasherFloatByte.java
+++ b/engine/table/src/main/java/io/deephaven/engine/table/impl/by/typed/staticopenagg/gen/StaticAggOpenHasherFloatByte.java
@@ -60,7 +60,7 @@ protected void build(RowSequence rowSequence, Chunk[] sourceKeyChunks) {
             int tableLocation = firstTableLocation;
             while (true) {
                 int outputPosition = mainOutputPosition.getUnsafe(tableLocation);
-                if (outputPosition == EMPTY_OUTPUT_POSITION) {
+                if (isStateEmpty(outputPosition)) {
                     numEntries++;
                     mainKeySource0.set(tableLocation, k0);
                     mainKeySource1.set(tableLocation, k1);
@@ -86,6 +86,10 @@ private static int hash(float k0, byte k1) {
         return hash;
     }
 
+    private static boolean isStateEmpty(int state) {
+        return state == EMPTY_OUTPUT_POSITION;
+    }
+
     @Override
     protected void rehashInternalFull(final int oldSize) {
         final float[] destKeyArray0 = new float[tableSize];
@@ -100,7 +104,7 @@ protected void rehashInternalFull(final int oldSize) {
         mainOutputPosition.setArray(destState);
         for (int sourceBucket = 0; sourceBucket < oldSize; ++sourceBucket) {
             final int currentStateValue = originalStateArray[sourceBucket];
-            if (currentStateValue == EMPTY_OUTPUT_POSITION) {
+            if (isStateEmpty(currentStateValue)) {
                 continue;
             }
             final float k0 = originalKeyArray0[sourceBucket];
@@ -109,7 +113,7 @@ protected void rehashInternalFull(final int oldSize) {
             final int firstDestinationTableLocation = hashToTableLocation(hash);
             int destinationTableLocation = firstDestinationTableLocation;
             while (true) {
-                if (destState[destinationTableLocation] == EMPTY_OUTPUT_POSITION) {
+                if (isStateEmpty(destState[destinationTableLocation])) {
                     destKeyArray0[destinationTableLocation] = k0;
                     destKeyArray1[destinationTableLocation] = k1;
                     destState[destinationTableLocation] = originalStateArray[sourceBucket];
@@ -134,7 +138,7 @@ public int findPositionForKey(Object key) {
         final int firstTableLocation = tableLocation;
         while (true) {
             final int positionValue = mainOutputPosition.getUnsafe(tableLocation);
-            if (positionValue == EMPTY_OUTPUT_POSITION) {
+            if (isStateEmpty(positionValue)) {
                 return UNKNOWN_ROW;
             }
             if (eq(mainKeySource0.getUnsafe(tableLocation), k0) && eq(mainKeySource1.getUnsafe(tableLocation), k1)) {
diff --git a/engine/table/src/main/java/io/deephaven/engine/table/impl/by/typed/staticopenagg/gen/StaticAggOpenHasherFloatChar.java b/engine/table/src/main/java/io/deephaven/engine/table/impl/by/typed/staticopenagg/gen/StaticAggOpenHasherFloatChar.java
index 5afb0cceb17..6adc9b46eaa 100644
--- a/engine/table/src/main/java/io/deephaven/engine/table/impl/by/typed/staticopenagg/gen/StaticAggOpenHasherFloatChar.java
+++ b/engine/table/src/main/java/io/deephaven/engine/table/impl/by/typed/staticopenagg/gen/StaticAggOpenHasherFloatChar.java
@@ -60,7 +60,7 @@ protected void build(RowSequence rowSequence, Chunk[] sourceKeyChunks) {
             int tableLocation = firstTableLocation;
             while (true) {
                 int outputPosition = mainOutputPosition.getUnsafe(tableLocation);
-                if (outputPosition == EMPTY_OUTPUT_POSITION) {
+                if (isStateEmpty(outputPosition)) {
                     numEntries++;
                     mainKeySource0.set(tableLocation, k0);
                     mainKeySource1.set(tableLocation, k1);
@@ -86,6 +86,10 @@ private static int hash(float k0, char k1) {
         return hash;
     }
 
+    private static boolean isStateEmpty(int state) {
+        return state == EMPTY_OUTPUT_POSITION;
+    }
+
     @Override
     protected void rehashInternalFull(final int oldSize) {
         final float[] destKeyArray0 = new float[tableSize];
@@ -100,7 +104,7 @@ protected void rehashInternalFull(final int oldSize) {
         mainOutputPosition.setArray(destState);
         for (int sourceBucket = 0; sourceBucket < oldSize; ++sourceBucket) {
             final int currentStateValue = originalStateArray[sourceBucket];
-            if (currentStateValue == EMPTY_OUTPUT_POSITION) {
+            if (isStateEmpty(currentStateValue)) {
                 continue;
             }
             final float k0 = originalKeyArray0[sourceBucket];
@@ -109,7 +113,7 @@ protected void rehashInternalFull(final int oldSize) {
             final int firstDestinationTableLocation = hashToTableLocation(hash);
             int destinationTableLocation = firstDestinationTableLocation;
             while (true) {
-                if (destState[destinationTableLocation] == EMPTY_OUTPUT_POSITION) {
+                if (isStateEmpty(destState[destinationTableLocation])) {
                     destKeyArray0[destinationTableLocation] = k0;
                     destKeyArray1[destinationTableLocation] = k1;
                     destState[destinationTableLocation] = originalStateArray[sourceBucket];
@@ -134,7 +138,7 @@ public int findPositionForKey(Object key) {
         final int firstTableLocation = tableLocation;
         while (true) {
             final int positionValue = mainOutputPosition.getUnsafe(tableLocation);
-            if (positionValue == EMPTY_OUTPUT_POSITION) {
+            if (isStateEmpty(positionValue)) {
                 return UNKNOWN_ROW;
             }
             if (eq(mainKeySource0.getUnsafe(tableLocation), k0) && eq(mainKeySource1.getUnsafe(tableLocation), k1)) {
diff --git a/engine/table/src/main/java/io/deephaven/engine/table/impl/by/typed/staticopenagg/gen/StaticAggOpenHasherFloatDouble.java b/engine/table/src/main/java/io/deephaven/engine/table/impl/by/typed/staticopenagg/gen/StaticAggOpenHasherFloatDouble.java
index f53d24ae838..856fac33f19 100644
--- a/engine/table/src/main/java/io/deephaven/engine/table/impl/by/typed/staticopenagg/gen/StaticAggOpenHasherFloatDouble.java
+++ b/engine/table/src/main/java/io/deephaven/engine/table/impl/by/typed/staticopenagg/gen/StaticAggOpenHasherFloatDouble.java
@@ -60,7 +60,7 @@ protected void build(RowSequence rowSequence, Chunk[] sourceKeyChunks) {
             int tableLocation = firstTableLocation;
             while (true) {
                 int outputPosition = mainOutputPosition.getUnsafe(tableLocation);
-                if (outputPosition == EMPTY_OUTPUT_POSITION) {
+                if (isStateEmpty(outputPosition)) {
                     numEntries++;
                     mainKeySource0.set(tableLocation, k0);
                     mainKeySource1.set(tableLocation, k1);
@@ -86,6 +86,10 @@ private static int hash(float k0, double k1) {
         return hash;
     }
 
+    private static boolean isStateEmpty(int state) {
+        return state == EMPTY_OUTPUT_POSITION;
+    }
+
     @Override
     protected void rehashInternalFull(final int oldSize) {
         final float[] destKeyArray0 = new float[tableSize];
@@ -100,7 +104,7 @@ protected void rehashInternalFull(final int oldSize) {
         mainOutputPosition.setArray(destState);
         for (int sourceBucket = 0; sourceBucket < oldSize; ++sourceBucket) {
             final int currentStateValue = originalStateArray[sourceBucket];
-            if (currentStateValue == EMPTY_OUTPUT_POSITION) {
+            if (isStateEmpty(currentStateValue)) {
                 continue;
             }
             final float k0 = originalKeyArray0[sourceBucket];
@@ -109,7 +113,7 @@ protected void rehashInternalFull(final int oldSize) {
             final int firstDestinationTableLocation = hashToTableLocation(hash);
             int destinationTableLocation = firstDestinationTableLocation;
             while (true) {
-                if (destState[destinationTableLocation] == EMPTY_OUTPUT_POSITION) {
+                if (isStateEmpty(destState[destinationTableLocation])) {
                     destKeyArray0[destinationTableLocation] = k0;
                     destKeyArray1[destinationTableLocation] = k1;
                     destState[destinationTableLocation] = originalStateArray[sourceBucket];
@@ -134,7 +138,7 @@ public int findPositionForKey(Object key) {
         final int firstTableLocation = tableLocation;
         while (true) {
             final int positionValue = mainOutputPosition.getUnsafe(tableLocation);
-            if (positionValue == EMPTY_OUTPUT_POSITION) {
+            if (isStateEmpty(positionValue)) {
                 return UNKNOWN_ROW;
             }
             if (eq(mainKeySource0.getUnsafe(tableLocation), k0) && eq(mainKeySource1.getUnsafe(tableLocation), k1)) {
diff --git a/engine/table/src/main/java/io/deephaven/engine/table/impl/by/typed/staticopenagg/gen/StaticAggOpenHasherFloatFloat.java b/engine/table/src/main/java/io/deephaven/engine/table/impl/by/typed/staticopenagg/gen/StaticAggOpenHasherFloatFloat.java
index 3b4d13209c0..009dd3e4547 100644
--- a/engine/table/src/main/java/io/deephaven/engine/table/impl/by/typed/staticopenagg/gen/StaticAggOpenHasherFloatFloat.java
+++ b/engine/table/src/main/java/io/deephaven/engine/table/impl/by/typed/staticopenagg/gen/StaticAggOpenHasherFloatFloat.java
@@ -55,7 +55,7 @@ protected void build(RowSequence rowSequence, Chunk[] sourceKeyChunks) {
             int tableLocation = firstTableLocation;
             while (true) {
                 int outputPosition = mainOutputPosition.getUnsafe(tableLocation);
-                if (outputPosition == EMPTY_OUTPUT_POSITION) {
+                if (isStateEmpty(outputPosition)) {
                     numEntries++;
                     mainKeySource0.set(tableLocation, k0);
                     mainKeySource1.set(tableLocation, k1);
@@ -81,6 +81,10 @@ private static int hash(float k0, float k1) {
         return hash;
     }
 
+    private static boolean isStateEmpty(int state) {
+        return state == EMPTY_OUTPUT_POSITION;
+    }
+
     @Override
     protected void rehashInternalFull(final int oldSize) {
         final float[] destKeyArray0 = new float[tableSize];
@@ -95,7 +99,7 @@ protected void rehashInternalFull(final int oldSize) {
         mainOutputPosition.setArray(destState);
         for (int sourceBucket = 0; sourceBucket < oldSize; ++sourceBucket) {
             final int currentStateValue = originalStateArray[sourceBucket];
-            if (currentStateValue == EMPTY_OUTPUT_POSITION) {
+            if (isStateEmpty(currentStateValue)) {
                 continue;
             }
             final float k0 = originalKeyArray0[sourceBucket];
@@ -104,7 +108,7 @@ protected void rehashInternalFull(final int oldSize) {
             final int firstDestinationTableLocation = hashToTableLocation(hash);
             int destinationTableLocation = firstDestinationTableLocation;
             while (true) {
-                if (destState[destinationTableLocation] == EMPTY_OUTPUT_POSITION) {
+                if (isStateEmpty(destState[destinationTableLocation])) {
                     destKeyArray0[destinationTableLocation] = k0;
                     destKeyArray1[destinationTableLocation] = k1;
                     destState[destinationTableLocation] = originalStateArray[sourceBucket];
@@ -129,7 +133,7 @@ public int findPositionForKey(Object key) {
         final int firstTableLocation = tableLocation;
         while (true) {
             final int positionValue = mainOutputPosition.getUnsafe(tableLocation);
-            if (positionValue == EMPTY_OUTPUT_POSITION) {
+            if (isStateEmpty(positionValue)) {
                 return UNKNOWN_ROW;
             }
             if (eq(mainKeySource0.getUnsafe(tableLocation), k0) && eq(mainKeySource1.getUnsafe(tableLocation), k1)) {
diff --git a/engine/table/src/main/java/io/deephaven/engine/table/impl/by/typed/staticopenagg/gen/StaticAggOpenHasherFloatInt.java b/engine/table/src/main/java/io/deephaven/engine/table/impl/by/typed/staticopenagg/gen/StaticAggOpenHasherFloatInt.java
index 1b35739c0a5..2f043d3d0da 100644
--- a/engine/table/src/main/java/io/deephaven/engine/table/impl/by/typed/staticopenagg/gen/StaticAggOpenHasherFloatInt.java
+++ b/engine/table/src/main/java/io/deephaven/engine/table/impl/by/typed/staticopenagg/gen/StaticAggOpenHasherFloatInt.java
@@ -60,7 +60,7 @@ protected void build(RowSequence rowSequence, Chunk[] sourceKeyChunks) {
             int tableLocation = firstTableLocation;
             while (true) {
                 int outputPosition = mainOutputPosition.getUnsafe(tableLocation);
-                if (outputPosition == EMPTY_OUTPUT_POSITION) {
+                if (isStateEmpty(outputPosition)) {
                     numEntries++;
                     mainKeySource0.set(tableLocation, k0);
                     mainKeySource1.set(tableLocation, k1);
@@ -86,6 +86,10 @@ private static int hash(float k0, int k1) {
         return hash;
     }
 
+    private static boolean isStateEmpty(int state) {
+        return state == EMPTY_OUTPUT_POSITION;
+    }
+
     @Override
     protected void rehashInternalFull(final int oldSize) {
         final float[] destKeyArray0 = new float[tableSize];
@@ -100,7 +104,7 @@ protected void rehashInternalFull(final int oldSize) {
         mainOutputPosition.setArray(destState);
         for (int sourceBucket = 0; sourceBucket < oldSize; ++sourceBucket) {
             final int currentStateValue = originalStateArray[sourceBucket];
-            if (currentStateValue == EMPTY_OUTPUT_POSITION) {
+            if (isStateEmpty(currentStateValue)) {
                 continue;
             }
             final float k0 = originalKeyArray0[sourceBucket];
@@ -109,7 +113,7 @@ protected void rehashInternalFull(final int oldSize) {
             final int firstDestinationTableLocation = hashToTableLocation(hash);
             int destinationTableLocation = firstDestinationTableLocation;
             while (true) {
-                if (destState[destinationTableLocation] == EMPTY_OUTPUT_POSITION) {
+                if (isStateEmpty(destState[destinationTableLocation])) {
                     destKeyArray0[destinationTableLocation] = k0;
                     destKeyArray1[destinationTableLocation] = k1;
                     destState[destinationTableLocation] = originalStateArray[sourceBucket];
@@ -134,7 +138,7 @@ public int findPositionForKey(Object key) {
         final int firstTableLocation = tableLocation;
         while (true) {
             final int positionValue = mainOutputPosition.getUnsafe(tableLocation);
-            if (positionValue == EMPTY_OUTPUT_POSITION) {
+            if (isStateEmpty(positionValue)) {
                 return UNKNOWN_ROW;
             }
             if (eq(mainKeySource0.getUnsafe(tableLocation), k0) && eq(mainKeySource1.getUnsafe(tableLocation), k1)) {
diff --git a/engine/table/src/main/java/io/deephaven/engine/table/impl/by/typed/staticopenagg/gen/StaticAggOpenHasherFloatLong.java b/engine/table/src/main/java/io/deephaven/engine/table/impl/by/typed/staticopenagg/gen/StaticAggOpenHasherFloatLong.java
index fdeafc9bc02..6a586beed11 100644
--- a/engine/table/src/main/java/io/deephaven/engine/table/impl/by/typed/staticopenagg/gen/StaticAggOpenHasherFloatLong.java
+++ b/engine/table/src/main/java/io/deephaven/engine/table/impl/by/typed/staticopenagg/gen/StaticAggOpenHasherFloatLong.java
@@ -60,7 +60,7 @@ protected void build(RowSequence rowSequence, Chunk[] sourceKeyChunks) {
             int tableLocation = firstTableLocation;
             while (true) {
                 int outputPosition = mainOutputPosition.getUnsafe(tableLocation);
-                if (outputPosition == EMPTY_OUTPUT_POSITION) {
+                if (isStateEmpty(outputPosition)) {
                     numEntries++;
                     mainKeySource0.set(tableLocation, k0);
                     mainKeySource1.set(tableLocation, k1);
@@ -86,6 +86,10 @@ private static int hash(float k0, long k1) {
         return hash;
     }
 
+    private static boolean isStateEmpty(int state) {
+        return state == EMPTY_OUTPUT_POSITION;
+    }
+
     @Override
     protected void rehashInternalFull(final int oldSize) {
         final float[] destKeyArray0 = new float[tableSize];
@@ -100,7 +104,7 @@ protected void rehashInternalFull(final int oldSize) {
         mainOutputPosition.setArray(destState);
         for (int sourceBucket = 0; sourceBucket < oldSize; ++sourceBucket) {
             final int currentStateValue = originalStateArray[sourceBucket];
-            if (currentStateValue == EMPTY_OUTPUT_POSITION) {
+            if (isStateEmpty(currentStateValue)) {
                 continue;
             }
             final float k0 = originalKeyArray0[sourceBucket];
@@ -109,7 +113,7 @@ protected void rehashInternalFull(final int oldSize) {
             final int firstDestinationTableLocation = hashToTableLocation(hash);
             int destinationTableLocation = firstDestinationTableLocation;
             while (true) {
-                if (destState[destinationTableLocation] == EMPTY_OUTPUT_POSITION) {
+                if (isStateEmpty(destState[destinationTableLocation])) {
                     destKeyArray0[destinationTableLocation] = k0;
                     destKeyArray1[destinationTableLocation] = k1;
                     destState[destinationTableLocation] = originalStateArray[sourceBucket];
@@ -134,7 +138,7 @@ public int findPositionForKey(Object key) {
         final int firstTableLocation = tableLocation;
         while (true) {
             final int positionValue = mainOutputPosition.getUnsafe(tableLocation);
-            if (positionValue == EMPTY_OUTPUT_POSITION) {
+            if (isStateEmpty(positionValue)) {
                 return UNKNOWN_ROW;
             }
             if (eq(mainKeySource0.getUnsafe(tableLocation), k0) && eq(mainKeySource1.getUnsafe(tableLocation), k1)) {
diff --git a/engine/table/src/main/java/io/deephaven/engine/table/impl/by/typed/staticopenagg/gen/StaticAggOpenHasherFloatObject.java b/engine/table/src/main/java/io/deephaven/engine/table/impl/by/typed/staticopenagg/gen/StaticAggOpenHasherFloatObject.java
index 2cf76d1586a..eb0691f238b 100644
--- a/engine/table/src/main/java/io/deephaven/engine/table/impl/by/typed/staticopenagg/gen/StaticAggOpenHasherFloatObject.java
+++ b/engine/table/src/main/java/io/deephaven/engine/table/impl/by/typed/staticopenagg/gen/StaticAggOpenHasherFloatObject.java
@@ -59,7 +59,7 @@ protected void build(RowSequence rowSequence, Chunk[] sourceKeyChunks) {
             int tableLocation = firstTableLocation;
             while (true) {
                 int outputPosition = mainOutputPosition.getUnsafe(tableLocation);
-                if (outputPosition == EMPTY_OUTPUT_POSITION) {
+                if (isStateEmpty(outputPosition)) {
                     numEntries++;
                     mainKeySource0.set(tableLocation, k0);
                     mainKeySource1.set(tableLocation, k1);
@@ -85,6 +85,10 @@ private static int hash(float k0, Object k1) {
         return hash;
     }
 
+    private static boolean isStateEmpty(int state) {
+        return state == EMPTY_OUTPUT_POSITION;
+    }
+
     @Override
     protected void rehashInternalFull(final int oldSize) {
         final float[] destKeyArray0 = new float[tableSize];
@@ -99,7 +103,7 @@ protected void rehashInternalFull(final int oldSize) {
         mainOutputPosition.setArray(destState);
         for (int sourceBucket = 0; sourceBucket < oldSize; ++sourceBucket) {
             final int currentStateValue = originalStateArray[sourceBucket];
-            if (currentStateValue == EMPTY_OUTPUT_POSITION) {
+            if (isStateEmpty(currentStateValue)) {
                 continue;
             }
             final float k0 = originalKeyArray0[sourceBucket];
@@ -108,7 +112,7 @@ protected void rehashInternalFull(final int oldSize) {
             final int firstDestinationTableLocation = hashToTableLocation(hash);
             int destinationTableLocation = firstDestinationTableLocation;
             while (true) {
-                if (destState[destinationTableLocation] == EMPTY_OUTPUT_POSITION) {
+                if (isStateEmpty(destState[destinationTableLocation])) {
                     destKeyArray0[destinationTableLocation] = k0;
                     destKeyArray1[destinationTableLocation] = k1;
                     destState[destinationTableLocation] = originalStateArray[sourceBucket];
@@ -133,7 +137,7 @@ public int findPositionForKey(Object key) {
         final int firstTableLocation = tableLocation;
         while (true) {
             final int positionValue = mainOutputPosition.getUnsafe(tableLocation);
-            if (positionValue == EMPTY_OUTPUT_POSITION) {
+            if (isStateEmpty(positionValue)) {
                 return UNKNOWN_ROW;
             }
             if (eq(mainKeySource0.getUnsafe(tableLocation), k0) && eq(mainKeySource1.getUnsafe(tableLocation), k1)) {
diff --git a/engine/table/src/main/java/io/deephaven/engine/table/impl/by/typed/staticopenagg/gen/StaticAggOpenHasherFloatShort.java b/engine/table/src/main/java/io/deephaven/engine/table/impl/by/typed/staticopenagg/gen/StaticAggOpenHasherFloatShort.java
index 2e3280a8db3..d4bbc5c62a6 100644
--- a/engine/table/src/main/java/io/deephaven/engine/table/impl/by/typed/staticopenagg/gen/StaticAggOpenHasherFloatShort.java
+++ b/engine/table/src/main/java/io/deephaven/engine/table/impl/by/typed/staticopenagg/gen/StaticAggOpenHasherFloatShort.java
@@ -60,7 +60,7 @@ protected void build(RowSequence rowSequence, Chunk[] sourceKeyChunks) {
             int tableLocation = firstTableLocation;
             while (true) {
                 int outputPosition = mainOutputPosition.getUnsafe(tableLocation);
-                if (outputPosition == EMPTY_OUTPUT_POSITION) {
+                if (isStateEmpty(outputPosition)) {
                     numEntries++;
                     mainKeySource0.set(tableLocation, k0);
                     mainKeySource1.set(tableLocation, k1);
@@ -86,6 +86,10 @@ private static int hash(float k0, short k1) {
         return hash;
     }
 
+    private static boolean isStateEmpty(int state) {
+        return state == EMPTY_OUTPUT_POSITION;
+    }
+
     @Override
     protected void rehashInternalFull(final int oldSize) {
         final float[] destKeyArray0 = new float[tableSize];
@@ -100,7 +104,7 @@ protected void rehashInternalFull(final int oldSize) {
         mainOutputPosition.setArray(destState);
         for (int sourceBucket = 0; sourceBucket < oldSize; ++sourceBucket) {
             final int currentStateValue = originalStateArray[sourceBucket];
-            if (currentStateValue == EMPTY_OUTPUT_POSITION) {
+            if (isStateEmpty(currentStateValue)) {
                 continue;
             }
             final float k0 = originalKeyArray0[sourceBucket];
@@ -109,7 +113,7 @@ protected void rehashInternalFull(final int oldSize) {
             final int firstDestinationTableLocation = hashToTableLocation(hash);
             int destinationTableLocation = firstDestinationTableLocation;
             while (true) {
-                if (destState[destinationTableLocation] == EMPTY_OUTPUT_POSITION) {
+                if (isStateEmpty(destState[destinationTableLocation])) {
                     destKeyArray0[destinationTableLocation] = k0;
                     destKeyArray1[destinationTableLocation] = k1;
                     destState[destinationTableLocation] = originalStateArray[sourceBucket];
@@ -134,7 +138,7 @@ public int findPositionForKey(Object key) {
         final int firstTableLocation = tableLocation;
         while (true) {
             final int positionValue = mainOutputPosition.getUnsafe(tableLocation);
-            if (positionValue == EMPTY_OUTPUT_POSITION) {
+            if (isStateEmpty(positionValue)) {
                 return UNKNOWN_ROW;
             }
             if (eq(mainKeySource0.getUnsafe(tableLocation), k0) && eq(mainKeySource1.getUnsafe(tableLocation), k1)) {
diff --git a/engine/table/src/main/java/io/deephaven/engine/table/impl/by/typed/staticopenagg/gen/StaticAggOpenHasherInt.java b/engine/table/src/main/java/io/deephaven/engine/table/impl/by/typed/staticopenagg/gen/StaticAggOpenHasherInt.java
index 4f0fc7ce56d..e070c54f667 100644
--- a/engine/table/src/main/java/io/deephaven/engine/table/impl/by/typed/staticopenagg/gen/StaticAggOpenHasherInt.java
+++ b/engine/table/src/main/java/io/deephaven/engine/table/impl/by/typed/staticopenagg/gen/StaticAggOpenHasherInt.java
@@ -49,7 +49,7 @@ protected void build(RowSequence rowSequence, Chunk[] sourceKeyChunks) {
             int tableLocation = firstTableLocation;
             while (true) {
                 int outputPosition = mainOutputPosition.getUnsafe(tableLocation);
-                if (outputPosition == EMPTY_OUTPUT_POSITION) {
+                if (isStateEmpty(outputPosition)) {
                     numEntries++;
                     mainKeySource0.set(tableLocation, k0);
                     outputPosition = nextOutputPosition.getAndIncrement();
@@ -73,6 +73,10 @@ private static int hash(int k0) {
         return hash;
     }
 
+    private static boolean isStateEmpty(int state) {
+        return state == EMPTY_OUTPUT_POSITION;
+    }
+
     @Override
     protected void rehashInternalFull(final int oldSize) {
         final int[] destKeyArray0 = new int[tableSize];
@@ -84,7 +88,7 @@ protected void rehashInternalFull(final int oldSize) {
         mainOutputPosition.setArray(destState);
         for (int sourceBucket = 0; sourceBucket < oldSize; ++sourceBucket) {
             final int currentStateValue = originalStateArray[sourceBucket];
-            if (currentStateValue == EMPTY_OUTPUT_POSITION) {
+            if (isStateEmpty(currentStateValue)) {
                 continue;
             }
             final int k0 = originalKeyArray0[sourceBucket];
@@ -92,7 +96,7 @@ protected void rehashInternalFull(final int oldSize) {
             final int firstDestinationTableLocation = hashToTableLocation(hash);
             int destinationTableLocation = firstDestinationTableLocation;
             while (true) {
-                if (destState[destinationTableLocation] == EMPTY_OUTPUT_POSITION) {
+                if (isStateEmpty(destState[destinationTableLocation])) {
                     destKeyArray0[destinationTableLocation] = k0;
                     destState[destinationTableLocation] = originalStateArray[sourceBucket];
                     if (sourceBucket != destinationTableLocation) {
@@ -114,7 +118,7 @@ public int findPositionForKey(Object key) {
         final int firstTableLocation = tableLocation;
         while (true) {
             final int positionValue = mainOutputPosition.getUnsafe(tableLocation);
-            if (positionValue == EMPTY_OUTPUT_POSITION) {
+            if (isStateEmpty(positionValue)) {
                 return UNKNOWN_ROW;
             }
             if (eq(mainKeySource0.getUnsafe(tableLocation), k0)) {
diff --git a/engine/table/src/main/java/io/deephaven/engine/table/impl/by/typed/staticopenagg/gen/StaticAggOpenHasherIntByte.java b/engine/table/src/main/java/io/deephaven/engine/table/impl/by/typed/staticopenagg/gen/StaticAggOpenHasherIntByte.java
index 975196685a6..c16ced3add0 100644
--- a/engine/table/src/main/java/io/deephaven/engine/table/impl/by/typed/staticopenagg/gen/StaticAggOpenHasherIntByte.java
+++ b/engine/table/src/main/java/io/deephaven/engine/table/impl/by/typed/staticopenagg/gen/StaticAggOpenHasherIntByte.java
@@ -60,7 +60,7 @@ protected void build(RowSequence rowSequence, Chunk[] sourceKeyChunks) {
             int tableLocation = firstTableLocation;
             while (true) {
                 int outputPosition = mainOutputPosition.getUnsafe(tableLocation);
-                if (outputPosition == EMPTY_OUTPUT_POSITION) {
+                if (isStateEmpty(outputPosition)) {
                     numEntries++;
                     mainKeySource0.set(tableLocation, k0);
                     mainKeySource1.set(tableLocation, k1);
@@ -86,6 +86,10 @@ private static int hash(int k0, byte k1) {
         return hash;
     }
 
+    private static boolean isStateEmpty(int state) {
+        return state == EMPTY_OUTPUT_POSITION;
+    }
+
     @Override
     protected void rehashInternalFull(final int oldSize) {
         final int[] destKeyArray0 = new int[tableSize];
@@ -100,7 +104,7 @@ protected void rehashInternalFull(final int oldSize) {
         mainOutputPosition.setArray(destState);
         for (int sourceBucket = 0; sourceBucket < oldSize; ++sourceBucket) {
             final int currentStateValue = originalStateArray[sourceBucket];
-            if (currentStateValue == EMPTY_OUTPUT_POSITION) {
+            if (isStateEmpty(currentStateValue)) {
                 continue;
             }
             final int k0 = originalKeyArray0[sourceBucket];
@@ -109,7 +113,7 @@ protected void rehashInternalFull(final int oldSize) {
             final int firstDestinationTableLocation = hashToTableLocation(hash);
             int destinationTableLocation = firstDestinationTableLocation;
             while (true) {
-                if (destState[destinationTableLocation] == EMPTY_OUTPUT_POSITION) {
+                if (isStateEmpty(destState[destinationTableLocation])) {
                     destKeyArray0[destinationTableLocation] = k0;
                     destKeyArray1[destinationTableLocation] = k1;
                     destState[destinationTableLocation] = originalStateArray[sourceBucket];
@@ -134,7 +138,7 @@ public int findPositionForKey(Object key) {
         final int firstTableLocation = tableLocation;
         while (true) {
             final int positionValue = mainOutputPosition.getUnsafe(tableLocation);
-            if (positionValue == EMPTY_OUTPUT_POSITION) {
+            if (isStateEmpty(positionValue)) {
                 return UNKNOWN_ROW;
             }
             if (eq(mainKeySource0.getUnsafe(tableLocation), k0) && eq(mainKeySource1.getUnsafe(tableLocation), k1)) {
diff --git a/engine/table/src/main/java/io/deephaven/engine/table/impl/by/typed/staticopenagg/gen/StaticAggOpenHasherIntChar.java b/engine/table/src/main/java/io/deephaven/engine/table/impl/by/typed/staticopenagg/gen/StaticAggOpenHasherIntChar.java
index d175bc62c42..d7396266c55 100644
--- a/engine/table/src/main/java/io/deephaven/engine/table/impl/by/typed/staticopenagg/gen/StaticAggOpenHasherIntChar.java
+++ b/engine/table/src/main/java/io/deephaven/engine/table/impl/by/typed/staticopenagg/gen/StaticAggOpenHasherIntChar.java
@@ -60,7 +60,7 @@ protected void build(RowSequence rowSequence, Chunk[] sourceKeyChunks) {
             int tableLocation = firstTableLocation;
             while (true) {
                 int outputPosition = mainOutputPosition.getUnsafe(tableLocation);
-                if (outputPosition == EMPTY_OUTPUT_POSITION) {
+                if (isStateEmpty(outputPosition)) {
                     numEntries++;
                     mainKeySource0.set(tableLocation, k0);
                     mainKeySource1.set(tableLocation, k1);
@@ -86,6 +86,10 @@ private static int hash(int k0, char k1) {
         return hash;
     }
 
+    private static boolean isStateEmpty(int state) {
+        return state == EMPTY_OUTPUT_POSITION;
+    }
+
     @Override
     protected void rehashInternalFull(final int oldSize) {
         final int[] destKeyArray0 = new int[tableSize];
@@ -100,7 +104,7 @@ protected void rehashInternalFull(final int oldSize) {
         mainOutputPosition.setArray(destState);
         for (int sourceBucket = 0; sourceBucket < oldSize; ++sourceBucket) {
             final int currentStateValue = originalStateArray[sourceBucket];
-            if (currentStateValue == EMPTY_OUTPUT_POSITION) {
+            if (isStateEmpty(currentStateValue)) {
                 continue;
             }
             final int k0 = originalKeyArray0[sourceBucket];
@@ -109,7 +113,7 @@ protected void rehashInternalFull(final int oldSize) {
             final int firstDestinationTableLocation = hashToTableLocation(hash);
             int destinationTableLocation = firstDestinationTableLocation;
             while (true) {
-                if (destState[destinationTableLocation] == EMPTY_OUTPUT_POSITION) {
+                if (isStateEmpty(destState[destinationTableLocation])) {
                     destKeyArray0[destinationTableLocation] = k0;
                     destKeyArray1[destinationTableLocation] = k1;
                     destState[destinationTableLocation] = originalStateArray[sourceBucket];
@@ -134,7 +138,7 @@ public int findPositionForKey(Object key) {
         final int firstTableLocation = tableLocation;
         while (true) {
             final int positionValue = mainOutputPosition.getUnsafe(tableLocation);
-            if (positionValue == EMPTY_OUTPUT_POSITION) {
+            if (isStateEmpty(positionValue)) {
                 return UNKNOWN_ROW;
             }
             if (eq(mainKeySource0.getUnsafe(tableLocation), k0) && eq(mainKeySource1.getUnsafe(tableLocation), k1)) {
diff --git a/engine/table/src/main/java/io/deephaven/engine/table/impl/by/typed/staticopenagg/gen/StaticAggOpenHasherIntDouble.java b/engine/table/src/main/java/io/deephaven/engine/table/impl/by/typed/staticopenagg/gen/StaticAggOpenHasherIntDouble.java
index 009f61452e6..d18719779fe 100644
--- a/engine/table/src/main/java/io/deephaven/engine/table/impl/by/typed/staticopenagg/gen/StaticAggOpenHasherIntDouble.java
+++ b/engine/table/src/main/java/io/deephaven/engine/table/impl/by/typed/staticopenagg/gen/StaticAggOpenHasherIntDouble.java
@@ -60,7 +60,7 @@ protected void build(RowSequence rowSequence, Chunk[] sourceKeyChunks) {
             int tableLocation = firstTableLocation;
             while (true) {
                 int outputPosition = mainOutputPosition.getUnsafe(tableLocation);
-                if (outputPosition == EMPTY_OUTPUT_POSITION) {
+                if (isStateEmpty(outputPosition)) {
                     numEntries++;
                     mainKeySource0.set(tableLocation, k0);
                     mainKeySource1.set(tableLocation, k1);
@@ -86,6 +86,10 @@ private static int hash(int k0, double k1) {
         return hash;
     }
 
+    private static boolean isStateEmpty(int state) {
+        return state == EMPTY_OUTPUT_POSITION;
+    }
+
     @Override
     protected void rehashInternalFull(final int oldSize) {
         final int[] destKeyArray0 = new int[tableSize];
@@ -100,7 +104,7 @@ protected void rehashInternalFull(final int oldSize) {
         mainOutputPosition.setArray(destState);
         for (int sourceBucket = 0; sourceBucket < oldSize; ++sourceBucket) {
             final int currentStateValue = originalStateArray[sourceBucket];
-            if (currentStateValue == EMPTY_OUTPUT_POSITION) {
+            if (isStateEmpty(currentStateValue)) {
                 continue;
             }
             final int k0 = originalKeyArray0[sourceBucket];
@@ -109,7 +113,7 @@ protected void rehashInternalFull(final int oldSize) {
             final int firstDestinationTableLocation = hashToTableLocation(hash);
             int destinationTableLocation = firstDestinationTableLocation;
             while (true) {
-                if (destState[destinationTableLocation] == EMPTY_OUTPUT_POSITION) {
+                if (isStateEmpty(destState[destinationTableLocation])) {
                     destKeyArray0[destinationTableLocation] = k0;
                     destKeyArray1[destinationTableLocation] = k1;
                     destState[destinationTableLocation] = originalStateArray[sourceBucket];
@@ -134,7 +138,7 @@ public int findPositionForKey(Object key) {
         final int firstTableLocation = tableLocation;
         while (true) {
             final int positionValue = mainOutputPosition.getUnsafe(tableLocation);
-            if (positionValue == EMPTY_OUTPUT_POSITION) {
+            if (isStateEmpty(positionValue)) {
                 return UNKNOWN_ROW;
             }
             if (eq(mainKeySource0.getUnsafe(tableLocation), k0) && eq(mainKeySource1.getUnsafe(tableLocation), k1)) {
diff --git a/engine/table/src/main/java/io/deephaven/engine/table/impl/by/typed/staticopenagg/gen/StaticAggOpenHasherIntFloat.java b/engine/table/src/main/java/io/deephaven/engine/table/impl/by/typed/staticopenagg/gen/StaticAggOpenHasherIntFloat.java
index 6769ed4c915..1fb36297614 100644
--- a/engine/table/src/main/java/io/deephaven/engine/table/impl/by/typed/staticopenagg/gen/StaticAggOpenHasherIntFloat.java
+++ b/engine/table/src/main/java/io/deephaven/engine/table/impl/by/typed/staticopenagg/gen/StaticAggOpenHasherIntFloat.java
@@ -60,7 +60,7 @@ protected void build(RowSequence rowSequence, Chunk[] sourceKeyChunks) {
             int tableLocation = firstTableLocation;
             while (true) {
                 int outputPosition = mainOutputPosition.getUnsafe(tableLocation);
-                if (outputPosition == EMPTY_OUTPUT_POSITION) {
+                if (isStateEmpty(outputPosition)) {
                     numEntries++;
                     mainKeySource0.set(tableLocation, k0);
                     mainKeySource1.set(tableLocation, k1);
@@ -86,6 +86,10 @@ private static int hash(int k0, float k1) {
         return hash;
     }
 
+    private static boolean isStateEmpty(int state) {
+        return state == EMPTY_OUTPUT_POSITION;
+    }
+
     @Override
     protected void rehashInternalFull(final int oldSize) {
         final int[] destKeyArray0 = new int[tableSize];
@@ -100,7 +104,7 @@ protected void rehashInternalFull(final int oldSize) {
         mainOutputPosition.setArray(destState);
         for (int sourceBucket = 0; sourceBucket < oldSize; ++sourceBucket) {
             final int currentStateValue = originalStateArray[sourceBucket];
-            if (currentStateValue == EMPTY_OUTPUT_POSITION) {
+            if (isStateEmpty(currentStateValue)) {
                 continue;
             }
             final int k0 = originalKeyArray0[sourceBucket];
@@ -109,7 +113,7 @@ protected void rehashInternalFull(final int oldSize) {
             final int firstDestinationTableLocation = hashToTableLocation(hash);
             int destinationTableLocation = firstDestinationTableLocation;
             while (true) {
-                if (destState[destinationTableLocation] == EMPTY_OUTPUT_POSITION) {
+                if (isStateEmpty(destState[destinationTableLocation])) {
                     destKeyArray0[destinationTableLocation] = k0;
                     destKeyArray1[destinationTableLocation] = k1;
                     destState[destinationTableLocation] = originalStateArray[sourceBucket];
@@ -134,7 +138,7 @@ public int findPositionForKey(Object key) {
         final int firstTableLocation = tableLocation;
         while (true) {
             final int positionValue = mainOutputPosition.getUnsafe(tableLocation);
-            if (positionValue == EMPTY_OUTPUT_POSITION) {
+            if (isStateEmpty(positionValue)) {
                 return UNKNOWN_ROW;
             }
             if (eq(mainKeySource0.getUnsafe(tableLocation), k0) && eq(mainKeySource1.getUnsafe(tableLocation), k1)) {
diff --git a/engine/table/src/main/java/io/deephaven/engine/table/impl/by/typed/staticopenagg/gen/StaticAggOpenHasherIntInt.java b/engine/table/src/main/java/io/deephaven/engine/table/impl/by/typed/staticopenagg/gen/StaticAggOpenHasherIntInt.java
index b0e1dd0f75d..a563d3cfa68 100644
--- a/engine/table/src/main/java/io/deephaven/engine/table/impl/by/typed/staticopenagg/gen/StaticAggOpenHasherIntInt.java
+++ b/engine/table/src/main/java/io/deephaven/engine/table/impl/by/typed/staticopenagg/gen/StaticAggOpenHasherIntInt.java
@@ -55,7 +55,7 @@ protected void build(RowSequence rowSequence, Chunk[] sourceKeyChunks) {
             int tableLocation = firstTableLocation;
             while (true) {
                 int outputPosition = mainOutputPosition.getUnsafe(tableLocation);
-                if (outputPosition == EMPTY_OUTPUT_POSITION) {
+                if (isStateEmpty(outputPosition)) {
                     numEntries++;
                     mainKeySource0.set(tableLocation, k0);
                     mainKeySource1.set(tableLocation, k1);
@@ -81,6 +81,10 @@ private static int hash(int k0, int k1) {
         return hash;
     }
 
+    private static boolean isStateEmpty(int state) {
+        return state == EMPTY_OUTPUT_POSITION;
+    }
+
     @Override
     protected void rehashInternalFull(final int oldSize) {
         final int[] destKeyArray0 = new int[tableSize];
@@ -95,7 +99,7 @@ protected void rehashInternalFull(final int oldSize) {
         mainOutputPosition.setArray(destState);
         for (int sourceBucket = 0; sourceBucket < oldSize; ++sourceBucket) {
             final int currentStateValue = originalStateArray[sourceBucket];
-            if (currentStateValue == EMPTY_OUTPUT_POSITION) {
+            if (isStateEmpty(currentStateValue)) {
                 continue;
             }
             final int k0 = originalKeyArray0[sourceBucket];
@@ -104,7 +108,7 @@ protected void rehashInternalFull(final int oldSize) {
             final int firstDestinationTableLocation = hashToTableLocation(hash);
             int destinationTableLocation = firstDestinationTableLocation;
             while (true) {
-                if (destState[destinationTableLocation] == EMPTY_OUTPUT_POSITION) {
+                if (isStateEmpty(destState[destinationTableLocation])) {
                     destKeyArray0[destinationTableLocation] = k0;
                     destKeyArray1[destinationTableLocation] = k1;
                     destState[destinationTableLocation] = originalStateArray[sourceBucket];
@@ -129,7 +133,7 @@ public int findPositionForKey(Object key) {
         final int firstTableLocation = tableLocation;
         while (true) {
             final int positionValue = mainOutputPosition.getUnsafe(tableLocation);
-            if (positionValue == EMPTY_OUTPUT_POSITION) {
+            if (isStateEmpty(positionValue)) {
                 return UNKNOWN_ROW;
             }
             if (eq(mainKeySource0.getUnsafe(tableLocation), k0) && eq(mainKeySource1.getUnsafe(tableLocation), k1)) {
diff --git a/engine/table/src/main/java/io/deephaven/engine/table/impl/by/typed/staticopenagg/gen/StaticAggOpenHasherIntLong.java b/engine/table/src/main/java/io/deephaven/engine/table/impl/by/typed/staticopenagg/gen/StaticAggOpenHasherIntLong.java
index 20086fba97b..cd5c016ff0c 100644
--- a/engine/table/src/main/java/io/deephaven/engine/table/impl/by/typed/staticopenagg/gen/StaticAggOpenHasherIntLong.java
+++ b/engine/table/src/main/java/io/deephaven/engine/table/impl/by/typed/staticopenagg/gen/StaticAggOpenHasherIntLong.java
@@ -60,7 +60,7 @@ protected void build(RowSequence rowSequence, Chunk[] sourceKeyChunks) {
             int tableLocation = firstTableLocation;
             while (true) {
                 int outputPosition = mainOutputPosition.getUnsafe(tableLocation);
-                if (outputPosition == EMPTY_OUTPUT_POSITION) {
+                if (isStateEmpty(outputPosition)) {
                     numEntries++;
                     mainKeySource0.set(tableLocation, k0);
                     mainKeySource1.set(tableLocation, k1);
@@ -86,6 +86,10 @@ private static int hash(int k0, long k1) {
         return hash;
     }
 
+    private static boolean isStateEmpty(int state) {
+        return state == EMPTY_OUTPUT_POSITION;
+    }
+
     @Override
     protected void rehashInternalFull(final int oldSize) {
         final int[] destKeyArray0 = new int[tableSize];
@@ -100,7 +104,7 @@ protected void rehashInternalFull(final int oldSize) {
         mainOutputPosition.setArray(destState);
         for (int sourceBucket = 0; sourceBucket < oldSize; ++sourceBucket) {
             final int currentStateValue = originalStateArray[sourceBucket];
-            if (currentStateValue == EMPTY_OUTPUT_POSITION) {
+            if (isStateEmpty(currentStateValue)) {
                 continue;
             }
             final int k0 = originalKeyArray0[sourceBucket];
@@ -109,7 +113,7 @@ protected void rehashInternalFull(final int oldSize) {
             final int firstDestinationTableLocation = hashToTableLocation(hash);
             int destinationTableLocation = firstDestinationTableLocation;
             while (true) {
-                if (destState[destinationTableLocation] == EMPTY_OUTPUT_POSITION) {
+                if (isStateEmpty(destState[destinationTableLocation])) {
                     destKeyArray0[destinationTableLocation] = k0;
                     destKeyArray1[destinationTableLocation] = k1;
                     destState[destinationTableLocation] = originalStateArray[sourceBucket];
@@ -134,7 +138,7 @@ public int findPositionForKey(Object key) {
         final int firstTableLocation = tableLocation;
         while (true) {
             final int positionValue = mainOutputPosition.getUnsafe(tableLocation);
-            if (positionValue == EMPTY_OUTPUT_POSITION) {
+            if (isStateEmpty(positionValue)) {
                 return UNKNOWN_ROW;
             }
             if (eq(mainKeySource0.getUnsafe(tableLocation), k0) && eq(mainKeySource1.getUnsafe(tableLocation), k1)) {
diff --git a/engine/table/src/main/java/io/deephaven/engine/table/impl/by/typed/staticopenagg/gen/StaticAggOpenHasherIntObject.java b/engine/table/src/main/java/io/deephaven/engine/table/impl/by/typed/staticopenagg/gen/StaticAggOpenHasherIntObject.java
index 68721772fe8..467d78153c2 100644
--- a/engine/table/src/main/java/io/deephaven/engine/table/impl/by/typed/staticopenagg/gen/StaticAggOpenHasherIntObject.java
+++ b/engine/table/src/main/java/io/deephaven/engine/table/impl/by/typed/staticopenagg/gen/StaticAggOpenHasherIntObject.java
@@ -59,7 +59,7 @@ protected void build(RowSequence rowSequence, Chunk[] sourceKeyChunks) {
             int tableLocation = firstTableLocation;
             while (true) {
                 int outputPosition = mainOutputPosition.getUnsafe(tableLocation);
-                if (outputPosition == EMPTY_OUTPUT_POSITION) {
+                if (isStateEmpty(outputPosition)) {
                     numEntries++;
                     mainKeySource0.set(tableLocation, k0);
                     mainKeySource1.set(tableLocation, k1);
@@ -85,6 +85,10 @@ private static int hash(int k0, Object k1) {
         return hash;
     }
 
+    private static boolean isStateEmpty(int state) {
+        return state == EMPTY_OUTPUT_POSITION;
+    }
+
     @Override
     protected void rehashInternalFull(final int oldSize) {
         final int[] destKeyArray0 = new int[tableSize];
@@ -99,7 +103,7 @@ protected void rehashInternalFull(final int oldSize) {
         mainOutputPosition.setArray(destState);
         for (int sourceBucket = 0; sourceBucket < oldSize; ++sourceBucket) {
             final int currentStateValue = originalStateArray[sourceBucket];
-            if (currentStateValue == EMPTY_OUTPUT_POSITION) {
+            if (isStateEmpty(currentStateValue)) {
                 continue;
             }
             final int k0 = originalKeyArray0[sourceBucket];
@@ -108,7 +112,7 @@ protected void rehashInternalFull(final int oldSize) {
             final int firstDestinationTableLocation = hashToTableLocation(hash);
             int destinationTableLocation = firstDestinationTableLocation;
             while (true) {
-                if (destState[destinationTableLocation] == EMPTY_OUTPUT_POSITION) {
+                if (isStateEmpty(destState[destinationTableLocation])) {
                     destKeyArray0[destinationTableLocation] = k0;
                     destKeyArray1[destinationTableLocation] = k1;
                     destState[destinationTableLocation] = originalStateArray[sourceBucket];
@@ -133,7 +137,7 @@ public int findPositionForKey(Object key) {
         final int firstTableLocation = tableLocation;
         while (true) {
             final int positionValue = mainOutputPosition.getUnsafe(tableLocation);
-            if (positionValue == EMPTY_OUTPUT_POSITION) {
+            if (isStateEmpty(positionValue)) {
                 return UNKNOWN_ROW;
             }
             if (eq(mainKeySource0.getUnsafe(tableLocation), k0) && eq(mainKeySource1.getUnsafe(tableLocation), k1)) {
diff --git a/engine/table/src/main/java/io/deephaven/engine/table/impl/by/typed/staticopenagg/gen/StaticAggOpenHasherIntShort.java b/engine/table/src/main/java/io/deephaven/engine/table/impl/by/typed/staticopenagg/gen/StaticAggOpenHasherIntShort.java
index 352f4f65360..ee5d87234a5 100644
--- a/engine/table/src/main/java/io/deephaven/engine/table/impl/by/typed/staticopenagg/gen/StaticAggOpenHasherIntShort.java
+++ b/engine/table/src/main/java/io/deephaven/engine/table/impl/by/typed/staticopenagg/gen/StaticAggOpenHasherIntShort.java
@@ -60,7 +60,7 @@ protected void build(RowSequence rowSequence, Chunk[] sourceKeyChunks) {
             int tableLocation = firstTableLocation;
             while (true) {
                 int outputPosition = mainOutputPosition.getUnsafe(tableLocation);
-                if (outputPosition == EMPTY_OUTPUT_POSITION) {
+                if (isStateEmpty(outputPosition)) {
                     numEntries++;
                     mainKeySource0.set(tableLocation, k0);
                     mainKeySource1.set(tableLocation, k1);
@@ -86,6 +86,10 @@ private static int hash(int k0, short k1) {
         return hash;
     }
 
+    private static boolean isStateEmpty(int state) {
+        return state == EMPTY_OUTPUT_POSITION;
+    }
+
     @Override
     protected void rehashInternalFull(final int oldSize) {
         final int[] destKeyArray0 = new int[tableSize];
@@ -100,7 +104,7 @@ protected void rehashInternalFull(final int oldSize) {
         mainOutputPosition.setArray(destState);
         for (int sourceBucket = 0; sourceBucket < oldSize; ++sourceBucket) {
             final int currentStateValue = originalStateArray[sourceBucket];
-            if (currentStateValue == EMPTY_OUTPUT_POSITION) {
+            if (isStateEmpty(currentStateValue)) {
                 continue;
             }
             final int k0 = originalKeyArray0[sourceBucket];
@@ -109,7 +113,7 @@ protected void rehashInternalFull(final int oldSize) {
             final int firstDestinationTableLocation = hashToTableLocation(hash);
             int destinationTableLocation = firstDestinationTableLocation;
             while (true) {
-                if (destState[destinationTableLocation] == EMPTY_OUTPUT_POSITION) {
+                if (isStateEmpty(destState[destinationTableLocation])) {
                     destKeyArray0[destinationTableLocation] = k0;
                     destKeyArray1[destinationTableLocation] = k1;
                     destState[destinationTableLocation] = originalStateArray[sourceBucket];
@@ -134,7 +138,7 @@ public int findPositionForKey(Object key) {
         final int firstTableLocation = tableLocation;
         while (true) {
             final int positionValue = mainOutputPosition.getUnsafe(tableLocation);
-            if (positionValue == EMPTY_OUTPUT_POSITION) {
+            if (isStateEmpty(positionValue)) {
                 return UNKNOWN_ROW;
             }
             if (eq(mainKeySource0.getUnsafe(tableLocation), k0) && eq(mainKeySource1.getUnsafe(tableLocation), k1)) {
diff --git a/engine/table/src/main/java/io/deephaven/engine/table/impl/by/typed/staticopenagg/gen/StaticAggOpenHasherLong.java b/engine/table/src/main/java/io/deephaven/engine/table/impl/by/typed/staticopenagg/gen/StaticAggOpenHasherLong.java
index 1962e3fdbfc..96ee16f6ab6 100644
--- a/engine/table/src/main/java/io/deephaven/engine/table/impl/by/typed/staticopenagg/gen/StaticAggOpenHasherLong.java
+++ b/engine/table/src/main/java/io/deephaven/engine/table/impl/by/typed/staticopenagg/gen/StaticAggOpenHasherLong.java
@@ -49,7 +49,7 @@ protected void build(RowSequence rowSequence, Chunk[] sourceKeyChunks) {
             int tableLocation = firstTableLocation;
             while (true) {
                 int outputPosition = mainOutputPosition.getUnsafe(tableLocation);
-                if (outputPosition == EMPTY_OUTPUT_POSITION) {
+                if (isStateEmpty(outputPosition)) {
                     numEntries++;
                     mainKeySource0.set(tableLocation, k0);
                     outputPosition = nextOutputPosition.getAndIncrement();
@@ -73,6 +73,10 @@ private static int hash(long k0) {
         return hash;
     }
 
+    private static boolean isStateEmpty(int state) {
+        return state == EMPTY_OUTPUT_POSITION;
+    }
+
     @Override
     protected void rehashInternalFull(final int oldSize) {
         final long[] destKeyArray0 = new long[tableSize];
@@ -84,7 +88,7 @@ protected void rehashInternalFull(final int oldSize) {
         mainOutputPosition.setArray(destState);
         for (int sourceBucket = 0; sourceBucket < oldSize; ++sourceBucket) {
             final int currentStateValue = originalStateArray[sourceBucket];
-            if (currentStateValue == EMPTY_OUTPUT_POSITION) {
+            if (isStateEmpty(currentStateValue)) {
                 continue;
             }
             final long k0 = originalKeyArray0[sourceBucket];
@@ -92,7 +96,7 @@ protected void rehashInternalFull(final int oldSize) {
             final int firstDestinationTableLocation = hashToTableLocation(hash);
             int destinationTableLocation = firstDestinationTableLocation;
             while (true) {
-                if (destState[destinationTableLocation] == EMPTY_OUTPUT_POSITION) {
+                if (isStateEmpty(destState[destinationTableLocation])) {
                     destKeyArray0[destinationTableLocation] = k0;
                     destState[destinationTableLocation] = originalStateArray[sourceBucket];
                     if (sourceBucket != destinationTableLocation) {
@@ -114,7 +118,7 @@ public int findPositionForKey(Object key) {
         final int firstTableLocation = tableLocation;
         while (true) {
             final int positionValue = mainOutputPosition.getUnsafe(tableLocation);
-            if (positionValue == EMPTY_OUTPUT_POSITION) {
+            if (isStateEmpty(positionValue)) {
                 return UNKNOWN_ROW;
             }
             if (eq(mainKeySource0.getUnsafe(tableLocation), k0)) {
diff --git a/engine/table/src/main/java/io/deephaven/engine/table/impl/by/typed/staticopenagg/gen/StaticAggOpenHasherLongByte.java b/engine/table/src/main/java/io/deephaven/engine/table/impl/by/typed/staticopenagg/gen/StaticAggOpenHasherLongByte.java
index a96b9cc6a66..0235844308e 100644
--- a/engine/table/src/main/java/io/deephaven/engine/table/impl/by/typed/staticopenagg/gen/StaticAggOpenHasherLongByte.java
+++ b/engine/table/src/main/java/io/deephaven/engine/table/impl/by/typed/staticopenagg/gen/StaticAggOpenHasherLongByte.java
@@ -60,7 +60,7 @@ protected void build(RowSequence rowSequence, Chunk[] sourceKeyChunks) {
             int tableLocation = firstTableLocation;
             while (true) {
                 int outputPosition = mainOutputPosition.getUnsafe(tableLocation);
-                if (outputPosition == EMPTY_OUTPUT_POSITION) {
+                if (isStateEmpty(outputPosition)) {
                     numEntries++;
                     mainKeySource0.set(tableLocation, k0);
                     mainKeySource1.set(tableLocation, k1);
@@ -86,6 +86,10 @@ private static int hash(long k0, byte k1) {
         return hash;
     }
 
+    private static boolean isStateEmpty(int state) {
+        return state == EMPTY_OUTPUT_POSITION;
+    }
+
     @Override
     protected void rehashInternalFull(final int oldSize) {
         final long[] destKeyArray0 = new long[tableSize];
@@ -100,7 +104,7 @@ protected void rehashInternalFull(final int oldSize) {
         mainOutputPosition.setArray(destState);
         for (int sourceBucket = 0; sourceBucket < oldSize; ++sourceBucket) {
             final int currentStateValue = originalStateArray[sourceBucket];
-            if (currentStateValue == EMPTY_OUTPUT_POSITION) {
+            if (isStateEmpty(currentStateValue)) {
                 continue;
             }
             final long k0 = originalKeyArray0[sourceBucket];
@@ -109,7 +113,7 @@ protected void rehashInternalFull(final int oldSize) {
             final int firstDestinationTableLocation = hashToTableLocation(hash);
             int destinationTableLocation = firstDestinationTableLocation;
             while (true) {
-                if (destState[destinationTableLocation] == EMPTY_OUTPUT_POSITION) {
+                if (isStateEmpty(destState[destinationTableLocation])) {
                     destKeyArray0[destinationTableLocation] = k0;
                     destKeyArray1[destinationTableLocation] = k1;
                     destState[destinationTableLocation] = originalStateArray[sourceBucket];
@@ -134,7 +138,7 @@ public int findPositionForKey(Object key) {
         final int firstTableLocation = tableLocation;
         while (true) {
             final int positionValue = mainOutputPosition.getUnsafe(tableLocation);
-            if (positionValue == EMPTY_OUTPUT_POSITION) {
+            if (isStateEmpty(positionValue)) {
                 return UNKNOWN_ROW;
             }
             if (eq(mainKeySource0.getUnsafe(tableLocation), k0) && eq(mainKeySource1.getUnsafe(tableLocation), k1)) {
diff --git a/engine/table/src/main/java/io/deephaven/engine/table/impl/by/typed/staticopenagg/gen/StaticAggOpenHasherLongChar.java b/engine/table/src/main/java/io/deephaven/engine/table/impl/by/typed/staticopenagg/gen/StaticAggOpenHasherLongChar.java
index c3be1cbff52..b8251675f1b 100644
--- a/engine/table/src/main/java/io/deephaven/engine/table/impl/by/typed/staticopenagg/gen/StaticAggOpenHasherLongChar.java
+++ b/engine/table/src/main/java/io/deephaven/engine/table/impl/by/typed/staticopenagg/gen/StaticAggOpenHasherLongChar.java
@@ -60,7 +60,7 @@ protected void build(RowSequence rowSequence, Chunk[] sourceKeyChunks) {
             int tableLocation = firstTableLocation;
             while (true) {
                 int outputPosition = mainOutputPosition.getUnsafe(tableLocation);
-                if (outputPosition == EMPTY_OUTPUT_POSITION) {
+                if (isStateEmpty(outputPosition)) {
                     numEntries++;
                     mainKeySource0.set(tableLocation, k0);
                     mainKeySource1.set(tableLocation, k1);
@@ -86,6 +86,10 @@ private static int hash(long k0, char k1) {
         return hash;
     }
 
+    private static boolean isStateEmpty(int state) {
+        return state == EMPTY_OUTPUT_POSITION;
+    }
+
     @Override
     protected void rehashInternalFull(final int oldSize) {
         final long[] destKeyArray0 = new long[tableSize];
@@ -100,7 +104,7 @@ protected void rehashInternalFull(final int oldSize) {
         mainOutputPosition.setArray(destState);
         for (int sourceBucket = 0; sourceBucket < oldSize; ++sourceBucket) {
             final int currentStateValue = originalStateArray[sourceBucket];
-            if (currentStateValue == EMPTY_OUTPUT_POSITION) {
+            if (isStateEmpty(currentStateValue)) {
                 continue;
             }
             final long k0 = originalKeyArray0[sourceBucket];
@@ -109,7 +113,7 @@ protected void rehashInternalFull(final int oldSize) {
             final int firstDestinationTableLocation = hashToTableLocation(hash);
             int destinationTableLocation = firstDestinationTableLocation;
             while (true) {
-                if (destState[destinationTableLocation] == EMPTY_OUTPUT_POSITION) {
+                if (isStateEmpty(destState[destinationTableLocation])) {
                     destKeyArray0[destinationTableLocation] = k0;
                     destKeyArray1[destinationTableLocation] = k1;
                     destState[destinationTableLocation] = originalStateArray[sourceBucket];
@@ -134,7 +138,7 @@ public int findPositionForKey(Object key) {
         final int firstTableLocation = tableLocation;
         while (true) {
             final int positionValue = mainOutputPosition.getUnsafe(tableLocation);
-            if (positionValue == EMPTY_OUTPUT_POSITION) {
+            if (isStateEmpty(positionValue)) {
                 return UNKNOWN_ROW;
             }
             if (eq(mainKeySource0.getUnsafe(tableLocation), k0) && eq(mainKeySource1.getUnsafe(tableLocation), k1)) {
diff --git a/engine/table/src/main/java/io/deephaven/engine/table/impl/by/typed/staticopenagg/gen/StaticAggOpenHasherLongDouble.java b/engine/table/src/main/java/io/deephaven/engine/table/impl/by/typed/staticopenagg/gen/StaticAggOpenHasherLongDouble.java
index 783e1d8651d..fa5e591e234 100644
--- a/engine/table/src/main/java/io/deephaven/engine/table/impl/by/typed/staticopenagg/gen/StaticAggOpenHasherLongDouble.java
+++ b/engine/table/src/main/java/io/deephaven/engine/table/impl/by/typed/staticopenagg/gen/StaticAggOpenHasherLongDouble.java
@@ -60,7 +60,7 @@ protected void build(RowSequence rowSequence, Chunk[] sourceKeyChunks) {
             int tableLocation = firstTableLocation;
             while (true) {
                 int outputPosition = mainOutputPosition.getUnsafe(tableLocation);
-                if (outputPosition == EMPTY_OUTPUT_POSITION) {
+                if (isStateEmpty(outputPosition)) {
                     numEntries++;
                     mainKeySource0.set(tableLocation, k0);
                     mainKeySource1.set(tableLocation, k1);
@@ -86,6 +86,10 @@ private static int hash(long k0, double k1) {
         return hash;
     }
 
+    private static boolean isStateEmpty(int state) {
+        return state == EMPTY_OUTPUT_POSITION;
+    }
+
     @Override
     protected void rehashInternalFull(final int oldSize) {
         final long[] destKeyArray0 = new long[tableSize];
@@ -100,7 +104,7 @@ protected void rehashInternalFull(final int oldSize) {
         mainOutputPosition.setArray(destState);
         for (int sourceBucket = 0; sourceBucket < oldSize; ++sourceBucket) {
             final int currentStateValue = originalStateArray[sourceBucket];
-            if (currentStateValue == EMPTY_OUTPUT_POSITION) {
+            if (isStateEmpty(currentStateValue)) {
                 continue;
             }
             final long k0 = originalKeyArray0[sourceBucket];
@@ -109,7 +113,7 @@ protected void rehashInternalFull(final int oldSize) {
             final int firstDestinationTableLocation = hashToTableLocation(hash);
             int destinationTableLocation = firstDestinationTableLocation;
             while (true) {
-                if (destState[destinationTableLocation] == EMPTY_OUTPUT_POSITION) {
+                if (isStateEmpty(destState[destinationTableLocation])) {
                     destKeyArray0[destinationTableLocation] = k0;
                     destKeyArray1[destinationTableLocation] = k1;
                     destState[destinationTableLocation] = originalStateArray[sourceBucket];
@@ -134,7 +138,7 @@ public int findPositionForKey(Object key) {
         final int firstTableLocation = tableLocation;
         while (true) {
             final int positionValue = mainOutputPosition.getUnsafe(tableLocation);
-            if (positionValue == EMPTY_OUTPUT_POSITION) {
+            if (isStateEmpty(positionValue)) {
                 return UNKNOWN_ROW;
             }
             if (eq(mainKeySource0.getUnsafe(tableLocation), k0) && eq(mainKeySource1.getUnsafe(tableLocation), k1)) {
diff --git a/engine/table/src/main/java/io/deephaven/engine/table/impl/by/typed/staticopenagg/gen/StaticAggOpenHasherLongFloat.java b/engine/table/src/main/java/io/deephaven/engine/table/impl/by/typed/staticopenagg/gen/StaticAggOpenHasherLongFloat.java
index d422e8a8272..fe8f461b640 100644
--- a/engine/table/src/main/java/io/deephaven/engine/table/impl/by/typed/staticopenagg/gen/StaticAggOpenHasherLongFloat.java
+++ b/engine/table/src/main/java/io/deephaven/engine/table/impl/by/typed/staticopenagg/gen/StaticAggOpenHasherLongFloat.java
@@ -60,7 +60,7 @@ protected void build(RowSequence rowSequence, Chunk[] sourceKeyChunks) {
             int tableLocation = firstTableLocation;
             while (true) {
                 int outputPosition = mainOutputPosition.getUnsafe(tableLocation);
-                if (outputPosition == EMPTY_OUTPUT_POSITION) {
+                if (isStateEmpty(outputPosition)) {
                     numEntries++;
                     mainKeySource0.set(tableLocation, k0);
                     mainKeySource1.set(tableLocation, k1);
@@ -86,6 +86,10 @@ private static int hash(long k0, float k1) {
         return hash;
     }
 
+    private static boolean isStateEmpty(int state) {
+        return state == EMPTY_OUTPUT_POSITION;
+    }
+
     @Override
     protected void rehashInternalFull(final int oldSize) {
         final long[] destKeyArray0 = new long[tableSize];
@@ -100,7 +104,7 @@ protected void rehashInternalFull(final int oldSize) {
         mainOutputPosition.setArray(destState);
         for (int sourceBucket = 0; sourceBucket < oldSize; ++sourceBucket) {
             final int currentStateValue = originalStateArray[sourceBucket];
-            if (currentStateValue == EMPTY_OUTPUT_POSITION) {
+            if (isStateEmpty(currentStateValue)) {
                 continue;
             }
             final long k0 = originalKeyArray0[sourceBucket];
@@ -109,7 +113,7 @@ protected void rehashInternalFull(final int oldSize) {
             final int firstDestinationTableLocation = hashToTableLocation(hash);
             int destinationTableLocation = firstDestinationTableLocation;
             while (true) {
-                if (destState[destinationTableLocation] == EMPTY_OUTPUT_POSITION) {
+                if (isStateEmpty(destState[destinationTableLocation])) {
                     destKeyArray0[destinationTableLocation] = k0;
                     destKeyArray1[destinationTableLocation] = k1;
                     destState[destinationTableLocation] = originalStateArray[sourceBucket];
@@ -134,7 +138,7 @@ public int findPositionForKey(Object key) {
         final int firstTableLocation = tableLocation;
         while (true) {
             final int positionValue = mainOutputPosition.getUnsafe(tableLocation);
-            if (positionValue == EMPTY_OUTPUT_POSITION) {
+            if (isStateEmpty(positionValue)) {
                 return UNKNOWN_ROW;
             }
             if (eq(mainKeySource0.getUnsafe(tableLocation), k0) && eq(mainKeySource1.getUnsafe(tableLocation), k1)) {
diff --git a/engine/table/src/main/java/io/deephaven/engine/table/impl/by/typed/staticopenagg/gen/StaticAggOpenHasherLongInt.java b/engine/table/src/main/java/io/deephaven/engine/table/impl/by/typed/staticopenagg/gen/StaticAggOpenHasherLongInt.java
index 6fe97f248fb..014e71bf86b 100644
--- a/engine/table/src/main/java/io/deephaven/engine/table/impl/by/typed/staticopenagg/gen/StaticAggOpenHasherLongInt.java
+++ b/engine/table/src/main/java/io/deephaven/engine/table/impl/by/typed/staticopenagg/gen/StaticAggOpenHasherLongInt.java
@@ -60,7 +60,7 @@ protected void build(RowSequence rowSequence, Chunk[] sourceKeyChunks) {
             int tableLocation = firstTableLocation;
             while (true) {
                 int outputPosition = mainOutputPosition.getUnsafe(tableLocation);
-                if (outputPosition == EMPTY_OUTPUT_POSITION) {
+                if (isStateEmpty(outputPosition)) {
                     numEntries++;
                     mainKeySource0.set(tableLocation, k0);
                     mainKeySource1.set(tableLocation, k1);
@@ -86,6 +86,10 @@ private static int hash(long k0, int k1) {
         return hash;
     }
 
+    private static boolean isStateEmpty(int state) {
+        return state == EMPTY_OUTPUT_POSITION;
+    }
+
     @Override
     protected void rehashInternalFull(final int oldSize) {
         final long[] destKeyArray0 = new long[tableSize];
@@ -100,7 +104,7 @@ protected void rehashInternalFull(final int oldSize) {
         mainOutputPosition.setArray(destState);
         for (int sourceBucket = 0; sourceBucket < oldSize; ++sourceBucket) {
             final int currentStateValue = originalStateArray[sourceBucket];
-            if (currentStateValue == EMPTY_OUTPUT_POSITION) {
+            if (isStateEmpty(currentStateValue)) {
                 continue;
             }
             final long k0 = originalKeyArray0[sourceBucket];
@@ -109,7 +113,7 @@ protected void rehashInternalFull(final int oldSize) {
             final int firstDestinationTableLocation = hashToTableLocation(hash);
             int destinationTableLocation = firstDestinationTableLocation;
             while (true) {
-                if (destState[destinationTableLocation] == EMPTY_OUTPUT_POSITION) {
+                if (isStateEmpty(destState[destinationTableLocation])) {
                     destKeyArray0[destinationTableLocation] = k0;
                     destKeyArray1[destinationTableLocation] = k1;
                     destState[destinationTableLocation] = originalStateArray[sourceBucket];
@@ -134,7 +138,7 @@ public int findPositionForKey(Object key) {
         final int firstTableLocation = tableLocation;
         while (true) {
             final int positionValue = mainOutputPosition.getUnsafe(tableLocation);
-            if (positionValue == EMPTY_OUTPUT_POSITION) {
+            if (isStateEmpty(positionValue)) {
                 return UNKNOWN_ROW;
             }
             if (eq(mainKeySource0.getUnsafe(tableLocation), k0) && eq(mainKeySource1.getUnsafe(tableLocation), k1)) {
diff --git a/engine/table/src/main/java/io/deephaven/engine/table/impl/by/typed/staticopenagg/gen/StaticAggOpenHasherLongLong.java b/engine/table/src/main/java/io/deephaven/engine/table/impl/by/typed/staticopenagg/gen/StaticAggOpenHasherLongLong.java
index 78b263ff607..7ba9ba1ed34 100644
--- a/engine/table/src/main/java/io/deephaven/engine/table/impl/by/typed/staticopenagg/gen/StaticAggOpenHasherLongLong.java
+++ b/engine/table/src/main/java/io/deephaven/engine/table/impl/by/typed/staticopenagg/gen/StaticAggOpenHasherLongLong.java
@@ -55,7 +55,7 @@ protected void build(RowSequence rowSequence, Chunk[] sourceKeyChunks) {
             int tableLocation = firstTableLocation;
             while (true) {
                 int outputPosition = mainOutputPosition.getUnsafe(tableLocation);
-                if (outputPosition == EMPTY_OUTPUT_POSITION) {
+                if (isStateEmpty(outputPosition)) {
                     numEntries++;
                     mainKeySource0.set(tableLocation, k0);
                     mainKeySource1.set(tableLocation, k1);
@@ -81,6 +81,10 @@ private static int hash(long k0, long k1) {
         return hash;
     }
 
+    private static boolean isStateEmpty(int state) {
+        return state == EMPTY_OUTPUT_POSITION;
+    }
+
     @Override
     protected void rehashInternalFull(final int oldSize) {
         final long[] destKeyArray0 = new long[tableSize];
@@ -95,7 +99,7 @@ protected void rehashInternalFull(final int oldSize) {
         mainOutputPosition.setArray(destState);
         for (int sourceBucket = 0; sourceBucket < oldSize; ++sourceBucket) {
             final int currentStateValue = originalStateArray[sourceBucket];
-            if (currentStateValue == EMPTY_OUTPUT_POSITION) {
+            if (isStateEmpty(currentStateValue)) {
                 continue;
             }
             final long k0 = originalKeyArray0[sourceBucket];
@@ -104,7 +108,7 @@ protected void rehashInternalFull(final int oldSize) {
             final int firstDestinationTableLocation = hashToTableLocation(hash);
             int destinationTableLocation = firstDestinationTableLocation;
             while (true) {
-                if (destState[destinationTableLocation] == EMPTY_OUTPUT_POSITION) {
+                if (isStateEmpty(destState[destinationTableLocation])) {
                     destKeyArray0[destinationTableLocation] = k0;
                     destKeyArray1[destinationTableLocation] = k1;
                     destState[destinationTableLocation] = originalStateArray[sourceBucket];
@@ -129,7 +133,7 @@ public int findPositionForKey(Object key) {
         final int firstTableLocation = tableLocation;
         while (true) {
             final int positionValue = mainOutputPosition.getUnsafe(tableLocation);
-            if (positionValue == EMPTY_OUTPUT_POSITION) {
+            if (isStateEmpty(positionValue)) {
                 return UNKNOWN_ROW;
             }
             if (eq(mainKeySource0.getUnsafe(tableLocation), k0) && eq(mainKeySource1.getUnsafe(tableLocation), k1)) {
diff --git a/engine/table/src/main/java/io/deephaven/engine/table/impl/by/typed/staticopenagg/gen/StaticAggOpenHasherLongObject.java b/engine/table/src/main/java/io/deephaven/engine/table/impl/by/typed/staticopenagg/gen/StaticAggOpenHasherLongObject.java
index 7544d296260..781d6a9cb1b 100644
--- a/engine/table/src/main/java/io/deephaven/engine/table/impl/by/typed/staticopenagg/gen/StaticAggOpenHasherLongObject.java
+++ b/engine/table/src/main/java/io/deephaven/engine/table/impl/by/typed/staticopenagg/gen/StaticAggOpenHasherLongObject.java
@@ -59,7 +59,7 @@ protected void build(RowSequence rowSequence, Chunk[] sourceKeyChunks) {
             int tableLocation = firstTableLocation;
             while (true) {
                 int outputPosition = mainOutputPosition.getUnsafe(tableLocation);
-                if (outputPosition == EMPTY_OUTPUT_POSITION) {
+                if (isStateEmpty(outputPosition)) {
                     numEntries++;
                     mainKeySource0.set(tableLocation, k0);
                     mainKeySource1.set(tableLocation, k1);
@@ -85,6 +85,10 @@ private static int hash(long k0, Object k1) {
         return hash;
     }
 
+    private static boolean isStateEmpty(int state) {
+        return state == EMPTY_OUTPUT_POSITION;
+    }
+
     @Override
     protected void rehashInternalFull(final int oldSize) {
         final long[] destKeyArray0 = new long[tableSize];
@@ -99,7 +103,7 @@ protected void rehashInternalFull(final int oldSize) {
         mainOutputPosition.setArray(destState);
         for (int sourceBucket = 0; sourceBucket < oldSize; ++sourceBucket) {
             final int currentStateValue = originalStateArray[sourceBucket];
-            if (currentStateValue == EMPTY_OUTPUT_POSITION) {
+            if (isStateEmpty(currentStateValue)) {
                 continue;
             }
             final long k0 = originalKeyArray0[sourceBucket];
@@ -108,7 +112,7 @@ protected void rehashInternalFull(final int oldSize) {
             final int firstDestinationTableLocation = hashToTableLocation(hash);
             int destinationTableLocation = firstDestinationTableLocation;
             while (true) {
-                if (destState[destinationTableLocation] == EMPTY_OUTPUT_POSITION) {
+                if (isStateEmpty(destState[destinationTableLocation])) {
                     destKeyArray0[destinationTableLocation] = k0;
                     destKeyArray1[destinationTableLocation] = k1;
                     destState[destinationTableLocation] = originalStateArray[sourceBucket];
@@ -133,7 +137,7 @@ public int findPositionForKey(Object key) {
         final int firstTableLocation = tableLocation;
         while (true) {
             final int positionValue = mainOutputPosition.getUnsafe(tableLocation);
-            if (positionValue == EMPTY_OUTPUT_POSITION) {
+            if (isStateEmpty(positionValue)) {
                 return UNKNOWN_ROW;
             }
             if (eq(mainKeySource0.getUnsafe(tableLocation), k0) && eq(mainKeySource1.getUnsafe(tableLocation), k1)) {
diff --git a/engine/table/src/main/java/io/deephaven/engine/table/impl/by/typed/staticopenagg/gen/StaticAggOpenHasherLongShort.java b/engine/table/src/main/java/io/deephaven/engine/table/impl/by/typed/staticopenagg/gen/StaticAggOpenHasherLongShort.java
index 242b9234142..ab7767afda8 100644
--- a/engine/table/src/main/java/io/deephaven/engine/table/impl/by/typed/staticopenagg/gen/StaticAggOpenHasherLongShort.java
+++ b/engine/table/src/main/java/io/deephaven/engine/table/impl/by/typed/staticopenagg/gen/StaticAggOpenHasherLongShort.java
@@ -60,7 +60,7 @@ protected void build(RowSequence rowSequence, Chunk[] sourceKeyChunks) {
             int tableLocation = firstTableLocation;
             while (true) {
                 int outputPosition = mainOutputPosition.getUnsafe(tableLocation);
-                if (outputPosition == EMPTY_OUTPUT_POSITION) {
+                if (isStateEmpty(outputPosition)) {
                     numEntries++;
                     mainKeySource0.set(tableLocation, k0);
                     mainKeySource1.set(tableLocation, k1);
@@ -86,6 +86,10 @@ private static int hash(long k0, short k1) {
         return hash;
     }
 
+    private static boolean isStateEmpty(int state) {
+        return state == EMPTY_OUTPUT_POSITION;
+    }
+
     @Override
     protected void rehashInternalFull(final int oldSize) {
         final long[] destKeyArray0 = new long[tableSize];
@@ -100,7 +104,7 @@ protected void rehashInternalFull(final int oldSize) {
         mainOutputPosition.setArray(destState);
         for (int sourceBucket = 0; sourceBucket < oldSize; ++sourceBucket) {
             final int currentStateValue = originalStateArray[sourceBucket];
-            if (currentStateValue == EMPTY_OUTPUT_POSITION) {
+            if (isStateEmpty(currentStateValue)) {
                 continue;
             }
             final long k0 = originalKeyArray0[sourceBucket];
@@ -109,7 +113,7 @@ protected void rehashInternalFull(final int oldSize) {
             final int firstDestinationTableLocation = hashToTableLocation(hash);
             int destinationTableLocation = firstDestinationTableLocation;
             while (true) {
-                if (destState[destinationTableLocation] == EMPTY_OUTPUT_POSITION) {
+                if (isStateEmpty(destState[destinationTableLocation])) {
                     destKeyArray0[destinationTableLocation] = k0;
                     destKeyArray1[destinationTableLocation] = k1;
                     destState[destinationTableLocation] = originalStateArray[sourceBucket];
@@ -134,7 +138,7 @@ public int findPositionForKey(Object key) {
         final int firstTableLocation = tableLocation;
         while (true) {
             final int positionValue = mainOutputPosition.getUnsafe(tableLocation);
-            if (positionValue == EMPTY_OUTPUT_POSITION) {
+            if (isStateEmpty(positionValue)) {
                 return UNKNOWN_ROW;
             }
             if (eq(mainKeySource0.getUnsafe(tableLocation), k0) && eq(mainKeySource1.getUnsafe(tableLocation), k1)) {
diff --git a/engine/table/src/main/java/io/deephaven/engine/table/impl/by/typed/staticopenagg/gen/StaticAggOpenHasherObject.java b/engine/table/src/main/java/io/deephaven/engine/table/impl/by/typed/staticopenagg/gen/StaticAggOpenHasherObject.java
index 8a15f4c92c8..aa69faec489 100644
--- a/engine/table/src/main/java/io/deephaven/engine/table/impl/by/typed/staticopenagg/gen/StaticAggOpenHasherObject.java
+++ b/engine/table/src/main/java/io/deephaven/engine/table/impl/by/typed/staticopenagg/gen/StaticAggOpenHasherObject.java
@@ -47,7 +47,7 @@ protected void build(RowSequence rowSequence, Chunk[] sourceKeyChunks) {
             int tableLocation = firstTableLocation;
             while (true) {
                 int outputPosition = mainOutputPosition.getUnsafe(tableLocation);
-                if (outputPosition == EMPTY_OUTPUT_POSITION) {
+                if (isStateEmpty(outputPosition)) {
                     numEntries++;
                     mainKeySource0.set(tableLocation, k0);
                     outputPosition = nextOutputPosition.getAndIncrement();
@@ -71,6 +71,10 @@ private static int hash(Object k0) {
         return hash;
     }
 
+    private static boolean isStateEmpty(int state) {
+        return state == EMPTY_OUTPUT_POSITION;
+    }
+
     @Override
     protected void rehashInternalFull(final int oldSize) {
         final Object[] destKeyArray0 = new Object[tableSize];
@@ -82,7 +86,7 @@ protected void rehashInternalFull(final int oldSize) {
         mainOutputPosition.setArray(destState);
         for (int sourceBucket = 0; sourceBucket < oldSize; ++sourceBucket) {
             final int currentStateValue = originalStateArray[sourceBucket];
-            if (currentStateValue == EMPTY_OUTPUT_POSITION) {
+            if (isStateEmpty(currentStateValue)) {
                 continue;
             }
             final Object k0 = originalKeyArray0[sourceBucket];
@@ -90,7 +94,7 @@ protected void rehashInternalFull(final int oldSize) {
             final int firstDestinationTableLocation = hashToTableLocation(hash);
             int destinationTableLocation = firstDestinationTableLocation;
             while (true) {
-                if (destState[destinationTableLocation] == EMPTY_OUTPUT_POSITION) {
+                if (isStateEmpty(destState[destinationTableLocation])) {
                     destKeyArray0[destinationTableLocation] = k0;
                     destState[destinationTableLocation] = originalStateArray[sourceBucket];
                     if (sourceBucket != destinationTableLocation) {
@@ -112,7 +116,7 @@ public int findPositionForKey(Object key) {
         final int firstTableLocation = tableLocation;
         while (true) {
             final int positionValue = mainOutputPosition.getUnsafe(tableLocation);
-            if (positionValue == EMPTY_OUTPUT_POSITION) {
+            if (isStateEmpty(positionValue)) {
                 return UNKNOWN_ROW;
             }
             if (eq(mainKeySource0.getUnsafe(tableLocation), k0)) {
diff --git a/engine/table/src/main/java/io/deephaven/engine/table/impl/by/typed/staticopenagg/gen/StaticAggOpenHasherObjectByte.java b/engine/table/src/main/java/io/deephaven/engine/table/impl/by/typed/staticopenagg/gen/StaticAggOpenHasherObjectByte.java
index 60fb48687cd..7776fe9601b 100644
--- a/engine/table/src/main/java/io/deephaven/engine/table/impl/by/typed/staticopenagg/gen/StaticAggOpenHasherObjectByte.java
+++ b/engine/table/src/main/java/io/deephaven/engine/table/impl/by/typed/staticopenagg/gen/StaticAggOpenHasherObjectByte.java
@@ -59,7 +59,7 @@ protected void build(RowSequence rowSequence, Chunk[] sourceKeyChunks) {
             int tableLocation = firstTableLocation;
             while (true) {
                 int outputPosition = mainOutputPosition.getUnsafe(tableLocation);
-                if (outputPosition == EMPTY_OUTPUT_POSITION) {
+                if (isStateEmpty(outputPosition)) {
                     numEntries++;
                     mainKeySource0.set(tableLocation, k0);
                     mainKeySource1.set(tableLocation, k1);
@@ -85,6 +85,10 @@ private static int hash(Object k0, byte k1) {
         return hash;
     }
 
+    private static boolean isStateEmpty(int state) {
+        return state == EMPTY_OUTPUT_POSITION;
+    }
+
     @Override
     protected void rehashInternalFull(final int oldSize) {
         final Object[] destKeyArray0 = new Object[tableSize];
@@ -99,7 +103,7 @@ protected void rehashInternalFull(final int oldSize) {
         mainOutputPosition.setArray(destState);
         for (int sourceBucket = 0; sourceBucket < oldSize; ++sourceBucket) {
             final int currentStateValue = originalStateArray[sourceBucket];
-            if (currentStateValue == EMPTY_OUTPUT_POSITION) {
+            if (isStateEmpty(currentStateValue)) {
                 continue;
             }
             final Object k0 = originalKeyArray0[sourceBucket];
@@ -108,7 +112,7 @@ protected void rehashInternalFull(final int oldSize) {
             final int firstDestinationTableLocation = hashToTableLocation(hash);
             int destinationTableLocation = firstDestinationTableLocation;
             while (true) {
-                if (destState[destinationTableLocation] == EMPTY_OUTPUT_POSITION) {
+                if (isStateEmpty(destState[destinationTableLocation])) {
                     destKeyArray0[destinationTableLocation] = k0;
                     destKeyArray1[destinationTableLocation] = k1;
                     destState[destinationTableLocation] = originalStateArray[sourceBucket];
@@ -133,7 +137,7 @@ public int findPositionForKey(Object key) {
         final int firstTableLocation = tableLocation;
         while (true) {
             final int positionValue = mainOutputPosition.getUnsafe(tableLocation);
-            if (positionValue == EMPTY_OUTPUT_POSITION) {
+            if (isStateEmpty(positionValue)) {
                 return UNKNOWN_ROW;
             }
             if (eq(mainKeySource0.getUnsafe(tableLocation), k0) && eq(mainKeySource1.getUnsafe(tableLocation), k1)) {
diff --git a/engine/table/src/main/java/io/deephaven/engine/table/impl/by/typed/staticopenagg/gen/StaticAggOpenHasherObjectChar.java b/engine/table/src/main/java/io/deephaven/engine/table/impl/by/typed/staticopenagg/gen/StaticAggOpenHasherObjectChar.java
index 4d18927b241..37e2406461b 100644
--- a/engine/table/src/main/java/io/deephaven/engine/table/impl/by/typed/staticopenagg/gen/StaticAggOpenHasherObjectChar.java
+++ b/engine/table/src/main/java/io/deephaven/engine/table/impl/by/typed/staticopenagg/gen/StaticAggOpenHasherObjectChar.java
@@ -59,7 +59,7 @@ protected void build(RowSequence rowSequence, Chunk[] sourceKeyChunks) {
             int tableLocation = firstTableLocation;
             while (true) {
                 int outputPosition = mainOutputPosition.getUnsafe(tableLocation);
-                if (outputPosition == EMPTY_OUTPUT_POSITION) {
+                if (isStateEmpty(outputPosition)) {
                     numEntries++;
                     mainKeySource0.set(tableLocation, k0);
                     mainKeySource1.set(tableLocation, k1);
@@ -85,6 +85,10 @@ private static int hash(Object k0, char k1) {
         return hash;
     }
 
+    private static boolean isStateEmpty(int state) {
+        return state == EMPTY_OUTPUT_POSITION;
+    }
+
     @Override
     protected void rehashInternalFull(final int oldSize) {
         final Object[] destKeyArray0 = new Object[tableSize];
@@ -99,7 +103,7 @@ protected void rehashInternalFull(final int oldSize) {
         mainOutputPosition.setArray(destState);
         for (int sourceBucket = 0; sourceBucket < oldSize; ++sourceBucket) {
             final int currentStateValue = originalStateArray[sourceBucket];
-            if (currentStateValue == EMPTY_OUTPUT_POSITION) {
+            if (isStateEmpty(currentStateValue)) {
                 continue;
             }
             final Object k0 = originalKeyArray0[sourceBucket];
@@ -108,7 +112,7 @@ protected void rehashInternalFull(final int oldSize) {
             final int firstDestinationTableLocation = hashToTableLocation(hash);
             int destinationTableLocation = firstDestinationTableLocation;
             while (true) {
-                if (destState[destinationTableLocation] == EMPTY_OUTPUT_POSITION) {
+                if (isStateEmpty(destState[destinationTableLocation])) {
                     destKeyArray0[destinationTableLocation] = k0;
                     destKeyArray1[destinationTableLocation] = k1;
                     destState[destinationTableLocation] = originalStateArray[sourceBucket];
@@ -133,7 +137,7 @@ public int findPositionForKey(Object key) {
         final int firstTableLocation = tableLocation;
         while (true) {
             final int positionValue = mainOutputPosition.getUnsafe(tableLocation);
-            if (positionValue == EMPTY_OUTPUT_POSITION) {
+            if (isStateEmpty(positionValue)) {
                 return UNKNOWN_ROW;
             }
             if (eq(mainKeySource0.getUnsafe(tableLocation), k0) && eq(mainKeySource1.getUnsafe(tableLocation), k1)) {
diff --git a/engine/table/src/main/java/io/deephaven/engine/table/impl/by/typed/staticopenagg/gen/StaticAggOpenHasherObjectDouble.java b/engine/table/src/main/java/io/deephaven/engine/table/impl/by/typed/staticopenagg/gen/StaticAggOpenHasherObjectDouble.java
index dd716cd1661..3de96501f61 100644
--- a/engine/table/src/main/java/io/deephaven/engine/table/impl/by/typed/staticopenagg/gen/StaticAggOpenHasherObjectDouble.java
+++ b/engine/table/src/main/java/io/deephaven/engine/table/impl/by/typed/staticopenagg/gen/StaticAggOpenHasherObjectDouble.java
@@ -59,7 +59,7 @@ protected void build(RowSequence rowSequence, Chunk[] sourceKeyChunks) {
             int tableLocation = firstTableLocation;
             while (true) {
                 int outputPosition = mainOutputPosition.getUnsafe(tableLocation);
-                if (outputPosition == EMPTY_OUTPUT_POSITION) {
+                if (isStateEmpty(outputPosition)) {
                     numEntries++;
                     mainKeySource0.set(tableLocation, k0);
                     mainKeySource1.set(tableLocation, k1);
@@ -85,6 +85,10 @@ private static int hash(Object k0, double k1) {
         return hash;
     }
 
+    private static boolean isStateEmpty(int state) {
+        return state == EMPTY_OUTPUT_POSITION;
+    }
+
     @Override
     protected void rehashInternalFull(final int oldSize) {
         final Object[] destKeyArray0 = new Object[tableSize];
@@ -99,7 +103,7 @@ protected void rehashInternalFull(final int oldSize) {
         mainOutputPosition.setArray(destState);
         for (int sourceBucket = 0; sourceBucket < oldSize; ++sourceBucket) {
             final int currentStateValue = originalStateArray[sourceBucket];
-            if (currentStateValue == EMPTY_OUTPUT_POSITION) {
+            if (isStateEmpty(currentStateValue)) {
                 continue;
             }
             final Object k0 = originalKeyArray0[sourceBucket];
@@ -108,7 +112,7 @@ protected void rehashInternalFull(final int oldSize) {
             final int firstDestinationTableLocation = hashToTableLocation(hash);
             int destinationTableLocation = firstDestinationTableLocation;
             while (true) {
-                if (destState[destinationTableLocation] == EMPTY_OUTPUT_POSITION) {
+                if (isStateEmpty(destState[destinationTableLocation])) {
                     destKeyArray0[destinationTableLocation] = k0;
                     destKeyArray1[destinationTableLocation] = k1;
                     destState[destinationTableLocation] = originalStateArray[sourceBucket];
@@ -133,7 +137,7 @@ public int findPositionForKey(Object key) {
         final int firstTableLocation = tableLocation;
         while (true) {
             final int positionValue = mainOutputPosition.getUnsafe(tableLocation);
-            if (positionValue == EMPTY_OUTPUT_POSITION) {
+            if (isStateEmpty(positionValue)) {
                 return UNKNOWN_ROW;
             }
             if (eq(mainKeySource0.getUnsafe(tableLocation), k0) && eq(mainKeySource1.getUnsafe(tableLocation), k1)) {
diff --git a/engine/table/src/main/java/io/deephaven/engine/table/impl/by/typed/staticopenagg/gen/StaticAggOpenHasherObjectFloat.java b/engine/table/src/main/java/io/deephaven/engine/table/impl/by/typed/staticopenagg/gen/StaticAggOpenHasherObjectFloat.java
index 6c6d802933a..33f2fd8aa14 100644
--- a/engine/table/src/main/java/io/deephaven/engine/table/impl/by/typed/staticopenagg/gen/StaticAggOpenHasherObjectFloat.java
+++ b/engine/table/src/main/java/io/deephaven/engine/table/impl/by/typed/staticopenagg/gen/StaticAggOpenHasherObjectFloat.java
@@ -59,7 +59,7 @@ protected void build(RowSequence rowSequence, Chunk[] sourceKeyChunks) {
             int tableLocation = firstTableLocation;
             while (true) {
                 int outputPosition = mainOutputPosition.getUnsafe(tableLocation);
-                if (outputPosition == EMPTY_OUTPUT_POSITION) {
+                if (isStateEmpty(outputPosition)) {
                     numEntries++;
                     mainKeySource0.set(tableLocation, k0);
                     mainKeySource1.set(tableLocation, k1);
@@ -85,6 +85,10 @@ private static int hash(Object k0, float k1) {
         return hash;
     }
 
+    private static boolean isStateEmpty(int state) {
+        return state == EMPTY_OUTPUT_POSITION;
+    }
+
     @Override
     protected void rehashInternalFull(final int oldSize) {
         final Object[] destKeyArray0 = new Object[tableSize];
@@ -99,7 +103,7 @@ protected void rehashInternalFull(final int oldSize) {
         mainOutputPosition.setArray(destState);
         for (int sourceBucket = 0; sourceBucket < oldSize; ++sourceBucket) {
             final int currentStateValue = originalStateArray[sourceBucket];
-            if (currentStateValue == EMPTY_OUTPUT_POSITION) {
+            if (isStateEmpty(currentStateValue)) {
                 continue;
             }
             final Object k0 = originalKeyArray0[sourceBucket];
@@ -108,7 +112,7 @@ protected void rehashInternalFull(final int oldSize) {
             final int firstDestinationTableLocation = hashToTableLocation(hash);
             int destinationTableLocation = firstDestinationTableLocation;
             while (true) {
-                if (destState[destinationTableLocation] == EMPTY_OUTPUT_POSITION) {
+                if (isStateEmpty(destState[destinationTableLocation])) {
                     destKeyArray0[destinationTableLocation] = k0;
                     destKeyArray1[destinationTableLocation] = k1;
                     destState[destinationTableLocation] = originalStateArray[sourceBucket];
@@ -133,7 +137,7 @@ public int findPositionForKey(Object key) {
         final int firstTableLocation = tableLocation;
         while (true) {
             final int positionValue = mainOutputPosition.getUnsafe(tableLocation);
-            if (positionValue == EMPTY_OUTPUT_POSITION) {
+            if (isStateEmpty(positionValue)) {
                 return UNKNOWN_ROW;
             }
             if (eq(mainKeySource0.getUnsafe(tableLocation), k0) && eq(mainKeySource1.getUnsafe(tableLocation), k1)) {
diff --git a/engine/table/src/main/java/io/deephaven/engine/table/impl/by/typed/staticopenagg/gen/StaticAggOpenHasherObjectInt.java b/engine/table/src/main/java/io/deephaven/engine/table/impl/by/typed/staticopenagg/gen/StaticAggOpenHasherObjectInt.java
index c427be0000a..8c44e96cc6d 100644
--- a/engine/table/src/main/java/io/deephaven/engine/table/impl/by/typed/staticopenagg/gen/StaticAggOpenHasherObjectInt.java
+++ b/engine/table/src/main/java/io/deephaven/engine/table/impl/by/typed/staticopenagg/gen/StaticAggOpenHasherObjectInt.java
@@ -59,7 +59,7 @@ protected void build(RowSequence rowSequence, Chunk[] sourceKeyChunks) {
             int tableLocation = firstTableLocation;
             while (true) {
                 int outputPosition = mainOutputPosition.getUnsafe(tableLocation);
-                if (outputPosition == EMPTY_OUTPUT_POSITION) {
+                if (isStateEmpty(outputPosition)) {
                     numEntries++;
                     mainKeySource0.set(tableLocation, k0);
                     mainKeySource1.set(tableLocation, k1);
@@ -85,6 +85,10 @@ private static int hash(Object k0, int k1) {
         return hash;
     }
 
+    private static boolean isStateEmpty(int state) {
+        return state == EMPTY_OUTPUT_POSITION;
+    }
+
     @Override
     protected void rehashInternalFull(final int oldSize) {
         final Object[] destKeyArray0 = new Object[tableSize];
@@ -99,7 +103,7 @@ protected void rehashInternalFull(final int oldSize) {
         mainOutputPosition.setArray(destState);
         for (int sourceBucket = 0; sourceBucket < oldSize; ++sourceBucket) {
             final int currentStateValue = originalStateArray[sourceBucket];
-            if (currentStateValue == EMPTY_OUTPUT_POSITION) {
+            if (isStateEmpty(currentStateValue)) {
                 continue;
             }
             final Object k0 = originalKeyArray0[sourceBucket];
@@ -108,7 +112,7 @@ protected void rehashInternalFull(final int oldSize) {
             final int firstDestinationTableLocation = hashToTableLocation(hash);
             int destinationTableLocation = firstDestinationTableLocation;
             while (true) {
-                if (destState[destinationTableLocation] == EMPTY_OUTPUT_POSITION) {
+                if (isStateEmpty(destState[destinationTableLocation])) {
                     destKeyArray0[destinationTableLocation] = k0;
                     destKeyArray1[destinationTableLocation] = k1;
                     destState[destinationTableLocation] = originalStateArray[sourceBucket];
@@ -133,7 +137,7 @@ public int findPositionForKey(Object key) {
         final int firstTableLocation = tableLocation;
         while (true) {
             final int positionValue = mainOutputPosition.getUnsafe(tableLocation);
-            if (positionValue == EMPTY_OUTPUT_POSITION) {
+            if (isStateEmpty(positionValue)) {
                 return UNKNOWN_ROW;
             }
             if (eq(mainKeySource0.getUnsafe(tableLocation), k0) && eq(mainKeySource1.getUnsafe(tableLocation), k1)) {
diff --git a/engine/table/src/main/java/io/deephaven/engine/table/impl/by/typed/staticopenagg/gen/StaticAggOpenHasherObjectLong.java b/engine/table/src/main/java/io/deephaven/engine/table/impl/by/typed/staticopenagg/gen/StaticAggOpenHasherObjectLong.java
index 191e3400221..b38b46727c5 100644
--- a/engine/table/src/main/java/io/deephaven/engine/table/impl/by/typed/staticopenagg/gen/StaticAggOpenHasherObjectLong.java
+++ b/engine/table/src/main/java/io/deephaven/engine/table/impl/by/typed/staticopenagg/gen/StaticAggOpenHasherObjectLong.java
@@ -59,7 +59,7 @@ protected void build(RowSequence rowSequence, Chunk[] sourceKeyChunks) {
             int tableLocation = firstTableLocation;
             while (true) {
                 int outputPosition = mainOutputPosition.getUnsafe(tableLocation);
-                if (outputPosition == EMPTY_OUTPUT_POSITION) {
+                if (isStateEmpty(outputPosition)) {
                     numEntries++;
                     mainKeySource0.set(tableLocation, k0);
                     mainKeySource1.set(tableLocation, k1);
@@ -85,6 +85,10 @@ private static int hash(Object k0, long k1) {
         return hash;
     }
 
+    private static boolean isStateEmpty(int state) {
+        return state == EMPTY_OUTPUT_POSITION;
+    }
+
     @Override
     protected void rehashInternalFull(final int oldSize) {
         final Object[] destKeyArray0 = new Object[tableSize];
@@ -99,7 +103,7 @@ protected void rehashInternalFull(final int oldSize) {
         mainOutputPosition.setArray(destState);
         for (int sourceBucket = 0; sourceBucket < oldSize; ++sourceBucket) {
             final int currentStateValue = originalStateArray[sourceBucket];
-            if (currentStateValue == EMPTY_OUTPUT_POSITION) {
+            if (isStateEmpty(currentStateValue)) {
                 continue;
             }
             final Object k0 = originalKeyArray0[sourceBucket];
@@ -108,7 +112,7 @@ protected void rehashInternalFull(final int oldSize) {
             final int firstDestinationTableLocation = hashToTableLocation(hash);
             int destinationTableLocation = firstDestinationTableLocation;
             while (true) {
-                if (destState[destinationTableLocation] == EMPTY_OUTPUT_POSITION) {
+                if (isStateEmpty(destState[destinationTableLocation])) {
                     destKeyArray0[destinationTableLocation] = k0;
                     destKeyArray1[destinationTableLocation] = k1;
                     destState[destinationTableLocation] = originalStateArray[sourceBucket];
@@ -133,7 +137,7 @@ public int findPositionForKey(Object key) {
         final int firstTableLocation = tableLocation;
         while (true) {
             final int positionValue = mainOutputPosition.getUnsafe(tableLocation);
-            if (positionValue == EMPTY_OUTPUT_POSITION) {
+            if (isStateEmpty(positionValue)) {
                 return UNKNOWN_ROW;
             }
             if (eq(mainKeySource0.getUnsafe(tableLocation), k0) && eq(mainKeySource1.getUnsafe(tableLocation), k1)) {
diff --git a/engine/table/src/main/java/io/deephaven/engine/table/impl/by/typed/staticopenagg/gen/StaticAggOpenHasherObjectObject.java b/engine/table/src/main/java/io/deephaven/engine/table/impl/by/typed/staticopenagg/gen/StaticAggOpenHasherObjectObject.java
index 341ad436f4d..8d25f0185f6 100644
--- a/engine/table/src/main/java/io/deephaven/engine/table/impl/by/typed/staticopenagg/gen/StaticAggOpenHasherObjectObject.java
+++ b/engine/table/src/main/java/io/deephaven/engine/table/impl/by/typed/staticopenagg/gen/StaticAggOpenHasherObjectObject.java
@@ -53,7 +53,7 @@ protected void build(RowSequence rowSequence, Chunk[] sourceKeyChunks) {
             int tableLocation = firstTableLocation;
             while (true) {
                 int outputPosition = mainOutputPosition.getUnsafe(tableLocation);
-                if (outputPosition == EMPTY_OUTPUT_POSITION) {
+                if (isStateEmpty(outputPosition)) {
                     numEntries++;
                     mainKeySource0.set(tableLocation, k0);
                     mainKeySource1.set(tableLocation, k1);
@@ -79,6 +79,10 @@ private static int hash(Object k0, Object k1) {
         return hash;
     }
 
+    private static boolean isStateEmpty(int state) {
+        return state == EMPTY_OUTPUT_POSITION;
+    }
+
     @Override
     protected void rehashInternalFull(final int oldSize) {
         final Object[] destKeyArray0 = new Object[tableSize];
@@ -93,7 +97,7 @@ protected void rehashInternalFull(final int oldSize) {
         mainOutputPosition.setArray(destState);
         for (int sourceBucket = 0; sourceBucket < oldSize; ++sourceBucket) {
             final int currentStateValue = originalStateArray[sourceBucket];
-            if (currentStateValue == EMPTY_OUTPUT_POSITION) {
+            if (isStateEmpty(currentStateValue)) {
                 continue;
             }
             final Object k0 = originalKeyArray0[sourceBucket];
@@ -102,7 +106,7 @@ protected void rehashInternalFull(final int oldSize) {
             final int firstDestinationTableLocation = hashToTableLocation(hash);
             int destinationTableLocation = firstDestinationTableLocation;
             while (true) {
-                if (destState[destinationTableLocation] == EMPTY_OUTPUT_POSITION) {
+                if (isStateEmpty(destState[destinationTableLocation])) {
                     destKeyArray0[destinationTableLocation] = k0;
                     destKeyArray1[destinationTableLocation] = k1;
                     destState[destinationTableLocation] = originalStateArray[sourceBucket];
@@ -127,7 +131,7 @@ public int findPositionForKey(Object key) {
         final int firstTableLocation = tableLocation;
         while (true) {
             final int positionValue = mainOutputPosition.getUnsafe(tableLocation);
-            if (positionValue == EMPTY_OUTPUT_POSITION) {
+            if (isStateEmpty(positionValue)) {
                 return UNKNOWN_ROW;
             }
             if (eq(mainKeySource0.getUnsafe(tableLocation), k0) && eq(mainKeySource1.getUnsafe(tableLocation), k1)) {
diff --git a/engine/table/src/main/java/io/deephaven/engine/table/impl/by/typed/staticopenagg/gen/StaticAggOpenHasherObjectShort.java b/engine/table/src/main/java/io/deephaven/engine/table/impl/by/typed/staticopenagg/gen/StaticAggOpenHasherObjectShort.java
index 41c2c6f97a8..b79d6584a8e 100644
--- a/engine/table/src/main/java/io/deephaven/engine/table/impl/by/typed/staticopenagg/gen/StaticAggOpenHasherObjectShort.java
+++ b/engine/table/src/main/java/io/deephaven/engine/table/impl/by/typed/staticopenagg/gen/StaticAggOpenHasherObjectShort.java
@@ -59,7 +59,7 @@ protected void build(RowSequence rowSequence, Chunk[] sourceKeyChunks) {
             int tableLocation = firstTableLocation;
             while (true) {
                 int outputPosition = mainOutputPosition.getUnsafe(tableLocation);
-                if (outputPosition == EMPTY_OUTPUT_POSITION) {
+                if (isStateEmpty(outputPosition)) {
                     numEntries++;
                     mainKeySource0.set(tableLocation, k0);
                     mainKeySource1.set(tableLocation, k1);
@@ -85,6 +85,10 @@ private static int hash(Object k0, short k1) {
         return hash;
     }
 
+    private static boolean isStateEmpty(int state) {
+        return state == EMPTY_OUTPUT_POSITION;
+    }
+
     @Override
     protected void rehashInternalFull(final int oldSize) {
         final Object[] destKeyArray0 = new Object[tableSize];
@@ -99,7 +103,7 @@ protected void rehashInternalFull(final int oldSize) {
         mainOutputPosition.setArray(destState);
         for (int sourceBucket = 0; sourceBucket < oldSize; ++sourceBucket) {
             final int currentStateValue = originalStateArray[sourceBucket];
-            if (currentStateValue == EMPTY_OUTPUT_POSITION) {
+            if (isStateEmpty(currentStateValue)) {
                 continue;
             }
             final Object k0 = originalKeyArray0[sourceBucket];
@@ -108,7 +112,7 @@ protected void rehashInternalFull(final int oldSize) {
             final int firstDestinationTableLocation = hashToTableLocation(hash);
             int destinationTableLocation = firstDestinationTableLocation;
             while (true) {
-                if (destState[destinationTableLocation] == EMPTY_OUTPUT_POSITION) {
+                if (isStateEmpty(destState[destinationTableLocation])) {
                     destKeyArray0[destinationTableLocation] = k0;
                     destKeyArray1[destinationTableLocation] = k1;
                     destState[destinationTableLocation] = originalStateArray[sourceBucket];
@@ -133,7 +137,7 @@ public int findPositionForKey(Object key) {
         final int firstTableLocation = tableLocation;
         while (true) {
             final int positionValue = mainOutputPosition.getUnsafe(tableLocation);
-            if (positionValue == EMPTY_OUTPUT_POSITION) {
+            if (isStateEmpty(positionValue)) {
                 return UNKNOWN_ROW;
             }
             if (eq(mainKeySource0.getUnsafe(tableLocation), k0) && eq(mainKeySource1.getUnsafe(tableLocation), k1)) {
diff --git a/engine/table/src/main/java/io/deephaven/engine/table/impl/by/typed/staticopenagg/gen/StaticAggOpenHasherShort.java b/engine/table/src/main/java/io/deephaven/engine/table/impl/by/typed/staticopenagg/gen/StaticAggOpenHasherShort.java
index 8e795a1834e..e9ca43dda68 100644
--- a/engine/table/src/main/java/io/deephaven/engine/table/impl/by/typed/staticopenagg/gen/StaticAggOpenHasherShort.java
+++ b/engine/table/src/main/java/io/deephaven/engine/table/impl/by/typed/staticopenagg/gen/StaticAggOpenHasherShort.java
@@ -49,7 +49,7 @@ protected void build(RowSequence rowSequence, Chunk[] sourceKeyChunks) {
             int tableLocation = firstTableLocation;
             while (true) {
                 int outputPosition = mainOutputPosition.getUnsafe(tableLocation);
-                if (outputPosition == EMPTY_OUTPUT_POSITION) {
+                if (isStateEmpty(outputPosition)) {
                     numEntries++;
                     mainKeySource0.set(tableLocation, k0);
                     outputPosition = nextOutputPosition.getAndIncrement();
@@ -73,6 +73,10 @@ private static int hash(short k0) {
         return hash;
     }
 
+    private static boolean isStateEmpty(int state) {
+        return state == EMPTY_OUTPUT_POSITION;
+    }
+
     @Override
     protected void rehashInternalFull(final int oldSize) {
         final short[] destKeyArray0 = new short[tableSize];
@@ -84,7 +88,7 @@ protected void rehashInternalFull(final int oldSize) {
         mainOutputPosition.setArray(destState);
         for (int sourceBucket = 0; sourceBucket < oldSize; ++sourceBucket) {
             final int currentStateValue = originalStateArray[sourceBucket];
-            if (currentStateValue == EMPTY_OUTPUT_POSITION) {
+            if (isStateEmpty(currentStateValue)) {
                 continue;
             }
             final short k0 = originalKeyArray0[sourceBucket];
@@ -92,7 +96,7 @@ protected void rehashInternalFull(final int oldSize) {
             final int firstDestinationTableLocation = hashToTableLocation(hash);
             int destinationTableLocation = firstDestinationTableLocation;
             while (true) {
-                if (destState[destinationTableLocation] == EMPTY_OUTPUT_POSITION) {
+                if (isStateEmpty(destState[destinationTableLocation])) {
                     destKeyArray0[destinationTableLocation] = k0;
                     destState[destinationTableLocation] = originalStateArray[sourceBucket];
                     if (sourceBucket != destinationTableLocation) {
@@ -114,7 +118,7 @@ public int findPositionForKey(Object key) {
         final int firstTableLocation = tableLocation;
         while (true) {
             final int positionValue = mainOutputPosition.getUnsafe(tableLocation);
-            if (positionValue == EMPTY_OUTPUT_POSITION) {
+            if (isStateEmpty(positionValue)) {
                 return UNKNOWN_ROW;
             }
             if (eq(mainKeySource0.getUnsafe(tableLocation), k0)) {
diff --git a/engine/table/src/main/java/io/deephaven/engine/table/impl/by/typed/staticopenagg/gen/StaticAggOpenHasherShortByte.java b/engine/table/src/main/java/io/deephaven/engine/table/impl/by/typed/staticopenagg/gen/StaticAggOpenHasherShortByte.java
index ad5b9377567..9c49fa74d7c 100644
--- a/engine/table/src/main/java/io/deephaven/engine/table/impl/by/typed/staticopenagg/gen/StaticAggOpenHasherShortByte.java
+++ b/engine/table/src/main/java/io/deephaven/engine/table/impl/by/typed/staticopenagg/gen/StaticAggOpenHasherShortByte.java
@@ -60,7 +60,7 @@ protected void build(RowSequence rowSequence, Chunk[] sourceKeyChunks) {
             int tableLocation = firstTableLocation;
             while (true) {
                 int outputPosition = mainOutputPosition.getUnsafe(tableLocation);
-                if (outputPosition == EMPTY_OUTPUT_POSITION) {
+                if (isStateEmpty(outputPosition)) {
                     numEntries++;
                     mainKeySource0.set(tableLocation, k0);
                     mainKeySource1.set(tableLocation, k1);
@@ -86,6 +86,10 @@ private static int hash(short k0, byte k1) {
         return hash;
     }
 
+    private static boolean isStateEmpty(int state) {
+        return state == EMPTY_OUTPUT_POSITION;
+    }
+
     @Override
     protected void rehashInternalFull(final int oldSize) {
         final short[] destKeyArray0 = new short[tableSize];
@@ -100,7 +104,7 @@ protected void rehashInternalFull(final int oldSize) {
         mainOutputPosition.setArray(destState);
         for (int sourceBucket = 0; sourceBucket < oldSize; ++sourceBucket) {
             final int currentStateValue = originalStateArray[sourceBucket];
-            if (currentStateValue == EMPTY_OUTPUT_POSITION) {
+            if (isStateEmpty(currentStateValue)) {
                 continue;
             }
             final short k0 = originalKeyArray0[sourceBucket];
@@ -109,7 +113,7 @@ protected void rehashInternalFull(final int oldSize) {
             final int firstDestinationTableLocation = hashToTableLocation(hash);
             int destinationTableLocation = firstDestinationTableLocation;
             while (true) {
-                if (destState[destinationTableLocation] == EMPTY_OUTPUT_POSITION) {
+                if (isStateEmpty(destState[destinationTableLocation])) {
                     destKeyArray0[destinationTableLocation] = k0;
                     destKeyArray1[destinationTableLocation] = k1;
                     destState[destinationTableLocation] = originalStateArray[sourceBucket];
@@ -134,7 +138,7 @@ public int findPositionForKey(Object key) {
         final int firstTableLocation = tableLocation;
         while (true) {
             final int positionValue = mainOutputPosition.getUnsafe(tableLocation);
-            if (positionValue == EMPTY_OUTPUT_POSITION) {
+            if (isStateEmpty(positionValue)) {
                 return UNKNOWN_ROW;
             }
             if (eq(mainKeySource0.getUnsafe(tableLocation), k0) && eq(mainKeySource1.getUnsafe(tableLocation), k1)) {
diff --git a/engine/table/src/main/java/io/deephaven/engine/table/impl/by/typed/staticopenagg/gen/StaticAggOpenHasherShortChar.java b/engine/table/src/main/java/io/deephaven/engine/table/impl/by/typed/staticopenagg/gen/StaticAggOpenHasherShortChar.java
index a883f69f9e4..1039b74c71a 100644
--- a/engine/table/src/main/java/io/deephaven/engine/table/impl/by/typed/staticopenagg/gen/StaticAggOpenHasherShortChar.java
+++ b/engine/table/src/main/java/io/deephaven/engine/table/impl/by/typed/staticopenagg/gen/StaticAggOpenHasherShortChar.java
@@ -60,7 +60,7 @@ protected void build(RowSequence rowSequence, Chunk[] sourceKeyChunks) {
             int tableLocation = firstTableLocation;
             while (true) {
                 int outputPosition = mainOutputPosition.getUnsafe(tableLocation);
-                if (outputPosition == EMPTY_OUTPUT_POSITION) {
+                if (isStateEmpty(outputPosition)) {
                     numEntries++;
                     mainKeySource0.set(tableLocation, k0);
                     mainKeySource1.set(tableLocation, k1);
@@ -86,6 +86,10 @@ private static int hash(short k0, char k1) {
         return hash;
     }
 
+    private static boolean isStateEmpty(int state) {
+        return state == EMPTY_OUTPUT_POSITION;
+    }
+
     @Override
     protected void rehashInternalFull(final int oldSize) {
         final short[] destKeyArray0 = new short[tableSize];
@@ -100,7 +104,7 @@ protected void rehashInternalFull(final int oldSize) {
         mainOutputPosition.setArray(destState);
         for (int sourceBucket = 0; sourceBucket < oldSize; ++sourceBucket) {
             final int currentStateValue = originalStateArray[sourceBucket];
-            if (currentStateValue == EMPTY_OUTPUT_POSITION) {
+            if (isStateEmpty(currentStateValue)) {
                 continue;
             }
             final short k0 = originalKeyArray0[sourceBucket];
@@ -109,7 +113,7 @@ protected void rehashInternalFull(final int oldSize) {
             final int firstDestinationTableLocation = hashToTableLocation(hash);
             int destinationTableLocation = firstDestinationTableLocation;
             while (true) {
-                if (destState[destinationTableLocation] == EMPTY_OUTPUT_POSITION) {
+                if (isStateEmpty(destState[destinationTableLocation])) {
                     destKeyArray0[destinationTableLocation] = k0;
                     destKeyArray1[destinationTableLocation] = k1;
                     destState[destinationTableLocation] = originalStateArray[sourceBucket];
@@ -134,7 +138,7 @@ public int findPositionForKey(Object key) {
         final int firstTableLocation = tableLocation;
         while (true) {
             final int positionValue = mainOutputPosition.getUnsafe(tableLocation);
-            if (positionValue == EMPTY_OUTPUT_POSITION) {
+            if (isStateEmpty(positionValue)) {
                 return UNKNOWN_ROW;
             }
             if (eq(mainKeySource0.getUnsafe(tableLocation), k0) && eq(mainKeySource1.getUnsafe(tableLocation), k1)) {
diff --git a/engine/table/src/main/java/io/deephaven/engine/table/impl/by/typed/staticopenagg/gen/StaticAggOpenHasherShortDouble.java b/engine/table/src/main/java/io/deephaven/engine/table/impl/by/typed/staticopenagg/gen/StaticAggOpenHasherShortDouble.java
index 7622ad7bc0a..5bb0ade119f 100644
--- a/engine/table/src/main/java/io/deephaven/engine/table/impl/by/typed/staticopenagg/gen/StaticAggOpenHasherShortDouble.java
+++ b/engine/table/src/main/java/io/deephaven/engine/table/impl/by/typed/staticopenagg/gen/StaticAggOpenHasherShortDouble.java
@@ -60,7 +60,7 @@ protected void build(RowSequence rowSequence, Chunk[] sourceKeyChunks) {
             int tableLocation = firstTableLocation;
             while (true) {
                 int outputPosition = mainOutputPosition.getUnsafe(tableLocation);
-                if (outputPosition == EMPTY_OUTPUT_POSITION) {
+                if (isStateEmpty(outputPosition)) {
                     numEntries++;
                     mainKeySource0.set(tableLocation, k0);
                     mainKeySource1.set(tableLocation, k1);
@@ -86,6 +86,10 @@ private static int hash(short k0, double k1) {
         return hash;
     }
 
+    private static boolean isStateEmpty(int state) {
+        return state == EMPTY_OUTPUT_POSITION;
+    }
+
     @Override
     protected void rehashInternalFull(final int oldSize) {
         final short[] destKeyArray0 = new short[tableSize];
@@ -100,7 +104,7 @@ protected void rehashInternalFull(final int oldSize) {
         mainOutputPosition.setArray(destState);
         for (int sourceBucket = 0; sourceBucket < oldSize; ++sourceBucket) {
             final int currentStateValue = originalStateArray[sourceBucket];
-            if (currentStateValue == EMPTY_OUTPUT_POSITION) {
+            if (isStateEmpty(currentStateValue)) {
                 continue;
             }
             final short k0 = originalKeyArray0[sourceBucket];
@@ -109,7 +113,7 @@ protected void rehashInternalFull(final int oldSize) {
             final int firstDestinationTableLocation = hashToTableLocation(hash);
             int destinationTableLocation = firstDestinationTableLocation;
             while (true) {
-                if (destState[destinationTableLocation] == EMPTY_OUTPUT_POSITION) {
+                if (isStateEmpty(destState[destinationTableLocation])) {
                     destKeyArray0[destinationTableLocation] = k0;
                     destKeyArray1[destinationTableLocation] = k1;
                     destState[destinationTableLocation] = originalStateArray[sourceBucket];
@@ -134,7 +138,7 @@ public int findPositionForKey(Object key) {
         final int firstTableLocation = tableLocation;
         while (true) {
             final int positionValue = mainOutputPosition.getUnsafe(tableLocation);
-            if (positionValue == EMPTY_OUTPUT_POSITION) {
+            if (isStateEmpty(positionValue)) {
                 return UNKNOWN_ROW;
             }
             if (eq(mainKeySource0.getUnsafe(tableLocation), k0) && eq(mainKeySource1.getUnsafe(tableLocation), k1)) {
diff --git a/engine/table/src/main/java/io/deephaven/engine/table/impl/by/typed/staticopenagg/gen/StaticAggOpenHasherShortFloat.java b/engine/table/src/main/java/io/deephaven/engine/table/impl/by/typed/staticopenagg/gen/StaticAggOpenHasherShortFloat.java
index 4a3305ab9c0..bd3474926cc 100644
--- a/engine/table/src/main/java/io/deephaven/engine/table/impl/by/typed/staticopenagg/gen/StaticAggOpenHasherShortFloat.java
+++ b/engine/table/src/main/java/io/deephaven/engine/table/impl/by/typed/staticopenagg/gen/StaticAggOpenHasherShortFloat.java
@@ -60,7 +60,7 @@ protected void build(RowSequence rowSequence, Chunk[] sourceKeyChunks) {
             int tableLocation = firstTableLocation;
             while (true) {
                 int outputPosition = mainOutputPosition.getUnsafe(tableLocation);
-                if (outputPosition == EMPTY_OUTPUT_POSITION) {
+                if (isStateEmpty(outputPosition)) {
                     numEntries++;
                     mainKeySource0.set(tableLocation, k0);
                     mainKeySource1.set(tableLocation, k1);
@@ -86,6 +86,10 @@ private static int hash(short k0, float k1) {
         return hash;
     }
 
+    private static boolean isStateEmpty(int state) {
+        return state == EMPTY_OUTPUT_POSITION;
+    }
+
     @Override
     protected void rehashInternalFull(final int oldSize) {
         final short[] destKeyArray0 = new short[tableSize];
@@ -100,7 +104,7 @@ protected void rehashInternalFull(final int oldSize) {
         mainOutputPosition.setArray(destState);
         for (int sourceBucket = 0; sourceBucket < oldSize; ++sourceBucket) {
             final int currentStateValue = originalStateArray[sourceBucket];
-            if (currentStateValue == EMPTY_OUTPUT_POSITION) {
+            if (isStateEmpty(currentStateValue)) {
                 continue;
             }
             final short k0 = originalKeyArray0[sourceBucket];
@@ -109,7 +113,7 @@ protected void rehashInternalFull(final int oldSize) {
             final int firstDestinationTableLocation = hashToTableLocation(hash);
             int destinationTableLocation = firstDestinationTableLocation;
             while (true) {
-                if (destState[destinationTableLocation] == EMPTY_OUTPUT_POSITION) {
+                if (isStateEmpty(destState[destinationTableLocation])) {
                     destKeyArray0[destinationTableLocation] = k0;
                     destKeyArray1[destinationTableLocation] = k1;
                     destState[destinationTableLocation] = originalStateArray[sourceBucket];
@@ -134,7 +138,7 @@ public int findPositionForKey(Object key) {
         final int firstTableLocation = tableLocation;
         while (true) {
             final int positionValue = mainOutputPosition.getUnsafe(tableLocation);
-            if (positionValue == EMPTY_OUTPUT_POSITION) {
+            if (isStateEmpty(positionValue)) {
                 return UNKNOWN_ROW;
             }
             if (eq(mainKeySource0.getUnsafe(tableLocation), k0) && eq(mainKeySource1.getUnsafe(tableLocation), k1)) {
diff --git a/engine/table/src/main/java/io/deephaven/engine/table/impl/by/typed/staticopenagg/gen/StaticAggOpenHasherShortInt.java b/engine/table/src/main/java/io/deephaven/engine/table/impl/by/typed/staticopenagg/gen/StaticAggOpenHasherShortInt.java
index ff6b97c6ceb..1a52cb42d25 100644
--- a/engine/table/src/main/java/io/deephaven/engine/table/impl/by/typed/staticopenagg/gen/StaticAggOpenHasherShortInt.java
+++ b/engine/table/src/main/java/io/deephaven/engine/table/impl/by/typed/staticopenagg/gen/StaticAggOpenHasherShortInt.java
@@ -60,7 +60,7 @@ protected void build(RowSequence rowSequence, Chunk[] sourceKeyChunks) {
             int tableLocation = firstTableLocation;
             while (true) {
                 int outputPosition = mainOutputPosition.getUnsafe(tableLocation);
-                if (outputPosition == EMPTY_OUTPUT_POSITION) {
+                if (isStateEmpty(outputPosition)) {
                     numEntries++;
                     mainKeySource0.set(tableLocation, k0);
                     mainKeySource1.set(tableLocation, k1);
@@ -86,6 +86,10 @@ private static int hash(short k0, int k1) {
         return hash;
     }
 
+    private static boolean isStateEmpty(int state) {
+        return state == EMPTY_OUTPUT_POSITION;
+    }
+
     @Override
     protected void rehashInternalFull(final int oldSize) {
         final short[] destKeyArray0 = new short[tableSize];
@@ -100,7 +104,7 @@ protected void rehashInternalFull(final int oldSize) {
         mainOutputPosition.setArray(destState);
         for (int sourceBucket = 0; sourceBucket < oldSize; ++sourceBucket) {
             final int currentStateValue = originalStateArray[sourceBucket];
-            if (currentStateValue == EMPTY_OUTPUT_POSITION) {
+            if (isStateEmpty(currentStateValue)) {
                 continue;
             }
             final short k0 = originalKeyArray0[sourceBucket];
@@ -109,7 +113,7 @@ protected void rehashInternalFull(final int oldSize) {
             final int firstDestinationTableLocation = hashToTableLocation(hash);
             int destinationTableLocation = firstDestinationTableLocation;
             while (true) {
-                if (destState[destinationTableLocation] == EMPTY_OUTPUT_POSITION) {
+                if (isStateEmpty(destState[destinationTableLocation])) {
                     destKeyArray0[destinationTableLocation] = k0;
                     destKeyArray1[destinationTableLocation] = k1;
                     destState[destinationTableLocation] = originalStateArray[sourceBucket];
@@ -134,7 +138,7 @@ public int findPositionForKey(Object key) {
         final int firstTableLocation = tableLocation;
         while (true) {
             final int positionValue = mainOutputPosition.getUnsafe(tableLocation);
-            if (positionValue == EMPTY_OUTPUT_POSITION) {
+            if (isStateEmpty(positionValue)) {
                 return UNKNOWN_ROW;
             }
             if (eq(mainKeySource0.getUnsafe(tableLocation), k0) && eq(mainKeySource1.getUnsafe(tableLocation), k1)) {
diff --git a/engine/table/src/main/java/io/deephaven/engine/table/impl/by/typed/staticopenagg/gen/StaticAggOpenHasherShortLong.java b/engine/table/src/main/java/io/deephaven/engine/table/impl/by/typed/staticopenagg/gen/StaticAggOpenHasherShortLong.java
index 982958c9441..c416cd9cd16 100644
--- a/engine/table/src/main/java/io/deephaven/engine/table/impl/by/typed/staticopenagg/gen/StaticAggOpenHasherShortLong.java
+++ b/engine/table/src/main/java/io/deephaven/engine/table/impl/by/typed/staticopenagg/gen/StaticAggOpenHasherShortLong.java
@@ -60,7 +60,7 @@ protected void build(RowSequence rowSequence, Chunk[] sourceKeyChunks) {
             int tableLocation = firstTableLocation;
             while (true) {
                 int outputPosition = mainOutputPosition.getUnsafe(tableLocation);
-                if (outputPosition == EMPTY_OUTPUT_POSITION) {
+                if (isStateEmpty(outputPosition)) {
                     numEntries++;
                     mainKeySource0.set(tableLocation, k0);
                     mainKeySource1.set(tableLocation, k1);
@@ -86,6 +86,10 @@ private static int hash(short k0, long k1) {
         return hash;
     }
 
+    private static boolean isStateEmpty(int state) {
+        return state == EMPTY_OUTPUT_POSITION;
+    }
+
     @Override
     protected void rehashInternalFull(final int oldSize) {
         final short[] destKeyArray0 = new short[tableSize];
@@ -100,7 +104,7 @@ protected void rehashInternalFull(final int oldSize) {
         mainOutputPosition.setArray(destState);
         for (int sourceBucket = 0; sourceBucket < oldSize; ++sourceBucket) {
             final int currentStateValue = originalStateArray[sourceBucket];
-            if (currentStateValue == EMPTY_OUTPUT_POSITION) {
+            if (isStateEmpty(currentStateValue)) {
                 continue;
             }
             final short k0 = originalKeyArray0[sourceBucket];
@@ -109,7 +113,7 @@ protected void rehashInternalFull(final int oldSize) {
             final int firstDestinationTableLocation = hashToTableLocation(hash);
             int destinationTableLocation = firstDestinationTableLocation;
             while (true) {
-                if (destState[destinationTableLocation] == EMPTY_OUTPUT_POSITION) {
+                if (isStateEmpty(destState[destinationTableLocation])) {
                     destKeyArray0[destinationTableLocation] = k0;
                     destKeyArray1[destinationTableLocation] = k1;
                     destState[destinationTableLocation] = originalStateArray[sourceBucket];
@@ -134,7 +138,7 @@ public int findPositionForKey(Object key) {
         final int firstTableLocation = tableLocation;
         while (true) {
             final int positionValue = mainOutputPosition.getUnsafe(tableLocation);
-            if (positionValue == EMPTY_OUTPUT_POSITION) {
+            if (isStateEmpty(positionValue)) {
                 return UNKNOWN_ROW;
             }
             if (eq(mainKeySource0.getUnsafe(tableLocation), k0) && eq(mainKeySource1.getUnsafe(tableLocation), k1)) {
diff --git a/engine/table/src/main/java/io/deephaven/engine/table/impl/by/typed/staticopenagg/gen/StaticAggOpenHasherShortObject.java b/engine/table/src/main/java/io/deephaven/engine/table/impl/by/typed/staticopenagg/gen/StaticAggOpenHasherShortObject.java
index a37209555d0..b00caae234a 100644
--- a/engine/table/src/main/java/io/deephaven/engine/table/impl/by/typed/staticopenagg/gen/StaticAggOpenHasherShortObject.java
+++ b/engine/table/src/main/java/io/deephaven/engine/table/impl/by/typed/staticopenagg/gen/StaticAggOpenHasherShortObject.java
@@ -59,7 +59,7 @@ protected void build(RowSequence rowSequence, Chunk[] sourceKeyChunks) {
             int tableLocation = firstTableLocation;
             while (true) {
                 int outputPosition = mainOutputPosition.getUnsafe(tableLocation);
-                if (outputPosition == EMPTY_OUTPUT_POSITION) {
+                if (isStateEmpty(outputPosition)) {
                     numEntries++;
                     mainKeySource0.set(tableLocation, k0);
                     mainKeySource1.set(tableLocation, k1);
@@ -85,6 +85,10 @@ private static int hash(short k0, Object k1) {
         return hash;
     }
 
+    private static boolean isStateEmpty(int state) {
+        return state == EMPTY_OUTPUT_POSITION;
+    }
+
     @Override
     protected void rehashInternalFull(final int oldSize) {
         final short[] destKeyArray0 = new short[tableSize];
@@ -99,7 +103,7 @@ protected void rehashInternalFull(final int oldSize) {
         mainOutputPosition.setArray(destState);
         for (int sourceBucket = 0; sourceBucket < oldSize; ++sourceBucket) {
             final int currentStateValue = originalStateArray[sourceBucket];
-            if (currentStateValue == EMPTY_OUTPUT_POSITION) {
+            if (isStateEmpty(currentStateValue)) {
                 continue;
             }
             final short k0 = originalKeyArray0[sourceBucket];
@@ -108,7 +112,7 @@ protected void rehashInternalFull(final int oldSize) {
             final int firstDestinationTableLocation = hashToTableLocation(hash);
             int destinationTableLocation = firstDestinationTableLocation;
             while (true) {
-                if (destState[destinationTableLocation] == EMPTY_OUTPUT_POSITION) {
+                if (isStateEmpty(destState[destinationTableLocation])) {
                     destKeyArray0[destinationTableLocation] = k0;
                     destKeyArray1[destinationTableLocation] = k1;
                     destState[destinationTableLocation] = originalStateArray[sourceBucket];
@@ -133,7 +137,7 @@ public int findPositionForKey(Object key) {
         final int firstTableLocation = tableLocation;
         while (true) {
             final int positionValue = mainOutputPosition.getUnsafe(tableLocation);
-            if (positionValue == EMPTY_OUTPUT_POSITION) {
+            if (isStateEmpty(positionValue)) {
                 return UNKNOWN_ROW;
             }
             if (eq(mainKeySource0.getUnsafe(tableLocation), k0) && eq(mainKeySource1.getUnsafe(tableLocation), k1)) {
diff --git a/engine/table/src/main/java/io/deephaven/engine/table/impl/by/typed/staticopenagg/gen/StaticAggOpenHasherShortShort.java b/engine/table/src/main/java/io/deephaven/engine/table/impl/by/typed/staticopenagg/gen/StaticAggOpenHasherShortShort.java
index 861b9bd31e4..204d1a03484 100644
--- a/engine/table/src/main/java/io/deephaven/engine/table/impl/by/typed/staticopenagg/gen/StaticAggOpenHasherShortShort.java
+++ b/engine/table/src/main/java/io/deephaven/engine/table/impl/by/typed/staticopenagg/gen/StaticAggOpenHasherShortShort.java
@@ -55,7 +55,7 @@ protected void build(RowSequence rowSequence, Chunk[] sourceKeyChunks) {
             int tableLocation = firstTableLocation;
             while (true) {
                 int outputPosition = mainOutputPosition.getUnsafe(tableLocation);
-                if (outputPosition == EMPTY_OUTPUT_POSITION) {
+                if (isStateEmpty(outputPosition)) {
                     numEntries++;
                     mainKeySource0.set(tableLocation, k0);
                     mainKeySource1.set(tableLocation, k1);
@@ -81,6 +81,10 @@ private static int hash(short k0, short k1) {
         return hash;
     }
 
+    private static boolean isStateEmpty(int state) {
+        return state == EMPTY_OUTPUT_POSITION;
+    }
+
     @Override
     protected void rehashInternalFull(final int oldSize) {
         final short[] destKeyArray0 = new short[tableSize];
@@ -95,7 +99,7 @@ protected void rehashInternalFull(final int oldSize) {
         mainOutputPosition.setArray(destState);
         for (int sourceBucket = 0; sourceBucket < oldSize; ++sourceBucket) {
             final int currentStateValue = originalStateArray[sourceBucket];
-            if (currentStateValue == EMPTY_OUTPUT_POSITION) {
+            if (isStateEmpty(currentStateValue)) {
                 continue;
             }
             final short k0 = originalKeyArray0[sourceBucket];
@@ -104,7 +108,7 @@ protected void rehashInternalFull(final int oldSize) {
             final int firstDestinationTableLocation = hashToTableLocation(hash);
             int destinationTableLocation = firstDestinationTableLocation;
             while (true) {
-                if (destState[destinationTableLocation] == EMPTY_OUTPUT_POSITION) {
+                if (isStateEmpty(destState[destinationTableLocation])) {
                     destKeyArray0[destinationTableLocation] = k0;
                     destKeyArray1[destinationTableLocation] = k1;
                     destState[destinationTableLocation] = originalStateArray[sourceBucket];
@@ -129,7 +133,7 @@ public int findPositionForKey(Object key) {
         final int firstTableLocation = tableLocation;
         while (true) {
             final int positionValue = mainOutputPosition.getUnsafe(tableLocation);
-            if (positionValue == EMPTY_OUTPUT_POSITION) {
+            if (isStateEmpty(positionValue)) {
                 return UNKNOWN_ROW;
             }
             if (eq(mainKeySource0.getUnsafe(tableLocation), k0) && eq(mainKeySource1.getUnsafe(tableLocation), k1)) {
diff --git a/engine/table/src/main/java/io/deephaven/engine/table/impl/chunkfilter/ByteChunkFilter.java b/engine/table/src/main/java/io/deephaven/engine/table/impl/chunkfilter/ByteChunkFilter.java
new file mode 100644
index 00000000000..b32ba2935d2
--- /dev/null
+++ b/engine/table/src/main/java/io/deephaven/engine/table/impl/chunkfilter/ByteChunkFilter.java
@@ -0,0 +1,67 @@
+//
+// Copyright (c) 2016-2024 Deephaven Data Labs and Patent Pending
+//
+// ****** AUTO-GENERATED CLASS - DO NOT EDIT MANUALLY
+// ****** Edit CharChunkFilter and run "./gradlew replicateChunkFilters" to regenerate
+//
+// @formatter:off
+package io.deephaven.engine.table.impl.chunkfilter;
+
+import io.deephaven.chunk.*;
+import io.deephaven.chunk.attributes.Values;
+import io.deephaven.engine.rowset.chunkattributes.OrderedRowKeys;
+
+public abstract class ByteChunkFilter implements ChunkFilter {
+    public abstract boolean matches(byte value);
+
+    @Override
+    public final void filter(
+            final Chunk<? extends Values> values,
+            final LongChunk<OrderedRowKeys> keys,
+            final WritableLongChunk<OrderedRowKeys> results) {
+        final ByteChunk<? extends Values> byteChunk = values.asByteChunk();
+        final int len = byteChunk.size();
+
+        results.setSize(0);
+        for (int ii = 0; ii < len; ++ii) {
+            if (matches(byteChunk.get(ii))) {
+                results.add(keys.get(ii));
+            }
+        }
+    }
+
+    @Override
+    public final int filter(final Chunk<? extends Values> values, final WritableBooleanChunk<Values> results) {
+        final ByteChunk<? extends Values> byteChunk = values.asByteChunk();
+        final int len = values.size();
+        int count = 0;
+        for (int ii = 0; ii < len; ++ii) {
+            final boolean newResult = matches(byteChunk.get(ii));
+            results.set(ii, newResult);
+            // count every true value
+            count += newResult ? 1 : 0;
+        }
+        return count;
+    }
+
+    @Override
+    public final int filterAnd(final Chunk<? extends Values> values, final WritableBooleanChunk<Values> results) {
+        final ByteChunk<? extends Values> byteChunk = values.asByteChunk();
+        final int len = values.size();
+        int count = 0;
+        // Count the values that changed from true to false
+        for (int ii = 0; ii < len; ++ii) {
+            final boolean result = results.get(ii);
+            if (!result) {
+                // already false, no need to compute or increment the count
+                continue;
+            }
+            boolean newResult = matches(byteChunk.get(ii));
+            results.set(ii, newResult);
+            // increment the count if the new result is TRUE
+            count += newResult ? 1 : 0;
+        }
+        return count;
+    }
+}
+
diff --git a/engine/table/src/main/java/io/deephaven/engine/table/impl/chunkfilter/ByteChunkMatchFilterFactory.java b/engine/table/src/main/java/io/deephaven/engine/table/impl/chunkfilter/ByteChunkMatchFilterFactory.java
index 24ddc5b788d..72e5226984e 100644
--- a/engine/table/src/main/java/io/deephaven/engine/table/impl/chunkfilter/ByteChunkMatchFilterFactory.java
+++ b/engine/table/src/main/java/io/deephaven/engine/table/impl/chunkfilter/ByteChunkMatchFilterFactory.java
@@ -7,23 +7,20 @@
 // @formatter:off
 package io.deephaven.engine.table.impl.chunkfilter;
 
-import io.deephaven.chunk.*;
-import io.deephaven.engine.rowset.chunkattributes.OrderedRowKeys;
-import io.deephaven.chunk.attributes.Values;
 import gnu.trove.set.hash.TByteHashSet;
 
 /**
  * Creates chunk filters for byte values.
- *
+ * <p>
  * The strategy is that for one, two, or three values we have specialized classes that will do the appropriate simple
  * equality check.
- *
+ * <p>
  * For more values, we use a trove set and check contains for each value in the chunk.
  */
 public class ByteChunkMatchFilterFactory {
     private ByteChunkMatchFilterFactory() {} // static use only
 
-    public static ChunkFilter.ByteChunkFilter makeFilter(boolean invertMatch, byte... values) {
+    public static ByteChunkFilter makeFilter(boolean invertMatch, byte... values) {
         if (invertMatch) {
             if (values.length == 1) {
                 return new InverseSingleValueByteChunkFilter(values[0]);
@@ -49,7 +46,7 @@ public static ChunkFilter.ByteChunkFilter makeFilter(boolean invertMatch, byte..
         }
     }
 
-    private static class SingleValueByteChunkFilter implements ChunkFilter.ByteChunkFilter {
+    private final static class SingleValueByteChunkFilter extends ByteChunkFilter {
         private final byte value;
 
         private SingleValueByteChunkFilter(byte value) {
@@ -57,18 +54,12 @@ private SingleValueByteChunkFilter(byte value) {
         }
 
         @Override
-        public void filter(ByteChunk<? extends Values> values, LongChunk<OrderedRowKeys> keys,
-                WritableLongChunk<OrderedRowKeys> results) {
-            results.setSize(0);
-            for (int ii = 0; ii < values.size(); ++ii) {
-                if (values.get(ii) == value) {
-                    results.add(keys.get(ii));
-                }
-            }
+        public boolean matches(byte value) {
+            return value == this.value;
         }
     }
 
-    private static class InverseSingleValueByteChunkFilter implements ChunkFilter.ByteChunkFilter {
+    private final static class InverseSingleValueByteChunkFilter extends ByteChunkFilter {
         private final byte value;
 
         private InverseSingleValueByteChunkFilter(byte value) {
@@ -76,18 +67,12 @@ private InverseSingleValueByteChunkFilter(byte value) {
         }
 
         @Override
-        public void filter(ByteChunk<? extends Values> values, LongChunk<OrderedRowKeys> keys,
-                WritableLongChunk<OrderedRowKeys> results) {
-            results.setSize(0);
-            for (int ii = 0; ii < values.size(); ++ii) {
-                if (values.get(ii) != value) {
-                    results.add(keys.get(ii));
-                }
-            }
+        public boolean matches(byte value) {
+            return value != this.value;
         }
     }
 
-    private static class TwoValueByteChunkFilter implements ChunkFilter.ByteChunkFilter {
+    private final static class TwoValueByteChunkFilter extends ByteChunkFilter {
         private final byte value1;
         private final byte value2;
 
@@ -97,19 +82,12 @@ private TwoValueByteChunkFilter(byte value1, byte value2) {
         }
 
         @Override
-        public void filter(ByteChunk<? extends Values> values, LongChunk<OrderedRowKeys> keys,
-                WritableLongChunk<OrderedRowKeys> results) {
-            results.setSize(0);
-            for (int ii = 0; ii < values.size(); ++ii) {
-                final byte checkValue = values.get(ii);
-                if (checkValue == value1 || checkValue == value2) {
-                    results.add(keys.get(ii));
-                }
-            }
+        public boolean matches(byte value) {
+            return value == value1 || value == value2;
         }
     }
 
-    private static class InverseTwoValueByteChunkFilter implements ChunkFilter.ByteChunkFilter {
+    private final static class InverseTwoValueByteChunkFilter extends ByteChunkFilter {
         private final byte value1;
         private final byte value2;
 
@@ -119,19 +97,12 @@ private InverseTwoValueByteChunkFilter(byte value1, byte value2) {
         }
 
         @Override
-        public void filter(ByteChunk<? extends Values> values, LongChunk<OrderedRowKeys> keys,
-                WritableLongChunk<OrderedRowKeys> results) {
-            results.setSize(0);
-            for (int ii = 0; ii < values.size(); ++ii) {
-                final byte checkValue = values.get(ii);
-                if (!(checkValue == value1 || checkValue == value2)) {
-                    results.add(keys.get(ii));
-                }
-            }
+        public boolean matches(byte value) {
+            return value != value1 && value != value2;
         }
     }
 
-    private static class ThreeValueByteChunkFilter implements ChunkFilter.ByteChunkFilter {
+    private final static class ThreeValueByteChunkFilter extends ByteChunkFilter {
         private final byte value1;
         private final byte value2;
         private final byte value3;
@@ -143,19 +114,12 @@ private ThreeValueByteChunkFilter(byte value1, byte value2, byte value3) {
         }
 
         @Override
-        public void filter(ByteChunk<? extends Values> values, LongChunk<OrderedRowKeys> keys,
-                WritableLongChunk<OrderedRowKeys> results) {
-            results.setSize(0);
-            for (int ii = 0; ii < values.size(); ++ii) {
-                final byte checkValue = values.get(ii);
-                if (checkValue == value1 || checkValue == value2 || checkValue == value3) {
-                    results.add(keys.get(ii));
-                }
-            }
+        public boolean matches(byte value) {
+            return value == value1 || value == value2 || value == value3;
         }
     }
 
-    private static class InverseThreeValueByteChunkFilter implements ChunkFilter.ByteChunkFilter {
+    private final static class InverseThreeValueByteChunkFilter extends ByteChunkFilter {
         private final byte value1;
         private final byte value2;
         private final byte value3;
@@ -167,19 +131,12 @@ private InverseThreeValueByteChunkFilter(byte value1, byte value2, byte value3)
         }
 
         @Override
-        public void filter(ByteChunk<? extends Values> values, LongChunk<OrderedRowKeys> keys,
-                WritableLongChunk<OrderedRowKeys> results) {
-            results.setSize(0);
-            for (int ii = 0; ii < values.size(); ++ii) {
-                final byte checkValue = values.get(ii);
-                if (!(checkValue == value1 || checkValue == value2 || checkValue == value3)) {
-                    results.add(keys.get(ii));
-                }
-            }
+        public boolean matches(byte value) {
+            return value != value1 && value != value2 && value != value3;
         }
     }
 
-    private static class MultiValueByteChunkFilter implements ChunkFilter.ByteChunkFilter {
+    private final static class MultiValueByteChunkFilter extends ByteChunkFilter {
         private final TByteHashSet values;
 
         private MultiValueByteChunkFilter(byte... values) {
@@ -187,19 +144,12 @@ private MultiValueByteChunkFilter(byte... values) {
         }
 
         @Override
-        public void filter(ByteChunk<? extends Values> values, LongChunk<OrderedRowKeys> keys,
-                WritableLongChunk<OrderedRowKeys> results) {
-            results.setSize(0);
-            for (int ii = 0; ii < values.size(); ++ii) {
-                final byte checkValue = values.get(ii);
-                if (this.values.contains(checkValue)) {
-                    results.add(keys.get(ii));
-                }
-            }
+        public boolean matches(byte value) {
+            return this.values.contains(value);
         }
     }
 
-    private static class InverseMultiValueByteChunkFilter implements ChunkFilter.ByteChunkFilter {
+    private final static class InverseMultiValueByteChunkFilter extends ByteChunkFilter {
         private final TByteHashSet values;
 
         private InverseMultiValueByteChunkFilter(byte... values) {
@@ -207,15 +157,8 @@ private InverseMultiValueByteChunkFilter(byte... values) {
         }
 
         @Override
-        public void filter(ByteChunk<? extends Values> values, LongChunk<OrderedRowKeys> keys,
-                WritableLongChunk<OrderedRowKeys> results) {
-            results.setSize(0);
-            for (int ii = 0; ii < values.size(); ++ii) {
-                final byte checkValue = values.get(ii);
-                if (!this.values.contains(checkValue)) {
-                    results.add(keys.get(ii));
-                }
-            }
+        public boolean matches(byte value) {
+            return !this.values.contains(value);
         }
     }
 }
diff --git a/engine/table/src/main/java/io/deephaven/engine/table/impl/chunkfilter/ByteRangeComparator.java b/engine/table/src/main/java/io/deephaven/engine/table/impl/chunkfilter/ByteRangeComparator.java
index 4390d3268f6..1575cb4f661 100644
--- a/engine/table/src/main/java/io/deephaven/engine/table/impl/chunkfilter/ByteRangeComparator.java
+++ b/engine/table/src/main/java/io/deephaven/engine/table/impl/chunkfilter/ByteRangeComparator.java
@@ -8,14 +8,11 @@
 package io.deephaven.engine.table.impl.chunkfilter;
 
 import io.deephaven.util.compare.ByteComparisons;
-import io.deephaven.chunk.*;
-import io.deephaven.engine.rowset.chunkattributes.OrderedRowKeys;
-import io.deephaven.chunk.attributes.Values;
 
 public class ByteRangeComparator {
     private ByteRangeComparator() {} // static use only
 
-    private abstract static class ByteByteFilter implements ChunkFilter.ByteChunkFilter {
+    private abstract static class ByteByteFilter extends ByteChunkFilter {
         final byte lower;
         final byte upper;
 
@@ -23,80 +20,53 @@ private abstract static class ByteByteFilter implements ChunkFilter.ByteChunkFil
             this.lower = lower;
             this.upper = upper;
         }
-
-        abstract public void filter(ByteChunk<? extends Values> values, LongChunk<OrderedRowKeys> keys,
-                WritableLongChunk<OrderedRowKeys> results);
     }
 
-    static class ByteByteInclusiveInclusiveFilter extends ByteByteFilter {
+    final static class ByteByteInclusiveInclusiveFilter extends ByteByteFilter {
         private ByteByteInclusiveInclusiveFilter(byte lower, byte upper) {
             super(lower, upper);
         }
 
-        public void filter(ByteChunk<? extends Values> values, LongChunk<OrderedRowKeys> keys,
-                WritableLongChunk<OrderedRowKeys> results) {
-            results.setSize(0);
-            for (int ii = 0; ii < values.size(); ++ii) {
-                final byte value = values.get(ii);
-                if (ByteComparisons.geq(value, lower) && ByteComparisons.leq(value, upper)) {
-                    results.add(keys.get(ii));
-                }
-            }
+        @Override
+        public boolean matches(byte value) {
+            return ByteComparisons.geq(value, lower) && ByteComparisons.leq(value, upper);
         }
     }
 
-    static class ByteByteInclusiveExclusiveFilter extends ByteByteFilter {
+    final static class ByteByteInclusiveExclusiveFilter extends ByteByteFilter {
         private ByteByteInclusiveExclusiveFilter(byte lower, byte upper) {
             super(lower, upper);
         }
 
-        public void filter(ByteChunk<? extends Values> values, LongChunk<OrderedRowKeys> keys,
-                WritableLongChunk<OrderedRowKeys> results) {
-            results.setSize(0);
-            for (int ii = 0; ii < values.size(); ++ii) {
-                final byte value = values.get(ii);
-                if (ByteComparisons.geq(value, lower) && ByteComparisons.lt(value, upper)) {
-                    results.add(keys.get(ii));
-                }
-            }
+        @Override
+        public boolean matches(byte value) {
+            return ByteComparisons.geq(value, lower) && ByteComparisons.lt(value, upper);
         }
     }
 
-    static class ByteByteExclusiveInclusiveFilter extends ByteByteFilter {
+    final static class ByteByteExclusiveInclusiveFilter extends ByteByteFilter {
         private ByteByteExclusiveInclusiveFilter(byte lower, byte upper) {
             super(lower, upper);
         }
 
-        public void filter(ByteChunk<? extends Values> values, LongChunk<OrderedRowKeys> keys,
-                WritableLongChunk<OrderedRowKeys> results) {
-            results.setSize(0);
-            for (int ii = 0; ii < values.size(); ++ii) {
-                final byte value = values.get(ii);
-                if (ByteComparisons.gt(value, lower) && ByteComparisons.leq(value, upper)) {
-                    results.add(keys.get(ii));
-                }
-            }
+        @Override
+        public boolean matches(byte value) {
+            return ByteComparisons.gt(value, lower) && ByteComparisons.leq(value, upper);
         }
     }
 
-    static class ByteByteExclusiveExclusiveFilter extends ByteByteFilter {
+    final static class ByteByteExclusiveExclusiveFilter extends ByteByteFilter {
         private ByteByteExclusiveExclusiveFilter(byte lower, byte upper) {
             super(lower, upper);
         }
 
-        public void filter(ByteChunk<? extends Values> values, LongChunk<OrderedRowKeys> keys,
-                WritableLongChunk<OrderedRowKeys> results) {
-            results.setSize(0);
-            for (int ii = 0; ii < values.size(); ++ii) {
-                final byte value = values.get(ii);
-                if (ByteComparisons.gt(value, lower) && ByteComparisons.lt(value, upper)) {
-                    results.add(keys.get(ii));
-                }
-            }
+        @Override
+        public boolean matches(byte value) {
+            return ByteComparisons.gt(value, lower) && ByteComparisons.lt(value, upper);
         }
     }
 
-    public static ChunkFilter.ByteChunkFilter makeByteFilter(byte lower, byte upper, boolean lowerInclusive,
+    public static ByteChunkFilter makeByteFilter(byte lower, byte upper, boolean lowerInclusive,
             boolean upperInclusive) {
         if (lowerInclusive) {
             if (upperInclusive) {
diff --git a/engine/table/src/main/java/io/deephaven/engine/table/impl/chunkfilter/CharChunkFilter.java b/engine/table/src/main/java/io/deephaven/engine/table/impl/chunkfilter/CharChunkFilter.java
new file mode 100644
index 00000000000..833963308a9
--- /dev/null
+++ b/engine/table/src/main/java/io/deephaven/engine/table/impl/chunkfilter/CharChunkFilter.java
@@ -0,0 +1,63 @@
+//
+// Copyright (c) 2016-2024 Deephaven Data Labs and Patent Pending
+//
+package io.deephaven.engine.table.impl.chunkfilter;
+
+import io.deephaven.chunk.*;
+import io.deephaven.chunk.attributes.Values;
+import io.deephaven.engine.rowset.chunkattributes.OrderedRowKeys;
+
+public abstract class CharChunkFilter implements ChunkFilter {
+    public abstract boolean matches(char value);
+
+    @Override
+    public final void filter(
+            final Chunk<? extends Values> values,
+            final LongChunk<OrderedRowKeys> keys,
+            final WritableLongChunk<OrderedRowKeys> results) {
+        final CharChunk<? extends Values> charChunk = values.asCharChunk();
+        final int len = charChunk.size();
+
+        results.setSize(0);
+        for (int ii = 0; ii < len; ++ii) {
+            if (matches(charChunk.get(ii))) {
+                results.add(keys.get(ii));
+            }
+        }
+    }
+
+    @Override
+    public final int filter(final Chunk<? extends Values> values, final WritableBooleanChunk<Values> results) {
+        final CharChunk<? extends Values> charChunk = values.asCharChunk();
+        final int len = values.size();
+        int count = 0;
+        for (int ii = 0; ii < len; ++ii) {
+            final boolean newResult = matches(charChunk.get(ii));
+            results.set(ii, newResult);
+            // count every true value
+            count += newResult ? 1 : 0;
+        }
+        return count;
+    }
+
+    @Override
+    public final int filterAnd(final Chunk<? extends Values> values, final WritableBooleanChunk<Values> results) {
+        final CharChunk<? extends Values> charChunk = values.asCharChunk();
+        final int len = values.size();
+        int count = 0;
+        // Count the values that changed from true to false
+        for (int ii = 0; ii < len; ++ii) {
+            final boolean result = results.get(ii);
+            if (!result) {
+                // already false, no need to compute or increment the count
+                continue;
+            }
+            boolean newResult = matches(charChunk.get(ii));
+            results.set(ii, newResult);
+            // increment the count if the new result is TRUE
+            count += newResult ? 1 : 0;
+        }
+        return count;
+    }
+}
+
diff --git a/engine/table/src/main/java/io/deephaven/engine/table/impl/chunkfilter/CharChunkMatchFilterFactory.java b/engine/table/src/main/java/io/deephaven/engine/table/impl/chunkfilter/CharChunkMatchFilterFactory.java
index 1a432399764..11f1dce9ae6 100644
--- a/engine/table/src/main/java/io/deephaven/engine/table/impl/chunkfilter/CharChunkMatchFilterFactory.java
+++ b/engine/table/src/main/java/io/deephaven/engine/table/impl/chunkfilter/CharChunkMatchFilterFactory.java
@@ -3,23 +3,20 @@
 //
 package io.deephaven.engine.table.impl.chunkfilter;
 
-import io.deephaven.chunk.*;
-import io.deephaven.engine.rowset.chunkattributes.OrderedRowKeys;
-import io.deephaven.chunk.attributes.Values;
 import gnu.trove.set.hash.TCharHashSet;
 
 /**
  * Creates chunk filters for char values.
- *
+ * <p>
  * The strategy is that for one, two, or three values we have specialized classes that will do the appropriate simple
  * equality check.
- *
+ * <p>
  * For more values, we use a trove set and check contains for each value in the chunk.
  */
 public class CharChunkMatchFilterFactory {
     private CharChunkMatchFilterFactory() {} // static use only
 
-    public static ChunkFilter.CharChunkFilter makeFilter(boolean invertMatch, char... values) {
+    public static CharChunkFilter makeFilter(boolean invertMatch, char... values) {
         if (invertMatch) {
             if (values.length == 1) {
                 return new InverseSingleValueCharChunkFilter(values[0]);
@@ -45,7 +42,7 @@ public static ChunkFilter.CharChunkFilter makeFilter(boolean invertMatch, char..
         }
     }
 
-    private static class SingleValueCharChunkFilter implements ChunkFilter.CharChunkFilter {
+    private final static class SingleValueCharChunkFilter extends CharChunkFilter {
         private final char value;
 
         private SingleValueCharChunkFilter(char value) {
@@ -53,18 +50,12 @@ private SingleValueCharChunkFilter(char value) {
         }
 
         @Override
-        public void filter(CharChunk<? extends Values> values, LongChunk<OrderedRowKeys> keys,
-                WritableLongChunk<OrderedRowKeys> results) {
-            results.setSize(0);
-            for (int ii = 0; ii < values.size(); ++ii) {
-                if (values.get(ii) == value) {
-                    results.add(keys.get(ii));
-                }
-            }
+        public boolean matches(char value) {
+            return value == this.value;
         }
     }
 
-    private static class InverseSingleValueCharChunkFilter implements ChunkFilter.CharChunkFilter {
+    private final static class InverseSingleValueCharChunkFilter extends CharChunkFilter {
         private final char value;
 
         private InverseSingleValueCharChunkFilter(char value) {
@@ -72,18 +63,12 @@ private InverseSingleValueCharChunkFilter(char value) {
         }
 
         @Override
-        public void filter(CharChunk<? extends Values> values, LongChunk<OrderedRowKeys> keys,
-                WritableLongChunk<OrderedRowKeys> results) {
-            results.setSize(0);
-            for (int ii = 0; ii < values.size(); ++ii) {
-                if (values.get(ii) != value) {
-                    results.add(keys.get(ii));
-                }
-            }
+        public boolean matches(char value) {
+            return value != this.value;
         }
     }
 
-    private static class TwoValueCharChunkFilter implements ChunkFilter.CharChunkFilter {
+    private final static class TwoValueCharChunkFilter extends CharChunkFilter {
         private final char value1;
         private final char value2;
 
@@ -93,19 +78,12 @@ private TwoValueCharChunkFilter(char value1, char value2) {
         }
 
         @Override
-        public void filter(CharChunk<? extends Values> values, LongChunk<OrderedRowKeys> keys,
-                WritableLongChunk<OrderedRowKeys> results) {
-            results.setSize(0);
-            for (int ii = 0; ii < values.size(); ++ii) {
-                final char checkValue = values.get(ii);
-                if (checkValue == value1 || checkValue == value2) {
-                    results.add(keys.get(ii));
-                }
-            }
+        public boolean matches(char value) {
+            return value == value1 || value == value2;
         }
     }
 
-    private static class InverseTwoValueCharChunkFilter implements ChunkFilter.CharChunkFilter {
+    private final static class InverseTwoValueCharChunkFilter extends CharChunkFilter {
         private final char value1;
         private final char value2;
 
@@ -115,19 +93,12 @@ private InverseTwoValueCharChunkFilter(char value1, char value2) {
         }
 
         @Override
-        public void filter(CharChunk<? extends Values> values, LongChunk<OrderedRowKeys> keys,
-                WritableLongChunk<OrderedRowKeys> results) {
-            results.setSize(0);
-            for (int ii = 0; ii < values.size(); ++ii) {
-                final char checkValue = values.get(ii);
-                if (!(checkValue == value1 || checkValue == value2)) {
-                    results.add(keys.get(ii));
-                }
-            }
+        public boolean matches(char value) {
+            return value != value1 && value != value2;
         }
     }
 
-    private static class ThreeValueCharChunkFilter implements ChunkFilter.CharChunkFilter {
+    private final static class ThreeValueCharChunkFilter extends CharChunkFilter {
         private final char value1;
         private final char value2;
         private final char value3;
@@ -139,19 +110,12 @@ private ThreeValueCharChunkFilter(char value1, char value2, char value3) {
         }
 
         @Override
-        public void filter(CharChunk<? extends Values> values, LongChunk<OrderedRowKeys> keys,
-                WritableLongChunk<OrderedRowKeys> results) {
-            results.setSize(0);
-            for (int ii = 0; ii < values.size(); ++ii) {
-                final char checkValue = values.get(ii);
-                if (checkValue == value1 || checkValue == value2 || checkValue == value3) {
-                    results.add(keys.get(ii));
-                }
-            }
+        public boolean matches(char value) {
+            return value == value1 || value == value2 || value == value3;
         }
     }
 
-    private static class InverseThreeValueCharChunkFilter implements ChunkFilter.CharChunkFilter {
+    private final static class InverseThreeValueCharChunkFilter extends CharChunkFilter {
         private final char value1;
         private final char value2;
         private final char value3;
@@ -163,19 +127,12 @@ private InverseThreeValueCharChunkFilter(char value1, char value2, char value3)
         }
 
         @Override
-        public void filter(CharChunk<? extends Values> values, LongChunk<OrderedRowKeys> keys,
-                WritableLongChunk<OrderedRowKeys> results) {
-            results.setSize(0);
-            for (int ii = 0; ii < values.size(); ++ii) {
-                final char checkValue = values.get(ii);
-                if (!(checkValue == value1 || checkValue == value2 || checkValue == value3)) {
-                    results.add(keys.get(ii));
-                }
-            }
+        public boolean matches(char value) {
+            return value != value1 && value != value2 && value != value3;
         }
     }
 
-    private static class MultiValueCharChunkFilter implements ChunkFilter.CharChunkFilter {
+    private final static class MultiValueCharChunkFilter extends CharChunkFilter {
         private final TCharHashSet values;
 
         private MultiValueCharChunkFilter(char... values) {
@@ -183,19 +140,12 @@ private MultiValueCharChunkFilter(char... values) {
         }
 
         @Override
-        public void filter(CharChunk<? extends Values> values, LongChunk<OrderedRowKeys> keys,
-                WritableLongChunk<OrderedRowKeys> results) {
-            results.setSize(0);
-            for (int ii = 0; ii < values.size(); ++ii) {
-                final char checkValue = values.get(ii);
-                if (this.values.contains(checkValue)) {
-                    results.add(keys.get(ii));
-                }
-            }
+        public boolean matches(char value) {
+            return this.values.contains(value);
         }
     }
 
-    private static class InverseMultiValueCharChunkFilter implements ChunkFilter.CharChunkFilter {
+    private final static class InverseMultiValueCharChunkFilter extends CharChunkFilter {
         private final TCharHashSet values;
 
         private InverseMultiValueCharChunkFilter(char... values) {
@@ -203,15 +153,8 @@ private InverseMultiValueCharChunkFilter(char... values) {
         }
 
         @Override
-        public void filter(CharChunk<? extends Values> values, LongChunk<OrderedRowKeys> keys,
-                WritableLongChunk<OrderedRowKeys> results) {
-            results.setSize(0);
-            for (int ii = 0; ii < values.size(); ++ii) {
-                final char checkValue = values.get(ii);
-                if (!this.values.contains(checkValue)) {
-                    results.add(keys.get(ii));
-                }
-            }
+        public boolean matches(char value) {
+            return !this.values.contains(value);
         }
     }
 }
diff --git a/engine/table/src/main/java/io/deephaven/engine/table/impl/chunkfilter/CharRangeComparator.java b/engine/table/src/main/java/io/deephaven/engine/table/impl/chunkfilter/CharRangeComparator.java
index 6c75bd5a946..3e3a01027f6 100644
--- a/engine/table/src/main/java/io/deephaven/engine/table/impl/chunkfilter/CharRangeComparator.java
+++ b/engine/table/src/main/java/io/deephaven/engine/table/impl/chunkfilter/CharRangeComparator.java
@@ -4,14 +4,11 @@
 package io.deephaven.engine.table.impl.chunkfilter;
 
 import io.deephaven.util.compare.CharComparisons;
-import io.deephaven.chunk.*;
-import io.deephaven.engine.rowset.chunkattributes.OrderedRowKeys;
-import io.deephaven.chunk.attributes.Values;
 
 public class CharRangeComparator {
     private CharRangeComparator() {} // static use only
 
-    private abstract static class CharCharFilter implements ChunkFilter.CharChunkFilter {
+    private abstract static class CharCharFilter extends CharChunkFilter {
         final char lower;
         final char upper;
 
@@ -19,80 +16,53 @@ private abstract static class CharCharFilter implements ChunkFilter.CharChunkFil
             this.lower = lower;
             this.upper = upper;
         }
-
-        abstract public void filter(CharChunk<? extends Values> values, LongChunk<OrderedRowKeys> keys,
-                WritableLongChunk<OrderedRowKeys> results);
     }
 
-    static class CharCharInclusiveInclusiveFilter extends CharCharFilter {
+    final static class CharCharInclusiveInclusiveFilter extends CharCharFilter {
         private CharCharInclusiveInclusiveFilter(char lower, char upper) {
             super(lower, upper);
         }
 
-        public void filter(CharChunk<? extends Values> values, LongChunk<OrderedRowKeys> keys,
-                WritableLongChunk<OrderedRowKeys> results) {
-            results.setSize(0);
-            for (int ii = 0; ii < values.size(); ++ii) {
-                final char value = values.get(ii);
-                if (CharComparisons.geq(value, lower) && CharComparisons.leq(value, upper)) {
-                    results.add(keys.get(ii));
-                }
-            }
+        @Override
+        public boolean matches(char value) {
+            return CharComparisons.geq(value, lower) && CharComparisons.leq(value, upper);
         }
     }
 
-    static class CharCharInclusiveExclusiveFilter extends CharCharFilter {
+    final static class CharCharInclusiveExclusiveFilter extends CharCharFilter {
         private CharCharInclusiveExclusiveFilter(char lower, char upper) {
             super(lower, upper);
         }
 
-        public void filter(CharChunk<? extends Values> values, LongChunk<OrderedRowKeys> keys,
-                WritableLongChunk<OrderedRowKeys> results) {
-            results.setSize(0);
-            for (int ii = 0; ii < values.size(); ++ii) {
-                final char value = values.get(ii);
-                if (CharComparisons.geq(value, lower) && CharComparisons.lt(value, upper)) {
-                    results.add(keys.get(ii));
-                }
-            }
+        @Override
+        public boolean matches(char value) {
+            return CharComparisons.geq(value, lower) && CharComparisons.lt(value, upper);
         }
     }
 
-    static class CharCharExclusiveInclusiveFilter extends CharCharFilter {
+    final static class CharCharExclusiveInclusiveFilter extends CharCharFilter {
         private CharCharExclusiveInclusiveFilter(char lower, char upper) {
             super(lower, upper);
         }
 
-        public void filter(CharChunk<? extends Values> values, LongChunk<OrderedRowKeys> keys,
-                WritableLongChunk<OrderedRowKeys> results) {
-            results.setSize(0);
-            for (int ii = 0; ii < values.size(); ++ii) {
-                final char value = values.get(ii);
-                if (CharComparisons.gt(value, lower) && CharComparisons.leq(value, upper)) {
-                    results.add(keys.get(ii));
-                }
-            }
+        @Override
+        public boolean matches(char value) {
+            return CharComparisons.gt(value, lower) && CharComparisons.leq(value, upper);
         }
     }
 
-    static class CharCharExclusiveExclusiveFilter extends CharCharFilter {
+    final static class CharCharExclusiveExclusiveFilter extends CharCharFilter {
         private CharCharExclusiveExclusiveFilter(char lower, char upper) {
             super(lower, upper);
         }
 
-        public void filter(CharChunk<? extends Values> values, LongChunk<OrderedRowKeys> keys,
-                WritableLongChunk<OrderedRowKeys> results) {
-            results.setSize(0);
-            for (int ii = 0; ii < values.size(); ++ii) {
-                final char value = values.get(ii);
-                if (CharComparisons.gt(value, lower) && CharComparisons.lt(value, upper)) {
-                    results.add(keys.get(ii));
-                }
-            }
+        @Override
+        public boolean matches(char value) {
+            return CharComparisons.gt(value, lower) && CharComparisons.lt(value, upper);
         }
     }
 
-    public static ChunkFilter.CharChunkFilter makeCharFilter(char lower, char upper, boolean lowerInclusive,
+    public static CharChunkFilter makeCharFilter(char lower, char upper, boolean lowerInclusive,
             boolean upperInclusive) {
         if (lowerInclusive) {
             if (upperInclusive) {
diff --git a/engine/table/src/main/java/io/deephaven/engine/table/impl/chunkfilter/ChunkFilter.java b/engine/table/src/main/java/io/deephaven/engine/table/impl/chunkfilter/ChunkFilter.java
index 562d50b1bba..27082102b82 100644
--- a/engine/table/src/main/java/io/deephaven/engine/table/impl/chunkfilter/ChunkFilter.java
+++ b/engine/table/src/main/java/io/deephaven/engine/table/impl/chunkfilter/ChunkFilter.java
@@ -15,107 +15,95 @@
 public interface ChunkFilter {
     /**
      * Filter a chunk of values, setting parallel values in results to "true" or "false".
-     *
+     * <p>
      * The results chunk must have capacity at least as large as values.size(); and the result size will be set to
      * values.size() on return.
      * 
      * @param values the values to filter
-     * @param results a boolean chunk with true values for items that match the filter, and false otherwise
+     * @param results a chunk with the key values where the result of the filter is true
      */
     void filter(Chunk<? extends Values> values, LongChunk<OrderedRowKeys> keys,
             WritableLongChunk<OrderedRowKeys> results);
 
-    interface CharChunkFilter extends ChunkFilter {
-        void filter(CharChunk<? extends Values> values, LongChunk<OrderedRowKeys> keys,
-                WritableLongChunk<OrderedRowKeys> results);
-
-        default void filter(Chunk<? extends Values> values, LongChunk<OrderedRowKeys> keys,
-                WritableLongChunk<OrderedRowKeys> results) {
-            filter(values.asCharChunk(), keys, results);
-        }
-    }
+    /**
+     * Filter a chunk of values, setting parallel values in {@code results} to the output of the filter.
+     * 
+     * @param values the values to filter
+     * @param results a boolean chunk containing the result of the filter
+     *
+     * @return the number of values that are {@code true} in {@code results} after the filter is applied.
+     */
+    int filter(Chunk<? extends Values> values, WritableBooleanChunk<Values> results);
 
-    interface ByteChunkFilter extends ChunkFilter {
-        void filter(ByteChunk<? extends Values> values, LongChunk<OrderedRowKeys> keys,
-                WritableLongChunk<OrderedRowKeys> results);
+    /**
+     * Filter a chunk of values, setting parallel values in {@code results} to {@code false} when the filter result is
+     * {@code false}. The filter will not be evaluated for values that are already {@code false} in the results chunk.
+     * <p>
+     * To use this method effectively, the results chunk should be initialized by a call to
+     * {@link #filter(Chunk, WritableBooleanChunk)} or by setting all values {@code true} before the first call.
+     * Successive calls will have the effect of AND'ing the filter results with existing results.
+     *
+     * @param values the values to filter
+     * @param results a boolean chunk containing the result of the filter
+     *
+     * @return the number of values that are {@code true} in {@code results} after the filter is applied.
+     */
+    int filterAnd(Chunk<? extends Values> values, WritableBooleanChunk<Values> results);
 
-        default void filter(Chunk<? extends Values> values, LongChunk<OrderedRowKeys> keys,
+    /**
+     * A filter that always returns false.
+     */
+    ChunkFilter FALSE_FILTER_INSTANCE = new ChunkFilter() {
+        @Override
+        public void filter(Chunk<? extends Values> values, LongChunk<OrderedRowKeys> keys,
                 WritableLongChunk<OrderedRowKeys> results) {
-            filter(values.asByteChunk(), keys, results);
+            results.setSize(0);
         }
-    }
-
-    interface ShortChunkFilter extends ChunkFilter {
-        void filter(ShortChunk<? extends Values> values, LongChunk<OrderedRowKeys> keys,
-                WritableLongChunk<OrderedRowKeys> results);
 
-        default void filter(Chunk<? extends Values> values, LongChunk<OrderedRowKeys> keys,
-                WritableLongChunk<OrderedRowKeys> results) {
-            filter(values.asShortChunk(), keys, results);
+        @Override
+        public int filter(final Chunk<? extends Values> values, final WritableBooleanChunk<Values> results) {
+            final int len = values.size();
+            results.fillWithValue(0, len, false);
+            return 0;
         }
-    }
-
-    interface IntChunkFilter extends ChunkFilter {
-        void filter(IntChunk<? extends Values> values, LongChunk<OrderedRowKeys> keys,
-                WritableLongChunk<OrderedRowKeys> results);
 
-        default void filter(Chunk<? extends Values> values, LongChunk<OrderedRowKeys> keys,
-                WritableLongChunk<OrderedRowKeys> results) {
-            filter(values.asIntChunk(), keys, results);
-        }
-    }
-
-    interface LongChunkFilter extends ChunkFilter {
-        void filter(LongChunk<? extends Values> values, LongChunk<OrderedRowKeys> keys,
-                WritableLongChunk<OrderedRowKeys> results);
-
-        default void filter(Chunk<? extends Values> values, LongChunk<OrderedRowKeys> keys,
-                WritableLongChunk<OrderedRowKeys> results) {
-            filter(values.asLongChunk(), keys, results);
+        @Override
+        public int filterAnd(final Chunk<? extends Values> values, final WritableBooleanChunk<Values> results) {
+            final int len = values.size();
+            // Count the values that changed from true to false
+            int count = 0;
+            for (int ii = 0; ii < len; ++ii) {
+                final boolean result = results.get(ii);
+                results.set(ii, false);
+                count += result ? 1 : 0;
+            }
+            return count;
         }
-    }
-
-    interface FloatChunkFilter extends ChunkFilter {
-        void filter(FloatChunk<? extends Values> values, LongChunk<OrderedRowKeys> keys,
-                WritableLongChunk<OrderedRowKeys> results);
+    };
 
-        default void filter(Chunk<? extends Values> values, LongChunk<OrderedRowKeys> keys,
+    /**
+     * A filter that always returns true.
+     */
+    ChunkFilter TRUE_FILTER_INSTANCE = new ChunkFilter() {
+        @Override
+        public void filter(Chunk<? extends Values> values, LongChunk<OrderedRowKeys> keys,
                 WritableLongChunk<OrderedRowKeys> results) {
-            filter(values.asFloatChunk(), keys, results);
+            results.setSize(values.size());
+            results.copyFromChunk(keys, 0, 0, keys.size());
         }
-    }
-
-    interface DoubleChunkFilter extends ChunkFilter {
-        void filter(DoubleChunk<? extends Values> values, LongChunk<OrderedRowKeys> keys,
-                WritableLongChunk<OrderedRowKeys> results);
 
-        default void filter(Chunk<? extends Values> values, LongChunk<OrderedRowKeys> keys,
-                WritableLongChunk<OrderedRowKeys> results) {
-            filter(values.asDoubleChunk(), keys, results);
+        @Override
+        public int filter(final Chunk<? extends Values> values, final WritableBooleanChunk<Values> results) {
+            final int len = values.size();
+            results.fillWithValue(0, len, true);
+            return len;
         }
-    }
-
-    interface ObjectChunkFilter<T> extends ChunkFilter {
-        void filter(ObjectChunk<T, ? extends Values> values, LongChunk<OrderedRowKeys> keys,
-                WritableLongChunk<OrderedRowKeys> results);
 
-        default void filter(Chunk<? extends Values> values, LongChunk<OrderedRowKeys> keys,
-                WritableLongChunk<OrderedRowKeys> results) {
-            filter(values.asObjectChunk(), keys, results);
+        @Override
+        public int filterAnd(final Chunk<? extends Values> values, final WritableBooleanChunk<Values> results) {
+            // No values were set to false
+            return 0;
         }
-    }
-
-    /**
-     * A filter that always returns false.
-     */
-    ChunkFilter FALSE_FILTER_INSTANCE = (values, keys, results) -> results.setSize(0);
-
-    /**
-     * A filter that always returns true.
-     */
-    ChunkFilter TRUE_FILTER_INSTANCE = (values, keys, results) -> {
-        results.setSize(values.size());
-        results.copyFromChunk(keys, 0, 0, keys.size());
     };
 
     /**
diff --git a/engine/table/src/main/java/io/deephaven/engine/table/impl/chunkfilter/DoubleChunkFilter.java b/engine/table/src/main/java/io/deephaven/engine/table/impl/chunkfilter/DoubleChunkFilter.java
new file mode 100644
index 00000000000..d38d66a3016
--- /dev/null
+++ b/engine/table/src/main/java/io/deephaven/engine/table/impl/chunkfilter/DoubleChunkFilter.java
@@ -0,0 +1,67 @@
+//
+// Copyright (c) 2016-2024 Deephaven Data Labs and Patent Pending
+//
+// ****** AUTO-GENERATED CLASS - DO NOT EDIT MANUALLY
+// ****** Edit CharChunkFilter and run "./gradlew replicateChunkFilters" to regenerate
+//
+// @formatter:off
+package io.deephaven.engine.table.impl.chunkfilter;
+
+import io.deephaven.chunk.*;
+import io.deephaven.chunk.attributes.Values;
+import io.deephaven.engine.rowset.chunkattributes.OrderedRowKeys;
+
+public abstract class DoubleChunkFilter implements ChunkFilter {
+    public abstract boolean matches(double value);
+
+    @Override
+    public final void filter(
+            final Chunk<? extends Values> values,
+            final LongChunk<OrderedRowKeys> keys,
+            final WritableLongChunk<OrderedRowKeys> results) {
+        final DoubleChunk<? extends Values> doubleChunk = values.asDoubleChunk();
+        final int len = doubleChunk.size();
+
+        results.setSize(0);
+        for (int ii = 0; ii < len; ++ii) {
+            if (matches(doubleChunk.get(ii))) {
+                results.add(keys.get(ii));
+            }
+        }
+    }
+
+    @Override
+    public final int filter(final Chunk<? extends Values> values, final WritableBooleanChunk<Values> results) {
+        final DoubleChunk<? extends Values> doubleChunk = values.asDoubleChunk();
+        final int len = values.size();
+        int count = 0;
+        for (int ii = 0; ii < len; ++ii) {
+            final boolean newResult = matches(doubleChunk.get(ii));
+            results.set(ii, newResult);
+            // count every true value
+            count += newResult ? 1 : 0;
+        }
+        return count;
+    }
+
+    @Override
+    public final int filterAnd(final Chunk<? extends Values> values, final WritableBooleanChunk<Values> results) {
+        final DoubleChunk<? extends Values> doubleChunk = values.asDoubleChunk();
+        final int len = values.size();
+        int count = 0;
+        // Count the values that changed from true to false
+        for (int ii = 0; ii < len; ++ii) {
+            final boolean result = results.get(ii);
+            if (!result) {
+                // already false, no need to compute or increment the count
+                continue;
+            }
+            boolean newResult = matches(doubleChunk.get(ii));
+            results.set(ii, newResult);
+            // increment the count if the new result is TRUE
+            count += newResult ? 1 : 0;
+        }
+        return count;
+    }
+}
+
diff --git a/engine/table/src/main/java/io/deephaven/engine/table/impl/chunkfilter/DoubleChunkMatchFilterFactory.java b/engine/table/src/main/java/io/deephaven/engine/table/impl/chunkfilter/DoubleChunkMatchFilterFactory.java
index 1068c96eed2..16e5549f626 100644
--- a/engine/table/src/main/java/io/deephaven/engine/table/impl/chunkfilter/DoubleChunkMatchFilterFactory.java
+++ b/engine/table/src/main/java/io/deephaven/engine/table/impl/chunkfilter/DoubleChunkMatchFilterFactory.java
@@ -7,23 +7,20 @@
 // @formatter:off
 package io.deephaven.engine.table.impl.chunkfilter;
 
-import io.deephaven.chunk.*;
-import io.deephaven.engine.rowset.chunkattributes.OrderedRowKeys;
-import io.deephaven.chunk.attributes.Values;
 import gnu.trove.set.hash.TDoubleHashSet;
 
 /**
  * Creates chunk filters for double values.
- *
+ * <p>
  * The strategy is that for one, two, or three values we have specialized classes that will do the appropriate simple
  * equality check.
- *
+ * <p>
  * For more values, we use a trove set and check contains for each value in the chunk.
  */
 public class DoubleChunkMatchFilterFactory {
     private DoubleChunkMatchFilterFactory() {} // static use only
 
-    public static ChunkFilter.DoubleChunkFilter makeFilter(boolean invertMatch, double... values) {
+    public static DoubleChunkFilter makeFilter(boolean invertMatch, double... values) {
         if (invertMatch) {
             if (values.length == 1) {
                 return new InverseSingleValueDoubleChunkFilter(values[0]);
@@ -49,7 +46,7 @@ public static ChunkFilter.DoubleChunkFilter makeFilter(boolean invertMatch, doub
         }
     }
 
-    private static class SingleValueDoubleChunkFilter implements ChunkFilter.DoubleChunkFilter {
+    private final static class SingleValueDoubleChunkFilter extends DoubleChunkFilter {
         private final double value;
 
         private SingleValueDoubleChunkFilter(double value) {
@@ -57,18 +54,12 @@ private SingleValueDoubleChunkFilter(double value) {
         }
 
         @Override
-        public void filter(DoubleChunk<? extends Values> values, LongChunk<OrderedRowKeys> keys,
-                WritableLongChunk<OrderedRowKeys> results) {
-            results.setSize(0);
-            for (int ii = 0; ii < values.size(); ++ii) {
-                if (values.get(ii) == value) {
-                    results.add(keys.get(ii));
-                }
-            }
+        public boolean matches(double value) {
+            return value == this.value;
         }
     }
 
-    private static class InverseSingleValueDoubleChunkFilter implements ChunkFilter.DoubleChunkFilter {
+    private final static class InverseSingleValueDoubleChunkFilter extends DoubleChunkFilter {
         private final double value;
 
         private InverseSingleValueDoubleChunkFilter(double value) {
@@ -76,18 +67,12 @@ private InverseSingleValueDoubleChunkFilter(double value) {
         }
 
         @Override
-        public void filter(DoubleChunk<? extends Values> values, LongChunk<OrderedRowKeys> keys,
-                WritableLongChunk<OrderedRowKeys> results) {
-            results.setSize(0);
-            for (int ii = 0; ii < values.size(); ++ii) {
-                if (values.get(ii) != value) {
-                    results.add(keys.get(ii));
-                }
-            }
+        public boolean matches(double value) {
+            return value != this.value;
         }
     }
 
-    private static class TwoValueDoubleChunkFilter implements ChunkFilter.DoubleChunkFilter {
+    private final static class TwoValueDoubleChunkFilter extends DoubleChunkFilter {
         private final double value1;
         private final double value2;
 
@@ -97,19 +82,12 @@ private TwoValueDoubleChunkFilter(double value1, double value2) {
         }
 
         @Override
-        public void filter(DoubleChunk<? extends Values> values, LongChunk<OrderedRowKeys> keys,
-                WritableLongChunk<OrderedRowKeys> results) {
-            results.setSize(0);
-            for (int ii = 0; ii < values.size(); ++ii) {
-                final double checkValue = values.get(ii);
-                if (checkValue == value1 || checkValue == value2) {
-                    results.add(keys.get(ii));
-                }
-            }
+        public boolean matches(double value) {
+            return value == value1 || value == value2;
         }
     }
 
-    private static class InverseTwoValueDoubleChunkFilter implements ChunkFilter.DoubleChunkFilter {
+    private final static class InverseTwoValueDoubleChunkFilter extends DoubleChunkFilter {
         private final double value1;
         private final double value2;
 
@@ -119,19 +97,12 @@ private InverseTwoValueDoubleChunkFilter(double value1, double value2) {
         }
 
         @Override
-        public void filter(DoubleChunk<? extends Values> values, LongChunk<OrderedRowKeys> keys,
-                WritableLongChunk<OrderedRowKeys> results) {
-            results.setSize(0);
-            for (int ii = 0; ii < values.size(); ++ii) {
-                final double checkValue = values.get(ii);
-                if (!(checkValue == value1 || checkValue == value2)) {
-                    results.add(keys.get(ii));
-                }
-            }
+        public boolean matches(double value) {
+            return value != value1 && value != value2;
         }
     }
 
-    private static class ThreeValueDoubleChunkFilter implements ChunkFilter.DoubleChunkFilter {
+    private final static class ThreeValueDoubleChunkFilter extends DoubleChunkFilter {
         private final double value1;
         private final double value2;
         private final double value3;
@@ -143,19 +114,12 @@ private ThreeValueDoubleChunkFilter(double value1, double value2, double value3)
         }
 
         @Override
-        public void filter(DoubleChunk<? extends Values> values, LongChunk<OrderedRowKeys> keys,
-                WritableLongChunk<OrderedRowKeys> results) {
-            results.setSize(0);
-            for (int ii = 0; ii < values.size(); ++ii) {
-                final double checkValue = values.get(ii);
-                if (checkValue == value1 || checkValue == value2 || checkValue == value3) {
-                    results.add(keys.get(ii));
-                }
-            }
+        public boolean matches(double value) {
+            return value == value1 || value == value2 || value == value3;
         }
     }
 
-    private static class InverseThreeValueDoubleChunkFilter implements ChunkFilter.DoubleChunkFilter {
+    private final static class InverseThreeValueDoubleChunkFilter extends DoubleChunkFilter {
         private final double value1;
         private final double value2;
         private final double value3;
@@ -167,19 +131,12 @@ private InverseThreeValueDoubleChunkFilter(double value1, double value2, double
         }
 
         @Override
-        public void filter(DoubleChunk<? extends Values> values, LongChunk<OrderedRowKeys> keys,
-                WritableLongChunk<OrderedRowKeys> results) {
-            results.setSize(0);
-            for (int ii = 0; ii < values.size(); ++ii) {
-                final double checkValue = values.get(ii);
-                if (!(checkValue == value1 || checkValue == value2 || checkValue == value3)) {
-                    results.add(keys.get(ii));
-                }
-            }
+        public boolean matches(double value) {
+            return value != value1 && value != value2 && value != value3;
         }
     }
 
-    private static class MultiValueDoubleChunkFilter implements ChunkFilter.DoubleChunkFilter {
+    private final static class MultiValueDoubleChunkFilter extends DoubleChunkFilter {
         private final TDoubleHashSet values;
 
         private MultiValueDoubleChunkFilter(double... values) {
@@ -187,19 +144,12 @@ private MultiValueDoubleChunkFilter(double... values) {
         }
 
         @Override
-        public void filter(DoubleChunk<? extends Values> values, LongChunk<OrderedRowKeys> keys,
-                WritableLongChunk<OrderedRowKeys> results) {
-            results.setSize(0);
-            for (int ii = 0; ii < values.size(); ++ii) {
-                final double checkValue = values.get(ii);
-                if (this.values.contains(checkValue)) {
-                    results.add(keys.get(ii));
-                }
-            }
+        public boolean matches(double value) {
+            return this.values.contains(value);
         }
     }
 
-    private static class InverseMultiValueDoubleChunkFilter implements ChunkFilter.DoubleChunkFilter {
+    private final static class InverseMultiValueDoubleChunkFilter extends DoubleChunkFilter {
         private final TDoubleHashSet values;
 
         private InverseMultiValueDoubleChunkFilter(double... values) {
@@ -207,15 +157,8 @@ private InverseMultiValueDoubleChunkFilter(double... values) {
         }
 
         @Override
-        public void filter(DoubleChunk<? extends Values> values, LongChunk<OrderedRowKeys> keys,
-                WritableLongChunk<OrderedRowKeys> results) {
-            results.setSize(0);
-            for (int ii = 0; ii < values.size(); ++ii) {
-                final double checkValue = values.get(ii);
-                if (!this.values.contains(checkValue)) {
-                    results.add(keys.get(ii));
-                }
-            }
+        public boolean matches(double value) {
+            return !this.values.contains(value);
         }
     }
 }
diff --git a/engine/table/src/main/java/io/deephaven/engine/table/impl/chunkfilter/DoubleRangeComparator.java b/engine/table/src/main/java/io/deephaven/engine/table/impl/chunkfilter/DoubleRangeComparator.java
index e250e127181..669be87ed72 100644
--- a/engine/table/src/main/java/io/deephaven/engine/table/impl/chunkfilter/DoubleRangeComparator.java
+++ b/engine/table/src/main/java/io/deephaven/engine/table/impl/chunkfilter/DoubleRangeComparator.java
@@ -8,14 +8,11 @@
 package io.deephaven.engine.table.impl.chunkfilter;
 
 import io.deephaven.util.compare.DoubleComparisons;
-import io.deephaven.chunk.*;
-import io.deephaven.engine.rowset.chunkattributes.OrderedRowKeys;
-import io.deephaven.chunk.attributes.Values;
 
 public class DoubleRangeComparator {
     private DoubleRangeComparator() {} // static use only
 
-    private abstract static class DoubleDoubleFilter implements ChunkFilter.DoubleChunkFilter {
+    private abstract static class DoubleDoubleFilter extends DoubleChunkFilter {
         final double lower;
         final double upper;
 
@@ -23,80 +20,53 @@ private abstract static class DoubleDoubleFilter implements ChunkFilter.DoubleCh
             this.lower = lower;
             this.upper = upper;
         }
-
-        abstract public void filter(DoubleChunk<? extends Values> values, LongChunk<OrderedRowKeys> keys,
-                WritableLongChunk<OrderedRowKeys> results);
     }
 
-    static class DoubleDoubleInclusiveInclusiveFilter extends DoubleDoubleFilter {
+    private final static class DoubleDoubleInclusiveInclusiveFilter extends DoubleDoubleFilter {
         private DoubleDoubleInclusiveInclusiveFilter(double lower, double upper) {
             super(lower, upper);
         }
 
-        public void filter(DoubleChunk<? extends Values> values, LongChunk<OrderedRowKeys> keys,
-                WritableLongChunk<OrderedRowKeys> results) {
-            results.setSize(0);
-            for (int ii = 0; ii < values.size(); ++ii) {
-                final double value = values.get(ii);
-                if (DoubleComparisons.geq(value, lower) && DoubleComparisons.leq(value, upper)) {
-                    results.add(keys.get(ii));
-                }
-            }
+        @Override
+        public boolean matches(double value) {
+            return DoubleComparisons.geq(value, lower) && DoubleComparisons.leq(value, upper);
         }
     }
 
-    static class DoubleDoubleInclusiveExclusiveFilter extends DoubleDoubleFilter {
+    private final static class DoubleDoubleInclusiveExclusiveFilter extends DoubleDoubleFilter {
         private DoubleDoubleInclusiveExclusiveFilter(double lower, double upper) {
             super(lower, upper);
         }
 
-        public void filter(DoubleChunk<? extends Values> values, LongChunk<OrderedRowKeys> keys,
-                WritableLongChunk<OrderedRowKeys> results) {
-            results.setSize(0);
-            for (int ii = 0; ii < values.size(); ++ii) {
-                final double value = values.get(ii);
-                if (DoubleComparisons.geq(value, lower) && DoubleComparisons.lt(value, upper)) {
-                    results.add(keys.get(ii));
-                }
-            }
+        @Override
+        public boolean matches(double value) {
+            return DoubleComparisons.geq(value, lower) && DoubleComparisons.lt(value, upper);
         }
     }
 
-    static class DoubleDoubleExclusiveInclusiveFilter extends DoubleDoubleFilter {
+    private final static class DoubleDoubleExclusiveInclusiveFilter extends DoubleDoubleFilter {
         private DoubleDoubleExclusiveInclusiveFilter(double lower, double upper) {
             super(lower, upper);
         }
 
-        public void filter(DoubleChunk<? extends Values> values, LongChunk<OrderedRowKeys> keys,
-                WritableLongChunk<OrderedRowKeys> results) {
-            results.setSize(0);
-            for (int ii = 0; ii < values.size(); ++ii) {
-                final double value = values.get(ii);
-                if (DoubleComparisons.gt(value, lower) && DoubleComparisons.leq(value, upper)) {
-                    results.add(keys.get(ii));
-                }
-            }
+        @Override
+        public boolean matches(double value) {
+            return DoubleComparisons.gt(value, lower) && DoubleComparisons.leq(value, upper);
         }
     }
 
-    static class DoubleDoubleExclusiveExclusiveFilter extends DoubleDoubleFilter {
+    private final static class DoubleDoubleExclusiveExclusiveFilter extends DoubleDoubleFilter {
         private DoubleDoubleExclusiveExclusiveFilter(double lower, double upper) {
             super(lower, upper);
         }
 
-        public void filter(DoubleChunk<? extends Values> values, LongChunk<OrderedRowKeys> keys,
-                WritableLongChunk<OrderedRowKeys> results) {
-            results.setSize(0);
-            for (int ii = 0; ii < values.size(); ++ii) {
-                final double value = values.get(ii);
-                if (DoubleComparisons.gt(value, lower) && DoubleComparisons.lt(value, upper)) {
-                    results.add(keys.get(ii));
-                }
-            }
+        @Override
+        public boolean matches(double value) {
+            return DoubleComparisons.gt(value, lower) && DoubleComparisons.lt(value, upper);
         }
     }
 
-    public static ChunkFilter.DoubleChunkFilter makeDoubleFilter(double lower, double upper, boolean lowerInclusive,
+    public static DoubleChunkFilter makeDoubleFilter(double lower, double upper, boolean lowerInclusive,
             boolean upperInclusive) {
         if (lowerInclusive) {
             if (upperInclusive) {
diff --git a/engine/table/src/main/java/io/deephaven/engine/table/impl/chunkfilter/FloatChunkFilter.java b/engine/table/src/main/java/io/deephaven/engine/table/impl/chunkfilter/FloatChunkFilter.java
new file mode 100644
index 00000000000..b6b85106a42
--- /dev/null
+++ b/engine/table/src/main/java/io/deephaven/engine/table/impl/chunkfilter/FloatChunkFilter.java
@@ -0,0 +1,67 @@
+//
+// Copyright (c) 2016-2024 Deephaven Data Labs and Patent Pending
+//
+// ****** AUTO-GENERATED CLASS - DO NOT EDIT MANUALLY
+// ****** Edit CharChunkFilter and run "./gradlew replicateChunkFilters" to regenerate
+//
+// @formatter:off
+package io.deephaven.engine.table.impl.chunkfilter;
+
+import io.deephaven.chunk.*;
+import io.deephaven.chunk.attributes.Values;
+import io.deephaven.engine.rowset.chunkattributes.OrderedRowKeys;
+
+public abstract class FloatChunkFilter implements ChunkFilter {
+    public abstract boolean matches(float value);
+
+    @Override
+    public final void filter(
+            final Chunk<? extends Values> values,
+            final LongChunk<OrderedRowKeys> keys,
+            final WritableLongChunk<OrderedRowKeys> results) {
+        final FloatChunk<? extends Values> floatChunk = values.asFloatChunk();
+        final int len = floatChunk.size();
+
+        results.setSize(0);
+        for (int ii = 0; ii < len; ++ii) {
+            if (matches(floatChunk.get(ii))) {
+                results.add(keys.get(ii));
+            }
+        }
+    }
+
+    @Override
+    public final int filter(final Chunk<? extends Values> values, final WritableBooleanChunk<Values> results) {
+        final FloatChunk<? extends Values> floatChunk = values.asFloatChunk();
+        final int len = values.size();
+        int count = 0;
+        for (int ii = 0; ii < len; ++ii) {
+            final boolean newResult = matches(floatChunk.get(ii));
+            results.set(ii, newResult);
+            // count every true value
+            count += newResult ? 1 : 0;
+        }
+        return count;
+    }
+
+    @Override
+    public final int filterAnd(final Chunk<? extends Values> values, final WritableBooleanChunk<Values> results) {
+        final FloatChunk<? extends Values> floatChunk = values.asFloatChunk();
+        final int len = values.size();
+        int count = 0;
+        // Count the values that changed from true to false
+        for (int ii = 0; ii < len; ++ii) {
+            final boolean result = results.get(ii);
+            if (!result) {
+                // already false, no need to compute or increment the count
+                continue;
+            }
+            boolean newResult = matches(floatChunk.get(ii));
+            results.set(ii, newResult);
+            // increment the count if the new result is TRUE
+            count += newResult ? 1 : 0;
+        }
+        return count;
+    }
+}
+
diff --git a/engine/table/src/main/java/io/deephaven/engine/table/impl/chunkfilter/FloatChunkMatchFilterFactory.java b/engine/table/src/main/java/io/deephaven/engine/table/impl/chunkfilter/FloatChunkMatchFilterFactory.java
index e98d9f6b85f..9fa345b5278 100644
--- a/engine/table/src/main/java/io/deephaven/engine/table/impl/chunkfilter/FloatChunkMatchFilterFactory.java
+++ b/engine/table/src/main/java/io/deephaven/engine/table/impl/chunkfilter/FloatChunkMatchFilterFactory.java
@@ -7,23 +7,20 @@
 // @formatter:off
 package io.deephaven.engine.table.impl.chunkfilter;
 
-import io.deephaven.chunk.*;
-import io.deephaven.engine.rowset.chunkattributes.OrderedRowKeys;
-import io.deephaven.chunk.attributes.Values;
 import gnu.trove.set.hash.TFloatHashSet;
 
 /**
  * Creates chunk filters for float values.
- *
+ * <p>
  * The strategy is that for one, two, or three values we have specialized classes that will do the appropriate simple
  * equality check.
- *
+ * <p>
  * For more values, we use a trove set and check contains for each value in the chunk.
  */
 public class FloatChunkMatchFilterFactory {
     private FloatChunkMatchFilterFactory() {} // static use only
 
-    public static ChunkFilter.FloatChunkFilter makeFilter(boolean invertMatch, float... values) {
+    public static FloatChunkFilter makeFilter(boolean invertMatch, float... values) {
         if (invertMatch) {
             if (values.length == 1) {
                 return new InverseSingleValueFloatChunkFilter(values[0]);
@@ -49,7 +46,7 @@ public static ChunkFilter.FloatChunkFilter makeFilter(boolean invertMatch, float
         }
     }
 
-    private static class SingleValueFloatChunkFilter implements ChunkFilter.FloatChunkFilter {
+    private final static class SingleValueFloatChunkFilter extends FloatChunkFilter {
         private final float value;
 
         private SingleValueFloatChunkFilter(float value) {
@@ -57,18 +54,12 @@ private SingleValueFloatChunkFilter(float value) {
         }
 
         @Override
-        public void filter(FloatChunk<? extends Values> values, LongChunk<OrderedRowKeys> keys,
-                WritableLongChunk<OrderedRowKeys> results) {
-            results.setSize(0);
-            for (int ii = 0; ii < values.size(); ++ii) {
-                if (values.get(ii) == value) {
-                    results.add(keys.get(ii));
-                }
-            }
+        public boolean matches(float value) {
+            return value == this.value;
         }
     }
 
-    private static class InverseSingleValueFloatChunkFilter implements ChunkFilter.FloatChunkFilter {
+    private final static class InverseSingleValueFloatChunkFilter extends FloatChunkFilter {
         private final float value;
 
         private InverseSingleValueFloatChunkFilter(float value) {
@@ -76,18 +67,12 @@ private InverseSingleValueFloatChunkFilter(float value) {
         }
 
         @Override
-        public void filter(FloatChunk<? extends Values> values, LongChunk<OrderedRowKeys> keys,
-                WritableLongChunk<OrderedRowKeys> results) {
-            results.setSize(0);
-            for (int ii = 0; ii < values.size(); ++ii) {
-                if (values.get(ii) != value) {
-                    results.add(keys.get(ii));
-                }
-            }
+        public boolean matches(float value) {
+            return value != this.value;
         }
     }
 
-    private static class TwoValueFloatChunkFilter implements ChunkFilter.FloatChunkFilter {
+    private final static class TwoValueFloatChunkFilter extends FloatChunkFilter {
         private final float value1;
         private final float value2;
 
@@ -97,19 +82,12 @@ private TwoValueFloatChunkFilter(float value1, float value2) {
         }
 
         @Override
-        public void filter(FloatChunk<? extends Values> values, LongChunk<OrderedRowKeys> keys,
-                WritableLongChunk<OrderedRowKeys> results) {
-            results.setSize(0);
-            for (int ii = 0; ii < values.size(); ++ii) {
-                final float checkValue = values.get(ii);
-                if (checkValue == value1 || checkValue == value2) {
-                    results.add(keys.get(ii));
-                }
-            }
+        public boolean matches(float value) {
+            return value == value1 || value == value2;
         }
     }
 
-    private static class InverseTwoValueFloatChunkFilter implements ChunkFilter.FloatChunkFilter {
+    private final static class InverseTwoValueFloatChunkFilter extends FloatChunkFilter {
         private final float value1;
         private final float value2;
 
@@ -119,19 +97,12 @@ private InverseTwoValueFloatChunkFilter(float value1, float value2) {
         }
 
         @Override
-        public void filter(FloatChunk<? extends Values> values, LongChunk<OrderedRowKeys> keys,
-                WritableLongChunk<OrderedRowKeys> results) {
-            results.setSize(0);
-            for (int ii = 0; ii < values.size(); ++ii) {
-                final float checkValue = values.get(ii);
-                if (!(checkValue == value1 || checkValue == value2)) {
-                    results.add(keys.get(ii));
-                }
-            }
+        public boolean matches(float value) {
+            return value != value1 && value != value2;
         }
     }
 
-    private static class ThreeValueFloatChunkFilter implements ChunkFilter.FloatChunkFilter {
+    private final static class ThreeValueFloatChunkFilter extends FloatChunkFilter {
         private final float value1;
         private final float value2;
         private final float value3;
@@ -143,19 +114,12 @@ private ThreeValueFloatChunkFilter(float value1, float value2, float value3) {
         }
 
         @Override
-        public void filter(FloatChunk<? extends Values> values, LongChunk<OrderedRowKeys> keys,
-                WritableLongChunk<OrderedRowKeys> results) {
-            results.setSize(0);
-            for (int ii = 0; ii < values.size(); ++ii) {
-                final float checkValue = values.get(ii);
-                if (checkValue == value1 || checkValue == value2 || checkValue == value3) {
-                    results.add(keys.get(ii));
-                }
-            }
+        public boolean matches(float value) {
+            return value == value1 || value == value2 || value == value3;
         }
     }
 
-    private static class InverseThreeValueFloatChunkFilter implements ChunkFilter.FloatChunkFilter {
+    private final static class InverseThreeValueFloatChunkFilter extends FloatChunkFilter {
         private final float value1;
         private final float value2;
         private final float value3;
@@ -167,19 +131,12 @@ private InverseThreeValueFloatChunkFilter(float value1, float value2, float valu
         }
 
         @Override
-        public void filter(FloatChunk<? extends Values> values, LongChunk<OrderedRowKeys> keys,
-                WritableLongChunk<OrderedRowKeys> results) {
-            results.setSize(0);
-            for (int ii = 0; ii < values.size(); ++ii) {
-                final float checkValue = values.get(ii);
-                if (!(checkValue == value1 || checkValue == value2 || checkValue == value3)) {
-                    results.add(keys.get(ii));
-                }
-            }
+        public boolean matches(float value) {
+            return value != value1 && value != value2 && value != value3;
         }
     }
 
-    private static class MultiValueFloatChunkFilter implements ChunkFilter.FloatChunkFilter {
+    private final static class MultiValueFloatChunkFilter extends FloatChunkFilter {
         private final TFloatHashSet values;
 
         private MultiValueFloatChunkFilter(float... values) {
@@ -187,19 +144,12 @@ private MultiValueFloatChunkFilter(float... values) {
         }
 
         @Override
-        public void filter(FloatChunk<? extends Values> values, LongChunk<OrderedRowKeys> keys,
-                WritableLongChunk<OrderedRowKeys> results) {
-            results.setSize(0);
-            for (int ii = 0; ii < values.size(); ++ii) {
-                final float checkValue = values.get(ii);
-                if (this.values.contains(checkValue)) {
-                    results.add(keys.get(ii));
-                }
-            }
+        public boolean matches(float value) {
+            return this.values.contains(value);
         }
     }
 
-    private static class InverseMultiValueFloatChunkFilter implements ChunkFilter.FloatChunkFilter {
+    private final static class InverseMultiValueFloatChunkFilter extends FloatChunkFilter {
         private final TFloatHashSet values;
 
         private InverseMultiValueFloatChunkFilter(float... values) {
@@ -207,15 +157,8 @@ private InverseMultiValueFloatChunkFilter(float... values) {
         }
 
         @Override
-        public void filter(FloatChunk<? extends Values> values, LongChunk<OrderedRowKeys> keys,
-                WritableLongChunk<OrderedRowKeys> results) {
-            results.setSize(0);
-            for (int ii = 0; ii < values.size(); ++ii) {
-                final float checkValue = values.get(ii);
-                if (!this.values.contains(checkValue)) {
-                    results.add(keys.get(ii));
-                }
-            }
+        public boolean matches(float value) {
+            return !this.values.contains(value);
         }
     }
 }
diff --git a/engine/table/src/main/java/io/deephaven/engine/table/impl/chunkfilter/FloatRangeComparator.java b/engine/table/src/main/java/io/deephaven/engine/table/impl/chunkfilter/FloatRangeComparator.java
index 2d9027c446e..caa3f084b1f 100644
--- a/engine/table/src/main/java/io/deephaven/engine/table/impl/chunkfilter/FloatRangeComparator.java
+++ b/engine/table/src/main/java/io/deephaven/engine/table/impl/chunkfilter/FloatRangeComparator.java
@@ -4,14 +4,11 @@
 package io.deephaven.engine.table.impl.chunkfilter;
 
 import io.deephaven.util.compare.FloatComparisons;
-import io.deephaven.chunk.*;
-import io.deephaven.engine.rowset.chunkattributes.OrderedRowKeys;
-import io.deephaven.chunk.attributes.Values;
 
 public class FloatRangeComparator {
     private FloatRangeComparator() {} // static use only
 
-    private abstract static class FloatFloatFilter implements ChunkFilter.FloatChunkFilter {
+    private abstract static class FloatFloatFilter extends FloatChunkFilter {
         final float lower;
         final float upper;
 
@@ -19,80 +16,53 @@ private abstract static class FloatFloatFilter implements ChunkFilter.FloatChunk
             this.lower = lower;
             this.upper = upper;
         }
-
-        abstract public void filter(FloatChunk<? extends Values> values, LongChunk<OrderedRowKeys> keys,
-                WritableLongChunk<OrderedRowKeys> results);
     }
 
-    static class FloatDoubleInclusiveInclusiveFilter extends FloatFloatFilter {
+    private final static class FloatDoubleInclusiveInclusiveFilter extends FloatFloatFilter {
         private FloatDoubleInclusiveInclusiveFilter(float lower, float upper) {
             super(lower, upper);
         }
 
-        public void filter(FloatChunk<? extends Values> values, LongChunk<OrderedRowKeys> keys,
-                WritableLongChunk<OrderedRowKeys> results) {
-            results.setSize(0);
-            for (int ii = 0; ii < values.size(); ++ii) {
-                final float value = values.get(ii);
-                if (FloatComparisons.geq(value, lower) && FloatComparisons.leq(value, upper)) {
-                    results.add(keys.get(ii));
-                }
-            }
+        @Override
+        public boolean matches(float value) {
+            return FloatComparisons.geq(value, lower) && FloatComparisons.leq(value, upper);
         }
     }
 
-    static class FloatDoubleInclusiveExclusiveFilter extends FloatFloatFilter {
+    private final static class FloatDoubleInclusiveExclusiveFilter extends FloatFloatFilter {
         private FloatDoubleInclusiveExclusiveFilter(float lower, float upper) {
             super(lower, upper);
         }
 
-        public void filter(FloatChunk<? extends Values> values, LongChunk<OrderedRowKeys> keys,
-                WritableLongChunk<OrderedRowKeys> results) {
-            results.setSize(0);
-            for (int ii = 0; ii < values.size(); ++ii) {
-                final float value = values.get(ii);
-                if (FloatComparisons.geq(value, lower) && FloatComparisons.lt(value, upper)) {
-                    results.add(keys.get(ii));
-                }
-            }
+        @Override
+        public boolean matches(float value) {
+            return FloatComparisons.geq(value, lower) && FloatComparisons.lt(value, upper);
         }
     }
 
-    static class FloatDoubleExclusiveInclusiveFilter extends FloatFloatFilter {
+    private final static class FloatDoubleExclusiveInclusiveFilter extends FloatFloatFilter {
         private FloatDoubleExclusiveInclusiveFilter(float lower, float upper) {
             super(lower, upper);
         }
 
-        public void filter(FloatChunk<? extends Values> values, LongChunk<OrderedRowKeys> keys,
-                WritableLongChunk<OrderedRowKeys> results) {
-            results.setSize(0);
-            for (int ii = 0; ii < values.size(); ++ii) {
-                final float value = values.get(ii);
-                if (FloatComparisons.gt(value, lower) && FloatComparisons.leq(value, upper)) {
-                    results.add(keys.get(ii));
-                }
-            }
+        @Override
+        public boolean matches(float value) {
+            return FloatComparisons.gt(value, lower) && FloatComparisons.leq(value, upper);
         }
     }
 
-    static class FloatDoubleExclusiveExclusiveFilter extends FloatFloatFilter {
+    private final static class FloatDoubleExclusiveExclusiveFilter extends FloatFloatFilter {
         private FloatDoubleExclusiveExclusiveFilter(float lower, float upper) {
             super(lower, upper);
         }
 
-        public void filter(FloatChunk<? extends Values> values, LongChunk<OrderedRowKeys> keys,
-                WritableLongChunk<OrderedRowKeys> results) {
-            results.setSize(0);
-            for (int ii = 0; ii < values.size(); ++ii) {
-                final float value = values.get(ii);
-                if (FloatComparisons.gt(value, lower) && FloatComparisons.lt(value, upper)) {
-                    results.add(keys.get(ii));
-                }
-            }
+        @Override
+        public boolean matches(float value) {
+            return FloatComparisons.gt(value, lower) && FloatComparisons.lt(value, upper);
         }
     }
 
-    public static ChunkFilter.FloatChunkFilter makeFloatFilter(float lower, float upper, boolean lowerInclusive,
+    public static FloatChunkFilter makeFloatFilter(float lower, float upper, boolean lowerInclusive,
             boolean upperInclusive) {
         if (lowerInclusive) {
             if (upperInclusive) {
diff --git a/engine/table/src/main/java/io/deephaven/engine/table/impl/chunkfilter/IntChunkFilter.java b/engine/table/src/main/java/io/deephaven/engine/table/impl/chunkfilter/IntChunkFilter.java
new file mode 100644
index 00000000000..c8dd051e53a
--- /dev/null
+++ b/engine/table/src/main/java/io/deephaven/engine/table/impl/chunkfilter/IntChunkFilter.java
@@ -0,0 +1,67 @@
+//
+// Copyright (c) 2016-2024 Deephaven Data Labs and Patent Pending
+//
+// ****** AUTO-GENERATED CLASS - DO NOT EDIT MANUALLY
+// ****** Edit CharChunkFilter and run "./gradlew replicateChunkFilters" to regenerate
+//
+// @formatter:off
+package io.deephaven.engine.table.impl.chunkfilter;
+
+import io.deephaven.chunk.*;
+import io.deephaven.chunk.attributes.Values;
+import io.deephaven.engine.rowset.chunkattributes.OrderedRowKeys;
+
+public abstract class IntChunkFilter implements ChunkFilter {
+    public abstract boolean matches(int value);
+
+    @Override
+    public final void filter(
+            final Chunk<? extends Values> values,
+            final LongChunk<OrderedRowKeys> keys,
+            final WritableLongChunk<OrderedRowKeys> results) {
+        final IntChunk<? extends Values> intChunk = values.asIntChunk();
+        final int len = intChunk.size();
+
+        results.setSize(0);
+        for (int ii = 0; ii < len; ++ii) {
+            if (matches(intChunk.get(ii))) {
+                results.add(keys.get(ii));
+            }
+        }
+    }
+
+    @Override
+    public final int filter(final Chunk<? extends Values> values, final WritableBooleanChunk<Values> results) {
+        final IntChunk<? extends Values> intChunk = values.asIntChunk();
+        final int len = values.size();
+        int count = 0;
+        for (int ii = 0; ii < len; ++ii) {
+            final boolean newResult = matches(intChunk.get(ii));
+            results.set(ii, newResult);
+            // count every true value
+            count += newResult ? 1 : 0;
+        }
+        return count;
+    }
+
+    @Override
+    public final int filterAnd(final Chunk<? extends Values> values, final WritableBooleanChunk<Values> results) {
+        final IntChunk<? extends Values> intChunk = values.asIntChunk();
+        final int len = values.size();
+        int count = 0;
+        // Count the values that changed from true to false
+        for (int ii = 0; ii < len; ++ii) {
+            final boolean result = results.get(ii);
+            if (!result) {
+                // already false, no need to compute or increment the count
+                continue;
+            }
+            boolean newResult = matches(intChunk.get(ii));
+            results.set(ii, newResult);
+            // increment the count if the new result is TRUE
+            count += newResult ? 1 : 0;
+        }
+        return count;
+    }
+}
+
diff --git a/engine/table/src/main/java/io/deephaven/engine/table/impl/chunkfilter/IntChunkMatchFilterFactory.java b/engine/table/src/main/java/io/deephaven/engine/table/impl/chunkfilter/IntChunkMatchFilterFactory.java
index 2199c7f9382..6af8527b13e 100644
--- a/engine/table/src/main/java/io/deephaven/engine/table/impl/chunkfilter/IntChunkMatchFilterFactory.java
+++ b/engine/table/src/main/java/io/deephaven/engine/table/impl/chunkfilter/IntChunkMatchFilterFactory.java
@@ -7,23 +7,20 @@
 // @formatter:off
 package io.deephaven.engine.table.impl.chunkfilter;
 
-import io.deephaven.chunk.*;
-import io.deephaven.engine.rowset.chunkattributes.OrderedRowKeys;
-import io.deephaven.chunk.attributes.Values;
 import gnu.trove.set.hash.TIntHashSet;
 
 /**
  * Creates chunk filters for int values.
- *
+ * <p>
  * The strategy is that for one, two, or three values we have specialized classes that will do the appropriate simple
  * equality check.
- *
+ * <p>
  * For more values, we use a trove set and check contains for each value in the chunk.
  */
 public class IntChunkMatchFilterFactory {
     private IntChunkMatchFilterFactory() {} // static use only
 
-    public static ChunkFilter.IntChunkFilter makeFilter(boolean invertMatch, int... values) {
+    public static IntChunkFilter makeFilter(boolean invertMatch, int... values) {
         if (invertMatch) {
             if (values.length == 1) {
                 return new InverseSingleValueIntChunkFilter(values[0]);
@@ -49,7 +46,7 @@ public static ChunkFilter.IntChunkFilter makeFilter(boolean invertMatch, int...
         }
     }
 
-    private static class SingleValueIntChunkFilter implements ChunkFilter.IntChunkFilter {
+    private final static class SingleValueIntChunkFilter extends IntChunkFilter {
         private final int value;
 
         private SingleValueIntChunkFilter(int value) {
@@ -57,18 +54,12 @@ private SingleValueIntChunkFilter(int value) {
         }
 
         @Override
-        public void filter(IntChunk<? extends Values> values, LongChunk<OrderedRowKeys> keys,
-                WritableLongChunk<OrderedRowKeys> results) {
-            results.setSize(0);
-            for (int ii = 0; ii < values.size(); ++ii) {
-                if (values.get(ii) == value) {
-                    results.add(keys.get(ii));
-                }
-            }
+        public boolean matches(int value) {
+            return value == this.value;
         }
     }
 
-    private static class InverseSingleValueIntChunkFilter implements ChunkFilter.IntChunkFilter {
+    private final static class InverseSingleValueIntChunkFilter extends IntChunkFilter {
         private final int value;
 
         private InverseSingleValueIntChunkFilter(int value) {
@@ -76,18 +67,12 @@ private InverseSingleValueIntChunkFilter(int value) {
         }
 
         @Override
-        public void filter(IntChunk<? extends Values> values, LongChunk<OrderedRowKeys> keys,
-                WritableLongChunk<OrderedRowKeys> results) {
-            results.setSize(0);
-            for (int ii = 0; ii < values.size(); ++ii) {
-                if (values.get(ii) != value) {
-                    results.add(keys.get(ii));
-                }
-            }
+        public boolean matches(int value) {
+            return value != this.value;
         }
     }
 
-    private static class TwoValueIntChunkFilter implements ChunkFilter.IntChunkFilter {
+    private final static class TwoValueIntChunkFilter extends IntChunkFilter {
         private final int value1;
         private final int value2;
 
@@ -97,19 +82,12 @@ private TwoValueIntChunkFilter(int value1, int value2) {
         }
 
         @Override
-        public void filter(IntChunk<? extends Values> values, LongChunk<OrderedRowKeys> keys,
-                WritableLongChunk<OrderedRowKeys> results) {
-            results.setSize(0);
-            for (int ii = 0; ii < values.size(); ++ii) {
-                final int checkValue = values.get(ii);
-                if (checkValue == value1 || checkValue == value2) {
-                    results.add(keys.get(ii));
-                }
-            }
+        public boolean matches(int value) {
+            return value == value1 || value == value2;
         }
     }
 
-    private static class InverseTwoValueIntChunkFilter implements ChunkFilter.IntChunkFilter {
+    private final static class InverseTwoValueIntChunkFilter extends IntChunkFilter {
         private final int value1;
         private final int value2;
 
@@ -119,19 +97,12 @@ private InverseTwoValueIntChunkFilter(int value1, int value2) {
         }
 
         @Override
-        public void filter(IntChunk<? extends Values> values, LongChunk<OrderedRowKeys> keys,
-                WritableLongChunk<OrderedRowKeys> results) {
-            results.setSize(0);
-            for (int ii = 0; ii < values.size(); ++ii) {
-                final int checkValue = values.get(ii);
-                if (!(checkValue == value1 || checkValue == value2)) {
-                    results.add(keys.get(ii));
-                }
-            }
+        public boolean matches(int value) {
+            return value != value1 && value != value2;
         }
     }
 
-    private static class ThreeValueIntChunkFilter implements ChunkFilter.IntChunkFilter {
+    private final static class ThreeValueIntChunkFilter extends IntChunkFilter {
         private final int value1;
         private final int value2;
         private final int value3;
@@ -143,19 +114,12 @@ private ThreeValueIntChunkFilter(int value1, int value2, int value3) {
         }
 
         @Override
-        public void filter(IntChunk<? extends Values> values, LongChunk<OrderedRowKeys> keys,
-                WritableLongChunk<OrderedRowKeys> results) {
-            results.setSize(0);
-            for (int ii = 0; ii < values.size(); ++ii) {
-                final int checkValue = values.get(ii);
-                if (checkValue == value1 || checkValue == value2 || checkValue == value3) {
-                    results.add(keys.get(ii));
-                }
-            }
+        public boolean matches(int value) {
+            return value == value1 || value == value2 || value == value3;
         }
     }
 
-    private static class InverseThreeValueIntChunkFilter implements ChunkFilter.IntChunkFilter {
+    private final static class InverseThreeValueIntChunkFilter extends IntChunkFilter {
         private final int value1;
         private final int value2;
         private final int value3;
@@ -167,19 +131,12 @@ private InverseThreeValueIntChunkFilter(int value1, int value2, int value3) {
         }
 
         @Override
-        public void filter(IntChunk<? extends Values> values, LongChunk<OrderedRowKeys> keys,
-                WritableLongChunk<OrderedRowKeys> results) {
-            results.setSize(0);
-            for (int ii = 0; ii < values.size(); ++ii) {
-                final int checkValue = values.get(ii);
-                if (!(checkValue == value1 || checkValue == value2 || checkValue == value3)) {
-                    results.add(keys.get(ii));
-                }
-            }
+        public boolean matches(int value) {
+            return value != value1 && value != value2 && value != value3;
         }
     }
 
-    private static class MultiValueIntChunkFilter implements ChunkFilter.IntChunkFilter {
+    private final static class MultiValueIntChunkFilter extends IntChunkFilter {
         private final TIntHashSet values;
 
         private MultiValueIntChunkFilter(int... values) {
@@ -187,19 +144,12 @@ private MultiValueIntChunkFilter(int... values) {
         }
 
         @Override
-        public void filter(IntChunk<? extends Values> values, LongChunk<OrderedRowKeys> keys,
-                WritableLongChunk<OrderedRowKeys> results) {
-            results.setSize(0);
-            for (int ii = 0; ii < values.size(); ++ii) {
-                final int checkValue = values.get(ii);
-                if (this.values.contains(checkValue)) {
-                    results.add(keys.get(ii));
-                }
-            }
+        public boolean matches(int value) {
+            return this.values.contains(value);
         }
     }
 
-    private static class InverseMultiValueIntChunkFilter implements ChunkFilter.IntChunkFilter {
+    private final static class InverseMultiValueIntChunkFilter extends IntChunkFilter {
         private final TIntHashSet values;
 
         private InverseMultiValueIntChunkFilter(int... values) {
@@ -207,15 +157,8 @@ private InverseMultiValueIntChunkFilter(int... values) {
         }
 
         @Override
-        public void filter(IntChunk<? extends Values> values, LongChunk<OrderedRowKeys> keys,
-                WritableLongChunk<OrderedRowKeys> results) {
-            results.setSize(0);
-            for (int ii = 0; ii < values.size(); ++ii) {
-                final int checkValue = values.get(ii);
-                if (!this.values.contains(checkValue)) {
-                    results.add(keys.get(ii));
-                }
-            }
+        public boolean matches(int value) {
+            return !this.values.contains(value);
         }
     }
 }
diff --git a/engine/table/src/main/java/io/deephaven/engine/table/impl/chunkfilter/IntRangeComparator.java b/engine/table/src/main/java/io/deephaven/engine/table/impl/chunkfilter/IntRangeComparator.java
index 16fa808cd24..308bf04f69b 100644
--- a/engine/table/src/main/java/io/deephaven/engine/table/impl/chunkfilter/IntRangeComparator.java
+++ b/engine/table/src/main/java/io/deephaven/engine/table/impl/chunkfilter/IntRangeComparator.java
@@ -8,14 +8,11 @@
 package io.deephaven.engine.table.impl.chunkfilter;
 
 import io.deephaven.util.compare.IntComparisons;
-import io.deephaven.chunk.*;
-import io.deephaven.engine.rowset.chunkattributes.OrderedRowKeys;
-import io.deephaven.chunk.attributes.Values;
 
 public class IntRangeComparator {
     private IntRangeComparator() {} // static use only
 
-    private abstract static class IntIntFilter implements ChunkFilter.IntChunkFilter {
+    private abstract static class IntIntFilter extends IntChunkFilter {
         final int lower;
         final int upper;
 
@@ -23,80 +20,53 @@ private abstract static class IntIntFilter implements ChunkFilter.IntChunkFilter
             this.lower = lower;
             this.upper = upper;
         }
-
-        abstract public void filter(IntChunk<? extends Values> values, LongChunk<OrderedRowKeys> keys,
-                WritableLongChunk<OrderedRowKeys> results);
     }
 
-    static class IntIntInclusiveInclusiveFilter extends IntIntFilter {
+    final static class IntIntInclusiveInclusiveFilter extends IntIntFilter {
         private IntIntInclusiveInclusiveFilter(int lower, int upper) {
             super(lower, upper);
         }
 
-        public void filter(IntChunk<? extends Values> values, LongChunk<OrderedRowKeys> keys,
-                WritableLongChunk<OrderedRowKeys> results) {
-            results.setSize(0);
-            for (int ii = 0; ii < values.size(); ++ii) {
-                final int value = values.get(ii);
-                if (IntComparisons.geq(value, lower) && IntComparisons.leq(value, upper)) {
-                    results.add(keys.get(ii));
-                }
-            }
+        @Override
+        public boolean matches(int value) {
+            return IntComparisons.geq(value, lower) && IntComparisons.leq(value, upper);
         }
     }
 
-    static class IntIntInclusiveExclusiveFilter extends IntIntFilter {
+    final static class IntIntInclusiveExclusiveFilter extends IntIntFilter {
         private IntIntInclusiveExclusiveFilter(int lower, int upper) {
             super(lower, upper);
         }
 
-        public void filter(IntChunk<? extends Values> values, LongChunk<OrderedRowKeys> keys,
-                WritableLongChunk<OrderedRowKeys> results) {
-            results.setSize(0);
-            for (int ii = 0; ii < values.size(); ++ii) {
-                final int value = values.get(ii);
-                if (IntComparisons.geq(value, lower) && IntComparisons.lt(value, upper)) {
-                    results.add(keys.get(ii));
-                }
-            }
+        @Override
+        public boolean matches(int value) {
+            return IntComparisons.geq(value, lower) && IntComparisons.lt(value, upper);
         }
     }
 
-    static class IntIntExclusiveInclusiveFilter extends IntIntFilter {
+    final static class IntIntExclusiveInclusiveFilter extends IntIntFilter {
         private IntIntExclusiveInclusiveFilter(int lower, int upper) {
             super(lower, upper);
         }
 
-        public void filter(IntChunk<? extends Values> values, LongChunk<OrderedRowKeys> keys,
-                WritableLongChunk<OrderedRowKeys> results) {
-            results.setSize(0);
-            for (int ii = 0; ii < values.size(); ++ii) {
-                final int value = values.get(ii);
-                if (IntComparisons.gt(value, lower) && IntComparisons.leq(value, upper)) {
-                    results.add(keys.get(ii));
-                }
-            }
+        @Override
+        public boolean matches(int value) {
+            return IntComparisons.gt(value, lower) && IntComparisons.leq(value, upper);
         }
     }
 
-    static class IntIntExclusiveExclusiveFilter extends IntIntFilter {
+    final static class IntIntExclusiveExclusiveFilter extends IntIntFilter {
         private IntIntExclusiveExclusiveFilter(int lower, int upper) {
             super(lower, upper);
         }
 
-        public void filter(IntChunk<? extends Values> values, LongChunk<OrderedRowKeys> keys,
-                WritableLongChunk<OrderedRowKeys> results) {
-            results.setSize(0);
-            for (int ii = 0; ii < values.size(); ++ii) {
-                final int value = values.get(ii);
-                if (IntComparisons.gt(value, lower) && IntComparisons.lt(value, upper)) {
-                    results.add(keys.get(ii));
-                }
-            }
+        @Override
+        public boolean matches(int value) {
+            return IntComparisons.gt(value, lower) && IntComparisons.lt(value, upper);
         }
     }
 
-    public static ChunkFilter.IntChunkFilter makeIntFilter(int lower, int upper, boolean lowerInclusive,
+    public static IntChunkFilter makeIntFilter(int lower, int upper, boolean lowerInclusive,
             boolean upperInclusive) {
         if (lowerInclusive) {
             if (upperInclusive) {
diff --git a/engine/table/src/main/java/io/deephaven/engine/table/impl/chunkfilter/LongChunkFilter.java b/engine/table/src/main/java/io/deephaven/engine/table/impl/chunkfilter/LongChunkFilter.java
new file mode 100644
index 00000000000..4545fbb3fbf
--- /dev/null
+++ b/engine/table/src/main/java/io/deephaven/engine/table/impl/chunkfilter/LongChunkFilter.java
@@ -0,0 +1,67 @@
+//
+// Copyright (c) 2016-2024 Deephaven Data Labs and Patent Pending
+//
+// ****** AUTO-GENERATED CLASS - DO NOT EDIT MANUALLY
+// ****** Edit CharChunkFilter and run "./gradlew replicateChunkFilters" to regenerate
+//
+// @formatter:off
+package io.deephaven.engine.table.impl.chunkfilter;
+
+import io.deephaven.chunk.*;
+import io.deephaven.chunk.attributes.Values;
+import io.deephaven.engine.rowset.chunkattributes.OrderedRowKeys;
+
+public abstract class LongChunkFilter implements ChunkFilter {
+    public abstract boolean matches(long value);
+
+    @Override
+    public final void filter(
+            final Chunk<? extends Values> values,
+            final LongChunk<OrderedRowKeys> keys,
+            final WritableLongChunk<OrderedRowKeys> results) {
+        final LongChunk<? extends Values> longChunk = values.asLongChunk();
+        final int len = longChunk.size();
+
+        results.setSize(0);
+        for (int ii = 0; ii < len; ++ii) {
+            if (matches(longChunk.get(ii))) {
+                results.add(keys.get(ii));
+            }
+        }
+    }
+
+    @Override
+    public final int filter(final Chunk<? extends Values> values, final WritableBooleanChunk<Values> results) {
+        final LongChunk<? extends Values> longChunk = values.asLongChunk();
+        final int len = values.size();
+        int count = 0;
+        for (int ii = 0; ii < len; ++ii) {
+            final boolean newResult = matches(longChunk.get(ii));
+            results.set(ii, newResult);
+            // count every true value
+            count += newResult ? 1 : 0;
+        }
+        return count;
+    }
+
+    @Override
+    public final int filterAnd(final Chunk<? extends Values> values, final WritableBooleanChunk<Values> results) {
+        final LongChunk<? extends Values> longChunk = values.asLongChunk();
+        final int len = values.size();
+        int count = 0;
+        // Count the values that changed from true to false
+        for (int ii = 0; ii < len; ++ii) {
+            final boolean result = results.get(ii);
+            if (!result) {
+                // already false, no need to compute or increment the count
+                continue;
+            }
+            boolean newResult = matches(longChunk.get(ii));
+            results.set(ii, newResult);
+            // increment the count if the new result is TRUE
+            count += newResult ? 1 : 0;
+        }
+        return count;
+    }
+}
+
diff --git a/engine/table/src/main/java/io/deephaven/engine/table/impl/chunkfilter/LongChunkMatchFilterFactory.java b/engine/table/src/main/java/io/deephaven/engine/table/impl/chunkfilter/LongChunkMatchFilterFactory.java
index e283ece3d82..74b932f8c94 100644
--- a/engine/table/src/main/java/io/deephaven/engine/table/impl/chunkfilter/LongChunkMatchFilterFactory.java
+++ b/engine/table/src/main/java/io/deephaven/engine/table/impl/chunkfilter/LongChunkMatchFilterFactory.java
@@ -7,23 +7,20 @@
 // @formatter:off
 package io.deephaven.engine.table.impl.chunkfilter;
 
-import io.deephaven.chunk.*;
-import io.deephaven.engine.rowset.chunkattributes.OrderedRowKeys;
-import io.deephaven.chunk.attributes.Values;
 import gnu.trove.set.hash.TLongHashSet;
 
 /**
  * Creates chunk filters for long values.
- *
+ * <p>
  * The strategy is that for one, two, or three values we have specialized classes that will do the appropriate simple
  * equality check.
- *
+ * <p>
  * For more values, we use a trove set and check contains for each value in the chunk.
  */
 public class LongChunkMatchFilterFactory {
     private LongChunkMatchFilterFactory() {} // static use only
 
-    public static ChunkFilter.LongChunkFilter makeFilter(boolean invertMatch, long... values) {
+    public static LongChunkFilter makeFilter(boolean invertMatch, long... values) {
         if (invertMatch) {
             if (values.length == 1) {
                 return new InverseSingleValueLongChunkFilter(values[0]);
@@ -49,7 +46,7 @@ public static ChunkFilter.LongChunkFilter makeFilter(boolean invertMatch, long..
         }
     }
 
-    private static class SingleValueLongChunkFilter implements ChunkFilter.LongChunkFilter {
+    private final static class SingleValueLongChunkFilter extends LongChunkFilter {
         private final long value;
 
         private SingleValueLongChunkFilter(long value) {
@@ -57,18 +54,12 @@ private SingleValueLongChunkFilter(long value) {
         }
 
         @Override
-        public void filter(LongChunk<? extends Values> values, LongChunk<OrderedRowKeys> keys,
-                WritableLongChunk<OrderedRowKeys> results) {
-            results.setSize(0);
-            for (int ii = 0; ii < values.size(); ++ii) {
-                if (values.get(ii) == value) {
-                    results.add(keys.get(ii));
-                }
-            }
+        public boolean matches(long value) {
+            return value == this.value;
         }
     }
 
-    private static class InverseSingleValueLongChunkFilter implements ChunkFilter.LongChunkFilter {
+    private final static class InverseSingleValueLongChunkFilter extends LongChunkFilter {
         private final long value;
 
         private InverseSingleValueLongChunkFilter(long value) {
@@ -76,18 +67,12 @@ private InverseSingleValueLongChunkFilter(long value) {
         }
 
         @Override
-        public void filter(LongChunk<? extends Values> values, LongChunk<OrderedRowKeys> keys,
-                WritableLongChunk<OrderedRowKeys> results) {
-            results.setSize(0);
-            for (int ii = 0; ii < values.size(); ++ii) {
-                if (values.get(ii) != value) {
-                    results.add(keys.get(ii));
-                }
-            }
+        public boolean matches(long value) {
+            return value != this.value;
         }
     }
 
-    private static class TwoValueLongChunkFilter implements ChunkFilter.LongChunkFilter {
+    private final static class TwoValueLongChunkFilter extends LongChunkFilter {
         private final long value1;
         private final long value2;
 
@@ -97,19 +82,12 @@ private TwoValueLongChunkFilter(long value1, long value2) {
         }
 
         @Override
-        public void filter(LongChunk<? extends Values> values, LongChunk<OrderedRowKeys> keys,
-                WritableLongChunk<OrderedRowKeys> results) {
-            results.setSize(0);
-            for (int ii = 0; ii < values.size(); ++ii) {
-                final long checkValue = values.get(ii);
-                if (checkValue == value1 || checkValue == value2) {
-                    results.add(keys.get(ii));
-                }
-            }
+        public boolean matches(long value) {
+            return value == value1 || value == value2;
         }
     }
 
-    private static class InverseTwoValueLongChunkFilter implements ChunkFilter.LongChunkFilter {
+    private final static class InverseTwoValueLongChunkFilter extends LongChunkFilter {
         private final long value1;
         private final long value2;
 
@@ -119,19 +97,12 @@ private InverseTwoValueLongChunkFilter(long value1, long value2) {
         }
 
         @Override
-        public void filter(LongChunk<? extends Values> values, LongChunk<OrderedRowKeys> keys,
-                WritableLongChunk<OrderedRowKeys> results) {
-            results.setSize(0);
-            for (int ii = 0; ii < values.size(); ++ii) {
-                final long checkValue = values.get(ii);
-                if (!(checkValue == value1 || checkValue == value2)) {
-                    results.add(keys.get(ii));
-                }
-            }
+        public boolean matches(long value) {
+            return value != value1 && value != value2;
         }
     }
 
-    private static class ThreeValueLongChunkFilter implements ChunkFilter.LongChunkFilter {
+    private final static class ThreeValueLongChunkFilter extends LongChunkFilter {
         private final long value1;
         private final long value2;
         private final long value3;
@@ -143,19 +114,12 @@ private ThreeValueLongChunkFilter(long value1, long value2, long value3) {
         }
 
         @Override
-        public void filter(LongChunk<? extends Values> values, LongChunk<OrderedRowKeys> keys,
-                WritableLongChunk<OrderedRowKeys> results) {
-            results.setSize(0);
-            for (int ii = 0; ii < values.size(); ++ii) {
-                final long checkValue = values.get(ii);
-                if (checkValue == value1 || checkValue == value2 || checkValue == value3) {
-                    results.add(keys.get(ii));
-                }
-            }
+        public boolean matches(long value) {
+            return value == value1 || value == value2 || value == value3;
         }
     }
 
-    private static class InverseThreeValueLongChunkFilter implements ChunkFilter.LongChunkFilter {
+    private final static class InverseThreeValueLongChunkFilter extends LongChunkFilter {
         private final long value1;
         private final long value2;
         private final long value3;
@@ -167,19 +131,12 @@ private InverseThreeValueLongChunkFilter(long value1, long value2, long value3)
         }
 
         @Override
-        public void filter(LongChunk<? extends Values> values, LongChunk<OrderedRowKeys> keys,
-                WritableLongChunk<OrderedRowKeys> results) {
-            results.setSize(0);
-            for (int ii = 0; ii < values.size(); ++ii) {
-                final long checkValue = values.get(ii);
-                if (!(checkValue == value1 || checkValue == value2 || checkValue == value3)) {
-                    results.add(keys.get(ii));
-                }
-            }
+        public boolean matches(long value) {
+            return value != value1 && value != value2 && value != value3;
         }
     }
 
-    private static class MultiValueLongChunkFilter implements ChunkFilter.LongChunkFilter {
+    private final static class MultiValueLongChunkFilter extends LongChunkFilter {
         private final TLongHashSet values;
 
         private MultiValueLongChunkFilter(long... values) {
@@ -187,19 +144,12 @@ private MultiValueLongChunkFilter(long... values) {
         }
 
         @Override
-        public void filter(LongChunk<? extends Values> values, LongChunk<OrderedRowKeys> keys,
-                WritableLongChunk<OrderedRowKeys> results) {
-            results.setSize(0);
-            for (int ii = 0; ii < values.size(); ++ii) {
-                final long checkValue = values.get(ii);
-                if (this.values.contains(checkValue)) {
-                    results.add(keys.get(ii));
-                }
-            }
+        public boolean matches(long value) {
+            return this.values.contains(value);
         }
     }
 
-    private static class InverseMultiValueLongChunkFilter implements ChunkFilter.LongChunkFilter {
+    private final static class InverseMultiValueLongChunkFilter extends LongChunkFilter {
         private final TLongHashSet values;
 
         private InverseMultiValueLongChunkFilter(long... values) {
@@ -207,15 +157,8 @@ private InverseMultiValueLongChunkFilter(long... values) {
         }
 
         @Override
-        public void filter(LongChunk<? extends Values> values, LongChunk<OrderedRowKeys> keys,
-                WritableLongChunk<OrderedRowKeys> results) {
-            results.setSize(0);
-            for (int ii = 0; ii < values.size(); ++ii) {
-                final long checkValue = values.get(ii);
-                if (!this.values.contains(checkValue)) {
-                    results.add(keys.get(ii));
-                }
-            }
+        public boolean matches(long value) {
+            return !this.values.contains(value);
         }
     }
 }
diff --git a/engine/table/src/main/java/io/deephaven/engine/table/impl/chunkfilter/LongRangeComparator.java b/engine/table/src/main/java/io/deephaven/engine/table/impl/chunkfilter/LongRangeComparator.java
index b150b80e880..bf910b99194 100644
--- a/engine/table/src/main/java/io/deephaven/engine/table/impl/chunkfilter/LongRangeComparator.java
+++ b/engine/table/src/main/java/io/deephaven/engine/table/impl/chunkfilter/LongRangeComparator.java
@@ -1,17 +1,18 @@
 //
 // Copyright (c) 2016-2024 Deephaven Data Labs and Patent Pending
 //
+// ****** AUTO-GENERATED CLASS - DO NOT EDIT MANUALLY
+// ****** Edit CharRangeComparator and run "./gradlew replicateChunkFilters" to regenerate
+//
+// @formatter:off
 package io.deephaven.engine.table.impl.chunkfilter;
 
 import io.deephaven.util.compare.LongComparisons;
-import io.deephaven.chunk.*;
-import io.deephaven.engine.rowset.chunkattributes.OrderedRowKeys;
-import io.deephaven.chunk.attributes.Values;
 
 public class LongRangeComparator {
     private LongRangeComparator() {} // static use only
 
-    private abstract static class LongLongFilter implements ChunkFilter.LongChunkFilter {
+    private abstract static class LongLongFilter extends LongChunkFilter {
         final long lower;
         final long upper;
 
@@ -19,80 +20,53 @@ private abstract static class LongLongFilter implements ChunkFilter.LongChunkFil
             this.lower = lower;
             this.upper = upper;
         }
-
-        abstract public void filter(LongChunk<? extends Values> values, LongChunk<OrderedRowKeys> keys,
-                WritableLongChunk<OrderedRowKeys> results);
     }
 
-    static class LongLongInclusiveInclusiveFilter extends LongLongFilter {
+    final static class LongLongInclusiveInclusiveFilter extends LongLongFilter {
         private LongLongInclusiveInclusiveFilter(long lower, long upper) {
             super(lower, upper);
         }
 
-        public void filter(LongChunk<? extends Values> values, LongChunk<OrderedRowKeys> keys,
-                WritableLongChunk<OrderedRowKeys> results) {
-            results.setSize(0);
-            for (int ii = 0; ii < values.size(); ++ii) {
-                final long value = values.get(ii);
-                if (LongComparisons.geq(value, lower) && LongComparisons.leq(value, upper)) {
-                    results.add(keys.get(ii));
-                }
-            }
+        @Override
+        public boolean matches(long value) {
+            return LongComparisons.geq(value, lower) && LongComparisons.leq(value, upper);
         }
     }
 
-    static class LongLongInclusiveExclusiveFilter extends LongLongFilter {
+    final static class LongLongInclusiveExclusiveFilter extends LongLongFilter {
         private LongLongInclusiveExclusiveFilter(long lower, long upper) {
             super(lower, upper);
         }
 
-        public void filter(LongChunk<? extends Values> values, LongChunk<OrderedRowKeys> keys,
-                WritableLongChunk<OrderedRowKeys> results) {
-            results.setSize(0);
-            for (int ii = 0; ii < values.size(); ++ii) {
-                final long value = values.get(ii);
-                if (LongComparisons.geq(value, lower) && LongComparisons.lt(value, upper)) {
-                    results.add(keys.get(ii));
-                }
-            }
+        @Override
+        public boolean matches(long value) {
+            return LongComparisons.geq(value, lower) && LongComparisons.lt(value, upper);
         }
     }
 
-    static class LongLongExclusiveInclusiveFilter extends LongLongFilter {
+    final static class LongLongExclusiveInclusiveFilter extends LongLongFilter {
         private LongLongExclusiveInclusiveFilter(long lower, long upper) {
             super(lower, upper);
         }
 
-        public void filter(LongChunk<? extends Values> values, LongChunk<OrderedRowKeys> keys,
-                WritableLongChunk<OrderedRowKeys> results) {
-            results.setSize(0);
-            for (int ii = 0; ii < values.size(); ++ii) {
-                final long value = values.get(ii);
-                if (LongComparisons.gt(value, lower) && LongComparisons.leq(value, upper)) {
-                    results.add(keys.get(ii));
-                }
-            }
+        @Override
+        public boolean matches(long value) {
+            return LongComparisons.gt(value, lower) && LongComparisons.leq(value, upper);
         }
     }
 
-    static class LongLongExclusiveExclusiveFilter extends LongLongFilter {
+    final static class LongLongExclusiveExclusiveFilter extends LongLongFilter {
         private LongLongExclusiveExclusiveFilter(long lower, long upper) {
             super(lower, upper);
         }
 
-        public void filter(LongChunk<? extends Values> values, LongChunk<OrderedRowKeys> keys,
-                WritableLongChunk<OrderedRowKeys> results) {
-            results.setSize(0);
-            for (int ii = 0; ii < values.size(); ++ii) {
-                final long value = values.get(ii);
-                if (LongComparisons.gt(value, lower) && LongComparisons.lt(value, upper)) {
-                    results.add(keys.get(ii));
-                }
-            }
+        @Override
+        public boolean matches(long value) {
+            return LongComparisons.gt(value, lower) && LongComparisons.lt(value, upper);
         }
     }
 
-    public static ChunkFilter.LongChunkFilter makeLongFilter(long lower, long upper, boolean lowerInclusive,
+    public static LongChunkFilter makeLongFilter(long lower, long upper, boolean lowerInclusive,
             boolean upperInclusive) {
         if (lowerInclusive) {
             if (upperInclusive) {
diff --git a/engine/table/src/main/java/io/deephaven/engine/table/impl/chunkfilter/ObjectChunkFilter.java b/engine/table/src/main/java/io/deephaven/engine/table/impl/chunkfilter/ObjectChunkFilter.java
new file mode 100644
index 00000000000..700c8653ac6
--- /dev/null
+++ b/engine/table/src/main/java/io/deephaven/engine/table/impl/chunkfilter/ObjectChunkFilter.java
@@ -0,0 +1,63 @@
+//
+// Copyright (c) 2016-2024 Deephaven Data Labs and Patent Pending
+//
+package io.deephaven.engine.table.impl.chunkfilter;
+
+import io.deephaven.chunk.*;
+import io.deephaven.chunk.attributes.Values;
+import io.deephaven.engine.rowset.chunkattributes.OrderedRowKeys;
+
+public abstract class ObjectChunkFilter<T> implements ChunkFilter {
+    public abstract boolean matches(T value);
+
+    @Override
+    public final void filter(
+            final Chunk<? extends Values> values,
+            final LongChunk<OrderedRowKeys> keys,
+            final WritableLongChunk<OrderedRowKeys> results) {
+        final ObjectChunk<T, ? extends Values> objectChunk = values.asObjectChunk();
+        final int len = objectChunk.size();
+
+        results.setSize(0);
+        for (int ii = 0; ii < len; ++ii) {
+            if (matches(objectChunk.get(ii))) {
+                results.add(keys.get(ii));
+            }
+        }
+    }
+
+    @Override
+    public final int filter(final Chunk<? extends Values> values, final WritableBooleanChunk<Values> results) {
+        final ObjectChunk<T, ? extends Values> objectChunk = values.asObjectChunk();
+        final int len = values.size();
+        int count = 0;
+        for (int ii = 0; ii < len; ++ii) {
+            final boolean newResult = matches(objectChunk.get(ii));
+            results.set(ii, newResult);
+            // count every true value
+            count += newResult ? 1 : 0;
+        }
+        return count;
+    }
+
+    @Override
+    public final int filterAnd(final Chunk<? extends Values> values, final WritableBooleanChunk<Values> results) {
+        final ObjectChunk<T, ? extends Values> objectChunk = values.asObjectChunk();
+        final int len = values.size();
+        int count = 0;
+        // Count the values that changed from true to false
+        for (int ii = 0; ii < len; ++ii) {
+            final boolean result = results.get(ii);
+            if (!result) {
+                // already false, no need to compute or increment the count
+                continue;
+            }
+            boolean newResult = matches(objectChunk.get(ii));
+            results.set(ii, newResult);
+            // increment the count if the new result is TRUE
+            count += newResult ? 1 : 0;
+        }
+        return count;
+    }
+}
+
diff --git a/engine/table/src/main/java/io/deephaven/engine/table/impl/chunkfilter/ObjectChunkMatchFilterFactory.java b/engine/table/src/main/java/io/deephaven/engine/table/impl/chunkfilter/ObjectChunkMatchFilterFactory.java
index 0d32524fc33..4cafb621563 100644
--- a/engine/table/src/main/java/io/deephaven/engine/table/impl/chunkfilter/ObjectChunkMatchFilterFactory.java
+++ b/engine/table/src/main/java/io/deephaven/engine/table/impl/chunkfilter/ObjectChunkMatchFilterFactory.java
@@ -3,10 +3,6 @@
 //
 package io.deephaven.engine.table.impl.chunkfilter;
 
-import io.deephaven.chunk.*;
-import io.deephaven.engine.rowset.chunkattributes.OrderedRowKeys;
-import io.deephaven.chunk.attributes.Values;
-
 import java.util.Arrays;
 import java.util.HashSet;
 import java.util.Objects;
@@ -14,7 +10,8 @@
 public class ObjectChunkMatchFilterFactory {
     private ObjectChunkMatchFilterFactory() {} // static use only
 
-    public static ChunkFilter.ObjectChunkFilter makeFilter(boolean invert, Object... values) {
+    @SuppressWarnings("rawtypes")
+    public static ObjectChunkFilter makeFilter(boolean invert, Object... values) {
         if (invert) {
             if (values.length == 1) {
                 return new InverseSingleValueObjectChunkFilter(values[0]);
@@ -40,7 +37,7 @@ public static ChunkFilter.ObjectChunkFilter makeFilter(boolean invert, Object...
         }
     }
 
-    private static class SingleValueObjectChunkFilter implements ChunkFilter.ObjectChunkFilter<Object> {
+    private final static class SingleValueObjectChunkFilter extends ObjectChunkFilter<Object> {
         private final Object value;
 
         private SingleValueObjectChunkFilter(Object value) {
@@ -48,18 +45,12 @@ private SingleValueObjectChunkFilter(Object value) {
         }
 
         @Override
-        public void filter(ObjectChunk<Object, ? extends Values> values, LongChunk<OrderedRowKeys> keys,
-                WritableLongChunk<OrderedRowKeys> results) {
-            results.setSize(0);
-            for (int ii = 0; ii < values.size(); ++ii) {
-                if (Objects.equals(values.get(ii), value)) {
-                    results.add(keys.get(ii));
-                }
-            }
+        public boolean matches(Object value) {
+            return Objects.equals(value, this.value);
         }
     }
 
-    private static class InverseSingleValueObjectChunkFilter implements ChunkFilter.ObjectChunkFilter<Object> {
+    private final static class InverseSingleValueObjectChunkFilter extends ObjectChunkFilter<Object> {
         private final Object value;
 
         private InverseSingleValueObjectChunkFilter(Object value) {
@@ -67,18 +58,12 @@ private InverseSingleValueObjectChunkFilter(Object value) {
         }
 
         @Override
-        public void filter(ObjectChunk<Object, ? extends Values> values, LongChunk<OrderedRowKeys> keys,
-                WritableLongChunk<OrderedRowKeys> results) {
-            results.setSize(0);
-            for (int ii = 0; ii < values.size(); ++ii) {
-                if (!Objects.equals(values.get(ii), value)) {
-                    results.add(keys.get(ii));
-                }
-            }
+        public boolean matches(Object value) {
+            return !Objects.equals(value, this.value);
         }
     }
 
-    private static class TwoValueObjectChunkFilter implements ChunkFilter.ObjectChunkFilter<Object> {
+    private final static class TwoValueObjectChunkFilter extends ObjectChunkFilter<Object> {
         private final Object value1;
         private final Object value2;
 
@@ -88,19 +73,12 @@ private TwoValueObjectChunkFilter(Object value1, Object value2) {
         }
 
         @Override
-        public void filter(ObjectChunk<Object, ? extends Values> values, LongChunk<OrderedRowKeys> keys,
-                WritableLongChunk<OrderedRowKeys> results) {
-            results.setSize(0);
-            for (int ii = 0; ii < values.size(); ++ii) {
-                final Object checkValue = values.get(ii);
-                if (Objects.equals(checkValue, value1) || Objects.equals(checkValue, value2)) {
-                    results.add(keys.get(ii));
-                }
-            }
+        public boolean matches(Object value) {
+            return Objects.equals(value, value1) || Objects.equals(value, value2);
         }
     }
 
-    private static class InverseTwoValueObjectChunkFilter implements ChunkFilter.ObjectChunkFilter<Object> {
+    private final static class InverseTwoValueObjectChunkFilter extends ObjectChunkFilter<Object> {
         private final Object value1;
         private final Object value2;
 
@@ -110,19 +88,12 @@ private InverseTwoValueObjectChunkFilter(Object value1, Object value2) {
         }
 
         @Override
-        public void filter(ObjectChunk<Object, ? extends Values> values, LongChunk<OrderedRowKeys> keys,
-                WritableLongChunk<OrderedRowKeys> results) {
-            results.setSize(0);
-            for (int ii = 0; ii < values.size(); ++ii) {
-                final Object checkValue = values.get(ii);
-                if (!(Objects.equals(checkValue, value1) || Objects.equals(checkValue, value2))) {
-                    results.add(keys.get(ii));
-                }
-            }
+        public boolean matches(Object value) {
+            return !(Objects.equals(value, value1) || Objects.equals(value, value2));
         }
     }
 
-    private static class ThreeValueObjectChunkFilter implements ChunkFilter.ObjectChunkFilter<Object> {
+    private final static class ThreeValueObjectChunkFilter extends ObjectChunkFilter<Object> {
         private final Object value1;
         private final Object value2;
         private final Object value3;
@@ -134,19 +105,12 @@ private ThreeValueObjectChunkFilter(Object value1, Object value2, Object value3)
         }
 
         @Override
-        public void filter(ObjectChunk<Object, ? extends Values> values, LongChunk<OrderedRowKeys> keys,
-                WritableLongChunk<OrderedRowKeys> results) {
-            results.setSize(0);
-            for (int ii = 0; ii < values.size(); ++ii) {
-                final Object checkValue = values.get(ii);
-                if (Objects.equals(checkValue, value1) || Objects.equals(checkValue, value2)
-                        || Objects.equals(checkValue, value3)) {
-                    results.add(keys.get(ii));
-                }
-            }
+        public boolean matches(Object value) {
+            return Objects.equals(value, value1) || Objects.equals(value, value2) || Objects.equals(value, value3);
         }
     }
-    private static class InverseThreeValueObjectChunkFilter implements ChunkFilter.ObjectChunkFilter<Object> {
+
+    private final static class InverseThreeValueObjectChunkFilter extends ObjectChunkFilter<Object> {
         private final Object value1;
         private final Object value2;
         private final Object value3;
@@ -158,20 +122,12 @@ private InverseThreeValueObjectChunkFilter(Object value1, Object value2, Object
         }
 
         @Override
-        public void filter(ObjectChunk<Object, ? extends Values> values, LongChunk<OrderedRowKeys> keys,
-                WritableLongChunk<OrderedRowKeys> results) {
-            results.setSize(0);
-            for (int ii = 0; ii < values.size(); ++ii) {
-                final Object checkValue = values.get(ii);
-                if (!(Objects.equals(checkValue, value1) || Objects.equals(checkValue, value2)
-                        || Objects.equals(checkValue, value3))) {
-                    results.add(keys.get(ii));
-                }
-            }
+        public boolean matches(Object value) {
+            return !(Objects.equals(value, value1) || Objects.equals(value, value2) || Objects.equals(value, value3));
         }
     }
 
-    private static class MultiValueObjectChunkFilter implements ChunkFilter.ObjectChunkFilter<Object> {
+    private final static class MultiValueObjectChunkFilter extends ObjectChunkFilter<Object> {
         private final HashSet<?> values;
 
         private MultiValueObjectChunkFilter(Object... values) {
@@ -179,18 +135,12 @@ private MultiValueObjectChunkFilter(Object... values) {
         }
 
         @Override
-        public void filter(ObjectChunk<Object, ? extends Values> values, LongChunk<OrderedRowKeys> keys,
-                WritableLongChunk<OrderedRowKeys> results) {
-            results.setSize(0);
-            for (int ii = 0; ii < values.size(); ++ii) {
-                if (this.values.contains(values.get(ii))) {
-                    results.add(keys.get(ii));
-                }
-            }
+        public boolean matches(Object value) {
+            return this.values.contains(value);
         }
     }
 
-    private static class InverseMultiValueObjectChunkFilter implements ChunkFilter.ObjectChunkFilter<Object> {
+    private final static class InverseMultiValueObjectChunkFilter extends ObjectChunkFilter<Object> {
         private final HashSet<?> values;
 
         private InverseMultiValueObjectChunkFilter(Object... values) {
@@ -198,14 +148,8 @@ private InverseMultiValueObjectChunkFilter(Object... values) {
         }
 
         @Override
-        public void filter(ObjectChunk<Object, ? extends Values> values, LongChunk<OrderedRowKeys> keys,
-                WritableLongChunk<OrderedRowKeys> results) {
-            results.setSize(0);
-            for (int ii = 0; ii < values.size(); ++ii) {
-                if (!this.values.contains(values.get(ii))) {
-                    results.add(keys.get(ii));
-                }
-            }
+        public boolean matches(Object value) {
+            return !this.values.contains(value);
         }
     }
 }
diff --git a/engine/table/src/main/java/io/deephaven/engine/table/impl/chunkfilter/ShortChunkFilter.java b/engine/table/src/main/java/io/deephaven/engine/table/impl/chunkfilter/ShortChunkFilter.java
new file mode 100644
index 00000000000..d2aac89d041
--- /dev/null
+++ b/engine/table/src/main/java/io/deephaven/engine/table/impl/chunkfilter/ShortChunkFilter.java
@@ -0,0 +1,67 @@
+//
+// Copyright (c) 2016-2024 Deephaven Data Labs and Patent Pending
+//
+// ****** AUTO-GENERATED CLASS - DO NOT EDIT MANUALLY
+// ****** Edit CharChunkFilter and run "./gradlew replicateChunkFilters" to regenerate
+//
+// @formatter:off
+package io.deephaven.engine.table.impl.chunkfilter;
+
+import io.deephaven.chunk.*;
+import io.deephaven.chunk.attributes.Values;
+import io.deephaven.engine.rowset.chunkattributes.OrderedRowKeys;
+
+public abstract class ShortChunkFilter implements ChunkFilter {
+    public abstract boolean matches(short value);
+
+    @Override
+    public final void filter(
+            final Chunk<? extends Values> values,
+            final LongChunk<OrderedRowKeys> keys,
+            final WritableLongChunk<OrderedRowKeys> results) {
+        final ShortChunk<? extends Values> shortChunk = values.asShortChunk();
+        final int len = shortChunk.size();
+
+        results.setSize(0);
+        for (int ii = 0; ii < len; ++ii) {
+            if (matches(shortChunk.get(ii))) {
+                results.add(keys.get(ii));
+            }
+        }
+    }
+
+    @Override
+    public final int filter(final Chunk<? extends Values> values, final WritableBooleanChunk<Values> results) {
+        final ShortChunk<? extends Values> shortChunk = values.asShortChunk();
+        final int len = values.size();
+        int count = 0;
+        for (int ii = 0; ii < len; ++ii) {
+            final boolean newResult = matches(shortChunk.get(ii));
+            results.set(ii, newResult);
+            // count every true value
+            count += newResult ? 1 : 0;
+        }
+        return count;
+    }
+
+    @Override
+    public final int filterAnd(final Chunk<? extends Values> values, final WritableBooleanChunk<Values> results) {
+        final ShortChunk<? extends Values> shortChunk = values.asShortChunk();
+        final int len = values.size();
+        int count = 0;
+        // Count the values that changed from true to false
+        for (int ii = 0; ii < len; ++ii) {
+            final boolean result = results.get(ii);
+            if (!result) {
+                // already false, no need to compute or increment the count
+                continue;
+            }
+            boolean newResult = matches(shortChunk.get(ii));
+            results.set(ii, newResult);
+            // increment the count if the new result is TRUE
+            count += newResult ? 1 : 0;
+        }
+        return count;
+    }
+}
+
diff --git a/engine/table/src/main/java/io/deephaven/engine/table/impl/chunkfilter/ShortChunkMatchFilterFactory.java b/engine/table/src/main/java/io/deephaven/engine/table/impl/chunkfilter/ShortChunkMatchFilterFactory.java
index 56be76311c5..d62966e309e 100644
--- a/engine/table/src/main/java/io/deephaven/engine/table/impl/chunkfilter/ShortChunkMatchFilterFactory.java
+++ b/engine/table/src/main/java/io/deephaven/engine/table/impl/chunkfilter/ShortChunkMatchFilterFactory.java
@@ -7,23 +7,20 @@
 // @formatter:off
 package io.deephaven.engine.table.impl.chunkfilter;
 
-import io.deephaven.chunk.*;
-import io.deephaven.engine.rowset.chunkattributes.OrderedRowKeys;
-import io.deephaven.chunk.attributes.Values;
 import gnu.trove.set.hash.TShortHashSet;
 
 /**
  * Creates chunk filters for short values.
- *
+ * <p>
  * The strategy is that for one, two, or three values we have specialized classes that will do the appropriate simple
  * equality check.
- *
+ * <p>
  * For more values, we use a trove set and check contains for each value in the chunk.
  */
 public class ShortChunkMatchFilterFactory {
     private ShortChunkMatchFilterFactory() {} // static use only
 
-    public static ChunkFilter.ShortChunkFilter makeFilter(boolean invertMatch, short... values) {
+    public static ShortChunkFilter makeFilter(boolean invertMatch, short... values) {
         if (invertMatch) {
             if (values.length == 1) {
                 return new InverseSingleValueShortChunkFilter(values[0]);
@@ -49,7 +46,7 @@ public static ChunkFilter.ShortChunkFilter makeFilter(boolean invertMatch, short
         }
     }
 
-    private static class SingleValueShortChunkFilter implements ChunkFilter.ShortChunkFilter {
+    private final static class SingleValueShortChunkFilter extends ShortChunkFilter {
         private final short value;
 
         private SingleValueShortChunkFilter(short value) {
@@ -57,18 +54,12 @@ private SingleValueShortChunkFilter(short value) {
         }
 
         @Override
-        public void filter(ShortChunk<? extends Values> values, LongChunk<OrderedRowKeys> keys,
-                WritableLongChunk<OrderedRowKeys> results) {
-            results.setSize(0);
-            for (int ii = 0; ii < values.size(); ++ii) {
-                if (values.get(ii) == value) {
-                    results.add(keys.get(ii));
-                }
-            }
+        public boolean matches(short value) {
+            return value == this.value;
         }
     }
 
-    private static class InverseSingleValueShortChunkFilter implements ChunkFilter.ShortChunkFilter {
+    private final static class InverseSingleValueShortChunkFilter extends ShortChunkFilter {
         private final short value;
 
         private InverseSingleValueShortChunkFilter(short value) {
@@ -76,18 +67,12 @@ private InverseSingleValueShortChunkFilter(short value) {
         }
 
         @Override
-        public void filter(ShortChunk<? extends Values> values, LongChunk<OrderedRowKeys> keys,
-                WritableLongChunk<OrderedRowKeys> results) {
-            results.setSize(0);
-            for (int ii = 0; ii < values.size(); ++ii) {
-                if (values.get(ii) != value) {
-                    results.add(keys.get(ii));
-                }
-            }
+        public boolean matches(short value) {
+            return value != this.value;
         }
     }
 
-    private static class TwoValueShortChunkFilter implements ChunkFilter.ShortChunkFilter {
+    private final static class TwoValueShortChunkFilter extends ShortChunkFilter {
         private final short value1;
         private final short value2;
 
@@ -97,19 +82,12 @@ private TwoValueShortChunkFilter(short value1, short value2) {
         }
 
         @Override
-        public void filter(ShortChunk<? extends Values> values, LongChunk<OrderedRowKeys> keys,
-                WritableLongChunk<OrderedRowKeys> results) {
-            results.setSize(0);
-            for (int ii = 0; ii < values.size(); ++ii) {
-                final short checkValue = values.get(ii);
-                if (checkValue == value1 || checkValue == value2) {
-                    results.add(keys.get(ii));
-                }
-            }
+        public boolean matches(short value) {
+            return value == value1 || value == value2;
         }
     }
 
-    private static class InverseTwoValueShortChunkFilter implements ChunkFilter.ShortChunkFilter {
+    private final static class InverseTwoValueShortChunkFilter extends ShortChunkFilter {
         private final short value1;
         private final short value2;
 
@@ -119,19 +97,12 @@ private InverseTwoValueShortChunkFilter(short value1, short value2) {
         }
 
         @Override
-        public void filter(ShortChunk<? extends Values> values, LongChunk<OrderedRowKeys> keys,
-                WritableLongChunk<OrderedRowKeys> results) {
-            results.setSize(0);
-            for (int ii = 0; ii < values.size(); ++ii) {
-                final short checkValue = values.get(ii);
-                if (!(checkValue == value1 || checkValue == value2)) {
-                    results.add(keys.get(ii));
-                }
-            }
+        public boolean matches(short value) {
+            return value != value1 && value != value2;
         }
     }
 
-    private static class ThreeValueShortChunkFilter implements ChunkFilter.ShortChunkFilter {
+    private final static class ThreeValueShortChunkFilter extends ShortChunkFilter {
         private final short value1;
         private final short value2;
         private final short value3;
@@ -143,19 +114,12 @@ private ThreeValueShortChunkFilter(short value1, short value2, short value3) {
         }
 
         @Override
-        public void filter(ShortChunk<? extends Values> values, LongChunk<OrderedRowKeys> keys,
-                WritableLongChunk<OrderedRowKeys> results) {
-            results.setSize(0);
-            for (int ii = 0; ii < values.size(); ++ii) {
-                final short checkValue = values.get(ii);
-                if (checkValue == value1 || checkValue == value2 || checkValue == value3) {
-                    results.add(keys.get(ii));
-                }
-            }
+        public boolean matches(short value) {
+            return value == value1 || value == value2 || value == value3;
         }
     }
 
-    private static class InverseThreeValueShortChunkFilter implements ChunkFilter.ShortChunkFilter {
+    private final static class InverseThreeValueShortChunkFilter extends ShortChunkFilter {
         private final short value1;
         private final short value2;
         private final short value3;
@@ -167,19 +131,12 @@ private InverseThreeValueShortChunkFilter(short value1, short value2, short valu
         }
 
         @Override
-        public void filter(ShortChunk<? extends Values> values, LongChunk<OrderedRowKeys> keys,
-                WritableLongChunk<OrderedRowKeys> results) {
-            results.setSize(0);
-            for (int ii = 0; ii < values.size(); ++ii) {
-                final short checkValue = values.get(ii);
-                if (!(checkValue == value1 || checkValue == value2 || checkValue == value3)) {
-                    results.add(keys.get(ii));
-                }
-            }
+        public boolean matches(short value) {
+            return value != value1 && value != value2 && value != value3;
         }
     }
 
-    private static class MultiValueShortChunkFilter implements ChunkFilter.ShortChunkFilter {
+    private final static class MultiValueShortChunkFilter extends ShortChunkFilter {
         private final TShortHashSet values;
 
         private MultiValueShortChunkFilter(short... values) {
@@ -187,19 +144,12 @@ private MultiValueShortChunkFilter(short... values) {
         }
 
         @Override
-        public void filter(ShortChunk<? extends Values> values, LongChunk<OrderedRowKeys> keys,
-                WritableLongChunk<OrderedRowKeys> results) {
-            results.setSize(0);
-            for (int ii = 0; ii < values.size(); ++ii) {
-                final short checkValue = values.get(ii);
-                if (this.values.contains(checkValue)) {
-                    results.add(keys.get(ii));
-                }
-            }
+        public boolean matches(short value) {
+            return this.values.contains(value);
         }
     }
 
-    private static class InverseMultiValueShortChunkFilter implements ChunkFilter.ShortChunkFilter {
+    private final static class InverseMultiValueShortChunkFilter extends ShortChunkFilter {
         private final TShortHashSet values;
 
         private InverseMultiValueShortChunkFilter(short... values) {
@@ -207,15 +157,8 @@ private InverseMultiValueShortChunkFilter(short... values) {
         }
 
         @Override
-        public void filter(ShortChunk<? extends Values> values, LongChunk<OrderedRowKeys> keys,
-                WritableLongChunk<OrderedRowKeys> results) {
-            results.setSize(0);
-            for (int ii = 0; ii < values.size(); ++ii) {
-                final short checkValue = values.get(ii);
-                if (!this.values.contains(checkValue)) {
-                    results.add(keys.get(ii));
-                }
-            }
+        public boolean matches(short value) {
+            return !this.values.contains(value);
         }
     }
 }
diff --git a/engine/table/src/main/java/io/deephaven/engine/table/impl/chunkfilter/ShortRangeComparator.java b/engine/table/src/main/java/io/deephaven/engine/table/impl/chunkfilter/ShortRangeComparator.java
index cbddc507b4b..2b994a0f335 100644
--- a/engine/table/src/main/java/io/deephaven/engine/table/impl/chunkfilter/ShortRangeComparator.java
+++ b/engine/table/src/main/java/io/deephaven/engine/table/impl/chunkfilter/ShortRangeComparator.java
@@ -8,14 +8,11 @@
 package io.deephaven.engine.table.impl.chunkfilter;
 
 import io.deephaven.util.compare.ShortComparisons;
-import io.deephaven.chunk.*;
-import io.deephaven.engine.rowset.chunkattributes.OrderedRowKeys;
-import io.deephaven.chunk.attributes.Values;
 
 public class ShortRangeComparator {
     private ShortRangeComparator() {} // static use only
 
-    private abstract static class ShortShortFilter implements ChunkFilter.ShortChunkFilter {
+    private abstract static class ShortShortFilter extends ShortChunkFilter {
         final short lower;
         final short upper;
 
@@ -23,80 +20,53 @@ private abstract static class ShortShortFilter implements ChunkFilter.ShortChunk
             this.lower = lower;
             this.upper = upper;
         }
-
-        abstract public void filter(ShortChunk<? extends Values> values, LongChunk<OrderedRowKeys> keys,
-                WritableLongChunk<OrderedRowKeys> results);
     }
 
-    static class ShortShortInclusiveInclusiveFilter extends ShortShortFilter {
+    final static class ShortShortInclusiveInclusiveFilter extends ShortShortFilter {
         private ShortShortInclusiveInclusiveFilter(short lower, short upper) {
             super(lower, upper);
         }
 
-        public void filter(ShortChunk<? extends Values> values, LongChunk<OrderedRowKeys> keys,
-                WritableLongChunk<OrderedRowKeys> results) {
-            results.setSize(0);
-            for (int ii = 0; ii < values.size(); ++ii) {
-                final short value = values.get(ii);
-                if (ShortComparisons.geq(value, lower) && ShortComparisons.leq(value, upper)) {
-                    results.add(keys.get(ii));
-                }
-            }
+        @Override
+        public boolean matches(short value) {
+            return ShortComparisons.geq(value, lower) && ShortComparisons.leq(value, upper);
         }
     }
 
-    static class ShortShortInclusiveExclusiveFilter extends ShortShortFilter {
+    final static class ShortShortInclusiveExclusiveFilter extends ShortShortFilter {
         private ShortShortInclusiveExclusiveFilter(short lower, short upper) {
             super(lower, upper);
         }
 
-        public void filter(ShortChunk<? extends Values> values, LongChunk<OrderedRowKeys> keys,
-                WritableLongChunk<OrderedRowKeys> results) {
-            results.setSize(0);
-            for (int ii = 0; ii < values.size(); ++ii) {
-                final short value = values.get(ii);
-                if (ShortComparisons.geq(value, lower) && ShortComparisons.lt(value, upper)) {
-                    results.add(keys.get(ii));
-                }
-            }
+        @Override
+        public boolean matches(short value) {
+            return ShortComparisons.geq(value, lower) && ShortComparisons.lt(value, upper);
         }
     }
 
-    static class ShortShortExclusiveInclusiveFilter extends ShortShortFilter {
+    final static class ShortShortExclusiveInclusiveFilter extends ShortShortFilter {
         private ShortShortExclusiveInclusiveFilter(short lower, short upper) {
             super(lower, upper);
         }
 
-        public void filter(ShortChunk<? extends Values> values, LongChunk<OrderedRowKeys> keys,
-                WritableLongChunk<OrderedRowKeys> results) {
-            results.setSize(0);
-            for (int ii = 0; ii < values.size(); ++ii) {
-                final short value = values.get(ii);
-                if (ShortComparisons.gt(value, lower) && ShortComparisons.leq(value, upper)) {
-                    results.add(keys.get(ii));
-                }
-            }
+        @Override
+        public boolean matches(short value) {
+            return ShortComparisons.gt(value, lower) && ShortComparisons.leq(value, upper);
         }
     }
 
-    static class ShortShortExclusiveExclusiveFilter extends ShortShortFilter {
+    final static class ShortShortExclusiveExclusiveFilter extends ShortShortFilter {
         private ShortShortExclusiveExclusiveFilter(short lower, short upper) {
             super(lower, upper);
         }
 
-        public void filter(ShortChunk<? extends Values> values, LongChunk<OrderedRowKeys> keys,
-                WritableLongChunk<OrderedRowKeys> results) {
-            results.setSize(0);
-            for (int ii = 0; ii < values.size(); ++ii) {
-                final short value = values.get(ii);
-                if (ShortComparisons.gt(value, lower) && ShortComparisons.lt(value, upper)) {
-                    results.add(keys.get(ii));
-                }
-            }
+        @Override
+        public boolean matches(short value) {
+            return ShortComparisons.gt(value, lower) && ShortComparisons.lt(value, upper);
         }
     }
 
-    public static ChunkFilter.ShortChunkFilter makeShortFilter(short lower, short upper, boolean lowerInclusive,
+    public static ShortChunkFilter makeShortFilter(short lower, short upper, boolean lowerInclusive,
             boolean upperInclusive) {
         if (lowerInclusive) {
             if (upperInclusive) {
diff --git a/engine/table/src/main/java/io/deephaven/engine/table/impl/chunkfilter/StringChunkMatchFilterFactory.java b/engine/table/src/main/java/io/deephaven/engine/table/impl/chunkfilter/StringChunkMatchFilterFactory.java
index b99a5b5d61d..d07d0b5a380 100644
--- a/engine/table/src/main/java/io/deephaven/engine/table/impl/chunkfilter/StringChunkMatchFilterFactory.java
+++ b/engine/table/src/main/java/io/deephaven/engine/table/impl/chunkfilter/StringChunkMatchFilterFactory.java
@@ -6,9 +6,6 @@
 import io.deephaven.hash.KeyedObjectHashSet;
 import io.deephaven.hash.KeyedObjectKey;
 import io.deephaven.base.string.cache.CharSequenceUtils;
-import io.deephaven.chunk.*;
-import io.deephaven.chunk.attributes.Values;
-import io.deephaven.engine.rowset.chunkattributes.OrderedRowKeys;
 
 class StringChunkMatchFilterFactory {
     private static final class CIStringKey implements KeyedObjectKey<String, String> {
@@ -32,7 +29,8 @@ public boolean equalKey(String s, String s2) {
 
     private StringChunkMatchFilterFactory() {} // static use only
 
-    static ChunkFilter.ObjectChunkFilter makeCaseInsensitiveFilter(boolean invert, Object... values) {
+    @SuppressWarnings("rawtypes")
+    static ObjectChunkFilter makeCaseInsensitiveFilter(boolean invert, Object... values) {
         if (invert) {
             if (values.length == 1) {
                 return new InverseSingleValueStringChunkFilter((String) values[0]);
@@ -59,7 +57,7 @@ static ChunkFilter.ObjectChunkFilter makeCaseInsensitiveFilter(boolean invert, O
         }
     }
 
-    private static class SingleValueStringChunkFilter implements ChunkFilter.ObjectChunkFilter<String> {
+    private final static class SingleValueStringChunkFilter extends ObjectChunkFilter<String> {
         private final String value;
 
         private SingleValueStringChunkFilter(String value) {
@@ -67,20 +65,12 @@ private SingleValueStringChunkFilter(String value) {
         }
 
         @Override
-        public void filter(ObjectChunk<String, ? extends Values> values, LongChunk<OrderedRowKeys> keys,
-                WritableLongChunk<OrderedRowKeys> results) {
-            final ObjectChunk<String, ? extends Values> stringChunk = values.asTypedObjectChunk();
-            results.setSize(0);
-            for (int ii = 0; ii < stringChunk.size(); ++ii) {
-                final String checkString = stringChunk.get(ii);
-                if (value.equalsIgnoreCase(checkString)) {
-                    results.add(keys.get(ii));
-                }
-            }
+        public boolean matches(String value) {
+            return this.value.equalsIgnoreCase(value);
         }
     }
 
-    private static class InverseSingleValueStringChunkFilter implements ChunkFilter.ObjectChunkFilter<String> {
+    private static class InverseSingleValueStringChunkFilter extends ObjectChunkFilter<String> {
         private final String value;
 
         private InverseSingleValueStringChunkFilter(String value) {
@@ -88,20 +78,12 @@ private InverseSingleValueStringChunkFilter(String value) {
         }
 
         @Override
-        public void filter(ObjectChunk<String, ? extends Values> values, LongChunk<OrderedRowKeys> keys,
-                WritableLongChunk<OrderedRowKeys> results) {
-            final ObjectChunk<String, ? extends Values> stringChunk = values.asTypedObjectChunk();
-            results.setSize(0);
-            for (int ii = 0; ii < stringChunk.size(); ++ii) {
-                final String checkString = stringChunk.get(ii);
-                if (!value.equalsIgnoreCase(checkString)) {
-                    results.add(keys.get(ii));
-                }
-            }
+        public boolean matches(String value) {
+            return !this.value.equalsIgnoreCase(value);
         }
     }
 
-    private static class TwoValueStringChunkFilter implements ChunkFilter.ObjectChunkFilter<String> {
+    private static class TwoValueStringChunkFilter extends ObjectChunkFilter<String> {
         private final String value1;
         private final String value2;
 
@@ -111,20 +93,12 @@ private TwoValueStringChunkFilter(String value1, String value2) {
         }
 
         @Override
-        public void filter(ObjectChunk<String, ? extends Values> values, LongChunk<OrderedRowKeys> keys,
-                WritableLongChunk<OrderedRowKeys> results) {
-            final ObjectChunk<String, ? extends Values> stringChunk = values.asTypedObjectChunk();
-            results.setSize(0);
-            for (int ii = 0; ii < stringChunk.size(); ++ii) {
-                final String checkString = stringChunk.get(ii);
-                if (value1.equalsIgnoreCase(checkString) || value2.equalsIgnoreCase(checkString)) {
-                    results.add(keys.get(ii));
-                }
-            }
+        public boolean matches(String value) {
+            return value1.equalsIgnoreCase(value) || value2.equalsIgnoreCase(value);
         }
     }
 
-    private static class InverseTwoValueStringChunkFilter implements ChunkFilter.ObjectChunkFilter<String> {
+    private static class InverseTwoValueStringChunkFilter extends ObjectChunkFilter<String> {
         private final String value1;
         private final String value2;
 
@@ -134,20 +108,12 @@ private InverseTwoValueStringChunkFilter(String value1, String value2) {
         }
 
         @Override
-        public void filter(ObjectChunk<String, ? extends Values> values, LongChunk<OrderedRowKeys> keys,
-                WritableLongChunk<OrderedRowKeys> results) {
-            final ObjectChunk<String, ? extends Values> stringChunk = values.asTypedObjectChunk();
-            results.setSize(0);
-            for (int ii = 0; ii < stringChunk.size(); ++ii) {
-                final String checkString = stringChunk.get(ii);
-                if (!(value1.equalsIgnoreCase(checkString) || value2.equalsIgnoreCase(checkString))) {
-                    results.add(keys.get(ii));
-                }
-            }
+        public boolean matches(String value) {
+            return !value1.equalsIgnoreCase(value) && !value2.equalsIgnoreCase(value);
         }
     }
 
-    private static class ThreeValueStringChunkFilter implements ChunkFilter.ObjectChunkFilter<String> {
+    private static class ThreeValueStringChunkFilter extends ObjectChunkFilter<String> {
         private final String value1;
         private final String value2;
         private final String value3;
@@ -159,21 +125,12 @@ private ThreeValueStringChunkFilter(String value1, String value2, String value3)
         }
 
         @Override
-        public void filter(ObjectChunk<String, ? extends Values> values, LongChunk<OrderedRowKeys> keys,
-                WritableLongChunk<OrderedRowKeys> results) {
-            final ObjectChunk<String, ? extends Values> stringChunk = values.asTypedObjectChunk();
-            results.setSize(0);
-            for (int ii = 0; ii < stringChunk.size(); ++ii) {
-                final String checkString = stringChunk.get(ii);
-                if (value1.equalsIgnoreCase(checkString) || value2.equalsIgnoreCase(checkString)
-                        || value3.equalsIgnoreCase(checkString)) {
-                    results.add(keys.get(ii));
-                }
-            }
+        public boolean matches(String value) {
+            return value1.equalsIgnoreCase(value) || value2.equalsIgnoreCase(value) || value3.equalsIgnoreCase(value);
         }
     }
 
-    private static class InverseThreeValueStringChunkFilter implements ChunkFilter.ObjectChunkFilter<String> {
+    private static class InverseThreeValueStringChunkFilter extends ObjectChunkFilter<String> {
         private final String value1;
         private final String value2;
         private final String value3;
@@ -185,21 +142,13 @@ private InverseThreeValueStringChunkFilter(String value1, String value2, String
         }
 
         @Override
-        public void filter(ObjectChunk<String, ? extends Values> values, LongChunk<OrderedRowKeys> keys,
-                WritableLongChunk<OrderedRowKeys> results) {
-            final ObjectChunk<String, ? extends Values> stringChunk = values.asTypedObjectChunk();
-            results.setSize(0);
-            for (int ii = 0; ii < stringChunk.size(); ++ii) {
-                final String checkString = stringChunk.get(ii);
-                if (!(value1.equalsIgnoreCase(checkString) || value2.equalsIgnoreCase(checkString)
-                        || value3.equalsIgnoreCase(checkString))) {
-                    results.add(keys.get(ii));
-                }
-            }
+        public boolean matches(String value) {
+            return !value1.equalsIgnoreCase(value) && !value2.equalsIgnoreCase(value)
+                    && !value3.equalsIgnoreCase(value);
         }
     }
 
-    private static class MultiValueStringChunkFilter implements ChunkFilter.ObjectChunkFilter<String> {
+    private static class MultiValueStringChunkFilter extends ObjectChunkFilter<String> {
         private final KeyedObjectHashSet<String, String> values;
 
         private MultiValueStringChunkFilter(Object... values) {
@@ -210,20 +159,12 @@ private MultiValueStringChunkFilter(Object... values) {
         }
 
         @Override
-        public void filter(ObjectChunk<String, ? extends Values> values, LongChunk<OrderedRowKeys> keys,
-                WritableLongChunk<OrderedRowKeys> results) {
-            final ObjectChunk<String, ? extends Values> stringChunk = values.asTypedObjectChunk();
-            results.setSize(0);
-            for (int ii = 0; ii < stringChunk.size(); ++ii) {
-                final String checkString = stringChunk.get(ii);
-                if (this.values.containsKey(checkString)) {
-                    results.add(keys.get(ii));
-                }
-            }
+        public boolean matches(String value) {
+            return this.values.containsKey(value);
         }
     }
 
-    private static class InverseMultiValueStringChunkFilter implements ChunkFilter.ObjectChunkFilter<String> {
+    private static class InverseMultiValueStringChunkFilter extends ObjectChunkFilter<String> {
         private final KeyedObjectHashSet<String, String> values;
 
         private InverseMultiValueStringChunkFilter(Object... values) {
@@ -234,16 +175,8 @@ private InverseMultiValueStringChunkFilter(Object... values) {
         }
 
         @Override
-        public void filter(ObjectChunk<String, ? extends Values> values, LongChunk<OrderedRowKeys> keys,
-                WritableLongChunk<OrderedRowKeys> results) {
-            final ObjectChunk<String, ? extends Values> stringChunk = values.asTypedObjectChunk();
-            results.setSize(0);
-            for (int ii = 0; ii < stringChunk.size(); ++ii) {
-                final String checkString = stringChunk.get(ii);
-                if (!this.values.containsKey(checkString)) {
-                    results.add(keys.get(ii));
-                }
-            }
+        public boolean matches(String value) {
+            return !this.values.containsKey(value);
         }
     }
 }
diff --git a/engine/table/src/main/java/io/deephaven/engine/table/impl/dataindex/TransformedDataIndex.java b/engine/table/src/main/java/io/deephaven/engine/table/impl/dataindex/TransformedDataIndex.java
index a48ab67b977..7759adcaa49 100644
--- a/engine/table/src/main/java/io/deephaven/engine/table/impl/dataindex/TransformedDataIndex.java
+++ b/engine/table/src/main/java/io/deephaven/engine/table/impl/dataindex/TransformedDataIndex.java
@@ -15,6 +15,8 @@
 import io.deephaven.engine.table.DataIndex;
 import io.deephaven.engine.table.DataIndexTransformer;
 import io.deephaven.engine.table.Table;
+import io.deephaven.engine.table.impl.ForkJoinPoolOperationInitializer;
+import io.deephaven.engine.table.impl.perf.QueryPerformanceRecorder;
 import io.deephaven.engine.table.impl.select.FunctionalColumn;
 import io.deephaven.engine.table.impl.select.FunctionalColumnLong;
 import io.deephaven.engine.table.impl.select.SelectColumn;
@@ -79,25 +81,28 @@ public Table table() {
             if ((localIndexTable = indexTable) != null) {
                 return localIndexTable;
             }
+            indexTable = localIndexTable = QueryPerformanceRecorder.withNugget("Transform Data Index",
+                    ForkJoinPoolOperationInitializer.ensureParallelizable(this::buildTable));
+            // Don't hold onto the transformer after the index table is computed, we don't need to maintain
+            // reachability for its RowSets anymore.
+            transformer = null;
+            return localIndexTable;
+        }
+    }
 
-            try (final SafeCloseable ignored = parentIndex.isRefreshing() ? LivenessScopeStack.open() : null) {
-                localIndexTable = parentIndex.table();
-                localIndexTable = maybeIntersectAndInvert(localIndexTable);
-                localIndexTable = maybeSortByFirstKey(localIndexTable);
-                localIndexTable = localIndexTable.isRefreshing() && transformer.snapshotResult()
-                        ? localIndexTable.snapshot()
-                        : localIndexTable;
-
-                if (localIndexTable.isRefreshing()) {
-                    manage(localIndexTable);
-                }
-
-                indexTable = localIndexTable;
-                // Don't hold onto the transformer after the index table is computed, we don't need to maintain
-                // reachability for its RowSets anymore.
-                transformer = null;
-                return localIndexTable;
+    private Table buildTable() {
+        try (final SafeCloseable ignored = parentIndex.isRefreshing() ? LivenessScopeStack.open() : null) {
+            Table localIndexTable = parentIndex.table();
+            localIndexTable = maybeIntersectAndInvert(localIndexTable);
+            localIndexTable = maybeSortByFirstKey(localIndexTable);
+            localIndexTable = localIndexTable.isRefreshing() && transformer.snapshotResult()
+                    ? localIndexTable.snapshot()
+                    : localIndexTable;
+
+            if (localIndexTable.isRefreshing()) {
+                manage(localIndexTable);
             }
+            return localIndexTable;
         }
     }
 
diff --git a/engine/table/src/main/java/io/deephaven/engine/table/impl/hierarchical/HierarchicalTableImpl.java b/engine/table/src/main/java/io/deephaven/engine/table/impl/hierarchical/HierarchicalTableImpl.java
index fbe80beeb7f..7ec94f15b68 100644
--- a/engine/table/src/main/java/io/deephaven/engine/table/impl/hierarchical/HierarchicalTableImpl.java
+++ b/engine/table/src/main/java/io/deephaven/engine/table/impl/hierarchical/HierarchicalTableImpl.java
@@ -37,6 +37,7 @@
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
+import javax.annotation.OverridingMethodsMustInvokeSuper;
 import java.util.*;
 import java.util.function.Function;
 import java.util.function.LongUnaryOperator;
@@ -388,6 +389,7 @@ private void releaseSnapshotResources() {
             perLevelSharedContexts.clear();
         }
 
+        @OverridingMethodsMustInvokeSuper
         @Override
         protected void destroy() {
             super.destroy();
@@ -1008,11 +1010,14 @@ private Collection<KeyTableDirective> extractKeyTableNodeDirectives(
         getDefaultExpansionNodeKeys().forEach((final Object nodeKey) -> accumulateKeyTableDirective(
                 nodeKey, Expand, directivesByNodeKey, orderedDirectives));
 
-        try (final RowSet prevRowSet = usePrev ? keyTable.getRowSet().copyPrev() : null) {
-            final RowSequence rowsToExtract = usePrev ? prevRowSet : keyTable.getRowSet();
-            final ColumnIterator<?> nodeKeyIter = ChunkedColumnIterator.make(nodeKeySource, rowsToExtract);
-            final ByteColumnIterator actionIter =
-                    actionSource == null ? null : new ChunkedByteColumnIterator(actionSource, rowsToExtract);
+        final RowSequence rowsToExtract = usePrev
+                ? keyTable.getRowSet().prev()
+                : keyTable.getRowSet();
+        // @formatter:off
+        try (final ColumnIterator<?> nodeKeyIter = ChunkedColumnIterator.make(nodeKeySource, rowsToExtract);
+             final ByteColumnIterator actionIter =
+                        actionSource == null ? null : new ChunkedByteColumnIterator(actionSource, rowsToExtract)) {
+            // @formatter:on
             // If no action source is supplied, we default to "Expand"
             final Supplier<VisitAction> nextAction = actionIter == null
                     ? () -> Expand
@@ -1235,11 +1240,11 @@ private void visitExpandedNode(
                     numChildDirectives = 0;
                 }
 
-                final RowSet prevRows = snapshotState.usePrev ? forExpansion.getRowSet().copyPrev() : null;
-                final RowSet rowsToVisit = prevRows != null ? prevRows : forExpansion.getRowSet();
+                final RowSet rowsToVisit = snapshotState.usePrev
+                        ? forExpansion.getRowSet().prev()
+                        : forExpansion.getRowSet();
                 // @formatter:off
-                try (final SafeCloseable ignored = prevRows;
-                     final RowSequence.Iterator rowsToVisitIter = rowsToVisit.getRowSequenceIterator();
+                try (final RowSequence.Iterator rowsToVisitIter = rowsToVisit.getRowSequenceIterator();
                      final NodeFillContext filler = filling
                              ? new NodeFillContext(snapshotState, nodeTableState, rowsToVisit.size())
                              : null;
@@ -1273,7 +1278,8 @@ private void visitExpandedNode(
                                 // We're at the start of a contracted range; we need to consume the contracted range
                                 // and expand the first row after if there is one.
                                 final long lastContractedPositionInRange = contractedRowPositionsIter.currentRangeEnd();
-                                final long rangeSize = lastContractedPositionInRange - nextContractedPosition + 1;
+                                final int rangeSize = Math.toIntExact(
+                                        lastContractedPositionInRange - nextContractedPosition + 1);
                                 cdi += rangeSize;
                                 nextChildDirective = cdi < numChildDirectives ? childDirectives.get(cdi) : null;
                                 if (rowsToVisit.size() > lastContractedPositionInRange + 1) {
@@ -1473,10 +1479,12 @@ private void fillNormalDestinations(@NotNull final RowSequence rows) {
 
             try (final RowSequence.Iterator rowsIter =
                     rows.size() >= chunkSize ? rows.getRowSequenceIterator() : null) {
-                final RowSequence chunkRows =
-                        rowsIter == null ? rows : rowsIter.getNextRowSequenceWithLength(chunkSize);
-                final int chunkRowsSize = chunkRows.intSize();
                 do {
+                    final RowSequence chunkRows = rowsIter == null
+                            ? rows
+                            : rowsIter.getNextRowSequenceWithLength(chunkSize);
+                    final int chunkRowsSize = chunkRows.intSize();
+                    Assert.leq(chunkRowsSize, "chunkRowsSize", capacity, "capacity");
                     for (int di = 0, ci = columns.nextSetBit(0); ci >= 0; ++di, ci = columns.nextSetBit(ci + 1)) {
                         if (ci == ROW_EXPANDED_COLUMN_INDEX) {
                             continue;
diff --git a/engine/table/src/main/java/io/deephaven/engine/table/impl/hierarchical/HierarchicalTableSnapshotException.java b/engine/table/src/main/java/io/deephaven/engine/table/impl/hierarchical/HierarchicalTableSnapshotException.java
index 76aadde104f..54bb3520a19 100644
--- a/engine/table/src/main/java/io/deephaven/engine/table/impl/hierarchical/HierarchicalTableSnapshotException.java
+++ b/engine/table/src/main/java/io/deephaven/engine/table/impl/hierarchical/HierarchicalTableSnapshotException.java
@@ -3,9 +3,9 @@
 //
 package io.deephaven.engine.table.impl.hierarchical;
 
-import io.deephaven.UncheckedDeephavenException;
 import io.deephaven.api.ColumnName;
 import io.deephaven.chunk.WritableChunk;
+import io.deephaven.engine.exceptions.SnapshotUnsuccessfulException;
 import io.deephaven.engine.rowset.RowSequence;
 import io.deephaven.engine.table.Table;
 import io.deephaven.engine.table.hierarchical.HierarchicalTable;
@@ -18,7 +18,7 @@
  * {@link HierarchicalTable#snapshot(HierarchicalTable.SnapshotState, Table, ColumnName, BitSet, RowSequence, WritableChunk[])
  * snapshot}.
  */
-public class HierarchicalTableSnapshotException extends UncheckedDeephavenException {
+public class HierarchicalTableSnapshotException extends SnapshotUnsuccessfulException {
 
     public HierarchicalTableSnapshotException(@NotNull final String message, @NotNull final Throwable cause) {
         super(message, cause);
diff --git a/engine/table/src/main/java/io/deephaven/engine/table/impl/hierarchical/RollupTableImpl.java b/engine/table/src/main/java/io/deephaven/engine/table/impl/hierarchical/RollupTableImpl.java
index 26a77957a08..ca62164b344 100644
--- a/engine/table/src/main/java/io/deephaven/engine/table/impl/hierarchical/RollupTableImpl.java
+++ b/engine/table/src/main/java/io/deephaven/engine/table/impl/hierarchical/RollupTableImpl.java
@@ -815,6 +815,6 @@ NotificationStepSource[] getSourceDependencies() {
 
     @Override
     void maybeWaitForStructuralSatisfaction() {
-        // NB: It's sufficient to wait for the root node, which is done at the beginning of traversal.
+        maybeWaitForSatisfaction(getRoot());
     }
 }
diff --git a/engine/table/src/main/java/io/deephaven/engine/table/impl/hierarchical/TreeTableFilter.java b/engine/table/src/main/java/io/deephaven/engine/table/impl/hierarchical/TreeTableFilter.java
index 49fe8d22089..136ad2baeb5 100644
--- a/engine/table/src/main/java/io/deephaven/engine/table/impl/hierarchical/TreeTableFilter.java
+++ b/engine/table/src/main/java/io/deephaven/engine/table/impl/hierarchical/TreeTableFilter.java
@@ -105,12 +105,12 @@ public MemoizedOperationKey getMemoKey() {
     /**
      * The row identifier source from {@link #source}.
      */
-    private final ColumnSource idSource;
+    private final ColumnSource<?> idSource;
 
     /**
      * The parent identifier source from {@link #source}.
      */
-    private final ColumnSource parentIdSource;
+    private final ColumnSource<?> parentIdSource;
 
     /**
      * The eventual listener that maintains {@link #result}.
@@ -177,16 +177,15 @@ private TreeTableFilter(@NotNull final TreeTableImpl tree, @NotNull final WhereF
     }
 
     private void doInitialFilter(@Nullable final OperationSnapshotControl snapshotControl, final boolean usePrev) {
-        try (final RowSet sourcePrevRows = usePrev ? source.getRowSet().copyPrev() : null) {
-            final RowSet sourceRows = usePrev ? sourcePrevRows : source.getRowSet();
+        final RowSet sourceRows = usePrev
+                ? source.getRowSet().prev()
+                : source.getRowSet();
+        matchedSourceRows = filterValues(usePrev, sourceRows, sourceRows);
+        parentIdToChildRows = new HashMap<>(matchedSourceRows.intSize("parentReferences"));
+        ancestorSourceRows = computeParents(usePrev, matchedSourceRows);
+        resultRows = matchedSourceRows.union(ancestorSourceRows).toTracking();
 
-            matchedSourceRows = filterValues(usePrev, sourceRows, sourceRows);
-            parentIdToChildRows = new HashMap<>(matchedSourceRows.intSize("parentReferences"));
-            ancestorSourceRows = computeParents(usePrev, matchedSourceRows);
-            resultRows = matchedSourceRows.union(ancestorSourceRows).toTracking();
-
-            validateState(usePrev, sourceRows);
-        }
+        validateState(usePrev, sourceRows);
 
         result = source.getSubTable(resultRows);
         if (snapshotControl != null) {
@@ -262,6 +261,7 @@ private void validateState(final boolean usePrev, @NotNull final RowSet sourceRo
                             });
                         }
                     }
+                    // noinspection resource
                     childRowsToProcess = newParentKeys.build();
                 }
             }
diff --git a/engine/table/src/main/java/io/deephaven/engine/table/impl/hierarchical/TreeTableImpl.java b/engine/table/src/main/java/io/deephaven/engine/table/impl/hierarchical/TreeTableImpl.java
index 15e38cfbcbc..7ed21dec686 100644
--- a/engine/table/src/main/java/io/deephaven/engine/table/impl/hierarchical/TreeTableImpl.java
+++ b/engine/table/src/main/java/io/deephaven/engine/table/impl/hierarchical/TreeTableImpl.java
@@ -414,7 +414,7 @@ boolean nodeIdExpandable(@NotNull final SnapshotStateImpl snapshotState, final l
 
     @Override
     NotificationStepSource[] getSourceDependencies() {
-        // NB: The reverse lookup may be derived from an unfiltered parent of our source, hence we need to treat it as a
+        // The reverse lookup may be derived from an unfiltered parent of our source, hence we need to treat it as a
         // separate dependency if we're filtered.
         return filtered
                 ? new NotificationStepSource[] {source, sourceRowLookup}
@@ -423,9 +423,12 @@ NotificationStepSource[] getSourceDependencies() {
 
     @Override
     void maybeWaitForStructuralSatisfaction() {
-        // NB: Our root is just a node in the tree (which is a partitioned table of constituent nodes), so waiting for
+        // Our root is just a node in the tree (which is a partitioned table of constituent nodes), so waiting for
         // satisfaction of the root would be insufficient (and unnecessary if we're waiting for the tree).
         maybeWaitForSatisfaction(tree);
+        if (!filtered) {
+            // The row lookup aggregation must also be satisfied if we aren't using it as a source dependency.
+            maybeWaitForSatisfaction(sourceRowLookup);
+        }
     }
-
 }
diff --git a/engine/table/src/main/java/io/deephaven/engine/table/impl/join/dupcompact/ObjectDupCompactKernel.java b/engine/table/src/main/java/io/deephaven/engine/table/impl/join/dupcompact/ObjectDupCompactKernel.java
index cb063342cf0..f8835352a24 100644
--- a/engine/table/src/main/java/io/deephaven/engine/table/impl/join/dupcompact/ObjectDupCompactKernel.java
+++ b/engine/table/src/main/java/io/deephaven/engine/table/impl/join/dupcompact/ObjectDupCompactKernel.java
@@ -8,6 +8,7 @@
 package io.deephaven.engine.table.impl.join.dupcompact;
 
 import java.util.Objects;
+import io.deephaven.util.compare.ObjectComparisons;
 
 import io.deephaven.chunk.*;
 import io.deephaven.chunk.attributes.Any;
@@ -109,19 +110,8 @@ private static int compactDuplicatesPreferFirst(
     // region comparison functions
     // ascending comparison
     private static int doComparison(Object lhs, Object rhs) {
-       if (lhs == rhs) {
-            return 0;
-        }
-        if (lhs == null) {
-            return -1;
-        }
-        if (rhs == null) {
-            return 1;
-        }
-        //noinspection unchecked,rawtypes
-        return ((Comparable)lhs).compareTo(rhs);
+        return ObjectComparisons.compare(lhs, rhs);
     }
-
     // endregion comparison functions
 
     private static boolean leq(Object lhs, Object rhs) {
diff --git a/engine/table/src/main/java/io/deephaven/engine/table/impl/join/dupcompact/ObjectReverseDupCompactKernel.java b/engine/table/src/main/java/io/deephaven/engine/table/impl/join/dupcompact/ObjectReverseDupCompactKernel.java
index b5f8868278f..b1f487cd052 100644
--- a/engine/table/src/main/java/io/deephaven/engine/table/impl/join/dupcompact/ObjectReverseDupCompactKernel.java
+++ b/engine/table/src/main/java/io/deephaven/engine/table/impl/join/dupcompact/ObjectReverseDupCompactKernel.java
@@ -9,8 +9,10 @@
 package io.deephaven.engine.table.impl.join.dupcompact;
 
 import java.util.Objects;
+import io.deephaven.util.compare.ObjectComparisons;
 
 import java.util.Objects;
+import io.deephaven.util.compare.ObjectComparisons;
 
 import io.deephaven.chunk.*;
 import io.deephaven.chunk.attributes.Any;
@@ -112,17 +114,7 @@ private static int compactDuplicatesPreferFirst(
     // region comparison functions
     // descending comparison
     private static int doComparison(Object lhs, Object rhs) {
-        if (lhs == rhs) {
-            return 0;
-        }
-        if (lhs == null) {
-            return 1;
-        }
-        if (rhs == null) {
-            return -1;
-        }
-        //noinspection unchecked,rawtypes
-        return ((Comparable)rhs).compareTo(lhs);
+        return ObjectComparisons.compare(rhs, lhs);
     }
     // endregion comparison functions
 
diff --git a/engine/table/src/main/java/io/deephaven/engine/table/impl/join/dupexpand/ObjectDupExpandKernel.java b/engine/table/src/main/java/io/deephaven/engine/table/impl/join/dupexpand/ObjectDupExpandKernel.java
index ca6889b93cb..d6c93dade44 100644
--- a/engine/table/src/main/java/io/deephaven/engine/table/impl/join/dupexpand/ObjectDupExpandKernel.java
+++ b/engine/table/src/main/java/io/deephaven/engine/table/impl/join/dupexpand/ObjectDupExpandKernel.java
@@ -8,6 +8,7 @@
 package io.deephaven.engine.table.impl.join.dupexpand;
 
 import java.util.Objects;
+import io.deephaven.util.compare.ObjectComparisons;
 
 import io.deephaven.chunk.*;
 import io.deephaven.chunk.attributes.Any;
diff --git a/engine/table/src/main/java/io/deephaven/engine/table/impl/join/stamp/ObjectNoExactReverseStampKernel.java b/engine/table/src/main/java/io/deephaven/engine/table/impl/join/stamp/ObjectNoExactReverseStampKernel.java
index fd24f6ad0a8..62f9360610f 100644
--- a/engine/table/src/main/java/io/deephaven/engine/table/impl/join/stamp/ObjectNoExactReverseStampKernel.java
+++ b/engine/table/src/main/java/io/deephaven/engine/table/impl/join/stamp/ObjectNoExactReverseStampKernel.java
@@ -9,8 +9,10 @@
 package io.deephaven.engine.table.impl.join.stamp;
 
 import java.util.Objects;
+import io.deephaven.util.compare.ObjectComparisons;
 
 import java.util.Objects;
+import io.deephaven.util.compare.ObjectComparisons;
 
 import io.deephaven.chunk.*;
 import io.deephaven.engine.rowset.chunkattributes.RowKeys;
@@ -84,17 +86,7 @@ static private void computeRedirections(ObjectChunk<Object, Values> leftStamps,
     // region comparison functions
     // descending comparison
     private static int doComparison(Object lhs, Object rhs) {
-        if (lhs == rhs) {
-            return 0;
-        }
-        if (lhs == null) {
-            return 1;
-        }
-        if (rhs == null) {
-            return -1;
-        }
-        //noinspection unchecked,rawtypes
-        return ((Comparable)rhs).compareTo(lhs);
+        return ObjectComparisons.compare(rhs, lhs);
     }
     // endregion comparison functions
 
diff --git a/engine/table/src/main/java/io/deephaven/engine/table/impl/join/stamp/ObjectNoExactStampKernel.java b/engine/table/src/main/java/io/deephaven/engine/table/impl/join/stamp/ObjectNoExactStampKernel.java
index 1ffc2ddf90b..33c9ba8e2c2 100644
--- a/engine/table/src/main/java/io/deephaven/engine/table/impl/join/stamp/ObjectNoExactStampKernel.java
+++ b/engine/table/src/main/java/io/deephaven/engine/table/impl/join/stamp/ObjectNoExactStampKernel.java
@@ -8,6 +8,7 @@
 package io.deephaven.engine.table.impl.join.stamp;
 
 import java.util.Objects;
+import io.deephaven.util.compare.ObjectComparisons;
 
 import io.deephaven.chunk.*;
 import io.deephaven.engine.rowset.chunkattributes.RowKeys;
@@ -81,19 +82,8 @@ static private void computeRedirections(ObjectChunk<Object, Values> leftStamps,
     // region comparison functions
     // ascending comparison
     private static int doComparison(Object lhs, Object rhs) {
-       if (lhs == rhs) {
-            return 0;
-        }
-        if (lhs == null) {
-            return -1;
-        }
-        if (rhs == null) {
-            return 1;
-        }
-        //noinspection unchecked,rawtypes
-        return ((Comparable)lhs).compareTo(rhs);
+        return ObjectComparisons.compare(lhs, rhs);
     }
-
     // endregion comparison functions
 
     private static boolean lt(Object lhs, Object rhs) {
diff --git a/engine/table/src/main/java/io/deephaven/engine/table/impl/join/stamp/ObjectReverseStampKernel.java b/engine/table/src/main/java/io/deephaven/engine/table/impl/join/stamp/ObjectReverseStampKernel.java
index 2879a4ff776..93cabd41c44 100644
--- a/engine/table/src/main/java/io/deephaven/engine/table/impl/join/stamp/ObjectReverseStampKernel.java
+++ b/engine/table/src/main/java/io/deephaven/engine/table/impl/join/stamp/ObjectReverseStampKernel.java
@@ -9,8 +9,10 @@
 package io.deephaven.engine.table.impl.join.stamp;
 
 import java.util.Objects;
+import io.deephaven.util.compare.ObjectComparisons;
 
 import java.util.Objects;
+import io.deephaven.util.compare.ObjectComparisons;
 
 import io.deephaven.chunk.*;
 import io.deephaven.engine.rowset.chunkattributes.RowKeys;
@@ -87,17 +89,7 @@ static private void computeRedirections(ObjectChunk<Object, Values> leftStamps,
     // region comparison functions
     // descending comparison
     private static int doComparison(Object lhs, Object rhs) {
-        if (lhs == rhs) {
-            return 0;
-        }
-        if (lhs == null) {
-            return 1;
-        }
-        if (rhs == null) {
-            return -1;
-        }
-        //noinspection unchecked,rawtypes
-        return ((Comparable)rhs).compareTo(lhs);
+        return ObjectComparisons.compare(rhs, lhs);
     }
     // endregion comparison functions
 
diff --git a/engine/table/src/main/java/io/deephaven/engine/table/impl/join/stamp/ObjectStampKernel.java b/engine/table/src/main/java/io/deephaven/engine/table/impl/join/stamp/ObjectStampKernel.java
index affae91eaee..e055ecdd356 100644
--- a/engine/table/src/main/java/io/deephaven/engine/table/impl/join/stamp/ObjectStampKernel.java
+++ b/engine/table/src/main/java/io/deephaven/engine/table/impl/join/stamp/ObjectStampKernel.java
@@ -8,6 +8,7 @@
 package io.deephaven.engine.table.impl.join.stamp;
 
 import java.util.Objects;
+import io.deephaven.util.compare.ObjectComparisons;
 
 import io.deephaven.chunk.*;
 import io.deephaven.engine.rowset.chunkattributes.RowKeys;
@@ -84,19 +85,8 @@ static private void computeRedirections(ObjectChunk<Object, Values> leftStamps,
     // region comparison functions
     // ascending comparison
     private static int doComparison(Object lhs, Object rhs) {
-       if (lhs == rhs) {
-            return 0;
-        }
-        if (lhs == null) {
-            return -1;
-        }
-        if (rhs == null) {
-            return 1;
-        }
-        //noinspection unchecked,rawtypes
-        return ((Comparable)lhs).compareTo(rhs);
+        return ObjectComparisons.compare(lhs, rhs);
     }
-
     // endregion comparison functions
 
     private static boolean lt(Object lhs, Object rhs) {
diff --git a/engine/table/src/main/java/io/deephaven/engine/table/impl/lang/QueryLanguageParser.java b/engine/table/src/main/java/io/deephaven/engine/table/impl/lang/QueryLanguageParser.java
index 36b10f914fa..d457a4ab0b3 100644
--- a/engine/table/src/main/java/io/deephaven/engine/table/impl/lang/QueryLanguageParser.java
+++ b/engine/table/src/main/java/io/deephaven/engine/table/impl/lang/QueryLanguageParser.java
@@ -182,6 +182,8 @@ public final class QueryLanguageParser extends GenericVisitorAdapter<Class<?>, Q
      * Create a QueryLanguageParser and parse the given {@code expression}. After construction, the
      * {@link QueryLanguageParser.Result result} of parsing the {@code expression} is available with the
      * {@link #getResult()}} method.
+     * <p>
+     * Note that the provided Collections and Maps must not be mutated concurrently with or after construction.
      *
      * @param expression The query language expression to parse
      * @param packageImports Wildcard package imports
@@ -190,9 +192,10 @@ public final class QueryLanguageParser extends GenericVisitorAdapter<Class<?>, Q
      *        imported.
      * @param variables A map of the names of scope variables to their types
      * @param variableTypeArguments A map of the names of scope variables to their type arguments
-     * @param unboxArguments If true it will unbox the query scope arguments
-     * @param queryScopeVariables A mutable map of the names of query scope variables to their values
+     * @param queryScopeVariables A map of the names of query scope variables to their values
      * @param columnVariables A set of column variable names
+     * @param unboxArguments If true it will unbox the query scope arguments
+     * @param timeConversionResult The result of converting time literals in the expression
      * @throws QueryLanguageParseException If any exception or error is encountered
      */
     public QueryLanguageParser(
@@ -225,6 +228,8 @@ public QueryLanguageParser(
      * Create a QueryLanguageParser and parse the given {@code expression}. After construction, the
      * {@link QueryLanguageParser.Result result} of parsing the {@code expression} is available with the
      * {@link #getResult()}} method.
+     * <p>
+     * Note that the provided Collections and Maps must not be mutated concurrently with or after construction.
      *
      * @param expression The query language expression to parse
      * @param packageImports Wildcard package imports
@@ -247,6 +252,28 @@ public QueryLanguageParser(
                 variableTypeArguments, null, null, true, null);
     }
 
+    /**
+     * Create a QueryLanguageParser and parse the given {@code expression}. After construction, the
+     * {@link QueryLanguageParser.Result result} of parsing the {@code expression} is available with the
+     * {@link #getResult()}} method.
+     * <p>
+     * Note that the provided Collections and Maps must not be mutated concurrently with or after construction.
+     *
+     * @param expression The query language expression to parse
+     * @param packageImports Wildcard package imports
+     * @param classImports Individual class imports
+     * @param staticImports Wildcard static imports. All static variables and methods for the given classes are
+     *        imported.
+     * @param variables A map of the names of scope variables to their types
+     * @param variableTypeArguments A map of the names of scope variables to their type arguments
+     * @param queryScopeVariables A map of the names of query scope variables to their values
+     * @param columnVariables A set of column variable names
+     * @param unboxArguments If true it will unbox the query scope arguments
+     * @param verifyIdempotence If true, the parser will verify that the result expression will not mutate when parsed
+     * @param pyCallableWrapperImplName The name of the PyCallableWrapper implementation to use
+     * @param timeConversionResult The result of converting time literals in the expression
+     * @throws QueryLanguageParseException If any exception or error is encountered
+     */
     @VisibleForTesting
     QueryLanguageParser(
             String expression,
@@ -264,9 +291,8 @@ public QueryLanguageParser(
         this.packageImports = packageImports == null ? Collections.emptySet() : Set.copyOf(packageImports);
         this.classImports = classImports == null ? Collections.emptySet() : Set.copyOf(classImports);
         this.staticImports = staticImports == null ? Collections.emptySet() : Set.copyOf(staticImports);
-        this.variables = variables == null ? Collections.emptyMap() : Map.copyOf(variables);
-        this.variableTypeArguments =
-                variableTypeArguments == null ? Collections.emptyMap() : Map.copyOf(variableTypeArguments);
+        this.variables = variables == null ? Collections.emptyMap() : variables;
+        this.variableTypeArguments = variableTypeArguments == null ? Collections.emptyMap() : variableTypeArguments;
         this.queryScopeVariables = queryScopeVariables == null ? new HashMap<>() : queryScopeVariables;
         this.columnVariables = columnVariables == null ? Collections.emptySet() : columnVariables;
         this.unboxArguments = unboxArguments;
@@ -1670,7 +1696,6 @@ public Class<?> visit(UnaryExpr n, VisitArgs printer) {
             if (isNonequalOpOverload && printer.hasStringBuilder()) {
                 // sanity checks -- the inner expression *must* be a BinaryExpr (for ==), and it must be replaced in
                 // this UnaryExpr with a MethodCallExpr (for "eq()" or possibly "isNull()").
-                Assert.instanceOf(n.getExpression(), "n.getExpression()", MethodCallExpr.class);
                 final MethodCallExpr methodCall = (MethodCallExpr) n.getExpression();
                 final String methodName = methodCall.getNameAsString();
                 if (!"eq".equals(methodName) && !"isNull".equals(methodName)) {
diff --git a/engine/table/src/main/java/io/deephaven/engine/table/impl/locations/ImmutableTableLocationKey.java b/engine/table/src/main/java/io/deephaven/engine/table/impl/locations/ImmutableTableLocationKey.java
index 407d6df9917..96799cf5a42 100644
--- a/engine/table/src/main/java/io/deephaven/engine/table/impl/locations/ImmutableTableLocationKey.java
+++ b/engine/table/src/main/java/io/deephaven/engine/table/impl/locations/ImmutableTableLocationKey.java
@@ -12,9 +12,6 @@
  */
 @Immutable
 public interface ImmutableTableLocationKey extends TableLocationKey {
-
-    ImmutableTableLocationKey[] ZERO_LENGTH_IMMUTABLE_TABLE_LOCATION_KEY_ARRAY = new ImmutableTableLocationKey[0];
-
     @FinalDefault
     default ImmutableTableLocationKey makeImmutable() {
         return this;
diff --git a/engine/table/src/main/java/io/deephaven/engine/table/impl/locations/TableDataService.java b/engine/table/src/main/java/io/deephaven/engine/table/impl/locations/TableDataService.java
index ccd392534be..8d3f9638d6d 100644
--- a/engine/table/src/main/java/io/deephaven/engine/table/impl/locations/TableDataService.java
+++ b/engine/table/src/main/java/io/deephaven/engine/table/impl/locations/TableDataService.java
@@ -20,6 +20,22 @@ public interface TableDataService {
     @NotNull
     TableLocationProvider getTableLocationProvider(@NotNull TableKey tableKey);
 
+    /**
+     * Request the single raw {@link TableLocationProvider} from this service that has the {@link TableLocation} for
+     * {@code tableKey} and {@code tableLocationKey}. A raw {@link TableLocationProvider} does not compose multiple
+     * {@link TableLocationProvider TableLocationProviders} or delegate to other implementations.
+     *
+     * @param tableKey The {@link TableKey} to lookup
+     * @param tableLocationKey The {@link TableLocationKey} to lookup
+     * @return The raw {@link TableLocationProvider} that has the {@link TableLocation} for {@code tableKey} and
+     *         {@code tableLocationKey}, or {@code null} if there is none
+     * @throws TableDataException If more than one {@link TableLocationProvider} has the {@link TableLocation}
+     *
+     */
+    @Nullable
+    TableLocationProvider getRawTableLocationProvider(@NotNull final TableKey tableKey,
+            @NotNull final TableLocationKey tableLocationKey);
+
     /**
      * Forget all state for subsequent requests for all tables.
      */
diff --git a/engine/table/src/main/java/io/deephaven/engine/table/impl/locations/TableLocation.java b/engine/table/src/main/java/io/deephaven/engine/table/impl/locations/TableLocation.java
index 9d3eb5b55e7..63ab9e03d1b 100644
--- a/engine/table/src/main/java/io/deephaven/engine/table/impl/locations/TableLocation.java
+++ b/engine/table/src/main/java/io/deephaven/engine/table/impl/locations/TableLocation.java
@@ -6,6 +6,7 @@
 import io.deephaven.api.SortColumn;
 import io.deephaven.base.log.LogOutput;
 import io.deephaven.base.log.LogOutputAppendable;
+import io.deephaven.engine.liveness.LivenessReferent;
 import io.deephaven.engine.table.BasicDataIndex;
 import io.deephaven.engine.table.Table;
 import io.deephaven.io.log.impl.LogOutputStringImpl;
@@ -21,7 +22,7 @@
  * location allows access to columns, size, and possibly other metadata for a single partition that may be included in a
  * source table.
  */
-public interface TableLocation extends NamedImplementation, LogOutputAppendable, TableLocationState {
+public interface TableLocation extends NamedImplementation, LogOutputAppendable, TableLocationState, LivenessReferent {
 
     /**
      * Listener interface for anything that wants to know about changes to a location.
@@ -64,8 +65,8 @@ interface Listener extends BasicTableDataListener {
      * or 1 handleException callbacks during invocation and continuing after completion, on a thread determined by the
      * implementation. Don't hold a lock that prevents notification delivery while subscribing!
      * <p>
-     * This method only guarantees eventually consistent state. To force a state update, use run() after subscription
-     * completes.
+     * This method only guarantees eventually consistent state. To force a state update, use refresh() after
+     * subscription completes.
      *
      * @param listener A listener
      */
diff --git a/engine/table/src/main/java/io/deephaven/engine/table/impl/locations/TableLocationKey.java b/engine/table/src/main/java/io/deephaven/engine/table/impl/locations/TableLocationKey.java
index 8b67fd1b6bd..008b8957819 100644
--- a/engine/table/src/main/java/io/deephaven/engine/table/impl/locations/TableLocationKey.java
+++ b/engine/table/src/main/java/io/deephaven/engine/table/impl/locations/TableLocationKey.java
@@ -56,4 +56,22 @@ <PARTITION_VALUE_TYPE extends Comparable<PARTITION_VALUE_TYPE>> PARTITION_VALUE_
      * @return An immutable version of this key
      */
     ImmutableTableLocationKey makeImmutable();
+
+    /**
+     * Release any cached data associated with this key. Should only be called when this key is no longer associated
+     * with any live TableLocation.
+     */
+    default void clear() {}
+
+    /**
+     * By default, compare fully qualified class names of the implementing classes. This method is a fallback where the
+     * implementing classes are not directly comparable, and should help establish a consistent ordering between
+     * distinct implementations.
+     * <p>
+     * {@inheritDoc}
+     */
+    @Override
+    default int compareTo(@NotNull final TableLocationKey other) {
+        return this.getClass().getName().compareTo(other.getClass().getName());
+    }
 }
diff --git a/engine/table/src/main/java/io/deephaven/engine/table/impl/locations/TableLocationProvider.java b/engine/table/src/main/java/io/deephaven/engine/table/impl/locations/TableLocationProvider.java
index 84969d6249f..55751c65901 100644
--- a/engine/table/src/main/java/io/deephaven/engine/table/impl/locations/TableLocationProvider.java
+++ b/engine/table/src/main/java/io/deephaven/engine/table/impl/locations/TableLocationProvider.java
@@ -3,17 +3,23 @@
 //
 package io.deephaven.engine.table.impl.locations;
 
+import io.deephaven.engine.liveness.LiveSupplier;
+import io.deephaven.engine.table.impl.TableUpdateMode;
+import io.deephaven.util.annotations.TestUseOnly;
 import io.deephaven.util.type.NamedImplementation;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
+import java.util.ArrayList;
 import java.util.Collection;
+import java.util.List;
+import java.util.function.Consumer;
+import java.util.function.Predicate;
 
 /**
  * Discovery utility for {@link TableLocation}s for a given table.
  */
 public interface TableLocationProvider extends NamedImplementation {
-
     /**
      * Get the {@link TableKey} associated with this provider.
      *
@@ -21,26 +27,60 @@ public interface TableLocationProvider extends NamedImplementation {
      */
     ImmutableTableKey getKey();
 
+    /**
+     * Get the {@link TableUpdateMode update guarantees} of this provider describing how this provider will add or
+     * remove table locations.
+     */
+    @NotNull
+    TableUpdateMode getUpdateMode();
+
+    /**
+     * Get the location {@link TableUpdateMode update guarantees} of this provider describing how individual locations
+     * will add or remove rows.
+     */
+    @NotNull
+    TableUpdateMode getLocationUpdateMode();
+
     /**
      * ShiftObliviousListener interface for anything that wants to know about new table location keys.
      */
     interface Listener extends BasicTableDataListener {
+        /**
+         * Notify the listener of a {@link LiveSupplier<ImmutableTableLocationKey>} encountered while initiating or
+         * maintaining the location subscription. This should occur at most once per location, but the order of delivery
+         * is <i>not</i> guaranteed. This addition is not part of any transaction, and is equivalent to
+         * {@code handleTableLocationKeyAdded(tableLocationKey, null);} by default.
+         *
+         * @param tableLocationKey The new table location key.
+         */
+        void handleTableLocationKeyAdded(@NotNull LiveSupplier<ImmutableTableLocationKey> tableLocationKey);
 
         /**
-         * Notify the listener of a {@link TableLocationKey} encountered while initiating or maintaining the location
-         * subscription. This should occur at most once per location, but the order of delivery is <i>not</i>
-         * guaranteed.
+         * Notify the listener of a {@link LiveSupplier<ImmutableTableLocationKey>} that has been removed. This removal
+         * is not part of any transaction, and is equivalent to
+         * {@code handleTableLocationKeyRemoved(tableLocationKey, null);} by default.
          *
-         * @param tableLocationKey The new table location key
+         * @param tableLocationKey The table location key that was removed.
          */
-        void handleTableLocationKey(@NotNull ImmutableTableLocationKey tableLocationKey);
+        @SuppressWarnings("unused")
+        void handleTableLocationKeyRemoved(@NotNull LiveSupplier<ImmutableTableLocationKey> tableLocationKey);
 
         /**
-         * Notify the listener of a {@link TableLocationKey} that has been removed.
+         * <p>
+         * Notify the listener of collections of {@link TableLocationKey TableLocationKeys} added or removed while
+         * initiating or maintaining the location subscription. Addition or removal should occur at most once per
+         * location, but the order of delivery is <i>not</i> guaranteed.
+         * </p>
          *
-         * @param tableLocationKey The table location key that was removed
+         * @param addedKeys Collection of table location keys that were added.
+         * @param removedKeys Collection of table location keys that were removed.
          */
-        void handleTableLocationKeyRemoved(@NotNull ImmutableTableLocationKey tableLocationKey);
+        default void handleTableLocationKeysUpdate(
+                @NotNull Collection<LiveSupplier<ImmutableTableLocationKey>> addedKeys,
+                @NotNull Collection<LiveSupplier<ImmutableTableLocationKey>> removedKeys) {
+            removedKeys.forEach(this::handleTableLocationKeyRemoved);
+            addedKeys.forEach(this::handleTableLocationKeyAdded);
+        }
     }
 
     /**
@@ -62,8 +102,8 @@ interface Listener extends BasicTableDataListener {
      * <b>must not</b> hold any lock that prevents notification delivery while subscribing. Callers <b>must</b> guard
      * against duplicate notifications.
      * <p>
-     * This method only guarantees eventually consistent state. To force a state update, use run() after subscription
-     * completes.
+     * This method only guarantees eventually consistent state. To force a state update, use refresh() after
+     * subscription completes.
      *
      * @param listener A listener.
      */
@@ -86,30 +126,59 @@ interface Listener extends BasicTableDataListener {
      * that {@link #refresh()} or {@link #subscribe(Listener)} has been called prior to calls to the various table
      * location fetch methods.
      *
-     * @return this, to allow method chaining
+     * @return this, to allow method chaining.
      */
     TableLocationProvider ensureInitialized();
 
     /**
      * Get this provider's currently known location keys. The locations specified by the keys returned may have null
      * size - that is, they may not "exist" for application purposes. {@link #getTableLocation(TableLocationKey)} is
-     * guaranteed to succeed for all results.
+     * guaranteed to succeed for all results as long as the associated {@link LiveSupplier} is retained by the caller.
+     */
+    @TestUseOnly
+    default Collection<ImmutableTableLocationKey> getTableLocationKeys() {
+        final List<ImmutableTableLocationKey> keys = new ArrayList<>();
+        getTableLocationKeys(trackedKey -> keys.add(trackedKey.get()));
+        return keys;
+    }
+
+    /**
+     * Get this provider's currently known location keys. The locations specified by the keys returned may have null
+     * size - that is, they may not "exist" for application purposes. {@link #getTableLocation(TableLocationKey)} is
+     * guaranteed to succeed for all results as long as the associated {@link LiveSupplier} is retained by the caller.
      *
-     * @return A collection of keys for locations available from this provider
+     * @param consumer A consumer to receive the location keys
      */
-    @NotNull
-    Collection<ImmutableTableLocationKey> getTableLocationKeys();
+    default void getTableLocationKeys(Consumer<LiveSupplier<ImmutableTableLocationKey>> consumer) {
+        getTableLocationKeys(consumer, key -> true);
+    }
+
+    /**
+     * Get this provider's currently known location keys. The locations specified by the keys returned may have null
+     * size - that is, they may not "exist" for application purposes. {@link #getTableLocation(TableLocationKey)} is
+     * guaranteed to succeed for all results as long as the associated {@link LiveSupplier} is retained by the caller.
+     *
+     * @param consumer A consumer to receive the location keys
+     * @param filter A filter to apply to the location keys before the consumer is called
+     */
+    void getTableLocationKeys(
+            Consumer<LiveSupplier<ImmutableTableLocationKey>> consumer,
+            Predicate<ImmutableTableLocationKey> filter);
 
     /**
      * Check if this provider knows the supplied location key.
      *
-     * @param tableLocationKey The key to test for
-     * @return Whether the key is known to this provider
+     * @param tableLocationKey The key to test.
+     * @return Whether the key is known to this provider.
      */
-    boolean hasTableLocationKey(@NotNull final TableLocationKey tableLocationKey);
+    boolean hasTableLocationKey(@NotNull TableLocationKey tableLocationKey);
 
     /**
-     * @param tableLocationKey A {@link TableLocationKey} specifying the location to get
+     * Get the {@link TableLocation} associated with the given key. Callers should ensure that they retain the
+     * {@link LiveSupplier} returned by {@link #getTableLocationKeys(Consumer, Predicate)} for the key they are
+     * interested in, as the location may be removed if the supplier is no longer live.
+     *
+     * @param tableLocationKey A {@link TableLocationKey} specifying the location to get.
      * @return The {@link TableLocation} matching the given key
      */
     @NotNull
@@ -122,8 +191,12 @@ default TableLocation getTableLocation(@NotNull TableLocationKey tableLocationKe
     }
 
     /**
-     * @param tableLocationKey A {@link TableLocationKey} specifying the location to get
-     * @return The {@link TableLocation} matching the given key if present, else null
+     * Get the {@link TableLocation} associated with the given key if it exists. Callers should ensure that they retain
+     * the {@link LiveSupplier} returned by {@link #getTableLocationKeys(Consumer, Predicate)} for the key they are
+     * interested in, as the location may be removed if the supplier is no longer live.
+     *
+     * @param tableLocationKey A {@link TableLocationKey} specifying the location to get.
+     * @return The {@link TableLocation} matching the given key if present, else null.
      */
     @Nullable
     TableLocation getTableLocationIfPresent(@NotNull TableLocationKey tableLocationKey);
diff --git a/engine/table/src/main/java/io/deephaven/engine/table/impl/locations/impl/AbstractTableDataService.java b/engine/table/src/main/java/io/deephaven/engine/table/impl/locations/impl/AbstractTableDataService.java
index 3be464123c4..a7d7ed2dd39 100644
--- a/engine/table/src/main/java/io/deephaven/engine/table/impl/locations/impl/AbstractTableDataService.java
+++ b/engine/table/src/main/java/io/deephaven/engine/table/impl/locations/impl/AbstractTableDataService.java
@@ -5,6 +5,7 @@
 
 import io.deephaven.engine.table.impl.locations.TableDataService;
 import io.deephaven.engine.table.impl.locations.TableKey;
+import io.deephaven.engine.table.impl.locations.TableLocationKey;
 import io.deephaven.engine.table.impl.locations.TableLocationProvider;
 import io.deephaven.hash.KeyedObjectHashMap;
 import io.deephaven.hash.KeyedObjectKey;
@@ -41,6 +42,18 @@ public final TableLocationProvider getTableLocationProvider(@NotNull final Table
         return tableLocationProviders.putIfAbsent(tableKey, this::makeTableLocationProvider);
     }
 
+    @Override
+    @Nullable
+    public TableLocationProvider getRawTableLocationProvider(@NotNull TableKey tableKey,
+            @NotNull TableLocationKey tableLocationKey) {
+        final TableLocationProvider tableLocationProvider = tableLocationProviders.get(tableKey);
+        if (tableLocationProvider == null || !tableLocationProvider.hasTableLocationKey(tableLocationKey)) {
+            return null;
+        }
+
+        return tableLocationProvider;
+    }
+
     @Override
     public void reset() {
         tableLocationProviders.clear();
diff --git a/engine/table/src/main/java/io/deephaven/engine/table/impl/locations/impl/AbstractTableLocation.java b/engine/table/src/main/java/io/deephaven/engine/table/impl/locations/impl/AbstractTableLocation.java
index b58d7b7ebd4..e1c0fed476b 100644
--- a/engine/table/src/main/java/io/deephaven/engine/table/impl/locations/impl/AbstractTableLocation.java
+++ b/engine/table/src/main/java/io/deephaven/engine/table/impl/locations/impl/AbstractTableLocation.java
@@ -4,7 +4,7 @@
 package io.deephaven.engine.table.impl.locations.impl;
 
 import io.deephaven.base.verify.Require;
-import io.deephaven.datastructures.util.CollectionUtil;
+import io.deephaven.engine.liveness.*;
 import io.deephaven.engine.table.BasicDataIndex;
 import io.deephaven.engine.table.impl.util.FieldUtils;
 import io.deephaven.engine.util.string.StringUtils;
@@ -16,6 +16,7 @@
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
+import javax.annotation.OverridingMethodsMustInvokeSuper;
 import java.lang.ref.SoftReference;
 import java.util.ArrayList;
 import java.util.Collections;
@@ -27,7 +28,7 @@
  */
 public abstract class AbstractTableLocation
         extends SubscriptionAggregator<TableLocation.Listener>
-        implements TableLocation {
+        implements TableLocation, DelegatingLivenessReferent {
 
     private final ImmutableTableKey tableKey;
     private final ImmutableTableLocationKey tableLocationKey;
@@ -36,6 +37,8 @@ public abstract class AbstractTableLocation
     private final KeyedObjectHashMap<CharSequence, ColumnLocation> columnLocations =
             new KeyedObjectHashMap<>(StringUtils.charSequenceKey());
 
+    private final ReferenceCountedLivenessReferent livenessReferent;
+
     @SuppressWarnings("rawtypes")
     private static final AtomicReferenceFieldUpdater<AbstractTableLocation, KeyedObjectHashMap> CACHED_DATA_INDEXES_UPDATER =
             AtomicReferenceFieldUpdater.newUpdater(
@@ -59,6 +62,15 @@ protected AbstractTableLocation(@NotNull final TableKey tableKey,
         super(supportsSubscriptions);
         this.tableKey = Require.neqNull(tableKey, "tableKey").makeImmutable();
         this.tableLocationKey = Require.neqNull(tableLocationKey, "tableLocationKey").makeImmutable();
+
+        livenessReferent = new ReferenceCountedLivenessReferent() {
+            @OverridingMethodsMustInvokeSuper
+            @Override
+            protected void destroy() {
+                super.destroy();
+                AbstractTableLocation.this.destroy();
+            }
+        };
     }
 
     @Override
@@ -66,6 +78,10 @@ public final String toString() {
         return toStringHelper();
     }
 
+    @Override
+    public LivenessReferent asLivenessReferent() {
+        return livenessReferent;
+    }
 
     // ------------------------------------------------------------------------------------------------------------------
     // TableLocationState implementation
@@ -159,7 +175,7 @@ public final ColumnLocation getColumnLocation(@NotNull final CharSequence name)
      * Clear all column locations (usually because a truncated location was observed).
      */
     @SuppressWarnings("unused")
-    protected final void clearColumnLocations() {
+    public final void clearColumnLocations() {
         columnLocations.clear();
     }
 
@@ -197,7 +213,7 @@ private BasicDataIndex getDataIndex() {
                 if (localReference != null && (localIndex = localReference.get()) != null) {
                     return localIndex;
                 }
-                localIndex = loadDataIndex(columns.toArray(CollectionUtil.ZERO_LENGTH_STRING_ARRAY));
+                localIndex = loadDataIndex(columns.toArray(String[]::new));
                 indexReference = localIndex == null ? NO_INDEX_SENTINEL : new SoftReference<>(localIndex);
                 return localIndex;
             }
@@ -230,4 +246,19 @@ public final BasicDataIndex getDataIndex(@NotNull final String... columns) {
     @InternalUseOnly
     @Nullable
     public abstract BasicDataIndex loadDataIndex(@NotNull String... columns);
+
+    // ------------------------------------------------------------------------------------------------------------------
+    // Reference counting implementation
+    // ------------------------------------------------------------------------------------------------------------------
+
+    /**
+     * The reference count has reached zero, we can clear this location and release any resources.
+     */
+    protected void destroy() {
+        handleUpdate(null, System.currentTimeMillis());
+        clearColumnLocations();
+
+        // The key may be holding resources that can be cleared.
+        tableLocationKey.clear();
+    }
 }
diff --git a/engine/table/src/main/java/io/deephaven/engine/table/impl/locations/impl/AbstractTableLocationProvider.java b/engine/table/src/main/java/io/deephaven/engine/table/impl/locations/impl/AbstractTableLocationProvider.java
index b474775955a..071b5b7d980 100644
--- a/engine/table/src/main/java/io/deephaven/engine/table/impl/locations/impl/AbstractTableLocationProvider.java
+++ b/engine/table/src/main/java/io/deephaven/engine/table/impl/locations/impl/AbstractTableLocationProvider.java
@@ -3,20 +3,31 @@
 //
 package io.deephaven.engine.table.impl.locations.impl;
 
+import io.deephaven.base.Pair;
+import io.deephaven.base.verify.Assert;
+import io.deephaven.engine.liveness.LiveSupplier;
+import io.deephaven.engine.liveness.ReferenceCountedLivenessNode;
+import io.deephaven.engine.liveness.StandaloneLivenessManager;
 import io.deephaven.engine.table.Table;
+import io.deephaven.engine.table.impl.TableUpdateMode;
 import io.deephaven.engine.table.impl.locations.*;
 import io.deephaven.hash.KeyedObjectHashMap;
 import io.deephaven.hash.KeyedObjectKey;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
+import javax.annotation.OverridingMethodsMustInvokeSuper;
 import java.util.*;
+import java.util.function.Consumer;
+import java.util.function.Predicate;
+import java.util.function.Supplier;
+import java.util.stream.Collectors;
 
 /**
  * Partial {@link TableLocationProvider} implementation for standalone use or as part of a {@link TableDataService}.
  * <p>
  * Presents an interface similar to {@link TableLocationProvider.Listener} for subclasses to use when communicating with
- * the parent; see {@link #handleTableLocationKey(TableLocationKey)}.
+ * the parent; see {@link #handleTableLocationKeyAdded(TableLocationKey, Object)}.
  * <p>
  * Note that subclasses are responsible for determining when it's appropriate to call {@link #setInitialized()} and/or
  * override {@link #doInitialization()}.
@@ -25,23 +36,145 @@ public abstract class AbstractTableLocationProvider
         extends SubscriptionAggregator<TableLocationProvider.Listener>
         implements TableLocationProvider {
 
+    private static final Set<ImmutableTableLocationKey> EMPTY_TABLE_LOCATION_KEYS = Collections.emptySet();
+
+    /**
+     * Helper class to manage a transaction of added and removed location keys.
+     */
+    private static class Transaction {
+        Set<ImmutableTableLocationKey> locationsAdded = EMPTY_TABLE_LOCATION_KEYS;
+        Set<ImmutableTableLocationKey> locationsRemoved = EMPTY_TABLE_LOCATION_KEYS;
+
+        synchronized void addLocationKey(ImmutableTableLocationKey locationKey) {
+            if (locationsAdded == EMPTY_TABLE_LOCATION_KEYS) {
+                locationsAdded = new HashSet<>();
+            }
+            // When adding a location in a transaction, check for logical consistency.
+            // 1. If the location was already added in this transaction, we have a problem. A transaction should not
+            // add the same location twice.
+            // 2. If the location was already removed in this transaction, we have a `replace` operation which is not a
+            // logical error (although it may not be supported by all consumers).
+            if (!locationsAdded.add(locationKey)) {
+                throw new IllegalStateException("TableLocationKey " + locationKey
+                        + " was already added in this transaction.");
+            }
+        }
+
+        synchronized void removeLocationKey(ImmutableTableLocationKey locationKey) {
+            if (locationsRemoved == EMPTY_TABLE_LOCATION_KEYS) {
+                locationsRemoved = new HashSet<>();
+            }
+            // When removing a location in a transaction, check for logical consistency.
+            // 1. If the location was already removed in this transaction, we have a problem. A transaction should not
+            // remove the same location twice.
+            if (!locationsRemoved.add(locationKey)) {
+                throw new IllegalStateException("TableLocationKey " + locationKey
+                        + " was already removed and has not been replaced.");
+            }
+            // 2. If the location was already added in this transaction, we have a problem. A transaction should not
+            // add then remove the same location.
+            if (locationsAdded.contains(locationKey)) {
+                throw new IllegalStateException("TableLocationKey " + locationKey
+                        + " was removed after being added in the same transaction.");
+            }
+        }
+    }
+
+    private class TrackedKeySupplier extends ReferenceCountedLivenessNode
+            implements LiveSupplier<ImmutableTableLocationKey> {
+
+        private final ImmutableTableLocationKey key;
+
+        private volatile TableLocation tableLocation;
+        private boolean active;
+
+        TrackedKeySupplier(@NotNull final ImmutableTableLocationKey key) {
+            super(false);
+            this.key = key;
+            active = true;
+        }
+
+        @Override
+        public ImmutableTableLocationKey get() {
+            return key;
+        }
+
+        /**
+         * Create the {@link TableLocation} for this key, if it has not already been created, and return it.
+         */
+        private TableLocation getTableLocation() {
+            TableLocation localTableLocation;
+            if ((localTableLocation = tableLocation) == null) {
+                synchronized (this) {
+                    if ((localTableLocation = tableLocation) == null) {
+                        // Make a new location, have the tracked key manage it, then store the location in the tracked
+                        // key.
+                        tableLocation = localTableLocation = makeTableLocation(key);
+                        manage(localTableLocation);
+                    }
+                }
+            }
+            return localTableLocation;
+        }
+
+        /**
+         * Mark this supplier inactive. Indicates that this key is not included in the live set for new subscribers.
+         * Only called under the lock on {@link #tableLocationKeyMap}.
+         */
+        private void deactivate() {
+            active = false;
+        }
+
+        /**
+         * Test whether this key is active. Only called under the lock on {@link #tableLocationKeyMap}.
+         *
+         * @return Whether this key is active (included in the live set for new subscribers)
+         */
+        private boolean active() {
+            return active;
+        }
+
+        @OverridingMethodsMustInvokeSuper
+        @Override
+        protected void destroy() {
+            super.destroy();
+            Assert.assertion(!active, "!active");
+            tableLocation = null;
+            releaseLocationKey(this);
+        }
+    }
+
     private final ImmutableTableKey tableKey;
 
+    // Open transactions that are being accumulated
+    private final Map<Object, Transaction> transactions = Collections.synchronizedMap(new HashMap<>());
+
     /**
-     * Map from {@link TableLocationKey} to itself, or to a {@link TableLocation}. The values are {@link TableLocation}s
-     * if:
-     * <ol>
-     * <li>The location has been requested via {@link #getTableLocation(TableLocationKey)} or
-     * {@link #getTableLocationIfPresent(TableLocationKey)}</li>
-     * <li>The {@link TableLocationKey} <em>is</em> a {@link TableLocation}</li>
-     * </ol>
+     * Map from {@link TableLocationKey} to a {@link TrackedKeySupplier}.
+     * <p>
+     * These values will not be cleared until all references to the {@link TableLocation} have been released by its
+     * managers (i.e. {@link TableLocationSubscriptionBuffer subscriptions} and
+     * {@link io.deephaven.engine.table.impl.sources.regioned.RegionedColumnSourceManager column source managers}).
+     */
+    private final KeyedObjectHashMap<TableLocationKey, TrackedKeySupplier> tableLocationKeyMap =
+            new KeyedObjectHashMap<>(TableLocationKeyDefinition.INSTANCE);
+
+    /**
+     * TLPs are (currently) not LivenessArtifacts, hence they are not managed by the enclosing LivenessScope, but they
+     * still need to manage liveness referents to control their lifecycles. The {@link StandaloneLivenessManager
+     * manager} will maintain the references until GC'd or the referents are not needed by the TLP.
+     */
+    private final StandaloneLivenessManager livenessManager;
+
+    /**
+     * Records how the set of locations for this TLP can update
+     */
+    private final TableUpdateMode updateMode;
+
+    /**
+     * Records how the individual locations for this TLP can update (whether row can be added or removed)
      */
-    private final KeyedObjectHashMap<TableLocationKey, Object> tableLocations =
-            new KeyedObjectHashMap<>(LocationKeyDefinition.INSTANCE);
-    @SuppressWarnings("unchecked")
-    private final Collection<ImmutableTableLocationKey> unmodifiableTableLocationKeys =
-            (Collection<ImmutableTableLocationKey>) (Collection<? extends TableLocationKey>) Collections
-                    .unmodifiableCollection(tableLocations.keySet());
+    private final TableUpdateMode locationUpdateMode;
 
     private volatile boolean initialized;
 
@@ -53,20 +186,35 @@ public abstract class AbstractTableLocationProvider
      *
      * @param tableKey A key that will be used by this provider
      * @param supportsSubscriptions Whether this provider should support subscriptions
+     * @param updateMode What updates to the set of locations are allowed
+     * @param locationUpdateMode What updates to the location rows are allowed
      */
-    protected AbstractTableLocationProvider(@NotNull final TableKey tableKey, final boolean supportsSubscriptions) {
+    protected AbstractTableLocationProvider(
+            @NotNull final TableKey tableKey,
+            final boolean supportsSubscriptions,
+            final TableUpdateMode updateMode,
+            final TableUpdateMode locationUpdateMode) {
         super(supportsSubscriptions);
         this.tableKey = tableKey.makeImmutable();
         this.partitionKeys = null;
+        this.updateMode = updateMode;
+        this.locationUpdateMode = locationUpdateMode;
+
+        livenessManager = new StandaloneLivenessManager(false);
     }
 
     /**
      * Construct a standalone provider.
      *
      * @param supportsSubscriptions Whether this provider should support subscriptions
+     * @param updateMode What updates to the set of locations are allowed
+     * @param locationUpdateMode What updates to the location rows are allowed
      */
-    protected AbstractTableLocationProvider(final boolean supportsSubscriptions) {
-        this(StandaloneTableKey.getInstance(), supportsSubscriptions);
+    protected AbstractTableLocationProvider(
+            final boolean supportsSubscriptions,
+            final TableUpdateMode updateMode,
+            final TableUpdateMode locationUpdateMode) {
+        this(StandaloneTableKey.getInstance(), supportsSubscriptions, updateMode, locationUpdateMode);
     }
 
     @Override
@@ -84,7 +232,106 @@ public final ImmutableTableKey getKey() {
 
     @Override
     protected final void deliverInitialSnapshot(@NotNull final TableLocationProvider.Listener listener) {
-        unmodifiableTableLocationKeys.forEach(listener::handleTableLocationKey);
+        // Lock on the map and deliver a copy to the listener
+        synchronized (tableLocationKeyMap) {
+            final List<LiveSupplier<ImmutableTableLocationKey>> keySuppliers =
+                    tableLocationKeyMap.values().stream()
+                            .filter(TrackedKeySupplier::active)
+                            .collect(Collectors.toList());
+            listener.handleTableLocationKeysUpdate(keySuppliers, List.of());
+        }
+    }
+
+    /**
+     * Internal method to begin an atomic transaction of location adds and removes.
+     *
+     * @param token A token to identify the transaction
+     */
+    protected void beginTransaction(@NotNull final Object token) {
+        // Verify that we can start a new transaction with this token.
+        transactions.compute(token, (key, val) -> {
+            if (val != null) {
+                throw new IllegalStateException("A transaction with token " + token + " is already open.");
+            }
+            return new Transaction();
+        });
+    }
+
+    /**
+     * Internal method to end an atomic transaction of location adds and removes.
+     *
+     * @param token A token to identify the transaction
+     */
+    protected void endTransaction(@NotNull final Object token) {
+        // Verify that this transaction is open.
+        final Transaction transaction = transactions.remove(token);
+        if (transaction == null) {
+            throw new IllegalStateException("No transaction with token " + token + " is currently open.");
+        }
+
+        // Return early if there are no changes to process
+        if (transaction.locationsAdded.isEmpty() && transaction.locationsRemoved.isEmpty()) {
+            return;
+        }
+
+        // This may need to run this under the subscriptions lock.
+        final Supplier<Pair<Collection<LiveSupplier<ImmutableTableLocationKey>>, Collection<LiveSupplier<ImmutableTableLocationKey>>>> applyTransaction =
+                () -> {
+                    final Collection<LiveSupplier<ImmutableTableLocationKey>> addedKeys =
+                            new ArrayList<>(transaction.locationsAdded.size());
+                    final Collection<LiveSupplier<ImmutableTableLocationKey>> removedKeys =
+                            new ArrayList<>(transaction.locationsRemoved.size());
+
+                    synchronized (tableLocationKeyMap) {
+                        for (ImmutableTableLocationKey locationKey : transaction.locationsRemoved) {
+                            final TrackedKeySupplier trackedKey = tableLocationKeyMap.get(locationKey);
+                            if (trackedKey == null) {
+                                // Not an error to remove a key multiple times (or a key that was never added)
+                                continue;
+                            }
+                            trackedKey.deactivate();
+
+                            // Pass this removed key to the subscribers
+                            removedKeys.add(trackedKey);
+                        }
+
+                        for (ImmutableTableLocationKey locationKey : transaction.locationsAdded) {
+                            locationCreatedRecorder = false;
+                            final TrackedKeySupplier result =
+                                    tableLocationKeyMap.putIfAbsent(locationKey, this::observeInsert);
+                            visitLocationKey(locationKey);
+                            if (locationCreatedRecorder) {
+                                verifyPartitionKeys(locationKey);
+                                addedKeys.add(result);
+                            }
+                        }
+                    }
+                    return new Pair<>(addedKeys, removedKeys);
+                };
+
+        final Collection<LiveSupplier<ImmutableTableLocationKey>> removedKeys;
+        if (supportsSubscriptions()) {
+            synchronized (subscriptions) {
+                final Collection<LiveSupplier<ImmutableTableLocationKey>> addedKeys;
+                final Pair<Collection<LiveSupplier<ImmutableTableLocationKey>>, Collection<LiveSupplier<ImmutableTableLocationKey>>> result =
+                        applyTransaction.get();
+                addedKeys = result.getFirst();
+                removedKeys = result.getSecond();
+                // Push the notifications to the subscribers
+                if (subscriptions.deliverNotification(
+                        Listener::handleTableLocationKeysUpdate,
+                        addedKeys,
+                        removedKeys,
+                        true)) {
+                    onEmpty();
+                }
+            }
+        } else {
+            removedKeys = applyTransaction.get().getSecond();
+        }
+        // Release the keys that were removed after we have delivered the notifications and the
+        // subscribers have had a chance to process them
+        removedKeys.forEach(livenessManager::unmanage);
     }
 
     /**
@@ -93,44 +340,127 @@ protected final void deliverInitialSnapshot(@NotNull final TableLocationProvider
      * @param locationKey The new key
      * @apiNote This method is intended to be used by subclasses or by tightly-coupled discovery tools.
      */
-    protected final void handleTableLocationKey(@NotNull final TableLocationKey locationKey) {
+    protected final void handleTableLocationKeyAdded(@NotNull final TableLocationKey locationKey) {
+        handleTableLocationKeyAdded(locationKey, null);
+    }
+
+    /**
+     * Deliver a possibly-new key, optionally as part of a transaction.
+     *
+     * @param locationKey The new key
+     * @param transactionToken The token identifying the transaction (or null if not part of a transaction)
+     * @apiNote This method is intended to be used by subclasses or by tightly-coupled discovery tools.
+     */
+    protected final void handleTableLocationKeyAdded(
+            @NotNull final TableLocationKey locationKey,
+            @Nullable final Object transactionToken) {
+        if (transactionToken != null) {
+            final Transaction transaction = transactions.get(transactionToken);
+            if (transaction == null) {
+                throw new IllegalStateException(
+                        "No transaction with token " + transactionToken + " is currently open.");
+            }
+            // Store an immutable key
+            transaction.addLocationKey(locationKey.makeImmutable());
+            return;
+        }
+
         if (!supportsSubscriptions()) {
-            tableLocations.putIfAbsent(locationKey, TableLocationKey::makeImmutable);
-            visitLocationKey(toKeyImmutable(locationKey));
+            tableLocationKeyMap.putIfAbsent(locationKey, this::observeInsert);
+            visitLocationKey(locationKey);
             return;
         }
 
+        // If we're not in a transaction, we should push this key immediately.
         synchronized (subscriptions) {
             // Since we're holding the lock on subscriptions, the following code is overly complicated - we could
             // certainly just deliver the notification in observeInsert. That said, I'm happier with this approach,
             // as it minimizes lock duration for tableLocations, exemplifies correct use of putIfAbsent, and keeps
             // observeInsert out of the business of subscription processing.
             locationCreatedRecorder = false;
-            final Object result = tableLocations.putIfAbsent(locationKey, this::observeInsert);
+            final TrackedKeySupplier result = tableLocationKeyMap.putIfAbsent(locationKey, this::observeInsert);
             visitLocationKey(locationKey);
             if (locationCreatedRecorder) {
-                verifyPartitionKeys(locationKey);
-                if (subscriptions.deliverNotification(Listener::handleTableLocationKey, toKeyImmutable(result), true)) {
+                verifyPartitionKeys(result.get());
+                if (subscriptions.deliverNotification(
+                        Listener::handleTableLocationKeyAdded,
+                        result,
+                        true)) {
+                    onEmpty();
+                }
+            }
+        }
+    }
+
+    /**
+     * Handle a removal, optionally as part of a transaction. Notify subscribers that {@code locationKey} was removed if
+     * necessary. See {@link #removeTableLocationKey(TableLocationKey)} for additional discussions of semantics.
+     *
+     * @param locationKey the TableLocation that was removed
+     * @param transactionToken The token identifying the transaction (or null if not part of a transaction)
+     */
+    protected void handleTableLocationKeyRemoved(
+            @NotNull final TableLocationKey locationKey,
+            @Nullable final Object transactionToken) {
+        if (transactionToken != null) {
+            final Transaction transaction = transactions.get(transactionToken);
+            if (transaction == null) {
+                throw new IllegalStateException(
+                        "No transaction with token " + transactionToken + " is currently open.");
+            }
+            transaction.removeLocationKey(locationKey.makeImmutable());
+            return;
+        }
+
+        if (!supportsSubscriptions()) {
+            final TrackedKeySupplier trackedKey = tableLocationKeyMap.get(locationKey);
+            if (trackedKey != null) {
+                synchronized (tableLocationKeyMap) {
+                    trackedKey.deactivate();
+                }
+                livenessManager.unmanage(trackedKey);
+            }
+            return;
+        }
+
+        // If we're not in a transaction, we should push this key immediately.
+        synchronized (subscriptions) {
+            final TrackedKeySupplier trackedKey = tableLocationKeyMap.get(locationKey);
+            if (trackedKey != null) {
+                synchronized (tableLocationKeyMap) {
+                    trackedKey.deactivate();
+                }
+                if (subscriptions.deliverNotification(
+                        Listener::handleTableLocationKeyRemoved,
+                        trackedKey,
+                        true)) {
                     onEmpty();
                 }
+                livenessManager.unmanage(trackedKey);
             }
         }
     }
 
     /**
-     * Called <i>after</i> a table location has been visited by {@link #handleTableLocationKey(TableLocationKey)}, but
-     * before notifications have been delivered to any subscriptions, if applicable. The default implementation does
-     * nothing, and may be overridden to implement additional features.
+     * Called <i>after</i> a table location has been visited by
+     * {@link #handleTableLocationKeyAdded(TableLocationKey, Object)}, but before notifications have been delivered to
+     * any subscriptions, if applicable. The default implementation does nothing, and may be overridden to implement
+     * additional features.
      *
      * @param locationKey The {@link TableLocationKey} that was visited.
      */
+    @SuppressWarnings("unused")
     protected void visitLocationKey(@NotNull final TableLocationKey locationKey) {}
 
     @NotNull
-    private Object observeInsert(@NotNull final TableLocationKey locationKey) {
+    private TrackedKeySupplier observeInsert(@NotNull final TableLocationKey locationKey) {
         // NB: This must only be called while the lock on subscriptions is held.
         locationCreatedRecorder = true;
-        return locationKey.makeImmutable();
+
+        final TrackedKeySupplier trackedKey = toTrackedKey(locationKey);
+        livenessManager.manage(trackedKey);
+
+        return trackedKey;
     }
 
     /**
@@ -178,45 +508,38 @@ protected void doInitialization() {
     }
 
     @Override
-    @NotNull
-    public final Collection<ImmutableTableLocationKey> getTableLocationKeys() {
-        return unmodifiableTableLocationKeys;
+    public void getTableLocationKeys(
+            final Consumer<LiveSupplier<ImmutableTableLocationKey>> consumer,
+            final Predicate<ImmutableTableLocationKey> filter) {
+        // Lock the live set and deliver a copy to the listener after filtering.
+        synchronized (tableLocationKeyMap) {
+            tableLocationKeyMap.values().stream()
+                    .filter(TrackedKeySupplier::active)
+                    .filter(ttlk -> filter.test(ttlk.get()))
+                    .forEach(consumer);
+        }
     }
 
     @Override
     public final boolean hasTableLocationKey(@NotNull final TableLocationKey tableLocationKey) {
-        return tableLocations.containsKey(tableLocationKey);
+        return tableLocationKeyMap.containsKey(tableLocationKey);
     }
 
     @Override
     @Nullable
     public TableLocation getTableLocationIfPresent(@NotNull final TableLocationKey tableLocationKey) {
-        Object current = tableLocations.get(tableLocationKey);
-        if (current == null) {
+        final TrackedKeySupplier trackedKey = tableLocationKeyMap.get(tableLocationKey);
+        if (trackedKey == null) {
             return null;
         }
-        // See JavaDoc on tableLocations for background.
-        // The intent is to create a TableLocation exactly once to replace the TableLocationKey placeholder that was
-        // added in handleTableLocationKey.
-        if (!(current instanceof TableLocation)) {
-            final TableLocationKey immutableKey = (TableLocationKey) current;
-            // noinspection SynchronizationOnLocalVariableOrMethodParameter
-            synchronized (immutableKey) {
-                current = tableLocations.get(immutableKey);
-                if (immutableKey == current) {
-                    // Note, this may contend for the lock on tableLocations
-                    tableLocations.add(current = makeTableLocation(immutableKey));
-                }
-            }
-        }
-        return (TableLocation) current;
+        return trackedKey.getTableLocation();
     }
 
     /**
      * Remove a {@link TableLocationKey} and its corresponding {@link TableLocation} (if it was created). All
      * subscribers to this TableLocationProvider will be
-     * {@link TableLocationProvider.Listener#handleTableLocationKeyRemoved(ImmutableTableLocationKey) notified}. If the
-     * TableLocation was created, all of its subscribers will additionally be
+     * {@link TableLocationProvider.Listener#handleTableLocationKeyRemoved(LiveSupplier<ImmutableTableLocationKey>)
+     * notified}. If the TableLocation was created, all of its subscribers will additionally be
      * {@link TableLocation.Listener#handleUpdate() notified} that it no longer exists. This TableLocationProvider will
      * continue to update other locations and will no longer provide or request information about the removed location.
      *
@@ -237,31 +560,7 @@ public TableLocation getTableLocationIfPresent(@NotNull final TableLocationKey t
      * @param locationKey The {@link TableLocationKey} to remove
      */
     public void removeTableLocationKey(@NotNull final TableLocationKey locationKey) {
-        final Object removedLocation = tableLocations.remove(locationKey);
-
-        if (removedLocation != null) {
-            handleTableLocationKeyRemoved(locationKey.makeImmutable());
-            if (removedLocation instanceof AbstractTableLocation) {
-                final AbstractTableLocation abstractLocation = (AbstractTableLocation) removedLocation;
-                abstractLocation.handleUpdate(null, System.currentTimeMillis());
-                abstractLocation.clearColumnLocations();
-            }
-        }
-    }
-
-    /**
-     * Notify subscribers that {@code locationKey} was removed.
-     * 
-     * @param locationKey the TableLocation that was removed
-     */
-    protected void handleTableLocationKeyRemoved(@NotNull final ImmutableTableLocationKey locationKey) {
-        if (supportsSubscriptions()) {
-            synchronized (subscriptions) {
-                if (subscriptions.deliverNotification(Listener::handleTableLocationKeyRemoved, locationKey, true)) {
-                    onEmpty();
-                }
-            }
-        }
+        handleTableLocationKeyRemoved(locationKey, null);
     }
 
     private void verifyPartitionKeys(@NotNull final TableLocationKey locationKey) {
@@ -275,33 +574,24 @@ private void verifyPartitionKeys(@NotNull final TableLocationKey locationKey) {
     }
 
     /**
-     * Key definition for {@link TableLocation} or {@link TableLocationKey} lookup by {@link TableLocationKey}.
+     * Key definition for {@link LiveSupplier<ImmutableTableLocationKey>} lookup by {@link ImmutableTableLocationKey}.
      */
-    private static final class LocationKeyDefinition extends KeyedObjectKey.Basic<TableLocationKey, Object> {
+    private static final class TableLocationKeyDefinition
+            extends KeyedObjectKey.Basic<TableLocationKey, TrackedKeySupplier> {
 
-        private static final KeyedObjectKey<TableLocationKey, Object> INSTANCE = new LocationKeyDefinition();
+        private static final KeyedObjectKey<TableLocationKey, TrackedKeySupplier> INSTANCE =
+                new TableLocationKeyDefinition();
 
-        private LocationKeyDefinition() {}
+        private TableLocationKeyDefinition() {}
 
         @Override
-        public TableLocationKey getKey(@NotNull final Object keyOrLocation) {
-            return toKey(keyOrLocation);
+        public TableLocationKey getKey(@NotNull final TrackedKeySupplier immutableKeySupplier) {
+            return immutableKeySupplier.get();
         }
     }
 
-    private static TableLocationKey toKey(@NotNull final Object keyOrLocation) {
-        if (keyOrLocation instanceof TableLocation) {
-            return ((TableLocation) keyOrLocation).getKey();
-        }
-        if (keyOrLocation instanceof TableLocationKey) {
-            return ((TableLocationKey) keyOrLocation);
-        }
-        throw new IllegalArgumentException(
-                "toKey expects a TableLocation or a TableLocationKey, instead received a " + keyOrLocation.getClass());
-    }
-
-    private static ImmutableTableLocationKey toKeyImmutable(@NotNull final Object keyOrLocation) {
-        return (ImmutableTableLocationKey) toKey(keyOrLocation);
+    private TrackedKeySupplier toTrackedKey(@NotNull final TableLocationKey locationKey) {
+        return new TrackedKeySupplier(locationKey.makeImmutable());
     }
 
     private static <T> boolean equals(Collection<T> c1, Collection<T> c2) {
@@ -316,4 +606,26 @@ private static <T> boolean equals(Collection<T> c1, Collection<T> c2) {
         }
         return !i2.hasNext();
     }
+
+    /**
+     * Called when every reference to the {@link LiveSupplier<ImmutableTableLocationKey> key} has been released.
+     *
+     * @param locationKey the key to release
+     */
+    private void releaseLocationKey(@NotNull final TrackedKeySupplier locationKey) {
+        // We can now remove the key from the tableLocations map
+        tableLocationKeyMap.removeKey(locationKey.get());
+    }
+
+    @Override
+    @NotNull
+    public TableUpdateMode getUpdateMode() {
+        return updateMode;
+    }
+
+    @Override
+    @NotNull
+    public TableUpdateMode getLocationUpdateMode() {
+        return locationUpdateMode;
+    }
 }
diff --git a/engine/table/src/main/java/io/deephaven/engine/table/impl/locations/impl/CompositeTableDataService.java b/engine/table/src/main/java/io/deephaven/engine/table/impl/locations/impl/CompositeTableDataService.java
index e9dbbc747ce..199e6a2ca87 100644
--- a/engine/table/src/main/java/io/deephaven/engine/table/impl/locations/impl/CompositeTableDataService.java
+++ b/engine/table/src/main/java/io/deephaven/engine/table/impl/locations/impl/CompositeTableDataService.java
@@ -4,6 +4,8 @@
 package io.deephaven.engine.table.impl.locations.impl;
 
 import io.deephaven.base.verify.Require;
+import io.deephaven.engine.liveness.LiveSupplier;
+import io.deephaven.engine.table.impl.TableUpdateMode;
 import io.deephaven.engine.util.Formatter;
 import io.deephaven.engine.table.impl.locations.*;
 import io.deephaven.hash.KeyedObjectHashSet;
@@ -13,6 +15,8 @@
 import org.jetbrains.annotations.Nullable;
 
 import java.util.*;
+import java.util.function.Consumer;
+import java.util.function.Predicate;
 import java.util.stream.Collectors;
 
 /**
@@ -53,6 +57,36 @@ public CompositeTableDataService(@NotNull String name, @NotNull final ServiceSel
         this.serviceSelector = Require.neqNull(serviceSelector, "serviceSelector");
     }
 
+    @Override
+    @Nullable
+    public TableLocationProvider getRawTableLocationProvider(@NotNull final TableKey tableKey,
+            @NotNull final TableLocationKey tableLocationKey) {
+        final TableDataService[] services = serviceSelector.call(tableKey);
+
+        if (services == null || services.length == 0) {
+            return null;
+        }
+
+        TableLocationProvider tlp = null;
+        for (final TableDataService service : services) {
+            final TableLocationProvider tlpCandidate = service.getRawTableLocationProvider(tableKey, tableLocationKey);
+            if (tlpCandidate == null) {
+                continue;
+            }
+
+            if (tlp != null) {
+                throw new TableDataException(
+                        "TableDataService elements " + tlpCandidate.getName() + " and " + tlp.getName()
+                                + " both contain " + tableLocationKey + ". Full TableDataService configuration:\n"
+                                + Formatter.formatTableDataService(CompositeTableDataService.this.toString()));
+            }
+
+            tlp = tlpCandidate;
+        }
+
+        return tlp;
+    }
+
     @Override
     public void reset() {
         super.reset();
@@ -85,12 +119,30 @@ private class TableLocationProviderImpl implements TableLocationProvider {
         private final List<TableLocationProvider> inputProviders;
         private final String implementationName;
 
+        // What guarantees about added/removed locations can be made?
+        private final TableUpdateMode updateMode;
+        // What guarantees about added/removed rows within locations can be made?
+        private final TableUpdateMode locationUpdateMode;
+
         private TableLocationProviderImpl(@NotNull final TableDataService[] inputServices,
                 @NotNull final TableKey tableKey) {
             this.tableKey = tableKey.makeImmutable();
             inputProviders = Arrays.stream(inputServices).map(s -> s.getTableLocationProvider(this.tableKey))
                     .collect(Collectors.toList());
             implementationName = "Composite-" + inputProviders;
+
+            // Analyze the update modes of the input providers to determine the update mode of the composite provider.
+            // The resultant mode is the most permissive mode of the input providers, with the exception that we will
+            // never return APPEND_ONLY.
+            final TableUpdateMode tmpUpdateMode = TableUpdateMode.mostPermissiveMode(
+                    inputProviders.stream().map(TableLocationProvider::getUpdateMode));
+            updateMode = tmpUpdateMode == TableUpdateMode.APPEND_ONLY ? TableUpdateMode.ADD_ONLY : tmpUpdateMode;
+
+            // Analyze the location update modes of the input providers to determine the location update mode
+            // of the composite provider. The resultant mode is the most permissive mode of the input provider
+            // locations.
+            locationUpdateMode = TableUpdateMode.mostPermissiveMode(
+                    inputProviders.stream().map(TableLocationProvider::getLocationUpdateMode));
         }
 
         @Override
@@ -115,7 +167,7 @@ public void subscribe(@NotNull final Listener listener) {
                     p.subscribe(listener);
                 } else {
                     p.refresh();
-                    p.getTableLocationKeys().forEach(listener::handleTableLocationKey);
+                    p.getTableLocationKeys(listener::handleTableLocationKeyAdded);
                 }
             });
         }
@@ -141,29 +193,33 @@ public TableLocationProvider ensureInitialized() {
         }
 
         @Override
-        @NotNull
-        public Collection<ImmutableTableLocationKey> getTableLocationKeys() {
-            final Set<ImmutableTableLocationKey> locationKeys = new KeyedObjectHashSet<>(KeyKeyDefinition.INSTANCE);
+        public void getTableLocationKeys(
+                final Consumer<LiveSupplier<ImmutableTableLocationKey>> consumer,
+                final Predicate<ImmutableTableLocationKey> filter) {
+            final Set<LiveSupplier<ImmutableTableLocationKey>> locationKeys =
+                    new KeyedObjectHashSet<>(KeyKeyDefinition.INSTANCE);
             try (final SafeCloseable ignored = CompositeTableDataServiceConsistencyMonitor.INSTANCE.start()) {
-                inputProviders.stream()
-                        .map(TableLocationProvider::getTableLocationKeys)
-                        .flatMap(Collection::stream)
-                        .filter(x -> !locationKeys.add(x))
-                        .findFirst()
-                        .ifPresent(duplicateLocationKey -> {
-                            final String overlappingProviders = inputProviders.stream()
-                                    .filter(inputProvider -> inputProvider.hasTableLocationKey(duplicateLocationKey))
-                                    .map(TableLocationProvider::getName)
-                                    .collect(Collectors.joining(","));
-                            throw new TableDataException(
-                                    "Data Routing Configuration error: TableDataService elements overlap at location " +
-                                            duplicateLocationKey +
-                                            " in providers " + overlappingProviders +
-                                            ". Full TableDataService configuration:\n" +
-                                            Formatter
-                                                    .formatTableDataService(CompositeTableDataService.this.toString()));
-                        });
-                return Collections.unmodifiableCollection(locationKeys);
+                // Add all the location keys from the providers to the set, throw an exception if there are duplicates
+                inputProviders.forEach(p -> p.getTableLocationKeys(tlk -> {
+                    if (locationKeys.add(tlk)) {
+                        // Consume the key immediately (while the key is still managed by the input provider)
+                        consumer.accept(tlk);
+                        return;
+                    }
+                    // We have a duplicate key, throw a detailed exception
+                    final String overlappingProviders = inputProviders.stream()
+                            .filter(inputProvider -> inputProvider.hasTableLocationKey(tlk.get()))
+                            .map(TableLocationProvider::getName)
+                            .collect(Collectors.joining(","));
+                    throw new TableDataException(
+                            "Data Routing Configuration error: TableDataService elements overlap at location " +
+                                    tlk +
+                                    " in providers " + overlappingProviders +
+                                    ". Full TableDataService configuration:\n" +
+                                    Formatter
+                                            .formatTableDataService(CompositeTableDataService.this.toString()));
+
+                }, filter));
             }
         }
 
@@ -197,6 +253,18 @@ public TableLocation getTableLocationIfPresent(@NotNull final TableLocationKey t
             }
             return location;
         }
+
+        @Override
+        @NotNull
+        public TableUpdateMode getUpdateMode() {
+            return updateMode;
+        }
+
+        @Override
+        @NotNull
+        public TableUpdateMode getLocationUpdateMode() {
+            return locationUpdateMode;
+        }
     }
 
     @Override
@@ -225,16 +293,17 @@ public String describe() {
     // ------------------------------------------------------------------------------------------------------------------
 
     private static final class KeyKeyDefinition
-            extends KeyedObjectKey.Basic<ImmutableTableLocationKey, ImmutableTableLocationKey> {
+            extends KeyedObjectKey.Basic<ImmutableTableLocationKey, LiveSupplier<ImmutableTableLocationKey>> {
 
-        private static final KeyedObjectKey<ImmutableTableLocationKey, ImmutableTableLocationKey> INSTANCE =
+        private static final KeyedObjectKey<ImmutableTableLocationKey, LiveSupplier<ImmutableTableLocationKey>> INSTANCE =
                 new KeyKeyDefinition();
 
         private KeyKeyDefinition() {}
 
         @Override
-        public ImmutableTableLocationKey getKey(@NotNull final ImmutableTableLocationKey tableLocationKey) {
-            return tableLocationKey;
+        public ImmutableTableLocationKey getKey(
+                @NotNull final LiveSupplier<ImmutableTableLocationKey> tableLocationKey) {
+            return tableLocationKey.get();
         }
     }
 }
diff --git a/engine/table/src/main/java/io/deephaven/engine/table/impl/locations/impl/FilteredTableDataService.java b/engine/table/src/main/java/io/deephaven/engine/table/impl/locations/impl/FilteredTableDataService.java
index 8bfbeed184a..b604c7ba700 100644
--- a/engine/table/src/main/java/io/deephaven/engine/table/impl/locations/impl/FilteredTableDataService.java
+++ b/engine/table/src/main/java/io/deephaven/engine/table/impl/locations/impl/FilteredTableDataService.java
@@ -5,6 +5,8 @@
 
 import io.deephaven.base.reference.WeakReferenceWrapper;
 import io.deephaven.base.verify.Require;
+import io.deephaven.engine.liveness.LiveSupplier;
+import io.deephaven.engine.table.impl.TableUpdateMode;
 import io.deephaven.engine.table.impl.locations.*;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
@@ -12,6 +14,8 @@
 import java.util.Collection;
 import java.util.Map;
 import java.util.WeakHashMap;
+import java.util.function.Consumer;
+import java.util.function.Predicate;
 import java.util.stream.Collectors;
 
 /**
@@ -47,6 +51,17 @@ public FilteredTableDataService(@NotNull final TableDataService serviceToFilter,
         this.locationKeyFilter = Require.neqNull(locationKeyFilter, "locationKeyFilter");
     }
 
+    @Override
+    @Nullable
+    public TableLocationProvider getRawTableLocationProvider(@NotNull final TableKey tableKey,
+            @NotNull final TableLocationKey tableLocationKey) {
+        if (!locationKeyFilter.accept(tableLocationKey)) {
+            return null;
+        }
+
+        return serviceToFilter.getRawTableLocationProvider(tableKey, tableLocationKey);
+    }
+
     @Override
     public void reset() {
         super.reset();
@@ -124,9 +139,10 @@ public TableLocationProvider ensureInitialized() {
         }
 
         @Override
-        public @NotNull Collection<ImmutableTableLocationKey> getTableLocationKeys() {
-            return inputProvider.getTableLocationKeys().stream().filter(locationKeyFilter::accept)
-                    .collect(Collectors.toList());
+        public void getTableLocationKeys(
+                final Consumer<LiveSupplier<ImmutableTableLocationKey>> consumer,
+                final Predicate<ImmutableTableLocationKey> filter) {
+            inputProvider.getTableLocationKeys(consumer, filter);
         }
 
         @Override
@@ -147,6 +163,18 @@ public TableLocation getTableLocationIfPresent(@NotNull final TableLocationKey t
         public String getName() {
             return FilteredTableDataService.this.getName();
         }
+
+        @Override
+        @NotNull
+        public TableUpdateMode getUpdateMode() {
+            return inputProvider.getUpdateMode();
+        }
+
+        @Override
+        @NotNull
+        public TableUpdateMode getLocationUpdateMode() {
+            return inputProvider.getLocationUpdateMode();
+        }
     }
 
     private class FilteringListener extends WeakReferenceWrapper<TableLocationProvider.Listener>
@@ -157,23 +185,46 @@ private FilteringListener(@NotNull final TableLocationProvider.Listener outputLi
         }
 
         @Override
-        public void handleTableLocationKey(@NotNull final ImmutableTableLocationKey tableLocationKey) {
+        public void handleTableLocationKeyAdded(
+                @NotNull final LiveSupplier<ImmutableTableLocationKey> tableLocationKey) {
             final TableLocationProvider.Listener outputListener = getWrapped();
             // We can't try to clean up null listeners here, the underlying implementation may not allow concurrent
             // unsubscribe operations.
-            if (outputListener != null && locationKeyFilter.accept(tableLocationKey)) {
-                outputListener.handleTableLocationKey(tableLocationKey);
+            if (outputListener != null && locationKeyFilter.accept(tableLocationKey.get())) {
+                outputListener.handleTableLocationKeyAdded(tableLocationKey);
             }
         }
 
         @Override
-        public void handleTableLocationKeyRemoved(@NotNull final ImmutableTableLocationKey tableLocationKey) {
+        public void handleTableLocationKeyRemoved(
+                @NotNull final LiveSupplier<ImmutableTableLocationKey> tableLocationKey) {
             final TableLocationProvider.Listener outputListener = getWrapped();
-            if (outputListener != null && locationKeyFilter.accept(tableLocationKey)) {
+            if (outputListener != null && locationKeyFilter.accept(tableLocationKey.get())) {
                 outputListener.handleTableLocationKeyRemoved(tableLocationKey);
             }
         }
 
+        @Override
+        public void handleTableLocationKeysUpdate(
+                @NotNull final Collection<LiveSupplier<ImmutableTableLocationKey>> addedKeys,
+                @NotNull final Collection<LiveSupplier<ImmutableTableLocationKey>> removedKeys) {
+            // NOTE: We are filtering the added and removed keys for every listener. We should consider refactoring to
+            // filter once and then notify all listeners with the filtered lists (similar to SubscriptionAggregator).
+            final TableLocationProvider.Listener outputListener = getWrapped();
+            if (outputListener != null) {
+                // Produce filtered lists of added and removed keys.
+                final Collection<LiveSupplier<ImmutableTableLocationKey>> filteredAddedKeys = addedKeys.stream()
+                        .filter(key -> locationKeyFilter.accept(key.get())).collect(Collectors.toList());
+                final Collection<LiveSupplier<ImmutableTableLocationKey>> filteredRemovedKeys = removedKeys.stream()
+                        .filter(key -> locationKeyFilter.accept(key.get())).collect(Collectors.toList());
+
+                if (filteredAddedKeys.isEmpty() && filteredRemovedKeys.isEmpty()) {
+                    return;
+                }
+                outputListener.handleTableLocationKeysUpdate(filteredAddedKeys, filteredRemovedKeys);
+            }
+        }
+
         @Override
         public void handleException(@NotNull final TableDataException exception) {
             final TableLocationProvider.Listener outputListener = getWrapped();
diff --git a/engine/table/src/main/java/io/deephaven/engine/table/impl/locations/impl/PartitionedTableLocationKey.java b/engine/table/src/main/java/io/deephaven/engine/table/impl/locations/impl/PartitionedTableLocationKey.java
index 83f6e619f0f..89325bc1351 100644
--- a/engine/table/src/main/java/io/deephaven/engine/table/impl/locations/impl/PartitionedTableLocationKey.java
+++ b/engine/table/src/main/java/io/deephaven/engine/table/impl/locations/impl/PartitionedTableLocationKey.java
@@ -5,6 +5,7 @@
 
 import io.deephaven.base.log.LogOutput;
 import io.deephaven.base.log.LogOutputAppendable;
+import io.deephaven.engine.table.impl.locations.TableLocationKey;
 import io.deephaven.util.compare.ObjectComparisons;
 import io.deephaven.engine.table.impl.locations.ImmutableTableLocationKey;
 import io.deephaven.engine.table.impl.locations.UnknownPartitionKeyException;
@@ -15,9 +16,9 @@
 
 /**
  * Base {@link ImmutableTableLocationKey} implementation for table locations that may be enclosed by partitions.
- * Sub-classes should be sure to invoke the partition-map comparator at higher priority than other comparisons when
- * implementing {@link #compareTo(Object)}, and to include the partitions in their {@link #equals(Object)}
- * implementations.
+ * Subclasses should consider invoking the partition-map comparator at higher priority than other comparisons when
+ * implementing {@link #compareTo(Object)}. Also, should include the partitions in their {@link #equals(Object)} and
+ * {@link #hashCode()} implementations if not calling {@code super.equals()} and {@code super.hashCode()}.
  */
 public abstract class PartitionedTableLocationKey implements ImmutableTableLocationKey {
 
@@ -26,6 +27,8 @@ public abstract class PartitionedTableLocationKey implements ImmutableTableLocat
 
     protected final Map<String, Comparable<?>> partitions;
 
+    private int cachedHashCode;
+
     /**
      * Construct a new PartitionedTableLocationKey for the supplied {@code partitions}.
      *
@@ -55,6 +58,46 @@ public final Set<String> getPartitionKeys() {
         return partitions.keySet();
     }
 
+    @Override
+    public int compareTo(@NotNull final TableLocationKey other) {
+        if (other instanceof PartitionedTableLocationKey) {
+            final PartitionedTableLocationKey otherTyped = (PartitionedTableLocationKey) other;
+            final int partitionComparisonResult =
+                    PartitionsComparator.INSTANCE.compare(partitions, otherTyped.partitions);
+            if (partitionComparisonResult != 0) {
+                return partitionComparisonResult;
+            }
+        }
+        return ImmutableTableLocationKey.super.compareTo(other);
+    }
+
+    @Override
+    public int hashCode() {
+        if (cachedHashCode == 0) {
+            final int computedHashCode = partitions.hashCode();
+            // Don't use 0; that's used by StandaloneTableLocationKey, and also our sentinel for the need to compute
+            if (computedHashCode == 0) {
+                final int fallbackHashCode = PartitionedTableLocationKey.class.hashCode();
+                cachedHashCode = fallbackHashCode == 0 ? 1 : fallbackHashCode;
+            } else {
+                cachedHashCode = computedHashCode;
+            }
+        }
+        return cachedHashCode;
+    }
+
+    @Override
+    public boolean equals(@Nullable final Object other) {
+        if (this == other) {
+            return true;
+        }
+        if (!(other instanceof PartitionedTableLocationKey)) {
+            return false;
+        }
+        final PartitionedTableLocationKey otherTyped = (PartitionedTableLocationKey) other;
+        return partitions.equals(otherTyped.partitions);
+    }
+
     /**
      * Formats a map of partitions as key-value pairs.
      */
diff --git a/engine/table/src/main/java/io/deephaven/engine/table/impl/locations/impl/PollingTableLocationProvider.java b/engine/table/src/main/java/io/deephaven/engine/table/impl/locations/impl/PollingTableLocationProvider.java
index 361a18c8c44..40a9bf8e761 100644
--- a/engine/table/src/main/java/io/deephaven/engine/table/impl/locations/impl/PollingTableLocationProvider.java
+++ b/engine/table/src/main/java/io/deephaven/engine/table/impl/locations/impl/PollingTableLocationProvider.java
@@ -3,10 +3,8 @@
 //
 package io.deephaven.engine.table.impl.locations.impl;
 
-import io.deephaven.engine.table.impl.locations.TableKey;
-import io.deephaven.engine.table.impl.locations.TableLocation;
-import io.deephaven.engine.table.impl.locations.TableLocationKey;
-import io.deephaven.engine.table.impl.locations.TableLocationProvider;
+import io.deephaven.engine.table.impl.TableUpdateMode;
+import io.deephaven.engine.table.impl.locations.*;
 import io.deephaven.engine.table.impl.locations.util.TableDataRefreshService;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
@@ -30,8 +28,10 @@ public class PollingTableLocationProvider<TK extends TableKey, TLK extends Table
     public PollingTableLocationProvider(@NotNull final TK tableKey,
             @NotNull final TableLocationKeyFinder<TLK> locationKeyFinder,
             @NotNull final TableLocationFactory<TK, TLK> locationFactory,
-            @Nullable final TableDataRefreshService refreshService) {
-        super(tableKey, refreshService != null);
+            @Nullable final TableDataRefreshService refreshService,
+            final TableUpdateMode updateMode,
+            final TableUpdateMode locationUpdateMode) {
+        super(tableKey, refreshService != null, updateMode, locationUpdateMode);
         this.locationKeyFinder = locationKeyFinder;
         this.locationFactory = locationFactory;
         this.refreshService = refreshService;
@@ -48,7 +48,7 @@ public String getImplementationName() {
 
     @Override
     public void refresh() {
-        locationKeyFinder.findKeys(this::handleTableLocationKey);
+        locationKeyFinder.findKeys(this::handleTableLocationKeyAdded);
         setInitialized();
     }
 
diff --git a/engine/table/src/main/java/io/deephaven/engine/table/impl/locations/impl/SingleTableLocationProvider.java b/engine/table/src/main/java/io/deephaven/engine/table/impl/locations/impl/SingleTableLocationProvider.java
index a94abd87f5f..977c4d8f0ef 100644
--- a/engine/table/src/main/java/io/deephaven/engine/table/impl/locations/impl/SingleTableLocationProvider.java
+++ b/engine/table/src/main/java/io/deephaven/engine/table/impl/locations/impl/SingleTableLocationProvider.java
@@ -3,27 +3,64 @@
 //
 package io.deephaven.engine.table.impl.locations.impl;
 
+import io.deephaven.engine.liveness.LiveSupplier;
+import io.deephaven.engine.liveness.LivenessReferent;
+import io.deephaven.engine.table.impl.TableUpdateMode;
 import io.deephaven.engine.table.impl.locations.*;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
-import java.util.Collection;
-import java.util.Collections;
+import java.lang.ref.WeakReference;
+import java.util.function.Consumer;
+import java.util.function.Predicate;
 
 /**
- * A {@link TableLocationProvider} that provides access to exactly one, previously-known {@link TableLocation}.
+ * A {@link TableLocationProvider} that provides access to exactly one, previously-known {@link TableLocation}. In
+ * contrast to {@link AbstractTableLocationProvider}, this class does not manage the liveness of the table location.
+ * Managment must be done externally (as in {@link io.deephaven.engine.table.impl.SourcePartitionedTable}).
  */
 public final class SingleTableLocationProvider implements TableLocationProvider {
-
     private static final String IMPLEMENTATION_NAME = SingleTableLocationProvider.class.getSimpleName();
 
+    private static class TrackedKeySupplier implements LiveSupplier<ImmutableTableLocationKey>, LivenessReferent {
+        final ImmutableTableLocationKey key;
+
+        protected TrackedKeySupplier(final ImmutableTableLocationKey key) {
+            this.key = key;
+        }
+
+        @Override
+        public ImmutableTableLocationKey get() {
+            return key;
+        }
+
+        @Override
+        public boolean tryRetainReference() {
+            return true;
+        }
+
+        @Override
+        public void dropReference() {}
+
+        @Override
+        public WeakReference<? extends LivenessReferent> getWeakReference() {
+            return new WeakReference<>(this);
+        }
+    }
+
+    private final TrackedKeySupplier immutableKeySupplier;
     private final TableLocation tableLocation;
+    private final TableUpdateMode locationUpdateMode;
 
     /**
      * @param tableLocation The only table location that this provider will ever provide
      */
-    public SingleTableLocationProvider(@NotNull final TableLocation tableLocation) {
+    public SingleTableLocationProvider(
+            @NotNull final TableLocation tableLocation,
+            final TableUpdateMode locationUpdateMode) {
         this.tableLocation = tableLocation;
+        immutableKeySupplier = new TrackedKeySupplier(tableLocation.getKey());
+        this.locationUpdateMode = locationUpdateMode;
     }
 
     @Override
@@ -59,10 +96,13 @@ public TableLocationProvider ensureInitialized() {
         return this;
     }
 
-    @NotNull
     @Override
-    public Collection<ImmutableTableLocationKey> getTableLocationKeys() {
-        return Collections.singleton(tableLocation.getKey());
+    public void getTableLocationKeys(
+            final Consumer<LiveSupplier<ImmutableTableLocationKey>> consumer,
+            final Predicate<ImmutableTableLocationKey> filter) {
+        if (filter.test(immutableKeySupplier.get())) {
+            consumer.accept(immutableKeySupplier);
+        }
     }
 
     @Override
@@ -75,4 +115,17 @@ public boolean hasTableLocationKey(@NotNull final TableLocationKey tableLocation
     public TableLocation getTableLocationIfPresent(@NotNull final TableLocationKey tableLocationKey) {
         return hasTableLocationKey(tableLocationKey) ? tableLocation : null;
     }
+
+    @Override
+    @NotNull
+    public TableUpdateMode getUpdateMode() {
+        // No additions or removals are possible from this provider, it exists to serve
+        return TableUpdateMode.STATIC;
+    }
+
+    @Override
+    @NotNull
+    public TableUpdateMode getLocationUpdateMode() {
+        return locationUpdateMode;
+    }
 }
diff --git a/engine/table/src/main/java/io/deephaven/engine/table/impl/locations/impl/StandaloneTableLocationKey.java b/engine/table/src/main/java/io/deephaven/engine/table/impl/locations/impl/StandaloneTableLocationKey.java
index a8ff59d8dd3..488529c05bd 100644
--- a/engine/table/src/main/java/io/deephaven/engine/table/impl/locations/impl/StandaloneTableLocationKey.java
+++ b/engine/table/src/main/java/io/deephaven/engine/table/impl/locations/impl/StandaloneTableLocationKey.java
@@ -48,7 +48,7 @@ public int compareTo(@NotNull final TableLocationKey other) {
         if (other instanceof StandaloneTableLocationKey) {
             return 0;
         }
-        throw new ClassCastException("Cannot compare " + getClass() + " to " + other.getClass());
+        return ImmutableTableLocationKey.super.compareTo(other);
     }
 
     @Override
diff --git a/engine/table/src/main/java/io/deephaven/engine/table/impl/locations/impl/TableLocationSubscriptionBuffer.java b/engine/table/src/main/java/io/deephaven/engine/table/impl/locations/impl/TableLocationSubscriptionBuffer.java
index fae32e8a0a1..3a59197a265 100644
--- a/engine/table/src/main/java/io/deephaven/engine/table/impl/locations/impl/TableLocationSubscriptionBuffer.java
+++ b/engine/table/src/main/java/io/deephaven/engine/table/impl/locations/impl/TableLocationSubscriptionBuffer.java
@@ -4,54 +4,67 @@
 package io.deephaven.engine.table.impl.locations.impl;
 
 import io.deephaven.base.verify.Require;
+import io.deephaven.engine.liveness.LiveSupplier;
+import io.deephaven.engine.liveness.ReferenceCountedLivenessNode;
 import io.deephaven.engine.table.impl.locations.ImmutableTableLocationKey;
 import io.deephaven.engine.table.impl.locations.TableDataException;
 import io.deephaven.engine.table.impl.locations.TableLocationProvider;
+import io.deephaven.util.SafeCloseable;
 import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
 
-import java.util.Collection;
-import java.util.Collections;
-import java.util.HashSet;
-import java.util.Set;
+import java.util.*;
 
 /**
  * Intermediates between push-based subscription to a TableLocationProvider and polling on update source refresh.
  */
-public class TableLocationSubscriptionBuffer implements TableLocationProvider.Listener {
+public class TableLocationSubscriptionBuffer extends ReferenceCountedLivenessNode
+        implements TableLocationProvider.Listener {
 
-    private static final Set<ImmutableTableLocationKey> EMPTY_TABLE_LOCATION_KEYS = Collections.emptySet();
+    private static final Set<LiveSupplier<ImmutableTableLocationKey>> EMPTY_TABLE_LOCATION_KEYS =
+            Collections.emptySet();
 
     private final TableLocationProvider tableLocationProvider;
 
     private boolean subscribed = false;
 
     private final Object updateLock = new Object();
-    private Set<ImmutableTableLocationKey> pendingLocationKeys = EMPTY_TABLE_LOCATION_KEYS;
 
-    private Set<ImmutableTableLocationKey> pendingLocationsRemoved = EMPTY_TABLE_LOCATION_KEYS;
+    // These sets represent adds and removes from completed transactions.
+    private Set<LiveSupplier<ImmutableTableLocationKey>> pendingLocationsAdded = EMPTY_TABLE_LOCATION_KEYS;
+    private Set<LiveSupplier<ImmutableTableLocationKey>> pendingLocationsRemoved = EMPTY_TABLE_LOCATION_KEYS;
+
     private TableDataException pendingException = null;
 
     public TableLocationSubscriptionBuffer(@NotNull final TableLocationProvider tableLocationProvider) {
+        super(false);
         this.tableLocationProvider = Require.neqNull(tableLocationProvider, "tableLocationProvider");
     }
 
-    public static final class LocationUpdate {
-        private final Collection<ImmutableTableLocationKey> pendingAddedLocationKeys;
-        private final Collection<ImmutableTableLocationKey> pendingRemovedLocations;
+    public final class LocationUpdate implements SafeCloseable {
+        private final Collection<LiveSupplier<ImmutableTableLocationKey>> pendingAddedLocationKeys;
+        private final Collection<LiveSupplier<ImmutableTableLocationKey>> pendingRemovedLocations;
 
-        public LocationUpdate(@NotNull final Collection<ImmutableTableLocationKey> pendingAddedLocationKeys,
-                @NotNull final Collection<ImmutableTableLocationKey> pendingRemovedLocations) {
+        public LocationUpdate(
+                @NotNull final Collection<LiveSupplier<ImmutableTableLocationKey>> pendingAddedLocationKeys,
+                @NotNull final Collection<LiveSupplier<ImmutableTableLocationKey>> pendingRemovedLocations) {
             this.pendingAddedLocationKeys = pendingAddedLocationKeys;
             this.pendingRemovedLocations = pendingRemovedLocations;
         }
 
-        public Collection<ImmutableTableLocationKey> getPendingAddedLocationKeys() {
+        public Collection<LiveSupplier<ImmutableTableLocationKey>> getPendingAddedLocationKeys() {
             return pendingAddedLocationKeys;
         }
 
-        public Collection<ImmutableTableLocationKey> getPendingRemovedLocationKeys() {
+        public Collection<LiveSupplier<ImmutableTableLocationKey>> getPendingRemovedLocationKeys() {
             return pendingRemovedLocations;
         }
+
+        @Override
+        public void close() {
+            pendingAddedLocationKeys.forEach(TableLocationSubscriptionBuffer.this::unmanage);
+            pendingRemovedLocations.forEach(TableLocationSubscriptionBuffer.this::unmanage);
+        }
     }
 
     /**
@@ -60,7 +73,7 @@ public Collection<ImmutableTableLocationKey> getPendingRemovedLocationKeys() {
      * reset). No order is maintained internally. If a pending exception is thrown, this signals that the subscription
      * is no longer valid and no subsequent location keys will be returned.
      *
-     * @return The collection of pending location keys
+     * @return The collection of pending location keys.
      */
     public synchronized LocationUpdate processPending() {
         // TODO: Should I change this to instead re-use the collection?
@@ -68,19 +81,21 @@ public synchronized LocationUpdate processPending() {
             if (tableLocationProvider.supportsSubscriptions()) {
                 tableLocationProvider.subscribe(this);
             } else {
-                // NB: Providers that don't support subscriptions don't tick - this single call to run is
+                // NB: Providers that don't support subscriptions don't tick - this single call to refresh is
                 // sufficient.
                 tableLocationProvider.refresh();
-                tableLocationProvider.getTableLocationKeys().forEach(this::handleTableLocationKey);
+                final Collection<LiveSupplier<ImmutableTableLocationKey>> tableLocationKeys = new ArrayList<>();
+                tableLocationProvider.getTableLocationKeys(tableLocationKeys::add);
+                handleTableLocationKeysUpdate(tableLocationKeys, List.of());
             }
             subscribed = true;
         }
-        final Collection<ImmutableTableLocationKey> resultLocationKeys;
-        final Collection<ImmutableTableLocationKey> resultLocationsRemoved;
+        final Collection<LiveSupplier<ImmutableTableLocationKey>> resultLocationKeys;
+        final Collection<LiveSupplier<ImmutableTableLocationKey>> resultLocationsRemoved;
         final TableDataException resultException;
         synchronized (updateLock) {
-            resultLocationKeys = pendingLocationKeys;
-            pendingLocationKeys = EMPTY_TABLE_LOCATION_KEYS;
+            resultLocationKeys = pendingLocationsAdded;
+            pendingLocationsAdded = EMPTY_TABLE_LOCATION_KEYS;
             resultLocationsRemoved = pendingLocationsRemoved;
             pendingLocationsRemoved = EMPTY_TABLE_LOCATION_KEYS;
             resultException = pendingException;
@@ -105,7 +120,9 @@ public synchronized void reset() {
             subscribed = false;
         }
         synchronized (updateLock) {
-            pendingLocationKeys = EMPTY_TABLE_LOCATION_KEYS;
+            pendingLocationsAdded.forEach(this::unmanage);
+            pendingLocationsRemoved.forEach(this::unmanage);
+            pendingLocationsAdded = EMPTY_TABLE_LOCATION_KEYS;
             pendingLocationsRemoved = EMPTY_TABLE_LOCATION_KEYS;
             pendingException = null;
         }
@@ -116,30 +133,81 @@ public synchronized void reset() {
     // ------------------------------------------------------------------------------------------------------------------
 
     @Override
-    public void handleTableLocationKey(@NotNull final ImmutableTableLocationKey tableLocationKey) {
+    public void handleTableLocationKeyAdded(@NotNull final LiveSupplier<ImmutableTableLocationKey> tableLocationKey) {
         synchronized (updateLock) {
-            if (pendingLocationKeys == EMPTY_TABLE_LOCATION_KEYS) {
-                pendingLocationKeys = new HashSet<>();
+            // Need to verify that we don't have stacked adds (without intervening removes).
+            if (pendingLocationsAdded.contains(tableLocationKey)) {
+                throw new IllegalStateException("TableLocationKey " + tableLocationKey
+                        + " was already added by a previous transaction.");
+            }
+            if (pendingLocationsAdded == EMPTY_TABLE_LOCATION_KEYS) {
+                pendingLocationsAdded = new HashSet<>();
             }
-            pendingLocationKeys.add(tableLocationKey);
+            manage(tableLocationKey);
+            pendingLocationsAdded.add(tableLocationKey);
         }
     }
 
     @Override
-    public void handleTableLocationKeyRemoved(@NotNull final ImmutableTableLocationKey tableLocationKey) {
+    public void handleTableLocationKeyRemoved(@NotNull final LiveSupplier<ImmutableTableLocationKey> tableLocationKey) {
         synchronized (updateLock) {
-            // If we remove something that was pending to be added, just discard both.
-            if (pendingLocationKeys.remove(tableLocationKey)) {
+            // If we have a pending add, it is being cancelled by this remove.
+            if (pendingLocationsAdded.remove(tableLocationKey)) {
                 return;
             }
-
+            // Verify that we don't have stacked removes (without intervening adds).
+            if (pendingLocationsRemoved.contains(tableLocationKey)) {
+                throw new IllegalStateException("TableLocationKey " + tableLocationKey
+                        + " was already removed and has not been replaced.");
+            }
             if (pendingLocationsRemoved == EMPTY_TABLE_LOCATION_KEYS) {
                 pendingLocationsRemoved = new HashSet<>();
             }
+            manage(tableLocationKey);
             pendingLocationsRemoved.add(tableLocationKey);
         }
     }
 
+    @Override
+    public void handleTableLocationKeysUpdate(
+            @Nullable Collection<LiveSupplier<ImmutableTableLocationKey>> addedKeys,
+            @Nullable Collection<LiveSupplier<ImmutableTableLocationKey>> removedKeys) {
+        synchronized (updateLock) {
+            if (removedKeys != null) {
+                for (final LiveSupplier<ImmutableTableLocationKey> removedTableLocationKey : removedKeys) {
+                    // If we have a pending add, it is being cancelled by this remove.
+                    if (pendingLocationsAdded.remove(removedTableLocationKey)) {
+                        continue;
+                    }
+                    // Verify that we don't have stacked removes.
+                    if (pendingLocationsRemoved.contains(removedTableLocationKey)) {
+                        throw new IllegalStateException("TableLocationKey " + removedTableLocationKey
+                                + " was already removed and has not been replaced.");
+                    }
+                    if (pendingLocationsRemoved == EMPTY_TABLE_LOCATION_KEYS) {
+                        pendingLocationsRemoved = new HashSet<>();
+                    }
+                    manage(removedTableLocationKey);
+                    pendingLocationsRemoved.add(removedTableLocationKey);
+                }
+            }
+            if (addedKeys != null) {
+                for (final LiveSupplier<ImmutableTableLocationKey> addedTableLocationKey : addedKeys) {
+                    // Need to verify that we don't have stacked adds.
+                    if (pendingLocationsAdded.contains(addedTableLocationKey)) {
+                        throw new IllegalStateException("TableLocationKey " + addedTableLocationKey
+                                + " was already added by a previous transaction.");
+                    }
+                    if (pendingLocationsAdded == EMPTY_TABLE_LOCATION_KEYS) {
+                        pendingLocationsAdded = new HashSet<>();
+                    }
+                    manage(addedTableLocationKey);
+                    pendingLocationsAdded.add(addedTableLocationKey);
+                }
+            }
+        }
+    }
+
     @Override
     public void handleException(@NotNull final TableDataException exception) {
         synchronized (updateLock) {
diff --git a/engine/table/src/main/java/io/deephaven/engine/table/impl/locations/impl/TableLocationUpdateSubscriptionBuffer.java b/engine/table/src/main/java/io/deephaven/engine/table/impl/locations/impl/TableLocationUpdateSubscriptionBuffer.java
index 0422d3d703d..a0777bd362a 100644
--- a/engine/table/src/main/java/io/deephaven/engine/table/impl/locations/impl/TableLocationUpdateSubscriptionBuffer.java
+++ b/engine/table/src/main/java/io/deephaven/engine/table/impl/locations/impl/TableLocationUpdateSubscriptionBuffer.java
@@ -40,7 +40,7 @@ public synchronized boolean processPending() {
             if (tableLocation.supportsSubscriptions()) {
                 tableLocation.subscribe(this);
             } else {
-                // NB: Locations that don't support subscriptions don't tick - this single call to run is
+                // NB: Locations that don't support subscriptions don't tick - this single call to refresh is
                 // sufficient.
                 tableLocation.refresh();
                 handleUpdate();
diff --git a/engine/table/src/main/java/io/deephaven/engine/table/impl/locations/local/FileTableLocationKey.java b/engine/table/src/main/java/io/deephaven/engine/table/impl/locations/local/FileTableLocationKey.java
index 251a1874277..516542396e4 100644
--- a/engine/table/src/main/java/io/deephaven/engine/table/impl/locations/local/FileTableLocationKey.java
+++ b/engine/table/src/main/java/io/deephaven/engine/table/impl/locations/local/FileTableLocationKey.java
@@ -66,10 +66,11 @@ public String toString() {
     }
 
     /**
-     * Precedence-wise this implementation compares {@code order}, then applies a {@link PartitionsComparator} to
-     * {@code partitions}, then compares {@code file}.
-     *
-     * @inheritDoc
+     * When comparing with another {@link FileTableLocationKey}, precedence-wise this implementation compares
+     * {@code order}, then applies a {@link PartitionsComparator} to {@code partitions}, then compares {@code file}.
+     * Otherwise, it delegates to parent class.
+     * <p>
+     * {@inheritDoc}
      */
     @Override
     public int compareTo(@NotNull final TableLocationKey other) {
@@ -86,7 +87,7 @@ public int compareTo(@NotNull final TableLocationKey other) {
             }
             return file.compareTo(otherTyped.file);
         }
-        throw new ClassCastException("Cannot compare " + getClass() + " to " + other.getClass());
+        return super.compareTo(other);
     }
 
     @Override
diff --git a/engine/table/src/main/java/io/deephaven/engine/table/impl/locations/local/URIStreamKeyValuePartitionLayout.java b/engine/table/src/main/java/io/deephaven/engine/table/impl/locations/local/URIStreamKeyValuePartitionLayout.java
index 2defb0a762b..1fb27e1d6b4 100644
--- a/engine/table/src/main/java/io/deephaven/engine/table/impl/locations/local/URIStreamKeyValuePartitionLayout.java
+++ b/engine/table/src/main/java/io/deephaven/engine/table/impl/locations/local/URIStreamKeyValuePartitionLayout.java
@@ -90,7 +90,8 @@ protected final void findKeys(@NotNull final Stream<URI> uriStream,
         buildLocationKeys(locationTable, targetURIs, locationKeyObserver);
     }
 
-    private void getPartitions(@NotNull final URI relativePath,
+    private void getPartitions(
+            @NotNull final URI relativePath,
             @NotNull final Set<String> partitionKeys,
             @NotNull final Collection<String> partitionValues,
             @NotNull final TIntObjectMap<ColumnNameInfo> partitionColInfo,
diff --git a/engine/table/src/main/java/io/deephaven/engine/table/impl/locations/local/URITableLocationKey.java b/engine/table/src/main/java/io/deephaven/engine/table/impl/locations/local/URITableLocationKey.java
index 86f9035d463..83d4476f762 100644
--- a/engine/table/src/main/java/io/deephaven/engine/table/impl/locations/local/URITableLocationKey.java
+++ b/engine/table/src/main/java/io/deephaven/engine/table/impl/locations/local/URITableLocationKey.java
@@ -28,7 +28,7 @@ public class URITableLocationKey extends PartitionedTableLocationKey {
     private static final String IMPLEMENTATION_NAME = URITableLocationKey.class.getSimpleName();
 
     protected final URI uri;
-    private final int order;
+    protected final int order;
 
     private int cachedHashCode;
 
@@ -72,10 +72,11 @@ public String toString() {
     }
 
     /**
-     * Precedence-wise this implementation compares {@code order}, then applies a {@link PartitionsComparator} to
-     * {@code partitions}, then compares {@code uri}.
-     *
-     * @inheritDoc
+     * When comparing with another {@link URITableLocationKey}, precedence-wise this implementation compares
+     * {@code order}, then applies a {@link PartitionsComparator} to {@code partitions}, then compares {@code uri}.
+     * Otherwise, it delegates to parent class.
+     * <p>
+     * {@inheritDoc}
      */
     @Override
     public int compareTo(@NotNull final TableLocationKey other) {
@@ -92,7 +93,7 @@ public int compareTo(@NotNull final TableLocationKey other) {
             }
             return uri.compareTo(otherTyped.uri);
         }
-        throw new ClassCastException("Cannot compare " + getClass() + " to " + other.getClass());
+        return super.compareTo(other);
     }
 
     @Override
diff --git a/engine/table/src/main/java/io/deephaven/engine/table/impl/locations/util/ExecutorTableDataRefreshService.java b/engine/table/src/main/java/io/deephaven/engine/table/impl/locations/util/ExecutorTableDataRefreshService.java
index 8c4e016607c..87fa75bccfa 100644
--- a/engine/table/src/main/java/io/deephaven/engine/table/impl/locations/util/ExecutorTableDataRefreshService.java
+++ b/engine/table/src/main/java/io/deephaven/engine/table/impl/locations/util/ExecutorTableDataRefreshService.java
@@ -19,7 +19,6 @@
 import java.util.concurrent.ScheduledThreadPoolExecutor;
 import java.util.concurrent.ThreadPoolExecutor;
 import java.util.concurrent.TimeUnit;
-import java.util.concurrent.atomic.AtomicInteger;
 
 /**
  * {@link TableDataRefreshService} implementation that uses a {@link ScheduledThreadPoolExecutor}.
@@ -29,8 +28,8 @@ public class ExecutorTableDataRefreshService implements TableDataRefreshService
     private static final String NAME_PREFIX = "TableDataRefreshService-";
 
     private final String name;
-    private final long tableLocationProviderRefreshIntervalMillis;
-    private final long tableLocationRefreshIntervalMillis;
+    private final long tableLocationProviderDefaultRefreshIntervalMillis;
+    private final long tableLocationDefaultRefreshIntervalMillis;
 
     private final ScheduledThreadPoolExecutor scheduler;
 
@@ -44,9 +43,10 @@ public ExecutorTableDataRefreshService(@NotNull final String name,
             final long tableLocationRefreshIntervalMillis,
             final int threadPoolSize) {
         this.name = Require.neqNull(name, "name");
-        this.tableLocationProviderRefreshIntervalMillis = Require.gtZero(tableLocationProviderRefreshIntervalMillis,
-                "tableLocationProviderRefreshIntervalMillis");
-        this.tableLocationRefreshIntervalMillis =
+        this.tableLocationProviderDefaultRefreshIntervalMillis =
+                Require.gtZero(tableLocationProviderRefreshIntervalMillis,
+                        "tableLocationProviderRefreshIntervalMillis");
+        this.tableLocationDefaultRefreshIntervalMillis =
                 Require.gtZero(tableLocationRefreshIntervalMillis, "tableLocationRefreshIntervalMillis");
 
         NamingThreadFactory threadFactory = new NamingThreadFactory(TableDataRefreshService.class, "refreshThread");
@@ -76,7 +76,8 @@ private abstract class ScheduledSubscriptionTask<TYPE extends SubscriptionAggreg
 
         private volatile boolean firstInvocation = true;
 
-        private ScheduledSubscriptionTask(@NotNull final TYPE subscriptionAggregator,
+        private ScheduledSubscriptionTask(
+                @NotNull final TYPE subscriptionAggregator,
                 final long refreshIntervalMillis) {
             this.subscriptionAggregator = subscriptionAggregator;
             future = scheduler.scheduleAtFixedRate(this::doRefresh, 0, refreshIntervalMillis, TimeUnit.MILLISECONDS);
@@ -110,8 +111,10 @@ public void cancel() {
     private class ScheduledTableLocationProviderRefresh
             extends ScheduledSubscriptionTask<AbstractTableLocationProvider> {
 
-        private ScheduledTableLocationProviderRefresh(@NotNull AbstractTableLocationProvider tableLocationProvider) {
-            super(tableLocationProvider, tableLocationProviderRefreshIntervalMillis);
+        private ScheduledTableLocationProviderRefresh(
+                @NotNull final AbstractTableLocationProvider tableLocationProvider,
+                final long refreshIntervalMillis) {
+            super(tableLocationProvider, refreshIntervalMillis);
             providerSubscriptions.increment(1);
         }
 
@@ -131,8 +134,10 @@ public void cancel() {
 
     private class ScheduledTableLocationRefresh extends ScheduledSubscriptionTask<AbstractTableLocation> {
 
-        private ScheduledTableLocationRefresh(@NotNull AbstractTableLocation tableLocation) {
-            super(tableLocation, tableLocationRefreshIntervalMillis);
+        private ScheduledTableLocationRefresh(
+                @NotNull final AbstractTableLocation tableLocation,
+                final long refreshIntervalMillis) {
+            super(tableLocation, refreshIntervalMillis);
             locationSubscriptions.increment(1);
         }
 
@@ -153,12 +158,27 @@ public void cancel() {
     @Override
     public CancellableSubscriptionToken scheduleTableLocationProviderRefresh(
             @NotNull final AbstractTableLocationProvider tableLocationProvider) {
-        return new ScheduledTableLocationProviderRefresh(tableLocationProvider);
+        return scheduleTableLocationProviderRefresh(tableLocationProvider,
+                tableLocationProviderDefaultRefreshIntervalMillis);
+    }
+
+    @Override
+    public CancellableSubscriptionToken scheduleTableLocationProviderRefresh(
+            @NotNull final AbstractTableLocationProvider tableLocationProvider,
+            final long refreshIntervalMillis) {
+        return new ScheduledTableLocationProviderRefresh(tableLocationProvider, refreshIntervalMillis);
     }
 
     @Override
     public CancellableSubscriptionToken scheduleTableLocationRefresh(
             @NotNull final AbstractTableLocation tableLocation) {
-        return new ScheduledTableLocationRefresh(tableLocation);
+        return scheduleTableLocationRefresh(tableLocation, tableLocationDefaultRefreshIntervalMillis);
+    }
+
+    @Override
+    public CancellableSubscriptionToken scheduleTableLocationRefresh(
+            @NotNull final AbstractTableLocation tableLocation,
+            final long refreshIntervalMillis) {
+        return new ScheduledTableLocationRefresh(tableLocation, refreshIntervalMillis);
     }
 }
diff --git a/engine/table/src/main/java/io/deephaven/engine/table/impl/locations/util/TableDataRefreshService.java b/engine/table/src/main/java/io/deephaven/engine/table/impl/locations/util/TableDataRefreshService.java
index c6b823c3139..dbdb942282d 100644
--- a/engine/table/src/main/java/io/deephaven/engine/table/impl/locations/util/TableDataRefreshService.java
+++ b/engine/table/src/main/java/io/deephaven/engine/table/impl/locations/util/TableDataRefreshService.java
@@ -32,7 +32,7 @@ interface CancellableSubscriptionToken {
     void submitOneTimeAsyncTask(@NotNull Runnable task);
 
     /**
-     * Schedule run for an AbstractTableLocationProvider.
+     * Schedule run for an AbstractTableLocationProvider using an implementation-defined default refresh interval
      *
      * @param tableLocationProvider The table location provider
      * @return A subscription token to be used for matching, which also supports cancellation
@@ -41,13 +41,35 @@ CancellableSubscriptionToken scheduleTableLocationProviderRefresh(
             @NotNull AbstractTableLocationProvider tableLocationProvider);
 
     /**
-     * Schedule run for an AbstractTableLocation.
+     * Schedule run for an AbstractTableLocationProvider.
+     *
+     * @param tableLocationProvider The table location provider
+     * @param refreshIntervalMs The interval in milliseconds between refreshes
+     * @return A subscription token to be used for matching, which also supports cancellation
+     */
+    CancellableSubscriptionToken scheduleTableLocationProviderRefresh(
+            @NotNull AbstractTableLocationProvider tableLocationProvider,
+            long refreshIntervalMs);
+
+    /**
+     * Schedule run for an AbstractTableLocation using an implementation-defined default refresh interval
      *
      * @param tableLocation The table location
      * @return A subscription token to be used for matching, which also supports cancellation
      */
     CancellableSubscriptionToken scheduleTableLocationRefresh(@NotNull AbstractTableLocation tableLocation);
 
+    /**
+     * Schedule run for an AbstractTableLocation.
+     *
+     * @param tableLocation The table location
+     * @param refreshIntervalMs The interval in milliseconds between refreshes
+     * @return A subscription token to be used for matching, which also supports cancellation
+     */
+    CancellableSubscriptionToken scheduleTableLocationRefresh(
+            @NotNull AbstractTableLocation tableLocation,
+            long refreshIntervalMs);
+
     /**
      * Get (and possibly construct) a shared instance.
      *
@@ -126,10 +148,24 @@ public CancellableSubscriptionToken scheduleTableLocationProviderRefresh(
             throw new UnsupportedOperationException();
         }
 
+        @Override
+        public CancellableSubscriptionToken scheduleTableLocationProviderRefresh(
+                @NotNull final AbstractTableLocationProvider tableLocationProvider,
+                final long refreshIntervalMs) {
+            throw new UnsupportedOperationException();
+        }
+
         @Override
         public CancellableSubscriptionToken scheduleTableLocationRefresh(
                 @NotNull final AbstractTableLocation tableLocation) {
             throw new UnsupportedOperationException();
         }
+
+        @Override
+        public CancellableSubscriptionToken scheduleTableLocationRefresh(
+                @NotNull AbstractTableLocation tableLocation,
+                final long refreshIntervalMs) {
+            throw new UnsupportedOperationException();
+        }
     }
 }
diff --git a/engine/table/src/main/java/io/deephaven/engine/table/impl/multijoin/IncrementalMultiJoinStateManagerTypedBase.java b/engine/table/src/main/java/io/deephaven/engine/table/impl/multijoin/IncrementalMultiJoinStateManagerTypedBase.java
index f880dfc7f42..4d7f84d6a35 100644
--- a/engine/table/src/main/java/io/deephaven/engine/table/impl/multijoin/IncrementalMultiJoinStateManagerTypedBase.java
+++ b/engine/table/src/main/java/io/deephaven/engine/table/impl/multijoin/IncrementalMultiJoinStateManagerTypedBase.java
@@ -437,18 +437,20 @@ public boolean doRehash(boolean fullRehash, MutableInt rehashCredits, int nextCh
             return false;
         }
 
-        Assert.eqZero(rehashPointer, "rehashPointer");
-
-        if (numEntries == 0) {
-            return false;
-        }
-        newAlternate();
-        alternateTableSize = oldTableSize;
-        rehashPointer = alternateTableSize;
+        setupNewAlternate(oldTableSize);
+        adviseNewAlternate();
         return true;
     }
 
-    protected void newAlternate() {
+    /**
+     * After creating the new alternate key states, advise the derived classes, so they can cast them to the typed
+     * versions of the column source and adjust the derived class pointers.
+     */
+    protected abstract void adviseNewAlternate();
+
+    private void setupNewAlternate(int oldTableSize) {
+        Assert.eqZero(rehashPointer, "rehashPointer");
+
         alternateSlotToOutputRow = slotToOutputRow;
         slotToOutputRow = new ImmutableIntArraySource();
         slotToOutputRow.ensureCapacity(tableSize);
@@ -463,6 +465,11 @@ protected void newAlternate() {
                     alternateKeySources[ii].getType(), alternateKeySources[ii].getComponentType());
             mainKeySources[ii].ensureCapacity(tableSize);
         }
+        alternateTableSize = oldTableSize;
+
+        if (numEntries > 0) {
+            rehashPointer = alternateTableSize;
+        }
     }
 
     protected void clearAlternate() {
diff --git a/engine/table/src/main/java/io/deephaven/engine/table/impl/multijoin/typed/incopen/gen/IncrementalMultiJoinHasherByte.java b/engine/table/src/main/java/io/deephaven/engine/table/impl/multijoin/typed/incopen/gen/IncrementalMultiJoinHasherByte.java
index 437d5ac90a6..3945e8bdf71 100644
--- a/engine/table/src/main/java/io/deephaven/engine/table/impl/multijoin/typed/incopen/gen/IncrementalMultiJoinHasherByte.java
+++ b/engine/table/src/main/java/io/deephaven/engine/table/impl/multijoin/typed/incopen/gen/IncrementalMultiJoinHasherByte.java
@@ -59,12 +59,12 @@ protected void buildFromTable(RowSequence rowSequence, Chunk[] sourceKeyChunks,
             int tableLocation = firstTableLocation;
             MAIN_SEARCH: while (true) {
                 int slotValue = slotToOutputRow.getUnsafe(tableLocation);
-                if (slotValue == EMPTY_OUTPUT_ROW) {
+                if (isStateEmpty(slotValue)) {
                     final int firstAlternateTableLocation = hashToTableLocationAlternate(hash);
                     int alternateTableLocation = firstAlternateTableLocation;
                     while (alternateTableLocation < rehashPointer) {
                         slotValue = alternateSlotToOutputRow.getUnsafe(alternateTableLocation);
-                        if (slotValue == EMPTY_OUTPUT_ROW) {
+                        if (isStateEmpty(slotValue)) {
                             break;
                         } else if (eq(alternateKeySource0.getUnsafe(alternateTableLocation), k0)) {
                             if (tableRedirSource.getLong(slotValue) != NO_REDIRECTION) {
@@ -123,7 +123,7 @@ protected void remove(RowSequence rowSequence, Chunk[] sourceKeyChunks,
             boolean found = false;
             int tableLocation = firstTableLocation;
             int slotValue;
-            while ((slotValue = slotToOutputRow.getUnsafe(tableLocation)) != EMPTY_OUTPUT_ROW) {
+            while (!isStateEmpty(slotValue = slotToOutputRow.getUnsafe(tableLocation))) {
                 if (eq(mainKeySource0.getUnsafe(tableLocation), k0)) {
                     final long mappedRowKey = tableRedirSource.getUnsafe(slotValue);
                     tableRedirSource.set(slotValue, NO_REDIRECTION);
@@ -141,7 +141,7 @@ protected void remove(RowSequence rowSequence, Chunk[] sourceKeyChunks,
                 boolean alternateFound = false;
                 if (firstAlternateTableLocation < rehashPointer) {
                     int alternateTableLocation = firstAlternateTableLocation;
-                    while ((slotValue = alternateSlotToOutputRow.getUnsafe(alternateTableLocation)) != EMPTY_OUTPUT_ROW) {
+                    while (!isStateEmpty(slotValue = alternateSlotToOutputRow.getUnsafe(alternateTableLocation))) {
                         if (eq(alternateKeySource0.getUnsafe(alternateTableLocation), k0)) {
                             final long mappedRowKey = tableRedirSource.getUnsafe(slotValue);
                             tableRedirSource.set(slotValue, NO_REDIRECTION);
@@ -175,7 +175,7 @@ protected void shift(RowSequence rowSequence, Chunk[] sourceKeyChunks,
             boolean found = false;
             int tableLocation = firstTableLocation;
             int slotValue;
-            while ((slotValue = slotToOutputRow.getUnsafe(tableLocation)) != EMPTY_OUTPUT_ROW) {
+            while (!isStateEmpty(slotValue = slotToOutputRow.getUnsafe(tableLocation))) {
                 if (eq(mainKeySource0.getUnsafe(tableLocation), k0)) {
                     final long mappedRowKey = tableRedirSource.getUnsafe(slotValue);
                     Assert.eq(rowKeyChunk.get(chunkPosition), "rowKey", mappedRowKey, "mappedRowKey");
@@ -193,7 +193,7 @@ protected void shift(RowSequence rowSequence, Chunk[] sourceKeyChunks,
                 boolean alternateFound = false;
                 if (firstAlternateTableLocation < rehashPointer) {
                     int alternateTableLocation = firstAlternateTableLocation;
-                    while ((slotValue = alternateSlotToOutputRow.getUnsafe(alternateTableLocation)) != EMPTY_OUTPUT_ROW) {
+                    while (!isStateEmpty(slotValue = alternateSlotToOutputRow.getUnsafe(alternateTableLocation))) {
                         if (eq(alternateKeySource0.getUnsafe(alternateTableLocation), k0)) {
                             final long mappedRowKey = tableRedirSource.getUnsafe(slotValue);
                             Assert.eq(rowKeyChunk.get(chunkPosition), "rowKey", mappedRowKey, "mappedRowKey");
@@ -226,7 +226,7 @@ protected void modify(RowSequence rowSequence, Chunk[] sourceKeyChunks,
             boolean found = false;
             int tableLocation = firstTableLocation;
             int slotValue;
-            while ((slotValue = slotToOutputRow.getUnsafe(tableLocation)) != EMPTY_OUTPUT_ROW) {
+            while (!isStateEmpty(slotValue = slotToOutputRow.getUnsafe(tableLocation))) {
                 if (eq(mainKeySource0.getUnsafe(tableLocation), k0)) {
                     final long cookie = mainModifiedTrackerCookieSource.getUnsafe(tableLocation);
                     mainModifiedTrackerCookieSource.set(tableLocation, modifiedSlotTracker.modifySlot(cookie, slotValue, tableNumber, trackerFlag));
@@ -241,7 +241,7 @@ protected void modify(RowSequence rowSequence, Chunk[] sourceKeyChunks,
                 boolean alternateFound = false;
                 if (firstAlternateTableLocation < rehashPointer) {
                     int alternateTableLocation = firstAlternateTableLocation;
-                    while ((slotValue = alternateSlotToOutputRow.getUnsafe(alternateTableLocation)) != EMPTY_OUTPUT_ROW) {
+                    while (!isStateEmpty(slotValue = alternateSlotToOutputRow.getUnsafe(alternateTableLocation))) {
                         if (eq(alternateKeySource0.getUnsafe(alternateTableLocation), k0)) {
                             final long cookie = alternateModifiedTrackerCookieSource.getUnsafe(alternateTableLocation);
                             alternateModifiedTrackerCookieSource.set(alternateTableLocation, modifiedSlotTracker.modifySlot(cookie, slotValue, tableNumber, trackerFlag));
@@ -264,15 +264,19 @@ private static int hash(byte k0) {
         return hash;
     }
 
+    private static boolean isStateEmpty(int state) {
+        return state == EMPTY_OUTPUT_ROW;
+    }
+
     private boolean migrateOneLocation(int locationToMigrate) {
         final int currentStateValue = alternateSlotToOutputRow.getUnsafe(locationToMigrate);
-        if (currentStateValue == EMPTY_OUTPUT_ROW) {
+        if (isStateEmpty(currentStateValue)) {
             return false;
         }
         final byte k0 = alternateKeySource0.getUnsafe(locationToMigrate);
         final int hash = hash(k0);
         int destinationTableLocation = hashToTableLocation(hash);
-        while (slotToOutputRow.getUnsafe(destinationTableLocation) != EMPTY_OUTPUT_ROW) {
+        while (!isStateEmpty(slotToOutputRow.getUnsafe(destinationTableLocation))) {
             destinationTableLocation = nextTableLocation(destinationTableLocation);
         }
         mainKeySource0.set(destinationTableLocation, k0);
@@ -296,8 +300,7 @@ protected int rehashInternalPartial(int entriesToRehash) {
     }
 
     @Override
-    protected void newAlternate() {
-        super.newAlternate();
+    protected void adviseNewAlternate() {
         this.mainKeySource0 = (ImmutableByteArraySource)super.mainKeySources[0];
         this.alternateKeySource0 = (ImmutableByteArraySource)super.alternateKeySources[0];
     }
@@ -311,7 +314,7 @@ protected void clearAlternate() {
     @Override
     protected void migrateFront() {
         int location = 0;
-        while (migrateOneLocation(location++));
+        while (migrateOneLocation(location++) && location < alternateTableSize);
     }
 
     @Override
@@ -328,7 +331,7 @@ protected void rehashInternalFull(final int oldSize) {
         mainModifiedTrackerCookieSource.setArray(destModifiedCookie);
         for (int sourceBucket = 0; sourceBucket < oldSize; ++sourceBucket) {
             final int currentStateValue = originalStateArray[sourceBucket];
-            if (currentStateValue == EMPTY_OUTPUT_ROW) {
+            if (isStateEmpty(currentStateValue)) {
                 continue;
             }
             final byte k0 = originalKeyArray0[sourceBucket];
@@ -336,7 +339,7 @@ protected void rehashInternalFull(final int oldSize) {
             final int firstDestinationTableLocation = hashToTableLocation(hash);
             int destinationTableLocation = firstDestinationTableLocation;
             while (true) {
-                if (destState[destinationTableLocation] == EMPTY_OUTPUT_ROW) {
+                if (isStateEmpty(destState[destinationTableLocation])) {
                     destKeyArray0[destinationTableLocation] = k0;
                     destState[destinationTableLocation] = originalStateArray[sourceBucket];
                     destModifiedCookie[destinationTableLocation] = oldModifiedCookie[sourceBucket];
diff --git a/engine/table/src/main/java/io/deephaven/engine/table/impl/multijoin/typed/incopen/gen/IncrementalMultiJoinHasherChar.java b/engine/table/src/main/java/io/deephaven/engine/table/impl/multijoin/typed/incopen/gen/IncrementalMultiJoinHasherChar.java
index d9811cf8173..7b7f2c3273f 100644
--- a/engine/table/src/main/java/io/deephaven/engine/table/impl/multijoin/typed/incopen/gen/IncrementalMultiJoinHasherChar.java
+++ b/engine/table/src/main/java/io/deephaven/engine/table/impl/multijoin/typed/incopen/gen/IncrementalMultiJoinHasherChar.java
@@ -59,12 +59,12 @@ protected void buildFromTable(RowSequence rowSequence, Chunk[] sourceKeyChunks,
             int tableLocation = firstTableLocation;
             MAIN_SEARCH: while (true) {
                 int slotValue = slotToOutputRow.getUnsafe(tableLocation);
-                if (slotValue == EMPTY_OUTPUT_ROW) {
+                if (isStateEmpty(slotValue)) {
                     final int firstAlternateTableLocation = hashToTableLocationAlternate(hash);
                     int alternateTableLocation = firstAlternateTableLocation;
                     while (alternateTableLocation < rehashPointer) {
                         slotValue = alternateSlotToOutputRow.getUnsafe(alternateTableLocation);
-                        if (slotValue == EMPTY_OUTPUT_ROW) {
+                        if (isStateEmpty(slotValue)) {
                             break;
                         } else if (eq(alternateKeySource0.getUnsafe(alternateTableLocation), k0)) {
                             if (tableRedirSource.getLong(slotValue) != NO_REDIRECTION) {
@@ -123,7 +123,7 @@ protected void remove(RowSequence rowSequence, Chunk[] sourceKeyChunks,
             boolean found = false;
             int tableLocation = firstTableLocation;
             int slotValue;
-            while ((slotValue = slotToOutputRow.getUnsafe(tableLocation)) != EMPTY_OUTPUT_ROW) {
+            while (!isStateEmpty(slotValue = slotToOutputRow.getUnsafe(tableLocation))) {
                 if (eq(mainKeySource0.getUnsafe(tableLocation), k0)) {
                     final long mappedRowKey = tableRedirSource.getUnsafe(slotValue);
                     tableRedirSource.set(slotValue, NO_REDIRECTION);
@@ -141,7 +141,7 @@ protected void remove(RowSequence rowSequence, Chunk[] sourceKeyChunks,
                 boolean alternateFound = false;
                 if (firstAlternateTableLocation < rehashPointer) {
                     int alternateTableLocation = firstAlternateTableLocation;
-                    while ((slotValue = alternateSlotToOutputRow.getUnsafe(alternateTableLocation)) != EMPTY_OUTPUT_ROW) {
+                    while (!isStateEmpty(slotValue = alternateSlotToOutputRow.getUnsafe(alternateTableLocation))) {
                         if (eq(alternateKeySource0.getUnsafe(alternateTableLocation), k0)) {
                             final long mappedRowKey = tableRedirSource.getUnsafe(slotValue);
                             tableRedirSource.set(slotValue, NO_REDIRECTION);
@@ -175,7 +175,7 @@ protected void shift(RowSequence rowSequence, Chunk[] sourceKeyChunks,
             boolean found = false;
             int tableLocation = firstTableLocation;
             int slotValue;
-            while ((slotValue = slotToOutputRow.getUnsafe(tableLocation)) != EMPTY_OUTPUT_ROW) {
+            while (!isStateEmpty(slotValue = slotToOutputRow.getUnsafe(tableLocation))) {
                 if (eq(mainKeySource0.getUnsafe(tableLocation), k0)) {
                     final long mappedRowKey = tableRedirSource.getUnsafe(slotValue);
                     Assert.eq(rowKeyChunk.get(chunkPosition), "rowKey", mappedRowKey, "mappedRowKey");
@@ -193,7 +193,7 @@ protected void shift(RowSequence rowSequence, Chunk[] sourceKeyChunks,
                 boolean alternateFound = false;
                 if (firstAlternateTableLocation < rehashPointer) {
                     int alternateTableLocation = firstAlternateTableLocation;
-                    while ((slotValue = alternateSlotToOutputRow.getUnsafe(alternateTableLocation)) != EMPTY_OUTPUT_ROW) {
+                    while (!isStateEmpty(slotValue = alternateSlotToOutputRow.getUnsafe(alternateTableLocation))) {
                         if (eq(alternateKeySource0.getUnsafe(alternateTableLocation), k0)) {
                             final long mappedRowKey = tableRedirSource.getUnsafe(slotValue);
                             Assert.eq(rowKeyChunk.get(chunkPosition), "rowKey", mappedRowKey, "mappedRowKey");
@@ -226,7 +226,7 @@ protected void modify(RowSequence rowSequence, Chunk[] sourceKeyChunks,
             boolean found = false;
             int tableLocation = firstTableLocation;
             int slotValue;
-            while ((slotValue = slotToOutputRow.getUnsafe(tableLocation)) != EMPTY_OUTPUT_ROW) {
+            while (!isStateEmpty(slotValue = slotToOutputRow.getUnsafe(tableLocation))) {
                 if (eq(mainKeySource0.getUnsafe(tableLocation), k0)) {
                     final long cookie = mainModifiedTrackerCookieSource.getUnsafe(tableLocation);
                     mainModifiedTrackerCookieSource.set(tableLocation, modifiedSlotTracker.modifySlot(cookie, slotValue, tableNumber, trackerFlag));
@@ -241,7 +241,7 @@ protected void modify(RowSequence rowSequence, Chunk[] sourceKeyChunks,
                 boolean alternateFound = false;
                 if (firstAlternateTableLocation < rehashPointer) {
                     int alternateTableLocation = firstAlternateTableLocation;
-                    while ((slotValue = alternateSlotToOutputRow.getUnsafe(alternateTableLocation)) != EMPTY_OUTPUT_ROW) {
+                    while (!isStateEmpty(slotValue = alternateSlotToOutputRow.getUnsafe(alternateTableLocation))) {
                         if (eq(alternateKeySource0.getUnsafe(alternateTableLocation), k0)) {
                             final long cookie = alternateModifiedTrackerCookieSource.getUnsafe(alternateTableLocation);
                             alternateModifiedTrackerCookieSource.set(alternateTableLocation, modifiedSlotTracker.modifySlot(cookie, slotValue, tableNumber, trackerFlag));
@@ -264,15 +264,19 @@ private static int hash(char k0) {
         return hash;
     }
 
+    private static boolean isStateEmpty(int state) {
+        return state == EMPTY_OUTPUT_ROW;
+    }
+
     private boolean migrateOneLocation(int locationToMigrate) {
         final int currentStateValue = alternateSlotToOutputRow.getUnsafe(locationToMigrate);
-        if (currentStateValue == EMPTY_OUTPUT_ROW) {
+        if (isStateEmpty(currentStateValue)) {
             return false;
         }
         final char k0 = alternateKeySource0.getUnsafe(locationToMigrate);
         final int hash = hash(k0);
         int destinationTableLocation = hashToTableLocation(hash);
-        while (slotToOutputRow.getUnsafe(destinationTableLocation) != EMPTY_OUTPUT_ROW) {
+        while (!isStateEmpty(slotToOutputRow.getUnsafe(destinationTableLocation))) {
             destinationTableLocation = nextTableLocation(destinationTableLocation);
         }
         mainKeySource0.set(destinationTableLocation, k0);
@@ -296,8 +300,7 @@ protected int rehashInternalPartial(int entriesToRehash) {
     }
 
     @Override
-    protected void newAlternate() {
-        super.newAlternate();
+    protected void adviseNewAlternate() {
         this.mainKeySource0 = (ImmutableCharArraySource)super.mainKeySources[0];
         this.alternateKeySource0 = (ImmutableCharArraySource)super.alternateKeySources[0];
     }
@@ -311,7 +314,7 @@ protected void clearAlternate() {
     @Override
     protected void migrateFront() {
         int location = 0;
-        while (migrateOneLocation(location++));
+        while (migrateOneLocation(location++) && location < alternateTableSize);
     }
 
     @Override
@@ -328,7 +331,7 @@ protected void rehashInternalFull(final int oldSize) {
         mainModifiedTrackerCookieSource.setArray(destModifiedCookie);
         for (int sourceBucket = 0; sourceBucket < oldSize; ++sourceBucket) {
             final int currentStateValue = originalStateArray[sourceBucket];
-            if (currentStateValue == EMPTY_OUTPUT_ROW) {
+            if (isStateEmpty(currentStateValue)) {
                 continue;
             }
             final char k0 = originalKeyArray0[sourceBucket];
@@ -336,7 +339,7 @@ protected void rehashInternalFull(final int oldSize) {
             final int firstDestinationTableLocation = hashToTableLocation(hash);
             int destinationTableLocation = firstDestinationTableLocation;
             while (true) {
-                if (destState[destinationTableLocation] == EMPTY_OUTPUT_ROW) {
+                if (isStateEmpty(destState[destinationTableLocation])) {
                     destKeyArray0[destinationTableLocation] = k0;
                     destState[destinationTableLocation] = originalStateArray[sourceBucket];
                     destModifiedCookie[destinationTableLocation] = oldModifiedCookie[sourceBucket];
diff --git a/engine/table/src/main/java/io/deephaven/engine/table/impl/multijoin/typed/incopen/gen/IncrementalMultiJoinHasherDouble.java b/engine/table/src/main/java/io/deephaven/engine/table/impl/multijoin/typed/incopen/gen/IncrementalMultiJoinHasherDouble.java
index 4752db90386..0a005d10fd0 100644
--- a/engine/table/src/main/java/io/deephaven/engine/table/impl/multijoin/typed/incopen/gen/IncrementalMultiJoinHasherDouble.java
+++ b/engine/table/src/main/java/io/deephaven/engine/table/impl/multijoin/typed/incopen/gen/IncrementalMultiJoinHasherDouble.java
@@ -59,12 +59,12 @@ protected void buildFromTable(RowSequence rowSequence, Chunk[] sourceKeyChunks,
             int tableLocation = firstTableLocation;
             MAIN_SEARCH: while (true) {
                 int slotValue = slotToOutputRow.getUnsafe(tableLocation);
-                if (slotValue == EMPTY_OUTPUT_ROW) {
+                if (isStateEmpty(slotValue)) {
                     final int firstAlternateTableLocation = hashToTableLocationAlternate(hash);
                     int alternateTableLocation = firstAlternateTableLocation;
                     while (alternateTableLocation < rehashPointer) {
                         slotValue = alternateSlotToOutputRow.getUnsafe(alternateTableLocation);
-                        if (slotValue == EMPTY_OUTPUT_ROW) {
+                        if (isStateEmpty(slotValue)) {
                             break;
                         } else if (eq(alternateKeySource0.getUnsafe(alternateTableLocation), k0)) {
                             if (tableRedirSource.getLong(slotValue) != NO_REDIRECTION) {
@@ -123,7 +123,7 @@ protected void remove(RowSequence rowSequence, Chunk[] sourceKeyChunks,
             boolean found = false;
             int tableLocation = firstTableLocation;
             int slotValue;
-            while ((slotValue = slotToOutputRow.getUnsafe(tableLocation)) != EMPTY_OUTPUT_ROW) {
+            while (!isStateEmpty(slotValue = slotToOutputRow.getUnsafe(tableLocation))) {
                 if (eq(mainKeySource0.getUnsafe(tableLocation), k0)) {
                     final long mappedRowKey = tableRedirSource.getUnsafe(slotValue);
                     tableRedirSource.set(slotValue, NO_REDIRECTION);
@@ -141,7 +141,7 @@ protected void remove(RowSequence rowSequence, Chunk[] sourceKeyChunks,
                 boolean alternateFound = false;
                 if (firstAlternateTableLocation < rehashPointer) {
                     int alternateTableLocation = firstAlternateTableLocation;
-                    while ((slotValue = alternateSlotToOutputRow.getUnsafe(alternateTableLocation)) != EMPTY_OUTPUT_ROW) {
+                    while (!isStateEmpty(slotValue = alternateSlotToOutputRow.getUnsafe(alternateTableLocation))) {
                         if (eq(alternateKeySource0.getUnsafe(alternateTableLocation), k0)) {
                             final long mappedRowKey = tableRedirSource.getUnsafe(slotValue);
                             tableRedirSource.set(slotValue, NO_REDIRECTION);
@@ -175,7 +175,7 @@ protected void shift(RowSequence rowSequence, Chunk[] sourceKeyChunks,
             boolean found = false;
             int tableLocation = firstTableLocation;
             int slotValue;
-            while ((slotValue = slotToOutputRow.getUnsafe(tableLocation)) != EMPTY_OUTPUT_ROW) {
+            while (!isStateEmpty(slotValue = slotToOutputRow.getUnsafe(tableLocation))) {
                 if (eq(mainKeySource0.getUnsafe(tableLocation), k0)) {
                     final long mappedRowKey = tableRedirSource.getUnsafe(slotValue);
                     Assert.eq(rowKeyChunk.get(chunkPosition), "rowKey", mappedRowKey, "mappedRowKey");
@@ -193,7 +193,7 @@ protected void shift(RowSequence rowSequence, Chunk[] sourceKeyChunks,
                 boolean alternateFound = false;
                 if (firstAlternateTableLocation < rehashPointer) {
                     int alternateTableLocation = firstAlternateTableLocation;
-                    while ((slotValue = alternateSlotToOutputRow.getUnsafe(alternateTableLocation)) != EMPTY_OUTPUT_ROW) {
+                    while (!isStateEmpty(slotValue = alternateSlotToOutputRow.getUnsafe(alternateTableLocation))) {
                         if (eq(alternateKeySource0.getUnsafe(alternateTableLocation), k0)) {
                             final long mappedRowKey = tableRedirSource.getUnsafe(slotValue);
                             Assert.eq(rowKeyChunk.get(chunkPosition), "rowKey", mappedRowKey, "mappedRowKey");
@@ -226,7 +226,7 @@ protected void modify(RowSequence rowSequence, Chunk[] sourceKeyChunks,
             boolean found = false;
             int tableLocation = firstTableLocation;
             int slotValue;
-            while ((slotValue = slotToOutputRow.getUnsafe(tableLocation)) != EMPTY_OUTPUT_ROW) {
+            while (!isStateEmpty(slotValue = slotToOutputRow.getUnsafe(tableLocation))) {
                 if (eq(mainKeySource0.getUnsafe(tableLocation), k0)) {
                     final long cookie = mainModifiedTrackerCookieSource.getUnsafe(tableLocation);
                     mainModifiedTrackerCookieSource.set(tableLocation, modifiedSlotTracker.modifySlot(cookie, slotValue, tableNumber, trackerFlag));
@@ -241,7 +241,7 @@ protected void modify(RowSequence rowSequence, Chunk[] sourceKeyChunks,
                 boolean alternateFound = false;
                 if (firstAlternateTableLocation < rehashPointer) {
                     int alternateTableLocation = firstAlternateTableLocation;
-                    while ((slotValue = alternateSlotToOutputRow.getUnsafe(alternateTableLocation)) != EMPTY_OUTPUT_ROW) {
+                    while (!isStateEmpty(slotValue = alternateSlotToOutputRow.getUnsafe(alternateTableLocation))) {
                         if (eq(alternateKeySource0.getUnsafe(alternateTableLocation), k0)) {
                             final long cookie = alternateModifiedTrackerCookieSource.getUnsafe(alternateTableLocation);
                             alternateModifiedTrackerCookieSource.set(alternateTableLocation, modifiedSlotTracker.modifySlot(cookie, slotValue, tableNumber, trackerFlag));
@@ -264,15 +264,19 @@ private static int hash(double k0) {
         return hash;
     }
 
+    private static boolean isStateEmpty(int state) {
+        return state == EMPTY_OUTPUT_ROW;
+    }
+
     private boolean migrateOneLocation(int locationToMigrate) {
         final int currentStateValue = alternateSlotToOutputRow.getUnsafe(locationToMigrate);
-        if (currentStateValue == EMPTY_OUTPUT_ROW) {
+        if (isStateEmpty(currentStateValue)) {
             return false;
         }
         final double k0 = alternateKeySource0.getUnsafe(locationToMigrate);
         final int hash = hash(k0);
         int destinationTableLocation = hashToTableLocation(hash);
-        while (slotToOutputRow.getUnsafe(destinationTableLocation) != EMPTY_OUTPUT_ROW) {
+        while (!isStateEmpty(slotToOutputRow.getUnsafe(destinationTableLocation))) {
             destinationTableLocation = nextTableLocation(destinationTableLocation);
         }
         mainKeySource0.set(destinationTableLocation, k0);
@@ -296,8 +300,7 @@ protected int rehashInternalPartial(int entriesToRehash) {
     }
 
     @Override
-    protected void newAlternate() {
-        super.newAlternate();
+    protected void adviseNewAlternate() {
         this.mainKeySource0 = (ImmutableDoubleArraySource)super.mainKeySources[0];
         this.alternateKeySource0 = (ImmutableDoubleArraySource)super.alternateKeySources[0];
     }
@@ -311,7 +314,7 @@ protected void clearAlternate() {
     @Override
     protected void migrateFront() {
         int location = 0;
-        while (migrateOneLocation(location++));
+        while (migrateOneLocation(location++) && location < alternateTableSize);
     }
 
     @Override
@@ -328,7 +331,7 @@ protected void rehashInternalFull(final int oldSize) {
         mainModifiedTrackerCookieSource.setArray(destModifiedCookie);
         for (int sourceBucket = 0; sourceBucket < oldSize; ++sourceBucket) {
             final int currentStateValue = originalStateArray[sourceBucket];
-            if (currentStateValue == EMPTY_OUTPUT_ROW) {
+            if (isStateEmpty(currentStateValue)) {
                 continue;
             }
             final double k0 = originalKeyArray0[sourceBucket];
@@ -336,7 +339,7 @@ protected void rehashInternalFull(final int oldSize) {
             final int firstDestinationTableLocation = hashToTableLocation(hash);
             int destinationTableLocation = firstDestinationTableLocation;
             while (true) {
-                if (destState[destinationTableLocation] == EMPTY_OUTPUT_ROW) {
+                if (isStateEmpty(destState[destinationTableLocation])) {
                     destKeyArray0[destinationTableLocation] = k0;
                     destState[destinationTableLocation] = originalStateArray[sourceBucket];
                     destModifiedCookie[destinationTableLocation] = oldModifiedCookie[sourceBucket];
diff --git a/engine/table/src/main/java/io/deephaven/engine/table/impl/multijoin/typed/incopen/gen/IncrementalMultiJoinHasherFloat.java b/engine/table/src/main/java/io/deephaven/engine/table/impl/multijoin/typed/incopen/gen/IncrementalMultiJoinHasherFloat.java
index 374ccb3b9d7..fffc4a1494c 100644
--- a/engine/table/src/main/java/io/deephaven/engine/table/impl/multijoin/typed/incopen/gen/IncrementalMultiJoinHasherFloat.java
+++ b/engine/table/src/main/java/io/deephaven/engine/table/impl/multijoin/typed/incopen/gen/IncrementalMultiJoinHasherFloat.java
@@ -59,12 +59,12 @@ protected void buildFromTable(RowSequence rowSequence, Chunk[] sourceKeyChunks,
             int tableLocation = firstTableLocation;
             MAIN_SEARCH: while (true) {
                 int slotValue = slotToOutputRow.getUnsafe(tableLocation);
-                if (slotValue == EMPTY_OUTPUT_ROW) {
+                if (isStateEmpty(slotValue)) {
                     final int firstAlternateTableLocation = hashToTableLocationAlternate(hash);
                     int alternateTableLocation = firstAlternateTableLocation;
                     while (alternateTableLocation < rehashPointer) {
                         slotValue = alternateSlotToOutputRow.getUnsafe(alternateTableLocation);
-                        if (slotValue == EMPTY_OUTPUT_ROW) {
+                        if (isStateEmpty(slotValue)) {
                             break;
                         } else if (eq(alternateKeySource0.getUnsafe(alternateTableLocation), k0)) {
                             if (tableRedirSource.getLong(slotValue) != NO_REDIRECTION) {
@@ -123,7 +123,7 @@ protected void remove(RowSequence rowSequence, Chunk[] sourceKeyChunks,
             boolean found = false;
             int tableLocation = firstTableLocation;
             int slotValue;
-            while ((slotValue = slotToOutputRow.getUnsafe(tableLocation)) != EMPTY_OUTPUT_ROW) {
+            while (!isStateEmpty(slotValue = slotToOutputRow.getUnsafe(tableLocation))) {
                 if (eq(mainKeySource0.getUnsafe(tableLocation), k0)) {
                     final long mappedRowKey = tableRedirSource.getUnsafe(slotValue);
                     tableRedirSource.set(slotValue, NO_REDIRECTION);
@@ -141,7 +141,7 @@ protected void remove(RowSequence rowSequence, Chunk[] sourceKeyChunks,
                 boolean alternateFound = false;
                 if (firstAlternateTableLocation < rehashPointer) {
                     int alternateTableLocation = firstAlternateTableLocation;
-                    while ((slotValue = alternateSlotToOutputRow.getUnsafe(alternateTableLocation)) != EMPTY_OUTPUT_ROW) {
+                    while (!isStateEmpty(slotValue = alternateSlotToOutputRow.getUnsafe(alternateTableLocation))) {
                         if (eq(alternateKeySource0.getUnsafe(alternateTableLocation), k0)) {
                             final long mappedRowKey = tableRedirSource.getUnsafe(slotValue);
                             tableRedirSource.set(slotValue, NO_REDIRECTION);
@@ -175,7 +175,7 @@ protected void shift(RowSequence rowSequence, Chunk[] sourceKeyChunks,
             boolean found = false;
             int tableLocation = firstTableLocation;
             int slotValue;
-            while ((slotValue = slotToOutputRow.getUnsafe(tableLocation)) != EMPTY_OUTPUT_ROW) {
+            while (!isStateEmpty(slotValue = slotToOutputRow.getUnsafe(tableLocation))) {
                 if (eq(mainKeySource0.getUnsafe(tableLocation), k0)) {
                     final long mappedRowKey = tableRedirSource.getUnsafe(slotValue);
                     Assert.eq(rowKeyChunk.get(chunkPosition), "rowKey", mappedRowKey, "mappedRowKey");
@@ -193,7 +193,7 @@ protected void shift(RowSequence rowSequence, Chunk[] sourceKeyChunks,
                 boolean alternateFound = false;
                 if (firstAlternateTableLocation < rehashPointer) {
                     int alternateTableLocation = firstAlternateTableLocation;
-                    while ((slotValue = alternateSlotToOutputRow.getUnsafe(alternateTableLocation)) != EMPTY_OUTPUT_ROW) {
+                    while (!isStateEmpty(slotValue = alternateSlotToOutputRow.getUnsafe(alternateTableLocation))) {
                         if (eq(alternateKeySource0.getUnsafe(alternateTableLocation), k0)) {
                             final long mappedRowKey = tableRedirSource.getUnsafe(slotValue);
                             Assert.eq(rowKeyChunk.get(chunkPosition), "rowKey", mappedRowKey, "mappedRowKey");
@@ -226,7 +226,7 @@ protected void modify(RowSequence rowSequence, Chunk[] sourceKeyChunks,
             boolean found = false;
             int tableLocation = firstTableLocation;
             int slotValue;
-            while ((slotValue = slotToOutputRow.getUnsafe(tableLocation)) != EMPTY_OUTPUT_ROW) {
+            while (!isStateEmpty(slotValue = slotToOutputRow.getUnsafe(tableLocation))) {
                 if (eq(mainKeySource0.getUnsafe(tableLocation), k0)) {
                     final long cookie = mainModifiedTrackerCookieSource.getUnsafe(tableLocation);
                     mainModifiedTrackerCookieSource.set(tableLocation, modifiedSlotTracker.modifySlot(cookie, slotValue, tableNumber, trackerFlag));
@@ -241,7 +241,7 @@ protected void modify(RowSequence rowSequence, Chunk[] sourceKeyChunks,
                 boolean alternateFound = false;
                 if (firstAlternateTableLocation < rehashPointer) {
                     int alternateTableLocation = firstAlternateTableLocation;
-                    while ((slotValue = alternateSlotToOutputRow.getUnsafe(alternateTableLocation)) != EMPTY_OUTPUT_ROW) {
+                    while (!isStateEmpty(slotValue = alternateSlotToOutputRow.getUnsafe(alternateTableLocation))) {
                         if (eq(alternateKeySource0.getUnsafe(alternateTableLocation), k0)) {
                             final long cookie = alternateModifiedTrackerCookieSource.getUnsafe(alternateTableLocation);
                             alternateModifiedTrackerCookieSource.set(alternateTableLocation, modifiedSlotTracker.modifySlot(cookie, slotValue, tableNumber, trackerFlag));
@@ -264,15 +264,19 @@ private static int hash(float k0) {
         return hash;
     }
 
+    private static boolean isStateEmpty(int state) {
+        return state == EMPTY_OUTPUT_ROW;
+    }
+
     private boolean migrateOneLocation(int locationToMigrate) {
         final int currentStateValue = alternateSlotToOutputRow.getUnsafe(locationToMigrate);
-        if (currentStateValue == EMPTY_OUTPUT_ROW) {
+        if (isStateEmpty(currentStateValue)) {
             return false;
         }
         final float k0 = alternateKeySource0.getUnsafe(locationToMigrate);
         final int hash = hash(k0);
         int destinationTableLocation = hashToTableLocation(hash);
-        while (slotToOutputRow.getUnsafe(destinationTableLocation) != EMPTY_OUTPUT_ROW) {
+        while (!isStateEmpty(slotToOutputRow.getUnsafe(destinationTableLocation))) {
             destinationTableLocation = nextTableLocation(destinationTableLocation);
         }
         mainKeySource0.set(destinationTableLocation, k0);
@@ -296,8 +300,7 @@ protected int rehashInternalPartial(int entriesToRehash) {
     }
 
     @Override
-    protected void newAlternate() {
-        super.newAlternate();
+    protected void adviseNewAlternate() {
         this.mainKeySource0 = (ImmutableFloatArraySource)super.mainKeySources[0];
         this.alternateKeySource0 = (ImmutableFloatArraySource)super.alternateKeySources[0];
     }
@@ -311,7 +314,7 @@ protected void clearAlternate() {
     @Override
     protected void migrateFront() {
         int location = 0;
-        while (migrateOneLocation(location++));
+        while (migrateOneLocation(location++) && location < alternateTableSize);
     }
 
     @Override
@@ -328,7 +331,7 @@ protected void rehashInternalFull(final int oldSize) {
         mainModifiedTrackerCookieSource.setArray(destModifiedCookie);
         for (int sourceBucket = 0; sourceBucket < oldSize; ++sourceBucket) {
             final int currentStateValue = originalStateArray[sourceBucket];
-            if (currentStateValue == EMPTY_OUTPUT_ROW) {
+            if (isStateEmpty(currentStateValue)) {
                 continue;
             }
             final float k0 = originalKeyArray0[sourceBucket];
@@ -336,7 +339,7 @@ protected void rehashInternalFull(final int oldSize) {
             final int firstDestinationTableLocation = hashToTableLocation(hash);
             int destinationTableLocation = firstDestinationTableLocation;
             while (true) {
-                if (destState[destinationTableLocation] == EMPTY_OUTPUT_ROW) {
+                if (isStateEmpty(destState[destinationTableLocation])) {
                     destKeyArray0[destinationTableLocation] = k0;
                     destState[destinationTableLocation] = originalStateArray[sourceBucket];
                     destModifiedCookie[destinationTableLocation] = oldModifiedCookie[sourceBucket];
diff --git a/engine/table/src/main/java/io/deephaven/engine/table/impl/multijoin/typed/incopen/gen/IncrementalMultiJoinHasherInt.java b/engine/table/src/main/java/io/deephaven/engine/table/impl/multijoin/typed/incopen/gen/IncrementalMultiJoinHasherInt.java
index 6f36000e630..560e5f475ad 100644
--- a/engine/table/src/main/java/io/deephaven/engine/table/impl/multijoin/typed/incopen/gen/IncrementalMultiJoinHasherInt.java
+++ b/engine/table/src/main/java/io/deephaven/engine/table/impl/multijoin/typed/incopen/gen/IncrementalMultiJoinHasherInt.java
@@ -59,12 +59,12 @@ protected void buildFromTable(RowSequence rowSequence, Chunk[] sourceKeyChunks,
             int tableLocation = firstTableLocation;
             MAIN_SEARCH: while (true) {
                 int slotValue = slotToOutputRow.getUnsafe(tableLocation);
-                if (slotValue == EMPTY_OUTPUT_ROW) {
+                if (isStateEmpty(slotValue)) {
                     final int firstAlternateTableLocation = hashToTableLocationAlternate(hash);
                     int alternateTableLocation = firstAlternateTableLocation;
                     while (alternateTableLocation < rehashPointer) {
                         slotValue = alternateSlotToOutputRow.getUnsafe(alternateTableLocation);
-                        if (slotValue == EMPTY_OUTPUT_ROW) {
+                        if (isStateEmpty(slotValue)) {
                             break;
                         } else if (eq(alternateKeySource0.getUnsafe(alternateTableLocation), k0)) {
                             if (tableRedirSource.getLong(slotValue) != NO_REDIRECTION) {
@@ -123,7 +123,7 @@ protected void remove(RowSequence rowSequence, Chunk[] sourceKeyChunks,
             boolean found = false;
             int tableLocation = firstTableLocation;
             int slotValue;
-            while ((slotValue = slotToOutputRow.getUnsafe(tableLocation)) != EMPTY_OUTPUT_ROW) {
+            while (!isStateEmpty(slotValue = slotToOutputRow.getUnsafe(tableLocation))) {
                 if (eq(mainKeySource0.getUnsafe(tableLocation), k0)) {
                     final long mappedRowKey = tableRedirSource.getUnsafe(slotValue);
                     tableRedirSource.set(slotValue, NO_REDIRECTION);
@@ -141,7 +141,7 @@ protected void remove(RowSequence rowSequence, Chunk[] sourceKeyChunks,
                 boolean alternateFound = false;
                 if (firstAlternateTableLocation < rehashPointer) {
                     int alternateTableLocation = firstAlternateTableLocation;
-                    while ((slotValue = alternateSlotToOutputRow.getUnsafe(alternateTableLocation)) != EMPTY_OUTPUT_ROW) {
+                    while (!isStateEmpty(slotValue = alternateSlotToOutputRow.getUnsafe(alternateTableLocation))) {
                         if (eq(alternateKeySource0.getUnsafe(alternateTableLocation), k0)) {
                             final long mappedRowKey = tableRedirSource.getUnsafe(slotValue);
                             tableRedirSource.set(slotValue, NO_REDIRECTION);
@@ -175,7 +175,7 @@ protected void shift(RowSequence rowSequence, Chunk[] sourceKeyChunks,
             boolean found = false;
             int tableLocation = firstTableLocation;
             int slotValue;
-            while ((slotValue = slotToOutputRow.getUnsafe(tableLocation)) != EMPTY_OUTPUT_ROW) {
+            while (!isStateEmpty(slotValue = slotToOutputRow.getUnsafe(tableLocation))) {
                 if (eq(mainKeySource0.getUnsafe(tableLocation), k0)) {
                     final long mappedRowKey = tableRedirSource.getUnsafe(slotValue);
                     Assert.eq(rowKeyChunk.get(chunkPosition), "rowKey", mappedRowKey, "mappedRowKey");
@@ -193,7 +193,7 @@ protected void shift(RowSequence rowSequence, Chunk[] sourceKeyChunks,
                 boolean alternateFound = false;
                 if (firstAlternateTableLocation < rehashPointer) {
                     int alternateTableLocation = firstAlternateTableLocation;
-                    while ((slotValue = alternateSlotToOutputRow.getUnsafe(alternateTableLocation)) != EMPTY_OUTPUT_ROW) {
+                    while (!isStateEmpty(slotValue = alternateSlotToOutputRow.getUnsafe(alternateTableLocation))) {
                         if (eq(alternateKeySource0.getUnsafe(alternateTableLocation), k0)) {
                             final long mappedRowKey = tableRedirSource.getUnsafe(slotValue);
                             Assert.eq(rowKeyChunk.get(chunkPosition), "rowKey", mappedRowKey, "mappedRowKey");
@@ -226,7 +226,7 @@ protected void modify(RowSequence rowSequence, Chunk[] sourceKeyChunks,
             boolean found = false;
             int tableLocation = firstTableLocation;
             int slotValue;
-            while ((slotValue = slotToOutputRow.getUnsafe(tableLocation)) != EMPTY_OUTPUT_ROW) {
+            while (!isStateEmpty(slotValue = slotToOutputRow.getUnsafe(tableLocation))) {
                 if (eq(mainKeySource0.getUnsafe(tableLocation), k0)) {
                     final long cookie = mainModifiedTrackerCookieSource.getUnsafe(tableLocation);
                     mainModifiedTrackerCookieSource.set(tableLocation, modifiedSlotTracker.modifySlot(cookie, slotValue, tableNumber, trackerFlag));
@@ -241,7 +241,7 @@ protected void modify(RowSequence rowSequence, Chunk[] sourceKeyChunks,
                 boolean alternateFound = false;
                 if (firstAlternateTableLocation < rehashPointer) {
                     int alternateTableLocation = firstAlternateTableLocation;
-                    while ((slotValue = alternateSlotToOutputRow.getUnsafe(alternateTableLocation)) != EMPTY_OUTPUT_ROW) {
+                    while (!isStateEmpty(slotValue = alternateSlotToOutputRow.getUnsafe(alternateTableLocation))) {
                         if (eq(alternateKeySource0.getUnsafe(alternateTableLocation), k0)) {
                             final long cookie = alternateModifiedTrackerCookieSource.getUnsafe(alternateTableLocation);
                             alternateModifiedTrackerCookieSource.set(alternateTableLocation, modifiedSlotTracker.modifySlot(cookie, slotValue, tableNumber, trackerFlag));
@@ -264,15 +264,19 @@ private static int hash(int k0) {
         return hash;
     }
 
+    private static boolean isStateEmpty(int state) {
+        return state == EMPTY_OUTPUT_ROW;
+    }
+
     private boolean migrateOneLocation(int locationToMigrate) {
         final int currentStateValue = alternateSlotToOutputRow.getUnsafe(locationToMigrate);
-        if (currentStateValue == EMPTY_OUTPUT_ROW) {
+        if (isStateEmpty(currentStateValue)) {
             return false;
         }
         final int k0 = alternateKeySource0.getUnsafe(locationToMigrate);
         final int hash = hash(k0);
         int destinationTableLocation = hashToTableLocation(hash);
-        while (slotToOutputRow.getUnsafe(destinationTableLocation) != EMPTY_OUTPUT_ROW) {
+        while (!isStateEmpty(slotToOutputRow.getUnsafe(destinationTableLocation))) {
             destinationTableLocation = nextTableLocation(destinationTableLocation);
         }
         mainKeySource0.set(destinationTableLocation, k0);
@@ -296,8 +300,7 @@ protected int rehashInternalPartial(int entriesToRehash) {
     }
 
     @Override
-    protected void newAlternate() {
-        super.newAlternate();
+    protected void adviseNewAlternate() {
         this.mainKeySource0 = (ImmutableIntArraySource)super.mainKeySources[0];
         this.alternateKeySource0 = (ImmutableIntArraySource)super.alternateKeySources[0];
     }
@@ -311,7 +314,7 @@ protected void clearAlternate() {
     @Override
     protected void migrateFront() {
         int location = 0;
-        while (migrateOneLocation(location++));
+        while (migrateOneLocation(location++) && location < alternateTableSize);
     }
 
     @Override
@@ -328,7 +331,7 @@ protected void rehashInternalFull(final int oldSize) {
         mainModifiedTrackerCookieSource.setArray(destModifiedCookie);
         for (int sourceBucket = 0; sourceBucket < oldSize; ++sourceBucket) {
             final int currentStateValue = originalStateArray[sourceBucket];
-            if (currentStateValue == EMPTY_OUTPUT_ROW) {
+            if (isStateEmpty(currentStateValue)) {
                 continue;
             }
             final int k0 = originalKeyArray0[sourceBucket];
@@ -336,7 +339,7 @@ protected void rehashInternalFull(final int oldSize) {
             final int firstDestinationTableLocation = hashToTableLocation(hash);
             int destinationTableLocation = firstDestinationTableLocation;
             while (true) {
-                if (destState[destinationTableLocation] == EMPTY_OUTPUT_ROW) {
+                if (isStateEmpty(destState[destinationTableLocation])) {
                     destKeyArray0[destinationTableLocation] = k0;
                     destState[destinationTableLocation] = originalStateArray[sourceBucket];
                     destModifiedCookie[destinationTableLocation] = oldModifiedCookie[sourceBucket];
diff --git a/engine/table/src/main/java/io/deephaven/engine/table/impl/multijoin/typed/incopen/gen/IncrementalMultiJoinHasherLong.java b/engine/table/src/main/java/io/deephaven/engine/table/impl/multijoin/typed/incopen/gen/IncrementalMultiJoinHasherLong.java
index 8d6c13e6f17..980516e3b6e 100644
--- a/engine/table/src/main/java/io/deephaven/engine/table/impl/multijoin/typed/incopen/gen/IncrementalMultiJoinHasherLong.java
+++ b/engine/table/src/main/java/io/deephaven/engine/table/impl/multijoin/typed/incopen/gen/IncrementalMultiJoinHasherLong.java
@@ -58,12 +58,12 @@ protected void buildFromTable(RowSequence rowSequence, Chunk[] sourceKeyChunks,
             int tableLocation = firstTableLocation;
             MAIN_SEARCH: while (true) {
                 int slotValue = slotToOutputRow.getUnsafe(tableLocation);
-                if (slotValue == EMPTY_OUTPUT_ROW) {
+                if (isStateEmpty(slotValue)) {
                     final int firstAlternateTableLocation = hashToTableLocationAlternate(hash);
                     int alternateTableLocation = firstAlternateTableLocation;
                     while (alternateTableLocation < rehashPointer) {
                         slotValue = alternateSlotToOutputRow.getUnsafe(alternateTableLocation);
-                        if (slotValue == EMPTY_OUTPUT_ROW) {
+                        if (isStateEmpty(slotValue)) {
                             break;
                         } else if (eq(alternateKeySource0.getUnsafe(alternateTableLocation), k0)) {
                             if (tableRedirSource.getLong(slotValue) != NO_REDIRECTION) {
@@ -122,7 +122,7 @@ protected void remove(RowSequence rowSequence, Chunk[] sourceKeyChunks,
             boolean found = false;
             int tableLocation = firstTableLocation;
             int slotValue;
-            while ((slotValue = slotToOutputRow.getUnsafe(tableLocation)) != EMPTY_OUTPUT_ROW) {
+            while (!isStateEmpty(slotValue = slotToOutputRow.getUnsafe(tableLocation))) {
                 if (eq(mainKeySource0.getUnsafe(tableLocation), k0)) {
                     final long mappedRowKey = tableRedirSource.getUnsafe(slotValue);
                     tableRedirSource.set(slotValue, NO_REDIRECTION);
@@ -140,7 +140,7 @@ protected void remove(RowSequence rowSequence, Chunk[] sourceKeyChunks,
                 boolean alternateFound = false;
                 if (firstAlternateTableLocation < rehashPointer) {
                     int alternateTableLocation = firstAlternateTableLocation;
-                    while ((slotValue = alternateSlotToOutputRow.getUnsafe(alternateTableLocation)) != EMPTY_OUTPUT_ROW) {
+                    while (!isStateEmpty(slotValue = alternateSlotToOutputRow.getUnsafe(alternateTableLocation))) {
                         if (eq(alternateKeySource0.getUnsafe(alternateTableLocation), k0)) {
                             final long mappedRowKey = tableRedirSource.getUnsafe(slotValue);
                             tableRedirSource.set(slotValue, NO_REDIRECTION);
@@ -174,7 +174,7 @@ protected void shift(RowSequence rowSequence, Chunk[] sourceKeyChunks,
             boolean found = false;
             int tableLocation = firstTableLocation;
             int slotValue;
-            while ((slotValue = slotToOutputRow.getUnsafe(tableLocation)) != EMPTY_OUTPUT_ROW) {
+            while (!isStateEmpty(slotValue = slotToOutputRow.getUnsafe(tableLocation))) {
                 if (eq(mainKeySource0.getUnsafe(tableLocation), k0)) {
                     final long mappedRowKey = tableRedirSource.getUnsafe(slotValue);
                     Assert.eq(rowKeyChunk.get(chunkPosition), "rowKey", mappedRowKey, "mappedRowKey");
@@ -192,7 +192,7 @@ protected void shift(RowSequence rowSequence, Chunk[] sourceKeyChunks,
                 boolean alternateFound = false;
                 if (firstAlternateTableLocation < rehashPointer) {
                     int alternateTableLocation = firstAlternateTableLocation;
-                    while ((slotValue = alternateSlotToOutputRow.getUnsafe(alternateTableLocation)) != EMPTY_OUTPUT_ROW) {
+                    while (!isStateEmpty(slotValue = alternateSlotToOutputRow.getUnsafe(alternateTableLocation))) {
                         if (eq(alternateKeySource0.getUnsafe(alternateTableLocation), k0)) {
                             final long mappedRowKey = tableRedirSource.getUnsafe(slotValue);
                             Assert.eq(rowKeyChunk.get(chunkPosition), "rowKey", mappedRowKey, "mappedRowKey");
@@ -225,7 +225,7 @@ protected void modify(RowSequence rowSequence, Chunk[] sourceKeyChunks,
             boolean found = false;
             int tableLocation = firstTableLocation;
             int slotValue;
-            while ((slotValue = slotToOutputRow.getUnsafe(tableLocation)) != EMPTY_OUTPUT_ROW) {
+            while (!isStateEmpty(slotValue = slotToOutputRow.getUnsafe(tableLocation))) {
                 if (eq(mainKeySource0.getUnsafe(tableLocation), k0)) {
                     final long cookie = mainModifiedTrackerCookieSource.getUnsafe(tableLocation);
                     mainModifiedTrackerCookieSource.set(tableLocation, modifiedSlotTracker.modifySlot(cookie, slotValue, tableNumber, trackerFlag));
@@ -240,7 +240,7 @@ protected void modify(RowSequence rowSequence, Chunk[] sourceKeyChunks,
                 boolean alternateFound = false;
                 if (firstAlternateTableLocation < rehashPointer) {
                     int alternateTableLocation = firstAlternateTableLocation;
-                    while ((slotValue = alternateSlotToOutputRow.getUnsafe(alternateTableLocation)) != EMPTY_OUTPUT_ROW) {
+                    while (!isStateEmpty(slotValue = alternateSlotToOutputRow.getUnsafe(alternateTableLocation))) {
                         if (eq(alternateKeySource0.getUnsafe(alternateTableLocation), k0)) {
                             final long cookie = alternateModifiedTrackerCookieSource.getUnsafe(alternateTableLocation);
                             alternateModifiedTrackerCookieSource.set(alternateTableLocation, modifiedSlotTracker.modifySlot(cookie, slotValue, tableNumber, trackerFlag));
@@ -263,15 +263,19 @@ private static int hash(long k0) {
         return hash;
     }
 
+    private static boolean isStateEmpty(int state) {
+        return state == EMPTY_OUTPUT_ROW;
+    }
+
     private boolean migrateOneLocation(int locationToMigrate) {
         final int currentStateValue = alternateSlotToOutputRow.getUnsafe(locationToMigrate);
-        if (currentStateValue == EMPTY_OUTPUT_ROW) {
+        if (isStateEmpty(currentStateValue)) {
             return false;
         }
         final long k0 = alternateKeySource0.getUnsafe(locationToMigrate);
         final int hash = hash(k0);
         int destinationTableLocation = hashToTableLocation(hash);
-        while (slotToOutputRow.getUnsafe(destinationTableLocation) != EMPTY_OUTPUT_ROW) {
+        while (!isStateEmpty(slotToOutputRow.getUnsafe(destinationTableLocation))) {
             destinationTableLocation = nextTableLocation(destinationTableLocation);
         }
         mainKeySource0.set(destinationTableLocation, k0);
@@ -295,8 +299,7 @@ protected int rehashInternalPartial(int entriesToRehash) {
     }
 
     @Override
-    protected void newAlternate() {
-        super.newAlternate();
+    protected void adviseNewAlternate() {
         this.mainKeySource0 = (ImmutableLongArraySource)super.mainKeySources[0];
         this.alternateKeySource0 = (ImmutableLongArraySource)super.alternateKeySources[0];
     }
@@ -310,7 +313,7 @@ protected void clearAlternate() {
     @Override
     protected void migrateFront() {
         int location = 0;
-        while (migrateOneLocation(location++));
+        while (migrateOneLocation(location++) && location < alternateTableSize);
     }
 
     @Override
@@ -327,7 +330,7 @@ protected void rehashInternalFull(final int oldSize) {
         mainModifiedTrackerCookieSource.setArray(destModifiedCookie);
         for (int sourceBucket = 0; sourceBucket < oldSize; ++sourceBucket) {
             final int currentStateValue = originalStateArray[sourceBucket];
-            if (currentStateValue == EMPTY_OUTPUT_ROW) {
+            if (isStateEmpty(currentStateValue)) {
                 continue;
             }
             final long k0 = originalKeyArray0[sourceBucket];
@@ -335,7 +338,7 @@ protected void rehashInternalFull(final int oldSize) {
             final int firstDestinationTableLocation = hashToTableLocation(hash);
             int destinationTableLocation = firstDestinationTableLocation;
             while (true) {
-                if (destState[destinationTableLocation] == EMPTY_OUTPUT_ROW) {
+                if (isStateEmpty(destState[destinationTableLocation])) {
                     destKeyArray0[destinationTableLocation] = k0;
                     destState[destinationTableLocation] = originalStateArray[sourceBucket];
                     destModifiedCookie[destinationTableLocation] = oldModifiedCookie[sourceBucket];
diff --git a/engine/table/src/main/java/io/deephaven/engine/table/impl/multijoin/typed/incopen/gen/IncrementalMultiJoinHasherObject.java b/engine/table/src/main/java/io/deephaven/engine/table/impl/multijoin/typed/incopen/gen/IncrementalMultiJoinHasherObject.java
index e8e1257082c..59642887f39 100644
--- a/engine/table/src/main/java/io/deephaven/engine/table/impl/multijoin/typed/incopen/gen/IncrementalMultiJoinHasherObject.java
+++ b/engine/table/src/main/java/io/deephaven/engine/table/impl/multijoin/typed/incopen/gen/IncrementalMultiJoinHasherObject.java
@@ -60,12 +60,12 @@ protected void buildFromTable(RowSequence rowSequence, Chunk[] sourceKeyChunks,
             int tableLocation = firstTableLocation;
             MAIN_SEARCH: while (true) {
                 int slotValue = slotToOutputRow.getUnsafe(tableLocation);
-                if (slotValue == EMPTY_OUTPUT_ROW) {
+                if (isStateEmpty(slotValue)) {
                     final int firstAlternateTableLocation = hashToTableLocationAlternate(hash);
                     int alternateTableLocation = firstAlternateTableLocation;
                     while (alternateTableLocation < rehashPointer) {
                         slotValue = alternateSlotToOutputRow.getUnsafe(alternateTableLocation);
-                        if (slotValue == EMPTY_OUTPUT_ROW) {
+                        if (isStateEmpty(slotValue)) {
                             break;
                         } else if (eq(alternateKeySource0.getUnsafe(alternateTableLocation), k0)) {
                             if (tableRedirSource.getLong(slotValue) != NO_REDIRECTION) {
@@ -124,7 +124,7 @@ protected void remove(RowSequence rowSequence, Chunk[] sourceKeyChunks,
             boolean found = false;
             int tableLocation = firstTableLocation;
             int slotValue;
-            while ((slotValue = slotToOutputRow.getUnsafe(tableLocation)) != EMPTY_OUTPUT_ROW) {
+            while (!isStateEmpty(slotValue = slotToOutputRow.getUnsafe(tableLocation))) {
                 if (eq(mainKeySource0.getUnsafe(tableLocation), k0)) {
                     final long mappedRowKey = tableRedirSource.getUnsafe(slotValue);
                     tableRedirSource.set(slotValue, NO_REDIRECTION);
@@ -142,7 +142,7 @@ protected void remove(RowSequence rowSequence, Chunk[] sourceKeyChunks,
                 boolean alternateFound = false;
                 if (firstAlternateTableLocation < rehashPointer) {
                     int alternateTableLocation = firstAlternateTableLocation;
-                    while ((slotValue = alternateSlotToOutputRow.getUnsafe(alternateTableLocation)) != EMPTY_OUTPUT_ROW) {
+                    while (!isStateEmpty(slotValue = alternateSlotToOutputRow.getUnsafe(alternateTableLocation))) {
                         if (eq(alternateKeySource0.getUnsafe(alternateTableLocation), k0)) {
                             final long mappedRowKey = tableRedirSource.getUnsafe(slotValue);
                             tableRedirSource.set(slotValue, NO_REDIRECTION);
@@ -176,7 +176,7 @@ protected void shift(RowSequence rowSequence, Chunk[] sourceKeyChunks,
             boolean found = false;
             int tableLocation = firstTableLocation;
             int slotValue;
-            while ((slotValue = slotToOutputRow.getUnsafe(tableLocation)) != EMPTY_OUTPUT_ROW) {
+            while (!isStateEmpty(slotValue = slotToOutputRow.getUnsafe(tableLocation))) {
                 if (eq(mainKeySource0.getUnsafe(tableLocation), k0)) {
                     final long mappedRowKey = tableRedirSource.getUnsafe(slotValue);
                     Assert.eq(rowKeyChunk.get(chunkPosition), "rowKey", mappedRowKey, "mappedRowKey");
@@ -194,7 +194,7 @@ protected void shift(RowSequence rowSequence, Chunk[] sourceKeyChunks,
                 boolean alternateFound = false;
                 if (firstAlternateTableLocation < rehashPointer) {
                     int alternateTableLocation = firstAlternateTableLocation;
-                    while ((slotValue = alternateSlotToOutputRow.getUnsafe(alternateTableLocation)) != EMPTY_OUTPUT_ROW) {
+                    while (!isStateEmpty(slotValue = alternateSlotToOutputRow.getUnsafe(alternateTableLocation))) {
                         if (eq(alternateKeySource0.getUnsafe(alternateTableLocation), k0)) {
                             final long mappedRowKey = tableRedirSource.getUnsafe(slotValue);
                             Assert.eq(rowKeyChunk.get(chunkPosition), "rowKey", mappedRowKey, "mappedRowKey");
@@ -227,7 +227,7 @@ protected void modify(RowSequence rowSequence, Chunk[] sourceKeyChunks,
             boolean found = false;
             int tableLocation = firstTableLocation;
             int slotValue;
-            while ((slotValue = slotToOutputRow.getUnsafe(tableLocation)) != EMPTY_OUTPUT_ROW) {
+            while (!isStateEmpty(slotValue = slotToOutputRow.getUnsafe(tableLocation))) {
                 if (eq(mainKeySource0.getUnsafe(tableLocation), k0)) {
                     final long cookie = mainModifiedTrackerCookieSource.getUnsafe(tableLocation);
                     mainModifiedTrackerCookieSource.set(tableLocation, modifiedSlotTracker.modifySlot(cookie, slotValue, tableNumber, trackerFlag));
@@ -242,7 +242,7 @@ protected void modify(RowSequence rowSequence, Chunk[] sourceKeyChunks,
                 boolean alternateFound = false;
                 if (firstAlternateTableLocation < rehashPointer) {
                     int alternateTableLocation = firstAlternateTableLocation;
-                    while ((slotValue = alternateSlotToOutputRow.getUnsafe(alternateTableLocation)) != EMPTY_OUTPUT_ROW) {
+                    while (!isStateEmpty(slotValue = alternateSlotToOutputRow.getUnsafe(alternateTableLocation))) {
                         if (eq(alternateKeySource0.getUnsafe(alternateTableLocation), k0)) {
                             final long cookie = alternateModifiedTrackerCookieSource.getUnsafe(alternateTableLocation);
                             alternateModifiedTrackerCookieSource.set(alternateTableLocation, modifiedSlotTracker.modifySlot(cookie, slotValue, tableNumber, trackerFlag));
@@ -265,15 +265,19 @@ private static int hash(Object k0) {
         return hash;
     }
 
+    private static boolean isStateEmpty(int state) {
+        return state == EMPTY_OUTPUT_ROW;
+    }
+
     private boolean migrateOneLocation(int locationToMigrate) {
         final int currentStateValue = alternateSlotToOutputRow.getUnsafe(locationToMigrate);
-        if (currentStateValue == EMPTY_OUTPUT_ROW) {
+        if (isStateEmpty(currentStateValue)) {
             return false;
         }
         final Object k0 = alternateKeySource0.getUnsafe(locationToMigrate);
         final int hash = hash(k0);
         int destinationTableLocation = hashToTableLocation(hash);
-        while (slotToOutputRow.getUnsafe(destinationTableLocation) != EMPTY_OUTPUT_ROW) {
+        while (!isStateEmpty(slotToOutputRow.getUnsafe(destinationTableLocation))) {
             destinationTableLocation = nextTableLocation(destinationTableLocation);
         }
         mainKeySource0.set(destinationTableLocation, k0);
@@ -298,8 +302,7 @@ protected int rehashInternalPartial(int entriesToRehash) {
     }
 
     @Override
-    protected void newAlternate() {
-        super.newAlternate();
+    protected void adviseNewAlternate() {
         this.mainKeySource0 = (ImmutableObjectArraySource)super.mainKeySources[0];
         this.alternateKeySource0 = (ImmutableObjectArraySource)super.alternateKeySources[0];
     }
@@ -313,7 +316,7 @@ protected void clearAlternate() {
     @Override
     protected void migrateFront() {
         int location = 0;
-        while (migrateOneLocation(location++));
+        while (migrateOneLocation(location++) && location < alternateTableSize);
     }
 
     @Override
@@ -330,7 +333,7 @@ protected void rehashInternalFull(final int oldSize) {
         mainModifiedTrackerCookieSource.setArray(destModifiedCookie);
         for (int sourceBucket = 0; sourceBucket < oldSize; ++sourceBucket) {
             final int currentStateValue = originalStateArray[sourceBucket];
-            if (currentStateValue == EMPTY_OUTPUT_ROW) {
+            if (isStateEmpty(currentStateValue)) {
                 continue;
             }
             final Object k0 = originalKeyArray0[sourceBucket];
@@ -338,7 +341,7 @@ protected void rehashInternalFull(final int oldSize) {
             final int firstDestinationTableLocation = hashToTableLocation(hash);
             int destinationTableLocation = firstDestinationTableLocation;
             while (true) {
-                if (destState[destinationTableLocation] == EMPTY_OUTPUT_ROW) {
+                if (isStateEmpty(destState[destinationTableLocation])) {
                     destKeyArray0[destinationTableLocation] = k0;
                     destState[destinationTableLocation] = originalStateArray[sourceBucket];
                     destModifiedCookie[destinationTableLocation] = oldModifiedCookie[sourceBucket];
diff --git a/engine/table/src/main/java/io/deephaven/engine/table/impl/multijoin/typed/incopen/gen/IncrementalMultiJoinHasherShort.java b/engine/table/src/main/java/io/deephaven/engine/table/impl/multijoin/typed/incopen/gen/IncrementalMultiJoinHasherShort.java
index 5475416e5dd..6d0459cd8ab 100644
--- a/engine/table/src/main/java/io/deephaven/engine/table/impl/multijoin/typed/incopen/gen/IncrementalMultiJoinHasherShort.java
+++ b/engine/table/src/main/java/io/deephaven/engine/table/impl/multijoin/typed/incopen/gen/IncrementalMultiJoinHasherShort.java
@@ -59,12 +59,12 @@ protected void buildFromTable(RowSequence rowSequence, Chunk[] sourceKeyChunks,
             int tableLocation = firstTableLocation;
             MAIN_SEARCH: while (true) {
                 int slotValue = slotToOutputRow.getUnsafe(tableLocation);
-                if (slotValue == EMPTY_OUTPUT_ROW) {
+                if (isStateEmpty(slotValue)) {
                     final int firstAlternateTableLocation = hashToTableLocationAlternate(hash);
                     int alternateTableLocation = firstAlternateTableLocation;
                     while (alternateTableLocation < rehashPointer) {
                         slotValue = alternateSlotToOutputRow.getUnsafe(alternateTableLocation);
-                        if (slotValue == EMPTY_OUTPUT_ROW) {
+                        if (isStateEmpty(slotValue)) {
                             break;
                         } else if (eq(alternateKeySource0.getUnsafe(alternateTableLocation), k0)) {
                             if (tableRedirSource.getLong(slotValue) != NO_REDIRECTION) {
@@ -123,7 +123,7 @@ protected void remove(RowSequence rowSequence, Chunk[] sourceKeyChunks,
             boolean found = false;
             int tableLocation = firstTableLocation;
             int slotValue;
-            while ((slotValue = slotToOutputRow.getUnsafe(tableLocation)) != EMPTY_OUTPUT_ROW) {
+            while (!isStateEmpty(slotValue = slotToOutputRow.getUnsafe(tableLocation))) {
                 if (eq(mainKeySource0.getUnsafe(tableLocation), k0)) {
                     final long mappedRowKey = tableRedirSource.getUnsafe(slotValue);
                     tableRedirSource.set(slotValue, NO_REDIRECTION);
@@ -141,7 +141,7 @@ protected void remove(RowSequence rowSequence, Chunk[] sourceKeyChunks,
                 boolean alternateFound = false;
                 if (firstAlternateTableLocation < rehashPointer) {
                     int alternateTableLocation = firstAlternateTableLocation;
-                    while ((slotValue = alternateSlotToOutputRow.getUnsafe(alternateTableLocation)) != EMPTY_OUTPUT_ROW) {
+                    while (!isStateEmpty(slotValue = alternateSlotToOutputRow.getUnsafe(alternateTableLocation))) {
                         if (eq(alternateKeySource0.getUnsafe(alternateTableLocation), k0)) {
                             final long mappedRowKey = tableRedirSource.getUnsafe(slotValue);
                             tableRedirSource.set(slotValue, NO_REDIRECTION);
@@ -175,7 +175,7 @@ protected void shift(RowSequence rowSequence, Chunk[] sourceKeyChunks,
             boolean found = false;
             int tableLocation = firstTableLocation;
             int slotValue;
-            while ((slotValue = slotToOutputRow.getUnsafe(tableLocation)) != EMPTY_OUTPUT_ROW) {
+            while (!isStateEmpty(slotValue = slotToOutputRow.getUnsafe(tableLocation))) {
                 if (eq(mainKeySource0.getUnsafe(tableLocation), k0)) {
                     final long mappedRowKey = tableRedirSource.getUnsafe(slotValue);
                     Assert.eq(rowKeyChunk.get(chunkPosition), "rowKey", mappedRowKey, "mappedRowKey");
@@ -193,7 +193,7 @@ protected void shift(RowSequence rowSequence, Chunk[] sourceKeyChunks,
                 boolean alternateFound = false;
                 if (firstAlternateTableLocation < rehashPointer) {
                     int alternateTableLocation = firstAlternateTableLocation;
-                    while ((slotValue = alternateSlotToOutputRow.getUnsafe(alternateTableLocation)) != EMPTY_OUTPUT_ROW) {
+                    while (!isStateEmpty(slotValue = alternateSlotToOutputRow.getUnsafe(alternateTableLocation))) {
                         if (eq(alternateKeySource0.getUnsafe(alternateTableLocation), k0)) {
                             final long mappedRowKey = tableRedirSource.getUnsafe(slotValue);
                             Assert.eq(rowKeyChunk.get(chunkPosition), "rowKey", mappedRowKey, "mappedRowKey");
@@ -226,7 +226,7 @@ protected void modify(RowSequence rowSequence, Chunk[] sourceKeyChunks,
             boolean found = false;
             int tableLocation = firstTableLocation;
             int slotValue;
-            while ((slotValue = slotToOutputRow.getUnsafe(tableLocation)) != EMPTY_OUTPUT_ROW) {
+            while (!isStateEmpty(slotValue = slotToOutputRow.getUnsafe(tableLocation))) {
                 if (eq(mainKeySource0.getUnsafe(tableLocation), k0)) {
                     final long cookie = mainModifiedTrackerCookieSource.getUnsafe(tableLocation);
                     mainModifiedTrackerCookieSource.set(tableLocation, modifiedSlotTracker.modifySlot(cookie, slotValue, tableNumber, trackerFlag));
@@ -241,7 +241,7 @@ protected void modify(RowSequence rowSequence, Chunk[] sourceKeyChunks,
                 boolean alternateFound = false;
                 if (firstAlternateTableLocation < rehashPointer) {
                     int alternateTableLocation = firstAlternateTableLocation;
-                    while ((slotValue = alternateSlotToOutputRow.getUnsafe(alternateTableLocation)) != EMPTY_OUTPUT_ROW) {
+                    while (!isStateEmpty(slotValue = alternateSlotToOutputRow.getUnsafe(alternateTableLocation))) {
                         if (eq(alternateKeySource0.getUnsafe(alternateTableLocation), k0)) {
                             final long cookie = alternateModifiedTrackerCookieSource.getUnsafe(alternateTableLocation);
                             alternateModifiedTrackerCookieSource.set(alternateTableLocation, modifiedSlotTracker.modifySlot(cookie, slotValue, tableNumber, trackerFlag));
@@ -264,15 +264,19 @@ private static int hash(short k0) {
         return hash;
     }
 
+    private static boolean isStateEmpty(int state) {
+        return state == EMPTY_OUTPUT_ROW;
+    }
+
     private boolean migrateOneLocation(int locationToMigrate) {
         final int currentStateValue = alternateSlotToOutputRow.getUnsafe(locationToMigrate);
-        if (currentStateValue == EMPTY_OUTPUT_ROW) {
+        if (isStateEmpty(currentStateValue)) {
             return false;
         }
         final short k0 = alternateKeySource0.getUnsafe(locationToMigrate);
         final int hash = hash(k0);
         int destinationTableLocation = hashToTableLocation(hash);
-        while (slotToOutputRow.getUnsafe(destinationTableLocation) != EMPTY_OUTPUT_ROW) {
+        while (!isStateEmpty(slotToOutputRow.getUnsafe(destinationTableLocation))) {
             destinationTableLocation = nextTableLocation(destinationTableLocation);
         }
         mainKeySource0.set(destinationTableLocation, k0);
@@ -296,8 +300,7 @@ protected int rehashInternalPartial(int entriesToRehash) {
     }
 
     @Override
-    protected void newAlternate() {
-        super.newAlternate();
+    protected void adviseNewAlternate() {
         this.mainKeySource0 = (ImmutableShortArraySource)super.mainKeySources[0];
         this.alternateKeySource0 = (ImmutableShortArraySource)super.alternateKeySources[0];
     }
@@ -311,7 +314,7 @@ protected void clearAlternate() {
     @Override
     protected void migrateFront() {
         int location = 0;
-        while (migrateOneLocation(location++));
+        while (migrateOneLocation(location++) && location < alternateTableSize);
     }
 
     @Override
@@ -328,7 +331,7 @@ protected void rehashInternalFull(final int oldSize) {
         mainModifiedTrackerCookieSource.setArray(destModifiedCookie);
         for (int sourceBucket = 0; sourceBucket < oldSize; ++sourceBucket) {
             final int currentStateValue = originalStateArray[sourceBucket];
-            if (currentStateValue == EMPTY_OUTPUT_ROW) {
+            if (isStateEmpty(currentStateValue)) {
                 continue;
             }
             final short k0 = originalKeyArray0[sourceBucket];
@@ -336,7 +339,7 @@ protected void rehashInternalFull(final int oldSize) {
             final int firstDestinationTableLocation = hashToTableLocation(hash);
             int destinationTableLocation = firstDestinationTableLocation;
             while (true) {
-                if (destState[destinationTableLocation] == EMPTY_OUTPUT_ROW) {
+                if (isStateEmpty(destState[destinationTableLocation])) {
                     destKeyArray0[destinationTableLocation] = k0;
                     destState[destinationTableLocation] = originalStateArray[sourceBucket];
                     destModifiedCookie[destinationTableLocation] = oldModifiedCookie[sourceBucket];
diff --git a/engine/table/src/main/java/io/deephaven/engine/table/impl/multijoin/typed/staticopen/gen/StaticMultiJoinHasherByte.java b/engine/table/src/main/java/io/deephaven/engine/table/impl/multijoin/typed/staticopen/gen/StaticMultiJoinHasherByte.java
index db762273c17..30465fe0c19 100644
--- a/engine/table/src/main/java/io/deephaven/engine/table/impl/multijoin/typed/staticopen/gen/StaticMultiJoinHasherByte.java
+++ b/engine/table/src/main/java/io/deephaven/engine/table/impl/multijoin/typed/staticopen/gen/StaticMultiJoinHasherByte.java
@@ -51,7 +51,7 @@ protected void buildFromTable(RowSequence rowSequence, Chunk[] sourceKeyChunks,
             int tableLocation = firstTableLocation;
             while (true) {
                 int slotValue = slotToOutputRow.getUnsafe(tableLocation);
-                if (slotValue == EMPTY_OUTPUT_ROW) {
+                if (isStateEmpty(slotValue)) {
                     numEntries++;
                     mainKeySource0.set(tableLocation, k0);
                     final int outputKey = numEntries - 1;
@@ -78,6 +78,10 @@ private static int hash(byte k0) {
         return hash;
     }
 
+    private static boolean isStateEmpty(int state) {
+        return state == EMPTY_OUTPUT_ROW;
+    }
+
     @Override
     protected void rehashInternalFull(final int oldSize) {
         final byte[] destKeyArray0 = new byte[tableSize];
@@ -89,7 +93,7 @@ protected void rehashInternalFull(final int oldSize) {
         slotToOutputRow.setArray(destState);
         for (int sourceBucket = 0; sourceBucket < oldSize; ++sourceBucket) {
             final int currentStateValue = originalStateArray[sourceBucket];
-            if (currentStateValue == EMPTY_OUTPUT_ROW) {
+            if (isStateEmpty(currentStateValue)) {
                 continue;
             }
             final byte k0 = originalKeyArray0[sourceBucket];
@@ -97,7 +101,7 @@ protected void rehashInternalFull(final int oldSize) {
             final int firstDestinationTableLocation = hashToTableLocation(hash);
             int destinationTableLocation = firstDestinationTableLocation;
             while (true) {
-                if (destState[destinationTableLocation] == EMPTY_OUTPUT_ROW) {
+                if (isStateEmpty(destState[destinationTableLocation])) {
                     destKeyArray0[destinationTableLocation] = k0;
                     destState[destinationTableLocation] = originalStateArray[sourceBucket];
                     break;
diff --git a/engine/table/src/main/java/io/deephaven/engine/table/impl/multijoin/typed/staticopen/gen/StaticMultiJoinHasherChar.java b/engine/table/src/main/java/io/deephaven/engine/table/impl/multijoin/typed/staticopen/gen/StaticMultiJoinHasherChar.java
index 98595ba3331..9bb13bfc525 100644
--- a/engine/table/src/main/java/io/deephaven/engine/table/impl/multijoin/typed/staticopen/gen/StaticMultiJoinHasherChar.java
+++ b/engine/table/src/main/java/io/deephaven/engine/table/impl/multijoin/typed/staticopen/gen/StaticMultiJoinHasherChar.java
@@ -51,7 +51,7 @@ protected void buildFromTable(RowSequence rowSequence, Chunk[] sourceKeyChunks,
             int tableLocation = firstTableLocation;
             while (true) {
                 int slotValue = slotToOutputRow.getUnsafe(tableLocation);
-                if (slotValue == EMPTY_OUTPUT_ROW) {
+                if (isStateEmpty(slotValue)) {
                     numEntries++;
                     mainKeySource0.set(tableLocation, k0);
                     final int outputKey = numEntries - 1;
@@ -78,6 +78,10 @@ private static int hash(char k0) {
         return hash;
     }
 
+    private static boolean isStateEmpty(int state) {
+        return state == EMPTY_OUTPUT_ROW;
+    }
+
     @Override
     protected void rehashInternalFull(final int oldSize) {
         final char[] destKeyArray0 = new char[tableSize];
@@ -89,7 +93,7 @@ protected void rehashInternalFull(final int oldSize) {
         slotToOutputRow.setArray(destState);
         for (int sourceBucket = 0; sourceBucket < oldSize; ++sourceBucket) {
             final int currentStateValue = originalStateArray[sourceBucket];
-            if (currentStateValue == EMPTY_OUTPUT_ROW) {
+            if (isStateEmpty(currentStateValue)) {
                 continue;
             }
             final char k0 = originalKeyArray0[sourceBucket];
@@ -97,7 +101,7 @@ protected void rehashInternalFull(final int oldSize) {
             final int firstDestinationTableLocation = hashToTableLocation(hash);
             int destinationTableLocation = firstDestinationTableLocation;
             while (true) {
-                if (destState[destinationTableLocation] == EMPTY_OUTPUT_ROW) {
+                if (isStateEmpty(destState[destinationTableLocation])) {
                     destKeyArray0[destinationTableLocation] = k0;
                     destState[destinationTableLocation] = originalStateArray[sourceBucket];
                     break;
diff --git a/engine/table/src/main/java/io/deephaven/engine/table/impl/multijoin/typed/staticopen/gen/StaticMultiJoinHasherDouble.java b/engine/table/src/main/java/io/deephaven/engine/table/impl/multijoin/typed/staticopen/gen/StaticMultiJoinHasherDouble.java
index 7c2dd4d7cce..5f66ac40a22 100644
--- a/engine/table/src/main/java/io/deephaven/engine/table/impl/multijoin/typed/staticopen/gen/StaticMultiJoinHasherDouble.java
+++ b/engine/table/src/main/java/io/deephaven/engine/table/impl/multijoin/typed/staticopen/gen/StaticMultiJoinHasherDouble.java
@@ -51,7 +51,7 @@ protected void buildFromTable(RowSequence rowSequence, Chunk[] sourceKeyChunks,
             int tableLocation = firstTableLocation;
             while (true) {
                 int slotValue = slotToOutputRow.getUnsafe(tableLocation);
-                if (slotValue == EMPTY_OUTPUT_ROW) {
+                if (isStateEmpty(slotValue)) {
                     numEntries++;
                     mainKeySource0.set(tableLocation, k0);
                     final int outputKey = numEntries - 1;
@@ -78,6 +78,10 @@ private static int hash(double k0) {
         return hash;
     }
 
+    private static boolean isStateEmpty(int state) {
+        return state == EMPTY_OUTPUT_ROW;
+    }
+
     @Override
     protected void rehashInternalFull(final int oldSize) {
         final double[] destKeyArray0 = new double[tableSize];
@@ -89,7 +93,7 @@ protected void rehashInternalFull(final int oldSize) {
         slotToOutputRow.setArray(destState);
         for (int sourceBucket = 0; sourceBucket < oldSize; ++sourceBucket) {
             final int currentStateValue = originalStateArray[sourceBucket];
-            if (currentStateValue == EMPTY_OUTPUT_ROW) {
+            if (isStateEmpty(currentStateValue)) {
                 continue;
             }
             final double k0 = originalKeyArray0[sourceBucket];
@@ -97,7 +101,7 @@ protected void rehashInternalFull(final int oldSize) {
             final int firstDestinationTableLocation = hashToTableLocation(hash);
             int destinationTableLocation = firstDestinationTableLocation;
             while (true) {
-                if (destState[destinationTableLocation] == EMPTY_OUTPUT_ROW) {
+                if (isStateEmpty(destState[destinationTableLocation])) {
                     destKeyArray0[destinationTableLocation] = k0;
                     destState[destinationTableLocation] = originalStateArray[sourceBucket];
                     break;
diff --git a/engine/table/src/main/java/io/deephaven/engine/table/impl/multijoin/typed/staticopen/gen/StaticMultiJoinHasherFloat.java b/engine/table/src/main/java/io/deephaven/engine/table/impl/multijoin/typed/staticopen/gen/StaticMultiJoinHasherFloat.java
index 62b60941fae..5103f8e7ed5 100644
--- a/engine/table/src/main/java/io/deephaven/engine/table/impl/multijoin/typed/staticopen/gen/StaticMultiJoinHasherFloat.java
+++ b/engine/table/src/main/java/io/deephaven/engine/table/impl/multijoin/typed/staticopen/gen/StaticMultiJoinHasherFloat.java
@@ -51,7 +51,7 @@ protected void buildFromTable(RowSequence rowSequence, Chunk[] sourceKeyChunks,
             int tableLocation = firstTableLocation;
             while (true) {
                 int slotValue = slotToOutputRow.getUnsafe(tableLocation);
-                if (slotValue == EMPTY_OUTPUT_ROW) {
+                if (isStateEmpty(slotValue)) {
                     numEntries++;
                     mainKeySource0.set(tableLocation, k0);
                     final int outputKey = numEntries - 1;
@@ -78,6 +78,10 @@ private static int hash(float k0) {
         return hash;
     }
 
+    private static boolean isStateEmpty(int state) {
+        return state == EMPTY_OUTPUT_ROW;
+    }
+
     @Override
     protected void rehashInternalFull(final int oldSize) {
         final float[] destKeyArray0 = new float[tableSize];
@@ -89,7 +93,7 @@ protected void rehashInternalFull(final int oldSize) {
         slotToOutputRow.setArray(destState);
         for (int sourceBucket = 0; sourceBucket < oldSize; ++sourceBucket) {
             final int currentStateValue = originalStateArray[sourceBucket];
-            if (currentStateValue == EMPTY_OUTPUT_ROW) {
+            if (isStateEmpty(currentStateValue)) {
                 continue;
             }
             final float k0 = originalKeyArray0[sourceBucket];
@@ -97,7 +101,7 @@ protected void rehashInternalFull(final int oldSize) {
             final int firstDestinationTableLocation = hashToTableLocation(hash);
             int destinationTableLocation = firstDestinationTableLocation;
             while (true) {
-                if (destState[destinationTableLocation] == EMPTY_OUTPUT_ROW) {
+                if (isStateEmpty(destState[destinationTableLocation])) {
                     destKeyArray0[destinationTableLocation] = k0;
                     destState[destinationTableLocation] = originalStateArray[sourceBucket];
                     break;
diff --git a/engine/table/src/main/java/io/deephaven/engine/table/impl/multijoin/typed/staticopen/gen/StaticMultiJoinHasherInt.java b/engine/table/src/main/java/io/deephaven/engine/table/impl/multijoin/typed/staticopen/gen/StaticMultiJoinHasherInt.java
index 92eecbcfc3f..7a89c6b1c4e 100644
--- a/engine/table/src/main/java/io/deephaven/engine/table/impl/multijoin/typed/staticopen/gen/StaticMultiJoinHasherInt.java
+++ b/engine/table/src/main/java/io/deephaven/engine/table/impl/multijoin/typed/staticopen/gen/StaticMultiJoinHasherInt.java
@@ -51,7 +51,7 @@ protected void buildFromTable(RowSequence rowSequence, Chunk[] sourceKeyChunks,
             int tableLocation = firstTableLocation;
             while (true) {
                 int slotValue = slotToOutputRow.getUnsafe(tableLocation);
-                if (slotValue == EMPTY_OUTPUT_ROW) {
+                if (isStateEmpty(slotValue)) {
                     numEntries++;
                     mainKeySource0.set(tableLocation, k0);
                     final int outputKey = numEntries - 1;
@@ -78,6 +78,10 @@ private static int hash(int k0) {
         return hash;
     }
 
+    private static boolean isStateEmpty(int state) {
+        return state == EMPTY_OUTPUT_ROW;
+    }
+
     @Override
     protected void rehashInternalFull(final int oldSize) {
         final int[] destKeyArray0 = new int[tableSize];
@@ -89,7 +93,7 @@ protected void rehashInternalFull(final int oldSize) {
         slotToOutputRow.setArray(destState);
         for (int sourceBucket = 0; sourceBucket < oldSize; ++sourceBucket) {
             final int currentStateValue = originalStateArray[sourceBucket];
-            if (currentStateValue == EMPTY_OUTPUT_ROW) {
+            if (isStateEmpty(currentStateValue)) {
                 continue;
             }
             final int k0 = originalKeyArray0[sourceBucket];
@@ -97,7 +101,7 @@ protected void rehashInternalFull(final int oldSize) {
             final int firstDestinationTableLocation = hashToTableLocation(hash);
             int destinationTableLocation = firstDestinationTableLocation;
             while (true) {
-                if (destState[destinationTableLocation] == EMPTY_OUTPUT_ROW) {
+                if (isStateEmpty(destState[destinationTableLocation])) {
                     destKeyArray0[destinationTableLocation] = k0;
                     destState[destinationTableLocation] = originalStateArray[sourceBucket];
                     break;
diff --git a/engine/table/src/main/java/io/deephaven/engine/table/impl/multijoin/typed/staticopen/gen/StaticMultiJoinHasherLong.java b/engine/table/src/main/java/io/deephaven/engine/table/impl/multijoin/typed/staticopen/gen/StaticMultiJoinHasherLong.java
index d8e6c76f697..05d59fc8f83 100644
--- a/engine/table/src/main/java/io/deephaven/engine/table/impl/multijoin/typed/staticopen/gen/StaticMultiJoinHasherLong.java
+++ b/engine/table/src/main/java/io/deephaven/engine/table/impl/multijoin/typed/staticopen/gen/StaticMultiJoinHasherLong.java
@@ -50,7 +50,7 @@ protected void buildFromTable(RowSequence rowSequence, Chunk[] sourceKeyChunks,
             int tableLocation = firstTableLocation;
             while (true) {
                 int slotValue = slotToOutputRow.getUnsafe(tableLocation);
-                if (slotValue == EMPTY_OUTPUT_ROW) {
+                if (isStateEmpty(slotValue)) {
                     numEntries++;
                     mainKeySource0.set(tableLocation, k0);
                     final int outputKey = numEntries - 1;
@@ -77,6 +77,10 @@ private static int hash(long k0) {
         return hash;
     }
 
+    private static boolean isStateEmpty(int state) {
+        return state == EMPTY_OUTPUT_ROW;
+    }
+
     @Override
     protected void rehashInternalFull(final int oldSize) {
         final long[] destKeyArray0 = new long[tableSize];
@@ -88,7 +92,7 @@ protected void rehashInternalFull(final int oldSize) {
         slotToOutputRow.setArray(destState);
         for (int sourceBucket = 0; sourceBucket < oldSize; ++sourceBucket) {
             final int currentStateValue = originalStateArray[sourceBucket];
-            if (currentStateValue == EMPTY_OUTPUT_ROW) {
+            if (isStateEmpty(currentStateValue)) {
                 continue;
             }
             final long k0 = originalKeyArray0[sourceBucket];
@@ -96,7 +100,7 @@ protected void rehashInternalFull(final int oldSize) {
             final int firstDestinationTableLocation = hashToTableLocation(hash);
             int destinationTableLocation = firstDestinationTableLocation;
             while (true) {
-                if (destState[destinationTableLocation] == EMPTY_OUTPUT_ROW) {
+                if (isStateEmpty(destState[destinationTableLocation])) {
                     destKeyArray0[destinationTableLocation] = k0;
                     destState[destinationTableLocation] = originalStateArray[sourceBucket];
                     break;
diff --git a/engine/table/src/main/java/io/deephaven/engine/table/impl/multijoin/typed/staticopen/gen/StaticMultiJoinHasherObject.java b/engine/table/src/main/java/io/deephaven/engine/table/impl/multijoin/typed/staticopen/gen/StaticMultiJoinHasherObject.java
index 4c306ecc640..ae09a6b0321 100644
--- a/engine/table/src/main/java/io/deephaven/engine/table/impl/multijoin/typed/staticopen/gen/StaticMultiJoinHasherObject.java
+++ b/engine/table/src/main/java/io/deephaven/engine/table/impl/multijoin/typed/staticopen/gen/StaticMultiJoinHasherObject.java
@@ -52,7 +52,7 @@ protected void buildFromTable(RowSequence rowSequence, Chunk[] sourceKeyChunks,
             int tableLocation = firstTableLocation;
             while (true) {
                 int slotValue = slotToOutputRow.getUnsafe(tableLocation);
-                if (slotValue == EMPTY_OUTPUT_ROW) {
+                if (isStateEmpty(slotValue)) {
                     numEntries++;
                     mainKeySource0.set(tableLocation, k0);
                     final int outputKey = numEntries - 1;
@@ -79,6 +79,10 @@ private static int hash(Object k0) {
         return hash;
     }
 
+    private static boolean isStateEmpty(int state) {
+        return state == EMPTY_OUTPUT_ROW;
+    }
+
     @Override
     protected void rehashInternalFull(final int oldSize) {
         final Object[] destKeyArray0 = new Object[tableSize];
@@ -90,7 +94,7 @@ protected void rehashInternalFull(final int oldSize) {
         slotToOutputRow.setArray(destState);
         for (int sourceBucket = 0; sourceBucket < oldSize; ++sourceBucket) {
             final int currentStateValue = originalStateArray[sourceBucket];
-            if (currentStateValue == EMPTY_OUTPUT_ROW) {
+            if (isStateEmpty(currentStateValue)) {
                 continue;
             }
             final Object k0 = originalKeyArray0[sourceBucket];
@@ -98,7 +102,7 @@ protected void rehashInternalFull(final int oldSize) {
             final int firstDestinationTableLocation = hashToTableLocation(hash);
             int destinationTableLocation = firstDestinationTableLocation;
             while (true) {
-                if (destState[destinationTableLocation] == EMPTY_OUTPUT_ROW) {
+                if (isStateEmpty(destState[destinationTableLocation])) {
                     destKeyArray0[destinationTableLocation] = k0;
                     destState[destinationTableLocation] = originalStateArray[sourceBucket];
                     break;
diff --git a/engine/table/src/main/java/io/deephaven/engine/table/impl/multijoin/typed/staticopen/gen/StaticMultiJoinHasherShort.java b/engine/table/src/main/java/io/deephaven/engine/table/impl/multijoin/typed/staticopen/gen/StaticMultiJoinHasherShort.java
index a99f3cb186b..8f1795aed59 100644
--- a/engine/table/src/main/java/io/deephaven/engine/table/impl/multijoin/typed/staticopen/gen/StaticMultiJoinHasherShort.java
+++ b/engine/table/src/main/java/io/deephaven/engine/table/impl/multijoin/typed/staticopen/gen/StaticMultiJoinHasherShort.java
@@ -51,7 +51,7 @@ protected void buildFromTable(RowSequence rowSequence, Chunk[] sourceKeyChunks,
             int tableLocation = firstTableLocation;
             while (true) {
                 int slotValue = slotToOutputRow.getUnsafe(tableLocation);
-                if (slotValue == EMPTY_OUTPUT_ROW) {
+                if (isStateEmpty(slotValue)) {
                     numEntries++;
                     mainKeySource0.set(tableLocation, k0);
                     final int outputKey = numEntries - 1;
@@ -78,6 +78,10 @@ private static int hash(short k0) {
         return hash;
     }
 
+    private static boolean isStateEmpty(int state) {
+        return state == EMPTY_OUTPUT_ROW;
+    }
+
     @Override
     protected void rehashInternalFull(final int oldSize) {
         final short[] destKeyArray0 = new short[tableSize];
@@ -89,7 +93,7 @@ protected void rehashInternalFull(final int oldSize) {
         slotToOutputRow.setArray(destState);
         for (int sourceBucket = 0; sourceBucket < oldSize; ++sourceBucket) {
             final int currentStateValue = originalStateArray[sourceBucket];
-            if (currentStateValue == EMPTY_OUTPUT_ROW) {
+            if (isStateEmpty(currentStateValue)) {
                 continue;
             }
             final short k0 = originalKeyArray0[sourceBucket];
@@ -97,7 +101,7 @@ protected void rehashInternalFull(final int oldSize) {
             final int firstDestinationTableLocation = hashToTableLocation(hash);
             int destinationTableLocation = firstDestinationTableLocation;
             while (true) {
-                if (destState[destinationTableLocation] == EMPTY_OUTPUT_ROW) {
+                if (isStateEmpty(destState[destinationTableLocation])) {
                     destKeyArray0[destinationTableLocation] = k0;
                     destState[destinationTableLocation] = originalStateArray[sourceBucket];
                     break;
diff --git a/engine/table/src/main/java/io/deephaven/engine/table/impl/naturaljoin/IncrementalNaturalJoinStateManagerTypedBase.java b/engine/table/src/main/java/io/deephaven/engine/table/impl/naturaljoin/IncrementalNaturalJoinStateManagerTypedBase.java
index bc6b96bdd70..43bbc3aea76 100644
--- a/engine/table/src/main/java/io/deephaven/engine/table/impl/naturaljoin/IncrementalNaturalJoinStateManagerTypedBase.java
+++ b/engine/table/src/main/java/io/deephaven/engine/table/impl/naturaljoin/IncrementalNaturalJoinStateManagerTypedBase.java
@@ -4,6 +4,7 @@
 package io.deephaven.engine.table.impl.naturaljoin;
 
 import gnu.trove.list.array.TLongArrayList;
+import io.deephaven.base.MathUtil;
 import io.deephaven.base.verify.Assert;
 import io.deephaven.base.verify.Require;
 import io.deephaven.chunk.Chunk;
@@ -33,6 +34,8 @@ public abstract class IncrementalNaturalJoinStateManagerTypedBase extends Static
         implements IncrementalNaturalJoinStateManager, BothIncrementalNaturalJoinStateManager {
 
     public static final long EMPTY_RIGHT_STATE = QueryConstants.NULL_LONG;
+    public static final long TOMBSTONE_RIGHT_STATE = RowSet.NULL_ROW_KEY - 1;
+    public static final long FIRST_DUPLICATE = TOMBSTONE_RIGHT_STATE - 1;
 
     // the number of slots in our table
     protected int tableSize;
@@ -44,10 +47,14 @@ public abstract class IncrementalNaturalJoinStateManagerTypedBase extends Static
     // how much of the alternate sources are necessary to rehash?
     protected int rehashPointer = 0;
 
+    /** How many entries are taking up slots in the main hash table (includes tombstones)? */
     protected long numEntries = 0;
+    /** How many values do we have that are live (in both main and alternate)? */
+    protected long liveEntries = 0;
+    /** How many entries are in the alternate table (includes tombstones)? */
+    protected long alternateEntries = 0;
 
     // the table will be rehashed to a load factor of targetLoadFactor if our loadFactor exceeds maximumLoadFactor
-    // or if it falls below minimum load factor we will instead contract the table
     private final double maximumLoadFactor;
 
     // the keys for our hash entries
@@ -55,11 +62,17 @@ public abstract class IncrementalNaturalJoinStateManagerTypedBase extends Static
     protected final WritableColumnSource[] mainKeySources;
     protected final WritableColumnSource[] alternateKeySources;
 
-    // we use a RowSet.NULL_ROW_KEY for a state that exists, but has no right hand side;
-    // the column sources are initialized with NULL_LONG for something that does not exist. When there are multiple
-    // right rows, we store a value less than RowSet.NULL_ROW_KEY, which is a position in the rightSideDuplicateRowSets
-    // (-2 maps to 0, -3 to 1, etc.). We must maintain the right side duplicates so that we do not need a rescan;
-    // but in the common (as opposed to impending error) case of a single value we do not want to allocate any objects
+    /**
+     * <p>
+     * We use a RowSet.NULL_ROW_KEY for a state that exists, but has no right hand side; the column sources are
+     * initialized with NULL_LONG for something that does not exist. When there are multiple right rows, we store a
+     * value less than TOMBSTONE_RIGHT_STATE, which is a position in the rightSideDuplicateRowSets (-3 maps to 0, -4 to
+     * 1, etc.). We must maintain the right side duplicates so that we do not need a rescan; but in the common (as
+     * opposed to impending error) case of a single value we do not want to allocate any objects
+     *
+     * The TOMBSTONE_RIGHT_STATE indicates that the row was deleted.
+     * </p>
+     */
     protected ImmutableLongArraySource mainRightRowKey = new ImmutableLongArraySource();
     protected ImmutableLongArraySource alternateRightRowKey;
 
@@ -216,6 +229,37 @@ protected void probeTable(
         }
     }
 
+    /* @formatter:off
+
+    void checkAlternateEntries() {
+        int expected = 0;
+        int expectedLive = 0;
+        if (alternateRightRowKey != null) {
+            for (int ii = 0; ii < rehashPointer; ++ii) {
+                long state = alternateRightRowKey.getUnsafe(ii);
+                if (state != EMPTY_RIGHT_STATE) {
+                    if (state != TOMBSTONE_RIGHT_STATE) {
+                        expectedLive++;
+                    }
+                    expected++;
+                }
+            }
+        }
+        Assert.eq(alternateEntries, "alternateEntries", expected, "expected");
+    }
+
+    void checkMainEntries() {
+        int expected = 0;
+        for (int ii = 0; ii < tableSize; ++ii) {
+            if (mainRightRowKey.getUnsafe(ii) != EMPTY_RIGHT_STATE) {
+                expected++;
+            }
+        }
+        Assert.eq(numEntries, "numEntries", expected, "expected");
+    }
+
+    @formatter:on */
+
     /**
      * @param fullRehash should we rehash the entire table (if false, we rehash incrementally)
      * @param rehashCredits the number of entries this operation has rehashed (input/output)
@@ -237,36 +281,43 @@ public boolean doRehash(boolean fullRehash, MutableInt rehashCredits, int nextCh
             }
         }
 
-        int oldTableSize = tableSize;
-        while (rehashRequired(nextChunkSize)) {
-            tableSize *= 2;
-
-            if (tableSize < 0 || tableSize > MAX_TABLE_SIZE) {
-                throw new UnsupportedOperationException("Hash table exceeds maximum size!");
-            }
-        }
-
-        if (oldTableSize == tableSize) {
+        if (!rehashRequired(nextChunkSize)) {
             return false;
         }
 
+        int oldTableSize = tableSize;
+        tableSize = computeTableSize(nextChunkSize);
+
         // we can't give the caller credit for rehashes with the old table, we need to begin migrating things again
         if (rehashCredits.get() > 0) {
             rehashCredits.set(0);
         }
 
         if (fullRehash) {
-            // if we are doing a full rehash, we need to ditch the alternate
+            // we need to ditch the alternate table before continuing on a full rehash
             if (rehashPointer > 0) {
-                rehashInternalPartial((int) numEntries, modifiedSlotTracker);
+                rehashInternalPartial((int) alternateEntries, modifiedSlotTracker);
+                Assert.eqZero(alternateEntries, "alternateEntries");
                 clearAlternate();
             }
-
             rehashInternalFull(oldTableSize);
-
             return false;
         }
+        Assert.eqZero(rehashPointer, "rehashPointer");
+
+        setupNewAlternate(oldTableSize);
+        adviseNewAlternate();
+
+        return true;
+    }
+
+    /**
+     * After creating the new alternate key states, advise the derived classes, so they can cast them to the typed
+     * versions of the column source and adjust the derived class pointers.
+     */
+    protected abstract void adviseNewAlternate();
 
+    private void setupNewAlternate(int oldTableSize) {
         Assert.eqZero(rehashPointer, "rehashPointer");
 
         for (int ii = 0; ii < mainKeySources.length; ++ii) {
@@ -280,12 +331,8 @@ public boolean doRehash(boolean fullRehash, MutableInt rehashCredits, int nextCh
             rehashPointer = alternateTableSize;
         }
 
-        newAlternate();
-
-        return true;
-    }
-
-    protected void newAlternate() {
+        alternateEntries = numEntries;
+        numEntries = 0;
         alternateRightRowKey = mainRightRowKey;
         mainRightRowKey = new ImmutableLongArraySource();
         mainRightRowKey.ensureCapacity(tableSize);
@@ -308,6 +355,8 @@ protected void newAlternate() {
     }
 
     protected void clearAlternate() {
+        alternateEntries = 0;
+        rehashPointer = 0;
         for (int ii = 0; ii < mainKeySources.length; ++ii) {
             alternateKeySources[ii] = null;
         }
@@ -317,6 +366,20 @@ public boolean rehashRequired(int nextChunkSize) {
         return (numEntries + nextChunkSize) > (tableSize * maximumLoadFactor);
     }
 
+    public int computeTableSize(int nextChunkSize) {
+        // we use the number of liveEntries multiplied by 2, so that as we rehash we can both consume a slot for the
+        // live entry from the alternate table; and also consume a slot for the new value. This ensures that we will
+        // burn down our rehash requirements before we need to initiate a new partial rehash.
+
+        final long desiredEntries = Math.max(liveEntries * 2, liveEntries + nextChunkSize);
+        final long tableSize =
+                MathUtil.roundUpPowerOf2(Math.max(this.tableSize, (long) (desiredEntries / maximumLoadFactor)));
+        if (tableSize <= 1 || tableSize > MAX_TABLE_SIZE) {
+            throw new UnsupportedOperationException("Hash table exceeds maximum size!");
+        }
+        return Math.toIntExact(tableSize);
+    }
+
     abstract protected void rehashInternalFull(final int oldSize);
 
     abstract protected void migrateFront(NaturalJoinModifiedSlotTracker modifiedSlotTracker);
@@ -337,12 +400,12 @@ protected int hashToTableLocationAlternate(int hash) {
     }
 
     protected long duplicateLocationFromRowKey(long rowKey) {
-        Assert.lt(rowKey, "rowKey", -1L);
-        return -rowKey - 2;
+        Assert.leq(rowKey, "rowKey", FIRST_DUPLICATE);
+        return -rowKey + FIRST_DUPLICATE;
     }
 
     protected long rowKeyFromDuplicateLocation(long duplicateLocation) {
-        return -duplicateLocation - 2;
+        return -duplicateLocation + FIRST_DUPLICATE;
     }
 
     protected long allocateDuplicateLocation() {
@@ -370,7 +433,7 @@ public long getRightIndex(int slot) {
         } else {
             rightRowKey = alternateRightRowKey.getUnsafe(slot & AlternatingColumnSource.ALTERNATE_INNER_MASK);
         }
-        if (rightRowKey < RowSet.NULL_ROW_KEY) {
+        if (rightRowKey <= FIRST_DUPLICATE) {
             return DUPLICATE_RIGHT_VALUE;
         }
         return rightRowKey;
diff --git a/engine/table/src/main/java/io/deephaven/engine/table/impl/naturaljoin/TypedNaturalJoinFactory.java b/engine/table/src/main/java/io/deephaven/engine/table/impl/naturaljoin/TypedNaturalJoinFactory.java
index 224d19dae18..e30734024b3 100644
--- a/engine/table/src/main/java/io/deephaven/engine/table/impl/naturaljoin/TypedNaturalJoinFactory.java
+++ b/engine/table/src/main/java/io/deephaven/engine/table/impl/naturaljoin/TypedNaturalJoinFactory.java
@@ -17,6 +17,9 @@
 import org.jetbrains.annotations.NotNull;
 
 public class TypedNaturalJoinFactory {
+
+    public static final String FIRST_DUPLICATE = "FIRST_DUPLICATE";
+
     public static void staticBuildLeftFound(HasherConfig<?> hasherConfig, boolean alternate,
             CodeBlock.Builder builder) {
         builder.addStatement("leftHashSlots.set(hashSlotOffset++, tableLocation)");
@@ -204,7 +207,7 @@ public static void incrementalRightFound(HasherConfig<?> hasherConfig, boolean a
         final String tableLocation = getTableLocation(alternate);
         builder.beginControlFlow("if (existingRightRowKey == $T.NULL_ROW_KEY)", RowSet.class);
         builder.addStatement("$LRightRowKey.set($L, rowKeyChunk.get(chunkPosition))", sourceType, tableLocation);
-        builder.nextControlFlow("else if (existingRightRowKey < $T.NULL_ROW_KEY)", RowSet.class);
+        builder.nextControlFlow("else if (existingRightRowKey <= $L)", FIRST_DUPLICATE);
         builder.addStatement("final long duplicateLocation = duplicateLocationFromRowKey(existingRightRowKey)");
         builder.addStatement(
                 "rightSideDuplicateRowSets.getUnsafe(duplicateLocation).insert(rowKeyChunk.get(chunkPosition))");
@@ -229,7 +232,7 @@ private static void checkForDuplicateError(CodeBlock.Builder builder, String sou
 
     private static void checkForDuplicateErrorLeftDecorate(CodeBlock.Builder builder, String leftRowKey,
             String rightRowState) {
-        builder.beginControlFlow("if ($L < $T.NULL_ROW_KEY)", rightRowState, RowSet.class);
+        builder.beginControlFlow("if ($L <= $L)", rightRowState, FIRST_DUPLICATE);
         builder.addStatement(
                 "throw new IllegalStateException(\"Natural Join found duplicate right key for \" + extractKeyStringFromSourceTable($L))",
                 leftRowKey);
@@ -247,7 +250,7 @@ public static void incrementalRemoveRightFound(HasherConfig<?> hasherConfig, boo
         final String sourceType = alternate ? "alternate" : "main";
         final String tableLocation = alternate ? "alternateTableLocation" : "tableLocation";
 
-        builder.beginControlFlow("if (existingRightRowKey < $T.NULL_ROW_KEY)", RowSet.class);
+        builder.beginControlFlow("if (existingRightRowKey <= $L)", FIRST_DUPLICATE);
         builder.addStatement("final long duplicateLocation = duplicateLocationFromRowKey(existingRightRowKey)");
         builder.addStatement("final $T duplicates = rightSideDuplicateRowSets.getUnsafe(duplicateLocation)",
                 WritableRowSet.class);
@@ -262,7 +265,16 @@ public static void incrementalRemoveRightFound(HasherConfig<?> hasherConfig, boo
         builder.addStatement("$T.statementNeverExecuted($S)", Assert.class,
                 "Could not find existing right row in state");
         builder.nextControlFlow("else");
+        // we need to check if our left hand side is empty at this location, if so then we must mark the location as a
+        // tombstone and reduce the number of entries in the table
+        builder.addStatement("final boolean leftEmpty = $LLeftRowSet.getUnsafe($L).isEmpty()", sourceType,
+                tableLocation);
+        builder.beginControlFlow("if (leftEmpty)");
+        builder.addStatement("$LRightRowKey.set($L, $L)", sourceType, tableLocation, hasherConfig.tombstoneStateName);
+        builder.addStatement("liveEntries--");
+        builder.nextControlFlow("else");
         builder.addStatement("$LRightRowKey.set($L, $T.NULL_ROW_KEY)", sourceType, tableLocation, RowSet.class);
+        builder.endControlFlow();
         modifyCookie(builder, sourceType, tableLocation, "FLAG_RIGHT_CHANGE");
         builder.endControlFlow();
     }
@@ -280,7 +292,7 @@ public static void incrementalRightFoundUpdate(HasherConfig<?> hasherConfig, boo
         builder.beginControlFlow("if (existingRightRowKey == $T.NULL_ROW_KEY)", RowSet.class);
         builder.addStatement("$LRightRowKey.set($L, rowKeyChunk.get(chunkPosition))", sourceType, tableLocation);
         modifyCookie(builder, sourceType, tableLocation, "FLAG_RIGHT_CHANGE");
-        builder.nextControlFlow("else if (existingRightRowKey < $T.NULL_ROW_KEY)", RowSet.class);
+        builder.nextControlFlow("else if (existingRightRowKey <= $L)", FIRST_DUPLICATE);
         builder.addStatement("final long duplicateLocation = duplicateLocationFromRowKey(existingRightRowKey)");
         builder.addStatement("final $T duplicates = rightSideDuplicateRowSets.getUnsafe(duplicateLocation)",
                 WritableRowSet.class);
@@ -351,8 +363,16 @@ public static void incrementalLeftInsertUpdate(HasherConfig<?> hasherConfig, Cod
 
     public static void incrementalRemoveLeftFound(HasherConfig<?> hasherConfig, boolean alternate,
             CodeBlock.Builder builder) {
-        builder.addStatement("$LLeftRowSet.getUnsafe($L).remove(rowKeyChunk.get(chunkPosition))",
-                getSourceType(alternate), getTableLocation(alternate));
+        final String sourceType = getSourceType(alternate);
+        final String tableLocation = getTableLocation(alternate);
+        builder.addStatement("final WritableRowSet left = $LLeftRowSet.getUnsafe($L)",
+                sourceType, tableLocation);
+        builder.addStatement("left.remove(rowKeyChunk.get(chunkPosition))");
+        builder.beginControlFlow("if (left.isEmpty() && rightState == $T.NULL_ROW_KEY)", RowSet.class);
+        // it is actually deleted
+        builder.addStatement("$LRightRowKey.set($L, TOMBSTONE_RIGHT_STATE)", sourceType, tableLocation);
+        builder.addStatement("liveEntries--");
+        builder.endControlFlow();
     }
 
     public static void incrementalRemoveLeftMissing(CodeBlock.Builder builder) {
@@ -382,7 +402,7 @@ public static void incrementalApplyRightShift(HasherConfig<?> hasherConfig, bool
         builder.beginControlFlow("if (existingRightRowKey == keyToShift - shiftDelta)");
         builder.addStatement("$LRightRowKey.set($L, keyToShift)", sourceType, tableLocation);
         modifyCookie(builder, sourceType, tableLocation, "FLAG_RIGHT_SHIFT");
-        builder.nextControlFlow("else if (existingRightRowKey < $T.NULL_ROW_KEY)", RowSet.class);
+        builder.nextControlFlow("else if (existingRightRowKey <= $L)", FIRST_DUPLICATE);
         builder.addStatement("final long duplicateLocation = duplicateLocationFromRowKey(existingRightRowKey)");
         builder.beginControlFlow("if (shiftDelta < 0)");
         builder.addStatement("final $T duplicates = rightSideDuplicateRowSets.getUnsafe(duplicateLocation)",
diff --git a/engine/table/src/main/java/io/deephaven/engine/table/impl/naturaljoin/typed/incopen/gen/IncrementalNaturalJoinHasherByte.java b/engine/table/src/main/java/io/deephaven/engine/table/impl/naturaljoin/typed/incopen/gen/IncrementalNaturalJoinHasherByte.java
index db92b91b31a..26a1f361068 100644
--- a/engine/table/src/main/java/io/deephaven/engine/table/impl/naturaljoin/typed/incopen/gen/IncrementalNaturalJoinHasherByte.java
+++ b/engine/table/src/main/java/io/deephaven/engine/table/impl/naturaljoin/typed/incopen/gen/IncrementalNaturalJoinHasherByte.java
@@ -62,15 +62,16 @@ protected void buildFromLeftSide(RowSequence rowSequence, Chunk[] sourceKeyChunk
             int tableLocation = firstTableLocation;
             MAIN_SEARCH: while (true) {
                 long rightRowKeyForState = mainRightRowKey.getUnsafe(tableLocation);
-                if (rightRowKeyForState == EMPTY_RIGHT_STATE) {
+                if (isStateEmpty(rightRowKeyForState)) {
                     numEntries++;
+                    liveEntries++;
                     mainKeySource0.set(tableLocation, k0);
                     mainLeftRowSet.set(tableLocation, RowSetFactory.fromKeys(rowKeyChunk.get(chunkPosition)));
                     mainRightRowKey.set(tableLocation, RowSet.NULL_ROW_KEY);
                     mainModifiedTrackerCookieSource.set(tableLocation, -1L);
                     break;
                 } else if (eq(mainKeySource0.getUnsafe(tableLocation), k0)) {
-                    if (rightRowKeyForState < RowSet.NULL_ROW_KEY) {
+                    if (rightRowKeyForState <= FIRST_DUPLICATE) {
                         throw new IllegalStateException("Natural Join found duplicate right key for " + extractKeyStringFromSourceTable(rowKeyChunk.get(chunkPosition)));
                     }
                     mainLeftRowSet.getUnsafe(tableLocation).insert(rowKeyChunk.get(chunkPosition));
@@ -95,8 +96,9 @@ protected void buildFromRightSide(RowSequence rowSequence, Chunk[] sourceKeyChun
             int tableLocation = firstTableLocation;
             MAIN_SEARCH: while (true) {
                 long existingRightRowKey = mainRightRowKey.getUnsafe(tableLocation);
-                if (existingRightRowKey == EMPTY_RIGHT_STATE) {
+                if (isStateEmpty(existingRightRowKey)) {
                     numEntries++;
+                    liveEntries++;
                     mainKeySource0.set(tableLocation, k0);
                     mainLeftRowSet.set(tableLocation, RowSetFactory.empty());
                     mainRightRowKey.set(tableLocation, rowKeyChunk.get(chunkPosition));
@@ -105,7 +107,7 @@ protected void buildFromRightSide(RowSequence rowSequence, Chunk[] sourceKeyChun
                 } else if (eq(mainKeySource0.getUnsafe(tableLocation), k0)) {
                     if (existingRightRowKey == RowSet.NULL_ROW_KEY) {
                         mainRightRowKey.set(tableLocation, rowKeyChunk.get(chunkPosition));
-                    } else if (existingRightRowKey < RowSet.NULL_ROW_KEY) {
+                    } else if (existingRightRowKey <= FIRST_DUPLICATE) {
                         final long duplicateLocation = duplicateLocationFromRowKey(existingRightRowKey);
                         rightSideDuplicateRowSets.getUnsafe(duplicateLocation).insert(rowKeyChunk.get(chunkPosition));
                     } else {
@@ -132,20 +134,27 @@ protected void addRightSide(RowSequence rowSequence, Chunk[] sourceKeyChunks,
             final int hash = hash(k0);
             final int firstTableLocation = hashToTableLocation(hash);
             int tableLocation = firstTableLocation;
+            int firstDeletedLocation = -1;
             MAIN_SEARCH: while (true) {
                 long existingRightRowKey = mainRightRowKey.getUnsafe(tableLocation);
-                if (existingRightRowKey == EMPTY_RIGHT_STATE) {
+                if (firstDeletedLocation < 0 && isStateDeleted(existingRightRowKey)) {
+                    firstDeletedLocation = tableLocation;
+                }
+                if (isStateEmpty(existingRightRowKey)) {
                     final int firstAlternateTableLocation = hashToTableLocationAlternate(hash);
                     int alternateTableLocation = firstAlternateTableLocation;
                     while (alternateTableLocation < rehashPointer) {
                         existingRightRowKey = alternateRightRowKey.getUnsafe(alternateTableLocation);
-                        if (existingRightRowKey == EMPTY_RIGHT_STATE) {
+                        if (isStateEmpty(existingRightRowKey)) {
                             break;
                         } else if (eq(alternateKeySource0.getUnsafe(alternateTableLocation), k0)) {
+                            if (isStateDeleted(existingRightRowKey)) {
+                                break;
+                            }
                             if (existingRightRowKey == RowSet.NULL_ROW_KEY) {
                                 alternateRightRowKey.set(alternateTableLocation, rowKeyChunk.get(chunkPosition));
                                 alternateModifiedTrackerCookieSource.set(alternateTableLocation, modifiedSlotTracker.addMain(alternateModifiedTrackerCookieSource.getUnsafe(alternateTableLocation), alternateInsertMask | alternateTableLocation, existingRightRowKey, NaturalJoinModifiedSlotTracker.FLAG_RIGHT_CHANGE));
-                            } else if (existingRightRowKey < RowSet.NULL_ROW_KEY) {
+                            } else if (existingRightRowKey <= FIRST_DUPLICATE) {
                                 final long duplicateLocation = duplicateLocationFromRowKey(existingRightRowKey);
                                 final WritableRowSet duplicates = rightSideDuplicateRowSets.getUnsafe(duplicateLocation);
                                 final long duplicateSize = duplicates.size();
@@ -163,17 +172,31 @@ protected void addRightSide(RowSequence rowSequence, Chunk[] sourceKeyChunks,
                             Assert.neq(alternateTableLocation, "alternateTableLocation", firstAlternateTableLocation, "firstAlternateTableLocation");
                         }
                     }
-                    numEntries++;
+                    if (firstDeletedLocation >= 0) {
+                        tableLocation = firstDeletedLocation;
+                    } else {
+                        numEntries++;
+                    }
+                    liveEntries++;
                     mainKeySource0.set(tableLocation, k0);
                     mainLeftRowSet.set(tableLocation, RowSetFactory.empty());
                     mainRightRowKey.set(tableLocation, rowKeyChunk.get(chunkPosition));
                     mainModifiedTrackerCookieSource.set(tableLocation, modifiedSlotTracker.addMain(-1, mainInsertMask | tableLocation, existingRightRowKey, NaturalJoinModifiedSlotTracker.FLAG_RIGHT_CHANGE));
                     break;
                 } else if (eq(mainKeySource0.getUnsafe(tableLocation), k0)) {
+                    if (isStateDeleted(existingRightRowKey)) {
+                        tableLocation = firstDeletedLocation;
+                        liveEntries++;
+                        mainKeySource0.set(tableLocation, k0);
+                        mainLeftRowSet.set(tableLocation, RowSetFactory.empty());
+                        mainRightRowKey.set(tableLocation, rowKeyChunk.get(chunkPosition));
+                        mainModifiedTrackerCookieSource.set(tableLocation, modifiedSlotTracker.addMain(-1, mainInsertMask | tableLocation, existingRightRowKey, NaturalJoinModifiedSlotTracker.FLAG_RIGHT_CHANGE));
+                        break;
+                    }
                     if (existingRightRowKey == RowSet.NULL_ROW_KEY) {
                         mainRightRowKey.set(tableLocation, rowKeyChunk.get(chunkPosition));
                         mainModifiedTrackerCookieSource.set(tableLocation, modifiedSlotTracker.addMain(mainModifiedTrackerCookieSource.getUnsafe(tableLocation), mainInsertMask | tableLocation, existingRightRowKey, NaturalJoinModifiedSlotTracker.FLAG_RIGHT_CHANGE));
-                    } else if (existingRightRowKey < RowSet.NULL_ROW_KEY) {
+                    } else if (existingRightRowKey <= FIRST_DUPLICATE) {
                         final long duplicateLocation = duplicateLocationFromRowKey(existingRightRowKey);
                         final WritableRowSet duplicates = rightSideDuplicateRowSets.getUnsafe(duplicateLocation);
                         final long duplicateSize = duplicates.size();
@@ -204,17 +227,24 @@ protected void addLeftSide(RowSequence rowSequence, Chunk[] sourceKeyChunks,
             final int hash = hash(k0);
             final int firstTableLocation = hashToTableLocation(hash);
             int tableLocation = firstTableLocation;
+            int firstDeletedLocation = -1;
             MAIN_SEARCH: while (true) {
                 long rightRowKeyForState = mainRightRowKey.getUnsafe(tableLocation);
-                if (rightRowKeyForState == EMPTY_RIGHT_STATE) {
+                if (firstDeletedLocation < 0 && isStateDeleted(rightRowKeyForState)) {
+                    firstDeletedLocation = tableLocation;
+                }
+                if (isStateEmpty(rightRowKeyForState)) {
                     final int firstAlternateTableLocation = hashToTableLocationAlternate(hash);
                     int alternateTableLocation = firstAlternateTableLocation;
                     while (alternateTableLocation < rehashPointer) {
                         rightRowKeyForState = alternateRightRowKey.getUnsafe(alternateTableLocation);
-                        if (rightRowKeyForState == EMPTY_RIGHT_STATE) {
+                        if (isStateEmpty(rightRowKeyForState)) {
                             break;
                         } else if (eq(alternateKeySource0.getUnsafe(alternateTableLocation), k0)) {
-                            if (rightRowKeyForState < RowSet.NULL_ROW_KEY) {
+                            if (isStateDeleted(rightRowKeyForState)) {
+                                break;
+                            }
+                            if (rightRowKeyForState <= FIRST_DUPLICATE) {
                                 throw new IllegalStateException("Natural Join found duplicate right key for " + extractKeyStringFromSourceTable(rowKeyChunk.get(chunkPosition)));
                             }
                             alternateLeftRowSet.getUnsafe(alternateTableLocation).insert(rowKeyChunk.get(chunkPosition));
@@ -225,7 +255,12 @@ protected void addLeftSide(RowSequence rowSequence, Chunk[] sourceKeyChunks,
                             Assert.neq(alternateTableLocation, "alternateTableLocation", firstAlternateTableLocation, "firstAlternateTableLocation");
                         }
                     }
-                    numEntries++;
+                    if (firstDeletedLocation >= 0) {
+                        tableLocation = firstDeletedLocation;
+                    } else {
+                        numEntries++;
+                    }
+                    liveEntries++;
                     mainKeySource0.set(tableLocation, k0);
                     mainLeftRowSet.set(tableLocation, RowSetFactory.fromKeys(rowKeyChunk.get(chunkPosition)));
                     mainRightRowKey.set(tableLocation, RowSet.NULL_ROW_KEY);
@@ -233,7 +268,17 @@ protected void addLeftSide(RowSequence rowSequence, Chunk[] sourceKeyChunks,
                     leftRedirections.set(leftRedirectionOffset++, RowSet.NULL_ROW_KEY);
                     break;
                 } else if (eq(mainKeySource0.getUnsafe(tableLocation), k0)) {
-                    if (rightRowKeyForState < RowSet.NULL_ROW_KEY) {
+                    if (isStateDeleted(rightRowKeyForState)) {
+                        tableLocation = firstDeletedLocation;
+                        liveEntries++;
+                        mainKeySource0.set(tableLocation, k0);
+                        mainLeftRowSet.set(tableLocation, RowSetFactory.fromKeys(rowKeyChunk.get(chunkPosition)));
+                        mainRightRowKey.set(tableLocation, RowSet.NULL_ROW_KEY);
+                        mainModifiedTrackerCookieSource.set(tableLocation, -1L);
+                        leftRedirections.set(leftRedirectionOffset++, RowSet.NULL_ROW_KEY);
+                        break;
+                    }
+                    if (rightRowKeyForState <= FIRST_DUPLICATE) {
                         throw new IllegalStateException("Natural Join found duplicate right key for " + extractKeyStringFromSourceTable(rowKeyChunk.get(chunkPosition)));
                     }
                     mainLeftRowSet.getUnsafe(tableLocation).insert(rowKeyChunk.get(chunkPosition));
@@ -257,11 +302,16 @@ protected void removeRight(RowSequence rowSequence, Chunk[] sourceKeyChunks,
             final int hash = hash(k0);
             final int firstTableLocation = hashToTableLocation(hash);
             boolean found = false;
+            boolean searchAlternate = true;
             int tableLocation = firstTableLocation;
             long existingRightRowKey;
-            while ((existingRightRowKey = mainRightRowKey.getUnsafe(tableLocation)) != EMPTY_RIGHT_STATE) {
+            while (!isStateEmpty(existingRightRowKey = mainRightRowKey.getUnsafe(tableLocation))) {
                 if (eq(mainKeySource0.getUnsafe(tableLocation), k0)) {
-                    if (existingRightRowKey < RowSet.NULL_ROW_KEY) {
+                    if (isStateDeleted(existingRightRowKey)) {
+                        searchAlternate = false;
+                        break;
+                    }
+                    if (existingRightRowKey <= FIRST_DUPLICATE) {
                         final long duplicateLocation = duplicateLocationFromRowKey(existingRightRowKey);
                         final WritableRowSet duplicates = rightSideDuplicateRowSets.getUnsafe(duplicateLocation);
                         final long duplicateSize = duplicates.size();
@@ -274,7 +324,13 @@ protected void removeRight(RowSequence rowSequence, Chunk[] sourceKeyChunks,
                     } else if (existingRightRowKey != rowKeyChunk.get(chunkPosition)) {
                         Assert.statementNeverExecuted("Could not find existing right row in state");
                     } else {
-                        mainRightRowKey.set(tableLocation, RowSet.NULL_ROW_KEY);
+                        final boolean leftEmpty = mainLeftRowSet.getUnsafe(tableLocation).isEmpty();
+                        if (leftEmpty) {
+                            mainRightRowKey.set(tableLocation, TOMBSTONE_RIGHT_STATE);
+                            liveEntries--;
+                        } else {
+                            mainRightRowKey.set(tableLocation, RowSet.NULL_ROW_KEY);
+                        }
                         mainModifiedTrackerCookieSource.set(tableLocation, modifiedSlotTracker.addMain(mainModifiedTrackerCookieSource.getUnsafe(tableLocation), mainInsertMask | tableLocation, existingRightRowKey, NaturalJoinModifiedSlotTracker.FLAG_RIGHT_CHANGE));
                     }
                     found = true;
@@ -284,37 +340,50 @@ protected void removeRight(RowSequence rowSequence, Chunk[] sourceKeyChunks,
                 Assert.neq(tableLocation, "tableLocation", firstTableLocation, "firstTableLocation");
             }
             if (!found) {
-                final int firstAlternateTableLocation = hashToTableLocationAlternate(hash);
-                boolean alternateFound = false;
-                if (firstAlternateTableLocation < rehashPointer) {
-                    int alternateTableLocation = firstAlternateTableLocation;
-                    while ((existingRightRowKey = alternateRightRowKey.getUnsafe(alternateTableLocation)) != EMPTY_RIGHT_STATE) {
-                        if (eq(alternateKeySource0.getUnsafe(alternateTableLocation), k0)) {
-                            if (existingRightRowKey < RowSet.NULL_ROW_KEY) {
-                                final long duplicateLocation = duplicateLocationFromRowKey(existingRightRowKey);
-                                final WritableRowSet duplicates = rightSideDuplicateRowSets.getUnsafe(duplicateLocation);
-                                final long duplicateSize = duplicates.size();
-                                duplicates.remove(rowKeyChunk.get(chunkPosition));
-                                Assert.eq(duplicateSize, "duplicateSize", duplicates.size() + 1, "duplicates.size() + 1");
-                                if (duplicates.size() == 1) {
-                                    alternateRightRowKey.set(alternateTableLocation, duplicates.firstRowKey());
-                                    freeDuplicateLocation(duplicateLocation);
+                if (!searchAlternate) {
+                    throw Assert.statementNeverExecuted("Could not find existing state for removed right row");
+                } else {
+                    final int firstAlternateTableLocation = hashToTableLocationAlternate(hash);
+                    boolean alternateFound = false;
+                    if (firstAlternateTableLocation < rehashPointer) {
+                        int alternateTableLocation = firstAlternateTableLocation;
+                        while (!isStateEmpty(existingRightRowKey = alternateRightRowKey.getUnsafe(alternateTableLocation))) {
+                            if (eq(alternateKeySource0.getUnsafe(alternateTableLocation), k0)) {
+                                if (isStateDeleted(existingRightRowKey)) {
+                                    break;
                                 }
-                            } else if (existingRightRowKey != rowKeyChunk.get(chunkPosition)) {
-                                Assert.statementNeverExecuted("Could not find existing right row in state");
-                            } else {
-                                alternateRightRowKey.set(alternateTableLocation, RowSet.NULL_ROW_KEY);
-                                alternateModifiedTrackerCookieSource.set(alternateTableLocation, modifiedSlotTracker.addMain(alternateModifiedTrackerCookieSource.getUnsafe(alternateTableLocation), alternateInsertMask | alternateTableLocation, existingRightRowKey, NaturalJoinModifiedSlotTracker.FLAG_RIGHT_CHANGE));
+                                if (existingRightRowKey <= FIRST_DUPLICATE) {
+                                    final long duplicateLocation = duplicateLocationFromRowKey(existingRightRowKey);
+                                    final WritableRowSet duplicates = rightSideDuplicateRowSets.getUnsafe(duplicateLocation);
+                                    final long duplicateSize = duplicates.size();
+                                    duplicates.remove(rowKeyChunk.get(chunkPosition));
+                                    Assert.eq(duplicateSize, "duplicateSize", duplicates.size() + 1, "duplicates.size() + 1");
+                                    if (duplicates.size() == 1) {
+                                        alternateRightRowKey.set(alternateTableLocation, duplicates.firstRowKey());
+                                        freeDuplicateLocation(duplicateLocation);
+                                    }
+                                } else if (existingRightRowKey != rowKeyChunk.get(chunkPosition)) {
+                                    Assert.statementNeverExecuted("Could not find existing right row in state");
+                                } else {
+                                    final boolean leftEmpty = alternateLeftRowSet.getUnsafe(alternateTableLocation).isEmpty();
+                                    if (leftEmpty) {
+                                        alternateRightRowKey.set(alternateTableLocation, TOMBSTONE_RIGHT_STATE);
+                                        liveEntries--;
+                                    } else {
+                                        alternateRightRowKey.set(alternateTableLocation, RowSet.NULL_ROW_KEY);
+                                    }
+                                    alternateModifiedTrackerCookieSource.set(alternateTableLocation, modifiedSlotTracker.addMain(alternateModifiedTrackerCookieSource.getUnsafe(alternateTableLocation), alternateInsertMask | alternateTableLocation, existingRightRowKey, NaturalJoinModifiedSlotTracker.FLAG_RIGHT_CHANGE));
+                                }
+                                alternateFound = true;
+                                break;
                             }
-                            alternateFound = true;
-                            break;
+                            alternateTableLocation = alternateNextTableLocation(alternateTableLocation);
+                            Assert.neq(alternateTableLocation, "alternateTableLocation", firstAlternateTableLocation, "firstAlternateTableLocation");
                         }
-                        alternateTableLocation = alternateNextTableLocation(alternateTableLocation);
-                        Assert.neq(alternateTableLocation, "alternateTableLocation", firstAlternateTableLocation, "firstAlternateTableLocation");
                     }
-                }
-                if (!alternateFound) {
-                    throw Assert.statementNeverExecuted("Could not find existing state for removed right row");
+                    if (!alternateFound) {
+                        throw Assert.statementNeverExecuted("Could not find existing state for removed right row");
+                    }
                 }
             }
         }
@@ -329,10 +398,15 @@ protected void modifyByRight(RowSequence rowSequence, Chunk[] sourceKeyChunks,
             final int hash = hash(k0);
             final int firstTableLocation = hashToTableLocation(hash);
             boolean found = false;
+            boolean searchAlternate = true;
             int tableLocation = firstTableLocation;
             long existingRightRowKey;
-            while ((existingRightRowKey = mainRightRowKey.getUnsafe(tableLocation)) != EMPTY_RIGHT_STATE) {
+            while (!isStateEmpty(existingRightRowKey = mainRightRowKey.getUnsafe(tableLocation))) {
                 if (eq(mainKeySource0.getUnsafe(tableLocation), k0)) {
+                    if (isStateDeleted(existingRightRowKey)) {
+                        searchAlternate = false;
+                        break;
+                    }
                     mainModifiedTrackerCookieSource.set(tableLocation, modifiedSlotTracker.addMain(mainModifiedTrackerCookieSource.getUnsafe(tableLocation), mainInsertMask | tableLocation, existingRightRowKey, NaturalJoinModifiedSlotTracker.FLAG_RIGHT_CHANGE));
                     found = true;
                     break;
@@ -341,22 +415,29 @@ protected void modifyByRight(RowSequence rowSequence, Chunk[] sourceKeyChunks,
                 Assert.neq(tableLocation, "tableLocation", firstTableLocation, "firstTableLocation");
             }
             if (!found) {
-                final int firstAlternateTableLocation = hashToTableLocationAlternate(hash);
-                boolean alternateFound = false;
-                if (firstAlternateTableLocation < rehashPointer) {
-                    int alternateTableLocation = firstAlternateTableLocation;
-                    while ((existingRightRowKey = alternateRightRowKey.getUnsafe(alternateTableLocation)) != EMPTY_RIGHT_STATE) {
-                        if (eq(alternateKeySource0.getUnsafe(alternateTableLocation), k0)) {
-                            alternateModifiedTrackerCookieSource.set(alternateTableLocation, modifiedSlotTracker.addMain(alternateModifiedTrackerCookieSource.getUnsafe(alternateTableLocation), alternateInsertMask | alternateTableLocation, existingRightRowKey, NaturalJoinModifiedSlotTracker.FLAG_RIGHT_CHANGE));
-                            alternateFound = true;
-                            break;
+                if (!searchAlternate) {
+                    throw Assert.statementNeverExecuted("Could not find existing state for modified right row");
+                } else {
+                    final int firstAlternateTableLocation = hashToTableLocationAlternate(hash);
+                    boolean alternateFound = false;
+                    if (firstAlternateTableLocation < rehashPointer) {
+                        int alternateTableLocation = firstAlternateTableLocation;
+                        while (!isStateEmpty(existingRightRowKey = alternateRightRowKey.getUnsafe(alternateTableLocation))) {
+                            if (eq(alternateKeySource0.getUnsafe(alternateTableLocation), k0)) {
+                                if (isStateDeleted(existingRightRowKey)) {
+                                    break;
+                                }
+                                alternateModifiedTrackerCookieSource.set(alternateTableLocation, modifiedSlotTracker.addMain(alternateModifiedTrackerCookieSource.getUnsafe(alternateTableLocation), alternateInsertMask | alternateTableLocation, existingRightRowKey, NaturalJoinModifiedSlotTracker.FLAG_RIGHT_CHANGE));
+                                alternateFound = true;
+                                break;
+                            }
+                            alternateTableLocation = alternateNextTableLocation(alternateTableLocation);
+                            Assert.neq(alternateTableLocation, "alternateTableLocation", firstAlternateTableLocation, "firstAlternateTableLocation");
                         }
-                        alternateTableLocation = alternateNextTableLocation(alternateTableLocation);
-                        Assert.neq(alternateTableLocation, "alternateTableLocation", firstAlternateTableLocation, "firstAlternateTableLocation");
                     }
-                }
-                if (!alternateFound) {
-                    throw Assert.statementNeverExecuted("Could not find existing state for modified right row");
+                    if (!alternateFound) {
+                        throw Assert.statementNeverExecuted("Could not find existing state for modified right row");
+                    }
                 }
             }
         }
@@ -373,15 +454,20 @@ protected void applyRightShift(RowSequence rowSequence, Chunk[] sourceKeyChunks,
             final int hash = hash(k0);
             final int firstTableLocation = hashToTableLocation(hash);
             boolean found = false;
+            boolean searchAlternate = true;
             int tableLocation = firstTableLocation;
             long existingRightRowKey;
-            while ((existingRightRowKey = mainRightRowKey.getUnsafe(tableLocation)) != EMPTY_RIGHT_STATE) {
+            while (!isStateEmpty(existingRightRowKey = mainRightRowKey.getUnsafe(tableLocation))) {
                 if (eq(mainKeySource0.getUnsafe(tableLocation), k0)) {
+                    if (isStateDeleted(existingRightRowKey)) {
+                        searchAlternate = false;
+                        break;
+                    }
                     final long keyToShift = rowKeyChunk.get(chunkPosition);
                     if (existingRightRowKey == keyToShift - shiftDelta) {
                         mainRightRowKey.set(tableLocation, keyToShift);
                         mainModifiedTrackerCookieSource.set(tableLocation, modifiedSlotTracker.addMain(mainModifiedTrackerCookieSource.getUnsafe(tableLocation), mainInsertMask | tableLocation, existingRightRowKey, NaturalJoinModifiedSlotTracker.FLAG_RIGHT_SHIFT));
-                    } else if (existingRightRowKey < RowSet.NULL_ROW_KEY) {
+                    } else if (existingRightRowKey <= FIRST_DUPLICATE) {
                         final long duplicateLocation = duplicateLocationFromRowKey(existingRightRowKey);
                         if (shiftDelta < 0) {
                             final WritableRowSet duplicates = rightSideDuplicateRowSets.getUnsafe(duplicateLocation);
@@ -400,37 +486,44 @@ protected void applyRightShift(RowSequence rowSequence, Chunk[] sourceKeyChunks,
                 Assert.neq(tableLocation, "tableLocation", firstTableLocation, "firstTableLocation");
             }
             if (!found) {
-                final int firstAlternateTableLocation = hashToTableLocationAlternate(hash);
-                boolean alternateFound = false;
-                if (firstAlternateTableLocation < rehashPointer) {
-                    int alternateTableLocation = firstAlternateTableLocation;
-                    while ((existingRightRowKey = alternateRightRowKey.getUnsafe(alternateTableLocation)) != EMPTY_RIGHT_STATE) {
-                        if (eq(alternateKeySource0.getUnsafe(alternateTableLocation), k0)) {
-                            final long keyToShift = rowKeyChunk.get(chunkPosition);
-                            if (existingRightRowKey == keyToShift - shiftDelta) {
-                                alternateRightRowKey.set(alternateTableLocation, keyToShift);
-                                alternateModifiedTrackerCookieSource.set(alternateTableLocation, modifiedSlotTracker.addMain(alternateModifiedTrackerCookieSource.getUnsafe(alternateTableLocation), alternateInsertMask | alternateTableLocation, existingRightRowKey, NaturalJoinModifiedSlotTracker.FLAG_RIGHT_SHIFT));
-                            } else if (existingRightRowKey < RowSet.NULL_ROW_KEY) {
-                                final long duplicateLocation = duplicateLocationFromRowKey(existingRightRowKey);
-                                if (shiftDelta < 0) {
-                                    final WritableRowSet duplicates = rightSideDuplicateRowSets.getUnsafe(duplicateLocation);
-                                    shiftOneKey(duplicates, keyToShift, shiftDelta);
+                if (!searchAlternate) {
+                    throw Assert.statementNeverExecuted("Could not find existing state for shifted right row");
+                } else {
+                    final int firstAlternateTableLocation = hashToTableLocationAlternate(hash);
+                    boolean alternateFound = false;
+                    if (firstAlternateTableLocation < rehashPointer) {
+                        int alternateTableLocation = firstAlternateTableLocation;
+                        while (!isStateEmpty(existingRightRowKey = alternateRightRowKey.getUnsafe(alternateTableLocation))) {
+                            if (eq(alternateKeySource0.getUnsafe(alternateTableLocation), k0)) {
+                                if (isStateDeleted(existingRightRowKey)) {
+                                    break;
+                                }
+                                final long keyToShift = rowKeyChunk.get(chunkPosition);
+                                if (existingRightRowKey == keyToShift - shiftDelta) {
+                                    alternateRightRowKey.set(alternateTableLocation, keyToShift);
+                                    alternateModifiedTrackerCookieSource.set(alternateTableLocation, modifiedSlotTracker.addMain(alternateModifiedTrackerCookieSource.getUnsafe(alternateTableLocation), alternateInsertMask | alternateTableLocation, existingRightRowKey, NaturalJoinModifiedSlotTracker.FLAG_RIGHT_SHIFT));
+                                } else if (existingRightRowKey <= FIRST_DUPLICATE) {
+                                    final long duplicateLocation = duplicateLocationFromRowKey(existingRightRowKey);
+                                    if (shiftDelta < 0) {
+                                        final WritableRowSet duplicates = rightSideDuplicateRowSets.getUnsafe(duplicateLocation);
+                                        shiftOneKey(duplicates, keyToShift, shiftDelta);
+                                    } else {
+                                        pc.pendingShifts.set(pc.pendingShiftPointer++, (long)duplicateLocation);
+                                        pc.pendingShifts.set(pc.pendingShiftPointer++, keyToShift);
+                                    }
                                 } else {
-                                    pc.pendingShifts.set(pc.pendingShiftPointer++, (long)duplicateLocation);
-                                    pc.pendingShifts.set(pc.pendingShiftPointer++, keyToShift);
+                                    throw Assert.statementNeverExecuted("Could not find existing index for shifted right row");
                                 }
-                            } else {
-                                throw Assert.statementNeverExecuted("Could not find existing index for shifted right row");
+                                alternateFound = true;
+                                break;
                             }
-                            alternateFound = true;
-                            break;
+                            alternateTableLocation = alternateNextTableLocation(alternateTableLocation);
+                            Assert.neq(alternateTableLocation, "alternateTableLocation", firstAlternateTableLocation, "firstAlternateTableLocation");
                         }
-                        alternateTableLocation = alternateNextTableLocation(alternateTableLocation);
-                        Assert.neq(alternateTableLocation, "alternateTableLocation", firstAlternateTableLocation, "firstAlternateTableLocation");
                     }
-                }
-                if (!alternateFound) {
-                    throw Assert.statementNeverExecuted("Could not find existing state for shifted right row");
+                    if (!alternateFound) {
+                        throw Assert.statementNeverExecuted("Could not find existing state for shifted right row");
+                    }
                 }
             }
         }
@@ -445,10 +538,21 @@ protected void removeLeft(RowSequence rowSequence, Chunk[] sourceKeyChunks) {
             final int hash = hash(k0);
             final int firstTableLocation = hashToTableLocation(hash);
             boolean found = false;
+            boolean searchAlternate = true;
             int tableLocation = firstTableLocation;
-            while (mainRightRowKey.getUnsafe(tableLocation) != EMPTY_RIGHT_STATE) {
+            long rightState;
+            while (!isStateEmpty(rightState = mainRightRowKey.getUnsafe(tableLocation))) {
                 if (eq(mainKeySource0.getUnsafe(tableLocation), k0)) {
-                    mainLeftRowSet.getUnsafe(tableLocation).remove(rowKeyChunk.get(chunkPosition));
+                    if (isStateDeleted(rightState)) {
+                        searchAlternate = false;
+                        break;
+                    }
+                    final WritableRowSet left = mainLeftRowSet.getUnsafe(tableLocation);
+                    left.remove(rowKeyChunk.get(chunkPosition));
+                    if (left.isEmpty() && rightState == RowSet.NULL_ROW_KEY) {
+                        mainRightRowKey.set(tableLocation, TOMBSTONE_RIGHT_STATE);
+                        liveEntries--;
+                    }
                     found = true;
                     break;
                 }
@@ -456,22 +560,34 @@ protected void removeLeft(RowSequence rowSequence, Chunk[] sourceKeyChunks) {
                 Assert.neq(tableLocation, "tableLocation", firstTableLocation, "firstTableLocation");
             }
             if (!found) {
-                final int firstAlternateTableLocation = hashToTableLocationAlternate(hash);
-                boolean alternateFound = false;
-                if (firstAlternateTableLocation < rehashPointer) {
-                    int alternateTableLocation = firstAlternateTableLocation;
-                    while (alternateRightRowKey.getUnsafe(alternateTableLocation) != EMPTY_RIGHT_STATE) {
-                        if (eq(alternateKeySource0.getUnsafe(alternateTableLocation), k0)) {
-                            alternateLeftRowSet.getUnsafe(alternateTableLocation).remove(rowKeyChunk.get(chunkPosition));
-                            alternateFound = true;
-                            break;
+                if (!searchAlternate) {
+                    throw Assert.statementNeverExecuted("Could not find existing state for removed left row");
+                } else {
+                    final int firstAlternateTableLocation = hashToTableLocationAlternate(hash);
+                    boolean alternateFound = false;
+                    if (firstAlternateTableLocation < rehashPointer) {
+                        int alternateTableLocation = firstAlternateTableLocation;
+                        while (!isStateEmpty(rightState = alternateRightRowKey.getUnsafe(alternateTableLocation))) {
+                            if (eq(alternateKeySource0.getUnsafe(alternateTableLocation), k0)) {
+                                if (isStateDeleted(rightState)) {
+                                    break;
+                                }
+                                final WritableRowSet left = alternateLeftRowSet.getUnsafe(alternateTableLocation);
+                                left.remove(rowKeyChunk.get(chunkPosition));
+                                if (left.isEmpty() && rightState == RowSet.NULL_ROW_KEY) {
+                                    alternateRightRowKey.set(alternateTableLocation, TOMBSTONE_RIGHT_STATE);
+                                    liveEntries--;
+                                }
+                                alternateFound = true;
+                                break;
+                            }
+                            alternateTableLocation = alternateNextTableLocation(alternateTableLocation);
+                            Assert.neq(alternateTableLocation, "alternateTableLocation", firstAlternateTableLocation, "firstAlternateTableLocation");
                         }
-                        alternateTableLocation = alternateNextTableLocation(alternateTableLocation);
-                        Assert.neq(alternateTableLocation, "alternateTableLocation", firstAlternateTableLocation, "firstAlternateTableLocation");
                     }
-                }
-                if (!alternateFound) {
-                    throw Assert.statementNeverExecuted("Could not find existing state for removed left row");
+                    if (!alternateFound) {
+                        throw Assert.statementNeverExecuted("Could not find existing state for removed left row");
+                    }
                 }
             }
         }
@@ -487,9 +603,15 @@ protected void applyLeftShift(RowSequence rowSequence, Chunk[] sourceKeyChunks,
             final int hash = hash(k0);
             final int firstTableLocation = hashToTableLocation(hash);
             boolean found = false;
+            boolean searchAlternate = true;
             int tableLocation = firstTableLocation;
-            while (mainRightRowKey.getUnsafe(tableLocation) != EMPTY_RIGHT_STATE) {
+            long stateValue;
+            while (!isStateEmpty(stateValue = mainRightRowKey.getUnsafe(tableLocation))) {
                 if (eq(mainKeySource0.getUnsafe(tableLocation), k0)) {
+                    if (isStateDeleted(stateValue)) {
+                        searchAlternate = false;
+                        break;
+                    }
                     final WritableRowSet leftRowSetForState = mainLeftRowSet.getUnsafe(tableLocation);
                     final long keyToShift = rowKeyChunk.get(chunkPosition);
                     if (shiftDelta < 0) {
@@ -505,29 +627,36 @@ protected void applyLeftShift(RowSequence rowSequence, Chunk[] sourceKeyChunks,
                 Assert.neq(tableLocation, "tableLocation", firstTableLocation, "firstTableLocation");
             }
             if (!found) {
-                final int firstAlternateTableLocation = hashToTableLocationAlternate(hash);
-                boolean alternateFound = false;
-                if (firstAlternateTableLocation < rehashPointer) {
-                    int alternateTableLocation = firstAlternateTableLocation;
-                    while (alternateRightRowKey.getUnsafe(alternateTableLocation) != EMPTY_RIGHT_STATE) {
-                        if (eq(alternateKeySource0.getUnsafe(alternateTableLocation), k0)) {
-                            final WritableRowSet leftRowSetForState = alternateLeftRowSet.getUnsafe(alternateTableLocation);
-                            final long keyToShift = rowKeyChunk.get(chunkPosition);
-                            if (shiftDelta < 0) {
-                                shiftOneKey(leftRowSetForState, keyToShift, shiftDelta);
-                            } else {
-                                pc.pendingShifts.set(pc.pendingShiftPointer++, (long)(AlternatingColumnSource.ALTERNATE_SWITCH_MASK | alternateTableLocation));
-                                pc.pendingShifts.set(pc.pendingShiftPointer++, keyToShift);
+                if (!searchAlternate) {
+                    throw Assert.statementNeverExecuted("Could not find existing state for shifted left row");
+                } else {
+                    final int firstAlternateTableLocation = hashToTableLocationAlternate(hash);
+                    boolean alternateFound = false;
+                    if (firstAlternateTableLocation < rehashPointer) {
+                        int alternateTableLocation = firstAlternateTableLocation;
+                        while (!isStateEmpty(stateValue = alternateRightRowKey.getUnsafe(alternateTableLocation))) {
+                            if (eq(alternateKeySource0.getUnsafe(alternateTableLocation), k0)) {
+                                if (isStateDeleted(stateValue)) {
+                                    break;
+                                }
+                                final WritableRowSet leftRowSetForState = alternateLeftRowSet.getUnsafe(alternateTableLocation);
+                                final long keyToShift = rowKeyChunk.get(chunkPosition);
+                                if (shiftDelta < 0) {
+                                    shiftOneKey(leftRowSetForState, keyToShift, shiftDelta);
+                                } else {
+                                    pc.pendingShifts.set(pc.pendingShiftPointer++, (long)(AlternatingColumnSource.ALTERNATE_SWITCH_MASK | alternateTableLocation));
+                                    pc.pendingShifts.set(pc.pendingShiftPointer++, keyToShift);
+                                }
+                                alternateFound = true;
+                                break;
                             }
-                            alternateFound = true;
-                            break;
+                            alternateTableLocation = alternateNextTableLocation(alternateTableLocation);
+                            Assert.neq(alternateTableLocation, "alternateTableLocation", firstAlternateTableLocation, "firstAlternateTableLocation");
                         }
-                        alternateTableLocation = alternateNextTableLocation(alternateTableLocation);
-                        Assert.neq(alternateTableLocation, "alternateTableLocation", firstAlternateTableLocation, "firstAlternateTableLocation");
                     }
-                }
-                if (!alternateFound) {
-                    throw Assert.statementNeverExecuted("Could not find existing state for shifted left row");
+                    if (!alternateFound) {
+                        throw Assert.statementNeverExecuted("Could not find existing state for shifted left row");
+                    }
                 }
             }
         }
@@ -538,16 +667,30 @@ private static int hash(byte k0) {
         return hash;
     }
 
-    private boolean migrateOneLocation(int locationToMigrate,
+    private static boolean isStateEmpty(long state) {
+        return state == EMPTY_RIGHT_STATE;
+    }
+
+    private static boolean isStateDeleted(long state) {
+        return state == TOMBSTONE_RIGHT_STATE;
+    }
+
+    private boolean migrateOneLocation(int locationToMigrate, boolean trueOnDeletedEntry,
             NaturalJoinModifiedSlotTracker modifiedSlotTracker) {
         final long currentStateValue = alternateRightRowKey.getUnsafe(locationToMigrate);
-        if (currentStateValue == EMPTY_RIGHT_STATE) {
+        if (isStateEmpty(currentStateValue)) {
             return false;
         }
+        if (isStateDeleted(currentStateValue)) {
+            alternateEntries--;
+            alternateRightRowKey.set(locationToMigrate, EMPTY_RIGHT_STATE);
+            return trueOnDeletedEntry;
+        }
         final byte k0 = alternateKeySource0.getUnsafe(locationToMigrate);
         final int hash = hash(k0);
         int destinationTableLocation = hashToTableLocation(hash);
-        while (mainRightRowKey.getUnsafe(destinationTableLocation) != EMPTY_RIGHT_STATE) {
+        long candidateState;
+        while (!isStateEmpty(candidateState = mainRightRowKey.getUnsafe(destinationTableLocation)) && !isStateDeleted(candidateState)) {
             destinationTableLocation = nextTableLocation(destinationTableLocation);
         }
         mainKeySource0.set(destinationTableLocation, k0);
@@ -559,6 +702,10 @@ private boolean migrateOneLocation(int locationToMigrate,
         alternateModifiedTrackerCookieSource.set(locationToMigrate, -1L);
         modifiedSlotTracker.moveTableLocation(cookie, locationToMigrate, mainInsertMask | destinationTableLocation);;
         alternateRightRowKey.set(locationToMigrate, EMPTY_RIGHT_STATE);
+        if (!isStateDeleted(candidateState)) {
+            numEntries++;
+        }
+        alternateEntries--;
         return true;
     }
 
@@ -567,7 +714,7 @@ protected int rehashInternalPartial(int entriesToRehash,
             NaturalJoinModifiedSlotTracker modifiedSlotTracker) {
         int rehashedEntries = 0;
         while (rehashPointer > 0 && rehashedEntries < entriesToRehash) {
-            if (migrateOneLocation(--rehashPointer, modifiedSlotTracker)) {
+            if (migrateOneLocation(--rehashPointer, false, modifiedSlotTracker)) {
                 rehashedEntries++;
             }
         }
@@ -575,8 +722,7 @@ protected int rehashInternalPartial(int entriesToRehash,
     }
 
     @Override
-    protected void newAlternate() {
-        super.newAlternate();
+    protected void adviseNewAlternate() {
         this.mainKeySource0 = (ImmutableByteArraySource)super.mainKeySources[0];
         this.alternateKeySource0 = (ImmutableByteArraySource)super.alternateKeySources[0];
     }
@@ -590,7 +736,7 @@ protected void clearAlternate() {
     @Override
     protected void migrateFront(NaturalJoinModifiedSlotTracker modifiedSlotTracker) {
         int location = 0;
-        while (migrateOneLocation(location++, modifiedSlotTracker));
+        while (migrateOneLocation(location++, true, modifiedSlotTracker) && location < alternateTableSize);
     }
 
     @Override
@@ -610,7 +756,7 @@ protected void rehashInternalFull(final int oldSize) {
         mainModifiedTrackerCookieSource.setArray(destModifiedCookie);
         for (int sourceBucket = 0; sourceBucket < oldSize; ++sourceBucket) {
             final long currentStateValue = originalStateArray[sourceBucket];
-            if (currentStateValue == EMPTY_RIGHT_STATE) {
+            if (isStateEmpty(currentStateValue)) {
                 continue;
             }
             final byte k0 = originalKeyArray0[sourceBucket];
@@ -618,7 +764,7 @@ protected void rehashInternalFull(final int oldSize) {
             final int firstDestinationTableLocation = hashToTableLocation(hash);
             int destinationTableLocation = firstDestinationTableLocation;
             while (true) {
-                if (destState[destinationTableLocation] == EMPTY_RIGHT_STATE) {
+                if (isStateEmpty(destState[destinationTableLocation])) {
                     destKeyArray0[destinationTableLocation] = k0;
                     destState[destinationTableLocation] = originalStateArray[sourceBucket];
                     destLeftRowSet[destinationTableLocation] = oldLeftRowSet[sourceBucket];
diff --git a/engine/table/src/main/java/io/deephaven/engine/table/impl/naturaljoin/typed/incopen/gen/IncrementalNaturalJoinHasherChar.java b/engine/table/src/main/java/io/deephaven/engine/table/impl/naturaljoin/typed/incopen/gen/IncrementalNaturalJoinHasherChar.java
index 2f726855f13..b0e370c1b5a 100644
--- a/engine/table/src/main/java/io/deephaven/engine/table/impl/naturaljoin/typed/incopen/gen/IncrementalNaturalJoinHasherChar.java
+++ b/engine/table/src/main/java/io/deephaven/engine/table/impl/naturaljoin/typed/incopen/gen/IncrementalNaturalJoinHasherChar.java
@@ -62,15 +62,16 @@ protected void buildFromLeftSide(RowSequence rowSequence, Chunk[] sourceKeyChunk
             int tableLocation = firstTableLocation;
             MAIN_SEARCH: while (true) {
                 long rightRowKeyForState = mainRightRowKey.getUnsafe(tableLocation);
-                if (rightRowKeyForState == EMPTY_RIGHT_STATE) {
+                if (isStateEmpty(rightRowKeyForState)) {
                     numEntries++;
+                    liveEntries++;
                     mainKeySource0.set(tableLocation, k0);
                     mainLeftRowSet.set(tableLocation, RowSetFactory.fromKeys(rowKeyChunk.get(chunkPosition)));
                     mainRightRowKey.set(tableLocation, RowSet.NULL_ROW_KEY);
                     mainModifiedTrackerCookieSource.set(tableLocation, -1L);
                     break;
                 } else if (eq(mainKeySource0.getUnsafe(tableLocation), k0)) {
-                    if (rightRowKeyForState < RowSet.NULL_ROW_KEY) {
+                    if (rightRowKeyForState <= FIRST_DUPLICATE) {
                         throw new IllegalStateException("Natural Join found duplicate right key for " + extractKeyStringFromSourceTable(rowKeyChunk.get(chunkPosition)));
                     }
                     mainLeftRowSet.getUnsafe(tableLocation).insert(rowKeyChunk.get(chunkPosition));
@@ -95,8 +96,9 @@ protected void buildFromRightSide(RowSequence rowSequence, Chunk[] sourceKeyChun
             int tableLocation = firstTableLocation;
             MAIN_SEARCH: while (true) {
                 long existingRightRowKey = mainRightRowKey.getUnsafe(tableLocation);
-                if (existingRightRowKey == EMPTY_RIGHT_STATE) {
+                if (isStateEmpty(existingRightRowKey)) {
                     numEntries++;
+                    liveEntries++;
                     mainKeySource0.set(tableLocation, k0);
                     mainLeftRowSet.set(tableLocation, RowSetFactory.empty());
                     mainRightRowKey.set(tableLocation, rowKeyChunk.get(chunkPosition));
@@ -105,7 +107,7 @@ protected void buildFromRightSide(RowSequence rowSequence, Chunk[] sourceKeyChun
                 } else if (eq(mainKeySource0.getUnsafe(tableLocation), k0)) {
                     if (existingRightRowKey == RowSet.NULL_ROW_KEY) {
                         mainRightRowKey.set(tableLocation, rowKeyChunk.get(chunkPosition));
-                    } else if (existingRightRowKey < RowSet.NULL_ROW_KEY) {
+                    } else if (existingRightRowKey <= FIRST_DUPLICATE) {
                         final long duplicateLocation = duplicateLocationFromRowKey(existingRightRowKey);
                         rightSideDuplicateRowSets.getUnsafe(duplicateLocation).insert(rowKeyChunk.get(chunkPosition));
                     } else {
@@ -132,20 +134,27 @@ protected void addRightSide(RowSequence rowSequence, Chunk[] sourceKeyChunks,
             final int hash = hash(k0);
             final int firstTableLocation = hashToTableLocation(hash);
             int tableLocation = firstTableLocation;
+            int firstDeletedLocation = -1;
             MAIN_SEARCH: while (true) {
                 long existingRightRowKey = mainRightRowKey.getUnsafe(tableLocation);
-                if (existingRightRowKey == EMPTY_RIGHT_STATE) {
+                if (firstDeletedLocation < 0 && isStateDeleted(existingRightRowKey)) {
+                    firstDeletedLocation = tableLocation;
+                }
+                if (isStateEmpty(existingRightRowKey)) {
                     final int firstAlternateTableLocation = hashToTableLocationAlternate(hash);
                     int alternateTableLocation = firstAlternateTableLocation;
                     while (alternateTableLocation < rehashPointer) {
                         existingRightRowKey = alternateRightRowKey.getUnsafe(alternateTableLocation);
-                        if (existingRightRowKey == EMPTY_RIGHT_STATE) {
+                        if (isStateEmpty(existingRightRowKey)) {
                             break;
                         } else if (eq(alternateKeySource0.getUnsafe(alternateTableLocation), k0)) {
+                            if (isStateDeleted(existingRightRowKey)) {
+                                break;
+                            }
                             if (existingRightRowKey == RowSet.NULL_ROW_KEY) {
                                 alternateRightRowKey.set(alternateTableLocation, rowKeyChunk.get(chunkPosition));
                                 alternateModifiedTrackerCookieSource.set(alternateTableLocation, modifiedSlotTracker.addMain(alternateModifiedTrackerCookieSource.getUnsafe(alternateTableLocation), alternateInsertMask | alternateTableLocation, existingRightRowKey, NaturalJoinModifiedSlotTracker.FLAG_RIGHT_CHANGE));
-                            } else if (existingRightRowKey < RowSet.NULL_ROW_KEY) {
+                            } else if (existingRightRowKey <= FIRST_DUPLICATE) {
                                 final long duplicateLocation = duplicateLocationFromRowKey(existingRightRowKey);
                                 final WritableRowSet duplicates = rightSideDuplicateRowSets.getUnsafe(duplicateLocation);
                                 final long duplicateSize = duplicates.size();
@@ -163,17 +172,31 @@ protected void addRightSide(RowSequence rowSequence, Chunk[] sourceKeyChunks,
                             Assert.neq(alternateTableLocation, "alternateTableLocation", firstAlternateTableLocation, "firstAlternateTableLocation");
                         }
                     }
-                    numEntries++;
+                    if (firstDeletedLocation >= 0) {
+                        tableLocation = firstDeletedLocation;
+                    } else {
+                        numEntries++;
+                    }
+                    liveEntries++;
                     mainKeySource0.set(tableLocation, k0);
                     mainLeftRowSet.set(tableLocation, RowSetFactory.empty());
                     mainRightRowKey.set(tableLocation, rowKeyChunk.get(chunkPosition));
                     mainModifiedTrackerCookieSource.set(tableLocation, modifiedSlotTracker.addMain(-1, mainInsertMask | tableLocation, existingRightRowKey, NaturalJoinModifiedSlotTracker.FLAG_RIGHT_CHANGE));
                     break;
                 } else if (eq(mainKeySource0.getUnsafe(tableLocation), k0)) {
+                    if (isStateDeleted(existingRightRowKey)) {
+                        tableLocation = firstDeletedLocation;
+                        liveEntries++;
+                        mainKeySource0.set(tableLocation, k0);
+                        mainLeftRowSet.set(tableLocation, RowSetFactory.empty());
+                        mainRightRowKey.set(tableLocation, rowKeyChunk.get(chunkPosition));
+                        mainModifiedTrackerCookieSource.set(tableLocation, modifiedSlotTracker.addMain(-1, mainInsertMask | tableLocation, existingRightRowKey, NaturalJoinModifiedSlotTracker.FLAG_RIGHT_CHANGE));
+                        break;
+                    }
                     if (existingRightRowKey == RowSet.NULL_ROW_KEY) {
                         mainRightRowKey.set(tableLocation, rowKeyChunk.get(chunkPosition));
                         mainModifiedTrackerCookieSource.set(tableLocation, modifiedSlotTracker.addMain(mainModifiedTrackerCookieSource.getUnsafe(tableLocation), mainInsertMask | tableLocation, existingRightRowKey, NaturalJoinModifiedSlotTracker.FLAG_RIGHT_CHANGE));
-                    } else if (existingRightRowKey < RowSet.NULL_ROW_KEY) {
+                    } else if (existingRightRowKey <= FIRST_DUPLICATE) {
                         final long duplicateLocation = duplicateLocationFromRowKey(existingRightRowKey);
                         final WritableRowSet duplicates = rightSideDuplicateRowSets.getUnsafe(duplicateLocation);
                         final long duplicateSize = duplicates.size();
@@ -204,17 +227,24 @@ protected void addLeftSide(RowSequence rowSequence, Chunk[] sourceKeyChunks,
             final int hash = hash(k0);
             final int firstTableLocation = hashToTableLocation(hash);
             int tableLocation = firstTableLocation;
+            int firstDeletedLocation = -1;
             MAIN_SEARCH: while (true) {
                 long rightRowKeyForState = mainRightRowKey.getUnsafe(tableLocation);
-                if (rightRowKeyForState == EMPTY_RIGHT_STATE) {
+                if (firstDeletedLocation < 0 && isStateDeleted(rightRowKeyForState)) {
+                    firstDeletedLocation = tableLocation;
+                }
+                if (isStateEmpty(rightRowKeyForState)) {
                     final int firstAlternateTableLocation = hashToTableLocationAlternate(hash);
                     int alternateTableLocation = firstAlternateTableLocation;
                     while (alternateTableLocation < rehashPointer) {
                         rightRowKeyForState = alternateRightRowKey.getUnsafe(alternateTableLocation);
-                        if (rightRowKeyForState == EMPTY_RIGHT_STATE) {
+                        if (isStateEmpty(rightRowKeyForState)) {
                             break;
                         } else if (eq(alternateKeySource0.getUnsafe(alternateTableLocation), k0)) {
-                            if (rightRowKeyForState < RowSet.NULL_ROW_KEY) {
+                            if (isStateDeleted(rightRowKeyForState)) {
+                                break;
+                            }
+                            if (rightRowKeyForState <= FIRST_DUPLICATE) {
                                 throw new IllegalStateException("Natural Join found duplicate right key for " + extractKeyStringFromSourceTable(rowKeyChunk.get(chunkPosition)));
                             }
                             alternateLeftRowSet.getUnsafe(alternateTableLocation).insert(rowKeyChunk.get(chunkPosition));
@@ -225,7 +255,12 @@ protected void addLeftSide(RowSequence rowSequence, Chunk[] sourceKeyChunks,
                             Assert.neq(alternateTableLocation, "alternateTableLocation", firstAlternateTableLocation, "firstAlternateTableLocation");
                         }
                     }
-                    numEntries++;
+                    if (firstDeletedLocation >= 0) {
+                        tableLocation = firstDeletedLocation;
+                    } else {
+                        numEntries++;
+                    }
+                    liveEntries++;
                     mainKeySource0.set(tableLocation, k0);
                     mainLeftRowSet.set(tableLocation, RowSetFactory.fromKeys(rowKeyChunk.get(chunkPosition)));
                     mainRightRowKey.set(tableLocation, RowSet.NULL_ROW_KEY);
@@ -233,7 +268,17 @@ protected void addLeftSide(RowSequence rowSequence, Chunk[] sourceKeyChunks,
                     leftRedirections.set(leftRedirectionOffset++, RowSet.NULL_ROW_KEY);
                     break;
                 } else if (eq(mainKeySource0.getUnsafe(tableLocation), k0)) {
-                    if (rightRowKeyForState < RowSet.NULL_ROW_KEY) {
+                    if (isStateDeleted(rightRowKeyForState)) {
+                        tableLocation = firstDeletedLocation;
+                        liveEntries++;
+                        mainKeySource0.set(tableLocation, k0);
+                        mainLeftRowSet.set(tableLocation, RowSetFactory.fromKeys(rowKeyChunk.get(chunkPosition)));
+                        mainRightRowKey.set(tableLocation, RowSet.NULL_ROW_KEY);
+                        mainModifiedTrackerCookieSource.set(tableLocation, -1L);
+                        leftRedirections.set(leftRedirectionOffset++, RowSet.NULL_ROW_KEY);
+                        break;
+                    }
+                    if (rightRowKeyForState <= FIRST_DUPLICATE) {
                         throw new IllegalStateException("Natural Join found duplicate right key for " + extractKeyStringFromSourceTable(rowKeyChunk.get(chunkPosition)));
                     }
                     mainLeftRowSet.getUnsafe(tableLocation).insert(rowKeyChunk.get(chunkPosition));
@@ -257,11 +302,16 @@ protected void removeRight(RowSequence rowSequence, Chunk[] sourceKeyChunks,
             final int hash = hash(k0);
             final int firstTableLocation = hashToTableLocation(hash);
             boolean found = false;
+            boolean searchAlternate = true;
             int tableLocation = firstTableLocation;
             long existingRightRowKey;
-            while ((existingRightRowKey = mainRightRowKey.getUnsafe(tableLocation)) != EMPTY_RIGHT_STATE) {
+            while (!isStateEmpty(existingRightRowKey = mainRightRowKey.getUnsafe(tableLocation))) {
                 if (eq(mainKeySource0.getUnsafe(tableLocation), k0)) {
-                    if (existingRightRowKey < RowSet.NULL_ROW_KEY) {
+                    if (isStateDeleted(existingRightRowKey)) {
+                        searchAlternate = false;
+                        break;
+                    }
+                    if (existingRightRowKey <= FIRST_DUPLICATE) {
                         final long duplicateLocation = duplicateLocationFromRowKey(existingRightRowKey);
                         final WritableRowSet duplicates = rightSideDuplicateRowSets.getUnsafe(duplicateLocation);
                         final long duplicateSize = duplicates.size();
@@ -274,7 +324,13 @@ protected void removeRight(RowSequence rowSequence, Chunk[] sourceKeyChunks,
                     } else if (existingRightRowKey != rowKeyChunk.get(chunkPosition)) {
                         Assert.statementNeverExecuted("Could not find existing right row in state");
                     } else {
-                        mainRightRowKey.set(tableLocation, RowSet.NULL_ROW_KEY);
+                        final boolean leftEmpty = mainLeftRowSet.getUnsafe(tableLocation).isEmpty();
+                        if (leftEmpty) {
+                            mainRightRowKey.set(tableLocation, TOMBSTONE_RIGHT_STATE);
+                            liveEntries--;
+                        } else {
+                            mainRightRowKey.set(tableLocation, RowSet.NULL_ROW_KEY);
+                        }
                         mainModifiedTrackerCookieSource.set(tableLocation, modifiedSlotTracker.addMain(mainModifiedTrackerCookieSource.getUnsafe(tableLocation), mainInsertMask | tableLocation, existingRightRowKey, NaturalJoinModifiedSlotTracker.FLAG_RIGHT_CHANGE));
                     }
                     found = true;
@@ -284,37 +340,50 @@ protected void removeRight(RowSequence rowSequence, Chunk[] sourceKeyChunks,
                 Assert.neq(tableLocation, "tableLocation", firstTableLocation, "firstTableLocation");
             }
             if (!found) {
-                final int firstAlternateTableLocation = hashToTableLocationAlternate(hash);
-                boolean alternateFound = false;
-                if (firstAlternateTableLocation < rehashPointer) {
-                    int alternateTableLocation = firstAlternateTableLocation;
-                    while ((existingRightRowKey = alternateRightRowKey.getUnsafe(alternateTableLocation)) != EMPTY_RIGHT_STATE) {
-                        if (eq(alternateKeySource0.getUnsafe(alternateTableLocation), k0)) {
-                            if (existingRightRowKey < RowSet.NULL_ROW_KEY) {
-                                final long duplicateLocation = duplicateLocationFromRowKey(existingRightRowKey);
-                                final WritableRowSet duplicates = rightSideDuplicateRowSets.getUnsafe(duplicateLocation);
-                                final long duplicateSize = duplicates.size();
-                                duplicates.remove(rowKeyChunk.get(chunkPosition));
-                                Assert.eq(duplicateSize, "duplicateSize", duplicates.size() + 1, "duplicates.size() + 1");
-                                if (duplicates.size() == 1) {
-                                    alternateRightRowKey.set(alternateTableLocation, duplicates.firstRowKey());
-                                    freeDuplicateLocation(duplicateLocation);
+                if (!searchAlternate) {
+                    throw Assert.statementNeverExecuted("Could not find existing state for removed right row");
+                } else {
+                    final int firstAlternateTableLocation = hashToTableLocationAlternate(hash);
+                    boolean alternateFound = false;
+                    if (firstAlternateTableLocation < rehashPointer) {
+                        int alternateTableLocation = firstAlternateTableLocation;
+                        while (!isStateEmpty(existingRightRowKey = alternateRightRowKey.getUnsafe(alternateTableLocation))) {
+                            if (eq(alternateKeySource0.getUnsafe(alternateTableLocation), k0)) {
+                                if (isStateDeleted(existingRightRowKey)) {
+                                    break;
                                 }
-                            } else if (existingRightRowKey != rowKeyChunk.get(chunkPosition)) {
-                                Assert.statementNeverExecuted("Could not find existing right row in state");
-                            } else {
-                                alternateRightRowKey.set(alternateTableLocation, RowSet.NULL_ROW_KEY);
-                                alternateModifiedTrackerCookieSource.set(alternateTableLocation, modifiedSlotTracker.addMain(alternateModifiedTrackerCookieSource.getUnsafe(alternateTableLocation), alternateInsertMask | alternateTableLocation, existingRightRowKey, NaturalJoinModifiedSlotTracker.FLAG_RIGHT_CHANGE));
+                                if (existingRightRowKey <= FIRST_DUPLICATE) {
+                                    final long duplicateLocation = duplicateLocationFromRowKey(existingRightRowKey);
+                                    final WritableRowSet duplicates = rightSideDuplicateRowSets.getUnsafe(duplicateLocation);
+                                    final long duplicateSize = duplicates.size();
+                                    duplicates.remove(rowKeyChunk.get(chunkPosition));
+                                    Assert.eq(duplicateSize, "duplicateSize", duplicates.size() + 1, "duplicates.size() + 1");
+                                    if (duplicates.size() == 1) {
+                                        alternateRightRowKey.set(alternateTableLocation, duplicates.firstRowKey());
+                                        freeDuplicateLocation(duplicateLocation);
+                                    }
+                                } else if (existingRightRowKey != rowKeyChunk.get(chunkPosition)) {
+                                    Assert.statementNeverExecuted("Could not find existing right row in state");
+                                } else {
+                                    final boolean leftEmpty = alternateLeftRowSet.getUnsafe(alternateTableLocation).isEmpty();
+                                    if (leftEmpty) {
+                                        alternateRightRowKey.set(alternateTableLocation, TOMBSTONE_RIGHT_STATE);
+                                        liveEntries--;
+                                    } else {
+                                        alternateRightRowKey.set(alternateTableLocation, RowSet.NULL_ROW_KEY);
+                                    }
+                                    alternateModifiedTrackerCookieSource.set(alternateTableLocation, modifiedSlotTracker.addMain(alternateModifiedTrackerCookieSource.getUnsafe(alternateTableLocation), alternateInsertMask | alternateTableLocation, existingRightRowKey, NaturalJoinModifiedSlotTracker.FLAG_RIGHT_CHANGE));
+                                }
+                                alternateFound = true;
+                                break;
                             }
-                            alternateFound = true;
-                            break;
+                            alternateTableLocation = alternateNextTableLocation(alternateTableLocation);
+                            Assert.neq(alternateTableLocation, "alternateTableLocation", firstAlternateTableLocation, "firstAlternateTableLocation");
                         }
-                        alternateTableLocation = alternateNextTableLocation(alternateTableLocation);
-                        Assert.neq(alternateTableLocation, "alternateTableLocation", firstAlternateTableLocation, "firstAlternateTableLocation");
                     }
-                }
-                if (!alternateFound) {
-                    throw Assert.statementNeverExecuted("Could not find existing state for removed right row");
+                    if (!alternateFound) {
+                        throw Assert.statementNeverExecuted("Could not find existing state for removed right row");
+                    }
                 }
             }
         }
@@ -329,10 +398,15 @@ protected void modifyByRight(RowSequence rowSequence, Chunk[] sourceKeyChunks,
             final int hash = hash(k0);
             final int firstTableLocation = hashToTableLocation(hash);
             boolean found = false;
+            boolean searchAlternate = true;
             int tableLocation = firstTableLocation;
             long existingRightRowKey;
-            while ((existingRightRowKey = mainRightRowKey.getUnsafe(tableLocation)) != EMPTY_RIGHT_STATE) {
+            while (!isStateEmpty(existingRightRowKey = mainRightRowKey.getUnsafe(tableLocation))) {
                 if (eq(mainKeySource0.getUnsafe(tableLocation), k0)) {
+                    if (isStateDeleted(existingRightRowKey)) {
+                        searchAlternate = false;
+                        break;
+                    }
                     mainModifiedTrackerCookieSource.set(tableLocation, modifiedSlotTracker.addMain(mainModifiedTrackerCookieSource.getUnsafe(tableLocation), mainInsertMask | tableLocation, existingRightRowKey, NaturalJoinModifiedSlotTracker.FLAG_RIGHT_CHANGE));
                     found = true;
                     break;
@@ -341,22 +415,29 @@ protected void modifyByRight(RowSequence rowSequence, Chunk[] sourceKeyChunks,
                 Assert.neq(tableLocation, "tableLocation", firstTableLocation, "firstTableLocation");
             }
             if (!found) {
-                final int firstAlternateTableLocation = hashToTableLocationAlternate(hash);
-                boolean alternateFound = false;
-                if (firstAlternateTableLocation < rehashPointer) {
-                    int alternateTableLocation = firstAlternateTableLocation;
-                    while ((existingRightRowKey = alternateRightRowKey.getUnsafe(alternateTableLocation)) != EMPTY_RIGHT_STATE) {
-                        if (eq(alternateKeySource0.getUnsafe(alternateTableLocation), k0)) {
-                            alternateModifiedTrackerCookieSource.set(alternateTableLocation, modifiedSlotTracker.addMain(alternateModifiedTrackerCookieSource.getUnsafe(alternateTableLocation), alternateInsertMask | alternateTableLocation, existingRightRowKey, NaturalJoinModifiedSlotTracker.FLAG_RIGHT_CHANGE));
-                            alternateFound = true;
-                            break;
+                if (!searchAlternate) {
+                    throw Assert.statementNeverExecuted("Could not find existing state for modified right row");
+                } else {
+                    final int firstAlternateTableLocation = hashToTableLocationAlternate(hash);
+                    boolean alternateFound = false;
+                    if (firstAlternateTableLocation < rehashPointer) {
+                        int alternateTableLocation = firstAlternateTableLocation;
+                        while (!isStateEmpty(existingRightRowKey = alternateRightRowKey.getUnsafe(alternateTableLocation))) {
+                            if (eq(alternateKeySource0.getUnsafe(alternateTableLocation), k0)) {
+                                if (isStateDeleted(existingRightRowKey)) {
+                                    break;
+                                }
+                                alternateModifiedTrackerCookieSource.set(alternateTableLocation, modifiedSlotTracker.addMain(alternateModifiedTrackerCookieSource.getUnsafe(alternateTableLocation), alternateInsertMask | alternateTableLocation, existingRightRowKey, NaturalJoinModifiedSlotTracker.FLAG_RIGHT_CHANGE));
+                                alternateFound = true;
+                                break;
+                            }
+                            alternateTableLocation = alternateNextTableLocation(alternateTableLocation);
+                            Assert.neq(alternateTableLocation, "alternateTableLocation", firstAlternateTableLocation, "firstAlternateTableLocation");
                         }
-                        alternateTableLocation = alternateNextTableLocation(alternateTableLocation);
-                        Assert.neq(alternateTableLocation, "alternateTableLocation", firstAlternateTableLocation, "firstAlternateTableLocation");
                     }
-                }
-                if (!alternateFound) {
-                    throw Assert.statementNeverExecuted("Could not find existing state for modified right row");
+                    if (!alternateFound) {
+                        throw Assert.statementNeverExecuted("Could not find existing state for modified right row");
+                    }
                 }
             }
         }
@@ -373,15 +454,20 @@ protected void applyRightShift(RowSequence rowSequence, Chunk[] sourceKeyChunks,
             final int hash = hash(k0);
             final int firstTableLocation = hashToTableLocation(hash);
             boolean found = false;
+            boolean searchAlternate = true;
             int tableLocation = firstTableLocation;
             long existingRightRowKey;
-            while ((existingRightRowKey = mainRightRowKey.getUnsafe(tableLocation)) != EMPTY_RIGHT_STATE) {
+            while (!isStateEmpty(existingRightRowKey = mainRightRowKey.getUnsafe(tableLocation))) {
                 if (eq(mainKeySource0.getUnsafe(tableLocation), k0)) {
+                    if (isStateDeleted(existingRightRowKey)) {
+                        searchAlternate = false;
+                        break;
+                    }
                     final long keyToShift = rowKeyChunk.get(chunkPosition);
                     if (existingRightRowKey == keyToShift - shiftDelta) {
                         mainRightRowKey.set(tableLocation, keyToShift);
                         mainModifiedTrackerCookieSource.set(tableLocation, modifiedSlotTracker.addMain(mainModifiedTrackerCookieSource.getUnsafe(tableLocation), mainInsertMask | tableLocation, existingRightRowKey, NaturalJoinModifiedSlotTracker.FLAG_RIGHT_SHIFT));
-                    } else if (existingRightRowKey < RowSet.NULL_ROW_KEY) {
+                    } else if (existingRightRowKey <= FIRST_DUPLICATE) {
                         final long duplicateLocation = duplicateLocationFromRowKey(existingRightRowKey);
                         if (shiftDelta < 0) {
                             final WritableRowSet duplicates = rightSideDuplicateRowSets.getUnsafe(duplicateLocation);
@@ -400,37 +486,44 @@ protected void applyRightShift(RowSequence rowSequence, Chunk[] sourceKeyChunks,
                 Assert.neq(tableLocation, "tableLocation", firstTableLocation, "firstTableLocation");
             }
             if (!found) {
-                final int firstAlternateTableLocation = hashToTableLocationAlternate(hash);
-                boolean alternateFound = false;
-                if (firstAlternateTableLocation < rehashPointer) {
-                    int alternateTableLocation = firstAlternateTableLocation;
-                    while ((existingRightRowKey = alternateRightRowKey.getUnsafe(alternateTableLocation)) != EMPTY_RIGHT_STATE) {
-                        if (eq(alternateKeySource0.getUnsafe(alternateTableLocation), k0)) {
-                            final long keyToShift = rowKeyChunk.get(chunkPosition);
-                            if (existingRightRowKey == keyToShift - shiftDelta) {
-                                alternateRightRowKey.set(alternateTableLocation, keyToShift);
-                                alternateModifiedTrackerCookieSource.set(alternateTableLocation, modifiedSlotTracker.addMain(alternateModifiedTrackerCookieSource.getUnsafe(alternateTableLocation), alternateInsertMask | alternateTableLocation, existingRightRowKey, NaturalJoinModifiedSlotTracker.FLAG_RIGHT_SHIFT));
-                            } else if (existingRightRowKey < RowSet.NULL_ROW_KEY) {
-                                final long duplicateLocation = duplicateLocationFromRowKey(existingRightRowKey);
-                                if (shiftDelta < 0) {
-                                    final WritableRowSet duplicates = rightSideDuplicateRowSets.getUnsafe(duplicateLocation);
-                                    shiftOneKey(duplicates, keyToShift, shiftDelta);
+                if (!searchAlternate) {
+                    throw Assert.statementNeverExecuted("Could not find existing state for shifted right row");
+                } else {
+                    final int firstAlternateTableLocation = hashToTableLocationAlternate(hash);
+                    boolean alternateFound = false;
+                    if (firstAlternateTableLocation < rehashPointer) {
+                        int alternateTableLocation = firstAlternateTableLocation;
+                        while (!isStateEmpty(existingRightRowKey = alternateRightRowKey.getUnsafe(alternateTableLocation))) {
+                            if (eq(alternateKeySource0.getUnsafe(alternateTableLocation), k0)) {
+                                if (isStateDeleted(existingRightRowKey)) {
+                                    break;
+                                }
+                                final long keyToShift = rowKeyChunk.get(chunkPosition);
+                                if (existingRightRowKey == keyToShift - shiftDelta) {
+                                    alternateRightRowKey.set(alternateTableLocation, keyToShift);
+                                    alternateModifiedTrackerCookieSource.set(alternateTableLocation, modifiedSlotTracker.addMain(alternateModifiedTrackerCookieSource.getUnsafe(alternateTableLocation), alternateInsertMask | alternateTableLocation, existingRightRowKey, NaturalJoinModifiedSlotTracker.FLAG_RIGHT_SHIFT));
+                                } else if (existingRightRowKey <= FIRST_DUPLICATE) {
+                                    final long duplicateLocation = duplicateLocationFromRowKey(existingRightRowKey);
+                                    if (shiftDelta < 0) {
+                                        final WritableRowSet duplicates = rightSideDuplicateRowSets.getUnsafe(duplicateLocation);
+                                        shiftOneKey(duplicates, keyToShift, shiftDelta);
+                                    } else {
+                                        pc.pendingShifts.set(pc.pendingShiftPointer++, (long)duplicateLocation);
+                                        pc.pendingShifts.set(pc.pendingShiftPointer++, keyToShift);
+                                    }
                                 } else {
-                                    pc.pendingShifts.set(pc.pendingShiftPointer++, (long)duplicateLocation);
-                                    pc.pendingShifts.set(pc.pendingShiftPointer++, keyToShift);
+                                    throw Assert.statementNeverExecuted("Could not find existing index for shifted right row");
                                 }
-                            } else {
-                                throw Assert.statementNeverExecuted("Could not find existing index for shifted right row");
+                                alternateFound = true;
+                                break;
                             }
-                            alternateFound = true;
-                            break;
+                            alternateTableLocation = alternateNextTableLocation(alternateTableLocation);
+                            Assert.neq(alternateTableLocation, "alternateTableLocation", firstAlternateTableLocation, "firstAlternateTableLocation");
                         }
-                        alternateTableLocation = alternateNextTableLocation(alternateTableLocation);
-                        Assert.neq(alternateTableLocation, "alternateTableLocation", firstAlternateTableLocation, "firstAlternateTableLocation");
                     }
-                }
-                if (!alternateFound) {
-                    throw Assert.statementNeverExecuted("Could not find existing state for shifted right row");
+                    if (!alternateFound) {
+                        throw Assert.statementNeverExecuted("Could not find existing state for shifted right row");
+                    }
                 }
             }
         }
@@ -445,10 +538,21 @@ protected void removeLeft(RowSequence rowSequence, Chunk[] sourceKeyChunks) {
             final int hash = hash(k0);
             final int firstTableLocation = hashToTableLocation(hash);
             boolean found = false;
+            boolean searchAlternate = true;
             int tableLocation = firstTableLocation;
-            while (mainRightRowKey.getUnsafe(tableLocation) != EMPTY_RIGHT_STATE) {
+            long rightState;
+            while (!isStateEmpty(rightState = mainRightRowKey.getUnsafe(tableLocation))) {
                 if (eq(mainKeySource0.getUnsafe(tableLocation), k0)) {
-                    mainLeftRowSet.getUnsafe(tableLocation).remove(rowKeyChunk.get(chunkPosition));
+                    if (isStateDeleted(rightState)) {
+                        searchAlternate = false;
+                        break;
+                    }
+                    final WritableRowSet left = mainLeftRowSet.getUnsafe(tableLocation);
+                    left.remove(rowKeyChunk.get(chunkPosition));
+                    if (left.isEmpty() && rightState == RowSet.NULL_ROW_KEY) {
+                        mainRightRowKey.set(tableLocation, TOMBSTONE_RIGHT_STATE);
+                        liveEntries--;
+                    }
                     found = true;
                     break;
                 }
@@ -456,22 +560,34 @@ protected void removeLeft(RowSequence rowSequence, Chunk[] sourceKeyChunks) {
                 Assert.neq(tableLocation, "tableLocation", firstTableLocation, "firstTableLocation");
             }
             if (!found) {
-                final int firstAlternateTableLocation = hashToTableLocationAlternate(hash);
-                boolean alternateFound = false;
-                if (firstAlternateTableLocation < rehashPointer) {
-                    int alternateTableLocation = firstAlternateTableLocation;
-                    while (alternateRightRowKey.getUnsafe(alternateTableLocation) != EMPTY_RIGHT_STATE) {
-                        if (eq(alternateKeySource0.getUnsafe(alternateTableLocation), k0)) {
-                            alternateLeftRowSet.getUnsafe(alternateTableLocation).remove(rowKeyChunk.get(chunkPosition));
-                            alternateFound = true;
-                            break;
+                if (!searchAlternate) {
+                    throw Assert.statementNeverExecuted("Could not find existing state for removed left row");
+                } else {
+                    final int firstAlternateTableLocation = hashToTableLocationAlternate(hash);
+                    boolean alternateFound = false;
+                    if (firstAlternateTableLocation < rehashPointer) {
+                        int alternateTableLocation = firstAlternateTableLocation;
+                        while (!isStateEmpty(rightState = alternateRightRowKey.getUnsafe(alternateTableLocation))) {
+                            if (eq(alternateKeySource0.getUnsafe(alternateTableLocation), k0)) {
+                                if (isStateDeleted(rightState)) {
+                                    break;
+                                }
+                                final WritableRowSet left = alternateLeftRowSet.getUnsafe(alternateTableLocation);
+                                left.remove(rowKeyChunk.get(chunkPosition));
+                                if (left.isEmpty() && rightState == RowSet.NULL_ROW_KEY) {
+                                    alternateRightRowKey.set(alternateTableLocation, TOMBSTONE_RIGHT_STATE);
+                                    liveEntries--;
+                                }
+                                alternateFound = true;
+                                break;
+                            }
+                            alternateTableLocation = alternateNextTableLocation(alternateTableLocation);
+                            Assert.neq(alternateTableLocation, "alternateTableLocation", firstAlternateTableLocation, "firstAlternateTableLocation");
                         }
-                        alternateTableLocation = alternateNextTableLocation(alternateTableLocation);
-                        Assert.neq(alternateTableLocation, "alternateTableLocation", firstAlternateTableLocation, "firstAlternateTableLocation");
                     }
-                }
-                if (!alternateFound) {
-                    throw Assert.statementNeverExecuted("Could not find existing state for removed left row");
+                    if (!alternateFound) {
+                        throw Assert.statementNeverExecuted("Could not find existing state for removed left row");
+                    }
                 }
             }
         }
@@ -487,9 +603,15 @@ protected void applyLeftShift(RowSequence rowSequence, Chunk[] sourceKeyChunks,
             final int hash = hash(k0);
             final int firstTableLocation = hashToTableLocation(hash);
             boolean found = false;
+            boolean searchAlternate = true;
             int tableLocation = firstTableLocation;
-            while (mainRightRowKey.getUnsafe(tableLocation) != EMPTY_RIGHT_STATE) {
+            long stateValue;
+            while (!isStateEmpty(stateValue = mainRightRowKey.getUnsafe(tableLocation))) {
                 if (eq(mainKeySource0.getUnsafe(tableLocation), k0)) {
+                    if (isStateDeleted(stateValue)) {
+                        searchAlternate = false;
+                        break;
+                    }
                     final WritableRowSet leftRowSetForState = mainLeftRowSet.getUnsafe(tableLocation);
                     final long keyToShift = rowKeyChunk.get(chunkPosition);
                     if (shiftDelta < 0) {
@@ -505,29 +627,36 @@ protected void applyLeftShift(RowSequence rowSequence, Chunk[] sourceKeyChunks,
                 Assert.neq(tableLocation, "tableLocation", firstTableLocation, "firstTableLocation");
             }
             if (!found) {
-                final int firstAlternateTableLocation = hashToTableLocationAlternate(hash);
-                boolean alternateFound = false;
-                if (firstAlternateTableLocation < rehashPointer) {
-                    int alternateTableLocation = firstAlternateTableLocation;
-                    while (alternateRightRowKey.getUnsafe(alternateTableLocation) != EMPTY_RIGHT_STATE) {
-                        if (eq(alternateKeySource0.getUnsafe(alternateTableLocation), k0)) {
-                            final WritableRowSet leftRowSetForState = alternateLeftRowSet.getUnsafe(alternateTableLocation);
-                            final long keyToShift = rowKeyChunk.get(chunkPosition);
-                            if (shiftDelta < 0) {
-                                shiftOneKey(leftRowSetForState, keyToShift, shiftDelta);
-                            } else {
-                                pc.pendingShifts.set(pc.pendingShiftPointer++, (long)(AlternatingColumnSource.ALTERNATE_SWITCH_MASK | alternateTableLocation));
-                                pc.pendingShifts.set(pc.pendingShiftPointer++, keyToShift);
+                if (!searchAlternate) {
+                    throw Assert.statementNeverExecuted("Could not find existing state for shifted left row");
+                } else {
+                    final int firstAlternateTableLocation = hashToTableLocationAlternate(hash);
+                    boolean alternateFound = false;
+                    if (firstAlternateTableLocation < rehashPointer) {
+                        int alternateTableLocation = firstAlternateTableLocation;
+                        while (!isStateEmpty(stateValue = alternateRightRowKey.getUnsafe(alternateTableLocation))) {
+                            if (eq(alternateKeySource0.getUnsafe(alternateTableLocation), k0)) {
+                                if (isStateDeleted(stateValue)) {
+                                    break;
+                                }
+                                final WritableRowSet leftRowSetForState = alternateLeftRowSet.getUnsafe(alternateTableLocation);
+                                final long keyToShift = rowKeyChunk.get(chunkPosition);
+                                if (shiftDelta < 0) {
+                                    shiftOneKey(leftRowSetForState, keyToShift, shiftDelta);
+                                } else {
+                                    pc.pendingShifts.set(pc.pendingShiftPointer++, (long)(AlternatingColumnSource.ALTERNATE_SWITCH_MASK | alternateTableLocation));
+                                    pc.pendingShifts.set(pc.pendingShiftPointer++, keyToShift);
+                                }
+                                alternateFound = true;
+                                break;
                             }
-                            alternateFound = true;
-                            break;
+                            alternateTableLocation = alternateNextTableLocation(alternateTableLocation);
+                            Assert.neq(alternateTableLocation, "alternateTableLocation", firstAlternateTableLocation, "firstAlternateTableLocation");
                         }
-                        alternateTableLocation = alternateNextTableLocation(alternateTableLocation);
-                        Assert.neq(alternateTableLocation, "alternateTableLocation", firstAlternateTableLocation, "firstAlternateTableLocation");
                     }
-                }
-                if (!alternateFound) {
-                    throw Assert.statementNeverExecuted("Could not find existing state for shifted left row");
+                    if (!alternateFound) {
+                        throw Assert.statementNeverExecuted("Could not find existing state for shifted left row");
+                    }
                 }
             }
         }
@@ -538,16 +667,30 @@ private static int hash(char k0) {
         return hash;
     }
 
-    private boolean migrateOneLocation(int locationToMigrate,
+    private static boolean isStateEmpty(long state) {
+        return state == EMPTY_RIGHT_STATE;
+    }
+
+    private static boolean isStateDeleted(long state) {
+        return state == TOMBSTONE_RIGHT_STATE;
+    }
+
+    private boolean migrateOneLocation(int locationToMigrate, boolean trueOnDeletedEntry,
             NaturalJoinModifiedSlotTracker modifiedSlotTracker) {
         final long currentStateValue = alternateRightRowKey.getUnsafe(locationToMigrate);
-        if (currentStateValue == EMPTY_RIGHT_STATE) {
+        if (isStateEmpty(currentStateValue)) {
             return false;
         }
+        if (isStateDeleted(currentStateValue)) {
+            alternateEntries--;
+            alternateRightRowKey.set(locationToMigrate, EMPTY_RIGHT_STATE);
+            return trueOnDeletedEntry;
+        }
         final char k0 = alternateKeySource0.getUnsafe(locationToMigrate);
         final int hash = hash(k0);
         int destinationTableLocation = hashToTableLocation(hash);
-        while (mainRightRowKey.getUnsafe(destinationTableLocation) != EMPTY_RIGHT_STATE) {
+        long candidateState;
+        while (!isStateEmpty(candidateState = mainRightRowKey.getUnsafe(destinationTableLocation)) && !isStateDeleted(candidateState)) {
             destinationTableLocation = nextTableLocation(destinationTableLocation);
         }
         mainKeySource0.set(destinationTableLocation, k0);
@@ -559,6 +702,10 @@ private boolean migrateOneLocation(int locationToMigrate,
         alternateModifiedTrackerCookieSource.set(locationToMigrate, -1L);
         modifiedSlotTracker.moveTableLocation(cookie, locationToMigrate, mainInsertMask | destinationTableLocation);;
         alternateRightRowKey.set(locationToMigrate, EMPTY_RIGHT_STATE);
+        if (!isStateDeleted(candidateState)) {
+            numEntries++;
+        }
+        alternateEntries--;
         return true;
     }
 
@@ -567,7 +714,7 @@ protected int rehashInternalPartial(int entriesToRehash,
             NaturalJoinModifiedSlotTracker modifiedSlotTracker) {
         int rehashedEntries = 0;
         while (rehashPointer > 0 && rehashedEntries < entriesToRehash) {
-            if (migrateOneLocation(--rehashPointer, modifiedSlotTracker)) {
+            if (migrateOneLocation(--rehashPointer, false, modifiedSlotTracker)) {
                 rehashedEntries++;
             }
         }
@@ -575,8 +722,7 @@ protected int rehashInternalPartial(int entriesToRehash,
     }
 
     @Override
-    protected void newAlternate() {
-        super.newAlternate();
+    protected void adviseNewAlternate() {
         this.mainKeySource0 = (ImmutableCharArraySource)super.mainKeySources[0];
         this.alternateKeySource0 = (ImmutableCharArraySource)super.alternateKeySources[0];
     }
@@ -590,7 +736,7 @@ protected void clearAlternate() {
     @Override
     protected void migrateFront(NaturalJoinModifiedSlotTracker modifiedSlotTracker) {
         int location = 0;
-        while (migrateOneLocation(location++, modifiedSlotTracker));
+        while (migrateOneLocation(location++, true, modifiedSlotTracker) && location < alternateTableSize);
     }
 
     @Override
@@ -610,7 +756,7 @@ protected void rehashInternalFull(final int oldSize) {
         mainModifiedTrackerCookieSource.setArray(destModifiedCookie);
         for (int sourceBucket = 0; sourceBucket < oldSize; ++sourceBucket) {
             final long currentStateValue = originalStateArray[sourceBucket];
-            if (currentStateValue == EMPTY_RIGHT_STATE) {
+            if (isStateEmpty(currentStateValue)) {
                 continue;
             }
             final char k0 = originalKeyArray0[sourceBucket];
@@ -618,7 +764,7 @@ protected void rehashInternalFull(final int oldSize) {
             final int firstDestinationTableLocation = hashToTableLocation(hash);
             int destinationTableLocation = firstDestinationTableLocation;
             while (true) {
-                if (destState[destinationTableLocation] == EMPTY_RIGHT_STATE) {
+                if (isStateEmpty(destState[destinationTableLocation])) {
                     destKeyArray0[destinationTableLocation] = k0;
                     destState[destinationTableLocation] = originalStateArray[sourceBucket];
                     destLeftRowSet[destinationTableLocation] = oldLeftRowSet[sourceBucket];
diff --git a/engine/table/src/main/java/io/deephaven/engine/table/impl/naturaljoin/typed/incopen/gen/IncrementalNaturalJoinHasherDouble.java b/engine/table/src/main/java/io/deephaven/engine/table/impl/naturaljoin/typed/incopen/gen/IncrementalNaturalJoinHasherDouble.java
index 356b8252575..4befa0c61ab 100644
--- a/engine/table/src/main/java/io/deephaven/engine/table/impl/naturaljoin/typed/incopen/gen/IncrementalNaturalJoinHasherDouble.java
+++ b/engine/table/src/main/java/io/deephaven/engine/table/impl/naturaljoin/typed/incopen/gen/IncrementalNaturalJoinHasherDouble.java
@@ -62,15 +62,16 @@ protected void buildFromLeftSide(RowSequence rowSequence, Chunk[] sourceKeyChunk
             int tableLocation = firstTableLocation;
             MAIN_SEARCH: while (true) {
                 long rightRowKeyForState = mainRightRowKey.getUnsafe(tableLocation);
-                if (rightRowKeyForState == EMPTY_RIGHT_STATE) {
+                if (isStateEmpty(rightRowKeyForState)) {
                     numEntries++;
+                    liveEntries++;
                     mainKeySource0.set(tableLocation, k0);
                     mainLeftRowSet.set(tableLocation, RowSetFactory.fromKeys(rowKeyChunk.get(chunkPosition)));
                     mainRightRowKey.set(tableLocation, RowSet.NULL_ROW_KEY);
                     mainModifiedTrackerCookieSource.set(tableLocation, -1L);
                     break;
                 } else if (eq(mainKeySource0.getUnsafe(tableLocation), k0)) {
-                    if (rightRowKeyForState < RowSet.NULL_ROW_KEY) {
+                    if (rightRowKeyForState <= FIRST_DUPLICATE) {
                         throw new IllegalStateException("Natural Join found duplicate right key for " + extractKeyStringFromSourceTable(rowKeyChunk.get(chunkPosition)));
                     }
                     mainLeftRowSet.getUnsafe(tableLocation).insert(rowKeyChunk.get(chunkPosition));
@@ -95,8 +96,9 @@ protected void buildFromRightSide(RowSequence rowSequence, Chunk[] sourceKeyChun
             int tableLocation = firstTableLocation;
             MAIN_SEARCH: while (true) {
                 long existingRightRowKey = mainRightRowKey.getUnsafe(tableLocation);
-                if (existingRightRowKey == EMPTY_RIGHT_STATE) {
+                if (isStateEmpty(existingRightRowKey)) {
                     numEntries++;
+                    liveEntries++;
                     mainKeySource0.set(tableLocation, k0);
                     mainLeftRowSet.set(tableLocation, RowSetFactory.empty());
                     mainRightRowKey.set(tableLocation, rowKeyChunk.get(chunkPosition));
@@ -105,7 +107,7 @@ protected void buildFromRightSide(RowSequence rowSequence, Chunk[] sourceKeyChun
                 } else if (eq(mainKeySource0.getUnsafe(tableLocation), k0)) {
                     if (existingRightRowKey == RowSet.NULL_ROW_KEY) {
                         mainRightRowKey.set(tableLocation, rowKeyChunk.get(chunkPosition));
-                    } else if (existingRightRowKey < RowSet.NULL_ROW_KEY) {
+                    } else if (existingRightRowKey <= FIRST_DUPLICATE) {
                         final long duplicateLocation = duplicateLocationFromRowKey(existingRightRowKey);
                         rightSideDuplicateRowSets.getUnsafe(duplicateLocation).insert(rowKeyChunk.get(chunkPosition));
                     } else {
@@ -132,20 +134,27 @@ protected void addRightSide(RowSequence rowSequence, Chunk[] sourceKeyChunks,
             final int hash = hash(k0);
             final int firstTableLocation = hashToTableLocation(hash);
             int tableLocation = firstTableLocation;
+            int firstDeletedLocation = -1;
             MAIN_SEARCH: while (true) {
                 long existingRightRowKey = mainRightRowKey.getUnsafe(tableLocation);
-                if (existingRightRowKey == EMPTY_RIGHT_STATE) {
+                if (firstDeletedLocation < 0 && isStateDeleted(existingRightRowKey)) {
+                    firstDeletedLocation = tableLocation;
+                }
+                if (isStateEmpty(existingRightRowKey)) {
                     final int firstAlternateTableLocation = hashToTableLocationAlternate(hash);
                     int alternateTableLocation = firstAlternateTableLocation;
                     while (alternateTableLocation < rehashPointer) {
                         existingRightRowKey = alternateRightRowKey.getUnsafe(alternateTableLocation);
-                        if (existingRightRowKey == EMPTY_RIGHT_STATE) {
+                        if (isStateEmpty(existingRightRowKey)) {
                             break;
                         } else if (eq(alternateKeySource0.getUnsafe(alternateTableLocation), k0)) {
+                            if (isStateDeleted(existingRightRowKey)) {
+                                break;
+                            }
                             if (existingRightRowKey == RowSet.NULL_ROW_KEY) {
                                 alternateRightRowKey.set(alternateTableLocation, rowKeyChunk.get(chunkPosition));
                                 alternateModifiedTrackerCookieSource.set(alternateTableLocation, modifiedSlotTracker.addMain(alternateModifiedTrackerCookieSource.getUnsafe(alternateTableLocation), alternateInsertMask | alternateTableLocation, existingRightRowKey, NaturalJoinModifiedSlotTracker.FLAG_RIGHT_CHANGE));
-                            } else if (existingRightRowKey < RowSet.NULL_ROW_KEY) {
+                            } else if (existingRightRowKey <= FIRST_DUPLICATE) {
                                 final long duplicateLocation = duplicateLocationFromRowKey(existingRightRowKey);
                                 final WritableRowSet duplicates = rightSideDuplicateRowSets.getUnsafe(duplicateLocation);
                                 final long duplicateSize = duplicates.size();
@@ -163,17 +172,31 @@ protected void addRightSide(RowSequence rowSequence, Chunk[] sourceKeyChunks,
                             Assert.neq(alternateTableLocation, "alternateTableLocation", firstAlternateTableLocation, "firstAlternateTableLocation");
                         }
                     }
-                    numEntries++;
+                    if (firstDeletedLocation >= 0) {
+                        tableLocation = firstDeletedLocation;
+                    } else {
+                        numEntries++;
+                    }
+                    liveEntries++;
                     mainKeySource0.set(tableLocation, k0);
                     mainLeftRowSet.set(tableLocation, RowSetFactory.empty());
                     mainRightRowKey.set(tableLocation, rowKeyChunk.get(chunkPosition));
                     mainModifiedTrackerCookieSource.set(tableLocation, modifiedSlotTracker.addMain(-1, mainInsertMask | tableLocation, existingRightRowKey, NaturalJoinModifiedSlotTracker.FLAG_RIGHT_CHANGE));
                     break;
                 } else if (eq(mainKeySource0.getUnsafe(tableLocation), k0)) {
+                    if (isStateDeleted(existingRightRowKey)) {
+                        tableLocation = firstDeletedLocation;
+                        liveEntries++;
+                        mainKeySource0.set(tableLocation, k0);
+                        mainLeftRowSet.set(tableLocation, RowSetFactory.empty());
+                        mainRightRowKey.set(tableLocation, rowKeyChunk.get(chunkPosition));
+                        mainModifiedTrackerCookieSource.set(tableLocation, modifiedSlotTracker.addMain(-1, mainInsertMask | tableLocation, existingRightRowKey, NaturalJoinModifiedSlotTracker.FLAG_RIGHT_CHANGE));
+                        break;
+                    }
                     if (existingRightRowKey == RowSet.NULL_ROW_KEY) {
                         mainRightRowKey.set(tableLocation, rowKeyChunk.get(chunkPosition));
                         mainModifiedTrackerCookieSource.set(tableLocation, modifiedSlotTracker.addMain(mainModifiedTrackerCookieSource.getUnsafe(tableLocation), mainInsertMask | tableLocation, existingRightRowKey, NaturalJoinModifiedSlotTracker.FLAG_RIGHT_CHANGE));
-                    } else if (existingRightRowKey < RowSet.NULL_ROW_KEY) {
+                    } else if (existingRightRowKey <= FIRST_DUPLICATE) {
                         final long duplicateLocation = duplicateLocationFromRowKey(existingRightRowKey);
                         final WritableRowSet duplicates = rightSideDuplicateRowSets.getUnsafe(duplicateLocation);
                         final long duplicateSize = duplicates.size();
@@ -204,17 +227,24 @@ protected void addLeftSide(RowSequence rowSequence, Chunk[] sourceKeyChunks,
             final int hash = hash(k0);
             final int firstTableLocation = hashToTableLocation(hash);
             int tableLocation = firstTableLocation;
+            int firstDeletedLocation = -1;
             MAIN_SEARCH: while (true) {
                 long rightRowKeyForState = mainRightRowKey.getUnsafe(tableLocation);
-                if (rightRowKeyForState == EMPTY_RIGHT_STATE) {
+                if (firstDeletedLocation < 0 && isStateDeleted(rightRowKeyForState)) {
+                    firstDeletedLocation = tableLocation;
+                }
+                if (isStateEmpty(rightRowKeyForState)) {
                     final int firstAlternateTableLocation = hashToTableLocationAlternate(hash);
                     int alternateTableLocation = firstAlternateTableLocation;
                     while (alternateTableLocation < rehashPointer) {
                         rightRowKeyForState = alternateRightRowKey.getUnsafe(alternateTableLocation);
-                        if (rightRowKeyForState == EMPTY_RIGHT_STATE) {
+                        if (isStateEmpty(rightRowKeyForState)) {
                             break;
                         } else if (eq(alternateKeySource0.getUnsafe(alternateTableLocation), k0)) {
-                            if (rightRowKeyForState < RowSet.NULL_ROW_KEY) {
+                            if (isStateDeleted(rightRowKeyForState)) {
+                                break;
+                            }
+                            if (rightRowKeyForState <= FIRST_DUPLICATE) {
                                 throw new IllegalStateException("Natural Join found duplicate right key for " + extractKeyStringFromSourceTable(rowKeyChunk.get(chunkPosition)));
                             }
                             alternateLeftRowSet.getUnsafe(alternateTableLocation).insert(rowKeyChunk.get(chunkPosition));
@@ -225,7 +255,12 @@ protected void addLeftSide(RowSequence rowSequence, Chunk[] sourceKeyChunks,
                             Assert.neq(alternateTableLocation, "alternateTableLocation", firstAlternateTableLocation, "firstAlternateTableLocation");
                         }
                     }
-                    numEntries++;
+                    if (firstDeletedLocation >= 0) {
+                        tableLocation = firstDeletedLocation;
+                    } else {
+                        numEntries++;
+                    }
+                    liveEntries++;
                     mainKeySource0.set(tableLocation, k0);
                     mainLeftRowSet.set(tableLocation, RowSetFactory.fromKeys(rowKeyChunk.get(chunkPosition)));
                     mainRightRowKey.set(tableLocation, RowSet.NULL_ROW_KEY);
@@ -233,7 +268,17 @@ protected void addLeftSide(RowSequence rowSequence, Chunk[] sourceKeyChunks,
                     leftRedirections.set(leftRedirectionOffset++, RowSet.NULL_ROW_KEY);
                     break;
                 } else if (eq(mainKeySource0.getUnsafe(tableLocation), k0)) {
-                    if (rightRowKeyForState < RowSet.NULL_ROW_KEY) {
+                    if (isStateDeleted(rightRowKeyForState)) {
+                        tableLocation = firstDeletedLocation;
+                        liveEntries++;
+                        mainKeySource0.set(tableLocation, k0);
+                        mainLeftRowSet.set(tableLocation, RowSetFactory.fromKeys(rowKeyChunk.get(chunkPosition)));
+                        mainRightRowKey.set(tableLocation, RowSet.NULL_ROW_KEY);
+                        mainModifiedTrackerCookieSource.set(tableLocation, -1L);
+                        leftRedirections.set(leftRedirectionOffset++, RowSet.NULL_ROW_KEY);
+                        break;
+                    }
+                    if (rightRowKeyForState <= FIRST_DUPLICATE) {
                         throw new IllegalStateException("Natural Join found duplicate right key for " + extractKeyStringFromSourceTable(rowKeyChunk.get(chunkPosition)));
                     }
                     mainLeftRowSet.getUnsafe(tableLocation).insert(rowKeyChunk.get(chunkPosition));
@@ -257,11 +302,16 @@ protected void removeRight(RowSequence rowSequence, Chunk[] sourceKeyChunks,
             final int hash = hash(k0);
             final int firstTableLocation = hashToTableLocation(hash);
             boolean found = false;
+            boolean searchAlternate = true;
             int tableLocation = firstTableLocation;
             long existingRightRowKey;
-            while ((existingRightRowKey = mainRightRowKey.getUnsafe(tableLocation)) != EMPTY_RIGHT_STATE) {
+            while (!isStateEmpty(existingRightRowKey = mainRightRowKey.getUnsafe(tableLocation))) {
                 if (eq(mainKeySource0.getUnsafe(tableLocation), k0)) {
-                    if (existingRightRowKey < RowSet.NULL_ROW_KEY) {
+                    if (isStateDeleted(existingRightRowKey)) {
+                        searchAlternate = false;
+                        break;
+                    }
+                    if (existingRightRowKey <= FIRST_DUPLICATE) {
                         final long duplicateLocation = duplicateLocationFromRowKey(existingRightRowKey);
                         final WritableRowSet duplicates = rightSideDuplicateRowSets.getUnsafe(duplicateLocation);
                         final long duplicateSize = duplicates.size();
@@ -274,7 +324,13 @@ protected void removeRight(RowSequence rowSequence, Chunk[] sourceKeyChunks,
                     } else if (existingRightRowKey != rowKeyChunk.get(chunkPosition)) {
                         Assert.statementNeverExecuted("Could not find existing right row in state");
                     } else {
-                        mainRightRowKey.set(tableLocation, RowSet.NULL_ROW_KEY);
+                        final boolean leftEmpty = mainLeftRowSet.getUnsafe(tableLocation).isEmpty();
+                        if (leftEmpty) {
+                            mainRightRowKey.set(tableLocation, TOMBSTONE_RIGHT_STATE);
+                            liveEntries--;
+                        } else {
+                            mainRightRowKey.set(tableLocation, RowSet.NULL_ROW_KEY);
+                        }
                         mainModifiedTrackerCookieSource.set(tableLocation, modifiedSlotTracker.addMain(mainModifiedTrackerCookieSource.getUnsafe(tableLocation), mainInsertMask | tableLocation, existingRightRowKey, NaturalJoinModifiedSlotTracker.FLAG_RIGHT_CHANGE));
                     }
                     found = true;
@@ -284,37 +340,50 @@ protected void removeRight(RowSequence rowSequence, Chunk[] sourceKeyChunks,
                 Assert.neq(tableLocation, "tableLocation", firstTableLocation, "firstTableLocation");
             }
             if (!found) {
-                final int firstAlternateTableLocation = hashToTableLocationAlternate(hash);
-                boolean alternateFound = false;
-                if (firstAlternateTableLocation < rehashPointer) {
-                    int alternateTableLocation = firstAlternateTableLocation;
-                    while ((existingRightRowKey = alternateRightRowKey.getUnsafe(alternateTableLocation)) != EMPTY_RIGHT_STATE) {
-                        if (eq(alternateKeySource0.getUnsafe(alternateTableLocation), k0)) {
-                            if (existingRightRowKey < RowSet.NULL_ROW_KEY) {
-                                final long duplicateLocation = duplicateLocationFromRowKey(existingRightRowKey);
-                                final WritableRowSet duplicates = rightSideDuplicateRowSets.getUnsafe(duplicateLocation);
-                                final long duplicateSize = duplicates.size();
-                                duplicates.remove(rowKeyChunk.get(chunkPosition));
-                                Assert.eq(duplicateSize, "duplicateSize", duplicates.size() + 1, "duplicates.size() + 1");
-                                if (duplicates.size() == 1) {
-                                    alternateRightRowKey.set(alternateTableLocation, duplicates.firstRowKey());
-                                    freeDuplicateLocation(duplicateLocation);
+                if (!searchAlternate) {
+                    throw Assert.statementNeverExecuted("Could not find existing state for removed right row");
+                } else {
+                    final int firstAlternateTableLocation = hashToTableLocationAlternate(hash);
+                    boolean alternateFound = false;
+                    if (firstAlternateTableLocation < rehashPointer) {
+                        int alternateTableLocation = firstAlternateTableLocation;
+                        while (!isStateEmpty(existingRightRowKey = alternateRightRowKey.getUnsafe(alternateTableLocation))) {
+                            if (eq(alternateKeySource0.getUnsafe(alternateTableLocation), k0)) {
+                                if (isStateDeleted(existingRightRowKey)) {
+                                    break;
                                 }
-                            } else if (existingRightRowKey != rowKeyChunk.get(chunkPosition)) {
-                                Assert.statementNeverExecuted("Could not find existing right row in state");
-                            } else {
-                                alternateRightRowKey.set(alternateTableLocation, RowSet.NULL_ROW_KEY);
-                                alternateModifiedTrackerCookieSource.set(alternateTableLocation, modifiedSlotTracker.addMain(alternateModifiedTrackerCookieSource.getUnsafe(alternateTableLocation), alternateInsertMask | alternateTableLocation, existingRightRowKey, NaturalJoinModifiedSlotTracker.FLAG_RIGHT_CHANGE));
+                                if (existingRightRowKey <= FIRST_DUPLICATE) {
+                                    final long duplicateLocation = duplicateLocationFromRowKey(existingRightRowKey);
+                                    final WritableRowSet duplicates = rightSideDuplicateRowSets.getUnsafe(duplicateLocation);
+                                    final long duplicateSize = duplicates.size();
+                                    duplicates.remove(rowKeyChunk.get(chunkPosition));
+                                    Assert.eq(duplicateSize, "duplicateSize", duplicates.size() + 1, "duplicates.size() + 1");
+                                    if (duplicates.size() == 1) {
+                                        alternateRightRowKey.set(alternateTableLocation, duplicates.firstRowKey());
+                                        freeDuplicateLocation(duplicateLocation);
+                                    }
+                                } else if (existingRightRowKey != rowKeyChunk.get(chunkPosition)) {
+                                    Assert.statementNeverExecuted("Could not find existing right row in state");
+                                } else {
+                                    final boolean leftEmpty = alternateLeftRowSet.getUnsafe(alternateTableLocation).isEmpty();
+                                    if (leftEmpty) {
+                                        alternateRightRowKey.set(alternateTableLocation, TOMBSTONE_RIGHT_STATE);
+                                        liveEntries--;
+                                    } else {
+                                        alternateRightRowKey.set(alternateTableLocation, RowSet.NULL_ROW_KEY);
+                                    }
+                                    alternateModifiedTrackerCookieSource.set(alternateTableLocation, modifiedSlotTracker.addMain(alternateModifiedTrackerCookieSource.getUnsafe(alternateTableLocation), alternateInsertMask | alternateTableLocation, existingRightRowKey, NaturalJoinModifiedSlotTracker.FLAG_RIGHT_CHANGE));
+                                }
+                                alternateFound = true;
+                                break;
                             }
-                            alternateFound = true;
-                            break;
+                            alternateTableLocation = alternateNextTableLocation(alternateTableLocation);
+                            Assert.neq(alternateTableLocation, "alternateTableLocation", firstAlternateTableLocation, "firstAlternateTableLocation");
                         }
-                        alternateTableLocation = alternateNextTableLocation(alternateTableLocation);
-                        Assert.neq(alternateTableLocation, "alternateTableLocation", firstAlternateTableLocation, "firstAlternateTableLocation");
                     }
-                }
-                if (!alternateFound) {
-                    throw Assert.statementNeverExecuted("Could not find existing state for removed right row");
+                    if (!alternateFound) {
+                        throw Assert.statementNeverExecuted("Could not find existing state for removed right row");
+                    }
                 }
             }
         }
@@ -329,10 +398,15 @@ protected void modifyByRight(RowSequence rowSequence, Chunk[] sourceKeyChunks,
             final int hash = hash(k0);
             final int firstTableLocation = hashToTableLocation(hash);
             boolean found = false;
+            boolean searchAlternate = true;
             int tableLocation = firstTableLocation;
             long existingRightRowKey;
-            while ((existingRightRowKey = mainRightRowKey.getUnsafe(tableLocation)) != EMPTY_RIGHT_STATE) {
+            while (!isStateEmpty(existingRightRowKey = mainRightRowKey.getUnsafe(tableLocation))) {
                 if (eq(mainKeySource0.getUnsafe(tableLocation), k0)) {
+                    if (isStateDeleted(existingRightRowKey)) {
+                        searchAlternate = false;
+                        break;
+                    }
                     mainModifiedTrackerCookieSource.set(tableLocation, modifiedSlotTracker.addMain(mainModifiedTrackerCookieSource.getUnsafe(tableLocation), mainInsertMask | tableLocation, existingRightRowKey, NaturalJoinModifiedSlotTracker.FLAG_RIGHT_CHANGE));
                     found = true;
                     break;
@@ -341,22 +415,29 @@ protected void modifyByRight(RowSequence rowSequence, Chunk[] sourceKeyChunks,
                 Assert.neq(tableLocation, "tableLocation", firstTableLocation, "firstTableLocation");
             }
             if (!found) {
-                final int firstAlternateTableLocation = hashToTableLocationAlternate(hash);
-                boolean alternateFound = false;
-                if (firstAlternateTableLocation < rehashPointer) {
-                    int alternateTableLocation = firstAlternateTableLocation;
-                    while ((existingRightRowKey = alternateRightRowKey.getUnsafe(alternateTableLocation)) != EMPTY_RIGHT_STATE) {
-                        if (eq(alternateKeySource0.getUnsafe(alternateTableLocation), k0)) {
-                            alternateModifiedTrackerCookieSource.set(alternateTableLocation, modifiedSlotTracker.addMain(alternateModifiedTrackerCookieSource.getUnsafe(alternateTableLocation), alternateInsertMask | alternateTableLocation, existingRightRowKey, NaturalJoinModifiedSlotTracker.FLAG_RIGHT_CHANGE));
-                            alternateFound = true;
-                            break;
+                if (!searchAlternate) {
+                    throw Assert.statementNeverExecuted("Could not find existing state for modified right row");
+                } else {
+                    final int firstAlternateTableLocation = hashToTableLocationAlternate(hash);
+                    boolean alternateFound = false;
+                    if (firstAlternateTableLocation < rehashPointer) {
+                        int alternateTableLocation = firstAlternateTableLocation;
+                        while (!isStateEmpty(existingRightRowKey = alternateRightRowKey.getUnsafe(alternateTableLocation))) {
+                            if (eq(alternateKeySource0.getUnsafe(alternateTableLocation), k0)) {
+                                if (isStateDeleted(existingRightRowKey)) {
+                                    break;
+                                }
+                                alternateModifiedTrackerCookieSource.set(alternateTableLocation, modifiedSlotTracker.addMain(alternateModifiedTrackerCookieSource.getUnsafe(alternateTableLocation), alternateInsertMask | alternateTableLocation, existingRightRowKey, NaturalJoinModifiedSlotTracker.FLAG_RIGHT_CHANGE));
+                                alternateFound = true;
+                                break;
+                            }
+                            alternateTableLocation = alternateNextTableLocation(alternateTableLocation);
+                            Assert.neq(alternateTableLocation, "alternateTableLocation", firstAlternateTableLocation, "firstAlternateTableLocation");
                         }
-                        alternateTableLocation = alternateNextTableLocation(alternateTableLocation);
-                        Assert.neq(alternateTableLocation, "alternateTableLocation", firstAlternateTableLocation, "firstAlternateTableLocation");
                     }
-                }
-                if (!alternateFound) {
-                    throw Assert.statementNeverExecuted("Could not find existing state for modified right row");
+                    if (!alternateFound) {
+                        throw Assert.statementNeverExecuted("Could not find existing state for modified right row");
+                    }
                 }
             }
         }
@@ -373,15 +454,20 @@ protected void applyRightShift(RowSequence rowSequence, Chunk[] sourceKeyChunks,
             final int hash = hash(k0);
             final int firstTableLocation = hashToTableLocation(hash);
             boolean found = false;
+            boolean searchAlternate = true;
             int tableLocation = firstTableLocation;
             long existingRightRowKey;
-            while ((existingRightRowKey = mainRightRowKey.getUnsafe(tableLocation)) != EMPTY_RIGHT_STATE) {
+            while (!isStateEmpty(existingRightRowKey = mainRightRowKey.getUnsafe(tableLocation))) {
                 if (eq(mainKeySource0.getUnsafe(tableLocation), k0)) {
+                    if (isStateDeleted(existingRightRowKey)) {
+                        searchAlternate = false;
+                        break;
+                    }
                     final long keyToShift = rowKeyChunk.get(chunkPosition);
                     if (existingRightRowKey == keyToShift - shiftDelta) {
                         mainRightRowKey.set(tableLocation, keyToShift);
                         mainModifiedTrackerCookieSource.set(tableLocation, modifiedSlotTracker.addMain(mainModifiedTrackerCookieSource.getUnsafe(tableLocation), mainInsertMask | tableLocation, existingRightRowKey, NaturalJoinModifiedSlotTracker.FLAG_RIGHT_SHIFT));
-                    } else if (existingRightRowKey < RowSet.NULL_ROW_KEY) {
+                    } else if (existingRightRowKey <= FIRST_DUPLICATE) {
                         final long duplicateLocation = duplicateLocationFromRowKey(existingRightRowKey);
                         if (shiftDelta < 0) {
                             final WritableRowSet duplicates = rightSideDuplicateRowSets.getUnsafe(duplicateLocation);
@@ -400,37 +486,44 @@ protected void applyRightShift(RowSequence rowSequence, Chunk[] sourceKeyChunks,
                 Assert.neq(tableLocation, "tableLocation", firstTableLocation, "firstTableLocation");
             }
             if (!found) {
-                final int firstAlternateTableLocation = hashToTableLocationAlternate(hash);
-                boolean alternateFound = false;
-                if (firstAlternateTableLocation < rehashPointer) {
-                    int alternateTableLocation = firstAlternateTableLocation;
-                    while ((existingRightRowKey = alternateRightRowKey.getUnsafe(alternateTableLocation)) != EMPTY_RIGHT_STATE) {
-                        if (eq(alternateKeySource0.getUnsafe(alternateTableLocation), k0)) {
-                            final long keyToShift = rowKeyChunk.get(chunkPosition);
-                            if (existingRightRowKey == keyToShift - shiftDelta) {
-                                alternateRightRowKey.set(alternateTableLocation, keyToShift);
-                                alternateModifiedTrackerCookieSource.set(alternateTableLocation, modifiedSlotTracker.addMain(alternateModifiedTrackerCookieSource.getUnsafe(alternateTableLocation), alternateInsertMask | alternateTableLocation, existingRightRowKey, NaturalJoinModifiedSlotTracker.FLAG_RIGHT_SHIFT));
-                            } else if (existingRightRowKey < RowSet.NULL_ROW_KEY) {
-                                final long duplicateLocation = duplicateLocationFromRowKey(existingRightRowKey);
-                                if (shiftDelta < 0) {
-                                    final WritableRowSet duplicates = rightSideDuplicateRowSets.getUnsafe(duplicateLocation);
-                                    shiftOneKey(duplicates, keyToShift, shiftDelta);
+                if (!searchAlternate) {
+                    throw Assert.statementNeverExecuted("Could not find existing state for shifted right row");
+                } else {
+                    final int firstAlternateTableLocation = hashToTableLocationAlternate(hash);
+                    boolean alternateFound = false;
+                    if (firstAlternateTableLocation < rehashPointer) {
+                        int alternateTableLocation = firstAlternateTableLocation;
+                        while (!isStateEmpty(existingRightRowKey = alternateRightRowKey.getUnsafe(alternateTableLocation))) {
+                            if (eq(alternateKeySource0.getUnsafe(alternateTableLocation), k0)) {
+                                if (isStateDeleted(existingRightRowKey)) {
+                                    break;
+                                }
+                                final long keyToShift = rowKeyChunk.get(chunkPosition);
+                                if (existingRightRowKey == keyToShift - shiftDelta) {
+                                    alternateRightRowKey.set(alternateTableLocation, keyToShift);
+                                    alternateModifiedTrackerCookieSource.set(alternateTableLocation, modifiedSlotTracker.addMain(alternateModifiedTrackerCookieSource.getUnsafe(alternateTableLocation), alternateInsertMask | alternateTableLocation, existingRightRowKey, NaturalJoinModifiedSlotTracker.FLAG_RIGHT_SHIFT));
+                                } else if (existingRightRowKey <= FIRST_DUPLICATE) {
+                                    final long duplicateLocation = duplicateLocationFromRowKey(existingRightRowKey);
+                                    if (shiftDelta < 0) {
+                                        final WritableRowSet duplicates = rightSideDuplicateRowSets.getUnsafe(duplicateLocation);
+                                        shiftOneKey(duplicates, keyToShift, shiftDelta);
+                                    } else {
+                                        pc.pendingShifts.set(pc.pendingShiftPointer++, (long)duplicateLocation);
+                                        pc.pendingShifts.set(pc.pendingShiftPointer++, keyToShift);
+                                    }
                                 } else {
-                                    pc.pendingShifts.set(pc.pendingShiftPointer++, (long)duplicateLocation);
-                                    pc.pendingShifts.set(pc.pendingShiftPointer++, keyToShift);
+                                    throw Assert.statementNeverExecuted("Could not find existing index for shifted right row");
                                 }
-                            } else {
-                                throw Assert.statementNeverExecuted("Could not find existing index for shifted right row");
+                                alternateFound = true;
+                                break;
                             }
-                            alternateFound = true;
-                            break;
+                            alternateTableLocation = alternateNextTableLocation(alternateTableLocation);
+                            Assert.neq(alternateTableLocation, "alternateTableLocation", firstAlternateTableLocation, "firstAlternateTableLocation");
                         }
-                        alternateTableLocation = alternateNextTableLocation(alternateTableLocation);
-                        Assert.neq(alternateTableLocation, "alternateTableLocation", firstAlternateTableLocation, "firstAlternateTableLocation");
                     }
-                }
-                if (!alternateFound) {
-                    throw Assert.statementNeverExecuted("Could not find existing state for shifted right row");
+                    if (!alternateFound) {
+                        throw Assert.statementNeverExecuted("Could not find existing state for shifted right row");
+                    }
                 }
             }
         }
@@ -445,10 +538,21 @@ protected void removeLeft(RowSequence rowSequence, Chunk[] sourceKeyChunks) {
             final int hash = hash(k0);
             final int firstTableLocation = hashToTableLocation(hash);
             boolean found = false;
+            boolean searchAlternate = true;
             int tableLocation = firstTableLocation;
-            while (mainRightRowKey.getUnsafe(tableLocation) != EMPTY_RIGHT_STATE) {
+            long rightState;
+            while (!isStateEmpty(rightState = mainRightRowKey.getUnsafe(tableLocation))) {
                 if (eq(mainKeySource0.getUnsafe(tableLocation), k0)) {
-                    mainLeftRowSet.getUnsafe(tableLocation).remove(rowKeyChunk.get(chunkPosition));
+                    if (isStateDeleted(rightState)) {
+                        searchAlternate = false;
+                        break;
+                    }
+                    final WritableRowSet left = mainLeftRowSet.getUnsafe(tableLocation);
+                    left.remove(rowKeyChunk.get(chunkPosition));
+                    if (left.isEmpty() && rightState == RowSet.NULL_ROW_KEY) {
+                        mainRightRowKey.set(tableLocation, TOMBSTONE_RIGHT_STATE);
+                        liveEntries--;
+                    }
                     found = true;
                     break;
                 }
@@ -456,22 +560,34 @@ protected void removeLeft(RowSequence rowSequence, Chunk[] sourceKeyChunks) {
                 Assert.neq(tableLocation, "tableLocation", firstTableLocation, "firstTableLocation");
             }
             if (!found) {
-                final int firstAlternateTableLocation = hashToTableLocationAlternate(hash);
-                boolean alternateFound = false;
-                if (firstAlternateTableLocation < rehashPointer) {
-                    int alternateTableLocation = firstAlternateTableLocation;
-                    while (alternateRightRowKey.getUnsafe(alternateTableLocation) != EMPTY_RIGHT_STATE) {
-                        if (eq(alternateKeySource0.getUnsafe(alternateTableLocation), k0)) {
-                            alternateLeftRowSet.getUnsafe(alternateTableLocation).remove(rowKeyChunk.get(chunkPosition));
-                            alternateFound = true;
-                            break;
+                if (!searchAlternate) {
+                    throw Assert.statementNeverExecuted("Could not find existing state for removed left row");
+                } else {
+                    final int firstAlternateTableLocation = hashToTableLocationAlternate(hash);
+                    boolean alternateFound = false;
+                    if (firstAlternateTableLocation < rehashPointer) {
+                        int alternateTableLocation = firstAlternateTableLocation;
+                        while (!isStateEmpty(rightState = alternateRightRowKey.getUnsafe(alternateTableLocation))) {
+                            if (eq(alternateKeySource0.getUnsafe(alternateTableLocation), k0)) {
+                                if (isStateDeleted(rightState)) {
+                                    break;
+                                }
+                                final WritableRowSet left = alternateLeftRowSet.getUnsafe(alternateTableLocation);
+                                left.remove(rowKeyChunk.get(chunkPosition));
+                                if (left.isEmpty() && rightState == RowSet.NULL_ROW_KEY) {
+                                    alternateRightRowKey.set(alternateTableLocation, TOMBSTONE_RIGHT_STATE);
+                                    liveEntries--;
+                                }
+                                alternateFound = true;
+                                break;
+                            }
+                            alternateTableLocation = alternateNextTableLocation(alternateTableLocation);
+                            Assert.neq(alternateTableLocation, "alternateTableLocation", firstAlternateTableLocation, "firstAlternateTableLocation");
                         }
-                        alternateTableLocation = alternateNextTableLocation(alternateTableLocation);
-                        Assert.neq(alternateTableLocation, "alternateTableLocation", firstAlternateTableLocation, "firstAlternateTableLocation");
                     }
-                }
-                if (!alternateFound) {
-                    throw Assert.statementNeverExecuted("Could not find existing state for removed left row");
+                    if (!alternateFound) {
+                        throw Assert.statementNeverExecuted("Could not find existing state for removed left row");
+                    }
                 }
             }
         }
@@ -487,9 +603,15 @@ protected void applyLeftShift(RowSequence rowSequence, Chunk[] sourceKeyChunks,
             final int hash = hash(k0);
             final int firstTableLocation = hashToTableLocation(hash);
             boolean found = false;
+            boolean searchAlternate = true;
             int tableLocation = firstTableLocation;
-            while (mainRightRowKey.getUnsafe(tableLocation) != EMPTY_RIGHT_STATE) {
+            long stateValue;
+            while (!isStateEmpty(stateValue = mainRightRowKey.getUnsafe(tableLocation))) {
                 if (eq(mainKeySource0.getUnsafe(tableLocation), k0)) {
+                    if (isStateDeleted(stateValue)) {
+                        searchAlternate = false;
+                        break;
+                    }
                     final WritableRowSet leftRowSetForState = mainLeftRowSet.getUnsafe(tableLocation);
                     final long keyToShift = rowKeyChunk.get(chunkPosition);
                     if (shiftDelta < 0) {
@@ -505,29 +627,36 @@ protected void applyLeftShift(RowSequence rowSequence, Chunk[] sourceKeyChunks,
                 Assert.neq(tableLocation, "tableLocation", firstTableLocation, "firstTableLocation");
             }
             if (!found) {
-                final int firstAlternateTableLocation = hashToTableLocationAlternate(hash);
-                boolean alternateFound = false;
-                if (firstAlternateTableLocation < rehashPointer) {
-                    int alternateTableLocation = firstAlternateTableLocation;
-                    while (alternateRightRowKey.getUnsafe(alternateTableLocation) != EMPTY_RIGHT_STATE) {
-                        if (eq(alternateKeySource0.getUnsafe(alternateTableLocation), k0)) {
-                            final WritableRowSet leftRowSetForState = alternateLeftRowSet.getUnsafe(alternateTableLocation);
-                            final long keyToShift = rowKeyChunk.get(chunkPosition);
-                            if (shiftDelta < 0) {
-                                shiftOneKey(leftRowSetForState, keyToShift, shiftDelta);
-                            } else {
-                                pc.pendingShifts.set(pc.pendingShiftPointer++, (long)(AlternatingColumnSource.ALTERNATE_SWITCH_MASK | alternateTableLocation));
-                                pc.pendingShifts.set(pc.pendingShiftPointer++, keyToShift);
+                if (!searchAlternate) {
+                    throw Assert.statementNeverExecuted("Could not find existing state for shifted left row");
+                } else {
+                    final int firstAlternateTableLocation = hashToTableLocationAlternate(hash);
+                    boolean alternateFound = false;
+                    if (firstAlternateTableLocation < rehashPointer) {
+                        int alternateTableLocation = firstAlternateTableLocation;
+                        while (!isStateEmpty(stateValue = alternateRightRowKey.getUnsafe(alternateTableLocation))) {
+                            if (eq(alternateKeySource0.getUnsafe(alternateTableLocation), k0)) {
+                                if (isStateDeleted(stateValue)) {
+                                    break;
+                                }
+                                final WritableRowSet leftRowSetForState = alternateLeftRowSet.getUnsafe(alternateTableLocation);
+                                final long keyToShift = rowKeyChunk.get(chunkPosition);
+                                if (shiftDelta < 0) {
+                                    shiftOneKey(leftRowSetForState, keyToShift, shiftDelta);
+                                } else {
+                                    pc.pendingShifts.set(pc.pendingShiftPointer++, (long)(AlternatingColumnSource.ALTERNATE_SWITCH_MASK | alternateTableLocation));
+                                    pc.pendingShifts.set(pc.pendingShiftPointer++, keyToShift);
+                                }
+                                alternateFound = true;
+                                break;
                             }
-                            alternateFound = true;
-                            break;
+                            alternateTableLocation = alternateNextTableLocation(alternateTableLocation);
+                            Assert.neq(alternateTableLocation, "alternateTableLocation", firstAlternateTableLocation, "firstAlternateTableLocation");
                         }
-                        alternateTableLocation = alternateNextTableLocation(alternateTableLocation);
-                        Assert.neq(alternateTableLocation, "alternateTableLocation", firstAlternateTableLocation, "firstAlternateTableLocation");
                     }
-                }
-                if (!alternateFound) {
-                    throw Assert.statementNeverExecuted("Could not find existing state for shifted left row");
+                    if (!alternateFound) {
+                        throw Assert.statementNeverExecuted("Could not find existing state for shifted left row");
+                    }
                 }
             }
         }
@@ -538,16 +667,30 @@ private static int hash(double k0) {
         return hash;
     }
 
-    private boolean migrateOneLocation(int locationToMigrate,
+    private static boolean isStateEmpty(long state) {
+        return state == EMPTY_RIGHT_STATE;
+    }
+
+    private static boolean isStateDeleted(long state) {
+        return state == TOMBSTONE_RIGHT_STATE;
+    }
+
+    private boolean migrateOneLocation(int locationToMigrate, boolean trueOnDeletedEntry,
             NaturalJoinModifiedSlotTracker modifiedSlotTracker) {
         final long currentStateValue = alternateRightRowKey.getUnsafe(locationToMigrate);
-        if (currentStateValue == EMPTY_RIGHT_STATE) {
+        if (isStateEmpty(currentStateValue)) {
             return false;
         }
+        if (isStateDeleted(currentStateValue)) {
+            alternateEntries--;
+            alternateRightRowKey.set(locationToMigrate, EMPTY_RIGHT_STATE);
+            return trueOnDeletedEntry;
+        }
         final double k0 = alternateKeySource0.getUnsafe(locationToMigrate);
         final int hash = hash(k0);
         int destinationTableLocation = hashToTableLocation(hash);
-        while (mainRightRowKey.getUnsafe(destinationTableLocation) != EMPTY_RIGHT_STATE) {
+        long candidateState;
+        while (!isStateEmpty(candidateState = mainRightRowKey.getUnsafe(destinationTableLocation)) && !isStateDeleted(candidateState)) {
             destinationTableLocation = nextTableLocation(destinationTableLocation);
         }
         mainKeySource0.set(destinationTableLocation, k0);
@@ -559,6 +702,10 @@ private boolean migrateOneLocation(int locationToMigrate,
         alternateModifiedTrackerCookieSource.set(locationToMigrate, -1L);
         modifiedSlotTracker.moveTableLocation(cookie, locationToMigrate, mainInsertMask | destinationTableLocation);;
         alternateRightRowKey.set(locationToMigrate, EMPTY_RIGHT_STATE);
+        if (!isStateDeleted(candidateState)) {
+            numEntries++;
+        }
+        alternateEntries--;
         return true;
     }
 
@@ -567,7 +714,7 @@ protected int rehashInternalPartial(int entriesToRehash,
             NaturalJoinModifiedSlotTracker modifiedSlotTracker) {
         int rehashedEntries = 0;
         while (rehashPointer > 0 && rehashedEntries < entriesToRehash) {
-            if (migrateOneLocation(--rehashPointer, modifiedSlotTracker)) {
+            if (migrateOneLocation(--rehashPointer, false, modifiedSlotTracker)) {
                 rehashedEntries++;
             }
         }
@@ -575,8 +722,7 @@ protected int rehashInternalPartial(int entriesToRehash,
     }
 
     @Override
-    protected void newAlternate() {
-        super.newAlternate();
+    protected void adviseNewAlternate() {
         this.mainKeySource0 = (ImmutableDoubleArraySource)super.mainKeySources[0];
         this.alternateKeySource0 = (ImmutableDoubleArraySource)super.alternateKeySources[0];
     }
@@ -590,7 +736,7 @@ protected void clearAlternate() {
     @Override
     protected void migrateFront(NaturalJoinModifiedSlotTracker modifiedSlotTracker) {
         int location = 0;
-        while (migrateOneLocation(location++, modifiedSlotTracker));
+        while (migrateOneLocation(location++, true, modifiedSlotTracker) && location < alternateTableSize);
     }
 
     @Override
@@ -610,7 +756,7 @@ protected void rehashInternalFull(final int oldSize) {
         mainModifiedTrackerCookieSource.setArray(destModifiedCookie);
         for (int sourceBucket = 0; sourceBucket < oldSize; ++sourceBucket) {
             final long currentStateValue = originalStateArray[sourceBucket];
-            if (currentStateValue == EMPTY_RIGHT_STATE) {
+            if (isStateEmpty(currentStateValue)) {
                 continue;
             }
             final double k0 = originalKeyArray0[sourceBucket];
@@ -618,7 +764,7 @@ protected void rehashInternalFull(final int oldSize) {
             final int firstDestinationTableLocation = hashToTableLocation(hash);
             int destinationTableLocation = firstDestinationTableLocation;
             while (true) {
-                if (destState[destinationTableLocation] == EMPTY_RIGHT_STATE) {
+                if (isStateEmpty(destState[destinationTableLocation])) {
                     destKeyArray0[destinationTableLocation] = k0;
                     destState[destinationTableLocation] = originalStateArray[sourceBucket];
                     destLeftRowSet[destinationTableLocation] = oldLeftRowSet[sourceBucket];
diff --git a/engine/table/src/main/java/io/deephaven/engine/table/impl/naturaljoin/typed/incopen/gen/IncrementalNaturalJoinHasherFloat.java b/engine/table/src/main/java/io/deephaven/engine/table/impl/naturaljoin/typed/incopen/gen/IncrementalNaturalJoinHasherFloat.java
index b464daa62a6..68a1b7177ba 100644
--- a/engine/table/src/main/java/io/deephaven/engine/table/impl/naturaljoin/typed/incopen/gen/IncrementalNaturalJoinHasherFloat.java
+++ b/engine/table/src/main/java/io/deephaven/engine/table/impl/naturaljoin/typed/incopen/gen/IncrementalNaturalJoinHasherFloat.java
@@ -62,15 +62,16 @@ protected void buildFromLeftSide(RowSequence rowSequence, Chunk[] sourceKeyChunk
             int tableLocation = firstTableLocation;
             MAIN_SEARCH: while (true) {
                 long rightRowKeyForState = mainRightRowKey.getUnsafe(tableLocation);
-                if (rightRowKeyForState == EMPTY_RIGHT_STATE) {
+                if (isStateEmpty(rightRowKeyForState)) {
                     numEntries++;
+                    liveEntries++;
                     mainKeySource0.set(tableLocation, k0);
                     mainLeftRowSet.set(tableLocation, RowSetFactory.fromKeys(rowKeyChunk.get(chunkPosition)));
                     mainRightRowKey.set(tableLocation, RowSet.NULL_ROW_KEY);
                     mainModifiedTrackerCookieSource.set(tableLocation, -1L);
                     break;
                 } else if (eq(mainKeySource0.getUnsafe(tableLocation), k0)) {
-                    if (rightRowKeyForState < RowSet.NULL_ROW_KEY) {
+                    if (rightRowKeyForState <= FIRST_DUPLICATE) {
                         throw new IllegalStateException("Natural Join found duplicate right key for " + extractKeyStringFromSourceTable(rowKeyChunk.get(chunkPosition)));
                     }
                     mainLeftRowSet.getUnsafe(tableLocation).insert(rowKeyChunk.get(chunkPosition));
@@ -95,8 +96,9 @@ protected void buildFromRightSide(RowSequence rowSequence, Chunk[] sourceKeyChun
             int tableLocation = firstTableLocation;
             MAIN_SEARCH: while (true) {
                 long existingRightRowKey = mainRightRowKey.getUnsafe(tableLocation);
-                if (existingRightRowKey == EMPTY_RIGHT_STATE) {
+                if (isStateEmpty(existingRightRowKey)) {
                     numEntries++;
+                    liveEntries++;
                     mainKeySource0.set(tableLocation, k0);
                     mainLeftRowSet.set(tableLocation, RowSetFactory.empty());
                     mainRightRowKey.set(tableLocation, rowKeyChunk.get(chunkPosition));
@@ -105,7 +107,7 @@ protected void buildFromRightSide(RowSequence rowSequence, Chunk[] sourceKeyChun
                 } else if (eq(mainKeySource0.getUnsafe(tableLocation), k0)) {
                     if (existingRightRowKey == RowSet.NULL_ROW_KEY) {
                         mainRightRowKey.set(tableLocation, rowKeyChunk.get(chunkPosition));
-                    } else if (existingRightRowKey < RowSet.NULL_ROW_KEY) {
+                    } else if (existingRightRowKey <= FIRST_DUPLICATE) {
                         final long duplicateLocation = duplicateLocationFromRowKey(existingRightRowKey);
                         rightSideDuplicateRowSets.getUnsafe(duplicateLocation).insert(rowKeyChunk.get(chunkPosition));
                     } else {
@@ -132,20 +134,27 @@ protected void addRightSide(RowSequence rowSequence, Chunk[] sourceKeyChunks,
             final int hash = hash(k0);
             final int firstTableLocation = hashToTableLocation(hash);
             int tableLocation = firstTableLocation;
+            int firstDeletedLocation = -1;
             MAIN_SEARCH: while (true) {
                 long existingRightRowKey = mainRightRowKey.getUnsafe(tableLocation);
-                if (existingRightRowKey == EMPTY_RIGHT_STATE) {
+                if (firstDeletedLocation < 0 && isStateDeleted(existingRightRowKey)) {
+                    firstDeletedLocation = tableLocation;
+                }
+                if (isStateEmpty(existingRightRowKey)) {
                     final int firstAlternateTableLocation = hashToTableLocationAlternate(hash);
                     int alternateTableLocation = firstAlternateTableLocation;
                     while (alternateTableLocation < rehashPointer) {
                         existingRightRowKey = alternateRightRowKey.getUnsafe(alternateTableLocation);
-                        if (existingRightRowKey == EMPTY_RIGHT_STATE) {
+                        if (isStateEmpty(existingRightRowKey)) {
                             break;
                         } else if (eq(alternateKeySource0.getUnsafe(alternateTableLocation), k0)) {
+                            if (isStateDeleted(existingRightRowKey)) {
+                                break;
+                            }
                             if (existingRightRowKey == RowSet.NULL_ROW_KEY) {
                                 alternateRightRowKey.set(alternateTableLocation, rowKeyChunk.get(chunkPosition));
                                 alternateModifiedTrackerCookieSource.set(alternateTableLocation, modifiedSlotTracker.addMain(alternateModifiedTrackerCookieSource.getUnsafe(alternateTableLocation), alternateInsertMask | alternateTableLocation, existingRightRowKey, NaturalJoinModifiedSlotTracker.FLAG_RIGHT_CHANGE));
-                            } else if (existingRightRowKey < RowSet.NULL_ROW_KEY) {
+                            } else if (existingRightRowKey <= FIRST_DUPLICATE) {
                                 final long duplicateLocation = duplicateLocationFromRowKey(existingRightRowKey);
                                 final WritableRowSet duplicates = rightSideDuplicateRowSets.getUnsafe(duplicateLocation);
                                 final long duplicateSize = duplicates.size();
@@ -163,17 +172,31 @@ protected void addRightSide(RowSequence rowSequence, Chunk[] sourceKeyChunks,
                             Assert.neq(alternateTableLocation, "alternateTableLocation", firstAlternateTableLocation, "firstAlternateTableLocation");
                         }
                     }
-                    numEntries++;
+                    if (firstDeletedLocation >= 0) {
+                        tableLocation = firstDeletedLocation;
+                    } else {
+                        numEntries++;
+                    }
+                    liveEntries++;
                     mainKeySource0.set(tableLocation, k0);
                     mainLeftRowSet.set(tableLocation, RowSetFactory.empty());
                     mainRightRowKey.set(tableLocation, rowKeyChunk.get(chunkPosition));
                     mainModifiedTrackerCookieSource.set(tableLocation, modifiedSlotTracker.addMain(-1, mainInsertMask | tableLocation, existingRightRowKey, NaturalJoinModifiedSlotTracker.FLAG_RIGHT_CHANGE));
                     break;
                 } else if (eq(mainKeySource0.getUnsafe(tableLocation), k0)) {
+                    if (isStateDeleted(existingRightRowKey)) {
+                        tableLocation = firstDeletedLocation;
+                        liveEntries++;
+                        mainKeySource0.set(tableLocation, k0);
+                        mainLeftRowSet.set(tableLocation, RowSetFactory.empty());
+                        mainRightRowKey.set(tableLocation, rowKeyChunk.get(chunkPosition));
+                        mainModifiedTrackerCookieSource.set(tableLocation, modifiedSlotTracker.addMain(-1, mainInsertMask | tableLocation, existingRightRowKey, NaturalJoinModifiedSlotTracker.FLAG_RIGHT_CHANGE));
+                        break;
+                    }
                     if (existingRightRowKey == RowSet.NULL_ROW_KEY) {
                         mainRightRowKey.set(tableLocation, rowKeyChunk.get(chunkPosition));
                         mainModifiedTrackerCookieSource.set(tableLocation, modifiedSlotTracker.addMain(mainModifiedTrackerCookieSource.getUnsafe(tableLocation), mainInsertMask | tableLocation, existingRightRowKey, NaturalJoinModifiedSlotTracker.FLAG_RIGHT_CHANGE));
-                    } else if (existingRightRowKey < RowSet.NULL_ROW_KEY) {
+                    } else if (existingRightRowKey <= FIRST_DUPLICATE) {
                         final long duplicateLocation = duplicateLocationFromRowKey(existingRightRowKey);
                         final WritableRowSet duplicates = rightSideDuplicateRowSets.getUnsafe(duplicateLocation);
                         final long duplicateSize = duplicates.size();
@@ -204,17 +227,24 @@ protected void addLeftSide(RowSequence rowSequence, Chunk[] sourceKeyChunks,
             final int hash = hash(k0);
             final int firstTableLocation = hashToTableLocation(hash);
             int tableLocation = firstTableLocation;
+            int firstDeletedLocation = -1;
             MAIN_SEARCH: while (true) {
                 long rightRowKeyForState = mainRightRowKey.getUnsafe(tableLocation);
-                if (rightRowKeyForState == EMPTY_RIGHT_STATE) {
+                if (firstDeletedLocation < 0 && isStateDeleted(rightRowKeyForState)) {
+                    firstDeletedLocation = tableLocation;
+                }
+                if (isStateEmpty(rightRowKeyForState)) {
                     final int firstAlternateTableLocation = hashToTableLocationAlternate(hash);
                     int alternateTableLocation = firstAlternateTableLocation;
                     while (alternateTableLocation < rehashPointer) {
                         rightRowKeyForState = alternateRightRowKey.getUnsafe(alternateTableLocation);
-                        if (rightRowKeyForState == EMPTY_RIGHT_STATE) {
+                        if (isStateEmpty(rightRowKeyForState)) {
                             break;
                         } else if (eq(alternateKeySource0.getUnsafe(alternateTableLocation), k0)) {
-                            if (rightRowKeyForState < RowSet.NULL_ROW_KEY) {
+                            if (isStateDeleted(rightRowKeyForState)) {
+                                break;
+                            }
+                            if (rightRowKeyForState <= FIRST_DUPLICATE) {
                                 throw new IllegalStateException("Natural Join found duplicate right key for " + extractKeyStringFromSourceTable(rowKeyChunk.get(chunkPosition)));
                             }
                             alternateLeftRowSet.getUnsafe(alternateTableLocation).insert(rowKeyChunk.get(chunkPosition));
@@ -225,7 +255,12 @@ protected void addLeftSide(RowSequence rowSequence, Chunk[] sourceKeyChunks,
                             Assert.neq(alternateTableLocation, "alternateTableLocation", firstAlternateTableLocation, "firstAlternateTableLocation");
                         }
                     }
-                    numEntries++;
+                    if (firstDeletedLocation >= 0) {
+                        tableLocation = firstDeletedLocation;
+                    } else {
+                        numEntries++;
+                    }
+                    liveEntries++;
                     mainKeySource0.set(tableLocation, k0);
                     mainLeftRowSet.set(tableLocation, RowSetFactory.fromKeys(rowKeyChunk.get(chunkPosition)));
                     mainRightRowKey.set(tableLocation, RowSet.NULL_ROW_KEY);
@@ -233,7 +268,17 @@ protected void addLeftSide(RowSequence rowSequence, Chunk[] sourceKeyChunks,
                     leftRedirections.set(leftRedirectionOffset++, RowSet.NULL_ROW_KEY);
                     break;
                 } else if (eq(mainKeySource0.getUnsafe(tableLocation), k0)) {
-                    if (rightRowKeyForState < RowSet.NULL_ROW_KEY) {
+                    if (isStateDeleted(rightRowKeyForState)) {
+                        tableLocation = firstDeletedLocation;
+                        liveEntries++;
+                        mainKeySource0.set(tableLocation, k0);
+                        mainLeftRowSet.set(tableLocation, RowSetFactory.fromKeys(rowKeyChunk.get(chunkPosition)));
+                        mainRightRowKey.set(tableLocation, RowSet.NULL_ROW_KEY);
+                        mainModifiedTrackerCookieSource.set(tableLocation, -1L);
+                        leftRedirections.set(leftRedirectionOffset++, RowSet.NULL_ROW_KEY);
+                        break;
+                    }
+                    if (rightRowKeyForState <= FIRST_DUPLICATE) {
                         throw new IllegalStateException("Natural Join found duplicate right key for " + extractKeyStringFromSourceTable(rowKeyChunk.get(chunkPosition)));
                     }
                     mainLeftRowSet.getUnsafe(tableLocation).insert(rowKeyChunk.get(chunkPosition));
@@ -257,11 +302,16 @@ protected void removeRight(RowSequence rowSequence, Chunk[] sourceKeyChunks,
             final int hash = hash(k0);
             final int firstTableLocation = hashToTableLocation(hash);
             boolean found = false;
+            boolean searchAlternate = true;
             int tableLocation = firstTableLocation;
             long existingRightRowKey;
-            while ((existingRightRowKey = mainRightRowKey.getUnsafe(tableLocation)) != EMPTY_RIGHT_STATE) {
+            while (!isStateEmpty(existingRightRowKey = mainRightRowKey.getUnsafe(tableLocation))) {
                 if (eq(mainKeySource0.getUnsafe(tableLocation), k0)) {
-                    if (existingRightRowKey < RowSet.NULL_ROW_KEY) {
+                    if (isStateDeleted(existingRightRowKey)) {
+                        searchAlternate = false;
+                        break;
+                    }
+                    if (existingRightRowKey <= FIRST_DUPLICATE) {
                         final long duplicateLocation = duplicateLocationFromRowKey(existingRightRowKey);
                         final WritableRowSet duplicates = rightSideDuplicateRowSets.getUnsafe(duplicateLocation);
                         final long duplicateSize = duplicates.size();
@@ -274,7 +324,13 @@ protected void removeRight(RowSequence rowSequence, Chunk[] sourceKeyChunks,
                     } else if (existingRightRowKey != rowKeyChunk.get(chunkPosition)) {
                         Assert.statementNeverExecuted("Could not find existing right row in state");
                     } else {
-                        mainRightRowKey.set(tableLocation, RowSet.NULL_ROW_KEY);
+                        final boolean leftEmpty = mainLeftRowSet.getUnsafe(tableLocation).isEmpty();
+                        if (leftEmpty) {
+                            mainRightRowKey.set(tableLocation, TOMBSTONE_RIGHT_STATE);
+                            liveEntries--;
+                        } else {
+                            mainRightRowKey.set(tableLocation, RowSet.NULL_ROW_KEY);
+                        }
                         mainModifiedTrackerCookieSource.set(tableLocation, modifiedSlotTracker.addMain(mainModifiedTrackerCookieSource.getUnsafe(tableLocation), mainInsertMask | tableLocation, existingRightRowKey, NaturalJoinModifiedSlotTracker.FLAG_RIGHT_CHANGE));
                     }
                     found = true;
@@ -284,37 +340,50 @@ protected void removeRight(RowSequence rowSequence, Chunk[] sourceKeyChunks,
                 Assert.neq(tableLocation, "tableLocation", firstTableLocation, "firstTableLocation");
             }
             if (!found) {
-                final int firstAlternateTableLocation = hashToTableLocationAlternate(hash);
-                boolean alternateFound = false;
-                if (firstAlternateTableLocation < rehashPointer) {
-                    int alternateTableLocation = firstAlternateTableLocation;
-                    while ((existingRightRowKey = alternateRightRowKey.getUnsafe(alternateTableLocation)) != EMPTY_RIGHT_STATE) {
-                        if (eq(alternateKeySource0.getUnsafe(alternateTableLocation), k0)) {
-                            if (existingRightRowKey < RowSet.NULL_ROW_KEY) {
-                                final long duplicateLocation = duplicateLocationFromRowKey(existingRightRowKey);
-                                final WritableRowSet duplicates = rightSideDuplicateRowSets.getUnsafe(duplicateLocation);
-                                final long duplicateSize = duplicates.size();
-                                duplicates.remove(rowKeyChunk.get(chunkPosition));
-                                Assert.eq(duplicateSize, "duplicateSize", duplicates.size() + 1, "duplicates.size() + 1");
-                                if (duplicates.size() == 1) {
-                                    alternateRightRowKey.set(alternateTableLocation, duplicates.firstRowKey());
-                                    freeDuplicateLocation(duplicateLocation);
+                if (!searchAlternate) {
+                    throw Assert.statementNeverExecuted("Could not find existing state for removed right row");
+                } else {
+                    final int firstAlternateTableLocation = hashToTableLocationAlternate(hash);
+                    boolean alternateFound = false;
+                    if (firstAlternateTableLocation < rehashPointer) {
+                        int alternateTableLocation = firstAlternateTableLocation;
+                        while (!isStateEmpty(existingRightRowKey = alternateRightRowKey.getUnsafe(alternateTableLocation))) {
+                            if (eq(alternateKeySource0.getUnsafe(alternateTableLocation), k0)) {
+                                if (isStateDeleted(existingRightRowKey)) {
+                                    break;
                                 }
-                            } else if (existingRightRowKey != rowKeyChunk.get(chunkPosition)) {
-                                Assert.statementNeverExecuted("Could not find existing right row in state");
-                            } else {
-                                alternateRightRowKey.set(alternateTableLocation, RowSet.NULL_ROW_KEY);
-                                alternateModifiedTrackerCookieSource.set(alternateTableLocation, modifiedSlotTracker.addMain(alternateModifiedTrackerCookieSource.getUnsafe(alternateTableLocation), alternateInsertMask | alternateTableLocation, existingRightRowKey, NaturalJoinModifiedSlotTracker.FLAG_RIGHT_CHANGE));
+                                if (existingRightRowKey <= FIRST_DUPLICATE) {
+                                    final long duplicateLocation = duplicateLocationFromRowKey(existingRightRowKey);
+                                    final WritableRowSet duplicates = rightSideDuplicateRowSets.getUnsafe(duplicateLocation);
+                                    final long duplicateSize = duplicates.size();
+                                    duplicates.remove(rowKeyChunk.get(chunkPosition));
+                                    Assert.eq(duplicateSize, "duplicateSize", duplicates.size() + 1, "duplicates.size() + 1");
+                                    if (duplicates.size() == 1) {
+                                        alternateRightRowKey.set(alternateTableLocation, duplicates.firstRowKey());
+                                        freeDuplicateLocation(duplicateLocation);
+                                    }
+                                } else if (existingRightRowKey != rowKeyChunk.get(chunkPosition)) {
+                                    Assert.statementNeverExecuted("Could not find existing right row in state");
+                                } else {
+                                    final boolean leftEmpty = alternateLeftRowSet.getUnsafe(alternateTableLocation).isEmpty();
+                                    if (leftEmpty) {
+                                        alternateRightRowKey.set(alternateTableLocation, TOMBSTONE_RIGHT_STATE);
+                                        liveEntries--;
+                                    } else {
+                                        alternateRightRowKey.set(alternateTableLocation, RowSet.NULL_ROW_KEY);
+                                    }
+                                    alternateModifiedTrackerCookieSource.set(alternateTableLocation, modifiedSlotTracker.addMain(alternateModifiedTrackerCookieSource.getUnsafe(alternateTableLocation), alternateInsertMask | alternateTableLocation, existingRightRowKey, NaturalJoinModifiedSlotTracker.FLAG_RIGHT_CHANGE));
+                                }
+                                alternateFound = true;
+                                break;
                             }
-                            alternateFound = true;
-                            break;
+                            alternateTableLocation = alternateNextTableLocation(alternateTableLocation);
+                            Assert.neq(alternateTableLocation, "alternateTableLocation", firstAlternateTableLocation, "firstAlternateTableLocation");
                         }
-                        alternateTableLocation = alternateNextTableLocation(alternateTableLocation);
-                        Assert.neq(alternateTableLocation, "alternateTableLocation", firstAlternateTableLocation, "firstAlternateTableLocation");
                     }
-                }
-                if (!alternateFound) {
-                    throw Assert.statementNeverExecuted("Could not find existing state for removed right row");
+                    if (!alternateFound) {
+                        throw Assert.statementNeverExecuted("Could not find existing state for removed right row");
+                    }
                 }
             }
         }
@@ -329,10 +398,15 @@ protected void modifyByRight(RowSequence rowSequence, Chunk[] sourceKeyChunks,
             final int hash = hash(k0);
             final int firstTableLocation = hashToTableLocation(hash);
             boolean found = false;
+            boolean searchAlternate = true;
             int tableLocation = firstTableLocation;
             long existingRightRowKey;
-            while ((existingRightRowKey = mainRightRowKey.getUnsafe(tableLocation)) != EMPTY_RIGHT_STATE) {
+            while (!isStateEmpty(existingRightRowKey = mainRightRowKey.getUnsafe(tableLocation))) {
                 if (eq(mainKeySource0.getUnsafe(tableLocation), k0)) {
+                    if (isStateDeleted(existingRightRowKey)) {
+                        searchAlternate = false;
+                        break;
+                    }
                     mainModifiedTrackerCookieSource.set(tableLocation, modifiedSlotTracker.addMain(mainModifiedTrackerCookieSource.getUnsafe(tableLocation), mainInsertMask | tableLocation, existingRightRowKey, NaturalJoinModifiedSlotTracker.FLAG_RIGHT_CHANGE));
                     found = true;
                     break;
@@ -341,22 +415,29 @@ protected void modifyByRight(RowSequence rowSequence, Chunk[] sourceKeyChunks,
                 Assert.neq(tableLocation, "tableLocation", firstTableLocation, "firstTableLocation");
             }
             if (!found) {
-                final int firstAlternateTableLocation = hashToTableLocationAlternate(hash);
-                boolean alternateFound = false;
-                if (firstAlternateTableLocation < rehashPointer) {
-                    int alternateTableLocation = firstAlternateTableLocation;
-                    while ((existingRightRowKey = alternateRightRowKey.getUnsafe(alternateTableLocation)) != EMPTY_RIGHT_STATE) {
-                        if (eq(alternateKeySource0.getUnsafe(alternateTableLocation), k0)) {
-                            alternateModifiedTrackerCookieSource.set(alternateTableLocation, modifiedSlotTracker.addMain(alternateModifiedTrackerCookieSource.getUnsafe(alternateTableLocation), alternateInsertMask | alternateTableLocation, existingRightRowKey, NaturalJoinModifiedSlotTracker.FLAG_RIGHT_CHANGE));
-                            alternateFound = true;
-                            break;
+                if (!searchAlternate) {
+                    throw Assert.statementNeverExecuted("Could not find existing state for modified right row");
+                } else {
+                    final int firstAlternateTableLocation = hashToTableLocationAlternate(hash);
+                    boolean alternateFound = false;
+                    if (firstAlternateTableLocation < rehashPointer) {
+                        int alternateTableLocation = firstAlternateTableLocation;
+                        while (!isStateEmpty(existingRightRowKey = alternateRightRowKey.getUnsafe(alternateTableLocation))) {
+                            if (eq(alternateKeySource0.getUnsafe(alternateTableLocation), k0)) {
+                                if (isStateDeleted(existingRightRowKey)) {
+                                    break;
+                                }
+                                alternateModifiedTrackerCookieSource.set(alternateTableLocation, modifiedSlotTracker.addMain(alternateModifiedTrackerCookieSource.getUnsafe(alternateTableLocation), alternateInsertMask | alternateTableLocation, existingRightRowKey, NaturalJoinModifiedSlotTracker.FLAG_RIGHT_CHANGE));
+                                alternateFound = true;
+                                break;
+                            }
+                            alternateTableLocation = alternateNextTableLocation(alternateTableLocation);
+                            Assert.neq(alternateTableLocation, "alternateTableLocation", firstAlternateTableLocation, "firstAlternateTableLocation");
                         }
-                        alternateTableLocation = alternateNextTableLocation(alternateTableLocation);
-                        Assert.neq(alternateTableLocation, "alternateTableLocation", firstAlternateTableLocation, "firstAlternateTableLocation");
                     }
-                }
-                if (!alternateFound) {
-                    throw Assert.statementNeverExecuted("Could not find existing state for modified right row");
+                    if (!alternateFound) {
+                        throw Assert.statementNeverExecuted("Could not find existing state for modified right row");
+                    }
                 }
             }
         }
@@ -373,15 +454,20 @@ protected void applyRightShift(RowSequence rowSequence, Chunk[] sourceKeyChunks,
             final int hash = hash(k0);
             final int firstTableLocation = hashToTableLocation(hash);
             boolean found = false;
+            boolean searchAlternate = true;
             int tableLocation = firstTableLocation;
             long existingRightRowKey;
-            while ((existingRightRowKey = mainRightRowKey.getUnsafe(tableLocation)) != EMPTY_RIGHT_STATE) {
+            while (!isStateEmpty(existingRightRowKey = mainRightRowKey.getUnsafe(tableLocation))) {
                 if (eq(mainKeySource0.getUnsafe(tableLocation), k0)) {
+                    if (isStateDeleted(existingRightRowKey)) {
+                        searchAlternate = false;
+                        break;
+                    }
                     final long keyToShift = rowKeyChunk.get(chunkPosition);
                     if (existingRightRowKey == keyToShift - shiftDelta) {
                         mainRightRowKey.set(tableLocation, keyToShift);
                         mainModifiedTrackerCookieSource.set(tableLocation, modifiedSlotTracker.addMain(mainModifiedTrackerCookieSource.getUnsafe(tableLocation), mainInsertMask | tableLocation, existingRightRowKey, NaturalJoinModifiedSlotTracker.FLAG_RIGHT_SHIFT));
-                    } else if (existingRightRowKey < RowSet.NULL_ROW_KEY) {
+                    } else if (existingRightRowKey <= FIRST_DUPLICATE) {
                         final long duplicateLocation = duplicateLocationFromRowKey(existingRightRowKey);
                         if (shiftDelta < 0) {
                             final WritableRowSet duplicates = rightSideDuplicateRowSets.getUnsafe(duplicateLocation);
@@ -400,37 +486,44 @@ protected void applyRightShift(RowSequence rowSequence, Chunk[] sourceKeyChunks,
                 Assert.neq(tableLocation, "tableLocation", firstTableLocation, "firstTableLocation");
             }
             if (!found) {
-                final int firstAlternateTableLocation = hashToTableLocationAlternate(hash);
-                boolean alternateFound = false;
-                if (firstAlternateTableLocation < rehashPointer) {
-                    int alternateTableLocation = firstAlternateTableLocation;
-                    while ((existingRightRowKey = alternateRightRowKey.getUnsafe(alternateTableLocation)) != EMPTY_RIGHT_STATE) {
-                        if (eq(alternateKeySource0.getUnsafe(alternateTableLocation), k0)) {
-                            final long keyToShift = rowKeyChunk.get(chunkPosition);
-                            if (existingRightRowKey == keyToShift - shiftDelta) {
-                                alternateRightRowKey.set(alternateTableLocation, keyToShift);
-                                alternateModifiedTrackerCookieSource.set(alternateTableLocation, modifiedSlotTracker.addMain(alternateModifiedTrackerCookieSource.getUnsafe(alternateTableLocation), alternateInsertMask | alternateTableLocation, existingRightRowKey, NaturalJoinModifiedSlotTracker.FLAG_RIGHT_SHIFT));
-                            } else if (existingRightRowKey < RowSet.NULL_ROW_KEY) {
-                                final long duplicateLocation = duplicateLocationFromRowKey(existingRightRowKey);
-                                if (shiftDelta < 0) {
-                                    final WritableRowSet duplicates = rightSideDuplicateRowSets.getUnsafe(duplicateLocation);
-                                    shiftOneKey(duplicates, keyToShift, shiftDelta);
+                if (!searchAlternate) {
+                    throw Assert.statementNeverExecuted("Could not find existing state for shifted right row");
+                } else {
+                    final int firstAlternateTableLocation = hashToTableLocationAlternate(hash);
+                    boolean alternateFound = false;
+                    if (firstAlternateTableLocation < rehashPointer) {
+                        int alternateTableLocation = firstAlternateTableLocation;
+                        while (!isStateEmpty(existingRightRowKey = alternateRightRowKey.getUnsafe(alternateTableLocation))) {
+                            if (eq(alternateKeySource0.getUnsafe(alternateTableLocation), k0)) {
+                                if (isStateDeleted(existingRightRowKey)) {
+                                    break;
+                                }
+                                final long keyToShift = rowKeyChunk.get(chunkPosition);
+                                if (existingRightRowKey == keyToShift - shiftDelta) {
+                                    alternateRightRowKey.set(alternateTableLocation, keyToShift);
+                                    alternateModifiedTrackerCookieSource.set(alternateTableLocation, modifiedSlotTracker.addMain(alternateModifiedTrackerCookieSource.getUnsafe(alternateTableLocation), alternateInsertMask | alternateTableLocation, existingRightRowKey, NaturalJoinModifiedSlotTracker.FLAG_RIGHT_SHIFT));
+                                } else if (existingRightRowKey <= FIRST_DUPLICATE) {
+                                    final long duplicateLocation = duplicateLocationFromRowKey(existingRightRowKey);
+                                    if (shiftDelta < 0) {
+                                        final WritableRowSet duplicates = rightSideDuplicateRowSets.getUnsafe(duplicateLocation);
+                                        shiftOneKey(duplicates, keyToShift, shiftDelta);
+                                    } else {
+                                        pc.pendingShifts.set(pc.pendingShiftPointer++, (long)duplicateLocation);
+                                        pc.pendingShifts.set(pc.pendingShiftPointer++, keyToShift);
+                                    }
                                 } else {
-                                    pc.pendingShifts.set(pc.pendingShiftPointer++, (long)duplicateLocation);
-                                    pc.pendingShifts.set(pc.pendingShiftPointer++, keyToShift);
+                                    throw Assert.statementNeverExecuted("Could not find existing index for shifted right row");
                                 }
-                            } else {
-                                throw Assert.statementNeverExecuted("Could not find existing index for shifted right row");
+                                alternateFound = true;
+                                break;
                             }
-                            alternateFound = true;
-                            break;
+                            alternateTableLocation = alternateNextTableLocation(alternateTableLocation);
+                            Assert.neq(alternateTableLocation, "alternateTableLocation", firstAlternateTableLocation, "firstAlternateTableLocation");
                         }
-                        alternateTableLocation = alternateNextTableLocation(alternateTableLocation);
-                        Assert.neq(alternateTableLocation, "alternateTableLocation", firstAlternateTableLocation, "firstAlternateTableLocation");
                     }
-                }
-                if (!alternateFound) {
-                    throw Assert.statementNeverExecuted("Could not find existing state for shifted right row");
+                    if (!alternateFound) {
+                        throw Assert.statementNeverExecuted("Could not find existing state for shifted right row");
+                    }
                 }
             }
         }
@@ -445,10 +538,21 @@ protected void removeLeft(RowSequence rowSequence, Chunk[] sourceKeyChunks) {
             final int hash = hash(k0);
             final int firstTableLocation = hashToTableLocation(hash);
             boolean found = false;
+            boolean searchAlternate = true;
             int tableLocation = firstTableLocation;
-            while (mainRightRowKey.getUnsafe(tableLocation) != EMPTY_RIGHT_STATE) {
+            long rightState;
+            while (!isStateEmpty(rightState = mainRightRowKey.getUnsafe(tableLocation))) {
                 if (eq(mainKeySource0.getUnsafe(tableLocation), k0)) {
-                    mainLeftRowSet.getUnsafe(tableLocation).remove(rowKeyChunk.get(chunkPosition));
+                    if (isStateDeleted(rightState)) {
+                        searchAlternate = false;
+                        break;
+                    }
+                    final WritableRowSet left = mainLeftRowSet.getUnsafe(tableLocation);
+                    left.remove(rowKeyChunk.get(chunkPosition));
+                    if (left.isEmpty() && rightState == RowSet.NULL_ROW_KEY) {
+                        mainRightRowKey.set(tableLocation, TOMBSTONE_RIGHT_STATE);
+                        liveEntries--;
+                    }
                     found = true;
                     break;
                 }
@@ -456,22 +560,34 @@ protected void removeLeft(RowSequence rowSequence, Chunk[] sourceKeyChunks) {
                 Assert.neq(tableLocation, "tableLocation", firstTableLocation, "firstTableLocation");
             }
             if (!found) {
-                final int firstAlternateTableLocation = hashToTableLocationAlternate(hash);
-                boolean alternateFound = false;
-                if (firstAlternateTableLocation < rehashPointer) {
-                    int alternateTableLocation = firstAlternateTableLocation;
-                    while (alternateRightRowKey.getUnsafe(alternateTableLocation) != EMPTY_RIGHT_STATE) {
-                        if (eq(alternateKeySource0.getUnsafe(alternateTableLocation), k0)) {
-                            alternateLeftRowSet.getUnsafe(alternateTableLocation).remove(rowKeyChunk.get(chunkPosition));
-                            alternateFound = true;
-                            break;
+                if (!searchAlternate) {
+                    throw Assert.statementNeverExecuted("Could not find existing state for removed left row");
+                } else {
+                    final int firstAlternateTableLocation = hashToTableLocationAlternate(hash);
+                    boolean alternateFound = false;
+                    if (firstAlternateTableLocation < rehashPointer) {
+                        int alternateTableLocation = firstAlternateTableLocation;
+                        while (!isStateEmpty(rightState = alternateRightRowKey.getUnsafe(alternateTableLocation))) {
+                            if (eq(alternateKeySource0.getUnsafe(alternateTableLocation), k0)) {
+                                if (isStateDeleted(rightState)) {
+                                    break;
+                                }
+                                final WritableRowSet left = alternateLeftRowSet.getUnsafe(alternateTableLocation);
+                                left.remove(rowKeyChunk.get(chunkPosition));
+                                if (left.isEmpty() && rightState == RowSet.NULL_ROW_KEY) {
+                                    alternateRightRowKey.set(alternateTableLocation, TOMBSTONE_RIGHT_STATE);
+                                    liveEntries--;
+                                }
+                                alternateFound = true;
+                                break;
+                            }
+                            alternateTableLocation = alternateNextTableLocation(alternateTableLocation);
+                            Assert.neq(alternateTableLocation, "alternateTableLocation", firstAlternateTableLocation, "firstAlternateTableLocation");
                         }
-                        alternateTableLocation = alternateNextTableLocation(alternateTableLocation);
-                        Assert.neq(alternateTableLocation, "alternateTableLocation", firstAlternateTableLocation, "firstAlternateTableLocation");
                     }
-                }
-                if (!alternateFound) {
-                    throw Assert.statementNeverExecuted("Could not find existing state for removed left row");
+                    if (!alternateFound) {
+                        throw Assert.statementNeverExecuted("Could not find existing state for removed left row");
+                    }
                 }
             }
         }
@@ -487,9 +603,15 @@ protected void applyLeftShift(RowSequence rowSequence, Chunk[] sourceKeyChunks,
             final int hash = hash(k0);
             final int firstTableLocation = hashToTableLocation(hash);
             boolean found = false;
+            boolean searchAlternate = true;
             int tableLocation = firstTableLocation;
-            while (mainRightRowKey.getUnsafe(tableLocation) != EMPTY_RIGHT_STATE) {
+            long stateValue;
+            while (!isStateEmpty(stateValue = mainRightRowKey.getUnsafe(tableLocation))) {
                 if (eq(mainKeySource0.getUnsafe(tableLocation), k0)) {
+                    if (isStateDeleted(stateValue)) {
+                        searchAlternate = false;
+                        break;
+                    }
                     final WritableRowSet leftRowSetForState = mainLeftRowSet.getUnsafe(tableLocation);
                     final long keyToShift = rowKeyChunk.get(chunkPosition);
                     if (shiftDelta < 0) {
@@ -505,29 +627,36 @@ protected void applyLeftShift(RowSequence rowSequence, Chunk[] sourceKeyChunks,
                 Assert.neq(tableLocation, "tableLocation", firstTableLocation, "firstTableLocation");
             }
             if (!found) {
-                final int firstAlternateTableLocation = hashToTableLocationAlternate(hash);
-                boolean alternateFound = false;
-                if (firstAlternateTableLocation < rehashPointer) {
-                    int alternateTableLocation = firstAlternateTableLocation;
-                    while (alternateRightRowKey.getUnsafe(alternateTableLocation) != EMPTY_RIGHT_STATE) {
-                        if (eq(alternateKeySource0.getUnsafe(alternateTableLocation), k0)) {
-                            final WritableRowSet leftRowSetForState = alternateLeftRowSet.getUnsafe(alternateTableLocation);
-                            final long keyToShift = rowKeyChunk.get(chunkPosition);
-                            if (shiftDelta < 0) {
-                                shiftOneKey(leftRowSetForState, keyToShift, shiftDelta);
-                            } else {
-                                pc.pendingShifts.set(pc.pendingShiftPointer++, (long)(AlternatingColumnSource.ALTERNATE_SWITCH_MASK | alternateTableLocation));
-                                pc.pendingShifts.set(pc.pendingShiftPointer++, keyToShift);
+                if (!searchAlternate) {
+                    throw Assert.statementNeverExecuted("Could not find existing state for shifted left row");
+                } else {
+                    final int firstAlternateTableLocation = hashToTableLocationAlternate(hash);
+                    boolean alternateFound = false;
+                    if (firstAlternateTableLocation < rehashPointer) {
+                        int alternateTableLocation = firstAlternateTableLocation;
+                        while (!isStateEmpty(stateValue = alternateRightRowKey.getUnsafe(alternateTableLocation))) {
+                            if (eq(alternateKeySource0.getUnsafe(alternateTableLocation), k0)) {
+                                if (isStateDeleted(stateValue)) {
+                                    break;
+                                }
+                                final WritableRowSet leftRowSetForState = alternateLeftRowSet.getUnsafe(alternateTableLocation);
+                                final long keyToShift = rowKeyChunk.get(chunkPosition);
+                                if (shiftDelta < 0) {
+                                    shiftOneKey(leftRowSetForState, keyToShift, shiftDelta);
+                                } else {
+                                    pc.pendingShifts.set(pc.pendingShiftPointer++, (long)(AlternatingColumnSource.ALTERNATE_SWITCH_MASK | alternateTableLocation));
+                                    pc.pendingShifts.set(pc.pendingShiftPointer++, keyToShift);
+                                }
+                                alternateFound = true;
+                                break;
                             }
-                            alternateFound = true;
-                            break;
+                            alternateTableLocation = alternateNextTableLocation(alternateTableLocation);
+                            Assert.neq(alternateTableLocation, "alternateTableLocation", firstAlternateTableLocation, "firstAlternateTableLocation");
                         }
-                        alternateTableLocation = alternateNextTableLocation(alternateTableLocation);
-                        Assert.neq(alternateTableLocation, "alternateTableLocation", firstAlternateTableLocation, "firstAlternateTableLocation");
                     }
-                }
-                if (!alternateFound) {
-                    throw Assert.statementNeverExecuted("Could not find existing state for shifted left row");
+                    if (!alternateFound) {
+                        throw Assert.statementNeverExecuted("Could not find existing state for shifted left row");
+                    }
                 }
             }
         }
@@ -538,16 +667,30 @@ private static int hash(float k0) {
         return hash;
     }
 
-    private boolean migrateOneLocation(int locationToMigrate,
+    private static boolean isStateEmpty(long state) {
+        return state == EMPTY_RIGHT_STATE;
+    }
+
+    private static boolean isStateDeleted(long state) {
+        return state == TOMBSTONE_RIGHT_STATE;
+    }
+
+    private boolean migrateOneLocation(int locationToMigrate, boolean trueOnDeletedEntry,
             NaturalJoinModifiedSlotTracker modifiedSlotTracker) {
         final long currentStateValue = alternateRightRowKey.getUnsafe(locationToMigrate);
-        if (currentStateValue == EMPTY_RIGHT_STATE) {
+        if (isStateEmpty(currentStateValue)) {
             return false;
         }
+        if (isStateDeleted(currentStateValue)) {
+            alternateEntries--;
+            alternateRightRowKey.set(locationToMigrate, EMPTY_RIGHT_STATE);
+            return trueOnDeletedEntry;
+        }
         final float k0 = alternateKeySource0.getUnsafe(locationToMigrate);
         final int hash = hash(k0);
         int destinationTableLocation = hashToTableLocation(hash);
-        while (mainRightRowKey.getUnsafe(destinationTableLocation) != EMPTY_RIGHT_STATE) {
+        long candidateState;
+        while (!isStateEmpty(candidateState = mainRightRowKey.getUnsafe(destinationTableLocation)) && !isStateDeleted(candidateState)) {
             destinationTableLocation = nextTableLocation(destinationTableLocation);
         }
         mainKeySource0.set(destinationTableLocation, k0);
@@ -559,6 +702,10 @@ private boolean migrateOneLocation(int locationToMigrate,
         alternateModifiedTrackerCookieSource.set(locationToMigrate, -1L);
         modifiedSlotTracker.moveTableLocation(cookie, locationToMigrate, mainInsertMask | destinationTableLocation);;
         alternateRightRowKey.set(locationToMigrate, EMPTY_RIGHT_STATE);
+        if (!isStateDeleted(candidateState)) {
+            numEntries++;
+        }
+        alternateEntries--;
         return true;
     }
 
@@ -567,7 +714,7 @@ protected int rehashInternalPartial(int entriesToRehash,
             NaturalJoinModifiedSlotTracker modifiedSlotTracker) {
         int rehashedEntries = 0;
         while (rehashPointer > 0 && rehashedEntries < entriesToRehash) {
-            if (migrateOneLocation(--rehashPointer, modifiedSlotTracker)) {
+            if (migrateOneLocation(--rehashPointer, false, modifiedSlotTracker)) {
                 rehashedEntries++;
             }
         }
@@ -575,8 +722,7 @@ protected int rehashInternalPartial(int entriesToRehash,
     }
 
     @Override
-    protected void newAlternate() {
-        super.newAlternate();
+    protected void adviseNewAlternate() {
         this.mainKeySource0 = (ImmutableFloatArraySource)super.mainKeySources[0];
         this.alternateKeySource0 = (ImmutableFloatArraySource)super.alternateKeySources[0];
     }
@@ -590,7 +736,7 @@ protected void clearAlternate() {
     @Override
     protected void migrateFront(NaturalJoinModifiedSlotTracker modifiedSlotTracker) {
         int location = 0;
-        while (migrateOneLocation(location++, modifiedSlotTracker));
+        while (migrateOneLocation(location++, true, modifiedSlotTracker) && location < alternateTableSize);
     }
 
     @Override
@@ -610,7 +756,7 @@ protected void rehashInternalFull(final int oldSize) {
         mainModifiedTrackerCookieSource.setArray(destModifiedCookie);
         for (int sourceBucket = 0; sourceBucket < oldSize; ++sourceBucket) {
             final long currentStateValue = originalStateArray[sourceBucket];
-            if (currentStateValue == EMPTY_RIGHT_STATE) {
+            if (isStateEmpty(currentStateValue)) {
                 continue;
             }
             final float k0 = originalKeyArray0[sourceBucket];
@@ -618,7 +764,7 @@ protected void rehashInternalFull(final int oldSize) {
             final int firstDestinationTableLocation = hashToTableLocation(hash);
             int destinationTableLocation = firstDestinationTableLocation;
             while (true) {
-                if (destState[destinationTableLocation] == EMPTY_RIGHT_STATE) {
+                if (isStateEmpty(destState[destinationTableLocation])) {
                     destKeyArray0[destinationTableLocation] = k0;
                     destState[destinationTableLocation] = originalStateArray[sourceBucket];
                     destLeftRowSet[destinationTableLocation] = oldLeftRowSet[sourceBucket];
diff --git a/engine/table/src/main/java/io/deephaven/engine/table/impl/naturaljoin/typed/incopen/gen/IncrementalNaturalJoinHasherInt.java b/engine/table/src/main/java/io/deephaven/engine/table/impl/naturaljoin/typed/incopen/gen/IncrementalNaturalJoinHasherInt.java
index 72e9935d058..99c7bc812fc 100644
--- a/engine/table/src/main/java/io/deephaven/engine/table/impl/naturaljoin/typed/incopen/gen/IncrementalNaturalJoinHasherInt.java
+++ b/engine/table/src/main/java/io/deephaven/engine/table/impl/naturaljoin/typed/incopen/gen/IncrementalNaturalJoinHasherInt.java
@@ -62,15 +62,16 @@ protected void buildFromLeftSide(RowSequence rowSequence, Chunk[] sourceKeyChunk
             int tableLocation = firstTableLocation;
             MAIN_SEARCH: while (true) {
                 long rightRowKeyForState = mainRightRowKey.getUnsafe(tableLocation);
-                if (rightRowKeyForState == EMPTY_RIGHT_STATE) {
+                if (isStateEmpty(rightRowKeyForState)) {
                     numEntries++;
+                    liveEntries++;
                     mainKeySource0.set(tableLocation, k0);
                     mainLeftRowSet.set(tableLocation, RowSetFactory.fromKeys(rowKeyChunk.get(chunkPosition)));
                     mainRightRowKey.set(tableLocation, RowSet.NULL_ROW_KEY);
                     mainModifiedTrackerCookieSource.set(tableLocation, -1L);
                     break;
                 } else if (eq(mainKeySource0.getUnsafe(tableLocation), k0)) {
-                    if (rightRowKeyForState < RowSet.NULL_ROW_KEY) {
+                    if (rightRowKeyForState <= FIRST_DUPLICATE) {
                         throw new IllegalStateException("Natural Join found duplicate right key for " + extractKeyStringFromSourceTable(rowKeyChunk.get(chunkPosition)));
                     }
                     mainLeftRowSet.getUnsafe(tableLocation).insert(rowKeyChunk.get(chunkPosition));
@@ -95,8 +96,9 @@ protected void buildFromRightSide(RowSequence rowSequence, Chunk[] sourceKeyChun
             int tableLocation = firstTableLocation;
             MAIN_SEARCH: while (true) {
                 long existingRightRowKey = mainRightRowKey.getUnsafe(tableLocation);
-                if (existingRightRowKey == EMPTY_RIGHT_STATE) {
+                if (isStateEmpty(existingRightRowKey)) {
                     numEntries++;
+                    liveEntries++;
                     mainKeySource0.set(tableLocation, k0);
                     mainLeftRowSet.set(tableLocation, RowSetFactory.empty());
                     mainRightRowKey.set(tableLocation, rowKeyChunk.get(chunkPosition));
@@ -105,7 +107,7 @@ protected void buildFromRightSide(RowSequence rowSequence, Chunk[] sourceKeyChun
                 } else if (eq(mainKeySource0.getUnsafe(tableLocation), k0)) {
                     if (existingRightRowKey == RowSet.NULL_ROW_KEY) {
                         mainRightRowKey.set(tableLocation, rowKeyChunk.get(chunkPosition));
-                    } else if (existingRightRowKey < RowSet.NULL_ROW_KEY) {
+                    } else if (existingRightRowKey <= FIRST_DUPLICATE) {
                         final long duplicateLocation = duplicateLocationFromRowKey(existingRightRowKey);
                         rightSideDuplicateRowSets.getUnsafe(duplicateLocation).insert(rowKeyChunk.get(chunkPosition));
                     } else {
@@ -132,20 +134,27 @@ protected void addRightSide(RowSequence rowSequence, Chunk[] sourceKeyChunks,
             final int hash = hash(k0);
             final int firstTableLocation = hashToTableLocation(hash);
             int tableLocation = firstTableLocation;
+            int firstDeletedLocation = -1;
             MAIN_SEARCH: while (true) {
                 long existingRightRowKey = mainRightRowKey.getUnsafe(tableLocation);
-                if (existingRightRowKey == EMPTY_RIGHT_STATE) {
+                if (firstDeletedLocation < 0 && isStateDeleted(existingRightRowKey)) {
+                    firstDeletedLocation = tableLocation;
+                }
+                if (isStateEmpty(existingRightRowKey)) {
                     final int firstAlternateTableLocation = hashToTableLocationAlternate(hash);
                     int alternateTableLocation = firstAlternateTableLocation;
                     while (alternateTableLocation < rehashPointer) {
                         existingRightRowKey = alternateRightRowKey.getUnsafe(alternateTableLocation);
-                        if (existingRightRowKey == EMPTY_RIGHT_STATE) {
+                        if (isStateEmpty(existingRightRowKey)) {
                             break;
                         } else if (eq(alternateKeySource0.getUnsafe(alternateTableLocation), k0)) {
+                            if (isStateDeleted(existingRightRowKey)) {
+                                break;
+                            }
                             if (existingRightRowKey == RowSet.NULL_ROW_KEY) {
                                 alternateRightRowKey.set(alternateTableLocation, rowKeyChunk.get(chunkPosition));
                                 alternateModifiedTrackerCookieSource.set(alternateTableLocation, modifiedSlotTracker.addMain(alternateModifiedTrackerCookieSource.getUnsafe(alternateTableLocation), alternateInsertMask | alternateTableLocation, existingRightRowKey, NaturalJoinModifiedSlotTracker.FLAG_RIGHT_CHANGE));
-                            } else if (existingRightRowKey < RowSet.NULL_ROW_KEY) {
+                            } else if (existingRightRowKey <= FIRST_DUPLICATE) {
                                 final long duplicateLocation = duplicateLocationFromRowKey(existingRightRowKey);
                                 final WritableRowSet duplicates = rightSideDuplicateRowSets.getUnsafe(duplicateLocation);
                                 final long duplicateSize = duplicates.size();
@@ -163,17 +172,31 @@ protected void addRightSide(RowSequence rowSequence, Chunk[] sourceKeyChunks,
                             Assert.neq(alternateTableLocation, "alternateTableLocation", firstAlternateTableLocation, "firstAlternateTableLocation");
                         }
                     }
-                    numEntries++;
+                    if (firstDeletedLocation >= 0) {
+                        tableLocation = firstDeletedLocation;
+                    } else {
+                        numEntries++;
+                    }
+                    liveEntries++;
                     mainKeySource0.set(tableLocation, k0);
                     mainLeftRowSet.set(tableLocation, RowSetFactory.empty());
                     mainRightRowKey.set(tableLocation, rowKeyChunk.get(chunkPosition));
                     mainModifiedTrackerCookieSource.set(tableLocation, modifiedSlotTracker.addMain(-1, mainInsertMask | tableLocation, existingRightRowKey, NaturalJoinModifiedSlotTracker.FLAG_RIGHT_CHANGE));
                     break;
                 } else if (eq(mainKeySource0.getUnsafe(tableLocation), k0)) {
+                    if (isStateDeleted(existingRightRowKey)) {
+                        tableLocation = firstDeletedLocation;
+                        liveEntries++;
+                        mainKeySource0.set(tableLocation, k0);
+                        mainLeftRowSet.set(tableLocation, RowSetFactory.empty());
+                        mainRightRowKey.set(tableLocation, rowKeyChunk.get(chunkPosition));
+                        mainModifiedTrackerCookieSource.set(tableLocation, modifiedSlotTracker.addMain(-1, mainInsertMask | tableLocation, existingRightRowKey, NaturalJoinModifiedSlotTracker.FLAG_RIGHT_CHANGE));
+                        break;
+                    }
                     if (existingRightRowKey == RowSet.NULL_ROW_KEY) {
                         mainRightRowKey.set(tableLocation, rowKeyChunk.get(chunkPosition));
                         mainModifiedTrackerCookieSource.set(tableLocation, modifiedSlotTracker.addMain(mainModifiedTrackerCookieSource.getUnsafe(tableLocation), mainInsertMask | tableLocation, existingRightRowKey, NaturalJoinModifiedSlotTracker.FLAG_RIGHT_CHANGE));
-                    } else if (existingRightRowKey < RowSet.NULL_ROW_KEY) {
+                    } else if (existingRightRowKey <= FIRST_DUPLICATE) {
                         final long duplicateLocation = duplicateLocationFromRowKey(existingRightRowKey);
                         final WritableRowSet duplicates = rightSideDuplicateRowSets.getUnsafe(duplicateLocation);
                         final long duplicateSize = duplicates.size();
@@ -204,17 +227,24 @@ protected void addLeftSide(RowSequence rowSequence, Chunk[] sourceKeyChunks,
             final int hash = hash(k0);
             final int firstTableLocation = hashToTableLocation(hash);
             int tableLocation = firstTableLocation;
+            int firstDeletedLocation = -1;
             MAIN_SEARCH: while (true) {
                 long rightRowKeyForState = mainRightRowKey.getUnsafe(tableLocation);
-                if (rightRowKeyForState == EMPTY_RIGHT_STATE) {
+                if (firstDeletedLocation < 0 && isStateDeleted(rightRowKeyForState)) {
+                    firstDeletedLocation = tableLocation;
+                }
+                if (isStateEmpty(rightRowKeyForState)) {
                     final int firstAlternateTableLocation = hashToTableLocationAlternate(hash);
                     int alternateTableLocation = firstAlternateTableLocation;
                     while (alternateTableLocation < rehashPointer) {
                         rightRowKeyForState = alternateRightRowKey.getUnsafe(alternateTableLocation);
-                        if (rightRowKeyForState == EMPTY_RIGHT_STATE) {
+                        if (isStateEmpty(rightRowKeyForState)) {
                             break;
                         } else if (eq(alternateKeySource0.getUnsafe(alternateTableLocation), k0)) {
-                            if (rightRowKeyForState < RowSet.NULL_ROW_KEY) {
+                            if (isStateDeleted(rightRowKeyForState)) {
+                                break;
+                            }
+                            if (rightRowKeyForState <= FIRST_DUPLICATE) {
                                 throw new IllegalStateException("Natural Join found duplicate right key for " + extractKeyStringFromSourceTable(rowKeyChunk.get(chunkPosition)));
                             }
                             alternateLeftRowSet.getUnsafe(alternateTableLocation).insert(rowKeyChunk.get(chunkPosition));
@@ -225,7 +255,12 @@ protected void addLeftSide(RowSequence rowSequence, Chunk[] sourceKeyChunks,
                             Assert.neq(alternateTableLocation, "alternateTableLocation", firstAlternateTableLocation, "firstAlternateTableLocation");
                         }
                     }
-                    numEntries++;
+                    if (firstDeletedLocation >= 0) {
+                        tableLocation = firstDeletedLocation;
+                    } else {
+                        numEntries++;
+                    }
+                    liveEntries++;
                     mainKeySource0.set(tableLocation, k0);
                     mainLeftRowSet.set(tableLocation, RowSetFactory.fromKeys(rowKeyChunk.get(chunkPosition)));
                     mainRightRowKey.set(tableLocation, RowSet.NULL_ROW_KEY);
@@ -233,7 +268,17 @@ protected void addLeftSide(RowSequence rowSequence, Chunk[] sourceKeyChunks,
                     leftRedirections.set(leftRedirectionOffset++, RowSet.NULL_ROW_KEY);
                     break;
                 } else if (eq(mainKeySource0.getUnsafe(tableLocation), k0)) {
-                    if (rightRowKeyForState < RowSet.NULL_ROW_KEY) {
+                    if (isStateDeleted(rightRowKeyForState)) {
+                        tableLocation = firstDeletedLocation;
+                        liveEntries++;
+                        mainKeySource0.set(tableLocation, k0);
+                        mainLeftRowSet.set(tableLocation, RowSetFactory.fromKeys(rowKeyChunk.get(chunkPosition)));
+                        mainRightRowKey.set(tableLocation, RowSet.NULL_ROW_KEY);
+                        mainModifiedTrackerCookieSource.set(tableLocation, -1L);
+                        leftRedirections.set(leftRedirectionOffset++, RowSet.NULL_ROW_KEY);
+                        break;
+                    }
+                    if (rightRowKeyForState <= FIRST_DUPLICATE) {
                         throw new IllegalStateException("Natural Join found duplicate right key for " + extractKeyStringFromSourceTable(rowKeyChunk.get(chunkPosition)));
                     }
                     mainLeftRowSet.getUnsafe(tableLocation).insert(rowKeyChunk.get(chunkPosition));
@@ -257,11 +302,16 @@ protected void removeRight(RowSequence rowSequence, Chunk[] sourceKeyChunks,
             final int hash = hash(k0);
             final int firstTableLocation = hashToTableLocation(hash);
             boolean found = false;
+            boolean searchAlternate = true;
             int tableLocation = firstTableLocation;
             long existingRightRowKey;
-            while ((existingRightRowKey = mainRightRowKey.getUnsafe(tableLocation)) != EMPTY_RIGHT_STATE) {
+            while (!isStateEmpty(existingRightRowKey = mainRightRowKey.getUnsafe(tableLocation))) {
                 if (eq(mainKeySource0.getUnsafe(tableLocation), k0)) {
-                    if (existingRightRowKey < RowSet.NULL_ROW_KEY) {
+                    if (isStateDeleted(existingRightRowKey)) {
+                        searchAlternate = false;
+                        break;
+                    }
+                    if (existingRightRowKey <= FIRST_DUPLICATE) {
                         final long duplicateLocation = duplicateLocationFromRowKey(existingRightRowKey);
                         final WritableRowSet duplicates = rightSideDuplicateRowSets.getUnsafe(duplicateLocation);
                         final long duplicateSize = duplicates.size();
@@ -274,7 +324,13 @@ protected void removeRight(RowSequence rowSequence, Chunk[] sourceKeyChunks,
                     } else if (existingRightRowKey != rowKeyChunk.get(chunkPosition)) {
                         Assert.statementNeverExecuted("Could not find existing right row in state");
                     } else {
-                        mainRightRowKey.set(tableLocation, RowSet.NULL_ROW_KEY);
+                        final boolean leftEmpty = mainLeftRowSet.getUnsafe(tableLocation).isEmpty();
+                        if (leftEmpty) {
+                            mainRightRowKey.set(tableLocation, TOMBSTONE_RIGHT_STATE);
+                            liveEntries--;
+                        } else {
+                            mainRightRowKey.set(tableLocation, RowSet.NULL_ROW_KEY);
+                        }
                         mainModifiedTrackerCookieSource.set(tableLocation, modifiedSlotTracker.addMain(mainModifiedTrackerCookieSource.getUnsafe(tableLocation), mainInsertMask | tableLocation, existingRightRowKey, NaturalJoinModifiedSlotTracker.FLAG_RIGHT_CHANGE));
                     }
                     found = true;
@@ -284,37 +340,50 @@ protected void removeRight(RowSequence rowSequence, Chunk[] sourceKeyChunks,
                 Assert.neq(tableLocation, "tableLocation", firstTableLocation, "firstTableLocation");
             }
             if (!found) {
-                final int firstAlternateTableLocation = hashToTableLocationAlternate(hash);
-                boolean alternateFound = false;
-                if (firstAlternateTableLocation < rehashPointer) {
-                    int alternateTableLocation = firstAlternateTableLocation;
-                    while ((existingRightRowKey = alternateRightRowKey.getUnsafe(alternateTableLocation)) != EMPTY_RIGHT_STATE) {
-                        if (eq(alternateKeySource0.getUnsafe(alternateTableLocation), k0)) {
-                            if (existingRightRowKey < RowSet.NULL_ROW_KEY) {
-                                final long duplicateLocation = duplicateLocationFromRowKey(existingRightRowKey);
-                                final WritableRowSet duplicates = rightSideDuplicateRowSets.getUnsafe(duplicateLocation);
-                                final long duplicateSize = duplicates.size();
-                                duplicates.remove(rowKeyChunk.get(chunkPosition));
-                                Assert.eq(duplicateSize, "duplicateSize", duplicates.size() + 1, "duplicates.size() + 1");
-                                if (duplicates.size() == 1) {
-                                    alternateRightRowKey.set(alternateTableLocation, duplicates.firstRowKey());
-                                    freeDuplicateLocation(duplicateLocation);
+                if (!searchAlternate) {
+                    throw Assert.statementNeverExecuted("Could not find existing state for removed right row");
+                } else {
+                    final int firstAlternateTableLocation = hashToTableLocationAlternate(hash);
+                    boolean alternateFound = false;
+                    if (firstAlternateTableLocation < rehashPointer) {
+                        int alternateTableLocation = firstAlternateTableLocation;
+                        while (!isStateEmpty(existingRightRowKey = alternateRightRowKey.getUnsafe(alternateTableLocation))) {
+                            if (eq(alternateKeySource0.getUnsafe(alternateTableLocation), k0)) {
+                                if (isStateDeleted(existingRightRowKey)) {
+                                    break;
                                 }
-                            } else if (existingRightRowKey != rowKeyChunk.get(chunkPosition)) {
-                                Assert.statementNeverExecuted("Could not find existing right row in state");
-                            } else {
-                                alternateRightRowKey.set(alternateTableLocation, RowSet.NULL_ROW_KEY);
-                                alternateModifiedTrackerCookieSource.set(alternateTableLocation, modifiedSlotTracker.addMain(alternateModifiedTrackerCookieSource.getUnsafe(alternateTableLocation), alternateInsertMask | alternateTableLocation, existingRightRowKey, NaturalJoinModifiedSlotTracker.FLAG_RIGHT_CHANGE));
+                                if (existingRightRowKey <= FIRST_DUPLICATE) {
+                                    final long duplicateLocation = duplicateLocationFromRowKey(existingRightRowKey);
+                                    final WritableRowSet duplicates = rightSideDuplicateRowSets.getUnsafe(duplicateLocation);
+                                    final long duplicateSize = duplicates.size();
+                                    duplicates.remove(rowKeyChunk.get(chunkPosition));
+                                    Assert.eq(duplicateSize, "duplicateSize", duplicates.size() + 1, "duplicates.size() + 1");
+                                    if (duplicates.size() == 1) {
+                                        alternateRightRowKey.set(alternateTableLocation, duplicates.firstRowKey());
+                                        freeDuplicateLocation(duplicateLocation);
+                                    }
+                                } else if (existingRightRowKey != rowKeyChunk.get(chunkPosition)) {
+                                    Assert.statementNeverExecuted("Could not find existing right row in state");
+                                } else {
+                                    final boolean leftEmpty = alternateLeftRowSet.getUnsafe(alternateTableLocation).isEmpty();
+                                    if (leftEmpty) {
+                                        alternateRightRowKey.set(alternateTableLocation, TOMBSTONE_RIGHT_STATE);
+                                        liveEntries--;
+                                    } else {
+                                        alternateRightRowKey.set(alternateTableLocation, RowSet.NULL_ROW_KEY);
+                                    }
+                                    alternateModifiedTrackerCookieSource.set(alternateTableLocation, modifiedSlotTracker.addMain(alternateModifiedTrackerCookieSource.getUnsafe(alternateTableLocation), alternateInsertMask | alternateTableLocation, existingRightRowKey, NaturalJoinModifiedSlotTracker.FLAG_RIGHT_CHANGE));
+                                }
+                                alternateFound = true;
+                                break;
                             }
-                            alternateFound = true;
-                            break;
+                            alternateTableLocation = alternateNextTableLocation(alternateTableLocation);
+                            Assert.neq(alternateTableLocation, "alternateTableLocation", firstAlternateTableLocation, "firstAlternateTableLocation");
                         }
-                        alternateTableLocation = alternateNextTableLocation(alternateTableLocation);
-                        Assert.neq(alternateTableLocation, "alternateTableLocation", firstAlternateTableLocation, "firstAlternateTableLocation");
                     }
-                }
-                if (!alternateFound) {
-                    throw Assert.statementNeverExecuted("Could not find existing state for removed right row");
+                    if (!alternateFound) {
+                        throw Assert.statementNeverExecuted("Could not find existing state for removed right row");
+                    }
                 }
             }
         }
@@ -329,10 +398,15 @@ protected void modifyByRight(RowSequence rowSequence, Chunk[] sourceKeyChunks,
             final int hash = hash(k0);
             final int firstTableLocation = hashToTableLocation(hash);
             boolean found = false;
+            boolean searchAlternate = true;
             int tableLocation = firstTableLocation;
             long existingRightRowKey;
-            while ((existingRightRowKey = mainRightRowKey.getUnsafe(tableLocation)) != EMPTY_RIGHT_STATE) {
+            while (!isStateEmpty(existingRightRowKey = mainRightRowKey.getUnsafe(tableLocation))) {
                 if (eq(mainKeySource0.getUnsafe(tableLocation), k0)) {
+                    if (isStateDeleted(existingRightRowKey)) {
+                        searchAlternate = false;
+                        break;
+                    }
                     mainModifiedTrackerCookieSource.set(tableLocation, modifiedSlotTracker.addMain(mainModifiedTrackerCookieSource.getUnsafe(tableLocation), mainInsertMask | tableLocation, existingRightRowKey, NaturalJoinModifiedSlotTracker.FLAG_RIGHT_CHANGE));
                     found = true;
                     break;
@@ -341,22 +415,29 @@ protected void modifyByRight(RowSequence rowSequence, Chunk[] sourceKeyChunks,
                 Assert.neq(tableLocation, "tableLocation", firstTableLocation, "firstTableLocation");
             }
             if (!found) {
-                final int firstAlternateTableLocation = hashToTableLocationAlternate(hash);
-                boolean alternateFound = false;
-                if (firstAlternateTableLocation < rehashPointer) {
-                    int alternateTableLocation = firstAlternateTableLocation;
-                    while ((existingRightRowKey = alternateRightRowKey.getUnsafe(alternateTableLocation)) != EMPTY_RIGHT_STATE) {
-                        if (eq(alternateKeySource0.getUnsafe(alternateTableLocation), k0)) {
-                            alternateModifiedTrackerCookieSource.set(alternateTableLocation, modifiedSlotTracker.addMain(alternateModifiedTrackerCookieSource.getUnsafe(alternateTableLocation), alternateInsertMask | alternateTableLocation, existingRightRowKey, NaturalJoinModifiedSlotTracker.FLAG_RIGHT_CHANGE));
-                            alternateFound = true;
-                            break;
+                if (!searchAlternate) {
+                    throw Assert.statementNeverExecuted("Could not find existing state for modified right row");
+                } else {
+                    final int firstAlternateTableLocation = hashToTableLocationAlternate(hash);
+                    boolean alternateFound = false;
+                    if (firstAlternateTableLocation < rehashPointer) {
+                        int alternateTableLocation = firstAlternateTableLocation;
+                        while (!isStateEmpty(existingRightRowKey = alternateRightRowKey.getUnsafe(alternateTableLocation))) {
+                            if (eq(alternateKeySource0.getUnsafe(alternateTableLocation), k0)) {
+                                if (isStateDeleted(existingRightRowKey)) {
+                                    break;
+                                }
+                                alternateModifiedTrackerCookieSource.set(alternateTableLocation, modifiedSlotTracker.addMain(alternateModifiedTrackerCookieSource.getUnsafe(alternateTableLocation), alternateInsertMask | alternateTableLocation, existingRightRowKey, NaturalJoinModifiedSlotTracker.FLAG_RIGHT_CHANGE));
+                                alternateFound = true;
+                                break;
+                            }
+                            alternateTableLocation = alternateNextTableLocation(alternateTableLocation);
+                            Assert.neq(alternateTableLocation, "alternateTableLocation", firstAlternateTableLocation, "firstAlternateTableLocation");
                         }
-                        alternateTableLocation = alternateNextTableLocation(alternateTableLocation);
-                        Assert.neq(alternateTableLocation, "alternateTableLocation", firstAlternateTableLocation, "firstAlternateTableLocation");
                     }
-                }
-                if (!alternateFound) {
-                    throw Assert.statementNeverExecuted("Could not find existing state for modified right row");
+                    if (!alternateFound) {
+                        throw Assert.statementNeverExecuted("Could not find existing state for modified right row");
+                    }
                 }
             }
         }
@@ -373,15 +454,20 @@ protected void applyRightShift(RowSequence rowSequence, Chunk[] sourceKeyChunks,
             final int hash = hash(k0);
             final int firstTableLocation = hashToTableLocation(hash);
             boolean found = false;
+            boolean searchAlternate = true;
             int tableLocation = firstTableLocation;
             long existingRightRowKey;
-            while ((existingRightRowKey = mainRightRowKey.getUnsafe(tableLocation)) != EMPTY_RIGHT_STATE) {
+            while (!isStateEmpty(existingRightRowKey = mainRightRowKey.getUnsafe(tableLocation))) {
                 if (eq(mainKeySource0.getUnsafe(tableLocation), k0)) {
+                    if (isStateDeleted(existingRightRowKey)) {
+                        searchAlternate = false;
+                        break;
+                    }
                     final long keyToShift = rowKeyChunk.get(chunkPosition);
                     if (existingRightRowKey == keyToShift - shiftDelta) {
                         mainRightRowKey.set(tableLocation, keyToShift);
                         mainModifiedTrackerCookieSource.set(tableLocation, modifiedSlotTracker.addMain(mainModifiedTrackerCookieSource.getUnsafe(tableLocation), mainInsertMask | tableLocation, existingRightRowKey, NaturalJoinModifiedSlotTracker.FLAG_RIGHT_SHIFT));
-                    } else if (existingRightRowKey < RowSet.NULL_ROW_KEY) {
+                    } else if (existingRightRowKey <= FIRST_DUPLICATE) {
                         final long duplicateLocation = duplicateLocationFromRowKey(existingRightRowKey);
                         if (shiftDelta < 0) {
                             final WritableRowSet duplicates = rightSideDuplicateRowSets.getUnsafe(duplicateLocation);
@@ -400,37 +486,44 @@ protected void applyRightShift(RowSequence rowSequence, Chunk[] sourceKeyChunks,
                 Assert.neq(tableLocation, "tableLocation", firstTableLocation, "firstTableLocation");
             }
             if (!found) {
-                final int firstAlternateTableLocation = hashToTableLocationAlternate(hash);
-                boolean alternateFound = false;
-                if (firstAlternateTableLocation < rehashPointer) {
-                    int alternateTableLocation = firstAlternateTableLocation;
-                    while ((existingRightRowKey = alternateRightRowKey.getUnsafe(alternateTableLocation)) != EMPTY_RIGHT_STATE) {
-                        if (eq(alternateKeySource0.getUnsafe(alternateTableLocation), k0)) {
-                            final long keyToShift = rowKeyChunk.get(chunkPosition);
-                            if (existingRightRowKey == keyToShift - shiftDelta) {
-                                alternateRightRowKey.set(alternateTableLocation, keyToShift);
-                                alternateModifiedTrackerCookieSource.set(alternateTableLocation, modifiedSlotTracker.addMain(alternateModifiedTrackerCookieSource.getUnsafe(alternateTableLocation), alternateInsertMask | alternateTableLocation, existingRightRowKey, NaturalJoinModifiedSlotTracker.FLAG_RIGHT_SHIFT));
-                            } else if (existingRightRowKey < RowSet.NULL_ROW_KEY) {
-                                final long duplicateLocation = duplicateLocationFromRowKey(existingRightRowKey);
-                                if (shiftDelta < 0) {
-                                    final WritableRowSet duplicates = rightSideDuplicateRowSets.getUnsafe(duplicateLocation);
-                                    shiftOneKey(duplicates, keyToShift, shiftDelta);
+                if (!searchAlternate) {
+                    throw Assert.statementNeverExecuted("Could not find existing state for shifted right row");
+                } else {
+                    final int firstAlternateTableLocation = hashToTableLocationAlternate(hash);
+                    boolean alternateFound = false;
+                    if (firstAlternateTableLocation < rehashPointer) {
+                        int alternateTableLocation = firstAlternateTableLocation;
+                        while (!isStateEmpty(existingRightRowKey = alternateRightRowKey.getUnsafe(alternateTableLocation))) {
+                            if (eq(alternateKeySource0.getUnsafe(alternateTableLocation), k0)) {
+                                if (isStateDeleted(existingRightRowKey)) {
+                                    break;
+                                }
+                                final long keyToShift = rowKeyChunk.get(chunkPosition);
+                                if (existingRightRowKey == keyToShift - shiftDelta) {
+                                    alternateRightRowKey.set(alternateTableLocation, keyToShift);
+                                    alternateModifiedTrackerCookieSource.set(alternateTableLocation, modifiedSlotTracker.addMain(alternateModifiedTrackerCookieSource.getUnsafe(alternateTableLocation), alternateInsertMask | alternateTableLocation, existingRightRowKey, NaturalJoinModifiedSlotTracker.FLAG_RIGHT_SHIFT));
+                                } else if (existingRightRowKey <= FIRST_DUPLICATE) {
+                                    final long duplicateLocation = duplicateLocationFromRowKey(existingRightRowKey);
+                                    if (shiftDelta < 0) {
+                                        final WritableRowSet duplicates = rightSideDuplicateRowSets.getUnsafe(duplicateLocation);
+                                        shiftOneKey(duplicates, keyToShift, shiftDelta);
+                                    } else {
+                                        pc.pendingShifts.set(pc.pendingShiftPointer++, (long)duplicateLocation);
+                                        pc.pendingShifts.set(pc.pendingShiftPointer++, keyToShift);
+                                    }
                                 } else {
-                                    pc.pendingShifts.set(pc.pendingShiftPointer++, (long)duplicateLocation);
-                                    pc.pendingShifts.set(pc.pendingShiftPointer++, keyToShift);
+                                    throw Assert.statementNeverExecuted("Could not find existing index for shifted right row");
                                 }
-                            } else {
-                                throw Assert.statementNeverExecuted("Could not find existing index for shifted right row");
+                                alternateFound = true;
+                                break;
                             }
-                            alternateFound = true;
-                            break;
+                            alternateTableLocation = alternateNextTableLocation(alternateTableLocation);
+                            Assert.neq(alternateTableLocation, "alternateTableLocation", firstAlternateTableLocation, "firstAlternateTableLocation");
                         }
-                        alternateTableLocation = alternateNextTableLocation(alternateTableLocation);
-                        Assert.neq(alternateTableLocation, "alternateTableLocation", firstAlternateTableLocation, "firstAlternateTableLocation");
                     }
-                }
-                if (!alternateFound) {
-                    throw Assert.statementNeverExecuted("Could not find existing state for shifted right row");
+                    if (!alternateFound) {
+                        throw Assert.statementNeverExecuted("Could not find existing state for shifted right row");
+                    }
                 }
             }
         }
@@ -445,10 +538,21 @@ protected void removeLeft(RowSequence rowSequence, Chunk[] sourceKeyChunks) {
             final int hash = hash(k0);
             final int firstTableLocation = hashToTableLocation(hash);
             boolean found = false;
+            boolean searchAlternate = true;
             int tableLocation = firstTableLocation;
-            while (mainRightRowKey.getUnsafe(tableLocation) != EMPTY_RIGHT_STATE) {
+            long rightState;
+            while (!isStateEmpty(rightState = mainRightRowKey.getUnsafe(tableLocation))) {
                 if (eq(mainKeySource0.getUnsafe(tableLocation), k0)) {
-                    mainLeftRowSet.getUnsafe(tableLocation).remove(rowKeyChunk.get(chunkPosition));
+                    if (isStateDeleted(rightState)) {
+                        searchAlternate = false;
+                        break;
+                    }
+                    final WritableRowSet left = mainLeftRowSet.getUnsafe(tableLocation);
+                    left.remove(rowKeyChunk.get(chunkPosition));
+                    if (left.isEmpty() && rightState == RowSet.NULL_ROW_KEY) {
+                        mainRightRowKey.set(tableLocation, TOMBSTONE_RIGHT_STATE);
+                        liveEntries--;
+                    }
                     found = true;
                     break;
                 }
@@ -456,22 +560,34 @@ protected void removeLeft(RowSequence rowSequence, Chunk[] sourceKeyChunks) {
                 Assert.neq(tableLocation, "tableLocation", firstTableLocation, "firstTableLocation");
             }
             if (!found) {
-                final int firstAlternateTableLocation = hashToTableLocationAlternate(hash);
-                boolean alternateFound = false;
-                if (firstAlternateTableLocation < rehashPointer) {
-                    int alternateTableLocation = firstAlternateTableLocation;
-                    while (alternateRightRowKey.getUnsafe(alternateTableLocation) != EMPTY_RIGHT_STATE) {
-                        if (eq(alternateKeySource0.getUnsafe(alternateTableLocation), k0)) {
-                            alternateLeftRowSet.getUnsafe(alternateTableLocation).remove(rowKeyChunk.get(chunkPosition));
-                            alternateFound = true;
-                            break;
+                if (!searchAlternate) {
+                    throw Assert.statementNeverExecuted("Could not find existing state for removed left row");
+                } else {
+                    final int firstAlternateTableLocation = hashToTableLocationAlternate(hash);
+                    boolean alternateFound = false;
+                    if (firstAlternateTableLocation < rehashPointer) {
+                        int alternateTableLocation = firstAlternateTableLocation;
+                        while (!isStateEmpty(rightState = alternateRightRowKey.getUnsafe(alternateTableLocation))) {
+                            if (eq(alternateKeySource0.getUnsafe(alternateTableLocation), k0)) {
+                                if (isStateDeleted(rightState)) {
+                                    break;
+                                }
+                                final WritableRowSet left = alternateLeftRowSet.getUnsafe(alternateTableLocation);
+                                left.remove(rowKeyChunk.get(chunkPosition));
+                                if (left.isEmpty() && rightState == RowSet.NULL_ROW_KEY) {
+                                    alternateRightRowKey.set(alternateTableLocation, TOMBSTONE_RIGHT_STATE);
+                                    liveEntries--;
+                                }
+                                alternateFound = true;
+                                break;
+                            }
+                            alternateTableLocation = alternateNextTableLocation(alternateTableLocation);
+                            Assert.neq(alternateTableLocation, "alternateTableLocation", firstAlternateTableLocation, "firstAlternateTableLocation");
                         }
-                        alternateTableLocation = alternateNextTableLocation(alternateTableLocation);
-                        Assert.neq(alternateTableLocation, "alternateTableLocation", firstAlternateTableLocation, "firstAlternateTableLocation");
                     }
-                }
-                if (!alternateFound) {
-                    throw Assert.statementNeverExecuted("Could not find existing state for removed left row");
+                    if (!alternateFound) {
+                        throw Assert.statementNeverExecuted("Could not find existing state for removed left row");
+                    }
                 }
             }
         }
@@ -487,9 +603,15 @@ protected void applyLeftShift(RowSequence rowSequence, Chunk[] sourceKeyChunks,
             final int hash = hash(k0);
             final int firstTableLocation = hashToTableLocation(hash);
             boolean found = false;
+            boolean searchAlternate = true;
             int tableLocation = firstTableLocation;
-            while (mainRightRowKey.getUnsafe(tableLocation) != EMPTY_RIGHT_STATE) {
+            long stateValue;
+            while (!isStateEmpty(stateValue = mainRightRowKey.getUnsafe(tableLocation))) {
                 if (eq(mainKeySource0.getUnsafe(tableLocation), k0)) {
+                    if (isStateDeleted(stateValue)) {
+                        searchAlternate = false;
+                        break;
+                    }
                     final WritableRowSet leftRowSetForState = mainLeftRowSet.getUnsafe(tableLocation);
                     final long keyToShift = rowKeyChunk.get(chunkPosition);
                     if (shiftDelta < 0) {
@@ -505,29 +627,36 @@ protected void applyLeftShift(RowSequence rowSequence, Chunk[] sourceKeyChunks,
                 Assert.neq(tableLocation, "tableLocation", firstTableLocation, "firstTableLocation");
             }
             if (!found) {
-                final int firstAlternateTableLocation = hashToTableLocationAlternate(hash);
-                boolean alternateFound = false;
-                if (firstAlternateTableLocation < rehashPointer) {
-                    int alternateTableLocation = firstAlternateTableLocation;
-                    while (alternateRightRowKey.getUnsafe(alternateTableLocation) != EMPTY_RIGHT_STATE) {
-                        if (eq(alternateKeySource0.getUnsafe(alternateTableLocation), k0)) {
-                            final WritableRowSet leftRowSetForState = alternateLeftRowSet.getUnsafe(alternateTableLocation);
-                            final long keyToShift = rowKeyChunk.get(chunkPosition);
-                            if (shiftDelta < 0) {
-                                shiftOneKey(leftRowSetForState, keyToShift, shiftDelta);
-                            } else {
-                                pc.pendingShifts.set(pc.pendingShiftPointer++, (long)(AlternatingColumnSource.ALTERNATE_SWITCH_MASK | alternateTableLocation));
-                                pc.pendingShifts.set(pc.pendingShiftPointer++, keyToShift);
+                if (!searchAlternate) {
+                    throw Assert.statementNeverExecuted("Could not find existing state for shifted left row");
+                } else {
+                    final int firstAlternateTableLocation = hashToTableLocationAlternate(hash);
+                    boolean alternateFound = false;
+                    if (firstAlternateTableLocation < rehashPointer) {
+                        int alternateTableLocation = firstAlternateTableLocation;
+                        while (!isStateEmpty(stateValue = alternateRightRowKey.getUnsafe(alternateTableLocation))) {
+                            if (eq(alternateKeySource0.getUnsafe(alternateTableLocation), k0)) {
+                                if (isStateDeleted(stateValue)) {
+                                    break;
+                                }
+                                final WritableRowSet leftRowSetForState = alternateLeftRowSet.getUnsafe(alternateTableLocation);
+                                final long keyToShift = rowKeyChunk.get(chunkPosition);
+                                if (shiftDelta < 0) {
+                                    shiftOneKey(leftRowSetForState, keyToShift, shiftDelta);
+                                } else {
+                                    pc.pendingShifts.set(pc.pendingShiftPointer++, (long)(AlternatingColumnSource.ALTERNATE_SWITCH_MASK | alternateTableLocation));
+                                    pc.pendingShifts.set(pc.pendingShiftPointer++, keyToShift);
+                                }
+                                alternateFound = true;
+                                break;
                             }
-                            alternateFound = true;
-                            break;
+                            alternateTableLocation = alternateNextTableLocation(alternateTableLocation);
+                            Assert.neq(alternateTableLocation, "alternateTableLocation", firstAlternateTableLocation, "firstAlternateTableLocation");
                         }
-                        alternateTableLocation = alternateNextTableLocation(alternateTableLocation);
-                        Assert.neq(alternateTableLocation, "alternateTableLocation", firstAlternateTableLocation, "firstAlternateTableLocation");
                     }
-                }
-                if (!alternateFound) {
-                    throw Assert.statementNeverExecuted("Could not find existing state for shifted left row");
+                    if (!alternateFound) {
+                        throw Assert.statementNeverExecuted("Could not find existing state for shifted left row");
+                    }
                 }
             }
         }
@@ -538,16 +667,30 @@ private static int hash(int k0) {
         return hash;
     }
 
-    private boolean migrateOneLocation(int locationToMigrate,
+    private static boolean isStateEmpty(long state) {
+        return state == EMPTY_RIGHT_STATE;
+    }
+
+    private static boolean isStateDeleted(long state) {
+        return state == TOMBSTONE_RIGHT_STATE;
+    }
+
+    private boolean migrateOneLocation(int locationToMigrate, boolean trueOnDeletedEntry,
             NaturalJoinModifiedSlotTracker modifiedSlotTracker) {
         final long currentStateValue = alternateRightRowKey.getUnsafe(locationToMigrate);
-        if (currentStateValue == EMPTY_RIGHT_STATE) {
+        if (isStateEmpty(currentStateValue)) {
             return false;
         }
+        if (isStateDeleted(currentStateValue)) {
+            alternateEntries--;
+            alternateRightRowKey.set(locationToMigrate, EMPTY_RIGHT_STATE);
+            return trueOnDeletedEntry;
+        }
         final int k0 = alternateKeySource0.getUnsafe(locationToMigrate);
         final int hash = hash(k0);
         int destinationTableLocation = hashToTableLocation(hash);
-        while (mainRightRowKey.getUnsafe(destinationTableLocation) != EMPTY_RIGHT_STATE) {
+        long candidateState;
+        while (!isStateEmpty(candidateState = mainRightRowKey.getUnsafe(destinationTableLocation)) && !isStateDeleted(candidateState)) {
             destinationTableLocation = nextTableLocation(destinationTableLocation);
         }
         mainKeySource0.set(destinationTableLocation, k0);
@@ -559,6 +702,10 @@ private boolean migrateOneLocation(int locationToMigrate,
         alternateModifiedTrackerCookieSource.set(locationToMigrate, -1L);
         modifiedSlotTracker.moveTableLocation(cookie, locationToMigrate, mainInsertMask | destinationTableLocation);;
         alternateRightRowKey.set(locationToMigrate, EMPTY_RIGHT_STATE);
+        if (!isStateDeleted(candidateState)) {
+            numEntries++;
+        }
+        alternateEntries--;
         return true;
     }
 
@@ -567,7 +714,7 @@ protected int rehashInternalPartial(int entriesToRehash,
             NaturalJoinModifiedSlotTracker modifiedSlotTracker) {
         int rehashedEntries = 0;
         while (rehashPointer > 0 && rehashedEntries < entriesToRehash) {
-            if (migrateOneLocation(--rehashPointer, modifiedSlotTracker)) {
+            if (migrateOneLocation(--rehashPointer, false, modifiedSlotTracker)) {
                 rehashedEntries++;
             }
         }
@@ -575,8 +722,7 @@ protected int rehashInternalPartial(int entriesToRehash,
     }
 
     @Override
-    protected void newAlternate() {
-        super.newAlternate();
+    protected void adviseNewAlternate() {
         this.mainKeySource0 = (ImmutableIntArraySource)super.mainKeySources[0];
         this.alternateKeySource0 = (ImmutableIntArraySource)super.alternateKeySources[0];
     }
@@ -590,7 +736,7 @@ protected void clearAlternate() {
     @Override
     protected void migrateFront(NaturalJoinModifiedSlotTracker modifiedSlotTracker) {
         int location = 0;
-        while (migrateOneLocation(location++, modifiedSlotTracker));
+        while (migrateOneLocation(location++, true, modifiedSlotTracker) && location < alternateTableSize);
     }
 
     @Override
@@ -610,7 +756,7 @@ protected void rehashInternalFull(final int oldSize) {
         mainModifiedTrackerCookieSource.setArray(destModifiedCookie);
         for (int sourceBucket = 0; sourceBucket < oldSize; ++sourceBucket) {
             final long currentStateValue = originalStateArray[sourceBucket];
-            if (currentStateValue == EMPTY_RIGHT_STATE) {
+            if (isStateEmpty(currentStateValue)) {
                 continue;
             }
             final int k0 = originalKeyArray0[sourceBucket];
@@ -618,7 +764,7 @@ protected void rehashInternalFull(final int oldSize) {
             final int firstDestinationTableLocation = hashToTableLocation(hash);
             int destinationTableLocation = firstDestinationTableLocation;
             while (true) {
-                if (destState[destinationTableLocation] == EMPTY_RIGHT_STATE) {
+                if (isStateEmpty(destState[destinationTableLocation])) {
                     destKeyArray0[destinationTableLocation] = k0;
                     destState[destinationTableLocation] = originalStateArray[sourceBucket];
                     destLeftRowSet[destinationTableLocation] = oldLeftRowSet[sourceBucket];
diff --git a/engine/table/src/main/java/io/deephaven/engine/table/impl/naturaljoin/typed/incopen/gen/IncrementalNaturalJoinHasherLong.java b/engine/table/src/main/java/io/deephaven/engine/table/impl/naturaljoin/typed/incopen/gen/IncrementalNaturalJoinHasherLong.java
index 42f43bb2bdd..fd4920fca3b 100644
--- a/engine/table/src/main/java/io/deephaven/engine/table/impl/naturaljoin/typed/incopen/gen/IncrementalNaturalJoinHasherLong.java
+++ b/engine/table/src/main/java/io/deephaven/engine/table/impl/naturaljoin/typed/incopen/gen/IncrementalNaturalJoinHasherLong.java
@@ -61,15 +61,16 @@ protected void buildFromLeftSide(RowSequence rowSequence, Chunk[] sourceKeyChunk
             int tableLocation = firstTableLocation;
             MAIN_SEARCH: while (true) {
                 long rightRowKeyForState = mainRightRowKey.getUnsafe(tableLocation);
-                if (rightRowKeyForState == EMPTY_RIGHT_STATE) {
+                if (isStateEmpty(rightRowKeyForState)) {
                     numEntries++;
+                    liveEntries++;
                     mainKeySource0.set(tableLocation, k0);
                     mainLeftRowSet.set(tableLocation, RowSetFactory.fromKeys(rowKeyChunk.get(chunkPosition)));
                     mainRightRowKey.set(tableLocation, RowSet.NULL_ROW_KEY);
                     mainModifiedTrackerCookieSource.set(tableLocation, -1L);
                     break;
                 } else if (eq(mainKeySource0.getUnsafe(tableLocation), k0)) {
-                    if (rightRowKeyForState < RowSet.NULL_ROW_KEY) {
+                    if (rightRowKeyForState <= FIRST_DUPLICATE) {
                         throw new IllegalStateException("Natural Join found duplicate right key for " + extractKeyStringFromSourceTable(rowKeyChunk.get(chunkPosition)));
                     }
                     mainLeftRowSet.getUnsafe(tableLocation).insert(rowKeyChunk.get(chunkPosition));
@@ -94,8 +95,9 @@ protected void buildFromRightSide(RowSequence rowSequence, Chunk[] sourceKeyChun
             int tableLocation = firstTableLocation;
             MAIN_SEARCH: while (true) {
                 long existingRightRowKey = mainRightRowKey.getUnsafe(tableLocation);
-                if (existingRightRowKey == EMPTY_RIGHT_STATE) {
+                if (isStateEmpty(existingRightRowKey)) {
                     numEntries++;
+                    liveEntries++;
                     mainKeySource0.set(tableLocation, k0);
                     mainLeftRowSet.set(tableLocation, RowSetFactory.empty());
                     mainRightRowKey.set(tableLocation, rowKeyChunk.get(chunkPosition));
@@ -104,7 +106,7 @@ protected void buildFromRightSide(RowSequence rowSequence, Chunk[] sourceKeyChun
                 } else if (eq(mainKeySource0.getUnsafe(tableLocation), k0)) {
                     if (existingRightRowKey == RowSet.NULL_ROW_KEY) {
                         mainRightRowKey.set(tableLocation, rowKeyChunk.get(chunkPosition));
-                    } else if (existingRightRowKey < RowSet.NULL_ROW_KEY) {
+                    } else if (existingRightRowKey <= FIRST_DUPLICATE) {
                         final long duplicateLocation = duplicateLocationFromRowKey(existingRightRowKey);
                         rightSideDuplicateRowSets.getUnsafe(duplicateLocation).insert(rowKeyChunk.get(chunkPosition));
                     } else {
@@ -131,20 +133,27 @@ protected void addRightSide(RowSequence rowSequence, Chunk[] sourceKeyChunks,
             final int hash = hash(k0);
             final int firstTableLocation = hashToTableLocation(hash);
             int tableLocation = firstTableLocation;
+            int firstDeletedLocation = -1;
             MAIN_SEARCH: while (true) {
                 long existingRightRowKey = mainRightRowKey.getUnsafe(tableLocation);
-                if (existingRightRowKey == EMPTY_RIGHT_STATE) {
+                if (firstDeletedLocation < 0 && isStateDeleted(existingRightRowKey)) {
+                    firstDeletedLocation = tableLocation;
+                }
+                if (isStateEmpty(existingRightRowKey)) {
                     final int firstAlternateTableLocation = hashToTableLocationAlternate(hash);
                     int alternateTableLocation = firstAlternateTableLocation;
                     while (alternateTableLocation < rehashPointer) {
                         existingRightRowKey = alternateRightRowKey.getUnsafe(alternateTableLocation);
-                        if (existingRightRowKey == EMPTY_RIGHT_STATE) {
+                        if (isStateEmpty(existingRightRowKey)) {
                             break;
                         } else if (eq(alternateKeySource0.getUnsafe(alternateTableLocation), k0)) {
+                            if (isStateDeleted(existingRightRowKey)) {
+                                break;
+                            }
                             if (existingRightRowKey == RowSet.NULL_ROW_KEY) {
                                 alternateRightRowKey.set(alternateTableLocation, rowKeyChunk.get(chunkPosition));
                                 alternateModifiedTrackerCookieSource.set(alternateTableLocation, modifiedSlotTracker.addMain(alternateModifiedTrackerCookieSource.getUnsafe(alternateTableLocation), alternateInsertMask | alternateTableLocation, existingRightRowKey, NaturalJoinModifiedSlotTracker.FLAG_RIGHT_CHANGE));
-                            } else if (existingRightRowKey < RowSet.NULL_ROW_KEY) {
+                            } else if (existingRightRowKey <= FIRST_DUPLICATE) {
                                 final long duplicateLocation = duplicateLocationFromRowKey(existingRightRowKey);
                                 final WritableRowSet duplicates = rightSideDuplicateRowSets.getUnsafe(duplicateLocation);
                                 final long duplicateSize = duplicates.size();
@@ -162,17 +171,31 @@ protected void addRightSide(RowSequence rowSequence, Chunk[] sourceKeyChunks,
                             Assert.neq(alternateTableLocation, "alternateTableLocation", firstAlternateTableLocation, "firstAlternateTableLocation");
                         }
                     }
-                    numEntries++;
+                    if (firstDeletedLocation >= 0) {
+                        tableLocation = firstDeletedLocation;
+                    } else {
+                        numEntries++;
+                    }
+                    liveEntries++;
                     mainKeySource0.set(tableLocation, k0);
                     mainLeftRowSet.set(tableLocation, RowSetFactory.empty());
                     mainRightRowKey.set(tableLocation, rowKeyChunk.get(chunkPosition));
                     mainModifiedTrackerCookieSource.set(tableLocation, modifiedSlotTracker.addMain(-1, mainInsertMask | tableLocation, existingRightRowKey, NaturalJoinModifiedSlotTracker.FLAG_RIGHT_CHANGE));
                     break;
                 } else if (eq(mainKeySource0.getUnsafe(tableLocation), k0)) {
+                    if (isStateDeleted(existingRightRowKey)) {
+                        tableLocation = firstDeletedLocation;
+                        liveEntries++;
+                        mainKeySource0.set(tableLocation, k0);
+                        mainLeftRowSet.set(tableLocation, RowSetFactory.empty());
+                        mainRightRowKey.set(tableLocation, rowKeyChunk.get(chunkPosition));
+                        mainModifiedTrackerCookieSource.set(tableLocation, modifiedSlotTracker.addMain(-1, mainInsertMask | tableLocation, existingRightRowKey, NaturalJoinModifiedSlotTracker.FLAG_RIGHT_CHANGE));
+                        break;
+                    }
                     if (existingRightRowKey == RowSet.NULL_ROW_KEY) {
                         mainRightRowKey.set(tableLocation, rowKeyChunk.get(chunkPosition));
                         mainModifiedTrackerCookieSource.set(tableLocation, modifiedSlotTracker.addMain(mainModifiedTrackerCookieSource.getUnsafe(tableLocation), mainInsertMask | tableLocation, existingRightRowKey, NaturalJoinModifiedSlotTracker.FLAG_RIGHT_CHANGE));
-                    } else if (existingRightRowKey < RowSet.NULL_ROW_KEY) {
+                    } else if (existingRightRowKey <= FIRST_DUPLICATE) {
                         final long duplicateLocation = duplicateLocationFromRowKey(existingRightRowKey);
                         final WritableRowSet duplicates = rightSideDuplicateRowSets.getUnsafe(duplicateLocation);
                         final long duplicateSize = duplicates.size();
@@ -203,17 +226,24 @@ protected void addLeftSide(RowSequence rowSequence, Chunk[] sourceKeyChunks,
             final int hash = hash(k0);
             final int firstTableLocation = hashToTableLocation(hash);
             int tableLocation = firstTableLocation;
+            int firstDeletedLocation = -1;
             MAIN_SEARCH: while (true) {
                 long rightRowKeyForState = mainRightRowKey.getUnsafe(tableLocation);
-                if (rightRowKeyForState == EMPTY_RIGHT_STATE) {
+                if (firstDeletedLocation < 0 && isStateDeleted(rightRowKeyForState)) {
+                    firstDeletedLocation = tableLocation;
+                }
+                if (isStateEmpty(rightRowKeyForState)) {
                     final int firstAlternateTableLocation = hashToTableLocationAlternate(hash);
                     int alternateTableLocation = firstAlternateTableLocation;
                     while (alternateTableLocation < rehashPointer) {
                         rightRowKeyForState = alternateRightRowKey.getUnsafe(alternateTableLocation);
-                        if (rightRowKeyForState == EMPTY_RIGHT_STATE) {
+                        if (isStateEmpty(rightRowKeyForState)) {
                             break;
                         } else if (eq(alternateKeySource0.getUnsafe(alternateTableLocation), k0)) {
-                            if (rightRowKeyForState < RowSet.NULL_ROW_KEY) {
+                            if (isStateDeleted(rightRowKeyForState)) {
+                                break;
+                            }
+                            if (rightRowKeyForState <= FIRST_DUPLICATE) {
                                 throw new IllegalStateException("Natural Join found duplicate right key for " + extractKeyStringFromSourceTable(rowKeyChunk.get(chunkPosition)));
                             }
                             alternateLeftRowSet.getUnsafe(alternateTableLocation).insert(rowKeyChunk.get(chunkPosition));
@@ -224,7 +254,12 @@ protected void addLeftSide(RowSequence rowSequence, Chunk[] sourceKeyChunks,
                             Assert.neq(alternateTableLocation, "alternateTableLocation", firstAlternateTableLocation, "firstAlternateTableLocation");
                         }
                     }
-                    numEntries++;
+                    if (firstDeletedLocation >= 0) {
+                        tableLocation = firstDeletedLocation;
+                    } else {
+                        numEntries++;
+                    }
+                    liveEntries++;
                     mainKeySource0.set(tableLocation, k0);
                     mainLeftRowSet.set(tableLocation, RowSetFactory.fromKeys(rowKeyChunk.get(chunkPosition)));
                     mainRightRowKey.set(tableLocation, RowSet.NULL_ROW_KEY);
@@ -232,7 +267,17 @@ protected void addLeftSide(RowSequence rowSequence, Chunk[] sourceKeyChunks,
                     leftRedirections.set(leftRedirectionOffset++, RowSet.NULL_ROW_KEY);
                     break;
                 } else if (eq(mainKeySource0.getUnsafe(tableLocation), k0)) {
-                    if (rightRowKeyForState < RowSet.NULL_ROW_KEY) {
+                    if (isStateDeleted(rightRowKeyForState)) {
+                        tableLocation = firstDeletedLocation;
+                        liveEntries++;
+                        mainKeySource0.set(tableLocation, k0);
+                        mainLeftRowSet.set(tableLocation, RowSetFactory.fromKeys(rowKeyChunk.get(chunkPosition)));
+                        mainRightRowKey.set(tableLocation, RowSet.NULL_ROW_KEY);
+                        mainModifiedTrackerCookieSource.set(tableLocation, -1L);
+                        leftRedirections.set(leftRedirectionOffset++, RowSet.NULL_ROW_KEY);
+                        break;
+                    }
+                    if (rightRowKeyForState <= FIRST_DUPLICATE) {
                         throw new IllegalStateException("Natural Join found duplicate right key for " + extractKeyStringFromSourceTable(rowKeyChunk.get(chunkPosition)));
                     }
                     mainLeftRowSet.getUnsafe(tableLocation).insert(rowKeyChunk.get(chunkPosition));
@@ -256,11 +301,16 @@ protected void removeRight(RowSequence rowSequence, Chunk[] sourceKeyChunks,
             final int hash = hash(k0);
             final int firstTableLocation = hashToTableLocation(hash);
             boolean found = false;
+            boolean searchAlternate = true;
             int tableLocation = firstTableLocation;
             long existingRightRowKey;
-            while ((existingRightRowKey = mainRightRowKey.getUnsafe(tableLocation)) != EMPTY_RIGHT_STATE) {
+            while (!isStateEmpty(existingRightRowKey = mainRightRowKey.getUnsafe(tableLocation))) {
                 if (eq(mainKeySource0.getUnsafe(tableLocation), k0)) {
-                    if (existingRightRowKey < RowSet.NULL_ROW_KEY) {
+                    if (isStateDeleted(existingRightRowKey)) {
+                        searchAlternate = false;
+                        break;
+                    }
+                    if (existingRightRowKey <= FIRST_DUPLICATE) {
                         final long duplicateLocation = duplicateLocationFromRowKey(existingRightRowKey);
                         final WritableRowSet duplicates = rightSideDuplicateRowSets.getUnsafe(duplicateLocation);
                         final long duplicateSize = duplicates.size();
@@ -273,7 +323,13 @@ protected void removeRight(RowSequence rowSequence, Chunk[] sourceKeyChunks,
                     } else if (existingRightRowKey != rowKeyChunk.get(chunkPosition)) {
                         Assert.statementNeverExecuted("Could not find existing right row in state");
                     } else {
-                        mainRightRowKey.set(tableLocation, RowSet.NULL_ROW_KEY);
+                        final boolean leftEmpty = mainLeftRowSet.getUnsafe(tableLocation).isEmpty();
+                        if (leftEmpty) {
+                            mainRightRowKey.set(tableLocation, TOMBSTONE_RIGHT_STATE);
+                            liveEntries--;
+                        } else {
+                            mainRightRowKey.set(tableLocation, RowSet.NULL_ROW_KEY);
+                        }
                         mainModifiedTrackerCookieSource.set(tableLocation, modifiedSlotTracker.addMain(mainModifiedTrackerCookieSource.getUnsafe(tableLocation), mainInsertMask | tableLocation, existingRightRowKey, NaturalJoinModifiedSlotTracker.FLAG_RIGHT_CHANGE));
                     }
                     found = true;
@@ -283,37 +339,50 @@ protected void removeRight(RowSequence rowSequence, Chunk[] sourceKeyChunks,
                 Assert.neq(tableLocation, "tableLocation", firstTableLocation, "firstTableLocation");
             }
             if (!found) {
-                final int firstAlternateTableLocation = hashToTableLocationAlternate(hash);
-                boolean alternateFound = false;
-                if (firstAlternateTableLocation < rehashPointer) {
-                    int alternateTableLocation = firstAlternateTableLocation;
-                    while ((existingRightRowKey = alternateRightRowKey.getUnsafe(alternateTableLocation)) != EMPTY_RIGHT_STATE) {
-                        if (eq(alternateKeySource0.getUnsafe(alternateTableLocation), k0)) {
-                            if (existingRightRowKey < RowSet.NULL_ROW_KEY) {
-                                final long duplicateLocation = duplicateLocationFromRowKey(existingRightRowKey);
-                                final WritableRowSet duplicates = rightSideDuplicateRowSets.getUnsafe(duplicateLocation);
-                                final long duplicateSize = duplicates.size();
-                                duplicates.remove(rowKeyChunk.get(chunkPosition));
-                                Assert.eq(duplicateSize, "duplicateSize", duplicates.size() + 1, "duplicates.size() + 1");
-                                if (duplicates.size() == 1) {
-                                    alternateRightRowKey.set(alternateTableLocation, duplicates.firstRowKey());
-                                    freeDuplicateLocation(duplicateLocation);
+                if (!searchAlternate) {
+                    throw Assert.statementNeverExecuted("Could not find existing state for removed right row");
+                } else {
+                    final int firstAlternateTableLocation = hashToTableLocationAlternate(hash);
+                    boolean alternateFound = false;
+                    if (firstAlternateTableLocation < rehashPointer) {
+                        int alternateTableLocation = firstAlternateTableLocation;
+                        while (!isStateEmpty(existingRightRowKey = alternateRightRowKey.getUnsafe(alternateTableLocation))) {
+                            if (eq(alternateKeySource0.getUnsafe(alternateTableLocation), k0)) {
+                                if (isStateDeleted(existingRightRowKey)) {
+                                    break;
                                 }
-                            } else if (existingRightRowKey != rowKeyChunk.get(chunkPosition)) {
-                                Assert.statementNeverExecuted("Could not find existing right row in state");
-                            } else {
-                                alternateRightRowKey.set(alternateTableLocation, RowSet.NULL_ROW_KEY);
-                                alternateModifiedTrackerCookieSource.set(alternateTableLocation, modifiedSlotTracker.addMain(alternateModifiedTrackerCookieSource.getUnsafe(alternateTableLocation), alternateInsertMask | alternateTableLocation, existingRightRowKey, NaturalJoinModifiedSlotTracker.FLAG_RIGHT_CHANGE));
+                                if (existingRightRowKey <= FIRST_DUPLICATE) {
+                                    final long duplicateLocation = duplicateLocationFromRowKey(existingRightRowKey);
+                                    final WritableRowSet duplicates = rightSideDuplicateRowSets.getUnsafe(duplicateLocation);
+                                    final long duplicateSize = duplicates.size();
+                                    duplicates.remove(rowKeyChunk.get(chunkPosition));
+                                    Assert.eq(duplicateSize, "duplicateSize", duplicates.size() + 1, "duplicates.size() + 1");
+                                    if (duplicates.size() == 1) {
+                                        alternateRightRowKey.set(alternateTableLocation, duplicates.firstRowKey());
+                                        freeDuplicateLocation(duplicateLocation);
+                                    }
+                                } else if (existingRightRowKey != rowKeyChunk.get(chunkPosition)) {
+                                    Assert.statementNeverExecuted("Could not find existing right row in state");
+                                } else {
+                                    final boolean leftEmpty = alternateLeftRowSet.getUnsafe(alternateTableLocation).isEmpty();
+                                    if (leftEmpty) {
+                                        alternateRightRowKey.set(alternateTableLocation, TOMBSTONE_RIGHT_STATE);
+                                        liveEntries--;
+                                    } else {
+                                        alternateRightRowKey.set(alternateTableLocation, RowSet.NULL_ROW_KEY);
+                                    }
+                                    alternateModifiedTrackerCookieSource.set(alternateTableLocation, modifiedSlotTracker.addMain(alternateModifiedTrackerCookieSource.getUnsafe(alternateTableLocation), alternateInsertMask | alternateTableLocation, existingRightRowKey, NaturalJoinModifiedSlotTracker.FLAG_RIGHT_CHANGE));
+                                }
+                                alternateFound = true;
+                                break;
                             }
-                            alternateFound = true;
-                            break;
+                            alternateTableLocation = alternateNextTableLocation(alternateTableLocation);
+                            Assert.neq(alternateTableLocation, "alternateTableLocation", firstAlternateTableLocation, "firstAlternateTableLocation");
                         }
-                        alternateTableLocation = alternateNextTableLocation(alternateTableLocation);
-                        Assert.neq(alternateTableLocation, "alternateTableLocation", firstAlternateTableLocation, "firstAlternateTableLocation");
                     }
-                }
-                if (!alternateFound) {
-                    throw Assert.statementNeverExecuted("Could not find existing state for removed right row");
+                    if (!alternateFound) {
+                        throw Assert.statementNeverExecuted("Could not find existing state for removed right row");
+                    }
                 }
             }
         }
@@ -328,10 +397,15 @@ protected void modifyByRight(RowSequence rowSequence, Chunk[] sourceKeyChunks,
             final int hash = hash(k0);
             final int firstTableLocation = hashToTableLocation(hash);
             boolean found = false;
+            boolean searchAlternate = true;
             int tableLocation = firstTableLocation;
             long existingRightRowKey;
-            while ((existingRightRowKey = mainRightRowKey.getUnsafe(tableLocation)) != EMPTY_RIGHT_STATE) {
+            while (!isStateEmpty(existingRightRowKey = mainRightRowKey.getUnsafe(tableLocation))) {
                 if (eq(mainKeySource0.getUnsafe(tableLocation), k0)) {
+                    if (isStateDeleted(existingRightRowKey)) {
+                        searchAlternate = false;
+                        break;
+                    }
                     mainModifiedTrackerCookieSource.set(tableLocation, modifiedSlotTracker.addMain(mainModifiedTrackerCookieSource.getUnsafe(tableLocation), mainInsertMask | tableLocation, existingRightRowKey, NaturalJoinModifiedSlotTracker.FLAG_RIGHT_CHANGE));
                     found = true;
                     break;
@@ -340,22 +414,29 @@ protected void modifyByRight(RowSequence rowSequence, Chunk[] sourceKeyChunks,
                 Assert.neq(tableLocation, "tableLocation", firstTableLocation, "firstTableLocation");
             }
             if (!found) {
-                final int firstAlternateTableLocation = hashToTableLocationAlternate(hash);
-                boolean alternateFound = false;
-                if (firstAlternateTableLocation < rehashPointer) {
-                    int alternateTableLocation = firstAlternateTableLocation;
-                    while ((existingRightRowKey = alternateRightRowKey.getUnsafe(alternateTableLocation)) != EMPTY_RIGHT_STATE) {
-                        if (eq(alternateKeySource0.getUnsafe(alternateTableLocation), k0)) {
-                            alternateModifiedTrackerCookieSource.set(alternateTableLocation, modifiedSlotTracker.addMain(alternateModifiedTrackerCookieSource.getUnsafe(alternateTableLocation), alternateInsertMask | alternateTableLocation, existingRightRowKey, NaturalJoinModifiedSlotTracker.FLAG_RIGHT_CHANGE));
-                            alternateFound = true;
-                            break;
+                if (!searchAlternate) {
+                    throw Assert.statementNeverExecuted("Could not find existing state for modified right row");
+                } else {
+                    final int firstAlternateTableLocation = hashToTableLocationAlternate(hash);
+                    boolean alternateFound = false;
+                    if (firstAlternateTableLocation < rehashPointer) {
+                        int alternateTableLocation = firstAlternateTableLocation;
+                        while (!isStateEmpty(existingRightRowKey = alternateRightRowKey.getUnsafe(alternateTableLocation))) {
+                            if (eq(alternateKeySource0.getUnsafe(alternateTableLocation), k0)) {
+                                if (isStateDeleted(existingRightRowKey)) {
+                                    break;
+                                }
+                                alternateModifiedTrackerCookieSource.set(alternateTableLocation, modifiedSlotTracker.addMain(alternateModifiedTrackerCookieSource.getUnsafe(alternateTableLocation), alternateInsertMask | alternateTableLocation, existingRightRowKey, NaturalJoinModifiedSlotTracker.FLAG_RIGHT_CHANGE));
+                                alternateFound = true;
+                                break;
+                            }
+                            alternateTableLocation = alternateNextTableLocation(alternateTableLocation);
+                            Assert.neq(alternateTableLocation, "alternateTableLocation", firstAlternateTableLocation, "firstAlternateTableLocation");
                         }
-                        alternateTableLocation = alternateNextTableLocation(alternateTableLocation);
-                        Assert.neq(alternateTableLocation, "alternateTableLocation", firstAlternateTableLocation, "firstAlternateTableLocation");
                     }
-                }
-                if (!alternateFound) {
-                    throw Assert.statementNeverExecuted("Could not find existing state for modified right row");
+                    if (!alternateFound) {
+                        throw Assert.statementNeverExecuted("Could not find existing state for modified right row");
+                    }
                 }
             }
         }
@@ -372,15 +453,20 @@ protected void applyRightShift(RowSequence rowSequence, Chunk[] sourceKeyChunks,
             final int hash = hash(k0);
             final int firstTableLocation = hashToTableLocation(hash);
             boolean found = false;
+            boolean searchAlternate = true;
             int tableLocation = firstTableLocation;
             long existingRightRowKey;
-            while ((existingRightRowKey = mainRightRowKey.getUnsafe(tableLocation)) != EMPTY_RIGHT_STATE) {
+            while (!isStateEmpty(existingRightRowKey = mainRightRowKey.getUnsafe(tableLocation))) {
                 if (eq(mainKeySource0.getUnsafe(tableLocation), k0)) {
+                    if (isStateDeleted(existingRightRowKey)) {
+                        searchAlternate = false;
+                        break;
+                    }
                     final long keyToShift = rowKeyChunk.get(chunkPosition);
                     if (existingRightRowKey == keyToShift - shiftDelta) {
                         mainRightRowKey.set(tableLocation, keyToShift);
                         mainModifiedTrackerCookieSource.set(tableLocation, modifiedSlotTracker.addMain(mainModifiedTrackerCookieSource.getUnsafe(tableLocation), mainInsertMask | tableLocation, existingRightRowKey, NaturalJoinModifiedSlotTracker.FLAG_RIGHT_SHIFT));
-                    } else if (existingRightRowKey < RowSet.NULL_ROW_KEY) {
+                    } else if (existingRightRowKey <= FIRST_DUPLICATE) {
                         final long duplicateLocation = duplicateLocationFromRowKey(existingRightRowKey);
                         if (shiftDelta < 0) {
                             final WritableRowSet duplicates = rightSideDuplicateRowSets.getUnsafe(duplicateLocation);
@@ -399,37 +485,44 @@ protected void applyRightShift(RowSequence rowSequence, Chunk[] sourceKeyChunks,
                 Assert.neq(tableLocation, "tableLocation", firstTableLocation, "firstTableLocation");
             }
             if (!found) {
-                final int firstAlternateTableLocation = hashToTableLocationAlternate(hash);
-                boolean alternateFound = false;
-                if (firstAlternateTableLocation < rehashPointer) {
-                    int alternateTableLocation = firstAlternateTableLocation;
-                    while ((existingRightRowKey = alternateRightRowKey.getUnsafe(alternateTableLocation)) != EMPTY_RIGHT_STATE) {
-                        if (eq(alternateKeySource0.getUnsafe(alternateTableLocation), k0)) {
-                            final long keyToShift = rowKeyChunk.get(chunkPosition);
-                            if (existingRightRowKey == keyToShift - shiftDelta) {
-                                alternateRightRowKey.set(alternateTableLocation, keyToShift);
-                                alternateModifiedTrackerCookieSource.set(alternateTableLocation, modifiedSlotTracker.addMain(alternateModifiedTrackerCookieSource.getUnsafe(alternateTableLocation), alternateInsertMask | alternateTableLocation, existingRightRowKey, NaturalJoinModifiedSlotTracker.FLAG_RIGHT_SHIFT));
-                            } else if (existingRightRowKey < RowSet.NULL_ROW_KEY) {
-                                final long duplicateLocation = duplicateLocationFromRowKey(existingRightRowKey);
-                                if (shiftDelta < 0) {
-                                    final WritableRowSet duplicates = rightSideDuplicateRowSets.getUnsafe(duplicateLocation);
-                                    shiftOneKey(duplicates, keyToShift, shiftDelta);
+                if (!searchAlternate) {
+                    throw Assert.statementNeverExecuted("Could not find existing state for shifted right row");
+                } else {
+                    final int firstAlternateTableLocation = hashToTableLocationAlternate(hash);
+                    boolean alternateFound = false;
+                    if (firstAlternateTableLocation < rehashPointer) {
+                        int alternateTableLocation = firstAlternateTableLocation;
+                        while (!isStateEmpty(existingRightRowKey = alternateRightRowKey.getUnsafe(alternateTableLocation))) {
+                            if (eq(alternateKeySource0.getUnsafe(alternateTableLocation), k0)) {
+                                if (isStateDeleted(existingRightRowKey)) {
+                                    break;
+                                }
+                                final long keyToShift = rowKeyChunk.get(chunkPosition);
+                                if (existingRightRowKey == keyToShift - shiftDelta) {
+                                    alternateRightRowKey.set(alternateTableLocation, keyToShift);
+                                    alternateModifiedTrackerCookieSource.set(alternateTableLocation, modifiedSlotTracker.addMain(alternateModifiedTrackerCookieSource.getUnsafe(alternateTableLocation), alternateInsertMask | alternateTableLocation, existingRightRowKey, NaturalJoinModifiedSlotTracker.FLAG_RIGHT_SHIFT));
+                                } else if (existingRightRowKey <= FIRST_DUPLICATE) {
+                                    final long duplicateLocation = duplicateLocationFromRowKey(existingRightRowKey);
+                                    if (shiftDelta < 0) {
+                                        final WritableRowSet duplicates = rightSideDuplicateRowSets.getUnsafe(duplicateLocation);
+                                        shiftOneKey(duplicates, keyToShift, shiftDelta);
+                                    } else {
+                                        pc.pendingShifts.set(pc.pendingShiftPointer++, (long)duplicateLocation);
+                                        pc.pendingShifts.set(pc.pendingShiftPointer++, keyToShift);
+                                    }
                                 } else {
-                                    pc.pendingShifts.set(pc.pendingShiftPointer++, (long)duplicateLocation);
-                                    pc.pendingShifts.set(pc.pendingShiftPointer++, keyToShift);
+                                    throw Assert.statementNeverExecuted("Could not find existing index for shifted right row");
                                 }
-                            } else {
-                                throw Assert.statementNeverExecuted("Could not find existing index for shifted right row");
+                                alternateFound = true;
+                                break;
                             }
-                            alternateFound = true;
-                            break;
+                            alternateTableLocation = alternateNextTableLocation(alternateTableLocation);
+                            Assert.neq(alternateTableLocation, "alternateTableLocation", firstAlternateTableLocation, "firstAlternateTableLocation");
                         }
-                        alternateTableLocation = alternateNextTableLocation(alternateTableLocation);
-                        Assert.neq(alternateTableLocation, "alternateTableLocation", firstAlternateTableLocation, "firstAlternateTableLocation");
                     }
-                }
-                if (!alternateFound) {
-                    throw Assert.statementNeverExecuted("Could not find existing state for shifted right row");
+                    if (!alternateFound) {
+                        throw Assert.statementNeverExecuted("Could not find existing state for shifted right row");
+                    }
                 }
             }
         }
@@ -444,10 +537,21 @@ protected void removeLeft(RowSequence rowSequence, Chunk[] sourceKeyChunks) {
             final int hash = hash(k0);
             final int firstTableLocation = hashToTableLocation(hash);
             boolean found = false;
+            boolean searchAlternate = true;
             int tableLocation = firstTableLocation;
-            while (mainRightRowKey.getUnsafe(tableLocation) != EMPTY_RIGHT_STATE) {
+            long rightState;
+            while (!isStateEmpty(rightState = mainRightRowKey.getUnsafe(tableLocation))) {
                 if (eq(mainKeySource0.getUnsafe(tableLocation), k0)) {
-                    mainLeftRowSet.getUnsafe(tableLocation).remove(rowKeyChunk.get(chunkPosition));
+                    if (isStateDeleted(rightState)) {
+                        searchAlternate = false;
+                        break;
+                    }
+                    final WritableRowSet left = mainLeftRowSet.getUnsafe(tableLocation);
+                    left.remove(rowKeyChunk.get(chunkPosition));
+                    if (left.isEmpty() && rightState == RowSet.NULL_ROW_KEY) {
+                        mainRightRowKey.set(tableLocation, TOMBSTONE_RIGHT_STATE);
+                        liveEntries--;
+                    }
                     found = true;
                     break;
                 }
@@ -455,22 +559,34 @@ protected void removeLeft(RowSequence rowSequence, Chunk[] sourceKeyChunks) {
                 Assert.neq(tableLocation, "tableLocation", firstTableLocation, "firstTableLocation");
             }
             if (!found) {
-                final int firstAlternateTableLocation = hashToTableLocationAlternate(hash);
-                boolean alternateFound = false;
-                if (firstAlternateTableLocation < rehashPointer) {
-                    int alternateTableLocation = firstAlternateTableLocation;
-                    while (alternateRightRowKey.getUnsafe(alternateTableLocation) != EMPTY_RIGHT_STATE) {
-                        if (eq(alternateKeySource0.getUnsafe(alternateTableLocation), k0)) {
-                            alternateLeftRowSet.getUnsafe(alternateTableLocation).remove(rowKeyChunk.get(chunkPosition));
-                            alternateFound = true;
-                            break;
+                if (!searchAlternate) {
+                    throw Assert.statementNeverExecuted("Could not find existing state for removed left row");
+                } else {
+                    final int firstAlternateTableLocation = hashToTableLocationAlternate(hash);
+                    boolean alternateFound = false;
+                    if (firstAlternateTableLocation < rehashPointer) {
+                        int alternateTableLocation = firstAlternateTableLocation;
+                        while (!isStateEmpty(rightState = alternateRightRowKey.getUnsafe(alternateTableLocation))) {
+                            if (eq(alternateKeySource0.getUnsafe(alternateTableLocation), k0)) {
+                                if (isStateDeleted(rightState)) {
+                                    break;
+                                }
+                                final WritableRowSet left = alternateLeftRowSet.getUnsafe(alternateTableLocation);
+                                left.remove(rowKeyChunk.get(chunkPosition));
+                                if (left.isEmpty() && rightState == RowSet.NULL_ROW_KEY) {
+                                    alternateRightRowKey.set(alternateTableLocation, TOMBSTONE_RIGHT_STATE);
+                                    liveEntries--;
+                                }
+                                alternateFound = true;
+                                break;
+                            }
+                            alternateTableLocation = alternateNextTableLocation(alternateTableLocation);
+                            Assert.neq(alternateTableLocation, "alternateTableLocation", firstAlternateTableLocation, "firstAlternateTableLocation");
                         }
-                        alternateTableLocation = alternateNextTableLocation(alternateTableLocation);
-                        Assert.neq(alternateTableLocation, "alternateTableLocation", firstAlternateTableLocation, "firstAlternateTableLocation");
                     }
-                }
-                if (!alternateFound) {
-                    throw Assert.statementNeverExecuted("Could not find existing state for removed left row");
+                    if (!alternateFound) {
+                        throw Assert.statementNeverExecuted("Could not find existing state for removed left row");
+                    }
                 }
             }
         }
@@ -486,9 +602,15 @@ protected void applyLeftShift(RowSequence rowSequence, Chunk[] sourceKeyChunks,
             final int hash = hash(k0);
             final int firstTableLocation = hashToTableLocation(hash);
             boolean found = false;
+            boolean searchAlternate = true;
             int tableLocation = firstTableLocation;
-            while (mainRightRowKey.getUnsafe(tableLocation) != EMPTY_RIGHT_STATE) {
+            long stateValue;
+            while (!isStateEmpty(stateValue = mainRightRowKey.getUnsafe(tableLocation))) {
                 if (eq(mainKeySource0.getUnsafe(tableLocation), k0)) {
+                    if (isStateDeleted(stateValue)) {
+                        searchAlternate = false;
+                        break;
+                    }
                     final WritableRowSet leftRowSetForState = mainLeftRowSet.getUnsafe(tableLocation);
                     final long keyToShift = rowKeyChunk.get(chunkPosition);
                     if (shiftDelta < 0) {
@@ -504,29 +626,36 @@ protected void applyLeftShift(RowSequence rowSequence, Chunk[] sourceKeyChunks,
                 Assert.neq(tableLocation, "tableLocation", firstTableLocation, "firstTableLocation");
             }
             if (!found) {
-                final int firstAlternateTableLocation = hashToTableLocationAlternate(hash);
-                boolean alternateFound = false;
-                if (firstAlternateTableLocation < rehashPointer) {
-                    int alternateTableLocation = firstAlternateTableLocation;
-                    while (alternateRightRowKey.getUnsafe(alternateTableLocation) != EMPTY_RIGHT_STATE) {
-                        if (eq(alternateKeySource0.getUnsafe(alternateTableLocation), k0)) {
-                            final WritableRowSet leftRowSetForState = alternateLeftRowSet.getUnsafe(alternateTableLocation);
-                            final long keyToShift = rowKeyChunk.get(chunkPosition);
-                            if (shiftDelta < 0) {
-                                shiftOneKey(leftRowSetForState, keyToShift, shiftDelta);
-                            } else {
-                                pc.pendingShifts.set(pc.pendingShiftPointer++, (long)(AlternatingColumnSource.ALTERNATE_SWITCH_MASK | alternateTableLocation));
-                                pc.pendingShifts.set(pc.pendingShiftPointer++, keyToShift);
+                if (!searchAlternate) {
+                    throw Assert.statementNeverExecuted("Could not find existing state for shifted left row");
+                } else {
+                    final int firstAlternateTableLocation = hashToTableLocationAlternate(hash);
+                    boolean alternateFound = false;
+                    if (firstAlternateTableLocation < rehashPointer) {
+                        int alternateTableLocation = firstAlternateTableLocation;
+                        while (!isStateEmpty(stateValue = alternateRightRowKey.getUnsafe(alternateTableLocation))) {
+                            if (eq(alternateKeySource0.getUnsafe(alternateTableLocation), k0)) {
+                                if (isStateDeleted(stateValue)) {
+                                    break;
+                                }
+                                final WritableRowSet leftRowSetForState = alternateLeftRowSet.getUnsafe(alternateTableLocation);
+                                final long keyToShift = rowKeyChunk.get(chunkPosition);
+                                if (shiftDelta < 0) {
+                                    shiftOneKey(leftRowSetForState, keyToShift, shiftDelta);
+                                } else {
+                                    pc.pendingShifts.set(pc.pendingShiftPointer++, (long)(AlternatingColumnSource.ALTERNATE_SWITCH_MASK | alternateTableLocation));
+                                    pc.pendingShifts.set(pc.pendingShiftPointer++, keyToShift);
+                                }
+                                alternateFound = true;
+                                break;
                             }
-                            alternateFound = true;
-                            break;
+                            alternateTableLocation = alternateNextTableLocation(alternateTableLocation);
+                            Assert.neq(alternateTableLocation, "alternateTableLocation", firstAlternateTableLocation, "firstAlternateTableLocation");
                         }
-                        alternateTableLocation = alternateNextTableLocation(alternateTableLocation);
-                        Assert.neq(alternateTableLocation, "alternateTableLocation", firstAlternateTableLocation, "firstAlternateTableLocation");
                     }
-                }
-                if (!alternateFound) {
-                    throw Assert.statementNeverExecuted("Could not find existing state for shifted left row");
+                    if (!alternateFound) {
+                        throw Assert.statementNeverExecuted("Could not find existing state for shifted left row");
+                    }
                 }
             }
         }
@@ -537,16 +666,30 @@ private static int hash(long k0) {
         return hash;
     }
 
-    private boolean migrateOneLocation(int locationToMigrate,
+    private static boolean isStateEmpty(long state) {
+        return state == EMPTY_RIGHT_STATE;
+    }
+
+    private static boolean isStateDeleted(long state) {
+        return state == TOMBSTONE_RIGHT_STATE;
+    }
+
+    private boolean migrateOneLocation(int locationToMigrate, boolean trueOnDeletedEntry,
             NaturalJoinModifiedSlotTracker modifiedSlotTracker) {
         final long currentStateValue = alternateRightRowKey.getUnsafe(locationToMigrate);
-        if (currentStateValue == EMPTY_RIGHT_STATE) {
+        if (isStateEmpty(currentStateValue)) {
             return false;
         }
+        if (isStateDeleted(currentStateValue)) {
+            alternateEntries--;
+            alternateRightRowKey.set(locationToMigrate, EMPTY_RIGHT_STATE);
+            return trueOnDeletedEntry;
+        }
         final long k0 = alternateKeySource0.getUnsafe(locationToMigrate);
         final int hash = hash(k0);
         int destinationTableLocation = hashToTableLocation(hash);
-        while (mainRightRowKey.getUnsafe(destinationTableLocation) != EMPTY_RIGHT_STATE) {
+        long candidateState;
+        while (!isStateEmpty(candidateState = mainRightRowKey.getUnsafe(destinationTableLocation)) && !isStateDeleted(candidateState)) {
             destinationTableLocation = nextTableLocation(destinationTableLocation);
         }
         mainKeySource0.set(destinationTableLocation, k0);
@@ -558,6 +701,10 @@ private boolean migrateOneLocation(int locationToMigrate,
         alternateModifiedTrackerCookieSource.set(locationToMigrate, -1L);
         modifiedSlotTracker.moveTableLocation(cookie, locationToMigrate, mainInsertMask | destinationTableLocation);;
         alternateRightRowKey.set(locationToMigrate, EMPTY_RIGHT_STATE);
+        if (!isStateDeleted(candidateState)) {
+            numEntries++;
+        }
+        alternateEntries--;
         return true;
     }
 
@@ -566,7 +713,7 @@ protected int rehashInternalPartial(int entriesToRehash,
             NaturalJoinModifiedSlotTracker modifiedSlotTracker) {
         int rehashedEntries = 0;
         while (rehashPointer > 0 && rehashedEntries < entriesToRehash) {
-            if (migrateOneLocation(--rehashPointer, modifiedSlotTracker)) {
+            if (migrateOneLocation(--rehashPointer, false, modifiedSlotTracker)) {
                 rehashedEntries++;
             }
         }
@@ -574,8 +721,7 @@ protected int rehashInternalPartial(int entriesToRehash,
     }
 
     @Override
-    protected void newAlternate() {
-        super.newAlternate();
+    protected void adviseNewAlternate() {
         this.mainKeySource0 = (ImmutableLongArraySource)super.mainKeySources[0];
         this.alternateKeySource0 = (ImmutableLongArraySource)super.alternateKeySources[0];
     }
@@ -589,7 +735,7 @@ protected void clearAlternate() {
     @Override
     protected void migrateFront(NaturalJoinModifiedSlotTracker modifiedSlotTracker) {
         int location = 0;
-        while (migrateOneLocation(location++, modifiedSlotTracker));
+        while (migrateOneLocation(location++, true, modifiedSlotTracker) && location < alternateTableSize);
     }
 
     @Override
@@ -609,7 +755,7 @@ protected void rehashInternalFull(final int oldSize) {
         mainModifiedTrackerCookieSource.setArray(destModifiedCookie);
         for (int sourceBucket = 0; sourceBucket < oldSize; ++sourceBucket) {
             final long currentStateValue = originalStateArray[sourceBucket];
-            if (currentStateValue == EMPTY_RIGHT_STATE) {
+            if (isStateEmpty(currentStateValue)) {
                 continue;
             }
             final long k0 = originalKeyArray0[sourceBucket];
@@ -617,7 +763,7 @@ protected void rehashInternalFull(final int oldSize) {
             final int firstDestinationTableLocation = hashToTableLocation(hash);
             int destinationTableLocation = firstDestinationTableLocation;
             while (true) {
-                if (destState[destinationTableLocation] == EMPTY_RIGHT_STATE) {
+                if (isStateEmpty(destState[destinationTableLocation])) {
                     destKeyArray0[destinationTableLocation] = k0;
                     destState[destinationTableLocation] = originalStateArray[sourceBucket];
                     destLeftRowSet[destinationTableLocation] = oldLeftRowSet[sourceBucket];
diff --git a/engine/table/src/main/java/io/deephaven/engine/table/impl/naturaljoin/typed/incopen/gen/IncrementalNaturalJoinHasherObject.java b/engine/table/src/main/java/io/deephaven/engine/table/impl/naturaljoin/typed/incopen/gen/IncrementalNaturalJoinHasherObject.java
index bc38d2262a0..0154892877a 100644
--- a/engine/table/src/main/java/io/deephaven/engine/table/impl/naturaljoin/typed/incopen/gen/IncrementalNaturalJoinHasherObject.java
+++ b/engine/table/src/main/java/io/deephaven/engine/table/impl/naturaljoin/typed/incopen/gen/IncrementalNaturalJoinHasherObject.java
@@ -63,15 +63,16 @@ protected void buildFromLeftSide(RowSequence rowSequence, Chunk[] sourceKeyChunk
             int tableLocation = firstTableLocation;
             MAIN_SEARCH: while (true) {
                 long rightRowKeyForState = mainRightRowKey.getUnsafe(tableLocation);
-                if (rightRowKeyForState == EMPTY_RIGHT_STATE) {
+                if (isStateEmpty(rightRowKeyForState)) {
                     numEntries++;
+                    liveEntries++;
                     mainKeySource0.set(tableLocation, k0);
                     mainLeftRowSet.set(tableLocation, RowSetFactory.fromKeys(rowKeyChunk.get(chunkPosition)));
                     mainRightRowKey.set(tableLocation, RowSet.NULL_ROW_KEY);
                     mainModifiedTrackerCookieSource.set(tableLocation, -1L);
                     break;
                 } else if (eq(mainKeySource0.getUnsafe(tableLocation), k0)) {
-                    if (rightRowKeyForState < RowSet.NULL_ROW_KEY) {
+                    if (rightRowKeyForState <= FIRST_DUPLICATE) {
                         throw new IllegalStateException("Natural Join found duplicate right key for " + extractKeyStringFromSourceTable(rowKeyChunk.get(chunkPosition)));
                     }
                     mainLeftRowSet.getUnsafe(tableLocation).insert(rowKeyChunk.get(chunkPosition));
@@ -96,8 +97,9 @@ protected void buildFromRightSide(RowSequence rowSequence, Chunk[] sourceKeyChun
             int tableLocation = firstTableLocation;
             MAIN_SEARCH: while (true) {
                 long existingRightRowKey = mainRightRowKey.getUnsafe(tableLocation);
-                if (existingRightRowKey == EMPTY_RIGHT_STATE) {
+                if (isStateEmpty(existingRightRowKey)) {
                     numEntries++;
+                    liveEntries++;
                     mainKeySource0.set(tableLocation, k0);
                     mainLeftRowSet.set(tableLocation, RowSetFactory.empty());
                     mainRightRowKey.set(tableLocation, rowKeyChunk.get(chunkPosition));
@@ -106,7 +108,7 @@ protected void buildFromRightSide(RowSequence rowSequence, Chunk[] sourceKeyChun
                 } else if (eq(mainKeySource0.getUnsafe(tableLocation), k0)) {
                     if (existingRightRowKey == RowSet.NULL_ROW_KEY) {
                         mainRightRowKey.set(tableLocation, rowKeyChunk.get(chunkPosition));
-                    } else if (existingRightRowKey < RowSet.NULL_ROW_KEY) {
+                    } else if (existingRightRowKey <= FIRST_DUPLICATE) {
                         final long duplicateLocation = duplicateLocationFromRowKey(existingRightRowKey);
                         rightSideDuplicateRowSets.getUnsafe(duplicateLocation).insert(rowKeyChunk.get(chunkPosition));
                     } else {
@@ -133,20 +135,27 @@ protected void addRightSide(RowSequence rowSequence, Chunk[] sourceKeyChunks,
             final int hash = hash(k0);
             final int firstTableLocation = hashToTableLocation(hash);
             int tableLocation = firstTableLocation;
+            int firstDeletedLocation = -1;
             MAIN_SEARCH: while (true) {
                 long existingRightRowKey = mainRightRowKey.getUnsafe(tableLocation);
-                if (existingRightRowKey == EMPTY_RIGHT_STATE) {
+                if (firstDeletedLocation < 0 && isStateDeleted(existingRightRowKey)) {
+                    firstDeletedLocation = tableLocation;
+                }
+                if (isStateEmpty(existingRightRowKey)) {
                     final int firstAlternateTableLocation = hashToTableLocationAlternate(hash);
                     int alternateTableLocation = firstAlternateTableLocation;
                     while (alternateTableLocation < rehashPointer) {
                         existingRightRowKey = alternateRightRowKey.getUnsafe(alternateTableLocation);
-                        if (existingRightRowKey == EMPTY_RIGHT_STATE) {
+                        if (isStateEmpty(existingRightRowKey)) {
                             break;
                         } else if (eq(alternateKeySource0.getUnsafe(alternateTableLocation), k0)) {
+                            if (isStateDeleted(existingRightRowKey)) {
+                                break;
+                            }
                             if (existingRightRowKey == RowSet.NULL_ROW_KEY) {
                                 alternateRightRowKey.set(alternateTableLocation, rowKeyChunk.get(chunkPosition));
                                 alternateModifiedTrackerCookieSource.set(alternateTableLocation, modifiedSlotTracker.addMain(alternateModifiedTrackerCookieSource.getUnsafe(alternateTableLocation), alternateInsertMask | alternateTableLocation, existingRightRowKey, NaturalJoinModifiedSlotTracker.FLAG_RIGHT_CHANGE));
-                            } else if (existingRightRowKey < RowSet.NULL_ROW_KEY) {
+                            } else if (existingRightRowKey <= FIRST_DUPLICATE) {
                                 final long duplicateLocation = duplicateLocationFromRowKey(existingRightRowKey);
                                 final WritableRowSet duplicates = rightSideDuplicateRowSets.getUnsafe(duplicateLocation);
                                 final long duplicateSize = duplicates.size();
@@ -164,17 +173,31 @@ protected void addRightSide(RowSequence rowSequence, Chunk[] sourceKeyChunks,
                             Assert.neq(alternateTableLocation, "alternateTableLocation", firstAlternateTableLocation, "firstAlternateTableLocation");
                         }
                     }
-                    numEntries++;
+                    if (firstDeletedLocation >= 0) {
+                        tableLocation = firstDeletedLocation;
+                    } else {
+                        numEntries++;
+                    }
+                    liveEntries++;
                     mainKeySource0.set(tableLocation, k0);
                     mainLeftRowSet.set(tableLocation, RowSetFactory.empty());
                     mainRightRowKey.set(tableLocation, rowKeyChunk.get(chunkPosition));
                     mainModifiedTrackerCookieSource.set(tableLocation, modifiedSlotTracker.addMain(-1, mainInsertMask | tableLocation, existingRightRowKey, NaturalJoinModifiedSlotTracker.FLAG_RIGHT_CHANGE));
                     break;
                 } else if (eq(mainKeySource0.getUnsafe(tableLocation), k0)) {
+                    if (isStateDeleted(existingRightRowKey)) {
+                        tableLocation = firstDeletedLocation;
+                        liveEntries++;
+                        mainKeySource0.set(tableLocation, k0);
+                        mainLeftRowSet.set(tableLocation, RowSetFactory.empty());
+                        mainRightRowKey.set(tableLocation, rowKeyChunk.get(chunkPosition));
+                        mainModifiedTrackerCookieSource.set(tableLocation, modifiedSlotTracker.addMain(-1, mainInsertMask | tableLocation, existingRightRowKey, NaturalJoinModifiedSlotTracker.FLAG_RIGHT_CHANGE));
+                        break;
+                    }
                     if (existingRightRowKey == RowSet.NULL_ROW_KEY) {
                         mainRightRowKey.set(tableLocation, rowKeyChunk.get(chunkPosition));
                         mainModifiedTrackerCookieSource.set(tableLocation, modifiedSlotTracker.addMain(mainModifiedTrackerCookieSource.getUnsafe(tableLocation), mainInsertMask | tableLocation, existingRightRowKey, NaturalJoinModifiedSlotTracker.FLAG_RIGHT_CHANGE));
-                    } else if (existingRightRowKey < RowSet.NULL_ROW_KEY) {
+                    } else if (existingRightRowKey <= FIRST_DUPLICATE) {
                         final long duplicateLocation = duplicateLocationFromRowKey(existingRightRowKey);
                         final WritableRowSet duplicates = rightSideDuplicateRowSets.getUnsafe(duplicateLocation);
                         final long duplicateSize = duplicates.size();
@@ -205,17 +228,24 @@ protected void addLeftSide(RowSequence rowSequence, Chunk[] sourceKeyChunks,
             final int hash = hash(k0);
             final int firstTableLocation = hashToTableLocation(hash);
             int tableLocation = firstTableLocation;
+            int firstDeletedLocation = -1;
             MAIN_SEARCH: while (true) {
                 long rightRowKeyForState = mainRightRowKey.getUnsafe(tableLocation);
-                if (rightRowKeyForState == EMPTY_RIGHT_STATE) {
+                if (firstDeletedLocation < 0 && isStateDeleted(rightRowKeyForState)) {
+                    firstDeletedLocation = tableLocation;
+                }
+                if (isStateEmpty(rightRowKeyForState)) {
                     final int firstAlternateTableLocation = hashToTableLocationAlternate(hash);
                     int alternateTableLocation = firstAlternateTableLocation;
                     while (alternateTableLocation < rehashPointer) {
                         rightRowKeyForState = alternateRightRowKey.getUnsafe(alternateTableLocation);
-                        if (rightRowKeyForState == EMPTY_RIGHT_STATE) {
+                        if (isStateEmpty(rightRowKeyForState)) {
                             break;
                         } else if (eq(alternateKeySource0.getUnsafe(alternateTableLocation), k0)) {
-                            if (rightRowKeyForState < RowSet.NULL_ROW_KEY) {
+                            if (isStateDeleted(rightRowKeyForState)) {
+                                break;
+                            }
+                            if (rightRowKeyForState <= FIRST_DUPLICATE) {
                                 throw new IllegalStateException("Natural Join found duplicate right key for " + extractKeyStringFromSourceTable(rowKeyChunk.get(chunkPosition)));
                             }
                             alternateLeftRowSet.getUnsafe(alternateTableLocation).insert(rowKeyChunk.get(chunkPosition));
@@ -226,7 +256,12 @@ protected void addLeftSide(RowSequence rowSequence, Chunk[] sourceKeyChunks,
                             Assert.neq(alternateTableLocation, "alternateTableLocation", firstAlternateTableLocation, "firstAlternateTableLocation");
                         }
                     }
-                    numEntries++;
+                    if (firstDeletedLocation >= 0) {
+                        tableLocation = firstDeletedLocation;
+                    } else {
+                        numEntries++;
+                    }
+                    liveEntries++;
                     mainKeySource0.set(tableLocation, k0);
                     mainLeftRowSet.set(tableLocation, RowSetFactory.fromKeys(rowKeyChunk.get(chunkPosition)));
                     mainRightRowKey.set(tableLocation, RowSet.NULL_ROW_KEY);
@@ -234,7 +269,17 @@ protected void addLeftSide(RowSequence rowSequence, Chunk[] sourceKeyChunks,
                     leftRedirections.set(leftRedirectionOffset++, RowSet.NULL_ROW_KEY);
                     break;
                 } else if (eq(mainKeySource0.getUnsafe(tableLocation), k0)) {
-                    if (rightRowKeyForState < RowSet.NULL_ROW_KEY) {
+                    if (isStateDeleted(rightRowKeyForState)) {
+                        tableLocation = firstDeletedLocation;
+                        liveEntries++;
+                        mainKeySource0.set(tableLocation, k0);
+                        mainLeftRowSet.set(tableLocation, RowSetFactory.fromKeys(rowKeyChunk.get(chunkPosition)));
+                        mainRightRowKey.set(tableLocation, RowSet.NULL_ROW_KEY);
+                        mainModifiedTrackerCookieSource.set(tableLocation, -1L);
+                        leftRedirections.set(leftRedirectionOffset++, RowSet.NULL_ROW_KEY);
+                        break;
+                    }
+                    if (rightRowKeyForState <= FIRST_DUPLICATE) {
                         throw new IllegalStateException("Natural Join found duplicate right key for " + extractKeyStringFromSourceTable(rowKeyChunk.get(chunkPosition)));
                     }
                     mainLeftRowSet.getUnsafe(tableLocation).insert(rowKeyChunk.get(chunkPosition));
@@ -258,11 +303,16 @@ protected void removeRight(RowSequence rowSequence, Chunk[] sourceKeyChunks,
             final int hash = hash(k0);
             final int firstTableLocation = hashToTableLocation(hash);
             boolean found = false;
+            boolean searchAlternate = true;
             int tableLocation = firstTableLocation;
             long existingRightRowKey;
-            while ((existingRightRowKey = mainRightRowKey.getUnsafe(tableLocation)) != EMPTY_RIGHT_STATE) {
+            while (!isStateEmpty(existingRightRowKey = mainRightRowKey.getUnsafe(tableLocation))) {
                 if (eq(mainKeySource0.getUnsafe(tableLocation), k0)) {
-                    if (existingRightRowKey < RowSet.NULL_ROW_KEY) {
+                    if (isStateDeleted(existingRightRowKey)) {
+                        searchAlternate = false;
+                        break;
+                    }
+                    if (existingRightRowKey <= FIRST_DUPLICATE) {
                         final long duplicateLocation = duplicateLocationFromRowKey(existingRightRowKey);
                         final WritableRowSet duplicates = rightSideDuplicateRowSets.getUnsafe(duplicateLocation);
                         final long duplicateSize = duplicates.size();
@@ -275,7 +325,13 @@ protected void removeRight(RowSequence rowSequence, Chunk[] sourceKeyChunks,
                     } else if (existingRightRowKey != rowKeyChunk.get(chunkPosition)) {
                         Assert.statementNeverExecuted("Could not find existing right row in state");
                     } else {
-                        mainRightRowKey.set(tableLocation, RowSet.NULL_ROW_KEY);
+                        final boolean leftEmpty = mainLeftRowSet.getUnsafe(tableLocation).isEmpty();
+                        if (leftEmpty) {
+                            mainRightRowKey.set(tableLocation, TOMBSTONE_RIGHT_STATE);
+                            liveEntries--;
+                        } else {
+                            mainRightRowKey.set(tableLocation, RowSet.NULL_ROW_KEY);
+                        }
                         mainModifiedTrackerCookieSource.set(tableLocation, modifiedSlotTracker.addMain(mainModifiedTrackerCookieSource.getUnsafe(tableLocation), mainInsertMask | tableLocation, existingRightRowKey, NaturalJoinModifiedSlotTracker.FLAG_RIGHT_CHANGE));
                     }
                     found = true;
@@ -285,37 +341,50 @@ protected void removeRight(RowSequence rowSequence, Chunk[] sourceKeyChunks,
                 Assert.neq(tableLocation, "tableLocation", firstTableLocation, "firstTableLocation");
             }
             if (!found) {
-                final int firstAlternateTableLocation = hashToTableLocationAlternate(hash);
-                boolean alternateFound = false;
-                if (firstAlternateTableLocation < rehashPointer) {
-                    int alternateTableLocation = firstAlternateTableLocation;
-                    while ((existingRightRowKey = alternateRightRowKey.getUnsafe(alternateTableLocation)) != EMPTY_RIGHT_STATE) {
-                        if (eq(alternateKeySource0.getUnsafe(alternateTableLocation), k0)) {
-                            if (existingRightRowKey < RowSet.NULL_ROW_KEY) {
-                                final long duplicateLocation = duplicateLocationFromRowKey(existingRightRowKey);
-                                final WritableRowSet duplicates = rightSideDuplicateRowSets.getUnsafe(duplicateLocation);
-                                final long duplicateSize = duplicates.size();
-                                duplicates.remove(rowKeyChunk.get(chunkPosition));
-                                Assert.eq(duplicateSize, "duplicateSize", duplicates.size() + 1, "duplicates.size() + 1");
-                                if (duplicates.size() == 1) {
-                                    alternateRightRowKey.set(alternateTableLocation, duplicates.firstRowKey());
-                                    freeDuplicateLocation(duplicateLocation);
+                if (!searchAlternate) {
+                    throw Assert.statementNeverExecuted("Could not find existing state for removed right row");
+                } else {
+                    final int firstAlternateTableLocation = hashToTableLocationAlternate(hash);
+                    boolean alternateFound = false;
+                    if (firstAlternateTableLocation < rehashPointer) {
+                        int alternateTableLocation = firstAlternateTableLocation;
+                        while (!isStateEmpty(existingRightRowKey = alternateRightRowKey.getUnsafe(alternateTableLocation))) {
+                            if (eq(alternateKeySource0.getUnsafe(alternateTableLocation), k0)) {
+                                if (isStateDeleted(existingRightRowKey)) {
+                                    break;
                                 }
-                            } else if (existingRightRowKey != rowKeyChunk.get(chunkPosition)) {
-                                Assert.statementNeverExecuted("Could not find existing right row in state");
-                            } else {
-                                alternateRightRowKey.set(alternateTableLocation, RowSet.NULL_ROW_KEY);
-                                alternateModifiedTrackerCookieSource.set(alternateTableLocation, modifiedSlotTracker.addMain(alternateModifiedTrackerCookieSource.getUnsafe(alternateTableLocation), alternateInsertMask | alternateTableLocation, existingRightRowKey, NaturalJoinModifiedSlotTracker.FLAG_RIGHT_CHANGE));
+                                if (existingRightRowKey <= FIRST_DUPLICATE) {
+                                    final long duplicateLocation = duplicateLocationFromRowKey(existingRightRowKey);
+                                    final WritableRowSet duplicates = rightSideDuplicateRowSets.getUnsafe(duplicateLocation);
+                                    final long duplicateSize = duplicates.size();
+                                    duplicates.remove(rowKeyChunk.get(chunkPosition));
+                                    Assert.eq(duplicateSize, "duplicateSize", duplicates.size() + 1, "duplicates.size() + 1");
+                                    if (duplicates.size() == 1) {
+                                        alternateRightRowKey.set(alternateTableLocation, duplicates.firstRowKey());
+                                        freeDuplicateLocation(duplicateLocation);
+                                    }
+                                } else if (existingRightRowKey != rowKeyChunk.get(chunkPosition)) {
+                                    Assert.statementNeverExecuted("Could not find existing right row in state");
+                                } else {
+                                    final boolean leftEmpty = alternateLeftRowSet.getUnsafe(alternateTableLocation).isEmpty();
+                                    if (leftEmpty) {
+                                        alternateRightRowKey.set(alternateTableLocation, TOMBSTONE_RIGHT_STATE);
+                                        liveEntries--;
+                                    } else {
+                                        alternateRightRowKey.set(alternateTableLocation, RowSet.NULL_ROW_KEY);
+                                    }
+                                    alternateModifiedTrackerCookieSource.set(alternateTableLocation, modifiedSlotTracker.addMain(alternateModifiedTrackerCookieSource.getUnsafe(alternateTableLocation), alternateInsertMask | alternateTableLocation, existingRightRowKey, NaturalJoinModifiedSlotTracker.FLAG_RIGHT_CHANGE));
+                                }
+                                alternateFound = true;
+                                break;
                             }
-                            alternateFound = true;
-                            break;
+                            alternateTableLocation = alternateNextTableLocation(alternateTableLocation);
+                            Assert.neq(alternateTableLocation, "alternateTableLocation", firstAlternateTableLocation, "firstAlternateTableLocation");
                         }
-                        alternateTableLocation = alternateNextTableLocation(alternateTableLocation);
-                        Assert.neq(alternateTableLocation, "alternateTableLocation", firstAlternateTableLocation, "firstAlternateTableLocation");
                     }
-                }
-                if (!alternateFound) {
-                    throw Assert.statementNeverExecuted("Could not find existing state for removed right row");
+                    if (!alternateFound) {
+                        throw Assert.statementNeverExecuted("Could not find existing state for removed right row");
+                    }
                 }
             }
         }
@@ -330,10 +399,15 @@ protected void modifyByRight(RowSequence rowSequence, Chunk[] sourceKeyChunks,
             final int hash = hash(k0);
             final int firstTableLocation = hashToTableLocation(hash);
             boolean found = false;
+            boolean searchAlternate = true;
             int tableLocation = firstTableLocation;
             long existingRightRowKey;
-            while ((existingRightRowKey = mainRightRowKey.getUnsafe(tableLocation)) != EMPTY_RIGHT_STATE) {
+            while (!isStateEmpty(existingRightRowKey = mainRightRowKey.getUnsafe(tableLocation))) {
                 if (eq(mainKeySource0.getUnsafe(tableLocation), k0)) {
+                    if (isStateDeleted(existingRightRowKey)) {
+                        searchAlternate = false;
+                        break;
+                    }
                     mainModifiedTrackerCookieSource.set(tableLocation, modifiedSlotTracker.addMain(mainModifiedTrackerCookieSource.getUnsafe(tableLocation), mainInsertMask | tableLocation, existingRightRowKey, NaturalJoinModifiedSlotTracker.FLAG_RIGHT_CHANGE));
                     found = true;
                     break;
@@ -342,22 +416,29 @@ protected void modifyByRight(RowSequence rowSequence, Chunk[] sourceKeyChunks,
                 Assert.neq(tableLocation, "tableLocation", firstTableLocation, "firstTableLocation");
             }
             if (!found) {
-                final int firstAlternateTableLocation = hashToTableLocationAlternate(hash);
-                boolean alternateFound = false;
-                if (firstAlternateTableLocation < rehashPointer) {
-                    int alternateTableLocation = firstAlternateTableLocation;
-                    while ((existingRightRowKey = alternateRightRowKey.getUnsafe(alternateTableLocation)) != EMPTY_RIGHT_STATE) {
-                        if (eq(alternateKeySource0.getUnsafe(alternateTableLocation), k0)) {
-                            alternateModifiedTrackerCookieSource.set(alternateTableLocation, modifiedSlotTracker.addMain(alternateModifiedTrackerCookieSource.getUnsafe(alternateTableLocation), alternateInsertMask | alternateTableLocation, existingRightRowKey, NaturalJoinModifiedSlotTracker.FLAG_RIGHT_CHANGE));
-                            alternateFound = true;
-                            break;
+                if (!searchAlternate) {
+                    throw Assert.statementNeverExecuted("Could not find existing state for modified right row");
+                } else {
+                    final int firstAlternateTableLocation = hashToTableLocationAlternate(hash);
+                    boolean alternateFound = false;
+                    if (firstAlternateTableLocation < rehashPointer) {
+                        int alternateTableLocation = firstAlternateTableLocation;
+                        while (!isStateEmpty(existingRightRowKey = alternateRightRowKey.getUnsafe(alternateTableLocation))) {
+                            if (eq(alternateKeySource0.getUnsafe(alternateTableLocation), k0)) {
+                                if (isStateDeleted(existingRightRowKey)) {
+                                    break;
+                                }
+                                alternateModifiedTrackerCookieSource.set(alternateTableLocation, modifiedSlotTracker.addMain(alternateModifiedTrackerCookieSource.getUnsafe(alternateTableLocation), alternateInsertMask | alternateTableLocation, existingRightRowKey, NaturalJoinModifiedSlotTracker.FLAG_RIGHT_CHANGE));
+                                alternateFound = true;
+                                break;
+                            }
+                            alternateTableLocation = alternateNextTableLocation(alternateTableLocation);
+                            Assert.neq(alternateTableLocation, "alternateTableLocation", firstAlternateTableLocation, "firstAlternateTableLocation");
                         }
-                        alternateTableLocation = alternateNextTableLocation(alternateTableLocation);
-                        Assert.neq(alternateTableLocation, "alternateTableLocation", firstAlternateTableLocation, "firstAlternateTableLocation");
                     }
-                }
-                if (!alternateFound) {
-                    throw Assert.statementNeverExecuted("Could not find existing state for modified right row");
+                    if (!alternateFound) {
+                        throw Assert.statementNeverExecuted("Could not find existing state for modified right row");
+                    }
                 }
             }
         }
@@ -374,15 +455,20 @@ protected void applyRightShift(RowSequence rowSequence, Chunk[] sourceKeyChunks,
             final int hash = hash(k0);
             final int firstTableLocation = hashToTableLocation(hash);
             boolean found = false;
+            boolean searchAlternate = true;
             int tableLocation = firstTableLocation;
             long existingRightRowKey;
-            while ((existingRightRowKey = mainRightRowKey.getUnsafe(tableLocation)) != EMPTY_RIGHT_STATE) {
+            while (!isStateEmpty(existingRightRowKey = mainRightRowKey.getUnsafe(tableLocation))) {
                 if (eq(mainKeySource0.getUnsafe(tableLocation), k0)) {
+                    if (isStateDeleted(existingRightRowKey)) {
+                        searchAlternate = false;
+                        break;
+                    }
                     final long keyToShift = rowKeyChunk.get(chunkPosition);
                     if (existingRightRowKey == keyToShift - shiftDelta) {
                         mainRightRowKey.set(tableLocation, keyToShift);
                         mainModifiedTrackerCookieSource.set(tableLocation, modifiedSlotTracker.addMain(mainModifiedTrackerCookieSource.getUnsafe(tableLocation), mainInsertMask | tableLocation, existingRightRowKey, NaturalJoinModifiedSlotTracker.FLAG_RIGHT_SHIFT));
-                    } else if (existingRightRowKey < RowSet.NULL_ROW_KEY) {
+                    } else if (existingRightRowKey <= FIRST_DUPLICATE) {
                         final long duplicateLocation = duplicateLocationFromRowKey(existingRightRowKey);
                         if (shiftDelta < 0) {
                             final WritableRowSet duplicates = rightSideDuplicateRowSets.getUnsafe(duplicateLocation);
@@ -401,37 +487,44 @@ protected void applyRightShift(RowSequence rowSequence, Chunk[] sourceKeyChunks,
                 Assert.neq(tableLocation, "tableLocation", firstTableLocation, "firstTableLocation");
             }
             if (!found) {
-                final int firstAlternateTableLocation = hashToTableLocationAlternate(hash);
-                boolean alternateFound = false;
-                if (firstAlternateTableLocation < rehashPointer) {
-                    int alternateTableLocation = firstAlternateTableLocation;
-                    while ((existingRightRowKey = alternateRightRowKey.getUnsafe(alternateTableLocation)) != EMPTY_RIGHT_STATE) {
-                        if (eq(alternateKeySource0.getUnsafe(alternateTableLocation), k0)) {
-                            final long keyToShift = rowKeyChunk.get(chunkPosition);
-                            if (existingRightRowKey == keyToShift - shiftDelta) {
-                                alternateRightRowKey.set(alternateTableLocation, keyToShift);
-                                alternateModifiedTrackerCookieSource.set(alternateTableLocation, modifiedSlotTracker.addMain(alternateModifiedTrackerCookieSource.getUnsafe(alternateTableLocation), alternateInsertMask | alternateTableLocation, existingRightRowKey, NaturalJoinModifiedSlotTracker.FLAG_RIGHT_SHIFT));
-                            } else if (existingRightRowKey < RowSet.NULL_ROW_KEY) {
-                                final long duplicateLocation = duplicateLocationFromRowKey(existingRightRowKey);
-                                if (shiftDelta < 0) {
-                                    final WritableRowSet duplicates = rightSideDuplicateRowSets.getUnsafe(duplicateLocation);
-                                    shiftOneKey(duplicates, keyToShift, shiftDelta);
+                if (!searchAlternate) {
+                    throw Assert.statementNeverExecuted("Could not find existing state for shifted right row");
+                } else {
+                    final int firstAlternateTableLocation = hashToTableLocationAlternate(hash);
+                    boolean alternateFound = false;
+                    if (firstAlternateTableLocation < rehashPointer) {
+                        int alternateTableLocation = firstAlternateTableLocation;
+                        while (!isStateEmpty(existingRightRowKey = alternateRightRowKey.getUnsafe(alternateTableLocation))) {
+                            if (eq(alternateKeySource0.getUnsafe(alternateTableLocation), k0)) {
+                                if (isStateDeleted(existingRightRowKey)) {
+                                    break;
+                                }
+                                final long keyToShift = rowKeyChunk.get(chunkPosition);
+                                if (existingRightRowKey == keyToShift - shiftDelta) {
+                                    alternateRightRowKey.set(alternateTableLocation, keyToShift);
+                                    alternateModifiedTrackerCookieSource.set(alternateTableLocation, modifiedSlotTracker.addMain(alternateModifiedTrackerCookieSource.getUnsafe(alternateTableLocation), alternateInsertMask | alternateTableLocation, existingRightRowKey, NaturalJoinModifiedSlotTracker.FLAG_RIGHT_SHIFT));
+                                } else if (existingRightRowKey <= FIRST_DUPLICATE) {
+                                    final long duplicateLocation = duplicateLocationFromRowKey(existingRightRowKey);
+                                    if (shiftDelta < 0) {
+                                        final WritableRowSet duplicates = rightSideDuplicateRowSets.getUnsafe(duplicateLocation);
+                                        shiftOneKey(duplicates, keyToShift, shiftDelta);
+                                    } else {
+                                        pc.pendingShifts.set(pc.pendingShiftPointer++, (long)duplicateLocation);
+                                        pc.pendingShifts.set(pc.pendingShiftPointer++, keyToShift);
+                                    }
                                 } else {
-                                    pc.pendingShifts.set(pc.pendingShiftPointer++, (long)duplicateLocation);
-                                    pc.pendingShifts.set(pc.pendingShiftPointer++, keyToShift);
+                                    throw Assert.statementNeverExecuted("Could not find existing index for shifted right row");
                                 }
-                            } else {
-                                throw Assert.statementNeverExecuted("Could not find existing index for shifted right row");
+                                alternateFound = true;
+                                break;
                             }
-                            alternateFound = true;
-                            break;
+                            alternateTableLocation = alternateNextTableLocation(alternateTableLocation);
+                            Assert.neq(alternateTableLocation, "alternateTableLocation", firstAlternateTableLocation, "firstAlternateTableLocation");
                         }
-                        alternateTableLocation = alternateNextTableLocation(alternateTableLocation);
-                        Assert.neq(alternateTableLocation, "alternateTableLocation", firstAlternateTableLocation, "firstAlternateTableLocation");
                     }
-                }
-                if (!alternateFound) {
-                    throw Assert.statementNeverExecuted("Could not find existing state for shifted right row");
+                    if (!alternateFound) {
+                        throw Assert.statementNeverExecuted("Could not find existing state for shifted right row");
+                    }
                 }
             }
         }
@@ -446,10 +539,21 @@ protected void removeLeft(RowSequence rowSequence, Chunk[] sourceKeyChunks) {
             final int hash = hash(k0);
             final int firstTableLocation = hashToTableLocation(hash);
             boolean found = false;
+            boolean searchAlternate = true;
             int tableLocation = firstTableLocation;
-            while (mainRightRowKey.getUnsafe(tableLocation) != EMPTY_RIGHT_STATE) {
+            long rightState;
+            while (!isStateEmpty(rightState = mainRightRowKey.getUnsafe(tableLocation))) {
                 if (eq(mainKeySource0.getUnsafe(tableLocation), k0)) {
-                    mainLeftRowSet.getUnsafe(tableLocation).remove(rowKeyChunk.get(chunkPosition));
+                    if (isStateDeleted(rightState)) {
+                        searchAlternate = false;
+                        break;
+                    }
+                    final WritableRowSet left = mainLeftRowSet.getUnsafe(tableLocation);
+                    left.remove(rowKeyChunk.get(chunkPosition));
+                    if (left.isEmpty() && rightState == RowSet.NULL_ROW_KEY) {
+                        mainRightRowKey.set(tableLocation, TOMBSTONE_RIGHT_STATE);
+                        liveEntries--;
+                    }
                     found = true;
                     break;
                 }
@@ -457,22 +561,34 @@ protected void removeLeft(RowSequence rowSequence, Chunk[] sourceKeyChunks) {
                 Assert.neq(tableLocation, "tableLocation", firstTableLocation, "firstTableLocation");
             }
             if (!found) {
-                final int firstAlternateTableLocation = hashToTableLocationAlternate(hash);
-                boolean alternateFound = false;
-                if (firstAlternateTableLocation < rehashPointer) {
-                    int alternateTableLocation = firstAlternateTableLocation;
-                    while (alternateRightRowKey.getUnsafe(alternateTableLocation) != EMPTY_RIGHT_STATE) {
-                        if (eq(alternateKeySource0.getUnsafe(alternateTableLocation), k0)) {
-                            alternateLeftRowSet.getUnsafe(alternateTableLocation).remove(rowKeyChunk.get(chunkPosition));
-                            alternateFound = true;
-                            break;
+                if (!searchAlternate) {
+                    throw Assert.statementNeverExecuted("Could not find existing state for removed left row");
+                } else {
+                    final int firstAlternateTableLocation = hashToTableLocationAlternate(hash);
+                    boolean alternateFound = false;
+                    if (firstAlternateTableLocation < rehashPointer) {
+                        int alternateTableLocation = firstAlternateTableLocation;
+                        while (!isStateEmpty(rightState = alternateRightRowKey.getUnsafe(alternateTableLocation))) {
+                            if (eq(alternateKeySource0.getUnsafe(alternateTableLocation), k0)) {
+                                if (isStateDeleted(rightState)) {
+                                    break;
+                                }
+                                final WritableRowSet left = alternateLeftRowSet.getUnsafe(alternateTableLocation);
+                                left.remove(rowKeyChunk.get(chunkPosition));
+                                if (left.isEmpty() && rightState == RowSet.NULL_ROW_KEY) {
+                                    alternateRightRowKey.set(alternateTableLocation, TOMBSTONE_RIGHT_STATE);
+                                    liveEntries--;
+                                }
+                                alternateFound = true;
+                                break;
+                            }
+                            alternateTableLocation = alternateNextTableLocation(alternateTableLocation);
+                            Assert.neq(alternateTableLocation, "alternateTableLocation", firstAlternateTableLocation, "firstAlternateTableLocation");
                         }
-                        alternateTableLocation = alternateNextTableLocation(alternateTableLocation);
-                        Assert.neq(alternateTableLocation, "alternateTableLocation", firstAlternateTableLocation, "firstAlternateTableLocation");
                     }
-                }
-                if (!alternateFound) {
-                    throw Assert.statementNeverExecuted("Could not find existing state for removed left row");
+                    if (!alternateFound) {
+                        throw Assert.statementNeverExecuted("Could not find existing state for removed left row");
+                    }
                 }
             }
         }
@@ -488,9 +604,15 @@ protected void applyLeftShift(RowSequence rowSequence, Chunk[] sourceKeyChunks,
             final int hash = hash(k0);
             final int firstTableLocation = hashToTableLocation(hash);
             boolean found = false;
+            boolean searchAlternate = true;
             int tableLocation = firstTableLocation;
-            while (mainRightRowKey.getUnsafe(tableLocation) != EMPTY_RIGHT_STATE) {
+            long stateValue;
+            while (!isStateEmpty(stateValue = mainRightRowKey.getUnsafe(tableLocation))) {
                 if (eq(mainKeySource0.getUnsafe(tableLocation), k0)) {
+                    if (isStateDeleted(stateValue)) {
+                        searchAlternate = false;
+                        break;
+                    }
                     final WritableRowSet leftRowSetForState = mainLeftRowSet.getUnsafe(tableLocation);
                     final long keyToShift = rowKeyChunk.get(chunkPosition);
                     if (shiftDelta < 0) {
@@ -506,29 +628,36 @@ protected void applyLeftShift(RowSequence rowSequence, Chunk[] sourceKeyChunks,
                 Assert.neq(tableLocation, "tableLocation", firstTableLocation, "firstTableLocation");
             }
             if (!found) {
-                final int firstAlternateTableLocation = hashToTableLocationAlternate(hash);
-                boolean alternateFound = false;
-                if (firstAlternateTableLocation < rehashPointer) {
-                    int alternateTableLocation = firstAlternateTableLocation;
-                    while (alternateRightRowKey.getUnsafe(alternateTableLocation) != EMPTY_RIGHT_STATE) {
-                        if (eq(alternateKeySource0.getUnsafe(alternateTableLocation), k0)) {
-                            final WritableRowSet leftRowSetForState = alternateLeftRowSet.getUnsafe(alternateTableLocation);
-                            final long keyToShift = rowKeyChunk.get(chunkPosition);
-                            if (shiftDelta < 0) {
-                                shiftOneKey(leftRowSetForState, keyToShift, shiftDelta);
-                            } else {
-                                pc.pendingShifts.set(pc.pendingShiftPointer++, (long)(AlternatingColumnSource.ALTERNATE_SWITCH_MASK | alternateTableLocation));
-                                pc.pendingShifts.set(pc.pendingShiftPointer++, keyToShift);
+                if (!searchAlternate) {
+                    throw Assert.statementNeverExecuted("Could not find existing state for shifted left row");
+                } else {
+                    final int firstAlternateTableLocation = hashToTableLocationAlternate(hash);
+                    boolean alternateFound = false;
+                    if (firstAlternateTableLocation < rehashPointer) {
+                        int alternateTableLocation = firstAlternateTableLocation;
+                        while (!isStateEmpty(stateValue = alternateRightRowKey.getUnsafe(alternateTableLocation))) {
+                            if (eq(alternateKeySource0.getUnsafe(alternateTableLocation), k0)) {
+                                if (isStateDeleted(stateValue)) {
+                                    break;
+                                }
+                                final WritableRowSet leftRowSetForState = alternateLeftRowSet.getUnsafe(alternateTableLocation);
+                                final long keyToShift = rowKeyChunk.get(chunkPosition);
+                                if (shiftDelta < 0) {
+                                    shiftOneKey(leftRowSetForState, keyToShift, shiftDelta);
+                                } else {
+                                    pc.pendingShifts.set(pc.pendingShiftPointer++, (long)(AlternatingColumnSource.ALTERNATE_SWITCH_MASK | alternateTableLocation));
+                                    pc.pendingShifts.set(pc.pendingShiftPointer++, keyToShift);
+                                }
+                                alternateFound = true;
+                                break;
                             }
-                            alternateFound = true;
-                            break;
+                            alternateTableLocation = alternateNextTableLocation(alternateTableLocation);
+                            Assert.neq(alternateTableLocation, "alternateTableLocation", firstAlternateTableLocation, "firstAlternateTableLocation");
                         }
-                        alternateTableLocation = alternateNextTableLocation(alternateTableLocation);
-                        Assert.neq(alternateTableLocation, "alternateTableLocation", firstAlternateTableLocation, "firstAlternateTableLocation");
                     }
-                }
-                if (!alternateFound) {
-                    throw Assert.statementNeverExecuted("Could not find existing state for shifted left row");
+                    if (!alternateFound) {
+                        throw Assert.statementNeverExecuted("Could not find existing state for shifted left row");
+                    }
                 }
             }
         }
@@ -539,16 +668,30 @@ private static int hash(Object k0) {
         return hash;
     }
 
-    private boolean migrateOneLocation(int locationToMigrate,
+    private static boolean isStateEmpty(long state) {
+        return state == EMPTY_RIGHT_STATE;
+    }
+
+    private static boolean isStateDeleted(long state) {
+        return state == TOMBSTONE_RIGHT_STATE;
+    }
+
+    private boolean migrateOneLocation(int locationToMigrate, boolean trueOnDeletedEntry,
             NaturalJoinModifiedSlotTracker modifiedSlotTracker) {
         final long currentStateValue = alternateRightRowKey.getUnsafe(locationToMigrate);
-        if (currentStateValue == EMPTY_RIGHT_STATE) {
+        if (isStateEmpty(currentStateValue)) {
             return false;
         }
+        if (isStateDeleted(currentStateValue)) {
+            alternateEntries--;
+            alternateRightRowKey.set(locationToMigrate, EMPTY_RIGHT_STATE);
+            return trueOnDeletedEntry;
+        }
         final Object k0 = alternateKeySource0.getUnsafe(locationToMigrate);
         final int hash = hash(k0);
         int destinationTableLocation = hashToTableLocation(hash);
-        while (mainRightRowKey.getUnsafe(destinationTableLocation) != EMPTY_RIGHT_STATE) {
+        long candidateState;
+        while (!isStateEmpty(candidateState = mainRightRowKey.getUnsafe(destinationTableLocation)) && !isStateDeleted(candidateState)) {
             destinationTableLocation = nextTableLocation(destinationTableLocation);
         }
         mainKeySource0.set(destinationTableLocation, k0);
@@ -561,6 +704,10 @@ private boolean migrateOneLocation(int locationToMigrate,
         alternateModifiedTrackerCookieSource.set(locationToMigrate, -1L);
         modifiedSlotTracker.moveTableLocation(cookie, locationToMigrate, mainInsertMask | destinationTableLocation);;
         alternateRightRowKey.set(locationToMigrate, EMPTY_RIGHT_STATE);
+        if (!isStateDeleted(candidateState)) {
+            numEntries++;
+        }
+        alternateEntries--;
         return true;
     }
 
@@ -569,7 +716,7 @@ protected int rehashInternalPartial(int entriesToRehash,
             NaturalJoinModifiedSlotTracker modifiedSlotTracker) {
         int rehashedEntries = 0;
         while (rehashPointer > 0 && rehashedEntries < entriesToRehash) {
-            if (migrateOneLocation(--rehashPointer, modifiedSlotTracker)) {
+            if (migrateOneLocation(--rehashPointer, false, modifiedSlotTracker)) {
                 rehashedEntries++;
             }
         }
@@ -577,8 +724,7 @@ protected int rehashInternalPartial(int entriesToRehash,
     }
 
     @Override
-    protected void newAlternate() {
-        super.newAlternate();
+    protected void adviseNewAlternate() {
         this.mainKeySource0 = (ImmutableObjectArraySource)super.mainKeySources[0];
         this.alternateKeySource0 = (ImmutableObjectArraySource)super.alternateKeySources[0];
     }
@@ -592,7 +738,7 @@ protected void clearAlternate() {
     @Override
     protected void migrateFront(NaturalJoinModifiedSlotTracker modifiedSlotTracker) {
         int location = 0;
-        while (migrateOneLocation(location++, modifiedSlotTracker));
+        while (migrateOneLocation(location++, true, modifiedSlotTracker) && location < alternateTableSize);
     }
 
     @Override
@@ -612,7 +758,7 @@ protected void rehashInternalFull(final int oldSize) {
         mainModifiedTrackerCookieSource.setArray(destModifiedCookie);
         for (int sourceBucket = 0; sourceBucket < oldSize; ++sourceBucket) {
             final long currentStateValue = originalStateArray[sourceBucket];
-            if (currentStateValue == EMPTY_RIGHT_STATE) {
+            if (isStateEmpty(currentStateValue)) {
                 continue;
             }
             final Object k0 = originalKeyArray0[sourceBucket];
@@ -620,7 +766,7 @@ protected void rehashInternalFull(final int oldSize) {
             final int firstDestinationTableLocation = hashToTableLocation(hash);
             int destinationTableLocation = firstDestinationTableLocation;
             while (true) {
-                if (destState[destinationTableLocation] == EMPTY_RIGHT_STATE) {
+                if (isStateEmpty(destState[destinationTableLocation])) {
                     destKeyArray0[destinationTableLocation] = k0;
                     destState[destinationTableLocation] = originalStateArray[sourceBucket];
                     destLeftRowSet[destinationTableLocation] = oldLeftRowSet[sourceBucket];
diff --git a/engine/table/src/main/java/io/deephaven/engine/table/impl/naturaljoin/typed/incopen/gen/IncrementalNaturalJoinHasherShort.java b/engine/table/src/main/java/io/deephaven/engine/table/impl/naturaljoin/typed/incopen/gen/IncrementalNaturalJoinHasherShort.java
index b6073073e36..f7f33edc499 100644
--- a/engine/table/src/main/java/io/deephaven/engine/table/impl/naturaljoin/typed/incopen/gen/IncrementalNaturalJoinHasherShort.java
+++ b/engine/table/src/main/java/io/deephaven/engine/table/impl/naturaljoin/typed/incopen/gen/IncrementalNaturalJoinHasherShort.java
@@ -62,15 +62,16 @@ protected void buildFromLeftSide(RowSequence rowSequence, Chunk[] sourceKeyChunk
             int tableLocation = firstTableLocation;
             MAIN_SEARCH: while (true) {
                 long rightRowKeyForState = mainRightRowKey.getUnsafe(tableLocation);
-                if (rightRowKeyForState == EMPTY_RIGHT_STATE) {
+                if (isStateEmpty(rightRowKeyForState)) {
                     numEntries++;
+                    liveEntries++;
                     mainKeySource0.set(tableLocation, k0);
                     mainLeftRowSet.set(tableLocation, RowSetFactory.fromKeys(rowKeyChunk.get(chunkPosition)));
                     mainRightRowKey.set(tableLocation, RowSet.NULL_ROW_KEY);
                     mainModifiedTrackerCookieSource.set(tableLocation, -1L);
                     break;
                 } else if (eq(mainKeySource0.getUnsafe(tableLocation), k0)) {
-                    if (rightRowKeyForState < RowSet.NULL_ROW_KEY) {
+                    if (rightRowKeyForState <= FIRST_DUPLICATE) {
                         throw new IllegalStateException("Natural Join found duplicate right key for " + extractKeyStringFromSourceTable(rowKeyChunk.get(chunkPosition)));
                     }
                     mainLeftRowSet.getUnsafe(tableLocation).insert(rowKeyChunk.get(chunkPosition));
@@ -95,8 +96,9 @@ protected void buildFromRightSide(RowSequence rowSequence, Chunk[] sourceKeyChun
             int tableLocation = firstTableLocation;
             MAIN_SEARCH: while (true) {
                 long existingRightRowKey = mainRightRowKey.getUnsafe(tableLocation);
-                if (existingRightRowKey == EMPTY_RIGHT_STATE) {
+                if (isStateEmpty(existingRightRowKey)) {
                     numEntries++;
+                    liveEntries++;
                     mainKeySource0.set(tableLocation, k0);
                     mainLeftRowSet.set(tableLocation, RowSetFactory.empty());
                     mainRightRowKey.set(tableLocation, rowKeyChunk.get(chunkPosition));
@@ -105,7 +107,7 @@ protected void buildFromRightSide(RowSequence rowSequence, Chunk[] sourceKeyChun
                 } else if (eq(mainKeySource0.getUnsafe(tableLocation), k0)) {
                     if (existingRightRowKey == RowSet.NULL_ROW_KEY) {
                         mainRightRowKey.set(tableLocation, rowKeyChunk.get(chunkPosition));
-                    } else if (existingRightRowKey < RowSet.NULL_ROW_KEY) {
+                    } else if (existingRightRowKey <= FIRST_DUPLICATE) {
                         final long duplicateLocation = duplicateLocationFromRowKey(existingRightRowKey);
                         rightSideDuplicateRowSets.getUnsafe(duplicateLocation).insert(rowKeyChunk.get(chunkPosition));
                     } else {
@@ -132,20 +134,27 @@ protected void addRightSide(RowSequence rowSequence, Chunk[] sourceKeyChunks,
             final int hash = hash(k0);
             final int firstTableLocation = hashToTableLocation(hash);
             int tableLocation = firstTableLocation;
+            int firstDeletedLocation = -1;
             MAIN_SEARCH: while (true) {
                 long existingRightRowKey = mainRightRowKey.getUnsafe(tableLocation);
-                if (existingRightRowKey == EMPTY_RIGHT_STATE) {
+                if (firstDeletedLocation < 0 && isStateDeleted(existingRightRowKey)) {
+                    firstDeletedLocation = tableLocation;
+                }
+                if (isStateEmpty(existingRightRowKey)) {
                     final int firstAlternateTableLocation = hashToTableLocationAlternate(hash);
                     int alternateTableLocation = firstAlternateTableLocation;
                     while (alternateTableLocation < rehashPointer) {
                         existingRightRowKey = alternateRightRowKey.getUnsafe(alternateTableLocation);
-                        if (existingRightRowKey == EMPTY_RIGHT_STATE) {
+                        if (isStateEmpty(existingRightRowKey)) {
                             break;
                         } else if (eq(alternateKeySource0.getUnsafe(alternateTableLocation), k0)) {
+                            if (isStateDeleted(existingRightRowKey)) {
+                                break;
+                            }
                             if (existingRightRowKey == RowSet.NULL_ROW_KEY) {
                                 alternateRightRowKey.set(alternateTableLocation, rowKeyChunk.get(chunkPosition));
                                 alternateModifiedTrackerCookieSource.set(alternateTableLocation, modifiedSlotTracker.addMain(alternateModifiedTrackerCookieSource.getUnsafe(alternateTableLocation), alternateInsertMask | alternateTableLocation, existingRightRowKey, NaturalJoinModifiedSlotTracker.FLAG_RIGHT_CHANGE));
-                            } else if (existingRightRowKey < RowSet.NULL_ROW_KEY) {
+                            } else if (existingRightRowKey <= FIRST_DUPLICATE) {
                                 final long duplicateLocation = duplicateLocationFromRowKey(existingRightRowKey);
                                 final WritableRowSet duplicates = rightSideDuplicateRowSets.getUnsafe(duplicateLocation);
                                 final long duplicateSize = duplicates.size();
@@ -163,17 +172,31 @@ protected void addRightSide(RowSequence rowSequence, Chunk[] sourceKeyChunks,
                             Assert.neq(alternateTableLocation, "alternateTableLocation", firstAlternateTableLocation, "firstAlternateTableLocation");
                         }
                     }
-                    numEntries++;
+                    if (firstDeletedLocation >= 0) {
+                        tableLocation = firstDeletedLocation;
+                    } else {
+                        numEntries++;
+                    }
+                    liveEntries++;
                     mainKeySource0.set(tableLocation, k0);
                     mainLeftRowSet.set(tableLocation, RowSetFactory.empty());
                     mainRightRowKey.set(tableLocation, rowKeyChunk.get(chunkPosition));
                     mainModifiedTrackerCookieSource.set(tableLocation, modifiedSlotTracker.addMain(-1, mainInsertMask | tableLocation, existingRightRowKey, NaturalJoinModifiedSlotTracker.FLAG_RIGHT_CHANGE));
                     break;
                 } else if (eq(mainKeySource0.getUnsafe(tableLocation), k0)) {
+                    if (isStateDeleted(existingRightRowKey)) {
+                        tableLocation = firstDeletedLocation;
+                        liveEntries++;
+                        mainKeySource0.set(tableLocation, k0);
+                        mainLeftRowSet.set(tableLocation, RowSetFactory.empty());
+                        mainRightRowKey.set(tableLocation, rowKeyChunk.get(chunkPosition));
+                        mainModifiedTrackerCookieSource.set(tableLocation, modifiedSlotTracker.addMain(-1, mainInsertMask | tableLocation, existingRightRowKey, NaturalJoinModifiedSlotTracker.FLAG_RIGHT_CHANGE));
+                        break;
+                    }
                     if (existingRightRowKey == RowSet.NULL_ROW_KEY) {
                         mainRightRowKey.set(tableLocation, rowKeyChunk.get(chunkPosition));
                         mainModifiedTrackerCookieSource.set(tableLocation, modifiedSlotTracker.addMain(mainModifiedTrackerCookieSource.getUnsafe(tableLocation), mainInsertMask | tableLocation, existingRightRowKey, NaturalJoinModifiedSlotTracker.FLAG_RIGHT_CHANGE));
-                    } else if (existingRightRowKey < RowSet.NULL_ROW_KEY) {
+                    } else if (existingRightRowKey <= FIRST_DUPLICATE) {
                         final long duplicateLocation = duplicateLocationFromRowKey(existingRightRowKey);
                         final WritableRowSet duplicates = rightSideDuplicateRowSets.getUnsafe(duplicateLocation);
                         final long duplicateSize = duplicates.size();
@@ -204,17 +227,24 @@ protected void addLeftSide(RowSequence rowSequence, Chunk[] sourceKeyChunks,
             final int hash = hash(k0);
             final int firstTableLocation = hashToTableLocation(hash);
             int tableLocation = firstTableLocation;
+            int firstDeletedLocation = -1;
             MAIN_SEARCH: while (true) {
                 long rightRowKeyForState = mainRightRowKey.getUnsafe(tableLocation);
-                if (rightRowKeyForState == EMPTY_RIGHT_STATE) {
+                if (firstDeletedLocation < 0 && isStateDeleted(rightRowKeyForState)) {
+                    firstDeletedLocation = tableLocation;
+                }
+                if (isStateEmpty(rightRowKeyForState)) {
                     final int firstAlternateTableLocation = hashToTableLocationAlternate(hash);
                     int alternateTableLocation = firstAlternateTableLocation;
                     while (alternateTableLocation < rehashPointer) {
                         rightRowKeyForState = alternateRightRowKey.getUnsafe(alternateTableLocation);
-                        if (rightRowKeyForState == EMPTY_RIGHT_STATE) {
+                        if (isStateEmpty(rightRowKeyForState)) {
                             break;
                         } else if (eq(alternateKeySource0.getUnsafe(alternateTableLocation), k0)) {
-                            if (rightRowKeyForState < RowSet.NULL_ROW_KEY) {
+                            if (isStateDeleted(rightRowKeyForState)) {
+                                break;
+                            }
+                            if (rightRowKeyForState <= FIRST_DUPLICATE) {
                                 throw new IllegalStateException("Natural Join found duplicate right key for " + extractKeyStringFromSourceTable(rowKeyChunk.get(chunkPosition)));
                             }
                             alternateLeftRowSet.getUnsafe(alternateTableLocation).insert(rowKeyChunk.get(chunkPosition));
@@ -225,7 +255,12 @@ protected void addLeftSide(RowSequence rowSequence, Chunk[] sourceKeyChunks,
                             Assert.neq(alternateTableLocation, "alternateTableLocation", firstAlternateTableLocation, "firstAlternateTableLocation");
                         }
                     }
-                    numEntries++;
+                    if (firstDeletedLocation >= 0) {
+                        tableLocation = firstDeletedLocation;
+                    } else {
+                        numEntries++;
+                    }
+                    liveEntries++;
                     mainKeySource0.set(tableLocation, k0);
                     mainLeftRowSet.set(tableLocation, RowSetFactory.fromKeys(rowKeyChunk.get(chunkPosition)));
                     mainRightRowKey.set(tableLocation, RowSet.NULL_ROW_KEY);
@@ -233,7 +268,17 @@ protected void addLeftSide(RowSequence rowSequence, Chunk[] sourceKeyChunks,
                     leftRedirections.set(leftRedirectionOffset++, RowSet.NULL_ROW_KEY);
                     break;
                 } else if (eq(mainKeySource0.getUnsafe(tableLocation), k0)) {
-                    if (rightRowKeyForState < RowSet.NULL_ROW_KEY) {
+                    if (isStateDeleted(rightRowKeyForState)) {
+                        tableLocation = firstDeletedLocation;
+                        liveEntries++;
+                        mainKeySource0.set(tableLocation, k0);
+                        mainLeftRowSet.set(tableLocation, RowSetFactory.fromKeys(rowKeyChunk.get(chunkPosition)));
+                        mainRightRowKey.set(tableLocation, RowSet.NULL_ROW_KEY);
+                        mainModifiedTrackerCookieSource.set(tableLocation, -1L);
+                        leftRedirections.set(leftRedirectionOffset++, RowSet.NULL_ROW_KEY);
+                        break;
+                    }
+                    if (rightRowKeyForState <= FIRST_DUPLICATE) {
                         throw new IllegalStateException("Natural Join found duplicate right key for " + extractKeyStringFromSourceTable(rowKeyChunk.get(chunkPosition)));
                     }
                     mainLeftRowSet.getUnsafe(tableLocation).insert(rowKeyChunk.get(chunkPosition));
@@ -257,11 +302,16 @@ protected void removeRight(RowSequence rowSequence, Chunk[] sourceKeyChunks,
             final int hash = hash(k0);
             final int firstTableLocation = hashToTableLocation(hash);
             boolean found = false;
+            boolean searchAlternate = true;
             int tableLocation = firstTableLocation;
             long existingRightRowKey;
-            while ((existingRightRowKey = mainRightRowKey.getUnsafe(tableLocation)) != EMPTY_RIGHT_STATE) {
+            while (!isStateEmpty(existingRightRowKey = mainRightRowKey.getUnsafe(tableLocation))) {
                 if (eq(mainKeySource0.getUnsafe(tableLocation), k0)) {
-                    if (existingRightRowKey < RowSet.NULL_ROW_KEY) {
+                    if (isStateDeleted(existingRightRowKey)) {
+                        searchAlternate = false;
+                        break;
+                    }
+                    if (existingRightRowKey <= FIRST_DUPLICATE) {
                         final long duplicateLocation = duplicateLocationFromRowKey(existingRightRowKey);
                         final WritableRowSet duplicates = rightSideDuplicateRowSets.getUnsafe(duplicateLocation);
                         final long duplicateSize = duplicates.size();
@@ -274,7 +324,13 @@ protected void removeRight(RowSequence rowSequence, Chunk[] sourceKeyChunks,
                     } else if (existingRightRowKey != rowKeyChunk.get(chunkPosition)) {
                         Assert.statementNeverExecuted("Could not find existing right row in state");
                     } else {
-                        mainRightRowKey.set(tableLocation, RowSet.NULL_ROW_KEY);
+                        final boolean leftEmpty = mainLeftRowSet.getUnsafe(tableLocation).isEmpty();
+                        if (leftEmpty) {
+                            mainRightRowKey.set(tableLocation, TOMBSTONE_RIGHT_STATE);
+                            liveEntries--;
+                        } else {
+                            mainRightRowKey.set(tableLocation, RowSet.NULL_ROW_KEY);
+                        }
                         mainModifiedTrackerCookieSource.set(tableLocation, modifiedSlotTracker.addMain(mainModifiedTrackerCookieSource.getUnsafe(tableLocation), mainInsertMask | tableLocation, existingRightRowKey, NaturalJoinModifiedSlotTracker.FLAG_RIGHT_CHANGE));
                     }
                     found = true;
@@ -284,37 +340,50 @@ protected void removeRight(RowSequence rowSequence, Chunk[] sourceKeyChunks,
                 Assert.neq(tableLocation, "tableLocation", firstTableLocation, "firstTableLocation");
             }
             if (!found) {
-                final int firstAlternateTableLocation = hashToTableLocationAlternate(hash);
-                boolean alternateFound = false;
-                if (firstAlternateTableLocation < rehashPointer) {
-                    int alternateTableLocation = firstAlternateTableLocation;
-                    while ((existingRightRowKey = alternateRightRowKey.getUnsafe(alternateTableLocation)) != EMPTY_RIGHT_STATE) {
-                        if (eq(alternateKeySource0.getUnsafe(alternateTableLocation), k0)) {
-                            if (existingRightRowKey < RowSet.NULL_ROW_KEY) {
-                                final long duplicateLocation = duplicateLocationFromRowKey(existingRightRowKey);
-                                final WritableRowSet duplicates = rightSideDuplicateRowSets.getUnsafe(duplicateLocation);
-                                final long duplicateSize = duplicates.size();
-                                duplicates.remove(rowKeyChunk.get(chunkPosition));
-                                Assert.eq(duplicateSize, "duplicateSize", duplicates.size() + 1, "duplicates.size() + 1");
-                                if (duplicates.size() == 1) {
-                                    alternateRightRowKey.set(alternateTableLocation, duplicates.firstRowKey());
-                                    freeDuplicateLocation(duplicateLocation);
+                if (!searchAlternate) {
+                    throw Assert.statementNeverExecuted("Could not find existing state for removed right row");
+                } else {
+                    final int firstAlternateTableLocation = hashToTableLocationAlternate(hash);
+                    boolean alternateFound = false;
+                    if (firstAlternateTableLocation < rehashPointer) {
+                        int alternateTableLocation = firstAlternateTableLocation;
+                        while (!isStateEmpty(existingRightRowKey = alternateRightRowKey.getUnsafe(alternateTableLocation))) {
+                            if (eq(alternateKeySource0.getUnsafe(alternateTableLocation), k0)) {
+                                if (isStateDeleted(existingRightRowKey)) {
+                                    break;
                                 }
-                            } else if (existingRightRowKey != rowKeyChunk.get(chunkPosition)) {
-                                Assert.statementNeverExecuted("Could not find existing right row in state");
-                            } else {
-                                alternateRightRowKey.set(alternateTableLocation, RowSet.NULL_ROW_KEY);
-                                alternateModifiedTrackerCookieSource.set(alternateTableLocation, modifiedSlotTracker.addMain(alternateModifiedTrackerCookieSource.getUnsafe(alternateTableLocation), alternateInsertMask | alternateTableLocation, existingRightRowKey, NaturalJoinModifiedSlotTracker.FLAG_RIGHT_CHANGE));
+                                if (existingRightRowKey <= FIRST_DUPLICATE) {
+                                    final long duplicateLocation = duplicateLocationFromRowKey(existingRightRowKey);
+                                    final WritableRowSet duplicates = rightSideDuplicateRowSets.getUnsafe(duplicateLocation);
+                                    final long duplicateSize = duplicates.size();
+                                    duplicates.remove(rowKeyChunk.get(chunkPosition));
+                                    Assert.eq(duplicateSize, "duplicateSize", duplicates.size() + 1, "duplicates.size() + 1");
+                                    if (duplicates.size() == 1) {
+                                        alternateRightRowKey.set(alternateTableLocation, duplicates.firstRowKey());
+                                        freeDuplicateLocation(duplicateLocation);
+                                    }
+                                } else if (existingRightRowKey != rowKeyChunk.get(chunkPosition)) {
+                                    Assert.statementNeverExecuted("Could not find existing right row in state");
+                                } else {
+                                    final boolean leftEmpty = alternateLeftRowSet.getUnsafe(alternateTableLocation).isEmpty();
+                                    if (leftEmpty) {
+                                        alternateRightRowKey.set(alternateTableLocation, TOMBSTONE_RIGHT_STATE);
+                                        liveEntries--;
+                                    } else {
+                                        alternateRightRowKey.set(alternateTableLocation, RowSet.NULL_ROW_KEY);
+                                    }
+                                    alternateModifiedTrackerCookieSource.set(alternateTableLocation, modifiedSlotTracker.addMain(alternateModifiedTrackerCookieSource.getUnsafe(alternateTableLocation), alternateInsertMask | alternateTableLocation, existingRightRowKey, NaturalJoinModifiedSlotTracker.FLAG_RIGHT_CHANGE));
+                                }
+                                alternateFound = true;
+                                break;
                             }
-                            alternateFound = true;
-                            break;
+                            alternateTableLocation = alternateNextTableLocation(alternateTableLocation);
+                            Assert.neq(alternateTableLocation, "alternateTableLocation", firstAlternateTableLocation, "firstAlternateTableLocation");
                         }
-                        alternateTableLocation = alternateNextTableLocation(alternateTableLocation);
-                        Assert.neq(alternateTableLocation, "alternateTableLocation", firstAlternateTableLocation, "firstAlternateTableLocation");
                     }
-                }
-                if (!alternateFound) {
-                    throw Assert.statementNeverExecuted("Could not find existing state for removed right row");
+                    if (!alternateFound) {
+                        throw Assert.statementNeverExecuted("Could not find existing state for removed right row");
+                    }
                 }
             }
         }
@@ -329,10 +398,15 @@ protected void modifyByRight(RowSequence rowSequence, Chunk[] sourceKeyChunks,
             final int hash = hash(k0);
             final int firstTableLocation = hashToTableLocation(hash);
             boolean found = false;
+            boolean searchAlternate = true;
             int tableLocation = firstTableLocation;
             long existingRightRowKey;
-            while ((existingRightRowKey = mainRightRowKey.getUnsafe(tableLocation)) != EMPTY_RIGHT_STATE) {
+            while (!isStateEmpty(existingRightRowKey = mainRightRowKey.getUnsafe(tableLocation))) {
                 if (eq(mainKeySource0.getUnsafe(tableLocation), k0)) {
+                    if (isStateDeleted(existingRightRowKey)) {
+                        searchAlternate = false;
+                        break;
+                    }
                     mainModifiedTrackerCookieSource.set(tableLocation, modifiedSlotTracker.addMain(mainModifiedTrackerCookieSource.getUnsafe(tableLocation), mainInsertMask | tableLocation, existingRightRowKey, NaturalJoinModifiedSlotTracker.FLAG_RIGHT_CHANGE));
                     found = true;
                     break;
@@ -341,22 +415,29 @@ protected void modifyByRight(RowSequence rowSequence, Chunk[] sourceKeyChunks,
                 Assert.neq(tableLocation, "tableLocation", firstTableLocation, "firstTableLocation");
             }
             if (!found) {
-                final int firstAlternateTableLocation = hashToTableLocationAlternate(hash);
-                boolean alternateFound = false;
-                if (firstAlternateTableLocation < rehashPointer) {
-                    int alternateTableLocation = firstAlternateTableLocation;
-                    while ((existingRightRowKey = alternateRightRowKey.getUnsafe(alternateTableLocation)) != EMPTY_RIGHT_STATE) {
-                        if (eq(alternateKeySource0.getUnsafe(alternateTableLocation), k0)) {
-                            alternateModifiedTrackerCookieSource.set(alternateTableLocation, modifiedSlotTracker.addMain(alternateModifiedTrackerCookieSource.getUnsafe(alternateTableLocation), alternateInsertMask | alternateTableLocation, existingRightRowKey, NaturalJoinModifiedSlotTracker.FLAG_RIGHT_CHANGE));
-                            alternateFound = true;
-                            break;
+                if (!searchAlternate) {
+                    throw Assert.statementNeverExecuted("Could not find existing state for modified right row");
+                } else {
+                    final int firstAlternateTableLocation = hashToTableLocationAlternate(hash);
+                    boolean alternateFound = false;
+                    if (firstAlternateTableLocation < rehashPointer) {
+                        int alternateTableLocation = firstAlternateTableLocation;
+                        while (!isStateEmpty(existingRightRowKey = alternateRightRowKey.getUnsafe(alternateTableLocation))) {
+                            if (eq(alternateKeySource0.getUnsafe(alternateTableLocation), k0)) {
+                                if (isStateDeleted(existingRightRowKey)) {
+                                    break;
+                                }
+                                alternateModifiedTrackerCookieSource.set(alternateTableLocation, modifiedSlotTracker.addMain(alternateModifiedTrackerCookieSource.getUnsafe(alternateTableLocation), alternateInsertMask | alternateTableLocation, existingRightRowKey, NaturalJoinModifiedSlotTracker.FLAG_RIGHT_CHANGE));
+                                alternateFound = true;
+                                break;
+                            }
+                            alternateTableLocation = alternateNextTableLocation(alternateTableLocation);
+                            Assert.neq(alternateTableLocation, "alternateTableLocation", firstAlternateTableLocation, "firstAlternateTableLocation");
                         }
-                        alternateTableLocation = alternateNextTableLocation(alternateTableLocation);
-                        Assert.neq(alternateTableLocation, "alternateTableLocation", firstAlternateTableLocation, "firstAlternateTableLocation");
                     }
-                }
-                if (!alternateFound) {
-                    throw Assert.statementNeverExecuted("Could not find existing state for modified right row");
+                    if (!alternateFound) {
+                        throw Assert.statementNeverExecuted("Could not find existing state for modified right row");
+                    }
                 }
             }
         }
@@ -373,15 +454,20 @@ protected void applyRightShift(RowSequence rowSequence, Chunk[] sourceKeyChunks,
             final int hash = hash(k0);
             final int firstTableLocation = hashToTableLocation(hash);
             boolean found = false;
+            boolean searchAlternate = true;
             int tableLocation = firstTableLocation;
             long existingRightRowKey;
-            while ((existingRightRowKey = mainRightRowKey.getUnsafe(tableLocation)) != EMPTY_RIGHT_STATE) {
+            while (!isStateEmpty(existingRightRowKey = mainRightRowKey.getUnsafe(tableLocation))) {
                 if (eq(mainKeySource0.getUnsafe(tableLocation), k0)) {
+                    if (isStateDeleted(existingRightRowKey)) {
+                        searchAlternate = false;
+                        break;
+                    }
                     final long keyToShift = rowKeyChunk.get(chunkPosition);
                     if (existingRightRowKey == keyToShift - shiftDelta) {
                         mainRightRowKey.set(tableLocation, keyToShift);
                         mainModifiedTrackerCookieSource.set(tableLocation, modifiedSlotTracker.addMain(mainModifiedTrackerCookieSource.getUnsafe(tableLocation), mainInsertMask | tableLocation, existingRightRowKey, NaturalJoinModifiedSlotTracker.FLAG_RIGHT_SHIFT));
-                    } else if (existingRightRowKey < RowSet.NULL_ROW_KEY) {
+                    } else if (existingRightRowKey <= FIRST_DUPLICATE) {
                         final long duplicateLocation = duplicateLocationFromRowKey(existingRightRowKey);
                         if (shiftDelta < 0) {
                             final WritableRowSet duplicates = rightSideDuplicateRowSets.getUnsafe(duplicateLocation);
@@ -400,37 +486,44 @@ protected void applyRightShift(RowSequence rowSequence, Chunk[] sourceKeyChunks,
                 Assert.neq(tableLocation, "tableLocation", firstTableLocation, "firstTableLocation");
             }
             if (!found) {
-                final int firstAlternateTableLocation = hashToTableLocationAlternate(hash);
-                boolean alternateFound = false;
-                if (firstAlternateTableLocation < rehashPointer) {
-                    int alternateTableLocation = firstAlternateTableLocation;
-                    while ((existingRightRowKey = alternateRightRowKey.getUnsafe(alternateTableLocation)) != EMPTY_RIGHT_STATE) {
-                        if (eq(alternateKeySource0.getUnsafe(alternateTableLocation), k0)) {
-                            final long keyToShift = rowKeyChunk.get(chunkPosition);
-                            if (existingRightRowKey == keyToShift - shiftDelta) {
-                                alternateRightRowKey.set(alternateTableLocation, keyToShift);
-                                alternateModifiedTrackerCookieSource.set(alternateTableLocation, modifiedSlotTracker.addMain(alternateModifiedTrackerCookieSource.getUnsafe(alternateTableLocation), alternateInsertMask | alternateTableLocation, existingRightRowKey, NaturalJoinModifiedSlotTracker.FLAG_RIGHT_SHIFT));
-                            } else if (existingRightRowKey < RowSet.NULL_ROW_KEY) {
-                                final long duplicateLocation = duplicateLocationFromRowKey(existingRightRowKey);
-                                if (shiftDelta < 0) {
-                                    final WritableRowSet duplicates = rightSideDuplicateRowSets.getUnsafe(duplicateLocation);
-                                    shiftOneKey(duplicates, keyToShift, shiftDelta);
+                if (!searchAlternate) {
+                    throw Assert.statementNeverExecuted("Could not find existing state for shifted right row");
+                } else {
+                    final int firstAlternateTableLocation = hashToTableLocationAlternate(hash);
+                    boolean alternateFound = false;
+                    if (firstAlternateTableLocation < rehashPointer) {
+                        int alternateTableLocation = firstAlternateTableLocation;
+                        while (!isStateEmpty(existingRightRowKey = alternateRightRowKey.getUnsafe(alternateTableLocation))) {
+                            if (eq(alternateKeySource0.getUnsafe(alternateTableLocation), k0)) {
+                                if (isStateDeleted(existingRightRowKey)) {
+                                    break;
+                                }
+                                final long keyToShift = rowKeyChunk.get(chunkPosition);
+                                if (existingRightRowKey == keyToShift - shiftDelta) {
+                                    alternateRightRowKey.set(alternateTableLocation, keyToShift);
+                                    alternateModifiedTrackerCookieSource.set(alternateTableLocation, modifiedSlotTracker.addMain(alternateModifiedTrackerCookieSource.getUnsafe(alternateTableLocation), alternateInsertMask | alternateTableLocation, existingRightRowKey, NaturalJoinModifiedSlotTracker.FLAG_RIGHT_SHIFT));
+                                } else if (existingRightRowKey <= FIRST_DUPLICATE) {
+                                    final long duplicateLocation = duplicateLocationFromRowKey(existingRightRowKey);
+                                    if (shiftDelta < 0) {
+                                        final WritableRowSet duplicates = rightSideDuplicateRowSets.getUnsafe(duplicateLocation);
+                                        shiftOneKey(duplicates, keyToShift, shiftDelta);
+                                    } else {
+                                        pc.pendingShifts.set(pc.pendingShiftPointer++, (long)duplicateLocation);
+                                        pc.pendingShifts.set(pc.pendingShiftPointer++, keyToShift);
+                                    }
                                 } else {
-                                    pc.pendingShifts.set(pc.pendingShiftPointer++, (long)duplicateLocation);
-                                    pc.pendingShifts.set(pc.pendingShiftPointer++, keyToShift);
+                                    throw Assert.statementNeverExecuted("Could not find existing index for shifted right row");
                                 }
-                            } else {
-                                throw Assert.statementNeverExecuted("Could not find existing index for shifted right row");
+                                alternateFound = true;
+                                break;
                             }
-                            alternateFound = true;
-                            break;
+                            alternateTableLocation = alternateNextTableLocation(alternateTableLocation);
+                            Assert.neq(alternateTableLocation, "alternateTableLocation", firstAlternateTableLocation, "firstAlternateTableLocation");
                         }
-                        alternateTableLocation = alternateNextTableLocation(alternateTableLocation);
-                        Assert.neq(alternateTableLocation, "alternateTableLocation", firstAlternateTableLocation, "firstAlternateTableLocation");
                     }
-                }
-                if (!alternateFound) {
-                    throw Assert.statementNeverExecuted("Could not find existing state for shifted right row");
+                    if (!alternateFound) {
+                        throw Assert.statementNeverExecuted("Could not find existing state for shifted right row");
+                    }
                 }
             }
         }
@@ -445,10 +538,21 @@ protected void removeLeft(RowSequence rowSequence, Chunk[] sourceKeyChunks) {
             final int hash = hash(k0);
             final int firstTableLocation = hashToTableLocation(hash);
             boolean found = false;
+            boolean searchAlternate = true;
             int tableLocation = firstTableLocation;
-            while (mainRightRowKey.getUnsafe(tableLocation) != EMPTY_RIGHT_STATE) {
+            long rightState;
+            while (!isStateEmpty(rightState = mainRightRowKey.getUnsafe(tableLocation))) {
                 if (eq(mainKeySource0.getUnsafe(tableLocation), k0)) {
-                    mainLeftRowSet.getUnsafe(tableLocation).remove(rowKeyChunk.get(chunkPosition));
+                    if (isStateDeleted(rightState)) {
+                        searchAlternate = false;
+                        break;
+                    }
+                    final WritableRowSet left = mainLeftRowSet.getUnsafe(tableLocation);
+                    left.remove(rowKeyChunk.get(chunkPosition));
+                    if (left.isEmpty() && rightState == RowSet.NULL_ROW_KEY) {
+                        mainRightRowKey.set(tableLocation, TOMBSTONE_RIGHT_STATE);
+                        liveEntries--;
+                    }
                     found = true;
                     break;
                 }
@@ -456,22 +560,34 @@ protected void removeLeft(RowSequence rowSequence, Chunk[] sourceKeyChunks) {
                 Assert.neq(tableLocation, "tableLocation", firstTableLocation, "firstTableLocation");
             }
             if (!found) {
-                final int firstAlternateTableLocation = hashToTableLocationAlternate(hash);
-                boolean alternateFound = false;
-                if (firstAlternateTableLocation < rehashPointer) {
-                    int alternateTableLocation = firstAlternateTableLocation;
-                    while (alternateRightRowKey.getUnsafe(alternateTableLocation) != EMPTY_RIGHT_STATE) {
-                        if (eq(alternateKeySource0.getUnsafe(alternateTableLocation), k0)) {
-                            alternateLeftRowSet.getUnsafe(alternateTableLocation).remove(rowKeyChunk.get(chunkPosition));
-                            alternateFound = true;
-                            break;
+                if (!searchAlternate) {
+                    throw Assert.statementNeverExecuted("Could not find existing state for removed left row");
+                } else {
+                    final int firstAlternateTableLocation = hashToTableLocationAlternate(hash);
+                    boolean alternateFound = false;
+                    if (firstAlternateTableLocation < rehashPointer) {
+                        int alternateTableLocation = firstAlternateTableLocation;
+                        while (!isStateEmpty(rightState = alternateRightRowKey.getUnsafe(alternateTableLocation))) {
+                            if (eq(alternateKeySource0.getUnsafe(alternateTableLocation), k0)) {
+                                if (isStateDeleted(rightState)) {
+                                    break;
+                                }
+                                final WritableRowSet left = alternateLeftRowSet.getUnsafe(alternateTableLocation);
+                                left.remove(rowKeyChunk.get(chunkPosition));
+                                if (left.isEmpty() && rightState == RowSet.NULL_ROW_KEY) {
+                                    alternateRightRowKey.set(alternateTableLocation, TOMBSTONE_RIGHT_STATE);
+                                    liveEntries--;
+                                }
+                                alternateFound = true;
+                                break;
+                            }
+                            alternateTableLocation = alternateNextTableLocation(alternateTableLocation);
+                            Assert.neq(alternateTableLocation, "alternateTableLocation", firstAlternateTableLocation, "firstAlternateTableLocation");
                         }
-                        alternateTableLocation = alternateNextTableLocation(alternateTableLocation);
-                        Assert.neq(alternateTableLocation, "alternateTableLocation", firstAlternateTableLocation, "firstAlternateTableLocation");
                     }
-                }
-                if (!alternateFound) {
-                    throw Assert.statementNeverExecuted("Could not find existing state for removed left row");
+                    if (!alternateFound) {
+                        throw Assert.statementNeverExecuted("Could not find existing state for removed left row");
+                    }
                 }
             }
         }
@@ -487,9 +603,15 @@ protected void applyLeftShift(RowSequence rowSequence, Chunk[] sourceKeyChunks,
             final int hash = hash(k0);
             final int firstTableLocation = hashToTableLocation(hash);
             boolean found = false;
+            boolean searchAlternate = true;
             int tableLocation = firstTableLocation;
-            while (mainRightRowKey.getUnsafe(tableLocation) != EMPTY_RIGHT_STATE) {
+            long stateValue;
+            while (!isStateEmpty(stateValue = mainRightRowKey.getUnsafe(tableLocation))) {
                 if (eq(mainKeySource0.getUnsafe(tableLocation), k0)) {
+                    if (isStateDeleted(stateValue)) {
+                        searchAlternate = false;
+                        break;
+                    }
                     final WritableRowSet leftRowSetForState = mainLeftRowSet.getUnsafe(tableLocation);
                     final long keyToShift = rowKeyChunk.get(chunkPosition);
                     if (shiftDelta < 0) {
@@ -505,29 +627,36 @@ protected void applyLeftShift(RowSequence rowSequence, Chunk[] sourceKeyChunks,
                 Assert.neq(tableLocation, "tableLocation", firstTableLocation, "firstTableLocation");
             }
             if (!found) {
-                final int firstAlternateTableLocation = hashToTableLocationAlternate(hash);
-                boolean alternateFound = false;
-                if (firstAlternateTableLocation < rehashPointer) {
-                    int alternateTableLocation = firstAlternateTableLocation;
-                    while (alternateRightRowKey.getUnsafe(alternateTableLocation) != EMPTY_RIGHT_STATE) {
-                        if (eq(alternateKeySource0.getUnsafe(alternateTableLocation), k0)) {
-                            final WritableRowSet leftRowSetForState = alternateLeftRowSet.getUnsafe(alternateTableLocation);
-                            final long keyToShift = rowKeyChunk.get(chunkPosition);
-                            if (shiftDelta < 0) {
-                                shiftOneKey(leftRowSetForState, keyToShift, shiftDelta);
-                            } else {
-                                pc.pendingShifts.set(pc.pendingShiftPointer++, (long)(AlternatingColumnSource.ALTERNATE_SWITCH_MASK | alternateTableLocation));
-                                pc.pendingShifts.set(pc.pendingShiftPointer++, keyToShift);
+                if (!searchAlternate) {
+                    throw Assert.statementNeverExecuted("Could not find existing state for shifted left row");
+                } else {
+                    final int firstAlternateTableLocation = hashToTableLocationAlternate(hash);
+                    boolean alternateFound = false;
+                    if (firstAlternateTableLocation < rehashPointer) {
+                        int alternateTableLocation = firstAlternateTableLocation;
+                        while (!isStateEmpty(stateValue = alternateRightRowKey.getUnsafe(alternateTableLocation))) {
+                            if (eq(alternateKeySource0.getUnsafe(alternateTableLocation), k0)) {
+                                if (isStateDeleted(stateValue)) {
+                                    break;
+                                }
+                                final WritableRowSet leftRowSetForState = alternateLeftRowSet.getUnsafe(alternateTableLocation);
+                                final long keyToShift = rowKeyChunk.get(chunkPosition);
+                                if (shiftDelta < 0) {
+                                    shiftOneKey(leftRowSetForState, keyToShift, shiftDelta);
+                                } else {
+                                    pc.pendingShifts.set(pc.pendingShiftPointer++, (long)(AlternatingColumnSource.ALTERNATE_SWITCH_MASK | alternateTableLocation));
+                                    pc.pendingShifts.set(pc.pendingShiftPointer++, keyToShift);
+                                }
+                                alternateFound = true;
+                                break;
                             }
-                            alternateFound = true;
-                            break;
+                            alternateTableLocation = alternateNextTableLocation(alternateTableLocation);
+                            Assert.neq(alternateTableLocation, "alternateTableLocation", firstAlternateTableLocation, "firstAlternateTableLocation");
                         }
-                        alternateTableLocation = alternateNextTableLocation(alternateTableLocation);
-                        Assert.neq(alternateTableLocation, "alternateTableLocation", firstAlternateTableLocation, "firstAlternateTableLocation");
                     }
-                }
-                if (!alternateFound) {
-                    throw Assert.statementNeverExecuted("Could not find existing state for shifted left row");
+                    if (!alternateFound) {
+                        throw Assert.statementNeverExecuted("Could not find existing state for shifted left row");
+                    }
                 }
             }
         }
@@ -538,16 +667,30 @@ private static int hash(short k0) {
         return hash;
     }
 
-    private boolean migrateOneLocation(int locationToMigrate,
+    private static boolean isStateEmpty(long state) {
+        return state == EMPTY_RIGHT_STATE;
+    }
+
+    private static boolean isStateDeleted(long state) {
+        return state == TOMBSTONE_RIGHT_STATE;
+    }
+
+    private boolean migrateOneLocation(int locationToMigrate, boolean trueOnDeletedEntry,
             NaturalJoinModifiedSlotTracker modifiedSlotTracker) {
         final long currentStateValue = alternateRightRowKey.getUnsafe(locationToMigrate);
-        if (currentStateValue == EMPTY_RIGHT_STATE) {
+        if (isStateEmpty(currentStateValue)) {
             return false;
         }
+        if (isStateDeleted(currentStateValue)) {
+            alternateEntries--;
+            alternateRightRowKey.set(locationToMigrate, EMPTY_RIGHT_STATE);
+            return trueOnDeletedEntry;
+        }
         final short k0 = alternateKeySource0.getUnsafe(locationToMigrate);
         final int hash = hash(k0);
         int destinationTableLocation = hashToTableLocation(hash);
-        while (mainRightRowKey.getUnsafe(destinationTableLocation) != EMPTY_RIGHT_STATE) {
+        long candidateState;
+        while (!isStateEmpty(candidateState = mainRightRowKey.getUnsafe(destinationTableLocation)) && !isStateDeleted(candidateState)) {
             destinationTableLocation = nextTableLocation(destinationTableLocation);
         }
         mainKeySource0.set(destinationTableLocation, k0);
@@ -559,6 +702,10 @@ private boolean migrateOneLocation(int locationToMigrate,
         alternateModifiedTrackerCookieSource.set(locationToMigrate, -1L);
         modifiedSlotTracker.moveTableLocation(cookie, locationToMigrate, mainInsertMask | destinationTableLocation);;
         alternateRightRowKey.set(locationToMigrate, EMPTY_RIGHT_STATE);
+        if (!isStateDeleted(candidateState)) {
+            numEntries++;
+        }
+        alternateEntries--;
         return true;
     }
 
@@ -567,7 +714,7 @@ protected int rehashInternalPartial(int entriesToRehash,
             NaturalJoinModifiedSlotTracker modifiedSlotTracker) {
         int rehashedEntries = 0;
         while (rehashPointer > 0 && rehashedEntries < entriesToRehash) {
-            if (migrateOneLocation(--rehashPointer, modifiedSlotTracker)) {
+            if (migrateOneLocation(--rehashPointer, false, modifiedSlotTracker)) {
                 rehashedEntries++;
             }
         }
@@ -575,8 +722,7 @@ protected int rehashInternalPartial(int entriesToRehash,
     }
 
     @Override
-    protected void newAlternate() {
-        super.newAlternate();
+    protected void adviseNewAlternate() {
         this.mainKeySource0 = (ImmutableShortArraySource)super.mainKeySources[0];
         this.alternateKeySource0 = (ImmutableShortArraySource)super.alternateKeySources[0];
     }
@@ -590,7 +736,7 @@ protected void clearAlternate() {
     @Override
     protected void migrateFront(NaturalJoinModifiedSlotTracker modifiedSlotTracker) {
         int location = 0;
-        while (migrateOneLocation(location++, modifiedSlotTracker));
+        while (migrateOneLocation(location++, true, modifiedSlotTracker) && location < alternateTableSize);
     }
 
     @Override
@@ -610,7 +756,7 @@ protected void rehashInternalFull(final int oldSize) {
         mainModifiedTrackerCookieSource.setArray(destModifiedCookie);
         for (int sourceBucket = 0; sourceBucket < oldSize; ++sourceBucket) {
             final long currentStateValue = originalStateArray[sourceBucket];
-            if (currentStateValue == EMPTY_RIGHT_STATE) {
+            if (isStateEmpty(currentStateValue)) {
                 continue;
             }
             final short k0 = originalKeyArray0[sourceBucket];
@@ -618,7 +764,7 @@ protected void rehashInternalFull(final int oldSize) {
             final int firstDestinationTableLocation = hashToTableLocation(hash);
             int destinationTableLocation = firstDestinationTableLocation;
             while (true) {
-                if (destState[destinationTableLocation] == EMPTY_RIGHT_STATE) {
+                if (isStateEmpty(destState[destinationTableLocation])) {
                     destKeyArray0[destinationTableLocation] = k0;
                     destState[destinationTableLocation] = originalStateArray[sourceBucket];
                     destLeftRowSet[destinationTableLocation] = oldLeftRowSet[sourceBucket];
diff --git a/engine/table/src/main/java/io/deephaven/engine/table/impl/naturaljoin/typed/rightincopen/gen/RightIncrementalNaturalJoinHasherByte.java b/engine/table/src/main/java/io/deephaven/engine/table/impl/naturaljoin/typed/rightincopen/gen/RightIncrementalNaturalJoinHasherByte.java
index 1f018c9c9e8..4585a4f34bb 100644
--- a/engine/table/src/main/java/io/deephaven/engine/table/impl/naturaljoin/typed/rightincopen/gen/RightIncrementalNaturalJoinHasherByte.java
+++ b/engine/table/src/main/java/io/deephaven/engine/table/impl/naturaljoin/typed/rightincopen/gen/RightIncrementalNaturalJoinHasherByte.java
@@ -53,7 +53,7 @@ protected void buildFromLeftSide(RowSequence rowSequence, Chunk[] sourceKeyChunk
             int tableLocation = firstTableLocation;
             while (true) {
                 RowSet leftRowSetForState = leftRowSet.getUnsafe(tableLocation);
-                if (leftRowSetForState == null) {
+                if (isStateEmpty(leftRowSetForState)) {
                     numEntries++;
                     mainKeySource0.set(tableLocation, k0);
                     final long leftRowKey = rowKeyChunk.get(chunkPosition);
@@ -82,7 +82,7 @@ protected void addRightSide(RowSequence rowSequence, Chunk[] sourceKeyChunks) {
             final int hash = hash(k0);
             final int firstTableLocation = hashToTableLocation(hash);
             int tableLocation = firstTableLocation;
-            while (leftRowSet.getUnsafe(tableLocation) != null) {
+            while (!isStateEmpty(leftRowSet.getUnsafe(tableLocation))) {
                 if (eq(mainKeySource0.getUnsafe(tableLocation), k0)) {
                     final long rightRowKeyForState = rightRowKey.getAndSetUnsafe(tableLocation, rowKeyChunk.get(chunkPosition));
                     if (rightRowKeyForState != RowSet.NULL_ROW_KEY && rightRowKeyForState != QueryConstants.NULL_LONG) {
@@ -107,7 +107,7 @@ protected void removeRight(RowSequence rowSequence, Chunk[] sourceKeyChunks,
             final int hash = hash(k0);
             final int firstTableLocation = hashToTableLocation(hash);
             int tableLocation = firstTableLocation;
-            while (leftRowSet.getUnsafe(tableLocation) != null) {
+            while (!isStateEmpty(leftRowSet.getUnsafe(tableLocation))) {
                 if (eq(mainKeySource0.getUnsafe(tableLocation), k0)) {
                     final long oldRightRow = rightRowKey.getAndSetUnsafe(tableLocation, RowSet.NULL_ROW_KEY);
                     Assert.eq(oldRightRow, "oldRightRow", rowKeyChunk.get(chunkPosition), "rowKeyChunk.get(chunkPosition)");
@@ -130,7 +130,7 @@ protected void addRightSide(RowSequence rowSequence, Chunk[] sourceKeyChunks,
             final int hash = hash(k0);
             final int firstTableLocation = hashToTableLocation(hash);
             int tableLocation = firstTableLocation;
-            while (leftRowSet.getUnsafe(tableLocation) != null) {
+            while (!isStateEmpty(leftRowSet.getUnsafe(tableLocation))) {
                 if (eq(mainKeySource0.getUnsafe(tableLocation), k0)) {
                     final long oldRightRow = rightRowKey.getAndSetUnsafe(tableLocation, rowKeyChunk.get(chunkPosition));
                     if (oldRightRow != RowSet.NULL_ROW_KEY && oldRightRow != QueryConstants.NULL_LONG) {
@@ -156,7 +156,7 @@ protected void modifyByRight(RowSequence rowSequence, Chunk[] sourceKeyChunks,
             final int hash = hash(k0);
             final int firstTableLocation = hashToTableLocation(hash);
             int tableLocation = firstTableLocation;
-            while (leftRowSet.getUnsafe(tableLocation) != null) {
+            while (!isStateEmpty(leftRowSet.getUnsafe(tableLocation))) {
                 if (eq(mainKeySource0.getUnsafe(tableLocation), k0)) {
                     final long oldRightRow = rightRowKey.getUnsafe(tableLocation);
                     Assert.eq(oldRightRow, "oldRightRow", rowKeyChunk.get(chunkPosition), "rowKeyChunk.get(chunkPosition)");
@@ -179,7 +179,7 @@ protected void applyRightShift(RowSequence rowSequence, Chunk[] sourceKeyChunks,
             final int hash = hash(k0);
             final int firstTableLocation = hashToTableLocation(hash);
             int tableLocation = firstTableLocation;
-            while (leftRowSet.getUnsafe(tableLocation) != null) {
+            while (!isStateEmpty(leftRowSet.getUnsafe(tableLocation))) {
                 if (eq(mainKeySource0.getUnsafe(tableLocation), k0)) {
                     final long oldRightRow = rightRowKey.getAndSetUnsafe(tableLocation, rowKeyChunk.get(chunkPosition));
                     Assert.eq(oldRightRow + shiftDelta, "oldRightRow + shiftDelta", rowKeyChunk.get(chunkPosition), "rowKeyChunk.get(chunkPosition)");
@@ -197,6 +197,10 @@ private static int hash(byte k0) {
         return hash;
     }
 
+    private static boolean isStateEmpty(RowSet state) {
+        return state == null;
+    }
+
     @Override
     protected void rehashInternalFull(final int oldSize) {
         final byte[] destKeyArray0 = new byte[tableSize];
@@ -214,7 +218,7 @@ protected void rehashInternalFull(final int oldSize) {
         modifiedTrackerCookieSource.setArray(destModifiedCookie);
         for (int sourceBucket = 0; sourceBucket < oldSize; ++sourceBucket) {
             final RowSet currentStateValue = (RowSet)originalStateArray[sourceBucket];
-            if (currentStateValue == null) {
+            if (isStateEmpty(currentStateValue)) {
                 continue;
             }
             final byte k0 = originalKeyArray0[sourceBucket];
@@ -222,7 +226,7 @@ protected void rehashInternalFull(final int oldSize) {
             final int firstDestinationTableLocation = hashToTableLocation(hash);
             int destinationTableLocation = firstDestinationTableLocation;
             while (true) {
-                if (destState[destinationTableLocation] == null) {
+                if (isStateEmpty((RowSet)destState[destinationTableLocation])) {
                     destKeyArray0[destinationTableLocation] = k0;
                     destState[destinationTableLocation] = originalStateArray[sourceBucket];
                     destRightRowKey[destinationTableLocation] = oldRightRowKey[sourceBucket];
diff --git a/engine/table/src/main/java/io/deephaven/engine/table/impl/naturaljoin/typed/rightincopen/gen/RightIncrementalNaturalJoinHasherChar.java b/engine/table/src/main/java/io/deephaven/engine/table/impl/naturaljoin/typed/rightincopen/gen/RightIncrementalNaturalJoinHasherChar.java
index 28f9af4eb01..210cc7d9fa7 100644
--- a/engine/table/src/main/java/io/deephaven/engine/table/impl/naturaljoin/typed/rightincopen/gen/RightIncrementalNaturalJoinHasherChar.java
+++ b/engine/table/src/main/java/io/deephaven/engine/table/impl/naturaljoin/typed/rightincopen/gen/RightIncrementalNaturalJoinHasherChar.java
@@ -53,7 +53,7 @@ protected void buildFromLeftSide(RowSequence rowSequence, Chunk[] sourceKeyChunk
             int tableLocation = firstTableLocation;
             while (true) {
                 RowSet leftRowSetForState = leftRowSet.getUnsafe(tableLocation);
-                if (leftRowSetForState == null) {
+                if (isStateEmpty(leftRowSetForState)) {
                     numEntries++;
                     mainKeySource0.set(tableLocation, k0);
                     final long leftRowKey = rowKeyChunk.get(chunkPosition);
@@ -82,7 +82,7 @@ protected void addRightSide(RowSequence rowSequence, Chunk[] sourceKeyChunks) {
             final int hash = hash(k0);
             final int firstTableLocation = hashToTableLocation(hash);
             int tableLocation = firstTableLocation;
-            while (leftRowSet.getUnsafe(tableLocation) != null) {
+            while (!isStateEmpty(leftRowSet.getUnsafe(tableLocation))) {
                 if (eq(mainKeySource0.getUnsafe(tableLocation), k0)) {
                     final long rightRowKeyForState = rightRowKey.getAndSetUnsafe(tableLocation, rowKeyChunk.get(chunkPosition));
                     if (rightRowKeyForState != RowSet.NULL_ROW_KEY && rightRowKeyForState != QueryConstants.NULL_LONG) {
@@ -107,7 +107,7 @@ protected void removeRight(RowSequence rowSequence, Chunk[] sourceKeyChunks,
             final int hash = hash(k0);
             final int firstTableLocation = hashToTableLocation(hash);
             int tableLocation = firstTableLocation;
-            while (leftRowSet.getUnsafe(tableLocation) != null) {
+            while (!isStateEmpty(leftRowSet.getUnsafe(tableLocation))) {
                 if (eq(mainKeySource0.getUnsafe(tableLocation), k0)) {
                     final long oldRightRow = rightRowKey.getAndSetUnsafe(tableLocation, RowSet.NULL_ROW_KEY);
                     Assert.eq(oldRightRow, "oldRightRow", rowKeyChunk.get(chunkPosition), "rowKeyChunk.get(chunkPosition)");
@@ -130,7 +130,7 @@ protected void addRightSide(RowSequence rowSequence, Chunk[] sourceKeyChunks,
             final int hash = hash(k0);
             final int firstTableLocation = hashToTableLocation(hash);
             int tableLocation = firstTableLocation;
-            while (leftRowSet.getUnsafe(tableLocation) != null) {
+            while (!isStateEmpty(leftRowSet.getUnsafe(tableLocation))) {
                 if (eq(mainKeySource0.getUnsafe(tableLocation), k0)) {
                     final long oldRightRow = rightRowKey.getAndSetUnsafe(tableLocation, rowKeyChunk.get(chunkPosition));
                     if (oldRightRow != RowSet.NULL_ROW_KEY && oldRightRow != QueryConstants.NULL_LONG) {
@@ -156,7 +156,7 @@ protected void modifyByRight(RowSequence rowSequence, Chunk[] sourceKeyChunks,
             final int hash = hash(k0);
             final int firstTableLocation = hashToTableLocation(hash);
             int tableLocation = firstTableLocation;
-            while (leftRowSet.getUnsafe(tableLocation) != null) {
+            while (!isStateEmpty(leftRowSet.getUnsafe(tableLocation))) {
                 if (eq(mainKeySource0.getUnsafe(tableLocation), k0)) {
                     final long oldRightRow = rightRowKey.getUnsafe(tableLocation);
                     Assert.eq(oldRightRow, "oldRightRow", rowKeyChunk.get(chunkPosition), "rowKeyChunk.get(chunkPosition)");
@@ -179,7 +179,7 @@ protected void applyRightShift(RowSequence rowSequence, Chunk[] sourceKeyChunks,
             final int hash = hash(k0);
             final int firstTableLocation = hashToTableLocation(hash);
             int tableLocation = firstTableLocation;
-            while (leftRowSet.getUnsafe(tableLocation) != null) {
+            while (!isStateEmpty(leftRowSet.getUnsafe(tableLocation))) {
                 if (eq(mainKeySource0.getUnsafe(tableLocation), k0)) {
                     final long oldRightRow = rightRowKey.getAndSetUnsafe(tableLocation, rowKeyChunk.get(chunkPosition));
                     Assert.eq(oldRightRow + shiftDelta, "oldRightRow + shiftDelta", rowKeyChunk.get(chunkPosition), "rowKeyChunk.get(chunkPosition)");
@@ -197,6 +197,10 @@ private static int hash(char k0) {
         return hash;
     }
 
+    private static boolean isStateEmpty(RowSet state) {
+        return state == null;
+    }
+
     @Override
     protected void rehashInternalFull(final int oldSize) {
         final char[] destKeyArray0 = new char[tableSize];
@@ -214,7 +218,7 @@ protected void rehashInternalFull(final int oldSize) {
         modifiedTrackerCookieSource.setArray(destModifiedCookie);
         for (int sourceBucket = 0; sourceBucket < oldSize; ++sourceBucket) {
             final RowSet currentStateValue = (RowSet)originalStateArray[sourceBucket];
-            if (currentStateValue == null) {
+            if (isStateEmpty(currentStateValue)) {
                 continue;
             }
             final char k0 = originalKeyArray0[sourceBucket];
@@ -222,7 +226,7 @@ protected void rehashInternalFull(final int oldSize) {
             final int firstDestinationTableLocation = hashToTableLocation(hash);
             int destinationTableLocation = firstDestinationTableLocation;
             while (true) {
-                if (destState[destinationTableLocation] == null) {
+                if (isStateEmpty((RowSet)destState[destinationTableLocation])) {
                     destKeyArray0[destinationTableLocation] = k0;
                     destState[destinationTableLocation] = originalStateArray[sourceBucket];
                     destRightRowKey[destinationTableLocation] = oldRightRowKey[sourceBucket];
diff --git a/engine/table/src/main/java/io/deephaven/engine/table/impl/naturaljoin/typed/rightincopen/gen/RightIncrementalNaturalJoinHasherDouble.java b/engine/table/src/main/java/io/deephaven/engine/table/impl/naturaljoin/typed/rightincopen/gen/RightIncrementalNaturalJoinHasherDouble.java
index 6d13e52cd01..9bc572fb5aa 100644
--- a/engine/table/src/main/java/io/deephaven/engine/table/impl/naturaljoin/typed/rightincopen/gen/RightIncrementalNaturalJoinHasherDouble.java
+++ b/engine/table/src/main/java/io/deephaven/engine/table/impl/naturaljoin/typed/rightincopen/gen/RightIncrementalNaturalJoinHasherDouble.java
@@ -53,7 +53,7 @@ protected void buildFromLeftSide(RowSequence rowSequence, Chunk[] sourceKeyChunk
             int tableLocation = firstTableLocation;
             while (true) {
                 RowSet leftRowSetForState = leftRowSet.getUnsafe(tableLocation);
-                if (leftRowSetForState == null) {
+                if (isStateEmpty(leftRowSetForState)) {
                     numEntries++;
                     mainKeySource0.set(tableLocation, k0);
                     final long leftRowKey = rowKeyChunk.get(chunkPosition);
@@ -82,7 +82,7 @@ protected void addRightSide(RowSequence rowSequence, Chunk[] sourceKeyChunks) {
             final int hash = hash(k0);
             final int firstTableLocation = hashToTableLocation(hash);
             int tableLocation = firstTableLocation;
-            while (leftRowSet.getUnsafe(tableLocation) != null) {
+            while (!isStateEmpty(leftRowSet.getUnsafe(tableLocation))) {
                 if (eq(mainKeySource0.getUnsafe(tableLocation), k0)) {
                     final long rightRowKeyForState = rightRowKey.getAndSetUnsafe(tableLocation, rowKeyChunk.get(chunkPosition));
                     if (rightRowKeyForState != RowSet.NULL_ROW_KEY && rightRowKeyForState != QueryConstants.NULL_LONG) {
@@ -107,7 +107,7 @@ protected void removeRight(RowSequence rowSequence, Chunk[] sourceKeyChunks,
             final int hash = hash(k0);
             final int firstTableLocation = hashToTableLocation(hash);
             int tableLocation = firstTableLocation;
-            while (leftRowSet.getUnsafe(tableLocation) != null) {
+            while (!isStateEmpty(leftRowSet.getUnsafe(tableLocation))) {
                 if (eq(mainKeySource0.getUnsafe(tableLocation), k0)) {
                     final long oldRightRow = rightRowKey.getAndSetUnsafe(tableLocation, RowSet.NULL_ROW_KEY);
                     Assert.eq(oldRightRow, "oldRightRow", rowKeyChunk.get(chunkPosition), "rowKeyChunk.get(chunkPosition)");
@@ -130,7 +130,7 @@ protected void addRightSide(RowSequence rowSequence, Chunk[] sourceKeyChunks,
             final int hash = hash(k0);
             final int firstTableLocation = hashToTableLocation(hash);
             int tableLocation = firstTableLocation;
-            while (leftRowSet.getUnsafe(tableLocation) != null) {
+            while (!isStateEmpty(leftRowSet.getUnsafe(tableLocation))) {
                 if (eq(mainKeySource0.getUnsafe(tableLocation), k0)) {
                     final long oldRightRow = rightRowKey.getAndSetUnsafe(tableLocation, rowKeyChunk.get(chunkPosition));
                     if (oldRightRow != RowSet.NULL_ROW_KEY && oldRightRow != QueryConstants.NULL_LONG) {
@@ -156,7 +156,7 @@ protected void modifyByRight(RowSequence rowSequence, Chunk[] sourceKeyChunks,
             final int hash = hash(k0);
             final int firstTableLocation = hashToTableLocation(hash);
             int tableLocation = firstTableLocation;
-            while (leftRowSet.getUnsafe(tableLocation) != null) {
+            while (!isStateEmpty(leftRowSet.getUnsafe(tableLocation))) {
                 if (eq(mainKeySource0.getUnsafe(tableLocation), k0)) {
                     final long oldRightRow = rightRowKey.getUnsafe(tableLocation);
                     Assert.eq(oldRightRow, "oldRightRow", rowKeyChunk.get(chunkPosition), "rowKeyChunk.get(chunkPosition)");
@@ -179,7 +179,7 @@ protected void applyRightShift(RowSequence rowSequence, Chunk[] sourceKeyChunks,
             final int hash = hash(k0);
             final int firstTableLocation = hashToTableLocation(hash);
             int tableLocation = firstTableLocation;
-            while (leftRowSet.getUnsafe(tableLocation) != null) {
+            while (!isStateEmpty(leftRowSet.getUnsafe(tableLocation))) {
                 if (eq(mainKeySource0.getUnsafe(tableLocation), k0)) {
                     final long oldRightRow = rightRowKey.getAndSetUnsafe(tableLocation, rowKeyChunk.get(chunkPosition));
                     Assert.eq(oldRightRow + shiftDelta, "oldRightRow + shiftDelta", rowKeyChunk.get(chunkPosition), "rowKeyChunk.get(chunkPosition)");
@@ -197,6 +197,10 @@ private static int hash(double k0) {
         return hash;
     }
 
+    private static boolean isStateEmpty(RowSet state) {
+        return state == null;
+    }
+
     @Override
     protected void rehashInternalFull(final int oldSize) {
         final double[] destKeyArray0 = new double[tableSize];
@@ -214,7 +218,7 @@ protected void rehashInternalFull(final int oldSize) {
         modifiedTrackerCookieSource.setArray(destModifiedCookie);
         for (int sourceBucket = 0; sourceBucket < oldSize; ++sourceBucket) {
             final RowSet currentStateValue = (RowSet)originalStateArray[sourceBucket];
-            if (currentStateValue == null) {
+            if (isStateEmpty(currentStateValue)) {
                 continue;
             }
             final double k0 = originalKeyArray0[sourceBucket];
@@ -222,7 +226,7 @@ protected void rehashInternalFull(final int oldSize) {
             final int firstDestinationTableLocation = hashToTableLocation(hash);
             int destinationTableLocation = firstDestinationTableLocation;
             while (true) {
-                if (destState[destinationTableLocation] == null) {
+                if (isStateEmpty((RowSet)destState[destinationTableLocation])) {
                     destKeyArray0[destinationTableLocation] = k0;
                     destState[destinationTableLocation] = originalStateArray[sourceBucket];
                     destRightRowKey[destinationTableLocation] = oldRightRowKey[sourceBucket];
diff --git a/engine/table/src/main/java/io/deephaven/engine/table/impl/naturaljoin/typed/rightincopen/gen/RightIncrementalNaturalJoinHasherFloat.java b/engine/table/src/main/java/io/deephaven/engine/table/impl/naturaljoin/typed/rightincopen/gen/RightIncrementalNaturalJoinHasherFloat.java
index 99b6759d7e8..0423268c788 100644
--- a/engine/table/src/main/java/io/deephaven/engine/table/impl/naturaljoin/typed/rightincopen/gen/RightIncrementalNaturalJoinHasherFloat.java
+++ b/engine/table/src/main/java/io/deephaven/engine/table/impl/naturaljoin/typed/rightincopen/gen/RightIncrementalNaturalJoinHasherFloat.java
@@ -53,7 +53,7 @@ protected void buildFromLeftSide(RowSequence rowSequence, Chunk[] sourceKeyChunk
             int tableLocation = firstTableLocation;
             while (true) {
                 RowSet leftRowSetForState = leftRowSet.getUnsafe(tableLocation);
-                if (leftRowSetForState == null) {
+                if (isStateEmpty(leftRowSetForState)) {
                     numEntries++;
                     mainKeySource0.set(tableLocation, k0);
                     final long leftRowKey = rowKeyChunk.get(chunkPosition);
@@ -82,7 +82,7 @@ protected void addRightSide(RowSequence rowSequence, Chunk[] sourceKeyChunks) {
             final int hash = hash(k0);
             final int firstTableLocation = hashToTableLocation(hash);
             int tableLocation = firstTableLocation;
-            while (leftRowSet.getUnsafe(tableLocation) != null) {
+            while (!isStateEmpty(leftRowSet.getUnsafe(tableLocation))) {
                 if (eq(mainKeySource0.getUnsafe(tableLocation), k0)) {
                     final long rightRowKeyForState = rightRowKey.getAndSetUnsafe(tableLocation, rowKeyChunk.get(chunkPosition));
                     if (rightRowKeyForState != RowSet.NULL_ROW_KEY && rightRowKeyForState != QueryConstants.NULL_LONG) {
@@ -107,7 +107,7 @@ protected void removeRight(RowSequence rowSequence, Chunk[] sourceKeyChunks,
             final int hash = hash(k0);
             final int firstTableLocation = hashToTableLocation(hash);
             int tableLocation = firstTableLocation;
-            while (leftRowSet.getUnsafe(tableLocation) != null) {
+            while (!isStateEmpty(leftRowSet.getUnsafe(tableLocation))) {
                 if (eq(mainKeySource0.getUnsafe(tableLocation), k0)) {
                     final long oldRightRow = rightRowKey.getAndSetUnsafe(tableLocation, RowSet.NULL_ROW_KEY);
                     Assert.eq(oldRightRow, "oldRightRow", rowKeyChunk.get(chunkPosition), "rowKeyChunk.get(chunkPosition)");
@@ -130,7 +130,7 @@ protected void addRightSide(RowSequence rowSequence, Chunk[] sourceKeyChunks,
             final int hash = hash(k0);
             final int firstTableLocation = hashToTableLocation(hash);
             int tableLocation = firstTableLocation;
-            while (leftRowSet.getUnsafe(tableLocation) != null) {
+            while (!isStateEmpty(leftRowSet.getUnsafe(tableLocation))) {
                 if (eq(mainKeySource0.getUnsafe(tableLocation), k0)) {
                     final long oldRightRow = rightRowKey.getAndSetUnsafe(tableLocation, rowKeyChunk.get(chunkPosition));
                     if (oldRightRow != RowSet.NULL_ROW_KEY && oldRightRow != QueryConstants.NULL_LONG) {
@@ -156,7 +156,7 @@ protected void modifyByRight(RowSequence rowSequence, Chunk[] sourceKeyChunks,
             final int hash = hash(k0);
             final int firstTableLocation = hashToTableLocation(hash);
             int tableLocation = firstTableLocation;
-            while (leftRowSet.getUnsafe(tableLocation) != null) {
+            while (!isStateEmpty(leftRowSet.getUnsafe(tableLocation))) {
                 if (eq(mainKeySource0.getUnsafe(tableLocation), k0)) {
                     final long oldRightRow = rightRowKey.getUnsafe(tableLocation);
                     Assert.eq(oldRightRow, "oldRightRow", rowKeyChunk.get(chunkPosition), "rowKeyChunk.get(chunkPosition)");
@@ -179,7 +179,7 @@ protected void applyRightShift(RowSequence rowSequence, Chunk[] sourceKeyChunks,
             final int hash = hash(k0);
             final int firstTableLocation = hashToTableLocation(hash);
             int tableLocation = firstTableLocation;
-            while (leftRowSet.getUnsafe(tableLocation) != null) {
+            while (!isStateEmpty(leftRowSet.getUnsafe(tableLocation))) {
                 if (eq(mainKeySource0.getUnsafe(tableLocation), k0)) {
                     final long oldRightRow = rightRowKey.getAndSetUnsafe(tableLocation, rowKeyChunk.get(chunkPosition));
                     Assert.eq(oldRightRow + shiftDelta, "oldRightRow + shiftDelta", rowKeyChunk.get(chunkPosition), "rowKeyChunk.get(chunkPosition)");
@@ -197,6 +197,10 @@ private static int hash(float k0) {
         return hash;
     }
 
+    private static boolean isStateEmpty(RowSet state) {
+        return state == null;
+    }
+
     @Override
     protected void rehashInternalFull(final int oldSize) {
         final float[] destKeyArray0 = new float[tableSize];
@@ -214,7 +218,7 @@ protected void rehashInternalFull(final int oldSize) {
         modifiedTrackerCookieSource.setArray(destModifiedCookie);
         for (int sourceBucket = 0; sourceBucket < oldSize; ++sourceBucket) {
             final RowSet currentStateValue = (RowSet)originalStateArray[sourceBucket];
-            if (currentStateValue == null) {
+            if (isStateEmpty(currentStateValue)) {
                 continue;
             }
             final float k0 = originalKeyArray0[sourceBucket];
@@ -222,7 +226,7 @@ protected void rehashInternalFull(final int oldSize) {
             final int firstDestinationTableLocation = hashToTableLocation(hash);
             int destinationTableLocation = firstDestinationTableLocation;
             while (true) {
-                if (destState[destinationTableLocation] == null) {
+                if (isStateEmpty((RowSet)destState[destinationTableLocation])) {
                     destKeyArray0[destinationTableLocation] = k0;
                     destState[destinationTableLocation] = originalStateArray[sourceBucket];
                     destRightRowKey[destinationTableLocation] = oldRightRowKey[sourceBucket];
diff --git a/engine/table/src/main/java/io/deephaven/engine/table/impl/naturaljoin/typed/rightincopen/gen/RightIncrementalNaturalJoinHasherInt.java b/engine/table/src/main/java/io/deephaven/engine/table/impl/naturaljoin/typed/rightincopen/gen/RightIncrementalNaturalJoinHasherInt.java
index c47a9e95815..a6810e81b61 100644
--- a/engine/table/src/main/java/io/deephaven/engine/table/impl/naturaljoin/typed/rightincopen/gen/RightIncrementalNaturalJoinHasherInt.java
+++ b/engine/table/src/main/java/io/deephaven/engine/table/impl/naturaljoin/typed/rightincopen/gen/RightIncrementalNaturalJoinHasherInt.java
@@ -53,7 +53,7 @@ protected void buildFromLeftSide(RowSequence rowSequence, Chunk[] sourceKeyChunk
             int tableLocation = firstTableLocation;
             while (true) {
                 RowSet leftRowSetForState = leftRowSet.getUnsafe(tableLocation);
-                if (leftRowSetForState == null) {
+                if (isStateEmpty(leftRowSetForState)) {
                     numEntries++;
                     mainKeySource0.set(tableLocation, k0);
                     final long leftRowKey = rowKeyChunk.get(chunkPosition);
@@ -82,7 +82,7 @@ protected void addRightSide(RowSequence rowSequence, Chunk[] sourceKeyChunks) {
             final int hash = hash(k0);
             final int firstTableLocation = hashToTableLocation(hash);
             int tableLocation = firstTableLocation;
-            while (leftRowSet.getUnsafe(tableLocation) != null) {
+            while (!isStateEmpty(leftRowSet.getUnsafe(tableLocation))) {
                 if (eq(mainKeySource0.getUnsafe(tableLocation), k0)) {
                     final long rightRowKeyForState = rightRowKey.getAndSetUnsafe(tableLocation, rowKeyChunk.get(chunkPosition));
                     if (rightRowKeyForState != RowSet.NULL_ROW_KEY && rightRowKeyForState != QueryConstants.NULL_LONG) {
@@ -107,7 +107,7 @@ protected void removeRight(RowSequence rowSequence, Chunk[] sourceKeyChunks,
             final int hash = hash(k0);
             final int firstTableLocation = hashToTableLocation(hash);
             int tableLocation = firstTableLocation;
-            while (leftRowSet.getUnsafe(tableLocation) != null) {
+            while (!isStateEmpty(leftRowSet.getUnsafe(tableLocation))) {
                 if (eq(mainKeySource0.getUnsafe(tableLocation), k0)) {
                     final long oldRightRow = rightRowKey.getAndSetUnsafe(tableLocation, RowSet.NULL_ROW_KEY);
                     Assert.eq(oldRightRow, "oldRightRow", rowKeyChunk.get(chunkPosition), "rowKeyChunk.get(chunkPosition)");
@@ -130,7 +130,7 @@ protected void addRightSide(RowSequence rowSequence, Chunk[] sourceKeyChunks,
             final int hash = hash(k0);
             final int firstTableLocation = hashToTableLocation(hash);
             int tableLocation = firstTableLocation;
-            while (leftRowSet.getUnsafe(tableLocation) != null) {
+            while (!isStateEmpty(leftRowSet.getUnsafe(tableLocation))) {
                 if (eq(mainKeySource0.getUnsafe(tableLocation), k0)) {
                     final long oldRightRow = rightRowKey.getAndSetUnsafe(tableLocation, rowKeyChunk.get(chunkPosition));
                     if (oldRightRow != RowSet.NULL_ROW_KEY && oldRightRow != QueryConstants.NULL_LONG) {
@@ -156,7 +156,7 @@ protected void modifyByRight(RowSequence rowSequence, Chunk[] sourceKeyChunks,
             final int hash = hash(k0);
             final int firstTableLocation = hashToTableLocation(hash);
             int tableLocation = firstTableLocation;
-            while (leftRowSet.getUnsafe(tableLocation) != null) {
+            while (!isStateEmpty(leftRowSet.getUnsafe(tableLocation))) {
                 if (eq(mainKeySource0.getUnsafe(tableLocation), k0)) {
                     final long oldRightRow = rightRowKey.getUnsafe(tableLocation);
                     Assert.eq(oldRightRow, "oldRightRow", rowKeyChunk.get(chunkPosition), "rowKeyChunk.get(chunkPosition)");
@@ -179,7 +179,7 @@ protected void applyRightShift(RowSequence rowSequence, Chunk[] sourceKeyChunks,
             final int hash = hash(k0);
             final int firstTableLocation = hashToTableLocation(hash);
             int tableLocation = firstTableLocation;
-            while (leftRowSet.getUnsafe(tableLocation) != null) {
+            while (!isStateEmpty(leftRowSet.getUnsafe(tableLocation))) {
                 if (eq(mainKeySource0.getUnsafe(tableLocation), k0)) {
                     final long oldRightRow = rightRowKey.getAndSetUnsafe(tableLocation, rowKeyChunk.get(chunkPosition));
                     Assert.eq(oldRightRow + shiftDelta, "oldRightRow + shiftDelta", rowKeyChunk.get(chunkPosition), "rowKeyChunk.get(chunkPosition)");
@@ -197,6 +197,10 @@ private static int hash(int k0) {
         return hash;
     }
 
+    private static boolean isStateEmpty(RowSet state) {
+        return state == null;
+    }
+
     @Override
     protected void rehashInternalFull(final int oldSize) {
         final int[] destKeyArray0 = new int[tableSize];
@@ -214,7 +218,7 @@ protected void rehashInternalFull(final int oldSize) {
         modifiedTrackerCookieSource.setArray(destModifiedCookie);
         for (int sourceBucket = 0; sourceBucket < oldSize; ++sourceBucket) {
             final RowSet currentStateValue = (RowSet)originalStateArray[sourceBucket];
-            if (currentStateValue == null) {
+            if (isStateEmpty(currentStateValue)) {
                 continue;
             }
             final int k0 = originalKeyArray0[sourceBucket];
@@ -222,7 +226,7 @@ protected void rehashInternalFull(final int oldSize) {
             final int firstDestinationTableLocation = hashToTableLocation(hash);
             int destinationTableLocation = firstDestinationTableLocation;
             while (true) {
-                if (destState[destinationTableLocation] == null) {
+                if (isStateEmpty((RowSet)destState[destinationTableLocation])) {
                     destKeyArray0[destinationTableLocation] = k0;
                     destState[destinationTableLocation] = originalStateArray[sourceBucket];
                     destRightRowKey[destinationTableLocation] = oldRightRowKey[sourceBucket];
diff --git a/engine/table/src/main/java/io/deephaven/engine/table/impl/naturaljoin/typed/rightincopen/gen/RightIncrementalNaturalJoinHasherLong.java b/engine/table/src/main/java/io/deephaven/engine/table/impl/naturaljoin/typed/rightincopen/gen/RightIncrementalNaturalJoinHasherLong.java
index 4b91cd1950e..ea3e8caf3c6 100644
--- a/engine/table/src/main/java/io/deephaven/engine/table/impl/naturaljoin/typed/rightincopen/gen/RightIncrementalNaturalJoinHasherLong.java
+++ b/engine/table/src/main/java/io/deephaven/engine/table/impl/naturaljoin/typed/rightincopen/gen/RightIncrementalNaturalJoinHasherLong.java
@@ -52,7 +52,7 @@ protected void buildFromLeftSide(RowSequence rowSequence, Chunk[] sourceKeyChunk
             int tableLocation = firstTableLocation;
             while (true) {
                 RowSet leftRowSetForState = leftRowSet.getUnsafe(tableLocation);
-                if (leftRowSetForState == null) {
+                if (isStateEmpty(leftRowSetForState)) {
                     numEntries++;
                     mainKeySource0.set(tableLocation, k0);
                     final long leftRowKey = rowKeyChunk.get(chunkPosition);
@@ -81,7 +81,7 @@ protected void addRightSide(RowSequence rowSequence, Chunk[] sourceKeyChunks) {
             final int hash = hash(k0);
             final int firstTableLocation = hashToTableLocation(hash);
             int tableLocation = firstTableLocation;
-            while (leftRowSet.getUnsafe(tableLocation) != null) {
+            while (!isStateEmpty(leftRowSet.getUnsafe(tableLocation))) {
                 if (eq(mainKeySource0.getUnsafe(tableLocation), k0)) {
                     final long rightRowKeyForState = rightRowKey.getAndSetUnsafe(tableLocation, rowKeyChunk.get(chunkPosition));
                     if (rightRowKeyForState != RowSet.NULL_ROW_KEY && rightRowKeyForState != QueryConstants.NULL_LONG) {
@@ -106,7 +106,7 @@ protected void removeRight(RowSequence rowSequence, Chunk[] sourceKeyChunks,
             final int hash = hash(k0);
             final int firstTableLocation = hashToTableLocation(hash);
             int tableLocation = firstTableLocation;
-            while (leftRowSet.getUnsafe(tableLocation) != null) {
+            while (!isStateEmpty(leftRowSet.getUnsafe(tableLocation))) {
                 if (eq(mainKeySource0.getUnsafe(tableLocation), k0)) {
                     final long oldRightRow = rightRowKey.getAndSetUnsafe(tableLocation, RowSet.NULL_ROW_KEY);
                     Assert.eq(oldRightRow, "oldRightRow", rowKeyChunk.get(chunkPosition), "rowKeyChunk.get(chunkPosition)");
@@ -129,7 +129,7 @@ protected void addRightSide(RowSequence rowSequence, Chunk[] sourceKeyChunks,
             final int hash = hash(k0);
             final int firstTableLocation = hashToTableLocation(hash);
             int tableLocation = firstTableLocation;
-            while (leftRowSet.getUnsafe(tableLocation) != null) {
+            while (!isStateEmpty(leftRowSet.getUnsafe(tableLocation))) {
                 if (eq(mainKeySource0.getUnsafe(tableLocation), k0)) {
                     final long oldRightRow = rightRowKey.getAndSetUnsafe(tableLocation, rowKeyChunk.get(chunkPosition));
                     if (oldRightRow != RowSet.NULL_ROW_KEY && oldRightRow != QueryConstants.NULL_LONG) {
@@ -155,7 +155,7 @@ protected void modifyByRight(RowSequence rowSequence, Chunk[] sourceKeyChunks,
             final int hash = hash(k0);
             final int firstTableLocation = hashToTableLocation(hash);
             int tableLocation = firstTableLocation;
-            while (leftRowSet.getUnsafe(tableLocation) != null) {
+            while (!isStateEmpty(leftRowSet.getUnsafe(tableLocation))) {
                 if (eq(mainKeySource0.getUnsafe(tableLocation), k0)) {
                     final long oldRightRow = rightRowKey.getUnsafe(tableLocation);
                     Assert.eq(oldRightRow, "oldRightRow", rowKeyChunk.get(chunkPosition), "rowKeyChunk.get(chunkPosition)");
@@ -178,7 +178,7 @@ protected void applyRightShift(RowSequence rowSequence, Chunk[] sourceKeyChunks,
             final int hash = hash(k0);
             final int firstTableLocation = hashToTableLocation(hash);
             int tableLocation = firstTableLocation;
-            while (leftRowSet.getUnsafe(tableLocation) != null) {
+            while (!isStateEmpty(leftRowSet.getUnsafe(tableLocation))) {
                 if (eq(mainKeySource0.getUnsafe(tableLocation), k0)) {
                     final long oldRightRow = rightRowKey.getAndSetUnsafe(tableLocation, rowKeyChunk.get(chunkPosition));
                     Assert.eq(oldRightRow + shiftDelta, "oldRightRow + shiftDelta", rowKeyChunk.get(chunkPosition), "rowKeyChunk.get(chunkPosition)");
@@ -196,6 +196,10 @@ private static int hash(long k0) {
         return hash;
     }
 
+    private static boolean isStateEmpty(RowSet state) {
+        return state == null;
+    }
+
     @Override
     protected void rehashInternalFull(final int oldSize) {
         final long[] destKeyArray0 = new long[tableSize];
@@ -213,7 +217,7 @@ protected void rehashInternalFull(final int oldSize) {
         modifiedTrackerCookieSource.setArray(destModifiedCookie);
         for (int sourceBucket = 0; sourceBucket < oldSize; ++sourceBucket) {
             final RowSet currentStateValue = (RowSet)originalStateArray[sourceBucket];
-            if (currentStateValue == null) {
+            if (isStateEmpty(currentStateValue)) {
                 continue;
             }
             final long k0 = originalKeyArray0[sourceBucket];
@@ -221,7 +225,7 @@ protected void rehashInternalFull(final int oldSize) {
             final int firstDestinationTableLocation = hashToTableLocation(hash);
             int destinationTableLocation = firstDestinationTableLocation;
             while (true) {
-                if (destState[destinationTableLocation] == null) {
+                if (isStateEmpty((RowSet)destState[destinationTableLocation])) {
                     destKeyArray0[destinationTableLocation] = k0;
                     destState[destinationTableLocation] = originalStateArray[sourceBucket];
                     destRightRowKey[destinationTableLocation] = oldRightRowKey[sourceBucket];
diff --git a/engine/table/src/main/java/io/deephaven/engine/table/impl/naturaljoin/typed/rightincopen/gen/RightIncrementalNaturalJoinHasherObject.java b/engine/table/src/main/java/io/deephaven/engine/table/impl/naturaljoin/typed/rightincopen/gen/RightIncrementalNaturalJoinHasherObject.java
index 7b8c83ff7a8..e929931aac9 100644
--- a/engine/table/src/main/java/io/deephaven/engine/table/impl/naturaljoin/typed/rightincopen/gen/RightIncrementalNaturalJoinHasherObject.java
+++ b/engine/table/src/main/java/io/deephaven/engine/table/impl/naturaljoin/typed/rightincopen/gen/RightIncrementalNaturalJoinHasherObject.java
@@ -54,7 +54,7 @@ protected void buildFromLeftSide(RowSequence rowSequence, Chunk[] sourceKeyChunk
             int tableLocation = firstTableLocation;
             while (true) {
                 RowSet leftRowSetForState = leftRowSet.getUnsafe(tableLocation);
-                if (leftRowSetForState == null) {
+                if (isStateEmpty(leftRowSetForState)) {
                     numEntries++;
                     mainKeySource0.set(tableLocation, k0);
                     final long leftRowKey = rowKeyChunk.get(chunkPosition);
@@ -83,7 +83,7 @@ protected void addRightSide(RowSequence rowSequence, Chunk[] sourceKeyChunks) {
             final int hash = hash(k0);
             final int firstTableLocation = hashToTableLocation(hash);
             int tableLocation = firstTableLocation;
-            while (leftRowSet.getUnsafe(tableLocation) != null) {
+            while (!isStateEmpty(leftRowSet.getUnsafe(tableLocation))) {
                 if (eq(mainKeySource0.getUnsafe(tableLocation), k0)) {
                     final long rightRowKeyForState = rightRowKey.getAndSetUnsafe(tableLocation, rowKeyChunk.get(chunkPosition));
                     if (rightRowKeyForState != RowSet.NULL_ROW_KEY && rightRowKeyForState != QueryConstants.NULL_LONG) {
@@ -108,7 +108,7 @@ protected void removeRight(RowSequence rowSequence, Chunk[] sourceKeyChunks,
             final int hash = hash(k0);
             final int firstTableLocation = hashToTableLocation(hash);
             int tableLocation = firstTableLocation;
-            while (leftRowSet.getUnsafe(tableLocation) != null) {
+            while (!isStateEmpty(leftRowSet.getUnsafe(tableLocation))) {
                 if (eq(mainKeySource0.getUnsafe(tableLocation), k0)) {
                     final long oldRightRow = rightRowKey.getAndSetUnsafe(tableLocation, RowSet.NULL_ROW_KEY);
                     Assert.eq(oldRightRow, "oldRightRow", rowKeyChunk.get(chunkPosition), "rowKeyChunk.get(chunkPosition)");
@@ -131,7 +131,7 @@ protected void addRightSide(RowSequence rowSequence, Chunk[] sourceKeyChunks,
             final int hash = hash(k0);
             final int firstTableLocation = hashToTableLocation(hash);
             int tableLocation = firstTableLocation;
-            while (leftRowSet.getUnsafe(tableLocation) != null) {
+            while (!isStateEmpty(leftRowSet.getUnsafe(tableLocation))) {
                 if (eq(mainKeySource0.getUnsafe(tableLocation), k0)) {
                     final long oldRightRow = rightRowKey.getAndSetUnsafe(tableLocation, rowKeyChunk.get(chunkPosition));
                     if (oldRightRow != RowSet.NULL_ROW_KEY && oldRightRow != QueryConstants.NULL_LONG) {
@@ -157,7 +157,7 @@ protected void modifyByRight(RowSequence rowSequence, Chunk[] sourceKeyChunks,
             final int hash = hash(k0);
             final int firstTableLocation = hashToTableLocation(hash);
             int tableLocation = firstTableLocation;
-            while (leftRowSet.getUnsafe(tableLocation) != null) {
+            while (!isStateEmpty(leftRowSet.getUnsafe(tableLocation))) {
                 if (eq(mainKeySource0.getUnsafe(tableLocation), k0)) {
                     final long oldRightRow = rightRowKey.getUnsafe(tableLocation);
                     Assert.eq(oldRightRow, "oldRightRow", rowKeyChunk.get(chunkPosition), "rowKeyChunk.get(chunkPosition)");
@@ -180,7 +180,7 @@ protected void applyRightShift(RowSequence rowSequence, Chunk[] sourceKeyChunks,
             final int hash = hash(k0);
             final int firstTableLocation = hashToTableLocation(hash);
             int tableLocation = firstTableLocation;
-            while (leftRowSet.getUnsafe(tableLocation) != null) {
+            while (!isStateEmpty(leftRowSet.getUnsafe(tableLocation))) {
                 if (eq(mainKeySource0.getUnsafe(tableLocation), k0)) {
                     final long oldRightRow = rightRowKey.getAndSetUnsafe(tableLocation, rowKeyChunk.get(chunkPosition));
                     Assert.eq(oldRightRow + shiftDelta, "oldRightRow + shiftDelta", rowKeyChunk.get(chunkPosition), "rowKeyChunk.get(chunkPosition)");
@@ -198,6 +198,10 @@ private static int hash(Object k0) {
         return hash;
     }
 
+    private static boolean isStateEmpty(RowSet state) {
+        return state == null;
+    }
+
     @Override
     protected void rehashInternalFull(final int oldSize) {
         final Object[] destKeyArray0 = new Object[tableSize];
@@ -215,7 +219,7 @@ protected void rehashInternalFull(final int oldSize) {
         modifiedTrackerCookieSource.setArray(destModifiedCookie);
         for (int sourceBucket = 0; sourceBucket < oldSize; ++sourceBucket) {
             final RowSet currentStateValue = (RowSet)originalStateArray[sourceBucket];
-            if (currentStateValue == null) {
+            if (isStateEmpty(currentStateValue)) {
                 continue;
             }
             final Object k0 = originalKeyArray0[sourceBucket];
@@ -223,7 +227,7 @@ protected void rehashInternalFull(final int oldSize) {
             final int firstDestinationTableLocation = hashToTableLocation(hash);
             int destinationTableLocation = firstDestinationTableLocation;
             while (true) {
-                if (destState[destinationTableLocation] == null) {
+                if (isStateEmpty((RowSet)destState[destinationTableLocation])) {
                     destKeyArray0[destinationTableLocation] = k0;
                     destState[destinationTableLocation] = originalStateArray[sourceBucket];
                     destRightRowKey[destinationTableLocation] = oldRightRowKey[sourceBucket];
diff --git a/engine/table/src/main/java/io/deephaven/engine/table/impl/naturaljoin/typed/rightincopen/gen/RightIncrementalNaturalJoinHasherShort.java b/engine/table/src/main/java/io/deephaven/engine/table/impl/naturaljoin/typed/rightincopen/gen/RightIncrementalNaturalJoinHasherShort.java
index fd8e34d1c51..8204c9f3cfd 100644
--- a/engine/table/src/main/java/io/deephaven/engine/table/impl/naturaljoin/typed/rightincopen/gen/RightIncrementalNaturalJoinHasherShort.java
+++ b/engine/table/src/main/java/io/deephaven/engine/table/impl/naturaljoin/typed/rightincopen/gen/RightIncrementalNaturalJoinHasherShort.java
@@ -53,7 +53,7 @@ protected void buildFromLeftSide(RowSequence rowSequence, Chunk[] sourceKeyChunk
             int tableLocation = firstTableLocation;
             while (true) {
                 RowSet leftRowSetForState = leftRowSet.getUnsafe(tableLocation);
-                if (leftRowSetForState == null) {
+                if (isStateEmpty(leftRowSetForState)) {
                     numEntries++;
                     mainKeySource0.set(tableLocation, k0);
                     final long leftRowKey = rowKeyChunk.get(chunkPosition);
@@ -82,7 +82,7 @@ protected void addRightSide(RowSequence rowSequence, Chunk[] sourceKeyChunks) {
             final int hash = hash(k0);
             final int firstTableLocation = hashToTableLocation(hash);
             int tableLocation = firstTableLocation;
-            while (leftRowSet.getUnsafe(tableLocation) != null) {
+            while (!isStateEmpty(leftRowSet.getUnsafe(tableLocation))) {
                 if (eq(mainKeySource0.getUnsafe(tableLocation), k0)) {
                     final long rightRowKeyForState = rightRowKey.getAndSetUnsafe(tableLocation, rowKeyChunk.get(chunkPosition));
                     if (rightRowKeyForState != RowSet.NULL_ROW_KEY && rightRowKeyForState != QueryConstants.NULL_LONG) {
@@ -107,7 +107,7 @@ protected void removeRight(RowSequence rowSequence, Chunk[] sourceKeyChunks,
             final int hash = hash(k0);
             final int firstTableLocation = hashToTableLocation(hash);
             int tableLocation = firstTableLocation;
-            while (leftRowSet.getUnsafe(tableLocation) != null) {
+            while (!isStateEmpty(leftRowSet.getUnsafe(tableLocation))) {
                 if (eq(mainKeySource0.getUnsafe(tableLocation), k0)) {
                     final long oldRightRow = rightRowKey.getAndSetUnsafe(tableLocation, RowSet.NULL_ROW_KEY);
                     Assert.eq(oldRightRow, "oldRightRow", rowKeyChunk.get(chunkPosition), "rowKeyChunk.get(chunkPosition)");
@@ -130,7 +130,7 @@ protected void addRightSide(RowSequence rowSequence, Chunk[] sourceKeyChunks,
             final int hash = hash(k0);
             final int firstTableLocation = hashToTableLocation(hash);
             int tableLocation = firstTableLocation;
-            while (leftRowSet.getUnsafe(tableLocation) != null) {
+            while (!isStateEmpty(leftRowSet.getUnsafe(tableLocation))) {
                 if (eq(mainKeySource0.getUnsafe(tableLocation), k0)) {
                     final long oldRightRow = rightRowKey.getAndSetUnsafe(tableLocation, rowKeyChunk.get(chunkPosition));
                     if (oldRightRow != RowSet.NULL_ROW_KEY && oldRightRow != QueryConstants.NULL_LONG) {
@@ -156,7 +156,7 @@ protected void modifyByRight(RowSequence rowSequence, Chunk[] sourceKeyChunks,
             final int hash = hash(k0);
             final int firstTableLocation = hashToTableLocation(hash);
             int tableLocation = firstTableLocation;
-            while (leftRowSet.getUnsafe(tableLocation) != null) {
+            while (!isStateEmpty(leftRowSet.getUnsafe(tableLocation))) {
                 if (eq(mainKeySource0.getUnsafe(tableLocation), k0)) {
                     final long oldRightRow = rightRowKey.getUnsafe(tableLocation);
                     Assert.eq(oldRightRow, "oldRightRow", rowKeyChunk.get(chunkPosition), "rowKeyChunk.get(chunkPosition)");
@@ -179,7 +179,7 @@ protected void applyRightShift(RowSequence rowSequence, Chunk[] sourceKeyChunks,
             final int hash = hash(k0);
             final int firstTableLocation = hashToTableLocation(hash);
             int tableLocation = firstTableLocation;
-            while (leftRowSet.getUnsafe(tableLocation) != null) {
+            while (!isStateEmpty(leftRowSet.getUnsafe(tableLocation))) {
                 if (eq(mainKeySource0.getUnsafe(tableLocation), k0)) {
                     final long oldRightRow = rightRowKey.getAndSetUnsafe(tableLocation, rowKeyChunk.get(chunkPosition));
                     Assert.eq(oldRightRow + shiftDelta, "oldRightRow + shiftDelta", rowKeyChunk.get(chunkPosition), "rowKeyChunk.get(chunkPosition)");
@@ -197,6 +197,10 @@ private static int hash(short k0) {
         return hash;
     }
 
+    private static boolean isStateEmpty(RowSet state) {
+        return state == null;
+    }
+
     @Override
     protected void rehashInternalFull(final int oldSize) {
         final short[] destKeyArray0 = new short[tableSize];
@@ -214,7 +218,7 @@ protected void rehashInternalFull(final int oldSize) {
         modifiedTrackerCookieSource.setArray(destModifiedCookie);
         for (int sourceBucket = 0; sourceBucket < oldSize; ++sourceBucket) {
             final RowSet currentStateValue = (RowSet)originalStateArray[sourceBucket];
-            if (currentStateValue == null) {
+            if (isStateEmpty(currentStateValue)) {
                 continue;
             }
             final short k0 = originalKeyArray0[sourceBucket];
@@ -222,7 +226,7 @@ protected void rehashInternalFull(final int oldSize) {
             final int firstDestinationTableLocation = hashToTableLocation(hash);
             int destinationTableLocation = firstDestinationTableLocation;
             while (true) {
-                if (destState[destinationTableLocation] == null) {
+                if (isStateEmpty((RowSet)destState[destinationTableLocation])) {
                     destKeyArray0[destinationTableLocation] = k0;
                     destState[destinationTableLocation] = originalStateArray[sourceBucket];
                     destRightRowKey[destinationTableLocation] = oldRightRowKey[sourceBucket];
diff --git a/engine/table/src/main/java/io/deephaven/engine/table/impl/naturaljoin/typed/staticopen/gen/StaticNaturalJoinHasherByte.java b/engine/table/src/main/java/io/deephaven/engine/table/impl/naturaljoin/typed/staticopen/gen/StaticNaturalJoinHasherByte.java
index b8c3d38338c..32ce48cbbbe 100644
--- a/engine/table/src/main/java/io/deephaven/engine/table/impl/naturaljoin/typed/staticopen/gen/StaticNaturalJoinHasherByte.java
+++ b/engine/table/src/main/java/io/deephaven/engine/table/impl/naturaljoin/typed/staticopen/gen/StaticNaturalJoinHasherByte.java
@@ -51,7 +51,7 @@ protected void buildFromLeftSide(RowSequence rowSequence, Chunk[] sourceKeyChunk
             int tableLocation = firstTableLocation;
             while (true) {
                 long rightSideSentinel = mainRightRowKey.getUnsafe(tableLocation);
-                if (rightSideSentinel == EMPTY_RIGHT_STATE) {
+                if (isStateEmpty(rightSideSentinel)) {
                     numEntries++;
                     mainKeySource0.set(tableLocation, k0);
                     mainRightRowKey.set(tableLocation, NO_RIGHT_STATE_VALUE);
@@ -79,7 +79,7 @@ protected void buildFromRightSide(RowSequence rowSequence, Chunk[] sourceKeyChun
             int tableLocation = firstTableLocation;
             while (true) {
                 long rightSideSentinel = mainRightRowKey.getUnsafe(tableLocation);
-                if (rightSideSentinel == EMPTY_RIGHT_STATE) {
+                if (isStateEmpty(rightSideSentinel)) {
                     numEntries++;
                     mainKeySource0.set(tableLocation, k0);
                     final long rightRowKeyToInsert = rowKeyChunk.get(chunkPosition);
@@ -107,7 +107,7 @@ protected void decorateLeftSide(RowSequence rowSequence, Chunk[] sourceKeyChunks
             boolean found = false;
             int tableLocation = firstTableLocation;
             long rightRowKey;
-            while ((rightRowKey = mainRightRowKey.getUnsafe(tableLocation)) != EMPTY_RIGHT_STATE) {
+            while (!isStateEmpty(rightRowKey = mainRightRowKey.getUnsafe(tableLocation))) {
                 if (eq(mainKeySource0.getUnsafe(tableLocation), k0)) {
                     if (rightRowKey == DUPLICATE_RIGHT_STATE) {
                         final LongChunk<OrderedRowKeys> rowKeyChunk = rowSequence.asRowKeyChunk();
@@ -136,7 +136,7 @@ protected void decorateWithRightSide(RowSequence rowSequence, Chunk[] sourceKeyC
             final int firstTableLocation = hashToTableLocation(hash);
             int tableLocation = firstTableLocation;
             long existingStateValue;
-            while ((existingStateValue = mainRightRowKey.getUnsafe(tableLocation)) != EMPTY_RIGHT_STATE) {
+            while (!isStateEmpty(existingStateValue = mainRightRowKey.getUnsafe(tableLocation))) {
                 if (eq(mainKeySource0.getUnsafe(tableLocation), k0)) {
                     if (existingStateValue != NO_RIGHT_STATE_VALUE) {
                         mainRightRowKey.set(tableLocation, DUPLICATE_RIGHT_STATE);
@@ -157,4 +157,8 @@ private static int hash(byte k0) {
         int hash = ByteChunkHasher.hashInitialSingle(k0);
         return hash;
     }
+
+    private static boolean isStateEmpty(long state) {
+        return state == EMPTY_RIGHT_STATE;
+    }
 }
diff --git a/engine/table/src/main/java/io/deephaven/engine/table/impl/naturaljoin/typed/staticopen/gen/StaticNaturalJoinHasherChar.java b/engine/table/src/main/java/io/deephaven/engine/table/impl/naturaljoin/typed/staticopen/gen/StaticNaturalJoinHasherChar.java
index db5ceb2c55a..2f598ae21d1 100644
--- a/engine/table/src/main/java/io/deephaven/engine/table/impl/naturaljoin/typed/staticopen/gen/StaticNaturalJoinHasherChar.java
+++ b/engine/table/src/main/java/io/deephaven/engine/table/impl/naturaljoin/typed/staticopen/gen/StaticNaturalJoinHasherChar.java
@@ -51,7 +51,7 @@ protected void buildFromLeftSide(RowSequence rowSequence, Chunk[] sourceKeyChunk
             int tableLocation = firstTableLocation;
             while (true) {
                 long rightSideSentinel = mainRightRowKey.getUnsafe(tableLocation);
-                if (rightSideSentinel == EMPTY_RIGHT_STATE) {
+                if (isStateEmpty(rightSideSentinel)) {
                     numEntries++;
                     mainKeySource0.set(tableLocation, k0);
                     mainRightRowKey.set(tableLocation, NO_RIGHT_STATE_VALUE);
@@ -79,7 +79,7 @@ protected void buildFromRightSide(RowSequence rowSequence, Chunk[] sourceKeyChun
             int tableLocation = firstTableLocation;
             while (true) {
                 long rightSideSentinel = mainRightRowKey.getUnsafe(tableLocation);
-                if (rightSideSentinel == EMPTY_RIGHT_STATE) {
+                if (isStateEmpty(rightSideSentinel)) {
                     numEntries++;
                     mainKeySource0.set(tableLocation, k0);
                     final long rightRowKeyToInsert = rowKeyChunk.get(chunkPosition);
@@ -107,7 +107,7 @@ protected void decorateLeftSide(RowSequence rowSequence, Chunk[] sourceKeyChunks
             boolean found = false;
             int tableLocation = firstTableLocation;
             long rightRowKey;
-            while ((rightRowKey = mainRightRowKey.getUnsafe(tableLocation)) != EMPTY_RIGHT_STATE) {
+            while (!isStateEmpty(rightRowKey = mainRightRowKey.getUnsafe(tableLocation))) {
                 if (eq(mainKeySource0.getUnsafe(tableLocation), k0)) {
                     if (rightRowKey == DUPLICATE_RIGHT_STATE) {
                         final LongChunk<OrderedRowKeys> rowKeyChunk = rowSequence.asRowKeyChunk();
@@ -136,7 +136,7 @@ protected void decorateWithRightSide(RowSequence rowSequence, Chunk[] sourceKeyC
             final int firstTableLocation = hashToTableLocation(hash);
             int tableLocation = firstTableLocation;
             long existingStateValue;
-            while ((existingStateValue = mainRightRowKey.getUnsafe(tableLocation)) != EMPTY_RIGHT_STATE) {
+            while (!isStateEmpty(existingStateValue = mainRightRowKey.getUnsafe(tableLocation))) {
                 if (eq(mainKeySource0.getUnsafe(tableLocation), k0)) {
                     if (existingStateValue != NO_RIGHT_STATE_VALUE) {
                         mainRightRowKey.set(tableLocation, DUPLICATE_RIGHT_STATE);
@@ -157,4 +157,8 @@ private static int hash(char k0) {
         int hash = CharChunkHasher.hashInitialSingle(k0);
         return hash;
     }
+
+    private static boolean isStateEmpty(long state) {
+        return state == EMPTY_RIGHT_STATE;
+    }
 }
diff --git a/engine/table/src/main/java/io/deephaven/engine/table/impl/naturaljoin/typed/staticopen/gen/StaticNaturalJoinHasherDouble.java b/engine/table/src/main/java/io/deephaven/engine/table/impl/naturaljoin/typed/staticopen/gen/StaticNaturalJoinHasherDouble.java
index b5dd07d293c..fc1992a02d7 100644
--- a/engine/table/src/main/java/io/deephaven/engine/table/impl/naturaljoin/typed/staticopen/gen/StaticNaturalJoinHasherDouble.java
+++ b/engine/table/src/main/java/io/deephaven/engine/table/impl/naturaljoin/typed/staticopen/gen/StaticNaturalJoinHasherDouble.java
@@ -51,7 +51,7 @@ protected void buildFromLeftSide(RowSequence rowSequence, Chunk[] sourceKeyChunk
             int tableLocation = firstTableLocation;
             while (true) {
                 long rightSideSentinel = mainRightRowKey.getUnsafe(tableLocation);
-                if (rightSideSentinel == EMPTY_RIGHT_STATE) {
+                if (isStateEmpty(rightSideSentinel)) {
                     numEntries++;
                     mainKeySource0.set(tableLocation, k0);
                     mainRightRowKey.set(tableLocation, NO_RIGHT_STATE_VALUE);
@@ -79,7 +79,7 @@ protected void buildFromRightSide(RowSequence rowSequence, Chunk[] sourceKeyChun
             int tableLocation = firstTableLocation;
             while (true) {
                 long rightSideSentinel = mainRightRowKey.getUnsafe(tableLocation);
-                if (rightSideSentinel == EMPTY_RIGHT_STATE) {
+                if (isStateEmpty(rightSideSentinel)) {
                     numEntries++;
                     mainKeySource0.set(tableLocation, k0);
                     final long rightRowKeyToInsert = rowKeyChunk.get(chunkPosition);
@@ -107,7 +107,7 @@ protected void decorateLeftSide(RowSequence rowSequence, Chunk[] sourceKeyChunks
             boolean found = false;
             int tableLocation = firstTableLocation;
             long rightRowKey;
-            while ((rightRowKey = mainRightRowKey.getUnsafe(tableLocation)) != EMPTY_RIGHT_STATE) {
+            while (!isStateEmpty(rightRowKey = mainRightRowKey.getUnsafe(tableLocation))) {
                 if (eq(mainKeySource0.getUnsafe(tableLocation), k0)) {
                     if (rightRowKey == DUPLICATE_RIGHT_STATE) {
                         final LongChunk<OrderedRowKeys> rowKeyChunk = rowSequence.asRowKeyChunk();
@@ -136,7 +136,7 @@ protected void decorateWithRightSide(RowSequence rowSequence, Chunk[] sourceKeyC
             final int firstTableLocation = hashToTableLocation(hash);
             int tableLocation = firstTableLocation;
             long existingStateValue;
-            while ((existingStateValue = mainRightRowKey.getUnsafe(tableLocation)) != EMPTY_RIGHT_STATE) {
+            while (!isStateEmpty(existingStateValue = mainRightRowKey.getUnsafe(tableLocation))) {
                 if (eq(mainKeySource0.getUnsafe(tableLocation), k0)) {
                     if (existingStateValue != NO_RIGHT_STATE_VALUE) {
                         mainRightRowKey.set(tableLocation, DUPLICATE_RIGHT_STATE);
@@ -157,4 +157,8 @@ private static int hash(double k0) {
         int hash = DoubleChunkHasher.hashInitialSingle(k0);
         return hash;
     }
+
+    private static boolean isStateEmpty(long state) {
+        return state == EMPTY_RIGHT_STATE;
+    }
 }
diff --git a/engine/table/src/main/java/io/deephaven/engine/table/impl/naturaljoin/typed/staticopen/gen/StaticNaturalJoinHasherFloat.java b/engine/table/src/main/java/io/deephaven/engine/table/impl/naturaljoin/typed/staticopen/gen/StaticNaturalJoinHasherFloat.java
index 0efb811783b..a069d49e91d 100644
--- a/engine/table/src/main/java/io/deephaven/engine/table/impl/naturaljoin/typed/staticopen/gen/StaticNaturalJoinHasherFloat.java
+++ b/engine/table/src/main/java/io/deephaven/engine/table/impl/naturaljoin/typed/staticopen/gen/StaticNaturalJoinHasherFloat.java
@@ -51,7 +51,7 @@ protected void buildFromLeftSide(RowSequence rowSequence, Chunk[] sourceKeyChunk
             int tableLocation = firstTableLocation;
             while (true) {
                 long rightSideSentinel = mainRightRowKey.getUnsafe(tableLocation);
-                if (rightSideSentinel == EMPTY_RIGHT_STATE) {
+                if (isStateEmpty(rightSideSentinel)) {
                     numEntries++;
                     mainKeySource0.set(tableLocation, k0);
                     mainRightRowKey.set(tableLocation, NO_RIGHT_STATE_VALUE);
@@ -79,7 +79,7 @@ protected void buildFromRightSide(RowSequence rowSequence, Chunk[] sourceKeyChun
             int tableLocation = firstTableLocation;
             while (true) {
                 long rightSideSentinel = mainRightRowKey.getUnsafe(tableLocation);
-                if (rightSideSentinel == EMPTY_RIGHT_STATE) {
+                if (isStateEmpty(rightSideSentinel)) {
                     numEntries++;
                     mainKeySource0.set(tableLocation, k0);
                     final long rightRowKeyToInsert = rowKeyChunk.get(chunkPosition);
@@ -107,7 +107,7 @@ protected void decorateLeftSide(RowSequence rowSequence, Chunk[] sourceKeyChunks
             boolean found = false;
             int tableLocation = firstTableLocation;
             long rightRowKey;
-            while ((rightRowKey = mainRightRowKey.getUnsafe(tableLocation)) != EMPTY_RIGHT_STATE) {
+            while (!isStateEmpty(rightRowKey = mainRightRowKey.getUnsafe(tableLocation))) {
                 if (eq(mainKeySource0.getUnsafe(tableLocation), k0)) {
                     if (rightRowKey == DUPLICATE_RIGHT_STATE) {
                         final LongChunk<OrderedRowKeys> rowKeyChunk = rowSequence.asRowKeyChunk();
@@ -136,7 +136,7 @@ protected void decorateWithRightSide(RowSequence rowSequence, Chunk[] sourceKeyC
             final int firstTableLocation = hashToTableLocation(hash);
             int tableLocation = firstTableLocation;
             long existingStateValue;
-            while ((existingStateValue = mainRightRowKey.getUnsafe(tableLocation)) != EMPTY_RIGHT_STATE) {
+            while (!isStateEmpty(existingStateValue = mainRightRowKey.getUnsafe(tableLocation))) {
                 if (eq(mainKeySource0.getUnsafe(tableLocation), k0)) {
                     if (existingStateValue != NO_RIGHT_STATE_VALUE) {
                         mainRightRowKey.set(tableLocation, DUPLICATE_RIGHT_STATE);
@@ -157,4 +157,8 @@ private static int hash(float k0) {
         int hash = FloatChunkHasher.hashInitialSingle(k0);
         return hash;
     }
+
+    private static boolean isStateEmpty(long state) {
+        return state == EMPTY_RIGHT_STATE;
+    }
 }
diff --git a/engine/table/src/main/java/io/deephaven/engine/table/impl/naturaljoin/typed/staticopen/gen/StaticNaturalJoinHasherInt.java b/engine/table/src/main/java/io/deephaven/engine/table/impl/naturaljoin/typed/staticopen/gen/StaticNaturalJoinHasherInt.java
index f6a885c3590..c6ef5a83188 100644
--- a/engine/table/src/main/java/io/deephaven/engine/table/impl/naturaljoin/typed/staticopen/gen/StaticNaturalJoinHasherInt.java
+++ b/engine/table/src/main/java/io/deephaven/engine/table/impl/naturaljoin/typed/staticopen/gen/StaticNaturalJoinHasherInt.java
@@ -51,7 +51,7 @@ protected void buildFromLeftSide(RowSequence rowSequence, Chunk[] sourceKeyChunk
             int tableLocation = firstTableLocation;
             while (true) {
                 long rightSideSentinel = mainRightRowKey.getUnsafe(tableLocation);
-                if (rightSideSentinel == EMPTY_RIGHT_STATE) {
+                if (isStateEmpty(rightSideSentinel)) {
                     numEntries++;
                     mainKeySource0.set(tableLocation, k0);
                     mainRightRowKey.set(tableLocation, NO_RIGHT_STATE_VALUE);
@@ -79,7 +79,7 @@ protected void buildFromRightSide(RowSequence rowSequence, Chunk[] sourceKeyChun
             int tableLocation = firstTableLocation;
             while (true) {
                 long rightSideSentinel = mainRightRowKey.getUnsafe(tableLocation);
-                if (rightSideSentinel == EMPTY_RIGHT_STATE) {
+                if (isStateEmpty(rightSideSentinel)) {
                     numEntries++;
                     mainKeySource0.set(tableLocation, k0);
                     final long rightRowKeyToInsert = rowKeyChunk.get(chunkPosition);
@@ -107,7 +107,7 @@ protected void decorateLeftSide(RowSequence rowSequence, Chunk[] sourceKeyChunks
             boolean found = false;
             int tableLocation = firstTableLocation;
             long rightRowKey;
-            while ((rightRowKey = mainRightRowKey.getUnsafe(tableLocation)) != EMPTY_RIGHT_STATE) {
+            while (!isStateEmpty(rightRowKey = mainRightRowKey.getUnsafe(tableLocation))) {
                 if (eq(mainKeySource0.getUnsafe(tableLocation), k0)) {
                     if (rightRowKey == DUPLICATE_RIGHT_STATE) {
                         final LongChunk<OrderedRowKeys> rowKeyChunk = rowSequence.asRowKeyChunk();
@@ -136,7 +136,7 @@ protected void decorateWithRightSide(RowSequence rowSequence, Chunk[] sourceKeyC
             final int firstTableLocation = hashToTableLocation(hash);
             int tableLocation = firstTableLocation;
             long existingStateValue;
-            while ((existingStateValue = mainRightRowKey.getUnsafe(tableLocation)) != EMPTY_RIGHT_STATE) {
+            while (!isStateEmpty(existingStateValue = mainRightRowKey.getUnsafe(tableLocation))) {
                 if (eq(mainKeySource0.getUnsafe(tableLocation), k0)) {
                     if (existingStateValue != NO_RIGHT_STATE_VALUE) {
                         mainRightRowKey.set(tableLocation, DUPLICATE_RIGHT_STATE);
@@ -157,4 +157,8 @@ private static int hash(int k0) {
         int hash = IntChunkHasher.hashInitialSingle(k0);
         return hash;
     }
+
+    private static boolean isStateEmpty(long state) {
+        return state == EMPTY_RIGHT_STATE;
+    }
 }
diff --git a/engine/table/src/main/java/io/deephaven/engine/table/impl/naturaljoin/typed/staticopen/gen/StaticNaturalJoinHasherLong.java b/engine/table/src/main/java/io/deephaven/engine/table/impl/naturaljoin/typed/staticopen/gen/StaticNaturalJoinHasherLong.java
index 646c6c0daf7..a9fa0435a2d 100644
--- a/engine/table/src/main/java/io/deephaven/engine/table/impl/naturaljoin/typed/staticopen/gen/StaticNaturalJoinHasherLong.java
+++ b/engine/table/src/main/java/io/deephaven/engine/table/impl/naturaljoin/typed/staticopen/gen/StaticNaturalJoinHasherLong.java
@@ -50,7 +50,7 @@ protected void buildFromLeftSide(RowSequence rowSequence, Chunk[] sourceKeyChunk
             int tableLocation = firstTableLocation;
             while (true) {
                 long rightSideSentinel = mainRightRowKey.getUnsafe(tableLocation);
-                if (rightSideSentinel == EMPTY_RIGHT_STATE) {
+                if (isStateEmpty(rightSideSentinel)) {
                     numEntries++;
                     mainKeySource0.set(tableLocation, k0);
                     mainRightRowKey.set(tableLocation, NO_RIGHT_STATE_VALUE);
@@ -78,7 +78,7 @@ protected void buildFromRightSide(RowSequence rowSequence, Chunk[] sourceKeyChun
             int tableLocation = firstTableLocation;
             while (true) {
                 long rightSideSentinel = mainRightRowKey.getUnsafe(tableLocation);
-                if (rightSideSentinel == EMPTY_RIGHT_STATE) {
+                if (isStateEmpty(rightSideSentinel)) {
                     numEntries++;
                     mainKeySource0.set(tableLocation, k0);
                     final long rightRowKeyToInsert = rowKeyChunk.get(chunkPosition);
@@ -106,7 +106,7 @@ protected void decorateLeftSide(RowSequence rowSequence, Chunk[] sourceKeyChunks
             boolean found = false;
             int tableLocation = firstTableLocation;
             long rightRowKey;
-            while ((rightRowKey = mainRightRowKey.getUnsafe(tableLocation)) != EMPTY_RIGHT_STATE) {
+            while (!isStateEmpty(rightRowKey = mainRightRowKey.getUnsafe(tableLocation))) {
                 if (eq(mainKeySource0.getUnsafe(tableLocation), k0)) {
                     if (rightRowKey == DUPLICATE_RIGHT_STATE) {
                         final LongChunk<OrderedRowKeys> rowKeyChunk = rowSequence.asRowKeyChunk();
@@ -135,7 +135,7 @@ protected void decorateWithRightSide(RowSequence rowSequence, Chunk[] sourceKeyC
             final int firstTableLocation = hashToTableLocation(hash);
             int tableLocation = firstTableLocation;
             long existingStateValue;
-            while ((existingStateValue = mainRightRowKey.getUnsafe(tableLocation)) != EMPTY_RIGHT_STATE) {
+            while (!isStateEmpty(existingStateValue = mainRightRowKey.getUnsafe(tableLocation))) {
                 if (eq(mainKeySource0.getUnsafe(tableLocation), k0)) {
                     if (existingStateValue != NO_RIGHT_STATE_VALUE) {
                         mainRightRowKey.set(tableLocation, DUPLICATE_RIGHT_STATE);
@@ -156,4 +156,8 @@ private static int hash(long k0) {
         int hash = LongChunkHasher.hashInitialSingle(k0);
         return hash;
     }
+
+    private static boolean isStateEmpty(long state) {
+        return state == EMPTY_RIGHT_STATE;
+    }
 }
diff --git a/engine/table/src/main/java/io/deephaven/engine/table/impl/naturaljoin/typed/staticopen/gen/StaticNaturalJoinHasherObject.java b/engine/table/src/main/java/io/deephaven/engine/table/impl/naturaljoin/typed/staticopen/gen/StaticNaturalJoinHasherObject.java
index f515f6acd60..b0b9d3d1d50 100644
--- a/engine/table/src/main/java/io/deephaven/engine/table/impl/naturaljoin/typed/staticopen/gen/StaticNaturalJoinHasherObject.java
+++ b/engine/table/src/main/java/io/deephaven/engine/table/impl/naturaljoin/typed/staticopen/gen/StaticNaturalJoinHasherObject.java
@@ -52,7 +52,7 @@ protected void buildFromLeftSide(RowSequence rowSequence, Chunk[] sourceKeyChunk
             int tableLocation = firstTableLocation;
             while (true) {
                 long rightSideSentinel = mainRightRowKey.getUnsafe(tableLocation);
-                if (rightSideSentinel == EMPTY_RIGHT_STATE) {
+                if (isStateEmpty(rightSideSentinel)) {
                     numEntries++;
                     mainKeySource0.set(tableLocation, k0);
                     mainRightRowKey.set(tableLocation, NO_RIGHT_STATE_VALUE);
@@ -80,7 +80,7 @@ protected void buildFromRightSide(RowSequence rowSequence, Chunk[] sourceKeyChun
             int tableLocation = firstTableLocation;
             while (true) {
                 long rightSideSentinel = mainRightRowKey.getUnsafe(tableLocation);
-                if (rightSideSentinel == EMPTY_RIGHT_STATE) {
+                if (isStateEmpty(rightSideSentinel)) {
                     numEntries++;
                     mainKeySource0.set(tableLocation, k0);
                     final long rightRowKeyToInsert = rowKeyChunk.get(chunkPosition);
@@ -108,7 +108,7 @@ protected void decorateLeftSide(RowSequence rowSequence, Chunk[] sourceKeyChunks
             boolean found = false;
             int tableLocation = firstTableLocation;
             long rightRowKey;
-            while ((rightRowKey = mainRightRowKey.getUnsafe(tableLocation)) != EMPTY_RIGHT_STATE) {
+            while (!isStateEmpty(rightRowKey = mainRightRowKey.getUnsafe(tableLocation))) {
                 if (eq(mainKeySource0.getUnsafe(tableLocation), k0)) {
                     if (rightRowKey == DUPLICATE_RIGHT_STATE) {
                         final LongChunk<OrderedRowKeys> rowKeyChunk = rowSequence.asRowKeyChunk();
@@ -137,7 +137,7 @@ protected void decorateWithRightSide(RowSequence rowSequence, Chunk[] sourceKeyC
             final int firstTableLocation = hashToTableLocation(hash);
             int tableLocation = firstTableLocation;
             long existingStateValue;
-            while ((existingStateValue = mainRightRowKey.getUnsafe(tableLocation)) != EMPTY_RIGHT_STATE) {
+            while (!isStateEmpty(existingStateValue = mainRightRowKey.getUnsafe(tableLocation))) {
                 if (eq(mainKeySource0.getUnsafe(tableLocation), k0)) {
                     if (existingStateValue != NO_RIGHT_STATE_VALUE) {
                         mainRightRowKey.set(tableLocation, DUPLICATE_RIGHT_STATE);
@@ -158,4 +158,8 @@ private static int hash(Object k0) {
         int hash = ObjectChunkHasher.hashInitialSingle(k0);
         return hash;
     }
+
+    private static boolean isStateEmpty(long state) {
+        return state == EMPTY_RIGHT_STATE;
+    }
 }
diff --git a/engine/table/src/main/java/io/deephaven/engine/table/impl/naturaljoin/typed/staticopen/gen/StaticNaturalJoinHasherShort.java b/engine/table/src/main/java/io/deephaven/engine/table/impl/naturaljoin/typed/staticopen/gen/StaticNaturalJoinHasherShort.java
index 3a1ddc52a37..066dedda412 100644
--- a/engine/table/src/main/java/io/deephaven/engine/table/impl/naturaljoin/typed/staticopen/gen/StaticNaturalJoinHasherShort.java
+++ b/engine/table/src/main/java/io/deephaven/engine/table/impl/naturaljoin/typed/staticopen/gen/StaticNaturalJoinHasherShort.java
@@ -51,7 +51,7 @@ protected void buildFromLeftSide(RowSequence rowSequence, Chunk[] sourceKeyChunk
             int tableLocation = firstTableLocation;
             while (true) {
                 long rightSideSentinel = mainRightRowKey.getUnsafe(tableLocation);
-                if (rightSideSentinel == EMPTY_RIGHT_STATE) {
+                if (isStateEmpty(rightSideSentinel)) {
                     numEntries++;
                     mainKeySource0.set(tableLocation, k0);
                     mainRightRowKey.set(tableLocation, NO_RIGHT_STATE_VALUE);
@@ -79,7 +79,7 @@ protected void buildFromRightSide(RowSequence rowSequence, Chunk[] sourceKeyChun
             int tableLocation = firstTableLocation;
             while (true) {
                 long rightSideSentinel = mainRightRowKey.getUnsafe(tableLocation);
-                if (rightSideSentinel == EMPTY_RIGHT_STATE) {
+                if (isStateEmpty(rightSideSentinel)) {
                     numEntries++;
                     mainKeySource0.set(tableLocation, k0);
                     final long rightRowKeyToInsert = rowKeyChunk.get(chunkPosition);
@@ -107,7 +107,7 @@ protected void decorateLeftSide(RowSequence rowSequence, Chunk[] sourceKeyChunks
             boolean found = false;
             int tableLocation = firstTableLocation;
             long rightRowKey;
-            while ((rightRowKey = mainRightRowKey.getUnsafe(tableLocation)) != EMPTY_RIGHT_STATE) {
+            while (!isStateEmpty(rightRowKey = mainRightRowKey.getUnsafe(tableLocation))) {
                 if (eq(mainKeySource0.getUnsafe(tableLocation), k0)) {
                     if (rightRowKey == DUPLICATE_RIGHT_STATE) {
                         final LongChunk<OrderedRowKeys> rowKeyChunk = rowSequence.asRowKeyChunk();
@@ -136,7 +136,7 @@ protected void decorateWithRightSide(RowSequence rowSequence, Chunk[] sourceKeyC
             final int firstTableLocation = hashToTableLocation(hash);
             int tableLocation = firstTableLocation;
             long existingStateValue;
-            while ((existingStateValue = mainRightRowKey.getUnsafe(tableLocation)) != EMPTY_RIGHT_STATE) {
+            while (!isStateEmpty(existingStateValue = mainRightRowKey.getUnsafe(tableLocation))) {
                 if (eq(mainKeySource0.getUnsafe(tableLocation), k0)) {
                     if (existingStateValue != NO_RIGHT_STATE_VALUE) {
                         mainRightRowKey.set(tableLocation, DUPLICATE_RIGHT_STATE);
@@ -157,4 +157,8 @@ private static int hash(short k0) {
         int hash = ShortChunkHasher.hashInitialSingle(k0);
         return hash;
     }
+
+    private static boolean isStateEmpty(long state) {
+        return state == EMPTY_RIGHT_STATE;
+    }
 }
diff --git a/engine/table/src/main/java/io/deephaven/engine/table/impl/partitioned/PartitionedTableProxyImpl.java b/engine/table/src/main/java/io/deephaven/engine/table/impl/partitioned/PartitionedTableProxyImpl.java
index 196fa4e2f93..e914aeb0937 100644
--- a/engine/table/src/main/java/io/deephaven/engine/table/impl/partitioned/PartitionedTableProxyImpl.java
+++ b/engine/table/src/main/java/io/deephaven/engine/table/impl/partitioned/PartitionedTableProxyImpl.java
@@ -430,6 +430,11 @@ public PartitionedTable.Proxy tail(long size) {
         return basicTransform(ct -> ct.tail(size));
     }
 
+    @Override
+    public PartitionedTable.Proxy slice(long firstPositionInclusive, long lastPositionExclusive) {
+        return basicTransform(ct -> ct.slice(firstPositionInclusive, lastPositionExclusive));
+    }
+
     @Override
     public PartitionedTable.Proxy reverse() {
         return basicTransform(Table::reverse);
diff --git a/engine/table/src/main/java/io/deephaven/engine/table/impl/perf/QueryPerformanceRecorderState.java b/engine/table/src/main/java/io/deephaven/engine/table/impl/perf/QueryPerformanceRecorderState.java
index 3120dedcb9a..3b75290a2ab 100644
--- a/engine/table/src/main/java/io/deephaven/engine/table/impl/perf/QueryPerformanceRecorderState.java
+++ b/engine/table/src/main/java/io/deephaven/engine/table/impl/perf/QueryPerformanceRecorderState.java
@@ -5,7 +5,6 @@
 
 import io.deephaven.chunk.util.pools.ChunkPoolInstrumentation;
 import io.deephaven.configuration.Configuration;
-import io.deephaven.datastructures.util.CollectionUtil;
 import io.deephaven.engine.updategraph.UpdateGraphLock;
 import io.deephaven.util.QueryConstants;
 import io.deephaven.util.SafeCloseable;
@@ -66,7 +65,7 @@ public abstract class QueryPerformanceRecorderState {
             throw new UncheckedIOException("Error reading file " + propVal, e);
         }
 
-        PACKAGE_FILTERS = filters.toArray(CollectionUtil.ZERO_LENGTH_STRING_ARRAY);
+        PACKAGE_FILTERS = filters.toArray(String[]::new);
     }
 
     private QueryPerformanceRecorderState() {
diff --git a/engine/table/src/main/java/io/deephaven/engine/table/impl/preview/ArrayPreview.java b/engine/table/src/main/java/io/deephaven/engine/table/impl/preview/ArrayPreview.java
index d1c742a7ddc..82514bfd29f 100644
--- a/engine/table/src/main/java/io/deephaven/engine/table/impl/preview/ArrayPreview.java
+++ b/engine/table/src/main/java/io/deephaven/engine/table/impl/preview/ArrayPreview.java
@@ -3,6 +3,7 @@
 //
 package io.deephaven.engine.table.impl.preview;
 
+import io.deephaven.util.type.TypeUtils;
 import io.deephaven.vector.Vector;
 import io.deephaven.vector.VectorFactory;
 import org.jetbrains.annotations.NotNull;
@@ -34,7 +35,9 @@ public static ArrayPreview fromArray(final Object array) {
         if (componentType == boolean.class) {
             return new ArrayPreview(convertToString((boolean[]) array));
         }
-        return new ArrayPreview(VectorFactory.forElementType(componentType)
+        // Boxed primitives need the Object wrapper.
+        final Class<?> elementType = TypeUtils.isBoxedType(componentType) ? Object.class : componentType;
+        return new ArrayPreview(VectorFactory.forElementType(elementType)
                 .vectorWrap(array)
                 .toString(ARRAY_SIZE_CUTOFF));
     }
diff --git a/engine/table/src/main/java/io/deephaven/engine/table/impl/preview/ColumnPreviewManager.java b/engine/table/src/main/java/io/deephaven/engine/table/impl/preview/ColumnPreviewManager.java
index 3a12528b431..b77f8619bf9 100644
--- a/engine/table/src/main/java/io/deephaven/engine/table/impl/preview/ColumnPreviewManager.java
+++ b/engine/table/src/main/java/io/deephaven/engine/table/impl/preview/ColumnPreviewManager.java
@@ -6,14 +6,18 @@
 import io.deephaven.configuration.Configuration;
 import io.deephaven.engine.table.ColumnDefinition;
 import io.deephaven.engine.table.Table;
+import io.deephaven.util.type.NumericTypeUtils;
 import io.deephaven.vector.Vector;
 import io.deephaven.engine.table.impl.BaseTable;
 import io.deephaven.engine.table.impl.select.FunctionalColumn;
 import io.deephaven.engine.table.impl.select.SelectColumn;
-import io.deephaven.util.type.TypeUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.jpy.PyListWrapper;
 
+import java.time.Instant;
+import java.time.LocalDate;
+import java.time.LocalTime;
+import java.time.ZonedDateTime;
 import java.util.*;
 import java.util.function.Function;
 import java.util.stream.Collectors;
@@ -155,8 +159,9 @@ public static boolean isColumnTypeDisplayable(Class<?> type) {
         return type.isPrimitive()
                 || io.deephaven.util.type.TypeUtils.isBoxedType(type)
                 || io.deephaven.util.type.TypeUtils.isString(type)
-                || io.deephaven.util.type.TypeUtils.isBigNumeric(type)
-                || TypeUtils.isDateTime(type)
+                || NumericTypeUtils.isBigNumeric(type)
+                || Instant.class == type || ZonedDateTime.class == type
+                || LocalDate.class == type || LocalTime.class == type
                 || isOnWhiteList(type);
     }
 
diff --git a/engine/table/src/main/java/io/deephaven/engine/table/impl/rangejoin/SupportedRangeJoinAggregations.java b/engine/table/src/main/java/io/deephaven/engine/table/impl/rangejoin/SupportedRangeJoinAggregations.java
index 8ed956ac6e4..5a21b8d570d 100644
--- a/engine/table/src/main/java/io/deephaven/engine/table/impl/rangejoin/SupportedRangeJoinAggregations.java
+++ b/engine/table/src/main/java/io/deephaven/engine/table/impl/rangejoin/SupportedRangeJoinAggregations.java
@@ -40,11 +40,11 @@ public static void validate(
         }
     }
 
-    private boolean lastSupported;
+    private boolean hasUnsupportedAggs;
 
     private boolean isSupported(@NotNull final Aggregation aggregation) {
         aggregation.walk(this);
-        return lastSupported;
+        return !hasUnsupportedAggs;
     }
 
     @Override
@@ -54,31 +54,41 @@ public void visit(@NotNull final Aggregations aggregations) {
 
     @Override
     public void visit(@NotNull final ColumnAggregation columnAgg) {
-        lastSupported = columnAgg.spec() instanceof AggSpecGroup;
+        hasUnsupportedAggs |= !(columnAgg.spec() instanceof AggSpecGroup);
     }
 
     @Override
     public void visit(@NotNull final ColumnAggregations columnAggs) {
-        lastSupported = columnAggs.spec() instanceof AggSpecGroup;
+        hasUnsupportedAggs |= !(columnAggs.spec() instanceof AggSpecGroup);
     }
 
     @Override
     public void visit(@NotNull final Count count) {
-        lastSupported = false;
+        hasUnsupportedAggs = true;
+    }
+
+    @Override
+    public void visit(@NotNull final CountWhere countWhere) {
+        hasUnsupportedAggs = true;
     }
 
     @Override
     public void visit(@NotNull final FirstRowKey firstRowKey) {
-        lastSupported = false;
+        hasUnsupportedAggs = true;
     }
 
     @Override
     public void visit(@NotNull final LastRowKey lastRowKey) {
-        lastSupported = false;
+        hasUnsupportedAggs = true;
     }
 
     @Override
     public void visit(@NotNull final Partition partition) {
-        lastSupported = false;
+        hasUnsupportedAggs = true;
+    }
+
+    @Override
+    public void visit(@NotNull final Formula formula) {
+        hasUnsupportedAggs = true;
     }
 }
diff --git a/engine/table/src/main/java/io/deephaven/engine/table/impl/rangejoin/ValidFloatingPointFilter.java b/engine/table/src/main/java/io/deephaven/engine/table/impl/rangejoin/ValidFloatingPointFilter.java
index 686e4ab7130..767b9a829d0 100644
--- a/engine/table/src/main/java/io/deephaven/engine/table/impl/rangejoin/ValidFloatingPointFilter.java
+++ b/engine/table/src/main/java/io/deephaven/engine/table/impl/rangejoin/ValidFloatingPointFilter.java
@@ -5,19 +5,15 @@
 
 import io.deephaven.api.ColumnName;
 import io.deephaven.api.Strings;
-import io.deephaven.chunk.DoubleChunk;
-import io.deephaven.chunk.FloatChunk;
-import io.deephaven.chunk.LongChunk;
-import io.deephaven.chunk.WritableLongChunk;
-import io.deephaven.chunk.attributes.Values;
 import io.deephaven.engine.rowset.RowSet;
 import io.deephaven.engine.rowset.WritableRowSet;
-import io.deephaven.engine.rowset.chunkattributes.OrderedRowKeys;
 import io.deephaven.engine.table.ColumnDefinition;
 import io.deephaven.engine.table.ColumnSource;
 import io.deephaven.engine.table.Table;
 import io.deephaven.engine.table.TableDefinition;
 import io.deephaven.engine.table.impl.chunkfilter.ChunkFilter;
+import io.deephaven.engine.table.impl.chunkfilter.DoubleChunkFilter;
+import io.deephaven.engine.table.impl.chunkfilter.FloatChunkFilter;
 import io.deephaven.engine.table.impl.select.WhereFilter;
 import io.deephaven.engine.table.impl.select.WhereFilterImpl;
 import org.jetbrains.annotations.NotNull;
@@ -86,47 +82,27 @@ public WritableRowSet filter(
         return ChunkFilter.applyChunkFilter(selection, columnSource, usePrev, chunkFilter);
     }
 
-    private static final class DoubleFilter implements ChunkFilter.DoubleChunkFilter {
+    private static final class DoubleFilter extends DoubleChunkFilter {
 
         private static final DoubleFilter INSTANCE = new DoubleFilter();
 
         private DoubleFilter() {}
 
         @Override
-        public void filter(
-                @NotNull final DoubleChunk<? extends Values> values,
-                @NotNull final LongChunk<OrderedRowKeys> rowKeys,
-                @NotNull final WritableLongChunk<OrderedRowKeys> acceptedRowKeys) {
-            final int size = values.size();
-            acceptedRowKeys.setSize(0);
-            for (int vi = 0; vi < size; ++vi) {
-                final double value = values.get(vi);
-                if (!Double.isNaN(value) && value != NULL_DOUBLE) {
-                    acceptedRowKeys.add(rowKeys.get(vi));
-                }
-            }
+        public boolean matches(final double value) {
+            return !Double.isNaN(value) && value != NULL_DOUBLE;
         }
     }
 
-    private static final class FloatFilter implements ChunkFilter.FloatChunkFilter {
+    private static final class FloatFilter extends FloatChunkFilter {
 
         private static final FloatFilter INSTANCE = new FloatFilter();
 
         private FloatFilter() {}
 
         @Override
-        public void filter(
-                @NotNull final FloatChunk<? extends Values> values,
-                @NotNull final LongChunk<OrderedRowKeys> rowKeys,
-                @NotNull final WritableLongChunk<OrderedRowKeys> acceptedRowKeys) {
-            final int size = values.size();
-            acceptedRowKeys.setSize(0);
-            for (int vi = 0; vi < size; ++vi) {
-                final float value = values.get(vi);
-                if (!Float.isNaN(value) && value != NULL_FLOAT) {
-                    acceptedRowKeys.add(rowKeys.get(vi));
-                }
-            }
+        public boolean matches(final float value) {
+            return !Float.isNaN(value) && value != NULL_FLOAT;
         }
     }
 
diff --git a/engine/table/src/main/java/io/deephaven/engine/table/impl/remote/ConstructSnapshot.java b/engine/table/src/main/java/io/deephaven/engine/table/impl/remote/ConstructSnapshot.java
index 14ac7076896..88d05fdbf92 100644
--- a/engine/table/src/main/java/io/deephaven/engine/table/impl/remote/ConstructSnapshot.java
+++ b/engine/table/src/main/java/io/deephaven/engine/table/impl/remote/ConstructSnapshot.java
@@ -3,13 +3,20 @@
 //
 package io.deephaven.engine.table.impl.remote;
 
+import gnu.trove.TIntCollection;
+import gnu.trove.list.TIntList;
+import gnu.trove.list.array.TIntArrayList;
 import io.deephaven.base.formatters.FormatBitSet;
 import io.deephaven.base.log.LogOutput;
 import io.deephaven.base.log.LogOutputAppendable;
 import io.deephaven.base.verify.Assert;
 import io.deephaven.configuration.Configuration;
 import io.deephaven.engine.context.ExecutionContext;
+import io.deephaven.engine.exceptions.ColumnSnapshotUnsuccessfulException;
 import io.deephaven.engine.exceptions.SnapshotUnsuccessfulException;
+import io.deephaven.engine.table.impl.ForkJoinPoolOperationInitializer;
+import io.deephaven.engine.table.impl.sources.InMemoryColumnSource;
+import io.deephaven.engine.table.impl.sources.RedirectedColumnSource;
 import io.deephaven.engine.updategraph.*;
 import io.deephaven.engine.rowset.*;
 import io.deephaven.engine.table.SharedContext;
@@ -18,11 +25,9 @@
 import io.deephaven.engine.updategraph.NotificationQueue.Dependency;
 import io.deephaven.engine.updategraph.impl.PeriodicUpdateGraph;
 import io.deephaven.io.log.LogEntry;
-import io.deephaven.engine.table.ColumnDefinition;
 import io.deephaven.engine.exceptions.CancellationException;
 import io.deephaven.engine.table.Table;
-import io.deephaven.engine.table.TableDefinition;
-import io.deephaven.util.datastructures.LongSizedDataStructure;
+import io.deephaven.util.SafeCloseableArray;
 import io.deephaven.engine.liveness.LivenessManager;
 import io.deephaven.engine.liveness.LivenessScope;
 import io.deephaven.engine.liveness.LivenessScopeStack;
@@ -33,17 +38,20 @@
 import io.deephaven.util.SafeCloseable;
 import io.deephaven.UncheckedDeephavenException;
 import io.deephaven.internal.log.LoggerFactory;
+import org.apache.commons.lang3.mutable.MutableObject;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
-import java.lang.reflect.Array;
-import java.time.Instant;
-import java.time.ZonedDateTime;
 import java.util.*;
+import java.util.concurrent.CompletableFuture;
+import java.util.concurrent.ExecutionException;
 import java.util.stream.Stream;
 
 import io.deephaven.chunk.attributes.Values;
 
+import static io.deephaven.engine.table.impl.QueryTable.ENABLE_PARALLEL_SNAPSHOT;
+import static io.deephaven.engine.table.impl.QueryTable.MINIMUM_PARALLEL_SNAPSHOT_ROWS;
+
 /**
  * A Set of static utilities for computing values from a table while avoiding the use of an update graph lock. This
  * class supports snapshots in both position space and key space.
@@ -82,42 +90,41 @@ public NoSnapshotAllowedException(String reason) {
     public static final int SNAPSHOT_CHUNK_SIZE = Configuration.getInstance()
             .getIntegerWithDefault("ConstructSnapshot.snapshotChunkSize", 1 << 24);
 
-
     public interface State {
 
         /**
-         * Test that determines whether the currently-active concurrent snapshot attempt has become inconsistent. Always
+         * Test that determines whether the currently active concurrent snapshot attempt has become inconsistent. Always
          * returns {@code false} if there is no snapshot attempt active, or if there is a locked attempt active
          * (necessarily at lower depth than the lowest concurrent attempt).
          *
-         * @return Whether the clock or sources have changed in such a way as to make the currently-active concurrent
+         * @return Whether the clock or sources have changed in such a way as to make the currently active concurrent
          *         snapshot attempt inconsistent
          */
         boolean concurrentAttemptInconsistent();
 
         /**
-         * Check that fails if the currently-active concurrent snapshot attempt has become inconsistent. source. This is
-         * a no-op if there is no snapshot attempt active, or if there is a locked attempt active (necessarily at lower
-         * depth than the lowest concurrent attempt).
+         * Check that fails if the currently active concurrent snapshot attempt has become inconsistent. This is a no-op
+         * if there is no snapshot attempt active, or if there is a locked attempt active (necessarily at lower depth
+         * than the lowest concurrent attempt).
          *
-         * @throws SnapshotInconsistentException If the currently-active concurrent snapshot attempt has become
+         * @throws SnapshotInconsistentException If the currently active concurrent snapshot attempt has become
          *         inconsistent
          */
         void failIfConcurrentAttemptInconsistent();
 
         /**
          * Wait for a dependency to become satisfied on the current cycle if we're trying to use current values for the
-         * currently-active concurrent snapshot attempt. This is a no-op if there is no snapshot attempt active, or if
+         * currently active concurrent snapshot attempt. This is a no-op if there is no snapshot attempt active, or if
          * there is a locked attempt active (necessarily at lower depth than the lowest concurrent attempt).
          *
-         * @param dependency The dependency, which may be null in order to avoid redundant checks in calling code
+         * @param dependency The dependency, which may be null to avoid redundant checks in calling code
          * @throws SnapshotInconsistentException If we cannot wait for this dependency on the current step because the
          *         step changed
          */
         void maybeWaitForSatisfaction(@Nullable NotificationQueue.Dependency dependency);
 
         /**
-         * Return the currently-active concurrent snapshot attempt's "before" clock value, or zero if there is no
+         * Return the currently active concurrent snapshot attempt's "before" clock value, or zero if there is no
          * concurrent attempt active.
          *
          * @return The concurrent snapshot attempt's "before" clock value, or zero
@@ -424,23 +431,23 @@ private static boolean clockConsistent(
     }
 
     /**
-     * Get the currently-active snapshot state.
+     * Get the currently active snapshot state.
      *
-     * @return the currently-active snapshot state
+     * @return the currently active snapshot state
      */
     public static State state() {
         return StateImpl.get();
     }
 
     /**
-     * Test that determines whether the currently-active concurrent snapshot attempt has become inconsistent. Always
+     * Test that determines whether the currently active concurrent snapshot attempt has become inconsistent. Always
      * returns {@code false} if there is no snapshot attempt active, or if there is a locked attempt active (necessarily
      * at lower depth than the lowest concurrent attempt).
      *
      * <p>
      * Equivalent to {@code state().concurrentAttemptInconsistent()}.
      *
-     * @return Whether the clock or sources have changed in such a way as to make the currently-active concurrent
+     * @return Whether the clock or sources have changed in such a way as to make the currently active concurrent
      *         snapshot attempt inconsistent
      * @see State#concurrentAttemptInconsistent()
      */
@@ -449,14 +456,14 @@ public static boolean concurrentAttemptInconsistent() {
     }
 
     /**
-     * Check that fails if the currently-active concurrent snapshot attempt has become inconsistent. source. This is a
-     * no-op if there is no snapshot attempt active, or if there is a locked attempt active (necessarily at lower depth
-     * than the lowest concurrent attempt).
+     * Check that fails if the currently active concurrent snapshot attempt has become inconsistent. This is a no-op if
+     * there is no snapshot attempt active, or if there is a locked attempt active (necessarily at lower depth than the
+     * lowest concurrent attempt).
      *
      * <p>
      * Equivalent to {@code state().failIfConcurrentAttemptInconsistent()}.
      *
-     * @throws SnapshotInconsistentException If the currently-active concurrent snapshot attempt has become inconsistent
+     * @throws SnapshotInconsistentException If the currently active concurrent snapshot attempt has become inconsistent
      * @see State#failIfConcurrentAttemptInconsistent()
      */
     public static void failIfConcurrentAttemptInconsistent() {
@@ -465,13 +472,13 @@ public static void failIfConcurrentAttemptInconsistent() {
 
     /**
      * Wait for a dependency to become satisfied on the current cycle if we're trying to use current values for the
-     * currently-active concurrent snapshot attempt. This is a no-op if there is no snapshot attempt active, or if there
+     * currently active concurrent snapshot attempt. This is a no-op if there is no snapshot attempt active, or if there
      * is a locked attempt active (necessarily at lower depth than the lowest concurrent attempt).
      *
      * <p>
      * Equivalent to {@code state().maybeWaitForSatisfaction(dependency)}.
      *
-     * @param dependency The dependency, which may be null in order to avoid redundant checks in calling code
+     * @param dependency The dependency, which may be null to avoid redundant checks in calling code
      * @throws SnapshotInconsistentException If we cannot wait for this dependency on the current step because the step
      *         changed
      * @see State#maybeWaitForSatisfaction(Dependency)
@@ -481,7 +488,7 @@ public static void maybeWaitForSatisfaction(@Nullable final NotificationQueue.De
     }
 
     /**
-     * Return the currently-active concurrent snapshot attempt's "before" clock value, or zero if there is no concurrent
+     * Return the currently active concurrent snapshot attempt's "before" clock value, or zero if there is no concurrent
      * attempt active.
      *
      * <p>
@@ -509,108 +516,6 @@ public static LogOutput appendConcurrentAttemptClockInfo(@NotNull final LogOutpu
         return state().appendConcurrentAttemptClockInfo(logOutput);
     }
 
-    /**
-     * Create a {@link InitialSnapshot snapshot} of the entire table specified. Note that this method is
-     * notification-oblivious, i.e. it makes no attempt to ensure that notifications are not missed.
-     *
-     * @param logIdentityObject An object used to prepend to log rows.
-     * @param table the table to snapshot.
-     * @return a snapshot of the entire base table.
-     */
-    public static InitialSnapshot constructInitialSnapshot(
-            @NotNull final Object logIdentityObject,
-            @NotNull final BaseTable<?> table) {
-        return constructInitialSnapshot(logIdentityObject, table, null, null);
-    }
-
-    /**
-     * Create a {@link InitialSnapshot snapshot} of the specified table using a set of requested columns and keys. Note
-     * that this method uses a RowSet that is in key space, and that it is notification-oblivious, i.e. it makes no
-     * attempt to ensure that notifications are not missed.
-     *
-     * @param logIdentityObject An object used to prepend to log rows.
-     * @param table the table to snapshot.
-     * @param columnsToSerialize A {@link BitSet} of columns to include, null for all
-     * @param keysToSnapshot An RowSet of keys within the table to include, null for all
-     * @return a snapshot of the entire base table.
-     */
-    public static InitialSnapshot constructInitialSnapshot(
-            @NotNull final Object logIdentityObject,
-            @NotNull final BaseTable<?> table,
-            @Nullable final BitSet columnsToSerialize,
-            @Nullable final RowSet keysToSnapshot) {
-        return constructInitialSnapshot(logIdentityObject, table, columnsToSerialize, keysToSnapshot,
-                makeSnapshotControl(false, table.isRefreshing(), table));
-    }
-
-    static InitialSnapshot constructInitialSnapshot(
-            @NotNull final Object logIdentityObject,
-            @NotNull final BaseTable<?> table,
-            @Nullable final BitSet columnsToSerialize,
-            @Nullable final RowSet keysToSnapshot,
-            @NotNull final SnapshotControl control) {
-        final UpdateGraph updateGraph = table.getUpdateGraph();
-        try (final SafeCloseable ignored = ExecutionContext.getContext().withUpdateGraph(updateGraph).open()) {
-            final InitialSnapshot snapshot = new InitialSnapshot();
-
-            final SnapshotFunction doSnapshot = (usePrev, beforeClockValue) -> serializeAllTable(
-                    usePrev, snapshot, table, logIdentityObject, columnsToSerialize, keysToSnapshot);
-
-            snapshot.step = callDataSnapshotFunction(System.identityHashCode(logIdentityObject), control, doSnapshot);
-
-            return snapshot;
-        }
-    }
-
-    /**
-     * Create a {@link InitialSnapshot snapshot} of the specified table using a set of requested columns and positions.
-     * Note that this method uses a RowSet that is in position space, and that it is notification-oblivious, i.e. it
-     * makes no attempt to ensure that notifications are not missed.
-     *
-     * @param logIdentityObject An object used to prepend to log rows.
-     * @param table the table to snapshot.
-     * @param columnsToSerialize A {@link BitSet} of columns to include, null for all
-     * @param positionsToSnapshot An RowSet of positions within the table to include, null for all
-     * @return a snapshot of the entire base table.
-     */
-    public static InitialSnapshot constructInitialSnapshotInPositionSpace(
-            @NotNull final Object logIdentityObject,
-            @NotNull final BaseTable<?> table,
-            @Nullable final BitSet columnsToSerialize,
-            @Nullable final RowSet positionsToSnapshot) {
-        try (final SafeCloseable ignored = ExecutionContext.getContext().withUpdateGraph(
-                table.getUpdateGraph()).open()) {
-            return constructInitialSnapshotInPositionSpace(logIdentityObject, table, columnsToSerialize,
-                    positionsToSnapshot, makeSnapshotControl(false, table.isRefreshing(), table));
-        }
-    }
-
-    static InitialSnapshot constructInitialSnapshotInPositionSpace(
-            @NotNull final Object logIdentityObject,
-            @NotNull final BaseTable<?> table,
-            @Nullable final BitSet columnsToSerialize,
-            @Nullable final RowSet positionsToSnapshot,
-            @NotNull final SnapshotControl control) {
-        final InitialSnapshot snapshot = new InitialSnapshot();
-
-        final SnapshotFunction doSnapshot = (usePrev, beforeClockValue) -> {
-            final RowSet keysToSnapshot;
-            if (positionsToSnapshot == null) {
-                keysToSnapshot = null;
-            } else {
-                keysToSnapshot = (usePrev ? table.getRowSet().prev() : table.getRowSet())
-                        .subSetForPositions(positionsToSnapshot);
-            }
-            return serializeAllTable(usePrev, snapshot, table, logIdentityObject, columnsToSerialize, keysToSnapshot);
-        };
-
-        try (final SafeCloseable ignored = ExecutionContext.getContext().withUpdateGraph(
-                table.getUpdateGraph()).open()) {
-            snapshot.step = callDataSnapshotFunction(System.identityHashCode(logIdentityObject), control, doSnapshot);
-        }
-        return snapshot;
-    }
-
     /**
      * Create a {@link BarrageMessage snapshot} of the specified table including all columns and rows. Note that this
      * method is notification-oblivious, i.e. it makes no attempt to ensure that notifications are not missed.
@@ -632,17 +537,17 @@ public static BarrageMessage constructBackplaneSnapshot(
      *
      * @param logIdentityObject An object used to prepend to log rows.
      * @param table the table to snapshot.
-     * @param columnsToSerialize A {@link BitSet} of columns to include, null for all
-     * @param positionsToSnapshot An RowSet of positions within the table to include, null for all
+     * @param columnsToSnapshot A {@link BitSet} of columns to include, null for all
+     * @param positionsToSnapshot RowSet of positions within the table to include, null for all
      * @return a snapshot of the entire base table.
      */
     public static BarrageMessage constructBackplaneSnapshotInPositionSpace(
             @NotNull final Object logIdentityObject,
             @NotNull final BaseTable<?> table,
-            @Nullable final BitSet columnsToSerialize,
+            @Nullable final BitSet columnsToSnapshot,
             @Nullable final RowSequence positionsToSnapshot,
             @Nullable final RowSequence reversePositionsToSnapshot) {
-        return constructBackplaneSnapshotInPositionSpace(logIdentityObject, table, columnsToSerialize,
+        return constructBackplaneSnapshotInPositionSpace(logIdentityObject, table, columnsToSnapshot,
                 positionsToSnapshot, reversePositionsToSnapshot,
                 makeSnapshotControl(false, table.isRefreshing(), table));
     }
@@ -653,7 +558,7 @@ public static BarrageMessage constructBackplaneSnapshotInPositionSpace(
      *
      * @param logIdentityObject An object used to prepend to log rows.
      * @param table the table to snapshot.
-     * @param columnsToSerialize A {@link BitSet} of columns to include, null for all
+     * @param columnsToSnapshot A {@link BitSet} of columns to include, null for all
      * @param positionsToSnapshot A RowSequence of positions within the table to include, null for all
      * @param reversePositionsToSnapshot A RowSequence of reverse positions within the table to include, null for all
      * @param control A {@link SnapshotControl} to define the parameters and consistency for this snapshot
@@ -662,18 +567,21 @@ public static BarrageMessage constructBackplaneSnapshotInPositionSpace(
     public static BarrageMessage constructBackplaneSnapshotInPositionSpace(
             @NotNull final Object logIdentityObject,
             @NotNull final BaseTable<?> table,
-            @Nullable final BitSet columnsToSerialize,
+            @Nullable final BitSet columnsToSnapshot,
             @Nullable final RowSequence positionsToSnapshot,
             @Nullable final RowSequence reversePositionsToSnapshot,
             @NotNull final SnapshotControl control) {
-
         final UpdateGraph updateGraph = table.getUpdateGraph();
-        try (final SafeCloseable ignored1 = ExecutionContext.getContext().withUpdateGraph(updateGraph).open()) {
-            final BarrageMessage snapshot = new BarrageMessage();
-            snapshot.isSnapshot = true;
-            snapshot.shifted = RowSetShiftData.EMPTY;
-
+        final MutableObject<BarrageMessage> snapshotMsg = new MutableObject<>();
+        // Use Fork-Join thread pool for parallel snapshotting
+        try (final SafeCloseable ignored1 = ExecutionContext.getContext()
+                .withUpdateGraph(updateGraph)
+                .withOperationInitializer(ForkJoinPoolOperationInitializer.fromCommonPool())
+                .open()) {
             final SnapshotFunction doSnapshot = (usePrev, beforeClockValue) -> {
+                final BarrageMessage snapshot = new BarrageMessage();
+                snapshot.isSnapshot = true;
+                snapshot.shifted = RowSetShiftData.EMPTY;
                 final RowSet keysToSnapshot;
                 if (positionsToSnapshot == null && reversePositionsToSnapshot == null) {
                     keysToSnapshot = null;
@@ -694,49 +602,27 @@ public static BarrageMessage constructBackplaneSnapshotInPositionSpace(
                     }
                 }
                 try (final RowSet ignored = keysToSnapshot) {
-                    return serializeAllTable(usePrev, snapshot, table, logIdentityObject, columnsToSerialize,
-                            keysToSnapshot);
+                    final boolean success = snapshotAllTable(usePrev, snapshot, table, logIdentityObject,
+                            columnsToSnapshot, keysToSnapshot);
+                    if (success) {
+                        snapshotMsg.setValue(snapshot);
+                    } else {
+                        snapshot.close();
+                    }
+                    return success;
+                } catch (final Throwable e) {
+                    snapshot.close();
+                    throw e;
                 }
             };
-
-            snapshot.step = callDataSnapshotFunction(System.identityHashCode(logIdentityObject), control, doSnapshot);
-            snapshot.firstSeq = snapshot.lastSeq = snapshot.step;
-
+            final long clockStep =
+                    callDataSnapshotFunction(System.identityHashCode(logIdentityObject), control, doSnapshot);
+            final BarrageMessage snapshot = snapshotMsg.getValue();
+            snapshot.firstSeq = snapshot.lastSeq = clockStep;
             return snapshot;
         }
     }
 
-    /**
-     * Constructs {@link InitialSnapshot}s for the entirety of the tables. Note that this method is
-     * notification-oblivious, i.e. it makes no attempt to ensure that notifications are not missed.
-     *
-     * @param logIdentityObject identifier prefixing the log message
-     * @param tables tables to snapshot
-     * @return list of the resulting {@link InitialSnapshot}s
-     */
-    public static List<InitialSnapshot> constructInitialSnapshots(
-            @NotNull final Object logIdentityObject,
-            @NotNull final BaseTable<?>... tables) {
-        if (tables.length == 0) {
-            return Collections.emptyList();
-        }
-        final UpdateGraph updateGraph = NotificationQueue.Dependency.getUpdateGraph(null, tables);
-        try (final SafeCloseable ignored = ExecutionContext.getContext().withUpdateGraph(updateGraph).open()) {
-            final List<InitialSnapshot> snapshots = new ArrayList<>();
-
-            final SnapshotControl snapshotControl = tables.length == 1
-                    ? makeSnapshotControl(false, tables[0].isRefreshing(), tables[0])
-                    : makeSnapshotControl(false, Arrays.stream(tables).anyMatch(BaseTable::isRefreshing), tables);
-
-            final SnapshotFunction doSnapshot =
-                    (usePrev, beforeClockValue) -> serializeAllTables(usePrev, snapshots, tables, logIdentityObject);
-
-            callDataSnapshotFunction(System.identityHashCode(logIdentityObject), snapshotControl, doSnapshot);
-
-            return snapshots;
-        }
-    }
-
     @FunctionalInterface
     public interface SnapshotFunction {
         /**
@@ -1274,6 +1160,10 @@ public static long callDataSnapshotFunction(
                                 .endl();
                     }
                     break;
+                } catch (SnapshotUnsuccessfulException sue) {
+                    // The snapshot function below detected a failure despite a consistent state. We should not
+                    // re-attempt, or re-check the consistency ourselves.
+                    throw sue;
                 } catch (Exception e) {
                     functionSuccessful = false;
                     caughtException = e;
@@ -1399,77 +1289,6 @@ public static long callDataSnapshotFunction(
         return step;
     }
 
-    /**
-     * <p>
-     * Populate an {@link InitialSnapshot} with the specified keys and columns to snapshot.
-     * <p>
-     * Note that care must be taken while using this method to ensure the underlying table is locked or does not change,
-     * otherwise the resulting snapshot may be inconsistent. In general users should instead use
-     * {@link #constructInitialSnapshot} for simple use cases or {@link #callDataSnapshotFunction} for more advanced
-     * uses.
-     *
-     * @param usePrev Whether to use previous values
-     * @param snapshot The snapshot to populate
-     * @param logIdentityObject An object for use with log() messages
-     * @param columnsToSerialize A {@link BitSet} of columns to include, null for all
-     * @param keysToSnapshot A RowSet of keys within the table to include, null for all
-     *
-     * @return Whether the snapshot succeeded
-     */
-    private static boolean serializeAllTable(
-            final boolean usePrev,
-            @NotNull final InitialSnapshot snapshot,
-            @NotNull final BaseTable<?> table,
-            @NotNull final Object logIdentityObject,
-            @Nullable final BitSet columnsToSerialize,
-            @Nullable final RowSet keysToSnapshot) {
-        snapshot.rowSet = (usePrev ? table.getRowSet().prev() : table.getRowSet()).copy();
-
-        if (keysToSnapshot != null) {
-            snapshot.rowsIncluded = snapshot.rowSet.intersect(keysToSnapshot);
-        } else {
-            snapshot.rowsIncluded = snapshot.rowSet;
-        }
-
-        LongSizedDataStructure.intSize("construct snapshot", snapshot.rowsIncluded.size());
-        final String[] columnSources = table.getDefinition().getColumnNamesArray();
-
-        snapshot.dataColumns = new Object[columnSources.length];
-        try (final SharedContext sharedContext =
-                (columnSources.length > 1) ? SharedContext.makeSharedContext() : null) {
-            for (int ii = 0; ii < columnSources.length; ii++) {
-                if (columnsToSerialize != null && !columnsToSerialize.get(ii)) {
-                    continue;
-                }
-
-                if (concurrentAttemptInconsistent()) {
-                    if (log.isDebugEnabled()) {
-                        final LogEntry logEntry = log.debug().append(System.identityHashCode(logIdentityObject))
-                                .append(" Bad snapshot before column ").append(ii);
-                        appendConcurrentAttemptClockInfo(logEntry);
-                        logEntry.endl();
-                    }
-                    return false;
-                }
-
-                final ColumnSource<?> columnSource = table.getColumnSource(columnSources[ii]);
-                snapshot.dataColumns[ii] = getSnapshotData(columnSource, sharedContext, snapshot.rowsIncluded, usePrev);
-            }
-        }
-
-        if (log.isDebugEnabled()) {
-            log.debug().append(System.identityHashCode(logIdentityObject))
-                    .append(": Snapshot candidate step=")
-                    .append((usePrev ? -1 : 0) + LogicalClock.getStep(getConcurrentAttemptClockValue()))
-                    .append(", rows=").append(snapshot.rowsIncluded).append("/").append(keysToSnapshot)
-                    .append(", cols=").append(FormatBitSet.arrayToLog(snapshot.dataColumns)).append("/")
-                    .append((columnsToSerialize != null) ? FormatBitSet.formatBitSet(columnsToSerialize)
-                            : FormatBitSet.arrayToLog(snapshot.dataColumns))
-                    .append(", usePrev=").append(usePrev).endl();
-        }
-        return true;
-    }
-
     /**
      * <p>
      * Populate a BarrageMessage with the specified positions to snapshot and columns.
@@ -1482,19 +1301,20 @@ private static boolean serializeAllTable(
      * @param usePrev Use previous values?
      * @param snapshot The snapshot to populate
      * @param logIdentityObject an object for use with log() messages
-     * @param columnsToSerialize A {@link BitSet} of columns to include, null for all
+     * @param columnsToSnapshot A {@link BitSet} of columns to include, null for all
      * @param keysToSnapshot A RowSet of keys within the table to include, null for all
      * @return true if the snapshot was computed with an unchanged clock, false otherwise.
      */
-    private static boolean serializeAllTable(
+    private static boolean snapshotAllTable(
             final boolean usePrev,
             @NotNull final BarrageMessage snapshot,
             @NotNull final BaseTable<?> table,
             @NotNull final Object logIdentityObject,
-            @Nullable final BitSet columnsToSerialize,
+            @Nullable final BitSet columnsToSnapshot,
             @Nullable final RowSet keysToSnapshot) {
 
         snapshot.rowsAdded = (usePrev ? table.getRowSet().prev() : table.getRowSet()).copy();
+        snapshot.tableSize = snapshot.rowsAdded.size();
         snapshot.rowsRemoved = RowSetFactory.empty();
         snapshot.addColumnData = new BarrageMessage.AddColumnData[table.getColumnSources().size()];
 
@@ -1509,243 +1329,205 @@ private static boolean serializeAllTable(
 
         final String[] columnSources = table.getDefinition().getColumnNamesArray();
 
-        try (final SharedContext sharedContext =
-                (columnSources.length > 1) ? SharedContext.makeSharedContext() : null) {
-            for (int ii = 0; ii < columnSources.length; ++ii) {
-                if (concurrentAttemptInconsistent()) {
-                    if (log.isDebugEnabled()) {
-                        final LogEntry logEntry = log.debug().append(System.identityHashCode(logIdentityObject))
-                                .append(" Bad snapshot before column ").append(ii);
-                        appendConcurrentAttemptClockInfo(logEntry);
-                        logEntry.endl();
-                    }
+        // Snapshot empty columns serially, and collect indices of non-empty columns
+        final int numColumnsToSnapshot =
+                columnsToSnapshot != null ? columnsToSnapshot.cardinality() : columnSources.length;
+        final TIntList nonEmptyColumnIndices = new TIntArrayList(numColumnsToSnapshot);
+        final List<ColumnSource<?>> nonEmptyColumnSources = new ArrayList<>(numColumnsToSnapshot);
+        if (!snapshotEmptyColumns(columnSources, columnsToSnapshot, table, logIdentityObject, snapshot,
+                nonEmptyColumnIndices, nonEmptyColumnSources)) {
+            return false;
+        }
+        boolean canParallelize = false;
+        final int numNonEmptyColumns = nonEmptyColumnIndices.size();
+        if (numNonEmptyColumns != 0) {
+            final ExecutionContext executionContext = ExecutionContext.getContext();
+            canParallelize = ENABLE_PARALLEL_SNAPSHOT &&
+                    executionContext.getOperationInitializer().canParallelize() &&
+                    numNonEmptyColumns > 1 &&
+                    (snapshot.rowsIncluded.size() >= MINIMUM_PARALLEL_SNAPSHOT_ROWS ||
+                            !allColumnSourcesInMemory(nonEmptyColumnSources));
+            if (canParallelize) {
+                if (!snapshotColumnsParallel(nonEmptyColumnIndices, nonEmptyColumnSources, usePrev, executionContext,
+                        snapshot)) {
                     return false;
                 }
-
-                final ColumnSource<?> columnSource = table.getColumnSource(columnSources[ii]);
-
-                final BarrageMessage.AddColumnData acd = new BarrageMessage.AddColumnData();
-                snapshot.addColumnData[ii] = acd;
-                final boolean columnIsEmpty = columnsToSerialize != null && !columnsToSerialize.get(ii);
-                final RowSet rows = columnIsEmpty ? RowSetFactory.empty() : snapshot.rowsIncluded;
-                // Note: cannot use shared context across several calls of differing lengths and no sharing necessary
-                // when empty
-                final ColumnSource<?> sourceToUse = ReinterpretUtils.maybeConvertToPrimitive(columnSource);
-                acd.data = getSnapshotDataAsChunkList(sourceToUse, columnIsEmpty ? null : sharedContext, rows, usePrev);
-                acd.type = columnSource.getType();
-                acd.componentType = columnSource.getComponentType();
-                acd.chunkType = sourceToUse.getChunkType();
-
-                final BarrageMessage.ModColumnData mcd = new BarrageMessage.ModColumnData();
-                snapshot.modColumnData[ii] = mcd;
-                mcd.rowsModified = RowSetFactory.empty();
-                mcd.data = getSnapshotDataAsChunkList(sourceToUse, null, RowSetFactory.empty(), usePrev);
-                mcd.type = acd.type;
-                mcd.componentType = acd.componentType;
-                mcd.chunkType = sourceToUse.getChunkType();
+            } else {
+                // Snapshot all non-empty columns serially
+                snapshotColumnsSerial(nonEmptyColumnIndices, nonEmptyColumnSources, usePrev, snapshot);
             }
         }
-
         if (log.isDebugEnabled()) {
             final LogEntry logEntry = log.debug().append(System.identityHashCode(logIdentityObject))
                     .append(": Snapshot candidate step=")
                     .append((usePrev ? -1 : 0) + LogicalClock.getStep(getConcurrentAttemptClockValue()))
+                    .append(", canParallelize=").append(canParallelize)
                     .append(", rows=").append(snapshot.rowsIncluded).append("/").append(keysToSnapshot)
                     .append(", cols=");
-            if (columnsToSerialize == null) {
+            if (columnsToSnapshot == null) {
                 logEntry.append("ALL");
             } else {
-                logEntry.append(FormatBitSet.formatBitSet(columnsToSerialize));
+                logEntry.append(FormatBitSet.formatBitSet(columnsToSnapshot));
             }
             logEntry.append(", usePrev=").append(usePrev).endl();
         }
-
         return true;
     }
 
-    private static boolean serializeAllTables(
-            final boolean usePrev,
-            @NotNull final List<InitialSnapshot> snapshots,
-            @NotNull final BaseTable<?>[] tables,
-            @NotNull final Object logIdentityObject) {
-        snapshots.clear();
-
-        for (final BaseTable<?> table : tables) {
-            final InitialSnapshot snapshot = new InitialSnapshot();
-            snapshots.add(snapshot);
-            if (!serializeAllTable(usePrev, snapshot, table, logIdentityObject, null, null)) {
-                snapshots.clear();
+    /**
+     * Check if all the required column sources are in memory and should allow efficient access.
+     */
+    private static boolean allColumnSourcesInMemory(@NotNull final Iterable<ColumnSource<?>> columnSources) {
+        for (final ColumnSource<?> columnSource : columnSources) {
+            if (!isColumnSourceInMemory(columnSource)) {
                 return false;
             }
         }
-
         return true;
     }
 
-    private static <T> Object getSnapshotData(
-            @NotNull final ColumnSource<T> columnSource,
-            @Nullable final SharedContext sharedContext,
-            @NotNull final RowSet rowSet,
-            final boolean usePrev) {
-        final ColumnSource<?> sourceToUse = ReinterpretUtils.maybeConvertToPrimitive(columnSource);
-        final Class<?> type = sourceToUse.getType();
-        final int size = rowSet.intSize();
-        try (final ColumnSource.FillContext context = sourceToUse.makeFillContext(size, sharedContext)) {
-            final ChunkType chunkType = sourceToUse.getChunkType();
-            final Object resultArray = chunkType.makeArray(size);
-            final WritableChunk<Values> result = chunkType.writableChunkWrap(resultArray, 0, size);
-            if (usePrev) {
-                sourceToUse.fillPrevChunk(context, result, rowSet);
-            } else {
-                sourceToUse.fillChunk(context, result, rowSet);
+    /**
+     * Check if the column source is in-memory or redirected to an in-memory column source.
+     */
+    private static boolean isColumnSourceInMemory(ColumnSource<?> columnSource) {
+        do {
+            if (columnSource instanceof InMemoryColumnSource) {
+                return ((InMemoryColumnSource) columnSource).isInMemory();
             }
-            if (chunkType == ChunkType.Object) {
-                // noinspection unchecked
-                final T[] values = (T[]) Array.newInstance(type, size);
-                for (int ii = 0; ii < values.length; ++ii) {
-                    // noinspection unchecked
-                    values[ii] = (T) result.asObjectChunk().get(ii);
-                }
-                return values;
-
+            if (!(columnSource instanceof RedirectedColumnSource)) {
+                return false;
             }
-            return resultArray;
-        }
+            columnSource = ((RedirectedColumnSource<?>) columnSource).getInnerSource();
+        } while (true);
     }
 
-    private static <T> ArrayList<Chunk<Values>> getSnapshotDataAsChunkList(
-            @NotNull final ColumnSource<T> columnSource,
-            @Nullable final SharedContext sharedContext,
-            @NotNull final RowSet rowSet,
-            final boolean usePrev) {
-        long offset = 0;
-        final long size = rowSet.size();
-        final ArrayList<Chunk<Values>> result = new ArrayList<>();
-
-        if (size == 0) {
-            return result;
+    /**
+     * Snapshot the specified columns in parallel.
+     */
+    private static boolean snapshotColumnsParallel(
+            @NotNull final TIntList columnIndices,
+            @NotNull final List<ColumnSource<?>> columnSources,
+            final boolean usePrev,
+            final ExecutionContext executionContext,
+            @NotNull final BarrageMessage snapshot) {
+        final JobScheduler jobScheduler = new OperationInitializerJobScheduler();
+        final CompletableFuture<Void> waitForParallelSnapshot = new CompletableFuture<>();
+        jobScheduler.iterateParallel(
+                executionContext,
+                logOutput -> logOutput.append("snapshotColumnsParallel"),
+                JobScheduler.DEFAULT_CONTEXT_FACTORY,
+                0, columnIndices.size(),
+                (context, colRank, nestedErrorConsumer) -> snapshotColumnsSerial(
+                        new TIntArrayList(new int[] {columnIndices.get(colRank)}),
+                        columnSources.subList(colRank, colRank + 1),
+                        usePrev, snapshot),
+                () -> waitForParallelSnapshot.complete(null),
+                waitForParallelSnapshot::completeExceptionally);
+        try {
+            waitForParallelSnapshot.get();
+        } catch (final InterruptedException e) {
+            throw new CancellationException("Interrupted during parallel column snapshot");
+        } catch (final ExecutionException e) {
+            throw new ColumnSnapshotUnsuccessfulException(
+                    "Exception occurred during parallel column snapshot", e.getCause());
         }
+        return true;
+    }
 
-        final int maxChunkSize = (int) Math.min(size, SNAPSHOT_CHUNK_SIZE);
-
-        try (final ColumnSource.FillContext context = columnSource.makeFillContext(maxChunkSize, sharedContext);
-                final RowSequence.Iterator it = rowSet.getRowSequenceIterator()) {
-            int chunkSize = maxChunkSize;
-            while (it.hasMore()) {
-                final RowSequence reducedRowSet = it.getNextRowSequenceWithLength(chunkSize);
-                final ChunkType chunkType = columnSource.getChunkType();
-
-                // create a new chunk
-                WritableChunk<Values> currentChunk = chunkType.makeWritableChunk(chunkSize);
-
-                if (usePrev) {
-                    columnSource.fillPrevChunk(context, currentChunk, reducedRowSet);
-                } else {
-                    columnSource.fillChunk(context, currentChunk, reducedRowSet);
+    /**
+     * Allocate add and mod column data for each column, and populate the snapshot data for empty columns. Also, collect
+     * the indices and column sources of non-empty columns, for which we will populate snapshot data later.
+     * <p>
+     * This method is intended to be called from the thread that initiated the column snapshot.
+     */
+    private static boolean snapshotEmptyColumns(
+            final String[] columnSources,
+            @Nullable final BitSet columnsToSnapshot,
+            @NotNull final Table table,
+            @NotNull final Object logIdentityObject,
+            @NotNull final BarrageMessage snapshot,
+            @NotNull final TIntCollection nonEmptyColumnsIndices,
+            @NotNull final Collection<ColumnSource<?>> nonEmptyColumnSources) {
+        final boolean rowsetIsEmpty = snapshot.rowsIncluded.isEmpty();
+        for (int colIdx = 0; colIdx < columnSources.length; ++colIdx) {
+            if (concurrentAttemptInconsistent()) {
+                if (log.isDebugEnabled()) {
+                    final LogEntry logEntry = log.debug().append(System.identityHashCode(logIdentityObject))
+                            .append(" Bad snapshot before column ").append(columnSources[colIdx])
+                            .append(" at idx ").append(colIdx);
+                    appendConcurrentAttemptClockInfo(logEntry);
+                    logEntry.endl();
                 }
+                return false;
+            }
 
-                // add the chunk to the current list
-                result.add(currentChunk);
-
-                // increment the offset for the next chunk (using the actual values written)
-                offset += currentChunk.size();
-
-                // recompute the size of the next chunk
-                if (size - offset > maxChunkSize) {
-                    chunkSize = maxChunkSize;
-                } else {
-                    chunkSize = (int) (size - offset);
-                }
+            final ColumnSource<?> columnSource = table.getColumnSource(columnSources[colIdx]);
 
-                if (sharedContext != null) {
-                    // a shared context is good for only one chunk of rows
-                    sharedContext.reset();
-                }
+            final BarrageMessage.AddColumnData acd = new BarrageMessage.AddColumnData();
+            snapshot.addColumnData[colIdx] = acd;
+            final boolean columnIsEmpty = rowsetIsEmpty ||
+                    (columnsToSnapshot != null && !columnsToSnapshot.get(colIdx));
+            final ColumnSource<?> sourceToUse = ReinterpretUtils.maybeConvertToPrimitive(columnSource);
+            if (columnIsEmpty) {
+                acd.data = List.of();
+            } else {
+                acd.data = new ArrayList<>(); // To be populated later
+                nonEmptyColumnsIndices.add(colIdx);
+                nonEmptyColumnSources.add(sourceToUse);
             }
+            acd.type = columnSource.getType();
+            acd.componentType = columnSource.getComponentType();
+            acd.chunkType = sourceToUse.getChunkType();
+
+            final BarrageMessage.ModColumnData mcd = new BarrageMessage.ModColumnData();
+            snapshot.modColumnData[colIdx] = mcd;
+            mcd.rowsModified = RowSetFactory.empty();
+            mcd.data = List.of();
+            mcd.type = acd.type;
+            mcd.componentType = acd.componentType;
+            mcd.chunkType = sourceToUse.getChunkType();
         }
-        return result;
-    }
-
-    /**
-     * Estimate the size of a complete table snapshot in bytes.
-     *
-     * @param table the table to estimate
-     * @return the estimated snapshot size in bytes.
-     */
-    public static long estimateSnapshotSize(@NotNull final Table table) {
-        final BitSet columns = new BitSet(table.numColumns());
-        columns.set(0, table.numColumns());
-        return estimateSnapshotSize(table.getDefinition(), columns, table.size());
+        return true;
     }
 
-    /**
-     * Make a rough guess at the size of a snapshot, using the column types and common column names. The use case is
-     * when a user requests something from the GUI; we'd like to know if it is ridiculous before actually doing it.
-     *
-     * @param tableDefinition the table definition
-     * @param columns a bitset indicating which columns are included
-     * @param rowCount how many rows of this data we'll be snapshotting
-     * @return the estimated size of the snapshot
-     */
-    public static long estimateSnapshotSize(
-            @NotNull final TableDefinition tableDefinition,
-            @NotNull final BitSet columns,
-            final long rowCount) {
-        long sizePerRow = 0;
-        long totalSize = 0;
-
-        final int numColumns = tableDefinition.numColumns();
-        final List<ColumnDefinition<?>> columnDefinitions = tableDefinition.getColumns();
-        for (int ii = 0; ii < numColumns; ++ii) {
-            if (!columns.get(ii)) {
-                continue;
+    private static void snapshotColumnsSerial(
+            @NotNull final TIntList columnIndices,
+            @NotNull final List<ColumnSource<?>> columnSources,
+            final boolean usePrev,
+            @NotNull final BarrageMessage snapshot) {
+        final RowSet rowSet = snapshot.rowsIncluded;
+        final long numRows = rowSet.size();
+        // The caller should handle empty tables
+        Assert.assertion(numRows > 0, "numRows > 0");
+        final int numCols = columnIndices.size();
+        final int maxChunkSize = (int) Math.min(numRows, SNAPSHOT_CHUNK_SIZE);
+        final ColumnSource.FillContext[] fillContexts = new ColumnSource.FillContext[numCols];
+        try (final SharedContext sharedContext = numCols > 1 ? SharedContext.makeSharedContext() : null;
+                final SafeCloseableArray<ColumnSource.FillContext> ignored = new SafeCloseableArray<>(fillContexts);
+                final RowSequence.Iterator it = rowSet.getRowSequenceIterator()) {
+            for (int colRank = 0; colRank < numCols; ++colRank) {
+                fillContexts[colRank] = columnSources.get(colRank).makeFillContext(maxChunkSize, sharedContext);
             }
-
-            totalSize += 44; // for an array
-
-            final ColumnDefinition<?> definition = columnDefinitions.get(ii);
-            if (definition.getDataType() == byte.class || definition.getDataType() == char.class
-                    || definition.getDataType() == Boolean.class) {
-                sizePerRow += 1;
-            } else if (definition.getDataType() == short.class) {
-                sizePerRow += 2;
-            } else if (definition.getDataType() == int.class || definition.getDataType() == float.class) {
-                sizePerRow += 4;
-            } else if (definition.getDataType() == long.class || definition.getDataType() == double.class
-                    || definition.getDataType() == Instant.class || definition.getDataType() == ZonedDateTime.class) {
-                sizePerRow += 8;
-            } else {
-                switch (definition.getName()) {
-                    case "Date":
-                        sizePerRow += 5;
-                        totalSize += 10;
-                        break;
-                    case "USym":
-                        sizePerRow += 5;
-                        totalSize += Math.min(rowCount, 10000) * 10;
-                        break;
-                    case "Sym":
-                        sizePerRow += 5;
-                        totalSize += Math.min(rowCount, 1000000) * 30;
-                        break;
-                    case "Parity":
-                        sizePerRow += 5;
-                        totalSize += 30;
-                        break;
-                    case "SecurityType":
-                        sizePerRow += 5;
-                        totalSize += 100;
-                        break;
-                    case "Exchange":
-                        sizePerRow += 5;
-                        totalSize += 130;
-                        break;
-                    default:
-                        sizePerRow += (42 + 8); // how big a dummy object was on a test + a pointer
+            while (it.hasMore()) {
+                final RowSequence reducedRowSet = it.getNextRowSequenceWithLength(maxChunkSize);
+                // Populate the snapshot data for each column for the current chunk of rows
+                for (int colRank = 0; colRank < numCols; ++colRank) {
+                    final int colIdx = columnIndices.get(colRank);
+                    final ColumnSource<?> columnSource = columnSources.get(colRank);
+                    final ColumnSource.FillContext fillContext = fillContexts[colRank];
+                    final WritableChunk<Values> currentChunk =
+                            columnSource.getChunkType().makeWritableChunk(reducedRowSet.intSize());
+                    if (usePrev) {
+                        columnSource.fillPrevChunk(fillContext, currentChunk, reducedRowSet);
+                    } else {
+                        columnSource.fillChunk(fillContext, currentChunk, reducedRowSet);
+                    }
+                    snapshot.addColumnData[colIdx].data.add(currentChunk);
+                }
+                if (sharedContext != null) {
+                    sharedContext.reset();
                 }
             }
         }
-
-        return totalSize + (sizePerRow * rowCount);
     }
 }
diff --git a/engine/table/src/main/java/io/deephaven/engine/table/impl/remote/DeltaUpdates.java b/engine/table/src/main/java/io/deephaven/engine/table/impl/remote/DeltaUpdates.java
deleted file mode 100644
index 0ff27a9af3d..00000000000
--- a/engine/table/src/main/java/io/deephaven/engine/table/impl/remote/DeltaUpdates.java
+++ /dev/null
@@ -1,88 +0,0 @@
-//
-// Copyright (c) 2016-2024 Deephaven Data Labs and Patent Pending
-//
-package io.deephaven.engine.table.impl.remote;
-
-import io.deephaven.engine.table.TableUpdate;
-import io.deephaven.engine.table.impl.TableUpdateImpl;
-import io.deephaven.engine.table.ModifiedColumnSet;
-import io.deephaven.engine.rowset.RowSet;
-import io.deephaven.engine.rowset.RowSetShiftData;
-
-import java.io.Serializable;
-
-public class DeltaUpdates implements Serializable, Cloneable {
-
-    public static class ColumnAdditions implements Serializable {
-        public int columnIndex;
-        public Object serializedRows;
-    }
-    public static class ColumnModifications implements Serializable {
-        public int columnIndex;
-        public RowSet modified;
-        public RowSet rowsIncluded;
-        public Object serializedRows;
-    }
-
-    public long deltaSequence;
-    public long firstStep;
-    public long lastStep;
-    public RowSet added;
-    public RowSet removed;
-    public RowSetShiftData shifted;
-    public RowSet includedAdditions;
-    public ColumnAdditions[] serializedAdditions;
-    public ColumnModifications[] serializedModifications;
-
-    public DeltaUpdates clone() {
-        try {
-            return (DeltaUpdates) super.clone();
-        } catch (CloneNotSupportedException e) {
-            throw new InternalError(e);
-        }
-    }
-
-    public TableUpdate asUpdate(RowSet modified, ModifiedColumnSet mcs) {
-        return new TableUpdateImpl(added, removed, modified, shifted, mcs);
-    }
-
-    @Override
-    public String toString() {
-        StringBuilder builder = new StringBuilder();
-        builder.append("added=").append(added);
-        builder.append(", removed=").append(removed);
-        builder.append(", shifted=").append(shifted);
-        builder.append(", includedAdditions=").append(includedAdditions);
-        if (serializedAdditions != null) {
-            builder.append(", serializedAdditions={");
-            for (int i = 0; i < serializedAdditions.length; ++i) {
-                if (i != 0) {
-                    builder.append(",");
-                } else {
-                    builder.append(serializedAdditions[i].columnIndex);
-                }
-            }
-            builder.append("}");
-        } else {
-            builder.append(", serializedAdditions=null");
-        }
-        if (serializedModifications != null) {
-            builder.append(", serializedModifications={i=");
-            for (int i = 0; i < serializedModifications.length; ++i) {
-                if (i != 0) {
-                    builder.append(";");
-                } else {
-                    builder.append(serializedModifications[i].columnIndex);
-                    builder.append(",modified=");
-                    builder.append(serializedModifications[i].modified);
-                    builder.append(",rowsIncluded=");
-                    builder.append(serializedModifications[i].rowsIncluded);
-                }
-            }
-            builder.append("}");
-        } else {
-            builder.append(", serializedModifications=null");
-        }
-        return builder.toString();
-    }
-}
diff --git a/engine/table/src/main/java/io/deephaven/engine/table/impl/remote/InitialSnapshot.java b/engine/table/src/main/java/io/deephaven/engine/table/impl/remote/InitialSnapshot.java
deleted file mode 100644
index 44832389d85..00000000000
--- a/engine/table/src/main/java/io/deephaven/engine/table/impl/remote/InitialSnapshot.java
+++ /dev/null
@@ -1,55 +0,0 @@
-//
-// Copyright (c) 2016-2024 Deephaven Data Labs and Patent Pending
-//
-package io.deephaven.engine.table.impl.remote;
-
-import io.deephaven.base.formatters.FormatBitSet;
-import io.deephaven.engine.table.Table;
-import io.deephaven.engine.rowset.RowSet;
-
-import java.io.Serializable;
-
-/**
- * A Raw table snapshot. Users may use {@link InitialSnapshotTable#setupInitialSnapshotTable(Table, InitialSnapshot)} to
- * convert this into a {@link io.deephaven.engine.table.impl.QueryTable}
- */
-public class InitialSnapshot implements Serializable, Cloneable {
-    static final long serialVersionUID = 4380513367437361741L;
-
-    public Object type;
-    public RowSet rowSet;
-    public Object[] dataColumns;
-    public long deltaSequence;
-    public long step;
-    public RowSet rowsIncluded;
-    public RowSet viewport;
-
-    public InitialSnapshot clone() {
-        try {
-            return (InitialSnapshot) super.clone();
-        } catch (CloneNotSupportedException e) {
-            throw new IllegalStateException();
-        }
-    }
-
-    public InitialSnapshot setType(Object type) {
-        this.type = type;
-        return this;
-    }
-
-    public InitialSnapshot setViewport(RowSet viewport) {
-        this.viewport = viewport;
-        return this;
-    }
-
-    @Override
-    public String toString() {
-        return "InitialSnapshot{" +
-                "type=" + type +
-                ", rows=" + rowsIncluded + (rowSet == null ? "" : "/" + rowSet) +
-                ", columns=" + FormatBitSet.formatBitSetAsString(FormatBitSet.arrayToBitSet(dataColumns)) +
-                ", deltaSequence=" + deltaSequence +
-                ", step=" + step +
-                '}';
-    }
-}
diff --git a/engine/table/src/main/java/io/deephaven/engine/table/impl/remote/InitialSnapshotTable.java b/engine/table/src/main/java/io/deephaven/engine/table/impl/remote/InitialSnapshotTable.java
deleted file mode 100644
index 2cd1f3e7170..00000000000
--- a/engine/table/src/main/java/io/deephaven/engine/table/impl/remote/InitialSnapshotTable.java
+++ /dev/null
@@ -1,212 +0,0 @@
-//
-// Copyright (c) 2016-2024 Deephaven Data Labs and Patent Pending
-//
-package io.deephaven.engine.table.impl.remote;
-
-import io.deephaven.base.verify.Assert;
-import io.deephaven.engine.rowset.WritableRowSet;
-import io.deephaven.engine.rowset.RowSet;
-import io.deephaven.engine.rowset.RowSetFactory;
-import io.deephaven.engine.table.*;
-import io.deephaven.engine.table.impl.QueryTable;
-import io.deephaven.engine.table.impl.sources.ArrayBackedColumnSource;
-import io.deephaven.engine.table.impl.sources.WritableRedirectedColumnSource;
-import io.deephaven.engine.table.WritableColumnSource;
-import io.deephaven.engine.table.impl.util.*;
-
-import java.time.Instant;
-import java.time.ZonedDateTime;
-import java.util.BitSet;
-import java.util.LinkedHashMap;
-import java.util.List;
-import java.util.Map;
-
-public class InitialSnapshotTable extends QueryTable {
-    protected final Setter<?>[] setters;
-    protected int capacity;
-    protected WritableRowSet freeset = RowSetFactory.empty();
-    protected final WritableRowSet populatedRows;
-    protected final WritableRowSet[] populatedCells;
-    protected WritableColumnSource<?>[] writableSources;
-    protected WritableRowRedirection rowRedirection;
-
-    private final BitSet subscribedColumns;
-
-    protected InitialSnapshotTable(Map<String, ? extends ColumnSource<?>> result,
-            WritableColumnSource<?>[] writableSources,
-            WritableRowRedirection rowRedirection, BitSet subscribedColumns) {
-        super(RowSetFactory.empty().toTracking(), result);
-        this.subscribedColumns = subscribedColumns;
-        this.writableSources = writableSources;
-        this.setters = new Setter[writableSources.length];
-        this.populatedCells = new WritableRowSet[writableSources.length];
-        for (int ii = 0; ii < writableSources.length; ++ii) {
-            setters[ii] = getSetter(writableSources[ii]);
-            this.populatedCells[ii] = RowSetFactory.fromKeys();
-        }
-        this.rowRedirection = rowRedirection;
-        this.populatedRows = RowSetFactory.fromKeys();
-    }
-
-    public BitSet getSubscribedColumns() {
-        return subscribedColumns;
-    }
-
-    public boolean isSubscribedColumn(int column) {
-        return subscribedColumns == null || subscribedColumns.get(column);
-    }
-
-    @SuppressWarnings("rawtypes")
-    protected Setter<?> getSetter(final WritableColumnSource source) {
-        if (source.getType() == byte.class) {
-            return (Setter<byte[]>) (array, arrayIndex, destIndex) -> source.set(destIndex, array[arrayIndex]);
-        } else if (source.getType() == char.class) {
-            return (Setter<char[]>) (array, arrayIndex, destIndex) -> source.set(destIndex, array[arrayIndex]);
-        } else if (source.getType() == double.class) {
-            return (Setter<double[]>) (array, arrayIndex, destIndex) -> source.set(destIndex, array[arrayIndex]);
-        } else if (source.getType() == float.class) {
-            return (Setter<float[]>) (array, arrayIndex, destIndex) -> source.set(destIndex, array[arrayIndex]);
-        } else if (source.getType() == int.class) {
-            return (Setter<int[]>) (array, arrayIndex, destIndex) -> source.set(destIndex, array[arrayIndex]);
-        } else if (source.getType() == long.class
-                || source.getType() == Instant.class
-                || source.getType() == ZonedDateTime.class) {
-            return (Setter<long[]>) (array, arrayIndex, destIndex) -> source.set(destIndex, array[arrayIndex]);
-        } else if (source.getType() == short.class) {
-            return (Setter<short[]>) (array, arrayIndex, destIndex) -> source.set(destIndex, array[arrayIndex]);
-        } else if (source.getType() == Boolean.class) {
-            return (Setter<byte[]>) (array, arrayIndex, destIndex) -> source.set(destIndex, array[arrayIndex]);
-        } else {
-            return (Setter<Object[]>) (array, arrayIndex, destIndex) -> {
-                // noinspection unchecked
-                source.set(destIndex, array[arrayIndex]);
-            };
-        }
-    }
-
-    protected void processInitialSnapshot(InitialSnapshot snapshot) {
-        final RowSet viewPort = snapshot.viewport;
-        final RowSet addedRowSet = snapshot.rowsIncluded;
-        try (final WritableRowSet newlyPopulated =
-                viewPort == null ? addedRowSet.copy() : snapshot.rowSet.subSetForPositions(viewPort)) {
-            if (viewPort != null) {
-                newlyPopulated.retain(addedRowSet);
-            }
-
-            final RowSet destinationRowSet = getFreeRows(newlyPopulated.size());
-
-            final RowSet.Iterator addedIt = addedRowSet.iterator();
-            final RowSet.Iterator destIt = destinationRowSet.iterator();
-
-            long nextInViewport = -1;
-            final RowSet.Iterator populationIt;
-            if (viewPort == null) {
-                populationIt = null;
-            } else {
-                populationIt = newlyPopulated.iterator();
-                if (populationIt.hasNext()) {
-                    nextInViewport = populationIt.nextLong();
-                }
-            }
-
-            int arrayIndex = 0;
-            while (addedIt.hasNext()) {
-                final long addedKey = addedIt.nextLong();
-                final boolean found = viewPort == null || addedKey == nextInViewport;
-
-                if (found) {
-                    final long destIndex = destIt.nextLong();
-                    for (int ii = 0; ii < setters.length; ii++) {
-                        if (subscribedColumns.get(ii) && snapshot.dataColumns[ii] != null) {
-                            // noinspection unchecked,rawtypes
-                            ((Setter) setters[ii]).set(snapshot.dataColumns[ii], arrayIndex, destIndex);
-                        }
-                    }
-                    final long prevIndex = rowRedirection.put(addedKey, destIndex);
-                    Assert.assertion(prevIndex == -1, "prevIndex == -1", prevIndex, "prevIndex");
-                    if (populationIt != null) {
-                        nextInViewport = populationIt.hasNext() ? populationIt.nextLong() : -1;
-                    }
-                }
-                arrayIndex++;
-            }
-
-            for (int ii = 0; ii < setters.length; ii++) {
-                if (subscribedColumns.get(ii) && snapshot.dataColumns[ii] != null) {
-                    final WritableRowSet ix = populatedCells[ii];
-                    ix.insert(newlyPopulated);
-                }
-            }
-            populatedRows.insert(newlyPopulated);
-        }
-        getRowSet().writableCast().insert(snapshot.rowSet);
-    }
-
-    protected RowSet getFreeRows(long size) {
-        boolean needsResizing = false;
-        if (capacity == 0) {
-            capacity = Integer.highestOneBit((int) Math.max(size * 2, 8));
-            freeset = RowSetFactory.flat(capacity);
-            needsResizing = true;
-        } else if (freeset.size() < size) {
-            int allocatedSize = (int) (capacity - freeset.size());
-            int prevCapacity = capacity;
-            do {
-                capacity *= 2;
-            } while ((capacity - allocatedSize) < size);
-            freeset.insertRange(prevCapacity, capacity - 1);
-            needsResizing = true;
-        }
-        if (needsResizing) {
-            for (ColumnSource<?> source : getColumnSources()) {
-                ((WritableColumnSource<?>) source).ensureCapacity(capacity);
-            }
-        }
-        RowSet result = freeset.subSetByPositionRange(0, (int) size);
-        Assert.assertion(result.size() == size, "result.size() == size");
-        freeset = freeset.subSetByPositionRange((int) size, (int) freeset.size());
-        return result;
-    }
-
-    protected interface Setter<T> {
-        void set(T array, int arrayIndex, long destIndex);
-    }
-
-    public static InitialSnapshotTable setupInitialSnapshotTable(Table originalTable, InitialSnapshot snapshot) {
-        return setupInitialSnapshotTable(originalTable.getDefinition(), snapshot);
-    }
-
-    public static InitialSnapshotTable setupInitialSnapshotTable(Table originalTable, InitialSnapshot snapshot,
-            BitSet subscribedColumns) {
-        return setupInitialSnapshotTable(originalTable.getDefinition(), snapshot, subscribedColumns);
-    }
-
-    public static InitialSnapshotTable setupInitialSnapshotTable(TableDefinition definition, InitialSnapshot snapshot) {
-        BitSet allColumns = new BitSet(definition.numColumns());
-        allColumns.set(0, definition.numColumns());
-        return setupInitialSnapshotTable(definition, snapshot, allColumns);
-    }
-
-    public static InitialSnapshotTable setupInitialSnapshotTable(
-            TableDefinition definition, InitialSnapshot snapshot, BitSet subscribedColumns) {
-        final List<ColumnDefinition<?>> columns = definition.getColumns();
-        WritableColumnSource<?>[] writableSources = new WritableColumnSource[columns.size()];
-        WritableRowRedirection rowRedirection = WritableRowRedirection.FACTORY.createRowRedirection(8);
-        LinkedHashMap<String, ColumnSource<?>> finalColumns = new LinkedHashMap<>();
-        for (int ci = 0; ci < writableSources.length; ci++) {
-            final ColumnDefinition<?> column = columns.get(ci);
-            writableSources[ci] = ArrayBackedColumnSource.getMemoryColumnSource(
-                    0, column.getDataType(), column.getComponentType());
-            finalColumns.put(column.getName(),
-                    WritableRedirectedColumnSource.maybeRedirect(rowRedirection, writableSources[ci], 0));
-        }
-        // This table does not run, so we don't need to tell our row redirection or column source to start
-        // tracking
-        // prev values.
-
-        InitialSnapshotTable initialSnapshotTable =
-                new InitialSnapshotTable(finalColumns, writableSources, rowRedirection, subscribedColumns);
-        initialSnapshotTable.processInitialSnapshot(snapshot);
-        return initialSnapshotTable;
-    }
-}
diff --git a/engine/table/src/main/java/io/deephaven/engine/table/impl/select/AbstractConditionFilter.java b/engine/table/src/main/java/io/deephaven/engine/table/impl/select/AbstractConditionFilter.java
index e96bb529f1e..83f60cadda2 100644
--- a/engine/table/src/main/java/io/deephaven/engine/table/impl/select/AbstractConditionFilter.java
+++ b/engine/table/src/main/java/io/deephaven/engine/table/impl/select/AbstractConditionFilter.java
@@ -4,9 +4,14 @@
 package io.deephaven.engine.table.impl.select;
 
 import io.deephaven.base.Pair;
+import io.deephaven.chunk.Chunk;
+import io.deephaven.chunk.LongChunk;
+import io.deephaven.chunk.WritableBooleanChunk;
+import io.deephaven.chunk.attributes.Values;
 import io.deephaven.engine.context.QueryScopeParam;
 import io.deephaven.engine.rowset.RowSet;
 import io.deephaven.engine.rowset.WritableRowSet;
+import io.deephaven.engine.rowset.chunkattributes.OrderedRowKeys;
 import io.deephaven.engine.table.impl.MatchPair;
 import io.deephaven.engine.table.Table;
 import io.deephaven.engine.table.TableDefinition;
@@ -89,7 +94,7 @@ public synchronized void init(
         try {
             final QueryLanguageParser.Result result = FormulaAnalyzer.parseFormula(
                     formula, tableDefinition.getColumnNameMap(), outerToInnerNames,
-                    compilationProcessor.getQueryScopeVariables(), unboxArguments);
+                    compilationProcessor.getFormulaImports(), unboxArguments);
 
             formulaShiftColPair = result.getFormulaShiftColPair();
             if (formulaShiftColPair != null) {
@@ -168,7 +173,7 @@ public void validateSafeForRefresh(BaseTable<?> sourceTable) {
             return;
         }
         if (sourceTable.isRefreshing() && !AbstractFormulaColumn.ALLOW_UNSAFE_REFRESHING_FORMULAS) {
-            // note that constant offset array accesss does not use i/ii or end up in usedColumnArrays
+            // note that constant offset array access does not use i/ii or end up in usedColumnArrays
             boolean isUnsafe = (usesI || usesII) && !sourceTable.isAppendOnly() && !sourceTable.isBlink();
             isUnsafe |= usesK && !sourceTable.isAddOnly() && !sourceTable.isBlink();
             isUnsafe |= !usedColumnArrays.isEmpty() && !sourceTable.isBlink();
@@ -262,7 +267,19 @@ public WritableRowSet filter(
         return filter.filter(selection, fullSet, table, usePrev, formula, params);
     }
 
-    protected abstract Filter getFilter(Table table, RowSet fullSet)
+    /**
+     * Retrieve the current {@link Filter filter} for this condition filter or create a new one initialized to the
+     * provided table and row set. With a {@link ConditionFilter.FilterKernel.Context context} from
+     * {@link Filter#getContext(int)}, this filter can be used for directly filtering chunked data.
+     *
+     * @param table the table to filter, or a table with a compatible schema
+     * @param fullSet the full set of rows currently in the table, used to populate the virtual row variables such as
+     *        {@code i}, {@code ii}, and {@code k}
+     *
+     * @return the initialized filter
+     */
+    @NotNull
+    public abstract Filter getFilter(Table table, RowSet fullSet)
             throws InstantiationException, IllegalAccessException, NoSuchMethodException, InvocationTargetException;
 
     /**
@@ -311,6 +328,15 @@ public boolean hasConstantArrayAccess() {
         return getFormulaShiftColPair() != null;
     }
 
+    /**
+     * Returns true if this filters uses row virtual offset columns of {@code i}, {@code ii} or {@code k}.
+     * <p>
+     * This filter must already be initialized before calling this method.
+     */
+    public boolean hasVirtualRowVariables() {
+        return usesI || usesII || usesK;
+    }
+
     /**
      * @return a Pair object, consisting of formula string and shift to column MatchPairs, if the filter formula or
      *         expression has Array Access that conforms to "i +/- &lt;constant&gt;" or "ii +/- &lt;constant&gt;". If
@@ -334,6 +360,48 @@ WritableRowSet filter(
                 boolean usePrev,
                 String formula,
                 QueryScopeParam<?>... params);
+
+        /**
+         * Create a new context for this filter, must be closed after use.
+         */
+        ConditionFilter.FilterKernel.Context getContext(int chunkSize);
+
+        /**
+         * Filter a chunk of values and copy the matching row keys to the returned chunk.
+         */
+        LongChunk<OrderedRowKeys> filter(
+                ConditionFilter.FilterKernel.Context context,
+                LongChunk<OrderedRowKeys> inputKeys,
+                Chunk<? extends Values>[] valueChunks);
+
+        /**
+         * Filter a chunk of values, setting parallel values in {@code results} to the output of the filter.
+         *
+         * @return the number of values are {@code true} in {@code results} after the filter is applied.
+         */
+        int filter(
+                ConditionFilter.FilterKernel.Context context,
+                Chunk<? extends Values>[] valueChunks,
+                int chunkSize,
+                WritableBooleanChunk<Values> results);
+
+        /**
+         * Filter a chunk of values, setting parallel values in {@code results} to {@code false} when the filter result
+         * is {@code false}. The filter will not be evaluated for values that are currently {@code false} in the results
+         * chunk.
+         * <p>
+         * To use this method effectively, the results chunk should be initialized by a call to
+         * {@link #filter(ConditionFilter.FilterKernel.Context, Chunk[], int, WritableBooleanChunk)} or by setting all
+         * values to {@code true} before the first call. Successive calls will have the effect of AND'ing this filter
+         * results with existing results.
+         *
+         * @return the number of values are {@code true} in {@code results} after the filter is applied.
+         */
+        int filterAnd(
+                ConditionFilter.FilterKernel.Context context,
+                Chunk<? extends Values>[] valueChunks,
+                int chunkSize,
+                WritableBooleanChunk<Values> results);
     }
 
     static String truncateLongFormula(String formula) {
diff --git a/engine/table/src/main/java/io/deephaven/engine/table/impl/select/AbstractFormulaColumn.java b/engine/table/src/main/java/io/deephaven/engine/table/impl/select/AbstractFormulaColumn.java
index 06cbd79fd70..b1240adb367 100644
--- a/engine/table/src/main/java/io/deephaven/engine/table/impl/select/AbstractFormulaColumn.java
+++ b/engine/table/src/main/java/io/deephaven/engine/table/impl/select/AbstractFormulaColumn.java
@@ -51,7 +51,7 @@ public abstract class AbstractFormulaColumn implements FormulaColumn {
     private Formula formula;
     protected QueryScopeParam<?>[] params;
     protected Map<String, ? extends ColumnSource<?>> columnSources;
-    protected Map<String, ? extends ColumnDefinition<?>> columnDefinitions;
+    protected Map<String, ColumnDefinition<?>> columnDefinitions;
     private TrackingRowSet rowSet;
     protected Class<?> returnedType;
     public static final String COLUMN_SUFFIX = "_";
@@ -90,12 +90,28 @@ public List<String> initInputs(
             @NotNull final Map<String, ? extends ColumnSource<?>> columnsOfInterest) {
         this.rowSet = rowSet;
 
-        this.columnSources = columnsOfInterest;
-        if (usedColumns != null) {
-            return usedColumns;
+        if (usedColumns == null) {
+            initDef(extractDefinitions(columnsOfInterest), QueryCompilerRequestProcessor.immediate());
         }
+        this.columnSources = filterColumnSources(columnsOfInterest);
 
-        return initDef(extractDefinitions(columnsOfInterest), QueryCompilerRequestProcessor.immediate());
+        return usedColumns;
+    }
+
+    private Map<String, ColumnSource<?>> filterColumnSources(
+            final Map<String, ? extends ColumnSource<?>> columnsOfInterest) {
+        if (usedColumns.isEmpty() && usedColumnArrays.isEmpty()) {
+            return Map.of();
+        }
+
+        final HashMap<String, ColumnSource<?>> sources = new HashMap<>();
+        for (String columnName : usedColumns) {
+            sources.put(columnName, columnsOfInterest.get(columnName));
+        }
+        for (String columnName : usedColumnArrays) {
+            sources.put(columnName, columnsOfInterest.get(columnName));
+        }
+        return sources;
     }
 
     @Override
@@ -119,28 +135,32 @@ public void validateSafeForRefresh(BaseTable<?> sourceTable) {
     }
 
     protected void applyUsedVariables(
-            @NotNull final Map<String, ColumnDefinition<?>> columnDefinitionMap,
+            @NotNull final Map<String, ColumnDefinition<?>> parentColumnDefinitions,
             @NotNull final Set<String> variablesUsed,
             @NotNull final Map<String, Object> possibleParams) {
         // the column definition map passed in is being mutated by the caller, so we need to make a copy
-        columnDefinitions = Map.copyOf(columnDefinitionMap);
+        columnDefinitions = new HashMap<>();
 
         final List<QueryScopeParam<?>> paramsList = new ArrayList<>();
         usedColumns = new ArrayList<>();
         usedColumnArrays = new ArrayList<>();
         for (String variable : variablesUsed) {
+            ColumnDefinition<?> columnDefinition = parentColumnDefinitions.get(variable);
             if (variable.equals("i")) {
                 usesI = true;
             } else if (variable.equals("ii")) {
                 usesII = true;
             } else if (variable.equals("k")) {
                 usesK = true;
-            } else if (columnDefinitions.get(variable) != null) {
+            } else if (columnDefinition != null) {
+                columnDefinitions.put(variable, columnDefinition);
                 usedColumns.add(variable);
             } else {
                 String strippedColumnName =
                         variable.substring(0, Math.max(0, variable.length() - COLUMN_SUFFIX.length()));
-                if (variable.endsWith(COLUMN_SUFFIX) && columnDefinitions.get(strippedColumnName) != null) {
+                columnDefinition = parentColumnDefinitions.get(strippedColumnName);
+                if (variable.endsWith(COLUMN_SUFFIX) && columnDefinition != null) {
+                    columnDefinitions.put(strippedColumnName, columnDefinition);
                     usedColumnArrays.add(strippedColumnName);
                 } else if (possibleParams.containsKey(variable)) {
                     paramsList.add(new QueryScopeParam<>(variable, possibleParams.get(variable)));
@@ -320,6 +340,11 @@ public boolean isRetain() {
         return false;
     }
 
+    @Override
+    public boolean hasVirtualRowVariables() {
+        return usesI || usesII || usesK;
+    }
+
     @Override
     public String toString() {
         return formulaString;
diff --git a/engine/table/src/main/java/io/deephaven/engine/table/impl/select/AbstractRangeFilter.java b/engine/table/src/main/java/io/deephaven/engine/table/impl/select/AbstractRangeFilter.java
index 513dafc7d36..2e4edee65f3 100644
--- a/engine/table/src/main/java/io/deephaven/engine/table/impl/select/AbstractRangeFilter.java
+++ b/engine/table/src/main/java/io/deephaven/engine/table/impl/select/AbstractRangeFilter.java
@@ -23,7 +23,7 @@
  * A filter that determines if a column value is between an upper and lower bound (which each may either be inclusive or
  * exclusive).
  */
-public abstract class AbstractRangeFilter extends WhereFilterImpl {
+public abstract class AbstractRangeFilter extends WhereFilterImpl implements ExposesChunkFilter {
     private static final Pattern decimalPattern = Pattern.compile("(-)?\\d+(?:\\.((\\d+)0*)?)?");
 
     protected final String columnName;
@@ -49,6 +49,11 @@ public abstract class AbstractRangeFilter extends WhereFilterImpl {
         this.lowerInclusive = lowerInclusive;
     }
 
+    @Override
+    public Optional<ChunkFilter> chunkFilter() {
+        return Optional.of(chunkFilter);
+    }
+
     public static WhereFilter makeBigDecimalRange(String columnName, String val) {
         final int precision = findPrecision(val);
         final BigDecimal parsed = new BigDecimal(val);
diff --git a/engine/table/src/main/java/io/deephaven/engine/table/impl/select/BaseIncrementalReleaseFilter.java b/engine/table/src/main/java/io/deephaven/engine/table/impl/select/BaseIncrementalReleaseFilter.java
index 887f5a221fa..a5a951aa935 100644
--- a/engine/table/src/main/java/io/deephaven/engine/table/impl/select/BaseIncrementalReleaseFilter.java
+++ b/engine/table/src/main/java/io/deephaven/engine/table/impl/select/BaseIncrementalReleaseFilter.java
@@ -14,6 +14,7 @@
 import io.deephaven.util.annotations.ScriptApi;
 import org.jetbrains.annotations.NotNull;
 
+import javax.annotation.OverridingMethodsMustInvokeSuper;
 import java.util.Collections;
 import java.util.List;
 
@@ -251,6 +252,7 @@ public void run() {
         listener.requestRecompute();
     }
 
+    @OverridingMethodsMustInvokeSuper
     @Override
     protected void destroy() {
         super.destroy();
diff --git a/engine/table/src/main/java/io/deephaven/engine/table/impl/select/ClockFilter.java b/engine/table/src/main/java/io/deephaven/engine/table/impl/select/ClockFilter.java
index 71a38223370..ddadfb2ea18 100644
--- a/engine/table/src/main/java/io/deephaven/engine/table/impl/select/ClockFilter.java
+++ b/engine/table/src/main/java/io/deephaven/engine/table/impl/select/ClockFilter.java
@@ -21,6 +21,7 @@
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
+import javax.annotation.OverridingMethodsMustInvokeSuper;
 import java.time.Instant;
 import java.util.Collections;
 import java.util.List;
@@ -114,6 +115,7 @@ public final void setRecomputeListener(@NotNull final RecomputeListener listener
         listener.setIsRefreshing(true);
     }
 
+    @OverridingMethodsMustInvokeSuper
     @Override
     protected void destroy() {
         super.destroy();
diff --git a/engine/table/src/main/java/io/deephaven/engine/table/impl/select/ComparableRangeFilter.java b/engine/table/src/main/java/io/deephaven/engine/table/impl/select/ComparableRangeFilter.java
index 3050b8d13a3..84a9f85e007 100644
--- a/engine/table/src/main/java/io/deephaven/engine/table/impl/select/ComparableRangeFilter.java
+++ b/engine/table/src/main/java/io/deephaven/engine/table/impl/select/ComparableRangeFilter.java
@@ -7,11 +7,9 @@
 import io.deephaven.engine.table.ColumnDefinition;
 import io.deephaven.engine.table.TableDefinition;
 import io.deephaven.engine.table.impl.chunkfilter.ChunkFilter;
+import io.deephaven.engine.table.impl.chunkfilter.ObjectChunkFilter;
 import io.deephaven.util.compare.ObjectComparisons;
 import io.deephaven.engine.table.ColumnSource;
-import io.deephaven.chunk.*;
-import io.deephaven.engine.rowset.chunkattributes.OrderedRowKeys;
-import io.deephaven.chunk.attributes.Values;
 import io.deephaven.engine.rowset.WritableRowSet;
 import io.deephaven.engine.rowset.RowSet;
 import io.deephaven.util.annotations.TestUseOnly;
@@ -91,7 +89,8 @@ public String toString() {
                 (upperInclusive ? "]" : ")") + ")";
     }
 
-    private static class InclusiveInclusiveComparableChunkFilter implements ChunkFilter {
+    private final static class InclusiveInclusiveComparableChunkFilter
+            extends ObjectChunkFilter<Comparable<?>> {
         private final Comparable<?> lower;
         private final Comparable<?> upper;
 
@@ -101,29 +100,13 @@ private InclusiveInclusiveComparableChunkFilter(Comparable<?> lower, Comparable<
         }
 
         @Override
-        public void filter(Chunk<? extends Values> values, LongChunk<OrderedRowKeys> keys,
-                WritableLongChunk<OrderedRowKeys> results) {
-            final ObjectChunk<? extends Comparable<?>, ? extends Values> objectChunk = values.asObjectChunk();
-
-            results.setSize(0);
-            for (int ii = 0; ii < values.size(); ++ii) {
-                final Comparable<?> value = objectChunk.get(ii);
-                if (meetsLowerBound(value) && meetsUpperBound(value)) {
-                    results.add(keys.get(ii));
-                }
-            }
-        }
-
-        boolean meetsLowerBound(Comparable<?> value) {
-            return ObjectComparisons.compare(lower, value) <= 0;
-        }
-
-        boolean meetsUpperBound(Comparable<?> value) {
-            return ObjectComparisons.compare(upper, value) >= 0;
+        public boolean matches(Comparable<?> value) {
+            return ObjectComparisons.compare(lower, value) <= 0 && ObjectComparisons.compare(upper, value) >= 0;
         }
     }
 
-    private static class InclusiveExclusiveComparableChunkFilter implements ChunkFilter {
+    private final static class InclusiveExclusiveComparableChunkFilter
+            extends ObjectChunkFilter<Comparable<?>> {
         private final Comparable<?> lower;
         private final Comparable<?> upper;
 
@@ -132,31 +115,14 @@ private InclusiveExclusiveComparableChunkFilter(Comparable<?> lower, Comparable<
             this.upper = upper;
         }
 
-
         @Override
-        public void filter(Chunk<? extends Values> values, LongChunk<OrderedRowKeys> keys,
-                WritableLongChunk<OrderedRowKeys> results) {
-            final ObjectChunk<? extends Comparable<?>, ? extends Values> objectChunk = values.asObjectChunk();
-
-            results.setSize(0);
-            for (int ii = 0; ii < values.size(); ++ii) {
-                final Comparable<?> value = objectChunk.get(ii);
-                if (meetsLowerBound(value) && meetsUpperBound(value)) {
-                    results.add(keys.get(ii));
-                }
-            }
-        }
-
-        boolean meetsLowerBound(Comparable<?> value) {
-            return ObjectComparisons.compare(lower, value) <= 0;
-        }
-
-        boolean meetsUpperBound(Comparable<?> value) {
-            return ObjectComparisons.compare(upper, value) > 0;
+        public boolean matches(Comparable<?> value) {
+            return ObjectComparisons.compare(lower, value) <= 0 && ObjectComparisons.compare(upper, value) > 0;
         }
     }
 
-    private static class ExclusiveInclusiveComparableChunkFilter implements ChunkFilter {
+    private final static class ExclusiveInclusiveComparableChunkFilter
+            extends ObjectChunkFilter<Comparable<?>> {
         private final Comparable<?> lower;
         private final Comparable<?> upper;
 
@@ -165,31 +131,14 @@ private ExclusiveInclusiveComparableChunkFilter(Comparable<?> lower, Comparable<
             this.upper = upper;
         }
 
-
         @Override
-        public void filter(Chunk<? extends Values> values, LongChunk<OrderedRowKeys> keys,
-                WritableLongChunk<OrderedRowKeys> results) {
-            final ObjectChunk<? extends Comparable<?>, ? extends Values> objectChunk = values.asObjectChunk();
-
-            results.setSize(0);
-            for (int ii = 0; ii < values.size(); ++ii) {
-                final Comparable<?> value = objectChunk.get(ii);
-                if (meetsLowerBound(value) && meetsUpperBound(value)) {
-                    results.add(keys.get(ii));
-                }
-            }
-        }
-
-        boolean meetsLowerBound(Comparable<?> value) {
-            return ObjectComparisons.compare(lower, value) < 0;
-        }
-
-        boolean meetsUpperBound(Comparable<?> value) {
-            return ObjectComparisons.compare(upper, value) >= 0;
+        public boolean matches(Comparable<?> value) {
+            return ObjectComparisons.compare(lower, value) < 0 && ObjectComparisons.compare(upper, value) >= 0;
         }
     }
 
-    private static class ExclusiveExclusiveComparableChunkFilter implements ChunkFilter {
+    private final static class ExclusiveExclusiveComparableChunkFilter
+            extends ObjectChunkFilter<Comparable<?>> {
         private final Comparable<?> lower;
         private final Comparable<?> upper;
 
@@ -198,27 +147,9 @@ private ExclusiveExclusiveComparableChunkFilter(Comparable<?> lower, Comparable<
             this.upper = upper;
         }
 
-
         @Override
-        public void filter(Chunk<? extends Values> values, LongChunk<OrderedRowKeys> keys,
-                WritableLongChunk<OrderedRowKeys> results) {
-            final ObjectChunk<? extends Comparable<?>, ? extends Values> objectChunk = values.asObjectChunk();
-
-            results.setSize(0);
-            for (int ii = 0; ii < values.size(); ++ii) {
-                final Comparable<?> value = objectChunk.get(ii);
-                if (meetsLowerBound(value) && meetsUpperBound(value)) {
-                    results.add(keys.get(ii));
-                }
-            }
-        }
-
-        boolean meetsLowerBound(Comparable<?> value) {
-            return ObjectComparisons.compare(lower, value) < 0;
-        }
-
-        boolean meetsUpperBound(Comparable<?> value) {
-            return ObjectComparisons.compare(upper, value) > 0;
+        public boolean matches(Comparable<?> value) {
+            return ObjectComparisons.compare(lower, value) < 0 && ObjectComparisons.compare(upper, value) > 0;
         }
     }
 
diff --git a/engine/table/src/main/java/io/deephaven/engine/table/impl/select/ConditionFilter.java b/engine/table/src/main/java/io/deephaven/engine/table/impl/select/ConditionFilter.java
index 51351cfb516..1868317c79a 100644
--- a/engine/table/src/main/java/io/deephaven/engine/table/impl/select/ConditionFilter.java
+++ b/engine/table/src/main/java/io/deephaven/engine/table/impl/select/ConditionFilter.java
@@ -5,6 +5,7 @@
 
 import io.deephaven.base.Pair;
 import io.deephaven.chunk.attributes.Any;
+import io.deephaven.chunk.attributes.Values;
 import io.deephaven.engine.context.ExecutionContext;
 import io.deephaven.engine.context.QueryCompilerImpl;
 import io.deephaven.engine.context.QueryCompilerRequest;
@@ -47,7 +48,6 @@
  * A condition filter evaluates a formula against a table.
  */
 public class ConditionFilter extends AbstractConditionFilter {
-
     public static final int CHUNK_SIZE = 4096;
     private Future<Class<?>> filterKernelClassFuture = null;
     private List<Pair<String, Class<?>>> usedInputs; // that is columns and special variables
@@ -113,8 +113,19 @@ public void close() {
 
         CONTEXT getContext(int maxChunkSize);
 
-        LongChunk<OrderedRowKeys> filter(CONTEXT context, LongChunk<OrderedRowKeys> indices,
-                Chunk... inputChunks);
+        LongChunk<OrderedRowKeys> filter(CONTEXT context, LongChunk<OrderedRowKeys> indices, Chunk... inputChunks);
+
+        int filter(
+                CONTEXT context,
+                Chunk[] inputChunks,
+                int chunkSize,
+                WritableBooleanChunk<Values> results);
+
+        int filterAnd(
+                CONTEXT context,
+                Chunk[] inputChunks,
+                int chunkSize,
+                WritableBooleanChunk<Values> results);
     }
 
 
@@ -375,6 +386,37 @@ public WritableRowSet filter(final RowSet selection, final RowSet fullSet, final
                 return resultBuilder.build();
             }
         }
+
+        @Override
+        public FilterKernel.Context getContext(int chunkSize) {
+            return filterKernel.getContext(chunkSize);
+        }
+
+        @Override
+        public LongChunk<OrderedRowKeys> filter(
+                final FilterKernel.Context context,
+                final LongChunk<OrderedRowKeys> inputKeys,
+                final Chunk<? extends Values>[] valueChunks) {
+            return filterKernel.filter(context, inputKeys, valueChunks);
+        }
+
+        @Override
+        public int filter(
+                final FilterKernel.Context context,
+                final Chunk<? extends Values>[] valueChunks,
+                final int chunkSize,
+                final WritableBooleanChunk<Values> results) {
+            return filterKernel.filter(context, valueChunks, chunkSize, results);
+        }
+
+        @Override
+        public int filterAnd(
+                final FilterKernel.Context context,
+                final Chunk<? extends Values>[] valueChunks,
+                final int chunkSize,
+                final WritableBooleanChunk<Values> results) {
+            return filterKernel.filterAnd(context, valueChunks, chunkSize, results);
+        }
     }
 
     private static String toTitleCase(String input) {
@@ -550,22 +592,94 @@ private StringBuilder getClassBody(
                 "@Override\n" +
                 "public LongChunk<OrderedRowKeys> filter(Context __context, LongChunk<OrderedRowKeys> __indices, Chunk... __inputChunks) {\n");
         indenter.increaseLevel();
-        for (int i = 0; i < usedInputs.size(); i++) {
-            final Class<?> columnType = usedInputs.get(i).second;
-            final String chunkType;
-            if (columnType.isPrimitive() && columnType != boolean.class) {
-                chunkType = toTitleCase(columnType.getSimpleName()) + "Chunk";
-            } else {
-                // TODO: Reinterpret Boolean and Instant to byte and long
-                chunkType = "ObjectChunk";
-            }
-            classBody.append(indenter).append("final ").append(chunkType).append(" __columnChunk").append(i)
-                    .append(" = __inputChunks[").append(i).append("].as").append(chunkType).append("();\n");
-        }
+        insertChunks(classBody, indenter);
         indenter.indent(classBody, "final int __size = __indices.size();\n" +
                 "__context.resultChunk.setSize(0);\n" +
                 "for (int __my_i__ = 0; __my_i__ < __size; __my_i__++) {\n");
         indenter.increaseLevel();
+        insertChunkValues(classBody, indenter);
+        classBody.append("" +
+                "            if (").append(result.getConvertedExpression()).append(") {\n" +
+                        "                __context.resultChunk.add(__indices.get(__my_i__));\n" +
+                        "            }\n" +
+                        "        }\n" +
+                        "        return __context.resultChunk;\n" +
+                        "    }\n");
+        indenter.decreaseLevel();
+        indenter.decreaseLevel();
+
+        //////////////////////////////////
+
+        indenter.indent(classBody, "\n" +
+                "@Override\n" +
+                "public int filter(final Context __context, final Chunk[] __inputChunks, final int __chunkSize, final WritableBooleanChunk<Values> __results) {\n");
+        indenter.increaseLevel();
+        insertChunks(classBody, indenter);
+
+        indenter.indent(classBody, "" +
+                "__results.setSize(__chunkSize);\n" +
+                "int __count = 0;\n" +
+                "for (int __my_i__ = 0; __my_i__ < __chunkSize; __my_i__++) {");
+        indenter.increaseLevel();
+        insertChunkValues(classBody, indenter);
+        indenter.indent(classBody, "" +
+                "final boolean __newResult = " + result.getConvertedExpression() + ";\n" +
+                "__results.set(__my_i__, __newResult);\n" +
+                "// count every true value\n" +
+                "__count += __newResult ? 1 : 0;\n");
+        indenter.decreaseLevel();
+        indenter.indent(classBody, "" +
+                "}\n" +
+                "return __count;");
+        indenter.decreaseLevel();
+        indenter.indent(classBody, "" +
+                "}\n");
+
+        //////////////////////////////////
+
+        indenter.indent(classBody, "\n" +
+                "@Override\n" +
+                "public int filterAnd(final Context __context, final Chunk[] __inputChunks, final int __chunkSize, final WritableBooleanChunk<Values> __results) {\n");
+        indenter.increaseLevel();
+        insertChunks(classBody, indenter);
+
+        indenter.indent(classBody, "" +
+                "__results.setSize(__chunkSize);\n" +
+                "int __count = 0;\n" +
+                "for (int __my_i__ = 0; __my_i__ < __chunkSize; __my_i__++) {\n");
+        indenter.increaseLevel();
+        indenter.indent(classBody, "" +
+                "final boolean __result = __results.get(__my_i__);\n" +
+                "if (!__result) {\n" +
+                "    // already false, no need to compute or increment the count\n" +
+                "    continue;\n" +
+                "}");
+        insertChunkValues(classBody, indenter);
+        indenter.indent(classBody, "" +
+                "final boolean __newResult = " + result.getConvertedExpression() + ";\n" +
+                "__results.set(__my_i__, __newResult);\n" +
+                "__results.set(__my_i__, __newResult);\n" +
+                "// increment the count if the new result is TRUE\n" +
+                "__count += __newResult ? 1 : 0;\n");
+
+        indenter.decreaseLevel();
+        indenter.indent(classBody, "" +
+                "}\n" +
+                "return __count;");
+        indenter.decreaseLevel();
+        indenter.indent(classBody, "" +
+                "}\n\n");
+
+        //////////////////////////////////
+
+        indenter.decreaseLevel();
+        indenter.indent(classBody, "" +
+                "}\n\n");
+
+        return classBody;
+    }
+
+    private void insertChunkValues(StringBuilder classBody, Indenter indenter) {
         for (int i = 0; i < usedInputs.size(); i++) {
             final Pair<String, Class<?>> usedInput = usedInputs.get(i);
             final Class<?> columnType = usedInput.second;
@@ -574,19 +688,26 @@ private StringBuilder getClassBody(
                     .append(" =  (").append(canonicalName).append(")__columnChunk").append(i)
                     .append(".get(__my_i__);\n");
         }
-        classBody.append(
-                "            if (").append(result.getConvertedExpression()).append(") {\n" +
-                        "                __context.resultChunk.add(__indices.get(__my_i__));\n" +
-                        "            }\n" +
-                        "        }\n" +
-                        "        return __context.resultChunk;\n" +
-                        "    }\n" +
-                        "}");
-        return classBody;
+    }
+
+    private void insertChunks(StringBuilder classBody, Indenter indenter) {
+        for (int i = 0; i < usedInputs.size(); i++) {
+            final Class<?> columnType = usedInputs.get(i).second;
+            final String chunkType;
+            if (columnType.isPrimitive() && columnType != boolean.class) {
+                chunkType = toTitleCase(columnType.getSimpleName()) + "Chunk";
+            } else {
+                // TODO: Reinterpret Boolean and Instant to byte and long
+                chunkType = "ObjectChunk";
+            }
+            classBody.append(indenter).append("final ").append(chunkType).append(" __columnChunk").append(i)
+                    .append(" = __inputChunks[").append(i).append("].as").append(chunkType).append("();\n");
+        }
     }
 
     @Override
-    protected Filter getFilter(Table table, RowSet fullSet)
+    @NotNull
+    public Filter getFilter(Table table, RowSet fullSet)
             throws InstantiationException, IllegalAccessException, NoSuchMethodException, InvocationTargetException {
         if (filter == null) {
             try {
diff --git a/engine/table/src/main/java/io/deephaven/engine/table/impl/select/DhFormulaColumn.java b/engine/table/src/main/java/io/deephaven/engine/table/impl/select/DhFormulaColumn.java
index 56a8aecfddc..7ed70800dfa 100644
--- a/engine/table/src/main/java/io/deephaven/engine/table/impl/select/DhFormulaColumn.java
+++ b/engine/table/src/main/java/io/deephaven/engine/table/impl/select/DhFormulaColumn.java
@@ -34,8 +34,7 @@
 import io.deephaven.io.logger.Logger;
 import io.deephaven.util.CompletionStageFuture;
 import io.deephaven.util.type.TypeUtils;
-import io.deephaven.vector.ObjectVector;
-import io.deephaven.vector.Vector;
+import io.deephaven.vector.VectorFactory;
 import org.jetbrains.annotations.NotNull;
 import org.jpy.PyObject;
 
@@ -161,21 +160,7 @@ private static Map<String, Class<?>> makeNameToTypeDict(final String[] names,
     }
 
     public static Class<?> getVectorType(Class<?> declaredType) {
-        if (!io.deephaven.util.type.TypeUtils.isConvertibleToPrimitive(declaredType) || declaredType == boolean.class
-                || declaredType == Boolean.class) {
-            return ObjectVector.class;
-        } else {
-            final String declaredTypeSimpleName =
-                    io.deephaven.util.type.TypeUtils.getUnboxedType(declaredType).getSimpleName();
-            try {
-                return Class.forName(Vector.class.getPackage().getName() + '.'
-                        + Character.toUpperCase(declaredTypeSimpleName.charAt(0))
-                        + declaredTypeSimpleName.substring(1)
-                        + "Vector");
-            } catch (ClassNotFoundException e) {
-                throw new RuntimeException("Unexpected exception for type " + declaredType, e);
-            }
-        }
+        return VectorFactory.forElementType(declaredType).vectorType();
     }
 
     @Override
@@ -195,7 +180,7 @@ public List<String> initDef(
         try {
             final QueryLanguageParser.Result result = FormulaAnalyzer.parseFormula(
                     formulaString, columnDefinitionMap, Collections.emptyMap(),
-                    compilationRequestProcessor.getQueryScopeVariables());
+                    compilationRequestProcessor.getFormulaImports());
             analyzedFormula = FormulaAnalyzer.analyze(formulaString, columnDefinitionMap, result);
             hasConstantValue = result.isConstantValueExpression();
             formulaShiftColPair = result.getFormulaShiftColPair();
diff --git a/engine/table/src/main/java/io/deephaven/engine/table/impl/select/ExposesChunkFilter.java b/engine/table/src/main/java/io/deephaven/engine/table/impl/select/ExposesChunkFilter.java
new file mode 100644
index 00000000000..5c46f82ec47
--- /dev/null
+++ b/engine/table/src/main/java/io/deephaven/engine/table/impl/select/ExposesChunkFilter.java
@@ -0,0 +1,17 @@
+//
+// Copyright (c) 2016-2024 Deephaven Data Labs and Patent Pending
+//
+package io.deephaven.engine.table.impl.select;
+
+import io.deephaven.engine.table.impl.chunkfilter.ChunkFilter;
+
+import java.util.Optional;
+
+public interface ExposesChunkFilter {
+    /**
+     * Retrieve the underlying chunk filter for this filter if available.
+     *
+     * @return If available, returns the underlying chunk filter. Otherwise returns {@link Optional#empty()}.
+     */
+    Optional<ChunkFilter> chunkFilter();
+}
diff --git a/engine/table/src/main/java/io/deephaven/engine/table/impl/select/FilterSelectColumn.java b/engine/table/src/main/java/io/deephaven/engine/table/impl/select/FilterSelectColumn.java
new file mode 100644
index 00000000000..2b096a69002
--- /dev/null
+++ b/engine/table/src/main/java/io/deephaven/engine/table/impl/select/FilterSelectColumn.java
@@ -0,0 +1,310 @@
+//
+// Copyright (c) 2016-2024 Deephaven Data Labs and Patent Pending
+//
+package io.deephaven.engine.table.impl.select;
+
+import io.deephaven.api.filter.Filter;
+import io.deephaven.chunk.ChunkType;
+import io.deephaven.chunk.WritableChunk;
+import io.deephaven.chunk.WritableObjectChunk;
+import io.deephaven.chunk.attributes.Values;
+import io.deephaven.engine.exceptions.UncheckedTableException;
+import io.deephaven.engine.rowset.*;
+import io.deephaven.engine.table.*;
+import io.deephaven.engine.table.impl.BaseTable;
+import io.deephaven.engine.table.impl.MatchPair;
+import io.deephaven.engine.table.impl.QueryCompilerRequestProcessor;
+import io.deephaven.engine.table.impl.QueryTable;
+import io.deephaven.engine.table.impl.sources.InMemoryColumnSource;
+import io.deephaven.engine.table.impl.sources.SparseArrayColumnSource;
+import io.deephaven.engine.table.impl.sources.ViewColumnSource;
+import org.jetbrains.annotations.NotNull;
+
+import java.util.Collection;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * The FilterSelectColumn wraps a {@link Filter} and producing a column of true or false Boolean values described by the
+ * filter.
+ * <p>
+ * This SelectColumn is appropriate as an argument to a {@link Table#view(Collection)} or
+ * {@link Table#updateView(String...)}, lazily evaluating the equivalent of a {@link Table#wouldMatch(String...)}
+ * operation. Although select and update can also use Filters, wouldMatch provides a more efficient path for realized
+ * results as it stores and updates only a {@link RowSet}. The FilterSelectColumn can only evaluate the Filter one chunk
+ * at a time, and must write to an in-memory {@link Boolean} {@link ColumnSource}.
+ */
+class FilterSelectColumn implements SelectColumn {
+
+    // We don't actually care to do anything, but cannot return null
+    private static final Formula.FillContext FILL_CONTEXT_INSTANCE = new Formula.FillContext() {};
+
+    @NotNull
+    private final String destName;
+    @NotNull
+    private final WhereFilter filter;
+
+    private Table tableToFilter;
+    /**
+     * We store a copy of our table definition, to ensure that it is identical between initDef and initInputs.
+     */
+    private TableDefinition computedDefinition;
+
+    /**
+     * Create a FilterSelectColumn with the given name and {@link WhereFilter}.
+     *
+     * @param destName the name of the result column
+     * @param filter the filter that is evaluated to true or false for each row of the table
+     * @return a new FilterSelectColumn representing the provided filter.
+     */
+    static FilterSelectColumn of(@NotNull final String destName, @NotNull final Filter filter) {
+        return new FilterSelectColumn(destName, WhereFilter.of(filter));
+    }
+
+    private FilterSelectColumn(@NotNull final String destName, @NotNull final WhereFilter filter) {
+        this.destName = destName;
+        this.filter = filter;
+    }
+
+    @Override
+    public String toString() {
+        return "filter(" + filter + ')';
+    }
+
+    @Override
+    public List<String> initInputs(final TrackingRowSet rowSet,
+            final Map<String, ? extends ColumnSource<?>> columnsOfInterest) {
+        tableToFilter = new QueryTable(rowSet, columnsOfInterest);
+        if (!computedDefinition.equals(tableToFilter.getDefinition())) {
+            throw new IllegalStateException(
+                    "Definition changed between initDef and initInputs in FilterSelectColumn: initDef="
+                            + computedDefinition + ", initInputs" + tableToFilter.getDefinition());
+        }
+        return filter.getColumns();
+    }
+
+    @Override
+    public List<String> initDef(@NotNull final Map<String, ColumnDefinition<?>> columnDefinitionMap) {
+        filter.init(computedDefinition = TableDefinition.of(columnDefinitionMap.values()));
+        return checkForInvalidFilters();
+    }
+
+    @Override
+    public List<String> initDef(@NotNull final Map<String, ColumnDefinition<?>> columnDefinitionMap,
+            @NotNull final QueryCompilerRequestProcessor compilationRequestProcessor) {
+        filter.init(computedDefinition = TableDefinition.of(columnDefinitionMap.values()), compilationRequestProcessor);
+        return checkForInvalidFilters();
+    }
+
+    /**
+     * Validates the filter to ensure it does not contain invalid filters such as column vectors or virtual row
+     * variables. Throws an {@link UncheckedTableException} if any invalid filters are found.
+     *
+     * @return the list of columns required by the filter.
+     */
+    private List<String> checkForInvalidFilters() {
+        if (!filter.getColumnArrays().isEmpty()) {
+            throw new UncheckedTableException(
+                    "Cannot use a filter with column Vectors (_ syntax) in select, view, update, or updateView: "
+                            + filter);
+        }
+        if (filter.hasVirtualRowVariables()) {
+            throw new UncheckedTableException(
+                    "Cannot use a filter with virtual row variables (i, ii, or k) in select, view, update, or updateView: "
+                            + filter);
+        }
+        if (filter.isRefreshing()) {
+            /*
+             * TODO: DH-18052: updateView and view should support refreshing Filter Expressions
+             *
+             * This would enable us to use a whereIn or whereNotIn for things like conditional formatting; which could
+             * be attractive. However, a join or wouldMatch gets you there without the additional complexity.
+             *
+             * Supporting this requires SelectColumn dependencies, which have not previously existed. Additionally, if
+             * we were to support these for select and update (as opposed to view and updateView), then the filter could
+             * require recomputing the entire result table whenever anything changes.
+             */
+            throw new UncheckedTableException(
+                    "Cannot use a refreshing filter in select, view, update, or updateView: " + filter);
+        }
+
+        return filter.getColumns();
+    }
+
+    @Override
+    public Class<?> getReturnedType() {
+        return Boolean.class;
+    }
+
+    @Override
+    public Class<?> getReturnedComponentType() {
+        return null;
+    }
+
+    @Override
+    public List<String> getColumns() {
+        return filter.getColumns();
+    }
+
+    @Override
+    public List<String> getColumnArrays() {
+        /* This should always be empty, because initDef throws when arrays or virtual row variables are used. */
+        return List.of();
+    }
+
+    @Override
+    public boolean hasVirtualRowVariables() {
+        /* This should always be false, because initDef throws when arrays or ii and friends are used. */
+        return false;
+    }
+
+    @NotNull
+    @Override
+    public ColumnSource<Boolean> getDataView() {
+        return new ViewColumnSource<>(Boolean.class, new FilterFormula(), isStateless());
+    }
+
+    @NotNull
+    @Override
+    public ColumnSource<?> getLazyView() {
+        return getDataView();
+    }
+
+    @Override
+    public String getName() {
+        return destName;
+    }
+
+    @Override
+    public MatchPair getMatchPair() {
+        throw new UnsupportedOperationException();
+    }
+
+    @Override
+    public final WritableColumnSource<?> newDestInstance(final long size) {
+        return SparseArrayColumnSource.getSparseMemoryColumnSource(size, Boolean.class);
+    }
+
+    @Override
+    public final WritableColumnSource<?> newFlatDestInstance(final long size) {
+        return InMemoryColumnSource.getImmutableMemoryColumnSource(size, Boolean.class, null);
+    }
+
+    @Override
+    public boolean isRetain() {
+        return false;
+    }
+
+    @Override
+    public boolean isStateless() {
+        return filter.permitParallelization();
+    }
+
+    @Override
+    public FilterSelectColumn copy() {
+        return new FilterSelectColumn(destName, filter.copy());
+    }
+
+    @Override
+    public void validateSafeForRefresh(final BaseTable<?> sourceTable) {
+        filter.validateSafeForRefresh(sourceTable);
+    }
+
+    private class FilterFormula extends Formula {
+        public FilterFormula() {
+            super(null);
+        }
+
+        @Override
+        public Boolean getBoolean(final long rowKey) {
+            try (final WritableRowSet selection = RowSetFactory.fromKeys(rowKey);
+                    final WritableRowSet filteredRowSet =
+                            filter.filter(selection, tableToFilter.getRowSet(), tableToFilter, false)) {
+                return filteredRowSet.isNonempty();
+            }
+        }
+
+        @Override
+        public Boolean getPrevBoolean(final long rowKey) {
+            try (final WritableRowSet selection = RowSetFactory.fromKeys(rowKey);
+                    final WritableRowSet filteredRowSet = filter.filter(selection,
+                            tableToFilter.getRowSet().prev(), tableToFilter, true)) {
+                return filteredRowSet.isNonempty();
+            }
+        }
+
+        @Override
+        public Object get(final long rowKey) {
+            return getBoolean(rowKey);
+        }
+
+        @Override
+        public Object getPrev(final long rowKey) {
+            return getPrevBoolean(rowKey);
+        }
+
+        @Override
+        public ChunkType getChunkType() {
+            return ChunkType.Object;
+        }
+
+        @Override
+        public FillContext makeFillContext(final int chunkCapacity) {
+            return FILL_CONTEXT_INSTANCE;
+        }
+
+        @Override
+        public void fillChunk(
+                @NotNull final FillContext fillContext,
+                @NotNull final WritableChunk<? super Values> destination,
+                @NotNull final RowSequence rowSequence) {
+            doFill(rowSequence, destination, false);
+        }
+
+        @Override
+        public void fillPrevChunk(
+                @NotNull final FillContext fillContext,
+                @NotNull final WritableChunk<? super Values> destination,
+                @NotNull final RowSequence rowSequence) {
+            doFill(rowSequence, destination, true);
+        }
+
+        private void doFill(@NotNull final RowSequence rowSequence, final WritableChunk<? super Values> destination,
+                final boolean usePrev) {
+            final WritableObjectChunk<Boolean, ?> booleanDestination = destination.asWritableObjectChunk();
+            booleanDestination.setSize(rowSequence.intSize());
+            final RowSet fullSet = usePrev ? tableToFilter.getRowSet().prev() : tableToFilter.getRowSet();
+
+            try (final RowSet inputRowSet = rowSequence.asRowSet();
+                    final RowSet filtered = filter.filter(inputRowSet, fullSet, tableToFilter, usePrev)) {
+                if (filtered.size() == inputRowSet.size()) {
+                    // if everything matches, short circuit the iteration
+                    booleanDestination.fillWithValue(0, booleanDestination.size(), true);
+                    return;
+                }
+
+                int offset = 0;
+
+                try (final RowSequence.Iterator inputRows = inputRowSet.getRowSequenceIterator();
+                        final RowSet.Iterator trueRows = filtered.iterator()) {
+                    while (trueRows.hasNext()) {
+                        final long nextTrue = trueRows.nextLong();
+                        // Find all the false rows between the last consumed input row and the next true row
+                        final int falsesSkipped = (int) inputRows.advanceAndGetPositionDistance(nextTrue + 1) - 1;
+                        if (falsesSkipped > 0) {
+                            booleanDestination.fillWithValue(offset, falsesSkipped, false);
+                            offset += falsesSkipped;
+                        }
+                        booleanDestination.set(offset++, true);
+                    }
+                }
+
+                final int remainingFalses = booleanDestination.size() - offset;
+                // Fill everything else up with false, because we've exhausted the trues
+                if (remainingFalses > 0) {
+                    booleanDestination.fillWithValue(offset, remainingFalses, false);
+                }
+            }
+        }
+    }
+}
diff --git a/engine/table/src/main/java/io/deephaven/engine/table/impl/select/InstantRangeFilter.java b/engine/table/src/main/java/io/deephaven/engine/table/impl/select/InstantRangeFilter.java
index 7d45254db75..64659acca44 100644
--- a/engine/table/src/main/java/io/deephaven/engine/table/impl/select/InstantRangeFilter.java
+++ b/engine/table/src/main/java/io/deephaven/engine/table/impl/select/InstantRangeFilter.java
@@ -90,19 +90,43 @@ WritableRowSet binarySearch(
     }
 
     private class InstantLongChunkFilterAdapter implements ChunkFilter {
+        /**
+         * Convert an Instant chunk to a Long chunk.
+         */
+        private WritableLongChunk<Values> convert(final Chunk<? extends Values> values) {
+            final ObjectChunk<Instant, ? extends Values> objectValues = values.asObjectChunk();
+            final WritableLongChunk<Values> outputChunk = WritableLongChunk.makeWritableChunk(objectValues.size());
+            for (int ii = 0; ii < values.size(); ++ii) {
+                final Instant instant = objectValues.get(ii);
+                outputChunk.set(ii, DateTimeUtils.epochNanos(instant));
+            }
+            outputChunk.setSize(values.size());
+            return outputChunk;
+        }
+
         @Override
         public void filter(Chunk<? extends Values> values, LongChunk<OrderedRowKeys> keys,
                 WritableLongChunk<OrderedRowKeys> results) {
-            try (final WritableLongChunk<Values> writableLongChunk =
-                    WritableLongChunk.makeWritableChunk(values.size())) {
-
-                final ObjectChunk<Instant, ? extends Values> objectValues = values.asObjectChunk();
-                for (int ii = 0; ii < values.size(); ++ii) {
-                    final Instant instant = objectValues.get(ii);
-                    writableLongChunk.set(ii, DateTimeUtils.epochNanos(instant));
-                }
-                writableLongChunk.setSize(values.size());
-                longFilter.filter(writableLongChunk, keys, results);
+            try (final WritableLongChunk<Values> convertedChunk = convert(values)) {
+                longFilter.filter(convertedChunk, keys, results);
+            }
+        }
+
+        @Override
+        public int filter(
+                final Chunk<? extends Values> values,
+                final WritableBooleanChunk<Values> results) {
+            try (final WritableLongChunk<Values> convertedChunk = convert(values)) {
+                return longFilter.filter(convertedChunk, results);
+            }
+        }
+
+        @Override
+        public int filterAnd(
+                final Chunk<? extends Values> values,
+                final WritableBooleanChunk<Values> results) {
+            try (final WritableLongChunk<Values> convertedChunk = convert(values)) {
+                return longFilter.filterAnd(convertedChunk, results);
             }
         }
     }
diff --git a/engine/table/src/main/java/io/deephaven/engine/table/impl/select/MatchFilter.java b/engine/table/src/main/java/io/deephaven/engine/table/impl/select/MatchFilter.java
index d4026f087aa..1052a8a96fb 100644
--- a/engine/table/src/main/java/io/deephaven/engine/table/impl/select/MatchFilter.java
+++ b/engine/table/src/main/java/io/deephaven/engine/table/impl/select/MatchFilter.java
@@ -15,6 +15,8 @@
 import io.deephaven.engine.table.Table;
 import io.deephaven.engine.table.TableDefinition;
 import io.deephaven.engine.table.impl.QueryCompilerRequestProcessor;
+import io.deephaven.engine.table.impl.chunkfilter.ChunkFilter;
+import io.deephaven.engine.table.impl.chunkfilter.ChunkMatchFilterFactory;
 import io.deephaven.engine.table.impl.lang.QueryLanguageFunctionUtils;
 import io.deephaven.engine.table.impl.preview.DisplayWrapper;
 import io.deephaven.engine.table.impl.DependencyStreamProvider;
@@ -41,7 +43,7 @@
 import java.util.function.Consumer;
 import java.util.stream.Stream;
 
-public class MatchFilter extends WhereFilterImpl implements DependencyStreamProvider {
+public class MatchFilter extends WhereFilterImpl implements DependencyStreamProvider, ExposesChunkFilter {
 
     private static final long serialVersionUID = 1L;
 
@@ -60,6 +62,7 @@ static MatchFilter ofLiterals(
 
     @NotNull
     private String columnName;
+    private Class<?> columnType;
     private Object[] values;
     private final String[] strValues;
     private final boolean invertMatch;
@@ -222,8 +225,10 @@ public synchronized void init(
                 initialized = true;
                 return;
             }
+            columnType = column.getDataType();
             final List<Object> valueList = new ArrayList<>();
-            final Map<String, Object> queryScopeVariables = compilationProcessor.getQueryScopeVariables();
+            final Map<String, Object> queryScopeVariables =
+                    compilationProcessor.getFormulaImports().getQueryScopeVariables();
             final ColumnTypeConvertor convertor = ColumnTypeConvertorFactory.getConvertor(column.getDataType());
             for (String strValue : strValues) {
                 convertor.convertValue(column, tableDefinition, strValue, queryScopeVariables, valueList::add);
@@ -302,6 +307,16 @@ public WritableRowSet filterInverse(
         return columnSource.match(!invertMatch, usePrev, caseInsensitive, dataIndex, selection, values);
     }
 
+    private ChunkFilter chunkFilter;
+
+    @Override
+    public Optional<ChunkFilter> chunkFilter() {
+        if (chunkFilter == null) {
+            chunkFilter = ChunkMatchFilterFactory.getChunkFilter(columnType, caseInsensitive, invertMatch, values);
+        }
+        return Optional.of(chunkFilter);
+    }
+
     @Override
     public boolean isSimpleFilter() {
         final WhereFilter failover = getFailoverFilterIfCached();
@@ -853,30 +868,51 @@ private String toString(Object[] x) {
 
     @Override
     public boolean equals(Object o) {
-        if (this == o)
+        if (this == o) {
             return true;
-        if (o == null || getClass() != o.getClass())
+        }
+        if (o == null || getClass() != o.getClass()) {
             return false;
+        }
+
         final MatchFilter that = (MatchFilter) o;
-        return invertMatch == that.invertMatch &&
-                caseInsensitive == that.caseInsensitive &&
-                Objects.equals(columnName, that.columnName) &&
-                Arrays.equals(values, that.values) &&
-                Arrays.equals(strValues, that.strValues);
+
+        // The equality check is used for memoization, and we cannot actually determine equality of an uninitialized
+        // filter, because there is too much state that has not been realized.
+        if (!initialized && !that.initialized) {
+            throw new UnsupportedOperationException("MatchFilter has not been initialized");
+        }
+
+        // start off with the simple things
+        if (invertMatch != that.invertMatch ||
+                caseInsensitive != that.caseInsensitive ||
+                !Objects.equals(columnName, that.columnName)) {
+            return false;
+        }
+
+        if (!Arrays.equals(values, that.values)) {
+            return false;
+        }
+
+        return Objects.equals(getFailoverFilterIfCached(), that.getFailoverFilterIfCached());
     }
 
     @Override
     public int hashCode() {
+        if (!initialized) {
+            throw new UnsupportedOperationException("MatchFilter has not been initialized");
+        }
         int result = Objects.hash(columnName, invertMatch, caseInsensitive);
+        // we can use values because we know the filter has been initialized; the hash code should be stable and it
+        // cannot be stable before we convert the values
         result = 31 * result + Arrays.hashCode(values);
-        result = 31 * result + Arrays.hashCode(strValues);
         return result;
     }
 
     @Override
     public boolean canMemoize() {
         // we can be memoized once our values have been initialized; but not before
-        return initialized;
+        return initialized && (getFailoverFilterIfCached() == null || getFailoverFilterIfCached().canMemoize());
     }
 
     @Override
diff --git a/engine/table/src/main/java/io/deephaven/engine/table/impl/select/RangeFilter.java b/engine/table/src/main/java/io/deephaven/engine/table/impl/select/RangeFilter.java
index 65d65b75e03..64fef6fc230 100644
--- a/engine/table/src/main/java/io/deephaven/engine/table/impl/select/RangeFilter.java
+++ b/engine/table/src/main/java/io/deephaven/engine/table/impl/select/RangeFilter.java
@@ -8,6 +8,7 @@
 import io.deephaven.engine.table.Table;
 import io.deephaven.engine.table.TableDefinition;
 import io.deephaven.engine.table.impl.QueryCompilerRequestProcessor;
+import io.deephaven.engine.table.impl.chunkfilter.ChunkFilter;
 import io.deephaven.time.DateTimeUtils;
 import io.deephaven.engine.rowset.WritableRowSet;
 import io.deephaven.engine.rowset.RowSet;
@@ -25,6 +26,7 @@
 import java.time.LocalTime;
 import java.time.ZonedDateTime;
 import java.util.List;
+import java.util.Optional;
 
 /**
  * A filter for comparable types (including Instant) for {@link Condition} values: <br>
@@ -35,7 +37,7 @@
  * <li>GREATER_THAN_OR_EQUAL</li>
  * </ul>
  */
-public class RangeFilter extends WhereFilterImpl {
+public class RangeFilter extends WhereFilterImpl implements ExposesChunkFilter {
 
     private String columnName;
     private String value;
@@ -183,7 +185,7 @@ public void init(
 
             try {
                 boolean wasAnArrayType = convertor.convertValue(
-                        def, tableDefinition, value, compilationProcessor.getQueryScopeVariables(),
+                        def, tableDefinition, value, compilationProcessor.getFormulaImports().getQueryScopeVariables(),
                         realValue::setValue);
                 if (wasAnArrayType) {
                     conversionError =
@@ -264,6 +266,15 @@ public void init(
         filter.init(tableDefinition, compilationProcessor);
     }
 
+    @Override
+    public Optional<ChunkFilter> chunkFilter() {
+        // The underlying filter may be a ConditionFilter
+        if (filter instanceof ExposesChunkFilter) {
+            return ((ExposesChunkFilter) filter).chunkFilter();
+        }
+        return Optional.empty();
+    }
+
     private static LongRangeFilter makeInstantRangeFilter(String columnName, Condition condition, long value) {
         switch (condition) {
             case LESS_THAN:
diff --git a/engine/table/src/main/java/io/deephaven/engine/table/impl/select/RecomputeOnModifiedRowSelectColumn.java b/engine/table/src/main/java/io/deephaven/engine/table/impl/select/RecomputeOnModifiedRowSelectColumn.java
new file mode 100644
index 00000000000..91a6f079b0c
--- /dev/null
+++ b/engine/table/src/main/java/io/deephaven/engine/table/impl/select/RecomputeOnModifiedRowSelectColumn.java
@@ -0,0 +1,44 @@
+//
+// Copyright (c) 2016-2024 Deephaven Data Labs and Patent Pending
+//
+package io.deephaven.engine.table.impl.select;
+
+import io.deephaven.api.ColumnName;
+import io.deephaven.api.expression.Expression;
+import io.deephaven.engine.rowset.TrackingRowSet;
+import io.deephaven.engine.table.ColumnDefinition;
+import io.deephaven.engine.table.ColumnSource;
+import io.deephaven.engine.table.WritableColumnSource;
+import io.deephaven.engine.table.impl.BaseTable;
+import io.deephaven.engine.table.impl.MatchPair;
+import io.deephaven.engine.table.impl.QueryCompilerRequestProcessor;
+import org.jetbrains.annotations.NotNull;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * {@link SelectColumn} implementation that wraps another {@link SelectColumn} and makes it report that values should be
+ * recomputed when the row is modified via {@link #recomputeOnModifiedRow()}.
+ */
+class RecomputeOnModifiedRowSelectColumn extends WrappedSelectColumn {
+
+    RecomputeOnModifiedRowSelectColumn(@NotNull final SelectColumn inner) {
+        super(inner);
+    }
+
+    @Override
+    public SelectColumn copy() {
+        return new RecomputeOnModifiedRowSelectColumn(inner.copy());
+    }
+
+    @Override
+    public boolean recomputeOnModifiedRow() {
+        return true;
+    }
+
+    @Override
+    public SelectColumn withRecomputeOnModifiedRow() {
+        return copy();
+    }
+}
diff --git a/engine/table/src/main/java/io/deephaven/engine/table/impl/select/RollingReleaseFilter.java b/engine/table/src/main/java/io/deephaven/engine/table/impl/select/RollingReleaseFilter.java
index 6459c65c704..7d1cc8169c0 100644
--- a/engine/table/src/main/java/io/deephaven/engine/table/impl/select/RollingReleaseFilter.java
+++ b/engine/table/src/main/java/io/deephaven/engine/table/impl/select/RollingReleaseFilter.java
@@ -13,6 +13,7 @@
 import io.deephaven.engine.updategraph.UpdateGraph;
 import org.jetbrains.annotations.NotNull;
 
+import javax.annotation.OverridingMethodsMustInvokeSuper;
 import java.util.Collections;
 import java.util.List;
 
@@ -117,6 +118,7 @@ public void run() {
         listener.requestRecompute();
     }
 
+    @OverridingMethodsMustInvokeSuper
     @Override
     protected void destroy() {
         super.destroy();
diff --git a/engine/table/src/main/java/io/deephaven/engine/table/impl/select/SelectColumn.java b/engine/table/src/main/java/io/deephaven/engine/table/impl/select/SelectColumn.java
index 9cb52213e3b..63239a0a461 100644
--- a/engine/table/src/main/java/io/deephaven/engine/table/impl/select/SelectColumn.java
+++ b/engine/table/src/main/java/io/deephaven/engine/table/impl/select/SelectColumn.java
@@ -67,6 +67,17 @@ static SelectColumn ofStateless(@NotNull final Selectable selectable) {
         return new StatelessSelectColumn(of(selectable));
     }
 
+    /**
+     * Produce a SelectColumn that {@link #recomputeOnModifiedRow()} recomputes values on any modified row} from
+     * {@code selectable}.
+     *
+     * @param selectable The {@link Selectable} to adapt and mark as requiring row-level recomputation
+     * @return The resulting SelectColumn
+     */
+    static SelectColumn ofRecomputeOnModifiedRow(Selectable selectable) {
+        return new RecomputeOnModifiedRowSelectColumn(of(selectable));
+    }
+
     /**
      * Convenient static final instance of a zero length Array of SelectColumns for use in toArray calls.
      */
@@ -171,7 +182,7 @@ default List<String> initDef(
     /**
      * Get a MatchPair for this column, if applicable.
      *
-     * @return
+     * @return the MatchPair for this column, if applicable.
      */
     MatchPair getMatchPair();
 
@@ -218,6 +229,13 @@ default void validateSafeForRefresh(final BaseTable<?> sourceTable) {
      */
     boolean isStateless();
 
+    /**
+     * Returns true if this column uses row virtual offset columns of {@code i}, {@code ii} or {@code k}.
+     */
+    default boolean hasVirtualRowVariables() {
+        return false;
+    }
+
     /**
      * Create a copy of this SelectColumn.
      *
@@ -225,6 +243,22 @@ default void validateSafeForRefresh(final BaseTable<?> sourceTable) {
      */
     SelectColumn copy();
 
+    /**
+     * Should we ignore modified column sets, and always re-evaluate this column when the row changes?
+     * 
+     * @return true if this column should be evaluated on every row modification
+     */
+    default boolean recomputeOnModifiedRow() {
+        return false;
+    }
+
+    /**
+     * Create a copy of this SelectColumn that always re-evaluates itself when a row is modified.
+     */
+    default SelectColumn withRecomputeOnModifiedRow() {
+        return new RecomputeOnModifiedRowSelectColumn(copy());
+    }
+
     class ExpressionAdapter implements Expression.Visitor<SelectColumn> {
         private final ColumnName lhs;
 
@@ -244,7 +278,7 @@ public SelectColumn visit(Literal rhs) {
 
         @Override
         public SelectColumn visit(Filter rhs) {
-            return makeSelectColumn(Strings.of(rhs));
+            return FilterSelectColumn.of(lhs.name(), rhs);
         }
 
         @Override
diff --git a/engine/table/src/main/java/io/deephaven/engine/table/impl/select/SingleSidedComparableRangeFilter.java b/engine/table/src/main/java/io/deephaven/engine/table/impl/select/SingleSidedComparableRangeFilter.java
index d9a54a7758b..19c5a76c564 100644
--- a/engine/table/src/main/java/io/deephaven/engine/table/impl/select/SingleSidedComparableRangeFilter.java
+++ b/engine/table/src/main/java/io/deephaven/engine/table/impl/select/SingleSidedComparableRangeFilter.java
@@ -7,11 +7,9 @@
 import io.deephaven.engine.table.ColumnDefinition;
 import io.deephaven.engine.table.TableDefinition;
 import io.deephaven.engine.table.impl.chunkfilter.ChunkFilter;
+import io.deephaven.engine.table.impl.chunkfilter.ObjectChunkFilter;
 import io.deephaven.util.compare.ObjectComparisons;
 import io.deephaven.engine.table.ColumnSource;
-import io.deephaven.chunk.*;
-import io.deephaven.engine.rowset.chunkattributes.OrderedRowKeys;
-import io.deephaven.chunk.attributes.Values;
 import io.deephaven.engine.rowset.WritableRowSet;
 import io.deephaven.engine.rowset.RowSet;
 import io.deephaven.util.annotations.TestUseOnly;
@@ -82,7 +80,7 @@ public String toString() {
                 + (lowerInclusive ? "=" : "") + pivot + ")";
     }
 
-    private static class GeqComparableChunkFilter implements ChunkFilter {
+    private static class GeqComparableChunkFilter extends ObjectChunkFilter<Comparable<?>> {
         private final Comparable<?> pivot;
 
         private GeqComparableChunkFilter(Comparable<?> pivot) {
@@ -90,21 +88,12 @@ private GeqComparableChunkFilter(Comparable<?> pivot) {
         }
 
         @Override
-        public void filter(Chunk<? extends Values> values, LongChunk<OrderedRowKeys> keys,
-                WritableLongChunk<OrderedRowKeys> results) {
-            final ObjectChunk<? extends Comparable<?>, ? extends Values> objectChunk = values.asObjectChunk();
-
-            results.setSize(0);
-            for (int ii = 0; ii < values.size(); ++ii) {
-                final Comparable<?> value = objectChunk.get(ii);
-                if (ObjectComparisons.geq(value, pivot)) {
-                    results.add(keys.get(ii));
-                }
-            }
+        public boolean matches(Comparable<?> value) {
+            return ObjectComparisons.geq(value, pivot);
         }
     }
 
-    private static class LeqComparableChunkFilter implements ChunkFilter {
+    private static class LeqComparableChunkFilter extends ObjectChunkFilter<Comparable<?>> {
         private final Comparable<?> pivot;
 
         private LeqComparableChunkFilter(Comparable<?> pivot) {
@@ -112,21 +101,12 @@ private LeqComparableChunkFilter(Comparable<?> pivot) {
         }
 
         @Override
-        public void filter(Chunk<? extends Values> values, LongChunk<OrderedRowKeys> keys,
-                WritableLongChunk<OrderedRowKeys> results) {
-            final ObjectChunk<? extends Comparable<?>, ? extends Values> objectChunk = values.asObjectChunk();
-
-            results.setSize(0);
-            for (int ii = 0; ii < values.size(); ++ii) {
-                final Comparable<?> value = objectChunk.get(ii);
-                if (ObjectComparisons.leq(value, pivot)) {
-                    results.add(keys.get(ii));
-                }
-            }
+        public boolean matches(Comparable<?> value) {
+            return ObjectComparisons.leq(value, pivot);
         }
     }
 
-    private static class GtComparableChunkFilter implements ChunkFilter {
+    private static class GtComparableChunkFilter extends ObjectChunkFilter<Comparable<?>> {
         private final Comparable<?> pivot;
 
         private GtComparableChunkFilter(Comparable<?> pivot) {
@@ -134,21 +114,12 @@ private GtComparableChunkFilter(Comparable<?> pivot) {
         }
 
         @Override
-        public void filter(Chunk<? extends Values> values, LongChunk<OrderedRowKeys> keys,
-                WritableLongChunk<OrderedRowKeys> results) {
-            final ObjectChunk<? extends Comparable<?>, ? extends Values> objectChunk = values.asObjectChunk();
-
-            results.setSize(0);
-            for (int ii = 0; ii < values.size(); ++ii) {
-                final Comparable<?> value = objectChunk.get(ii);
-                if (ObjectComparisons.gt(value, pivot)) {
-                    results.add(keys.get(ii));
-                }
-            }
+        public boolean matches(Comparable<?> value) {
+            return ObjectComparisons.gt(value, pivot);
         }
     }
 
-    private static class LtComparableChunkFilter implements ChunkFilter {
+    private static class LtComparableChunkFilter extends ObjectChunkFilter<Comparable<?>> {
         private final Comparable<?> pivot;
 
         private LtComparableChunkFilter(Comparable<?> pivot) {
@@ -156,17 +127,8 @@ private LtComparableChunkFilter(Comparable<?> pivot) {
         }
 
         @Override
-        public void filter(Chunk<? extends Values> values, LongChunk<OrderedRowKeys> keys,
-                WritableLongChunk<OrderedRowKeys> results) {
-            final ObjectChunk<? extends Comparable<?>, ? extends Values> objectChunk = values.asObjectChunk();
-
-            results.setSize(0);
-            for (int ii = 0; ii < values.size(); ++ii) {
-                final Comparable<?> value = objectChunk.get(ii);
-                if (ObjectComparisons.lt(value, pivot)) {
-                    results.add(keys.get(ii));
-                }
-            }
+        public boolean matches(Comparable<?> value) {
+            return ObjectComparisons.lt(value, pivot);
         }
     }
 
diff --git a/engine/table/src/main/java/io/deephaven/engine/table/impl/select/StatelessSelectColumn.java b/engine/table/src/main/java/io/deephaven/engine/table/impl/select/StatelessSelectColumn.java
index 97ca5052ce4..d257ab1ff4e 100644
--- a/engine/table/src/main/java/io/deephaven/engine/table/impl/select/StatelessSelectColumn.java
+++ b/engine/table/src/main/java/io/deephaven/engine/table/impl/select/StatelessSelectColumn.java
@@ -21,93 +21,10 @@
  * {@link SelectColumn} implementation that wraps another {@link SelectColumn} and makes it report to be
  * {@link #isStateless() stateless}.
  */
-class StatelessSelectColumn implements SelectColumn {
-
-    private final SelectColumn inner;
+class StatelessSelectColumn extends WrappedSelectColumn {
 
     StatelessSelectColumn(@NotNull final SelectColumn inner) {
-        this.inner = inner;
-    }
-
-    @Override
-    public List<String> initInputs(
-            @NotNull final TrackingRowSet rowSet,
-            @NotNull final Map<String, ? extends ColumnSource<?>> columnsOfInterest) {
-        return inner.initInputs(rowSet, columnsOfInterest);
-    }
-
-    @Override
-    public List<String> initDef(@NotNull final Map<String, ColumnDefinition<?>> columnDefinitionMap) {
-        return inner.initDef(columnDefinitionMap);
-    }
-
-    @Override
-    public List<String> initDef(
-            @NotNull final Map<String, ColumnDefinition<?>> columnDefinitionMap,
-            @NotNull final QueryCompilerRequestProcessor compilationRequestProcessor) {
-        return inner.initDef(columnDefinitionMap, compilationRequestProcessor);
-    }
-
-    @Override
-    public Class<?> getReturnedType() {
-        return inner.getReturnedType();
-    }
-
-    @Override
-    public Class<?> getReturnedComponentType() {
-        return inner.getReturnedComponentType();
-    }
-
-    @Override
-    public List<String> getColumns() {
-        return inner.getColumns();
-    }
-
-    @Override
-    public List<String> getColumnArrays() {
-        return inner.getColumnArrays();
-    }
-
-    @Override
-    @NotNull
-    public ColumnSource<?> getDataView() {
-        return inner.getDataView();
-    }
-
-    @Override
-    @NotNull
-    public ColumnSource<?> getLazyView() {
-        return inner.getLazyView();
-    }
-
-    @Override
-    public String getName() {
-        return inner.getName();
-    }
-
-    @Override
-    public MatchPair getMatchPair() {
-        return inner.getMatchPair();
-    }
-
-    @Override
-    public WritableColumnSource<?> newDestInstance(final long size) {
-        return inner.newDestInstance(size);
-    }
-
-    @Override
-    public WritableColumnSource<?> newFlatDestInstance(final long size) {
-        return inner.newFlatDestInstance(size);
-    }
-
-    @Override
-    public boolean isRetain() {
-        return inner.isRetain();
-    }
-
-    @Override
-    public void validateSafeForRefresh(@NotNull final BaseTable<?> sourceTable) {
-        inner.validateSafeForRefresh(sourceTable);
+        super(inner);
     }
 
     @Override
@@ -119,14 +36,4 @@ public boolean isStateless() {
     public SelectColumn copy() {
         return new StatelessSelectColumn(inner.copy());
     }
-
-    @Override
-    public ColumnName newColumn() {
-        return inner.newColumn();
-    }
-
-    @Override
-    public Expression expression() {
-        return inner.expression();
-    }
 }
diff --git a/engine/table/src/main/java/io/deephaven/engine/table/impl/select/TimeSeriesFilter.java b/engine/table/src/main/java/io/deephaven/engine/table/impl/select/TimeSeriesFilter.java
index 497957f4e45..22a52024308 100644
--- a/engine/table/src/main/java/io/deephaven/engine/table/impl/select/TimeSeriesFilter.java
+++ b/engine/table/src/main/java/io/deephaven/engine/table/impl/select/TimeSeriesFilter.java
@@ -3,49 +3,202 @@
 //
 package io.deephaven.engine.table.impl.select;
 
+import io.deephaven.base.Pair;
 import io.deephaven.base.clock.Clock;
 import io.deephaven.base.verify.Assert;
-import io.deephaven.base.verify.Require;
+import io.deephaven.engine.rowset.RowSetFactory;
 import io.deephaven.engine.rowset.WritableRowSet;
 import io.deephaven.engine.rowset.RowSet;
-import io.deephaven.engine.rowset.RowSetBuilderSequential;
-import io.deephaven.engine.rowset.RowSetFactory;
-import io.deephaven.engine.table.Table;
-import io.deephaven.engine.table.TableDefinition;
+import io.deephaven.engine.table.*;
+import io.deephaven.engine.table.impl.InstrumentedTableUpdateListenerAdapter;
+import io.deephaven.engine.table.impl.QueryTable;
 import io.deephaven.engine.updategraph.NotificationQueue;
 import io.deephaven.engine.updategraph.UpdateGraph;
+import io.deephaven.engine.util.WindowCheck;
 import io.deephaven.time.DateTimeUtils;
-import io.deephaven.engine.table.ColumnSource;
+import io.deephaven.util.SafeCloseable;
+import io.deephaven.util.annotations.TestUseOnly;
 import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
 
-import java.time.Instant;
+import java.time.Duration;
 import java.util.Collections;
 import java.util.List;
 
 /**
- * This will filter a table for the most recent N nanoseconds (must be on an {@link Instant} column).
+ * TimeSeriesFilter filters a timestamp colum within the table for recent rows.
+ *
+ * <p>
+ * The filtered column must be an Instant or long containing nanoseconds since the epoch. The computation of recency is
+ * delegated to {@link io.deephaven.engine.util.WindowCheck}.
+ * </p>
  *
  * <p>
- * Note, this filter rescans the source table. You should prefer to use {@link io.deephaven.engine.util.WindowCheck}
- * instead.
+ * When the filter is not inverted, null rows are not accepted and rows that match the window exactly are accepted.
  * </p>
  */
 public class TimeSeriesFilter
         extends WhereFilterLivenessArtifactImpl
-        implements Runnable, NotificationQueue.Dependency {
-    protected final String columnName;
-    protected final long nanos;
+        implements NotificationQueue.Dependency {
+    /**
+     * A builder to create a TimeSeriesFilter.
+     */
+    public static class Builder {
+        private String columnName;
+        private long periodNanos;
+        private boolean invert;
+        private Clock clock;
+
+        private Builder() {
+            // use newBuilder
+        }
+
+        /**
+         * Set the column name to filter on.
+         * 
+         * @param columnName the column name to filter on, required
+         * @return this builder
+         */
+        public Builder columnName(final String columnName) {
+            this.columnName = columnName;
+            return this;
+        }
+
+        /**
+         * Set an optional Clock to use for this filter. When not specified, the clock is determined by
+         * {@link DateTimeUtils#currentClock()}.
+         * 
+         * @param clock the clock to use for the filter
+         * @return this builder
+         */
+        public Builder clock(final Clock clock) {
+            this.clock = clock;
+            return this;
+        }
+
+        /**
+         * Set the period for this filter.
+         * 
+         * @param period the period as a string for the filter
+         * @return this builder
+         */
+        public Builder period(final String period) {
+            return period(DateTimeUtils.parseDurationNanos(period));
+        }
+
+        /**
+         * Set the period for this filter.
+         * 
+         * @param period the period as a Duration for the filter
+         * @return this builder
+         */
+        public Builder period(final Duration period) {
+            return period(period.toNanos());
+        }
+
+        /**
+         * Set the period for this filter.
+         * 
+         * @param period the period in nanoseconds for the filter
+         * @return this builder
+         */
+        public Builder period(final long period) {
+            this.periodNanos = period;
+            return this;
+        }
+
+        /**
+         * Set whether this filter should be inverted. An inverted filter accepts only rows that have null timestamps or
+         * timestamps older than the period.
+         * 
+         * @param invert true if the filter should be inverted.
+         * @return this builder
+         */
+        public Builder invert(final boolean invert) {
+            this.invert = invert;
+            return this;
+        }
+
+        /**
+         * Create the TimeSeriesFilter described by this builder.
+         * 
+         * @return a TimeSeriesFilter using the options from this builder.
+         */
+        public TimeSeriesFilter build() {
+            if (columnName == null) {
+                throw new IllegalArgumentException("Column name is required");
+            }
+            return new TimeSeriesFilter(columnName, periodNanos, invert, clock);
+        }
+    }
+
+    /**
+     * Create a builder for a time series filter.
+     * 
+     * @return a Builder object to configure a TimeSeriesFilter
+     */
+    public static Builder newBuilder() {
+        return new Builder();
+    }
+
+    private final String columnName;
+    private final long periodNanos;
+    private final boolean invert;
+    private final Clock clock;
+
     private RecomputeListener listener;
 
+    /**
+     * For unit tests, we must be able to cause the window check to update.
+     */
+    private Runnable refreshFunctionForUnitTests;
+
+    /**
+     * The listener is responsible for listening to the WindowCheck result, updating our RowSet that contains the rows
+     * in our window, and then notifying the WhereListener that we are requesting recomputation.
+     */
+    private TimeSeriesFilterWindowListener windowListener;
+
+    /**
+     * Create a TimeSeriesFilter on the given column for the given period
+     *
+     * @param columnName the name of the timestamp column
+     * @param period the duration of the window as parsed by {@link DateTimeUtils#parseDurationNanos(String)}.
+     */
     @SuppressWarnings("UnusedDeclaration")
-    public TimeSeriesFilter(String columnName, String period) {
+    public TimeSeriesFilter(final String columnName,
+            final String period) {
         this(columnName, DateTimeUtils.parseDurationNanos(period));
     }
 
-    public TimeSeriesFilter(String columnName, long nanos) {
-        Require.gtZero(nanos, "nanos");
+    /**
+     * Create a TimeSeriesFilter on the given column for the given period in nanoseconds.
+     *
+     * @param columnName the name of the timestamp column
+     * @param periodNanos the duration of the window in nanoseconds
+     */
+    public TimeSeriesFilter(final String columnName,
+            final long periodNanos) {
+        this(columnName, periodNanos, false, null);
+    }
+
+    /**
+     * Create a TimeSeriesFilter on the given column for the given period in nanoseconds.
+     *
+     * @param columnName the name of the timestamp column
+     * @param periodNanos the duration of the window in nanoseconds
+     * @param invert true if only rows outside the window (or with a null timestamp) should be included in the result
+     * @param clock the Clock to use as a time source for this filter, when null the clock supplied by
+     *        {@link DateTimeUtils#currentClock()} is used.
+     */
+    private TimeSeriesFilter(final String columnName,
+            final long periodNanos,
+            final boolean invert,
+            @Nullable final Clock clock) {
         this.columnName = columnName;
-        this.nanos = nanos;
+        this.periodNanos = periodNanos;
+        this.invert = invert;
+        this.clock = clock;
     }
 
     @Override
@@ -72,28 +225,13 @@ public WritableRowSet filter(
             throw new PreviousFilteringNotSupported();
         }
 
-        ColumnSource<Instant> dateColumn = table.getColumnSource(columnName);
-        if (!Instant.class.isAssignableFrom(dateColumn.getType())) {
-            throw new RuntimeException(columnName + " is not an Instant column!");
-        }
-
-        long nanoBoundary = getNowNanos() - nanos;
+        Assert.neqNull(windowListener, "windowListener");
 
-        RowSetBuilderSequential indexBuilder = RowSetFactory.builderSequential();
-        for (RowSet.Iterator it = selection.iterator(); it.hasNext();) {
-            long row = it.nextLong();
-            Instant instant = dateColumn.get(row);
-            long nanoValue = DateTimeUtils.epochNanos(instant);
-            if (nanoValue >= nanoBoundary) {
-                indexBuilder.appendKey(row);
-            }
+        if (invert) {
+            return selection.minus(windowListener.inWindowRowSet);
+        } else {
+            return selection.intersect(windowListener.inWindowRowSet);
         }
-
-        return indexBuilder.build();
-    }
-
-    protected long getNowNanos() {
-        return Clock.system().currentTimeNanos();
     }
 
     @Override
@@ -107,12 +245,11 @@ public void setRecomputeListener(RecomputeListener listener) {
         Assert.eqNull(this.listener, "this.listener");
         this.listener = listener;
         listener.setIsRefreshing(true);
-        updateGraph.addSource(this);
     }
 
     @Override
     public boolean satisfied(long step) {
-        return updateGraph.satisfied(step);
+        return windowListener.satisfied(step);
     }
 
     @Override
@@ -122,7 +259,7 @@ public UpdateGraph getUpdateGraph() {
 
     @Override
     public TimeSeriesFilter copy() {
-        return new TimeSeriesFilter(columnName, nanos);
+        return new TimeSeriesFilter(columnName, periodNanos, invert, clock);
     }
 
     @Override
@@ -131,13 +268,99 @@ public boolean isRefreshing() {
     }
 
     @Override
-    public void run() {
-        listener.requestRecomputeMatched();
+    public boolean permitParallelization() {
+        // there is no reason to parallelize this filter, because the actual filtering is only a simple rowset operation
+        // and parallelization would cost more than actually applying the rowset operation once
+        return false;
+    }
+
+    @Override
+    public String toString() {
+        return "TimeSeriesFilter{" +
+                "columnName='" + columnName + '\'' +
+                ", periodNanos=" + periodNanos +
+                ", invert=" + invert +
+                '}';
+    }
+
+    private class TimeSeriesFilterWindowListener extends InstrumentedTableUpdateListenerAdapter {
+        // the list of rows that exist within our window
+        final WritableRowSet inWindowRowSet = RowSetFactory.empty();
+
+        // the columnset that represents our window source
+        private final ModifiedColumnSet windowColumnSet;
+
+        // the column source containing the window; which we match on
+        private final ColumnSource<Object> windowColumnSource;
+
+        protected TimeSeriesFilterWindowListener(String listenerDescription, QueryTable tableWithWindow,
+                final String windowSourceName) {
+            super(listenerDescription, tableWithWindow, false);
+            this.windowColumnSet = tableWithWindow.newModifiedColumnSet(windowSourceName);
+            this.windowColumnSource = tableWithWindow.getColumnSource(windowSourceName);
+        }
+
+
+        @Override
+        public void onUpdate(TableUpdate update) {
+            inWindowRowSet.remove(update.removed());
+            final boolean windowModified = update.modifiedColumnSet().containsAny(windowColumnSet);
+            if (windowModified) {
+                // we need to check on the modified rows; they may be in the window,
+                inWindowRowSet.remove(update.getModifiedPreShift());
+            }
+            update.shifted().apply(inWindowRowSet);
+            if (windowModified) {
+                final RowSet newlyMatched = insertMatched(update.modified());
+                try (final WritableRowSet movedOutOfWindow = update.modified().minus(newlyMatched)) {
+                    if (movedOutOfWindow.isNonempty()) {
+                        listener.requestRecompute(movedOutOfWindow);
+                    }
+                }
+            }
+            insertMatched(update.added());
+        }
+
+        private RowSet insertMatched(final RowSet rowSet) {
+            // The original filter did not include nulls for a regular filter, so we do not include them here either to
+            // maintain compatibility. That also means the inverted filter is going to include nulls (as the null is
+            // less than the current time using Deephaven long comparisons).
+            final RowSet matched = windowColumnSource.match(false, false, false, null, rowSet, Boolean.TRUE);
+            inWindowRowSet.insert(matched);
+            return matched;
+        }
+    }
+
+    /**
+     * For test uses, causes the WindowCheck to update rows based on the current value of clock.
+     */
+    @TestUseOnly
+    void runForUnitTests() {
+        refreshFunctionForUnitTests.run();
     }
 
     @Override
-    protected void destroy() {
-        super.destroy();
-        updateGraph.removeSource(this);
+    public SafeCloseable beginOperation(@NotNull Table sourceTable) {
+        String windowSourceName = "__Window_" + columnName;
+        while (sourceTable.hasColumns(windowSourceName)) {
+            windowSourceName = "_" + windowSourceName;
+        }
+
+        final Pair<Table, WindowCheck.TimeWindowListener> pair = WindowCheck.addTimeWindowInternal(clock,
+                (QueryTable) sourceTable, columnName, periodNanos + 1, windowSourceName, true);
+        final QueryTable tableWithWindow = (QueryTable) pair.first;
+        refreshFunctionForUnitTests = pair.second;
+
+        windowListener = new TimeSeriesFilterWindowListener(
+                "TimeSeriesFilter(" + columnName + ", " + Duration.ofNanos(periodNanos) + ", " + invert + ")",
+                tableWithWindow, windowSourceName);
+        tableWithWindow.addUpdateListener(windowListener);
+        manage(windowListener);
+
+        // we are doing the first match, which is based on the entire set of values in the table
+        windowListener.insertMatched(sourceTable.getRowSet());
+
+        // the only thing we hold is our listener, which in turn holds the windowed table
+        return null;
     }
 }
diff --git a/engine/table/src/main/java/io/deephaven/engine/table/impl/select/WhereFilter.java b/engine/table/src/main/java/io/deephaven/engine/table/impl/select/WhereFilter.java
index 5c17955ccde..454cc547020 100644
--- a/engine/table/src/main/java/io/deephaven/engine/table/impl/select/WhereFilter.java
+++ b/engine/table/src/main/java/io/deephaven/engine/table/impl/select/WhereFilter.java
@@ -58,17 +58,23 @@ interface RecomputeListener {
         void requestRecompute();
 
         /**
-         * Notify the something about the filters has changed such that all unmatched rows of the source table should be
-         * re-evaluated.
+         * Notify that something about the filters has changed such that all unmatched rows of the source table should
+         * be re-evaluated.
          */
         void requestRecomputeUnmatched();
 
         /**
-         * Notify the something about the filters has changed such that all matched rows of the source table should be
+         * Notify that something about the filters has changed such that all matched rows of the source table should be
          * re-evaluated.
          */
         void requestRecomputeMatched();
 
+        /**
+         * Notify that something about the filters has changed such that the following rows of the source table should
+         * be re-evaluated. The rowSet ownership is not taken by requestRecompute.
+         */
+        void requestRecompute(RowSet rowSet);
+
         /**
          * Get the table underlying this listener.
          *
@@ -295,6 +301,13 @@ default boolean canMemoize() {
         return false;
     }
 
+    /**
+     * Returns true if this filter uses row virtual offset columns of {@code i}, {@code ii} or {@code k}.
+     */
+    default boolean hasVirtualRowVariables() {
+        return false;
+    }
+
     /**
      * Create a copy of this WhereFilter.
      *
@@ -325,7 +338,7 @@ default Filter invert() {
 
     @Override
     default <T> T walk(Expression.Visitor<T> visitor) {
-        throw new UnsupportedOperationException("WhereFilters do not implement walk");
+        return visitor.visit(this);
     }
 
     @Override
diff --git a/engine/table/src/main/java/io/deephaven/engine/table/impl/select/WhereFilterPatternImpl.java b/engine/table/src/main/java/io/deephaven/engine/table/impl/select/WhereFilterPatternImpl.java
index de19278857d..395f8a12279 100644
--- a/engine/table/src/main/java/io/deephaven/engine/table/impl/select/WhereFilterPatternImpl.java
+++ b/engine/table/src/main/java/io/deephaven/engine/table/impl/select/WhereFilterPatternImpl.java
@@ -5,19 +5,14 @@
 
 import io.deephaven.api.ColumnName;
 import io.deephaven.api.filter.FilterPattern;
-import io.deephaven.chunk.LongChunk;
-import io.deephaven.chunk.ObjectChunk;
-import io.deephaven.chunk.WritableLongChunk;
-import io.deephaven.chunk.attributes.Values;
 import io.deephaven.engine.rowset.RowSet;
 import io.deephaven.engine.rowset.WritableRowSet;
-import io.deephaven.engine.rowset.chunkattributes.OrderedRowKeys;
 import io.deephaven.engine.table.ColumnDefinition;
 import io.deephaven.engine.table.ColumnSource;
 import io.deephaven.engine.table.Table;
 import io.deephaven.engine.table.TableDefinition;
 import io.deephaven.engine.table.impl.chunkfilter.ChunkFilter;
-import io.deephaven.engine.table.impl.chunkfilter.ChunkFilter.ObjectChunkFilter;
+import io.deephaven.engine.table.impl.chunkfilter.ObjectChunkFilter;
 import org.jetbrains.annotations.NotNull;
 
 import java.util.List;
@@ -80,9 +75,7 @@ public boolean isSimpleFilter() {
     }
 
     @Override
-    public void setRecomputeListener(RecomputeListener listener) {
-
-    }
+    public void setRecomputeListener(RecomputeListener listener) {}
 
     @Override
     public boolean canMemoize() {
@@ -166,123 +159,59 @@ private boolean findPatternInverted(CharSequence value) {
         return value != null && !filterPattern.pattern().matcher(value).find();
     }
 
-    private class Matches implements ObjectChunkFilter<CharSequence> {
+    private final class Matches extends ObjectChunkFilter<CharSequence> {
         @Override
-        public void filter(
-                ObjectChunk<CharSequence, ? extends Values> values,
-                LongChunk<OrderedRowKeys> keys,
-                WritableLongChunk<OrderedRowKeys> results) {
-            results.setSize(0);
-            for (int ix = 0; ix < values.size(); ++ix) {
-                if (matches(values.get(ix))) {
-                    results.add(keys.get(ix));
-                }
-            }
+        public boolean matches(CharSequence value) {
+            return WhereFilterPatternImpl.this.matches(value);
         }
     }
 
-    private class MatchesPatternInverted implements ObjectChunkFilter<CharSequence> {
+    private final class MatchesPatternInverted extends ObjectChunkFilter<CharSequence> {
         @Override
-        public void filter(
-                ObjectChunk<CharSequence, ? extends Values> values,
-                LongChunk<OrderedRowKeys> keys,
-                WritableLongChunk<OrderedRowKeys> results) {
-            results.setSize(0);
-            for (int ix = 0; ix < values.size(); ++ix) {
-                if (matchesPatternInverted(values.get(ix))) {
-                    results.add(keys.get(ix));
-                }
-            }
+        public boolean matches(CharSequence value) {
+            return WhereFilterPatternImpl.this.matchesPatternInverted(value);
         }
     }
 
-    private class Find implements ObjectChunkFilter<CharSequence> {
+    private final class Find extends ObjectChunkFilter<CharSequence> {
         @Override
-        public void filter(
-                ObjectChunk<CharSequence, ? extends Values> values,
-                LongChunk<OrderedRowKeys> keys,
-                WritableLongChunk<OrderedRowKeys> results) {
-            results.setSize(0);
-            for (int ix = 0; ix < values.size(); ++ix) {
-                if (find(values.get(ix))) {
-                    results.add(keys.get(ix));
-                }
-            }
+        public boolean matches(CharSequence value) {
+            return WhereFilterPatternImpl.this.find(value);
         }
     }
 
-    private class FindPatternInverted implements ObjectChunkFilter<CharSequence> {
+    private final class FindPatternInverted extends ObjectChunkFilter<CharSequence> {
         @Override
-        public void filter(
-                ObjectChunk<CharSequence, ? extends Values> values,
-                LongChunk<OrderedRowKeys> keys,
-                WritableLongChunk<OrderedRowKeys> results) {
-            results.setSize(0);
-            for (int ix = 0; ix < values.size(); ++ix) {
-                if (findPatternInverted(values.get(ix))) {
-                    results.add(keys.get(ix));
-                }
-            }
+        public boolean matches(CharSequence value) {
+            return WhereFilterPatternImpl.this.findPatternInverted(value);
         }
     }
 
-    private class NotMatches implements ObjectChunkFilter<CharSequence> {
+    private final class NotMatches extends ObjectChunkFilter<CharSequence> {
         @Override
-        public void filter(
-                ObjectChunk<CharSequence, ? extends Values> values,
-                LongChunk<OrderedRowKeys> keys,
-                WritableLongChunk<OrderedRowKeys> results) {
-            results.setSize(0);
-            for (int ix = 0; ix < values.size(); ++ix) {
-                if (!matches(values.get(ix))) {
-                    results.add(keys.get(ix));
-                }
-            }
+        public boolean matches(CharSequence value) {
+            return !WhereFilterPatternImpl.this.matches(value);
         }
     }
 
-    private class NotMatchesPatternInverted implements ObjectChunkFilter<CharSequence> {
+    private final class NotMatchesPatternInverted extends ObjectChunkFilter<CharSequence> {
         @Override
-        public void filter(
-                ObjectChunk<CharSequence, ? extends Values> values,
-                LongChunk<OrderedRowKeys> keys,
-                WritableLongChunk<OrderedRowKeys> results) {
-            results.setSize(0);
-            for (int ix = 0; ix < values.size(); ++ix) {
-                if (!matchesPatternInverted(values.get(ix))) {
-                    results.add(keys.get(ix));
-                }
-            }
+        public boolean matches(CharSequence value) {
+            return !WhereFilterPatternImpl.this.matchesPatternInverted(value);
         }
     }
 
-    private class NotFind implements ObjectChunkFilter<CharSequence> {
+    private final class NotFind extends ObjectChunkFilter<CharSequence> {
         @Override
-        public void filter(
-                ObjectChunk<CharSequence, ? extends Values> values,
-                LongChunk<OrderedRowKeys> keys,
-                WritableLongChunk<OrderedRowKeys> results) {
-            results.setSize(0);
-            for (int ix = 0; ix < values.size(); ++ix) {
-                if (!find(values.get(ix))) {
-                    results.add(keys.get(ix));
-                }
-            }
+        public boolean matches(CharSequence value) {
+            return !WhereFilterPatternImpl.this.find(value);
         }
     }
 
-    private class NotFindPatternInverted implements ObjectChunkFilter<CharSequence> {
+    private final class NotFindPatternInverted extends ObjectChunkFilter<CharSequence> {
         @Override
-        public void filter(
-                ObjectChunk<CharSequence, ? extends Values> values,
-                LongChunk<OrderedRowKeys> keys,
-                WritableLongChunk<OrderedRowKeys> results) {
-            results.setSize(0);
-            for (int ix = 0; ix < values.size(); ++ix) {
-                if (!findPatternInverted(values.get(ix))) {
-                    results.add(keys.get(ix));
-                }
-            }
+        public boolean matches(CharSequence value) {
+            return !WhereFilterPatternImpl.this.findPatternInverted(value);
         }
     }
 }
diff --git a/engine/table/src/main/java/io/deephaven/engine/table/impl/select/WrappedSelectColumn.java b/engine/table/src/main/java/io/deephaven/engine/table/impl/select/WrappedSelectColumn.java
new file mode 100644
index 00000000000..a77bf533d2d
--- /dev/null
+++ b/engine/table/src/main/java/io/deephaven/engine/table/impl/select/WrappedSelectColumn.java
@@ -0,0 +1,134 @@
+//
+// Copyright (c) 2016-2024 Deephaven Data Labs and Patent Pending
+//
+package io.deephaven.engine.table.impl.select;
+
+import io.deephaven.api.ColumnName;
+import io.deephaven.api.expression.Expression;
+import io.deephaven.engine.rowset.TrackingRowSet;
+import io.deephaven.engine.table.ColumnDefinition;
+import io.deephaven.engine.table.ColumnSource;
+import io.deephaven.engine.table.WritableColumnSource;
+import io.deephaven.engine.table.impl.BaseTable;
+import io.deephaven.engine.table.impl.MatchPair;
+import io.deephaven.engine.table.impl.QueryCompilerRequestProcessor;
+import org.jetbrains.annotations.NotNull;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * {@link SelectColumn} implementation that wraps another {@link SelectColumn}.
+ */
+abstract class WrappedSelectColumn implements SelectColumn {
+
+    /**
+     * The select column that is being wrapped.
+     */
+    protected final SelectColumn inner;
+
+    WrappedSelectColumn(@NotNull final SelectColumn inner) {
+        this.inner = inner;
+    }
+
+    @Override
+    public List<String> initInputs(
+            @NotNull final TrackingRowSet rowSet,
+            @NotNull final Map<String, ? extends ColumnSource<?>> columnsOfInterest) {
+        return inner.initInputs(rowSet, columnsOfInterest);
+    }
+
+    @Override
+    public List<String> initDef(@NotNull final Map<String, ColumnDefinition<?>> columnDefinitionMap) {
+        return inner.initDef(columnDefinitionMap);
+    }
+
+    @Override
+    public List<String> initDef(
+            @NotNull final Map<String, ColumnDefinition<?>> columnDefinitionMap,
+            @NotNull final QueryCompilerRequestProcessor compilationRequestProcessor) {
+        return inner.initDef(columnDefinitionMap, compilationRequestProcessor);
+    }
+
+    @Override
+    public Class<?> getReturnedType() {
+        return inner.getReturnedType();
+    }
+
+    @Override
+    public Class<?> getReturnedComponentType() {
+        return inner.getReturnedComponentType();
+    }
+
+    @Override
+    public List<String> getColumns() {
+        return inner.getColumns();
+    }
+
+    @Override
+    public List<String> getColumnArrays() {
+        return inner.getColumnArrays();
+    }
+
+    @Override
+    @NotNull
+    public ColumnSource<?> getDataView() {
+        return inner.getDataView();
+    }
+
+    @Override
+    @NotNull
+    public ColumnSource<?> getLazyView() {
+        return inner.getLazyView();
+    }
+
+    @Override
+    public String getName() {
+        return inner.getName();
+    }
+
+    @Override
+    public MatchPair getMatchPair() {
+        return inner.getMatchPair();
+    }
+
+    @Override
+    public WritableColumnSource<?> newDestInstance(final long size) {
+        return inner.newDestInstance(size);
+    }
+
+    @Override
+    public WritableColumnSource<?> newFlatDestInstance(final long size) {
+        return inner.newFlatDestInstance(size);
+    }
+
+    @Override
+    public boolean isRetain() {
+        return inner.isRetain();
+    }
+
+    @Override
+    public void validateSafeForRefresh(@NotNull final BaseTable<?> sourceTable) {
+        inner.validateSafeForRefresh(sourceTable);
+    }
+
+    @Override
+    public boolean isStateless() {
+        return inner.isStateless();
+    }
+
+    @Override
+    public boolean recomputeOnModifiedRow() {
+        return inner.recomputeOnModifiedRow();
+    }
+
+    @Override
+    public ColumnName newColumn() {
+        return inner.newColumn();
+    }
+
+    @Override
+    public Expression expression() {
+        return inner.expression();
+    }
+}
diff --git a/engine/table/src/main/java/io/deephaven/engine/table/impl/select/analyzers/BaseLayer.java b/engine/table/src/main/java/io/deephaven/engine/table/impl/select/analyzers/BaseLayer.java
deleted file mode 100644
index 0d9c0892c4d..00000000000
--- a/engine/table/src/main/java/io/deephaven/engine/table/impl/select/analyzers/BaseLayer.java
+++ /dev/null
@@ -1,99 +0,0 @@
-//
-// Copyright (c) 2016-2024 Deephaven Data Labs and Patent Pending
-//
-package io.deephaven.engine.table.impl.select.analyzers;
-
-import io.deephaven.base.log.LogOutput;
-import io.deephaven.datastructures.util.CollectionUtil;
-import io.deephaven.engine.liveness.LivenessNode;
-import io.deephaven.engine.table.ColumnDefinition;
-import io.deephaven.engine.table.TableUpdate;
-import io.deephaven.engine.table.ModifiedColumnSet;
-import io.deephaven.engine.table.ColumnSource;
-import io.deephaven.engine.rowset.RowSet;
-import io.deephaven.engine.table.impl.util.JobScheduler;
-import org.jetbrains.annotations.Nullable;
-
-import java.util.*;
-
-public class BaseLayer extends SelectAndViewAnalyzer {
-    private final Map<String, ColumnSource<?>> sources;
-    private final boolean publishTheseSources;
-
-    BaseLayer(Map<String, ColumnSource<?>> sources, boolean publishTheseSources) {
-        super(BASE_LAYER_INDEX);
-        this.sources = sources;
-        this.publishTheseSources = publishTheseSources;
-    }
-
-    @Override
-    int getLayerIndexFor(String column) {
-        if (sources.containsKey(column)) {
-            return BASE_LAYER_INDEX;
-        }
-        throw new IllegalArgumentException("Unknown column: " + column);
-    }
-
-    @Override
-    void setBaseBits(BitSet bitset) {
-        bitset.set(BASE_LAYER_INDEX);
-    }
-
-    @Override
-    public void setAllNewColumns(BitSet bitset) {
-        bitset.set(BASE_LAYER_INDEX);
-    }
-
-    @Override
-    void populateModifiedColumnSetRecurse(ModifiedColumnSet mcsBuilder, Set<String> remainingDepsToSatisfy) {
-        mcsBuilder.setAll(remainingDepsToSatisfy.toArray(CollectionUtil.ZERO_LENGTH_STRING_ARRAY));
-    }
-
-    @Override
-    final Map<String, ColumnSource<?>> getColumnSourcesRecurse(GetMode mode) {
-        // We specifically return a LinkedHashMap so the columns get populated in order
-        final Map<String, ColumnSource<?>> result = new LinkedHashMap<>();
-        if (mode == GetMode.All || (mode == GetMode.Published && publishTheseSources)) {
-            result.putAll(sources);
-        }
-        return result;
-    }
-
-    @Override
-    public void applyUpdate(TableUpdate upstream, RowSet toClear, UpdateHelper helper, JobScheduler jobScheduler,
-            @Nullable LivenessNode liveResultOwner, SelectLayerCompletionHandler onCompletion) {
-        // nothing to do at the base layer
-        onCompletion.onLayerCompleted(BASE_LAYER_INDEX);
-    }
-
-    @Override
-    final Map<String, Set<String>> calcDependsOnRecurse(boolean forcePublishAllSources) {
-        final Map<String, Set<String>> result = new HashMap<>();
-        if (publishTheseSources || forcePublishAllSources) {
-            for (final String col : sources.keySet()) {
-                result.computeIfAbsent(col, dummy -> new HashSet<>()).add(col);
-            }
-        }
-        return result;
-    }
-
-    @Override
-    public SelectAndViewAnalyzer getInner() {
-        return null;
-    }
-
-    @Override
-    public void startTrackingPrev() {
-        // nothing to do
-    }
-
-    @Override
-    public LogOutput append(LogOutput logOutput) {
-        return logOutput.append("{BaseLayer").append(", layerIndex=").append(getLayerIndex()).append("}");
-    }
-
-    @Override
-    public boolean allowCrossColumnParallelization() {
-        return true;
-    }
-}
diff --git a/engine/table/src/main/java/io/deephaven/engine/table/impl/select/analyzers/ConstantColumnLayer.java b/engine/table/src/main/java/io/deephaven/engine/table/impl/select/analyzers/ConstantColumnLayer.java
index c5eff7f3132..fdcb877e752 100644
--- a/engine/table/src/main/java/io/deephaven/engine/table/impl/select/analyzers/ConstantColumnLayer.java
+++ b/engine/table/src/main/java/io/deephaven/engine/table/impl/select/analyzers/ConstantColumnLayer.java
@@ -5,41 +5,27 @@
 
 import io.deephaven.base.log.LogOutput;
 import io.deephaven.chunk.attributes.Values;
-import io.deephaven.engine.liveness.LivenessNode;
 import io.deephaven.engine.rowset.RowSequence;
-import io.deephaven.engine.rowset.RowSet;
 import io.deephaven.engine.rowset.RowSetFactory;
 import io.deephaven.engine.table.ChunkSource;
 import io.deephaven.engine.table.ModifiedColumnSet;
-import io.deephaven.engine.table.TableUpdate;
 import io.deephaven.engine.table.WritableColumnSource;
 import io.deephaven.engine.table.impl.select.SelectColumn;
 import io.deephaven.engine.table.impl.select.VectorChunkAdapter;
-import io.deephaven.engine.table.impl.util.JobScheduler;
-import org.jetbrains.annotations.Nullable;
-
-import java.util.Arrays;
-import java.util.BitSet;
 
 public class ConstantColumnLayer extends SelectOrViewColumnLayer {
-    private final BitSet dependencyBitSet;
-    private final boolean flattenedResult;
-    private final boolean alreadyFlattenedSources;
 
     ConstantColumnLayer(
-            SelectAndViewAnalyzer inner,
-            String name,
-            SelectColumn sc,
-            WritableColumnSource<?> ws,
-            String[] deps,
-            ModifiedColumnSet mcsBuilder,
-            boolean flattenedResult,
-            boolean alreadyFlattenedSources) {
-        super(inner, name, sc, ws, null, deps, mcsBuilder);
-        this.dependencyBitSet = new BitSet();
-        this.flattenedResult = flattenedResult;
-        this.alreadyFlattenedSources = alreadyFlattenedSources;
-        Arrays.stream(deps).mapToInt(inner::getLayerIndexFor).forEach(dependencyBitSet::set);
+            final SelectAndViewAnalyzer.AnalyzerContext context,
+            final SelectColumn sc,
+            final WritableColumnSource<?> ws,
+            final String[] deps,
+            final ModifiedColumnSet mcsBuilder) {
+        super(context, sc, ws, null, deps, mcsBuilder);
+        if (sc.recomputeOnModifiedRow()) {
+            throw new IllegalArgumentException(
+                    "SelectColumn may not have alwaysEvaluate set for a constant column: " + sc);
+        }
         initialize(ws);
     }
 
@@ -60,38 +46,17 @@ private void initialize(final WritableColumnSource<?> writableSource) {
     }
 
     @Override
-    public void applyUpdate(final TableUpdate upstream, final RowSet toClear, final UpdateHelper helper,
-            final JobScheduler jobScheduler, @Nullable final LivenessNode liveResultOwner,
-            final SelectLayerCompletionHandler onCompletion) {
-        // Nothing to do at this level, but need to recurse because my inner layers might need to be called (e.g.
-        // because they are SelectColumnLayers)
-        inner.applyUpdate(upstream, toClear, helper, jobScheduler, liveResultOwner,
-                new SelectLayerCompletionHandler(dependencyBitSet, onCompletion) {
-                    @Override
-                    public void onAllRequiredColumnsCompleted() {
-                        // we don't need to do anything specific here; our result value is constant
-                        onCompletion.onLayerCompleted(getLayerIndex());
-                    }
-                });
-    }
-
-    @Override
-    public LogOutput append(LogOutput logOutput) {
-        return logOutput.append("{ConstantColumnLayer: ").append(selectColumn.toString()).append("}");
-    }
-
-    @Override
-    public boolean flattenedResult() {
-        return flattenedResult;
+    public boolean hasRefreshingLogic() {
+        return false;
     }
 
     @Override
-    public boolean alreadyFlattenedSources() {
-        return alreadyFlattenedSources;
+    boolean allowCrossColumnParallelization() {
+        return true;
     }
 
     @Override
-    public boolean allowCrossColumnParallelization() {
-        return inner.allowCrossColumnParallelization();
+    public LogOutput append(LogOutput logOutput) {
+        return logOutput.append("{ConstantColumnLayer: ").append(selectColumn.toString()).append("}");
     }
 }
diff --git a/engine/table/src/main/java/io/deephaven/engine/table/impl/select/analyzers/DependencyLayerBase.java b/engine/table/src/main/java/io/deephaven/engine/table/impl/select/analyzers/DependencyLayerBase.java
index 67fa89b424a..7bd050e9c10 100644
--- a/engine/table/src/main/java/io/deephaven/engine/table/impl/select/analyzers/DependencyLayerBase.java
+++ b/engine/table/src/main/java/io/deephaven/engine/table/impl/select/analyzers/DependencyLayerBase.java
@@ -3,7 +3,6 @@
 //
 package io.deephaven.engine.table.impl.select.analyzers;
 
-import io.deephaven.engine.table.ColumnDefinition;
 import io.deephaven.vector.Vector;
 import io.deephaven.engine.table.ModifiedColumnSet;
 import io.deephaven.engine.table.impl.select.SelectColumn;
@@ -11,75 +10,41 @@
 
 import java.util.*;
 
-public abstract class DependencyLayerBase extends SelectAndViewAnalyzer {
-    final SelectAndViewAnalyzer inner;
+public abstract class DependencyLayerBase extends SelectAndViewAnalyzer.Layer {
     final String name;
     final SelectColumn selectColumn;
     final boolean selectColumnHoldsVector;
     final ColumnSource<?> columnSource;
-    // probably don't need this any more
-    private final String[] dependencies;
     final ModifiedColumnSet myModifiedColumnSet;
-
-    DependencyLayerBase(SelectAndViewAnalyzer inner, String name, SelectColumn selectColumn,
-            ColumnSource<?> columnSource,
-            String[] dependencies, ModifiedColumnSet mcsBuilder) {
-        super(inner.getLayerIndex() + 1);
-        this.inner = inner;
-        this.name = name;
+    final BitSet myLayerDependencySet;
+
+    DependencyLayerBase(
+            final SelectAndViewAnalyzer.AnalyzerContext context,
+            final SelectColumn selectColumn,
+            final ColumnSource<?> columnSource,
+            final String[] dependencies,
+            final ModifiedColumnSet mcsBuilder) {
+        super(context.getNextLayerIndex());
+        this.name = selectColumn.getName();
         this.selectColumn = selectColumn;
         selectColumnHoldsVector = Vector.class.isAssignableFrom(selectColumn.getReturnedType());
         this.columnSource = columnSource;
-        this.dependencies = dependencies;
-        final Set<String> remainingDepsToSatisfy = new HashSet<>(Arrays.asList(dependencies));
-        inner.populateModifiedColumnSetRecurse(mcsBuilder, remainingDepsToSatisfy);
-        this.myModifiedColumnSet = mcsBuilder;
-    }
-
-    @Override
-    void populateModifiedColumnSetRecurse(ModifiedColumnSet mcsBuilder, Set<String> remainingDepsToSatisfy) {
-        // Later-defined columns override earlier-defined columns. So we satisfy column dependencies "on the way
-        // down" the recursion.
-        if (remainingDepsToSatisfy.remove(name)) {
-            // Caller had a dependency on us, so caller gets our dependencies
-            mcsBuilder.setAll(myModifiedColumnSet);
-        }
-        inner.populateModifiedColumnSetRecurse(mcsBuilder, remainingDepsToSatisfy);
-    }
-
-    @Override
-    final Map<String, Set<String>> calcDependsOnRecurse(boolean forcePublishAllResources) {
-        final Map<String, Set<String>> result = inner.calcDependsOnRecurse(forcePublishAllResources);
-        final Set<String> thisResult = new HashSet<>();
-        for (final String dep : dependencies) {
-            final Set<String> innerDependencies = result.get(dep);
-            if (innerDependencies == null) {
-                // There are no further expansions of 'dep', so add it as a dependency.
-                thisResult.add(dep);
-            } else {
-                // Instead of adding 'dep', add what 'dep' expands to.
-                thisResult.addAll(innerDependencies);
-            }
+        context.populateParentDependenciesMCS(mcsBuilder, dependencies);
+        if (selectColumn.recomputeOnModifiedRow()) {
+            mcsBuilder.setAll(ModifiedColumnSet.ALL);
         }
-        result.put(name, thisResult);
-        return result;
-    }
-
-    @Override
-    public SelectAndViewAnalyzer getInner() {
-        return inner;
+        this.myModifiedColumnSet = mcsBuilder;
+        this.myLayerDependencySet = new BitSet();
+        context.populateLayerDependencySet(myLayerDependencySet, dependencies);
     }
 
     @Override
-    int getLayerIndexFor(String column) {
-        if (name.equals(column)) {
-            return getLayerIndex();
-        }
-        return inner.getLayerIndexFor(column);
+    Set<String> getLayerColumnNames() {
+        return Set.of(name);
     }
 
     @Override
-    void setBaseBits(BitSet bitset) {
-        inner.setBaseBits(bitset);
+    public ModifiedColumnSet getModifiedColumnSet() {
+        return myModifiedColumnSet;
     }
 }
diff --git a/engine/table/src/main/java/io/deephaven/engine/table/impl/select/analyzers/PreserveColumnLayer.java b/engine/table/src/main/java/io/deephaven/engine/table/impl/select/analyzers/PreserveColumnLayer.java
index 8d687cdc8c8..9b0f4b690f7 100644
--- a/engine/table/src/main/java/io/deephaven/engine/table/impl/select/analyzers/PreserveColumnLayer.java
+++ b/engine/table/src/main/java/io/deephaven/engine/table/impl/select/analyzers/PreserveColumnLayer.java
@@ -4,69 +4,41 @@
 package io.deephaven.engine.table.impl.select.analyzers;
 
 import io.deephaven.base.log.LogOutput;
-import io.deephaven.engine.liveness.LivenessNode;
-import io.deephaven.engine.table.TableUpdate;
 import io.deephaven.engine.table.ModifiedColumnSet;
 import io.deephaven.engine.table.impl.select.SelectColumn;
 import io.deephaven.engine.table.ColumnSource;
-import io.deephaven.engine.rowset.RowSet;
-import io.deephaven.engine.table.impl.util.JobScheduler;
-import org.jetbrains.annotations.Nullable;
 
-import java.util.Arrays;
-import java.util.BitSet;
 import java.util.Map;
 
 /**
  * A layer that copies a column from our input to our output.
- *
+ * <p>
  * {@implNote This class is part of the Deephaven engine, and not intended for direct use.}
  */
 final public class PreserveColumnLayer extends DependencyLayerBase {
-    private final BitSet dependencyBitSet;
 
-    PreserveColumnLayer(SelectAndViewAnalyzer inner, String name, SelectColumn sc, ColumnSource<?> cs, String[] deps,
-            ModifiedColumnSet mcsBuilder) {
-        super(inner, name, sc, cs, deps, mcsBuilder);
-        this.dependencyBitSet = new BitSet();
-        Arrays.stream(deps).mapToInt(inner::getLayerIndexFor).forEach(dependencyBitSet::set);
+    PreserveColumnLayer(
+            final SelectAndViewAnalyzer.AnalyzerContext context,
+            final SelectColumn sc,
+            final ColumnSource<?> cs,
+            final String[] deps,
+            final ModifiedColumnSet mcsBuilder) {
+        super(context, sc, cs, deps, mcsBuilder);
     }
 
     @Override
-    public void applyUpdate(TableUpdate upstream, RowSet toClear, UpdateHelper helper, JobScheduler jobScheduler,
-            @Nullable LivenessNode liveResultOwner, SelectLayerCompletionHandler onCompletion) {
-        // Nothing to do at this level, but need to recurse because my inner layers might need to be called (e.g.
-        // because they are SelectColumnLayers)
-        inner.applyUpdate(upstream, toClear, helper, jobScheduler, liveResultOwner,
-                new SelectLayerCompletionHandler(dependencyBitSet, onCompletion) {
-                    @Override
-                    public void onAllRequiredColumnsCompleted() {
-                        // we don't need to do anything specific here
-                        onCompletion.onLayerCompleted(getLayerIndex());
-                    }
-                });
+    public boolean hasRefreshingLogic() {
+        return false;
     }
 
     @Override
-    Map<String, ColumnSource<?>> getColumnSourcesRecurse(GetMode mode) {
-        // our column is not a new column, so we need to make sure that we do not double enable previous tracking
-        final Map<String, ColumnSource<?>> result = inner.getColumnSourcesRecurse(mode);
-        switch (mode) {
-            case New:
-                // we have no new sources
-                break;
-            case Published:
-            case All:
-                result.put(name, columnSource);
-                break;
-        }
-        return result;
+    void populateColumnSources(final Map<String, ColumnSource<?>> result) {
+        result.put(name, columnSource);
     }
 
     @Override
-    public void startTrackingPrev() {
-        // nothing to do, here but the inner needs to be called
-        inner.startTrackingPrev();
+    boolean allowCrossColumnParallelization() {
+        return true;
     }
 
     @Override
@@ -74,24 +46,4 @@ public LogOutput append(LogOutput logOutput) {
         return logOutput.append("{PreserveColumnLayer: ").append(name).append(", layerIndex=").append(getLayerIndex())
                 .append("}");
     }
-
-    @Override
-    public boolean flattenedResult() {
-        // preserve layer is only flattened if the inner is flattened
-        // the "flattenedResult" means that we are flattening the table as part of select. For a pre-existing column, we
-        // could not preserve a layer while flattening, but if we are preserving a newly generated column; it is valid
-        // for the result to have been flattened as part of select.
-        return inner.flattenedResult();
-    }
-
-    @Override
-    public boolean alreadyFlattenedSources() {
-        // a preserve layer is only already flattened if the inner is already flattened
-        return inner.alreadyFlattenedSources();
-    }
-
-    @Override
-    public boolean allowCrossColumnParallelization() {
-        return inner.allowCrossColumnParallelization();
-    }
 }
diff --git a/engine/table/src/main/java/io/deephaven/engine/table/impl/select/analyzers/RedirectionLayer.java b/engine/table/src/main/java/io/deephaven/engine/table/impl/select/analyzers/RedirectionLayer.java
index 8a33acfa00d..46fe6ea4c31 100644
--- a/engine/table/src/main/java/io/deephaven/engine/table/impl/select/analyzers/RedirectionLayer.java
+++ b/engine/table/src/main/java/io/deephaven/engine/table/impl/select/analyzers/RedirectionLayer.java
@@ -4,82 +4,83 @@
 package io.deephaven.engine.table.impl.select.analyzers;
 
 import io.deephaven.base.log.LogOutput;
-import io.deephaven.base.verify.Assert;
 import io.deephaven.engine.liveness.LivenessNode;
 import io.deephaven.engine.rowset.*;
 import io.deephaven.engine.rowset.RowSetFactory;
-import io.deephaven.engine.table.TableUpdate;
-import io.deephaven.engine.table.ModifiedColumnSet;
 import io.deephaven.engine.table.ColumnSource;
+import io.deephaven.engine.table.ModifiedColumnSet;
+import io.deephaven.engine.table.TableUpdate;
 import io.deephaven.engine.table.impl.util.*;
 import io.deephaven.util.mutable.MutableLong;
 import org.apache.commons.lang3.mutable.MutableObject;
 import org.jetbrains.annotations.Nullable;
 
 import java.util.*;
+import java.util.function.Consumer;
 
 /**
  * A layer that maintains the row redirection for future SelectColumnLayers.
- *
+ * <p>
  * {@implNote This class is part of the Deephaven engine, and not intended for direct use.}
  */
-public final class RedirectionLayer extends SelectAndViewAnalyzer {
-    private final SelectAndViewAnalyzer inner;
+public final class RedirectionLayer extends SelectAndViewAnalyzer.Layer {
     private final TrackingRowSet resultRowSet;
     private final WritableRowRedirection rowRedirection;
     private final WritableRowSet freeValues = RowSetFactory.empty();
+    private final BitSet layerDependencySet = new BitSet();
     private long maxInnerIndex;
 
-    RedirectionLayer(SelectAndViewAnalyzer inner, TrackingRowSet resultRowSet, WritableRowRedirection rowRedirection) {
-        super(REDIRECTION_LAYER_INDEX);
-        Assert.eq(inner.getLayerIndex(), "inner.getLayerIndex()", BASE_LAYER_INDEX);
-        this.inner = inner;
+    RedirectionLayer(
+            final SelectAndViewAnalyzer.AnalyzerContext context,
+            final TrackingRowSet resultRowSet,
+            final WritableRowRedirection rowRedirection) {
+        super(context.getNextLayerIndex());
         this.resultRowSet = resultRowSet;
         this.rowRedirection = rowRedirection;
         this.maxInnerIndex = -1;
     }
 
     @Override
-    int getLayerIndexFor(String column) {
-        // Result columns' applyUpdate depend on the result of the redirection.
-        Assert.eq(inner.getLayerIndexFor(column), "inner.getLayerIndexFor(column)", BASE_LAYER_INDEX);
-        return REDIRECTION_LAYER_INDEX;
+    Set<String> getLayerColumnNames() {
+        return Set.of();
     }
 
     @Override
-    void setBaseBits(BitSet bitset) {
-        inner.setBaseBits(bitset);
-        bitset.set(REDIRECTION_LAYER_INDEX);
+    void populateColumnSources(final Map<String, ColumnSource<?>> result) {
+        // we don't generate any column sources, so we don't need to do anything here
     }
 
     @Override
-    public void populateModifiedColumnSetRecurse(ModifiedColumnSet mcsBuilder, Set<String> remainingDepsToSatisfy) {
-        inner.populateModifiedColumnSetRecurse(mcsBuilder, remainingDepsToSatisfy);
+    ModifiedColumnSet getModifiedColumnSet() {
+        return ModifiedColumnSet.EMPTY;
     }
 
     @Override
-    public Map<String, ColumnSource<?>> getColumnSourcesRecurse(GetMode mode) {
-        return inner.getColumnSourcesRecurse(mode);
+    BitSet getLayerDependencySet() {
+        return layerDependencySet;
     }
 
     @Override
-    public void applyUpdate(TableUpdate upstream, RowSet toClear, UpdateHelper helper, JobScheduler jobScheduler,
-            @Nullable LivenessNode liveResultOwner, SelectLayerCompletionHandler onCompletion) {
-        final BitSet baseLayerBitSet = new BitSet();
-        inner.setBaseBits(baseLayerBitSet);
-        inner.applyUpdate(upstream, toClear, helper, jobScheduler, liveResultOwner,
-                new SelectLayerCompletionHandler(baseLayerBitSet, onCompletion) {
-                    @Override
-                    public void onAllRequiredColumnsCompleted() {
-                        // we only have a base layer underneath us, so we do not care about the bitSet; it is always
-                        // empty
-                        doApplyUpdate(upstream, toClear, helper, onCompletion);
-                    }
-                });
+    boolean allowCrossColumnParallelization() {
+        return true;
+    }
+
+    @Override
+    public Runnable createUpdateHandler(
+            final TableUpdate upstream,
+            final RowSet toClear,
+            final SelectAndViewAnalyzer.UpdateHelper helper,
+            final JobScheduler jobScheduler,
+            @Nullable final LivenessNode liveResultOwner,
+            final Runnable onSuccess,
+            final Consumer<Exception> onError) {
+        // note that we process this layer directly because all subsequent layers depend on it
+        return () -> doApplyUpdate(upstream, onSuccess);
     }
 
-    private void doApplyUpdate(TableUpdate upstream, RowSet toClear, UpdateHelper helper,
-            SelectLayerCompletionHandler onCompletion) {
+    private void doApplyUpdate(
+            final TableUpdate upstream,
+            final Runnable onSuccess) {
         // we need to remove the removed values from our row redirection, and add them to our free RowSet; so that
         // updating tables will not consume more space over the course of a day for abandoned rows
         final RowSetBuilderRandom innerToFreeBuilder = RowSetFactory.builderRandom();
@@ -150,32 +151,16 @@ private void doApplyUpdate(TableUpdate upstream, RowSet toClear, UpdateHelper he
             freeValues.removeRange(0, lastAllocated.get());
         }
 
-        onCompletion.onLayerCompleted(REDIRECTION_LAYER_INDEX);
-    }
-
-    @Override
-    public Map<String, Set<String>> calcDependsOnRecurse(boolean forcePublishAllResources) {
-        return inner.calcDependsOnRecurse(forcePublishAllResources);
-    }
-
-    @Override
-    public SelectAndViewAnalyzer getInner() {
-        return inner;
+        onSuccess.run();
     }
 
     @Override
     public void startTrackingPrev() {
         rowRedirection.startTrackingPrevValues();
-        inner.startTrackingPrev();
     }
 
     @Override
     public LogOutput append(LogOutput logOutput) {
         return logOutput.append("{RedirectionLayer").append(", layerIndex=").append(getLayerIndex()).append("}");
     }
-
-    @Override
-    public boolean allowCrossColumnParallelization() {
-        return inner.allowCrossColumnParallelization();
-    }
 }
diff --git a/engine/table/src/main/java/io/deephaven/engine/table/impl/select/analyzers/SelectAndViewAnalyzer.java b/engine/table/src/main/java/io/deephaven/engine/table/impl/select/analyzers/SelectAndViewAnalyzer.java
index b2a5907e32e..6efaf2425b2 100644
--- a/engine/table/src/main/java/io/deephaven/engine/table/impl/select/analyzers/SelectAndViewAnalyzer.java
+++ b/engine/table/src/main/java/io/deephaven/engine/table/impl/select/analyzers/SelectAndViewAnalyzer.java
@@ -3,47 +3,60 @@
 //
 package io.deephaven.engine.table.impl.select.analyzers;
 
+import gnu.trove.map.TObjectIntMap;
+import gnu.trove.map.hash.TObjectIntHashMap;
 import io.deephaven.base.Pair;
+import io.deephaven.base.log.LogOutput;
 import io.deephaven.base.log.LogOutputAppendable;
-import io.deephaven.datastructures.util.CollectionUtil;
+import io.deephaven.base.verify.Assert;
 import io.deephaven.engine.liveness.LivenessNode;
 import io.deephaven.engine.rowset.RowSet;
 import io.deephaven.engine.rowset.RowSetFactory;
+import io.deephaven.engine.rowset.RowSetShiftData;
 import io.deephaven.engine.rowset.TrackingRowSet;
 import io.deephaven.engine.table.*;
 import io.deephaven.engine.table.impl.MatchPair;
 import io.deephaven.engine.table.impl.QueryCompilerRequestProcessor;
 import io.deephaven.engine.table.impl.QueryTable;
+import io.deephaven.engine.table.impl.ShiftedColumnsFactory;
+import io.deephaven.engine.table.impl.TableUpdateImpl;
 import io.deephaven.engine.table.impl.select.FormulaColumn;
 import io.deephaven.engine.table.impl.select.SelectColumn;
 import io.deephaven.engine.table.impl.select.SourceColumn;
 import io.deephaven.engine.table.impl.select.SwitchColumn;
 import io.deephaven.engine.table.impl.sources.InMemoryColumnSource;
+import io.deephaven.engine.table.impl.sources.PossiblyImmutableColumnSource;
+import io.deephaven.engine.table.impl.sources.RedirectedColumnSource;
 import io.deephaven.engine.table.impl.sources.SingleValueColumnSource;
 import io.deephaven.engine.table.impl.sources.WritableRedirectedColumnSource;
 import io.deephaven.engine.table.impl.util.InverseWrappedRowSetRowRedirection;
 import io.deephaven.engine.table.impl.util.JobScheduler;
 import io.deephaven.engine.table.impl.util.RowRedirection;
+import io.deephaven.engine.table.impl.util.WrappedRowSetRowRedirection;
 import io.deephaven.engine.table.impl.util.WritableRowRedirection;
 import io.deephaven.engine.updategraph.UpdateGraph;
 import io.deephaven.io.log.impl.LogOutputStringImpl;
 import io.deephaven.util.SafeCloseable;
 import io.deephaven.util.SafeCloseablePair;
 import io.deephaven.vector.Vector;
+import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
 import java.util.*;
-import java.util.concurrent.CompletableFuture;
+import java.util.concurrent.locks.ReentrantLock;
 import java.util.function.Consumer;
 import java.util.stream.Stream;
 
-public abstract class SelectAndViewAnalyzer implements LogOutputAppendable {
+public class SelectAndViewAnalyzer implements LogOutputAppendable {
     private static final Consumer<ColumnSource<?>> NOOP = ignore -> {
     };
 
     public enum Mode {
         VIEW_LAZY, VIEW_EAGER, SELECT_STATIC, SELECT_REFRESHING, SELECT_REDIRECTED_REFRESHING, SELECT_REDIRECTED_STATIC
     }
+    public enum UpdateFlavor {
+        Select, View, Update, UpdateView, LazyUpdate
+    }
 
     public static void initializeSelectColumns(
             final Map<String, ColumnDefinition<?>> parentColumnMap,
@@ -66,26 +79,23 @@ public static void initializeSelectColumns(
         }
     }
 
-    public static SelectAndViewAnalyzerWrapper create(
-            QueryTable sourceTable, Mode mode, Map<String, ColumnSource<?>> columnSources,
-            TrackingRowSet rowSet, ModifiedColumnSet parentMcs, boolean publishTheseSources, boolean useShiftedColumns,
-            SelectColumn... selectColumns) {
-        return create(sourceTable, mode, columnSources, rowSet, parentMcs, publishTheseSources, useShiftedColumns,
-                true, selectColumns);
-    }
-
-    public static SelectAndViewAnalyzerWrapper create(
-            final QueryTable sourceTable,
+    public static AnalyzerContext createContext(
+            final QueryTable parentTable,
             final Mode mode,
-            final Map<String, ColumnSource<?>> columnSources,
-            TrackingRowSet rowSet,
-            final ModifiedColumnSet parentMcs,
-            final boolean publishTheseSources,
+            final boolean publishParentSources,
             boolean useShiftedColumns,
-            final boolean allowInternalFlatten,
             final SelectColumn... selectColumns) {
-        final UpdateGraph updateGraph = sourceTable.getUpdateGraph();
-        SelectAndViewAnalyzer analyzer = createBaseLayer(columnSources, publishTheseSources);
+        final UpdateGraph updateGraph = parentTable.getUpdateGraph();
+
+        final Map<String, ColumnSource<?>> columnSources = parentTable.getColumnSourceMap();
+        final TrackingRowSet rowSet = parentTable.getRowSet();
+
+        final boolean parentIsFlat = parentTable.isFlat();
+        final boolean flatResult = !parentIsFlat
+                && (columnSources.isEmpty() || !publishParentSources)
+                && mode == Mode.SELECT_STATIC;
+        final AnalyzerContext context = new AnalyzerContext(parentTable, publishParentSources, flatResult);
+
         final Map<String, ColumnDefinition<?>> columnDefinitions = new LinkedHashMap<>();
         final RowRedirection rowRedirection;
         if (mode == Mode.SELECT_REDIRECTED_STATIC) {
@@ -93,19 +103,12 @@ public static SelectAndViewAnalyzerWrapper create(
         } else if (mode == Mode.SELECT_REDIRECTED_REFRESHING && rowSet.size() < Integer.MAX_VALUE) {
             final WritableRowRedirection writableRowRedirection =
                     WritableRowRedirection.FACTORY.createRowRedirection(rowSet.intSize());
-            analyzer = analyzer.createRedirectionLayer(rowSet, writableRowRedirection);
+            context.addLayer(new RedirectionLayer(context, rowSet, writableRowRedirection));
             rowRedirection = writableRowRedirection;
         } else {
             rowRedirection = null;
         }
 
-        List<SelectColumn> processedCols = new LinkedList<>();
-        List<SelectColumn> remainingCols = null;
-        FormulaColumn shiftColumn = null;
-        boolean shiftColumnHasPositiveOffset = false;
-
-        final HashSet<String> resultColumns = new HashSet<>();
-
         // First pass to initialize all columns and to compile formulas in one batch.
         final QueryCompilerRequestProcessor.BatchProcessor compilationProcessor = QueryCompilerRequestProcessor.batch();
         for (Map.Entry<String, ColumnSource<?>> entry : columnSources.entrySet()) {
@@ -115,9 +118,10 @@ public static SelectAndViewAnalyzerWrapper create(
             columnDefinitions.put(name, cd);
         }
 
+        final Set<String> resultColumnNames = new HashSet<>();
         for (final SelectColumn sc : selectColumns) {
-            if (remainingCols != null) {
-                remainingCols.add(sc);
+            if (context.remainingCols != null) {
+                context.remainingCols.add(sc);
                 continue;
             }
 
@@ -127,55 +131,50 @@ public static SelectAndViewAnalyzerWrapper create(
             columnDefinitions.put(sc.getName(), cd);
 
             if (useShiftedColumns && hasConstantArrayAccess(sc)) {
-                remainingCols = new LinkedList<>();
-                shiftColumn = sc instanceof FormulaColumn
+                context.remainingCols = new LinkedList<>();
+                context.shiftColumn = sc instanceof FormulaColumn
                         ? (FormulaColumn) sc
                         : (FormulaColumn) ((SwitchColumn) sc).getRealColumn();
-                shiftColumnHasPositiveOffset = hasPositiveOffsetConstantArrayAccess(sc);
+                context.shiftColumnHasPositiveOffset = hasPositiveOffsetConstantArrayAccess(sc);
                 continue;
             }
 
-            processedCols.add(sc);
+            // In our first pass, determine whether any columns will be preserved so that we don't prematurely flatten.
+            final SourceColumn realColumn = tryToGetSourceColumn(sc);
+
+            if (realColumn != null && !resultColumnNames.contains(realColumn.getSourceName())) {
+                // if we are preserving a column, then we cannot change key space
+                context.flatResult &= !shouldPreserve(columnSources.get(realColumn.getSourceName()));
+            }
+
+            // TODO (deephaven#5760): If layers may define more than one column, we'll need to add all of them here.
+            resultColumnNames.add(sc.getName());
+
+            context.processedCols.add(sc);
         }
 
         compilationProcessor.compile();
 
         // Second pass builds the analyzer and destination columns
-        final TrackingRowSet originalRowSet = rowSet;
-        boolean flatResult = rowSet.isFlat();
-        // if we preserve a column, we set this to false
-        boolean flattenedResult = !flatResult
-                && allowInternalFlatten
-                && (columnSources.isEmpty() || !publishTheseSources)
-                && mode == Mode.SELECT_STATIC;
-        int numberOfInternallyFlattenedColumns = 0;
-
         final HashMap<String, ColumnSource<?>> resultAlias = new HashMap<>();
-        for (final SelectColumn sc : processedCols) {
-
-            sc.initInputs(rowSet, analyzer.getAllColumnSources());
+        for (final SelectColumn sc : context.processedCols) {
 
-            // When flattening the result, intermediate columns generate results in position space. When we discover
-            // that a select column depends on an intermediate result, then we must flatten all parent columns so
-            // that all dependent columns are in the same result-key space.
-            if (!flatResult && flattenedResult && Stream.concat(sc.getColumns().stream(), sc.getColumnArrays().stream())
-                    .anyMatch(resultColumns::contains)) {
-                analyzer = analyzer.createStaticFlattenLayer(rowSet);
-                rowSet = RowSetFactory.flat(rowSet.size()).toTracking();
-                flatResult = true;
+            // if this select column depends on result column then its updates must happen in result-key-space
+            // note: if flatResult is true then we are not preserving any parent columns
+            final boolean useResultKeySpace = context.flatResult
+                    && Stream.concat(sc.getColumns().stream(), sc.getColumnArrays().stream())
+                            .anyMatch(columnName -> context.getLayerIndexFor(columnName) != Layer.PARENT_TABLE_INDEX);
 
-                // we must re-initialize the column inputs as they may have changed post-flatten
-                sc.initInputs(rowSet, analyzer.getAllColumnSources());
-            }
+            sc.initInputs(rowSet, useResultKeySpace ? context.allSourcesInResultKeySpace : context.allSources);
 
-            resultColumns.add(sc.getName());
-            // this shadows any known alias
+            // TODO (deephaven-core#5760): If layers may define more than one column, we'll need to fix resultAlias.
+            // new columns shadow known aliases
             resultAlias.remove(sc.getName());
 
             final Stream<String> allDependencies =
                     Stream.concat(sc.getColumns().stream(), sc.getColumnArrays().stream());
             final String[] distinctDeps = allDependencies.distinct().toArray(String[]::new);
-            final ModifiedColumnSet mcsBuilder = new ModifiedColumnSet(parentMcs);
+            final ModifiedColumnSet mcsBuilder = new ModifiedColumnSet(parentTable.getModifiedColumnSetForUpdates());
 
             if (useShiftedColumns && hasConstantArrayAccess(sc)) {
                 // we use the first shifted column to split between processed columns and remaining columns
@@ -184,104 +183,78 @@ public static SelectAndViewAnalyzerWrapper create(
 
             // shifted columns appear to not be safe for refresh, so we do not validate them until they are rewritten
             // using the intermediary shifted column
-            if (sourceTable.isRefreshing()) {
-                sc.validateSafeForRefresh(sourceTable);
+            if (parentTable.isRefreshing()) {
+                sc.validateSafeForRefresh(parentTable);
             }
 
             if (hasConstantValue(sc)) {
                 final WritableColumnSource<?> constViewSource =
                         SingleValueColumnSource.getSingleValueColumnSource(sc.getReturnedType());
-                analyzer = analyzer.createLayerForConstantView(
-                        sc.getName(), sc, constViewSource, distinctDeps, mcsBuilder, flattenedResult,
-                        flatResult && flattenedResult);
+                context.addLayer(new ConstantColumnLayer(context, sc, constViewSource, distinctDeps, mcsBuilder));
                 continue;
             }
 
-            final SourceColumn realColumn;
-            if (sc instanceof SourceColumn) {
-                realColumn = (SourceColumn) sc;
-            } else if ((sc instanceof SwitchColumn) && ((SwitchColumn) sc).getRealColumn() instanceof SourceColumn) {
-                realColumn = (SourceColumn) ((SwitchColumn) sc).getRealColumn();
-            } else {
-                realColumn = null;
-            }
-
-            if (realColumn != null && shouldPreserve(sc)) {
-                boolean sourceIsNew = resultColumns.contains(realColumn.getSourceName());
-                if (!sourceIsNew) {
-                    if (numberOfInternallyFlattenedColumns > 0) {
-                        // we must preserve this column, but have already created an analyzer for the internally
-                        // flattened column, therefore must start over without permitting internal flattening
-                        return create(sourceTable, mode, columnSources, originalRowSet, parentMcs, publishTheseSources,
-                                useShiftedColumns, false, selectColumns);
-                    } else {
-                        // we can not flatten future columns because we are preserving a column that may not be flat
-                        flattenedResult = false;
-                    }
-                }
-
-                analyzer = analyzer.createLayerForPreserve(
-                        sc.getName(), sc, sc.getDataView(), distinctDeps, mcsBuilder);
-
-                continue;
-            }
-
-            // look for an existing alias that can be preserved instead
+            final SourceColumn realColumn = tryToGetSourceColumn(sc);
             if (realColumn != null) {
+                if (shouldPreserve(sc.getDataView())) {
+                    context.addLayer(new PreserveColumnLayer(context, sc, sc.getDataView(), distinctDeps, mcsBuilder));
+                    continue;
+                }
+                // look for an existing alias that can be preserved instead
                 final ColumnSource<?> alias = resultAlias.get(realColumn.getSourceName());
                 if (alias != null) {
-                    analyzer = analyzer.createLayerForPreserve(sc.getName(), sc, alias, distinctDeps, mcsBuilder);
+                    context.addLayer(new PreserveColumnLayer(context, sc, alias, distinctDeps, mcsBuilder));
                     continue;
                 }
             }
 
-            // if this is a source column, then results are eligible for aliasing
+            // if this is a SourceColumn, then results are eligible for aliasing
             final Consumer<ColumnSource<?>> maybeCreateAlias = realColumn == null ? NOOP
                     : cs -> resultAlias.put(realColumn.getSourceName(), cs);
 
             final long targetDestinationCapacity =
-                    rowSet.isEmpty() ? 0 : (flattenedResult ? rowSet.size() : rowSet.lastRowKey() + 1);
+                    rowSet.isEmpty() ? 0 : (context.flatResult ? rowSet.size() : rowSet.lastRowKey() + 1);
             switch (mode) {
                 case VIEW_LAZY: {
                     final ColumnSource<?> viewCs = sc.getLazyView();
                     maybeCreateAlias.accept(viewCs);
-                    analyzer = analyzer.createLayerForView(sc.getName(), sc, viewCs, distinctDeps, mcsBuilder);
+                    context.addLayer(new ViewColumnLayer(context, sc, viewCs, distinctDeps, mcsBuilder));
                     break;
                 }
                 case VIEW_EAGER: {
                     final ColumnSource<?> viewCs = sc.getDataView();
                     maybeCreateAlias.accept(viewCs);
-                    analyzer = analyzer.createLayerForView(sc.getName(), sc, viewCs, distinctDeps, mcsBuilder);
+                    context.addLayer(new ViewColumnLayer(context, sc, viewCs, distinctDeps, mcsBuilder));
                     break;
                 }
                 case SELECT_STATIC: {
                     // We need to call newDestInstance because only newDestInstance has the knowledge to endow our
                     // created array with the proper componentType (in the case of Vectors).
-                    final WritableColumnSource<?> scs =
-                            flatResult || flattenedResult ? sc.newFlatDestInstance(targetDestinationCapacity)
-                                    : sc.newDestInstance(targetDestinationCapacity);
+                    final WritableColumnSource<?> scs = parentIsFlat || context.flatResult
+                            ? sc.newFlatDestInstance(targetDestinationCapacity)
+                            : sc.newDestInstance(targetDestinationCapacity);
+                    maybeSetStaticColumnSourceImmutable(scs);
                     maybeCreateAlias.accept(scs);
-                    analyzer = analyzer.createLayerForSelect(updateGraph, rowSet, sc.getName(), sc, scs, null,
-                            distinctDeps, mcsBuilder, false, flattenedResult, flatResult && flattenedResult);
-                    if (flattenedResult) {
-                        numberOfInternallyFlattenedColumns++;
-                    }
+                    context.addLayer(new SelectColumnLayer(
+                            updateGraph, rowSet, context, sc, scs, null, distinctDeps, mcsBuilder, false,
+                            useResultKeySpace));
                     break;
                 }
                 case SELECT_REDIRECTED_STATIC: {
                     final WritableColumnSource<?> underlyingSource = sc.newDestInstance(rowSet.size());
                     final WritableColumnSource<?> scs = WritableRedirectedColumnSource.maybeRedirect(
                             rowRedirection, underlyingSource, rowSet.size());
+                    maybeSetStaticColumnSourceImmutable(scs);
                     maybeCreateAlias.accept(scs);
-                    analyzer = analyzer.createLayerForSelect(updateGraph, rowSet, sc.getName(), sc, scs,
-                            underlyingSource, distinctDeps, mcsBuilder, true, false, false);
+                    context.addLayer(new SelectColumnLayer(
+                            updateGraph, rowSet, context, sc, scs, underlyingSource, distinctDeps, mcsBuilder, true,
+                            useResultKeySpace));
                     break;
                 }
                 case SELECT_REDIRECTED_REFRESHING:
                 case SELECT_REFRESHING: {
                     // We need to call newDestInstance because only newDestInstance has the knowledge to endow our
                     // created array with the proper componentType (in the case of Vectors).
-                    // TODO: use DeltaAwareColumnSource
                     WritableColumnSource<?> scs = sc.newDestInstance(targetDestinationCapacity);
                     WritableColumnSource<?> underlyingSource = null;
                     if (rowRedirection != null) {
@@ -290,8 +263,9 @@ public static SelectAndViewAnalyzerWrapper create(
                                 rowRedirection, underlyingSource, rowSet.intSize());
                     }
                     maybeCreateAlias.accept(scs);
-                    analyzer = analyzer.createLayerForSelect(updateGraph, rowSet, sc.getName(), sc, scs,
-                            underlyingSource, distinctDeps, mcsBuilder, rowRedirection != null, false, false);
+                    context.addLayer(new SelectColumnLayer(
+                            updateGraph, rowSet, context, sc, scs, underlyingSource, distinctDeps, mcsBuilder,
+                            rowRedirection != null, useResultKeySpace));
                     break;
                 }
                 default:
@@ -299,8 +273,25 @@ public static SelectAndViewAnalyzerWrapper create(
             }
         }
 
-        return new SelectAndViewAnalyzerWrapper(analyzer, shiftColumn, shiftColumnHasPositiveOffset, remainingCols,
-                processedCols);
+        return context;
+    }
+
+    private static void maybeSetStaticColumnSourceImmutable(final ColumnSource<?> columnSource) {
+        if (columnSource instanceof PossiblyImmutableColumnSource) {
+            ((PossiblyImmutableColumnSource) columnSource).setImmutable();
+        }
+    }
+
+    private static @Nullable SourceColumn tryToGetSourceColumn(final SelectColumn sc) {
+        final SourceColumn realColumn;
+        if (sc instanceof SourceColumn) {
+            realColumn = (SourceColumn) sc;
+        } else if ((sc instanceof SwitchColumn) && ((SwitchColumn) sc).getRealColumn() instanceof SourceColumn) {
+            realColumn = (SourceColumn) ((SwitchColumn) sc).getRealColumn();
+        } else {
+            realColumn = null;
+        }
+        return realColumn;
     }
 
     private static boolean hasConstantArrayAccess(final SelectColumn sc) {
@@ -344,110 +335,439 @@ private static boolean hasConstantValue(final SelectColumn sc) {
         return false;
     }
 
-    private static boolean shouldPreserve(final SelectColumn sc) {
-        // we already know sc is a SourceColumn or switches to a SourceColumn
-        final ColumnSource<?> sccs = sc.getDataView();
-        return sccs instanceof InMemoryColumnSource && ((InMemoryColumnSource) sccs).isInMemory()
-                && !Vector.class.isAssignableFrom(sc.getReturnedType());
+    private static boolean shouldPreserve(final ColumnSource<?> columnSource) {
+        return columnSource instanceof InMemoryColumnSource && ((InMemoryColumnSource) columnSource).isInMemory()
+                && !Vector.class.isAssignableFrom(columnSource.getType());
     }
 
-    static final int BASE_LAYER_INDEX = 0;
-    static final int REDIRECTION_LAYER_INDEX = 1;
+    /** The layers that make up this analyzer. */
+    private final Layer[] layers;
 
-    /**
-     * The layerIndex is used to identify each layer uniquely within the bitsets for completion.
-     */
-    private final int layerIndex;
+    /** Whether the result should be flat. */
+    private final boolean flatResult;
 
-    public SelectAndViewAnalyzer(int layerIndex) {
-        this.layerIndex = layerIndex;
-    }
+    private final BitSet requiredLayers = new BitSet();
+    private final BitSet remainingLayers = new BitSet();
 
-    int getLayerIndex() {
-        return layerIndex;
+    private SelectAndViewAnalyzer(
+            final Layer[] layers,
+            final boolean flatResult) {
+        this.layers = layers;
+        this.flatResult = flatResult;
+        for (final Layer layer : layers) {
+            if (layer.hasRefreshingLogic()) {
+                requiredLayers.set(layer.getLayerIndex());
+            } else {
+                this.layers[layer.getLayerIndex()] = null;
+            }
+        }
     }
 
-    /**
-     * Set the bits in bitset that represent the base layer and optional redirection layer. No other jobs can be
-     * executed until all of these bits are set.
-     *
-     * @param bitset the bitset to manipulate.
-     */
-    abstract void setBaseBits(BitSet bitset);
+    public final static class AnalyzerContext {
 
-    /**
-     * Set the bits in bitset that represent all the new columns. This is used to identify when the select or update
-     * operation is complete.
-     *
-     * @param bitset the bitset to manipulate.
-     */
-    public void setAllNewColumns(BitSet bitset) {
-        getInner().setAllNewColumns(bitset);
-        bitset.set(getLayerIndex());
-    }
+        /** The analyzer that we are building. */
+        private final List<Layer> layers = new ArrayList<>();
+        /**
+         * The sources that are available to the analyzer, including parent columns. Parent columns are in parent key
+         * space, others are in result key space.
+         */
+        private final Map<String, ColumnSource<?>> allSources = new LinkedHashMap<>();
+        /** The sources that are available to the analyzer, including parent columns, in result key space. */
+        private final Map<String, ColumnSource<?>> allSourcesInResultKeySpace;
+        /** The sources that are published to the child table. */
+        private final Map<String, ColumnSource<?>> publishedSources = new LinkedHashMap<>();
+        /** A mapping from result column name to the layer index that created it. */
+        private final TObjectIntMap<String> columnToLayerIndex;
+        /** The select columns that have been processed so far. */
+        private final List<SelectColumn> processedCols = new ArrayList<>();
+
+        /** A holder for the shift column, if any. */
+        private FormulaColumn shiftColumn;
+        /** Whether the shift column has a positive offset. */
+        private boolean shiftColumnHasPositiveOffset;
+        /** The columns that will need to be processed after the shift column. */
+        private List<SelectColumn> remainingCols;
+        /** Whether the result should be flat. */
+        private boolean flatResult;
+        /** The layer that will be used to process redirection, if we have one. */
+        private int redirectionLayer = Layer.UNSET_INDEX;
+
+        AnalyzerContext(
+                final QueryTable parentTable,
+                final boolean publishParentSources,
+                final boolean flatResult) {
+            final Map<String, ColumnSource<?>> parentSources = parentTable.getColumnSourceMap();
+            columnToLayerIndex = new TObjectIntHashMap<>(parentSources.size(), 0.5f, Layer.UNSET_INDEX);
+
+            this.flatResult = flatResult;
+
+            allSources.putAll(parentSources);
+            for (final String columnName : allSources.keySet()) {
+                columnToLayerIndex.put(columnName, Layer.PARENT_TABLE_INDEX);
+            }
 
-    private static SelectAndViewAnalyzer createBaseLayer(Map<String, ColumnSource<?>> sources,
-            boolean publishTheseSources) {
-        return new BaseLayer(sources, publishTheseSources);
-    }
+            if (publishParentSources) {
+                publishedSources.putAll(parentSources);
+            }
 
-    private RedirectionLayer createRedirectionLayer(TrackingRowSet resultRowSet,
-            WritableRowRedirection rowRedirection) {
-        return new RedirectionLayer(this, resultRowSet, rowRedirection);
-    }
+            if (!flatResult) {
+                // result key space is the same as parent key space
+                allSourcesInResultKeySpace = allSources;
+            } else {
+                allSourcesInResultKeySpace = new HashMap<>();
 
-    private StaticFlattenLayer createStaticFlattenLayer(TrackingRowSet parentRowSet) {
-        return new StaticFlattenLayer(this, parentRowSet);
-    }
+                final RowRedirection rowRedirection = new WrappedRowSetRowRedirection(parentTable.getRowSet());
+                allSources.forEach((name, cs) -> allSourcesInResultKeySpace.put(name,
+                        RedirectedColumnSource.maybeRedirect(rowRedirection, cs)));
+            }
+        }
 
-    private SelectAndViewAnalyzer createLayerForSelect(
-            UpdateGraph updateGraph, RowSet parentRowset, String name, SelectColumn sc, WritableColumnSource<?> cs,
-            WritableColumnSource<?> underlyingSource, String[] parentColumnDependencies, ModifiedColumnSet mcsBuilder,
-            boolean isRedirected, boolean flattenResult, boolean alreadyFlattened) {
-        return new SelectColumnLayer(updateGraph, parentRowset, this, name, sc, cs, underlyingSource,
-                parentColumnDependencies,
-                mcsBuilder, isRedirected, flattenResult, alreadyFlattened);
-    }
+        /**
+         * Add a layer to the analyzer.
+         *
+         * @param layer the layer to add
+         */
+        void addLayer(final Layer layer) {
+            if (layer instanceof RedirectionLayer) {
+                if (redirectionLayer != Layer.UNSET_INDEX) {
+                    throw new IllegalStateException("Cannot have more than one redirection layer");
+                }
+                redirectionLayer = layers.size();
+            }
 
-    private SelectAndViewAnalyzer createLayerForConstantView(String name, SelectColumn sc, WritableColumnSource<?> cs,
-            String[] parentColumnDependencies, ModifiedColumnSet mcsBuilder, boolean flattenResult,
-            boolean alreadyFlattened) {
-        return new ConstantColumnLayer(this, name, sc, cs, parentColumnDependencies, mcsBuilder, flattenResult,
-                alreadyFlattened);
-    }
+            layer.populateColumnSources(allSources);
+            if (flatResult) {
+                layer.populateColumnSources(allSourcesInResultKeySpace);
+            }
+            layer.populateColumnSources(publishedSources);
 
-    private SelectAndViewAnalyzer createLayerForView(String name, SelectColumn sc, ColumnSource<?> cs,
-            String[] parentColumnDependencies, ModifiedColumnSet mcsBuilder) {
-        return new ViewColumnLayer(this, name, sc, cs, parentColumnDependencies, mcsBuilder);
-    }
+            layers.add(layer);
 
-    private SelectAndViewAnalyzer createLayerForPreserve(String name, SelectColumn sc, ColumnSource<?> cs,
-            String[] parentColumnDependencies, ModifiedColumnSet mcsBuilder) {
-        return new PreserveColumnLayer(this, name, sc, cs, parentColumnDependencies, mcsBuilder);
-    }
+            for (final String columnName : layer.getLayerColumnNames()) {
+                columnToLayerIndex.put(columnName, layer.getLayerIndex());
+            }
+        }
 
-    abstract void populateModifiedColumnSetRecurse(ModifiedColumnSet mcsBuilder, Set<String> remainingDepsToSatisfy);
+        /**
+         * @return the next layerIndex to use
+         */
+        int getNextLayerIndex() {
+            return layers.size();
+        }
 
-    enum GetMode {
-        All, New, Published
-    }
+        /**
+         * Return the layerIndex for a given string column.
+         *
+         * @param column the name of the column
+         *
+         * @return the layerIndex
+         */
+        int getLayerIndexFor(String column) {
+            final int layerIndex = columnToLayerIndex.get(column);
+            if (layerIndex == Layer.UNSET_INDEX) {
+                throw new IllegalStateException("Column " + column + " not found in any layer of the analyzer");
+            }
+            return layerIndex;
+        }
 
-    public final Map<String, ColumnSource<?>> getAllColumnSources() {
-        return getColumnSourcesRecurse(GetMode.All);
-    }
+        /**
+         * Populate the ModifiedColumnSet with all indirect/direct dependencies on the parent table.
+         *
+         * @param mcsBuilder the result ModifiedColumnSet to populate
+         * @param dependencies the immediate dependencies
+         */
+        void populateParentDependenciesMCS(
+                final ModifiedColumnSet mcsBuilder,
+                final String[] dependencies) {
+            for (final String dep : dependencies) {
+                final int layerIndex = getLayerIndexFor(dep);
+                if (layerIndex == Layer.PARENT_TABLE_INDEX) {
+                    // this is a preserved parent column
+                    mcsBuilder.setAll(dep);
+                } else {
+                    mcsBuilder.setAll(layers.get(layerIndex).getModifiedColumnSet());
+                }
+            }
+        }
 
-    public final Map<String, ColumnSource<?>> getNewColumnSources() {
-        return getColumnSourcesRecurse(GetMode.New);
-    }
+        /**
+         * Populate the layer dependency set with the layer indices that the dependencies are in.
+         *
+         * @param layerDependencySet the result bitset to populate
+         * @param dependencies the dependencies
+         */
+        void populateLayerDependencySet(
+                final BitSet layerDependencySet,
+                final String[] dependencies) {
+            for (final String dep : dependencies) {
+                final int layerIndex = getLayerIndexFor(dep);
+                if (layerIndex != Layer.PARENT_TABLE_INDEX) {
+                    // note that implicitly preserved columns do not belong to a layer.
+                    layerDependencySet.or(layers.get(layerIndex).getLayerDependencySet());
+                }
+            }
+        }
+
+        /**
+         * Set the redirection layer in the bitset if the analyzer has any redirection.
+         *
+         * @param layerDependencies the result bitset to populate
+         */
+        void setRedirectionLayer(final BitSet layerDependencies) {
+            if (redirectionLayer != Layer.UNSET_INDEX) {
+                layerDependencies.set(redirectionLayer);
+            }
+        }
+
+        /**
+         * @return the column sources that are published through the child table
+         */
+        public Map<String, ColumnSource<?>> getPublishedColumnSources() {
+            // Note that if we have a shift column that we forcibly publish all columns.
+            return shiftColumn == null ? publishedSources : allSources;
+        }
+
+        /**
+         * @return the final analyzer
+         */
+        public SelectAndViewAnalyzer createAnalyzer() {
+            return new SelectAndViewAnalyzer(layers.toArray(Layer[]::new), flatResult);
+        }
+
+        /**
+         * @return which select columns were included in the result (not including the shift, or post-shift, columns)
+         */
+        public List<SelectColumn> getProcessedColumns() {
+            return processedCols;
+        }
+
+        /**
+         * @return whether the result should be flat
+         */
+        public boolean isFlatResult() {
+            return flatResult;
+        }
+
+        /**
+         * Our job here is to calculate the effects: a map from incoming column to a list of columns that it effects. We
+         * do this in two stages. In the first stage we create a map from column to (set of dependent columns). In the
+         * second stage we reverse that map.
+         *
+         * @return the effects map
+         */
+        public Map<String, String[]> calcEffects() {
+            final Map<String, ColumnSource<?>> resultMap = getPublishedColumnSources();
+
+            // Create the mapping from result column to dependent source columns.
+            final Map<String, String[]> dependsOn = new HashMap<>();
+            for (final String columnName : resultMap.keySet()) {
+                final int layerIndex = getLayerIndexFor(columnName);
+                final String[] dependencies;
+                if (layerIndex == Layer.PARENT_TABLE_INDEX) {
+                    dependencies = new String[] {columnName};
+                } else {
+                    dependencies = layers.get(layerIndex).getModifiedColumnSet().dirtyColumnNames();
+                }
+                dependsOn.put(columnName, dependencies);
+            }
+
+            // Now create the mapping from source column to result columns.
+            final Map<String, List<String>> effects = new HashMap<>();
+            for (Map.Entry<String, String[]> entry : dependsOn.entrySet()) {
+                final String depender = entry.getKey();
+                for (final String dependee : entry.getValue()) {
+                    effects.computeIfAbsent(dependee, dummy -> new ArrayList<>()).add(depender);
+                }
+            }
+
+            // Convert effects type into result type
+            final Map<String, String[]> result = new HashMap<>();
+            for (Map.Entry<String, List<String>> entry : effects.entrySet()) {
+                final String[] value = entry.getValue().toArray(String[]::new);
+                result.put(entry.getKey(), value);
+            }
+            return result;
+        }
+
+        /**
+         * Shift columns introduce intermediary table operations. This method applies remaining work to the result built
+         * so far.
+         *
+         * @param parentTable the source table
+         * @param resultSoFar the intermediate result
+         * @param updateFlavor the update flavor
+         * @return the final result
+         */
+        public QueryTable applyShiftsAndRemainingColumns(
+                @NotNull final QueryTable parentTable,
+                @NotNull QueryTable resultSoFar,
+                final UpdateFlavor updateFlavor) {
+            if (shiftColumn != null) {
+                resultSoFar = (QueryTable) ShiftedColumnsFactory.getShiftedColumnsTable(
+                        resultSoFar, shiftColumn, updateFlavor);
+            }
+
+            // shift columns may introduce modifies that are not present in the original table; set these before using
+            if (parentTable.isRefreshing()) {
+                if (shiftColumn == null && parentTable.isAddOnly()) {
+                    resultSoFar.setAttribute(Table.ADD_ONLY_TABLE_ATTRIBUTE, true);
+                }
+                if ((shiftColumn == null || !shiftColumnHasPositiveOffset) && parentTable.isAppendOnly()) {
+                    // note if the shift offset is non-positive, then this result is still append-only
+                    resultSoFar.setAttribute(Table.APPEND_ONLY_TABLE_ATTRIBUTE, true);
+                }
+                if (parentTable.hasAttribute(Table.TEST_SOURCE_TABLE_ATTRIBUTE)) {
+                    // be convenient for test authors by propagating the test source table attribute
+                    resultSoFar.setAttribute(Table.TEST_SOURCE_TABLE_ATTRIBUTE, true);
+                }
+                if (parentTable.isBlink()) {
+                    // blink tables, although possibly not useful, can have shift columns
+                    resultSoFar.setAttribute(Table.BLINK_TABLE_ATTRIBUTE, true);
+                }
+            }
 
-    public final Map<String, ColumnSource<?>> getPublishedColumnSources() {
-        return getColumnSourcesRecurse(GetMode.Published);
+            boolean isMultiStateSelect = shiftColumn != null || remainingCols != null;
+            if (isMultiStateSelect && (updateFlavor == UpdateFlavor.Select || updateFlavor == UpdateFlavor.View)) {
+                List<SelectColumn> newResultColumns = new LinkedList<>();
+                for (SelectColumn processed : processedCols) {
+                    newResultColumns.add(new SourceColumn(processed.getName()));
+                }
+                if (shiftColumn != null) {
+                    newResultColumns.add(new SourceColumn(shiftColumn.getName()));
+                }
+                if (remainingCols != null) {
+                    newResultColumns.addAll(remainingCols);
+                }
+
+                if (updateFlavor == UpdateFlavor.Select) {
+                    resultSoFar = (QueryTable) resultSoFar.select(newResultColumns);
+                } else {
+                    resultSoFar = (QueryTable) resultSoFar.view(newResultColumns);
+                }
+            } else if (remainingCols != null) {
+                switch (updateFlavor) {
+                    case Update: {
+                        resultSoFar = (QueryTable) resultSoFar.update(remainingCols);
+                        break;
+                    }
+                    case UpdateView: {
+                        resultSoFar = (QueryTable) resultSoFar.updateView(remainingCols);
+                        break;
+                    }
+                    case LazyUpdate: {
+                        resultSoFar = (QueryTable) resultSoFar.lazyUpdate(remainingCols);
+                        break;
+                    }
+                    default:
+                        throw new IllegalStateException("Unexpected update flavor: " + updateFlavor);
+                }
+            }
+
+            return resultSoFar;
+        }
     }
 
-    abstract Map<String, ColumnSource<?>> getColumnSourcesRecurse(GetMode mode);
+    static abstract class Layer implements LogOutputAppendable {
+        private static final BitSet EMPTY_BITSET = new BitSet();
+
+        public static final int UNSET_INDEX = -1;
+        public static final int PARENT_TABLE_INDEX = -2;
+
+        /**
+         * The layerIndex is used to identify each layer uniquely within the bitsets for completion.
+         */
+        private final int layerIndex;
+
+        Layer(int layerIndex) {
+            this.layerIndex = layerIndex;
+        }
+
+        /**
+         * @return which index in the layer stack this layer is
+         */
+        int getLayerIndex() {
+            return layerIndex;
+        }
+
+        /**
+         * @return whether this layer has refreshing logic and needs to be updated
+         */
+        boolean hasRefreshingLogic() {
+            return true;
+        }
+
+        /**
+         * @return the modified column set of the parent table that this layer indirectly depends on
+         */
+        ModifiedColumnSet getModifiedColumnSet() {
+            return failNoRefreshingLogic();
+        }
+
+        /**
+         * @return the layer dependency set indicating which layers this layer depends on
+         */
+        BitSet getLayerDependencySet() {
+            return EMPTY_BITSET;
+        }
+
+        @Override
+        public String toString() {
+            return new LogOutputStringImpl().append(this).toString();
+        }
+
+        void startTrackingPrev() {
+            // default is that there is nothing to do
+        }
+
+        /**
+         * @return the column names created by this layer
+         */
+        abstract Set<String> getLayerColumnNames();
+
+        /**
+         * Populate the column sources for this layer.
+         *
+         * @param result the map to populate
+         */
+        abstract void populateColumnSources(Map<String, ColumnSource<?>> result);
+
+        /**
+         * @return true if this layer allows parallelization across columns
+         */
+        abstract boolean allowCrossColumnParallelization();
+
+        /**
+         * Apply this update to this Layer.
+         *
+         * @param upstream the upstream update
+         * @param toClear rows that used to exist and no longer exist
+         * @param helper convenience class that memoizes reusable calculations for this update
+         * @param jobScheduler scheduler for parallel sub-tasks
+         * @param liveResultOwner {@link LivenessNode node} to be used to manage/unmanage results that happen to be
+         *        {@link io.deephaven.engine.liveness.LivenessReferent liveness referents}
+         * @param onSuccess called when the update completed successfully
+         * @param onError called when the update failed
+         */
+        Runnable createUpdateHandler(
+                TableUpdate upstream,
+                RowSet toClear,
+                UpdateHelper helper,
+                JobScheduler jobScheduler,
+                @Nullable LivenessNode liveResultOwner,
+                Runnable onSuccess,
+                Consumer<Exception> onError) {
+            return failNoRefreshingLogic();
+        }
+
+        private <T> T failNoRefreshingLogic() {
+            throw new UnsupportedOperationException(String.format(
+                    "%s does not have any refreshing logic", this.getClass().getSimpleName()));
+        }
+    }
 
     public static class UpdateHelper implements SafeCloseable {
         private RowSet existingRows;
+        private TableUpdate upstreamInResultSpace;
         private SafeCloseablePair<RowSet, RowSet> shiftedWithModifies;
         private SafeCloseablePair<RowSet, RowSet> shiftedWithoutModifies;
 
@@ -459,6 +779,21 @@ public UpdateHelper(RowSet parentRowSet, TableUpdate upstream) {
             this.upstream = upstream;
         }
 
+        /**
+         * Flatten the upstream update from the parent key space to the destination key space. We are guaranteed to be
+         * in STATIC_SELECT mode.
+         *
+         * @return the flattened update
+         */
+        TableUpdate resultKeySpaceUpdate() {
+            if (upstreamInResultSpace == null) {
+                upstreamInResultSpace = new TableUpdateImpl(
+                        RowSetFactory.flat(upstream.added().size()), RowSetFactory.empty(), RowSetFactory.empty(),
+                        RowSetShiftData.EMPTY, ModifiedColumnSet.EMPTY);
+            }
+            return upstreamInResultSpace;
+        }
+
         private RowSet getExisting() {
             if (existingRows == null) {
                 existingRows = parentRowSet.minus(upstream.added());
@@ -508,6 +843,10 @@ public void close() {
                 shiftedWithoutModifies.close();
                 shiftedWithoutModifies = null;
             }
+            if (upstreamInResultSpace != null) {
+                upstreamInResultSpace.release();
+                upstreamInResultSpace = null;
+            }
         }
     }
 
@@ -520,195 +859,174 @@ public void close() {
      * @param jobScheduler scheduler for parallel sub-tasks
      * @param liveResultOwner {@link LivenessNode node} to be used to manage/unmanage results that happen to be
      *        {@link io.deephaven.engine.liveness.LivenessReferent liveness referents}
-     * @param onCompletion Called when an inner column is complete. The outer layer should pass the {@code onCompletion}
-     */
-    public abstract void applyUpdate(TableUpdate upstream, RowSet toClear, UpdateHelper helper,
-            JobScheduler jobScheduler, @Nullable LivenessNode liveResultOwner,
-            SelectLayerCompletionHandler onCompletion);
-
-    /**
-     * Our job here is to calculate the effects: a map from incoming column to a list of columns that it effects. We do
-     * this in two stages. In the first stage we create a map from column to (set of dependent columns). In the second
-     * stage we reverse that map.
+     * @param onSuccess called when the update completed successfully
+     * @param onError called when the update failed
      */
-    public final Map<String, String[]> calcEffects(boolean forcePublishAllResources) {
-        final Map<String, Set<String>> dependsOn = calcDependsOnRecurse(forcePublishAllResources);
-
-        // Now create effects, which is the inverse of dependsOn:
-        // An entry W -> [X, Y, Z] in effects means that W affects X, Y, and Z
-        final Map<String, List<String>> effects = new HashMap<>();
-        for (Map.Entry<String, Set<String>> entry : dependsOn.entrySet()) {
-            final String depender = entry.getKey();
-            for (final String dependee : entry.getValue()) {
-                effects.computeIfAbsent(dependee, dummy -> new ArrayList<>()).add(depender);
+    public void applyUpdate(
+            final TableUpdate upstream,
+            final RowSet toClear,
+            final UpdateHelper helper,
+            final JobScheduler jobScheduler,
+            @Nullable final LivenessNode liveResultOwner,
+            final Runnable onSuccess,
+            final Consumer<Exception> onError) {
+
+        Assert.assertion(remainingLayers.isEmpty(), "remainingLayers.isEmpty()");
+        remainingLayers.or(requiredLayers);
+
+        final Runnable[] runners = new Runnable[layers.length];
+        final UpdateScheduler scheduler = new UpdateScheduler(runners, onSuccess, onError);
+
+        for (int ii = 0; ii < layers.length; ++ii) {
+            final Layer layer = layers[ii];
+            if (layer != null) {
+                // TODO (deephaven-core#4896): this error handling allows concurrent layers to fail without ensuring
+                // that other tasks are finished.
+                runners[ii] = layer.createUpdateHandler(
+                        upstream, toClear, helper, jobScheduler, liveResultOwner,
+                        () -> scheduler.onLayerComplete(layer.getLayerIndex()), onError);
             }
         }
-        // Convert effects type into result type
-        final Map<String, String[]> result = new HashMap<>();
-        for (Map.Entry<String, List<String>> entry : effects.entrySet()) {
-            final String[] value = entry.getValue().toArray(CollectionUtil.ZERO_LENGTH_STRING_ARRAY);
-            result.put(entry.getKey(), value);
-        }
-        return result;
+
+        scheduler.tryToKickOffWork();
     }
 
-    abstract Map<String, Set<String>> calcDependsOnRecurse(boolean forcePublishAllResources);
+    private class UpdateScheduler {
+        private final ReentrantLock runLock = new ReentrantLock();
 
-    public abstract SelectAndViewAnalyzer getInner();
+        private final Runnable[] runners;
+        private final Runnable onSuccess;
+        private final Consumer<Exception> onError;
 
-    public abstract void startTrackingPrev();
+        private volatile boolean needsRun;
+        /** whether we have already invoked onSuccess */
+        private boolean updateComplete;
 
-    /**
-     * Was the result internally flattened? Only the STATIC_SELECT case flattens the result. If the result preserves any
-     * columns, then flattening is not permitted. Because all the other layers cannot internally flatten, the default
-     * implementation returns false.
-     */
-    public boolean flattenedResult() {
-        return false;
-    }
+        public UpdateScheduler(
+                final Runnable[] runners,
+                final Runnable onSuccess,
+                final Consumer<Exception> onError) {
+            this.runners = runners;
+            this.onSuccess = onSuccess;
+            this.onError = onError;
+        }
 
-    /**
-     * Have the column sources already been flattened? Only the STATIC_SELECT case flattens the result. A static flatten
-     * layer is only added if SelectColumn depends on an intermediate result.
-     */
-    public boolean alreadyFlattenedSources() {
-        return false;
-    }
+        public void onLayerComplete(final int layerIndex) {
+            synchronized (remainingLayers) {
+                remainingLayers.set(layerIndex, false);
+            }
 
-    /**
-     * Return the layerIndex for a given string column.
-     *
-     * <p>
-     * This is executed recursively, because later columns in a select statement hide earlier columns.
-     * </p>
-     *
-     * @param column the name of the column
-     *
-     * @return the layerIndex
-     */
-    abstract int getLayerIndexFor(String column);
+            tryToKickOffWork();
+        }
 
-    /**
-     * Can all of our columns permit parallel updates?
-     */
-    abstract public boolean allowCrossColumnParallelization();
+        private void tryToKickOffWork() {
+            needsRun = true;
+            while (true) {
+                if (runLock.isHeldByCurrentThread() || !runLock.tryLock()) {
+                    // do not permit re-entry or waiting on another thread doing exactly this work
+                    return;
+                }
 
-    /**
-     * A class that handles the completion of one select column. The handlers are chained together; all downstream
-     * dependencies may execute when a column completes.
-     */
-    public static abstract class SelectLayerCompletionHandler {
-        /**
-         * Note that the completed columns are shared among the entire chain of completion handlers.
-         */
-        private final BitSet completedColumns;
-        private final SelectLayerCompletionHandler nextHandler;
-        private final BitSet requiredColumns;
-        private volatile boolean fired = false;
+                try {
+                    if (needsRun) {
+                        needsRun = false;
+                        doKickOffWork();
+                    }
+                } catch (final Exception exception) {
+                    try {
+                        onError.accept(exception);
+                    } catch (final Exception ignored) {
+                    }
+                } finally {
+                    runLock.unlock();
+                }
 
-        /**
-         * Create a new completion handler that calls nextHandler after its own processing. The completedColumns BitSet
-         * is shared among all handlers.
-         *
-         * @param requiredColumns the columns required for this layer
-         * @param nextHandler the next handler to call
-         */
-        SelectLayerCompletionHandler(BitSet requiredColumns, SelectLayerCompletionHandler nextHandler) {
-            this.requiredColumns = requiredColumns;
-            this.completedColumns = nextHandler.completedColumns;
-            this.nextHandler = nextHandler;
+                if (!needsRun) {
+                    return;
+                }
+            }
         }
 
-        /**
-         * Create the final completion handler, which has no next handler.
-         *
-         * @param requiredColumns the columns required for this handler to fire
-         * @param completedColumns the set of completed columns, shared with all the other handlers
-         */
-        public SelectLayerCompletionHandler(BitSet requiredColumns, BitSet completedColumns) {
-            this.requiredColumns = requiredColumns;
-            this.completedColumns = completedColumns;
-            this.nextHandler = null;
-        }
+        private void doKickOffWork() {
+            if (updateComplete) {
+                // we may have already completed the update, but are checking again due to the potential of a race
+                return;
+            }
 
-        /**
-         * Called when a single column is completed.
-         * <p>
-         * If we are ready, then we call {@link #onAllRequiredColumnsCompleted()}.
-         * <p>
-         * We may not be ready, but other columns downstream of us may be ready, so they are also notified (the
-         * nextHandler).
-         *
-         * @param completedColumn the layerIndex of the completedColumn
-         */
-        void onLayerCompleted(int completedColumn) {
-            if (!fired) {
+            int nextLayer = 0;
+            while (nextLayer >= 0) {
+                boolean complete;
                 boolean readyToFire = false;
-                synchronized (completedColumns) {
-                    if (!fired) {
-                        completedColumns.set(completedColumn);
-                        if (requiredColumns.get(completedColumn) || requiredColumns.isEmpty()) {
-                            readyToFire = requiredColumns.stream().allMatch(completedColumns::get);
-                            if (readyToFire) {
-                                fired = true;
-                            }
+                Runnable runner = null;
+                synchronized (remainingLayers) {
+                    complete = remainingLayers.isEmpty();
+                    nextLayer = complete ? -1 : remainingLayers.nextSetBit(nextLayer);
+
+                    if (nextLayer != -1) {
+                        if ((runner = runners[nextLayer]) != null) {
+                            readyToFire = !layers[nextLayer].getLayerDependencySet().intersects(remainingLayers);
+                        }
+
+                        if (readyToFire) {
+                            runners[nextLayer] = null;
+                        } else {
+                            ++nextLayer;
                         }
                     }
                 }
+
                 if (readyToFire) {
-                    onAllRequiredColumnsCompleted();
+                    runner.run();
+                } else if (complete) {
+                    updateComplete = true;
+                    onSuccess.run();
+                    return;
                 }
             }
-            if (nextHandler != null) {
-                nextHandler.onLayerCompleted(completedColumn);
-            }
         }
+    }
 
-        protected void onError(Exception error) {
-            if (nextHandler != null) {
-                nextHandler.onError(error);
+    public void startTrackingPrev() {
+        for (final Layer layer : layers) {
+            if (layer != null) {
+                layer.startTrackingPrev();
             }
         }
-
-        /**
-         * Called when all required columns are completed.
-         */
-        protected abstract void onAllRequiredColumnsCompleted();
     }
 
     /**
-     * Create a completion handler that signals a future when the update is completed.
-     *
-     * @param waitForResult a void future indicating success or failure
-     *
-     * @return a completion handler that will signal the future
+     * Is the result of this select/view flat?
      */
-    public SelectLayerCompletionHandler futureCompletionHandler(CompletableFuture<Void> waitForResult) {
-        final BitSet completedColumns = new BitSet();
-        final BitSet requiredColumns = new BitSet();
-
-        setAllNewColumns(requiredColumns);
+    public boolean flatResult() {
+        return flatResult;
+    }
 
-        return new SelectLayerCompletionHandler(requiredColumns, completedColumns) {
-            boolean errorOccurred = false;
+    /**
+     * Can all of our columns permit parallel updates?
+     */
+    public boolean allowCrossColumnParallelization() {
+        return Arrays.stream(layers)
+                .filter(Objects::nonNull)
+                .allMatch(Layer::allowCrossColumnParallelization);
+    }
 
-            @Override
-            public void onAllRequiredColumnsCompleted() {
-                if (errorOccurred) {
-                    return;
-                }
-                waitForResult.complete(null);
+    @Override
+    public LogOutput append(LogOutput logOutput) {
+        logOutput = logOutput.append("SelectAndViewAnalyzer{");
+        boolean first = true;
+        for (final Layer layer : layers) {
+            if (layer == null) {
+                continue;
             }
-
-            @Override
-            protected void onError(Exception error) {
-                if (errorOccurred) {
-                    return;
-                }
-                errorOccurred = true;
-                waitForResult.completeExceptionally(error);
+            if (first) {
+                first = false;
+            } else {
+                logOutput = logOutput.append(", ");
             }
-        };
+            logOutput = logOutput.append(layer);
+
+        }
+        return logOutput.append("}");
     }
 
     @Override
diff --git a/engine/table/src/main/java/io/deephaven/engine/table/impl/select/analyzers/SelectAndViewAnalyzerWrapper.java b/engine/table/src/main/java/io/deephaven/engine/table/impl/select/analyzers/SelectAndViewAnalyzerWrapper.java
deleted file mode 100644
index ec4fcf6f534..00000000000
--- a/engine/table/src/main/java/io/deephaven/engine/table/impl/select/analyzers/SelectAndViewAnalyzerWrapper.java
+++ /dev/null
@@ -1,128 +0,0 @@
-//
-// Copyright (c) 2016-2024 Deephaven Data Labs and Patent Pending
-//
-package io.deephaven.engine.table.impl.select.analyzers;
-
-import io.deephaven.engine.table.ColumnSource;
-import io.deephaven.engine.table.Table;
-import io.deephaven.engine.table.impl.QueryTable;
-import io.deephaven.engine.table.impl.ShiftedColumnsFactory;
-import io.deephaven.engine.table.impl.select.FormulaColumn;
-import io.deephaven.engine.table.impl.select.SelectColumn;
-import io.deephaven.engine.table.impl.select.SourceColumn;
-import org.jetbrains.annotations.NotNull;
-
-import java.util.LinkedList;
-import java.util.List;
-import java.util.Map;
-
-public class SelectAndViewAnalyzerWrapper {
-    public enum UpdateFlavor {
-        Select, View, Update, UpdateView, LazyUpdate
-    }
-
-    private final SelectAndViewAnalyzer analyzer;
-    private final FormulaColumn shiftColumn;
-    private final boolean shiftColumnHasPositiveOffset;
-    private final List<SelectColumn> remainingCols;
-    private final List<SelectColumn> processedColumns;
-
-    SelectAndViewAnalyzerWrapper(
-            SelectAndViewAnalyzer analyzer,
-            FormulaColumn shiftColumn,
-            boolean shiftColumnHasPositiveOffset,
-            List<SelectColumn> remainingCols,
-            List<SelectColumn> processedColumns) {
-        this.analyzer = analyzer;
-        this.shiftColumn = shiftColumn;
-        this.shiftColumnHasPositiveOffset = shiftColumnHasPositiveOffset;
-        this.remainingCols = remainingCols;
-        this.processedColumns = processedColumns;
-    }
-
-    public final Map<String, ColumnSource<?>> getPublishedColumnResources() {
-        if (shiftColumn == null) {
-            return analyzer.getPublishedColumnSources();
-        } else {
-            return analyzer.getAllColumnSources();
-        }
-    }
-
-    public final Map<String, String[]> calcEffects() {
-        return analyzer.calcEffects(shiftColumn != null);
-    }
-
-    public SelectAndViewAnalyzer getAnalyzer() {
-        return analyzer;
-    }
-
-    public List<SelectColumn> getProcessedColumns() {
-        return processedColumns;
-    }
-
-    public QueryTable applyShiftsAndRemainingColumns(
-            @NotNull QueryTable sourceTable, @NotNull QueryTable queryTable, UpdateFlavor updateFlavor) {
-        if (shiftColumn != null) {
-            queryTable = (QueryTable) ShiftedColumnsFactory.getShiftedColumnsTable(
-                    queryTable, shiftColumn, updateFlavor);
-        }
-
-        // shift columns may introduce modifies that are not present in the original table; set these before using
-        if (sourceTable.isRefreshing()) {
-            if (shiftColumn == null && sourceTable.isAddOnly()) {
-                queryTable.setAttribute(Table.ADD_ONLY_TABLE_ATTRIBUTE, true);
-            }
-            if ((shiftColumn == null || !shiftColumnHasPositiveOffset) && sourceTable.isAppendOnly()) {
-                // note if the shift offset is non-positive, then this result is still append-only
-                queryTable.setAttribute(Table.APPEND_ONLY_TABLE_ATTRIBUTE, true);
-            }
-            if (sourceTable.hasAttribute(Table.TEST_SOURCE_TABLE_ATTRIBUTE)) {
-                // be convenient for test authors by propagating the test source table attribute
-                queryTable.setAttribute(Table.TEST_SOURCE_TABLE_ATTRIBUTE, true);
-            }
-            if (sourceTable.isBlink()) {
-                // blink tables, although possibly not useful, can have shift columns
-                queryTable.setAttribute(Table.BLINK_TABLE_ATTRIBUTE, true);
-            }
-        }
-
-        boolean isMultiStateSelect = shiftColumn != null || remainingCols != null;
-        if (isMultiStateSelect && (updateFlavor == UpdateFlavor.Select || updateFlavor == UpdateFlavor.View)) {
-            List<SelectColumn> newResultColumns = new LinkedList<>();
-            for (SelectColumn processed : processedColumns) {
-                newResultColumns.add(new SourceColumn(processed.getName()));
-            }
-            if (shiftColumn != null) {
-                newResultColumns.add(new SourceColumn(shiftColumn.getName()));
-            }
-            if (remainingCols != null) {
-                newResultColumns.addAll(remainingCols);
-            }
-
-            if (updateFlavor == UpdateFlavor.Select) {
-                queryTable = (QueryTable) queryTable.select(newResultColumns);
-            } else {
-                queryTable = (QueryTable) queryTable.view(newResultColumns);
-            }
-        } else if (remainingCols != null) {
-            switch (updateFlavor) {
-                case Update: {
-                    queryTable = (QueryTable) queryTable.update(remainingCols);
-                    break;
-                }
-                case UpdateView: {
-                    queryTable = (QueryTable) queryTable.updateView(remainingCols);
-                    break;
-                }
-                case LazyUpdate: {
-                    queryTable = (QueryTable) queryTable.lazyUpdate(remainingCols);
-                    break;
-                }
-                default:
-                    throw new IllegalStateException("Unexpected update flavor: " + updateFlavor);
-            }
-        }
-
-        return queryTable;
-    }
-}
diff --git a/engine/table/src/main/java/io/deephaven/engine/table/impl/select/analyzers/SelectColumnLayer.java b/engine/table/src/main/java/io/deephaven/engine/table/impl/select/analyzers/SelectColumnLayer.java
index 971d4a8e2c9..431d00ee7e7 100644
--- a/engine/table/src/main/java/io/deephaven/engine/table/impl/select/analyzers/SelectColumnLayer.java
+++ b/engine/table/src/main/java/io/deephaven/engine/table/impl/select/analyzers/SelectColumnLayer.java
@@ -40,24 +40,22 @@
 import static io.deephaven.chunk.util.pools.ChunkPoolConstants.LARGEST_POOLED_CHUNK_CAPACITY;
 
 final public class SelectColumnLayer extends SelectOrViewColumnLayer {
-    /**
-     * The same reference as super.columnSource, but as a WritableColumnSource and maybe reinterpreted
-     */
+    /** The same reference as super.columnSource, but as a WritableColumnSource and maybe reinterpreted */
     private final WritableColumnSource<?> writableSource;
 
-    /**
-     * The execution context the select column layer was constructed in
-     */
+    /** The execution context the select column layer was constructed in */
     private final ExecutionContext executionContext;
 
     private final UpdateGraph updateGraph;
-    /**
-     * Our parent row set, used for ensuring capacity.
-     */
+    /** Our parent row set, used for ensuring capacity */
     private final RowSet parentRowSet;
+    /** Whether our result is redirected */
     private final boolean isRedirected;
+    /** Whether our result is flattened */
     private final boolean flattenedResult;
-    private final boolean alreadyFlattenedSources;
+    /** Whether our dependencies are in the result key space instead of parent key space */
+    private final boolean sourcesAreInResultKeySpace;
+    /** Which layers we depend on */
     private final BitSet dependencyBitSet;
     private final boolean canParallelizeThisColumn;
     private final boolean isSystemic;
@@ -73,14 +71,22 @@ final public class SelectColumnLayer extends SelectOrViewColumnLayer {
     private ChunkSource.WithPrev<Values> chunkSource;
 
     SelectColumnLayer(
-            UpdateGraph updateGraph, RowSet parentRowSet, SelectAndViewAnalyzer inner, String name, SelectColumn sc,
-            WritableColumnSource<?> ws, WritableColumnSource<?> underlying, String[] deps, ModifiedColumnSet mcsBuilder,
-            boolean isRedirected, boolean flattenedResult, boolean alreadyFlattenedSources) {
-        super(inner, name, sc, ws, underlying, deps, mcsBuilder);
+            final UpdateGraph updateGraph,
+            final RowSet parentRowSet,
+            final SelectAndViewAnalyzer.AnalyzerContext context,
+            final SelectColumn sc,
+            final WritableColumnSource<?> ws,
+            final WritableColumnSource<?> underlying,
+            final String[] deps,
+            final ModifiedColumnSet mcsBuilder,
+            final boolean isRedirected,
+            final boolean sourcesAreInResultKeySpace) {
+        super(context, sc, ws, underlying, deps, mcsBuilder);
         this.updateGraph = updateGraph;
         this.parentRowSet = parentRowSet;
         this.writableSource = ReinterpretUtils.maybeConvertToWritablePrimitive(ws);
         this.isRedirected = isRedirected;
+        this.sourcesAreInResultKeySpace = sourcesAreInResultKeySpace;
 
         final ExecutionContext userSuppliedContext = ExecutionContext.getContextToRecord();
         if (userSuppliedContext != null) {
@@ -91,10 +97,16 @@ final public class SelectColumnLayer extends SelectOrViewColumnLayer {
         }
 
         dependencyBitSet = new BitSet();
-        Arrays.stream(deps).mapToInt(inner::getLayerIndexFor).forEach(dependencyBitSet::set);
+        Arrays.stream(deps)
+                .mapToInt(context::getLayerIndexFor)
+                .filter(layerIndex -> layerIndex >= 0)
+                .forEach(dependencyBitSet::set);
+        if (isRedirected) {
+            // we cannot write to the redirected column until after the redirection has been updated
+            context.setRedirectionLayer(dependencyBitSet);
+        }
 
-        this.flattenedResult = flattenedResult;
-        this.alreadyFlattenedSources = alreadyFlattenedSources;
+        this.flattenedResult = context.isFlatResult();
 
         // We can only parallelize this column if we are not redirected, our destination provides ensure previous, and
         // the select column is stateless
@@ -136,9 +148,33 @@ private ChunkSource<Values> getChunkSource() {
     }
 
     @Override
-    public void applyUpdate(final TableUpdate upstream, final RowSet toClear,
-            final UpdateHelper helper, final JobScheduler jobScheduler, @Nullable final LivenessNode liveResultOwner,
-            final SelectLayerCompletionHandler onCompletion) {
+    public BitSet getLayerDependencySet() {
+        return dependencyBitSet;
+    }
+
+    @Override
+    public Runnable createUpdateHandler(
+            final TableUpdate originalUpdate,
+            final RowSet toClear,
+            final SelectAndViewAnalyzer.UpdateHelper helper,
+            final JobScheduler jobScheduler,
+            @Nullable final LivenessNode liveResultOwner,
+            final Runnable onSuccess,
+            final Consumer<Exception> onError) {
+        final TableUpdate upstream;
+        if (!sourcesAreInResultKeySpace) {
+            upstream = originalUpdate;
+        } else {
+            // This better be the static fake update.
+            Assert.eqTrue(originalUpdate.added().size() == parentRowSet.size(),
+                    "originalUpdate.added().size() == parentRowSet.size()");
+            Assert.eqTrue(originalUpdate.removed().isEmpty(), "originalUpdate.removed.isEmpty()");
+            Assert.eqTrue(originalUpdate.modified().isEmpty(), "originalUpdate.modified.isEmpty()");
+            Assert.eqTrue(originalUpdate.shifted().empty(), "originalUpdate.shifted.empty()");
+
+            upstream = helper.resultKeySpaceUpdate();
+        }
+
         if (upstream.removed().isNonempty()) {
             if (isRedirected) {
                 clearObjectsAtThisLevel(upstream.removed());
@@ -148,80 +184,80 @@ public void applyUpdate(final TableUpdate upstream, final RowSet toClear,
             }
         }
 
-        // recurse so that dependent intermediate columns are already updated
-        inner.applyUpdate(upstream, toClear, helper, jobScheduler, liveResultOwner,
-                new SelectLayerCompletionHandler(dependencyBitSet, onCompletion) {
-                    @Override
-                    public void onAllRequiredColumnsCompleted() {
-                        // We don't want to bother with threads if we are going to process a small update
-                        final long totalSize = upstream.added().size() + upstream.modified().size();
-
-                        // If we have shifts, that makes everything nasty; so we do not want to deal with it
-                        final boolean hasShifts = upstream.shifted().nonempty();
-
-                        final boolean serialTableOperationsSafe = updateGraph.serialTableOperationsSafe()
-                                || updateGraph.sharedLock().isHeldByCurrentThread()
-                                || updateGraph.exclusiveLock().isHeldByCurrentThread();
-
-                        if (canParallelizeThisColumn && jobScheduler.threadCount() > 1 && !hasShifts &&
-                                ((resultTypeIsTableOrRowSet && totalSize > 0)
-                                        || totalSize > QueryTable.MINIMUM_PARALLEL_SELECT_ROWS)) {
-                            final long divisionSize = resultTypeIsTableOrRowSet ? 1
-                                    : Math.max(QueryTable.MINIMUM_PARALLEL_SELECT_ROWS,
-                                            (totalSize + jobScheduler.threadCount() - 1) / jobScheduler.threadCount());
-                            final List<TableUpdate> updates = new ArrayList<>();
-                            // divide up the additions and modifications
-                            try (final RowSequence.Iterator rsAddIt = upstream.added().getRowSequenceIterator();
-                                    final RowSequence.Iterator rsModIt = upstream.modified().getRowSequenceIterator()) {
-                                while (rsAddIt.hasMore() || rsModIt.hasMore()) {
-                                    final TableUpdateImpl update = new TableUpdateImpl();
-                                    update.modifiedColumnSet = upstream.modifiedColumnSet();
-                                    update.shifted = RowSetShiftData.EMPTY;
-                                    update.removed = RowSetFactory.empty();
-
-                                    if (rsAddIt.hasMore()) {
-                                        update.added = rsAddIt.getNextRowSequenceWithLength(divisionSize).asRowSet();
-                                    } else {
-                                        update.added = RowSetFactory.empty();
-                                    }
-
-                                    if (update.added.size() < divisionSize && rsModIt.hasMore()) {
-                                        update.modified = rsModIt
-                                                .getNextRowSequenceWithLength(divisionSize - update.added().size())
-                                                .asRowSet();
-                                    } else {
-                                        update.modified = RowSetFactory.empty();
-                                    }
-
-                                    updates.add(update);
-                                }
-                            }
-
-                            if (updates.isEmpty()) {
-                                throw new IllegalStateException();
-                            }
+        return () -> {
+            // We don't want to bother with threads if we are going to process a small update
+            final long totalSize = upstream.added().size() + upstream.modified().size();
+
+            // If we have shifts, that makes everything nasty; so we do not want to deal with it
+            final boolean hasShifts = upstream.shifted().nonempty();
+
+            final boolean serialTableOperationsSafe = updateGraph.serialTableOperationsSafe()
+                    || updateGraph.sharedLock().isHeldByCurrentThread()
+                    || updateGraph.exclusiveLock().isHeldByCurrentThread();
+
+            if (canParallelizeThisColumn && jobScheduler.threadCount() > 1 && !hasShifts &&
+                    ((resultTypeIsTableOrRowSet && totalSize > 0)
+                            || totalSize >= QueryTable.MINIMUM_PARALLEL_SELECT_ROWS)) {
+                final long divisionSize = resultTypeIsTableOrRowSet ? 1
+                        : Math.max(QueryTable.MINIMUM_PARALLEL_SELECT_ROWS,
+                                (totalSize + jobScheduler.threadCount() - 1) / jobScheduler.threadCount());
+                final List<TableUpdate> updates = new ArrayList<>();
+                // divide up the additions and modifications
+                try (final RowSequence.Iterator rsAddIt = upstream.added().getRowSequenceIterator();
+                        final RowSequence.Iterator rsModIt = upstream.modified().getRowSequenceIterator()) {
+                    while (rsAddIt.hasMore() || rsModIt.hasMore()) {
+                        final TableUpdateImpl update = new TableUpdateImpl();
+                        update.modifiedColumnSet = upstream.modifiedColumnSet();
+                        update.shifted = RowSetShiftData.EMPTY;
+                        update.removed = RowSetFactory.empty();
+
+                        if (rsAddIt.hasMore()) {
+                            update.added = rsAddIt.getNextRowSequenceWithLength(divisionSize).asRowSet();
+                        } else {
+                            update.added = RowSetFactory.empty();
+                        }
 
-                            jobScheduler.submit(
-                                    executionContext,
-                                    () -> prepareParallelUpdate(jobScheduler, upstream, toClear, helper,
-                                            liveResultOwner, onCompletion, this::onError, updates,
-                                            serialTableOperationsSafe),
-                                    SelectColumnLayer.this, this::onError);
+                        if (update.added.size() < divisionSize && rsModIt.hasMore()) {
+                            update.modified = rsModIt
+                                    .getNextRowSequenceWithLength(divisionSize - update.added().size())
+                                    .asRowSet();
                         } else {
-                            jobScheduler.submit(
-                                    executionContext,
-                                    () -> doSerialApplyUpdate(upstream, toClear, helper, liveResultOwner, onCompletion,
-                                            serialTableOperationsSafe),
-                                    SelectColumnLayer.this, this::onError);
+                            update.modified = RowSetFactory.empty();
                         }
+
+                        updates.add(update);
                     }
-                });
+                }
+
+                if (updates.isEmpty()) {
+                    throw new IllegalStateException();
+                }
+
+                jobScheduler.submit(
+                        executionContext,
+                        () -> prepareParallelUpdate(jobScheduler, upstream, toClear, helper, liveResultOwner, onSuccess,
+                                onError, updates, serialTableOperationsSafe),
+                        SelectColumnLayer.this, onError);
+            } else {
+                jobScheduler.submit(
+                        executionContext,
+                        () -> doSerialApplyUpdate(upstream, toClear, helper, liveResultOwner, onSuccess,
+                                serialTableOperationsSafe),
+                        SelectColumnLayer.this, onError);
+            }
+        };
     }
 
-    private void prepareParallelUpdate(final JobScheduler jobScheduler, final TableUpdate upstream,
-            final RowSet toClear, final UpdateHelper helper, @Nullable final LivenessNode liveResultOwner,
-            final SelectLayerCompletionHandler onCompletion, final Consumer<Exception> onError,
-            final List<TableUpdate> splitUpdates, final boolean serialTableOperationsSafe) {
+    private void prepareParallelUpdate(
+            final JobScheduler jobScheduler,
+            final TableUpdate upstream,
+            final RowSet toClear,
+            final SelectAndViewAnalyzer.UpdateHelper helper,
+            @Nullable final LivenessNode liveResultOwner,
+            final Runnable onSuccess,
+            final Consumer<Exception> onError,
+            final List<TableUpdate> splitUpdates,
+            final boolean serialTableOperationsSafe) {
         // we have to do removal and previous initialization before we can do any of the actual filling in multiple
         // threads to avoid concurrency problems with our destination column sources
         doEnsureCapacity();
@@ -250,13 +286,17 @@ private void prepareParallelUpdate(final JobScheduler jobScheduler, final TableU
                     if (!isRedirected) {
                         clearObjectsAtThisLevel(toClear);
                     }
-                    onCompletion.onLayerCompleted(getLayerIndex());
+                    onSuccess.run();
                 },
                 onError);
     }
 
-    private void doSerialApplyUpdate(final TableUpdate upstream, final RowSet toClear, final UpdateHelper helper,
-            @Nullable final LivenessNode liveResultOwner, final SelectLayerCompletionHandler onCompletion,
+    private void doSerialApplyUpdate(
+            final TableUpdate upstream,
+            final RowSet toClear,
+            final SelectAndViewAnalyzer.UpdateHelper helper,
+            @Nullable final LivenessNode liveResultOwner,
+            final Runnable onSuccess,
             final boolean serialTableOperationsSafe) {
         doEnsureCapacity();
         final boolean oldSafe = updateGraph.setSerialTableOperationsSafe(serialTableOperationsSafe);
@@ -269,11 +309,14 @@ private void doSerialApplyUpdate(final TableUpdate upstream, final RowSet toClea
         if (!isRedirected) {
             clearObjectsAtThisLevel(toClear);
         }
-        onCompletion.onLayerCompleted(getLayerIndex());
+        onSuccess.run();
     }
 
-    private void doParallelApplyUpdate(final TableUpdate upstream, final UpdateHelper helper,
-            @Nullable final LivenessNode liveResultOwner, final boolean serialTableOperationsSafe,
+    private void doParallelApplyUpdate(
+            final TableUpdate upstream,
+            final SelectAndViewAnalyzer.UpdateHelper helper,
+            @Nullable final LivenessNode liveResultOwner,
+            final boolean serialTableOperationsSafe,
             final long startOffset) {
         final boolean oldSafe = updateGraph.setSerialTableOperationsSafe(serialTableOperationsSafe);
         try {
@@ -285,8 +328,11 @@ private void doParallelApplyUpdate(final TableUpdate upstream, final UpdateHelpe
         upstream.release();
     }
 
-    private Boolean doApplyUpdate(final TableUpdate upstream, final UpdateHelper helper,
-            @Nullable final LivenessNode liveResultOwner, final long startOffset) {
+    private Boolean doApplyUpdate(
+            final TableUpdate upstream,
+            final SelectAndViewAnalyzer.UpdateHelper helper,
+            @Nullable final LivenessNode liveResultOwner,
+            final long startOffset) {
         final int PAGE_SIZE = 4096;
         final LongToIntFunction contextSize = (long size) -> size > PAGE_SIZE ? PAGE_SIZE : (int) size;
 
@@ -594,16 +640,6 @@ private void clearObjectsAtThisLevel(RowSet keys) {
         }
     }
 
-    @Override
-    public boolean flattenedResult() {
-        return flattenedResult;
-    }
-
-    @Override
-    public boolean alreadyFlattenedSources() {
-        return alreadyFlattenedSources;
-    }
-
     @Override
     public LogOutput append(LogOutput logOutput) {
         return logOutput.append("{SelectColumnLayer: ").append(selectColumn.toString()).append(", layerIndex=")
@@ -612,6 +648,6 @@ public LogOutput append(LogOutput logOutput) {
 
     @Override
     public boolean allowCrossColumnParallelization() {
-        return selectColumn.isStateless() && inner.allowCrossColumnParallelization();
+        return selectColumn.isStateless();
     }
 }
diff --git a/engine/table/src/main/java/io/deephaven/engine/table/impl/select/analyzers/SelectOrViewColumnLayer.java b/engine/table/src/main/java/io/deephaven/engine/table/impl/select/analyzers/SelectOrViewColumnLayer.java
index 5fbef5b9d74..ebf2ac05ec2 100644
--- a/engine/table/src/main/java/io/deephaven/engine/table/impl/select/analyzers/SelectOrViewColumnLayer.java
+++ b/engine/table/src/main/java/io/deephaven/engine/table/impl/select/analyzers/SelectOrViewColumnLayer.java
@@ -12,18 +12,20 @@
 public abstract class SelectOrViewColumnLayer extends DependencyLayerBase {
     private final ColumnSource<?> optionalUnderlying;
 
-    SelectOrViewColumnLayer(SelectAndViewAnalyzer inner, String name, SelectColumn sc,
-            ColumnSource<?> ws, ColumnSource<?> optionalUnderlying,
-            String[] deps, ModifiedColumnSet mcsBuilder) {
-        super(inner, name, sc, ws, deps, mcsBuilder);
+    SelectOrViewColumnLayer(
+            final SelectAndViewAnalyzer.AnalyzerContext context,
+            final SelectColumn sc,
+            final ColumnSource<?> ws,
+            final ColumnSource<?> optionalUnderlying,
+            final String[] deps,
+            final ModifiedColumnSet mcsBuilder) {
+        super(context, sc, ws, deps, mcsBuilder);
         this.optionalUnderlying = optionalUnderlying;
     }
 
     @Override
-    final Map<String, ColumnSource<?>> getColumnSourcesRecurse(GetMode mode) {
-        final Map<String, ColumnSource<?>> result = inner.getColumnSourcesRecurse(mode);
+    void populateColumnSources(final Map<String, ColumnSource<?>> result) {
         result.put(name, columnSource);
-        return result;
     }
 
     @Override
@@ -32,6 +34,5 @@ public void startTrackingPrev() {
         if (optionalUnderlying != null) {
             optionalUnderlying.startTrackingPrevValues();
         }
-        inner.startTrackingPrev();
     }
 }
diff --git a/engine/table/src/main/java/io/deephaven/engine/table/impl/select/analyzers/StaticFlattenLayer.java b/engine/table/src/main/java/io/deephaven/engine/table/impl/select/analyzers/StaticFlattenLayer.java
deleted file mode 100644
index 25827b2ca19..00000000000
--- a/engine/table/src/main/java/io/deephaven/engine/table/impl/select/analyzers/StaticFlattenLayer.java
+++ /dev/null
@@ -1,146 +0,0 @@
-//
-// Copyright (c) 2016-2024 Deephaven Data Labs and Patent Pending
-//
-package io.deephaven.engine.table.impl.select.analyzers;
-
-import io.deephaven.base.log.LogOutput;
-import io.deephaven.base.verify.Assert;
-import io.deephaven.engine.liveness.LivenessNode;
-import io.deephaven.engine.rowset.RowSet;
-import io.deephaven.engine.rowset.RowSetFactory;
-import io.deephaven.engine.rowset.RowSetShiftData;
-import io.deephaven.engine.rowset.TrackingRowSet;
-import io.deephaven.engine.table.ColumnDefinition;
-import io.deephaven.engine.table.ColumnSource;
-import io.deephaven.engine.table.ModifiedColumnSet;
-import io.deephaven.engine.table.TableUpdate;
-import io.deephaven.engine.table.impl.TableUpdateImpl;
-import io.deephaven.engine.table.impl.sources.RedirectedColumnSource;
-import io.deephaven.engine.table.impl.util.RowRedirection;
-import io.deephaven.engine.table.impl.util.WrappedRowSetRowRedirection;
-import io.deephaven.engine.table.impl.util.JobScheduler;
-import org.jetbrains.annotations.Nullable;
-
-import java.util.BitSet;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.LinkedHashMap;
-import java.util.Map;
-import java.util.Set;
-
-final public class StaticFlattenLayer extends SelectAndViewAnalyzer {
-    private final SelectAndViewAnalyzer inner;
-    private final TrackingRowSet parentRowSet;
-    private final Map<String, ColumnSource<?>> overriddenColumns;
-
-    StaticFlattenLayer(SelectAndViewAnalyzer inner, TrackingRowSet parentRowSet) {
-        super(inner.getLayerIndex() + 1);
-        this.inner = inner;
-        this.parentRowSet = parentRowSet;
-        final HashSet<String> alreadyFlattenedColumns = new HashSet<>();
-        inner.getNewColumnSources().forEach((name, cs) -> {
-            alreadyFlattenedColumns.add(name);
-        });
-
-        final RowRedirection rowRedirection = new WrappedRowSetRowRedirection(parentRowSet);
-        overriddenColumns = new HashMap<>();
-        inner.getAllColumnSources().forEach((name, cs) -> {
-            if (alreadyFlattenedColumns.contains(name)) {
-                return;
-            }
-
-            overriddenColumns.put(name, RedirectedColumnSource.maybeRedirect(rowRedirection, cs));
-        });
-    }
-
-    @Override
-    void setBaseBits(BitSet bitset) {
-        inner.setBaseBits(bitset);
-    }
-
-    @Override
-    void populateModifiedColumnSetRecurse(ModifiedColumnSet mcsBuilder, Set<String> remainingDepsToSatisfy) {
-        inner.populateModifiedColumnSetRecurse(mcsBuilder, remainingDepsToSatisfy);
-    }
-
-    @Override
-    Map<String, ColumnSource<?>> getColumnSourcesRecurse(GetMode mode) {
-        final Map<String, ColumnSource<?>> innerColumns = inner.getColumnSourcesRecurse(mode);
-
-        if (overriddenColumns.keySet().stream().noneMatch(innerColumns::containsKey)) {
-            return innerColumns;
-        }
-
-        final Map<String, ColumnSource<?>> columns = new LinkedHashMap<>();
-        innerColumns.forEach((name, cs) -> columns.put(name, overriddenColumns.getOrDefault(name, cs)));
-        return columns;
-    }
-
-    @Override
-    public void applyUpdate(TableUpdate upstream, RowSet toClear, UpdateHelper helper, JobScheduler jobScheduler,
-            @Nullable LivenessNode liveResultOwner, SelectLayerCompletionHandler onCompletion) {
-        // this must be the fake update used to initialize the result table
-        Assert.eqTrue(upstream.added().isFlat(), "upstream.added.isFlat()");
-        Assert.eq(upstream.added().size(), "upstream.added.size()", parentRowSet.size(), "parentRowSet.size()");
-        Assert.eqTrue(upstream.removed().isEmpty(), "upstream.removed.isEmpty()");
-        Assert.eqTrue(upstream.modified().isEmpty(), "upstream.modified.isEmpty()");
-
-        final BitSet baseLayerBitSet = new BitSet();
-        inner.setBaseBits(baseLayerBitSet);
-        final TableUpdate innerUpdate = new TableUpdateImpl(
-                parentRowSet.copy(), RowSetFactory.empty(), RowSetFactory.empty(),
-                RowSetShiftData.EMPTY, ModifiedColumnSet.EMPTY);
-        inner.applyUpdate(innerUpdate, toClear, helper, jobScheduler, liveResultOwner,
-                new SelectLayerCompletionHandler(baseLayerBitSet, onCompletion) {
-                    @Override
-                    public void onAllRequiredColumnsCompleted() {
-                        onCompletion.onLayerCompleted(getLayerIndex());
-                    }
-                });
-    }
-
-    @Override
-    Map<String, Set<String>> calcDependsOnRecurse(boolean forcePublishAllResources) {
-        return inner.calcDependsOnRecurse(forcePublishAllResources);
-    }
-
-    @Override
-    public SelectAndViewAnalyzer getInner() {
-        return inner;
-    }
-
-    @Override
-    int getLayerIndexFor(String column) {
-        if (overriddenColumns.containsKey(column)) {
-            return getLayerIndex();
-        }
-        return inner.getLayerIndexFor(column);
-    }
-
-    @Override
-    public void startTrackingPrev() {
-        throw new UnsupportedOperationException("StaticFlattenLayer is used in only non-refreshing scenarios");
-    }
-
-    @Override
-    public LogOutput append(LogOutput logOutput) {
-        return logOutput.append("{StaticFlattenLayer").append(", layerIndex=").append(getLayerIndex()).append("}");
-    }
-
-    @Override
-    public boolean allowCrossColumnParallelization() {
-        return inner.allowCrossColumnParallelization();
-    }
-
-    @Override
-    public boolean flattenedResult() {
-        // this layer performs a flatten, so the result is flattened
-        return true;
-    }
-
-    @Override
-    public boolean alreadyFlattenedSources() {
-        // this layer performs a flatten, so the sources are now flattened
-        return true;
-    }
-}
diff --git a/engine/table/src/main/java/io/deephaven/engine/table/impl/select/analyzers/ViewColumnLayer.java b/engine/table/src/main/java/io/deephaven/engine/table/impl/select/analyzers/ViewColumnLayer.java
index 84bdda755a5..890324b77f7 100644
--- a/engine/table/src/main/java/io/deephaven/engine/table/impl/select/analyzers/ViewColumnLayer.java
+++ b/engine/table/src/main/java/io/deephaven/engine/table/impl/select/analyzers/ViewColumnLayer.java
@@ -4,35 +4,34 @@
 package io.deephaven.engine.table.impl.select.analyzers;
 
 import io.deephaven.base.log.LogOutput;
-import io.deephaven.base.verify.Assert;
 import io.deephaven.configuration.Configuration;
-import io.deephaven.engine.liveness.LivenessNode;
 import io.deephaven.engine.liveness.LivenessReferent;
-import io.deephaven.engine.rowset.RowSet;
 import io.deephaven.engine.table.ColumnSource;
 import io.deephaven.engine.table.ModifiedColumnSet;
-import io.deephaven.engine.table.TableUpdate;
 import io.deephaven.engine.table.impl.select.SelectColumn;
-import io.deephaven.engine.table.impl.util.JobScheduler;
 import org.jetbrains.annotations.NotNull;
-import org.jetbrains.annotations.Nullable;
 
 final public class ViewColumnLayer extends SelectOrViewColumnLayer {
 
     private static final boolean ALLOW_LIVENESS_REFERENT_RESULTS = Configuration.getInstance()
             .getBooleanForClassWithDefault(ViewColumnLayer.class, "allowLivenessReferentResults", false);
 
-    ViewColumnLayer(SelectAndViewAnalyzer inner, String name, SelectColumn sc, ColumnSource cs, String[] deps,
-            ModifiedColumnSet mcsBuilder) {
-        super(inner, name, sc, checkResultType(cs), null, deps, mcsBuilder);
+    ViewColumnLayer(
+            final SelectAndViewAnalyzer.AnalyzerContext context,
+            final SelectColumn sc,
+            final ColumnSource<?> cs,
+            final String[] deps,
+            final ModifiedColumnSet mcsBuilder) {
+        super(context, sc, checkResultType(cs), null, deps, mcsBuilder);
+        if (sc.recomputeOnModifiedRow()) {
+            throw new IllegalArgumentException(
+                    "SelectColumn may not have recomputeOnModifiedRow set for a view column: " + sc);
+        }
     }
 
     @Override
-    public void applyUpdate(TableUpdate upstream, RowSet toClear, UpdateHelper helper, JobScheduler jobScheduler,
-            @Nullable LivenessNode liveResultOwner, SelectLayerCompletionHandler completionHandler) {
-        // To be parallel with SelectColumnLayer, we would recurse here, but since this is ViewColumnLayer
-        // (and all my inner layers are ViewColumnLayer), there's nothing to do.
-        Assert.eqNull(completionHandler, "completionHandler");
+    public boolean hasRefreshingLogic() {
+        return false;
     }
 
     @Override
@@ -47,7 +46,7 @@ public boolean allowCrossColumnParallelization() {
         return false;
     }
 
-    private static ColumnSource checkResultType(@NotNull final ColumnSource cs) {
+    private static ColumnSource<?> checkResultType(@NotNull final ColumnSource<?> cs) {
         final Class<?> resultType = cs.getType();
         if (!ALLOW_LIVENESS_REFERENT_RESULTS && LivenessReferent.class.isAssignableFrom(resultType)) {
             throw new UnsupportedOperationException(String.format(
diff --git a/engine/table/src/main/java/io/deephaven/engine/table/impl/select/codegen/FormulaAnalyzer.java b/engine/table/src/main/java/io/deephaven/engine/table/impl/select/codegen/FormulaAnalyzer.java
index eecd97ae009..0ef5b12f59e 100644
--- a/engine/table/src/main/java/io/deephaven/engine/table/impl/select/codegen/FormulaAnalyzer.java
+++ b/engine/table/src/main/java/io/deephaven/engine/table/impl/select/codegen/FormulaAnalyzer.java
@@ -3,7 +3,7 @@
 //
 package io.deephaven.engine.table.impl.select.codegen;
 
-import io.deephaven.datastructures.util.CollectionUtil;
+import io.deephaven.api.util.NameValidator;
 import io.deephaven.engine.context.ExecutionContext;
 import io.deephaven.engine.context.QueryLibrary;
 import io.deephaven.engine.table.ColumnDefinition;
@@ -13,8 +13,6 @@
 import io.deephaven.vector.ObjectVector;
 import io.deephaven.engine.table.impl.select.DhFormulaColumn;
 import io.deephaven.engine.table.impl.select.formula.FormulaSourceDescriptor;
-import io.deephaven.engine.table.WritableColumnSource;
-import io.deephaven.engine.rowset.TrackingWritableRowSet;
 import io.deephaven.internal.log.LoggerFactory;
 import io.deephaven.io.logger.Logger;
 import org.jetbrains.annotations.NotNull;
@@ -29,9 +27,45 @@
 public class FormulaAnalyzer {
     private static final Logger log = LoggerFactory.getLogger(FormulaAnalyzer.class);
 
+    /**
+     * A container to hold a single copy of imports required to compile formulas for one operation.
+     */
+    public static final class Imports {
+        private final Map<String, Object> queryScopeVariables;
+        private final Collection<Package> packageImports;
+        private final Collection<Class<?>> classImports;
+        private final Collection<Class<?>> staticImports;
+
+        public Imports() {
+            final ExecutionContext context = ExecutionContext.getContext();
+            queryScopeVariables = Collections.unmodifiableMap(
+                    context.getQueryScope().toMap((name, value) -> NameValidator.isValidQueryParameterName(name)));
+            final QueryLibrary queryLibrary = context.getQueryLibrary();
+            packageImports = Set.copyOf(queryLibrary.getPackageImports());
+            classImports = Set.copyOf(queryLibrary.getClassImports());
+            staticImports = Set.copyOf(queryLibrary.getStaticImports());
+        }
+
+        public Map<String, Object> getQueryScopeVariables() {
+            return queryScopeVariables;
+        }
+
+        public Collection<Package> getPackageImports() {
+            return packageImports;
+        }
+
+        public Collection<Class<?>> getClassImports() {
+            return classImports;
+        }
+
+        public Collection<Class<?>> getStaticImports() {
+            return staticImports;
+        }
+    }
+
     public static Result analyze(final String rawFormulaString,
             final Map<String, ColumnDefinition<?>> columnDefinitionMap,
-            final QueryLanguageParser.Result queryLanguageResult) throws Exception {
+            final QueryLanguageParser.Result queryLanguageResult) {
 
         log.debug().append("Expression (after language conversion) : ")
                 .append(queryLanguageResult.getConvertedExpression())
@@ -63,9 +97,9 @@ public static Result analyze(final String rawFormulaString,
         final String cookedFormulaString = queryLanguageResult.getConvertedExpression();
         final String timeInstanceVariables = queryLanguageResult.getTimeConversionResult().getInstanceVariablesString();
         return new Result(returnedType,
-                usedColumns.toArray(CollectionUtil.ZERO_LENGTH_STRING_ARRAY),
-                usedColumnArrays.toArray(CollectionUtil.ZERO_LENGTH_STRING_ARRAY),
-                userParams.toArray(CollectionUtil.ZERO_LENGTH_STRING_ARRAY),
+                usedColumns.toArray(String[]::new),
+                usedColumnArrays.toArray(String[]::new),
+                userParams.toArray(String[]::new),
                 rawFormulaString, cookedFormulaString, timeInstanceVariables,
                 queryLanguageResult.isConstantValueExpression());
     }
@@ -76,7 +110,7 @@ public static Result analyze(final String rawFormulaString,
      * @param formulaString The raw formula string
      * @param availableColumns The columns available for use in the formula
      * @param columnRenames Outer to inner column name mapping
-     * @param queryScopeVariables The query scope variables
+     * @param imports The query scope variables, package, class, and static imports
      * @return The parsed formula {@link QueryLanguageParser.Result result}
      * @throws Exception If the formula cannot be parsed
      */
@@ -84,8 +118,8 @@ public static QueryLanguageParser.Result parseFormula(
             @NotNull final String formulaString,
             @NotNull final Map<String, ColumnDefinition<?>> availableColumns,
             @NotNull final Map<String, String> columnRenames,
-            @NotNull final Map<String, Object> queryScopeVariables) throws Exception {
-        return parseFormula(formulaString, availableColumns, columnRenames, queryScopeVariables, true);
+            @NotNull final Imports imports) throws Exception {
+        return parseFormula(formulaString, availableColumns, columnRenames, imports, true);
     }
 
     /**
@@ -94,7 +128,7 @@ public static QueryLanguageParser.Result parseFormula(
      * @param formulaString The raw formula string
      * @param availableColumns The columns available for use in the formula
      * @param columnRenames Outer to inner column name mapping
-     * @param queryScopeVariables The query scope variables
+     * @param imports The query scope variables, package, class, and static imports
      * @param unboxArguments If true it will unbox the query scope arguments
      * @return The parsed formula {@link QueryLanguageParser.Result result}
      * @throws Exception If the formula cannot be parsed
@@ -103,7 +137,7 @@ public static QueryLanguageParser.Result parseFormula(
             @NotNull final String formulaString,
             @NotNull final Map<String, ColumnDefinition<?>> availableColumns,
             @NotNull final Map<String, String> columnRenames,
-            @NotNull final Map<String, Object> queryScopeVariables,
+            @NotNull final Imports imports,
             final boolean unboxArguments) throws Exception {
 
         final TimeLiteralReplacedExpression timeConversionResult =
@@ -178,7 +212,7 @@ public static QueryLanguageParser.Result parseFormula(
         }
 
         // Parameters come last.
-        for (Map.Entry<String, Object> param : queryScopeVariables.entrySet()) {
+        for (Map.Entry<String, Object> param : imports.queryScopeVariables.entrySet()) {
             if (possibleVariables.containsKey(param.getKey())) {
                 // Columns and column arrays take precedence over parameters.
                 continue;
@@ -201,13 +235,10 @@ public static QueryLanguageParser.Result parseFormula(
 
         possibleVariables.putAll(timeConversionResult.getNewVariables());
 
-        final QueryLibrary queryLibrary = ExecutionContext.getContext().getQueryLibrary();
-        final Set<Class<?>> classImports = new HashSet<>(queryLibrary.getClassImports());
-        classImports.add(TrackingWritableRowSet.class);
-        classImports.add(WritableColumnSource.class);
-        return new QueryLanguageParser(timeConversionResult.getConvertedFormula(), queryLibrary.getPackageImports(),
-                classImports, queryLibrary.getStaticImports(), possibleVariables, possibleVariableParameterizedTypes,
-                queryScopeVariables, columnVariables, unboxArguments, timeConversionResult).getResult();
+        return new QueryLanguageParser(timeConversionResult.getConvertedFormula(), imports.getPackageImports(),
+                imports.getClassImports(), imports.getStaticImports(), possibleVariables,
+                possibleVariableParameterizedTypes, imports.getQueryScopeVariables(), columnVariables, unboxArguments,
+                timeConversionResult).getResult();
     }
 
     public static class Result {
diff --git a/engine/table/src/main/java/io/deephaven/engine/table/impl/select/python/FilterKernelPythonChunkedFunction.java b/engine/table/src/main/java/io/deephaven/engine/table/impl/select/python/FilterKernelPythonChunkedFunction.java
index c8bbe7e8667..2a17f476306 100644
--- a/engine/table/src/main/java/io/deephaven/engine/table/impl/select/python/FilterKernelPythonChunkedFunction.java
+++ b/engine/table/src/main/java/io/deephaven/engine/table/impl/select/python/FilterKernelPythonChunkedFunction.java
@@ -3,6 +3,8 @@
 //
 package io.deephaven.engine.table.impl.select.python;
 
+import io.deephaven.chunk.WritableBooleanChunk;
+import io.deephaven.chunk.attributes.Values;
 import io.deephaven.engine.table.impl.select.ConditionFilter.FilterKernel;
 import io.deephaven.engine.rowset.chunkattributes.OrderedRowKeys;
 import io.deephaven.chunk.Chunk;
@@ -59,4 +61,57 @@ public LongChunk<OrderedRowKeys> filter(
         }
         return context.resultChunk;
     }
+
+    @Override
+    public int filter(
+            final Context context,
+            final Chunk[] inputChunks,
+            final int chunkSize,
+            final WritableBooleanChunk<Values> results) {
+        FillContextPython fillContextPython = context.getKernelContext();
+        fillContextPython.resolveColumnChunks(inputChunks, chunkSize);
+
+        final boolean[] pyResults = function
+                .call(boolean[].class, CALL_METHOD, fillContextPython.getChunkedArgTypes(),
+                        fillContextPython.getChunkedArgs());
+        if (chunkSize > pyResults.length) {
+            throw new IllegalStateException(
+                    "FilterKernelPythonChunkedFunction returned results are not the proper size");
+        }
+        // Count the number of true values
+        int count = 0;
+        for (int i = 0; i < chunkSize; ++i) {
+            boolean newResult = pyResults[i];
+            results.set(i, newResult);
+            count += newResult ? 1 : 0;
+        }
+        return count;
+    }
+
+    @Override
+    public int filterAnd(
+            final Context context,
+            final Chunk[] inputChunks,
+            final int chunkSize,
+            final WritableBooleanChunk<Values> results) {
+        FillContextPython fillContextPython = context.getKernelContext();
+        fillContextPython.resolveColumnChunks(inputChunks, chunkSize);
+
+        final boolean[] pyResults = function
+                .call(boolean[].class, CALL_METHOD, fillContextPython.getChunkedArgTypes(),
+                        fillContextPython.getChunkedArgs());
+        if (chunkSize > pyResults.length) {
+            throw new IllegalStateException(
+                    "FilterKernelPythonChunkedFunction returned results are not the proper size");
+        }
+        // Count values that changed from true to false
+        int count = 0;
+        for (int i = 0; i < chunkSize; ++i) {
+            boolean result = results.get(i);
+            boolean newResult = result & pyResults[i];
+            results.set(i, newResult);
+            count += result == newResult ? 0 : 1;
+        }
+        return count;
+    }
 }
diff --git a/engine/table/src/main/java/io/deephaven/engine/table/impl/select/python/FilterKernelPythonSingularFunction.java b/engine/table/src/main/java/io/deephaven/engine/table/impl/select/python/FilterKernelPythonSingularFunction.java
index f7a42c84acc..fc88c77ee67 100644
--- a/engine/table/src/main/java/io/deephaven/engine/table/impl/select/python/FilterKernelPythonSingularFunction.java
+++ b/engine/table/src/main/java/io/deephaven/engine/table/impl/select/python/FilterKernelPythonSingularFunction.java
@@ -3,6 +3,8 @@
 //
 package io.deephaven.engine.table.impl.select.python;
 
+import io.deephaven.chunk.WritableBooleanChunk;
+import io.deephaven.chunk.attributes.Values;
 import io.deephaven.engine.table.impl.select.ConditionFilter.FilterKernel;
 import io.deephaven.engine.rowset.chunkattributes.OrderedRowKeys;
 import io.deephaven.chunk.Chunk;
@@ -48,4 +50,47 @@ public LongChunk<OrderedRowKeys> filter(
         }
         return context.resultChunk;
     }
+
+    @Override
+    public int filter(
+            final Context context,
+            final Chunk[] inputChunks,
+            final int chunkSize,
+            final WritableBooleanChunk<Values> results) {
+        final Class<?>[] paramTypes = ArgumentsSingular.buildParamTypes(inputChunks);
+        context.resultChunk.setSize(0);
+        // Count the number of true values
+        int count = 0;
+        for (int i = 0; i < chunkSize; ++i) {
+            final Object[] params = ArgumentsSingular.buildArguments(inputChunks, i);
+            boolean newResult = function.call(boolean.class, CALL_METHOD, paramTypes, params);
+            results.set(i, newResult);
+            count += newResult ? 1 : 0;
+        }
+        return count;
+    }
+
+    @Override
+    public int filterAnd(
+            final Context context,
+            final Chunk[] inputChunks,
+            final int chunkSize,
+            final WritableBooleanChunk<Values> results) {
+        final Class<?>[] paramTypes = ArgumentsSingular.buildParamTypes(inputChunks);
+        context.resultChunk.setSize(0);
+        // Count the values that changed from true to false
+        int count = 0;
+        for (int i = 0; i < chunkSize; ++i) {
+            boolean result = results.get(i);
+            // Save the cost of the call if the result is already false
+            if (!result) {
+                continue;
+            }
+            final Object[] params = ArgumentsSingular.buildArguments(inputChunks, i);
+            boolean newResult = function.call(boolean.class, CALL_METHOD, paramTypes, params);
+            results.set(i, newResult);
+            count += result == newResult ? 0 : 1;
+        }
+        return count;
+    }
 }
diff --git a/engine/table/src/main/java/io/deephaven/engine/table/impl/select/python/FormulaColumnPython.java b/engine/table/src/main/java/io/deephaven/engine/table/impl/select/python/FormulaColumnPython.java
index 298abcf1702..99d72638e87 100644
--- a/engine/table/src/main/java/io/deephaven/engine/table/impl/select/python/FormulaColumnPython.java
+++ b/engine/table/src/main/java/io/deephaven/engine/table/impl/select/python/FormulaColumnPython.java
@@ -6,6 +6,7 @@
 import io.deephaven.engine.table.ColumnDefinition;
 import io.deephaven.engine.context.QueryScopeParam;
 import io.deephaven.util.CompletionStageFuture;
+import io.deephaven.util.type.ArrayTypeUtils;
 import io.deephaven.vector.Vector;
 import io.deephaven.engine.table.impl.select.AbstractFormulaColumn;
 import io.deephaven.engine.table.impl.select.SelectColumn;
@@ -19,8 +20,6 @@
 import java.util.Map;
 import java.util.Objects;
 
-import static io.deephaven.datastructures.util.CollectionUtil.ZERO_LENGTH_STRING_ARRAY;
-
 /**
  * A formula column for python native code.
  */
@@ -62,9 +61,9 @@ public boolean isStateless() {
     protected final FormulaSourceDescriptor getSourceDescriptor() {
         return new FormulaSourceDescriptor(
                 returnedType,
-                dcf.getColumnNames().toArray(new String[0]),
-                ZERO_LENGTH_STRING_ARRAY,
-                ZERO_LENGTH_STRING_ARRAY);
+                dcf.getColumnNames().toArray(String[]::new),
+                ArrayTypeUtils.EMPTY_STRING_ARRAY,
+                ArrayTypeUtils.EMPTY_STRING_ARRAY);
     }
 
     @Override
diff --git a/engine/table/src/main/java/io/deephaven/engine/table/impl/sort/timsort/ObjectByteTimsortDescendingKernel.java b/engine/table/src/main/java/io/deephaven/engine/table/impl/sort/timsort/ObjectByteTimsortDescendingKernel.java
index 1dde8e730af..285bbba2437 100644
--- a/engine/table/src/main/java/io/deephaven/engine/table/impl/sort/timsort/ObjectByteTimsortDescendingKernel.java
+++ b/engine/table/src/main/java/io/deephaven/engine/table/impl/sort/timsort/ObjectByteTimsortDescendingKernel.java
@@ -9,6 +9,7 @@
 package io.deephaven.engine.table.impl.sort.timsort;
 
 import java.util.Objects;
+import io.deephaven.util.compare.ObjectComparisons;
 
 import io.deephaven.chunk.attributes.Any;
 import io.deephaven.chunk.attributes.ChunkLengths;
@@ -204,17 +205,7 @@ static private <SORT_VALUES_ATTR extends Any, PERMUTE_VALUES_ATTR extends Any> v
     // region comparison functions
     // descending comparison
     private static int doComparison(Object lhs, Object rhs) {
-        if (lhs == rhs) {
-            return 0;
-        }
-        if (lhs == null) {
-            return 1;
-        }
-        if (rhs == null) {
-            return -1;
-        }
-        //noinspection unchecked,rawtypes
-        return ((Comparable)rhs).compareTo(lhs);
+        return ObjectComparisons.compare(rhs, lhs);
     }
     // endregion comparison functions
 
diff --git a/engine/table/src/main/java/io/deephaven/engine/table/impl/sort/timsort/ObjectByteTimsortKernel.java b/engine/table/src/main/java/io/deephaven/engine/table/impl/sort/timsort/ObjectByteTimsortKernel.java
index 69de4107b14..a91afda549f 100644
--- a/engine/table/src/main/java/io/deephaven/engine/table/impl/sort/timsort/ObjectByteTimsortKernel.java
+++ b/engine/table/src/main/java/io/deephaven/engine/table/impl/sort/timsort/ObjectByteTimsortKernel.java
@@ -8,6 +8,7 @@
 package io.deephaven.engine.table.impl.sort.timsort;
 
 import java.util.Objects;
+import io.deephaven.util.compare.ObjectComparisons;
 
 import io.deephaven.chunk.attributes.Any;
 import io.deephaven.chunk.attributes.ChunkLengths;
@@ -203,19 +204,8 @@ static private <SORT_VALUES_ATTR extends Any, PERMUTE_VALUES_ATTR extends Any> v
     // region comparison functions
     // ascending comparison
     private static int doComparison(Object lhs, Object rhs) {
-       if (lhs == rhs) {
-            return 0;
-        }
-        if (lhs == null) {
-            return -1;
-        }
-        if (rhs == null) {
-            return 1;
-        }
-        //noinspection unchecked,rawtypes
-        return ((Comparable)lhs).compareTo(rhs);
+        return ObjectComparisons.compare(lhs, rhs);
     }
-
     // endregion comparison functions
 
     @VisibleForTesting
diff --git a/engine/table/src/main/java/io/deephaven/engine/table/impl/sort/timsort/ObjectIntTimsortDescendingKernel.java b/engine/table/src/main/java/io/deephaven/engine/table/impl/sort/timsort/ObjectIntTimsortDescendingKernel.java
index c02a83662b0..6ee2d1259c5 100644
--- a/engine/table/src/main/java/io/deephaven/engine/table/impl/sort/timsort/ObjectIntTimsortDescendingKernel.java
+++ b/engine/table/src/main/java/io/deephaven/engine/table/impl/sort/timsort/ObjectIntTimsortDescendingKernel.java
@@ -9,6 +9,7 @@
 package io.deephaven.engine.table.impl.sort.timsort;
 
 import java.util.Objects;
+import io.deephaven.util.compare.ObjectComparisons;
 
 import io.deephaven.chunk.attributes.Any;
 import io.deephaven.chunk.attributes.ChunkLengths;
@@ -204,17 +205,7 @@ static private <SORT_VALUES_ATTR extends Any, PERMUTE_VALUES_ATTR extends Any> v
     // region comparison functions
     // descending comparison
     private static int doComparison(Object lhs, Object rhs) {
-        if (lhs == rhs) {
-            return 0;
-        }
-        if (lhs == null) {
-            return 1;
-        }
-        if (rhs == null) {
-            return -1;
-        }
-        //noinspection unchecked,rawtypes
-        return ((Comparable)rhs).compareTo(lhs);
+        return ObjectComparisons.compare(rhs, lhs);
     }
     // endregion comparison functions
 
diff --git a/engine/table/src/main/java/io/deephaven/engine/table/impl/sort/timsort/ObjectIntTimsortKernel.java b/engine/table/src/main/java/io/deephaven/engine/table/impl/sort/timsort/ObjectIntTimsortKernel.java
index 973f705e64c..092177d9583 100644
--- a/engine/table/src/main/java/io/deephaven/engine/table/impl/sort/timsort/ObjectIntTimsortKernel.java
+++ b/engine/table/src/main/java/io/deephaven/engine/table/impl/sort/timsort/ObjectIntTimsortKernel.java
@@ -8,6 +8,7 @@
 package io.deephaven.engine.table.impl.sort.timsort;
 
 import java.util.Objects;
+import io.deephaven.util.compare.ObjectComparisons;
 
 import io.deephaven.chunk.attributes.Any;
 import io.deephaven.chunk.attributes.ChunkLengths;
@@ -203,19 +204,8 @@ static private <SORT_VALUES_ATTR extends Any, PERMUTE_VALUES_ATTR extends Any> v
     // region comparison functions
     // ascending comparison
     private static int doComparison(Object lhs, Object rhs) {
-       if (lhs == rhs) {
-            return 0;
-        }
-        if (lhs == null) {
-            return -1;
-        }
-        if (rhs == null) {
-            return 1;
-        }
-        //noinspection unchecked,rawtypes
-        return ((Comparable)lhs).compareTo(rhs);
+        return ObjectComparisons.compare(lhs, rhs);
     }
-
     // endregion comparison functions
 
     @VisibleForTesting
diff --git a/engine/table/src/main/java/io/deephaven/engine/table/impl/sort/timsort/ObjectLongTimsortDescendingKernel.java b/engine/table/src/main/java/io/deephaven/engine/table/impl/sort/timsort/ObjectLongTimsortDescendingKernel.java
index f9ecfa02fa0..3db4c9e2aa2 100644
--- a/engine/table/src/main/java/io/deephaven/engine/table/impl/sort/timsort/ObjectLongTimsortDescendingKernel.java
+++ b/engine/table/src/main/java/io/deephaven/engine/table/impl/sort/timsort/ObjectLongTimsortDescendingKernel.java
@@ -9,6 +9,7 @@
 package io.deephaven.engine.table.impl.sort.timsort;
 
 import java.util.Objects;
+import io.deephaven.util.compare.ObjectComparisons;
 
 import io.deephaven.chunk.attributes.Any;
 import io.deephaven.chunk.attributes.ChunkLengths;
@@ -204,17 +205,7 @@ static private <SORT_VALUES_ATTR extends Any, PERMUTE_VALUES_ATTR extends Any> v
     // region comparison functions
     // descending comparison
     private static int doComparison(Object lhs, Object rhs) {
-        if (lhs == rhs) {
-            return 0;
-        }
-        if (lhs == null) {
-            return 1;
-        }
-        if (rhs == null) {
-            return -1;
-        }
-        //noinspection unchecked,rawtypes
-        return ((Comparable)rhs).compareTo(lhs);
+        return ObjectComparisons.compare(rhs, lhs);
     }
     // endregion comparison functions
 
diff --git a/engine/table/src/main/java/io/deephaven/engine/table/impl/sort/timsort/ObjectLongTimsortKernel.java b/engine/table/src/main/java/io/deephaven/engine/table/impl/sort/timsort/ObjectLongTimsortKernel.java
index 11eee8f5df8..7002d731900 100644
--- a/engine/table/src/main/java/io/deephaven/engine/table/impl/sort/timsort/ObjectLongTimsortKernel.java
+++ b/engine/table/src/main/java/io/deephaven/engine/table/impl/sort/timsort/ObjectLongTimsortKernel.java
@@ -8,6 +8,7 @@
 package io.deephaven.engine.table.impl.sort.timsort;
 
 import java.util.Objects;
+import io.deephaven.util.compare.ObjectComparisons;
 
 import io.deephaven.chunk.attributes.Any;
 import io.deephaven.chunk.attributes.ChunkLengths;
@@ -203,19 +204,8 @@ static private <SORT_VALUES_ATTR extends Any, PERMUTE_VALUES_ATTR extends Any> v
     // region comparison functions
     // ascending comparison
     private static int doComparison(Object lhs, Object rhs) {
-       if (lhs == rhs) {
-            return 0;
-        }
-        if (lhs == null) {
-            return -1;
-        }
-        if (rhs == null) {
-            return 1;
-        }
-        //noinspection unchecked,rawtypes
-        return ((Comparable)lhs).compareTo(rhs);
+        return ObjectComparisons.compare(lhs, rhs);
     }
-
     // endregion comparison functions
 
     @VisibleForTesting
diff --git a/engine/table/src/main/java/io/deephaven/engine/table/impl/sort/timsort/ObjectTimsortDescendingKernel.java b/engine/table/src/main/java/io/deephaven/engine/table/impl/sort/timsort/ObjectTimsortDescendingKernel.java
index 4e7c2667a84..8dbecf1277b 100644
--- a/engine/table/src/main/java/io/deephaven/engine/table/impl/sort/timsort/ObjectTimsortDescendingKernel.java
+++ b/engine/table/src/main/java/io/deephaven/engine/table/impl/sort/timsort/ObjectTimsortDescendingKernel.java
@@ -9,6 +9,7 @@
 package io.deephaven.engine.table.impl.sort.timsort;
 
 import java.util.Objects;
+import io.deephaven.util.compare.ObjectComparisons;
 
 import io.deephaven.chunk.ObjectChunk;
 import io.deephaven.chunk.WritableObjectChunk;
@@ -161,17 +162,7 @@ static private <ATTR extends Any> void timSort(
     // region comparison functions
     // descending comparison
     private static int doComparison(Object lhs, Object rhs) {
-        if (lhs == rhs) {
-            return 0;
-        }
-        if (lhs == null) {
-            return 1;
-        }
-        if (rhs == null) {
-            return -1;
-        }
-        //noinspection unchecked,rawtypes
-        return ((Comparable)rhs).compareTo(lhs);
+        return ObjectComparisons.compare(rhs, lhs);
     }
     // endregion comparison functions
 
diff --git a/engine/table/src/main/java/io/deephaven/engine/table/impl/sort/timsort/ObjectTimsortKernel.java b/engine/table/src/main/java/io/deephaven/engine/table/impl/sort/timsort/ObjectTimsortKernel.java
index 165306d225c..9b834eaccc5 100644
--- a/engine/table/src/main/java/io/deephaven/engine/table/impl/sort/timsort/ObjectTimsortKernel.java
+++ b/engine/table/src/main/java/io/deephaven/engine/table/impl/sort/timsort/ObjectTimsortKernel.java
@@ -8,6 +8,7 @@
 package io.deephaven.engine.table.impl.sort.timsort;
 
 import java.util.Objects;
+import io.deephaven.util.compare.ObjectComparisons;
 
 import io.deephaven.chunk.ObjectChunk;
 import io.deephaven.chunk.WritableObjectChunk;
@@ -160,19 +161,8 @@ static private <ATTR extends Any> void timSort(
     // region comparison functions
     // ascending comparison
     private static int doComparison(Object lhs, Object rhs) {
-       if (lhs == rhs) {
-            return 0;
-        }
-        if (lhs == null) {
-            return -1;
-        }
-        if (rhs == null) {
-            return 1;
-        }
-        //noinspection unchecked,rawtypes
-        return ((Comparable)lhs).compareTo(rhs);
+        return ObjectComparisons.compare(lhs, rhs);
     }
-
     // endregion comparison functions
 
     @VisibleForTesting
diff --git a/engine/table/src/main/java/io/deephaven/engine/table/impl/sortcheck/ByteReverseSortCheck.java b/engine/table/src/main/java/io/deephaven/engine/table/impl/sortcheck/ByteReverseSortCheck.java
index 79cb6a1941d..e982a097885 100644
--- a/engine/table/src/main/java/io/deephaven/engine/table/impl/sortcheck/ByteReverseSortCheck.java
+++ b/engine/table/src/main/java/io/deephaven/engine/table/impl/sortcheck/ByteReverseSortCheck.java
@@ -38,12 +38,8 @@ private int sortCheck(ByteChunk<? extends Values> valuesToCheck) {
 
     // region comparison functions
     // note that this is a descending kernel, thus the comparisons here are backwards (e.g., the lt function is in terms of the sort direction, so is implemented by gt)
-    private static int doComparison(byte lhs, byte rhs) {
-        return -1 * ByteComparisons.compare(lhs, rhs);
-    }
-    // endregion comparison functions
-
     private static boolean leq(byte lhs, byte rhs) {
-        return doComparison(lhs, rhs) <= 0;
+        return ByteComparisons.geq(lhs, rhs);
     }
+    // endregion comparison functions
 }
diff --git a/engine/table/src/main/java/io/deephaven/engine/table/impl/sortcheck/ByteSortCheck.java b/engine/table/src/main/java/io/deephaven/engine/table/impl/sortcheck/ByteSortCheck.java
index 6d8ece4c78e..ab8fd37e783 100644
--- a/engine/table/src/main/java/io/deephaven/engine/table/impl/sortcheck/ByteSortCheck.java
+++ b/engine/table/src/main/java/io/deephaven/engine/table/impl/sortcheck/ByteSortCheck.java
@@ -36,12 +36,8 @@ private int sortCheck(ByteChunk<? extends Values> valuesToCheck) {
     }
 
     // region comparison functions
-    private static int doComparison(byte lhs, byte rhs) {
-        return ByteComparisons.compare(lhs, rhs);
-    }
-    // endregion comparison functions
-
     private static boolean leq(byte lhs, byte rhs) {
-        return doComparison(lhs, rhs) <= 0;
+        return ByteComparisons.leq(lhs, rhs);
     }
+    // endregion comparison functions
 }
diff --git a/engine/table/src/main/java/io/deephaven/engine/table/impl/sortcheck/CharReverseSortCheck.java b/engine/table/src/main/java/io/deephaven/engine/table/impl/sortcheck/CharReverseSortCheck.java
index 76fd4c8e774..8cf47484e73 100644
--- a/engine/table/src/main/java/io/deephaven/engine/table/impl/sortcheck/CharReverseSortCheck.java
+++ b/engine/table/src/main/java/io/deephaven/engine/table/impl/sortcheck/CharReverseSortCheck.java
@@ -38,12 +38,8 @@ private int sortCheck(CharChunk<? extends Values> valuesToCheck) {
 
     // region comparison functions
     // note that this is a descending kernel, thus the comparisons here are backwards (e.g., the lt function is in terms of the sort direction, so is implemented by gt)
-    private static int doComparison(char lhs, char rhs) {
-        return -1 * CharComparisons.compare(lhs, rhs);
-    }
-    // endregion comparison functions
-
     private static boolean leq(char lhs, char rhs) {
-        return doComparison(lhs, rhs) <= 0;
+        return CharComparisons.geq(lhs, rhs);
     }
+    // endregion comparison functions
 }
diff --git a/engine/table/src/main/java/io/deephaven/engine/table/impl/sortcheck/CharSortCheck.java b/engine/table/src/main/java/io/deephaven/engine/table/impl/sortcheck/CharSortCheck.java
index 5fd63081bc6..88ca26f4878 100644
--- a/engine/table/src/main/java/io/deephaven/engine/table/impl/sortcheck/CharSortCheck.java
+++ b/engine/table/src/main/java/io/deephaven/engine/table/impl/sortcheck/CharSortCheck.java
@@ -32,12 +32,8 @@ private int sortCheck(CharChunk<? extends Values> valuesToCheck) {
     }
 
     // region comparison functions
-    private static int doComparison(char lhs, char rhs) {
-        return CharComparisons.compare(lhs, rhs);
-    }
-    // endregion comparison functions
-
     private static boolean leq(char lhs, char rhs) {
-        return doComparison(lhs, rhs) <= 0;
+        return CharComparisons.leq(lhs, rhs);
     }
+    // endregion comparison functions
 }
diff --git a/engine/table/src/main/java/io/deephaven/engine/table/impl/sortcheck/DoubleReverseSortCheck.java b/engine/table/src/main/java/io/deephaven/engine/table/impl/sortcheck/DoubleReverseSortCheck.java
index 3cfa3621378..c13db905602 100644
--- a/engine/table/src/main/java/io/deephaven/engine/table/impl/sortcheck/DoubleReverseSortCheck.java
+++ b/engine/table/src/main/java/io/deephaven/engine/table/impl/sortcheck/DoubleReverseSortCheck.java
@@ -38,12 +38,8 @@ private int sortCheck(DoubleChunk<? extends Values> valuesToCheck) {
 
     // region comparison functions
     // note that this is a descending kernel, thus the comparisons here are backwards (e.g., the lt function is in terms of the sort direction, so is implemented by gt)
-    private static int doComparison(double lhs, double rhs) {
-        return -1 * DoubleComparisons.compare(lhs, rhs);
-    }
-    // endregion comparison functions
-
     private static boolean leq(double lhs, double rhs) {
-        return doComparison(lhs, rhs) <= 0;
+        return DoubleComparisons.geq(lhs, rhs);
     }
+    // endregion comparison functions
 }
diff --git a/engine/table/src/main/java/io/deephaven/engine/table/impl/sortcheck/DoubleSortCheck.java b/engine/table/src/main/java/io/deephaven/engine/table/impl/sortcheck/DoubleSortCheck.java
index 0113d1fc535..75d997dcf49 100644
--- a/engine/table/src/main/java/io/deephaven/engine/table/impl/sortcheck/DoubleSortCheck.java
+++ b/engine/table/src/main/java/io/deephaven/engine/table/impl/sortcheck/DoubleSortCheck.java
@@ -36,12 +36,8 @@ private int sortCheck(DoubleChunk<? extends Values> valuesToCheck) {
     }
 
     // region comparison functions
-    private static int doComparison(double lhs, double rhs) {
-        return DoubleComparisons.compare(lhs, rhs);
-    }
-    // endregion comparison functions
-
     private static boolean leq(double lhs, double rhs) {
-        return doComparison(lhs, rhs) <= 0;
+        return DoubleComparisons.leq(lhs, rhs);
     }
+    // endregion comparison functions
 }
diff --git a/engine/table/src/main/java/io/deephaven/engine/table/impl/sortcheck/FloatReverseSortCheck.java b/engine/table/src/main/java/io/deephaven/engine/table/impl/sortcheck/FloatReverseSortCheck.java
index a114a505848..1d211b1659f 100644
--- a/engine/table/src/main/java/io/deephaven/engine/table/impl/sortcheck/FloatReverseSortCheck.java
+++ b/engine/table/src/main/java/io/deephaven/engine/table/impl/sortcheck/FloatReverseSortCheck.java
@@ -38,12 +38,8 @@ private int sortCheck(FloatChunk<? extends Values> valuesToCheck) {
 
     // region comparison functions
     // note that this is a descending kernel, thus the comparisons here are backwards (e.g., the lt function is in terms of the sort direction, so is implemented by gt)
-    private static int doComparison(float lhs, float rhs) {
-        return -1 * FloatComparisons.compare(lhs, rhs);
-    }
-    // endregion comparison functions
-
     private static boolean leq(float lhs, float rhs) {
-        return doComparison(lhs, rhs) <= 0;
+        return FloatComparisons.geq(lhs, rhs);
     }
+    // endregion comparison functions
 }
diff --git a/engine/table/src/main/java/io/deephaven/engine/table/impl/sortcheck/FloatSortCheck.java b/engine/table/src/main/java/io/deephaven/engine/table/impl/sortcheck/FloatSortCheck.java
index d818116f283..21890857693 100644
--- a/engine/table/src/main/java/io/deephaven/engine/table/impl/sortcheck/FloatSortCheck.java
+++ b/engine/table/src/main/java/io/deephaven/engine/table/impl/sortcheck/FloatSortCheck.java
@@ -36,12 +36,8 @@ private int sortCheck(FloatChunk<? extends Values> valuesToCheck) {
     }
 
     // region comparison functions
-    private static int doComparison(float lhs, float rhs) {
-        return FloatComparisons.compare(lhs, rhs);
-    }
-    // endregion comparison functions
-
     private static boolean leq(float lhs, float rhs) {
-        return doComparison(lhs, rhs) <= 0;
+        return FloatComparisons.leq(lhs, rhs);
     }
+    // endregion comparison functions
 }
diff --git a/engine/table/src/main/java/io/deephaven/engine/table/impl/sortcheck/IntReverseSortCheck.java b/engine/table/src/main/java/io/deephaven/engine/table/impl/sortcheck/IntReverseSortCheck.java
index adee5bc51a1..d402150b097 100644
--- a/engine/table/src/main/java/io/deephaven/engine/table/impl/sortcheck/IntReverseSortCheck.java
+++ b/engine/table/src/main/java/io/deephaven/engine/table/impl/sortcheck/IntReverseSortCheck.java
@@ -38,12 +38,8 @@ private int sortCheck(IntChunk<? extends Values> valuesToCheck) {
 
     // region comparison functions
     // note that this is a descending kernel, thus the comparisons here are backwards (e.g., the lt function is in terms of the sort direction, so is implemented by gt)
-    private static int doComparison(int lhs, int rhs) {
-        return -1 * IntComparisons.compare(lhs, rhs);
-    }
-    // endregion comparison functions
-
     private static boolean leq(int lhs, int rhs) {
-        return doComparison(lhs, rhs) <= 0;
+        return IntComparisons.geq(lhs, rhs);
     }
+    // endregion comparison functions
 }
diff --git a/engine/table/src/main/java/io/deephaven/engine/table/impl/sortcheck/IntSortCheck.java b/engine/table/src/main/java/io/deephaven/engine/table/impl/sortcheck/IntSortCheck.java
index e335e2b40f6..7e973fcdae4 100644
--- a/engine/table/src/main/java/io/deephaven/engine/table/impl/sortcheck/IntSortCheck.java
+++ b/engine/table/src/main/java/io/deephaven/engine/table/impl/sortcheck/IntSortCheck.java
@@ -36,12 +36,8 @@ private int sortCheck(IntChunk<? extends Values> valuesToCheck) {
     }
 
     // region comparison functions
-    private static int doComparison(int lhs, int rhs) {
-        return IntComparisons.compare(lhs, rhs);
-    }
-    // endregion comparison functions
-
     private static boolean leq(int lhs, int rhs) {
-        return doComparison(lhs, rhs) <= 0;
+        return IntComparisons.leq(lhs, rhs);
     }
+    // endregion comparison functions
 }
diff --git a/engine/table/src/main/java/io/deephaven/engine/table/impl/sortcheck/LongReverseSortCheck.java b/engine/table/src/main/java/io/deephaven/engine/table/impl/sortcheck/LongReverseSortCheck.java
index 2354192802a..3f8d5dd69c8 100644
--- a/engine/table/src/main/java/io/deephaven/engine/table/impl/sortcheck/LongReverseSortCheck.java
+++ b/engine/table/src/main/java/io/deephaven/engine/table/impl/sortcheck/LongReverseSortCheck.java
@@ -38,12 +38,8 @@ private int sortCheck(LongChunk<? extends Values> valuesToCheck) {
 
     // region comparison functions
     // note that this is a descending kernel, thus the comparisons here are backwards (e.g., the lt function is in terms of the sort direction, so is implemented by gt)
-    private static int doComparison(long lhs, long rhs) {
-        return -1 * LongComparisons.compare(lhs, rhs);
-    }
-    // endregion comparison functions
-
     private static boolean leq(long lhs, long rhs) {
-        return doComparison(lhs, rhs) <= 0;
+        return LongComparisons.geq(lhs, rhs);
     }
+    // endregion comparison functions
 }
diff --git a/engine/table/src/main/java/io/deephaven/engine/table/impl/sortcheck/LongSortCheck.java b/engine/table/src/main/java/io/deephaven/engine/table/impl/sortcheck/LongSortCheck.java
index 9c71385aa21..7a7e86479ad 100644
--- a/engine/table/src/main/java/io/deephaven/engine/table/impl/sortcheck/LongSortCheck.java
+++ b/engine/table/src/main/java/io/deephaven/engine/table/impl/sortcheck/LongSortCheck.java
@@ -36,12 +36,8 @@ private int sortCheck(LongChunk<? extends Values> valuesToCheck) {
     }
 
     // region comparison functions
-    private static int doComparison(long lhs, long rhs) {
-        return LongComparisons.compare(lhs, rhs);
-    }
-    // endregion comparison functions
-
     private static boolean leq(long lhs, long rhs) {
-        return doComparison(lhs, rhs) <= 0;
+        return LongComparisons.leq(lhs, rhs);
     }
+    // endregion comparison functions
 }
diff --git a/engine/table/src/main/java/io/deephaven/engine/table/impl/sortcheck/ObjectReverseSortCheck.java b/engine/table/src/main/java/io/deephaven/engine/table/impl/sortcheck/ObjectReverseSortCheck.java
index ae08133c625..5752450b80c 100644
--- a/engine/table/src/main/java/io/deephaven/engine/table/impl/sortcheck/ObjectReverseSortCheck.java
+++ b/engine/table/src/main/java/io/deephaven/engine/table/impl/sortcheck/ObjectReverseSortCheck.java
@@ -8,8 +8,6 @@
 
 package io.deephaven.engine.table.impl.sortcheck;
 
-import java.util.Objects;
-
 import io.deephaven.chunk.attributes.Values;
 import io.deephaven.util.compare.ObjectComparisons;
 import io.deephaven.chunk.ObjectChunk;
@@ -39,23 +37,9 @@ private int sortCheck(ObjectChunk<Object, ? extends Values> valuesToCheck) {
     }
 
     // region comparison functions
-    // descending comparison
-    private static int doComparison(Object lhs, Object rhs) {
-        if (lhs == rhs) {
-            return 0;
-        }
-        if (lhs == null) {
-            return 1;
-        }
-        if (rhs == null) {
-            return -1;
-        }
-        //noinspection unchecked,rawtypes
-        return ((Comparable)rhs).compareTo(lhs);
-    }
-    // endregion comparison functions
-
+    // note that this is a descending kernel, thus the comparisons here are backwards (e.g., the lt function is in terms of the sort direction, so is implemented by gt)
     private static boolean leq(Object lhs, Object rhs) {
-        return doComparison(lhs, rhs) <= 0;
+        return ObjectComparisons.geq(lhs, rhs);
     }
+    // endregion comparison functions
 }
diff --git a/engine/table/src/main/java/io/deephaven/engine/table/impl/sortcheck/ObjectSortCheck.java b/engine/table/src/main/java/io/deephaven/engine/table/impl/sortcheck/ObjectSortCheck.java
index 7610b5f4132..b7aec4de583 100644
--- a/engine/table/src/main/java/io/deephaven/engine/table/impl/sortcheck/ObjectSortCheck.java
+++ b/engine/table/src/main/java/io/deephaven/engine/table/impl/sortcheck/ObjectSortCheck.java
@@ -36,12 +36,8 @@ private int sortCheck(ObjectChunk<Object, ? extends Values> valuesToCheck) {
     }
 
     // region comparison functions
-    private static int doComparison(Object lhs, Object rhs) {
-        return ObjectComparisons.compare(lhs, rhs);
-    }
-    // endregion comparison functions
-
     private static boolean leq(Object lhs, Object rhs) {
-        return doComparison(lhs, rhs) <= 0;
+        return ObjectComparisons.leq(lhs, rhs);
     }
+    // endregion comparison functions
 }
diff --git a/engine/table/src/main/java/io/deephaven/engine/table/impl/sortcheck/ShortReverseSortCheck.java b/engine/table/src/main/java/io/deephaven/engine/table/impl/sortcheck/ShortReverseSortCheck.java
index c15a61488aa..cbe810f0cf7 100644
--- a/engine/table/src/main/java/io/deephaven/engine/table/impl/sortcheck/ShortReverseSortCheck.java
+++ b/engine/table/src/main/java/io/deephaven/engine/table/impl/sortcheck/ShortReverseSortCheck.java
@@ -38,12 +38,8 @@ private int sortCheck(ShortChunk<? extends Values> valuesToCheck) {
 
     // region comparison functions
     // note that this is a descending kernel, thus the comparisons here are backwards (e.g., the lt function is in terms of the sort direction, so is implemented by gt)
-    private static int doComparison(short lhs, short rhs) {
-        return -1 * ShortComparisons.compare(lhs, rhs);
-    }
-    // endregion comparison functions
-
     private static boolean leq(short lhs, short rhs) {
-        return doComparison(lhs, rhs) <= 0;
+        return ShortComparisons.geq(lhs, rhs);
     }
+    // endregion comparison functions
 }
diff --git a/engine/table/src/main/java/io/deephaven/engine/table/impl/sortcheck/ShortSortCheck.java b/engine/table/src/main/java/io/deephaven/engine/table/impl/sortcheck/ShortSortCheck.java
index fef32cb9716..1c33fac188d 100644
--- a/engine/table/src/main/java/io/deephaven/engine/table/impl/sortcheck/ShortSortCheck.java
+++ b/engine/table/src/main/java/io/deephaven/engine/table/impl/sortcheck/ShortSortCheck.java
@@ -36,12 +36,8 @@ private int sortCheck(ShortChunk<? extends Values> valuesToCheck) {
     }
 
     // region comparison functions
-    private static int doComparison(short lhs, short rhs) {
-        return ShortComparisons.compare(lhs, rhs);
-    }
-    // endregion comparison functions
-
     private static boolean leq(short lhs, short rhs) {
-        return doComparison(lhs, rhs) <= 0;
+        return ShortComparisons.leq(lhs, rhs);
     }
+    // endregion comparison functions
 }
diff --git a/engine/table/src/main/java/io/deephaven/engine/table/impl/sources/ArrayBackedColumnSource.java b/engine/table/src/main/java/io/deephaven/engine/table/impl/sources/ArrayBackedColumnSource.java
index 0d5fda89395..090cb61677c 100644
--- a/engine/table/src/main/java/io/deephaven/engine/table/impl/sources/ArrayBackedColumnSource.java
+++ b/engine/table/src/main/java/io/deephaven/engine/table/impl/sources/ArrayBackedColumnSource.java
@@ -14,7 +14,6 @@
 import io.deephaven.chunk.attributes.Values;
 import io.deephaven.engine.rowset.RowSequence;
 import io.deephaven.engine.rowset.RowSequenceFactory;
-import io.deephaven.engine.table.impl.util.ShiftData;
 import io.deephaven.qst.array.Array;
 import io.deephaven.qst.array.BooleanArray;
 import io.deephaven.qst.array.ByteArray;
@@ -47,7 +46,7 @@
  */
 public abstract class ArrayBackedColumnSource<T>
         extends AbstractColumnSource<T>
-        implements FillUnordered<Values>, ShiftData.ShiftCallback, WritableColumnSource<T>, InMemoryColumnSource,
+        implements FillUnordered<Values>, WritableColumnSource<T>, InMemoryColumnSource,
         ChunkedBackingStoreExposedWritableSource {
 
     static final int DEFAULT_RECYCLER_CAPACITY = 1024;
@@ -426,20 +425,6 @@ public static <T> WritableColumnSource<T> getMemoryColumnSource(final long size,
     @Override
     public abstract void ensureCapacity(long size, boolean nullFill);
 
-    @Override
-    public void shift(final long start, final long end, final long offset) {
-        if (offset > 0) {
-            for (long i = end; i >= start; i--) {
-                set((i + offset), get(i));
-            }
-        } else {
-            for (long i = start; i <= end; i++) {
-                set((i + offset), get(i));
-            }
-        }
-
-    }
-
     /**
      * Creates an in-memory ColumnSource from the supplied dataArray, using instanceof checks to determine the
      * appropriate type of column source to produce.
diff --git a/engine/table/src/main/java/io/deephaven/engine/table/impl/sources/BooleanArraySource.java b/engine/table/src/main/java/io/deephaven/engine/table/impl/sources/BooleanArraySource.java
index f7a5760fe24..72e41f33e71 100644
--- a/engine/table/src/main/java/io/deephaven/engine/table/impl/sources/BooleanArraySource.java
+++ b/engine/table/src/main/java/io/deephaven/engine/table/impl/sources/BooleanArraySource.java
@@ -196,19 +196,6 @@ public Boolean getPrev(long rowKey) {
         return BooleanUtils.byteAsBoolean(getPrevByte(rowKey));
     }
 
-    @Override
-    public void shift(long start, long end, long offset) {
-        if (offset > 0) {
-            for (long i = (int) end; i >= start; i--) {
-                set((i + offset), getByte(i));
-            }
-        } else {
-            for (int i = (int) start; i <= end; i++) {
-                set((i + offset), getByte(i));
-            }
-        }
-    }
-
     @Override
     byte[] allocateNullFilledBlock(int size) {
         final byte[] result = new byte[size];
diff --git a/engine/table/src/main/java/io/deephaven/engine/table/impl/sources/ByteArraySource.java b/engine/table/src/main/java/io/deephaven/engine/table/impl/sources/ByteArraySource.java
index 76693de2f90..03a29432654 100644
--- a/engine/table/src/main/java/io/deephaven/engine/table/impl/sources/ByteArraySource.java
+++ b/engine/table/src/main/java/io/deephaven/engine/table/impl/sources/ByteArraySource.java
@@ -193,19 +193,6 @@ public final byte getPrevByte(long rowKey) {
         }
     }
 
-    @Override
-    public void shift(long start, long end, long offset) {
-        if (offset > 0) {
-            for (long i = (int) end; i >= start; i--) {
-                set((i + offset), getByte(i));
-            }
-        } else {
-            for (int i = (int) start; i <= end; i++) {
-                set((i + offset), getByte(i));
-            }
-        }
-    }
-
     public void move(long source, long dest, long length) {
         if (prevBlocks != null) {
             throw new UnsupportedOperationException();
diff --git a/engine/table/src/main/java/io/deephaven/engine/table/impl/sources/CharacterArraySource.java b/engine/table/src/main/java/io/deephaven/engine/table/impl/sources/CharacterArraySource.java
index 088cc63a4ef..fbbc84ed6dc 100644
--- a/engine/table/src/main/java/io/deephaven/engine/table/impl/sources/CharacterArraySource.java
+++ b/engine/table/src/main/java/io/deephaven/engine/table/impl/sources/CharacterArraySource.java
@@ -190,19 +190,6 @@ public final char getPrevChar(long rowKey) {
         }
     }
 
-    @Override
-    public void shift(long start, long end, long offset) {
-        if (offset > 0) {
-            for (long i = (int) end; i >= start; i--) {
-                set((i + offset), getChar(i));
-            }
-        } else {
-            for (int i = (int) start; i <= end; i++) {
-                set((i + offset), getChar(i));
-            }
-        }
-    }
-
     public void move(long source, long dest, long length) {
         if (prevBlocks != null) {
             throw new UnsupportedOperationException();
diff --git a/engine/table/src/main/java/io/deephaven/engine/table/impl/sources/DoubleArraySource.java b/engine/table/src/main/java/io/deephaven/engine/table/impl/sources/DoubleArraySource.java
index 2343325982d..74a523a1e73 100644
--- a/engine/table/src/main/java/io/deephaven/engine/table/impl/sources/DoubleArraySource.java
+++ b/engine/table/src/main/java/io/deephaven/engine/table/impl/sources/DoubleArraySource.java
@@ -193,19 +193,6 @@ public final double getPrevDouble(long rowKey) {
         }
     }
 
-    @Override
-    public void shift(long start, long end, long offset) {
-        if (offset > 0) {
-            for (long i = (int) end; i >= start; i--) {
-                set((i + offset), getDouble(i));
-            }
-        } else {
-            for (int i = (int) start; i <= end; i++) {
-                set((i + offset), getDouble(i));
-            }
-        }
-    }
-
     public void move(long source, long dest, long length) {
         if (prevBlocks != null) {
             throw new UnsupportedOperationException();
diff --git a/engine/table/src/main/java/io/deephaven/engine/table/impl/sources/FloatArraySource.java b/engine/table/src/main/java/io/deephaven/engine/table/impl/sources/FloatArraySource.java
index bd01ec0ee0e..5579e8d2159 100644
--- a/engine/table/src/main/java/io/deephaven/engine/table/impl/sources/FloatArraySource.java
+++ b/engine/table/src/main/java/io/deephaven/engine/table/impl/sources/FloatArraySource.java
@@ -193,19 +193,6 @@ public final float getPrevFloat(long rowKey) {
         }
     }
 
-    @Override
-    public void shift(long start, long end, long offset) {
-        if (offset > 0) {
-            for (long i = (int) end; i >= start; i--) {
-                set((i + offset), getFloat(i));
-            }
-        } else {
-            for (int i = (int) start; i <= end; i++) {
-                set((i + offset), getFloat(i));
-            }
-        }
-    }
-
     public void move(long source, long dest, long length) {
         if (prevBlocks != null) {
             throw new UnsupportedOperationException();
diff --git a/engine/table/src/main/java/io/deephaven/engine/table/impl/sources/IntegerArraySource.java b/engine/table/src/main/java/io/deephaven/engine/table/impl/sources/IntegerArraySource.java
index b4172cc7794..07a4f676c33 100644
--- a/engine/table/src/main/java/io/deephaven/engine/table/impl/sources/IntegerArraySource.java
+++ b/engine/table/src/main/java/io/deephaven/engine/table/impl/sources/IntegerArraySource.java
@@ -193,19 +193,6 @@ public final int getPrevInt(long rowKey) {
         }
     }
 
-    @Override
-    public void shift(long start, long end, long offset) {
-        if (offset > 0) {
-            for (long i = (int) end; i >= start; i--) {
-                set((i + offset), getInt(i));
-            }
-        } else {
-            for (int i = (int) start; i <= end; i++) {
-                set((i + offset), getInt(i));
-            }
-        }
-    }
-
     public void move(long source, long dest, long length) {
         if (prevBlocks != null) {
             throw new UnsupportedOperationException();
diff --git a/engine/table/src/main/java/io/deephaven/engine/table/impl/sources/LongArraySource.java b/engine/table/src/main/java/io/deephaven/engine/table/impl/sources/LongArraySource.java
index 2cbb16cd130..5296629e4d0 100644
--- a/engine/table/src/main/java/io/deephaven/engine/table/impl/sources/LongArraySource.java
+++ b/engine/table/src/main/java/io/deephaven/engine/table/impl/sources/LongArraySource.java
@@ -216,19 +216,6 @@ public final long getPrevLong(long rowKey) {
         }
     }
 
-    @Override
-    public void shift(long start, long end, long offset) {
-        if (offset > 0) {
-            for (long i = (int) end; i >= start; i--) {
-                set((i + offset), getLong(i));
-            }
-        } else {
-            for (int i = (int) start; i <= end; i++) {
-                set((i + offset), getLong(i));
-            }
-        }
-    }
-
     public void move(long source, long dest, long length) {
         if (prevBlocks != null) {
             throw new UnsupportedOperationException();
diff --git a/engine/table/src/main/java/io/deephaven/engine/table/impl/sources/NanosBasedTimeArraySource.java b/engine/table/src/main/java/io/deephaven/engine/table/impl/sources/NanosBasedTimeArraySource.java
index 0d91720ef27..e351b8da09f 100644
--- a/engine/table/src/main/java/io/deephaven/engine/table/impl/sources/NanosBasedTimeArraySource.java
+++ b/engine/table/src/main/java/io/deephaven/engine/table/impl/sources/NanosBasedTimeArraySource.java
@@ -16,13 +16,12 @@
 import io.deephaven.engine.table.WritableColumnSource;
 import io.deephaven.engine.table.WritableSourceWithPrepareForParallelPopulation;
 import io.deephaven.engine.table.impl.AbstractColumnSource;
-import io.deephaven.engine.table.impl.util.ShiftData;
 import org.jetbrains.annotations.NotNull;
 
 import java.time.*;
 
 public abstract class NanosBasedTimeArraySource<TIME_TYPE> extends AbstractColumnSource<TIME_TYPE>
-        implements FillUnordered<Values>, ShiftData.ShiftCallback, WritableColumnSource<TIME_TYPE>,
+        implements FillUnordered<Values>, WritableColumnSource<TIME_TYPE>,
         InMemoryColumnSource, WritableSourceWithPrepareForParallelPopulation, ConvertibleTimeSource {
 
     protected final LongArraySource nanoSource;
@@ -79,11 +78,6 @@ public long getPrevLong(long rowKey) {
     public final long getAndSetUnsafe(long rowKey, long newValue) {
         return nanoSource.getAndSetUnsafe(rowKey, newValue);
     }
-
-    @Override
-    public void shift(long start, long end, long offset) {
-        nanoSource.shift(start, end, offset);
-    }
     // endregion
 
     // region ArraySource impl
diff --git a/engine/table/src/main/java/io/deephaven/engine/table/impl/sources/NanosBasedTimeSparseArraySource.java b/engine/table/src/main/java/io/deephaven/engine/table/impl/sources/NanosBasedTimeSparseArraySource.java
index 02abc54a547..30d4e490a9b 100644
--- a/engine/table/src/main/java/io/deephaven/engine/table/impl/sources/NanosBasedTimeSparseArraySource.java
+++ b/engine/table/src/main/java/io/deephaven/engine/table/impl/sources/NanosBasedTimeSparseArraySource.java
@@ -16,7 +16,7 @@
 import io.deephaven.engine.table.WritableColumnSource;
 import io.deephaven.engine.table.WritableSourceWithPrepareForParallelPopulation;
 import io.deephaven.engine.table.impl.AbstractColumnSource;
-import io.deephaven.engine.table.impl.util.ShiftData;
+import io.deephaven.engine.rowset.RowSetShiftCallback;
 import org.jetbrains.annotations.NotNull;
 
 import java.time.Instant;
@@ -30,7 +30,7 @@
  */
 public abstract class NanosBasedTimeSparseArraySource<TIME_TYPE> extends AbstractColumnSource<TIME_TYPE>
         implements FillUnordered<Values>, WritableColumnSource<TIME_TYPE>, InMemoryColumnSource,
-        PossiblyImmutableColumnSource, WritableSourceWithPrepareForParallelPopulation, ShiftData.RowSetShiftCallback,
+        PossiblyImmutableColumnSource, WritableSourceWithPrepareForParallelPopulation, RowSetShiftCallback,
         ConvertibleTimeSource {
 
     protected final LongSparseArraySource nanoSource;
diff --git a/engine/table/src/main/java/io/deephaven/engine/table/impl/sources/NullValueColumnSource.java b/engine/table/src/main/java/io/deephaven/engine/table/impl/sources/NullValueColumnSource.java
index aec4b545db7..2c2e873e58d 100644
--- a/engine/table/src/main/java/io/deephaven/engine/table/impl/sources/NullValueColumnSource.java
+++ b/engine/table/src/main/java/io/deephaven/engine/table/impl/sources/NullValueColumnSource.java
@@ -18,7 +18,6 @@
 import io.deephaven.hash.KeyedObjectHashMap;
 import io.deephaven.hash.KeyedObjectKey;
 import io.deephaven.chunk.WritableChunk;
-import io.deephaven.engine.table.impl.util.ShiftData;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
@@ -37,7 +36,7 @@
  * A column source that returns null for all keys. Trivially "writable" since it can only contain null values.
  */
 public final class NullValueColumnSource<T> extends AbstractColumnSource<T>
-        implements ShiftData.ShiftCallback, InMemoryColumnSource, RowKeyAgnosticChunkSource<Values>,
+        implements InMemoryColumnSource, RowKeyAgnosticChunkSource<Values>,
         WritableColumnSource<T> {
 
     private static final KeyedObjectKey.Basic<Pair<Class<?>, Class<?>>, NullValueColumnSource<?>> KEY_TYPE =
@@ -167,9 +166,6 @@ public short getPrevShort(long rowKey) {
         return NULL_SHORT;
     }
 
-    @Override
-    public void shift(long start, long end, long offset) {}
-
     @Override
     public boolean isImmutable() {
         return true;
diff --git a/engine/table/src/main/java/io/deephaven/engine/table/impl/sources/ObjectSingleValueSource.java b/engine/table/src/main/java/io/deephaven/engine/table/impl/sources/ObjectSingleValueSource.java
index 94ebdd1bbbd..3785bfadfce 100644
--- a/engine/table/src/main/java/io/deephaven/engine/table/impl/sources/ObjectSingleValueSource.java
+++ b/engine/table/src/main/java/io/deephaven/engine/table/impl/sources/ObjectSingleValueSource.java
@@ -36,8 +36,8 @@ public class ObjectSingleValueSource<T> extends SingleValueColumnSource<T>
     private transient T prev;
 
     // region Constructor
-    public ObjectSingleValueSource(Class<T> type) {
-        super(type);
+    public ObjectSingleValueSource(Class<T> type, Class<?> componentType) {
+        super(type, componentType);
         current = null;
         prev = null;
     }
diff --git a/engine/table/src/main/java/io/deephaven/engine/table/impl/sources/RedirectedColumnSource.java b/engine/table/src/main/java/io/deephaven/engine/table/impl/sources/RedirectedColumnSource.java
index f8628fda503..432daa0efe3 100644
--- a/engine/table/src/main/java/io/deephaven/engine/table/impl/sources/RedirectedColumnSource.java
+++ b/engine/table/src/main/java/io/deephaven/engine/table/impl/sources/RedirectedColumnSource.java
@@ -94,6 +94,10 @@ public RowRedirection getRowRedirection() {
         return rowRedirection;
     }
 
+    public final ColumnSource<T> getInnerSource() {
+        return innerSource;
+    }
+
     @Override
     public void startTrackingPrevValues() {}
 
diff --git a/engine/table/src/main/java/io/deephaven/engine/table/impl/sources/ShortArraySource.java b/engine/table/src/main/java/io/deephaven/engine/table/impl/sources/ShortArraySource.java
index 928b9ec20bf..6ac23b0db31 100644
--- a/engine/table/src/main/java/io/deephaven/engine/table/impl/sources/ShortArraySource.java
+++ b/engine/table/src/main/java/io/deephaven/engine/table/impl/sources/ShortArraySource.java
@@ -193,19 +193,6 @@ public final short getPrevShort(long rowKey) {
         }
     }
 
-    @Override
-    public void shift(long start, long end, long offset) {
-        if (offset > 0) {
-            for (long i = (int) end; i >= start; i--) {
-                set((i + offset), getShort(i));
-            }
-        } else {
-            for (int i = (int) start; i <= end; i++) {
-                set((i + offset), getShort(i));
-            }
-        }
-    }
-
     public void move(long source, long dest, long length) {
         if (prevBlocks != null) {
             throw new UnsupportedOperationException();
diff --git a/engine/table/src/main/java/io/deephaven/engine/table/impl/sources/SingleValueColumnSource.java b/engine/table/src/main/java/io/deephaven/engine/table/impl/sources/SingleValueColumnSource.java
index dadb09f9be4..e2e44684989 100644
--- a/engine/table/src/main/java/io/deephaven/engine/table/impl/sources/SingleValueColumnSource.java
+++ b/engine/table/src/main/java/io/deephaven/engine/table/impl/sources/SingleValueColumnSource.java
@@ -8,19 +8,22 @@
 import io.deephaven.engine.table.ChunkSink;
 import io.deephaven.engine.table.WritableColumnSource;
 import io.deephaven.engine.table.impl.AbstractColumnSource;
-import io.deephaven.engine.table.impl.util.ShiftData;
-
-import static io.deephaven.util.QueryConstants.NULL_BYTE;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
 
 public abstract class SingleValueColumnSource<T> extends AbstractColumnSource<T>
-        implements WritableColumnSource<T>, ChunkSink<Values>, ShiftData.ShiftCallback, InMemoryColumnSource,
+        implements WritableColumnSource<T>, ChunkSink<Values>, InMemoryColumnSource,
         RowKeyAgnosticChunkSource<Values> {
 
     protected transient long changeTime;
     protected boolean isTrackingPrevValues;
 
-    SingleValueColumnSource(Class<T> type) {
-        super(type);
+    SingleValueColumnSource(@NotNull final Class<T> type) {
+        this(type, null);
+    }
+
+    SingleValueColumnSource(@NotNull final Class<T> type, @Nullable final Class<?> elementType) {
+        super(type, elementType);
     }
 
     @Override
@@ -28,10 +31,11 @@ public final void startTrackingPrevValues() {
         isTrackingPrevValues = true;
     }
 
-    @Override
-    public void shift(long start, long end, long offset) {}
-
     public static <T> SingleValueColumnSource<T> getSingleValueColumnSource(Class<T> type) {
+        return getSingleValueColumnSource(type, null);
+    }
+
+    public static <T> SingleValueColumnSource<T> getSingleValueColumnSource(Class<T> type, Class<?> componentType) {
         SingleValueColumnSource<?> result;
         if (type == Byte.class || type == byte.class) {
             result = new ByteSingleValueSource();
@@ -50,7 +54,7 @@ public static <T> SingleValueColumnSource<T> getSingleValueColumnSource(Class<T>
         } else if (type == Boolean.class || type == boolean.class) {
             result = new BooleanSingleValueSource();
         } else {
-            result = new ObjectSingleValueSource<>(type);
+            result = new ObjectSingleValueSource<>(type, componentType);
         }
         // noinspection unchecked
         return (SingleValueColumnSource<T>) result;
diff --git a/engine/table/src/main/java/io/deephaven/engine/table/impl/sources/SparseArrayColumnSource.java b/engine/table/src/main/java/io/deephaven/engine/table/impl/sources/SparseArrayColumnSource.java
index d67858056f9..2394e07c17e 100644
--- a/engine/table/src/main/java/io/deephaven/engine/table/impl/sources/SparseArrayColumnSource.java
+++ b/engine/table/src/main/java/io/deephaven/engine/table/impl/sources/SparseArrayColumnSource.java
@@ -8,7 +8,7 @@
 import io.deephaven.engine.table.WritableColumnSource;
 import io.deephaven.engine.table.WritableSourceWithPrepareForParallelPopulation;
 import io.deephaven.engine.table.impl.AbstractColumnSource;
-import io.deephaven.engine.table.impl.util.ShiftData;
+import io.deephaven.engine.rowset.RowSetShiftCallback;
 import io.deephaven.util.type.ArrayTypeUtils;
 import io.deephaven.engine.rowset.chunkattributes.RowKeys;
 import io.deephaven.chunk.attributes.Values;
@@ -74,7 +74,7 @@
 public abstract class SparseArrayColumnSource<T>
         extends AbstractColumnSource<T>
         implements FillUnordered<Values>, WritableColumnSource<T>, InMemoryColumnSource, PossiblyImmutableColumnSource,
-        WritableSourceWithPrepareForParallelPopulation, ShiftData.RowSetShiftCallback {
+        WritableSourceWithPrepareForParallelPopulation, RowSetShiftCallback {
 
     static final int DEFAULT_RECYCLER_CAPACITY = 1024;
 
diff --git a/engine/table/src/main/java/io/deephaven/engine/table/impl/sources/chunkcolumnsource/ByteChunkColumnSource.java b/engine/table/src/main/java/io/deephaven/engine/table/impl/sources/chunkcolumnsource/ByteChunkColumnSource.java
index b52645f878b..efb9942419a 100644
--- a/engine/table/src/main/java/io/deephaven/engine/table/impl/sources/chunkcolumnsource/ByteChunkColumnSource.java
+++ b/engine/table/src/main/java/io/deephaven/engine/table/impl/sources/chunkcolumnsource/ByteChunkColumnSource.java
@@ -189,7 +189,7 @@ public void addChunk(@NotNull final WritableChunk<? extends Values> chunk) {
     }
 
     @Override
-    public void clear() {
+    public synchronized void clear() {
         totalSize = 0;
         data.forEach(SafeCloseable::close);
         data.clear();
diff --git a/engine/table/src/main/java/io/deephaven/engine/table/impl/sources/chunkcolumnsource/CharChunkColumnSource.java b/engine/table/src/main/java/io/deephaven/engine/table/impl/sources/chunkcolumnsource/CharChunkColumnSource.java
index 57aeba11fbe..9cf074473dd 100644
--- a/engine/table/src/main/java/io/deephaven/engine/table/impl/sources/chunkcolumnsource/CharChunkColumnSource.java
+++ b/engine/table/src/main/java/io/deephaven/engine/table/impl/sources/chunkcolumnsource/CharChunkColumnSource.java
@@ -185,7 +185,7 @@ public void addChunk(@NotNull final WritableChunk<? extends Values> chunk) {
     }
 
     @Override
-    public void clear() {
+    public synchronized void clear() {
         totalSize = 0;
         data.forEach(SafeCloseable::close);
         data.clear();
diff --git a/engine/table/src/main/java/io/deephaven/engine/table/impl/sources/chunkcolumnsource/DoubleChunkColumnSource.java b/engine/table/src/main/java/io/deephaven/engine/table/impl/sources/chunkcolumnsource/DoubleChunkColumnSource.java
index d620235038c..6348a6857ce 100644
--- a/engine/table/src/main/java/io/deephaven/engine/table/impl/sources/chunkcolumnsource/DoubleChunkColumnSource.java
+++ b/engine/table/src/main/java/io/deephaven/engine/table/impl/sources/chunkcolumnsource/DoubleChunkColumnSource.java
@@ -189,7 +189,7 @@ public void addChunk(@NotNull final WritableChunk<? extends Values> chunk) {
     }
 
     @Override
-    public void clear() {
+    public synchronized void clear() {
         totalSize = 0;
         data.forEach(SafeCloseable::close);
         data.clear();
diff --git a/engine/table/src/main/java/io/deephaven/engine/table/impl/sources/chunkcolumnsource/FloatChunkColumnSource.java b/engine/table/src/main/java/io/deephaven/engine/table/impl/sources/chunkcolumnsource/FloatChunkColumnSource.java
index 908bcc06fb4..eaf6fa88c5d 100644
--- a/engine/table/src/main/java/io/deephaven/engine/table/impl/sources/chunkcolumnsource/FloatChunkColumnSource.java
+++ b/engine/table/src/main/java/io/deephaven/engine/table/impl/sources/chunkcolumnsource/FloatChunkColumnSource.java
@@ -189,7 +189,7 @@ public void addChunk(@NotNull final WritableChunk<? extends Values> chunk) {
     }
 
     @Override
-    public void clear() {
+    public synchronized void clear() {
         totalSize = 0;
         data.forEach(SafeCloseable::close);
         data.clear();
diff --git a/engine/table/src/main/java/io/deephaven/engine/table/impl/sources/chunkcolumnsource/IntChunkColumnSource.java b/engine/table/src/main/java/io/deephaven/engine/table/impl/sources/chunkcolumnsource/IntChunkColumnSource.java
index 417c568f5fa..e84825a1264 100644
--- a/engine/table/src/main/java/io/deephaven/engine/table/impl/sources/chunkcolumnsource/IntChunkColumnSource.java
+++ b/engine/table/src/main/java/io/deephaven/engine/table/impl/sources/chunkcolumnsource/IntChunkColumnSource.java
@@ -189,7 +189,7 @@ public void addChunk(@NotNull final WritableChunk<? extends Values> chunk) {
     }
 
     @Override
-    public void clear() {
+    public synchronized void clear() {
         totalSize = 0;
         data.forEach(SafeCloseable::close);
         data.clear();
diff --git a/engine/table/src/main/java/io/deephaven/engine/table/impl/sources/chunkcolumnsource/LongChunkColumnSource.java b/engine/table/src/main/java/io/deephaven/engine/table/impl/sources/chunkcolumnsource/LongChunkColumnSource.java
index 9db4a1ec35d..2a703e0bd16 100644
--- a/engine/table/src/main/java/io/deephaven/engine/table/impl/sources/chunkcolumnsource/LongChunkColumnSource.java
+++ b/engine/table/src/main/java/io/deephaven/engine/table/impl/sources/chunkcolumnsource/LongChunkColumnSource.java
@@ -189,7 +189,7 @@ public void addChunk(@NotNull final WritableChunk<? extends Values> chunk) {
     }
 
     @Override
-    public void clear() {
+    public synchronized void clear() {
         totalSize = 0;
         data.forEach(SafeCloseable::close);
         data.clear();
diff --git a/engine/table/src/main/java/io/deephaven/engine/table/impl/sources/chunkcolumnsource/ObjectChunkColumnSource.java b/engine/table/src/main/java/io/deephaven/engine/table/impl/sources/chunkcolumnsource/ObjectChunkColumnSource.java
index 5e6bae02f21..69dbcdb3409 100644
--- a/engine/table/src/main/java/io/deephaven/engine/table/impl/sources/chunkcolumnsource/ObjectChunkColumnSource.java
+++ b/engine/table/src/main/java/io/deephaven/engine/table/impl/sources/chunkcolumnsource/ObjectChunkColumnSource.java
@@ -189,7 +189,7 @@ public void addChunk(@NotNull final WritableChunk<? extends Values> chunk) {
     }
 
     @Override
-    public void clear() {
+    public synchronized void clear() {
         totalSize = 0;
         data.forEach(SafeCloseable::close);
         data.clear();
diff --git a/engine/table/src/main/java/io/deephaven/engine/table/impl/sources/chunkcolumnsource/ShortChunkColumnSource.java b/engine/table/src/main/java/io/deephaven/engine/table/impl/sources/chunkcolumnsource/ShortChunkColumnSource.java
index c89e46d4452..d74ee9050fe 100644
--- a/engine/table/src/main/java/io/deephaven/engine/table/impl/sources/chunkcolumnsource/ShortChunkColumnSource.java
+++ b/engine/table/src/main/java/io/deephaven/engine/table/impl/sources/chunkcolumnsource/ShortChunkColumnSource.java
@@ -189,7 +189,7 @@ public void addChunk(@NotNull final WritableChunk<? extends Values> chunk) {
     }
 
     @Override
-    public void clear() {
+    public synchronized void clear() {
         totalSize = 0;
         data.forEach(SafeCloseable::close);
         data.clear();
diff --git a/engine/table/src/main/java/io/deephaven/engine/table/impl/sources/immutable/ImmutableConstantByteSource.java b/engine/table/src/main/java/io/deephaven/engine/table/impl/sources/immutable/ImmutableConstantByteSource.java
index 6e8b5e8a813..05475da83ae 100644
--- a/engine/table/src/main/java/io/deephaven/engine/table/impl/sources/immutable/ImmutableConstantByteSource.java
+++ b/engine/table/src/main/java/io/deephaven/engine/table/impl/sources/immutable/ImmutableConstantByteSource.java
@@ -18,7 +18,6 @@
 import io.deephaven.engine.table.impl.AbstractColumnSource;
 import io.deephaven.engine.table.impl.ImmutableColumnSourceGetDefaults;
 import io.deephaven.engine.table.impl.sources.*;
-import io.deephaven.engine.table.impl.util.ShiftData;
 import org.jetbrains.annotations.NotNull;
 
 import static io.deephaven.engine.rowset.RowSequence.NULL_ROW_KEY;
@@ -32,7 +31,7 @@
  */
 public class ImmutableConstantByteSource
         extends AbstractColumnSource<Byte>
-        implements ImmutableColumnSourceGetDefaults.ForByte, ShiftData.ShiftCallback, InMemoryColumnSource,
+        implements ImmutableColumnSourceGetDefaults.ForByte, InMemoryColumnSource,
         RowKeyAgnosticChunkSource<Values> /* MIXIN_IMPLS */ {
 
     private final byte value;
@@ -70,9 +69,6 @@ public final void fillPrevChunk(
         fillChunk(context, destination, rowSequence);
     }
 
-    @Override
-    public final void shift(final long start, final long end, final long offset) {}
-
     @Override
     public void fillChunkUnordered(
             @NotNull FillContext context,
diff --git a/engine/table/src/main/java/io/deephaven/engine/table/impl/sources/immutable/ImmutableConstantCharSource.java b/engine/table/src/main/java/io/deephaven/engine/table/impl/sources/immutable/ImmutableConstantCharSource.java
index 0788b2cb9c3..9ea61d9946d 100644
--- a/engine/table/src/main/java/io/deephaven/engine/table/impl/sources/immutable/ImmutableConstantCharSource.java
+++ b/engine/table/src/main/java/io/deephaven/engine/table/impl/sources/immutable/ImmutableConstantCharSource.java
@@ -12,7 +12,6 @@
 import io.deephaven.engine.table.impl.AbstractColumnSource;
 import io.deephaven.engine.table.impl.ImmutableColumnSourceGetDefaults;
 import io.deephaven.engine.table.impl.sources.*;
-import io.deephaven.engine.table.impl.util.ShiftData;
 import org.jetbrains.annotations.NotNull;
 
 import static io.deephaven.engine.rowset.RowSequence.NULL_ROW_KEY;
@@ -26,7 +25,7 @@
  */
 public class ImmutableConstantCharSource
         extends AbstractColumnSource<Character>
-        implements ImmutableColumnSourceGetDefaults.ForChar, ShiftData.ShiftCallback, InMemoryColumnSource,
+        implements ImmutableColumnSourceGetDefaults.ForChar, InMemoryColumnSource,
         RowKeyAgnosticChunkSource<Values> /* MIXIN_IMPLS */ {
 
     private final char value;
@@ -64,9 +63,6 @@ public final void fillPrevChunk(
         fillChunk(context, destination, rowSequence);
     }
 
-    @Override
-    public final void shift(final long start, final long end, final long offset) {}
-
     @Override
     public void fillChunkUnordered(
             @NotNull FillContext context,
diff --git a/engine/table/src/main/java/io/deephaven/engine/table/impl/sources/immutable/ImmutableConstantDoubleSource.java b/engine/table/src/main/java/io/deephaven/engine/table/impl/sources/immutable/ImmutableConstantDoubleSource.java
index c75d5f2faba..75c3dd0b441 100644
--- a/engine/table/src/main/java/io/deephaven/engine/table/impl/sources/immutable/ImmutableConstantDoubleSource.java
+++ b/engine/table/src/main/java/io/deephaven/engine/table/impl/sources/immutable/ImmutableConstantDoubleSource.java
@@ -16,7 +16,6 @@
 import io.deephaven.engine.table.impl.AbstractColumnSource;
 import io.deephaven.engine.table.impl.ImmutableColumnSourceGetDefaults;
 import io.deephaven.engine.table.impl.sources.*;
-import io.deephaven.engine.table.impl.util.ShiftData;
 import org.jetbrains.annotations.NotNull;
 
 import static io.deephaven.engine.rowset.RowSequence.NULL_ROW_KEY;
@@ -30,7 +29,7 @@
  */
 public class ImmutableConstantDoubleSource
         extends AbstractColumnSource<Double>
-        implements ImmutableColumnSourceGetDefaults.ForDouble, ShiftData.ShiftCallback, InMemoryColumnSource,
+        implements ImmutableColumnSourceGetDefaults.ForDouble, InMemoryColumnSource,
         RowKeyAgnosticChunkSource<Values> /* MIXIN_IMPLS */ {
 
     private final double value;
@@ -68,9 +67,6 @@ public final void fillPrevChunk(
         fillChunk(context, destination, rowSequence);
     }
 
-    @Override
-    public final void shift(final long start, final long end, final long offset) {}
-
     @Override
     public void fillChunkUnordered(
             @NotNull FillContext context,
diff --git a/engine/table/src/main/java/io/deephaven/engine/table/impl/sources/immutable/ImmutableConstantFloatSource.java b/engine/table/src/main/java/io/deephaven/engine/table/impl/sources/immutable/ImmutableConstantFloatSource.java
index 81e961dbfec..9b895d41bdd 100644
--- a/engine/table/src/main/java/io/deephaven/engine/table/impl/sources/immutable/ImmutableConstantFloatSource.java
+++ b/engine/table/src/main/java/io/deephaven/engine/table/impl/sources/immutable/ImmutableConstantFloatSource.java
@@ -16,7 +16,6 @@
 import io.deephaven.engine.table.impl.AbstractColumnSource;
 import io.deephaven.engine.table.impl.ImmutableColumnSourceGetDefaults;
 import io.deephaven.engine.table.impl.sources.*;
-import io.deephaven.engine.table.impl.util.ShiftData;
 import org.jetbrains.annotations.NotNull;
 
 import static io.deephaven.engine.rowset.RowSequence.NULL_ROW_KEY;
@@ -30,7 +29,7 @@
  */
 public class ImmutableConstantFloatSource
         extends AbstractColumnSource<Float>
-        implements ImmutableColumnSourceGetDefaults.ForFloat, ShiftData.ShiftCallback, InMemoryColumnSource,
+        implements ImmutableColumnSourceGetDefaults.ForFloat, InMemoryColumnSource,
         RowKeyAgnosticChunkSource<Values> /* MIXIN_IMPLS */ {
 
     private final float value;
@@ -68,9 +67,6 @@ public final void fillPrevChunk(
         fillChunk(context, destination, rowSequence);
     }
 
-    @Override
-    public final void shift(final long start, final long end, final long offset) {}
-
     @Override
     public void fillChunkUnordered(
             @NotNull FillContext context,
diff --git a/engine/table/src/main/java/io/deephaven/engine/table/impl/sources/immutable/ImmutableConstantIntSource.java b/engine/table/src/main/java/io/deephaven/engine/table/impl/sources/immutable/ImmutableConstantIntSource.java
index ea4a6a8a82c..e9fd8c3938c 100644
--- a/engine/table/src/main/java/io/deephaven/engine/table/impl/sources/immutable/ImmutableConstantIntSource.java
+++ b/engine/table/src/main/java/io/deephaven/engine/table/impl/sources/immutable/ImmutableConstantIntSource.java
@@ -16,7 +16,6 @@
 import io.deephaven.engine.table.impl.AbstractColumnSource;
 import io.deephaven.engine.table.impl.ImmutableColumnSourceGetDefaults;
 import io.deephaven.engine.table.impl.sources.*;
-import io.deephaven.engine.table.impl.util.ShiftData;
 import org.jetbrains.annotations.NotNull;
 
 import static io.deephaven.engine.rowset.RowSequence.NULL_ROW_KEY;
@@ -30,7 +29,7 @@
  */
 public class ImmutableConstantIntSource
         extends AbstractColumnSource<Integer>
-        implements ImmutableColumnSourceGetDefaults.ForInt, ShiftData.ShiftCallback, InMemoryColumnSource,
+        implements ImmutableColumnSourceGetDefaults.ForInt, InMemoryColumnSource,
         RowKeyAgnosticChunkSource<Values> /* MIXIN_IMPLS */ {
 
     private final int value;
@@ -68,9 +67,6 @@ public final void fillPrevChunk(
         fillChunk(context, destination, rowSequence);
     }
 
-    @Override
-    public final void shift(final long start, final long end, final long offset) {}
-
     @Override
     public void fillChunkUnordered(
             @NotNull FillContext context,
diff --git a/engine/table/src/main/java/io/deephaven/engine/table/impl/sources/immutable/ImmutableConstantLongSource.java b/engine/table/src/main/java/io/deephaven/engine/table/impl/sources/immutable/ImmutableConstantLongSource.java
index 7d9e322f6d3..14c235bd509 100644
--- a/engine/table/src/main/java/io/deephaven/engine/table/impl/sources/immutable/ImmutableConstantLongSource.java
+++ b/engine/table/src/main/java/io/deephaven/engine/table/impl/sources/immutable/ImmutableConstantLongSource.java
@@ -25,7 +25,6 @@
 import io.deephaven.engine.table.impl.AbstractColumnSource;
 import io.deephaven.engine.table.impl.ImmutableColumnSourceGetDefaults;
 import io.deephaven.engine.table.impl.sources.*;
-import io.deephaven.engine.table.impl.util.ShiftData;
 import org.jetbrains.annotations.NotNull;
 
 import static io.deephaven.engine.rowset.RowSequence.NULL_ROW_KEY;
@@ -39,7 +38,7 @@
  */
 public class ImmutableConstantLongSource
         extends AbstractColumnSource<Long>
-        implements ImmutableColumnSourceGetDefaults.ForLong, ShiftData.ShiftCallback, InMemoryColumnSource,
+        implements ImmutableColumnSourceGetDefaults.ForLong, InMemoryColumnSource,
         RowKeyAgnosticChunkSource<Values> , ConvertibleTimeSource {
 
     private final long value;
@@ -77,9 +76,6 @@ public final void fillPrevChunk(
         fillChunk(context, destination, rowSequence);
     }
 
-    @Override
-    public final void shift(final long start, final long end, final long offset) {}
-
     @Override
     public void fillChunkUnordered(
             @NotNull FillContext context,
diff --git a/engine/table/src/main/java/io/deephaven/engine/table/impl/sources/immutable/ImmutableConstantNanosBasedTimeSource.java b/engine/table/src/main/java/io/deephaven/engine/table/impl/sources/immutable/ImmutableConstantNanosBasedTimeSource.java
index 075b786b412..bf55d4f5fde 100644
--- a/engine/table/src/main/java/io/deephaven/engine/table/impl/sources/immutable/ImmutableConstantNanosBasedTimeSource.java
+++ b/engine/table/src/main/java/io/deephaven/engine/table/impl/sources/immutable/ImmutableConstantNanosBasedTimeSource.java
@@ -13,7 +13,6 @@
 import io.deephaven.engine.table.ColumnSource;
 import io.deephaven.engine.table.impl.AbstractColumnSource;
 import io.deephaven.engine.table.impl.sources.*;
-import io.deephaven.engine.table.impl.util.ShiftData;
 import org.jetbrains.annotations.NotNull;
 
 import java.time.Instant;
@@ -23,7 +22,7 @@
 import java.time.ZonedDateTime;
 
 public abstract class ImmutableConstantNanosBasedTimeSource<TIME_TYPE> extends AbstractColumnSource<TIME_TYPE>
-        implements ShiftData.ShiftCallback, InMemoryColumnSource, RowKeyAgnosticChunkSource<Values>,
+        implements InMemoryColumnSource, RowKeyAgnosticChunkSource<Values>,
         ConvertibleTimeSource {
 
     protected final ImmutableConstantLongSource nanoSource;
@@ -61,9 +60,6 @@ public long getLong(long rowKey) {
     public long getPrevLong(long rowKey) {
         return nanoSource.getPrevLong(rowKey);
     }
-
-    @Override
-    public final void shift(final long start, final long end, final long offset) {}
     // endregion
 
     // region Chunking
diff --git a/engine/table/src/main/java/io/deephaven/engine/table/impl/sources/immutable/ImmutableConstantObjectSource.java b/engine/table/src/main/java/io/deephaven/engine/table/impl/sources/immutable/ImmutableConstantObjectSource.java
index 5971e14e61f..952559d98fd 100644
--- a/engine/table/src/main/java/io/deephaven/engine/table/impl/sources/immutable/ImmutableConstantObjectSource.java
+++ b/engine/table/src/main/java/io/deephaven/engine/table/impl/sources/immutable/ImmutableConstantObjectSource.java
@@ -16,7 +16,6 @@
 import io.deephaven.engine.table.impl.AbstractColumnSource;
 import io.deephaven.engine.table.impl.ImmutableColumnSourceGetDefaults;
 import io.deephaven.engine.table.impl.sources.*;
-import io.deephaven.engine.table.impl.util.ShiftData;
 import org.jetbrains.annotations.NotNull;
 
 import static io.deephaven.engine.rowset.RowSequence.NULL_ROW_KEY;
@@ -29,7 +28,7 @@
  */
 public class ImmutableConstantObjectSource<T>
         extends AbstractColumnSource<T>
-        implements ImmutableColumnSourceGetDefaults.ForObject<T>, ShiftData.ShiftCallback, InMemoryColumnSource,
+        implements ImmutableColumnSourceGetDefaults.ForObject<T>, InMemoryColumnSource,
         RowKeyAgnosticChunkSource<Values> /* MIXIN_IMPLS */ {
 
     private final T value;
@@ -67,9 +66,6 @@ public final void fillPrevChunk(
         fillChunk(context, destination, rowSequence);
     }
 
-    @Override
-    public final void shift(final long start, final long end, final long offset) {}
-
     @Override
     public void fillChunkUnordered(
             @NotNull FillContext context,
diff --git a/engine/table/src/main/java/io/deephaven/engine/table/impl/sources/immutable/ImmutableConstantShortSource.java b/engine/table/src/main/java/io/deephaven/engine/table/impl/sources/immutable/ImmutableConstantShortSource.java
index cdf53c08c05..95eb2ea4989 100644
--- a/engine/table/src/main/java/io/deephaven/engine/table/impl/sources/immutable/ImmutableConstantShortSource.java
+++ b/engine/table/src/main/java/io/deephaven/engine/table/impl/sources/immutable/ImmutableConstantShortSource.java
@@ -16,7 +16,6 @@
 import io.deephaven.engine.table.impl.AbstractColumnSource;
 import io.deephaven.engine.table.impl.ImmutableColumnSourceGetDefaults;
 import io.deephaven.engine.table.impl.sources.*;
-import io.deephaven.engine.table.impl.util.ShiftData;
 import org.jetbrains.annotations.NotNull;
 
 import static io.deephaven.engine.rowset.RowSequence.NULL_ROW_KEY;
@@ -30,7 +29,7 @@
  */
 public class ImmutableConstantShortSource
         extends AbstractColumnSource<Short>
-        implements ImmutableColumnSourceGetDefaults.ForShort, ShiftData.ShiftCallback, InMemoryColumnSource,
+        implements ImmutableColumnSourceGetDefaults.ForShort, InMemoryColumnSource,
         RowKeyAgnosticChunkSource<Values> /* MIXIN_IMPLS */ {
 
     private final short value;
@@ -68,9 +67,6 @@ public final void fillPrevChunk(
         fillChunk(context, destination, rowSequence);
     }
 
-    @Override
-    public final void shift(final long start, final long end, final long offset) {}
-
     @Override
     public void fillChunkUnordered(
             @NotNull FillContext context,
diff --git a/engine/table/src/main/java/io/deephaven/engine/table/impl/sources/regioned/ColumnRegionChunkDictionary.java b/engine/table/src/main/java/io/deephaven/engine/table/impl/sources/regioned/ColumnRegionChunkDictionary.java
index c56c58097fd..74a747f4e18 100644
--- a/engine/table/src/main/java/io/deephaven/engine/table/impl/sources/regioned/ColumnRegionChunkDictionary.java
+++ b/engine/table/src/main/java/io/deephaven/engine/table/impl/sources/regioned/ColumnRegionChunkDictionary.java
@@ -86,7 +86,10 @@ public boolean gatherDictionaryValuesRowSet(
             @NotNull final RowSequence.Iterator knownKeys,
             @NotNull final RowSetBuilderSequential sequentialBuilder) {
         final long dictSize = getDictionaryChunk().size();
-
+        if (dictSize == 0) {
+            advanceToNextPage(knownKeys);
+            return advanceToNextPage(keysToVisit);
+        }
         final long pageFirstKey = firstRow(keysToVisit.currentValue());
         final long pageLastKey = pageFirstKey + dictSize - 1;
 
diff --git a/engine/table/src/main/java/io/deephaven/engine/table/impl/sources/regioned/MergedDataIndex.java b/engine/table/src/main/java/io/deephaven/engine/table/impl/sources/regioned/MergedDataIndex.java
index 8bbe9f15532..44735004f52 100644
--- a/engine/table/src/main/java/io/deephaven/engine/table/impl/sources/regioned/MergedDataIndex.java
+++ b/engine/table/src/main/java/io/deephaven/engine/table/impl/sources/regioned/MergedDataIndex.java
@@ -15,6 +15,7 @@
 import io.deephaven.engine.table.ColumnSource;
 import io.deephaven.engine.table.PartitionedTableFactory;
 import io.deephaven.engine.table.Table;
+import io.deephaven.engine.table.impl.ForkJoinPoolOperationInitializer;
 import io.deephaven.engine.table.impl.by.AggregationProcessor;
 import io.deephaven.engine.table.impl.by.AggregationRowLookup;
 import io.deephaven.engine.table.impl.dataindex.AbstractDataIndex;
@@ -33,7 +34,7 @@
 /**
  * DataIndex that accumulates the individual per-{@link TableLocation} data indexes of a {@link Table} backed by a
  * {@link RegionedColumnSourceManager}.
- * 
+ *
  * @implNote This implementation is responsible for ensuring that the provided table accounts for the relative positions
  *           of individual table locations in the provided table of indices. Work to coalesce the index table is
  *           deferred until the first call to {@link #table()}. Refreshing inputs/indexes are not supported at this time
@@ -123,7 +124,7 @@ public Table table() {
             try {
                 return QueryPerformanceRecorder.withNugget(
                         String.format("Merge Data Indexes [%s]", String.join(", ", keyColumnNames)),
-                        this::buildTable);
+                        ForkJoinPoolOperationInitializer.ensureParallelizable(this::buildTable));
             } catch (Throwable t) {
                 isCorrupt = true;
                 throw t;
diff --git a/engine/table/src/main/java/io/deephaven/engine/table/impl/sources/regioned/PartitioningColumnDataIndex.java b/engine/table/src/main/java/io/deephaven/engine/table/impl/sources/regioned/PartitioningColumnDataIndex.java
index fb972aa92e9..1fc5e540b88 100644
--- a/engine/table/src/main/java/io/deephaven/engine/table/impl/sources/regioned/PartitioningColumnDataIndex.java
+++ b/engine/table/src/main/java/io/deephaven/engine/table/impl/sources/regioned/PartitioningColumnDataIndex.java
@@ -6,12 +6,7 @@
 import gnu.trove.map.hash.TObjectIntHashMap;
 import io.deephaven.base.verify.Assert;
 import io.deephaven.base.verify.Require;
-import io.deephaven.engine.rowset.RowSequence;
-import io.deephaven.engine.rowset.RowSet;
-import io.deephaven.engine.rowset.RowSetBuilderRandom;
-import io.deephaven.engine.rowset.RowSetFactory;
-import io.deephaven.engine.rowset.RowSetShiftData;
-import io.deephaven.engine.rowset.WritableRowSet;
+import io.deephaven.engine.rowset.*;
 import io.deephaven.engine.table.ColumnSource;
 import io.deephaven.engine.table.ModifiedColumnSet;
 import io.deephaven.engine.table.Table;
@@ -56,7 +51,7 @@ class PartitioningColumnDataIndex<KEY_TYPE> extends AbstractDataIndex {
     /** Provides fast lookup from keys to positions in the index table **/
     private final TObjectIntHashMap<Object> keyPositionMap;
 
-    private final ModifiedColumnSet upstreamLocationModified;
+    private final ModifiedColumnSet upstreamKeyModified;
     private final ModifiedColumnSet upstreamRowSetModified;
     private final ModifiedColumnSet downstreamRowSetModified;
 
@@ -65,7 +60,7 @@ class PartitioningColumnDataIndex<KEY_TYPE> extends AbstractDataIndex {
      * {@link RegionedColumnSourceManager} at a time when there cannot be any concurrent "refresh" behavior, and so we
      * can safely use the {@link RegionedColumnSourceManager#locationTable() location table} without snapshotting or
      * considering previous values.
-     * 
+     *
      * @param keyColumnName The key column name
      * @param keySource The key source in the indexed table
      * @param columnSourceManager The column source manager that provides locations and region indexes
@@ -113,7 +108,7 @@ class PartitioningColumnDataIndex<KEY_TYPE> extends AbstractDataIndex {
         if (locationTable.isRefreshing()) {
             // No need to track previous values; we mutate the index table's RowSets in-place, and we never move a key.
             indexTable.getRowSet().writableCast().initializePreviousValue();
-            upstreamLocationModified = locationTable.newModifiedColumnSet(columnSourceManager.locationColumnName());
+            upstreamKeyModified = locationTable.newModifiedColumnSet(keyColumnName);
             upstreamRowSetModified = locationTable.newModifiedColumnSet(columnSourceManager.rowSetColumnName());
             downstreamRowSetModified = indexTable.newModifiedColumnSet(rowSetColumnName());
             final TableUpdateListener tableListener = new BaseTable.ListenerImpl(String.format(
@@ -126,7 +121,7 @@ public void onUpdate(@NotNull final TableUpdate upstream) {
             locationTable.addUpdateListener(tableListener);
             manage(indexTable);
         } else {
-            upstreamLocationModified = null;
+            upstreamKeyModified = null;
             upstreamRowSetModified = null;
             downstreamRowSetModified = null;
         }
@@ -138,29 +133,30 @@ private synchronized void processUpdate(
         if (upstream.empty()) {
             return;
         }
-        if (upstream.removed().isNonempty()) {
-            throw new UnsupportedOperationException("Removed locations are not currently supported");
-        }
         if (upstream.shifted().nonempty()) {
             throw new UnsupportedOperationException("Shifted locations are not currently supported");
         }
-        if (upstream.modified().isNonempty() && upstream.modifiedColumnSet().containsAny(upstreamLocationModified)) {
-            throw new UnsupportedOperationException("Modified locations are not currently supported");
+        if (upstream.modified().isNonempty() && upstream.modifiedColumnSet().containsAny(upstreamKeyModified)) {
+            throw new UnsupportedOperationException("Modified location keys are not currently supported");
         }
         Assert.assertion(initializing || isRefreshing(), "initializing || isRefreshing()");
 
         final int previousSize = keyPositionMap.size();
-        final RowSetBuilderRandom modifiedBuilder = initializing ? null : RowSetFactory.builderRandom();
+        final RowSetBuilderRandom modifiedPositionBuilder = initializing ? null : RowSetFactory.builderRandom();
 
-        if (upstream.added().isNonempty()) {
-            upstream.added().forAllRowKeys((final long locationRowKey) -> handleKey(
-                    locationRowKey, false, previousSize, modifiedBuilder));
+        if (upstream.removed().isNonempty()) {
+            Assert.eqFalse(initializing, "initializing");
+            upstream.removed().forAllRowKeys((final long locationRowKey) -> handleLocation(
+                    locationRowKey, ChangeType.REMOVE, modifiedPositionBuilder));
         }
-
         if (upstream.modified().isNonempty() && upstream.modifiedColumnSet().containsAny(upstreamRowSetModified)) {
             Assert.eqFalse(initializing, "initializing");
-            upstream.modified().forAllRowKeys((final long locationRowKey) -> handleKey(
-                    locationRowKey, true, previousSize, modifiedBuilder));
+            upstream.modified().forAllRowKeys((final long locationRowKey) -> handleLocation(
+                    locationRowKey, ChangeType.MODIFY, modifiedPositionBuilder));
+        }
+        if (upstream.added().isNonempty()) {
+            upstream.added().forAllRowKeys((final long locationRowKey) -> handleLocation(
+                    locationRowKey, ChangeType.ADD, modifiedPositionBuilder));
         }
 
         final int newSize = keyPositionMap.size();
@@ -172,40 +168,89 @@ private synchronized void processUpdate(
             return;
         }
 
-        // Send the downstream updates to any listeners of the index table
-        final WritableRowSet modified = modifiedBuilder.build();
+        final WritableRowSet modified = modifiedPositionBuilder.build();
         if (previousSize == newSize && modified.isEmpty()) {
             modified.close();
             return;
         }
 
+        final RowSetBuilderSequential removedPositionsBuilder = RowSetFactory.builderSequential();
+        final RowSetBuilderSequential resurrectedPositionsBuilder = RowSetFactory.builderSequential();
+        modified.forAllRowKeys((final long pos) -> {
+            final RowSet indexRowSet = indexRowSetSource.get(pos);
+            // noinspection DataFlowIssue
+            if (indexRowSet.isEmpty()) {
+                removedPositionsBuilder.appendKey(pos);
+            } else if (indexRowSet.trackingCast().prev().isEmpty()) {
+                resurrectedPositionsBuilder.appendKey(pos);
+            }
+        });
+
+        final WritableRowSet added = RowSetFactory.fromRange(previousSize, newSize - 1);
+        final RowSet removed = removedPositionsBuilder.build();
+        modified.remove(removed);
+        try (final RowSet resurrected = resurrectedPositionsBuilder.build()) {
+            added.insert(resurrected);
+            modified.remove(resurrected);
+        }
+
+        // Send the downstream updates to any listeners of the index table
         final TableUpdate downstream = new TableUpdateImpl(
-                RowSetFactory.fromRange(previousSize, newSize - 1),
-                RowSetFactory.empty(),
+                added,
+                removed,
                 modified,
                 RowSetShiftData.EMPTY,
                 modified.isNonempty() ? downstreamRowSetModified : ModifiedColumnSet.EMPTY);
         indexTable.notifyListeners(downstream);
     }
 
-    private void handleKey(
+    private enum ChangeType {
+        // @formatter:off
+        ADD("Added"),
+        REMOVE("Removed"),
+        MODIFY("Modified");
+        // @formatter:on
+
+        private final String actionLabel;
+
+        ChangeType(@NotNull final String actionLabel) {
+            this.actionLabel = actionLabel;
+        }
+    }
+
+    private void handleLocation(
             final long locationRowKey,
-            final boolean isModify,
-            final int previousSize,
-            @Nullable final RowSetBuilderRandom modifiedBuilder) {
+            @NotNull final ChangeType changeType,
+            @Nullable final RowSetBuilderRandom modifiedPositionBuilder) {
         final KEY_TYPE locationKey = locationTableKeySource.get(locationRowKey);
         final Object locationKeyReinterpreted = locationTableKeySourceReinterpreted.get(locationRowKey);
-        final RowSet regionRowSet = locationTableRowSetSource.get(locationRowKey);
-        if (regionRowSet == null) {
-            throw new IllegalStateException(String.format("Null row set found at location index %d", locationRowKey));
+
+        final RowSet currentRegionRowSet = changeType == ChangeType.REMOVE
+                ? null
+                : locationTableRowSetSource.get(locationRowKey);
+        final RowSet previousRegionRowSet = changeType == ChangeType.ADD
+                ? null
+                : locationTableRowSetSource.getPrev(locationRowKey);
+
+        if (changeType != ChangeType.REMOVE && (currentRegionRowSet == null || currentRegionRowSet.isEmpty())) {
+            throw new IllegalStateException(String.format(
+                    "%s partition (index=%d, key=%s): Unexpected null or empty current row set",
+                    changeType.actionLabel, locationRowKey, locationKey));
+        }
+        if (changeType != ChangeType.ADD && (previousRegionRowSet == null || previousRegionRowSet.isEmpty())) {
+            throw new IllegalStateException(String.format(
+                    "%s partition (index=%d, key=%s): Unexpected null or empty previous row set",
+                    changeType.actionLabel, locationRowKey, locationKey));
         }
 
-        final long regionFirstRowKey = RegionedColumnSource.getFirstRowKey(Math.toIntExact(locationRowKey));
         // Test using the (maybe) reinterpreted key
         final int pos = keyPositionMap.get(locationKeyReinterpreted);
+
+        // Inserting a new bucket
         if (pos == KEY_NOT_FOUND) {
-            if (isModify) {
-                throw new IllegalStateException(String.format("Modified partition key %s not found", locationKey));
+            if (changeType == ChangeType.REMOVE || changeType == ChangeType.MODIFY) {
+                throw new IllegalStateException(String.format("%s partition (index=%d, key=%s): Key not found",
+                        changeType.actionLabel, locationRowKey, locationKey));
             }
             final int addedKeyPos = keyPositionMap.size();
             // Store the (maybe) reinterpreted key in the lookup hashmap.
@@ -216,21 +261,27 @@ private void handleKey(
             indexKeySource.set(addedKeyPos, locationKey);
 
             indexRowSetSource.ensureCapacity(addedKeyPos + 1);
-            indexRowSetSource.set(addedKeyPos, regionRowSet.shift(regionFirstRowKey));
-        } else {
-            // noinspection DataFlowIssue
-            final WritableRowSet existingRowSet = indexRowSetSource.get(pos).writableCast();
-            try (final WritableRowSet shiftedRowSet = regionRowSet.shift(regionFirstRowKey)) {
-                // We could assert that:
-                // 1. an added location is non-overlapping with the key's existing row set
-                // 2. a modified location's current row set is a superset of its previous row set
-                // 3. a modified location's previous row set is a subset of the key's existing row set
-                existingRowSet.insert(shiftedRowSet);
-            }
+            indexRowSetSource.set(addedKeyPos, currentRegionRowSet.copy().toTracking());
+            return;
+        }
 
-            if (modifiedBuilder != null && pos < previousSize) {
-                modifiedBuilder.addKey(pos);
-            }
+        // Updating an existing bucket
+        // noinspection DataFlowIssue
+        final WritableRowSet existingRowSet = indexRowSetSource.get(pos).writableCast();
+        // We _could_ assert that:
+        // 1. An added location is non-overlapping with the key's existing row set
+        // 2. A modified location's current row set is a superset of its previous row set (with existing RCSM)
+        // 3. A removed or modified location's previous row set is a subset of the key's existing row set
+        if (previousRegionRowSet != null) {
+            existingRowSet.remove(previousRegionRowSet);
+        }
+        if (currentRegionRowSet != null) {
+            existingRowSet.insert(currentRegionRowSet);
+        }
+        if (modifiedPositionBuilder != null) {
+            // Note that once done processing everything, we're going to adjust this to pull out transitions _from_
+            // empty as adds and _to_ empty as removes.
+            modifiedPositionBuilder.addKey(pos);
         }
     }
 
diff --git a/engine/table/src/main/java/io/deephaven/engine/table/impl/sources/regioned/RegionedColumnSourceManager.java b/engine/table/src/main/java/io/deephaven/engine/table/impl/sources/regioned/RegionedColumnSourceManager.java
index d510f21a002..0a131275a7b 100644
--- a/engine/table/src/main/java/io/deephaven/engine/table/impl/sources/regioned/RegionedColumnSourceManager.java
+++ b/engine/table/src/main/java/io/deephaven/engine/table/impl/sources/regioned/RegionedColumnSourceManager.java
@@ -4,20 +4,19 @@
 package io.deephaven.engine.table.impl.sources.regioned;
 
 import io.deephaven.base.verify.Assert;
-import io.deephaven.engine.liveness.LivenessArtifact;
-import io.deephaven.engine.liveness.LivenessScopeStack;
+import io.deephaven.engine.context.ExecutionContext;
+import io.deephaven.engine.liveness.*;
 import io.deephaven.engine.rowset.*;
 import io.deephaven.engine.table.*;
 import io.deephaven.engine.table.impl.*;
 import io.deephaven.engine.table.impl.indexer.DataIndexer;
-import io.deephaven.engine.table.impl.locations.ColumnLocation;
-import io.deephaven.engine.table.impl.locations.ImmutableTableLocationKey;
-import io.deephaven.engine.table.impl.locations.TableDataException;
-import io.deephaven.engine.table.impl.locations.TableLocation;
+import io.deephaven.engine.table.impl.locations.*;
+import io.deephaven.engine.table.impl.locations.impl.AbstractTableLocation;
 import io.deephaven.engine.table.impl.locations.impl.TableLocationUpdateSubscriptionBuffer;
 import io.deephaven.engine.table.impl.sources.ArrayBackedColumnSource;
 import io.deephaven.engine.table.impl.sources.ObjectArraySource;
 import io.deephaven.engine.table.impl.util.DelayedErrorNotifier;
+import io.deephaven.engine.updategraph.UpdateCommitter;
 import io.deephaven.hash.KeyedObjectHashMap;
 import io.deephaven.hash.KeyedObjectKey;
 import io.deephaven.internal.log.LoggerFactory;
@@ -30,14 +29,23 @@
 import java.util.*;
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
+import java.util.stream.StreamSupport;
+
+import static io.deephaven.engine.table.impl.sources.regioned.RegionedColumnSource.ROW_KEY_TO_SUB_REGION_ROW_INDEX_MASK;
+import static io.deephaven.engine.table.impl.sources.regioned.RegionedColumnSource.getFirstRowKey;
 
 /**
  * Manage column sources made up of regions in their own row key address space.
  */
-public class RegionedColumnSourceManager extends LivenessArtifact implements ColumnSourceManager {
+public class RegionedColumnSourceManager implements ColumnSourceManager, DelegatingLivenessNode {
 
     private static final Logger log = LoggerFactory.getLogger(RegionedColumnSourceManager.class);
 
+    /**
+     * The liveness node to which this column source manager will delegate.
+     */
+    private final LivenessNode livenessNode;
+
     /**
      * Whether this column source manager is serving a refreshing dynamic table.
      */
@@ -100,13 +108,40 @@ public class RegionedColumnSourceManager extends LivenessArtifact implements Col
     @ReferentialIntegrity
     private final Collection<DataIndex> retainedDataIndexes = new ArrayList<>();
 
+    /**
+     * List of tracked location keys to release at the end of the cycle.
+     */
+    private final List<AbstractTableLocation> releasedLocations = new ArrayList<>();
+
     /**
      * A reference to a delayed error notifier for the {@link #includedLocationsTable}, if one is pending.
      */
-    @SuppressWarnings("unused")
     @ReferentialIntegrity
     private Runnable delayedErrorReference;
 
+    /**
+     * The next region index to assign to a location. We increment for each new location and will not reuse indices from
+     * regions that were removed.
+     */
+    private int nextRegionIndex = 0;
+
+    /**
+     * List of locations that were removed this cycle. Will be swapped each cycle with {@code invalidatedLocations} and
+     * cleared.
+     */
+    private List<IncludedTableLocationEntry> removedTableLocations = new ArrayList<>();
+
+    /**
+     * List of locations to invalidate at the end of the cycle. Swapped with {@code removedTableLocations} each cycle to
+     * avoid reallocating.
+     */
+    private List<IncludedTableLocationEntry> invalidatedLocations = new ArrayList<>();
+
+    /**
+     * Will invalidate the locations at the end of the cycle after all downstream updates are complete.
+     */
+    final UpdateCommitter<?> invalidateCommitter;
+
     /**
      * Construct a column manager with the specified component factory and definitions.
      *
@@ -119,7 +154,6 @@ public class RegionedColumnSourceManager extends LivenessArtifact implements Col
             @NotNull final RegionedTableComponentFactory componentFactory,
             @NotNull final ColumnToCodecMappings codecMappings,
             @NotNull final List<ColumnDefinition<?>> columnDefinitions) {
-        super(false);
 
         this.isRefreshing = isRefreshing;
         this.columnDefinitions = columnDefinitions;
@@ -145,6 +179,33 @@ public class RegionedColumnSourceManager extends LivenessArtifact implements Col
                 ? SIMPLE_LOCATION_TABLE_DEFINITION
                 : TableDefinition.inferFrom(columnSourceMap);
 
+        if (isRefreshing) {
+            livenessNode = new LivenessArtifact() {
+                @Override
+                protected void destroy() {
+                    super.destroy();
+                    // NB: we do not want to null out any subscriptionBuffers here, as they may still be in use by a
+                    // notification delivery running currently with this destroy. We also do not want to clear the table
+                    // location maps as these locations may still be useful for static tables.
+                    for (final EmptyTableLocationEntry entry : emptyTableLocations.values()) {
+                        if (entry.subscriptionBuffer != null) {
+                            entry.subscriptionBuffer.reset();
+                        }
+                    }
+                    for (final IncludedTableLocationEntry entry : includedTableLocations.values()) {
+                        if (entry.subscriptionBuffer != null) {
+                            entry.subscriptionBuffer.reset();
+                        }
+                    }
+                }
+            };
+        } else {
+            // This RCSM wil be managing table locations to prevent them from being de-scoped but will not otherwise
+            // participate in the liveness management process.
+            livenessNode = new ReferenceCountedLivenessNode(false) {};
+            livenessNode.retainReference();
+        }
+
         try (final SafeCloseable ignored = isRefreshing ? LivenessScopeStack.open() : null) {
             includedLocationsTable = new QueryTable(
                     locationTableDefinition,
@@ -159,12 +220,27 @@ public class RegionedColumnSourceManager extends LivenessArtifact implements Col
                 }
             };
             if (isRefreshing) {
+                livenessNode.manage(includedLocationsTable);
                 rowSetModifiedColumnSet = includedLocationsTable.newModifiedColumnSet(ROWS_SET_COLUMN_NAME);
-                manage(includedLocationsTable);
             } else {
                 rowSetModifiedColumnSet = null;
             }
         }
+
+        invalidateCommitter = new UpdateCommitter<>(this,
+                ExecutionContext.getContext().getUpdateGraph(),
+                RegionedColumnSourceManager::invalidateAndRelease);
+    }
+
+    /**
+     * Activated by the invalidateCommitter to invalidate populated locations and to release all the managed locations
+     * that we no longer care about.
+     */
+    private synchronized void invalidateAndRelease() {
+        invalidatedLocations.forEach(IncludedTableLocationEntry::invalidate);
+        invalidatedLocations.clear();
+        releasedLocations.forEach(this::unmanage);
+        releasedLocations.clear();
     }
 
     @Override
@@ -176,6 +252,8 @@ public synchronized void addLocation(@NotNull final TableLocation tableLocation)
             if (log.isDebugEnabled()) {
                 log.debug().append("LOCATION_ADDED:").append(tableLocation.toString()).endl();
             }
+            // Hold on to this table location.
+            livenessNode.manage(tableLocation);
             emptyTableLocations.add(new EmptyTableLocationEntry(tableLocation));
         } else {
             // Duplicate location - not allowed
@@ -197,7 +275,7 @@ public synchronized void addLocation(@NotNull final TableLocation tableLocation)
     }
 
     @Override
-    public boolean removeLocationKey(@NotNull final ImmutableTableLocationKey locationKey) {
+    public synchronized void removeLocationKey(final @NotNull ImmutableTableLocationKey locationKey) {
         final IncludedTableLocationEntry includedLocation = includedTableLocations.remove(locationKey);
         final EmptyTableLocationEntry emptyLocation = emptyTableLocations.remove(locationKey);
 
@@ -205,12 +283,18 @@ public boolean removeLocationKey(@NotNull final ImmutableTableLocationKey locati
             if (log.isDebugEnabled()) {
                 log.debug().append("EMPTY_LOCATION_REMOVED:").append(locationKey.toString()).endl();
             }
+            if (emptyLocation.location instanceof AbstractTableLocation) {
+                releasedLocations.add((AbstractTableLocation) emptyLocation.location);
+                invalidateCommitter.maybeActivate();
+            }
         } else if (includedLocation != null) {
-            includedLocation.invalidate();
-            return true;
+            orderedIncludedTableLocations.remove(includedLocation);
+            removedTableLocations.add(includedLocation);
+            if (includedLocation.location instanceof AbstractTableLocation) {
+                releasedLocations.add((AbstractTableLocation) includedLocation.location);
+            }
+            invalidateCommitter.maybeActivate();
         }
-
-        return false;
     }
 
     @Override
@@ -218,8 +302,11 @@ public synchronized TrackingWritableRowSet initialize() {
         Assert.assertion(includedLocationsTable.isEmpty(), "includedLocationsTable.isEmpty()");
 
         // Do our first pass over the locations to include as many as possible and build the initial row set
+        final TableUpdateImpl update = update(true);
         // noinspection resource
-        final TrackingWritableRowSet initialRowSet = update(true).toTracking();
+        final TrackingWritableRowSet initialRowSet = update.added().writableCast().toTracking();
+        update.added = null;
+        update.release();
 
         // Add single-column data indexes for all partitioning columns, whether refreshing or not
         columnDefinitions.stream().filter(ColumnDefinition::isPartitioning).forEach(cd -> {
@@ -228,7 +315,7 @@ public synchronized TrackingWritableRowSet initialize() {
                         new PartitioningColumnDataIndex<>(cd.getName(), columnSources.get(cd.getName()), this);
                 retainedDataIndexes.add(partitioningIndex);
                 if (isRefreshing) {
-                    manage(partitioningIndex);
+                    livenessNode.manage(partitioningIndex);
                 }
                 DataIndexer.of(initialRowSet).addDataIndex(partitioningIndex);
             }
@@ -261,7 +348,7 @@ public synchronized TrackingWritableRowSet initialize() {
     }
 
     @Override
-    public synchronized WritableRowSet refresh() {
+    public synchronized TableUpdate refresh() {
         if (!isRefreshing) {
             throw new UnsupportedOperationException("Cannot refresh a static table");
         }
@@ -280,9 +367,28 @@ public void deliverError(@NotNull final Throwable error, @Nullable final TableLi
         }
     }
 
-    private WritableRowSet update(final boolean initializing) {
+    private TableUpdateImpl update(final boolean initializing) {
         final RowSetBuilderSequential addedRowSetBuilder = RowSetFactory.builderSequential();
 
+        final RowSetBuilderSequential removedRowSetBuilder =
+                removedTableLocations.isEmpty() ? null : RowSetFactory.builderSequential();
+        final RowSetBuilderSequential removedRegionBuilder =
+                removedTableLocations.isEmpty() ? null : RowSetFactory.builderSequential();
+
+        // Sort the removed locations by region index, so that we can process them in order.
+        removedTableLocations.sort(Comparator.comparingInt(e -> e.regionIndex));
+        for (final IncludedTableLocationEntry removedLocation : removedTableLocations) {
+            final long regionFirstKey = RegionedColumnSource.getFirstRowKey(removedLocation.regionIndex);
+            removedRowSetBuilder.appendRowSequenceWithOffset(removedLocation.rowSetAtLastUpdate, regionFirstKey);
+            removedRegionBuilder.appendKey(removedLocation.regionIndex);
+        }
+
+        // Swap invalidatedLocations with removedTableLocations.
+        final List<IncludedTableLocationEntry> tmpTableLocations = removedTableLocations;
+        removedTableLocations = invalidatedLocations;
+        invalidatedLocations = tmpTableLocations;
+        Assert.eqTrue(removedTableLocations.isEmpty(), "removedTableLocations.isEmpty()");
+
         final RowSetBuilderSequential modifiedRegionBuilder = initializing ? null : RowSetFactory.builderSequential();
 
         // Ordering matters, since we're using a sequential builder.
@@ -290,43 +396,50 @@ private WritableRowSet update(final boolean initializing) {
             if (entry.pollUpdates(addedRowSetBuilder)) {
                 // Changes were detected, update the row set in the table and mark the row/column as modified.
                 /*
-                 * Since TableLocationState.getRowSet() returns a copy(), we should consider adding an UpdateCommitter
-                 * to close() the previous row sets for modified locations. This is not important for current
-                 * implementations, since they always allocate new, flat RowSets.
+                 * We should consider adding an UpdateCommitter to close() the previous row sets for modified locations.
+                 * This is not important for current implementations, since they always allocate new, flat RowSets.
                  */
-                rowSetSource.set(entry.regionIndex, entry.location.getRowSet());
+                rowSetSource.set(entry.regionIndex, entry.rowSetAtLastUpdate.shift(getFirstRowKey(entry.regionIndex)));
                 if (modifiedRegionBuilder != null) {
                     modifiedRegionBuilder.appendKey(entry.regionIndex);
                 }
             }
         }
 
-        Collection<EmptyTableLocationEntry> entriesToInclude = null;
-        for (final Iterator<EmptyTableLocationEntry> iterator = emptyTableLocations.iterator(); iterator.hasNext();) {
-            final EmptyTableLocationEntry emptyEntry = iterator.next();
-            emptyEntry.refresh();
-            final RowSet locationRowSet = emptyEntry.location.getRowSet();
-            if (locationRowSet == null) {
-                continue;
-            }
-            if (locationRowSet.isEmpty()) {
-                locationRowSet.close();
-            } else {
-                emptyEntry.initialRowSet = locationRowSet;
-                (entriesToInclude == null ? entriesToInclude = new TreeSet<>() : entriesToInclude).add(emptyEntry);
-                iterator.remove();
-            }
-        }
-
-        final int previousNumRegions = includedTableLocations.size();
-        final int newNumRegions = previousNumRegions + (entriesToInclude == null ? 0 : entriesToInclude.size());
-        if (entriesToInclude != null) {
+        //@formatter:off
+        final Collection<EmptyTableLocationEntry> entriesToInclude = StreamSupport.stream(Spliterators.spliterator(
+                                emptyTableLocations.iterator(),
+                                emptyTableLocations.size(),
+                                Spliterator.IMMUTABLE | Spliterator.DISTINCT | Spliterator.NONNULL),
+                        true) //@formatter:on
+                .peek(EmptyTableLocationEntry::refresh)
+                .filter((final EmptyTableLocationEntry emptyEntry) -> {
+                    final RowSet locationRowSet = emptyEntry.location.getRowSet();
+                    if (locationRowSet == null) {
+                        return false;
+                    }
+                    if (locationRowSet.isEmpty()) {
+                        locationRowSet.close();
+                        return false;
+                    }
+                    emptyEntry.initialRowSet = locationRowSet;
+                    return true;
+                }).collect(Collectors.toList());
+
+        emptyTableLocations.removeAll(entriesToInclude);
+
+        final RowSetBuilderSequential addedRegionBuilder =
+                entriesToInclude.isEmpty() ? null : RowSetFactory.builderSequential();
+
+        final int prevMaxIndex = nextRegionIndex;
+        final int maxIndex = nextRegionIndex + (entriesToInclude.isEmpty() ? 0 : entriesToInclude.size());
+        if (!entriesToInclude.isEmpty()) {
             partitioningColumnValueSources.values().forEach(
-                    (final WritableColumnSource<?> wcs) -> wcs.ensureCapacity(newNumRegions));
-            locationSource.ensureCapacity(newNumRegions);
-            rowSetSource.ensureCapacity(newNumRegions);
+                    (final WritableColumnSource<?> wcs) -> wcs.ensureCapacity(maxIndex));
+            locationSource.ensureCapacity(maxIndex);
+            rowSetSource.ensureCapacity(maxIndex);
 
-            for (final EmptyTableLocationEntry entryToInclude : entriesToInclude) {
+            entriesToInclude.stream().sorted().forEachOrdered((final EmptyTableLocationEntry entryToInclude) -> {
                 final IncludedTableLocationEntry entry = new IncludedTableLocationEntry(entryToInclude);
                 includedTableLocations.add(entry);
                 orderedIncludedTableLocations.add(entry);
@@ -340,16 +453,18 @@ private WritableRowSet update(final boolean initializing) {
                                 wcs.set(entry.regionIndex, entry.location.getKey().getPartitionValue(key)));
                 // @formatter:on
                 locationSource.set(entry.regionIndex, entry.location);
-                rowSetSource.set(entry.regionIndex, entry.location.getRowSet());
-            }
+                rowSetSource.set(entry.regionIndex, entry.rowSetAtLastUpdate.shift(getFirstRowKey(entry.regionIndex)));
+                addedRegionBuilder.appendKey(entry.regionIndex);
+            });
         }
+        final RowSet addedRegions = addedRegionBuilder == null ? RowSetFactory.empty() : addedRegionBuilder.build();
 
-        if (previousNumRegions != newNumRegions) {
-            includedLocationsTable.getRowSet().writableCast().insertRange(previousNumRegions, newNumRegions - 1);
+        if (addedRegions.isNonempty()) {
+            includedLocationsTable.getRowSet().writableCast().insert(addedRegions);
         }
 
         if (initializing) {
-            Assert.eqZero(previousNumRegions, "previousNumRegions");
+            Assert.eqZero(prevMaxIndex, "prevMaxIndex");
             if (isRefreshing) {
                 rowSetSource.startTrackingPrevValues();
                 includedLocationsTable.getRowSet().writableCast().initializePreviousValue();
@@ -359,28 +474,35 @@ private WritableRowSet update(final boolean initializing) {
             }
         } else {
             final RowSet modifiedRegions = modifiedRegionBuilder.build();
-            if (previousNumRegions == newNumRegions && modifiedRegions.isEmpty()) {
-                modifiedRegions.close();
+            final RowSet removedRegions =
+                    removedRegionBuilder == null ? RowSetFactory.empty() : removedRegionBuilder.build();
+            if (addedRegions.isEmpty() && modifiedRegions.isEmpty() && removedRegions.isEmpty()) {
+                SafeCloseable.closeAll(addedRegions, modifiedRegions, removedRegions);
             } else {
+                includedLocationsTable.getRowSet().writableCast().remove(removedRegions);
                 final TableUpdate update = new TableUpdateImpl(
-                        previousNumRegions == newNumRegions
-                                ? RowSetFactory.empty()
-                                : RowSetFactory.fromRange(previousNumRegions, newNumRegions - 1),
-                        RowSetFactory.empty(),
+                        addedRegions,
+                        removedRegions,
                         modifiedRegions,
                         RowSetShiftData.EMPTY,
                         modifiedRegions.isNonempty() ? rowSetModifiedColumnSet : ModifiedColumnSet.EMPTY);
                 includedLocationsTable.notifyListeners(update);
             }
         }
-        return addedRowSetBuilder.build();
+        return new TableUpdateImpl(
+                addedRowSetBuilder.build(),
+                removedRowSetBuilder == null ? RowSetFactory.empty() : removedRowSetBuilder.build(),
+                RowSetFactory.empty(),
+                RowSetShiftData.EMPTY,
+                ModifiedColumnSet.EMPTY);
     }
 
     @Override
     public final synchronized Collection<TableLocation> allLocations() {
+        //@formatter:off
         return Stream.concat(
-                orderedIncludedTableLocations.stream().map(e -> e.location),
-                emptyTableLocations.values().stream().sorted().map(e -> e.location))
+                        orderedIncludedTableLocations.stream().map(e -> e.location),
+                        emptyTableLocations.values().stream().sorted().map(e -> e.location)) //@formatter:on
                 .collect(Collectors.toCollection(ArrayList::new));
     }
 
@@ -415,6 +537,10 @@ public final synchronized boolean isEmpty() {
         return sharedColumnSources;
     }
 
+    public LivenessNode asLivenessNode() {
+        return livenessNode;
+    }
+
     /**
      * State keeper for a table location and its subscription buffer if it hasn't been found to have a non-null,
      * non-zero size yet.
@@ -472,7 +598,9 @@ private class IncludedTableLocationEntry implements Comparable<IncludedTableLoca
         private final TableLocation location;
         private final TableLocationUpdateSubscriptionBuffer subscriptionBuffer;
 
-        private final int regionIndex = includedTableLocations.size();
+        // New regions indices are assigned in order of insertion, starting from 0 with no re-use of removed indices.
+        // If this logic changes, the `getTableAttributes()` logic needs to be updated.
+        private final int regionIndex = nextRegionIndex++;
         private final List<ColumnLocationState<?>> columnLocationStates = new ArrayList<>();
 
         /**
@@ -489,14 +617,14 @@ private void processInitial(final RowSetBuilderSequential addedRowSetBuilder, fi
             Assert.neqNull(initialRowSet, "initialRowSet");
             Assert.eqTrue(initialRowSet.isNonempty(), "initialRowSet.isNonempty()");
             Assert.eqNull(rowSetAtLastUpdate, "rowSetAtLastUpdate");
-            if (initialRowSet.lastRowKey() > RegionedColumnSource.ROW_KEY_TO_SUB_REGION_ROW_INDEX_MASK) {
+            if (initialRowSet.lastRowKey() > ROW_KEY_TO_SUB_REGION_ROW_INDEX_MASK) {
                 throw new TableDataException(String.format(
                         "Location %s has initial last key %#016X, larger than maximum supported key %#016X",
                         location, initialRowSet.lastRowKey(),
-                        RegionedColumnSource.ROW_KEY_TO_SUB_REGION_ROW_INDEX_MASK));
+                        ROW_KEY_TO_SUB_REGION_ROW_INDEX_MASK));
             }
 
-            final long regionFirstKey = RegionedColumnSource.getFirstRowKey(regionIndex);
+            final long regionFirstKey = getFirstRowKey(regionIndex);
             initialRowSet.forAllRowKeyRanges((subRegionFirstKey, subRegionLastKey) -> addedRowSetBuilder
                     .appendRange(regionFirstKey + subRegionFirstKey, regionFirstKey + subRegionLastKey));
 
@@ -513,7 +641,9 @@ private void processInitial(final RowSetBuilderSequential addedRowSetBuilder, fi
             rowSetAtLastUpdate = initialRowSet;
         }
 
-        /** Returns {@code true} if there were changes to the row set for this location. */
+        /**
+         * Returns {@code true} if there were changes to the row set for this location.
+         */
         private boolean pollUpdates(final RowSetBuilderSequential addedRowSetBuilder) {
             Assert.neqNull(subscriptionBuffer, "subscriptionBuffer"); // Effectively, this is asserting "isRefreshing".
             try {
@@ -547,11 +677,11 @@ private boolean pollUpdates(final RowSetBuilderSequential addedRowSetBuilder) {
                     // Nothing to do
                     return false;
                 }
-                if (updateRowSet.lastRowKey() > RegionedColumnSource.ROW_KEY_TO_SUB_REGION_ROW_INDEX_MASK) {
+                if (updateRowSet.lastRowKey() > ROW_KEY_TO_SUB_REGION_ROW_INDEX_MASK) {
                     throw new TableDataException(String.format(
                             "Location %s has updated last key %#016X, larger than maximum supported key %#016X",
                             location, updateRowSet.lastRowKey(),
-                            RegionedColumnSource.ROW_KEY_TO_SUB_REGION_ROW_INDEX_MASK));
+                            ROW_KEY_TO_SUB_REGION_ROW_INDEX_MASK));
                 }
 
                 if (log.isDebugEnabled()) {
@@ -560,12 +690,17 @@ private boolean pollUpdates(final RowSetBuilderSequential addedRowSetBuilder) {
                             .append(",TO:").append(updateRowSet.size()).endl();
                 }
                 try (final RowSet addedRowSet = updateRowSet.minus(rowSetAtLastUpdate)) {
-                    final long regionFirstKey = RegionedColumnSource.getFirstRowKey(regionIndex);
+                    final long regionFirstKey = getFirstRowKey(regionIndex);
                     addedRowSet.forAllRowKeyRanges((subRegionFirstKey, subRegionLastKey) -> addedRowSetBuilder
                             .appendRange(regionFirstKey + subRegionFirstKey, regionFirstKey + subRegionLastKey));
                 }
             } finally {
-                rowSetAtLastUpdate.close();
+                /*
+                 * Since we record rowSetAtLastUpdate in the RowSet column of our includedLocationsTable, we must not
+                 * close() the old rowSetAtLastUpdate here. We should instead consider adding an UpdateCommitter to
+                 * close() the previous RowSets for modified locations, but this is not important for current
+                 * implementations since they always allocate new, flat RowSets.
+                 */
                 rowSetAtLastUpdate = updateRowSet;
             }
             // There was a change to the row set.
@@ -606,7 +741,8 @@ private static class ColumnLocationState<T> {
         protected final RegionedColumnSource<T> source;
         protected final ColumnLocation location;
 
-        private ColumnLocationState(ColumnDefinition<T> definition,
+        private ColumnLocationState(
+                ColumnDefinition<T> definition,
                 RegionedColumnSource<T> source,
                 ColumnLocation location) {
             this.definition = definition;
@@ -619,4 +755,25 @@ private void regionAllocated(final int regionIndex) {
                     "source.addRegion((definition, location)");
         }
     }
+
+    public Map<String, Object> getTableAttributes(
+            @NotNull TableUpdateMode tableUpdateMode,
+            @NotNull TableUpdateMode tableLocationUpdateMode) {
+        final Map<String, Object> attributes = new HashMap<>();
+        // NOTE: Current RegionedColumnSourceManager implementation appends new locations and does not reuse
+        // region indices. This is important for the following attributes to be correct.
+
+        if (tableUpdateMode == TableUpdateMode.APPEND_ONLY
+                && tableLocationUpdateMode == TableUpdateMode.STATIC) {
+            // This table is APPEND_ONLY IFF the set of locations is APPEND_ONLY
+            // and the location contents are STATIC
+            attributes.put(Table.APPEND_ONLY_TABLE_ATTRIBUTE, Boolean.TRUE);
+        } else if (!tableUpdateMode.removeAllowed()
+                && !tableLocationUpdateMode.removeAllowed()) {
+            // This table is ADD_ONLY IFF the set of locations is not allowed to remove locations
+            // and the locations contents are not allowed to remove rows
+            attributes.put(Table.ADD_ONLY_TABLE_ATTRIBUTE, Boolean.TRUE);
+        }
+        return attributes;
+    }
 }
diff --git a/engine/table/src/main/java/io/deephaven/engine/table/impl/ssa/ObjectChunkSsaStamp.java b/engine/table/src/main/java/io/deephaven/engine/table/impl/ssa/ObjectChunkSsaStamp.java
index c398afa86fa..6dc103737bf 100644
--- a/engine/table/src/main/java/io/deephaven/engine/table/impl/ssa/ObjectChunkSsaStamp.java
+++ b/engine/table/src/main/java/io/deephaven/engine/table/impl/ssa/ObjectChunkSsaStamp.java
@@ -8,6 +8,7 @@
 package io.deephaven.engine.table.impl.ssa;
 
 import java.util.Objects;
+import io.deephaven.util.compare.ObjectComparisons;
 
 import io.deephaven.chunk.*;
 import io.deephaven.engine.rowset.chunkattributes.RowKeys;
@@ -249,19 +250,8 @@ private static int findFirstResponsiveLeft(int leftLowIdx, ObjectChunk<Object, V
     // region comparison functions
     // ascending comparison
     private static int doComparison(Object lhs, Object rhs) {
-       if (lhs == rhs) {
-            return 0;
-        }
-        if (lhs == null) {
-            return -1;
-        }
-        if (rhs == null) {
-            return 1;
-        }
-        //noinspection unchecked,rawtypes
-        return ((Comparable)lhs).compareTo(rhs);
+        return ObjectComparisons.compare(lhs, rhs);
     }
-
     // endregion comparison functions
 
     private static boolean lt(Object lhs, Object rhs) {
diff --git a/engine/table/src/main/java/io/deephaven/engine/table/impl/ssa/ObjectReverseChunkSsaStamp.java b/engine/table/src/main/java/io/deephaven/engine/table/impl/ssa/ObjectReverseChunkSsaStamp.java
index 8efb4cde547..5a4e57791ea 100644
--- a/engine/table/src/main/java/io/deephaven/engine/table/impl/ssa/ObjectReverseChunkSsaStamp.java
+++ b/engine/table/src/main/java/io/deephaven/engine/table/impl/ssa/ObjectReverseChunkSsaStamp.java
@@ -10,8 +10,10 @@
 package io.deephaven.engine.table.impl.ssa;
 
 import java.util.Objects;
+import io.deephaven.util.compare.ObjectComparisons;
 
 import java.util.Objects;
+import io.deephaven.util.compare.ObjectComparisons;
 
 import io.deephaven.chunk.*;
 import io.deephaven.engine.rowset.chunkattributes.RowKeys;
@@ -253,17 +255,7 @@ private static int findFirstResponsiveLeft(int leftLowIdx, ObjectChunk<Object, V
     // region comparison functions
     // descending comparison
     private static int doComparison(Object lhs, Object rhs) {
-        if (lhs == rhs) {
-            return 0;
-        }
-        if (lhs == null) {
-            return 1;
-        }
-        if (rhs == null) {
-            return -1;
-        }
-        //noinspection unchecked,rawtypes
-        return ((Comparable)rhs).compareTo(lhs);
+        return ObjectComparisons.compare(rhs, lhs);
     }
     // endregion comparison functions
 
diff --git a/engine/table/src/main/java/io/deephaven/engine/table/impl/ssa/ObjectReverseSegmentedSortedArray.java b/engine/table/src/main/java/io/deephaven/engine/table/impl/ssa/ObjectReverseSegmentedSortedArray.java
index ba41c58dd35..d22ad6806b7 100644
--- a/engine/table/src/main/java/io/deephaven/engine/table/impl/ssa/ObjectReverseSegmentedSortedArray.java
+++ b/engine/table/src/main/java/io/deephaven/engine/table/impl/ssa/ObjectReverseSegmentedSortedArray.java
@@ -10,8 +10,10 @@
 package io.deephaven.engine.table.impl.ssa;
 
 import java.util.Objects;
+import io.deephaven.util.compare.ObjectComparisons;
 
 import java.util.Objects;
+import io.deephaven.util.compare.ObjectComparisons;
 
 import io.deephaven.base.verify.Assert;
 import io.deephaven.engine.rowset.RowSequence;
@@ -1508,17 +1510,7 @@ public void forAllKeys(LongConsumer longConsumer) {
     // region comparison functions
     // descending comparison
     private static int doComparison(Object lhs, Object rhs) {
-        if (lhs == rhs) {
-            return 0;
-        }
-        if (lhs == null) {
-            return 1;
-        }
-        if (rhs == null) {
-            return -1;
-        }
-        //noinspection unchecked,rawtypes
-        return ((Comparable)rhs).compareTo(lhs);
+        return ObjectComparisons.compare(rhs, lhs);
     }
     // endregion comparison functions
 
diff --git a/engine/table/src/main/java/io/deephaven/engine/table/impl/ssa/ObjectReverseSsaChecker.java b/engine/table/src/main/java/io/deephaven/engine/table/impl/ssa/ObjectReverseSsaChecker.java
index 38706a17db5..6f80d4a8e69 100644
--- a/engine/table/src/main/java/io/deephaven/engine/table/impl/ssa/ObjectReverseSsaChecker.java
+++ b/engine/table/src/main/java/io/deephaven/engine/table/impl/ssa/ObjectReverseSsaChecker.java
@@ -10,8 +10,10 @@
 package io.deephaven.engine.table.impl.ssa;
 
 import java.util.Objects;
+import io.deephaven.util.compare.ObjectComparisons;
 
 import java.util.Objects;
+import io.deephaven.util.compare.ObjectComparisons;
 
 import io.deephaven.base.verify.Assert;
 import io.deephaven.chunk.ObjectChunk;
diff --git a/engine/table/src/main/java/io/deephaven/engine/table/impl/ssa/ObjectReverseSsaSsaStamp.java b/engine/table/src/main/java/io/deephaven/engine/table/impl/ssa/ObjectReverseSsaSsaStamp.java
index 7b88fc933c8..da805187d16 100644
--- a/engine/table/src/main/java/io/deephaven/engine/table/impl/ssa/ObjectReverseSsaSsaStamp.java
+++ b/engine/table/src/main/java/io/deephaven/engine/table/impl/ssa/ObjectReverseSsaSsaStamp.java
@@ -10,8 +10,10 @@
 package io.deephaven.engine.table.impl.ssa;
 
 import java.util.Objects;
+import io.deephaven.util.compare.ObjectComparisons;
 
 import java.util.Objects;
+import io.deephaven.util.compare.ObjectComparisons;
 
 import io.deephaven.chunk.*;
 import io.deephaven.engine.rowset.chunkattributes.RowKeys;
@@ -296,17 +298,7 @@ private void applyShift(ObjectReverseSegmentedSortedArray leftSsa, ObjectChunk<O
     // region comparison functions
     // descending comparison
     private static int doComparison(Object lhs, Object rhs) {
-        if (lhs == rhs) {
-            return 0;
-        }
-        if (lhs == null) {
-            return 1;
-        }
-        if (rhs == null) {
-            return -1;
-        }
-        //noinspection unchecked,rawtypes
-        return ((Comparable)rhs).compareTo(lhs);
+        return ObjectComparisons.compare(rhs, lhs);
     }
     // endregion comparison functions
 
diff --git a/engine/table/src/main/java/io/deephaven/engine/table/impl/ssa/ObjectSegmentedSortedArray.java b/engine/table/src/main/java/io/deephaven/engine/table/impl/ssa/ObjectSegmentedSortedArray.java
index cb19f5631e0..16bc62db0b6 100644
--- a/engine/table/src/main/java/io/deephaven/engine/table/impl/ssa/ObjectSegmentedSortedArray.java
+++ b/engine/table/src/main/java/io/deephaven/engine/table/impl/ssa/ObjectSegmentedSortedArray.java
@@ -8,6 +8,7 @@
 package io.deephaven.engine.table.impl.ssa;
 
 import java.util.Objects;
+import io.deephaven.util.compare.ObjectComparisons;
 
 import io.deephaven.base.verify.Assert;
 import io.deephaven.engine.rowset.RowSequence;
@@ -1504,19 +1505,8 @@ public void forAllKeys(LongConsumer longConsumer) {
     // region comparison functions
     // ascending comparison
     private static int doComparison(Object lhs, Object rhs) {
-       if (lhs == rhs) {
-            return 0;
-        }
-        if (lhs == null) {
-            return -1;
-        }
-        if (rhs == null) {
-            return 1;
-        }
-        //noinspection unchecked,rawtypes
-        return ((Comparable)lhs).compareTo(rhs);
+        return ObjectComparisons.compare(lhs, rhs);
     }
-
     // endregion comparison functions
 
     private static boolean gt(Object lhs, Object rhs) {
diff --git a/engine/table/src/main/java/io/deephaven/engine/table/impl/ssa/ObjectSsaChecker.java b/engine/table/src/main/java/io/deephaven/engine/table/impl/ssa/ObjectSsaChecker.java
index 0340fb5a5e8..a46e54e880e 100644
--- a/engine/table/src/main/java/io/deephaven/engine/table/impl/ssa/ObjectSsaChecker.java
+++ b/engine/table/src/main/java/io/deephaven/engine/table/impl/ssa/ObjectSsaChecker.java
@@ -8,6 +8,7 @@
 package io.deephaven.engine.table.impl.ssa;
 
 import java.util.Objects;
+import io.deephaven.util.compare.ObjectComparisons;
 
 import io.deephaven.base.verify.Assert;
 import io.deephaven.chunk.ObjectChunk;
diff --git a/engine/table/src/main/java/io/deephaven/engine/table/impl/ssa/ObjectSsaSsaStamp.java b/engine/table/src/main/java/io/deephaven/engine/table/impl/ssa/ObjectSsaSsaStamp.java
index 0551b39a49f..3945b7cdf63 100644
--- a/engine/table/src/main/java/io/deephaven/engine/table/impl/ssa/ObjectSsaSsaStamp.java
+++ b/engine/table/src/main/java/io/deephaven/engine/table/impl/ssa/ObjectSsaSsaStamp.java
@@ -8,6 +8,7 @@
 package io.deephaven.engine.table.impl.ssa;
 
 import java.util.Objects;
+import io.deephaven.util.compare.ObjectComparisons;
 
 import io.deephaven.chunk.*;
 import io.deephaven.engine.rowset.chunkattributes.RowKeys;
@@ -292,19 +293,8 @@ private void applyShift(ObjectSegmentedSortedArray leftSsa, ObjectChunk<Object,
     // region comparison functions
     // ascending comparison
     private static int doComparison(Object lhs, Object rhs) {
-       if (lhs == rhs) {
-            return 0;
-        }
-        if (lhs == null) {
-            return -1;
-        }
-        if (rhs == null) {
-            return 1;
-        }
-        //noinspection unchecked,rawtypes
-        return ((Comparable)lhs).compareTo(rhs);
+        return ObjectComparisons.compare(lhs, rhs);
     }
-
     // endregion comparison functions
 
     private static boolean lt(Object lhs, Object rhs) {
diff --git a/engine/table/src/main/java/io/deephaven/engine/table/impl/ssms/ObjectSegmentedSortedMultiset.java b/engine/table/src/main/java/io/deephaven/engine/table/impl/ssms/ObjectSegmentedSortedMultiset.java
index 4633709598f..42cb21d95d0 100644
--- a/engine/table/src/main/java/io/deephaven/engine/table/impl/ssms/ObjectSegmentedSortedMultiset.java
+++ b/engine/table/src/main/java/io/deephaven/engine/table/impl/ssms/ObjectSegmentedSortedMultiset.java
@@ -10,6 +10,7 @@
 import gnu.trove.set.hash.THashSet;
 
 import java.util.Objects;
+import io.deephaven.util.compare.ObjectComparisons;
 
 import io.deephaven.base.verify.Assert;
 import io.deephaven.chunk.attributes.Any;
diff --git a/engine/table/src/main/java/io/deephaven/engine/table/impl/updateby/BucketedPartitionedUpdateByManager.java b/engine/table/src/main/java/io/deephaven/engine/table/impl/updateby/BucketedPartitionedUpdateByManager.java
index 83461f2a75b..aad2b027925 100644
--- a/engine/table/src/main/java/io/deephaven/engine/table/impl/updateby/BucketedPartitionedUpdateByManager.java
+++ b/engine/table/src/main/java/io/deephaven/engine/table/impl/updateby/BucketedPartitionedUpdateByManager.java
@@ -3,7 +3,6 @@
 //
 package io.deephaven.engine.table.impl.updateby;
 
-import io.deephaven.UncheckedDeephavenException;
 import io.deephaven.api.updateby.UpdateByControl;
 import io.deephaven.base.verify.Assert;
 import io.deephaven.engine.exceptions.CancellationException;
@@ -83,9 +82,12 @@ class BucketedPartitionedUpdateByManager extends UpdateBy {
             final PartitionedTable partitioned = source.partitionedAggBy(List.of(), true, null, byColumnNames);
             final PartitionedTable transformed = partitioned.transform(t -> {
                 final long firstSourceRowKey = t.getRowSet().firstRowKey();
+                final Object[] bucketKeyValues = Arrays.stream(byColumnNames)
+                        .map(colName -> t.getColumnSource(colName).get(firstSourceRowKey))
+                        .toArray();
                 final String bucketDescription = BucketedPartitionedUpdateByManager.this + "-bucket-" +
-                        Arrays.stream(byColumnNames)
-                                .map(bcn -> Objects.toString(t.getColumnSource(bcn).get(firstSourceRowKey)))
+                        Arrays.stream(bucketKeyValues)
+                                .map(Objects::toString)
                                 .collect(Collectors.joining(", ", "[", "]"));
                 UpdateByBucketHelper bucket = new UpdateByBucketHelper(
                         bucketDescription,
@@ -94,7 +96,8 @@ class BucketedPartitionedUpdateByManager extends UpdateBy {
                         resultSources,
                         timestampColumnName,
                         control,
-                        this::onBucketFailure);
+                        this::onBucketFailure,
+                        bucketKeyValues);
                 // add this to the bucket list
                 synchronized (buckets) {
                     buckets.offer(bucket);
diff --git a/engine/table/src/main/java/io/deephaven/engine/table/impl/updateby/UpdateByBucketHelper.java b/engine/table/src/main/java/io/deephaven/engine/table/impl/updateby/UpdateByBucketHelper.java
index 17bff00fec5..3c99b57a5b7 100644
--- a/engine/table/src/main/java/io/deephaven/engine/table/impl/updateby/UpdateByBucketHelper.java
+++ b/engine/table/src/main/java/io/deephaven/engine/table/impl/updateby/UpdateByBucketHelper.java
@@ -50,6 +50,9 @@ class UpdateByBucketHelper extends IntrusiveDoublyLinkedNode.Impl<UpdateByBucket
     private final ColumnSource<?> timestampColumnSource;
     private final ModifiedColumnSet timestampColumnSet;
 
+    /** Store boxed key values for this bucket */
+    private final Object[] bucketKeyValues;
+
     /** Indicates this bucket needs to be processed (at least one window and operator are dirty) */
     private boolean isDirty;
     /** This rowset will store row keys where the timestamp is not null (will mirror the SSA contents) */
@@ -65,8 +68,9 @@ class UpdateByBucketHelper extends IntrusiveDoublyLinkedNode.Impl<UpdateByBucket
      * @param resultSources the result sources
      * @param timestampColumnName the timestamp column used for time-based operations
      * @param control the control object.
+     * @param failureNotifier a consumer to notify of any failures
+     * @param bucketKeyValues the key values for this bucket (empty for zero-key)
      */
-
     protected UpdateByBucketHelper(
             @NotNull final String description,
             @NotNull final QueryTable source,
@@ -74,13 +78,15 @@ protected UpdateByBucketHelper(
             @NotNull final Map<String, ? extends ColumnSource<?>> resultSources,
             @Nullable final String timestampColumnName,
             @NotNull final UpdateByControl control,
-            @NotNull final BiConsumer<Throwable, TableListener.Entry> failureNotifier) {
+            @NotNull final BiConsumer<Throwable, TableListener.Entry> failureNotifier,
+            @NotNull final Object[] bucketKeyValues) {
         this.description = description;
         this.source = source;
         // some columns will have multiple inputs, such as time-based and Weighted computations
         this.windows = windows;
         this.control = control;
         this.failureNotifier = failureNotifier;
+        this.bucketKeyValues = bucketKeyValues;
 
         result = new QueryTable(source.getRowSet(), resultSources);
 
@@ -331,7 +337,8 @@ public void prepareForUpdate(final TableUpdate upstream, final boolean initialSt
                     timestampValidRowSet,
                     timestampsModified,
                     control.chunkCapacityOrDefault(),
-                    initialStep);
+                    initialStep,
+                    bucketKeyValues);
 
             // compute the affected/influenced operators and rowsets within this window
             windows[winIdx].computeAffectedRowsAndOperators(windowContexts[winIdx], upstream);
diff --git a/engine/table/src/main/java/io/deephaven/engine/table/impl/updateby/UpdateByOperator.java b/engine/table/src/main/java/io/deephaven/engine/table/impl/updateby/UpdateByOperator.java
index b82ef5c83eb..ab36bbb757e 100644
--- a/engine/table/src/main/java/io/deephaven/engine/table/impl/updateby/UpdateByOperator.java
+++ b/engine/table/src/main/java/io/deephaven/engine/table/impl/updateby/UpdateByOperator.java
@@ -130,7 +130,8 @@ public abstract void accumulateRolling(RowSequence inputKeys,
         protected abstract void reset();
     }
 
-    protected UpdateByOperator(@NotNull final MatchPair pair,
+    protected UpdateByOperator(
+            @NotNull final MatchPair pair,
             @NotNull final String[] affectingColumns,
             @Nullable final String timestampColumnName,
             final long reverseWindowScaleUnits,
@@ -158,19 +159,46 @@ protected UpdateByOperator(@NotNull final MatchPair pair,
      */
     public abstract void initializeSources(@NotNull Table source, @Nullable RowRedirection rowRedirection);
 
+    /**
+     * Initialize the bucket context for a cumulative operator and pass in the bucket key values. Most operators will
+     * not need the key values, but those that do can override this method.
+     */
+    public void initializeCumulativeWithKeyValues(
+            @NotNull final Context context,
+            final long firstUnmodifiedKey,
+            final long firstUnmodifiedTimestamp,
+            @NotNull final RowSet bucketRowSet,
+            @NotNull Object[] bucketKeyValues) {
+        initializeCumulative(context, firstUnmodifiedKey, firstUnmodifiedTimestamp, bucketRowSet);
+    }
+
     /**
      * Initialize the bucket context for a cumulative operator
      */
-    public void initializeCumulative(@NotNull final Context context, final long firstUnmodifiedKey,
+    public void initializeCumulative(
+            @NotNull final Context context,
+            final long firstUnmodifiedKey,
             final long firstUnmodifiedTimestamp,
             @NotNull final RowSet bucketRowSet) {
         context.reset();
     }
 
+    /**
+     * Initialize the bucket context for a windowed operator and pass in the bucket key values. Most operators will not
+     * need the key values, but those that do can override this method.
+     */
+    public void initializeRollingWithKeyValues(
+            @NotNull final Context context,
+            @NotNull final RowSet bucketRowSet,
+            @NotNull Object[] bucketKeyValues) {
+        initializeRolling(context, bucketRowSet);
+    }
+
     /**
      * Initialize the bucket context for a windowed operator
      */
-    public void initializeRolling(@NotNull final Context context,
+    public void initializeRolling(
+            @NotNull final Context context,
             @NotNull final RowSet bucketRowSet) {
         context.reset();
     }
diff --git a/engine/table/src/main/java/io/deephaven/engine/table/impl/updateby/UpdateByOperatorFactory.java b/engine/table/src/main/java/io/deephaven/engine/table/impl/updateby/UpdateByOperatorFactory.java
index 6e551476520..671e87bdd01 100644
--- a/engine/table/src/main/java/io/deephaven/engine/table/impl/updateby/UpdateByOperatorFactory.java
+++ b/engine/table/src/main/java/io/deephaven/engine/table/impl/updateby/UpdateByOperatorFactory.java
@@ -4,6 +4,7 @@
 package io.deephaven.engine.table.impl.updateby;
 
 import io.deephaven.api.Pair;
+import io.deephaven.api.Selectable;
 import io.deephaven.api.updateby.ColumnUpdateOperation;
 import io.deephaven.api.updateby.OperationControl;
 import io.deephaven.api.updateby.UpdateByControl;
@@ -14,6 +15,7 @@
 import io.deephaven.engine.table.impl.MatchPair;
 import io.deephaven.engine.table.impl.QueryCompilerRequestProcessor;
 import io.deephaven.engine.table.impl.select.FormulaColumn;
+import io.deephaven.engine.table.impl.select.SelectColumn;
 import io.deephaven.engine.table.impl.updateby.delta.*;
 import io.deephaven.engine.table.impl.updateby.em.*;
 import io.deephaven.engine.table.impl.updateby.emstd.*;
@@ -23,6 +25,7 @@
 import io.deephaven.engine.table.impl.updateby.rollingavg.*;
 import io.deephaven.engine.table.impl.updateby.rollingcount.*;
 import io.deephaven.engine.table.impl.updateby.rollingformula.*;
+import io.deephaven.engine.table.impl.updateby.rollingformulamulticolumn.RollingFormulaMultiColumnOperator;
 import io.deephaven.engine.table.impl.updateby.rollinggroup.RollingGroupOperator;
 import io.deephaven.engine.table.impl.updateby.rollingminmax.*;
 import io.deephaven.engine.table.impl.updateby.rollingproduct.*;
@@ -32,6 +35,8 @@
 import io.deephaven.engine.table.impl.updateby.sum.*;
 import io.deephaven.hash.KeyedObjectHashMap;
 import io.deephaven.hash.KeyedObjectKey;
+import io.deephaven.vector.VectorFactory;
+import org.apache.commons.lang3.ArrayUtils;
 import org.jetbrains.annotations.NotNull;
 
 import java.math.BigDecimal;
@@ -54,6 +59,7 @@ public class UpdateByOperatorFactory {
     private final MatchPair[] groupByColumns;
     @NotNull
     private final UpdateByControl control;
+    private Map<String, ColumnDefinition<?>> vectorColumnDefinitions;
 
     public UpdateByOperatorFactory(
             @NotNull final TableDefinition tableDef,
@@ -539,6 +545,12 @@ public Void visit(@NotNull final RollingFormulaSpec spec) {
             // These operators can re-use formula columns when the types match.
             final Map<Class<?>, FormulaColumn> formulaColumnMap = new HashMap<>();
 
+            // noinspection deprecation
+            if (spec.paramToken().isEmpty()) {
+                ops.add(makeRollingFormulaMultiColumnOperator(tableDef, spec));
+                return null;
+            }
+
             Arrays.stream(pairs)
                     .filter(p -> !isTimeBased || !p.rightColumn().equals(timestampCol))
                     .map(fc -> makeRollingFormulaOperator(fc, tableDef, formulaColumnMap, spec))
@@ -1371,52 +1383,138 @@ private UpdateByOperator makeRollingFormulaOperator(@NotNull final MatchPair pai
             final long prevWindowScaleUnits = rs.revWindowScale().getTimeScaleUnits();
             final long fwdWindowScaleUnits = rs.fwdWindowScale().getTimeScaleUnits();
 
+            final String formula = rs.formula();
+            // noinspection deprecation
+            final String paramToken = rs.paramToken().orElseThrow();
+
             if (csType == boolean.class || csType == Boolean.class) {
                 return new BooleanRollingFormulaOperator(pair, affectingColumns,
                         rs.revWindowScale().timestampCol(),
-                        prevWindowScaleUnits, fwdWindowScaleUnits, rs.formula(), rs.paramToken(),
+                        prevWindowScaleUnits, fwdWindowScaleUnits, formula, paramToken,
                         formulaColumnMap, tableDef, compilationProcessor);
             } else if (csType == byte.class || csType == Byte.class) {
                 return new ByteRollingFormulaOperator(pair, affectingColumns,
                         rs.revWindowScale().timestampCol(),
-                        prevWindowScaleUnits, fwdWindowScaleUnits, rs.formula(), rs.paramToken(),
+                        prevWindowScaleUnits, fwdWindowScaleUnits, formula, paramToken,
                         formulaColumnMap, tableDef, compilationProcessor);
             } else if (csType == char.class || csType == Character.class) {
                 return new CharRollingFormulaOperator(pair, affectingColumns,
                         rs.revWindowScale().timestampCol(),
-                        prevWindowScaleUnits, fwdWindowScaleUnits, rs.formula(), rs.paramToken(),
+                        prevWindowScaleUnits, fwdWindowScaleUnits, formula, paramToken,
                         formulaColumnMap, tableDef, compilationProcessor);
             } else if (csType == short.class || csType == Short.class) {
                 return new ShortRollingFormulaOperator(pair, affectingColumns,
                         rs.revWindowScale().timestampCol(),
-                        prevWindowScaleUnits, fwdWindowScaleUnits, rs.formula(), rs.paramToken(),
+                        prevWindowScaleUnits, fwdWindowScaleUnits, formula, paramToken,
                         formulaColumnMap, tableDef, compilationProcessor);
             } else if (csType == int.class || csType == Integer.class) {
                 return new IntRollingFormulaOperator(pair, affectingColumns,
                         rs.revWindowScale().timestampCol(),
-                        prevWindowScaleUnits, fwdWindowScaleUnits, rs.formula(), rs.paramToken(),
+                        prevWindowScaleUnits, fwdWindowScaleUnits, formula, paramToken,
                         formulaColumnMap, tableDef, compilationProcessor);
             } else if (csType == long.class || csType == Long.class) {
                 return new LongRollingFormulaOperator(pair, affectingColumns,
                         rs.revWindowScale().timestampCol(),
-                        prevWindowScaleUnits, fwdWindowScaleUnits, rs.formula(), rs.paramToken(),
+                        prevWindowScaleUnits, fwdWindowScaleUnits, formula, paramToken,
                         formulaColumnMap, tableDef, compilationProcessor);
             } else if (csType == float.class || csType == Float.class) {
                 return new FloatRollingFormulaOperator(pair, affectingColumns,
                         rs.revWindowScale().timestampCol(),
-                        prevWindowScaleUnits, fwdWindowScaleUnits, rs.formula(), rs.paramToken(),
+                        prevWindowScaleUnits, fwdWindowScaleUnits, formula, paramToken,
                         formulaColumnMap, tableDef, compilationProcessor);
             } else if (csType == double.class || csType == Double.class) {
                 return new DoubleRollingFormulaOperator(pair, affectingColumns,
                         rs.revWindowScale().timestampCol(),
-                        prevWindowScaleUnits, fwdWindowScaleUnits, rs.formula(), rs.paramToken(),
+                        prevWindowScaleUnits, fwdWindowScaleUnits, formula, paramToken,
                         formulaColumnMap, tableDef, compilationProcessor);
             }
             return new ObjectRollingFormulaOperator<>(pair, affectingColumns,
                     rs.revWindowScale().timestampCol(),
-                    prevWindowScaleUnits, fwdWindowScaleUnits, rs.formula(), rs.paramToken(),
+                    prevWindowScaleUnits, fwdWindowScaleUnits, formula, paramToken,
                     formulaColumnMap, tableDef, compilationProcessor);
         }
 
+        private UpdateByOperator makeRollingFormulaMultiColumnOperator(
+                @NotNull final TableDefinition tableDef,
+                @NotNull final RollingFormulaSpec rs) {
+            final long prevWindowScaleUnits = rs.revWindowScale().getTimeScaleUnits();
+            final long fwdWindowScaleUnits = rs.fwdWindowScale().getTimeScaleUnits();
+
+            final Map<String, ColumnDefinition<?>> columnDefinitionMap = tableDef.getColumnNameMap();
+
+            // Create the colum
+            final SelectColumn selectColumn = SelectColumn.of(Selectable.parse(rs.formula()));
+
+            // Get or create a column definition map composed of vectors of the original column types (or scalars when
+            // part of the group_by columns).
+            final Set<String> groupByColumnSet =
+                    Arrays.stream(groupByColumns).map(MatchPair::rightColumn).collect(Collectors.toSet());
+            if (vectorColumnDefinitions == null) {
+                vectorColumnDefinitions = tableDef.getColumnStream().collect(Collectors.toMap(
+                        ColumnDefinition::getName,
+                        (final ColumnDefinition<?> cd) -> groupByColumnSet.contains(cd.getName())
+                                ? cd
+                                : ColumnDefinition.fromGenericType(
+                                        cd.getName(),
+                                        VectorFactory.forElementType(cd.getDataType()).vectorType(),
+                                        cd.getDataType())));
+            }
+
+            // Get the input column names from the formula and provide them to the rolling formula operator
+            final String[] allInputColumns =
+                    selectColumn.initDef(vectorColumnDefinitions, compilationProcessor).toArray(String[]::new);
+            if (!selectColumn.getColumnArrays().isEmpty()) {
+                throw new IllegalArgumentException("RollingFormulaMultiColumnOperator does not support column arrays ("
+                        + selectColumn.getColumnArrays() + ")");
+            }
+            if (selectColumn.hasVirtualRowVariables()) {
+                throw new IllegalArgumentException("RollingFormula does not support virtual row variables");
+            }
+
+            final Map<Boolean, List<String>> partitioned = Arrays.stream(allInputColumns)
+                    .collect(Collectors.partitioningBy(groupByColumnSet::contains));
+            final String[] inputKeyColumns = partitioned.get(true).toArray(String[]::new);
+            final String[] inputNonKeyColumns = partitioned.get(false).toArray(String[]::new);
+
+            final Class<?>[] inputKeyColumnTypes = new Class[inputKeyColumns.length];
+            final Class<?>[] inputKeyComponentTypes = new Class[inputKeyColumns.length];
+            for (int i = 0; i < inputKeyColumns.length; i++) {
+                final ColumnDefinition<?> columnDef = columnDefinitionMap.get(inputKeyColumns[i]);
+                inputKeyColumnTypes[i] = columnDef.getDataType();
+                inputKeyComponentTypes[i] = columnDef.getComponentType();
+            }
+
+            final Class<?>[] inputNonKeyColumnTypes = new Class[inputNonKeyColumns.length];
+            final Class<?>[] inputNonKeyVectorTypes = new Class[inputNonKeyColumns.length];
+            for (int i = 0; i < inputNonKeyColumns.length; i++) {
+                final ColumnDefinition<?> columnDef = columnDefinitionMap.get(inputNonKeyColumns[i]);
+                inputNonKeyColumnTypes[i] = columnDef.getDataType();
+                inputNonKeyVectorTypes[i] = vectorColumnDefinitions.get(inputNonKeyColumns[i]).getDataType();
+            }
+
+            final String[] affectingColumns;
+            if (rs.revWindowScale().timestampCol() == null) {
+                affectingColumns = inputNonKeyColumns;
+            } else {
+                affectingColumns = ArrayUtils.add(inputNonKeyColumns, rs.revWindowScale().timestampCol());
+            }
+
+            // Create a new column pair with the same name for the left and right columns
+            final MatchPair pair = new MatchPair(selectColumn.getName(), selectColumn.getName());
+
+            return new RollingFormulaMultiColumnOperator(
+                    pair,
+                    affectingColumns,
+                    rs.revWindowScale().timestampCol(),
+                    prevWindowScaleUnits,
+                    fwdWindowScaleUnits,
+                    selectColumn,
+                    inputKeyColumns,
+                    inputKeyColumnTypes,
+                    inputKeyComponentTypes,
+                    inputNonKeyColumns,
+                    inputNonKeyColumnTypes,
+                    inputNonKeyVectorTypes);
+        }
     }
 }
diff --git a/engine/table/src/main/java/io/deephaven/engine/table/impl/updateby/UpdateByWindow.java b/engine/table/src/main/java/io/deephaven/engine/table/impl/updateby/UpdateByWindow.java
index 501b37fd67f..5825e6900ca 100644
--- a/engine/table/src/main/java/io/deephaven/engine/table/impl/updateby/UpdateByWindow.java
+++ b/engine/table/src/main/java/io/deephaven/engine/table/impl/updateby/UpdateByWindow.java
@@ -47,7 +47,8 @@ static class UpdateByWindowBucketContext implements SafeCloseable {
         protected final boolean timestampsModified;
         /** Whether this is the creation phase of this window */
         protected final boolean initialStep;
-
+        /** Store the key values for this bucket */
+        protected final Object[] bucketKeyValues;
 
         /** An array of ColumnSources for each underlying operator */
         protected ColumnSource<?>[] inputSources;
@@ -71,12 +72,14 @@ static class UpdateByWindowBucketContext implements SafeCloseable {
                 final TrackingRowSet timestampValidRowSet,
                 final boolean timestampsModified,
                 final int chunkSize,
-                final boolean initialStep) {
+                final boolean initialStep,
+                @NotNull final Object[] bucketKeyValues) {
             this.sourceRowSet = sourceRowSet;
             this.timestampColumnSource = timestampColumnSource;
             this.timestampSsa = timestampSsa;
             this.timestampValidRowSet = timestampValidRowSet;
             this.timestampsModified = timestampsModified;
+            this.bucketKeyValues = bucketKeyValues;
 
             workingChunkSize = chunkSize;
             this.initialStep = initialStep;
@@ -91,13 +94,15 @@ public void close() {
         }
     }
 
-    abstract UpdateByWindowBucketContext makeWindowContext(final TrackingRowSet sourceRowSet,
+    abstract UpdateByWindowBucketContext makeWindowContext(
+            final TrackingRowSet sourceRowSet,
             final ColumnSource<?> timestampColumnSource,
             final LongSegmentedSortedArray timestampSsa,
             final TrackingRowSet timestampValidRowSet,
             final boolean timestampsModified,
             final int chunkSize,
-            final boolean isInitializeStep);
+            final boolean isInitializeStep,
+            final Object[] bucketKeyValues);
 
     UpdateByWindow(final UpdateByOperator[] operators,
             final int[][] operatorInputSourceSlots,
diff --git a/engine/table/src/main/java/io/deephaven/engine/table/impl/updateby/UpdateByWindowCumulative.java b/engine/table/src/main/java/io/deephaven/engine/table/impl/updateby/UpdateByWindowCumulative.java
index fc0dba46273..8702abf2ede 100644
--- a/engine/table/src/main/java/io/deephaven/engine/table/impl/updateby/UpdateByWindowCumulative.java
+++ b/engine/table/src/main/java/io/deephaven/engine/table/impl/updateby/UpdateByWindowCumulative.java
@@ -55,9 +55,17 @@ UpdateByWindowBucketContext makeWindowContext(final TrackingRowSet sourceRowSet,
             final TrackingRowSet timestampValidRowSet,
             final boolean timestampsModified,
             final int chunkSize,
-            final boolean isInitializeStep) {
-        return new UpdateByWindowBucketContext(sourceRowSet, timestampColumnSource, timestampSsa, timestampValidRowSet,
-                timestampsModified, chunkSize, isInitializeStep);
+            final boolean isInitializeStep,
+            final Object[] bucketKeyValues) {
+        return new UpdateByWindowBucketContext(
+                sourceRowSet,
+                timestampColumnSource,
+                timestampSsa,
+                timestampValidRowSet,
+                timestampsModified,
+                chunkSize,
+                isInitializeStep,
+                bucketKeyValues);
     }
 
     @Override
@@ -192,7 +200,8 @@ void processWindowBucketOperatorSet(final UpdateByWindowBucketContext context,
                     continue;
                 }
                 UpdateByOperator cumOp = operators[opIdx];
-                cumOp.initializeCumulative(winOpContexts[ii], rowKey, timestamp, context.sourceRowSet);
+                cumOp.initializeCumulativeWithKeyValues(winOpContexts[ii], rowKey, timestamp, context.sourceRowSet,
+                        context.bucketKeyValues);
             }
 
             while (affectedIt.hasMore()) {
diff --git a/engine/table/src/main/java/io/deephaven/engine/table/impl/updateby/UpdateByWindowRollingBase.java b/engine/table/src/main/java/io/deephaven/engine/table/impl/updateby/UpdateByWindowRollingBase.java
index e35973bc1a0..37ccac96fbe 100644
--- a/engine/table/src/main/java/io/deephaven/engine/table/impl/updateby/UpdateByWindowRollingBase.java
+++ b/engine/table/src/main/java/io/deephaven/engine/table/impl/updateby/UpdateByWindowRollingBase.java
@@ -41,14 +41,16 @@ static class UpdateByWindowRollingBucketContext extends UpdateByWindowBucketCont
                 final TrackingRowSet timestampValidRowSet,
                 final boolean timestampsModified,
                 final int chunkSize,
-                final boolean initialStep) {
+                final boolean initialStep,
+                final Object[] bucketKeyValues) {
             super(sourceRowSet,
                     timestampColumnSource,
                     timestampSsa,
                     timestampValidRowSet,
                     timestampsModified,
                     chunkSize,
-                    initialStep);
+                    initialStep,
+                    bucketKeyValues);
         }
 
         @Override
@@ -60,7 +62,7 @@ public void close() {
     }
 
     UpdateByWindowRollingBase(@NotNull final UpdateByOperator[] operators,
-            @NotNull final int[][] operatorSourceSlots,
+            final int[][] operatorSourceSlots,
             final long prevUnits,
             final long fwdUnits,
             @Nullable final String timestampColumnName) {
@@ -152,7 +154,7 @@ void processWindowBucketOperatorSet(final UpdateByWindowBucketContext context,
                     continue;
                 }
                 UpdateByOperator rollingOp = operators[opIdx];
-                rollingOp.initializeRolling(winOpContexts[ii], bucketRowSet);
+                rollingOp.initializeRollingWithKeyValues(winOpContexts[ii], bucketRowSet, context.bucketKeyValues);
             }
 
             int affectedChunkOffset = 0;
diff --git a/engine/table/src/main/java/io/deephaven/engine/table/impl/updateby/UpdateByWindowRollingTicks.java b/engine/table/src/main/java/io/deephaven/engine/table/impl/updateby/UpdateByWindowRollingTicks.java
index 53db9547e5c..417a95bec4f 100644
--- a/engine/table/src/main/java/io/deephaven/engine/table/impl/updateby/UpdateByWindowRollingTicks.java
+++ b/engine/table/src/main/java/io/deephaven/engine/table/impl/updateby/UpdateByWindowRollingTicks.java
@@ -30,9 +30,12 @@ static class UpdateByWindowTicksBucketContext extends UpdateByWindowRollingBucke
         private RowSet affectedRowPositions;
         private RowSet influencerPositions;
 
-        UpdateByWindowTicksBucketContext(final TrackingRowSet sourceRowSet,
-                final int chunkSize, final boolean initialStep) {
-            super(sourceRowSet, null, null, null, false, chunkSize, initialStep);
+        UpdateByWindowTicksBucketContext(
+                final TrackingRowSet sourceRowSet,
+                final int chunkSize,
+                final boolean initialStep,
+                final Object[] bucketKeyValues) {
+            super(sourceRowSet, null, null, null, false, chunkSize, initialStep, bucketKeyValues);
         }
 
         @Override
@@ -77,14 +80,16 @@ void finalizeWindowBucket(UpdateByWindowBucketContext context) {
     }
 
     @Override
-    UpdateByWindowBucketContext makeWindowContext(final TrackingRowSet sourceRowSet,
+    UpdateByWindowBucketContext makeWindowContext(
+            final TrackingRowSet sourceRowSet,
             final ColumnSource<?> timestampColumnSource,
             final LongSegmentedSortedArray timestampSsa,
             final TrackingRowSet timestampValidRowSet,
             final boolean timestampsModified,
             final int chunkSize,
-            final boolean isInitializeStep) {
-        return new UpdateByWindowTicksBucketContext(sourceRowSet, chunkSize, isInitializeStep);
+            final boolean isInitializeStep,
+            final Object[] bucketKeyValues) {
+        return new UpdateByWindowTicksBucketContext(sourceRowSet, chunkSize, isInitializeStep, bucketKeyValues);
     }
 
     private static WritableRowSet computeAffectedRowsTicks(final RowSet sourceSet, final RowSet invertedSubSet,
diff --git a/engine/table/src/main/java/io/deephaven/engine/table/impl/updateby/UpdateByWindowRollingTime.java b/engine/table/src/main/java/io/deephaven/engine/table/impl/updateby/UpdateByWindowRollingTime.java
index ee42b5007b3..d5f7d74f58c 100644
--- a/engine/table/src/main/java/io/deephaven/engine/table/impl/updateby/UpdateByWindowRollingTime.java
+++ b/engine/table/src/main/java/io/deephaven/engine/table/impl/updateby/UpdateByWindowRollingTime.java
@@ -39,9 +39,10 @@ public UpdateByWindowTimeBucketContext(final TrackingRowSet sourceRowSet,
                 final TrackingRowSet timestampValidRowSet,
                 final boolean timestampsModified,
                 final int chunkSize,
-                final boolean initialStep) {
+                final boolean initialStep,
+                final Object[] bucketKeyValues) {
             super(sourceRowSet, timestampColumnSource, timestampSsa, timestampValidRowSet, timestampsModified,
-                    chunkSize, initialStep);
+                    chunkSize, initialStep, bucketKeyValues);
         }
     }
 
@@ -72,9 +73,10 @@ public UpdateByWindowBucketContext makeWindowContext(final TrackingRowSet source
             final TrackingRowSet timestampValidRowSet,
             final boolean timestampsModified,
             final int chunkSize,
-            final boolean isInitializeStep) {
+            final boolean isInitializeStep,
+            final Object[] bucketKeyValues) {
         return new UpdateByWindowTimeBucketContext(sourceRowSet, timestampColumnSource, timestampSsa,
-                timestampValidRowSet, timestampsModified, chunkSize, isInitializeStep);
+                timestampValidRowSet, timestampsModified, chunkSize, isInitializeStep, bucketKeyValues);
     }
 
     /**
diff --git a/engine/table/src/main/java/io/deephaven/engine/table/impl/updateby/ZeroKeyUpdateByManager.java b/engine/table/src/main/java/io/deephaven/engine/table/impl/updateby/ZeroKeyUpdateByManager.java
index 98f43be8cf7..fd5c70a8d91 100644
--- a/engine/table/src/main/java/io/deephaven/engine/table/impl/updateby/ZeroKeyUpdateByManager.java
+++ b/engine/table/src/main/java/io/deephaven/engine/table/impl/updateby/ZeroKeyUpdateByManager.java
@@ -3,7 +3,6 @@
 //
 package io.deephaven.engine.table.impl.updateby;
 
-import io.deephaven.UncheckedDeephavenException;
 import io.deephaven.api.updateby.UpdateByControl;
 import io.deephaven.engine.exceptions.CancellationException;
 import io.deephaven.engine.exceptions.TableInitializationException;
@@ -14,6 +13,7 @@
 import io.deephaven.engine.table.impl.QueryTable;
 import io.deephaven.engine.table.impl.TableUpdateImpl;
 import io.deephaven.engine.table.impl.util.RowRedirection;
+import io.deephaven.util.type.ArrayTypeUtils;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
@@ -70,7 +70,8 @@ public class ZeroKeyUpdateByManager extends UpdateBy {
 
             // create an updateby bucket instance directly from the source table
             zeroKeyUpdateBy = new UpdateByBucketHelper(bucketDescription, source, windows, resultSources,
-                    timestampColumnName, control, (oe, se) -> deliverUpdateError(oe, se, true));
+                    timestampColumnName, control, (oe, se) -> deliverUpdateError(oe, se, true),
+                    ArrayTypeUtils.EMPTY_OBJECT_ARRAY);
             buckets.offer(zeroKeyUpdateBy);
 
             // make the source->result transformer
@@ -88,7 +89,7 @@ public class ZeroKeyUpdateByManager extends UpdateBy {
             zeroKeyUpdateBy = new UpdateByBucketHelper(bucketDescription, source, windows, resultSources,
                     timestampColumnName, control, (oe, se) -> {
                         throw new IllegalStateException("Update failure from static zero key updateBy");
-                    });
+                    }, ArrayTypeUtils.EMPTY_OBJECT_ARRAY);
             result = zeroKeyUpdateBy.result;
             buckets.offer(zeroKeyUpdateBy);
             sourceListener = null;
diff --git a/engine/table/src/main/java/io/deephaven/engine/table/impl/updateby/hashing/UpdateByStateManagerTypedBase.java b/engine/table/src/main/java/io/deephaven/engine/table/impl/updateby/hashing/UpdateByStateManagerTypedBase.java
index 70fbe817e08..5c98267d707 100644
--- a/engine/table/src/main/java/io/deephaven/engine/table/impl/updateby/hashing/UpdateByStateManagerTypedBase.java
+++ b/engine/table/src/main/java/io/deephaven/engine/table/impl/updateby/hashing/UpdateByStateManagerTypedBase.java
@@ -181,7 +181,26 @@ public SafeCloseable makeUpdateByProbeContext(ColumnSource<?>[] buildSources, lo
         return new ProbeContext(buildSources, (int) Math.min(maxSize, CHUNK_SIZE));
     }
 
-    protected void newAlternate() {
+    /**
+     * After creating the new alternate key states, advise the derived classes, so they can cast them to the typed
+     * versions of the column source and adjust the derived class pointers.
+     */
+    protected abstract void adviseNewAlternate();
+
+    private void setupNewAlternate(int oldTableSize) {
+        Assert.eqZero(rehashPointer, "rehashPointer");
+
+        for (int ii = 0; ii < mainKeySources.length; ++ii) {
+            alternateKeySources[ii] = mainKeySources[ii];
+            mainKeySources[ii] = InMemoryColumnSource.getImmutableMemoryColumnSource(tableSize,
+                    alternateKeySources[ii].getType(), alternateKeySources[ii].getComponentType());
+            mainKeySources[ii].ensureCapacity(tableSize);
+        }
+        alternateTableSize = oldTableSize;
+        if (numEntries > 0) {
+            rehashPointer = alternateTableSize;
+        }
+
         alternateStateSource = stateSource;
         stateSource = new ImmutableIntArraySource();
         stateSource.ensureCapacity(tableSize);
@@ -316,20 +335,9 @@ public boolean doRehash(boolean fullRehash, MutableInt rehashCredits, int nextCh
             return false;
         }
 
-        Assert.eqZero(rehashPointer, "rehashPointer");
-
-        for (int ii = 0; ii < mainKeySources.length; ++ii) {
-            alternateKeySources[ii] = mainKeySources[ii];
-            mainKeySources[ii] = InMemoryColumnSource.getImmutableMemoryColumnSource(tableSize,
-                    alternateKeySources[ii].getType(), alternateKeySources[ii].getComponentType());
-            mainKeySources[ii].ensureCapacity(tableSize);
-        }
-        alternateTableSize = oldTableSize;
-        if (numEntries > 0) {
-            rehashPointer = alternateTableSize;
-        }
 
-        newAlternate();
+        setupNewAlternate(oldTableSize);
+        adviseNewAlternate();
 
         return true;
     }
diff --git a/engine/table/src/main/java/io/deephaven/engine/table/impl/updateby/hashing/typed/open/gen/UpdateByHasherByte.java b/engine/table/src/main/java/io/deephaven/engine/table/impl/updateby/hashing/typed/open/gen/UpdateByHasherByte.java
index 2f475810d85..58d8cd22cd9 100644
--- a/engine/table/src/main/java/io/deephaven/engine/table/impl/updateby/hashing/typed/open/gen/UpdateByHasherByte.java
+++ b/engine/table/src/main/java/io/deephaven/engine/table/impl/updateby/hashing/typed/open/gen/UpdateByHasherByte.java
@@ -59,12 +59,12 @@ protected void buildHashTable(RowSequence rowSequence, Chunk[] sourceKeyChunks,
             int tableLocation = firstTableLocation;
             MAIN_SEARCH: while (true) {
                 int rowState = stateSource.getUnsafe(tableLocation);
-                if (rowState == EMPTY_RIGHT_VALUE) {
+                if (isStateEmpty(rowState)) {
                     final int firstAlternateTableLocation = hashToTableLocationAlternate(hash);
                     int alternateTableLocation = firstAlternateTableLocation;
                     while (alternateTableLocation < rehashPointer) {
                         rowState = alternateStateSource.getUnsafe(alternateTableLocation);
-                        if (rowState == EMPTY_RIGHT_VALUE) {
+                        if (isStateEmpty(rowState)) {
                             break;
                         } else if (eq(alternateKeySource0.getUnsafe(alternateTableLocation), k0)) {
                             // map the existing bucket to this chunk position;
@@ -107,7 +107,7 @@ protected void probeHashTable(RowSequence rowSequence, Chunk[] sourceKeyChunks,
             boolean found = false;
             int tableLocation = firstTableLocation;
             int rowState;
-            while ((rowState = stateSource.getUnsafe(tableLocation)) != EMPTY_RIGHT_VALUE) {
+            while (!isStateEmpty(rowState = stateSource.getUnsafe(tableLocation))) {
                 if (eq(mainKeySource0.getUnsafe(tableLocation), k0)) {
                     // map the existing bucket to this chunk position;
                     outputPositions.set(chunkPosition, rowState);
@@ -122,7 +122,7 @@ protected void probeHashTable(RowSequence rowSequence, Chunk[] sourceKeyChunks,
                 boolean alternateFound = false;
                 if (firstAlternateTableLocation < rehashPointer) {
                     int alternateTableLocation = firstAlternateTableLocation;
-                    while ((rowState = alternateStateSource.getUnsafe(alternateTableLocation)) != EMPTY_RIGHT_VALUE) {
+                    while (!isStateEmpty(rowState = alternateStateSource.getUnsafe(alternateTableLocation))) {
                         if (eq(alternateKeySource0.getUnsafe(alternateTableLocation), k0)) {
                             // map the existing bucket (from alternate) to this chunk position;
                             outputPositions.set(chunkPosition, rowState);
@@ -146,16 +146,20 @@ private static int hash(byte k0) {
         return hash;
     }
 
+    private static boolean isStateEmpty(int state) {
+        return state == EMPTY_RIGHT_VALUE;
+    }
+
     private boolean migrateOneLocation(int locationToMigrate,
             WritableIntChunk<RowKeys> outputPositions) {
         final int currentStateValue = alternateStateSource.getUnsafe(locationToMigrate);
-        if (currentStateValue == EMPTY_RIGHT_VALUE) {
+        if (isStateEmpty(currentStateValue)) {
             return false;
         }
         final byte k0 = alternateKeySource0.getUnsafe(locationToMigrate);
         final int hash = hash(k0);
         int destinationTableLocation = hashToTableLocation(hash);
-        while (stateSource.getUnsafe(destinationTableLocation) != EMPTY_RIGHT_VALUE) {
+        while (!isStateEmpty(stateSource.getUnsafe(destinationTableLocation))) {
             destinationTableLocation = nextTableLocation(destinationTableLocation);
         }
         mainKeySource0.set(destinationTableLocation, k0);
@@ -177,8 +181,7 @@ protected int rehashInternalPartial(int entriesToRehash,
     }
 
     @Override
-    protected void newAlternate() {
-        super.newAlternate();
+    protected void adviseNewAlternate() {
         this.mainKeySource0 = (ImmutableByteArraySource)super.mainKeySources[0];
         this.alternateKeySource0 = (ImmutableByteArraySource)super.alternateKeySources[0];
     }
@@ -192,7 +195,7 @@ protected void clearAlternate() {
     @Override
     protected void migrateFront(WritableIntChunk<RowKeys> outputPositions) {
         int location = 0;
-        while (migrateOneLocation(location++, outputPositions));
+        while (migrateOneLocation(location++, outputPositions) && location < alternateTableSize);
     }
 
     @Override
@@ -206,7 +209,7 @@ protected void rehashInternalFull(final int oldSize) {
         stateSource.setArray(destState);
         for (int sourceBucket = 0; sourceBucket < oldSize; ++sourceBucket) {
             final int currentStateValue = originalStateArray[sourceBucket];
-            if (currentStateValue == EMPTY_RIGHT_VALUE) {
+            if (isStateEmpty(currentStateValue)) {
                 continue;
             }
             final byte k0 = originalKeyArray0[sourceBucket];
@@ -214,7 +217,7 @@ protected void rehashInternalFull(final int oldSize) {
             final int firstDestinationTableLocation = hashToTableLocation(hash);
             int destinationTableLocation = firstDestinationTableLocation;
             while (true) {
-                if (destState[destinationTableLocation] == EMPTY_RIGHT_VALUE) {
+                if (isStateEmpty(destState[destinationTableLocation])) {
                     destKeyArray0[destinationTableLocation] = k0;
                     destState[destinationTableLocation] = originalStateArray[sourceBucket];
                     break;
diff --git a/engine/table/src/main/java/io/deephaven/engine/table/impl/updateby/hashing/typed/open/gen/UpdateByHasherByteByte.java b/engine/table/src/main/java/io/deephaven/engine/table/impl/updateby/hashing/typed/open/gen/UpdateByHasherByteByte.java
index f9e3830e3ed..6db0bc99dad 100644
--- a/engine/table/src/main/java/io/deephaven/engine/table/impl/updateby/hashing/typed/open/gen/UpdateByHasherByteByte.java
+++ b/engine/table/src/main/java/io/deephaven/engine/table/impl/updateby/hashing/typed/open/gen/UpdateByHasherByteByte.java
@@ -67,12 +67,12 @@ protected void buildHashTable(RowSequence rowSequence, Chunk[] sourceKeyChunks,
             int tableLocation = firstTableLocation;
             MAIN_SEARCH: while (true) {
                 int rowState = stateSource.getUnsafe(tableLocation);
-                if (rowState == EMPTY_RIGHT_VALUE) {
+                if (isStateEmpty(rowState)) {
                     final int firstAlternateTableLocation = hashToTableLocationAlternate(hash);
                     int alternateTableLocation = firstAlternateTableLocation;
                     while (alternateTableLocation < rehashPointer) {
                         rowState = alternateStateSource.getUnsafe(alternateTableLocation);
-                        if (rowState == EMPTY_RIGHT_VALUE) {
+                        if (isStateEmpty(rowState)) {
                             break;
                         } else if (eq(alternateKeySource0.getUnsafe(alternateTableLocation), k0) && eq(alternateKeySource1.getUnsafe(alternateTableLocation), k1)) {
                             // map the existing bucket to this chunk position;
@@ -118,7 +118,7 @@ protected void probeHashTable(RowSequence rowSequence, Chunk[] sourceKeyChunks,
             boolean found = false;
             int tableLocation = firstTableLocation;
             int rowState;
-            while ((rowState = stateSource.getUnsafe(tableLocation)) != EMPTY_RIGHT_VALUE) {
+            while (!isStateEmpty(rowState = stateSource.getUnsafe(tableLocation))) {
                 if (eq(mainKeySource0.getUnsafe(tableLocation), k0) && eq(mainKeySource1.getUnsafe(tableLocation), k1)) {
                     // map the existing bucket to this chunk position;
                     outputPositions.set(chunkPosition, rowState);
@@ -133,7 +133,7 @@ protected void probeHashTable(RowSequence rowSequence, Chunk[] sourceKeyChunks,
                 boolean alternateFound = false;
                 if (firstAlternateTableLocation < rehashPointer) {
                     int alternateTableLocation = firstAlternateTableLocation;
-                    while ((rowState = alternateStateSource.getUnsafe(alternateTableLocation)) != EMPTY_RIGHT_VALUE) {
+                    while (!isStateEmpty(rowState = alternateStateSource.getUnsafe(alternateTableLocation))) {
                         if (eq(alternateKeySource0.getUnsafe(alternateTableLocation), k0) && eq(alternateKeySource1.getUnsafe(alternateTableLocation), k1)) {
                             // map the existing bucket (from alternate) to this chunk position;
                             outputPositions.set(chunkPosition, rowState);
@@ -158,17 +158,21 @@ private static int hash(byte k0, byte k1) {
         return hash;
     }
 
+    private static boolean isStateEmpty(int state) {
+        return state == EMPTY_RIGHT_VALUE;
+    }
+
     private boolean migrateOneLocation(int locationToMigrate,
             WritableIntChunk<RowKeys> outputPositions) {
         final int currentStateValue = alternateStateSource.getUnsafe(locationToMigrate);
-        if (currentStateValue == EMPTY_RIGHT_VALUE) {
+        if (isStateEmpty(currentStateValue)) {
             return false;
         }
         final byte k0 = alternateKeySource0.getUnsafe(locationToMigrate);
         final byte k1 = alternateKeySource1.getUnsafe(locationToMigrate);
         final int hash = hash(k0, k1);
         int destinationTableLocation = hashToTableLocation(hash);
-        while (stateSource.getUnsafe(destinationTableLocation) != EMPTY_RIGHT_VALUE) {
+        while (!isStateEmpty(stateSource.getUnsafe(destinationTableLocation))) {
             destinationTableLocation = nextTableLocation(destinationTableLocation);
         }
         mainKeySource0.set(destinationTableLocation, k0);
@@ -191,8 +195,7 @@ protected int rehashInternalPartial(int entriesToRehash,
     }
 
     @Override
-    protected void newAlternate() {
-        super.newAlternate();
+    protected void adviseNewAlternate() {
         this.mainKeySource0 = (ImmutableByteArraySource)super.mainKeySources[0];
         this.alternateKeySource0 = (ImmutableByteArraySource)super.alternateKeySources[0];
         this.mainKeySource1 = (ImmutableByteArraySource)super.mainKeySources[1];
@@ -209,7 +212,7 @@ protected void clearAlternate() {
     @Override
     protected void migrateFront(WritableIntChunk<RowKeys> outputPositions) {
         int location = 0;
-        while (migrateOneLocation(location++, outputPositions));
+        while (migrateOneLocation(location++, outputPositions) && location < alternateTableSize);
     }
 
     @Override
@@ -226,7 +229,7 @@ protected void rehashInternalFull(final int oldSize) {
         stateSource.setArray(destState);
         for (int sourceBucket = 0; sourceBucket < oldSize; ++sourceBucket) {
             final int currentStateValue = originalStateArray[sourceBucket];
-            if (currentStateValue == EMPTY_RIGHT_VALUE) {
+            if (isStateEmpty(currentStateValue)) {
                 continue;
             }
             final byte k0 = originalKeyArray0[sourceBucket];
@@ -235,7 +238,7 @@ protected void rehashInternalFull(final int oldSize) {
             final int firstDestinationTableLocation = hashToTableLocation(hash);
             int destinationTableLocation = firstDestinationTableLocation;
             while (true) {
-                if (destState[destinationTableLocation] == EMPTY_RIGHT_VALUE) {
+                if (isStateEmpty(destState[destinationTableLocation])) {
                     destKeyArray0[destinationTableLocation] = k0;
                     destKeyArray1[destinationTableLocation] = k1;
                     destState[destinationTableLocation] = originalStateArray[sourceBucket];
diff --git a/engine/table/src/main/java/io/deephaven/engine/table/impl/updateby/hashing/typed/open/gen/UpdateByHasherByteChar.java b/engine/table/src/main/java/io/deephaven/engine/table/impl/updateby/hashing/typed/open/gen/UpdateByHasherByteChar.java
index 1b27ef0a229..b0260a93a36 100644
--- a/engine/table/src/main/java/io/deephaven/engine/table/impl/updateby/hashing/typed/open/gen/UpdateByHasherByteChar.java
+++ b/engine/table/src/main/java/io/deephaven/engine/table/impl/updateby/hashing/typed/open/gen/UpdateByHasherByteChar.java
@@ -71,12 +71,12 @@ protected void buildHashTable(RowSequence rowSequence, Chunk[] sourceKeyChunks,
             int tableLocation = firstTableLocation;
             MAIN_SEARCH: while (true) {
                 int rowState = stateSource.getUnsafe(tableLocation);
-                if (rowState == EMPTY_RIGHT_VALUE) {
+                if (isStateEmpty(rowState)) {
                     final int firstAlternateTableLocation = hashToTableLocationAlternate(hash);
                     int alternateTableLocation = firstAlternateTableLocation;
                     while (alternateTableLocation < rehashPointer) {
                         rowState = alternateStateSource.getUnsafe(alternateTableLocation);
-                        if (rowState == EMPTY_RIGHT_VALUE) {
+                        if (isStateEmpty(rowState)) {
                             break;
                         } else if (eq(alternateKeySource0.getUnsafe(alternateTableLocation), k0) && eq(alternateKeySource1.getUnsafe(alternateTableLocation), k1)) {
                             // map the existing bucket to this chunk position;
@@ -122,7 +122,7 @@ protected void probeHashTable(RowSequence rowSequence, Chunk[] sourceKeyChunks,
             boolean found = false;
             int tableLocation = firstTableLocation;
             int rowState;
-            while ((rowState = stateSource.getUnsafe(tableLocation)) != EMPTY_RIGHT_VALUE) {
+            while (!isStateEmpty(rowState = stateSource.getUnsafe(tableLocation))) {
                 if (eq(mainKeySource0.getUnsafe(tableLocation), k0) && eq(mainKeySource1.getUnsafe(tableLocation), k1)) {
                     // map the existing bucket to this chunk position;
                     outputPositions.set(chunkPosition, rowState);
@@ -137,7 +137,7 @@ protected void probeHashTable(RowSequence rowSequence, Chunk[] sourceKeyChunks,
                 boolean alternateFound = false;
                 if (firstAlternateTableLocation < rehashPointer) {
                     int alternateTableLocation = firstAlternateTableLocation;
-                    while ((rowState = alternateStateSource.getUnsafe(alternateTableLocation)) != EMPTY_RIGHT_VALUE) {
+                    while (!isStateEmpty(rowState = alternateStateSource.getUnsafe(alternateTableLocation))) {
                         if (eq(alternateKeySource0.getUnsafe(alternateTableLocation), k0) && eq(alternateKeySource1.getUnsafe(alternateTableLocation), k1)) {
                             // map the existing bucket (from alternate) to this chunk position;
                             outputPositions.set(chunkPosition, rowState);
@@ -162,17 +162,21 @@ private static int hash(byte k0, char k1) {
         return hash;
     }
 
+    private static boolean isStateEmpty(int state) {
+        return state == EMPTY_RIGHT_VALUE;
+    }
+
     private boolean migrateOneLocation(int locationToMigrate,
             WritableIntChunk<RowKeys> outputPositions) {
         final int currentStateValue = alternateStateSource.getUnsafe(locationToMigrate);
-        if (currentStateValue == EMPTY_RIGHT_VALUE) {
+        if (isStateEmpty(currentStateValue)) {
             return false;
         }
         final byte k0 = alternateKeySource0.getUnsafe(locationToMigrate);
         final char k1 = alternateKeySource1.getUnsafe(locationToMigrate);
         final int hash = hash(k0, k1);
         int destinationTableLocation = hashToTableLocation(hash);
-        while (stateSource.getUnsafe(destinationTableLocation) != EMPTY_RIGHT_VALUE) {
+        while (!isStateEmpty(stateSource.getUnsafe(destinationTableLocation))) {
             destinationTableLocation = nextTableLocation(destinationTableLocation);
         }
         mainKeySource0.set(destinationTableLocation, k0);
@@ -195,8 +199,7 @@ protected int rehashInternalPartial(int entriesToRehash,
     }
 
     @Override
-    protected void newAlternate() {
-        super.newAlternate();
+    protected void adviseNewAlternate() {
         this.mainKeySource0 = (ImmutableByteArraySource)super.mainKeySources[0];
         this.alternateKeySource0 = (ImmutableByteArraySource)super.alternateKeySources[0];
         this.mainKeySource1 = (ImmutableCharArraySource)super.mainKeySources[1];
@@ -213,7 +216,7 @@ protected void clearAlternate() {
     @Override
     protected void migrateFront(WritableIntChunk<RowKeys> outputPositions) {
         int location = 0;
-        while (migrateOneLocation(location++, outputPositions));
+        while (migrateOneLocation(location++, outputPositions) && location < alternateTableSize);
     }
 
     @Override
@@ -230,7 +233,7 @@ protected void rehashInternalFull(final int oldSize) {
         stateSource.setArray(destState);
         for (int sourceBucket = 0; sourceBucket < oldSize; ++sourceBucket) {
             final int currentStateValue = originalStateArray[sourceBucket];
-            if (currentStateValue == EMPTY_RIGHT_VALUE) {
+            if (isStateEmpty(currentStateValue)) {
                 continue;
             }
             final byte k0 = originalKeyArray0[sourceBucket];
@@ -239,7 +242,7 @@ protected void rehashInternalFull(final int oldSize) {
             final int firstDestinationTableLocation = hashToTableLocation(hash);
             int destinationTableLocation = firstDestinationTableLocation;
             while (true) {
-                if (destState[destinationTableLocation] == EMPTY_RIGHT_VALUE) {
+                if (isStateEmpty(destState[destinationTableLocation])) {
                     destKeyArray0[destinationTableLocation] = k0;
                     destKeyArray1[destinationTableLocation] = k1;
                     destState[destinationTableLocation] = originalStateArray[sourceBucket];
diff --git a/engine/table/src/main/java/io/deephaven/engine/table/impl/updateby/hashing/typed/open/gen/UpdateByHasherByteDouble.java b/engine/table/src/main/java/io/deephaven/engine/table/impl/updateby/hashing/typed/open/gen/UpdateByHasherByteDouble.java
index 2998243d6a9..294df18d15b 100644
--- a/engine/table/src/main/java/io/deephaven/engine/table/impl/updateby/hashing/typed/open/gen/UpdateByHasherByteDouble.java
+++ b/engine/table/src/main/java/io/deephaven/engine/table/impl/updateby/hashing/typed/open/gen/UpdateByHasherByteDouble.java
@@ -71,12 +71,12 @@ protected void buildHashTable(RowSequence rowSequence, Chunk[] sourceKeyChunks,
             int tableLocation = firstTableLocation;
             MAIN_SEARCH: while (true) {
                 int rowState = stateSource.getUnsafe(tableLocation);
-                if (rowState == EMPTY_RIGHT_VALUE) {
+                if (isStateEmpty(rowState)) {
                     final int firstAlternateTableLocation = hashToTableLocationAlternate(hash);
                     int alternateTableLocation = firstAlternateTableLocation;
                     while (alternateTableLocation < rehashPointer) {
                         rowState = alternateStateSource.getUnsafe(alternateTableLocation);
-                        if (rowState == EMPTY_RIGHT_VALUE) {
+                        if (isStateEmpty(rowState)) {
                             break;
                         } else if (eq(alternateKeySource0.getUnsafe(alternateTableLocation), k0) && eq(alternateKeySource1.getUnsafe(alternateTableLocation), k1)) {
                             // map the existing bucket to this chunk position;
@@ -122,7 +122,7 @@ protected void probeHashTable(RowSequence rowSequence, Chunk[] sourceKeyChunks,
             boolean found = false;
             int tableLocation = firstTableLocation;
             int rowState;
-            while ((rowState = stateSource.getUnsafe(tableLocation)) != EMPTY_RIGHT_VALUE) {
+            while (!isStateEmpty(rowState = stateSource.getUnsafe(tableLocation))) {
                 if (eq(mainKeySource0.getUnsafe(tableLocation), k0) && eq(mainKeySource1.getUnsafe(tableLocation), k1)) {
                     // map the existing bucket to this chunk position;
                     outputPositions.set(chunkPosition, rowState);
@@ -137,7 +137,7 @@ protected void probeHashTable(RowSequence rowSequence, Chunk[] sourceKeyChunks,
                 boolean alternateFound = false;
                 if (firstAlternateTableLocation < rehashPointer) {
                     int alternateTableLocation = firstAlternateTableLocation;
-                    while ((rowState = alternateStateSource.getUnsafe(alternateTableLocation)) != EMPTY_RIGHT_VALUE) {
+                    while (!isStateEmpty(rowState = alternateStateSource.getUnsafe(alternateTableLocation))) {
                         if (eq(alternateKeySource0.getUnsafe(alternateTableLocation), k0) && eq(alternateKeySource1.getUnsafe(alternateTableLocation), k1)) {
                             // map the existing bucket (from alternate) to this chunk position;
                             outputPositions.set(chunkPosition, rowState);
@@ -162,17 +162,21 @@ private static int hash(byte k0, double k1) {
         return hash;
     }
 
+    private static boolean isStateEmpty(int state) {
+        return state == EMPTY_RIGHT_VALUE;
+    }
+
     private boolean migrateOneLocation(int locationToMigrate,
             WritableIntChunk<RowKeys> outputPositions) {
         final int currentStateValue = alternateStateSource.getUnsafe(locationToMigrate);
-        if (currentStateValue == EMPTY_RIGHT_VALUE) {
+        if (isStateEmpty(currentStateValue)) {
             return false;
         }
         final byte k0 = alternateKeySource0.getUnsafe(locationToMigrate);
         final double k1 = alternateKeySource1.getUnsafe(locationToMigrate);
         final int hash = hash(k0, k1);
         int destinationTableLocation = hashToTableLocation(hash);
-        while (stateSource.getUnsafe(destinationTableLocation) != EMPTY_RIGHT_VALUE) {
+        while (!isStateEmpty(stateSource.getUnsafe(destinationTableLocation))) {
             destinationTableLocation = nextTableLocation(destinationTableLocation);
         }
         mainKeySource0.set(destinationTableLocation, k0);
@@ -195,8 +199,7 @@ protected int rehashInternalPartial(int entriesToRehash,
     }
 
     @Override
-    protected void newAlternate() {
-        super.newAlternate();
+    protected void adviseNewAlternate() {
         this.mainKeySource0 = (ImmutableByteArraySource)super.mainKeySources[0];
         this.alternateKeySource0 = (ImmutableByteArraySource)super.alternateKeySources[0];
         this.mainKeySource1 = (ImmutableDoubleArraySource)super.mainKeySources[1];
@@ -213,7 +216,7 @@ protected void clearAlternate() {
     @Override
     protected void migrateFront(WritableIntChunk<RowKeys> outputPositions) {
         int location = 0;
-        while (migrateOneLocation(location++, outputPositions));
+        while (migrateOneLocation(location++, outputPositions) && location < alternateTableSize);
     }
 
     @Override
@@ -230,7 +233,7 @@ protected void rehashInternalFull(final int oldSize) {
         stateSource.setArray(destState);
         for (int sourceBucket = 0; sourceBucket < oldSize; ++sourceBucket) {
             final int currentStateValue = originalStateArray[sourceBucket];
-            if (currentStateValue == EMPTY_RIGHT_VALUE) {
+            if (isStateEmpty(currentStateValue)) {
                 continue;
             }
             final byte k0 = originalKeyArray0[sourceBucket];
@@ -239,7 +242,7 @@ protected void rehashInternalFull(final int oldSize) {
             final int firstDestinationTableLocation = hashToTableLocation(hash);
             int destinationTableLocation = firstDestinationTableLocation;
             while (true) {
-                if (destState[destinationTableLocation] == EMPTY_RIGHT_VALUE) {
+                if (isStateEmpty(destState[destinationTableLocation])) {
                     destKeyArray0[destinationTableLocation] = k0;
                     destKeyArray1[destinationTableLocation] = k1;
                     destState[destinationTableLocation] = originalStateArray[sourceBucket];
diff --git a/engine/table/src/main/java/io/deephaven/engine/table/impl/updateby/hashing/typed/open/gen/UpdateByHasherByteFloat.java b/engine/table/src/main/java/io/deephaven/engine/table/impl/updateby/hashing/typed/open/gen/UpdateByHasherByteFloat.java
index 6e184e43630..a963cb15d8b 100644
--- a/engine/table/src/main/java/io/deephaven/engine/table/impl/updateby/hashing/typed/open/gen/UpdateByHasherByteFloat.java
+++ b/engine/table/src/main/java/io/deephaven/engine/table/impl/updateby/hashing/typed/open/gen/UpdateByHasherByteFloat.java
@@ -71,12 +71,12 @@ protected void buildHashTable(RowSequence rowSequence, Chunk[] sourceKeyChunks,
             int tableLocation = firstTableLocation;
             MAIN_SEARCH: while (true) {
                 int rowState = stateSource.getUnsafe(tableLocation);
-                if (rowState == EMPTY_RIGHT_VALUE) {
+                if (isStateEmpty(rowState)) {
                     final int firstAlternateTableLocation = hashToTableLocationAlternate(hash);
                     int alternateTableLocation = firstAlternateTableLocation;
                     while (alternateTableLocation < rehashPointer) {
                         rowState = alternateStateSource.getUnsafe(alternateTableLocation);
-                        if (rowState == EMPTY_RIGHT_VALUE) {
+                        if (isStateEmpty(rowState)) {
                             break;
                         } else if (eq(alternateKeySource0.getUnsafe(alternateTableLocation), k0) && eq(alternateKeySource1.getUnsafe(alternateTableLocation), k1)) {
                             // map the existing bucket to this chunk position;
@@ -122,7 +122,7 @@ protected void probeHashTable(RowSequence rowSequence, Chunk[] sourceKeyChunks,
             boolean found = false;
             int tableLocation = firstTableLocation;
             int rowState;
-            while ((rowState = stateSource.getUnsafe(tableLocation)) != EMPTY_RIGHT_VALUE) {
+            while (!isStateEmpty(rowState = stateSource.getUnsafe(tableLocation))) {
                 if (eq(mainKeySource0.getUnsafe(tableLocation), k0) && eq(mainKeySource1.getUnsafe(tableLocation), k1)) {
                     // map the existing bucket to this chunk position;
                     outputPositions.set(chunkPosition, rowState);
@@ -137,7 +137,7 @@ protected void probeHashTable(RowSequence rowSequence, Chunk[] sourceKeyChunks,
                 boolean alternateFound = false;
                 if (firstAlternateTableLocation < rehashPointer) {
                     int alternateTableLocation = firstAlternateTableLocation;
-                    while ((rowState = alternateStateSource.getUnsafe(alternateTableLocation)) != EMPTY_RIGHT_VALUE) {
+                    while (!isStateEmpty(rowState = alternateStateSource.getUnsafe(alternateTableLocation))) {
                         if (eq(alternateKeySource0.getUnsafe(alternateTableLocation), k0) && eq(alternateKeySource1.getUnsafe(alternateTableLocation), k1)) {
                             // map the existing bucket (from alternate) to this chunk position;
                             outputPositions.set(chunkPosition, rowState);
@@ -162,17 +162,21 @@ private static int hash(byte k0, float k1) {
         return hash;
     }
 
+    private static boolean isStateEmpty(int state) {
+        return state == EMPTY_RIGHT_VALUE;
+    }
+
     private boolean migrateOneLocation(int locationToMigrate,
             WritableIntChunk<RowKeys> outputPositions) {
         final int currentStateValue = alternateStateSource.getUnsafe(locationToMigrate);
-        if (currentStateValue == EMPTY_RIGHT_VALUE) {
+        if (isStateEmpty(currentStateValue)) {
             return false;
         }
         final byte k0 = alternateKeySource0.getUnsafe(locationToMigrate);
         final float k1 = alternateKeySource1.getUnsafe(locationToMigrate);
         final int hash = hash(k0, k1);
         int destinationTableLocation = hashToTableLocation(hash);
-        while (stateSource.getUnsafe(destinationTableLocation) != EMPTY_RIGHT_VALUE) {
+        while (!isStateEmpty(stateSource.getUnsafe(destinationTableLocation))) {
             destinationTableLocation = nextTableLocation(destinationTableLocation);
         }
         mainKeySource0.set(destinationTableLocation, k0);
@@ -195,8 +199,7 @@ protected int rehashInternalPartial(int entriesToRehash,
     }
 
     @Override
-    protected void newAlternate() {
-        super.newAlternate();
+    protected void adviseNewAlternate() {
         this.mainKeySource0 = (ImmutableByteArraySource)super.mainKeySources[0];
         this.alternateKeySource0 = (ImmutableByteArraySource)super.alternateKeySources[0];
         this.mainKeySource1 = (ImmutableFloatArraySource)super.mainKeySources[1];
@@ -213,7 +216,7 @@ protected void clearAlternate() {
     @Override
     protected void migrateFront(WritableIntChunk<RowKeys> outputPositions) {
         int location = 0;
-        while (migrateOneLocation(location++, outputPositions));
+        while (migrateOneLocation(location++, outputPositions) && location < alternateTableSize);
     }
 
     @Override
@@ -230,7 +233,7 @@ protected void rehashInternalFull(final int oldSize) {
         stateSource.setArray(destState);
         for (int sourceBucket = 0; sourceBucket < oldSize; ++sourceBucket) {
             final int currentStateValue = originalStateArray[sourceBucket];
-            if (currentStateValue == EMPTY_RIGHT_VALUE) {
+            if (isStateEmpty(currentStateValue)) {
                 continue;
             }
             final byte k0 = originalKeyArray0[sourceBucket];
@@ -239,7 +242,7 @@ protected void rehashInternalFull(final int oldSize) {
             final int firstDestinationTableLocation = hashToTableLocation(hash);
             int destinationTableLocation = firstDestinationTableLocation;
             while (true) {
-                if (destState[destinationTableLocation] == EMPTY_RIGHT_VALUE) {
+                if (isStateEmpty(destState[destinationTableLocation])) {
                     destKeyArray0[destinationTableLocation] = k0;
                     destKeyArray1[destinationTableLocation] = k1;
                     destState[destinationTableLocation] = originalStateArray[sourceBucket];
diff --git a/engine/table/src/main/java/io/deephaven/engine/table/impl/updateby/hashing/typed/open/gen/UpdateByHasherByteInt.java b/engine/table/src/main/java/io/deephaven/engine/table/impl/updateby/hashing/typed/open/gen/UpdateByHasherByteInt.java
index 27341562e18..abdc5639cde 100644
--- a/engine/table/src/main/java/io/deephaven/engine/table/impl/updateby/hashing/typed/open/gen/UpdateByHasherByteInt.java
+++ b/engine/table/src/main/java/io/deephaven/engine/table/impl/updateby/hashing/typed/open/gen/UpdateByHasherByteInt.java
@@ -71,12 +71,12 @@ protected void buildHashTable(RowSequence rowSequence, Chunk[] sourceKeyChunks,
             int tableLocation = firstTableLocation;
             MAIN_SEARCH: while (true) {
                 int rowState = stateSource.getUnsafe(tableLocation);
-                if (rowState == EMPTY_RIGHT_VALUE) {
+                if (isStateEmpty(rowState)) {
                     final int firstAlternateTableLocation = hashToTableLocationAlternate(hash);
                     int alternateTableLocation = firstAlternateTableLocation;
                     while (alternateTableLocation < rehashPointer) {
                         rowState = alternateStateSource.getUnsafe(alternateTableLocation);
-                        if (rowState == EMPTY_RIGHT_VALUE) {
+                        if (isStateEmpty(rowState)) {
                             break;
                         } else if (eq(alternateKeySource0.getUnsafe(alternateTableLocation), k0) && eq(alternateKeySource1.getUnsafe(alternateTableLocation), k1)) {
                             // map the existing bucket to this chunk position;
@@ -122,7 +122,7 @@ protected void probeHashTable(RowSequence rowSequence, Chunk[] sourceKeyChunks,
             boolean found = false;
             int tableLocation = firstTableLocation;
             int rowState;
-            while ((rowState = stateSource.getUnsafe(tableLocation)) != EMPTY_RIGHT_VALUE) {
+            while (!isStateEmpty(rowState = stateSource.getUnsafe(tableLocation))) {
                 if (eq(mainKeySource0.getUnsafe(tableLocation), k0) && eq(mainKeySource1.getUnsafe(tableLocation), k1)) {
                     // map the existing bucket to this chunk position;
                     outputPositions.set(chunkPosition, rowState);
@@ -137,7 +137,7 @@ protected void probeHashTable(RowSequence rowSequence, Chunk[] sourceKeyChunks,
                 boolean alternateFound = false;
                 if (firstAlternateTableLocation < rehashPointer) {
                     int alternateTableLocation = firstAlternateTableLocation;
-                    while ((rowState = alternateStateSource.getUnsafe(alternateTableLocation)) != EMPTY_RIGHT_VALUE) {
+                    while (!isStateEmpty(rowState = alternateStateSource.getUnsafe(alternateTableLocation))) {
                         if (eq(alternateKeySource0.getUnsafe(alternateTableLocation), k0) && eq(alternateKeySource1.getUnsafe(alternateTableLocation), k1)) {
                             // map the existing bucket (from alternate) to this chunk position;
                             outputPositions.set(chunkPosition, rowState);
@@ -162,17 +162,21 @@ private static int hash(byte k0, int k1) {
         return hash;
     }
 
+    private static boolean isStateEmpty(int state) {
+        return state == EMPTY_RIGHT_VALUE;
+    }
+
     private boolean migrateOneLocation(int locationToMigrate,
             WritableIntChunk<RowKeys> outputPositions) {
         final int currentStateValue = alternateStateSource.getUnsafe(locationToMigrate);
-        if (currentStateValue == EMPTY_RIGHT_VALUE) {
+        if (isStateEmpty(currentStateValue)) {
             return false;
         }
         final byte k0 = alternateKeySource0.getUnsafe(locationToMigrate);
         final int k1 = alternateKeySource1.getUnsafe(locationToMigrate);
         final int hash = hash(k0, k1);
         int destinationTableLocation = hashToTableLocation(hash);
-        while (stateSource.getUnsafe(destinationTableLocation) != EMPTY_RIGHT_VALUE) {
+        while (!isStateEmpty(stateSource.getUnsafe(destinationTableLocation))) {
             destinationTableLocation = nextTableLocation(destinationTableLocation);
         }
         mainKeySource0.set(destinationTableLocation, k0);
@@ -195,8 +199,7 @@ protected int rehashInternalPartial(int entriesToRehash,
     }
 
     @Override
-    protected void newAlternate() {
-        super.newAlternate();
+    protected void adviseNewAlternate() {
         this.mainKeySource0 = (ImmutableByteArraySource)super.mainKeySources[0];
         this.alternateKeySource0 = (ImmutableByteArraySource)super.alternateKeySources[0];
         this.mainKeySource1 = (ImmutableIntArraySource)super.mainKeySources[1];
@@ -213,7 +216,7 @@ protected void clearAlternate() {
     @Override
     protected void migrateFront(WritableIntChunk<RowKeys> outputPositions) {
         int location = 0;
-        while (migrateOneLocation(location++, outputPositions));
+        while (migrateOneLocation(location++, outputPositions) && location < alternateTableSize);
     }
 
     @Override
@@ -230,7 +233,7 @@ protected void rehashInternalFull(final int oldSize) {
         stateSource.setArray(destState);
         for (int sourceBucket = 0; sourceBucket < oldSize; ++sourceBucket) {
             final int currentStateValue = originalStateArray[sourceBucket];
-            if (currentStateValue == EMPTY_RIGHT_VALUE) {
+            if (isStateEmpty(currentStateValue)) {
                 continue;
             }
             final byte k0 = originalKeyArray0[sourceBucket];
@@ -239,7 +242,7 @@ protected void rehashInternalFull(final int oldSize) {
             final int firstDestinationTableLocation = hashToTableLocation(hash);
             int destinationTableLocation = firstDestinationTableLocation;
             while (true) {
-                if (destState[destinationTableLocation] == EMPTY_RIGHT_VALUE) {
+                if (isStateEmpty(destState[destinationTableLocation])) {
                     destKeyArray0[destinationTableLocation] = k0;
                     destKeyArray1[destinationTableLocation] = k1;
                     destState[destinationTableLocation] = originalStateArray[sourceBucket];
diff --git a/engine/table/src/main/java/io/deephaven/engine/table/impl/updateby/hashing/typed/open/gen/UpdateByHasherByteLong.java b/engine/table/src/main/java/io/deephaven/engine/table/impl/updateby/hashing/typed/open/gen/UpdateByHasherByteLong.java
index 28f0807df87..be4d1139744 100644
--- a/engine/table/src/main/java/io/deephaven/engine/table/impl/updateby/hashing/typed/open/gen/UpdateByHasherByteLong.java
+++ b/engine/table/src/main/java/io/deephaven/engine/table/impl/updateby/hashing/typed/open/gen/UpdateByHasherByteLong.java
@@ -70,12 +70,12 @@ protected void buildHashTable(RowSequence rowSequence, Chunk[] sourceKeyChunks,
             int tableLocation = firstTableLocation;
             MAIN_SEARCH: while (true) {
                 int rowState = stateSource.getUnsafe(tableLocation);
-                if (rowState == EMPTY_RIGHT_VALUE) {
+                if (isStateEmpty(rowState)) {
                     final int firstAlternateTableLocation = hashToTableLocationAlternate(hash);
                     int alternateTableLocation = firstAlternateTableLocation;
                     while (alternateTableLocation < rehashPointer) {
                         rowState = alternateStateSource.getUnsafe(alternateTableLocation);
-                        if (rowState == EMPTY_RIGHT_VALUE) {
+                        if (isStateEmpty(rowState)) {
                             break;
                         } else if (eq(alternateKeySource0.getUnsafe(alternateTableLocation), k0) && eq(alternateKeySource1.getUnsafe(alternateTableLocation), k1)) {
                             // map the existing bucket to this chunk position;
@@ -121,7 +121,7 @@ protected void probeHashTable(RowSequence rowSequence, Chunk[] sourceKeyChunks,
             boolean found = false;
             int tableLocation = firstTableLocation;
             int rowState;
-            while ((rowState = stateSource.getUnsafe(tableLocation)) != EMPTY_RIGHT_VALUE) {
+            while (!isStateEmpty(rowState = stateSource.getUnsafe(tableLocation))) {
                 if (eq(mainKeySource0.getUnsafe(tableLocation), k0) && eq(mainKeySource1.getUnsafe(tableLocation), k1)) {
                     // map the existing bucket to this chunk position;
                     outputPositions.set(chunkPosition, rowState);
@@ -136,7 +136,7 @@ protected void probeHashTable(RowSequence rowSequence, Chunk[] sourceKeyChunks,
                 boolean alternateFound = false;
                 if (firstAlternateTableLocation < rehashPointer) {
                     int alternateTableLocation = firstAlternateTableLocation;
-                    while ((rowState = alternateStateSource.getUnsafe(alternateTableLocation)) != EMPTY_RIGHT_VALUE) {
+                    while (!isStateEmpty(rowState = alternateStateSource.getUnsafe(alternateTableLocation))) {
                         if (eq(alternateKeySource0.getUnsafe(alternateTableLocation), k0) && eq(alternateKeySource1.getUnsafe(alternateTableLocation), k1)) {
                             // map the existing bucket (from alternate) to this chunk position;
                             outputPositions.set(chunkPosition, rowState);
@@ -161,17 +161,21 @@ private static int hash(byte k0, long k1) {
         return hash;
     }
 
+    private static boolean isStateEmpty(int state) {
+        return state == EMPTY_RIGHT_VALUE;
+    }
+
     private boolean migrateOneLocation(int locationToMigrate,
             WritableIntChunk<RowKeys> outputPositions) {
         final int currentStateValue = alternateStateSource.getUnsafe(locationToMigrate);
-        if (currentStateValue == EMPTY_RIGHT_VALUE) {
+        if (isStateEmpty(currentStateValue)) {
             return false;
         }
         final byte k0 = alternateKeySource0.getUnsafe(locationToMigrate);
         final long k1 = alternateKeySource1.getUnsafe(locationToMigrate);
         final int hash = hash(k0, k1);
         int destinationTableLocation = hashToTableLocation(hash);
-        while (stateSource.getUnsafe(destinationTableLocation) != EMPTY_RIGHT_VALUE) {
+        while (!isStateEmpty(stateSource.getUnsafe(destinationTableLocation))) {
             destinationTableLocation = nextTableLocation(destinationTableLocation);
         }
         mainKeySource0.set(destinationTableLocation, k0);
@@ -194,8 +198,7 @@ protected int rehashInternalPartial(int entriesToRehash,
     }
 
     @Override
-    protected void newAlternate() {
-        super.newAlternate();
+    protected void adviseNewAlternate() {
         this.mainKeySource0 = (ImmutableByteArraySource)super.mainKeySources[0];
         this.alternateKeySource0 = (ImmutableByteArraySource)super.alternateKeySources[0];
         this.mainKeySource1 = (ImmutableLongArraySource)super.mainKeySources[1];
@@ -212,7 +215,7 @@ protected void clearAlternate() {
     @Override
     protected void migrateFront(WritableIntChunk<RowKeys> outputPositions) {
         int location = 0;
-        while (migrateOneLocation(location++, outputPositions));
+        while (migrateOneLocation(location++, outputPositions) && location < alternateTableSize);
     }
 
     @Override
@@ -229,7 +232,7 @@ protected void rehashInternalFull(final int oldSize) {
         stateSource.setArray(destState);
         for (int sourceBucket = 0; sourceBucket < oldSize; ++sourceBucket) {
             final int currentStateValue = originalStateArray[sourceBucket];
-            if (currentStateValue == EMPTY_RIGHT_VALUE) {
+            if (isStateEmpty(currentStateValue)) {
                 continue;
             }
             final byte k0 = originalKeyArray0[sourceBucket];
@@ -238,7 +241,7 @@ protected void rehashInternalFull(final int oldSize) {
             final int firstDestinationTableLocation = hashToTableLocation(hash);
             int destinationTableLocation = firstDestinationTableLocation;
             while (true) {
-                if (destState[destinationTableLocation] == EMPTY_RIGHT_VALUE) {
+                if (isStateEmpty(destState[destinationTableLocation])) {
                     destKeyArray0[destinationTableLocation] = k0;
                     destKeyArray1[destinationTableLocation] = k1;
                     destState[destinationTableLocation] = originalStateArray[sourceBucket];
diff --git a/engine/table/src/main/java/io/deephaven/engine/table/impl/updateby/hashing/typed/open/gen/UpdateByHasherByteObject.java b/engine/table/src/main/java/io/deephaven/engine/table/impl/updateby/hashing/typed/open/gen/UpdateByHasherByteObject.java
index 660338677c6..76175065f90 100644
--- a/engine/table/src/main/java/io/deephaven/engine/table/impl/updateby/hashing/typed/open/gen/UpdateByHasherByteObject.java
+++ b/engine/table/src/main/java/io/deephaven/engine/table/impl/updateby/hashing/typed/open/gen/UpdateByHasherByteObject.java
@@ -72,12 +72,12 @@ protected void buildHashTable(RowSequence rowSequence, Chunk[] sourceKeyChunks,
             int tableLocation = firstTableLocation;
             MAIN_SEARCH: while (true) {
                 int rowState = stateSource.getUnsafe(tableLocation);
-                if (rowState == EMPTY_RIGHT_VALUE) {
+                if (isStateEmpty(rowState)) {
                     final int firstAlternateTableLocation = hashToTableLocationAlternate(hash);
                     int alternateTableLocation = firstAlternateTableLocation;
                     while (alternateTableLocation < rehashPointer) {
                         rowState = alternateStateSource.getUnsafe(alternateTableLocation);
-                        if (rowState == EMPTY_RIGHT_VALUE) {
+                        if (isStateEmpty(rowState)) {
                             break;
                         } else if (eq(alternateKeySource0.getUnsafe(alternateTableLocation), k0) && eq(alternateKeySource1.getUnsafe(alternateTableLocation), k1)) {
                             // map the existing bucket to this chunk position;
@@ -123,7 +123,7 @@ protected void probeHashTable(RowSequence rowSequence, Chunk[] sourceKeyChunks,
             boolean found = false;
             int tableLocation = firstTableLocation;
             int rowState;
-            while ((rowState = stateSource.getUnsafe(tableLocation)) != EMPTY_RIGHT_VALUE) {
+            while (!isStateEmpty(rowState = stateSource.getUnsafe(tableLocation))) {
                 if (eq(mainKeySource0.getUnsafe(tableLocation), k0) && eq(mainKeySource1.getUnsafe(tableLocation), k1)) {
                     // map the existing bucket to this chunk position;
                     outputPositions.set(chunkPosition, rowState);
@@ -138,7 +138,7 @@ protected void probeHashTable(RowSequence rowSequence, Chunk[] sourceKeyChunks,
                 boolean alternateFound = false;
                 if (firstAlternateTableLocation < rehashPointer) {
                     int alternateTableLocation = firstAlternateTableLocation;
-                    while ((rowState = alternateStateSource.getUnsafe(alternateTableLocation)) != EMPTY_RIGHT_VALUE) {
+                    while (!isStateEmpty(rowState = alternateStateSource.getUnsafe(alternateTableLocation))) {
                         if (eq(alternateKeySource0.getUnsafe(alternateTableLocation), k0) && eq(alternateKeySource1.getUnsafe(alternateTableLocation), k1)) {
                             // map the existing bucket (from alternate) to this chunk position;
                             outputPositions.set(chunkPosition, rowState);
@@ -163,17 +163,21 @@ private static int hash(byte k0, Object k1) {
         return hash;
     }
 
+    private static boolean isStateEmpty(int state) {
+        return state == EMPTY_RIGHT_VALUE;
+    }
+
     private boolean migrateOneLocation(int locationToMigrate,
             WritableIntChunk<RowKeys> outputPositions) {
         final int currentStateValue = alternateStateSource.getUnsafe(locationToMigrate);
-        if (currentStateValue == EMPTY_RIGHT_VALUE) {
+        if (isStateEmpty(currentStateValue)) {
             return false;
         }
         final byte k0 = alternateKeySource0.getUnsafe(locationToMigrate);
         final Object k1 = alternateKeySource1.getUnsafe(locationToMigrate);
         final int hash = hash(k0, k1);
         int destinationTableLocation = hashToTableLocation(hash);
-        while (stateSource.getUnsafe(destinationTableLocation) != EMPTY_RIGHT_VALUE) {
+        while (!isStateEmpty(stateSource.getUnsafe(destinationTableLocation))) {
             destinationTableLocation = nextTableLocation(destinationTableLocation);
         }
         mainKeySource0.set(destinationTableLocation, k0);
@@ -197,8 +201,7 @@ protected int rehashInternalPartial(int entriesToRehash,
     }
 
     @Override
-    protected void newAlternate() {
-        super.newAlternate();
+    protected void adviseNewAlternate() {
         this.mainKeySource0 = (ImmutableByteArraySource)super.mainKeySources[0];
         this.alternateKeySource0 = (ImmutableByteArraySource)super.alternateKeySources[0];
         this.mainKeySource1 = (ImmutableObjectArraySource)super.mainKeySources[1];
@@ -215,7 +218,7 @@ protected void clearAlternate() {
     @Override
     protected void migrateFront(WritableIntChunk<RowKeys> outputPositions) {
         int location = 0;
-        while (migrateOneLocation(location++, outputPositions));
+        while (migrateOneLocation(location++, outputPositions) && location < alternateTableSize);
     }
 
     @Override
@@ -232,7 +235,7 @@ protected void rehashInternalFull(final int oldSize) {
         stateSource.setArray(destState);
         for (int sourceBucket = 0; sourceBucket < oldSize; ++sourceBucket) {
             final int currentStateValue = originalStateArray[sourceBucket];
-            if (currentStateValue == EMPTY_RIGHT_VALUE) {
+            if (isStateEmpty(currentStateValue)) {
                 continue;
             }
             final byte k0 = originalKeyArray0[sourceBucket];
@@ -241,7 +244,7 @@ protected void rehashInternalFull(final int oldSize) {
             final int firstDestinationTableLocation = hashToTableLocation(hash);
             int destinationTableLocation = firstDestinationTableLocation;
             while (true) {
-                if (destState[destinationTableLocation] == EMPTY_RIGHT_VALUE) {
+                if (isStateEmpty(destState[destinationTableLocation])) {
                     destKeyArray0[destinationTableLocation] = k0;
                     destKeyArray1[destinationTableLocation] = k1;
                     destState[destinationTableLocation] = originalStateArray[sourceBucket];
diff --git a/engine/table/src/main/java/io/deephaven/engine/table/impl/updateby/hashing/typed/open/gen/UpdateByHasherByteShort.java b/engine/table/src/main/java/io/deephaven/engine/table/impl/updateby/hashing/typed/open/gen/UpdateByHasherByteShort.java
index 1eaca8f1162..8b2411cf364 100644
--- a/engine/table/src/main/java/io/deephaven/engine/table/impl/updateby/hashing/typed/open/gen/UpdateByHasherByteShort.java
+++ b/engine/table/src/main/java/io/deephaven/engine/table/impl/updateby/hashing/typed/open/gen/UpdateByHasherByteShort.java
@@ -71,12 +71,12 @@ protected void buildHashTable(RowSequence rowSequence, Chunk[] sourceKeyChunks,
             int tableLocation = firstTableLocation;
             MAIN_SEARCH: while (true) {
                 int rowState = stateSource.getUnsafe(tableLocation);
-                if (rowState == EMPTY_RIGHT_VALUE) {
+                if (isStateEmpty(rowState)) {
                     final int firstAlternateTableLocation = hashToTableLocationAlternate(hash);
                     int alternateTableLocation = firstAlternateTableLocation;
                     while (alternateTableLocation < rehashPointer) {
                         rowState = alternateStateSource.getUnsafe(alternateTableLocation);
-                        if (rowState == EMPTY_RIGHT_VALUE) {
+                        if (isStateEmpty(rowState)) {
                             break;
                         } else if (eq(alternateKeySource0.getUnsafe(alternateTableLocation), k0) && eq(alternateKeySource1.getUnsafe(alternateTableLocation), k1)) {
                             // map the existing bucket to this chunk position;
@@ -122,7 +122,7 @@ protected void probeHashTable(RowSequence rowSequence, Chunk[] sourceKeyChunks,
             boolean found = false;
             int tableLocation = firstTableLocation;
             int rowState;
-            while ((rowState = stateSource.getUnsafe(tableLocation)) != EMPTY_RIGHT_VALUE) {
+            while (!isStateEmpty(rowState = stateSource.getUnsafe(tableLocation))) {
                 if (eq(mainKeySource0.getUnsafe(tableLocation), k0) && eq(mainKeySource1.getUnsafe(tableLocation), k1)) {
                     // map the existing bucket to this chunk position;
                     outputPositions.set(chunkPosition, rowState);
@@ -137,7 +137,7 @@ protected void probeHashTable(RowSequence rowSequence, Chunk[] sourceKeyChunks,
                 boolean alternateFound = false;
                 if (firstAlternateTableLocation < rehashPointer) {
                     int alternateTableLocation = firstAlternateTableLocation;
-                    while ((rowState = alternateStateSource.getUnsafe(alternateTableLocation)) != EMPTY_RIGHT_VALUE) {
+                    while (!isStateEmpty(rowState = alternateStateSource.getUnsafe(alternateTableLocation))) {
                         if (eq(alternateKeySource0.getUnsafe(alternateTableLocation), k0) && eq(alternateKeySource1.getUnsafe(alternateTableLocation), k1)) {
                             // map the existing bucket (from alternate) to this chunk position;
                             outputPositions.set(chunkPosition, rowState);
@@ -162,17 +162,21 @@ private static int hash(byte k0, short k1) {
         return hash;
     }
 
+    private static boolean isStateEmpty(int state) {
+        return state == EMPTY_RIGHT_VALUE;
+    }
+
     private boolean migrateOneLocation(int locationToMigrate,
             WritableIntChunk<RowKeys> outputPositions) {
         final int currentStateValue = alternateStateSource.getUnsafe(locationToMigrate);
-        if (currentStateValue == EMPTY_RIGHT_VALUE) {
+        if (isStateEmpty(currentStateValue)) {
             return false;
         }
         final byte k0 = alternateKeySource0.getUnsafe(locationToMigrate);
         final short k1 = alternateKeySource1.getUnsafe(locationToMigrate);
         final int hash = hash(k0, k1);
         int destinationTableLocation = hashToTableLocation(hash);
-        while (stateSource.getUnsafe(destinationTableLocation) != EMPTY_RIGHT_VALUE) {
+        while (!isStateEmpty(stateSource.getUnsafe(destinationTableLocation))) {
             destinationTableLocation = nextTableLocation(destinationTableLocation);
         }
         mainKeySource0.set(destinationTableLocation, k0);
@@ -195,8 +199,7 @@ protected int rehashInternalPartial(int entriesToRehash,
     }
 
     @Override
-    protected void newAlternate() {
-        super.newAlternate();
+    protected void adviseNewAlternate() {
         this.mainKeySource0 = (ImmutableByteArraySource)super.mainKeySources[0];
         this.alternateKeySource0 = (ImmutableByteArraySource)super.alternateKeySources[0];
         this.mainKeySource1 = (ImmutableShortArraySource)super.mainKeySources[1];
@@ -213,7 +216,7 @@ protected void clearAlternate() {
     @Override
     protected void migrateFront(WritableIntChunk<RowKeys> outputPositions) {
         int location = 0;
-        while (migrateOneLocation(location++, outputPositions));
+        while (migrateOneLocation(location++, outputPositions) && location < alternateTableSize);
     }
 
     @Override
@@ -230,7 +233,7 @@ protected void rehashInternalFull(final int oldSize) {
         stateSource.setArray(destState);
         for (int sourceBucket = 0; sourceBucket < oldSize; ++sourceBucket) {
             final int currentStateValue = originalStateArray[sourceBucket];
-            if (currentStateValue == EMPTY_RIGHT_VALUE) {
+            if (isStateEmpty(currentStateValue)) {
                 continue;
             }
             final byte k0 = originalKeyArray0[sourceBucket];
@@ -239,7 +242,7 @@ protected void rehashInternalFull(final int oldSize) {
             final int firstDestinationTableLocation = hashToTableLocation(hash);
             int destinationTableLocation = firstDestinationTableLocation;
             while (true) {
-                if (destState[destinationTableLocation] == EMPTY_RIGHT_VALUE) {
+                if (isStateEmpty(destState[destinationTableLocation])) {
                     destKeyArray0[destinationTableLocation] = k0;
                     destKeyArray1[destinationTableLocation] = k1;
                     destState[destinationTableLocation] = originalStateArray[sourceBucket];
diff --git a/engine/table/src/main/java/io/deephaven/engine/table/impl/updateby/hashing/typed/open/gen/UpdateByHasherChar.java b/engine/table/src/main/java/io/deephaven/engine/table/impl/updateby/hashing/typed/open/gen/UpdateByHasherChar.java
index bc6b0dc43cc..1245de3377c 100644
--- a/engine/table/src/main/java/io/deephaven/engine/table/impl/updateby/hashing/typed/open/gen/UpdateByHasherChar.java
+++ b/engine/table/src/main/java/io/deephaven/engine/table/impl/updateby/hashing/typed/open/gen/UpdateByHasherChar.java
@@ -59,12 +59,12 @@ protected void buildHashTable(RowSequence rowSequence, Chunk[] sourceKeyChunks,
             int tableLocation = firstTableLocation;
             MAIN_SEARCH: while (true) {
                 int rowState = stateSource.getUnsafe(tableLocation);
-                if (rowState == EMPTY_RIGHT_VALUE) {
+                if (isStateEmpty(rowState)) {
                     final int firstAlternateTableLocation = hashToTableLocationAlternate(hash);
                     int alternateTableLocation = firstAlternateTableLocation;
                     while (alternateTableLocation < rehashPointer) {
                         rowState = alternateStateSource.getUnsafe(alternateTableLocation);
-                        if (rowState == EMPTY_RIGHT_VALUE) {
+                        if (isStateEmpty(rowState)) {
                             break;
                         } else if (eq(alternateKeySource0.getUnsafe(alternateTableLocation), k0)) {
                             // map the existing bucket to this chunk position;
@@ -107,7 +107,7 @@ protected void probeHashTable(RowSequence rowSequence, Chunk[] sourceKeyChunks,
             boolean found = false;
             int tableLocation = firstTableLocation;
             int rowState;
-            while ((rowState = stateSource.getUnsafe(tableLocation)) != EMPTY_RIGHT_VALUE) {
+            while (!isStateEmpty(rowState = stateSource.getUnsafe(tableLocation))) {
                 if (eq(mainKeySource0.getUnsafe(tableLocation), k0)) {
                     // map the existing bucket to this chunk position;
                     outputPositions.set(chunkPosition, rowState);
@@ -122,7 +122,7 @@ protected void probeHashTable(RowSequence rowSequence, Chunk[] sourceKeyChunks,
                 boolean alternateFound = false;
                 if (firstAlternateTableLocation < rehashPointer) {
                     int alternateTableLocation = firstAlternateTableLocation;
-                    while ((rowState = alternateStateSource.getUnsafe(alternateTableLocation)) != EMPTY_RIGHT_VALUE) {
+                    while (!isStateEmpty(rowState = alternateStateSource.getUnsafe(alternateTableLocation))) {
                         if (eq(alternateKeySource0.getUnsafe(alternateTableLocation), k0)) {
                             // map the existing bucket (from alternate) to this chunk position;
                             outputPositions.set(chunkPosition, rowState);
@@ -146,16 +146,20 @@ private static int hash(char k0) {
         return hash;
     }
 
+    private static boolean isStateEmpty(int state) {
+        return state == EMPTY_RIGHT_VALUE;
+    }
+
     private boolean migrateOneLocation(int locationToMigrate,
             WritableIntChunk<RowKeys> outputPositions) {
         final int currentStateValue = alternateStateSource.getUnsafe(locationToMigrate);
-        if (currentStateValue == EMPTY_RIGHT_VALUE) {
+        if (isStateEmpty(currentStateValue)) {
             return false;
         }
         final char k0 = alternateKeySource0.getUnsafe(locationToMigrate);
         final int hash = hash(k0);
         int destinationTableLocation = hashToTableLocation(hash);
-        while (stateSource.getUnsafe(destinationTableLocation) != EMPTY_RIGHT_VALUE) {
+        while (!isStateEmpty(stateSource.getUnsafe(destinationTableLocation))) {
             destinationTableLocation = nextTableLocation(destinationTableLocation);
         }
         mainKeySource0.set(destinationTableLocation, k0);
@@ -177,8 +181,7 @@ protected int rehashInternalPartial(int entriesToRehash,
     }
 
     @Override
-    protected void newAlternate() {
-        super.newAlternate();
+    protected void adviseNewAlternate() {
         this.mainKeySource0 = (ImmutableCharArraySource)super.mainKeySources[0];
         this.alternateKeySource0 = (ImmutableCharArraySource)super.alternateKeySources[0];
     }
@@ -192,7 +195,7 @@ protected void clearAlternate() {
     @Override
     protected void migrateFront(WritableIntChunk<RowKeys> outputPositions) {
         int location = 0;
-        while (migrateOneLocation(location++, outputPositions));
+        while (migrateOneLocation(location++, outputPositions) && location < alternateTableSize);
     }
 
     @Override
@@ -206,7 +209,7 @@ protected void rehashInternalFull(final int oldSize) {
         stateSource.setArray(destState);
         for (int sourceBucket = 0; sourceBucket < oldSize; ++sourceBucket) {
             final int currentStateValue = originalStateArray[sourceBucket];
-            if (currentStateValue == EMPTY_RIGHT_VALUE) {
+            if (isStateEmpty(currentStateValue)) {
                 continue;
             }
             final char k0 = originalKeyArray0[sourceBucket];
@@ -214,7 +217,7 @@ protected void rehashInternalFull(final int oldSize) {
             final int firstDestinationTableLocation = hashToTableLocation(hash);
             int destinationTableLocation = firstDestinationTableLocation;
             while (true) {
-                if (destState[destinationTableLocation] == EMPTY_RIGHT_VALUE) {
+                if (isStateEmpty(destState[destinationTableLocation])) {
                     destKeyArray0[destinationTableLocation] = k0;
                     destState[destinationTableLocation] = originalStateArray[sourceBucket];
                     break;
diff --git a/engine/table/src/main/java/io/deephaven/engine/table/impl/updateby/hashing/typed/open/gen/UpdateByHasherCharByte.java b/engine/table/src/main/java/io/deephaven/engine/table/impl/updateby/hashing/typed/open/gen/UpdateByHasherCharByte.java
index b4f12318a2a..92228fd2b92 100644
--- a/engine/table/src/main/java/io/deephaven/engine/table/impl/updateby/hashing/typed/open/gen/UpdateByHasherCharByte.java
+++ b/engine/table/src/main/java/io/deephaven/engine/table/impl/updateby/hashing/typed/open/gen/UpdateByHasherCharByte.java
@@ -71,12 +71,12 @@ protected void buildHashTable(RowSequence rowSequence, Chunk[] sourceKeyChunks,
             int tableLocation = firstTableLocation;
             MAIN_SEARCH: while (true) {
                 int rowState = stateSource.getUnsafe(tableLocation);
-                if (rowState == EMPTY_RIGHT_VALUE) {
+                if (isStateEmpty(rowState)) {
                     final int firstAlternateTableLocation = hashToTableLocationAlternate(hash);
                     int alternateTableLocation = firstAlternateTableLocation;
                     while (alternateTableLocation < rehashPointer) {
                         rowState = alternateStateSource.getUnsafe(alternateTableLocation);
-                        if (rowState == EMPTY_RIGHT_VALUE) {
+                        if (isStateEmpty(rowState)) {
                             break;
                         } else if (eq(alternateKeySource0.getUnsafe(alternateTableLocation), k0) && eq(alternateKeySource1.getUnsafe(alternateTableLocation), k1)) {
                             // map the existing bucket to this chunk position;
@@ -122,7 +122,7 @@ protected void probeHashTable(RowSequence rowSequence, Chunk[] sourceKeyChunks,
             boolean found = false;
             int tableLocation = firstTableLocation;
             int rowState;
-            while ((rowState = stateSource.getUnsafe(tableLocation)) != EMPTY_RIGHT_VALUE) {
+            while (!isStateEmpty(rowState = stateSource.getUnsafe(tableLocation))) {
                 if (eq(mainKeySource0.getUnsafe(tableLocation), k0) && eq(mainKeySource1.getUnsafe(tableLocation), k1)) {
                     // map the existing bucket to this chunk position;
                     outputPositions.set(chunkPosition, rowState);
@@ -137,7 +137,7 @@ protected void probeHashTable(RowSequence rowSequence, Chunk[] sourceKeyChunks,
                 boolean alternateFound = false;
                 if (firstAlternateTableLocation < rehashPointer) {
                     int alternateTableLocation = firstAlternateTableLocation;
-                    while ((rowState = alternateStateSource.getUnsafe(alternateTableLocation)) != EMPTY_RIGHT_VALUE) {
+                    while (!isStateEmpty(rowState = alternateStateSource.getUnsafe(alternateTableLocation))) {
                         if (eq(alternateKeySource0.getUnsafe(alternateTableLocation), k0) && eq(alternateKeySource1.getUnsafe(alternateTableLocation), k1)) {
                             // map the existing bucket (from alternate) to this chunk position;
                             outputPositions.set(chunkPosition, rowState);
@@ -162,17 +162,21 @@ private static int hash(char k0, byte k1) {
         return hash;
     }
 
+    private static boolean isStateEmpty(int state) {
+        return state == EMPTY_RIGHT_VALUE;
+    }
+
     private boolean migrateOneLocation(int locationToMigrate,
             WritableIntChunk<RowKeys> outputPositions) {
         final int currentStateValue = alternateStateSource.getUnsafe(locationToMigrate);
-        if (currentStateValue == EMPTY_RIGHT_VALUE) {
+        if (isStateEmpty(currentStateValue)) {
             return false;
         }
         final char k0 = alternateKeySource0.getUnsafe(locationToMigrate);
         final byte k1 = alternateKeySource1.getUnsafe(locationToMigrate);
         final int hash = hash(k0, k1);
         int destinationTableLocation = hashToTableLocation(hash);
-        while (stateSource.getUnsafe(destinationTableLocation) != EMPTY_RIGHT_VALUE) {
+        while (!isStateEmpty(stateSource.getUnsafe(destinationTableLocation))) {
             destinationTableLocation = nextTableLocation(destinationTableLocation);
         }
         mainKeySource0.set(destinationTableLocation, k0);
@@ -195,8 +199,7 @@ protected int rehashInternalPartial(int entriesToRehash,
     }
 
     @Override
-    protected void newAlternate() {
-        super.newAlternate();
+    protected void adviseNewAlternate() {
         this.mainKeySource0 = (ImmutableCharArraySource)super.mainKeySources[0];
         this.alternateKeySource0 = (ImmutableCharArraySource)super.alternateKeySources[0];
         this.mainKeySource1 = (ImmutableByteArraySource)super.mainKeySources[1];
@@ -213,7 +216,7 @@ protected void clearAlternate() {
     @Override
     protected void migrateFront(WritableIntChunk<RowKeys> outputPositions) {
         int location = 0;
-        while (migrateOneLocation(location++, outputPositions));
+        while (migrateOneLocation(location++, outputPositions) && location < alternateTableSize);
     }
 
     @Override
@@ -230,7 +233,7 @@ protected void rehashInternalFull(final int oldSize) {
         stateSource.setArray(destState);
         for (int sourceBucket = 0; sourceBucket < oldSize; ++sourceBucket) {
             final int currentStateValue = originalStateArray[sourceBucket];
-            if (currentStateValue == EMPTY_RIGHT_VALUE) {
+            if (isStateEmpty(currentStateValue)) {
                 continue;
             }
             final char k0 = originalKeyArray0[sourceBucket];
@@ -239,7 +242,7 @@ protected void rehashInternalFull(final int oldSize) {
             final int firstDestinationTableLocation = hashToTableLocation(hash);
             int destinationTableLocation = firstDestinationTableLocation;
             while (true) {
-                if (destState[destinationTableLocation] == EMPTY_RIGHT_VALUE) {
+                if (isStateEmpty(destState[destinationTableLocation])) {
                     destKeyArray0[destinationTableLocation] = k0;
                     destKeyArray1[destinationTableLocation] = k1;
                     destState[destinationTableLocation] = originalStateArray[sourceBucket];
diff --git a/engine/table/src/main/java/io/deephaven/engine/table/impl/updateby/hashing/typed/open/gen/UpdateByHasherCharChar.java b/engine/table/src/main/java/io/deephaven/engine/table/impl/updateby/hashing/typed/open/gen/UpdateByHasherCharChar.java
index a2a6f1d9a93..99d9a1f1180 100644
--- a/engine/table/src/main/java/io/deephaven/engine/table/impl/updateby/hashing/typed/open/gen/UpdateByHasherCharChar.java
+++ b/engine/table/src/main/java/io/deephaven/engine/table/impl/updateby/hashing/typed/open/gen/UpdateByHasherCharChar.java
@@ -67,12 +67,12 @@ protected void buildHashTable(RowSequence rowSequence, Chunk[] sourceKeyChunks,
             int tableLocation = firstTableLocation;
             MAIN_SEARCH: while (true) {
                 int rowState = stateSource.getUnsafe(tableLocation);
-                if (rowState == EMPTY_RIGHT_VALUE) {
+                if (isStateEmpty(rowState)) {
                     final int firstAlternateTableLocation = hashToTableLocationAlternate(hash);
                     int alternateTableLocation = firstAlternateTableLocation;
                     while (alternateTableLocation < rehashPointer) {
                         rowState = alternateStateSource.getUnsafe(alternateTableLocation);
-                        if (rowState == EMPTY_RIGHT_VALUE) {
+                        if (isStateEmpty(rowState)) {
                             break;
                         } else if (eq(alternateKeySource0.getUnsafe(alternateTableLocation), k0) && eq(alternateKeySource1.getUnsafe(alternateTableLocation), k1)) {
                             // map the existing bucket to this chunk position;
@@ -118,7 +118,7 @@ protected void probeHashTable(RowSequence rowSequence, Chunk[] sourceKeyChunks,
             boolean found = false;
             int tableLocation = firstTableLocation;
             int rowState;
-            while ((rowState = stateSource.getUnsafe(tableLocation)) != EMPTY_RIGHT_VALUE) {
+            while (!isStateEmpty(rowState = stateSource.getUnsafe(tableLocation))) {
                 if (eq(mainKeySource0.getUnsafe(tableLocation), k0) && eq(mainKeySource1.getUnsafe(tableLocation), k1)) {
                     // map the existing bucket to this chunk position;
                     outputPositions.set(chunkPosition, rowState);
@@ -133,7 +133,7 @@ protected void probeHashTable(RowSequence rowSequence, Chunk[] sourceKeyChunks,
                 boolean alternateFound = false;
                 if (firstAlternateTableLocation < rehashPointer) {
                     int alternateTableLocation = firstAlternateTableLocation;
-                    while ((rowState = alternateStateSource.getUnsafe(alternateTableLocation)) != EMPTY_RIGHT_VALUE) {
+                    while (!isStateEmpty(rowState = alternateStateSource.getUnsafe(alternateTableLocation))) {
                         if (eq(alternateKeySource0.getUnsafe(alternateTableLocation), k0) && eq(alternateKeySource1.getUnsafe(alternateTableLocation), k1)) {
                             // map the existing bucket (from alternate) to this chunk position;
                             outputPositions.set(chunkPosition, rowState);
@@ -158,17 +158,21 @@ private static int hash(char k0, char k1) {
         return hash;
     }
 
+    private static boolean isStateEmpty(int state) {
+        return state == EMPTY_RIGHT_VALUE;
+    }
+
     private boolean migrateOneLocation(int locationToMigrate,
             WritableIntChunk<RowKeys> outputPositions) {
         final int currentStateValue = alternateStateSource.getUnsafe(locationToMigrate);
-        if (currentStateValue == EMPTY_RIGHT_VALUE) {
+        if (isStateEmpty(currentStateValue)) {
             return false;
         }
         final char k0 = alternateKeySource0.getUnsafe(locationToMigrate);
         final char k1 = alternateKeySource1.getUnsafe(locationToMigrate);
         final int hash = hash(k0, k1);
         int destinationTableLocation = hashToTableLocation(hash);
-        while (stateSource.getUnsafe(destinationTableLocation) != EMPTY_RIGHT_VALUE) {
+        while (!isStateEmpty(stateSource.getUnsafe(destinationTableLocation))) {
             destinationTableLocation = nextTableLocation(destinationTableLocation);
         }
         mainKeySource0.set(destinationTableLocation, k0);
@@ -191,8 +195,7 @@ protected int rehashInternalPartial(int entriesToRehash,
     }
 
     @Override
-    protected void newAlternate() {
-        super.newAlternate();
+    protected void adviseNewAlternate() {
         this.mainKeySource0 = (ImmutableCharArraySource)super.mainKeySources[0];
         this.alternateKeySource0 = (ImmutableCharArraySource)super.alternateKeySources[0];
         this.mainKeySource1 = (ImmutableCharArraySource)super.mainKeySources[1];
@@ -209,7 +212,7 @@ protected void clearAlternate() {
     @Override
     protected void migrateFront(WritableIntChunk<RowKeys> outputPositions) {
         int location = 0;
-        while (migrateOneLocation(location++, outputPositions));
+        while (migrateOneLocation(location++, outputPositions) && location < alternateTableSize);
     }
 
     @Override
@@ -226,7 +229,7 @@ protected void rehashInternalFull(final int oldSize) {
         stateSource.setArray(destState);
         for (int sourceBucket = 0; sourceBucket < oldSize; ++sourceBucket) {
             final int currentStateValue = originalStateArray[sourceBucket];
-            if (currentStateValue == EMPTY_RIGHT_VALUE) {
+            if (isStateEmpty(currentStateValue)) {
                 continue;
             }
             final char k0 = originalKeyArray0[sourceBucket];
@@ -235,7 +238,7 @@ protected void rehashInternalFull(final int oldSize) {
             final int firstDestinationTableLocation = hashToTableLocation(hash);
             int destinationTableLocation = firstDestinationTableLocation;
             while (true) {
-                if (destState[destinationTableLocation] == EMPTY_RIGHT_VALUE) {
+                if (isStateEmpty(destState[destinationTableLocation])) {
                     destKeyArray0[destinationTableLocation] = k0;
                     destKeyArray1[destinationTableLocation] = k1;
                     destState[destinationTableLocation] = originalStateArray[sourceBucket];
diff --git a/engine/table/src/main/java/io/deephaven/engine/table/impl/updateby/hashing/typed/open/gen/UpdateByHasherCharDouble.java b/engine/table/src/main/java/io/deephaven/engine/table/impl/updateby/hashing/typed/open/gen/UpdateByHasherCharDouble.java
index 926bfa07e27..24dd51083a3 100644
--- a/engine/table/src/main/java/io/deephaven/engine/table/impl/updateby/hashing/typed/open/gen/UpdateByHasherCharDouble.java
+++ b/engine/table/src/main/java/io/deephaven/engine/table/impl/updateby/hashing/typed/open/gen/UpdateByHasherCharDouble.java
@@ -71,12 +71,12 @@ protected void buildHashTable(RowSequence rowSequence, Chunk[] sourceKeyChunks,
             int tableLocation = firstTableLocation;
             MAIN_SEARCH: while (true) {
                 int rowState = stateSource.getUnsafe(tableLocation);
-                if (rowState == EMPTY_RIGHT_VALUE) {
+                if (isStateEmpty(rowState)) {
                     final int firstAlternateTableLocation = hashToTableLocationAlternate(hash);
                     int alternateTableLocation = firstAlternateTableLocation;
                     while (alternateTableLocation < rehashPointer) {
                         rowState = alternateStateSource.getUnsafe(alternateTableLocation);
-                        if (rowState == EMPTY_RIGHT_VALUE) {
+                        if (isStateEmpty(rowState)) {
                             break;
                         } else if (eq(alternateKeySource0.getUnsafe(alternateTableLocation), k0) && eq(alternateKeySource1.getUnsafe(alternateTableLocation), k1)) {
                             // map the existing bucket to this chunk position;
@@ -122,7 +122,7 @@ protected void probeHashTable(RowSequence rowSequence, Chunk[] sourceKeyChunks,
             boolean found = false;
             int tableLocation = firstTableLocation;
             int rowState;
-            while ((rowState = stateSource.getUnsafe(tableLocation)) != EMPTY_RIGHT_VALUE) {
+            while (!isStateEmpty(rowState = stateSource.getUnsafe(tableLocation))) {
                 if (eq(mainKeySource0.getUnsafe(tableLocation), k0) && eq(mainKeySource1.getUnsafe(tableLocation), k1)) {
                     // map the existing bucket to this chunk position;
                     outputPositions.set(chunkPosition, rowState);
@@ -137,7 +137,7 @@ protected void probeHashTable(RowSequence rowSequence, Chunk[] sourceKeyChunks,
                 boolean alternateFound = false;
                 if (firstAlternateTableLocation < rehashPointer) {
                     int alternateTableLocation = firstAlternateTableLocation;
-                    while ((rowState = alternateStateSource.getUnsafe(alternateTableLocation)) != EMPTY_RIGHT_VALUE) {
+                    while (!isStateEmpty(rowState = alternateStateSource.getUnsafe(alternateTableLocation))) {
                         if (eq(alternateKeySource0.getUnsafe(alternateTableLocation), k0) && eq(alternateKeySource1.getUnsafe(alternateTableLocation), k1)) {
                             // map the existing bucket (from alternate) to this chunk position;
                             outputPositions.set(chunkPosition, rowState);
@@ -162,17 +162,21 @@ private static int hash(char k0, double k1) {
         return hash;
     }
 
+    private static boolean isStateEmpty(int state) {
+        return state == EMPTY_RIGHT_VALUE;
+    }
+
     private boolean migrateOneLocation(int locationToMigrate,
             WritableIntChunk<RowKeys> outputPositions) {
         final int currentStateValue = alternateStateSource.getUnsafe(locationToMigrate);
-        if (currentStateValue == EMPTY_RIGHT_VALUE) {
+        if (isStateEmpty(currentStateValue)) {
             return false;
         }
         final char k0 = alternateKeySource0.getUnsafe(locationToMigrate);
         final double k1 = alternateKeySource1.getUnsafe(locationToMigrate);
         final int hash = hash(k0, k1);
         int destinationTableLocation = hashToTableLocation(hash);
-        while (stateSource.getUnsafe(destinationTableLocation) != EMPTY_RIGHT_VALUE) {
+        while (!isStateEmpty(stateSource.getUnsafe(destinationTableLocation))) {
             destinationTableLocation = nextTableLocation(destinationTableLocation);
         }
         mainKeySource0.set(destinationTableLocation, k0);
@@ -195,8 +199,7 @@ protected int rehashInternalPartial(int entriesToRehash,
     }
 
     @Override
-    protected void newAlternate() {
-        super.newAlternate();
+    protected void adviseNewAlternate() {
         this.mainKeySource0 = (ImmutableCharArraySource)super.mainKeySources[0];
         this.alternateKeySource0 = (ImmutableCharArraySource)super.alternateKeySources[0];
         this.mainKeySource1 = (ImmutableDoubleArraySource)super.mainKeySources[1];
@@ -213,7 +216,7 @@ protected void clearAlternate() {
     @Override
     protected void migrateFront(WritableIntChunk<RowKeys> outputPositions) {
         int location = 0;
-        while (migrateOneLocation(location++, outputPositions));
+        while (migrateOneLocation(location++, outputPositions) && location < alternateTableSize);
     }
 
     @Override
@@ -230,7 +233,7 @@ protected void rehashInternalFull(final int oldSize) {
         stateSource.setArray(destState);
         for (int sourceBucket = 0; sourceBucket < oldSize; ++sourceBucket) {
             final int currentStateValue = originalStateArray[sourceBucket];
-            if (currentStateValue == EMPTY_RIGHT_VALUE) {
+            if (isStateEmpty(currentStateValue)) {
                 continue;
             }
             final char k0 = originalKeyArray0[sourceBucket];
@@ -239,7 +242,7 @@ protected void rehashInternalFull(final int oldSize) {
             final int firstDestinationTableLocation = hashToTableLocation(hash);
             int destinationTableLocation = firstDestinationTableLocation;
             while (true) {
-                if (destState[destinationTableLocation] == EMPTY_RIGHT_VALUE) {
+                if (isStateEmpty(destState[destinationTableLocation])) {
                     destKeyArray0[destinationTableLocation] = k0;
                     destKeyArray1[destinationTableLocation] = k1;
                     destState[destinationTableLocation] = originalStateArray[sourceBucket];
diff --git a/engine/table/src/main/java/io/deephaven/engine/table/impl/updateby/hashing/typed/open/gen/UpdateByHasherCharFloat.java b/engine/table/src/main/java/io/deephaven/engine/table/impl/updateby/hashing/typed/open/gen/UpdateByHasherCharFloat.java
index 537d6cb52ad..dd16dfd1d07 100644
--- a/engine/table/src/main/java/io/deephaven/engine/table/impl/updateby/hashing/typed/open/gen/UpdateByHasherCharFloat.java
+++ b/engine/table/src/main/java/io/deephaven/engine/table/impl/updateby/hashing/typed/open/gen/UpdateByHasherCharFloat.java
@@ -71,12 +71,12 @@ protected void buildHashTable(RowSequence rowSequence, Chunk[] sourceKeyChunks,
             int tableLocation = firstTableLocation;
             MAIN_SEARCH: while (true) {
                 int rowState = stateSource.getUnsafe(tableLocation);
-                if (rowState == EMPTY_RIGHT_VALUE) {
+                if (isStateEmpty(rowState)) {
                     final int firstAlternateTableLocation = hashToTableLocationAlternate(hash);
                     int alternateTableLocation = firstAlternateTableLocation;
                     while (alternateTableLocation < rehashPointer) {
                         rowState = alternateStateSource.getUnsafe(alternateTableLocation);
-                        if (rowState == EMPTY_RIGHT_VALUE) {
+                        if (isStateEmpty(rowState)) {
                             break;
                         } else if (eq(alternateKeySource0.getUnsafe(alternateTableLocation), k0) && eq(alternateKeySource1.getUnsafe(alternateTableLocation), k1)) {
                             // map the existing bucket to this chunk position;
@@ -122,7 +122,7 @@ protected void probeHashTable(RowSequence rowSequence, Chunk[] sourceKeyChunks,
             boolean found = false;
             int tableLocation = firstTableLocation;
             int rowState;
-            while ((rowState = stateSource.getUnsafe(tableLocation)) != EMPTY_RIGHT_VALUE) {
+            while (!isStateEmpty(rowState = stateSource.getUnsafe(tableLocation))) {
                 if (eq(mainKeySource0.getUnsafe(tableLocation), k0) && eq(mainKeySource1.getUnsafe(tableLocation), k1)) {
                     // map the existing bucket to this chunk position;
                     outputPositions.set(chunkPosition, rowState);
@@ -137,7 +137,7 @@ protected void probeHashTable(RowSequence rowSequence, Chunk[] sourceKeyChunks,
                 boolean alternateFound = false;
                 if (firstAlternateTableLocation < rehashPointer) {
                     int alternateTableLocation = firstAlternateTableLocation;
-                    while ((rowState = alternateStateSource.getUnsafe(alternateTableLocation)) != EMPTY_RIGHT_VALUE) {
+                    while (!isStateEmpty(rowState = alternateStateSource.getUnsafe(alternateTableLocation))) {
                         if (eq(alternateKeySource0.getUnsafe(alternateTableLocation), k0) && eq(alternateKeySource1.getUnsafe(alternateTableLocation), k1)) {
                             // map the existing bucket (from alternate) to this chunk position;
                             outputPositions.set(chunkPosition, rowState);
@@ -162,17 +162,21 @@ private static int hash(char k0, float k1) {
         return hash;
     }
 
+    private static boolean isStateEmpty(int state) {
+        return state == EMPTY_RIGHT_VALUE;
+    }
+
     private boolean migrateOneLocation(int locationToMigrate,
             WritableIntChunk<RowKeys> outputPositions) {
         final int currentStateValue = alternateStateSource.getUnsafe(locationToMigrate);
-        if (currentStateValue == EMPTY_RIGHT_VALUE) {
+        if (isStateEmpty(currentStateValue)) {
             return false;
         }
         final char k0 = alternateKeySource0.getUnsafe(locationToMigrate);
         final float k1 = alternateKeySource1.getUnsafe(locationToMigrate);
         final int hash = hash(k0, k1);
         int destinationTableLocation = hashToTableLocation(hash);
-        while (stateSource.getUnsafe(destinationTableLocation) != EMPTY_RIGHT_VALUE) {
+        while (!isStateEmpty(stateSource.getUnsafe(destinationTableLocation))) {
             destinationTableLocation = nextTableLocation(destinationTableLocation);
         }
         mainKeySource0.set(destinationTableLocation, k0);
@@ -195,8 +199,7 @@ protected int rehashInternalPartial(int entriesToRehash,
     }
 
     @Override
-    protected void newAlternate() {
-        super.newAlternate();
+    protected void adviseNewAlternate() {
         this.mainKeySource0 = (ImmutableCharArraySource)super.mainKeySources[0];
         this.alternateKeySource0 = (ImmutableCharArraySource)super.alternateKeySources[0];
         this.mainKeySource1 = (ImmutableFloatArraySource)super.mainKeySources[1];
@@ -213,7 +216,7 @@ protected void clearAlternate() {
     @Override
     protected void migrateFront(WritableIntChunk<RowKeys> outputPositions) {
         int location = 0;
-        while (migrateOneLocation(location++, outputPositions));
+        while (migrateOneLocation(location++, outputPositions) && location < alternateTableSize);
     }
 
     @Override
@@ -230,7 +233,7 @@ protected void rehashInternalFull(final int oldSize) {
         stateSource.setArray(destState);
         for (int sourceBucket = 0; sourceBucket < oldSize; ++sourceBucket) {
             final int currentStateValue = originalStateArray[sourceBucket];
-            if (currentStateValue == EMPTY_RIGHT_VALUE) {
+            if (isStateEmpty(currentStateValue)) {
                 continue;
             }
             final char k0 = originalKeyArray0[sourceBucket];
@@ -239,7 +242,7 @@ protected void rehashInternalFull(final int oldSize) {
             final int firstDestinationTableLocation = hashToTableLocation(hash);
             int destinationTableLocation = firstDestinationTableLocation;
             while (true) {
-                if (destState[destinationTableLocation] == EMPTY_RIGHT_VALUE) {
+                if (isStateEmpty(destState[destinationTableLocation])) {
                     destKeyArray0[destinationTableLocation] = k0;
                     destKeyArray1[destinationTableLocation] = k1;
                     destState[destinationTableLocation] = originalStateArray[sourceBucket];
diff --git a/engine/table/src/main/java/io/deephaven/engine/table/impl/updateby/hashing/typed/open/gen/UpdateByHasherCharInt.java b/engine/table/src/main/java/io/deephaven/engine/table/impl/updateby/hashing/typed/open/gen/UpdateByHasherCharInt.java
index ff8e2e5bb67..0e29858310a 100644
--- a/engine/table/src/main/java/io/deephaven/engine/table/impl/updateby/hashing/typed/open/gen/UpdateByHasherCharInt.java
+++ b/engine/table/src/main/java/io/deephaven/engine/table/impl/updateby/hashing/typed/open/gen/UpdateByHasherCharInt.java
@@ -71,12 +71,12 @@ protected void buildHashTable(RowSequence rowSequence, Chunk[] sourceKeyChunks,
             int tableLocation = firstTableLocation;
             MAIN_SEARCH: while (true) {
                 int rowState = stateSource.getUnsafe(tableLocation);
-                if (rowState == EMPTY_RIGHT_VALUE) {
+                if (isStateEmpty(rowState)) {
                     final int firstAlternateTableLocation = hashToTableLocationAlternate(hash);
                     int alternateTableLocation = firstAlternateTableLocation;
                     while (alternateTableLocation < rehashPointer) {
                         rowState = alternateStateSource.getUnsafe(alternateTableLocation);
-                        if (rowState == EMPTY_RIGHT_VALUE) {
+                        if (isStateEmpty(rowState)) {
                             break;
                         } else if (eq(alternateKeySource0.getUnsafe(alternateTableLocation), k0) && eq(alternateKeySource1.getUnsafe(alternateTableLocation), k1)) {
                             // map the existing bucket to this chunk position;
@@ -122,7 +122,7 @@ protected void probeHashTable(RowSequence rowSequence, Chunk[] sourceKeyChunks,
             boolean found = false;
             int tableLocation = firstTableLocation;
             int rowState;
-            while ((rowState = stateSource.getUnsafe(tableLocation)) != EMPTY_RIGHT_VALUE) {
+            while (!isStateEmpty(rowState = stateSource.getUnsafe(tableLocation))) {
                 if (eq(mainKeySource0.getUnsafe(tableLocation), k0) && eq(mainKeySource1.getUnsafe(tableLocation), k1)) {
                     // map the existing bucket to this chunk position;
                     outputPositions.set(chunkPosition, rowState);
@@ -137,7 +137,7 @@ protected void probeHashTable(RowSequence rowSequence, Chunk[] sourceKeyChunks,
                 boolean alternateFound = false;
                 if (firstAlternateTableLocation < rehashPointer) {
                     int alternateTableLocation = firstAlternateTableLocation;
-                    while ((rowState = alternateStateSource.getUnsafe(alternateTableLocation)) != EMPTY_RIGHT_VALUE) {
+                    while (!isStateEmpty(rowState = alternateStateSource.getUnsafe(alternateTableLocation))) {
                         if (eq(alternateKeySource0.getUnsafe(alternateTableLocation), k0) && eq(alternateKeySource1.getUnsafe(alternateTableLocation), k1)) {
                             // map the existing bucket (from alternate) to this chunk position;
                             outputPositions.set(chunkPosition, rowState);
@@ -162,17 +162,21 @@ private static int hash(char k0, int k1) {
         return hash;
     }
 
+    private static boolean isStateEmpty(int state) {
+        return state == EMPTY_RIGHT_VALUE;
+    }
+
     private boolean migrateOneLocation(int locationToMigrate,
             WritableIntChunk<RowKeys> outputPositions) {
         final int currentStateValue = alternateStateSource.getUnsafe(locationToMigrate);
-        if (currentStateValue == EMPTY_RIGHT_VALUE) {
+        if (isStateEmpty(currentStateValue)) {
             return false;
         }
         final char k0 = alternateKeySource0.getUnsafe(locationToMigrate);
         final int k1 = alternateKeySource1.getUnsafe(locationToMigrate);
         final int hash = hash(k0, k1);
         int destinationTableLocation = hashToTableLocation(hash);
-        while (stateSource.getUnsafe(destinationTableLocation) != EMPTY_RIGHT_VALUE) {
+        while (!isStateEmpty(stateSource.getUnsafe(destinationTableLocation))) {
             destinationTableLocation = nextTableLocation(destinationTableLocation);
         }
         mainKeySource0.set(destinationTableLocation, k0);
@@ -195,8 +199,7 @@ protected int rehashInternalPartial(int entriesToRehash,
     }
 
     @Override
-    protected void newAlternate() {
-        super.newAlternate();
+    protected void adviseNewAlternate() {
         this.mainKeySource0 = (ImmutableCharArraySource)super.mainKeySources[0];
         this.alternateKeySource0 = (ImmutableCharArraySource)super.alternateKeySources[0];
         this.mainKeySource1 = (ImmutableIntArraySource)super.mainKeySources[1];
@@ -213,7 +216,7 @@ protected void clearAlternate() {
     @Override
     protected void migrateFront(WritableIntChunk<RowKeys> outputPositions) {
         int location = 0;
-        while (migrateOneLocation(location++, outputPositions));
+        while (migrateOneLocation(location++, outputPositions) && location < alternateTableSize);
     }
 
     @Override
@@ -230,7 +233,7 @@ protected void rehashInternalFull(final int oldSize) {
         stateSource.setArray(destState);
         for (int sourceBucket = 0; sourceBucket < oldSize; ++sourceBucket) {
             final int currentStateValue = originalStateArray[sourceBucket];
-            if (currentStateValue == EMPTY_RIGHT_VALUE) {
+            if (isStateEmpty(currentStateValue)) {
                 continue;
             }
             final char k0 = originalKeyArray0[sourceBucket];
@@ -239,7 +242,7 @@ protected void rehashInternalFull(final int oldSize) {
             final int firstDestinationTableLocation = hashToTableLocation(hash);
             int destinationTableLocation = firstDestinationTableLocation;
             while (true) {
-                if (destState[destinationTableLocation] == EMPTY_RIGHT_VALUE) {
+                if (isStateEmpty(destState[destinationTableLocation])) {
                     destKeyArray0[destinationTableLocation] = k0;
                     destKeyArray1[destinationTableLocation] = k1;
                     destState[destinationTableLocation] = originalStateArray[sourceBucket];
diff --git a/engine/table/src/main/java/io/deephaven/engine/table/impl/updateby/hashing/typed/open/gen/UpdateByHasherCharLong.java b/engine/table/src/main/java/io/deephaven/engine/table/impl/updateby/hashing/typed/open/gen/UpdateByHasherCharLong.java
index b7c750a1124..df5bcfb9385 100644
--- a/engine/table/src/main/java/io/deephaven/engine/table/impl/updateby/hashing/typed/open/gen/UpdateByHasherCharLong.java
+++ b/engine/table/src/main/java/io/deephaven/engine/table/impl/updateby/hashing/typed/open/gen/UpdateByHasherCharLong.java
@@ -70,12 +70,12 @@ protected void buildHashTable(RowSequence rowSequence, Chunk[] sourceKeyChunks,
             int tableLocation = firstTableLocation;
             MAIN_SEARCH: while (true) {
                 int rowState = stateSource.getUnsafe(tableLocation);
-                if (rowState == EMPTY_RIGHT_VALUE) {
+                if (isStateEmpty(rowState)) {
                     final int firstAlternateTableLocation = hashToTableLocationAlternate(hash);
                     int alternateTableLocation = firstAlternateTableLocation;
                     while (alternateTableLocation < rehashPointer) {
                         rowState = alternateStateSource.getUnsafe(alternateTableLocation);
-                        if (rowState == EMPTY_RIGHT_VALUE) {
+                        if (isStateEmpty(rowState)) {
                             break;
                         } else if (eq(alternateKeySource0.getUnsafe(alternateTableLocation), k0) && eq(alternateKeySource1.getUnsafe(alternateTableLocation), k1)) {
                             // map the existing bucket to this chunk position;
@@ -121,7 +121,7 @@ protected void probeHashTable(RowSequence rowSequence, Chunk[] sourceKeyChunks,
             boolean found = false;
             int tableLocation = firstTableLocation;
             int rowState;
-            while ((rowState = stateSource.getUnsafe(tableLocation)) != EMPTY_RIGHT_VALUE) {
+            while (!isStateEmpty(rowState = stateSource.getUnsafe(tableLocation))) {
                 if (eq(mainKeySource0.getUnsafe(tableLocation), k0) && eq(mainKeySource1.getUnsafe(tableLocation), k1)) {
                     // map the existing bucket to this chunk position;
                     outputPositions.set(chunkPosition, rowState);
@@ -136,7 +136,7 @@ protected void probeHashTable(RowSequence rowSequence, Chunk[] sourceKeyChunks,
                 boolean alternateFound = false;
                 if (firstAlternateTableLocation < rehashPointer) {
                     int alternateTableLocation = firstAlternateTableLocation;
-                    while ((rowState = alternateStateSource.getUnsafe(alternateTableLocation)) != EMPTY_RIGHT_VALUE) {
+                    while (!isStateEmpty(rowState = alternateStateSource.getUnsafe(alternateTableLocation))) {
                         if (eq(alternateKeySource0.getUnsafe(alternateTableLocation), k0) && eq(alternateKeySource1.getUnsafe(alternateTableLocation), k1)) {
                             // map the existing bucket (from alternate) to this chunk position;
                             outputPositions.set(chunkPosition, rowState);
@@ -161,17 +161,21 @@ private static int hash(char k0, long k1) {
         return hash;
     }
 
+    private static boolean isStateEmpty(int state) {
+        return state == EMPTY_RIGHT_VALUE;
+    }
+
     private boolean migrateOneLocation(int locationToMigrate,
             WritableIntChunk<RowKeys> outputPositions) {
         final int currentStateValue = alternateStateSource.getUnsafe(locationToMigrate);
-        if (currentStateValue == EMPTY_RIGHT_VALUE) {
+        if (isStateEmpty(currentStateValue)) {
             return false;
         }
         final char k0 = alternateKeySource0.getUnsafe(locationToMigrate);
         final long k1 = alternateKeySource1.getUnsafe(locationToMigrate);
         final int hash = hash(k0, k1);
         int destinationTableLocation = hashToTableLocation(hash);
-        while (stateSource.getUnsafe(destinationTableLocation) != EMPTY_RIGHT_VALUE) {
+        while (!isStateEmpty(stateSource.getUnsafe(destinationTableLocation))) {
             destinationTableLocation = nextTableLocation(destinationTableLocation);
         }
         mainKeySource0.set(destinationTableLocation, k0);
@@ -194,8 +198,7 @@ protected int rehashInternalPartial(int entriesToRehash,
     }
 
     @Override
-    protected void newAlternate() {
-        super.newAlternate();
+    protected void adviseNewAlternate() {
         this.mainKeySource0 = (ImmutableCharArraySource)super.mainKeySources[0];
         this.alternateKeySource0 = (ImmutableCharArraySource)super.alternateKeySources[0];
         this.mainKeySource1 = (ImmutableLongArraySource)super.mainKeySources[1];
@@ -212,7 +215,7 @@ protected void clearAlternate() {
     @Override
     protected void migrateFront(WritableIntChunk<RowKeys> outputPositions) {
         int location = 0;
-        while (migrateOneLocation(location++, outputPositions));
+        while (migrateOneLocation(location++, outputPositions) && location < alternateTableSize);
     }
 
     @Override
@@ -229,7 +232,7 @@ protected void rehashInternalFull(final int oldSize) {
         stateSource.setArray(destState);
         for (int sourceBucket = 0; sourceBucket < oldSize; ++sourceBucket) {
             final int currentStateValue = originalStateArray[sourceBucket];
-            if (currentStateValue == EMPTY_RIGHT_VALUE) {
+            if (isStateEmpty(currentStateValue)) {
                 continue;
             }
             final char k0 = originalKeyArray0[sourceBucket];
@@ -238,7 +241,7 @@ protected void rehashInternalFull(final int oldSize) {
             final int firstDestinationTableLocation = hashToTableLocation(hash);
             int destinationTableLocation = firstDestinationTableLocation;
             while (true) {
-                if (destState[destinationTableLocation] == EMPTY_RIGHT_VALUE) {
+                if (isStateEmpty(destState[destinationTableLocation])) {
                     destKeyArray0[destinationTableLocation] = k0;
                     destKeyArray1[destinationTableLocation] = k1;
                     destState[destinationTableLocation] = originalStateArray[sourceBucket];
diff --git a/engine/table/src/main/java/io/deephaven/engine/table/impl/updateby/hashing/typed/open/gen/UpdateByHasherCharObject.java b/engine/table/src/main/java/io/deephaven/engine/table/impl/updateby/hashing/typed/open/gen/UpdateByHasherCharObject.java
index a84e4d786c6..0fe663d8952 100644
--- a/engine/table/src/main/java/io/deephaven/engine/table/impl/updateby/hashing/typed/open/gen/UpdateByHasherCharObject.java
+++ b/engine/table/src/main/java/io/deephaven/engine/table/impl/updateby/hashing/typed/open/gen/UpdateByHasherCharObject.java
@@ -72,12 +72,12 @@ protected void buildHashTable(RowSequence rowSequence, Chunk[] sourceKeyChunks,
             int tableLocation = firstTableLocation;
             MAIN_SEARCH: while (true) {
                 int rowState = stateSource.getUnsafe(tableLocation);
-                if (rowState == EMPTY_RIGHT_VALUE) {
+                if (isStateEmpty(rowState)) {
                     final int firstAlternateTableLocation = hashToTableLocationAlternate(hash);
                     int alternateTableLocation = firstAlternateTableLocation;
                     while (alternateTableLocation < rehashPointer) {
                         rowState = alternateStateSource.getUnsafe(alternateTableLocation);
-                        if (rowState == EMPTY_RIGHT_VALUE) {
+                        if (isStateEmpty(rowState)) {
                             break;
                         } else if (eq(alternateKeySource0.getUnsafe(alternateTableLocation), k0) && eq(alternateKeySource1.getUnsafe(alternateTableLocation), k1)) {
                             // map the existing bucket to this chunk position;
@@ -123,7 +123,7 @@ protected void probeHashTable(RowSequence rowSequence, Chunk[] sourceKeyChunks,
             boolean found = false;
             int tableLocation = firstTableLocation;
             int rowState;
-            while ((rowState = stateSource.getUnsafe(tableLocation)) != EMPTY_RIGHT_VALUE) {
+            while (!isStateEmpty(rowState = stateSource.getUnsafe(tableLocation))) {
                 if (eq(mainKeySource0.getUnsafe(tableLocation), k0) && eq(mainKeySource1.getUnsafe(tableLocation), k1)) {
                     // map the existing bucket to this chunk position;
                     outputPositions.set(chunkPosition, rowState);
@@ -138,7 +138,7 @@ protected void probeHashTable(RowSequence rowSequence, Chunk[] sourceKeyChunks,
                 boolean alternateFound = false;
                 if (firstAlternateTableLocation < rehashPointer) {
                     int alternateTableLocation = firstAlternateTableLocation;
-                    while ((rowState = alternateStateSource.getUnsafe(alternateTableLocation)) != EMPTY_RIGHT_VALUE) {
+                    while (!isStateEmpty(rowState = alternateStateSource.getUnsafe(alternateTableLocation))) {
                         if (eq(alternateKeySource0.getUnsafe(alternateTableLocation), k0) && eq(alternateKeySource1.getUnsafe(alternateTableLocation), k1)) {
                             // map the existing bucket (from alternate) to this chunk position;
                             outputPositions.set(chunkPosition, rowState);
@@ -163,17 +163,21 @@ private static int hash(char k0, Object k1) {
         return hash;
     }
 
+    private static boolean isStateEmpty(int state) {
+        return state == EMPTY_RIGHT_VALUE;
+    }
+
     private boolean migrateOneLocation(int locationToMigrate,
             WritableIntChunk<RowKeys> outputPositions) {
         final int currentStateValue = alternateStateSource.getUnsafe(locationToMigrate);
-        if (currentStateValue == EMPTY_RIGHT_VALUE) {
+        if (isStateEmpty(currentStateValue)) {
             return false;
         }
         final char k0 = alternateKeySource0.getUnsafe(locationToMigrate);
         final Object k1 = alternateKeySource1.getUnsafe(locationToMigrate);
         final int hash = hash(k0, k1);
         int destinationTableLocation = hashToTableLocation(hash);
-        while (stateSource.getUnsafe(destinationTableLocation) != EMPTY_RIGHT_VALUE) {
+        while (!isStateEmpty(stateSource.getUnsafe(destinationTableLocation))) {
             destinationTableLocation = nextTableLocation(destinationTableLocation);
         }
         mainKeySource0.set(destinationTableLocation, k0);
@@ -197,8 +201,7 @@ protected int rehashInternalPartial(int entriesToRehash,
     }
 
     @Override
-    protected void newAlternate() {
-        super.newAlternate();
+    protected void adviseNewAlternate() {
         this.mainKeySource0 = (ImmutableCharArraySource)super.mainKeySources[0];
         this.alternateKeySource0 = (ImmutableCharArraySource)super.alternateKeySources[0];
         this.mainKeySource1 = (ImmutableObjectArraySource)super.mainKeySources[1];
@@ -215,7 +218,7 @@ protected void clearAlternate() {
     @Override
     protected void migrateFront(WritableIntChunk<RowKeys> outputPositions) {
         int location = 0;
-        while (migrateOneLocation(location++, outputPositions));
+        while (migrateOneLocation(location++, outputPositions) && location < alternateTableSize);
     }
 
     @Override
@@ -232,7 +235,7 @@ protected void rehashInternalFull(final int oldSize) {
         stateSource.setArray(destState);
         for (int sourceBucket = 0; sourceBucket < oldSize; ++sourceBucket) {
             final int currentStateValue = originalStateArray[sourceBucket];
-            if (currentStateValue == EMPTY_RIGHT_VALUE) {
+            if (isStateEmpty(currentStateValue)) {
                 continue;
             }
             final char k0 = originalKeyArray0[sourceBucket];
@@ -241,7 +244,7 @@ protected void rehashInternalFull(final int oldSize) {
             final int firstDestinationTableLocation = hashToTableLocation(hash);
             int destinationTableLocation = firstDestinationTableLocation;
             while (true) {
-                if (destState[destinationTableLocation] == EMPTY_RIGHT_VALUE) {
+                if (isStateEmpty(destState[destinationTableLocation])) {
                     destKeyArray0[destinationTableLocation] = k0;
                     destKeyArray1[destinationTableLocation] = k1;
                     destState[destinationTableLocation] = originalStateArray[sourceBucket];
diff --git a/engine/table/src/main/java/io/deephaven/engine/table/impl/updateby/hashing/typed/open/gen/UpdateByHasherCharShort.java b/engine/table/src/main/java/io/deephaven/engine/table/impl/updateby/hashing/typed/open/gen/UpdateByHasherCharShort.java
index d800c537c2e..03c2328730e 100644
--- a/engine/table/src/main/java/io/deephaven/engine/table/impl/updateby/hashing/typed/open/gen/UpdateByHasherCharShort.java
+++ b/engine/table/src/main/java/io/deephaven/engine/table/impl/updateby/hashing/typed/open/gen/UpdateByHasherCharShort.java
@@ -71,12 +71,12 @@ protected void buildHashTable(RowSequence rowSequence, Chunk[] sourceKeyChunks,
             int tableLocation = firstTableLocation;
             MAIN_SEARCH: while (true) {
                 int rowState = stateSource.getUnsafe(tableLocation);
-                if (rowState == EMPTY_RIGHT_VALUE) {
+                if (isStateEmpty(rowState)) {
                     final int firstAlternateTableLocation = hashToTableLocationAlternate(hash);
                     int alternateTableLocation = firstAlternateTableLocation;
                     while (alternateTableLocation < rehashPointer) {
                         rowState = alternateStateSource.getUnsafe(alternateTableLocation);
-                        if (rowState == EMPTY_RIGHT_VALUE) {
+                        if (isStateEmpty(rowState)) {
                             break;
                         } else if (eq(alternateKeySource0.getUnsafe(alternateTableLocation), k0) && eq(alternateKeySource1.getUnsafe(alternateTableLocation), k1)) {
                             // map the existing bucket to this chunk position;
@@ -122,7 +122,7 @@ protected void probeHashTable(RowSequence rowSequence, Chunk[] sourceKeyChunks,
             boolean found = false;
             int tableLocation = firstTableLocation;
             int rowState;
-            while ((rowState = stateSource.getUnsafe(tableLocation)) != EMPTY_RIGHT_VALUE) {
+            while (!isStateEmpty(rowState = stateSource.getUnsafe(tableLocation))) {
                 if (eq(mainKeySource0.getUnsafe(tableLocation), k0) && eq(mainKeySource1.getUnsafe(tableLocation), k1)) {
                     // map the existing bucket to this chunk position;
                     outputPositions.set(chunkPosition, rowState);
@@ -137,7 +137,7 @@ protected void probeHashTable(RowSequence rowSequence, Chunk[] sourceKeyChunks,
                 boolean alternateFound = false;
                 if (firstAlternateTableLocation < rehashPointer) {
                     int alternateTableLocation = firstAlternateTableLocation;
-                    while ((rowState = alternateStateSource.getUnsafe(alternateTableLocation)) != EMPTY_RIGHT_VALUE) {
+                    while (!isStateEmpty(rowState = alternateStateSource.getUnsafe(alternateTableLocation))) {
                         if (eq(alternateKeySource0.getUnsafe(alternateTableLocation), k0) && eq(alternateKeySource1.getUnsafe(alternateTableLocation), k1)) {
                             // map the existing bucket (from alternate) to this chunk position;
                             outputPositions.set(chunkPosition, rowState);
@@ -162,17 +162,21 @@ private static int hash(char k0, short k1) {
         return hash;
     }
 
+    private static boolean isStateEmpty(int state) {
+        return state == EMPTY_RIGHT_VALUE;
+    }
+
     private boolean migrateOneLocation(int locationToMigrate,
             WritableIntChunk<RowKeys> outputPositions) {
         final int currentStateValue = alternateStateSource.getUnsafe(locationToMigrate);
-        if (currentStateValue == EMPTY_RIGHT_VALUE) {
+        if (isStateEmpty(currentStateValue)) {
             return false;
         }
         final char k0 = alternateKeySource0.getUnsafe(locationToMigrate);
         final short k1 = alternateKeySource1.getUnsafe(locationToMigrate);
         final int hash = hash(k0, k1);
         int destinationTableLocation = hashToTableLocation(hash);
-        while (stateSource.getUnsafe(destinationTableLocation) != EMPTY_RIGHT_VALUE) {
+        while (!isStateEmpty(stateSource.getUnsafe(destinationTableLocation))) {
             destinationTableLocation = nextTableLocation(destinationTableLocation);
         }
         mainKeySource0.set(destinationTableLocation, k0);
@@ -195,8 +199,7 @@ protected int rehashInternalPartial(int entriesToRehash,
     }
 
     @Override
-    protected void newAlternate() {
-        super.newAlternate();
+    protected void adviseNewAlternate() {
         this.mainKeySource0 = (ImmutableCharArraySource)super.mainKeySources[0];
         this.alternateKeySource0 = (ImmutableCharArraySource)super.alternateKeySources[0];
         this.mainKeySource1 = (ImmutableShortArraySource)super.mainKeySources[1];
@@ -213,7 +216,7 @@ protected void clearAlternate() {
     @Override
     protected void migrateFront(WritableIntChunk<RowKeys> outputPositions) {
         int location = 0;
-        while (migrateOneLocation(location++, outputPositions));
+        while (migrateOneLocation(location++, outputPositions) && location < alternateTableSize);
     }
 
     @Override
@@ -230,7 +233,7 @@ protected void rehashInternalFull(final int oldSize) {
         stateSource.setArray(destState);
         for (int sourceBucket = 0; sourceBucket < oldSize; ++sourceBucket) {
             final int currentStateValue = originalStateArray[sourceBucket];
-            if (currentStateValue == EMPTY_RIGHT_VALUE) {
+            if (isStateEmpty(currentStateValue)) {
                 continue;
             }
             final char k0 = originalKeyArray0[sourceBucket];
@@ -239,7 +242,7 @@ protected void rehashInternalFull(final int oldSize) {
             final int firstDestinationTableLocation = hashToTableLocation(hash);
             int destinationTableLocation = firstDestinationTableLocation;
             while (true) {
-                if (destState[destinationTableLocation] == EMPTY_RIGHT_VALUE) {
+                if (isStateEmpty(destState[destinationTableLocation])) {
                     destKeyArray0[destinationTableLocation] = k0;
                     destKeyArray1[destinationTableLocation] = k1;
                     destState[destinationTableLocation] = originalStateArray[sourceBucket];
diff --git a/engine/table/src/main/java/io/deephaven/engine/table/impl/updateby/hashing/typed/open/gen/UpdateByHasherDouble.java b/engine/table/src/main/java/io/deephaven/engine/table/impl/updateby/hashing/typed/open/gen/UpdateByHasherDouble.java
index c05c73951c2..04ebd6b7bbc 100644
--- a/engine/table/src/main/java/io/deephaven/engine/table/impl/updateby/hashing/typed/open/gen/UpdateByHasherDouble.java
+++ b/engine/table/src/main/java/io/deephaven/engine/table/impl/updateby/hashing/typed/open/gen/UpdateByHasherDouble.java
@@ -59,12 +59,12 @@ protected void buildHashTable(RowSequence rowSequence, Chunk[] sourceKeyChunks,
             int tableLocation = firstTableLocation;
             MAIN_SEARCH: while (true) {
                 int rowState = stateSource.getUnsafe(tableLocation);
-                if (rowState == EMPTY_RIGHT_VALUE) {
+                if (isStateEmpty(rowState)) {
                     final int firstAlternateTableLocation = hashToTableLocationAlternate(hash);
                     int alternateTableLocation = firstAlternateTableLocation;
                     while (alternateTableLocation < rehashPointer) {
                         rowState = alternateStateSource.getUnsafe(alternateTableLocation);
-                        if (rowState == EMPTY_RIGHT_VALUE) {
+                        if (isStateEmpty(rowState)) {
                             break;
                         } else if (eq(alternateKeySource0.getUnsafe(alternateTableLocation), k0)) {
                             // map the existing bucket to this chunk position;
@@ -107,7 +107,7 @@ protected void probeHashTable(RowSequence rowSequence, Chunk[] sourceKeyChunks,
             boolean found = false;
             int tableLocation = firstTableLocation;
             int rowState;
-            while ((rowState = stateSource.getUnsafe(tableLocation)) != EMPTY_RIGHT_VALUE) {
+            while (!isStateEmpty(rowState = stateSource.getUnsafe(tableLocation))) {
                 if (eq(mainKeySource0.getUnsafe(tableLocation), k0)) {
                     // map the existing bucket to this chunk position;
                     outputPositions.set(chunkPosition, rowState);
@@ -122,7 +122,7 @@ protected void probeHashTable(RowSequence rowSequence, Chunk[] sourceKeyChunks,
                 boolean alternateFound = false;
                 if (firstAlternateTableLocation < rehashPointer) {
                     int alternateTableLocation = firstAlternateTableLocation;
-                    while ((rowState = alternateStateSource.getUnsafe(alternateTableLocation)) != EMPTY_RIGHT_VALUE) {
+                    while (!isStateEmpty(rowState = alternateStateSource.getUnsafe(alternateTableLocation))) {
                         if (eq(alternateKeySource0.getUnsafe(alternateTableLocation), k0)) {
                             // map the existing bucket (from alternate) to this chunk position;
                             outputPositions.set(chunkPosition, rowState);
@@ -146,16 +146,20 @@ private static int hash(double k0) {
         return hash;
     }
 
+    private static boolean isStateEmpty(int state) {
+        return state == EMPTY_RIGHT_VALUE;
+    }
+
     private boolean migrateOneLocation(int locationToMigrate,
             WritableIntChunk<RowKeys> outputPositions) {
         final int currentStateValue = alternateStateSource.getUnsafe(locationToMigrate);
-        if (currentStateValue == EMPTY_RIGHT_VALUE) {
+        if (isStateEmpty(currentStateValue)) {
             return false;
         }
         final double k0 = alternateKeySource0.getUnsafe(locationToMigrate);
         final int hash = hash(k0);
         int destinationTableLocation = hashToTableLocation(hash);
-        while (stateSource.getUnsafe(destinationTableLocation) != EMPTY_RIGHT_VALUE) {
+        while (!isStateEmpty(stateSource.getUnsafe(destinationTableLocation))) {
             destinationTableLocation = nextTableLocation(destinationTableLocation);
         }
         mainKeySource0.set(destinationTableLocation, k0);
@@ -177,8 +181,7 @@ protected int rehashInternalPartial(int entriesToRehash,
     }
 
     @Override
-    protected void newAlternate() {
-        super.newAlternate();
+    protected void adviseNewAlternate() {
         this.mainKeySource0 = (ImmutableDoubleArraySource)super.mainKeySources[0];
         this.alternateKeySource0 = (ImmutableDoubleArraySource)super.alternateKeySources[0];
     }
@@ -192,7 +195,7 @@ protected void clearAlternate() {
     @Override
     protected void migrateFront(WritableIntChunk<RowKeys> outputPositions) {
         int location = 0;
-        while (migrateOneLocation(location++, outputPositions));
+        while (migrateOneLocation(location++, outputPositions) && location < alternateTableSize);
     }
 
     @Override
@@ -206,7 +209,7 @@ protected void rehashInternalFull(final int oldSize) {
         stateSource.setArray(destState);
         for (int sourceBucket = 0; sourceBucket < oldSize; ++sourceBucket) {
             final int currentStateValue = originalStateArray[sourceBucket];
-            if (currentStateValue == EMPTY_RIGHT_VALUE) {
+            if (isStateEmpty(currentStateValue)) {
                 continue;
             }
             final double k0 = originalKeyArray0[sourceBucket];
@@ -214,7 +217,7 @@ protected void rehashInternalFull(final int oldSize) {
             final int firstDestinationTableLocation = hashToTableLocation(hash);
             int destinationTableLocation = firstDestinationTableLocation;
             while (true) {
-                if (destState[destinationTableLocation] == EMPTY_RIGHT_VALUE) {
+                if (isStateEmpty(destState[destinationTableLocation])) {
                     destKeyArray0[destinationTableLocation] = k0;
                     destState[destinationTableLocation] = originalStateArray[sourceBucket];
                     break;
diff --git a/engine/table/src/main/java/io/deephaven/engine/table/impl/updateby/hashing/typed/open/gen/UpdateByHasherDoubleByte.java b/engine/table/src/main/java/io/deephaven/engine/table/impl/updateby/hashing/typed/open/gen/UpdateByHasherDoubleByte.java
index 90413d20d36..81a6b8802a7 100644
--- a/engine/table/src/main/java/io/deephaven/engine/table/impl/updateby/hashing/typed/open/gen/UpdateByHasherDoubleByte.java
+++ b/engine/table/src/main/java/io/deephaven/engine/table/impl/updateby/hashing/typed/open/gen/UpdateByHasherDoubleByte.java
@@ -71,12 +71,12 @@ protected void buildHashTable(RowSequence rowSequence, Chunk[] sourceKeyChunks,
             int tableLocation = firstTableLocation;
             MAIN_SEARCH: while (true) {
                 int rowState = stateSource.getUnsafe(tableLocation);
-                if (rowState == EMPTY_RIGHT_VALUE) {
+                if (isStateEmpty(rowState)) {
                     final int firstAlternateTableLocation = hashToTableLocationAlternate(hash);
                     int alternateTableLocation = firstAlternateTableLocation;
                     while (alternateTableLocation < rehashPointer) {
                         rowState = alternateStateSource.getUnsafe(alternateTableLocation);
-                        if (rowState == EMPTY_RIGHT_VALUE) {
+                        if (isStateEmpty(rowState)) {
                             break;
                         } else if (eq(alternateKeySource0.getUnsafe(alternateTableLocation), k0) && eq(alternateKeySource1.getUnsafe(alternateTableLocation), k1)) {
                             // map the existing bucket to this chunk position;
@@ -122,7 +122,7 @@ protected void probeHashTable(RowSequence rowSequence, Chunk[] sourceKeyChunks,
             boolean found = false;
             int tableLocation = firstTableLocation;
             int rowState;
-            while ((rowState = stateSource.getUnsafe(tableLocation)) != EMPTY_RIGHT_VALUE) {
+            while (!isStateEmpty(rowState = stateSource.getUnsafe(tableLocation))) {
                 if (eq(mainKeySource0.getUnsafe(tableLocation), k0) && eq(mainKeySource1.getUnsafe(tableLocation), k1)) {
                     // map the existing bucket to this chunk position;
                     outputPositions.set(chunkPosition, rowState);
@@ -137,7 +137,7 @@ protected void probeHashTable(RowSequence rowSequence, Chunk[] sourceKeyChunks,
                 boolean alternateFound = false;
                 if (firstAlternateTableLocation < rehashPointer) {
                     int alternateTableLocation = firstAlternateTableLocation;
-                    while ((rowState = alternateStateSource.getUnsafe(alternateTableLocation)) != EMPTY_RIGHT_VALUE) {
+                    while (!isStateEmpty(rowState = alternateStateSource.getUnsafe(alternateTableLocation))) {
                         if (eq(alternateKeySource0.getUnsafe(alternateTableLocation), k0) && eq(alternateKeySource1.getUnsafe(alternateTableLocation), k1)) {
                             // map the existing bucket (from alternate) to this chunk position;
                             outputPositions.set(chunkPosition, rowState);
@@ -162,17 +162,21 @@ private static int hash(double k0, byte k1) {
         return hash;
     }
 
+    private static boolean isStateEmpty(int state) {
+        return state == EMPTY_RIGHT_VALUE;
+    }
+
     private boolean migrateOneLocation(int locationToMigrate,
             WritableIntChunk<RowKeys> outputPositions) {
         final int currentStateValue = alternateStateSource.getUnsafe(locationToMigrate);
-        if (currentStateValue == EMPTY_RIGHT_VALUE) {
+        if (isStateEmpty(currentStateValue)) {
             return false;
         }
         final double k0 = alternateKeySource0.getUnsafe(locationToMigrate);
         final byte k1 = alternateKeySource1.getUnsafe(locationToMigrate);
         final int hash = hash(k0, k1);
         int destinationTableLocation = hashToTableLocation(hash);
-        while (stateSource.getUnsafe(destinationTableLocation) != EMPTY_RIGHT_VALUE) {
+        while (!isStateEmpty(stateSource.getUnsafe(destinationTableLocation))) {
             destinationTableLocation = nextTableLocation(destinationTableLocation);
         }
         mainKeySource0.set(destinationTableLocation, k0);
@@ -195,8 +199,7 @@ protected int rehashInternalPartial(int entriesToRehash,
     }
 
     @Override
-    protected void newAlternate() {
-        super.newAlternate();
+    protected void adviseNewAlternate() {
         this.mainKeySource0 = (ImmutableDoubleArraySource)super.mainKeySources[0];
         this.alternateKeySource0 = (ImmutableDoubleArraySource)super.alternateKeySources[0];
         this.mainKeySource1 = (ImmutableByteArraySource)super.mainKeySources[1];
@@ -213,7 +216,7 @@ protected void clearAlternate() {
     @Override
     protected void migrateFront(WritableIntChunk<RowKeys> outputPositions) {
         int location = 0;
-        while (migrateOneLocation(location++, outputPositions));
+        while (migrateOneLocation(location++, outputPositions) && location < alternateTableSize);
     }
 
     @Override
@@ -230,7 +233,7 @@ protected void rehashInternalFull(final int oldSize) {
         stateSource.setArray(destState);
         for (int sourceBucket = 0; sourceBucket < oldSize; ++sourceBucket) {
             final int currentStateValue = originalStateArray[sourceBucket];
-            if (currentStateValue == EMPTY_RIGHT_VALUE) {
+            if (isStateEmpty(currentStateValue)) {
                 continue;
             }
             final double k0 = originalKeyArray0[sourceBucket];
@@ -239,7 +242,7 @@ protected void rehashInternalFull(final int oldSize) {
             final int firstDestinationTableLocation = hashToTableLocation(hash);
             int destinationTableLocation = firstDestinationTableLocation;
             while (true) {
-                if (destState[destinationTableLocation] == EMPTY_RIGHT_VALUE) {
+                if (isStateEmpty(destState[destinationTableLocation])) {
                     destKeyArray0[destinationTableLocation] = k0;
                     destKeyArray1[destinationTableLocation] = k1;
                     destState[destinationTableLocation] = originalStateArray[sourceBucket];
diff --git a/engine/table/src/main/java/io/deephaven/engine/table/impl/updateby/hashing/typed/open/gen/UpdateByHasherDoubleChar.java b/engine/table/src/main/java/io/deephaven/engine/table/impl/updateby/hashing/typed/open/gen/UpdateByHasherDoubleChar.java
index eaffa0a8f18..6c837623ebb 100644
--- a/engine/table/src/main/java/io/deephaven/engine/table/impl/updateby/hashing/typed/open/gen/UpdateByHasherDoubleChar.java
+++ b/engine/table/src/main/java/io/deephaven/engine/table/impl/updateby/hashing/typed/open/gen/UpdateByHasherDoubleChar.java
@@ -71,12 +71,12 @@ protected void buildHashTable(RowSequence rowSequence, Chunk[] sourceKeyChunks,
             int tableLocation = firstTableLocation;
             MAIN_SEARCH: while (true) {
                 int rowState = stateSource.getUnsafe(tableLocation);
-                if (rowState == EMPTY_RIGHT_VALUE) {
+                if (isStateEmpty(rowState)) {
                     final int firstAlternateTableLocation = hashToTableLocationAlternate(hash);
                     int alternateTableLocation = firstAlternateTableLocation;
                     while (alternateTableLocation < rehashPointer) {
                         rowState = alternateStateSource.getUnsafe(alternateTableLocation);
-                        if (rowState == EMPTY_RIGHT_VALUE) {
+                        if (isStateEmpty(rowState)) {
                             break;
                         } else if (eq(alternateKeySource0.getUnsafe(alternateTableLocation), k0) && eq(alternateKeySource1.getUnsafe(alternateTableLocation), k1)) {
                             // map the existing bucket to this chunk position;
@@ -122,7 +122,7 @@ protected void probeHashTable(RowSequence rowSequence, Chunk[] sourceKeyChunks,
             boolean found = false;
             int tableLocation = firstTableLocation;
             int rowState;
-            while ((rowState = stateSource.getUnsafe(tableLocation)) != EMPTY_RIGHT_VALUE) {
+            while (!isStateEmpty(rowState = stateSource.getUnsafe(tableLocation))) {
                 if (eq(mainKeySource0.getUnsafe(tableLocation), k0) && eq(mainKeySource1.getUnsafe(tableLocation), k1)) {
                     // map the existing bucket to this chunk position;
                     outputPositions.set(chunkPosition, rowState);
@@ -137,7 +137,7 @@ protected void probeHashTable(RowSequence rowSequence, Chunk[] sourceKeyChunks,
                 boolean alternateFound = false;
                 if (firstAlternateTableLocation < rehashPointer) {
                     int alternateTableLocation = firstAlternateTableLocation;
-                    while ((rowState = alternateStateSource.getUnsafe(alternateTableLocation)) != EMPTY_RIGHT_VALUE) {
+                    while (!isStateEmpty(rowState = alternateStateSource.getUnsafe(alternateTableLocation))) {
                         if (eq(alternateKeySource0.getUnsafe(alternateTableLocation), k0) && eq(alternateKeySource1.getUnsafe(alternateTableLocation), k1)) {
                             // map the existing bucket (from alternate) to this chunk position;
                             outputPositions.set(chunkPosition, rowState);
@@ -162,17 +162,21 @@ private static int hash(double k0, char k1) {
         return hash;
     }
 
+    private static boolean isStateEmpty(int state) {
+        return state == EMPTY_RIGHT_VALUE;
+    }
+
     private boolean migrateOneLocation(int locationToMigrate,
             WritableIntChunk<RowKeys> outputPositions) {
         final int currentStateValue = alternateStateSource.getUnsafe(locationToMigrate);
-        if (currentStateValue == EMPTY_RIGHT_VALUE) {
+        if (isStateEmpty(currentStateValue)) {
             return false;
         }
         final double k0 = alternateKeySource0.getUnsafe(locationToMigrate);
         final char k1 = alternateKeySource1.getUnsafe(locationToMigrate);
         final int hash = hash(k0, k1);
         int destinationTableLocation = hashToTableLocation(hash);
-        while (stateSource.getUnsafe(destinationTableLocation) != EMPTY_RIGHT_VALUE) {
+        while (!isStateEmpty(stateSource.getUnsafe(destinationTableLocation))) {
             destinationTableLocation = nextTableLocation(destinationTableLocation);
         }
         mainKeySource0.set(destinationTableLocation, k0);
@@ -195,8 +199,7 @@ protected int rehashInternalPartial(int entriesToRehash,
     }
 
     @Override
-    protected void newAlternate() {
-        super.newAlternate();
+    protected void adviseNewAlternate() {
         this.mainKeySource0 = (ImmutableDoubleArraySource)super.mainKeySources[0];
         this.alternateKeySource0 = (ImmutableDoubleArraySource)super.alternateKeySources[0];
         this.mainKeySource1 = (ImmutableCharArraySource)super.mainKeySources[1];
@@ -213,7 +216,7 @@ protected void clearAlternate() {
     @Override
     protected void migrateFront(WritableIntChunk<RowKeys> outputPositions) {
         int location = 0;
-        while (migrateOneLocation(location++, outputPositions));
+        while (migrateOneLocation(location++, outputPositions) && location < alternateTableSize);
     }
 
     @Override
@@ -230,7 +233,7 @@ protected void rehashInternalFull(final int oldSize) {
         stateSource.setArray(destState);
         for (int sourceBucket = 0; sourceBucket < oldSize; ++sourceBucket) {
             final int currentStateValue = originalStateArray[sourceBucket];
-            if (currentStateValue == EMPTY_RIGHT_VALUE) {
+            if (isStateEmpty(currentStateValue)) {
                 continue;
             }
             final double k0 = originalKeyArray0[sourceBucket];
@@ -239,7 +242,7 @@ protected void rehashInternalFull(final int oldSize) {
             final int firstDestinationTableLocation = hashToTableLocation(hash);
             int destinationTableLocation = firstDestinationTableLocation;
             while (true) {
-                if (destState[destinationTableLocation] == EMPTY_RIGHT_VALUE) {
+                if (isStateEmpty(destState[destinationTableLocation])) {
                     destKeyArray0[destinationTableLocation] = k0;
                     destKeyArray1[destinationTableLocation] = k1;
                     destState[destinationTableLocation] = originalStateArray[sourceBucket];
diff --git a/engine/table/src/main/java/io/deephaven/engine/table/impl/updateby/hashing/typed/open/gen/UpdateByHasherDoubleDouble.java b/engine/table/src/main/java/io/deephaven/engine/table/impl/updateby/hashing/typed/open/gen/UpdateByHasherDoubleDouble.java
index 3994228799c..ec930fdfd68 100644
--- a/engine/table/src/main/java/io/deephaven/engine/table/impl/updateby/hashing/typed/open/gen/UpdateByHasherDoubleDouble.java
+++ b/engine/table/src/main/java/io/deephaven/engine/table/impl/updateby/hashing/typed/open/gen/UpdateByHasherDoubleDouble.java
@@ -67,12 +67,12 @@ protected void buildHashTable(RowSequence rowSequence, Chunk[] sourceKeyChunks,
             int tableLocation = firstTableLocation;
             MAIN_SEARCH: while (true) {
                 int rowState = stateSource.getUnsafe(tableLocation);
-                if (rowState == EMPTY_RIGHT_VALUE) {
+                if (isStateEmpty(rowState)) {
                     final int firstAlternateTableLocation = hashToTableLocationAlternate(hash);
                     int alternateTableLocation = firstAlternateTableLocation;
                     while (alternateTableLocation < rehashPointer) {
                         rowState = alternateStateSource.getUnsafe(alternateTableLocation);
-                        if (rowState == EMPTY_RIGHT_VALUE) {
+                        if (isStateEmpty(rowState)) {
                             break;
                         } else if (eq(alternateKeySource0.getUnsafe(alternateTableLocation), k0) && eq(alternateKeySource1.getUnsafe(alternateTableLocation), k1)) {
                             // map the existing bucket to this chunk position;
@@ -118,7 +118,7 @@ protected void probeHashTable(RowSequence rowSequence, Chunk[] sourceKeyChunks,
             boolean found = false;
             int tableLocation = firstTableLocation;
             int rowState;
-            while ((rowState = stateSource.getUnsafe(tableLocation)) != EMPTY_RIGHT_VALUE) {
+            while (!isStateEmpty(rowState = stateSource.getUnsafe(tableLocation))) {
                 if (eq(mainKeySource0.getUnsafe(tableLocation), k0) && eq(mainKeySource1.getUnsafe(tableLocation), k1)) {
                     // map the existing bucket to this chunk position;
                     outputPositions.set(chunkPosition, rowState);
@@ -133,7 +133,7 @@ protected void probeHashTable(RowSequence rowSequence, Chunk[] sourceKeyChunks,
                 boolean alternateFound = false;
                 if (firstAlternateTableLocation < rehashPointer) {
                     int alternateTableLocation = firstAlternateTableLocation;
-                    while ((rowState = alternateStateSource.getUnsafe(alternateTableLocation)) != EMPTY_RIGHT_VALUE) {
+                    while (!isStateEmpty(rowState = alternateStateSource.getUnsafe(alternateTableLocation))) {
                         if (eq(alternateKeySource0.getUnsafe(alternateTableLocation), k0) && eq(alternateKeySource1.getUnsafe(alternateTableLocation), k1)) {
                             // map the existing bucket (from alternate) to this chunk position;
                             outputPositions.set(chunkPosition, rowState);
@@ -158,17 +158,21 @@ private static int hash(double k0, double k1) {
         return hash;
     }
 
+    private static boolean isStateEmpty(int state) {
+        return state == EMPTY_RIGHT_VALUE;
+    }
+
     private boolean migrateOneLocation(int locationToMigrate,
             WritableIntChunk<RowKeys> outputPositions) {
         final int currentStateValue = alternateStateSource.getUnsafe(locationToMigrate);
-        if (currentStateValue == EMPTY_RIGHT_VALUE) {
+        if (isStateEmpty(currentStateValue)) {
             return false;
         }
         final double k0 = alternateKeySource0.getUnsafe(locationToMigrate);
         final double k1 = alternateKeySource1.getUnsafe(locationToMigrate);
         final int hash = hash(k0, k1);
         int destinationTableLocation = hashToTableLocation(hash);
-        while (stateSource.getUnsafe(destinationTableLocation) != EMPTY_RIGHT_VALUE) {
+        while (!isStateEmpty(stateSource.getUnsafe(destinationTableLocation))) {
             destinationTableLocation = nextTableLocation(destinationTableLocation);
         }
         mainKeySource0.set(destinationTableLocation, k0);
@@ -191,8 +195,7 @@ protected int rehashInternalPartial(int entriesToRehash,
     }
 
     @Override
-    protected void newAlternate() {
-        super.newAlternate();
+    protected void adviseNewAlternate() {
         this.mainKeySource0 = (ImmutableDoubleArraySource)super.mainKeySources[0];
         this.alternateKeySource0 = (ImmutableDoubleArraySource)super.alternateKeySources[0];
         this.mainKeySource1 = (ImmutableDoubleArraySource)super.mainKeySources[1];
@@ -209,7 +212,7 @@ protected void clearAlternate() {
     @Override
     protected void migrateFront(WritableIntChunk<RowKeys> outputPositions) {
         int location = 0;
-        while (migrateOneLocation(location++, outputPositions));
+        while (migrateOneLocation(location++, outputPositions) && location < alternateTableSize);
     }
 
     @Override
@@ -226,7 +229,7 @@ protected void rehashInternalFull(final int oldSize) {
         stateSource.setArray(destState);
         for (int sourceBucket = 0; sourceBucket < oldSize; ++sourceBucket) {
             final int currentStateValue = originalStateArray[sourceBucket];
-            if (currentStateValue == EMPTY_RIGHT_VALUE) {
+            if (isStateEmpty(currentStateValue)) {
                 continue;
             }
             final double k0 = originalKeyArray0[sourceBucket];
@@ -235,7 +238,7 @@ protected void rehashInternalFull(final int oldSize) {
             final int firstDestinationTableLocation = hashToTableLocation(hash);
             int destinationTableLocation = firstDestinationTableLocation;
             while (true) {
-                if (destState[destinationTableLocation] == EMPTY_RIGHT_VALUE) {
+                if (isStateEmpty(destState[destinationTableLocation])) {
                     destKeyArray0[destinationTableLocation] = k0;
                     destKeyArray1[destinationTableLocation] = k1;
                     destState[destinationTableLocation] = originalStateArray[sourceBucket];
diff --git a/engine/table/src/main/java/io/deephaven/engine/table/impl/updateby/hashing/typed/open/gen/UpdateByHasherDoubleFloat.java b/engine/table/src/main/java/io/deephaven/engine/table/impl/updateby/hashing/typed/open/gen/UpdateByHasherDoubleFloat.java
index 5e43d0b4e54..72f5b1aaf08 100644
--- a/engine/table/src/main/java/io/deephaven/engine/table/impl/updateby/hashing/typed/open/gen/UpdateByHasherDoubleFloat.java
+++ b/engine/table/src/main/java/io/deephaven/engine/table/impl/updateby/hashing/typed/open/gen/UpdateByHasherDoubleFloat.java
@@ -71,12 +71,12 @@ protected void buildHashTable(RowSequence rowSequence, Chunk[] sourceKeyChunks,
             int tableLocation = firstTableLocation;
             MAIN_SEARCH: while (true) {
                 int rowState = stateSource.getUnsafe(tableLocation);
-                if (rowState == EMPTY_RIGHT_VALUE) {
+                if (isStateEmpty(rowState)) {
                     final int firstAlternateTableLocation = hashToTableLocationAlternate(hash);
                     int alternateTableLocation = firstAlternateTableLocation;
                     while (alternateTableLocation < rehashPointer) {
                         rowState = alternateStateSource.getUnsafe(alternateTableLocation);
-                        if (rowState == EMPTY_RIGHT_VALUE) {
+                        if (isStateEmpty(rowState)) {
                             break;
                         } else if (eq(alternateKeySource0.getUnsafe(alternateTableLocation), k0) && eq(alternateKeySource1.getUnsafe(alternateTableLocation), k1)) {
                             // map the existing bucket to this chunk position;
@@ -122,7 +122,7 @@ protected void probeHashTable(RowSequence rowSequence, Chunk[] sourceKeyChunks,
             boolean found = false;
             int tableLocation = firstTableLocation;
             int rowState;
-            while ((rowState = stateSource.getUnsafe(tableLocation)) != EMPTY_RIGHT_VALUE) {
+            while (!isStateEmpty(rowState = stateSource.getUnsafe(tableLocation))) {
                 if (eq(mainKeySource0.getUnsafe(tableLocation), k0) && eq(mainKeySource1.getUnsafe(tableLocation), k1)) {
                     // map the existing bucket to this chunk position;
                     outputPositions.set(chunkPosition, rowState);
@@ -137,7 +137,7 @@ protected void probeHashTable(RowSequence rowSequence, Chunk[] sourceKeyChunks,
                 boolean alternateFound = false;
                 if (firstAlternateTableLocation < rehashPointer) {
                     int alternateTableLocation = firstAlternateTableLocation;
-                    while ((rowState = alternateStateSource.getUnsafe(alternateTableLocation)) != EMPTY_RIGHT_VALUE) {
+                    while (!isStateEmpty(rowState = alternateStateSource.getUnsafe(alternateTableLocation))) {
                         if (eq(alternateKeySource0.getUnsafe(alternateTableLocation), k0) && eq(alternateKeySource1.getUnsafe(alternateTableLocation), k1)) {
                             // map the existing bucket (from alternate) to this chunk position;
                             outputPositions.set(chunkPosition, rowState);
@@ -162,17 +162,21 @@ private static int hash(double k0, float k1) {
         return hash;
     }
 
+    private static boolean isStateEmpty(int state) {
+        return state == EMPTY_RIGHT_VALUE;
+    }
+
     private boolean migrateOneLocation(int locationToMigrate,
             WritableIntChunk<RowKeys> outputPositions) {
         final int currentStateValue = alternateStateSource.getUnsafe(locationToMigrate);
-        if (currentStateValue == EMPTY_RIGHT_VALUE) {
+        if (isStateEmpty(currentStateValue)) {
             return false;
         }
         final double k0 = alternateKeySource0.getUnsafe(locationToMigrate);
         final float k1 = alternateKeySource1.getUnsafe(locationToMigrate);
         final int hash = hash(k0, k1);
         int destinationTableLocation = hashToTableLocation(hash);
-        while (stateSource.getUnsafe(destinationTableLocation) != EMPTY_RIGHT_VALUE) {
+        while (!isStateEmpty(stateSource.getUnsafe(destinationTableLocation))) {
             destinationTableLocation = nextTableLocation(destinationTableLocation);
         }
         mainKeySource0.set(destinationTableLocation, k0);
@@ -195,8 +199,7 @@ protected int rehashInternalPartial(int entriesToRehash,
     }
 
     @Override
-    protected void newAlternate() {
-        super.newAlternate();
+    protected void adviseNewAlternate() {
         this.mainKeySource0 = (ImmutableDoubleArraySource)super.mainKeySources[0];
         this.alternateKeySource0 = (ImmutableDoubleArraySource)super.alternateKeySources[0];
         this.mainKeySource1 = (ImmutableFloatArraySource)super.mainKeySources[1];
@@ -213,7 +216,7 @@ protected void clearAlternate() {
     @Override
     protected void migrateFront(WritableIntChunk<RowKeys> outputPositions) {
         int location = 0;
-        while (migrateOneLocation(location++, outputPositions));
+        while (migrateOneLocation(location++, outputPositions) && location < alternateTableSize);
     }
 
     @Override
@@ -230,7 +233,7 @@ protected void rehashInternalFull(final int oldSize) {
         stateSource.setArray(destState);
         for (int sourceBucket = 0; sourceBucket < oldSize; ++sourceBucket) {
             final int currentStateValue = originalStateArray[sourceBucket];
-            if (currentStateValue == EMPTY_RIGHT_VALUE) {
+            if (isStateEmpty(currentStateValue)) {
                 continue;
             }
             final double k0 = originalKeyArray0[sourceBucket];
@@ -239,7 +242,7 @@ protected void rehashInternalFull(final int oldSize) {
             final int firstDestinationTableLocation = hashToTableLocation(hash);
             int destinationTableLocation = firstDestinationTableLocation;
             while (true) {
-                if (destState[destinationTableLocation] == EMPTY_RIGHT_VALUE) {
+                if (isStateEmpty(destState[destinationTableLocation])) {
                     destKeyArray0[destinationTableLocation] = k0;
                     destKeyArray1[destinationTableLocation] = k1;
                     destState[destinationTableLocation] = originalStateArray[sourceBucket];
diff --git a/engine/table/src/main/java/io/deephaven/engine/table/impl/updateby/hashing/typed/open/gen/UpdateByHasherDoubleInt.java b/engine/table/src/main/java/io/deephaven/engine/table/impl/updateby/hashing/typed/open/gen/UpdateByHasherDoubleInt.java
index 3d3b25fa783..b311fe94aae 100644
--- a/engine/table/src/main/java/io/deephaven/engine/table/impl/updateby/hashing/typed/open/gen/UpdateByHasherDoubleInt.java
+++ b/engine/table/src/main/java/io/deephaven/engine/table/impl/updateby/hashing/typed/open/gen/UpdateByHasherDoubleInt.java
@@ -71,12 +71,12 @@ protected void buildHashTable(RowSequence rowSequence, Chunk[] sourceKeyChunks,
             int tableLocation = firstTableLocation;
             MAIN_SEARCH: while (true) {
                 int rowState = stateSource.getUnsafe(tableLocation);
-                if (rowState == EMPTY_RIGHT_VALUE) {
+                if (isStateEmpty(rowState)) {
                     final int firstAlternateTableLocation = hashToTableLocationAlternate(hash);
                     int alternateTableLocation = firstAlternateTableLocation;
                     while (alternateTableLocation < rehashPointer) {
                         rowState = alternateStateSource.getUnsafe(alternateTableLocation);
-                        if (rowState == EMPTY_RIGHT_VALUE) {
+                        if (isStateEmpty(rowState)) {
                             break;
                         } else if (eq(alternateKeySource0.getUnsafe(alternateTableLocation), k0) && eq(alternateKeySource1.getUnsafe(alternateTableLocation), k1)) {
                             // map the existing bucket to this chunk position;
@@ -122,7 +122,7 @@ protected void probeHashTable(RowSequence rowSequence, Chunk[] sourceKeyChunks,
             boolean found = false;
             int tableLocation = firstTableLocation;
             int rowState;
-            while ((rowState = stateSource.getUnsafe(tableLocation)) != EMPTY_RIGHT_VALUE) {
+            while (!isStateEmpty(rowState = stateSource.getUnsafe(tableLocation))) {
                 if (eq(mainKeySource0.getUnsafe(tableLocation), k0) && eq(mainKeySource1.getUnsafe(tableLocation), k1)) {
                     // map the existing bucket to this chunk position;
                     outputPositions.set(chunkPosition, rowState);
@@ -137,7 +137,7 @@ protected void probeHashTable(RowSequence rowSequence, Chunk[] sourceKeyChunks,
                 boolean alternateFound = false;
                 if (firstAlternateTableLocation < rehashPointer) {
                     int alternateTableLocation = firstAlternateTableLocation;
-                    while ((rowState = alternateStateSource.getUnsafe(alternateTableLocation)) != EMPTY_RIGHT_VALUE) {
+                    while (!isStateEmpty(rowState = alternateStateSource.getUnsafe(alternateTableLocation))) {
                         if (eq(alternateKeySource0.getUnsafe(alternateTableLocation), k0) && eq(alternateKeySource1.getUnsafe(alternateTableLocation), k1)) {
                             // map the existing bucket (from alternate) to this chunk position;
                             outputPositions.set(chunkPosition, rowState);
@@ -162,17 +162,21 @@ private static int hash(double k0, int k1) {
         return hash;
     }
 
+    private static boolean isStateEmpty(int state) {
+        return state == EMPTY_RIGHT_VALUE;
+    }
+
     private boolean migrateOneLocation(int locationToMigrate,
             WritableIntChunk<RowKeys> outputPositions) {
         final int currentStateValue = alternateStateSource.getUnsafe(locationToMigrate);
-        if (currentStateValue == EMPTY_RIGHT_VALUE) {
+        if (isStateEmpty(currentStateValue)) {
             return false;
         }
         final double k0 = alternateKeySource0.getUnsafe(locationToMigrate);
         final int k1 = alternateKeySource1.getUnsafe(locationToMigrate);
         final int hash = hash(k0, k1);
         int destinationTableLocation = hashToTableLocation(hash);
-        while (stateSource.getUnsafe(destinationTableLocation) != EMPTY_RIGHT_VALUE) {
+        while (!isStateEmpty(stateSource.getUnsafe(destinationTableLocation))) {
             destinationTableLocation = nextTableLocation(destinationTableLocation);
         }
         mainKeySource0.set(destinationTableLocation, k0);
@@ -195,8 +199,7 @@ protected int rehashInternalPartial(int entriesToRehash,
     }
 
     @Override
-    protected void newAlternate() {
-        super.newAlternate();
+    protected void adviseNewAlternate() {
         this.mainKeySource0 = (ImmutableDoubleArraySource)super.mainKeySources[0];
         this.alternateKeySource0 = (ImmutableDoubleArraySource)super.alternateKeySources[0];
         this.mainKeySource1 = (ImmutableIntArraySource)super.mainKeySources[1];
@@ -213,7 +216,7 @@ protected void clearAlternate() {
     @Override
     protected void migrateFront(WritableIntChunk<RowKeys> outputPositions) {
         int location = 0;
-        while (migrateOneLocation(location++, outputPositions));
+        while (migrateOneLocation(location++, outputPositions) && location < alternateTableSize);
     }
 
     @Override
@@ -230,7 +233,7 @@ protected void rehashInternalFull(final int oldSize) {
         stateSource.setArray(destState);
         for (int sourceBucket = 0; sourceBucket < oldSize; ++sourceBucket) {
             final int currentStateValue = originalStateArray[sourceBucket];
-            if (currentStateValue == EMPTY_RIGHT_VALUE) {
+            if (isStateEmpty(currentStateValue)) {
                 continue;
             }
             final double k0 = originalKeyArray0[sourceBucket];
@@ -239,7 +242,7 @@ protected void rehashInternalFull(final int oldSize) {
             final int firstDestinationTableLocation = hashToTableLocation(hash);
             int destinationTableLocation = firstDestinationTableLocation;
             while (true) {
-                if (destState[destinationTableLocation] == EMPTY_RIGHT_VALUE) {
+                if (isStateEmpty(destState[destinationTableLocation])) {
                     destKeyArray0[destinationTableLocation] = k0;
                     destKeyArray1[destinationTableLocation] = k1;
                     destState[destinationTableLocation] = originalStateArray[sourceBucket];
diff --git a/engine/table/src/main/java/io/deephaven/engine/table/impl/updateby/hashing/typed/open/gen/UpdateByHasherDoubleLong.java b/engine/table/src/main/java/io/deephaven/engine/table/impl/updateby/hashing/typed/open/gen/UpdateByHasherDoubleLong.java
index dfef30c7b00..b0e61ff245d 100644
--- a/engine/table/src/main/java/io/deephaven/engine/table/impl/updateby/hashing/typed/open/gen/UpdateByHasherDoubleLong.java
+++ b/engine/table/src/main/java/io/deephaven/engine/table/impl/updateby/hashing/typed/open/gen/UpdateByHasherDoubleLong.java
@@ -70,12 +70,12 @@ protected void buildHashTable(RowSequence rowSequence, Chunk[] sourceKeyChunks,
             int tableLocation = firstTableLocation;
             MAIN_SEARCH: while (true) {
                 int rowState = stateSource.getUnsafe(tableLocation);
-                if (rowState == EMPTY_RIGHT_VALUE) {
+                if (isStateEmpty(rowState)) {
                     final int firstAlternateTableLocation = hashToTableLocationAlternate(hash);
                     int alternateTableLocation = firstAlternateTableLocation;
                     while (alternateTableLocation < rehashPointer) {
                         rowState = alternateStateSource.getUnsafe(alternateTableLocation);
-                        if (rowState == EMPTY_RIGHT_VALUE) {
+                        if (isStateEmpty(rowState)) {
                             break;
                         } else if (eq(alternateKeySource0.getUnsafe(alternateTableLocation), k0) && eq(alternateKeySource1.getUnsafe(alternateTableLocation), k1)) {
                             // map the existing bucket to this chunk position;
@@ -121,7 +121,7 @@ protected void probeHashTable(RowSequence rowSequence, Chunk[] sourceKeyChunks,
             boolean found = false;
             int tableLocation = firstTableLocation;
             int rowState;
-            while ((rowState = stateSource.getUnsafe(tableLocation)) != EMPTY_RIGHT_VALUE) {
+            while (!isStateEmpty(rowState = stateSource.getUnsafe(tableLocation))) {
                 if (eq(mainKeySource0.getUnsafe(tableLocation), k0) && eq(mainKeySource1.getUnsafe(tableLocation), k1)) {
                     // map the existing bucket to this chunk position;
                     outputPositions.set(chunkPosition, rowState);
@@ -136,7 +136,7 @@ protected void probeHashTable(RowSequence rowSequence, Chunk[] sourceKeyChunks,
                 boolean alternateFound = false;
                 if (firstAlternateTableLocation < rehashPointer) {
                     int alternateTableLocation = firstAlternateTableLocation;
-                    while ((rowState = alternateStateSource.getUnsafe(alternateTableLocation)) != EMPTY_RIGHT_VALUE) {
+                    while (!isStateEmpty(rowState = alternateStateSource.getUnsafe(alternateTableLocation))) {
                         if (eq(alternateKeySource0.getUnsafe(alternateTableLocation), k0) && eq(alternateKeySource1.getUnsafe(alternateTableLocation), k1)) {
                             // map the existing bucket (from alternate) to this chunk position;
                             outputPositions.set(chunkPosition, rowState);
@@ -161,17 +161,21 @@ private static int hash(double k0, long k1) {
         return hash;
     }
 
+    private static boolean isStateEmpty(int state) {
+        return state == EMPTY_RIGHT_VALUE;
+    }
+
     private boolean migrateOneLocation(int locationToMigrate,
             WritableIntChunk<RowKeys> outputPositions) {
         final int currentStateValue = alternateStateSource.getUnsafe(locationToMigrate);
-        if (currentStateValue == EMPTY_RIGHT_VALUE) {
+        if (isStateEmpty(currentStateValue)) {
             return false;
         }
         final double k0 = alternateKeySource0.getUnsafe(locationToMigrate);
         final long k1 = alternateKeySource1.getUnsafe(locationToMigrate);
         final int hash = hash(k0, k1);
         int destinationTableLocation = hashToTableLocation(hash);
-        while (stateSource.getUnsafe(destinationTableLocation) != EMPTY_RIGHT_VALUE) {
+        while (!isStateEmpty(stateSource.getUnsafe(destinationTableLocation))) {
             destinationTableLocation = nextTableLocation(destinationTableLocation);
         }
         mainKeySource0.set(destinationTableLocation, k0);
@@ -194,8 +198,7 @@ protected int rehashInternalPartial(int entriesToRehash,
     }
 
     @Override
-    protected void newAlternate() {
-        super.newAlternate();
+    protected void adviseNewAlternate() {
         this.mainKeySource0 = (ImmutableDoubleArraySource)super.mainKeySources[0];
         this.alternateKeySource0 = (ImmutableDoubleArraySource)super.alternateKeySources[0];
         this.mainKeySource1 = (ImmutableLongArraySource)super.mainKeySources[1];
@@ -212,7 +215,7 @@ protected void clearAlternate() {
     @Override
     protected void migrateFront(WritableIntChunk<RowKeys> outputPositions) {
         int location = 0;
-        while (migrateOneLocation(location++, outputPositions));
+        while (migrateOneLocation(location++, outputPositions) && location < alternateTableSize);
     }
 
     @Override
@@ -229,7 +232,7 @@ protected void rehashInternalFull(final int oldSize) {
         stateSource.setArray(destState);
         for (int sourceBucket = 0; sourceBucket < oldSize; ++sourceBucket) {
             final int currentStateValue = originalStateArray[sourceBucket];
-            if (currentStateValue == EMPTY_RIGHT_VALUE) {
+            if (isStateEmpty(currentStateValue)) {
                 continue;
             }
             final double k0 = originalKeyArray0[sourceBucket];
@@ -238,7 +241,7 @@ protected void rehashInternalFull(final int oldSize) {
             final int firstDestinationTableLocation = hashToTableLocation(hash);
             int destinationTableLocation = firstDestinationTableLocation;
             while (true) {
-                if (destState[destinationTableLocation] == EMPTY_RIGHT_VALUE) {
+                if (isStateEmpty(destState[destinationTableLocation])) {
                     destKeyArray0[destinationTableLocation] = k0;
                     destKeyArray1[destinationTableLocation] = k1;
                     destState[destinationTableLocation] = originalStateArray[sourceBucket];
diff --git a/engine/table/src/main/java/io/deephaven/engine/table/impl/updateby/hashing/typed/open/gen/UpdateByHasherDoubleObject.java b/engine/table/src/main/java/io/deephaven/engine/table/impl/updateby/hashing/typed/open/gen/UpdateByHasherDoubleObject.java
index 06e8c709809..da9a1a4d907 100644
--- a/engine/table/src/main/java/io/deephaven/engine/table/impl/updateby/hashing/typed/open/gen/UpdateByHasherDoubleObject.java
+++ b/engine/table/src/main/java/io/deephaven/engine/table/impl/updateby/hashing/typed/open/gen/UpdateByHasherDoubleObject.java
@@ -72,12 +72,12 @@ protected void buildHashTable(RowSequence rowSequence, Chunk[] sourceKeyChunks,
             int tableLocation = firstTableLocation;
             MAIN_SEARCH: while (true) {
                 int rowState = stateSource.getUnsafe(tableLocation);
-                if (rowState == EMPTY_RIGHT_VALUE) {
+                if (isStateEmpty(rowState)) {
                     final int firstAlternateTableLocation = hashToTableLocationAlternate(hash);
                     int alternateTableLocation = firstAlternateTableLocation;
                     while (alternateTableLocation < rehashPointer) {
                         rowState = alternateStateSource.getUnsafe(alternateTableLocation);
-                        if (rowState == EMPTY_RIGHT_VALUE) {
+                        if (isStateEmpty(rowState)) {
                             break;
                         } else if (eq(alternateKeySource0.getUnsafe(alternateTableLocation), k0) && eq(alternateKeySource1.getUnsafe(alternateTableLocation), k1)) {
                             // map the existing bucket to this chunk position;
@@ -123,7 +123,7 @@ protected void probeHashTable(RowSequence rowSequence, Chunk[] sourceKeyChunks,
             boolean found = false;
             int tableLocation = firstTableLocation;
             int rowState;
-            while ((rowState = stateSource.getUnsafe(tableLocation)) != EMPTY_RIGHT_VALUE) {
+            while (!isStateEmpty(rowState = stateSource.getUnsafe(tableLocation))) {
                 if (eq(mainKeySource0.getUnsafe(tableLocation), k0) && eq(mainKeySource1.getUnsafe(tableLocation), k1)) {
                     // map the existing bucket to this chunk position;
                     outputPositions.set(chunkPosition, rowState);
@@ -138,7 +138,7 @@ protected void probeHashTable(RowSequence rowSequence, Chunk[] sourceKeyChunks,
                 boolean alternateFound = false;
                 if (firstAlternateTableLocation < rehashPointer) {
                     int alternateTableLocation = firstAlternateTableLocation;
-                    while ((rowState = alternateStateSource.getUnsafe(alternateTableLocation)) != EMPTY_RIGHT_VALUE) {
+                    while (!isStateEmpty(rowState = alternateStateSource.getUnsafe(alternateTableLocation))) {
                         if (eq(alternateKeySource0.getUnsafe(alternateTableLocation), k0) && eq(alternateKeySource1.getUnsafe(alternateTableLocation), k1)) {
                             // map the existing bucket (from alternate) to this chunk position;
                             outputPositions.set(chunkPosition, rowState);
@@ -163,17 +163,21 @@ private static int hash(double k0, Object k1) {
         return hash;
     }
 
+    private static boolean isStateEmpty(int state) {
+        return state == EMPTY_RIGHT_VALUE;
+    }
+
     private boolean migrateOneLocation(int locationToMigrate,
             WritableIntChunk<RowKeys> outputPositions) {
         final int currentStateValue = alternateStateSource.getUnsafe(locationToMigrate);
-        if (currentStateValue == EMPTY_RIGHT_VALUE) {
+        if (isStateEmpty(currentStateValue)) {
             return false;
         }
         final double k0 = alternateKeySource0.getUnsafe(locationToMigrate);
         final Object k1 = alternateKeySource1.getUnsafe(locationToMigrate);
         final int hash = hash(k0, k1);
         int destinationTableLocation = hashToTableLocation(hash);
-        while (stateSource.getUnsafe(destinationTableLocation) != EMPTY_RIGHT_VALUE) {
+        while (!isStateEmpty(stateSource.getUnsafe(destinationTableLocation))) {
             destinationTableLocation = nextTableLocation(destinationTableLocation);
         }
         mainKeySource0.set(destinationTableLocation, k0);
@@ -197,8 +201,7 @@ protected int rehashInternalPartial(int entriesToRehash,
     }
 
     @Override
-    protected void newAlternate() {
-        super.newAlternate();
+    protected void adviseNewAlternate() {
         this.mainKeySource0 = (ImmutableDoubleArraySource)super.mainKeySources[0];
         this.alternateKeySource0 = (ImmutableDoubleArraySource)super.alternateKeySources[0];
         this.mainKeySource1 = (ImmutableObjectArraySource)super.mainKeySources[1];
@@ -215,7 +218,7 @@ protected void clearAlternate() {
     @Override
     protected void migrateFront(WritableIntChunk<RowKeys> outputPositions) {
         int location = 0;
-        while (migrateOneLocation(location++, outputPositions));
+        while (migrateOneLocation(location++, outputPositions) && location < alternateTableSize);
     }
 
     @Override
@@ -232,7 +235,7 @@ protected void rehashInternalFull(final int oldSize) {
         stateSource.setArray(destState);
         for (int sourceBucket = 0; sourceBucket < oldSize; ++sourceBucket) {
             final int currentStateValue = originalStateArray[sourceBucket];
-            if (currentStateValue == EMPTY_RIGHT_VALUE) {
+            if (isStateEmpty(currentStateValue)) {
                 continue;
             }
             final double k0 = originalKeyArray0[sourceBucket];
@@ -241,7 +244,7 @@ protected void rehashInternalFull(final int oldSize) {
             final int firstDestinationTableLocation = hashToTableLocation(hash);
             int destinationTableLocation = firstDestinationTableLocation;
             while (true) {
-                if (destState[destinationTableLocation] == EMPTY_RIGHT_VALUE) {
+                if (isStateEmpty(destState[destinationTableLocation])) {
                     destKeyArray0[destinationTableLocation] = k0;
                     destKeyArray1[destinationTableLocation] = k1;
                     destState[destinationTableLocation] = originalStateArray[sourceBucket];
diff --git a/engine/table/src/main/java/io/deephaven/engine/table/impl/updateby/hashing/typed/open/gen/UpdateByHasherDoubleShort.java b/engine/table/src/main/java/io/deephaven/engine/table/impl/updateby/hashing/typed/open/gen/UpdateByHasherDoubleShort.java
index 1b3b02fe992..7b31cc9da20 100644
--- a/engine/table/src/main/java/io/deephaven/engine/table/impl/updateby/hashing/typed/open/gen/UpdateByHasherDoubleShort.java
+++ b/engine/table/src/main/java/io/deephaven/engine/table/impl/updateby/hashing/typed/open/gen/UpdateByHasherDoubleShort.java
@@ -71,12 +71,12 @@ protected void buildHashTable(RowSequence rowSequence, Chunk[] sourceKeyChunks,
             int tableLocation = firstTableLocation;
             MAIN_SEARCH: while (true) {
                 int rowState = stateSource.getUnsafe(tableLocation);
-                if (rowState == EMPTY_RIGHT_VALUE) {
+                if (isStateEmpty(rowState)) {
                     final int firstAlternateTableLocation = hashToTableLocationAlternate(hash);
                     int alternateTableLocation = firstAlternateTableLocation;
                     while (alternateTableLocation < rehashPointer) {
                         rowState = alternateStateSource.getUnsafe(alternateTableLocation);
-                        if (rowState == EMPTY_RIGHT_VALUE) {
+                        if (isStateEmpty(rowState)) {
                             break;
                         } else if (eq(alternateKeySource0.getUnsafe(alternateTableLocation), k0) && eq(alternateKeySource1.getUnsafe(alternateTableLocation), k1)) {
                             // map the existing bucket to this chunk position;
@@ -122,7 +122,7 @@ protected void probeHashTable(RowSequence rowSequence, Chunk[] sourceKeyChunks,
             boolean found = false;
             int tableLocation = firstTableLocation;
             int rowState;
-            while ((rowState = stateSource.getUnsafe(tableLocation)) != EMPTY_RIGHT_VALUE) {
+            while (!isStateEmpty(rowState = stateSource.getUnsafe(tableLocation))) {
                 if (eq(mainKeySource0.getUnsafe(tableLocation), k0) && eq(mainKeySource1.getUnsafe(tableLocation), k1)) {
                     // map the existing bucket to this chunk position;
                     outputPositions.set(chunkPosition, rowState);
@@ -137,7 +137,7 @@ protected void probeHashTable(RowSequence rowSequence, Chunk[] sourceKeyChunks,
                 boolean alternateFound = false;
                 if (firstAlternateTableLocation < rehashPointer) {
                     int alternateTableLocation = firstAlternateTableLocation;
-                    while ((rowState = alternateStateSource.getUnsafe(alternateTableLocation)) != EMPTY_RIGHT_VALUE) {
+                    while (!isStateEmpty(rowState = alternateStateSource.getUnsafe(alternateTableLocation))) {
                         if (eq(alternateKeySource0.getUnsafe(alternateTableLocation), k0) && eq(alternateKeySource1.getUnsafe(alternateTableLocation), k1)) {
                             // map the existing bucket (from alternate) to this chunk position;
                             outputPositions.set(chunkPosition, rowState);
@@ -162,17 +162,21 @@ private static int hash(double k0, short k1) {
         return hash;
     }
 
+    private static boolean isStateEmpty(int state) {
+        return state == EMPTY_RIGHT_VALUE;
+    }
+
     private boolean migrateOneLocation(int locationToMigrate,
             WritableIntChunk<RowKeys> outputPositions) {
         final int currentStateValue = alternateStateSource.getUnsafe(locationToMigrate);
-        if (currentStateValue == EMPTY_RIGHT_VALUE) {
+        if (isStateEmpty(currentStateValue)) {
             return false;
         }
         final double k0 = alternateKeySource0.getUnsafe(locationToMigrate);
         final short k1 = alternateKeySource1.getUnsafe(locationToMigrate);
         final int hash = hash(k0, k1);
         int destinationTableLocation = hashToTableLocation(hash);
-        while (stateSource.getUnsafe(destinationTableLocation) != EMPTY_RIGHT_VALUE) {
+        while (!isStateEmpty(stateSource.getUnsafe(destinationTableLocation))) {
             destinationTableLocation = nextTableLocation(destinationTableLocation);
         }
         mainKeySource0.set(destinationTableLocation, k0);
@@ -195,8 +199,7 @@ protected int rehashInternalPartial(int entriesToRehash,
     }
 
     @Override
-    protected void newAlternate() {
-        super.newAlternate();
+    protected void adviseNewAlternate() {
         this.mainKeySource0 = (ImmutableDoubleArraySource)super.mainKeySources[0];
         this.alternateKeySource0 = (ImmutableDoubleArraySource)super.alternateKeySources[0];
         this.mainKeySource1 = (ImmutableShortArraySource)super.mainKeySources[1];
@@ -213,7 +216,7 @@ protected void clearAlternate() {
     @Override
     protected void migrateFront(WritableIntChunk<RowKeys> outputPositions) {
         int location = 0;
-        while (migrateOneLocation(location++, outputPositions));
+        while (migrateOneLocation(location++, outputPositions) && location < alternateTableSize);
     }
 
     @Override
@@ -230,7 +233,7 @@ protected void rehashInternalFull(final int oldSize) {
         stateSource.setArray(destState);
         for (int sourceBucket = 0; sourceBucket < oldSize; ++sourceBucket) {
             final int currentStateValue = originalStateArray[sourceBucket];
-            if (currentStateValue == EMPTY_RIGHT_VALUE) {
+            if (isStateEmpty(currentStateValue)) {
                 continue;
             }
             final double k0 = originalKeyArray0[sourceBucket];
@@ -239,7 +242,7 @@ protected void rehashInternalFull(final int oldSize) {
             final int firstDestinationTableLocation = hashToTableLocation(hash);
             int destinationTableLocation = firstDestinationTableLocation;
             while (true) {
-                if (destState[destinationTableLocation] == EMPTY_RIGHT_VALUE) {
+                if (isStateEmpty(destState[destinationTableLocation])) {
                     destKeyArray0[destinationTableLocation] = k0;
                     destKeyArray1[destinationTableLocation] = k1;
                     destState[destinationTableLocation] = originalStateArray[sourceBucket];
diff --git a/engine/table/src/main/java/io/deephaven/engine/table/impl/updateby/hashing/typed/open/gen/UpdateByHasherFloat.java b/engine/table/src/main/java/io/deephaven/engine/table/impl/updateby/hashing/typed/open/gen/UpdateByHasherFloat.java
index fc39b68b2e8..7efde05beba 100644
--- a/engine/table/src/main/java/io/deephaven/engine/table/impl/updateby/hashing/typed/open/gen/UpdateByHasherFloat.java
+++ b/engine/table/src/main/java/io/deephaven/engine/table/impl/updateby/hashing/typed/open/gen/UpdateByHasherFloat.java
@@ -59,12 +59,12 @@ protected void buildHashTable(RowSequence rowSequence, Chunk[] sourceKeyChunks,
             int tableLocation = firstTableLocation;
             MAIN_SEARCH: while (true) {
                 int rowState = stateSource.getUnsafe(tableLocation);
-                if (rowState == EMPTY_RIGHT_VALUE) {
+                if (isStateEmpty(rowState)) {
                     final int firstAlternateTableLocation = hashToTableLocationAlternate(hash);
                     int alternateTableLocation = firstAlternateTableLocation;
                     while (alternateTableLocation < rehashPointer) {
                         rowState = alternateStateSource.getUnsafe(alternateTableLocation);
-                        if (rowState == EMPTY_RIGHT_VALUE) {
+                        if (isStateEmpty(rowState)) {
                             break;
                         } else if (eq(alternateKeySource0.getUnsafe(alternateTableLocation), k0)) {
                             // map the existing bucket to this chunk position;
@@ -107,7 +107,7 @@ protected void probeHashTable(RowSequence rowSequence, Chunk[] sourceKeyChunks,
             boolean found = false;
             int tableLocation = firstTableLocation;
             int rowState;
-            while ((rowState = stateSource.getUnsafe(tableLocation)) != EMPTY_RIGHT_VALUE) {
+            while (!isStateEmpty(rowState = stateSource.getUnsafe(tableLocation))) {
                 if (eq(mainKeySource0.getUnsafe(tableLocation), k0)) {
                     // map the existing bucket to this chunk position;
                     outputPositions.set(chunkPosition, rowState);
@@ -122,7 +122,7 @@ protected void probeHashTable(RowSequence rowSequence, Chunk[] sourceKeyChunks,
                 boolean alternateFound = false;
                 if (firstAlternateTableLocation < rehashPointer) {
                     int alternateTableLocation = firstAlternateTableLocation;
-                    while ((rowState = alternateStateSource.getUnsafe(alternateTableLocation)) != EMPTY_RIGHT_VALUE) {
+                    while (!isStateEmpty(rowState = alternateStateSource.getUnsafe(alternateTableLocation))) {
                         if (eq(alternateKeySource0.getUnsafe(alternateTableLocation), k0)) {
                             // map the existing bucket (from alternate) to this chunk position;
                             outputPositions.set(chunkPosition, rowState);
@@ -146,16 +146,20 @@ private static int hash(float k0) {
         return hash;
     }
 
+    private static boolean isStateEmpty(int state) {
+        return state == EMPTY_RIGHT_VALUE;
+    }
+
     private boolean migrateOneLocation(int locationToMigrate,
             WritableIntChunk<RowKeys> outputPositions) {
         final int currentStateValue = alternateStateSource.getUnsafe(locationToMigrate);
-        if (currentStateValue == EMPTY_RIGHT_VALUE) {
+        if (isStateEmpty(currentStateValue)) {
             return false;
         }
         final float k0 = alternateKeySource0.getUnsafe(locationToMigrate);
         final int hash = hash(k0);
         int destinationTableLocation = hashToTableLocation(hash);
-        while (stateSource.getUnsafe(destinationTableLocation) != EMPTY_RIGHT_VALUE) {
+        while (!isStateEmpty(stateSource.getUnsafe(destinationTableLocation))) {
             destinationTableLocation = nextTableLocation(destinationTableLocation);
         }
         mainKeySource0.set(destinationTableLocation, k0);
@@ -177,8 +181,7 @@ protected int rehashInternalPartial(int entriesToRehash,
     }
 
     @Override
-    protected void newAlternate() {
-        super.newAlternate();
+    protected void adviseNewAlternate() {
         this.mainKeySource0 = (ImmutableFloatArraySource)super.mainKeySources[0];
         this.alternateKeySource0 = (ImmutableFloatArraySource)super.alternateKeySources[0];
     }
@@ -192,7 +195,7 @@ protected void clearAlternate() {
     @Override
     protected void migrateFront(WritableIntChunk<RowKeys> outputPositions) {
         int location = 0;
-        while (migrateOneLocation(location++, outputPositions));
+        while (migrateOneLocation(location++, outputPositions) && location < alternateTableSize);
     }
 
     @Override
@@ -206,7 +209,7 @@ protected void rehashInternalFull(final int oldSize) {
         stateSource.setArray(destState);
         for (int sourceBucket = 0; sourceBucket < oldSize; ++sourceBucket) {
             final int currentStateValue = originalStateArray[sourceBucket];
-            if (currentStateValue == EMPTY_RIGHT_VALUE) {
+            if (isStateEmpty(currentStateValue)) {
                 continue;
             }
             final float k0 = originalKeyArray0[sourceBucket];
@@ -214,7 +217,7 @@ protected void rehashInternalFull(final int oldSize) {
             final int firstDestinationTableLocation = hashToTableLocation(hash);
             int destinationTableLocation = firstDestinationTableLocation;
             while (true) {
-                if (destState[destinationTableLocation] == EMPTY_RIGHT_VALUE) {
+                if (isStateEmpty(destState[destinationTableLocation])) {
                     destKeyArray0[destinationTableLocation] = k0;
                     destState[destinationTableLocation] = originalStateArray[sourceBucket];
                     break;
diff --git a/engine/table/src/main/java/io/deephaven/engine/table/impl/updateby/hashing/typed/open/gen/UpdateByHasherFloatByte.java b/engine/table/src/main/java/io/deephaven/engine/table/impl/updateby/hashing/typed/open/gen/UpdateByHasherFloatByte.java
index 7510e3d6f37..12c90c1ce71 100644
--- a/engine/table/src/main/java/io/deephaven/engine/table/impl/updateby/hashing/typed/open/gen/UpdateByHasherFloatByte.java
+++ b/engine/table/src/main/java/io/deephaven/engine/table/impl/updateby/hashing/typed/open/gen/UpdateByHasherFloatByte.java
@@ -71,12 +71,12 @@ protected void buildHashTable(RowSequence rowSequence, Chunk[] sourceKeyChunks,
             int tableLocation = firstTableLocation;
             MAIN_SEARCH: while (true) {
                 int rowState = stateSource.getUnsafe(tableLocation);
-                if (rowState == EMPTY_RIGHT_VALUE) {
+                if (isStateEmpty(rowState)) {
                     final int firstAlternateTableLocation = hashToTableLocationAlternate(hash);
                     int alternateTableLocation = firstAlternateTableLocation;
                     while (alternateTableLocation < rehashPointer) {
                         rowState = alternateStateSource.getUnsafe(alternateTableLocation);
-                        if (rowState == EMPTY_RIGHT_VALUE) {
+                        if (isStateEmpty(rowState)) {
                             break;
                         } else if (eq(alternateKeySource0.getUnsafe(alternateTableLocation), k0) && eq(alternateKeySource1.getUnsafe(alternateTableLocation), k1)) {
                             // map the existing bucket to this chunk position;
@@ -122,7 +122,7 @@ protected void probeHashTable(RowSequence rowSequence, Chunk[] sourceKeyChunks,
             boolean found = false;
             int tableLocation = firstTableLocation;
             int rowState;
-            while ((rowState = stateSource.getUnsafe(tableLocation)) != EMPTY_RIGHT_VALUE) {
+            while (!isStateEmpty(rowState = stateSource.getUnsafe(tableLocation))) {
                 if (eq(mainKeySource0.getUnsafe(tableLocation), k0) && eq(mainKeySource1.getUnsafe(tableLocation), k1)) {
                     // map the existing bucket to this chunk position;
                     outputPositions.set(chunkPosition, rowState);
@@ -137,7 +137,7 @@ protected void probeHashTable(RowSequence rowSequence, Chunk[] sourceKeyChunks,
                 boolean alternateFound = false;
                 if (firstAlternateTableLocation < rehashPointer) {
                     int alternateTableLocation = firstAlternateTableLocation;
-                    while ((rowState = alternateStateSource.getUnsafe(alternateTableLocation)) != EMPTY_RIGHT_VALUE) {
+                    while (!isStateEmpty(rowState = alternateStateSource.getUnsafe(alternateTableLocation))) {
                         if (eq(alternateKeySource0.getUnsafe(alternateTableLocation), k0) && eq(alternateKeySource1.getUnsafe(alternateTableLocation), k1)) {
                             // map the existing bucket (from alternate) to this chunk position;
                             outputPositions.set(chunkPosition, rowState);
@@ -162,17 +162,21 @@ private static int hash(float k0, byte k1) {
         return hash;
     }
 
+    private static boolean isStateEmpty(int state) {
+        return state == EMPTY_RIGHT_VALUE;
+    }
+
     private boolean migrateOneLocation(int locationToMigrate,
             WritableIntChunk<RowKeys> outputPositions) {
         final int currentStateValue = alternateStateSource.getUnsafe(locationToMigrate);
-        if (currentStateValue == EMPTY_RIGHT_VALUE) {
+        if (isStateEmpty(currentStateValue)) {
             return false;
         }
         final float k0 = alternateKeySource0.getUnsafe(locationToMigrate);
         final byte k1 = alternateKeySource1.getUnsafe(locationToMigrate);
         final int hash = hash(k0, k1);
         int destinationTableLocation = hashToTableLocation(hash);
-        while (stateSource.getUnsafe(destinationTableLocation) != EMPTY_RIGHT_VALUE) {
+        while (!isStateEmpty(stateSource.getUnsafe(destinationTableLocation))) {
             destinationTableLocation = nextTableLocation(destinationTableLocation);
         }
         mainKeySource0.set(destinationTableLocation, k0);
@@ -195,8 +199,7 @@ protected int rehashInternalPartial(int entriesToRehash,
     }
 
     @Override
-    protected void newAlternate() {
-        super.newAlternate();
+    protected void adviseNewAlternate() {
         this.mainKeySource0 = (ImmutableFloatArraySource)super.mainKeySources[0];
         this.alternateKeySource0 = (ImmutableFloatArraySource)super.alternateKeySources[0];
         this.mainKeySource1 = (ImmutableByteArraySource)super.mainKeySources[1];
@@ -213,7 +216,7 @@ protected void clearAlternate() {
     @Override
     protected void migrateFront(WritableIntChunk<RowKeys> outputPositions) {
         int location = 0;
-        while (migrateOneLocation(location++, outputPositions));
+        while (migrateOneLocation(location++, outputPositions) && location < alternateTableSize);
     }
 
     @Override
@@ -230,7 +233,7 @@ protected void rehashInternalFull(final int oldSize) {
         stateSource.setArray(destState);
         for (int sourceBucket = 0; sourceBucket < oldSize; ++sourceBucket) {
             final int currentStateValue = originalStateArray[sourceBucket];
-            if (currentStateValue == EMPTY_RIGHT_VALUE) {
+            if (isStateEmpty(currentStateValue)) {
                 continue;
             }
             final float k0 = originalKeyArray0[sourceBucket];
@@ -239,7 +242,7 @@ protected void rehashInternalFull(final int oldSize) {
             final int firstDestinationTableLocation = hashToTableLocation(hash);
             int destinationTableLocation = firstDestinationTableLocation;
             while (true) {
-                if (destState[destinationTableLocation] == EMPTY_RIGHT_VALUE) {
+                if (isStateEmpty(destState[destinationTableLocation])) {
                     destKeyArray0[destinationTableLocation] = k0;
                     destKeyArray1[destinationTableLocation] = k1;
                     destState[destinationTableLocation] = originalStateArray[sourceBucket];
diff --git a/engine/table/src/main/java/io/deephaven/engine/table/impl/updateby/hashing/typed/open/gen/UpdateByHasherFloatChar.java b/engine/table/src/main/java/io/deephaven/engine/table/impl/updateby/hashing/typed/open/gen/UpdateByHasherFloatChar.java
index 0d44855ca5c..bfe6baca04d 100644
--- a/engine/table/src/main/java/io/deephaven/engine/table/impl/updateby/hashing/typed/open/gen/UpdateByHasherFloatChar.java
+++ b/engine/table/src/main/java/io/deephaven/engine/table/impl/updateby/hashing/typed/open/gen/UpdateByHasherFloatChar.java
@@ -71,12 +71,12 @@ protected void buildHashTable(RowSequence rowSequence, Chunk[] sourceKeyChunks,
             int tableLocation = firstTableLocation;
             MAIN_SEARCH: while (true) {
                 int rowState = stateSource.getUnsafe(tableLocation);
-                if (rowState == EMPTY_RIGHT_VALUE) {
+                if (isStateEmpty(rowState)) {
                     final int firstAlternateTableLocation = hashToTableLocationAlternate(hash);
                     int alternateTableLocation = firstAlternateTableLocation;
                     while (alternateTableLocation < rehashPointer) {
                         rowState = alternateStateSource.getUnsafe(alternateTableLocation);
-                        if (rowState == EMPTY_RIGHT_VALUE) {
+                        if (isStateEmpty(rowState)) {
                             break;
                         } else if (eq(alternateKeySource0.getUnsafe(alternateTableLocation), k0) && eq(alternateKeySource1.getUnsafe(alternateTableLocation), k1)) {
                             // map the existing bucket to this chunk position;
@@ -122,7 +122,7 @@ protected void probeHashTable(RowSequence rowSequence, Chunk[] sourceKeyChunks,
             boolean found = false;
             int tableLocation = firstTableLocation;
             int rowState;
-            while ((rowState = stateSource.getUnsafe(tableLocation)) != EMPTY_RIGHT_VALUE) {
+            while (!isStateEmpty(rowState = stateSource.getUnsafe(tableLocation))) {
                 if (eq(mainKeySource0.getUnsafe(tableLocation), k0) && eq(mainKeySource1.getUnsafe(tableLocation), k1)) {
                     // map the existing bucket to this chunk position;
                     outputPositions.set(chunkPosition, rowState);
@@ -137,7 +137,7 @@ protected void probeHashTable(RowSequence rowSequence, Chunk[] sourceKeyChunks,
                 boolean alternateFound = false;
                 if (firstAlternateTableLocation < rehashPointer) {
                     int alternateTableLocation = firstAlternateTableLocation;
-                    while ((rowState = alternateStateSource.getUnsafe(alternateTableLocation)) != EMPTY_RIGHT_VALUE) {
+                    while (!isStateEmpty(rowState = alternateStateSource.getUnsafe(alternateTableLocation))) {
                         if (eq(alternateKeySource0.getUnsafe(alternateTableLocation), k0) && eq(alternateKeySource1.getUnsafe(alternateTableLocation), k1)) {
                             // map the existing bucket (from alternate) to this chunk position;
                             outputPositions.set(chunkPosition, rowState);
@@ -162,17 +162,21 @@ private static int hash(float k0, char k1) {
         return hash;
     }
 
+    private static boolean isStateEmpty(int state) {
+        return state == EMPTY_RIGHT_VALUE;
+    }
+
     private boolean migrateOneLocation(int locationToMigrate,
             WritableIntChunk<RowKeys> outputPositions) {
         final int currentStateValue = alternateStateSource.getUnsafe(locationToMigrate);
-        if (currentStateValue == EMPTY_RIGHT_VALUE) {
+        if (isStateEmpty(currentStateValue)) {
             return false;
         }
         final float k0 = alternateKeySource0.getUnsafe(locationToMigrate);
         final char k1 = alternateKeySource1.getUnsafe(locationToMigrate);
         final int hash = hash(k0, k1);
         int destinationTableLocation = hashToTableLocation(hash);
-        while (stateSource.getUnsafe(destinationTableLocation) != EMPTY_RIGHT_VALUE) {
+        while (!isStateEmpty(stateSource.getUnsafe(destinationTableLocation))) {
             destinationTableLocation = nextTableLocation(destinationTableLocation);
         }
         mainKeySource0.set(destinationTableLocation, k0);
@@ -195,8 +199,7 @@ protected int rehashInternalPartial(int entriesToRehash,
     }
 
     @Override
-    protected void newAlternate() {
-        super.newAlternate();
+    protected void adviseNewAlternate() {
         this.mainKeySource0 = (ImmutableFloatArraySource)super.mainKeySources[0];
         this.alternateKeySource0 = (ImmutableFloatArraySource)super.alternateKeySources[0];
         this.mainKeySource1 = (ImmutableCharArraySource)super.mainKeySources[1];
@@ -213,7 +216,7 @@ protected void clearAlternate() {
     @Override
     protected void migrateFront(WritableIntChunk<RowKeys> outputPositions) {
         int location = 0;
-        while (migrateOneLocation(location++, outputPositions));
+        while (migrateOneLocation(location++, outputPositions) && location < alternateTableSize);
     }
 
     @Override
@@ -230,7 +233,7 @@ protected void rehashInternalFull(final int oldSize) {
         stateSource.setArray(destState);
         for (int sourceBucket = 0; sourceBucket < oldSize; ++sourceBucket) {
             final int currentStateValue = originalStateArray[sourceBucket];
-            if (currentStateValue == EMPTY_RIGHT_VALUE) {
+            if (isStateEmpty(currentStateValue)) {
                 continue;
             }
             final float k0 = originalKeyArray0[sourceBucket];
@@ -239,7 +242,7 @@ protected void rehashInternalFull(final int oldSize) {
             final int firstDestinationTableLocation = hashToTableLocation(hash);
             int destinationTableLocation = firstDestinationTableLocation;
             while (true) {
-                if (destState[destinationTableLocation] == EMPTY_RIGHT_VALUE) {
+                if (isStateEmpty(destState[destinationTableLocation])) {
                     destKeyArray0[destinationTableLocation] = k0;
                     destKeyArray1[destinationTableLocation] = k1;
                     destState[destinationTableLocation] = originalStateArray[sourceBucket];
diff --git a/engine/table/src/main/java/io/deephaven/engine/table/impl/updateby/hashing/typed/open/gen/UpdateByHasherFloatDouble.java b/engine/table/src/main/java/io/deephaven/engine/table/impl/updateby/hashing/typed/open/gen/UpdateByHasherFloatDouble.java
index 3970c65c41f..26501649f25 100644
--- a/engine/table/src/main/java/io/deephaven/engine/table/impl/updateby/hashing/typed/open/gen/UpdateByHasherFloatDouble.java
+++ b/engine/table/src/main/java/io/deephaven/engine/table/impl/updateby/hashing/typed/open/gen/UpdateByHasherFloatDouble.java
@@ -71,12 +71,12 @@ protected void buildHashTable(RowSequence rowSequence, Chunk[] sourceKeyChunks,
             int tableLocation = firstTableLocation;
             MAIN_SEARCH: while (true) {
                 int rowState = stateSource.getUnsafe(tableLocation);
-                if (rowState == EMPTY_RIGHT_VALUE) {
+                if (isStateEmpty(rowState)) {
                     final int firstAlternateTableLocation = hashToTableLocationAlternate(hash);
                     int alternateTableLocation = firstAlternateTableLocation;
                     while (alternateTableLocation < rehashPointer) {
                         rowState = alternateStateSource.getUnsafe(alternateTableLocation);
-                        if (rowState == EMPTY_RIGHT_VALUE) {
+                        if (isStateEmpty(rowState)) {
                             break;
                         } else if (eq(alternateKeySource0.getUnsafe(alternateTableLocation), k0) && eq(alternateKeySource1.getUnsafe(alternateTableLocation), k1)) {
                             // map the existing bucket to this chunk position;
@@ -122,7 +122,7 @@ protected void probeHashTable(RowSequence rowSequence, Chunk[] sourceKeyChunks,
             boolean found = false;
             int tableLocation = firstTableLocation;
             int rowState;
-            while ((rowState = stateSource.getUnsafe(tableLocation)) != EMPTY_RIGHT_VALUE) {
+            while (!isStateEmpty(rowState = stateSource.getUnsafe(tableLocation))) {
                 if (eq(mainKeySource0.getUnsafe(tableLocation), k0) && eq(mainKeySource1.getUnsafe(tableLocation), k1)) {
                     // map the existing bucket to this chunk position;
                     outputPositions.set(chunkPosition, rowState);
@@ -137,7 +137,7 @@ protected void probeHashTable(RowSequence rowSequence, Chunk[] sourceKeyChunks,
                 boolean alternateFound = false;
                 if (firstAlternateTableLocation < rehashPointer) {
                     int alternateTableLocation = firstAlternateTableLocation;
-                    while ((rowState = alternateStateSource.getUnsafe(alternateTableLocation)) != EMPTY_RIGHT_VALUE) {
+                    while (!isStateEmpty(rowState = alternateStateSource.getUnsafe(alternateTableLocation))) {
                         if (eq(alternateKeySource0.getUnsafe(alternateTableLocation), k0) && eq(alternateKeySource1.getUnsafe(alternateTableLocation), k1)) {
                             // map the existing bucket (from alternate) to this chunk position;
                             outputPositions.set(chunkPosition, rowState);
@@ -162,17 +162,21 @@ private static int hash(float k0, double k1) {
         return hash;
     }
 
+    private static boolean isStateEmpty(int state) {
+        return state == EMPTY_RIGHT_VALUE;
+    }
+
     private boolean migrateOneLocation(int locationToMigrate,
             WritableIntChunk<RowKeys> outputPositions) {
         final int currentStateValue = alternateStateSource.getUnsafe(locationToMigrate);
-        if (currentStateValue == EMPTY_RIGHT_VALUE) {
+        if (isStateEmpty(currentStateValue)) {
             return false;
         }
         final float k0 = alternateKeySource0.getUnsafe(locationToMigrate);
         final double k1 = alternateKeySource1.getUnsafe(locationToMigrate);
         final int hash = hash(k0, k1);
         int destinationTableLocation = hashToTableLocation(hash);
-        while (stateSource.getUnsafe(destinationTableLocation) != EMPTY_RIGHT_VALUE) {
+        while (!isStateEmpty(stateSource.getUnsafe(destinationTableLocation))) {
             destinationTableLocation = nextTableLocation(destinationTableLocation);
         }
         mainKeySource0.set(destinationTableLocation, k0);
@@ -195,8 +199,7 @@ protected int rehashInternalPartial(int entriesToRehash,
     }
 
     @Override
-    protected void newAlternate() {
-        super.newAlternate();
+    protected void adviseNewAlternate() {
         this.mainKeySource0 = (ImmutableFloatArraySource)super.mainKeySources[0];
         this.alternateKeySource0 = (ImmutableFloatArraySource)super.alternateKeySources[0];
         this.mainKeySource1 = (ImmutableDoubleArraySource)super.mainKeySources[1];
@@ -213,7 +216,7 @@ protected void clearAlternate() {
     @Override
     protected void migrateFront(WritableIntChunk<RowKeys> outputPositions) {
         int location = 0;
-        while (migrateOneLocation(location++, outputPositions));
+        while (migrateOneLocation(location++, outputPositions) && location < alternateTableSize);
     }
 
     @Override
@@ -230,7 +233,7 @@ protected void rehashInternalFull(final int oldSize) {
         stateSource.setArray(destState);
         for (int sourceBucket = 0; sourceBucket < oldSize; ++sourceBucket) {
             final int currentStateValue = originalStateArray[sourceBucket];
-            if (currentStateValue == EMPTY_RIGHT_VALUE) {
+            if (isStateEmpty(currentStateValue)) {
                 continue;
             }
             final float k0 = originalKeyArray0[sourceBucket];
@@ -239,7 +242,7 @@ protected void rehashInternalFull(final int oldSize) {
             final int firstDestinationTableLocation = hashToTableLocation(hash);
             int destinationTableLocation = firstDestinationTableLocation;
             while (true) {
-                if (destState[destinationTableLocation] == EMPTY_RIGHT_VALUE) {
+                if (isStateEmpty(destState[destinationTableLocation])) {
                     destKeyArray0[destinationTableLocation] = k0;
                     destKeyArray1[destinationTableLocation] = k1;
                     destState[destinationTableLocation] = originalStateArray[sourceBucket];
diff --git a/engine/table/src/main/java/io/deephaven/engine/table/impl/updateby/hashing/typed/open/gen/UpdateByHasherFloatFloat.java b/engine/table/src/main/java/io/deephaven/engine/table/impl/updateby/hashing/typed/open/gen/UpdateByHasherFloatFloat.java
index a3c3aae743e..e18b453c7cf 100644
--- a/engine/table/src/main/java/io/deephaven/engine/table/impl/updateby/hashing/typed/open/gen/UpdateByHasherFloatFloat.java
+++ b/engine/table/src/main/java/io/deephaven/engine/table/impl/updateby/hashing/typed/open/gen/UpdateByHasherFloatFloat.java
@@ -67,12 +67,12 @@ protected void buildHashTable(RowSequence rowSequence, Chunk[] sourceKeyChunks,
             int tableLocation = firstTableLocation;
             MAIN_SEARCH: while (true) {
                 int rowState = stateSource.getUnsafe(tableLocation);
-                if (rowState == EMPTY_RIGHT_VALUE) {
+                if (isStateEmpty(rowState)) {
                     final int firstAlternateTableLocation = hashToTableLocationAlternate(hash);
                     int alternateTableLocation = firstAlternateTableLocation;
                     while (alternateTableLocation < rehashPointer) {
                         rowState = alternateStateSource.getUnsafe(alternateTableLocation);
-                        if (rowState == EMPTY_RIGHT_VALUE) {
+                        if (isStateEmpty(rowState)) {
                             break;
                         } else if (eq(alternateKeySource0.getUnsafe(alternateTableLocation), k0) && eq(alternateKeySource1.getUnsafe(alternateTableLocation), k1)) {
                             // map the existing bucket to this chunk position;
@@ -118,7 +118,7 @@ protected void probeHashTable(RowSequence rowSequence, Chunk[] sourceKeyChunks,
             boolean found = false;
             int tableLocation = firstTableLocation;
             int rowState;
-            while ((rowState = stateSource.getUnsafe(tableLocation)) != EMPTY_RIGHT_VALUE) {
+            while (!isStateEmpty(rowState = stateSource.getUnsafe(tableLocation))) {
                 if (eq(mainKeySource0.getUnsafe(tableLocation), k0) && eq(mainKeySource1.getUnsafe(tableLocation), k1)) {
                     // map the existing bucket to this chunk position;
                     outputPositions.set(chunkPosition, rowState);
@@ -133,7 +133,7 @@ protected void probeHashTable(RowSequence rowSequence, Chunk[] sourceKeyChunks,
                 boolean alternateFound = false;
                 if (firstAlternateTableLocation < rehashPointer) {
                     int alternateTableLocation = firstAlternateTableLocation;
-                    while ((rowState = alternateStateSource.getUnsafe(alternateTableLocation)) != EMPTY_RIGHT_VALUE) {
+                    while (!isStateEmpty(rowState = alternateStateSource.getUnsafe(alternateTableLocation))) {
                         if (eq(alternateKeySource0.getUnsafe(alternateTableLocation), k0) && eq(alternateKeySource1.getUnsafe(alternateTableLocation), k1)) {
                             // map the existing bucket (from alternate) to this chunk position;
                             outputPositions.set(chunkPosition, rowState);
@@ -158,17 +158,21 @@ private static int hash(float k0, float k1) {
         return hash;
     }
 
+    private static boolean isStateEmpty(int state) {
+        return state == EMPTY_RIGHT_VALUE;
+    }
+
     private boolean migrateOneLocation(int locationToMigrate,
             WritableIntChunk<RowKeys> outputPositions) {
         final int currentStateValue = alternateStateSource.getUnsafe(locationToMigrate);
-        if (currentStateValue == EMPTY_RIGHT_VALUE) {
+        if (isStateEmpty(currentStateValue)) {
             return false;
         }
         final float k0 = alternateKeySource0.getUnsafe(locationToMigrate);
         final float k1 = alternateKeySource1.getUnsafe(locationToMigrate);
         final int hash = hash(k0, k1);
         int destinationTableLocation = hashToTableLocation(hash);
-        while (stateSource.getUnsafe(destinationTableLocation) != EMPTY_RIGHT_VALUE) {
+        while (!isStateEmpty(stateSource.getUnsafe(destinationTableLocation))) {
             destinationTableLocation = nextTableLocation(destinationTableLocation);
         }
         mainKeySource0.set(destinationTableLocation, k0);
@@ -191,8 +195,7 @@ protected int rehashInternalPartial(int entriesToRehash,
     }
 
     @Override
-    protected void newAlternate() {
-        super.newAlternate();
+    protected void adviseNewAlternate() {
         this.mainKeySource0 = (ImmutableFloatArraySource)super.mainKeySources[0];
         this.alternateKeySource0 = (ImmutableFloatArraySource)super.alternateKeySources[0];
         this.mainKeySource1 = (ImmutableFloatArraySource)super.mainKeySources[1];
@@ -209,7 +212,7 @@ protected void clearAlternate() {
     @Override
     protected void migrateFront(WritableIntChunk<RowKeys> outputPositions) {
         int location = 0;
-        while (migrateOneLocation(location++, outputPositions));
+        while (migrateOneLocation(location++, outputPositions) && location < alternateTableSize);
     }
 
     @Override
@@ -226,7 +229,7 @@ protected void rehashInternalFull(final int oldSize) {
         stateSource.setArray(destState);
         for (int sourceBucket = 0; sourceBucket < oldSize; ++sourceBucket) {
             final int currentStateValue = originalStateArray[sourceBucket];
-            if (currentStateValue == EMPTY_RIGHT_VALUE) {
+            if (isStateEmpty(currentStateValue)) {
                 continue;
             }
             final float k0 = originalKeyArray0[sourceBucket];
@@ -235,7 +238,7 @@ protected void rehashInternalFull(final int oldSize) {
             final int firstDestinationTableLocation = hashToTableLocation(hash);
             int destinationTableLocation = firstDestinationTableLocation;
             while (true) {
-                if (destState[destinationTableLocation] == EMPTY_RIGHT_VALUE) {
+                if (isStateEmpty(destState[destinationTableLocation])) {
                     destKeyArray0[destinationTableLocation] = k0;
                     destKeyArray1[destinationTableLocation] = k1;
                     destState[destinationTableLocation] = originalStateArray[sourceBucket];
diff --git a/engine/table/src/main/java/io/deephaven/engine/table/impl/updateby/hashing/typed/open/gen/UpdateByHasherFloatInt.java b/engine/table/src/main/java/io/deephaven/engine/table/impl/updateby/hashing/typed/open/gen/UpdateByHasherFloatInt.java
index 600fa01c6b1..2397e60f612 100644
--- a/engine/table/src/main/java/io/deephaven/engine/table/impl/updateby/hashing/typed/open/gen/UpdateByHasherFloatInt.java
+++ b/engine/table/src/main/java/io/deephaven/engine/table/impl/updateby/hashing/typed/open/gen/UpdateByHasherFloatInt.java
@@ -71,12 +71,12 @@ protected void buildHashTable(RowSequence rowSequence, Chunk[] sourceKeyChunks,
             int tableLocation = firstTableLocation;
             MAIN_SEARCH: while (true) {
                 int rowState = stateSource.getUnsafe(tableLocation);
-                if (rowState == EMPTY_RIGHT_VALUE) {
+                if (isStateEmpty(rowState)) {
                     final int firstAlternateTableLocation = hashToTableLocationAlternate(hash);
                     int alternateTableLocation = firstAlternateTableLocation;
                     while (alternateTableLocation < rehashPointer) {
                         rowState = alternateStateSource.getUnsafe(alternateTableLocation);
-                        if (rowState == EMPTY_RIGHT_VALUE) {
+                        if (isStateEmpty(rowState)) {
                             break;
                         } else if (eq(alternateKeySource0.getUnsafe(alternateTableLocation), k0) && eq(alternateKeySource1.getUnsafe(alternateTableLocation), k1)) {
                             // map the existing bucket to this chunk position;
@@ -122,7 +122,7 @@ protected void probeHashTable(RowSequence rowSequence, Chunk[] sourceKeyChunks,
             boolean found = false;
             int tableLocation = firstTableLocation;
             int rowState;
-            while ((rowState = stateSource.getUnsafe(tableLocation)) != EMPTY_RIGHT_VALUE) {
+            while (!isStateEmpty(rowState = stateSource.getUnsafe(tableLocation))) {
                 if (eq(mainKeySource0.getUnsafe(tableLocation), k0) && eq(mainKeySource1.getUnsafe(tableLocation), k1)) {
                     // map the existing bucket to this chunk position;
                     outputPositions.set(chunkPosition, rowState);
@@ -137,7 +137,7 @@ protected void probeHashTable(RowSequence rowSequence, Chunk[] sourceKeyChunks,
                 boolean alternateFound = false;
                 if (firstAlternateTableLocation < rehashPointer) {
                     int alternateTableLocation = firstAlternateTableLocation;
-                    while ((rowState = alternateStateSource.getUnsafe(alternateTableLocation)) != EMPTY_RIGHT_VALUE) {
+                    while (!isStateEmpty(rowState = alternateStateSource.getUnsafe(alternateTableLocation))) {
                         if (eq(alternateKeySource0.getUnsafe(alternateTableLocation), k0) && eq(alternateKeySource1.getUnsafe(alternateTableLocation), k1)) {
                             // map the existing bucket (from alternate) to this chunk position;
                             outputPositions.set(chunkPosition, rowState);
@@ -162,17 +162,21 @@ private static int hash(float k0, int k1) {
         return hash;
     }
 
+    private static boolean isStateEmpty(int state) {
+        return state == EMPTY_RIGHT_VALUE;
+    }
+
     private boolean migrateOneLocation(int locationToMigrate,
             WritableIntChunk<RowKeys> outputPositions) {
         final int currentStateValue = alternateStateSource.getUnsafe(locationToMigrate);
-        if (currentStateValue == EMPTY_RIGHT_VALUE) {
+        if (isStateEmpty(currentStateValue)) {
             return false;
         }
         final float k0 = alternateKeySource0.getUnsafe(locationToMigrate);
         final int k1 = alternateKeySource1.getUnsafe(locationToMigrate);
         final int hash = hash(k0, k1);
         int destinationTableLocation = hashToTableLocation(hash);
-        while (stateSource.getUnsafe(destinationTableLocation) != EMPTY_RIGHT_VALUE) {
+        while (!isStateEmpty(stateSource.getUnsafe(destinationTableLocation))) {
             destinationTableLocation = nextTableLocation(destinationTableLocation);
         }
         mainKeySource0.set(destinationTableLocation, k0);
@@ -195,8 +199,7 @@ protected int rehashInternalPartial(int entriesToRehash,
     }
 
     @Override
-    protected void newAlternate() {
-        super.newAlternate();
+    protected void adviseNewAlternate() {
         this.mainKeySource0 = (ImmutableFloatArraySource)super.mainKeySources[0];
         this.alternateKeySource0 = (ImmutableFloatArraySource)super.alternateKeySources[0];
         this.mainKeySource1 = (ImmutableIntArraySource)super.mainKeySources[1];
@@ -213,7 +216,7 @@ protected void clearAlternate() {
     @Override
     protected void migrateFront(WritableIntChunk<RowKeys> outputPositions) {
         int location = 0;
-        while (migrateOneLocation(location++, outputPositions));
+        while (migrateOneLocation(location++, outputPositions) && location < alternateTableSize);
     }
 
     @Override
@@ -230,7 +233,7 @@ protected void rehashInternalFull(final int oldSize) {
         stateSource.setArray(destState);
         for (int sourceBucket = 0; sourceBucket < oldSize; ++sourceBucket) {
             final int currentStateValue = originalStateArray[sourceBucket];
-            if (currentStateValue == EMPTY_RIGHT_VALUE) {
+            if (isStateEmpty(currentStateValue)) {
                 continue;
             }
             final float k0 = originalKeyArray0[sourceBucket];
@@ -239,7 +242,7 @@ protected void rehashInternalFull(final int oldSize) {
             final int firstDestinationTableLocation = hashToTableLocation(hash);
             int destinationTableLocation = firstDestinationTableLocation;
             while (true) {
-                if (destState[destinationTableLocation] == EMPTY_RIGHT_VALUE) {
+                if (isStateEmpty(destState[destinationTableLocation])) {
                     destKeyArray0[destinationTableLocation] = k0;
                     destKeyArray1[destinationTableLocation] = k1;
                     destState[destinationTableLocation] = originalStateArray[sourceBucket];
diff --git a/engine/table/src/main/java/io/deephaven/engine/table/impl/updateby/hashing/typed/open/gen/UpdateByHasherFloatLong.java b/engine/table/src/main/java/io/deephaven/engine/table/impl/updateby/hashing/typed/open/gen/UpdateByHasherFloatLong.java
index 129dc214078..ff313276c16 100644
--- a/engine/table/src/main/java/io/deephaven/engine/table/impl/updateby/hashing/typed/open/gen/UpdateByHasherFloatLong.java
+++ b/engine/table/src/main/java/io/deephaven/engine/table/impl/updateby/hashing/typed/open/gen/UpdateByHasherFloatLong.java
@@ -70,12 +70,12 @@ protected void buildHashTable(RowSequence rowSequence, Chunk[] sourceKeyChunks,
             int tableLocation = firstTableLocation;
             MAIN_SEARCH: while (true) {
                 int rowState = stateSource.getUnsafe(tableLocation);
-                if (rowState == EMPTY_RIGHT_VALUE) {
+                if (isStateEmpty(rowState)) {
                     final int firstAlternateTableLocation = hashToTableLocationAlternate(hash);
                     int alternateTableLocation = firstAlternateTableLocation;
                     while (alternateTableLocation < rehashPointer) {
                         rowState = alternateStateSource.getUnsafe(alternateTableLocation);
-                        if (rowState == EMPTY_RIGHT_VALUE) {
+                        if (isStateEmpty(rowState)) {
                             break;
                         } else if (eq(alternateKeySource0.getUnsafe(alternateTableLocation), k0) && eq(alternateKeySource1.getUnsafe(alternateTableLocation), k1)) {
                             // map the existing bucket to this chunk position;
@@ -121,7 +121,7 @@ protected void probeHashTable(RowSequence rowSequence, Chunk[] sourceKeyChunks,
             boolean found = false;
             int tableLocation = firstTableLocation;
             int rowState;
-            while ((rowState = stateSource.getUnsafe(tableLocation)) != EMPTY_RIGHT_VALUE) {
+            while (!isStateEmpty(rowState = stateSource.getUnsafe(tableLocation))) {
                 if (eq(mainKeySource0.getUnsafe(tableLocation), k0) && eq(mainKeySource1.getUnsafe(tableLocation), k1)) {
                     // map the existing bucket to this chunk position;
                     outputPositions.set(chunkPosition, rowState);
@@ -136,7 +136,7 @@ protected void probeHashTable(RowSequence rowSequence, Chunk[] sourceKeyChunks,
                 boolean alternateFound = false;
                 if (firstAlternateTableLocation < rehashPointer) {
                     int alternateTableLocation = firstAlternateTableLocation;
-                    while ((rowState = alternateStateSource.getUnsafe(alternateTableLocation)) != EMPTY_RIGHT_VALUE) {
+                    while (!isStateEmpty(rowState = alternateStateSource.getUnsafe(alternateTableLocation))) {
                         if (eq(alternateKeySource0.getUnsafe(alternateTableLocation), k0) && eq(alternateKeySource1.getUnsafe(alternateTableLocation), k1)) {
                             // map the existing bucket (from alternate) to this chunk position;
                             outputPositions.set(chunkPosition, rowState);
@@ -161,17 +161,21 @@ private static int hash(float k0, long k1) {
         return hash;
     }
 
+    private static boolean isStateEmpty(int state) {
+        return state == EMPTY_RIGHT_VALUE;
+    }
+
     private boolean migrateOneLocation(int locationToMigrate,
             WritableIntChunk<RowKeys> outputPositions) {
         final int currentStateValue = alternateStateSource.getUnsafe(locationToMigrate);
-        if (currentStateValue == EMPTY_RIGHT_VALUE) {
+        if (isStateEmpty(currentStateValue)) {
             return false;
         }
         final float k0 = alternateKeySource0.getUnsafe(locationToMigrate);
         final long k1 = alternateKeySource1.getUnsafe(locationToMigrate);
         final int hash = hash(k0, k1);
         int destinationTableLocation = hashToTableLocation(hash);
-        while (stateSource.getUnsafe(destinationTableLocation) != EMPTY_RIGHT_VALUE) {
+        while (!isStateEmpty(stateSource.getUnsafe(destinationTableLocation))) {
             destinationTableLocation = nextTableLocation(destinationTableLocation);
         }
         mainKeySource0.set(destinationTableLocation, k0);
@@ -194,8 +198,7 @@ protected int rehashInternalPartial(int entriesToRehash,
     }
 
     @Override
-    protected void newAlternate() {
-        super.newAlternate();
+    protected void adviseNewAlternate() {
         this.mainKeySource0 = (ImmutableFloatArraySource)super.mainKeySources[0];
         this.alternateKeySource0 = (ImmutableFloatArraySource)super.alternateKeySources[0];
         this.mainKeySource1 = (ImmutableLongArraySource)super.mainKeySources[1];
@@ -212,7 +215,7 @@ protected void clearAlternate() {
     @Override
     protected void migrateFront(WritableIntChunk<RowKeys> outputPositions) {
         int location = 0;
-        while (migrateOneLocation(location++, outputPositions));
+        while (migrateOneLocation(location++, outputPositions) && location < alternateTableSize);
     }
 
     @Override
@@ -229,7 +232,7 @@ protected void rehashInternalFull(final int oldSize) {
         stateSource.setArray(destState);
         for (int sourceBucket = 0; sourceBucket < oldSize; ++sourceBucket) {
             final int currentStateValue = originalStateArray[sourceBucket];
-            if (currentStateValue == EMPTY_RIGHT_VALUE) {
+            if (isStateEmpty(currentStateValue)) {
                 continue;
             }
             final float k0 = originalKeyArray0[sourceBucket];
@@ -238,7 +241,7 @@ protected void rehashInternalFull(final int oldSize) {
             final int firstDestinationTableLocation = hashToTableLocation(hash);
             int destinationTableLocation = firstDestinationTableLocation;
             while (true) {
-                if (destState[destinationTableLocation] == EMPTY_RIGHT_VALUE) {
+                if (isStateEmpty(destState[destinationTableLocation])) {
                     destKeyArray0[destinationTableLocation] = k0;
                     destKeyArray1[destinationTableLocation] = k1;
                     destState[destinationTableLocation] = originalStateArray[sourceBucket];
diff --git a/engine/table/src/main/java/io/deephaven/engine/table/impl/updateby/hashing/typed/open/gen/UpdateByHasherFloatObject.java b/engine/table/src/main/java/io/deephaven/engine/table/impl/updateby/hashing/typed/open/gen/UpdateByHasherFloatObject.java
index d12ef11e17e..7e557a34acd 100644
--- a/engine/table/src/main/java/io/deephaven/engine/table/impl/updateby/hashing/typed/open/gen/UpdateByHasherFloatObject.java
+++ b/engine/table/src/main/java/io/deephaven/engine/table/impl/updateby/hashing/typed/open/gen/UpdateByHasherFloatObject.java
@@ -72,12 +72,12 @@ protected void buildHashTable(RowSequence rowSequence, Chunk[] sourceKeyChunks,
             int tableLocation = firstTableLocation;
             MAIN_SEARCH: while (true) {
                 int rowState = stateSource.getUnsafe(tableLocation);
-                if (rowState == EMPTY_RIGHT_VALUE) {
+                if (isStateEmpty(rowState)) {
                     final int firstAlternateTableLocation = hashToTableLocationAlternate(hash);
                     int alternateTableLocation = firstAlternateTableLocation;
                     while (alternateTableLocation < rehashPointer) {
                         rowState = alternateStateSource.getUnsafe(alternateTableLocation);
-                        if (rowState == EMPTY_RIGHT_VALUE) {
+                        if (isStateEmpty(rowState)) {
                             break;
                         } else if (eq(alternateKeySource0.getUnsafe(alternateTableLocation), k0) && eq(alternateKeySource1.getUnsafe(alternateTableLocation), k1)) {
                             // map the existing bucket to this chunk position;
@@ -123,7 +123,7 @@ protected void probeHashTable(RowSequence rowSequence, Chunk[] sourceKeyChunks,
             boolean found = false;
             int tableLocation = firstTableLocation;
             int rowState;
-            while ((rowState = stateSource.getUnsafe(tableLocation)) != EMPTY_RIGHT_VALUE) {
+            while (!isStateEmpty(rowState = stateSource.getUnsafe(tableLocation))) {
                 if (eq(mainKeySource0.getUnsafe(tableLocation), k0) && eq(mainKeySource1.getUnsafe(tableLocation), k1)) {
                     // map the existing bucket to this chunk position;
                     outputPositions.set(chunkPosition, rowState);
@@ -138,7 +138,7 @@ protected void probeHashTable(RowSequence rowSequence, Chunk[] sourceKeyChunks,
                 boolean alternateFound = false;
                 if (firstAlternateTableLocation < rehashPointer) {
                     int alternateTableLocation = firstAlternateTableLocation;
-                    while ((rowState = alternateStateSource.getUnsafe(alternateTableLocation)) != EMPTY_RIGHT_VALUE) {
+                    while (!isStateEmpty(rowState = alternateStateSource.getUnsafe(alternateTableLocation))) {
                         if (eq(alternateKeySource0.getUnsafe(alternateTableLocation), k0) && eq(alternateKeySource1.getUnsafe(alternateTableLocation), k1)) {
                             // map the existing bucket (from alternate) to this chunk position;
                             outputPositions.set(chunkPosition, rowState);
@@ -163,17 +163,21 @@ private static int hash(float k0, Object k1) {
         return hash;
     }
 
+    private static boolean isStateEmpty(int state) {
+        return state == EMPTY_RIGHT_VALUE;
+    }
+
     private boolean migrateOneLocation(int locationToMigrate,
             WritableIntChunk<RowKeys> outputPositions) {
         final int currentStateValue = alternateStateSource.getUnsafe(locationToMigrate);
-        if (currentStateValue == EMPTY_RIGHT_VALUE) {
+        if (isStateEmpty(currentStateValue)) {
             return false;
         }
         final float k0 = alternateKeySource0.getUnsafe(locationToMigrate);
         final Object k1 = alternateKeySource1.getUnsafe(locationToMigrate);
         final int hash = hash(k0, k1);
         int destinationTableLocation = hashToTableLocation(hash);
-        while (stateSource.getUnsafe(destinationTableLocation) != EMPTY_RIGHT_VALUE) {
+        while (!isStateEmpty(stateSource.getUnsafe(destinationTableLocation))) {
             destinationTableLocation = nextTableLocation(destinationTableLocation);
         }
         mainKeySource0.set(destinationTableLocation, k0);
@@ -197,8 +201,7 @@ protected int rehashInternalPartial(int entriesToRehash,
     }
 
     @Override
-    protected void newAlternate() {
-        super.newAlternate();
+    protected void adviseNewAlternate() {
         this.mainKeySource0 = (ImmutableFloatArraySource)super.mainKeySources[0];
         this.alternateKeySource0 = (ImmutableFloatArraySource)super.alternateKeySources[0];
         this.mainKeySource1 = (ImmutableObjectArraySource)super.mainKeySources[1];
@@ -215,7 +218,7 @@ protected void clearAlternate() {
     @Override
     protected void migrateFront(WritableIntChunk<RowKeys> outputPositions) {
         int location = 0;
-        while (migrateOneLocation(location++, outputPositions));
+        while (migrateOneLocation(location++, outputPositions) && location < alternateTableSize);
     }
 
     @Override
@@ -232,7 +235,7 @@ protected void rehashInternalFull(final int oldSize) {
         stateSource.setArray(destState);
         for (int sourceBucket = 0; sourceBucket < oldSize; ++sourceBucket) {
             final int currentStateValue = originalStateArray[sourceBucket];
-            if (currentStateValue == EMPTY_RIGHT_VALUE) {
+            if (isStateEmpty(currentStateValue)) {
                 continue;
             }
             final float k0 = originalKeyArray0[sourceBucket];
@@ -241,7 +244,7 @@ protected void rehashInternalFull(final int oldSize) {
             final int firstDestinationTableLocation = hashToTableLocation(hash);
             int destinationTableLocation = firstDestinationTableLocation;
             while (true) {
-                if (destState[destinationTableLocation] == EMPTY_RIGHT_VALUE) {
+                if (isStateEmpty(destState[destinationTableLocation])) {
                     destKeyArray0[destinationTableLocation] = k0;
                     destKeyArray1[destinationTableLocation] = k1;
                     destState[destinationTableLocation] = originalStateArray[sourceBucket];
diff --git a/engine/table/src/main/java/io/deephaven/engine/table/impl/updateby/hashing/typed/open/gen/UpdateByHasherFloatShort.java b/engine/table/src/main/java/io/deephaven/engine/table/impl/updateby/hashing/typed/open/gen/UpdateByHasherFloatShort.java
index 0e512790ad9..d934b77c1e1 100644
--- a/engine/table/src/main/java/io/deephaven/engine/table/impl/updateby/hashing/typed/open/gen/UpdateByHasherFloatShort.java
+++ b/engine/table/src/main/java/io/deephaven/engine/table/impl/updateby/hashing/typed/open/gen/UpdateByHasherFloatShort.java
@@ -71,12 +71,12 @@ protected void buildHashTable(RowSequence rowSequence, Chunk[] sourceKeyChunks,
             int tableLocation = firstTableLocation;
             MAIN_SEARCH: while (true) {
                 int rowState = stateSource.getUnsafe(tableLocation);
-                if (rowState == EMPTY_RIGHT_VALUE) {
+                if (isStateEmpty(rowState)) {
                     final int firstAlternateTableLocation = hashToTableLocationAlternate(hash);
                     int alternateTableLocation = firstAlternateTableLocation;
                     while (alternateTableLocation < rehashPointer) {
                         rowState = alternateStateSource.getUnsafe(alternateTableLocation);
-                        if (rowState == EMPTY_RIGHT_VALUE) {
+                        if (isStateEmpty(rowState)) {
                             break;
                         } else if (eq(alternateKeySource0.getUnsafe(alternateTableLocation), k0) && eq(alternateKeySource1.getUnsafe(alternateTableLocation), k1)) {
                             // map the existing bucket to this chunk position;
@@ -122,7 +122,7 @@ protected void probeHashTable(RowSequence rowSequence, Chunk[] sourceKeyChunks,
             boolean found = false;
             int tableLocation = firstTableLocation;
             int rowState;
-            while ((rowState = stateSource.getUnsafe(tableLocation)) != EMPTY_RIGHT_VALUE) {
+            while (!isStateEmpty(rowState = stateSource.getUnsafe(tableLocation))) {
                 if (eq(mainKeySource0.getUnsafe(tableLocation), k0) && eq(mainKeySource1.getUnsafe(tableLocation), k1)) {
                     // map the existing bucket to this chunk position;
                     outputPositions.set(chunkPosition, rowState);
@@ -137,7 +137,7 @@ protected void probeHashTable(RowSequence rowSequence, Chunk[] sourceKeyChunks,
                 boolean alternateFound = false;
                 if (firstAlternateTableLocation < rehashPointer) {
                     int alternateTableLocation = firstAlternateTableLocation;
-                    while ((rowState = alternateStateSource.getUnsafe(alternateTableLocation)) != EMPTY_RIGHT_VALUE) {
+                    while (!isStateEmpty(rowState = alternateStateSource.getUnsafe(alternateTableLocation))) {
                         if (eq(alternateKeySource0.getUnsafe(alternateTableLocation), k0) && eq(alternateKeySource1.getUnsafe(alternateTableLocation), k1)) {
                             // map the existing bucket (from alternate) to this chunk position;
                             outputPositions.set(chunkPosition, rowState);
@@ -162,17 +162,21 @@ private static int hash(float k0, short k1) {
         return hash;
     }
 
+    private static boolean isStateEmpty(int state) {
+        return state == EMPTY_RIGHT_VALUE;
+    }
+
     private boolean migrateOneLocation(int locationToMigrate,
             WritableIntChunk<RowKeys> outputPositions) {
         final int currentStateValue = alternateStateSource.getUnsafe(locationToMigrate);
-        if (currentStateValue == EMPTY_RIGHT_VALUE) {
+        if (isStateEmpty(currentStateValue)) {
             return false;
         }
         final float k0 = alternateKeySource0.getUnsafe(locationToMigrate);
         final short k1 = alternateKeySource1.getUnsafe(locationToMigrate);
         final int hash = hash(k0, k1);
         int destinationTableLocation = hashToTableLocation(hash);
-        while (stateSource.getUnsafe(destinationTableLocation) != EMPTY_RIGHT_VALUE) {
+        while (!isStateEmpty(stateSource.getUnsafe(destinationTableLocation))) {
             destinationTableLocation = nextTableLocation(destinationTableLocation);
         }
         mainKeySource0.set(destinationTableLocation, k0);
@@ -195,8 +199,7 @@ protected int rehashInternalPartial(int entriesToRehash,
     }
 
     @Override
-    protected void newAlternate() {
-        super.newAlternate();
+    protected void adviseNewAlternate() {
         this.mainKeySource0 = (ImmutableFloatArraySource)super.mainKeySources[0];
         this.alternateKeySource0 = (ImmutableFloatArraySource)super.alternateKeySources[0];
         this.mainKeySource1 = (ImmutableShortArraySource)super.mainKeySources[1];
@@ -213,7 +216,7 @@ protected void clearAlternate() {
     @Override
     protected void migrateFront(WritableIntChunk<RowKeys> outputPositions) {
         int location = 0;
-        while (migrateOneLocation(location++, outputPositions));
+        while (migrateOneLocation(location++, outputPositions) && location < alternateTableSize);
     }
 
     @Override
@@ -230,7 +233,7 @@ protected void rehashInternalFull(final int oldSize) {
         stateSource.setArray(destState);
         for (int sourceBucket = 0; sourceBucket < oldSize; ++sourceBucket) {
             final int currentStateValue = originalStateArray[sourceBucket];
-            if (currentStateValue == EMPTY_RIGHT_VALUE) {
+            if (isStateEmpty(currentStateValue)) {
                 continue;
             }
             final float k0 = originalKeyArray0[sourceBucket];
@@ -239,7 +242,7 @@ protected void rehashInternalFull(final int oldSize) {
             final int firstDestinationTableLocation = hashToTableLocation(hash);
             int destinationTableLocation = firstDestinationTableLocation;
             while (true) {
-                if (destState[destinationTableLocation] == EMPTY_RIGHT_VALUE) {
+                if (isStateEmpty(destState[destinationTableLocation])) {
                     destKeyArray0[destinationTableLocation] = k0;
                     destKeyArray1[destinationTableLocation] = k1;
                     destState[destinationTableLocation] = originalStateArray[sourceBucket];
diff --git a/engine/table/src/main/java/io/deephaven/engine/table/impl/updateby/hashing/typed/open/gen/UpdateByHasherInt.java b/engine/table/src/main/java/io/deephaven/engine/table/impl/updateby/hashing/typed/open/gen/UpdateByHasherInt.java
index f5573bc7620..d25d45bd5ae 100644
--- a/engine/table/src/main/java/io/deephaven/engine/table/impl/updateby/hashing/typed/open/gen/UpdateByHasherInt.java
+++ b/engine/table/src/main/java/io/deephaven/engine/table/impl/updateby/hashing/typed/open/gen/UpdateByHasherInt.java
@@ -58,12 +58,12 @@ protected void buildHashTable(RowSequence rowSequence, Chunk[] sourceKeyChunks,
             int tableLocation = firstTableLocation;
             MAIN_SEARCH: while (true) {
                 int rowState = stateSource.getUnsafe(tableLocation);
-                if (rowState == EMPTY_RIGHT_VALUE) {
+                if (isStateEmpty(rowState)) {
                     final int firstAlternateTableLocation = hashToTableLocationAlternate(hash);
                     int alternateTableLocation = firstAlternateTableLocation;
                     while (alternateTableLocation < rehashPointer) {
                         rowState = alternateStateSource.getUnsafe(alternateTableLocation);
-                        if (rowState == EMPTY_RIGHT_VALUE) {
+                        if (isStateEmpty(rowState)) {
                             break;
                         } else if (eq(alternateKeySource0.getUnsafe(alternateTableLocation), k0)) {
                             // map the existing bucket to this chunk position;
@@ -106,7 +106,7 @@ protected void probeHashTable(RowSequence rowSequence, Chunk[] sourceKeyChunks,
             boolean found = false;
             int tableLocation = firstTableLocation;
             int rowState;
-            while ((rowState = stateSource.getUnsafe(tableLocation)) != EMPTY_RIGHT_VALUE) {
+            while (!isStateEmpty(rowState = stateSource.getUnsafe(tableLocation))) {
                 if (eq(mainKeySource0.getUnsafe(tableLocation), k0)) {
                     // map the existing bucket to this chunk position;
                     outputPositions.set(chunkPosition, rowState);
@@ -121,7 +121,7 @@ protected void probeHashTable(RowSequence rowSequence, Chunk[] sourceKeyChunks,
                 boolean alternateFound = false;
                 if (firstAlternateTableLocation < rehashPointer) {
                     int alternateTableLocation = firstAlternateTableLocation;
-                    while ((rowState = alternateStateSource.getUnsafe(alternateTableLocation)) != EMPTY_RIGHT_VALUE) {
+                    while (!isStateEmpty(rowState = alternateStateSource.getUnsafe(alternateTableLocation))) {
                         if (eq(alternateKeySource0.getUnsafe(alternateTableLocation), k0)) {
                             // map the existing bucket (from alternate) to this chunk position;
                             outputPositions.set(chunkPosition, rowState);
@@ -145,16 +145,20 @@ private static int hash(int k0) {
         return hash;
     }
 
+    private static boolean isStateEmpty(int state) {
+        return state == EMPTY_RIGHT_VALUE;
+    }
+
     private boolean migrateOneLocation(int locationToMigrate,
             WritableIntChunk<RowKeys> outputPositions) {
         final int currentStateValue = alternateStateSource.getUnsafe(locationToMigrate);
-        if (currentStateValue == EMPTY_RIGHT_VALUE) {
+        if (isStateEmpty(currentStateValue)) {
             return false;
         }
         final int k0 = alternateKeySource0.getUnsafe(locationToMigrate);
         final int hash = hash(k0);
         int destinationTableLocation = hashToTableLocation(hash);
-        while (stateSource.getUnsafe(destinationTableLocation) != EMPTY_RIGHT_VALUE) {
+        while (!isStateEmpty(stateSource.getUnsafe(destinationTableLocation))) {
             destinationTableLocation = nextTableLocation(destinationTableLocation);
         }
         mainKeySource0.set(destinationTableLocation, k0);
@@ -176,8 +180,7 @@ protected int rehashInternalPartial(int entriesToRehash,
     }
 
     @Override
-    protected void newAlternate() {
-        super.newAlternate();
+    protected void adviseNewAlternate() {
         this.mainKeySource0 = (ImmutableIntArraySource)super.mainKeySources[0];
         this.alternateKeySource0 = (ImmutableIntArraySource)super.alternateKeySources[0];
     }
@@ -191,7 +194,7 @@ protected void clearAlternate() {
     @Override
     protected void migrateFront(WritableIntChunk<RowKeys> outputPositions) {
         int location = 0;
-        while (migrateOneLocation(location++, outputPositions));
+        while (migrateOneLocation(location++, outputPositions) && location < alternateTableSize);
     }
 
     @Override
@@ -205,7 +208,7 @@ protected void rehashInternalFull(final int oldSize) {
         stateSource.setArray(destState);
         for (int sourceBucket = 0; sourceBucket < oldSize; ++sourceBucket) {
             final int currentStateValue = originalStateArray[sourceBucket];
-            if (currentStateValue == EMPTY_RIGHT_VALUE) {
+            if (isStateEmpty(currentStateValue)) {
                 continue;
             }
             final int k0 = originalKeyArray0[sourceBucket];
@@ -213,7 +216,7 @@ protected void rehashInternalFull(final int oldSize) {
             final int firstDestinationTableLocation = hashToTableLocation(hash);
             int destinationTableLocation = firstDestinationTableLocation;
             while (true) {
-                if (destState[destinationTableLocation] == EMPTY_RIGHT_VALUE) {
+                if (isStateEmpty(destState[destinationTableLocation])) {
                     destKeyArray0[destinationTableLocation] = k0;
                     destState[destinationTableLocation] = originalStateArray[sourceBucket];
                     break;
diff --git a/engine/table/src/main/java/io/deephaven/engine/table/impl/updateby/hashing/typed/open/gen/UpdateByHasherIntByte.java b/engine/table/src/main/java/io/deephaven/engine/table/impl/updateby/hashing/typed/open/gen/UpdateByHasherIntByte.java
index e3d466cbd9f..42b77d476fb 100644
--- a/engine/table/src/main/java/io/deephaven/engine/table/impl/updateby/hashing/typed/open/gen/UpdateByHasherIntByte.java
+++ b/engine/table/src/main/java/io/deephaven/engine/table/impl/updateby/hashing/typed/open/gen/UpdateByHasherIntByte.java
@@ -71,12 +71,12 @@ protected void buildHashTable(RowSequence rowSequence, Chunk[] sourceKeyChunks,
             int tableLocation = firstTableLocation;
             MAIN_SEARCH: while (true) {
                 int rowState = stateSource.getUnsafe(tableLocation);
-                if (rowState == EMPTY_RIGHT_VALUE) {
+                if (isStateEmpty(rowState)) {
                     final int firstAlternateTableLocation = hashToTableLocationAlternate(hash);
                     int alternateTableLocation = firstAlternateTableLocation;
                     while (alternateTableLocation < rehashPointer) {
                         rowState = alternateStateSource.getUnsafe(alternateTableLocation);
-                        if (rowState == EMPTY_RIGHT_VALUE) {
+                        if (isStateEmpty(rowState)) {
                             break;
                         } else if (eq(alternateKeySource0.getUnsafe(alternateTableLocation), k0) && eq(alternateKeySource1.getUnsafe(alternateTableLocation), k1)) {
                             // map the existing bucket to this chunk position;
@@ -122,7 +122,7 @@ protected void probeHashTable(RowSequence rowSequence, Chunk[] sourceKeyChunks,
             boolean found = false;
             int tableLocation = firstTableLocation;
             int rowState;
-            while ((rowState = stateSource.getUnsafe(tableLocation)) != EMPTY_RIGHT_VALUE) {
+            while (!isStateEmpty(rowState = stateSource.getUnsafe(tableLocation))) {
                 if (eq(mainKeySource0.getUnsafe(tableLocation), k0) && eq(mainKeySource1.getUnsafe(tableLocation), k1)) {
                     // map the existing bucket to this chunk position;
                     outputPositions.set(chunkPosition, rowState);
@@ -137,7 +137,7 @@ protected void probeHashTable(RowSequence rowSequence, Chunk[] sourceKeyChunks,
                 boolean alternateFound = false;
                 if (firstAlternateTableLocation < rehashPointer) {
                     int alternateTableLocation = firstAlternateTableLocation;
-                    while ((rowState = alternateStateSource.getUnsafe(alternateTableLocation)) != EMPTY_RIGHT_VALUE) {
+                    while (!isStateEmpty(rowState = alternateStateSource.getUnsafe(alternateTableLocation))) {
                         if (eq(alternateKeySource0.getUnsafe(alternateTableLocation), k0) && eq(alternateKeySource1.getUnsafe(alternateTableLocation), k1)) {
                             // map the existing bucket (from alternate) to this chunk position;
                             outputPositions.set(chunkPosition, rowState);
@@ -162,17 +162,21 @@ private static int hash(int k0, byte k1) {
         return hash;
     }
 
+    private static boolean isStateEmpty(int state) {
+        return state == EMPTY_RIGHT_VALUE;
+    }
+
     private boolean migrateOneLocation(int locationToMigrate,
             WritableIntChunk<RowKeys> outputPositions) {
         final int currentStateValue = alternateStateSource.getUnsafe(locationToMigrate);
-        if (currentStateValue == EMPTY_RIGHT_VALUE) {
+        if (isStateEmpty(currentStateValue)) {
             return false;
         }
         final int k0 = alternateKeySource0.getUnsafe(locationToMigrate);
         final byte k1 = alternateKeySource1.getUnsafe(locationToMigrate);
         final int hash = hash(k0, k1);
         int destinationTableLocation = hashToTableLocation(hash);
-        while (stateSource.getUnsafe(destinationTableLocation) != EMPTY_RIGHT_VALUE) {
+        while (!isStateEmpty(stateSource.getUnsafe(destinationTableLocation))) {
             destinationTableLocation = nextTableLocation(destinationTableLocation);
         }
         mainKeySource0.set(destinationTableLocation, k0);
@@ -195,8 +199,7 @@ protected int rehashInternalPartial(int entriesToRehash,
     }
 
     @Override
-    protected void newAlternate() {
-        super.newAlternate();
+    protected void adviseNewAlternate() {
         this.mainKeySource0 = (ImmutableIntArraySource)super.mainKeySources[0];
         this.alternateKeySource0 = (ImmutableIntArraySource)super.alternateKeySources[0];
         this.mainKeySource1 = (ImmutableByteArraySource)super.mainKeySources[1];
@@ -213,7 +216,7 @@ protected void clearAlternate() {
     @Override
     protected void migrateFront(WritableIntChunk<RowKeys> outputPositions) {
         int location = 0;
-        while (migrateOneLocation(location++, outputPositions));
+        while (migrateOneLocation(location++, outputPositions) && location < alternateTableSize);
     }
 
     @Override
@@ -230,7 +233,7 @@ protected void rehashInternalFull(final int oldSize) {
         stateSource.setArray(destState);
         for (int sourceBucket = 0; sourceBucket < oldSize; ++sourceBucket) {
             final int currentStateValue = originalStateArray[sourceBucket];
-            if (currentStateValue == EMPTY_RIGHT_VALUE) {
+            if (isStateEmpty(currentStateValue)) {
                 continue;
             }
             final int k0 = originalKeyArray0[sourceBucket];
@@ -239,7 +242,7 @@ protected void rehashInternalFull(final int oldSize) {
             final int firstDestinationTableLocation = hashToTableLocation(hash);
             int destinationTableLocation = firstDestinationTableLocation;
             while (true) {
-                if (destState[destinationTableLocation] == EMPTY_RIGHT_VALUE) {
+                if (isStateEmpty(destState[destinationTableLocation])) {
                     destKeyArray0[destinationTableLocation] = k0;
                     destKeyArray1[destinationTableLocation] = k1;
                     destState[destinationTableLocation] = originalStateArray[sourceBucket];
diff --git a/engine/table/src/main/java/io/deephaven/engine/table/impl/updateby/hashing/typed/open/gen/UpdateByHasherIntChar.java b/engine/table/src/main/java/io/deephaven/engine/table/impl/updateby/hashing/typed/open/gen/UpdateByHasherIntChar.java
index 6ef113da5e5..55761aa83e5 100644
--- a/engine/table/src/main/java/io/deephaven/engine/table/impl/updateby/hashing/typed/open/gen/UpdateByHasherIntChar.java
+++ b/engine/table/src/main/java/io/deephaven/engine/table/impl/updateby/hashing/typed/open/gen/UpdateByHasherIntChar.java
@@ -71,12 +71,12 @@ protected void buildHashTable(RowSequence rowSequence, Chunk[] sourceKeyChunks,
             int tableLocation = firstTableLocation;
             MAIN_SEARCH: while (true) {
                 int rowState = stateSource.getUnsafe(tableLocation);
-                if (rowState == EMPTY_RIGHT_VALUE) {
+                if (isStateEmpty(rowState)) {
                     final int firstAlternateTableLocation = hashToTableLocationAlternate(hash);
                     int alternateTableLocation = firstAlternateTableLocation;
                     while (alternateTableLocation < rehashPointer) {
                         rowState = alternateStateSource.getUnsafe(alternateTableLocation);
-                        if (rowState == EMPTY_RIGHT_VALUE) {
+                        if (isStateEmpty(rowState)) {
                             break;
                         } else if (eq(alternateKeySource0.getUnsafe(alternateTableLocation), k0) && eq(alternateKeySource1.getUnsafe(alternateTableLocation), k1)) {
                             // map the existing bucket to this chunk position;
@@ -122,7 +122,7 @@ protected void probeHashTable(RowSequence rowSequence, Chunk[] sourceKeyChunks,
             boolean found = false;
             int tableLocation = firstTableLocation;
             int rowState;
-            while ((rowState = stateSource.getUnsafe(tableLocation)) != EMPTY_RIGHT_VALUE) {
+            while (!isStateEmpty(rowState = stateSource.getUnsafe(tableLocation))) {
                 if (eq(mainKeySource0.getUnsafe(tableLocation), k0) && eq(mainKeySource1.getUnsafe(tableLocation), k1)) {
                     // map the existing bucket to this chunk position;
                     outputPositions.set(chunkPosition, rowState);
@@ -137,7 +137,7 @@ protected void probeHashTable(RowSequence rowSequence, Chunk[] sourceKeyChunks,
                 boolean alternateFound = false;
                 if (firstAlternateTableLocation < rehashPointer) {
                     int alternateTableLocation = firstAlternateTableLocation;
-                    while ((rowState = alternateStateSource.getUnsafe(alternateTableLocation)) != EMPTY_RIGHT_VALUE) {
+                    while (!isStateEmpty(rowState = alternateStateSource.getUnsafe(alternateTableLocation))) {
                         if (eq(alternateKeySource0.getUnsafe(alternateTableLocation), k0) && eq(alternateKeySource1.getUnsafe(alternateTableLocation), k1)) {
                             // map the existing bucket (from alternate) to this chunk position;
                             outputPositions.set(chunkPosition, rowState);
@@ -162,17 +162,21 @@ private static int hash(int k0, char k1) {
         return hash;
     }
 
+    private static boolean isStateEmpty(int state) {
+        return state == EMPTY_RIGHT_VALUE;
+    }
+
     private boolean migrateOneLocation(int locationToMigrate,
             WritableIntChunk<RowKeys> outputPositions) {
         final int currentStateValue = alternateStateSource.getUnsafe(locationToMigrate);
-        if (currentStateValue == EMPTY_RIGHT_VALUE) {
+        if (isStateEmpty(currentStateValue)) {
             return false;
         }
         final int k0 = alternateKeySource0.getUnsafe(locationToMigrate);
         final char k1 = alternateKeySource1.getUnsafe(locationToMigrate);
         final int hash = hash(k0, k1);
         int destinationTableLocation = hashToTableLocation(hash);
-        while (stateSource.getUnsafe(destinationTableLocation) != EMPTY_RIGHT_VALUE) {
+        while (!isStateEmpty(stateSource.getUnsafe(destinationTableLocation))) {
             destinationTableLocation = nextTableLocation(destinationTableLocation);
         }
         mainKeySource0.set(destinationTableLocation, k0);
@@ -195,8 +199,7 @@ protected int rehashInternalPartial(int entriesToRehash,
     }
 
     @Override
-    protected void newAlternate() {
-        super.newAlternate();
+    protected void adviseNewAlternate() {
         this.mainKeySource0 = (ImmutableIntArraySource)super.mainKeySources[0];
         this.alternateKeySource0 = (ImmutableIntArraySource)super.alternateKeySources[0];
         this.mainKeySource1 = (ImmutableCharArraySource)super.mainKeySources[1];
@@ -213,7 +216,7 @@ protected void clearAlternate() {
     @Override
     protected void migrateFront(WritableIntChunk<RowKeys> outputPositions) {
         int location = 0;
-        while (migrateOneLocation(location++, outputPositions));
+        while (migrateOneLocation(location++, outputPositions) && location < alternateTableSize);
     }
 
     @Override
@@ -230,7 +233,7 @@ protected void rehashInternalFull(final int oldSize) {
         stateSource.setArray(destState);
         for (int sourceBucket = 0; sourceBucket < oldSize; ++sourceBucket) {
             final int currentStateValue = originalStateArray[sourceBucket];
-            if (currentStateValue == EMPTY_RIGHT_VALUE) {
+            if (isStateEmpty(currentStateValue)) {
                 continue;
             }
             final int k0 = originalKeyArray0[sourceBucket];
@@ -239,7 +242,7 @@ protected void rehashInternalFull(final int oldSize) {
             final int firstDestinationTableLocation = hashToTableLocation(hash);
             int destinationTableLocation = firstDestinationTableLocation;
             while (true) {
-                if (destState[destinationTableLocation] == EMPTY_RIGHT_VALUE) {
+                if (isStateEmpty(destState[destinationTableLocation])) {
                     destKeyArray0[destinationTableLocation] = k0;
                     destKeyArray1[destinationTableLocation] = k1;
                     destState[destinationTableLocation] = originalStateArray[sourceBucket];
diff --git a/engine/table/src/main/java/io/deephaven/engine/table/impl/updateby/hashing/typed/open/gen/UpdateByHasherIntDouble.java b/engine/table/src/main/java/io/deephaven/engine/table/impl/updateby/hashing/typed/open/gen/UpdateByHasherIntDouble.java
index 06b7ff80162..e01016f9c9a 100644
--- a/engine/table/src/main/java/io/deephaven/engine/table/impl/updateby/hashing/typed/open/gen/UpdateByHasherIntDouble.java
+++ b/engine/table/src/main/java/io/deephaven/engine/table/impl/updateby/hashing/typed/open/gen/UpdateByHasherIntDouble.java
@@ -71,12 +71,12 @@ protected void buildHashTable(RowSequence rowSequence, Chunk[] sourceKeyChunks,
             int tableLocation = firstTableLocation;
             MAIN_SEARCH: while (true) {
                 int rowState = stateSource.getUnsafe(tableLocation);
-                if (rowState == EMPTY_RIGHT_VALUE) {
+                if (isStateEmpty(rowState)) {
                     final int firstAlternateTableLocation = hashToTableLocationAlternate(hash);
                     int alternateTableLocation = firstAlternateTableLocation;
                     while (alternateTableLocation < rehashPointer) {
                         rowState = alternateStateSource.getUnsafe(alternateTableLocation);
-                        if (rowState == EMPTY_RIGHT_VALUE) {
+                        if (isStateEmpty(rowState)) {
                             break;
                         } else if (eq(alternateKeySource0.getUnsafe(alternateTableLocation), k0) && eq(alternateKeySource1.getUnsafe(alternateTableLocation), k1)) {
                             // map the existing bucket to this chunk position;
@@ -122,7 +122,7 @@ protected void probeHashTable(RowSequence rowSequence, Chunk[] sourceKeyChunks,
             boolean found = false;
             int tableLocation = firstTableLocation;
             int rowState;
-            while ((rowState = stateSource.getUnsafe(tableLocation)) != EMPTY_RIGHT_VALUE) {
+            while (!isStateEmpty(rowState = stateSource.getUnsafe(tableLocation))) {
                 if (eq(mainKeySource0.getUnsafe(tableLocation), k0) && eq(mainKeySource1.getUnsafe(tableLocation), k1)) {
                     // map the existing bucket to this chunk position;
                     outputPositions.set(chunkPosition, rowState);
@@ -137,7 +137,7 @@ protected void probeHashTable(RowSequence rowSequence, Chunk[] sourceKeyChunks,
                 boolean alternateFound = false;
                 if (firstAlternateTableLocation < rehashPointer) {
                     int alternateTableLocation = firstAlternateTableLocation;
-                    while ((rowState = alternateStateSource.getUnsafe(alternateTableLocation)) != EMPTY_RIGHT_VALUE) {
+                    while (!isStateEmpty(rowState = alternateStateSource.getUnsafe(alternateTableLocation))) {
                         if (eq(alternateKeySource0.getUnsafe(alternateTableLocation), k0) && eq(alternateKeySource1.getUnsafe(alternateTableLocation), k1)) {
                             // map the existing bucket (from alternate) to this chunk position;
                             outputPositions.set(chunkPosition, rowState);
@@ -162,17 +162,21 @@ private static int hash(int k0, double k1) {
         return hash;
     }
 
+    private static boolean isStateEmpty(int state) {
+        return state == EMPTY_RIGHT_VALUE;
+    }
+
     private boolean migrateOneLocation(int locationToMigrate,
             WritableIntChunk<RowKeys> outputPositions) {
         final int currentStateValue = alternateStateSource.getUnsafe(locationToMigrate);
-        if (currentStateValue == EMPTY_RIGHT_VALUE) {
+        if (isStateEmpty(currentStateValue)) {
             return false;
         }
         final int k0 = alternateKeySource0.getUnsafe(locationToMigrate);
         final double k1 = alternateKeySource1.getUnsafe(locationToMigrate);
         final int hash = hash(k0, k1);
         int destinationTableLocation = hashToTableLocation(hash);
-        while (stateSource.getUnsafe(destinationTableLocation) != EMPTY_RIGHT_VALUE) {
+        while (!isStateEmpty(stateSource.getUnsafe(destinationTableLocation))) {
             destinationTableLocation = nextTableLocation(destinationTableLocation);
         }
         mainKeySource0.set(destinationTableLocation, k0);
@@ -195,8 +199,7 @@ protected int rehashInternalPartial(int entriesToRehash,
     }
 
     @Override
-    protected void newAlternate() {
-        super.newAlternate();
+    protected void adviseNewAlternate() {
         this.mainKeySource0 = (ImmutableIntArraySource)super.mainKeySources[0];
         this.alternateKeySource0 = (ImmutableIntArraySource)super.alternateKeySources[0];
         this.mainKeySource1 = (ImmutableDoubleArraySource)super.mainKeySources[1];
@@ -213,7 +216,7 @@ protected void clearAlternate() {
     @Override
     protected void migrateFront(WritableIntChunk<RowKeys> outputPositions) {
         int location = 0;
-        while (migrateOneLocation(location++, outputPositions));
+        while (migrateOneLocation(location++, outputPositions) && location < alternateTableSize);
     }
 
     @Override
@@ -230,7 +233,7 @@ protected void rehashInternalFull(final int oldSize) {
         stateSource.setArray(destState);
         for (int sourceBucket = 0; sourceBucket < oldSize; ++sourceBucket) {
             final int currentStateValue = originalStateArray[sourceBucket];
-            if (currentStateValue == EMPTY_RIGHT_VALUE) {
+            if (isStateEmpty(currentStateValue)) {
                 continue;
             }
             final int k0 = originalKeyArray0[sourceBucket];
@@ -239,7 +242,7 @@ protected void rehashInternalFull(final int oldSize) {
             final int firstDestinationTableLocation = hashToTableLocation(hash);
             int destinationTableLocation = firstDestinationTableLocation;
             while (true) {
-                if (destState[destinationTableLocation] == EMPTY_RIGHT_VALUE) {
+                if (isStateEmpty(destState[destinationTableLocation])) {
                     destKeyArray0[destinationTableLocation] = k0;
                     destKeyArray1[destinationTableLocation] = k1;
                     destState[destinationTableLocation] = originalStateArray[sourceBucket];
diff --git a/engine/table/src/main/java/io/deephaven/engine/table/impl/updateby/hashing/typed/open/gen/UpdateByHasherIntFloat.java b/engine/table/src/main/java/io/deephaven/engine/table/impl/updateby/hashing/typed/open/gen/UpdateByHasherIntFloat.java
index 1fb94dfec49..a880dc87579 100644
--- a/engine/table/src/main/java/io/deephaven/engine/table/impl/updateby/hashing/typed/open/gen/UpdateByHasherIntFloat.java
+++ b/engine/table/src/main/java/io/deephaven/engine/table/impl/updateby/hashing/typed/open/gen/UpdateByHasherIntFloat.java
@@ -71,12 +71,12 @@ protected void buildHashTable(RowSequence rowSequence, Chunk[] sourceKeyChunks,
             int tableLocation = firstTableLocation;
             MAIN_SEARCH: while (true) {
                 int rowState = stateSource.getUnsafe(tableLocation);
-                if (rowState == EMPTY_RIGHT_VALUE) {
+                if (isStateEmpty(rowState)) {
                     final int firstAlternateTableLocation = hashToTableLocationAlternate(hash);
                     int alternateTableLocation = firstAlternateTableLocation;
                     while (alternateTableLocation < rehashPointer) {
                         rowState = alternateStateSource.getUnsafe(alternateTableLocation);
-                        if (rowState == EMPTY_RIGHT_VALUE) {
+                        if (isStateEmpty(rowState)) {
                             break;
                         } else if (eq(alternateKeySource0.getUnsafe(alternateTableLocation), k0) && eq(alternateKeySource1.getUnsafe(alternateTableLocation), k1)) {
                             // map the existing bucket to this chunk position;
@@ -122,7 +122,7 @@ protected void probeHashTable(RowSequence rowSequence, Chunk[] sourceKeyChunks,
             boolean found = false;
             int tableLocation = firstTableLocation;
             int rowState;
-            while ((rowState = stateSource.getUnsafe(tableLocation)) != EMPTY_RIGHT_VALUE) {
+            while (!isStateEmpty(rowState = stateSource.getUnsafe(tableLocation))) {
                 if (eq(mainKeySource0.getUnsafe(tableLocation), k0) && eq(mainKeySource1.getUnsafe(tableLocation), k1)) {
                     // map the existing bucket to this chunk position;
                     outputPositions.set(chunkPosition, rowState);
@@ -137,7 +137,7 @@ protected void probeHashTable(RowSequence rowSequence, Chunk[] sourceKeyChunks,
                 boolean alternateFound = false;
                 if (firstAlternateTableLocation < rehashPointer) {
                     int alternateTableLocation = firstAlternateTableLocation;
-                    while ((rowState = alternateStateSource.getUnsafe(alternateTableLocation)) != EMPTY_RIGHT_VALUE) {
+                    while (!isStateEmpty(rowState = alternateStateSource.getUnsafe(alternateTableLocation))) {
                         if (eq(alternateKeySource0.getUnsafe(alternateTableLocation), k0) && eq(alternateKeySource1.getUnsafe(alternateTableLocation), k1)) {
                             // map the existing bucket (from alternate) to this chunk position;
                             outputPositions.set(chunkPosition, rowState);
@@ -162,17 +162,21 @@ private static int hash(int k0, float k1) {
         return hash;
     }
 
+    private static boolean isStateEmpty(int state) {
+        return state == EMPTY_RIGHT_VALUE;
+    }
+
     private boolean migrateOneLocation(int locationToMigrate,
             WritableIntChunk<RowKeys> outputPositions) {
         final int currentStateValue = alternateStateSource.getUnsafe(locationToMigrate);
-        if (currentStateValue == EMPTY_RIGHT_VALUE) {
+        if (isStateEmpty(currentStateValue)) {
             return false;
         }
         final int k0 = alternateKeySource0.getUnsafe(locationToMigrate);
         final float k1 = alternateKeySource1.getUnsafe(locationToMigrate);
         final int hash = hash(k0, k1);
         int destinationTableLocation = hashToTableLocation(hash);
-        while (stateSource.getUnsafe(destinationTableLocation) != EMPTY_RIGHT_VALUE) {
+        while (!isStateEmpty(stateSource.getUnsafe(destinationTableLocation))) {
             destinationTableLocation = nextTableLocation(destinationTableLocation);
         }
         mainKeySource0.set(destinationTableLocation, k0);
@@ -195,8 +199,7 @@ protected int rehashInternalPartial(int entriesToRehash,
     }
 
     @Override
-    protected void newAlternate() {
-        super.newAlternate();
+    protected void adviseNewAlternate() {
         this.mainKeySource0 = (ImmutableIntArraySource)super.mainKeySources[0];
         this.alternateKeySource0 = (ImmutableIntArraySource)super.alternateKeySources[0];
         this.mainKeySource1 = (ImmutableFloatArraySource)super.mainKeySources[1];
@@ -213,7 +216,7 @@ protected void clearAlternate() {
     @Override
     protected void migrateFront(WritableIntChunk<RowKeys> outputPositions) {
         int location = 0;
-        while (migrateOneLocation(location++, outputPositions));
+        while (migrateOneLocation(location++, outputPositions) && location < alternateTableSize);
     }
 
     @Override
@@ -230,7 +233,7 @@ protected void rehashInternalFull(final int oldSize) {
         stateSource.setArray(destState);
         for (int sourceBucket = 0; sourceBucket < oldSize; ++sourceBucket) {
             final int currentStateValue = originalStateArray[sourceBucket];
-            if (currentStateValue == EMPTY_RIGHT_VALUE) {
+            if (isStateEmpty(currentStateValue)) {
                 continue;
             }
             final int k0 = originalKeyArray0[sourceBucket];
@@ -239,7 +242,7 @@ protected void rehashInternalFull(final int oldSize) {
             final int firstDestinationTableLocation = hashToTableLocation(hash);
             int destinationTableLocation = firstDestinationTableLocation;
             while (true) {
-                if (destState[destinationTableLocation] == EMPTY_RIGHT_VALUE) {
+                if (isStateEmpty(destState[destinationTableLocation])) {
                     destKeyArray0[destinationTableLocation] = k0;
                     destKeyArray1[destinationTableLocation] = k1;
                     destState[destinationTableLocation] = originalStateArray[sourceBucket];
diff --git a/engine/table/src/main/java/io/deephaven/engine/table/impl/updateby/hashing/typed/open/gen/UpdateByHasherIntInt.java b/engine/table/src/main/java/io/deephaven/engine/table/impl/updateby/hashing/typed/open/gen/UpdateByHasherIntInt.java
index 390d9e60b71..b5f9e2a1fa9 100644
--- a/engine/table/src/main/java/io/deephaven/engine/table/impl/updateby/hashing/typed/open/gen/UpdateByHasherIntInt.java
+++ b/engine/table/src/main/java/io/deephaven/engine/table/impl/updateby/hashing/typed/open/gen/UpdateByHasherIntInt.java
@@ -67,12 +67,12 @@ protected void buildHashTable(RowSequence rowSequence, Chunk[] sourceKeyChunks,
             int tableLocation = firstTableLocation;
             MAIN_SEARCH: while (true) {
                 int rowState = stateSource.getUnsafe(tableLocation);
-                if (rowState == EMPTY_RIGHT_VALUE) {
+                if (isStateEmpty(rowState)) {
                     final int firstAlternateTableLocation = hashToTableLocationAlternate(hash);
                     int alternateTableLocation = firstAlternateTableLocation;
                     while (alternateTableLocation < rehashPointer) {
                         rowState = alternateStateSource.getUnsafe(alternateTableLocation);
-                        if (rowState == EMPTY_RIGHT_VALUE) {
+                        if (isStateEmpty(rowState)) {
                             break;
                         } else if (eq(alternateKeySource0.getUnsafe(alternateTableLocation), k0) && eq(alternateKeySource1.getUnsafe(alternateTableLocation), k1)) {
                             // map the existing bucket to this chunk position;
@@ -118,7 +118,7 @@ protected void probeHashTable(RowSequence rowSequence, Chunk[] sourceKeyChunks,
             boolean found = false;
             int tableLocation = firstTableLocation;
             int rowState;
-            while ((rowState = stateSource.getUnsafe(tableLocation)) != EMPTY_RIGHT_VALUE) {
+            while (!isStateEmpty(rowState = stateSource.getUnsafe(tableLocation))) {
                 if (eq(mainKeySource0.getUnsafe(tableLocation), k0) && eq(mainKeySource1.getUnsafe(tableLocation), k1)) {
                     // map the existing bucket to this chunk position;
                     outputPositions.set(chunkPosition, rowState);
@@ -133,7 +133,7 @@ protected void probeHashTable(RowSequence rowSequence, Chunk[] sourceKeyChunks,
                 boolean alternateFound = false;
                 if (firstAlternateTableLocation < rehashPointer) {
                     int alternateTableLocation = firstAlternateTableLocation;
-                    while ((rowState = alternateStateSource.getUnsafe(alternateTableLocation)) != EMPTY_RIGHT_VALUE) {
+                    while (!isStateEmpty(rowState = alternateStateSource.getUnsafe(alternateTableLocation))) {
                         if (eq(alternateKeySource0.getUnsafe(alternateTableLocation), k0) && eq(alternateKeySource1.getUnsafe(alternateTableLocation), k1)) {
                             // map the existing bucket (from alternate) to this chunk position;
                             outputPositions.set(chunkPosition, rowState);
@@ -158,17 +158,21 @@ private static int hash(int k0, int k1) {
         return hash;
     }
 
+    private static boolean isStateEmpty(int state) {
+        return state == EMPTY_RIGHT_VALUE;
+    }
+
     private boolean migrateOneLocation(int locationToMigrate,
             WritableIntChunk<RowKeys> outputPositions) {
         final int currentStateValue = alternateStateSource.getUnsafe(locationToMigrate);
-        if (currentStateValue == EMPTY_RIGHT_VALUE) {
+        if (isStateEmpty(currentStateValue)) {
             return false;
         }
         final int k0 = alternateKeySource0.getUnsafe(locationToMigrate);
         final int k1 = alternateKeySource1.getUnsafe(locationToMigrate);
         final int hash = hash(k0, k1);
         int destinationTableLocation = hashToTableLocation(hash);
-        while (stateSource.getUnsafe(destinationTableLocation) != EMPTY_RIGHT_VALUE) {
+        while (!isStateEmpty(stateSource.getUnsafe(destinationTableLocation))) {
             destinationTableLocation = nextTableLocation(destinationTableLocation);
         }
         mainKeySource0.set(destinationTableLocation, k0);
@@ -191,8 +195,7 @@ protected int rehashInternalPartial(int entriesToRehash,
     }
 
     @Override
-    protected void newAlternate() {
-        super.newAlternate();
+    protected void adviseNewAlternate() {
         this.mainKeySource0 = (ImmutableIntArraySource)super.mainKeySources[0];
         this.alternateKeySource0 = (ImmutableIntArraySource)super.alternateKeySources[0];
         this.mainKeySource1 = (ImmutableIntArraySource)super.mainKeySources[1];
@@ -209,7 +212,7 @@ protected void clearAlternate() {
     @Override
     protected void migrateFront(WritableIntChunk<RowKeys> outputPositions) {
         int location = 0;
-        while (migrateOneLocation(location++, outputPositions));
+        while (migrateOneLocation(location++, outputPositions) && location < alternateTableSize);
     }
 
     @Override
@@ -226,7 +229,7 @@ protected void rehashInternalFull(final int oldSize) {
         stateSource.setArray(destState);
         for (int sourceBucket = 0; sourceBucket < oldSize; ++sourceBucket) {
             final int currentStateValue = originalStateArray[sourceBucket];
-            if (currentStateValue == EMPTY_RIGHT_VALUE) {
+            if (isStateEmpty(currentStateValue)) {
                 continue;
             }
             final int k0 = originalKeyArray0[sourceBucket];
@@ -235,7 +238,7 @@ protected void rehashInternalFull(final int oldSize) {
             final int firstDestinationTableLocation = hashToTableLocation(hash);
             int destinationTableLocation = firstDestinationTableLocation;
             while (true) {
-                if (destState[destinationTableLocation] == EMPTY_RIGHT_VALUE) {
+                if (isStateEmpty(destState[destinationTableLocation])) {
                     destKeyArray0[destinationTableLocation] = k0;
                     destKeyArray1[destinationTableLocation] = k1;
                     destState[destinationTableLocation] = originalStateArray[sourceBucket];
diff --git a/engine/table/src/main/java/io/deephaven/engine/table/impl/updateby/hashing/typed/open/gen/UpdateByHasherIntLong.java b/engine/table/src/main/java/io/deephaven/engine/table/impl/updateby/hashing/typed/open/gen/UpdateByHasherIntLong.java
index 529c8948ba1..e9c8c75db69 100644
--- a/engine/table/src/main/java/io/deephaven/engine/table/impl/updateby/hashing/typed/open/gen/UpdateByHasherIntLong.java
+++ b/engine/table/src/main/java/io/deephaven/engine/table/impl/updateby/hashing/typed/open/gen/UpdateByHasherIntLong.java
@@ -70,12 +70,12 @@ protected void buildHashTable(RowSequence rowSequence, Chunk[] sourceKeyChunks,
             int tableLocation = firstTableLocation;
             MAIN_SEARCH: while (true) {
                 int rowState = stateSource.getUnsafe(tableLocation);
-                if (rowState == EMPTY_RIGHT_VALUE) {
+                if (isStateEmpty(rowState)) {
                     final int firstAlternateTableLocation = hashToTableLocationAlternate(hash);
                     int alternateTableLocation = firstAlternateTableLocation;
                     while (alternateTableLocation < rehashPointer) {
                         rowState = alternateStateSource.getUnsafe(alternateTableLocation);
-                        if (rowState == EMPTY_RIGHT_VALUE) {
+                        if (isStateEmpty(rowState)) {
                             break;
                         } else if (eq(alternateKeySource0.getUnsafe(alternateTableLocation), k0) && eq(alternateKeySource1.getUnsafe(alternateTableLocation), k1)) {
                             // map the existing bucket to this chunk position;
@@ -121,7 +121,7 @@ protected void probeHashTable(RowSequence rowSequence, Chunk[] sourceKeyChunks,
             boolean found = false;
             int tableLocation = firstTableLocation;
             int rowState;
-            while ((rowState = stateSource.getUnsafe(tableLocation)) != EMPTY_RIGHT_VALUE) {
+            while (!isStateEmpty(rowState = stateSource.getUnsafe(tableLocation))) {
                 if (eq(mainKeySource0.getUnsafe(tableLocation), k0) && eq(mainKeySource1.getUnsafe(tableLocation), k1)) {
                     // map the existing bucket to this chunk position;
                     outputPositions.set(chunkPosition, rowState);
@@ -136,7 +136,7 @@ protected void probeHashTable(RowSequence rowSequence, Chunk[] sourceKeyChunks,
                 boolean alternateFound = false;
                 if (firstAlternateTableLocation < rehashPointer) {
                     int alternateTableLocation = firstAlternateTableLocation;
-                    while ((rowState = alternateStateSource.getUnsafe(alternateTableLocation)) != EMPTY_RIGHT_VALUE) {
+                    while (!isStateEmpty(rowState = alternateStateSource.getUnsafe(alternateTableLocation))) {
                         if (eq(alternateKeySource0.getUnsafe(alternateTableLocation), k0) && eq(alternateKeySource1.getUnsafe(alternateTableLocation), k1)) {
                             // map the existing bucket (from alternate) to this chunk position;
                             outputPositions.set(chunkPosition, rowState);
@@ -161,17 +161,21 @@ private static int hash(int k0, long k1) {
         return hash;
     }
 
+    private static boolean isStateEmpty(int state) {
+        return state == EMPTY_RIGHT_VALUE;
+    }
+
     private boolean migrateOneLocation(int locationToMigrate,
             WritableIntChunk<RowKeys> outputPositions) {
         final int currentStateValue = alternateStateSource.getUnsafe(locationToMigrate);
-        if (currentStateValue == EMPTY_RIGHT_VALUE) {
+        if (isStateEmpty(currentStateValue)) {
             return false;
         }
         final int k0 = alternateKeySource0.getUnsafe(locationToMigrate);
         final long k1 = alternateKeySource1.getUnsafe(locationToMigrate);
         final int hash = hash(k0, k1);
         int destinationTableLocation = hashToTableLocation(hash);
-        while (stateSource.getUnsafe(destinationTableLocation) != EMPTY_RIGHT_VALUE) {
+        while (!isStateEmpty(stateSource.getUnsafe(destinationTableLocation))) {
             destinationTableLocation = nextTableLocation(destinationTableLocation);
         }
         mainKeySource0.set(destinationTableLocation, k0);
@@ -194,8 +198,7 @@ protected int rehashInternalPartial(int entriesToRehash,
     }
 
     @Override
-    protected void newAlternate() {
-        super.newAlternate();
+    protected void adviseNewAlternate() {
         this.mainKeySource0 = (ImmutableIntArraySource)super.mainKeySources[0];
         this.alternateKeySource0 = (ImmutableIntArraySource)super.alternateKeySources[0];
         this.mainKeySource1 = (ImmutableLongArraySource)super.mainKeySources[1];
@@ -212,7 +215,7 @@ protected void clearAlternate() {
     @Override
     protected void migrateFront(WritableIntChunk<RowKeys> outputPositions) {
         int location = 0;
-        while (migrateOneLocation(location++, outputPositions));
+        while (migrateOneLocation(location++, outputPositions) && location < alternateTableSize);
     }
 
     @Override
@@ -229,7 +232,7 @@ protected void rehashInternalFull(final int oldSize) {
         stateSource.setArray(destState);
         for (int sourceBucket = 0; sourceBucket < oldSize; ++sourceBucket) {
             final int currentStateValue = originalStateArray[sourceBucket];
-            if (currentStateValue == EMPTY_RIGHT_VALUE) {
+            if (isStateEmpty(currentStateValue)) {
                 continue;
             }
             final int k0 = originalKeyArray0[sourceBucket];
@@ -238,7 +241,7 @@ protected void rehashInternalFull(final int oldSize) {
             final int firstDestinationTableLocation = hashToTableLocation(hash);
             int destinationTableLocation = firstDestinationTableLocation;
             while (true) {
-                if (destState[destinationTableLocation] == EMPTY_RIGHT_VALUE) {
+                if (isStateEmpty(destState[destinationTableLocation])) {
                     destKeyArray0[destinationTableLocation] = k0;
                     destKeyArray1[destinationTableLocation] = k1;
                     destState[destinationTableLocation] = originalStateArray[sourceBucket];
diff --git a/engine/table/src/main/java/io/deephaven/engine/table/impl/updateby/hashing/typed/open/gen/UpdateByHasherIntObject.java b/engine/table/src/main/java/io/deephaven/engine/table/impl/updateby/hashing/typed/open/gen/UpdateByHasherIntObject.java
index d917bdb2ae4..d2ac458e4ef 100644
--- a/engine/table/src/main/java/io/deephaven/engine/table/impl/updateby/hashing/typed/open/gen/UpdateByHasherIntObject.java
+++ b/engine/table/src/main/java/io/deephaven/engine/table/impl/updateby/hashing/typed/open/gen/UpdateByHasherIntObject.java
@@ -72,12 +72,12 @@ protected void buildHashTable(RowSequence rowSequence, Chunk[] sourceKeyChunks,
             int tableLocation = firstTableLocation;
             MAIN_SEARCH: while (true) {
                 int rowState = stateSource.getUnsafe(tableLocation);
-                if (rowState == EMPTY_RIGHT_VALUE) {
+                if (isStateEmpty(rowState)) {
                     final int firstAlternateTableLocation = hashToTableLocationAlternate(hash);
                     int alternateTableLocation = firstAlternateTableLocation;
                     while (alternateTableLocation < rehashPointer) {
                         rowState = alternateStateSource.getUnsafe(alternateTableLocation);
-                        if (rowState == EMPTY_RIGHT_VALUE) {
+                        if (isStateEmpty(rowState)) {
                             break;
                         } else if (eq(alternateKeySource0.getUnsafe(alternateTableLocation), k0) && eq(alternateKeySource1.getUnsafe(alternateTableLocation), k1)) {
                             // map the existing bucket to this chunk position;
@@ -123,7 +123,7 @@ protected void probeHashTable(RowSequence rowSequence, Chunk[] sourceKeyChunks,
             boolean found = false;
             int tableLocation = firstTableLocation;
             int rowState;
-            while ((rowState = stateSource.getUnsafe(tableLocation)) != EMPTY_RIGHT_VALUE) {
+            while (!isStateEmpty(rowState = stateSource.getUnsafe(tableLocation))) {
                 if (eq(mainKeySource0.getUnsafe(tableLocation), k0) && eq(mainKeySource1.getUnsafe(tableLocation), k1)) {
                     // map the existing bucket to this chunk position;
                     outputPositions.set(chunkPosition, rowState);
@@ -138,7 +138,7 @@ protected void probeHashTable(RowSequence rowSequence, Chunk[] sourceKeyChunks,
                 boolean alternateFound = false;
                 if (firstAlternateTableLocation < rehashPointer) {
                     int alternateTableLocation = firstAlternateTableLocation;
-                    while ((rowState = alternateStateSource.getUnsafe(alternateTableLocation)) != EMPTY_RIGHT_VALUE) {
+                    while (!isStateEmpty(rowState = alternateStateSource.getUnsafe(alternateTableLocation))) {
                         if (eq(alternateKeySource0.getUnsafe(alternateTableLocation), k0) && eq(alternateKeySource1.getUnsafe(alternateTableLocation), k1)) {
                             // map the existing bucket (from alternate) to this chunk position;
                             outputPositions.set(chunkPosition, rowState);
@@ -163,17 +163,21 @@ private static int hash(int k0, Object k1) {
         return hash;
     }
 
+    private static boolean isStateEmpty(int state) {
+        return state == EMPTY_RIGHT_VALUE;
+    }
+
     private boolean migrateOneLocation(int locationToMigrate,
             WritableIntChunk<RowKeys> outputPositions) {
         final int currentStateValue = alternateStateSource.getUnsafe(locationToMigrate);
-        if (currentStateValue == EMPTY_RIGHT_VALUE) {
+        if (isStateEmpty(currentStateValue)) {
             return false;
         }
         final int k0 = alternateKeySource0.getUnsafe(locationToMigrate);
         final Object k1 = alternateKeySource1.getUnsafe(locationToMigrate);
         final int hash = hash(k0, k1);
         int destinationTableLocation = hashToTableLocation(hash);
-        while (stateSource.getUnsafe(destinationTableLocation) != EMPTY_RIGHT_VALUE) {
+        while (!isStateEmpty(stateSource.getUnsafe(destinationTableLocation))) {
             destinationTableLocation = nextTableLocation(destinationTableLocation);
         }
         mainKeySource0.set(destinationTableLocation, k0);
@@ -197,8 +201,7 @@ protected int rehashInternalPartial(int entriesToRehash,
     }
 
     @Override
-    protected void newAlternate() {
-        super.newAlternate();
+    protected void adviseNewAlternate() {
         this.mainKeySource0 = (ImmutableIntArraySource)super.mainKeySources[0];
         this.alternateKeySource0 = (ImmutableIntArraySource)super.alternateKeySources[0];
         this.mainKeySource1 = (ImmutableObjectArraySource)super.mainKeySources[1];
@@ -215,7 +218,7 @@ protected void clearAlternate() {
     @Override
     protected void migrateFront(WritableIntChunk<RowKeys> outputPositions) {
         int location = 0;
-        while (migrateOneLocation(location++, outputPositions));
+        while (migrateOneLocation(location++, outputPositions) && location < alternateTableSize);
     }
 
     @Override
@@ -232,7 +235,7 @@ protected void rehashInternalFull(final int oldSize) {
         stateSource.setArray(destState);
         for (int sourceBucket = 0; sourceBucket < oldSize; ++sourceBucket) {
             final int currentStateValue = originalStateArray[sourceBucket];
-            if (currentStateValue == EMPTY_RIGHT_VALUE) {
+            if (isStateEmpty(currentStateValue)) {
                 continue;
             }
             final int k0 = originalKeyArray0[sourceBucket];
@@ -241,7 +244,7 @@ protected void rehashInternalFull(final int oldSize) {
             final int firstDestinationTableLocation = hashToTableLocation(hash);
             int destinationTableLocation = firstDestinationTableLocation;
             while (true) {
-                if (destState[destinationTableLocation] == EMPTY_RIGHT_VALUE) {
+                if (isStateEmpty(destState[destinationTableLocation])) {
                     destKeyArray0[destinationTableLocation] = k0;
                     destKeyArray1[destinationTableLocation] = k1;
                     destState[destinationTableLocation] = originalStateArray[sourceBucket];
diff --git a/engine/table/src/main/java/io/deephaven/engine/table/impl/updateby/hashing/typed/open/gen/UpdateByHasherIntShort.java b/engine/table/src/main/java/io/deephaven/engine/table/impl/updateby/hashing/typed/open/gen/UpdateByHasherIntShort.java
index ec26978597f..8170f410e09 100644
--- a/engine/table/src/main/java/io/deephaven/engine/table/impl/updateby/hashing/typed/open/gen/UpdateByHasherIntShort.java
+++ b/engine/table/src/main/java/io/deephaven/engine/table/impl/updateby/hashing/typed/open/gen/UpdateByHasherIntShort.java
@@ -71,12 +71,12 @@ protected void buildHashTable(RowSequence rowSequence, Chunk[] sourceKeyChunks,
             int tableLocation = firstTableLocation;
             MAIN_SEARCH: while (true) {
                 int rowState = stateSource.getUnsafe(tableLocation);
-                if (rowState == EMPTY_RIGHT_VALUE) {
+                if (isStateEmpty(rowState)) {
                     final int firstAlternateTableLocation = hashToTableLocationAlternate(hash);
                     int alternateTableLocation = firstAlternateTableLocation;
                     while (alternateTableLocation < rehashPointer) {
                         rowState = alternateStateSource.getUnsafe(alternateTableLocation);
-                        if (rowState == EMPTY_RIGHT_VALUE) {
+                        if (isStateEmpty(rowState)) {
                             break;
                         } else if (eq(alternateKeySource0.getUnsafe(alternateTableLocation), k0) && eq(alternateKeySource1.getUnsafe(alternateTableLocation), k1)) {
                             // map the existing bucket to this chunk position;
@@ -122,7 +122,7 @@ protected void probeHashTable(RowSequence rowSequence, Chunk[] sourceKeyChunks,
             boolean found = false;
             int tableLocation = firstTableLocation;
             int rowState;
-            while ((rowState = stateSource.getUnsafe(tableLocation)) != EMPTY_RIGHT_VALUE) {
+            while (!isStateEmpty(rowState = stateSource.getUnsafe(tableLocation))) {
                 if (eq(mainKeySource0.getUnsafe(tableLocation), k0) && eq(mainKeySource1.getUnsafe(tableLocation), k1)) {
                     // map the existing bucket to this chunk position;
                     outputPositions.set(chunkPosition, rowState);
@@ -137,7 +137,7 @@ protected void probeHashTable(RowSequence rowSequence, Chunk[] sourceKeyChunks,
                 boolean alternateFound = false;
                 if (firstAlternateTableLocation < rehashPointer) {
                     int alternateTableLocation = firstAlternateTableLocation;
-                    while ((rowState = alternateStateSource.getUnsafe(alternateTableLocation)) != EMPTY_RIGHT_VALUE) {
+                    while (!isStateEmpty(rowState = alternateStateSource.getUnsafe(alternateTableLocation))) {
                         if (eq(alternateKeySource0.getUnsafe(alternateTableLocation), k0) && eq(alternateKeySource1.getUnsafe(alternateTableLocation), k1)) {
                             // map the existing bucket (from alternate) to this chunk position;
                             outputPositions.set(chunkPosition, rowState);
@@ -162,17 +162,21 @@ private static int hash(int k0, short k1) {
         return hash;
     }
 
+    private static boolean isStateEmpty(int state) {
+        return state == EMPTY_RIGHT_VALUE;
+    }
+
     private boolean migrateOneLocation(int locationToMigrate,
             WritableIntChunk<RowKeys> outputPositions) {
         final int currentStateValue = alternateStateSource.getUnsafe(locationToMigrate);
-        if (currentStateValue == EMPTY_RIGHT_VALUE) {
+        if (isStateEmpty(currentStateValue)) {
             return false;
         }
         final int k0 = alternateKeySource0.getUnsafe(locationToMigrate);
         final short k1 = alternateKeySource1.getUnsafe(locationToMigrate);
         final int hash = hash(k0, k1);
         int destinationTableLocation = hashToTableLocation(hash);
-        while (stateSource.getUnsafe(destinationTableLocation) != EMPTY_RIGHT_VALUE) {
+        while (!isStateEmpty(stateSource.getUnsafe(destinationTableLocation))) {
             destinationTableLocation = nextTableLocation(destinationTableLocation);
         }
         mainKeySource0.set(destinationTableLocation, k0);
@@ -195,8 +199,7 @@ protected int rehashInternalPartial(int entriesToRehash,
     }
 
     @Override
-    protected void newAlternate() {
-        super.newAlternate();
+    protected void adviseNewAlternate() {
         this.mainKeySource0 = (ImmutableIntArraySource)super.mainKeySources[0];
         this.alternateKeySource0 = (ImmutableIntArraySource)super.alternateKeySources[0];
         this.mainKeySource1 = (ImmutableShortArraySource)super.mainKeySources[1];
@@ -213,7 +216,7 @@ protected void clearAlternate() {
     @Override
     protected void migrateFront(WritableIntChunk<RowKeys> outputPositions) {
         int location = 0;
-        while (migrateOneLocation(location++, outputPositions));
+        while (migrateOneLocation(location++, outputPositions) && location < alternateTableSize);
     }
 
     @Override
@@ -230,7 +233,7 @@ protected void rehashInternalFull(final int oldSize) {
         stateSource.setArray(destState);
         for (int sourceBucket = 0; sourceBucket < oldSize; ++sourceBucket) {
             final int currentStateValue = originalStateArray[sourceBucket];
-            if (currentStateValue == EMPTY_RIGHT_VALUE) {
+            if (isStateEmpty(currentStateValue)) {
                 continue;
             }
             final int k0 = originalKeyArray0[sourceBucket];
@@ -239,7 +242,7 @@ protected void rehashInternalFull(final int oldSize) {
             final int firstDestinationTableLocation = hashToTableLocation(hash);
             int destinationTableLocation = firstDestinationTableLocation;
             while (true) {
-                if (destState[destinationTableLocation] == EMPTY_RIGHT_VALUE) {
+                if (isStateEmpty(destState[destinationTableLocation])) {
                     destKeyArray0[destinationTableLocation] = k0;
                     destKeyArray1[destinationTableLocation] = k1;
                     destState[destinationTableLocation] = originalStateArray[sourceBucket];
diff --git a/engine/table/src/main/java/io/deephaven/engine/table/impl/updateby/hashing/typed/open/gen/UpdateByHasherLong.java b/engine/table/src/main/java/io/deephaven/engine/table/impl/updateby/hashing/typed/open/gen/UpdateByHasherLong.java
index ff6c9edad5c..89f7e07c09d 100644
--- a/engine/table/src/main/java/io/deephaven/engine/table/impl/updateby/hashing/typed/open/gen/UpdateByHasherLong.java
+++ b/engine/table/src/main/java/io/deephaven/engine/table/impl/updateby/hashing/typed/open/gen/UpdateByHasherLong.java
@@ -58,12 +58,12 @@ protected void buildHashTable(RowSequence rowSequence, Chunk[] sourceKeyChunks,
             int tableLocation = firstTableLocation;
             MAIN_SEARCH: while (true) {
                 int rowState = stateSource.getUnsafe(tableLocation);
-                if (rowState == EMPTY_RIGHT_VALUE) {
+                if (isStateEmpty(rowState)) {
                     final int firstAlternateTableLocation = hashToTableLocationAlternate(hash);
                     int alternateTableLocation = firstAlternateTableLocation;
                     while (alternateTableLocation < rehashPointer) {
                         rowState = alternateStateSource.getUnsafe(alternateTableLocation);
-                        if (rowState == EMPTY_RIGHT_VALUE) {
+                        if (isStateEmpty(rowState)) {
                             break;
                         } else if (eq(alternateKeySource0.getUnsafe(alternateTableLocation), k0)) {
                             // map the existing bucket to this chunk position;
@@ -106,7 +106,7 @@ protected void probeHashTable(RowSequence rowSequence, Chunk[] sourceKeyChunks,
             boolean found = false;
             int tableLocation = firstTableLocation;
             int rowState;
-            while ((rowState = stateSource.getUnsafe(tableLocation)) != EMPTY_RIGHT_VALUE) {
+            while (!isStateEmpty(rowState = stateSource.getUnsafe(tableLocation))) {
                 if (eq(mainKeySource0.getUnsafe(tableLocation), k0)) {
                     // map the existing bucket to this chunk position;
                     outputPositions.set(chunkPosition, rowState);
@@ -121,7 +121,7 @@ protected void probeHashTable(RowSequence rowSequence, Chunk[] sourceKeyChunks,
                 boolean alternateFound = false;
                 if (firstAlternateTableLocation < rehashPointer) {
                     int alternateTableLocation = firstAlternateTableLocation;
-                    while ((rowState = alternateStateSource.getUnsafe(alternateTableLocation)) != EMPTY_RIGHT_VALUE) {
+                    while (!isStateEmpty(rowState = alternateStateSource.getUnsafe(alternateTableLocation))) {
                         if (eq(alternateKeySource0.getUnsafe(alternateTableLocation), k0)) {
                             // map the existing bucket (from alternate) to this chunk position;
                             outputPositions.set(chunkPosition, rowState);
@@ -145,16 +145,20 @@ private static int hash(long k0) {
         return hash;
     }
 
+    private static boolean isStateEmpty(int state) {
+        return state == EMPTY_RIGHT_VALUE;
+    }
+
     private boolean migrateOneLocation(int locationToMigrate,
             WritableIntChunk<RowKeys> outputPositions) {
         final int currentStateValue = alternateStateSource.getUnsafe(locationToMigrate);
-        if (currentStateValue == EMPTY_RIGHT_VALUE) {
+        if (isStateEmpty(currentStateValue)) {
             return false;
         }
         final long k0 = alternateKeySource0.getUnsafe(locationToMigrate);
         final int hash = hash(k0);
         int destinationTableLocation = hashToTableLocation(hash);
-        while (stateSource.getUnsafe(destinationTableLocation) != EMPTY_RIGHT_VALUE) {
+        while (!isStateEmpty(stateSource.getUnsafe(destinationTableLocation))) {
             destinationTableLocation = nextTableLocation(destinationTableLocation);
         }
         mainKeySource0.set(destinationTableLocation, k0);
@@ -176,8 +180,7 @@ protected int rehashInternalPartial(int entriesToRehash,
     }
 
     @Override
-    protected void newAlternate() {
-        super.newAlternate();
+    protected void adviseNewAlternate() {
         this.mainKeySource0 = (ImmutableLongArraySource)super.mainKeySources[0];
         this.alternateKeySource0 = (ImmutableLongArraySource)super.alternateKeySources[0];
     }
@@ -191,7 +194,7 @@ protected void clearAlternate() {
     @Override
     protected void migrateFront(WritableIntChunk<RowKeys> outputPositions) {
         int location = 0;
-        while (migrateOneLocation(location++, outputPositions));
+        while (migrateOneLocation(location++, outputPositions) && location < alternateTableSize);
     }
 
     @Override
@@ -205,7 +208,7 @@ protected void rehashInternalFull(final int oldSize) {
         stateSource.setArray(destState);
         for (int sourceBucket = 0; sourceBucket < oldSize; ++sourceBucket) {
             final int currentStateValue = originalStateArray[sourceBucket];
-            if (currentStateValue == EMPTY_RIGHT_VALUE) {
+            if (isStateEmpty(currentStateValue)) {
                 continue;
             }
             final long k0 = originalKeyArray0[sourceBucket];
@@ -213,7 +216,7 @@ protected void rehashInternalFull(final int oldSize) {
             final int firstDestinationTableLocation = hashToTableLocation(hash);
             int destinationTableLocation = firstDestinationTableLocation;
             while (true) {
-                if (destState[destinationTableLocation] == EMPTY_RIGHT_VALUE) {
+                if (isStateEmpty(destState[destinationTableLocation])) {
                     destKeyArray0[destinationTableLocation] = k0;
                     destState[destinationTableLocation] = originalStateArray[sourceBucket];
                     break;
diff --git a/engine/table/src/main/java/io/deephaven/engine/table/impl/updateby/hashing/typed/open/gen/UpdateByHasherLongByte.java b/engine/table/src/main/java/io/deephaven/engine/table/impl/updateby/hashing/typed/open/gen/UpdateByHasherLongByte.java
index 0ea5a139348..8a029594df7 100644
--- a/engine/table/src/main/java/io/deephaven/engine/table/impl/updateby/hashing/typed/open/gen/UpdateByHasherLongByte.java
+++ b/engine/table/src/main/java/io/deephaven/engine/table/impl/updateby/hashing/typed/open/gen/UpdateByHasherLongByte.java
@@ -70,12 +70,12 @@ protected void buildHashTable(RowSequence rowSequence, Chunk[] sourceKeyChunks,
             int tableLocation = firstTableLocation;
             MAIN_SEARCH: while (true) {
                 int rowState = stateSource.getUnsafe(tableLocation);
-                if (rowState == EMPTY_RIGHT_VALUE) {
+                if (isStateEmpty(rowState)) {
                     final int firstAlternateTableLocation = hashToTableLocationAlternate(hash);
                     int alternateTableLocation = firstAlternateTableLocation;
                     while (alternateTableLocation < rehashPointer) {
                         rowState = alternateStateSource.getUnsafe(alternateTableLocation);
-                        if (rowState == EMPTY_RIGHT_VALUE) {
+                        if (isStateEmpty(rowState)) {
                             break;
                         } else if (eq(alternateKeySource0.getUnsafe(alternateTableLocation), k0) && eq(alternateKeySource1.getUnsafe(alternateTableLocation), k1)) {
                             // map the existing bucket to this chunk position;
@@ -121,7 +121,7 @@ protected void probeHashTable(RowSequence rowSequence, Chunk[] sourceKeyChunks,
             boolean found = false;
             int tableLocation = firstTableLocation;
             int rowState;
-            while ((rowState = stateSource.getUnsafe(tableLocation)) != EMPTY_RIGHT_VALUE) {
+            while (!isStateEmpty(rowState = stateSource.getUnsafe(tableLocation))) {
                 if (eq(mainKeySource0.getUnsafe(tableLocation), k0) && eq(mainKeySource1.getUnsafe(tableLocation), k1)) {
                     // map the existing bucket to this chunk position;
                     outputPositions.set(chunkPosition, rowState);
@@ -136,7 +136,7 @@ protected void probeHashTable(RowSequence rowSequence, Chunk[] sourceKeyChunks,
                 boolean alternateFound = false;
                 if (firstAlternateTableLocation < rehashPointer) {
                     int alternateTableLocation = firstAlternateTableLocation;
-                    while ((rowState = alternateStateSource.getUnsafe(alternateTableLocation)) != EMPTY_RIGHT_VALUE) {
+                    while (!isStateEmpty(rowState = alternateStateSource.getUnsafe(alternateTableLocation))) {
                         if (eq(alternateKeySource0.getUnsafe(alternateTableLocation), k0) && eq(alternateKeySource1.getUnsafe(alternateTableLocation), k1)) {
                             // map the existing bucket (from alternate) to this chunk position;
                             outputPositions.set(chunkPosition, rowState);
@@ -161,17 +161,21 @@ private static int hash(long k0, byte k1) {
         return hash;
     }
 
+    private static boolean isStateEmpty(int state) {
+        return state == EMPTY_RIGHT_VALUE;
+    }
+
     private boolean migrateOneLocation(int locationToMigrate,
             WritableIntChunk<RowKeys> outputPositions) {
         final int currentStateValue = alternateStateSource.getUnsafe(locationToMigrate);
-        if (currentStateValue == EMPTY_RIGHT_VALUE) {
+        if (isStateEmpty(currentStateValue)) {
             return false;
         }
         final long k0 = alternateKeySource0.getUnsafe(locationToMigrate);
         final byte k1 = alternateKeySource1.getUnsafe(locationToMigrate);
         final int hash = hash(k0, k1);
         int destinationTableLocation = hashToTableLocation(hash);
-        while (stateSource.getUnsafe(destinationTableLocation) != EMPTY_RIGHT_VALUE) {
+        while (!isStateEmpty(stateSource.getUnsafe(destinationTableLocation))) {
             destinationTableLocation = nextTableLocation(destinationTableLocation);
         }
         mainKeySource0.set(destinationTableLocation, k0);
@@ -194,8 +198,7 @@ protected int rehashInternalPartial(int entriesToRehash,
     }
 
     @Override
-    protected void newAlternate() {
-        super.newAlternate();
+    protected void adviseNewAlternate() {
         this.mainKeySource0 = (ImmutableLongArraySource)super.mainKeySources[0];
         this.alternateKeySource0 = (ImmutableLongArraySource)super.alternateKeySources[0];
         this.mainKeySource1 = (ImmutableByteArraySource)super.mainKeySources[1];
@@ -212,7 +215,7 @@ protected void clearAlternate() {
     @Override
     protected void migrateFront(WritableIntChunk<RowKeys> outputPositions) {
         int location = 0;
-        while (migrateOneLocation(location++, outputPositions));
+        while (migrateOneLocation(location++, outputPositions) && location < alternateTableSize);
     }
 
     @Override
@@ -229,7 +232,7 @@ protected void rehashInternalFull(final int oldSize) {
         stateSource.setArray(destState);
         for (int sourceBucket = 0; sourceBucket < oldSize; ++sourceBucket) {
             final int currentStateValue = originalStateArray[sourceBucket];
-            if (currentStateValue == EMPTY_RIGHT_VALUE) {
+            if (isStateEmpty(currentStateValue)) {
                 continue;
             }
             final long k0 = originalKeyArray0[sourceBucket];
@@ -238,7 +241,7 @@ protected void rehashInternalFull(final int oldSize) {
             final int firstDestinationTableLocation = hashToTableLocation(hash);
             int destinationTableLocation = firstDestinationTableLocation;
             while (true) {
-                if (destState[destinationTableLocation] == EMPTY_RIGHT_VALUE) {
+                if (isStateEmpty(destState[destinationTableLocation])) {
                     destKeyArray0[destinationTableLocation] = k0;
                     destKeyArray1[destinationTableLocation] = k1;
                     destState[destinationTableLocation] = originalStateArray[sourceBucket];
diff --git a/engine/table/src/main/java/io/deephaven/engine/table/impl/updateby/hashing/typed/open/gen/UpdateByHasherLongChar.java b/engine/table/src/main/java/io/deephaven/engine/table/impl/updateby/hashing/typed/open/gen/UpdateByHasherLongChar.java
index b27ba8861db..206dc07492a 100644
--- a/engine/table/src/main/java/io/deephaven/engine/table/impl/updateby/hashing/typed/open/gen/UpdateByHasherLongChar.java
+++ b/engine/table/src/main/java/io/deephaven/engine/table/impl/updateby/hashing/typed/open/gen/UpdateByHasherLongChar.java
@@ -70,12 +70,12 @@ protected void buildHashTable(RowSequence rowSequence, Chunk[] sourceKeyChunks,
             int tableLocation = firstTableLocation;
             MAIN_SEARCH: while (true) {
                 int rowState = stateSource.getUnsafe(tableLocation);
-                if (rowState == EMPTY_RIGHT_VALUE) {
+                if (isStateEmpty(rowState)) {
                     final int firstAlternateTableLocation = hashToTableLocationAlternate(hash);
                     int alternateTableLocation = firstAlternateTableLocation;
                     while (alternateTableLocation < rehashPointer) {
                         rowState = alternateStateSource.getUnsafe(alternateTableLocation);
-                        if (rowState == EMPTY_RIGHT_VALUE) {
+                        if (isStateEmpty(rowState)) {
                             break;
                         } else if (eq(alternateKeySource0.getUnsafe(alternateTableLocation), k0) && eq(alternateKeySource1.getUnsafe(alternateTableLocation), k1)) {
                             // map the existing bucket to this chunk position;
@@ -121,7 +121,7 @@ protected void probeHashTable(RowSequence rowSequence, Chunk[] sourceKeyChunks,
             boolean found = false;
             int tableLocation = firstTableLocation;
             int rowState;
-            while ((rowState = stateSource.getUnsafe(tableLocation)) != EMPTY_RIGHT_VALUE) {
+            while (!isStateEmpty(rowState = stateSource.getUnsafe(tableLocation))) {
                 if (eq(mainKeySource0.getUnsafe(tableLocation), k0) && eq(mainKeySource1.getUnsafe(tableLocation), k1)) {
                     // map the existing bucket to this chunk position;
                     outputPositions.set(chunkPosition, rowState);
@@ -136,7 +136,7 @@ protected void probeHashTable(RowSequence rowSequence, Chunk[] sourceKeyChunks,
                 boolean alternateFound = false;
                 if (firstAlternateTableLocation < rehashPointer) {
                     int alternateTableLocation = firstAlternateTableLocation;
-                    while ((rowState = alternateStateSource.getUnsafe(alternateTableLocation)) != EMPTY_RIGHT_VALUE) {
+                    while (!isStateEmpty(rowState = alternateStateSource.getUnsafe(alternateTableLocation))) {
                         if (eq(alternateKeySource0.getUnsafe(alternateTableLocation), k0) && eq(alternateKeySource1.getUnsafe(alternateTableLocation), k1)) {
                             // map the existing bucket (from alternate) to this chunk position;
                             outputPositions.set(chunkPosition, rowState);
@@ -161,17 +161,21 @@ private static int hash(long k0, char k1) {
         return hash;
     }
 
+    private static boolean isStateEmpty(int state) {
+        return state == EMPTY_RIGHT_VALUE;
+    }
+
     private boolean migrateOneLocation(int locationToMigrate,
             WritableIntChunk<RowKeys> outputPositions) {
         final int currentStateValue = alternateStateSource.getUnsafe(locationToMigrate);
-        if (currentStateValue == EMPTY_RIGHT_VALUE) {
+        if (isStateEmpty(currentStateValue)) {
             return false;
         }
         final long k0 = alternateKeySource0.getUnsafe(locationToMigrate);
         final char k1 = alternateKeySource1.getUnsafe(locationToMigrate);
         final int hash = hash(k0, k1);
         int destinationTableLocation = hashToTableLocation(hash);
-        while (stateSource.getUnsafe(destinationTableLocation) != EMPTY_RIGHT_VALUE) {
+        while (!isStateEmpty(stateSource.getUnsafe(destinationTableLocation))) {
             destinationTableLocation = nextTableLocation(destinationTableLocation);
         }
         mainKeySource0.set(destinationTableLocation, k0);
@@ -194,8 +198,7 @@ protected int rehashInternalPartial(int entriesToRehash,
     }
 
     @Override
-    protected void newAlternate() {
-        super.newAlternate();
+    protected void adviseNewAlternate() {
         this.mainKeySource0 = (ImmutableLongArraySource)super.mainKeySources[0];
         this.alternateKeySource0 = (ImmutableLongArraySource)super.alternateKeySources[0];
         this.mainKeySource1 = (ImmutableCharArraySource)super.mainKeySources[1];
@@ -212,7 +215,7 @@ protected void clearAlternate() {
     @Override
     protected void migrateFront(WritableIntChunk<RowKeys> outputPositions) {
         int location = 0;
-        while (migrateOneLocation(location++, outputPositions));
+        while (migrateOneLocation(location++, outputPositions) && location < alternateTableSize);
     }
 
     @Override
@@ -229,7 +232,7 @@ protected void rehashInternalFull(final int oldSize) {
         stateSource.setArray(destState);
         for (int sourceBucket = 0; sourceBucket < oldSize; ++sourceBucket) {
             final int currentStateValue = originalStateArray[sourceBucket];
-            if (currentStateValue == EMPTY_RIGHT_VALUE) {
+            if (isStateEmpty(currentStateValue)) {
                 continue;
             }
             final long k0 = originalKeyArray0[sourceBucket];
@@ -238,7 +241,7 @@ protected void rehashInternalFull(final int oldSize) {
             final int firstDestinationTableLocation = hashToTableLocation(hash);
             int destinationTableLocation = firstDestinationTableLocation;
             while (true) {
-                if (destState[destinationTableLocation] == EMPTY_RIGHT_VALUE) {
+                if (isStateEmpty(destState[destinationTableLocation])) {
                     destKeyArray0[destinationTableLocation] = k0;
                     destKeyArray1[destinationTableLocation] = k1;
                     destState[destinationTableLocation] = originalStateArray[sourceBucket];
diff --git a/engine/table/src/main/java/io/deephaven/engine/table/impl/updateby/hashing/typed/open/gen/UpdateByHasherLongDouble.java b/engine/table/src/main/java/io/deephaven/engine/table/impl/updateby/hashing/typed/open/gen/UpdateByHasherLongDouble.java
index 715a9f00399..70f78d0b752 100644
--- a/engine/table/src/main/java/io/deephaven/engine/table/impl/updateby/hashing/typed/open/gen/UpdateByHasherLongDouble.java
+++ b/engine/table/src/main/java/io/deephaven/engine/table/impl/updateby/hashing/typed/open/gen/UpdateByHasherLongDouble.java
@@ -70,12 +70,12 @@ protected void buildHashTable(RowSequence rowSequence, Chunk[] sourceKeyChunks,
             int tableLocation = firstTableLocation;
             MAIN_SEARCH: while (true) {
                 int rowState = stateSource.getUnsafe(tableLocation);
-                if (rowState == EMPTY_RIGHT_VALUE) {
+                if (isStateEmpty(rowState)) {
                     final int firstAlternateTableLocation = hashToTableLocationAlternate(hash);
                     int alternateTableLocation = firstAlternateTableLocation;
                     while (alternateTableLocation < rehashPointer) {
                         rowState = alternateStateSource.getUnsafe(alternateTableLocation);
-                        if (rowState == EMPTY_RIGHT_VALUE) {
+                        if (isStateEmpty(rowState)) {
                             break;
                         } else if (eq(alternateKeySource0.getUnsafe(alternateTableLocation), k0) && eq(alternateKeySource1.getUnsafe(alternateTableLocation), k1)) {
                             // map the existing bucket to this chunk position;
@@ -121,7 +121,7 @@ protected void probeHashTable(RowSequence rowSequence, Chunk[] sourceKeyChunks,
             boolean found = false;
             int tableLocation = firstTableLocation;
             int rowState;
-            while ((rowState = stateSource.getUnsafe(tableLocation)) != EMPTY_RIGHT_VALUE) {
+            while (!isStateEmpty(rowState = stateSource.getUnsafe(tableLocation))) {
                 if (eq(mainKeySource0.getUnsafe(tableLocation), k0) && eq(mainKeySource1.getUnsafe(tableLocation), k1)) {
                     // map the existing bucket to this chunk position;
                     outputPositions.set(chunkPosition, rowState);
@@ -136,7 +136,7 @@ protected void probeHashTable(RowSequence rowSequence, Chunk[] sourceKeyChunks,
                 boolean alternateFound = false;
                 if (firstAlternateTableLocation < rehashPointer) {
                     int alternateTableLocation = firstAlternateTableLocation;
-                    while ((rowState = alternateStateSource.getUnsafe(alternateTableLocation)) != EMPTY_RIGHT_VALUE) {
+                    while (!isStateEmpty(rowState = alternateStateSource.getUnsafe(alternateTableLocation))) {
                         if (eq(alternateKeySource0.getUnsafe(alternateTableLocation), k0) && eq(alternateKeySource1.getUnsafe(alternateTableLocation), k1)) {
                             // map the existing bucket (from alternate) to this chunk position;
                             outputPositions.set(chunkPosition, rowState);
@@ -161,17 +161,21 @@ private static int hash(long k0, double k1) {
         return hash;
     }
 
+    private static boolean isStateEmpty(int state) {
+        return state == EMPTY_RIGHT_VALUE;
+    }
+
     private boolean migrateOneLocation(int locationToMigrate,
             WritableIntChunk<RowKeys> outputPositions) {
         final int currentStateValue = alternateStateSource.getUnsafe(locationToMigrate);
-        if (currentStateValue == EMPTY_RIGHT_VALUE) {
+        if (isStateEmpty(currentStateValue)) {
             return false;
         }
         final long k0 = alternateKeySource0.getUnsafe(locationToMigrate);
         final double k1 = alternateKeySource1.getUnsafe(locationToMigrate);
         final int hash = hash(k0, k1);
         int destinationTableLocation = hashToTableLocation(hash);
-        while (stateSource.getUnsafe(destinationTableLocation) != EMPTY_RIGHT_VALUE) {
+        while (!isStateEmpty(stateSource.getUnsafe(destinationTableLocation))) {
             destinationTableLocation = nextTableLocation(destinationTableLocation);
         }
         mainKeySource0.set(destinationTableLocation, k0);
@@ -194,8 +198,7 @@ protected int rehashInternalPartial(int entriesToRehash,
     }
 
     @Override
-    protected void newAlternate() {
-        super.newAlternate();
+    protected void adviseNewAlternate() {
         this.mainKeySource0 = (ImmutableLongArraySource)super.mainKeySources[0];
         this.alternateKeySource0 = (ImmutableLongArraySource)super.alternateKeySources[0];
         this.mainKeySource1 = (ImmutableDoubleArraySource)super.mainKeySources[1];
@@ -212,7 +215,7 @@ protected void clearAlternate() {
     @Override
     protected void migrateFront(WritableIntChunk<RowKeys> outputPositions) {
         int location = 0;
-        while (migrateOneLocation(location++, outputPositions));
+        while (migrateOneLocation(location++, outputPositions) && location < alternateTableSize);
     }
 
     @Override
@@ -229,7 +232,7 @@ protected void rehashInternalFull(final int oldSize) {
         stateSource.setArray(destState);
         for (int sourceBucket = 0; sourceBucket < oldSize; ++sourceBucket) {
             final int currentStateValue = originalStateArray[sourceBucket];
-            if (currentStateValue == EMPTY_RIGHT_VALUE) {
+            if (isStateEmpty(currentStateValue)) {
                 continue;
             }
             final long k0 = originalKeyArray0[sourceBucket];
@@ -238,7 +241,7 @@ protected void rehashInternalFull(final int oldSize) {
             final int firstDestinationTableLocation = hashToTableLocation(hash);
             int destinationTableLocation = firstDestinationTableLocation;
             while (true) {
-                if (destState[destinationTableLocation] == EMPTY_RIGHT_VALUE) {
+                if (isStateEmpty(destState[destinationTableLocation])) {
                     destKeyArray0[destinationTableLocation] = k0;
                     destKeyArray1[destinationTableLocation] = k1;
                     destState[destinationTableLocation] = originalStateArray[sourceBucket];
diff --git a/engine/table/src/main/java/io/deephaven/engine/table/impl/updateby/hashing/typed/open/gen/UpdateByHasherLongFloat.java b/engine/table/src/main/java/io/deephaven/engine/table/impl/updateby/hashing/typed/open/gen/UpdateByHasherLongFloat.java
index e5cb586a9b4..2a3759e99cd 100644
--- a/engine/table/src/main/java/io/deephaven/engine/table/impl/updateby/hashing/typed/open/gen/UpdateByHasherLongFloat.java
+++ b/engine/table/src/main/java/io/deephaven/engine/table/impl/updateby/hashing/typed/open/gen/UpdateByHasherLongFloat.java
@@ -70,12 +70,12 @@ protected void buildHashTable(RowSequence rowSequence, Chunk[] sourceKeyChunks,
             int tableLocation = firstTableLocation;
             MAIN_SEARCH: while (true) {
                 int rowState = stateSource.getUnsafe(tableLocation);
-                if (rowState == EMPTY_RIGHT_VALUE) {
+                if (isStateEmpty(rowState)) {
                     final int firstAlternateTableLocation = hashToTableLocationAlternate(hash);
                     int alternateTableLocation = firstAlternateTableLocation;
                     while (alternateTableLocation < rehashPointer) {
                         rowState = alternateStateSource.getUnsafe(alternateTableLocation);
-                        if (rowState == EMPTY_RIGHT_VALUE) {
+                        if (isStateEmpty(rowState)) {
                             break;
                         } else if (eq(alternateKeySource0.getUnsafe(alternateTableLocation), k0) && eq(alternateKeySource1.getUnsafe(alternateTableLocation), k1)) {
                             // map the existing bucket to this chunk position;
@@ -121,7 +121,7 @@ protected void probeHashTable(RowSequence rowSequence, Chunk[] sourceKeyChunks,
             boolean found = false;
             int tableLocation = firstTableLocation;
             int rowState;
-            while ((rowState = stateSource.getUnsafe(tableLocation)) != EMPTY_RIGHT_VALUE) {
+            while (!isStateEmpty(rowState = stateSource.getUnsafe(tableLocation))) {
                 if (eq(mainKeySource0.getUnsafe(tableLocation), k0) && eq(mainKeySource1.getUnsafe(tableLocation), k1)) {
                     // map the existing bucket to this chunk position;
                     outputPositions.set(chunkPosition, rowState);
@@ -136,7 +136,7 @@ protected void probeHashTable(RowSequence rowSequence, Chunk[] sourceKeyChunks,
                 boolean alternateFound = false;
                 if (firstAlternateTableLocation < rehashPointer) {
                     int alternateTableLocation = firstAlternateTableLocation;
-                    while ((rowState = alternateStateSource.getUnsafe(alternateTableLocation)) != EMPTY_RIGHT_VALUE) {
+                    while (!isStateEmpty(rowState = alternateStateSource.getUnsafe(alternateTableLocation))) {
                         if (eq(alternateKeySource0.getUnsafe(alternateTableLocation), k0) && eq(alternateKeySource1.getUnsafe(alternateTableLocation), k1)) {
                             // map the existing bucket (from alternate) to this chunk position;
                             outputPositions.set(chunkPosition, rowState);
@@ -161,17 +161,21 @@ private static int hash(long k0, float k1) {
         return hash;
     }
 
+    private static boolean isStateEmpty(int state) {
+        return state == EMPTY_RIGHT_VALUE;
+    }
+
     private boolean migrateOneLocation(int locationToMigrate,
             WritableIntChunk<RowKeys> outputPositions) {
         final int currentStateValue = alternateStateSource.getUnsafe(locationToMigrate);
-        if (currentStateValue == EMPTY_RIGHT_VALUE) {
+        if (isStateEmpty(currentStateValue)) {
             return false;
         }
         final long k0 = alternateKeySource0.getUnsafe(locationToMigrate);
         final float k1 = alternateKeySource1.getUnsafe(locationToMigrate);
         final int hash = hash(k0, k1);
         int destinationTableLocation = hashToTableLocation(hash);
-        while (stateSource.getUnsafe(destinationTableLocation) != EMPTY_RIGHT_VALUE) {
+        while (!isStateEmpty(stateSource.getUnsafe(destinationTableLocation))) {
             destinationTableLocation = nextTableLocation(destinationTableLocation);
         }
         mainKeySource0.set(destinationTableLocation, k0);
@@ -194,8 +198,7 @@ protected int rehashInternalPartial(int entriesToRehash,
     }
 
     @Override
-    protected void newAlternate() {
-        super.newAlternate();
+    protected void adviseNewAlternate() {
         this.mainKeySource0 = (ImmutableLongArraySource)super.mainKeySources[0];
         this.alternateKeySource0 = (ImmutableLongArraySource)super.alternateKeySources[0];
         this.mainKeySource1 = (ImmutableFloatArraySource)super.mainKeySources[1];
@@ -212,7 +215,7 @@ protected void clearAlternate() {
     @Override
     protected void migrateFront(WritableIntChunk<RowKeys> outputPositions) {
         int location = 0;
-        while (migrateOneLocation(location++, outputPositions));
+        while (migrateOneLocation(location++, outputPositions) && location < alternateTableSize);
     }
 
     @Override
@@ -229,7 +232,7 @@ protected void rehashInternalFull(final int oldSize) {
         stateSource.setArray(destState);
         for (int sourceBucket = 0; sourceBucket < oldSize; ++sourceBucket) {
             final int currentStateValue = originalStateArray[sourceBucket];
-            if (currentStateValue == EMPTY_RIGHT_VALUE) {
+            if (isStateEmpty(currentStateValue)) {
                 continue;
             }
             final long k0 = originalKeyArray0[sourceBucket];
@@ -238,7 +241,7 @@ protected void rehashInternalFull(final int oldSize) {
             final int firstDestinationTableLocation = hashToTableLocation(hash);
             int destinationTableLocation = firstDestinationTableLocation;
             while (true) {
-                if (destState[destinationTableLocation] == EMPTY_RIGHT_VALUE) {
+                if (isStateEmpty(destState[destinationTableLocation])) {
                     destKeyArray0[destinationTableLocation] = k0;
                     destKeyArray1[destinationTableLocation] = k1;
                     destState[destinationTableLocation] = originalStateArray[sourceBucket];
diff --git a/engine/table/src/main/java/io/deephaven/engine/table/impl/updateby/hashing/typed/open/gen/UpdateByHasherLongInt.java b/engine/table/src/main/java/io/deephaven/engine/table/impl/updateby/hashing/typed/open/gen/UpdateByHasherLongInt.java
index 2363bdf02d4..55a27040e50 100644
--- a/engine/table/src/main/java/io/deephaven/engine/table/impl/updateby/hashing/typed/open/gen/UpdateByHasherLongInt.java
+++ b/engine/table/src/main/java/io/deephaven/engine/table/impl/updateby/hashing/typed/open/gen/UpdateByHasherLongInt.java
@@ -70,12 +70,12 @@ protected void buildHashTable(RowSequence rowSequence, Chunk[] sourceKeyChunks,
             int tableLocation = firstTableLocation;
             MAIN_SEARCH: while (true) {
                 int rowState = stateSource.getUnsafe(tableLocation);
-                if (rowState == EMPTY_RIGHT_VALUE) {
+                if (isStateEmpty(rowState)) {
                     final int firstAlternateTableLocation = hashToTableLocationAlternate(hash);
                     int alternateTableLocation = firstAlternateTableLocation;
                     while (alternateTableLocation < rehashPointer) {
                         rowState = alternateStateSource.getUnsafe(alternateTableLocation);
-                        if (rowState == EMPTY_RIGHT_VALUE) {
+                        if (isStateEmpty(rowState)) {
                             break;
                         } else if (eq(alternateKeySource0.getUnsafe(alternateTableLocation), k0) && eq(alternateKeySource1.getUnsafe(alternateTableLocation), k1)) {
                             // map the existing bucket to this chunk position;
@@ -121,7 +121,7 @@ protected void probeHashTable(RowSequence rowSequence, Chunk[] sourceKeyChunks,
             boolean found = false;
             int tableLocation = firstTableLocation;
             int rowState;
-            while ((rowState = stateSource.getUnsafe(tableLocation)) != EMPTY_RIGHT_VALUE) {
+            while (!isStateEmpty(rowState = stateSource.getUnsafe(tableLocation))) {
                 if (eq(mainKeySource0.getUnsafe(tableLocation), k0) && eq(mainKeySource1.getUnsafe(tableLocation), k1)) {
                     // map the existing bucket to this chunk position;
                     outputPositions.set(chunkPosition, rowState);
@@ -136,7 +136,7 @@ protected void probeHashTable(RowSequence rowSequence, Chunk[] sourceKeyChunks,
                 boolean alternateFound = false;
                 if (firstAlternateTableLocation < rehashPointer) {
                     int alternateTableLocation = firstAlternateTableLocation;
-                    while ((rowState = alternateStateSource.getUnsafe(alternateTableLocation)) != EMPTY_RIGHT_VALUE) {
+                    while (!isStateEmpty(rowState = alternateStateSource.getUnsafe(alternateTableLocation))) {
                         if (eq(alternateKeySource0.getUnsafe(alternateTableLocation), k0) && eq(alternateKeySource1.getUnsafe(alternateTableLocation), k1)) {
                             // map the existing bucket (from alternate) to this chunk position;
                             outputPositions.set(chunkPosition, rowState);
@@ -161,17 +161,21 @@ private static int hash(long k0, int k1) {
         return hash;
     }
 
+    private static boolean isStateEmpty(int state) {
+        return state == EMPTY_RIGHT_VALUE;
+    }
+
     private boolean migrateOneLocation(int locationToMigrate,
             WritableIntChunk<RowKeys> outputPositions) {
         final int currentStateValue = alternateStateSource.getUnsafe(locationToMigrate);
-        if (currentStateValue == EMPTY_RIGHT_VALUE) {
+        if (isStateEmpty(currentStateValue)) {
             return false;
         }
         final long k0 = alternateKeySource0.getUnsafe(locationToMigrate);
         final int k1 = alternateKeySource1.getUnsafe(locationToMigrate);
         final int hash = hash(k0, k1);
         int destinationTableLocation = hashToTableLocation(hash);
-        while (stateSource.getUnsafe(destinationTableLocation) != EMPTY_RIGHT_VALUE) {
+        while (!isStateEmpty(stateSource.getUnsafe(destinationTableLocation))) {
             destinationTableLocation = nextTableLocation(destinationTableLocation);
         }
         mainKeySource0.set(destinationTableLocation, k0);
@@ -194,8 +198,7 @@ protected int rehashInternalPartial(int entriesToRehash,
     }
 
     @Override
-    protected void newAlternate() {
-        super.newAlternate();
+    protected void adviseNewAlternate() {
         this.mainKeySource0 = (ImmutableLongArraySource)super.mainKeySources[0];
         this.alternateKeySource0 = (ImmutableLongArraySource)super.alternateKeySources[0];
         this.mainKeySource1 = (ImmutableIntArraySource)super.mainKeySources[1];
@@ -212,7 +215,7 @@ protected void clearAlternate() {
     @Override
     protected void migrateFront(WritableIntChunk<RowKeys> outputPositions) {
         int location = 0;
-        while (migrateOneLocation(location++, outputPositions));
+        while (migrateOneLocation(location++, outputPositions) && location < alternateTableSize);
     }
 
     @Override
@@ -229,7 +232,7 @@ protected void rehashInternalFull(final int oldSize) {
         stateSource.setArray(destState);
         for (int sourceBucket = 0; sourceBucket < oldSize; ++sourceBucket) {
             final int currentStateValue = originalStateArray[sourceBucket];
-            if (currentStateValue == EMPTY_RIGHT_VALUE) {
+            if (isStateEmpty(currentStateValue)) {
                 continue;
             }
             final long k0 = originalKeyArray0[sourceBucket];
@@ -238,7 +241,7 @@ protected void rehashInternalFull(final int oldSize) {
             final int firstDestinationTableLocation = hashToTableLocation(hash);
             int destinationTableLocation = firstDestinationTableLocation;
             while (true) {
-                if (destState[destinationTableLocation] == EMPTY_RIGHT_VALUE) {
+                if (isStateEmpty(destState[destinationTableLocation])) {
                     destKeyArray0[destinationTableLocation] = k0;
                     destKeyArray1[destinationTableLocation] = k1;
                     destState[destinationTableLocation] = originalStateArray[sourceBucket];
diff --git a/engine/table/src/main/java/io/deephaven/engine/table/impl/updateby/hashing/typed/open/gen/UpdateByHasherLongLong.java b/engine/table/src/main/java/io/deephaven/engine/table/impl/updateby/hashing/typed/open/gen/UpdateByHasherLongLong.java
index a663e2c9b60..10690cb7909 100644
--- a/engine/table/src/main/java/io/deephaven/engine/table/impl/updateby/hashing/typed/open/gen/UpdateByHasherLongLong.java
+++ b/engine/table/src/main/java/io/deephaven/engine/table/impl/updateby/hashing/typed/open/gen/UpdateByHasherLongLong.java
@@ -66,12 +66,12 @@ protected void buildHashTable(RowSequence rowSequence, Chunk[] sourceKeyChunks,
             int tableLocation = firstTableLocation;
             MAIN_SEARCH: while (true) {
                 int rowState = stateSource.getUnsafe(tableLocation);
-                if (rowState == EMPTY_RIGHT_VALUE) {
+                if (isStateEmpty(rowState)) {
                     final int firstAlternateTableLocation = hashToTableLocationAlternate(hash);
                     int alternateTableLocation = firstAlternateTableLocation;
                     while (alternateTableLocation < rehashPointer) {
                         rowState = alternateStateSource.getUnsafe(alternateTableLocation);
-                        if (rowState == EMPTY_RIGHT_VALUE) {
+                        if (isStateEmpty(rowState)) {
                             break;
                         } else if (eq(alternateKeySource0.getUnsafe(alternateTableLocation), k0) && eq(alternateKeySource1.getUnsafe(alternateTableLocation), k1)) {
                             // map the existing bucket to this chunk position;
@@ -117,7 +117,7 @@ protected void probeHashTable(RowSequence rowSequence, Chunk[] sourceKeyChunks,
             boolean found = false;
             int tableLocation = firstTableLocation;
             int rowState;
-            while ((rowState = stateSource.getUnsafe(tableLocation)) != EMPTY_RIGHT_VALUE) {
+            while (!isStateEmpty(rowState = stateSource.getUnsafe(tableLocation))) {
                 if (eq(mainKeySource0.getUnsafe(tableLocation), k0) && eq(mainKeySource1.getUnsafe(tableLocation), k1)) {
                     // map the existing bucket to this chunk position;
                     outputPositions.set(chunkPosition, rowState);
@@ -132,7 +132,7 @@ protected void probeHashTable(RowSequence rowSequence, Chunk[] sourceKeyChunks,
                 boolean alternateFound = false;
                 if (firstAlternateTableLocation < rehashPointer) {
                     int alternateTableLocation = firstAlternateTableLocation;
-                    while ((rowState = alternateStateSource.getUnsafe(alternateTableLocation)) != EMPTY_RIGHT_VALUE) {
+                    while (!isStateEmpty(rowState = alternateStateSource.getUnsafe(alternateTableLocation))) {
                         if (eq(alternateKeySource0.getUnsafe(alternateTableLocation), k0) && eq(alternateKeySource1.getUnsafe(alternateTableLocation), k1)) {
                             // map the existing bucket (from alternate) to this chunk position;
                             outputPositions.set(chunkPosition, rowState);
@@ -157,17 +157,21 @@ private static int hash(long k0, long k1) {
         return hash;
     }
 
+    private static boolean isStateEmpty(int state) {
+        return state == EMPTY_RIGHT_VALUE;
+    }
+
     private boolean migrateOneLocation(int locationToMigrate,
             WritableIntChunk<RowKeys> outputPositions) {
         final int currentStateValue = alternateStateSource.getUnsafe(locationToMigrate);
-        if (currentStateValue == EMPTY_RIGHT_VALUE) {
+        if (isStateEmpty(currentStateValue)) {
             return false;
         }
         final long k0 = alternateKeySource0.getUnsafe(locationToMigrate);
         final long k1 = alternateKeySource1.getUnsafe(locationToMigrate);
         final int hash = hash(k0, k1);
         int destinationTableLocation = hashToTableLocation(hash);
-        while (stateSource.getUnsafe(destinationTableLocation) != EMPTY_RIGHT_VALUE) {
+        while (!isStateEmpty(stateSource.getUnsafe(destinationTableLocation))) {
             destinationTableLocation = nextTableLocation(destinationTableLocation);
         }
         mainKeySource0.set(destinationTableLocation, k0);
@@ -190,8 +194,7 @@ protected int rehashInternalPartial(int entriesToRehash,
     }
 
     @Override
-    protected void newAlternate() {
-        super.newAlternate();
+    protected void adviseNewAlternate() {
         this.mainKeySource0 = (ImmutableLongArraySource)super.mainKeySources[0];
         this.alternateKeySource0 = (ImmutableLongArraySource)super.alternateKeySources[0];
         this.mainKeySource1 = (ImmutableLongArraySource)super.mainKeySources[1];
@@ -208,7 +211,7 @@ protected void clearAlternate() {
     @Override
     protected void migrateFront(WritableIntChunk<RowKeys> outputPositions) {
         int location = 0;
-        while (migrateOneLocation(location++, outputPositions));
+        while (migrateOneLocation(location++, outputPositions) && location < alternateTableSize);
     }
 
     @Override
@@ -225,7 +228,7 @@ protected void rehashInternalFull(final int oldSize) {
         stateSource.setArray(destState);
         for (int sourceBucket = 0; sourceBucket < oldSize; ++sourceBucket) {
             final int currentStateValue = originalStateArray[sourceBucket];
-            if (currentStateValue == EMPTY_RIGHT_VALUE) {
+            if (isStateEmpty(currentStateValue)) {
                 continue;
             }
             final long k0 = originalKeyArray0[sourceBucket];
@@ -234,7 +237,7 @@ protected void rehashInternalFull(final int oldSize) {
             final int firstDestinationTableLocation = hashToTableLocation(hash);
             int destinationTableLocation = firstDestinationTableLocation;
             while (true) {
-                if (destState[destinationTableLocation] == EMPTY_RIGHT_VALUE) {
+                if (isStateEmpty(destState[destinationTableLocation])) {
                     destKeyArray0[destinationTableLocation] = k0;
                     destKeyArray1[destinationTableLocation] = k1;
                     destState[destinationTableLocation] = originalStateArray[sourceBucket];
diff --git a/engine/table/src/main/java/io/deephaven/engine/table/impl/updateby/hashing/typed/open/gen/UpdateByHasherLongObject.java b/engine/table/src/main/java/io/deephaven/engine/table/impl/updateby/hashing/typed/open/gen/UpdateByHasherLongObject.java
index 140dad36c99..35417bc5495 100644
--- a/engine/table/src/main/java/io/deephaven/engine/table/impl/updateby/hashing/typed/open/gen/UpdateByHasherLongObject.java
+++ b/engine/table/src/main/java/io/deephaven/engine/table/impl/updateby/hashing/typed/open/gen/UpdateByHasherLongObject.java
@@ -71,12 +71,12 @@ protected void buildHashTable(RowSequence rowSequence, Chunk[] sourceKeyChunks,
             int tableLocation = firstTableLocation;
             MAIN_SEARCH: while (true) {
                 int rowState = stateSource.getUnsafe(tableLocation);
-                if (rowState == EMPTY_RIGHT_VALUE) {
+                if (isStateEmpty(rowState)) {
                     final int firstAlternateTableLocation = hashToTableLocationAlternate(hash);
                     int alternateTableLocation = firstAlternateTableLocation;
                     while (alternateTableLocation < rehashPointer) {
                         rowState = alternateStateSource.getUnsafe(alternateTableLocation);
-                        if (rowState == EMPTY_RIGHT_VALUE) {
+                        if (isStateEmpty(rowState)) {
                             break;
                         } else if (eq(alternateKeySource0.getUnsafe(alternateTableLocation), k0) && eq(alternateKeySource1.getUnsafe(alternateTableLocation), k1)) {
                             // map the existing bucket to this chunk position;
@@ -122,7 +122,7 @@ protected void probeHashTable(RowSequence rowSequence, Chunk[] sourceKeyChunks,
             boolean found = false;
             int tableLocation = firstTableLocation;
             int rowState;
-            while ((rowState = stateSource.getUnsafe(tableLocation)) != EMPTY_RIGHT_VALUE) {
+            while (!isStateEmpty(rowState = stateSource.getUnsafe(tableLocation))) {
                 if (eq(mainKeySource0.getUnsafe(tableLocation), k0) && eq(mainKeySource1.getUnsafe(tableLocation), k1)) {
                     // map the existing bucket to this chunk position;
                     outputPositions.set(chunkPosition, rowState);
@@ -137,7 +137,7 @@ protected void probeHashTable(RowSequence rowSequence, Chunk[] sourceKeyChunks,
                 boolean alternateFound = false;
                 if (firstAlternateTableLocation < rehashPointer) {
                     int alternateTableLocation = firstAlternateTableLocation;
-                    while ((rowState = alternateStateSource.getUnsafe(alternateTableLocation)) != EMPTY_RIGHT_VALUE) {
+                    while (!isStateEmpty(rowState = alternateStateSource.getUnsafe(alternateTableLocation))) {
                         if (eq(alternateKeySource0.getUnsafe(alternateTableLocation), k0) && eq(alternateKeySource1.getUnsafe(alternateTableLocation), k1)) {
                             // map the existing bucket (from alternate) to this chunk position;
                             outputPositions.set(chunkPosition, rowState);
@@ -162,17 +162,21 @@ private static int hash(long k0, Object k1) {
         return hash;
     }
 
+    private static boolean isStateEmpty(int state) {
+        return state == EMPTY_RIGHT_VALUE;
+    }
+
     private boolean migrateOneLocation(int locationToMigrate,
             WritableIntChunk<RowKeys> outputPositions) {
         final int currentStateValue = alternateStateSource.getUnsafe(locationToMigrate);
-        if (currentStateValue == EMPTY_RIGHT_VALUE) {
+        if (isStateEmpty(currentStateValue)) {
             return false;
         }
         final long k0 = alternateKeySource0.getUnsafe(locationToMigrate);
         final Object k1 = alternateKeySource1.getUnsafe(locationToMigrate);
         final int hash = hash(k0, k1);
         int destinationTableLocation = hashToTableLocation(hash);
-        while (stateSource.getUnsafe(destinationTableLocation) != EMPTY_RIGHT_VALUE) {
+        while (!isStateEmpty(stateSource.getUnsafe(destinationTableLocation))) {
             destinationTableLocation = nextTableLocation(destinationTableLocation);
         }
         mainKeySource0.set(destinationTableLocation, k0);
@@ -196,8 +200,7 @@ protected int rehashInternalPartial(int entriesToRehash,
     }
 
     @Override
-    protected void newAlternate() {
-        super.newAlternate();
+    protected void adviseNewAlternate() {
         this.mainKeySource0 = (ImmutableLongArraySource)super.mainKeySources[0];
         this.alternateKeySource0 = (ImmutableLongArraySource)super.alternateKeySources[0];
         this.mainKeySource1 = (ImmutableObjectArraySource)super.mainKeySources[1];
@@ -214,7 +217,7 @@ protected void clearAlternate() {
     @Override
     protected void migrateFront(WritableIntChunk<RowKeys> outputPositions) {
         int location = 0;
-        while (migrateOneLocation(location++, outputPositions));
+        while (migrateOneLocation(location++, outputPositions) && location < alternateTableSize);
     }
 
     @Override
@@ -231,7 +234,7 @@ protected void rehashInternalFull(final int oldSize) {
         stateSource.setArray(destState);
         for (int sourceBucket = 0; sourceBucket < oldSize; ++sourceBucket) {
             final int currentStateValue = originalStateArray[sourceBucket];
-            if (currentStateValue == EMPTY_RIGHT_VALUE) {
+            if (isStateEmpty(currentStateValue)) {
                 continue;
             }
             final long k0 = originalKeyArray0[sourceBucket];
@@ -240,7 +243,7 @@ protected void rehashInternalFull(final int oldSize) {
             final int firstDestinationTableLocation = hashToTableLocation(hash);
             int destinationTableLocation = firstDestinationTableLocation;
             while (true) {
-                if (destState[destinationTableLocation] == EMPTY_RIGHT_VALUE) {
+                if (isStateEmpty(destState[destinationTableLocation])) {
                     destKeyArray0[destinationTableLocation] = k0;
                     destKeyArray1[destinationTableLocation] = k1;
                     destState[destinationTableLocation] = originalStateArray[sourceBucket];
diff --git a/engine/table/src/main/java/io/deephaven/engine/table/impl/updateby/hashing/typed/open/gen/UpdateByHasherLongShort.java b/engine/table/src/main/java/io/deephaven/engine/table/impl/updateby/hashing/typed/open/gen/UpdateByHasherLongShort.java
index ae2f7a9b6cc..f5258bfe2f8 100644
--- a/engine/table/src/main/java/io/deephaven/engine/table/impl/updateby/hashing/typed/open/gen/UpdateByHasherLongShort.java
+++ b/engine/table/src/main/java/io/deephaven/engine/table/impl/updateby/hashing/typed/open/gen/UpdateByHasherLongShort.java
@@ -70,12 +70,12 @@ protected void buildHashTable(RowSequence rowSequence, Chunk[] sourceKeyChunks,
             int tableLocation = firstTableLocation;
             MAIN_SEARCH: while (true) {
                 int rowState = stateSource.getUnsafe(tableLocation);
-                if (rowState == EMPTY_RIGHT_VALUE) {
+                if (isStateEmpty(rowState)) {
                     final int firstAlternateTableLocation = hashToTableLocationAlternate(hash);
                     int alternateTableLocation = firstAlternateTableLocation;
                     while (alternateTableLocation < rehashPointer) {
                         rowState = alternateStateSource.getUnsafe(alternateTableLocation);
-                        if (rowState == EMPTY_RIGHT_VALUE) {
+                        if (isStateEmpty(rowState)) {
                             break;
                         } else if (eq(alternateKeySource0.getUnsafe(alternateTableLocation), k0) && eq(alternateKeySource1.getUnsafe(alternateTableLocation), k1)) {
                             // map the existing bucket to this chunk position;
@@ -121,7 +121,7 @@ protected void probeHashTable(RowSequence rowSequence, Chunk[] sourceKeyChunks,
             boolean found = false;
             int tableLocation = firstTableLocation;
             int rowState;
-            while ((rowState = stateSource.getUnsafe(tableLocation)) != EMPTY_RIGHT_VALUE) {
+            while (!isStateEmpty(rowState = stateSource.getUnsafe(tableLocation))) {
                 if (eq(mainKeySource0.getUnsafe(tableLocation), k0) && eq(mainKeySource1.getUnsafe(tableLocation), k1)) {
                     // map the existing bucket to this chunk position;
                     outputPositions.set(chunkPosition, rowState);
@@ -136,7 +136,7 @@ protected void probeHashTable(RowSequence rowSequence, Chunk[] sourceKeyChunks,
                 boolean alternateFound = false;
                 if (firstAlternateTableLocation < rehashPointer) {
                     int alternateTableLocation = firstAlternateTableLocation;
-                    while ((rowState = alternateStateSource.getUnsafe(alternateTableLocation)) != EMPTY_RIGHT_VALUE) {
+                    while (!isStateEmpty(rowState = alternateStateSource.getUnsafe(alternateTableLocation))) {
                         if (eq(alternateKeySource0.getUnsafe(alternateTableLocation), k0) && eq(alternateKeySource1.getUnsafe(alternateTableLocation), k1)) {
                             // map the existing bucket (from alternate) to this chunk position;
                             outputPositions.set(chunkPosition, rowState);
@@ -161,17 +161,21 @@ private static int hash(long k0, short k1) {
         return hash;
     }
 
+    private static boolean isStateEmpty(int state) {
+        return state == EMPTY_RIGHT_VALUE;
+    }
+
     private boolean migrateOneLocation(int locationToMigrate,
             WritableIntChunk<RowKeys> outputPositions) {
         final int currentStateValue = alternateStateSource.getUnsafe(locationToMigrate);
-        if (currentStateValue == EMPTY_RIGHT_VALUE) {
+        if (isStateEmpty(currentStateValue)) {
             return false;
         }
         final long k0 = alternateKeySource0.getUnsafe(locationToMigrate);
         final short k1 = alternateKeySource1.getUnsafe(locationToMigrate);
         final int hash = hash(k0, k1);
         int destinationTableLocation = hashToTableLocation(hash);
-        while (stateSource.getUnsafe(destinationTableLocation) != EMPTY_RIGHT_VALUE) {
+        while (!isStateEmpty(stateSource.getUnsafe(destinationTableLocation))) {
             destinationTableLocation = nextTableLocation(destinationTableLocation);
         }
         mainKeySource0.set(destinationTableLocation, k0);
@@ -194,8 +198,7 @@ protected int rehashInternalPartial(int entriesToRehash,
     }
 
     @Override
-    protected void newAlternate() {
-        super.newAlternate();
+    protected void adviseNewAlternate() {
         this.mainKeySource0 = (ImmutableLongArraySource)super.mainKeySources[0];
         this.alternateKeySource0 = (ImmutableLongArraySource)super.alternateKeySources[0];
         this.mainKeySource1 = (ImmutableShortArraySource)super.mainKeySources[1];
@@ -212,7 +215,7 @@ protected void clearAlternate() {
     @Override
     protected void migrateFront(WritableIntChunk<RowKeys> outputPositions) {
         int location = 0;
-        while (migrateOneLocation(location++, outputPositions));
+        while (migrateOneLocation(location++, outputPositions) && location < alternateTableSize);
     }
 
     @Override
@@ -229,7 +232,7 @@ protected void rehashInternalFull(final int oldSize) {
         stateSource.setArray(destState);
         for (int sourceBucket = 0; sourceBucket < oldSize; ++sourceBucket) {
             final int currentStateValue = originalStateArray[sourceBucket];
-            if (currentStateValue == EMPTY_RIGHT_VALUE) {
+            if (isStateEmpty(currentStateValue)) {
                 continue;
             }
             final long k0 = originalKeyArray0[sourceBucket];
@@ -238,7 +241,7 @@ protected void rehashInternalFull(final int oldSize) {
             final int firstDestinationTableLocation = hashToTableLocation(hash);
             int destinationTableLocation = firstDestinationTableLocation;
             while (true) {
-                if (destState[destinationTableLocation] == EMPTY_RIGHT_VALUE) {
+                if (isStateEmpty(destState[destinationTableLocation])) {
                     destKeyArray0[destinationTableLocation] = k0;
                     destKeyArray1[destinationTableLocation] = k1;
                     destState[destinationTableLocation] = originalStateArray[sourceBucket];
diff --git a/engine/table/src/main/java/io/deephaven/engine/table/impl/updateby/hashing/typed/open/gen/UpdateByHasherObject.java b/engine/table/src/main/java/io/deephaven/engine/table/impl/updateby/hashing/typed/open/gen/UpdateByHasherObject.java
index 4f6d71e3bc1..7e38675e757 100644
--- a/engine/table/src/main/java/io/deephaven/engine/table/impl/updateby/hashing/typed/open/gen/UpdateByHasherObject.java
+++ b/engine/table/src/main/java/io/deephaven/engine/table/impl/updateby/hashing/typed/open/gen/UpdateByHasherObject.java
@@ -60,12 +60,12 @@ protected void buildHashTable(RowSequence rowSequence, Chunk[] sourceKeyChunks,
             int tableLocation = firstTableLocation;
             MAIN_SEARCH: while (true) {
                 int rowState = stateSource.getUnsafe(tableLocation);
-                if (rowState == EMPTY_RIGHT_VALUE) {
+                if (isStateEmpty(rowState)) {
                     final int firstAlternateTableLocation = hashToTableLocationAlternate(hash);
                     int alternateTableLocation = firstAlternateTableLocation;
                     while (alternateTableLocation < rehashPointer) {
                         rowState = alternateStateSource.getUnsafe(alternateTableLocation);
-                        if (rowState == EMPTY_RIGHT_VALUE) {
+                        if (isStateEmpty(rowState)) {
                             break;
                         } else if (eq(alternateKeySource0.getUnsafe(alternateTableLocation), k0)) {
                             // map the existing bucket to this chunk position;
@@ -108,7 +108,7 @@ protected void probeHashTable(RowSequence rowSequence, Chunk[] sourceKeyChunks,
             boolean found = false;
             int tableLocation = firstTableLocation;
             int rowState;
-            while ((rowState = stateSource.getUnsafe(tableLocation)) != EMPTY_RIGHT_VALUE) {
+            while (!isStateEmpty(rowState = stateSource.getUnsafe(tableLocation))) {
                 if (eq(mainKeySource0.getUnsafe(tableLocation), k0)) {
                     // map the existing bucket to this chunk position;
                     outputPositions.set(chunkPosition, rowState);
@@ -123,7 +123,7 @@ protected void probeHashTable(RowSequence rowSequence, Chunk[] sourceKeyChunks,
                 boolean alternateFound = false;
                 if (firstAlternateTableLocation < rehashPointer) {
                     int alternateTableLocation = firstAlternateTableLocation;
-                    while ((rowState = alternateStateSource.getUnsafe(alternateTableLocation)) != EMPTY_RIGHT_VALUE) {
+                    while (!isStateEmpty(rowState = alternateStateSource.getUnsafe(alternateTableLocation))) {
                         if (eq(alternateKeySource0.getUnsafe(alternateTableLocation), k0)) {
                             // map the existing bucket (from alternate) to this chunk position;
                             outputPositions.set(chunkPosition, rowState);
@@ -147,16 +147,20 @@ private static int hash(Object k0) {
         return hash;
     }
 
+    private static boolean isStateEmpty(int state) {
+        return state == EMPTY_RIGHT_VALUE;
+    }
+
     private boolean migrateOneLocation(int locationToMigrate,
             WritableIntChunk<RowKeys> outputPositions) {
         final int currentStateValue = alternateStateSource.getUnsafe(locationToMigrate);
-        if (currentStateValue == EMPTY_RIGHT_VALUE) {
+        if (isStateEmpty(currentStateValue)) {
             return false;
         }
         final Object k0 = alternateKeySource0.getUnsafe(locationToMigrate);
         final int hash = hash(k0);
         int destinationTableLocation = hashToTableLocation(hash);
-        while (stateSource.getUnsafe(destinationTableLocation) != EMPTY_RIGHT_VALUE) {
+        while (!isStateEmpty(stateSource.getUnsafe(destinationTableLocation))) {
             destinationTableLocation = nextTableLocation(destinationTableLocation);
         }
         mainKeySource0.set(destinationTableLocation, k0);
@@ -179,8 +183,7 @@ protected int rehashInternalPartial(int entriesToRehash,
     }
 
     @Override
-    protected void newAlternate() {
-        super.newAlternate();
+    protected void adviseNewAlternate() {
         this.mainKeySource0 = (ImmutableObjectArraySource)super.mainKeySources[0];
         this.alternateKeySource0 = (ImmutableObjectArraySource)super.alternateKeySources[0];
     }
@@ -194,7 +197,7 @@ protected void clearAlternate() {
     @Override
     protected void migrateFront(WritableIntChunk<RowKeys> outputPositions) {
         int location = 0;
-        while (migrateOneLocation(location++, outputPositions));
+        while (migrateOneLocation(location++, outputPositions) && location < alternateTableSize);
     }
 
     @Override
@@ -208,7 +211,7 @@ protected void rehashInternalFull(final int oldSize) {
         stateSource.setArray(destState);
         for (int sourceBucket = 0; sourceBucket < oldSize; ++sourceBucket) {
             final int currentStateValue = originalStateArray[sourceBucket];
-            if (currentStateValue == EMPTY_RIGHT_VALUE) {
+            if (isStateEmpty(currentStateValue)) {
                 continue;
             }
             final Object k0 = originalKeyArray0[sourceBucket];
@@ -216,7 +219,7 @@ protected void rehashInternalFull(final int oldSize) {
             final int firstDestinationTableLocation = hashToTableLocation(hash);
             int destinationTableLocation = firstDestinationTableLocation;
             while (true) {
-                if (destState[destinationTableLocation] == EMPTY_RIGHT_VALUE) {
+                if (isStateEmpty(destState[destinationTableLocation])) {
                     destKeyArray0[destinationTableLocation] = k0;
                     destState[destinationTableLocation] = originalStateArray[sourceBucket];
                     break;
diff --git a/engine/table/src/main/java/io/deephaven/engine/table/impl/updateby/hashing/typed/open/gen/UpdateByHasherObjectByte.java b/engine/table/src/main/java/io/deephaven/engine/table/impl/updateby/hashing/typed/open/gen/UpdateByHasherObjectByte.java
index 1ea4397799a..13b38f956fa 100644
--- a/engine/table/src/main/java/io/deephaven/engine/table/impl/updateby/hashing/typed/open/gen/UpdateByHasherObjectByte.java
+++ b/engine/table/src/main/java/io/deephaven/engine/table/impl/updateby/hashing/typed/open/gen/UpdateByHasherObjectByte.java
@@ -72,12 +72,12 @@ protected void buildHashTable(RowSequence rowSequence, Chunk[] sourceKeyChunks,
             int tableLocation = firstTableLocation;
             MAIN_SEARCH: while (true) {
                 int rowState = stateSource.getUnsafe(tableLocation);
-                if (rowState == EMPTY_RIGHT_VALUE) {
+                if (isStateEmpty(rowState)) {
                     final int firstAlternateTableLocation = hashToTableLocationAlternate(hash);
                     int alternateTableLocation = firstAlternateTableLocation;
                     while (alternateTableLocation < rehashPointer) {
                         rowState = alternateStateSource.getUnsafe(alternateTableLocation);
-                        if (rowState == EMPTY_RIGHT_VALUE) {
+                        if (isStateEmpty(rowState)) {
                             break;
                         } else if (eq(alternateKeySource0.getUnsafe(alternateTableLocation), k0) && eq(alternateKeySource1.getUnsafe(alternateTableLocation), k1)) {
                             // map the existing bucket to this chunk position;
@@ -123,7 +123,7 @@ protected void probeHashTable(RowSequence rowSequence, Chunk[] sourceKeyChunks,
             boolean found = false;
             int tableLocation = firstTableLocation;
             int rowState;
-            while ((rowState = stateSource.getUnsafe(tableLocation)) != EMPTY_RIGHT_VALUE) {
+            while (!isStateEmpty(rowState = stateSource.getUnsafe(tableLocation))) {
                 if (eq(mainKeySource0.getUnsafe(tableLocation), k0) && eq(mainKeySource1.getUnsafe(tableLocation), k1)) {
                     // map the existing bucket to this chunk position;
                     outputPositions.set(chunkPosition, rowState);
@@ -138,7 +138,7 @@ protected void probeHashTable(RowSequence rowSequence, Chunk[] sourceKeyChunks,
                 boolean alternateFound = false;
                 if (firstAlternateTableLocation < rehashPointer) {
                     int alternateTableLocation = firstAlternateTableLocation;
-                    while ((rowState = alternateStateSource.getUnsafe(alternateTableLocation)) != EMPTY_RIGHT_VALUE) {
+                    while (!isStateEmpty(rowState = alternateStateSource.getUnsafe(alternateTableLocation))) {
                         if (eq(alternateKeySource0.getUnsafe(alternateTableLocation), k0) && eq(alternateKeySource1.getUnsafe(alternateTableLocation), k1)) {
                             // map the existing bucket (from alternate) to this chunk position;
                             outputPositions.set(chunkPosition, rowState);
@@ -163,17 +163,21 @@ private static int hash(Object k0, byte k1) {
         return hash;
     }
 
+    private static boolean isStateEmpty(int state) {
+        return state == EMPTY_RIGHT_VALUE;
+    }
+
     private boolean migrateOneLocation(int locationToMigrate,
             WritableIntChunk<RowKeys> outputPositions) {
         final int currentStateValue = alternateStateSource.getUnsafe(locationToMigrate);
-        if (currentStateValue == EMPTY_RIGHT_VALUE) {
+        if (isStateEmpty(currentStateValue)) {
             return false;
         }
         final Object k0 = alternateKeySource0.getUnsafe(locationToMigrate);
         final byte k1 = alternateKeySource1.getUnsafe(locationToMigrate);
         final int hash = hash(k0, k1);
         int destinationTableLocation = hashToTableLocation(hash);
-        while (stateSource.getUnsafe(destinationTableLocation) != EMPTY_RIGHT_VALUE) {
+        while (!isStateEmpty(stateSource.getUnsafe(destinationTableLocation))) {
             destinationTableLocation = nextTableLocation(destinationTableLocation);
         }
         mainKeySource0.set(destinationTableLocation, k0);
@@ -197,8 +201,7 @@ protected int rehashInternalPartial(int entriesToRehash,
     }
 
     @Override
-    protected void newAlternate() {
-        super.newAlternate();
+    protected void adviseNewAlternate() {
         this.mainKeySource0 = (ImmutableObjectArraySource)super.mainKeySources[0];
         this.alternateKeySource0 = (ImmutableObjectArraySource)super.alternateKeySources[0];
         this.mainKeySource1 = (ImmutableByteArraySource)super.mainKeySources[1];
@@ -215,7 +218,7 @@ protected void clearAlternate() {
     @Override
     protected void migrateFront(WritableIntChunk<RowKeys> outputPositions) {
         int location = 0;
-        while (migrateOneLocation(location++, outputPositions));
+        while (migrateOneLocation(location++, outputPositions) && location < alternateTableSize);
     }
 
     @Override
@@ -232,7 +235,7 @@ protected void rehashInternalFull(final int oldSize) {
         stateSource.setArray(destState);
         for (int sourceBucket = 0; sourceBucket < oldSize; ++sourceBucket) {
             final int currentStateValue = originalStateArray[sourceBucket];
-            if (currentStateValue == EMPTY_RIGHT_VALUE) {
+            if (isStateEmpty(currentStateValue)) {
                 continue;
             }
             final Object k0 = originalKeyArray0[sourceBucket];
@@ -241,7 +244,7 @@ protected void rehashInternalFull(final int oldSize) {
             final int firstDestinationTableLocation = hashToTableLocation(hash);
             int destinationTableLocation = firstDestinationTableLocation;
             while (true) {
-                if (destState[destinationTableLocation] == EMPTY_RIGHT_VALUE) {
+                if (isStateEmpty(destState[destinationTableLocation])) {
                     destKeyArray0[destinationTableLocation] = k0;
                     destKeyArray1[destinationTableLocation] = k1;
                     destState[destinationTableLocation] = originalStateArray[sourceBucket];
diff --git a/engine/table/src/main/java/io/deephaven/engine/table/impl/updateby/hashing/typed/open/gen/UpdateByHasherObjectChar.java b/engine/table/src/main/java/io/deephaven/engine/table/impl/updateby/hashing/typed/open/gen/UpdateByHasherObjectChar.java
index 292448fd924..aa898b8541b 100644
--- a/engine/table/src/main/java/io/deephaven/engine/table/impl/updateby/hashing/typed/open/gen/UpdateByHasherObjectChar.java
+++ b/engine/table/src/main/java/io/deephaven/engine/table/impl/updateby/hashing/typed/open/gen/UpdateByHasherObjectChar.java
@@ -72,12 +72,12 @@ protected void buildHashTable(RowSequence rowSequence, Chunk[] sourceKeyChunks,
             int tableLocation = firstTableLocation;
             MAIN_SEARCH: while (true) {
                 int rowState = stateSource.getUnsafe(tableLocation);
-                if (rowState == EMPTY_RIGHT_VALUE) {
+                if (isStateEmpty(rowState)) {
                     final int firstAlternateTableLocation = hashToTableLocationAlternate(hash);
                     int alternateTableLocation = firstAlternateTableLocation;
                     while (alternateTableLocation < rehashPointer) {
                         rowState = alternateStateSource.getUnsafe(alternateTableLocation);
-                        if (rowState == EMPTY_RIGHT_VALUE) {
+                        if (isStateEmpty(rowState)) {
                             break;
                         } else if (eq(alternateKeySource0.getUnsafe(alternateTableLocation), k0) && eq(alternateKeySource1.getUnsafe(alternateTableLocation), k1)) {
                             // map the existing bucket to this chunk position;
@@ -123,7 +123,7 @@ protected void probeHashTable(RowSequence rowSequence, Chunk[] sourceKeyChunks,
             boolean found = false;
             int tableLocation = firstTableLocation;
             int rowState;
-            while ((rowState = stateSource.getUnsafe(tableLocation)) != EMPTY_RIGHT_VALUE) {
+            while (!isStateEmpty(rowState = stateSource.getUnsafe(tableLocation))) {
                 if (eq(mainKeySource0.getUnsafe(tableLocation), k0) && eq(mainKeySource1.getUnsafe(tableLocation), k1)) {
                     // map the existing bucket to this chunk position;
                     outputPositions.set(chunkPosition, rowState);
@@ -138,7 +138,7 @@ protected void probeHashTable(RowSequence rowSequence, Chunk[] sourceKeyChunks,
                 boolean alternateFound = false;
                 if (firstAlternateTableLocation < rehashPointer) {
                     int alternateTableLocation = firstAlternateTableLocation;
-                    while ((rowState = alternateStateSource.getUnsafe(alternateTableLocation)) != EMPTY_RIGHT_VALUE) {
+                    while (!isStateEmpty(rowState = alternateStateSource.getUnsafe(alternateTableLocation))) {
                         if (eq(alternateKeySource0.getUnsafe(alternateTableLocation), k0) && eq(alternateKeySource1.getUnsafe(alternateTableLocation), k1)) {
                             // map the existing bucket (from alternate) to this chunk position;
                             outputPositions.set(chunkPosition, rowState);
@@ -163,17 +163,21 @@ private static int hash(Object k0, char k1) {
         return hash;
     }
 
+    private static boolean isStateEmpty(int state) {
+        return state == EMPTY_RIGHT_VALUE;
+    }
+
     private boolean migrateOneLocation(int locationToMigrate,
             WritableIntChunk<RowKeys> outputPositions) {
         final int currentStateValue = alternateStateSource.getUnsafe(locationToMigrate);
-        if (currentStateValue == EMPTY_RIGHT_VALUE) {
+        if (isStateEmpty(currentStateValue)) {
             return false;
         }
         final Object k0 = alternateKeySource0.getUnsafe(locationToMigrate);
         final char k1 = alternateKeySource1.getUnsafe(locationToMigrate);
         final int hash = hash(k0, k1);
         int destinationTableLocation = hashToTableLocation(hash);
-        while (stateSource.getUnsafe(destinationTableLocation) != EMPTY_RIGHT_VALUE) {
+        while (!isStateEmpty(stateSource.getUnsafe(destinationTableLocation))) {
             destinationTableLocation = nextTableLocation(destinationTableLocation);
         }
         mainKeySource0.set(destinationTableLocation, k0);
@@ -197,8 +201,7 @@ protected int rehashInternalPartial(int entriesToRehash,
     }
 
     @Override
-    protected void newAlternate() {
-        super.newAlternate();
+    protected void adviseNewAlternate() {
         this.mainKeySource0 = (ImmutableObjectArraySource)super.mainKeySources[0];
         this.alternateKeySource0 = (ImmutableObjectArraySource)super.alternateKeySources[0];
         this.mainKeySource1 = (ImmutableCharArraySource)super.mainKeySources[1];
@@ -215,7 +218,7 @@ protected void clearAlternate() {
     @Override
     protected void migrateFront(WritableIntChunk<RowKeys> outputPositions) {
         int location = 0;
-        while (migrateOneLocation(location++, outputPositions));
+        while (migrateOneLocation(location++, outputPositions) && location < alternateTableSize);
     }
 
     @Override
@@ -232,7 +235,7 @@ protected void rehashInternalFull(final int oldSize) {
         stateSource.setArray(destState);
         for (int sourceBucket = 0; sourceBucket < oldSize; ++sourceBucket) {
             final int currentStateValue = originalStateArray[sourceBucket];
-            if (currentStateValue == EMPTY_RIGHT_VALUE) {
+            if (isStateEmpty(currentStateValue)) {
                 continue;
             }
             final Object k0 = originalKeyArray0[sourceBucket];
@@ -241,7 +244,7 @@ protected void rehashInternalFull(final int oldSize) {
             final int firstDestinationTableLocation = hashToTableLocation(hash);
             int destinationTableLocation = firstDestinationTableLocation;
             while (true) {
-                if (destState[destinationTableLocation] == EMPTY_RIGHT_VALUE) {
+                if (isStateEmpty(destState[destinationTableLocation])) {
                     destKeyArray0[destinationTableLocation] = k0;
                     destKeyArray1[destinationTableLocation] = k1;
                     destState[destinationTableLocation] = originalStateArray[sourceBucket];
diff --git a/engine/table/src/main/java/io/deephaven/engine/table/impl/updateby/hashing/typed/open/gen/UpdateByHasherObjectDouble.java b/engine/table/src/main/java/io/deephaven/engine/table/impl/updateby/hashing/typed/open/gen/UpdateByHasherObjectDouble.java
index f865228e0c7..8e81cfd9b41 100644
--- a/engine/table/src/main/java/io/deephaven/engine/table/impl/updateby/hashing/typed/open/gen/UpdateByHasherObjectDouble.java
+++ b/engine/table/src/main/java/io/deephaven/engine/table/impl/updateby/hashing/typed/open/gen/UpdateByHasherObjectDouble.java
@@ -72,12 +72,12 @@ protected void buildHashTable(RowSequence rowSequence, Chunk[] sourceKeyChunks,
             int tableLocation = firstTableLocation;
             MAIN_SEARCH: while (true) {
                 int rowState = stateSource.getUnsafe(tableLocation);
-                if (rowState == EMPTY_RIGHT_VALUE) {
+                if (isStateEmpty(rowState)) {
                     final int firstAlternateTableLocation = hashToTableLocationAlternate(hash);
                     int alternateTableLocation = firstAlternateTableLocation;
                     while (alternateTableLocation < rehashPointer) {
                         rowState = alternateStateSource.getUnsafe(alternateTableLocation);
-                        if (rowState == EMPTY_RIGHT_VALUE) {
+                        if (isStateEmpty(rowState)) {
                             break;
                         } else if (eq(alternateKeySource0.getUnsafe(alternateTableLocation), k0) && eq(alternateKeySource1.getUnsafe(alternateTableLocation), k1)) {
                             // map the existing bucket to this chunk position;
@@ -123,7 +123,7 @@ protected void probeHashTable(RowSequence rowSequence, Chunk[] sourceKeyChunks,
             boolean found = false;
             int tableLocation = firstTableLocation;
             int rowState;
-            while ((rowState = stateSource.getUnsafe(tableLocation)) != EMPTY_RIGHT_VALUE) {
+            while (!isStateEmpty(rowState = stateSource.getUnsafe(tableLocation))) {
                 if (eq(mainKeySource0.getUnsafe(tableLocation), k0) && eq(mainKeySource1.getUnsafe(tableLocation), k1)) {
                     // map the existing bucket to this chunk position;
                     outputPositions.set(chunkPosition, rowState);
@@ -138,7 +138,7 @@ protected void probeHashTable(RowSequence rowSequence, Chunk[] sourceKeyChunks,
                 boolean alternateFound = false;
                 if (firstAlternateTableLocation < rehashPointer) {
                     int alternateTableLocation = firstAlternateTableLocation;
-                    while ((rowState = alternateStateSource.getUnsafe(alternateTableLocation)) != EMPTY_RIGHT_VALUE) {
+                    while (!isStateEmpty(rowState = alternateStateSource.getUnsafe(alternateTableLocation))) {
                         if (eq(alternateKeySource0.getUnsafe(alternateTableLocation), k0) && eq(alternateKeySource1.getUnsafe(alternateTableLocation), k1)) {
                             // map the existing bucket (from alternate) to this chunk position;
                             outputPositions.set(chunkPosition, rowState);
@@ -163,17 +163,21 @@ private static int hash(Object k0, double k1) {
         return hash;
     }
 
+    private static boolean isStateEmpty(int state) {
+        return state == EMPTY_RIGHT_VALUE;
+    }
+
     private boolean migrateOneLocation(int locationToMigrate,
             WritableIntChunk<RowKeys> outputPositions) {
         final int currentStateValue = alternateStateSource.getUnsafe(locationToMigrate);
-        if (currentStateValue == EMPTY_RIGHT_VALUE) {
+        if (isStateEmpty(currentStateValue)) {
             return false;
         }
         final Object k0 = alternateKeySource0.getUnsafe(locationToMigrate);
         final double k1 = alternateKeySource1.getUnsafe(locationToMigrate);
         final int hash = hash(k0, k1);
         int destinationTableLocation = hashToTableLocation(hash);
-        while (stateSource.getUnsafe(destinationTableLocation) != EMPTY_RIGHT_VALUE) {
+        while (!isStateEmpty(stateSource.getUnsafe(destinationTableLocation))) {
             destinationTableLocation = nextTableLocation(destinationTableLocation);
         }
         mainKeySource0.set(destinationTableLocation, k0);
@@ -197,8 +201,7 @@ protected int rehashInternalPartial(int entriesToRehash,
     }
 
     @Override
-    protected void newAlternate() {
-        super.newAlternate();
+    protected void adviseNewAlternate() {
         this.mainKeySource0 = (ImmutableObjectArraySource)super.mainKeySources[0];
         this.alternateKeySource0 = (ImmutableObjectArraySource)super.alternateKeySources[0];
         this.mainKeySource1 = (ImmutableDoubleArraySource)super.mainKeySources[1];
@@ -215,7 +218,7 @@ protected void clearAlternate() {
     @Override
     protected void migrateFront(WritableIntChunk<RowKeys> outputPositions) {
         int location = 0;
-        while (migrateOneLocation(location++, outputPositions));
+        while (migrateOneLocation(location++, outputPositions) && location < alternateTableSize);
     }
 
     @Override
@@ -232,7 +235,7 @@ protected void rehashInternalFull(final int oldSize) {
         stateSource.setArray(destState);
         for (int sourceBucket = 0; sourceBucket < oldSize; ++sourceBucket) {
             final int currentStateValue = originalStateArray[sourceBucket];
-            if (currentStateValue == EMPTY_RIGHT_VALUE) {
+            if (isStateEmpty(currentStateValue)) {
                 continue;
             }
             final Object k0 = originalKeyArray0[sourceBucket];
@@ -241,7 +244,7 @@ protected void rehashInternalFull(final int oldSize) {
             final int firstDestinationTableLocation = hashToTableLocation(hash);
             int destinationTableLocation = firstDestinationTableLocation;
             while (true) {
-                if (destState[destinationTableLocation] == EMPTY_RIGHT_VALUE) {
+                if (isStateEmpty(destState[destinationTableLocation])) {
                     destKeyArray0[destinationTableLocation] = k0;
                     destKeyArray1[destinationTableLocation] = k1;
                     destState[destinationTableLocation] = originalStateArray[sourceBucket];
diff --git a/engine/table/src/main/java/io/deephaven/engine/table/impl/updateby/hashing/typed/open/gen/UpdateByHasherObjectFloat.java b/engine/table/src/main/java/io/deephaven/engine/table/impl/updateby/hashing/typed/open/gen/UpdateByHasherObjectFloat.java
index ac1abc1a807..72438aea864 100644
--- a/engine/table/src/main/java/io/deephaven/engine/table/impl/updateby/hashing/typed/open/gen/UpdateByHasherObjectFloat.java
+++ b/engine/table/src/main/java/io/deephaven/engine/table/impl/updateby/hashing/typed/open/gen/UpdateByHasherObjectFloat.java
@@ -72,12 +72,12 @@ protected void buildHashTable(RowSequence rowSequence, Chunk[] sourceKeyChunks,
             int tableLocation = firstTableLocation;
             MAIN_SEARCH: while (true) {
                 int rowState = stateSource.getUnsafe(tableLocation);
-                if (rowState == EMPTY_RIGHT_VALUE) {
+                if (isStateEmpty(rowState)) {
                     final int firstAlternateTableLocation = hashToTableLocationAlternate(hash);
                     int alternateTableLocation = firstAlternateTableLocation;
                     while (alternateTableLocation < rehashPointer) {
                         rowState = alternateStateSource.getUnsafe(alternateTableLocation);
-                        if (rowState == EMPTY_RIGHT_VALUE) {
+                        if (isStateEmpty(rowState)) {
                             break;
                         } else if (eq(alternateKeySource0.getUnsafe(alternateTableLocation), k0) && eq(alternateKeySource1.getUnsafe(alternateTableLocation), k1)) {
                             // map the existing bucket to this chunk position;
@@ -123,7 +123,7 @@ protected void probeHashTable(RowSequence rowSequence, Chunk[] sourceKeyChunks,
             boolean found = false;
             int tableLocation = firstTableLocation;
             int rowState;
-            while ((rowState = stateSource.getUnsafe(tableLocation)) != EMPTY_RIGHT_VALUE) {
+            while (!isStateEmpty(rowState = stateSource.getUnsafe(tableLocation))) {
                 if (eq(mainKeySource0.getUnsafe(tableLocation), k0) && eq(mainKeySource1.getUnsafe(tableLocation), k1)) {
                     // map the existing bucket to this chunk position;
                     outputPositions.set(chunkPosition, rowState);
@@ -138,7 +138,7 @@ protected void probeHashTable(RowSequence rowSequence, Chunk[] sourceKeyChunks,
                 boolean alternateFound = false;
                 if (firstAlternateTableLocation < rehashPointer) {
                     int alternateTableLocation = firstAlternateTableLocation;
-                    while ((rowState = alternateStateSource.getUnsafe(alternateTableLocation)) != EMPTY_RIGHT_VALUE) {
+                    while (!isStateEmpty(rowState = alternateStateSource.getUnsafe(alternateTableLocation))) {
                         if (eq(alternateKeySource0.getUnsafe(alternateTableLocation), k0) && eq(alternateKeySource1.getUnsafe(alternateTableLocation), k1)) {
                             // map the existing bucket (from alternate) to this chunk position;
                             outputPositions.set(chunkPosition, rowState);
@@ -163,17 +163,21 @@ private static int hash(Object k0, float k1) {
         return hash;
     }
 
+    private static boolean isStateEmpty(int state) {
+        return state == EMPTY_RIGHT_VALUE;
+    }
+
     private boolean migrateOneLocation(int locationToMigrate,
             WritableIntChunk<RowKeys> outputPositions) {
         final int currentStateValue = alternateStateSource.getUnsafe(locationToMigrate);
-        if (currentStateValue == EMPTY_RIGHT_VALUE) {
+        if (isStateEmpty(currentStateValue)) {
             return false;
         }
         final Object k0 = alternateKeySource0.getUnsafe(locationToMigrate);
         final float k1 = alternateKeySource1.getUnsafe(locationToMigrate);
         final int hash = hash(k0, k1);
         int destinationTableLocation = hashToTableLocation(hash);
-        while (stateSource.getUnsafe(destinationTableLocation) != EMPTY_RIGHT_VALUE) {
+        while (!isStateEmpty(stateSource.getUnsafe(destinationTableLocation))) {
             destinationTableLocation = nextTableLocation(destinationTableLocation);
         }
         mainKeySource0.set(destinationTableLocation, k0);
@@ -197,8 +201,7 @@ protected int rehashInternalPartial(int entriesToRehash,
     }
 
     @Override
-    protected void newAlternate() {
-        super.newAlternate();
+    protected void adviseNewAlternate() {
         this.mainKeySource0 = (ImmutableObjectArraySource)super.mainKeySources[0];
         this.alternateKeySource0 = (ImmutableObjectArraySource)super.alternateKeySources[0];
         this.mainKeySource1 = (ImmutableFloatArraySource)super.mainKeySources[1];
@@ -215,7 +218,7 @@ protected void clearAlternate() {
     @Override
     protected void migrateFront(WritableIntChunk<RowKeys> outputPositions) {
         int location = 0;
-        while (migrateOneLocation(location++, outputPositions));
+        while (migrateOneLocation(location++, outputPositions) && location < alternateTableSize);
     }
 
     @Override
@@ -232,7 +235,7 @@ protected void rehashInternalFull(final int oldSize) {
         stateSource.setArray(destState);
         for (int sourceBucket = 0; sourceBucket < oldSize; ++sourceBucket) {
             final int currentStateValue = originalStateArray[sourceBucket];
-            if (currentStateValue == EMPTY_RIGHT_VALUE) {
+            if (isStateEmpty(currentStateValue)) {
                 continue;
             }
             final Object k0 = originalKeyArray0[sourceBucket];
@@ -241,7 +244,7 @@ protected void rehashInternalFull(final int oldSize) {
             final int firstDestinationTableLocation = hashToTableLocation(hash);
             int destinationTableLocation = firstDestinationTableLocation;
             while (true) {
-                if (destState[destinationTableLocation] == EMPTY_RIGHT_VALUE) {
+                if (isStateEmpty(destState[destinationTableLocation])) {
                     destKeyArray0[destinationTableLocation] = k0;
                     destKeyArray1[destinationTableLocation] = k1;
                     destState[destinationTableLocation] = originalStateArray[sourceBucket];
diff --git a/engine/table/src/main/java/io/deephaven/engine/table/impl/updateby/hashing/typed/open/gen/UpdateByHasherObjectInt.java b/engine/table/src/main/java/io/deephaven/engine/table/impl/updateby/hashing/typed/open/gen/UpdateByHasherObjectInt.java
index 6e309e92247..f412fbf7a74 100644
--- a/engine/table/src/main/java/io/deephaven/engine/table/impl/updateby/hashing/typed/open/gen/UpdateByHasherObjectInt.java
+++ b/engine/table/src/main/java/io/deephaven/engine/table/impl/updateby/hashing/typed/open/gen/UpdateByHasherObjectInt.java
@@ -72,12 +72,12 @@ protected void buildHashTable(RowSequence rowSequence, Chunk[] sourceKeyChunks,
             int tableLocation = firstTableLocation;
             MAIN_SEARCH: while (true) {
                 int rowState = stateSource.getUnsafe(tableLocation);
-                if (rowState == EMPTY_RIGHT_VALUE) {
+                if (isStateEmpty(rowState)) {
                     final int firstAlternateTableLocation = hashToTableLocationAlternate(hash);
                     int alternateTableLocation = firstAlternateTableLocation;
                     while (alternateTableLocation < rehashPointer) {
                         rowState = alternateStateSource.getUnsafe(alternateTableLocation);
-                        if (rowState == EMPTY_RIGHT_VALUE) {
+                        if (isStateEmpty(rowState)) {
                             break;
                         } else if (eq(alternateKeySource0.getUnsafe(alternateTableLocation), k0) && eq(alternateKeySource1.getUnsafe(alternateTableLocation), k1)) {
                             // map the existing bucket to this chunk position;
@@ -123,7 +123,7 @@ protected void probeHashTable(RowSequence rowSequence, Chunk[] sourceKeyChunks,
             boolean found = false;
             int tableLocation = firstTableLocation;
             int rowState;
-            while ((rowState = stateSource.getUnsafe(tableLocation)) != EMPTY_RIGHT_VALUE) {
+            while (!isStateEmpty(rowState = stateSource.getUnsafe(tableLocation))) {
                 if (eq(mainKeySource0.getUnsafe(tableLocation), k0) && eq(mainKeySource1.getUnsafe(tableLocation), k1)) {
                     // map the existing bucket to this chunk position;
                     outputPositions.set(chunkPosition, rowState);
@@ -138,7 +138,7 @@ protected void probeHashTable(RowSequence rowSequence, Chunk[] sourceKeyChunks,
                 boolean alternateFound = false;
                 if (firstAlternateTableLocation < rehashPointer) {
                     int alternateTableLocation = firstAlternateTableLocation;
-                    while ((rowState = alternateStateSource.getUnsafe(alternateTableLocation)) != EMPTY_RIGHT_VALUE) {
+                    while (!isStateEmpty(rowState = alternateStateSource.getUnsafe(alternateTableLocation))) {
                         if (eq(alternateKeySource0.getUnsafe(alternateTableLocation), k0) && eq(alternateKeySource1.getUnsafe(alternateTableLocation), k1)) {
                             // map the existing bucket (from alternate) to this chunk position;
                             outputPositions.set(chunkPosition, rowState);
@@ -163,17 +163,21 @@ private static int hash(Object k0, int k1) {
         return hash;
     }
 
+    private static boolean isStateEmpty(int state) {
+        return state == EMPTY_RIGHT_VALUE;
+    }
+
     private boolean migrateOneLocation(int locationToMigrate,
             WritableIntChunk<RowKeys> outputPositions) {
         final int currentStateValue = alternateStateSource.getUnsafe(locationToMigrate);
-        if (currentStateValue == EMPTY_RIGHT_VALUE) {
+        if (isStateEmpty(currentStateValue)) {
             return false;
         }
         final Object k0 = alternateKeySource0.getUnsafe(locationToMigrate);
         final int k1 = alternateKeySource1.getUnsafe(locationToMigrate);
         final int hash = hash(k0, k1);
         int destinationTableLocation = hashToTableLocation(hash);
-        while (stateSource.getUnsafe(destinationTableLocation) != EMPTY_RIGHT_VALUE) {
+        while (!isStateEmpty(stateSource.getUnsafe(destinationTableLocation))) {
             destinationTableLocation = nextTableLocation(destinationTableLocation);
         }
         mainKeySource0.set(destinationTableLocation, k0);
@@ -197,8 +201,7 @@ protected int rehashInternalPartial(int entriesToRehash,
     }
 
     @Override
-    protected void newAlternate() {
-        super.newAlternate();
+    protected void adviseNewAlternate() {
         this.mainKeySource0 = (ImmutableObjectArraySource)super.mainKeySources[0];
         this.alternateKeySource0 = (ImmutableObjectArraySource)super.alternateKeySources[0];
         this.mainKeySource1 = (ImmutableIntArraySource)super.mainKeySources[1];
@@ -215,7 +218,7 @@ protected void clearAlternate() {
     @Override
     protected void migrateFront(WritableIntChunk<RowKeys> outputPositions) {
         int location = 0;
-        while (migrateOneLocation(location++, outputPositions));
+        while (migrateOneLocation(location++, outputPositions) && location < alternateTableSize);
     }
 
     @Override
@@ -232,7 +235,7 @@ protected void rehashInternalFull(final int oldSize) {
         stateSource.setArray(destState);
         for (int sourceBucket = 0; sourceBucket < oldSize; ++sourceBucket) {
             final int currentStateValue = originalStateArray[sourceBucket];
-            if (currentStateValue == EMPTY_RIGHT_VALUE) {
+            if (isStateEmpty(currentStateValue)) {
                 continue;
             }
             final Object k0 = originalKeyArray0[sourceBucket];
@@ -241,7 +244,7 @@ protected void rehashInternalFull(final int oldSize) {
             final int firstDestinationTableLocation = hashToTableLocation(hash);
             int destinationTableLocation = firstDestinationTableLocation;
             while (true) {
-                if (destState[destinationTableLocation] == EMPTY_RIGHT_VALUE) {
+                if (isStateEmpty(destState[destinationTableLocation])) {
                     destKeyArray0[destinationTableLocation] = k0;
                     destKeyArray1[destinationTableLocation] = k1;
                     destState[destinationTableLocation] = originalStateArray[sourceBucket];
diff --git a/engine/table/src/main/java/io/deephaven/engine/table/impl/updateby/hashing/typed/open/gen/UpdateByHasherObjectLong.java b/engine/table/src/main/java/io/deephaven/engine/table/impl/updateby/hashing/typed/open/gen/UpdateByHasherObjectLong.java
index 8f0a296c246..011cc5e5cf9 100644
--- a/engine/table/src/main/java/io/deephaven/engine/table/impl/updateby/hashing/typed/open/gen/UpdateByHasherObjectLong.java
+++ b/engine/table/src/main/java/io/deephaven/engine/table/impl/updateby/hashing/typed/open/gen/UpdateByHasherObjectLong.java
@@ -71,12 +71,12 @@ protected void buildHashTable(RowSequence rowSequence, Chunk[] sourceKeyChunks,
             int tableLocation = firstTableLocation;
             MAIN_SEARCH: while (true) {
                 int rowState = stateSource.getUnsafe(tableLocation);
-                if (rowState == EMPTY_RIGHT_VALUE) {
+                if (isStateEmpty(rowState)) {
                     final int firstAlternateTableLocation = hashToTableLocationAlternate(hash);
                     int alternateTableLocation = firstAlternateTableLocation;
                     while (alternateTableLocation < rehashPointer) {
                         rowState = alternateStateSource.getUnsafe(alternateTableLocation);
-                        if (rowState == EMPTY_RIGHT_VALUE) {
+                        if (isStateEmpty(rowState)) {
                             break;
                         } else if (eq(alternateKeySource0.getUnsafe(alternateTableLocation), k0) && eq(alternateKeySource1.getUnsafe(alternateTableLocation), k1)) {
                             // map the existing bucket to this chunk position;
@@ -122,7 +122,7 @@ protected void probeHashTable(RowSequence rowSequence, Chunk[] sourceKeyChunks,
             boolean found = false;
             int tableLocation = firstTableLocation;
             int rowState;
-            while ((rowState = stateSource.getUnsafe(tableLocation)) != EMPTY_RIGHT_VALUE) {
+            while (!isStateEmpty(rowState = stateSource.getUnsafe(tableLocation))) {
                 if (eq(mainKeySource0.getUnsafe(tableLocation), k0) && eq(mainKeySource1.getUnsafe(tableLocation), k1)) {
                     // map the existing bucket to this chunk position;
                     outputPositions.set(chunkPosition, rowState);
@@ -137,7 +137,7 @@ protected void probeHashTable(RowSequence rowSequence, Chunk[] sourceKeyChunks,
                 boolean alternateFound = false;
                 if (firstAlternateTableLocation < rehashPointer) {
                     int alternateTableLocation = firstAlternateTableLocation;
-                    while ((rowState = alternateStateSource.getUnsafe(alternateTableLocation)) != EMPTY_RIGHT_VALUE) {
+                    while (!isStateEmpty(rowState = alternateStateSource.getUnsafe(alternateTableLocation))) {
                         if (eq(alternateKeySource0.getUnsafe(alternateTableLocation), k0) && eq(alternateKeySource1.getUnsafe(alternateTableLocation), k1)) {
                             // map the existing bucket (from alternate) to this chunk position;
                             outputPositions.set(chunkPosition, rowState);
@@ -162,17 +162,21 @@ private static int hash(Object k0, long k1) {
         return hash;
     }
 
+    private static boolean isStateEmpty(int state) {
+        return state == EMPTY_RIGHT_VALUE;
+    }
+
     private boolean migrateOneLocation(int locationToMigrate,
             WritableIntChunk<RowKeys> outputPositions) {
         final int currentStateValue = alternateStateSource.getUnsafe(locationToMigrate);
-        if (currentStateValue == EMPTY_RIGHT_VALUE) {
+        if (isStateEmpty(currentStateValue)) {
             return false;
         }
         final Object k0 = alternateKeySource0.getUnsafe(locationToMigrate);
         final long k1 = alternateKeySource1.getUnsafe(locationToMigrate);
         final int hash = hash(k0, k1);
         int destinationTableLocation = hashToTableLocation(hash);
-        while (stateSource.getUnsafe(destinationTableLocation) != EMPTY_RIGHT_VALUE) {
+        while (!isStateEmpty(stateSource.getUnsafe(destinationTableLocation))) {
             destinationTableLocation = nextTableLocation(destinationTableLocation);
         }
         mainKeySource0.set(destinationTableLocation, k0);
@@ -196,8 +200,7 @@ protected int rehashInternalPartial(int entriesToRehash,
     }
 
     @Override
-    protected void newAlternate() {
-        super.newAlternate();
+    protected void adviseNewAlternate() {
         this.mainKeySource0 = (ImmutableObjectArraySource)super.mainKeySources[0];
         this.alternateKeySource0 = (ImmutableObjectArraySource)super.alternateKeySources[0];
         this.mainKeySource1 = (ImmutableLongArraySource)super.mainKeySources[1];
@@ -214,7 +217,7 @@ protected void clearAlternate() {
     @Override
     protected void migrateFront(WritableIntChunk<RowKeys> outputPositions) {
         int location = 0;
-        while (migrateOneLocation(location++, outputPositions));
+        while (migrateOneLocation(location++, outputPositions) && location < alternateTableSize);
     }
 
     @Override
@@ -231,7 +234,7 @@ protected void rehashInternalFull(final int oldSize) {
         stateSource.setArray(destState);
         for (int sourceBucket = 0; sourceBucket < oldSize; ++sourceBucket) {
             final int currentStateValue = originalStateArray[sourceBucket];
-            if (currentStateValue == EMPTY_RIGHT_VALUE) {
+            if (isStateEmpty(currentStateValue)) {
                 continue;
             }
             final Object k0 = originalKeyArray0[sourceBucket];
@@ -240,7 +243,7 @@ protected void rehashInternalFull(final int oldSize) {
             final int firstDestinationTableLocation = hashToTableLocation(hash);
             int destinationTableLocation = firstDestinationTableLocation;
             while (true) {
-                if (destState[destinationTableLocation] == EMPTY_RIGHT_VALUE) {
+                if (isStateEmpty(destState[destinationTableLocation])) {
                     destKeyArray0[destinationTableLocation] = k0;
                     destKeyArray1[destinationTableLocation] = k1;
                     destState[destinationTableLocation] = originalStateArray[sourceBucket];
diff --git a/engine/table/src/main/java/io/deephaven/engine/table/impl/updateby/hashing/typed/open/gen/UpdateByHasherObjectObject.java b/engine/table/src/main/java/io/deephaven/engine/table/impl/updateby/hashing/typed/open/gen/UpdateByHasherObjectObject.java
index 0372464a2eb..d5711d060c1 100644
--- a/engine/table/src/main/java/io/deephaven/engine/table/impl/updateby/hashing/typed/open/gen/UpdateByHasherObjectObject.java
+++ b/engine/table/src/main/java/io/deephaven/engine/table/impl/updateby/hashing/typed/open/gen/UpdateByHasherObjectObject.java
@@ -68,12 +68,12 @@ protected void buildHashTable(RowSequence rowSequence, Chunk[] sourceKeyChunks,
             int tableLocation = firstTableLocation;
             MAIN_SEARCH: while (true) {
                 int rowState = stateSource.getUnsafe(tableLocation);
-                if (rowState == EMPTY_RIGHT_VALUE) {
+                if (isStateEmpty(rowState)) {
                     final int firstAlternateTableLocation = hashToTableLocationAlternate(hash);
                     int alternateTableLocation = firstAlternateTableLocation;
                     while (alternateTableLocation < rehashPointer) {
                         rowState = alternateStateSource.getUnsafe(alternateTableLocation);
-                        if (rowState == EMPTY_RIGHT_VALUE) {
+                        if (isStateEmpty(rowState)) {
                             break;
                         } else if (eq(alternateKeySource0.getUnsafe(alternateTableLocation), k0) && eq(alternateKeySource1.getUnsafe(alternateTableLocation), k1)) {
                             // map the existing bucket to this chunk position;
@@ -119,7 +119,7 @@ protected void probeHashTable(RowSequence rowSequence, Chunk[] sourceKeyChunks,
             boolean found = false;
             int tableLocation = firstTableLocation;
             int rowState;
-            while ((rowState = stateSource.getUnsafe(tableLocation)) != EMPTY_RIGHT_VALUE) {
+            while (!isStateEmpty(rowState = stateSource.getUnsafe(tableLocation))) {
                 if (eq(mainKeySource0.getUnsafe(tableLocation), k0) && eq(mainKeySource1.getUnsafe(tableLocation), k1)) {
                     // map the existing bucket to this chunk position;
                     outputPositions.set(chunkPosition, rowState);
@@ -134,7 +134,7 @@ protected void probeHashTable(RowSequence rowSequence, Chunk[] sourceKeyChunks,
                 boolean alternateFound = false;
                 if (firstAlternateTableLocation < rehashPointer) {
                     int alternateTableLocation = firstAlternateTableLocation;
-                    while ((rowState = alternateStateSource.getUnsafe(alternateTableLocation)) != EMPTY_RIGHT_VALUE) {
+                    while (!isStateEmpty(rowState = alternateStateSource.getUnsafe(alternateTableLocation))) {
                         if (eq(alternateKeySource0.getUnsafe(alternateTableLocation), k0) && eq(alternateKeySource1.getUnsafe(alternateTableLocation), k1)) {
                             // map the existing bucket (from alternate) to this chunk position;
                             outputPositions.set(chunkPosition, rowState);
@@ -159,17 +159,21 @@ private static int hash(Object k0, Object k1) {
         return hash;
     }
 
+    private static boolean isStateEmpty(int state) {
+        return state == EMPTY_RIGHT_VALUE;
+    }
+
     private boolean migrateOneLocation(int locationToMigrate,
             WritableIntChunk<RowKeys> outputPositions) {
         final int currentStateValue = alternateStateSource.getUnsafe(locationToMigrate);
-        if (currentStateValue == EMPTY_RIGHT_VALUE) {
+        if (isStateEmpty(currentStateValue)) {
             return false;
         }
         final Object k0 = alternateKeySource0.getUnsafe(locationToMigrate);
         final Object k1 = alternateKeySource1.getUnsafe(locationToMigrate);
         final int hash = hash(k0, k1);
         int destinationTableLocation = hashToTableLocation(hash);
-        while (stateSource.getUnsafe(destinationTableLocation) != EMPTY_RIGHT_VALUE) {
+        while (!isStateEmpty(stateSource.getUnsafe(destinationTableLocation))) {
             destinationTableLocation = nextTableLocation(destinationTableLocation);
         }
         mainKeySource0.set(destinationTableLocation, k0);
@@ -194,8 +198,7 @@ protected int rehashInternalPartial(int entriesToRehash,
     }
 
     @Override
-    protected void newAlternate() {
-        super.newAlternate();
+    protected void adviseNewAlternate() {
         this.mainKeySource0 = (ImmutableObjectArraySource)super.mainKeySources[0];
         this.alternateKeySource0 = (ImmutableObjectArraySource)super.alternateKeySources[0];
         this.mainKeySource1 = (ImmutableObjectArraySource)super.mainKeySources[1];
@@ -212,7 +215,7 @@ protected void clearAlternate() {
     @Override
     protected void migrateFront(WritableIntChunk<RowKeys> outputPositions) {
         int location = 0;
-        while (migrateOneLocation(location++, outputPositions));
+        while (migrateOneLocation(location++, outputPositions) && location < alternateTableSize);
     }
 
     @Override
@@ -229,7 +232,7 @@ protected void rehashInternalFull(final int oldSize) {
         stateSource.setArray(destState);
         for (int sourceBucket = 0; sourceBucket < oldSize; ++sourceBucket) {
             final int currentStateValue = originalStateArray[sourceBucket];
-            if (currentStateValue == EMPTY_RIGHT_VALUE) {
+            if (isStateEmpty(currentStateValue)) {
                 continue;
             }
             final Object k0 = originalKeyArray0[sourceBucket];
@@ -238,7 +241,7 @@ protected void rehashInternalFull(final int oldSize) {
             final int firstDestinationTableLocation = hashToTableLocation(hash);
             int destinationTableLocation = firstDestinationTableLocation;
             while (true) {
-                if (destState[destinationTableLocation] == EMPTY_RIGHT_VALUE) {
+                if (isStateEmpty(destState[destinationTableLocation])) {
                     destKeyArray0[destinationTableLocation] = k0;
                     destKeyArray1[destinationTableLocation] = k1;
                     destState[destinationTableLocation] = originalStateArray[sourceBucket];
diff --git a/engine/table/src/main/java/io/deephaven/engine/table/impl/updateby/hashing/typed/open/gen/UpdateByHasherObjectShort.java b/engine/table/src/main/java/io/deephaven/engine/table/impl/updateby/hashing/typed/open/gen/UpdateByHasherObjectShort.java
index 8d31dfd1e1d..cd767797a8a 100644
--- a/engine/table/src/main/java/io/deephaven/engine/table/impl/updateby/hashing/typed/open/gen/UpdateByHasherObjectShort.java
+++ b/engine/table/src/main/java/io/deephaven/engine/table/impl/updateby/hashing/typed/open/gen/UpdateByHasherObjectShort.java
@@ -72,12 +72,12 @@ protected void buildHashTable(RowSequence rowSequence, Chunk[] sourceKeyChunks,
             int tableLocation = firstTableLocation;
             MAIN_SEARCH: while (true) {
                 int rowState = stateSource.getUnsafe(tableLocation);
-                if (rowState == EMPTY_RIGHT_VALUE) {
+                if (isStateEmpty(rowState)) {
                     final int firstAlternateTableLocation = hashToTableLocationAlternate(hash);
                     int alternateTableLocation = firstAlternateTableLocation;
                     while (alternateTableLocation < rehashPointer) {
                         rowState = alternateStateSource.getUnsafe(alternateTableLocation);
-                        if (rowState == EMPTY_RIGHT_VALUE) {
+                        if (isStateEmpty(rowState)) {
                             break;
                         } else if (eq(alternateKeySource0.getUnsafe(alternateTableLocation), k0) && eq(alternateKeySource1.getUnsafe(alternateTableLocation), k1)) {
                             // map the existing bucket to this chunk position;
@@ -123,7 +123,7 @@ protected void probeHashTable(RowSequence rowSequence, Chunk[] sourceKeyChunks,
             boolean found = false;
             int tableLocation = firstTableLocation;
             int rowState;
-            while ((rowState = stateSource.getUnsafe(tableLocation)) != EMPTY_RIGHT_VALUE) {
+            while (!isStateEmpty(rowState = stateSource.getUnsafe(tableLocation))) {
                 if (eq(mainKeySource0.getUnsafe(tableLocation), k0) && eq(mainKeySource1.getUnsafe(tableLocation), k1)) {
                     // map the existing bucket to this chunk position;
                     outputPositions.set(chunkPosition, rowState);
@@ -138,7 +138,7 @@ protected void probeHashTable(RowSequence rowSequence, Chunk[] sourceKeyChunks,
                 boolean alternateFound = false;
                 if (firstAlternateTableLocation < rehashPointer) {
                     int alternateTableLocation = firstAlternateTableLocation;
-                    while ((rowState = alternateStateSource.getUnsafe(alternateTableLocation)) != EMPTY_RIGHT_VALUE) {
+                    while (!isStateEmpty(rowState = alternateStateSource.getUnsafe(alternateTableLocation))) {
                         if (eq(alternateKeySource0.getUnsafe(alternateTableLocation), k0) && eq(alternateKeySource1.getUnsafe(alternateTableLocation), k1)) {
                             // map the existing bucket (from alternate) to this chunk position;
                             outputPositions.set(chunkPosition, rowState);
@@ -163,17 +163,21 @@ private static int hash(Object k0, short k1) {
         return hash;
     }
 
+    private static boolean isStateEmpty(int state) {
+        return state == EMPTY_RIGHT_VALUE;
+    }
+
     private boolean migrateOneLocation(int locationToMigrate,
             WritableIntChunk<RowKeys> outputPositions) {
         final int currentStateValue = alternateStateSource.getUnsafe(locationToMigrate);
-        if (currentStateValue == EMPTY_RIGHT_VALUE) {
+        if (isStateEmpty(currentStateValue)) {
             return false;
         }
         final Object k0 = alternateKeySource0.getUnsafe(locationToMigrate);
         final short k1 = alternateKeySource1.getUnsafe(locationToMigrate);
         final int hash = hash(k0, k1);
         int destinationTableLocation = hashToTableLocation(hash);
-        while (stateSource.getUnsafe(destinationTableLocation) != EMPTY_RIGHT_VALUE) {
+        while (!isStateEmpty(stateSource.getUnsafe(destinationTableLocation))) {
             destinationTableLocation = nextTableLocation(destinationTableLocation);
         }
         mainKeySource0.set(destinationTableLocation, k0);
@@ -197,8 +201,7 @@ protected int rehashInternalPartial(int entriesToRehash,
     }
 
     @Override
-    protected void newAlternate() {
-        super.newAlternate();
+    protected void adviseNewAlternate() {
         this.mainKeySource0 = (ImmutableObjectArraySource)super.mainKeySources[0];
         this.alternateKeySource0 = (ImmutableObjectArraySource)super.alternateKeySources[0];
         this.mainKeySource1 = (ImmutableShortArraySource)super.mainKeySources[1];
@@ -215,7 +218,7 @@ protected void clearAlternate() {
     @Override
     protected void migrateFront(WritableIntChunk<RowKeys> outputPositions) {
         int location = 0;
-        while (migrateOneLocation(location++, outputPositions));
+        while (migrateOneLocation(location++, outputPositions) && location < alternateTableSize);
     }
 
     @Override
@@ -232,7 +235,7 @@ protected void rehashInternalFull(final int oldSize) {
         stateSource.setArray(destState);
         for (int sourceBucket = 0; sourceBucket < oldSize; ++sourceBucket) {
             final int currentStateValue = originalStateArray[sourceBucket];
-            if (currentStateValue == EMPTY_RIGHT_VALUE) {
+            if (isStateEmpty(currentStateValue)) {
                 continue;
             }
             final Object k0 = originalKeyArray0[sourceBucket];
@@ -241,7 +244,7 @@ protected void rehashInternalFull(final int oldSize) {
             final int firstDestinationTableLocation = hashToTableLocation(hash);
             int destinationTableLocation = firstDestinationTableLocation;
             while (true) {
-                if (destState[destinationTableLocation] == EMPTY_RIGHT_VALUE) {
+                if (isStateEmpty(destState[destinationTableLocation])) {
                     destKeyArray0[destinationTableLocation] = k0;
                     destKeyArray1[destinationTableLocation] = k1;
                     destState[destinationTableLocation] = originalStateArray[sourceBucket];
diff --git a/engine/table/src/main/java/io/deephaven/engine/table/impl/updateby/hashing/typed/open/gen/UpdateByHasherShort.java b/engine/table/src/main/java/io/deephaven/engine/table/impl/updateby/hashing/typed/open/gen/UpdateByHasherShort.java
index c079ab37d62..ba3780b9851 100644
--- a/engine/table/src/main/java/io/deephaven/engine/table/impl/updateby/hashing/typed/open/gen/UpdateByHasherShort.java
+++ b/engine/table/src/main/java/io/deephaven/engine/table/impl/updateby/hashing/typed/open/gen/UpdateByHasherShort.java
@@ -59,12 +59,12 @@ protected void buildHashTable(RowSequence rowSequence, Chunk[] sourceKeyChunks,
             int tableLocation = firstTableLocation;
             MAIN_SEARCH: while (true) {
                 int rowState = stateSource.getUnsafe(tableLocation);
-                if (rowState == EMPTY_RIGHT_VALUE) {
+                if (isStateEmpty(rowState)) {
                     final int firstAlternateTableLocation = hashToTableLocationAlternate(hash);
                     int alternateTableLocation = firstAlternateTableLocation;
                     while (alternateTableLocation < rehashPointer) {
                         rowState = alternateStateSource.getUnsafe(alternateTableLocation);
-                        if (rowState == EMPTY_RIGHT_VALUE) {
+                        if (isStateEmpty(rowState)) {
                             break;
                         } else if (eq(alternateKeySource0.getUnsafe(alternateTableLocation), k0)) {
                             // map the existing bucket to this chunk position;
@@ -107,7 +107,7 @@ protected void probeHashTable(RowSequence rowSequence, Chunk[] sourceKeyChunks,
             boolean found = false;
             int tableLocation = firstTableLocation;
             int rowState;
-            while ((rowState = stateSource.getUnsafe(tableLocation)) != EMPTY_RIGHT_VALUE) {
+            while (!isStateEmpty(rowState = stateSource.getUnsafe(tableLocation))) {
                 if (eq(mainKeySource0.getUnsafe(tableLocation), k0)) {
                     // map the existing bucket to this chunk position;
                     outputPositions.set(chunkPosition, rowState);
@@ -122,7 +122,7 @@ protected void probeHashTable(RowSequence rowSequence, Chunk[] sourceKeyChunks,
                 boolean alternateFound = false;
                 if (firstAlternateTableLocation < rehashPointer) {
                     int alternateTableLocation = firstAlternateTableLocation;
-                    while ((rowState = alternateStateSource.getUnsafe(alternateTableLocation)) != EMPTY_RIGHT_VALUE) {
+                    while (!isStateEmpty(rowState = alternateStateSource.getUnsafe(alternateTableLocation))) {
                         if (eq(alternateKeySource0.getUnsafe(alternateTableLocation), k0)) {
                             // map the existing bucket (from alternate) to this chunk position;
                             outputPositions.set(chunkPosition, rowState);
@@ -146,16 +146,20 @@ private static int hash(short k0) {
         return hash;
     }
 
+    private static boolean isStateEmpty(int state) {
+        return state == EMPTY_RIGHT_VALUE;
+    }
+
     private boolean migrateOneLocation(int locationToMigrate,
             WritableIntChunk<RowKeys> outputPositions) {
         final int currentStateValue = alternateStateSource.getUnsafe(locationToMigrate);
-        if (currentStateValue == EMPTY_RIGHT_VALUE) {
+        if (isStateEmpty(currentStateValue)) {
             return false;
         }
         final short k0 = alternateKeySource0.getUnsafe(locationToMigrate);
         final int hash = hash(k0);
         int destinationTableLocation = hashToTableLocation(hash);
-        while (stateSource.getUnsafe(destinationTableLocation) != EMPTY_RIGHT_VALUE) {
+        while (!isStateEmpty(stateSource.getUnsafe(destinationTableLocation))) {
             destinationTableLocation = nextTableLocation(destinationTableLocation);
         }
         mainKeySource0.set(destinationTableLocation, k0);
@@ -177,8 +181,7 @@ protected int rehashInternalPartial(int entriesToRehash,
     }
 
     @Override
-    protected void newAlternate() {
-        super.newAlternate();
+    protected void adviseNewAlternate() {
         this.mainKeySource0 = (ImmutableShortArraySource)super.mainKeySources[0];
         this.alternateKeySource0 = (ImmutableShortArraySource)super.alternateKeySources[0];
     }
@@ -192,7 +195,7 @@ protected void clearAlternate() {
     @Override
     protected void migrateFront(WritableIntChunk<RowKeys> outputPositions) {
         int location = 0;
-        while (migrateOneLocation(location++, outputPositions));
+        while (migrateOneLocation(location++, outputPositions) && location < alternateTableSize);
     }
 
     @Override
@@ -206,7 +209,7 @@ protected void rehashInternalFull(final int oldSize) {
         stateSource.setArray(destState);
         for (int sourceBucket = 0; sourceBucket < oldSize; ++sourceBucket) {
             final int currentStateValue = originalStateArray[sourceBucket];
-            if (currentStateValue == EMPTY_RIGHT_VALUE) {
+            if (isStateEmpty(currentStateValue)) {
                 continue;
             }
             final short k0 = originalKeyArray0[sourceBucket];
@@ -214,7 +217,7 @@ protected void rehashInternalFull(final int oldSize) {
             final int firstDestinationTableLocation = hashToTableLocation(hash);
             int destinationTableLocation = firstDestinationTableLocation;
             while (true) {
-                if (destState[destinationTableLocation] == EMPTY_RIGHT_VALUE) {
+                if (isStateEmpty(destState[destinationTableLocation])) {
                     destKeyArray0[destinationTableLocation] = k0;
                     destState[destinationTableLocation] = originalStateArray[sourceBucket];
                     break;
diff --git a/engine/table/src/main/java/io/deephaven/engine/table/impl/updateby/hashing/typed/open/gen/UpdateByHasherShortByte.java b/engine/table/src/main/java/io/deephaven/engine/table/impl/updateby/hashing/typed/open/gen/UpdateByHasherShortByte.java
index 892caeece45..9f98f2f889d 100644
--- a/engine/table/src/main/java/io/deephaven/engine/table/impl/updateby/hashing/typed/open/gen/UpdateByHasherShortByte.java
+++ b/engine/table/src/main/java/io/deephaven/engine/table/impl/updateby/hashing/typed/open/gen/UpdateByHasherShortByte.java
@@ -71,12 +71,12 @@ protected void buildHashTable(RowSequence rowSequence, Chunk[] sourceKeyChunks,
             int tableLocation = firstTableLocation;
             MAIN_SEARCH: while (true) {
                 int rowState = stateSource.getUnsafe(tableLocation);
-                if (rowState == EMPTY_RIGHT_VALUE) {
+                if (isStateEmpty(rowState)) {
                     final int firstAlternateTableLocation = hashToTableLocationAlternate(hash);
                     int alternateTableLocation = firstAlternateTableLocation;
                     while (alternateTableLocation < rehashPointer) {
                         rowState = alternateStateSource.getUnsafe(alternateTableLocation);
-                        if (rowState == EMPTY_RIGHT_VALUE) {
+                        if (isStateEmpty(rowState)) {
                             break;
                         } else if (eq(alternateKeySource0.getUnsafe(alternateTableLocation), k0) && eq(alternateKeySource1.getUnsafe(alternateTableLocation), k1)) {
                             // map the existing bucket to this chunk position;
@@ -122,7 +122,7 @@ protected void probeHashTable(RowSequence rowSequence, Chunk[] sourceKeyChunks,
             boolean found = false;
             int tableLocation = firstTableLocation;
             int rowState;
-            while ((rowState = stateSource.getUnsafe(tableLocation)) != EMPTY_RIGHT_VALUE) {
+            while (!isStateEmpty(rowState = stateSource.getUnsafe(tableLocation))) {
                 if (eq(mainKeySource0.getUnsafe(tableLocation), k0) && eq(mainKeySource1.getUnsafe(tableLocation), k1)) {
                     // map the existing bucket to this chunk position;
                     outputPositions.set(chunkPosition, rowState);
@@ -137,7 +137,7 @@ protected void probeHashTable(RowSequence rowSequence, Chunk[] sourceKeyChunks,
                 boolean alternateFound = false;
                 if (firstAlternateTableLocation < rehashPointer) {
                     int alternateTableLocation = firstAlternateTableLocation;
-                    while ((rowState = alternateStateSource.getUnsafe(alternateTableLocation)) != EMPTY_RIGHT_VALUE) {
+                    while (!isStateEmpty(rowState = alternateStateSource.getUnsafe(alternateTableLocation))) {
                         if (eq(alternateKeySource0.getUnsafe(alternateTableLocation), k0) && eq(alternateKeySource1.getUnsafe(alternateTableLocation), k1)) {
                             // map the existing bucket (from alternate) to this chunk position;
                             outputPositions.set(chunkPosition, rowState);
@@ -162,17 +162,21 @@ private static int hash(short k0, byte k1) {
         return hash;
     }
 
+    private static boolean isStateEmpty(int state) {
+        return state == EMPTY_RIGHT_VALUE;
+    }
+
     private boolean migrateOneLocation(int locationToMigrate,
             WritableIntChunk<RowKeys> outputPositions) {
         final int currentStateValue = alternateStateSource.getUnsafe(locationToMigrate);
-        if (currentStateValue == EMPTY_RIGHT_VALUE) {
+        if (isStateEmpty(currentStateValue)) {
             return false;
         }
         final short k0 = alternateKeySource0.getUnsafe(locationToMigrate);
         final byte k1 = alternateKeySource1.getUnsafe(locationToMigrate);
         final int hash = hash(k0, k1);
         int destinationTableLocation = hashToTableLocation(hash);
-        while (stateSource.getUnsafe(destinationTableLocation) != EMPTY_RIGHT_VALUE) {
+        while (!isStateEmpty(stateSource.getUnsafe(destinationTableLocation))) {
             destinationTableLocation = nextTableLocation(destinationTableLocation);
         }
         mainKeySource0.set(destinationTableLocation, k0);
@@ -195,8 +199,7 @@ protected int rehashInternalPartial(int entriesToRehash,
     }
 
     @Override
-    protected void newAlternate() {
-        super.newAlternate();
+    protected void adviseNewAlternate() {
         this.mainKeySource0 = (ImmutableShortArraySource)super.mainKeySources[0];
         this.alternateKeySource0 = (ImmutableShortArraySource)super.alternateKeySources[0];
         this.mainKeySource1 = (ImmutableByteArraySource)super.mainKeySources[1];
@@ -213,7 +216,7 @@ protected void clearAlternate() {
     @Override
     protected void migrateFront(WritableIntChunk<RowKeys> outputPositions) {
         int location = 0;
-        while (migrateOneLocation(location++, outputPositions));
+        while (migrateOneLocation(location++, outputPositions) && location < alternateTableSize);
     }
 
     @Override
@@ -230,7 +233,7 @@ protected void rehashInternalFull(final int oldSize) {
         stateSource.setArray(destState);
         for (int sourceBucket = 0; sourceBucket < oldSize; ++sourceBucket) {
             final int currentStateValue = originalStateArray[sourceBucket];
-            if (currentStateValue == EMPTY_RIGHT_VALUE) {
+            if (isStateEmpty(currentStateValue)) {
                 continue;
             }
             final short k0 = originalKeyArray0[sourceBucket];
@@ -239,7 +242,7 @@ protected void rehashInternalFull(final int oldSize) {
             final int firstDestinationTableLocation = hashToTableLocation(hash);
             int destinationTableLocation = firstDestinationTableLocation;
             while (true) {
-                if (destState[destinationTableLocation] == EMPTY_RIGHT_VALUE) {
+                if (isStateEmpty(destState[destinationTableLocation])) {
                     destKeyArray0[destinationTableLocation] = k0;
                     destKeyArray1[destinationTableLocation] = k1;
                     destState[destinationTableLocation] = originalStateArray[sourceBucket];
diff --git a/engine/table/src/main/java/io/deephaven/engine/table/impl/updateby/hashing/typed/open/gen/UpdateByHasherShortChar.java b/engine/table/src/main/java/io/deephaven/engine/table/impl/updateby/hashing/typed/open/gen/UpdateByHasherShortChar.java
index 884e49e6b9d..d7717fbae77 100644
--- a/engine/table/src/main/java/io/deephaven/engine/table/impl/updateby/hashing/typed/open/gen/UpdateByHasherShortChar.java
+++ b/engine/table/src/main/java/io/deephaven/engine/table/impl/updateby/hashing/typed/open/gen/UpdateByHasherShortChar.java
@@ -71,12 +71,12 @@ protected void buildHashTable(RowSequence rowSequence, Chunk[] sourceKeyChunks,
             int tableLocation = firstTableLocation;
             MAIN_SEARCH: while (true) {
                 int rowState = stateSource.getUnsafe(tableLocation);
-                if (rowState == EMPTY_RIGHT_VALUE) {
+                if (isStateEmpty(rowState)) {
                     final int firstAlternateTableLocation = hashToTableLocationAlternate(hash);
                     int alternateTableLocation = firstAlternateTableLocation;
                     while (alternateTableLocation < rehashPointer) {
                         rowState = alternateStateSource.getUnsafe(alternateTableLocation);
-                        if (rowState == EMPTY_RIGHT_VALUE) {
+                        if (isStateEmpty(rowState)) {
                             break;
                         } else if (eq(alternateKeySource0.getUnsafe(alternateTableLocation), k0) && eq(alternateKeySource1.getUnsafe(alternateTableLocation), k1)) {
                             // map the existing bucket to this chunk position;
@@ -122,7 +122,7 @@ protected void probeHashTable(RowSequence rowSequence, Chunk[] sourceKeyChunks,
             boolean found = false;
             int tableLocation = firstTableLocation;
             int rowState;
-            while ((rowState = stateSource.getUnsafe(tableLocation)) != EMPTY_RIGHT_VALUE) {
+            while (!isStateEmpty(rowState = stateSource.getUnsafe(tableLocation))) {
                 if (eq(mainKeySource0.getUnsafe(tableLocation), k0) && eq(mainKeySource1.getUnsafe(tableLocation), k1)) {
                     // map the existing bucket to this chunk position;
                     outputPositions.set(chunkPosition, rowState);
@@ -137,7 +137,7 @@ protected void probeHashTable(RowSequence rowSequence, Chunk[] sourceKeyChunks,
                 boolean alternateFound = false;
                 if (firstAlternateTableLocation < rehashPointer) {
                     int alternateTableLocation = firstAlternateTableLocation;
-                    while ((rowState = alternateStateSource.getUnsafe(alternateTableLocation)) != EMPTY_RIGHT_VALUE) {
+                    while (!isStateEmpty(rowState = alternateStateSource.getUnsafe(alternateTableLocation))) {
                         if (eq(alternateKeySource0.getUnsafe(alternateTableLocation), k0) && eq(alternateKeySource1.getUnsafe(alternateTableLocation), k1)) {
                             // map the existing bucket (from alternate) to this chunk position;
                             outputPositions.set(chunkPosition, rowState);
@@ -162,17 +162,21 @@ private static int hash(short k0, char k1) {
         return hash;
     }
 
+    private static boolean isStateEmpty(int state) {
+        return state == EMPTY_RIGHT_VALUE;
+    }
+
     private boolean migrateOneLocation(int locationToMigrate,
             WritableIntChunk<RowKeys> outputPositions) {
         final int currentStateValue = alternateStateSource.getUnsafe(locationToMigrate);
-        if (currentStateValue == EMPTY_RIGHT_VALUE) {
+        if (isStateEmpty(currentStateValue)) {
             return false;
         }
         final short k0 = alternateKeySource0.getUnsafe(locationToMigrate);
         final char k1 = alternateKeySource1.getUnsafe(locationToMigrate);
         final int hash = hash(k0, k1);
         int destinationTableLocation = hashToTableLocation(hash);
-        while (stateSource.getUnsafe(destinationTableLocation) != EMPTY_RIGHT_VALUE) {
+        while (!isStateEmpty(stateSource.getUnsafe(destinationTableLocation))) {
             destinationTableLocation = nextTableLocation(destinationTableLocation);
         }
         mainKeySource0.set(destinationTableLocation, k0);
@@ -195,8 +199,7 @@ protected int rehashInternalPartial(int entriesToRehash,
     }
 
     @Override
-    protected void newAlternate() {
-        super.newAlternate();
+    protected void adviseNewAlternate() {
         this.mainKeySource0 = (ImmutableShortArraySource)super.mainKeySources[0];
         this.alternateKeySource0 = (ImmutableShortArraySource)super.alternateKeySources[0];
         this.mainKeySource1 = (ImmutableCharArraySource)super.mainKeySources[1];
@@ -213,7 +216,7 @@ protected void clearAlternate() {
     @Override
     protected void migrateFront(WritableIntChunk<RowKeys> outputPositions) {
         int location = 0;
-        while (migrateOneLocation(location++, outputPositions));
+        while (migrateOneLocation(location++, outputPositions) && location < alternateTableSize);
     }
 
     @Override
@@ -230,7 +233,7 @@ protected void rehashInternalFull(final int oldSize) {
         stateSource.setArray(destState);
         for (int sourceBucket = 0; sourceBucket < oldSize; ++sourceBucket) {
             final int currentStateValue = originalStateArray[sourceBucket];
-            if (currentStateValue == EMPTY_RIGHT_VALUE) {
+            if (isStateEmpty(currentStateValue)) {
                 continue;
             }
             final short k0 = originalKeyArray0[sourceBucket];
@@ -239,7 +242,7 @@ protected void rehashInternalFull(final int oldSize) {
             final int firstDestinationTableLocation = hashToTableLocation(hash);
             int destinationTableLocation = firstDestinationTableLocation;
             while (true) {
-                if (destState[destinationTableLocation] == EMPTY_RIGHT_VALUE) {
+                if (isStateEmpty(destState[destinationTableLocation])) {
                     destKeyArray0[destinationTableLocation] = k0;
                     destKeyArray1[destinationTableLocation] = k1;
                     destState[destinationTableLocation] = originalStateArray[sourceBucket];
diff --git a/engine/table/src/main/java/io/deephaven/engine/table/impl/updateby/hashing/typed/open/gen/UpdateByHasherShortDouble.java b/engine/table/src/main/java/io/deephaven/engine/table/impl/updateby/hashing/typed/open/gen/UpdateByHasherShortDouble.java
index 6c21f349ae2..4f1e1490bbd 100644
--- a/engine/table/src/main/java/io/deephaven/engine/table/impl/updateby/hashing/typed/open/gen/UpdateByHasherShortDouble.java
+++ b/engine/table/src/main/java/io/deephaven/engine/table/impl/updateby/hashing/typed/open/gen/UpdateByHasherShortDouble.java
@@ -71,12 +71,12 @@ protected void buildHashTable(RowSequence rowSequence, Chunk[] sourceKeyChunks,
             int tableLocation = firstTableLocation;
             MAIN_SEARCH: while (true) {
                 int rowState = stateSource.getUnsafe(tableLocation);
-                if (rowState == EMPTY_RIGHT_VALUE) {
+                if (isStateEmpty(rowState)) {
                     final int firstAlternateTableLocation = hashToTableLocationAlternate(hash);
                     int alternateTableLocation = firstAlternateTableLocation;
                     while (alternateTableLocation < rehashPointer) {
                         rowState = alternateStateSource.getUnsafe(alternateTableLocation);
-                        if (rowState == EMPTY_RIGHT_VALUE) {
+                        if (isStateEmpty(rowState)) {
                             break;
                         } else if (eq(alternateKeySource0.getUnsafe(alternateTableLocation), k0) && eq(alternateKeySource1.getUnsafe(alternateTableLocation), k1)) {
                             // map the existing bucket to this chunk position;
@@ -122,7 +122,7 @@ protected void probeHashTable(RowSequence rowSequence, Chunk[] sourceKeyChunks,
             boolean found = false;
             int tableLocation = firstTableLocation;
             int rowState;
-            while ((rowState = stateSource.getUnsafe(tableLocation)) != EMPTY_RIGHT_VALUE) {
+            while (!isStateEmpty(rowState = stateSource.getUnsafe(tableLocation))) {
                 if (eq(mainKeySource0.getUnsafe(tableLocation), k0) && eq(mainKeySource1.getUnsafe(tableLocation), k1)) {
                     // map the existing bucket to this chunk position;
                     outputPositions.set(chunkPosition, rowState);
@@ -137,7 +137,7 @@ protected void probeHashTable(RowSequence rowSequence, Chunk[] sourceKeyChunks,
                 boolean alternateFound = false;
                 if (firstAlternateTableLocation < rehashPointer) {
                     int alternateTableLocation = firstAlternateTableLocation;
-                    while ((rowState = alternateStateSource.getUnsafe(alternateTableLocation)) != EMPTY_RIGHT_VALUE) {
+                    while (!isStateEmpty(rowState = alternateStateSource.getUnsafe(alternateTableLocation))) {
                         if (eq(alternateKeySource0.getUnsafe(alternateTableLocation), k0) && eq(alternateKeySource1.getUnsafe(alternateTableLocation), k1)) {
                             // map the existing bucket (from alternate) to this chunk position;
                             outputPositions.set(chunkPosition, rowState);
@@ -162,17 +162,21 @@ private static int hash(short k0, double k1) {
         return hash;
     }
 
+    private static boolean isStateEmpty(int state) {
+        return state == EMPTY_RIGHT_VALUE;
+    }
+
     private boolean migrateOneLocation(int locationToMigrate,
             WritableIntChunk<RowKeys> outputPositions) {
         final int currentStateValue = alternateStateSource.getUnsafe(locationToMigrate);
-        if (currentStateValue == EMPTY_RIGHT_VALUE) {
+        if (isStateEmpty(currentStateValue)) {
             return false;
         }
         final short k0 = alternateKeySource0.getUnsafe(locationToMigrate);
         final double k1 = alternateKeySource1.getUnsafe(locationToMigrate);
         final int hash = hash(k0, k1);
         int destinationTableLocation = hashToTableLocation(hash);
-        while (stateSource.getUnsafe(destinationTableLocation) != EMPTY_RIGHT_VALUE) {
+        while (!isStateEmpty(stateSource.getUnsafe(destinationTableLocation))) {
             destinationTableLocation = nextTableLocation(destinationTableLocation);
         }
         mainKeySource0.set(destinationTableLocation, k0);
@@ -195,8 +199,7 @@ protected int rehashInternalPartial(int entriesToRehash,
     }
 
     @Override
-    protected void newAlternate() {
-        super.newAlternate();
+    protected void adviseNewAlternate() {
         this.mainKeySource0 = (ImmutableShortArraySource)super.mainKeySources[0];
         this.alternateKeySource0 = (ImmutableShortArraySource)super.alternateKeySources[0];
         this.mainKeySource1 = (ImmutableDoubleArraySource)super.mainKeySources[1];
@@ -213,7 +216,7 @@ protected void clearAlternate() {
     @Override
     protected void migrateFront(WritableIntChunk<RowKeys> outputPositions) {
         int location = 0;
-        while (migrateOneLocation(location++, outputPositions));
+        while (migrateOneLocation(location++, outputPositions) && location < alternateTableSize);
     }
 
     @Override
@@ -230,7 +233,7 @@ protected void rehashInternalFull(final int oldSize) {
         stateSource.setArray(destState);
         for (int sourceBucket = 0; sourceBucket < oldSize; ++sourceBucket) {
             final int currentStateValue = originalStateArray[sourceBucket];
-            if (currentStateValue == EMPTY_RIGHT_VALUE) {
+            if (isStateEmpty(currentStateValue)) {
                 continue;
             }
             final short k0 = originalKeyArray0[sourceBucket];
@@ -239,7 +242,7 @@ protected void rehashInternalFull(final int oldSize) {
             final int firstDestinationTableLocation = hashToTableLocation(hash);
             int destinationTableLocation = firstDestinationTableLocation;
             while (true) {
-                if (destState[destinationTableLocation] == EMPTY_RIGHT_VALUE) {
+                if (isStateEmpty(destState[destinationTableLocation])) {
                     destKeyArray0[destinationTableLocation] = k0;
                     destKeyArray1[destinationTableLocation] = k1;
                     destState[destinationTableLocation] = originalStateArray[sourceBucket];
diff --git a/engine/table/src/main/java/io/deephaven/engine/table/impl/updateby/hashing/typed/open/gen/UpdateByHasherShortFloat.java b/engine/table/src/main/java/io/deephaven/engine/table/impl/updateby/hashing/typed/open/gen/UpdateByHasherShortFloat.java
index 2e18e2edf79..64df1a9a73b 100644
--- a/engine/table/src/main/java/io/deephaven/engine/table/impl/updateby/hashing/typed/open/gen/UpdateByHasherShortFloat.java
+++ b/engine/table/src/main/java/io/deephaven/engine/table/impl/updateby/hashing/typed/open/gen/UpdateByHasherShortFloat.java
@@ -71,12 +71,12 @@ protected void buildHashTable(RowSequence rowSequence, Chunk[] sourceKeyChunks,
             int tableLocation = firstTableLocation;
             MAIN_SEARCH: while (true) {
                 int rowState = stateSource.getUnsafe(tableLocation);
-                if (rowState == EMPTY_RIGHT_VALUE) {
+                if (isStateEmpty(rowState)) {
                     final int firstAlternateTableLocation = hashToTableLocationAlternate(hash);
                     int alternateTableLocation = firstAlternateTableLocation;
                     while (alternateTableLocation < rehashPointer) {
                         rowState = alternateStateSource.getUnsafe(alternateTableLocation);
-                        if (rowState == EMPTY_RIGHT_VALUE) {
+                        if (isStateEmpty(rowState)) {
                             break;
                         } else if (eq(alternateKeySource0.getUnsafe(alternateTableLocation), k0) && eq(alternateKeySource1.getUnsafe(alternateTableLocation), k1)) {
                             // map the existing bucket to this chunk position;
@@ -122,7 +122,7 @@ protected void probeHashTable(RowSequence rowSequence, Chunk[] sourceKeyChunks,
             boolean found = false;
             int tableLocation = firstTableLocation;
             int rowState;
-            while ((rowState = stateSource.getUnsafe(tableLocation)) != EMPTY_RIGHT_VALUE) {
+            while (!isStateEmpty(rowState = stateSource.getUnsafe(tableLocation))) {
                 if (eq(mainKeySource0.getUnsafe(tableLocation), k0) && eq(mainKeySource1.getUnsafe(tableLocation), k1)) {
                     // map the existing bucket to this chunk position;
                     outputPositions.set(chunkPosition, rowState);
@@ -137,7 +137,7 @@ protected void probeHashTable(RowSequence rowSequence, Chunk[] sourceKeyChunks,
                 boolean alternateFound = false;
                 if (firstAlternateTableLocation < rehashPointer) {
                     int alternateTableLocation = firstAlternateTableLocation;
-                    while ((rowState = alternateStateSource.getUnsafe(alternateTableLocation)) != EMPTY_RIGHT_VALUE) {
+                    while (!isStateEmpty(rowState = alternateStateSource.getUnsafe(alternateTableLocation))) {
                         if (eq(alternateKeySource0.getUnsafe(alternateTableLocation), k0) && eq(alternateKeySource1.getUnsafe(alternateTableLocation), k1)) {
                             // map the existing bucket (from alternate) to this chunk position;
                             outputPositions.set(chunkPosition, rowState);
@@ -162,17 +162,21 @@ private static int hash(short k0, float k1) {
         return hash;
     }
 
+    private static boolean isStateEmpty(int state) {
+        return state == EMPTY_RIGHT_VALUE;
+    }
+
     private boolean migrateOneLocation(int locationToMigrate,
             WritableIntChunk<RowKeys> outputPositions) {
         final int currentStateValue = alternateStateSource.getUnsafe(locationToMigrate);
-        if (currentStateValue == EMPTY_RIGHT_VALUE) {
+        if (isStateEmpty(currentStateValue)) {
             return false;
         }
         final short k0 = alternateKeySource0.getUnsafe(locationToMigrate);
         final float k1 = alternateKeySource1.getUnsafe(locationToMigrate);
         final int hash = hash(k0, k1);
         int destinationTableLocation = hashToTableLocation(hash);
-        while (stateSource.getUnsafe(destinationTableLocation) != EMPTY_RIGHT_VALUE) {
+        while (!isStateEmpty(stateSource.getUnsafe(destinationTableLocation))) {
             destinationTableLocation = nextTableLocation(destinationTableLocation);
         }
         mainKeySource0.set(destinationTableLocation, k0);
@@ -195,8 +199,7 @@ protected int rehashInternalPartial(int entriesToRehash,
     }
 
     @Override
-    protected void newAlternate() {
-        super.newAlternate();
+    protected void adviseNewAlternate() {
         this.mainKeySource0 = (ImmutableShortArraySource)super.mainKeySources[0];
         this.alternateKeySource0 = (ImmutableShortArraySource)super.alternateKeySources[0];
         this.mainKeySource1 = (ImmutableFloatArraySource)super.mainKeySources[1];
@@ -213,7 +216,7 @@ protected void clearAlternate() {
     @Override
     protected void migrateFront(WritableIntChunk<RowKeys> outputPositions) {
         int location = 0;
-        while (migrateOneLocation(location++, outputPositions));
+        while (migrateOneLocation(location++, outputPositions) && location < alternateTableSize);
     }
 
     @Override
@@ -230,7 +233,7 @@ protected void rehashInternalFull(final int oldSize) {
         stateSource.setArray(destState);
         for (int sourceBucket = 0; sourceBucket < oldSize; ++sourceBucket) {
             final int currentStateValue = originalStateArray[sourceBucket];
-            if (currentStateValue == EMPTY_RIGHT_VALUE) {
+            if (isStateEmpty(currentStateValue)) {
                 continue;
             }
             final short k0 = originalKeyArray0[sourceBucket];
@@ -239,7 +242,7 @@ protected void rehashInternalFull(final int oldSize) {
             final int firstDestinationTableLocation = hashToTableLocation(hash);
             int destinationTableLocation = firstDestinationTableLocation;
             while (true) {
-                if (destState[destinationTableLocation] == EMPTY_RIGHT_VALUE) {
+                if (isStateEmpty(destState[destinationTableLocation])) {
                     destKeyArray0[destinationTableLocation] = k0;
                     destKeyArray1[destinationTableLocation] = k1;
                     destState[destinationTableLocation] = originalStateArray[sourceBucket];
diff --git a/engine/table/src/main/java/io/deephaven/engine/table/impl/updateby/hashing/typed/open/gen/UpdateByHasherShortInt.java b/engine/table/src/main/java/io/deephaven/engine/table/impl/updateby/hashing/typed/open/gen/UpdateByHasherShortInt.java
index bd9f482f254..ab29cc30fdb 100644
--- a/engine/table/src/main/java/io/deephaven/engine/table/impl/updateby/hashing/typed/open/gen/UpdateByHasherShortInt.java
+++ b/engine/table/src/main/java/io/deephaven/engine/table/impl/updateby/hashing/typed/open/gen/UpdateByHasherShortInt.java
@@ -71,12 +71,12 @@ protected void buildHashTable(RowSequence rowSequence, Chunk[] sourceKeyChunks,
             int tableLocation = firstTableLocation;
             MAIN_SEARCH: while (true) {
                 int rowState = stateSource.getUnsafe(tableLocation);
-                if (rowState == EMPTY_RIGHT_VALUE) {
+                if (isStateEmpty(rowState)) {
                     final int firstAlternateTableLocation = hashToTableLocationAlternate(hash);
                     int alternateTableLocation = firstAlternateTableLocation;
                     while (alternateTableLocation < rehashPointer) {
                         rowState = alternateStateSource.getUnsafe(alternateTableLocation);
-                        if (rowState == EMPTY_RIGHT_VALUE) {
+                        if (isStateEmpty(rowState)) {
                             break;
                         } else if (eq(alternateKeySource0.getUnsafe(alternateTableLocation), k0) && eq(alternateKeySource1.getUnsafe(alternateTableLocation), k1)) {
                             // map the existing bucket to this chunk position;
@@ -122,7 +122,7 @@ protected void probeHashTable(RowSequence rowSequence, Chunk[] sourceKeyChunks,
             boolean found = false;
             int tableLocation = firstTableLocation;
             int rowState;
-            while ((rowState = stateSource.getUnsafe(tableLocation)) != EMPTY_RIGHT_VALUE) {
+            while (!isStateEmpty(rowState = stateSource.getUnsafe(tableLocation))) {
                 if (eq(mainKeySource0.getUnsafe(tableLocation), k0) && eq(mainKeySource1.getUnsafe(tableLocation), k1)) {
                     // map the existing bucket to this chunk position;
                     outputPositions.set(chunkPosition, rowState);
@@ -137,7 +137,7 @@ protected void probeHashTable(RowSequence rowSequence, Chunk[] sourceKeyChunks,
                 boolean alternateFound = false;
                 if (firstAlternateTableLocation < rehashPointer) {
                     int alternateTableLocation = firstAlternateTableLocation;
-                    while ((rowState = alternateStateSource.getUnsafe(alternateTableLocation)) != EMPTY_RIGHT_VALUE) {
+                    while (!isStateEmpty(rowState = alternateStateSource.getUnsafe(alternateTableLocation))) {
                         if (eq(alternateKeySource0.getUnsafe(alternateTableLocation), k0) && eq(alternateKeySource1.getUnsafe(alternateTableLocation), k1)) {
                             // map the existing bucket (from alternate) to this chunk position;
                             outputPositions.set(chunkPosition, rowState);
@@ -162,17 +162,21 @@ private static int hash(short k0, int k1) {
         return hash;
     }
 
+    private static boolean isStateEmpty(int state) {
+        return state == EMPTY_RIGHT_VALUE;
+    }
+
     private boolean migrateOneLocation(int locationToMigrate,
             WritableIntChunk<RowKeys> outputPositions) {
         final int currentStateValue = alternateStateSource.getUnsafe(locationToMigrate);
-        if (currentStateValue == EMPTY_RIGHT_VALUE) {
+        if (isStateEmpty(currentStateValue)) {
             return false;
         }
         final short k0 = alternateKeySource0.getUnsafe(locationToMigrate);
         final int k1 = alternateKeySource1.getUnsafe(locationToMigrate);
         final int hash = hash(k0, k1);
         int destinationTableLocation = hashToTableLocation(hash);
-        while (stateSource.getUnsafe(destinationTableLocation) != EMPTY_RIGHT_VALUE) {
+        while (!isStateEmpty(stateSource.getUnsafe(destinationTableLocation))) {
             destinationTableLocation = nextTableLocation(destinationTableLocation);
         }
         mainKeySource0.set(destinationTableLocation, k0);
@@ -195,8 +199,7 @@ protected int rehashInternalPartial(int entriesToRehash,
     }
 
     @Override
-    protected void newAlternate() {
-        super.newAlternate();
+    protected void adviseNewAlternate() {
         this.mainKeySource0 = (ImmutableShortArraySource)super.mainKeySources[0];
         this.alternateKeySource0 = (ImmutableShortArraySource)super.alternateKeySources[0];
         this.mainKeySource1 = (ImmutableIntArraySource)super.mainKeySources[1];
@@ -213,7 +216,7 @@ protected void clearAlternate() {
     @Override
     protected void migrateFront(WritableIntChunk<RowKeys> outputPositions) {
         int location = 0;
-        while (migrateOneLocation(location++, outputPositions));
+        while (migrateOneLocation(location++, outputPositions) && location < alternateTableSize);
     }
 
     @Override
@@ -230,7 +233,7 @@ protected void rehashInternalFull(final int oldSize) {
         stateSource.setArray(destState);
         for (int sourceBucket = 0; sourceBucket < oldSize; ++sourceBucket) {
             final int currentStateValue = originalStateArray[sourceBucket];
-            if (currentStateValue == EMPTY_RIGHT_VALUE) {
+            if (isStateEmpty(currentStateValue)) {
                 continue;
             }
             final short k0 = originalKeyArray0[sourceBucket];
@@ -239,7 +242,7 @@ protected void rehashInternalFull(final int oldSize) {
             final int firstDestinationTableLocation = hashToTableLocation(hash);
             int destinationTableLocation = firstDestinationTableLocation;
             while (true) {
-                if (destState[destinationTableLocation] == EMPTY_RIGHT_VALUE) {
+                if (isStateEmpty(destState[destinationTableLocation])) {
                     destKeyArray0[destinationTableLocation] = k0;
                     destKeyArray1[destinationTableLocation] = k1;
                     destState[destinationTableLocation] = originalStateArray[sourceBucket];
diff --git a/engine/table/src/main/java/io/deephaven/engine/table/impl/updateby/hashing/typed/open/gen/UpdateByHasherShortLong.java b/engine/table/src/main/java/io/deephaven/engine/table/impl/updateby/hashing/typed/open/gen/UpdateByHasherShortLong.java
index 0343b1f7b18..ff850b0c8ec 100644
--- a/engine/table/src/main/java/io/deephaven/engine/table/impl/updateby/hashing/typed/open/gen/UpdateByHasherShortLong.java
+++ b/engine/table/src/main/java/io/deephaven/engine/table/impl/updateby/hashing/typed/open/gen/UpdateByHasherShortLong.java
@@ -70,12 +70,12 @@ protected void buildHashTable(RowSequence rowSequence, Chunk[] sourceKeyChunks,
             int tableLocation = firstTableLocation;
             MAIN_SEARCH: while (true) {
                 int rowState = stateSource.getUnsafe(tableLocation);
-                if (rowState == EMPTY_RIGHT_VALUE) {
+                if (isStateEmpty(rowState)) {
                     final int firstAlternateTableLocation = hashToTableLocationAlternate(hash);
                     int alternateTableLocation = firstAlternateTableLocation;
                     while (alternateTableLocation < rehashPointer) {
                         rowState = alternateStateSource.getUnsafe(alternateTableLocation);
-                        if (rowState == EMPTY_RIGHT_VALUE) {
+                        if (isStateEmpty(rowState)) {
                             break;
                         } else if (eq(alternateKeySource0.getUnsafe(alternateTableLocation), k0) && eq(alternateKeySource1.getUnsafe(alternateTableLocation), k1)) {
                             // map the existing bucket to this chunk position;
@@ -121,7 +121,7 @@ protected void probeHashTable(RowSequence rowSequence, Chunk[] sourceKeyChunks,
             boolean found = false;
             int tableLocation = firstTableLocation;
             int rowState;
-            while ((rowState = stateSource.getUnsafe(tableLocation)) != EMPTY_RIGHT_VALUE) {
+            while (!isStateEmpty(rowState = stateSource.getUnsafe(tableLocation))) {
                 if (eq(mainKeySource0.getUnsafe(tableLocation), k0) && eq(mainKeySource1.getUnsafe(tableLocation), k1)) {
                     // map the existing bucket to this chunk position;
                     outputPositions.set(chunkPosition, rowState);
@@ -136,7 +136,7 @@ protected void probeHashTable(RowSequence rowSequence, Chunk[] sourceKeyChunks,
                 boolean alternateFound = false;
                 if (firstAlternateTableLocation < rehashPointer) {
                     int alternateTableLocation = firstAlternateTableLocation;
-                    while ((rowState = alternateStateSource.getUnsafe(alternateTableLocation)) != EMPTY_RIGHT_VALUE) {
+                    while (!isStateEmpty(rowState = alternateStateSource.getUnsafe(alternateTableLocation))) {
                         if (eq(alternateKeySource0.getUnsafe(alternateTableLocation), k0) && eq(alternateKeySource1.getUnsafe(alternateTableLocation), k1)) {
                             // map the existing bucket (from alternate) to this chunk position;
                             outputPositions.set(chunkPosition, rowState);
@@ -161,17 +161,21 @@ private static int hash(short k0, long k1) {
         return hash;
     }
 
+    private static boolean isStateEmpty(int state) {
+        return state == EMPTY_RIGHT_VALUE;
+    }
+
     private boolean migrateOneLocation(int locationToMigrate,
             WritableIntChunk<RowKeys> outputPositions) {
         final int currentStateValue = alternateStateSource.getUnsafe(locationToMigrate);
-        if (currentStateValue == EMPTY_RIGHT_VALUE) {
+        if (isStateEmpty(currentStateValue)) {
             return false;
         }
         final short k0 = alternateKeySource0.getUnsafe(locationToMigrate);
         final long k1 = alternateKeySource1.getUnsafe(locationToMigrate);
         final int hash = hash(k0, k1);
         int destinationTableLocation = hashToTableLocation(hash);
-        while (stateSource.getUnsafe(destinationTableLocation) != EMPTY_RIGHT_VALUE) {
+        while (!isStateEmpty(stateSource.getUnsafe(destinationTableLocation))) {
             destinationTableLocation = nextTableLocation(destinationTableLocation);
         }
         mainKeySource0.set(destinationTableLocation, k0);
@@ -194,8 +198,7 @@ protected int rehashInternalPartial(int entriesToRehash,
     }
 
     @Override
-    protected void newAlternate() {
-        super.newAlternate();
+    protected void adviseNewAlternate() {
         this.mainKeySource0 = (ImmutableShortArraySource)super.mainKeySources[0];
         this.alternateKeySource0 = (ImmutableShortArraySource)super.alternateKeySources[0];
         this.mainKeySource1 = (ImmutableLongArraySource)super.mainKeySources[1];
@@ -212,7 +215,7 @@ protected void clearAlternate() {
     @Override
     protected void migrateFront(WritableIntChunk<RowKeys> outputPositions) {
         int location = 0;
-        while (migrateOneLocation(location++, outputPositions));
+        while (migrateOneLocation(location++, outputPositions) && location < alternateTableSize);
     }
 
     @Override
@@ -229,7 +232,7 @@ protected void rehashInternalFull(final int oldSize) {
         stateSource.setArray(destState);
         for (int sourceBucket = 0; sourceBucket < oldSize; ++sourceBucket) {
             final int currentStateValue = originalStateArray[sourceBucket];
-            if (currentStateValue == EMPTY_RIGHT_VALUE) {
+            if (isStateEmpty(currentStateValue)) {
                 continue;
             }
             final short k0 = originalKeyArray0[sourceBucket];
@@ -238,7 +241,7 @@ protected void rehashInternalFull(final int oldSize) {
             final int firstDestinationTableLocation = hashToTableLocation(hash);
             int destinationTableLocation = firstDestinationTableLocation;
             while (true) {
-                if (destState[destinationTableLocation] == EMPTY_RIGHT_VALUE) {
+                if (isStateEmpty(destState[destinationTableLocation])) {
                     destKeyArray0[destinationTableLocation] = k0;
                     destKeyArray1[destinationTableLocation] = k1;
                     destState[destinationTableLocation] = originalStateArray[sourceBucket];
diff --git a/engine/table/src/main/java/io/deephaven/engine/table/impl/updateby/hashing/typed/open/gen/UpdateByHasherShortObject.java b/engine/table/src/main/java/io/deephaven/engine/table/impl/updateby/hashing/typed/open/gen/UpdateByHasherShortObject.java
index a4218814551..1722d039d19 100644
--- a/engine/table/src/main/java/io/deephaven/engine/table/impl/updateby/hashing/typed/open/gen/UpdateByHasherShortObject.java
+++ b/engine/table/src/main/java/io/deephaven/engine/table/impl/updateby/hashing/typed/open/gen/UpdateByHasherShortObject.java
@@ -72,12 +72,12 @@ protected void buildHashTable(RowSequence rowSequence, Chunk[] sourceKeyChunks,
             int tableLocation = firstTableLocation;
             MAIN_SEARCH: while (true) {
                 int rowState = stateSource.getUnsafe(tableLocation);
-                if (rowState == EMPTY_RIGHT_VALUE) {
+                if (isStateEmpty(rowState)) {
                     final int firstAlternateTableLocation = hashToTableLocationAlternate(hash);
                     int alternateTableLocation = firstAlternateTableLocation;
                     while (alternateTableLocation < rehashPointer) {
                         rowState = alternateStateSource.getUnsafe(alternateTableLocation);
-                        if (rowState == EMPTY_RIGHT_VALUE) {
+                        if (isStateEmpty(rowState)) {
                             break;
                         } else if (eq(alternateKeySource0.getUnsafe(alternateTableLocation), k0) && eq(alternateKeySource1.getUnsafe(alternateTableLocation), k1)) {
                             // map the existing bucket to this chunk position;
@@ -123,7 +123,7 @@ protected void probeHashTable(RowSequence rowSequence, Chunk[] sourceKeyChunks,
             boolean found = false;
             int tableLocation = firstTableLocation;
             int rowState;
-            while ((rowState = stateSource.getUnsafe(tableLocation)) != EMPTY_RIGHT_VALUE) {
+            while (!isStateEmpty(rowState = stateSource.getUnsafe(tableLocation))) {
                 if (eq(mainKeySource0.getUnsafe(tableLocation), k0) && eq(mainKeySource1.getUnsafe(tableLocation), k1)) {
                     // map the existing bucket to this chunk position;
                     outputPositions.set(chunkPosition, rowState);
@@ -138,7 +138,7 @@ protected void probeHashTable(RowSequence rowSequence, Chunk[] sourceKeyChunks,
                 boolean alternateFound = false;
                 if (firstAlternateTableLocation < rehashPointer) {
                     int alternateTableLocation = firstAlternateTableLocation;
-                    while ((rowState = alternateStateSource.getUnsafe(alternateTableLocation)) != EMPTY_RIGHT_VALUE) {
+                    while (!isStateEmpty(rowState = alternateStateSource.getUnsafe(alternateTableLocation))) {
                         if (eq(alternateKeySource0.getUnsafe(alternateTableLocation), k0) && eq(alternateKeySource1.getUnsafe(alternateTableLocation), k1)) {
                             // map the existing bucket (from alternate) to this chunk position;
                             outputPositions.set(chunkPosition, rowState);
@@ -163,17 +163,21 @@ private static int hash(short k0, Object k1) {
         return hash;
     }
 
+    private static boolean isStateEmpty(int state) {
+        return state == EMPTY_RIGHT_VALUE;
+    }
+
     private boolean migrateOneLocation(int locationToMigrate,
             WritableIntChunk<RowKeys> outputPositions) {
         final int currentStateValue = alternateStateSource.getUnsafe(locationToMigrate);
-        if (currentStateValue == EMPTY_RIGHT_VALUE) {
+        if (isStateEmpty(currentStateValue)) {
             return false;
         }
         final short k0 = alternateKeySource0.getUnsafe(locationToMigrate);
         final Object k1 = alternateKeySource1.getUnsafe(locationToMigrate);
         final int hash = hash(k0, k1);
         int destinationTableLocation = hashToTableLocation(hash);
-        while (stateSource.getUnsafe(destinationTableLocation) != EMPTY_RIGHT_VALUE) {
+        while (!isStateEmpty(stateSource.getUnsafe(destinationTableLocation))) {
             destinationTableLocation = nextTableLocation(destinationTableLocation);
         }
         mainKeySource0.set(destinationTableLocation, k0);
@@ -197,8 +201,7 @@ protected int rehashInternalPartial(int entriesToRehash,
     }
 
     @Override
-    protected void newAlternate() {
-        super.newAlternate();
+    protected void adviseNewAlternate() {
         this.mainKeySource0 = (ImmutableShortArraySource)super.mainKeySources[0];
         this.alternateKeySource0 = (ImmutableShortArraySource)super.alternateKeySources[0];
         this.mainKeySource1 = (ImmutableObjectArraySource)super.mainKeySources[1];
@@ -215,7 +218,7 @@ protected void clearAlternate() {
     @Override
     protected void migrateFront(WritableIntChunk<RowKeys> outputPositions) {
         int location = 0;
-        while (migrateOneLocation(location++, outputPositions));
+        while (migrateOneLocation(location++, outputPositions) && location < alternateTableSize);
     }
 
     @Override
@@ -232,7 +235,7 @@ protected void rehashInternalFull(final int oldSize) {
         stateSource.setArray(destState);
         for (int sourceBucket = 0; sourceBucket < oldSize; ++sourceBucket) {
             final int currentStateValue = originalStateArray[sourceBucket];
-            if (currentStateValue == EMPTY_RIGHT_VALUE) {
+            if (isStateEmpty(currentStateValue)) {
                 continue;
             }
             final short k0 = originalKeyArray0[sourceBucket];
@@ -241,7 +244,7 @@ protected void rehashInternalFull(final int oldSize) {
             final int firstDestinationTableLocation = hashToTableLocation(hash);
             int destinationTableLocation = firstDestinationTableLocation;
             while (true) {
-                if (destState[destinationTableLocation] == EMPTY_RIGHT_VALUE) {
+                if (isStateEmpty(destState[destinationTableLocation])) {
                     destKeyArray0[destinationTableLocation] = k0;
                     destKeyArray1[destinationTableLocation] = k1;
                     destState[destinationTableLocation] = originalStateArray[sourceBucket];
diff --git a/engine/table/src/main/java/io/deephaven/engine/table/impl/updateby/hashing/typed/open/gen/UpdateByHasherShortShort.java b/engine/table/src/main/java/io/deephaven/engine/table/impl/updateby/hashing/typed/open/gen/UpdateByHasherShortShort.java
index 474df7233cb..a48272f8889 100644
--- a/engine/table/src/main/java/io/deephaven/engine/table/impl/updateby/hashing/typed/open/gen/UpdateByHasherShortShort.java
+++ b/engine/table/src/main/java/io/deephaven/engine/table/impl/updateby/hashing/typed/open/gen/UpdateByHasherShortShort.java
@@ -67,12 +67,12 @@ protected void buildHashTable(RowSequence rowSequence, Chunk[] sourceKeyChunks,
             int tableLocation = firstTableLocation;
             MAIN_SEARCH: while (true) {
                 int rowState = stateSource.getUnsafe(tableLocation);
-                if (rowState == EMPTY_RIGHT_VALUE) {
+                if (isStateEmpty(rowState)) {
                     final int firstAlternateTableLocation = hashToTableLocationAlternate(hash);
                     int alternateTableLocation = firstAlternateTableLocation;
                     while (alternateTableLocation < rehashPointer) {
                         rowState = alternateStateSource.getUnsafe(alternateTableLocation);
-                        if (rowState == EMPTY_RIGHT_VALUE) {
+                        if (isStateEmpty(rowState)) {
                             break;
                         } else if (eq(alternateKeySource0.getUnsafe(alternateTableLocation), k0) && eq(alternateKeySource1.getUnsafe(alternateTableLocation), k1)) {
                             // map the existing bucket to this chunk position;
@@ -118,7 +118,7 @@ protected void probeHashTable(RowSequence rowSequence, Chunk[] sourceKeyChunks,
             boolean found = false;
             int tableLocation = firstTableLocation;
             int rowState;
-            while ((rowState = stateSource.getUnsafe(tableLocation)) != EMPTY_RIGHT_VALUE) {
+            while (!isStateEmpty(rowState = stateSource.getUnsafe(tableLocation))) {
                 if (eq(mainKeySource0.getUnsafe(tableLocation), k0) && eq(mainKeySource1.getUnsafe(tableLocation), k1)) {
                     // map the existing bucket to this chunk position;
                     outputPositions.set(chunkPosition, rowState);
@@ -133,7 +133,7 @@ protected void probeHashTable(RowSequence rowSequence, Chunk[] sourceKeyChunks,
                 boolean alternateFound = false;
                 if (firstAlternateTableLocation < rehashPointer) {
                     int alternateTableLocation = firstAlternateTableLocation;
-                    while ((rowState = alternateStateSource.getUnsafe(alternateTableLocation)) != EMPTY_RIGHT_VALUE) {
+                    while (!isStateEmpty(rowState = alternateStateSource.getUnsafe(alternateTableLocation))) {
                         if (eq(alternateKeySource0.getUnsafe(alternateTableLocation), k0) && eq(alternateKeySource1.getUnsafe(alternateTableLocation), k1)) {
                             // map the existing bucket (from alternate) to this chunk position;
                             outputPositions.set(chunkPosition, rowState);
@@ -158,17 +158,21 @@ private static int hash(short k0, short k1) {
         return hash;
     }
 
+    private static boolean isStateEmpty(int state) {
+        return state == EMPTY_RIGHT_VALUE;
+    }
+
     private boolean migrateOneLocation(int locationToMigrate,
             WritableIntChunk<RowKeys> outputPositions) {
         final int currentStateValue = alternateStateSource.getUnsafe(locationToMigrate);
-        if (currentStateValue == EMPTY_RIGHT_VALUE) {
+        if (isStateEmpty(currentStateValue)) {
             return false;
         }
         final short k0 = alternateKeySource0.getUnsafe(locationToMigrate);
         final short k1 = alternateKeySource1.getUnsafe(locationToMigrate);
         final int hash = hash(k0, k1);
         int destinationTableLocation = hashToTableLocation(hash);
-        while (stateSource.getUnsafe(destinationTableLocation) != EMPTY_RIGHT_VALUE) {
+        while (!isStateEmpty(stateSource.getUnsafe(destinationTableLocation))) {
             destinationTableLocation = nextTableLocation(destinationTableLocation);
         }
         mainKeySource0.set(destinationTableLocation, k0);
@@ -191,8 +195,7 @@ protected int rehashInternalPartial(int entriesToRehash,
     }
 
     @Override
-    protected void newAlternate() {
-        super.newAlternate();
+    protected void adviseNewAlternate() {
         this.mainKeySource0 = (ImmutableShortArraySource)super.mainKeySources[0];
         this.alternateKeySource0 = (ImmutableShortArraySource)super.alternateKeySources[0];
         this.mainKeySource1 = (ImmutableShortArraySource)super.mainKeySources[1];
@@ -209,7 +212,7 @@ protected void clearAlternate() {
     @Override
     protected void migrateFront(WritableIntChunk<RowKeys> outputPositions) {
         int location = 0;
-        while (migrateOneLocation(location++, outputPositions));
+        while (migrateOneLocation(location++, outputPositions) && location < alternateTableSize);
     }
 
     @Override
@@ -226,7 +229,7 @@ protected void rehashInternalFull(final int oldSize) {
         stateSource.setArray(destState);
         for (int sourceBucket = 0; sourceBucket < oldSize; ++sourceBucket) {
             final int currentStateValue = originalStateArray[sourceBucket];
-            if (currentStateValue == EMPTY_RIGHT_VALUE) {
+            if (isStateEmpty(currentStateValue)) {
                 continue;
             }
             final short k0 = originalKeyArray0[sourceBucket];
@@ -235,7 +238,7 @@ protected void rehashInternalFull(final int oldSize) {
             final int firstDestinationTableLocation = hashToTableLocation(hash);
             int destinationTableLocation = firstDestinationTableLocation;
             while (true) {
-                if (destState[destinationTableLocation] == EMPTY_RIGHT_VALUE) {
+                if (isStateEmpty(destState[destinationTableLocation])) {
                     destKeyArray0[destinationTableLocation] = k0;
                     destKeyArray1[destinationTableLocation] = k1;
                     destState[destinationTableLocation] = originalStateArray[sourceBucket];
diff --git a/engine/table/src/main/java/io/deephaven/engine/table/impl/updateby/rollingavg/BigIntegerRollingAvgOperator.java b/engine/table/src/main/java/io/deephaven/engine/table/impl/updateby/rollingavg/BigIntegerRollingAvgOperator.java
index 817bfeee1d8..6a869d58aa1 100644
--- a/engine/table/src/main/java/io/deephaven/engine/table/impl/updateby/rollingavg/BigIntegerRollingAvgOperator.java
+++ b/engine/table/src/main/java/io/deephaven/engine/table/impl/updateby/rollingavg/BigIntegerRollingAvgOperator.java
@@ -10,7 +10,6 @@
 import io.deephaven.engine.table.impl.MatchPair;
 import io.deephaven.engine.table.impl.updateby.UpdateByOperator;
 import io.deephaven.engine.table.impl.updateby.internal.BaseObjectUpdateByOperator;
-import io.deephaven.engine.table.impl.util.RowRedirection;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
diff --git a/engine/table/src/main/java/io/deephaven/engine/table/impl/updateby/rollingformula/BaseRollingFormulaOperator.java b/engine/table/src/main/java/io/deephaven/engine/table/impl/updateby/rollingformula/BaseRollingFormulaOperator.java
index b5e0a9560a9..5f153a1fe24 100644
--- a/engine/table/src/main/java/io/deephaven/engine/table/impl/updateby/rollingformula/BaseRollingFormulaOperator.java
+++ b/engine/table/src/main/java/io/deephaven/engine/table/impl/updateby/rollingformula/BaseRollingFormulaOperator.java
@@ -38,6 +38,8 @@ abstract class BaseRollingFormulaOperator extends UpdateByOperator {
     final TableDefinition tableDef;
 
     final FormulaColumn formulaColumn;
+    final Class<?> inputColumnType;
+    final Class<?> inputComponentType;
     final Class<?> inputVectorType;
 
     protected WritableColumnSource<?> primitiveOutputSource;
@@ -104,7 +106,9 @@ public BaseRollingFormulaOperator(
 
         final String outputColumnName = pair.leftColumn;
 
-        final Class<?> inputColumnType = tableDef.getColumn(pair.rightColumn).getDataType();
+        final ColumnDefinition<?> columnDefinition = tableDef.getColumn(pair.rightColumn);
+        inputColumnType = columnDefinition.getDataType();
+        inputComponentType = columnDefinition.getComponentType();
         inputVectorType = VectorFactory.forElementType(inputColumnType).vectorType();
 
         // Re-use the formula column if it's already been created for this type. No need to synchronize; these
@@ -126,15 +130,17 @@ protected BaseRollingFormulaOperator(
             @Nullable final String timestampColumnName,
             final long reverseWindowScaleUnits,
             final long forwardWindowScaleUnits,
-            final Class<?> inputVectorType,
+            final Class<?> columnType,
+            final Class<?> componentType,
+            final Class<?> vectorType,
             @NotNull final Map<Class<?>, FormulaColumn> formulaColumnMap,
             @NotNull final TableDefinition tableDef) {
         super(pair, affectingColumns, timestampColumnName, reverseWindowScaleUnits, forwardWindowScaleUnits, true);
         this.formulaColumnMap = formulaColumnMap;
         this.tableDef = tableDef;
-
-        final Class<?> columnType = tableDef.getColumn(pair.rightColumn).getDataType();
-        this.inputVectorType = inputVectorType;
+        this.inputColumnType = columnType;
+        this.inputComponentType = componentType;
+        this.inputVectorType = vectorType;
 
         // Re-use the formula column already created for this type.
         formulaColumn = formulaColumnMap.computeIfAbsent(columnType, t -> {
@@ -172,49 +178,35 @@ protected static IntConsumer getChunkSetter(
                     "Output chunk type should not be Boolean but should have been reinterpreted to byte");
         }
         if (chunkType == ChunkType.Byte) {
-            return i -> {
-                final WritableByteChunk<? extends Values> writableChunk = valueChunk.asWritableByteChunk();
-                writableChunk.set(i, formulaOutputSource.getByte(0));
-            };
+            final WritableByteChunk<? extends Values> writableChunk = valueChunk.asWritableByteChunk();
+            return index -> writableChunk.set(index, formulaOutputSource.getByte(0));
         }
         if (chunkType == ChunkType.Char) {
-            return i -> {
-                final WritableCharChunk<? extends Values> writableChunk = valueChunk.asWritableCharChunk();
-                writableChunk.set(i, formulaOutputSource.getChar(0));
-            };
+            final WritableCharChunk<? extends Values> writableChunk = valueChunk.asWritableCharChunk();
+            return index -> writableChunk.set(index, formulaOutputSource.getChar(0));
         }
         if (chunkType == ChunkType.Double) {
-            return i -> {
-                final WritableDoubleChunk<? extends Values> writableChunk = valueChunk.asWritableDoubleChunk();
-                writableChunk.set(i, formulaOutputSource.getDouble(0));
-            };
+            final WritableDoubleChunk<? extends Values> writableChunk = valueChunk.asWritableDoubleChunk();
+            return index -> writableChunk.set(index, formulaOutputSource.getDouble(0));
         }
         if (chunkType == ChunkType.Float) {
-            return i -> {
-                final WritableFloatChunk<? extends Values> writableChunk = valueChunk.asWritableFloatChunk();
-                writableChunk.set(i, formulaOutputSource.getFloat(0));
-            };
+            final WritableFloatChunk<? extends Values> writableChunk = valueChunk.asWritableFloatChunk();
+            return index -> writableChunk.set(index, formulaOutputSource.getFloat(0));
         }
         if (chunkType == ChunkType.Int) {
-            return i -> {
-                final WritableIntChunk<? extends Values> writableChunk = valueChunk.asWritableIntChunk();
-                writableChunk.set(i, formulaOutputSource.getInt(0));
-            };
+            final WritableIntChunk<? extends Values> writableChunk = valueChunk.asWritableIntChunk();
+            return index -> writableChunk.set(index, formulaOutputSource.getInt(0));
         }
         if (chunkType == ChunkType.Long) {
-            return i -> {
-                final WritableLongChunk<? extends Values> writableChunk = valueChunk.asWritableLongChunk();
-                writableChunk.set(i, formulaOutputSource.getLong(0));
-            };
+            final WritableLongChunk<? extends Values> writableChunk = valueChunk.asWritableLongChunk();
+            return index -> writableChunk.set(index, formulaOutputSource.getLong(0));
         }
         if (chunkType == ChunkType.Short) {
-            return i -> {
-                final WritableShortChunk<? extends Values> writableChunk = valueChunk.asWritableShortChunk();
-                writableChunk.set(i, formulaOutputSource.getShort(0));
-            };
+            final WritableShortChunk<? extends Values> writableChunk = valueChunk.asWritableShortChunk();
+            return index -> writableChunk.set(index, formulaOutputSource.getShort(0));
         }
-        return i -> {
-            final WritableObjectChunk<Object, ? extends Values> writableChunk = valueChunk.asWritableObjectChunk();
+        final WritableObjectChunk<Object, ? extends Values> writableChunk = valueChunk.asWritableObjectChunk();
+        return index -> {
             Object result = formulaOutputSource.get(0);
             if (result instanceof RingBufferVectorWrapper) {
                 // Handle the rare (and probably not useful) case where the formula is an identity. We need to
@@ -222,7 +214,7 @@ protected static IntConsumer getChunkSetter(
                 // live data in the ring.
                 result = ((Vector<?>) result).getDirect();
             }
-            writableChunk.set(i, result);
+            writableChunk.set(index, result);
         };
     }
 
diff --git a/engine/table/src/main/java/io/deephaven/engine/table/impl/updateby/rollingformula/BooleanRollingFormulaOperator.java b/engine/table/src/main/java/io/deephaven/engine/table/impl/updateby/rollingformula/BooleanRollingFormulaOperator.java
index b54d4dcc02d..7144e591683 100644
--- a/engine/table/src/main/java/io/deephaven/engine/table/impl/updateby/rollingformula/BooleanRollingFormulaOperator.java
+++ b/engine/table/src/main/java/io/deephaven/engine/table/impl/updateby/rollingformula/BooleanRollingFormulaOperator.java
@@ -41,7 +41,6 @@ public class BooleanRollingFormulaOperator extends BaseRollingFormulaOperator {
     private static final int BUFFER_INITIAL_CAPACITY = 128;
 
     protected class Context extends BaseRollingFormulaOperator.Context {
-        private final ColumnSource<?> formulaOutputSource;
         private final IntConsumer outputSetter;
 
         private ByteChunk<? extends Values> influencerValuesChunk;
@@ -64,11 +63,12 @@ protected Context(final int affectedChunkSize, final int influencerChunkSize) {
             final SingleValueColumnSource<ObjectVector<?>> formulaInputSource =
                     (SingleValueColumnSource<ObjectVector<?>>) SingleValueColumnSource
                             .getSingleValueColumnSource(inputVectorType);
-            formulaInputSource.set(new ObjectRingBufferVectorWrapper(windowValues, inputVectorType));
+            // noinspection rawtypes
+            formulaInputSource.set(new ObjectRingBufferVectorWrapper(windowValues, inputComponentType));
             formulaCopy.initInputs(RowSetFactory.flat(1).toTracking(),
                     Collections.singletonMap(PARAM_COLUMN_NAME, formulaInputSource));
 
-            formulaOutputSource = formulaCopy.getDataView();
+            final ColumnSource<?> formulaOutputSource = formulaCopy.getDataView();
             outputSetter = getChunkSetter(outputValues, formulaOutputSource);
         }
 
@@ -173,11 +173,22 @@ protected BooleanRollingFormulaOperator(
             @Nullable final String timestampColumnName,
             final long reverseWindowScaleUnits,
             final long forwardWindowScaleUnits,
+            final Class<?> columnType,
+            final Class<?> componentType,
             final Class<?> vectorType,
             @NotNull final Map<Class<?>, FormulaColumn> formulaColumnMap,
             @NotNull final TableDefinition tableDef) {
-        super(pair, affectingColumns, timestampColumnName, reverseWindowScaleUnits, forwardWindowScaleUnits, vectorType,
-                formulaColumnMap, tableDef);
+        super(
+                pair,
+                affectingColumns,
+                timestampColumnName,
+                reverseWindowScaleUnits,
+                forwardWindowScaleUnits,
+                columnType,
+                componentType,
+                vectorType,
+                formulaColumnMap,
+                tableDef);
     }
 
     @Override
@@ -187,6 +198,8 @@ public UpdateByOperator copy() {
                 timestampColumnName,
                 reverseWindowScaleUnits,
                 forwardWindowScaleUnits,
+                inputColumnType,
+                inputComponentType,
                 inputVectorType,
                 formulaColumnMap,
                 tableDef);
diff --git a/engine/table/src/main/java/io/deephaven/engine/table/impl/updateby/rollingformula/ByteRollingFormulaOperator.java b/engine/table/src/main/java/io/deephaven/engine/table/impl/updateby/rollingformula/ByteRollingFormulaOperator.java
index 4cb47097afa..477d949f647 100644
--- a/engine/table/src/main/java/io/deephaven/engine/table/impl/updateby/rollingformula/ByteRollingFormulaOperator.java
+++ b/engine/table/src/main/java/io/deephaven/engine/table/impl/updateby/rollingformula/ByteRollingFormulaOperator.java
@@ -48,7 +48,6 @@ public class ByteRollingFormulaOperator extends BaseRollingFormulaOperator {
     // endregion extra-fields
 
     protected class Context extends BaseRollingFormulaOperator.Context {
-        private final ColumnSource<?> formulaOutputSource;
         private final IntConsumer outputSetter;
 
         private ByteChunk<? extends Values> influencerValuesChunk;
@@ -71,7 +70,8 @@ protected Context(final int affectedChunkSize, final int influencerChunkSize) {
             formulaCopy.initInputs(RowSetFactory.flat(1).toTracking(),
                     Collections.singletonMap(PARAM_COLUMN_NAME, formulaInputSource));
 
-            formulaOutputSource = ReinterpretUtils.maybeConvertToPrimitive(formulaCopy.getDataView());
+            final ColumnSource<?> formulaOutputSource =
+                    ReinterpretUtils.maybeConvertToPrimitive(formulaCopy.getDataView());
             outputSetter = getChunkSetter(outputValues, formulaOutputSource);
         }
 
@@ -169,8 +169,17 @@ public ByteRollingFormulaOperator(
     // region extra-constructor-args
     // endregion extra-constructor-args
     ) {
-        super(pair, affectingColumns, timestampColumnName, reverseWindowScaleUnits, forwardWindowScaleUnits, formula,
-                paramToken, formulaColumnMap, tableDef, compilationProcessor);
+        super(
+                pair,
+                affectingColumns,
+                timestampColumnName,
+                reverseWindowScaleUnits,
+                forwardWindowScaleUnits,
+                formula,
+                paramToken,
+                formulaColumnMap,
+                tableDef,
+                compilationProcessor);
         // region constructor
         // endregion constructor
     }
@@ -181,14 +190,25 @@ protected ByteRollingFormulaOperator(
             @Nullable final String timestampColumnName,
             final long reverseWindowScaleUnits,
             final long forwardWindowScaleUnits,
+            final Class<?> columnType,
+            final Class<?> componentType,
             final Class<?> vectorType,
             @NotNull final Map<Class<?>, FormulaColumn> formulaColumnMap,
             @NotNull final TableDefinition tableDef
     // region extra-constructor-args
     // endregion extra-constructor-args
     ) {
-        super(pair, affectingColumns, timestampColumnName, reverseWindowScaleUnits, forwardWindowScaleUnits, vectorType,
-                formulaColumnMap, tableDef);
+        super(
+                pair,
+                affectingColumns,
+                timestampColumnName,
+                reverseWindowScaleUnits,
+                forwardWindowScaleUnits,
+                columnType,
+                componentType,
+                vectorType,
+                formulaColumnMap,
+                tableDef);
         // region constructor
         // endregion constructor
     }
@@ -200,6 +220,8 @@ public UpdateByOperator copy() {
                 timestampColumnName,
                 reverseWindowScaleUnits,
                 forwardWindowScaleUnits,
+                inputColumnType,
+                inputComponentType,
                 inputVectorType,
                 formulaColumnMap,
                 tableDef
diff --git a/engine/table/src/main/java/io/deephaven/engine/table/impl/updateby/rollingformula/CharRollingFormulaOperator.java b/engine/table/src/main/java/io/deephaven/engine/table/impl/updateby/rollingformula/CharRollingFormulaOperator.java
index 7018c431482..1882f881aad 100644
--- a/engine/table/src/main/java/io/deephaven/engine/table/impl/updateby/rollingformula/CharRollingFormulaOperator.java
+++ b/engine/table/src/main/java/io/deephaven/engine/table/impl/updateby/rollingformula/CharRollingFormulaOperator.java
@@ -44,7 +44,6 @@ public class CharRollingFormulaOperator extends BaseRollingFormulaOperator {
     // endregion extra-fields
 
     protected class Context extends BaseRollingFormulaOperator.Context {
-        private final ColumnSource<?> formulaOutputSource;
         private final IntConsumer outputSetter;
 
         private CharChunk<? extends Values> influencerValuesChunk;
@@ -67,7 +66,8 @@ protected Context(final int affectedChunkSize, final int influencerChunkSize) {
             formulaCopy.initInputs(RowSetFactory.flat(1).toTracking(),
                     Collections.singletonMap(PARAM_COLUMN_NAME, formulaInputSource));
 
-            formulaOutputSource = ReinterpretUtils.maybeConvertToPrimitive(formulaCopy.getDataView());
+            final ColumnSource<?> formulaOutputSource =
+                    ReinterpretUtils.maybeConvertToPrimitive(formulaCopy.getDataView());
             outputSetter = getChunkSetter(outputValues, formulaOutputSource);
         }
 
@@ -165,8 +165,17 @@ public CharRollingFormulaOperator(
     // region extra-constructor-args
     // endregion extra-constructor-args
     ) {
-        super(pair, affectingColumns, timestampColumnName, reverseWindowScaleUnits, forwardWindowScaleUnits, formula,
-                paramToken, formulaColumnMap, tableDef, compilationProcessor);
+        super(
+                pair,
+                affectingColumns,
+                timestampColumnName,
+                reverseWindowScaleUnits,
+                forwardWindowScaleUnits,
+                formula,
+                paramToken,
+                formulaColumnMap,
+                tableDef,
+                compilationProcessor);
         // region constructor
         // endregion constructor
     }
@@ -177,14 +186,25 @@ protected CharRollingFormulaOperator(
             @Nullable final String timestampColumnName,
             final long reverseWindowScaleUnits,
             final long forwardWindowScaleUnits,
+            final Class<?> columnType,
+            final Class<?> componentType,
             final Class<?> vectorType,
             @NotNull final Map<Class<?>, FormulaColumn> formulaColumnMap,
             @NotNull final TableDefinition tableDef
     // region extra-constructor-args
     // endregion extra-constructor-args
     ) {
-        super(pair, affectingColumns, timestampColumnName, reverseWindowScaleUnits, forwardWindowScaleUnits, vectorType,
-                formulaColumnMap, tableDef);
+        super(
+                pair,
+                affectingColumns,
+                timestampColumnName,
+                reverseWindowScaleUnits,
+                forwardWindowScaleUnits,
+                columnType,
+                componentType,
+                vectorType,
+                formulaColumnMap,
+                tableDef);
         // region constructor
         // endregion constructor
     }
@@ -196,6 +216,8 @@ public UpdateByOperator copy() {
                 timestampColumnName,
                 reverseWindowScaleUnits,
                 forwardWindowScaleUnits,
+                inputColumnType,
+                inputComponentType,
                 inputVectorType,
                 formulaColumnMap,
                 tableDef
diff --git a/engine/table/src/main/java/io/deephaven/engine/table/impl/updateby/rollingformula/DoubleRollingFormulaOperator.java b/engine/table/src/main/java/io/deephaven/engine/table/impl/updateby/rollingformula/DoubleRollingFormulaOperator.java
index bb0c449e394..2a4f4026415 100644
--- a/engine/table/src/main/java/io/deephaven/engine/table/impl/updateby/rollingformula/DoubleRollingFormulaOperator.java
+++ b/engine/table/src/main/java/io/deephaven/engine/table/impl/updateby/rollingformula/DoubleRollingFormulaOperator.java
@@ -48,7 +48,6 @@ public class DoubleRollingFormulaOperator extends BaseRollingFormulaOperator {
     // endregion extra-fields
 
     protected class Context extends BaseRollingFormulaOperator.Context {
-        private final ColumnSource<?> formulaOutputSource;
         private final IntConsumer outputSetter;
 
         private DoubleChunk<? extends Values> influencerValuesChunk;
@@ -71,7 +70,8 @@ protected Context(final int affectedChunkSize, final int influencerChunkSize) {
             formulaCopy.initInputs(RowSetFactory.flat(1).toTracking(),
                     Collections.singletonMap(PARAM_COLUMN_NAME, formulaInputSource));
 
-            formulaOutputSource = ReinterpretUtils.maybeConvertToPrimitive(formulaCopy.getDataView());
+            final ColumnSource<?> formulaOutputSource =
+                    ReinterpretUtils.maybeConvertToPrimitive(formulaCopy.getDataView());
             outputSetter = getChunkSetter(outputValues, formulaOutputSource);
         }
 
@@ -169,8 +169,17 @@ public DoubleRollingFormulaOperator(
     // region extra-constructor-args
     // endregion extra-constructor-args
     ) {
-        super(pair, affectingColumns, timestampColumnName, reverseWindowScaleUnits, forwardWindowScaleUnits, formula,
-                paramToken, formulaColumnMap, tableDef, compilationProcessor);
+        super(
+                pair,
+                affectingColumns,
+                timestampColumnName,
+                reverseWindowScaleUnits,
+                forwardWindowScaleUnits,
+                formula,
+                paramToken,
+                formulaColumnMap,
+                tableDef,
+                compilationProcessor);
         // region constructor
         // endregion constructor
     }
@@ -181,14 +190,25 @@ protected DoubleRollingFormulaOperator(
             @Nullable final String timestampColumnName,
             final long reverseWindowScaleUnits,
             final long forwardWindowScaleUnits,
+            final Class<?> columnType,
+            final Class<?> componentType,
             final Class<?> vectorType,
             @NotNull final Map<Class<?>, FormulaColumn> formulaColumnMap,
             @NotNull final TableDefinition tableDef
     // region extra-constructor-args
     // endregion extra-constructor-args
     ) {
-        super(pair, affectingColumns, timestampColumnName, reverseWindowScaleUnits, forwardWindowScaleUnits, vectorType,
-                formulaColumnMap, tableDef);
+        super(
+                pair,
+                affectingColumns,
+                timestampColumnName,
+                reverseWindowScaleUnits,
+                forwardWindowScaleUnits,
+                columnType,
+                componentType,
+                vectorType,
+                formulaColumnMap,
+                tableDef);
         // region constructor
         // endregion constructor
     }
@@ -200,6 +220,8 @@ public UpdateByOperator copy() {
                 timestampColumnName,
                 reverseWindowScaleUnits,
                 forwardWindowScaleUnits,
+                inputColumnType,
+                inputComponentType,
                 inputVectorType,
                 formulaColumnMap,
                 tableDef
diff --git a/engine/table/src/main/java/io/deephaven/engine/table/impl/updateby/rollingformula/FloatRollingFormulaOperator.java b/engine/table/src/main/java/io/deephaven/engine/table/impl/updateby/rollingformula/FloatRollingFormulaOperator.java
index 66a65898978..398685f8da9 100644
--- a/engine/table/src/main/java/io/deephaven/engine/table/impl/updateby/rollingformula/FloatRollingFormulaOperator.java
+++ b/engine/table/src/main/java/io/deephaven/engine/table/impl/updateby/rollingformula/FloatRollingFormulaOperator.java
@@ -48,7 +48,6 @@ public class FloatRollingFormulaOperator extends BaseRollingFormulaOperator {
     // endregion extra-fields
 
     protected class Context extends BaseRollingFormulaOperator.Context {
-        private final ColumnSource<?> formulaOutputSource;
         private final IntConsumer outputSetter;
 
         private FloatChunk<? extends Values> influencerValuesChunk;
@@ -71,7 +70,8 @@ protected Context(final int affectedChunkSize, final int influencerChunkSize) {
             formulaCopy.initInputs(RowSetFactory.flat(1).toTracking(),
                     Collections.singletonMap(PARAM_COLUMN_NAME, formulaInputSource));
 
-            formulaOutputSource = ReinterpretUtils.maybeConvertToPrimitive(formulaCopy.getDataView());
+            final ColumnSource<?> formulaOutputSource =
+                    ReinterpretUtils.maybeConvertToPrimitive(formulaCopy.getDataView());
             outputSetter = getChunkSetter(outputValues, formulaOutputSource);
         }
 
@@ -169,8 +169,17 @@ public FloatRollingFormulaOperator(
     // region extra-constructor-args
     // endregion extra-constructor-args
     ) {
-        super(pair, affectingColumns, timestampColumnName, reverseWindowScaleUnits, forwardWindowScaleUnits, formula,
-                paramToken, formulaColumnMap, tableDef, compilationProcessor);
+        super(
+                pair,
+                affectingColumns,
+                timestampColumnName,
+                reverseWindowScaleUnits,
+                forwardWindowScaleUnits,
+                formula,
+                paramToken,
+                formulaColumnMap,
+                tableDef,
+                compilationProcessor);
         // region constructor
         // endregion constructor
     }
@@ -181,14 +190,25 @@ protected FloatRollingFormulaOperator(
             @Nullable final String timestampColumnName,
             final long reverseWindowScaleUnits,
             final long forwardWindowScaleUnits,
+            final Class<?> columnType,
+            final Class<?> componentType,
             final Class<?> vectorType,
             @NotNull final Map<Class<?>, FormulaColumn> formulaColumnMap,
             @NotNull final TableDefinition tableDef
     // region extra-constructor-args
     // endregion extra-constructor-args
     ) {
-        super(pair, affectingColumns, timestampColumnName, reverseWindowScaleUnits, forwardWindowScaleUnits, vectorType,
-                formulaColumnMap, tableDef);
+        super(
+                pair,
+                affectingColumns,
+                timestampColumnName,
+                reverseWindowScaleUnits,
+                forwardWindowScaleUnits,
+                columnType,
+                componentType,
+                vectorType,
+                formulaColumnMap,
+                tableDef);
         // region constructor
         // endregion constructor
     }
@@ -200,6 +220,8 @@ public UpdateByOperator copy() {
                 timestampColumnName,
                 reverseWindowScaleUnits,
                 forwardWindowScaleUnits,
+                inputColumnType,
+                inputComponentType,
                 inputVectorType,
                 formulaColumnMap,
                 tableDef
diff --git a/engine/table/src/main/java/io/deephaven/engine/table/impl/updateby/rollingformula/IntRollingFormulaOperator.java b/engine/table/src/main/java/io/deephaven/engine/table/impl/updateby/rollingformula/IntRollingFormulaOperator.java
index c0b07b52af9..e3b432dde19 100644
--- a/engine/table/src/main/java/io/deephaven/engine/table/impl/updateby/rollingformula/IntRollingFormulaOperator.java
+++ b/engine/table/src/main/java/io/deephaven/engine/table/impl/updateby/rollingformula/IntRollingFormulaOperator.java
@@ -48,7 +48,6 @@ public class IntRollingFormulaOperator extends BaseRollingFormulaOperator {
     // endregion extra-fields
 
     protected class Context extends BaseRollingFormulaOperator.Context {
-        private final ColumnSource<?> formulaOutputSource;
         private final IntConsumer outputSetter;
 
         private IntChunk<? extends Values> influencerValuesChunk;
@@ -71,7 +70,8 @@ protected Context(final int affectedChunkSize, final int influencerChunkSize) {
             formulaCopy.initInputs(RowSetFactory.flat(1).toTracking(),
                     Collections.singletonMap(PARAM_COLUMN_NAME, formulaInputSource));
 
-            formulaOutputSource = ReinterpretUtils.maybeConvertToPrimitive(formulaCopy.getDataView());
+            final ColumnSource<?> formulaOutputSource =
+                    ReinterpretUtils.maybeConvertToPrimitive(formulaCopy.getDataView());
             outputSetter = getChunkSetter(outputValues, formulaOutputSource);
         }
 
@@ -169,8 +169,17 @@ public IntRollingFormulaOperator(
     // region extra-constructor-args
     // endregion extra-constructor-args
     ) {
-        super(pair, affectingColumns, timestampColumnName, reverseWindowScaleUnits, forwardWindowScaleUnits, formula,
-                paramToken, formulaColumnMap, tableDef, compilationProcessor);
+        super(
+                pair,
+                affectingColumns,
+                timestampColumnName,
+                reverseWindowScaleUnits,
+                forwardWindowScaleUnits,
+                formula,
+                paramToken,
+                formulaColumnMap,
+                tableDef,
+                compilationProcessor);
         // region constructor
         // endregion constructor
     }
@@ -181,14 +190,25 @@ protected IntRollingFormulaOperator(
             @Nullable final String timestampColumnName,
             final long reverseWindowScaleUnits,
             final long forwardWindowScaleUnits,
+            final Class<?> columnType,
+            final Class<?> componentType,
             final Class<?> vectorType,
             @NotNull final Map<Class<?>, FormulaColumn> formulaColumnMap,
             @NotNull final TableDefinition tableDef
     // region extra-constructor-args
     // endregion extra-constructor-args
     ) {
-        super(pair, affectingColumns, timestampColumnName, reverseWindowScaleUnits, forwardWindowScaleUnits, vectorType,
-                formulaColumnMap, tableDef);
+        super(
+                pair,
+                affectingColumns,
+                timestampColumnName,
+                reverseWindowScaleUnits,
+                forwardWindowScaleUnits,
+                columnType,
+                componentType,
+                vectorType,
+                formulaColumnMap,
+                tableDef);
         // region constructor
         // endregion constructor
     }
@@ -200,6 +220,8 @@ public UpdateByOperator copy() {
                 timestampColumnName,
                 reverseWindowScaleUnits,
                 forwardWindowScaleUnits,
+                inputColumnType,
+                inputComponentType,
                 inputVectorType,
                 formulaColumnMap,
                 tableDef
diff --git a/engine/table/src/main/java/io/deephaven/engine/table/impl/updateby/rollingformula/LongRollingFormulaOperator.java b/engine/table/src/main/java/io/deephaven/engine/table/impl/updateby/rollingformula/LongRollingFormulaOperator.java
index 9b3eb63de7b..dc2051b2701 100644
--- a/engine/table/src/main/java/io/deephaven/engine/table/impl/updateby/rollingformula/LongRollingFormulaOperator.java
+++ b/engine/table/src/main/java/io/deephaven/engine/table/impl/updateby/rollingformula/LongRollingFormulaOperator.java
@@ -48,7 +48,6 @@ public class LongRollingFormulaOperator extends BaseRollingFormulaOperator {
     // endregion extra-fields
 
     protected class Context extends BaseRollingFormulaOperator.Context {
-        private final ColumnSource<?> formulaOutputSource;
         private final IntConsumer outputSetter;
 
         private LongChunk<? extends Values> influencerValuesChunk;
@@ -71,7 +70,8 @@ protected Context(final int affectedChunkSize, final int influencerChunkSize) {
             formulaCopy.initInputs(RowSetFactory.flat(1).toTracking(),
                     Collections.singletonMap(PARAM_COLUMN_NAME, formulaInputSource));
 
-            formulaOutputSource = ReinterpretUtils.maybeConvertToPrimitive(formulaCopy.getDataView());
+            final ColumnSource<?> formulaOutputSource =
+                    ReinterpretUtils.maybeConvertToPrimitive(formulaCopy.getDataView());
             outputSetter = getChunkSetter(outputValues, formulaOutputSource);
         }
 
@@ -169,8 +169,17 @@ public LongRollingFormulaOperator(
     // region extra-constructor-args
     // endregion extra-constructor-args
     ) {
-        super(pair, affectingColumns, timestampColumnName, reverseWindowScaleUnits, forwardWindowScaleUnits, formula,
-                paramToken, formulaColumnMap, tableDef, compilationProcessor);
+        super(
+                pair,
+                affectingColumns,
+                timestampColumnName,
+                reverseWindowScaleUnits,
+                forwardWindowScaleUnits,
+                formula,
+                paramToken,
+                formulaColumnMap,
+                tableDef,
+                compilationProcessor);
         // region constructor
         // endregion constructor
     }
@@ -181,14 +190,25 @@ protected LongRollingFormulaOperator(
             @Nullable final String timestampColumnName,
             final long reverseWindowScaleUnits,
             final long forwardWindowScaleUnits,
+            final Class<?> columnType,
+            final Class<?> componentType,
             final Class<?> vectorType,
             @NotNull final Map<Class<?>, FormulaColumn> formulaColumnMap,
             @NotNull final TableDefinition tableDef
     // region extra-constructor-args
     // endregion extra-constructor-args
     ) {
-        super(pair, affectingColumns, timestampColumnName, reverseWindowScaleUnits, forwardWindowScaleUnits, vectorType,
-                formulaColumnMap, tableDef);
+        super(
+                pair,
+                affectingColumns,
+                timestampColumnName,
+                reverseWindowScaleUnits,
+                forwardWindowScaleUnits,
+                columnType,
+                componentType,
+                vectorType,
+                formulaColumnMap,
+                tableDef);
         // region constructor
         // endregion constructor
     }
@@ -200,6 +220,8 @@ public UpdateByOperator copy() {
                 timestampColumnName,
                 reverseWindowScaleUnits,
                 forwardWindowScaleUnits,
+                inputColumnType,
+                inputComponentType,
                 inputVectorType,
                 formulaColumnMap,
                 tableDef
diff --git a/engine/table/src/main/java/io/deephaven/engine/table/impl/updateby/rollingformula/ObjectRollingFormulaOperator.java b/engine/table/src/main/java/io/deephaven/engine/table/impl/updateby/rollingformula/ObjectRollingFormulaOperator.java
index 8b062025e52..c344a150ca5 100644
--- a/engine/table/src/main/java/io/deephaven/engine/table/impl/updateby/rollingformula/ObjectRollingFormulaOperator.java
+++ b/engine/table/src/main/java/io/deephaven/engine/table/impl/updateby/rollingformula/ObjectRollingFormulaOperator.java
@@ -13,7 +13,6 @@
 import io.deephaven.engine.rowset.RowSequence;
 import io.deephaven.engine.rowset.RowSetFactory;
 import io.deephaven.engine.rowset.chunkattributes.OrderedRowKeys;
-import io.deephaven.engine.table.ColumnSource;
 import io.deephaven.engine.table.TableDefinition;
 import io.deephaven.engine.table.impl.MatchPair;
 import io.deephaven.engine.table.impl.QueryCompilerRequestProcessor;
@@ -43,7 +42,6 @@ public class ObjectRollingFormulaOperator<T> extends BaseRollingFormulaOperator
     // endregion extra-fields
 
     protected class Context extends BaseRollingFormulaOperator.Context {
-        private final ColumnSource<?> formulaOutputSource;
         private final IntConsumer outputSetter;
 
         private ObjectChunk<T, ? extends Values> influencerValuesChunk;
@@ -62,12 +60,12 @@ protected Context(final int affectedChunkSize, final int influencerChunkSize) {
             final SingleValueColumnSource<ObjectVector<?>> formulaInputSource =
                     (SingleValueColumnSource<ObjectVector<?>>) SingleValueColumnSource
                             .getSingleValueColumnSource(inputVectorType);
-            formulaInputSource.set(new ObjectRingBufferVectorWrapper(windowValues, inputVectorType));
+            // noinspection rawtypes
+            formulaInputSource.set(new ObjectRingBufferVectorWrapper(windowValues, inputComponentType));
             formulaCopy.initInputs(RowSetFactory.flat(1).toTracking(),
                     Collections.singletonMap(PARAM_COLUMN_NAME, formulaInputSource));
 
-            formulaOutputSource = formulaCopy.getDataView();
-            outputSetter = getChunkSetter(outputValues, formulaOutputSource);
+            outputSetter = getChunkSetter(outputValues, formulaCopy.getDataView());
         }
 
         @Override
@@ -172,11 +170,22 @@ protected ObjectRollingFormulaOperator(
             @Nullable final String timestampColumnName,
             final long reverseWindowScaleUnits,
             final long forwardWindowScaleUnits,
+            final Class<?> columnType,
+            final Class<?> componentType,
             final Class<?> vectorType,
             @NotNull final Map<Class<?>, FormulaColumn> formulaColumnMap,
             @NotNull final TableDefinition tableDef) {
-        super(pair, affectingColumns, timestampColumnName, reverseWindowScaleUnits, forwardWindowScaleUnits, vectorType,
-                formulaColumnMap, tableDef);
+        super(
+                pair,
+                affectingColumns,
+                timestampColumnName,
+                reverseWindowScaleUnits,
+                forwardWindowScaleUnits,
+                columnType,
+                componentType,
+                vectorType,
+                formulaColumnMap,
+                tableDef);
     }
 
     @Override
@@ -186,6 +195,8 @@ public UpdateByOperator copy() {
                 timestampColumnName,
                 reverseWindowScaleUnits,
                 forwardWindowScaleUnits,
+                inputColumnType,
+                inputComponentType,
                 inputVectorType,
                 formulaColumnMap,
                 tableDef);
diff --git a/engine/table/src/main/java/io/deephaven/engine/table/impl/updateby/rollingformula/ShortRollingFormulaOperator.java b/engine/table/src/main/java/io/deephaven/engine/table/impl/updateby/rollingformula/ShortRollingFormulaOperator.java
index 7cce65c7cb5..1ab9962c011 100644
--- a/engine/table/src/main/java/io/deephaven/engine/table/impl/updateby/rollingformula/ShortRollingFormulaOperator.java
+++ b/engine/table/src/main/java/io/deephaven/engine/table/impl/updateby/rollingformula/ShortRollingFormulaOperator.java
@@ -48,7 +48,6 @@ public class ShortRollingFormulaOperator extends BaseRollingFormulaOperator {
     // endregion extra-fields
 
     protected class Context extends BaseRollingFormulaOperator.Context {
-        private final ColumnSource<?> formulaOutputSource;
         private final IntConsumer outputSetter;
 
         private ShortChunk<? extends Values> influencerValuesChunk;
@@ -71,7 +70,8 @@ protected Context(final int affectedChunkSize, final int influencerChunkSize) {
             formulaCopy.initInputs(RowSetFactory.flat(1).toTracking(),
                     Collections.singletonMap(PARAM_COLUMN_NAME, formulaInputSource));
 
-            formulaOutputSource = ReinterpretUtils.maybeConvertToPrimitive(formulaCopy.getDataView());
+            final ColumnSource<?> formulaOutputSource =
+                    ReinterpretUtils.maybeConvertToPrimitive(formulaCopy.getDataView());
             outputSetter = getChunkSetter(outputValues, formulaOutputSource);
         }
 
@@ -169,8 +169,17 @@ public ShortRollingFormulaOperator(
     // region extra-constructor-args
     // endregion extra-constructor-args
     ) {
-        super(pair, affectingColumns, timestampColumnName, reverseWindowScaleUnits, forwardWindowScaleUnits, formula,
-                paramToken, formulaColumnMap, tableDef, compilationProcessor);
+        super(
+                pair,
+                affectingColumns,
+                timestampColumnName,
+                reverseWindowScaleUnits,
+                forwardWindowScaleUnits,
+                formula,
+                paramToken,
+                formulaColumnMap,
+                tableDef,
+                compilationProcessor);
         // region constructor
         // endregion constructor
     }
@@ -181,14 +190,25 @@ protected ShortRollingFormulaOperator(
             @Nullable final String timestampColumnName,
             final long reverseWindowScaleUnits,
             final long forwardWindowScaleUnits,
+            final Class<?> columnType,
+            final Class<?> componentType,
             final Class<?> vectorType,
             @NotNull final Map<Class<?>, FormulaColumn> formulaColumnMap,
             @NotNull final TableDefinition tableDef
     // region extra-constructor-args
     // endregion extra-constructor-args
     ) {
-        super(pair, affectingColumns, timestampColumnName, reverseWindowScaleUnits, forwardWindowScaleUnits, vectorType,
-                formulaColumnMap, tableDef);
+        super(
+                pair,
+                affectingColumns,
+                timestampColumnName,
+                reverseWindowScaleUnits,
+                forwardWindowScaleUnits,
+                columnType,
+                componentType,
+                vectorType,
+                formulaColumnMap,
+                tableDef);
         // region constructor
         // endregion constructor
     }
@@ -200,6 +220,8 @@ public UpdateByOperator copy() {
                 timestampColumnName,
                 reverseWindowScaleUnits,
                 forwardWindowScaleUnits,
+                inputColumnType,
+                inputComponentType,
                 inputVectorType,
                 formulaColumnMap,
                 tableDef
diff --git a/engine/table/src/main/java/io/deephaven/engine/table/impl/updateby/rollingformula/ringbuffervectorwrapper/ByteRingBufferVectorWrapper.java b/engine/table/src/main/java/io/deephaven/engine/table/impl/updateby/rollingformula/ringbuffervectorwrapper/ByteRingBufferVectorWrapper.java
index 5fc15cb3280..e3323a3a689 100644
--- a/engine/table/src/main/java/io/deephaven/engine/table/impl/updateby/rollingformula/ringbuffervectorwrapper/ByteRingBufferVectorWrapper.java
+++ b/engine/table/src/main/java/io/deephaven/engine/table/impl/updateby/rollingformula/ringbuffervectorwrapper/ByteRingBufferVectorWrapper.java
@@ -13,7 +13,7 @@
 import io.deephaven.vector.ByteVectorDirect;
 import io.deephaven.vector.ByteVectorSlice;
 
-public class ByteRingBufferVectorWrapper implements ByteVector, RingBufferVectorWrapper {
+public class ByteRingBufferVectorWrapper implements ByteVector, RingBufferVectorWrapper<ByteVector> {
     private final ByteRingBuffer ringBuffer;
 
     public ByteRingBufferVectorWrapper(final ByteRingBuffer ringBuffer) {
diff --git a/engine/table/src/main/java/io/deephaven/engine/table/impl/updateby/rollingformula/ringbuffervectorwrapper/CharRingBufferVectorWrapper.java b/engine/table/src/main/java/io/deephaven/engine/table/impl/updateby/rollingformula/ringbuffervectorwrapper/CharRingBufferVectorWrapper.java
index b30dd79b925..6c1cb68a3c2 100644
--- a/engine/table/src/main/java/io/deephaven/engine/table/impl/updateby/rollingformula/ringbuffervectorwrapper/CharRingBufferVectorWrapper.java
+++ b/engine/table/src/main/java/io/deephaven/engine/table/impl/updateby/rollingformula/ringbuffervectorwrapper/CharRingBufferVectorWrapper.java
@@ -9,7 +9,7 @@
 import io.deephaven.vector.CharVectorDirect;
 import io.deephaven.vector.CharVectorSlice;
 
-public class CharRingBufferVectorWrapper implements CharVector, RingBufferVectorWrapper {
+public class CharRingBufferVectorWrapper implements CharVector, RingBufferVectorWrapper<CharVector> {
     private final CharRingBuffer ringBuffer;
 
     public CharRingBufferVectorWrapper(final CharRingBuffer ringBuffer) {
diff --git a/engine/table/src/main/java/io/deephaven/engine/table/impl/updateby/rollingformula/ringbuffervectorwrapper/DoubleRingBufferVectorWrapper.java b/engine/table/src/main/java/io/deephaven/engine/table/impl/updateby/rollingformula/ringbuffervectorwrapper/DoubleRingBufferVectorWrapper.java
index b2e07f33a4e..b8a336a1117 100644
--- a/engine/table/src/main/java/io/deephaven/engine/table/impl/updateby/rollingformula/ringbuffervectorwrapper/DoubleRingBufferVectorWrapper.java
+++ b/engine/table/src/main/java/io/deephaven/engine/table/impl/updateby/rollingformula/ringbuffervectorwrapper/DoubleRingBufferVectorWrapper.java
@@ -13,7 +13,7 @@
 import io.deephaven.vector.DoubleVectorDirect;
 import io.deephaven.vector.DoubleVectorSlice;
 
-public class DoubleRingBufferVectorWrapper implements DoubleVector, RingBufferVectorWrapper {
+public class DoubleRingBufferVectorWrapper implements DoubleVector, RingBufferVectorWrapper<DoubleVector> {
     private final DoubleRingBuffer ringBuffer;
 
     public DoubleRingBufferVectorWrapper(final DoubleRingBuffer ringBuffer) {
diff --git a/engine/table/src/main/java/io/deephaven/engine/table/impl/updateby/rollingformula/ringbuffervectorwrapper/FloatRingBufferVectorWrapper.java b/engine/table/src/main/java/io/deephaven/engine/table/impl/updateby/rollingformula/ringbuffervectorwrapper/FloatRingBufferVectorWrapper.java
index 1e636dfe397..46f92a96db5 100644
--- a/engine/table/src/main/java/io/deephaven/engine/table/impl/updateby/rollingformula/ringbuffervectorwrapper/FloatRingBufferVectorWrapper.java
+++ b/engine/table/src/main/java/io/deephaven/engine/table/impl/updateby/rollingformula/ringbuffervectorwrapper/FloatRingBufferVectorWrapper.java
@@ -13,7 +13,7 @@
 import io.deephaven.vector.FloatVectorDirect;
 import io.deephaven.vector.FloatVectorSlice;
 
-public class FloatRingBufferVectorWrapper implements FloatVector, RingBufferVectorWrapper {
+public class FloatRingBufferVectorWrapper implements FloatVector, RingBufferVectorWrapper<FloatVector> {
     private final FloatRingBuffer ringBuffer;
 
     public FloatRingBufferVectorWrapper(final FloatRingBuffer ringBuffer) {
diff --git a/engine/table/src/main/java/io/deephaven/engine/table/impl/updateby/rollingformula/ringbuffervectorwrapper/IntRingBufferVectorWrapper.java b/engine/table/src/main/java/io/deephaven/engine/table/impl/updateby/rollingformula/ringbuffervectorwrapper/IntRingBufferVectorWrapper.java
index 28c33bb0c22..6c150a43949 100644
--- a/engine/table/src/main/java/io/deephaven/engine/table/impl/updateby/rollingformula/ringbuffervectorwrapper/IntRingBufferVectorWrapper.java
+++ b/engine/table/src/main/java/io/deephaven/engine/table/impl/updateby/rollingformula/ringbuffervectorwrapper/IntRingBufferVectorWrapper.java
@@ -13,7 +13,7 @@
 import io.deephaven.vector.IntVectorDirect;
 import io.deephaven.vector.IntVectorSlice;
 
-public class IntRingBufferVectorWrapper implements IntVector, RingBufferVectorWrapper {
+public class IntRingBufferVectorWrapper implements IntVector, RingBufferVectorWrapper<IntVector> {
     private final IntRingBuffer ringBuffer;
 
     public IntRingBufferVectorWrapper(final IntRingBuffer ringBuffer) {
diff --git a/engine/table/src/main/java/io/deephaven/engine/table/impl/updateby/rollingformula/ringbuffervectorwrapper/LongRingBufferVectorWrapper.java b/engine/table/src/main/java/io/deephaven/engine/table/impl/updateby/rollingformula/ringbuffervectorwrapper/LongRingBufferVectorWrapper.java
index b7e2a838d3d..719c355af87 100644
--- a/engine/table/src/main/java/io/deephaven/engine/table/impl/updateby/rollingformula/ringbuffervectorwrapper/LongRingBufferVectorWrapper.java
+++ b/engine/table/src/main/java/io/deephaven/engine/table/impl/updateby/rollingformula/ringbuffervectorwrapper/LongRingBufferVectorWrapper.java
@@ -13,7 +13,7 @@
 import io.deephaven.vector.LongVectorDirect;
 import io.deephaven.vector.LongVectorSlice;
 
-public class LongRingBufferVectorWrapper implements LongVector, RingBufferVectorWrapper {
+public class LongRingBufferVectorWrapper implements LongVector, RingBufferVectorWrapper<LongVector> {
     private final LongRingBuffer ringBuffer;
 
     public LongRingBufferVectorWrapper(final LongRingBuffer ringBuffer) {
diff --git a/engine/table/src/main/java/io/deephaven/engine/table/impl/updateby/rollingformula/ringbuffervectorwrapper/ObjectRingBufferVectorWrapper.java b/engine/table/src/main/java/io/deephaven/engine/table/impl/updateby/rollingformula/ringbuffervectorwrapper/ObjectRingBufferVectorWrapper.java
index fde4452e6ea..775f792e82c 100644
--- a/engine/table/src/main/java/io/deephaven/engine/table/impl/updateby/rollingformula/ringbuffervectorwrapper/ObjectRingBufferVectorWrapper.java
+++ b/engine/table/src/main/java/io/deephaven/engine/table/impl/updateby/rollingformula/ringbuffervectorwrapper/ObjectRingBufferVectorWrapper.java
@@ -9,7 +9,7 @@
 import io.deephaven.vector.ObjectVectorDirect;
 import io.deephaven.vector.ObjectVectorSlice;
 
-public class ObjectRingBufferVectorWrapper<T> implements ObjectVector<T>, RingBufferVectorWrapper {
+public class ObjectRingBufferVectorWrapper<T> implements ObjectVector<T>, RingBufferVectorWrapper<ObjectVector<T>> {
     private final ObjectRingBuffer<T> ringBuffer;
     private final Class<T> componentType;
 
diff --git a/engine/table/src/main/java/io/deephaven/engine/table/impl/updateby/rollingformula/ringbuffervectorwrapper/RingBufferVectorWrapper.java b/engine/table/src/main/java/io/deephaven/engine/table/impl/updateby/rollingformula/ringbuffervectorwrapper/RingBufferVectorWrapper.java
index 48892888ac0..88932bde0af 100644
--- a/engine/table/src/main/java/io/deephaven/engine/table/impl/updateby/rollingformula/ringbuffervectorwrapper/RingBufferVectorWrapper.java
+++ b/engine/table/src/main/java/io/deephaven/engine/table/impl/updateby/rollingformula/ringbuffervectorwrapper/RingBufferVectorWrapper.java
@@ -3,5 +3,43 @@
 //
 package io.deephaven.engine.table.impl.updateby.rollingformula.ringbuffervectorwrapper;
 
-public interface RingBufferVectorWrapper {
+import io.deephaven.base.ringbuffer.*;
+import io.deephaven.vector.Vector;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
+
+/**
+ * This helper class will expose a {@link Vector} interface for a {@link RingBuffer}.
+ */
+public interface RingBufferVectorWrapper<T extends Vector<T>> extends Vector<T> {
+    /**
+     * Create a {@link RingBufferVectorWrapper} for the given {@link RingBuffer}. Optionally, a component type can be
+     * supplied (although it will be ignored for all wrappers but {@link ObjectRingBufferVectorWrapper}).
+     */
+    static <T extends Vector<T>> RingBufferVectorWrapper<T> makeRingBufferVectorWrapper(
+            @NotNull final RingBuffer buffer,
+            @Nullable final Class<?> componentType) {
+        final RingBufferVectorWrapper<?> result;
+        final Class<?> bufferClass = buffer.getClass();
+        if (bufferClass == CharRingBuffer.class) {
+            result = new CharRingBufferVectorWrapper((CharRingBuffer) buffer);
+        } else if (bufferClass == ByteRingBuffer.class) {
+            result = new ByteRingBufferVectorWrapper((ByteRingBuffer) buffer);
+        } else if (bufferClass == DoubleRingBuffer.class) {
+            result = new DoubleRingBufferVectorWrapper((DoubleRingBuffer) buffer);
+        } else if (bufferClass == FloatRingBuffer.class) {
+            result = new FloatRingBufferVectorWrapper((FloatRingBuffer) buffer);
+        } else if (bufferClass == IntRingBuffer.class) {
+            result = new IntRingBufferVectorWrapper((IntRingBuffer) buffer);
+        } else if (bufferClass == LongRingBuffer.class) {
+            result = new LongRingBufferVectorWrapper((LongRingBuffer) buffer);
+        } else if (bufferClass == ShortRingBuffer.class) {
+            result = new ShortRingBufferVectorWrapper((ShortRingBuffer) buffer);
+        } else {
+            // noinspection unchecked
+            result = new ObjectRingBufferVectorWrapper<>((ObjectRingBuffer<T>) buffer, (Class<T>) componentType);
+        }
+        // noinspection unchecked
+        return (RingBufferVectorWrapper<T>) result;
+    }
 }
diff --git a/engine/table/src/main/java/io/deephaven/engine/table/impl/updateby/rollingformula/ringbuffervectorwrapper/ShortRingBufferVectorWrapper.java b/engine/table/src/main/java/io/deephaven/engine/table/impl/updateby/rollingformula/ringbuffervectorwrapper/ShortRingBufferVectorWrapper.java
index 35b36a303a6..29fb081133d 100644
--- a/engine/table/src/main/java/io/deephaven/engine/table/impl/updateby/rollingformula/ringbuffervectorwrapper/ShortRingBufferVectorWrapper.java
+++ b/engine/table/src/main/java/io/deephaven/engine/table/impl/updateby/rollingformula/ringbuffervectorwrapper/ShortRingBufferVectorWrapper.java
@@ -13,7 +13,7 @@
 import io.deephaven.vector.ShortVectorDirect;
 import io.deephaven.vector.ShortVectorSlice;
 
-public class ShortRingBufferVectorWrapper implements ShortVector, RingBufferVectorWrapper {
+public class ShortRingBufferVectorWrapper implements ShortVector, RingBufferVectorWrapper<ShortVector> {
     private final ShortRingBuffer ringBuffer;
 
     public ShortRingBufferVectorWrapper(final ShortRingBuffer ringBuffer) {
diff --git a/engine/table/src/main/java/io/deephaven/engine/table/impl/updateby/rollingformulamulticolumn/RollingFormulaMultiColumnOperator.java b/engine/table/src/main/java/io/deephaven/engine/table/impl/updateby/rollingformulamulticolumn/RollingFormulaMultiColumnOperator.java
new file mode 100644
index 00000000000..ca1effa60e3
--- /dev/null
+++ b/engine/table/src/main/java/io/deephaven/engine/table/impl/updateby/rollingformulamulticolumn/RollingFormulaMultiColumnOperator.java
@@ -0,0 +1,467 @@
+//
+// Copyright (c) 2016-2024 Deephaven Data Labs and Patent Pending
+//
+package io.deephaven.engine.table.impl.updateby.rollingformulamulticolumn;
+
+import io.deephaven.base.ringbuffer.*;
+import io.deephaven.chunk.*;
+import io.deephaven.chunk.attributes.Values;
+import io.deephaven.engine.rowset.RowSequence;
+import io.deephaven.engine.rowset.RowSet;
+import io.deephaven.engine.rowset.RowSetFactory;
+import io.deephaven.engine.rowset.chunkattributes.OrderedRowKeys;
+import io.deephaven.engine.table.*;
+import io.deephaven.engine.table.impl.MatchPair;
+import io.deephaven.engine.table.impl.select.SelectColumn;
+import io.deephaven.engine.table.impl.sources.*;
+import io.deephaven.engine.table.impl.updateby.UpdateByOperator;
+import io.deephaven.engine.table.impl.updateby.rollingformula.ringbuffervectorwrapper.RingBufferVectorWrapper;
+import io.deephaven.engine.table.impl.updateby.rollingformulamulticolumn.windowconsumer.RingBufferWindowConsumer;
+import io.deephaven.engine.table.impl.util.ChunkUtils;
+import io.deephaven.engine.table.impl.util.RowRedirection;
+import io.deephaven.vector.Vector;
+import org.apache.commons.lang3.ArrayUtils;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
+
+import java.util.*;
+import java.util.function.IntConsumer;
+
+import static io.deephaven.util.QueryConstants.*;
+
+public class RollingFormulaMultiColumnOperator extends UpdateByOperator {
+    private static final int BUFFER_INITIAL_CAPACITY = 512;
+
+    private final SelectColumn selectColumn;
+
+    private final String[] inputKeyColumnNames;
+    private final Class<?>[] inputKeyColumnTypes;
+    private final Class<?>[] inputKeyComponentTypes;
+
+    private final String[] inputNonKeyColumnNames;
+    private final Class<?>[] inputNonKeyColumnTypes;
+    private final Class<?>[] inputNonKeyVectorTypes;
+
+    private WritableColumnSource<?> primitiveOutputSource;
+    private WritableColumnSource<?> outputSource;
+    private WritableColumnSource<?> maybeInnerSource;
+    private ChunkType outputChunkType;
+
+    private class Context extends UpdateByOperator.Context {
+        private final ChunkSink.FillFromContext outputFillContext;
+        private final WritableChunk<? extends Values> outputValues;
+
+        private final IntConsumer outputSetter;
+        private final IntConsumer outputNullSetter;
+
+        @SuppressWarnings("rawtypes")
+        private final SingleValueColumnSource[] keyValueSources;
+        private final RingBufferWindowConsumer[] inputConsumers;
+
+        @SuppressWarnings("unused")
+        private Context(final int affectedChunkSize, final int influencerChunkSize) {
+            outputFillContext = primitiveOutputSource.makeFillFromContext(affectedChunkSize);
+            outputValues = outputChunkType.makeWritableChunk(affectedChunkSize);
+
+            // Make a copy of the operator formula column.
+            final SelectColumn contextSelectColumn = selectColumn.copy();
+
+            keyValueSources = new SingleValueColumnSource<?>[inputKeyColumnNames.length];
+            inputConsumers = new RingBufferWindowConsumer[inputNonKeyColumnNames.length];
+
+            // To perform the calculation, we will leverage SelectColumn and for its input sources we create a set of
+            // SingleValueColumnSources, each containing a Vector of values (or a scalar when the source is a key).
+            // These sources will contain exactly the values from the input columns that are appropriate for the output
+            // row given the window configuration and state. The formula column is evaluated once per output row and
+            // the result written to the output column source.
+
+            // The SingleValueColumnSources is backed by RingBuffers through use of a RingBufferVectorWrapper.
+            // The underlying RingBuffer is updated with the values from the input columns with assistance from
+            // the RingBufferWindowConsumer class, which abstracts the process of pushing and popping values from input
+            // column data chunks into the RingBuffer.
+
+            final Map<String, ColumnSource<?>> inputSources = new HashMap<>();
+
+            for (int i = 0; i < inputKeyColumnNames.length; i++) {
+                final String inputColumnName = inputKeyColumnNames[i];
+                final Class<?> inputColumnType = inputKeyColumnTypes[i];
+                final Class<?> inputComponentType = inputKeyComponentTypes[i];
+
+                // Create a single value column source wrapping a scalar of the appropriate type for this key.
+                keyValueSources[i] =
+                        SingleValueColumnSource.getSingleValueColumnSource(inputColumnType, inputComponentType);
+                inputSources.put(inputColumnName, keyValueSources[i]);
+            }
+
+            for (int i = 0; i < inputNonKeyColumnNames.length; i++) {
+                final String inputColumnName = inputNonKeyColumnNames[i];
+                final Class<?> inputColumnType = inputNonKeyColumnTypes[i];
+                final Class<?> inputVectorType = inputNonKeyVectorTypes[i];
+
+                // Create and store the ring buffer for the input column.
+                final RingBuffer ringBuffer = RingBuffer.makeRingBuffer(
+                        inputColumnType,
+                        BUFFER_INITIAL_CAPACITY,
+                        true);
+
+                // Create a single value column source wrapping the ring buffer.
+                // noinspection unchecked
+                final SingleValueColumnSource<Vector<?>> formulaInputSource =
+                        (SingleValueColumnSource<Vector<?>>) SingleValueColumnSource
+                                .getSingleValueColumnSource(inputVectorType, inputColumnType);
+                final RingBufferVectorWrapper<?> wrapper = RingBufferVectorWrapper.makeRingBufferVectorWrapper(
+                        ringBuffer,
+                        inputColumnType);
+                formulaInputSource.set(wrapper);
+                inputSources.put(inputColumnName, formulaInputSource);
+                inputConsumers[i] = RingBufferWindowConsumer.create(ringBuffer);
+            }
+
+            contextSelectColumn.initInputs(RowSetFactory.flat(1).toTracking(), inputSources);
+            final ColumnSource<?> formulaOutputSource =
+                    ReinterpretUtils.maybeConvertToPrimitive(contextSelectColumn.getDataView());
+
+            outputSetter = getChunkSetter(outputValues, formulaOutputSource);
+            outputNullSetter = getChunkNullSetter(outputValues);
+        }
+
+        @Override
+        protected void setValueChunks(@NotNull Chunk<? extends Values>[] valueChunks) {
+            for (int i = 0; i < inputConsumers.length; i++) {
+                inputConsumers[i].setInputChunk(valueChunks[i]);
+            }
+        }
+
+        @Override
+        protected void push(int pos, int count) {
+            throw new IllegalStateException("RollingFormulaMultiColumnOperator.Context.push should never be called.");
+        }
+
+        @Override
+        public void accumulateCumulative(
+                @NotNull final RowSequence inputKeys,
+                @NotNull final Chunk<? extends Values>[] valueChunkArr,
+                @Nullable final LongChunk<? extends Values> tsChunk,
+                final int len) {
+            throw new UnsupportedOperationException("RollingFormula is not supported in cumulative operations.");
+        }
+
+        @Override
+        public void accumulateRolling(
+                @NotNull final RowSequence inputKeys,
+                @NotNull final Chunk<? extends Values>[] influencerValueChunkArr,
+                @Nullable final LongChunk<OrderedRowKeys> affectedPosChunk,
+                @Nullable final LongChunk<OrderedRowKeys> influencerPosChunk,
+                @NotNull final IntChunk<? extends Values> pushChunk,
+                @NotNull final IntChunk<? extends Values> popChunk,
+                final int len) {
+
+            setValueChunks(influencerValueChunkArr);
+            setPosChunks(affectedPosChunk, influencerPosChunk);
+
+            int pushIndex = 0;
+
+            // chunk processing
+            for (int ii = 0; ii < len; ii++) {
+                final int pushCount = pushChunk.get(ii);
+                final int popCount = popChunk.get(ii);
+
+                if (pushCount == NULL_INT) {
+                    outputNullSetter.accept(ii);
+                    continue;
+                }
+
+                // pop for this row
+                if (popCount > 0) {
+                    for (RingBufferWindowConsumer consumer : inputConsumers) {
+                        consumer.pop(popCount);
+                    }
+                }
+
+                // push for this row
+                if (pushCount > 0) {
+                    for (RingBufferWindowConsumer consumer : inputConsumers) {
+                        consumer.push(pushIndex, pushCount);
+                    }
+                    pushIndex += pushCount;
+                }
+
+                // If not empty (even if completely full of null), run the formula over the window values.
+                outputSetter.accept(ii);
+            }
+
+            // chunk output to column
+            writeToOutputColumn(inputKeys);
+        }
+
+        @Override
+        protected void writeToOutputChunk(int outIdx) {
+            throw new IllegalStateException(
+                    "RollingFormulaMultiColumnOperator.Context.writeToOutputChunk should never be called.");
+        }
+
+        @Override
+        public void writeToOutputColumn(@NotNull final RowSequence inputKeys) {
+            primitiveOutputSource.fillFromChunk(outputFillContext, outputValues, inputKeys);
+        }
+
+        @Override
+        public void reset() {
+            // Clear all the ring buffers for re-use
+            for (RingBufferWindowConsumer consumer : inputConsumers) {
+                consumer.reset();
+            }
+            nullCount = 0;
+        }
+
+        @Override
+        public void close() {
+            outputValues.close();
+            outputFillContext.close();
+        }
+
+        private void setBucketKeyValues(final Object[] bucketKeyValues) {
+            for (int i = 0; i < keyValueSources.length; i++) {
+                // noinspection unchecked
+                keyValueSources[i].set(bucketKeyValues[i]);
+            }
+        }
+    }
+
+    /**
+     * Create a new RollingFormulaMultiColumnOperator.
+     *
+     * @param pair Contains the output column name as a MatchPair
+     * @param affectingColumns The names of the columns that when changed would affect this formula output
+     * @param timestampColumnName The name of the column containing timestamps for time-based calculations (or null when
+     *        not time-based)
+     * @param reverseWindowScaleUnits The size of the reverse window in ticks (or nanoseconds when time-based)
+     * @param forwardWindowScaleUnits The size of the forward window in ticks (or nanoseconds when time-based)
+     * @param selectColumn The {@link SelectColumn} specifying the calculation to be performed
+     * @param inputKeyColumnNames The names of the key columns to be used as inputs
+     * @param inputKeyColumnTypes The types of the key columns to be used as inputs
+     * @param inputKeyComponentTypes The component types of the key columns to be used as inputs
+     * @param inputNonKeyColumnNames The names of the non-key columns to be used as inputs
+     * @param inputNonKeyColumnTypes The types of the non-key columns to be used as inputs
+     * @param inputNonKeyVectorTypes The vector types of the non-key columns to be used as inputs
+     */
+    public RollingFormulaMultiColumnOperator(
+            @NotNull final MatchPair pair,
+            @NotNull final String[] affectingColumns,
+            @Nullable final String timestampColumnName,
+            final long reverseWindowScaleUnits,
+            final long forwardWindowScaleUnits,
+            @NotNull final SelectColumn selectColumn,
+            @NotNull final String[] inputKeyColumnNames,
+            @NotNull final Class<?>[] inputKeyColumnTypes,
+            @NotNull final Class<?>[] inputKeyComponentTypes,
+            @NotNull final String[] inputNonKeyColumnNames,
+            @NotNull final Class<?>[] inputNonKeyColumnTypes,
+            @NotNull final Class<?>[] inputNonKeyVectorTypes) {
+        super(pair, affectingColumns, timestampColumnName, reverseWindowScaleUnits, forwardWindowScaleUnits, true);
+        this.selectColumn = selectColumn;
+        this.inputKeyColumnNames = inputKeyColumnNames;
+        this.inputKeyColumnTypes = inputKeyColumnTypes;
+        this.inputKeyComponentTypes = inputKeyComponentTypes;
+        this.inputNonKeyColumnNames = inputNonKeyColumnNames;
+        this.inputNonKeyColumnTypes = inputNonKeyColumnTypes;
+        this.inputNonKeyVectorTypes = inputNonKeyVectorTypes;
+    }
+
+    @Override
+    public UpdateByOperator copy() {
+        return new RollingFormulaMultiColumnOperator(
+                pair,
+                affectingColumns,
+                timestampColumnName,
+                reverseWindowScaleUnits,
+                forwardWindowScaleUnits,
+                selectColumn,
+                inputKeyColumnNames,
+                inputKeyColumnTypes,
+                inputKeyComponentTypes,
+                inputNonKeyColumnNames,
+                inputNonKeyColumnTypes,
+                inputNonKeyVectorTypes);
+    }
+
+    @Override
+    public void initializeSources(@NotNull final Table source, @Nullable final RowRedirection rowRedirection) {
+        this.rowRedirection = rowRedirection;
+
+        if (rowRedirection != null) {
+            // region create-dense
+            maybeInnerSource = ArrayBackedColumnSource.getMemoryColumnSource(0, selectColumn.getReturnedType(),
+                    selectColumn.getReturnedComponentType());
+            // endregion create-dense
+            outputSource = WritableRedirectedColumnSource.maybeRedirect(rowRedirection, maybeInnerSource, 0);
+        } else {
+            maybeInnerSource = null;
+            // region create-sparse
+            outputSource = SparseArrayColumnSource.getSparseMemoryColumnSource(0, selectColumn.getReturnedType(),
+                    selectColumn.getReturnedComponentType());
+            // endregion create-sparse
+        }
+
+        primitiveOutputSource = ReinterpretUtils.maybeConvertToWritablePrimitive(outputSource);
+
+        outputChunkType = primitiveOutputSource.getChunkType();
+    }
+
+    // region value-setters
+    protected static IntConsumer getChunkSetter(
+            final WritableChunk<? extends Values> valueChunk,
+            final ColumnSource<?> formulaOutputSource) {
+        final ChunkType chunkType = valueChunk.getChunkType();
+        switch (chunkType) {
+            case Boolean:
+                throw new IllegalStateException(
+                        "Output chunk type should not be Boolean but should have been reinterpreted to byte");
+            case Byte:
+                final WritableByteChunk<? extends Values> byteChunk = valueChunk.asWritableByteChunk();
+                return index -> byteChunk.set(index, formulaOutputSource.getByte(0));
+
+            case Char:
+                final WritableCharChunk<? extends Values> charChunk = valueChunk.asWritableCharChunk();
+                return index -> charChunk.set(index, formulaOutputSource.getChar(0));
+
+            case Double:
+                final WritableDoubleChunk<? extends Values> doubleChunk = valueChunk.asWritableDoubleChunk();
+                return index -> doubleChunk.set(index, formulaOutputSource.getDouble(0));
+
+            case Float:
+                final WritableFloatChunk<? extends Values> floatChunk = valueChunk.asWritableFloatChunk();
+                return index -> floatChunk.set(index, formulaOutputSource.getFloat(0));
+
+            case Int:
+                final WritableIntChunk<? extends Values> intChunk = valueChunk.asWritableIntChunk();
+                return index -> intChunk.set(index, formulaOutputSource.getInt(0));
+
+            case Long:
+                final WritableLongChunk<? extends Values> longChunk = valueChunk.asWritableLongChunk();
+                return index -> longChunk.set(index, formulaOutputSource.getLong(0));
+
+            case Short:
+                final WritableShortChunk<? extends Values> shortChunk = valueChunk.asWritableShortChunk();
+                return index -> shortChunk.set(index, formulaOutputSource.getShort(0));
+
+            default:
+                final WritableObjectChunk<Object, ? extends Values> objectChunk = valueChunk.asWritableObjectChunk();
+                return index -> {
+                    Object result = formulaOutputSource.get(0);
+                    if (result instanceof RingBufferVectorWrapper) {
+                        // Handle the rare (and probably not useful) case where the formula is an identity. We need to
+                        // copy the data in the RingBuffer and store that as a DirectVector. If not, we will point to
+                        // the live data in the ring.
+                        result = ((Vector<?>) result).getDirect();
+                    }
+                    objectChunk.set(index, result);
+                };
+        }
+    }
+
+    protected static IntConsumer getChunkNullSetter(final WritableChunk<? extends Values> valueChunk) {
+        final ChunkType chunkType = valueChunk.getChunkType();
+        switch (chunkType) {
+            case Boolean:
+                throw new IllegalStateException(
+                        "Output chunk type should not be Boolean but should have been reinterpreted to byte");
+            case Byte:
+                final WritableByteChunk<? extends Values> byteChunk = valueChunk.asWritableByteChunk();
+                return index -> byteChunk.set(index, NULL_BYTE);
+
+            case Char:
+                final WritableCharChunk<? extends Values> charChunk = valueChunk.asWritableCharChunk();
+                return index -> charChunk.set(index, NULL_CHAR);
+
+            case Double:
+                final WritableDoubleChunk<? extends Values> doubleChunk = valueChunk.asWritableDoubleChunk();
+                return index -> doubleChunk.set(index, NULL_DOUBLE);
+
+            case Float:
+                final WritableFloatChunk<? extends Values> floatChunk = valueChunk.asWritableFloatChunk();
+                return index -> floatChunk.set(index, NULL_FLOAT);
+
+            case Int:
+                final WritableIntChunk<? extends Values> intChunk = valueChunk.asWritableIntChunk();
+                return index -> intChunk.set(index, NULL_INT);
+
+            case Long:
+                final WritableLongChunk<? extends Values> longChunk = valueChunk.asWritableLongChunk();
+                return index -> longChunk.set(index, NULL_LONG);
+
+            case Short:
+                final WritableShortChunk<? extends Values> shortChunk = valueChunk.asWritableShortChunk();
+                return index -> shortChunk.set(index, NULL_SHORT);
+
+            default:
+                final WritableObjectChunk<Object, ? extends Values> objectChunk = valueChunk.asWritableObjectChunk();
+                return index -> objectChunk.set(index, null);
+        }
+    }
+    // endregion value-setters
+
+    @Override
+    public void startTrackingPrev() {
+        outputSource.startTrackingPrevValues();
+        if (rowRedirection != null) {
+            assert maybeInnerSource != null;
+            maybeInnerSource.startTrackingPrevValues();
+        }
+    }
+
+    @Override
+    public UpdateByOperator.@NotNull Context makeUpdateContext(int affectedChunkSize, int influencerChunkSize) {
+        return new Context(affectedChunkSize, influencerChunkSize);
+    }
+
+    @Override
+    public void prepareForParallelPopulation(final RowSet changedRows) {
+        if (rowRedirection != null) {
+            assert maybeInnerSource != null;
+            ((WritableSourceWithPrepareForParallelPopulation) maybeInnerSource)
+                    .prepareForParallelPopulation(changedRows);
+        } else {
+            ((WritableSourceWithPrepareForParallelPopulation) outputSource).prepareForParallelPopulation(changedRows);
+        }
+    }
+
+    @Override
+    public void initializeRollingWithKeyValues(
+            @NotNull final UpdateByOperator.Context context,
+            @NotNull final RowSet bucketRowSet,
+            @NotNull Object[] bucketKeyValues) {
+        super.initializeRollingWithKeyValues(context, bucketRowSet, bucketKeyValues);
+
+        final Context rollingContext = (Context) context;
+        rollingContext.setBucketKeyValues(bucketKeyValues);
+    }
+
+    @NotNull
+    @Override
+    public Map<String, ColumnSource<?>> getOutputColumns() {
+        return Collections.singletonMap(pair.leftColumn, outputSource);
+    }
+
+    // region clear-output
+    @Override
+    public void clearOutputRows(final RowSet toClear) {
+        // if we are redirected, clear the inner source
+        if (rowRedirection != null) {
+            ChunkUtils.fillWithNullValue(maybeInnerSource, toClear);
+        } else {
+            ChunkUtils.fillWithNullValue(outputSource, toClear);
+        }
+    }
+
+    @Override
+    public void applyOutputShift(@NotNull final RowSet subRowSetToShift, final long delta) {
+        ((SparseArrayColumnSource<?>) outputSource).shift(subRowSetToShift, delta);
+    }
+
+    @Override
+    @NotNull
+    protected String[] getInputColumnNames() {
+        return ArrayUtils.addAll(inputNonKeyColumnNames);
+    }
+}
diff --git a/engine/table/src/main/java/io/deephaven/engine/table/impl/updateby/rollingformulamulticolumn/windowconsumer/ByteRingBufferWindowConsumer.java b/engine/table/src/main/java/io/deephaven/engine/table/impl/updateby/rollingformulamulticolumn/windowconsumer/ByteRingBufferWindowConsumer.java
new file mode 100644
index 00000000000..5f1c6978077
--- /dev/null
+++ b/engine/table/src/main/java/io/deephaven/engine/table/impl/updateby/rollingformulamulticolumn/windowconsumer/ByteRingBufferWindowConsumer.java
@@ -0,0 +1,47 @@
+//
+// Copyright (c) 2016-2024 Deephaven Data Labs and Patent Pending
+//
+// ****** AUTO-GENERATED CLASS - DO NOT EDIT MANUALLY
+// ****** Edit CharRingBufferWindowConsumer and run "./gradlew replicateUpdateBy" to regenerate
+//
+// @formatter:off
+package io.deephaven.engine.table.impl.updateby.rollingformulamulticolumn.windowconsumer;
+
+import io.deephaven.base.ringbuffer.ByteRingBuffer;
+import io.deephaven.chunk.ByteChunk;
+import io.deephaven.chunk.Chunk;
+
+class ByteRingBufferWindowConsumer extends RingBufferWindowConsumer {
+    private final ByteRingBuffer byteRingBuffer;
+
+    private ByteChunk<?> influencerValuesChunk;
+
+    ByteRingBufferWindowConsumer(ByteRingBuffer byteRingBuffer) {
+        this.byteRingBuffer = byteRingBuffer;
+    }
+
+    @Override
+    public void setInputChunk(final Chunk<?> inputChunk) {
+        this.influencerValuesChunk = inputChunk.asByteChunk();
+    }
+
+    @Override
+    public void push(int index, int count) {
+        byteRingBuffer.ensureRemaining(count);
+        for (int i = 0; i < count; i++) {
+            byteRingBuffer.add(influencerValuesChunk.get(index + i));
+        }
+    }
+
+    @Override
+    public void pop(int count) {
+        for (int i = 0; i < count; i++) {
+            byteRingBuffer.remove();
+        }
+    }
+
+    @Override
+    public void reset() {
+        byteRingBuffer.clear();
+    }
+}
diff --git a/engine/table/src/main/java/io/deephaven/engine/table/impl/updateby/rollingformulamulticolumn/windowconsumer/CharRingBufferWindowConsumer.java b/engine/table/src/main/java/io/deephaven/engine/table/impl/updateby/rollingformulamulticolumn/windowconsumer/CharRingBufferWindowConsumer.java
new file mode 100644
index 00000000000..f15aca8a02f
--- /dev/null
+++ b/engine/table/src/main/java/io/deephaven/engine/table/impl/updateby/rollingformulamulticolumn/windowconsumer/CharRingBufferWindowConsumer.java
@@ -0,0 +1,43 @@
+//
+// Copyright (c) 2016-2024 Deephaven Data Labs and Patent Pending
+//
+package io.deephaven.engine.table.impl.updateby.rollingformulamulticolumn.windowconsumer;
+
+import io.deephaven.base.ringbuffer.CharRingBuffer;
+import io.deephaven.chunk.CharChunk;
+import io.deephaven.chunk.Chunk;
+
+class CharRingBufferWindowConsumer extends RingBufferWindowConsumer {
+    private final CharRingBuffer charRingBuffer;
+
+    private CharChunk<?> influencerValuesChunk;
+
+    CharRingBufferWindowConsumer(CharRingBuffer charRingBuffer) {
+        this.charRingBuffer = charRingBuffer;
+    }
+
+    @Override
+    public void setInputChunk(final Chunk<?> inputChunk) {
+        this.influencerValuesChunk = inputChunk.asCharChunk();
+    }
+
+    @Override
+    public void push(int index, int count) {
+        charRingBuffer.ensureRemaining(count);
+        for (int i = 0; i < count; i++) {
+            charRingBuffer.add(influencerValuesChunk.get(index + i));
+        }
+    }
+
+    @Override
+    public void pop(int count) {
+        for (int i = 0; i < count; i++) {
+            charRingBuffer.remove();
+        }
+    }
+
+    @Override
+    public void reset() {
+        charRingBuffer.clear();
+    }
+}
diff --git a/engine/table/src/main/java/io/deephaven/engine/table/impl/updateby/rollingformulamulticolumn/windowconsumer/DoubleRingBufferWindowConsumer.java b/engine/table/src/main/java/io/deephaven/engine/table/impl/updateby/rollingformulamulticolumn/windowconsumer/DoubleRingBufferWindowConsumer.java
new file mode 100644
index 00000000000..08c3feac049
--- /dev/null
+++ b/engine/table/src/main/java/io/deephaven/engine/table/impl/updateby/rollingformulamulticolumn/windowconsumer/DoubleRingBufferWindowConsumer.java
@@ -0,0 +1,47 @@
+//
+// Copyright (c) 2016-2024 Deephaven Data Labs and Patent Pending
+//
+// ****** AUTO-GENERATED CLASS - DO NOT EDIT MANUALLY
+// ****** Edit CharRingBufferWindowConsumer and run "./gradlew replicateUpdateBy" to regenerate
+//
+// @formatter:off
+package io.deephaven.engine.table.impl.updateby.rollingformulamulticolumn.windowconsumer;
+
+import io.deephaven.base.ringbuffer.DoubleRingBuffer;
+import io.deephaven.chunk.DoubleChunk;
+import io.deephaven.chunk.Chunk;
+
+class DoubleRingBufferWindowConsumer extends RingBufferWindowConsumer {
+    private final DoubleRingBuffer doubleRingBuffer;
+
+    private DoubleChunk<?> influencerValuesChunk;
+
+    DoubleRingBufferWindowConsumer(DoubleRingBuffer doubleRingBuffer) {
+        this.doubleRingBuffer = doubleRingBuffer;
+    }
+
+    @Override
+    public void setInputChunk(final Chunk<?> inputChunk) {
+        this.influencerValuesChunk = inputChunk.asDoubleChunk();
+    }
+
+    @Override
+    public void push(int index, int count) {
+        doubleRingBuffer.ensureRemaining(count);
+        for (int i = 0; i < count; i++) {
+            doubleRingBuffer.add(influencerValuesChunk.get(index + i));
+        }
+    }
+
+    @Override
+    public void pop(int count) {
+        for (int i = 0; i < count; i++) {
+            doubleRingBuffer.remove();
+        }
+    }
+
+    @Override
+    public void reset() {
+        doubleRingBuffer.clear();
+    }
+}
diff --git a/engine/table/src/main/java/io/deephaven/engine/table/impl/updateby/rollingformulamulticolumn/windowconsumer/FloatRingBufferWindowConsumer.java b/engine/table/src/main/java/io/deephaven/engine/table/impl/updateby/rollingformulamulticolumn/windowconsumer/FloatRingBufferWindowConsumer.java
new file mode 100644
index 00000000000..0b5797800db
--- /dev/null
+++ b/engine/table/src/main/java/io/deephaven/engine/table/impl/updateby/rollingformulamulticolumn/windowconsumer/FloatRingBufferWindowConsumer.java
@@ -0,0 +1,47 @@
+//
+// Copyright (c) 2016-2024 Deephaven Data Labs and Patent Pending
+//
+// ****** AUTO-GENERATED CLASS - DO NOT EDIT MANUALLY
+// ****** Edit CharRingBufferWindowConsumer and run "./gradlew replicateUpdateBy" to regenerate
+//
+// @formatter:off
+package io.deephaven.engine.table.impl.updateby.rollingformulamulticolumn.windowconsumer;
+
+import io.deephaven.base.ringbuffer.FloatRingBuffer;
+import io.deephaven.chunk.FloatChunk;
+import io.deephaven.chunk.Chunk;
+
+class FloatRingBufferWindowConsumer extends RingBufferWindowConsumer {
+    private final FloatRingBuffer floatRingBuffer;
+
+    private FloatChunk<?> influencerValuesChunk;
+
+    FloatRingBufferWindowConsumer(FloatRingBuffer floatRingBuffer) {
+        this.floatRingBuffer = floatRingBuffer;
+    }
+
+    @Override
+    public void setInputChunk(final Chunk<?> inputChunk) {
+        this.influencerValuesChunk = inputChunk.asFloatChunk();
+    }
+
+    @Override
+    public void push(int index, int count) {
+        floatRingBuffer.ensureRemaining(count);
+        for (int i = 0; i < count; i++) {
+            floatRingBuffer.add(influencerValuesChunk.get(index + i));
+        }
+    }
+
+    @Override
+    public void pop(int count) {
+        for (int i = 0; i < count; i++) {
+            floatRingBuffer.remove();
+        }
+    }
+
+    @Override
+    public void reset() {
+        floatRingBuffer.clear();
+    }
+}
diff --git a/engine/table/src/main/java/io/deephaven/engine/table/impl/updateby/rollingformulamulticolumn/windowconsumer/IntRingBufferWindowConsumer.java b/engine/table/src/main/java/io/deephaven/engine/table/impl/updateby/rollingformulamulticolumn/windowconsumer/IntRingBufferWindowConsumer.java
new file mode 100644
index 00000000000..23d8ca6d2a3
--- /dev/null
+++ b/engine/table/src/main/java/io/deephaven/engine/table/impl/updateby/rollingformulamulticolumn/windowconsumer/IntRingBufferWindowConsumer.java
@@ -0,0 +1,47 @@
+//
+// Copyright (c) 2016-2024 Deephaven Data Labs and Patent Pending
+//
+// ****** AUTO-GENERATED CLASS - DO NOT EDIT MANUALLY
+// ****** Edit CharRingBufferWindowConsumer and run "./gradlew replicateUpdateBy" to regenerate
+//
+// @formatter:off
+package io.deephaven.engine.table.impl.updateby.rollingformulamulticolumn.windowconsumer;
+
+import io.deephaven.base.ringbuffer.IntRingBuffer;
+import io.deephaven.chunk.IntChunk;
+import io.deephaven.chunk.Chunk;
+
+class IntRingBufferWindowConsumer extends RingBufferWindowConsumer {
+    private final IntRingBuffer intRingBuffer;
+
+    private IntChunk<?> influencerValuesChunk;
+
+    IntRingBufferWindowConsumer(IntRingBuffer intRingBuffer) {
+        this.intRingBuffer = intRingBuffer;
+    }
+
+    @Override
+    public void setInputChunk(final Chunk<?> inputChunk) {
+        this.influencerValuesChunk = inputChunk.asIntChunk();
+    }
+
+    @Override
+    public void push(int index, int count) {
+        intRingBuffer.ensureRemaining(count);
+        for (int i = 0; i < count; i++) {
+            intRingBuffer.add(influencerValuesChunk.get(index + i));
+        }
+    }
+
+    @Override
+    public void pop(int count) {
+        for (int i = 0; i < count; i++) {
+            intRingBuffer.remove();
+        }
+    }
+
+    @Override
+    public void reset() {
+        intRingBuffer.clear();
+    }
+}
diff --git a/engine/table/src/main/java/io/deephaven/engine/table/impl/updateby/rollingformulamulticolumn/windowconsumer/LongRingBufferWindowConsumer.java b/engine/table/src/main/java/io/deephaven/engine/table/impl/updateby/rollingformulamulticolumn/windowconsumer/LongRingBufferWindowConsumer.java
new file mode 100644
index 00000000000..e77d06e8425
--- /dev/null
+++ b/engine/table/src/main/java/io/deephaven/engine/table/impl/updateby/rollingformulamulticolumn/windowconsumer/LongRingBufferWindowConsumer.java
@@ -0,0 +1,47 @@
+//
+// Copyright (c) 2016-2024 Deephaven Data Labs and Patent Pending
+//
+// ****** AUTO-GENERATED CLASS - DO NOT EDIT MANUALLY
+// ****** Edit CharRingBufferWindowConsumer and run "./gradlew replicateUpdateBy" to regenerate
+//
+// @formatter:off
+package io.deephaven.engine.table.impl.updateby.rollingformulamulticolumn.windowconsumer;
+
+import io.deephaven.base.ringbuffer.LongRingBuffer;
+import io.deephaven.chunk.LongChunk;
+import io.deephaven.chunk.Chunk;
+
+class LongRingBufferWindowConsumer extends RingBufferWindowConsumer {
+    private final LongRingBuffer longRingBuffer;
+
+    private LongChunk<?> influencerValuesChunk;
+
+    LongRingBufferWindowConsumer(LongRingBuffer longRingBuffer) {
+        this.longRingBuffer = longRingBuffer;
+    }
+
+    @Override
+    public void setInputChunk(final Chunk<?> inputChunk) {
+        this.influencerValuesChunk = inputChunk.asLongChunk();
+    }
+
+    @Override
+    public void push(int index, int count) {
+        longRingBuffer.ensureRemaining(count);
+        for (int i = 0; i < count; i++) {
+            longRingBuffer.add(influencerValuesChunk.get(index + i));
+        }
+    }
+
+    @Override
+    public void pop(int count) {
+        for (int i = 0; i < count; i++) {
+            longRingBuffer.remove();
+        }
+    }
+
+    @Override
+    public void reset() {
+        longRingBuffer.clear();
+    }
+}
diff --git a/engine/table/src/main/java/io/deephaven/engine/table/impl/updateby/rollingformulamulticolumn/windowconsumer/ObjectRingBufferWindowConsumer.java b/engine/table/src/main/java/io/deephaven/engine/table/impl/updateby/rollingformulamulticolumn/windowconsumer/ObjectRingBufferWindowConsumer.java
new file mode 100644
index 00000000000..206d2cf15d3
--- /dev/null
+++ b/engine/table/src/main/java/io/deephaven/engine/table/impl/updateby/rollingformulamulticolumn/windowconsumer/ObjectRingBufferWindowConsumer.java
@@ -0,0 +1,43 @@
+//
+// Copyright (c) 2016-2024 Deephaven Data Labs and Patent Pending
+//
+package io.deephaven.engine.table.impl.updateby.rollingformulamulticolumn.windowconsumer;
+
+import io.deephaven.base.ringbuffer.ObjectRingBuffer;
+import io.deephaven.chunk.ObjectChunk;
+import io.deephaven.chunk.Chunk;
+
+class ObjectRingBufferWindowConsumer<T> extends RingBufferWindowConsumer {
+    private final ObjectRingBuffer<T> objectRingBuffer;
+
+    private ObjectChunk<T, ?> influencerValuesChunk;
+
+    ObjectRingBufferWindowConsumer(ObjectRingBuffer<T> objectRingBuffer) {
+        this.objectRingBuffer = objectRingBuffer;
+    }
+
+    @Override
+    public void setInputChunk(final Chunk<?> inputChunk) {
+        this.influencerValuesChunk = inputChunk.asObjectChunk();
+    }
+
+    @Override
+    public void push(int index, int count) {
+        objectRingBuffer.ensureRemaining(count);
+        for (int i = 0; i < count; i++) {
+            objectRingBuffer.add(influencerValuesChunk.get(index + i));
+        }
+    }
+
+    @Override
+    public void pop(int count) {
+        for (int i = 0; i < count; i++) {
+            objectRingBuffer.remove();
+        }
+    }
+
+    @Override
+    public void reset() {
+        objectRingBuffer.clear();
+    }
+}
diff --git a/engine/table/src/main/java/io/deephaven/engine/table/impl/updateby/rollingformulamulticolumn/windowconsumer/RingBufferWindowConsumer.java b/engine/table/src/main/java/io/deephaven/engine/table/impl/updateby/rollingformulamulticolumn/windowconsumer/RingBufferWindowConsumer.java
new file mode 100644
index 00000000000..c98088ee61d
--- /dev/null
+++ b/engine/table/src/main/java/io/deephaven/engine/table/impl/updateby/rollingformulamulticolumn/windowconsumer/RingBufferWindowConsumer.java
@@ -0,0 +1,71 @@
+//
+// Copyright (c) 2016-2024 Deephaven Data Labs and Patent Pending
+//
+package io.deephaven.engine.table.impl.updateby.rollingformulamulticolumn.windowconsumer;
+
+import io.deephaven.base.ringbuffer.*;
+import io.deephaven.chunk.Chunk;
+
+/**
+ * This helper provides an abstract interface for consuming UpdateBy window input data values and storing in a
+ * {@link RingBuffer}. The UpdateBy code produces a chunk of input data and lists of push/pop instructions for managing
+ * the current window values. This class abstracts the underlying buffer type and provides a common interface for the
+ * UpdateBy code to interact with the buffer.
+ */
+public abstract class RingBufferWindowConsumer {
+    /**
+     * Create a new {@link RingBufferWindowConsumer} for the given buffer.
+     *
+     * @param buffer the buffer to manage
+     * @return a new RingBufferWindowConsumer
+     */
+    public static RingBufferWindowConsumer create(final RingBuffer buffer) {
+        final Class<?> bufferClass = buffer.getClass();
+
+        if (bufferClass == CharRingBuffer.class) {
+            return new CharRingBufferWindowConsumer((CharRingBuffer) buffer);
+        } else if (bufferClass == ByteRingBuffer.class) {
+            return new ByteRingBufferWindowConsumer((ByteRingBuffer) buffer);
+        } else if (bufferClass == DoubleRingBuffer.class) {
+            return new DoubleRingBufferWindowConsumer((DoubleRingBuffer) buffer);
+        } else if (bufferClass == FloatRingBuffer.class) {
+            return new FloatRingBufferWindowConsumer((FloatRingBuffer) buffer);
+        } else if (bufferClass == IntRingBuffer.class) {
+            return new IntRingBufferWindowConsumer((IntRingBuffer) buffer);
+        } else if (bufferClass == LongRingBuffer.class) {
+            return new LongRingBufferWindowConsumer((LongRingBuffer) buffer);
+        } else if (bufferClass == ShortRingBuffer.class) {
+            return new ShortRingBufferWindowConsumer((ShortRingBuffer) buffer);
+        }
+        return new ObjectRingBufferWindowConsumer<>((ObjectRingBuffer<?>) buffer);
+    }
+
+    /**
+     * Set the input chunk for this consumer. This will be stored and the push instructions will index into this buffer
+     * for newly provided values.
+     *
+     * @param inputChunk the input chunk
+     */
+    public abstract void setInputChunk(Chunk<?> inputChunk);
+
+    /**
+     * Push {@code count} values from the input chunk into the ring buffer, beginning at {@code index}.
+     *
+     * @param index the index of the first value to push
+     * @param count the count of values to push
+     */
+    public abstract void push(int index, int count);
+
+    /**
+     * Pop {@code count} values from the ring buffer.
+     *
+     * @param count the count of values to pop
+     */
+    public abstract void pop(int count);
+
+    /**
+     * Reset the ring buffer to its initial state. If this is an object ring buffer, this will set all values to
+     * {@code null}.
+     */
+    public abstract void reset();
+}
diff --git a/engine/table/src/main/java/io/deephaven/engine/table/impl/updateby/rollingformulamulticolumn/windowconsumer/ShortRingBufferWindowConsumer.java b/engine/table/src/main/java/io/deephaven/engine/table/impl/updateby/rollingformulamulticolumn/windowconsumer/ShortRingBufferWindowConsumer.java
new file mode 100644
index 00000000000..187b34fa603
--- /dev/null
+++ b/engine/table/src/main/java/io/deephaven/engine/table/impl/updateby/rollingformulamulticolumn/windowconsumer/ShortRingBufferWindowConsumer.java
@@ -0,0 +1,47 @@
+//
+// Copyright (c) 2016-2024 Deephaven Data Labs and Patent Pending
+//
+// ****** AUTO-GENERATED CLASS - DO NOT EDIT MANUALLY
+// ****** Edit CharRingBufferWindowConsumer and run "./gradlew replicateUpdateBy" to regenerate
+//
+// @formatter:off
+package io.deephaven.engine.table.impl.updateby.rollingformulamulticolumn.windowconsumer;
+
+import io.deephaven.base.ringbuffer.ShortRingBuffer;
+import io.deephaven.chunk.ShortChunk;
+import io.deephaven.chunk.Chunk;
+
+class ShortRingBufferWindowConsumer extends RingBufferWindowConsumer {
+    private final ShortRingBuffer shortRingBuffer;
+
+    private ShortChunk<?> influencerValuesChunk;
+
+    ShortRingBufferWindowConsumer(ShortRingBuffer shortRingBuffer) {
+        this.shortRingBuffer = shortRingBuffer;
+    }
+
+    @Override
+    public void setInputChunk(final Chunk<?> inputChunk) {
+        this.influencerValuesChunk = inputChunk.asShortChunk();
+    }
+
+    @Override
+    public void push(int index, int count) {
+        shortRingBuffer.ensureRemaining(count);
+        for (int i = 0; i < count; i++) {
+            shortRingBuffer.add(influencerValuesChunk.get(index + i));
+        }
+    }
+
+    @Override
+    public void pop(int count) {
+        for (int i = 0; i < count; i++) {
+            shortRingBuffer.remove();
+        }
+    }
+
+    @Override
+    public void reset() {
+        shortRingBuffer.clear();
+    }
+}
diff --git a/engine/table/src/main/java/io/deephaven/engine/table/impl/updateby/rollingwavg/ByteRollingWAvgOperator.java b/engine/table/src/main/java/io/deephaven/engine/table/impl/updateby/rollingwavg/ByteRollingWAvgOperator.java
index 70b3537a674..25f26774957 100644
--- a/engine/table/src/main/java/io/deephaven/engine/table/impl/updateby/rollingwavg/ByteRollingWAvgOperator.java
+++ b/engine/table/src/main/java/io/deephaven/engine/table/impl/updateby/rollingwavg/ByteRollingWAvgOperator.java
@@ -93,15 +93,4 @@ public UpdateByOperator copy() {
         // endregion extra-copy-args
         );
     }
-
-    /**
-     * Get the names of the input column(s) for this operator.
-     *
-     * @return the names of the input column
-     */
-    @NotNull
-    @Override
-    protected String[] getInputColumnNames() {
-        return new String[] {pair.rightColumn, weightColumnName};
-    }
 }
diff --git a/engine/table/src/main/java/io/deephaven/engine/table/impl/updateby/rollingwavg/CharRollingWAvgOperator.java b/engine/table/src/main/java/io/deephaven/engine/table/impl/updateby/rollingwavg/CharRollingWAvgOperator.java
index 37e41347661..d892f43771a 100644
--- a/engine/table/src/main/java/io/deephaven/engine/table/impl/updateby/rollingwavg/CharRollingWAvgOperator.java
+++ b/engine/table/src/main/java/io/deephaven/engine/table/impl/updateby/rollingwavg/CharRollingWAvgOperator.java
@@ -89,15 +89,4 @@ public UpdateByOperator copy() {
         // endregion extra-copy-args
         );
     }
-
-    /**
-     * Get the names of the input column(s) for this operator.
-     *
-     * @return the names of the input column
-     */
-    @NotNull
-    @Override
-    protected String[] getInputColumnNames() {
-        return new String[] {pair.rightColumn, weightColumnName};
-    }
 }
diff --git a/engine/table/src/main/java/io/deephaven/engine/table/impl/updateby/rollingwavg/DoubleRollingWAvgOperator.java b/engine/table/src/main/java/io/deephaven/engine/table/impl/updateby/rollingwavg/DoubleRollingWAvgOperator.java
index c1e3a717d9a..1547753a81a 100644
--- a/engine/table/src/main/java/io/deephaven/engine/table/impl/updateby/rollingwavg/DoubleRollingWAvgOperator.java
+++ b/engine/table/src/main/java/io/deephaven/engine/table/impl/updateby/rollingwavg/DoubleRollingWAvgOperator.java
@@ -93,15 +93,4 @@ public UpdateByOperator copy() {
         // endregion extra-copy-args
         );
     }
-
-    /**
-     * Get the names of the input column(s) for this operator.
-     *
-     * @return the names of the input column
-     */
-    @NotNull
-    @Override
-    protected String[] getInputColumnNames() {
-        return new String[] {pair.rightColumn, weightColumnName};
-    }
 }
diff --git a/engine/table/src/main/java/io/deephaven/engine/table/impl/updateby/rollingwavg/FloatRollingWAvgOperator.java b/engine/table/src/main/java/io/deephaven/engine/table/impl/updateby/rollingwavg/FloatRollingWAvgOperator.java
index 0d4e0392595..0c79c04de30 100644
--- a/engine/table/src/main/java/io/deephaven/engine/table/impl/updateby/rollingwavg/FloatRollingWAvgOperator.java
+++ b/engine/table/src/main/java/io/deephaven/engine/table/impl/updateby/rollingwavg/FloatRollingWAvgOperator.java
@@ -93,15 +93,4 @@ public UpdateByOperator copy() {
         // endregion extra-copy-args
         );
     }
-
-    /**
-     * Get the names of the input column(s) for this operator.
-     *
-     * @return the names of the input column
-     */
-    @NotNull
-    @Override
-    protected String[] getInputColumnNames() {
-        return new String[] {pair.rightColumn, weightColumnName};
-    }
 }
diff --git a/engine/table/src/main/java/io/deephaven/engine/table/impl/updateby/rollingwavg/IntRollingWAvgOperator.java b/engine/table/src/main/java/io/deephaven/engine/table/impl/updateby/rollingwavg/IntRollingWAvgOperator.java
index 5aeda3a07f1..58b4515becf 100644
--- a/engine/table/src/main/java/io/deephaven/engine/table/impl/updateby/rollingwavg/IntRollingWAvgOperator.java
+++ b/engine/table/src/main/java/io/deephaven/engine/table/impl/updateby/rollingwavg/IntRollingWAvgOperator.java
@@ -93,15 +93,4 @@ public UpdateByOperator copy() {
         // endregion extra-copy-args
         );
     }
-
-    /**
-     * Get the names of the input column(s) for this operator.
-     *
-     * @return the names of the input column
-     */
-    @NotNull
-    @Override
-    protected String[] getInputColumnNames() {
-        return new String[] {pair.rightColumn, weightColumnName};
-    }
 }
diff --git a/engine/table/src/main/java/io/deephaven/engine/table/impl/updateby/rollingwavg/LongRollingWAvgOperator.java b/engine/table/src/main/java/io/deephaven/engine/table/impl/updateby/rollingwavg/LongRollingWAvgOperator.java
index 60bbc0e8d1d..59939e67891 100644
--- a/engine/table/src/main/java/io/deephaven/engine/table/impl/updateby/rollingwavg/LongRollingWAvgOperator.java
+++ b/engine/table/src/main/java/io/deephaven/engine/table/impl/updateby/rollingwavg/LongRollingWAvgOperator.java
@@ -93,15 +93,4 @@ public UpdateByOperator copy() {
         // endregion extra-copy-args
         );
     }
-
-    /**
-     * Get the names of the input column(s) for this operator.
-     *
-     * @return the names of the input column
-     */
-    @NotNull
-    @Override
-    protected String[] getInputColumnNames() {
-        return new String[] {pair.rightColumn, weightColumnName};
-    }
 }
diff --git a/engine/table/src/main/java/io/deephaven/engine/table/impl/updateby/rollingwavg/ShortRollingWAvgOperator.java b/engine/table/src/main/java/io/deephaven/engine/table/impl/updateby/rollingwavg/ShortRollingWAvgOperator.java
index 4f9f11f5c83..459598dc86c 100644
--- a/engine/table/src/main/java/io/deephaven/engine/table/impl/updateby/rollingwavg/ShortRollingWAvgOperator.java
+++ b/engine/table/src/main/java/io/deephaven/engine/table/impl/updateby/rollingwavg/ShortRollingWAvgOperator.java
@@ -93,15 +93,4 @@ public UpdateByOperator copy() {
         // endregion extra-copy-args
         );
     }
-
-    /**
-     * Get the names of the input column(s) for this operator.
-     *
-     * @return the names of the input column
-     */
-    @NotNull
-    @Override
-    protected String[] getInputColumnNames() {
-        return new String[] {pair.rightColumn, weightColumnName};
-    }
 }
diff --git a/engine/table/src/main/java/io/deephaven/engine/table/impl/util/BarrageMessage.java b/engine/table/src/main/java/io/deephaven/engine/table/impl/util/BarrageMessage.java
index a895302194b..b1f0db57cb7 100644
--- a/engine/table/src/main/java/io/deephaven/engine/table/impl/util/BarrageMessage.java
+++ b/engine/table/src/main/java/io/deephaven/engine/table/impl/util/BarrageMessage.java
@@ -11,8 +11,9 @@
 import io.deephaven.engine.rowset.RowSetShiftData;
 import io.deephaven.util.SafeCloseable;
 
-import java.util.ArrayList;
 import java.util.BitSet;
+import java.util.Collection;
+import java.util.List;
 import java.util.concurrent.atomic.AtomicIntegerFieldUpdater;
 
 /**
@@ -31,26 +32,30 @@ public static class ModColumnData {
         public RowSet rowsModified;
         public Class<?> type;
         public Class<?> componentType;
-        public ArrayList<Chunk<Values>> data;
+        public List<Chunk<Values>> data;
         public ChunkType chunkType;
     }
 
     public static class AddColumnData {
         public Class<?> type;
         public Class<?> componentType;
-        public ArrayList<Chunk<Values>> data;
+        public List<Chunk<Values>> data;
         public ChunkType chunkType;
     }
 
     public long firstSeq = -1;
     public long lastSeq = -1;
-    public long step = -1;
+    /** The size of the table after this update. -1 if unknown. */
+    public long tableSize = -1;
 
-    public boolean isSnapshot;
+    /** The RowSet the server is now respecting for this client; only set when parsing on the client. */
     public RowSet snapshotRowSet;
+    /** Whether the server-respecting viewport is a tail; only set when parsing on the client. */
     public boolean snapshotRowSetIsReversed;
+    /** The BitSet of columns the server is now respecting for this client; only set when parsing on the client. */
     public BitSet snapshotColumns;
 
+    public boolean isSnapshot;
     public RowSet rowsAdded;
     public RowSet rowsIncluded;
     public RowSet rowsRemoved;
@@ -94,34 +99,30 @@ public void close() {
             rowsRemoved.close();
         }
         if (addColumnData != null) {
-            for (final BarrageMessage.AddColumnData acd : addColumnData) {
-                if (acd == null) {
-                    continue;
-                }
-
-                for (Chunk<Values> chunk : acd.data) {
-                    if (chunk instanceof PoolableChunk) {
-                        ((PoolableChunk) chunk).close();
-                    }
+            for (final AddColumnData acd : addColumnData) {
+                if (acd != null) {
+                    closeChunkData(acd.data);
                 }
-
-                acd.data.clear();
             }
         }
         if (modColumnData != null) {
             for (final ModColumnData mcd : modColumnData) {
-                if (mcd == null) {
-                    continue;
-                }
-
-                for (Chunk<Values> chunk : mcd.data) {
-                    if (chunk instanceof PoolableChunk) {
-                        ((PoolableChunk) chunk).close();
-                    }
+                if (mcd != null) {
+                    closeChunkData(mcd.data);
                 }
+            }
+        }
+    }
 
-                mcd.data.clear();
+    private static void closeChunkData(final Collection<Chunk<Values>> data) {
+        if (data.isEmpty()) {
+            return;
+        }
+        for (final Chunk<Values> chunk : data) {
+            if (chunk instanceof PoolableChunk) {
+                ((PoolableChunk) chunk).close();
             }
         }
+        data.clear();
     }
 }
diff --git a/engine/table/src/main/java/io/deephaven/engine/table/impl/util/BaseArrayBackedInputTable.java b/engine/table/src/main/java/io/deephaven/engine/table/impl/util/BaseArrayBackedInputTable.java
index b1d09589f73..88f5097080f 100644
--- a/engine/table/src/main/java/io/deephaven/engine/table/impl/util/BaseArrayBackedInputTable.java
+++ b/engine/table/src/main/java/io/deephaven/engine/table/impl/util/BaseArrayBackedInputTable.java
@@ -171,7 +171,7 @@ private final class PendingChange {
         String error;
 
         private PendingChange(@NotNull Table table, boolean delete) {
-            Assert.holdsLock(pendingChanges, "pendingChanges");
+            Assert.assertion(Thread.holdsLock(pendingChanges), "Thread.holdsLock(pendingChanges)");
             Assert.neqNull(table, "table");
             this.table = table;
             this.delete = delete;
diff --git a/engine/table/src/main/java/io/deephaven/engine/table/impl/util/ColumnsToRowsTransform.java b/engine/table/src/main/java/io/deephaven/engine/table/impl/util/ColumnsToRowsTransform.java
index 9de2ecde91b..97617b3918c 100644
--- a/engine/table/src/main/java/io/deephaven/engine/table/impl/util/ColumnsToRowsTransform.java
+++ b/engine/table/src/main/java/io/deephaven/engine/table/impl/util/ColumnsToRowsTransform.java
@@ -5,7 +5,6 @@
 
 import io.deephaven.chunk.attributes.ChunkPositions;
 import io.deephaven.chunk.attributes.Values;
-import io.deephaven.datastructures.util.CollectionUtil;
 import io.deephaven.engine.rowset.RowSetFactory;
 import io.deephaven.engine.table.*;
 import io.deephaven.engine.rowset.*;
@@ -207,7 +206,7 @@ public static Table columnsToRows(final Table source, final String labelColumn,
             final String[] sourceColumns = new String[sourceColumnCount];
             final MutableInt columnIndex = new MutableInt();
             final ModifiedColumnSet modifyAll = querySource
-                    .newModifiedColumnSet(expandSet.toArray(CollectionUtil.ZERO_LENGTH_STRING_ARRAY));
+                    .newModifiedColumnSet(expandSet.toArray(String[]::new));
             final ModifiedColumnSet[] modifyOneRow = new ModifiedColumnSet[labels.length];
             // noinspection unchecked
             final List<String>[] sourcesForRow = new ArrayList[labels.length];
@@ -233,7 +232,7 @@ public static Table columnsToRows(final Table source, final String labelColumn,
 
             for (int cc = 0; cc < labels.length; ++cc) {
                 modifyOneRow[cc] = querySource
-                        .newModifiedColumnSet(sourcesForRow[cc].toArray(CollectionUtil.ZERO_LENGTH_STRING_ARRAY));
+                        .newModifiedColumnSet(sourcesForRow[cc].toArray(String[]::new));
             }
 
             final ModifiedColumnSet.Transformer transformer =
diff --git a/engine/table/src/main/java/io/deephaven/engine/table/impl/util/FunctionGeneratedTableFactory.java b/engine/table/src/main/java/io/deephaven/engine/table/impl/util/FunctionGeneratedTableFactory.java
index a6391686c22..0da9131ca5e 100644
--- a/engine/table/src/main/java/io/deephaven/engine/table/impl/util/FunctionGeneratedTableFactory.java
+++ b/engine/table/src/main/java/io/deephaven/engine/table/impl/util/FunctionGeneratedTableFactory.java
@@ -16,6 +16,7 @@
 import io.deephaven.util.annotations.ReferentialIntegrity;
 import org.jetbrains.annotations.NotNull;
 
+import javax.annotation.OverridingMethodsMustInvokeSuper;
 import java.util.*;
 import java.util.function.Supplier;
 import java.util.stream.Collectors;
@@ -279,6 +280,7 @@ private void doRefresh() {
             }
         }
 
+        @OverridingMethodsMustInvokeSuper
         @Override
         public void destroy() {
             super.destroy();
diff --git a/engine/table/src/main/java/io/deephaven/engine/table/impl/util/HashSetBackedTableFactory.java b/engine/table/src/main/java/io/deephaven/engine/table/impl/util/HashSetBackedTableFactory.java
index ca8259f8a1c..4d5c366cae8 100644
--- a/engine/table/src/main/java/io/deephaven/engine/table/impl/util/HashSetBackedTableFactory.java
+++ b/engine/table/src/main/java/io/deephaven/engine/table/impl/util/HashSetBackedTableFactory.java
@@ -23,6 +23,7 @@
 import io.deephaven.engine.updategraph.UpdateGraph;
 import io.deephaven.tuple.ArrayTuple;
 
+import javax.annotation.OverridingMethodsMustInvokeSuper;
 import java.util.HashSet;
 import java.util.LinkedHashMap;
 import java.util.Map;
@@ -187,6 +188,7 @@ public void run() {
             }
         }
 
+        @OverridingMethodsMustInvokeSuper
         @Override
         public void destroy() {
             super.destroy();
diff --git a/engine/table/src/main/java/io/deephaven/engine/table/impl/util/RuntimeMemory.java b/engine/table/src/main/java/io/deephaven/engine/table/impl/util/RuntimeMemory.java
index 156528fec5d..944cee6872c 100644
--- a/engine/table/src/main/java/io/deephaven/engine/table/impl/util/RuntimeMemory.java
+++ b/engine/table/src/main/java/io/deephaven/engine/table/impl/util/RuntimeMemory.java
@@ -152,6 +152,18 @@ void copy(final Sample s) {
             totalCollections = s.totalCollections;
             totalCollectionTimeMs = s.totalCollectionTimeMs;
         }
+
+        @Override
+        public String toString() {
+            final DecimalFormat format = new DecimalFormat("###,###");
+            return "Sample{" +
+                    "usedMemory (calculated)=" + format.format(totalMemory - freeMemory) +
+                    ", freeMemory=" + format.format(freeMemory) +
+                    ", totalMemory=" + format.format(totalMemory) +
+                    ", totalCollections=" + format.format(totalCollections) +
+                    ", totalCollectionTimeMs=" + format.format(totalCollectionTimeMs) +
+                    '}';
+        }
     }
 
     /**
diff --git a/engine/table/src/main/java/io/deephaven/engine/table/impl/util/ShiftData.java b/engine/table/src/main/java/io/deephaven/engine/table/impl/util/ShiftData.java
deleted file mode 100644
index 1e3f9859561..00000000000
--- a/engine/table/src/main/java/io/deephaven/engine/table/impl/util/ShiftData.java
+++ /dev/null
@@ -1,142 +0,0 @@
-//
-// Copyright (c) 2016-2024 Deephaven Data Labs and Patent Pending
-//
-package io.deephaven.engine.table.impl.util;
-
-import gnu.trove.list.TLongList;
-import gnu.trove.list.array.TLongArrayList;
-import io.deephaven.engine.rowset.RowSet;
-
-public class ShiftData {
-
-    private final TLongArrayList startIndex;
-    private final TLongArrayList endIndex;
-    private final TLongArrayList offsets;
-    private final int size;
-    private int runningSize = 0;
-    private long runningOffset = 0;
-
-    public RowSet getAddedPos() {
-        return addedPos;
-    }
-
-    private RowSet addedPos;
-
-    public ShiftData(RowSet rowSet, RowSet removed, RowSet added) {
-        TLongList[] removedKeys = rowSet.findMissing(removed);
-        addedPos = rowSet.invert(added);
-        endIndex = new TLongArrayList();
-        startIndex = new TLongArrayList();
-        offsets = new TLongArrayList();
-        int removedIndex = 0;
-        TLongList removedPositions = removedKeys[0];
-        TLongList removedCount = removedKeys[1];
-        for (RowSet.RangeIterator addedIt = addedPos.rangeIterator(); addedIt.hasNext();) {
-            addedIt.next();
-            int startOffset = (int) addedIt.currentRangeStart();
-            int endOffset = (int) addedIt.currentRangeEnd();
-            while (removedIndex < removedPositions.size() && removedPositions.get(removedIndex) < startOffset) {
-                removeRange(removedPositions.get(removedIndex), removedCount.get(removedIndex));
-                removedIndex++;
-            }
-            int deleteCount = 0;
-            while (removedIndex < removedPositions.size() && removedPositions.get(removedIndex) <= endOffset) {
-                deleteCount += removedCount.get(removedIndex);
-                removedIndex++;
-            }
-            addRange(startOffset, endOffset, deleteCount);
-        }
-        while (removedIndex < removedPositions.size()) {
-            removeRange(removedPositions.get(removedIndex), removedCount.get(removedIndex));
-            removedIndex++;
-        }
-        if (runningSize > 0) {
-            if (startIndex.get(runningSize - 1) <= (rowSet.size() - added.size() + removed.size() - 1)) {
-                endIndex.set(runningSize - 1, (int) (rowSet.size() - added.size() + removed.size() - 1));
-            } else {
-                runningSize--;
-            }
-        }
-        size = runningSize;
-    }
-
-    void addRange(long firstIndex, long lastIndex, long deletionCount) {
-        if (lastIndex - firstIndex + 1 == deletionCount) {
-            return;
-        }
-        if (runningSize > 0) {
-            endIndex.set(runningSize - 1, firstIndex - runningOffset - 1);
-        }
-
-
-        long newStartIndex = firstIndex + deletionCount - runningOffset;
-        runningOffset = lastIndex + runningOffset + 1 - (deletionCount + firstIndex);
-
-        if (runningSize > 0 && ((newStartIndex + runningOffset) == (startIndex.get(runningSize - 1)
-                + offsets.get(runningSize - 1)))) {
-            startIndex.set(runningSize - 1, newStartIndex);
-            offsets.set(runningSize - 1, runningOffset);
-        } else {
-            startIndex.add(newStartIndex);
-            offsets.add(runningOffset);
-            endIndex.add(0);
-            runningSize++;
-        }
-    }
-
-    void removeRange(long firstIndex, long count) {
-        if (runningSize > 0) {
-            endIndex.set(runningSize - 1, firstIndex - runningOffset - 1);
-        }
-
-        long newStartIndex = firstIndex - runningOffset + count;
-        runningOffset = runningOffset - count;
-
-        if (runningSize > 0
-                && (newStartIndex + runningOffset == startIndex.get(runningSize - 1) + offsets.get(runningSize - 1))) {
-            startIndex.set(runningSize - 1, newStartIndex);
-            offsets.set(runningSize - 1, runningOffset);
-        } else {
-            startIndex.add(newStartIndex);
-            offsets.add(runningOffset);
-            endIndex.add(0);
-            runningSize++;
-        }
-    }
-
-    public interface ShiftCallback {
-        void shift(long start, long end, long offset);
-    }
-
-    public interface RowSetShiftCallback {
-        void shift(RowSet rowSet, long offset);
-    }
-
-    public void applyDataShift(ShiftCallback shiftCallback) {
-        int startPos = 0;
-        int currentPos = 0;
-        while (currentPos < size) {
-            if (offsets.get(startPos) > 0) {
-                while (currentPos < size && offsets.get(currentPos) > 0) {
-                    currentPos++;
-                }
-                for (int ii = currentPos - 1; ii >= startPos; ii--) {
-                    shiftCallback.shift(startIndex.get(ii), endIndex.get(ii), offsets.get(ii));
-                }
-            } else if (offsets.get(startPos) < 0) {
-                while (currentPos < size && offsets.get(currentPos) < 0) {
-                    currentPos++;
-                }
-                for (int ii = startPos; ii < currentPos; ii++) {
-                    shiftCallback.shift(startIndex.get(ii), endIndex.get(ii), offsets.get(ii));
-                }
-            } else {
-                while (currentPos < size && offsets.get(currentPos) == 0) {
-                    currentPos++;
-                }
-            }
-            startPos = currentPos;
-        }
-    }
-
-}
diff --git a/engine/table/src/main/java/io/deephaven/engine/table/lang/impl/QueryLibraryImportsDefaults.java b/engine/table/src/main/java/io/deephaven/engine/table/lang/impl/QueryLibraryImportsDefaults.java
index 5ef0ad1890e..d06ba6c2b8a 100644
--- a/engine/table/src/main/java/io/deephaven/engine/table/lang/impl/QueryLibraryImportsDefaults.java
+++ b/engine/table/src/main/java/io/deephaven/engine/table/lang/impl/QueryLibraryImportsDefaults.java
@@ -79,6 +79,7 @@ public Set<Class<?>> classes() {
                 LongSizedDataStructure.class,
                 ConcurrentHashMap.class,
                 Chunk.class,
+                BooleanChunk.class,
                 ByteChunk.class,
                 CharChunk.class,
                 ShortChunk.class,
@@ -88,6 +89,7 @@ public Set<Class<?>> classes() {
                 DoubleChunk.class,
                 ObjectChunk.class,
                 WritableChunk.class,
+                WritableBooleanChunk.class,
                 WritableByteChunk.class,
                 WritableCharChunk.class,
                 WritableShortChunk.class,
diff --git a/engine/table/src/main/java/io/deephaven/engine/util/AbstractScriptSession.java b/engine/table/src/main/java/io/deephaven/engine/util/AbstractScriptSession.java
index c1f1705b626..31f5f021c27 100644
--- a/engine/table/src/main/java/io/deephaven/engine/util/AbstractScriptSession.java
+++ b/engine/table/src/main/java/io/deephaven/engine/util/AbstractScriptSession.java
@@ -24,6 +24,7 @@
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
+import javax.annotation.OverridingMethodsMustInvokeSuper;
 import java.io.File;
 import java.io.IOException;
 import java.nio.file.Files;
@@ -240,6 +241,7 @@ public Changes evaluateScript(Path scriptPath) {
         }
     }
 
+    @OverridingMethodsMustInvokeSuper
     @Override
     protected void destroy() {
         super.destroy();
diff --git a/engine/table/src/main/java/io/deephaven/engine/util/BigDecimalUtils.java b/engine/table/src/main/java/io/deephaven/engine/util/BigDecimalUtils.java
index fe192c436da..eab692ec961 100644
--- a/engine/table/src/main/java/io/deephaven/engine/util/BigDecimalUtils.java
+++ b/engine/table/src/main/java/io/deephaven/engine/util/BigDecimalUtils.java
@@ -3,31 +3,37 @@
 //
 package io.deephaven.engine.util;
 
-import io.deephaven.chunk.ObjectChunk;
-import io.deephaven.chunk.attributes.Values;
-import io.deephaven.engine.rowset.RowSequence;
+import io.deephaven.engine.primitive.iterator.CloseableIterator;
 import io.deephaven.engine.rowset.RowSet;
-import io.deephaven.engine.table.ChunkSource;
 import io.deephaven.engine.table.ColumnSource;
 import io.deephaven.engine.table.Table;
+import io.deephaven.engine.table.vectors.ObjectVectorColumnWrapper;
+import io.deephaven.vector.ObjectVector;
+import io.deephaven.vector.Vector;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
 
 import java.math.BigDecimal;
+import java.util.Iterator;
 import java.util.Properties;
 
 /**
  * Utilities to support BigDecimal exhaust.
- *
+ * <p>
  * Parquet and Avro decimal types make a whole column decimal type have a fixed precision and scale; BigDecimal columns
  * in Deephaven are, each value, arbitrary precision (its own precision and scale).
- *
+ * <p>
  * For static tables, it is possible to compute overall precision and scale values that fit every existing value. For
  * refreshing tables, we need the user to tell us.
  */
 public class BigDecimalUtils {
-    private static final PrecisionAndScale EMPTY_TABLE_PRECISION_AND_SCALE = new PrecisionAndScale(1, 1);
-    private static final int TARGET_CHUNK_SIZE = 4096;
+
     public static final int INVALID_PRECISION_OR_SCALE = -1;
 
+    private static final PrecisionAndScale EMPTY_TABLE_PRECISION_AND_SCALE = new PrecisionAndScale(1, 1);
+    private static final int INIT_MAX_PRECISION_MINUS_SCALE = -1;
+    private static final int INIT_MAX_SCALE = -1;
+
     /**
      * Immutable way to store and pass precision and scale values.
      */
@@ -44,14 +50,16 @@ public PrecisionAndScale(final int precision, final int scale) {
     /**
      * Compute an overall precision and scale that would fit all existing values in a table.
      *
-     * @param t a Deephaven table
-     * @param colName a Column for {@code t}, which should be of {@code BigDecimal} type
-     * @return a {@code PrecisionAndScale} object result.
+     * @param table A Deephaven table
+     * @param colName Column for {@code table}, which should be of {@code BigDecimal} {@link ColumnSource#getType type}
+     *        or {@link ColumnSource#getComponentType component type}
+     * @return A {@link PrecisionAndScale} object result.
      */
     public static PrecisionAndScale computePrecisionAndScale(
-            final Table t, final String colName) {
-        final ColumnSource<BigDecimal> src = t.getColumnSource(colName, BigDecimal.class);
-        return computePrecisionAndScale(t.getRowSet(), src);
+            final Table table,
+            final String colName) {
+        final ColumnSource<?> src = table.getColumnSource(colName);
+        return computePrecisionAndScale(table.getRowSet(), src);
     }
 
     /**
@@ -59,12 +67,13 @@ public static PrecisionAndScale computePrecisionAndScale(
      * requires a full table scan to ensure the correct values are determined.
      *
      * @param rowSet The rowset for the provided column
-     * @param source a {@code ColumnSource} of {@code BigDecimal} type
-     * @return a {@code PrecisionAndScale} object result.
+     * @param columnSource A {@code ColumnSource} of {@code BigDecimal} {@link ColumnSource#getType type} or
+     *        {@link ColumnSource#getComponentType component type}
+     * @return A {@link PrecisionAndScale} object result.
      */
     public static PrecisionAndScale computePrecisionAndScale(
             final RowSet rowSet,
-            final ColumnSource<BigDecimal> source) {
+            final ColumnSource<?> columnSource) {
         if (rowSet.isEmpty()) {
             return EMPTY_TABLE_PRECISION_AND_SCALE;
         }
@@ -72,39 +81,94 @@ public static PrecisionAndScale computePrecisionAndScale(
         // We will walk the entire table to determine the max(precision - scale) and
         // max(scale), which corresponds to max(digits left of the decimal point), max(digits right of the decimal
         // point). Then we convert to (precision, scale) before returning.
-        int maxPrecisionMinusScale = -1;
-        int maxScale = -1;
-        try (final ChunkSource.GetContext context = source.makeGetContext(TARGET_CHUNK_SIZE);
-                final RowSequence.Iterator it = rowSet.getRowSequenceIterator()) {
-            while (it.hasMore()) {
-                final RowSequence rowSeq = it.getNextRowSequenceWithLength(TARGET_CHUNK_SIZE);
-                final ObjectChunk<BigDecimal, ? extends Values> chunk =
-                        source.getChunk(context, rowSeq).asObjectChunk();
-                for (int i = 0; i < chunk.size(); ++i) {
-                    final BigDecimal x = chunk.get(i);
-                    if (x == null) {
-                        continue;
-                    }
-
-                    final int precision = x.precision();
-                    final int scale = x.scale();
-                    final int precisionMinusScale = precision - scale;
-                    if (precisionMinusScale > maxPrecisionMinusScale) {
-                        maxPrecisionMinusScale = precisionMinusScale;
-                    }
-                    if (scale > maxScale) {
-                        maxScale = scale;
-                    }
+        final BigDecimalParameters result = new BigDecimalParameters(INIT_MAX_PRECISION_MINUS_SCALE, INIT_MAX_SCALE);
+        final ObjectVector<?> columnVector = new ObjectVectorColumnWrapper<>(columnSource, rowSet);
+        try (final CloseableIterator<?> columnIterator = columnVector.iterator()) {
+            final Class<?> columnType = columnSource.getType();
+            if (columnType == BigDecimal.class) {
+                // noinspection unchecked
+                processFlatColumn((Iterator<BigDecimal>) columnIterator, result);
+            } else if (columnSource.getComponentType() == BigDecimal.class) {
+                if (columnType.isArray()) {
+                    // noinspection unchecked
+                    processArrayColumn((Iterator<BigDecimal[]>) columnIterator, result);
+                } else if (Vector.class.isAssignableFrom(columnType)) {
+                    // noinspection unchecked
+                    processVectorColumn((Iterator<ObjectVector<BigDecimal>>) columnIterator, result);
                 }
+            } else {
+                throw new IllegalArgumentException("Column source is not of type BigDecimal or an array/vector of " +
+                        "BigDecimal, but of type " + columnType + " and component type " +
+                        columnSource.getComponentType());
             }
         }
 
-        // If these are < 0, then every value we visited was null
-        if (maxPrecisionMinusScale < 0 && maxScale < 0) {
+        // If these are same as initial values, then every value we visited was null
+        if (result.maxPrecisionMinusScale == INIT_MAX_PRECISION_MINUS_SCALE && result.maxScale == INIT_MAX_SCALE) {
             return EMPTY_TABLE_PRECISION_AND_SCALE;
         }
 
-        return new PrecisionAndScale(maxPrecisionMinusScale + maxScale, maxScale);
+        return new PrecisionAndScale(result.maxPrecisionMinusScale + result.maxScale, result.maxScale);
+    }
+
+    private static class BigDecimalParameters {
+        private int maxPrecisionMinusScale;
+        private int maxScale;
+
+        private BigDecimalParameters(final int maxPrecisionMinusScale, final int maxScale) {
+            this.maxPrecisionMinusScale = maxPrecisionMinusScale;
+            this.maxScale = maxScale;
+        }
+
+        /**
+         * Update the maximum values for the parameters based on the given value.
+         */
+        private void updateMaximum(@Nullable final BigDecimal value) {
+            if (value == null) {
+                return;
+            }
+            final int precision = value.precision();
+            final int scale = value.scale();
+            final int precisionMinusScale = precision - scale;
+            if (precisionMinusScale > maxPrecisionMinusScale) {
+                maxPrecisionMinusScale = precisionMinusScale;
+            }
+            if (scale > maxScale) {
+                maxScale = scale;
+            }
+        }
+    }
+
+    private static void processFlatColumn(
+            @NotNull final Iterator<BigDecimal> columnIterator,
+            @NotNull final BigDecimalParameters result) {
+        columnIterator.forEachRemaining(result::updateMaximum);
+    }
+
+    private static void processVectorColumn(
+            @NotNull final Iterator<ObjectVector<BigDecimal>> columnIterator,
+            @NotNull final BigDecimalParameters result) {
+        columnIterator.forEachRemaining(values -> {
+            if (values == null) {
+                return;
+            }
+            try (final CloseableIterator<BigDecimal> valuesIterator = values.iterator()) {
+                valuesIterator.forEachRemaining(result::updateMaximum);
+            }
+        });
+    }
+
+    private static void processArrayColumn(
+            @NotNull final Iterator<BigDecimal[]> columnIterator,
+            @NotNull final BigDecimalParameters result) {
+        columnIterator.forEachRemaining(values -> {
+            if (values == null) {
+                return;
+            }
+            for (final BigDecimal value : values) {
+                result.updateMaximum(value);
+            }
+        });
     }
 
     /**
diff --git a/engine/table/src/main/java/io/deephaven/engine/util/PyCallableWrapper.java b/engine/table/src/main/java/io/deephaven/engine/util/PyCallableWrapper.java
index bcbcfb5462a..11c560804d8 100644
--- a/engine/table/src/main/java/io/deephaven/engine/util/PyCallableWrapper.java
+++ b/engine/table/src/main/java/io/deephaven/engine/util/PyCallableWrapper.java
@@ -56,6 +56,7 @@ public String getName() {
     class Signature {
         private final List<Parameter> parameters;
         private final Class<?> returnType;
+        public final static Signature EMPTY = new Signature(List.of(), null);
 
         public Signature(List<Parameter> parameters, Class<?> returnType) {
             this.parameters = parameters;
diff --git a/engine/table/src/main/java/io/deephaven/engine/util/PyCallableWrapperJpyImpl.java b/engine/table/src/main/java/io/deephaven/engine/util/PyCallableWrapperJpyImpl.java
index fe8dc367439..df25e5ba29e 100644
--- a/engine/table/src/main/java/io/deephaven/engine/util/PyCallableWrapperJpyImpl.java
+++ b/engine/table/src/main/java/io/deephaven/engine/util/PyCallableWrapperJpyImpl.java
@@ -193,18 +193,29 @@ private void prepareSignature() {
             vectorized = false;
         }
         pyUdfDecorator = dh_udf_module.call("_udf_parser", pyCallable);
-        signatureString = pyUdfDecorator.getAttribute("signature").toString();
+        // The Python UDF parser failed to get/parse the callable's signature. This is likely due to it being
+        // a function in an extension module or a signature-less/multi-signature builtin function such as 'max'.
+        if (pyUdfDecorator.isNone()) {
+            pyUdfDecorator = null;
+            signature = Signature.EMPTY;
+        } else {
+            signatureString = pyUdfDecorator.getAttribute("signature").toString();
+        }
     }
 
 
     @Override
     public void parseSignature() {
-        if (signatureString != null) {
+        if (signature != null) {
             return;
         }
 
         prepareSignature();
 
+        if (signature == Signature.EMPTY) {
+            return;
+        }
+
         // the 'types' field of a vectorized function follows the pattern of '[ilhfdb?O]*->[ilhfdb?O]',
         // eg. [ll->d] defines two int64 (long) arguments and a double return type.
         if (signatureString == null || signatureString.isEmpty()) {
@@ -287,7 +298,16 @@ public static boolean isLosslessWideningPrimitiveConversion(@NotNull Class<?> or
     }
 
     public void verifyArguments(Class<?>[] argTypes) {
-        String callableName = pyCallable.getAttribute("__name__").toString();
+        if (signature == Signature.EMPTY) {
+            return;
+        }
+
+        String callableName;
+        if (pyCallable.hasAttribute("__name__")) {
+            callableName = pyCallable.getAttribute("__name__").toString();
+        } else {
+            callableName = pyCallable.toString();
+        }
         List<Parameter> parameters = signature.getParameters();
 
         if (parameters.size() == 0 && argTypes.length > 0) {
@@ -358,7 +378,7 @@ public void verifyArguments(Class<?>[] argTypes) {
 
     // In vectorized mode, we want to call the vectorized function directly.
     public PyObject vectorizedCallable() {
-        if (numbaVectorized) {
+        if (numbaVectorized || pyUdfDecorator == null) {
             return pyCallable;
         } else {
             return pyUdfDecorator.call("__call__", this.argTypesStr, true);
diff --git a/engine/table/src/main/java/io/deephaven/engine/util/TableDiff.java b/engine/table/src/main/java/io/deephaven/engine/util/TableDiff.java
index 3c8aa2a6624..156b8219c58 100644
--- a/engine/table/src/main/java/io/deephaven/engine/util/TableDiff.java
+++ b/engine/table/src/main/java/io/deephaven/engine/util/TableDiff.java
@@ -4,7 +4,6 @@
 package io.deephaven.engine.util;
 
 import io.deephaven.base.Pair;
-import io.deephaven.datastructures.util.CollectionUtil;
 import io.deephaven.engine.table.Context;
 import io.deephaven.engine.table.SharedContext;
 import io.deephaven.engine.table.Table;
@@ -62,9 +61,9 @@ static Pair<String, Long> diffInternal(Table actualResult, Table expectedResult,
         final Map<String, ? extends ColumnSource<?>> actualNameToColumnSource = actualResult.getColumnSourceMap();
         final Map<String, ? extends ColumnSource<?>> expectedNameToColumnSource = expectedResult.getColumnSourceMap();
         final String[] actualColumnNames =
-                actualResult.getDefinition().getColumnNames().toArray(CollectionUtil.ZERO_LENGTH_STRING_ARRAY);
+                actualResult.getDefinition().getColumnNames().toArray(String[]::new);
         final String[] expectedColumnNames =
-                expectedResult.getDefinition().getColumnNames().toArray(CollectionUtil.ZERO_LENGTH_STRING_ARRAY);
+                expectedResult.getDefinition().getColumnNames().toArray(String[]::new);
 
         for (final String actualColumnName : actualColumnNames) {
             if (!expectedNameToColumnSource.containsKey(actualColumnName)) {
@@ -183,7 +182,7 @@ public enum DiffItems {
          */
         DoublesExact,
         /**
-         * Columns that exist in both tables, but in diferent orders are not treated as differences.
+         * Columns that exist in both tables, but in different orders are not treated as differences.
          */
         ColumnsOrder,
         /**
diff --git a/engine/table/src/main/java/io/deephaven/engine/util/TableShowTools.java b/engine/table/src/main/java/io/deephaven/engine/util/TableShowTools.java
index 35aa40dbf8a..0d8d58e4125 100644
--- a/engine/table/src/main/java/io/deephaven/engine/util/TableShowTools.java
+++ b/engine/table/src/main/java/io/deephaven/engine/util/TableShowTools.java
@@ -3,7 +3,6 @@
 //
 package io.deephaven.engine.util;
 
-import io.deephaven.datastructures.util.CollectionUtil;
 import io.deephaven.engine.table.Table;
 import io.deephaven.engine.table.impl.perf.QueryPerformanceRecorder;
 import io.deephaven.engine.table.ColumnSource;
@@ -31,7 +30,7 @@ static void showInternal(Table source, long firstRow, long lastRowExclusive, Zon
         try (final SafeCloseable ignored = QueryPerformanceRecorder.getInstance().getNugget("TableTools.show()")) {
             if (columns.length == 0) {
                 final List<String> columnNames = source.getDefinition().getColumnNames();
-                columns = columnNames.toArray(CollectionUtil.ZERO_LENGTH_STRING_ARRAY);
+                columns = columnNames.toArray(String[]::new);
             }
             final ColumnSource[] columnSources =
                     Arrays.stream(columns).map(source::getColumnSource).toArray(ColumnSource[]::new);
diff --git a/engine/table/src/main/java/io/deephaven/engine/util/TableTools.java b/engine/table/src/main/java/io/deephaven/engine/util/TableTools.java
index 31d75090d91..2c4176012ad 100644
--- a/engine/table/src/main/java/io/deephaven/engine/util/TableTools.java
+++ b/engine/table/src/main/java/io/deephaven/engine/util/TableTools.java
@@ -7,14 +7,15 @@
 import io.deephaven.base.Pair;
 import io.deephaven.base.clock.Clock;
 import io.deephaven.base.verify.Require;
-import io.deephaven.datastructures.util.CollectionUtil;
 import io.deephaven.engine.context.ExecutionContext;
 import io.deephaven.engine.exceptions.ArgumentException;
 import io.deephaven.engine.rowset.WritableRowSet;
 import io.deephaven.engine.rowset.RowSequence;
 import io.deephaven.engine.rowset.RowSetFactory;
 import io.deephaven.engine.table.*;
+import io.deephaven.engine.table.impl.InMemoryTable;
 import io.deephaven.engine.table.impl.perf.QueryPerformanceRecorder;
+import io.deephaven.engine.table.impl.sources.NullValueColumnSource;
 import io.deephaven.internal.log.LoggerFactory;
 import io.deephaven.time.DateTimeUtils;
 import io.deephaven.engine.table.impl.QueryTable;
@@ -31,6 +32,7 @@
 import io.deephaven.util.annotations.ScriptApi;
 import io.deephaven.util.type.ArrayTypeUtils;
 import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
 
 import java.io.*;
 import java.nio.charset.StandardCharsets;
@@ -66,13 +68,13 @@ private static <T> BinaryOperator<T> throwingMerger() {
         };
     }
 
-    private static <T, K, U> Collector<T, ?, Map<K, U>> toLinkedMap(
+    private static <T, K, U> Collector<T, ?, LinkedHashMap<K, U>> toLinkedMap(
             Function<? super T, ? extends K> keyMapper,
             Function<? super T, ? extends U> valueMapper) {
         return Collectors.toMap(keyMapper, valueMapper, throwingMerger(), LinkedHashMap::new);
     }
 
-    private static final Collector<ColumnHolder<?>, ?, Map<String, ColumnSource<?>>> COLUMN_HOLDER_LINKEDMAP_COLLECTOR =
+    private static final Collector<ColumnHolder<?>, ?, LinkedHashMap<String, ColumnSource<?>>> COLUMN_HOLDER_LINKEDMAP_COLLECTOR =
             toLinkedMap(ColumnHolder::getName, ColumnHolder::getColumnSource);
 
     /////////// Utilities To Display Tables /////////////////
@@ -731,7 +733,7 @@ public static Table newTable(long size, Map<String, ColumnSource<?>> columns) {
     public static Table newTable(TableDefinition definition) {
         Map<String, ColumnSource<?>> columns = new LinkedHashMap<>();
         for (ColumnDefinition<?> columnDefinition : definition.getColumns()) {
-            columns.put(columnDefinition.getName(), ArrayBackedColumnSource.getMemoryColumnSource(0,
+            columns.put(columnDefinition.getName(), NullValueColumnSource.getInstance(
                     columnDefinition.getDataType(), columnDefinition.getComponentType()));
         }
         return new QueryTable(definition, RowSetFactory.empty().toTracking(), columns) {
@@ -751,22 +753,65 @@ public static Table newTable(ColumnHolder<?>... columnHolders) {
         checkSizes(columnHolders);
         WritableRowSet rowSet = getRowSet(columnHolders);
         Map<String, ColumnSource<?>> columns = Arrays.stream(columnHolders).collect(COLUMN_HOLDER_LINKEDMAP_COLLECTOR);
-        return new QueryTable(rowSet.toTracking(), columns) {
-            {
-                setFlat();
-            }
-        };
+        QueryTable queryTable = new QueryTable(rowSet.toTracking(), columns);
+        queryTable.setFlat();
+        return queryTable;
     }
 
     public static Table newTable(TableDefinition definition, ColumnHolder<?>... columnHolders) {
+        return newTable(definition, null, columnHolders);
+    }
+
+    public static Table newTable(TableDefinition definition, @Nullable Map<String, Object> attributes,
+            ColumnHolder<?>... columnHolders) {
         checkSizes(columnHolders);
-        WritableRowSet rowSet = getRowSet(columnHolders);
-        Map<String, ColumnSource<?>> columns = Arrays.stream(columnHolders).collect(COLUMN_HOLDER_LINKEDMAP_COLLECTOR);
-        return new QueryTable(definition, rowSet.toTracking(), columns) {
-            {
-                setFlat();
-            }
+        final WritableRowSet rowSet = getRowSet(columnHolders);
+        final LinkedHashMap<String, ColumnSource<?>> columns =
+                Arrays.stream(columnHolders).collect(COLUMN_HOLDER_LINKEDMAP_COLLECTOR);
+        final QueryTable queryTable = new QueryTable(definition, rowSet.toTracking(), columns, null, attributes);
+        queryTable.setFlat();
+        return queryTable;
+    }
+
+    /**
+     * Creates a metadata {@link Table} representing the columns in {@code definition}. Will include the following
+     * columns:
+     * <dl>
+     * <dt>Name</dt>
+     * <dd>{@link ColumnDefinition#getName()}</dd>
+     * <dt>DataType</dt>
+     * <dd>From {@link ColumnDefinition#getDataType()}, result of {@link Class#getCanonicalName()} if non-{@code null},
+     * else {@link Class#getName()}</dd>
+     * <dt>ColumnType</dt>
+     * <dd>{@code ColumnDefinition#getColumnType()}</dd>
+     * <dt>IsPartitioning</dt>
+     * <dd>{@link ColumnDefinition#isPartitioning()}</dd>
+     * </dl>
+     *
+     * @param definition the definition
+     * @return the metadata Table
+     */
+    public static Table metaTable(TableDefinition definition) {
+        List<String> columnNames = new ArrayList<>();
+        List<String> columnDataTypes = new ArrayList<>();
+        List<String> columnTypes = new ArrayList<>();
+        List<Boolean> columnPartitioning = new ArrayList<>();
+        for (ColumnDefinition<?> cDef : definition.getColumns()) {
+            columnNames.add(cDef.getName());
+            final Class<?> dataType = cDef.getDataType();
+            final String dataTypeName = dataType.getCanonicalName();
+            columnDataTypes.add(dataTypeName == null ? dataType.getName() : dataTypeName);
+            columnTypes.add(cDef.getColumnType().name());
+            columnPartitioning.add(cDef.isPartitioning());
+        }
+        final String[] resultColumnNames = {"Name", "DataType", "ColumnType", "IsPartitioning"};
+        final Object[] resultValues = {
+                columnNames.toArray(String[]::new),
+                columnDataTypes.toArray(String[]::new),
+                columnTypes.toArray(String[]::new),
+                columnPartitioning.toArray(new Boolean[0]),
         };
+        return new InMemoryTable(resultColumnNames, resultValues);
     }
 
     private static void checkSizes(ColumnHolder<?>[] columnHolders) {
@@ -1075,7 +1120,7 @@ public static Table roundDecimalColumns(Table table) {
                 columnsToRound.add(columnDefinition.getName());
             }
         }
-        return roundDecimalColumns(table, columnsToRound.toArray(CollectionUtil.ZERO_LENGTH_STRING_ARRAY));
+        return roundDecimalColumns(table, columnsToRound.toArray(String[]::new));
     }
 
     /**
@@ -1100,7 +1145,7 @@ public static Table roundDecimalColumnsExcept(Table table, String... columnsNotT
                 columnsToRound.add(colName);
             }
         }
-        return roundDecimalColumns(table, columnsToRound.toArray(CollectionUtil.ZERO_LENGTH_STRING_ARRAY));
+        return roundDecimalColumns(table, columnsToRound.toArray(String[]::new));
     }
 
     /**
@@ -1124,7 +1169,7 @@ public static Table roundDecimalColumns(Table table, String... columns) {
                 throw new IllegalArgumentException("Column \"" + colName + "\" is not a decimal column!");
             updateDescriptions.add(colName + "=round(" + colName + ')');
         }
-        return table.updateView(updateDescriptions.toArray(CollectionUtil.ZERO_LENGTH_STRING_ARRAY));
+        return table.updateView(updateDescriptions.toArray(String[]::new));
     }
 
     /**
diff --git a/engine/table/src/main/java/io/deephaven/engine/util/TotalsTableBuilder.java b/engine/table/src/main/java/io/deephaven/engine/util/TotalsTableBuilder.java
index 41db32cff3a..54c443b3fd6 100644
--- a/engine/table/src/main/java/io/deephaven/engine/util/TotalsTableBuilder.java
+++ b/engine/table/src/main/java/io/deephaven/engine/util/TotalsTableBuilder.java
@@ -21,7 +21,6 @@
 import java.util.stream.Stream;
 
 import static io.deephaven.api.agg.Aggregation.*;
-import static io.deephaven.datastructures.util.CollectionUtil.ZERO_LENGTH_STRING_ARRAY;
 import static io.deephaven.engine.table.Table.TOTALS_TABLE_ATTRIBUTE;
 
 /**
@@ -591,7 +590,7 @@ private static String[] makeColumnFormats(Table source, TotalsTableBuilder build
             }
         });
 
-        return formatSpecs.toArray(ZERO_LENGTH_STRING_ARRAY);
+        return formatSpecs.toArray(String[]::new);
     }
 
 
@@ -635,7 +634,7 @@ public static Collection<? extends Aggregation> makeAggregations(Table source, T
         }
 
         return columnsByType.entrySet().stream()
-                .flatMap(e -> makeOperation(e.getKey(), e.getValue().toArray(ZERO_LENGTH_STRING_ARRAY)))
+                .flatMap(e -> makeOperation(e.getKey(), e.getValue().toArray(String[]::new)))
                 .collect(Collectors.toList());
     }
 
diff --git a/engine/table/src/main/java/io/deephaven/engine/util/WindowCheck.java b/engine/table/src/main/java/io/deephaven/engine/util/WindowCheck.java
index 278814c44b0..2bf3bdb8229 100644
--- a/engine/table/src/main/java/io/deephaven/engine/util/WindowCheck.java
+++ b/engine/table/src/main/java/io/deephaven/engine/util/WindowCheck.java
@@ -15,11 +15,7 @@
 import io.deephaven.engine.rowset.*;
 import io.deephaven.engine.rowset.RowSetFactory;
 import io.deephaven.engine.rowset.chunkattributes.OrderedRowKeys;
-import io.deephaven.engine.table.ChunkSource;
-import io.deephaven.engine.table.ModifiedColumnSet;
-import io.deephaven.engine.table.SharedContext;
-import io.deephaven.engine.table.Table;
-import io.deephaven.engine.table.TableUpdate;
+import io.deephaven.engine.table.*;
 import io.deephaven.engine.table.impl.TableUpdateImpl;
 import io.deephaven.engine.table.impl.perf.QueryPerformanceRecorder;
 import io.deephaven.engine.table.impl.sources.ReinterpretUtils;
@@ -29,15 +25,17 @@
 import io.deephaven.time.DateTimeUtils;
 import io.deephaven.engine.table.impl.*;
 import io.deephaven.engine.table.impl.AbstractColumnSource;
-import io.deephaven.engine.table.ColumnSource;
 import io.deephaven.engine.table.impl.MutableColumnSourceGetDefaults;
 import io.deephaven.base.RAPriQueue;
 import io.deephaven.util.QueryConstants;
+import io.deephaven.util.annotations.InternalUseOnly;
 import it.unimi.dsi.fastutil.longs.Long2ObjectAVLTreeMap;
 import it.unimi.dsi.fastutil.longs.Long2ObjectMap;
 import it.unimi.dsi.fastutil.longs.LongBidirectionalIterator;
 import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
 
+import javax.annotation.OverridingMethodsMustInvokeSuper;
 import java.util.*;
 
 /**
@@ -92,7 +90,8 @@ private WindowListenerRecorder(Table parent, BaseTable<?> dependent) {
      * @param addToMonitor should we add this to the PeriodicUpdateGraph
      * @return a pair of the result table and the TimeWindowListener that drives it
      */
-    static Pair<Table, TimeWindowListener> addTimeWindowInternal(Clock clock, QueryTable table,
+    @InternalUseOnly
+    public static Pair<Table, TimeWindowListener> addTimeWindowInternal(Clock clock, QueryTable table,
             String timestampColumn, long windowNanos, String inWindowColumn, boolean addToMonitor) {
         if (table.isRefreshing()) {
             table.getUpdateGraph().checkInitiateSerialTableOperation();
@@ -111,19 +110,28 @@ static Pair<Table, TimeWindowListener> addTimeWindowInternal(Clock clock, QueryT
 
         final QueryTable result = new QueryTable(table.getRowSet(), resultColumns);
         final WindowListenerRecorder recorder = new WindowListenerRecorder(table, result);
-        final TimeWindowListener timeWindowListener =
-                new TimeWindowListener(inWindowColumn, inWindowColumnSource, recorder, table, result);
-        recorder.setMergedListener(timeWindowListener);
+        final TimeWindowListenerImpl timeWindowListenerImpl =
+                new TimeWindowListenerImpl(inWindowColumn, inWindowColumnSource, recorder, table, result);
+        recorder.setMergedListener(timeWindowListenerImpl);
         if (table.isRefreshing()) {
             table.addUpdateListener(recorder);
         }
-        timeWindowListener.addRowSequence(table.getRowSet(), false);
-        result.addParentReference(timeWindowListener);
-        result.manage(table);
+        timeWindowListenerImpl.addRowSequence(table.getRowSet(), false);
+        result.addParentReference(timeWindowListenerImpl);
         if (addToMonitor) {
-            result.getUpdateGraph().addSource(timeWindowListener);
+            result.getUpdateGraph().addSource(timeWindowListenerImpl);
         }
-        return new Pair<>(result, timeWindowListener);
+        return new Pair<>(result, timeWindowListenerImpl);
+    }
+
+    /**
+     * This interface is only for Deephaven internal use.
+     */
+    @InternalUseOnly
+    public interface TimeWindowListener extends Runnable {
+        void validateQueue();
+
+        void dumpQueue();
     }
 
     /**
@@ -134,7 +142,7 @@ static Pair<Table, TimeWindowListener> addTimeWindowInternal(Clock clock, QueryT
      * It implements {@link Runnable}, so that we can be inserted into the {@link PeriodicUpdateGraph}.
      * </p>
      */
-    static class TimeWindowListener extends MergedListener implements Runnable {
+    static class TimeWindowListenerImpl extends MergedListener implements TimeWindowListener {
         private final InWindowColumnSource inWindowColumnSource;
         private final QueryTable result;
         /**
@@ -202,9 +210,9 @@ public String toString() {
          * @param source the source table
          * @param result our initialized result table
          */
-        private TimeWindowListener(final String inWindowColumnName, final InWindowColumnSource inWindowColumnSource,
+        private TimeWindowListenerImpl(final String inWindowColumnName, final InWindowColumnSource inWindowColumnSource,
                 final ListenerRecorder recorder, final QueryTable source, final QueryTable result) {
-            super(Collections.singleton(recorder), Collections.singleton(source), "WindowCheck", result);
+            super(Collections.singleton(recorder), List.of(), "WindowCheck", result);
             this.source = source;
             this.recorder = recorder;
             this.inWindowColumnSource = inWindowColumnSource;
@@ -802,7 +810,8 @@ private RowSet recomputeModified() {
             return builder.build();
         }
 
-        void validateQueue() {
+        @Override
+        public void validateQueue() {
             final RowSet resultRowSet = result.getRowSet();
             final RowSetBuilderRandom builder = RowSetFactory.builderRandom();
 
@@ -866,7 +875,8 @@ void validateQueue() {
             }
         }
 
-        void dumpQueue() {
+        @Override
+        public void dumpQueue() {
             final Entry[] entries = new Entry[priorityQueue.size()];
             priorityQueue.dump(entries, 0);
             System.out.println("Queue size: " + entries.length);
@@ -882,6 +892,7 @@ void dumpQueue() {
             }
         }
 
+        @OverridingMethodsMustInvokeSuper
         @Override
         public void destroy() {
             super.destroy();
@@ -1048,5 +1059,52 @@ private long timeStampForPrev() {
             final long currentStep = updateGraph.clock().currentStep();
             return (clockStep < currentStep || clockStep == initialStep) ? currentTime : prevTime;
         }
+
+        @Override
+        public WritableRowSet match(boolean invertMatch, boolean usePrev, boolean caseInsensitive,
+                @Nullable DataIndex dataIndex, @NotNull RowSet mapper, Object... keys) {
+            final List<Object> keysList = Arrays.asList(keys);
+            final boolean includeNull = keysList.contains(null) ^ invertMatch;
+            final boolean includeTrue = keysList.contains(true) ^ invertMatch;
+            final boolean includeFalse = keysList.contains(false) ^ invertMatch;
+
+            final int getSize = (int) Math.min(4096, mapper.size());
+
+            final RowSetBuilderSequential builder = RowSetFactory.builderSequential();
+
+            try (final GetContext getContext = timeStampSource.makeGetContext(getSize);
+                    final RowSequence.Iterator rsit = mapper.getRowSequenceIterator()) {
+                while (rsit.hasMore()) {
+                    final RowSequence chunkRs = rsit.getNextRowSequenceWithLength(getSize);
+                    final LongChunk<OrderedRowKeys> rowKeys = chunkRs.asRowKeyChunk();
+                    final LongChunk<? extends Values> timeStamps;
+                    if (usePrev) {
+                        timeStamps = timeStampSource.getPrevChunk(getContext, chunkRs).asLongChunk();
+                    } else {
+                        timeStamps = timeStampSource.getChunk(getContext, chunkRs).asLongChunk();
+                    }
+                    final int chunkSize = rowKeys.size();
+                    for (int ii = 0; ii < chunkSize; ++ii) {
+                        final long rowKey = rowKeys.get(ii);
+                        final Boolean inWindow = computeInWindow(timeStamps.get(ii), currentTime);
+                        if (inWindow == null) {
+                            if (includeNull) {
+                                builder.appendKey(rowKey);
+                            }
+                        } else if (inWindow) {
+                            if (includeTrue) {
+                                builder.appendKey(rowKey);
+                            }
+                        } else {
+                            if (includeFalse) {
+                                builder.appendKey(rowKey);
+                            }
+                        }
+                    }
+                }
+            }
+
+            return builder.build();
+        }
     }
 }
diff --git a/engine/table/src/main/java/io/deephaven/libs/GroovyStaticImports.java b/engine/table/src/main/java/io/deephaven/libs/GroovyStaticImports.java
index fcdd8102b47..555cf5b3faa 100644
--- a/engine/table/src/main/java/io/deephaven/libs/GroovyStaticImports.java
+++ b/engine/table/src/main/java/io/deephaven/libs/GroovyStaticImports.java
@@ -43,6 +43,12 @@
  * @see io.deephaven.function
  */
 public class GroovyStaticImports {
+    /** @see io.deephaven.function.Numeric#IEEEremainder(double,double) */
+    public static  double IEEEremainder( double x, double y ) {return Numeric.IEEEremainder( x, y );}
+
+    /** @see io.deephaven.function.Numeric#IEEEremainder(float,float) */
+    public static  float IEEEremainder( float x, float y ) {return Numeric.IEEEremainder( x, y );}
+
     /** @see io.deephaven.function.Numeric#abs(byte) */
     public static  byte abs( byte value ) {return Numeric.abs( value );}
 
@@ -133,6 +139,18 @@ public class GroovyStaticImports {
     /** @see io.deephaven.function.Numeric#acos(short) */
     public static  double acos( short value ) {return Numeric.acos( value );}
 
+    /** @see io.deephaven.function.Numeric#addExact(byte,byte) */
+    public static  byte addExact( byte x, byte y ) {return Numeric.addExact( x, y );}
+
+    /** @see io.deephaven.function.Numeric#addExact(int,int) */
+    public static  int addExact( int x, int y ) {return Numeric.addExact( x, y );}
+
+    /** @see io.deephaven.function.Numeric#addExact(long,long) */
+    public static  long addExact( long x, long y ) {return Numeric.addExact( x, y );}
+
+    /** @see io.deephaven.function.Numeric#addExact(short,short) */
+    public static  short addExact( short x, short y ) {return Numeric.addExact( x, y );}
+
     /** @see io.deephaven.function.Logic#and(java.lang.Boolean[]) */
     public static  java.lang.Boolean and( java.lang.Boolean... values ) {return Logic.and( values );}
 
@@ -208,6 +226,24 @@ public class GroovyStaticImports {
     /** @see io.deephaven.function.Numeric#atan(short) */
     public static  double atan( short value ) {return Numeric.atan( value );}
 
+    /** @see io.deephaven.function.Numeric#atan2(byte,byte) */
+    public static  double atan2( byte y, byte x ) {return Numeric.atan2( y, x );}
+
+    /** @see io.deephaven.function.Numeric#atan2(double,double) */
+    public static  double atan2( double y, double x ) {return Numeric.atan2( y, x );}
+
+    /** @see io.deephaven.function.Numeric#atan2(float,float) */
+    public static  double atan2( float y, float x ) {return Numeric.atan2( y, x );}
+
+    /** @see io.deephaven.function.Numeric#atan2(int,int) */
+    public static  double atan2( int y, int x ) {return Numeric.atan2( y, x );}
+
+    /** @see io.deephaven.function.Numeric#atan2(long,long) */
+    public static  double atan2( long y, long x ) {return Numeric.atan2( y, x );}
+
+    /** @see io.deephaven.function.Numeric#atan2(short,short) */
+    public static  double atan2( short y, short x ) {return Numeric.atan2( y, x );}
+
     /** @see io.deephaven.function.Numeric#avg(byte[]) */
     public static  double avg( byte... values ) {return Numeric.avg( values );}
 
@@ -562,6 +598,24 @@ public class GroovyStaticImports {
     /** @see io.deephaven.function.Cast#castLong(short,boolean) */
     public static  long castLong( short value, boolean checkFidelity ) {return Cast.castLong( value, checkFidelity );}
 
+    /** @see io.deephaven.function.Numeric#cbrt(byte) */
+    public static  double cbrt( byte x ) {return Numeric.cbrt( x );}
+
+    /** @see io.deephaven.function.Numeric#cbrt(double) */
+    public static  double cbrt( double x ) {return Numeric.cbrt( x );}
+
+    /** @see io.deephaven.function.Numeric#cbrt(float) */
+    public static  double cbrt( float x ) {return Numeric.cbrt( x );}
+
+    /** @see io.deephaven.function.Numeric#cbrt(int) */
+    public static  double cbrt( int x ) {return Numeric.cbrt( x );}
+
+    /** @see io.deephaven.function.Numeric#cbrt(long) */
+    public static  double cbrt( long x ) {return Numeric.cbrt( x );}
+
+    /** @see io.deephaven.function.Numeric#cbrt(short) */
+    public static  double cbrt( short x ) {return Numeric.cbrt( x );}
+
     /** @see io.deephaven.function.Numeric#ceil(byte) */
     public static  double ceil( byte value ) {return Numeric.ceil( value );}
 
@@ -718,6 +772,24 @@ public class GroovyStaticImports {
     /** @see io.deephaven.function.Numeric#containsNonFinite(short[]) */
     public static  boolean containsNonFinite( short... values ) {return Numeric.containsNonFinite( values );}
 
+    /** @see io.deephaven.function.Numeric#copySign(byte,byte) */
+    public static  byte copySign( byte magnitude, byte sign ) {return Numeric.copySign( magnitude, sign );}
+
+    /** @see io.deephaven.function.Numeric#copySign(double,double) */
+    public static  double copySign( double magnitude, double sign ) {return Numeric.copySign( magnitude, sign );}
+
+    /** @see io.deephaven.function.Numeric#copySign(float,float) */
+    public static  float copySign( float magnitude, float sign ) {return Numeric.copySign( magnitude, sign );}
+
+    /** @see io.deephaven.function.Numeric#copySign(int,int) */
+    public static  int copySign( int magnitude, int sign ) {return Numeric.copySign( magnitude, sign );}
+
+    /** @see io.deephaven.function.Numeric#copySign(long,long) */
+    public static  long copySign( long magnitude, long sign ) {return Numeric.copySign( magnitude, sign );}
+
+    /** @see io.deephaven.function.Numeric#copySign(short,short) */
+    public static  short copySign( short magnitude, short sign ) {return Numeric.copySign( magnitude, sign );}
+
     /** @see io.deephaven.function.Numeric#cor(byte[],byte[]) */
     public static  double cor( byte[] values0, byte[] values1 ) {return Numeric.cor( values0, values1 );}
 
@@ -1168,6 +1240,24 @@ public class GroovyStaticImports {
     /** @see io.deephaven.function.Numeric#cos(short) */
     public static  double cos( short value ) {return Numeric.cos( value );}
 
+    /** @see io.deephaven.function.Numeric#cosh(byte) */
+    public static  double cosh( byte x ) {return Numeric.cosh( x );}
+
+    /** @see io.deephaven.function.Numeric#cosh(double) */
+    public static  double cosh( double x ) {return Numeric.cosh( x );}
+
+    /** @see io.deephaven.function.Numeric#cosh(float) */
+    public static  double cosh( float x ) {return Numeric.cosh( x );}
+
+    /** @see io.deephaven.function.Numeric#cosh(int) */
+    public static  double cosh( int x ) {return Numeric.cosh( x );}
+
+    /** @see io.deephaven.function.Numeric#cosh(long) */
+    public static  double cosh( long x ) {return Numeric.cosh( x );}
+
+    /** @see io.deephaven.function.Numeric#cosh(short) */
+    public static  double cosh( short x ) {return Numeric.cosh( x );}
+
     /** @see io.deephaven.function.Basic#count(byte[]) */
     public static  long count( byte... values ) {return Basic.count( values );}
 
@@ -2122,6 +2212,18 @@ public class GroovyStaticImports {
     /** @see io.deephaven.function.Numeric#cumsum(io.deephaven.vector.ShortVector) */
     public static  long[] cumsum( io.deephaven.vector.ShortVector values ) {return Numeric.cumsum( values );}
 
+    /** @see io.deephaven.function.Numeric#decrementExact(byte) */
+    public static  byte decrementExact( byte x ) {return Numeric.decrementExact( x );}
+
+    /** @see io.deephaven.function.Numeric#decrementExact(int) */
+    public static  int decrementExact( int x ) {return Numeric.decrementExact( x );}
+
+    /** @see io.deephaven.function.Numeric#decrementExact(long) */
+    public static  long decrementExact( long x ) {return Numeric.decrementExact( x );}
+
+    /** @see io.deephaven.function.Numeric#decrementExact(short) */
+    public static  short decrementExact( short x ) {return Numeric.decrementExact( x );}
+
     /** @see io.deephaven.function.Numeric#diff(int,byte[]) */
     public static  byte[] diff( int stride, byte... values ) {return Numeric.diff( stride, values );}
 
@@ -2311,6 +2413,24 @@ public class GroovyStaticImports {
     /** @see io.deephaven.function.Numeric#exp(short) */
     public static  double exp( short value ) {return Numeric.exp( value );}
 
+    /** @see io.deephaven.function.Numeric#expm1(byte) */
+    public static  double expm1( byte x ) {return Numeric.expm1( x );}
+
+    /** @see io.deephaven.function.Numeric#expm1(double) */
+    public static  double expm1( double x ) {return Numeric.expm1( x );}
+
+    /** @see io.deephaven.function.Numeric#expm1(float) */
+    public static  double expm1( float x ) {return Numeric.expm1( x );}
+
+    /** @see io.deephaven.function.Numeric#expm1(int) */
+    public static  double expm1( int x ) {return Numeric.expm1( x );}
+
+    /** @see io.deephaven.function.Numeric#expm1(long) */
+    public static  double expm1( long x ) {return Numeric.expm1( x );}
+
+    /** @see io.deephaven.function.Numeric#expm1(short) */
+    public static  double expm1( short x ) {return Numeric.expm1( x );}
+
     /** @see io.deephaven.function.Basic#first(byte[]) */
     public static  byte first( byte... values ) {return Basic.first( values );}
 
@@ -2425,6 +2545,30 @@ public class GroovyStaticImports {
     /** @see io.deephaven.function.Numeric#floor(short) */
     public static  double floor( short value ) {return Numeric.floor( value );}
 
+    /** @see io.deephaven.function.Numeric#floorDiv(byte,byte) */
+    public static  byte floorDiv( byte x, byte y ) {return Numeric.floorDiv( x, y );}
+
+    /** @see io.deephaven.function.Numeric#floorDiv(int,int) */
+    public static  int floorDiv( int x, int y ) {return Numeric.floorDiv( x, y );}
+
+    /** @see io.deephaven.function.Numeric#floorDiv(long,long) */
+    public static  long floorDiv( long x, long y ) {return Numeric.floorDiv( x, y );}
+
+    /** @see io.deephaven.function.Numeric#floorDiv(short,short) */
+    public static  short floorDiv( short x, short y ) {return Numeric.floorDiv( x, y );}
+
+    /** @see io.deephaven.function.Numeric#floorMod(byte,byte) */
+    public static  byte floorMod( byte x, byte y ) {return Numeric.floorMod( x, y );}
+
+    /** @see io.deephaven.function.Numeric#floorMod(int,int) */
+    public static  int floorMod( int x, int y ) {return Numeric.floorMod( x, y );}
+
+    /** @see io.deephaven.function.Numeric#floorMod(long,long) */
+    public static  long floorMod( long x, long y ) {return Numeric.floorMod( x, y );}
+
+    /** @see io.deephaven.function.Numeric#floorMod(short,short) */
+    public static  short floorMod( short x, short y ) {return Numeric.floorMod( x, y );}
+
     /** @see io.deephaven.function.Basic#forwardFill(byte[]) */
     public static  byte[] forwardFill( byte... values ) {return Basic.forwardFill( values );}
 
@@ -2473,6 +2617,30 @@ public class GroovyStaticImports {
     /** @see io.deephaven.function.Basic#forwardFillObj(io.deephaven.vector.ObjectVector) */
     public static <T> T[] forwardFillObj( io.deephaven.vector.ObjectVector<T> values ) {return Basic.forwardFillObj( values );}
 
+    /** @see io.deephaven.function.Numeric#getExponent(double) */
+    public static  int getExponent( double x ) {return Numeric.getExponent( x );}
+
+    /** @see io.deephaven.function.Numeric#getExponent(float) */
+    public static  int getExponent( float x ) {return Numeric.getExponent( x );}
+
+    /** @see io.deephaven.function.Numeric#hypot(byte,byte) */
+    public static  double hypot( byte x, byte y ) {return Numeric.hypot( x, y );}
+
+    /** @see io.deephaven.function.Numeric#hypot(double,double) */
+    public static  double hypot( double x, double y ) {return Numeric.hypot( x, y );}
+
+    /** @see io.deephaven.function.Numeric#hypot(float,float) */
+    public static  double hypot( float x, float y ) {return Numeric.hypot( x, y );}
+
+    /** @see io.deephaven.function.Numeric#hypot(int,int) */
+    public static  double hypot( int x, int y ) {return Numeric.hypot( x, y );}
+
+    /** @see io.deephaven.function.Numeric#hypot(long,long) */
+    public static  double hypot( long x, long y ) {return Numeric.hypot( x, y );}
+
+    /** @see io.deephaven.function.Numeric#hypot(short,short) */
+    public static  double hypot( short x, short y ) {return Numeric.hypot( x, y );}
+
     /** @see io.deephaven.function.Basic#ifelse(java.lang.Boolean[],byte,byte) */
     public static  byte[] ifelse( java.lang.Boolean[] condition, byte trueCase, byte falseCase ) {return Basic.ifelse( condition, trueCase, falseCase );}
 
@@ -2644,6 +2812,18 @@ public class GroovyStaticImports {
     /** @see io.deephaven.function.Basic#inRange(short,short,short) */
     public static  boolean inRange( short testedValue, short lowInclusiveValue, short highInclusiveValue ) {return Basic.inRange( testedValue, lowInclusiveValue, highInclusiveValue );}
 
+    /** @see io.deephaven.function.Numeric#incrementExact(byte) */
+    public static  byte incrementExact( byte x ) {return Numeric.incrementExact( x );}
+
+    /** @see io.deephaven.function.Numeric#incrementExact(int) */
+    public static  int incrementExact( int x ) {return Numeric.incrementExact( x );}
+
+    /** @see io.deephaven.function.Numeric#incrementExact(long) */
+    public static  long incrementExact( long x ) {return Numeric.incrementExact( x );}
+
+    /** @see io.deephaven.function.Numeric#incrementExact(short) */
+    public static  short incrementExact( short x ) {return Numeric.incrementExact( x );}
+
     /** @see io.deephaven.function.Numeric#indexOfMax(byte[]) */
     public static  long indexOfMax( byte... values ) {return Numeric.indexOfMax( values );}
 
@@ -2989,6 +3169,42 @@ public class GroovyStaticImports {
     /** @see io.deephaven.function.Numeric#log(short) */
     public static  double log( short value ) {return Numeric.log( value );}
 
+    /** @see io.deephaven.function.Numeric#log10(byte) */
+    public static  double log10( byte x ) {return Numeric.log10( x );}
+
+    /** @see io.deephaven.function.Numeric#log10(double) */
+    public static  double log10( double x ) {return Numeric.log10( x );}
+
+    /** @see io.deephaven.function.Numeric#log10(float) */
+    public static  double log10( float x ) {return Numeric.log10( x );}
+
+    /** @see io.deephaven.function.Numeric#log10(int) */
+    public static  double log10( int x ) {return Numeric.log10( x );}
+
+    /** @see io.deephaven.function.Numeric#log10(long) */
+    public static  double log10( long x ) {return Numeric.log10( x );}
+
+    /** @see io.deephaven.function.Numeric#log10(short) */
+    public static  double log10( short x ) {return Numeric.log10( x );}
+
+    /** @see io.deephaven.function.Numeric#log1p(byte) */
+    public static  double log1p( byte x ) {return Numeric.log1p( x );}
+
+    /** @see io.deephaven.function.Numeric#log1p(double) */
+    public static  double log1p( double x ) {return Numeric.log1p( x );}
+
+    /** @see io.deephaven.function.Numeric#log1p(float) */
+    public static  double log1p( float x ) {return Numeric.log1p( x );}
+
+    /** @see io.deephaven.function.Numeric#log1p(int) */
+    public static  double log1p( int x ) {return Numeric.log1p( x );}
+
+    /** @see io.deephaven.function.Numeric#log1p(long) */
+    public static  double log1p( long x ) {return Numeric.log1p( x );}
+
+    /** @see io.deephaven.function.Numeric#log1p(short) */
+    public static  double log1p( short x ) {return Numeric.log1p( x );}
+
     /** @see io.deephaven.function.Numeric#lowerBin(byte,byte) */
     public static  byte lowerBin( byte value, byte interval ) {return Numeric.lowerBin( value, interval );}
 
@@ -3199,6 +3415,48 @@ public class GroovyStaticImports {
     /** @see io.deephaven.function.Numeric#minObj(io.deephaven.vector.ObjectVector) */
     public static <T extends java.lang.Comparable<T>> T minObj( io.deephaven.vector.ObjectVector<T> values ) {return Numeric.minObj( values );}
 
+    /** @see io.deephaven.function.Numeric#multiplyExact(byte,byte) */
+    public static  byte multiplyExact( byte x, byte y ) {return Numeric.multiplyExact( x, y );}
+
+    /** @see io.deephaven.function.Numeric#multiplyExact(int,int) */
+    public static  int multiplyExact( int x, int y ) {return Numeric.multiplyExact( x, y );}
+
+    /** @see io.deephaven.function.Numeric#multiplyExact(long,long) */
+    public static  long multiplyExact( long x, long y ) {return Numeric.multiplyExact( x, y );}
+
+    /** @see io.deephaven.function.Numeric#multiplyExact(short,short) */
+    public static  short multiplyExact( short x, short y ) {return Numeric.multiplyExact( x, y );}
+
+    /** @see io.deephaven.function.Numeric#negateExact(byte) */
+    public static  byte negateExact( byte x ) {return Numeric.negateExact( x );}
+
+    /** @see io.deephaven.function.Numeric#negateExact(int) */
+    public static  int negateExact( int x ) {return Numeric.negateExact( x );}
+
+    /** @see io.deephaven.function.Numeric#negateExact(long) */
+    public static  long negateExact( long x ) {return Numeric.negateExact( x );}
+
+    /** @see io.deephaven.function.Numeric#negateExact(short) */
+    public static  short negateExact( short x ) {return Numeric.negateExact( x );}
+
+    /** @see io.deephaven.function.Numeric#nextAfter(double,double) */
+    public static  double nextAfter( double start, double direction ) {return Numeric.nextAfter( start, direction );}
+
+    /** @see io.deephaven.function.Numeric#nextAfter(float,float) */
+    public static  float nextAfter( float start, float direction ) {return Numeric.nextAfter( start, direction );}
+
+    /** @see io.deephaven.function.Numeric#nextDown(double) */
+    public static  double nextDown( double x ) {return Numeric.nextDown( x );}
+
+    /** @see io.deephaven.function.Numeric#nextDown(float) */
+    public static  float nextDown( float x ) {return Numeric.nextDown( x );}
+
+    /** @see io.deephaven.function.Numeric#nextUp(double) */
+    public static  double nextUp( double x ) {return Numeric.nextUp( x );}
+
+    /** @see io.deephaven.function.Numeric#nextUp(float) */
+    public static  float nextUp( float x ) {return Numeric.nextUp( x );}
+
     /** @see io.deephaven.function.Logic#not(java.lang.Boolean[]) */
     public static  java.lang.Boolean[] not( java.lang.Boolean... values ) {return Logic.not( values );}
 
@@ -3943,6 +4201,12 @@ public class GroovyStaticImports {
     /** @see io.deephaven.function.Numeric#round(short) */
     public static  long round( short value ) {return Numeric.round( value );}
 
+    /** @see io.deephaven.function.Numeric#scalb(double,int) */
+    public static  double scalb( double x, int scaleFactor ) {return Numeric.scalb( x, scaleFactor );}
+
+    /** @see io.deephaven.function.Numeric#scalb(float,int) */
+    public static  float scalb( float x, int scaleFactor ) {return Numeric.scalb( x, scaleFactor );}
+
     /** @see io.deephaven.function.Numeric#sequence(byte,byte,byte) */
     public static  byte[] sequence( byte start, byte end, byte step ) {return Numeric.sequence( start, end, step );}
 
@@ -3997,6 +4261,24 @@ public class GroovyStaticImports {
     /** @see io.deephaven.function.Numeric#sin(short) */
     public static  double sin( short value ) {return Numeric.sin( value );}
 
+    /** @see io.deephaven.function.Numeric#sinh(byte) */
+    public static  double sinh( byte x ) {return Numeric.sinh( x );}
+
+    /** @see io.deephaven.function.Numeric#sinh(double) */
+    public static  double sinh( double x ) {return Numeric.sinh( x );}
+
+    /** @see io.deephaven.function.Numeric#sinh(float) */
+    public static  double sinh( float x ) {return Numeric.sinh( x );}
+
+    /** @see io.deephaven.function.Numeric#sinh(int) */
+    public static  double sinh( int x ) {return Numeric.sinh( x );}
+
+    /** @see io.deephaven.function.Numeric#sinh(long) */
+    public static  double sinh( long x ) {return Numeric.sinh( x );}
+
+    /** @see io.deephaven.function.Numeric#sinh(short) */
+    public static  double sinh( short x ) {return Numeric.sinh( x );}
+
     /** @see io.deephaven.function.Sort#sort(byte[]) */
     public static  byte[] sort( byte... values ) {return Sort.sort( values );}
 
@@ -4255,6 +4537,18 @@ public class GroovyStaticImports {
     /** @see io.deephaven.function.Numeric#ste(io.deephaven.vector.ShortVector) */
     public static  double ste( io.deephaven.vector.ShortVector values ) {return Numeric.ste( values );}
 
+    /** @see io.deephaven.function.Numeric#subtractExact(byte,byte) */
+    public static  byte subtractExact( byte x, byte y ) {return Numeric.subtractExact( x, y );}
+
+    /** @see io.deephaven.function.Numeric#subtractExact(int,int) */
+    public static  int subtractExact( int x, int y ) {return Numeric.subtractExact( x, y );}
+
+    /** @see io.deephaven.function.Numeric#subtractExact(long,long) */
+    public static  long subtractExact( long x, long y ) {return Numeric.subtractExact( x, y );}
+
+    /** @see io.deephaven.function.Numeric#subtractExact(short,short) */
+    public static  short subtractExact( short x, short y ) {return Numeric.subtractExact( x, y );}
+
     /** @see io.deephaven.function.Numeric#sum(byte[]) */
     public static  long sum( byte... values ) {return Numeric.sum( values );}
 
@@ -4309,6 +4603,96 @@ public class GroovyStaticImports {
     /** @see io.deephaven.function.Numeric#tan(short) */
     public static  double tan( short value ) {return Numeric.tan( value );}
 
+    /** @see io.deephaven.function.Numeric#tanh(byte) */
+    public static  double tanh( byte x ) {return Numeric.tanh( x );}
+
+    /** @see io.deephaven.function.Numeric#tanh(double) */
+    public static  double tanh( double x ) {return Numeric.tanh( x );}
+
+    /** @see io.deephaven.function.Numeric#tanh(float) */
+    public static  double tanh( float x ) {return Numeric.tanh( x );}
+
+    /** @see io.deephaven.function.Numeric#tanh(int) */
+    public static  double tanh( int x ) {return Numeric.tanh( x );}
+
+    /** @see io.deephaven.function.Numeric#tanh(long) */
+    public static  double tanh( long x ) {return Numeric.tanh( x );}
+
+    /** @see io.deephaven.function.Numeric#tanh(short) */
+    public static  double tanh( short x ) {return Numeric.tanh( x );}
+
+    /** @see io.deephaven.function.Numeric#toByteExact(byte) */
+    public static  short toByteExact( byte x ) {return Numeric.toByteExact( x );}
+
+    /** @see io.deephaven.function.Numeric#toByteExact(int) */
+    public static  short toByteExact( int x ) {return Numeric.toByteExact( x );}
+
+    /** @see io.deephaven.function.Numeric#toByteExact(long) */
+    public static  short toByteExact( long x ) {return Numeric.toByteExact( x );}
+
+    /** @see io.deephaven.function.Numeric#toByteExact(short) */
+    public static  short toByteExact( short x ) {return Numeric.toByteExact( x );}
+
+    /** @see io.deephaven.function.Numeric#toDegrees(byte) */
+    public static  double toDegrees( byte x ) {return Numeric.toDegrees( x );}
+
+    /** @see io.deephaven.function.Numeric#toDegrees(double) */
+    public static  double toDegrees( double x ) {return Numeric.toDegrees( x );}
+
+    /** @see io.deephaven.function.Numeric#toDegrees(float) */
+    public static  double toDegrees( float x ) {return Numeric.toDegrees( x );}
+
+    /** @see io.deephaven.function.Numeric#toDegrees(int) */
+    public static  double toDegrees( int x ) {return Numeric.toDegrees( x );}
+
+    /** @see io.deephaven.function.Numeric#toDegrees(long) */
+    public static  double toDegrees( long x ) {return Numeric.toDegrees( x );}
+
+    /** @see io.deephaven.function.Numeric#toDegrees(short) */
+    public static  double toDegrees( short x ) {return Numeric.toDegrees( x );}
+
+    /** @see io.deephaven.function.Numeric#toIntExact(byte) */
+    public static  int toIntExact( byte x ) {return Numeric.toIntExact( x );}
+
+    /** @see io.deephaven.function.Numeric#toIntExact(int) */
+    public static  int toIntExact( int x ) {return Numeric.toIntExact( x );}
+
+    /** @see io.deephaven.function.Numeric#toIntExact(long) */
+    public static  int toIntExact( long x ) {return Numeric.toIntExact( x );}
+
+    /** @see io.deephaven.function.Numeric#toIntExact(short) */
+    public static  int toIntExact( short x ) {return Numeric.toIntExact( x );}
+
+    /** @see io.deephaven.function.Numeric#toRadians(byte) */
+    public static  double toRadians( byte x ) {return Numeric.toRadians( x );}
+
+    /** @see io.deephaven.function.Numeric#toRadians(double) */
+    public static  double toRadians( double x ) {return Numeric.toRadians( x );}
+
+    /** @see io.deephaven.function.Numeric#toRadians(float) */
+    public static  double toRadians( float x ) {return Numeric.toRadians( x );}
+
+    /** @see io.deephaven.function.Numeric#toRadians(int) */
+    public static  double toRadians( int x ) {return Numeric.toRadians( x );}
+
+    /** @see io.deephaven.function.Numeric#toRadians(long) */
+    public static  double toRadians( long x ) {return Numeric.toRadians( x );}
+
+    /** @see io.deephaven.function.Numeric#toRadians(short) */
+    public static  double toRadians( short x ) {return Numeric.toRadians( x );}
+
+    /** @see io.deephaven.function.Numeric#toShortExact(byte) */
+    public static  short toShortExact( byte x ) {return Numeric.toShortExact( x );}
+
+    /** @see io.deephaven.function.Numeric#toShortExact(int) */
+    public static  short toShortExact( int x ) {return Numeric.toShortExact( x );}
+
+    /** @see io.deephaven.function.Numeric#toShortExact(long) */
+    public static  short toShortExact( long x ) {return Numeric.toShortExact( x );}
+
+    /** @see io.deephaven.function.Numeric#toShortExact(short) */
+    public static  short toShortExact( short x ) {return Numeric.toShortExact( x );}
+
     /** @see io.deephaven.function.Numeric#tstat(byte[]) */
     public static  double tstat( byte... values ) {return Numeric.tstat( values );}
 
@@ -4363,6 +4747,12 @@ public class GroovyStaticImports {
     /** @see io.deephaven.function.Numeric#tstat(io.deephaven.vector.ShortVector) */
     public static  double tstat( io.deephaven.vector.ShortVector values ) {return Numeric.tstat( values );}
 
+    /** @see io.deephaven.function.Numeric#ulp(double) */
+    public static  double ulp( double x ) {return Numeric.ulp( x );}
+
+    /** @see io.deephaven.function.Numeric#ulp(float) */
+    public static  float ulp( float x ) {return Numeric.ulp( x );}
+
     /** @see io.deephaven.function.Basic#unbox(java.lang.Byte[]) */
     public static  byte[] unbox( java.lang.Byte... values ) {return Basic.unbox( values );}
 
diff --git a/engine/table/src/main/java/io/deephaven/stream/StreamToBlinkTableAdapter.java b/engine/table/src/main/java/io/deephaven/stream/StreamToBlinkTableAdapter.java
index 77fbbf4a23c..08aba9b7f63 100644
--- a/engine/table/src/main/java/io/deephaven/stream/StreamToBlinkTableAdapter.java
+++ b/engine/table/src/main/java/io/deephaven/stream/StreamToBlinkTableAdapter.java
@@ -19,9 +19,6 @@
 import io.deephaven.engine.table.impl.sources.LongAsInstantColumnSource;
 import io.deephaven.engine.table.impl.sources.NullValueColumnSource;
 import io.deephaven.engine.table.impl.sources.SwitchColumnSource;
-import io.deephaven.engine.updategraph.NotificationQueue;
-import io.deephaven.engine.updategraph.UpdateGraph;
-import io.deephaven.engine.updategraph.UpdateSourceRegistrar;
 import io.deephaven.engine.table.impl.QueryTable;
 import io.deephaven.chunk.ChunkType;
 import io.deephaven.chunk.WritableChunk;
@@ -29,6 +26,9 @@
 import io.deephaven.engine.rowset.RowSetFactory;
 import io.deephaven.engine.rowset.RowSetShiftData;
 import io.deephaven.engine.rowset.TrackingWritableRowSet;
+import io.deephaven.engine.updategraph.NotificationQueue;
+import io.deephaven.engine.updategraph.UpdateGraph;
+import io.deephaven.engine.updategraph.UpdateSourceRegistrar;
 import io.deephaven.internal.log.LoggerFactory;
 import io.deephaven.io.logger.Logger;
 import io.deephaven.util.MultiException;
@@ -36,14 +36,17 @@
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
+import javax.annotation.OverridingMethodsMustInvokeSuper;
 import java.lang.ref.WeakReference;
 import java.time.Instant;
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.Collection;
 import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Map;
 import java.util.Map.Entry;
+import java.util.Objects;
 import java.util.concurrent.atomic.AtomicBoolean;
 import java.util.stream.Stream;
 
@@ -174,8 +177,10 @@ public StreamToBlinkTableAdapter(
                 }
             }
 
+            @OverridingMethodsMustInvokeSuper
             @Override
             public void destroy() {
+                super.destroy();
                 StreamToBlinkTableAdapter.this.close();
             }
         };
@@ -268,6 +273,15 @@ private static void maybeClearChunkColumnSource(ColumnSource<?> cs) {
         }
     }
 
+    private synchronized void clearChunkColumnSources() {
+        SafeCloseable.closeAll(
+                Stream.of(bufferChunkSources, currentChunkSources, prevChunkSources)
+                        .filter(Objects::nonNull)
+                        .flatMap(Arrays::stream)
+                        .map(ccs -> ccs::clear));
+        bufferChunkSources = currentChunkSources = prevChunkSources = null;
+    }
+
     /**
      * Return the {@link Table#BLINK_TABLE_ATTRIBUTE blink} {@link Table table} that this adapter is producing, and
      * ensure that this StreamToBlinkTableAdapter no longer enforces strong reachability of the result. May return
@@ -303,6 +317,7 @@ public void close() {
                     .endl();
             updateSourceRegistrar.removeSource(this);
             streamPublisher.shutdown();
+            getUpdateGraph().runWhenIdle(this::clearChunkColumnSources);
         }
     }
 
diff --git a/engine/table/src/test/java/io/deephaven/engine/table/impl/AbstractTableLocationProviderTest.java b/engine/table/src/test/java/io/deephaven/engine/table/impl/AbstractTableLocationProviderTest.java
new file mode 100644
index 00000000000..23664cb05d7
--- /dev/null
+++ b/engine/table/src/test/java/io/deephaven/engine/table/impl/AbstractTableLocationProviderTest.java
@@ -0,0 +1,318 @@
+//
+// Copyright (c) 2016-2024 Deephaven Data Labs and Patent Pending
+//
+package io.deephaven.engine.table.impl;
+
+import io.deephaven.api.SortColumn;
+import io.deephaven.base.verify.Assert;
+import io.deephaven.engine.liveness.LiveSupplier;
+import io.deephaven.engine.liveness.StandaloneLivenessManager;
+import io.deephaven.engine.table.BasicDataIndex;
+import io.deephaven.engine.table.impl.locations.*;
+import io.deephaven.engine.table.impl.locations.impl.AbstractTableLocation;
+import io.deephaven.engine.table.impl.locations.impl.AbstractTableLocationProvider;
+import io.deephaven.engine.table.impl.locations.local.URITableLocationKey;
+import io.deephaven.engine.testutil.testcase.RefreshingTableTestCase;
+import io.deephaven.test.types.OutOfBandTest;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
+import org.junit.Test;
+import org.junit.experimental.categories.Category;
+
+import java.net.URI;
+import java.util.ArrayList;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Set;
+import java.util.stream.IntStream;
+
+@Category(OutOfBandTest.class)
+public class AbstractTableLocationProviderTest extends RefreshingTableTestCase {
+    private static class TestTableLocationProvider extends AbstractTableLocationProvider {
+
+        public TestTableLocationProvider(final boolean supportsSubscriptions) {
+            super(supportsSubscriptions, TableUpdateMode.ADD_REMOVE, TableUpdateMode.ADD_REMOVE);
+        }
+
+        @Override
+        protected @NotNull TableLocation makeTableLocation(@NotNull TableLocationKey locationKey) {
+            return new TestTableLocation(getKey(), locationKey, false);
+        }
+
+        @Override
+        public void refresh() {
+            Assert.statementNeverExecuted();
+        }
+
+        public void addKey(@NotNull TableLocationKey locationKey) {
+            handleTableLocationKeyAdded(locationKey, null);
+        }
+
+        public void removeKey(@NotNull TableLocationKey locationKey) {
+            handleTableLocationKeyRemoved(locationKey, null);
+        }
+
+
+        public void beginTransaction(@NotNull Object token) {
+            super.beginTransaction(token);
+        }
+
+        public void endTransaction(@NotNull Object token) {
+            super.endTransaction(token);
+        }
+
+        public void addKey(@NotNull TableLocationKey locationKey, @NotNull Object token) {
+            handleTableLocationKeyAdded(locationKey, token);
+        }
+
+        public void removeKey(@NotNull TableLocationKey locationKey, @NotNull Object token) {
+            handleTableLocationKeyRemoved(locationKey, token);
+        }
+    }
+
+    private static class TestTableLocation extends AbstractTableLocation {
+        private boolean destroyed = false;
+
+        protected TestTableLocation(@NotNull TableKey tableKey, @NotNull TableLocationKey tableLocationKey,
+                boolean supportsSubscriptions) {
+            super(tableKey, tableLocationKey, supportsSubscriptions);
+        }
+
+        public boolean isDestroyed() {
+            return destroyed;
+        }
+
+        @Override
+        protected void destroy() {
+            super.destroy();
+            destroyed = true;
+        }
+
+        @Override
+        protected @NotNull ColumnLocation makeColumnLocation(@NotNull String name) {
+            throw new UnsupportedOperationException();
+        }
+
+        @Override
+        public @Nullable BasicDataIndex loadDataIndex(@NotNull String... columns) {
+            throw new UnsupportedOperationException();
+        }
+
+        @Override
+        public void refresh() {
+            throw new UnsupportedOperationException();
+        }
+
+        @Override
+        public @NotNull List<SortColumn> getSortedColumns() {
+            return List.of();
+        }
+
+        @Override
+        public @NotNull List<String[]> getDataIndexColumns() {
+            return List.of();
+        }
+
+        @Override
+        public boolean hasDataIndex(@NotNull String... columns) {
+            return false;
+        }
+    }
+
+    @Override
+    public void setUp() throws Exception {
+        super.setUp();
+        setExpectError(false);
+    }
+
+    private List<TableLocationKey> createKeys(final int count) {
+        final List<TableLocationKey> keys = new ArrayList<>();
+        for (int i = 0; i < count; i++) {
+            keys.add(new URITableLocationKey(URI.create("file:///tmp/" + i), i, null));
+        }
+        return keys;
+    }
+
+    /**
+     * Test the management and release of the liveness of table location keys is correct.
+     */
+    @Test
+    public void testTableLocationKeyManagement() {
+
+        // Create a test table location provider
+        final TestTableLocationProvider provider = new TestTableLocationProvider(false);
+
+        // Create a set of table location keys
+        final List<TableLocationKey> initialKeys = createKeys(5);
+
+        // Add the keys to the table location provider
+        for (final TableLocationKey locationKey : initialKeys) {
+            provider.addKey(locationKey);
+        }
+
+        // Verify all the initial keys are present for new listeners
+        Set<TableLocationKey> keys = new HashSet<>(provider.getTableLocationKeys());
+        for (final TableLocationKey tlk : initialKeys) {
+            Assert.eqTrue(keys.contains(tlk), "keys.contains(tlk)");
+        }
+
+        // Create a local liveness manager
+        final StandaloneLivenessManager manager = new StandaloneLivenessManager(false);
+
+        // Get a list of the LiveSupplier<> keys
+        final List<LiveSupplier<ImmutableTableLocationKey>> initialTrackedKeys = new ArrayList<>();
+        provider.getTableLocationKeys(lstlk -> {
+            // Externally manage all keys (simulate a TLSB)
+            manager.manage(lstlk);
+            initialTrackedKeys.add(lstlk);
+        });
+
+        // Resolve and create all the table locations
+        final List<TestTableLocation> tableLocations = new ArrayList<>();
+        for (final TableLocationKey key : initialKeys) {
+            final TestTableLocation tl = (TestTableLocation) provider.getTableLocation(key);
+            tableLocations.add(tl);
+        }
+
+        // Drop the first 4 keys from the provider
+        for (int i = 0; i < 4; i++) {
+            final TableLocationKey removedKey = initialKeys.get(i);
+            provider.removeKey(removedKey);
+        }
+
+        // Simulate delivering the initial keys to the RCSM
+        final List<TableLocation> includedLocations = new ArrayList<>();
+        includedLocations.add(provider.getTableLocation(initialKeys.get(2)));
+        includedLocations.forEach(manager::manage);
+        initialTrackedKeys.forEach(manager::unmanage);
+
+        // Verify only the last key is present for new listeners
+        keys = new HashSet<>(provider.getTableLocationKeys());
+        Assert.eqTrue(keys.contains(initialKeys.get(4)), "keys.contains(initialKeys.get(4))");
+        Assert.eq(keys.size(), "keys.size()", 1);
+
+        // Verify that we CAN'T retrieve the unmanaged locations from the provider (they were dropped)
+        IntStream.range(0, 4).forEach(
+                i -> {
+                    Assert.eqFalse(provider.hasTableLocationKey(initialKeys.get(i)),
+                            "provider.hasTableLocationKey(initialKeys.get(" + i + "))");
+                });
+
+        // Verify the tableLocations for only the unmanaged keys are destroyed
+        Assert.eqTrue(tableLocations.get(0).isDestroyed(), "tableLocations.get(0).isDestroyed()");
+        Assert.eqTrue(tableLocations.get(1).isDestroyed(), "tableLocations.get(1).isDestroyed()");
+        Assert.eqTrue(tableLocations.get(3).isDestroyed(), "tableLocations.get(3).isDestroyed()");
+        Assert.eqFalse(tableLocations.get(2).isDestroyed(), "tableLocations.get(2).isDestroyed()");
+
+        // Verify the tableLocations for the previously included keys are destroyed
+        includedLocations.forEach(manager::unmanage);
+        Assert.eqTrue(tableLocations.get(2).isDestroyed(), "tableLocations.get(2).isDestroyed()");
+
+        // Verify that we CAN retrieve the last key from the provider and the location is not destroyed
+        Assert.eqTrue(provider.hasTableLocationKey(initialKeys.get(4)),
+                "provider.hasTableLocationKey(initialKeys.get(4))");
+        Assert.eqFalse(tableLocations.get(4).isDestroyed(), "tableLocations.get(4).isDestroyed()");
+
+        // Drop the final key from the provider
+        provider.removeKey(initialKeys.get(4));
+
+        // Verify that we CAN retrieve the last key from the provider and the location is not destroyed
+        Assert.eqFalse(provider.hasTableLocationKey(initialKeys.get(4)),
+                "provider.hasTableLocationKey(initialKeys.get(4))");
+        Assert.eqTrue(tableLocations.get(4).isDestroyed(), "tableLocations.get(4).isDestroyed()");
+    }
+
+
+    /**
+     * Test the management and release of the liveness of table location keys is correct when using transactions.
+     */
+    @Test
+    public void testTableLocationKeyTransactionManagement() {
+
+        // Create a test table location provider
+        final TestTableLocationProvider provider = new TestTableLocationProvider(false);
+
+        // Create a set of table location keys
+        final List<TableLocationKey> initialKeys = createKeys(5);
+
+        // Add the keys to the table location provider in a single tranasction
+        provider.beginTransaction(provider);
+        for (final TableLocationKey locationKey : initialKeys) {
+            provider.addKey(locationKey, provider);
+        }
+        provider.endTransaction(provider);
+
+        // Verify all the initial keys are present for new listeners
+        Set<TableLocationKey> keys = new HashSet<>(provider.getTableLocationKeys());
+        for (final TableLocationKey tlk : initialKeys) {
+            Assert.eqTrue(keys.contains(tlk), "keys.contains(tlk)");
+        }
+
+        // Create a local liveness manager
+        final StandaloneLivenessManager manager = new StandaloneLivenessManager(false);
+
+        // Get a list of the LiveSupplier<> keys
+        final List<LiveSupplier<ImmutableTableLocationKey>> initialTrackedKeys = new ArrayList<>();
+        provider.getTableLocationKeys(lstlk -> {
+            // Externally manage all keys (simulate a TLSB)
+            manager.manage(lstlk);
+            initialTrackedKeys.add(lstlk);
+        });
+
+        // Resolve and create all the table locations
+        final List<TestTableLocation> tableLocations = new ArrayList<>();
+        for (final TableLocationKey key : initialKeys) {
+            final TestTableLocation tl = (TestTableLocation) provider.getTableLocation(key);
+            tableLocations.add(tl);
+        }
+
+        // Drop the first 4 keys from the provider in a single tranasction
+        provider.beginTransaction(provider);
+        for (int i = 0; i < 4; i++) {
+            final TableLocationKey removedKey = initialKeys.get(i);
+            provider.removeKey(removedKey, provider);
+        }
+        provider.endTransaction(provider);
+
+        // Simulate delivering the initial keys to the RCSM
+        final List<TableLocation> includedLocations = new ArrayList<>();
+        includedLocations.add(provider.getTableLocation(initialKeys.get(2)));
+        includedLocations.forEach(manager::manage);
+        initialTrackedKeys.forEach(manager::unmanage);
+
+        // Verify only the last key is present for new listeners
+        keys = new HashSet<>(provider.getTableLocationKeys());
+        Assert.eqTrue(keys.contains(initialKeys.get(4)), "keys.contains(initialKeys.get(4))");
+        Assert.eq(keys.size(), "keys.size()", 1);
+
+        // Verify that we CAN'T retrieve the unmanaged locations from the provider (they were dropped)
+        IntStream.range(0, 4).forEach(
+                i -> {
+                    Assert.eqFalse(provider.hasTableLocationKey(initialKeys.get(i)),
+                            "provider.hasTableLocationKey(initialKeys.get(" + i + "))");
+                });
+
+        // Verify the tableLocations for only the unmanaged keys are destroyed
+        Assert.eqTrue(tableLocations.get(0).isDestroyed(), "tableLocations.get(0).isDestroyed()");
+        Assert.eqTrue(tableLocations.get(1).isDestroyed(), "tableLocations.get(1).isDestroyed()");
+        Assert.eqTrue(tableLocations.get(3).isDestroyed(), "tableLocations.get(3).isDestroyed()");
+        Assert.eqFalse(tableLocations.get(2).isDestroyed(), "tableLocations.get(2).isDestroyed()");
+
+        // Verify the tableLocations for the previously included keys are destroyed
+        includedLocations.forEach(manager::unmanage);
+        Assert.eqTrue(tableLocations.get(2).isDestroyed(), "tableLocations.get(2).isDestroyed()");
+
+        // Verify that we CAN retrieve the last key from the provider and the location is not destroyed
+        Assert.eqTrue(provider.hasTableLocationKey(initialKeys.get(4)),
+                "provider.hasTableLocationKey(initialKeys.get(4))");
+        Assert.eqFalse(tableLocations.get(4).isDestroyed(), "tableLocations.get(4).isDestroyed()");
+
+        // Drop the final key from the provider
+        provider.removeKey(initialKeys.get(4));
+
+        // Verify that we CAN retrieve the last key from the provider and the location is not destroyed
+        Assert.eqFalse(provider.hasTableLocationKey(initialKeys.get(4)),
+                "provider.hasTableLocationKey(initialKeys.get(4))");
+        Assert.eqTrue(tableLocations.get(4).isDestroyed(), "tableLocations.get(4).isDestroyed()");
+    }
+}
diff --git a/engine/table/src/test/java/io/deephaven/engine/table/impl/DeferredViewTableTest.java b/engine/table/src/test/java/io/deephaven/engine/table/impl/DeferredViewTableTest.java
index e30d76d649a..3dcbe08ca11 100644
--- a/engine/table/src/test/java/io/deephaven/engine/table/impl/DeferredViewTableTest.java
+++ b/engine/table/src/test/java/io/deephaven/engine/table/impl/DeferredViewTableTest.java
@@ -5,7 +5,6 @@
 
 import io.deephaven.api.Selectable;
 import io.deephaven.base.verify.Assert;
-import io.deephaven.datastructures.util.CollectionUtil;
 import io.deephaven.engine.table.ColumnDefinition;
 import io.deephaven.engine.table.Table;
 import io.deephaven.engine.table.TableDefinition;
@@ -15,6 +14,7 @@
 import io.deephaven.engine.testutil.TstUtils;
 import io.deephaven.engine.util.TableTools;
 import io.deephaven.engine.testutil.junit4.EngineCleanup;
+import io.deephaven.util.type.ArrayTypeUtils;
 import org.junit.Rule;
 import org.junit.Test;
 
@@ -39,7 +39,7 @@ public void testDeferredViewTableCanUseIntermediateColumns() {
                 resultDef,
                 "test",
                 new DeferredViewTable.TableReference(sourceTable),
-                CollectionUtil.ZERO_LENGTH_STRING_ARRAY,
+                ArrayTypeUtils.EMPTY_STRING_ARRAY,
                 viewColumns,
                 WhereFilter.ZERO_LENGTH_WHERE_FILTER_ARRAY);
 
@@ -67,7 +67,7 @@ private void testIsRefreshingViaSource(boolean sourceRefreshing) {
                 resultDef,
                 "test",
                 new DeferredViewTable.TableReference(sourceTable),
-                CollectionUtil.ZERO_LENGTH_STRING_ARRAY,
+                ArrayTypeUtils.EMPTY_STRING_ARRAY,
                 SelectColumn.ZERO_LENGTH_SELECT_COLUMN_ARRAY,
                 WhereFilter.ZERO_LENGTH_WHERE_FILTER_ARRAY);
 
@@ -90,7 +90,7 @@ public void testIsRefreshingViaFilter() {
                 resultDef,
                 "test",
                 new DeferredViewTable.TableReference(sourceTable),
-                CollectionUtil.ZERO_LENGTH_STRING_ARRAY,
+                ArrayTypeUtils.EMPTY_STRING_ARRAY,
                 SelectColumn.ZERO_LENGTH_SELECT_COLUMN_ARRAY,
                 whereFilters);
 
@@ -110,7 +110,7 @@ public void testUpdateColumnToDifferentType() {
                 resultDef,
                 "test",
                 new DeferredViewTable.TableReference(sourceTable),
-                CollectionUtil.ZERO_LENGTH_STRING_ARRAY,
+                ArrayTypeUtils.EMPTY_STRING_ARRAY,
                 viewColumns,
                 WhereFilter.ZERO_LENGTH_WHERE_FILTER_ARRAY);
 
diff --git a/engine/table/src/test/java/io/deephaven/engine/table/impl/DummyTableLocation.java b/engine/table/src/test/java/io/deephaven/engine/table/impl/DummyTableLocation.java
new file mode 100644
index 00000000000..752c74b9414
--- /dev/null
+++ b/engine/table/src/test/java/io/deephaven/engine/table/impl/DummyTableLocation.java
@@ -0,0 +1,131 @@
+//
+// Copyright (c) 2016-2024 Deephaven Data Labs and Patent Pending
+//
+package io.deephaven.engine.table.impl;
+
+import io.deephaven.api.SortColumn;
+import io.deephaven.chunk.attributes.Values;
+import io.deephaven.engine.table.BasicDataIndex;
+import io.deephaven.engine.table.ColumnDefinition;
+import io.deephaven.engine.table.impl.locations.ColumnLocation;
+import io.deephaven.engine.table.impl.locations.TableKey;
+import io.deephaven.engine.table.impl.locations.TableLocation;
+import io.deephaven.engine.table.impl.locations.TableLocationKey;
+import io.deephaven.engine.table.impl.locations.impl.AbstractTableLocation;
+import io.deephaven.engine.table.impl.sources.regioned.ColumnRegionByte;
+import io.deephaven.engine.table.impl.sources.regioned.ColumnRegionChar;
+import io.deephaven.engine.table.impl.sources.regioned.ColumnRegionDouble;
+import io.deephaven.engine.table.impl.sources.regioned.ColumnRegionFloat;
+import io.deephaven.engine.table.impl.sources.regioned.ColumnRegionInt;
+import io.deephaven.engine.table.impl.sources.regioned.ColumnRegionLong;
+import io.deephaven.engine.table.impl.sources.regioned.ColumnRegionObject;
+import io.deephaven.engine.table.impl.sources.regioned.ColumnRegionShort;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
+
+import java.util.List;
+
+public final class DummyTableLocation extends AbstractTableLocation {
+
+    public DummyTableLocation(@NotNull final TableKey tableKey,
+            @NotNull final TableLocationKey tableLocationKey) {
+        super(tableKey, tableLocationKey, false);
+    }
+
+    @Override
+    public void refresh() {}
+
+    @Override
+    public @NotNull List<SortColumn> getSortedColumns() {
+        return List.of();
+    }
+
+    @Override
+    @NotNull
+    public List<String[]> getDataIndexColumns() {
+        return List.of();
+    }
+
+    @Override
+    public boolean hasDataIndex(@NotNull final String... columns) {
+        return false;
+    }
+
+    @NotNull
+    @Override
+    protected ColumnLocation makeColumnLocation(@NotNull final String name) {
+        return new ColumnLocation() {
+            @NotNull
+            @Override
+            public TableLocation getTableLocation() {
+                return DummyTableLocation.this;
+            }
+
+            @NotNull
+            @Override
+            public String getName() {
+                return name;
+            }
+
+            @Override
+            public boolean exists() {
+                throw new UnsupportedOperationException();
+            }
+
+            @Override
+            public ColumnRegionChar<Values> makeColumnRegionChar(
+                    @NotNull final ColumnDefinition<?> columnDefinition) {
+                throw new UnsupportedOperationException();
+            }
+
+            @Override
+            public ColumnRegionByte<Values> makeColumnRegionByte(
+                    @NotNull final ColumnDefinition<?> columnDefinition) {
+                throw new UnsupportedOperationException();
+            }
+
+            @Override
+            public ColumnRegionShort<Values> makeColumnRegionShort(
+                    @NotNull final ColumnDefinition<?> columnDefinition) {
+                throw new UnsupportedOperationException();
+            }
+
+            @Override
+            public ColumnRegionInt<Values> makeColumnRegionInt(
+                    @NotNull final ColumnDefinition<?> columnDefinition) {
+                throw new UnsupportedOperationException();
+            }
+
+            @Override
+            public ColumnRegionLong<Values> makeColumnRegionLong(
+                    @NotNull final ColumnDefinition<?> columnDefinition) {
+                throw new UnsupportedOperationException();
+            }
+
+            @Override
+            public ColumnRegionFloat<Values> makeColumnRegionFloat(
+                    @NotNull final ColumnDefinition<?> columnDefinition) {
+                throw new UnsupportedOperationException();
+            }
+
+            @Override
+            public ColumnRegionDouble<Values> makeColumnRegionDouble(
+                    @NotNull final ColumnDefinition<?> columnDefinition) {
+                throw new UnsupportedOperationException();
+            }
+
+            @Override
+            public <TYPE> ColumnRegionObject<TYPE, Values> makeColumnRegionObject(
+                    @NotNull final ColumnDefinition<TYPE> columnDefinition) {
+                throw new UnsupportedOperationException();
+            }
+
+        };
+    }
+
+    @Override
+    @Nullable
+    public BasicDataIndex loadDataIndex(@NotNull final String... columns) {
+        throw new UnsupportedOperationException();
+    }
+}
diff --git a/engine/table/src/test/java/io/deephaven/engine/table/impl/PartitionedTableTest.java b/engine/table/src/test/java/io/deephaven/engine/table/impl/PartitionedTableTest.java
index bcc1d02062d..fd4138bd81f 100644
--- a/engine/table/src/test/java/io/deephaven/engine/table/impl/PartitionedTableTest.java
+++ b/engine/table/src/test/java/io/deephaven/engine/table/impl/PartitionedTableTest.java
@@ -10,7 +10,6 @@
 import io.deephaven.base.SleepUtil;
 import io.deephaven.base.log.LogOutput;
 import io.deephaven.base.verify.Assert;
-import io.deephaven.datastructures.util.CollectionUtil;
 import io.deephaven.engine.context.ExecutionContext;
 import io.deephaven.engine.context.QueryScope;
 import io.deephaven.engine.exceptions.TableInitializationException;
@@ -43,6 +42,7 @@
 import java.io.File;
 import java.io.IOException;
 import java.nio.file.Files;
+import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Map;
 import java.util.Random;
@@ -339,12 +339,12 @@ public void testAttributes() {
 
         Table merged = partitionedTable.merge();
         if (SystemicObjectTracker.isSystemicObjectMarkingEnabled()) {
-            TestCase.assertEquals(CollectionUtil.mapFromArray(String.class, Object.class, "quux", "baz",
+            TestCase.assertEquals(mapFromArray("quux", "baz",
                     Table.SORTABLE_COLUMNS_ATTRIBUTE, "bar", Table.MERGED_TABLE_ATTRIBUTE, true,
                     Table.SYSTEMIC_TABLE_ATTRIBUTE, Boolean.TRUE), merged.getAttributes());
         } else {
             TestCase.assertEquals(
-                    CollectionUtil.mapFromArray(String.class, Object.class, "quux", "baz",
+                    mapFromArray("quux", "baz",
                             Table.SORTABLE_COLUMNS_ATTRIBUTE, "bar", Table.MERGED_TABLE_ATTRIBUTE, true),
                     merged.getAttributes());
         }
@@ -356,12 +356,12 @@ public void testAttributes() {
         // the merged table just takes the set that is consistent
         merged = transformed.merge();
         if (SystemicObjectTracker.isSystemicObjectMarkingEnabled()) {
-            TestCase.assertEquals(CollectionUtil.mapFromArray(String.class, Object.class, "quux", "baz",
+            TestCase.assertEquals(mapFromArray("quux", "baz",
                     Table.SORTABLE_COLUMNS_ATTRIBUTE, "bar", Table.MERGED_TABLE_ATTRIBUTE, true,
                     Table.SYSTEMIC_TABLE_ATTRIBUTE, Boolean.TRUE), merged.getAttributes());
         } else {
             TestCase.assertEquals(
-                    CollectionUtil.mapFromArray(String.class, Object.class, "quux", "baz",
+                    mapFromArray("quux", "baz",
                             Table.SORTABLE_COLUMNS_ATTRIBUTE, "bar", Table.MERGED_TABLE_ATTRIBUTE, true),
                     merged.getAttributes());
         }
@@ -1110,4 +1110,13 @@ public void testPartitionedTableSort() throws IOException {
             FileUtils.deleteRecursively(tmpDir);
         }
     }
+
+    @SuppressWarnings({"unchecked"})
+    public static <K, V> Map<K, V> mapFromArray(Object... data) {
+        Map<K, V> map = new LinkedHashMap<K, V>();
+        for (int nIndex = 0; nIndex < data.length; nIndex += 2) {
+            map.put((K) data[nIndex], (V) data[nIndex + 1]);
+        }
+        return map;
+    }
 }
diff --git a/engine/table/src/test/java/io/deephaven/engine/table/impl/QueryTableAggregationTest.java b/engine/table/src/test/java/io/deephaven/engine/table/impl/QueryTableAggregationTest.java
index 6194ddc85a5..296d3e257e3 100644
--- a/engine/table/src/test/java/io/deephaven/engine/table/impl/QueryTableAggregationTest.java
+++ b/engine/table/src/test/java/io/deephaven/engine/table/impl/QueryTableAggregationTest.java
@@ -10,7 +10,6 @@
 import io.deephaven.api.agg.spec.AggSpec;
 import io.deephaven.base.FileUtils;
 import io.deephaven.chunk.util.pools.ChunkPoolReleaseTracking;
-import io.deephaven.datastructures.util.CollectionUtil;
 import io.deephaven.engine.context.ExecutionContext;
 import io.deephaven.engine.context.QueryScope;
 import io.deephaven.engine.liveness.LivenessScopeStack;
@@ -199,13 +198,26 @@ public int initialHashTableSize(@NotNull final Table table) {
 
     @Test
     public void testStaticGroupedByWithChunks() {
-        final Table input1 = emptyTable(10000).update("A=Integer.toString(i % 5)", "B=i / 5");
+        final Table input1 = emptyTable(10000).update("A=Integer.toString(i % 5)", "B=i / 5", "C=ii");
 
         DataIndexer.getOrCreateDataIndex(input1, "A");
         DataIndexer.getOrCreateDataIndex(input1, "B");
+        DataIndexer.getOrCreateDataIndex(input1, "A", "B");
 
         individualStaticByTest(input1, null, "A");
         individualStaticByTest(input1, null, "B");
+        individualStaticByTest(input1, null, "A", "B");
+
+        // Test scenario where the key columns have different order than in the index
+        individualStaticByTest(input1, null, "B", "A");
+
+        // Test scenarios where the key columns have different names than in the index
+        individualStaticByTest(input1.renameColumns("D=A", "E=B"), null, "D");
+        individualStaticByTest(input1.renameColumns("D=A", "E=B"), null, "E");
+        individualStaticByTest(input1.renameColumns("D=A", "E=B"), null, "D", "E");
+
+        // Test scenario where the key columns have different names and order than in the index
+        individualStaticByTest(input1.renameColumns("D=A", "E=B"), null, "E", "D");
     }
 
     @Test
@@ -887,7 +899,7 @@ public void testKeyColumnTypes() {
 
         final Set<String> keyColumnSet = new LinkedHashSet<>(table.getDefinition().getColumnNameSet());
         keyColumnSet.remove("NonKey");
-        final String[] keyColumns = keyColumnSet.toArray(CollectionUtil.ZERO_LENGTH_STRING_ARRAY);
+        final String[] keyColumns = keyColumnSet.toArray(String[]::new);
 
         table.lastBy("Date", "Sym");
 
@@ -3922,7 +3934,7 @@ public void testKeyColumnMissing() {
             final Table agg = data.selectDistinct("NonExistentCol");
             fail("Should have thrown an exception");
         } catch (Exception ex) {
-            io.deephaven.base.verify.Assert.instanceOf(ex, "ex", IllegalArgumentException.class);
+            assertTrue(ex instanceof IllegalArgumentException);
             io.deephaven.base.verify.Assert.assertion(
                     ex.getMessage().contains("Missing columns: [NonExistentCol]"),
                     "ex.getMessage().contains(\"Missing columns: [NonExistentCol]\")",
@@ -3977,7 +3989,7 @@ public void testMultiPartitionSymbolTableBy() throws IOException {
                     t4.updateView("Date=`2021-07-21`", "Num=400")).moveColumnsUp("Date", "Num");
 
             final Table loaded = ParquetTools.readTable(
-                    new ParquetKeyValuePartitionedLayout(testRootFile.toURI(), 2, ParquetInstructions.EMPTY),
+                    ParquetKeyValuePartitionedLayout.create(testRootFile.toURI(), 2, ParquetInstructions.EMPTY, null),
                     ParquetInstructions.EMPTY);
 
             // verify the sources are identical
diff --git a/engine/table/src/test/java/io/deephaven/engine/table/impl/QueryTableAjTest.java b/engine/table/src/test/java/io/deephaven/engine/table/impl/QueryTableAjTest.java
index 0da82cfe4f3..f04fcfd6009 100644
--- a/engine/table/src/test/java/io/deephaven/engine/table/impl/QueryTableAjTest.java
+++ b/engine/table/src/test/java/io/deephaven/engine/table/impl/QueryTableAjTest.java
@@ -3,10 +3,10 @@
 //
 package io.deephaven.engine.table.impl;
 
+import io.deephaven.engine.liveness.LivenessScope;
 import io.deephaven.engine.table.impl.AsOfJoinMatchFactory.AsOfJoinResult;
 import io.deephaven.base.clock.Clock;
 import io.deephaven.base.testing.BaseArrayTestCase;
-import io.deephaven.datastructures.util.CollectionUtil;
 import io.deephaven.engine.context.ExecutionContext;
 import io.deephaven.engine.primitive.iterator.CloseableIterator;
 import io.deephaven.engine.table.PartitionedTable;
@@ -27,6 +27,7 @@
 import io.deephaven.test.types.OutOfBandTest;
 import io.deephaven.util.SafeCloseable;
 import gnu.trove.list.array.TIntArrayList;
+import io.deephaven.util.type.ArrayTypeUtils;
 import junit.framework.TestCase;
 import org.jetbrains.annotations.NotNull;
 
@@ -367,7 +368,7 @@ public void testAjEmpty() {
         assertEquals(Arrays.asList("Bucket", "LeftStamp", "RightStamp", "Sentinel"),
                 result.getDefinition().getColumnNames());
 
-        BaseArrayTestCase.assertEquals(CollectionUtil.ZERO_LENGTH_INT_ARRAY, intColumn(result, "Sentinel"));
+        BaseArrayTestCase.assertEquals(ArrayTypeUtils.EMPTY_INT_ARRAY, intColumn(result, "Sentinel"));
     }
 
     @Test
@@ -661,31 +662,31 @@ public void testAjRandomLeftIncrementalRightStatic() {
             for (int leftSize = 10; leftSize <= maxLeftSize; leftSize *= leftFactor) {
                 for (int rightSize = 10; rightSize <= maxRightSize; rightSize *= rightFactor) {
                     System.out.println("Seed=" + seed + ", leftSize=" + leftSize + ", rightSize=" + rightSize);
-                    try (final SafeCloseable ignored = LivenessScopeStack.open()) {
+                    try (final SafeCloseable ignored = LivenessScopeStack.open(new LivenessScope(true), true)) {
                         testAjRandomIncremental(base.leftStep, seed, leftSize, rightSize, true, false, false, false);
                     }
-                    try (final SafeCloseable ignored = LivenessScopeStack.open()) {
+                    try (final SafeCloseable ignored = LivenessScopeStack.open(new LivenessScope(true), true)) {
                         testAjRandomIncremental(base.leftStep, seed, leftSize, rightSize, true, false, true, false);
                     }
-                    try (final SafeCloseable ignored = LivenessScopeStack.open()) {
+                    try (final SafeCloseable ignored = LivenessScopeStack.open(new LivenessScope(true), true)) {
                         testAjRandomIncremental(base.leftStep, seed, leftSize, rightSize, true, false, false, true);
                     }
-                    try (final SafeCloseable ignored = LivenessScopeStack.open()) {
+                    try (final SafeCloseable ignored = LivenessScopeStack.open(new LivenessScope(true), true)) {
                         testAjRandomIncremental(base.leftStep, seed, leftSize, rightSize, true, false, true, true);
                     }
-                    try (final SafeCloseable ignored = LivenessScopeStack.open()) {
+                    try (final SafeCloseable ignored = LivenessScopeStack.open(new LivenessScope(true), true)) {
                         testAjRandomIncremental(base.leftStepShift, seed, leftSize, rightSize, true, false, false,
                                 false);
                     }
-                    try (final SafeCloseable ignored = LivenessScopeStack.open()) {
+                    try (final SafeCloseable ignored = LivenessScopeStack.open(new LivenessScope(true), true)) {
                         testAjRandomIncremental(base.leftStepShift, seed, leftSize, rightSize, true, false, true,
                                 false);
                     }
-                    try (final SafeCloseable ignored = LivenessScopeStack.open()) {
+                    try (final SafeCloseable ignored = LivenessScopeStack.open(new LivenessScope(true), true)) {
                         testAjRandomIncremental(base.leftStepShift, seed, leftSize, rightSize, true, false, false,
                                 true);
                     }
-                    try (final SafeCloseable ignored = LivenessScopeStack.open()) {
+                    try (final SafeCloseable ignored = LivenessScopeStack.open(new LivenessScope(true), true)) {
                         testAjRandomIncremental(base.leftStepShift, seed, leftSize, rightSize, true, false, true, true);
                     }
                 }
@@ -713,16 +714,16 @@ public void testAjRandomLeftStaticRightIncremental() {
 
                         System.out.println("Seed=" + seed + ", nodeSize=" + nodeSize + ", leftSize=" + leftSize
                                 + ", rightSize=" + rightSize);
-                        try (final SafeCloseable ignored = LivenessScopeStack.open()) {
+                        try (final SafeCloseable ignored = LivenessScopeStack.open(new LivenessScope(true), true)) {
                             testAjRandomLeftStaticRightIncremental(seed, nodeSize, leftSize, rightSize, false, false);
                         }
-                        try (final SafeCloseable ignored = LivenessScopeStack.open()) {
+                        try (final SafeCloseable ignored = LivenessScopeStack.open(new LivenessScope(true), true)) {
                             testAjRandomLeftStaticRightIncremental(seed, nodeSize, leftSize, rightSize, true, false);
                         }
-                        try (final SafeCloseable ignored = LivenessScopeStack.open()) {
+                        try (final SafeCloseable ignored = LivenessScopeStack.open(new LivenessScope(true), true)) {
                             testAjRandomLeftStaticRightIncremental(seed, nodeSize, leftSize, rightSize, false, true);
                         }
-                        try (final SafeCloseable ignored = LivenessScopeStack.open()) {
+                        try (final SafeCloseable ignored = LivenessScopeStack.open(new LivenessScope(true), true)) {
                             testAjRandomLeftStaticRightIncremental(seed, nodeSize, leftSize, rightSize, true, true);
                         }
                     }
@@ -765,7 +766,8 @@ public void testAjBothIncremental() {
                                         + ", leftNodeSize=" + leftNodeSize + ", rightNodeSize=" + rightNodeSize
                                         + ", leftSize=" + leftSize + ", rightSize=" + rightSize + ", joinIncrement="
                                         + joinIncrement);
-                                try (final SafeCloseable ignored = LivenessScopeStack.open()) {
+                                try (final SafeCloseable ignored =
+                                        LivenessScopeStack.open(new LivenessScope(true), true)) {
                                     testAjRandomBothIncremental(seed, leftNodeSize, rightNodeSize, leftSize, rightSize,
                                             joinIncrement, int.class);
                                 }
@@ -823,7 +825,8 @@ public void testAjCharIncremental() {
                                         + ", leftNodeSize=" + leftNodeSize + ", rightNodeSize=" + rightNodeSize
                                         + ", leftSize=" + leftSize + ", rightSize=" + rightSize + ", joinIncrement="
                                         + joinIncrement);
-                                try (final SafeCloseable ignored = LivenessScopeStack.open()) {
+                                try (final SafeCloseable ignored =
+                                        LivenessScopeStack.open(new LivenessScope(true), true)) {
                                     testAjRandomBothIncremental(seed, leftNodeSize, rightNodeSize, leftSize, rightSize,
                                             joinIncrement, char.class);
                                 }
@@ -875,7 +878,8 @@ public void testAjBothIncrementalOverflow() {
                                         + joinIncrement);
                                 final int fRightNodeSize = rightNodeSize;
                                 final int fLeftNodeSize = leftNodeSize;
-                                try (final SafeCloseable ignored = LivenessScopeStack.open()) {
+                                try (final SafeCloseable ignored =
+                                        LivenessScopeStack.open(new LivenessScope(true), true)) {
                                     testAjRandomIncrementalWithInitial(seed, leftNodeSize, rightNodeSize, leftSize,
                                             rightSize, joinIncrement, true, true, false, false, true, false,
                                             new JoinControl() {
@@ -986,7 +990,8 @@ public void testAjBothIncrementalIndexed() {
                                         + ", leftNodeSize=" + leftNodeSize + ", rightNodeSize=" + rightNodeSize
                                         + ", leftSize=" + leftSize + ", rightSize=" + rightSize + ", joinIncrement="
                                         + joinIncrement);
-                                try (final SafeCloseable ignored = LivenessScopeStack.open()) {
+                                try (final SafeCloseable ignored =
+                                        LivenessScopeStack.open(new LivenessScope(true), true)) {
                                     testAjRandomBothIncrementalIndexed(seed, leftNodeSize, rightNodeSize, leftSize,
                                             rightSize,
                                             joinIncrement, int.class);
@@ -1232,7 +1237,7 @@ private void doInitialAjComparison(QueryTable leftTable, QueryTable rightTable,
                 Stream.of(oldStyle(r)))
                 .toArray(MatchPair[]::new);
 
-        try (final SafeCloseable ignored = LivenessScopeStack.open()) {
+        try (final SafeCloseable ignored = LivenessScopeStack.open(new LivenessScope(true), true)) {
             final Table refreshingResult = AsOfJoinHelper.asOfJoin(control, leftTable,
                     reverse ? ((QueryTable) rightTable.reverse()) : rightTable, oldStyleMatches,
                     MatchPairFactory.getExpressions("RightStamp", "RightSentinel"),
@@ -1433,10 +1438,10 @@ private void checkAjResult(Table leftTable, Table rightTable, Table result, bool
 
         final int[] leftStampArray = ColumnVectors.ofInt(leftTable, "LeftStamp").toArray();
         final int[] rightStampArray = rightTable == null
-                ? CollectionUtil.ZERO_LENGTH_INT_ARRAY
+                ? ArrayTypeUtils.EMPTY_INT_ARRAY
                 : ColumnVectors.ofInt(rightTable, "RightStamp").toArray();
         final int[] rightSentinelArray = rightTable == null
-                ? CollectionUtil.ZERO_LENGTH_INT_ARRAY
+                ? ArrayTypeUtils.EMPTY_INT_ARRAY
                 : ColumnVectors.ofInt(rightTable, "RightSentinel").toArray();
 
         for (final int leftStamp : leftStampArray) {
@@ -1588,51 +1593,49 @@ public void testIds5293() {
 
     @Test
     public void testIds6898() {
-        try (final SafeCloseable ignored = LivenessScopeStack.open()) {
-            final JoinIncrement joinIncrement = base.leftRightStep;
-            final int seed = 0;
-            final Random random = new Random(seed);
-            final int maxSteps = 5;
-
-            final ColumnInfo<?, ?>[] leftColumnInfo;
-            final int leftSize = 32000;
-            final int rightSize = 32000;
-            final QueryTable leftTable = getTable(true, 100000, random,
-                    leftColumnInfo = initColumnInfos(new String[] {"Bucket", "LeftStamp", "LeftSentinel"},
-                            new StringGenerator(leftSize),
-                            new IntGenerator(0, 100000),
-                            new IntGenerator(10_000_000, 10_010_000)));
-            final ColumnInfo<?, ?>[] rightColumnInfo;
-            final QueryTable rightTable = getTable(true, 100000, random,
-                    rightColumnInfo = initColumnInfos(new String[] {"Bucket", "RightStamp", "RightSentinel"},
-                            new StringGenerator(leftSize),
-                            new SortedIntGenerator(0, 100000),
-                            new IntGenerator(20_000_000, 20_010_000)));
-
-            final EvalNuggetInterface[] en = new EvalNuggetInterface[] {
-                    new EvalNugget() {
-                        @Override
-                        protected Table e() {
-                            return AsOfJoinHelper.asOfJoin(QueryTableJoinTest.SMALL_RIGHT_CONTROL,
-                                    (QueryTable) leftTable.sort("LeftStamp"), rightTable,
-                                    MatchPairFactory.getExpressions("Bucket", "LeftStamp=RightStamp"),
-                                    MatchPairFactory.getExpressions("RightSentinel"), SortingOrder.Ascending, false);
-                        }
-                    },
-            };
-
-            for (int step = 0; step < maxSteps; step++) {
-                System.out.println("Step = " + step + ", leftSize=" + leftSize + ", rightSize=" + rightSize
-                        + ", seed = " + seed + ", joinIncrement=" + joinIncrement);
-                if (RefreshingTableTestCase.printTableUpdates) {
-                    System.out.println("Left Table:" + leftTable.size());
-                    TableTools.showWithRowSet(leftTable, 100);
-                    System.out.println("Right Table:" + rightTable.size());
-                    TableTools.showWithRowSet(rightTable, 100);
-                }
-                joinIncrement.step(leftSize, rightSize, leftTable, rightTable, leftColumnInfo, rightColumnInfo, en,
-                        random);
+        final JoinIncrement joinIncrement = base.leftRightStep;
+        final int seed = 0;
+        final Random random = new Random(seed);
+        final int maxSteps = 5;
+
+        final ColumnInfo<?, ?>[] leftColumnInfo;
+        final int leftSize = 32000;
+        final int rightSize = 32000;
+        final QueryTable leftTable = getTable(true, 100000, random,
+                leftColumnInfo = initColumnInfos(new String[] {"Bucket", "LeftStamp", "LeftSentinel"},
+                        new StringGenerator(leftSize),
+                        new IntGenerator(0, 100000),
+                        new IntGenerator(10_000_000, 10_010_000)));
+        final ColumnInfo<?, ?>[] rightColumnInfo;
+        final QueryTable rightTable = getTable(true, 100000, random,
+                rightColumnInfo = initColumnInfos(new String[] {"Bucket", "RightStamp", "RightSentinel"},
+                        new StringGenerator(leftSize),
+                        new SortedIntGenerator(0, 100000),
+                        new IntGenerator(20_000_000, 20_010_000)));
+
+        final EvalNuggetInterface[] en = new EvalNuggetInterface[] {
+                new EvalNugget() {
+                    @Override
+                    protected Table e() {
+                        return AsOfJoinHelper.asOfJoin(QueryTableJoinTest.SMALL_RIGHT_CONTROL,
+                                (QueryTable) leftTable.sort("LeftStamp"), rightTable,
+                                MatchPairFactory.getExpressions("Bucket", "LeftStamp=RightStamp"),
+                                MatchPairFactory.getExpressions("RightSentinel"), SortingOrder.Ascending, false);
+                    }
+                },
+        };
+
+        for (int step = 0; step < maxSteps; step++) {
+            System.out.println("Step = " + step + ", leftSize=" + leftSize + ", rightSize=" + rightSize
+                    + ", seed = " + seed + ", joinIncrement=" + joinIncrement);
+            if (RefreshingTableTestCase.printTableUpdates) {
+                System.out.println("Left Table:" + leftTable.size());
+                TableTools.showWithRowSet(leftTable, 100);
+                System.out.println("Right Table:" + rightTable.size());
+                TableTools.showWithRowSet(rightTable, 100);
             }
+            joinIncrement.step(leftSize, rightSize, leftTable, rightTable, leftColumnInfo, rightColumnInfo, en,
+                    random);
         }
     }
 
@@ -1641,37 +1644,35 @@ protected Table e() {
      */
     @Test
     public void testDHC3080() {
-        try (final SafeCloseable ignored = LivenessScopeStack.open()) {
-            final int seed = 0;
-            final Random random = new Random(seed);
-
-            final int leftSize = 32000;
-
-            // fairly small LHS will speed up detection of the error but will not affect correctness
-            final QueryTable leftTable = getTable(true, 1000, random,
-                    initColumnInfos(new String[] {"Bucket", "LeftStamp", "LeftSentinel"},
-                            new StringGenerator(leftSize),
-                            new IntGenerator(0, 100000),
-                            new IntGenerator(10_000_000, 10_010_000)));
-
-            // need RHS with unique bucket count > rehash threshold of 4096
-            final QueryTable rightTable = getTable(true, 32000, random,
-                    initColumnInfos(new String[] {"Bucket", "RightStamp", "RightSentinel"},
-                            new StringGenerator(leftSize),
-                            new SortedIntGenerator(0, 100000),
-                            new IntGenerator(20_000_000, 20_010_000)));
-
-            final Table result = AsOfJoinHelper.asOfJoin(QueryTableJoinTest.SMALL_LEFT_CONTROL, leftTable,
-                    (QueryTable) rightTable.reverse(),
-                    MatchPairFactory.getExpressions("Bucket", "LeftStamp=RightStamp"),
-                    MatchPairFactory.getExpressions("RightStamp", "RightSentinel"), SortingOrder.Descending, true);
-
-            // force compare results of the bucketed output, we cannot compare static to incremental as in other tests
-            // because static will experience the same error when performing `rehashInternalFull()`
-            checkAjResults(result.partitionBy("Bucket"), leftTable.partitionBy("Bucket"),
-                    rightTable.partitionBy("Bucket"),
-                    true, true);
-        }
+        final int seed = 0;
+        final Random random = new Random(seed);
+
+        final int leftSize = 32000;
+
+        // fairly small LHS will speed up detection of the error but will not affect correctness
+        final QueryTable leftTable = getTable(true, 1000, random,
+                initColumnInfos(new String[] {"Bucket", "LeftStamp", "LeftSentinel"},
+                        new StringGenerator(leftSize),
+                        new IntGenerator(0, 100000),
+                        new IntGenerator(10_000_000, 10_010_000)));
+
+        // need RHS with unique bucket count > rehash threshold of 4096
+        final QueryTable rightTable = getTable(true, 32000, random,
+                initColumnInfos(new String[] {"Bucket", "RightStamp", "RightSentinel"},
+                        new StringGenerator(leftSize),
+                        new SortedIntGenerator(0, 100000),
+                        new IntGenerator(20_000_000, 20_010_000)));
+
+        final Table result = AsOfJoinHelper.asOfJoin(QueryTableJoinTest.SMALL_LEFT_CONTROL, leftTable,
+                (QueryTable) rightTable.reverse(),
+                MatchPairFactory.getExpressions("Bucket", "LeftStamp=RightStamp"),
+                MatchPairFactory.getExpressions("RightStamp", "RightSentinel"), SortingOrder.Descending, true);
+
+        // force compare results of the bucketed output, we cannot compare static to incremental as in other tests
+        // because static will experience the same error when performing `rehashInternalFull()`
+        checkAjResults(result.partitionBy("Bucket"), leftTable.partitionBy("Bucket"),
+                rightTable.partitionBy("Bucket"),
+                true, true);
     }
 
     /**
@@ -1681,45 +1682,43 @@ public void testDHC3080() {
      */
     @Test
     public void testDHC4700() {
-        try (final SafeCloseable ignored = LivenessScopeStack.open()) {
-            final int seed = 0;
-            final Random random = new Random(seed);
-
-            final ColumnInfo<?, ?>[] leftColumnInfo;
-            final ColumnInfo<?, ?>[] rightColumnInfo;
-
-            // Small initial tables.
-            final int leftSize = 2;
-            final int rightSize = 2;
-            final QueryTable leftTable = getTable(true, leftSize, random,
-                    leftColumnInfo = initColumnInfos(new String[] {"Bucket", "LeftStamp", "LeftSentinel"},
-                            new StringGenerator(100_000),
-                            new IntGenerator(0, 100_000),
-                            new IntGenerator(10_000_000, 10_010_000)));
-            final QueryTable rightTable = getTable(true, rightSize, random,
-                    rightColumnInfo = initColumnInfos(new String[] {"Bucket", "RightStamp", "RightSentinel"},
-                            new StringGenerator(100_000),
-                            new SortedIntGenerator(0, 100_000),
-                            new IntGenerator(20_000_000, 20_010_000)));
-
-            final Table result = AsOfJoinHelper.asOfJoin(QueryTableJoinTest.SMALL_LEFT_CONTROL, leftTable,
-                    (QueryTable) rightTable.reverse(),
-                    MatchPairFactory.getExpressions("Bucket", "LeftStamp=RightStamp"),
-                    MatchPairFactory.getExpressions("RightStamp", "RightSentinel"), SortingOrder.Descending, true);
+        final int seed = 0;
+        final Random random = new Random(seed);
 
-            final ControlledUpdateGraph updateGraph = ExecutionContext.getContext().getUpdateGraph().cast();
-            updateGraph.runWithinUnitTestCycle(() -> {
-                // Large updates to force a partial rehash.
-                GenerateTableUpdates.generateShiftAwareTableUpdates(GenerateTableUpdates.DEFAULT_PROFILE, 100_000,
-                        random, leftTable, leftColumnInfo);
-                GenerateTableUpdates.generateShiftAwareTableUpdates(GenerateTableUpdates.DEFAULT_PROFILE, 100_000,
-                        random, rightTable, rightColumnInfo);
-            });
+        final ColumnInfo<?, ?>[] leftColumnInfo;
+        final ColumnInfo<?, ?>[] rightColumnInfo;
 
-            // Compare results of the bucketed output.
-            checkAjResults(result.partitionBy("Bucket"), leftTable.partitionBy("Bucket"),
-                    rightTable.partitionBy("Bucket"),
-                    true, true);
-        }
+        // Small initial tables.
+        final int leftSize = 2;
+        final int rightSize = 2;
+        final QueryTable leftTable = getTable(true, leftSize, random,
+                leftColumnInfo = initColumnInfos(new String[] {"Bucket", "LeftStamp", "LeftSentinel"},
+                        new StringGenerator(100_000),
+                        new IntGenerator(0, 100_000),
+                        new IntGenerator(10_000_000, 10_010_000)));
+        final QueryTable rightTable = getTable(true, rightSize, random,
+                rightColumnInfo = initColumnInfos(new String[] {"Bucket", "RightStamp", "RightSentinel"},
+                        new StringGenerator(100_000),
+                        new SortedIntGenerator(0, 100_000),
+                        new IntGenerator(20_000_000, 20_010_000)));
+
+        final Table result = AsOfJoinHelper.asOfJoin(QueryTableJoinTest.SMALL_LEFT_CONTROL, leftTable,
+                (QueryTable) rightTable.reverse(),
+                MatchPairFactory.getExpressions("Bucket", "LeftStamp=RightStamp"),
+                MatchPairFactory.getExpressions("RightStamp", "RightSentinel"), SortingOrder.Descending, true);
+
+        final ControlledUpdateGraph updateGraph = ExecutionContext.getContext().getUpdateGraph().cast();
+        updateGraph.runWithinUnitTestCycle(() -> {
+            // Large updates to force a partial rehash.
+            GenerateTableUpdates.generateShiftAwareTableUpdates(GenerateTableUpdates.DEFAULT_PROFILE, 100_000,
+                    random, leftTable, leftColumnInfo);
+            GenerateTableUpdates.generateShiftAwareTableUpdates(GenerateTableUpdates.DEFAULT_PROFILE, 100_000,
+                    random, rightTable, rightColumnInfo);
+        });
+
+        // Compare results of the bucketed output.
+        checkAjResults(result.partitionBy("Bucket"), leftTable.partitionBy("Bucket"),
+                rightTable.partitionBy("Bucket"),
+                true, true);
     }
 }
diff --git a/engine/table/src/test/java/io/deephaven/engine/table/impl/QueryTableCrossJoinTestBase.java b/engine/table/src/test/java/io/deephaven/engine/table/impl/QueryTableCrossJoinTestBase.java
index 6f09bebc648..010179fd169 100644
--- a/engine/table/src/test/java/io/deephaven/engine/table/impl/QueryTableCrossJoinTestBase.java
+++ b/engine/table/src/test/java/io/deephaven/engine/table/impl/QueryTableCrossJoinTestBase.java
@@ -10,7 +10,6 @@
 import io.deephaven.chunk.ResettableWritableIntChunk;
 import io.deephaven.chunk.WritableIntChunk;
 import io.deephaven.chunk.attributes.Values;
-import io.deephaven.datastructures.util.CollectionUtil;
 import io.deephaven.engine.context.ExecutionContext;
 import io.deephaven.engine.rowset.RowSetFactory;
 import io.deephaven.engine.rowset.RowSetShiftData;
@@ -386,14 +385,14 @@ private void testStaticJoin(final String[] types, final int[] cardinality, int m
         }
 
         final QueryTable left = (QueryTable) TableTools.newTable(
-                stringCol("sharedKey", leftKeys.toArray(CollectionUtil.ZERO_LENGTH_STRING_ARRAY)),
+                stringCol("sharedKey", leftKeys.toArray(String[]::new)),
                 longCol("leftData", leftData.toArray()));
         if (leftTicking) {
             left.setRefreshing(true);
         }
 
         final QueryTable right = (QueryTable) TableTools.newTable(stringCol("sharedKey",
-                rightKeys.toArray(CollectionUtil.ZERO_LENGTH_STRING_ARRAY)),
+                rightKeys.toArray(String[]::new)),
                 longCol("rightData", rightData.toArray()));
         if (rightTicking) {
             right.setRefreshing(true);
diff --git a/engine/table/src/test/java/io/deephaven/engine/table/impl/QueryTableFloatingPointZeroTest.java b/engine/table/src/test/java/io/deephaven/engine/table/impl/QueryTableFloatingPointZeroTest.java
new file mode 100644
index 00000000000..8630e2c1bfd
--- /dev/null
+++ b/engine/table/src/test/java/io/deephaven/engine/table/impl/QueryTableFloatingPointZeroTest.java
@@ -0,0 +1,660 @@
+//
+// Copyright (c) 2016-2024 Deephaven Data Labs and Patent Pending
+//
+package io.deephaven.engine.table.impl;
+
+import io.deephaven.api.ColumnName;
+import io.deephaven.api.RangeJoinMatch;
+import io.deephaven.api.agg.Aggregation;
+import io.deephaven.api.agg.spec.AggSpec;
+import io.deephaven.api.filter.FilterComparison;
+import io.deephaven.api.literal.Literal;
+import io.deephaven.chunk.util.pools.ChunkPoolReleaseTracking;
+import io.deephaven.engine.rowset.RowSet;
+import io.deephaven.engine.table.MultiJoinFactory;
+import io.deephaven.engine.table.Table;
+import io.deephaven.engine.testutil.junit4.EngineCleanup;
+import io.deephaven.test.types.OutOfBandTest;
+import junit.framework.TestCase;
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Ignore;
+import org.junit.Rule;
+import org.junit.Test;
+import org.junit.experimental.categories.Category;
+
+import java.util.Arrays;
+import java.util.List;
+
+import static io.deephaven.engine.testutil.TstUtils.assertEquals;
+import static io.deephaven.engine.testutil.TstUtils.assertTableEquals;
+import static io.deephaven.engine.util.TableTools.doubleCol;
+import static io.deephaven.engine.util.TableTools.floatCol;
+import static io.deephaven.engine.util.TableTools.intCol;
+import static io.deephaven.engine.util.TableTools.longCol;
+import static io.deephaven.engine.util.TableTools.newTable;
+
+@Category(OutOfBandTest.class)
+public class QueryTableFloatingPointZeroTest {
+
+    @Rule
+    public final EngineCleanup base = new EngineCleanup();
+
+    @Before
+    public void setUp() throws Exception {
+        ChunkPoolReleaseTracking.enableStrict();
+    }
+
+    @After
+    public void tearDown() throws Exception {
+        ChunkPoolReleaseTracking.checkAndDisable();
+    }
+
+    @Test
+    public void testFloatJoinKey() {
+        final Table t1 = newTable(floatCol("KeyNeg", -0.0f), floatCol("Neg", -0.0f));
+        final Table t2 = newTable(floatCol("KeyPos", 0.0f), floatCol("Pos", 0.0f));
+        final Table ajT1 = newTable(intCol("KeyA", 0), floatCol("KeyNeg", -0.0f), floatCol("Neg", -0.0f));
+        final Table ajT2 = newTable(intCol("KeyA", 0), floatCol("KeyPos", 0.0f), floatCol("Pos", 0.0f));
+        for (Table out : Arrays.asList(
+                t1.naturalJoin(t2, "KeyNeg=KeyPos"),
+                t2.naturalJoin(t1, "KeyPos=KeyNeg"),
+                t1.exactJoin(t2, "KeyNeg=KeyPos"),
+                t2.exactJoin(t1, "KeyPos=KeyNeg"),
+                t1.join(t2, "KeyNeg=KeyPos"),
+                t2.join(t1, "KeyPos=KeyNeg"),
+                ajT1.aj(ajT2, "KeyA,KeyNeg>=KeyPos"),
+                ajT2.aj(ajT1, "KeyA,KeyPos>=KeyNeg"),
+                ajT1.aj(ajT2, "KeyNeg=KeyPos,KeyA"),
+                ajT2.aj(ajT1, "KeyPos=KeyNeg,KeyA"))) {
+            final long key = oneKey(out);
+            floatToBitsEquals(out, "KeyNeg", key, -0.0f);
+            floatToBitsEquals(out, "KeyPos", key, 0.0f);
+            floatToBitsEquals(out, "Neg", key, -0.0f);
+            floatToBitsEquals(out, "Pos", key, 0.0f);
+        }
+    }
+
+    @Test
+    public void testDoubleJoinKey() {
+        final Table t1 = newTable(doubleCol("KeyNeg", -0.0), doubleCol("Neg", -0.0));
+        final Table t2 = newTable(doubleCol("KeyPos", 0.0), doubleCol("Pos", 0.0));
+        final Table ajT1 = newTable(intCol("KeyA", 0), doubleCol("KeyNeg", -0.0), doubleCol("Neg", -0.0));
+        final Table ajT2 = newTable(intCol("KeyA", 0), doubleCol("KeyPos", 0.0), doubleCol("Pos", 0.0));
+        for (Table out : Arrays.asList(
+                t1.naturalJoin(t2, "KeyNeg=KeyPos"),
+                t2.naturalJoin(t1, "KeyPos=KeyNeg"),
+                t1.exactJoin(t2, "KeyNeg=KeyPos"),
+                t2.exactJoin(t1, "KeyPos=KeyNeg"),
+                t1.join(t2, "KeyNeg=KeyPos"),
+                t2.join(t1, "KeyPos=KeyNeg"),
+                ajT1.aj(ajT2, "KeyA,KeyNeg>=KeyPos"),
+                ajT2.aj(ajT1, "KeyA,KeyPos>=KeyNeg"),
+                ajT1.aj(ajT2, "KeyNeg=KeyPos,KeyA"),
+                ajT2.aj(ajT1, "KeyPos=KeyNeg,KeyA"))) {
+            final long key = oneKey(out);
+            doubleToBitsEquals(out, "KeyNeg", key, -0.0);
+            doubleToBitsEquals(out, "KeyPos", key, 0.0);
+            doubleToBitsEquals(out, "Neg", key, -0.0);
+            doubleToBitsEquals(out, "Pos", key, 0.0);
+        }
+    }
+
+    @Test
+    public void testFloatJoinMultiKey() {
+        final Table t1 = newTable(intCol("Key1", 0), floatCol("KeyNeg", -0.0f), floatCol("Neg", -0.0f));
+        final Table t2 = newTable(intCol("Key1", 0), floatCol("KeyPos", 0.0f), floatCol("Pos", 0.0f));
+        final Table ajT1 =
+                newTable(intCol("KeyA", 0), intCol("Key1", 0), floatCol("KeyNeg", -0.0f), floatCol("Neg", -0.0f));
+        final Table ajT2 =
+                newTable(intCol("KeyA", 0), intCol("Key1", 0), floatCol("KeyPos", 0.0f), floatCol("Pos", 0.0f));
+        for (Table out : Arrays.asList(
+                t1.naturalJoin(t2, "Key1,KeyNeg=KeyPos"),
+                t2.naturalJoin(t1, "Key1,KeyPos=KeyNeg"),
+                t1.exactJoin(t2, "Key1,KeyNeg=KeyPos"),
+                t2.exactJoin(t1, "Key1,KeyPos=KeyNeg"),
+                t1.join(t2, "Key1,KeyNeg=KeyPos"),
+                t2.join(t1, "Key1,KeyPos=KeyNeg"),
+
+                t1.naturalJoin(t2, "KeyNeg=KeyPos,Key1"),
+                t2.naturalJoin(t1, "KeyPos=KeyNeg,Key1"),
+                t1.exactJoin(t2, "KeyNeg=KeyPos,Key1"),
+                t2.exactJoin(t1, "KeyPos=KeyNeg,Key1"),
+                t1.join(t2, "KeyNeg=KeyPos,Key1"),
+                t2.join(t1, "KeyPos=KeyNeg,Key1"),
+
+                ajT1.aj(ajT2, "KeyA,Key1,KeyNeg>=KeyPos"),
+                ajT2.aj(ajT1, "KeyA,Key1,KeyPos>=KeyNeg"),
+
+                ajT1.aj(ajT2, "KeyA,KeyNeg=KeyPos,Key1"),
+                ajT2.aj(ajT1, "KeyA,KeyPos=KeyNeg,Key1"),
+
+                ajT1.aj(ajT2, "KeyNeg=KeyPos,KeyA,Key1"),
+                ajT2.aj(ajT1, "KeyPos=KeyNeg,KeyA,Key1"))) {
+            final long key = oneKey(out);
+            floatToBitsEquals(out, "KeyNeg", key, -0.0f);
+            floatToBitsEquals(out, "KeyPos", key, 0.0f);
+            floatToBitsEquals(out, "Neg", key, -0.0f);
+            floatToBitsEquals(out, "Pos", key, 0.0f);
+        }
+    }
+
+    @Test
+    public void testDoubleJoinMultiKey() {
+        final Table t1 = newTable(intCol("Key1", 0), doubleCol("KeyNeg", -0.0), doubleCol("Neg", -0.0));
+        final Table t2 = newTable(intCol("Key1", 0), doubleCol("KeyPos", 0.0), doubleCol("Pos", 0.0));
+        final Table ajT1 =
+                newTable(intCol("KeyA", 0), intCol("Key1", 0), doubleCol("KeyNeg", -0.0), doubleCol("Neg", -0.0));
+        final Table ajT2 =
+                newTable(intCol("KeyA", 0), intCol("Key1", 0), doubleCol("KeyPos", 0.0), doubleCol("Pos", 0.0));
+
+        for (Table out : Arrays.asList(
+                t1.naturalJoin(t2, "Key1,KeyNeg=KeyPos"),
+                t2.naturalJoin(t1, "Key1,KeyPos=KeyNeg"),
+                t1.exactJoin(t2, "Key1,KeyNeg=KeyPos"),
+                t2.exactJoin(t1, "Key1,KeyPos=KeyNeg"),
+                t1.join(t2, "Key1,KeyNeg=KeyPos"),
+                t2.join(t1, "Key1,KeyPos=KeyNeg"),
+
+                t1.naturalJoin(t2, "KeyNeg=KeyPos,Key1"),
+                t2.naturalJoin(t1, "KeyPos=KeyNeg,Key1"),
+                t1.exactJoin(t2, "KeyNeg=KeyPos,Key1"),
+                t2.exactJoin(t1, "KeyPos=KeyNeg,Key1"),
+                t1.join(t2, "KeyNeg=KeyPos,Key1"),
+                t2.join(t1, "KeyPos=KeyNeg,Key1"),
+
+                ajT1.aj(ajT2, "KeyA,Key1,KeyNeg>=KeyPos"),
+                ajT2.aj(ajT1, "KeyA,Key1,KeyPos>=KeyNeg"),
+
+                ajT1.aj(ajT2, "KeyA,KeyNeg=KeyPos,Key1"),
+                ajT2.aj(ajT1, "KeyA,KeyPos=KeyNeg,Key1"),
+
+                ajT1.aj(ajT2, "KeyNeg=KeyPos,KeyA,Key1"),
+                ajT2.aj(ajT1, "KeyPos=KeyNeg,KeyA,Key1"))) {
+            final long key = oneKey(out);
+            doubleToBitsEquals(out, "KeyNeg", key, -0.0);
+            doubleToBitsEquals(out, "KeyPos", key, 0.0);
+            doubleToBitsEquals(out, "Neg", key, -0.0);
+            doubleToBitsEquals(out, "Pos", key, 0.0);
+        }
+    }
+
+    @Test
+    public void testFloatMultiJoin() {
+        // Note: table equals check doesn't account for -0.0 v 0.0, so explicitly testing that as well
+        final Table expected = newTable(
+                floatCol("Key", 0.0f),
+                intCol("S1", 1),
+                intCol("S2", 2),
+                intCol("S3", 3));
+        // preserves Key from first table
+        {
+            final Table t1 = newTable(floatCol("Key", -0.0f), intCol("S1", 1));
+            final Table t2 = newTable(floatCol("Key", 0.0f), intCol("S2", 2));
+            final Table t3 = newTable(floatCol("Key", -0.0f), intCol("S3", 3));
+            final Table actual = MultiJoinFactory.of("Key", t1, t2, t3).table();
+            final long key = oneKey(actual);
+            floatToBitsEquals(actual, "Key", key, -0.0f);
+            assertTableEquals(expected, actual);
+        }
+        {
+            final Table t1 = newTable(floatCol("Key", 0.0f), intCol("S1", 1));
+            final Table t2 = newTable(floatCol("Key", 0.0f), intCol("S2", 2));
+            final Table t3 = newTable(floatCol("Key", -0.0f), intCol("S3", 3));
+            final Table actual = MultiJoinFactory.of("Key", t1, t2, t3).table();
+            final long key = oneKey(actual);
+            floatToBitsEquals(actual, "Key", key, 0.0f);
+            assertTableEquals(expected, actual);
+        }
+    }
+
+    @Test
+    public void testDoubleMultiJoin() {
+        // Note: table equals check doesn't account for -0.0 v 0.0, so explicitly testing that as well
+        final Table expected = newTable(
+                doubleCol("Key", 0.0),
+                intCol("S1", 1),
+                intCol("S2", 2),
+                intCol("S3", 3));
+        // preserves Key from first table
+        {
+            final Table t1 = newTable(doubleCol("Key", -0.0), intCol("S1", 1));
+            final Table t2 = newTable(doubleCol("Key", 0.0), intCol("S2", 2));
+            final Table t3 = newTable(doubleCol("Key", -0.0), intCol("S3", 3));
+            final Table actual = MultiJoinFactory.of("Key", t1, t2, t3).table();
+            final long key = oneKey(actual);
+            doubleToBitsEquals(actual, "Key", key, -0.0);
+            assertTableEquals(expected, actual);
+        }
+        {
+            final Table t1 = newTable(doubleCol("Key", 0.0), intCol("S1", 1));
+            final Table t2 = newTable(doubleCol("Key", 0.0), intCol("S2", 2));
+            final Table t3 = newTable(doubleCol("Key", -0.0), intCol("S3", 3));
+            final Table actual = MultiJoinFactory.of("Key", t1, t2, t3).table();
+            final long key = oneKey(actual);
+            doubleToBitsEquals(actual, "Key", key, 0.0);
+            assertTableEquals(expected, actual);
+        }
+    }
+
+    @Test
+    public void testFloatAggKey() {
+        {
+            final Table xy = newTable(floatCol("X", -0.0f, 0.0f), intCol("Y", 0, 1));
+            final Table grouped = xy.groupBy("X");
+            floatToBitsEquals(grouped, "X", oneKey(grouped), -0.0f);
+        }
+        {
+            final Table xy = newTable(floatCol("X", 0.0f, -0.0f), intCol("Y", 0, 1));
+            final Table grouped = xy.groupBy("X");
+            floatToBitsEquals(grouped, "X", oneKey(grouped), 0.0f);
+        }
+    }
+
+    @Test
+    public void testDoubleAggKey() {
+        {
+            final Table xy = newTable(doubleCol("X", -0.0, 0.0), intCol("Y", 0, 1));
+            final Table grouped = xy.groupBy("X");
+            doubleToBitsEquals(grouped, "X", oneKey(grouped), -0.0);
+        }
+        {
+            final Table xy = newTable(doubleCol("X", 0.0, -0.0), intCol("Y", 0, 1));
+            final Table grouped = xy.groupBy("X");
+            doubleToBitsEquals(grouped, "X", oneKey(grouped), 0.0);
+        }
+    }
+
+    @Test
+    public void testFloatDoubleAggKey() {
+        {
+            final Table xyz = newTable(
+                    floatCol("X", -0.0f, 0.0f),
+                    doubleCol("Y", -0.0, 0.0),
+                    intCol("Z", 0, 1));
+            final Table grouped = xyz.groupBy("X", "Y");
+            floatToBitsEquals(grouped, "X", oneKey(grouped), -0.0f);
+            doubleToBitsEquals(grouped, "Y", oneKey(grouped), -0.0);
+        }
+        {
+            final Table xyz = newTable(
+                    floatCol("X", -0.0f, 0.0f),
+                    doubleCol("Y", -0.0, 0.0),
+                    intCol("Z", 0, 1));
+            final Table grouped = xyz.groupBy("Y", "X");
+            floatToBitsEquals(grouped, "X", oneKey(grouped), -0.0f);
+            doubleToBitsEquals(grouped, "Y", oneKey(grouped), -0.0);
+        }
+        {
+            final Table xyz = newTable(
+                    floatCol("X", -0.0f, 0.0f),
+                    doubleCol("Y", 0.0, -0.0),
+                    intCol("Z", 0, 1));
+            final Table grouped = xyz.groupBy("X", "Y");
+            floatToBitsEquals(grouped, "X", oneKey(grouped), -0.0f);
+            doubleToBitsEquals(grouped, "Y", oneKey(grouped), 0.0);
+        }
+        {
+            final Table xyz = newTable(
+                    floatCol("X", -0.0f, 0.0f),
+                    doubleCol("Y", 0.0, -0.0),
+                    intCol("Z", 0, 1));
+            final Table grouped = xyz.groupBy("Y", "X");
+            floatToBitsEquals(grouped, "X", oneKey(grouped), -0.0f);
+            doubleToBitsEquals(grouped, "Y", oneKey(grouped), 0.0);
+        }
+    }
+
+    @Test
+    public void testFloatMinMaxAggAndFormulaResult() {
+        {
+            final Table negFirst = newTable(floatCol("X", -0.0f, 0.0f));
+            for (Table table : Arrays.asList(
+                    negFirst.minBy(),
+                    negFirst.maxBy(),
+                    negFirst.groupBy().view("X=min(X)"),
+                    negFirst.groupBy().view("X=max(X)"))) {
+                floatToBitsEquals(table, "X", oneKey(table), -0.0f);
+            }
+        }
+        {
+            final Table posFirst = newTable(floatCol("X", 0.0f, -0.0f));
+            for (Table table : Arrays.asList(
+                    posFirst.minBy(),
+                    posFirst.maxBy(),
+                    posFirst.groupBy().view("X=min(X)"),
+                    posFirst.groupBy().view("X=max(X)"))) {
+                floatToBitsEquals(table, "X", oneKey(table), 0.0f);
+            }
+        }
+    }
+
+    @Test
+    public void testDoubleMinMaxAggAndFormulaResult() {
+        {
+            final Table negFirst = newTable(doubleCol("X", -0.0, 0.0));
+            for (Table table : Arrays.asList(
+                    negFirst.minBy(),
+                    negFirst.maxBy(),
+                    negFirst.groupBy().view("X=min(X)"),
+                    negFirst.groupBy().view("X=max(X)"))) {
+                doubleToBitsEquals(table, "X", oneKey(table), -0.0);
+            }
+        }
+        {
+            final Table posFirst = newTable(doubleCol("X", 0.0, -0.0));
+            for (Table table : Arrays.asList(
+                    posFirst.minBy(),
+                    posFirst.maxBy(),
+                    posFirst.groupBy().view("X=min(X)"),
+                    posFirst.groupBy().view("X=max(X)"))) {
+                doubleToBitsEquals(table, "X", oneKey(table), 0.0);
+            }
+        }
+    }
+
+    @Test
+    @Ignore("Unstable sort?")
+    public void testFloatMedianAggResult() {
+        {
+            final Table negFirst = newTable(floatCol("X", -2.0f, -1.0f, -0.0f, 0.0f, 1.0f));
+            for (Table table : Arrays.asList(
+                    negFirst.medianBy())) {
+                floatToBitsEquals(table, "X", oneKey(table), -0.0f);
+            }
+        }
+        {
+            final Table posFirst = newTable(floatCol("X", -2.0f, -1.0f, 0.0f, -0.0f, 1.0f));
+            for (Table table : Arrays.asList(
+                    posFirst.medianBy())) {
+                floatToBitsEquals(table, "X", oneKey(table), 0.0f);
+            }
+        }
+    }
+
+    // Note: broken into a different test than above b/c median(FloatVector) returns double :(
+    @Test
+    @Ignore("Unstable sort?")
+    public void testFloatMedianFormulaResult() {
+        {
+            final Table negFirst = newTable(floatCol("X", -2.0f, -1.0f, -0.0f, 0.0f, 1.0f));
+            for (Table table : Arrays.asList(
+                    negFirst.groupBy().view("X=median(X)"))) {
+                doubleToBitsEquals(table, "X", oneKey(table), -0.0);
+            }
+        }
+        {
+            final Table posFirst = newTable(floatCol("X", -2.0f, -1.0f, 0.0f, -0.0f, 1.0f));
+            for (Table table : Arrays.asList(
+                    posFirst.groupBy().view("X=median(X)"))) {
+                doubleToBitsEquals(table, "X", oneKey(table), 0.0);
+            }
+        }
+    }
+
+    @Test
+    @Ignore("Unstable sort?")
+    public void testDoubleMedianAggAndFormulaResult() {
+        {
+            final Table negFirst = newTable(doubleCol("X", -2.0, -1.0, -0.0, 0.0, 1.0));
+            for (Table table : Arrays.asList(
+                    negFirst.medianBy(),
+                    negFirst.groupBy().view("X=median(X)"))) {
+                doubleToBitsEquals(table, "X", oneKey(table), -0.0);
+            }
+        }
+        {
+            final Table posFirst = newTable(doubleCol("X", -2.0, -1.0, 0.0, -0.0, 1.0));
+            for (Table table : Arrays.asList(
+                    posFirst.medianBy(),
+                    posFirst.groupBy().view("X=median(X)"))) {
+                doubleToBitsEquals(table, "X", oneKey(table), 0.0);
+            }
+        }
+    }
+
+    @Test
+    public void testCountDistinctFloatAggResults() {
+        final Table expected = newTable(longCol("X", 1));
+        for (Table x : Arrays.asList(
+                newTable(floatCol("X", -0.0f, 0.0f)),
+                newTable(floatCol("X", 0.0f, -0.0f)),
+                newTable(floatCol("X", -0.0f, 0.0f, -0.0f)),
+                newTable(floatCol("X", 0.0f, -0.0f, 0.0f)))) {
+            final Table actual = x.aggAllBy(AggSpec.countDistinct());
+            assertTableEquals(expected, actual);
+        }
+    }
+
+    @Test
+    public void testCountDistinctDoubleAggResults() {
+        final Table expected = newTable(longCol("X", 1));
+        for (Table x : Arrays.asList(
+                newTable(doubleCol("X", -0.0, 0.0)),
+                newTable(doubleCol("X", 0.0, -0.0)),
+                newTable(doubleCol("X", -0.0, 0.0, -0.0)),
+                newTable(doubleCol("X", 0.0, -0.0, 0.0)))) {
+            final Table actual = x.aggAllBy(AggSpec.countDistinct());
+            assertTableEquals(expected, actual);
+        }
+    }
+
+    @Test
+    @Ignore("Unstable sort?")
+    public void testDistinctFloatAggResults() {
+        {
+            final Table x = newTable(floatCol("X", -0.0f, 0.0f));
+            final Table actual = x.aggAllBy(AggSpec.distinct()).ungroup();
+            floatToBitsEquals(actual, "X", oneKey(actual), -0.0f);
+        }
+        {
+            final Table x = newTable(floatCol("X", 0.0f, -0.0f));
+            final Table actual = x.aggAllBy(AggSpec.distinct()).ungroup();
+            floatToBitsEquals(actual, "X", oneKey(actual), 0.0f);
+        }
+    }
+
+    @Test
+    @Ignore("Unstable sort?")
+    public void testDistinctDoubleAggResults() {
+        {
+            final Table x = newTable(doubleCol("X", -0.0, 0.0));
+            final Table actual = x.aggAllBy(AggSpec.distinct()).ungroup();
+            doubleToBitsEquals(actual, "X", oneKey(actual), -0.0);
+        }
+        {
+            final Table x = newTable(doubleCol("X", 0.0, -0.0));
+            final Table actual = x.aggAllBy(AggSpec.distinct()).ungroup();
+            doubleToBitsEquals(actual, "X", oneKey(actual), 0.0);
+        }
+    }
+
+    @Test
+    @Ignore("Unstable sort?")
+    public void testUniqueFloatAggResults() {
+        {
+            final Table x = newTable(floatCol("X", -0.0f, 0.0f));
+            final Table actual = x.aggAllBy(AggSpec.unique());
+            floatToBitsEquals(actual, "X", oneKey(actual), -0.0f);
+        }
+        {
+            final Table x = newTable(floatCol("X", 0.0f, -0.0f));
+            final Table actual = x.aggAllBy(AggSpec.unique());
+            floatToBitsEquals(actual, "X", oneKey(actual), 0.0f);
+        }
+    }
+
+    @Test
+    @Ignore("Unstable sort?")
+    public void testUniqueDoubleAggResults() {
+        {
+            final Table x = newTable(doubleCol("X", -0.0, 0.0));
+            final Table actual = x.aggAllBy(AggSpec.unique());
+            doubleToBitsEquals(actual, "X", oneKey(actual), -0.0);
+        }
+        {
+            final Table x = newTable(doubleCol("X", 0.0, -0.0));
+            final Table actual = x.aggAllBy(AggSpec.unique());
+            doubleToBitsEquals(actual, "X", oneKey(actual), 0.0);
+        }
+    }
+
+    @Test
+    public void testFloatSortedFirstLastAggResults() {
+        final Table expected = newTable(intCol("YFirst", 0), intCol("YLast", 1));
+        for (Table x : Arrays.asList(
+                newTable(floatCol("X", -0.0f, 0.0f), intCol("Y", 0, 1)),
+                newTable(floatCol("X", 0.0f, -0.0f), intCol("Y", 0, 1)))) {
+            final Table actual = x.aggBy(List.of(
+                    Aggregation.AggSortedFirst("X", "YFirst=Y"),
+                    Aggregation.AggSortedLast("X", "YLast=Y")));
+            assertTableEquals(expected, actual);
+        }
+    }
+
+    @Test
+    public void testDoubleSortedFirstLastAggResults() {
+        final Table expected = newTable(intCol("YFirst", 0), intCol("YLast", 1));
+        for (Table x : Arrays.asList(
+                newTable(doubleCol("X", -0.0, 0.0), intCol("Y", 0, 1)),
+                newTable(doubleCol("X", 0.0, -0.0), intCol("Y", 0, 1)))) {
+            final Table actual = x.aggBy(List.of(
+                    Aggregation.AggSortedFirst("X", "YFirst=Y"),
+                    Aggregation.AggSortedLast("X", "YLast=Y")));
+            assertTableEquals(expected, actual);
+        }
+    }
+
+    @Test
+    public void testSortFloatResults() {
+        {
+            final Table x = newTable(floatCol("X", -0.0f, 0.0f));
+            final Table actual = x.sort("X").head(1);
+            floatToBitsEquals(actual, "X", oneKey(actual), -0.0f);
+        }
+        {
+            final Table x = newTable(floatCol("X", 0.0f, -0.0f));
+            final Table actual = x.sort("X").head(1);
+            floatToBitsEquals(actual, "X", oneKey(actual), 0.0f);
+        }
+    }
+
+    @Test
+    public void testSortDoubleResults() {
+        {
+            final Table x = newTable(doubleCol("X", -0.0, 0.0));
+            final Table actual = x.sort("X").head(1);
+            doubleToBitsEquals(actual, "X", oneKey(actual), -0.0);
+        }
+        {
+            final Table x = newTable(doubleCol("X", 0.0, -0.0));
+            final Table actual = x.sort("X").head(1);
+            doubleToBitsEquals(actual, "X", oneKey(actual), 0.0);
+        }
+    }
+
+    @Test
+    public void testWhereFloatFilter() {
+        final Table posZero = newTable(floatCol("X", 0.0f));
+        final Table negZero = newTable(floatCol("X", -0.0f));
+        for (float f : new float[] {-0.0f, 0.0f}) {
+            final Table x = newTable(floatCol("X", f));
+            for (Table actual : Arrays.asList(
+                    x.where("X == 0.0f"),
+                    x.where("X == -0.0f"),
+                    x.where("X >= 0.0f"),
+                    x.where("X >= -0.0f"),
+                    x.where("X <= 0.0f"),
+                    x.where("X <= -0.0f"),
+                    x.where(FilterComparison.eq(ColumnName.of("X"), Literal.of(0.0f))),
+                    x.where(FilterComparison.eq(ColumnName.of("X"), Literal.of(-0.0f))),
+                    x.where(FilterComparison.geq(ColumnName.of("X"), Literal.of(0.0f))),
+                    x.where(FilterComparison.geq(ColumnName.of("X"), Literal.of(-0.0f))),
+                    x.where(FilterComparison.leq(ColumnName.of("X"), Literal.of(0.0f))),
+                    x.where(FilterComparison.leq(ColumnName.of("X"), Literal.of(-0.0f))),
+                    x.whereIn(posZero, "X"),
+                    x.whereIn(negZero, "X"))) {
+                floatToBitsEquals(actual, "X", oneKey(actual), f);
+            }
+        }
+    }
+
+    @Test
+    public void testWhereDoubleFilter() {
+        final Table posZero = newTable(doubleCol("X", 0.0));
+        final Table negZero = newTable(doubleCol("X", -0.0));
+        for (double d : new double[] {-0.0, 0.0}) {
+            final Table x = newTable(doubleCol("X", d));
+            for (Table actual : Arrays.asList(
+                    x.where("X == 0.0"),
+                    x.where("X == -0.0"),
+                    x.where("X >= 0.0"),
+                    x.where("X >= -0.0"),
+                    x.where("X <= 0.0"),
+                    x.where("X <= -0.0"),
+                    x.where(FilterComparison.eq(ColumnName.of("X"), Literal.of(0.0))),
+                    x.where(FilterComparison.eq(ColumnName.of("X"), Literal.of(-0.0))),
+                    x.where(FilterComparison.geq(ColumnName.of("X"), Literal.of(0.0))),
+                    x.where(FilterComparison.geq(ColumnName.of("X"), Literal.of(-0.0))),
+                    x.where(FilterComparison.leq(ColumnName.of("X"), Literal.of(0.0))),
+                    x.where(FilterComparison.leq(ColumnName.of("X"), Literal.of(-0.0))),
+                    x.whereIn(posZero, "X"),
+                    x.whereIn(negZero, "X"))) {
+                doubleToBitsEquals(actual, "X", oneKey(actual), d);
+            }
+        }
+    }
+
+    @Test
+    public void testWhereNotInFloatFilter() {
+        final Table posZero = newTable(floatCol("X", 0.0f));
+        final Table negZero = newTable(floatCol("X", -0.0f));
+        final Table expected = newTable(floatCol("X"));
+        for (float d : new float[] {-0.0f, 0.0f}) {
+            final Table x = newTable(floatCol("X", d));
+            for (Table actual : Arrays.asList(
+                    x.where("X != 0.0f"),
+                    x.where("X != -0.0f"),
+                    x.where(FilterComparison.neq(ColumnName.of("X"), Literal.of(0.0f))),
+                    x.where(FilterComparison.neq(ColumnName.of("X"), Literal.of(-0.0f))),
+                    x.whereNotIn(posZero, "X"),
+                    x.whereNotIn(negZero, "X"))) {
+                assertTableEquals(expected, actual);
+            }
+        }
+    }
+
+    @Test
+    public void testWhereNotInDoubleFilter() {
+        final Table posZero = newTable(doubleCol("X", 0.0));
+        final Table negZero = newTable(doubleCol("X", -0.0));
+        final Table expected = newTable(doubleCol("X"));
+        for (double d : new double[] {-0.0, 0.0}) {
+            final Table x = newTable(doubleCol("X", d));
+            for (Table actual : Arrays.asList(
+                    x.where("X != 0.0"),
+                    x.where("X != -0.0"),
+                    x.where(FilterComparison.neq(ColumnName.of("X"), Literal.of(0.0))),
+                    x.where(FilterComparison.neq(ColumnName.of("X"), Literal.of(-0.0))),
+                    x.whereNotIn(posZero, "X"),
+                    x.whereNotIn(negZero, "X"))) {
+                assertTableEquals(expected, actual);
+            }
+        }
+    }
+
+    private static long oneKey(Table table) {
+        TestCase.assertEquals(1, table.size());
+        return table.getRowSet().firstRowKey();
+    }
+
+    private static void floatToBitsEquals(Table table, String column, long key, float expectedExact) {
+        final float result = table.getColumnSource(column, float.class).getFloat(key);
+        TestCase.assertEquals(Float.floatToIntBits(expectedExact), Float.floatToIntBits(result));
+    }
+
+    private static void doubleToBitsEquals(Table table, String column, long key, double expectedExact) {
+        final double result = table.getColumnSource(column, double.class).getDouble(key);
+        TestCase.assertEquals(Double.doubleToLongBits(expectedExact), Double.doubleToLongBits(result));
+    }
+}
diff --git a/engine/table/src/test/java/io/deephaven/engine/table/impl/QueryTableJoinTest.java b/engine/table/src/test/java/io/deephaven/engine/table/impl/QueryTableJoinTest.java
index 87d10524cb4..44b17967838 100644
--- a/engine/table/src/test/java/io/deephaven/engine/table/impl/QueryTableJoinTest.java
+++ b/engine/table/src/test/java/io/deephaven/engine/table/impl/QueryTableJoinTest.java
@@ -3,7 +3,6 @@
 //
 package io.deephaven.engine.table.impl;
 
-import io.deephaven.datastructures.util.CollectionUtil;
 import io.deephaven.engine.context.ExecutionContext;
 import io.deephaven.engine.table.Table;
 import io.deephaven.engine.table.vectors.ColumnVectors;
@@ -14,6 +13,7 @@
 import io.deephaven.engine.testutil.generator.UnsortedInstantGenerator;
 import io.deephaven.time.DateTimeFormatter;
 import io.deephaven.time.DateTimeUtils;
+import io.deephaven.util.type.ArrayTypeUtils;
 import io.deephaven.vector.IntVector;
 import io.deephaven.vector.ObjectVector;
 import io.deephaven.vector.DoubleVector;
@@ -33,7 +33,6 @@
 import org.junit.Test;
 import org.junit.experimental.categories.Category;
 
-import static io.deephaven.datastructures.util.CollectionUtil.ZERO_LENGTH_STRING_ARRAY;
 import static io.deephaven.engine.testutil.testcase.RefreshingTableTestCase.printTableUpdates;
 import static io.deephaven.engine.util.TableTools.*;
 import static io.deephaven.engine.testutil.TstUtils.*;
@@ -622,9 +621,9 @@ public void testAjEmptyRight() {
                 col("LSentinel", "a", "b", "c", "d"));
 
         final QueryTable right = TstUtils.testRefreshingTable(i().toTracking(),
-                col("Group", ZERO_LENGTH_STRING_ARRAY),
+                col("Group", ArrayTypeUtils.EMPTY_STRING_ARRAY),
                 intCol("RInt"),
-                col("RSentinel", ZERO_LENGTH_STRING_ARRAY));
+                col("RSentinel", ArrayTypeUtils.EMPTY_STRING_ARRAY));
 
         System.out.println("Left:");
         TableTools.show(left);
diff --git a/engine/table/src/test/java/io/deephaven/engine/table/impl/QueryTableLeftOuterJoinTestBase.java b/engine/table/src/test/java/io/deephaven/engine/table/impl/QueryTableLeftOuterJoinTestBase.java
index d37bff134af..f2097ada9b5 100644
--- a/engine/table/src/test/java/io/deephaven/engine/table/impl/QueryTableLeftOuterJoinTestBase.java
+++ b/engine/table/src/test/java/io/deephaven/engine/table/impl/QueryTableLeftOuterJoinTestBase.java
@@ -10,7 +10,6 @@
 import io.deephaven.chunk.WritableIntChunk;
 import io.deephaven.chunk.attributes.Values;
 import io.deephaven.chunk.util.pools.ChunkPoolReleaseTracking;
-import io.deephaven.datastructures.util.CollectionUtil;
 import io.deephaven.engine.context.ExecutionContext;
 import io.deephaven.engine.liveness.LivenessScopeStack;
 import io.deephaven.engine.rowset.RowSet;
@@ -1232,13 +1231,13 @@ private void testStaticJoin(final String[] types, final int[] cardinality, int m
         }
 
         final QueryTable left = (QueryTable) TableTools.newTable(
-                stringCol("sharedKey", leftKeys.toArray(CollectionUtil.ZERO_LENGTH_STRING_ARRAY)),
+                stringCol("sharedKey", leftKeys.toArray(String[]::new)),
                 longCol("leftData", leftData.toArray()));
         if (leftTicking) {
             left.setRefreshing(true);
         }
         final QueryTable right = (QueryTable) TableTools.newTable(
-                stringCol("sharedKey", rightKeys.toArray(CollectionUtil.ZERO_LENGTH_STRING_ARRAY)),
+                stringCol("sharedKey", rightKeys.toArray(String[]::new)),
                 longCol("rightData", rightData.toArray()));
         if (rightTicking) {
             right.setRefreshing(true);
diff --git a/engine/table/src/test/java/io/deephaven/engine/table/impl/QueryTableMultiJoinTest.java b/engine/table/src/test/java/io/deephaven/engine/table/impl/QueryTableMultiJoinTest.java
index 0b1dce72529..5cd865802de 100644
--- a/engine/table/src/test/java/io/deephaven/engine/table/impl/QueryTableMultiJoinTest.java
+++ b/engine/table/src/test/java/io/deephaven/engine/table/impl/QueryTableMultiJoinTest.java
@@ -5,7 +5,6 @@
 
 import gnu.trove.map.hash.TIntIntHashMap;
 import io.deephaven.chunk.util.pools.ChunkPoolReleaseTracking;
-import io.deephaven.datastructures.util.CollectionUtil;
 import io.deephaven.engine.context.ExecutionContext;
 import io.deephaven.engine.liveness.LivenessScopeStack;
 import io.deephaven.engine.rowset.RowSet;
@@ -19,6 +18,7 @@
 import io.deephaven.test.types.OutOfBandTest;
 import io.deephaven.time.DateTimeUtils;
 import io.deephaven.util.SafeCloseable;
+import io.deephaven.util.type.ArrayTypeUtils;
 import org.apache.commons.lang3.mutable.MutableBoolean;
 import org.junit.*;
 import org.junit.experimental.categories.Category;
@@ -26,6 +26,7 @@
 import java.util.*;
 import java.util.function.IntUnaryOperator;
 import java.util.stream.Collectors;
+import java.util.stream.IntStream;
 
 import static io.deephaven.engine.testutil.TstUtils.*;
 import static io.deephaven.engine.testutil.junit4.EngineCleanup.printTableUpdates;
@@ -188,9 +189,9 @@ public void testStatic() {
                 System.out.println("Size = " + size + ", seed =" + seed);
                 testStatic(DEFAULT_JOIN_CONTROL, size, seed, new String[] {"Key"}, new String[] {"Key2"});
                 testStatic(DEFAULT_JOIN_CONTROL, size, seed, new String[] {"Key", "Key2"},
-                        CollectionUtil.ZERO_LENGTH_STRING_ARRAY);
+                        ArrayTypeUtils.EMPTY_STRING_ARRAY);
                 testStatic(DEFAULT_JOIN_CONTROL, size, seed, new String[] {"Key", "Key2"},
-                        CollectionUtil.ZERO_LENGTH_STRING_ARRAY);
+                        ArrayTypeUtils.EMPTY_STRING_ARRAY);
             }
         }
     }
@@ -199,9 +200,9 @@ public void testStatic() {
     public void testStaticOverflowAndRehash() {
         for (int size = 1000; size <= 100_000; size *= 10) {
             testStatic(HIGH_LOAD_JOIN_CONTROL, size, 0, new String[] {"Key", "Key2"},
-                    CollectionUtil.ZERO_LENGTH_STRING_ARRAY);
+                    ArrayTypeUtils.EMPTY_STRING_ARRAY);
             testStatic(REHASH_JOIN_CONTROL, size, 0, new String[] {"Key", "Key2"},
-                    CollectionUtil.ZERO_LENGTH_STRING_ARRAY);
+                    ArrayTypeUtils.EMPTY_STRING_ARRAY);
         }
     }
 
@@ -269,7 +270,7 @@ public void testIncremental() {
                     testIncremental(DEFAULT_JOIN_CONTROL, size, seed, maxSteps, new String[] {"Key"},
                             new String[] {"Key2"});
                     testIncremental(DEFAULT_JOIN_CONTROL, size, seed, maxSteps, new String[] {"Key", "Key2"},
-                            CollectionUtil.ZERO_LENGTH_STRING_ARRAY);
+                            ArrayTypeUtils.EMPTY_STRING_ARRAY);
                 }
             }
         }
@@ -301,7 +302,7 @@ public void testIncrementalOverflowAndRehash() {
                 testIncremental(HIGH_LOAD_JOIN_CONTROL, size, seedInitial, maxSteps, new String[] {"Key"},
                         new String[] {"Key2"});
                 testIncremental(REHASH_JOIN_CONTROL, size, seedInitial, maxSteps, new String[] {"Key", "Key2"},
-                        CollectionUtil.ZERO_LENGTH_STRING_ARRAY);
+                        ArrayTypeUtils.EMPTY_STRING_ARRAY);
             }
         }
     }
@@ -312,7 +313,7 @@ public void testIncrementalZeroKey() {
         for (int seed = 0; seed < seedCount; ++seed) {
             System.out.println("Zero Key, seed = " + seed);
             try (final SafeCloseable ignored = LivenessScopeStack.open()) {
-                testIncremental(DEFAULT_JOIN_CONTROL, 5, seed, 20, CollectionUtil.ZERO_LENGTH_STRING_ARRAY,
+                testIncremental(DEFAULT_JOIN_CONTROL, 5, seed, 20, ArrayTypeUtils.EMPTY_STRING_ARRAY,
                         new String[] {"Key", "Key2"});
             }
         }
@@ -542,9 +543,9 @@ public void testZeroKeyStatic() {
             }
         }
 
-        final Table result = MultiJoinFactory.of(CollectionUtil.ZERO_LENGTH_STRING_ARRAY,
+        final Table result = MultiJoinFactory.of(ArrayTypeUtils.EMPTY_STRING_ARRAY,
                 inputTables.toArray(TableDefaults.ZERO_LENGTH_TABLE_ARRAY)).table();
-        final Table expected = doIterativeMultiJoin(CollectionUtil.ZERO_LENGTH_STRING_ARRAY, inputTables);
+        final Table expected = doIterativeMultiJoin(ArrayTypeUtils.EMPTY_STRING_ARRAY, inputTables);
 
         if (printTableUpdates()) {
             TableTools.showWithRowSet(result);
@@ -819,6 +820,24 @@ public void testMultiJoinInputColumnParsing() {
         Assert.assertEquals(mjiArr[1].columnsToMatch()[1].right().name(), "B");
     }
 
+    @Test
+    public void testRehashWhenEmpty() {
+        final QueryTable t1 = TstUtils.testRefreshingTable(stringCol("Key"), intCol("S1"));
+        final QueryTable t2 = TstUtils.testRefreshingTable(stringCol("Key"), intCol("S2"));
+
+        final ControlledUpdateGraph updateGraph = ExecutionContext.getContext().getUpdateGraph().cast();
+
+        final Table result = updateGraph.sharedLock().computeLocked(
+                () -> MultiJoinFactory.of(new String[] {"Key"}, t1, t2).table());
+
+        updateGraph.runWithinUnitTestCycle(() -> {
+            final RowSet additions = RowSetFactory.fromRange(0, 3073);
+            TstUtils.addToTable(t1, additions,
+                    stringCol("Key", IntStream.rangeClosed(0, 3073).mapToObj(Integer::toString).toArray(String[]::new)),
+                    intCol("S1", IntStream.rangeClosed(0, 3073).map(i -> i * 2).toArray()));
+            t1.notifyListeners(additions, RowSetFactory.empty(), RowSetFactory.empty());
+        });
+    }
 
     private Table doIterativeMultiJoin(String[] keyColumns, List<? extends Table> inputTables) {
         final List<Table> keyTables = inputTables.stream()
diff --git a/engine/table/src/test/java/io/deephaven/engine/table/impl/QueryTableNaturalJoinTest.java b/engine/table/src/test/java/io/deephaven/engine/table/impl/QueryTableNaturalJoinTest.java
index 35b99cacf78..b6e6d4d0802 100644
--- a/engine/table/src/test/java/io/deephaven/engine/table/impl/QueryTableNaturalJoinTest.java
+++ b/engine/table/src/test/java/io/deephaven/engine/table/impl/QueryTableNaturalJoinTest.java
@@ -5,12 +5,10 @@
 
 import io.deephaven.base.FileUtils;
 import io.deephaven.chunk.ObjectChunk;
-import io.deephaven.datastructures.util.CollectionUtil;
 import io.deephaven.engine.context.ExecutionContext;
-import io.deephaven.engine.rowset.RowSet;
-import io.deephaven.engine.rowset.RowSetBuilderSequential;
-import io.deephaven.engine.rowset.RowSetFactory;
-import io.deephaven.engine.rowset.TrackingRowSet;
+import io.deephaven.engine.context.QueryScope;
+import io.deephaven.engine.primitive.iterator.CloseablePrimitiveIteratorOfLong;
+import io.deephaven.engine.rowset.*;
 import io.deephaven.engine.table.ChunkSource;
 import io.deephaven.engine.table.ColumnDefinition;
 import io.deephaven.engine.table.ColumnSource;
@@ -19,6 +17,7 @@
 import io.deephaven.engine.table.impl.indexer.DataIndexer;
 import io.deephaven.engine.table.impl.select.MatchPairFactory;
 import io.deephaven.engine.table.impl.util.ColumnHolder;
+import io.deephaven.engine.table.impl.util.RuntimeMemory;
 import io.deephaven.engine.table.vectors.ColumnVectors;
 import io.deephaven.engine.testutil.*;
 import io.deephaven.engine.testutil.generator.*;
@@ -30,6 +29,7 @@
 import io.deephaven.time.DateTimeUtils;
 import io.deephaven.util.QueryConstants;
 import io.deephaven.util.mutable.MutableInt;
+import io.deephaven.util.type.ArrayTypeUtils;
 import io.deephaven.vector.IntVector;
 import io.deephaven.vector.ObjectVector;
 import junit.framework.TestCase;
@@ -513,7 +513,7 @@ private void testNaturalJoinSimpleStatic(MakeLeftColumn lC) {
         assertEquals(new int[] {NULL_INT, NULL_INT, NULL_INT}, intColumn(cj6, "RightSentinel"));
 
         final Table left7 = newTable(
-                lC.make("String", CollectionUtil.ZERO_LENGTH_STRING_ARRAY),
+                lC.make("String", ArrayTypeUtils.EMPTY_STRING_ARRAY),
                 intCol("LeftSentinel"));
         final Table right7 = newTable(intCol("RightSentinel", 10, 11));
         final Table cj7 = left7.naturalJoin(right7, "");
@@ -1661,6 +1661,59 @@ public void testDHC3202_v2() {
         }
     }
 
+    public void testCyclingBuckets() {
+        final QueryTable cells = TstUtils.testRefreshingTable(RowSetFactory.fromRange(0, 999).toTracking());
+
+        final Table left = cells.updateView("Bucket=k", "SentinelL=1_000_000_000 + k").flatten();
+        final Table right = cells.updateView("Bucket=k", "SentinelR=2_000_000_000 + k").flatten();
+
+        final Table joined = left.naturalJoin(right, "Bucket");
+
+        // create 100,000,000 buckets
+        final RuntimeMemory.Sample sample = new RuntimeMemory.Sample();
+        final ControlledUpdateGraph updateGraph = ExecutionContext.getContext().getUpdateGraph().cast();
+        for (long step = 0; step <= 100_000; ++step) {
+            final long fstep = step;
+            if (fstep % 10000 == 0) {
+                System.out.println("Step = " + fstep);
+                System.gc();
+                RuntimeMemory.getInstance().read(sample);
+                System.out.println(sample);
+            }
+            updateGraph.runWithinUnitTestCycle(() -> {
+                final WritableRowSet removed;
+                if (fstep > 0) {
+                    removed = RowSetFactory.fromRange(fstep * 1000 - 100, fstep * 1000 + 899);
+                } else {
+                    removed = RowSetFactory.fromRange(0, 899);
+                }
+                removeRows(cells, removed);
+                final WritableRowSet added = RowSetFactory.fromRange((fstep + 1) * 1000, (fstep + 1) * 1000 + 999);
+                addToTable(cells, added);
+                cells.notifyListeners(added, removed, RowSetFactory.empty());
+            });
+            TestCase.assertEquals(1100, joined.size());
+
+            long currentBucket = (step + 1) * 1000 - 100;
+            try (final CloseablePrimitiveIteratorOfLong bucketIt = joined.longColumnIterator("Bucket");
+                    final CloseablePrimitiveIteratorOfLong leftIt = joined.longColumnIterator("SentinelL");
+                    final CloseablePrimitiveIteratorOfLong rightIt = joined.longColumnIterator("SentinelR")) {
+                while (bucketIt.hasNext()) {
+                    final long bucket = bucketIt.nextLong();
+                    final long lsentinel = leftIt.nextLong();
+                    final long rsentinel = rightIt.nextLong();
+                    TestCase.assertEquals(currentBucket++, bucket);
+                    TestCase.assertEquals(bucket + 1_000_000_000L, lsentinel);
+                    TestCase.assertEquals(bucket + 2_000_000_000L, rsentinel);
+                }
+            }
+        }
+        System.out.println("Done.");
+        System.gc();
+        RuntimeMemory.getInstance().read(sample);
+        System.out.println(sample);
+    }
+
     public void testGetDirectAfterNaturalJoin() {
         final Table sodiumLeft = emptyTable(3).updateView("Value=(i%5==0? null : i*2)", "ColLeft=`LeftOnlyContents`");
         final Table peppermintRight =
diff --git a/engine/table/src/test/java/io/deephaven/engine/table/impl/QueryTableSelectUpdateTest.java b/engine/table/src/test/java/io/deephaven/engine/table/impl/QueryTableSelectUpdateTest.java
index 35596b75d0e..10e1b015cf5 100644
--- a/engine/table/src/test/java/io/deephaven/engine/table/impl/QueryTableSelectUpdateTest.java
+++ b/engine/table/src/test/java/io/deephaven/engine/table/impl/QueryTableSelectUpdateTest.java
@@ -3,23 +3,23 @@
 //
 package io.deephaven.engine.table.impl;
 
-import io.deephaven.api.JoinMatch;
-import io.deephaven.api.TableOperations;
+import io.deephaven.api.*;
+import io.deephaven.api.filter.Filter;
+import io.deephaven.api.filter.FilterIn;
+import io.deephaven.api.literal.Literal;
 import io.deephaven.base.testing.BaseArrayTestCase;
+import io.deephaven.chunk.ObjectChunk;
+import io.deephaven.chunk.attributes.Values;
 import io.deephaven.configuration.Configuration;
 import io.deephaven.engine.context.ExecutionContext;
 import io.deephaven.engine.context.QueryScope;
+import io.deephaven.engine.exceptions.UncheckedTableException;
 import io.deephaven.engine.liveness.LivenessScope;
 import io.deephaven.engine.liveness.LivenessScopeStack;
-import io.deephaven.engine.rowset.RowSet;
-import io.deephaven.engine.rowset.RowSetBuilderSequential;
-import io.deephaven.engine.rowset.RowSetFactory;
-import io.deephaven.engine.rowset.WritableRowSet;
-import io.deephaven.engine.table.ColumnSource;
-import io.deephaven.engine.table.ShiftObliviousListener;
-import io.deephaven.engine.table.Table;
-import io.deephaven.engine.table.impl.select.DhFormulaColumn;
-import io.deephaven.engine.table.impl.select.FormulaCompilationException;
+import io.deephaven.engine.primitive.iterator.CloseableIterator;
+import io.deephaven.engine.rowset.*;
+import io.deephaven.engine.table.*;
+import io.deephaven.engine.table.impl.select.*;
 import io.deephaven.engine.table.impl.sources.InMemoryColumnSource;
 import io.deephaven.engine.table.impl.sources.LongSparseArraySource;
 import io.deephaven.engine.table.impl.sources.RedirectedColumnSource;
@@ -33,6 +33,7 @@
 import io.deephaven.engine.testutil.generator.SetGenerator;
 import io.deephaven.engine.testutil.junit4.EngineCleanup;
 import io.deephaven.engine.testutil.testcase.RefreshingTableTestCase;
+import io.deephaven.engine.util.PrintListener;
 import io.deephaven.engine.util.TableTools;
 import io.deephaven.util.SafeCloseable;
 import io.deephaven.util.mutable.MutableInt;
@@ -42,15 +43,19 @@
 import org.junit.Rule;
 import org.junit.Test;
 
+import java.text.DecimalFormat;
 import java.util.*;
 import java.util.concurrent.atomic.AtomicInteger;
 import java.util.function.Supplier;
+import java.util.stream.Collectors;
+import java.util.stream.IntStream;
 
 import static io.deephaven.engine.testutil.TstUtils.*;
 import static io.deephaven.engine.util.TableTools.*;
 import static io.deephaven.util.QueryConstants.NULL_INT;
 import static java.util.Collections.emptyList;
 import static org.junit.Assert.assertArrayEquals;
+import static org.junit.Assert.assertEquals;
 
 /**
  * Test QueryTable select and update operations.
@@ -1300,4 +1305,362 @@ public void testPropagationOfAttributes() {
             Assert.assertTrue(result.isBlink());
         }
     }
+
+    @Test
+    public void testFilterExpression() {
+        final Filter filter = FilterIn.of(ColumnName.of("A"), Literal.of(1), Literal.of(3));
+        final Table t = TableTools.newTable(intCol("A", 1, 1, 2, 3, 5, 8));
+        final Table wm = t.wouldMatch(new WouldMatchPair("AWM", filter));
+
+        // use an update
+        final Table up = t.update(List.of(Selectable.of(ColumnName.of("AWM"), filter)));
+        assertTableEquals(wm, up);
+
+        // use an updateView
+        final Table upv = t.updateView(List.of(Selectable.of(ColumnName.of("AWM"), filter)));
+        assertTableEquals(wm, upv);
+
+        // Test the getBoolean method
+        assertEquals(true, upv.getColumnSource("AWM").get(t.getRowSet().get(0)));
+        assertEquals(false, upv.getColumnSource("AWM").get(t.getRowSet().get(2)));
+
+        // and now a more generic WhereFilter
+
+        final Filter filter2 = WhereFilterFactory.getExpression("A == 1 || A==3");
+        final Table wm2 = t.wouldMatch(new WouldMatchPair("AWM", filter2));
+
+        // use an update
+        final Table up2 = t.update(List.of(Selectable.of(ColumnName.of("AWM"), filter2)));
+        assertTableEquals(wm2, up2);
+
+        // a Filter where nothing is true, to check that state
+        final Table upvf = t.updateView(List.of(Selectable.of(ColumnName.of("AWM"), Filter.ofFalse())));
+        assertTableEquals(t.updateView("AWM=false"), upvf);
+
+        // a Filter where everything is true
+        final Table upvt = t.updateView(List.of(Selectable.of(ColumnName.of("AWM"), Filter.ofTrue())));
+        assertTableEquals(t.updateView("AWM=true"), upvt);
+
+        // a Filter where the last value in the chunk is true
+        final Filter filter3 = WhereFilterFactory.getExpression("A in 8");
+        final Table wm3 = t.wouldMatch(new WouldMatchPair("AWM", filter3));
+        final Table upv3 = t.updateView(List.of(Selectable.of(ColumnName.of("AWM"), filter3)));
+        assertTableEquals(wm3, upv3);
+    }
+
+    @Test
+    public void testFilterExpressionGetPrev() {
+        final Filter filter = FilterIn.of(ColumnName.of("A"), Literal.of(2), Literal.of(4));
+        final QueryTable t = TstUtils.testRefreshingTable(i(2, 4, 6, 8).toTracking(), intCol("A", 1, 2, 3, 4));
+        // noinspection resource
+        final TrackingWritableRowSet rs = t.getRowSet().writableCast();
+
+        // use an updateView
+        final Table upv = t.updateView(List.of(Selectable.of(ColumnName.of("AWM"), filter)));
+
+        // Test the getBoolean method
+        ColumnSource<Object> resultColumn = upv.getColumnSource("AWM");
+        assertEquals(false, resultColumn.get(rs.get(0)));
+        assertEquals(true, resultColumn.get(rs.get(1)));
+        assertEquals(false, resultColumn.get(rs.get(2)));
+        assertEquals(true, resultColumn.get(rs.get(3)));
+
+        // and do it with chunks
+        try (final CloseableIterator<Object> awm = upv.columnIterator("AWM")) {
+            assertEquals(Arrays.asList(false, true, false, true), awm.stream().collect(Collectors.toList()));
+        }
+
+        final ControlledUpdateGraph updateGraph = ExecutionContext.getContext().getUpdateGraph().cast();
+
+        updateGraph.runWithinUnitTestCycle(() -> {
+            assertEquals(false, resultColumn.get(t.getRowSet().get(0)));
+            assertEquals(true, resultColumn.get(t.getRowSet().get(1)));
+            assertEquals(false, resultColumn.get(t.getRowSet().get(2)));
+            assertEquals(true, resultColumn.get(t.getRowSet().get(3)));
+
+            final RowSet prevRowset = rs.prev();
+            assertEquals(false, resultColumn.getPrev(prevRowset.get(0)));
+            assertEquals(true, resultColumn.getPrev(prevRowset.get(1)));
+            assertEquals(false, resultColumn.getPrev(prevRowset.get(2)));
+            assertEquals(true, resultColumn.getPrev(prevRowset.get(3)));
+
+            addToTable(t, i(1, 2, 9), intCol("A", 2, 2, 4));
+            removeRows(t, i(8));
+            rs.insert(i(1, 9));
+            rs.remove(8);
+            t.notifyListeners(i(1, 9), i(8), i());
+
+            // with a chunk
+            try (final ChunkSource.GetContext fc = resultColumn.makeGetContext(4)) {
+                final ObjectChunk<Boolean, ? extends Values> prevValues =
+                        resultColumn.getPrevChunk(fc, prevRowset).asObjectChunk();
+                assertEquals(false, prevValues.get(0));
+                assertEquals(true, prevValues.get(1));
+                assertEquals(false, prevValues.get(2));
+                assertEquals(true, prevValues.get(3));
+            }
+
+            assertEquals(false, resultColumn.getPrev(prevRowset.get(0)));
+            assertEquals(true, resultColumn.getPrev(prevRowset.get(1)));
+            assertEquals(false, resultColumn.getPrev(prevRowset.get(2)));
+            assertEquals(true, resultColumn.getPrev(prevRowset.get(3)));
+
+            assertEquals(true, resultColumn.get(rs.get(0)));
+            assertEquals(true, resultColumn.get(rs.get(1)));
+            assertEquals(true, resultColumn.get(rs.get(2)));
+            assertEquals(false, resultColumn.get(rs.get(3)));
+            assertEquals(true, resultColumn.get(rs.get(4)));
+        });
+    }
+
+    @Test
+    public void testFilterExpressionFillChunkPerformance() {
+        testFilterExpressionFillChunkPerformance(1.0);
+        testFilterExpressionFillChunkPerformance(.9999);
+        testFilterExpressionFillChunkPerformance(.999);
+        testFilterExpressionFillChunkPerformance(.8725);
+        testFilterExpressionFillChunkPerformance(.75);
+        testFilterExpressionFillChunkPerformance(.5);
+        testFilterExpressionFillChunkPerformance(.25);
+        testFilterExpressionFillChunkPerformance(.125);
+        testFilterExpressionFillChunkPerformance(0.001);
+        testFilterExpressionFillChunkPerformance(0.0001);
+    }
+
+    public void testFilterExpressionFillChunkPerformance(final double density) {
+        final int numIterations = 1;
+        final int size = 100_000;
+        final Filter filter = FilterIn.of(ColumnName.of("A"), Literal.of(1));
+
+        final Random random = new Random(20241120);
+        final List<Boolean> values = IntStream.range(0, size).mapToObj(ignored -> random.nextDouble() < density)
+                .collect(Collectors.toList());
+        QueryScope.addParam("values", values);
+        final Table t = TableTools.emptyTable(size).update("A=(Boolean)(values[i]) ? 1: 0");
+        QueryScope.addParam("values", null);
+
+        final Table upv = t.updateView(List.of(Selectable.of(ColumnName.of("AWM"), filter)));
+        final long startTime = System.nanoTime();
+        for (int iters = 0; iters < numIterations; ++iters) {
+            final long trueValues = upv.columnIterator("AWM").stream().filter(x -> (Boolean) x).count();
+            assertEquals(values.stream().filter(x -> x).count(), trueValues);
+        }
+        final long endTime = System.nanoTime();
+        final double duration = endTime - startTime;
+        System.out.println("Density: " + new DecimalFormat("0.0000").format(density) + ", Nanos: " + (long) duration
+                + ", per cell=" + new DecimalFormat("0.00").format(duration / (size * numIterations)));
+    }
+
+    @Test
+    public void testFilterExpressionArray() {
+        final Filter filter = WhereFilterFactory.getExpression("A=A_[i-1]");
+        final Filter filterArrayOnly = WhereFilterFactory.getExpression("A=A_.size() = 1");
+        final Filter filterKonly = WhereFilterFactory.getExpression("A=k+1");
+        final QueryTable setTable = TstUtils.testRefreshingTable(intCol("B"));
+        final Filter whereIn = new DynamicWhereFilter(setTable, true, MatchPairFactory.getExpression("A=B"));
+        final QueryTable table = TstUtils.testRefreshingTable(intCol("A", 1, 1, 2, 3, 5, 8, 9, 9));
+
+        final UncheckedTableException wme = Assert.assertThrows(UncheckedTableException.class,
+                () -> table.wouldMatch(new WouldMatchPair("AWM", filter)));
+        Assert.assertEquals("wouldMatch filters cannot use virtual row variables (i, ii, and k): [A=A_[i-1]]",
+                wme.getMessage());
+
+        final UncheckedTableException wme2 = Assert.assertThrows(UncheckedTableException.class,
+                () -> table.wouldMatch(new WouldMatchPair("AWM", filterArrayOnly)));
+        Assert.assertEquals("wouldMatch filters cannot use column Vectors (_ syntax): [A=A_.size() = 1]",
+                wme2.getMessage());
+
+        final UncheckedTableException upe = Assert.assertThrows(UncheckedTableException.class,
+                () -> table.update(List.of(Selectable.of(ColumnName.of("AWM"), filter))));
+        Assert.assertEquals(
+                "Cannot use a filter with column Vectors (_ syntax) in select, view, update, or updateView: A=A_[i-1]",
+                upe.getMessage());
+
+        final UncheckedTableException uve = Assert.assertThrows(UncheckedTableException.class,
+                () -> table.updateView(List.of(Selectable.of(ColumnName.of("AWM"), filter))));
+        Assert.assertEquals(
+                "Cannot use a filter with column Vectors (_ syntax) in select, view, update, or updateView: A=A_[i-1]",
+                uve.getMessage());
+
+        final UncheckedTableException se = Assert.assertThrows(UncheckedTableException.class,
+                () -> table.select(List.of(Selectable.of(ColumnName.of("AWM"), filterKonly))));
+        Assert.assertEquals(
+                "Cannot use a filter with virtual row variables (i, ii, or k) in select, view, update, or updateView: A=k+1",
+                se.getMessage());
+
+        final UncheckedTableException ve = Assert.assertThrows(UncheckedTableException.class,
+                () -> table.view(List.of(Selectable.of(ColumnName.of("AWM"), filterKonly))));
+        Assert.assertEquals(
+                "Cannot use a filter with virtual row variables (i, ii, or k) in select, view, update, or updateView: A=k+1",
+                ve.getMessage());
+
+        final UncheckedTableException dw = Assert.assertThrows(UncheckedTableException.class,
+                () -> table.view(List.of(Selectable.of(ColumnName.of("AWM"), whereIn))));
+        Assert.assertEquals(
+                "Cannot use a refreshing filter in select, view, update, or updateView: DynamicWhereFilter([A=B])",
+                dw.getMessage());
+
+    }
+
+    @Test
+    public void testFilterExpressionTicking() {
+        for (int seed = 0; seed < 5; ++seed) {
+            testFilterExpressionTicking(seed, new MutableInt(100));
+        }
+    }
+
+    private void testFilterExpressionTicking(final int seed, final MutableInt numSteps) {
+        final Random random = new Random(seed);
+        final ColumnInfo<?, ?>[] columnInfo;
+        final int size = 25;
+        final QueryTable queryTable = getTable(size, random,
+                columnInfo = initColumnInfos(new String[] {"Sym", "intCol", "doubleCol"},
+                        new SetGenerator<>("a", "b", "c", "d", "e"),
+                        new IntGenerator(10, 100),
+                        new SetGenerator<>(10.1, 20.1, 30.1)));
+
+        final EvalNuggetInterface[] en = new EvalNuggetInterface[] {
+                new TableComparator(queryTable.wouldMatch("SM=Sym in `b`, `d`"),
+                        queryTable.update(List.of(Selectable.of(ColumnName.of("SM"),
+                                WhereFilterFactory.getExpression("Sym in `b`, `d`"))))),
+                new TableComparator(queryTable.wouldMatch("SM=Sym in `b`, `d`"),
+                        queryTable.updateView(List.of(Selectable.of(ColumnName.of("SM"),
+                                WhereFilterFactory.getExpression("Sym in `b`, `d`"))))),
+                new TableComparator(queryTable.wouldMatch("IM=intCol < 50"),
+                        queryTable.update(List.of(
+                                Selectable.of(ColumnName.of("IM"), WhereFilterFactory.getExpression("intCol < 50"))))),
+                new TableComparator(queryTable.wouldMatch("IM=intCol < 50"),
+                        queryTable.updateView(List.of(
+                                Selectable.of(ColumnName.of("IM"), WhereFilterFactory.getExpression("intCol < 50"))))),
+                new TableComparator(queryTable.wouldMatch("IM=Sym= (intCol%2 == 0? `a` : `b`)"),
+                        queryTable.update(List.of(Selectable.of(ColumnName.of("IM"),
+                                WhereFilterFactory.getExpression("Sym= (intCol%2 == 0? `a` : `b`)"))))),
+                new TableComparator(queryTable.wouldMatch("IM=Sym= (intCol%2 == 0? `a` : `b`)"),
+                        queryTable.updateView(List.of(Selectable.of(ColumnName.of("IM"),
+                                WhereFilterFactory.getExpression("Sym= (intCol%2 == 0? `a` : `b`)"))))),
+        };
+
+        final int maxSteps = numSteps.get();
+        for (numSteps.set(0); numSteps.get() < maxSteps; numSteps.increment()) {
+            if (RefreshingTableTestCase.printTableUpdates) {
+                System.out.println("Step = " + numSteps.get());
+            }
+            RefreshingTableTestCase.simulateShiftAwareStep(size, random, queryTable, columnInfo, en);
+        }
+    }
+
+    @Test
+    public void testAlwaysUpdate() {
+        final MutableInt count = new MutableInt(0);
+        final MutableInt count2 = new MutableInt(0);
+        QueryScope.addParam("__COUNT1", count);
+        QueryScope.addParam("__COUNT2", count2);
+        final QueryTable base = testRefreshingTable(intCol("Sentinel", 1, 2, 3, 4, 5, 6, 7, 8, 9),
+                stringCol("Thing", "A", "B", "C", "D", "E", "F", "G", "H", "I"));
+
+        final SelectColumn sc1 = SelectColumnFactory.getExpression("NormalCount=__COUNT1.getAndIncrement()");
+        final SelectColumn sc2 =
+                SelectColumnFactory.getExpression("AlwaysCount=__COUNT2.getAndIncrement()")
+                        .withRecomputeOnModifiedRow();
+
+        final Table withUpdates = base.update(Arrays.asList(sc1, sc2));
+
+        final ControlledUpdateGraph updateGraph = ExecutionContext.getContext().getUpdateGraph().cast();
+
+        assertArrayEquals(new int[] {0, 1, 2, 3, 4, 5, 6, 7, 8},
+                ColumnVectors.ofInt(withUpdates, "NormalCount").toArray());
+        assertArrayEquals(new int[] {0, 1, 2, 3, 4, 5, 6, 7, 8},
+                ColumnVectors.ofInt(withUpdates, "AlwaysCount").toArray());
+
+        updateGraph.runWithinUnitTestCycle(() -> {
+            addToTable(base, i(9), intCol("Sentinel", 10), stringCol("Thing", "J"));
+            base.notifyListeners(i(9), i(), i());
+        });
+
+        assertArrayEquals(new int[] {0, 1, 2, 3, 4, 5, 6, 7, 8, 9},
+                ColumnVectors.ofInt(withUpdates, "NormalCount").toArray());
+        assertArrayEquals(new int[] {0, 1, 2, 3, 4, 5, 6, 7, 8, 9},
+                ColumnVectors.ofInt(withUpdates, "AlwaysCount").toArray());
+
+        updateGraph.runWithinUnitTestCycle(() -> {
+            addToTable(base, i(0, 2, 4), intCol("Sentinel", 1, 3, 5), stringCol("Thing", "a", "c", "e"));
+            base.notifyListeners(i(), i(), i(0, 2, 4));
+        });
+
+        assertArrayEquals(new int[] {0, 1, 2, 3, 4, 5, 6, 7, 8, 9},
+                ColumnVectors.ofInt(withUpdates, "NormalCount").toArray());
+        assertArrayEquals(new int[] {10, 1, 11, 3, 12, 5, 6, 7, 8, 9},
+                ColumnVectors.ofInt(withUpdates, "AlwaysCount").toArray());
+
+        updateGraph.runWithinUnitTestCycle(() -> {
+            removeRows(base, i(5));
+            base.notifyListeners(i(), i(5), i());
+        });
+
+        assertArrayEquals(new int[] {0, 1, 2, 3, 4, 6, 7, 8, 9},
+                ColumnVectors.ofInt(withUpdates, "NormalCount").toArray());
+        assertArrayEquals(new int[] {10, 1, 11, 3, 12, 6, 7, 8, 9},
+                ColumnVectors.ofInt(withUpdates, "AlwaysCount").toArray());
+    }
+
+    @Test
+    public void testAlwaysUpdateMCS() {
+        final AtomicInteger a = new AtomicInteger(100);
+        QueryScope.addParam("a", a);
+        final AtomicInteger b = new AtomicInteger(200);
+        QueryScope.addParam("b", b);
+        final QueryTable base = testRefreshingTable(RowSetFactory.fromKeys(10, 11).toTracking(),
+                intCol("Sentinel", 1, 2), intCol("B", 10, 11));
+
+        final SelectColumn x =
+                SelectColumnFactory.getExpression("X = a.getAndIncrement()").withRecomputeOnModifiedRow();
+
+        final Table withUpdates = base.update(Arrays.asList(x, SelectColumnFactory.getExpression("Y=1"),
+                SelectColumnFactory.getExpression("Z=B+b.getAndIncrement()")));
+
+        final PrintListener pl = new PrintListener("withUpdates", withUpdates, 10);
+
+        final SimpleListener simpleListener = new SimpleListener(withUpdates);
+        withUpdates.addUpdateListener(simpleListener);
+
+        assertTableEquals(TableTools.newTable(intCol("Sentinel", 1, 2), intCol("B", 10, 11), intCol("X", 100, 101),
+                intCol("Y", 1, 1), intCol("Z", 210, 212)), withUpdates);
+
+        final ControlledUpdateGraph updateGraph = ExecutionContext.getContext().getUpdateGraph().cast();
+
+        updateGraph.runWithinUnitTestCycle(() -> {
+            addToTable(base, i(10), intCol("Sentinel", 3), intCol("B", 10));
+            base.notifyListeners(
+                    new TableUpdateImpl(i(), i(), i(10), RowSetShiftData.EMPTY, base.newModifiedColumnSet("Sentinel")));
+        });
+
+        assertTableEquals(TableTools.newTable(intCol("Sentinel", 3, 2), intCol("B", 10, 11), intCol("X", 102, 101),
+                intCol("Y", 1, 1), intCol("Z", 210, 212)), withUpdates);
+
+        assertEquals(1, simpleListener.count);
+        assertEquals(i(), simpleListener.update.added());
+        assertEquals(i(), simpleListener.update.removed());
+        assertEquals(i(10), simpleListener.update.modified());
+        assertEquals(((QueryTable) withUpdates).newModifiedColumnSet("Sentinel", "X"),
+                simpleListener.update.modifiedColumnSet());
+
+        updateGraph.runWithinUnitTestCycle(() -> {
+            addToTable(base, i(11), intCol("Sentinel", 4), intCol("B", 12));
+            base.notifyListeners(new TableUpdateImpl(i(), i(), i(11), RowSetShiftData.EMPTY,
+                    base.newModifiedColumnSet("Sentinel", "B")));
+        });
+
+        assertTableEquals(TableTools.newTable(intCol("Sentinel", 3, 4), intCol("B", 10, 12), intCol("X", 102, 103),
+                intCol("Y", 1, 1), intCol("Z", 210, 214)), withUpdates);
+
+        assertEquals(2, simpleListener.count);
+        assertEquals(i(), simpleListener.update.added());
+        assertEquals(i(), simpleListener.update.removed());
+        assertEquals(i(11), simpleListener.update.modified());
+        assertEquals(((QueryTable) withUpdates).newModifiedColumnSet("Sentinel", "B", "X", "Z"),
+                simpleListener.update.modifiedColumnSet());
+
+        QueryScope.addParam("a", null);
+        QueryScope.addParam("b", null);
+    }
 }
diff --git a/engine/table/src/test/java/io/deephaven/engine/table/impl/QueryTableStaticNaturalJoinRandomTest.java b/engine/table/src/test/java/io/deephaven/engine/table/impl/QueryTableStaticNaturalJoinRandomTest.java
index f1b53b28416..55b4c5e6fe4 100644
--- a/engine/table/src/test/java/io/deephaven/engine/table/impl/QueryTableStaticNaturalJoinRandomTest.java
+++ b/engine/table/src/test/java/io/deephaven/engine/table/impl/QueryTableStaticNaturalJoinRandomTest.java
@@ -4,7 +4,6 @@
 package io.deephaven.engine.table.impl;
 
 import io.deephaven.api.TableOperationsDefaults;
-import io.deephaven.datastructures.util.CollectionUtil;
 import io.deephaven.engine.rowset.RowSet;
 import io.deephaven.engine.testutil.ColumnInfo;
 import io.deephaven.engine.testutil.QueryTableTestBase;
@@ -64,7 +63,7 @@ private static void testNaturalJoinRandomStatic(int seed, int leftSize, int righ
             }
 
             final List<TestDataGenerator<String, String>> generatorList = Arrays.asList(uniqueStringGenerator,
-                    new SetGenerator<>(duplicateRights.toArray(CollectionUtil.ZERO_LENGTH_STRING_ARRAY)));
+                    new SetGenerator<>(duplicateRights.toArray(String[]::new)));
             rightGenerator = new CompositeGenerator<>(generatorList, 0.9);
             leftGenerator = new FromUniqueStringGenerator(uniqueStringGenerator, 0.5);
         } else if (dataType == ArrayTuple.class) {
diff --git a/engine/table/src/test/java/io/deephaven/engine/table/impl/QueryTableTest.java b/engine/table/src/test/java/io/deephaven/engine/table/impl/QueryTableTest.java
index 934b5c54c23..5aa0832ebd1 100644
--- a/engine/table/src/test/java/io/deephaven/engine/table/impl/QueryTableTest.java
+++ b/engine/table/src/test/java/io/deephaven/engine/table/impl/QueryTableTest.java
@@ -12,7 +12,8 @@
 import io.deephaven.base.Pair;
 import io.deephaven.base.log.LogOutput;
 import io.deephaven.base.verify.AssertionFailure;
-import io.deephaven.datastructures.util.CollectionUtil;
+import io.deephaven.chunk.Chunk;
+import io.deephaven.chunk.attributes.Values;
 import io.deephaven.engine.context.ExecutionContext;
 import io.deephaven.engine.context.QueryScope;
 import io.deephaven.engine.exceptions.UpdateGraphConflictException;
@@ -22,7 +23,6 @@
 import io.deephaven.engine.table.*;
 import io.deephaven.engine.table.impl.indexer.DataIndexer;
 import io.deephaven.engine.table.impl.remote.ConstructSnapshot;
-import io.deephaven.engine.table.impl.remote.InitialSnapshotTable;
 import io.deephaven.engine.table.impl.select.*;
 import io.deephaven.engine.table.impl.select.MatchFilter.CaseSensitivity;
 import io.deephaven.engine.table.impl.select.MatchFilter.MatchType;
@@ -46,6 +46,7 @@
 import io.deephaven.util.QueryConstants;
 import io.deephaven.util.SafeCloseable;
 import io.deephaven.util.locks.AwareFunctionalLock;
+import io.deephaven.util.type.ArrayTypeUtils;
 import io.deephaven.vector.*;
 import junit.framework.TestCase;
 import org.apache.commons.lang3.mutable.MutableObject;
@@ -68,6 +69,7 @@
 import java.util.stream.LongStream;
 
 import static io.deephaven.api.agg.Aggregation.*;
+import static io.deephaven.engine.table.impl.SnapshotTestUtils.verifySnapshotBarrageMessage;
 import static io.deephaven.engine.testutil.TstUtils.*;
 import static io.deephaven.engine.util.TableTools.*;
 import static org.junit.Assert.assertArrayEquals;
@@ -75,7 +77,7 @@
 /**
  * Test of QueryTable functionality.
  * <p>
- * This test used to be a catch all, but at over 7,000 lines became unwieldy. It is still somewhat of a catch-all, but
+ * This test used to be a catch-all, but at over 7,000 lines became unwieldy. It is still somewhat of a catch-all, but
  * some specific classes of tests have been broken out.
  * <p>
  * See also {@link QueryTableAggregationTest}, {@link QueryTableJoinTest}, {@link QueryTableSelectUpdateTest},
@@ -436,11 +438,11 @@ public void testView1() {
 
         Table table = newTable(3, Arrays.asList("String", "Int"),
                 Arrays.asList(TableTools.objColSource("c", "e", "g"), TableTools.colSource(2, 4, 6)));
-        assertEquals(2, table.view(CollectionUtil.ZERO_LENGTH_STRING_ARRAY).numColumns());
+        assertEquals(2, table.view(ArrayTypeUtils.EMPTY_STRING_ARRAY).numColumns());
         assertEquals(table.getDefinition().getColumns().get(0).getName(),
-                table.view(CollectionUtil.ZERO_LENGTH_STRING_ARRAY).getDefinition().getColumns().get(0).getName());
+                table.view(ArrayTypeUtils.EMPTY_STRING_ARRAY).getDefinition().getColumns().get(0).getName());
         assertEquals(table.getDefinition().getColumns().get(1).getName(),
-                table.view(CollectionUtil.ZERO_LENGTH_STRING_ARRAY).getDefinition().getColumns().get(1).getName());
+                table.view(ArrayTypeUtils.EMPTY_STRING_ARRAY).getDefinition().getColumns().get(1).getName());
 
         assertEquals(2, table.view("String", "Int").numColumns());
         assertEquals(table.getDefinition().getColumns().get(0).getName(),
@@ -594,22 +596,22 @@ public void testRenameColumns() {
         final Table table = newTable(3,
                 Arrays.asList("String", "Int", "Double"),
                 Arrays.asList(TableTools.objColSource("c", "e", "g"), colSource(2, 4, 6), colSource(1.0, 2.0, 3.0)));
-        assertEquals(3, table.renameColumns(CollectionUtil.ZERO_LENGTH_STRING_ARRAY).getColumnSources().size());
+        assertEquals(3, table.renameColumns(ArrayTypeUtils.EMPTY_STRING_ARRAY).getColumnSources().size());
         final Collection<? extends ColumnSource<?>> columnSources = table.getColumnSources();
         final ColumnSource<?>[] columns = columnSources.toArray(ColumnSource.ZERO_LENGTH_COLUMN_SOURCE_ARRAY);
         final Collection<? extends ColumnSource<?>> renamedColumnSources =
-                table.renameColumns(CollectionUtil.ZERO_LENGTH_STRING_ARRAY).getColumnSources();
+                table.renameColumns(ArrayTypeUtils.EMPTY_STRING_ARRAY).getColumnSources();
         final ColumnSource<?>[] renamedColumns =
                 renamedColumnSources.toArray(ColumnSource.ZERO_LENGTH_COLUMN_SOURCE_ARRAY);
         assertSame(columns[0], renamedColumns[0]);
         assertSame(columns[1], renamedColumns[1]);
         assertSame(columns[2], renamedColumns[2]);
         assertSame(table.getColumnSource("String"),
-                table.renameColumns(CollectionUtil.ZERO_LENGTH_STRING_ARRAY).getColumnSource("String"));
+                table.renameColumns(ArrayTypeUtils.EMPTY_STRING_ARRAY).getColumnSource("String"));
         assertSame(table.getColumnSource("Int"),
-                table.renameColumns(CollectionUtil.ZERO_LENGTH_STRING_ARRAY).getColumnSource("Int"));
+                table.renameColumns(ArrayTypeUtils.EMPTY_STRING_ARRAY).getColumnSource("Int"));
         assertSame(table.getColumnSource("Double"),
-                table.renameColumns(CollectionUtil.ZERO_LENGTH_STRING_ARRAY).getColumnSource("Double"));
+                table.renameColumns(ArrayTypeUtils.EMPTY_STRING_ARRAY).getColumnSource("Double"));
 
         assertEquals(3, table.renameColumns("NewInt=Int").numColumns());
         assertEquals(table.getColumnSources().toArray()[0],
@@ -2631,7 +2633,7 @@ public void testInstantColumns() {
     public void testUngroupingAgnostic() {
         int[][] data1 = new int[][] {new int[] {4, 5, 6}, new int[0], new int[] {7, 8}};
         Table table = testRefreshingTable(col("X", 1, 2, 3),
-                col("Y", new String[] {"a", "b", "c"}, CollectionUtil.ZERO_LENGTH_STRING_ARRAY,
+                col("Y", new String[] {"a", "b", "c"}, ArrayTypeUtils.EMPTY_STRING_ARRAY,
                         new String[] {"d", "e"}),
                 col("Z", data1));
 
@@ -2654,7 +2656,7 @@ public void testUngroupingAgnostic() {
         int[][] data = new int[][] {new int[] {4, 5, 6}, new int[0], new int[] {7, 8}};
         table = testRefreshingTable(col("X", 1, 2, 3),
                 col("Y", new String[] {"a", "b", "c"}, new String[] {"d", "e"},
-                        CollectionUtil.ZERO_LENGTH_STRING_ARRAY),
+                        ArrayTypeUtils.EMPTY_STRING_ARRAY),
                 col("Z", data));
         try {
             table.ungroup();
@@ -2703,18 +2705,114 @@ public void testUngroupingAgnostic() {
                 ColumnVectors.ofObject(t1, "Y", String.class).toArray());
     }
 
+    public void testEmptyTableSnapshot() {
+        final Table emptyTableNoColumns = emptyTable(0);
+        final Table emptyTableWithSingleColumn = emptyTable(0).update("X = i");
+        final Table emptyTableWithMultipleColumns = emptyTable(0).update("X = i", "Y = 2*i", "Z = 3*i");
+        try (final BarrageMessage snap =
+                ConstructSnapshot.constructBackplaneSnapshot(this, (BaseTable<?>) emptyTableNoColumns)) {
+            assertTrue(snap.rowsIncluded.isEmpty());
+            assertTrue(snap.addColumnData.length == 0);
+            assertTrue(snap.modColumnData.length == 0);
+        }
+
+        try (final BarrageMessage snap =
+                ConstructSnapshot.constructBackplaneSnapshot(this, (BaseTable<?>) emptyTableWithSingleColumn)) {
+            assertTrue(snap.rowsIncluded.isEmpty());
+            assertTrue(snap.addColumnData.length == 1);
+            assertTrue(snap.modColumnData.length == 1);
+            assertTrue(snap.addColumnData[0].data.isEmpty());
+            assertTrue(snap.modColumnData[0].data.isEmpty());
+        }
+
+        try (final BarrageMessage snap =
+                ConstructSnapshot.constructBackplaneSnapshot(this, (BaseTable<?>) emptyTableWithMultipleColumns)) {
+            assertTrue(snap.rowsIncluded.isEmpty());
+            assertTrue(snap.addColumnData.length == 3);
+            assertTrue(snap.modColumnData.length == 3);
+            assertTrue(snap.addColumnData[0].data.isEmpty());
+            assertTrue(snap.addColumnData[1].data.isEmpty());
+            assertTrue(snap.addColumnData[2].data.isEmpty());
+            assertTrue(snap.modColumnData[0].data.isEmpty());
+            assertTrue(snap.modColumnData[1].data.isEmpty());
+            assertTrue(snap.modColumnData[2].data.isEmpty());
+        }
+    }
+
     public void testUngroupConstructSnapshotOfBoxedNull() {
         final Table t =
                 testRefreshingTable(i(0).toTracking())
                         .update("X = new Integer[]{null, 2, 3}", "Z = new Integer[]{4, 5, null}");
         final Table ungrouped = t.ungroup();
+        try (final BarrageMessage snap =
+                ConstructSnapshot.constructBackplaneSnapshot(this, (BaseTable<?>) ungrouped)) {
+            testUngroupConstructSnapshotBoxedNullAllColumnHelper(snap);
+        }
+
+        // Snapshot the second column for last two rows
+        final BitSet columnsToSnapshot = new BitSet(2);
+        columnsToSnapshot.set(1);
+        final RowSequence rowsToSnapshot = RowSequenceFactory.forRange(1, 2);
+        try (final BarrageMessage snap =
+                ConstructSnapshot.constructBackplaneSnapshotInPositionSpace(this, (BaseTable<?>) ungrouped,
+                        columnsToSnapshot, rowsToSnapshot, null)) {
+            testUngroupConstructSnapshotBoxedNullFewColumnsHelper(snap);
+        }
 
-        try (final BarrageMessage snap = ConstructSnapshot.constructBackplaneSnapshot(this, (BaseTable<?>) ungrouped)) {
-            assertEquals(snap.rowsAdded, i(0, 1, 2));
-            assertEquals(snap.addColumnData[0].data.get(0).asIntChunk().get(0),
-                    io.deephaven.util.QueryConstants.NULL_INT);
-            assertEquals(snap.addColumnData[1].data.get(0).asIntChunk().get(2),
-                    io.deephaven.util.QueryConstants.NULL_INT);
+        final Table selected = ungrouped.select(); // Will convert column sources to in memory
+        try (final BarrageMessage snap =
+                ConstructSnapshot.constructBackplaneSnapshot(this, (BaseTable<?>) selected)) {
+            testUngroupConstructSnapshotBoxedNullAllColumnHelper(snap);
+        }
+
+        try (final BarrageMessage snap =
+                ConstructSnapshot.constructBackplaneSnapshotInPositionSpace(this, (BaseTable<?>) selected,
+                        columnsToSnapshot, RowSequenceFactory.forRange(1, 2), null)) {
+            testUngroupConstructSnapshotBoxedNullFewColumnsHelper(snap);
+        }
+    }
+
+    private static void testUngroupConstructSnapshotBoxedNullAllColumnHelper(@NotNull final BarrageMessage snap) {
+        assertEquals(snap.rowsAdded, i(0, 1, 2));
+        final List<Chunk<Values>> firstColChunk = snap.addColumnData[0].data;
+        final int[] firstColExpected = new int[] {QueryConstants.NULL_INT, 2, 3};
+        final List<Chunk<Values>> secondColChunk = snap.addColumnData[1].data;
+        final int[] secondColExpected = new int[] {4, 5, QueryConstants.NULL_INT};
+        for (int i = 0; i < 3; i++) {
+            assertEquals(firstColChunk.get(0).asIntChunk().get(i), firstColExpected[i]);
+            assertEquals(secondColChunk.get(0).asIntChunk().get(i), secondColExpected[i]);
+        }
+    }
+
+    private static void testUngroupConstructSnapshotBoxedNullFewColumnsHelper(@NotNull final BarrageMessage snap) {
+        assertEquals(snap.rowsIncluded, i(1, 2));
+        assertEquals(snap.addColumnData[1].data.get(0).asIntChunk().get(0), 5);
+        assertEquals(snap.addColumnData[1].data.get(0).asIntChunk().get(1), QueryConstants.NULL_INT);
+    }
+
+
+    public void testUngroupConstructSnapshotSingleColumnTable() {
+        final Table t =
+                testRefreshingTable(i(0).toTracking())
+                        .update("X = new Integer[]{null, 2, 3}");
+        final Table ungrouped = t.ungroup();
+        try (final BarrageMessage snap =
+                ConstructSnapshot.constructBackplaneSnapshot(this, (BaseTable<?>) ungrouped)) {
+            testUngroupConstructSnapshotSingleColumnHelper(snap);
+        }
+
+        final Table selected = ungrouped.select(); // Will convert column sources to in memory
+        try (final BarrageMessage snap = ConstructSnapshot.constructBackplaneSnapshot(this, (BaseTable<?>) selected)) {
+            testUngroupConstructSnapshotSingleColumnHelper(snap);
+        }
+    }
+
+    private static void testUngroupConstructSnapshotSingleColumnHelper(@NotNull final BarrageMessage snap) {
+        assertEquals(snap.rowsAdded, i(0, 1, 2));
+        final List<Chunk<Values>> firstColChunk = snap.addColumnData[0].data;
+        final int[] firstColExpected = new int[] {QueryConstants.NULL_INT, 2, 3};
+        for (int i = 0; i < 3; i++) {
+            assertEquals(firstColChunk.get(0).asIntChunk().get(i), firstColExpected[i]);
         }
     }
 
@@ -2881,7 +2979,7 @@ private void testUngroupIncremental(int tableSize, boolean nullFill) throws Pars
                         new DateGenerator(format.parse("2011-02-02"), format.parse("2011-02-03")),
                         new SetGenerator<>("a", "b"),
                         new SetGenerator<>(10, 20, 30),
-                        new SetGenerator<>(CollectionUtil.ZERO_LENGTH_STRING_ARRAY, new String[] {"a", "b"},
+                        new SetGenerator<>(ArrayTypeUtils.EMPTY_STRING_ARRAY, new String[] {"a", "b"},
                                 new String[] {"a", "b", "c"})));
 
         final EvalNuggetInterface[] en = new EvalNuggetInterface[] {
@@ -3082,10 +3180,10 @@ public void testUngroupJoined_IDS6311() {
         assertNull(ungrouped.getColumnSource("CCol").getPrev(firstKey));
         assertEquals('b', ungrouped.getColumnSource("CCol").getPrev(secondKey));
 
-        // This tests the NPE condition in the ungrouped column sources
-        final Table snappy = InitialSnapshotTable.setupInitialSnapshotTable(ungrouped,
-                ConstructSnapshot.constructInitialSnapshot(this, (QueryTable) ungrouped));
-        assertTableEquals(expected, snappy);
+        try (final BarrageMessage snap =
+                ConstructSnapshot.constructBackplaneSnapshot(this, (BaseTable<?>) ungrouped)) {
+            verifySnapshotBarrageMessage(snap, expected);
+        }
     }
 
     private void testMemoize(QueryTable source, UnaryOperator<Table> op) {
@@ -3182,6 +3280,11 @@ public void testMemoize() {
             testNoMemoize(source, t -> t.where("Sym in `aa`, `bb`"), t -> t.where("Sym in `aa`, `cc`"));
             testNoMemoize(source, t -> t.where("Sym.startsWith(`a`)"));
 
+            testMemoize(source, t -> t.wouldMatch("A=intCol == 7"), t -> t.wouldMatch("A=intCol == 7"));
+            testNoMemoize(source, t -> t.wouldMatch("A=intCol == 7"), t -> t.wouldMatch("A=intCol == 6"));
+            testNoMemoize(source, t -> t.wouldMatch("A=intCol == 7"), t -> t.wouldMatch("B=intCol == 7"));
+            testNoMemoize(source, t -> t.wouldMatch("A=intCol < 7"), t -> t.wouldMatch("A=intCol < 7"));
+
             testMemoize(source, t -> t.countBy("Count", "Sym"));
             testMemoize(source, t -> t.countBy("Sym"));
             testMemoize(source, t -> t.sumBy("Sym"));
@@ -3750,6 +3853,79 @@ public void testMultipleUpdateGraphs() {
         assertEquals(g2, g2.sharedLock().computeLocked(() -> merge(s1, s2, r2).getUpdateGraph()));
     }
 
+    public void testColumnSourceCast() {
+        // Create a test table with a String column and an array column
+        final Table testTable = TableTools.newTable(
+                TableTools.stringCol("MyTestStrCol", "A", "B", "C"),
+                TableTools.col("MyTestArrCol", new String[] {"A0", "A1"}, new String[] {"B0", "B1"},
+                        new String[] {"C0", "C1"}));
+
+        /* Test getting column sources with checked types */
+
+        // Test getColumnSource for MyTestStrCol
+        ColumnSource<CharSequence> stringColSource = testTable.getColumnSource("MyTestStrCol", CharSequence.class);
+        assertNotNull(stringColSource);
+        assertEquals(String.class, stringColSource.getType()); // actual type is still String
+
+        // Test getColumnSource for MyTestStrCol with wrong type and verify exception message
+        ClassCastException colTypeException = Assert.assertThrows(ClassCastException.class, () -> {
+            ColumnSource<Integer> intColSource = testTable.getColumnSource("MyTestStrCol", Integer.class);
+        });
+        assertEquals("Cannot convert ColumnSource[MyTestStrCol] of type java.lang.String to type java.lang.Integer",
+                colTypeException.getMessage());
+
+        // Test getColumnSource for MyTestArrCol
+        ColumnSource<CharSequence[]> arrColSource =
+                testTable.getColumnSource("MyTestArrCol", CharSequence[].class, CharSequence.class);
+        assertNotNull(arrColSource);
+        assertEquals(String[].class, arrColSource.getType());
+        assertEquals(String.class, arrColSource.getComponentType());
+
+        // Test getColumnSource for MyTestArrCol with a wrong component type and verify exception message
+        ClassCastException wrongComponentException = Assert.assertThrows(ClassCastException.class, () -> {
+            ColumnSource<CharSequence[]> wrongComponentTypeSource =
+                    testTable.getColumnSource("MyTestArrCol", CharSequence[].class, Integer.class);
+        });
+        assertEquals(
+                "Cannot convert ColumnSource[MyTestArrCol] componentType of type java.lang.String to java.lang.Integer (for [Ljava.lang.String; / [Ljava.lang.CharSequence;)",
+                wrongComponentException.getMessage());
+
+
+        /* Verify exception messages of underlying ColumnSource.cast method, with and without column name specified */
+
+        ColumnSource<?> rawStrColSource = testTable.getColumnSource("MyTestStrCol");
+        // cast() without component type, with column name specified
+        ClassCastException castExceptionNoCompWithColName = Assert.assertThrows(ClassCastException.class, () -> {
+            rawStrColSource.cast(Boolean.class, "MyTestStrCol");
+        });
+        assertEquals("Cannot convert ColumnSource[MyTestStrCol] of type java.lang.String to type java.lang.Boolean",
+                castExceptionNoCompWithColName.getMessage());
+
+        // cast() without component type and no column name specified
+        ClassCastException castExceptionNoCompNoColName = Assert.assertThrows(ClassCastException.class, () -> {
+            rawStrColSource.cast(Boolean.class);
+        });
+        assertEquals("Cannot convert ColumnSource of type java.lang.String to type java.lang.Boolean",
+                castExceptionNoCompNoColName.getMessage());
+
+        ColumnSource<Object> rawArrColSource = testTable.getColumnSource("MyTestArrCol");
+        // cast() with component type and column name specified
+        ClassCastException castExceptionWithCompAndColName = Assert.assertThrows(ClassCastException.class, () -> {
+            rawArrColSource.cast(Object[].class, Integer.class, "MyTestArrCol");
+        });
+        assertEquals(
+                "Cannot convert ColumnSource[MyTestArrCol] componentType of type java.lang.String to java.lang.Integer (for [Ljava.lang.String; / [Ljava.lang.Object;)",
+                castExceptionWithCompAndColName.getMessage());
+
+        // cast() with component type and no column name specified
+        ClassCastException castExceptionWithCompNoColName = Assert.assertThrows(ClassCastException.class, () -> {
+            rawArrColSource.cast(Object[].class, Integer.class);
+        });
+        assertEquals(
+                "Cannot convert ColumnSource componentType of type java.lang.String to java.lang.Integer (for [Ljava.lang.String; / [Ljava.lang.Object;)",
+                castExceptionWithCompNoColName.getMessage());
+    }
+
     private static final class DummyUpdateGraph implements UpdateGraph {
 
         private final String name;
diff --git a/engine/table/src/test/java/io/deephaven/engine/table/impl/QueryTableTreeTest.java b/engine/table/src/test/java/io/deephaven/engine/table/impl/QueryTableTreeTest.java
deleted file mode 100644
index 2d01eed214d..00000000000
--- a/engine/table/src/test/java/io/deephaven/engine/table/impl/QueryTableTreeTest.java
+++ /dev/null
@@ -1,2057 +0,0 @@
-//
-// Copyright (c) 2016-2024 Deephaven Data Labs and Patent Pending
-//
-package io.deephaven.engine.table.impl;
-
-import io.deephaven.engine.testutil.QueryTableTestBase;
-import io.deephaven.test.types.OutOfBandTest;
-
-import org.junit.experimental.categories.Category;
-
-/**
- * Test of Tree Tables and rollups.
- */
-@Category(OutOfBandTest.class)
-public class QueryTableTreeTest extends QueryTableTestBase {
-
-    public void testNothing() {}
-    //
-    // private final ExecutorService pool = Executors.newFixedThreadPool(1);
-    //
-    // public void testMemoize() {
-    // final Random random = new Random(0);
-    // final ParentChildGenerator parentChildGenerator = new ParentChildGenerator(0.25, 0);
-    // final QueryTable table = getTable(1000, random,
-    // initColumnInfos(new String[] {"IDPair", "Sentinel", "Sentinel2", "Sym"},
-    // parentChildGenerator,
-    // new IntGenerator(0, 1_000_000_000),
-    // new IntGenerator(0, 1_000_000_000),
-    // new SetGenerator<>("AAPL", "TSLA", "VXX", "SPY")));
-    //
-    // final Table prepared = table.update("ID=IDPair.getId()", "Parent=IDPair.getParent()").dropColumns("IDPair");
-    // final Table tree = prepared.tree("ID", "Parent");
-    //
-    // final boolean old = QueryTable.setMemoizeResults(true);
-    // try {
-    // testMemoize(tree, t -> TreeTableFilter.rawFilterTree(t, "Sym in `AAPL`, `TSLA`"));
-    // testMemoize(tree, t -> TreeTableFilter.rawFilterTree(t, "Sym in `AAPL`, `TSLA`", "Sentinel == 500000000"));
-    // testNoMemoize(tree, t -> TreeTableFilter.rawFilterTree(t, "Sentinel > Sentinel2/4"));
-    // testNoMemoize(tree, t -> TreeTableFilter.rawFilterTree(t, "Sym in `AAPL`, `TSLA`"),
-    // t -> TreeTableFilter.rawFilterTree(t, "Sym in `AAPL`"));
-    // } finally {
-    // QueryTable.setMemoizeResults(old);
-    // }
-    // }
-    //
-    // private void testMemoize(Table source, UnaryOperator<Table> op) {
-    // final Table result = op.apply(source);
-    // final Table result2 = op.apply(source);
-    // Assert.assertSame(result, result2);
-    // }
-    //
-    // private void testNoMemoize(Table source, UnaryOperator<Table> op1, UnaryOperator<Table> op2) {
-    // final Table result = op1.apply(source);
-    // final Table result2 = op2.apply(source);
-    // Assert.assertNotSame(result, result2);
-    // }
-    //
-    // private void testNoMemoize(Table source, UnaryOperator<Table> op) {
-    // final Table result = op.apply(source);
-    // final Table result2 = op.apply(source);
-    // Assert.assertNotSame(result, result2);
-    // }
-    //
-    // public void testTreeTableSimple() {
-    // final Table source = TableTools.newTable(col("Sentinel", 1, 2, 3, 4, 5, 6, 7, 8, 9, 10),
-    // col("Parent", NULL_INT, NULL_INT, 1, 1, 2, 3, 5, 5, 3, 2));
-    //
-    // final Table treed =
-    // ExecutionContext.getContext().getUpdateGraph().exclusiveLock().computeLocked(() -> source.tree("Sentinel",
-    // "Parent"));
-    // final String hierarchicalColumnName = getHierarchicalColumnName(treed);
-    // TableTools.showWithRowSet(treed);
-    //
-    // assertEquals(2, treed.size());
-    //
-    // assertTrue(Arrays.equals(new int[] {NULL_INT, NULL_INT}, (int[]) treed.getColumn("Parent").getDirect()));
-    //
-    // final Table child1 = getChildTable(treed, treed, hierarchicalColumnName, 0);
-    // assertNotNull(child1);
-    //
-    // TableTools.showWithRowSet(child1);
-    // assertEquals(2, child1.size());
-    // final Table gc1 = getChildTable(treed, child1, hierarchicalColumnName, 0);
-    // TableTools.showWithRowSet(gc1);
-    //
-    // assertNull(getChildTable(treed, child1, hierarchicalColumnName, 1));
-    //
-    // final Table child2 = getChildTable(treed, treed, hierarchicalColumnName, 1);
-    // assertNotNull(child2);
-    // TableTools.showWithRowSet(child2);
-    // assertEquals(2, child2.size());
-    //
-    // assertNull(getChildTable(treed, child2, hierarchicalColumnName, 1));
-    // final Table gc2 = getChildTable(treed, child2, hierarchicalColumnName, 0);
-    // TableTools.showWithRowSet(gc2);
-    // }
-    //
-    // public void testConcurrentInstantiation() throws ExecutionException, InterruptedException {
-    // final Logger log = new StreamLoggerImpl(System.out, LogLevel.DEBUG);
-    // final boolean oldMemoize = QueryTable.setMemoizeResults(false);
-    //
-    // try {
-    //
-    // final QueryTable source = testRefreshingTable(
-    // RowSetFactory.flat(10).toTracking(),
-    // col("Sentinel", 1, 2, 3, 4, 5, 6, 7, 8, 9, 10),
-    // col("Parent", NULL_INT, NULL_INT, 1, 1, 2, 3, 5, 5, 3, 2),
-    // col("Extra", "a", "b", "c", "d", "e", "f", "g", "h", "i", "j"));
-    // final QueryTable source2 = testRefreshingTable(
-    // RowSetFactory.flat(11).toTracking(),
-    // col("Sentinel", 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11),
-    // col("Parent", NULL_INT, NULL_INT, 1, 1, 2, 3, 5, 5, 3, 2, NULL_INT),
-    // col("Extra", "aa", "b", "c", "d", "e", "f", "g", "h", "i", "j", "k"));
-    // final QueryTable source3 = testRefreshingTable(
-    // RowSetFactory.flat(12).toTracking(),
-    // col("Sentinel", 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12),
-    // col("Parent", NULL_INT, NULL_INT, 1, 1, 2, 3, 5, 5, 3, 2, NULL_INT, 11),
-    // col("Extra", "aa", "b", "c", "d", "e", "f", "g", "h", "i", "j", "k", "l"));
-    //
-    // final Table rootExpected1 = source.where("isNull(Parent)");
-    // final Table rootExpected2 = source2.where("isNull(Parent)");
-    // final Table rootExpected3 = source3.where("isNull(Parent)");
-    //
-    // final Supplier<Table> doTree = () -> source.tree("Sentinel", "Parent");
-    // final Table expect = ExecutionContext.getContext().getUpdateGraph().exclusiveLock().computeLocked(doTree::get);
-    // final Table expectOriginal = ExecutionContext.getContext().getUpdateGraph().exclusiveLock()
-    // .computeLocked(() -> makeStatic(source).tree("Sentinel", "Parent"));
-    // final Table expect2 = ExecutionContext.getContext().getUpdateGraph().exclusiveLock()
-    // .computeLocked(() -> source2.tree("Sentinel", "Parent"));
-    //
-    // final String hierarchicalColumnName = getHierarchicalColumnName(expect);
-    //
-    // ExecutionContext.getContext().getUpdateGraph().<ControlledUpdateGraph>cast().startCycleForUnitTests();
-    //
-    // final Table treed1 = pool.submit(doTree::get).get();
-    //
-    // doCompareWithChildrenForTrees("testConcurrentInstantiation", treed1, expect, 0, 10, hierarchicalColumnName,
-    // CollectionUtil.ZERO_LENGTH_STRING_ARRAY);
-    //
-    // System.out.println("ORIGINAL TREED1");
-    // dumpRollup(treed1, hierarchicalColumnName);
-    //
-    // addToTable(source, i(0, 11), col("Sentinel", 1, 11), col("Parent", NULL_INT, NULL_INT),
-    // col("Extra", "aa", "k"));
-    //
-    // final Table treed2 = pool.submit(doTree::get).get();
-    //
-    // doCompareWithChildrenForTrees("testConcurrentInstantiation", treed1, expectOriginal, true, false, 0, 10,
-    // hierarchicalColumnName, CollectionUtil.ZERO_LENGTH_STRING_ARRAY);
-    // doCompareWithChildrenForTrees("testConcurrentInstantiation", treed2, expectOriginal, true, false, 0, 10,
-    // hierarchicalColumnName, CollectionUtil.ZERO_LENGTH_STRING_ARRAY);
-    //
-    // final TableMap map1 = (TableMap) treed1.getAttribute(Table.HIERARCHICAL_CHILDREN_TABLE_MAP_ATTRIBUTE);
-    // final TableMap map2 = (TableMap) treed2.getAttribute(Table.HIERARCHICAL_CHILDREN_TABLE_MAP_ATTRIBUTE);
-    //
-    // assertNotNull(map1);
-    // assertNotNull(map2);
-    //
-    // final Table root1 = map1.get(null);
-    // final Table root2 = map2.get(null);
-    //
-    // final Table sortedRoot1 = pool.submit(() -> root1.sortDescending("Sentinel")).get();
-    // final Table sortedRoot2 = pool.submit(() -> root2.sortDescending("Sentinel")).get();
-    //
-    // final Table sortedSortedRoot1 = pool.submit(() -> sortedRoot1.sort("Extra")).get();
-    // final Table sortedSortedRoot2 = pool.submit(() -> sortedRoot2.sort("Extra")).get();
-    //
-    // assertTableEquals(rootExpected1.sortDescending("Sentinel"), sortedRoot1);
-    // assertTableEquals(rootExpected1.sortDescending("Sentinel"), sortedRoot2);
-    // assertTableEquals(rootExpected1.sortDescending("Sentinel").sort("Extra"), sortedSortedRoot1);
-    // assertTableEquals(rootExpected1.sortDescending("Sentinel").sort("Extra"), sortedSortedRoot2);
-    //
-    // source.notifyListeners(i(11), i(), i());
-    //
-    // final Table treed3 = pool.submit(doTree::get).get();
-    //
-    // final TableMap map3 = (TableMap) treed3.getAttribute(Table.HIERARCHICAL_CHILDREN_TABLE_MAP_ATTRIBUTE);
-    // final Table root3 = map3.get(null);
-    // final Table sortedRoot3 = pool.submit(() -> root3.sortDescending("Sentinel")).get();
-    // final Table sortedSortedRoot3 = pool.submit(() -> sortedRoot3.sort("Extra")).get();
-    // assertTableEquals(rootExpected2.sortDescending("Sentinel"), sortedRoot3);
-    // assertTableEquals(rootExpected2.sort("Extra"), sortedSortedRoot3);
-    //
-    // TableTools.show(treed3);
-    //
-    // doCompareWithChildrenForTrees("testConcurrentInstantiation", expect, treed1, 0, 4, hierarchicalColumnName,
-    // CollectionUtil.ZERO_LENGTH_STRING_ARRAY);
-    // doCompareWithChildrenForTrees("testConcurrentInstantiation", expect, treed2, 0, 4, hierarchicalColumnName,
-    // CollectionUtil.ZERO_LENGTH_STRING_ARRAY);
-    // doCompareWithChildrenForTrees("testConcurrentInstantiation", expect2, treed3, 0, 4, hierarchicalColumnName,
-    // CollectionUtil.ZERO_LENGTH_STRING_ARRAY);
-    //
-    // ExecutionContext.getContext().getUpdateGraph().<ControlledUpdateGraph>cast().completeCycleForUnitTests();
-    //
-    // doCompareWithChildrenForTrees("testConcurrentInstantiation", expect2, treed1, 0, 4, hierarchicalColumnName,
-    // CollectionUtil.ZERO_LENGTH_STRING_ARRAY);
-    // doCompareWithChildrenForTrees("testConcurrentInstantiation", expect2, treed2, 0, 4, hierarchicalColumnName,
-    // CollectionUtil.ZERO_LENGTH_STRING_ARRAY);
-    // doCompareWithChildrenForTrees("testConcurrentInstantiation", expect2, treed3, 0, 4, hierarchicalColumnName,
-    // CollectionUtil.ZERO_LENGTH_STRING_ARRAY);
-    //
-    // final Table expectedFinalSort = rootExpected2.sortDescending("Sentinel");
-    // assertTableEquals(expectedFinalSort, sortedRoot1);
-    // assertTableEquals(expectedFinalSort, sortedRoot1);
-    // assertTableEquals(expectedFinalSort, sortedRoot3);
-    // assertTableEquals(expectedFinalSort.sort("Extra"), sortedSortedRoot1);
-    // assertTableEquals(expectedFinalSort.sort("Extra"), sortedSortedRoot1);
-    // assertTableEquals(expectedFinalSort.sort("Extra"), sortedSortedRoot3);
-    //
-    // final Table eleven1a = map1.get(11);
-    // assertNull(eleven1a);
-    //
-    // ExecutionContext.getContext().getUpdateGraph().<ControlledUpdateGraph>cast().startCycleForUnitTests();
-    //
-    // final Table backwards1 =
-    // pool.submit(() -> TreeTableFilter.rawFilterTree(treed1, "!isNull(Extra)").sortDescending("Extra"))
-    // .get();
-    // final Table backwardsTree1a = pool.submit(() -> backwards1.tree("Sentinel", "Parent")).get();
-    //
-    // final Table treed4 = pool.submit(doTree::get).get();
-    //
-    // addToTable(source, i(12), col("Sentinel", 12), col("Parent", 11), col("Extra", "l"));
-    //
-    // final Table backwards2 =
-    // pool.submit(() -> TreeTableFilter.rawFilterTree(treed1, "!isNull(Extra)").sortDescending("Extra"))
-    // .get();
-    // final Table backwardsTree1b = pool.submit(() -> backwards1.tree("Sentinel", "Parent")).get();
-    // final Table backwardsTree2a = pool.submit(() -> backwards2.tree("Sentinel", "Parent")).get();
-    //
-    // final Table treed5 = pool.submit(doTree::get).get();
-    //
-    // int ii = 1;
-    // for (Table treed : Arrays.asList(treed1, treed2, treed3, treed4, treed5)) {
-    // doCompareWithChildrenForTrees("testConcurrentInstantiation" + ii++, expect, treed, 0, 4,
-    // hierarchicalColumnName, CollectionUtil.ZERO_LENGTH_STRING_ARRAY);
-    // }
-    //
-    // final Table eleven1b = map1.get(11);
-    // assertNull(eleven1b);
-    //
-    // source.notifyListeners(i(12), i(), i());
-    //
-    // final Table treed6 = pool.submit(doTree::get).get();
-    // ExecutionContext.getContext().getUpdateGraph().<ControlledUpdateGraph>cast().flushAllNormalNotificationsForUnitTests();
-    //
-    // final Table backwardsTree1c = pool.submit(() -> backwards1.tree("Sentinel", "Parent")).get();
-    // final Table backwardsTree2b = pool.submit(() -> backwards2.tree("Sentinel", "Parent")).get();
-    // final Table backwards3 =
-    // pool.submit(() -> TreeTableFilter.rawFilterTree(treed1, "!isNull(Extra)").sortDescending("Extra"))
-    // .get();
-    // final Table backwardsTree3 = pool.submit(() -> backwards3.tree("Sentinel", "Parent")).get();
-    //
-    // final Table root1a = map1.get(null);
-    // final Table root2a = map2.get(null);
-    // final Table root3a = map3.get(null);
-    // assertTableEquals(root1a, rootExpected3);
-    // assertTableEquals(root2a, rootExpected3);
-    // assertTableEquals(root3a, rootExpected3);
-    //
-    // ExecutionContext.getContext().getUpdateGraph().<ControlledUpdateGraph>cast().completeCycleForUnitTests();
-    //
-    // final Table eleven1c = map1.get(11);
-    // assertNotNull(eleven1c);
-    //
-    // final TableMap map4 = (TableMap) treed4.getAttribute(Table.HIERARCHICAL_CHILDREN_TABLE_MAP_ATTRIBUTE);
-    // final TableMap map5 = (TableMap) treed5.getAttribute(Table.HIERARCHICAL_CHILDREN_TABLE_MAP_ATTRIBUTE);
-    // final TableMap map6 = (TableMap) treed6.getAttribute(Table.HIERARCHICAL_CHILDREN_TABLE_MAP_ATTRIBUTE);
-    // assertNotNull(map4.get(11));
-    // assertNotNull(map5.get(11));
-    // assertNotNull(map6.get(11));
-    // assertEquals(1, map4.get(11).size());
-    // assertEquals(1, map5.get(11).size());
-    // assertEquals(1, map6.get(11).size());
-    //
-    // ii = 1;
-    // for (Table treed : Arrays.asList(treed1, treed2, treed3, treed4, treed5, treed6)) {
-    // doCompareWithChildrenForTrees("testConcurrentInstantiation" + ii++, expect, treed, 0, 4,
-    // hierarchicalColumnName, CollectionUtil.ZERO_LENGTH_STRING_ARRAY);
-    // }
-    //
-    // final Table backwardsExpected = ExecutionContext.getContext().getUpdateGraph().exclusiveLock()
-    // .computeLocked(() -> source.sortDescending("Extra").tree("Sentinel", "Parent"));
-    // ii = 1;
-    // for (Table treed : Arrays.asList(backwardsTree1a, backwardsTree1b, backwardsTree1c, backwardsTree2a,
-    // backwardsTree2b, backwardsTree3)) {
-    // doCompareWithChildrenForTrees("testConcurrentInstantiationBackward" + ii++, backwardsExpected, treed, 0,
-    // 4, hierarchicalColumnName, CollectionUtil.ZERO_LENGTH_STRING_ARRAY);
-    // }
-    // } finally {
-    // QueryTable.setMemoizeResults(oldMemoize);
-    // }
-    // }
-    //
-    // public void testConcurrentInstantiationOfSort() throws ExecutionException, InterruptedException {
-    // final Logger log = new StreamLoggerImpl(System.out, LogLevel.DEBUG);
-    // final boolean oldMemoize = QueryTable.setMemoizeResults(false);
-    //
-    // try {
-    //
-    // final QueryTable source = testRefreshingTable(
-    // RowSetFactory.flat(10).toTracking(),
-    // col("Sentinel", 1, 2, 3, 4, 5, 6, 7, 8, 9, 10),
-    // col("Parent", NULL_INT, NULL_INT, 1, 1, 2, 3, 5, 5, 3, 2),
-    // col("Extra", "a", "b", "c", "d", "e", "f", "g", "h", "i", "j"));
-    // final QueryTable source2 = testRefreshingTable(
-    // RowSetFactory.flat(11).toTracking(),
-    // col("Sentinel", 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12),
-    // col("Parent", NULL_INT, 1, 1, 2, 3, 5, 5, 3, 2, NULL_INT, 11),
-    // col("Extra", "bb", "c", "d", "e", "f", "g", "h", "i", "j", "k", "l"));
-    //
-    // final Function<Table, Table> doSort = t -> t.sortDescending("Extra");
-    // final Function<Table, Table> doTree = t -> t.tree("Sentinel", "Parent");
-    // final Function<Table, Table> doSortAndTree = doSort.andThen(doTree);
-    //
-    // final Table expect =
-    // ExecutionContext.getContext().getUpdateGraph().exclusiveLock().computeLocked(() -> doSortAndTree.apply(source));
-    // final Table expectOriginal = ExecutionContext.getContext().getUpdateGraph().exclusiveLock()
-    // .computeLocked(() -> doSortAndTree.apply(makeStatic(source)));
-    // final Table expect2 = ExecutionContext.getContext().getUpdateGraph().exclusiveLock()
-    // .computeLocked(() -> doSortAndTree.apply(makeStatic(source2)));
-    //
-    // final String hierarchicalColumnName = getHierarchicalColumnName(expect);
-    //
-    // final Table sorted0 = doSort.apply(source);
-    // final Table sorted0Original = doSort.apply(makeStatic(source));
-    // final Table sorted2 = doSort.apply(makeStatic(source2));
-    //
-    // ExecutionContext.getContext().getUpdateGraph().<ControlledUpdateGraph>cast().startCycleForUnitTests();
-    //
-    // final Table treed1 = pool.submit(() -> doSortAndTree.apply(source)).get();
-    // final Table sorted1 = pool.submit(() -> doSort.apply(source)).get();
-    //
-    // doCompareWithChildrenForTrees("testConcurrentInstantiation", treed1, expect, 0, 10, hierarchicalColumnName,
-    // CollectionUtil.ZERO_LENGTH_STRING_ARRAY);
-    //
-    // removeRows(source, i(0));
-    // addToTable(source, i(1, 11, 12), col("Sentinel", 2, 11, 12), col("Parent", NULL_INT, NULL_INT, 11),
-    // col("Extra", "bb", "k", "l"));
-    //
-    // final Table treed2a = pool.submit(() -> doSortAndTree.apply(source)).get();
-    // final Table treed2b = pool.submit(() -> doTree.apply(sorted0)).get();
-    // final Table treed2c = pool.submit(() -> doTree.apply(sorted1)).get();
-    //
-    // doCompareWithChildrenForTrees("testConcurrentInstantiation", treed1, expectOriginal, true, false, 0, 10,
-    // hierarchicalColumnName, CollectionUtil.ZERO_LENGTH_STRING_ARRAY);
-    // doCompareWithChildrenForTrees("testConcurrentInstantiation", treed2a, expectOriginal, true, false, 0, 10,
-    // hierarchicalColumnName, CollectionUtil.ZERO_LENGTH_STRING_ARRAY);
-    // doCompareWithChildrenForTrees("testConcurrentInstantiation", treed2b, expectOriginal, true, false, 0, 10,
-    // hierarchicalColumnName, CollectionUtil.ZERO_LENGTH_STRING_ARRAY);
-    // doCompareWithChildrenForTrees("testConcurrentInstantiation", treed2c, expectOriginal, true, false, 0, 10,
-    // hierarchicalColumnName, CollectionUtil.ZERO_LENGTH_STRING_ARRAY);
-    //
-    // source.notifyListeners(i(11, 12), i(0), i(1));
-    //
-    // ExecutionContext.getContext().getUpdateGraph().<ControlledUpdateGraph>cast().flushAllNormalNotificationsForUnitTests();
-    //
-    // // everything should have current values now
-    // doCompareWithChildrenForTrees("testConcurrentInstantiation", treed1, expect2, false, false, 0, 4,
-    // hierarchicalColumnName, CollectionUtil.ZERO_LENGTH_STRING_ARRAY);
-    // doCompareWithChildrenForTrees("testConcurrentInstantiation", treed2a, expect2, false, false, 0, 4,
-    // hierarchicalColumnName, CollectionUtil.ZERO_LENGTH_STRING_ARRAY);
-    // doCompareWithChildrenForTrees("testConcurrentInstantiation", treed2b, expect2, false, false, 0, 4,
-    // hierarchicalColumnName, CollectionUtil.ZERO_LENGTH_STRING_ARRAY);
-    // doCompareWithChildrenForTrees("testConcurrentInstantiation", treed2c, expect2, false, false, 0, 4,
-    // hierarchicalColumnName, CollectionUtil.ZERO_LENGTH_STRING_ARRAY);
-    // // but still have a previous value for things that are old
-    // doCompareWithChildrenForTrees("testConcurrentInstantiation", treed1, expectOriginal, true, false, 0, 4,
-    // hierarchicalColumnName, CollectionUtil.ZERO_LENGTH_STRING_ARRAY);
-    // doCompareWithChildrenForTrees("testConcurrentInstantiation", treed2a, expectOriginal, true, false, 0, 4,
-    // hierarchicalColumnName, CollectionUtil.ZERO_LENGTH_STRING_ARRAY);
-    // doCompareWithChildrenForTrees("testConcurrentInstantiation", treed2b, expectOriginal, true, false, 0, 4,
-    // hierarchicalColumnName, CollectionUtil.ZERO_LENGTH_STRING_ARRAY);
-    // doCompareWithChildrenForTrees("testConcurrentInstantiation", treed2c, expectOriginal, true, false, 0, 4,
-    // hierarchicalColumnName, CollectionUtil.ZERO_LENGTH_STRING_ARRAY);
-    //
-    // // we now initialize things after the notification is complete
-    // final Table treed3a = pool.submit(() -> doSortAndTree.apply(source)).get();
-    // final Table treed3b = pool.submit(() -> doTree.apply(sorted0)).get();
-    // final Table treed3c = pool.submit(() -> doTree.apply(sorted1)).get();
-    //
-    // System.out.println("Tree3a");
-    // dumpRollup(treed3a, hierarchicalColumnName);
-    // System.out.println("Tree3b");
-    // dumpRollup(treed3b, hierarchicalColumnName);
-    // System.out.println("Tree3c");
-    // dumpRollup(treed3c, hierarchicalColumnName);
-    //
-    // // everything should have current values now
-    // doCompareWithChildrenForTrees("testConcurrentInstantiation", treed3a, expect2, false, false, 0, 4,
-    // hierarchicalColumnName, CollectionUtil.ZERO_LENGTH_STRING_ARRAY);
-    // doCompareWithChildrenForTrees("testConcurrentInstantiation", treed3b, expect2, false, false, 0, 4,
-    // hierarchicalColumnName, CollectionUtil.ZERO_LENGTH_STRING_ARRAY);
-    // doCompareWithChildrenForTrees("testConcurrentInstantiation", treed3c, expect2, false, false, 0, 4,
-    // hierarchicalColumnName, CollectionUtil.ZERO_LENGTH_STRING_ARRAY);
-    //
-    // // Note that previous is not defined to be the starting value, now that redirectToGet has been discontinued.
-    // assertTableEquals(sorted0Original, prevTable(sorted0));
-    // assertTableEquals(sorted0Original, prevTable(sorted1));
-    // assertTableEquals(sorted2, sorted0);
-    // assertTableEquals(sorted2, sorted1);
-    //
-    // ExecutionContext.getContext().getUpdateGraph().<ControlledUpdateGraph>cast().completeCycleForUnitTests();
-    //
-    // doCompareWithChildrenForTrees("testConcurrentInstantiation", expect2, treed1, 0, 4, hierarchicalColumnName,
-    // CollectionUtil.ZERO_LENGTH_STRING_ARRAY);
-    // doCompareWithChildrenForTrees("testConcurrentInstantiation", expect2, treed2a, 0, 4, hierarchicalColumnName,
-    // CollectionUtil.ZERO_LENGTH_STRING_ARRAY);
-    // doCompareWithChildrenForTrees("testConcurrentInstantiation", expect2, treed2b, 0, 4, hierarchicalColumnName,
-    // CollectionUtil.ZERO_LENGTH_STRING_ARRAY);
-    // doCompareWithChildrenForTrees("testConcurrentInstantiation", expect2, treed2c, 0, 4, hierarchicalColumnName,
-    // CollectionUtil.ZERO_LENGTH_STRING_ARRAY);
-    // doCompareWithChildrenForTrees("testConcurrentInstantiation", expect2, treed3a, 0, 4, hierarchicalColumnName,
-    // CollectionUtil.ZERO_LENGTH_STRING_ARRAY);
-    // doCompareWithChildrenForTrees("testConcurrentInstantiation", expect2, treed3b, 0, 4, hierarchicalColumnName,
-    // CollectionUtil.ZERO_LENGTH_STRING_ARRAY);
-    // doCompareWithChildrenForTrees("testConcurrentInstantiation", expect2, treed3c, 0, 4, hierarchicalColumnName,
-    // CollectionUtil.ZERO_LENGTH_STRING_ARRAY);
-    //
-    // } finally {
-    // QueryTable.setMemoizeResults(oldMemoize);
-    // }
-    // }
-    //
-    // private Table makeStatic(QueryTable source) {
-    // return source.silent().select();
-    // }
-    //
-    // public void testTreeTableStaticFilter() {
-    // final Table source = TableTools.newTable(intCol("Sentinel", 1, 2, 3, 4, 5, 6, 7, 8, 9, 10),
-    // col("Parent", NULL_INT, NULL_INT, 1, 1, 2, 3, 5, 5, 3, 6));
-    //
-    // final Table treed =
-    // ExecutionContext.getContext().getUpdateGraph().exclusiveLock()
-    // .computeLocked(() -> source.tree("Sentinel", "Parent"));
-    // TableTools.showWithRowSet(treed);
-    //
-    // final String hierarchicalColumnName = getHierarchicalColumnName(treed);
-    // assertEquals(2, treed.size());
-    //
-    // final Table filtered = TreeTableFilter.filterTree(treed, "Sentinel in 6, 11, 14");
-    // TableTools.showWithRowSet(filtered);
-    // assertEquals(1, filtered.size());
-    //
-    // assertTrue(Arrays.equals(new int[] {NULL_INT, NULL_INT}, (int[]) treed.getColumn("Parent").getDirect()));
-    // final Table child1 = getChildTable(filtered, filtered, hierarchicalColumnName, 0);
-    // assertNotNull(child1);
-    //
-    // TableTools.showWithRowSet(child1);
-    // assertEquals(1, child1.size());
-    // }
-    //
-    // public void testTreeTableSimpleFilter() {
-    // final QueryTable source = testRefreshingTable(RowSetFactory.flat(10).toTracking(),
-    // col("Sentinel", 1, 2, 3, 4, 5, 6, 7, 8, 9, 10),
-    // col("Parent", NULL_INT, NULL_INT, 1, 1, 2, 3, 5, 5, 3, 6));
-    //
-    // final Table treed =
-    // ExecutionContext.getContext().getUpdateGraph().exclusiveLock()
-    // .computeLocked(() -> source.tree("Sentinel", "Parent"));
-    // TableTools.showWithRowSet(treed);
-    //
-    // final String hierarchicalColumnName = getHierarchicalColumnName(treed);
-    // assertEquals(2, treed.size());
-    //
-    // System.out.println("Filtered.");
-    // final Table filtered = TreeTableFilter.filterTree(treed, "Sentinel in 6, 11, 14");
-    // TableTools.showWithRowSet(filtered);
-    // assertEquals(1, filtered.size());
-    //
-    // assertTrue(Arrays.equals(new int[] {NULL_INT, NULL_INT}, (int[]) treed.getColumn("Parent").getDirect()));
-    // final Table child1 = getChildTable(filtered, filtered, hierarchicalColumnName, 0);
-    // assertNotNull(child1);
-    //
-    // TableTools.showWithRowSet(child1);
-    // assertEquals(1, child1.size());
-    //
-    // final Table child2 = getChildTable(filtered, child1, hierarchicalColumnName, 0);
-    // assertNotNull(child2);
-    // TableTools.showWithRowSet(child2);
-    // assertEquals(1, child1.size());
-    //
-    // assertNull(getChildTable(filtered, child2, hierarchicalColumnName, 0));
-    //
-    // ExecutionContext.getContext().getUpdateGraph().<ControlledUpdateGraph>cast().startCycleForUnitTests();
-    // addToTable(source, i(10), col("Sentinel", 11), col("Parent", 2));
-    // source.notifyListeners(i(10), i(), i());
-    // ExecutionContext.getContext().getUpdateGraph().<ControlledUpdateGraph>cast().completeCycleForUnitTests();
-    // System.out.println("Modified.");
-    // TableTools.showWithRowSet(filtered);
-    // assertEquals(2, filtered.size());
-    //
-    // ExecutionContext.getContext().getUpdateGraph().<ControlledUpdateGraph>cast().startCycleForUnitTests();
-    // addToTable(source, i(10), col("Sentinel", 12), col("Parent", 2));
-    // source.notifyListeners(i(), i(), i(10));
-    // ExecutionContext.getContext().getUpdateGraph().<ControlledUpdateGraph>cast().completeCycleForUnitTests();
-    // System.out.println("Modified.");
-    // TableTools.showWithRowSet(filtered);
-    // assertEquals(1, filtered.size());
-    //
-    //
-    // ExecutionContext.getContext().getUpdateGraph().<ControlledUpdateGraph>cast().startCycleForUnitTests();
-    // addToTable(source, i(10, 11), col("Sentinel", 12, 11), col("Parent", 2, 12));
-    // source.notifyListeners(i(11), i(), i(10));
-    // ExecutionContext.getContext().getUpdateGraph().<ControlledUpdateGraph>cast().completeCycleForUnitTests();
-    // System.out.println("Grand parent.");
-    // TableTools.showWithRowSet(filtered);
-    // assertEquals(2, filtered.size());
-    //
-    // ExecutionContext.getContext().getUpdateGraph().<ControlledUpdateGraph>cast().startCycleForUnitTests();
-    // addToTable(source, i(11), col("Sentinel", 13), col("Parent", 12));
-    // source.notifyListeners(i(), i(), i(11));
-    // ExecutionContext.getContext().getUpdateGraph().<ControlledUpdateGraph>cast().completeCycleForUnitTests();
-    // System.out.println("Grand parent disappear.");
-    // TableTools.showWithRowSet(filtered);
-    // assertEquals(1, filtered.size());
-    //
-    // ExecutionContext.getContext().getUpdateGraph().<ControlledUpdateGraph>cast().startCycleForUnitTests();
-    // addToTable(source, i(12), col("Sentinel", 14), col("Parent", 13));
-    // source.notifyListeners(i(12), i(), i());
-    // ExecutionContext.getContext().getUpdateGraph().<ControlledUpdateGraph>cast().completeCycleForUnitTests();
-    // TableTools.showWithRowSet(source, 15);
-    // System.out.println("Great grand parent appear.");
-    // TableTools.showWithRowSet(filtered);
-    // assertEquals(2, filtered.size());
-    //
-    // ExecutionContext.getContext().getUpdateGraph().<ControlledUpdateGraph>cast().startCycleForUnitTests();
-    // removeRows(source, i(1));
-    // source.notifyListeners(i(), i(1), i());
-    // ExecutionContext.getContext().getUpdateGraph().<ControlledUpdateGraph>cast().completeCycleForUnitTests();
-    // TableTools.showWithRowSet(source, 15);
-    // System.out.println("2 removed.");
-    // TableTools.showWithRowSet(filtered);
-    // assertEquals(1, filtered.size());
-    //
-    // ExecutionContext.getContext().getUpdateGraph().<ControlledUpdateGraph>cast().startCycleForUnitTests();
-    // addToTable(source, i(1), col("Sentinel", 2), col("Parent", NULL_INT));
-    // source.notifyListeners(i(1), i(), i());
-    // ExecutionContext.getContext().getUpdateGraph().<ControlledUpdateGraph>cast().completeCycleForUnitTests();
-    // TableTools.showWithRowSet(source, 15);
-    // System.out.println("2 resurrected.");
-    // TableTools.showWithRowSet(filtered);
-    // assertEquals(2, filtered.size());
-    // }
-    //
-    // public void testOrphanPromoterSimple() {
-    // final QueryTable source = testRefreshingTable(RowSetFactory.flat(4).toTracking(),
-    // col("Sentinel", 1, 2, 3, 4), col("Parent", NULL_INT, NULL_INT, 1, 5));
-    //
-    // final Table treed = ExecutionContext.getContext().getUpdateGraph().exclusiveLock().computeLocked(() -> TreeTable
-    // .promoteOrphans(source, "Sentinel", "Parent").tree("Sentinel", "Parent"));
-    // TableTools.showWithRowSet(treed);
-    // assertEquals(3, treed.size());
-    //
-    // // add a parent, which will make something not an orphan
-    // ExecutionContext.getContext().getUpdateGraph().<ControlledUpdateGraph>cast().startCycleForUnitTests();
-    // addToTable(source, i(5), col("Sentinel", 5), col("Parent", 1));
-    // source.notifyListeners(i(5), i(), i());
-    // ExecutionContext.getContext().getUpdateGraph().<ControlledUpdateGraph>cast().completeCycleForUnitTests();
-    // TableTools.showWithRowSet(treed);
-    // assertEquals(2, treed.size());
-    //
-    // // swap two things
-    // ExecutionContext.getContext().getUpdateGraph().<ControlledUpdateGraph>cast().startCycleForUnitTests();
-    // addToTable(source, i(0, 1), col("Sentinel", 2, 1), col("Parent", NULL_INT, NULL_INT));
-    // source.notifyListeners(i(), i(), i(0, 1));
-    // ExecutionContext.getContext().getUpdateGraph().<ControlledUpdateGraph>cast().completeCycleForUnitTests();
-    // TableTools.showWithRowSet(treed);
-    // assertEquals(2, treed.size());
-    //
-    // // now remove a parent
-    // ExecutionContext.getContext().getUpdateGraph().<ControlledUpdateGraph>cast().startCycleForUnitTests();
-    // removeRows(source, i(0, 1));
-    // source.notifyListeners(i(), i(0, 1), i());
-    // ExecutionContext.getContext().getUpdateGraph().<ControlledUpdateGraph>cast().completeCycleForUnitTests();
-    // TableTools.showWithRowSet(treed);
-    // assertEquals(2, treed.size());
-    // }
-    //
-    // private static String getHierarchicalColumnName(Table treed) {
-    // final HierarchicalTableInfo info =
-    // (HierarchicalTableInfo) treed.getAttribute(Table.HIERARCHICAL_SOURCE_INFO_ATTRIBUTE);
-    // return info.getHierarchicalColumnName();
-    // }
-    //
-    // private Table getChildTable(Table root, Table treed, String hierarchicalColumnName, long index) {
-    // final Object childKey1 = treed.getColumn(hierarchicalColumnName).get(index);
-    // final Table table =
-    // ((TableMap) root.getAttribute(Table.HIERARCHICAL_CHILDREN_TABLE_MAP_ATTRIBUTE)).get(childKey1);
-    // if (table == null || table.isEmpty()) {
-    // return null;
-    // }
-    // return table;
-    // }
-    //
-    // public void testTreeTableEdgeCases() {
-    // final QueryTable source = testRefreshingTable(RowSetFactory.flat(4).toTracking(),
-    // col("Sentinel", 0, 1, 2, 3),
-    // col("Filter", 0, 0, 0, 0),
-    // col("Parent", NULL_INT, NULL_INT, NULL_INT, NULL_INT));
-    //
-    // final EvalNugget[] en = new EvalNugget[] {
-    // new EvalNugget() {
-    // @Override
-    // protected Table e() {
-    // return ExecutionContext.getContext().getUpdateGraph().exclusiveLock().computeLocked(() -> {
-    // final Table treed = source.tree("Sentinel", "Parent");
-    // return TreeTableFilter.rawFilterTree(treed, "Filter in 1");
-    // });
-    // }
-    // },
-    // };
-    //
-    // validate(en);
-    // Assert.assertEquals(0, en[0].originalValue.size());
-    //
-    // // modify child to have parent
-    // ExecutionContext.getContext().getUpdateGraph().<ControlledUpdateGraph>cast().runWithinUnitTestCycle(() -> {
-    // addToTable(source, i(0), col("Sentinel", 0), col("Filter", 1), col("Parent", 1));
-    // source.notifyListeners(i(), i(), i(0));
-    // });
-    // Assert.assertEquals(i(0, 1), en[0].originalValue.getRowSet());
-    //
-    // // modify parent to have grandparent
-    // ExecutionContext.getContext().getUpdateGraph().<ControlledUpdateGraph>cast().runWithinUnitTestCycle(() -> {
-    // addToTable(source, i(1), col("Sentinel", 1), col("Filter", 0), col("Parent", 2));
-    // source.notifyListeners(i(), i(), i(1));
-    // });
-    // Assert.assertEquals(i(0, 1, 2), en[0].originalValue.getRowSet());
-    //
-    // // modify parent's id to orphan child
-    // ExecutionContext.getContext().getUpdateGraph().<ControlledUpdateGraph>cast().runWithinUnitTestCycle(() -> {
-    // addToTable(source, i(1), col("Sentinel", -1), col("Filter", 0), col("Parent", 2));
-    // source.notifyListeners(i(), i(), i(1));
-    // });
-    // Assert.assertEquals(i(0), en[0].originalValue.getRowSet());
-    //
-    // // revert parent's id and adopt child
-    // ExecutionContext.getContext().getUpdateGraph().<ControlledUpdateGraph>cast().runWithinUnitTestCycle(() -> {
-    // addToTable(source, i(1), col("Sentinel", 1), col("Filter", 0), col("Parent", 2));
-    // source.notifyListeners(i(), i(), i(1));
-    // });
-    // Assert.assertEquals(i(0, 1, 2), en[0].originalValue.getRowSet());
-    //
-    // // remove child, resurrect parent
-    // ExecutionContext.getContext().getUpdateGraph().<ControlledUpdateGraph>cast().runWithinUnitTestCycle(() -> {
-    // removeRows(source, i(0));
-    // addToTable(source, i(3), col("Sentinel", 3), col("Filter", 1), col("Parent", 1));
-    // source.notifyListeners(i(), i(0), i(3));
-    // });
-    // Assert.assertEquals(i(1, 2, 3), en[0].originalValue.getRowSet());
-    // }
-    //
-    // @TableToolsShowControl(getWidth = 40)
-    // public static class IdParentPair {
-    // final int id;
-    // final int parent;
-    //
-    // private IdParentPair(int id, int parent) {
-    // this.id = id;
-    // this.parent = parent;
-    // }
-    //
-    // public int getId() {
-    // return id;
-    // }
-    //
-    // // used within query strings below
-    // @SuppressWarnings("unused")
-    // public int getParent() {
-    // return parent;
-    // }
-    //
-    // @Override
-    // public String toString() {
-    // return "{id=" + id + ", parent=" + parent + '}';
-    // }
-    // }
-    //
-    // public static class ParentChildGenerator implements TestDataGenerator<IdParentPair, IdParentPair> {
-    // final double rootFraction;
-    // final double createAsOrphanFraction;
-    //
-    // final Map<Integer, Set<Integer>> parentToChild = new HashMap<>();
-    // final Map<Integer, Set<Integer>> orphans = new HashMap<>();
-    // final List<Integer> usedIds = new ArrayList<>();
-    //
-    // public ParentChildGenerator(double rootFraction, double createAsOrphanFraction) {
-    // this.rootFraction = rootFraction;
-    // this.createAsOrphanFraction = createAsOrphanFraction;
-    // }
-    //
-    // @Override
-    // public TreeMap<Long, IdParentPair> populateMap(TreeMap<Long, IdParentPair> values, RowSet toAdd,
-    // Random random) {
-    // final TreeMap<Long, IdParentPair> result = new TreeMap<>();
-    //
-    // for (final RowSet.Iterator it = toAdd.iterator(); it.hasNext();) {
-    // add(random, values, result, it.nextLong());
-    // }
-    //
-    // values.putAll(result);
-    //
-    // return result;
-    // }
-    //
-    // private void add(Random random, TreeMap<Long, IdParentPair> values, TreeMap<Long, IdParentPair> result,
-    // long key) {
-    // if (values.containsKey(key)) {
-    // // this is a modification, for now let's keep it actually the same, because otherwise it is hard
-    // final IdParentPair existing = values.get(key);
-    //
-    // // final boolean isOrphan = orphans.containsKey(existing.id);
-    // // final boolean isActive = parentToChild.containsKey(existing.id);
-    //
-    // result.put(key, existing);
-    //
-    // return;
-    // }
-    //
-    // int id;
-    // do {
-    // id = random.nextInt();
-    // } while (parentToChild.containsKey(id));
-    //
-    // final boolean asOrphan = random.nextDouble() < createAsOrphanFraction;
-    // final boolean canSatisfy = !(asOrphan ? orphans : parentToChild).isEmpty();
-    //
-    // parentToChild.put(id, new HashSet<>());
-    //
-    // int parent;
-    // if (usedIds.isEmpty() || random.nextDouble() < rootFraction || !canSatisfy) {
-    // parent = NULL_INT;
-    // } else {
-    // boolean satisfied;
-    // final int startIdx = random.nextInt(usedIds.size());
-    // int nextIdx = startIdx;
-    // do {
-    // // we need to find an appropriate parent, from one of the existing elements
-    // parent = usedIds.get(nextIdx);
-    // if (asOrphan) {
-    // satisfied = !orphans.isEmpty() && orphans.keySet().contains(parent);
-    // } else {
-    // satisfied = !parentToChild.isEmpty() && parentToChild.keySet().contains(parent);
-    // }
-    // nextIdx = (nextIdx + 1) % usedIds.size();
-    // } while (!satisfied && nextIdx != startIdx);
-    //
-    // if (!satisfied) {
-    // // oops couldn't find a parent without creating a cycle
-    // parent = NULL_INT;
-    // }
-    // }
-    // usedIds.add(id);
-    //
-    // final IdParentPair pair = new IdParentPair(id, parent);
-    // result.put(key, pair);
-    // }
-    //
-    // @Override
-    // public void onRemove(long key, IdParentPair remove) {
-    // final int parentToOrphan = remove.id;
-    // doOrphan(parentToOrphan);
-    // }
-    //
-    // private void doOrphan(int parentToOrphan) {
-    // final Set<Integer> orphanKeys =
-    // Require.neqNull(parentToChild.remove(parentToOrphan), Integer.toString(parentToOrphan));
-    // orphans.put(parentToOrphan, orphanKeys);
-    // orphanKeys.forEach(this::doOrphan);
-    // }
-    //
-    // @Override
-    // public Class<IdParentPair> getType() {
-    // return IdParentPair.class;
-    // }
-    //
-    // @Override
-    // public Class<IdParentPair> getColumnType() {
-    // return IdParentPair.class;
-    // }
-    //
-    // void show() {
-    // System.out.println("Parents: " + parentToChild.keySet());
-    // System.out.println("Orphans: " + orphans.keySet());
-    // }
-    // }
-    //
-    // static abstract class HierarchicalTableEvalNugget extends EvalNugget {
-    // final Supplier<Integer> maxLevels;
-    // final String[] sortColumns;
-    //
-    // HierarchicalTableEvalNugget(Table prepared) {
-    // this.maxLevels = prepared::intSize;
-    // this.sortColumns = CollectionUtil.ZERO_LENGTH_STRING_ARRAY;
-    // }
-    //
-    // HierarchicalTableEvalNugget(int maxLevels, String... sortColumns) {
-    // this.maxLevels = () -> maxLevels;
-    // this.sortColumns = sortColumns;
-    // }
-    //
-    // @Override
-    // void checkDifferences(String msg, Table recomputed) {
-    // compareWithChildren(msg, originalValue, recomputed, getHierarchicalColumnName(recomputed));
-    // }
-    //
-    // abstract void compareWithChildren(String msg, Table originalValue, Table recomputed,
-    // String hierarchicalColumnName);
-    //
-    // @Override
-    // void showResult(String label, Table e) {
-    // System.out.println(label);
-    // dumpRollup(e, getHierarchicalColumnName(e));
-    // }
-    // }
-    //
-    // static abstract class TreeTableEvalNugget extends HierarchicalTableEvalNugget {
-    //
-    // TreeTableEvalNugget(Table prepared) {
-    // super(prepared);
-    // }
-    //
-    // TreeTableEvalNugget(int maxLevels, String... sortColumns) {
-    // super(maxLevels, sortColumns);
-    // }
-    //
-    // void compareWithChildren(String msg, Table originalValue, Table recomputed, String hierarchicalColumnName) {
-    // doCompareWithChildrenForTrees(msg, originalValue, recomputed, 0, maxLevels.get(), hierarchicalColumnName,
-    // sortColumns);
-    // }
-    // }
-    //
-    // static abstract class RollupEvalNugget extends HierarchicalTableEvalNugget {
-    //
-    // RollupEvalNugget(Table prepared) {
-    // super(prepared);
-    // }
-    //
-    // RollupEvalNugget(int maxLevels, String... sortColumns) {
-    // super(maxLevels, sortColumns);
-    // }
-    //
-    // void compareWithChildren(String msg, Table originalValue, Table recomputed, String hierarchicalColumnName) {
-    // doCompareWithChildrenForRollups(msg, originalValue, recomputed, 0, maxLevels.get(), hierarchicalColumnName,
-    // sortColumns);
-    // }
-    // }
-    //
-    // static private void doCompareWithChildrenForTrees(String msg, Table actualValue, Table expectedValue, int levels,
-    // int maxLevels, String hierarchicalColumnName, String[] sortColumns) {
-    // doCompareWithChildrenForTrees(msg, actualValue, expectedValue, false, false, levels, maxLevels,
-    // hierarchicalColumnName, sortColumns);
-    // }
-    //
-    // static private void doCompareWithChildrenForTrees(String msg, Table actualValue, Table expectedValue,
-    // boolean actualPrev, boolean expectedPrev, int levels, int maxLevels, String hierarchicalColumnName,
-    // String[] sortColumns) {
-    // doCompareWithChildren(
-    // t -> (TableMap) actualValue.getAttribute(Table.HIERARCHICAL_CHILDREN_TABLE_MAP_ATTRIBUTE),
-    // t -> (TableMap) expectedValue.getAttribute(Table.HIERARCHICAL_CHILDREN_TABLE_MAP_ATTRIBUTE),
-    // msg, actualValue, expectedValue, actualPrev, expectedPrev, levels, maxLevels, hierarchicalColumnName,
-    // sortColumns);
-    // }
-    //
-    // static private void doCompareWithChildrenForRollups(String msg, Table originalValue, Table recomputed, int
-    // levels,
-    // int maxLevels, String hierarchicalColumnName, String[] sortColumns) {
-    // doCompareWithChildren(
-    // t -> (TableMap) t.getAttribute(Table.HIERARCHICAL_CHILDREN_TABLE_MAP_ATTRIBUTE),
-    // t -> (TableMap) t.getAttribute(Table.HIERARCHICAL_CHILDREN_TABLE_MAP_ATTRIBUTE),
-    // msg, originalValue, recomputed, false, false, levels, maxLevels, hierarchicalColumnName, sortColumns);
-    // }
-    //
-    // static private void doCompareWithChildren(Function<TableMap, Table> actualMapSource,
-    // Function<TableMap, Table> expectedMapSource,
-    // String msg,
-    // Table actualValueIn,
-    // Table expectedValueIn,
-    // boolean actualPrev,
-    // boolean expectedPrev,
-    // int levels,
-    // int maxLevels,
-    // String hierarchicalColumnName,
-    // String[] sortColumns) {
-    // if (levels > maxLevels) {
-    // throw new IllegalStateException("Refusing to validate levels " + levels + ", to prevent infinite looping!");
-    // }
-    //
-    // Table actualValue = getDiffableTable(actualValueIn);
-    // Table expectedValue = getDiffableTable(expectedValueIn);
-    //
-    // if (sortColumns.length > 0) {
-    // actualValue = actualValue.sort(sortColumns);
-    // expectedValue = expectedValue.sort(sortColumns);
-    // }
-    //
-    // assertTableEquals(maybePrev(expectedValue.dropColumns(hierarchicalColumnName), expectedPrev),
-    // maybePrev(actualValue.dropColumns(hierarchicalColumnName), actualPrev),
-    // TableDiff.DiffItems.DoublesExact);
-    //
-    // final ColumnSource actualChildren = columnOrPrev(actualValue, hierarchicalColumnName, actualPrev);
-    // final ColumnSource expectedChildren = columnOrPrev(expectedValue, hierarchicalColumnName, expectedPrev);
-    //
-    // final TableMap actualMap = actualMapSource.apply(actualValue);
-    // final TableMap expectedMap = expectedMapSource.apply(expectedValue);
-    //
-    // final RowSet actualRowSet = indexOrPrev(actualValue, actualPrev);
-    // final RowSet expectedRowSet = indexOrPrev(expectedValue, expectedPrev);
-    // assertEquals(expectedRowSet.size(), actualRowSet.size());
-    //
-    // final RowSet.Iterator oit = actualRowSet.iterator();
-    // final RowSet.Iterator rit = expectedRowSet.iterator();
-    //
-    // for (; oit.hasNext();) {
-    // assertTrue(rit.hasNext());
-    // final long originalRow = oit.nextLong();
-    // final long recomputedRow = rit.nextLong();
-    //
-    // final Object aKey = actualChildren.get(originalRow);
-    // final Object eKey = expectedChildren.get(recomputedRow);
-    //
-    // assertEquals(aKey == null, eKey == null);
-    //
-    // final Table ac = aKey == null ? null : actualMap.get(aKey);
-    // final Table ec = eKey == null ? null : expectedMap.get(eKey);
-    //
-    // assertEquals(ac == null || ac.size() == 0, ec == null || ec.size() == 0);
-    //
-    // if ((ac != null && ac.size() > 0) && (ec != null && ec.size() > 0)) {
-    // doCompareWithChildren(actualMapSource, expectedMapSource, msg, ac, ec, actualPrev, expectedPrev,
-    // levels + 1, maxLevels, hierarchicalColumnName, sortColumns);
-    // }
-    // }
-    // }
-    //
-    // public void testTreeTableIncremental() {
-    // testTreeTableIncremental(10, 0, new MutableInt(100));
-    // testTreeTableIncremental(100, 0, new MutableInt(100));
-    // }
-    //
-    // private static Table maybePrev(Table table, boolean usePrev) {
-    // return usePrev ? prevTable(table) : table;
-    // }
-    //
-    // private static ColumnSource columnOrPrev(Table table, String columnName, boolean usePrev) {
-    // // noinspection unchecked
-    // return usePrev ? new PrevColumnSource(table.getColumnSource(columnName)) : table.getColumnSource(columnName);
-    // }
-    //
-    // private static RowSet indexOrPrev(Table table, boolean usePrev) {
-    // return usePrev ? table.getRowSet().copyPrev() : table.getRowSet();
-    // }
-    //
-    // private void testTreeTableIncremental(final int size, final long seed, final MutableInt numSteps) {
-    // final Random random = new Random(seed);
-    // final ParentChildGenerator parentChildGenerator = new ParentChildGenerator(0.25, 0);
-    //
-    // final ColumnInfo[] columnInfo = initColumnInfos(new String[] {"IDPair", "Sentinel", "Sym"},
-    // parentChildGenerator,
-    // new IntGenerator(0, 1_000_000_000),
-    // new SetGenerator<>("AAPL", "TSLA", "VXX", "SPY"));
-    // // noinspection unchecked
-    // final QueryTable table = getTable(size, random, columnInfo);
-    //
-    // if (RefreshingTableTestCase.printTableUpdates) {
-    // System.out.println("Original:");
-    // TableTools.showWithRowSet(table);
-    // }
-    //
-    // final Table prepared = table.update("ID=IDPair.getId()", "Parent=IDPair.getParent()").dropColumns("IDPair");
-    //
-    // if (RefreshingTableTestCase.printTableUpdates) {
-    // System.out.println("Original Prepared:");
-    // TableTools.showWithRowSet(prepared);
-    // }
-    //
-    // final EvalNuggetInterface en[] = new EvalNuggetInterface[] {
-    // new EvalNuggetInterface() {
-    // @Override
-    // public void validate(String msg) {}
-    //
-    // @Override
-    // public void show() {
-    // TableTools.showWithRowSet(prepared);
-    // }
-    // },
-    // new TreeTableEvalNugget(prepared) {
-    // @Override
-    // protected Table e() {
-    // return ExecutionContext.getContext().getUpdateGraph().exclusiveLock().computeLocked(() -> prepared.tree("ID",
-    // "Parent"));
-    // }
-    // },
-    // new TreeTableEvalNugget(prepared) {
-    // @Override
-    // protected Table e() {
-    // return ExecutionContext.getContext().getUpdateGraph().exclusiveLock().computeLocked(() ->
-    // prepared.sort("Sym").tree("ID", "Parent"));
-    // }
-    // },
-    // new TreeTableEvalNugget(prepared) {
-    // @Override
-    // protected Table e() {
-    // return ExecutionContext.getContext().getUpdateGraph().exclusiveLock().computeLocked(() ->
-    // prepared.sort("Sentinel").tree("ID", "Parent"));
-    // }
-    // },
-    // new TreeTableEvalNugget(prepared) {
-    // @Override
-    // protected Table e() {
-    // return TreeTableFilter.filterTree(prepared.tree("ID", "Parent"), "Sentinel % 2 == 1");
-    // }
-    // },
-    // EvalNugget.from(
-    // () -> TreeTableFilter.rawFilterTree(prepared.tree("ID", "Parent"), "Sentinel % 2 == 1")),
-    // };
-    //
-    // final int maxSteps = numSteps.intValue();
-    // for (numSteps.setValue(0); numSteps.intValue() < maxSteps; numSteps.increment()) {
-    // if (RefreshingTableTestCase.printTableUpdates) {
-    // System.out.println("Step = " + numSteps.intValue());
-    // }
-    // simulateShiftAwareStep(size, random, table, columnInfo, en);
-    // }
-    // }
-    //
-    // public void testOrphanPromoter() throws IOException {
-    // testOrphanPromoter(10, 0, new MutableInt(100));
-    // testOrphanPromoter(100, 0, new MutableInt(100));
-    // }
-    //
-    // private void testOrphanPromoter(final int size, int seed, MutableInt numSteps) {
-    // final int maxSteps = numSteps.intValue();
-    // final Random random = new Random(seed);
-    //
-    // final ColumnInfo[] columnInfo;
-    // final ParentChildGenerator parentChildGenerator = new ParentChildGenerator(0.25, 0.25);
-    // final QueryTable table = getTable(size, random,
-    // columnInfo = initColumnInfos(new String[] {"IDPair", "Sentinel", "Sym"},
-    // parentChildGenerator,
-    // new IntGenerator(0, 1_000_000_000),
-    // new SetGenerator<>("AAPL", "TSLA", "VXX", "SPY")));
-    //
-    // final Table prepared = table.update("ID=IDPair.getId()", "Parent=IDPair.getParent()").dropColumns("IDPair");
-    //
-    // final EvalNuggetInterface en[] = new EvalNuggetInterface[] {
-    // new EvalNuggetInterface() {
-    // @Override
-    // public void validate(String msg) {}
-    //
-    // @Override
-    // public void show() {
-    // TableTools.showWithRowSet(prepared);
-    // }
-    // },
-    // new EvalNugget() {
-    // @Override
-    // protected Table e() {
-    // return ExecutionContext.getContext().getUpdateGraph().exclusiveLock().computeLocked(
-    // () -> TreeTable.promoteOrphans((QueryTable) prepared, "ID", "Parent"));
-    // }
-    // },
-    // new EvalNugget() {
-    // @Override
-    // protected Table e() {
-    // return ExecutionContext.getContext().getUpdateGraph().exclusiveLock().computeLocked(() -> TreeTable
-    // .promoteOrphans((QueryTable) prepared.where("Sentinel % 2 == 0"), "ID", "Parent"));
-    // }
-    // },
-    // new TreeTableEvalNugget(prepared) {
-    // @Override
-    // protected Table e() {
-    // return ExecutionContext.getContext().getUpdateGraph().exclusiveLock()
-    // .computeLocked(() -> TreeTable.promoteOrphans((QueryTable) prepared
-    // .where("Sentinel % 2 == 0"), "ID", "Parent").tree("ID", "Parent"));
-    // }
-    // },
-    // };
-    //
-    // for (numSteps.setValue(0); numSteps.intValue() < maxSteps; numSteps.increment()) {
-    // if (RefreshingTableTestCase.printTableUpdates) {
-    // System.out.println("Step = " + numSteps.intValue());
-    // }
-    // simulateShiftAwareStep(size, random, table, columnInfo, en);
-    // }
-    // }
-    //
-    // private static void dumpRollup(Table root, String hierarchicalColumnName, String... labelColumns) {
-    // dumpRollup(root, false, hierarchicalColumnName, labelColumns);
-    // }
-    //
-    // private static void dumpRollup(Table root, boolean usePrev, String hierarchicalColumnName, String...
-    // labelColumns) {
-    // final HierarchicalTableInfo info =
-    // (HierarchicalTableInfo) root.getAttribute(Table.HIERARCHICAL_SOURCE_INFO_ATTRIBUTE);
-    //
-    // final TableMap map = info instanceof TreeTableInfo
-    // ? (TableMap) root.getAttribute(Table.HIERARCHICAL_CHILDREN_TABLE_MAP_ATTRIBUTE)
-    // : null;
-    //
-    // dumpRollup(root, map, usePrev, hierarchicalColumnName, labelColumns);
-    // }
-    //
-    // private static void dumpRollup(Table root, TableMap childMap, boolean usePrev, String hierarchicalColumnName,
-    // String... labelColumns) {
-    // TableTools.showWithRowSet(usePrev ? prevTable(root) : root, 101);
-    //
-    // final List<ColumnSource> labelSource =
-    // Arrays.stream(labelColumns).map(root::getColumnSource).collect(Collectors.toList());
-    // final ColumnSource children = columnOrPrev(root, hierarchicalColumnName, usePrev);
-    // final TableMap map =
-    // childMap == null ? (TableMap) root.getAttribute(Table.HIERARCHICAL_CHILDREN_TABLE_MAP_ATTRIBUTE)
-    // : childMap;
-    // final ReverseLookup reverseLookup = (ReverseLookup) root.getAttribute(Table.REVERSE_LOOKUP_ATTRIBUTE);
-    // if (reverseLookup != null) {
-    // System.out.println("Reverse Lookup is set.");
-    // } else {
-    // System.out.println("No Reverse Lookup.");
-    // }
-    //
-    // if (map == null) {
-    // System.out.println("No child map.");
-    // return;
-    // }
-    //
-    // for (final RowSet.Iterator it = indexOrPrev(root, usePrev).iterator(); it.hasNext();) {
-    // final long key = it.nextLong();
-    // Object childKey = children.get(key);
-    // if (childKey == null) {
-    // childKey = new SmartKey();
-    // }
-    //
-    // final Table childTable = map.get(childKey);
-    // if (childTable == null || childTable.size() == 0) {
-    // continue;
-    // }
-    //
-    // System.out.println(
-    // "Label: " + labelSource.stream().map(x -> (String) x.get(key)).collect(Collectors.joining(", ")));
-    // dumpRollup(childTable, childMap, usePrev, hierarchicalColumnName, labelColumns);
-    // }
-    // }
-    //
-    // public void testRollupMinMax() {
-    // testSimpleRollup(List.of(AggMin("IntCol", "DoubleCol")));
-    // testSimpleRollup(List.of(AggMax("IntCol", "DoubleCol")));
-    // }
-    //
-    // public void testRollupSum() {
-    // testSimpleRollup(List.of(AggSum("IntCol", "DoubleCol", "BigIntCol", "BigDecCol")));
-    // }
-    //
-    // public void testRollupWSum() {
-    // // TODO: BigDecimal, BigInteger
-    // testSimpleRollup(List.of(AggWSum("DoubleCol", "IntCol", "DoubleCol")));
-    // }
-    //
-    // public void testRollupReverseLookup() {
-    // final Collection<? extends Aggregation> comboAgg = List.of(Aggregation.AggSum("IntCol", "DoubleCol"));
-    // final Random random = new Random(0);
-    //
-    // final int size = 100;
-    // final QueryTable table = getTable(size, random,
-    // initColumnInfos(
-    // new String[] {"USym", "Instant", "IntCol", "DoubleCol", "BoolCol", "BigIntCol", "BigDecCol"},
-    // new SetGenerator<>("AAPL", "TSLA", "VXX", "SPY"),
-    // new SetGenerator<>(DateTimeUtils.parseInstant("2020-01-01T00:00:00 NY"), null,
-    // DateTimeUtils.parseInstant("2020-02-28T14:30:00 NY")),
-    // new IntGenerator(0, 1_000_000),
-    // new DoubleGenerator(-100, 100),
-    // new BooleanGenerator(0.4, 0.1),
-    // new BigIntegerGenerator(BigInteger.ZERO, BigInteger.valueOf(100), 0.1),
-    // new BigDecimalGenerator(BigInteger.valueOf(-1000), BigInteger.valueOf(1000), 5, 0.1)));
-    //
-    // System.out.println("Source Data:");
-    // TableTools.showWithRowSet(table);
-    //
-    // final Table rollup = ExecutionContext.getContext().getUpdateGraph().exclusiveLock()
-    // .computeLocked(() -> table.rollup(comboAgg, "USym", "Instant", "BoolCol", "BigIntCol", "BigDecCol"));
-    // verifyReverseLookup(rollup);
-    //
-    // verifyReverseLookup(
-    // ExecutionContext.getContext().getUpdateGraph().exclusiveLock().computeLocked(() -> table.rollup(comboAgg,
-    // "USym")));
-    // verifyReverseLookup(
-    // ExecutionContext.getContext().getUpdateGraph().exclusiveLock().computeLocked(() -> table.rollup(comboAgg,
-    // "Instant")));
-    // verifyReverseLookup(
-    // ExecutionContext.getContext().getUpdateGraph().exclusiveLock().computeLocked(() -> table.rollup(comboAgg,
-    // "BoolCol")));
-    // }
-    //
-    // private void verifyReverseLookup(Table rollup) {
-    // final String columnName =
-    // ((HierarchicalTableInfo) rollup.getAttribute(Table.HIERARCHICAL_SOURCE_INFO_ATTRIBUTE))
-    // .getHierarchicalColumnName();
-    // verifyReverseLookup(rollup, columnName);
-    // }
-    //
-    // private void verifyReverseLookup(Table rollup, String columnName) {
-    // final ReverseLookup rl = (ReverseLookup) rollup.getAttribute(Table.REVERSE_LOOKUP_ATTRIBUTE);
-    // Assert.assertNotNull("rl", rl);
-    // final Set<Object> children = new LinkedHashSet<>();
-    // final ColumnSource childSource = rollup.getColumnSource(columnName);
-    //
-    // TableTools.showWithRowSet(rollup);
-    //
-    // rollup.columnIterator(columnName).forEachRemaining(key -> {
-    // if (key == null) {
-    // return;
-    // }
-    // children.add(key);
-    // final long idx = rl.get(key);
-    // final Object fromColumn = childSource.get(idx);
-    // TestCase.assertEquals(key, fromColumn);
-    // });
-    //
-    // final TableMap childMap = (TableMap) rollup.getAttribute(Table.HIERARCHICAL_CHILDREN_TABLE_MAP_ATTRIBUTE);
-    // for (final Object childKey : children) {
-    // verifyReverseLookup(childMap.get(childKey), columnName);
-    // }
-    // }
-    //
-    // public void testRollupAbsSum() {
-    // testSimpleRollup(List.of(AggAbsSum("IntCol", "DoubleCol", "BigIntCol", "BigDecCol")));
-    // }
-    //
-    // public void testRollupAverage() {
-    // testSimpleRollup(
-    // List.of(AggAvg("IntCol", "DoubleCol", "BigIntCol", "BigDecCol", "DoubleNanCol", "FloatNullCol")));
-    // }
-    //
-    // public void testRollupStd() {
-    // testSimpleRollup(List.of(AggStd("IntCol", "DoubleCol", "BigIntCol", "BigDecCol")));
-    // }
-    //
-    // public void testRollupVar() {
-    // testSimpleRollup(List.of(AggVar("IntCol", "DoubleCol", "BigIntCol", "BigDecCol")));
-    // }
-    //
-    // public void testRollupFirst() {
-    // testSimpleRollup(List.of(AggFirst("IntCol", "DoubleCol")));
-    // }
-    //
-    // public void testRollupLast() {
-    // testSimpleRollup(List.of(AggLast("IntCol", "DoubleCol")));
-    // }
-    //
-    // public void testRollupSortedLast() {
-    // testSimpleRollup(List.of(AggSortedLast("IntCol", "IntCol", "DoubleCol")));
-    // }
-    //
-    // public void testRollupSortedFirst() {
-    // testSimpleRollup(List.of(AggSortedFirst("IntCol", "IntCol", "DoubleCol")));
-    // }
-    //
-    // public void testRollupCountDistinct() {
-    // testSimpleRollup(List.of(AggCountDistinct("IntCol", "DoubleCol", "FloatNullCol", "StringCol", "BoolCol")));
-    // testSimpleRollup(
-    // List.of(AggCountDistinct(true, "IntCol", "DoubleCol", "FloatNullCol", "StringCol", "BoolCol")));
-    // }
-    //
-    // public void testRollupDistinct() {
-    // testSimpleRollup(List.of(AggDistinct("IntCol", "DoubleCol", "FloatNullCol", "StringCol", "BoolCol")));
-    // testSimpleRollup(List.of(AggDistinct(true, "IntCol", "DoubleCol", "FloatNullCol", "StringCol", "BoolCol")));
-    // }
-    //
-    // public void testRollupUnique() {
-    // testSimpleRollup(List.of(AggUnique("IntCol", "DoubleCol", "FloatNullCol", "StringCol", "BoolCol")));
-    // testSimpleRollup(List.of(AggUnique(true, Sentinel(), "IntCol", "DoubleCol", "FloatNullCol", "StringCol",
-    // "BoolCol")));
-    // }
-    //
-    // private void testSimpleRollup(Collection<? extends Aggregation> comboAgg) {
-    // final Random random = new Random(0);
-    //
-    // final int size = 10;
-    // final QueryTable table = getTable(size, random,
-    // initColumnInfos(
-    // new String[] {"USym", "Group", "IntCol", "DoubleCol", "DoubleNanCol", "FloatNullCol",
-    // "StringCol", "BoolCol", "BigIntCol", "BigDecCol"},
-    // new SetGenerator<>("AAPL", "TSLA", "VXX", "SPY"),
-    // new SetGenerator<>("Terran", "Vulcan", "Klingon", "Romulan"),
-    // new IntGenerator(0, 1_000_000),
-    // new DoubleGenerator(-100, 100),
-    // new DoubleGenerator(-100, 100, 0.0, 0.1),
-    // new FloatGenerator(-100, 100, 0.1, 0.0),
-    // new SetGenerator<>("A", "B", "C", "D"),
-    // new BooleanGenerator(.5, .1),
-    // new BigIntegerGenerator(BigInteger.ZERO, BigInteger.valueOf(100), 0.1),
-    // new BigDecimalGenerator(BigInteger.valueOf(-1000), BigInteger.valueOf(1000), 5, 0.1)));
-    //
-    // System.out.println("Source Data:");
-    // TableTools.showWithRowSet(table);
-    //
-    // final Table rollup =
-    // ExecutionContext.getContext().getUpdateGraph().exclusiveLock()
-    // .computeLocked(() -> table.rollup(comboAgg, "USym", "Group"));
-    //
-    // final Table fullBy = ExecutionContext.getContext().getUpdateGraph().exclusiveLock().computeLocked(() ->
-    // table.aggBy(comboAgg));
-    // System.out.println("Full By:");
-    // TableTools.showWithRowSet(fullBy);
-    //
-    // System.out.println("Rollup Meta");
-    // TableTools.show(rollup.getMeta());
-    //
-    // System.out.println("Rollup:");
-    // dumpRollup(rollup, getHierarchicalColumnName(rollup), "USym", "Group");
-    //
-    // final List<String> viewCols = new ArrayList<>(Arrays.asList("IntCol", "DoubleCol"));
-    // for (final String maybeColumn : new String[] {"BigIntCol", "BigDecCol", "DoubleNanCol", "FloatNullCol",
-    // "StringCol", "BoolCol"}) {
-    // if (fullBy.hasColumns(maybeColumn)) {
-    // viewCols.add(maybeColumn);
-    // }
-    // }
-    //
-    // final Table rollupClean = getDiffableTable(rollup).view(Selectable.from(viewCols));
-    //
-    // final String diff = TableTools.diff(fullBy, rollupClean, 10, EnumSet.of(TableDiff.DiffItems.DoublesExact));
-    //
-    // assertEquals("", diff);
-    //
-    // }
-    //
-    // public void testRollupScope() {
-    // final Random random = new Random(0);
-    //
-    // final int size = 10;
-    // final QueryTable table = getTable(size, random,
-    // initColumnInfos(new String[] {"USym", "Group", "IntCol", "DoubleCol"},
-    // new SetGenerator<>("AAPL", "TSLA", "VXX", "SPY"),
-    // new SetGenerator<>("Terran", "Vulcan", "Klingon", "Romulan"),
-    // new IntGenerator(0, 1_000_000),
-    // new DoubleGenerator(-100, 100)));
-    //
-    // final SafeCloseable scopeCloseable = LivenessScopeStack.open();
-    //
-    // final Table rollup = ExecutionContext.getContext().getUpdateGraph().exclusiveLock()
-    // .computeLocked(() -> table.rollup(List.of(AggSum("IntCol", "DoubleCol")), "USym", "Group"));
-    // final TableMap rootMap = (TableMap) rollup.getAttribute(Table.HIERARCHICAL_CHILDREN_TABLE_MAP_ATTRIBUTE);
-    // final Table nextLevel = rootMap.get(SmartKey.EMPTY);
-    // assertNotNull(nextLevel);
-    //
-    // // TableTools.show(rollup.getMeta());
-    // // dumpRollup(rollup, getHierarchicalColumnName(rollup), "USym", "Group");
-    //
-    // final SingletonLivenessManager rollupManager = new SingletonLivenessManager(rollup);
-    //
-    // ExecutionContext.getContext().getUpdateGraph().exclusiveLock().doLocked(scopeCloseable::close);
-    //
-    // Assert.assertTrue(rollup.tryRetainReference());
-    // Assert.assertTrue(rootMap.tryRetainReference());
-    // Assert.assertTrue(nextLevel.tryRetainReference());
-    //
-    // rollup.dropReference();
-    // rootMap.dropReference();
-    // nextLevel.dropReference();
-    //
-    // ExecutionContext.getContext().getUpdateGraph().exclusiveLock().doLocked(rollupManager::release);
-    //
-    // // we should not be able to retainReference the rollup, because closing the scope should have decremented it to
-    // // zero
-    // Assert.assertFalse(rollup.tryRetainReference());
-    //
-    // // we should not be able to retainReference the tablemap, because closing the scope should have decremented it
-    // // to zero
-    // Assert.assertFalse(rootMap.tryRetainReference());
-    //
-    // Assert.assertFalse(nextLevel.tryRetainReference());
-    // }
-    //
-    // public void testTreeTableScope() {
-    // final Random random = new Random(0);
-    //
-    // final int size = 10;
-    // final QueryTable table = getTable(size, random,
-    // initColumnInfos(new String[] {"USym", "Group", "IntCol", "DoubleCol", "ParentCol"},
-    // new SetGenerator<>("AAPL", "TSLA", "VXX", "SPY"),
-    // new SetGenerator<>("Terran", "Vulcan", "Klingon", "Romulan"),
-    // new IntGenerator(1, 1_000_000),
-    // new DoubleGenerator(-100, 100),
-    // new IntGenerator(0, 0, 1.0)));
-    //
-    // final SafeCloseable scopeCloseable = LivenessScopeStack.open();
-    //
-    // final Table promoted = TreeTable.promoteOrphans(table, "IntCol", "ParentCol");
-    // final Table treed = promoted.tree("IntCol", "ParentCol");
-    //
-    // final SingletonLivenessManager treeManager = new SingletonLivenessManager(treed);
-    //
-    // ExecutionContext.getContext().getUpdateGraph().exclusiveLock().doLocked(scopeCloseable::close);
-    //
-    // Assert.assertTrue(treed.tryRetainReference());
-    // Assert.assertTrue(promoted.tryRetainReference());
-    // treed.dropReference();
-    // promoted.dropReference();
-    //
-    // System.gc();
-    //
-    // assertTableEquals(table, treed);
-    //
-    // ExecutionContext.getContext().getUpdateGraph().<ControlledUpdateGraph>cast().runWithinUnitTestCycle(() -> {
-    // final long key = table.getRowSet().firstRowKey();
-    // table.getRowSet().writableCast().remove(key);
-    // removeRows(table, i(key));
-    // table.notifyListeners(i(), i(key), i());
-    // });
-    //
-    // assertTableEquals(table, treed);
-    //
-    // ExecutionContext.getContext().getUpdateGraph().exclusiveLock().doLocked(treeManager::release);
-    //
-    // // we should not be able to retainReference the tree table, because closing the scope should have decremented it
-    // // to zero
-    // Assert.assertFalse(treed.tryRetainReference());
-    // Assert.assertFalse(promoted.tryRetainReference());
-    // }
-    //
-    // public void testRollupScope2() {
-    // final QueryTable table = testRefreshingTable(i().toTracking(),
-    // col("USym", CollectionUtil.ZERO_LENGTH_STRING_ARRAY),
-    // col("Group", CollectionUtil.ZERO_LENGTH_STRING_ARRAY),
-    // intCol("IntCol"), doubleCol("DoubleCol"));
-    //
-    // final SafeCloseable scopeCloseable = LivenessScopeStack.open();
-    //
-    // final Table rollup = ExecutionContext.getContext().getUpdateGraph().exclusiveLock()
-    // .computeLocked(() -> table.rollup(List.of(AggSum("IntCol", "DoubleCol")), "USym", "Group"));
-    // final TableMap rootMap = (TableMap) rollup.getAttribute(Table.HIERARCHICAL_CHILDREN_TABLE_MAP_ATTRIBUTE);
-    //
-    // final SingletonLivenessManager rollupManager = new SingletonLivenessManager(rollup);
-    //
-    // ExecutionContext.getContext().getUpdateGraph().exclusiveLock().doLocked(scopeCloseable::close);
-    //
-    // // dumpRollup(rollup, getHierarchicalColumnName(rollup), "USym", "Group");
-    //
-    // Assert.assertTrue(rollup.tryRetainReference());
-    // Assert.assertTrue(rootMap.tryRetainReference());
-    //
-    // rollup.dropReference();
-    // rootMap.dropReference();
-    //
-    // ExecutionContext.getContext().getUpdateGraph().<ControlledUpdateGraph>cast().startCycleForUnitTests();
-    // addToTable(table, i(0, 1), col("USym", "AAPL", "TSLA"), col("Group", "Terran", "Vulcan"),
-    // intCol("IntCol", 1, 2), doubleCol("DoubleCol", .1, .2));
-    // table.notifyListeners(i(0, 1), i(), i());
-    // ExecutionContext.getContext().getUpdateGraph().<ControlledUpdateGraph>cast().completeCycleForUnitTests();
-    //
-    // final SafeCloseable getScope = LivenessScopeStack.open();
-    // final Table nextLevel = rootMap.get(SmartKey.EMPTY);
-    // assertNotNull(nextLevel);
-    //
-    // Assert.assertTrue(rollup.tryRetainReference());
-    // Assert.assertTrue(rootMap.tryRetainReference());
-    // Assert.assertTrue(nextLevel.tryRetainReference());
-    //
-    // rollup.dropReference();
-    // rootMap.dropReference();
-    // nextLevel.dropReference();
-    //
-    // ExecutionContext.getContext().getUpdateGraph().exclusiveLock().doLocked(getScope::close);
-    // ExecutionContext.getContext().getUpdateGraph().exclusiveLock().doLocked(rollupManager::release);
-    //
-    // // we should not be able to retainReference the rollup, because closing the scope should have decremented it to
-    // // zero
-    // Assert.assertFalse(rollup.tryRetainReference());
-    //
-    // // we should not be able to retainReference the tablemap, because closing the scope should have decremented it
-    // // to zero
-    // Assert.assertFalse(rootMap.tryRetainReference());
-    //
-    // Assert.assertFalse(nextLevel.tryRetainReference());
-    // }
-    //
-    // public void testNullTypes() {
-    // final Random random = new Random(0);
-    //
-    // final int size = 10;
-    // final QueryTable table = getTable(size, random,
-    // initColumnInfos(new String[] {"USym", "Group", "IntCol", "DoubleCol", "StringCol"},
-    // new SetGenerator<>("AAPL", "TSLA", "VXX", "SPY"),
-    // new SetGenerator<>("Terran", "Vulcan", "Klingon", "Romulan"),
-    // new IntGenerator(0, 1_000_000),
-    // new DoubleGenerator(-100, 100),
-    // new SetGenerator<>("A", "B", "C", "D")));
-    //
-    // final Table rollup = ExecutionContext.getContext().getUpdateGraph().exclusiveLock().computeLocked(
-    // () -> table.rollup(List.of(AggSum("DoubleCol"), AggFirst("StringCol")), "USym", "Group", "IntCol"));
-    // TestCase.assertEquals(String.class, rollup.getColumnSource("USym").getType());
-    // TestCase.assertEquals(String.class, rollup.getColumnSource("Group").getType());
-    // TestCase.assertEquals(int.class, rollup.getColumnSource("IntCol").getType());
-    // }
-    //
-    // public void testSumIncrementalSimple() {
-    // testIncrementalSimple(AggSum("IntCol"));
-    // }
-    //
-    // public void testAvgIncrementalSimple() {
-    // testIncrementalSimple(AggAvg("IntCol"));
-    // }
-    //
-    // public void testStdIncrementalSimple() {
-    // testIncrementalSimple(AggStd("IntCol"));
-    // }
-    //
-    // public void testVarIncrementalSimple() {
-    // testIncrementalSimple(AggVar("IntCol"));
-    // }
-    //
-    // public void testRollupCountDistinctIncremental() {
-    // testIncrementalSimple(AggCountDistinct("IntCol"));
-    // testIncrementalSimple(AggCountDistinct(true, "IntCol"));
-    // }
-    //
-    // public void testRollupDistinctIncremental() {
-    // testIncrementalSimple(AggDistinct("IntCol"));
-    // testIncrementalSimple(AggDistinct(true, "IntCol"));
-    // }
-    //
-    // public void testRollupUniqueIncremental() {
-    // testIncrementalSimple(AggUnique("IntCol"));
-    // testIncrementalSimple(AggUnique(true, Sentinel(), "IntCol"));
-    // // TODO (https://github.com/deephaven/deephaven-core/issues/991): Re-enable these sub-tests
-    // // testIncrementalSimple(AggUnique(false, -1, -2, "IntCol"));
-    // // testIncrementalSimple(AggUnique(true, -1, -2, "IntCol"));
-    // }
-    //
-    // private void testIncrementalSimple(Aggregation aggregation) {
-    // final QueryTable table =
-    // testRefreshingTable(RowSetFactory.flat(6).toTracking(),
-    // col("G1", "A", "A", "A", "B", "B", "B"),
-    // col("G2", "C", "C", "D", "D", "E", "E"),
-    // col("IntCol", 1, 2, 3, 4, 5, 6));
-    //
-    // final Table rollup = ExecutionContext.getContext().getUpdateGraph().exclusiveLock()
-    // .computeLocked(() -> table.rollup(List.of(aggregation), "G1", "G2"));
-    //
-    // dumpRollup(rollup, "G1", "G2");
-    //
-    // final Table fullBy =
-    // ExecutionContext.getContext().getUpdateGraph().exclusiveLock().computeLocked(() ->
-    // table.aggBy(List.of(aggregation)));
-    //
-    // final Table rollupClean = getDiffableTable(rollup).view("IntCol");
-    //
-    // final String diff = TableTools.diff(fullBy, rollupClean, 10, EnumSet.of(TableDiff.DiffItems.DoublesExact));
-    //
-    // assertEquals("", diff);
-    //
-    // ExecutionContext.getContext().getUpdateGraph().<ControlledUpdateGraph>cast().startCycleForUnitTests();
-    // removeRows(table, i(2));
-    // table.notifyListeners(i(), i(2), i());
-    // ExecutionContext.getContext().getUpdateGraph().<ControlledUpdateGraph>cast().completeCycleForUnitTests();
-    //
-    // System.out.println("Removed Row 2, Rollup:");
-    // dumpRollup(rollup, "G1", "G2");
-    // System.out.println("Expected:");
-    // TableTools.showWithRowSet(fullBy);
-    //
-    // final String diff2 = TableTools.diff(fullBy, rollupClean, 10, EnumSet.of(TableDiff.DiffItems.DoublesExact));
-    // assertEquals("", diff2);
-    //
-    // ExecutionContext.getContext().getUpdateGraph().<ControlledUpdateGraph>cast().startCycleForUnitTests();
-    // removeRows(table, i(0, 1));
-    // table.notifyListeners(i(), i(0, 1), i());
-    // ExecutionContext.getContext().getUpdateGraph().<ControlledUpdateGraph>cast().completeCycleForUnitTests();
-    //
-    // dumpRollup(rollup, "G1", "G2");
-    //
-    // final String diff3 = TableTools.diff(fullBy, rollupClean, 10, EnumSet.of(TableDiff.DiffItems.DoublesExact));
-    // assertEquals("", diff3);
-    // }
-    //
-    // public void testDuplicateAgg() {
-    // final Table simpleTable = TableTools.emptyTable(10).update(
-    // "MyString=new String(`a`+i)",
-    // "MyInt=new Integer(i)",
-    // "MyLong=new Long(i)",
-    // "MyDouble=new Double(i+i/10)",
-    // "MyFloat=new Float(i+i/10)",
-    // "MyBoolean=new Boolean(i%2==0)",
-    // "MyChar= new Character((char) ((i%26)+97))",
-    // "MyShort=new Short(Integer.toString(i%32767))",
-    // "MyByte= new java.lang.Byte(Integer.toString(i%127))");
-    //
-    //
-    // try {
-    // simpleTable.rollup(List.of(AggCount("MyString"), AggMin("MyString")), "MyDouble");
-    // TestCase.fail("No exception generated with duplicate output column names.");
-    // } catch (IllegalArgumentException iae) {
-    // assertEquals("Duplicate output columns found: MyString used 2 times", iae.getMessage());
-    // }
-    // }
-    //
-    // public void testRollupIncremental() {
-    // for (int seed = 0; seed < 1; ++seed) {
-    // System.out.println("Seed = " + seed);
-    // testRollupIncremental(seed);
-    // }
-    // }
-    //
-    // private void testRollupIncremental(int seed) {
-    // final Random random = new Random(seed);
-    // final ColumnInfo[] columnInfo;
-    //
-    // final int size = 100;
-    // final QueryTable table = getTable(size, random, columnInfo = initColumnInfos(new String[] {
-    // "USym", "Group", "IntCol", "DoubleCol", "StringCol", "StringNulls", "BoolCol", "Instant",
-    // "IntSet", "LongSet", "DoubleSet", "FloatSet", "CharSet", "ShortSet", "ByteSet"},
-    //
-    // new SetGenerator<>("AAPL", "TSLA", "VXX", "SPY"),
-    // new SetGenerator<>("Terran", "Vulcan", "Klingon", "Romulan"),
-    // new IntGenerator(0, 1_000_000),
-    // new DoubleGenerator(-100, 100),
-    // new SetGenerator<>("A", "B", "C", "D"),
-    // new SetGenerator<>("A", "B", "C", "D", null),
-    // new BooleanGenerator(.5, .1),
-    // new UnsortedInstantGenerator(DateTimeUtils.parseInstant("2020-03-17T09:30:00 NY"),
-    // DateTimeUtils.parseInstant("2020-03-17T16:00:00 NY")),
-    // new SetGenerator<>(0, 1, 2, 3, 4, 5, NULL_INT),
-    // new SetGenerator<>(0L, 1L, 2L, 3L, 4L, 5L, NULL_LONG),
-    // new SetGenerator<>(0.0D, 1.1D, 2.2D, 3.3D, 4.4D, 5.5D, NULL_DOUBLE),
-    // new SetGenerator<>(0.0f, 1.1f, 2.2f, 3.3f, 4.4f, 5.5f, NULL_FLOAT),
-    // new SetGenerator<>('a', 'b', 'c', 'd', 'e', NULL_CHAR),
-    // new SetGenerator<>((short) 0, (short) 1, (short) 2, (short) 3, (short) 4, (short) 5,
-    // NULL_SHORT),
-    // new SetGenerator<>((byte) 0, (byte) 1, (byte) 2, (byte) 3, (byte) 4, (byte) 5, NULL_BYTE)));
-    //
-    // final Collection<? extends Aggregation> rollupDefinition = List.of(
-    // AggSum("IntCol", "DoubleCol"),
-    // AggMin("MinInt=IntCol", "MinDT=Instant"),
-    // AggMax("MaxDouble=DoubleCol", "MaxDT=Instant"),
-    // AggAvg("IntAvg=IntCol", "DoubleAvg=DoubleCol"),
-    // AggStd("IntStd=IntCol", "DoubleStd=DoubleCol"),
-    // AggVar("IntVar=IntCol", "DoubleVar=DoubleCol"),
-    // AggFirst("IntFirst=IntCol", "DoubleFirst=DoubleCol"),
-    // AggLast("IntLast=IntCol", "DoubleLast=DoubleCol"),
-    // AggCount("Count"),
-    // AggCountDistinct("SCDistinct=StringCol", "CDBoolCol=BoolCol", "DTCDistinct=Instant",
-    // "CDIntCol=IntSet", "CDLongCol=LongSet", "CDDoubleCol=DoubleSet",
-    // "CDFloatCol=FloatSet", "CDCharCol=CharSet", "CDShortCol=ShortSet", "CDByteCol=ByteSet"),
-    // AggDistinct("SDistinct=StringCol", "DistinctBoolCol=BoolCol", "DTDistinct=Instant",
-    // "DIntCol=IntSet", "DLongCol=LongSet", "DDoubleCol=DoubleSet",
-    // "DFloatCol=FloatSet", "DCharCol=CharSet", "DShortCol=ShortSet", "DByteCol=ByteSet"),
-    // AggUnique("SUnique=StringCol", "UniqueBoolCol=BoolCol",
-    // "UIntCol=IntSet", "ULongCol=LongSet", "UDoubleCol=DoubleSet",
-    // "UFloatCol=FloatSet", "UCharCol=CharSet", "UShortCol=ShortSet", "UByteCol=ByteSet"),
-    // AggCountDistinct(true, "SCDistinctN=StringNulls", "CDBoolColN=BoolCol",
-    // "CDNIntCol=IntSet", "CDNLongCol=LongSet", "CDNDoubleCol=DoubleSet",
-    // "CDNFloatCol=FloatSet", "CDNCharCol=CharSet", "CDNShortCol=ShortSet", "CDNByteCol=ByteSet"),
-    // AggDistinct(true, "SDistinctN=StringNulls", "DistinctBoolColN=BoolCol",
-    // "DNIntCol=IntSet", "DNLongCol=LongSet", "DNDoubleCol=DoubleSet",
-    // "DNFloatCol=FloatSet", "DNCharCol=CharSet", "DNShortCol=ShortSet", "DNByteCol=ByteSet"),
-    // AggUnique(true, Sentinel(), "SUniqueN=StringNulls", "UniqueBoolColN=BoolCol",
-    // "UNIntCol=IntSet", "UNLongCol=LongSet", "UNDoubleCol=DoubleSet",
-    // "UNFloatCol=FloatSet", "UNCharCol=CharSet", "UNShortCol=ShortSet", "UNByteCol=ByteSet"));
-    // final EvalNuggetInterface[] en = new EvalNuggetInterface[] {
-    // new EvalNuggetInterface() {
-    // @Override
-    // public void validate(String msg) {}
-    //
-    // @Override
-    // public void show() {
-    // System.out.println("Table:");
-    // TableTools.showWithRowSet(table);
-    // }
-    // },
-    // new RollupEvalNugget(3, "USym", "Group") {
-    // @Override
-    // protected Table e() {
-    // return ExecutionContext.getContext().getUpdateGraph().exclusiveLock()
-    // .computeLocked(() -> table.rollup(rollupDefinition, "USym", "Group"));
-    // }
-    //
-    // @Override
-    // void showResult(String label, Table e) {
-    // System.out.println(label);
-    // dumpRollup(e, "USym", "Group");
-    // }
-    // },
-    // new TableComparator(
-    // getDiffableTable(table.rollup(rollupDefinition)).dropColumns(RollupInfo.ROLLUP_COLUMN),
-    // table.aggBy(rollupDefinition))
-    // };
-    //
-    // for (int step = 0; step < 100; step++) {
-    // if (printTableUpdates) {
-    // System.out.println("Step = " + step);
-    // }
-    // simulateShiftAwareStep(size, random, table, columnInfo, en);
-    // }
-    // }
-    //
-    // @ReflexiveUse(referrers = "QueryTableTreeTest")
-    // static public SmartKey getPrefix(String id, String pos) {
-    // if (pos == null || pos.isEmpty()) {
-    // return null;
-    // }
-    //
-    // final int liof = pos.lastIndexOf(".");
-    // if (liof < 0) {
-    // return null;
-    // }
-    //
-    // return new io.deephaven.datastructures.util.SmartKey(id, pos.substring(0, liof));
-    // }
-    //
-    // public void testOrderTreeTable() {
-    // final Random random = new Random(0);
-    //
-    // int maxLevel = 1;
-    //
-    // int nextHid = 11;
-    // long index = 2;
-    //
-    // final QueryTable source = testRefreshingTable(RowSetFactory.flat(1).toTracking(),
-    // longCol("Sentinel", 1), stringCol("hid", "a"), stringCol("hpos", "1"),
-    // col("open", true), doubleCol("rand", 1.0));
-    //
-    // final List<String> openHid = new ArrayList<>();
-    // openHid.add("a");
-    // final Map<String, List<String>> hidToPos = new HashMap<>();
-    // hidToPos.put("a", new ArrayList<>(Collections.singletonList("1")));
-    //
-    //
-    // final Table orders = source
-    // .lastBy("hpos", "hid")
-    // .where("open")
-    // .update("treeid=new io.deephaven.datastructures.util.SmartKey(hid, hpos)",
-    // "parent=io.deephaven.engine.table.impl.QueryTableTreeTest.getPrefix(hid, hpos)");
-    //
-    // final Table ordersTree = orders.tree("treeid", "parent");
-    // final Table ordersFiltered = TreeTableFilter.filterTree(ordersTree, "rand > 0.8");
-    // final Table ordersFiltered2 = TreeTableFilter.filterTree(ordersTree, "rand > 0.1");
-    //
-    // for (int step = 0; step < 100; ++step) {
-    // System.out.println("step = " + step);
-    // ExecutionContext.getContext().getUpdateGraph().<ControlledUpdateGraph>cast().startCycleForUnitTests();
-    //
-    // final int numChanges = random.nextInt(100);
-    // final RowSetBuilderSequential builder = RowSetFactory.builderSequential();
-    //
-    // for (int count = 0; count < numChanges; ++count) {
-    // assertEquals(openHid.size(), hidToPos.size());
-    //
-    // final double which = random.nextDouble();
-    // if (which < 0.3 || openHid.isEmpty()) {
-    // // add an order
-    // final String hid;
-    // if (openHid.isEmpty() || random.nextDouble() < 0.3) {
-    // // new hid
-    // hid = Integer.toHexString(nextHid++);
-    // openHid.add(hid);
-    // } else {
-    // // existing hid
-    // hid = openHid.get(random.nextInt(openHid.size()));
-    // }
-    //
-    // final List<String> hpos = hidToPos.computeIfAbsent(hid, (key) -> new ArrayList<>());
-    // final String newHpos;
-    // if (hpos.isEmpty()) {
-    // // newHpos = random.nextBoolean() ? "1" : "1.1";
-    // newHpos = "1";
-    // } else {
-    // final String parentHpos = hpos.get(random.nextInt(hpos.size()));
-    // final int next = hpos.stream().filter(s -> s.startsWith(parentHpos + "."))
-    // .map(s -> s.substring(parentHpos.length() + 1).split("\\.")[0])
-    // .mapToInt(Integer::parseInt).max().orElse(0) + 1;
-    // newHpos = parentHpos + "." + next;
-    // maxLevel = Math.max(maxLevel, 1 + StringUtils.countMatches(newHpos, "."));
-    // }
-    // hpos.add(newHpos);
-    //
-    // final long newIndex = ++index;
-    // addToTable(source, i(newIndex), longCol("Sentinel", newIndex), col("hid", hid),
-    // col("hpos", newHpos), col("open", true), col("rand", random.nextDouble()));
-    // builder.appendKey(newIndex);
-    // } else if (which < 0.1) {
-    // // close an order
-    // final String hid = openHid.get(random.nextInt(openHid.size()));
-    // final List<String> validHpos = hidToPos.get(hid);
-    // final String hpos = validHpos.get(random.nextInt(validHpos.size()));
-    // validHpos.remove(hpos);
-    // if (validHpos.isEmpty()) {
-    // openHid.remove(hid);
-    // hidToPos.remove(hid);
-    // }
-    //
-    // final long newIndex = ++index;
-    // addToTable(source, i(newIndex), longCol("Sentinel", newIndex), col("hid", hid), col("hpos", hpos),
-    // col("open", false), col("rand", random.nextDouble()));
-    // builder.appendKey(newIndex);
-    // } else {
-    // // modify an order
-    // final String hid = openHid.get(random.nextInt(openHid.size()));
-    // final List<String> validHpos = hidToPos.get(hid);
-    // if (validHpos.isEmpty()) {
-    // System.out.println(validHpos.size());
-    // throw new IllegalStateException();
-    // }
-    // final String hpos = validHpos.get(random.nextInt(validHpos.size()));
-    //
-    // final long newIndex = ++index;
-    // addToTable(source, i(newIndex), longCol("Sentinel", newIndex), col("hid", hid), col("hpos", hpos),
-    // col("open", true), col("rand", random.nextDouble()));
-    // builder.appendKey(newIndex);
-    // }
-    //
-    // assertEquals(openHid.size(), hidToPos.size());
-    // }
-    //
-    // final RowSet newRowSet = builder.build();
-    // source.notifyListeners(newRowSet, i(), i());
-    //
-    // // TableTools.showWithRowSet(source.getSubTable(newRowSet));
-    //
-    // ExecutionContext.getContext().getUpdateGraph().<ControlledUpdateGraph>cast().completeCycleForUnitTests();
-    //
-    // final String hierarchicalColumnName = getHierarchicalColumnName(ordersFiltered);
-    // doCompareWithChildrenForTrees("step = " + step, ordersFiltered,
-    // TreeTableFilter.filterTree(ordersTree, "rand > 0.8"), 0, maxLevel, hierarchicalColumnName,
-    // CollectionUtil.ZERO_LENGTH_STRING_ARRAY);
-    // doCompareWithChildrenForTrees("step = " + step, ordersFiltered2,
-    // TreeTableFilter.filterTree(ordersTree, "rand > 0.1"), 0, maxLevel, hierarchicalColumnName,
-    // CollectionUtil.ZERO_LENGTH_STRING_ARRAY);
-    // }
-    // }
-    //
-    // public void testIds6262() {
-    // final QueryTable table = testRefreshingTable(i(1).toTracking(),
-    // col("Sym", "A"), col("BigI", new BigInteger[] {null}), col("BigD", new BigDecimal[] {null}));
-    //
-    // final Table rollup = table.rollup(List.of(AggVar("BigI", "BigD")), "Sym");
-    //
-    // dumpRollup(rollup, getHierarchicalColumnName(rollup), "Sym");
-    //
-    // assertNull(rollup.getColumn("BigI").get(0));
-    // assertNull(rollup.getColumn("BigD").get(0));
-    //
-    // ExecutionContext.getContext().getUpdateGraph().<ControlledUpdateGraph>cast().runWithinUnitTestCycle(() -> {
-    // addToTable(table, i(2, 3), col("Sym", "A", "A"), col("BigI", BigInteger.ZERO, BigInteger.ZERO),
-    // col("BigD", BigDecimal.ZERO, BigDecimal.ZERO));
-    // table.notifyListeners(i(2, 3), i(), i());
-    // });
-    //
-    // dumpRollup(rollup, getHierarchicalColumnName(rollup), "Sym");
-    //
-    // assertEquals(BigDecimal.ZERO, rollup.getColumn("BigI").get(0));
-    // assertEquals(BigDecimal.ZERO, rollup.getColumn("BigD").get(0));
-    // }
-    //
-    // public void testIds7773() {
-    // final QueryTable dataTable = testRefreshingTable(
-    // stringCol("USym", "A"),
-    // doubleCol("Value", NULL_DOUBLE),
-    // byteCol("BValue", NULL_BYTE),
-    // shortCol("SValue", NULL_SHORT),
-    // intCol("IValue", NULL_INT),
-    // longCol("LValue", NULL_LONG),
-    // floatCol("FValue", NULL_FLOAT));
-    //
-    // final Table rolledUp =
-    // dataTable.rollup(List.of(AggAvg("Value", "BValue", "SValue", "IValue", "LValue", "FValue")), "USym");
-    // final TableMap rollupMap = (TableMap) rolledUp.getAttribute(Table.HIERARCHICAL_CHILDREN_TABLE_MAP_ATTRIBUTE);
-    // assertNotNull(rollupMap);
-    //
-    // final Table aTable = rollupMap.get(SmartKey.EMPTY);
-    // assertNotNull(aTable);
-    //
-    // // Start with Nulls and make sure we get NaN
-    // ExecutionContext.getContext().getUpdateGraph().<ControlledUpdateGraph>cast().runWithinUnitTestCycle(() -> {
-    // addToTable(dataTable, i(1, 2),
-    // stringCol("USym", "A", "A"),
-    // doubleCol("Value", NULL_DOUBLE, NULL_DOUBLE),
-    // byteCol("BValue", NULL_BYTE, NULL_BYTE),
-    // shortCol("SValue", NULL_SHORT, NULL_SHORT),
-    // intCol("IValue", NULL_INT, NULL_INT),
-    // longCol("LValue", NULL_LONG, NULL_LONG),
-    // floatCol("FValue", NULL_FLOAT, NULL_FLOAT));
-    //
-    // dataTable.notifyListeners(i(1, 2), i(), i());
-    // });
-    //
-    // assertEquals(Double.NaN, rolledUp.getColumn("Value").getDouble(0));
-    // assertEquals(Double.NaN, rolledUp.getColumn("FValue").getDouble(0));
-    // assertEquals(NULL_DOUBLE, rolledUp.getColumn("BValue").getDouble(0));
-    // assertEquals(NULL_DOUBLE, rolledUp.getColumn("SValue").getDouble(0));
-    // assertEquals(NULL_DOUBLE, rolledUp.getColumn("IValue").getDouble(0));
-    // assertEquals(NULL_DOUBLE, rolledUp.getColumn("LValue").getDouble(0));
-    //
-    // assertEquals(Double.NaN, aTable.getColumn("Value").getDouble(0));
-    // assertEquals(Double.NaN, aTable.getColumn("FValue").getDouble(0));
-    // assertEquals(Double.NaN, aTable.getColumn("BValue").getDouble(0));
-    // assertEquals(Double.NaN, aTable.getColumn("SValue").getDouble(0));
-    // assertEquals(Double.NaN, aTable.getColumn("IValue").getDouble(0));
-    // assertEquals(Double.NaN, aTable.getColumn("LValue").getDouble(0));
-    //
-    // // Add a real value 0, which used to be broken because the default value was 0 and resulted in a no change
-    // ExecutionContext.getContext().getUpdateGraph().<ControlledUpdateGraph>cast().runWithinUnitTestCycle(() -> {
-    // addToTable(dataTable, i(3),
-    // stringCol("USym", "A"),
-    // doubleCol("Value", 0.0d),
-    // byteCol("BValue", (byte) 0),
-    // shortCol("SValue", (short) 0),
-    // intCol("IValue", 0),
-    // longCol("LValue", 0),
-    // floatCol("FValue", 0.0f));
-    //
-    // dataTable.notifyListeners(i(3), i(), i());
-    // });
-    //
-    // assertEquals(0.0d, rolledUp.getColumn("Value").getDouble(0));
-    // assertEquals(0.0d, rolledUp.getColumn("FValue").getDouble(0));
-    // assertEquals(0.0d, rolledUp.getColumn("BValue").getDouble(0));
-    // assertEquals(0.0d, rolledUp.getColumn("SValue").getDouble(0));
-    // assertEquals(0.0d, rolledUp.getColumn("IValue").getDouble(0));
-    // assertEquals(0.0d, rolledUp.getColumn("LValue").getDouble(0));
-    //
-    // assertEquals(0.0d, aTable.getColumn("Value").getDouble(0));
-    // assertEquals(0.0d, aTable.getColumn("FValue").getDouble(0));
-    // assertEquals(0.0d, aTable.getColumn("BValue").getDouble(0));
-    // assertEquals(0.0d, aTable.getColumn("SValue").getDouble(0));
-    // assertEquals(0.0d, aTable.getColumn("IValue").getDouble(0));
-    // assertEquals(0.0d, aTable.getColumn("LValue").getDouble(0));
-    //
-    // // Delete the real value to make sure we go back to NaN
-    // ExecutionContext.getContext().getUpdateGraph().<ControlledUpdateGraph>cast().runWithinUnitTestCycle(() -> {
-    // removeRows(dataTable, i(3));
-    //
-    // dataTable.notifyListeners(i(), i(3), i());
-    // });
-    //
-    // assertEquals(Double.NaN, rolledUp.getColumn("Value").getDouble(0));
-    // assertEquals(Double.NaN, rolledUp.getColumn("FValue").getDouble(0));
-    // assertEquals(Double.NaN, rolledUp.getColumn("BValue").getDouble(0));
-    // assertEquals(Double.NaN, rolledUp.getColumn("SValue").getDouble(0));
-    // assertEquals(Double.NaN, rolledUp.getColumn("IValue").getDouble(0));
-    // assertEquals(Double.NaN, rolledUp.getColumn("LValue").getDouble(0));
-    //
-    // assertEquals(Double.NaN, aTable.getColumn("Value").getDouble(0));
-    // assertEquals(Double.NaN, aTable.getColumn("FValue").getDouble(0));
-    // assertEquals(Double.NaN, aTable.getColumn("BValue").getDouble(0));
-    // assertEquals(Double.NaN, aTable.getColumn("SValue").getDouble(0));
-    // assertEquals(Double.NaN, aTable.getColumn("IValue").getDouble(0));
-    // assertEquals(Double.NaN, aTable.getColumn("LValue").getDouble(0));
-    //
-    // // Add a couple of real 0's and make sure we get a 0
-    // ExecutionContext.getContext().getUpdateGraph().<ControlledUpdateGraph>cast().runWithinUnitTestCycle(() -> {
-    // addToTable(dataTable, i(3, 4, 5),
-    // stringCol("USym", "A", "A", "A"),
-    // doubleCol("Value", 0.0d, 0.0d, 0.0d),
-    // byteCol("BValue", (byte) 0, (byte) 0, (byte) 0),
-    // shortCol("SValue", (short) 0, (short) 0, (short) 0),
-    // intCol("IValue", 0, 0, 0),
-    // longCol("LValue", 0, 0, 0),
-    // floatCol("FValue", 0.0f, 0.0f, 0.0f));
-    //
-    // dataTable.notifyListeners(i(3, 4, 5), i(), i());
-    // });
-    //
-    // assertEquals(0.0d, rolledUp.getColumn("Value").getDouble(0));
-    // assertEquals(0.0d, rolledUp.getColumn("FValue").getDouble(0));
-    // assertEquals(0.0d, rolledUp.getColumn("BValue").getDouble(0));
-    // assertEquals(0.0d, rolledUp.getColumn("SValue").getDouble(0));
-    // assertEquals(0.0d, rolledUp.getColumn("IValue").getDouble(0));
-    // assertEquals(0.0d, rolledUp.getColumn("LValue").getDouble(0));
-    //
-    // assertEquals(0.0d, aTable.getColumn("Value").getDouble(0));
-    // assertEquals(0.0d, aTable.getColumn("FValue").getDouble(0));
-    // assertEquals(0.0d, aTable.getColumn("BValue").getDouble(0));
-    // assertEquals(0.0d, aTable.getColumn("SValue").getDouble(0));
-    // assertEquals(0.0d, aTable.getColumn("IValue").getDouble(0));
-    // assertEquals(0.0d, aTable.getColumn("LValue").getDouble(0));
-    //
-    // ExecutionContext.getContext().getUpdateGraph().<ControlledUpdateGraph>cast().runWithinUnitTestCycle(() -> {
-    // addToTable(dataTable, i(6),
-    // stringCol("USym", "A"),
-    // doubleCol("Value", 1.0d),
-    // byteCol("BValue", (byte) 1),
-    // shortCol("SValue", (short) 1),
-    // intCol("IValue", 1),
-    // longCol("LValue", 1),
-    // floatCol("FValue", 1.0f));
-    //
-    // dataTable.notifyListeners(i(6), i(), i());
-    // });
-    //
-    // assertEquals(0.25d, rolledUp.getColumn("Value").getDouble(0));
-    // assertEquals(0.25d, rolledUp.getColumn("FValue").getDouble(0));
-    // assertEquals(0.25d, rolledUp.getColumn("BValue").getDouble(0));
-    // assertEquals(0.25d, rolledUp.getColumn("SValue").getDouble(0));
-    // assertEquals(0.25d, rolledUp.getColumn("IValue").getDouble(0));
-    // assertEquals(0.25d, rolledUp.getColumn("LValue").getDouble(0));
-    //
-    // assertEquals(0.25d, aTable.getColumn("Value").getDouble(0));
-    // assertEquals(0.25d, aTable.getColumn("FValue").getDouble(0));
-    // assertEquals(0.25d, aTable.getColumn("BValue").getDouble(0));
-    // assertEquals(0.25d, aTable.getColumn("SValue").getDouble(0));
-    // assertEquals(0.25d, aTable.getColumn("IValue").getDouble(0));
-    // assertEquals(0.25d, aTable.getColumn("LValue").getDouble(0));
-    // }
-    //
-    // private static Table getDiffableTable(Table table) {
-    // if (table instanceof HierarchicalTable) {
-    // return ((HierarchicalTable) table).getRootTable();
-    // }
-    //
-    // return table;
-    // }
-    //
-    // public void testRollupStdSlotOutOfOrder() {
-    // final QueryTable source =
-    // testRefreshingTable(col("G1", "a", "b", "c", "d", "e", "f", "g", "A", "A", "B", "B", "A"),
-    // col("G2", "a", "a", "a", "a", "a", "a", "a", "a", "a", "a", "a", "a"),
-    // intCol("Val", 0, 0, 0, 0, 0, 0, 0, 1, 2, 3, 4, 5));
-    // final Table rollup = source.rollup(List.of(AggVar("Val")), "G1", "G2");
-    // checkVar(source, rollup);
-    //
-    // ExecutionContext.getContext().getUpdateGraph().<ControlledUpdateGraph>cast().runWithinUnitTestCycle(() -> {
-    // addToTable(source, i(9, 11), col("G1", "B", "A"), col("G2", "a", "a"), intCol("Val", 6, 7));
-    // final TableUpdate update =
-    // new TableUpdateImpl(i(), i(), i(9, 11), RowSetShiftData.EMPTY, source.newModifiedColumnSet("Val"));
-    // source.notifyListeners(update);
-    // });
-    // checkVar(source, rollup);
-    // }
-    //
-    // private void checkVar(QueryTable source, Table rollup) {
-    // System.out.println("Source:");
-    // TableTools.showWithRowSet(source, 20);
-    //
-    // System.out.println("Total variance");
-    // final Table totalExpect = source.view("Val").varBy();
-    // TableTools.show(totalExpect);
-    // System.out.println("A variance");
-    // final Table aExpect = source.view("G1", "Val").varBy("G1").where("G1 in `A`");
-    // TableTools.show(aExpect);
-    // System.out.println("B variance");
-    // final Table bExpect = source.view("G1", "Val").varBy("G1").where("G1 in `B`");
-    // TableTools.show(bExpect);
-    //
-    // dumpRollup(rollup, "G1", "G2");
-    //
-    // assertTableEquals(totalExpect, getDiffableTable(rollup).view("Val"));
-    //
-    // final Table rootTable =
-    // ((TableMap) rollup.getAttribute(Table.HIERARCHICAL_CHILDREN_TABLE_MAP_ATTRIBUTE)).get(new SmartKey());
-    //
-    // final Table a = ((TableMap) rootTable.getAttribute(Table.HIERARCHICAL_CHILDREN_TABLE_MAP_ATTRIBUTE)).get("A");
-    // final Table b = ((TableMap) rootTable.getAttribute(Table.HIERARCHICAL_CHILDREN_TABLE_MAP_ATTRIBUTE)).get("B");
-    //
-    // assertTableEquals(aExpect, a.view("G1", "Val"));
-    // assertTableEquals(bExpect, b.view("G1", "Val"));
-    // }
-}
diff --git a/engine/table/src/test/java/io/deephaven/engine/table/impl/QueryTableWhereParallelTest.java b/engine/table/src/test/java/io/deephaven/engine/table/impl/QueryTableWhereParallelTest.java
index 65b27a6b380..0659f11a139 100644
--- a/engine/table/src/test/java/io/deephaven/engine/table/impl/QueryTableWhereParallelTest.java
+++ b/engine/table/src/test/java/io/deephaven/engine/table/impl/QueryTableWhereParallelTest.java
@@ -5,12 +5,23 @@
 
 import gnu.trove.list.TLongList;
 import gnu.trove.list.array.TLongArrayList;
+import io.deephaven.engine.context.ExecutionContext;
 import io.deephaven.engine.rowset.RowSet;
+import io.deephaven.engine.rowset.RowSetFactory;
+import io.deephaven.engine.rowset.RowSetShiftData;
 import io.deephaven.engine.rowset.WritableRowSet;
+import io.deephaven.engine.table.ModifiedColumnSet;
 import io.deephaven.engine.table.Table;
 import io.deephaven.engine.table.TableDefinition;
+import io.deephaven.engine.table.TableUpdate;
 import io.deephaven.engine.table.impl.select.WhereFilter;
 import io.deephaven.engine.table.impl.select.WhereFilterImpl;
+import io.deephaven.engine.table.impl.sources.RowKeyColumnSource;
+import io.deephaven.engine.table.impl.sources.RowPositionColumnSource;
+import io.deephaven.engine.testutil.ControlledUpdateGraph;
+import io.deephaven.engine.testutil.EvalNugget;
+import io.deephaven.engine.testutil.EvalNuggetInterface;
+import io.deephaven.engine.testutil.TstUtils;
 import io.deephaven.engine.util.TableTools;
 import io.deephaven.test.types.OutOfBandTest;
 import org.jetbrains.annotations.NotNull;
@@ -21,6 +32,7 @@
 
 import java.util.Collections;
 import java.util.List;
+import java.util.Map;
 
 import static org.junit.Assert.assertEquals;
 
@@ -119,4 +131,40 @@ public WhereFilter copy() {
             QueryTable.PARALLEL_WHERE_ROWS_PER_SEGMENT = oldSize;
         }
     }
+
+    @Test
+    public void testParallelExecutionViaTableUpdate() {
+        final ControlledUpdateGraph updateGraph = ExecutionContext.getContext().getUpdateGraph().cast();
+
+        final long oldSize = QueryTable.PARALLEL_WHERE_ROWS_PER_SEGMENT;
+        try {
+            QueryTable.PARALLEL_WHERE_ROWS_PER_SEGMENT = 1_000;
+            final QueryTable table = TstUtils.testRefreshingTable(RowSetFactory.flat(1500).toTracking())
+                    .withAdditionalColumns(Map.of("K", new RowKeyColumnSource()));
+            table.setRefreshing(true);
+            table.setAttribute(BaseTable.TEST_SOURCE_TABLE_ATTRIBUTE, true);
+            final Table source = table.updateView("J = ii % 2 == 0 ? K : 0");
+
+            final EvalNuggetInterface[] en = new EvalNuggetInterface[] {
+                    EvalNugget.from(() -> source.where("K == J")),
+            };
+
+            updateGraph.runWithinUnitTestCycle(() -> {
+                final RowSet added = RowSetFactory.fromRange(1500, 2999);
+                final RowSet modified = RowSetFactory.fromRange(0, 1499);
+                table.getRowSet().writableCast().insert(added);
+
+                final TableUpdate upstream = new TableUpdateImpl(
+                        added, RowSetFactory.empty(), modified, RowSetShiftData.EMPTY, ModifiedColumnSet.ALL);
+
+                table.notifyListeners(upstream);
+            });
+
+            // Ensure the table is as expected.
+            TstUtils.validate(en);
+
+        } finally {
+            QueryTable.PARALLEL_WHERE_ROWS_PER_SEGMENT = oldSize;
+        }
+    }
 }
diff --git a/engine/table/src/test/java/io/deephaven/engine/table/impl/QueryTableWhereTest.java b/engine/table/src/test/java/io/deephaven/engine/table/impl/QueryTableWhereTest.java
index acfa9686b6f..de502b44ae6 100644
--- a/engine/table/src/test/java/io/deephaven/engine/table/impl/QueryTableWhereTest.java
+++ b/engine/table/src/test/java/io/deephaven/engine/table/impl/QueryTableWhereTest.java
@@ -6,9 +6,7 @@
 import io.deephaven.api.RawString;
 import io.deephaven.api.filter.Filter;
 import io.deephaven.base.verify.Assert;
-import io.deephaven.chunk.Chunk;
-import io.deephaven.chunk.LongChunk;
-import io.deephaven.chunk.WritableLongChunk;
+import io.deephaven.chunk.*;
 import io.deephaven.chunk.attributes.Values;
 import io.deephaven.engine.context.ExecutionContext;
 import io.deephaven.engine.context.QueryScope;
@@ -31,6 +29,7 @@
 import io.deephaven.engine.testutil.QueryTableTestBase.TableComparator;
 import io.deephaven.engine.testutil.generator.*;
 import io.deephaven.engine.testutil.junit4.EngineCleanup;
+import io.deephaven.engine.util.PrintListener;
 import io.deephaven.engine.util.TableTools;
 import io.deephaven.gui.table.filters.Condition;
 import io.deephaven.internal.log.LoggerFactory;
@@ -43,7 +42,6 @@
 import junit.framework.TestCase;
 import org.apache.commons.lang3.mutable.MutableBoolean;
 import org.apache.commons.lang3.mutable.MutableObject;
-import org.junit.Ignore;
 import org.junit.Rule;
 import org.junit.Test;
 
@@ -867,8 +865,10 @@ private TestChunkFilter(ChunkFilter actualFilter, long sleepDurationNanos) {
         }
 
         @Override
-        public void filter(Chunk<? extends Values> values, LongChunk<OrderedRowKeys> keys,
-                WritableLongChunk<OrderedRowKeys> results) {
+        public void filter(
+                final Chunk<? extends Values> values,
+                final LongChunk<OrderedRowKeys> keys,
+                final WritableLongChunk<OrderedRowKeys> results) {
             if (++invokes == 1) {
                 latch.countDown();
             }
@@ -883,6 +883,42 @@ public void filter(Chunk<? extends Values> values, LongChunk<OrderedRowKeys> key
             actualFilter.filter(values, keys, results);
         }
 
+        @Override
+        public int filter(
+                final Chunk<? extends Values> values,
+                final WritableBooleanChunk<Values> results) {
+            if (++invokes == 1) {
+                latch.countDown();
+            }
+            invokedValues += values.size();
+            if (sleepDurationNanos > 0) {
+                long nanos = sleepDurationNanos * values.size();
+                final long timeStart = System.nanoTime();
+                final long timeEnd = timeStart + nanos;
+                // noinspection StatementWithEmptyBody
+                while (System.nanoTime() < timeEnd);
+            }
+            return actualFilter.filter(values, results);
+        }
+
+        @Override
+        public int filterAnd(
+                final Chunk<? extends Values> values,
+                final WritableBooleanChunk<Values> results) {
+            if (++invokes == 1) {
+                latch.countDown();
+            }
+            invokedValues += values.size();
+            if (sleepDurationNanos > 0) {
+                long nanos = sleepDurationNanos * values.size();
+                final long timeStart = System.nanoTime();
+                final long timeEnd = timeStart + nanos;
+                // noinspection StatementWithEmptyBody
+                while (System.nanoTime() < timeEnd);
+            }
+            return actualFilter.filterAnd(values, results);
+        }
+
         void reset() {
             invokes = invokedValues = 0;
         }
@@ -1448,18 +1484,38 @@ public void testEnsureColumnsTakePrecedence() {
     }
 
     @Test
-    @Ignore
     public void testEnsureColumnArraysTakePrecedence() {
-        // TODO: column arrays aren't well supported in match arrays and this example's where filter fails to compile
-        final Table table = emptyTable(10).update("X=i", "Y=new int[]{1, 5, 9}");
-        ExecutionContext.getContext().getQueryScope().putParam("Y_", new int[] {0, 4, 8});
+        final Table table = emptyTable(10).update("X = i", "Y = ii == 1 ? 5 : -1");
+        ExecutionContext.getContext().getQueryScope().putParam("Y_", new int[] {0, 4, 0});
 
-        final Table result = table.where("X == Y_[1]");
-        Assert.equals(result.getRowSet(), "result.getRowSet()", RowSetFactory.fromKeys(5));
+        {
+            final Table result = table.where("X == Y_[1]");
+            Assert.equals(result.getRowSet(), "result.getRowSet()", RowSetFactory.fromKeys(5));
 
-        // check that the mirror matches the expected result
-        final Table mResult = table.where("Y_[1] == X");
-        assertTableEquals(result, mResult);
+            // check that the mirror matches the expected result
+            final Table mResult = table.where("Y_[1] == X");
+            assertTableEquals(result, mResult);
+        }
+
+        {
+            final Table result = table.where("X < Y_[1]");
+            Assert.equals(result.getRowSet(), "result.getRowSet()", RowSetFactory.flat(5));
+
+            // check that the mirror matches the expected result
+            final Table mResult = table.where("Y_[1] > X");
+            assertTableEquals(result, mResult);
+        }
+
+        // note that array access doesn't match the RangeFilter/MatchFilter regex, so let's try to override the
+        // array access with a type that would otherwise work.
+        ExecutionContext.getContext().getQueryScope().putParam("Y_", 4);
+        try {
+            table.where("X == Y_");
+            // noinspection ThrowableNotThrown
+            Assert.statementNeverExecuted();
+        } catch (IllegalArgumentException expected) {
+
+        }
     }
 
     @Test
@@ -1627,4 +1683,74 @@ public void testBigDecimalCoercion() {
         final Table bi_result = table.where("X >= bi_5");
         assertTableEquals(range_result, bi_result);
     }
+
+    @Test
+    public void testAddAndRemoveRefilter() {
+        final QueryTable source = testRefreshingTable(i(10, 20, 30).toTracking(), stringCol("FV", "A", "B", "C"),
+                intCol("Sentinel", 10, 20, 30));
+        final ControlledUpdateGraph updateGraph = ExecutionContext.getContext().getUpdateGraph().cast();
+
+        final QueryTable setTable = testRefreshingTable(i(10, 30).toTracking(), stringCol("FV", "A", "C"));
+
+        final Table result = source.whereIn(setTable, "FV");
+        final SimpleListener listener = new SimpleListener(result);
+        result.addUpdateListener(listener);
+
+        final PrintListener plResult = new PrintListener("testAddAndRemoveRefilter-result", result);
+        assertTableEquals(source.where("FV in `A`, `C`"), result);
+
+        updateGraph.runWithinUnitTestCycle(() -> {
+            TstUtils.addToTable(setTable, i(20), stringCol("FV", "B"));
+            TstUtils.removeRows(setTable, i(30));
+            setTable.notifyListeners(i(20), i(30), i());
+            TstUtils.addToTable(source, i(10), stringCol("FV", "A"), intCol("Sentinel", 40));
+            source.notifyListeners(i(10), i(10), i());
+        });
+
+        assertEquals(i(10, 20), listener.update.added());
+        assertEquals(i(10, 30), listener.update.removed());
+        assertEquals(i(), listener.update.modified());
+
+        assertTableEquals(source.where("FV in `A`, `B`"), result);
+    }
+
+    @Test
+    public void testWhereFilterEquality() {
+        final Table x = TableTools.newTable(intCol("A", 1, 2, 3), intCol("B", 4, 2, 1), stringCol("S", "A", "B", "C"));
+
+        final WhereFilter f1 = WhereFilterFactory.getExpression("A in 7");
+        final WhereFilter f2 = WhereFilterFactory.getExpression("A in 8");
+        final WhereFilter f3 = WhereFilterFactory.getExpression("A in 7");
+
+        final Table ignored = x.where(Filter.and(f1, f2, f3));
+
+        assertEquals(f1, f3);
+        assertNotEquals(f1, f2);
+        assertNotEquals(f2, f3);
+
+        final WhereFilter fa = WhereFilterFactory.getExpression("A in 7");
+        final WhereFilter fb = WhereFilterFactory.getExpression("B in 7");
+        final WhereFilter fap = WhereFilterFactory.getExpression("A not in 7");
+
+        final Table ignored2 = x.where(Filter.and(fa, fb, fap));
+
+        assertNotEquals(fa, fb);
+        assertNotEquals(fa, fap);
+        assertNotEquals(fb, fap);
+
+        final WhereFilter fs = WhereFilterFactory.getExpression("S icase in `A`");
+        final WhereFilter fs2 = WhereFilterFactory.getExpression("S icase in `A`, `B`, `C`");
+        final WhereFilter fs3 = WhereFilterFactory.getExpression("S icase in `A`, `B`, `C`");
+        final Table ignored3 = x.where(Filter.and(fs, fs2, fs3));
+        assertNotEquals(fs, fs2);
+        assertNotEquals(fs, fs3);
+        assertEquals(fs2, fs3);
+
+        final WhereFilter fof1 = WhereFilterFactory.getExpression("A = B");
+        final WhereFilter fof2 = WhereFilterFactory.getExpression("A = B");
+        final Table ignored4 = x.where(fof1);
+        final Table ignored5 = x.where(fof2);
+        // the ConditionFilters do not compare as equal, so this is unfortunate, but expected behavior
+        assertNotEquals(fof1, fof2);
+    }
 }
diff --git a/engine/table/src/test/java/io/deephaven/engine/table/impl/SelectOverheadLimiter.java b/engine/table/src/test/java/io/deephaven/engine/table/impl/SelectOverheadLimiter.java
index f2a6ce18894..a2df031e96d 100644
--- a/engine/table/src/test/java/io/deephaven/engine/table/impl/SelectOverheadLimiter.java
+++ b/engine/table/src/test/java/io/deephaven/engine/table/impl/SelectOverheadLimiter.java
@@ -4,7 +4,6 @@
 package io.deephaven.engine.table.impl;
 
 import io.deephaven.base.verify.Assert;
-import io.deephaven.datastructures.util.CollectionUtil;
 import io.deephaven.engine.rowset.RowSet;
 import io.deephaven.engine.rowset.RowSetFactory;
 import io.deephaven.engine.rowset.RowSetShiftData;
@@ -12,7 +11,6 @@
 import io.deephaven.engine.table.ModifiedColumnSet;
 import io.deephaven.engine.table.Table;
 import io.deephaven.engine.table.TableUpdate;
-import io.deephaven.engine.updategraph.NotificationQueue;
 import io.deephaven.engine.table.impl.sources.SwitchColumnSource;
 import io.deephaven.engine.table.impl.sources.sparse.SparseConstants;
 import io.deephaven.util.annotations.VisibleForTesting;
diff --git a/engine/table/src/test/java/io/deephaven/engine/table/impl/SnapshotTestUtils.java b/engine/table/src/test/java/io/deephaven/engine/table/impl/SnapshotTestUtils.java
new file mode 100644
index 00000000000..68a393433b1
--- /dev/null
+++ b/engine/table/src/test/java/io/deephaven/engine/table/impl/SnapshotTestUtils.java
@@ -0,0 +1,68 @@
+//
+// Copyright (c) 2016-2024 Deephaven Data Labs and Patent Pending
+//
+package io.deephaven.engine.table.impl;
+
+import io.deephaven.chunk.*;
+import io.deephaven.chunk.attributes.Values;
+import io.deephaven.chunk.util.hashing.ChunkEquals;
+import io.deephaven.engine.rowset.RowSequence;
+import io.deephaven.engine.table.ChunkSource;
+import io.deephaven.engine.table.Table;
+import io.deephaven.engine.table.impl.sources.ArrayBackedColumnSource;
+import io.deephaven.engine.table.impl.sources.ReinterpretUtils;
+import io.deephaven.engine.table.impl.util.BarrageMessage;
+import io.deephaven.engine.table.impl.remote.ConstructSnapshot;
+import org.jetbrains.annotations.NotNull;
+import org.junit.Assert;
+import java.util.Iterator;
+import java.util.List;
+
+public class SnapshotTestUtils {
+
+    /**
+     * Used to compare snapshot data inside a {@link BarrageMessage} generated using
+     * {@link ConstructSnapshot#constructBackplaneSnapshot(Object, BaseTable)} with the expected data in a
+     * {@link Table}.
+     */
+    public static void verifySnapshotBarrageMessage(@NotNull final BarrageMessage snap, @NotNull final Table expected) {
+        Assert.assertEquals(snap.rowsAdded.size(), expected.size());
+        Assert.assertEquals(snap.addColumnData.length, expected.getColumnSources().size());
+
+        final int numColumns = expected.getColumnSources().size();
+        final int numRows = expected.intSize();
+        final List<String> columnNames = expected.getDefinition().getColumnNames();
+        final int maxSliceSize = Math.min(ArrayBackedColumnSource.BLOCK_SIZE, numRows);
+
+        for (int colId = 0; colId < numColumns; colId++) {
+            final ChunkSource<Values> expectedSource = ReinterpretUtils.maybeConvertToPrimitive(
+                    expected.getColumnSource(columnNames.get(colId)));
+            final ChunkType chunkType = expectedSource.getChunkType();
+
+            // @formatter:off
+            try (final ChunkSource.GetContext expectedGetContext = expectedSource.makeGetContext(maxSliceSize);
+                 final RowSequence.Iterator expectedRows = expected.getRowSet().getRowSequenceIterator();
+                 final ResettableReadOnlyChunk<Values> snapshotSlice = chunkType.makeResettableReadOnlyChunk()) {
+                // @formatter:on
+
+                final Iterator<Chunk<Values>> snapshotChunks = snap.addColumnData[colId].data.iterator();
+                final ChunkEquals chunkEquals = ChunkEquals.makeEqual(chunkType);
+
+                while (snapshotChunks.hasNext()) {
+                    Assert.assertTrue(expectedRows.hasMore());
+                    final Chunk<Values> snapshotChunk = snapshotChunks.next();
+                    final int snapshotChunkSize = snapshotChunk.size();
+                    for (int snapshotChunkUsed = 0; snapshotChunkUsed < snapshotChunkSize;) {
+                        final int sliceSize = Math.min(snapshotChunkSize - snapshotChunkUsed, maxSliceSize);
+                        final Chunk<? extends Values> expectedSlice = expectedSource.getChunk(expectedGetContext,
+                                expectedRows.getNextRowSequenceWithLength(sliceSize));
+                        snapshotSlice.resetFromChunk(snapshotChunk, snapshotChunkUsed, sliceSize);
+                        Assert.assertTrue(chunkEquals.equalReduce(expectedSlice, snapshotSlice));
+                        snapshotChunkUsed += sliceSize;
+                    }
+                }
+                Assert.assertFalse(expectedRows.hasMore());
+            }
+        }
+    }
+}
diff --git a/engine/table/src/test/java/io/deephaven/engine/table/impl/SourcePartitionedTableTest.java b/engine/table/src/test/java/io/deephaven/engine/table/impl/SourcePartitionedTableTest.java
index ee43dbc5ba2..af416b73aad 100644
--- a/engine/table/src/test/java/io/deephaven/engine/table/impl/SourcePartitionedTableTest.java
+++ b/engine/table/src/test/java/io/deephaven/engine/table/impl/SourcePartitionedTableTest.java
@@ -6,12 +6,14 @@
 import io.deephaven.base.verify.AssertionFailure;
 import io.deephaven.configuration.Configuration;
 import io.deephaven.engine.context.ExecutionContext;
+import io.deephaven.engine.liveness.LivenessScope;
+import io.deephaven.engine.liveness.LivenessScopeStack;
 import io.deephaven.engine.primitive.iterator.CloseableIterator;
 import io.deephaven.engine.rowset.RowSet;
+import io.deephaven.engine.table.ColumnSource;
 import io.deephaven.engine.table.Table;
-import io.deephaven.engine.table.impl.locations.ImmutableTableLocationKey;
-import io.deephaven.engine.table.impl.locations.InvalidatedRegionException;
-import io.deephaven.engine.table.impl.locations.TableLocationRemovedException;
+import io.deephaven.engine.table.impl.locations.*;
+import io.deephaven.engine.table.iterators.ChunkedColumnIterator;
 import io.deephaven.engine.testutil.locations.DependentRegistrar;
 import io.deephaven.engine.testutil.locations.TableBackedTableLocationKey;
 import io.deephaven.engine.testutil.locations.TableBackedTableLocationProvider;
@@ -25,6 +27,9 @@
 import org.junit.Test;
 import org.junit.experimental.categories.Category;
 
+import java.util.HashSet;
+import java.util.Set;
+
 import static io.deephaven.engine.testutil.TstUtils.*;
 import static io.deephaven.engine.util.TableTools.*;
 
@@ -90,6 +95,8 @@ private SourcePartitionedTable setUpData() {
         tlp = new TableBackedTableLocationProvider(
                 registrar,
                 true,
+                TableUpdateMode.ADD_REMOVE,
+                TableUpdateMode.ADD_REMOVE,
                 p1, p2);
 
         return new SourcePartitionedTable(p1.getDefinition(),
@@ -100,42 +107,97 @@ private SourcePartitionedTable setUpData() {
                 l -> true);
     }
 
+    private void verifyStringColumnContents(Table table, String columnName, String... expectedValues) {
+        final ColumnSource<String> columnSource = table.getColumnSource(columnName);
+        final Set<String> expectedSym = Set.of(expectedValues);
+
+        final Set<String> actualSym = new HashSet<>();
+        try (final CloseableIterator<String> symIterator = ChunkedColumnIterator.make(
+                columnSource, table.getRowSet(), 1024)) {
+            symIterator.forEachRemaining(actualSym::add);
+        }
+        assertEquals(expectedSym, actualSym);
+    }
+
     @Test
     public void testAddAndRemoveLocations() {
         final SourcePartitionedTable spt = setUpData();
 
         final Table partitionTable = spt.table();
 
+        final Table ptSummary = spt.merge().selectDistinct("Sym");
+
         assertEquals(2, partitionTable.size());
         try (final CloseableIterator<Table> tableIt = partitionTable.columnIterator("LocationTable")) {
             assertTableEquals(tableIt.next(), p1);
             assertTableEquals(tableIt.next(), p2);
         }
 
+        // Verify the contents of the downstream summary table
+        verifyStringColumnContents(ptSummary, "Sym", "aa", "bb", "cc", "dd");
+
+        ////////////////////////////////////////////
+        // Remove the p1 location
+        ////////////////////////////////////////////
+
         ImmutableTableLocationKey[] tlks = tlp.getTableLocationKeys()
                 .stream().sorted().toArray(ImmutableTableLocationKey[]::new);
-        tlp.removeTableLocationKey(tlks[0]);
+        final ImmutableTableLocationKey tlk0 = tlks[0];
+
+        tlp.removeTableLocationKey(tlk0);
         tlp.refresh();
 
-        allowingError(() -> updateGraph.getDelegate().runWithinUnitTestCycle(() -> {
-            updateGraph.refreshSources();
-            updateGraph.markSourcesRefreshedForUnitTests();
-            registrar.run();
-        }, false), errors -> errors.size() == 1 &&
-                FindExceptionCause.isOrCausedBy(errors.get(0), TableLocationRemovedException.class).isPresent());
-        getUpdateErrors().clear();
+        // We've removed location 0, should be gone from the location key list
+        assertFalse(new HashSet<>(tlp.getTableLocationKeys()).contains(tlk0));
+
+        // Since we haven't been through an update cycle, we should still be able to retrieve the location for this key.
+        assertTrue(tlp.hasTableLocationKey(tlk0));
+        assertNotNull(tlp.getTableLocation(tlk0));
+
+        // Verify the contents of the downstream summary table haven't changed yet
+        verifyStringColumnContents(ptSummary, "Sym", "aa", "bb", "cc", "dd");
+
+        updateGraph.getDelegate().startCycleForUnitTests(false);
+        updateGraph.refreshSources();
+        updateGraph.markSourcesRefreshedForUnitTests();
+        registrar.run();
+
+        // Verify the contents of the downstream summary table haven't changed yet
+        verifyStringColumnContents(ptSummary, "Sym", "aa", "bb", "cc", "dd");
+
+        // flush the notifications and verify changes are now visible
+        updateGraph.getDelegate().flushAllNormalNotificationsForUnitTests();
+        verifyStringColumnContents(ptSummary, "Sym", "cc", "dd");
+
+        // Finish the cycle and retest
+        updateGraph.getDelegate().completeCycleForUnitTests();
+        assertFalse(tlp.hasTableLocationKey(tlk0));
 
         assertEquals(1, partitionTable.size());
         try (final CloseableIterator<Table> tableIt = partitionTable.columnIterator("LocationTable")) {
             assertTableEquals(tableIt.next(), p2);
         }
 
+        ////////////////////////////////////////////
+        // Add a new location (p3)
+        ////////////////////////////////////////////
+
         tlp.addPending(p3);
         tlp.refresh();
-        updateGraph.getDelegate().runWithinUnitTestCycle(() -> {
-            updateGraph.refreshSources();
-            registrar.run();
-        });
+
+        updateGraph.getDelegate().startCycleForUnitTests(false);
+        updateGraph.refreshSources();
+        updateGraph.markSourcesRefreshedForUnitTests();
+        registrar.run();
+        // Verify the contents of the downstream summary table haven't changed yet
+        verifyStringColumnContents(ptSummary, "Sym", "cc", "dd");
+
+        // flush the notifications and verify changes are now visible
+        updateGraph.getDelegate().flushAllNormalNotificationsForUnitTests();
+        verifyStringColumnContents(ptSummary, "Sym", "cc", "dd", "ee", "ff");
+
+        // Finish the cycle
+        updateGraph.getDelegate().completeCycleForUnitTests();
 
         assertEquals(2, partitionTable.size());
         try (final CloseableIterator<Table> tableIt = partitionTable.columnIterator("LocationTable")) {
@@ -143,18 +205,28 @@ public void testAddAndRemoveLocations() {
             assertTableEquals(tableIt.next(), p3);
         }
 
+        ////////////////////////////////////////////
+        // Add a new location (p4) and remove p2
+        ////////////////////////////////////////////
+
         tlks = tlp.getTableLocationKeys().stream().sorted().toArray(ImmutableTableLocationKey[]::new);
         tlp.addPending(p4);
         tlp.removeTableLocationKey(tlks[0]);
         tlp.refresh();
 
-        allowingError(() -> updateGraph.getDelegate().runWithinUnitTestCycle(() -> {
-            updateGraph.refreshSources();
-            updateGraph.markSourcesRefreshedForUnitTests();
-            registrar.run();
-        }, false), errors -> errors.size() == 1 &&
-                FindExceptionCause.isOrCausedBy(errors.get(0), TableLocationRemovedException.class).isPresent());
-        getUpdateErrors().clear();
+        updateGraph.getDelegate().startCycleForUnitTests(false);
+        updateGraph.refreshSources();
+        updateGraph.markSourcesRefreshedForUnitTests();
+        registrar.run();
+        // Verify the contents of the downstream summary table haven't changed yet
+        verifyStringColumnContents(ptSummary, "Sym", "cc", "dd", "ee", "ff");
+
+        // flush the notifications and verify changes are now visible
+        updateGraph.getDelegate().flushAllNormalNotificationsForUnitTests();
+        verifyStringColumnContents(ptSummary, "Sym", "ee", "ff", "gg", "hh");
+
+        // Finish the cycle
+        updateGraph.getDelegate().completeCycleForUnitTests();
 
         assertEquals(2, partitionTable.size());
         try (final CloseableIterator<Table> tableIt = partitionTable.columnIterator("LocationTable")) {
@@ -162,6 +234,91 @@ public void testAddAndRemoveLocations() {
             assertTableEquals(tableIt.next(), p4);
         }
 
+        /*
+         * Set up a complicated table location management test, where we create a new table under a scope, add it to the
+         * SPT, then drop the table and verify that the table location is destroyed only after the scope is released.
+         */
+        final TableLocation location5;
+        try (final SafeCloseable ignored = LivenessScopeStack.open(new LivenessScope(), true)) {
+            final QueryTable p5 = testRefreshingTable(i(0, 1, 2, 3).toTracking(),
+                    stringCol("Sym", "ii", "jj", "ii", "jj"),
+                    intCol("intCol", 10000, 20000, 40000, 60000),
+                    doubleCol("doubleCol", 0.1, 0.2, 0.4, 0.6));
+            p5.setAttribute(Table.APPEND_ONLY_TABLE_ATTRIBUTE, true);
+            tlp.addPending(p5);
+            tlp.refresh();
+
+            updateGraph.getDelegate().startCycleForUnitTests(false);
+            updateGraph.refreshSources();
+            updateGraph.markSourcesRefreshedForUnitTests();
+            registrar.run();
+            // Verify the contents of the downstream summary table haven't changed yet
+            verifyStringColumnContents(ptSummary, "Sym", "ee", "ff", "gg", "hh");
+
+            // flush the notifications and verify changes are now visible
+            updateGraph.getDelegate().flushAllNormalNotificationsForUnitTests();
+            verifyStringColumnContents(ptSummary, "Sym", "ee", "ff", "gg", "hh", "ii", "jj");
+
+            // Finish the cycle
+            updateGraph.getDelegate().completeCycleForUnitTests();
+
+            assertEquals(3, partitionTable.size());
+            try (final CloseableIterator<Table> tableIt = partitionTable.columnIterator("LocationTable")) {
+                assertTableEquals(tableIt.next(), p3);
+                assertTableEquals(tableIt.next(), p4);
+                assertTableEquals(tableIt.next(), p5);
+            }
+
+            tlks = tlp.getTableLocationKeys().stream().sorted().toArray(ImmutableTableLocationKey[]::new);
+            final ImmutableTableLocationKey tlk_p5 = tlks[2];
+            location5 = tlp.getTableLocation(tlk_p5);
+            assertTrue(location5.getRowSet() != null && location5.getRowSet().size() == 4);
+
+            ////////////////////////////////////////////
+            // remove the p5 key from the SPT
+            ////////////////////////////////////////////
+
+            tlp.removeTableLocationKey(tlk_p5);
+            tlp.refresh();
+
+            // We've removed location 5, should be gone from the location key list
+            assertFalse(new HashSet<>(tlp.getTableLocationKeys()).contains(tlk_p5));
+
+            // Since we haven't been through an update cycle, we can still retrieve the location for this key.
+            assertTrue(tlp.hasTableLocationKey(tlk_p5));
+            assertNotNull(tlp.getTableLocation(tlk_p5));
+
+            updateGraph.getDelegate().startCycleForUnitTests(false);
+            updateGraph.refreshSources();
+            updateGraph.markSourcesRefreshedForUnitTests();
+            registrar.run();
+            // Verify the contents of the downstream summary table haven't changed yet
+            verifyStringColumnContents(ptSummary, "Sym", "ee", "ff", "gg", "hh", "ii", "jj");
+
+            // flush the notifications and verify changes are now visible
+            updateGraph.getDelegate().flushAllNormalNotificationsForUnitTests();
+            verifyStringColumnContents(ptSummary, "Sym", "ee", "ff", "gg", "hh");
+
+            // Finish the cycle
+            updateGraph.getDelegate().completeCycleForUnitTests();
+
+            // After the cycle cleanup, this location should not be available
+            assertFalse(tlp.hasTableLocationKey(tlk_p5));
+
+            // The location associated with p5 should still be valid, because it is held by p5 RCSM and p5 is in scope
+            assertTrue(location5.getRowSet() != null && location5.getRowSet().size() == 4);
+
+            assertEquals(2, partitionTable.size());
+            try (final CloseableIterator<Table> tableIt = partitionTable.columnIterator("LocationTable")) {
+                assertTableEquals(tableIt.next(), p3);
+                assertTableEquals(tableIt.next(), p4);
+            }
+        }
+
+        // The scope has been released, p5 should be dead so verify that the location associated with p5 has been
+        // cleaned up
+        assertNull(location5.getRowSet());
+
         // Prove that we propagate normal errors. This is a little tricky, we can't test for errors.size == 1 because
         // The TableBackedTableLocation has a copy() of the p3 table which is itself a leaf. Erroring P3 will
         // cause one error to come from the copied table, and one from the merged() table. We just need to validate
diff --git a/engine/table/src/test/java/io/deephaven/engine/table/impl/TestAggBy.java b/engine/table/src/test/java/io/deephaven/engine/table/impl/TestAggBy.java
index 41c03989f6c..9ecb8e14e42 100644
--- a/engine/table/src/test/java/io/deephaven/engine/table/impl/TestAggBy.java
+++ b/engine/table/src/test/java/io/deephaven/engine/table/impl/TestAggBy.java
@@ -9,13 +9,19 @@
 import gnu.trove.set.hash.TIntHashSet;
 import io.deephaven.api.agg.Aggregation;
 import io.deephaven.api.agg.spec.AggSpec;
+import io.deephaven.api.filter.Filter;
 import io.deephaven.api.object.UnionObject;
+import io.deephaven.base.verify.Assert;
 import io.deephaven.chunk.IntChunk;
 import io.deephaven.chunk.attributes.Values;
 import io.deephaven.engine.context.ExecutionContext;
 import io.deephaven.engine.rowset.RowSet;
+import io.deephaven.engine.rowset.RowSetShiftData;
 import io.deephaven.engine.table.ColumnSource;
+import io.deephaven.engine.table.ModifiedColumnSet;
 import io.deephaven.engine.table.Table;
+import io.deephaven.engine.table.impl.select.DynamicWhereFilter;
+import io.deephaven.engine.table.impl.select.MatchPairFactory;
 import io.deephaven.engine.table.impl.util.ColumnHolder;
 import io.deephaven.engine.table.vectors.ColumnVectors;
 import io.deephaven.engine.testutil.*;
@@ -60,7 +66,8 @@ public void setUp() throws Exception {
     public void testBy() {
         ColumnHolder<?> aHolder = col("A", 0, 0, 1, 1, 0, 0, 1, 1, 0, 0);
         ColumnHolder<?> bHolder = col("B", 1, 2, 3, 4, 5, 6, 7, 8, 9, 10);
-        Table table = TableTools.newTable(aHolder, bHolder);
+        ColumnHolder<?> cHolder = col("C", 1, 1, 1, 1, 1, 1, 1, 1, 1, 1);
+        Table table = TableTools.newTable(aHolder, bHolder, cHolder);
         show(table);
         assertEquals(10, table.size());
         assertEquals(2, table.groupBy("A").size());
@@ -68,18 +75,58 @@ public void testBy() {
         Table minMax = table.aggBy(
                 List.of(
                         AggFormula("min(each)", "each", "Min=B"),
-                        AggFormula("max(each)", "each", "Max=B")),
+                        AggFormula("max(each)", "each", "Max=B"),
+                        AggFormula("sum(each)", "each", "Sum=B"),
+                        AggFormula("f_const=6.0 + 3"),
+                        AggFormula("f_min=min(B)"),
+                        AggFormula("f_max=max(B)"),
+                        AggFormula("f_sum=sum(B)"),
+                        AggFormula("f_sum_two_col=sum(B) + sum(C)"),
+                        AggFormula("f_custom_sum=A * (sum(B) + sum(C))"),
+                        AggFormula("f_weighted_avg=wavg(B, C)")),
                 "A");
         show(minMax);
+
         assertEquals(2, minMax.size());
+
+        DoubleVector consts = ColumnVectors.ofDouble(minMax, "f_const");
+        assertEquals(9.0, consts.get(0));
+        assertEquals(9.0, consts.get(1));
+
         IntVector mins = ColumnVectors.ofInt(minMax, "Min");
         assertEquals(1, mins.get(0));
         assertEquals(3, mins.get(1));
+        mins = ColumnVectors.ofInt(minMax, "f_min");
+        assertEquals(1, mins.get(0));
+        assertEquals(3, mins.get(1));
+
         IntVector maxes = ColumnVectors.ofInt(minMax, "Max");
         assertEquals(10, maxes.get(0));
         assertEquals(8, maxes.get(1));
+        maxes = ColumnVectors.ofInt(minMax, "f_max");
+        assertEquals(10, maxes.get(0));
+        assertEquals(8, maxes.get(1));
+
+        LongVector sums = ColumnVectors.ofLong(minMax, "Sum");
+        assertEquals(33, sums.get(0));
+        assertEquals(22, sums.get(1));
+        sums = ColumnVectors.ofLong(minMax, "f_sum");
+        assertEquals(33, sums.get(0));
+        assertEquals(22, sums.get(1));
+
+        sums = ColumnVectors.ofLong(minMax, "f_sum_two_col");
+        assertEquals(33 + 6, sums.get(0));
+        assertEquals(22 + 4, sums.get(1));
 
-        Table doubleCounted = table.aggBy(List.of(AggCount("Count1"), AggCount("Count2")), "A");
+        sums = ColumnVectors.ofLong(minMax, "f_custom_sum");
+        assertEquals(0, sums.get(0));
+        assertEquals(22 + 4, sums.get(1));
+
+        Table doubleCounted = table.aggBy(
+                List.of(
+                        AggCount("Count1"),
+                        AggCount("Count2")),
+                "A");
         show(doubleCounted);
         assertEquals(2, doubleCounted.size());
 
@@ -127,8 +174,8 @@ public void testBy() {
         for (int ii = 0; ii < bChunk.size(); ++ii) {
             doubles[ii] = 1.1 * bChunk.get(ii);
         }
-        ColumnHolder<?> cHolder = col("C", doubles);
-        table = TableTools.newTable(aHolder, bHolder, cHolder);
+        ColumnHolder<?> dHolder = col("D", doubles);
+        table = TableTools.newTable(aHolder, bHolder, cHolder, dHolder);
         show(table);
         Table summary = table.aggBy(summaryStatistics, "A");
         show(summary);
@@ -138,6 +185,164 @@ public void testBy() {
         show(percentilesAll);
     }
 
+    @Test
+    public void testAggCountWhere() {
+        ColumnHolder<?> aHolder = col("A", 0, 0, 1, 1, 0, 0, 1, 1, 0, 0);
+        ColumnHolder<?> bHolder = col("B", 1, 2, 3, 4, 5, 6, 7, 8, 9, 10);
+        ColumnHolder<?> cHolder = col("C", 1, 1, 1, 1, 1, 1, 1, 1, 1, 1);
+        ColumnHolder<?> dHolder = booleanCol("D", true, true, true, true, true, false, false, false, false, false);
+        final Instant startInstant = Instant.parse("1970-01-01T00:00:00.000Z");
+
+        final Instant[] instantData = new Instant[] {
+                startInstant, // 1970-01-01T00:00:00.000Z
+                startInstant.plusNanos(10 * 1_000_000), // 1970-01-01T00:00:00.010Z
+                startInstant.plusNanos(20 * 1_000_000), // 1970-01-01T00:00:00.020Z
+                startInstant.plusNanos(30 * 1_000_000), // 1970-01-01T00:00:00.030Z
+                startInstant.plusNanos(40 * 1_000_000), // 1970-01-01T00:00:00.040Z
+                startInstant.plusNanos(50 * 1_000_000), // 1970-01-01T00:00:00.050Z
+                startInstant.plusNanos(60 * 1_000_000), // 1970-01-01T00:00:00.060Z
+                startInstant.plusNanos(70 * 1_000_000), // 1970-01-01T00:00:00.070Z
+                startInstant.plusNanos(80 * 1_000_000), // 1970-01-01T00:00:00.080Z
+                startInstant.plusNanos(90 * 1_000_000) // 1970-01-01T00:00:00.090Z
+        };
+        ColumnHolder<?> eHolder = instantCol("E", instantData);
+        ColumnHolder<?> fHolder = stringCol("F", "A", "B", "C", "D", "E", "A", "B", "C", "D", "E");
+
+        Table table = TableTools.newTable(aHolder, bHolder, cHolder, dHolder, eHolder, fHolder);
+        show(table);
+        assertEquals(10, table.size());
+        assertEquals(2, table.groupBy("A").size());
+        Table doubleCounted = table.aggBy(
+                List.of(
+                        AggCountWhere("filter1", "B >= 5"),
+                        AggCountWhere("filter2", "B >= 5", "B != 8"),
+                        AggCountWhere("filter3", Filter.or(Filter.from("B >= 5", "B == 3"))),
+                        AggCountWhere("filter4", "true"),
+                        AggCountWhere("filter5", "false"),
+                        AggCountWhere("filter6", "B % 2 == 0"),
+                        AggCountWhere("filter7", Filter.and(Filter.or(Filter.from("false", "B % 3 == 0")),
+                                Filter.or(Filter.from("false", "B % 2 == 0")))),
+                        AggCountWhere("filter8", "B % 2 == 0", "B % 3 == 0"),
+                        AggCountWhere("filter9", Filter.and(Filter.and(Filter.from("B > 0")),
+                                Filter.and(Filter.from("B <= 10", "B >= 5")))),
+                        // Multiple input columns
+                        AggCountWhere("filter10", "B >= 5", "C == 1"),
+                        AggCountWhere("filter11", "B >= 5 && C == 1 && A == 0"),
+                        AggCountWhere("filter12", "B >= 5", "C >= 1"),
+                        // Boolean column test
+                        AggCountWhere("filter13", "D == true"),
+                        // Instant column test
+                        AggCountWhere("filter14", "E > '1970-01-01T00:00:00.030Z'"),
+                        // String column test
+                        AggCountWhere("filter15", "F != 'A'", "F != 'B'")),
+                "A");
+        show(doubleCounted);
+        assertEquals(2, doubleCounted.size());
+
+        LongVector counts = ColumnVectors.ofLong(doubleCounted, "filter1");
+        assertEquals(4L, counts.get(0));
+        assertEquals(2L, counts.get(1));
+        counts = ColumnVectors.ofLong(doubleCounted, "filter2");
+        assertEquals(4L, counts.get(0));
+        assertEquals(1L, counts.get(1));
+        counts = ColumnVectors.ofLong(doubleCounted, "filter3");
+        assertEquals(4L, counts.get(0));
+        assertEquals(3L, counts.get(1));
+        counts = ColumnVectors.ofLong(doubleCounted, "filter4");
+        assertEquals(6L, counts.get(0));
+        assertEquals(4L, counts.get(1));
+        counts = ColumnVectors.ofLong(doubleCounted, "filter5");
+        assertEquals(0L, counts.get(0));
+        assertEquals(0L, counts.get(1));
+        counts = ColumnVectors.ofLong(doubleCounted, "filter6");
+        assertEquals(3L, counts.get(0));
+        assertEquals(2L, counts.get(1));
+        counts = ColumnVectors.ofLong(doubleCounted, "filter7");
+        assertEquals(1L, counts.get(0));
+        assertEquals(0L, counts.get(1));
+        counts = ColumnVectors.ofLong(doubleCounted, "filter8");
+        assertEquals(1L, counts.get(0));
+        assertEquals(0L, counts.get(1));
+        counts = ColumnVectors.ofLong(doubleCounted, "filter9");
+        assertEquals(4L, counts.get(0));
+        assertEquals(2L, counts.get(1));
+        counts = ColumnVectors.ofLong(doubleCounted, "filter10");
+        assertEquals(4L, counts.get(0));
+        assertEquals(2L, counts.get(1));
+        counts = ColumnVectors.ofLong(doubleCounted, "filter11");
+        assertEquals(4L, counts.get(0));
+        assertEquals(0L, counts.get(1));
+        counts = ColumnVectors.ofLong(doubleCounted, "filter12");
+        assertEquals(4L, counts.get(0));
+        assertEquals(2L, counts.get(1));
+        counts = ColumnVectors.ofLong(doubleCounted, "filter13");
+        assertEquals(3L, counts.get(0));
+        assertEquals(2L, counts.get(1));
+        counts = ColumnVectors.ofLong(doubleCounted, "filter14");
+        assertEquals(4L, counts.get(0));
+        assertEquals(2L, counts.get(1));
+        counts = ColumnVectors.ofLong(doubleCounted, "filter15");
+        assertEquals(3L, counts.get(0));
+        assertEquals(3L, counts.get(1));
+
+        doubleCounted = table.aggBy(
+                List.of(
+                        AggCountWhere("filter1", "B >= 5"),
+                        AggCountWhere("filter2", "B >= 5", "B != 8"),
+                        AggCountWhere("filter3", Filter.or(Filter.from("B >= 5", "B == 3"))),
+                        AggCountWhere("filter4", "true"),
+                        AggCountWhere("filter5", "false"),
+                        AggCountWhere("filter6", "B % 2 == 0"),
+                        AggCountWhere("filter7", Filter.and(Filter.or(Filter.from("false", "B % 3 == 0")),
+                                Filter.or(Filter.from("false", "B % 2 == 0")))),
+                        AggCountWhere("filter8", "B % 2 == 0", "B % 3 == 0"),
+                        AggCountWhere("filter9", Filter.and(Filter.and(Filter.from("B > 0")),
+                                Filter.and(Filter.from("B <= 10", "B >= 5")))),
+                        // Multiple input columns
+                        AggCountWhere("filter10", "B >= 5", "C == 1"),
+                        AggCountWhere("filter11", "B >= 5 && C == 1 && A == 0"),
+                        AggCountWhere("filter12", "B >= 5", "C >= 1"),
+                        // Boolean column test
+                        AggCountWhere("filter13", "D == true"),
+                        // Instant column test
+                        AggCountWhere("filter14", "E > '1970-01-01T00:00:00.030Z'"),
+                        // String column test
+                        AggCountWhere("filter15", "F != 'A'", "F != 'B'")));
+        show(doubleCounted);
+        assertEquals(1, doubleCounted.size());
+
+        counts = ColumnVectors.ofLong(doubleCounted, "filter1");
+        assertEquals(6L, counts.get(0));
+        counts = ColumnVectors.ofLong(doubleCounted, "filter2");
+        assertEquals(5L, counts.get(0));
+        counts = ColumnVectors.ofLong(doubleCounted, "filter3");
+        assertEquals(7L, counts.get(0));
+        counts = ColumnVectors.ofLong(doubleCounted, "filter4");
+        assertEquals(10L, counts.get(0));
+        counts = ColumnVectors.ofLong(doubleCounted, "filter5");
+        assertEquals(0L, counts.get(0));
+        counts = ColumnVectors.ofLong(doubleCounted, "filter6");
+        assertEquals(5L, counts.get(0));
+        counts = ColumnVectors.ofLong(doubleCounted, "filter7");
+        assertEquals(1L, counts.get(0));
+        counts = ColumnVectors.ofLong(doubleCounted, "filter8");
+        assertEquals(1L, counts.get(0));
+        counts = ColumnVectors.ofLong(doubleCounted, "filter9");
+        assertEquals(6L, counts.get(0));
+        counts = ColumnVectors.ofLong(doubleCounted, "filter10");
+        assertEquals(6L, counts.get(0));
+        counts = ColumnVectors.ofLong(doubleCounted, "filter11");
+        assertEquals(4L, counts.get(0));
+        counts = ColumnVectors.ofLong(doubleCounted, "filter12");
+        assertEquals(6L, counts.get(0));
+        counts = ColumnVectors.ofLong(doubleCounted, "filter13");
+        assertEquals(5L, counts.get(0));
+        counts = ColumnVectors.ofLong(doubleCounted, "filter14");
+        assertEquals(6L, counts.get(0));
+        counts = ColumnVectors.ofLong(doubleCounted, "filter15");
+        assertEquals(6L, counts.get(0));
+    }
+
     @Test
     public void testComboByMinMaxTypes() {
         final Random random = new Random(0);
@@ -152,7 +357,7 @@ public void testComboByMinMaxTypes() {
                         new ShortGenerator(),
                         new ByteGenerator(),
                         new LongGenerator(),
-                        new IntGenerator(10, 100),
+                        new CharGenerator('A', 'z'),
                         new SetGenerator<>(10.1, 20.1, 30.1),
                         new FloatGenerator(0, 10.0f),
                         new UnsortedInstantGenerator(DateTimeUtils.parseInstant("2020-03-17T12:00:00 NY"),
@@ -200,6 +405,11 @@ private void testComboByIncremental(final String ctxt, final int size) {
                                 new SetGenerator<>(10.1, 20.1, 30.1),
                                 new SetGenerator<>(10.1, 20.1, 30.1, QueryConstants.NULL_DOUBLE)));
 
+        // Get a static set table for use in dynamic where filters
+        final QueryTable setTable = getTable(false, size / 10, random,
+                initColumnInfos(new String[] {"intCol"},
+                        new IntGenerator(10, 100)));
+
         ExecutionContext.getContext().getQueryLibrary().importClass(TestAggBy.class);
 
         String[] groupByColumns = new String[0];
@@ -215,7 +425,71 @@ public Table e() {
                     public Table e() {
                         return queryTable.aggBy(List.of(
                                 AggFormula("min(each)", "each", "MinI=intCol", "MinD=doubleCol"),
-                                AggFormula("max(each)", "each", "MaxI=intCol")), "Sym").sort("Sym");
+                                AggFormula("max(each)", "each", "MaxI=intCol"),
+                                AggFormula("f_const=6.0 / 3"),
+                                AggFormula("f_min=min(intColNulls)"),
+                                AggFormula("f_max=max(doubleColNulls)"),
+                                AggFormula("f_sum=sum(intColNulls + doubleColNulls)"),
+                                AggFormula("f_key=Sym.equals(\"a\") ? \"a\" : \"not a\""),
+                                AggFormula("f_key_sum=Sym + ':' + sum(intColNulls + doubleColNulls)"),
+                                AggFormula(
+                                        "f_custom_sum=sum(intColNulls) + sum(doubleCol) + min(doubleColNulls)")),
+                                "Sym").sort("Sym");
+                    }
+                },
+                // Bucketed AggCountWhere tests
+                new EvalNugget() {
+                    public Table e() {
+                        return queryTable.aggBy(List.of(
+                                AggCountWhere("filter1", "intCol >= 50"),
+                                AggCountWhere("filter2", "intCol >= 50", "intCol != 80"),
+                                AggCountWhere("filter3", Filter.or(Filter.from("intCol >= 50", "intCol == 3"))),
+                                AggCountWhere("filter4", "true"),
+                                AggCountWhere("filter5", "false"),
+                                AggCountWhere("filter6", "intCol % 2 == 0"),
+                                AggCountWhere("filter7",
+                                        Filter.and(Filter.or(Filter.from("false", "intCol % 3 == 0")),
+                                                Filter.or(Filter.from("false", "intCol % 2 == 0")))),
+                                AggCountWhere("filter8", "intCol % 2 == 0", "intCol % 3 == 0"),
+                                AggCountWhere("filter9",
+                                        Filter.and(Filter.and(Filter.from("intCol > 0")),
+                                                Filter.and(Filter.from("intCol <= 10", "intCol >= 5")))),
+                                // Multiple input columns
+                                AggCountWhere("filter10", "intCol >= 5", "doubleCol <= 10.0"),
+                                AggCountWhere("filter11", "intCol >= 5 && intColNulls != 3 && doubleCol <= 10.0"),
+                                // DynamicWhereFilter
+                                AggCountWhere("filter12",
+                                        new DynamicWhereFilter(setTable, true,
+                                                MatchPairFactory.getExpressions("intCol"))),
+                                AggCountWhere("filter13", "doubleCol >= 5", "doubleColNulls >= 1")),
+                                "Sym").sort("Sym");
+                    }
+                },
+                // Zero-Key AggCountWhere tests
+                new EvalNugget() {
+                    public Table e() {
+                        return queryTable.aggBy(List.of(
+                                AggCountWhere("filter1", "intCol >= 50"),
+                                AggCountWhere("filter2", "intCol >= 50", "intCol != 80"),
+                                AggCountWhere("filter3", Filter.or(Filter.from("intCol >= 50", "intCol == 3"))),
+                                AggCountWhere("filter4", "true"),
+                                AggCountWhere("filter5", "false"),
+                                AggCountWhere("filter6", "intCol % 2 == 0"),
+                                AggCountWhere("filter7",
+                                        Filter.and(Filter.or(Filter.from("false", "intCol % 3 == 0")),
+                                                Filter.or(Filter.from("false", "intCol % 2 == 0")))),
+                                AggCountWhere("filter8", "intCol % 2 == 0", "intCol % 3 == 0"),
+                                AggCountWhere("filter9",
+                                        Filter.and(Filter.and(Filter.from("intCol > 0")),
+                                                Filter.and(Filter.from("intCol <= 10", "intCol >= 5")))),
+                                // Multiple input columns
+                                AggCountWhere("filter10", "intCol >= 5", "doubleCol <= 10.0"),
+                                AggCountWhere("filter11", "intCol >= 5 && intColNulls != 3 && doubleCol <= 10.0"),
+                                // DynamicWhereFilter
+                                AggCountWhere("filter12",
+                                        new DynamicWhereFilter(setTable, true,
+                                                MatchPairFactory.getExpressions("intCol"))),
+                                AggCountWhere("filter13", "doubleCol >= 5", "doubleColNulls >= 1")));
                     }
                 },
                 new QueryTableTest.TableComparator(
@@ -832,4 +1106,179 @@ public void testAggAllByWithFormatColumn() {
         cs = result.getColumnSource("Integers");
         assertEquals(1, cs.get(0));
     }
+
+    @Test
+    public void testFormulaUpdatePropagation() {
+        final QueryTable table = TstUtils.testRefreshingTable(
+                i(2, 4, 6).toTracking(),
+                col("Key", "A", "B", "A"),
+                doubleCol("Double", 1.0, 2.0, 2.0),
+                shortCol("Short", (short) 10, (short) 20, (short) 30),
+                intCol("Int", 2, 4, 6));
+        final QueryTable result = (QueryTable) table.aggBy(
+                List.of(AggFormula("sumInt=sum(Int)"),
+                        AggFormula("sumDouble=sum(Double)"),
+                        AggFormula("sumCustom=sum(Int) + sum(Double)")),
+                "Key");
+
+        // Add to "B" bucket
+        final ControlledUpdateGraph updateGraph = ExecutionContext.getContext().getUpdateGraph().cast();
+
+        final SimpleListener resultListener = new SimpleListener(result);
+        result.addUpdateListener(resultListener);
+        int lastResultListenerCount = 0;
+
+        final ModifiedColumnSet sumIntMCS = result.newModifiedColumnSet("sumInt");
+        final ModifiedColumnSet sumDoubleMCS = result.newModifiedColumnSet("sumDouble");
+        final ModifiedColumnSet sumCustomMCS = result.newModifiedColumnSet("sumCustom");
+        final ModifiedColumnSet allFormulaMCS = result.newModifiedColumnSet("sumInt", "sumDouble", "sumCustom");
+
+        updateGraph.runWithinUnitTestCycle(() -> {
+            TstUtils.addToTable(table,
+                    i(8),
+                    col("Key", "B"),
+                    doubleCol("Double", 3.0),
+                    shortCol("Short", (short) 40),
+                    intCol("Int", 8)); // Add to "B" bucket
+            table.notifyListeners(i(8), i(), i());
+        });
+        Assert.eq(lastResultListenerCount + 1, "lastResultListenerCount + 1",
+                resultListener.count, "resultListener.count");
+        Assert.eqTrue(resultListener.update.added().isEmpty(), "added() matches expected");
+        Assert.eqTrue(resultListener.update.removed().isEmpty(), "removed() matches expected");
+        Assert.eqTrue(resultListener.update.shifted().empty(), "shifted() matches expected");
+        Assert.eqTrue(resultListener.update.modified().equals(i(1)), "modified() matches expected");
+
+        Assert.eqTrue(resultListener.update.modifiedColumnSet().containsAll(allFormulaMCS), "MCS matches expected");
+        lastResultListenerCount = resultListener.count;
+
+        // Change a row in the "B" bucket
+        updateGraph.runWithinUnitTestCycle(() -> {
+            TstUtils.addToTable(table,
+                    i(8),
+                    col("Key", "B"),
+                    doubleCol("Double", 3.0),
+                    shortCol("Short", (short) 40),
+                    intCol("Int", 9)); // Change Int
+
+            table.notifyListeners(new TableUpdateImpl(
+                    i(), i(), i(8),
+                    RowSetShiftData.EMPTY,
+                    table.newModifiedColumnSet("Int")));
+        });
+        Assert.eq(lastResultListenerCount + 1, "lastResultListenerCount + 1",
+                resultListener.count, "resultListener.count");
+        Assert.eqTrue(resultListener.update.added().isEmpty(), "added() matches expected");
+        Assert.eqTrue(resultListener.update.removed().isEmpty(), "removed() matches expected");
+        Assert.eqTrue(resultListener.update.shifted().empty(), "shifted() matches expected");
+        Assert.eqTrue(resultListener.update.modified().equals(i(1)), "modified() matches expected");
+        Assert.eqTrue(resultListener.update.modifiedColumnSet().containsAny(sumIntMCS), "MCS matches expected");
+        Assert.eqFalse(resultListener.update.modifiedColumnSet().containsAny(sumDoubleMCS), "MCS matches expected");
+        Assert.eqTrue(resultListener.update.modifiedColumnSet().containsAny(sumCustomMCS), "MCS matches expected");
+        lastResultListenerCount = resultListener.count;
+
+        // Change a row in the "B" bucket
+        updateGraph.runWithinUnitTestCycle(() -> {
+            TstUtils.addToTable(table,
+                    i(8),
+                    col("Key", "B"),
+                    doubleCol("Double", 5.0), // Change Double
+                    shortCol("Short", (short) 40),
+                    intCol("Int", 9));
+
+            table.notifyListeners(new TableUpdateImpl(
+                    i(), i(), i(8),
+                    RowSetShiftData.EMPTY,
+                    table.newModifiedColumnSet("Double")));
+        });
+        Assert.eq(lastResultListenerCount + 1, "lastResultListenerCount + 1",
+                resultListener.count, "resultListener.count");
+        Assert.eqTrue(resultListener.update.added().isEmpty(), "added() matches expected");
+        Assert.eqTrue(resultListener.update.removed().isEmpty(), "removed() matches expected");
+        Assert.eqTrue(resultListener.update.shifted().empty(), "shifted() matches expected");
+        Assert.eqTrue(resultListener.update.modified().equals(i(1)), "modified() matches expected");
+        Assert.eqFalse(resultListener.update.modifiedColumnSet().containsAny(sumIntMCS), "MCS matches expected");
+        Assert.eqTrue(resultListener.update.modifiedColumnSet().containsAny(sumDoubleMCS), "MCS matches expected");
+        Assert.eqTrue(resultListener.update.modifiedColumnSet().containsAny(sumCustomMCS), "MCS matches expected");
+        lastResultListenerCount = resultListener.count;
+
+        // Change a row in the "B" bucket
+        updateGraph.runWithinUnitTestCycle(() -> {
+            TstUtils.addToTable(table,
+                    i(8),
+                    col("Key", "B"),
+                    doubleCol("Double", 5.0),
+                    shortCol("Short", (short) 50), // Change Short
+                    intCol("Int", 9));
+
+            table.notifyListeners(new TableUpdateImpl(
+                    i(), i(), i(8),
+                    RowSetShiftData.EMPTY,
+                    table.newModifiedColumnSet("Short")));
+        });
+        // No update expected from the result table,
+        Assert.eq(lastResultListenerCount, "lastResultListenerCount + 1",
+                resultListener.count, "resultListener.count");
+
+        // New "C" bucket
+        updateGraph.runWithinUnitTestCycle(() -> {
+            TstUtils.addToTable(table,
+                    i(9),
+                    col("Key", "C"),
+                    doubleCol("Double", 4.0),
+                    shortCol("Short", (short) 40),
+                    intCol("Int", 10)); // New "C" bucket in isolation
+            table.notifyListeners(i(9), i(), i());
+        });
+        Assert.eq(lastResultListenerCount + 1, "lastResultListenerCount + 1",
+                resultListener.count, "resultListener.count");
+        Assert.eqTrue(resultListener.update.added().equals(i(2)), "added() matches expected");
+        Assert.eqTrue(resultListener.update.removed().isEmpty(), "removed() matches expected");
+        Assert.eqTrue(resultListener.update.shifted().empty(), "shifted() matches expected");
+        Assert.eqTrue(resultListener.update.modified().isEmpty(), "modified() matches expected");
+        Assert.eqTrue(resultListener.update.modifiedColumnSet().empty(), "MCS matches expected");
+        lastResultListenerCount = resultListener.count;
+
+        // Row from "B" bucket to "C" bucket
+        updateGraph.runWithinUnitTestCycle(() -> {
+            TstUtils.addToTable(table,
+                    i(8),
+                    col("Key", "C"),
+                    doubleCol("Double", 3.0),
+                    shortCol("Short", (short) 40),
+                    intCol("Int", 11)); // Row from "B" bucket to "C" bucket
+            table.notifyListeners(new TableUpdateImpl(
+                    i(), i(), i(8),
+                    RowSetShiftData.EMPTY,
+                    table.newModifiedColumnSet("Key")));
+        });
+        Assert.eq(lastResultListenerCount + 1, "lastResultListenerCount + 1",
+                resultListener.count, "resultListener.count");
+        Assert.eqTrue(resultListener.update.added().isEmpty(), "added() matches expected");
+        Assert.eqTrue(resultListener.update.removed().isEmpty(), "removed() matches expected");
+        Assert.eqTrue(resultListener.update.shifted().empty(), "shifted() matches expected");
+        Assert.eqTrue(resultListener.update.modified().equals(i(1, 2)), "modified() matches expected");
+        Assert.eqTrue(resultListener.update.modifiedColumnSet().containsAll(allFormulaMCS), "MCS matches expected");
+        lastResultListenerCount = resultListener.count;
+
+        // New "D" bucket, and new row in "C"
+        updateGraph.runWithinUnitTestCycle(() -> {
+            TstUtils.addToTable(table,
+                    i(10, 11),
+                    col("Key", "D", "C"),
+                    doubleCol("Double", 5.0, 6.0),
+                    shortCol("Short", (short) 40, (short) 50),
+                    intCol("Int", 10, 11)); // New "D" bucket
+            table.notifyListeners(i(10, 11), i(), i());
+        });
+        Assert.eq(lastResultListenerCount + 1, "lastResultListenerCount + 1",
+                resultListener.count, "resultListener.count");
+        Assert.eqTrue(resultListener.update.added().equals(i(3)), "added() matches expected");
+        Assert.eqTrue(resultListener.update.removed().isEmpty(), "removed() matches expected");
+        Assert.eqTrue(resultListener.update.shifted().empty(), "shifted() matches expected");
+        Assert.eqTrue(resultListener.update.modified().equals(i(2)), "modified() matches expected");
+        Assert.eqTrue(resultListener.update.modifiedColumnSet().containsAll(allFormulaMCS), "MCS matches expected");
+
+        TableTools.show(result);
+    }
 }
diff --git a/engine/table/src/test/java/io/deephaven/engine/table/impl/TestCodecColumns.java b/engine/table/src/test/java/io/deephaven/engine/table/impl/TestCodecColumns.java
index a65bcfb1fa4..33474e0044e 100644
--- a/engine/table/src/test/java/io/deephaven/engine/table/impl/TestCodecColumns.java
+++ b/engine/table/src/test/java/io/deephaven/engine/table/impl/TestCodecColumns.java
@@ -77,6 +77,8 @@ public class TestCodecColumns {
             VARIABLE_WIDTH_BIG_INTEGER_COLUMN_DEFINITION,
             VARIABLE_WIDTH_BIG_INTEGER_COLUMN_DEFINITION_S);
 
+    private static final byte[] EMPTY_BYTE_ARRAY = new byte[] {};
+
     @Rule
     public final EngineCleanup base = new EngineCleanup();
 
@@ -85,12 +87,13 @@ public class TestCodecColumns {
     @Before
     public void setUp() {
         table = TableTools.newTable(TABLE_DEFINITION,
-                TableTools.col("VWBA", new byte[] {0, 1, 2}, null, new byte[] {3, 4, 5, 6}),
-                TableTools.col("VWCD", null, new ArrayTuple(0, 2, 4, 6), new ArrayTuple(1, 3, 5, 7)),
+                TableTools.col("VWBA", new byte[] {0, 1, 2}, null, new byte[] {3, 4, 5, 6}, EMPTY_BYTE_ARRAY),
+                TableTools.col("VWCD", null, new ArrayTuple(0, 2, 4, 6), new ArrayTuple(1, 3, 5, 7), null),
                 TableTools.col("FWBA", new byte[] {7, 8, 9, 10, 11, 12, 13, 14, 15},
-                        new byte[] {16, 17, 18, 19, 20, 21, 22, 23, 24}, new byte[] {0, 0, 0, 0, 0, 0, 0, 0, 0}),
-                TableTools.col("VWBI", BigInteger.valueOf(91), BigInteger.valueOf(111111111111111L), null),
-                TableTools.col("VWBIS", BigInteger.valueOf(94), null, BigInteger.valueOf(111111111111112L)));
+                        new byte[] {16, 17, 18, 19, 20, 21, 22, 23, 24}, new byte[] {0, 0, 0, 0, 0, 0, 0, 0, 0},
+                        EMPTY_BYTE_ARRAY),
+                TableTools.col("VWBI", BigInteger.valueOf(91), BigInteger.valueOf(111111111111111L), null, null),
+                TableTools.col("VWBIS", BigInteger.valueOf(94), null, BigInteger.valueOf(111111111111112L), null));
     }
 
     @Test
@@ -99,20 +102,32 @@ public void doColumnsTest() throws IOException {
         final File dest = new File(dir, "Test.parquet");
         try {
             ParquetTools.writeTable(table, dest.getPath(), writeInstructions);
-            final MutableObject<ParquetInstructions> instructionsOut = new MutableObject<>();
-            final Table result =
-                    ParquetTools.readParquetSchemaAndTable(dest, ParquetInstructions.EMPTY, instructionsOut);
-            TableTools.show(result);
-            TestCase.assertEquals(TABLE_DEFINITION, result.getDefinition());
-            final ParquetInstructions readInstructions = instructionsOut.getValue();
-            TestCase.assertTrue(
-                    ParquetInstructions.sameColumnNamesAndCodecMappings(expectedReadInstructions, readInstructions));
-            TstUtils.assertTableEquals(table, result);
+            doColumnsTestHelper(dest);
         } finally {
             FileUtils.deleteRecursively(dir);
         }
     }
 
+    @Test
+    public void doLegacyColumnsTest() {
+        // Make sure that we can read legacy data encoded with the old codec implementations.
+        final String path =
+                TestCodecColumns.class.getResource("/ReferenceParquetWithCodecColumns.parquet").getFile();
+        doColumnsTestHelper(new File(path));
+    }
+
+    private void doColumnsTestHelper(final File dest) {
+        final MutableObject<ParquetInstructions> instructionsOut = new MutableObject<>();
+        final Table result =
+                ParquetTools.readParquetSchemaAndTable(dest, ParquetInstructions.EMPTY, instructionsOut);
+        TableTools.show(result);
+        TestCase.assertEquals(TABLE_DEFINITION, result.getDefinition());
+        final ParquetInstructions readInstructions = instructionsOut.getValue();
+        TestCase.assertTrue(
+                ParquetInstructions.sameColumnNamesAndCodecMappings(expectedReadInstructions, readInstructions));
+        TstUtils.assertTableEquals(table, result);
+    }
+
     @Test
     public void doCacheTest() {
         try {
diff --git a/engine/table/src/test/java/io/deephaven/engine/table/impl/TestHierarchicalTableSnapshots.java b/engine/table/src/test/java/io/deephaven/engine/table/impl/TestHierarchicalTableSnapshots.java
new file mode 100644
index 00000000000..62c78fcb2d3
--- /dev/null
+++ b/engine/table/src/test/java/io/deephaven/engine/table/impl/TestHierarchicalTableSnapshots.java
@@ -0,0 +1,274 @@
+//
+// Copyright (c) 2016-2024 Deephaven Data Labs and Patent Pending
+//
+package io.deephaven.engine.table.impl;
+
+import io.deephaven.api.ColumnName;
+import io.deephaven.chunk.WritableChunk;
+import io.deephaven.chunk.attributes.Values;
+import io.deephaven.engine.context.ExecutionContext;
+import io.deephaven.engine.rowset.RowSequence;
+import io.deephaven.engine.rowset.RowSetFactory;
+import io.deephaven.engine.rowset.RowSetShiftData;
+import io.deephaven.engine.table.*;
+import io.deephaven.engine.table.hierarchical.HierarchicalTable;
+import io.deephaven.engine.table.hierarchical.HierarchicalTable.SnapshotState;
+import io.deephaven.engine.table.hierarchical.RollupTable;
+import io.deephaven.engine.table.hierarchical.TreeTable;
+import io.deephaven.engine.table.impl.sources.ByteAsBooleanColumnSource;
+import io.deephaven.engine.table.impl.sources.LongAsInstantColumnSource;
+import io.deephaven.engine.table.impl.sources.chunkcolumnsource.ChunkColumnSource;
+import io.deephaven.engine.testutil.ControlledUpdateGraph;
+import io.deephaven.engine.testutil.junit4.EngineCleanup;
+import io.deephaven.test.types.OutOfBandTest;
+
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
+import org.junit.Rule;
+import org.junit.Test;
+import org.junit.experimental.categories.Category;
+
+import java.time.Instant;
+import java.util.Arrays;
+import java.util.BitSet;
+import java.util.LinkedHashMap;
+import java.util.List;
+import java.util.concurrent.ExecutionException;
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.Executors;
+import java.util.concurrent.Future;
+import java.util.concurrent.TimeUnit;
+import java.util.concurrent.TimeoutException;
+
+import static io.deephaven.api.agg.Aggregation.AggMax;
+import static io.deephaven.engine.table.impl.sources.ReinterpretUtils.byteToBooleanSource;
+import static io.deephaven.engine.table.impl.sources.ReinterpretUtils.longToInstantSource;
+import static io.deephaven.engine.table.impl.sources.ReinterpretUtils.maybeConvertToPrimitiveChunkType;
+import static io.deephaven.engine.testutil.TstUtils.addToTable;
+import static io.deephaven.engine.testutil.TstUtils.assertTableEquals;
+import static io.deephaven.engine.testutil.TstUtils.testRefreshingTable;
+import static io.deephaven.engine.util.TableTools.booleanCol;
+import static io.deephaven.engine.util.TableTools.byteCol;
+import static io.deephaven.engine.util.TableTools.intCol;
+import static io.deephaven.engine.util.TableTools.newTable;
+import static io.deephaven.util.QueryConstants.NULL_INT;
+import static org.assertj.core.api.Assertions.assertThat;
+
+/**
+ * Tests for {@link HierarchicalTable#snapshot(SnapshotState, Table, ColumnName, BitSet, RowSequence, WritableChunk[])
+ * hierarchical table snapshots}.
+ */
+@Category(OutOfBandTest.class)
+public class TestHierarchicalTableSnapshots {
+
+    @Rule
+    public final EngineCleanup framework = new EngineCleanup();
+
+    @Test
+    public void testRollupSnapshotSatisfaction() throws ExecutionException, InterruptedException, TimeoutException {
+        // noinspection resource
+        final QueryTable source = testRefreshingTable(
+                RowSetFactory.fromKeys(10).toTracking(),
+                intCol("A", 1),
+                intCol("B", 2),
+                intCol("C", 3));
+        final RollupTable rollupTable = source.rollup(List.of(AggMax("MaxC=C")), "A", "B");
+
+        final SnapshotState snapshotState = rollupTable.makeSnapshotState();
+
+        final Table expandAllKeys = newTable(
+                intCol(rollupTable.getRowDepthColumn().name(), 0),
+                intCol("A", NULL_INT),
+                intCol("B", NULL_INT),
+                byteCol("Action", HierarchicalTable.KEY_TABLE_ACTION_EXPAND_ALL));
+
+        final Table initialSnapshot = snapshotToTable(rollupTable, snapshotState,
+                expandAllKeys, ColumnName.of("Action"), null, RowSetFactory.flat(4) /* Ask for 1 extra. */);
+        final Table initialExpected = newTable(
+                intCol(rollupTable.getRowDepthColumn().name(), 1, 2, 3),
+                booleanCol(rollupTable.getRowExpandedColumn().name(), true, true, null),
+                intCol("A", NULL_INT, 1, 1),
+                intCol("B", NULL_INT, NULL_INT, 2),
+                intCol("MaxC", 3, 3, 3));
+        assertTableEquals(initialExpected, initialSnapshot);
+        freeSnapshotTableChunks(initialSnapshot);
+
+        final ControlledUpdateGraph updateGraph = ExecutionContext.getContext().getUpdateGraph().cast();
+        final ExecutorService concurrentExecutor = Executors.newSingleThreadScheduledExecutor();
+
+        updateGraph.startCycleForUnitTests();
+        addToTable(source, RowSetFactory.fromKeys(20), intCol("A", 1), intCol("B", 2), intCol("C", 4));
+        source.notifyListeners(new TableUpdateImpl(RowSetFactory.fromKeys(20),
+                RowSetFactory.empty(), RowSetFactory.empty(), RowSetShiftData.EMPTY, ModifiedColumnSet.EMPTY));
+        final Future<Table> snapshotFuture = concurrentExecutor.submit(() -> snapshotToTable(
+                rollupTable, snapshotState, expandAllKeys, ColumnName.of("Action"), null, RowSetFactory.flat(4)));
+        // We need to deliver 3 notifications to ensure that the rollup's 3 aggregation layers are satisfied.
+        // The future cannot complete before that happens.
+        for (int ni = 0; ni < 3; ++ni) {
+            assertThat(snapshotFuture.isDone()).isFalse();
+            updateGraph.flushOneNotificationForUnitTests();
+        }
+        /* @formatter off:
+         * The snapshot thread will be racing to see that the rollup root is satisfied.
+         * There are 2 scenarios:
+         * 1. Snapshot sees that the input is satisfied or waits for it successfully before the cycle is complete, thus
+         *    allowing it to complete concurrently.
+         * 2. Snapshot fails to wait for structural satisfaction before the cycle finishes, and has to re-try, which
+         *    is guaranteed to succeed against the idle cycle.
+         * We cannot control which of these outcomes happens without instrumenting the snapshot to let us gate progress
+         * through its structural satisfaction checks.
+         * @formatter:on */
+        updateGraph.completeCycleForUnitTests();
+
+        final Table updatedSnapshot = snapshotFuture.get(30, TimeUnit.SECONDS);
+        final Table updatedExpected = newTable(
+                intCol(rollupTable.getRowDepthColumn().name(), 1, 2, 3),
+                booleanCol(rollupTable.getRowExpandedColumn().name(), true, true, null),
+                intCol("A", NULL_INT, 1, 1),
+                intCol("B", NULL_INT, NULL_INT, 2),
+                intCol("MaxC", 4, 4, 4));
+        assertTableEquals(updatedExpected, updatedSnapshot);
+        freeSnapshotTableChunks(updatedSnapshot);
+
+        concurrentExecutor.shutdown();
+    }
+
+    @Test
+    public void testTreeSnapshotSatisfaction() throws ExecutionException, InterruptedException, TimeoutException {
+        // noinspection resource
+        final QueryTable source = testRefreshingTable(
+                RowSetFactory.fromKeys(10, 11, 12).toTracking(),
+                intCol("CID", 0, 1, 2),
+                intCol("PID", NULL_INT, 0, 1),
+                intCol("Other", 50, 60, 70));
+        final TreeTable treeTable = source.tree("CID", "PID");
+
+        final SnapshotState snapshotState = treeTable.makeSnapshotState();
+
+        final Table expandAllKeys = newTable(
+                intCol(treeTable.getRowDepthColumn().name(), 0),
+                intCol("CID", NULL_INT),
+                byteCol("Action", HierarchicalTable.KEY_TABLE_ACTION_EXPAND_ALL));
+
+        final Table initialSnapshot = snapshotToTable(treeTable, snapshotState,
+                expandAllKeys, ColumnName.of("Action"), null, RowSetFactory.flat(4));
+        final Table initialExpected = newTable(
+                intCol(treeTable.getRowDepthColumn().name(), 1, 2, 3),
+                booleanCol(treeTable.getRowExpandedColumn().name(), true, true, null),
+                intCol("CID", 0, 1, 2),
+                intCol("PID", NULL_INT, 0, 1),
+                intCol("Other", 50, 60, 70));
+        assertTableEquals(initialExpected, initialSnapshot);
+        freeSnapshotTableChunks(initialSnapshot);
+
+        final ControlledUpdateGraph updateGraph = ExecutionContext.getContext().getUpdateGraph().cast();
+        final ExecutorService concurrentExecutor = Executors.newSingleThreadScheduledExecutor();
+
+        updateGraph.startCycleForUnitTests();
+        addToTable(source, RowSetFactory.fromKeys(20), intCol("CID", 3), intCol("PID", 2), intCol("Other", 800));
+        source.notifyListeners(new TableUpdateImpl(RowSetFactory.fromKeys(20),
+                RowSetFactory.empty(), RowSetFactory.empty(), RowSetShiftData.EMPTY, ModifiedColumnSet.EMPTY));
+        final Future<Table> snapshotFuture = concurrentExecutor.submit(() -> snapshotToTable(
+                treeTable, snapshotState, expandAllKeys, ColumnName.of("Action"), null, RowSetFactory.flat(5)));
+        // We need to deliver 2 notifications to ensure that the tree's partition and lookup aggregations are satisfied.
+        // The future cannot complete before that happens.
+        for (int ni = 0; ni < 2; ++ni) {
+            assertThat(snapshotFuture.isDone()).isFalse();
+            updateGraph.flushOneNotificationForUnitTests();
+        }
+        /* @formatter off:
+         * The snapshot thread will be racing to see that the tree and sourceRowLookup are satisfied.
+         * There are 2 scenarios:
+         * 1. Snapshot sees that any combination of the two inputs are satisfied, and waits for any unsatisfied input(s)
+         *    successfully before the cycle is complete, thus allowing it to complete concurrently.
+         * 2. Snapshot fails to wait for structural satisfaction before the cycle finishes, and has to re-try, which
+         *    is guaranteed to succeed against the idle cycle.
+         * We cannot control which of these outcomes happens without instrumenting the snapshot to let us gate progress
+         * through its structural satisfaction checks.
+         * @formatter:on */
+        updateGraph.completeCycleForUnitTests();
+
+        final Table updatedSnapshot = snapshotFuture.get(30, TimeUnit.SECONDS);
+        final Table updatedExpected = newTable(
+                intCol(treeTable.getRowDepthColumn().name(), 1, 2, 3, 4),
+                booleanCol(treeTable.getRowExpandedColumn().name(), true, true, true, null),
+                intCol("CID", 0, 1, 2, 3),
+                intCol("PID", NULL_INT, 0, 1, 2),
+                intCol("Other", 50, 60, 70, 800));
+        assertTableEquals(updatedExpected, updatedSnapshot);
+        freeSnapshotTableChunks(updatedSnapshot);
+
+        concurrentExecutor.shutdown();
+    }
+
+    @SuppressWarnings("SameParameterValue")
+    private static Table snapshotToTable(
+            @NotNull final HierarchicalTable<?> hierarchicalTable,
+            @NotNull final SnapshotState snapshotState,
+            @NotNull final Table keyTable,
+            @Nullable final ColumnName keyTableActionColumn,
+            @Nullable final BitSet columns,
+            @NotNull final RowSequence rows) {
+        final ColumnDefinition<?>[] availableColumns =
+                hierarchicalTable.getAvailableColumnDefinitions().toArray(ColumnDefinition[]::new);
+        final ColumnDefinition<?>[] includedColumns = columns == null
+                ? availableColumns
+                : columns.stream().mapToObj(ci -> availableColumns[ci]).toArray(ColumnDefinition[]::new);
+
+        assertThat(rows.isContiguous()).isTrue();
+        final int rowsSize = rows.intSize();
+        // noinspection rawtypes
+        final WritableChunk[] chunks = Arrays.stream(includedColumns)
+                .map(cd -> maybeConvertToPrimitiveChunkType(cd.getDataType()))
+                .map(ct -> ct.makeWritableChunk(rowsSize))
+                .toArray(WritableChunk[]::new);
+
+        // noinspection unchecked
+        final long expandedSize =
+                hierarchicalTable.snapshot(snapshotState, keyTable, keyTableActionColumn, columns, rows, chunks);
+        final int snapshotSize = chunks.length == 0 ? 0 : chunks[0].size();
+        final long expectedSnapshotSize = rows.isEmpty()
+                ? 0
+                : Math.min(rows.lastRowKey() + 1, expandedSize) - rows.firstRowKey();
+        assertThat(snapshotSize).isEqualTo(expectedSnapshotSize);
+
+        final LinkedHashMap<String, ColumnSource<?>> sources = new LinkedHashMap<>(includedColumns.length);
+        for (int ci = 0; ci < includedColumns.length; ++ci) {
+            final ColumnDefinition<?> columnDefinition = includedColumns[ci];
+            // noinspection unchecked
+            final WritableChunk<? extends Values> chunk = chunks[ci];
+            final ChunkColumnSource<?> chunkColumnSource = ChunkColumnSource.make(
+                    chunk.getChunkType(), columnDefinition.getDataType(), columnDefinition.getComponentType());
+            chunkColumnSource.addChunk(chunk);
+            final ColumnSource<?> source;
+            if (columnDefinition.getDataType() == Boolean.class && chunkColumnSource.getType() == byte.class) {
+                // noinspection unchecked
+                source = byteToBooleanSource((ColumnSource<Byte>) chunkColumnSource);
+            } else if (columnDefinition.getDataType() == Instant.class && chunkColumnSource.getType() == long.class) {
+                // noinspection unchecked
+                source = longToInstantSource((ColumnSource<Long>) chunkColumnSource);
+            } else {
+                source = chunkColumnSource;
+            }
+            sources.put(columnDefinition.getName(), source);
+        }
+
+        // noinspection resource
+        return new QueryTable(
+                TableDefinition.of(includedColumns),
+                RowSetFactory.flat(snapshotSize).toTracking(),
+                sources);
+    }
+
+    private static void freeSnapshotTableChunks(@NotNull final Table snapshotTable) {
+        snapshotTable.getColumnSources().forEach(cs -> {
+            if (cs instanceof ByteAsBooleanColumnSource) {
+                ((ChunkColumnSource<?>) cs.reinterpret(byte.class)).clear();
+            } else if (cs instanceof LongAsInstantColumnSource) {
+                ((ChunkColumnSource<?>) cs.reinterpret(long.class)).clear();
+            } else {
+                ((ChunkColumnSource<?>) cs).clear();
+            }
+        });
+    }
+}
diff --git a/engine/table/src/test/java/io/deephaven/engine/table/impl/TestMapCodecColumns.java b/engine/table/src/test/java/io/deephaven/engine/table/impl/TestMapCodecColumns.java
index e3d135b5427..dac39a3be5a 100644
--- a/engine/table/src/test/java/io/deephaven/engine/table/impl/TestMapCodecColumns.java
+++ b/engine/table/src/test/java/io/deephaven/engine/table/impl/TestMapCodecColumns.java
@@ -4,7 +4,6 @@
 package io.deephaven.engine.table.impl;
 
 import io.deephaven.base.FileUtils;
-import io.deephaven.datastructures.util.CollectionUtil;
 import io.deephaven.engine.table.ColumnDefinition;
 import io.deephaven.engine.table.Table;
 import io.deephaven.engine.table.TableDefinition;
@@ -14,7 +13,7 @@
 import io.deephaven.engine.util.TableTools;
 import io.deephaven.parquet.table.ParquetInstructions;
 import io.deephaven.util.codec.*;
-import junit.framework.TestCase;
+import org.junit.Assert;
 import org.junit.Before;
 import org.junit.Rule;
 import org.junit.Test;
@@ -24,6 +23,7 @@
 import java.nio.file.Files;
 import java.nio.file.Paths;
 import java.util.Collections;
+import java.util.LinkedHashMap;
 import java.util.Map;
 
 /**
@@ -77,26 +77,26 @@ public class TestMapCodecColumns {
     public void setUp() {
         table = TableTools.newTable(TABLE_DEFINITION,
                 TableTools.col("StrStrMap",
-                        CollectionUtil.mapFromArray(String.class, String.class, "AK", "AV", "BK", "BV"),
+                        mapFromArray("AK", "AV", "BK", "BV"),
                         null, Collections.singletonMap("Key", "Value")),
                 TableTools.col("StrBoolMap",
-                        CollectionUtil.mapFromArray(String.class, Boolean.class, "True", true, "False", false, "Null",
+                        mapFromArray("True", true, "False", false, "Null",
                                 null),
                         null, Collections.singletonMap("Truthiness", true)),
                 TableTools.col("StrDoubleMap",
-                        CollectionUtil.mapFromArray(String.class, Double.class, "One", 1.0, "Two", 2.0, "Null", null),
+                        mapFromArray("One", 1.0, "Two", 2.0, "Null", null),
                         null,
                         Collections.singletonMap("Pi", Math.PI)),
                 TableTools.col("StrFloatMap",
-                        CollectionUtil.mapFromArray(String.class, Float.class, "Ten", 10.0f, "Twenty", 20.0f, "Null",
+                        mapFromArray("Ten", 10.0f, "Twenty", 20.0f, "Null",
                                 null),
                         null, Collections.singletonMap("e", (float) Math.E)),
                 TableTools.col("StrIntMap",
-                        CollectionUtil.mapFromArray(String.class, Integer.class, "Million", 1_000_000, "Billion",
+                        mapFromArray("Million", 1_000_000, "Billion",
                                 1_000_000_000, "Null", null),
                         null, Collections.singletonMap("Negative", -1)),
                 TableTools.col("StrLongMap",
-                        CollectionUtil.mapFromArray(String.class, Long.class, "Trillion", 1_000_000_000_000L,
+                        mapFromArray("Trillion", 1_000_000_000_000L,
                                 "Billion", 1_000_000_000L, "Null", null),
                         null, Collections.singletonMap("Negative", -1L)));
     }
@@ -104,15 +104,36 @@ public void setUp() {
     @Test
     public void doColumnsTest() throws IOException {
         final File dir = Files.createTempDirectory(Paths.get(""), "CODEC_TEST").toFile();
-        final File dest = new File(dir, "Table.parquet");
+        final String dest = new File(dir, "Table.parquet").getPath();
         try {
-            ParquetTools.writeTable(table, dest.getPath(), writeInstructions);
-            final Table result = ParquetTools.readTable(dest.getPath());
-            TableTools.show(result);
-            TestCase.assertEquals(TABLE_DEFINITION, result.getDefinition());
-            TstUtils.assertTableEquals(table, result);
+            ParquetTools.writeTable(table, dest, writeInstructions);
+            doColumnsTestHelper(dest);
         } finally {
             FileUtils.deleteRecursively(dir);
         }
     }
+
+    @Test
+    public void doLegacyColumnsTest() {
+        // Make sure that we can read legacy data encoded with the old codec implementations.
+        final String dest =
+                TestMapCodecColumns.class.getResource("/ReferenceParquetWithMapCodecData.parquet").getFile();
+        doColumnsTestHelper(dest);
+    }
+
+    private void doColumnsTestHelper(final String dest) {
+        final Table result = ParquetTools.readTable(dest);
+        TableTools.show(result);
+        Assert.assertEquals(TABLE_DEFINITION, result.getDefinition());
+        TstUtils.assertTableEquals(table, result);
+    }
+
+    @SuppressWarnings({"unchecked"})
+    public static <K, V> Map<K, V> mapFromArray(Object... data) {
+        Map<K, V> map = new LinkedHashMap<K, V>();
+        for (int nIndex = 0; nIndex < data.length; nIndex += 2) {
+            map.put((K) data[nIndex], (V) data[nIndex + 1]);
+        }
+        return map;
+    }
 }
diff --git a/engine/table/src/test/java/io/deephaven/engine/table/impl/TestPartitionAwareSourceTable.java b/engine/table/src/test/java/io/deephaven/engine/table/impl/TestPartitionAwareSourceTable.java
index f6b838c0646..a755e0253b5 100644
--- a/engine/table/src/test/java/io/deephaven/engine/table/impl/TestPartitionAwareSourceTable.java
+++ b/engine/table/src/test/java/io/deephaven/engine/table/impl/TestPartitionAwareSourceTable.java
@@ -5,11 +5,10 @@
 
 import io.deephaven.base.Pair;
 import io.deephaven.base.verify.Assert;
-import io.deephaven.datastructures.util.CollectionUtil;
 import io.deephaven.engine.context.ExecutionContext;
-import io.deephaven.engine.rowset.WritableRowSet;
-import io.deephaven.engine.rowset.RowSet;
-import io.deephaven.engine.rowset.RowSetFactory;
+import io.deephaven.engine.liveness.LiveSupplier;
+import io.deephaven.engine.liveness.ReferenceCountedLivenessNode;
+import io.deephaven.engine.rowset.*;
 import io.deephaven.engine.table.*;
 import io.deephaven.engine.table.impl.perf.PerformanceEntry;
 import io.deephaven.engine.table.vectors.ColumnVectors;
@@ -25,8 +24,8 @@
 import io.deephaven.chunk.ChunkType;
 import io.deephaven.chunk.WritableChunk;
 import io.deephaven.chunk.WritableIntChunk;
-import io.deephaven.engine.rowset.RowSequence;
 import io.deephaven.qst.column.Column;
+import io.deephaven.util.type.ArrayTypeUtils;
 import io.deephaven.vector.ObjectVector;
 import org.jetbrains.annotations.NotNull;
 import org.jmock.api.Invocation;
@@ -35,6 +34,7 @@
 import org.junit.Before;
 import org.junit.Test;
 
+import javax.annotation.OverridingMethodsMustInvokeSuper;
 import java.lang.ref.WeakReference;
 import java.util.*;
 import java.util.stream.Collectors;
@@ -49,6 +49,38 @@
 @SuppressWarnings({"AutoBoxing", "JUnit4AnnotatedMethodInJUnit3TestCase", "AnonymousInnerClassMayBeStatic"})
 public class TestPartitionAwareSourceTable extends RefreshingTableTestCase {
 
+    private static class TestKeySupplier extends ReferenceCountedLivenessNode
+            implements LiveSupplier<ImmutableTableLocationKey> {
+
+        private final ImmutableTableLocationKey key;
+
+        private TableLocation tableLocation;
+
+        TestKeySupplier(
+                final ImmutableTableLocationKey key) {
+            super(false);
+            this.key = key;
+        }
+
+        @Override
+        public ImmutableTableLocationKey get() {
+            return key;
+        }
+
+        public synchronized void setTableLocation(final TableLocation tableLocation) {
+            Assert.eqNull(this.tableLocation, "this.tableLocation");
+            manage(tableLocation);
+            this.tableLocation = tableLocation;
+        }
+
+        @OverridingMethodsMustInvokeSuper
+        @Override
+        protected synchronized void destroy() {
+            super.destroy();
+            tableLocation = null;
+        }
+    }
+
     private static final int NUM_COLUMNS = 5;
     private static final ColumnDefinition<String> PARTITIONING_COLUMN_DEFINITION =
             ColumnDefinition.ofString("Date").withPartitioning();
@@ -110,6 +142,15 @@ public void setUp() throws Exception {
             return mocked;
         }).toArray(ColumnSource[]::new);
         locationProvider = mock(TableLocationProvider.class);
+        checking(new Expectations() {
+            {
+                allowing(locationProvider).getUpdateMode();
+                will(returnValue(TableUpdateMode.ADD_REMOVE));
+                allowing(locationProvider).getLocationUpdateMode();
+                will(returnValue(TableUpdateMode.ADD_REMOVE));
+            }
+        });
+
         tableLocationKeys = IntStream.range(0, 6).mapToObj(tlki -> {
             final Map<String, Comparable<?>> partitions = new LinkedHashMap<>();
             partitions.put(PARTITIONING_COLUMN_DEFINITION.getName(), COLUMN_PARTITIONS[tlki]);
@@ -151,6 +192,10 @@ public void setUp() throws Exception {
                 allowing(columnSourceManager).getWeakReference();
                 will(returnValue(new WeakReference<>(columnSourceManager)));
                 allowing(columnSourceManager).dropReference();
+                allowing(columnSourceManager).getTableAttributes(with(any(TableUpdateMode.class)),
+                        with(any(TableUpdateMode.class)));
+                will(returnValue(Collections.EMPTY_MAP));
+
             }
         });
 
@@ -165,6 +210,7 @@ public void setUp() throws Exception {
     @Override
     public void tearDown() throws Exception {
         try {
+            allowLivenessRelease();
             super.tearDown();
         } finally {
             if (coalesced != null) {
@@ -174,6 +220,22 @@ public void tearDown() throws Exception {
         }
     }
 
+    private void allowLivenessRelease() {
+        checking(new Expectations() {
+            {
+                allowing(locationProvider).supportsSubscriptions();
+                allowing(locationProvider).unsubscribe(with(any(TableLocationProvider.Listener.class)));
+                will(returnValue(true));
+                for (int li = 0; li < tableLocations.length; ++li) {
+                    final TableLocation tableLocation = tableLocations[li];
+                    allowing(tableLocation).supportsSubscriptions();
+                    will(returnValue(true));
+                    allowing(tableLocation).unsubscribe(with(any(TableLocation.Listener.class)));
+                }
+            }
+        });
+    }
+
     private Map<String, ? extends ColumnSource<?>> getIncludedColumnsMap(final int... indices) {
         return IntStream.of(indices)
                 .mapToObj(ci -> new Pair<>(TABLE_DEFINITION.getColumns().get(ci).getName(), columnSources[ci]))
@@ -250,7 +312,8 @@ private void doInitializeCheck(final ImmutableTableLocationKey[] tableLocationKe
                     @Override
                     public Object invoke(Invocation invocation) {
                         subscriptionBuffer = (TableLocationSubscriptionBuffer) invocation.getParameter(0);
-                        Arrays.stream(tableLocationKeys).forEach(subscriptionBuffer::handleTableLocationKey);
+                        Arrays.stream(tableLocationKeys).map(TestKeySupplier::new)
+                                .forEach(subscriptionBuffer::handleTableLocationKeyAdded);
                         return null;
                     }
                 });
@@ -320,7 +383,8 @@ private void doRefreshChangedCheck() {
         checking(new Expectations() {
             {
                 oneOf(columnSourceManager).refresh();
-                will(returnValue(toAdd.copy()));
+                will(returnValue(new TableUpdateImpl(toAdd.copy(), RowSetFactory.empty(), RowSetFactory.empty(),
+                        RowSetShiftData.EMPTY, ModifiedColumnSet.ALL)));
                 checking(new Expectations() {
                     {
                         oneOf(listener).getNotification(with(any(TableUpdateImpl.class)));
@@ -360,7 +424,9 @@ private void doRefreshUnchangedCheck() {
         checking(new Expectations() {
             {
                 oneOf(columnSourceManager).refresh();
-                will(returnValue(RowSetFactory.empty()));
+                will(returnValue(
+                        new TableUpdateImpl(RowSetFactory.empty(), RowSetFactory.empty(), RowSetFactory.empty(),
+                                RowSetShiftData.EMPTY, ModifiedColumnSet.ALL)));
             }
         });
 
@@ -396,6 +462,7 @@ public Object invoke(Invocation invocation) {
         errorNotification.reset();
         final ControlledUpdateGraph updateGraph = ExecutionContext.getContext().getUpdateGraph().cast();
         updateGraph.runWithinUnitTestCycle(() -> {
+            allowLivenessRelease();
             SUT.refresh();
             updateGraph.markSourcesRefreshedForUnitTests();
         }, false);
@@ -407,7 +474,8 @@ public Object invoke(Invocation invocation) {
 
     private void doAddLocationsRefreshCheck(final ImmutableTableLocationKey[] tableLocationKeys,
             final Set<TableLocation> expectPassFilters) {
-        Arrays.stream(tableLocationKeys).forEach(subscriptionBuffer::handleTableLocationKey);
+        Arrays.stream(tableLocationKeys).map(TestKeySupplier::new)
+                .forEach(subscriptionBuffer::handleTableLocationKeyAdded);
 
         expectPassFilters.forEach(tl -> checking(new Expectations() {
             {
@@ -697,7 +765,7 @@ public Object invoke(@NotNull final Invocation invocation) {
             }
         });
         assertRowSetEquals(expectedRowSet, SUT.where(INTEGER_COLUMN_DEFINITION.getName() + ">0")
-                .where(CollectionUtil.ZERO_LENGTH_STRING_ARRAY).getRowSet());
+                .where(ArrayTypeUtils.EMPTY_STRING_ARRAY).getRowSet());
         assertIsSatisfied();
     }
 
diff --git a/engine/table/src/test/java/io/deephaven/engine/table/impl/TestPartitioningColumns.java b/engine/table/src/test/java/io/deephaven/engine/table/impl/TestPartitioningColumns.java
index adb04b08fa5..2da405b3c05 100644
--- a/engine/table/src/test/java/io/deephaven/engine/table/impl/TestPartitioningColumns.java
+++ b/engine/table/src/test/java/io/deephaven/engine/table/impl/TestPartitioningColumns.java
@@ -3,31 +3,24 @@
 //
 package io.deephaven.engine.table.impl;
 
-import io.deephaven.api.SortColumn;
 import io.deephaven.api.filter.Filter;
 import io.deephaven.base.verify.Assert;
-import io.deephaven.chunk.attributes.Values;
 import io.deephaven.engine.primitive.iterator.CloseableIterator;
 import io.deephaven.engine.rowset.RowSet;
 import io.deephaven.engine.table.*;
 import io.deephaven.engine.table.impl.dataindex.DataIndexUtils;
 import io.deephaven.engine.table.impl.indexer.DataIndexer;
+import io.deephaven.engine.table.impl.locations.TableLocationProvider;
 import io.deephaven.engine.table.impl.select.MatchFilter.MatchType;
 import io.deephaven.engine.table.iterators.ChunkedColumnIterator;
 import io.deephaven.engine.testutil.TstUtils;
 import io.deephaven.engine.testutil.junit4.EngineCleanup;
 import io.deephaven.time.DateTimeUtils;
-import io.deephaven.engine.table.impl.locations.ColumnLocation;
-import io.deephaven.engine.table.impl.locations.TableKey;
-import io.deephaven.engine.table.impl.locations.TableLocation;
-import io.deephaven.engine.table.impl.locations.TableLocationKey;
 import io.deephaven.engine.table.impl.locations.impl.*;
 import io.deephaven.engine.table.impl.select.MatchFilter;
 import io.deephaven.engine.table.impl.select.WhereFilter;
 import io.deephaven.engine.table.impl.sources.regioned.*;
 import io.deephaven.engine.rowset.RowSetFactory;
-import org.jetbrains.annotations.NotNull;
-import org.jetbrains.annotations.Nullable;
 import org.junit.Rule;
 import org.junit.Test;
 
@@ -88,7 +81,9 @@ public void testEverything() {
                             tl.handleUpdate(RowSetFactory.flat(1), 1L);
                             return tl;
                         },
-                        null),
+                        null,
+                        TableUpdateMode.STATIC,
+                        TableUpdateMode.STATIC),
                 null);
 
         for (String colName : partitionKeys) {
@@ -121,7 +116,6 @@ public void testEverything() {
                     Assert.eqTrue(fullRowSet.containsRange(rowKey, rowKey), "fullRowSet.containsRange(rowKey, rowKey)");
                 }
             }
-
         }
 
         final Table expected = input.sort(input.getDefinition().getColumnNamesArray());
@@ -135,109 +129,4 @@ public void testEverything() {
 
         TstUtils.assertTableEquals(expected.selectDistinct(), result.selectDistinct());
     }
-
-    private static final class DummyTableLocation extends AbstractTableLocation {
-
-        private DummyTableLocation(@NotNull final TableKey tableKey,
-                @NotNull final TableLocationKey tableLocationKey) {
-            super(tableKey, tableLocationKey, false);
-        }
-
-        @Override
-        public void refresh() {}
-
-        @Override
-        public @NotNull List<SortColumn> getSortedColumns() {
-            return List.of();
-        }
-
-        @Override
-        @NotNull
-        public List<String[]> getDataIndexColumns() {
-            return List.of();
-        }
-
-        @Override
-        public boolean hasDataIndex(@NotNull final String... columns) {
-            return false;
-        }
-
-        @NotNull
-        @Override
-        protected ColumnLocation makeColumnLocation(@NotNull final String name) {
-            return new ColumnLocation() {
-                @NotNull
-                @Override
-                public TableLocation getTableLocation() {
-                    return DummyTableLocation.this;
-                }
-
-                @NotNull
-                @Override
-                public String getName() {
-                    return name;
-                }
-
-                @Override
-                public boolean exists() {
-                    throw new UnsupportedOperationException();
-                }
-
-                @Override
-                public ColumnRegionChar<Values> makeColumnRegionChar(
-                        @NotNull final ColumnDefinition<?> columnDefinition) {
-                    throw new UnsupportedOperationException();
-                }
-
-                @Override
-                public ColumnRegionByte<Values> makeColumnRegionByte(
-                        @NotNull final ColumnDefinition<?> columnDefinition) {
-                    throw new UnsupportedOperationException();
-                }
-
-                @Override
-                public ColumnRegionShort<Values> makeColumnRegionShort(
-                        @NotNull final ColumnDefinition<?> columnDefinition) {
-                    throw new UnsupportedOperationException();
-                }
-
-                @Override
-                public ColumnRegionInt<Values> makeColumnRegionInt(
-                        @NotNull final ColumnDefinition<?> columnDefinition) {
-                    throw new UnsupportedOperationException();
-                }
-
-                @Override
-                public ColumnRegionLong<Values> makeColumnRegionLong(
-                        @NotNull final ColumnDefinition<?> columnDefinition) {
-                    throw new UnsupportedOperationException();
-                }
-
-                @Override
-                public ColumnRegionFloat<Values> makeColumnRegionFloat(
-                        @NotNull final ColumnDefinition<?> columnDefinition) {
-                    throw new UnsupportedOperationException();
-                }
-
-                @Override
-                public ColumnRegionDouble<Values> makeColumnRegionDouble(
-                        @NotNull final ColumnDefinition<?> columnDefinition) {
-                    throw new UnsupportedOperationException();
-                }
-
-                @Override
-                public <TYPE> ColumnRegionObject<TYPE, Values> makeColumnRegionObject(
-                        @NotNull final ColumnDefinition<TYPE> columnDefinition) {
-                    throw new UnsupportedOperationException();
-                }
-
-            };
-        }
-
-        @Override
-        @Nullable
-        public BasicDataIndex loadDataIndex(@NotNull final String... columns) {
-            throw new UnsupportedOperationException();
-        }
-    }
 }
diff --git a/engine/table/src/test/java/io/deephaven/engine/table/impl/TestRollup.java b/engine/table/src/test/java/io/deephaven/engine/table/impl/TestRollup.java
new file mode 100644
index 00000000000..d50471f4c93
--- /dev/null
+++ b/engine/table/src/test/java/io/deephaven/engine/table/impl/TestRollup.java
@@ -0,0 +1,124 @@
+//
+// Copyright (c) 2016-2024 Deephaven Data Labs and Patent Pending
+//
+package io.deephaven.engine.table.impl;
+
+import io.deephaven.api.agg.Aggregation;
+import io.deephaven.engine.table.Table;
+import io.deephaven.engine.table.hierarchical.RollupTable;
+import io.deephaven.engine.testutil.*;
+import io.deephaven.engine.testutil.generator.*;
+import io.deephaven.engine.testutil.testcase.RefreshingTableTestCase;
+import io.deephaven.test.types.OutOfBandTest;
+import org.junit.Test;
+import org.junit.experimental.categories.Category;
+
+import java.util.*;
+
+import static io.deephaven.api.agg.Aggregation.*;
+import static io.deephaven.engine.testutil.TstUtils.*;
+
+@Category(OutOfBandTest.class)
+public class TestRollup extends RefreshingTableTestCase {
+    // This is the list of supported aggregations for rollup. These are all using `intCol` as the column to aggregate
+    // because the re-aggregation logic is effectively the same for all column types.
+    private final Collection<Aggregation> aggs = List.of(
+            AggAbsSum("absSum=intCol"),
+            AggAvg("avg=intCol"),
+            AggCount("count"),
+            AggCountWhere("countWhere", "intCol > 50"),
+            AggCountDistinct("countDistinct=intCol"),
+            AggDistinct("distinct=intCol"),
+            AggFirst("first=intCol"),
+            AggLast("last=intCol"),
+            AggMax("max=intCol"),
+            AggMin("min=intCol"),
+            AggSortedFirst("Sym", "firstSorted=intCol"),
+            AggSortedLast("Sym", "lastSorted=intCol"),
+            AggStd("std=intCol"),
+            AggSum("sum=intCol"),
+            AggUnique("unique=intCol"),
+            AggVar("var=intCol"),
+            AggWAvg("intCol", "wavg=intCol"),
+            AggWSum("intCol", "wsum=intCol"));
+
+    // Companion list of columns to compare between rollup root and the zero-key equivalent
+    private final String[] columnsToCompare = new String[] {
+            "absSum",
+            "avg",
+            "count",
+            "countWhere",
+            "countDistinct",
+            "distinct",
+            "first",
+            "last",
+            "max",
+            "min",
+            "firstSorted",
+            "lastSorted",
+            "std",
+            "sum",
+            "unique",
+            "var",
+            "wavg",
+            "wsum"
+    };
+
+    @SuppressWarnings("rawtypes")
+    private final ColumnInfo[] columnInfo = initColumnInfos(
+            new String[] {"Sym", "intCol"},
+            new SetGenerator<>("a", "b", "c", "d"),
+            new IntGenerator(10, 100));
+
+    private QueryTable createTable(boolean refreshing, int size, Random random) {
+        return getTable(refreshing, size, random, columnInfo);
+    }
+
+    @Override
+    public void setUp() throws Exception {
+        super.setUp();
+    }
+
+    @Test
+    public void testRollup() {
+        final Random random = new Random(0);
+        // Create the test table
+        final Table testTable = createTable(false, 100_000, random);
+
+        final RollupTable rollupTable = testTable.rollup(aggs, false, "Sym");
+        final Table rootTable = rollupTable.getRoot();
+
+        final Table actual = rootTable.select(columnsToCompare);
+        final Table expected = testTable.aggBy(aggs);
+
+        // Compare the zero-key equivalent table to the rollup table root
+        TstUtils.assertTableEquals(actual, expected);
+    }
+
+    @Test
+    public void testRollupIncremental() {
+        for (int size = 10; size <= 1000; size *= 10) {
+            testRollupIncrementalInternal("size-" + size, size);
+        }
+    }
+
+    private void testRollupIncrementalInternal(final String ctxt, final int size) {
+        final Random random = new Random(0);
+
+        final QueryTable testTable = createTable(true, size * 10, random);
+        EvalNuggetInterface[] en = new EvalNuggetInterface[] {
+                new QueryTableTest.TableComparator(
+                        testTable.rollup(aggs, false, "Sym")
+                                .getRoot().select(columnsToCompare),
+                        testTable.aggBy(aggs))
+        };
+
+        final int steps = 100;
+        for (int step = 0; step < steps; step++) {
+            if (RefreshingTableTestCase.printTableUpdates) {
+                System.out.println("Step = " + step);
+            }
+            simulateShiftAwareStep(ctxt + " step == " + step, size, random, testTable, columnInfo, en);
+        }
+    }
+}
diff --git a/engine/table/src/test/java/io/deephaven/engine/table/impl/TestSimpleSourceTable.java b/engine/table/src/test/java/io/deephaven/engine/table/impl/TestSimpleSourceTable.java
index 435077fe280..48c994ebe4a 100644
--- a/engine/table/src/test/java/io/deephaven/engine/table/impl/TestSimpleSourceTable.java
+++ b/engine/table/src/test/java/io/deephaven/engine/table/impl/TestSimpleSourceTable.java
@@ -6,10 +6,9 @@
 import io.deephaven.base.Pair;
 import io.deephaven.base.verify.Assert;
 import io.deephaven.engine.context.ExecutionContext;
-import io.deephaven.engine.table.ColumnDefinition;
-import io.deephaven.engine.table.ColumnSource;
-import io.deephaven.engine.table.Table;
-import io.deephaven.engine.table.TableDefinition;
+import io.deephaven.engine.liveness.LiveSupplier;
+import io.deephaven.engine.table.*;
+import io.deephaven.engine.table.impl.locations.ImmutableTableLocationKey;
 import io.deephaven.engine.testutil.testcase.RefreshingTableTestCase;
 import io.deephaven.engine.table.impl.locations.TableDataException;
 import io.deephaven.engine.table.impl.locations.TableLocation;
@@ -18,11 +17,15 @@
 import io.deephaven.engine.rowset.WritableRowSet;
 import io.deephaven.engine.rowset.RowSet;
 import io.deephaven.engine.rowset.RowSetFactory;
+import org.jmock.api.Invocation;
+import org.jmock.lib.action.CustomAction;
 import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;
 
+import java.lang.ref.WeakReference;
 import java.util.*;
+import java.util.function.Consumer;
 import java.util.stream.Collectors;
 import java.util.stream.IntStream;
 
@@ -55,6 +58,7 @@ public class TestSimpleSourceTable extends RefreshingTableTestCase {
 
     private TableLocationProvider locationProvider;
     private TableLocation tableLocation;
+    private LiveSupplier<ImmutableTableLocationKey> keySupplier;
 
     private WritableRowSet expectedRowSet;
 
@@ -70,7 +74,10 @@ public void setUp() throws Exception {
         checking(new Expectations() {
             {
                 allowing(columnSourceManager).allLocations();
-                will(returnValue(Collections.EMPTY_SET));
+                will(returnValue(Collections.EMPTY_MAP));
+                allowing(columnSourceManager).getTableAttributes(with(any(TableUpdateMode.class)),
+                        with(any(TableUpdateMode.class)));
+                will(returnValue(Collections.EMPTY_MAP));
             }
         });
 
@@ -88,14 +95,38 @@ public void setUp() throws Exception {
             });
             return mocked;
         }).toArray(ColumnSource[]::new);
+        keySupplier = mock(LiveSupplier.class);
         locationProvider = mock(TableLocationProvider.class);
         tableLocation = mock(TableLocation.class);
         checking(new Expectations() {
             {
+                allowing(keySupplier).get();
+                will(returnValue(StandaloneTableLocationKey.getInstance()));
+                allowing(keySupplier).tryRetainReference();
+                will(returnValue(true));
+                allowing(keySupplier).getWeakReference();
+                will(returnValue(new WeakReference<>(keySupplier)));
+                allowing(keySupplier).retainReference();
+                allowing(keySupplier).dropReference();
+
                 allowing(locationProvider).getTableLocationKeys();
                 will(returnValue(Collections.singleton(StandaloneTableLocationKey.getInstance())));
+                allowing(locationProvider).getTableLocationKeys(with(any(Consumer.class)));
+                will(new CustomAction("check added") {
+                    @Override
+                    public Object invoke(Invocation invocation) {
+                        final Consumer<LiveSupplier<ImmutableTableLocationKey>> consumer =
+                                (Consumer<LiveSupplier<ImmutableTableLocationKey>>) invocation.getParameter(0);
+                        consumer.accept(keySupplier);
+                        return null;
+                    }
+                });
                 allowing(locationProvider).getTableLocation(with(StandaloneTableLocationKey.getInstance()));
                 will(returnValue(tableLocation));
+                allowing(locationProvider).getUpdateMode();
+                will(returnValue(TableUpdateMode.STATIC));
+                allowing(locationProvider).getLocationUpdateMode();
+                will(returnValue(TableUpdateMode.STATIC));
                 allowing(tableLocation).supportsSubscriptions();
                 will(returnValue(true));
                 allowing(tableLocation).getKey();
diff --git a/engine/table/src/test/java/io/deephaven/engine/table/impl/lang/TestQueryLanguageParser.java b/engine/table/src/test/java/io/deephaven/engine/table/impl/lang/TestQueryLanguageParser.java
index 32523cbf766..4f1558f0c1d 100644
--- a/engine/table/src/test/java/io/deephaven/engine/table/impl/lang/TestQueryLanguageParser.java
+++ b/engine/table/src/test/java/io/deephaven/engine/table/impl/lang/TestQueryLanguageParser.java
@@ -3178,7 +3178,7 @@ private void check(String expression, String resultExpression, Class<?> resultTy
         final Map<String, Object> possibleParams;
         final QueryScope queryScope = ExecutionContext.getContext().getQueryScope();
         if (!(queryScope instanceof PoisonedQueryScope)) {
-            possibleParams = QueryCompilerRequestProcessor.newQueryScopeVariableSupplier().get();
+            possibleParams = QueryCompilerRequestProcessor.newFormulaImportsSupplier().get().getQueryScopeVariables();
         } else {
             possibleParams = null;
         }
diff --git a/engine/table/src/test/java/io/deephaven/engine/table/impl/locations/impl/SimpleTableLocationKey.java b/engine/table/src/test/java/io/deephaven/engine/table/impl/locations/impl/SimpleTableLocationKey.java
index 55ebb48429a..6d7d1817fdf 100644
--- a/engine/table/src/test/java/io/deephaven/engine/table/impl/locations/impl/SimpleTableLocationKey.java
+++ b/engine/table/src/test/java/io/deephaven/engine/table/impl/locations/impl/SimpleTableLocationKey.java
@@ -4,8 +4,6 @@
 package io.deephaven.engine.table.impl.locations.impl;
 
 import io.deephaven.base.log.LogOutput;
-import io.deephaven.engine.table.impl.locations.TableLocationKey;
-import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
 import java.util.Map;
@@ -31,23 +29,4 @@ public LogOutput append(LogOutput logOutput) {
         return logOutput.append(getImplementationName()).append("[partitions=")
                 .append(PartitionsFormatter.INSTANCE, partitions).append(']');
     }
-
-    @Override
-    public int compareTo(@NotNull final TableLocationKey other) {
-        if (other instanceof SimpleTableLocationKey) {
-            return PartitionsComparator.INSTANCE.compare(partitions, ((SimpleTableLocationKey) other).partitions);
-        }
-        throw new ClassCastException("Cannot compare " + getClass() + " to " + other.getClass());
-    }
-
-    @Override
-    public int hashCode() {
-        return partitions.hashCode();
-    }
-
-    @Override
-    public boolean equals(final Object other) {
-        return other == this || (other instanceof SimpleTableLocationKey
-                && partitions.equals(((SimpleTableLocationKey) other).partitions));
-    }
 }
diff --git a/engine/table/src/test/java/io/deephaven/engine/table/impl/locations/impl/TestTableDataService.java b/engine/table/src/test/java/io/deephaven/engine/table/impl/locations/impl/TestTableDataService.java
new file mode 100644
index 00000000000..100485541e7
--- /dev/null
+++ b/engine/table/src/test/java/io/deephaven/engine/table/impl/locations/impl/TestTableDataService.java
@@ -0,0 +1,97 @@
+//
+// Copyright (c) 2016-2024 Deephaven Data Labs and Patent Pending
+//
+package io.deephaven.engine.table.impl.locations.impl;
+
+import io.deephaven.engine.table.impl.DummyTableLocation;
+import io.deephaven.engine.table.impl.TableUpdateMode;
+import io.deephaven.engine.table.impl.locations.TableDataException;
+import io.deephaven.engine.table.impl.locations.TableDataService;
+import io.deephaven.engine.table.impl.locations.TableKey;
+import io.deephaven.engine.table.impl.locations.TableLocation;
+import io.deephaven.engine.table.impl.locations.TableLocationKey;
+import io.deephaven.engine.table.impl.locations.TableLocationProvider;
+import org.jetbrains.annotations.NotNull;
+import org.junit.Assert;
+import org.junit.Test;
+
+import java.util.HashMap;
+import java.util.Map;
+
+public class TestTableDataService {
+    @Test
+    public void testGetRawTableDataService() {
+        final Map<String, Comparable<?>> partitions1 = new HashMap<>();
+        partitions1.put("Part", "A");
+        final Map<String, Comparable<?>> partitions2 = new HashMap<>();
+        partitions2.put("Part", "B");
+        final Map<String, Comparable<?>> partitions3 = new HashMap<>();
+        partitions3.put("Part", "C");
+
+        TableLocationKey tlk1 = new SimpleTableLocationKey(partitions1);
+        TableLocationKey tlk2 = new SimpleTableLocationKey(partitions2);
+        TableLocationKey tlk3 = new SimpleTableLocationKey(partitions3);
+
+        // No table location overlap
+        final CompositeTableDataService ctds1 =
+                new CompositeTableDataService("ctds1", new DummyServiceSelector(tlk1, tlk2));
+        Assert.assertNotNull(ctds1.getRawTableLocationProvider(StandaloneTableKey.getInstance(), tlk1));
+        Assert.assertNull(ctds1.getRawTableLocationProvider(StandaloneTableKey.getInstance(), tlk3));
+
+        // Table location overlap
+        final CompositeTableDataService ctds2 =
+                new CompositeTableDataService("ctds2", new DummyServiceSelector(tlk1, tlk1));
+        Assert.assertThrows(TableDataException.class,
+                () -> ctds2.getRawTableLocationProvider(StandaloneTableKey.getInstance(), tlk1));
+        Assert.assertNull(ctds2.getRawTableLocationProvider(StandaloneTableKey.getInstance(), tlk3));
+    }
+
+    private static class DummyTableDataService extends AbstractTableDataService {
+        final TableLocation tableLocation;
+
+        private DummyTableDataService(@NotNull final String name, @NotNull final TableLocation tableLocation) {
+            super(name);
+            this.tableLocation = tableLocation;
+        }
+
+        @Override
+        @NotNull
+        protected TableLocationProvider makeTableLocationProvider(@NotNull TableKey tableKey) {
+            return new SingleTableLocationProvider(tableLocation, TableUpdateMode.ADD_REMOVE);
+        }
+    }
+
+    private static class DummyServiceSelector implements CompositeTableDataService.ServiceSelector {
+        final TableDataService[] tableDataServices;
+
+        private DummyServiceSelector(final TableLocationKey tlk1, final TableLocationKey tlk2) {
+            final FilteredTableDataService.LocationKeyFilter dummyFilter = (tlk) -> true;
+            tableDataServices = new TableDataService[] {
+                    new FilteredTableDataService(new DummyTableDataService("dummyTds1",
+                            new DummyTableLocation(StandaloneTableKey.getInstance(), tlk1)), dummyFilter),
+                    new FilteredTableDataService(new DummyTableDataService("dummyTds2",
+                            new DummyTableLocation(StandaloneTableKey.getInstance(), tlk2)), dummyFilter)
+            };
+            // Init table locations
+            tableDataServices[0].getTableLocationProvider(StandaloneTableKey.getInstance())
+                    .getTableLocationIfPresent(tlk1);
+            tableDataServices[1].getTableLocationProvider(StandaloneTableKey.getInstance())
+                    .getTableLocationIfPresent(tlk2);
+        }
+
+        @Override
+        public TableDataService[] call(@NotNull TableKey tableKey) {
+            return tableDataServices;
+        }
+
+        @Override
+        public void resetServices() {
+            throw new UnsupportedOperationException();
+        }
+
+        @Override
+        public void resetServices(@NotNull TableKey key) {
+            throw new UnsupportedOperationException();
+        }
+    }
+}
diff --git a/engine/table/src/test/java/io/deephaven/engine/table/impl/remote/TestConstructSnapshot.java b/engine/table/src/test/java/io/deephaven/engine/table/impl/remote/TestConstructSnapshot.java
index dfe651a81ce..f037f631580 100644
--- a/engine/table/src/test/java/io/deephaven/engine/table/impl/remote/TestConstructSnapshot.java
+++ b/engine/table/src/test/java/io/deephaven/engine/table/impl/remote/TestConstructSnapshot.java
@@ -8,6 +8,7 @@
 import io.deephaven.engine.rowset.RowSetFactory;
 import io.deephaven.engine.table.impl.QueryTable;
 import io.deephaven.engine.table.impl.select.FunctionalColumn;
+import io.deephaven.engine.table.impl.util.BarrageMessage;
 import io.deephaven.engine.testutil.ControlledUpdateGraph;
 import io.deephaven.engine.testutil.testcase.RefreshingTableTestCase;
 import io.deephaven.engine.updategraph.LogicalClock;
@@ -23,8 +24,8 @@
 import java.util.concurrent.ExecutorService;
 import java.util.concurrent.Executors;
 
+import static io.deephaven.engine.table.impl.SnapshotTestUtils.verifySnapshotBarrageMessage;
 import static io.deephaven.engine.testutil.TstUtils.addToTable;
-import static io.deephaven.engine.testutil.TstUtils.assertTableEquals;
 import static io.deephaven.engine.testutil.TstUtils.i;
 import static io.deephaven.engine.testutil.TstUtils.testRefreshingTable;
 import static io.deephaven.engine.util.TableTools.intCol;
@@ -83,12 +84,12 @@ public UpdateGraph getUpdateGraph() {
         assertEquals(1, changed.get());
     }
 
-    public void testUsePrevSnapshot() throws ExecutionException, InterruptedException {
+    public void testConstructBackplaneSnapshot() throws ExecutionException, InterruptedException {
         final ExecutorService executor = Executors.newSingleThreadExecutor(
                 new NamingThreadFactory(TestConstructSnapshot.class, "TestConstructSnapshot Executor"));
 
         final QueryTable table = testRefreshingTable(i(1000).toTracking(), intCol("I", 10));
-        FunctionalColumn<Integer, String> plusOneColumn =
+        final FunctionalColumn<Integer, String> plusOneColumn =
                 new FunctionalColumn<>("I", Integer.class, "S2", String.class, (Integer i) -> Integer.toString(i + 1));
         final QueryTable functionalTable = (QueryTable) table.updateView(List.of(plusOneColumn));
 
@@ -97,58 +98,47 @@ public void testUsePrevSnapshot() throws ExecutionException, InterruptedExceptio
         final BitSet twoBits = new BitSet();
         twoBits.set(0, 2);
 
-        final InitialSnapshot initialSnapshot = ConstructSnapshot.constructInitialSnapshotInPositionSpace(
-                "table", table, oneBit, RowSetFactory.fromRange(0, 10));
-        final InitialSnapshot funcSnapshot = ConstructSnapshot.constructInitialSnapshotInPositionSpace(
-                "functionalTable", functionalTable, twoBits, RowSetFactory.fromRange(0, 10));
-
-        final InitialSnapshotTable initialSnapshotTable =
-                InitialSnapshotTable.setupInitialSnapshotTable(table.getDefinition(), initialSnapshot);
-        final InitialSnapshotTable funcSnapshotTable =
-                InitialSnapshotTable.setupInitialSnapshotTable(functionalTable.getDefinition(), funcSnapshot);
-
-        assertTableEquals(TableTools.newTable(intCol("I", 10)), initialSnapshotTable);
-        assertTableEquals(TableTools.newTable(intCol("I", 10), stringCol("S2", "11")), funcSnapshotTable);
+        try (final BarrageMessage initialSnapshot1 = ConstructSnapshot.constructBackplaneSnapshotInPositionSpace(
+                "table", table, oneBit, RowSetFactory.fromRange(0, 10), null);
+                final BarrageMessage funcSnapshot1 = ConstructSnapshot.constructBackplaneSnapshotInPositionSpace(
+                        "functionalTable", functionalTable, twoBits, RowSetFactory.fromRange(0, 10), null)) {
+            verifySnapshotBarrageMessage(initialSnapshot1, TableTools.newTable(intCol("I", 10)));
+            verifySnapshotBarrageMessage(funcSnapshot1, TableTools.newTable(intCol("I", 10), stringCol("S2", "11")));
+        }
 
         final ControlledUpdateGraph ug = ExecutionContext.getContext().getUpdateGraph().cast();
 
         ug.startCycleForUnitTests(false);
         addToTable(table, i(1000), intCol("I", 20));
-        final InitialSnapshot initialSnapshot2 =
-                executor.submit(() -> ConstructSnapshot.constructInitialSnapshotInPositionSpace(
-                        "table", table, oneBit, RowSetFactory.fromRange(0, 10))).get();
-        final InitialSnapshot funcSnapshot2 =
-                executor.submit(() -> ConstructSnapshot.constructInitialSnapshotInPositionSpace(
-                        "functionalTable", functionalTable, twoBits, RowSetFactory.fromRange(0, 10))).get();
-        table.notifyListeners(i(), i(), i(1000));
-        ug.markSourcesRefreshedForUnitTests();
-
-        // noinspection StatementWithEmptyBody
-        while (ug.flushOneNotificationForUnitTests());
-
-        final InitialSnapshot initialSnapshot3 =
-                executor.submit(() -> ConstructSnapshot.constructInitialSnapshotInPositionSpace(
-                        "table", table, oneBit, RowSetFactory.fromRange(0, 10))).get();
-        final InitialSnapshot funcSnapshot3 =
-                executor.submit(() -> ConstructSnapshot.constructInitialSnapshotInPositionSpace(
-                        "functionalTable", functionalTable, twoBits, RowSetFactory.fromRange(0, 10))).get();
-        ug.completeCycleForUnitTests();
-
-        final InitialSnapshotTable initialSnapshotTable2 =
-                InitialSnapshotTable.setupInitialSnapshotTable(table.getDefinition(), initialSnapshot2);
-        final InitialSnapshotTable initialSnapshotTable3 =
-                InitialSnapshotTable.setupInitialSnapshotTable(table.getDefinition(), initialSnapshot3);
-
-        assertTableEquals(TableTools.newTable(intCol("I", 10)), initialSnapshotTable2);
-        assertTableEquals(TableTools.newTable(intCol("I", 20)), initialSnapshotTable3);
-
-        final InitialSnapshotTable funcSnapshotTable2 =
-                InitialSnapshotTable.setupInitialSnapshotTable(functionalTable.getDefinition(), funcSnapshot2);
-        final InitialSnapshotTable funcSnapshotTable3 =
-                InitialSnapshotTable.setupInitialSnapshotTable(functionalTable.getDefinition(), funcSnapshot3);
-
-        assertTableEquals(TableTools.newTable(intCol("I", 10), stringCol("S2", "11")), funcSnapshotTable2);
-        assertTableEquals(TableTools.newTable(intCol("I", 20), stringCol("S2", "21")), funcSnapshotTable3);
+
+        try (final BarrageMessage initialSnapshot2 = ConstructSnapshot.constructBackplaneSnapshotInPositionSpace(
+                "table", table, oneBit, RowSetFactory.fromRange(0, 10), null);
+                final BarrageMessage funcSnapshot2 = ConstructSnapshot.constructBackplaneSnapshotInPositionSpace(
+                        "functionalTable", functionalTable, twoBits, RowSetFactory.fromRange(0, 10), null)) {
+            table.notifyListeners(i(), i(), i(1000));
+            ug.markSourcesRefreshedForUnitTests();
+
+            // noinspection StatementWithEmptyBody
+            while (ug.flushOneNotificationForUnitTests());
+
+            try (final BarrageMessage initialSnapshot3 =
+                    executor.submit(() -> ConstructSnapshot.constructBackplaneSnapshotInPositionSpace(
+                            "table", table, oneBit, RowSetFactory.fromRange(0, 10), null)).get();
+                    final BarrageMessage funcSnapshot3 =
+                            executor.submit(() -> ConstructSnapshot.constructBackplaneSnapshotInPositionSpace(
+                                    "functionalTable", functionalTable, twoBits, RowSetFactory.fromRange(0, 10), null))
+                                    .get()) {
+                ug.completeCycleForUnitTests();
+
+                verifySnapshotBarrageMessage(initialSnapshot2, TableTools.newTable(intCol("I", 10)));
+                verifySnapshotBarrageMessage(initialSnapshot3, TableTools.newTable(intCol("I", 20)));
+
+                verifySnapshotBarrageMessage(funcSnapshot2,
+                        TableTools.newTable(intCol("I", 10), stringCol("S2", "11")));
+                verifySnapshotBarrageMessage(funcSnapshot3,
+                        TableTools.newTable(intCol("I", 20), stringCol("S2", "21")));
+            }
+        }
 
         executor.shutdownNow();
     }
diff --git a/engine/table/src/test/java/io/deephaven/engine/table/impl/select/FilterKernelArraySample.java b/engine/table/src/test/java/io/deephaven/engine/table/impl/select/FilterKernelArraySample.java
index 24432e01084..78ba79b13eb 100644
--- a/engine/table/src/test/java/io/deephaven/engine/table/impl/select/FilterKernelArraySample.java
+++ b/engine/table/src/test/java/io/deephaven/engine/table/impl/select/FilterKernelArraySample.java
@@ -5,6 +5,7 @@
 import java.lang.*;
 import java.util.*;
 import io.deephaven.base.string.cache.CompressedString;
+import io.deephaven.chunk.BooleanChunk;
 import io.deephaven.chunk.ByteChunk;
 import io.deephaven.chunk.CharChunk;
 import io.deephaven.chunk.Chunk;
@@ -14,6 +15,7 @@
 import io.deephaven.chunk.LongChunk;
 import io.deephaven.chunk.ObjectChunk;
 import io.deephaven.chunk.ShortChunk;
+import io.deephaven.chunk.WritableBooleanChunk;
 import io.deephaven.chunk.WritableByteChunk;
 import io.deephaven.chunk.WritableCharChunk;
 import io.deephaven.chunk.WritableChunk;
@@ -100,4 +102,36 @@ public LongChunk<OrderedRowKeys> filter(Context __context, LongChunk<OrderedRowK
         }
         return __context.resultChunk;
     }
-}
\ No newline at end of file
+    
+    @Override
+    public int filter(final Context __context, final Chunk[] __inputChunks, final int __chunkSize, final WritableBooleanChunk<Values> __results) {
+        __results.setSize(__chunkSize);
+        int __count = 0;
+        for (int __my_i__ = 0; __my_i__ < __chunkSize; __my_i__++) {
+            final boolean __newResult = eq(v1_.size(), v2_.size());
+            __results.set(__my_i__, __newResult);
+            // count every true value
+            __count += __newResult ? 1 : 0;
+        }
+        return __count;
+    }
+    
+    @Override
+    public int filterAnd(final Context __context, final Chunk[] __inputChunks, final int __chunkSize, final WritableBooleanChunk<Values> __results) {
+        __results.setSize(__chunkSize);
+        int __count = 0;
+        for (int __my_i__ = 0; __my_i__ < __chunkSize; __my_i__++) {
+            final boolean __result = __results.get(__my_i__);
+            if (!__result) {
+                // already false, no need to compute or increment the count
+                continue;
+            }
+            final boolean __newResult = eq(v1_.size(), v2_.size());
+            __results.set(__my_i__, __newResult);
+            __results.set(__my_i__, __newResult);
+            // increment the count if the new result is TRUE
+            __count += __newResult ? 1 : 0;
+        }
+        return __count;
+    }
+}
diff --git a/engine/table/src/test/java/io/deephaven/engine/table/impl/select/FilterKernelSample.java b/engine/table/src/test/java/io/deephaven/engine/table/impl/select/FilterKernelSample.java
index 1b57b3f40f2..9d13e977755 100644
--- a/engine/table/src/test/java/io/deephaven/engine/table/impl/select/FilterKernelSample.java
+++ b/engine/table/src/test/java/io/deephaven/engine/table/impl/select/FilterKernelSample.java
@@ -5,6 +5,7 @@
 import java.lang.*;
 import java.util.*;
 import io.deephaven.base.string.cache.CompressedString;
+import io.deephaven.chunk.BooleanChunk;
 import io.deephaven.chunk.ByteChunk;
 import io.deephaven.chunk.CharChunk;
 import io.deephaven.chunk.Chunk;
@@ -14,6 +15,7 @@
 import io.deephaven.chunk.LongChunk;
 import io.deephaven.chunk.ObjectChunk;
 import io.deephaven.chunk.ShortChunk;
+import io.deephaven.chunk.WritableBooleanChunk;
 import io.deephaven.chunk.WritableByteChunk;
 import io.deephaven.chunk.WritableCharChunk;
 import io.deephaven.chunk.WritableChunk;
@@ -102,4 +104,44 @@ public LongChunk<OrderedRowKeys> filter(Context __context, LongChunk<OrderedRowK
         }
         return __context.resultChunk;
     }
-}
\ No newline at end of file
+    
+    @Override
+    public int filter(final Context __context, final Chunk[] __inputChunks, final int __chunkSize, final WritableBooleanChunk<Values> __results) {
+        final ShortChunk __columnChunk0 = __inputChunks[0].asShortChunk();
+        final DoubleChunk __columnChunk1 = __inputChunks[1].asDoubleChunk();
+        __results.setSize(__chunkSize);
+        int __count = 0;
+        for (int __my_i__ = 0; __my_i__ < __chunkSize; __my_i__++) {
+            final short v1 =  (short)__columnChunk0.get(__my_i__);
+            final double v2 =  (double)__columnChunk1.get(__my_i__);
+            final boolean __newResult = "foo".equals((plus(plus(plus(p1, p2), v1), v2)) + p3);
+            __results.set(__my_i__, __newResult);
+            // count every true value
+            __count += __newResult ? 1 : 0;
+        }
+        return __count;
+    }
+    
+    @Override
+    public int filterAnd(final Context __context, final Chunk[] __inputChunks, final int __chunkSize, final WritableBooleanChunk<Values> __results) {
+        final ShortChunk __columnChunk0 = __inputChunks[0].asShortChunk();
+        final DoubleChunk __columnChunk1 = __inputChunks[1].asDoubleChunk();
+        __results.setSize(__chunkSize);
+        int __count = 0;
+        for (int __my_i__ = 0; __my_i__ < __chunkSize; __my_i__++) {
+            final boolean __result = __results.get(__my_i__);
+            if (!__result) {
+                // already false, no need to compute or increment the count
+                continue;
+            }
+            final short v1 =  (short)__columnChunk0.get(__my_i__);
+            final double v2 =  (double)__columnChunk1.get(__my_i__);
+            final boolean __newResult = "foo".equals((plus(plus(plus(p1, p2), v1), v2)) + p3);
+            __results.set(__my_i__, __newResult);
+            __results.set(__my_i__, __newResult);
+            // increment the count if the new result is TRUE
+            __count += __newResult ? 1 : 0;
+        }
+        return __count;
+    }
+}
diff --git a/engine/table/src/test/java/io/deephaven/engine/table/impl/select/FormulaKernelSample.java b/engine/table/src/test/java/io/deephaven/engine/table/impl/select/FormulaKernelSample.java
index 28acdde3e30..733647f96d6 100644
--- a/engine/table/src/test/java/io/deephaven/engine/table/impl/select/FormulaKernelSample.java
+++ b/engine/table/src/test/java/io/deephaven/engine/table/impl/select/FormulaKernelSample.java
@@ -5,6 +5,7 @@
 import java.lang.*;
 import java.util.*;
 import io.deephaven.base.string.cache.CompressedString;
+import io.deephaven.chunk.BooleanChunk;
 import io.deephaven.chunk.ByteChunk;
 import io.deephaven.chunk.CharChunk;
 import io.deephaven.chunk.Chunk;
@@ -14,6 +15,7 @@
 import io.deephaven.chunk.LongChunk;
 import io.deephaven.chunk.ObjectChunk;
 import io.deephaven.chunk.ShortChunk;
+import io.deephaven.chunk.WritableBooleanChunk;
 import io.deephaven.chunk.WritableByteChunk;
 import io.deephaven.chunk.WritableCharChunk;
 import io.deephaven.chunk.WritableChunk;
diff --git a/engine/table/src/test/java/io/deephaven/engine/table/impl/select/FormulaSample.java b/engine/table/src/test/java/io/deephaven/engine/table/impl/select/FormulaSample.java
index 7a027cde2ff..45035e32184 100644
--- a/engine/table/src/test/java/io/deephaven/engine/table/impl/select/FormulaSample.java
+++ b/engine/table/src/test/java/io/deephaven/engine/table/impl/select/FormulaSample.java
@@ -5,6 +5,7 @@
 import java.lang.*;
 import java.util.*;
 import io.deephaven.base.string.cache.CompressedString;
+import io.deephaven.chunk.BooleanChunk;
 import io.deephaven.chunk.ByteChunk;
 import io.deephaven.chunk.CharChunk;
 import io.deephaven.chunk.Chunk;
@@ -14,6 +15,7 @@
 import io.deephaven.chunk.LongChunk;
 import io.deephaven.chunk.ObjectChunk;
 import io.deephaven.chunk.ShortChunk;
+import io.deephaven.chunk.WritableBooleanChunk;
 import io.deephaven.chunk.WritableByteChunk;
 import io.deephaven.chunk.WritableCharChunk;
 import io.deephaven.chunk.WritableChunk;
diff --git a/engine/table/src/test/java/io/deephaven/engine/table/impl/select/TestTimeSeriesFilter.java b/engine/table/src/test/java/io/deephaven/engine/table/impl/select/TestTimeSeriesFilter.java
new file mode 100644
index 00000000000..d5cf3646f2c
--- /dev/null
+++ b/engine/table/src/test/java/io/deephaven/engine/table/impl/select/TestTimeSeriesFilter.java
@@ -0,0 +1,377 @@
+//
+// Copyright (c) 2016-2024 Deephaven Data Labs and Patent Pending
+//
+package io.deephaven.engine.table.impl.select;
+
+import io.deephaven.api.filter.Filter;
+import io.deephaven.engine.context.ExecutionContext;
+import io.deephaven.engine.rowset.RowSet;
+import io.deephaven.engine.rowset.WritableRowSet;
+import io.deephaven.engine.table.Table;
+import io.deephaven.engine.table.TableDefinition;
+import io.deephaven.engine.testutil.*;
+import io.deephaven.engine.testutil.generator.DateGenerator;
+import io.deephaven.engine.testutil.generator.IntGenerator;
+import io.deephaven.engine.util.TableTools;
+import io.deephaven.engine.testutil.testcase.RefreshingTableTestCase;
+import io.deephaven.engine.table.impl.QueryTable;
+import io.deephaven.engine.util.TestClock;
+import io.deephaven.time.DateTimeUtils;
+import org.apache.commons.lang3.mutable.MutableInt;
+import org.jetbrains.annotations.NotNull;
+
+import java.lang.ref.WeakReference;
+import java.text.ParseException;
+import java.text.SimpleDateFormat;
+import java.time.Instant;
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
+import java.util.Random;
+import java.util.concurrent.atomic.AtomicLong;
+
+import static io.deephaven.engine.testutil.TstUtils.*;
+import static io.deephaven.engine.util.TableTools.intCol;
+import static io.deephaven.engine.util.TableTools.longCol;
+
+public class TestTimeSeriesFilter extends RefreshingTableTestCase {
+    public void testSimple() {
+        Instant[] times = new Instant[10];
+
+        final long startTime = System.currentTimeMillis() - (10 * times.length);
+        for (int ii = 0; ii < times.length; ++ii) {
+            times[ii] = DateTimeUtils.epochNanosToInstant((startTime + (ii * 1000)) * 1000000L);
+        }
+
+        Table source = TableTools.newTable(TableTools.col("Timestamp", times));
+        TableTools.show(source);
+
+        final TestClock testClock = new TestClock().setMillis(startTime);
+
+        final TimeSeriesFilter timeSeriesFilter =
+                TimeSeriesFilter.newBuilder().columnName("Timestamp").period("PT00:00:05").clock(testClock).build();
+        Table filtered = source.where(timeSeriesFilter);
+
+        TableTools.show(filtered);
+        assertEquals(10, filtered.size());
+
+        final ControlledUpdateGraph updateGraph = ExecutionContext.getContext().getUpdateGraph().cast();
+        updateGraph.runWithinUnitTestCycle(() -> {
+            testClock.addMillis(5000);
+            timeSeriesFilter.runForUnitTests();
+        });
+
+        TableTools.show(filtered);
+        assertEquals(10, filtered.size());
+
+        updateGraph.runWithinUnitTestCycle(() -> {
+            testClock.addMillis(5000);
+            timeSeriesFilter.runForUnitTests();
+        });
+
+        System.out.println(testClock);
+
+        TableTools.show(filtered);
+        assertEquals(5, filtered.size());
+
+        updateGraph.runWithinUnitTestCycle(() -> {
+            testClock.addMillis(2000);
+            timeSeriesFilter.runForUnitTests();
+        });
+
+        TableTools.show(filtered);
+        assertEquals(3, filtered.size());
+    }
+
+    public void testInverted() {
+        Instant[] times = new Instant[10];
+
+        final long startTime = System.currentTimeMillis() - (10 * times.length);
+        for (int ii = 0; ii < times.length; ++ii) {
+            times[ii] = DateTimeUtils.epochNanosToInstant((startTime + (ii * 1000)) * 1000000L);
+        }
+
+        Table source = TableTools.newTable(TableTools.col("Timestamp", times));
+        TableTools.show(source);
+
+        final TestClock testClock = new TestClock().setMillis(startTime);
+
+        final TimeSeriesFilter timeSeriesFilter =
+                TimeSeriesFilter.newBuilder().columnName("Timestamp").period("PT00:00:05").clock(testClock).invert(true)
+                        .build();
+        Table filtered = source.where(timeSeriesFilter);
+
+        TableTools.show(filtered);
+        assertEquals(0, filtered.size());
+
+        final ControlledUpdateGraph updateGraph = ExecutionContext.getContext().getUpdateGraph().cast();
+        updateGraph.runWithinUnitTestCycle(() -> {
+            testClock.addMillis(5000);
+            timeSeriesFilter.runForUnitTests();
+        });
+
+        TableTools.show(filtered);
+        assertEquals(0, filtered.size());
+
+        updateGraph.runWithinUnitTestCycle(() -> {
+            testClock.addMillis(5000);
+            timeSeriesFilter.runForUnitTests();
+        });
+
+        System.out.println(testClock);
+
+        TableTools.show(filtered);
+        assertEquals(5, filtered.size());
+
+        updateGraph.runWithinUnitTestCycle(() -> {
+            testClock.addMillis(2000);
+            timeSeriesFilter.runForUnitTests();
+        });
+
+        TableTools.show(filtered);
+        assertEquals(7, filtered.size());
+    }
+
+    public void testIncremental() throws ParseException {
+        Random random = new Random(0);
+
+        final SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd");
+
+        ColumnInfo<?, ?>[] columnInfo;
+        int size = 100;
+        final Date startDate = format.parse("2015-03-23");
+        Date endDate = format.parse("2015-03-24");
+        final QueryTable table = getTable(size, random, columnInfo = initColumnInfos(new String[] {"Date", "C1"},
+                new DateGenerator(startDate, endDate),
+                new IntGenerator(1, 100)));
+
+        final TestClock testClock = new TestClock().setMillis(startDate.getTime());
+
+        final TimeSeriesFilter inclusionFilter =
+                TimeSeriesFilter.newBuilder().columnName("Date").period("PT01:00:00").clock(testClock).invert(false)
+                        .build();
+        final TimeSeriesFilter exclusionFilter =
+                TimeSeriesFilter.newBuilder().columnName("Date").period("PT01:00:00").clock(testClock).invert(true)
+                        .build();
+        final ArrayList<WeakReference<TimeSeriesFilter>> filtersToRefresh = new ArrayList<>();
+
+        final ControlledUpdateGraph updateGraph = ExecutionContext.getContext().getUpdateGraph().cast();
+        EvalNugget[] en = makeNuggets(table, inclusionFilter, filtersToRefresh, updateGraph, exclusionFilter);
+
+
+        int updatesPerTick = 3;
+        for (int ii = 0; ii < 24 * (updatesPerTick + 1); ++ii) {
+            if (ii % (updatesPerTick + 1) > 0) {
+                simulateShiftAwareStep(size, random, table, columnInfo, en);
+            } else {
+                updateGraph.runWithinUnitTestCycle(() -> refreshFilters(testClock, filtersToRefresh, 3600 * 1000));
+                TstUtils.validate("time update " + ii, en);
+            }
+        }
+    }
+
+    public void testIncremental2() throws ParseException {
+        Random random = new Random(0);
+
+        final SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd");
+
+        ColumnInfo<?, ?>[] columnInfo;
+        int size = 100;
+        final Date startDate = format.parse("2015-03-23");
+        Date endDate = format.parse("2015-03-24");
+        final QueryTable table = getTable(size, random, columnInfo = initColumnInfos(new String[] {"Date", "C1"},
+                new DateGenerator(startDate, endDate),
+                new IntGenerator(1, 100)));
+
+        final TestClock testClock = new TestClock().setMillis(startDate.getTime());
+        final ControlledUpdateGraph updateGraph = ExecutionContext.getContext().getUpdateGraph().cast();
+
+        final TimeSeriesFilter inclusionFilter =
+                TimeSeriesFilter.newBuilder().columnName("Date").period("PT01:00:00").clock(testClock).invert(false)
+                        .build();
+        final TimeSeriesFilter exclusionFilter =
+                TimeSeriesFilter.newBuilder().columnName("Date").period("PT01:00:00").clock(testClock).invert(true)
+                        .build();
+        final ArrayList<WeakReference<TimeSeriesFilter>> filtersToRefresh = new ArrayList<>();
+
+        EvalNugget[] en = makeNuggets(table, inclusionFilter, filtersToRefresh, updateGraph, exclusionFilter);
+
+        final MutableInt advanced = new MutableInt(0);
+        while (advanced.intValue() < 24 * 3600 * 1000) {
+            updateGraph.runWithinUnitTestCycle(() -> {
+                if (random.nextBoolean()) {
+                    final int toAdvance = random.nextInt(1800 * 1000);
+                    refreshFilters(testClock, filtersToRefresh, toAdvance);
+                    advanced.add(toAdvance);
+                }
+                if (random.nextBoolean()) {
+                    GenerateTableUpdates.generateShiftAwareTableUpdates(GenerateTableUpdates.DEFAULT_PROFILE, size,
+                            random, table, columnInfo);
+                }
+            });
+            TstUtils.validate("incremental2", en);
+        }
+    }
+
+    private static EvalNugget @NotNull [] makeNuggets(QueryTable table, TimeSeriesFilter inclusionFilter,
+            ArrayList<WeakReference<TimeSeriesFilter>> filtersToRefresh, ControlledUpdateGraph updateGraph,
+            TimeSeriesFilter exclusionFilter) {
+        final Table withInstant = table.update("Date=DateTimeUtils.epochNanosToInstant(Date.getTime() * 1000000L)");
+        return new EvalNugget[] {
+                EvalNugget.from(() -> {
+                    final TimeSeriesFilter inclusionCopy = inclusionFilter.copy();
+                    filtersToRefresh.add(new WeakReference<>(inclusionCopy));
+                    return updateGraph.exclusiveLock().computeLocked(() -> withInstant.where(inclusionCopy));
+                }),
+                EvalNugget.from(() -> {
+                    final TimeSeriesFilter exclusionCopy = exclusionFilter.copy();
+                    filtersToRefresh.add(new WeakReference<>(exclusionCopy));
+                    return updateGraph.exclusiveLock().computeLocked(() -> withInstant.where(exclusionCopy));
+                }),
+        };
+    }
+
+    private static void refreshFilters(final TestClock testClock,
+            final List<WeakReference<TimeSeriesFilter>> filtersToRefresh, final int millisToAdvance) {
+        testClock.addMillis(millisToAdvance);
+
+        final List<WeakReference<TimeSeriesFilter>> collectedRefs = new ArrayList<>();
+        for (WeakReference<TimeSeriesFilter> ref : filtersToRefresh) {
+            final TimeSeriesFilter refreshFilter = ref.get();
+            if (refreshFilter == null) {
+                collectedRefs.add(ref);
+            } else {
+                refreshFilter.runForUnitTests();
+            }
+        }
+        filtersToRefresh.removeAll(collectedRefs);
+    }
+
+    private static class CountingFilter extends WhereFilterImpl {
+        final AtomicLong count;
+
+        CountingFilter() {
+            count = new AtomicLong(0);
+        }
+
+        CountingFilter(final AtomicLong count) {
+            this.count = count;
+        }
+
+        @Override
+        public List<String> getColumns() {
+            return List.of("Sentinel");
+        }
+
+        @Override
+        public List<String> getColumnArrays() {
+            return List.of();
+        }
+
+        @Override
+        public void init(@NotNull TableDefinition tableDefinition) {
+
+        }
+
+        @Override
+        public @NotNull WritableRowSet filter(@NotNull RowSet selection, @NotNull RowSet fullSet, @NotNull Table table,
+                boolean usePrev) {
+            count.addAndGet(selection.size());
+            return selection.copy();
+        }
+
+        @Override
+        public boolean isSimpleFilter() {
+            return true;
+        }
+
+        @Override
+        public void setRecomputeListener(RecomputeListener result) {
+
+        }
+
+        @Override
+        public WhereFilter copy() {
+            return new CountingFilter(count);
+        }
+    }
+
+    public void testFilterSequence() {
+        final long start = DateTimeUtils.epochNanos(DateTimeUtils.parseInstant("2024-09-18T21:29:00 NY"));
+        final QueryTable source = testRefreshingTable(i().toTracking(), longCol("Timestamp"), intCol("Sentinel"));
+        final TestClock testClock = new TestClock().setNanos(start);
+        final ControlledUpdateGraph updateGraph = ExecutionContext.getContext().getUpdateGraph().cast();
+
+        final CountingFilter cfi1 = new CountingFilter();
+        final CountingFilter cfi2 = new CountingFilter();
+        final CountingFilter cfe1 = new CountingFilter();
+        final CountingFilter cfe2 = new CountingFilter();
+
+        final TimeSeriesFilter inclusionFilter =
+                TimeSeriesFilter.newBuilder().columnName("Timestamp").period("PT01:00:00").clock(testClock)
+                        .invert(false).build();
+        final TimeSeriesFilter exclusionFilter =
+                TimeSeriesFilter.newBuilder().columnName("Timestamp").period("PT01:00:00").clock(testClock).invert(true)
+                        .build();
+
+        final Table inclusion = source.where(Filter.and(cfi1, inclusionFilter, cfi2));
+        final Table exclusion = source.where(Filter.and(cfe1, exclusionFilter, cfe2));
+
+        assertEquals(0, cfi1.count.intValue());
+        assertEquals(0, cfi2.count.intValue());
+        assertEquals(0, cfe1.count.intValue());
+        assertEquals(0, cfe2.count.intValue());
+
+        updateGraph.runWithinUnitTestCycle(() -> {
+            TstUtils.addToTable(source, i(10), longCol("Timestamp", start), intCol("Sentinel", 10));
+            source.notifyListeners(i(10), i(), i());
+            inclusionFilter.runForUnitTests();
+            exclusionFilter.runForUnitTests();
+        });
+
+        TableTools.show(inclusion);
+        TableTools.show(exclusion);
+
+        assertEquals(1, cfi1.count.intValue());
+        assertEquals(1, cfi2.count.intValue());
+        assertEquals(1, cfe1.count.intValue());
+        assertEquals(0, cfe2.count.intValue());
+
+
+        updateGraph.runWithinUnitTestCycle(() -> {
+            TstUtils.addToTable(source, i(10, 20, 30),
+                    longCol("Timestamp", start, start + 300_000_000_000L, start + 4200_000_000_000L),
+                    intCol("Sentinel", 10, 20, 30));
+            source.notifyListeners(i(20, 30), i(), i(10));
+            inclusionFilter.runForUnitTests();
+            exclusionFilter.runForUnitTests();
+        });
+
+        assertEquals(4, cfi1.count.intValue());
+        assertEquals(4, cfi2.count.intValue());
+        assertEquals(4, cfe1.count.intValue());
+        assertEquals(0, cfe2.count.intValue());
+
+        updateGraph.runWithinUnitTestCycle(() -> {
+            testClock.addMillis(3_700_000L);
+            inclusionFilter.runForUnitTests();
+            exclusionFilter.runForUnitTests();
+        });
+
+        assertEquals(5, cfi1.count.intValue());
+        assertEquals(4, cfi2.count.intValue());
+        assertEquals(5, cfe1.count.intValue());
+        assertEquals(1, cfe2.count.intValue());
+
+        updateGraph.runWithinUnitTestCycle(() -> {
+            testClock.addMillis(300_000L);
+            inclusionFilter.runForUnitTests();
+            exclusionFilter.runForUnitTests();
+        });
+
+        assertEquals(6, cfi1.count.intValue());
+        assertEquals(4, cfi2.count.intValue());
+        assertEquals(6, cfe1.count.intValue());
+        assertEquals(2, cfe2.count.intValue());
+    }
+}
diff --git a/engine/table/src/main/java/io/deephaven/engine/table/impl/sort/partition/BytePartitionKernel.java b/engine/table/src/test/java/io/deephaven/engine/table/impl/sort/partition/BytePartitionKernel.java
similarity index 100%
rename from engine/table/src/main/java/io/deephaven/engine/table/impl/sort/partition/BytePartitionKernel.java
rename to engine/table/src/test/java/io/deephaven/engine/table/impl/sort/partition/BytePartitionKernel.java
diff --git a/engine/table/src/main/java/io/deephaven/engine/table/impl/sort/partition/CharPartitionKernel.java b/engine/table/src/test/java/io/deephaven/engine/table/impl/sort/partition/CharPartitionKernel.java
similarity index 100%
rename from engine/table/src/main/java/io/deephaven/engine/table/impl/sort/partition/CharPartitionKernel.java
rename to engine/table/src/test/java/io/deephaven/engine/table/impl/sort/partition/CharPartitionKernel.java
diff --git a/engine/table/src/main/java/io/deephaven/engine/table/impl/sort/partition/DoublePartitionKernel.java b/engine/table/src/test/java/io/deephaven/engine/table/impl/sort/partition/DoublePartitionKernel.java
similarity index 100%
rename from engine/table/src/main/java/io/deephaven/engine/table/impl/sort/partition/DoublePartitionKernel.java
rename to engine/table/src/test/java/io/deephaven/engine/table/impl/sort/partition/DoublePartitionKernel.java
diff --git a/engine/table/src/main/java/io/deephaven/engine/table/impl/sort/partition/FloatPartitionKernel.java b/engine/table/src/test/java/io/deephaven/engine/table/impl/sort/partition/FloatPartitionKernel.java
similarity index 100%
rename from engine/table/src/main/java/io/deephaven/engine/table/impl/sort/partition/FloatPartitionKernel.java
rename to engine/table/src/test/java/io/deephaven/engine/table/impl/sort/partition/FloatPartitionKernel.java
diff --git a/engine/table/src/main/java/io/deephaven/engine/table/impl/sort/partition/IntPartitionKernel.java b/engine/table/src/test/java/io/deephaven/engine/table/impl/sort/partition/IntPartitionKernel.java
similarity index 100%
rename from engine/table/src/main/java/io/deephaven/engine/table/impl/sort/partition/IntPartitionKernel.java
rename to engine/table/src/test/java/io/deephaven/engine/table/impl/sort/partition/IntPartitionKernel.java
diff --git a/engine/table/src/main/java/io/deephaven/engine/table/impl/sort/partition/LongPartitionKernel.java b/engine/table/src/test/java/io/deephaven/engine/table/impl/sort/partition/LongPartitionKernel.java
similarity index 100%
rename from engine/table/src/main/java/io/deephaven/engine/table/impl/sort/partition/LongPartitionKernel.java
rename to engine/table/src/test/java/io/deephaven/engine/table/impl/sort/partition/LongPartitionKernel.java
diff --git a/engine/table/src/main/java/io/deephaven/engine/table/impl/sort/partition/ObjectPartitionKernel.java b/engine/table/src/test/java/io/deephaven/engine/table/impl/sort/partition/ObjectPartitionKernel.java
similarity index 97%
rename from engine/table/src/main/java/io/deephaven/engine/table/impl/sort/partition/ObjectPartitionKernel.java
rename to engine/table/src/test/java/io/deephaven/engine/table/impl/sort/partition/ObjectPartitionKernel.java
index 6b8edf6f203..46342665ad9 100644
--- a/engine/table/src/main/java/io/deephaven/engine/table/impl/sort/partition/ObjectPartitionKernel.java
+++ b/engine/table/src/test/java/io/deephaven/engine/table/impl/sort/partition/ObjectPartitionKernel.java
@@ -8,6 +8,7 @@
 package io.deephaven.engine.table.impl.sort.partition;
 
 import java.util.Objects;
+import io.deephaven.util.compare.ObjectComparisons;
 
 import io.deephaven.chunk.attributes.Any;
 import io.deephaven.engine.rowset.chunkattributes.RowKeys;
@@ -242,19 +243,8 @@ private static int binarySearchTieIndex(ObjectChunk pivotValues, LongChunk<RowKe
     // region comparison functions
     // ascending comparison
     private static int doComparison(Object lhs, Object rhs) {
-       if (lhs == rhs) {
-            return 0;
-        }
-        if (lhs == null) {
-            return -1;
-        }
-        if (rhs == null) {
-            return 1;
-        }
-        //noinspection unchecked,rawtypes
-        return ((Comparable)lhs).compareTo(rhs);
+        return ObjectComparisons.compare(lhs, rhs);
     }
-
     // endregion comparison functions
 
     // region equality function
diff --git a/engine/table/src/main/java/io/deephaven/engine/table/impl/sort/partition/PartitionUtils.java b/engine/table/src/test/java/io/deephaven/engine/table/impl/sort/partition/PartitionUtils.java
similarity index 100%
rename from engine/table/src/main/java/io/deephaven/engine/table/impl/sort/partition/PartitionUtils.java
rename to engine/table/src/test/java/io/deephaven/engine/table/impl/sort/partition/PartitionUtils.java
diff --git a/engine/table/src/main/java/io/deephaven/engine/table/impl/sort/partition/ShortPartitionKernel.java b/engine/table/src/test/java/io/deephaven/engine/table/impl/sort/partition/ShortPartitionKernel.java
similarity index 100%
rename from engine/table/src/main/java/io/deephaven/engine/table/impl/sort/partition/ShortPartitionKernel.java
rename to engine/table/src/test/java/io/deephaven/engine/table/impl/sort/partition/ShortPartitionKernel.java
diff --git a/engine/table/src/test/java/io/deephaven/engine/table/impl/sort/timsort/BaseTestObjectTimSortKernel.java b/engine/table/src/test/java/io/deephaven/engine/table/impl/sort/timsort/BaseTestObjectTimSortKernel.java
index 85914964103..5c5121386b0 100644
--- a/engine/table/src/test/java/io/deephaven/engine/table/impl/sort/timsort/BaseTestObjectTimSortKernel.java
+++ b/engine/table/src/test/java/io/deephaven/engine/table/impl/sort/timsort/BaseTestObjectTimSortKernel.java
@@ -8,6 +8,7 @@
 package io.deephaven.engine.table.impl.sort.timsort;
 
 import java.util.Objects;
+import io.deephaven.util.compare.ObjectComparisons;
 
 import io.deephaven.chunk.attributes.Any;
 import io.deephaven.chunk.attributes.ChunkPositions;
@@ -516,19 +517,8 @@ static private void verify(int size, List<ObjectLongLongTuple> javaTuples, Objec
     // region comparison functions
     // ascending comparison
     private static int doComparison(Object lhs, Object rhs) {
-       if (lhs == rhs) {
-            return 0;
-        }
-        if (lhs == null) {
-            return -1;
-        }
-        if (rhs == null) {
-            return 1;
-        }
-        //noinspection unchecked,rawtypes
-        return ((Comparable)lhs).compareTo(rhs);
+        return ObjectComparisons.compare(lhs, rhs);
     }
-
     // endregion comparison functions
 
     private static boolean gt(Object lhs, Object rhs) {
diff --git a/engine/table/src/test/java/io/deephaven/engine/table/impl/sources/regioned/TestChunkedRegionedOperations.java b/engine/table/src/test/java/io/deephaven/engine/table/impl/sources/regioned/TestChunkedRegionedOperations.java
index 16495ff9265..3a42ce4207c 100644
--- a/engine/table/src/test/java/io/deephaven/engine/table/impl/sources/regioned/TestChunkedRegionedOperations.java
+++ b/engine/table/src/test/java/io/deephaven/engine/table/impl/sources/regioned/TestChunkedRegionedOperations.java
@@ -227,7 +227,7 @@ public void setUp() throws Exception {
         final PartitionedTable partitionedInputData = inputData.partitionBy("PC");
         final String[] partitionedInputDestinations;
         try (final Stream<String> partitionNames = partitionedInputData.table()
-                .<String>objectColumnIterator("PC").stream()) {
+                .objectColumnIterator("PC", String.class).stream()) {
             partitionedInputDestinations = partitionNames.map(pcv -> new File(dataDirectory,
                     "IP" + File.separator + "P" + pcv + File.separator + tableName + File.separator
                             + PARQUET_FILE_NAME)
@@ -242,7 +242,7 @@ public void setUp() throws Exception {
         final PartitionedTable partitionedInputMissingData = inputMissingData.view("PC", "II").partitionBy("PC");
         final String[] partitionedInputMissingDestinations;
         try (final Stream<String> partitionNames = partitionedInputMissingData.table()
-                .<String>objectColumnIterator("PC").stream()) {
+                .objectColumnIterator("PC", String.class).stream()) {
             partitionedInputMissingDestinations = partitionNames.map(pcv -> new File(dataDirectory,
                     "IP" + File.separator + "P" + pcv + File.separator + tableName + File.separator
                             + PARQUET_FILE_NAME)
diff --git a/engine/table/src/test/java/io/deephaven/engine/table/impl/sources/regioned/TestRegionedColumnSourceManager.java b/engine/table/src/test/java/io/deephaven/engine/table/impl/sources/regioned/TestRegionedColumnSourceManager.java
index 55ffd9960b5..0aeb1b05a07 100644
--- a/engine/table/src/test/java/io/deephaven/engine/table/impl/sources/regioned/TestRegionedColumnSourceManager.java
+++ b/engine/table/src/test/java/io/deephaven/engine/table/impl/sources/regioned/TestRegionedColumnSourceManager.java
@@ -30,6 +30,7 @@
 import org.junit.Before;
 import org.junit.Test;
 
+import java.lang.ref.WeakReference;
 import java.util.*;
 import java.util.stream.Collectors;
 import java.util.stream.IntStream;
@@ -150,6 +151,17 @@ public void setUp() throws Exception {
         tableLocation1A = tableLocations[1];
         tableLocation0B = tableLocations[2];
         tableLocation1B = tableLocations[3];
+        checking(new Expectations() {
+            {
+                for (final TableLocation tl : tableLocations) {
+                    allowing(tl).tryRetainReference();
+                    will(returnValue(true));
+                    allowing(tl).getWeakReference();
+                    will(returnValue(new WeakReference<>(tl)));
+                    allowing(tl).dropReference();
+                }
+            }
+        });
 
         duplicateTableLocation0A = setUpTableLocation(0, "-duplicate");
 
@@ -525,19 +537,19 @@ public void testRefreshing() {
 
         // Refresh them
         setSizeExpectations(true, true, 5, 1000);
-        updateGraph.runWithinUnitTestCycle(() -> captureIndexes(SUT.refresh()));
+        updateGraph.runWithinUnitTestCycle(() -> captureIndexes(SUT.refresh().added()));
         checkIndexes();
         assertEquals(Arrays.asList(tableLocation0A, tableLocation1A), SUT.includedLocations());
 
         // Refresh them with no change
         setSizeExpectations(true, true, 5, 1000);
-        updateGraph.runWithinUnitTestCycle(() -> captureIndexes(SUT.refresh()));
+        updateGraph.runWithinUnitTestCycle(() -> captureIndexes(SUT.refresh().added()));
         checkIndexes();
         assertEquals(Arrays.asList(tableLocation0A, tableLocation1A), SUT.includedLocations());
 
         // Refresh them with a change for the subscription-supporting one
         setSizeExpectations(true, true, 5, 1001);
-        updateGraph.runWithinUnitTestCycle(() -> captureIndexes(SUT.refresh()));
+        updateGraph.runWithinUnitTestCycle(() -> captureIndexes(SUT.refresh().added()));
         checkIndexes();
         assertEquals(Arrays.asList(tableLocation0A, tableLocation1A), SUT.includedLocations());
 
@@ -568,26 +580,26 @@ public void testRefreshing() {
 
         // Test run with new locations included
         setSizeExpectations(true, true, 5, REGION_CAPACITY_IN_ELEMENTS, 5003, NULL_SIZE);
-        updateGraph.runWithinUnitTestCycle(() -> captureIndexes(SUT.refresh()));
+        updateGraph.runWithinUnitTestCycle(() -> captureIndexes(SUT.refresh().added()));
         checkIndexes();
         assertEquals(Arrays.asList(tableLocation0A, tableLocation1A, tableLocation0B), SUT.includedLocations());
 
         // Test no-op run
         setSizeExpectations(true, true, 5, REGION_CAPACITY_IN_ELEMENTS, 5003, NULL_SIZE);
-        updateGraph.runWithinUnitTestCycle(() -> captureIndexes(SUT.refresh()));
+        updateGraph.runWithinUnitTestCycle(() -> captureIndexes(SUT.refresh().added()));
         checkIndexes();
         assertEquals(Arrays.asList(tableLocation0A, tableLocation1A, tableLocation0B), SUT.includedLocations());
 
         // Test run with a location updated from null to not
         setSizeExpectations(true, true, 5, REGION_CAPACITY_IN_ELEMENTS, 5003, 2);
-        updateGraph.runWithinUnitTestCycle(() -> captureIndexes(SUT.refresh()));
+        updateGraph.runWithinUnitTestCycle(() -> captureIndexes(SUT.refresh().added()));
         checkIndexes();
         assertEquals(Arrays.asList(tableLocation0A, tableLocation1A, tableLocation0B, tableLocation1B),
                 SUT.includedLocations());
 
         // Test run with a location updated
         setSizeExpectations(true, true, 5, REGION_CAPACITY_IN_ELEMENTS, 5003, 10000002);
-        updateGraph.runWithinUnitTestCycle(() -> captureIndexes(SUT.refresh()));
+        updateGraph.runWithinUnitTestCycle(() -> captureIndexes(SUT.refresh().added()));
         checkIndexes();
         assertEquals(Arrays.asList(tableLocation0A, tableLocation1A, tableLocation0B, tableLocation1B),
                 SUT.includedLocations());
@@ -650,6 +662,23 @@ public void testRefreshing() {
         checkIndexes();
         assertEquals(Arrays.asList(tableLocation0A, tableLocation1A, tableLocation0B, tableLocation1B),
                 SUT.includedLocations());
+
+        // expect table locations to be cleaned up via LivenessScope release as the test exits
+        IntStream.range(0, tableLocations.length).forEachOrdered(li -> {
+            final TableLocation tl = tableLocations[li];
+            checking(new Expectations() {
+                {
+                    oneOf(tl).supportsSubscriptions();
+                    if (li % 2 == 0) {
+                        // Even locations don't support subscriptions
+                        will(returnValue(false));
+                    } else {
+                        will(returnValue(true));
+                        oneOf(tl).unsubscribe(with(subscriptionBuffers[li]));
+                    }
+                }
+            });
+        });
     }
 
     private static void maybePrintStackTrace(@NotNull final Exception e) {
diff --git a/engine/table/src/test/java/io/deephaven/engine/table/impl/updateby/BaseUpdateByTest.java b/engine/table/src/test/java/io/deephaven/engine/table/impl/updateby/BaseUpdateByTest.java
index dc34435515a..303c9031d94 100644
--- a/engine/table/src/test/java/io/deephaven/engine/table/impl/updateby/BaseUpdateByTest.java
+++ b/engine/table/src/test/java/io/deephaven/engine/table/impl/updateby/BaseUpdateByTest.java
@@ -3,12 +3,12 @@
 //
 package io.deephaven.engine.table.impl.updateby;
 
-import io.deephaven.datastructures.util.CollectionUtil;
 import io.deephaven.engine.table.impl.QueryTable;
 import io.deephaven.engine.table.impl.indexer.DataIndexer;
 import io.deephaven.engine.testutil.ColumnInfo;
 import io.deephaven.engine.testutil.generator.*;
 import io.deephaven.engine.testutil.junit4.EngineCleanup;
+import io.deephaven.util.type.ArrayTypeUtils;
 import org.junit.Rule;
 
 import java.math.BigInteger;
@@ -39,7 +39,7 @@ static class CreateResult {
     static CreateResult createTestTable(int tableSize, boolean includeSym, boolean includeGroups, boolean isRefreshing,
             int seed) {
         return createTestTable(tableSize, includeSym, includeGroups, isRefreshing, seed,
-                CollectionUtil.ZERO_LENGTH_STRING_ARRAY, new TestDataGenerator[0]);
+                ArrayTypeUtils.EMPTY_STRING_ARRAY, new TestDataGenerator[0]);
     }
 
     static CreateResult createTestTable(
@@ -107,7 +107,7 @@ static CreateResult createTestTable(
                 new BigDecimalGenerator(new BigInteger("1"), new BigInteger("2"), 5, nullFraction)));
 
         final Random random = new Random(seed);
-        final ColumnInfo[] columnInfos = initColumnInfos(colsList.toArray(CollectionUtil.ZERO_LENGTH_STRING_ARRAY),
+        final ColumnInfo[] columnInfos = initColumnInfos(colsList.toArray(ArrayTypeUtils.EMPTY_STRING_ARRAY),
                 generators.toArray(new TestDataGenerator[0]));
         final QueryTable t = getTable(isRefreshing, tableSize, random, columnInfos);
 
diff --git a/engine/table/src/test/java/io/deephaven/engine/table/impl/updateby/TestCumMinMax.java b/engine/table/src/test/java/io/deephaven/engine/table/impl/updateby/TestCumMinMax.java
index ba1f0a95335..c3076baedf0 100644
--- a/engine/table/src/test/java/io/deephaven/engine/table/impl/updateby/TestCumMinMax.java
+++ b/engine/table/src/test/java/io/deephaven/engine/table/impl/updateby/TestCumMinMax.java
@@ -4,7 +4,6 @@
 package io.deephaven.engine.table.impl.updateby;
 
 import io.deephaven.api.updateby.UpdateByOperation;
-import io.deephaven.datastructures.util.CollectionUtil;
 import io.deephaven.engine.context.ExecutionContext;
 import io.deephaven.engine.table.PartitionedTable;
 import io.deephaven.engine.table.Table;
@@ -16,6 +15,7 @@
 import io.deephaven.engine.testutil.generator.TestDataGenerator;
 import io.deephaven.function.Numeric;
 import io.deephaven.test.types.OutOfBandTest;
+import io.deephaven.util.type.ArrayTypeUtils;
 import org.jetbrains.annotations.NotNull;
 import org.junit.Test;
 import org.junit.experimental.categories.Category;
@@ -55,7 +55,7 @@ public void testStaticZeroKey() {
     @Test
     public void testStaticZeroKeyAllNulls() {
         final QueryTable t = createTestTableAllNull(100000, false, false, false, 0x31313131,
-                CollectionUtil.ZERO_LENGTH_STRING_ARRAY, new TestDataGenerator[0]).t;
+                ArrayTypeUtils.EMPTY_STRING_ARRAY, new TestDataGenerator[0]).t;
 
         final Table result = t.updateBy(List.of(
                 UpdateByOperation.CumMin("byteColMin=byteCol", "shortColMin=shortCol", "intColMin=intCol",
diff --git a/engine/table/src/test/java/io/deephaven/engine/table/impl/updateby/TestCumProd.java b/engine/table/src/test/java/io/deephaven/engine/table/impl/updateby/TestCumProd.java
index 2187d9f49b5..747bdc9a463 100644
--- a/engine/table/src/test/java/io/deephaven/engine/table/impl/updateby/TestCumProd.java
+++ b/engine/table/src/test/java/io/deephaven/engine/table/impl/updateby/TestCumProd.java
@@ -4,7 +4,6 @@
 package io.deephaven.engine.table.impl.updateby;
 
 import io.deephaven.api.updateby.UpdateByControl;
-import io.deephaven.datastructures.util.CollectionUtil;
 import io.deephaven.engine.context.ExecutionContext;
 import io.deephaven.engine.table.PartitionedTable;
 import io.deephaven.engine.table.Table;
@@ -18,6 +17,7 @@
 import io.deephaven.engine.testutil.generator.TestDataGenerator;
 import io.deephaven.function.Numeric;
 import io.deephaven.test.types.OutOfBandTest;
+import io.deephaven.util.type.ArrayTypeUtils;
 import org.jetbrains.annotations.NotNull;
 import org.junit.Test;
 import org.junit.experimental.categories.Category;
@@ -58,7 +58,7 @@ public void testStaticZeroKey() {
     @Test
     public void testStaticZeroKeyAllNulls() {
         final QueryTable t = createTestTableAllNull(100000, false, false, false, 0x31313131,
-                CollectionUtil.ZERO_LENGTH_STRING_ARRAY, new TestDataGenerator[0]).t;
+                ArrayTypeUtils.EMPTY_STRING_ARRAY, new TestDataGenerator[0]).t;
         final Table result = t.updateBy(UpdateByOperation.CumProd());
         for (String col : t.getDefinition().getColumnNamesArray()) {
             if ("boolCol".equals(col)) {
diff --git a/engine/table/src/test/java/io/deephaven/engine/table/impl/updateby/TestCumSum.java b/engine/table/src/test/java/io/deephaven/engine/table/impl/updateby/TestCumSum.java
index 86de3408e9a..4b0b7a87d46 100644
--- a/engine/table/src/test/java/io/deephaven/engine/table/impl/updateby/TestCumSum.java
+++ b/engine/table/src/test/java/io/deephaven/engine/table/impl/updateby/TestCumSum.java
@@ -5,7 +5,6 @@
 
 import io.deephaven.api.updateby.UpdateByControl;
 import io.deephaven.api.updateby.UpdateByOperation;
-import io.deephaven.datastructures.util.CollectionUtil;
 import io.deephaven.engine.context.ExecutionContext;
 import io.deephaven.engine.table.PartitionedTable;
 import io.deephaven.engine.table.Table;
@@ -19,6 +18,7 @@
 import io.deephaven.engine.testutil.generator.TestDataGenerator;
 import io.deephaven.function.Numeric;
 import io.deephaven.test.types.OutOfBandTest;
+import io.deephaven.util.type.ArrayTypeUtils;
 import org.jetbrains.annotations.NotNull;
 import org.junit.Test;
 import org.junit.experimental.categories.Category;
@@ -60,7 +60,7 @@ public void testStaticZeroKey() {
     @Test
     public void testStaticZeroKeyAllNulls() {
         final QueryTable t = createTestTableAllNull(100000, false, false, false, 0x31313131,
-                CollectionUtil.ZERO_LENGTH_STRING_ARRAY, new TestDataGenerator[0]).t;
+                ArrayTypeUtils.EMPTY_STRING_ARRAY, new TestDataGenerator[0]).t;
 
         t.setRefreshing(false);
 
diff --git a/engine/table/src/test/java/io/deephaven/engine/table/impl/updateby/TestRollingFormula.java b/engine/table/src/test/java/io/deephaven/engine/table/impl/updateby/TestRollingFormula.java
index 7238a47c1d0..bdf95beb916 100644
--- a/engine/table/src/test/java/io/deephaven/engine/table/impl/updateby/TestRollingFormula.java
+++ b/engine/table/src/test/java/io/deephaven/engine/table/impl/updateby/TestRollingFormula.java
@@ -5,10 +5,12 @@
 
 import io.deephaven.api.updateby.UpdateByControl;
 import io.deephaven.api.updateby.UpdateByOperation;
+import io.deephaven.base.verify.Assert;
 import io.deephaven.engine.context.ExecutionContext;
 import io.deephaven.engine.table.PartitionedTable;
 import io.deephaven.engine.table.Table;
 import io.deephaven.engine.table.impl.QueryTable;
+import io.deephaven.engine.table.impl.select.FormulaCompilationException;
 import io.deephaven.engine.testutil.ControlledUpdateGraph;
 import io.deephaven.engine.testutil.EvalNugget;
 import io.deephaven.engine.testutil.GenerateTableUpdates;
@@ -204,6 +206,15 @@ private void doTestStaticZeroKey(final int prevTicks, final int postTicks) {
                 new String[] {"charCol"},
                 new TestDataGenerator[] {new CharGenerator('A', 'z', 0.1)}).t;
 
+        // Verify that the RollingFormula spec errors out when provided a paramToken and multiple input columns.
+        try {
+            t.updateBy(UpdateByOperation.RollingFormula(prevTicks, postTicks, "out=sum(x)", "x", primitiveColumns));
+            Assert.statementNeverExecuted();
+        } catch (Exception exception) {
+            Assert.assertion(exception instanceof FormulaCompilationException,
+                    "exception instanceof FormulaCompilationException");
+        }
+
         Table actual;
         Table expected;
         String[] updateStrings;
@@ -261,7 +272,8 @@ private void doTestStaticZeroKey(final int prevTicks, final int postTicks) {
         // Count vs. RollingCount
         ////////////////////////////////////////////////////////////////////////////////////////////////////
 
-        actual = t.updateBy(UpdateByOperation.RollingFormula(prevTicks, postTicks, "count(x)", "x", primitiveColumns));
+        actual = t.updateBy(UpdateByOperation.RollingFormula(prevTicks, postTicks, "count(x)", "x",
+                primitiveColumns));
         expected = t.updateBy(UpdateByOperation.RollingCount(prevTicks, postTicks, primitiveColumns));
 
         TstUtils.assertTableEquals(expected, actual, TableDiff.DiffItems.DoublesExact);
@@ -311,6 +323,49 @@ private void doTestStaticZeroKey(final int prevTicks, final int postTicks) {
         expected = t.updateBy(UpdateByOperation.RollingCount(prevTicks, postTicks, "boolCol"));
 
         TstUtils.assertTableEquals(expected, actual, TableDiff.DiffItems.DoublesExact);
+
+        ////////////////////////////////////////////////////////////////////////////////////////////////////
+        // Multi-column formula tests
+        ////////////////////////////////////////////////////////////////////////////////////////////////////
+
+        // zero input columns
+        actual = t.updateBy(UpdateByOperation.RollingFormula(prevTicks, postTicks, "out_val=-1L"));
+        expected = t.update("out_val=-1L");
+
+        TstUtils.assertTableEquals(expected, actual, TableDiff.DiffItems.DoublesExact);
+
+        // single input column
+        actual = t
+                .updateBy(UpdateByOperation.RollingFormula(prevTicks, postTicks, "out_val=sum(intCol)"));
+        expected = t.updateBy(UpdateByOperation.RollingGroup(prevTicks, postTicks, "a=intCol"))
+                .update("out_val=sum(a)").dropColumns("a");
+
+        TstUtils.assertTableEquals(expected, actual, TableDiff.DiffItems.DoublesExact);
+
+        // two input columns
+        actual = t
+                .updateBy(UpdateByOperation.RollingFormula(prevTicks, postTicks, "out_val=min(intCol) - max(longCol)"));
+        expected = t.updateBy(UpdateByOperation.RollingGroup(prevTicks, postTicks, "a=intCol", "b=longCol"))
+                .update("out_val=min(a) - max(b)").dropColumns("a", "b");
+
+        TstUtils.assertTableEquals(expected, actual, TableDiff.DiffItems.DoublesExact);
+
+        // three input columns
+        actual = t
+                .updateBy(UpdateByOperation.RollingFormula(prevTicks, postTicks,
+                        "out_val=sum(intCol) - max(longCol) + min(doubleCol)"));
+        expected =
+                t.updateBy(UpdateByOperation.RollingGroup(prevTicks, postTicks, "a=intCol", "b=longCol", "c=doubleCol"))
+                        .update("out_val=sum(a) - max(b) + min(c)").dropColumns("a", "b", "c");
+
+        TstUtils.assertTableEquals(expected, actual, TableDiff.DiffItems.DoublesExact);
+
+        actual = t
+                .updateBy(UpdateByOperation.RollingFormula(prevTicks, postTicks, "out_val=sum(intCol) - max(longCol)"));
+        expected = t.updateBy(UpdateByOperation.RollingGroup(prevTicks, postTicks, "a=intCol", "b=longCol"))
+                .update("out_val=sum(a) - max(b)").dropColumns("a", "b");
+
+        TstUtils.assertTableEquals(expected, actual, TableDiff.DiffItems.DoublesExact);
     }
 
     private void doTestStaticZeroKeyTimed(final Duration prevTime, final Duration postTime) {
@@ -320,6 +375,15 @@ private void doTestStaticZeroKeyTimed(final Duration prevTime, final Duration po
                         DateTimeUtils.parseInstant("2022-03-09T16:30:00.000 NY")),
                         new CharGenerator('A', 'z', 0.1)}).t;
 
+        // Verify that the RollingFormula spec errors out when provided a paramToken and multiple input columns.
+        try {
+            t.updateBy(UpdateByOperation.RollingFormula("ts", prevTime, postTime, "out=sum(x)", "x", primitiveColumns));
+            Assert.statementNeverExecuted();
+        } catch (Exception exception) {
+            Assert.assertion(exception instanceof FormulaCompilationException,
+                    "exception instanceof FormulaCompilationException");
+        }
+
         Table actual;
         Table expected;
         String[] updateStrings;
@@ -431,6 +495,52 @@ private void doTestStaticZeroKeyTimed(final Duration prevTime, final Duration po
         expected = t.updateBy(UpdateByOperation.RollingCount("ts", prevTime, postTime, "boolCol"));
 
         TstUtils.assertTableEquals(expected, actual, TableDiff.DiffItems.DoublesExact);
+
+        ////////////////////////////////////////////////////////////////////////////////////////////////////
+        // Multi-column formula tests
+        ////////////////////////////////////////////////////////////////////////////////////////////////////
+
+        // zero input columns
+        actual = t.updateBy(UpdateByOperation.RollingFormula("ts", prevTime, postTime, "out_val=-1L"));
+        expected = t.update("out_val=-1L");
+
+        TstUtils.assertTableEquals(expected, actual, TableDiff.DiffItems.DoublesExact);
+
+        // single input column
+        actual = t
+                .updateBy(UpdateByOperation.RollingFormula("ts", prevTime, postTime, "out_val=sum(intCol)"));
+        expected = t.updateBy(UpdateByOperation.RollingGroup("ts", prevTime, postTime, "a=intCol"))
+                .update("out_val=sum(a)").dropColumns("a");
+
+        TstUtils.assertTableEquals(expected, actual, TableDiff.DiffItems.DoublesExact);
+
+        // two input columns
+        actual = t
+                .updateBy(UpdateByOperation.RollingFormula("ts", prevTime, postTime,
+                        "out_val=min(intCol) - max(longCol)"));
+        expected = t.updateBy(UpdateByOperation.RollingGroup("ts", prevTime, postTime, "a=intCol", "b=longCol"))
+                .update("out_val=min(a) - max(b)").dropColumns("a", "b");
+
+        TstUtils.assertTableEquals(expected, actual, TableDiff.DiffItems.DoublesExact);
+
+        // three input columns
+        actual = t
+                .updateBy(UpdateByOperation.RollingFormula("ts", prevTime, postTime,
+                        "out_val=sum(intCol) - max(longCol) + min(doubleCol)"));
+        expected = t
+                .updateBy(UpdateByOperation.RollingGroup("ts", prevTime, postTime, "a=intCol", "b=longCol",
+                        "c=doubleCol"))
+                .update("out_val=sum(a) - max(b) + min(c)").dropColumns("a", "b", "c");
+
+        TstUtils.assertTableEquals(expected, actual, TableDiff.DiffItems.DoublesExact);
+
+        actual = t.updateBy(UpdateByOperation.RollingFormula("ts", prevTime, postTime,
+                "out_val=intCol + longCol"));
+        expected = t.updateBy(UpdateByOperation.RollingGroup("ts", prevTime, postTime,
+                "a=intCol", "b=longCol"))
+                .update("out_val=a + b").dropColumns("a", "b");
+
+        TstUtils.assertTableEquals(expected, actual, TableDiff.DiffItems.DoublesExact);
     }
 
     // endregion
@@ -640,6 +750,69 @@ private void doTestStaticBucketed(boolean grouped, int prevTicks, int postTicks)
         expected = t.updateBy(UpdateByOperation.RollingCount(prevTicks, postTicks, "boolCol"), "Sym");
 
         TstUtils.assertTableEquals(expected, actual, TableDiff.DiffItems.DoublesExact);
+
+        ////////////////////////////////////////////////////////////////////////////////////////////////////
+        // Multi-column formula tests
+        ////////////////////////////////////////////////////////////////////////////////////////////////////
+
+        // zero input columns
+        actual = t.updateBy(UpdateByOperation.RollingFormula(prevTicks, postTicks, "out_val=-1L"), "Sym");
+        expected = t.update("out_val=-1L");
+
+        TstUtils.assertTableEquals(expected, actual, TableDiff.DiffItems.DoublesExact);
+
+        // single input column
+        actual = t
+                .updateBy(UpdateByOperation.RollingFormula(prevTicks, postTicks, "out_val=sum(intCol)"), "Sym");
+        expected = t.updateBy(UpdateByOperation.RollingGroup(prevTicks, postTicks, "a=intCol"), "Sym")
+                .update("out_val=sum(a)").dropColumns("a");
+
+        TstUtils.assertTableEquals(expected, actual, TableDiff.DiffItems.DoublesExact);
+
+        // two input columns
+        actual = t
+                .updateBy(UpdateByOperation.RollingFormula(prevTicks, postTicks, "out_val=min(intCol) - max(longCol)"),
+                        "Sym");
+        expected = t.updateBy(UpdateByOperation.RollingGroup(prevTicks, postTicks, "a=intCol", "b=longCol"), "Sym")
+                .update("out_val=min(a) - max(b)").dropColumns("a", "b");
+
+        TstUtils.assertTableEquals(expected, actual, TableDiff.DiffItems.DoublesExact);
+
+        // three input columns
+        actual = t
+                .updateBy(UpdateByOperation.RollingFormula(prevTicks, postTicks,
+                        "out_val=sum(intCol) - max(longCol) + min(doubleCol)"), "Sym");
+        expected =
+                t.updateBy(UpdateByOperation.RollingGroup(prevTicks, postTicks, "a=intCol", "b=longCol", "c=doubleCol"),
+                        "Sym")
+                        .update("out_val=sum(a) - max(b) + min(c)").dropColumns("a", "b", "c");
+
+        TstUtils.assertTableEquals(expected, actual, TableDiff.DiffItems.DoublesExact);
+
+        actual = t
+                .updateBy(UpdateByOperation.RollingFormula(prevTicks, postTicks, "out_val=sum(intCol) - max(longCol)"),
+                        "Sym");
+        expected = t.updateBy(UpdateByOperation.RollingGroup(prevTicks, postTicks, "a=intCol", "b=longCol"), "Sym")
+                .update("out_val=sum(a) - max(b)").dropColumns("a", "b");
+
+        TstUtils.assertTableEquals(expected, actual, TableDiff.DiffItems.DoublesExact);
+
+        // using the key column
+        actual = t.updateBy(UpdateByOperation.RollingFormula(prevTicks, postTicks,
+                "out_val=sum(intCol) - max(longCol) + (Sym == null ? 0 : Sym.length())"), "Sym");
+        expected = t.updateBy(UpdateByOperation.RollingGroup(prevTicks, postTicks, "a=intCol", "b=longCol"), "Sym")
+                .update("out_val=sum(a) - max(b) + (Sym == null ? 0 : Sym.length())").dropColumns("a", "b");
+
+        TstUtils.assertTableEquals(expected, actual, TableDiff.DiffItems.DoublesExact);
+
+        // using the byte key column
+        actual = t.updateBy(UpdateByOperation.RollingFormula(prevTicks, postTicks,
+                "out_val=byteCol == null ? -1 : byteCol + sum(intCol) - max(longCol)"), "byteCol");
+        expected =
+                t.updateBy(UpdateByOperation.RollingGroup(prevTicks, postTicks, "a=intCol", "b=longCol"), "byteCol")
+                        .update("out_val=byteCol == null ? -1 : byteCol + sum(a) - max(b)").dropColumns("a", "b");
+
+        TstUtils.assertTableEquals(expected, actual, TableDiff.DiffItems.DoublesExact);
     }
 
     private void doTestStaticBucketedTimed(boolean grouped, Duration prevTime, Duration postTime) {
@@ -762,6 +935,69 @@ private void doTestStaticBucketedTimed(boolean grouped, Duration prevTime, Durat
         expected = t.updateBy(UpdateByOperation.RollingCount("ts", prevTime, postTime, "boolCol"), "Sym");
 
         TstUtils.assertTableEquals(expected, actual, TableDiff.DiffItems.DoublesExact);
+
+        ////////////////////////////////////////////////////////////////////////////////////////////////////
+        // Multi-column formula tests
+        ////////////////////////////////////////////////////////////////////////////////////////////////////
+
+        // zero input columns
+        actual = t.updateBy(UpdateByOperation.RollingFormula("ts", prevTime, postTime, "out_val=-1L"), "Sym");
+        expected = t.update("out_val=-1L");
+
+        TstUtils.assertTableEquals(expected, actual, TableDiff.DiffItems.DoublesExact);
+
+        // single input column
+        actual = t
+                .updateBy(UpdateByOperation.RollingFormula("ts", prevTime, postTime, "out_val=sum(intCol)"), "Sym");
+        expected = t.updateBy(UpdateByOperation.RollingGroup("ts", prevTime, postTime, "a=intCol"), "Sym")
+                .update("out_val=sum(a)").dropColumns("a");
+
+        TstUtils.assertTableEquals(expected, actual, TableDiff.DiffItems.DoublesExact);
+
+        // two input columns
+        actual = t
+                .updateBy(UpdateByOperation.RollingFormula("ts", prevTime, postTime,
+                        "out_val=min(intCol) - max(longCol)"), "Sym");
+        expected = t.updateBy(UpdateByOperation.RollingGroup("ts", prevTime, postTime, "a=intCol", "b=longCol"), "Sym")
+                .update("out_val=min(a) - max(b)").dropColumns("a", "b");
+
+        TstUtils.assertTableEquals(expected, actual, TableDiff.DiffItems.DoublesExact);
+
+        // three input columns
+        actual = t
+                .updateBy(UpdateByOperation.RollingFormula("ts", prevTime, postTime,
+                        "out_val=sum(intCol) - max(longCol) + min(doubleCol)"), "Sym");
+        expected = t
+                .updateBy(UpdateByOperation.RollingGroup("ts", prevTime, postTime, "a=intCol", "b=longCol",
+                        "c=doubleCol"), "Sym")
+                .update("out_val=sum(a) - max(b) + min(c)").dropColumns("a", "b", "c");
+
+        TstUtils.assertTableEquals(expected, actual, TableDiff.DiffItems.DoublesExact);
+
+        actual = t.updateBy(UpdateByOperation.RollingFormula("ts", prevTime, postTime,
+                "out_val=intCol + longCol"), "Sym");
+        expected = t.updateBy(UpdateByOperation.RollingGroup("ts", prevTime, postTime,
+                "a=intCol", "b=longCol"), "Sym")
+                .update("out_val=a + b").dropColumns("a", "b");
+
+        TstUtils.assertTableEquals(expected, actual, TableDiff.DiffItems.DoublesExact);
+
+        // using the key column
+        actual = t.updateBy(UpdateByOperation.RollingFormula("ts", prevTime, postTime,
+                "out_val=(Sym == null ? 0 : Sym.length()) + sum(intCol) - max(longCol)"), "Sym");
+        expected = t.updateBy(UpdateByOperation.RollingGroup("ts", prevTime, postTime, "a=intCol", "b=longCol"), "Sym")
+                .update("out_val=(Sym == null ? 0 : Sym.length()) + sum(a) - max(b)").dropColumns("a", "b");
+
+        TstUtils.assertTableEquals(expected, actual, TableDiff.DiffItems.DoublesExact);
+
+        // using the byte key column
+        actual = t.updateBy(UpdateByOperation.RollingFormula("ts", prevTime, postTime,
+                "out_val=byteCol == null ? -1 : byteCol + sum(intCol) - max(longCol)"), "byteCol");
+        expected =
+                t.updateBy(UpdateByOperation.RollingGroup("ts", prevTime, postTime, "a=intCol", "b=longCol"), "byteCol")
+                        .update("out_val=byteCol == null ? -1 : byteCol + sum(a) - max(b)").dropColumns("a", "b");
+
+        TstUtils.assertTableEquals(expected, actual, TableDiff.DiffItems.DoublesExact);
     }
 
     // endregion
@@ -930,6 +1166,7 @@ private void doTestAppendOnly(boolean bucketed, int prevTicks, int postTicks) {
         ExecutionContext.getContext().getQueryLibrary().importStatic(Helpers.class);
 
         final EvalNugget[] nuggets = new EvalNugget[] {
+                // Single column formula tests
                 EvalNugget.from(() -> bucketed
                         ? t.updateBy(UpdateByOperation.RollingFormula(prevTicks, postTicks, "sum(x + 1)", "x",
                                 primitiveColumns), "Sym")
@@ -945,9 +1182,39 @@ private void doTestAppendOnly(boolean bucketed, int prevTicks, int postTicks) {
                                 "x", "bigDecimalCol"), "Sym")
                         : t.updateBy(UpdateByOperation.RollingFormula(prevTicks, postTicks, "sumBigDecimal(x)",
                                 "x", "bigDecimalCol"))),
+                // Multi-column formula tests
+                EvalNugget.from(() -> bucketed
+                        ? t.updateBy(UpdateByOperation.RollingFormula(prevTicks, postTicks, "const_val=5"),
+                                "Sym")
+                        : t.updateBy(UpdateByOperation.RollingFormula(prevTicks, postTicks, "const_val=5"))),
+                EvalNugget.from(() -> bucketed
+                        ? t.updateBy(UpdateByOperation.RollingFormula(prevTicks, postTicks, "sum=sum(longCol) / 2"),
+                                "Sym")
+                        : t.updateBy(UpdateByOperation.RollingFormula(prevTicks, postTicks, "sum=sum(longCol) / 2"))),
+                EvalNugget.from(() -> bucketed
+                        ? t.updateBy(
+                                UpdateByOperation.RollingFormula(prevTicks, postTicks,
+                                        "sum=sum(intCol) + sum(longCol)"),
+                                "Sym")
+                        : t.updateBy(UpdateByOperation.RollingFormula(prevTicks, postTicks,
+                                "sum=sum(intCol) + sum(longCol)"))),
+                EvalNugget.from(() -> bucketed
+                        ? t.updateBy(
+                                UpdateByOperation.RollingFormula(prevTicks, postTicks,
+                                        "sum=min(intCol) + min(longCol) * max(doubleCol)"),
+                                "Sym")
+                        : t.updateBy(UpdateByOperation.RollingFormula(prevTicks, postTicks,
+                                "sum=min(intCol) + min(longCol) * max(doubleCol)"))),
+                EvalNugget.from(() -> bucketed
+                        ? t.updateBy(
+                                UpdateByOperation.RollingFormula(prevTicks, postTicks,
+                                        "out_col=Sym == null ? 0.0 : min(intCol) + min(longCol) * max(doubleCol)"),
+                                "Sym")
+                        : t.updateBy(UpdateByOperation.RollingFormula(prevTicks, postTicks,
+                                "out_col=true"))), // This is a dummy test, we care about the bucketed test
         };
 
-        final Random billy = new Random(0xB177B177);
+        final Random billy = new Random(0xB177B177L);
         for (int ii = 0; ii < DYNAMIC_UPDATE_STEPS; ii++) {
             ExecutionContext.getContext().getUpdateGraph().<ControlledUpdateGraph>cast().runWithinUnitTestCycle(
                     () -> generateAppends(DYNAMIC_UPDATE_SIZE, billy, t, result.infos));
@@ -967,6 +1234,7 @@ private void doTestAppendOnlyTimed(boolean bucketed, Duration prevTime, Duration
         ExecutionContext.getContext().getQueryLibrary().importStatic(Helpers.class);
 
         final EvalNugget[] nuggets = new EvalNugget[] {
+                // Single column formula tests
                 EvalNugget.from(() -> bucketed
                         ? t.updateBy(UpdateByOperation.RollingFormula("ts", prevTime, postTime, "sum(x + 1)", "x",
                                 primitiveColumns), "Sym")
@@ -982,9 +1250,40 @@ private void doTestAppendOnlyTimed(boolean bucketed, Duration prevTime, Duration
                                 "sumBigDecimal(x)", "x", "bigDecimalCol"), "Sym")
                         : t.updateBy(UpdateByOperation.RollingFormula("ts", prevTime, postTime,
                                 "sumBigDecimal(x)", "x", "bigDecimalCol"))),
+                // Multi-column formula tests
+                EvalNugget.from(() -> bucketed
+                        ? t.updateBy(UpdateByOperation.RollingFormula("ts", prevTime, postTime, "const_val=5"),
+                                "Sym")
+                        : t.updateBy(UpdateByOperation.RollingFormula("ts", prevTime, postTime, "const_val=5"))),
+                EvalNugget.from(() -> bucketed
+                        ? t.updateBy(UpdateByOperation.RollingFormula("ts", prevTime, postTime, "sum=sum(longCol) / 2"),
+                                "Sym")
+                        : t.updateBy(
+                                UpdateByOperation.RollingFormula("ts", prevTime, postTime, "sum=sum(longCol) / 2"))),
+                EvalNugget.from(() -> bucketed
+                        ? t.updateBy(
+                                UpdateByOperation.RollingFormula("ts", prevTime, postTime,
+                                        "sum=sum(intCol) + sum(longCol)"),
+                                "Sym")
+                        : t.updateBy(UpdateByOperation.RollingFormula("ts", prevTime, postTime,
+                                "sum=sum(intCol) + sum(longCol)"))),
+                EvalNugget.from(() -> bucketed
+                        ? t.updateBy(
+                                UpdateByOperation.RollingFormula("ts", prevTime, postTime,
+                                        "sum=min(intCol) + min(longCol) * max(doubleCol)"),
+                                "Sym")
+                        : t.updateBy(UpdateByOperation.RollingFormula("ts", prevTime, postTime,
+                                "sum=min(intCol) + min(longCol) * max(doubleCol)"))),
+                EvalNugget.from(() -> bucketed
+                        ? t.updateBy(
+                                UpdateByOperation.RollingFormula("ts", prevTime, postTime,
+                                        "out_col=Sym == null ? null : min(intCol) + min(longCol) * max(doubleCol)"),
+                                "Sym")
+                        : t.updateBy(UpdateByOperation.RollingFormula("ts", prevTime, postTime,
+                                "out_col=true"))), // This is a dummy test, we care about the bucketed test
         };
 
-        final Random billy = new Random(0xB177B177);
+        final Random billy = new Random(0xB177B177L);
         for (int ii = 0; ii < DYNAMIC_UPDATE_STEPS; ii++) {
             ExecutionContext.getContext().getUpdateGraph().<ControlledUpdateGraph>cast().runWithinUnitTestCycle(
                     () -> generateAppends(DYNAMIC_UPDATE_SIZE, billy, t, result.infos));
@@ -1132,6 +1431,29 @@ private void doTestTicking(final boolean bucketed, final long prevTicks, final l
                                 "x", "bigDecimalCol"), "Sym")
                         : t.updateBy(UpdateByOperation.RollingFormula(prevTicks, postTicks, "sumBigDecimal(x)",
                                 "x", "bigDecimalCol"))),
+                // Multi-column formula tests
+                EvalNugget.from(() -> bucketed
+                        ? t.updateBy(UpdateByOperation.RollingFormula(prevTicks, postTicks, "const_val=5"),
+                                "Sym")
+                        : t.updateBy(UpdateByOperation.RollingFormula(prevTicks, postTicks, "const_val=5"))),
+                EvalNugget.from(() -> bucketed
+                        ? t.updateBy(UpdateByOperation.RollingFormula(prevTicks, postTicks, "sum=sum(longCol) / 2"),
+                                "Sym")
+                        : t.updateBy(UpdateByOperation.RollingFormula(prevTicks, postTicks, "sum=sum(longCol) / 2"))),
+                EvalNugget.from(() -> bucketed
+                        ? t.updateBy(
+                                UpdateByOperation.RollingFormula(prevTicks, postTicks,
+                                        "sum=sum(intCol) + sum(longCol)"),
+                                "Sym")
+                        : t.updateBy(UpdateByOperation.RollingFormula(prevTicks, postTicks,
+                                "sum=sum(intCol) + sum(longCol)"))),
+                EvalNugget.from(() -> bucketed
+                        ? t.updateBy(
+                                UpdateByOperation.RollingFormula(prevTicks, postTicks,
+                                        "sum=min(intCol) + min(longCol) * max(doubleCol)"),
+                                "Sym")
+                        : t.updateBy(UpdateByOperation.RollingFormula(prevTicks, postTicks,
+                                "sum=min(intCol) + min(longCol) * max(doubleCol)"))),
         };
 
         final Random billy = new Random(0xB177B177);
@@ -1169,6 +1491,30 @@ private void doTestTickingTimed(final boolean bucketed, final Duration prevTime,
                                 "sumBigDecimal(x)", "x", "bigDecimalCol"), "Sym")
                         : t.updateBy(UpdateByOperation.RollingFormula("ts", prevTime, postTime,
                                 "sumBigDecimal(x)", "x", "bigDecimalCol"))),
+                // Multi-column formula tests
+                EvalNugget.from(() -> bucketed
+                        ? t.updateBy(UpdateByOperation.RollingFormula("ts", prevTime, postTime, "const_val=5"),
+                                "Sym")
+                        : t.updateBy(UpdateByOperation.RollingFormula("ts", prevTime, postTime, "const_val=5"))),
+                EvalNugget.from(() -> bucketed
+                        ? t.updateBy(UpdateByOperation.RollingFormula("ts", prevTime, postTime, "sum=sum(longCol) / 2"),
+                                "Sym")
+                        : t.updateBy(
+                                UpdateByOperation.RollingFormula("ts", prevTime, postTime, "sum=sum(longCol) / 2"))),
+                EvalNugget.from(() -> bucketed
+                        ? t.updateBy(
+                                UpdateByOperation.RollingFormula("ts", prevTime, postTime,
+                                        "sum=sum(intCol) + sum(longCol)"),
+                                "Sym")
+                        : t.updateBy(UpdateByOperation.RollingFormula("ts", prevTime, postTime,
+                                "sum=sum(intCol) + sum(longCol)"))),
+                EvalNugget.from(() -> bucketed
+                        ? t.updateBy(
+                                UpdateByOperation.RollingFormula("ts", prevTime, postTime,
+                                        "sum=min(intCol) + min(longCol) * max(doubleCol)"),
+                                "Sym")
+                        : t.updateBy(UpdateByOperation.RollingFormula("ts", prevTime, postTime,
+                                "sum=min(intCol) + min(longCol) * max(doubleCol)"))),
         };
 
         final Random billy = new Random(0xB177B177);
@@ -1294,11 +1640,14 @@ public void testProxy() {
         final int postTicks = 0;
 
         Table actual;
-        Table expected;
 
         PartitionedTable pt = t.partitionBy("Sym");
         actual = pt.proxy().updateBy(UpdateByOperation.RollingFormula(prevTicks, postTicks, "count(x)", "x", "intCol"))
                 .target().merge();
+
+        actual = pt.proxy()
+                .updateBy(UpdateByOperation.RollingFormula(prevTicks, postTicks, "intCol_count=count(intCol)"))
+                .target().merge();
     }
 
     // endregion
diff --git a/engine/table/src/test/java/io/deephaven/engine/table/impl/updateby/TestRollingProduct.java b/engine/table/src/test/java/io/deephaven/engine/table/impl/updateby/TestRollingProduct.java
index 8107ce5e716..6c92a5e47cd 100644
--- a/engine/table/src/test/java/io/deephaven/engine/table/impl/updateby/TestRollingProduct.java
+++ b/engine/table/src/test/java/io/deephaven/engine/table/impl/updateby/TestRollingProduct.java
@@ -7,7 +7,6 @@
 import io.deephaven.api.updateby.UpdateByControl;
 import io.deephaven.api.updateby.UpdateByOperation;
 import io.deephaven.base.verify.Assert;
-import io.deephaven.datastructures.util.CollectionUtil;
 import io.deephaven.engine.context.ExecutionContext;
 import io.deephaven.engine.table.Table;
 import io.deephaven.engine.table.impl.QueryTable;
@@ -142,7 +141,7 @@ static CreateResult createSmallTestTable(int tableSize,
                 new BigDecimalGenerator(new BigInteger("1"), new BigInteger("2"), 5, .1)));
 
         final Random random = new Random(seed);
-        final ColumnInfo[] columnInfos = initColumnInfos(colsList.toArray(CollectionUtil.ZERO_LENGTH_STRING_ARRAY),
+        final ColumnInfo[] columnInfos = initColumnInfos(colsList.toArray(String[]::new),
                 generators.toArray(new TestDataGenerator[0]));
         final QueryTable t = getTable(tableSize, random, columnInfos);
 
diff --git a/engine/table/src/test/java/io/deephaven/engine/table/impl/util/RowSetShiftDataTest.java b/engine/table/src/test/java/io/deephaven/engine/table/impl/util/RowSetShiftDataTest.java
index 97ec38f5cea..2e8e68934a8 100644
--- a/engine/table/src/test/java/io/deephaven/engine/table/impl/util/RowSetShiftDataTest.java
+++ b/engine/table/src/test/java/io/deephaven/engine/table/impl/util/RowSetShiftDataTest.java
@@ -458,7 +458,7 @@ private long[] fromValues(long... values) {
         return values;
     }
 
-    private RowSetShiftData.Callback createMemMovCallback(final long[] arr) {
+    private RowKeyRangeShiftCallback createMemMovCallback(final long[] arr) {
         return (start, end, delta) -> {
             final long dir = (delta > 0) ? -1 : 1;
             if (dir < 0) {
diff --git a/engine/table/src/test/java/io/deephaven/engine/table/impl/util/ShiftDataTest.java b/engine/table/src/test/java/io/deephaven/engine/table/impl/util/ShiftDataTest.java
deleted file mode 100644
index 1e3573b9567..00000000000
--- a/engine/table/src/test/java/io/deephaven/engine/table/impl/util/ShiftDataTest.java
+++ /dev/null
@@ -1,271 +0,0 @@
-//
-// Copyright (c) 2016-2024 Deephaven Data Labs and Patent Pending
-//
-package io.deephaven.engine.table.impl.util;
-
-import io.deephaven.engine.rowset.RowSet;
-import io.deephaven.engine.rowset.RowSetBuilderRandom;
-import io.deephaven.engine.rowset.RowSetBuilderSequential;
-import io.deephaven.engine.rowset.RowSetFactory;
-import junit.framework.TestCase;
-
-import java.util.*;
-
-public class ShiftDataTest extends TestCase {
-
-    public void testSystematic() {
-        RowSet rowSet = getSortedIndex();
-        RowSet removed = getSortedIndex();
-        RowSet added = getSortedIndex();
-        ShiftData shiftData = new ShiftData(rowSet, removed, added);
-        shiftData.applyDataShift(new ShiftData.ShiftCallback() {
-            @Override
-            public void shift(long start, long end, long offset) {
-                assertTrue("Should not call it", false);
-            }
-        });
-        rowSet = getSortedIndex(1L);
-        testNoNotification(rowSet, removed, added);
-        added = getSortedIndex(1L);
-        testNoNotification(rowSet, removed, added);
-        rowSet = getSortedIndex(1L, 2);
-        added = getSortedIndex(1L, 2);
-        testNoNotification(rowSet, removed, added);
-
-        rowSet = getSortedIndex(1L, 2, 3);
-        added = getSortedIndex(2, 3);
-        testNoNotification(rowSet, removed, added);
-
-        removed = getSortedIndex(4, 5);
-        testNoNotification(rowSet, removed, added);
-
-        rowSet = getSortedIndex();
-        added = getSortedIndex();
-        removed = getSortedIndex(4, 5);
-        testNoNotification(rowSet, removed, added);
-
-        rowSet = getSortedIndex(1L, 2, 4);
-        added = getSortedIndex(2);
-        removed = getSortedIndex(3);
-        testNoNotification(rowSet, removed, added);
-
-        rowSet = getSortedIndex(1L, 3, 4);
-        added = getSortedIndex(3);
-        removed = getSortedIndex(2);
-        testNoNotification(rowSet, removed, added);
-
-        rowSet = getSortedIndex();
-        added = getSortedIndex();
-        removed = getSortedIndex(1, 2, 4);
-        testNoNotification(rowSet, removed, added);
-
-
-        rowSet = getSortedIndex(4);
-        added = getSortedIndex();
-        removed = getSortedIndex(1);
-        checkExpectations(rowSet, removed, added, new long[][] {{1, 1, -1}});
-
-        rowSet = getSortedIndex(4, 5);
-        added = getSortedIndex(4);
-        removed = getSortedIndex();
-        checkExpectations(rowSet, removed, added, new long[][] {{0, 0, 1}});
-
-        rowSet = getSortedIndex(4, 5, 6, 7);
-        added = getSortedIndex(4);
-        removed = getSortedIndex();
-        checkExpectations(rowSet, removed, added, new long[][] {{0, 2, 1}});
-
-        rowSet = getSortedIndex(4, 5, 6, 7);
-        added = getSortedIndex(4, 5);
-        removed = getSortedIndex();
-        checkExpectations(rowSet, removed, added, new long[][] {{0, 1, 2}});
-
-        rowSet = getSortedIndex(4, 5, 6, 7);
-        added = getSortedIndex(5, 6);
-        removed = getSortedIndex();
-        checkExpectations(rowSet, removed, added, new long[][] {{1, 1, 2}});
-        // was 1,4,7
-        rowSet = getSortedIndex(4, 5, 6, 7);
-        added = getSortedIndex(5, 6);
-        removed = getSortedIndex(1);
-        checkExpectations(rowSet, removed, added, new long[][] {{1, 1, -1}, {2, 2, 1}});
-
-        // was 1,2,4,6,7
-        rowSet = getSortedIndex(4, 5, 6, 7);
-        added = getSortedIndex(5);
-        removed = getSortedIndex(1, 2);
-        checkExpectations(rowSet, removed, added, new long[][] {{2, 2, -2}, {3, 4, -1}});
-
-        // was 6,7,9,11
-        rowSet = getSortedIndex(4, 5, 9, 10, 11);
-        added = getSortedIndex(4, 5, 10);
-        removed = getSortedIndex(6, 7);
-        checkExpectations(rowSet, removed, added, new long[][] {{3, 3, 1}});
-
-        // was 6,7,9,11
-        rowSet = getSortedIndex(4, 9, 10, 11);
-        added = getSortedIndex(4, 10);
-        removed = getSortedIndex(6, 7);
-        checkExpectations(rowSet, removed, added, new long[][] {{2, 2, -1}});
-
-        // was 2,4,6,8
-        rowSet = getSortedIndex(1, 2, 3, 4, 5, 6, 7, 8);
-        added = getSortedIndex(1, 3, 5, 7);
-        removed = getSortedIndex();
-        checkExpectations(rowSet, removed, added, new long[][] {{3, 3, 4}, {2, 2, 3}, {1, 1, 2}, {0, 0, 1}});
-
-        // was 2,4,6,8,10,12,16
-        rowSet = getSortedIndex(1, 2, 3, 4, 8, 16);
-        added = getSortedIndex(1, 3);
-        removed = getSortedIndex(6, 10, 12);
-        checkExpectations(rowSet, removed, added, new long[][] {{3, 3, 1}, {1, 1, 2}, {0, 0, 1}, {6, 6, -1}});
-
-        // was 100,200,300,400,500,600,700
-        rowSet = getSortedIndex(100, 200, 230, 240, 250, 260, 270, 500, 550, 700);
-        added = getSortedIndex(230, 240, 250, 260, 270, 550);
-        removed = getSortedIndex(300, 400, 600);
-        checkExpectations(rowSet, removed, added, new long[][] {{6, 6, 3}, {4, 4, 3}});
-    }
-
-    private void checkExpectations(RowSet rowSet, RowSet removed, RowSet added, long[][] expected) {
-        ShiftData shiftData;
-        class Expectations implements ShiftData.ShiftCallback {
-
-            private final long[][] expected;
-            private int i = 0;
-
-            Expectations(long[][] expected) {
-                this.expected = expected;
-            }
-
-            @Override
-            public void shift(long start, long end, long offset) {
-                long[] current = expected[i++];
-                assertEquals(current[0], start);
-                assertEquals(current[1], end);
-                assertEquals(current[2], offset);
-            }
-
-            public void allMet() {
-                assertEquals(i, expected.length);
-            }
-        }
-        shiftData = new ShiftData(rowSet, removed, added);
-        final Expectations expectations = new Expectations(expected);
-        shiftData.applyDataShift(expectations);
-        expectations.allMet();
-    }
-
-    private void testNoNotification(RowSet rowSet, RowSet removed, RowSet added) {
-        ShiftData shiftData;
-        shiftData = new ShiftData(rowSet, removed, added);
-        shiftData.applyDataShift(new ShiftData.ShiftCallback() {
-            @Override
-            public void shift(long start, long end, long offset) {
-                assertTrue("Should not call it", false);
-            }
-        });
-    }
-
-    Random random = new Random(123);
-
-    public void testRandom() {
-        for (int k = 0; k < 100; k++) {
-            RowSet initialRowSet = getBaseIndex(100, 10);
-            RowSet added = getRandomIndex(20, 1, 10);
-            RowSet removed = getRandomRemoves(initialRowSet, 2);
-            RowSet finalRowSet = getFinalIndex(initialRowSet, added, removed);
-            final long resultKeys[] = new long[(int) Math.max(initialRowSet.size(), finalRowSet.size())];
-            int pos = 0;
-            for (RowSet.Iterator it = initialRowSet.iterator(); it.hasNext();) {
-                resultKeys[pos++] = it.nextLong();
-            }
-            ShiftData shiftData = new ShiftData(finalRowSet, removed, added);
-            shiftData.applyDataShift(new ShiftData.ShiftCallback() {
-                @Override
-                public void shift(long start, long end, long offset) {
-                    if (offset > 0) {
-                        for (int i = (int) end; i >= start; i--) {
-                            resultKeys[((int) (i + offset))] = resultKeys[i];
-                        }
-                    } else {
-                        for (int i = (int) start; i <= end; i++) {
-                            resultKeys[((int) (i + offset))] = resultKeys[i];
-                        }
-                    }
-                }
-            });
-            RowSet addedPos = shiftData.getAddedPos();
-
-            for (RowSet.Iterator iterator = addedPos.iterator(), valueIt = added.iterator(); iterator.hasNext();) {
-                resultKeys[((int) iterator.nextLong())] = valueIt.nextLong();
-            }
-
-            pos = 0;
-            for (RowSet.Iterator iterator = finalRowSet.iterator(); iterator.hasNext();) {
-                assertEquals(iterator.nextLong(), resultKeys[pos++]);
-            }
-        }
-    }
-
-    private RowSet getFinalIndex(RowSet initialRowSet, RowSet added, RowSet removed) {
-        TreeSet<Long> finalKeys = new TreeSet<Long>();
-        for (RowSet.Iterator iterator = initialRowSet.iterator(); iterator.hasNext();) {
-            Long next = iterator.nextLong();
-            finalKeys.add(next);
-        }
-        for (RowSet.Iterator iterator = removed.iterator(); iterator.hasNext();) {
-            Long next = iterator.nextLong();
-            finalKeys.remove(next);
-        }
-        for (RowSet.Iterator iterator = added.iterator(); iterator.hasNext();) {
-            Long next = iterator.nextLong();
-            finalKeys.add(next);
-        }
-        RowSetBuilderRandom builder = RowSetFactory.builderRandom();
-        for (Long finalKey : finalKeys) {
-            builder.addKey(finalKey);
-        }
-        return builder.build();
-    }
-
-    private RowSet getRandomRemoves(RowSet rowSet, int prob) {
-        RowSetBuilderRandom builder = RowSetFactory.builderRandom();
-        for (RowSet.Iterator iterator = rowSet.iterator(); iterator.hasNext();) {
-            long next = iterator.nextLong();
-            if (random.nextInt(prob) == 0) {
-                builder.addKey(next);
-            }
-        }
-        return builder.build();
-    }
-
-
-    private RowSet getBaseIndex(int base, int size) {
-        RowSetBuilderSequential builder = RowSetFactory.builderSequential();
-        for (int i = 0; i < size; i++) {
-            builder.appendKey(i * size);
-        }
-        return builder.build();
-    }
-
-    private RowSet getRandomIndex(int base, int offset, int size) {
-        RowSetBuilderRandom builder = RowSetFactory.builderRandom();
-        for (int i = 0; i < size; i++) {
-            if (random.nextInt(2) == 0) {
-                builder.addKey(i * base + offset);
-            }
-        }
-        return builder.build();
-    }
-
-
-    protected RowSet getSortedIndex(long... keys) {
-        RowSetBuilderRandom builder = RowSetFactory.builderRandom();
-        for (long key : keys) {
-            builder.addKey(key);
-        }
-        return builder.build();
-    }
-
-}
diff --git a/engine/table/src/test/java/io/deephaven/engine/table/impl/util/TestTimeSeriesFilter.java b/engine/table/src/test/java/io/deephaven/engine/table/impl/util/TestTimeSeriesFilter.java
deleted file mode 100644
index f71f8b3c01c..00000000000
--- a/engine/table/src/test/java/io/deephaven/engine/table/impl/util/TestTimeSeriesFilter.java
+++ /dev/null
@@ -1,165 +0,0 @@
-//
-// Copyright (c) 2016-2024 Deephaven Data Labs and Patent Pending
-//
-package io.deephaven.engine.table.impl.util;
-
-import io.deephaven.engine.context.ExecutionContext;
-import io.deephaven.engine.table.Table;
-import io.deephaven.engine.testutil.ColumnInfo;
-import io.deephaven.engine.testutil.ControlledUpdateGraph;
-import io.deephaven.engine.testutil.generator.DateGenerator;
-import io.deephaven.engine.testutil.generator.IntGenerator;
-import io.deephaven.engine.util.TableTools;
-import io.deephaven.engine.testutil.EvalNugget;
-import io.deephaven.engine.testutil.testcase.RefreshingTableTestCase;
-import io.deephaven.engine.table.impl.QueryTable;
-import io.deephaven.engine.testutil.TstUtils;
-import io.deephaven.engine.table.impl.select.TimeSeriesFilter;
-import io.deephaven.time.DateTimeUtils;
-
-import java.lang.ref.WeakReference;
-import java.text.ParseException;
-import java.text.SimpleDateFormat;
-import java.time.Instant;
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.Random;
-
-import static io.deephaven.engine.testutil.TstUtils.getTable;
-import static io.deephaven.engine.testutil.TstUtils.initColumnInfos;
-
-public class TestTimeSeriesFilter extends RefreshingTableTestCase {
-    public void testSimple() {
-        Instant[] times = new Instant[10];
-
-        final long startTime = System.currentTimeMillis() - (10 * times.length);
-        for (int ii = 0; ii < times.length; ++ii) {
-            times[ii] = DateTimeUtils.epochNanosToInstant((startTime + (ii * 1000)) * 1000000L);
-        }
-
-        Table source = TableTools.newTable(TableTools.col("Timestamp", times));
-        TableTools.show(source);
-
-        UnitTestTimeSeriesFilter timeSeriesFilter = new UnitTestTimeSeriesFilter(startTime, "Timestamp", "PT00:00:05");
-        Table filtered = source.where(timeSeriesFilter);
-
-        TableTools.show(filtered);
-        assertEquals(10, filtered.size());
-
-        final ControlledUpdateGraph updateGraph = ExecutionContext.getContext().getUpdateGraph().cast();
-        updateGraph.runWithinUnitTestCycle(() -> {
-            timeSeriesFilter.incrementNow(5000);
-            timeSeriesFilter.run();
-        });
-
-        TableTools.show(filtered);
-        assertEquals(10, filtered.size());
-
-        updateGraph.runWithinUnitTestCycle(() -> {
-            timeSeriesFilter.incrementNow(5000);
-            timeSeriesFilter.run();
-        });
-
-        TableTools.show(filtered);
-        assertEquals(5, filtered.size());
-
-        updateGraph.runWithinUnitTestCycle(() -> {
-            timeSeriesFilter.incrementNow(2000);
-            timeSeriesFilter.run();
-        });
-
-        TableTools.show(filtered);
-        assertEquals(3, filtered.size());
-    }
-
-    public void testIncremental() throws ParseException {
-        Random random = new Random(0);
-
-        final SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd");
-
-        ColumnInfo<?, ?>[] columnInfo;
-        int size = 100;
-        final Date startDate = format.parse("2015-03-23");
-        Date endDate = format.parse("2015-03-24");
-        final QueryTable table = getTable(size, random, columnInfo = initColumnInfos(new String[] {"Date", "C1"},
-                new DateGenerator(startDate, endDate),
-                new IntGenerator(1, 100)));
-
-        final UnitTestTimeSeriesFilter unitTestTimeSeriesFilter =
-                new UnitTestTimeSeriesFilter(startDate.getTime(), "Date", "PT01:00:00");
-        final ArrayList<WeakReference<UnitTestTimeSeriesFilter>> filtersToRefresh = new ArrayList<>();
-
-        final ControlledUpdateGraph updateGraph = ExecutionContext.getContext().getUpdateGraph().cast();
-        EvalNugget[] en = new EvalNugget[] {
-                EvalNugget.from(() -> {
-                    UnitTestTimeSeriesFilter unitTestTimeSeriesFilter1 =
-                            new UnitTestTimeSeriesFilter(unitTestTimeSeriesFilter);
-                    filtersToRefresh.add(new WeakReference<>(unitTestTimeSeriesFilter1));
-                    return updateGraph.exclusiveLock().computeLocked(
-                            () -> table.update("Date=DateTimeUtils.epochNanosToInstant(Date.getTime() * 1000000L)")
-                                    .where(unitTestTimeSeriesFilter1));
-                }),
-        };
-
-
-        int updatesPerTick = 3;
-        for (int ii = 0; ii < 24 * (updatesPerTick + 1); ++ii) {
-            if (ii % (updatesPerTick + 1) > 0) {
-                simulateShiftAwareStep(size, random, table, columnInfo, en);
-            } else {
-                updateGraph.runWithinUnitTestCycle(() -> {
-                    unitTestTimeSeriesFilter.incrementNow(3600 * 1000);
-
-                    final ArrayList<WeakReference<UnitTestTimeSeriesFilter>> collectedRefs = new ArrayList<>();
-                    for (WeakReference<UnitTestTimeSeriesFilter> ref : filtersToRefresh) {
-                        final UnitTestTimeSeriesFilter refreshFilter = ref.get();
-                        if (refreshFilter == null) {
-                            collectedRefs.add(ref);
-                        } else {
-                            refreshFilter.setNow(unitTestTimeSeriesFilter.getNowLong());
-                            refreshFilter.run();
-                        }
-                    }
-                    filtersToRefresh.removeAll(collectedRefs);
-                });
-                TstUtils.validate("time update " + ii, en);
-            }
-        }
-    }
-
-    private static class UnitTestTimeSeriesFilter extends TimeSeriesFilter {
-        long now;
-
-        public UnitTestTimeSeriesFilter(long startTime, String timestamp, String period) {
-            super(timestamp, period);
-            now = startTime;
-        }
-
-        public UnitTestTimeSeriesFilter(long startTime, String timestamp, long period) {
-            super(timestamp, period);
-            now = startTime;
-        }
-
-        public UnitTestTimeSeriesFilter(UnitTestTimeSeriesFilter other) {
-            this(other.now, other.columnName, other.nanos);
-        }
-
-        @Override
-        protected long getNowNanos() {
-            return now * 1000000L;
-        }
-
-        long getNowLong() {
-            return now;
-        }
-
-        void incrementNow(long increment) {
-            now += increment;
-        }
-
-        void setNow(long newValue) {
-            now = newValue;
-        }
-    }
-
-}
diff --git a/engine/table/src/test/java/io/deephaven/engine/util/TestClock.java b/engine/table/src/test/java/io/deephaven/engine/util/TestClock.java
index 2a7debb4362..0c4ea932f71 100644
--- a/engine/table/src/test/java/io/deephaven/engine/util/TestClock.java
+++ b/engine/table/src/test/java/io/deephaven/engine/util/TestClock.java
@@ -4,6 +4,9 @@
 package io.deephaven.engine.util;
 
 import io.deephaven.base.clock.ClockNanoBase;
+import io.deephaven.time.DateTimeUtils;
+
+import java.time.ZoneId;
 
 public final class TestClock extends ClockNanoBase {
     public long now;
@@ -20,4 +23,42 @@ public TestClock(long nowNanos) {
     public long currentTimeNanos() {
         return now;
     }
+
+    /**
+     * Set the time.
+     *
+     * @param epochNanos the time to set in nanos since the epoch
+     * @return this clock
+     */
+    public TestClock setNanos(long epochNanos) {
+        this.now = epochNanos;
+        return this;
+    }
+
+    /**
+     * Set the time.
+     *
+     * @param epochMillis the time to set in millis since the epoch
+     * @return this clock
+     */
+    public TestClock setMillis(long epochMillis) {
+        this.now = DateTimeUtils.millisToNanos(epochMillis);
+        return this;
+    }
+
+    /**
+     * Add millis to the current time.
+     *
+     * @param millis the number of millis to add
+     * @return this clock
+     */
+    public TestClock addMillis(long millis) {
+        this.now += DateTimeUtils.millisToNanos(millis);
+        return this;
+    }
+
+    @Override
+    public String toString() {
+        return "TestClock{" + DateTimeUtils.epochNanosToInstant(now).atZone(ZoneId.systemDefault()) + "}";
+    }
 }
diff --git a/engine/table/src/test/java/io/deephaven/engine/util/TestJobScheduler.java b/engine/table/src/test/java/io/deephaven/engine/util/TestJobScheduler.java
index 2e05d840473..1058cdb6e3a 100644
--- a/engine/table/src/test/java/io/deephaven/engine/util/TestJobScheduler.java
+++ b/engine/table/src/test/java/io/deephaven/engine/util/TestJobScheduler.java
@@ -23,6 +23,8 @@
 import java.util.concurrent.ExecutionException;
 import java.util.concurrent.atomic.AtomicInteger;
 
+import static org.junit.Assert.assertNotNull;
+
 public final class TestJobScheduler {
 
     @Rule
@@ -148,8 +150,7 @@ public void close() {
                     0,
                     50,
                     (context, idx, nec, resume) -> {
-                        // verify the type is correct
-                        Assert.instanceOf(context, "context", TestJobThreadContext.class);
+                        assertNotNull(context);
 
                         completed[idx] = true;
                         resume.run();
@@ -261,8 +262,7 @@ public void close() {
                     0,
                     50,
                     (context, idx, nec, resume) -> {
-                        // verify the type is correct
-                        Assert.instanceOf(context, "context", TestJobThreadContext.class);
+                        assertNotNull(context);
 
                         completed[idx] = true;
                         resume.run();
@@ -395,8 +395,7 @@ public void close() {
                     0,
                     50,
                     (context, idx, nec) -> {
-                        // verify the type is correct
-                        Assert.instanceOf(context, "context", TestJobThreadContext.class);
+                        assertNotNull(context);
 
                         // throw before "doing work" to make verification easy
                         if (idx == 10) {
@@ -466,8 +465,7 @@ public void close() {
                     0,
                     50,
                     (context, idx, nec, resume) -> {
-                        // verify the type is correct
-                        Assert.instanceOf(context, "context", TestJobThreadContext.class);
+                        assertNotNull(context);
 
                         completed[idx] = true;
 
@@ -551,8 +549,7 @@ public void close() {
                                 0,
                                 60,
                                 (context2, idx2, nec2) -> {
-                                    // verify the type is correct
-                                    Assert.instanceOf(context2, "context2", TestJobThreadContext.class);
+                                    assertNotNull(context2);
 
                                     // throw before "doing work" to make verification easy
                                     if (idx1 == 10 && idx2 == 10) {
@@ -631,8 +628,7 @@ public void close() {
                                 0,
                                 60,
                                 (context2, idx2, nec2) -> {
-                                    // verify the type is correct
-                                    Assert.instanceOf(context2, "context2", TestJobThreadContext.class);
+                                    assertNotNull(context2);
                                     completed[idx1][idx2] = true;
                                 }, r1, nec1);
                     },
@@ -701,8 +697,7 @@ public void close() {
                                 0,
                                 60,
                                 (context2, idx2, nec2) -> {
-                                    // verify the type is correct
-                                    Assert.instanceOf(context2, "context2", TestJobThreadContext.class);
+                                    assertNotNull(context2);
                                     completed[idx1][idx2] = true;
                                 }, r1, nec1);
                     },
@@ -769,8 +764,7 @@ public void close() {
                         0,
                         50,
                         (context, idx, nec) -> {
-                            // verify the type is correct
-                            Assert.instanceOf(context, "context", TestJobThreadContext.class);
+                            assertNotNull(context);
 
                             // throw before "doing work" to make verification easy
                             if (idx == 10) {
@@ -824,8 +818,7 @@ public void close() {
                         0,
                         50,
                         (context, idx, nec) -> {
-                            // verify the type is correct
-                            Assert.instanceOf(context, "context", TestJobThreadContext.class);
+                            assertNotNull(context);
                             completed[idx] = true;
                         },
                         () -> {
diff --git a/engine/table/src/test/java/io/deephaven/engine/util/TestNumericTypeUtils.java b/engine/table/src/test/java/io/deephaven/engine/util/TestNumericTypeUtils.java
new file mode 100644
index 00000000000..795405becba
--- /dev/null
+++ b/engine/table/src/test/java/io/deephaven/engine/util/TestNumericTypeUtils.java
@@ -0,0 +1,34 @@
+//
+// Copyright (c) 2016-2024 Deephaven Data Labs and Patent Pending
+//
+package io.deephaven.engine.util;
+
+import io.deephaven.util.type.NumericTypeUtils;
+import org.junit.Test;
+
+import java.time.Instant;
+import java.util.Date;
+
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
+
+public class TestNumericTypeUtils {
+
+    @Test
+    public void testIsType() {
+        assertFalse(NumericTypeUtils.isPrimitiveNumeric(Instant.class));
+        assertFalse(NumericTypeUtils.isPrimitiveNumeric(Date.class));
+        assertTrue(NumericTypeUtils.isPrimitiveNumeric(int.class));
+        assertFalse(NumericTypeUtils.isPrimitiveNumeric(Double.class));
+
+        assertFalse(NumericTypeUtils.isBoxedNumeric(Instant.class));
+        assertFalse(NumericTypeUtils.isBoxedNumeric(Date.class));
+        assertFalse(NumericTypeUtils.isBoxedNumeric(int.class));
+        assertTrue(NumericTypeUtils.isBoxedNumeric(Double.class));
+
+        assertFalse(NumericTypeUtils.isNumeric(Instant.class));
+        assertFalse(NumericTypeUtils.isNumeric(Date.class));
+        assertTrue(NumericTypeUtils.isNumeric(int.class));
+        assertTrue(NumericTypeUtils.isNumeric(Double.class));
+    }
+}
diff --git a/engine/table/src/test/java/io/deephaven/engine/util/TestTableTools.java b/engine/table/src/test/java/io/deephaven/engine/util/TestTableTools.java
index 4bae86ac383..c68eba09288 100644
--- a/engine/table/src/test/java/io/deephaven/engine/util/TestTableTools.java
+++ b/engine/table/src/test/java/io/deephaven/engine/util/TestTableTools.java
@@ -5,7 +5,6 @@
 
 import io.deephaven.chunk.IntChunk;
 import io.deephaven.chunk.attributes.Values;
-import io.deephaven.datastructures.util.CollectionUtil;
 import io.deephaven.engine.context.*;
 import io.deephaven.engine.rowset.RowSet;
 import io.deephaven.engine.rowset.RowSetFactory;
@@ -28,6 +27,7 @@
 import io.deephaven.test.types.OutOfBandTest;
 import io.deephaven.time.DateTimeUtils;
 import io.deephaven.util.QueryConstants;
+import io.deephaven.util.type.ArrayTypeUtils;
 import io.deephaven.vector.IntVector;
 import junit.framework.TestCase;
 import org.junit.Assert;
@@ -68,8 +68,8 @@ public void setUp() throws Exception {
         table2 = testRefreshingTable(TstUtils.i(1, 3, 5, 10, 20, 30, 31, 32, 33).toTracking(),
                 col("StringKeys1", "key1", "key1", "key1", "key1", "key2", "key2", "key2", "key2", "key2"),
                 col("GroupedInts1", 1, 1, 2, 2, 2, 3, 3, 3, 3));
-        emptyTable = testRefreshingTable(col("StringKeys", (Object) CollectionUtil.ZERO_LENGTH_STRING_ARRAY),
-                col("GroupedInts", (Object) CollectionUtil.ZERO_LENGTH_BYTE_ARRAY));
+        emptyTable = testRefreshingTable(col("StringKeys", (Object) ArrayTypeUtils.EMPTY_STRING_ARRAY),
+                col("GroupedInts", (Object) ArrayTypeUtils.EMPTY_BYTE_ARRAY));
     }
 
     @Test
diff --git a/engine/table/src/test/java/io/deephaven/engine/util/TestTypeUtils.java b/engine/table/src/test/java/io/deephaven/engine/util/TestTypeUtils.java
index 46bad50b275..3becd9e27b8 100644
--- a/engine/table/src/test/java/io/deephaven/engine/util/TestTypeUtils.java
+++ b/engine/table/src/test/java/io/deephaven/engine/util/TestTypeUtils.java
@@ -7,7 +7,6 @@
 import junit.framework.TestCase;
 import org.apache.commons.lang3.ArrayUtils;
 
-import java.io.IOException;
 import java.time.Instant;
 import java.util.Arrays;
 import java.util.Date;
@@ -129,21 +128,6 @@ public void testTypesSetOrdering() {
     }
 
     public void testIsType() {
-        assertFalse(io.deephaven.util.type.TypeUtils.isPrimitiveNumeric(Instant.class));
-        assertFalse(io.deephaven.util.type.TypeUtils.isPrimitiveNumeric(Date.class));
-        assertTrue(io.deephaven.util.type.TypeUtils.isPrimitiveNumeric(int.class));
-        assertFalse(io.deephaven.util.type.TypeUtils.isPrimitiveNumeric(Double.class));
-
-        assertFalse(io.deephaven.util.type.TypeUtils.isBoxedNumeric(Instant.class));
-        assertFalse(io.deephaven.util.type.TypeUtils.isBoxedNumeric(Date.class));
-        assertFalse(io.deephaven.util.type.TypeUtils.isBoxedNumeric(int.class));
-        assertTrue(io.deephaven.util.type.TypeUtils.isBoxedNumeric(Double.class));
-
-        assertFalse(io.deephaven.util.type.TypeUtils.isNumeric(Instant.class));
-        assertFalse(io.deephaven.util.type.TypeUtils.isNumeric(Date.class));
-        assertTrue(io.deephaven.util.type.TypeUtils.isNumeric(int.class));
-        assertTrue(io.deephaven.util.type.TypeUtils.isNumeric(Double.class));
-
         assertFalse(io.deephaven.util.type.TypeUtils.isCharacter(Instant.class));
         assertFalse(io.deephaven.util.type.TypeUtils.isCharacter(Date.class));
         assertFalse(io.deephaven.util.type.TypeUtils.isCharacter(int.class));
@@ -162,9 +146,4 @@ public void testIsType() {
         assertFalse(io.deephaven.util.type.TypeUtils.isBoxedChar(char.class));
         assertTrue(io.deephaven.util.type.TypeUtils.isBoxedChar(Character.class));
     }
-
-    public void testObjectToString() throws IOException {
-        assertNull(io.deephaven.util.type.TypeUtils.objectToString(null)); // null input
-        assertEquals("STRING", io.deephaven.util.type.TypeUtils.objectToString("STRING")); // non null input
-    }
 }
diff --git a/engine/table/src/test/java/io/deephaven/engine/util/jpy/JpyConfigLoaderTest.java b/engine/table/src/test/java/io/deephaven/engine/util/jpy/JpyConfigLoaderTest.java
index 730ecac72bd..294b8518972 100644
--- a/engine/table/src/test/java/io/deephaven/engine/util/jpy/JpyConfigLoaderTest.java
+++ b/engine/table/src/test/java/io/deephaven/engine/util/jpy/JpyConfigLoaderTest.java
@@ -226,7 +226,7 @@ private static Configuration loadConfig(String configFile) {
         // and Configuration not an interface...
         String existingValue = System.getProperty("Configuration.rootFile");
         System.setProperty("Configuration.rootFile", configFile);
-        Configuration config = Configuration.newConfigurationForTesting();
+        Configuration config = Configuration.newStandaloneConfiguration();
         if (existingValue != null) {
             System.setProperty("Configuration.rootFile", existingValue);
         } else {
diff --git a/engine/table/src/test/java/io/deephaven/stream/TestStreamToBlinkTableAdapter.java b/engine/table/src/test/java/io/deephaven/stream/TestStreamToBlinkTableAdapter.java
index b89de7fa701..26e4928b0a4 100644
--- a/engine/table/src/test/java/io/deephaven/stream/TestStreamToBlinkTableAdapter.java
+++ b/engine/table/src/test/java/io/deephaven/stream/TestStreamToBlinkTableAdapter.java
@@ -4,8 +4,11 @@
 package io.deephaven.stream;
 
 import io.deephaven.chunk.attributes.Values;
-import io.deephaven.datastructures.util.CollectionUtil;
+import io.deephaven.chunk.util.pools.ChunkPoolConstants;
+import io.deephaven.chunk.util.pools.ChunkPoolReleaseTracking;
 import io.deephaven.engine.context.ExecutionContext;
+import io.deephaven.engine.liveness.LivenessScope;
+import io.deephaven.engine.liveness.LivenessScopeStack;
 import io.deephaven.engine.rowset.RowSetFactory;
 import io.deephaven.engine.rowset.RowSetShiftData;
 import io.deephaven.engine.table.Table;
@@ -19,6 +22,8 @@
 import io.deephaven.engine.table.impl.SimpleListener;
 import io.deephaven.chunk.*;
 import io.deephaven.util.BooleanUtils;
+import io.deephaven.util.SafeCloseable;
+import io.deephaven.util.type.ArrayTypeUtils;
 import junit.framework.TestCase;
 import org.apache.commons.lang3.mutable.MutableBoolean;
 import org.jetbrains.annotations.NotNull;
@@ -329,7 +334,7 @@ public void testArrayTypes() {
         TestCase.assertEquals(ModifiedColumnSet.EMPTY, listener.getUpdate().modifiedColumnSet());
 
         final Table expect1 = TableTools.newTable(
-                col("SA", new String[] {"Gagarin", "Tereshkova"}, CollectionUtil.ZERO_LENGTH_STRING_ARRAY),
+                col("SA", new String[] {"Gagarin", "Tereshkova"}, ArrayTypeUtils.EMPTY_STRING_ARRAY),
                 col("IA", new int[] {1, 2, 3}, new int[] {4, 5, 6}));
         TstUtils.assertTableEquals(expect1, result);
 
@@ -446,6 +451,34 @@ public void onFailureInternal(Throwable originalException, Entry sourceEntry) {
         TestCase.assertTrue(listenerFailed.booleanValue());
     }
 
+    @Test
+    public void testCleanup() {
+        final TableDefinition tableDefinition = TableDefinition.from(
+                List.of("O", "B", "S", "I", "L", "F", "D", "C"),
+                List.of(String.class, byte.class, short.class, int.class, long.class, float.class, double.class,
+                        char.class));
+        final Table tableToAdd = emptyTable(ChunkPoolConstants.SMALLEST_POOLED_CHUNK_CAPACITY).updateView(
+                "O=Long.toString(ii)", "B=(byte)ii", "S=(short)ii", "I=(int)ii", "L=ii", "F=(float)ii",
+                "D=(double)ii", "C=(char)ii");
+        final ControlledUpdateGraph updateGraph = ExecutionContext.getContext().getUpdateGraph().cast();
+        try (final SafeCloseable ignored = LivenessScopeStack.open(new LivenessScope(true), true)) {
+            final TablePublisher tablePublisher = TablePublisher.of("Test", tableDefinition, null, null);
+            // Add buffered chunks
+            tablePublisher.add(tableToAdd);
+            // Move buffered chunks to current
+            updateGraph.runWithinUnitTestCycle(() -> {
+            });
+            // Add more buffered chunks
+            tablePublisher.add(tableToAdd);
+            // Move current to previous, buffered to current
+            updateGraph.runWithinUnitTestCycle(() -> {
+            });
+            // Add even more buffered chunks
+            tablePublisher.add(tableToAdd);
+        }
+        ChunkPoolReleaseTracking.check();
+    }
+
     private static class DummyStreamPublisher implements StreamPublisher {
 
         private boolean fail;
diff --git a/engine/table/src/test/resources/ReferenceParquetWithCodecColumns.parquet b/engine/table/src/test/resources/ReferenceParquetWithCodecColumns.parquet
new file mode 100644
index 00000000000..7d29daa9c7c
--- /dev/null
+++ b/engine/table/src/test/resources/ReferenceParquetWithCodecColumns.parquet
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:d934e2cbee03b2cdcea4077f2446211fc51fb3d515985d92824c6b0db396a233
+size 2375
diff --git a/engine/table/src/test/resources/ReferenceParquetWithMapCodecData.parquet b/engine/table/src/test/resources/ReferenceParquetWithMapCodecData.parquet
new file mode 100644
index 00000000000..2c68c42e1da
--- /dev/null
+++ b/engine/table/src/test/resources/ReferenceParquetWithMapCodecData.parquet
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:07ba35d54dd0e2343f02ddfe1df3c4485ae78a80a35c16c9b5e1bb3c84aee07e
+size 2354
diff --git a/engine/test-utils/build.gradle b/engine/test-utils/build.gradle
index 883e4cd7d00..2ca92c66019 100644
--- a/engine/test-utils/build.gradle
+++ b/engine/test-utils/build.gradle
@@ -9,18 +9,20 @@ dependencies {
     api project(":engine-table")
     api project(":engine-rowset")
 
+    implementation project(":util-processenvironment")
+    implementation project(":util-thread")
     implementation project(':Configuration')
     implementation project(':engine-tuple')
     api project(':base-test-utils')
     implementation project(':engine-rowset-test-utils')
     implementation project(':extensions-source-support')
 
-    implementation depCommonsLang3
-    implementation depTrove3
+    implementation libs.commons.lang3
+    implementation libs.trove
 
-    implementation 'it.unimi.dsi:fastutil:8.5.13'
+    implementation libs.dsi.fastutil
 
-    Classpaths.inheritJUnitClassic(project, 'implementation')
-    Classpaths.inheritJUnitPlatform(project, 'implementation')
-    Classpaths.inheritAssertJ(project, 'implementation')
+    implementation libs.junit4
+    implementation platform(libs.junit.bom)
+    implementation libs.assertj
 }
diff --git a/engine/test-utils/src/main/java/io/deephaven/engine/testutil/EvalNuggetSet.java b/engine/test-utils/src/main/java/io/deephaven/engine/testutil/EvalNuggetSet.java
index ceea8e134ad..c49ce7cfd95 100644
--- a/engine/test-utils/src/main/java/io/deephaven/engine/testutil/EvalNuggetSet.java
+++ b/engine/test-utils/src/main/java/io/deephaven/engine/testutil/EvalNuggetSet.java
@@ -3,6 +3,7 @@
 //
 package io.deephaven.engine.testutil;
 
+import io.deephaven.engine.liveness.LivenessScope;
 import io.deephaven.engine.liveness.LivenessScopeStack;
 import io.deephaven.engine.table.Table;
 import io.deephaven.engine.util.TableTools;
@@ -21,7 +22,7 @@ public EvalNuggetSet(String description) {
 
     @Override
     public void validate(final String msg) {
-        try (final SafeCloseable ignored = LivenessScopeStack.open()) {
+        try (final SafeCloseable ignored = LivenessScopeStack.open(new LivenessScope(true), true)) {
             final Table expected = e();
             try {
                 TableTools.show(expected);
diff --git a/engine/test-utils/src/main/java/io/deephaven/engine/testutil/GenerateTableUpdates.java b/engine/test-utils/src/main/java/io/deephaven/engine/testutil/GenerateTableUpdates.java
index 6040187d840..6690ba1e4c8 100644
--- a/engine/test-utils/src/main/java/io/deephaven/engine/testutil/GenerateTableUpdates.java
+++ b/engine/test-utils/src/main/java/io/deephaven/engine/testutil/GenerateTableUpdates.java
@@ -4,7 +4,6 @@
 package io.deephaven.engine.testutil;
 
 import io.deephaven.base.verify.Assert;
-import io.deephaven.datastructures.util.CollectionUtil;
 import io.deephaven.engine.rowset.*;
 import io.deephaven.engine.table.ColumnSource;
 import io.deephaven.engine.table.ModifiedColumnSet;
@@ -276,7 +275,7 @@ public static void generateShiftAwareTableUpdates(final SimulationProfile profil
                         modifiedColumns.add(ci.name);
                     }
                 }
-                update.modifiedColumnSet().setAll(modifiedColumns.toArray(CollectionUtil.ZERO_LENGTH_STRING_ARRAY));
+                update.modifiedColumnSet().setAll(modifiedColumns.toArray(String[]::new));
             }
 
             update.added = TstUtils.newIndex(numRowsBlattedByShift + random.nextInt(targetUpdateSize), rowSet, random);
diff --git a/engine/test-utils/src/main/java/io/deephaven/engine/testutil/TstUtils.java b/engine/test-utils/src/main/java/io/deephaven/engine/testutil/TstUtils.java
index 4975d53fc13..9518badf6af 100644
--- a/engine/test-utils/src/main/java/io/deephaven/engine/testutil/TstUtils.java
+++ b/engine/test-utils/src/main/java/io/deephaven/engine/testutil/TstUtils.java
@@ -12,6 +12,7 @@
 import io.deephaven.chunk.WritableLongChunk;
 import io.deephaven.chunk.attributes.Values;
 import io.deephaven.configuration.Configuration;
+import io.deephaven.engine.liveness.LivenessScope;
 import io.deephaven.engine.liveness.LivenessScopeStack;
 import io.deephaven.engine.liveness.LivenessStateException;
 import io.deephaven.engine.rowset.*;
@@ -430,7 +431,7 @@ public static void validate(final String ctxt, final EvalNuggetInterface[] en) {
             System.out.println("================ NEXT ITERATION ================");
         }
         for (int i = 0; i < en.length; i++) {
-            try (final SafeCloseable ignored = LivenessScopeStack.open()) {
+            try (final SafeCloseable ignored = LivenessScopeStack.open(new LivenessScope(true), true)) {
                 if (RefreshingTableTestCase.printTableUpdates) {
                     if (i != 0) {
                         System.out.println("================ NUGGET (" + i + ") ================");
diff --git a/engine/test-utils/src/main/java/io/deephaven/engine/testutil/generator/UniqueStringArrayGenerator.java b/engine/test-utils/src/main/java/io/deephaven/engine/testutil/generator/UniqueStringArrayGenerator.java
index 2c64c488c36..2039ceaa35f 100644
--- a/engine/test-utils/src/main/java/io/deephaven/engine/testutil/generator/UniqueStringArrayGenerator.java
+++ b/engine/test-utils/src/main/java/io/deephaven/engine/testutil/generator/UniqueStringArrayGenerator.java
@@ -6,7 +6,6 @@
 import io.deephaven.chunk.ObjectChunk;
 import io.deephaven.chunk.WritableObjectChunk;
 import io.deephaven.chunk.attributes.Values;
-import io.deephaven.datastructures.util.CollectionUtil;
 
 import java.util.Arrays;
 import java.util.List;
@@ -43,7 +42,7 @@ List<String> nextValue(long key, Random random) {
 
     @Override
     String[] adapt(List<String> value) {
-        return value.toArray(CollectionUtil.ZERO_LENGTH_STRING_ARRAY);
+        return value.toArray(String[]::new);
     }
 
     @Override
diff --git a/engine/test-utils/src/main/java/io/deephaven/engine/testutil/locations/TableBackedTableLocationKey.java b/engine/test-utils/src/main/java/io/deephaven/engine/testutil/locations/TableBackedTableLocationKey.java
index 1c2cc7ce1c9..97829cfaf9f 100644
--- a/engine/test-utils/src/main/java/io/deephaven/engine/testutil/locations/TableBackedTableLocationKey.java
+++ b/engine/test-utils/src/main/java/io/deephaven/engine/testutil/locations/TableBackedTableLocationKey.java
@@ -46,10 +46,16 @@ public String toString() {
 
     @Override
     public int compareTo(@NotNull final TableLocationKey other) {
-        // noinspection DataFlowIssue
-        return Integer.compare(
-                (int) table.getAttribute("ID"),
-                (int) ((TableBackedTableLocationKey) other).table.getAttribute("ID"));
+        if (other instanceof TableBackedTableLocationKey) {
+            final TableBackedTableLocationKey otherTyped = (TableBackedTableLocationKey) other;
+            // noinspection DataFlowIssue
+            final int idComparisonResult =
+                    Integer.compare((int) table.getAttribute("ID"), (int) otherTyped.table.getAttribute("ID"));
+            if (idComparisonResult != 0) {
+                return idComparisonResult;
+            }
+        }
+        return ImmutableTableLocationKey.super.compareTo(other);
     }
 
     @Override
diff --git a/engine/test-utils/src/main/java/io/deephaven/engine/testutil/locations/TableBackedTableLocationProvider.java b/engine/test-utils/src/main/java/io/deephaven/engine/testutil/locations/TableBackedTableLocationProvider.java
index 09687f81f1c..65e196b6d46 100644
--- a/engine/test-utils/src/main/java/io/deephaven/engine/testutil/locations/TableBackedTableLocationProvider.java
+++ b/engine/test-utils/src/main/java/io/deephaven/engine/testutil/locations/TableBackedTableLocationProvider.java
@@ -6,6 +6,7 @@
 import io.deephaven.base.verify.Assert;
 import io.deephaven.engine.table.Table;
 import io.deephaven.engine.table.impl.QueryTable;
+import io.deephaven.engine.table.impl.TableUpdateMode;
 import io.deephaven.engine.table.impl.locations.TableLocation;
 import io.deephaven.engine.table.impl.locations.TableLocationKey;
 import io.deephaven.engine.table.impl.locations.impl.AbstractTableLocationProvider;
@@ -31,8 +32,10 @@ public final class TableBackedTableLocationProvider extends AbstractTableLocatio
     public TableBackedTableLocationProvider(
             @NotNull final UpdateSourceRegistrar registrar,
             final boolean supportsSubscriptions,
+            final TableUpdateMode updateMode,
+            final TableUpdateMode locationUpdateMode,
             @NotNull final Table... tables) {
-        super(StandaloneTableKey.getInstance(), supportsSubscriptions);
+        super(StandaloneTableKey.getInstance(), supportsSubscriptions, updateMode, locationUpdateMode);
         this.registrar = registrar;
         processPending(Arrays.stream(tables));
     }
@@ -43,7 +46,7 @@ private void processPending(@NotNull final Stream<Table> tableStream) {
                         .withAttributes(Map.of(LOCATION_ID_ATTR, nextId.getAndIncrement())))
                 .peek(table -> Assert.assertion(table.isAppendOnly(), "table is append only"))
                 .map(TableBackedTableLocationKey::new)
-                .forEach(this::handleTableLocationKey);
+                .forEach(this::handleTableLocationKeyAdded);
     }
 
     public synchronized void addPending(@NotNull final Table toAdd) {
diff --git a/engine/time/build.gradle b/engine/time/build.gradle
index 1ad3995e386..6ab2a69cf04 100644
--- a/engine/time/build.gradle
+++ b/engine/time/build.gradle
@@ -5,10 +5,6 @@ plugins {
 
 description 'Engine Time: Types and libraries for working with instants, periods, and calendars'
 
-configurations {
-    testImplementation.extendsFrom junit
-}
-
 dependencies {
     api project(':Base')
     api project(':Util')
@@ -17,13 +13,14 @@ dependencies {
     implementation project(':engine-function')
     implementation project(':Configuration')
     implementation project(':log-factory')
-    implementation depJdom2
-    Classpaths.inheritDagger(project)
+    implementation libs.jdom2
+    implementation libs.dagger
+    annotationProcessor libs.dagger.compiler
 
     testImplementation project(':base-test-utils')
 
     testRuntimeOnly project(':log-to-slf4j'),
             project(path: ':configs'),
             project(path: ':test-configs')
-    Classpaths.inheritSlf4j(project, 'slf4j-simple', 'testRuntimeOnly')
+    testRuntimeOnly libs.slf4j.simple
 }
diff --git a/engine/time/src/main/java/io/deephaven/time/calendar/BusinessCalendar.java b/engine/time/src/main/java/io/deephaven/time/calendar/BusinessCalendar.java
index 3b95f92adae..66a0c6813fe 100644
--- a/engine/time/src/main/java/io/deephaven/time/calendar/BusinessCalendar.java
+++ b/engine/time/src/main/java/io/deephaven/time/calendar/BusinessCalendar.java
@@ -57,76 +57,188 @@ public InvalidDateException(final String message, final Throwable cause) {
 
     // region Cache
 
-    private final Map<LocalDate, CalendarDay<Instant>> cachedSchedules = new HashMap<>();
-    private final Map<Integer, YearData> cachedYearData = new HashMap<>();
+    private static class SummaryData extends ReadOptimizedConcurrentCache.IntKeyedValue {
+        private final Instant startInstant;
+        private final LocalDate startDate;
+        private final Instant endInstant;
+        private final LocalDate endDate; // exclusive
+        private final long businessTimeNanos;
+        private final int businessDays;
+        private final int nonBusinessDays;
+        private final ArrayList<LocalDate> businessDates;
+        private final ArrayList<LocalDate> nonBusinessDates;
+
+        public SummaryData(
+                final int key,
+                final Instant startInstant,
+                final LocalDate startDate,
+                final Instant endInstant,
+                final LocalDate endDate,
+                final long businessTimeNanos,
+                final int businessDays,
+                final int nonBusinessDays,
+                final ArrayList<LocalDate> businessDates,
+                final ArrayList<LocalDate> nonBusinessDates) {
+            super(key);
+            this.startInstant = startInstant;
+            this.startDate = startDate;
+            this.endInstant = endInstant;
+            this.endDate = endDate;
+            this.businessTimeNanos = businessTimeNanos;
+            this.businessDays = businessDays;
+            this.nonBusinessDays = nonBusinessDays;
+            this.businessDates = businessDates;
+            this.nonBusinessDates = nonBusinessDates;
+        }
+    }
+
+    private final ReadOptimizedConcurrentCache<ReadOptimizedConcurrentCache.Pair<CalendarDay<Instant>>> schedulesCache =
+            new ReadOptimizedConcurrentCache<>(10000, this::computeCalendarDay);
+    private final YearMonthSummaryCache<SummaryData> summaryCache =
+            new YearMonthSummaryCache<>(this::computeMonthSummary, this::computeYearSummary);
+    private final int yearCacheStart;
+    private final int yearCacheEnd;
 
-    private void populateSchedules() {
-        LocalDate date = firstValidDate;
+    @Override
+    synchronized void clearCache() {
+        super.clearCache();
+        schedulesCache.clear();
+        summaryCache.clear();
+    }
 
-        while (!date.isAfter(lastValidDate)) {
+    private SummaryData summarize(final int key, final LocalDate startDate, final LocalDate endDate) {
+        final ZonedDateTime start = startDate.atTime(0, 0).atZone(timeZone());
+        final ZonedDateTime end = endDate.atTime(0, 0).atZone(timeZone());
 
-            final CalendarDay<Instant> s = holidays.get(date);
+        LocalDate date = startDate;
+        long businessTimeNanos = 0;
+        int businessDays = 0;
+        int nonBusinessDays = 0;
+        final ArrayList<LocalDate> businessDates = new ArrayList<>();
+        final ArrayList<LocalDate> nonBusinessDates = new ArrayList<>();
 
-            if (s != null) {
-                cachedSchedules.put(date, s);
-            } else if (weekendDays.contains(date.getDayOfWeek())) {
-                cachedSchedules.put(date, CalendarDay.toInstant(CalendarDay.HOLIDAY, date, timeZone()));
+        while (date.isBefore(endDate)) {
+            final CalendarDay<Instant> bs = calendarDay(date);
+
+            if (bs.isBusinessDay()) {
+                ++businessDays;
+                businessDates.add(date);
             } else {
-                cachedSchedules.put(date, CalendarDay.toInstant(standardBusinessDay, date, timeZone()));
+                ++nonBusinessDays;
+                nonBusinessDates.add(date);
             }
 
+            businessTimeNanos += bs.businessNanos();
             date = date.plusDays(1);
         }
-    }
 
-    private static class YearData {
-        private final Instant start;
-        private final Instant end;
-        private final long businessTimeNanos;
+        return new SummaryData(
+                key,
+                start.toInstant(),
+                start.toLocalDate(),
+                end.toInstant(),
+                end.toLocalDate(),
+                businessTimeNanos,
+                businessDays,
+                nonBusinessDays,
+                businessDates,
+                nonBusinessDates);
+    }
+
+    private SummaryData computeMonthSummary(final int key) {
+        final int year = YearMonthSummaryCache.yearFromYearMonthKey(key);
+        final int month = YearMonthSummaryCache.monthFromYearMonthKey(key);
+        final LocalDate startDate = LocalDate.of(year, month, 1);
+        final LocalDate endDate = startDate.plusMonths(1); // exclusive
+        return summarize(key, startDate, endDate);
+    }
+
+    private SummaryData computeYearSummary(final int year) {
+        Instant startInstant = null;
+        LocalDate startDate = null;
+        Instant endInstant = null;
+        LocalDate endDate = null;
+        long businessTimeNanos = 0;
+        int businessDays = 0;
+        int nonBusinessDays = 0;
+        ArrayList<LocalDate> businessDates = new ArrayList<>();
+        ArrayList<LocalDate> nonBusinessDates = new ArrayList<>();
+
+        for (int month = 1; month <= 12; month++) {
+            SummaryData ms = summaryCache.getMonthSummary(year, month);
+            if (month == 1) {
+                startInstant = ms.startInstant;
+                startDate = ms.startDate;
+            }
 
-        public YearData(final Instant start, final Instant end, final long businessTimeNanos) {
-            this.start = start;
-            this.end = end;
-            this.businessTimeNanos = businessTimeNanos;
+            if (month == 12) {
+                endInstant = ms.endInstant;
+                endDate = ms.endDate;
+            }
+
+            businessTimeNanos += ms.businessTimeNanos;
+            businessDays += ms.businessDays;
+            nonBusinessDays += ms.nonBusinessDays;
+            businessDates.addAll(ms.businessDates);
+            nonBusinessDates.addAll(ms.nonBusinessDates);
         }
+
+        return new SummaryData(
+                year,
+                startInstant,
+                startDate,
+                endInstant,
+                endDate,
+                businessTimeNanos,
+                businessDays,
+                nonBusinessDays,
+                businessDates,
+                nonBusinessDates);
     }
 
-    private void populateCachedYearData() {
-        // Only cache complete years, since incomplete years can not be fully computed.
+    private SummaryData getYearSummary(final int year) {
 
-        final int yearStart =
-                firstValidDate.getDayOfYear() == 1 ? firstValidDate.getYear() : firstValidDate.getYear() + 1;
-        final int yearEnd = ((lastValidDate.isLeapYear() && lastValidDate.getDayOfYear() == 366)
-                || lastValidDate.getDayOfYear() == 365) ? lastValidDate.getYear() : lastValidDate.getYear() - 1;
-
-        for (int year = yearStart; year <= yearEnd; year++) {
-            final LocalDate startDate = LocalDate.ofYearDay(year, 1);
-            final LocalDate endDate = LocalDate.ofYearDay(year + 1, 1);
-            final ZonedDateTime start = startDate.atTime(0, 0).atZone(timeZone());
-            final ZonedDateTime end = endDate.atTime(0, 0).atZone(timeZone());
+        if (year < yearCacheStart || year > yearCacheEnd) {
+            throw new InvalidDateException("Business calendar does not contain a complete year for: year=" + year);
+        }
 
-            LocalDate date = startDate;
-            long businessTimeNanos = 0;
+        return summaryCache.getYearSummary(year);
+    }
 
-            while (date.isBefore(endDate)) {
-                final CalendarDay<Instant> bs = this.calendarDay(date);
-                businessTimeNanos += bs.businessNanos();
-                date = date.plusDays(1);
-            }
+    /**
+     * Creates a key for the schedules cache from a date.
+     *
+     * @param date date
+     * @return key
+     */
+    static int schedulesCacheKeyFromDate(final LocalDate date) {
+        return date.getYear() * 10000 + date.getMonthValue() * 100 + date.getDayOfMonth();
+    }
 
-            final YearData yd = new YearData(start.toInstant(), end.toInstant(), businessTimeNanos);
-            cachedYearData.put(year, yd);
-        }
+    /**
+     * Creates a date from a schedules cache key.
+     *
+     * @param key key
+     * @return date
+     */
+    static LocalDate schedulesCacheDateFromKey(final int key) {
+        return LocalDate.of(key / 10000, (key % 10000) / 100, key % 100);
     }
 
-    private YearData getYearData(final int year) {
-        final YearData yd = cachedYearData.get(year);
+    private ReadOptimizedConcurrentCache.Pair<CalendarDay<Instant>> computeCalendarDay(final int key) {
+        final LocalDate date = schedulesCacheDateFromKey(key);
+        final CalendarDay<Instant> h = holidays.get(date);
+        final CalendarDay<Instant> v;
 
-        if (yd == null) {
-            throw new InvalidDateException("Business calendar does not contain a complete year for: year=" + year);
+        if (h != null) {
+            v = h;
+        } else if (weekendDays.contains(date.getDayOfWeek())) {
+            v = CalendarDay.toInstant(CalendarDay.HOLIDAY, date, timeZone());
+        } else {
+            v = CalendarDay.toInstant(standardBusinessDay, date, timeZone());
         }
 
-        return yd;
+        return new ReadOptimizedConcurrentCache.Pair<>(key, v);
     }
 
     // endregion
@@ -157,8 +269,12 @@ public BusinessCalendar(final String name, final String description, final ZoneI
         this.standardBusinessDay = Require.neqNull(standardBusinessDay, "standardBusinessDay");
         this.weekendDays = Set.copyOf(Require.neqNull(weekendDays, "weekendDays"));
         this.holidays = Map.copyOf(Require.neqNull(holidays, "holidays"));
-        populateSchedules();
-        populateCachedYearData();
+
+        // Only cache complete years, since incomplete years can not be fully computed.
+        yearCacheStart =
+                firstValidDate.getDayOfYear() == 1 ? firstValidDate.getYear() : firstValidDate.getYear() + 1;
+        yearCacheEnd = ((lastValidDate.isLeapYear() && lastValidDate.getDayOfYear() == 366)
+                || lastValidDate.getDayOfYear() == 365) ? lastValidDate.getYear() : lastValidDate.getYear() - 1;
     }
 
     // endregion
@@ -254,7 +370,8 @@ public CalendarDay<Instant> calendarDay(final LocalDate date) {
                     + " lastValidDate=" + lastValidDate);
         }
 
-        return cachedSchedules.get(date);
+        final int key = schedulesCacheKeyFromDate(date);
+        return schedulesCache.computeIfAbsent(key).getValue();
     }
 
     /**
@@ -350,7 +467,7 @@ public boolean isBusinessDay(final String date) {
 
     /**
      * Is the time on a business day?
-     *
+     * <p>
      * As long as the time occurs on a business day, it is considered a business day. The time does not have to be
      * within the business day schedule. To determine if a time is within the business day schedule, use
      * {@link #isBusinessTime(ZonedDateTime)}.
@@ -369,7 +486,7 @@ public boolean isBusinessDay(final ZonedDateTime time) {
 
     /**
      * Is the time on a business day?
-     *
+     * <p>
      * As long as the time occurs on a business day, it is considered a business day. The time does not have to be
      * within the business day schedule. To determine if a time is within the business day schedule, use
      * {@link #isBusinessTime(Instant)}.
@@ -430,7 +547,7 @@ boolean isLastBusinessDayOfMonth(final LocalDate date) {
 
     /**
      * Is the time on the last business day of the month?
-     *
+     * <p>
      * As long as the time occurs on a business day, it is considered a business day. The time does not have to be
      * within the business day schedule.
      *
@@ -450,7 +567,7 @@ public boolean isLastBusinessDayOfMonth(final ZonedDateTime time) {
 
     /**
      * Is the time on the last business day of the month?
-     *
+     * <p>
      * As long as the time occurs on a business day, it is considered a business day. The time does not have to be
      * within the business day schedule.
      *
@@ -513,7 +630,7 @@ public boolean isLastBusinessDayOfWeek(final LocalDate date) {
 
     /**
      * Is the time on the last business day of the week?
-     *
+     * <p>
      * As long as the time occurs on a business day, it is considered a business day. The time does not have to be
      * within the business day schedule.
      *
@@ -532,7 +649,7 @@ public boolean isLastBusinessDayOfWeek(final ZonedDateTime time) {
 
     /**
      * Is the time on the last business day of the week?
-     *
+     * <p>
      * As long as the time occurs on a business day, it is considered a business day. The time does not have to be
      * within the business day schedule.
      *
@@ -595,7 +712,7 @@ boolean isLastBusinessDayOfYear(final LocalDate date) {
 
     /**
      * Is the time on the last business day of the year?
-     *
+     * <p>
      * As long as the time occurs on a business day, it is considered a business day. The time does not have to be
      * within the business day schedule.
      *
@@ -614,7 +731,7 @@ public boolean isLastBusinessDayOfYear(final ZonedDateTime time) {
 
     /**
      * Is the time on the last business day of the year?
-     *
+     * <p>
      * As long as the time occurs on a business day, it is considered a business day. The time does not have to be
      * within the business day schedule.
      *
@@ -651,7 +768,7 @@ boolean isLastBusinessDayOfYear(final String date) {
 
     /**
      * Is the current date the last business day of the year?
-     *
+     * <p>
      * As long as the current time occurs on a business day, it is considered a business day. The time does not have to
      * be within the business day schedule.
      *
@@ -889,6 +1006,21 @@ public double fractionBusinessDayRemaining() {
 
     // region Ranges
 
+    private int numberBusinessDatesInternal(final LocalDate start, final LocalDate end, final boolean startInclusive,
+            final boolean endInclusive) {
+        int days = 0;
+
+        for (LocalDate day = start; !day.isAfter(end); day = day.plusDays(1)) {
+            final boolean skip = (!startInclusive && day.equals(start)) || (!endInclusive && day.equals(end));
+
+            if (!skip && isBusinessDay(day)) {
+                days++;
+            }
+        }
+
+        return days;
+    }
+
     /**
      * Returns the number of business dates in a given range.
      *
@@ -906,14 +1038,30 @@ public int numberBusinessDates(final LocalDate start, final LocalDate end, final
             return NULL_INT;
         }
 
+        if (start.isAfter(end)) {
+            return 0;
+        }
+
+        SummaryData summaryFirst = null;
+        SummaryData summary = null;
         int days = 0;
 
-        for (LocalDate day = start; !day.isAfter(end); day = day.plusDays(1)) {
-            final boolean skip = (!startInclusive && day.equals(start)) || (!endInclusive && day.equals(end));
+        for (Iterator<SummaryData> it = summaryCache.iterator(start, end, startInclusive, endInclusive); it
+                .hasNext();) {
+            summary = it.next();
 
-            if (!skip && isBusinessDay(day)) {
-                days++;
+            if (summaryFirst == null) {
+                summaryFirst = summary;
             }
+
+            days += summary.businessDays;
+        }
+
+        if (summaryFirst == null) {
+            return numberBusinessDatesInternal(start, end, startInclusive, endInclusive);
+        } else {
+            days += numberBusinessDatesInternal(start, summaryFirst.startDate, startInclusive, false);
+            days += numberBusinessDatesInternal(summary.endDate, end, true, endInclusive);
         }
 
         return days;
@@ -1036,6 +1184,21 @@ public int numberBusinessDates(final Instant start, final Instant end) {
         return numberBusinessDates(start, end, true, true);
     }
 
+    private int numberNonBusinessDatesInternal(final LocalDate start, final LocalDate end, final boolean startInclusive,
+            final boolean endInclusive) {
+        int days = 0;
+
+        for (LocalDate day = start; !day.isAfter(end); day = day.plusDays(1)) {
+            final boolean skip = (!startInclusive && day.equals(start)) || (!endInclusive && day.equals(end));
+
+            if (!skip && !isBusinessDay(day)) {
+                days++;
+            }
+        }
+
+        return days;
+    }
+
     /**
      * Returns the number of non-business dates in a given range.
      *
@@ -1053,8 +1216,33 @@ public int numberNonBusinessDates(final LocalDate start, final LocalDate end, fi
             return NULL_INT;
         }
 
-        return numberCalendarDates(start, end, startInclusive, endInclusive)
-                - numberBusinessDates(start, end, startInclusive, endInclusive);
+        if (start.isAfter(end)) {
+            return 0;
+        }
+
+        SummaryData summaryFirst = null;
+        SummaryData summary = null;
+        int days = 0;
+
+        for (Iterator<SummaryData> it = summaryCache.iterator(start, end, startInclusive, endInclusive); it
+                .hasNext();) {
+            summary = it.next();
+
+            if (summaryFirst == null) {
+                summaryFirst = summary;
+            }
+
+            days += summary.nonBusinessDays;
+        }
+
+        if (summaryFirst == null) {
+            return numberNonBusinessDatesInternal(start, end, startInclusive, endInclusive);
+        } else {
+            days += numberNonBusinessDatesInternal(start, summaryFirst.startDate, startInclusive, false);
+            days += numberNonBusinessDatesInternal(summary.endDate, end, true, endInclusive);
+        }
+
+        return days;
     }
 
     /**
@@ -1174,6 +1362,18 @@ public int numberNonBusinessDates(final Instant start, final Instant end) {
         return numberNonBusinessDates(start, end, true, true);
     }
 
+    private void businessDatesInternal(final ArrayList<LocalDate> result, final LocalDate start, final LocalDate end,
+            final boolean startInclusive,
+            final boolean endInclusive) {
+        for (LocalDate day = start; !day.isAfter(end); day = day.plusDays(1)) {
+            final boolean skip = (!startInclusive && day.equals(start)) || (!endInclusive && day.equals(end));
+
+            if (!skip && isBusinessDay(day)) {
+                result.add(day);
+            }
+        }
+    }
+
     /**
      * Returns the business dates in a given range.
      *
@@ -1190,14 +1390,31 @@ public LocalDate[] businessDates(final LocalDate start, final LocalDate end, fin
             return null;
         }
 
-        List<LocalDate> dateList = new ArrayList<>();
+        if (start.isAfter(end)) {
+            return new LocalDate[0];
+        }
 
-        for (LocalDate day = start; !day.isAfter(end); day = day.plusDays(1)) {
-            final boolean skip = (!startInclusive && day.equals(start)) || (!endInclusive && day.equals(end));
+        final ArrayList<LocalDate> dateList = new ArrayList<>();
 
-            if (!skip && isBusinessDay(day)) {
-                dateList.add(day);
+        SummaryData summaryFirst = null;
+        SummaryData summary = null;
+
+        for (Iterator<SummaryData> it = summaryCache.iterator(start, end, startInclusive, endInclusive); it
+                .hasNext();) {
+            summary = it.next();
+
+            if (summaryFirst == null) {
+                summaryFirst = summary;
+                businessDatesInternal(dateList, start, summaryFirst.startDate, startInclusive, false);
             }
+
+            dateList.addAll(summary.businessDates);
+        }
+
+        if (summaryFirst == null) {
+            businessDatesInternal(dateList, start, end, startInclusive, endInclusive);
+        } else {
+            businessDatesInternal(dateList, summary.endDate, end, true, endInclusive);
         }
 
         return dateList.toArray(new LocalDate[0]);
@@ -1319,6 +1536,18 @@ public LocalDate[] businessDates(final Instant start, final Instant end) {
         return businessDates(start, end, true, true);
     }
 
+    private void nonBusinessDatesInternal(final ArrayList<LocalDate> result, final LocalDate start, final LocalDate end,
+            final boolean startInclusive,
+            final boolean endInclusive) {
+        for (LocalDate day = start; !day.isAfter(end); day = day.plusDays(1)) {
+            final boolean skip = (!startInclusive && day.equals(start)) || (!endInclusive && day.equals(end));
+
+            if (!skip && !isBusinessDay(day)) {
+                result.add(day);
+            }
+        }
+    }
+
     /**
      * Returns the non-business dates in a given range.
      *
@@ -1335,14 +1564,31 @@ public LocalDate[] nonBusinessDates(final LocalDate start, final LocalDate end,
             return null;
         }
 
-        List<LocalDate> dateList = new ArrayList<>();
+        if (start.isAfter(end)) {
+            return new LocalDate[0];
+        }
 
-        for (LocalDate day = start; !day.isAfter(end); day = day.plusDays(1)) {
-            final boolean skip = (!startInclusive && day.equals(start)) || (!endInclusive && day.equals(end));
+        final ArrayList<LocalDate> dateList = new ArrayList<>();
 
-            if (!skip && !isBusinessDay(day)) {
-                dateList.add(day);
+        SummaryData summaryFirst = null;
+        SummaryData summary = null;
+
+        for (Iterator<SummaryData> it = summaryCache.iterator(start, end, startInclusive, endInclusive); it
+                .hasNext();) {
+            summary = it.next();
+
+            if (summaryFirst == null) {
+                summaryFirst = summary;
+                nonBusinessDatesInternal(dateList, start, summaryFirst.startDate, startInclusive, false);
             }
+
+            dateList.addAll(summary.nonBusinessDates);
+        }
+
+        if (summaryFirst == null) {
+            nonBusinessDatesInternal(dateList, start, end, startInclusive, endInclusive);
+        } else {
+            nonBusinessDatesInternal(dateList, summary.endDate, end, true, endInclusive);
         }
 
         return dateList.toArray(new LocalDate[0]);
@@ -1468,6 +1714,25 @@ public LocalDate[] nonBusinessDates(final Instant start, final Instant end) {
 
     // region Differences
 
+    private long diffBusinessNanosInternal(final Instant start, final LocalDate startDate, final Instant end,
+            final LocalDate endDate) {
+
+        if (startDate.equals(endDate)) {
+            final CalendarDay<Instant> schedule = this.calendarDay(startDate);
+            return schedule.businessNanosElapsed(end) - schedule.businessNanosElapsed(start);
+        }
+
+        long rst = this.calendarDay(startDate).businessNanosRemaining(start)
+                + this.calendarDay(endDate).businessNanosElapsed(end);
+
+        for (LocalDate d = startDate.plusDays(1); d.isBefore(endDate); d = d.plusDays(1)) {
+            rst += this.calendarDay(d).businessNanos();
+        }
+
+        return rst;
+    }
+
+
     /**
      * Returns the amount of business time in nanoseconds between two times.
      *
@@ -1492,19 +1757,28 @@ public long diffBusinessNanos(final Instant start, final Instant end) {
         assert startDate != null;
         assert endDate != null;
 
-        if (startDate.equals(endDate)) {
-            final CalendarDay<Instant> schedule = this.calendarDay(startDate);
-            return schedule.businessNanosElapsed(end) - schedule.businessNanosElapsed(start);
-        }
+        SummaryData summaryFirst = null;
+        SummaryData summary = null;
+        long nanos = 0;
 
-        long rst = this.calendarDay(startDate).businessNanosRemaining(start)
-                + this.calendarDay(endDate).businessNanosElapsed(end);
+        for (Iterator<SummaryData> it = summaryCache.iterator(startDate, endDate, false, false); it.hasNext();) {
+            summary = it.next();
 
-        for (LocalDate d = startDate.plusDays(1); d.isBefore(endDate); d = d.plusDays(1)) {
-            rst += this.calendarDay(d).businessNanos();
+            if (summaryFirst == null) {
+                summaryFirst = summary;
+            }
+
+            nanos += summary.businessTimeNanos;
         }
 
-        return rst;
+        if (summaryFirst == null) {
+            return diffBusinessNanosInternal(start, startDate, end, endDate);
+        } else {
+            nanos += diffBusinessNanosInternal(start, startDate, summaryFirst.startInstant, summaryFirst.startDate);
+            nanos += diffBusinessNanosInternal(summary.endInstant, summary.endDate, end, endDate);
+        }
+
+        return nanos;
     }
 
     /**
@@ -1678,14 +1952,14 @@ public double diffBusinessYears(final Instant start, final Instant end) {
         final int yearEnd = DateTimeUtils.year(end, timeZone());
 
         if (yearStart == yearEnd) {
-            return (double) diffBusinessNanos(start, end) / (double) getYearData(yearStart).businessTimeNanos;
+            return (double) diffBusinessNanos(start, end) / (double) getYearSummary(yearStart).businessTimeNanos;
         }
 
-        final YearData yearDataStart = getYearData(yearStart);
-        final YearData yearDataEnd = getYearData(yearEnd);
+        final SummaryData yearDataStart = getYearSummary(yearStart);
+        final SummaryData yearDataEnd = getYearSummary(yearEnd);
 
-        return (double) diffBusinessNanos(start, yearDataStart.end) / (double) yearDataStart.businessTimeNanos +
-                (double) diffBusinessNanos(yearDataEnd.start, end) / (double) yearDataEnd.businessTimeNanos +
+        return (double) diffBusinessNanos(start, yearDataStart.endInstant) / (double) yearDataStart.businessTimeNanos +
+                (double) diffBusinessNanos(yearDataEnd.startInstant, end) / (double) yearDataEnd.businessTimeNanos +
                 yearEnd - yearStart - 1;
     }
 
@@ -1764,7 +2038,7 @@ public String plusBusinessDays(final String date, final int days) {
     /**
      * Adds a specified number of business days to an input time. Adding negative days is equivalent to subtracting
      * days.
-     *
+     * <p>
      * Day additions are not always 24 hours. The resultant time will have the same local time as the input time, as
      * determined by the calendar's time zone. This accounts for Daylight Savings Time. For example, 2023-11-05 has a
      * daylight savings time adjustment, so '2023-11-04T14:00 ET' plus 1 day will result in '2023-11-05T15:00 ET', which
@@ -1788,12 +2062,12 @@ public Instant plusBusinessDays(final Instant time, final int days) {
     /**
      * Adds a specified number of business days to an input time. Adding negative days is equivalent to subtracting
      * days.
-     *
+     * <p>
      * Day additions are not always 24 hours. The resultant time will have the same local time as the input time, as
      * determined by the calendar's time zone. This accounts for Daylight Savings Time. For example, 2023-11-05 has a
      * daylight savings time adjustment, so '2023-11-04T14:00 ET' plus 1 day will result in '2023-11-05T15:00 ET', which
      * is a 25-hour difference.
-     *
+     * <p>
      * The resultant time will have the same time zone as the calendar. This could be different than the time zone of
      * the input {@link ZonedDateTime}.
      *
@@ -1856,7 +2130,7 @@ public String minusBusinessDays(final String date, final int days) {
     /**
      * Subtracts a specified number of business days from an input time. Subtracting negative days is equivalent to
      * adding days.
-     *
+     * <p>
      * Day subtractions are not always 24 hours. The resultant time will have the same local time as the input time, as
      * determined by the calendar's time zone. This accounts for Daylight Savings Time. For example, 2023-11-05 has a
      * daylight savings time adjustment, so '2023-11-04T14:00 ET' plus 1 day will result in '2023-11-05T15:00 ET', which
@@ -1879,12 +2153,12 @@ public Instant minusBusinessDays(final Instant time, final int days) {
     /**
      * Subtracts a specified number of business days from an input time. Subtracting negative days is equivalent to
      * adding days.
-     *
+     * <p>
      * Day subtraction are not always 24 hours. The resultant time will have the same local time as the input time, as
      * determined by the calendar's time zone. This accounts for Daylight Savings Time. For example, 2023-11-05 has a
      * daylight savings time adjustment, so '2023-11-04T14:00 ET' plus 1 day will result in '2023-11-05T15:00 ET', which
      * is a 25-hour difference.
-     *
+     * <p>
      * The resultant time will have the same time zone as the calendar. This could be different than the time zone of
      * the input {@link ZonedDateTime}.
      *
@@ -1956,12 +2230,12 @@ public String plusNonBusinessDays(final String date, final int days) {
     /**
      * Adds a specified number of non-business days to an input time. Adding negative days is equivalent to subtracting
      * days.
-     *
+     * <p>
      * Day additions are not always 24 hours. The resultant time will have the same local time as the input time, as
      * determined by the calendar's time zone. This accounts for Daylight Savings Time. For example, 2023-11-05 has a
      * daylight savings time adjustment, so '2023-11-04T14:00 ET' plus 1 day will result in '2023-11-05T15:00 ET', which
      * is a 25-hour difference.
-     *
+     * <p>
      * The resultant time will have the same time zone as the calendar. This could be different than the time zone of
      * the input {@link ZonedDateTime}.
      *
@@ -1983,12 +2257,12 @@ public Instant plusNonBusinessDays(final Instant time, final int days) {
     /**
      * Adds a specified number of non-business days to an input time. Adding negative days is equivalent to subtracting
      * days.
-     *
+     * <p>
      * Day additions are not always 24 hours. The resultant time will have the same local time as the input time, as
      * determined by the calendar's time zone. This accounts for Daylight Savings Time. For example, 2023-11-05 has a
      * daylight savings time adjustment, so '2023-11-04T14:00 ET' plus 1 day will result in '2023-11-05T15:00 ET', which
      * is a 25-hour difference.
-     *
+     * <p>
      * The resultant time will have the same time zone as the calendar. This could be different than the time zone of
      * the input {@link ZonedDateTime}.
      *
@@ -2051,7 +2325,7 @@ public String minusNonBusinessDays(final String date, final int days) {
     /**
      * Subtracts a specified number of non-business days to an input time. Subtracting negative days is equivalent to
      * adding days.
-     *
+     * <p>
      * Day subtractions are not always 24 hours. The resultant time will have the same local time as the input time, as
      * determined by the calendar's time zone. This accounts for Daylight Savings Time. For example, 2023-11-05 has a
      * daylight savings time adjustment, so '2023-11-04T14:00 ET' plus 1 day will result in '2023-11-05T15:00 ET', which
@@ -2074,12 +2348,12 @@ public Instant minusNonBusinessDays(final Instant time, final int days) {
     /**
      * Subtracts a specified number of non-business days to an input time. Subtracting negative days is equivalent to
      * adding days.
-     *
+     * <p>
      * Day subtractions are not always 24 hours. The resultant time will have the same local time as the input time, as
      * determined by the calendar's time zone. This accounts for Daylight Savings Time. For example, 2023-11-05 has a
      * daylight savings time adjustment, so '2023-11-04T14:00 ET' plus 1 day will result in '2023-11-05T15:00 ET', which
      * is a 25-hour difference.
-     *
+     * <p>
      * The resultant time will have the same time zone as the calendar. This could be different than the time zone of
      * the input {@link ZonedDateTime}.
      *
diff --git a/engine/time/src/main/java/io/deephaven/time/calendar/BusinessCalendarXMLParser.java b/engine/time/src/main/java/io/deephaven/time/calendar/BusinessCalendarXMLParser.java
index 6f2c0432b9b..7c430b43cc6 100644
--- a/engine/time/src/main/java/io/deephaven/time/calendar/BusinessCalendarXMLParser.java
+++ b/engine/time/src/main/java/io/deephaven/time/calendar/BusinessCalendarXMLParser.java
@@ -35,7 +35,12 @@
  *     <description>New York Stock Exchange Calendar</description>
  *     <timeZone>America/New_York</timeZone>
  *     <default>
- *          <businessTime><open>09:30</open><close>16:00</close></businessTime>
+ *          <businessTime>
+ *              <open>09:30</open>
+ *              <close>16:00</close>
+ *              <!-- Optional include the close nanosecond in the business time range. -->
+ *              <includeClose>true</includeClose>
+ *          </businessTime>
  *          <weekend>Saturday</weekend>
  *          <weekend>Sunday</weekend>
  *      </default>
@@ -51,6 +56,8 @@
  *          <businessTime>
  *              <open>09:30</open>
  *              <close>13:00</close>
+ *              <!-- Optional include the close nanosecond in the business time range. -->
+ *              <includeClose>true</includeClose>
  *          </businessTime>
  *      </holiday>
  * </calendar>
@@ -254,6 +261,7 @@ private static TimeRange<LocalTime>[] parseBusinessRanges(final List<Element> bu
         for (int i = 0; i < businessRanges.size(); i++) {
             final String openTxt = getText(getRequiredChild(businessRanges.get(i), "open"));
             final String closeTxt = getText(getRequiredChild(businessRanges.get(i), "close"));
+            final String includeCloseTxt = getText(businessRanges.get(i).getChild("includeClose"));
 
             if (closeTxt.startsWith("24:00")) {
                 throw new RuntimeException("Close time (" + closeTxt
@@ -262,7 +270,8 @@ private static TimeRange<LocalTime>[] parseBusinessRanges(final List<Element> bu
 
             final LocalTime open = DateTimeUtils.parseLocalTime(openTxt);
             final LocalTime close = DateTimeUtils.parseLocalTime(closeTxt);
-            rst[i] = new TimeRange<>(open, close, true);
+            final boolean inclusiveEnd = Boolean.parseBoolean(includeCloseTxt); // defaults to false
+            rst[i] = new TimeRange<>(open, close, inclusiveEnd);
         }
 
         return rst;
@@ -282,7 +291,7 @@ private static TimeRange<LocalTime>[] parseBusinessRangesLegacy(final List<Eleme
                 final String closeTxt = openClose[1];
                 final LocalTime open = DateTimeUtils.parseLocalTime(openTxt);
                 final LocalTime close = DateTimeUtils.parseLocalTime(closeTxt);
-                rst[i] = new TimeRange<>(open, close, true);
+                rst[i] = new TimeRange<>(open, close, false);
             } else {
                 throw new IllegalArgumentException("Can not parse business periods; open/close = " + br.getText());
             }
diff --git a/engine/time/src/main/java/io/deephaven/time/calendar/Calendar.java b/engine/time/src/main/java/io/deephaven/time/calendar/Calendar.java
index 8b7946eaed8..9cb997112c6 100644
--- a/engine/time/src/main/java/io/deephaven/time/calendar/Calendar.java
+++ b/engine/time/src/main/java/io/deephaven/time/calendar/Calendar.java
@@ -9,9 +9,7 @@
 
 import java.time.*;
 import java.time.temporal.ChronoUnit;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.List;
+import java.util.*;
 
 import static io.deephaven.util.QueryConstants.NULL_INT;
 
@@ -30,6 +28,68 @@ public class Calendar {
     private final String description;
     private final ZoneId timeZone;
 
+    // region Cache
+
+    private static class SummaryData extends ReadOptimizedConcurrentCache.IntKeyedValue {
+        final LocalDate startDate;
+        final LocalDate endDate; // exclusive
+        final List<LocalDate> dates;
+
+        SummaryData(int key, LocalDate startDate, LocalDate endDate, List<LocalDate> dates) {
+            super(key);
+            this.startDate = startDate;
+            this.endDate = endDate;
+            this.dates = dates;
+        }
+
+    }
+
+    private final YearMonthSummaryCache<SummaryData> summaryCache =
+            new YearMonthSummaryCache<>(this::computeMonthSummary, this::computeYearSummary);
+
+    private SummaryData summarize(final int key, final LocalDate startDate, final LocalDate endDate) {
+        LocalDate date = startDate;
+        final ArrayList<LocalDate> dates = new ArrayList<>();
+
+        while (date.isBefore(endDate)) {
+            dates.add(date);
+            date = date.plusDays(1);
+        }
+
+        return new SummaryData(key, startDate, endDate, dates); // end date is exclusive
+    }
+
+    private SummaryData computeMonthSummary(final int yearMonth) {
+        final int year = YearMonthSummaryCache.yearFromYearMonthKey(yearMonth);
+        final int month = YearMonthSummaryCache.monthFromYearMonthKey(yearMonth);
+        final LocalDate startDate = LocalDate.of(year, month, 1);
+        final LocalDate endDate = startDate.plusMonths(1); // exclusive
+        return summarize(yearMonth, startDate, endDate);
+    }
+
+    private SummaryData computeYearSummary(final int year) {
+        LocalDate startDate = null;
+        LocalDate endDate = null;
+        ArrayList<LocalDate> dates = new ArrayList<>();
+
+        for (int month = 1; month <= 12; month++) {
+            SummaryData ms = summaryCache.getMonthSummary(year, month);
+            if (month == 1) {
+                startDate = ms.startDate;
+            }
+
+            if (month == 12) {
+                endDate = ms.endDate;
+            }
+
+            dates.addAll(ms.dates);
+        }
+
+        return new SummaryData(year, startDate, endDate, dates);
+    }
+
+    // endregion
+
     // region Constructors
 
     /**
@@ -48,6 +108,17 @@ public class Calendar {
 
     // endregion
 
+    // region Cache
+
+    /**
+     * Clears the cache. This should not generally be used and is provided for benchmarking.
+     */
+    synchronized void clearCache() {
+        summaryCache.clear();
+    }
+
+    // endregion
+
     // region Getters
 
     /**
@@ -296,7 +367,7 @@ public Instant plusDays(final Instant time, final int days) {
      * determined by the calendar's time zone. This accounts for Daylight Savings Time. For example, 2023-11-05 has a
      * daylight savings time adjustment, so '2023-11-04T14:00 ET' plus 1 day will result in '2023-11-05T15:00 ET', which
      * is a 25-hour difference.
-     *
+     * <p>
      * The resultant time will have the same time zone as the calendar. This could be different than the time zone of
      * the input {@link ZonedDateTime}.
      *
@@ -422,6 +493,18 @@ public LocalDate pastDate(final int days) {
 
     // region Ranges
 
+    private void calendarDatesInternal(final ArrayList<LocalDate> result, final LocalDate start, final LocalDate end,
+            final boolean startInclusive,
+            final boolean endInclusive) {
+        for (LocalDate day = start; !day.isAfter(end); day = day.plusDays(1)) {
+            final boolean skip = (!startInclusive && day.equals(start)) || (!endInclusive && day.equals(end));
+
+            if (!skip) {
+                result.add(day);
+            }
+        }
+    }
+
     /**
      * Returns the dates in a given range.
      *
@@ -437,14 +520,31 @@ public LocalDate[] calendarDates(final LocalDate start, final LocalDate end, fin
             return null;
         }
 
-        List<LocalDate> dateList = new ArrayList<>();
+        if (start.isAfter(end)) {
+            return new LocalDate[0];
+        }
 
-        for (LocalDate day = start; !day.isAfter(end); day = day.plusDays(1)) {
-            final boolean skip = (!startInclusive && day.equals(start)) || (!endInclusive && day.equals(end));
+        final ArrayList<LocalDate> dateList = new ArrayList<>();
 
-            if (!skip) {
-                dateList.add(day);
+        SummaryData summaryFirst = null;
+        SummaryData summary = null;
+
+        for (Iterator<SummaryData> it = summaryCache.iterator(start, end, startInclusive, endInclusive); it
+                .hasNext();) {
+            summary = it.next();
+
+            if (summaryFirst == null) {
+                summaryFirst = summary;
+                calendarDatesInternal(dateList, start, summaryFirst.startDate, startInclusive, false);
             }
+
+            dateList.addAll(summary.dates);
+        }
+
+        if (summaryFirst == null) {
+            calendarDatesInternal(dateList, start, end, startInclusive, endInclusive);
+        } else {
+            calendarDatesInternal(dateList, summary.endDate, end, true, endInclusive);
         }
 
         return dateList.toArray(new LocalDate[0]);
diff --git a/engine/time/src/main/java/io/deephaven/time/calendar/CalendarDay.java b/engine/time/src/main/java/io/deephaven/time/calendar/CalendarDay.java
index 92b066ee924..d1c6d81bddf 100644
--- a/engine/time/src/main/java/io/deephaven/time/calendar/CalendarDay.java
+++ b/engine/time/src/main/java/io/deephaven/time/calendar/CalendarDay.java
@@ -30,7 +30,8 @@ public class CalendarDay<T extends Comparable<T> & Temporal> {
      */
     public static final CalendarDay<LocalTime> HOLIDAY = new CalendarDay<>();
 
-    private final List<TimeRange<T>> businessTimeRanges;
+    private final TimeRange<T>[] businessTimeRanges;
+    private final long businessNanos;
 
     /**
      * Creates a CalendarDay instance.
@@ -63,7 +64,8 @@ public class CalendarDay<T extends Comparable<T> & Temporal> {
             }
         }
 
-        this.businessTimeRanges = List.of(ranges);
+        this.businessTimeRanges = ranges;
+        this.businessNanos = Arrays.stream(businessTimeRanges).mapToLong(TimeRange::nanos).sum();
     }
 
     /**
@@ -80,7 +82,7 @@ public class CalendarDay<T extends Comparable<T> & Temporal> {
      * @return business time ranges for the day
      */
     public List<TimeRange<T>> businessTimeRanges() {
-        return businessTimeRanges;
+        return Arrays.asList(businessTimeRanges);
     }
 
     /**
@@ -89,7 +91,7 @@ public List<TimeRange<T>> businessTimeRanges() {
      * @return start of the business day, or {@code null} for a holiday schedule
      */
     public T businessStart() {
-        return !businessTimeRanges.isEmpty() ? businessTimeRanges.get(0).start() : null;
+        return businessTimeRanges.length > 0 ? businessTimeRanges[0].start() : null;
     }
 
     /**
@@ -98,7 +100,7 @@ public T businessStart() {
      * @return end of the business day, or {@code null} for a holiday schedule
      */
     public T businessEnd() {
-        return !businessTimeRanges.isEmpty() ? businessTimeRanges.get(businessTimeRanges.size() - 1).end() : null;
+        return businessTimeRanges.length > 0 ? businessTimeRanges[businessTimeRanges.length - 1].end() : null;
     }
 
     /**
@@ -107,7 +109,7 @@ public T businessEnd() {
      * @return is the end of the business day inclusive?
      */
     public boolean isInclusiveEnd() {
-        return businessTimeRanges.isEmpty() || businessTimeRanges.get(businessTimeRanges.size() - 1).isInclusiveEnd();
+        return businessTimeRanges.length == 0 || businessTimeRanges[businessTimeRanges.length - 1].isInclusiveEnd();
     }
 
     /**
@@ -117,7 +119,7 @@ public boolean isInclusiveEnd() {
      * @return length of the day in nanoseconds
      */
     public long businessNanos() {
-        return businessTimeRanges.stream().map(TimeRange::nanos).reduce(0L, Long::sum);
+        return businessNanos;
     }
 
     /**
@@ -239,18 +241,18 @@ public boolean equals(Object o) {
         if (!(o instanceof CalendarDay))
             return false;
         CalendarDay<?> that = (CalendarDay<?>) o;
-        return Objects.equals(businessTimeRanges, that.businessTimeRanges);
+        return Arrays.equals(businessTimeRanges, that.businessTimeRanges);
     }
 
     @Override
     public int hashCode() {
-        return Objects.hash(businessTimeRanges);
+        return Arrays.hashCode(businessTimeRanges);
     }
 
     @Override
     public String toString() {
         return "CalendarDay{" +
-                "businessTimeRanges=" + Arrays.toString(businessTimeRanges.toArray()) +
+                "businessTimeRanges=" + Arrays.toString(businessTimeRanges) +
                 '}';
     }
 
diff --git a/engine/time/src/main/java/io/deephaven/time/calendar/ReadOptimizedConcurrentCache.java b/engine/time/src/main/java/io/deephaven/time/calendar/ReadOptimizedConcurrentCache.java
new file mode 100644
index 00000000000..1c5de8bce04
--- /dev/null
+++ b/engine/time/src/main/java/io/deephaven/time/calendar/ReadOptimizedConcurrentCache.java
@@ -0,0 +1,126 @@
+//
+// Copyright (c) 2016-2024 Deephaven Data Labs and Patent Pending
+//
+package io.deephaven.time.calendar;
+
+import io.deephaven.hash.KeyedIntObjectHash;
+import io.deephaven.hash.KeyedIntObjectKey;
+
+import java.util.function.IntFunction;
+
+/**
+ * A cache that is designed to be fast when accessed concurrently with read-heavy workloads. Values are populated from a
+ * function when they are not found in the cache. All values must be non-null.
+ *
+ * @param <V> the value type
+ */
+class ReadOptimizedConcurrentCache<V extends ReadOptimizedConcurrentCache.IntKeyedValue> {
+
+    /**
+     * A value that has an included integer key.
+     */
+    public static abstract class IntKeyedValue {
+        private final int key;
+
+        /**
+         * Creates a new value.
+         *
+         * @param key the key
+         */
+        public IntKeyedValue(int key) {
+            this.key = key;
+        }
+
+        /**
+         * Gets the key.
+         *
+         * @return the key
+         */
+        public int getKey() {
+            return key;
+        }
+    }
+
+    /**
+     * A pair of a key and a value.
+     *
+     * @param <T> the value type
+     */
+    public static class Pair<T> extends IntKeyedValue {
+        private final T value;
+
+        /**
+         * Creates a new pair.
+         *
+         * @param key the key
+         * @param value the value
+         */
+        public Pair(int key, T value) {
+            super(key);
+            this.value = value;
+        }
+
+        /**
+         * Gets the value.
+         *
+         * @return the value
+         */
+        public T getValue() {
+            return value;
+        }
+    }
+
+    private static class KeyDef<V extends IntKeyedValue> extends KeyedIntObjectKey.BasicStrict<V> {
+
+        @Override
+        public int getIntKey(V v) {
+            return v.getKey();
+        }
+
+    }
+
+    private final IntFunction<V> valueComputer;
+    private final KeyedIntObjectHash<V> cache;
+
+    /**
+     * Creates a new cache.
+     *
+     * @param initialCapacity the initial capacity
+     * @param valueComputer computes the value for a key.
+     */
+    public ReadOptimizedConcurrentCache(final int initialCapacity, final IntFunction<V> valueComputer) {
+        this.valueComputer = valueComputer;
+        this.cache = new KeyedIntObjectHash<>(initialCapacity, new KeyDef<>());
+    }
+
+    /**
+     * Clears the cache.
+     */
+    synchronized void clear() {
+        cache.clear();
+    }
+
+    /**
+     * Gets the value for a key. If the value is not found, it is computed and added to the cache.
+     *
+     * @param key the key
+     * @return the value
+     * @throws NullPointerException if the value is not found
+     */
+    public V computeIfAbsent(int key) {
+        V existing = cache.get(key);
+
+        if (existing != null) {
+            return existing;
+        }
+
+        final V newValue = valueComputer.apply(key);
+
+        if (newValue == null) {
+            throw new NullPointerException("Computed a null value: key=" + key);
+        }
+
+        cache.put(key, newValue);
+        return newValue;
+    }
+}
diff --git a/engine/time/src/main/java/io/deephaven/time/calendar/TimeRange.java b/engine/time/src/main/java/io/deephaven/time/calendar/TimeRange.java
index e412673eb9d..837f8a23fca 100644
--- a/engine/time/src/main/java/io/deephaven/time/calendar/TimeRange.java
+++ b/engine/time/src/main/java/io/deephaven/time/calendar/TimeRange.java
@@ -81,7 +81,7 @@ public boolean isInclusiveEnd() {
      * @return length of the range in nanoseconds
      */
     public long nanos() {
-        return start.until(end, ChronoUnit.NANOS) - (inclusiveEnd ? 0 : 1);
+        return start.until(end, ChronoUnit.NANOS) + (inclusiveEnd ? 1 : 0);
     }
 
     /**
diff --git a/engine/time/src/main/java/io/deephaven/time/calendar/YearMonthSummaryCache.java b/engine/time/src/main/java/io/deephaven/time/calendar/YearMonthSummaryCache.java
new file mode 100644
index 00000000000..cc183aad686
--- /dev/null
+++ b/engine/time/src/main/java/io/deephaven/time/calendar/YearMonthSummaryCache.java
@@ -0,0 +1,189 @@
+//
+// Copyright (c) 2016-2024 Deephaven Data Labs and Patent Pending
+//
+package io.deephaven.time.calendar;
+
+import java.time.LocalDate;
+import java.util.Iterator;
+import java.util.function.IntFunction;
+
+/**
+ * A thread-safe lazily initialized cache for year and month summaries.
+ *
+ * @param <T> the type of the summary
+ */
+class YearMonthSummaryCache<T extends ReadOptimizedConcurrentCache.IntKeyedValue> {
+
+    /**
+     * Computes a year-month key for a year and month.
+     *
+     * @param year the year
+     * @param month the month
+     * @return the key
+     */
+    static int yearMonthKey(int year, int month) {
+        return year * 100 + month;
+    }
+
+    /**
+     * Gets the year from a year-month key.
+     *
+     * @param key the year month key
+     * @return the year
+     */
+    static int yearFromYearMonthKey(int key) {
+        return key / 100;
+    }
+
+    /**
+     * Gets the month from a year-month key.
+     *
+     * @param key the year month key
+     * @return the month
+     */
+    static int monthFromYearMonthKey(int key) {
+        return key % 100;
+    }
+
+    private final ReadOptimizedConcurrentCache<T> monthCache;
+    private final ReadOptimizedConcurrentCache<T> yearCache;
+
+    /**
+     * Creates a new cache.
+     *
+     * @param computeMonthSummary the function to compute a month summary
+     * @param computeYearSummary the function to compute a year summary
+     */
+    YearMonthSummaryCache(IntFunction<T> computeMonthSummary, IntFunction<T> computeYearSummary) {
+        monthCache = new ReadOptimizedConcurrentCache<>(12 * 50, computeMonthSummary);
+        yearCache = new ReadOptimizedConcurrentCache<>(50, computeYearSummary);
+    }
+
+    /**
+     * Clears the cache.
+     */
+    synchronized void clear() {
+        monthCache.clear();
+        yearCache.clear();
+    }
+
+    /**
+     * Gets the month summary for the specified year and month.
+     *
+     * @param year the year
+     * @param month the month
+     * @return the month summary
+     */
+    T getMonthSummary(int year, int month) {
+        return monthCache.computeIfAbsent(yearMonthKey(year, month));
+    }
+
+    /**
+     * Gets the year summary for the specified year.
+     *
+     * @param year the year
+     * @return the year summary
+     */
+    T getYearSummary(int year) {
+        return yearCache.computeIfAbsent(year);
+    }
+
+    private class YearMonthSummaryIterator implements Iterator<T> {
+
+        private int currentYear;
+        private int currentMonth;
+        private int currentYearMonth;
+        private int finalYear;
+        private int finalMonth;
+        final private int finalYearMonth;
+
+        YearMonthSummaryIterator(LocalDate start, LocalDate end) {
+            int startYear = start.getYear();
+            int startMonth = start.getMonthValue();
+            int endYear = end.getYear();
+            int endMonth = end.getMonthValue();
+
+            currentMonth = startMonth;
+            currentYear = startYear;
+
+            if (start.getDayOfMonth() != 1) {
+                incrementCurrentByMonth();
+            }
+
+            currentYearMonth = yearMonthKey(currentYear, currentMonth);
+
+            final LocalDate endPlus1 = end.plusDays(1);
+            final int endPlus1Month = endPlus1.getMonthValue();
+
+            finalMonth = endMonth;
+            finalYear = endYear;
+
+            if (endPlus1Month == endMonth) {
+                if (finalMonth == 1) {
+                    finalMonth = 12;
+                    finalYear = finalYear - 1;
+                } else {
+                    finalMonth = finalMonth - 1;
+                }
+            }
+
+            finalYearMonth = yearMonthKey(finalYear, finalMonth);
+        }
+
+        private void incrementCurrentByMonth() {
+            if (currentMonth == 12) {
+                currentMonth = 1;
+                currentYear += 1;
+            } else {
+                currentMonth = currentMonth + 1;
+            }
+
+            currentYearMonth = yearMonthKey(currentYear, currentMonth);
+        }
+
+        private void incrementCurrentByYear() {
+            currentYear++;
+            currentYearMonth = yearMonthKey(currentYear, currentMonth);
+        }
+
+        @Override
+        public boolean hasNext() {
+            return currentYearMonth <= finalYearMonth;
+        }
+
+        @Override
+        public T next() {
+            final T val;
+
+            if (currentMonth == 1 && (currentYear != finalYear || finalMonth == 12)) {
+                val = getYearSummary(currentYear);
+                incrementCurrentByYear();
+            } else {
+                val = getMonthSummary(currentYear, currentMonth);
+                incrementCurrentByMonth();
+            }
+
+            return val;
+        }
+    }
+
+    /**
+     * Gets an iterator over the summaries for the specified range. The returned iterator will include the start date if
+     * {@code startInclusive} is true, and the end date if {@code endInclusive} is true. If the start date is after the
+     * end date, the iterator will be empty.
+     * <p>
+     * The iterator will return summaries in chronological order, and these summaries can be a mix of month and year
+     * summaries. Dates not represented by complete summaries will be skipped (e.g. partial months).
+     *
+     * @param start the start date
+     * @param end the end date
+     * @param startInclusive whether the start date is inclusive
+     * @param endInclusive whether the end date is inclusive
+     * @return the iterator
+     */
+    Iterator<T> iterator(final LocalDate start, final LocalDate end,
+            final boolean startInclusive, final boolean endInclusive) {
+        return new YearMonthSummaryIterator(startInclusive ? start : start.plusDays(1),
+                endInclusive ? end : end.minusDays(1));
+    }
+}
diff --git a/engine/time/src/test/java/io/deephaven/time/TestDateTimeUtils.java b/engine/time/src/test/java/io/deephaven/time/TestDateTimeUtils.java
index 7dcad0ad771..585cde2f96a 100644
--- a/engine/time/src/test/java/io/deephaven/time/TestDateTimeUtils.java
+++ b/engine/time/src/test/java/io/deephaven/time/TestDateTimeUtils.java
@@ -1933,6 +1933,13 @@ public Instant instantMillis() {
             TestCase.assertEquals(Instant.ofEpochSecond(0, (nanos / DateTimeUtils.MILLI) * DateTimeUtils.MILLI),
                     DateTimeUtils.nowMillisResolution());
 
+            // Occasionally tests fail because of invalid clocks on the test system
+            final LocalDate startDate = LocalDate.of(1990, 1, 1);
+            final LocalDate currentDate = DateTimeUtils.toLocalDate(
+                    DateTimeUtils.epochNanosToInstant(Clock.system().currentTimeNanos()), DateTimeUtils.timeZone());
+            assertTrue("Checking for a valid date on the test system: currentDate=" + currentDate,
+                    currentDate.isAfter(startDate));
+
             TestCase.assertTrue(Math.abs(Clock.system().currentTimeNanos()
                     - DateTimeUtils.epochNanos(DateTimeUtils.nowSystem())) < 1_000_000L);
             TestCase.assertTrue(Math.abs(Clock.system().currentTimeNanos()
diff --git a/engine/time/src/test/java/io/deephaven/time/calendar/TestBusinessCalendar.java b/engine/time/src/test/java/io/deephaven/time/calendar/TestBusinessCalendar.java
index cce9c4b07a8..34e5873d446 100644
--- a/engine/time/src/test/java/io/deephaven/time/calendar/TestBusinessCalendar.java
+++ b/engine/time/src/test/java/io/deephaven/time/calendar/TestBusinessCalendar.java
@@ -7,10 +7,7 @@
 
 import java.time.*;
 import java.time.temporal.ChronoUnit;
-import java.util.Arrays;
-import java.util.HashMap;
-import java.util.Map;
-import java.util.Set;
+import java.util.*;
 
 import static io.deephaven.util.QueryConstants.*;
 
@@ -46,6 +43,17 @@ protected void setUp() throws Exception {
         calendar = bCalendar;
     }
 
+    public void testSchedulesCacheKeys() {
+        final int y = 2023;
+        final int m = 7;
+        final int d = 11;
+        final LocalDate ld = LocalDate.of(y, m, d);
+
+        final int key = BusinessCalendar.schedulesCacheKeyFromDate(ld);
+        assertEquals(key, y * 10000 + m * 100 + d);
+        assertEquals(ld, BusinessCalendar.schedulesCacheDateFromKey(key));
+    }
+
     public void testBusinessGetters() {
         assertEquals(schedule, bCalendar.standardBusinessDay());
         assertEquals(schedule.businessNanos(), bCalendar.standardBusinessNanos());
@@ -692,6 +700,22 @@ public void testBusinessDates() {
         assertNull(bCalendar.businessDates(start.atTime(1, 2).atZone(timeZone).toInstant(), null, true, true));
         assertNull(bCalendar.businessDates(null, end.atTime(1, 2).atZone(timeZone), true, true));
         assertNull(bCalendar.businessDates(start.atTime(1, 2).atZone(timeZone), null, true, true));
+
+        // end before start
+        assertEquals(new LocalDate[0], bCalendar.businessDates(end, start));
+
+        // long span of dates
+        final LocalDate startLong = LocalDate.of(2019, 2, 1);
+        final LocalDate endLong = LocalDate.of(2023, 12, 31);
+        final ArrayList<LocalDate> targetLong = new ArrayList<>();
+
+        for (LocalDate d = startLong; !d.isAfter(endLong); d = d.plusDays(1)) {
+            if (bCalendar.isBusinessDay(d)) {
+                targetLong.add(d);
+            }
+        }
+
+        assertEquals(targetLong.toArray(LocalDate[]::new), bCalendar.businessDates(startLong, endLong));
     }
 
     public void testNumberBusinessDates() {
@@ -758,6 +782,160 @@ public void testNumberBusinessDates() {
                 bCalendar.numberBusinessDates(start.atTime(1, 2).atZone(timeZone).toInstant(), null, true, true));
         assertEquals(NULL_INT, bCalendar.numberBusinessDates(null, end.atTime(1, 2).atZone(timeZone), true, true));
         assertEquals(NULL_INT, bCalendar.numberBusinessDates(start.atTime(1, 2).atZone(timeZone), null, true, true));
+
+        // end before start
+        assertEquals(0, bCalendar.numberBusinessDates(end, start));
+
+        // long span of dates
+        final LocalDate startLong = LocalDate.of(2019, 2, 1);
+        final LocalDate endLong = LocalDate.of(2023, 12, 31);
+        final ArrayList<LocalDate> targetLong = new ArrayList<>();
+
+        for (LocalDate d = startLong; !d.isAfter(endLong); d = d.plusDays(1)) {
+            if (bCalendar.isBusinessDay(d)) {
+                targetLong.add(d);
+            }
+        }
+
+        assertEquals(targetLong.size(), bCalendar.numberBusinessDates(startLong, endLong));
+    }
+
+    public void testBusinessDatesValidateCacheIteration() {
+        // Construct a very simple calendar for counting business days that is easy to reason about
+
+        final LocalDate firstValidDateLocal = LocalDate.of(2000, 1, 1);
+        final LocalDate lastValidDateLocal = LocalDate.of(2030, 12, 31);
+        final Set<DayOfWeek> weekendDaysLocal = Set.of(DayOfWeek.SATURDAY, DayOfWeek.SUNDAY);
+        final Map<LocalDate, CalendarDay<Instant>> holidaysLocal = new HashMap<>();
+        final BusinessCalendar bc = new BusinessCalendar("Test", "Test", timeZone, firstValidDateLocal,
+                lastValidDateLocal, schedule, weekendDaysLocal, holidaysLocal);
+
+        // short period -- no caching case
+
+        LocalDate start = LocalDate.of(2024, 5, 15);
+        LocalDate end = LocalDate.of(2024, 5, 29);
+
+        LocalDate[] target = {
+                LocalDate.of(2024, 5, 15),
+                LocalDate.of(2024, 5, 16),
+                LocalDate.of(2024, 5, 17),
+                LocalDate.of(2024, 5, 20),
+                LocalDate.of(2024, 5, 21),
+                LocalDate.of(2024, 5, 22),
+                LocalDate.of(2024, 5, 23),
+                LocalDate.of(2024, 5, 24),
+                LocalDate.of(2024, 5, 27),
+                LocalDate.of(2024, 5, 28),
+                LocalDate.of(2024, 5, 29),
+        };
+
+        assertEquals(target, bc.businessDates(start, end, true, true));
+        assertEquals(target.length, bc.numberBusinessDates(start, end, true, true));
+
+        target = new LocalDate[] {
+                LocalDate.of(2024, 5, 16),
+                LocalDate.of(2024, 5, 17),
+                LocalDate.of(2024, 5, 20),
+                LocalDate.of(2024, 5, 21),
+                LocalDate.of(2024, 5, 22),
+                LocalDate.of(2024, 5, 23),
+                LocalDate.of(2024, 5, 24),
+                LocalDate.of(2024, 5, 27),
+                LocalDate.of(2024, 5, 28),
+        };
+
+        assertEquals(target, bc.businessDates(start, end, false, false));
+        assertEquals(target.length, bc.numberBusinessDates(start, end, false, false));
+
+        // long period -- caching case
+
+        start = LocalDate.of(2024, 5, 15);
+        end = LocalDate.of(2025, 5, 29);
+
+        final ArrayList<LocalDate> targetList = new ArrayList<>();
+        LocalDate d = start;
+
+        while (!d.isAfter(end)) {
+            if (!weekendDaysLocal.contains(d.getDayOfWeek())) {
+                targetList.add(d);
+            }
+            d = d.plusDays(1);
+        }
+
+        target = targetList.toArray(new LocalDate[0]);
+
+        assertEquals(target, bc.businessDates(start, end, true, true));
+        assertEquals(target.length, bc.numberBusinessDates(start, end, true, true));
+
+        targetList.remove(0);
+        targetList.remove(targetList.size() - 1);
+        target = targetList.toArray(new LocalDate[0]);
+
+        assertEquals(target, bc.businessDates(start, end, false, false));
+        assertEquals(target.length, bc.numberBusinessDates(start, end, false, false));
+    }
+
+    public void testNonBusinessDatesValidateCacheIteration() {
+        // Construct a very simple calendar for counting business days that is easy to reason about
+
+        final LocalDate firstValidDateLocal = LocalDate.of(2000, 1, 1);
+        final LocalDate lastValidDateLocal = LocalDate.of(2030, 12, 31);
+        final Set<DayOfWeek> weekendDaysLocal = Set.of(DayOfWeek.SATURDAY, DayOfWeek.SUNDAY);
+        final Map<LocalDate, CalendarDay<Instant>> holidaysLocal = new HashMap<>();
+        final BusinessCalendar bc = new BusinessCalendar("Test", "Test", timeZone, firstValidDateLocal,
+                lastValidDateLocal, schedule, weekendDaysLocal, holidaysLocal);
+
+        // short period -- no caching case
+
+        LocalDate start = LocalDate.of(2024, 5, 12);
+        LocalDate end = LocalDate.of(2024, 5, 26);
+
+        LocalDate[] target = {
+                LocalDate.of(2024, 5, 12),
+                LocalDate.of(2024, 5, 18),
+                LocalDate.of(2024, 5, 19),
+                LocalDate.of(2024, 5, 25),
+                LocalDate.of(2024, 5, 26),
+        };
+
+        assertEquals(target, bc.nonBusinessDates(start, end, true, true));
+        assertEquals(target.length, bc.numberNonBusinessDates(start, end, true, true));
+
+        target = new LocalDate[] {
+                LocalDate.of(2024, 5, 18),
+                LocalDate.of(2024, 5, 19),
+                LocalDate.of(2024, 5, 25),
+        };
+
+        assertEquals(target, bc.nonBusinessDates(start, end, false, false));
+        assertEquals(target.length, bc.numberNonBusinessDates(start, end, false, false));
+
+        // long period -- caching case
+
+        start = LocalDate.of(2024, 5, 19);
+        end = LocalDate.of(2025, 5, 17);
+
+        final ArrayList<LocalDate> targetList = new ArrayList<>();
+        LocalDate d = start;
+
+        while (!d.isAfter(end)) {
+            if (weekendDaysLocal.contains(d.getDayOfWeek())) {
+                targetList.add(d);
+            }
+            d = d.plusDays(1);
+        }
+
+        target = targetList.toArray(new LocalDate[0]);
+
+        assertEquals(target, bc.nonBusinessDates(start, end, true, true));
+        assertEquals(target.length, bc.numberNonBusinessDates(start, end, true, true));
+
+        targetList.remove(0);
+        targetList.remove(targetList.size() - 1);
+        target = targetList.toArray(new LocalDate[0]);
+
+        assertEquals(target, bc.nonBusinessDates(start, end, false, false));
+        assertEquals(target.length, bc.numberNonBusinessDates(start, end, false, false));
     }
 
     public void testNonBusinessDates() {
@@ -840,6 +1018,22 @@ public void testNonBusinessDates() {
         assertNull(bCalendar.nonBusinessDates(start.atTime(1, 2).atZone(timeZone).toInstant(), null, true, true));
         assertNull(bCalendar.nonBusinessDates(null, end.atTime(1, 2).atZone(timeZone), true, true));
         assertNull(bCalendar.nonBusinessDates(start.atTime(1, 2).atZone(timeZone), null, true, true));
+
+        // end before start
+        assertEquals(new LocalDate[0], bCalendar.nonBusinessDates(end, start));
+
+        // long span of dates
+        final LocalDate startLong = LocalDate.of(2019, 2, 1);
+        final LocalDate endLong = LocalDate.of(2023, 12, 31);
+        final ArrayList<LocalDate> targetLong = new ArrayList<>();
+
+        for (LocalDate d = startLong; !d.isAfter(endLong); d = d.plusDays(1)) {
+            if (!bCalendar.isBusinessDay(d)) {
+                targetLong.add(d);
+            }
+        }
+
+        assertEquals(targetLong.toArray(LocalDate[]::new), bCalendar.nonBusinessDates(startLong, endLong));
     }
 
     public void testNumberNonBusinessDates() {
@@ -867,6 +1061,7 @@ public void testNumberNonBusinessDates() {
         // LocalDate.of(2023,7,15),
         // };
 
+        assertEquals(0, bCalendar.numberNonBusinessDates(end, start));
         assertEquals(nonBus.length, bCalendar.numberNonBusinessDates(start, end));
         assertEquals(nonBus.length, bCalendar.numberNonBusinessDates(start.toString(), end.toString()));
         assertEquals(nonBus.length, bCalendar.numberNonBusinessDates(start.atTime(1, 24).atZone(timeZone),
@@ -914,6 +1109,11 @@ public void testNumberNonBusinessDates() {
                 bCalendar.numberNonBusinessDates(start.atTime(1, 2).atZone(timeZone).toInstant(), null, true, true));
         assertEquals(NULL_INT, bCalendar.numberNonBusinessDates(null, end.atTime(1, 2).atZone(timeZone), true, true));
         assertEquals(NULL_INT, bCalendar.numberNonBusinessDates(start.atTime(1, 2).atZone(timeZone), null, true, true));
+
+        final LocalDate startLong = LocalDate.of(2023, 7, 3);
+        final LocalDate endLong = LocalDate.of(2025, 7, 15);
+        final LocalDate[] nonBusLong = bCalendar.nonBusinessDates(startLong, endLong);
+        assertEquals(nonBusLong.length, bCalendar.numberNonBusinessDates(startLong, endLong));
     }
 
     public void testDiffBusinessNanos() {
@@ -1547,4 +1747,25 @@ public void testPastNonBusinessDate() {
         assertNull(bCalendar.pastNonBusinessDate(NULL_INT));
     }
 
+    public void testClearCache() {
+        final LocalDate start = LocalDate.of(2023, 7, 3);
+        final LocalDate end = LocalDate.of(2025, 7, 10);
+
+        final CalendarDay<Instant> v1 = bCalendar.calendarDay();
+        final CalendarDay<Instant> v2 = bCalendar.calendarDay();
+        assertEquals(v1, v2);
+        final int i1 = bCalendar.numberBusinessDates(start, end);
+        final int i2 = bCalendar.numberBusinessDates(start, end);
+        assertEquals(i1, i2);
+
+        bCalendar.clearCache();
+
+        final CalendarDay<Instant> v3 = bCalendar.calendarDay();
+        final CalendarDay<Instant> v4 = bCalendar.calendarDay();
+        assertEquals(v3, v4);
+        final int i3 = bCalendar.numberBusinessDates(start, end);
+        final int i4 = bCalendar.numberBusinessDates(start, end);
+        assertEquals(i3, i4);
+    }
+
 }
diff --git a/engine/time/src/test/java/io/deephaven/time/calendar/TestBusinessCalendarXMLParser.java b/engine/time/src/test/java/io/deephaven/time/calendar/TestBusinessCalendarXMLParser.java
index a8a4a75ee0e..43635475aa7 100644
--- a/engine/time/src/test/java/io/deephaven/time/calendar/TestBusinessCalendarXMLParser.java
+++ b/engine/time/src/test/java/io/deephaven/time/calendar/TestBusinessCalendarXMLParser.java
@@ -36,6 +36,9 @@ public static void assertParserTestCal(final BusinessCalendar cal) {
                 cal.calendarDay("2015-04-06").businessStart());
         assertEquals(DateTimeUtils.parseInstant("2015-04-06T16:46 Asia/Tokyo"),
                 cal.calendarDay("2015-04-06").businessEnd());
+
+        assertTrue(cal.calendarDay("2015-04-06").isInclusiveEnd());
+        assertFalse(cal.calendarDay("2015-04-07").isInclusiveEnd());
     }
 
     public void testLoad() throws URISyntaxException {
diff --git a/engine/time/src/test/java/io/deephaven/time/calendar/TestCalendar.java b/engine/time/src/test/java/io/deephaven/time/calendar/TestCalendar.java
index 1a6936e3832..8909d2232c1 100644
--- a/engine/time/src/test/java/io/deephaven/time/calendar/TestCalendar.java
+++ b/engine/time/src/test/java/io/deephaven/time/calendar/TestCalendar.java
@@ -7,6 +7,7 @@
 import io.deephaven.time.DateTimeUtils;
 
 import java.time.*;
+import java.util.ArrayList;
 
 import static io.deephaven.util.QueryConstants.NULL_INT;
 
@@ -224,6 +225,20 @@ public void testCalendarDates() {
         assertNull(calendar.calendarDates(start.atTime(3, 15).atZone(timeZone).toInstant(), null, false, false));
         assertNull(calendar.calendarDates(null, end.atTime(3, 15).atZone(timeZone), false, false));
         assertNull(calendar.calendarDates(start.atTime(3, 15).atZone(timeZone), null, false, false));
+
+        // end before start
+        assertEquals(new LocalDate[0], calendar.calendarDates(end, start));
+
+        // long span of dates
+        final LocalDate startLong = LocalDate.of(2019, 2, 1);
+        final LocalDate endLong = LocalDate.of(2023, 12, 31);
+        final ArrayList<LocalDate> targetLong = new ArrayList<>();
+
+        for (LocalDate d = startLong; !d.isAfter(endLong); d = d.plusDays(1)) {
+            targetLong.add(d);
+        }
+
+        assertEquals(targetLong.toArray(LocalDate[]::new), calendar.calendarDates(startLong, endLong));
     }
 
     public void testNumberCalendarDates() {
diff --git a/engine/time/src/test/java/io/deephaven/time/calendar/TestCalendarDay.java b/engine/time/src/test/java/io/deephaven/time/calendar/TestCalendarDay.java
index 367ebbdb7a0..fded3f8adc6 100644
--- a/engine/time/src/test/java/io/deephaven/time/calendar/TestCalendarDay.java
+++ b/engine/time/src/test/java/io/deephaven/time/calendar/TestCalendarDay.java
@@ -7,8 +7,8 @@
 import io.deephaven.time.DateTimeUtils;
 
 import java.time.*;
+import java.util.Arrays;
 import java.util.List;
-import java.util.Objects;
 
 import static io.deephaven.util.QueryConstants.NULL_LONG;
 import static org.junit.Assert.assertNotEquals;
@@ -61,10 +61,10 @@ public void testSinglePeriod() {
         assertEquals(close1, single.businessEnd());
         assertEquals(close1, single.businessEnd());
         assertTrue(single.isInclusiveEnd());
-        assertEquals(DateTimeUtils.HOUR, single.businessNanos());
-        assertEquals(Duration.ofNanos(DateTimeUtils.HOUR), single.businessDuration());
-        assertEquals(DateTimeUtils.HOUR, single.businessNanos());
-        assertEquals(Duration.ofNanos(DateTimeUtils.HOUR), single.businessDuration());
+        assertEquals(DateTimeUtils.HOUR + 1, single.businessNanos());
+        assertEquals(Duration.ofNanos(DateTimeUtils.HOUR + 1), single.businessDuration());
+        assertEquals(DateTimeUtils.HOUR + 1, single.businessNanos());
+        assertEquals(Duration.ofNanos(DateTimeUtils.HOUR + 1), single.businessDuration());
         assertTrue(single.isBusinessDay());
         assertTrue(single.isBusinessTime(DateTimeUtils.parseInstant("2017-03-11T10:00:00.000000000 NY")));
         assertTrue(single.isBusinessTime(DateTimeUtils.parseInstant("2017-03-11T10:15:00.000000000 NY")));
@@ -77,13 +77,13 @@ public void testSinglePeriod() {
                 single.businessNanosElapsed(DateTimeUtils.parseInstant("2017-03-11T10:30:00.000000000 NY")));
         assertEquals(Duration.ofNanos(DateTimeUtils.MINUTE * 30),
                 single.businessDurationElapsed(DateTimeUtils.parseInstant("2017-03-11T10:30:00.000000000 NY")));
-        assertEquals(DateTimeUtils.HOUR,
+        assertEquals(DateTimeUtils.HOUR + 1,
                 single.businessNanosElapsed(DateTimeUtils.parseInstant("2017-03-11T13:00:00.000000000 NY")));
-        assertEquals(Duration.ofNanos(DateTimeUtils.HOUR),
+        assertEquals(Duration.ofNanos(DateTimeUtils.HOUR + 1),
                 single.businessDurationElapsed(DateTimeUtils.parseInstant("2017-03-11T13:00:00.000000000 NY")));
-        assertEquals(DateTimeUtils.MINUTE * 30,
+        assertEquals(DateTimeUtils.MINUTE * 30 + 1,
                 single.businessNanosRemaining(DateTimeUtils.parseInstant("2017-03-11T10:30:00.000000000 NY")));
-        assertEquals(Duration.ofNanos(DateTimeUtils.MINUTE * 30),
+        assertEquals(Duration.ofNanos(DateTimeUtils.MINUTE * 30 + 1),
                 single.businessDurationRemaining(DateTimeUtils.parseInstant("2017-03-11T10:30:00.000000000 NY")));
         assertEquals(0L,
                 single.businessNanosRemaining(DateTimeUtils.parseInstant("2017-03-11T13:00:00.000000000 NY")));
@@ -105,10 +105,10 @@ public void testMultiPeriod() {
         assertEquals(close2, multi.businessEnd());
         assertEquals(close2, multi.businessEnd());
         assertTrue(multi.isInclusiveEnd());
-        assertEquals(DateTimeUtils.HOUR * 6, multi.businessNanos());
-        assertEquals(Duration.ofNanos(DateTimeUtils.HOUR * 6), multi.businessDuration());
-        assertEquals(DateTimeUtils.HOUR * 6, multi.businessNanos());
-        assertEquals(Duration.ofNanos(DateTimeUtils.HOUR * 6), multi.businessDuration());
+        assertEquals(DateTimeUtils.HOUR * 6 + 2, multi.businessNanos());
+        assertEquals(Duration.ofNanos(DateTimeUtils.HOUR * 6 + 2), multi.businessDuration());
+        assertEquals(DateTimeUtils.HOUR * 6 + 2, multi.businessNanos());
+        assertEquals(Duration.ofNanos(DateTimeUtils.HOUR * 6 + 2), multi.businessDuration());
         assertTrue(multi.isBusinessDay());
         assertTrue(multi.isBusinessTime(DateTimeUtils.parseInstant("2017-03-11T10:00:00.000000000 NY")));
         assertTrue(multi.isBusinessTime(DateTimeUtils.parseInstant("2017-03-11T10:15:00.000000000 NY")));
@@ -122,25 +122,25 @@ public void testMultiPeriod() {
                 multi.businessNanosElapsed(DateTimeUtils.parseInstant("2017-03-11T10:30:00.000000000 NY")));
         assertEquals(Duration.ofNanos(DateTimeUtils.MINUTE * 30),
                 multi.businessDurationElapsed(DateTimeUtils.parseInstant("2017-03-11T10:30:00.000000000 NY")));
-        assertEquals(DateTimeUtils.HOUR * 2,
+        assertEquals(DateTimeUtils.HOUR * 2 + 1,
                 multi.businessNanosElapsed(DateTimeUtils.parseInstant("2017-03-11T13:00:00.000000000 NY")));
-        assertEquals(Duration.ofNanos(DateTimeUtils.HOUR * 2),
+        assertEquals(Duration.ofNanos(DateTimeUtils.HOUR * 2 + 1),
                 multi.businessDurationElapsed(DateTimeUtils.parseInstant("2017-03-11T13:00:00.000000000 NY")));
-        assertEquals(DateTimeUtils.HOUR * 2,
+        assertEquals(DateTimeUtils.HOUR * 2 + 1,
                 multi.businessNanosElapsed(DateTimeUtils.parseInstant("2017-03-11T13:00:00.000000000 NY")));
-        assertEquals(Duration.ofNanos(DateTimeUtils.HOUR * 2),
+        assertEquals(Duration.ofNanos(DateTimeUtils.HOUR * 2 + 1),
                 multi.businessDurationElapsed(DateTimeUtils.parseInstant("2017-03-11T13:00:00.000000000 NY")));
-        assertEquals(DateTimeUtils.HOUR * 6,
+        assertEquals(DateTimeUtils.HOUR * 6 + 2,
                 multi.businessNanosRemaining(DateTimeUtils.parseInstant("2017-03-11T01:00:00.000000000 NY")));
-        assertEquals(Duration.ofNanos(DateTimeUtils.HOUR * 6),
+        assertEquals(Duration.ofNanos(DateTimeUtils.HOUR * 6 + 2),
                 multi.businessDurationRemaining(DateTimeUtils.parseInstant("2017-03-11T01:00:00.000000000 NY")));
-        assertEquals(DateTimeUtils.HOUR * 5 + DateTimeUtils.MINUTE * 30,
+        assertEquals(DateTimeUtils.HOUR * 5 + DateTimeUtils.MINUTE * 30 + 2,
                 multi.businessNanosRemaining(DateTimeUtils.parseInstant("2017-03-11T10:30:00.000000000 NY")));
-        assertEquals(Duration.ofNanos(DateTimeUtils.HOUR * 5 + DateTimeUtils.MINUTE * 30),
+        assertEquals(Duration.ofNanos(DateTimeUtils.HOUR * 5 + DateTimeUtils.MINUTE * 30 + 2),
                 multi.businessDurationRemaining(DateTimeUtils.parseInstant("2017-03-11T10:30:00.000000000 NY")));
-        assertEquals(DateTimeUtils.HOUR * 4,
+        assertEquals(DateTimeUtils.HOUR * 4 + 1,
                 multi.businessNanosRemaining(DateTimeUtils.parseInstant("2017-03-11T13:00:00.000000000 NY")));
-        assertEquals(Duration.ofNanos(DateTimeUtils.HOUR * 4),
+        assertEquals(Duration.ofNanos(DateTimeUtils.HOUR * 4 + 1),
                 multi.businessDurationRemaining(DateTimeUtils.parseInstant("2017-03-11T13:00:00.000000000 NY")));
 
         assertEquals(NULL_LONG, multi.businessNanosElapsed(null));
@@ -156,10 +156,10 @@ public void testMultiPeriod() {
         assertEquals(close2, multi2.businessEnd());
         assertEquals(close2, multi2.businessEnd());
         assertTrue(multi2.isInclusiveEnd());
-        assertEquals(DateTimeUtils.HOUR * 6, multi2.businessNanos());
-        assertEquals(Duration.ofNanos(DateTimeUtils.HOUR * 6), multi2.businessDuration());
-        assertEquals(DateTimeUtils.HOUR * 6, multi2.businessNanos());
-        assertEquals(Duration.ofNanos(DateTimeUtils.HOUR * 6), multi2.businessDuration());
+        assertEquals(DateTimeUtils.HOUR * 6 + 2, multi2.businessNanos());
+        assertEquals(Duration.ofNanos(DateTimeUtils.HOUR * 6 + 2), multi2.businessDuration());
+        assertEquals(DateTimeUtils.HOUR * 6 + 2, multi2.businessNanos());
+        assertEquals(Duration.ofNanos(DateTimeUtils.HOUR * 6 + 2), multi2.businessDuration());
         assertTrue(multi2.isBusinessDay());
         assertTrue(multi2.isBusinessTime(DateTimeUtils.parseInstant("2017-03-11T10:00:00.000000000 NY")));
         assertTrue(multi2.isBusinessTime(DateTimeUtils.parseInstant("2017-03-11T10:15:00.000000000 NY")));
@@ -173,13 +173,13 @@ public void testMultiPeriod() {
                 multi2.businessNanosElapsed(DateTimeUtils.parseInstant("2017-03-11T10:30:00.000000000 NY")));
         assertEquals(Duration.ofNanos(DateTimeUtils.MINUTE * 30),
                 multi2.businessDurationElapsed(DateTimeUtils.parseInstant("2017-03-11T10:30:00.000000000 NY")));
-        assertEquals(DateTimeUtils.HOUR * 2,
+        assertEquals(DateTimeUtils.HOUR * 2 + 1,
                 multi2.businessNanosElapsed(DateTimeUtils.parseInstant("2017-03-11T13:00:00.000000000 NY")));
-        assertEquals(Duration.ofNanos(DateTimeUtils.HOUR * 2),
+        assertEquals(Duration.ofNanos(DateTimeUtils.HOUR * 2 + 1),
                 multi2.businessDurationElapsed(DateTimeUtils.parseInstant("2017-03-11T13:00:00.000000000 NY")));
-        assertEquals(DateTimeUtils.HOUR * 2,
+        assertEquals(DateTimeUtils.HOUR * 2 + 1,
                 multi2.businessNanosElapsed(DateTimeUtils.parseInstant("2017-03-11T13:00:00.000000000 NY")));
-        assertEquals(Duration.ofNanos(DateTimeUtils.HOUR * 2),
+        assertEquals(Duration.ofNanos(DateTimeUtils.HOUR * 2 + 1),
                 multi2.businessDurationElapsed(DateTimeUtils.parseInstant("2017-03-11T13:00:00.000000000 NY")));
 
         assertEquals(NULL_LONG, multi2.businessNanosElapsed(null));
@@ -216,7 +216,7 @@ public void testEqualsHash() {
         final CalendarDay<Instant> multi = new CalendarDay<>(new TimeRange[] {period1, period2});
         assertEquals(List.of(period1, period2), multi.businessTimeRanges());
 
-        int hashTarget = Objects.hash(multi.businessTimeRanges());
+        int hashTarget = Arrays.hashCode(multi.businessTimeRanges().toArray());
         assertEquals(hashTarget, multi.hashCode());
 
         final CalendarDay<Instant> multi2 = new CalendarDay<>(new TimeRange[] {period1, period2});
diff --git a/engine/time/src/test/java/io/deephaven/time/calendar/TestCalendars.java b/engine/time/src/test/java/io/deephaven/time/calendar/TestCalendars.java
index ef10b20e9d4..6c86dc632de 100644
--- a/engine/time/src/test/java/io/deephaven/time/calendar/TestCalendars.java
+++ b/engine/time/src/test/java/io/deephaven/time/calendar/TestCalendars.java
@@ -5,6 +5,7 @@
 
 import io.deephaven.base.testing.BaseArrayTestCase;
 import io.deephaven.configuration.Configuration;
+import io.deephaven.time.DateTimeUtils;
 
 import java.net.URISyntaxException;
 import java.nio.file.Paths;
@@ -82,6 +83,15 @@ public void testAdd() throws URISyntaxException {
         } catch (Exception e) {
             // pass
         }
+    }
+
+    public void testUTCDayLength() {
+        final BusinessCalendar cal = Calendars.calendar("UTC");
+        assertEquals(DateTimeUtils.DAY, cal.standardBusinessDay().businessNanos());
+    }
 
+    public void testNYSEDayLength() {
+        final BusinessCalendar cal = Calendars.calendar("USNYSE_EXAMPLE");
+        assertEquals(6 * DateTimeUtils.HOUR + 30 * DateTimeUtils.MINUTE, cal.standardBusinessDay().businessNanos());
     }
 }
diff --git a/engine/time/src/test/java/io/deephaven/time/calendar/TestReadOptimizedConcurrentCache.java b/engine/time/src/test/java/io/deephaven/time/calendar/TestReadOptimizedConcurrentCache.java
new file mode 100644
index 00000000000..20bca069d3e
--- /dev/null
+++ b/engine/time/src/test/java/io/deephaven/time/calendar/TestReadOptimizedConcurrentCache.java
@@ -0,0 +1,56 @@
+//
+// Copyright (c) 2016-2024 Deephaven Data Labs and Patent Pending
+//
+package io.deephaven.time.calendar;
+
+import io.deephaven.base.testing.BaseArrayTestCase;
+
+public class TestReadOptimizedConcurrentCache extends BaseArrayTestCase {
+
+    private static class Value extends ReadOptimizedConcurrentCache.Pair<String> {
+        Value(int key, String value) {
+            super(key, value);
+        }
+    }
+
+    private static Value makeVal(Integer key) {
+        final Character c = (char) (key + 'a');
+
+        if (c.equals('d')) {
+            return null;
+        }
+
+        return new Value(key, c.toString().toUpperCase());
+    }
+
+    public void testCache() {
+        final ReadOptimizedConcurrentCache<Value> cache =
+                new ReadOptimizedConcurrentCache<>(10, TestReadOptimizedConcurrentCache::makeVal);
+
+        assertEquals("A", cache.computeIfAbsent(0).getValue());
+        assertEquals("A", cache.computeIfAbsent(0).getValue());
+
+        assertEquals("A", cache.computeIfAbsent(0).getValue());
+        assertEquals("B", cache.computeIfAbsent(1).getValue());
+        assertEquals("C", cache.computeIfAbsent(2).getValue());
+
+        try {
+            cache.computeIfAbsent(3);
+            fail("Expected exception");
+        } catch (final NullPointerException e) {
+            // pass
+        }
+
+        cache.clear();
+        assertEquals("A", cache.computeIfAbsent(0).getValue());
+        assertEquals("B", cache.computeIfAbsent(1).getValue());
+        assertEquals("C", cache.computeIfAbsent(2).getValue());
+
+        try {
+            cache.computeIfAbsent(3);
+            fail("Expected exception");
+        } catch (final NullPointerException e) {
+            // pass
+        }
+    }
+}
diff --git a/engine/time/src/test/java/io/deephaven/time/calendar/TestStaticCalendarMethods.java b/engine/time/src/test/java/io/deephaven/time/calendar/TestStaticCalendarMethods.java
index 4140b66cf34..6d2936214ce 100644
--- a/engine/time/src/test/java/io/deephaven/time/calendar/TestStaticCalendarMethods.java
+++ b/engine/time/src/test/java/io/deephaven/time/calendar/TestStaticCalendarMethods.java
@@ -3,6 +3,7 @@
 //
 package io.deephaven.time.calendar;
 
+import io.deephaven.base.clock.Clock;
 import io.deephaven.base.testing.BaseArrayTestCase;
 import io.deephaven.time.DateTimeUtils;
 
@@ -106,6 +107,13 @@ public void testAll() {
         excludes.add("description");
         excludes.add("firstValidDate");
         excludes.add("lastValidDate");
+        excludes.add("clearCache");
+
+        // Occasionally tests fail because of invalid clocks on the test system
+        final LocalDate startDate = LocalDate.of(1990, 1, 1);
+        final LocalDate currentDate = DateTimeUtils.todayLocalDate();
+        assertTrue("Checking for a valid date on the test system: currentDate=" + currentDate,
+                currentDate.isAfter(startDate));
 
         for (Method m1 : BusinessCalendar.class.getMethods()) {
             if (m1.getDeclaringClass() == Object.class ||
diff --git a/engine/time/src/test/java/io/deephaven/time/calendar/TestTimeRange.java b/engine/time/src/test/java/io/deephaven/time/calendar/TestTimeRange.java
index 5a0a11dbd87..476d7ee243f 100644
--- a/engine/time/src/test/java/io/deephaven/time/calendar/TestTimeRange.java
+++ b/engine/time/src/test/java/io/deephaven/time/calendar/TestTimeRange.java
@@ -50,8 +50,8 @@ public void testTimeRangeInclusive() {
         assertEquals(open1, period.start());
         assertEquals(close1, period.end());
         assertTrue(period.isInclusiveEnd());
-        assertEquals(DateTimeUtils.HOUR, period.nanos());
-        assertEquals(Duration.ofNanos(DateTimeUtils.HOUR), period.duration());
+        assertEquals(DateTimeUtils.HOUR + 1, period.nanos());
+        assertEquals(Duration.ofNanos(DateTimeUtils.HOUR + 1), period.duration());
 
         assertTrue(period.contains(open1));
         assertTrue(period
@@ -101,8 +101,8 @@ public void testTimeRangeExclusive() {
         assertEquals(open1, period.start());
         assertEquals(close1, period.end());
         assertFalse(period.isInclusiveEnd());
-        assertEquals(DateTimeUtils.HOUR - 1, period.nanos());
-        assertEquals(Duration.ofNanos(DateTimeUtils.HOUR - 1), period.duration());
+        assertEquals(DateTimeUtils.HOUR, period.nanos());
+        assertEquals(Duration.ofNanos(DateTimeUtils.HOUR), period.duration());
 
         assertTrue(period.contains(open1));
         assertTrue(period
@@ -192,4 +192,19 @@ public void testToStringExclusive() {
         final TimeRange<LocalTime> p1 = new TimeRange<>(start, end, false);
         assertEquals("TimeRange{start=01:02:03, end=07:08:09, inclusiveEnd=false}", p1.toString());
     }
+
+    public void testNanos() {
+        final Instant t1 = DateTimeUtils.epochMillisToInstant(0);
+        final Instant t2 = DateTimeUtils.epochMillisToInstant(1);
+
+        final TimeRange<Instant> pInclusive = new TimeRange<>(t1, t2, true);
+        final TimeRange<Instant> pExclusive = new TimeRange<>(t1, t2, false);
+
+        final long nInclusive = pInclusive.nanos();
+        final long nExclusive = pExclusive.nanos();
+
+        assertNotEquals(nInclusive, nExclusive);
+        assertEquals(DateTimeUtils.MILLI, nExclusive);
+        assertEquals(DateTimeUtils.MILLI + 1, nInclusive);
+    }
 }
diff --git a/engine/time/src/test/java/io/deephaven/time/calendar/TestYearMonthSummaryCache.java b/engine/time/src/test/java/io/deephaven/time/calendar/TestYearMonthSummaryCache.java
new file mode 100644
index 00000000000..7d8568b1f56
--- /dev/null
+++ b/engine/time/src/test/java/io/deephaven/time/calendar/TestYearMonthSummaryCache.java
@@ -0,0 +1,333 @@
+//
+// Copyright (c) 2016-2024 Deephaven Data Labs and Patent Pending
+//
+package io.deephaven.time.calendar;
+
+import io.deephaven.base.testing.BaseArrayTestCase;
+
+import java.time.LocalDate;
+import java.util.Iterator;
+import java.util.Spliterator;
+import java.util.Spliterators;
+import java.util.function.IntFunction;
+import java.util.stream.Stream;
+import java.util.stream.StreamSupport;
+
+@SuppressWarnings({"DataFlowIssue", "ConstantValue"})
+public class TestYearMonthSummaryCache extends BaseArrayTestCase {
+
+    private static class Value extends ReadOptimizedConcurrentCache.Pair<String> {
+        Value(int key, String value) {
+            super(key, value);
+        }
+    }
+
+    public void testKeys() {
+        final int y = 2021;
+        final int m = 3;
+        final int key = YearMonthSummaryCache.yearMonthKey(y, m);
+        assertEquals(key, 2021 * 100 + m);
+        assertEquals(y, YearMonthSummaryCache.yearFromYearMonthKey(key));
+        assertEquals(m, YearMonthSummaryCache.monthFromYearMonthKey(key));
+    }
+
+    public void testGetters() {
+        final int[] monthCount = new int[] {0};
+        final int[] yearCount = new int[] {0};
+
+        final IntFunction<Value> monthSummary = i -> {
+            monthCount[0]++;
+            return new Value(i, "month" + i);
+        };
+
+        final IntFunction<Value> yearSummary = i -> {
+            yearCount[0]++;
+            return new Value(i, "year" + i);
+        };
+
+        final YearMonthSummaryCache<Value> cache = new YearMonthSummaryCache<>(monthSummary, yearSummary);
+
+        cache.clear();
+        monthCount[0] = 0;
+        yearCount[0] = 0;
+
+        assertEquals("month202101", cache.getMonthSummary(2021, 1).getValue());
+        assertEquals(1, monthCount[0]);
+        assertEquals(0, yearCount[0]);
+        assertEquals("year2021", cache.getYearSummary(2021).getValue());
+        assertEquals(1, monthCount[0]);
+        assertEquals(1, yearCount[0]);
+        assertEquals("month202101", cache.getMonthSummary(2021, 1).getValue());
+        assertEquals(1, monthCount[0]);
+        assertEquals(1, yearCount[0]);
+        assertEquals("year2021", cache.getYearSummary(2021).getValue());
+        assertEquals(1, monthCount[0]);
+        assertEquals(1, yearCount[0]);
+
+        assertEquals("month202102", cache.getMonthSummary(2021, 2).getValue());
+        assertEquals(2, monthCount[0]);
+        assertEquals(1, yearCount[0]);
+        assertEquals("year2022", cache.getYearSummary(2022).getValue());
+        assertEquals(2, monthCount[0]);
+        assertEquals(2, yearCount[0]);
+
+        cache.clear();
+
+        assertEquals("month202101", cache.getMonthSummary(2021, 1).getValue());
+        assertEquals(3, monthCount[0]);
+        assertEquals(2, yearCount[0]);
+        assertEquals("year2021", cache.getYearSummary(2021).getValue());
+        assertEquals(3, monthCount[0]);
+        assertEquals(3, yearCount[0]);
+        assertEquals("month202101", cache.getMonthSummary(2021, 1).getValue());
+        assertEquals(3, monthCount[0]);
+        assertEquals(3, yearCount[0]);
+        assertEquals("year2021", cache.getYearSummary(2021).getValue());
+        assertEquals(3, monthCount[0]);
+        assertEquals(3, yearCount[0]);
+
+        assertEquals("month202102", cache.getMonthSummary(2021, 2).getValue());
+        assertEquals(4, monthCount[0]);
+        assertEquals(3, yearCount[0]);
+        assertEquals("year2022", cache.getYearSummary(2022).getValue());
+        assertEquals(4, monthCount[0]);
+        assertEquals(4, yearCount[0]);
+    }
+
+    private static <T> Stream<T> iteratorToStream(Iterator<T> iterator) {
+        Spliterator<T> spliterator = Spliterators.spliteratorUnknownSize(iterator, 0);
+        return StreamSupport.stream(spliterator, false);
+    }
+
+    public void testIteratorInclusive() {
+        final YearMonthSummaryCache<Value> cache =
+                new YearMonthSummaryCache<>(i -> new Value(i, "month" + i), i -> new Value(i, "year" + i));
+        final boolean startInclusive = true;
+        final boolean endInclusive = true;
+
+        // end before start
+        LocalDate start = LocalDate.of(2021, 1, 2);
+        LocalDate end = LocalDate.of(2021, 1, 1);
+        String[] target = {};
+        String[] actual =
+                iteratorToStream(cache.iterator(start, end, startInclusive, endInclusive)).toArray(String[]::new);
+        assertEquals(target, actual);
+
+        // same month
+        start = LocalDate.of(2021, 1, 1);
+        end = LocalDate.of(2021, 1, 11);
+        target = new String[] {};
+        actual = iteratorToStream(cache.iterator(start, end, startInclusive, endInclusive)).toArray(String[]::new);
+        assertEquals(target, actual);
+
+        // adjacent partial months
+        start = LocalDate.of(2021, 1, 3);
+        end = LocalDate.of(2021, 2, 11);
+        target = new String[] {};
+        actual = iteratorToStream(cache.iterator(start, end, startInclusive, endInclusive)).toArray(String[]::new);
+        assertEquals(target, actual);
+
+        // full month + partial month
+        start = LocalDate.of(2021, 1, 1);
+        end = LocalDate.of(2021, 2, 11);
+        target = new String[] {"month202101"};
+        actual = iteratorToStream(cache.iterator(start, end, startInclusive, endInclusive)).map(x -> x.getValue())
+                .toArray(String[]::new);
+        assertEquals(target, actual);
+
+        // full month + few days
+        start = LocalDate.of(2020, 12, 12);
+        end = LocalDate.of(2021, 2, 11);
+        target = new String[] {"month202101"};
+        actual = iteratorToStream(cache.iterator(start, end, startInclusive, endInclusive)).map(x -> x.getValue())
+                .toArray(String[]::new);
+        assertEquals(target, actual);
+
+        // multiple months + few days
+        start = LocalDate.of(2020, 11, 12);
+        end = LocalDate.of(2021, 4, 11);
+        target = new String[] {"month202012", "month202101", "month202102", "month202103"};
+        actual = iteratorToStream(cache.iterator(start, end, startInclusive, endInclusive)).map(x -> x.getValue())
+                .toArray(String[]::new);
+        assertEquals(target, actual);
+
+        // partial month + full month
+        start = LocalDate.of(2021, 1, 3);
+        end = LocalDate.of(2021, 2, 28);
+        target = new String[] {"month202102"};
+        actual = iteratorToStream(cache.iterator(start, end, startInclusive, endInclusive)).map(x -> x.getValue())
+                .toArray(String[]::new);
+        assertEquals(target, actual);
+
+        // full year
+        start = LocalDate.of(2021, 1, 1);
+        end = LocalDate.of(2021, 12, 31);
+        target = new String[] {"year2021"};
+        actual = iteratorToStream(cache.iterator(start, end, startInclusive, endInclusive)).map(x -> x.getValue())
+                .toArray(String[]::new);
+        assertEquals(target, actual);
+
+        // full year + few days
+        start = LocalDate.of(2020, 12, 11);
+        end = LocalDate.of(2022, 1, 3);
+        target = new String[] {"year2021"};
+        actual = iteratorToStream(cache.iterator(start, end, startInclusive, endInclusive)).map(x -> x.getValue())
+                .toArray(String[]::new);
+        assertEquals(target, actual);
+
+        // multiple years + few days
+        start = LocalDate.of(2018, 12, 11);
+        end = LocalDate.of(2022, 1, 3);
+        target = new String[] {"year2019", "year2020", "year2021"};
+        actual = iteratorToStream(cache.iterator(start, end, startInclusive, endInclusive)).map(x -> x.getValue())
+                .toArray(String[]::new);
+        assertEquals(target, actual);
+
+        // mixed
+        start = LocalDate.of(2018, 10, 11);
+        end = LocalDate.of(2022, 3, 3);
+        target = new String[] {"month201811", "month201812", "year2019", "year2020", "year2021", "month202201",
+                "month202202"};
+        actual = iteratorToStream(cache.iterator(start, end, startInclusive, endInclusive)).map(x -> x.getValue())
+                .toArray(String[]::new);
+        assertEquals(target, actual);
+    }
+
+    public void testIteratorExclusiveInclusive() {
+        final YearMonthSummaryCache<Value> cache =
+                new YearMonthSummaryCache<>(i -> new Value(i, "month" + i), i -> new Value(i, "year" + i));
+
+        // start and end of month
+
+        LocalDate start = LocalDate.of(2021, 12, 1);
+        LocalDate end = LocalDate.of(2021, 12, 31);
+
+        boolean startInclusive = true;
+        boolean endInclusive = true;
+        String[] target = new String[] {"month202112"};
+        String[] actual =
+                iteratorToStream(cache.iterator(start, end, startInclusive, endInclusive)).map(x -> x.getValue())
+                        .toArray(String[]::new);
+        assertEquals(target, actual);
+
+        startInclusive = false;
+        endInclusive = true;
+        target = new String[] {};
+        actual = iteratorToStream(cache.iterator(start, end, startInclusive, endInclusive)).map(x -> x.getValue())
+                .toArray(String[]::new);
+        assertEquals(target, actual);
+
+        startInclusive = true;
+        endInclusive = false;
+        target = new String[] {};
+        actual = iteratorToStream(cache.iterator(start, end, startInclusive, endInclusive)).map(x -> x.getValue())
+                .toArray(String[]::new);
+        assertEquals(target, actual);
+
+        startInclusive = false;
+        endInclusive = false;
+        target = new String[] {};
+        actual = iteratorToStream(cache.iterator(start, end, startInclusive, endInclusive)).map(x -> x.getValue())
+                .toArray(String[]::new);
+        assertEquals(target, actual);
+
+        // day before start of month
+
+        start = LocalDate.of(2021, 11, 30);
+        end = LocalDate.of(2021, 12, 31);
+
+        startInclusive = true;
+        endInclusive = true;
+        target = new String[] {"month202112"};
+        actual = iteratorToStream(cache.iterator(start, end, startInclusive, endInclusive)).map(x -> x.getValue())
+                .toArray(String[]::new);
+        assertEquals(target, actual);
+
+        startInclusive = false;
+        endInclusive = true;
+        target = new String[] {"month202112"};
+        actual = iteratorToStream(cache.iterator(start, end, startInclusive, endInclusive)).map(x -> x.getValue())
+                .toArray(String[]::new);
+        assertEquals(target, actual);
+
+        startInclusive = true;
+        endInclusive = false;
+        target = new String[] {};
+        actual = iteratorToStream(cache.iterator(start, end, startInclusive, endInclusive)).map(x -> x.getValue())
+                .toArray(String[]::new);
+        assertEquals(target, actual);
+
+        startInclusive = false;
+        endInclusive = false;
+        target = new String[] {};
+        actual = iteratorToStream(cache.iterator(start, end, startInclusive, endInclusive)).map(x -> x.getValue())
+                .toArray(String[]::new);
+        assertEquals(target, actual);
+
+        // day after end of month
+
+        start = LocalDate.of(2021, 12, 1);
+        end = LocalDate.of(2022, 1, 1);
+
+        startInclusive = true;
+        endInclusive = true;
+        target = new String[] {"month202112"};
+        actual = iteratorToStream(cache.iterator(start, end, startInclusive, endInclusive)).map(x -> x.getValue())
+                .toArray(String[]::new);
+        assertEquals(target, actual);
+
+        startInclusive = false;
+        endInclusive = true;
+        target = new String[] {};
+        actual = iteratorToStream(cache.iterator(start, end, startInclusive, endInclusive)).map(x -> x.getValue())
+                .toArray(String[]::new);
+        assertEquals(target, actual);
+
+        startInclusive = true;
+        endInclusive = false;
+        target = new String[] {"month202112"};
+        actual = iteratorToStream(cache.iterator(start, end, startInclusive, endInclusive)).map(x -> x.getValue())
+                .toArray(String[]::new);
+        assertEquals(target, actual);
+
+        startInclusive = false;
+        endInclusive = false;
+        target = new String[] {};
+        actual = iteratorToStream(cache.iterator(start, end, startInclusive, endInclusive)).map(x -> x.getValue())
+                .toArray(String[]::new);
+        assertEquals(target, actual);
+
+        // day before and after end of month
+
+        start = LocalDate.of(2021, 11, 30);
+        end = LocalDate.of(2022, 1, 1);
+
+        startInclusive = true;
+        endInclusive = true;
+        target = new String[] {"month202112"};
+        actual = iteratorToStream(cache.iterator(start, end, startInclusive, endInclusive)).map(x -> x.getValue())
+                .toArray(String[]::new);
+        assertEquals(target, actual);
+
+        startInclusive = false;
+        endInclusive = true;
+        target = new String[] {"month202112"};
+        actual = iteratorToStream(cache.iterator(start, end, startInclusive, endInclusive)).map(x -> x.getValue())
+                .toArray(String[]::new);
+        assertEquals(target, actual);
+
+        startInclusive = true;
+        endInclusive = false;
+        target = new String[] {"month202112"};
+        actual = iteratorToStream(cache.iterator(start, end, startInclusive, endInclusive)).map(x -> x.getValue())
+                .toArray(String[]::new);
+        assertEquals(target, actual);
+
+        startInclusive = false;
+        endInclusive = false;
+        target = new String[] {"month202112"};
+        actual = iteratorToStream(cache.iterator(start, end, startInclusive, endInclusive)).map(x -> x.getValue())
+                .toArray(String[]::new);
+        assertEquals(target, actual);
+    }
+}
diff --git a/engine/time/src/test/resources/PARSER-TEST.calendar b/engine/time/src/test/resources/PARSER-TEST.calendar
index 0fff2688674..3f4d43e1344 100644
--- a/engine/time/src/test/resources/PARSER-TEST.calendar
+++ b/engine/time/src/test/resources/PARSER-TEST.calendar
@@ -18,6 +18,6 @@
     </holiday>
     <holiday>
         <date>2015-04-06</date>
-        <businessTime><open>14:15</open><close>16:46</close></businessTime>
+        <businessTime><open>14:15</open><close>16:46</close><includeClose>true</includeClose></businessTime>
     </holiday>
 </calendar>
diff --git a/engine/tuple/build.gradle b/engine/tuple/build.gradle
index 1073ff03c1e..f845ac4442a 100644
--- a/engine/tuple/build.gradle
+++ b/engine/tuple/build.gradle
@@ -6,18 +6,18 @@ plugins {
 description 'Engine Tuples: Value sequences for use in aggregations, joins, and indexing'
 
 dependencies {
-    api 'net.sf.trove4j:trove4j:3.0.3'
+    api libs.trove
     api project(':Util')
     api project(':engine-time')
     implementation project(':DataStructures')
     implementation project(':log-factory')
 
-    Classpaths.inheritJUnitClassic(project, 'testImplementation')
+    testImplementation libs.junit4
 
     testRuntimeOnly project(':log-to-slf4j'),
             project(path: ':configs'),
             project(path: ':test-configs')
-    Classpaths.inheritSlf4j(project, 'slf4j-simple', 'testRuntimeOnly')
+    testRuntimeOnly libs.slf4j.simple
 }
 
 spotless {
diff --git a/engine/tuple/src/main/java/io/deephaven/tuple/ArrayTuple.java b/engine/tuple/src/main/java/io/deephaven/tuple/ArrayTuple.java
index 6476e47ba69..866bcb3ef3d 100644
--- a/engine/tuple/src/main/java/io/deephaven/tuple/ArrayTuple.java
+++ b/engine/tuple/src/main/java/io/deephaven/tuple/ArrayTuple.java
@@ -3,11 +3,11 @@
 //
 package io.deephaven.tuple;
 
-import io.deephaven.datastructures.util.CollectionUtil;
 import io.deephaven.tuple.serialization.SerializationUtils;
 import io.deephaven.tuple.serialization.StreamingExternalizable;
 import gnu.trove.map.TIntObjectMap;
 import io.deephaven.util.compare.ObjectComparisons;
+import io.deephaven.util.type.ArrayTypeUtils;
 import org.jetbrains.annotations.NotNull;
 
 import java.io.*;
@@ -35,7 +35,7 @@ public class ArrayTuple
      * @param elements The array to wrap
      */
     public ArrayTuple(final Object... elements) {
-        initialize(elements == null ? CollectionUtil.ZERO_LENGTH_OBJECT_ARRAY : elements);
+        initialize(elements == null ? ArrayTypeUtils.EMPTY_OBJECT_ARRAY : elements);
     }
 
     /**
diff --git a/engine/tuplesource/build.gradle b/engine/tuplesource/build.gradle
index afdd0ecaed2..625bc082cf8 100644
--- a/engine/tuplesource/build.gradle
+++ b/engine/tuplesource/build.gradle
@@ -11,5 +11,6 @@ dependencies {
 
     implementation project(':engine-base')
 
-    Classpaths.inheritAutoService(project)
+    compileOnly libs.autoservice
+    annotationProcessor libs.autoservice.compiler
 }
diff --git a/engine/updategraph/build.gradle b/engine/updategraph/build.gradle
index 68ecd87cdf6..ec8cba4c3b9 100644
--- a/engine/updategraph/build.gradle
+++ b/engine/updategraph/build.gradle
@@ -10,18 +10,19 @@ dependencies {
     implementation project(':hotspot')
     implementation project(':log-factory')
     implementation project(':Configuration')
-    implementation depCommonsLang3
+    implementation project(':util-processenvironment')
+    implementation libs.commons.lang3
 
-    compileOnly 'com.google.code.findbugs:jsr305:3.0.2'
-    compileOnly depAnnotations
+    compileOnly libs.google.findbugs.jsr305
+    compileOnly libs.jetbrains.annotations
 
     testImplementation project(':engine-context')
 
-    Classpaths.inheritJUnitClassic(project, 'testImplementation')
+    testImplementation libs.junit4
     testImplementation project(':engine-test-utils')
 
     testRuntimeOnly project(':log-to-slf4j'),
             project(path: ':configs'),
             project(path: ':test-configs')
-    Classpaths.inheritSlf4j(project, 'slf4j-simple', 'testRuntimeOnly')
+    testRuntimeOnly libs.slf4j.simple
 }
diff --git a/engine/updategraph/src/main/java/io/deephaven/engine/liveness/DelegatingLivenessNode.java b/engine/updategraph/src/main/java/io/deephaven/engine/liveness/DelegatingLivenessNode.java
index c4173d8034b..d11ed40c00b 100644
--- a/engine/updategraph/src/main/java/io/deephaven/engine/liveness/DelegatingLivenessNode.java
+++ b/engine/updategraph/src/main/java/io/deephaven/engine/liveness/DelegatingLivenessNode.java
@@ -5,14 +5,13 @@
 
 import org.jetbrains.annotations.NotNull;
 
-import java.lang.ref.WeakReference;
 import java.util.stream.Stream;
 
 /**
  * Indicates that this class implements LivenessNode via a member rather than implementing it directly. The real
  * LivenessNode is exposed via {@link #asLivenessNode()}, all other methods delegate to this instance.
  */
-public interface DelegatingLivenessNode extends LivenessNode {
+public interface DelegatingLivenessNode extends DelegatingLivenessReferent, LivenessNode {
     /**
      * Returns the "real" {@link LivenessNode} instance. When implementing this, care should be taken to match lifecycle
      * of the {@code DelegatingLivenessNode} instance with this instance, as the returned {@code LivenessNode} behaves
@@ -22,6 +21,11 @@ public interface DelegatingLivenessNode extends LivenessNode {
      */
     LivenessNode asLivenessNode();
 
+    @Override
+    default LivenessReferent asLivenessReferent() {
+        return asLivenessNode();
+    }
+
     @Override
     default boolean tryManage(@NotNull LivenessReferent referent) {
         return asLivenessNode().tryManage(referent);
@@ -36,19 +40,4 @@ default boolean tryUnmanage(@NotNull LivenessReferent referent) {
     default boolean tryUnmanage(@NotNull Stream<? extends LivenessReferent> referents) {
         return asLivenessNode().tryUnmanage(referents);
     }
-
-    @Override
-    default boolean tryRetainReference() {
-        return asLivenessNode().tryRetainReference();
-    }
-
-    @Override
-    default void dropReference() {
-        asLivenessNode().dropReference();
-    }
-
-    @Override
-    default WeakReference<? extends LivenessReferent> getWeakReference() {
-        return asLivenessNode().getWeakReference();
-    }
 }
diff --git a/engine/updategraph/src/main/java/io/deephaven/engine/liveness/DelegatingLivenessReferent.java b/engine/updategraph/src/main/java/io/deephaven/engine/liveness/DelegatingLivenessReferent.java
new file mode 100644
index 00000000000..6db44a3f860
--- /dev/null
+++ b/engine/updategraph/src/main/java/io/deephaven/engine/liveness/DelegatingLivenessReferent.java
@@ -0,0 +1,46 @@
+//
+// Copyright (c) 2016-2024 Deephaven Data Labs and Patent Pending
+//
+package io.deephaven.engine.liveness;
+
+import io.deephaven.util.annotations.ReferentialIntegrity;
+
+import java.lang.ref.WeakReference;
+
+/**
+ * Indicates that this class implements LivenessReferent via a member rather than implementing it directly. The real
+ * LivenessReferent is exposed via {@link #asLivenessReferent()}, all other methods delegate to this instance.
+ */
+public interface DelegatingLivenessReferent extends LivenessReferent {
+    /**
+     * Returns the "real" {@link LivenessReferent} instance. When implementing this, care should be taken to match
+     * lifecycle of the {@code DelegatingLivenessReferent} instance with this instance, as the returned
+     * {@code LivenessReferent} behaves as a proxy for {@code this}.
+     *
+     * @return a LivenessReferent to use to manage this object's liveness.
+     */
+    LivenessReferent asLivenessReferent();
+
+    @Override
+    default boolean tryRetainReference() {
+        return asLivenessReferent().tryRetainReference();
+    }
+
+    @Override
+    default void dropReference() {
+        asLivenessReferent().dropReference();
+    }
+
+    @Override
+    default WeakReference<? extends LivenessReferent> getWeakReference() {
+        // Must return a WeakReference to the DelegatingLivenessReferent, not the underlying LivenessReferent
+        return new WeakReference<>(this) {
+            /**
+             * Hold this reference to ensure that any cleanup that requires the strong reachability of our underlying
+             * LivenessReferent's WeakReference happens.
+             */
+            @ReferentialIntegrity
+            private final WeakReference<? extends LivenessReferent> delegate = asLivenessReferent().getWeakReference();
+        };
+    }
+}
diff --git a/engine/updategraph/src/main/java/io/deephaven/engine/liveness/LiveSupplier.java b/engine/updategraph/src/main/java/io/deephaven/engine/liveness/LiveSupplier.java
new file mode 100644
index 00000000000..4343ce4de01
--- /dev/null
+++ b/engine/updategraph/src/main/java/io/deephaven/engine/liveness/LiveSupplier.java
@@ -0,0 +1,12 @@
+//
+// Copyright (c) 2016-2024 Deephaven Data Labs and Patent Pending
+//
+package io.deephaven.engine.liveness;
+
+import java.util.function.Supplier;
+
+/**
+ * Interface for a supplier that continues to "live" while retained by a {@link LivenessManager}.
+ */
+public interface LiveSupplier<TYPE> extends LivenessReferent, Supplier<TYPE> {
+}
diff --git a/engine/updategraph/src/main/java/io/deephaven/engine/liveness/Liveness.java b/engine/updategraph/src/main/java/io/deephaven/engine/liveness/Liveness.java
index 3d3543d3dd9..320e98efcee 100644
--- a/engine/updategraph/src/main/java/io/deephaven/engine/liveness/Liveness.java
+++ b/engine/updategraph/src/main/java/io/deephaven/engine/liveness/Liveness.java
@@ -97,8 +97,8 @@ private Liveness() {}
     /**
      * <p>
      * Determine whether a cached object should be reused, w.r.t. liveness. Null inputs are never safe for reuse. If the
-     * object is a {@link LivenessReferent} and not a non-refreshing {@link DynamicNode}, this method will return the
-     * result of trying to manage object with the top of the current thread's {@link LivenessScopeStack}.
+     * object is a {@link LivenessReferent} and is a refreshing {@link DynamicNode}, this method will return the result
+     * of trying to manage object with the top of the current thread's {@link LivenessScopeStack}.
      *
      * @param object The object
      * @return True if the object did not need management, or if it was successfully managed, false otherwise
diff --git a/engine/updategraph/src/main/java/io/deephaven/engine/liveness/LivenessManager.java b/engine/updategraph/src/main/java/io/deephaven/engine/liveness/LivenessManager.java
index db7c336e985..4bcfdfc4af6 100644
--- a/engine/updategraph/src/main/java/io/deephaven/engine/liveness/LivenessManager.java
+++ b/engine/updategraph/src/main/java/io/deephaven/engine/liveness/LivenessManager.java
@@ -6,6 +6,8 @@
 import io.deephaven.util.annotations.FinalDefault;
 import io.deephaven.util.referencecounting.ReferenceCounted;
 import org.jetbrains.annotations.NotNull;
+import java.util.stream.Collectors;
+import java.util.stream.Stream;
 
 /**
  * Interface for objects that retainReference {@link LivenessReferent}s until such time as they are no longer necessary.
@@ -36,4 +38,55 @@ default void manage(@NotNull final LivenessReferent referent) {
      * @return Whether the referent was in fact added
      */
     boolean tryManage(@NotNull LivenessReferent referent);
+
+    /**
+     * If this manager manages {@code referent} one or more times, drop one such reference. If this manager is also a
+     * {@link LivenessReferent}, then it must also be live.
+     *
+     * @param referent The referent to drop
+     */
+    @FinalDefault
+    default void unmanage(@NotNull LivenessReferent referent) {
+        if (!tryUnmanage(referent)) {
+            throw new LivenessStateException(this + " cannot unmanage " + referent.getReferentDescription());
+        }
+    }
+
+    /**
+     * If this manager manages referent one or more times, drop one such reference. If this manager is also a
+     * {@link LivenessReferent}, then this method is a no-op if {@code this} is not live.
+     *
+     * @param referent The referent to drop
+     * @return If this node is also a {@link LivenessReferent}, whether this node was live and thus in fact tried to
+     *         drop a reference. Else always returns {@code true} if dropping a reference via this method is supported
+     *         by the implementation.
+     */
+    boolean tryUnmanage(@NotNull LivenessReferent referent);
+
+    /**
+     * For each referent in {@code referent}, if this manager manages referent one or more times, drop one such
+     * reference. If this manager is also a {@link LivenessReferent}, then it must also be live.
+     *
+     * @param referents The referents to drop
+     */
+    @SuppressWarnings("unused")
+    @FinalDefault
+    default void unmanage(@NotNull Stream<? extends LivenessReferent> referents) {
+        if (!tryUnmanage(referents)) {
+            throw new LivenessStateException(this + " is no longer live and cannot unmanage " +
+                    referents.map(LivenessReferent::getReferentDescription).collect(Collectors.joining()));
+        }
+    }
+
+    /**
+     * For each referent in referents, if this manager manages referent one or more times, drop one such reference. If
+     * this manager is also a {@link LivenessReferent}, then this method is a no-op if {@code this} is not live.
+     *
+     * @param referents The referents to drop
+     * @return If this node is also a {@link LivenessReferent}, whether this node was live and thus in fact tried to
+     *         drop the references. Else always returns {@code true} if dropping a reference via this method is
+     *         supported by the implementation.
+     */
+    @SuppressWarnings("unused")
+    boolean tryUnmanage(@NotNull Stream<? extends LivenessReferent> referents);
 }
diff --git a/engine/updategraph/src/main/java/io/deephaven/engine/liveness/LivenessNode.java b/engine/updategraph/src/main/java/io/deephaven/engine/liveness/LivenessNode.java
index 5a7c52bbbfd..233608d3c81 100644
--- a/engine/updategraph/src/main/java/io/deephaven/engine/liveness/LivenessNode.java
+++ b/engine/updategraph/src/main/java/io/deephaven/engine/liveness/LivenessNode.java
@@ -3,60 +3,8 @@
 //
 package io.deephaven.engine.liveness;
 
-import io.deephaven.util.annotations.FinalDefault;
-import org.jetbrains.annotations.NotNull;
-
-import java.util.stream.Collectors;
-import java.util.stream.Stream;
-
 /**
  * A {@link LivenessReferent} that is also a {@link LivenessManager}, transitively enforcing liveness on its referents.
  */
 public interface LivenessNode extends LivenessReferent, LivenessManager {
-
-    /**
-     * If this node manages {@code referent} one or more times, drop one such reference. This node must be live.
-     *
-     * @param referent The referent to drop
-     */
-    @FinalDefault
-    default void unmanage(@NotNull LivenessReferent referent) {
-        if (!tryUnmanage(referent)) {
-            throw new LivenessStateException(this + " is no longer live and cannot unmanage " +
-                    referent.getReferentDescription());
-        }
-    }
-
-    /**
-     * If this node is still live and manages referent one or more times, drop one such reference.
-     *
-     * @param referent The referent to drop
-     * @return Whether this node was live and thus in fact tried to drop a reference
-     */
-    boolean tryUnmanage(@NotNull LivenessReferent referent);
-
-    /**
-     * For each referent in {@code referent}, if this node manages referent one or more times, drop one such reference.
-     * This node must be live.
-     *
-     * @param referents The referents to drop
-     */
-    @SuppressWarnings("unused")
-    @FinalDefault
-    default void unmanage(@NotNull Stream<? extends LivenessReferent> referents) {
-        if (!tryUnmanage(referents)) {
-            throw new LivenessStateException(this + " is no longer live and cannot unmanage " +
-                    referents.map(LivenessReferent::getReferentDescription).collect(Collectors.joining()));
-        }
-    }
-
-    /**
-     * For each referent in referents, if this node is still live and manages referent one or more times, drop one such
-     * reference.
-     *
-     * @param referents The referents to drop
-     * @return Whether this node was live and thus in fact tried to drop a reference
-     */
-    @SuppressWarnings("unused")
-    boolean tryUnmanage(@NotNull Stream<? extends LivenessReferent> referents);
 }
diff --git a/engine/updategraph/src/main/java/io/deephaven/engine/liveness/LivenessScopeStack.java b/engine/updategraph/src/main/java/io/deephaven/engine/liveness/LivenessScopeStack.java
index 042738df654..fd3f85cef04 100644
--- a/engine/updategraph/src/main/java/io/deephaven/engine/liveness/LivenessScopeStack.java
+++ b/engine/updategraph/src/main/java/io/deephaven/engine/liveness/LivenessScopeStack.java
@@ -28,7 +28,7 @@ public class LivenessScopeStack {
     private static final ThreadLocal<LivenessManager> THREAD_BASE_MANAGER =
             ThreadLocal.withInitial(PermanentLivenessManager::new);
 
-    private final Deque<LivenessScope> stack = new ArrayDeque<>();
+    private final Deque<LivenessManager> stack = new ArrayDeque<>();
 
     private LivenessScopeStack() {}
 
@@ -38,7 +38,7 @@ private LivenessScopeStack() {}
      *
      * @param scope The scope
      */
-    public static void push(@NotNull final LivenessScope scope) {
+    public static void push(@NotNull final LivenessManager scope) {
         THREAD_STACK.get().pushInternal(scope);
     }
 
@@ -50,7 +50,7 @@ public static void push(@NotNull final LivenessScope scope) {
      *
      * @param scope The scope
      */
-    public static void pop(@NotNull final LivenessScope scope) {
+    public static void pop(@NotNull final LivenessManager scope) {
         THREAD_STACK.get().popInternal(scope);
     }
 
@@ -76,11 +76,11 @@ public static LivenessManager peek() {
      *
      * @param scope The scope
      * @param releaseOnClose Whether the scope should be released when the result is closed
-     * @return A {@link SafeCloseable} whose {@link SafeCloseable#close()} method invokes {@link #pop(LivenessScope)}
+     * @return A {@link SafeCloseable} whose {@link SafeCloseable#close()} method invokes {@link #pop(LivenessManager)}
      *         for the scope (followed by {@link LivenessScope#release()} if releaseOnClose is true)
      */
     @NotNull
-    public static SafeCloseable open(@NotNull final LivenessScope scope, final boolean releaseOnClose) {
+    public static SafeCloseable open(@NotNull final ReleasableLivenessManager scope, final boolean releaseOnClose) {
         push(scope);
         return releaseOnClose ? new PopAndReleaseOnClose(scope) : new PopOnClose(scope);
     }
@@ -93,7 +93,7 @@ public static SafeCloseable open(@NotNull final LivenessScope scope, final boole
      * This is useful enclosing a series of query engine actions whose results must be explicitly retained externally in
      * order to preserve liveness.
      *
-     * @return A {@link SafeCloseable} whose {@link SafeCloseable#close()} method invokes {@link #pop(LivenessScope)}
+     * @return A {@link SafeCloseable} whose {@link SafeCloseable#close()} method invokes {@link #pop(LivenessManager)}
      *         for the scope, followed by {@link LivenessScope#release()}
      */
     @NotNull
@@ -103,18 +103,18 @@ public static SafeCloseable open() {
         return new PopAndReleaseOnClose(scope);
     }
 
-    private void pushInternal(@NotNull final LivenessScope scope) {
+    private void pushInternal(@NotNull final LivenessManager scope) {
         if (Liveness.DEBUG_MODE_ENABLED) {
             Liveness.log.info().append("LivenessDebug: Pushing scope ").append(Utils.REFERENT_FORMATTER, scope).endl();
         }
         stack.push(scope);
     }
 
-    private void popInternal(@NotNull final LivenessScope scope) {
+    private void popInternal(@NotNull final LivenessManager scope) {
         if (Liveness.DEBUG_MODE_ENABLED) {
             Liveness.log.info().append("LivenessDebug: Popping scope ").append(Utils.REFERENT_FORMATTER, scope).endl();
         }
-        final LivenessScope peeked = stack.peekFirst();
+        final LivenessManager peeked = stack.peekFirst();
         if (peeked != scope) {
             throw new IllegalStateException(
                     "Caller requested to pop " + scope + " but the top of the scope stack is " + peeked);
@@ -124,15 +124,15 @@ private void popInternal(@NotNull final LivenessScope scope) {
 
     @NotNull
     private LivenessManager peekInternal() {
-        final LivenessScope peeked = stack.peekFirst();
+        final LivenessManager peeked = stack.peekFirst();
         return peeked != null ? peeked : THREAD_BASE_MANAGER.get();
     }
 
     private static final class PopOnClose implements SafeCloseable {
 
-        private final LivenessScope scope;
+        private final LivenessManager scope;
 
-        private PopOnClose(@NotNull final LivenessScope scope) {
+        private PopOnClose(@NotNull final LivenessManager scope) {
             this.scope = scope;
         }
 
@@ -144,9 +144,9 @@ public void close() {
 
     private static final class PopAndReleaseOnClose implements SafeCloseable {
 
-        private final LivenessScope scope;
+        private final ReleasableLivenessManager scope;
 
-        private PopAndReleaseOnClose(@NotNull final LivenessScope scope) {
+        private PopAndReleaseOnClose(@NotNull final ReleasableLivenessManager scope) {
             this.scope = scope;
         }
 
diff --git a/engine/updategraph/src/main/java/io/deephaven/engine/liveness/PermanentLivenessManager.java b/engine/updategraph/src/main/java/io/deephaven/engine/liveness/PermanentLivenessManager.java
index d4e5fca2986..16c61be5e40 100644
--- a/engine/updategraph/src/main/java/io/deephaven/engine/liveness/PermanentLivenessManager.java
+++ b/engine/updategraph/src/main/java/io/deephaven/engine/liveness/PermanentLivenessManager.java
@@ -6,6 +6,8 @@
 import io.deephaven.util.Utils;
 import org.jetbrains.annotations.NotNull;
 
+import java.util.stream.Stream;
+
 /**
  * <p>
  * A {@link LivenessManager} implementation that will never release its referents.
@@ -31,4 +33,14 @@ public boolean tryManage(@NotNull LivenessReferent referent) {
         }
         return true;
     }
+
+    @Override
+    public boolean tryUnmanage(@NotNull LivenessReferent referent) {
+        throw new UnsupportedOperationException("PermanentLivenessManager cannot unmanage referents");
+    }
+
+    @Override
+    public boolean tryUnmanage(@NotNull Stream<? extends LivenessReferent> referents) {
+        throw new UnsupportedOperationException("PermanentLivenessManager cannot unmanage referents");
+    }
 }
diff --git a/engine/updategraph/src/main/java/io/deephaven/engine/liveness/ReferenceCountedLivenessNode.java b/engine/updategraph/src/main/java/io/deephaven/engine/liveness/ReferenceCountedLivenessNode.java
index 450a8a466b5..1625c522cca 100644
--- a/engine/updategraph/src/main/java/io/deephaven/engine/liveness/ReferenceCountedLivenessNode.java
+++ b/engine/updategraph/src/main/java/io/deephaven/engine/liveness/ReferenceCountedLivenessNode.java
@@ -3,6 +3,7 @@
 //
 package io.deephaven.engine.liveness;
 
+import io.deephaven.util.SafeCloseable;
 import io.deephaven.util.Utils;
 import io.deephaven.util.annotations.VisibleForTesting;
 import org.jetbrains.annotations.NotNull;
@@ -107,7 +108,8 @@ public final boolean tryUnmanage(@NotNull final Stream<? extends LivenessReferen
 
     @Override
     public final void onReferenceCountAtZero() {
-        super.onReferenceCountAtZero();
-        tracker.ensureReferencesDropped();
+        try (final SafeCloseable ignored = tracker.enqueueReferencesForDrop()) {
+            super.onReferenceCountAtZero();
+        }
     }
 }
diff --git a/engine/updategraph/src/main/java/io/deephaven/engine/liveness/ReferenceCountedLivenessReferent.java b/engine/updategraph/src/main/java/io/deephaven/engine/liveness/ReferenceCountedLivenessReferent.java
index 1722a6a4a4d..9462cc96a2f 100644
--- a/engine/updategraph/src/main/java/io/deephaven/engine/liveness/ReferenceCountedLivenessReferent.java
+++ b/engine/updategraph/src/main/java/io/deephaven/engine/liveness/ReferenceCountedLivenessReferent.java
@@ -6,6 +6,7 @@
 import io.deephaven.util.Utils;
 import io.deephaven.util.referencecounting.ReferenceCounted;
 
+import javax.annotation.OverridingMethodsMustInvokeSuper;
 import java.lang.ref.WeakReference;
 
 /**
@@ -44,6 +45,7 @@ public WeakReference<? extends LivenessReferent> getWeakReference() {
      * <p>
      * This is intended to only ever be used as a side effect of decreasing the reference count to 0.
      */
+    @OverridingMethodsMustInvokeSuper
     protected void destroy() {}
 
     @Override
diff --git a/engine/updategraph/src/main/java/io/deephaven/engine/liveness/RetainedReferenceTracker.java b/engine/updategraph/src/main/java/io/deephaven/engine/liveness/RetainedReferenceTracker.java
index 9104338fefd..67a849aeb30 100644
--- a/engine/updategraph/src/main/java/io/deephaven/engine/liveness/RetainedReferenceTracker.java
+++ b/engine/updategraph/src/main/java/io/deephaven/engine/liveness/RetainedReferenceTracker.java
@@ -4,13 +4,13 @@
 package io.deephaven.engine.liveness;
 
 import io.deephaven.base.cache.RetentionCache;
-import io.deephaven.base.reference.CleanupReference;
 import io.deephaven.base.reference.WeakCleanupReference;
 import io.deephaven.engine.util.reference.CleanupReferenceProcessorInstance;
 import io.deephaven.hash.KeyedObjectHashMap;
 import io.deephaven.hash.KeyedObjectKey;
 import io.deephaven.internal.log.LoggerFactory;
 import io.deephaven.io.logger.Logger;
+import io.deephaven.util.SafeCloseable;
 import io.deephaven.util.Utils;
 import io.deephaven.util.datastructures.hash.KeyIdentityKeyedObjectKey;
 import org.jetbrains.annotations.NotNull;
@@ -30,7 +30,7 @@
  * <p>
  * This cleanup process is initiated one of two ways:
  * <ol>
- * <li>The manager invokes it directly via {@link #ensureReferencesDropped()} because it is releasing all of its
+ * <li>The manager invokes it directly via {@link #enqueueReferencesForDrop()} because it is releasing all of its
  * retained references.</li>
  * <li>A {@link io.deephaven.util.reference.CleanupReferenceProcessor} or similar code invokes {@link #cleanup()} after
  * the manager is garbage-collected.</li>
@@ -46,10 +46,8 @@ final class RetainedReferenceTracker<TYPE extends LivenessManager> extends WeakC
 
     private static final AtomicInteger outstandingCount = new AtomicInteger(0);
 
-    private static final ThreadLocal<Queue<WeakReference<? extends LivenessReferent>>> tlPendingDropReferences =
-            new ThreadLocal<>();
-    private static final ThreadLocal<SoftReference<Queue<WeakReference<? extends LivenessReferent>>>> tlSavedQueueReference =
-            new ThreadLocal<>();
+    private static final ThreadLocal<PendingDropsTracker> tlPendingDropsTracker = new ThreadLocal<>();
+    private static final ThreadLocal<SoftReference<PendingDropsTracker>> tlSavedTrackerReference = new ThreadLocal<>();
 
     private static final Logger log = LoggerFactory.getLogger(RetainedReferenceTracker.class);
 
@@ -83,11 +81,11 @@ public String toString() {
 
     /**
      * Add a {@link LivenessReferent} to drop a reference to on {@link #cleanup()} or
-     * {@link #ensureReferencesDropped()}. This is not permitted if {@link #cleanup()} or
-     * {@link #ensureReferencesDropped()} has already been invoked.
+     * {@link #enqueueReferencesForDrop()}. This is not permitted if {@link #cleanup()} or
+     * {@link #enqueueReferencesForDrop()} has already been invoked.
      *
      * @param referent The referent to drop on cleanup
-     * @throws LivenessStateException If {@link #cleanup()} or {@link #ensureReferencesDropped()} has already been
+     * @throws LivenessStateException If {@link #cleanup()} or {@link #enqueueReferencesForDrop()} has already been
      *         invoked
      */
     synchronized void addReference(@NotNull final LivenessReferent referent) throws LivenessStateException {
@@ -98,12 +96,12 @@ synchronized void addReference(@NotNull final LivenessReferent referent) throws
     /**
      * <p>
      * Remove at most one existing reference to referent from this tracker, so that it will no longer be dropped on
-     * {@link #cleanup()} or {@link #ensureReferencesDropped()}, and drop it immediately.
+     * {@link #cleanup()} or {@link #enqueueReferencesForDrop()}, and drop it immediately.
      * <p>
-     * This is not permitted if {@link #cleanup()} or {@link #ensureReferencesDropped()} has already been invoked.
+     * This is not permitted if {@link #cleanup()} or {@link #enqueueReferencesForDrop()} has already been invoked.
      *
      * @param referent The referent to remove
-     * @throws LivenessStateException If {@link #cleanup()} or {@link #ensureReferencesDropped()} has already been
+     * @throws LivenessStateException If {@link #cleanup()} or {@link #enqueueReferencesForDrop()} has already been
      *         invoked
      */
     synchronized void dropReference(@NotNull final LivenessReferent referent) throws LivenessStateException {
@@ -114,12 +112,12 @@ synchronized void dropReference(@NotNull final LivenessReferent referent) throws
     /**
      * <p>
      * Remove at most one existing reference to each input referent from this tracker, so that it will no longer be
-     * dropped on {@link #cleanup()} or {@link #ensureReferencesDropped()}, and drop it immediately.
+     * dropped on {@link #cleanup()} or {@link #enqueueReferencesForDrop()}, and drop it immediately.
      * <p>
-     * This is not permitted if {@link #cleanup()} or {@link #ensureReferencesDropped()} has already been invoked.
+     * This is not permitted if {@link #cleanup()} or {@link #enqueueReferencesForDrop()} has already been invoked.
      *
      * @param referents The referents to remove
-     * @throws LivenessStateException If {@link #cleanup()} or {@link #ensureReferencesDropped()} has already been
+     * @throws LivenessStateException If {@link #cleanup()} or {@link #enqueueReferencesForDrop()} has already been
      *         invoked
      */
     synchronized void dropReferences(@NotNull final Stream<? extends LivenessReferent> referents)
@@ -133,23 +131,15 @@ synchronized void dropReferences(@NotNull final Stream<? extends LivenessReferen
      * Move all {@link LivenessReferent}s previously added to this tracker to other, which becomes responsible for
      * dropping them.
      * <p>
-     * This is not permitted if {@link #cleanup()} or {@link #ensureReferencesDropped()} has already been invoked.
+     * This is not permitted if {@link #cleanup()} or {@link #enqueueReferencesForDrop()} has already been invoked.
      *
      * @param other The other tracker
-     * @throws LivenessStateException If {@link #cleanup()} or {@link #ensureReferencesDropped()} has already been
+     * @throws LivenessStateException If {@link #cleanup()} or {@link #enqueueReferencesForDrop()} has already been
      *         invoked
      */
     synchronized void transferReferencesTo(@NotNull final RetainedReferenceTracker<?> other) {
         checkOutstanding();
-        for (final WeakReference<? extends LivenessReferent> retainedReference : impl) {
-            final LivenessReferent retained = retainedReference.get();
-            if (retained != null) {
-                other.addReference(retained);
-            } else if (retainedReference instanceof CleanupReference) {
-                ((CleanupReference<?>) retainedReference).cleanup();
-            }
-        }
-        impl.clear();
+        impl.transferReferencesTo(other);
     }
 
     /**
@@ -157,9 +147,9 @@ synchronized void transferReferencesTo(@NotNull final RetainedReferenceTracker<?
      * Remove all {@link LivenessReferent}s previously added to this tracker, unless they have been transferred, without
      * dropping them. Uses to make references "permanent".
      * <p>
-     * This is not permitted if {@link #cleanup()} or {@link #ensureReferencesDropped()} has already been invoked.
+     * This is not permitted if {@link #cleanup()} or {@link #enqueueReferencesForDrop()} has already been invoked.
      *
-     * @throws LivenessStateException If {@link #cleanup()} or {@link #ensureReferencesDropped()} has already been
+     * @throws LivenessStateException If {@link #cleanup()} or {@link #enqueueReferencesForDrop()} has already been
      *         invoked
      */
     synchronized void makeReferencesPermanent() {
@@ -174,23 +164,39 @@ private void checkOutstanding() {
         }
     }
 
+    /**
+     * Ensure that references are dropped even if this RetainedReferenceTracker's manager is garbage-collected. As a
+     * last resort, this will be invoked by the {@link CleanupReferenceProcessorInstance#LIVENESS liveness cleanup
+     * reference processor}, but it may also be invoked by any other RetainedReferenceTracker that observes that this
+     * RetainedReferenceTracker no longer refers to its manager. This method is idempotent.
+     */
     @Override
     public void cleanup() {
-        ensureReferencesDroppedInternal(true);
+        // noinspection EmptyTryBlock
+        try (final SafeCloseable ignored = ensureReferencesDroppedInternal(true)) {
+        }
     }
 
     /**
      * <p>
-     * Initiate the idempotent cleanup process. This will drop all retained references if their referents still exist.
-     * No new references may be added to or dropped from this tracker.
+     * Initiate the idempotent cleanup process. This will enqueue all retained references to be dropped if their
+     * referents still exist. No new references may be added to or dropped from this tracker.
+     * 
+     * @apiNote This should be invoked in proactive cleanup scenarios before any destructive cleanup operations are
+     *          undertaken, in order to allow the system to record the state of the retention graph and propagate
+     *          proactive cleanup as far as possible.
+     *
+     * @return A {@link SafeCloseable} that will process the queued drops if necessary. Must be called exactly once,
+     *         after any other desired cleanup has been performed.
      */
-    void ensureReferencesDropped() {
-        ensureReferencesDroppedInternal(false);
+    SafeCloseable enqueueReferencesForDrop() {
+        return ensureReferencesDroppedInternal(false);
     }
 
-    private void ensureReferencesDroppedInternal(final boolean onCleanup) {
+    private SafeCloseable ensureReferencesDroppedInternal(final boolean onCleanup) {
         if (!OUTSTANDING_STATE_UPDATER.compareAndSet(this, OUTSTANDING, NOT_OUTSTANDING)) {
-            return;
+            return () -> {
+            };
         }
         if (Liveness.DEBUG_MODE_ENABLED || (onCleanup && Liveness.CLEANUP_LOG_ENABLED)) {
             Liveness.log.info().append("LivenessDebug: Ensuring references dropped ")
@@ -199,43 +205,38 @@ private void ensureReferencesDroppedInternal(final boolean onCleanup) {
         }
         outstandingCount.decrementAndGet();
 
-        Queue<WeakReference<? extends LivenessReferent>> pendingDropReferences = tlPendingDropReferences.get();
-        final boolean processDrops = pendingDropReferences == null;
+        PendingDropsTracker pendingDropsTracker = tlPendingDropsTracker.get();
+        final boolean processDrops = pendingDropsTracker == null;
         if (processDrops) {
-            final SoftReference<Queue<WeakReference<? extends LivenessReferent>>> savedQueueReference =
-                    tlSavedQueueReference.get();
-            if (savedQueueReference == null || (pendingDropReferences = savedQueueReference.get()) == null) {
-                tlSavedQueueReference.set(new SoftReference<>(pendingDropReferences = new ArrayDeque<>()));
+            final SoftReference<PendingDropsTracker> savedTrackerReference = tlSavedTrackerReference.get();
+            if (savedTrackerReference == null || (pendingDropsTracker = savedTrackerReference.get()) == null) {
+                tlSavedTrackerReference.set(new SoftReference<>(pendingDropsTracker = new PendingDropsTracker()));
             }
-            tlPendingDropReferences.set(pendingDropReferences);
+            tlPendingDropsTracker.set(pendingDropsTracker);
         }
 
         synchronized (this) {
-            impl.forEach(pendingDropReferences::add);
-            impl.clear();
+            impl.enqueueReferencesForDrop(pendingDropsTracker, onCleanup);
         }
 
         if (processDrops) {
-            try {
-                WeakReference<? extends LivenessReferent> pendingDropReference;
-                while ((pendingDropReference = pendingDropReferences.poll()) != null) {
-                    final LivenessReferent pendingDrop = pendingDropReference.get();
-                    if (pendingDrop != null) {
-                        pendingDrop.dropReference();
-                    } else if (pendingDropReference instanceof CleanupReference) {
-                        ((CleanupReference<?>) pendingDropReference).cleanup();
-                    }
+            final PendingDropsTracker finalPendingDropsTracker = pendingDropsTracker;
+            return () -> {
+                try {
+                    finalPendingDropsTracker.dropAll();
+                } finally {
+                    tlPendingDropsTracker.remove();
                 }
-            } finally {
-                tlPendingDropReferences.set(null);
-            }
+            };
         }
+        return () -> {
+        };
     }
 
     /**
      * <p>
      * Get the number of outstanding trackers (instances of RetainedReferenceTracker that have not had their
-     * {@link #cleanup()} or {@link #ensureReferencesDropped()} method called).
+     * {@link #cleanup()} or {@link #enqueueReferencesForDrop()} method called).
      * <p>
      * Note that this number represents the liveness system's current knowledge of the number of live references in the
      * system.
@@ -246,14 +247,17 @@ static int getOutstandingCount() {
         return outstandingCount.get();
     }
 
-    private interface Impl extends Iterable<WeakReference<? extends LivenessReferent>> {
+    private interface Impl {
+
         void add(@NotNull final LivenessReferent referent);
 
         void drop(@NotNull final LivenessReferent referent);
 
         void drop(@NotNull final Stream<? extends LivenessReferent> referents);
 
-        void clear();
+        void enqueueReferencesForDrop(@NotNull PendingDropsTracker tracker, boolean onCleanup);
+
+        void transferReferencesTo(@NotNull RetainedReferenceTracker<?> other);
 
         void makePermanent();
     }
@@ -286,8 +290,8 @@ public void drop(@NotNull final LivenessReferent referent) {
                     retainedReferences.set(rri, retainedReferences.get(rrLast));
                 }
                 retainedReferences.remove(rrLast--);
-                if (cleared && retainedReference instanceof CleanupReference) {
-                    ((CleanupReference<?>) retainedReference).cleanup();
+                if (cleared && retainedReference instanceof RetainedReferenceTracker) {
+                    ((RetainedReferenceTracker<?>) retainedReference).cleanup();
                 }
                 if (found) {
                     referent.dropReference();
@@ -298,16 +302,17 @@ public void drop(@NotNull final LivenessReferent referent) {
 
         @Override
         public void drop(@NotNull final Stream<? extends LivenessReferent> referents) {
-            final KeyedObjectHashMap<LivenessReferent, DropState> referentsToRemove =
-                    new KeyedObjectHashMap<>(DropState.KEYED_OBJECT_KEY);
-            referents.forEach(referent -> referentsToRemove.putIfAbsent(referent, DropState::new).incrementDrops());
+            final KeyedObjectHashMap<LivenessReferent, DropRequestState> referentsToRemove =
+                    new KeyedObjectHashMap<>(DropRequestState.KEYED_OBJECT_KEY);
+            referents.forEach(
+                    referent -> referentsToRemove.putIfAbsent(referent, DropRequestState::new).incrementDrops());
             if (referentsToRemove.isEmpty()) {
                 return;
             }
             for (int rrLast = retainedReferences.size() - 1, rri = 0; rri <= rrLast;) {
                 final WeakReference<? extends LivenessReferent> retainedReference = retainedReferences.get(rri);
                 final boolean cleared;
-                final DropState foundState;
+                final DropRequestState foundState;
                 {
                     final LivenessReferent retained = retainedReference.get();
                     cleared = retained == null;
@@ -321,8 +326,8 @@ public void drop(@NotNull final Stream<? extends LivenessReferent> referents) {
                     retainedReferences.set(rri, retainedReferences.get(rrLast));
                 }
                 retainedReferences.remove(rrLast--);
-                if (cleared && retainedReference instanceof CleanupReference) {
-                    ((CleanupReference<?>) retainedReference).cleanup();
+                if (cleared && retainedReference instanceof RetainedReferenceTracker) {
+                    ((RetainedReferenceTracker<?>) retainedReference).cleanup();
                 }
                 if (foundState != null && foundState.doDrop()) {
                     referentsToRemove.remove(foundState.referent);
@@ -334,19 +339,31 @@ public void drop(@NotNull final Stream<? extends LivenessReferent> referents) {
         }
 
         @Override
-        public void clear() {
+        public void enqueueReferencesForDrop(@NotNull final PendingDropsTracker tracker, final boolean onCleanup) {
+            if (onCleanup) {
+                retainedReferences.forEach(tracker::addOnCleanup);
+            } else {
+                retainedReferences.forEach(tracker::addOnEnsureDropped);
+            }
             retainedReferences.clear();
         }
 
         @Override
-        public void makePermanent() {
+        public void transferReferencesTo(@NotNull final RetainedReferenceTracker<?> other) {
+            retainedReferences.forEach((final WeakReference<? extends LivenessReferent> retainedReference) -> {
+                final LivenessReferent retained = retainedReference.get();
+                if (retained != null) {
+                    other.addReference(retained);
+                } else if (retainedReference instanceof RetainedReferenceTracker) {
+                    ((RetainedReferenceTracker<?>) retainedReference).cleanup();
+                }
+            });
             retainedReferences.clear();
         }
 
-        @NotNull
         @Override
-        public Iterator<WeakReference<? extends LivenessReferent>> iterator() {
-            return retainedReferences.iterator();
+        public void makePermanent() {
+            retainedReferences.clear();
         }
     }
 
@@ -379,15 +396,16 @@ public void drop(@NotNull final LivenessReferent referent) {
 
         @Override
         public void drop(@NotNull final Stream<? extends LivenessReferent> referents) {
-            final KeyedObjectHashMap<LivenessReferent, DropState> referentsToRemove =
-                    new KeyedObjectHashMap<>(DropState.KEYED_OBJECT_KEY);
-            referents.forEach(referent -> referentsToRemove.putIfAbsent(referent, DropState::new).incrementDrops());
+            final KeyedObjectHashMap<LivenessReferent, DropRequestState> referentsToRemove =
+                    new KeyedObjectHashMap<>(DropRequestState.KEYED_OBJECT_KEY);
+            referents.forEach(
+                    referent -> referentsToRemove.putIfAbsent(referent, DropRequestState::new).incrementDrops());
             if (referentsToRemove.isEmpty()) {
                 return;
             }
             for (int rLast = retained.size() - 1, ri = 0; ri <= rLast;) {
                 final LivenessReferent current = retained.get(ri);
-                final DropState foundState = referentsToRemove.get(current);
+                final DropRequestState foundState = referentsToRemove.get(current);
                 if (foundState != null) {
                     if (ri != rLast) {
                         retained.set(ri, retained.get(rLast));
@@ -406,44 +424,39 @@ public void drop(@NotNull final Stream<? extends LivenessReferent> referents) {
         }
 
         @Override
-        public void clear() {
+        public void enqueueReferencesForDrop(@NotNull final PendingDropsTracker tracker, final boolean onCleanup) {
+            if (onCleanup) {
+                retained.forEach(tracker::addOnCleanup);
+            } else {
+                retained.forEach(tracker::addOnEnsureDropped);
+            }
             retained.clear();
         }
 
         @Override
-        public void makePermanent() {
-            // See LivenessScope.transferTo: This is currently unreachable code, but implemented for completeness
-            retained.forEach(permanentReferences::retain);
+        public void transferReferencesTo(@NotNull final RetainedReferenceTracker<?> other) {
+            retained.forEach(other::addReference);
             retained.clear();
         }
 
-        @NotNull
         @Override
-        public Iterator<WeakReference<? extends LivenessReferent>> iterator() {
-            return new Iterator<>() {
-
-                private final Iterator<LivenessReferent> internal = retained.iterator();
-
-                @Override
-                public boolean hasNext() {
-                    return internal.hasNext();
-                }
-
-                @Override
-                public WeakReference<? extends LivenessReferent> next() {
-                    return internal.next().getWeakReference();
-                }
-            };
+        public void makePermanent() {
+            // See LivenessScope.transferTo: This is currently unreachable code, but implemented for completeness
+            retained.forEach(permanentReferences::retain);
+            retained.clear();
         }
     }
 
-    private static final class DropState {
+    /**
+     * A state that tracks the number of times a referent should be dropped.
+     */
+    private static final class DropRequestState {
 
-        private static final KeyedObjectKey<LivenessReferent, DropState> KEYED_OBJECT_KEY =
+        private static final KeyedObjectKey<LivenessReferent, DropRequestState> KEYED_OBJECT_KEY =
                 new KeyIdentityKeyedObjectKey<>() {
                     @Override
-                    public LivenessReferent getKey(@NotNull final DropState dropState) {
-                        return dropState.referent;
+                    public LivenessReferent getKey(@NotNull final DropRequestState dropRequestState) {
+                        return dropRequestState.referent;
                     }
                 };
 
@@ -451,7 +464,7 @@ public LivenessReferent getKey(@NotNull final DropState dropState) {
 
         private int timesToDrop;
 
-        private DropState(@NotNull final LivenessReferent referent) {
+        private DropRequestState(@NotNull final LivenessReferent referent) {
             this.referent = referent;
         }
 
@@ -464,4 +477,63 @@ boolean doDrop() {
             return --timesToDrop == 0;
         }
     }
+
+    /**
+     * A tracker for drops that are pending on the current thread, used to avoid deep recursion when ensuring that
+     * references are dropped.
+     */
+    private static final class PendingDropsTracker {
+
+        private final Queue<Object> pendingDrops = new ArrayDeque<>();
+
+        void addOnCleanup(@NotNull final WeakReference<? extends LivenessReferent> reference) {
+            /*
+             * Enqueue the WeakReference, taking no position w.r.t. reachability of the referent.
+             */
+            pendingDrops.add(reference);
+        }
+
+        void addOnEnsureDropped(@NotNull final WeakReference<? extends LivenessReferent> reference) {
+            /*
+             * Preserve reachability from the time of invocation. This is intended to make sure that proactive cleanup
+             * respects the state of the world at the time it was initiated.
+             */
+            final LivenessReferent referent = reference.get();
+            pendingDrops.add(referent == null ? reference : referent);
+        }
+
+        void addOnCleanup(@NotNull final LivenessReferent referent) {
+            /*
+             * We enqueue the WeakReference, rather than the LivenessReferent itself. Since our manager has been
+             * collected, it's inappropriate to enforce strong reachability to its references.
+             */
+            pendingDrops.add(referent.getWeakReference());
+        }
+
+        void addOnEnsureDropped(@NotNull final LivenessReferent referent) {
+            /*
+             * We enqueue the LivenessReferent itself, rather than a WeakReference. Since the manager is explicitly
+             * ensuring that we drop its references, we should preserve reachability from the time of invocation.
+             */
+            pendingDrops.add(referent);
+        }
+
+        void dropAll() {
+            Object next;
+            while ((next = pendingDrops.poll()) != null) {
+                // noinspection unchecked
+                final WeakReference<? extends LivenessReferent> pendingDropReference = next instanceof WeakReference
+                        ? (WeakReference<? extends LivenessReferent>) next
+                        : null;
+                final LivenessReferent pendingDrop = pendingDropReference == null
+                        ? (LivenessReferent) next
+                        : pendingDropReference.get();
+                if (pendingDrop != null) {
+                    pendingDrop.dropReference();
+                } else if (pendingDropReference instanceof RetainedReferenceTracker) {
+                    ((RetainedReferenceTracker<?>) pendingDropReference).cleanup();
+                }
+            }
+        }
+    }
 }
diff --git a/engine/updategraph/src/main/java/io/deephaven/engine/liveness/SingletonLivenessManager.java b/engine/updategraph/src/main/java/io/deephaven/engine/liveness/SingletonLivenessManager.java
index ed05a356008..d047b0c9339 100644
--- a/engine/updategraph/src/main/java/io/deephaven/engine/liveness/SingletonLivenessManager.java
+++ b/engine/updategraph/src/main/java/io/deephaven/engine/liveness/SingletonLivenessManager.java
@@ -8,6 +8,7 @@
 
 import java.lang.ref.WeakReference;
 import java.util.concurrent.atomic.AtomicReferenceFieldUpdater;
+import java.util.stream.Stream;
 
 /**
  * {@link ReleasableLivenessManager} to manage exactly one object, passed at construction time or managed later.
@@ -61,6 +62,32 @@ public final boolean tryManage(@NotNull LivenessReferent referent) {
         return true;
     }
 
+    /**
+     * @inheritDoc
+     * @implNote This is equivalent to {@link #release()} if {@code referent} is the one managed by this manager.
+     */
+    @Override
+    public boolean tryUnmanage(@NotNull LivenessReferent referent) {
+        final WeakReference<? extends LivenessReferent> localRetainedReference;
+        if (!Liveness.REFERENCE_TRACKING_DISABLED
+                && (localRetainedReference = retainedReference) != null
+                && localRetainedReference.get() == referent) {
+            release();
+        }
+        return true;
+    }
+
+    /**
+     * @inheritDoc
+     * @implNote This is equivalent to {@link #release()} if any element of {@code referents} is the one managed by this
+     *           manager.
+     */
+    @Override
+    public boolean tryUnmanage(@NotNull Stream<? extends LivenessReferent> referents) {
+        referents.forEach(this::tryUnmanage);
+        return true;
+    }
+
     @Override
     public final void release() {
         if (Liveness.REFERENCE_TRACKING_DISABLED) {
diff --git a/engine/updategraph/src/main/java/io/deephaven/engine/liveness/StandaloneLivenessManager.java b/engine/updategraph/src/main/java/io/deephaven/engine/liveness/StandaloneLivenessManager.java
new file mode 100644
index 00000000000..32aa80efb0a
--- /dev/null
+++ b/engine/updategraph/src/main/java/io/deephaven/engine/liveness/StandaloneLivenessManager.java
@@ -0,0 +1,90 @@
+//
+// Copyright (c) 2016-2024 Deephaven Data Labs and Patent Pending
+//
+package io.deephaven.engine.liveness;
+
+import io.deephaven.base.log.LogOutput;
+import io.deephaven.base.log.LogOutputAppendable;
+import io.deephaven.util.Utils;
+import io.deephaven.util.annotations.VisibleForTesting;
+import org.jetbrains.annotations.NotNull;
+
+import java.util.stream.Stream;
+
+/**
+ * Simple {@link LivenessManager} implementation.
+ */
+public class StandaloneLivenessManager implements LivenessManager, LogOutputAppendable {
+
+    final boolean enforceStrongReachability;
+
+    transient RetainedReferenceTracker<StandaloneLivenessManager> tracker;
+
+    /**
+     * @param enforceStrongReachability Whether this {@link LivenessManager} should maintain strong references to its
+     *        referents
+     */
+    @SuppressWarnings("WeakerAccess") // Needed in order to deserialize Serializable subclass instances
+    public StandaloneLivenessManager(final boolean enforceStrongReachability) {
+        this.enforceStrongReachability = enforceStrongReachability;
+        initializeTransientFieldsForLiveness();
+    }
+
+    /**
+     * Package-private for {@link java.io.Serializable} sub-classes to use in <code>readObject</code> <em>only</em>.
+     * Public to allow unit tests in another package to work around mock issues where the constructor is never invoked.
+     */
+    @VisibleForTesting
+    public final void initializeTransientFieldsForLiveness() {
+        if (Liveness.REFERENCE_TRACKING_DISABLED) {
+            return;
+        }
+        tracker = new RetainedReferenceTracker<>(this, enforceStrongReachability);
+        if (Liveness.DEBUG_MODE_ENABLED) {
+            Liveness.log.info().append("LivenessDebug: Created tracker ").append(Utils.REFERENT_FORMATTER, tracker)
+                    .append(" for ").append(Utils.REFERENT_FORMATTER, this).endl();
+        }
+    }
+
+    @Override
+    public final boolean tryManage(@NotNull final LivenessReferent referent) {
+        if (Liveness.REFERENCE_TRACKING_DISABLED) {
+            return true;
+        }
+        if (Liveness.DEBUG_MODE_ENABLED) {
+            Liveness.log.info().append("LivenessDebug: ").append(this).append(" managing ")
+                    .append(referent.getReferentDescription()).endl();
+        }
+        if (!referent.tryRetainReference()) {
+            return false;
+        }
+        tracker.addReference(referent);
+        return true;
+    }
+
+    @Override
+    public final boolean tryUnmanage(@NotNull final LivenessReferent referent) {
+        if (Liveness.REFERENCE_TRACKING_DISABLED) {
+            return true;
+        }
+        tracker.dropReference(referent);
+        return true;
+    }
+
+    @Override
+    public final boolean tryUnmanage(@NotNull final Stream<? extends LivenessReferent> referents) {
+        if (Liveness.REFERENCE_TRACKING_DISABLED) {
+            return true;
+        }
+        tracker.dropReferences(referents);
+        return true;
+    }
+
+    @Override
+    public LogOutput append(LogOutput logOutput) {
+        return logOutput
+                .append("StandaloneLivenessManager{enforceStrongReachability=")
+                .append(enforceStrongReachability)
+                .append("}");
+    }
+}
diff --git a/engine/updategraph/src/main/java/io/deephaven/engine/updategraph/UpdateGraph.java b/engine/updategraph/src/main/java/io/deephaven/engine/updategraph/UpdateGraph.java
index c29efed8408..b546758e5e1 100644
--- a/engine/updategraph/src/main/java/io/deephaven/engine/updategraph/UpdateGraph.java
+++ b/engine/updategraph/src/main/java/io/deephaven/engine/updategraph/UpdateGraph.java
@@ -6,6 +6,7 @@
 import io.deephaven.base.log.LogOutput;
 import io.deephaven.base.verify.Assert;
 import io.deephaven.io.log.LogEntry;
+import io.deephaven.util.annotations.FinalDefault;
 import io.deephaven.util.function.ThrowingSupplier;
 import io.deephaven.util.locks.AwareFunctionalLock;
 import org.jetbrains.annotations.NotNull;
@@ -244,4 +245,24 @@ public LogOutput append(LogOutput output) {
     }
 
     // endregion refresh control
+
+    /**
+     * Run {@code task} immediately if this UpdateGraph is currently idle, else schedule {@code task} to run at a later
+     * time when it has become idle.
+     *
+     * @param task The task to run when idle
+     */
+    @FinalDefault
+    default void runWhenIdle(@NotNull final Runnable task) {
+        if (clock().currentState() == LogicalClock.State.Idle) {
+            task.run();
+        } else {
+            addNotification(new TerminalNotification() {
+                @Override
+                public void run() {
+                    task.run();
+                }
+            });
+        }
+    }
 }
diff --git a/engine/updategraph/src/main/java/io/deephaven/engine/updategraph/UpdateSourceCombiner.java b/engine/updategraph/src/main/java/io/deephaven/engine/updategraph/UpdateSourceCombiner.java
index 6fb6e841f6f..da7820a3712 100644
--- a/engine/updategraph/src/main/java/io/deephaven/engine/updategraph/UpdateSourceCombiner.java
+++ b/engine/updategraph/src/main/java/io/deephaven/engine/updategraph/UpdateSourceCombiner.java
@@ -7,6 +7,7 @@
 import io.deephaven.engine.liveness.LivenessArtifact;
 import org.jetbrains.annotations.NotNull;
 
+import javax.annotation.OverridingMethodsMustInvokeSuper;
 import java.util.Collections;
 
 /**
@@ -64,6 +65,7 @@ public void requestRefresh() {
         updateGraph.requestRefresh();
     }
 
+    @OverridingMethodsMustInvokeSuper
     @Override
     public void destroy() {
         super.destroy();
diff --git a/engine/vector/build.gradle b/engine/vector/build.gradle
index 9271ed56c1c..34559d7e7f5 100644
--- a/engine/vector/build.gradle
+++ b/engine/vector/build.gradle
@@ -12,7 +12,7 @@ dependencies {
 
     implementation project(':Base')
 
-    compileOnly depAnnotations
+    compileOnly libs.jetbrains.annotations
 
-    Classpaths.inheritJUnitClassic(project, 'testImplementation')
+    testImplementation libs.junit4
 }
diff --git a/extensions/arrow/build.gradle b/extensions/arrow/build.gradle
index 7cf80da2a84..fb03d4d63b2 100644
--- a/extensions/arrow/build.gradle
+++ b/extensions/arrow/build.gradle
@@ -9,20 +9,20 @@ dependencies {
     api project(':engine-table')
 
     implementation project(':Configuration')
-    implementation depCommonsLang3
+    implementation libs.commons.lang3
 
-    Classpaths.inheritArrow(project, 'arrow-format', 'implementation')
-    Classpaths.inheritArrow(project, 'arrow-vector', 'implementation')
-    Classpaths.inheritArrow(project, 'arrow-compression', 'implementation')
+    implementation libs.arrow.format
+    implementation libs.arrow.vector
+    implementation libs.arrow.compression
 
     testImplementation TestTools.projectDependency(project, 'engine-table')
 
-    Classpaths.inheritSlf4j(project, 'slf4j-api', 'implementation')
-    Classpaths.inheritSlf4j(project, 'slf4j-simple', 'testRuntimeOnly')
+    implementation libs.slf4j.api
+    testRuntimeOnly libs.slf4j.simple
     testRuntimeOnly project(':log-to-slf4j')
 
-    Classpaths.inheritJUnitPlatform(project)
-    Classpaths.inheritAssertJ(project)
+    testImplementation platform(libs.junit.bom)
+    testImplementation libs.assertj
 }
 
 apply plugin: 'io.deephaven.java-open-nio'
diff --git a/extensions/arrow/src/test/java/io/deephaven/extensions/arrow/ArrowWrapperToolsTest.java b/extensions/arrow/src/test/java/io/deephaven/extensions/arrow/ArrowWrapperToolsTest.java
index 89329e44626..905c8288791 100644
--- a/extensions/arrow/src/test/java/io/deephaven/extensions/arrow/ArrowWrapperToolsTest.java
+++ b/extensions/arrow/src/test/java/io/deephaven/extensions/arrow/ArrowWrapperToolsTest.java
@@ -19,7 +19,7 @@
 import io.deephaven.engine.table.Table;
 import io.deephaven.engine.table.impl.QueryTable;
 import io.deephaven.engine.table.impl.remote.ConstructSnapshot;
-import io.deephaven.engine.table.impl.remote.InitialSnapshotTable;
+import io.deephaven.engine.table.impl.util.BarrageMessage;
 import io.deephaven.engine.testutil.junit4.EngineCleanup;
 import io.deephaven.engine.util.TableTools;
 import io.deephaven.util.QueryConstants;
@@ -51,6 +51,7 @@
 import java.util.concurrent.CountDownLatch;
 import java.util.concurrent.CyclicBarrier;
 
+import static io.deephaven.engine.table.impl.SnapshotTestUtils.verifySnapshotBarrageMessage;
 import static io.deephaven.engine.testutil.TstUtils.assertTableEquals;
 import static java.util.Arrays.asList;
 
@@ -287,37 +288,37 @@ public void testConcurrentSnapshots() {
             final QueryTable readback = ArrowWrapperTools.readFeather(file.getPath());
 
             final Thread[] threads = new Thread[10];
-            final Table[] results = new Table[10];
-
-            // Lets simulate 10 threads trying to snapshot the table at the same time.
-            // Each thread will start up and wait for the barrier, then they will all attempt
-            // a snapshot at the same time and poke the countdown latch to release the test thread
-            // Then we'll validate all the results and life will be great
-            final CyclicBarrier barrier = new CyclicBarrier(10);
-            final CountDownLatch latch = new CountDownLatch(10);
-            final ExecutionContext executionContext = ExecutionContext.getContext();
-            for (int ii = 0; ii < 10; ii++) {
-                final int threadNo = ii;
-                threads[ii] = new Thread(() -> {
-                    try (final SafeCloseable ignored = executionContext.open()) {
-                        barrier.await();
-                        results[threadNo] =
-                                InitialSnapshotTable.setupInitialSnapshotTable(expected,
-                                        ConstructSnapshot.constructInitialSnapshot(new Object(), readback));
-                    } catch (InterruptedException | BrokenBarrierException e) {
-                        throw new RuntimeException(e);
-                    } finally {
-                        latch.countDown();
-                    }
-                });
-                threads[ii].start();
-            }
+            final BarrageMessage[] results = new BarrageMessage[10];
+            try (final SafeCloseable ignored1 = () -> SafeCloseable.closeAll(results)) {
+                // Lets simulate 10 threads trying to snapshot the table at the same time.
+                // Each thread will start up and wait for the barrier, then they will all attempt
+                // a snapshot at the same time and poke the countdown latch to release the test thread
+                // Then we'll validate all the results and life will be great
+                final CyclicBarrier barrier = new CyclicBarrier(10);
+                final CountDownLatch latch = new CountDownLatch(10);
+                final ExecutionContext executionContext = ExecutionContext.getContext();
+                for (int ii = 0; ii < 10; ii++) {
+                    final int threadNo = ii;
+                    threads[ii] = new Thread(() -> {
+                        try (final SafeCloseable ignored2 = executionContext.open()) {
+                            barrier.await();
+                            // noinspection resource
+                            results[threadNo] = ConstructSnapshot.constructBackplaneSnapshot(new Object(), readback);
+                        } catch (InterruptedException | BrokenBarrierException e) {
+                            throw new RuntimeException(e);
+                        } finally {
+                            latch.countDown();
+                        }
+                    });
+                    threads[ii].start();
+                }
 
-            latch.await();
-            for (int ii = 0; ii < 10; ii++) {
-                assertTableEquals(expected, results[ii]);
+                latch.await();
+                for (int ii = 0; ii < 10; ii++) {
+                    verifySnapshotBarrageMessage(results[ii], expected);
+                }
+                readback.close();
             }
-            readback.close();
         } catch (InterruptedException e) {
             throw new RuntimeException(e);
         } finally {
diff --git a/extensions/barrage/build.gradle b/extensions/barrage/build.gradle
index dae5b72f7a3..f57cdcadbeb 100644
--- a/extensions/barrage/build.gradle
+++ b/extensions/barrage/build.gradle
@@ -3,11 +3,6 @@ plugins {
     id 'io.deephaven.project.register'
 }
 
-configurations {
-    implementation.extendsFrom irisDb
-    testImplementation.extendsFrom irisDbTest
-}
-
 description = 'An extension integrating Barrage with Deephaven\'s Table Model'
 
 dependencies {
@@ -15,29 +10,31 @@ dependencies {
     implementation project(':Util')
     implementation project(':Configuration')
     implementation project(':util-function')
-    implementation depCommonsLang3
+    implementation libs.commons.lang3
 
     api project(':engine-table')
     implementation project(':proto:proto-backplane-grpc-flight')
     implementation project(':log-factory')
-    api 'io.deephaven.barrage:barrage-format:0.6.0'
-    implementation 'org.hdrhistogram:HdrHistogram:2.1.12'
+    api libs.deephaven.barrage.format
+    implementation libs.hdrhistogram
 
-    Classpaths.inheritFlatbuffer(project, 'implementation')
+    implementation libs.flatbuffers.java
 
-    Classpaths.inheritArrow(project, 'arrow-vector', 'implementation')
-    Classpaths.inheritArrow(project, 'arrow-format', 'implementation')
+    implementation libs.arrow.vector
+    implementation libs.arrow.format
+    implementation project(path: ':extensions-source-support')
 
-    Classpaths.inheritImmutables(project)
+    compileOnly project(':util-immutables')
+    annotationProcessor libs.immutables.value
 
     testImplementation project(':engine-test-utils')
 
-    Classpaths.inheritSlf4j(project, 'slf4j-api', 'implementation')
-    Classpaths.inheritSlf4j(project, 'slf4j-simple', 'testRuntimeOnly')
+    implementation libs.slf4j.api
+    testRuntimeOnly libs.slf4j.simple
     testRuntimeOnly project(':log-to-slf4j')
     testRuntimeOnly project(':test-configs')
 
-    Classpaths.inheritJUnitPlatform(project)
-    Classpaths.inheritAssertJ(project)
-    testImplementation 'org.junit.jupiter:junit-jupiter'
+    testImplementation libs.assertj
+    testImplementation platform(libs.junit.bom)
+    testImplementation libs.junit.jupiter
 }
diff --git a/extensions/barrage/src/main/java/io/deephaven/extensions/barrage/BarrageSnapshotOptions.java b/extensions/barrage/src/main/java/io/deephaven/extensions/barrage/BarrageSnapshotOptions.java
index 7993a5f663c..7843fe4eed9 100644
--- a/extensions/barrage/src/main/java/io/deephaven/extensions/barrage/BarrageSnapshotOptions.java
+++ b/extensions/barrage/src/main/java/io/deephaven/extensions/barrage/BarrageSnapshotOptions.java
@@ -7,6 +7,7 @@
 import io.deephaven.annotations.BuildableStyle;
 import io.deephaven.barrage.flatbuf.BarrageSnapshotRequest;
 import io.deephaven.extensions.barrage.util.StreamReaderOptions;
+import io.deephaven.util.annotations.FinalDefault;
 import org.immutables.value.Value.Default;
 import org.immutables.value.Value.Immutable;
 
@@ -21,12 +22,11 @@ public static BarrageSnapshotOptions of(final io.deephaven.barrage.flatbuf.Barra
         if (options == null) {
             return builder().build();
         }
-        final byte mode = options.columnConversionMode();
         return builder()
                 .useDeephavenNulls(options.useDeephavenNulls())
-                .columnConversionMode(ColumnConversionMode.conversionModeFbToEnum(mode))
                 .batchSize(options.batchSize())
                 .maxMessageSize(options.maxMessageSize())
+                .previewListLengthLimit(options.previewListLengthLimit())
                 .build();
     }
 
@@ -34,29 +34,18 @@ public static BarrageSnapshotOptions of(final BarrageSnapshotRequest snapshotReq
         return of(snapshotRequest.snapshotOptions());
     }
 
-    /**
-     * By default, prefer to communicate null values using the arrow-compatible validity structure.
-     *
-     * @return whether to use deephaven nulls
-     */
     @Override
     @Default
     public boolean useDeephavenNulls() {
         return false;
     }
 
-    /**
-     * @return the preferred batch size if specified
-     */
     @Override
     @Default
     public int batchSize() {
         return 0;
     }
 
-    /**
-     * @return the maximum GRPC message size if specified
-     */
     @Override
     @Default
     public int maxMessageSize() {
@@ -65,27 +54,68 @@ public int maxMessageSize() {
 
     @Override
     @Default
-    public ColumnConversionMode columnConversionMode() {
-        return ColumnConversionMode.Stringify;
+    public long previewListLengthLimit() {
+        return 0;
     }
 
     public int appendTo(FlatBufferBuilder builder) {
-        return io.deephaven.barrage.flatbuf.BarrageSnapshotOptions.createBarrageSnapshotOptions(
-                builder, ColumnConversionMode.conversionModeEnumToFb(columnConversionMode()), useDeephavenNulls(),
+        return io.deephaven.barrage.flatbuf.BarrageSnapshotOptions.createBarrageSnapshotOptions(builder,
+                useDeephavenNulls(),
                 batchSize(),
-                maxMessageSize());
+                maxMessageSize(),
+                previewListLengthLimit());
     }
 
     public interface Builder {
 
+        /**
+         * See {@link StreamReaderOptions#useDeephavenNulls()} for details.
+         *
+         * @param useDeephavenNulls whether to use deephaven nulls
+         * @return this builder
+         */
         Builder useDeephavenNulls(boolean useDeephavenNulls);
 
-        Builder columnConversionMode(ColumnConversionMode columnConversionMode);
+        /**
+         * The default conversion mode is to Stringify all objects that do not have a registered encoding. Column
+         * conversion modes are no longer supported.
+         *
+         * @deprecated Since 0.37.0 and is marked for removal. (Note, GWT does not support encoding this context via
+         *             annotation values.)
+         */
+        @FinalDefault
+        @Deprecated
+        default Builder columnConversionMode(ColumnConversionMode columnConversionMode) {
+            return this;
+        }
 
+        /**
+         * See {@link StreamReaderOptions#batchSize()} for details.
+         *
+         * @param batchSize the ideal number of records to send per record batch
+         * @return this builder
+         */
         Builder batchSize(int batchSize);
 
+        /**
+         * See {@link StreamReaderOptions#maxMessageSize()} for details.
+         *
+         * @param messageSize the maximum size of a GRPC message in bytes
+         * @return this builder
+         */
         Builder maxMessageSize(int messageSize);
 
+        /**
+         * See {@link StreamReaderOptions#previewListLengthLimit()} for details.
+         *
+         * @param previewListLengthLimit the magnitude of the number of elements to include in a preview list
+         * @return this builder
+         */
+        Builder previewListLengthLimit(long previewListLengthLimit);
+
+        /**
+         * @return a new BarrageSnapshotOptions instance
+         */
         BarrageSnapshotOptions build();
     }
 }
diff --git a/extensions/barrage/src/main/java/io/deephaven/extensions/barrage/BarrageStreamGenerator.java b/extensions/barrage/src/main/java/io/deephaven/extensions/barrage/BarrageStreamGenerator.java
index 2c0375235ae..b8dce7527aa 100644
--- a/extensions/barrage/src/main/java/io/deephaven/extensions/barrage/BarrageStreamGenerator.java
+++ b/extensions/barrage/src/main/java/io/deephaven/extensions/barrage/BarrageStreamGenerator.java
@@ -59,24 +59,35 @@ BarrageStreamGenerator newGenerator(
      * Obtain a Full-Subscription View of this StreamGenerator that can be sent to a single subscriber.
      *
      * @param options serialization options for this specific view
-     * @param isInitialSnapshot indicates whether or not this is the first snapshot for the listener
+     * @param isInitialSnapshot indicates whether this is the first snapshot for the listener
      * @return a MessageView filtered by the subscription properties that can be sent to that subscriber
      */
     MessageView getSubView(BarrageSubscriptionOptions options, boolean isInitialSnapshot);
 
     /**
      * Obtain a View of this StreamGenerator that can be sent to a single subscriber.
+     * <p>
+     * Note that all passed in arguments are owned by the caller and may be modified external to this method.
      *
      * @param options serialization options for this specific view
-     * @param isInitialSnapshot indicates whether or not this is the first snapshot for the listener
+     * @param isInitialSnapshot indicates whether this is the first snapshot for the listener
+     * @param isFullSubscription whether this is a full subscription (possibly a growing viewport)
      * @param viewport is the position-space viewport
      * @param reverseViewport is the viewport reversed (relative to end of table instead of beginning)
+     * @param keyspaceViewportPrev is the key-space viewport prior to applying the update
      * @param keyspaceViewport is the key-space viewport
      * @param subscribedColumns are the columns subscribed for this view
      * @return a MessageView filtered by the subscription properties that can be sent to that subscriber
      */
-    MessageView getSubView(BarrageSubscriptionOptions options, boolean isInitialSnapshot, @Nullable RowSet viewport,
-            boolean reverseViewport, @Nullable RowSet keyspaceViewport, BitSet subscribedColumns);
+    MessageView getSubView(
+            BarrageSubscriptionOptions options,
+            boolean isInitialSnapshot,
+            boolean isFullSubscription,
+            @Nullable RowSet viewport,
+            boolean reverseViewport,
+            @Nullable RowSet keyspaceViewportPrev,
+            @Nullable RowSet keyspaceViewport,
+            BitSet subscribedColumns);
 
     /**
      * Obtain a Full-Snapshot View of this StreamGenerator that can be sent to a single requestor.
@@ -88,6 +99,8 @@ MessageView getSubView(BarrageSubscriptionOptions options, boolean isInitialSnap
 
     /**
      * Obtain a View of this StreamGenerator that can be sent to a single requestor.
+     * <p>
+     * Note that all passed in arguments are owned by the caller and may be modified external to this method.
      *
      * @param options serialization options for this specific view
      * @param viewport is the position-space viewport
@@ -95,7 +108,10 @@ MessageView getSubView(BarrageSubscriptionOptions options, boolean isInitialSnap
      * @param snapshotColumns are the columns included for this view
      * @return a MessageView filtered by the snapshot properties that can be sent to that requestor
      */
-    MessageView getSnapshotView(BarrageSnapshotOptions options, @Nullable RowSet viewport, boolean reverseViewport,
+    MessageView getSnapshotView(
+            BarrageSnapshotOptions options,
+            @Nullable RowSet viewport,
+            boolean reverseViewport,
             @Nullable RowSet keyspaceViewport, BitSet snapshotColumns);
 
 }
diff --git a/extensions/barrage/src/main/java/io/deephaven/extensions/barrage/BarrageStreamGeneratorImpl.java b/extensions/barrage/src/main/java/io/deephaven/extensions/barrage/BarrageStreamGeneratorImpl.java
index 9aa0c9376c5..03ccc941508 100644
--- a/extensions/barrage/src/main/java/io/deephaven/extensions/barrage/BarrageStreamGeneratorImpl.java
+++ b/extensions/barrage/src/main/java/io/deephaven/extensions/barrage/BarrageStreamGeneratorImpl.java
@@ -14,6 +14,7 @@
 import io.deephaven.barrage.flatbuf.BarrageMessageWrapper;
 import io.deephaven.barrage.flatbuf.BarrageModColumnMetadata;
 import io.deephaven.barrage.flatbuf.BarrageUpdateMetadata;
+import io.deephaven.base.verify.Assert;
 import io.deephaven.chunk.ChunkType;
 import io.deephaven.chunk.WritableChunk;
 import io.deephaven.chunk.WritableLongChunk;
@@ -25,8 +26,9 @@
 import io.deephaven.engine.rowset.impl.ExternalizableRowSetUtils;
 import io.deephaven.engine.table.impl.util.BarrageMessage;
 import io.deephaven.extensions.barrage.chunk.ChunkInputStreamGenerator;
+import io.deephaven.extensions.barrage.chunk.DefaultChunkInputStreamGeneratorFactory;
 import io.deephaven.extensions.barrage.chunk.SingleElementListHeaderInputStreamGenerator;
-import io.deephaven.extensions.barrage.util.BarrageProtoUtil.ExposedByteArrayOutputStream;
+import io.deephaven.extensions.barrage.util.ExposedByteArrayOutputStream;
 import io.deephaven.extensions.barrage.util.BarrageUtil;
 import io.deephaven.extensions.barrage.util.DefensiveDrainable;
 import io.deephaven.extensions.barrage.util.StreamReaderOptions;
@@ -34,6 +36,7 @@
 import io.deephaven.io.logger.Logger;
 import io.deephaven.proto.flight.util.MessageHelper;
 import io.deephaven.util.SafeCloseable;
+import io.deephaven.util.SafeCloseableList;
 import io.deephaven.util.datastructures.LongSizedDataStructure;
 import io.deephaven.util.datastructures.SizeException;
 import io.deephaven.util.mutable.MutableInt;
@@ -55,8 +58,8 @@
 import static io.deephaven.proto.flight.util.MessageHelper.toIpcBytes;
 
 public class BarrageStreamGeneratorImpl implements BarrageStreamGenerator {
-
     private static final Logger log = LoggerFactory.getLogger(BarrageStreamGeneratorImpl.class);
+
     // NB: This should likely be something smaller, such as 1<<16, but since the js api is not yet able
     // to receive multiple record batches we crank this up to MAX_INT.
     private static final int DEFAULT_BATCH_SIZE = Configuration.getInstance()
@@ -72,8 +75,6 @@ public class BarrageStreamGeneratorImpl implements BarrageStreamGenerator {
                     100 * 1024 * 1024);
 
     public interface RecordBatchMessageView extends MessageView {
-        boolean isViewport();
-
         StreamReaderOptions options();
 
         RowSet addRowOffsets();
@@ -122,9 +123,10 @@ public static class ModColumnGenerator implements SafeCloseable {
         private final RowSetGenerator rowsModified;
         private final ChunkListInputStreamGenerator data;
 
-        ModColumnGenerator(final BarrageMessage.ModColumnData col) throws IOException {
+        ModColumnGenerator(ChunkInputStreamGenerator.Factory factory, final BarrageMessage.ModColumnData col)
+                throws IOException {
             rowsModified = new RowSetGenerator(col.rowsModified);
-            data = new ChunkListInputStreamGenerator(col.type, col.componentType, col.data, col.chunkType);
+            data = new ChunkListInputStreamGenerator(factory, col.type, col.componentType, col.data, col.chunkType);
         }
 
         @Override
@@ -173,13 +175,17 @@ public BarrageStreamGeneratorImpl(final BarrageMessage message,
             addColumnData = new ChunkListInputStreamGenerator[message.addColumnData.length];
             for (int i = 0; i < message.addColumnData.length; ++i) {
                 BarrageMessage.AddColumnData columnData = message.addColumnData[i];
-                addColumnData[i] = new ChunkListInputStreamGenerator(columnData.type, columnData.componentType,
+                // noinspection resource
+                addColumnData[i] = new ChunkListInputStreamGenerator(DefaultChunkInputStreamGeneratorFactory.INSTANCE,
+                        columnData.type, columnData.componentType,
                         columnData.data, columnData.chunkType);
             }
 
             modColumnData = new ModColumnGenerator[message.modColumnData.length];
             for (int i = 0; i < modColumnData.length; ++i) {
-                modColumnData[i] = new ModColumnGenerator(message.modColumnData[i]);
+                // noinspection resource
+                modColumnData[i] = new ModColumnGenerator(DefaultChunkInputStreamGeneratorFactory.INSTANCE,
+                        message.modColumnData[i]);
             }
         } catch (final IOException e) {
             throw new UncheckedDeephavenException("unexpected IOException while creating barrage message stream", e);
@@ -209,101 +215,145 @@ public void close() {
         }
     }
 
-    /**
-     * Obtain a View of this StreamGenerator that can be sent to a single subscriber.
-     *
-     * @param options serialization options for this specific view
-     * @param isInitialSnapshot indicates whether or not this is the first snapshot for the listener
-     * @param viewport is the position-space viewport
-     * @param reverseViewport is the viewport reversed (relative to end of table instead of beginning)
-     * @param keyspaceViewport is the key-space viewport
-     * @param subscribedColumns are the columns subscribed for this view
-     * @return a MessageView filtered by the subscription properties that can be sent to that subscriber
-     */
     @Override
-    public MessageView getSubView(final BarrageSubscriptionOptions options,
+    public MessageView getSubView(
+            final BarrageSubscriptionOptions options,
             final boolean isInitialSnapshot,
+            final boolean isFullSubscription,
             @Nullable final RowSet viewport,
             final boolean reverseViewport,
+            @Nullable final RowSet keyspaceViewportPrev,
             @Nullable final RowSet keyspaceViewport,
             @Nullable final BitSet subscribedColumns) {
-        return new SubView(options, isInitialSnapshot, viewport, reverseViewport, keyspaceViewport,
-                subscribedColumns);
+        return new SubView(options, isInitialSnapshot, isFullSubscription, viewport, reverseViewport,
+                keyspaceViewportPrev, keyspaceViewport, subscribedColumns);
     }
 
-    /**
-     * Obtain a Full-Subscription View of this StreamGenerator that can be sent to a single subscriber.
-     *
-     * @param options serialization options for this specific view
-     * @param isInitialSnapshot indicates whether or not this is the first snapshot for the listener
-     * @return a MessageView filtered by the subscription properties that can be sent to that subscriber
-     */
     @Override
     public MessageView getSubView(BarrageSubscriptionOptions options, boolean isInitialSnapshot) {
-        return getSubView(options, isInitialSnapshot, null, false, null, null);
+        return getSubView(options, isInitialSnapshot, true, null, false, null, null, null);
     }
 
     private final class SubView implements RecordBatchMessageView {
         private final BarrageSubscriptionOptions options;
         private final boolean isInitialSnapshot;
-        private final RowSet viewport;
+        private final boolean isFullSubscription;
         private final boolean reverseViewport;
-        private final RowSet keyspaceViewport;
+        private final boolean hasViewport;
         private final BitSet subscribedColumns;
-        private final long numAddRows;
-        private final long numModRows;
-        private final RowSet addRowOffsets;
-        private final RowSet addRowKeys;
-        private final RowSet[] modRowOffsets;
+
+        private final long numClientIncludedRows;
+        private final long numClientModRows;
+        private final WritableRowSet clientViewport;
+        private final WritableRowSet clientIncludedRows;
+        private final WritableRowSet clientIncludedRowOffsets;
+        private final WritableRowSet[] clientModdedRows;
+        private final WritableRowSet[] clientModdedRowOffsets;
+        private final WritableRowSet clientRemovedRows;
 
         public SubView(final BarrageSubscriptionOptions options,
                 final boolean isInitialSnapshot,
+                final boolean isFullSubscription,
                 @Nullable final RowSet viewport,
                 final boolean reverseViewport,
+                @Nullable final RowSet keyspaceViewportPrev,
                 @Nullable final RowSet keyspaceViewport,
                 @Nullable final BitSet subscribedColumns) {
             this.options = options;
             this.isInitialSnapshot = isInitialSnapshot;
-            this.viewport = viewport;
+            this.isFullSubscription = isFullSubscription;
+            this.clientViewport = viewport == null ? null : viewport.copy();
             this.reverseViewport = reverseViewport;
-            this.keyspaceViewport = keyspaceViewport;
+            this.hasViewport = keyspaceViewport != null;
             this.subscribedColumns = subscribedColumns;
 
-            if (keyspaceViewport != null) {
-                this.modRowOffsets = new WritableRowSet[modColumnData.length];
+            // precompute the included rows / offsets and viewport removed rows
+            if (isFullSubscription) {
+                clientRemovedRows = null; // we'll send full subscriptions the full removed set
+
+                if (keyspaceViewport != null) {
+                    // growing viewport clients need to know about all rows, including those that were scoped into view
+                    clientIncludedRows = keyspaceViewport.intersect(rowsIncluded.original);
+                    clientIncludedRowOffsets = rowsIncluded.original.invert(clientIncludedRows);
+                } else if (!rowsAdded.original.equals(rowsIncluded.original)) {
+                    // there are scoped rows that need to be removed from the data sent to the client
+                    clientIncludedRows = rowsAdded.original.copy();
+                    clientIncludedRowOffsets = rowsIncluded.original.invert(clientIncludedRows);
+                } else {
+                    clientIncludedRows = rowsAdded.original.copy();
+                    clientIncludedRowOffsets = RowSetFactory.flat(rowsAdded.original.size());
+                }
             } else {
-                this.modRowOffsets = null;
+                Assert.neqNull(keyspaceViewportPrev, "keyspaceViewportPrev");
+                try (final SafeCloseableList toClose = new SafeCloseableList()) {
+                    final WritableRowSet keyspaceClientIncludedRows =
+                            toClose.add(keyspaceViewport.intersect(rowsIncluded.original));
+                    // all included rows are sent to viewport clients as adds (already includes repainted rows)
+                    clientIncludedRows = keyspaceViewport.invert(keyspaceClientIncludedRows);
+                    clientIncludedRowOffsets = rowsIncluded.original.invert(keyspaceClientIncludedRows);
+
+                    // A row may slide out of the viewport and back into the viewport within the same coalesced message.
+                    // The coalesced adds/removes will not contain this row, but the server has recorded it as needing
+                    // to be sent to the client in its entirety. The client will process this row as both removed and
+                    // added.
+                    final WritableRowSet keyspacePrevClientRepaintedRows =
+                            toClose.add(keyspaceClientIncludedRows.copy());
+                    if (!isSnapshot) {
+                        // note that snapshot rowsAdded contain all rows; we "repaint" only rows shared between prev and
+                        // new viewports.
+                        keyspacePrevClientRepaintedRows.remove(rowsAdded.original);
+                        shifted.original.unapply(keyspacePrevClientRepaintedRows);
+                    }
+                    keyspacePrevClientRepaintedRows.retain(keyspaceViewportPrev);
+
+                    // any pre-existing rows that are no longer in the viewport also need to be removed
+                    final WritableRowSet rowsToRetain;
+                    if (isSnapshot) {
+                        // for a snapshot, the goal is to calculate which rows to remove due to viewport changes
+                        rowsToRetain = toClose.add(keyspaceViewport.copy());
+                    } else {
+                        rowsToRetain = toClose.add(keyspaceViewport.minus(rowsAdded.original));
+                        shifted.original.unapply(rowsToRetain);
+                    }
+                    final WritableRowSet noLongerExistingRows = toClose.add(keyspaceViewportPrev.minus(rowsToRetain));
+                    noLongerExistingRows.insert(keyspacePrevClientRepaintedRows);
+                    clientRemovedRows = keyspaceViewportPrev.invert(noLongerExistingRows);
+                }
             }
+            numClientIncludedRows = clientIncludedRowOffsets.size();
 
             // precompute the modified column indexes, and calculate total rows needed
+            if (keyspaceViewport != null) {
+                clientModdedRows = new WritableRowSet[modColumnData.length];
+                clientModdedRowOffsets = new WritableRowSet[modColumnData.length];
+            } else {
+                clientModdedRows = null;
+                clientModdedRowOffsets = null;
+            }
+
             long numModRows = 0;
             for (int ii = 0; ii < modColumnData.length; ++ii) {
                 final ModColumnGenerator mcd = modColumnData[ii];
 
-                if (keyspaceViewport != null) {
-                    try (WritableRowSet intersect = keyspaceViewport.intersect(mcd.rowsModified.original)) {
-                        this.modRowOffsets[ii] = mcd.rowsModified.original.invert(intersect);
-                        numModRows = Math.max(numModRows, intersect.size());
-                    }
-                } else {
+                if (keyspaceViewport == null) {
                     numModRows = Math.max(numModRows, mcd.rowsModified.original.size());
+                    continue;
                 }
-            }
-            this.numModRows = numModRows;
 
-            if (keyspaceViewport != null) {
-                addRowKeys = keyspaceViewport.intersect(rowsIncluded.original);
-                addRowOffsets = rowsIncluded.original.invert(addRowKeys);
-            } else if (!rowsAdded.original.equals(rowsIncluded.original)) {
-                // there are scoped rows included in the chunks that need to be removed
-                addRowKeys = rowsAdded.original.copy();
-                addRowOffsets = rowsIncluded.original.invert(addRowKeys);
-            } else {
-                addRowKeys = rowsAdded.original.copy();
-                addRowOffsets = RowSetFactory.flat(rowsAdded.original.size());
+                try (final WritableRowSet intersect = keyspaceViewport.intersect(mcd.rowsModified.original)) {
+                    // some rows may be marked both as included and modified; viewport clients must be sent
+                    // the full row data for these rows, so we do not also need to send them as modified
+                    intersect.remove(rowsIncluded.original);
+                    if (isFullSubscription) {
+                        clientModdedRows[ii] = intersect.copy();
+                    } else {
+                        clientModdedRows[ii] = keyspaceViewport.invert(intersect);
+                    }
+                    clientModdedRowOffsets[ii] = mcd.rowsModified.original.invert(intersect);
+                    numModRows = Math.max(numModRows, intersect.size());
+                }
             }
-
-            this.numAddRows = addRowOffsets.size();
+            numClientModRows = numModRows;
         }
 
         @Override
@@ -317,7 +367,7 @@ public void forEachStream(Consumer<DefensiveDrainable> visitor) throws IOExcepti
 
             final MutableInt actualBatchSize = new MutableInt();
 
-            if (numAddRows == 0 && numModRows == 0) {
+            if (numClientIncludedRows == 0 && numClientModRows == 0) {
                 // we still need to send a message containing metadata when there are no rows
                 final DefensiveDrainable is = getInputStream(this, 0, 0, actualBatchSize, metadata,
                         BarrageStreamGeneratorImpl.this::appendAddColumns);
@@ -328,19 +378,19 @@ public void forEachStream(Consumer<DefensiveDrainable> visitor) throws IOExcepti
             }
 
             // send the add batches (if any)
-            processBatches(visitor, this, numAddRows, maxBatchSize, metadata,
-                    BarrageStreamGeneratorImpl.this::appendAddColumns, bytesWritten);
-
-            // send the mod batches (if any) but don't send metadata twice
-            processBatches(visitor, this, numModRows, maxBatchSize, numAddRows > 0 ? null : metadata,
-                    BarrageStreamGeneratorImpl.this::appendModColumns, bytesWritten);
-
-            // clean up the helper indexes
-            addRowOffsets.close();
-            addRowKeys.close();
-            if (modRowOffsets != null) {
-                for (final RowSet modViewport : modRowOffsets) {
-                    modViewport.close();
+            try {
+                processBatches(visitor, this, numClientIncludedRows, maxBatchSize, metadata,
+                        BarrageStreamGeneratorImpl.this::appendAddColumns, bytesWritten);
+
+                // send the mod batches (if any) but don't send metadata twice
+                processBatches(visitor, this, numClientModRows, maxBatchSize,
+                        numClientIncludedRows > 0 ? null : metadata,
+                        BarrageStreamGeneratorImpl.this::appendModColumns, bytesWritten);
+            } finally {
+                SafeCloseable.closeAll(clientViewport, clientIncludedRows, clientIncludedRowOffsets, clientRemovedRows);
+                if (clientModdedRowOffsets != null) {
+                    SafeCloseable.closeAll(clientModdedRows);
+                    SafeCloseable.closeAll(clientModdedRowOffsets);
                 }
             }
             writeConsumer.onWrite(bytesWritten.get(), System.nanoTime() - startTm);
@@ -354,11 +404,6 @@ private int batchSize() {
             return batchSize;
         }
 
-        @Override
-        public boolean isViewport() {
-            return viewport != null;
-        }
-
         @Override
         public StreamReaderOptions options() {
             return options;
@@ -366,23 +411,23 @@ public StreamReaderOptions options() {
 
         @Override
         public RowSet addRowOffsets() {
-            return addRowOffsets;
+            return clientIncludedRowOffsets;
         }
 
         @Override
         public RowSet modRowOffsets(int col) {
-            if (modRowOffsets == null) {
+            if (clientModdedRowOffsets == null) {
                 return null;
             }
-            return modRowOffsets[col];
+            return clientModdedRowOffsets[col];
         }
 
         private ByteBuffer getSubscriptionMetadata() throws IOException {
             final FlatBufferBuilder metadata = new FlatBufferBuilder();
 
             int effectiveViewportOffset = 0;
-            if (isSnapshot && isViewport()) {
-                try (final RowSetGenerator viewportGen = new RowSetGenerator(viewport)) {
+            if (isSnapshot && clientViewport != null) {
+                try (final RowSetGenerator viewportGen = new RowSetGenerator(clientViewport)) {
                     effectiveViewportOffset = viewportGen.addToFlatBuffer(metadata);
                 }
             }
@@ -393,32 +438,54 @@ private ByteBuffer getSubscriptionMetadata() throws IOException {
             }
 
             final int rowsAddedOffset;
-            if (isSnapshot && !isInitialSnapshot) {
-                // client's don't need/want to receive the full RowSet on every snapshot
+            if (!isFullSubscription) {
+                // viewport clients consider all included rows as added; scoped rows will also appear in the removed set
+                try (final RowSetGenerator clientIncludedRowsGen = new RowSetGenerator(clientIncludedRows)) {
+                    rowsAddedOffset = clientIncludedRowsGen.addToFlatBuffer(metadata);
+                }
+            } else if (isSnapshot && !isInitialSnapshot) {
+                // Growing viewport clients don't need/want to receive the full RowSet on every snapshot
                 rowsAddedOffset = EmptyRowSetGenerator.INSTANCE.addToFlatBuffer(metadata);
             } else {
                 rowsAddedOffset = rowsAdded.addToFlatBuffer(metadata);
             }
 
-            final int rowsRemovedOffset = rowsRemoved.addToFlatBuffer(metadata);
-            final int shiftDataOffset = shifted.addToFlatBuffer(metadata);
+            final int rowsRemovedOffset;
+            if (!isFullSubscription) {
+                // viewport clients need to also remove rows that were scoped out of view; computed in the constructor
+                try (final RowSetGenerator clientRemovedRowsGen = new RowSetGenerator(clientRemovedRows)) {
+                    rowsRemovedOffset = clientRemovedRowsGen.addToFlatBuffer(metadata);
+                }
+            } else {
+                rowsRemovedOffset = rowsRemoved.addToFlatBuffer(metadata);
+            }
+
+            final int shiftDataOffset;
+            if (!isFullSubscription) {
+                // we only send shifts to full table subscriptions
+                shiftDataOffset = 0;
+            } else {
+                shiftDataOffset = shifted.addToFlatBuffer(metadata);
+            }
 
             // Added Chunk Data:
             int addedRowsIncludedOffset = 0;
 
-            // don't send `rowsIncluded` when identical to `rowsAdded`, client will infer they are the same
-            if (isSnapshot || !addRowKeys.equals(rowsAdded.original)) {
-                addedRowsIncludedOffset = rowsIncluded.addToFlatBuffer(addRowKeys, metadata);
+            // don't send `rowsIncluded` to viewport clients or if identical to `rowsAdded`
+            if (isFullSubscription && (isSnapshot || !clientIncludedRows.equals(rowsAdded.original))) {
+                addedRowsIncludedOffset = rowsIncluded.addToFlatBuffer(clientIncludedRows, metadata);
             }
 
             // now add mod-column streams, and write the mod column indexes
             TIntArrayList modOffsets = new TIntArrayList(modColumnData.length);
-            for (final ModColumnGenerator mcd : modColumnData) {
+            for (int ii = 0; ii < modColumnData.length; ++ii) {
                 final int myModRowOffset;
-                if (keyspaceViewport != null) {
-                    myModRowOffset = mcd.rowsModified.addToFlatBuffer(keyspaceViewport, metadata);
+                if (hasViewport) {
+                    try (final RowSetGenerator modRowsGen = new RowSetGenerator(clientModdedRows[ii])) {
+                        myModRowOffset = modRowsGen.addToFlatBuffer(metadata);
+                    }
                 } else {
-                    myModRowOffset = mcd.rowsModified.addToFlatBuffer(metadata);
+                    myModRowOffset = modColumnData[ii].rowsModified.addToFlatBuffer(metadata);
                 }
                 modOffsets.add(BarrageModColumnMetadata.createBarrageModColumnMetadata(metadata, myModRowOffset));
             }
@@ -442,6 +509,7 @@ private ByteBuffer getSubscriptionMetadata() throws IOException {
             BarrageUpdateMetadata.addAddedRowsIncluded(metadata, addedRowsIncludedOffset);
             BarrageUpdateMetadata.addModColumnNodes(metadata, nodesOffset);
             BarrageUpdateMetadata.addEffectiveReverseViewport(metadata, reverseViewport);
+            BarrageUpdateMetadata.addTableSize(metadata, message.tableSize);
             metadata.finish(BarrageUpdateMetadata.endBarrageUpdateMetadata(metadata));
 
             final FlatBufferBuilder header = new FlatBufferBuilder();
@@ -456,16 +524,6 @@ private ByteBuffer getSubscriptionMetadata() throws IOException {
         }
     }
 
-    /**
-     * Obtain a View of this StreamGenerator that can be sent to a single snapshot requestor.
-     *
-     * @param options serialization options for this specific view
-     * @param viewport is the position-space viewport
-     * @param reverseViewport is the viewport reversed (relative to end of table instead of beginning)
-     * @param keyspaceViewport is the key-space viewport
-     * @param snapshotColumns are the columns subscribed for this view
-     * @return a MessageView filtered by the snapshot properties that can be sent to that subscriber
-     */
     @Override
     public MessageView getSnapshotView(final BarrageSnapshotOptions options,
             @Nullable final RowSet viewport,
@@ -475,12 +533,6 @@ public MessageView getSnapshotView(final BarrageSnapshotOptions options,
         return new SnapshotView(options, viewport, reverseViewport, keyspaceViewport, snapshotColumns);
     }
 
-    /**
-     * Obtain a Full-Snapshot View of this StreamGenerator that can be sent to a single snapshot requestor.
-     *
-     * @param options serialization options for this specific view
-     * @return a MessageView filtered by the snapshot properties that can be sent to that subscriber
-     */
     @Override
     public MessageView getSnapshotView(BarrageSnapshotOptions options) {
         return getSnapshotView(options, null, false, null, null);
@@ -488,12 +540,13 @@ public MessageView getSnapshotView(BarrageSnapshotOptions options) {
 
     private final class SnapshotView implements RecordBatchMessageView {
         private final BarrageSnapshotOptions options;
-        private final RowSet viewport;
         private final boolean reverseViewport;
         private final BitSet subscribedColumns;
-        private final long numAddRows;
-        private final RowSet addRowKeys;
-        private final RowSet addRowOffsets;
+        private final long numClientAddRows;
+
+        private final WritableRowSet clientViewport;
+        private final WritableRowSet clientAddedRows;
+        private final WritableRowSet clientAddedRowOffsets;
 
         public SnapshotView(final BarrageSnapshotOptions options,
                 @Nullable final RowSet viewport,
@@ -501,21 +554,21 @@ public SnapshotView(final BarrageSnapshotOptions options,
                 @Nullable final RowSet keyspaceViewport,
                 @Nullable final BitSet subscribedColumns) {
             this.options = options;
-            this.viewport = viewport;
+            this.clientViewport = viewport == null ? null : viewport.copy();
             this.reverseViewport = reverseViewport;
 
             this.subscribedColumns = subscribedColumns;
 
             // precompute add row offsets
             if (keyspaceViewport != null) {
-                addRowKeys = keyspaceViewport.intersect(rowsIncluded.original);
-                addRowOffsets = rowsIncluded.original.invert(addRowKeys);
+                clientAddedRows = keyspaceViewport.intersect(rowsIncluded.original);
+                clientAddedRowOffsets = rowsIncluded.original.invert(clientAddedRows);
             } else {
-                addRowKeys = rowsAdded.original.copy();
-                addRowOffsets = RowSetFactory.flat(addRowKeys.size());
+                clientAddedRows = rowsAdded.original.copy();
+                clientAddedRowOffsets = RowSetFactory.flat(clientAddedRows.size());
             }
 
-            numAddRows = addRowOffsets.size();
+            numClientAddRows = clientAddedRowOffsets.size();
         }
 
         @Override
@@ -527,17 +580,20 @@ public void forEachStream(Consumer<DefensiveDrainable> visitor) throws IOExcepti
             // batch size is maximum, will write fewer rows when needed
             int maxBatchSize = batchSize();
             final MutableInt actualBatchSize = new MutableInt();
-            if (numAddRows == 0) {
-                // we still need to send a message containing metadata when there are no rows
-                visitor.accept(getInputStream(this, 0, 0, actualBatchSize, metadata,
-                        BarrageStreamGeneratorImpl.this::appendAddColumns));
-            } else {
-                // send the add batches
-                processBatches(visitor, this, numAddRows, maxBatchSize, metadata,
-                        BarrageStreamGeneratorImpl.this::appendAddColumns, bytesWritten);
+            try {
+                if (numClientAddRows == 0) {
+                    // we still need to send a message containing metadata when there are no rows
+                    visitor.accept(getInputStream(this, 0, 0, actualBatchSize, metadata,
+                            BarrageStreamGeneratorImpl.this::appendAddColumns));
+                } else {
+                    // send the add batches
+                    processBatches(visitor, this, numClientAddRows, maxBatchSize, metadata,
+                            BarrageStreamGeneratorImpl.this::appendAddColumns, bytesWritten);
+                }
+            } finally {
+                SafeCloseable.closeAll(clientViewport, clientAddedRows, clientAddedRowOffsets);
             }
-            addRowOffsets.close();
-            addRowKeys.close();
+
             writeConsumer.onWrite(bytesWritten.get(), System.nanoTime() - startTm);
         }
 
@@ -549,11 +605,6 @@ private int batchSize() {
             return batchSize;
         }
 
-        @Override
-        public boolean isViewport() {
-            return viewport != null;
-        }
-
         @Override
         public StreamReaderOptions options() {
             return options;
@@ -561,7 +612,7 @@ public StreamReaderOptions options() {
 
         @Override
         public RowSet addRowOffsets() {
-            return addRowOffsets;
+            return clientAddedRowOffsets;
         }
 
         @Override
@@ -573,8 +624,8 @@ private ByteBuffer getSnapshotMetadata() throws IOException {
             final FlatBufferBuilder metadata = new FlatBufferBuilder();
 
             int effectiveViewportOffset = 0;
-            if (isViewport()) {
-                try (final RowSetGenerator viewportGen = new RowSetGenerator(viewport)) {
+            if (clientViewport != null) {
+                try (final RowSetGenerator viewportGen = new RowSetGenerator(clientViewport)) {
                     effectiveViewportOffset = viewportGen.addToFlatBuffer(metadata);
                 }
             }
@@ -592,8 +643,8 @@ private ByteBuffer getSnapshotMetadata() throws IOException {
             // Added Chunk Data:
             int addedRowsIncludedOffset = 0;
             // don't send `rowsIncluded` when identical to `rowsAdded`, client will infer they are the same
-            if (isSnapshot || !addRowKeys.equals(rowsAdded.original)) {
-                addedRowsIncludedOffset = rowsIncluded.addToFlatBuffer(addRowKeys, metadata);
+            if (isSnapshot || !clientAddedRows.equals(rowsAdded.original)) {
+                addedRowsIncludedOffset = rowsIncluded.addToFlatBuffer(clientAddedRows, metadata);
             }
 
             BarrageUpdateMetadata.startBarrageUpdateMetadata(metadata);
@@ -659,9 +710,13 @@ int visit(final RecordBatchMessageView view, final long startRange, final int ta
      * @param columnVisitor the helper method responsible for appending the payload columns to the RecordBatch
      * @return an InputStream ready to be drained by GRPC
      */
-    private DefensiveDrainable getInputStream(final RecordBatchMessageView view, final long offset,
+    private DefensiveDrainable getInputStream(
+            final RecordBatchMessageView view,
+            final long offset,
             final int targetBatchSize,
-            final MutableInt actualBatchSize, final ByteBuffer metadata, final ColumnVisitor columnVisitor)
+            final MutableInt actualBatchSize,
+            final ByteBuffer metadata,
+            final ColumnVisitor columnVisitor)
             throws IOException {
         final ArrayDeque<DefensiveDrainable> streams = new ArrayDeque<>();
         final MutableInt size = new MutableInt();
@@ -699,12 +754,14 @@ private DefensiveDrainable getInputStream(final RecordBatchMessageView view, fin
             nodeOffsets.ensureCapacity(addColumnData.length);
             nodeOffsets.get().setSize(0);
             bufferInfos.ensureCapacity(addColumnData.length * 3);
+            // noinspection DataFlowIssue
             bufferInfos.get().setSize(0);
 
             final MutableLong totalBufferLength = new MutableLong();
             final ChunkInputStreamGenerator.FieldNodeListener fieldNodeListener =
                     (numElements, nullCount) -> {
                         nodeOffsets.ensureCapacityPreserve(nodeOffsets.get().size() + 1);
+                        // noinspection resource
                         nodeOffsets.get().asWritableObjectChunk()
                                 .add(new ChunkInputStreamGenerator.FieldNodeInfo(numElements, nullCount));
                     };
@@ -1050,9 +1107,12 @@ private int appendModColumns(final RecordBatchMessageView view, final long start
 
     public static abstract class ByteArrayGenerator {
         protected int len;
-        protected byte[] raw;
+        protected volatile byte[] raw;
 
-        protected int addToFlatBuffer(final FlatBufferBuilder builder) {
+        protected abstract void ensureComputed() throws IOException;
+
+        protected int addToFlatBuffer(final FlatBufferBuilder builder) throws IOException {
+            ensureComputed();
             return builder.createByteVector(raw, 0, len);
         }
     }
@@ -1062,14 +1122,6 @@ public static class RowSetGenerator extends ByteArrayGenerator implements SafeCl
 
         public RowSetGenerator(final RowSet rowSet) throws IOException {
             this.original = rowSet.copy();
-            // noinspection UnstableApiUsage
-            try (final ExposedByteArrayOutputStream baos = new ExposedByteArrayOutputStream();
-                    final LittleEndianDataOutputStream oos = new LittleEndianDataOutputStream(baos)) {
-                ExternalizableRowSetUtils.writeExternalCompressedDeltas(oos, rowSet);
-                oos.flush();
-                raw = baos.peekBuffer();
-                len = baos.size();
-            }
         }
 
         @Override
@@ -1077,8 +1129,24 @@ public void close() {
             original.close();
         }
 
-        public DrainableByteArrayInputStream getInputStream() {
-            return new DrainableByteArrayInputStream(raw, 0, len);
+        protected void ensureComputed() throws IOException {
+            if (raw != null) {
+                return;
+            }
+
+            synchronized (this) {
+                if (raw != null) {
+                    return;
+                }
+
+                try (final ExposedByteArrayOutputStream baos = new ExposedByteArrayOutputStream();
+                        final LittleEndianDataOutputStream oos = new LittleEndianDataOutputStream(baos)) {
+                    ExternalizableRowSetUtils.writeExternalCompressedDeltas(oos, original);
+                    oos.flush();
+                    len = baos.size();
+                    raw = baos.peekBuffer();
+                }
+            }
         }
 
         /**
@@ -1090,19 +1158,19 @@ public DrainableByteArrayInputStream getInputStream() {
          */
         protected int addToFlatBuffer(final RowSet viewport, final FlatBufferBuilder builder) throws IOException {
             if (original.subsetOf(viewport)) {
+                ensureComputed();
                 return addToFlatBuffer(builder);
             }
 
             final int nlen;
             final byte[] nraw;
-            // noinspection UnstableApiUsage
             try (final ExposedByteArrayOutputStream baos = new ExposedByteArrayOutputStream();
                     final LittleEndianDataOutputStream oos = new LittleEndianDataOutputStream(baos);
                     final RowSet viewOfOriginal = original.intersect(viewport)) {
                 ExternalizableRowSetUtils.writeExternalCompressedDeltas(oos, viewOfOriginal);
                 oos.flush();
-                nraw = baos.peekBuffer();
                 nlen = baos.size();
+                nraw = baos.peekBuffer();
             }
 
             return builder.createByteVector(nraw, 0, nlen);
@@ -1110,47 +1178,78 @@ protected int addToFlatBuffer(final RowSet viewport, final FlatBufferBuilder bui
     }
 
     public static class BitSetGenerator extends ByteArrayGenerator {
+        private final BitSet original;
+
         public BitSetGenerator(final BitSet bitset) {
-            BitSet original = bitset == null ? new BitSet() : bitset;
-            this.raw = original.toByteArray();
-            final int nBits = original.previousSetBit(Integer.MAX_VALUE - 1) + 1;
-            this.len = (int) ((long) nBits + 7) / 8;
+            original = bitset == null ? new BitSet() : (BitSet) bitset.clone();
+        }
+
+        @Override
+        protected void ensureComputed() {
+            if (raw != null) {
+                return;
+            }
+
+            synchronized (this) {
+                if (raw != null) {
+                    return;
+                }
+
+                final int nBits = original.previousSetBit(Integer.MAX_VALUE - 1) + 1;
+                len = (int) ((long) nBits + 7) / 8;
+                raw = original.toByteArray();
+            }
         }
     }
 
     public static class RowSetShiftDataGenerator extends ByteArrayGenerator {
+        private final RowSetShiftData original;
+
         public RowSetShiftDataGenerator(final RowSetShiftData shifted) throws IOException {
-            final RowSetBuilderSequential sRangeBuilder = RowSetFactory.builderSequential();
-            final RowSetBuilderSequential eRangeBuilder = RowSetFactory.builderSequential();
-            final RowSetBuilderSequential destBuilder = RowSetFactory.builderSequential();
+            original = shifted;
+        }
 
-            if (shifted != null) {
-                for (int i = 0; i < shifted.size(); ++i) {
-                    long s = shifted.getBeginRange(i);
-                    final long dt = shifted.getShiftDelta(i);
+        protected void ensureComputed() throws IOException {
+            if (raw != null) {
+                return;
+            }
 
-                    if (dt < 0 && s < -dt) {
-                        s = -dt;
-                    }
+            synchronized (this) {
+                if (raw != null) {
+                    return;
+                }
+
+                final RowSetBuilderSequential sRangeBuilder = RowSetFactory.builderSequential();
+                final RowSetBuilderSequential eRangeBuilder = RowSetFactory.builderSequential();
+                final RowSetBuilderSequential destBuilder = RowSetFactory.builderSequential();
 
-                    sRangeBuilder.appendKey(s);
-                    eRangeBuilder.appendKey(shifted.getEndRange(i));
-                    destBuilder.appendKey(s + dt);
+                if (original != null) {
+                    for (int i = 0; i < original.size(); ++i) {
+                        long s = original.getBeginRange(i);
+                        final long dt = original.getShiftDelta(i);
+
+                        if (dt < 0 && s < -dt) {
+                            s = -dt;
+                        }
+
+                        sRangeBuilder.appendKey(s);
+                        eRangeBuilder.appendKey(original.getEndRange(i));
+                        destBuilder.appendKey(s + dt);
+                    }
                 }
-            }
 
-            // noinspection UnstableApiUsage
-            try (final RowSet sRange = sRangeBuilder.build();
-                    final RowSet eRange = eRangeBuilder.build();
-                    final RowSet dest = destBuilder.build();
-                    final ExposedByteArrayOutputStream baos = new ExposedByteArrayOutputStream();
-                    final LittleEndianDataOutputStream oos = new LittleEndianDataOutputStream(baos)) {
-                ExternalizableRowSetUtils.writeExternalCompressedDeltas(oos, sRange);
-                ExternalizableRowSetUtils.writeExternalCompressedDeltas(oos, eRange);
-                ExternalizableRowSetUtils.writeExternalCompressedDeltas(oos, dest);
-                oos.flush();
-                raw = baos.peekBuffer();
-                len = baos.size();
+                try (final RowSet sRange = sRangeBuilder.build();
+                        final RowSet eRange = eRangeBuilder.build();
+                        final RowSet dest = destBuilder.build();
+                        final ExposedByteArrayOutputStream baos = new ExposedByteArrayOutputStream();
+                        final LittleEndianDataOutputStream oos = new LittleEndianDataOutputStream(baos)) {
+                    ExternalizableRowSetUtils.writeExternalCompressedDeltas(oos, sRange);
+                    ExternalizableRowSetUtils.writeExternalCompressedDeltas(oos, eRange);
+                    ExternalizableRowSetUtils.writeExternalCompressedDeltas(oos, dest);
+                    oos.flush();
+                    len = baos.size();
+                    raw = baos.peekBuffer();
+                }
             }
         }
     }
diff --git a/extensions/barrage/src/main/java/io/deephaven/extensions/barrage/BarrageSubscriptionOptions.java b/extensions/barrage/src/main/java/io/deephaven/extensions/barrage/BarrageSubscriptionOptions.java
index 64e5d13219c..f26803283ef 100644
--- a/extensions/barrage/src/main/java/io/deephaven/extensions/barrage/BarrageSubscriptionOptions.java
+++ b/extensions/barrage/src/main/java/io/deephaven/extensions/barrage/BarrageSubscriptionOptions.java
@@ -7,6 +7,7 @@
 import io.deephaven.annotations.BuildableStyle;
 import io.deephaven.barrage.flatbuf.BarrageSubscriptionRequest;
 import io.deephaven.extensions.barrage.util.StreamReaderOptions;
+import io.deephaven.util.annotations.FinalDefault;
 import org.immutables.value.Value.Default;
 import org.immutables.value.Value.Immutable;
 
@@ -22,14 +23,13 @@ public static BarrageSubscriptionOptions of(final io.deephaven.barrage.flatbuf.B
         if (options == null) {
             return builder().build();
         }
-        final byte mode = options.columnConversionMode();
         return builder()
                 .useDeephavenNulls(options.useDeephavenNulls())
-                .columnConversionMode(ColumnConversionMode.conversionModeFbToEnum(mode))
                 .minUpdateIntervalMs(options.minUpdateIntervalMs())
                 .batchSize(options.batchSize())
                 .maxMessageSize(options.maxMessageSize())
                 .columnsAsList(options.columnsAsList())
+                .previewListLengthLimit(options.previewListLengthLimit())
                 .build();
     }
 
@@ -37,21 +37,12 @@ public static BarrageSubscriptionOptions of(final BarrageSubscriptionRequest sub
         return of(subscriptionRequest.subscriptionOptions());
     }
 
-    /**
-     * By default, prefer to communicate null values using the arrow-compatible validity structure.
-     *
-     * @return whether to use deephaven nulls
-     */
     @Override
     @Default
     public boolean useDeephavenNulls() {
         return false;
     }
 
-    /**
-     * Requesting clients can specify whether they want columns to be returned wrapped in a list. This enables easier
-     * support in some official arrow clients, but is not the default.
-     */
     @Override
     @Default
     public boolean columnsAsList() {
@@ -64,11 +55,11 @@ public boolean columnsAsList() {
      * needed to perform barrage-acrobatics for both of them. This greatly reduces the burden each client adds to the
      * server's workload. If a given table does want a shorter interval, consider using that shorter interval for all
      * subscriptions to that table.
-     *
+     * <p>
      * The default interval can be set on the server with the flag
      * {@code io.deephaven.server.arrow.ArrowFlightUtil#DEFAULT_UPDATE_INTERVAL_MS}, or
      * {@code -Dbarrage.minUpdateInterval=1000}.
-     *
+     * <p>
      * Related, when shortening the minUpdateInterval, you typically want to shorten the server's UGP cycle enough to
      * update at least as quickly. This can be done on the server with the flag
      * {@code io.deephaven.engine.updategraph.impl.PeriodicUpdateGraph#defaultTargetCycleTime}, or
@@ -81,18 +72,12 @@ public int minUpdateIntervalMs() {
         return 0;
     }
 
-    /**
-     * @return the preferred batch size if specified
-     */
     @Override
     @Default
     public int batchSize() {
         return 0;
     }
 
-    /**
-     * @return the preferred maximum GRPC message size if specified
-     */
     @Override
     @Default
     public int maxMessageSize() {
@@ -101,33 +86,87 @@ public int maxMessageSize() {
 
     @Override
     @Default
-    public ColumnConversionMode columnConversionMode() {
-        return ColumnConversionMode.Stringify;
+    public long previewListLengthLimit() {
+        return 0;
     }
 
     public int appendTo(FlatBufferBuilder builder) {
-        return io.deephaven.barrage.flatbuf.BarrageSubscriptionOptions.createBarrageSubscriptionOptions(
-                builder, ColumnConversionMode.conversionModeEnumToFb(columnConversionMode()), useDeephavenNulls(),
+        return io.deephaven.barrage.flatbuf.BarrageSubscriptionOptions.createBarrageSubscriptionOptions(builder,
+                useDeephavenNulls(),
                 minUpdateIntervalMs(),
                 batchSize(),
                 maxMessageSize(),
-                columnsAsList());
+                columnsAsList(),
+                previewListLengthLimit());
     }
 
     public interface Builder {
 
+        /**
+         * See {@link StreamReaderOptions#useDeephavenNulls()} for details.
+         *
+         * @param useDeephavenNulls whether to use deephaven nulls
+         * @return this builder
+         */
         Builder useDeephavenNulls(boolean useDeephavenNulls);
 
+        /**
+         * See {@link StreamReaderOptions#columnsAsList() } for details.
+         *
+         * @param columnsAsList whether to wrap columns in a list to be compatible with native Flight clients
+         * @return this builder
+         */
         Builder columnsAsList(boolean columnsAsList);
 
-        Builder columnConversionMode(ColumnConversionMode columnConversionMode);
+        /**
+         * The default conversion mode is to Stringify all objects that do not have a registered encoding. Column
+         * conversion modes are no longer supported.
+         *
+         * @deprecated Since 0.37.0 and is marked for removal. (Note, GWT does not support encoding this context via
+         *             annotation values.)
+         * @return this builder
+         */
+        @FinalDefault
+        @Deprecated
+        default Builder columnConversionMode(ColumnConversionMode columnConversionMode) {
+            return this;
+        }
 
+        /**
+         * See {@link BarrageSubscriptionOptions#minUpdateIntervalMs()} for details.
+         *
+         * @param minUpdateIntervalMs the update interval used to limit barrage message frequency
+         * @return this builder
+         */
         Builder minUpdateIntervalMs(int minUpdateIntervalMs);
 
+        /**
+         * See {@link StreamReaderOptions#batchSize()} for details.
+         *
+         * @param batchSize the ideal number of records to send per record batch
+         * @return this builder
+         */
         Builder batchSize(int batchSize);
 
+        /**
+         * See {@link StreamReaderOptions#maxMessageSize()} for details.
+         *
+         * @param messageSize the maximum size of a GRPC message in bytes
+         * @return this builder
+         */
         Builder maxMessageSize(int messageSize);
 
+        /**
+         * See {@link StreamReaderOptions#previewListLengthLimit()} for details.
+         *
+         * @param previewListLengthLimit the magnitude of the number of elements to include in a preview list
+         * @return this builder
+         */
+        Builder previewListLengthLimit(long previewListLengthLimit);
+
+        /**
+         * @return a new BarrageSubscriptionOptions instance
+         */
         BarrageSubscriptionOptions build();
     }
 }
diff --git a/extensions/barrage/src/main/java/io/deephaven/extensions/barrage/ChunkListInputStreamGenerator.java b/extensions/barrage/src/main/java/io/deephaven/extensions/barrage/ChunkListInputStreamGenerator.java
index f64be56149f..a5b95f2c524 100644
--- a/extensions/barrage/src/main/java/io/deephaven/extensions/barrage/ChunkListInputStreamGenerator.java
+++ b/extensions/barrage/src/main/java/io/deephaven/extensions/barrage/ChunkListInputStreamGenerator.java
@@ -19,7 +19,8 @@ public class ChunkListInputStreamGenerator implements SafeCloseable {
     private final List<ChunkInputStreamGenerator> generators;
     private final ChunkInputStreamGenerator emptyGenerator;
 
-    public ChunkListInputStreamGenerator(Class<?> type, Class<?> componentType, List<Chunk<Values>> data,
+    public ChunkListInputStreamGenerator(ChunkInputStreamGenerator.Factory factory, Class<?> type,
+            Class<?> componentType, List<Chunk<Values>> data,
             ChunkType chunkType) {
         // create an input stream generator for each chunk
         ChunkInputStreamGenerator[] generators = new ChunkInputStreamGenerator[data.size()];
@@ -27,12 +28,12 @@ public ChunkListInputStreamGenerator(Class<?> type, Class<?> componentType, List
         long rowOffset = 0;
         for (int i = 0; i < data.size(); ++i) {
             final Chunk<Values> valuesChunk = data.get(i);
-            generators[i] = ChunkInputStreamGenerator.makeInputStreamGenerator(chunkType, type, componentType,
+            generators[i] = factory.makeInputStreamGenerator(chunkType, type, componentType,
                     valuesChunk, rowOffset);
             rowOffset += valuesChunk.size();
         }
         this.generators = Arrays.asList(generators);
-        emptyGenerator = ChunkInputStreamGenerator.makeInputStreamGenerator(
+        emptyGenerator = factory.makeInputStreamGenerator(
                 chunkType, type, componentType, chunkType.getEmptyChunk(), 0);
     }
 
diff --git a/extensions/barrage/src/main/java/io/deephaven/extensions/barrage/chunk/BaseChunkInputStreamGenerator.java b/extensions/barrage/src/main/java/io/deephaven/extensions/barrage/chunk/BaseChunkInputStreamGenerator.java
index ab4c5bd20b8..f51da87e959 100644
--- a/extensions/barrage/src/main/java/io/deephaven/extensions/barrage/chunk/BaseChunkInputStreamGenerator.java
+++ b/extensions/barrage/src/main/java/io/deephaven/extensions/barrage/chunk/BaseChunkInputStreamGenerator.java
@@ -3,37 +3,32 @@
 //
 package io.deephaven.extensions.barrage.chunk;
 
+import io.deephaven.chunk.Chunk;
 import io.deephaven.chunk.attributes.Values;
+import io.deephaven.chunk.util.pools.PoolableChunk;
 import io.deephaven.engine.rowset.RowSequence;
 import io.deephaven.engine.rowset.RowSequenceFactory;
 import io.deephaven.engine.rowset.RowSet;
 import io.deephaven.extensions.barrage.util.StreamReaderOptions;
 import io.deephaven.util.datastructures.LongSizedDataStructure;
-import io.deephaven.chunk.Chunk;
-import io.deephaven.chunk.util.pools.PoolableChunk;
+import io.deephaven.util.referencecounting.ReferenceCounted;
 
 import java.io.IOException;
-import java.util.concurrent.atomic.AtomicIntegerFieldUpdater;
 
-public abstract class BaseChunkInputStreamGenerator<T extends Chunk<Values>> implements ChunkInputStreamGenerator {
+public abstract class BaseChunkInputStreamGenerator<T extends Chunk<Values>>
+        extends ReferenceCounted
+        implements ChunkInputStreamGenerator {
+
     public static final byte[] PADDING_BUFFER = new byte[8];
     public static final int REMAINDER_MOD_8_MASK = 0x7;
 
-    // Ensure that we clean up chunk only after all copies of the update are released.
-    private volatile int refCount = 1;
-
-    // Field updater for refCount, so we can avoid creating an {@link java.util.concurrent.atomic.AtomicInteger} for
-    // each instance.
-    @SuppressWarnings("rawtypes")
-    protected static final AtomicIntegerFieldUpdater<BaseChunkInputStreamGenerator> REFERENCE_COUNT_UPDATER =
-            AtomicIntegerFieldUpdater.newUpdater(BaseChunkInputStreamGenerator.class, "refCount");
-
     protected final T chunk;
     protected final int elementSize;
 
     private final long rowOffset;
 
     BaseChunkInputStreamGenerator(final T chunk, final int elementSize, final long rowOffset) {
+        super(1);
         this.chunk = chunk;
         this.elementSize = elementSize;
         this.rowOffset = rowOffset;
@@ -51,10 +46,13 @@ public long getLastRowOffset() {
 
     @Override
     public void close() {
-        if (REFERENCE_COUNT_UPDATER.decrementAndGet(this) == 0) {
-            if (chunk instanceof PoolableChunk) {
-                ((PoolableChunk) chunk).close();
-            }
+        decrementReferenceCount();
+    }
+
+    @Override
+    protected void onReferenceCountAtZero() {
+        if (chunk instanceof PoolableChunk) {
+            ((PoolableChunk) chunk).close();
         }
     }
 
@@ -87,7 +85,7 @@ abstract class BaseChunkInputStream extends DrainableColumn {
             this.options = options;
             this.subset = chunk.size() == 0 ? RowSequenceFactory.EMPTY
                     : subset != null ? subset.copy() : RowSequenceFactory.forRange(0, chunk.size() - 1);
-            REFERENCE_COUNT_UPDATER.incrementAndGet(BaseChunkInputStreamGenerator.this);
+            BaseChunkInputStreamGenerator.this.incrementReferenceCount();
             // ignore the empty chunk as these are intentionally empty generators that should work for any subset
             if (chunk.size() > 0 && this.subset.lastRowKey() >= chunk.size()) {
                 throw new IllegalStateException(
@@ -97,7 +95,7 @@ abstract class BaseChunkInputStream extends DrainableColumn {
 
         @Override
         public void close() throws IOException {
-            BaseChunkInputStreamGenerator.this.close();
+            BaseChunkInputStreamGenerator.this.decrementReferenceCount();
             subset.close();
         }
 
diff --git a/extensions/barrage/src/main/java/io/deephaven/extensions/barrage/chunk/BooleanChunkInputStreamGenerator.java b/extensions/barrage/src/main/java/io/deephaven/extensions/barrage/chunk/BooleanChunkInputStreamGenerator.java
index 8c1503b67f8..b376fde388b 100644
--- a/extensions/barrage/src/main/java/io/deephaven/extensions/barrage/chunk/BooleanChunkInputStreamGenerator.java
+++ b/extensions/barrage/src/main/java/io/deephaven/extensions/barrage/chunk/BooleanChunkInputStreamGenerator.java
@@ -4,7 +4,6 @@
 package io.deephaven.extensions.barrage.chunk;
 
 import io.deephaven.chunk.ObjectChunk;
-import io.deephaven.chunk.WritableChunk;
 import io.deephaven.chunk.attributes.Values;
 import io.deephaven.chunk.util.pools.PoolableChunk;
 import io.deephaven.engine.rowset.RowSet;
@@ -15,14 +14,10 @@
 import io.deephaven.util.datastructures.LongSizedDataStructure;
 import io.deephaven.chunk.ByteChunk;
 import io.deephaven.chunk.WritableByteChunk;
-import io.deephaven.chunk.WritableLongChunk;
 import org.jetbrains.annotations.Nullable;
 
-import java.io.DataInput;
 import java.io.IOException;
 import java.io.OutputStream;
-import java.util.Iterator;
-import java.util.PrimitiveIterator;
 
 import static io.deephaven.util.QueryConstants.*;
 
@@ -153,130 +148,4 @@ public int drainTo(final OutputStream outputStream) throws IOException {
             return LongSizedDataStructure.intSize(DEBUG_NAME, bytesWritten);
         }
     }
-
-    @FunctionalInterface
-    public interface ByteConversion {
-        byte apply(byte in);
-
-        ByteConversion IDENTITY = (byte a) -> a;
-    }
-
-    static WritableChunk<Values> extractChunkFromInputStream(
-            final StreamReaderOptions options,
-            final Iterator<FieldNodeInfo> fieldNodeIter,
-            final PrimitiveIterator.OfLong bufferInfoIter,
-            final DataInput is,
-            final WritableChunk<Values> outChunk,
-            final int outOffset,
-            final int totalRows) throws IOException {
-        return extractChunkFromInputStreamWithConversion(
-                options, ByteConversion.IDENTITY, fieldNodeIter, bufferInfoIter, is, outChunk, outOffset, totalRows);
-    }
-
-    static WritableChunk<Values> extractChunkFromInputStreamWithConversion(
-            final StreamReaderOptions options,
-            final ByteConversion conversion,
-            final Iterator<FieldNodeInfo> fieldNodeIter,
-            final PrimitiveIterator.OfLong bufferInfoIter,
-            final DataInput is,
-            final WritableChunk<Values> outChunk,
-            final int outOffset,
-            final int totalRows) throws IOException {
-
-        final FieldNodeInfo nodeInfo = fieldNodeIter.next();
-        final long validityBuffer = bufferInfoIter.nextLong();
-        final long payloadBuffer = bufferInfoIter.nextLong();
-
-        final WritableByteChunk<Values> chunk;
-        if (outChunk != null) {
-            chunk = outChunk.asWritableByteChunk();
-        } else {
-            final int numRows = Math.max(totalRows, nodeInfo.numElements);
-            chunk = WritableByteChunk.makeWritableChunk(numRows);
-            chunk.setSize(numRows);
-        }
-
-        if (nodeInfo.numElements == 0) {
-            return chunk;
-        }
-
-        final int numValidityLongs = (nodeInfo.numElements + 63) / 64;
-        try (final WritableLongChunk<Values> isValid = WritableLongChunk.makeWritableChunk(numValidityLongs)) {
-            int jj = 0;
-            for (; jj < Math.min(numValidityLongs, validityBuffer / 8); ++jj) {
-                isValid.set(jj, is.readLong());
-            }
-            final long valBufRead = jj * 8L;
-            if (valBufRead < validityBuffer) {
-                is.skipBytes(LongSizedDataStructure.intSize(DEBUG_NAME, validityBuffer - valBufRead));
-            }
-            // we support short validity buffers
-            for (; jj < numValidityLongs; ++jj) {
-                isValid.set(jj, -1); // -1 is bit-wise representation of all ones
-            }
-            // consumed entire validity buffer by here
-
-            final int numPayloadBytesNeeded = (int) ((nodeInfo.numElements + 7L) / 8L);
-            if (payloadBuffer < numPayloadBytesNeeded) {
-                throw new IllegalStateException("payload buffer is too short for expected number of elements");
-            }
-
-            // cannot use deephaven nulls as booleans are not nullable
-            useValidityBuffer(conversion, is, nodeInfo, chunk, outOffset, isValid);
-
-            // flight requires that the payload buffer be padded to multiples of 8 bytes
-            final long payloadRead = getNumLongsForBitPackOfSize(nodeInfo.numElements) * 8L;
-            final long overhangPayload = payloadBuffer - payloadRead;
-            if (overhangPayload > 0) {
-                is.skipBytes(LongSizedDataStructure.intSize(DEBUG_NAME, overhangPayload));
-            }
-        }
-
-        return chunk;
-    }
-
-    private static void useValidityBuffer(
-            final ByteConversion conversion,
-            final DataInput is,
-            final FieldNodeInfo nodeInfo,
-            final WritableByteChunk<Values> chunk,
-            final int offset,
-            final WritableLongChunk<Values> isValid) throws IOException {
-        final int numElements = nodeInfo.numElements;
-        final int numValidityWords = (numElements + 63) / 64;
-
-        int ei = 0;
-        int pendingSkips = 0;
-
-        for (int vi = 0; vi < numValidityWords; ++vi) {
-            int bitsLeftInThisWord = Math.min(64, numElements - vi * 64);
-            long validityWord = isValid.get(vi);
-            long payloadWord = is.readLong();
-            do {
-                if ((validityWord & 1) == 1) {
-                    if (pendingSkips > 0) {
-                        chunk.fillWithNullValue(offset + ei, pendingSkips);
-                        ei += pendingSkips;
-                        pendingSkips = 0;
-                    }
-                    final byte value = (payloadWord & 1) == 1 ? BooleanUtils.TRUE_BOOLEAN_AS_BYTE
-                            : BooleanUtils.FALSE_BOOLEAN_AS_BYTE;
-                    chunk.set(offset + ei++, conversion.apply(value));
-                    validityWord >>= 1;
-                    payloadWord >>= 1;
-                    bitsLeftInThisWord--;
-                } else {
-                    final int skips = Math.min(Long.numberOfTrailingZeros(validityWord), bitsLeftInThisWord);
-                    pendingSkips += skips;
-                    validityWord >>= skips;
-                    payloadWord >>= skips;
-                    bitsLeftInThisWord -= skips;
-                }
-            } while (bitsLeftInThisWord > 0);
-        }
-
-        if (pendingSkips > 0) {
-            chunk.fillWithNullValue(offset + ei, pendingSkips);
-        }
-    }
 }
diff --git a/extensions/barrage/src/main/java/io/deephaven/extensions/barrage/chunk/BooleanChunkReader.java b/extensions/barrage/src/main/java/io/deephaven/extensions/barrage/chunk/BooleanChunkReader.java
new file mode 100644
index 00000000000..9195db956a4
--- /dev/null
+++ b/extensions/barrage/src/main/java/io/deephaven/extensions/barrage/chunk/BooleanChunkReader.java
@@ -0,0 +1,141 @@
+//
+// Copyright (c) 2016-2024 Deephaven Data Labs and Patent Pending
+//
+package io.deephaven.extensions.barrage.chunk;
+
+import io.deephaven.chunk.WritableByteChunk;
+import io.deephaven.chunk.WritableChunk;
+import io.deephaven.chunk.WritableLongChunk;
+import io.deephaven.chunk.attributes.Values;
+import io.deephaven.util.BooleanUtils;
+import io.deephaven.util.datastructures.LongSizedDataStructure;
+
+import java.io.DataInput;
+import java.io.IOException;
+import java.util.Iterator;
+import java.util.PrimitiveIterator;
+
+import static io.deephaven.extensions.barrage.chunk.BaseChunkInputStreamGenerator.getNumLongsForBitPackOfSize;
+
+public class BooleanChunkReader implements ChunkReader {
+    private static final String DEBUG_NAME = "BooleanChunkReader";
+
+    @FunctionalInterface
+    public interface ByteConversion {
+        byte apply(byte in);
+
+        ByteConversion IDENTITY = (byte a) -> a;
+    }
+
+    private final ByteConversion conversion;
+
+    public BooleanChunkReader() {
+        this(ByteConversion.IDENTITY);
+    }
+
+    public BooleanChunkReader(ByteConversion conversion) {
+        this.conversion = conversion;
+    }
+
+    @Override
+    public WritableChunk<Values> readChunk(Iterator<ChunkInputStreamGenerator.FieldNodeInfo> fieldNodeIter,
+            PrimitiveIterator.OfLong bufferInfoIter, DataInput is, WritableChunk<Values> outChunk, int outOffset,
+            int totalRows) throws IOException {
+        final ChunkInputStreamGenerator.FieldNodeInfo nodeInfo = fieldNodeIter.next();
+        final long validityBuffer = bufferInfoIter.nextLong();
+        final long payloadBuffer = bufferInfoIter.nextLong();
+
+        final WritableByteChunk<Values> chunk;
+        if (outChunk != null) {
+            chunk = outChunk.asWritableByteChunk();
+        } else {
+            final int numRows = Math.max(totalRows, nodeInfo.numElements);
+            chunk = WritableByteChunk.makeWritableChunk(numRows);
+            chunk.setSize(numRows);
+        }
+
+        if (nodeInfo.numElements == 0) {
+            return chunk;
+        }
+
+        final int numValidityLongs = (nodeInfo.numElements + 63) / 64;
+        try (final WritableLongChunk<Values> isValid = WritableLongChunk.makeWritableChunk(numValidityLongs)) {
+            int jj = 0;
+            for (; jj < Math.min(numValidityLongs, validityBuffer / 8); ++jj) {
+                isValid.set(jj, is.readLong());
+            }
+            final long valBufRead = jj * 8L;
+            if (valBufRead < validityBuffer) {
+                is.skipBytes(LongSizedDataStructure.intSize(DEBUG_NAME, validityBuffer - valBufRead));
+            }
+            // we support short validity buffers
+            for (; jj < numValidityLongs; ++jj) {
+                isValid.set(jj, -1); // -1 is bit-wise representation of all ones
+            }
+            // consumed entire validity buffer by here
+
+            final int numPayloadBytesNeeded = (int) ((nodeInfo.numElements + 7L) / 8L);
+            if (payloadBuffer < numPayloadBytesNeeded) {
+                throw new IllegalStateException("payload buffer is too short for expected number of elements");
+            }
+
+            // cannot use deephaven nulls as booleans are not nullable
+            useValidityBuffer(conversion, is, nodeInfo, chunk, outOffset, isValid);
+
+            // flight requires that the payload buffer be padded to multiples of 8 bytes
+            final long payloadRead = getNumLongsForBitPackOfSize(nodeInfo.numElements) * 8L;
+            final long overhangPayload = payloadBuffer - payloadRead;
+            if (overhangPayload > 0) {
+                is.skipBytes(LongSizedDataStructure.intSize(DEBUG_NAME, overhangPayload));
+            }
+        }
+
+        return chunk;
+    }
+
+
+    private static void useValidityBuffer(
+            final ByteConversion conversion,
+            final DataInput is,
+            final ChunkInputStreamGenerator.FieldNodeInfo nodeInfo,
+            final WritableByteChunk<Values> chunk,
+            final int offset,
+            final WritableLongChunk<Values> isValid) throws IOException {
+        final int numElements = nodeInfo.numElements;
+        final int numValidityWords = (numElements + 63) / 64;
+
+        int ei = 0;
+        int pendingSkips = 0;
+
+        for (int vi = 0; vi < numValidityWords; ++vi) {
+            int bitsLeftInThisWord = Math.min(64, numElements - vi * 64);
+            long validityWord = isValid.get(vi);
+            long payloadWord = is.readLong();
+            do {
+                if ((validityWord & 1) == 1) {
+                    if (pendingSkips > 0) {
+                        chunk.fillWithNullValue(offset + ei, pendingSkips);
+                        ei += pendingSkips;
+                        pendingSkips = 0;
+                    }
+                    final byte value = (payloadWord & 1) == 1 ? BooleanUtils.TRUE_BOOLEAN_AS_BYTE
+                            : BooleanUtils.FALSE_BOOLEAN_AS_BYTE;
+                    chunk.set(offset + ei++, conversion.apply(value));
+                    validityWord >>= 1;
+                    payloadWord >>= 1;
+                    bitsLeftInThisWord--;
+                } else {
+                    final int skips = Math.min(Long.numberOfTrailingZeros(validityWord), bitsLeftInThisWord);
+                    pendingSkips += skips;
+                    validityWord >>= skips;
+                    payloadWord >>= skips;
+                    bitsLeftInThisWord -= skips;
+                }
+            } while (bitsLeftInThisWord > 0);
+        }
+
+        if (pendingSkips > 0) {
+            chunk.fillWithNullValue(offset + ei, pendingSkips);
+        }
+    }
+}
diff --git a/extensions/barrage/src/main/java/io/deephaven/extensions/barrage/chunk/ByteChunkInputStreamGenerator.java b/extensions/barrage/src/main/java/io/deephaven/extensions/barrage/chunk/ByteChunkInputStreamGenerator.java
index 59efe7bfb33..d334e031bed 100644
--- a/extensions/barrage/src/main/java/io/deephaven/extensions/barrage/chunk/ByteChunkInputStreamGenerator.java
+++ b/extensions/barrage/src/main/java/io/deephaven/extensions/barrage/chunk/ByteChunkInputStreamGenerator.java
@@ -7,10 +7,7 @@
 // @formatter:off
 package io.deephaven.extensions.barrage.chunk;
 
-import io.deephaven.base.verify.Assert;
 import io.deephaven.chunk.ObjectChunk;
-import io.deephaven.chunk.WritableChunk;
-import io.deephaven.chunk.WritableObjectChunk;
 import io.deephaven.chunk.attributes.Values;
 import io.deephaven.chunk.util.pools.PoolableChunk;
 import io.deephaven.engine.primitive.function.ToByteFunction;
@@ -21,17 +18,11 @@
 import io.deephaven.util.datastructures.LongSizedDataStructure;
 import io.deephaven.chunk.ByteChunk;
 import io.deephaven.chunk.WritableByteChunk;
-import io.deephaven.chunk.WritableLongChunk;
 import io.deephaven.util.type.TypeUtils;
 import org.jetbrains.annotations.Nullable;
 
-import java.io.DataInput;
 import java.io.IOException;
 import java.io.OutputStream;
-import java.util.Iterator;
-import java.util.PrimitiveIterator;
-import java.util.function.Function;
-import java.util.function.IntFunction;
 
 import static io.deephaven.util.QueryConstants.*;
 
@@ -167,198 +158,4 @@ public int drainTo(final OutputStream outputStream) throws IOException {
             return LongSizedDataStructure.intSize("ByteChunkInputStreamGenerator", bytesWritten);
         }
     }
-
-    @FunctionalInterface
-    public interface ByteConversion {
-        byte apply(byte in);
-
-        ByteConversion IDENTITY = (byte a) -> a;
-    }
-
-    static WritableByteChunk<Values> extractChunkFromInputStream(
-            final int elementSize,
-            final StreamReaderOptions options,
-            final Iterator<FieldNodeInfo> fieldNodeIter,
-            final PrimitiveIterator.OfLong bufferInfoIter,
-            final DataInput is,
-            final WritableChunk<Values> outChunk,
-            final int outOffset,
-            final int totalRows) throws IOException {
-        return extractChunkFromInputStreamWithConversion(
-                elementSize, options, ByteConversion.IDENTITY, fieldNodeIter, bufferInfoIter, is, outChunk, outOffset,
-                totalRows);
-    }
-
-    static <T> WritableObjectChunk<T, Values> extractChunkFromInputStreamWithTransform(
-            final int elementSize,
-            final StreamReaderOptions options,
-            final Function<Byte, T> transform,
-            final Iterator<FieldNodeInfo> fieldNodeIter,
-            final PrimitiveIterator.OfLong bufferInfoIter,
-            final DataInput is,
-            final WritableChunk<Values> outChunk,
-            final int outOffset,
-            final int totalRows) throws IOException {
-
-        try (final WritableByteChunk<Values> inner = extractChunkFromInputStream(
-                elementSize, options, fieldNodeIter, bufferInfoIter, is, null, 0, 0)) {
-
-            final WritableObjectChunk<T, Values> chunk = castOrCreateChunk(
-                    outChunk,
-                    Math.max(totalRows, inner.size()),
-                    WritableObjectChunk::makeWritableChunk,
-                    WritableChunk::asWritableObjectChunk);
-
-            if (outChunk == null) {
-                // if we're not given an output chunk then we better be writing at the front of the new one
-                Assert.eqZero(outOffset, "outOffset");
-            }
-
-            for (int ii = 0; ii < inner.size(); ++ii) {
-                byte value = inner.get(ii);
-                chunk.set(outOffset + ii, transform.apply(value));
-            }
-
-            return chunk;
-        }
-    }
-
-    static WritableByteChunk<Values> extractChunkFromInputStreamWithConversion(
-            final int elementSize,
-            final StreamReaderOptions options,
-            final ByteConversion conversion,
-            final Iterator<FieldNodeInfo> fieldNodeIter,
-            final PrimitiveIterator.OfLong bufferInfoIter,
-            final DataInput is,
-            final WritableChunk<Values> outChunk,
-            final int outOffset,
-            final int totalRows) throws IOException {
-
-        final FieldNodeInfo nodeInfo = fieldNodeIter.next();
-        final long validityBuffer = bufferInfoIter.nextLong();
-        final long payloadBuffer = bufferInfoIter.nextLong();
-
-        final WritableByteChunk<Values> chunk = castOrCreateChunk(
-                outChunk,
-                Math.max(totalRows, nodeInfo.numElements),
-                WritableByteChunk::makeWritableChunk,
-                WritableChunk::asWritableByteChunk);
-
-        if (nodeInfo.numElements == 0) {
-            return chunk;
-        }
-
-        final int numValidityLongs = options.useDeephavenNulls() ? 0 : (nodeInfo.numElements + 63) / 64;
-        try (final WritableLongChunk<Values> isValid = WritableLongChunk.makeWritableChunk(numValidityLongs)) {
-            if (options.useDeephavenNulls() && validityBuffer != 0) {
-                throw new IllegalStateException("validity buffer is non-empty, but is unnecessary");
-            }
-            int jj = 0;
-            for (; jj < Math.min(numValidityLongs, validityBuffer / 8); ++jj) {
-                isValid.set(jj, is.readLong());
-            }
-            final long valBufRead = jj * 8L;
-            if (valBufRead < validityBuffer) {
-                is.skipBytes(LongSizedDataStructure.intSize(DEBUG_NAME, validityBuffer - valBufRead));
-            }
-            // we support short validity buffers
-            for (; jj < numValidityLongs; ++jj) {
-                isValid.set(jj, -1); // -1 is bit-wise representation of all ones
-            }
-            // consumed entire validity buffer by here
-
-            final long payloadRead = (long) nodeInfo.numElements * elementSize;
-            if (payloadBuffer < payloadRead) {
-                throw new IllegalStateException("payload buffer is too short for expected number of elements");
-            }
-
-            if (options.useDeephavenNulls()) {
-                useDeephavenNulls(conversion, is, nodeInfo, chunk, outOffset);
-            } else {
-                useValidityBuffer(elementSize, conversion, is, nodeInfo, chunk, outOffset, isValid);
-            }
-
-            final long overhangPayload = payloadBuffer - payloadRead;
-            if (overhangPayload > 0) {
-                is.skipBytes(LongSizedDataStructure.intSize(DEBUG_NAME, overhangPayload));
-            }
-        }
-
-        return chunk;
-    }
-
-    private static <T extends WritableChunk<Values>> T castOrCreateChunk(
-            final WritableChunk<Values> outChunk,
-            final int numRows,
-            final IntFunction<T> chunkFactory,
-            final Function<WritableChunk<Values>, T> castFunction) {
-        if (outChunk != null) {
-            return castFunction.apply(outChunk);
-        }
-        final T newChunk = chunkFactory.apply(numRows);
-        newChunk.setSize(numRows);
-        return newChunk;
-    }
-
-    private static void useDeephavenNulls(
-            final ByteConversion conversion,
-            final DataInput is,
-            final FieldNodeInfo nodeInfo,
-            final WritableByteChunk<Values> chunk,
-            final int offset) throws IOException {
-        if (conversion == ByteConversion.IDENTITY) {
-            for (int ii = 0; ii < nodeInfo.numElements; ++ii) {
-                chunk.set(offset + ii, is.readByte());
-            }
-        } else {
-            for (int ii = 0; ii < nodeInfo.numElements; ++ii) {
-                final byte in = is.readByte();
-                final byte out = in == NULL_BYTE ? in : conversion.apply(in);
-                chunk.set(offset + ii, out);
-            }
-        }
-    }
-
-    private static void useValidityBuffer(
-            final int elementSize,
-            final ByteConversion conversion,
-            final DataInput is,
-            final FieldNodeInfo nodeInfo,
-            final WritableByteChunk<Values> chunk,
-            final int offset,
-            final WritableLongChunk<Values> isValid) throws IOException {
-        final int numElements = nodeInfo.numElements;
-        final int numValidityWords = (numElements + 63) / 64;
-
-        int ei = 0;
-        int pendingSkips = 0;
-
-        for (int vi = 0; vi < numValidityWords; ++vi) {
-            int bitsLeftInThisWord = Math.min(64, numElements - vi * 64);
-            long validityWord = isValid.get(vi);
-            do {
-                if ((validityWord & 1) == 1) {
-                    if (pendingSkips > 0) {
-                        is.skipBytes(pendingSkips * elementSize);
-                        chunk.fillWithNullValue(offset + ei, pendingSkips);
-                        ei += pendingSkips;
-                        pendingSkips = 0;
-                    }
-                    chunk.set(offset + ei++, conversion.apply(is.readByte()));
-                    validityWord >>= 1;
-                    bitsLeftInThisWord--;
-                } else {
-                    final int skips = Math.min(Long.numberOfTrailingZeros(validityWord), bitsLeftInThisWord);
-                    pendingSkips += skips;
-                    validityWord >>= skips;
-                    bitsLeftInThisWord -= skips;
-                }
-            } while (bitsLeftInThisWord > 0);
-        }
-
-        if (pendingSkips > 0) {
-            is.skipBytes(pendingSkips * elementSize);
-            chunk.fillWithNullValue(offset + ei, pendingSkips);
-        }
-    }
 }
diff --git a/extensions/barrage/src/main/java/io/deephaven/extensions/barrage/chunk/ByteChunkReader.java b/extensions/barrage/src/main/java/io/deephaven/extensions/barrage/chunk/ByteChunkReader.java
new file mode 100644
index 00000000000..d9a473df93f
--- /dev/null
+++ b/extensions/barrage/src/main/java/io/deephaven/extensions/barrage/chunk/ByteChunkReader.java
@@ -0,0 +1,204 @@
+//
+// Copyright (c) 2016-2024 Deephaven Data Labs and Patent Pending
+//
+// ****** AUTO-GENERATED CLASS - DO NOT EDIT MANUALLY
+// ****** Edit CharChunkReader and run "./gradlew replicateBarrageUtils" to regenerate
+//
+// @formatter:off
+package io.deephaven.extensions.barrage.chunk;
+
+import io.deephaven.base.verify.Assert;
+import io.deephaven.chunk.WritableByteChunk;
+import io.deephaven.chunk.WritableChunk;
+import io.deephaven.chunk.WritableLongChunk;
+import io.deephaven.chunk.WritableObjectChunk;
+import io.deephaven.chunk.attributes.Values;
+import io.deephaven.extensions.barrage.util.StreamReaderOptions;
+import io.deephaven.util.datastructures.LongSizedDataStructure;
+
+import java.io.DataInput;
+import java.io.IOException;
+import java.util.Iterator;
+import java.util.PrimitiveIterator;
+import java.util.function.Function;
+import java.util.function.IntFunction;
+
+import static io.deephaven.util.QueryConstants.NULL_BYTE;
+
+public class ByteChunkReader implements ChunkReader {
+    private static final String DEBUG_NAME = "ByteChunkReader";
+    private final StreamReaderOptions options;
+    private final ByteConversion conversion;
+
+    @FunctionalInterface
+    public interface ByteConversion {
+        byte apply(byte in);
+
+        ByteConversion IDENTITY = (byte a) -> a;
+    }
+
+    public ByteChunkReader(StreamReaderOptions options) {
+        this(options, ByteConversion.IDENTITY);
+    }
+
+    public ByteChunkReader(StreamReaderOptions options, ByteConversion conversion) {
+        this.options = options;
+        this.conversion = conversion;
+    }
+
+    public <T> ChunkReader transform(Function<Byte, T> transform) {
+        return (fieldNodeIter, bufferInfoIter, is, outChunk, outOffset, totalRows) -> {
+            try (final WritableByteChunk<Values> inner = ByteChunkReader.this.readChunk(
+                    fieldNodeIter, bufferInfoIter, is, null, 0, 0)) {
+
+                final WritableObjectChunk<T, Values> chunk = castOrCreateChunk(
+                        outChunk,
+                        Math.max(totalRows, inner.size()),
+                        WritableObjectChunk::makeWritableChunk,
+                        WritableChunk::asWritableObjectChunk);
+
+                if (outChunk == null) {
+                    // if we're not given an output chunk then we better be writing at the front of the new one
+                    Assert.eqZero(outOffset, "outOffset");
+                }
+
+                for (int ii = 0; ii < inner.size(); ++ii) {
+                    byte value = inner.get(ii);
+                    chunk.set(outOffset + ii, transform.apply(value));
+                }
+
+                return chunk;
+            }
+        };
+    }
+
+    @Override
+    public WritableByteChunk<Values> readChunk(Iterator<ChunkInputStreamGenerator.FieldNodeInfo> fieldNodeIter,
+            PrimitiveIterator.OfLong bufferInfoIter, DataInput is, WritableChunk<Values> outChunk, int outOffset,
+            int totalRows) throws IOException {
+
+        final ChunkInputStreamGenerator.FieldNodeInfo nodeInfo = fieldNodeIter.next();
+        final long validityBuffer = bufferInfoIter.nextLong();
+        final long payloadBuffer = bufferInfoIter.nextLong();
+
+        final WritableByteChunk<Values> chunk = castOrCreateChunk(
+                outChunk,
+                Math.max(totalRows, nodeInfo.numElements),
+                WritableByteChunk::makeWritableChunk,
+                WritableChunk::asWritableByteChunk);
+
+        if (nodeInfo.numElements == 0) {
+            return chunk;
+        }
+
+        final int numValidityLongs = options.useDeephavenNulls() ? 0 : (nodeInfo.numElements + 63) / 64;
+        try (final WritableLongChunk<Values> isValid = WritableLongChunk.makeWritableChunk(numValidityLongs)) {
+            if (options.useDeephavenNulls() && validityBuffer != 0) {
+                throw new IllegalStateException("validity buffer is non-empty, but is unnecessary");
+            }
+            int jj = 0;
+            for (; jj < Math.min(numValidityLongs, validityBuffer / 8); ++jj) {
+                isValid.set(jj, is.readLong());
+            }
+            final long valBufRead = jj * 8L;
+            if (valBufRead < validityBuffer) {
+                is.skipBytes(LongSizedDataStructure.intSize(DEBUG_NAME, validityBuffer - valBufRead));
+            }
+            // we support short validity buffers
+            for (; jj < numValidityLongs; ++jj) {
+                isValid.set(jj, -1); // -1 is bit-wise representation of all ones
+            }
+            // consumed entire validity buffer by here
+
+            final long payloadRead = (long) nodeInfo.numElements * Byte.BYTES;
+            Assert.geq(payloadBuffer, "payloadBuffer", payloadRead, "payloadRead");
+
+            if (options.useDeephavenNulls()) {
+                useDeephavenNulls(conversion, is, nodeInfo, chunk, outOffset);
+            } else {
+                useValidityBuffer(conversion, is, nodeInfo, chunk, outOffset, isValid);
+            }
+
+            final long overhangPayload = payloadBuffer - payloadRead;
+            if (overhangPayload > 0) {
+                is.skipBytes(LongSizedDataStructure.intSize(DEBUG_NAME, overhangPayload));
+            }
+        }
+
+        return chunk;
+    }
+
+    private static <T extends WritableChunk<Values>> T castOrCreateChunk(
+            final WritableChunk<Values> outChunk,
+            final int numRows,
+            final IntFunction<T> chunkFactory,
+            final Function<WritableChunk<Values>, T> castFunction) {
+        if (outChunk != null) {
+            return castFunction.apply(outChunk);
+        }
+        final T newChunk = chunkFactory.apply(numRows);
+        newChunk.setSize(numRows);
+        return newChunk;
+    }
+
+    private static void useDeephavenNulls(
+            final ByteConversion conversion,
+            final DataInput is,
+            final ChunkInputStreamGenerator.FieldNodeInfo nodeInfo,
+            final WritableByteChunk<Values> chunk,
+            final int offset) throws IOException {
+        if (conversion == ByteConversion.IDENTITY) {
+            for (int ii = 0; ii < nodeInfo.numElements; ++ii) {
+                chunk.set(offset + ii, is.readByte());
+            }
+        } else {
+            for (int ii = 0; ii < nodeInfo.numElements; ++ii) {
+                final byte in = is.readByte();
+                final byte out = in == NULL_BYTE ? in : conversion.apply(in);
+                chunk.set(offset + ii, out);
+            }
+        }
+    }
+
+    private static void useValidityBuffer(
+            final ByteConversion conversion,
+            final DataInput is,
+            final ChunkInputStreamGenerator.FieldNodeInfo nodeInfo,
+            final WritableByteChunk<Values> chunk,
+            final int offset,
+            final WritableLongChunk<Values> isValid) throws IOException {
+        final int numElements = nodeInfo.numElements;
+        final int numValidityWords = (numElements + 63) / 64;
+
+        int ei = 0;
+        int pendingSkips = 0;
+
+        for (int vi = 0; vi < numValidityWords; ++vi) {
+            int bitsLeftInThisWord = Math.min(64, numElements - vi * 64);
+            long validityWord = isValid.get(vi);
+            do {
+                if ((validityWord & 1) == 1) {
+                    if (pendingSkips > 0) {
+                        is.skipBytes(pendingSkips * Byte.BYTES);
+                        chunk.fillWithNullValue(offset + ei, pendingSkips);
+                        ei += pendingSkips;
+                        pendingSkips = 0;
+                    }
+                    chunk.set(offset + ei++, conversion.apply(is.readByte()));
+                    validityWord >>= 1;
+                    bitsLeftInThisWord--;
+                } else {
+                    final int skips = Math.min(Long.numberOfTrailingZeros(validityWord), bitsLeftInThisWord);
+                    pendingSkips += skips;
+                    validityWord >>= skips;
+                    bitsLeftInThisWord -= skips;
+                }
+            } while (bitsLeftInThisWord > 0);
+        }
+
+        if (pendingSkips > 0) {
+            is.skipBytes(pendingSkips * Byte.BYTES);
+            chunk.fillWithNullValue(offset + ei, pendingSkips);
+        }
+    }
+}
diff --git a/extensions/barrage/src/main/java/io/deephaven/extensions/barrage/chunk/CharChunkInputStreamGenerator.java b/extensions/barrage/src/main/java/io/deephaven/extensions/barrage/chunk/CharChunkInputStreamGenerator.java
index 212ef4c33bd..83b1f2f72f1 100644
--- a/extensions/barrage/src/main/java/io/deephaven/extensions/barrage/chunk/CharChunkInputStreamGenerator.java
+++ b/extensions/barrage/src/main/java/io/deephaven/extensions/barrage/chunk/CharChunkInputStreamGenerator.java
@@ -3,10 +3,7 @@
 //
 package io.deephaven.extensions.barrage.chunk;
 
-import io.deephaven.base.verify.Assert;
 import io.deephaven.chunk.ObjectChunk;
-import io.deephaven.chunk.WritableChunk;
-import io.deephaven.chunk.WritableObjectChunk;
 import io.deephaven.chunk.attributes.Values;
 import io.deephaven.chunk.util.pools.PoolableChunk;
 import io.deephaven.engine.primitive.function.ToCharFunction;
@@ -17,17 +14,11 @@
 import io.deephaven.util.datastructures.LongSizedDataStructure;
 import io.deephaven.chunk.CharChunk;
 import io.deephaven.chunk.WritableCharChunk;
-import io.deephaven.chunk.WritableLongChunk;
 import io.deephaven.util.type.TypeUtils;
 import org.jetbrains.annotations.Nullable;
 
-import java.io.DataInput;
 import java.io.IOException;
 import java.io.OutputStream;
-import java.util.Iterator;
-import java.util.PrimitiveIterator;
-import java.util.function.Function;
-import java.util.function.IntFunction;
 
 import static io.deephaven.util.QueryConstants.*;
 
@@ -163,198 +154,4 @@ public int drainTo(final OutputStream outputStream) throws IOException {
             return LongSizedDataStructure.intSize("CharChunkInputStreamGenerator", bytesWritten);
         }
     }
-
-    @FunctionalInterface
-    public interface CharConversion {
-        char apply(char in);
-
-        CharConversion IDENTITY = (char a) -> a;
-    }
-
-    static WritableCharChunk<Values> extractChunkFromInputStream(
-            final int elementSize,
-            final StreamReaderOptions options,
-            final Iterator<FieldNodeInfo> fieldNodeIter,
-            final PrimitiveIterator.OfLong bufferInfoIter,
-            final DataInput is,
-            final WritableChunk<Values> outChunk,
-            final int outOffset,
-            final int totalRows) throws IOException {
-        return extractChunkFromInputStreamWithConversion(
-                elementSize, options, CharConversion.IDENTITY, fieldNodeIter, bufferInfoIter, is, outChunk, outOffset,
-                totalRows);
-    }
-
-    static <T> WritableObjectChunk<T, Values> extractChunkFromInputStreamWithTransform(
-            final int elementSize,
-            final StreamReaderOptions options,
-            final Function<Character, T> transform,
-            final Iterator<FieldNodeInfo> fieldNodeIter,
-            final PrimitiveIterator.OfLong bufferInfoIter,
-            final DataInput is,
-            final WritableChunk<Values> outChunk,
-            final int outOffset,
-            final int totalRows) throws IOException {
-
-        try (final WritableCharChunk<Values> inner = extractChunkFromInputStream(
-                elementSize, options, fieldNodeIter, bufferInfoIter, is, null, 0, 0)) {
-
-            final WritableObjectChunk<T, Values> chunk = castOrCreateChunk(
-                    outChunk,
-                    Math.max(totalRows, inner.size()),
-                    WritableObjectChunk::makeWritableChunk,
-                    WritableChunk::asWritableObjectChunk);
-
-            if (outChunk == null) {
-                // if we're not given an output chunk then we better be writing at the front of the new one
-                Assert.eqZero(outOffset, "outOffset");
-            }
-
-            for (int ii = 0; ii < inner.size(); ++ii) {
-                char value = inner.get(ii);
-                chunk.set(outOffset + ii, transform.apply(value));
-            }
-
-            return chunk;
-        }
-    }
-
-    static WritableCharChunk<Values> extractChunkFromInputStreamWithConversion(
-            final int elementSize,
-            final StreamReaderOptions options,
-            final CharConversion conversion,
-            final Iterator<FieldNodeInfo> fieldNodeIter,
-            final PrimitiveIterator.OfLong bufferInfoIter,
-            final DataInput is,
-            final WritableChunk<Values> outChunk,
-            final int outOffset,
-            final int totalRows) throws IOException {
-
-        final FieldNodeInfo nodeInfo = fieldNodeIter.next();
-        final long validityBuffer = bufferInfoIter.nextLong();
-        final long payloadBuffer = bufferInfoIter.nextLong();
-
-        final WritableCharChunk<Values> chunk = castOrCreateChunk(
-                outChunk,
-                Math.max(totalRows, nodeInfo.numElements),
-                WritableCharChunk::makeWritableChunk,
-                WritableChunk::asWritableCharChunk);
-
-        if (nodeInfo.numElements == 0) {
-            return chunk;
-        }
-
-        final int numValidityLongs = options.useDeephavenNulls() ? 0 : (nodeInfo.numElements + 63) / 64;
-        try (final WritableLongChunk<Values> isValid = WritableLongChunk.makeWritableChunk(numValidityLongs)) {
-            if (options.useDeephavenNulls() && validityBuffer != 0) {
-                throw new IllegalStateException("validity buffer is non-empty, but is unnecessary");
-            }
-            int jj = 0;
-            for (; jj < Math.min(numValidityLongs, validityBuffer / 8); ++jj) {
-                isValid.set(jj, is.readLong());
-            }
-            final long valBufRead = jj * 8L;
-            if (valBufRead < validityBuffer) {
-                is.skipBytes(LongSizedDataStructure.intSize(DEBUG_NAME, validityBuffer - valBufRead));
-            }
-            // we support short validity buffers
-            for (; jj < numValidityLongs; ++jj) {
-                isValid.set(jj, -1); // -1 is bit-wise representation of all ones
-            }
-            // consumed entire validity buffer by here
-
-            final long payloadRead = (long) nodeInfo.numElements * elementSize;
-            if (payloadBuffer < payloadRead) {
-                throw new IllegalStateException("payload buffer is too short for expected number of elements");
-            }
-
-            if (options.useDeephavenNulls()) {
-                useDeephavenNulls(conversion, is, nodeInfo, chunk, outOffset);
-            } else {
-                useValidityBuffer(elementSize, conversion, is, nodeInfo, chunk, outOffset, isValid);
-            }
-
-            final long overhangPayload = payloadBuffer - payloadRead;
-            if (overhangPayload > 0) {
-                is.skipBytes(LongSizedDataStructure.intSize(DEBUG_NAME, overhangPayload));
-            }
-        }
-
-        return chunk;
-    }
-
-    private static <T extends WritableChunk<Values>> T castOrCreateChunk(
-            final WritableChunk<Values> outChunk,
-            final int numRows,
-            final IntFunction<T> chunkFactory,
-            final Function<WritableChunk<Values>, T> castFunction) {
-        if (outChunk != null) {
-            return castFunction.apply(outChunk);
-        }
-        final T newChunk = chunkFactory.apply(numRows);
-        newChunk.setSize(numRows);
-        return newChunk;
-    }
-
-    private static void useDeephavenNulls(
-            final CharConversion conversion,
-            final DataInput is,
-            final FieldNodeInfo nodeInfo,
-            final WritableCharChunk<Values> chunk,
-            final int offset) throws IOException {
-        if (conversion == CharConversion.IDENTITY) {
-            for (int ii = 0; ii < nodeInfo.numElements; ++ii) {
-                chunk.set(offset + ii, is.readChar());
-            }
-        } else {
-            for (int ii = 0; ii < nodeInfo.numElements; ++ii) {
-                final char in = is.readChar();
-                final char out = in == NULL_CHAR ? in : conversion.apply(in);
-                chunk.set(offset + ii, out);
-            }
-        }
-    }
-
-    private static void useValidityBuffer(
-            final int elementSize,
-            final CharConversion conversion,
-            final DataInput is,
-            final FieldNodeInfo nodeInfo,
-            final WritableCharChunk<Values> chunk,
-            final int offset,
-            final WritableLongChunk<Values> isValid) throws IOException {
-        final int numElements = nodeInfo.numElements;
-        final int numValidityWords = (numElements + 63) / 64;
-
-        int ei = 0;
-        int pendingSkips = 0;
-
-        for (int vi = 0; vi < numValidityWords; ++vi) {
-            int bitsLeftInThisWord = Math.min(64, numElements - vi * 64);
-            long validityWord = isValid.get(vi);
-            do {
-                if ((validityWord & 1) == 1) {
-                    if (pendingSkips > 0) {
-                        is.skipBytes(pendingSkips * elementSize);
-                        chunk.fillWithNullValue(offset + ei, pendingSkips);
-                        ei += pendingSkips;
-                        pendingSkips = 0;
-                    }
-                    chunk.set(offset + ei++, conversion.apply(is.readChar()));
-                    validityWord >>= 1;
-                    bitsLeftInThisWord--;
-                } else {
-                    final int skips = Math.min(Long.numberOfTrailingZeros(validityWord), bitsLeftInThisWord);
-                    pendingSkips += skips;
-                    validityWord >>= skips;
-                    bitsLeftInThisWord -= skips;
-                }
-            } while (bitsLeftInThisWord > 0);
-        }
-
-        if (pendingSkips > 0) {
-            is.skipBytes(pendingSkips * elementSize);
-            chunk.fillWithNullValue(offset + ei, pendingSkips);
-        }
-    }
 }
diff --git a/extensions/barrage/src/main/java/io/deephaven/extensions/barrage/chunk/CharChunkReader.java b/extensions/barrage/src/main/java/io/deephaven/extensions/barrage/chunk/CharChunkReader.java
new file mode 100644
index 00000000000..d3fc3ed47a7
--- /dev/null
+++ b/extensions/barrage/src/main/java/io/deephaven/extensions/barrage/chunk/CharChunkReader.java
@@ -0,0 +1,200 @@
+//
+// Copyright (c) 2016-2024 Deephaven Data Labs and Patent Pending
+//
+package io.deephaven.extensions.barrage.chunk;
+
+import io.deephaven.base.verify.Assert;
+import io.deephaven.chunk.WritableCharChunk;
+import io.deephaven.chunk.WritableChunk;
+import io.deephaven.chunk.WritableLongChunk;
+import io.deephaven.chunk.WritableObjectChunk;
+import io.deephaven.chunk.attributes.Values;
+import io.deephaven.extensions.barrage.util.StreamReaderOptions;
+import io.deephaven.util.datastructures.LongSizedDataStructure;
+
+import java.io.DataInput;
+import java.io.IOException;
+import java.util.Iterator;
+import java.util.PrimitiveIterator;
+import java.util.function.Function;
+import java.util.function.IntFunction;
+
+import static io.deephaven.util.QueryConstants.NULL_CHAR;
+
+public class CharChunkReader implements ChunkReader {
+    private static final String DEBUG_NAME = "CharChunkReader";
+    private final StreamReaderOptions options;
+    private final CharConversion conversion;
+
+    @FunctionalInterface
+    public interface CharConversion {
+        char apply(char in);
+
+        CharConversion IDENTITY = (char a) -> a;
+    }
+
+    public CharChunkReader(StreamReaderOptions options) {
+        this(options, CharConversion.IDENTITY);
+    }
+
+    public CharChunkReader(StreamReaderOptions options, CharConversion conversion) {
+        this.options = options;
+        this.conversion = conversion;
+    }
+
+    public <T> ChunkReader transform(Function<Character, T> transform) {
+        return (fieldNodeIter, bufferInfoIter, is, outChunk, outOffset, totalRows) -> {
+            try (final WritableCharChunk<Values> inner = CharChunkReader.this.readChunk(
+                    fieldNodeIter, bufferInfoIter, is, null, 0, 0)) {
+
+                final WritableObjectChunk<T, Values> chunk = castOrCreateChunk(
+                        outChunk,
+                        Math.max(totalRows, inner.size()),
+                        WritableObjectChunk::makeWritableChunk,
+                        WritableChunk::asWritableObjectChunk);
+
+                if (outChunk == null) {
+                    // if we're not given an output chunk then we better be writing at the front of the new one
+                    Assert.eqZero(outOffset, "outOffset");
+                }
+
+                for (int ii = 0; ii < inner.size(); ++ii) {
+                    char value = inner.get(ii);
+                    chunk.set(outOffset + ii, transform.apply(value));
+                }
+
+                return chunk;
+            }
+        };
+    }
+
+    @Override
+    public WritableCharChunk<Values> readChunk(Iterator<ChunkInputStreamGenerator.FieldNodeInfo> fieldNodeIter,
+            PrimitiveIterator.OfLong bufferInfoIter, DataInput is, WritableChunk<Values> outChunk, int outOffset,
+            int totalRows) throws IOException {
+
+        final ChunkInputStreamGenerator.FieldNodeInfo nodeInfo = fieldNodeIter.next();
+        final long validityBuffer = bufferInfoIter.nextLong();
+        final long payloadBuffer = bufferInfoIter.nextLong();
+
+        final WritableCharChunk<Values> chunk = castOrCreateChunk(
+                outChunk,
+                Math.max(totalRows, nodeInfo.numElements),
+                WritableCharChunk::makeWritableChunk,
+                WritableChunk::asWritableCharChunk);
+
+        if (nodeInfo.numElements == 0) {
+            return chunk;
+        }
+
+        final int numValidityLongs = options.useDeephavenNulls() ? 0 : (nodeInfo.numElements + 63) / 64;
+        try (final WritableLongChunk<Values> isValid = WritableLongChunk.makeWritableChunk(numValidityLongs)) {
+            if (options.useDeephavenNulls() && validityBuffer != 0) {
+                throw new IllegalStateException("validity buffer is non-empty, but is unnecessary");
+            }
+            int jj = 0;
+            for (; jj < Math.min(numValidityLongs, validityBuffer / 8); ++jj) {
+                isValid.set(jj, is.readLong());
+            }
+            final long valBufRead = jj * 8L;
+            if (valBufRead < validityBuffer) {
+                is.skipBytes(LongSizedDataStructure.intSize(DEBUG_NAME, validityBuffer - valBufRead));
+            }
+            // we support short validity buffers
+            for (; jj < numValidityLongs; ++jj) {
+                isValid.set(jj, -1); // -1 is bit-wise representation of all ones
+            }
+            // consumed entire validity buffer by here
+
+            final long payloadRead = (long) nodeInfo.numElements * Character.BYTES;
+            Assert.geq(payloadBuffer, "payloadBuffer", payloadRead, "payloadRead");
+
+            if (options.useDeephavenNulls()) {
+                useDeephavenNulls(conversion, is, nodeInfo, chunk, outOffset);
+            } else {
+                useValidityBuffer(conversion, is, nodeInfo, chunk, outOffset, isValid);
+            }
+
+            final long overhangPayload = payloadBuffer - payloadRead;
+            if (overhangPayload > 0) {
+                is.skipBytes(LongSizedDataStructure.intSize(DEBUG_NAME, overhangPayload));
+            }
+        }
+
+        return chunk;
+    }
+
+    private static <T extends WritableChunk<Values>> T castOrCreateChunk(
+            final WritableChunk<Values> outChunk,
+            final int numRows,
+            final IntFunction<T> chunkFactory,
+            final Function<WritableChunk<Values>, T> castFunction) {
+        if (outChunk != null) {
+            return castFunction.apply(outChunk);
+        }
+        final T newChunk = chunkFactory.apply(numRows);
+        newChunk.setSize(numRows);
+        return newChunk;
+    }
+
+    private static void useDeephavenNulls(
+            final CharConversion conversion,
+            final DataInput is,
+            final ChunkInputStreamGenerator.FieldNodeInfo nodeInfo,
+            final WritableCharChunk<Values> chunk,
+            final int offset) throws IOException {
+        if (conversion == CharConversion.IDENTITY) {
+            for (int ii = 0; ii < nodeInfo.numElements; ++ii) {
+                chunk.set(offset + ii, is.readChar());
+            }
+        } else {
+            for (int ii = 0; ii < nodeInfo.numElements; ++ii) {
+                final char in = is.readChar();
+                final char out = in == NULL_CHAR ? in : conversion.apply(in);
+                chunk.set(offset + ii, out);
+            }
+        }
+    }
+
+    private static void useValidityBuffer(
+            final CharConversion conversion,
+            final DataInput is,
+            final ChunkInputStreamGenerator.FieldNodeInfo nodeInfo,
+            final WritableCharChunk<Values> chunk,
+            final int offset,
+            final WritableLongChunk<Values> isValid) throws IOException {
+        final int numElements = nodeInfo.numElements;
+        final int numValidityWords = (numElements + 63) / 64;
+
+        int ei = 0;
+        int pendingSkips = 0;
+
+        for (int vi = 0; vi < numValidityWords; ++vi) {
+            int bitsLeftInThisWord = Math.min(64, numElements - vi * 64);
+            long validityWord = isValid.get(vi);
+            do {
+                if ((validityWord & 1) == 1) {
+                    if (pendingSkips > 0) {
+                        is.skipBytes(pendingSkips * Character.BYTES);
+                        chunk.fillWithNullValue(offset + ei, pendingSkips);
+                        ei += pendingSkips;
+                        pendingSkips = 0;
+                    }
+                    chunk.set(offset + ei++, conversion.apply(is.readChar()));
+                    validityWord >>= 1;
+                    bitsLeftInThisWord--;
+                } else {
+                    final int skips = Math.min(Long.numberOfTrailingZeros(validityWord), bitsLeftInThisWord);
+                    pendingSkips += skips;
+                    validityWord >>= skips;
+                    bitsLeftInThisWord -= skips;
+                }
+            } while (bitsLeftInThisWord > 0);
+        }
+
+        if (pendingSkips > 0) {
+            is.skipBytes(pendingSkips * Character.BYTES);
+            chunk.fillWithNullValue(offset + ei, pendingSkips);
+        }
+    }
+}
diff --git a/extensions/barrage/src/main/java/io/deephaven/extensions/barrage/chunk/ChunkInputStreamGenerator.java b/extensions/barrage/src/main/java/io/deephaven/extensions/barrage/chunk/ChunkInputStreamGenerator.java
index 92c62dd1d00..bfd22d342e4 100644
--- a/extensions/barrage/src/main/java/io/deephaven/extensions/barrage/chunk/ChunkInputStreamGenerator.java
+++ b/extensions/barrage/src/main/java/io/deephaven/extensions/barrage/chunk/ChunkInputStreamGenerator.java
@@ -3,374 +3,47 @@
 //
 package io.deephaven.extensions.barrage.chunk;
 
-import com.google.common.base.Charsets;
-import io.deephaven.chunk.ObjectChunk;
-import io.deephaven.chunk.WritableChunk;
-import io.deephaven.chunk.WritableLongChunk;
 import io.deephaven.chunk.attributes.Values;
-import io.deephaven.chunk.util.pools.PoolableChunk;
 import io.deephaven.engine.rowset.RowSet;
-import io.deephaven.extensions.barrage.ColumnConversionMode;
 import io.deephaven.extensions.barrage.util.DefensiveDrainable;
 import io.deephaven.extensions.barrage.util.StreamReaderOptions;
-import io.deephaven.time.DateTimeUtils;
 import io.deephaven.util.QueryConstants;
 import io.deephaven.util.datastructures.LongSizedDataStructure;
 import io.deephaven.chunk.Chunk;
 import io.deephaven.chunk.ChunkType;
 import io.deephaven.util.SafeCloseable;
-import io.deephaven.util.type.TypeUtils;
-import io.deephaven.vector.Vector;
 import org.jetbrains.annotations.Nullable;
 
-import java.io.DataInput;
 import java.io.IOException;
-import java.math.BigDecimal;
-import java.math.BigInteger;
-import java.time.Instant;
-import java.time.LocalDate;
-import java.time.LocalTime;
-import java.time.ZonedDateTime;
-import java.util.Arrays;
-import java.util.Iterator;
-import java.util.PrimitiveIterator;
 
 public interface ChunkInputStreamGenerator extends SafeCloseable {
     long MS_PER_DAY = 24 * 60 * 60 * 1000L;
     long MIN_LOCAL_DATE_VALUE = QueryConstants.MIN_LONG / MS_PER_DAY;
     long MAX_LOCAL_DATE_VALUE = QueryConstants.MAX_LONG / MS_PER_DAY;
 
-    static <T> ChunkInputStreamGenerator makeInputStreamGenerator(
-            final ChunkType chunkType,
-            final Class<T> type,
-            final Class<?> componentType,
-            final Chunk<Values> chunk,
-            final long rowOffset) {
-        // TODO (deephaven-core#5453): pass in ArrowType to enable ser/deser of single java class in multiple formats
-        switch (chunkType) {
-            case Boolean:
-                throw new UnsupportedOperationException("Booleans are reinterpreted as bytes");
-            case Char:
-                return new CharChunkInputStreamGenerator(chunk.asCharChunk(), Character.BYTES, rowOffset);
-            case Byte:
-                if (type == Boolean.class || type == boolean.class) {
-                    // internally we represent booleans as bytes, but the wire format respects arrow's specification
-                    return new BooleanChunkInputStreamGenerator(chunk.asByteChunk(), rowOffset);
-                }
-                return new ByteChunkInputStreamGenerator(chunk.asByteChunk(), Byte.BYTES, rowOffset);
-            case Short:
-                return new ShortChunkInputStreamGenerator(chunk.asShortChunk(), Short.BYTES, rowOffset);
-            case Int:
-                return new IntChunkInputStreamGenerator(chunk.asIntChunk(), Integer.BYTES, rowOffset);
-            case Long:
-                return new LongChunkInputStreamGenerator(chunk.asLongChunk(), Long.BYTES, rowOffset);
-            case Float:
-                return new FloatChunkInputStreamGenerator(chunk.asFloatChunk(), Float.BYTES, rowOffset);
-            case Double:
-                return new DoubleChunkInputStreamGenerator(chunk.asDoubleChunk(), Double.BYTES, rowOffset);
-            case Object:
-                if (type.isArray()) {
-                    if (componentType == byte.class) {
-                        return new VarBinaryChunkInputStreamGenerator<>(chunk.asObjectChunk(), rowOffset,
-                                (out, item) -> out.write((byte[]) item));
-                    } else {
-                        return new VarListChunkInputStreamGenerator<>(type, chunk.asObjectChunk(), rowOffset);
-                    }
-                }
-                if (Vector.class.isAssignableFrom(type)) {
-                    // noinspection unchecked
-                    return new VectorChunkInputStreamGenerator(
-                            (Class<Vector<?>>) type, componentType, chunk.asObjectChunk(), rowOffset);
-                }
-                if (type == String.class) {
-                    return new VarBinaryChunkInputStreamGenerator<String>(chunk.asObjectChunk(), rowOffset,
-                            (out, str) -> out.write(str.getBytes(Charsets.UTF_8)));
-                }
-                if (type == BigInteger.class) {
-                    return new VarBinaryChunkInputStreamGenerator<BigInteger>(chunk.asObjectChunk(), rowOffset,
-                            (out, item) -> out.write(item.toByteArray()));
-                }
-                if (type == BigDecimal.class) {
-                    return new VarBinaryChunkInputStreamGenerator<BigDecimal>(chunk.asObjectChunk(), rowOffset,
-                            (out, item) -> {
-                                final BigDecimal normal = item.stripTrailingZeros();
-                                final int v = normal.scale();
-                                // Write as little endian, arrow endianness.
-                                out.write(0xFF & v);
-                                out.write(0xFF & (v >> 8));
-                                out.write(0xFF & (v >> 16));
-                                out.write(0xFF & (v >> 24));
-                                out.write(normal.unscaledValue().toByteArray());
-                            });
-                }
-                if (type == Instant.class) {
-                    // This code path is utilized for arrays and vectors of Instant, which cannot be reinterpreted.
-                    ObjectChunk<Instant, Values> objChunk = chunk.asObjectChunk();
-                    WritableLongChunk<Values> outChunk = WritableLongChunk.makeWritableChunk(objChunk.size());
-                    for (int i = 0; i < objChunk.size(); ++i) {
-                        outChunk.set(i, DateTimeUtils.epochNanos(objChunk.get(i)));
-                    }
-                    if (chunk instanceof PoolableChunk) {
-                        ((PoolableChunk) chunk).close();
-                    }
-                    return new LongChunkInputStreamGenerator(outChunk, Long.BYTES, rowOffset);
-                }
-                if (type == ZonedDateTime.class) {
-                    // This code path is utilized for arrays and vectors of Instant, which cannot be reinterpreted.
-                    ObjectChunk<ZonedDateTime, Values> objChunk = chunk.asObjectChunk();
-                    WritableLongChunk<Values> outChunk = WritableLongChunk.makeWritableChunk(objChunk.size());
-                    for (int i = 0; i < objChunk.size(); ++i) {
-                        outChunk.set(i, DateTimeUtils.epochNanos(objChunk.get(i)));
-                    }
-                    if (chunk instanceof PoolableChunk) {
-                        ((PoolableChunk) chunk).close();
-                    }
-                    return new LongChunkInputStreamGenerator(outChunk, Long.BYTES, rowOffset);
-                }
-                if (type == Boolean.class) {
-                    return BooleanChunkInputStreamGenerator.convertBoxed(chunk.asObjectChunk(), rowOffset);
-                }
-                if (type == Byte.class) {
-                    return ByteChunkInputStreamGenerator.convertBoxed(chunk.asObjectChunk(), rowOffset);
-                }
-                if (type == Character.class) {
-                    return CharChunkInputStreamGenerator.convertBoxed(chunk.asObjectChunk(), rowOffset);
-                }
-                if (type == Double.class) {
-                    return DoubleChunkInputStreamGenerator.convertBoxed(chunk.asObjectChunk(), rowOffset);
-                }
-                if (type == Float.class) {
-                    return FloatChunkInputStreamGenerator.convertBoxed(chunk.asObjectChunk(), rowOffset);
-                }
-                if (type == Integer.class) {
-                    return IntChunkInputStreamGenerator.convertBoxed(chunk.asObjectChunk(), rowOffset);
-                }
-                if (type == Long.class) {
-                    return LongChunkInputStreamGenerator.convertBoxed(chunk.asObjectChunk(), rowOffset);
-                }
-                if (type == Short.class) {
-                    return ShortChunkInputStreamGenerator.convertBoxed(chunk.asObjectChunk(), rowOffset);
-                }
-                if (type == LocalDate.class) {
-                    return LongChunkInputStreamGenerator.<LocalDate>convertWithTransform(chunk.asObjectChunk(),
-                            rowOffset, date -> {
-                                if (date == null) {
-                                    return QueryConstants.NULL_LONG;
-                                }
-                                final long epochDay = date.toEpochDay();
-                                if (epochDay < MIN_LOCAL_DATE_VALUE || epochDay > MAX_LOCAL_DATE_VALUE) {
-                                    throw new IllegalArgumentException("Date out of range: " + date + " (" + epochDay
-                                            + " not in [" + MIN_LOCAL_DATE_VALUE + ", " + MAX_LOCAL_DATE_VALUE + "])");
-                                }
-                                return epochDay * MS_PER_DAY;
-                            });
-                }
-                if (type == LocalTime.class) {
-                    return LongChunkInputStreamGenerator.<LocalTime>convertWithTransform(chunk.asObjectChunk(),
-                            rowOffset, time -> {
-                                if (time == null) {
-                                    return QueryConstants.NULL_LONG;
-                                }
-                                final long nanoOfDay = time.toNanoOfDay();
-                                if (nanoOfDay < 0) {
-                                    throw new IllegalArgumentException("Time out of range: " + time);
-                                }
-                                return nanoOfDay;
-                            });
-                }
-                // TODO (core#936): support column conversion modes
-
-                return new VarBinaryChunkInputStreamGenerator<>(chunk.asObjectChunk(), rowOffset,
-                        (out, item) -> out.write(item.toString().getBytes(Charsets.UTF_8)));
-            default:
-                throw new UnsupportedOperationException();
-        }
-    }
-
-    static WritableChunk<Values> extractChunkFromInputStream(
-            final StreamReaderOptions options,
-            final ChunkType chunkType, final Class<?> type, final Class<?> componentType,
-            final Iterator<FieldNodeInfo> fieldNodeIter,
-            final PrimitiveIterator.OfLong bufferInfoIter,
-            final DataInput is,
-            final WritableChunk<Values> outChunk, final int offset, final int totalRows) throws IOException {
-        return extractChunkFromInputStream(options, 1, chunkType, type, componentType, fieldNodeIter, bufferInfoIter,
-                is,
-                outChunk, offset, totalRows);
-    }
-
-    static WritableChunk<Values> extractChunkFromInputStream(
-            final StreamReaderOptions options,
-            final int factor,
-            final ChunkType chunkType, final Class<?> type, final Class<?> componentType,
-            final Iterator<FieldNodeInfo> fieldNodeIter,
-            final PrimitiveIterator.OfLong bufferInfoIter,
-            final DataInput is,
-            final WritableChunk<Values> outChunk, final int outOffset, final int totalRows) throws IOException {
-        // TODO (deephaven-core#5453): pass in ArrowType to enable ser/deser of single java class in multiple formats
-        switch (chunkType) {
-            case Boolean:
-                throw new UnsupportedOperationException("Booleans are reinterpreted as bytes");
-            case Char:
-                return CharChunkInputStreamGenerator.extractChunkFromInputStream(
-                        Character.BYTES, options, fieldNodeIter, bufferInfoIter, is, outChunk, outOffset, totalRows);
-            case Byte:
-                if (type == Boolean.class || type == boolean.class) {
-                    return BooleanChunkInputStreamGenerator.extractChunkFromInputStream(
-                            options, fieldNodeIter, bufferInfoIter, is, outChunk, outOffset, totalRows);
-                }
-                return ByteChunkInputStreamGenerator.extractChunkFromInputStream(
-                        Byte.BYTES, options, fieldNodeIter, bufferInfoIter, is, outChunk, outOffset, totalRows);
-            case Short:
-                return ShortChunkInputStreamGenerator.extractChunkFromInputStream(
-                        Short.BYTES, options, fieldNodeIter, bufferInfoIter, is, outChunk, outOffset, totalRows);
-            case Int:
-                return IntChunkInputStreamGenerator.extractChunkFromInputStream(
-                        Integer.BYTES, options, fieldNodeIter, bufferInfoIter, is, outChunk, outOffset, totalRows);
-            case Long:
-                if (factor == 1) {
-                    return LongChunkInputStreamGenerator.extractChunkFromInputStream(
-                            Long.BYTES, options,
-                            fieldNodeIter, bufferInfoIter, is, outChunk, outOffset, totalRows);
-                }
-                return LongChunkInputStreamGenerator.extractChunkFromInputStreamWithConversion(
-                        Long.BYTES, options,
-                        (long v) -> v == QueryConstants.NULL_LONG ? QueryConstants.NULL_LONG : (v * factor),
-                        fieldNodeIter, bufferInfoIter, is, outChunk, outOffset, totalRows);
-            case Float:
-                return FloatChunkInputStreamGenerator.extractChunkFromInputStream(
-                        Float.BYTES, options, fieldNodeIter, bufferInfoIter, is, outChunk, outOffset, totalRows);
-            case Double:
-                return DoubleChunkInputStreamGenerator.extractChunkFromInputStream(
-                        Double.BYTES, options, fieldNodeIter, bufferInfoIter, is, outChunk, outOffset, totalRows);
-            case Object:
-                if (type.isArray()) {
-                    if (componentType == byte.class) {
-                        return VarBinaryChunkInputStreamGenerator.extractChunkFromInputStream(
-                                is,
-                                fieldNodeIter,
-                                bufferInfoIter,
-                                (buf, off, len) -> Arrays.copyOfRange(buf, off, off + len),
-                                outChunk, outOffset, totalRows);
-                    } else {
-                        return VarListChunkInputStreamGenerator.extractChunkFromInputStream(
-                                options, type, fieldNodeIter, bufferInfoIter, is, outChunk, outOffset, totalRows);
-                    }
-                }
-                if (Vector.class.isAssignableFrom(type)) {
-                    // noinspection unchecked
-                    return VectorChunkInputStreamGenerator.extractChunkFromInputStream(
-                            options, (Class<Vector<?>>) type, componentType, fieldNodeIter, bufferInfoIter, is,
-                            outChunk, outOffset, totalRows);
-                }
-                if (type == BigInteger.class) {
-                    return VarBinaryChunkInputStreamGenerator.extractChunkFromInputStream(
-                            is,
-                            fieldNodeIter,
-                            bufferInfoIter,
-                            BigInteger::new,
-                            outChunk, outOffset, totalRows);
-                }
-                if (type == BigDecimal.class) {
-                    return VarBinaryChunkInputStreamGenerator.extractChunkFromInputStream(
-                            is,
-                            fieldNodeIter,
-                            bufferInfoIter,
-                            (final byte[] buf, final int offset, final int length) -> {
-                                // read the int scale value as little endian, arrow's endianness.
-                                final byte b1 = buf[offset];
-                                final byte b2 = buf[offset + 1];
-                                final byte b3 = buf[offset + 2];
-                                final byte b4 = buf[offset + 3];
-                                final int scale = b4 << 24 | (b3 & 0xFF) << 16 | (b2 & 0xFF) << 8 | (b1 & 0xFF);
-                                return new BigDecimal(new BigInteger(buf, offset + 4, length - 4), scale);
-                            },
-                            outChunk, outOffset, totalRows);
-                }
-                if (type == Instant.class) {
-                    return FixedWidthChunkInputStreamGenerator.extractChunkFromInputStreamWithTypeConversion(
-                            Long.BYTES, options, io -> {
-                                final long value = io.readLong();
-                                if (value == QueryConstants.NULL_LONG) {
-                                    return null;
-                                }
-                                return DateTimeUtils.epochNanosToInstant(value * factor);
-                            },
-                            fieldNodeIter, bufferInfoIter, is, outChunk, outOffset, totalRows);
-                }
-                if (type == ZonedDateTime.class) {
-                    return FixedWidthChunkInputStreamGenerator.extractChunkFromInputStreamWithTypeConversion(
-                            Long.BYTES, options, io -> {
-                                final long value = io.readLong();
-                                if (value == QueryConstants.NULL_LONG) {
-                                    return null;
-                                }
-                                return DateTimeUtils.epochNanosToZonedDateTime(
-                                        value * factor, DateTimeUtils.timeZone());
-                            },
-                            fieldNodeIter, bufferInfoIter, is, outChunk, outOffset, totalRows);
-                }
-                if (type == Byte.class) {
-                    return FixedWidthChunkInputStreamGenerator.extractChunkFromInputStreamWithTypeConversion(
-                            Byte.BYTES, options, io -> TypeUtils.box(io.readByte()),
-                            fieldNodeIter, bufferInfoIter, is, outChunk, outOffset, totalRows);
-                }
-                if (type == Character.class) {
-                    return FixedWidthChunkInputStreamGenerator.extractChunkFromInputStreamWithTypeConversion(
-                            Character.BYTES, options, io -> TypeUtils.box(io.readChar()),
-                            fieldNodeIter, bufferInfoIter, is, outChunk, outOffset, totalRows);
-                }
-                if (type == Double.class) {
-                    return FixedWidthChunkInputStreamGenerator.extractChunkFromInputStreamWithTypeConversion(
-                            Double.BYTES, options, io -> TypeUtils.box(io.readDouble()),
-                            fieldNodeIter, bufferInfoIter, is, outChunk, outOffset, totalRows);
-                }
-                if (type == Float.class) {
-                    return FixedWidthChunkInputStreamGenerator.extractChunkFromInputStreamWithTypeConversion(
-                            Float.BYTES, options, io -> TypeUtils.box(io.readFloat()),
-                            fieldNodeIter, bufferInfoIter, is, outChunk, outOffset, totalRows);
-                }
-                if (type == Integer.class) {
-                    return FixedWidthChunkInputStreamGenerator.extractChunkFromInputStreamWithTypeConversion(
-                            Integer.BYTES, options, io -> TypeUtils.box(io.readInt()),
-                            fieldNodeIter, bufferInfoIter, is, outChunk, outOffset, totalRows);
-                }
-                if (type == Long.class) {
-                    return FixedWidthChunkInputStreamGenerator.extractChunkFromInputStreamWithTypeConversion(
-                            Long.BYTES, options, io -> TypeUtils.box(io.readLong()),
-                            fieldNodeIter, bufferInfoIter, is, outChunk, outOffset, totalRows);
-                }
-                if (type == Short.class) {
-                    return FixedWidthChunkInputStreamGenerator.extractChunkFromInputStreamWithTypeConversion(
-                            Short.BYTES, options, io -> TypeUtils.box(io.readShort()),
-                            fieldNodeIter, bufferInfoIter, is, outChunk, outOffset, totalRows);
-                }
-                if (type == LocalDate.class) {
-                    return LongChunkInputStreamGenerator.extractChunkFromInputStreamWithTransform(
-                            Long.BYTES, options,
-                            value -> value == QueryConstants.NULL_LONG
-                                    ? null
-                                    : LocalDate.ofEpochDay(value / MS_PER_DAY),
-                            fieldNodeIter, bufferInfoIter, is, outChunk, outOffset, totalRows);
-                }
-                if (type == LocalTime.class) {
-                    return LongChunkInputStreamGenerator.extractChunkFromInputStreamWithTransform(
-                            Long.BYTES, options,
-                            value -> value == QueryConstants.NULL_LONG ? null : LocalTime.ofNanoOfDay(value),
-                            fieldNodeIter, bufferInfoIter, is, outChunk, outOffset, totalRows);
-                }
-                if (type == String.class ||
-                        options.columnConversionMode().equals(ColumnConversionMode.Stringify)) {
-                    return VarBinaryChunkInputStreamGenerator.extractChunkFromInputStream(is, fieldNodeIter,
-                            bufferInfoIter,
-                            (buf, off, len) -> new String(buf, off, len, Charsets.UTF_8), outChunk, outOffset,
-                            totalRows);
-                }
-                throw new UnsupportedOperationException(
-                        "Do not yet support column conversion mode: " + options.columnConversionMode());
-            default:
-                throw new UnsupportedOperationException();
-        }
+    /**
+     * Creator of {@link ChunkInputStreamGenerator} instances.
+     * <p>
+     * This API may not be stable, while the JS API's usages of it are implemented.
+     */
+    interface Factory {
+        /**
+         * Returns an instance capable of writing the given chunk
+         *
+         * @param chunkType the type of the chunk to be written
+         * @param type the Java type of the column being written
+         * @param componentType the Java type of data in an array/vector, or null if irrelevant
+         * @param chunk the chunk that will be written out to an input stream
+         * @param rowOffset the offset into the chunk to start writing from
+         * @return an instance capable of serializing the given chunk
+         * @param <T> the type of data in the column
+         */
+        <T> ChunkInputStreamGenerator makeInputStreamGenerator(
+                final ChunkType chunkType,
+                final Class<T> type,
+                final Class<?> componentType,
+                final Chunk<Values> chunk,
+                final long rowOffset);
     }
 
     /**
diff --git a/extensions/barrage/src/main/java/io/deephaven/extensions/barrage/chunk/ChunkReader.java b/extensions/barrage/src/main/java/io/deephaven/extensions/barrage/chunk/ChunkReader.java
new file mode 100644
index 00000000000..09fc51a18cb
--- /dev/null
+++ b/extensions/barrage/src/main/java/io/deephaven/extensions/barrage/chunk/ChunkReader.java
@@ -0,0 +1,125 @@
+//
+// Copyright (c) 2016-2024 Deephaven Data Labs and Patent Pending
+//
+package io.deephaven.extensions.barrage.chunk;
+
+import io.deephaven.chunk.ChunkType;
+import io.deephaven.chunk.WritableChunk;
+import io.deephaven.chunk.attributes.Values;
+import io.deephaven.extensions.barrage.util.StreamReaderOptions;
+import org.apache.arrow.flatbuf.Field;
+import org.apache.arrow.flatbuf.Type;
+
+import java.io.DataInput;
+import java.io.IOException;
+import java.util.Iterator;
+import java.util.PrimitiveIterator;
+
+/**
+ * Consumes Flight/Barrage streams and transforms them into WritableChunks.
+ */
+public interface ChunkReader {
+    /**
+     * Reads the given DataInput to extract the next Arrow buffer as a Deephaven Chunk.
+     * 
+     * @param fieldNodeIter iterator to read fields from the stream
+     * @param bufferInfoIter iterator to read buffers from the stream
+     * @param is input stream containing buffers to be read
+     * @param outChunk chunk to write to
+     * @param outOffset offset within the outChunk to begin writing
+     * @param totalRows total rows to write to the outChunk
+     * @return a Chunk containing the data from the stream
+     * @throws IOException if an error occurred while reading the stream
+     */
+    WritableChunk<Values> readChunk(final Iterator<ChunkInputStreamGenerator.FieldNodeInfo> fieldNodeIter,
+            final PrimitiveIterator.OfLong bufferInfoIter,
+            final DataInput is,
+            final WritableChunk<Values> outChunk,
+            final int outOffset,
+            final int totalRows) throws IOException;
+
+    /**
+     * Supports creation of {@link ChunkReader} instances to use when processing a flight stream. JVM implementations
+     * for client and server should probably use {@link DefaultChunkReadingFactory#INSTANCE}.
+     */
+    interface Factory {
+
+        /**
+         * Returns a {@link ChunkReader} for the specified arguments.
+         *
+         * @param options options for reading the stream
+         * @param factor a multiplicative factor to apply when reading integers
+         * @param typeInfo the type of data to read into a chunk
+         * @return a ChunkReader based on the given options, factory, and type to read
+         */
+        ChunkReader getReader(final StreamReaderOptions options, final int factor, final TypeInfo typeInfo);
+
+        /**
+         * Returns a {@link ChunkReader} for the specified arguments.
+         *
+         * @param options options for reading the stream
+         * @param typeInfo the type of data to read into a chunk
+         * @return a ChunkReader based on the given options, factory, and type to read
+         */
+        default ChunkReader getReader(final StreamReaderOptions options, final TypeInfo typeInfo) {
+            return getReader(options, 1, typeInfo);
+        }
+
+    }
+
+    /**
+     * Describes type info used by factory implementations when creating a ChunkReader.
+     */
+    class TypeInfo {
+        private final ChunkType chunkType;
+        private final Class<?> type;
+        private final Class<?> componentType;
+        private final Field arrowField;
+
+        public TypeInfo(ChunkType chunkType, Class<?> type, Class<?> componentType, Field arrowField) {
+            this.chunkType = chunkType;
+            this.type = type;
+            this.componentType = componentType;
+            this.arrowField = arrowField;
+        }
+
+        public ChunkType chunkType() {
+            return chunkType;
+        }
+
+        public Class<?> type() {
+            return type;
+        }
+
+        public Class<?> componentType() {
+            return componentType;
+        }
+
+        public Field arrowField() {
+            return arrowField;
+        }
+
+        public Field componentArrowField() {
+            if (arrowField.typeType() != Type.List) {
+                throw new IllegalStateException("Not a flight List");
+            }
+            if (arrowField.childrenLength() != 1) {
+                throw new IllegalStateException("Incorrect number of child Fields");
+            }
+            return arrowField.children(0);
+        }
+    }
+
+    /**
+     * Factory method to create a TypeInfo instance.
+     *
+     * @param chunkType the output chunk type
+     * @param type the Java type to be read into the chunk
+     * @param componentType the Java type of nested components
+     * @param arrowField the Arrow type to be read into the chunk
+     * @return a TypeInfo instance
+     */
+    static TypeInfo typeInfo(ChunkType chunkType, Class<?> type, Class<?> componentType, Field arrowField) {
+        return new TypeInfo(chunkType, type, componentType, arrowField);
+    }
+}
diff --git a/extensions/barrage/src/main/java/io/deephaven/extensions/barrage/chunk/DefaultChunkInputStreamGeneratorFactory.java b/extensions/barrage/src/main/java/io/deephaven/extensions/barrage/chunk/DefaultChunkInputStreamGeneratorFactory.java
new file mode 100644
index 00000000000..2d27195a4b5
--- /dev/null
+++ b/extensions/barrage/src/main/java/io/deephaven/extensions/barrage/chunk/DefaultChunkInputStreamGeneratorFactory.java
@@ -0,0 +1,185 @@
+//
+// Copyright (c) 2016-2024 Deephaven Data Labs and Patent Pending
+//
+package io.deephaven.extensions.barrage.chunk;
+
+import com.google.common.base.Charsets;
+import io.deephaven.chunk.Chunk;
+import io.deephaven.chunk.ChunkType;
+import io.deephaven.chunk.ObjectChunk;
+import io.deephaven.chunk.WritableLongChunk;
+import io.deephaven.chunk.attributes.Values;
+import io.deephaven.chunk.util.pools.PoolableChunk;
+import io.deephaven.extensions.barrage.util.ArrowIpcUtil;
+import io.deephaven.time.DateTimeUtils;
+import io.deephaven.util.QueryConstants;
+import io.deephaven.vector.Vector;
+import org.apache.arrow.vector.types.pojo.Schema;
+
+import java.math.BigDecimal;
+import java.math.BigInteger;
+import java.time.Instant;
+import java.time.LocalDate;
+import java.time.LocalTime;
+import java.time.ZonedDateTime;
+
+import static io.deephaven.extensions.barrage.chunk.ChunkInputStreamGenerator.MAX_LOCAL_DATE_VALUE;
+import static io.deephaven.extensions.barrage.chunk.ChunkInputStreamGenerator.MIN_LOCAL_DATE_VALUE;
+import static io.deephaven.extensions.barrage.chunk.ChunkInputStreamGenerator.MS_PER_DAY;
+
+/**
+ * JVM implementation of ChunkInputStreamGenerator.Factory, suitable for use in Java clients and servers.
+ */
+public class DefaultChunkInputStreamGeneratorFactory implements ChunkInputStreamGenerator.Factory {
+    public static final DefaultChunkInputStreamGeneratorFactory INSTANCE =
+            new DefaultChunkInputStreamGeneratorFactory();
+
+    @Override
+    public <T> ChunkInputStreamGenerator makeInputStreamGenerator(ChunkType chunkType, Class<T> type,
+            Class<?> componentType, Chunk<Values> chunk, long rowOffset) {
+        // TODO (deephaven-core#5453): pass in ArrowType to enable ser/deser of single java class in multiple formats
+        switch (chunkType) {
+            case Boolean:
+                throw new UnsupportedOperationException("Booleans are reinterpreted as bytes");
+            case Char:
+                return new CharChunkInputStreamGenerator(chunk.asCharChunk(), Character.BYTES, rowOffset);
+            case Byte:
+                if (type == Boolean.class || type == boolean.class) {
+                    // internally we represent booleans as bytes, but the wire format respects arrow's specification
+                    return new BooleanChunkInputStreamGenerator(chunk.asByteChunk(), rowOffset);
+                }
+                return new ByteChunkInputStreamGenerator(chunk.asByteChunk(), Byte.BYTES, rowOffset);
+            case Short:
+                return new ShortChunkInputStreamGenerator(chunk.asShortChunk(), Short.BYTES, rowOffset);
+            case Int:
+                return new IntChunkInputStreamGenerator(chunk.asIntChunk(), Integer.BYTES, rowOffset);
+            case Long:
+                return new LongChunkInputStreamGenerator(chunk.asLongChunk(), Long.BYTES, rowOffset);
+            case Float:
+                return new FloatChunkInputStreamGenerator(chunk.asFloatChunk(), Float.BYTES, rowOffset);
+            case Double:
+                return new DoubleChunkInputStreamGenerator(chunk.asDoubleChunk(), Double.BYTES, rowOffset);
+            case Object:
+                if (type.isArray()) {
+                    if (componentType == byte.class) {
+                        return new VarBinaryChunkInputStreamGenerator<>(chunk.asObjectChunk(), rowOffset,
+                                (out, item) -> out.write((byte[]) item));
+                    } else {
+                        return new VarListChunkInputStreamGenerator<>(this, type, chunk.asObjectChunk(), rowOffset);
+                    }
+                }
+                if (Vector.class.isAssignableFrom(type)) {
+                    // noinspection unchecked
+                    return new VectorChunkInputStreamGenerator(this,
+                            (Class<Vector<?>>) type, componentType, chunk.asObjectChunk(), rowOffset);
+                }
+                if (type == String.class) {
+                    return new VarBinaryChunkInputStreamGenerator<String>(chunk.asObjectChunk(), rowOffset,
+                            (out, str) -> out.write(str.getBytes(Charsets.UTF_8)));
+                }
+                if (type == BigInteger.class) {
+                    return new VarBinaryChunkInputStreamGenerator<BigInteger>(chunk.asObjectChunk(), rowOffset,
+                            (out, item) -> out.write(item.toByteArray()));
+                }
+                if (type == BigDecimal.class) {
+                    return new VarBinaryChunkInputStreamGenerator<BigDecimal>(chunk.asObjectChunk(), rowOffset,
+                            (out, item) -> {
+                                final BigDecimal normal = item.stripTrailingZeros();
+                                final int v = normal.scale();
+                                // Write as little endian, arrow endianness.
+                                out.write(0xFF & v);
+                                out.write(0xFF & (v >> 8));
+                                out.write(0xFF & (v >> 16));
+                                out.write(0xFF & (v >> 24));
+                                out.write(normal.unscaledValue().toByteArray());
+                            });
+                }
+                if (type == Instant.class) {
+                    // This code path is utilized for arrays and vectors of Instant, which cannot be reinterpreted.
+                    ObjectChunk<Instant, Values> objChunk = chunk.asObjectChunk();
+                    WritableLongChunk<Values> outChunk = WritableLongChunk.makeWritableChunk(objChunk.size());
+                    for (int i = 0; i < objChunk.size(); ++i) {
+                        outChunk.set(i, DateTimeUtils.epochNanos(objChunk.get(i)));
+                    }
+                    if (chunk instanceof PoolableChunk) {
+                        ((PoolableChunk) chunk).close();
+                    }
+                    return new LongChunkInputStreamGenerator(outChunk, Long.BYTES, rowOffset);
+                }
+                if (type == ZonedDateTime.class) {
+                    // This code path is utilized for arrays and vectors of Instant, which cannot be reinterpreted.
+                    ObjectChunk<ZonedDateTime, Values> objChunk = chunk.asObjectChunk();
+                    WritableLongChunk<Values> outChunk = WritableLongChunk.makeWritableChunk(objChunk.size());
+                    for (int i = 0; i < objChunk.size(); ++i) {
+                        outChunk.set(i, DateTimeUtils.epochNanos(objChunk.get(i)));
+                    }
+                    if (chunk instanceof PoolableChunk) {
+                        ((PoolableChunk) chunk).close();
+                    }
+                    return new LongChunkInputStreamGenerator(outChunk, Long.BYTES, rowOffset);
+                }
+                if (type == Boolean.class) {
+                    return BooleanChunkInputStreamGenerator.convertBoxed(chunk.asObjectChunk(), rowOffset);
+                }
+                if (type == Byte.class) {
+                    return ByteChunkInputStreamGenerator.convertBoxed(chunk.asObjectChunk(), rowOffset);
+                }
+                if (type == Character.class) {
+                    return CharChunkInputStreamGenerator.convertBoxed(chunk.asObjectChunk(), rowOffset);
+                }
+                if (type == Double.class) {
+                    return DoubleChunkInputStreamGenerator.convertBoxed(chunk.asObjectChunk(), rowOffset);
+                }
+                if (type == Float.class) {
+                    return FloatChunkInputStreamGenerator.convertBoxed(chunk.asObjectChunk(), rowOffset);
+                }
+                if (type == Integer.class) {
+                    return IntChunkInputStreamGenerator.convertBoxed(chunk.asObjectChunk(), rowOffset);
+                }
+                if (type == Long.class) {
+                    return LongChunkInputStreamGenerator.convertBoxed(chunk.asObjectChunk(), rowOffset);
+                }
+                if (type == Short.class) {
+                    return ShortChunkInputStreamGenerator.convertBoxed(chunk.asObjectChunk(), rowOffset);
+                }
+                if (type == LocalDate.class) {
+                    return LongChunkInputStreamGenerator.<LocalDate>convertWithTransform(chunk.asObjectChunk(),
+                            rowOffset, date -> {
+                                if (date == null) {
+                                    return QueryConstants.NULL_LONG;
+                                }
+                                final long epochDay = date.toEpochDay();
+                                if (epochDay < MIN_LOCAL_DATE_VALUE || epochDay > MAX_LOCAL_DATE_VALUE) {
+                                    throw new IllegalArgumentException("Date out of range: " + date + " (" + epochDay
+                                            + " not in [" + MIN_LOCAL_DATE_VALUE + ", " + MAX_LOCAL_DATE_VALUE + "])");
+                                }
+                                return epochDay * MS_PER_DAY;
+                            });
+                }
+                if (type == LocalTime.class) {
+                    return LongChunkInputStreamGenerator.<LocalTime>convertWithTransform(chunk.asObjectChunk(),
+                            rowOffset, time -> {
+                                if (time == null) {
+                                    return QueryConstants.NULL_LONG;
+                                }
+                                final long nanoOfDay = time.toNanoOfDay();
+                                if (nanoOfDay < 0) {
+                                    throw new IllegalArgumentException("Time out of range: " + time);
+                                }
+                                return nanoOfDay;
+                            });
+                }
+                // TODO (core#58): add custom barrage serialization/deserialization support
+                // Migrate Schema to custom format when available.
+                if (type == Schema.class) {
+                    return new VarBinaryChunkInputStreamGenerator<>(chunk.asObjectChunk(), rowOffset,
+                            ArrowIpcUtil::serialize);
+                }
+                // TODO (core#936): support column conversion modes
+                return new VarBinaryChunkInputStreamGenerator<>(chunk.asObjectChunk(), rowOffset,
+                        (out, item) -> out.write(item.toString().getBytes(Charsets.UTF_8)));
+            default:
+                throw new UnsupportedOperationException();
+        }
+    }
+}
diff --git a/extensions/barrage/src/main/java/io/deephaven/extensions/barrage/chunk/DefaultChunkReadingFactory.java b/extensions/barrage/src/main/java/io/deephaven/extensions/barrage/chunk/DefaultChunkReadingFactory.java
new file mode 100644
index 00000000000..2156c95628c
--- /dev/null
+++ b/extensions/barrage/src/main/java/io/deephaven/extensions/barrage/chunk/DefaultChunkReadingFactory.java
@@ -0,0 +1,290 @@
+//
+// Copyright (c) 2016-2024 Deephaven Data Labs and Patent Pending
+//
+package io.deephaven.extensions.barrage.chunk;
+
+import com.google.common.base.Charsets;
+import io.deephaven.chunk.WritableChunk;
+import io.deephaven.chunk.attributes.Values;
+import io.deephaven.extensions.barrage.util.ArrowIpcUtil;
+import io.deephaven.extensions.barrage.util.StreamReaderOptions;
+import io.deephaven.time.DateTimeUtils;
+import io.deephaven.util.QueryConstants;
+import io.deephaven.util.type.TypeUtils;
+import io.deephaven.vector.Vector;
+import org.apache.arrow.vector.types.pojo.Schema;
+
+import java.io.DataInput;
+import java.io.IOException;
+import java.math.BigDecimal;
+import java.math.BigInteger;
+import java.time.Instant;
+import java.time.LocalDate;
+import java.time.LocalTime;
+import java.time.ZonedDateTime;
+import java.util.Arrays;
+import java.util.Iterator;
+import java.util.PrimitiveIterator;
+
+import static io.deephaven.extensions.barrage.chunk.ChunkInputStreamGenerator.MS_PER_DAY;
+
+/**
+ * JVM implementation of {@link ChunkReader.Factory}, suitable for use in Java clients and servers. This default
+ * implementation may not round trip flight types in a stable way, but will round trip Deephaven table definitions and
+ * table data. Neither of these is a required/expected property of being a Flight/Barrage/Deephaven client.
+ */
+public final class DefaultChunkReadingFactory implements ChunkReader.Factory {
+    public static final ChunkReader.Factory INSTANCE = new DefaultChunkReadingFactory();
+
+    @Override
+    public ChunkReader getReader(StreamReaderOptions options, int factor,
+            ChunkReader.TypeInfo typeInfo) {
+        // TODO (deephaven-core#5453): pass in ArrowType to enable ser/deser of single java class in multiple formats
+        switch (typeInfo.chunkType()) {
+            case Boolean:
+                throw new UnsupportedOperationException("Booleans are reinterpreted as bytes");
+            case Char:
+                return new CharChunkReader(options);
+            case Byte:
+                if (typeInfo.type() == Boolean.class || typeInfo.type() == boolean.class) {
+                    return new BooleanChunkReader();
+                }
+                return new ByteChunkReader(options);
+            case Short:
+                return new ShortChunkReader(options);
+            case Int:
+                return new IntChunkReader(options);
+            case Long:
+                if (factor == 1) {
+                    return new LongChunkReader(options);
+                }
+                return new LongChunkReader(options,
+                        (long v) -> v == QueryConstants.NULL_LONG ? QueryConstants.NULL_LONG : (v * factor));
+            case Float:
+                return new FloatChunkReader(options);
+            case Double:
+                return new DoubleChunkReader(options);
+            case Object:
+                if (typeInfo.type().isArray()) {
+                    if (typeInfo.componentType() == byte.class) {
+                        return ByteArrayChunkReader.BYTEARRAY_READER;
+                    } else {
+                        return new VarListChunkReader<>(options, typeInfo, this);
+                    }
+                }
+                if (Vector.class.isAssignableFrom(typeInfo.type())) {
+                    return new VectorChunkReader(options, typeInfo, this);
+                }
+                if (typeInfo.type() == BigInteger.class) {
+                    return BigIntegerChunkReader.BIG_INTEGER_CHUNK_READER;
+                }
+                if (typeInfo.type() == BigDecimal.class) {
+                    return BigDecimalChunkReader.BIG_DECIMAL_CHUNK_READER;
+                }
+                if (typeInfo.type() == Instant.class) {
+                    return (fieldNodeIter, bufferInfoIter, is, outChunk, outOffset,
+                            totalRows) -> FixedWidthChunkInputStreamGenerator
+                                    .extractChunkFromInputStreamWithTypeConversion(
+                                            Long.BYTES, options, io -> {
+                                                final long value = io.readLong();
+                                                if (value == QueryConstants.NULL_LONG) {
+                                                    return null;
+                                                }
+                                                return DateTimeUtils.epochNanosToInstant(value * factor);
+                                            },
+                                            fieldNodeIter, bufferInfoIter, is, outChunk, outOffset, totalRows);
+                }
+                if (typeInfo.type() == ZonedDateTime.class) {
+                    return (fieldNodeIter, bufferInfoIter, is, outChunk, outOffset,
+                            totalRows) -> FixedWidthChunkInputStreamGenerator
+                                    .extractChunkFromInputStreamWithTypeConversion(
+                                            Long.BYTES, options, io -> {
+                                                final long value = io.readLong();
+                                                if (value == QueryConstants.NULL_LONG) {
+                                                    return null;
+                                                }
+                                                return DateTimeUtils.epochNanosToZonedDateTime(
+                                                        value * factor, DateTimeUtils.timeZone());
+                                            },
+                                            fieldNodeIter, bufferInfoIter, is, outChunk, outOffset, totalRows);
+                }
+                if (typeInfo.type() == Byte.class) {
+                    return (fieldNodeIter, bufferInfoIter, is, outChunk, outOffset,
+                            totalRows) -> FixedWidthChunkInputStreamGenerator
+                                    .extractChunkFromInputStreamWithTypeConversion(
+                                            Byte.BYTES, options, io -> TypeUtils.box(io.readByte()),
+                                            fieldNodeIter, bufferInfoIter, is, outChunk, outOffset, totalRows);
+                }
+                if (typeInfo.type() == Character.class) {
+                    return (fieldNodeIter, bufferInfoIter, is, outChunk, outOffset,
+                            totalRows) -> FixedWidthChunkInputStreamGenerator
+                                    .extractChunkFromInputStreamWithTypeConversion(
+                                            Character.BYTES, options, io -> TypeUtils.box(io.readChar()),
+                                            fieldNodeIter, bufferInfoIter, is, outChunk, outOffset, totalRows);
+                }
+                if (typeInfo.type() == Double.class) {
+                    return (fieldNodeIter, bufferInfoIter, is, outChunk, outOffset,
+                            totalRows) -> FixedWidthChunkInputStreamGenerator
+                                    .extractChunkFromInputStreamWithTypeConversion(
+                                            Double.BYTES, options, io -> TypeUtils.box(io.readDouble()),
+                                            fieldNodeIter, bufferInfoIter, is, outChunk, outOffset, totalRows);
+                }
+                if (typeInfo.type() == Float.class) {
+                    return (fieldNodeIter, bufferInfoIter, is, outChunk, outOffset,
+                            totalRows) -> FixedWidthChunkInputStreamGenerator
+                                    .extractChunkFromInputStreamWithTypeConversion(
+                                            Float.BYTES, options, io -> TypeUtils.box(io.readFloat()),
+                                            fieldNodeIter, bufferInfoIter, is, outChunk, outOffset, totalRows);
+                }
+                if (typeInfo.type() == Integer.class) {
+                    return (fieldNodeIter, bufferInfoIter, is, outChunk, outOffset,
+                            totalRows) -> FixedWidthChunkInputStreamGenerator
+                                    .extractChunkFromInputStreamWithTypeConversion(
+                                            Integer.BYTES, options, io -> TypeUtils.box(io.readInt()),
+                                            fieldNodeIter, bufferInfoIter, is, outChunk, outOffset, totalRows);
+                }
+                if (typeInfo.type() == Long.class) {
+                    return (fieldNodeIter, bufferInfoIter, is, outChunk, outOffset,
+                            totalRows) -> FixedWidthChunkInputStreamGenerator
+                                    .extractChunkFromInputStreamWithTypeConversion(
+                                            Long.BYTES, options, io -> TypeUtils.box(io.readLong()),
+                                            fieldNodeIter, bufferInfoIter, is, outChunk, outOffset, totalRows);
+                }
+                if (typeInfo.type() == Short.class) {
+                    return (fieldNodeIter, bufferInfoIter, is, outChunk, outOffset,
+                            totalRows) -> FixedWidthChunkInputStreamGenerator
+                                    .extractChunkFromInputStreamWithTypeConversion(
+                                            Short.BYTES, options, io -> TypeUtils.box(io.readShort()),
+                                            fieldNodeIter, bufferInfoIter, is, outChunk, outOffset, totalRows);
+                }
+                if (typeInfo.type() == LocalDate.class) {
+                    return new LongChunkReader(options).transform(value -> value == QueryConstants.NULL_LONG ? null
+                            : LocalDate.ofEpochDay(value / MS_PER_DAY));
+                }
+                if (typeInfo.type() == LocalTime.class) {
+                    return new LongChunkReader(options).transform(
+                            value -> value == QueryConstants.NULL_LONG ? null : LocalTime.ofNanoOfDay(value));
+                }
+                if (typeInfo.type() == String.class) {
+                    return StringChunkReader.STRING_CHUNK_READER;
+                }
+                // TODO (core#58): add custom barrage serialization/deserialization support
+                if (typeInfo.type() == Schema.class) {
+                    // Migrate Schema to custom format when available.
+                    return SchemaChunkReader.SCHEMA_CHUNK_READER;
+                }
+                // All other object types are sent from the server as strings
+                return StringChunkReader.STRING_CHUNK_READER;
+            default:
+                throw new UnsupportedOperationException();
+        }
+    }
+
+    private enum ByteArrayChunkReader implements ChunkReader {
+        BYTEARRAY_READER;
+
+        @Override
+        public WritableChunk<Values> readChunk(Iterator<ChunkInputStreamGenerator.FieldNodeInfo> fieldNodeIter,
+                PrimitiveIterator.OfLong bufferInfoIter, DataInput is, WritableChunk<Values> outChunk, int outOffset,
+                int totalRows) throws IOException {
+            return VarBinaryChunkInputStreamGenerator.extractChunkFromInputStream(
+                    is,
+                    fieldNodeIter,
+                    bufferInfoIter,
+                    ByteArrayChunkReader::readBytes,
+                    outChunk,
+                    outOffset,
+                    totalRows);
+        }
+
+        private static byte[] readBytes(byte[] buf, int off, int len) {
+            return Arrays.copyOfRange(buf, off, off + len);
+        }
+    }
+
+    private enum BigIntegerChunkReader implements ChunkReader {
+        BIG_INTEGER_CHUNK_READER;
+
+        @Override
+        public WritableChunk<Values> readChunk(Iterator<ChunkInputStreamGenerator.FieldNodeInfo> fieldNodeIter,
+                PrimitiveIterator.OfLong bufferInfoIter, DataInput is, WritableChunk<Values> outChunk, int outOffset,
+                int totalRows) throws IOException {
+            return VarBinaryChunkInputStreamGenerator.extractChunkFromInputStream(
+                    is,
+                    fieldNodeIter,
+                    bufferInfoIter,
+                    BigInteger::new,
+                    outChunk,
+                    outOffset,
+                    totalRows);
+        }
+    }
+
+    private enum BigDecimalChunkReader implements ChunkReader {
+        BIG_DECIMAL_CHUNK_READER;
+
+        @Override
+        public WritableChunk<Values> readChunk(Iterator<ChunkInputStreamGenerator.FieldNodeInfo> fieldNodeIter,
+                PrimitiveIterator.OfLong bufferInfoIter, DataInput is, WritableChunk<Values> outChunk, int outOffset,
+                int totalRows) throws IOException {
+            return VarBinaryChunkInputStreamGenerator.extractChunkFromInputStream(
+                    is,
+                    fieldNodeIter,
+                    bufferInfoIter,
+                    BigDecimalChunkReader::readBigDecimal,
+                    outChunk,
+                    outOffset,
+                    totalRows);
+        }
+
+        private static BigDecimal readBigDecimal(byte[] buf, int offset, int length) {
+            // read the int scale value as little endian, arrow's endianness.
+            final byte b1 = buf[offset];
+            final byte b2 = buf[offset + 1];
+            final byte b3 = buf[offset + 2];
+            final byte b4 = buf[offset + 3];
+            final int scale = b4 << 24 | (b3 & 0xFF) << 16 | (b2 & 0xFF) << 8 | (b1 & 0xFF);
+            return new BigDecimal(new BigInteger(buf, offset + 4, length - 4), scale);
+        }
+    }
+
+    private enum StringChunkReader implements ChunkReader {
+        STRING_CHUNK_READER;
+
+        @Override
+        public WritableChunk<Values> readChunk(Iterator<ChunkInputStreamGenerator.FieldNodeInfo> fieldNodeIter,
+                PrimitiveIterator.OfLong bufferInfoIter, DataInput is, WritableChunk<Values> outChunk, int outOffset,
+                int totalRows) throws IOException {
+            return VarBinaryChunkInputStreamGenerator.extractChunkFromInputStream(
+                    is,
+                    fieldNodeIter,
+                    bufferInfoIter,
+                    StringChunkReader::readString,
+                    outChunk,
+                    outOffset,
+                    totalRows);
+        }
+
+        private static String readString(byte[] buf, int off, int len) {
+            return new String(buf, off, len, Charsets.UTF_8);
+        }
+    }
+
+    private enum SchemaChunkReader implements ChunkReader {
+        SCHEMA_CHUNK_READER;
+
+        @Override
+        public WritableChunk<Values> readChunk(Iterator<ChunkInputStreamGenerator.FieldNodeInfo> fieldNodeIter,
+                PrimitiveIterator.OfLong bufferInfoIter, DataInput is, WritableChunk<Values> outChunk, int outOffset,
+                int totalRows) throws IOException {
+            return VarBinaryChunkInputStreamGenerator.extractChunkFromInputStream(
+                    is,
+                    fieldNodeIter,
+                    bufferInfoIter,
+                    ArrowIpcUtil::deserialize,
+                    outChunk,
+                    outOffset,
+                    totalRows);
+        }
+    }
+}
diff --git a/extensions/barrage/src/main/java/io/deephaven/extensions/barrage/chunk/DoubleChunkInputStreamGenerator.java b/extensions/barrage/src/main/java/io/deephaven/extensions/barrage/chunk/DoubleChunkInputStreamGenerator.java
index e99ee922cac..a0046b67edb 100644
--- a/extensions/barrage/src/main/java/io/deephaven/extensions/barrage/chunk/DoubleChunkInputStreamGenerator.java
+++ b/extensions/barrage/src/main/java/io/deephaven/extensions/barrage/chunk/DoubleChunkInputStreamGenerator.java
@@ -9,10 +9,7 @@
 
 import java.util.function.ToDoubleFunction;
 
-import io.deephaven.base.verify.Assert;
 import io.deephaven.chunk.ObjectChunk;
-import io.deephaven.chunk.WritableChunk;
-import io.deephaven.chunk.WritableObjectChunk;
 import io.deephaven.chunk.attributes.Values;
 import io.deephaven.chunk.util.pools.PoolableChunk;
 import io.deephaven.engine.rowset.RowSet;
@@ -22,17 +19,11 @@
 import io.deephaven.util.datastructures.LongSizedDataStructure;
 import io.deephaven.chunk.DoubleChunk;
 import io.deephaven.chunk.WritableDoubleChunk;
-import io.deephaven.chunk.WritableLongChunk;
 import io.deephaven.util.type.TypeUtils;
 import org.jetbrains.annotations.Nullable;
 
-import java.io.DataInput;
 import java.io.IOException;
 import java.io.OutputStream;
-import java.util.Iterator;
-import java.util.PrimitiveIterator;
-import java.util.function.Function;
-import java.util.function.IntFunction;
 
 import static io.deephaven.util.QueryConstants.*;
 
@@ -168,198 +159,4 @@ public int drainTo(final OutputStream outputStream) throws IOException {
             return LongSizedDataStructure.intSize("DoubleChunkInputStreamGenerator", bytesWritten);
         }
     }
-
-    @FunctionalInterface
-    public interface DoubleConversion {
-        double apply(double in);
-
-        DoubleConversion IDENTITY = (double a) -> a;
-    }
-
-    static WritableDoubleChunk<Values> extractChunkFromInputStream(
-            final int elementSize,
-            final StreamReaderOptions options,
-            final Iterator<FieldNodeInfo> fieldNodeIter,
-            final PrimitiveIterator.OfLong bufferInfoIter,
-            final DataInput is,
-            final WritableChunk<Values> outChunk,
-            final int outOffset,
-            final int totalRows) throws IOException {
-        return extractChunkFromInputStreamWithConversion(
-                elementSize, options, DoubleConversion.IDENTITY, fieldNodeIter, bufferInfoIter, is, outChunk, outOffset,
-                totalRows);
-    }
-
-    static <T> WritableObjectChunk<T, Values> extractChunkFromInputStreamWithTransform(
-            final int elementSize,
-            final StreamReaderOptions options,
-            final Function<Double, T> transform,
-            final Iterator<FieldNodeInfo> fieldNodeIter,
-            final PrimitiveIterator.OfLong bufferInfoIter,
-            final DataInput is,
-            final WritableChunk<Values> outChunk,
-            final int outOffset,
-            final int totalRows) throws IOException {
-
-        try (final WritableDoubleChunk<Values> inner = extractChunkFromInputStream(
-                elementSize, options, fieldNodeIter, bufferInfoIter, is, null, 0, 0)) {
-
-            final WritableObjectChunk<T, Values> chunk = castOrCreateChunk(
-                    outChunk,
-                    Math.max(totalRows, inner.size()),
-                    WritableObjectChunk::makeWritableChunk,
-                    WritableChunk::asWritableObjectChunk);
-
-            if (outChunk == null) {
-                // if we're not given an output chunk then we better be writing at the front of the new one
-                Assert.eqZero(outOffset, "outOffset");
-            }
-
-            for (int ii = 0; ii < inner.size(); ++ii) {
-                double value = inner.get(ii);
-                chunk.set(outOffset + ii, transform.apply(value));
-            }
-
-            return chunk;
-        }
-    }
-
-    static WritableDoubleChunk<Values> extractChunkFromInputStreamWithConversion(
-            final int elementSize,
-            final StreamReaderOptions options,
-            final DoubleConversion conversion,
-            final Iterator<FieldNodeInfo> fieldNodeIter,
-            final PrimitiveIterator.OfLong bufferInfoIter,
-            final DataInput is,
-            final WritableChunk<Values> outChunk,
-            final int outOffset,
-            final int totalRows) throws IOException {
-
-        final FieldNodeInfo nodeInfo = fieldNodeIter.next();
-        final long validityBuffer = bufferInfoIter.nextLong();
-        final long payloadBuffer = bufferInfoIter.nextLong();
-
-        final WritableDoubleChunk<Values> chunk = castOrCreateChunk(
-                outChunk,
-                Math.max(totalRows, nodeInfo.numElements),
-                WritableDoubleChunk::makeWritableChunk,
-                WritableChunk::asWritableDoubleChunk);
-
-        if (nodeInfo.numElements == 0) {
-            return chunk;
-        }
-
-        final int numValidityLongs = options.useDeephavenNulls() ? 0 : (nodeInfo.numElements + 63) / 64;
-        try (final WritableLongChunk<Values> isValid = WritableLongChunk.makeWritableChunk(numValidityLongs)) {
-            if (options.useDeephavenNulls() && validityBuffer != 0) {
-                throw new IllegalStateException("validity buffer is non-empty, but is unnecessary");
-            }
-            int jj = 0;
-            for (; jj < Math.min(numValidityLongs, validityBuffer / 8); ++jj) {
-                isValid.set(jj, is.readLong());
-            }
-            final long valBufRead = jj * 8L;
-            if (valBufRead < validityBuffer) {
-                is.skipBytes(LongSizedDataStructure.intSize(DEBUG_NAME, validityBuffer - valBufRead));
-            }
-            // we support short validity buffers
-            for (; jj < numValidityLongs; ++jj) {
-                isValid.set(jj, -1); // -1 is bit-wise representation of all ones
-            }
-            // consumed entire validity buffer by here
-
-            final long payloadRead = (long) nodeInfo.numElements * elementSize;
-            if (payloadBuffer < payloadRead) {
-                throw new IllegalStateException("payload buffer is too short for expected number of elements");
-            }
-
-            if (options.useDeephavenNulls()) {
-                useDeephavenNulls(conversion, is, nodeInfo, chunk, outOffset);
-            } else {
-                useValidityBuffer(elementSize, conversion, is, nodeInfo, chunk, outOffset, isValid);
-            }
-
-            final long overhangPayload = payloadBuffer - payloadRead;
-            if (overhangPayload > 0) {
-                is.skipBytes(LongSizedDataStructure.intSize(DEBUG_NAME, overhangPayload));
-            }
-        }
-
-        return chunk;
-    }
-
-    private static <T extends WritableChunk<Values>> T castOrCreateChunk(
-            final WritableChunk<Values> outChunk,
-            final int numRows,
-            final IntFunction<T> chunkFactory,
-            final Function<WritableChunk<Values>, T> castFunction) {
-        if (outChunk != null) {
-            return castFunction.apply(outChunk);
-        }
-        final T newChunk = chunkFactory.apply(numRows);
-        newChunk.setSize(numRows);
-        return newChunk;
-    }
-
-    private static void useDeephavenNulls(
-            final DoubleConversion conversion,
-            final DataInput is,
-            final FieldNodeInfo nodeInfo,
-            final WritableDoubleChunk<Values> chunk,
-            final int offset) throws IOException {
-        if (conversion == DoubleConversion.IDENTITY) {
-            for (int ii = 0; ii < nodeInfo.numElements; ++ii) {
-                chunk.set(offset + ii, is.readDouble());
-            }
-        } else {
-            for (int ii = 0; ii < nodeInfo.numElements; ++ii) {
-                final double in = is.readDouble();
-                final double out = in == NULL_DOUBLE ? in : conversion.apply(in);
-                chunk.set(offset + ii, out);
-            }
-        }
-    }
-
-    private static void useValidityBuffer(
-            final int elementSize,
-            final DoubleConversion conversion,
-            final DataInput is,
-            final FieldNodeInfo nodeInfo,
-            final WritableDoubleChunk<Values> chunk,
-            final int offset,
-            final WritableLongChunk<Values> isValid) throws IOException {
-        final int numElements = nodeInfo.numElements;
-        final int numValidityWords = (numElements + 63) / 64;
-
-        int ei = 0;
-        int pendingSkips = 0;
-
-        for (int vi = 0; vi < numValidityWords; ++vi) {
-            int bitsLeftInThisWord = Math.min(64, numElements - vi * 64);
-            long validityWord = isValid.get(vi);
-            do {
-                if ((validityWord & 1) == 1) {
-                    if (pendingSkips > 0) {
-                        is.skipBytes(pendingSkips * elementSize);
-                        chunk.fillWithNullValue(offset + ei, pendingSkips);
-                        ei += pendingSkips;
-                        pendingSkips = 0;
-                    }
-                    chunk.set(offset + ei++, conversion.apply(is.readDouble()));
-                    validityWord >>= 1;
-                    bitsLeftInThisWord--;
-                } else {
-                    final int skips = Math.min(Long.numberOfTrailingZeros(validityWord), bitsLeftInThisWord);
-                    pendingSkips += skips;
-                    validityWord >>= skips;
-                    bitsLeftInThisWord -= skips;
-                }
-            } while (bitsLeftInThisWord > 0);
-        }
-
-        if (pendingSkips > 0) {
-            is.skipBytes(pendingSkips * elementSize);
-            chunk.fillWithNullValue(offset + ei, pendingSkips);
-        }
-    }
 }
diff --git a/extensions/barrage/src/main/java/io/deephaven/extensions/barrage/chunk/DoubleChunkReader.java b/extensions/barrage/src/main/java/io/deephaven/extensions/barrage/chunk/DoubleChunkReader.java
new file mode 100644
index 00000000000..39059f29a2f
--- /dev/null
+++ b/extensions/barrage/src/main/java/io/deephaven/extensions/barrage/chunk/DoubleChunkReader.java
@@ -0,0 +1,204 @@
+//
+// Copyright (c) 2016-2024 Deephaven Data Labs and Patent Pending
+//
+// ****** AUTO-GENERATED CLASS - DO NOT EDIT MANUALLY
+// ****** Edit CharChunkReader and run "./gradlew replicateBarrageUtils" to regenerate
+//
+// @formatter:off
+package io.deephaven.extensions.barrage.chunk;
+
+import io.deephaven.base.verify.Assert;
+import io.deephaven.chunk.WritableDoubleChunk;
+import io.deephaven.chunk.WritableChunk;
+import io.deephaven.chunk.WritableLongChunk;
+import io.deephaven.chunk.WritableObjectChunk;
+import io.deephaven.chunk.attributes.Values;
+import io.deephaven.extensions.barrage.util.StreamReaderOptions;
+import io.deephaven.util.datastructures.LongSizedDataStructure;
+
+import java.io.DataInput;
+import java.io.IOException;
+import java.util.Iterator;
+import java.util.PrimitiveIterator;
+import java.util.function.Function;
+import java.util.function.IntFunction;
+
+import static io.deephaven.util.QueryConstants.NULL_DOUBLE;
+
+public class DoubleChunkReader implements ChunkReader {
+    private static final String DEBUG_NAME = "DoubleChunkReader";
+    private final StreamReaderOptions options;
+    private final DoubleConversion conversion;
+
+    @FunctionalInterface
+    public interface DoubleConversion {
+        double apply(double in);
+
+        DoubleConversion IDENTITY = (double a) -> a;
+    }
+
+    public DoubleChunkReader(StreamReaderOptions options) {
+        this(options, DoubleConversion.IDENTITY);
+    }
+
+    public DoubleChunkReader(StreamReaderOptions options, DoubleConversion conversion) {
+        this.options = options;
+        this.conversion = conversion;
+    }
+
+    public <T> ChunkReader transform(Function<Double, T> transform) {
+        return (fieldNodeIter, bufferInfoIter, is, outChunk, outOffset, totalRows) -> {
+            try (final WritableDoubleChunk<Values> inner = DoubleChunkReader.this.readChunk(
+                    fieldNodeIter, bufferInfoIter, is, null, 0, 0)) {
+
+                final WritableObjectChunk<T, Values> chunk = castOrCreateChunk(
+                        outChunk,
+                        Math.max(totalRows, inner.size()),
+                        WritableObjectChunk::makeWritableChunk,
+                        WritableChunk::asWritableObjectChunk);
+
+                if (outChunk == null) {
+                    // if we're not given an output chunk then we better be writing at the front of the new one
+                    Assert.eqZero(outOffset, "outOffset");
+                }
+
+                for (int ii = 0; ii < inner.size(); ++ii) {
+                    double value = inner.get(ii);
+                    chunk.set(outOffset + ii, transform.apply(value));
+                }
+
+                return chunk;
+            }
+        };
+    }
+
+    @Override
+    public WritableDoubleChunk<Values> readChunk(Iterator<ChunkInputStreamGenerator.FieldNodeInfo> fieldNodeIter,
+            PrimitiveIterator.OfLong bufferInfoIter, DataInput is, WritableChunk<Values> outChunk, int outOffset,
+            int totalRows) throws IOException {
+
+        final ChunkInputStreamGenerator.FieldNodeInfo nodeInfo = fieldNodeIter.next();
+        final long validityBuffer = bufferInfoIter.nextLong();
+        final long payloadBuffer = bufferInfoIter.nextLong();
+
+        final WritableDoubleChunk<Values> chunk = castOrCreateChunk(
+                outChunk,
+                Math.max(totalRows, nodeInfo.numElements),
+                WritableDoubleChunk::makeWritableChunk,
+                WritableChunk::asWritableDoubleChunk);
+
+        if (nodeInfo.numElements == 0) {
+            return chunk;
+        }
+
+        final int numValidityLongs = options.useDeephavenNulls() ? 0 : (nodeInfo.numElements + 63) / 64;
+        try (final WritableLongChunk<Values> isValid = WritableLongChunk.makeWritableChunk(numValidityLongs)) {
+            if (options.useDeephavenNulls() && validityBuffer != 0) {
+                throw new IllegalStateException("validity buffer is non-empty, but is unnecessary");
+            }
+            int jj = 0;
+            for (; jj < Math.min(numValidityLongs, validityBuffer / 8); ++jj) {
+                isValid.set(jj, is.readLong());
+            }
+            final long valBufRead = jj * 8L;
+            if (valBufRead < validityBuffer) {
+                is.skipBytes(LongSizedDataStructure.intSize(DEBUG_NAME, validityBuffer - valBufRead));
+            }
+            // we support short validity buffers
+            for (; jj < numValidityLongs; ++jj) {
+                isValid.set(jj, -1); // -1 is bit-wise representation of all ones
+            }
+            // consumed entire validity buffer by here
+
+            final long payloadRead = (long) nodeInfo.numElements * Double.BYTES;
+            Assert.geq(payloadBuffer, "payloadBuffer", payloadRead, "payloadRead");
+
+            if (options.useDeephavenNulls()) {
+                useDeephavenNulls(conversion, is, nodeInfo, chunk, outOffset);
+            } else {
+                useValidityBuffer(conversion, is, nodeInfo, chunk, outOffset, isValid);
+            }
+
+            final long overhangPayload = payloadBuffer - payloadRead;
+            if (overhangPayload > 0) {
+                is.skipBytes(LongSizedDataStructure.intSize(DEBUG_NAME, overhangPayload));
+            }
+        }
+
+        return chunk;
+    }
+
+    private static <T extends WritableChunk<Values>> T castOrCreateChunk(
+            final WritableChunk<Values> outChunk,
+            final int numRows,
+            final IntFunction<T> chunkFactory,
+            final Function<WritableChunk<Values>, T> castFunction) {
+        if (outChunk != null) {
+            return castFunction.apply(outChunk);
+        }
+        final T newChunk = chunkFactory.apply(numRows);
+        newChunk.setSize(numRows);
+        return newChunk;
+    }
+
+    private static void useDeephavenNulls(
+            final DoubleConversion conversion,
+            final DataInput is,
+            final ChunkInputStreamGenerator.FieldNodeInfo nodeInfo,
+            final WritableDoubleChunk<Values> chunk,
+            final int offset) throws IOException {
+        if (conversion == DoubleConversion.IDENTITY) {
+            for (int ii = 0; ii < nodeInfo.numElements; ++ii) {
+                chunk.set(offset + ii, is.readDouble());
+            }
+        } else {
+            for (int ii = 0; ii < nodeInfo.numElements; ++ii) {
+                final double in = is.readDouble();
+                final double out = in == NULL_DOUBLE ? in : conversion.apply(in);
+                chunk.set(offset + ii, out);
+            }
+        }
+    }
+
+    private static void useValidityBuffer(
+            final DoubleConversion conversion,
+            final DataInput is,
+            final ChunkInputStreamGenerator.FieldNodeInfo nodeInfo,
+            final WritableDoubleChunk<Values> chunk,
+            final int offset,
+            final WritableLongChunk<Values> isValid) throws IOException {
+        final int numElements = nodeInfo.numElements;
+        final int numValidityWords = (numElements + 63) / 64;
+
+        int ei = 0;
+        int pendingSkips = 0;
+
+        for (int vi = 0; vi < numValidityWords; ++vi) {
+            int bitsLeftInThisWord = Math.min(64, numElements - vi * 64);
+            long validityWord = isValid.get(vi);
+            do {
+                if ((validityWord & 1) == 1) {
+                    if (pendingSkips > 0) {
+                        is.skipBytes(pendingSkips * Double.BYTES);
+                        chunk.fillWithNullValue(offset + ei, pendingSkips);
+                        ei += pendingSkips;
+                        pendingSkips = 0;
+                    }
+                    chunk.set(offset + ei++, conversion.apply(is.readDouble()));
+                    validityWord >>= 1;
+                    bitsLeftInThisWord--;
+                } else {
+                    final int skips = Math.min(Long.numberOfTrailingZeros(validityWord), bitsLeftInThisWord);
+                    pendingSkips += skips;
+                    validityWord >>= skips;
+                    bitsLeftInThisWord -= skips;
+                }
+            } while (bitsLeftInThisWord > 0);
+        }
+
+        if (pendingSkips > 0) {
+            is.skipBytes(pendingSkips * Double.BYTES);
+            chunk.fillWithNullValue(offset + ei, pendingSkips);
+        }
+    }
+}
diff --git a/extensions/barrage/src/main/java/io/deephaven/extensions/barrage/chunk/FixedWidthChunkInputStreamGenerator.java b/extensions/barrage/src/main/java/io/deephaven/extensions/barrage/chunk/FixedWidthChunkInputStreamGenerator.java
index 46541c8ec1d..7b77b00911b 100644
--- a/extensions/barrage/src/main/java/io/deephaven/extensions/barrage/chunk/FixedWidthChunkInputStreamGenerator.java
+++ b/extensions/barrage/src/main/java/io/deephaven/extensions/barrage/chunk/FixedWidthChunkInputStreamGenerator.java
@@ -40,7 +40,7 @@ public interface TypeConversion<T> {
      * @param <T> the result type
      * @return the resulting chunk of the buffer that is read
      */
-    static <T> WritableObjectChunk<T, Values> extractChunkFromInputStreamWithTypeConversion(
+    public static <T> WritableObjectChunk<T, Values> extractChunkFromInputStreamWithTypeConversion(
             final int elementSize,
             final StreamReaderOptions options,
             final TypeConversion<T> conversion,
diff --git a/extensions/barrage/src/main/java/io/deephaven/extensions/barrage/chunk/FloatChunkInputStreamGenerator.java b/extensions/barrage/src/main/java/io/deephaven/extensions/barrage/chunk/FloatChunkInputStreamGenerator.java
index 0daee6eb829..edd8aaccb2a 100644
--- a/extensions/barrage/src/main/java/io/deephaven/extensions/barrage/chunk/FloatChunkInputStreamGenerator.java
+++ b/extensions/barrage/src/main/java/io/deephaven/extensions/barrage/chunk/FloatChunkInputStreamGenerator.java
@@ -7,10 +7,7 @@
 // @formatter:off
 package io.deephaven.extensions.barrage.chunk;
 
-import io.deephaven.base.verify.Assert;
 import io.deephaven.chunk.ObjectChunk;
-import io.deephaven.chunk.WritableChunk;
-import io.deephaven.chunk.WritableObjectChunk;
 import io.deephaven.chunk.attributes.Values;
 import io.deephaven.chunk.util.pools.PoolableChunk;
 import io.deephaven.engine.primitive.function.ToFloatFunction;
@@ -21,17 +18,11 @@
 import io.deephaven.util.datastructures.LongSizedDataStructure;
 import io.deephaven.chunk.FloatChunk;
 import io.deephaven.chunk.WritableFloatChunk;
-import io.deephaven.chunk.WritableLongChunk;
 import io.deephaven.util.type.TypeUtils;
 import org.jetbrains.annotations.Nullable;
 
-import java.io.DataInput;
 import java.io.IOException;
 import java.io.OutputStream;
-import java.util.Iterator;
-import java.util.PrimitiveIterator;
-import java.util.function.Function;
-import java.util.function.IntFunction;
 
 import static io.deephaven.util.QueryConstants.*;
 
@@ -167,198 +158,4 @@ public int drainTo(final OutputStream outputStream) throws IOException {
             return LongSizedDataStructure.intSize("FloatChunkInputStreamGenerator", bytesWritten);
         }
     }
-
-    @FunctionalInterface
-    public interface FloatConversion {
-        float apply(float in);
-
-        FloatConversion IDENTITY = (float a) -> a;
-    }
-
-    static WritableFloatChunk<Values> extractChunkFromInputStream(
-            final int elementSize,
-            final StreamReaderOptions options,
-            final Iterator<FieldNodeInfo> fieldNodeIter,
-            final PrimitiveIterator.OfLong bufferInfoIter,
-            final DataInput is,
-            final WritableChunk<Values> outChunk,
-            final int outOffset,
-            final int totalRows) throws IOException {
-        return extractChunkFromInputStreamWithConversion(
-                elementSize, options, FloatConversion.IDENTITY, fieldNodeIter, bufferInfoIter, is, outChunk, outOffset,
-                totalRows);
-    }
-
-    static <T> WritableObjectChunk<T, Values> extractChunkFromInputStreamWithTransform(
-            final int elementSize,
-            final StreamReaderOptions options,
-            final Function<Float, T> transform,
-            final Iterator<FieldNodeInfo> fieldNodeIter,
-            final PrimitiveIterator.OfLong bufferInfoIter,
-            final DataInput is,
-            final WritableChunk<Values> outChunk,
-            final int outOffset,
-            final int totalRows) throws IOException {
-
-        try (final WritableFloatChunk<Values> inner = extractChunkFromInputStream(
-                elementSize, options, fieldNodeIter, bufferInfoIter, is, null, 0, 0)) {
-
-            final WritableObjectChunk<T, Values> chunk = castOrCreateChunk(
-                    outChunk,
-                    Math.max(totalRows, inner.size()),
-                    WritableObjectChunk::makeWritableChunk,
-                    WritableChunk::asWritableObjectChunk);
-
-            if (outChunk == null) {
-                // if we're not given an output chunk then we better be writing at the front of the new one
-                Assert.eqZero(outOffset, "outOffset");
-            }
-
-            for (int ii = 0; ii < inner.size(); ++ii) {
-                float value = inner.get(ii);
-                chunk.set(outOffset + ii, transform.apply(value));
-            }
-
-            return chunk;
-        }
-    }
-
-    static WritableFloatChunk<Values> extractChunkFromInputStreamWithConversion(
-            final int elementSize,
-            final StreamReaderOptions options,
-            final FloatConversion conversion,
-            final Iterator<FieldNodeInfo> fieldNodeIter,
-            final PrimitiveIterator.OfLong bufferInfoIter,
-            final DataInput is,
-            final WritableChunk<Values> outChunk,
-            final int outOffset,
-            final int totalRows) throws IOException {
-
-        final FieldNodeInfo nodeInfo = fieldNodeIter.next();
-        final long validityBuffer = bufferInfoIter.nextLong();
-        final long payloadBuffer = bufferInfoIter.nextLong();
-
-        final WritableFloatChunk<Values> chunk = castOrCreateChunk(
-                outChunk,
-                Math.max(totalRows, nodeInfo.numElements),
-                WritableFloatChunk::makeWritableChunk,
-                WritableChunk::asWritableFloatChunk);
-
-        if (nodeInfo.numElements == 0) {
-            return chunk;
-        }
-
-        final int numValidityLongs = options.useDeephavenNulls() ? 0 : (nodeInfo.numElements + 63) / 64;
-        try (final WritableLongChunk<Values> isValid = WritableLongChunk.makeWritableChunk(numValidityLongs)) {
-            if (options.useDeephavenNulls() && validityBuffer != 0) {
-                throw new IllegalStateException("validity buffer is non-empty, but is unnecessary");
-            }
-            int jj = 0;
-            for (; jj < Math.min(numValidityLongs, validityBuffer / 8); ++jj) {
-                isValid.set(jj, is.readLong());
-            }
-            final long valBufRead = jj * 8L;
-            if (valBufRead < validityBuffer) {
-                is.skipBytes(LongSizedDataStructure.intSize(DEBUG_NAME, validityBuffer - valBufRead));
-            }
-            // we support short validity buffers
-            for (; jj < numValidityLongs; ++jj) {
-                isValid.set(jj, -1); // -1 is bit-wise representation of all ones
-            }
-            // consumed entire validity buffer by here
-
-            final long payloadRead = (long) nodeInfo.numElements * elementSize;
-            if (payloadBuffer < payloadRead) {
-                throw new IllegalStateException("payload buffer is too short for expected number of elements");
-            }
-
-            if (options.useDeephavenNulls()) {
-                useDeephavenNulls(conversion, is, nodeInfo, chunk, outOffset);
-            } else {
-                useValidityBuffer(elementSize, conversion, is, nodeInfo, chunk, outOffset, isValid);
-            }
-
-            final long overhangPayload = payloadBuffer - payloadRead;
-            if (overhangPayload > 0) {
-                is.skipBytes(LongSizedDataStructure.intSize(DEBUG_NAME, overhangPayload));
-            }
-        }
-
-        return chunk;
-    }
-
-    private static <T extends WritableChunk<Values>> T castOrCreateChunk(
-            final WritableChunk<Values> outChunk,
-            final int numRows,
-            final IntFunction<T> chunkFactory,
-            final Function<WritableChunk<Values>, T> castFunction) {
-        if (outChunk != null) {
-            return castFunction.apply(outChunk);
-        }
-        final T newChunk = chunkFactory.apply(numRows);
-        newChunk.setSize(numRows);
-        return newChunk;
-    }
-
-    private static void useDeephavenNulls(
-            final FloatConversion conversion,
-            final DataInput is,
-            final FieldNodeInfo nodeInfo,
-            final WritableFloatChunk<Values> chunk,
-            final int offset) throws IOException {
-        if (conversion == FloatConversion.IDENTITY) {
-            for (int ii = 0; ii < nodeInfo.numElements; ++ii) {
-                chunk.set(offset + ii, is.readFloat());
-            }
-        } else {
-            for (int ii = 0; ii < nodeInfo.numElements; ++ii) {
-                final float in = is.readFloat();
-                final float out = in == NULL_FLOAT ? in : conversion.apply(in);
-                chunk.set(offset + ii, out);
-            }
-        }
-    }
-
-    private static void useValidityBuffer(
-            final int elementSize,
-            final FloatConversion conversion,
-            final DataInput is,
-            final FieldNodeInfo nodeInfo,
-            final WritableFloatChunk<Values> chunk,
-            final int offset,
-            final WritableLongChunk<Values> isValid) throws IOException {
-        final int numElements = nodeInfo.numElements;
-        final int numValidityWords = (numElements + 63) / 64;
-
-        int ei = 0;
-        int pendingSkips = 0;
-
-        for (int vi = 0; vi < numValidityWords; ++vi) {
-            int bitsLeftInThisWord = Math.min(64, numElements - vi * 64);
-            long validityWord = isValid.get(vi);
-            do {
-                if ((validityWord & 1) == 1) {
-                    if (pendingSkips > 0) {
-                        is.skipBytes(pendingSkips * elementSize);
-                        chunk.fillWithNullValue(offset + ei, pendingSkips);
-                        ei += pendingSkips;
-                        pendingSkips = 0;
-                    }
-                    chunk.set(offset + ei++, conversion.apply(is.readFloat()));
-                    validityWord >>= 1;
-                    bitsLeftInThisWord--;
-                } else {
-                    final int skips = Math.min(Long.numberOfTrailingZeros(validityWord), bitsLeftInThisWord);
-                    pendingSkips += skips;
-                    validityWord >>= skips;
-                    bitsLeftInThisWord -= skips;
-                }
-            } while (bitsLeftInThisWord > 0);
-        }
-
-        if (pendingSkips > 0) {
-            is.skipBytes(pendingSkips * elementSize);
-            chunk.fillWithNullValue(offset + ei, pendingSkips);
-        }
-    }
 }
diff --git a/extensions/barrage/src/main/java/io/deephaven/extensions/barrage/chunk/FloatChunkReader.java b/extensions/barrage/src/main/java/io/deephaven/extensions/barrage/chunk/FloatChunkReader.java
new file mode 100644
index 00000000000..df2bfa32071
--- /dev/null
+++ b/extensions/barrage/src/main/java/io/deephaven/extensions/barrage/chunk/FloatChunkReader.java
@@ -0,0 +1,204 @@
+//
+// Copyright (c) 2016-2024 Deephaven Data Labs and Patent Pending
+//
+// ****** AUTO-GENERATED CLASS - DO NOT EDIT MANUALLY
+// ****** Edit CharChunkReader and run "./gradlew replicateBarrageUtils" to regenerate
+//
+// @formatter:off
+package io.deephaven.extensions.barrage.chunk;
+
+import io.deephaven.base.verify.Assert;
+import io.deephaven.chunk.WritableFloatChunk;
+import io.deephaven.chunk.WritableChunk;
+import io.deephaven.chunk.WritableLongChunk;
+import io.deephaven.chunk.WritableObjectChunk;
+import io.deephaven.chunk.attributes.Values;
+import io.deephaven.extensions.barrage.util.StreamReaderOptions;
+import io.deephaven.util.datastructures.LongSizedDataStructure;
+
+import java.io.DataInput;
+import java.io.IOException;
+import java.util.Iterator;
+import java.util.PrimitiveIterator;
+import java.util.function.Function;
+import java.util.function.IntFunction;
+
+import static io.deephaven.util.QueryConstants.NULL_FLOAT;
+
+public class FloatChunkReader implements ChunkReader {
+    private static final String DEBUG_NAME = "FloatChunkReader";
+    private final StreamReaderOptions options;
+    private final FloatConversion conversion;
+
+    @FunctionalInterface
+    public interface FloatConversion {
+        float apply(float in);
+
+        FloatConversion IDENTITY = (float a) -> a;
+    }
+
+    public FloatChunkReader(StreamReaderOptions options) {
+        this(options, FloatConversion.IDENTITY);
+    }
+
+    public FloatChunkReader(StreamReaderOptions options, FloatConversion conversion) {
+        this.options = options;
+        this.conversion = conversion;
+    }
+
+    public <T> ChunkReader transform(Function<Float, T> transform) {
+        return (fieldNodeIter, bufferInfoIter, is, outChunk, outOffset, totalRows) -> {
+            try (final WritableFloatChunk<Values> inner = FloatChunkReader.this.readChunk(
+                    fieldNodeIter, bufferInfoIter, is, null, 0, 0)) {
+
+                final WritableObjectChunk<T, Values> chunk = castOrCreateChunk(
+                        outChunk,
+                        Math.max(totalRows, inner.size()),
+                        WritableObjectChunk::makeWritableChunk,
+                        WritableChunk::asWritableObjectChunk);
+
+                if (outChunk == null) {
+                    // if we're not given an output chunk then we better be writing at the front of the new one
+                    Assert.eqZero(outOffset, "outOffset");
+                }
+
+                for (int ii = 0; ii < inner.size(); ++ii) {
+                    float value = inner.get(ii);
+                    chunk.set(outOffset + ii, transform.apply(value));
+                }
+
+                return chunk;
+            }
+        };
+    }
+
+    @Override
+    public WritableFloatChunk<Values> readChunk(Iterator<ChunkInputStreamGenerator.FieldNodeInfo> fieldNodeIter,
+            PrimitiveIterator.OfLong bufferInfoIter, DataInput is, WritableChunk<Values> outChunk, int outOffset,
+            int totalRows) throws IOException {
+
+        final ChunkInputStreamGenerator.FieldNodeInfo nodeInfo = fieldNodeIter.next();
+        final long validityBuffer = bufferInfoIter.nextLong();
+        final long payloadBuffer = bufferInfoIter.nextLong();
+
+        final WritableFloatChunk<Values> chunk = castOrCreateChunk(
+                outChunk,
+                Math.max(totalRows, nodeInfo.numElements),
+                WritableFloatChunk::makeWritableChunk,
+                WritableChunk::asWritableFloatChunk);
+
+        if (nodeInfo.numElements == 0) {
+            return chunk;
+        }
+
+        final int numValidityLongs = options.useDeephavenNulls() ? 0 : (nodeInfo.numElements + 63) / 64;
+        try (final WritableLongChunk<Values> isValid = WritableLongChunk.makeWritableChunk(numValidityLongs)) {
+            if (options.useDeephavenNulls() && validityBuffer != 0) {
+                throw new IllegalStateException("validity buffer is non-empty, but is unnecessary");
+            }
+            int jj = 0;
+            for (; jj < Math.min(numValidityLongs, validityBuffer / 8); ++jj) {
+                isValid.set(jj, is.readLong());
+            }
+            final long valBufRead = jj * 8L;
+            if (valBufRead < validityBuffer) {
+                is.skipBytes(LongSizedDataStructure.intSize(DEBUG_NAME, validityBuffer - valBufRead));
+            }
+            // we support short validity buffers
+            for (; jj < numValidityLongs; ++jj) {
+                isValid.set(jj, -1); // -1 is bit-wise representation of all ones
+            }
+            // consumed entire validity buffer by here
+
+            final long payloadRead = (long) nodeInfo.numElements * Float.BYTES;
+            Assert.geq(payloadBuffer, "payloadBuffer", payloadRead, "payloadRead");
+
+            if (options.useDeephavenNulls()) {
+                useDeephavenNulls(conversion, is, nodeInfo, chunk, outOffset);
+            } else {
+                useValidityBuffer(conversion, is, nodeInfo, chunk, outOffset, isValid);
+            }
+
+            final long overhangPayload = payloadBuffer - payloadRead;
+            if (overhangPayload > 0) {
+                is.skipBytes(LongSizedDataStructure.intSize(DEBUG_NAME, overhangPayload));
+            }
+        }
+
+        return chunk;
+    }
+
+    private static <T extends WritableChunk<Values>> T castOrCreateChunk(
+            final WritableChunk<Values> outChunk,
+            final int numRows,
+            final IntFunction<T> chunkFactory,
+            final Function<WritableChunk<Values>, T> castFunction) {
+        if (outChunk != null) {
+            return castFunction.apply(outChunk);
+        }
+        final T newChunk = chunkFactory.apply(numRows);
+        newChunk.setSize(numRows);
+        return newChunk;
+    }
+
+    private static void useDeephavenNulls(
+            final FloatConversion conversion,
+            final DataInput is,
+            final ChunkInputStreamGenerator.FieldNodeInfo nodeInfo,
+            final WritableFloatChunk<Values> chunk,
+            final int offset) throws IOException {
+        if (conversion == FloatConversion.IDENTITY) {
+            for (int ii = 0; ii < nodeInfo.numElements; ++ii) {
+                chunk.set(offset + ii, is.readFloat());
+            }
+        } else {
+            for (int ii = 0; ii < nodeInfo.numElements; ++ii) {
+                final float in = is.readFloat();
+                final float out = in == NULL_FLOAT ? in : conversion.apply(in);
+                chunk.set(offset + ii, out);
+            }
+        }
+    }
+
+    private static void useValidityBuffer(
+            final FloatConversion conversion,
+            final DataInput is,
+            final ChunkInputStreamGenerator.FieldNodeInfo nodeInfo,
+            final WritableFloatChunk<Values> chunk,
+            final int offset,
+            final WritableLongChunk<Values> isValid) throws IOException {
+        final int numElements = nodeInfo.numElements;
+        final int numValidityWords = (numElements + 63) / 64;
+
+        int ei = 0;
+        int pendingSkips = 0;
+
+        for (int vi = 0; vi < numValidityWords; ++vi) {
+            int bitsLeftInThisWord = Math.min(64, numElements - vi * 64);
+            long validityWord = isValid.get(vi);
+            do {
+                if ((validityWord & 1) == 1) {
+                    if (pendingSkips > 0) {
+                        is.skipBytes(pendingSkips * Float.BYTES);
+                        chunk.fillWithNullValue(offset + ei, pendingSkips);
+                        ei += pendingSkips;
+                        pendingSkips = 0;
+                    }
+                    chunk.set(offset + ei++, conversion.apply(is.readFloat()));
+                    validityWord >>= 1;
+                    bitsLeftInThisWord--;
+                } else {
+                    final int skips = Math.min(Long.numberOfTrailingZeros(validityWord), bitsLeftInThisWord);
+                    pendingSkips += skips;
+                    validityWord >>= skips;
+                    bitsLeftInThisWord -= skips;
+                }
+            } while (bitsLeftInThisWord > 0);
+        }
+
+        if (pendingSkips > 0) {
+            is.skipBytes(pendingSkips * Float.BYTES);
+            chunk.fillWithNullValue(offset + ei, pendingSkips);
+        }
+    }
+}
diff --git a/extensions/barrage/src/main/java/io/deephaven/extensions/barrage/chunk/IntChunkInputStreamGenerator.java b/extensions/barrage/src/main/java/io/deephaven/extensions/barrage/chunk/IntChunkInputStreamGenerator.java
index 667c1921c76..87bc61b8c6d 100644
--- a/extensions/barrage/src/main/java/io/deephaven/extensions/barrage/chunk/IntChunkInputStreamGenerator.java
+++ b/extensions/barrage/src/main/java/io/deephaven/extensions/barrage/chunk/IntChunkInputStreamGenerator.java
@@ -9,10 +9,7 @@
 
 import java.util.function.ToIntFunction;
 
-import io.deephaven.base.verify.Assert;
 import io.deephaven.chunk.ObjectChunk;
-import io.deephaven.chunk.WritableChunk;
-import io.deephaven.chunk.WritableObjectChunk;
 import io.deephaven.chunk.attributes.Values;
 import io.deephaven.chunk.util.pools.PoolableChunk;
 import io.deephaven.engine.rowset.RowSet;
@@ -22,17 +19,11 @@
 import io.deephaven.util.datastructures.LongSizedDataStructure;
 import io.deephaven.chunk.IntChunk;
 import io.deephaven.chunk.WritableIntChunk;
-import io.deephaven.chunk.WritableLongChunk;
 import io.deephaven.util.type.TypeUtils;
 import org.jetbrains.annotations.Nullable;
 
-import java.io.DataInput;
 import java.io.IOException;
 import java.io.OutputStream;
-import java.util.Iterator;
-import java.util.PrimitiveIterator;
-import java.util.function.Function;
-import java.util.function.IntFunction;
 
 import static io.deephaven.util.QueryConstants.*;
 
@@ -168,198 +159,4 @@ public int drainTo(final OutputStream outputStream) throws IOException {
             return LongSizedDataStructure.intSize("IntChunkInputStreamGenerator", bytesWritten);
         }
     }
-
-    @FunctionalInterface
-    public interface IntConversion {
-        int apply(int in);
-
-        IntConversion IDENTITY = (int a) -> a;
-    }
-
-    static WritableIntChunk<Values> extractChunkFromInputStream(
-            final int elementSize,
-            final StreamReaderOptions options,
-            final Iterator<FieldNodeInfo> fieldNodeIter,
-            final PrimitiveIterator.OfLong bufferInfoIter,
-            final DataInput is,
-            final WritableChunk<Values> outChunk,
-            final int outOffset,
-            final int totalRows) throws IOException {
-        return extractChunkFromInputStreamWithConversion(
-                elementSize, options, IntConversion.IDENTITY, fieldNodeIter, bufferInfoIter, is, outChunk, outOffset,
-                totalRows);
-    }
-
-    static <T> WritableObjectChunk<T, Values> extractChunkFromInputStreamWithTransform(
-            final int elementSize,
-            final StreamReaderOptions options,
-            final Function<Integer, T> transform,
-            final Iterator<FieldNodeInfo> fieldNodeIter,
-            final PrimitiveIterator.OfLong bufferInfoIter,
-            final DataInput is,
-            final WritableChunk<Values> outChunk,
-            final int outOffset,
-            final int totalRows) throws IOException {
-
-        try (final WritableIntChunk<Values> inner = extractChunkFromInputStream(
-                elementSize, options, fieldNodeIter, bufferInfoIter, is, null, 0, 0)) {
-
-            final WritableObjectChunk<T, Values> chunk = castOrCreateChunk(
-                    outChunk,
-                    Math.max(totalRows, inner.size()),
-                    WritableObjectChunk::makeWritableChunk,
-                    WritableChunk::asWritableObjectChunk);
-
-            if (outChunk == null) {
-                // if we're not given an output chunk then we better be writing at the front of the new one
-                Assert.eqZero(outOffset, "outOffset");
-            }
-
-            for (int ii = 0; ii < inner.size(); ++ii) {
-                int value = inner.get(ii);
-                chunk.set(outOffset + ii, transform.apply(value));
-            }
-
-            return chunk;
-        }
-    }
-
-    static WritableIntChunk<Values> extractChunkFromInputStreamWithConversion(
-            final int elementSize,
-            final StreamReaderOptions options,
-            final IntConversion conversion,
-            final Iterator<FieldNodeInfo> fieldNodeIter,
-            final PrimitiveIterator.OfLong bufferInfoIter,
-            final DataInput is,
-            final WritableChunk<Values> outChunk,
-            final int outOffset,
-            final int totalRows) throws IOException {
-
-        final FieldNodeInfo nodeInfo = fieldNodeIter.next();
-        final long validityBuffer = bufferInfoIter.nextLong();
-        final long payloadBuffer = bufferInfoIter.nextLong();
-
-        final WritableIntChunk<Values> chunk = castOrCreateChunk(
-                outChunk,
-                Math.max(totalRows, nodeInfo.numElements),
-                WritableIntChunk::makeWritableChunk,
-                WritableChunk::asWritableIntChunk);
-
-        if (nodeInfo.numElements == 0) {
-            return chunk;
-        }
-
-        final int numValidityLongs = options.useDeephavenNulls() ? 0 : (nodeInfo.numElements + 63) / 64;
-        try (final WritableLongChunk<Values> isValid = WritableLongChunk.makeWritableChunk(numValidityLongs)) {
-            if (options.useDeephavenNulls() && validityBuffer != 0) {
-                throw new IllegalStateException("validity buffer is non-empty, but is unnecessary");
-            }
-            int jj = 0;
-            for (; jj < Math.min(numValidityLongs, validityBuffer / 8); ++jj) {
-                isValid.set(jj, is.readLong());
-            }
-            final long valBufRead = jj * 8L;
-            if (valBufRead < validityBuffer) {
-                is.skipBytes(LongSizedDataStructure.intSize(DEBUG_NAME, validityBuffer - valBufRead));
-            }
-            // we support short validity buffers
-            for (; jj < numValidityLongs; ++jj) {
-                isValid.set(jj, -1); // -1 is bit-wise representation of all ones
-            }
-            // consumed entire validity buffer by here
-
-            final long payloadRead = (long) nodeInfo.numElements * elementSize;
-            if (payloadBuffer < payloadRead) {
-                throw new IllegalStateException("payload buffer is too short for expected number of elements");
-            }
-
-            if (options.useDeephavenNulls()) {
-                useDeephavenNulls(conversion, is, nodeInfo, chunk, outOffset);
-            } else {
-                useValidityBuffer(elementSize, conversion, is, nodeInfo, chunk, outOffset, isValid);
-            }
-
-            final long overhangPayload = payloadBuffer - payloadRead;
-            if (overhangPayload > 0) {
-                is.skipBytes(LongSizedDataStructure.intSize(DEBUG_NAME, overhangPayload));
-            }
-        }
-
-        return chunk;
-    }
-
-    private static <T extends WritableChunk<Values>> T castOrCreateChunk(
-            final WritableChunk<Values> outChunk,
-            final int numRows,
-            final IntFunction<T> chunkFactory,
-            final Function<WritableChunk<Values>, T> castFunction) {
-        if (outChunk != null) {
-            return castFunction.apply(outChunk);
-        }
-        final T newChunk = chunkFactory.apply(numRows);
-        newChunk.setSize(numRows);
-        return newChunk;
-    }
-
-    private static void useDeephavenNulls(
-            final IntConversion conversion,
-            final DataInput is,
-            final FieldNodeInfo nodeInfo,
-            final WritableIntChunk<Values> chunk,
-            final int offset) throws IOException {
-        if (conversion == IntConversion.IDENTITY) {
-            for (int ii = 0; ii < nodeInfo.numElements; ++ii) {
-                chunk.set(offset + ii, is.readInt());
-            }
-        } else {
-            for (int ii = 0; ii < nodeInfo.numElements; ++ii) {
-                final int in = is.readInt();
-                final int out = in == NULL_INT ? in : conversion.apply(in);
-                chunk.set(offset + ii, out);
-            }
-        }
-    }
-
-    private static void useValidityBuffer(
-            final int elementSize,
-            final IntConversion conversion,
-            final DataInput is,
-            final FieldNodeInfo nodeInfo,
-            final WritableIntChunk<Values> chunk,
-            final int offset,
-            final WritableLongChunk<Values> isValid) throws IOException {
-        final int numElements = nodeInfo.numElements;
-        final int numValidityWords = (numElements + 63) / 64;
-
-        int ei = 0;
-        int pendingSkips = 0;
-
-        for (int vi = 0; vi < numValidityWords; ++vi) {
-            int bitsLeftInThisWord = Math.min(64, numElements - vi * 64);
-            long validityWord = isValid.get(vi);
-            do {
-                if ((validityWord & 1) == 1) {
-                    if (pendingSkips > 0) {
-                        is.skipBytes(pendingSkips * elementSize);
-                        chunk.fillWithNullValue(offset + ei, pendingSkips);
-                        ei += pendingSkips;
-                        pendingSkips = 0;
-                    }
-                    chunk.set(offset + ei++, conversion.apply(is.readInt()));
-                    validityWord >>= 1;
-                    bitsLeftInThisWord--;
-                } else {
-                    final int skips = Math.min(Long.numberOfTrailingZeros(validityWord), bitsLeftInThisWord);
-                    pendingSkips += skips;
-                    validityWord >>= skips;
-                    bitsLeftInThisWord -= skips;
-                }
-            } while (bitsLeftInThisWord > 0);
-        }
-
-        if (pendingSkips > 0) {
-            is.skipBytes(pendingSkips * elementSize);
-            chunk.fillWithNullValue(offset + ei, pendingSkips);
-        }
-    }
 }
diff --git a/extensions/barrage/src/main/java/io/deephaven/extensions/barrage/chunk/IntChunkReader.java b/extensions/barrage/src/main/java/io/deephaven/extensions/barrage/chunk/IntChunkReader.java
new file mode 100644
index 00000000000..edf333f054b
--- /dev/null
+++ b/extensions/barrage/src/main/java/io/deephaven/extensions/barrage/chunk/IntChunkReader.java
@@ -0,0 +1,204 @@
+//
+// Copyright (c) 2016-2024 Deephaven Data Labs and Patent Pending
+//
+// ****** AUTO-GENERATED CLASS - DO NOT EDIT MANUALLY
+// ****** Edit CharChunkReader and run "./gradlew replicateBarrageUtils" to regenerate
+//
+// @formatter:off
+package io.deephaven.extensions.barrage.chunk;
+
+import io.deephaven.base.verify.Assert;
+import io.deephaven.chunk.WritableIntChunk;
+import io.deephaven.chunk.WritableChunk;
+import io.deephaven.chunk.WritableLongChunk;
+import io.deephaven.chunk.WritableObjectChunk;
+import io.deephaven.chunk.attributes.Values;
+import io.deephaven.extensions.barrage.util.StreamReaderOptions;
+import io.deephaven.util.datastructures.LongSizedDataStructure;
+
+import java.io.DataInput;
+import java.io.IOException;
+import java.util.Iterator;
+import java.util.PrimitiveIterator;
+import java.util.function.Function;
+import java.util.function.IntFunction;
+
+import static io.deephaven.util.QueryConstants.NULL_INT;
+
+public class IntChunkReader implements ChunkReader {
+    private static final String DEBUG_NAME = "IntChunkReader";
+    private final StreamReaderOptions options;
+    private final IntConversion conversion;
+
+    @FunctionalInterface
+    public interface IntConversion {
+        int apply(int in);
+
+        IntConversion IDENTITY = (int a) -> a;
+    }
+
+    public IntChunkReader(StreamReaderOptions options) {
+        this(options, IntConversion.IDENTITY);
+    }
+
+    public IntChunkReader(StreamReaderOptions options, IntConversion conversion) {
+        this.options = options;
+        this.conversion = conversion;
+    }
+
+    public <T> ChunkReader transform(Function<Integer, T> transform) {
+        return (fieldNodeIter, bufferInfoIter, is, outChunk, outOffset, totalRows) -> {
+            try (final WritableIntChunk<Values> inner = IntChunkReader.this.readChunk(
+                    fieldNodeIter, bufferInfoIter, is, null, 0, 0)) {
+
+                final WritableObjectChunk<T, Values> chunk = castOrCreateChunk(
+                        outChunk,
+                        Math.max(totalRows, inner.size()),
+                        WritableObjectChunk::makeWritableChunk,
+                        WritableChunk::asWritableObjectChunk);
+
+                if (outChunk == null) {
+                    // if we're not given an output chunk then we better be writing at the front of the new one
+                    Assert.eqZero(outOffset, "outOffset");
+                }
+
+                for (int ii = 0; ii < inner.size(); ++ii) {
+                    int value = inner.get(ii);
+                    chunk.set(outOffset + ii, transform.apply(value));
+                }
+
+                return chunk;
+            }
+        };
+    }
+
+    @Override
+    public WritableIntChunk<Values> readChunk(Iterator<ChunkInputStreamGenerator.FieldNodeInfo> fieldNodeIter,
+            PrimitiveIterator.OfLong bufferInfoIter, DataInput is, WritableChunk<Values> outChunk, int outOffset,
+            int totalRows) throws IOException {
+
+        final ChunkInputStreamGenerator.FieldNodeInfo nodeInfo = fieldNodeIter.next();
+        final long validityBuffer = bufferInfoIter.nextLong();
+        final long payloadBuffer = bufferInfoIter.nextLong();
+
+        final WritableIntChunk<Values> chunk = castOrCreateChunk(
+                outChunk,
+                Math.max(totalRows, nodeInfo.numElements),
+                WritableIntChunk::makeWritableChunk,
+                WritableChunk::asWritableIntChunk);
+
+        if (nodeInfo.numElements == 0) {
+            return chunk;
+        }
+
+        final int numValidityLongs = options.useDeephavenNulls() ? 0 : (nodeInfo.numElements + 63) / 64;
+        try (final WritableLongChunk<Values> isValid = WritableLongChunk.makeWritableChunk(numValidityLongs)) {
+            if (options.useDeephavenNulls() && validityBuffer != 0) {
+                throw new IllegalStateException("validity buffer is non-empty, but is unnecessary");
+            }
+            int jj = 0;
+            for (; jj < Math.min(numValidityLongs, validityBuffer / 8); ++jj) {
+                isValid.set(jj, is.readLong());
+            }
+            final long valBufRead = jj * 8L;
+            if (valBufRead < validityBuffer) {
+                is.skipBytes(LongSizedDataStructure.intSize(DEBUG_NAME, validityBuffer - valBufRead));
+            }
+            // we support short validity buffers
+            for (; jj < numValidityLongs; ++jj) {
+                isValid.set(jj, -1); // -1 is bit-wise representation of all ones
+            }
+            // consumed entire validity buffer by here
+
+            final long payloadRead = (long) nodeInfo.numElements * Integer.BYTES;
+            Assert.geq(payloadBuffer, "payloadBuffer", payloadRead, "payloadRead");
+
+            if (options.useDeephavenNulls()) {
+                useDeephavenNulls(conversion, is, nodeInfo, chunk, outOffset);
+            } else {
+                useValidityBuffer(conversion, is, nodeInfo, chunk, outOffset, isValid);
+            }
+
+            final long overhangPayload = payloadBuffer - payloadRead;
+            if (overhangPayload > 0) {
+                is.skipBytes(LongSizedDataStructure.intSize(DEBUG_NAME, overhangPayload));
+            }
+        }
+
+        return chunk;
+    }
+
+    private static <T extends WritableChunk<Values>> T castOrCreateChunk(
+            final WritableChunk<Values> outChunk,
+            final int numRows,
+            final IntFunction<T> chunkFactory,
+            final Function<WritableChunk<Values>, T> castFunction) {
+        if (outChunk != null) {
+            return castFunction.apply(outChunk);
+        }
+        final T newChunk = chunkFactory.apply(numRows);
+        newChunk.setSize(numRows);
+        return newChunk;
+    }
+
+    private static void useDeephavenNulls(
+            final IntConversion conversion,
+            final DataInput is,
+            final ChunkInputStreamGenerator.FieldNodeInfo nodeInfo,
+            final WritableIntChunk<Values> chunk,
+            final int offset) throws IOException {
+        if (conversion == IntConversion.IDENTITY) {
+            for (int ii = 0; ii < nodeInfo.numElements; ++ii) {
+                chunk.set(offset + ii, is.readInt());
+            }
+        } else {
+            for (int ii = 0; ii < nodeInfo.numElements; ++ii) {
+                final int in = is.readInt();
+                final int out = in == NULL_INT ? in : conversion.apply(in);
+                chunk.set(offset + ii, out);
+            }
+        }
+    }
+
+    private static void useValidityBuffer(
+            final IntConversion conversion,
+            final DataInput is,
+            final ChunkInputStreamGenerator.FieldNodeInfo nodeInfo,
+            final WritableIntChunk<Values> chunk,
+            final int offset,
+            final WritableLongChunk<Values> isValid) throws IOException {
+        final int numElements = nodeInfo.numElements;
+        final int numValidityWords = (numElements + 63) / 64;
+
+        int ei = 0;
+        int pendingSkips = 0;
+
+        for (int vi = 0; vi < numValidityWords; ++vi) {
+            int bitsLeftInThisWord = Math.min(64, numElements - vi * 64);
+            long validityWord = isValid.get(vi);
+            do {
+                if ((validityWord & 1) == 1) {
+                    if (pendingSkips > 0) {
+                        is.skipBytes(pendingSkips * Integer.BYTES);
+                        chunk.fillWithNullValue(offset + ei, pendingSkips);
+                        ei += pendingSkips;
+                        pendingSkips = 0;
+                    }
+                    chunk.set(offset + ei++, conversion.apply(is.readInt()));
+                    validityWord >>= 1;
+                    bitsLeftInThisWord--;
+                } else {
+                    final int skips = Math.min(Long.numberOfTrailingZeros(validityWord), bitsLeftInThisWord);
+                    pendingSkips += skips;
+                    validityWord >>= skips;
+                    bitsLeftInThisWord -= skips;
+                }
+            } while (bitsLeftInThisWord > 0);
+        }
+
+        if (pendingSkips > 0) {
+            is.skipBytes(pendingSkips * Integer.BYTES);
+            chunk.fillWithNullValue(offset + ei, pendingSkips);
+        }
+    }
+}
diff --git a/extensions/barrage/src/main/java/io/deephaven/extensions/barrage/chunk/LongChunkInputStreamGenerator.java b/extensions/barrage/src/main/java/io/deephaven/extensions/barrage/chunk/LongChunkInputStreamGenerator.java
index d8da1b1807d..671d972ccce 100644
--- a/extensions/barrage/src/main/java/io/deephaven/extensions/barrage/chunk/LongChunkInputStreamGenerator.java
+++ b/extensions/barrage/src/main/java/io/deephaven/extensions/barrage/chunk/LongChunkInputStreamGenerator.java
@@ -9,10 +9,7 @@
 
 import java.util.function.ToLongFunction;
 
-import io.deephaven.base.verify.Assert;
 import io.deephaven.chunk.ObjectChunk;
-import io.deephaven.chunk.WritableChunk;
-import io.deephaven.chunk.WritableObjectChunk;
 import io.deephaven.chunk.attributes.Values;
 import io.deephaven.chunk.util.pools.PoolableChunk;
 import io.deephaven.engine.rowset.RowSet;
@@ -22,17 +19,11 @@
 import io.deephaven.util.datastructures.LongSizedDataStructure;
 import io.deephaven.chunk.LongChunk;
 import io.deephaven.chunk.WritableLongChunk;
-import io.deephaven.chunk.WritableLongChunk;
 import io.deephaven.util.type.TypeUtils;
 import org.jetbrains.annotations.Nullable;
 
-import java.io.DataInput;
 import java.io.IOException;
 import java.io.OutputStream;
-import java.util.Iterator;
-import java.util.PrimitiveIterator;
-import java.util.function.Function;
-import java.util.function.IntFunction;
 
 import static io.deephaven.util.QueryConstants.*;
 
@@ -168,198 +159,4 @@ public int drainTo(final OutputStream outputStream) throws IOException {
             return LongSizedDataStructure.intSize("LongChunkInputStreamGenerator", bytesWritten);
         }
     }
-
-    @FunctionalInterface
-    public interface LongConversion {
-        long apply(long in);
-
-        LongConversion IDENTITY = (long a) -> a;
-    }
-
-    static WritableLongChunk<Values> extractChunkFromInputStream(
-            final int elementSize,
-            final StreamReaderOptions options,
-            final Iterator<FieldNodeInfo> fieldNodeIter,
-            final PrimitiveIterator.OfLong bufferInfoIter,
-            final DataInput is,
-            final WritableChunk<Values> outChunk,
-            final int outOffset,
-            final int totalRows) throws IOException {
-        return extractChunkFromInputStreamWithConversion(
-                elementSize, options, LongConversion.IDENTITY, fieldNodeIter, bufferInfoIter, is, outChunk, outOffset,
-                totalRows);
-    }
-
-    static <T> WritableObjectChunk<T, Values> extractChunkFromInputStreamWithTransform(
-            final int elementSize,
-            final StreamReaderOptions options,
-            final Function<Long, T> transform,
-            final Iterator<FieldNodeInfo> fieldNodeIter,
-            final PrimitiveIterator.OfLong bufferInfoIter,
-            final DataInput is,
-            final WritableChunk<Values> outChunk,
-            final int outOffset,
-            final int totalRows) throws IOException {
-
-        try (final WritableLongChunk<Values> inner = extractChunkFromInputStream(
-                elementSize, options, fieldNodeIter, bufferInfoIter, is, null, 0, 0)) {
-
-            final WritableObjectChunk<T, Values> chunk = castOrCreateChunk(
-                    outChunk,
-                    Math.max(totalRows, inner.size()),
-                    WritableObjectChunk::makeWritableChunk,
-                    WritableChunk::asWritableObjectChunk);
-
-            if (outChunk == null) {
-                // if we're not given an output chunk then we better be writing at the front of the new one
-                Assert.eqZero(outOffset, "outOffset");
-            }
-
-            for (int ii = 0; ii < inner.size(); ++ii) {
-                long value = inner.get(ii);
-                chunk.set(outOffset + ii, transform.apply(value));
-            }
-
-            return chunk;
-        }
-    }
-
-    static WritableLongChunk<Values> extractChunkFromInputStreamWithConversion(
-            final int elementSize,
-            final StreamReaderOptions options,
-            final LongConversion conversion,
-            final Iterator<FieldNodeInfo> fieldNodeIter,
-            final PrimitiveIterator.OfLong bufferInfoIter,
-            final DataInput is,
-            final WritableChunk<Values> outChunk,
-            final int outOffset,
-            final int totalRows) throws IOException {
-
-        final FieldNodeInfo nodeInfo = fieldNodeIter.next();
-        final long validityBuffer = bufferInfoIter.nextLong();
-        final long payloadBuffer = bufferInfoIter.nextLong();
-
-        final WritableLongChunk<Values> chunk = castOrCreateChunk(
-                outChunk,
-                Math.max(totalRows, nodeInfo.numElements),
-                WritableLongChunk::makeWritableChunk,
-                WritableChunk::asWritableLongChunk);
-
-        if (nodeInfo.numElements == 0) {
-            return chunk;
-        }
-
-        final int numValidityLongs = options.useDeephavenNulls() ? 0 : (nodeInfo.numElements + 63) / 64;
-        try (final WritableLongChunk<Values> isValid = WritableLongChunk.makeWritableChunk(numValidityLongs)) {
-            if (options.useDeephavenNulls() && validityBuffer != 0) {
-                throw new IllegalStateException("validity buffer is non-empty, but is unnecessary");
-            }
-            int jj = 0;
-            for (; jj < Math.min(numValidityLongs, validityBuffer / 8); ++jj) {
-                isValid.set(jj, is.readLong());
-            }
-            final long valBufRead = jj * 8L;
-            if (valBufRead < validityBuffer) {
-                is.skipBytes(LongSizedDataStructure.intSize(DEBUG_NAME, validityBuffer - valBufRead));
-            }
-            // we support short validity buffers
-            for (; jj < numValidityLongs; ++jj) {
-                isValid.set(jj, -1); // -1 is bit-wise representation of all ones
-            }
-            // consumed entire validity buffer by here
-
-            final long payloadRead = (long) nodeInfo.numElements * elementSize;
-            if (payloadBuffer < payloadRead) {
-                throw new IllegalStateException("payload buffer is too short for expected number of elements");
-            }
-
-            if (options.useDeephavenNulls()) {
-                useDeephavenNulls(conversion, is, nodeInfo, chunk, outOffset);
-            } else {
-                useValidityBuffer(elementSize, conversion, is, nodeInfo, chunk, outOffset, isValid);
-            }
-
-            final long overhangPayload = payloadBuffer - payloadRead;
-            if (overhangPayload > 0) {
-                is.skipBytes(LongSizedDataStructure.intSize(DEBUG_NAME, overhangPayload));
-            }
-        }
-
-        return chunk;
-    }
-
-    private static <T extends WritableChunk<Values>> T castOrCreateChunk(
-            final WritableChunk<Values> outChunk,
-            final int numRows,
-            final IntFunction<T> chunkFactory,
-            final Function<WritableChunk<Values>, T> castFunction) {
-        if (outChunk != null) {
-            return castFunction.apply(outChunk);
-        }
-        final T newChunk = chunkFactory.apply(numRows);
-        newChunk.setSize(numRows);
-        return newChunk;
-    }
-
-    private static void useDeephavenNulls(
-            final LongConversion conversion,
-            final DataInput is,
-            final FieldNodeInfo nodeInfo,
-            final WritableLongChunk<Values> chunk,
-            final int offset) throws IOException {
-        if (conversion == LongConversion.IDENTITY) {
-            for (int ii = 0; ii < nodeInfo.numElements; ++ii) {
-                chunk.set(offset + ii, is.readLong());
-            }
-        } else {
-            for (int ii = 0; ii < nodeInfo.numElements; ++ii) {
-                final long in = is.readLong();
-                final long out = in == NULL_LONG ? in : conversion.apply(in);
-                chunk.set(offset + ii, out);
-            }
-        }
-    }
-
-    private static void useValidityBuffer(
-            final int elementSize,
-            final LongConversion conversion,
-            final DataInput is,
-            final FieldNodeInfo nodeInfo,
-            final WritableLongChunk<Values> chunk,
-            final int offset,
-            final WritableLongChunk<Values> isValid) throws IOException {
-        final int numElements = nodeInfo.numElements;
-        final int numValidityWords = (numElements + 63) / 64;
-
-        int ei = 0;
-        int pendingSkips = 0;
-
-        for (int vi = 0; vi < numValidityWords; ++vi) {
-            int bitsLeftInThisWord = Math.min(64, numElements - vi * 64);
-            long validityWord = isValid.get(vi);
-            do {
-                if ((validityWord & 1) == 1) {
-                    if (pendingSkips > 0) {
-                        is.skipBytes(pendingSkips * elementSize);
-                        chunk.fillWithNullValue(offset + ei, pendingSkips);
-                        ei += pendingSkips;
-                        pendingSkips = 0;
-                    }
-                    chunk.set(offset + ei++, conversion.apply(is.readLong()));
-                    validityWord >>= 1;
-                    bitsLeftInThisWord--;
-                } else {
-                    final int skips = Math.min(Long.numberOfTrailingZeros(validityWord), bitsLeftInThisWord);
-                    pendingSkips += skips;
-                    validityWord >>= skips;
-                    bitsLeftInThisWord -= skips;
-                }
-            } while (bitsLeftInThisWord > 0);
-        }
-
-        if (pendingSkips > 0) {
-            is.skipBytes(pendingSkips * elementSize);
-            chunk.fillWithNullValue(offset + ei, pendingSkips);
-        }
-    }
 }
diff --git a/extensions/barrage/src/main/java/io/deephaven/extensions/barrage/chunk/LongChunkReader.java b/extensions/barrage/src/main/java/io/deephaven/extensions/barrage/chunk/LongChunkReader.java
new file mode 100644
index 00000000000..e96385b6740
--- /dev/null
+++ b/extensions/barrage/src/main/java/io/deephaven/extensions/barrage/chunk/LongChunkReader.java
@@ -0,0 +1,204 @@
+//
+// Copyright (c) 2016-2024 Deephaven Data Labs and Patent Pending
+//
+// ****** AUTO-GENERATED CLASS - DO NOT EDIT MANUALLY
+// ****** Edit CharChunkReader and run "./gradlew replicateBarrageUtils" to regenerate
+//
+// @formatter:off
+package io.deephaven.extensions.barrage.chunk;
+
+import io.deephaven.base.verify.Assert;
+import io.deephaven.chunk.WritableLongChunk;
+import io.deephaven.chunk.WritableChunk;
+import io.deephaven.chunk.WritableLongChunk;
+import io.deephaven.chunk.WritableObjectChunk;
+import io.deephaven.chunk.attributes.Values;
+import io.deephaven.extensions.barrage.util.StreamReaderOptions;
+import io.deephaven.util.datastructures.LongSizedDataStructure;
+
+import java.io.DataInput;
+import java.io.IOException;
+import java.util.Iterator;
+import java.util.PrimitiveIterator;
+import java.util.function.Function;
+import java.util.function.IntFunction;
+
+import static io.deephaven.util.QueryConstants.NULL_LONG;
+
+public class LongChunkReader implements ChunkReader {
+    private static final String DEBUG_NAME = "LongChunkReader";
+    private final StreamReaderOptions options;
+    private final LongConversion conversion;
+
+    @FunctionalInterface
+    public interface LongConversion {
+        long apply(long in);
+
+        LongConversion IDENTITY = (long a) -> a;
+    }
+
+    public LongChunkReader(StreamReaderOptions options) {
+        this(options, LongConversion.IDENTITY);
+    }
+
+    public LongChunkReader(StreamReaderOptions options, LongConversion conversion) {
+        this.options = options;
+        this.conversion = conversion;
+    }
+
+    public <T> ChunkReader transform(Function<Long, T> transform) {
+        return (fieldNodeIter, bufferInfoIter, is, outChunk, outOffset, totalRows) -> {
+            try (final WritableLongChunk<Values> inner = LongChunkReader.this.readChunk(
+                    fieldNodeIter, bufferInfoIter, is, null, 0, 0)) {
+
+                final WritableObjectChunk<T, Values> chunk = castOrCreateChunk(
+                        outChunk,
+                        Math.max(totalRows, inner.size()),
+                        WritableObjectChunk::makeWritableChunk,
+                        WritableChunk::asWritableObjectChunk);
+
+                if (outChunk == null) {
+                    // if we're not given an output chunk then we better be writing at the front of the new one
+                    Assert.eqZero(outOffset, "outOffset");
+                }
+
+                for (int ii = 0; ii < inner.size(); ++ii) {
+                    long value = inner.get(ii);
+                    chunk.set(outOffset + ii, transform.apply(value));
+                }
+
+                return chunk;
+            }
+        };
+    }
+
+    @Override
+    public WritableLongChunk<Values> readChunk(Iterator<ChunkInputStreamGenerator.FieldNodeInfo> fieldNodeIter,
+            PrimitiveIterator.OfLong bufferInfoIter, DataInput is, WritableChunk<Values> outChunk, int outOffset,
+            int totalRows) throws IOException {
+
+        final ChunkInputStreamGenerator.FieldNodeInfo nodeInfo = fieldNodeIter.next();
+        final long validityBuffer = bufferInfoIter.nextLong();
+        final long payloadBuffer = bufferInfoIter.nextLong();
+
+        final WritableLongChunk<Values> chunk = castOrCreateChunk(
+                outChunk,
+                Math.max(totalRows, nodeInfo.numElements),
+                WritableLongChunk::makeWritableChunk,
+                WritableChunk::asWritableLongChunk);
+
+        if (nodeInfo.numElements == 0) {
+            return chunk;
+        }
+
+        final int numValidityLongs = options.useDeephavenNulls() ? 0 : (nodeInfo.numElements + 63) / 64;
+        try (final WritableLongChunk<Values> isValid = WritableLongChunk.makeWritableChunk(numValidityLongs)) {
+            if (options.useDeephavenNulls() && validityBuffer != 0) {
+                throw new IllegalStateException("validity buffer is non-empty, but is unnecessary");
+            }
+            int jj = 0;
+            for (; jj < Math.min(numValidityLongs, validityBuffer / 8); ++jj) {
+                isValid.set(jj, is.readLong());
+            }
+            final long valBufRead = jj * 8L;
+            if (valBufRead < validityBuffer) {
+                is.skipBytes(LongSizedDataStructure.intSize(DEBUG_NAME, validityBuffer - valBufRead));
+            }
+            // we support short validity buffers
+            for (; jj < numValidityLongs; ++jj) {
+                isValid.set(jj, -1); // -1 is bit-wise representation of all ones
+            }
+            // consumed entire validity buffer by here
+
+            final long payloadRead = (long) nodeInfo.numElements * Long.BYTES;
+            Assert.geq(payloadBuffer, "payloadBuffer", payloadRead, "payloadRead");
+
+            if (options.useDeephavenNulls()) {
+                useDeephavenNulls(conversion, is, nodeInfo, chunk, outOffset);
+            } else {
+                useValidityBuffer(conversion, is, nodeInfo, chunk, outOffset, isValid);
+            }
+
+            final long overhangPayload = payloadBuffer - payloadRead;
+            if (overhangPayload > 0) {
+                is.skipBytes(LongSizedDataStructure.intSize(DEBUG_NAME, overhangPayload));
+            }
+        }
+
+        return chunk;
+    }
+
+    private static <T extends WritableChunk<Values>> T castOrCreateChunk(
+            final WritableChunk<Values> outChunk,
+            final int numRows,
+            final IntFunction<T> chunkFactory,
+            final Function<WritableChunk<Values>, T> castFunction) {
+        if (outChunk != null) {
+            return castFunction.apply(outChunk);
+        }
+        final T newChunk = chunkFactory.apply(numRows);
+        newChunk.setSize(numRows);
+        return newChunk;
+    }
+
+    private static void useDeephavenNulls(
+            final LongConversion conversion,
+            final DataInput is,
+            final ChunkInputStreamGenerator.FieldNodeInfo nodeInfo,
+            final WritableLongChunk<Values> chunk,
+            final int offset) throws IOException {
+        if (conversion == LongConversion.IDENTITY) {
+            for (int ii = 0; ii < nodeInfo.numElements; ++ii) {
+                chunk.set(offset + ii, is.readLong());
+            }
+        } else {
+            for (int ii = 0; ii < nodeInfo.numElements; ++ii) {
+                final long in = is.readLong();
+                final long out = in == NULL_LONG ? in : conversion.apply(in);
+                chunk.set(offset + ii, out);
+            }
+        }
+    }
+
+    private static void useValidityBuffer(
+            final LongConversion conversion,
+            final DataInput is,
+            final ChunkInputStreamGenerator.FieldNodeInfo nodeInfo,
+            final WritableLongChunk<Values> chunk,
+            final int offset,
+            final WritableLongChunk<Values> isValid) throws IOException {
+        final int numElements = nodeInfo.numElements;
+        final int numValidityWords = (numElements + 63) / 64;
+
+        int ei = 0;
+        int pendingSkips = 0;
+
+        for (int vi = 0; vi < numValidityWords; ++vi) {
+            int bitsLeftInThisWord = Math.min(64, numElements - vi * 64);
+            long validityWord = isValid.get(vi);
+            do {
+                if ((validityWord & 1) == 1) {
+                    if (pendingSkips > 0) {
+                        is.skipBytes(pendingSkips * Long.BYTES);
+                        chunk.fillWithNullValue(offset + ei, pendingSkips);
+                        ei += pendingSkips;
+                        pendingSkips = 0;
+                    }
+                    chunk.set(offset + ei++, conversion.apply(is.readLong()));
+                    validityWord >>= 1;
+                    bitsLeftInThisWord--;
+                } else {
+                    final int skips = Math.min(Long.numberOfTrailingZeros(validityWord), bitsLeftInThisWord);
+                    pendingSkips += skips;
+                    validityWord >>= skips;
+                    bitsLeftInThisWord -= skips;
+                }
+            } while (bitsLeftInThisWord > 0);
+        }
+
+        if (pendingSkips > 0) {
+            is.skipBytes(pendingSkips * Long.BYTES);
+            chunk.fillWithNullValue(offset + ei, pendingSkips);
+        }
+    }
+}
diff --git a/extensions/barrage/src/main/java/io/deephaven/extensions/barrage/chunk/ShortChunkInputStreamGenerator.java b/extensions/barrage/src/main/java/io/deephaven/extensions/barrage/chunk/ShortChunkInputStreamGenerator.java
index 4bd912e646b..4fd81b47d03 100644
--- a/extensions/barrage/src/main/java/io/deephaven/extensions/barrage/chunk/ShortChunkInputStreamGenerator.java
+++ b/extensions/barrage/src/main/java/io/deephaven/extensions/barrage/chunk/ShortChunkInputStreamGenerator.java
@@ -7,10 +7,7 @@
 // @formatter:off
 package io.deephaven.extensions.barrage.chunk;
 
-import io.deephaven.base.verify.Assert;
 import io.deephaven.chunk.ObjectChunk;
-import io.deephaven.chunk.WritableChunk;
-import io.deephaven.chunk.WritableObjectChunk;
 import io.deephaven.chunk.attributes.Values;
 import io.deephaven.chunk.util.pools.PoolableChunk;
 import io.deephaven.engine.primitive.function.ToShortFunction;
@@ -21,17 +18,11 @@
 import io.deephaven.util.datastructures.LongSizedDataStructure;
 import io.deephaven.chunk.ShortChunk;
 import io.deephaven.chunk.WritableShortChunk;
-import io.deephaven.chunk.WritableLongChunk;
 import io.deephaven.util.type.TypeUtils;
 import org.jetbrains.annotations.Nullable;
 
-import java.io.DataInput;
 import java.io.IOException;
 import java.io.OutputStream;
-import java.util.Iterator;
-import java.util.PrimitiveIterator;
-import java.util.function.Function;
-import java.util.function.IntFunction;
 
 import static io.deephaven.util.QueryConstants.*;
 
@@ -167,198 +158,4 @@ public int drainTo(final OutputStream outputStream) throws IOException {
             return LongSizedDataStructure.intSize("ShortChunkInputStreamGenerator", bytesWritten);
         }
     }
-
-    @FunctionalInterface
-    public interface ShortConversion {
-        short apply(short in);
-
-        ShortConversion IDENTITY = (short a) -> a;
-    }
-
-    static WritableShortChunk<Values> extractChunkFromInputStream(
-            final int elementSize,
-            final StreamReaderOptions options,
-            final Iterator<FieldNodeInfo> fieldNodeIter,
-            final PrimitiveIterator.OfLong bufferInfoIter,
-            final DataInput is,
-            final WritableChunk<Values> outChunk,
-            final int outOffset,
-            final int totalRows) throws IOException {
-        return extractChunkFromInputStreamWithConversion(
-                elementSize, options, ShortConversion.IDENTITY, fieldNodeIter, bufferInfoIter, is, outChunk, outOffset,
-                totalRows);
-    }
-
-    static <T> WritableObjectChunk<T, Values> extractChunkFromInputStreamWithTransform(
-            final int elementSize,
-            final StreamReaderOptions options,
-            final Function<Short, T> transform,
-            final Iterator<FieldNodeInfo> fieldNodeIter,
-            final PrimitiveIterator.OfLong bufferInfoIter,
-            final DataInput is,
-            final WritableChunk<Values> outChunk,
-            final int outOffset,
-            final int totalRows) throws IOException {
-
-        try (final WritableShortChunk<Values> inner = extractChunkFromInputStream(
-                elementSize, options, fieldNodeIter, bufferInfoIter, is, null, 0, 0)) {
-
-            final WritableObjectChunk<T, Values> chunk = castOrCreateChunk(
-                    outChunk,
-                    Math.max(totalRows, inner.size()),
-                    WritableObjectChunk::makeWritableChunk,
-                    WritableChunk::asWritableObjectChunk);
-
-            if (outChunk == null) {
-                // if we're not given an output chunk then we better be writing at the front of the new one
-                Assert.eqZero(outOffset, "outOffset");
-            }
-
-            for (int ii = 0; ii < inner.size(); ++ii) {
-                short value = inner.get(ii);
-                chunk.set(outOffset + ii, transform.apply(value));
-            }
-
-            return chunk;
-        }
-    }
-
-    static WritableShortChunk<Values> extractChunkFromInputStreamWithConversion(
-            final int elementSize,
-            final StreamReaderOptions options,
-            final ShortConversion conversion,
-            final Iterator<FieldNodeInfo> fieldNodeIter,
-            final PrimitiveIterator.OfLong bufferInfoIter,
-            final DataInput is,
-            final WritableChunk<Values> outChunk,
-            final int outOffset,
-            final int totalRows) throws IOException {
-
-        final FieldNodeInfo nodeInfo = fieldNodeIter.next();
-        final long validityBuffer = bufferInfoIter.nextLong();
-        final long payloadBuffer = bufferInfoIter.nextLong();
-
-        final WritableShortChunk<Values> chunk = castOrCreateChunk(
-                outChunk,
-                Math.max(totalRows, nodeInfo.numElements),
-                WritableShortChunk::makeWritableChunk,
-                WritableChunk::asWritableShortChunk);
-
-        if (nodeInfo.numElements == 0) {
-            return chunk;
-        }
-
-        final int numValidityLongs = options.useDeephavenNulls() ? 0 : (nodeInfo.numElements + 63) / 64;
-        try (final WritableLongChunk<Values> isValid = WritableLongChunk.makeWritableChunk(numValidityLongs)) {
-            if (options.useDeephavenNulls() && validityBuffer != 0) {
-                throw new IllegalStateException("validity buffer is non-empty, but is unnecessary");
-            }
-            int jj = 0;
-            for (; jj < Math.min(numValidityLongs, validityBuffer / 8); ++jj) {
-                isValid.set(jj, is.readLong());
-            }
-            final long valBufRead = jj * 8L;
-            if (valBufRead < validityBuffer) {
-                is.skipBytes(LongSizedDataStructure.intSize(DEBUG_NAME, validityBuffer - valBufRead));
-            }
-            // we support short validity buffers
-            for (; jj < numValidityLongs; ++jj) {
-                isValid.set(jj, -1); // -1 is bit-wise representation of all ones
-            }
-            // consumed entire validity buffer by here
-
-            final long payloadRead = (long) nodeInfo.numElements * elementSize;
-            if (payloadBuffer < payloadRead) {
-                throw new IllegalStateException("payload buffer is too short for expected number of elements");
-            }
-
-            if (options.useDeephavenNulls()) {
-                useDeephavenNulls(conversion, is, nodeInfo, chunk, outOffset);
-            } else {
-                useValidityBuffer(elementSize, conversion, is, nodeInfo, chunk, outOffset, isValid);
-            }
-
-            final long overhangPayload = payloadBuffer - payloadRead;
-            if (overhangPayload > 0) {
-                is.skipBytes(LongSizedDataStructure.intSize(DEBUG_NAME, overhangPayload));
-            }
-        }
-
-        return chunk;
-    }
-
-    private static <T extends WritableChunk<Values>> T castOrCreateChunk(
-            final WritableChunk<Values> outChunk,
-            final int numRows,
-            final IntFunction<T> chunkFactory,
-            final Function<WritableChunk<Values>, T> castFunction) {
-        if (outChunk != null) {
-            return castFunction.apply(outChunk);
-        }
-        final T newChunk = chunkFactory.apply(numRows);
-        newChunk.setSize(numRows);
-        return newChunk;
-    }
-
-    private static void useDeephavenNulls(
-            final ShortConversion conversion,
-            final DataInput is,
-            final FieldNodeInfo nodeInfo,
-            final WritableShortChunk<Values> chunk,
-            final int offset) throws IOException {
-        if (conversion == ShortConversion.IDENTITY) {
-            for (int ii = 0; ii < nodeInfo.numElements; ++ii) {
-                chunk.set(offset + ii, is.readShort());
-            }
-        } else {
-            for (int ii = 0; ii < nodeInfo.numElements; ++ii) {
-                final short in = is.readShort();
-                final short out = in == NULL_SHORT ? in : conversion.apply(in);
-                chunk.set(offset + ii, out);
-            }
-        }
-    }
-
-    private static void useValidityBuffer(
-            final int elementSize,
-            final ShortConversion conversion,
-            final DataInput is,
-            final FieldNodeInfo nodeInfo,
-            final WritableShortChunk<Values> chunk,
-            final int offset,
-            final WritableLongChunk<Values> isValid) throws IOException {
-        final int numElements = nodeInfo.numElements;
-        final int numValidityWords = (numElements + 63) / 64;
-
-        int ei = 0;
-        int pendingSkips = 0;
-
-        for (int vi = 0; vi < numValidityWords; ++vi) {
-            int bitsLeftInThisWord = Math.min(64, numElements - vi * 64);
-            long validityWord = isValid.get(vi);
-            do {
-                if ((validityWord & 1) == 1) {
-                    if (pendingSkips > 0) {
-                        is.skipBytes(pendingSkips * elementSize);
-                        chunk.fillWithNullValue(offset + ei, pendingSkips);
-                        ei += pendingSkips;
-                        pendingSkips = 0;
-                    }
-                    chunk.set(offset + ei++, conversion.apply(is.readShort()));
-                    validityWord >>= 1;
-                    bitsLeftInThisWord--;
-                } else {
-                    final int skips = Math.min(Long.numberOfTrailingZeros(validityWord), bitsLeftInThisWord);
-                    pendingSkips += skips;
-                    validityWord >>= skips;
-                    bitsLeftInThisWord -= skips;
-                }
-            } while (bitsLeftInThisWord > 0);
-        }
-
-        if (pendingSkips > 0) {
-            is.skipBytes(pendingSkips * elementSize);
-            chunk.fillWithNullValue(offset + ei, pendingSkips);
-        }
-    }
 }
diff --git a/extensions/barrage/src/main/java/io/deephaven/extensions/barrage/chunk/ShortChunkReader.java b/extensions/barrage/src/main/java/io/deephaven/extensions/barrage/chunk/ShortChunkReader.java
new file mode 100644
index 00000000000..1bd92351d6c
--- /dev/null
+++ b/extensions/barrage/src/main/java/io/deephaven/extensions/barrage/chunk/ShortChunkReader.java
@@ -0,0 +1,204 @@
+//
+// Copyright (c) 2016-2024 Deephaven Data Labs and Patent Pending
+//
+// ****** AUTO-GENERATED CLASS - DO NOT EDIT MANUALLY
+// ****** Edit CharChunkReader and run "./gradlew replicateBarrageUtils" to regenerate
+//
+// @formatter:off
+package io.deephaven.extensions.barrage.chunk;
+
+import io.deephaven.base.verify.Assert;
+import io.deephaven.chunk.WritableShortChunk;
+import io.deephaven.chunk.WritableChunk;
+import io.deephaven.chunk.WritableLongChunk;
+import io.deephaven.chunk.WritableObjectChunk;
+import io.deephaven.chunk.attributes.Values;
+import io.deephaven.extensions.barrage.util.StreamReaderOptions;
+import io.deephaven.util.datastructures.LongSizedDataStructure;
+
+import java.io.DataInput;
+import java.io.IOException;
+import java.util.Iterator;
+import java.util.PrimitiveIterator;
+import java.util.function.Function;
+import java.util.function.IntFunction;
+
+import static io.deephaven.util.QueryConstants.NULL_SHORT;
+
+public class ShortChunkReader implements ChunkReader {
+    private static final String DEBUG_NAME = "ShortChunkReader";
+    private final StreamReaderOptions options;
+    private final ShortConversion conversion;
+
+    @FunctionalInterface
+    public interface ShortConversion {
+        short apply(short in);
+
+        ShortConversion IDENTITY = (short a) -> a;
+    }
+
+    public ShortChunkReader(StreamReaderOptions options) {
+        this(options, ShortConversion.IDENTITY);
+    }
+
+    public ShortChunkReader(StreamReaderOptions options, ShortConversion conversion) {
+        this.options = options;
+        this.conversion = conversion;
+    }
+
+    public <T> ChunkReader transform(Function<Short, T> transform) {
+        return (fieldNodeIter, bufferInfoIter, is, outChunk, outOffset, totalRows) -> {
+            try (final WritableShortChunk<Values> inner = ShortChunkReader.this.readChunk(
+                    fieldNodeIter, bufferInfoIter, is, null, 0, 0)) {
+
+                final WritableObjectChunk<T, Values> chunk = castOrCreateChunk(
+                        outChunk,
+                        Math.max(totalRows, inner.size()),
+                        WritableObjectChunk::makeWritableChunk,
+                        WritableChunk::asWritableObjectChunk);
+
+                if (outChunk == null) {
+                    // if we're not given an output chunk then we better be writing at the front of the new one
+                    Assert.eqZero(outOffset, "outOffset");
+                }
+
+                for (int ii = 0; ii < inner.size(); ++ii) {
+                    short value = inner.get(ii);
+                    chunk.set(outOffset + ii, transform.apply(value));
+                }
+
+                return chunk;
+            }
+        };
+    }
+
+    @Override
+    public WritableShortChunk<Values> readChunk(Iterator<ChunkInputStreamGenerator.FieldNodeInfo> fieldNodeIter,
+            PrimitiveIterator.OfLong bufferInfoIter, DataInput is, WritableChunk<Values> outChunk, int outOffset,
+            int totalRows) throws IOException {
+
+        final ChunkInputStreamGenerator.FieldNodeInfo nodeInfo = fieldNodeIter.next();
+        final long validityBuffer = bufferInfoIter.nextLong();
+        final long payloadBuffer = bufferInfoIter.nextLong();
+
+        final WritableShortChunk<Values> chunk = castOrCreateChunk(
+                outChunk,
+                Math.max(totalRows, nodeInfo.numElements),
+                WritableShortChunk::makeWritableChunk,
+                WritableChunk::asWritableShortChunk);
+
+        if (nodeInfo.numElements == 0) {
+            return chunk;
+        }
+
+        final int numValidityLongs = options.useDeephavenNulls() ? 0 : (nodeInfo.numElements + 63) / 64;
+        try (final WritableLongChunk<Values> isValid = WritableLongChunk.makeWritableChunk(numValidityLongs)) {
+            if (options.useDeephavenNulls() && validityBuffer != 0) {
+                throw new IllegalStateException("validity buffer is non-empty, but is unnecessary");
+            }
+            int jj = 0;
+            for (; jj < Math.min(numValidityLongs, validityBuffer / 8); ++jj) {
+                isValid.set(jj, is.readLong());
+            }
+            final long valBufRead = jj * 8L;
+            if (valBufRead < validityBuffer) {
+                is.skipBytes(LongSizedDataStructure.intSize(DEBUG_NAME, validityBuffer - valBufRead));
+            }
+            // we support short validity buffers
+            for (; jj < numValidityLongs; ++jj) {
+                isValid.set(jj, -1); // -1 is bit-wise representation of all ones
+            }
+            // consumed entire validity buffer by here
+
+            final long payloadRead = (long) nodeInfo.numElements * Short.BYTES;
+            Assert.geq(payloadBuffer, "payloadBuffer", payloadRead, "payloadRead");
+
+            if (options.useDeephavenNulls()) {
+                useDeephavenNulls(conversion, is, nodeInfo, chunk, outOffset);
+            } else {
+                useValidityBuffer(conversion, is, nodeInfo, chunk, outOffset, isValid);
+            }
+
+            final long overhangPayload = payloadBuffer - payloadRead;
+            if (overhangPayload > 0) {
+                is.skipBytes(LongSizedDataStructure.intSize(DEBUG_NAME, overhangPayload));
+            }
+        }
+
+        return chunk;
+    }
+
+    private static <T extends WritableChunk<Values>> T castOrCreateChunk(
+            final WritableChunk<Values> outChunk,
+            final int numRows,
+            final IntFunction<T> chunkFactory,
+            final Function<WritableChunk<Values>, T> castFunction) {
+        if (outChunk != null) {
+            return castFunction.apply(outChunk);
+        }
+        final T newChunk = chunkFactory.apply(numRows);
+        newChunk.setSize(numRows);
+        return newChunk;
+    }
+
+    private static void useDeephavenNulls(
+            final ShortConversion conversion,
+            final DataInput is,
+            final ChunkInputStreamGenerator.FieldNodeInfo nodeInfo,
+            final WritableShortChunk<Values> chunk,
+            final int offset) throws IOException {
+        if (conversion == ShortConversion.IDENTITY) {
+            for (int ii = 0; ii < nodeInfo.numElements; ++ii) {
+                chunk.set(offset + ii, is.readShort());
+            }
+        } else {
+            for (int ii = 0; ii < nodeInfo.numElements; ++ii) {
+                final short in = is.readShort();
+                final short out = in == NULL_SHORT ? in : conversion.apply(in);
+                chunk.set(offset + ii, out);
+            }
+        }
+    }
+
+    private static void useValidityBuffer(
+            final ShortConversion conversion,
+            final DataInput is,
+            final ChunkInputStreamGenerator.FieldNodeInfo nodeInfo,
+            final WritableShortChunk<Values> chunk,
+            final int offset,
+            final WritableLongChunk<Values> isValid) throws IOException {
+        final int numElements = nodeInfo.numElements;
+        final int numValidityWords = (numElements + 63) / 64;
+
+        int ei = 0;
+        int pendingSkips = 0;
+
+        for (int vi = 0; vi < numValidityWords; ++vi) {
+            int bitsLeftInThisWord = Math.min(64, numElements - vi * 64);
+            long validityWord = isValid.get(vi);
+            do {
+                if ((validityWord & 1) == 1) {
+                    if (pendingSkips > 0) {
+                        is.skipBytes(pendingSkips * Short.BYTES);
+                        chunk.fillWithNullValue(offset + ei, pendingSkips);
+                        ei += pendingSkips;
+                        pendingSkips = 0;
+                    }
+                    chunk.set(offset + ei++, conversion.apply(is.readShort()));
+                    validityWord >>= 1;
+                    bitsLeftInThisWord--;
+                } else {
+                    final int skips = Math.min(Long.numberOfTrailingZeros(validityWord), bitsLeftInThisWord);
+                    pendingSkips += skips;
+                    validityWord >>= skips;
+                    bitsLeftInThisWord -= skips;
+                }
+            } while (bitsLeftInThisWord > 0);
+        }
+
+        if (pendingSkips > 0) {
+            is.skipBytes(pendingSkips * Short.BYTES);
+            chunk.fillWithNullValue(offset + ei, pendingSkips);
+        }
+    }
+}
diff --git a/extensions/barrage/src/main/java/io/deephaven/extensions/barrage/chunk/VarBinaryChunkInputStreamGenerator.java b/extensions/barrage/src/main/java/io/deephaven/extensions/barrage/chunk/VarBinaryChunkInputStreamGenerator.java
index e84184be19c..b6c85018fb6 100644
--- a/extensions/barrage/src/main/java/io/deephaven/extensions/barrage/chunk/VarBinaryChunkInputStreamGenerator.java
+++ b/extensions/barrage/src/main/java/io/deephaven/extensions/barrage/chunk/VarBinaryChunkInputStreamGenerator.java
@@ -13,7 +13,6 @@
 import io.deephaven.extensions.barrage.util.StreamReaderOptions;
 import io.deephaven.util.SafeCloseable;
 import io.deephaven.util.datastructures.LongSizedDataStructure;
-import io.deephaven.chunk.util.pools.PoolableChunk;
 import io.deephaven.engine.rowset.RowSet;
 import io.deephaven.util.mutable.MutableInt;
 import io.deephaven.util.mutable.MutableLong;
@@ -214,14 +213,10 @@ private synchronized void computePayload() throws IOException {
     }
 
     @Override
-    public void close() {
-        if (REFERENCE_COUNT_UPDATER.decrementAndGet(this) == 0) {
-            if (chunk instanceof PoolableChunk) {
-                ((PoolableChunk) chunk).close();
-            }
-            if (byteStorage != null) {
-                byteStorage.close();
-            }
+    protected void onReferenceCountAtZero() {
+        super.onReferenceCountAtZero();
+        if (byteStorage != null) {
+            byteStorage.close();
         }
     }
 
@@ -396,7 +391,7 @@ public int drainTo(final OutputStream outputStream) throws IOException {
         }
     }
 
-    static <T> WritableObjectChunk<T, Values> extractChunkFromInputStream(
+    public static <T> WritableObjectChunk<T, Values> extractChunkFromInputStream(
             final DataInput is,
             final Iterator<FieldNodeInfo> fieldNodeIter,
             final PrimitiveIterator.OfLong bufferInfoIter,
diff --git a/extensions/barrage/src/main/java/io/deephaven/extensions/barrage/chunk/VarListChunkInputStreamGenerator.java b/extensions/barrage/src/main/java/io/deephaven/extensions/barrage/chunk/VarListChunkInputStreamGenerator.java
index 0a109230ca6..d85c2d6c3d4 100644
--- a/extensions/barrage/src/main/java/io/deephaven/extensions/barrage/chunk/VarListChunkInputStreamGenerator.java
+++ b/extensions/barrage/src/main/java/io/deephaven/extensions/barrage/chunk/VarListChunkInputStreamGenerator.java
@@ -13,9 +13,6 @@
 import io.deephaven.chunk.ObjectChunk;
 import io.deephaven.chunk.WritableChunk;
 import io.deephaven.chunk.WritableIntChunk;
-import io.deephaven.chunk.WritableLongChunk;
-import io.deephaven.chunk.WritableObjectChunk;
-import io.deephaven.chunk.util.pools.PoolableChunk;
 import io.deephaven.engine.rowset.RowSet;
 import io.deephaven.engine.rowset.RowSetBuilderSequential;
 import io.deephaven.engine.rowset.RowSetFactory;
@@ -23,22 +20,22 @@
 import io.deephaven.util.mutable.MutableInt;
 import org.jetbrains.annotations.Nullable;
 
-import java.io.DataInput;
 import java.io.IOException;
 import java.io.OutputStream;
-import java.util.Iterator;
-import java.util.PrimitiveIterator;
 
 public class VarListChunkInputStreamGenerator<T> extends BaseChunkInputStreamGenerator<ObjectChunk<T, Values>> {
     private static final String DEBUG_NAME = "VarListChunkInputStreamGenerator";
 
+    private final Factory factory;
     private final Class<T> type;
 
     private WritableIntChunk<ChunkPositions> offsets;
     private ChunkInputStreamGenerator innerGenerator;
 
-    VarListChunkInputStreamGenerator(final Class<T> type, final ObjectChunk<T, Values> chunk, final long rowOffset) {
+    VarListChunkInputStreamGenerator(ChunkInputStreamGenerator.Factory factory, final Class<T> type,
+            final ObjectChunk<T, Values> chunk, final long rowOffset) {
         super(chunk, 0, rowOffset);
+        this.factory = factory;
         this.type = type;
     }
 
@@ -49,31 +46,32 @@ private synchronized void computePayload() {
 
         final Class<?> myType = type.getComponentType();
         final Class<?> myComponentType = myType != null ? myType.getComponentType() : null;
-        ChunkType chunkType = ChunkType.fromElementType(myType);
-        if (chunkType == ChunkType.Boolean) {
-            // the internal payload is in bytes (to handle nulls), but the wire format is packed bits
+
+        final ChunkType chunkType;
+        if (myType == boolean.class || myType == Boolean.class) {
+            // Note: Internally booleans are passed around as bytes, but the wire format is packed bits.
             chunkType = ChunkType.Byte;
+        } else if (myType != null && !myType.isPrimitive()) {
+            chunkType = ChunkType.Object;
+        } else {
+            chunkType = ChunkType.fromElementType(myType);
         }
+
         final ArrayExpansionKernel kernel = ArrayExpansionKernel.makeExpansionKernel(chunkType, myType);
         offsets = WritableIntChunk.makeWritableChunk(chunk.size() + 1);
 
         final WritableChunk<Values> innerChunk = kernel.expand(chunk, offsets);
-        innerGenerator = ChunkInputStreamGenerator.makeInputStreamGenerator(
-                chunkType, myType, myComponentType, innerChunk, 0);
+        innerGenerator = factory.makeInputStreamGenerator(chunkType, myType, myComponentType, innerChunk, 0);
     }
 
     @Override
-    public void close() {
-        if (REFERENCE_COUNT_UPDATER.decrementAndGet(this) == 0) {
-            if (chunk instanceof PoolableChunk) {
-                ((PoolableChunk) chunk).close();
-            }
-            if (offsets != null) {
-                offsets.close();
-            }
-            if (innerGenerator != null) {
-                innerGenerator.close();
-            }
+    protected void onReferenceCountAtZero() {
+        super.onReferenceCountAtZero();
+        if (offsets != null) {
+            offsets.close();
+        }
+        if (innerGenerator != null) {
+            innerGenerator.close();
         }
     }
 
@@ -233,91 +231,5 @@ public int drainTo(final OutputStream outputStream) throws IOException {
         }
     }
 
-    static <T> WritableObjectChunk<T, Values> extractChunkFromInputStream(
-            final StreamReaderOptions options,
-            final Class<T> type,
-            final Iterator<FieldNodeInfo> fieldNodeIter,
-            final PrimitiveIterator.OfLong bufferInfoIter,
-            final DataInput is,
-            final WritableChunk<Values> outChunk,
-            final int outOffset,
-            final int totalRows) throws IOException {
-
-        final FieldNodeInfo nodeInfo = fieldNodeIter.next();
-        final long validityBuffer = bufferInfoIter.nextLong();
-        final long offsetsBuffer = bufferInfoIter.nextLong();
-
-        final Class<?> componentType = type.getComponentType();
-        final Class<?> innerComponentType = componentType != null ? componentType.getComponentType() : null;
-
-        final ChunkType chunkType;
-        if (componentType == boolean.class || componentType == Boolean.class) {
-            // Note: Internally booleans are passed around as bytes, but the wire format is packed bits.
-            chunkType = ChunkType.Byte;
-        } else {
-            chunkType = ChunkType.fromElementType(componentType);
-        }
-
-        if (nodeInfo.numElements == 0) {
-            try (final WritableChunk<Values> ignored = ChunkInputStreamGenerator.extractChunkFromInputStream(
-                    options, chunkType, componentType, innerComponentType, fieldNodeIter,
-                    bufferInfoIter, is, null, 0, 0)) {
-                return WritableObjectChunk.makeWritableChunk(nodeInfo.numElements);
-            }
-        }
-
-        final WritableObjectChunk<T, Values> chunk;
-        final int numValidityLongs = (nodeInfo.numElements + 63) / 64;
-        try (final WritableLongChunk<Values> isValid = WritableLongChunk.makeWritableChunk(numValidityLongs);
-                final WritableIntChunk<ChunkPositions> offsets =
-                        WritableIntChunk.makeWritableChunk(nodeInfo.numElements + 1)) {
-            // Read validity buffer:
-            int jj = 0;
-            for (; jj < Math.min(numValidityLongs, validityBuffer / 8); ++jj) {
-                isValid.set(jj, is.readLong());
-            }
-            final long valBufRead = jj * 8L;
-            if (valBufRead < validityBuffer) {
-                is.skipBytes(LongSizedDataStructure.intSize(DEBUG_NAME, validityBuffer - valBufRead));
-            }
-            // we support short validity buffers
-            for (; jj < numValidityLongs; ++jj) {
-                isValid.set(jj, -1); // -1 is bit-wise representation of all ones
-            }
-            // consumed entire validity buffer by here
-
-            // Read offsets:
-            final long offBufRead = (nodeInfo.numElements + 1L) * Integer.BYTES;
-            if (offsetsBuffer < offBufRead) {
-                throw new IllegalStateException("offset buffer is too short for the expected number of elements");
-            }
-            for (int i = 0; i < nodeInfo.numElements + 1; ++i) {
-                offsets.set(i, is.readInt());
-            }
-            if (offBufRead < offsetsBuffer) {
-                is.skipBytes(LongSizedDataStructure.intSize(DEBUG_NAME, offsetsBuffer - offBufRead));
-            }
-
-            final ArrayExpansionKernel kernel = ArrayExpansionKernel.makeExpansionKernel(chunkType, componentType);
-            try (final WritableChunk<Values> inner = ChunkInputStreamGenerator.extractChunkFromInputStream(
-                    options, chunkType, componentType, innerComponentType,
-                    fieldNodeIter, bufferInfoIter, is, null, 0, 0)) {
-                chunk = kernel.contract(inner, offsets, outChunk, outOffset, totalRows);
-
-                long nextValid = 0;
-                for (int ii = 0; ii < nodeInfo.numElements; ++ii) {
-                    if ((ii % 64) == 0) {
-                        nextValid = isValid.get(ii / 64);
-                    }
-                    if ((nextValid & 0x1) == 0x0) {
-                        chunk.set(outOffset + ii, null);
-                    }
-                    nextValid >>= 1;
-                }
-            }
-        }
-
-        return chunk;
-    }
 }
 
diff --git a/extensions/barrage/src/main/java/io/deephaven/extensions/barrage/chunk/VarListChunkReader.java b/extensions/barrage/src/main/java/io/deephaven/extensions/barrage/chunk/VarListChunkReader.java
new file mode 100644
index 00000000000..4e5b8cb0bd7
--- /dev/null
+++ b/extensions/barrage/src/main/java/io/deephaven/extensions/barrage/chunk/VarListChunkReader.java
@@ -0,0 +1,116 @@
+//
+// Copyright (c) 2016-2024 Deephaven Data Labs and Patent Pending
+//
+package io.deephaven.extensions.barrage.chunk;
+
+import io.deephaven.chunk.ChunkType;
+import io.deephaven.chunk.WritableChunk;
+import io.deephaven.chunk.WritableIntChunk;
+import io.deephaven.chunk.WritableLongChunk;
+import io.deephaven.chunk.WritableObjectChunk;
+import io.deephaven.chunk.attributes.ChunkPositions;
+import io.deephaven.chunk.attributes.Values;
+import io.deephaven.extensions.barrage.chunk.array.ArrayExpansionKernel;
+import io.deephaven.extensions.barrage.util.StreamReaderOptions;
+import io.deephaven.util.datastructures.LongSizedDataStructure;
+
+import java.io.DataInput;
+import java.io.IOException;
+import java.util.Iterator;
+import java.util.PrimitiveIterator;
+
+import static io.deephaven.extensions.barrage.chunk.ChunkReader.typeInfo;
+
+public class VarListChunkReader<T> implements ChunkReader {
+    private static final String DEBUG_NAME = "VarListChunkReader";
+
+    private final ArrayExpansionKernel kernel;
+    private final ChunkReader componentReader;
+
+    public VarListChunkReader(final StreamReaderOptions options, final TypeInfo typeInfo,
+            Factory chunkReaderFactory) {
+        final Class<?> componentType = typeInfo.type().getComponentType();
+        final Class<?> innerComponentType = componentType != null ? componentType.getComponentType() : null;
+
+        final ChunkType chunkType;
+        if (componentType == boolean.class || componentType == Boolean.class) {
+            // Note: Internally booleans are passed around as bytes, but the wire format is packed bits.
+            chunkType = ChunkType.Byte;
+        } else if (componentType != null && !componentType.isPrimitive()) {
+            chunkType = ChunkType.Object;
+        } else {
+            chunkType = ChunkType.fromElementType(componentType);
+        }
+        kernel = ArrayExpansionKernel.makeExpansionKernel(chunkType, componentType);
+
+        componentReader = chunkReaderFactory.getReader(options,
+                typeInfo(chunkType, componentType, innerComponentType, typeInfo.componentArrowField()));
+    }
+
+    @Override
+    public WritableObjectChunk<T, Values> readChunk(Iterator<ChunkInputStreamGenerator.FieldNodeInfo> fieldNodeIter,
+            PrimitiveIterator.OfLong bufferInfoIter, DataInput is, WritableChunk<Values> outChunk, int outOffset,
+            int totalRows) throws IOException {
+        final ChunkInputStreamGenerator.FieldNodeInfo nodeInfo = fieldNodeIter.next();
+        final long validityBuffer = bufferInfoIter.nextLong();
+        final long offsetsBuffer = bufferInfoIter.nextLong();
+
+        if (nodeInfo.numElements == 0) {
+            try (final WritableChunk<Values> ignored =
+                    componentReader.readChunk(fieldNodeIter, bufferInfoIter, is, null, 0, 0)) {
+                return WritableObjectChunk.makeWritableChunk(nodeInfo.numElements);
+            }
+        }
+
+        final WritableObjectChunk<T, Values> chunk;
+        final int numValidityLongs = (nodeInfo.numElements + 63) / 64;
+        try (final WritableLongChunk<Values> isValid = WritableLongChunk.makeWritableChunk(numValidityLongs);
+                final WritableIntChunk<ChunkPositions> offsets =
+                        WritableIntChunk.makeWritableChunk(nodeInfo.numElements + 1)) {
+            // Read validity buffer:
+            int jj = 0;
+            for (; jj < Math.min(numValidityLongs, validityBuffer / 8); ++jj) {
+                isValid.set(jj, is.readLong());
+            }
+            final long valBufRead = jj * 8L;
+            if (valBufRead < validityBuffer) {
+                is.skipBytes(LongSizedDataStructure.intSize(DEBUG_NAME, validityBuffer - valBufRead));
+            }
+            // we support short validity buffers
+            for (; jj < numValidityLongs; ++jj) {
+                isValid.set(jj, -1); // -1 is bit-wise representation of all ones
+            }
+            // consumed entire validity buffer by here
+
+            // Read offsets:
+            final long offBufRead = (nodeInfo.numElements + 1L) * Integer.BYTES;
+            if (offsetsBuffer < offBufRead) {
+                throw new IllegalStateException("offset buffer is too short for the expected number of elements");
+            }
+            for (int i = 0; i < nodeInfo.numElements + 1; ++i) {
+                offsets.set(i, is.readInt());
+            }
+            if (offBufRead < offsetsBuffer) {
+                is.skipBytes(LongSizedDataStructure.intSize(DEBUG_NAME, offsetsBuffer - offBufRead));
+            }
+
+            try (final WritableChunk<Values> inner =
+                    componentReader.readChunk(fieldNodeIter, bufferInfoIter, is, null, 0, 0)) {
+                chunk = kernel.contract(inner, offsets, outChunk, outOffset, totalRows);
+
+                long nextValid = 0;
+                for (int ii = 0; ii < nodeInfo.numElements; ++ii) {
+                    if ((ii % 64) == 0) {
+                        nextValid = isValid.get(ii / 64);
+                    }
+                    if ((nextValid & 0x1) == 0x0) {
+                        chunk.set(outOffset + ii, null);
+                    }
+                    nextValid >>= 1;
+                }
+            }
+        }
+
+        return chunk;
+    }
+}
diff --git a/extensions/barrage/src/main/java/io/deephaven/extensions/barrage/chunk/VectorChunkInputStreamGenerator.java b/extensions/barrage/src/main/java/io/deephaven/extensions/barrage/chunk/VectorChunkInputStreamGenerator.java
index 35245b11631..6b15bb348a4 100644
--- a/extensions/barrage/src/main/java/io/deephaven/extensions/barrage/chunk/VectorChunkInputStreamGenerator.java
+++ b/extensions/barrage/src/main/java/io/deephaven/extensions/barrage/chunk/VectorChunkInputStreamGenerator.java
@@ -9,11 +9,8 @@
 import io.deephaven.chunk.ObjectChunk;
 import io.deephaven.chunk.WritableChunk;
 import io.deephaven.chunk.WritableIntChunk;
-import io.deephaven.chunk.WritableLongChunk;
-import io.deephaven.chunk.WritableObjectChunk;
 import io.deephaven.chunk.attributes.ChunkPositions;
 import io.deephaven.chunk.attributes.Values;
-import io.deephaven.chunk.util.pools.PoolableChunk;
 import io.deephaven.engine.rowset.RowSet;
 import io.deephaven.engine.rowset.RowSetBuilderSequential;
 import io.deephaven.engine.rowset.RowSetFactory;
@@ -24,26 +21,26 @@
 import io.deephaven.util.mutable.MutableInt;
 import org.jetbrains.annotations.Nullable;
 
-import java.io.DataInput;
 import java.io.IOException;
 import java.io.OutputStream;
-import java.util.Iterator;
-import java.util.PrimitiveIterator;
 
 public class VectorChunkInputStreamGenerator extends BaseChunkInputStreamGenerator<ObjectChunk<Vector<?>, Values>> {
     private static final String DEBUG_NAME = "VarListChunkInputStreamGenerator";
 
     private final Class<?> componentType;
+    private final Factory factory;
 
     private WritableIntChunk<ChunkPositions> offsets;
     private ChunkInputStreamGenerator innerGenerator;
 
     VectorChunkInputStreamGenerator(
+            final ChunkInputStreamGenerator.Factory factory,
             final Class<Vector<?>> type,
             final Class<?> componentType,
             final ObjectChunk<Vector<?>, Values> chunk,
             final long rowOffset) {
         super(chunk, 0, rowOffset);
+        this.factory = factory;
         this.componentType = VectorExpansionKernel.getComponentType(type, componentType);
     }
 
@@ -58,22 +55,17 @@ private synchronized void computePayload() {
         offsets = WritableIntChunk.makeWritableChunk(chunk.size() + 1);
 
         final WritableChunk<Values> innerChunk = kernel.expand(chunk, offsets);
-        innerGenerator = ChunkInputStreamGenerator.makeInputStreamGenerator(
-                chunkType, componentType, innerComponentType, innerChunk, 0);
+        innerGenerator = factory.makeInputStreamGenerator(chunkType, componentType, innerComponentType, innerChunk, 0);
     }
 
     @Override
-    public void close() {
-        if (REFERENCE_COUNT_UPDATER.decrementAndGet(this) == 0) {
-            if (chunk instanceof PoolableChunk) {
-                ((PoolableChunk) chunk).close();
-            }
-            if (offsets != null) {
-                offsets.close();
-            }
-            if (innerGenerator != null) {
-                innerGenerator.close();
-            }
+    protected void onReferenceCountAtZero() {
+        super.onReferenceCountAtZero();
+        if (offsets != null) {
+            offsets.close();
+        }
+        if (innerGenerator != null) {
+            innerGenerator.close();
         }
     }
 
@@ -232,89 +224,4 @@ public int drainTo(final OutputStream outputStream) throws IOException {
             return LongSizedDataStructure.intSize(DEBUG_NAME, bytesWritten);
         }
     }
-
-    static WritableObjectChunk<Vector<?>, Values> extractChunkFromInputStream(
-            final StreamReaderOptions options,
-            final Class<Vector<?>> type,
-            final Class<?> inComponentType,
-            final Iterator<FieldNodeInfo> fieldNodeIter,
-            final PrimitiveIterator.OfLong bufferInfoIter,
-            final DataInput is,
-            final WritableChunk<Values> outChunk,
-            final int outOffset,
-            final int totalRows) throws IOException {
-
-        final FieldNodeInfo nodeInfo = fieldNodeIter.next();
-        final long validityBuffer = bufferInfoIter.nextLong();
-        final long offsetsBuffer = bufferInfoIter.nextLong();
-
-        final Class<?> componentType = VectorExpansionKernel.getComponentType(type, inComponentType);
-        final ChunkType chunkType = ChunkType.fromElementType(componentType);
-
-        if (nodeInfo.numElements == 0) {
-            try (final WritableChunk<Values> ignored = ChunkInputStreamGenerator.extractChunkFromInputStream(
-                    options, chunkType, componentType, componentType.getComponentType(), fieldNodeIter, bufferInfoIter,
-                    is,
-                    null, 0, 0)) {
-                if (outChunk != null) {
-                    return outChunk.asWritableObjectChunk();
-                }
-                return WritableObjectChunk.makeWritableChunk(totalRows);
-            }
-        }
-
-        final WritableObjectChunk<Vector<?>, Values> chunk;
-        final int numValidityLongs = (nodeInfo.numElements + 63) / 64;
-        try (final WritableLongChunk<Values> isValid = WritableLongChunk.makeWritableChunk(numValidityLongs);
-                final WritableIntChunk<ChunkPositions> offsets =
-                        WritableIntChunk.makeWritableChunk(nodeInfo.numElements + 1)) {
-            // Read validity buffer:
-            int jj = 0;
-            for (; jj < Math.min(numValidityLongs, validityBuffer / 8); ++jj) {
-                isValid.set(jj, is.readLong());
-            }
-            final long valBufRead = jj * 8L;
-            if (valBufRead < validityBuffer) {
-                is.skipBytes(LongSizedDataStructure.intSize(DEBUG_NAME, validityBuffer - valBufRead));
-            }
-            // we support short validity buffers
-            for (; jj < numValidityLongs; ++jj) {
-                isValid.set(jj, -1); // -1 is bit-wise representation of all ones
-            }
-            // consumed entire validity buffer by here
-
-            // Read offsets:
-            final long offBufRead = (nodeInfo.numElements + 1L) * Integer.BYTES;
-            if (offsetsBuffer < offBufRead) {
-                throw new IllegalStateException("offset buffer is too short for the expected number of elements");
-            }
-            for (int i = 0; i < nodeInfo.numElements + 1; ++i) {
-                offsets.set(i, is.readInt());
-            }
-            if (offBufRead < offsetsBuffer) {
-                is.skipBytes(LongSizedDataStructure.intSize(DEBUG_NAME, offsetsBuffer - offBufRead));
-            }
-
-            final VectorExpansionKernel kernel = VectorExpansionKernel.makeExpansionKernel(chunkType, componentType);
-            try (final WritableChunk<Values> inner = ChunkInputStreamGenerator.extractChunkFromInputStream(
-                    options, chunkType, componentType, componentType.getComponentType(), fieldNodeIter, bufferInfoIter,
-                    is,
-                    null, 0, 0)) {
-                chunk = kernel.contract(inner, offsets, outChunk, outOffset, totalRows);
-
-                long nextValid = 0;
-                for (int ii = 0; ii < nodeInfo.numElements; ++ii) {
-                    if ((ii % 64) == 0) {
-                        nextValid = isValid.get(ii / 64);
-                    }
-                    if ((nextValid & 0x1) == 0x0) {
-                        chunk.set(outOffset + ii, null);
-                    }
-                    nextValid >>= 1;
-                }
-            }
-        }
-
-        return chunk;
-    }
 }
diff --git a/extensions/barrage/src/main/java/io/deephaven/extensions/barrage/chunk/VectorChunkReader.java b/extensions/barrage/src/main/java/io/deephaven/extensions/barrage/chunk/VectorChunkReader.java
new file mode 100644
index 00000000000..4832ae3baa6
--- /dev/null
+++ b/extensions/barrage/src/main/java/io/deephaven/extensions/barrage/chunk/VectorChunkReader.java
@@ -0,0 +1,112 @@
+//
+// Copyright (c) 2016-2024 Deephaven Data Labs and Patent Pending
+//
+package io.deephaven.extensions.barrage.chunk;
+
+import io.deephaven.chunk.ChunkType;
+import io.deephaven.chunk.WritableChunk;
+import io.deephaven.chunk.WritableIntChunk;
+import io.deephaven.chunk.WritableLongChunk;
+import io.deephaven.chunk.WritableObjectChunk;
+import io.deephaven.chunk.attributes.ChunkPositions;
+import io.deephaven.chunk.attributes.Values;
+import io.deephaven.extensions.barrage.chunk.vector.VectorExpansionKernel;
+import io.deephaven.extensions.barrage.util.StreamReaderOptions;
+import io.deephaven.util.datastructures.LongSizedDataStructure;
+import io.deephaven.vector.Vector;
+
+import java.io.DataInput;
+import java.io.IOException;
+import java.util.Iterator;
+import java.util.PrimitiveIterator;
+
+import static io.deephaven.extensions.barrage.chunk.ChunkReader.typeInfo;
+
+public class VectorChunkReader implements ChunkReader {
+    private static final String DEBUG_NAME = "VectorChunkReader";
+    private final ChunkReader componentReader;
+    private final VectorExpansionKernel kernel;
+
+    public VectorChunkReader(final StreamReaderOptions options, final TypeInfo typeInfo,
+            Factory chunkReaderFactory) {
+
+        final Class<?> componentType =
+                VectorExpansionKernel.getComponentType(typeInfo.type(), typeInfo.componentType());
+        final ChunkType chunkType = ChunkType.fromElementType(componentType);
+        componentReader = chunkReaderFactory.getReader(
+                options, typeInfo(chunkType, componentType, componentType.getComponentType(),
+                        typeInfo.componentArrowField()));
+        kernel = VectorExpansionKernel.makeExpansionKernel(chunkType, componentType);
+    }
+
+    @Override
+    public WritableObjectChunk<Vector<?>, Values> readChunk(
+            Iterator<ChunkInputStreamGenerator.FieldNodeInfo> fieldNodeIter,
+            PrimitiveIterator.OfLong bufferInfoIter, DataInput is, WritableChunk<Values> outChunk, int outOffset,
+            int totalRows) throws IOException {
+        final ChunkInputStreamGenerator.FieldNodeInfo nodeInfo = fieldNodeIter.next();
+        final long validityBuffer = bufferInfoIter.nextLong();
+        final long offsetsBuffer = bufferInfoIter.nextLong();
+
+        if (nodeInfo.numElements == 0) {
+            try (final WritableChunk<Values> ignored =
+                    componentReader.readChunk(fieldNodeIter, bufferInfoIter, is, null, 0, 0)) {
+                if (outChunk != null) {
+                    return outChunk.asWritableObjectChunk();
+                }
+                return WritableObjectChunk.makeWritableChunk(totalRows);
+            }
+        }
+
+        final WritableObjectChunk<Vector<?>, Values> chunk;
+        final int numValidityLongs = (nodeInfo.numElements + 63) / 64;
+        try (final WritableLongChunk<Values> isValid = WritableLongChunk.makeWritableChunk(numValidityLongs);
+                final WritableIntChunk<ChunkPositions> offsets =
+                        WritableIntChunk.makeWritableChunk(nodeInfo.numElements + 1)) {
+            // Read validity buffer:
+            int jj = 0;
+            for (; jj < Math.min(numValidityLongs, validityBuffer / 8); ++jj) {
+                isValid.set(jj, is.readLong());
+            }
+            final long valBufRead = jj * 8L;
+            if (valBufRead < validityBuffer) {
+                is.skipBytes(LongSizedDataStructure.intSize(DEBUG_NAME, validityBuffer - valBufRead));
+            }
+            // we support short validity buffers
+            for (; jj < numValidityLongs; ++jj) {
+                isValid.set(jj, -1); // -1 is bit-wise representation of all ones
+            }
+            // consumed entire validity buffer by here
+
+            // Read offsets:
+            final long offBufRead = (nodeInfo.numElements + 1L) * Integer.BYTES;
+            if (offsetsBuffer < offBufRead) {
+                throw new IllegalStateException("offset buffer is too short for the expected number of elements");
+            }
+            for (int i = 0; i < nodeInfo.numElements + 1; ++i) {
+                offsets.set(i, is.readInt());
+            }
+            if (offBufRead < offsetsBuffer) {
+                is.skipBytes(LongSizedDataStructure.intSize(DEBUG_NAME, offsetsBuffer - offBufRead));
+            }
+
+            try (final WritableChunk<Values> inner =
+                    componentReader.readChunk(fieldNodeIter, bufferInfoIter, is, null, 0, 0)) {
+                chunk = kernel.contract(inner, offsets, outChunk, outOffset, totalRows);
+
+                long nextValid = 0;
+                for (int ii = 0; ii < nodeInfo.numElements; ++ii) {
+                    if ((ii % 64) == 0) {
+                        nextValid = isValid.get(ii / 64);
+                    }
+                    if ((nextValid & 0x1) == 0x0) {
+                        chunk.set(outOffset + ii, null);
+                    }
+                    nextValid >>= 1;
+                }
+            }
+        }
+
+        return chunk;
+    }
+}
diff --git a/extensions/barrage/src/main/java/io/deephaven/extensions/barrage/chunk/array/ArrayReflectUtil.java b/extensions/barrage/src/main/java/io/deephaven/extensions/barrage/chunk/array/ArrayReflectUtil.java
new file mode 100644
index 00000000000..c59fdf93016
--- /dev/null
+++ b/extensions/barrage/src/main/java/io/deephaven/extensions/barrage/chunk/array/ArrayReflectUtil.java
@@ -0,0 +1,24 @@
+//
+// Copyright (c) 2016-2024 Deephaven Data Labs and Patent Pending
+//
+package io.deephaven.extensions.barrage.chunk.array;
+
+import java.lang.reflect.Array;
+
+/**
+ * This utility class exists to isolate wrappers around reflective calls that may need to have their implementations
+ * replaced when emulated in the JS API.
+ */
+class ArrayReflectUtil {
+    /**
+     * Allocate an array to hold {@code length} elements of type {@code componentType}. The standard (Java)
+     * implementation delegates to {@link Array#newInstance(Class, int)}.
+     *
+     * @param componentType the component type in the array to be created
+     * @param length the length of the array to create
+     * @return the created array
+     */
+    static Object newInstance(Class<?> componentType, int length) {
+        return Array.newInstance(componentType, length);
+    }
+}
diff --git a/extensions/barrage/src/main/java/io/deephaven/extensions/barrage/chunk/array/BoxedBooleanArrayExpansionKernel.java b/extensions/barrage/src/main/java/io/deephaven/extensions/barrage/chunk/array/BoxedBooleanArrayExpansionKernel.java
index c6b901a7dd3..0a02ddb31f9 100644
--- a/extensions/barrage/src/main/java/io/deephaven/extensions/barrage/chunk/array/BoxedBooleanArrayExpansionKernel.java
+++ b/extensions/barrage/src/main/java/io/deephaven/extensions/barrage/chunk/array/BoxedBooleanArrayExpansionKernel.java
@@ -47,7 +47,7 @@ public <T, A extends Any> WritableChunk<A> expand(final ObjectChunk<T, A> source
                 continue;
             }
             for (int j = 0; j < row.length; ++j) {
-                final byte value = row[j] ? BooleanUtils.TRUE_BOOLEAN_AS_BYTE : BooleanUtils.FALSE_BOOLEAN_AS_BYTE;
+                final byte value = BooleanUtils.booleanAsByte(row[j]);
                 result.set(lenWritten + j, value);
             }
             lenWritten += row.length;
diff --git a/extensions/barrage/src/main/java/io/deephaven/extensions/barrage/chunk/array/ObjectArrayExpansionKernel.java b/extensions/barrage/src/main/java/io/deephaven/extensions/barrage/chunk/array/ObjectArrayExpansionKernel.java
index cb36daf0ba6..f20e408bc6b 100644
--- a/extensions/barrage/src/main/java/io/deephaven/extensions/barrage/chunk/array/ObjectArrayExpansionKernel.java
+++ b/extensions/barrage/src/main/java/io/deephaven/extensions/barrage/chunk/array/ObjectArrayExpansionKernel.java
@@ -13,8 +13,6 @@
 import io.deephaven.chunk.WritableObjectChunk;
 import io.deephaven.util.datastructures.LongSizedDataStructure;
 
-import java.lang.reflect.Array;
-
 public class ObjectArrayExpansionKernel implements ArrayExpansionKernel {
 
     private final Class<?> componentType;
@@ -82,7 +80,7 @@ public <T, A extends Any> WritableObjectChunk<T, A> contract(
         int lenRead = 0;
         for (int i = 0; i < itemsInBatch; ++i) {
             final int rowLen = perElementLengthDest.get(i + 1) - perElementLengthDest.get(i);
-            final Object[] row = (Object[]) Array.newInstance(componentType, rowLen);
+            final Object[] row = (Object[]) ArrayReflectUtil.newInstance(componentType, rowLen);
             if (rowLen != 0) {
                 typedSource.copyToArray(lenRead, row, 0, rowLen);
                 lenRead += rowLen;
diff --git a/extensions/barrage/src/main/java/io/deephaven/extensions/barrage/table/BarrageRedirectedTable.java b/extensions/barrage/src/main/java/io/deephaven/extensions/barrage/table/BarrageRedirectedTable.java
index fe735a20f5b..001af543759 100644
--- a/extensions/barrage/src/main/java/io/deephaven/extensions/barrage/table/BarrageRedirectedTable.java
+++ b/extensions/barrage/src/main/java/io/deephaven/extensions/barrage/table/BarrageRedirectedTable.java
@@ -10,6 +10,7 @@
 import io.deephaven.engine.rowset.RowSequence;
 import io.deephaven.engine.rowset.RowSet;
 import io.deephaven.engine.rowset.RowSetFactory;
+import io.deephaven.engine.rowset.RowSetShiftData;
 import io.deephaven.engine.rowset.WritableRowSet;
 import io.deephaven.engine.rowset.chunkattributes.OrderedRowKeys;
 import io.deephaven.engine.rowset.chunkattributes.RowKeys;
@@ -20,6 +21,7 @@
 import io.deephaven.engine.table.Table;
 import io.deephaven.engine.table.TableUpdate;
 import io.deephaven.engine.table.WritableColumnSource;
+import io.deephaven.engine.table.impl.FlattenOperation;
 import io.deephaven.engine.table.impl.TableUpdateImpl;
 import io.deephaven.engine.table.impl.util.BarrageMessage;
 import io.deephaven.engine.table.impl.util.UpdateCoalescer;
@@ -30,7 +32,6 @@
 import org.jetbrains.annotations.Nullable;
 
 import java.util.ArrayDeque;
-import java.util.BitSet;
 import java.util.LinkedHashMap;
 import java.util.Map;
 import java.util.concurrent.ScheduledExecutorService;
@@ -47,6 +48,14 @@ public class BarrageRedirectedTable extends BarrageTable {
     /** represents which rows in writable source exist but are not mapped to any parent rows */
     private WritableRowSet freeset = RowSetFactory.empty();
 
+    /**
+     * A full subscription is where the server sends all data to the client. The server is allowed to initially send
+     * growing viewports to the client to avoid contention on the update graph lock. Once the server has grown the
+     * viewport to match the entire table as of any particular consistent state, it will not send any more snapshots and
+     * {@code serverViewport} will be set to {@code null}.
+     */
+    protected final boolean isFullSubscription;
+
     protected BarrageRedirectedTable(final UpdateSourceRegistrar registrar,
             final NotificationQueue notificationQueue,
             @Nullable final ScheduledExecutorService executorService,
@@ -55,10 +64,12 @@ protected BarrageRedirectedTable(final UpdateSourceRegistrar registrar,
             final WritableRowRedirection rowRedirection,
             final Map<String, Object> attributes,
             final boolean isFlat,
+            final boolean isFullSubscription,
             @Nullable final ViewportChangedCallback vpCallback) {
         super(registrar, notificationQueue, executorService, columns, writableSources, attributes, vpCallback);
         this.rowRedirection = rowRedirection;
-        if (isFlat) {
+        this.isFullSubscription = isFullSubscription;
+        if (!isFullSubscription || isFlat) {
             setFlat();
         }
     }
@@ -105,23 +116,31 @@ private UpdateCoalescer processUpdate(final BarrageMessage update, final UpdateC
         final boolean serverReverseViewport = getServerReverseViewport();
 
         try (final RowSet currRowsFromPrev = currentRowSet.copy();
-                final WritableRowSet populatedRows =
-                        (serverViewport != null
-                                ? currentRowSet.subSetForPositions(serverViewport, serverReverseViewport)
-                                : null)) {
+                final WritableRowSet populatedRows = serverViewport != null && isFullSubscription
+                        ? currentRowSet.subSetForPositions(serverViewport, serverReverseViewport)
+                        : null) {
+
+            final RowSetShiftData updateShiftData;
+            if (isFullSubscription) {
+                updateShiftData = update.shifted;
+            } else {
+                updateShiftData = FlattenOperation.computeFlattenedRowSetShiftData(
+                        update.rowsRemoved, update.rowsAdded, currentRowSet.size());
+            }
 
             // removes
             currentRowSet.remove(update.rowsRemoved);
-            try (final RowSet removed = serverViewport != null ? populatedRows.extract(update.rowsRemoved) : null) {
-                freeRows(removed != null ? removed : update.rowsRemoved);
+            try (final RowSet populatedRowsRemoved =
+                    populatedRows != null ? populatedRows.extract(update.rowsRemoved) : null) {
+                freeRows(populatedRowsRemoved != null ? populatedRowsRemoved : update.rowsRemoved);
             }
 
             // shifts
-            if (update.shifted.nonempty()) {
-                rowRedirection.applyShift(currentRowSet, update.shifted);
-                update.shifted.apply(currentRowSet);
+            if (updateShiftData.nonempty()) {
+                rowRedirection.applyShift(currentRowSet, updateShiftData);
+                updateShiftData.apply(currentRowSet);
                 if (populatedRows != null) {
-                    update.shifted.apply(populatedRows);
+                    updateShiftData.apply(populatedRows);
                 }
             }
             currentRowSet.insert(update.rowsAdded);
@@ -231,7 +250,7 @@ private UpdateCoalescer processUpdate(final BarrageMessage update, final UpdateC
             }
 
             // remove all data outside of our viewport
-            if (serverViewport != null) {
+            if (populatedRows != null) {
                 try (final RowSet newPopulated =
                         currentRowSet.subSetForPositions(serverViewport, serverReverseViewport)) {
                     populatedRows.remove(newPopulated);
@@ -247,7 +266,8 @@ private UpdateCoalescer processUpdate(final BarrageMessage update, final UpdateC
             }
 
             final TableUpdate downstream = new TableUpdateImpl(
-                    update.rowsAdded.copy(), update.rowsRemoved.copy(), totalMods, update.shifted, modifiedColumnSet);
+                    update.rowsAdded, update.rowsRemoved, totalMods, updateShiftData, modifiedColumnSet);
+
             return (coalescer == null) ? new UpdateCoalescer(currRowsFromPrev, downstream)
                     : coalescer.update(downstream);
         }
diff --git a/extensions/barrage/src/main/java/io/deephaven/extensions/barrage/table/BarrageTable.java b/extensions/barrage/src/main/java/io/deephaven/extensions/barrage/table/BarrageTable.java
index 118c968e479..60e2e463432 100644
--- a/extensions/barrage/src/main/java/io/deephaven/extensions/barrage/table/BarrageTable.java
+++ b/extensions/barrage/src/main/java/io/deephaven/extensions/barrage/table/BarrageTable.java
@@ -37,6 +37,7 @@
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
+import javax.annotation.OverridingMethodsMustInvokeSuper;
 import java.time.Instant;
 import java.util.*;
 import java.util.concurrent.ScheduledExecutorService;
@@ -101,7 +102,7 @@ public interface ViewportChangedCallback {
      * Due to the asynchronous aspect of this protocol, the client may have multiple requests in-flight and the server
      * may choose to honor the most recent request and assumes that the client no longer wants earlier but unacked
      * viewport changes.
-     *
+     * <p>
      * The server notifies the client which viewport it is respecting by including it inside of each snapshot. Note that
      * the server assumes that the client has maintained its state prior to these server-side viewport acks and will not
      * re-send data that the client should already have within the existing viewport.
@@ -293,7 +294,7 @@ protected synchronized void updateServerViewport(
             final RowSet viewport,
             final BitSet columns,
             final boolean reverseViewport) {
-        Assert.holdsLock(this, "BarrageTable.this");
+        Assert.assertion(Thread.holdsLock(this), "Thread.holdsLock(this)");
 
         final RowSet finalViewport = viewport == null ? null : viewport.copy();
         final BitSet finalColumns = (columns == null || columns.cardinality() == numColumns())
@@ -423,6 +424,7 @@ private void enqueueError(final Throwable e) {
      * @param executorService an executor service used to flush stats
      * @param tableDefinition the table definition
      * @param attributes Key-Value pairs of attributes to forward to the QueryTable's metadata
+     * @param isFullSubscription whether this table is a full subscription
      *
      * @return a properly initialized {@link BarrageTable}
      */
@@ -431,9 +433,10 @@ public static BarrageTable make(
             @Nullable final ScheduledExecutorService executorService,
             final TableDefinition tableDefinition,
             final Map<String, Object> attributes,
+            final boolean isFullSubscription,
             @Nullable final ViewportChangedCallback vpCallback) {
         final UpdateGraph ug = ExecutionContext.getContext().getUpdateGraph();
-        return make(ug, ug, executorService, tableDefinition, attributes, vpCallback);
+        return make(ug, ug, executorService, tableDefinition, attributes, isFullSubscription, vpCallback);
     }
 
     @VisibleForTesting
@@ -443,6 +446,7 @@ public static BarrageTable make(
             @Nullable final ScheduledExecutorService executor,
             final TableDefinition tableDefinition,
             final Map<String, Object> attributes,
+            final boolean isFullSubscription,
             @Nullable final ViewportChangedCallback vpCallback) {
         final List<ColumnDefinition<?>> columns = tableDefinition.getColumns();
         final WritableColumnSource<?>[] writableSources = new WritableColumnSource[columns.size()];
@@ -471,7 +475,7 @@ public static BarrageTable make(
                     makeColumns(columns, writableSources, rowRedirection);
             table = new BarrageRedirectedTable(
                     registrar, queue, executor, finalColumns, writableSources, rowRedirection, attributes, isFlat,
-                    vpCallback);
+                    isFullSubscription, vpCallback);
         }
 
         return table;
@@ -570,6 +574,7 @@ protected LogEntry beginLog(LogLevel level) {
         return log.getEntry(level).append(System.identityHashCode(this));
     }
 
+    @OverridingMethodsMustInvokeSuper
     @Override
     protected void destroy() {
         super.destroy();
diff --git a/extensions/barrage/src/main/java/io/deephaven/extensions/barrage/util/ArrowIpcUtil.java b/extensions/barrage/src/main/java/io/deephaven/extensions/barrage/util/ArrowIpcUtil.java
new file mode 100644
index 00000000000..b85b672e8d4
--- /dev/null
+++ b/extensions/barrage/src/main/java/io/deephaven/extensions/barrage/util/ArrowIpcUtil.java
@@ -0,0 +1,31 @@
+//
+// Copyright (c) 2016-2024 Deephaven Data Labs and Patent Pending
+//
+package io.deephaven.extensions.barrage.util;
+
+import org.apache.arrow.vector.ipc.ReadChannel;
+import org.apache.arrow.vector.ipc.WriteChannel;
+import org.apache.arrow.vector.ipc.message.MessageSerializer;
+import org.apache.arrow.vector.types.pojo.Schema;
+
+import java.io.ByteArrayInputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.OutputStream;
+import java.nio.channels.Channels;
+
+public class ArrowIpcUtil {
+    public static long serialize(OutputStream outputStream, Schema schema) throws IOException {
+        // not buffered. no flushing needed. not closing write channel
+        return MessageSerializer.serialize(new WriteChannel(Channels.newChannel(outputStream)), schema);
+    }
+
+    public static Schema deserialize(InputStream in) throws IOException {
+        // not buffered. not closing read channel
+        return MessageSerializer.deserializeSchema(new ReadChannel(Channels.newChannel(in)));
+    }
+
+    public static Schema deserialize(byte[] buf, int offset, int length) throws IOException {
+        return deserialize(new ByteArrayInputStream(buf, offset, length));
+    }
+}
diff --git a/extensions/barrage/src/main/java/io/deephaven/extensions/barrage/util/ArrowToTableConverter.java b/extensions/barrage/src/main/java/io/deephaven/extensions/barrage/util/ArrowToTableConverter.java
index 71f8a81b0fe..5e83dea4b63 100644
--- a/extensions/barrage/src/main/java/io/deephaven/extensions/barrage/util/ArrowToTableConverter.java
+++ b/extensions/barrage/src/main/java/io/deephaven/extensions/barrage/util/ArrowToTableConverter.java
@@ -13,6 +13,8 @@
 import io.deephaven.engine.table.impl.util.BarrageMessage;
 import io.deephaven.extensions.barrage.BarrageSubscriptionOptions;
 import io.deephaven.extensions.barrage.chunk.ChunkInputStreamGenerator;
+import io.deephaven.extensions.barrage.chunk.ChunkReader;
+import io.deephaven.extensions.barrage.chunk.DefaultChunkReadingFactory;
 import io.deephaven.extensions.barrage.table.BarrageTable;
 import io.deephaven.io.streams.ByteBufferInputStream;
 import io.deephaven.proto.util.Exceptions;
@@ -22,6 +24,7 @@
 import org.apache.arrow.flatbuf.MessageHeader;
 import org.apache.arrow.flatbuf.RecordBatch;
 import org.apache.arrow.flatbuf.Schema;
+import org.jetbrains.annotations.NotNull;
 
 import java.io.IOException;
 import java.nio.ByteBuffer;
@@ -29,8 +32,10 @@
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Iterator;
+import java.util.List;
 import java.util.PrimitiveIterator;
 
+import static io.deephaven.extensions.barrage.chunk.ChunkReader.typeInfo;
 import static io.deephaven.extensions.barrage.util.BarrageProtoUtil.DEFAULT_SER_OPTIONS;
 
 /**
@@ -40,15 +45,14 @@
 public class ArrowToTableConverter {
     protected long totalRowsRead = 0;
     protected BarrageTable resultTable;
-    private ChunkType[] columnChunkTypes;
-    private int[] columnConversionFactors;
     private Class<?>[] columnTypes;
     private Class<?>[] componentTypes;
     protected BarrageSubscriptionOptions options = DEFAULT_SER_OPTIONS;
+    private final List<ChunkReader> readers = new ArrayList<>();
 
     private volatile boolean completed = false;
 
-    private static BarrageProtoUtil.MessageInfo parseArrowIpcMessage(final ByteBuffer bb) throws IOException {
+    public static BarrageProtoUtil.MessageInfo parseArrowIpcMessage(final ByteBuffer bb) {
         final BarrageProtoUtil.MessageInfo mi = new BarrageProtoUtil.MessageInfo();
 
         bb.order(ByteOrder.LITTLE_ENDIAN);
@@ -61,13 +65,45 @@ private static BarrageProtoUtil.MessageInfo parseArrowIpcMessage(final ByteBuffe
             final ByteBuffer bodyBB = bb.slice();
             final ByteBufferInputStream bbis = new ByteBufferInputStream(bodyBB);
             final CodedInputStream decoder = CodedInputStream.newInstance(bbis);
-            // noinspection UnstableApiUsage
             mi.inputStream = new LittleEndianDataInputStream(
                     new BarrageProtoUtil.ObjectInputStreamAdapter(decoder, bodyBB.remaining()));
         }
         return mi;
     }
 
+    public static Schema parseArrowSchema(final BarrageProtoUtil.MessageInfo mi) {
+        if (mi.header.headerType() != MessageHeader.Schema) {
+            throw new IllegalArgumentException("The input is not a valid Arrow Schema IPC message");
+        }
+
+        // The Schema instance (especially originated from Python) can't be assumed to be valid after the return
+        // of this method. Until https://github.com/jpy-consortium/jpy/issues/126 is resolved, we need to make a copy of
+        // the header to use after the return of this method.
+        ByteBuffer original = mi.header.getByteBuffer();
+        ByteBuffer copy = ByteBuffer.allocate(original.remaining()).put(original).rewind();
+        Schema schema = new Schema();
+        Message.getRootAsMessage(copy).header(schema);
+
+        return schema;
+    }
+
+    public static PrimitiveIterator.OfLong extractBufferInfo(@NotNull final RecordBatch batch) {
+        final long[] bufferInfo = new long[batch.buffersLength()];
+        for (int bi = 0; bi < batch.buffersLength(); ++bi) {
+            int offset = LongSizedDataStructure.intSize("BufferInfo", batch.buffers(bi).offset());
+            int length = LongSizedDataStructure.intSize("BufferInfo", batch.buffers(bi).length());
+
+            if (bi < batch.buffersLength() - 1) {
+                final int nextOffset =
+                        LongSizedDataStructure.intSize("BufferInfo", batch.buffers(bi + 1).offset());
+                // our parsers handle overhanging buffers
+                length += Math.max(0, nextOffset - offset - length);
+            }
+            bufferInfo[bi] = length;
+        }
+        return Arrays.stream(bufferInfo).iterator();
+    }
+
     @ScriptApi
     public synchronized void setSchema(final ByteBuffer ipcMessage) {
         // The input ByteBuffer instance (especially originated from Python) can't be assumed to be valid after the
@@ -76,11 +112,8 @@ public synchronized void setSchema(final ByteBuffer ipcMessage) {
         if (completed) {
             throw new IllegalStateException("Conversion is complete; cannot process additional messages");
         }
-        final BarrageProtoUtil.MessageInfo mi = getMessageInfo(ipcMessage);
-        if (mi.header.headerType() != MessageHeader.Schema) {
-            throw new IllegalArgumentException("The input is not a valid Arrow Schema IPC message");
-        }
-        parseSchema((Schema) mi.header.header(new Schema()));
+        final BarrageProtoUtil.MessageInfo mi = parseArrowIpcMessage(ipcMessage);
+        configureWithSchema(parseArrowSchema(mi));
     }
 
     @ScriptApi
@@ -105,7 +138,7 @@ public synchronized void addRecordBatch(final ByteBuffer ipcMessage) {
             throw new IllegalStateException("Arrow schema must be provided before record batches can be added");
         }
 
-        final BarrageProtoUtil.MessageInfo mi = getMessageInfo(ipcMessage);
+        final BarrageProtoUtil.MessageInfo mi = parseArrowIpcMessage(ipcMessage);
         if (mi.header.headerType() != MessageHeader.RecordBatch) {
             throw new IllegalArgumentException("The input is not a valid Arrow RecordBatch IPC message");
         }
@@ -135,22 +168,24 @@ public synchronized void onCompleted() throws InterruptedException {
         completed = true;
     }
 
-    protected void parseSchema(final Schema header) {
-        // The Schema instance (especially originated from Python) can't be assumed to be valid after the return
-        // of this method. Until https://github.com/jpy-consortium/jpy/issues/126 is resolved, we need to make a copy of
-        // the header to use after the return of this method.
+    protected void configureWithSchema(final Schema schema) {
         if (resultTable != null) {
             throw Exceptions.statusRuntimeException(Code.INVALID_ARGUMENT, "Schema evolution not supported");
         }
 
-        final BarrageUtil.ConvertedArrowSchema result = BarrageUtil.convertArrowSchema(header);
-        resultTable = BarrageTable.make(null, result.tableDef, result.attributes, null);
+        final BarrageUtil.ConvertedArrowSchema result = BarrageUtil.convertArrowSchema(schema);
+        resultTable = BarrageTable.make(null, result.tableDef, result.attributes, true, null);
         resultTable.setFlat();
 
-        columnConversionFactors = result.conversionFactors;
-        columnChunkTypes = result.computeWireChunkTypes();
+        ChunkType[] columnChunkTypes = result.computeWireChunkTypes();
         columnTypes = result.computeWireTypes();
         componentTypes = result.computeWireComponentTypes();
+        for (int i = 0; i < schema.fieldsLength(); i++) {
+            final int factor = (result.conversionFactors == null) ? 1 : result.conversionFactors[i];
+            ChunkReader reader = DefaultChunkReadingFactory.INSTANCE.getReader(options, factor,
+                    typeInfo(columnChunkTypes[i], columnTypes[i], componentTypes[i], schema.fields(i)));
+            readers.add(reader);
+        }
 
         // retain reference until the resultTable can be sealed
         resultTable.retainReference();
@@ -167,20 +202,7 @@ protected BarrageMessage createBarrageMessage(BarrageProtoUtil.MessageInfo mi, i
                 new FlatBufferIteratorAdapter<>(batch.nodesLength(),
                         i -> new ChunkInputStreamGenerator.FieldNodeInfo(batch.nodes(i)));
 
-        final long[] bufferInfo = new long[batch.buffersLength()];
-        for (int bi = 0; bi < batch.buffersLength(); ++bi) {
-            int offset = LongSizedDataStructure.intSize("BufferInfo", batch.buffers(bi).offset());
-            int length = LongSizedDataStructure.intSize("BufferInfo", batch.buffers(bi).length());
-
-            if (bi < batch.buffersLength() - 1) {
-                final int nextOffset =
-                        LongSizedDataStructure.intSize("BufferInfo", batch.buffers(bi + 1).offset());
-                // our parsers handle overhanging buffers
-                length += Math.max(0, nextOffset - offset - length);
-            }
-            bufferInfo[bi] = length;
-        }
-        final PrimitiveIterator.OfLong bufferInfoIter = Arrays.stream(bufferInfo).iterator();
+        final PrimitiveIterator.OfLong bufferInfoIter = extractBufferInfo(batch);
 
         msg.rowsRemoved = RowSetFactory.empty();
         msg.shifted = RowSetShiftData.EMPTY;
@@ -192,11 +214,8 @@ protected BarrageMessage createBarrageMessage(BarrageProtoUtil.MessageInfo mi, i
             final BarrageMessage.AddColumnData acd = new BarrageMessage.AddColumnData();
             msg.addColumnData[ci] = acd;
             msg.addColumnData[ci].data = new ArrayList<>();
-            final int factor = (columnConversionFactors == null) ? 1 : columnConversionFactors[ci];
             try {
-                acd.data.add(ChunkInputStreamGenerator.extractChunkFromInputStream(options, factor,
-                        columnChunkTypes[ci], columnTypes[ci], componentTypes[ci], fieldNodeIter,
-                        bufferInfoIter, mi.inputStream, null, 0, 0));
+                acd.data.add(readers.get(ci).readChunk(fieldNodeIter, bufferInfoIter, mi.inputStream, null, 0, 0));
             } catch (final IOException unexpected) {
                 throw new UncheckedDeephavenException(unexpected);
             }
@@ -212,16 +231,4 @@ protected BarrageMessage createBarrageMessage(BarrageProtoUtil.MessageInfo mi, i
         msg.length = numRowsAdded;
         return msg;
     }
-
-    private BarrageProtoUtil.MessageInfo getMessageInfo(ByteBuffer ipcMessage) {
-        final BarrageProtoUtil.MessageInfo mi;
-        try {
-            mi = parseArrowIpcMessage(ipcMessage);
-        } catch (IOException unexpected) {
-            throw new UncheckedDeephavenException(unexpected);
-        }
-        return mi;
-    }
-
-
 }
diff --git a/extensions/barrage/src/main/java/io/deephaven/extensions/barrage/util/BarrageChunkAppendingMarshaller.java b/extensions/barrage/src/main/java/io/deephaven/extensions/barrage/util/BarrageChunkAppendingMarshaller.java
deleted file mode 100644
index edbf60d72a1..00000000000
--- a/extensions/barrage/src/main/java/io/deephaven/extensions/barrage/util/BarrageChunkAppendingMarshaller.java
+++ /dev/null
@@ -1,206 +0,0 @@
-//
-// Copyright (c) 2016-2024 Deephaven Data Labs and Patent Pending
-//
-package io.deephaven.extensions.barrage.util;
-
-import com.google.common.io.LittleEndianDataInputStream;
-import com.google.protobuf.CodedInputStream;
-import io.deephaven.chunk.WritableChunk;
-import io.deephaven.chunk.attributes.Values;
-import io.deephaven.extensions.barrage.BarrageSnapshotOptions;
-import io.deephaven.extensions.barrage.chunk.ChunkInputStreamGenerator;
-import io.deephaven.util.datastructures.LongSizedDataStructure;
-import io.deephaven.chunk.ChunkType;
-import io.deephaven.internal.log.LoggerFactory;
-import io.deephaven.io.logger.Logger;
-import io.grpc.MethodDescriptor;
-import io.grpc.protobuf.ProtoUtils;
-import org.apache.arrow.flatbuf.Message;
-import org.apache.arrow.flatbuf.MessageHeader;
-import org.apache.arrow.flatbuf.RecordBatch;
-import org.apache.arrow.flight.impl.Flight;
-import org.apache.arrow.flight.impl.FlightServiceGrpc;
-
-import java.io.InputStream;
-import java.nio.ByteBuffer;
-import java.util.Arrays;
-import java.util.Iterator;
-import java.util.PrimitiveIterator;
-
-/**
- * This class is used to append the results of a DoGet directly into destination {@link WritableChunk<Values>}.
- * <p>
- * It will append the results of a DoGet into the destination chunks, and notify the listener of the number of rows
- * appended to the record batch in total. The user will typically want to wait for OnCompletion to be called before
- * assuming they have received all the data.
- */
-public class BarrageChunkAppendingMarshaller implements MethodDescriptor.Marshaller<Integer> {
-
-    /**
-     * Fetch the client side descriptor for a specific DoGet invocation.
-     * <p>
-     * Instead of providing BarrageMessage as the response type, this custom marshaller will return the number of rows
-     * appended after each RecordBatch. This is informative yet hands-off process reading data into the chunks.
-     *
-     * @param columnChunkTypes the chunk types per column
-     * @param columnTypes the class type per column
-     * @param componentTypes the component class type per column
-     * @param destChunks the destination chunks
-     * @return the client side method descriptor
-     */
-    public static MethodDescriptor<Flight.Ticket, Integer> getClientDoGetDescriptor(
-            final ChunkType[] columnChunkTypes,
-            final Class<?>[] columnTypes,
-            final Class<?>[] componentTypes,
-            final WritableChunk<Values>[] destChunks) {
-        final MethodDescriptor.Marshaller<Flight.Ticket> requestMarshaller =
-                ProtoUtils.marshaller(Flight.Ticket.getDefaultInstance());
-        final MethodDescriptor<?, ?> descriptor = FlightServiceGrpc.getDoGetMethod();
-
-        return MethodDescriptor.<Flight.Ticket, Integer>newBuilder()
-                .setType(MethodDescriptor.MethodType.SERVER_STREAMING)
-                .setFullMethodName(descriptor.getFullMethodName())
-                .setSampledToLocalTracing(false)
-                .setRequestMarshaller(requestMarshaller)
-                .setResponseMarshaller(new BarrageChunkAppendingMarshaller(
-                        BARRAGE_OPTIONS, columnChunkTypes, columnTypes, componentTypes, destChunks))
-                .setSchemaDescriptor(descriptor.getSchemaDescriptor())
-                .build();
-    }
-
-    // DoGet does not get to set any options
-    private static final BarrageSnapshotOptions BARRAGE_OPTIONS = BarrageSnapshotOptions.builder().build();
-
-    private static final Logger log = LoggerFactory.getLogger(BarrageChunkAppendingMarshaller.class);
-
-    private final BarrageSnapshotOptions options;
-
-    private final ChunkType[] columnChunkTypes;
-    private final Class<?>[] columnTypes;
-    private final Class<?>[] componentTypes;
-
-    private final WritableChunk<Values>[] destChunks;
-    private long numRowsRead = 0;
-
-    public BarrageChunkAppendingMarshaller(
-            final BarrageSnapshotOptions options,
-            final ChunkType[] columnChunkTypes,
-            final Class<?>[] columnTypes,
-            final Class<?>[] componentTypes,
-            final WritableChunk<Values>[] destChunks) {
-        this.options = options;
-        this.columnChunkTypes = columnChunkTypes;
-        this.columnTypes = columnTypes;
-        this.componentTypes = componentTypes;
-        this.destChunks = destChunks;
-    }
-
-    @Override
-    public InputStream stream(final Integer value) {
-        throw new UnsupportedOperationException(
-                "BarrageDataMarshaller unexpectedly used to directly convert BarrageMessage to InputStream");
-    }
-
-    @Override
-    public Integer parse(final InputStream stream) {
-        Message header = null;
-        try {
-            boolean bodyParsed = false;
-
-            final CodedInputStream decoder = CodedInputStream.newInstance(stream);
-
-            for (int tag = decoder.readTag(); tag != 0; tag = decoder.readTag()) {
-                if (tag == BarrageProtoUtil.DATA_HEADER_TAG) {
-                    final int size = decoder.readRawVarint32();
-                    header = Message.getRootAsMessage(ByteBuffer.wrap(decoder.readRawBytes(size)));
-                    continue;
-                } else if (tag != BarrageProtoUtil.BODY_TAG) {
-                    decoder.skipField(tag);
-                    continue;
-                }
-
-                if (bodyParsed) {
-                    // although not an error for protobuf, arrow payloads should consider it one
-                    throw new IllegalStateException("Unexpected duplicate body tag");
-                }
-
-                if (header == null) {
-                    throw new IllegalStateException("Missing metadata header; cannot decode body");
-                }
-
-                if (header.headerType() != org.apache.arrow.flatbuf.MessageHeader.RecordBatch) {
-                    throw new IllegalStateException("Only know how to decode Schema/BarrageRecordBatch messages");
-                }
-
-                bodyParsed = true;
-                final int size = decoder.readRawVarint32();
-                final RecordBatch batch = (RecordBatch) header.header(new RecordBatch());
-
-                // noinspection UnstableApiUsage
-                try (final LittleEndianDataInputStream ois =
-                        new LittleEndianDataInputStream(new BarrageProtoUtil.ObjectInputStreamAdapter(decoder, size))) {
-                    final Iterator<ChunkInputStreamGenerator.FieldNodeInfo> fieldNodeIter =
-                            new FlatBufferIteratorAdapter<>(batch.nodesLength(),
-                                    i -> new ChunkInputStreamGenerator.FieldNodeInfo(batch.nodes(i)));
-
-                    final long[] bufferInfo = new long[batch.buffersLength()];
-                    for (int bi = 0; bi < batch.buffersLength(); ++bi) {
-                        int offset = LongSizedDataStructure.intSize("BufferInfo", batch.buffers(bi).offset());
-                        int length = LongSizedDataStructure.intSize("BufferInfo", batch.buffers(bi).length());
-                        if (bi < batch.buffersLength() - 1) {
-                            final int nextOffset =
-                                    LongSizedDataStructure.intSize("BufferInfo", batch.buffers(bi + 1).offset());
-                            // our parsers handle overhanging buffers
-                            length += Math.max(0, nextOffset - offset - length);
-                        }
-                        bufferInfo[bi] = length;
-                    }
-                    final PrimitiveIterator.OfLong bufferInfoIter = Arrays.stream(bufferInfo).iterator();
-
-                    for (int ci = 0; ci < destChunks.length; ++ci) {
-                        final WritableChunk<Values> dest = destChunks[ci];
-
-                        final long remaining = dest.capacity() - dest.size();
-                        if (batch.length() > remaining) {
-                            throw new BarrageMarshallingException(String.format("Received RecordBatch length (%d) " +
-                                    "exceeds the remaining capacity (%d) of the destination Chunk.", batch.length(),
-                                    remaining));
-                        }
-
-                        // Barrage should return the provided chunk since there was enough room to append the data
-                        final WritableChunk<Values> retChunk = ChunkInputStreamGenerator.extractChunkFromInputStream(
-                                options, columnChunkTypes[ci], columnTypes[ci], componentTypes[ci], fieldNodeIter,
-                                bufferInfoIter, ois, dest, dest.size(), (int) batch.length());
-
-                        if (retChunk != dest) {
-                            throw new BarrageMarshallingException("Unexpected chunk returned from " +
-                                    "ChunkInputStreamGenerator.extractChunkFromInputStream");
-                        }
-
-                        // barrage does not alter the destination chunk size, so let's set it ourselves
-                        dest.setSize(dest.size() + (int) batch.length());
-                    }
-                    numRowsRead += batch.length();
-                }
-            }
-
-            if (header != null && header.headerType() == MessageHeader.Schema) {
-                // getting started, but no rows yet; schemas do not have body tags
-                return 0;
-            }
-
-            if (!bodyParsed) {
-                throw new IllegalStateException("Missing body tag");
-            }
-
-            // we're appending directly to the chunk, but courteously let our user know how many rows were read
-            return (int) numRowsRead;
-        } catch (final Exception e) {
-            log.error().append("Unable to parse a received DoGet: ").append(e).endl();
-            if (e instanceof BarrageMarshallingException) {
-                throw (BarrageMarshallingException) e;
-            }
-            throw new GrpcMarshallingException("Unable to parse DoGet", e);
-        }
-    }
-}
diff --git a/extensions/barrage/src/main/java/io/deephaven/extensions/barrage/util/BarrageProtoUtil.java b/extensions/barrage/src/main/java/io/deephaven/extensions/barrage/util/BarrageProtoUtil.java
index 9bc4af6fb09..3321951b76d 100644
--- a/extensions/barrage/src/main/java/io/deephaven/extensions/barrage/util/BarrageProtoUtil.java
+++ b/extensions/barrage/src/main/java/io/deephaven/extensions/barrage/util/BarrageProtoUtil.java
@@ -11,18 +11,17 @@
 import io.deephaven.barrage.flatbuf.BarrageMessageWrapper;
 import io.deephaven.engine.rowset.RowSet;
 import io.deephaven.extensions.barrage.BarrageSubscriptionOptions;
-import io.deephaven.datastructures.util.CollectionUtil;
 import io.deephaven.engine.rowset.impl.ExternalizableRowSetUtils;
 import io.deephaven.internal.log.LoggerFactory;
 import io.deephaven.io.logger.Logger;
 import io.deephaven.io.streams.ByteBufferInputStream;
+import io.deephaven.util.type.ArrayTypeUtils;
 import org.apache.arrow.flatbuf.Message;
 import org.apache.arrow.flatbuf.MessageHeader;
 import org.apache.arrow.flight.impl.Flight;
 import org.jetbrains.annotations.NotNull;
 
 import java.io.ByteArrayInputStream;
-import java.io.ByteArrayOutputStream;
 import java.io.IOException;
 import java.io.InputStream;
 import java.nio.ByteBuffer;
@@ -65,12 +64,6 @@ public static RowSet toRowSet(final ByteBuffer string) {
         }
     }
 
-    public static class ExposedByteArrayOutputStream extends ByteArrayOutputStream {
-        public byte[] peekBuffer() {
-            return buf;
-        }
-    }
-
     public static class ObjectInputStreamAdapter extends InputStream {
 
         private int sizeRemaining;
@@ -196,7 +189,7 @@ public static MessageInfo parseProtoMessage(final InputStream stream) throws IOE
         if (mi.header != null && mi.header.headerType() == MessageHeader.RecordBatch && mi.inputStream == null) {
             // noinspection UnstableApiUsage
             mi.inputStream =
-                    new LittleEndianDataInputStream(new ByteArrayInputStream(CollectionUtil.ZERO_LENGTH_BYTE_ARRAY));
+                    new LittleEndianDataInputStream(new ByteArrayInputStream(ArrayTypeUtils.EMPTY_BYTE_ARRAY));
         }
 
         return mi;
diff --git a/extensions/barrage/src/main/java/io/deephaven/extensions/barrage/util/BarrageStreamReader.java b/extensions/barrage/src/main/java/io/deephaven/extensions/barrage/util/BarrageStreamReader.java
index 3d749adee21..0abde8fd91e 100644
--- a/extensions/barrage/src/main/java/io/deephaven/extensions/barrage/util/BarrageStreamReader.java
+++ b/extensions/barrage/src/main/java/io/deephaven/extensions/barrage/util/BarrageStreamReader.java
@@ -19,13 +19,17 @@
 import io.deephaven.engine.rowset.RowSetShiftData;
 import io.deephaven.engine.table.impl.util.*;
 import io.deephaven.extensions.barrage.chunk.ChunkInputStreamGenerator;
+import io.deephaven.extensions.barrage.chunk.ChunkReader;
+import io.deephaven.extensions.barrage.chunk.DefaultChunkReadingFactory;
 import io.deephaven.util.datastructures.LongSizedDataStructure;
 import io.deephaven.chunk.ChunkType;
 import io.deephaven.internal.log.LoggerFactory;
 import io.deephaven.io.logger.Logger;
+import org.apache.arrow.flatbuf.Field;
 import org.apache.arrow.flatbuf.Message;
 import org.apache.arrow.flatbuf.MessageHeader;
 import org.apache.arrow.flatbuf.RecordBatch;
+import org.apache.arrow.flatbuf.Schema;
 
 import java.io.IOException;
 import java.io.InputStream;
@@ -34,9 +38,12 @@
 import java.util.Arrays;
 import java.util.BitSet;
 import java.util.Iterator;
+import java.util.List;
 import java.util.PrimitiveIterator;
 import java.util.function.LongConsumer;
 
+import static io.deephaven.extensions.barrage.chunk.ChunkReader.typeInfo;
+
 public class BarrageStreamReader implements StreamReader {
 
     private static final Logger log = LoggerFactory.getLogger(BarrageStreamReader.class);
@@ -44,7 +51,7 @@ public class BarrageStreamReader implements StreamReader {
     // We would like to use jdk.internal.util.ArraysSupport.MAX_ARRAY_LENGTH, but it is not exported
     private static final int MAX_CHUNK_SIZE = ArrayUtil.MAX_ARRAY_SIZE;
 
-    private final LongConsumer deserializeTmConsumer;
+    private volatile LongConsumer deserializeTmConsumer;
 
     private long numAddRowsRead = 0;
     private long numAddRowsTotal = 0;
@@ -53,13 +60,24 @@ public class BarrageStreamReader implements StreamReader {
 
     private BarrageMessage msg = null;
 
+    private final ChunkReader.Factory chunkReaderFactory = DefaultChunkReadingFactory.INSTANCE;
+    private final List<ChunkReader> readers = new ArrayList<>();
+
+    public BarrageStreamReader() {
+        this(tm -> {
+        });
+    }
+
     public BarrageStreamReader(final LongConsumer deserializeTmConsumer) {
         this.deserializeTmConsumer = deserializeTmConsumer;
     }
 
+    public void setDeserializeTmConsumer(final LongConsumer deserializeTmConsumer) {
+        this.deserializeTmConsumer = deserializeTmConsumer;
+    }
+
     @Override
     public BarrageMessage safelyParseFrom(final StreamReaderOptions options,
-            final BitSet expectedColumns,
             final ChunkType[] columnChunkTypes,
             final Class<?>[] columnTypes,
             final Class<?>[] componentTypes,
@@ -115,9 +133,11 @@ public BarrageMessage safelyParseFrom(final StreamReaderOptions options,
 
                         msg.firstSeq = metadata.firstSeq();
                         msg.lastSeq = metadata.lastSeq();
+                        msg.tableSize = metadata.tableSize();
                         msg.rowsAdded = extractIndex(metadata.addedRowsAsByteBuffer());
                         msg.rowsRemoved = extractIndex(metadata.removedRowsAsByteBuffer());
-                        msg.shifted = extractIndexShiftData(metadata.shiftDataAsByteBuffer());
+                        final ByteBuffer shiftData = metadata.shiftDataAsByteBuffer();
+                        msg.shifted = shiftData != null ? extractIndexShiftData(shiftData) : RowSetShiftData.EMPTY;
 
                         final ByteBuffer rowsIncluded = metadata.addedRowsIncludedAsByteBuffer();
                         msg.rowsIncluded = rowsIncluded != null ? extractIndex(rowsIncluded) : msg.rowsAdded.copy();
@@ -240,9 +260,8 @@ public BarrageMessage safelyParseFrom(final StreamReaderOptions options,
 
                             // fill the chunk with data and assign back into the array
                             acd.data.set(lastChunkIndex,
-                                    ChunkInputStreamGenerator.extractChunkFromInputStream(options, columnChunkTypes[ci],
-                                            columnTypes[ci], componentTypes[ci], fieldNodeIter, bufferInfoIter, ois,
-                                            chunk, chunk.size(), (int) batch.length()));
+                                    readers.get(ci).readChunk(fieldNodeIter, bufferInfoIter, ois, chunk,
+                                            chunk.size(), (int) batch.length()));
                             chunk.setSize(chunk.size() + (int) batch.length());
                         }
                         numAddRowsRead += batch.length();
@@ -271,9 +290,8 @@ public BarrageMessage safelyParseFrom(final StreamReaderOptions options,
 
                             // fill the chunk with data and assign back into the array
                             mcd.data.set(lastChunkIndex,
-                                    ChunkInputStreamGenerator.extractChunkFromInputStream(options, columnChunkTypes[ci],
-                                            columnTypes[ci], componentTypes[ci], fieldNodeIter, bufferInfoIter, ois,
-                                            chunk, chunk.size(), numRowsToRead));
+                                    readers.get(ci).readChunk(fieldNodeIter, bufferInfoIter, ois, chunk,
+                                            chunk.size(), numRowsToRead));
                             chunk.setSize(chunk.size() + numRowsToRead);
                         }
                         numModRowsRead += batch.length();
@@ -282,7 +300,19 @@ public BarrageMessage safelyParseFrom(final StreamReaderOptions options,
             }
 
             if (header != null && header.headerType() == MessageHeader.Schema) {
-                // there is no body and our clients do not want to see schema messages
+                // there is no body and our clients do not want to see schema messages, consume the schema so that we
+                // can read the following messages and return null.
+                ByteBuffer original = header.getByteBuffer();
+                ByteBuffer copy = ByteBuffer.allocate(original.remaining()).put(original).rewind();
+                Schema schema = new Schema();
+                Message.getRootAsMessage(copy).header(schema);
+                header.header(schema);
+                for (int i = 0; i < schema.fieldsLength(); i++) {
+                    Field field = schema.fields(i);
+                    ChunkReader chunkReader = chunkReaderFactory.getReader(options,
+                            typeInfo(columnChunkTypes[i], columnTypes[i], componentTypes[i], field));
+                    readers.add(chunkReader);
+                }
                 return null;
             }
 
diff --git a/extensions/barrage/src/main/java/io/deephaven/extensions/barrage/util/BarrageUtil.java b/extensions/barrage/src/main/java/io/deephaven/extensions/barrage/util/BarrageUtil.java
index f8933e6aee0..362bdc67353 100755
--- a/extensions/barrage/src/main/java/io/deephaven/extensions/barrage/util/BarrageUtil.java
+++ b/extensions/barrage/src/main/java/io/deephaven/extensions/barrage/util/BarrageUtil.java
@@ -9,10 +9,12 @@
 import com.google.protobuf.ByteStringAccess;
 import com.google.rpc.Code;
 import io.deephaven.UncheckedDeephavenException;
+import io.deephaven.api.util.NameValidator;
 import io.deephaven.barrage.flatbuf.BarrageMessageWrapper;
 import io.deephaven.base.ArrayUtil;
 import io.deephaven.base.ClassUtil;
 import io.deephaven.base.verify.Assert;
+import io.deephaven.chunk.ChunkType;
 import io.deephaven.configuration.Configuration;
 import io.deephaven.engine.rowset.RowSequence;
 import io.deephaven.engine.rowset.RowSet;
@@ -27,20 +29,20 @@
 import io.deephaven.engine.table.impl.sources.ReinterpretUtils;
 import io.deephaven.engine.table.impl.util.BarrageMessage;
 import io.deephaven.engine.updategraph.impl.PeriodicUpdateGraph;
+import io.deephaven.engine.util.ColumnFormatting;
+import io.deephaven.engine.util.input.InputTableUpdater;
 import io.deephaven.extensions.barrage.BarragePerformanceLog;
 import io.deephaven.extensions.barrage.BarrageSnapshotOptions;
 import io.deephaven.extensions.barrage.BarrageStreamGenerator;
+import io.deephaven.extensions.barrage.chunk.ChunkReader;
+import io.deephaven.extensions.barrage.chunk.DefaultChunkReadingFactory;
 import io.deephaven.extensions.barrage.chunk.vector.VectorExpansionKernel;
 import io.deephaven.internal.log.LoggerFactory;
 import io.deephaven.io.logger.Logger;
+import io.deephaven.proto.backplane.grpc.ExportedTableCreationResponse;
 import io.deephaven.proto.flight.util.MessageHelper;
 import io.deephaven.proto.flight.util.SchemaHelper;
 import io.deephaven.proto.util.Exceptions;
-import io.deephaven.api.util.NameValidator;
-import io.deephaven.engine.util.ColumnFormatting;
-import io.deephaven.engine.util.input.InputTableUpdater;
-import io.deephaven.chunk.ChunkType;
-import io.deephaven.proto.backplane.grpc.ExportedTableCreationResponse;
 import io.deephaven.util.type.TypeUtils;
 import io.deephaven.vector.Vector;
 import io.grpc.stub.StreamObserver;
@@ -66,13 +68,28 @@
 import java.time.LocalDate;
 import java.time.LocalTime;
 import java.time.ZonedDateTime;
-import java.util.*;
-import java.util.function.*;
+import java.util.Arrays;
+import java.util.BitSet;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Map;
+import java.util.Optional;
+import java.util.Set;
+import java.util.function.BiConsumer;
+import java.util.function.Consumer;
+import java.util.function.Function;
+import java.util.function.IntFunction;
+import java.util.function.ToIntFunction;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
 
+import static io.deephaven.extensions.barrage.chunk.ChunkReader.typeInfo;
+
 public class BarrageUtil {
     public static final BarrageSnapshotOptions DEFAULT_SNAPSHOT_DESER_OPTIONS =
             BarrageSnapshotOptions.builder().build();
@@ -187,7 +204,8 @@ private static Optional<String> extractFlatBufferVersion(String method) {
             Instant.class,
             Boolean.class,
             LocalDate.class,
-            LocalTime.class));
+            LocalTime.class,
+            Schema.class));
 
     public static ByteString schemaBytesFromTable(@NotNull final Table table) {
         return schemaBytesFromTableDefinition(table.getDefinition(), table.getAttributes(), table.isFlat());
@@ -201,6 +219,14 @@ public static ByteString schemaBytesFromTableDefinition(
                 fbb, DEFAULT_SNAPSHOT_DESER_OPTIONS, tableDefinition, attributes, isFlat));
     }
 
+    public static Schema schemaFromTable(@NotNull final Table table) {
+        return makeSchema(DEFAULT_SNAPSHOT_DESER_OPTIONS, table.getDefinition(), table.getAttributes(), table.isFlat());
+    }
+
+    public static Schema toSchema(final TableDefinition definition, Map<String, Object> attributes, boolean isFlat) {
+        return makeSchema(DEFAULT_SNAPSHOT_DESER_OPTIONS, definition, attributes, isFlat);
+    }
+
     public static ByteString schemaBytes(@NotNull final ToIntFunction<FlatBufferBuilder> schemaPayloadWriter) {
 
         // note that flight expects the Schema to be wrapped in a Message prefixed by a 4-byte identifier
@@ -220,8 +246,15 @@ public static int makeTableSchemaPayload(
             @NotNull final TableDefinition tableDefinition,
             @NotNull final Map<String, Object> attributes,
             final boolean isFlat) {
-        final Map<String, String> schemaMetadata = attributesToMetadata(attributes, isFlat);
+        return makeSchema(options, tableDefinition, attributes, isFlat).getSchema(builder);
+    }
 
+    public static Schema makeSchema(
+            @NotNull final StreamReaderOptions options,
+            @NotNull final TableDefinition tableDefinition,
+            @NotNull final Map<String, Object> attributes,
+            final boolean isFlat) {
+        final Map<String, String> schemaMetadata = attributesToMetadata(attributes, isFlat);
         final Map<String, String> descriptions = GridAttributes.getColumnDescriptions(attributes);
         final InputTableUpdater inputTableUpdater = (InputTableUpdater) attributes.get(Table.INPUT_TABLE_ATTRIBUTE);
         final List<Field> fields = columnDefinitionsToFields(
@@ -229,8 +262,7 @@ public static int makeTableSchemaPayload(
                 ignored -> new HashMap<>(),
                 attributes, options.columnsAsList())
                 .collect(Collectors.toList());
-
-        return new Schema(fields, schemaMetadata).getSchema(builder);
+        return new Schema(fields, schemaMetadata);
     }
 
     @NotNull
@@ -510,6 +542,27 @@ public Class<?>[] computeWireComponentTypes() {
             return tableDef.getColumnStream()
                     .map(ColumnDefinition::getComponentType).toArray(Class[]::new);
         }
+
+        public ChunkReader[] computeChunkReaders(
+                @NotNull final ChunkReader.Factory chunkReaderFactory,
+                @NotNull final org.apache.arrow.flatbuf.Schema schema,
+                @NotNull final StreamReaderOptions barrageOptions) {
+            final ChunkReader[] readers = new ChunkReader[tableDef.numColumns()];
+
+            final List<ColumnDefinition<?>> columns = tableDef.getColumns();
+            for (int ii = 0; ii < tableDef.numColumns(); ++ii) {
+                final ColumnDefinition<?> columnDefinition = columns.get(ii);
+                final int factor = (conversionFactors == null) ? 1 : conversionFactors[ii];
+                final ChunkReader.TypeInfo typeInfo = typeInfo(
+                        ReinterpretUtils.maybeConvertToWritablePrimitiveChunkType(columnDefinition.getDataType()),
+                        columnDefinition.getDataType(),
+                        columnDefinition.getComponentType(),
+                        schema.fields(ii));
+                readers[ii] = DefaultChunkReadingFactory.INSTANCE.getReader(barrageOptions, factor, typeInfo);
+            }
+
+            return readers;
+        }
     }
 
     private static void setConversionFactor(
@@ -682,7 +735,7 @@ private static ConvertedArrowSchema convertArrowSchema(
 
     private static boolean isTypeNativelySupported(final Class<?> typ) {
         if (typ.isPrimitive() || TypeUtils.isBoxedType(typ) || supportedTypes.contains(typ)
-                || Vector.class.isAssignableFrom(typ) || TypeUtils.isDateTime(typ)) {
+                || Vector.class.isAssignableFrom(typ) || Instant.class == typ || ZonedDateTime.class == typ) {
             return true;
         }
         if (typ.isArray()) {
@@ -745,7 +798,8 @@ private static ArrowType arrowTypeFor(Class<?> type) {
                     return Types.MinorType.TIMENANO.getType();
                 }
                 if (type == BigDecimal.class
-                        || type == BigInteger.class) {
+                        || type == BigInteger.class
+                        || type == Schema.class) {
                     return Types.MinorType.VARBINARY.getType();
                 }
                 if (type == Instant.class || type == ZonedDateTime.class) {
diff --git a/extensions/barrage/src/main/java/io/deephaven/extensions/barrage/util/DefensiveCapture.java b/extensions/barrage/src/main/java/io/deephaven/extensions/barrage/util/DefensiveCapture.java
index 5bd8148afc7..0c186a5f354 100644
--- a/extensions/barrage/src/main/java/io/deephaven/extensions/barrage/util/DefensiveCapture.java
+++ b/extensions/barrage/src/main/java/io/deephaven/extensions/barrage/util/DefensiveCapture.java
@@ -22,7 +22,7 @@ synchronized InputStream delegate() throws IOException {
         if (delegate != null) {
             return delegate;
         }
-        final BarrageProtoUtil.ExposedByteArrayOutputStream out = new BarrageProtoUtil.ExposedByteArrayOutputStream();
+        final ExposedByteArrayOutputStream out = new ExposedByteArrayOutputStream();
         final int size = in.drainTo(out);
         in.close();
         in = null;
diff --git a/extensions/barrage/src/main/java/io/deephaven/extensions/barrage/util/ExposedByteArrayOutputStream.java b/extensions/barrage/src/main/java/io/deephaven/extensions/barrage/util/ExposedByteArrayOutputStream.java
new file mode 100644
index 00000000000..5c071322a19
--- /dev/null
+++ b/extensions/barrage/src/main/java/io/deephaven/extensions/barrage/util/ExposedByteArrayOutputStream.java
@@ -0,0 +1,12 @@
+//
+// Copyright (c) 2016-2024 Deephaven Data Labs and Patent Pending
+//
+package io.deephaven.extensions.barrage.util;
+
+import java.io.ByteArrayOutputStream;
+
+public class ExposedByteArrayOutputStream extends ByteArrayOutputStream {
+    public byte[] peekBuffer() {
+        return buf;
+    }
+}
diff --git a/extensions/barrage/src/main/java/io/deephaven/extensions/barrage/util/GrpcUtil.java b/extensions/barrage/src/main/java/io/deephaven/extensions/barrage/util/GrpcUtil.java
index cfa9617a690..9d4d875f6f8 100644
--- a/extensions/barrage/src/main/java/io/deephaven/extensions/barrage/util/GrpcUtil.java
+++ b/extensions/barrage/src/main/java/io/deephaven/extensions/barrage/util/GrpcUtil.java
@@ -14,7 +14,7 @@
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
-import java.util.UUID;
+import java.util.function.Supplier;
 
 public class GrpcUtil {
     private static final Logger log = LoggerFactory.getLogger(GrpcUtil.class);
@@ -56,7 +56,7 @@ public static <T> void safelyOnNext(StreamObserver<T> observer, T message) {
      * @param message the last message to send on this stream before completing
      * @param <T> the type of message that the stream handles
      */
-    public static <T> void safelyComplete(StreamObserver<T> observer, T message) {
+    public static <T> void safelyOnNextAndComplete(StreamObserver<T> observer, T message) {
         safelyExecuteLocked(observer, () -> {
             observer.onNext(message);
             observer.onCompleted();
diff --git a/extensions/barrage/src/main/java/io/deephaven/extensions/barrage/util/PythonTableDataService.java b/extensions/barrage/src/main/java/io/deephaven/extensions/barrage/util/PythonTableDataService.java
new file mode 100644
index 00000000000..477dd05cc4e
--- /dev/null
+++ b/extensions/barrage/src/main/java/io/deephaven/extensions/barrage/util/PythonTableDataService.java
@@ -0,0 +1,990 @@
+//
+// Copyright (c) 2016-2024 Deephaven Data Labs and Patent Pending
+//
+package io.deephaven.extensions.barrage.util;
+
+import io.deephaven.UncheckedDeephavenException;
+import io.deephaven.api.SortColumn;
+import io.deephaven.base.log.LogOutput;
+import io.deephaven.chunk.Chunk;
+import io.deephaven.chunk.WritableChunk;
+import io.deephaven.chunk.attributes.Values;
+import io.deephaven.configuration.Configuration;
+import io.deephaven.engine.context.ExecutionContext;
+import io.deephaven.engine.rowset.RowSetFactory;
+import io.deephaven.engine.table.BasicDataIndex;
+import io.deephaven.engine.table.ColumnDefinition;
+import io.deephaven.engine.table.Table;
+import io.deephaven.engine.table.TableDefinition;
+import io.deephaven.engine.table.impl.PartitionAwareSourceTable;
+import io.deephaven.engine.table.impl.TableUpdateMode;
+import io.deephaven.engine.table.impl.chunkboxer.ChunkBoxer;
+import io.deephaven.engine.table.impl.locations.*;
+import io.deephaven.engine.table.impl.locations.impl.*;
+import io.deephaven.engine.table.impl.sources.regioned.*;
+import io.deephaven.extensions.barrage.chunk.ChunkInputStreamGenerator;
+import io.deephaven.extensions.barrage.chunk.ChunkReader;
+import io.deephaven.extensions.barrage.chunk.DefaultChunkReadingFactory;
+import io.deephaven.generic.region.*;
+import io.deephaven.io.log.impl.LogOutputStringImpl;
+import io.deephaven.util.SafeCloseable;
+import io.deephaven.util.annotations.ScriptApi;
+import org.apache.arrow.flatbuf.MessageHeader;
+import org.apache.arrow.flatbuf.RecordBatch;
+import org.apache.arrow.flatbuf.Schema;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
+import org.jpy.PyObject;
+
+import java.io.IOException;
+import java.nio.ByteBuffer;
+import java.util.*;
+import java.util.concurrent.atomic.AtomicBoolean;
+import java.util.concurrent.atomic.AtomicReference;
+import java.util.function.BiConsumer;
+import java.util.function.Consumer;
+import java.util.function.Function;
+import java.util.function.LongConsumer;
+import java.util.stream.IntStream;
+
+import static io.deephaven.extensions.barrage.util.ArrowToTableConverter.parseArrowIpcMessage;
+
+@ScriptApi
+public class PythonTableDataService extends AbstractTableDataService {
+
+    private static final int DEFAULT_PAGE_SIZE = Configuration.getInstance()
+            .getIntegerForClassWithDefault(PythonTableDataService.class, "defaultPageSize", 1 << 16);
+    private static final long REGION_MASK = RegionedColumnSource.ROW_KEY_TO_SUB_REGION_ROW_INDEX_MASK;
+
+    private final BackendAccessor backend;
+    private final ChunkReader.Factory chunkReaderFactory;
+    private final StreamReaderOptions streamReaderOptions;
+    private final int pageSize;
+
+    @ScriptApi
+    public static PythonTableDataService create(
+            @NotNull final PyObject pyTableDataService,
+            @Nullable final ChunkReader.Factory chunkReaderFactory,
+            @Nullable final StreamReaderOptions streamReaderOptions,
+            final int pageSize) {
+        return new PythonTableDataService(
+                pyTableDataService,
+                chunkReaderFactory == null ? DefaultChunkReadingFactory.INSTANCE : chunkReaderFactory,
+                streamReaderOptions == null ? BarrageUtil.DEFAULT_SNAPSHOT_DESER_OPTIONS : streamReaderOptions,
+                pageSize <= 0 ? DEFAULT_PAGE_SIZE : pageSize);
+    }
+
+    /**
+     * Construct a Deephaven {@link io.deephaven.engine.table.impl.locations.TableDataService TableDataService} wrapping
+     * the provided Python TableDataServiceBackend.
+     *
+     * @param pyTableDataService The Python TableDataService
+     * @param pageSize The page size to use for all regions
+     */
+    private PythonTableDataService(
+            @NotNull final PyObject pyTableDataService,
+            @NotNull final ChunkReader.Factory chunkReaderFactory,
+            @NotNull final StreamReaderOptions streamReaderOptions,
+            final int pageSize) {
+        super("PythonTableDataService");
+        this.backend = new BackendAccessor(pyTableDataService);
+        this.chunkReaderFactory = chunkReaderFactory;
+        this.streamReaderOptions = streamReaderOptions;
+        this.pageSize = pageSize <= 0 ? DEFAULT_PAGE_SIZE : pageSize;
+    }
+
+    /**
+     * Get a Deephaven {@link Table} for the supplied {@link TableKey}.
+     *
+     * @param tableKey The table key
+     * @param live Whether the table should update as new data becomes available
+     * @return The {@link Table}
+     */
+    @ScriptApi
+    public Table makeTable(@NotNull final TableKeyImpl tableKey, final boolean live) {
+        final TableLocationProviderImpl tableLocationProvider =
+                (TableLocationProviderImpl) getTableLocationProvider(tableKey);
+        return new PartitionAwareSourceTable(
+                tableLocationProvider.tableDefinition,
+                tableKey.toString(),
+                RegionedTableComponentFactoryImpl.INSTANCE,
+                tableLocationProvider,
+                live ? ExecutionContext.getContext().getUpdateGraph() : null);
+    }
+
+    /**
+     * This Backend impl marries the Python TableDataService with the Deephaven TableDataService. By performing the
+     * object translation here, we can keep the Python TableDataService implementation simple and focused on the Python
+     * side of the implementation.
+     */
+    private class BackendAccessor {
+        private final PyObject pyTableDataService;
+
+        private BackendAccessor(
+                @NotNull final PyObject pyTableDataService) {
+            this.pyTableDataService = pyTableDataService;
+        }
+
+        /**
+         * Get two schemas, the first for partitioning columns whose values will be derived from TableLocationKey and
+         * applied to all rows in the associated TableLocation, and the second specifying the table data to be read
+         * chunk-wise (in columnar fashion) from the TableLocations.
+         *
+         * @param tableKey the table key
+         * @return the schemas
+         */
+        public BarrageUtil.ConvertedArrowSchema[] getTableSchema(
+                @NotNull final TableKeyImpl tableKey) {
+            final AsyncState<BarrageUtil.ConvertedArrowSchema[]> asyncState = new AsyncState<>();
+
+            final Consumer<ByteBuffer[]> onRawSchemas = byteBuffers -> {
+                final BarrageUtil.ConvertedArrowSchema[] schemas = new BarrageUtil.ConvertedArrowSchema[2];
+
+                if (byteBuffers.length != schemas.length) {
+                    asyncState.setError(new IllegalArgumentException(String.format(
+                            "Provided too many IPC messages. Expected %d, received %d.",
+                            schemas.length, byteBuffers.length)));
+                    return;
+                }
+
+                for (int ii = 0; ii < schemas.length; ++ii) {
+                    try {
+                        schemas[ii] = BarrageUtil.convertArrowSchema(
+                                ArrowToTableConverter.parseArrowSchema(
+                                        ArrowToTableConverter.parseArrowIpcMessage(
+                                                byteBuffers[ii])));
+                    } catch (final Exception e) {
+                        final String schemaType = ii % 2 == 0 ? "data table" : "partitioning column";
+                        asyncState.setError(new IllegalArgumentException(String.format(
+                                "Failed to parse %s schema message", schemaType), e));
+                        return;
+                    }
+                }
+
+                asyncState.setResult(schemas);
+            };
+
+            final Consumer<String> onFailure = errorString -> asyncState.setError(
+                    new UncheckedDeephavenException(errorString));
+
+            pyTableDataService.call("_table_schema", tableKey.key, onRawSchemas, onFailure);
+
+            return asyncState.awaitResult(err -> new TableDataException(String.format(
+                    "%s: table_schema failed", tableKey), err));
+        }
+
+        /**
+         * Get the existing table locations for the provided {@code tableKey}.
+         *
+         * @param definition the table definition to validate partitioning columns against
+         * @param tableKey the table key
+         * @param listener the listener to call with each existing table location key
+         */
+        public void getTableLocations(
+                @NotNull final TableDefinition definition,
+                @NotNull final TableKeyImpl tableKey,
+                @NotNull final Consumer<TableLocationKeyImpl> listener) {
+            final AsyncState<Boolean> asyncState = new AsyncState<>();
+
+            final BiConsumer<TableLocationKeyImpl, ByteBuffer[]> convertingListener =
+                    (tableLocationKey, byteBuffers) -> {
+                        try {
+                            processTableLocationKey(definition, tableKey, listener, tableLocationKey, byteBuffers);
+                        } catch (final RuntimeException e) {
+                            asyncState.setError(e);
+                        }
+                    };
+
+            final Runnable onSuccess = () -> asyncState.setResult(true);
+            final Consumer<String> onFailure = errorString -> asyncState.setError(
+                    new UncheckedDeephavenException(errorString));
+
+            pyTableDataService.call("_table_locations", tableKey.key, convertingListener, onSuccess, onFailure);
+            asyncState.awaitResult(err -> new TableDataException(String.format(
+                    "%s: table_locations failed", tableKey), err));
+        }
+
+        /**
+         * Subscribe to table location updates for the provided {@code tableKey}.
+         * <p>
+         * The {@code tableLocationListener} should be invoked with all existing table locations. Any asynchronous calls
+         * to {@code tableLocationListener}, {@code successCallback}, or {@code failureCallback} will block until this
+         * method has completed.
+         *
+         * @param definition the table definition to validate partitioning columns against
+         * @param tableKey the table key
+         * @param tableLocationListener the tableLocationListener to call with each table location key
+         * @param successCallback the success callback; called when the subscription is successfully established and the
+         *        tableLocationListener has been called with all existing table locations
+         * @param failureCallback the failure callback; called to deliver an exception triggered while activating or
+         *        maintaining the underlying data source
+         * @return a {@link SafeCloseable} that can be used to cancel the subscription
+         */
+        public SafeCloseable subscribeToTableLocations(
+                @NotNull final TableDefinition definition,
+                @NotNull final TableKeyImpl tableKey,
+                @NotNull final Consumer<TableLocationKeyImpl> tableLocationListener,
+                @NotNull final Runnable successCallback,
+                @NotNull final Consumer<RuntimeException> failureCallback) {
+            final AtomicBoolean locationProcessingFailed = new AtomicBoolean();
+            final AtomicReference<SafeCloseable> cancellationCallbackRef = new AtomicReference<>();
+
+            final BiConsumer<TableLocationKeyImpl, ByteBuffer[]> convertingListener =
+                    (tableLocationKey, byteBuffers) -> {
+                        if (locationProcessingFailed.get()) {
+                            return;
+                        }
+                        try {
+                            processTableLocationKey(
+                                    definition, tableKey, tableLocationListener, tableLocationKey, byteBuffers);
+                        } catch (final RuntimeException e) {
+                            failureCallback.accept(e);
+                            // we must also cancel the python subscription
+                            locationProcessingFailed.set(true);
+                            final SafeCloseable localCancellationCallback = cancellationCallbackRef.get();
+                            if (localCancellationCallback != null) {
+                                localCancellationCallback.close();
+                            }
+                        }
+                    };
+
+            final Consumer<String> onFailure = errorString -> failureCallback.accept(
+                    new UncheckedDeephavenException(errorString));
+
+            final PyObject cancellationCallback = pyTableDataService.call(
+                    "_subscribe_to_table_locations", tableKey.key,
+                    convertingListener, successCallback, onFailure);
+            final SafeCloseable cancellationCallbackOnce = new SafeCloseable() {
+
+                private final AtomicBoolean invoked = new AtomicBoolean();
+
+                @Override
+                public void close() {
+                    if (invoked.compareAndSet(false, true)) {
+                        cancellationCallback.call("__call__");
+                        cancellationCallbackRef.set(null);
+                    }
+                }
+            };
+            cancellationCallbackRef.set(cancellationCallbackOnce);
+            if (locationProcessingFailed.get()) {
+                cancellationCallbackOnce.close();
+            }
+            return cancellationCallbackOnce;
+        }
+
+        private void processTableLocationKey(
+                @NotNull final TableDefinition definition,
+                @NotNull final TableKeyImpl tableKey,
+                @NotNull final Consumer<TableLocationKeyImpl> listener,
+                @NotNull final TableLocationKeyImpl tableLocationKey,
+                @NotNull final ByteBuffer[] byteBuffers) {
+            if (byteBuffers.length == 0) {
+                if (!definition.getPartitioningColumns().isEmpty()) {
+                    throw new IllegalArgumentException(String.format("%s:%s: table_location_key callback expected "
+                            + "partitioned column values but none were provided", tableKey, tableLocationKey));
+                }
+                listener.accept(tableLocationKey);
+                return;
+            }
+
+            if (byteBuffers.length != 2) {
+                throw new IllegalArgumentException(String.format("%s:%s: table_location_key callback expected 2 IPC "
+                        + "messages describing the wire format of the partitioning columns followed by partitioning "
+                        + "values, but received %d messages", tableKey, tableLocationKey, byteBuffers.length));
+            }
+
+            // partitioning values must be in the same order as the partitioning keys, so we'll prepare an ordered map
+            // with null values for each key so that we may fill them in out of order
+            final Map<String, Comparable<?>> partitioningValues = new LinkedHashMap<>(
+                    definition.getPartitioningColumns().size());
+            definition.getPartitioningColumns().forEach(column -> partitioningValues.put(column.getName(), null));
+
+            // note that we recompute chunk readers for each location to support some schema evolution
+            final Schema partitioningValuesSchema = ArrowToTableConverter.parseArrowSchema(
+                    ArrowToTableConverter.parseArrowIpcMessage(byteBuffers[0]));
+            final BarrageUtil.ConvertedArrowSchema schemaPlus =
+                    BarrageUtil.convertArrowSchema(partitioningValuesSchema);
+
+            try {
+                definition.checkCompatibility(schemaPlus.tableDef);
+            } catch (TableDefinition.IncompatibleTableDefinitionException err) {
+                throw new IllegalArgumentException(String.format("%s:%s: table_location_key callback received "
+                        + "partitioning schema that is incompatible with table definition", tableKey, tableLocationKey),
+                        err);
+            }
+
+            final ChunkReader[] readers = schemaPlus.computeChunkReaders(
+                    chunkReaderFactory,
+                    partitioningValuesSchema,
+                    streamReaderOptions);
+
+            final BarrageProtoUtil.MessageInfo recordBatchMessageInfo = parseArrowIpcMessage(byteBuffers[1]);
+            if (recordBatchMessageInfo.header.headerType() != MessageHeader.RecordBatch) {
+                throw new IllegalArgumentException(String.format("%s:%s: table_location_key callback received 2nd IPC "
+                        + "message that is not a valid Arrow RecordBatch", tableKey, tableLocationKey));
+            }
+            final RecordBatch batch = (RecordBatch) recordBatchMessageInfo.header.header(new RecordBatch());
+
+            final Iterator<ChunkInputStreamGenerator.FieldNodeInfo> fieldNodeIter =
+                    new FlatBufferIteratorAdapter<>(batch.nodesLength(),
+                            i -> new ChunkInputStreamGenerator.FieldNodeInfo(batch.nodes(i)));
+
+            final PrimitiveIterator.OfLong bufferInfoIter = ArrowToTableConverter.extractBufferInfo(batch);
+
+            // extract partitioning values and box them to be used as Comparable in the map
+            for (int ci = 0; ci < partitioningValuesSchema.fieldsLength(); ++ci) {
+                final String columnName = partitioningValuesSchema.fields(ci).name();
+                try (final WritableChunk<Values> columnValues = readers[ci].readChunk(
+                        fieldNodeIter, bufferInfoIter, recordBatchMessageInfo.inputStream, null, 0, 0)) {
+
+                    if (columnValues.size() != 1) {
+                        throw new IllegalArgumentException(String.format("%s:%s: table_location_key callback received "
+                                + "%d rows for partitioning column %s; expected 1", tableKey, tableLocationKey,
+                                columnValues.size(), columnName));
+                    }
+
+                    partitioningValues.put(columnName, ChunkBoxer.boxedGet(columnValues, 0));
+                } catch (final IOException ioe) {
+                    throw new UncheckedDeephavenException(String.format(
+                            "%s:%s: table_location_key callback failed to read partitioning column %s", tableKey,
+                            tableLocationKey, columnName), ioe);
+                }
+            }
+
+            listener.accept(new TableLocationKeyImpl(tableLocationKey.locationKey, partitioningValues));
+        }
+
+        /**
+         * Get the size of the given {@code tableLocationKey}.
+         *
+         * @param tableKey the table key
+         * @param tableLocationKey the table location key
+         * @param listener the listener to call with the table location size
+         */
+        public void getTableLocationSize(
+                @NotNull final TableKeyImpl tableKey,
+                @NotNull final TableLocationKeyImpl tableLocationKey,
+                @NotNull final LongConsumer listener) {
+            final AsyncState<Long> asyncState = new AsyncState<>();
+
+            final LongConsumer onSize = asyncState::setResult;
+            final Consumer<String> onFailure = errorString -> asyncState.setError(
+                    new UncheckedDeephavenException(errorString));
+
+            pyTableDataService.call("_table_location_size", tableKey.key, tableLocationKey.locationKey,
+                    onSize, onFailure);
+
+            listener.accept(asyncState.awaitResult(err -> new TableDataException(String.format(
+                    "%s:%s: table_location_size failed", tableKey, tableLocationKey), err)));
+        }
+
+        /**
+         * Subscribe to the existing size and future size changes of a table location.
+         *
+         * @param tableKey the table key
+         * @param tableLocationKey the table location key
+         * @param sizeListener the sizeListener to call with the partition size
+         * @param successCallback the success callback; called when the subscription is successfully established and the
+         *        sizeListener has been called with the initial size
+         * @param failureCallback the failure callback; called to deliver an exception triggered while activating or
+         *        maintaining the underlying data source
+         * @return a {@link SafeCloseable} that can be used to cancel the subscription
+         */
+        public SafeCloseable subscribeToTableLocationSize(
+                @NotNull final TableKeyImpl tableKey,
+                @NotNull final TableLocationKeyImpl tableLocationKey,
+                @NotNull final LongConsumer sizeListener,
+                @NotNull final Runnable successCallback,
+                @NotNull final Consumer<String> failureCallback) {
+
+            final PyObject cancellationCallback = pyTableDataService.call(
+                    "_subscribe_to_table_location_size", tableKey.key, tableLocationKey.locationKey,
+                    sizeListener, successCallback, failureCallback);
+
+            return () -> cancellationCallback.call("__call__");
+        }
+
+        /**
+         * Get a range of data for a column.
+         *
+         * @param tableKey the table key
+         * @param tableLocationKey the table location key
+         * @param columnDefinition the column definition
+         * @param firstRowPosition the first row position
+         * @param minimumSize the minimum size
+         * @param maximumSize the maximum size
+         * @return the column values
+         */
+        public List<WritableChunk<Values>> getColumnValues(
+                @NotNull final TableKeyImpl tableKey,
+                @NotNull final TableLocationKeyImpl tableLocationKey,
+                @NotNull final ColumnDefinition<?> columnDefinition,
+                final long firstRowPosition,
+                final int minimumSize,
+                final int maximumSize) {
+
+            final AsyncState<List<WritableChunk<Values>>> asyncState = new AsyncState<>();
+
+            final String columnName = columnDefinition.getName();
+            final Consumer<ByteBuffer[]> onMessages = messages -> {
+                if (messages.length < 2) {
+                    asyncState.setError(new IllegalArgumentException(String.format(
+                            "expected at least 2 IPC messages describing the wire format of the column followed by "
+                                    + "column values, but received %d messages",
+                            messages.length)));
+                    return;
+                }
+                final Schema schema = ArrowToTableConverter.parseArrowSchema(
+                        ArrowToTableConverter.parseArrowIpcMessage(messages[0]));
+                final BarrageUtil.ConvertedArrowSchema schemaPlus = BarrageUtil.convertArrowSchema(schema);
+
+                if (schema.fieldsLength() > 1) {
+                    asyncState.setError(new IllegalArgumentException(String.format(
+                            "Received more than one field. Received %d fields for columns %s.",
+                            schema.fieldsLength(),
+                            IntStream.range(0, schema.fieldsLength())
+                                    .mapToObj(ci -> schema.fields(ci).name())
+                                    .reduce((a, b) -> a + ", " + b).orElse(""))));
+                    return;
+                }
+                if (!columnDefinition.isCompatible(schemaPlus.tableDef.getColumns().get(0))) {
+                    asyncState.setError(new IllegalArgumentException(String.format(
+                            "Received incompatible column definition. Expected %s, but received %s.",
+                            columnDefinition, schemaPlus.tableDef.getColumns().get(0))));
+                    return;
+                }
+
+                final ArrayList<WritableChunk<Values>> resultChunks = new ArrayList<>(messages.length - 1);
+                final ChunkReader reader = schemaPlus.computeChunkReaders(
+                        chunkReaderFactory, schema, streamReaderOptions)[0];
+                int mi = 1;
+                try {
+                    for (; mi < messages.length; ++mi) {
+                        final BarrageProtoUtil.MessageInfo recordBatchMessageInfo = parseArrowIpcMessage(messages[mi]);
+                        if (recordBatchMessageInfo.header.headerType() != MessageHeader.RecordBatch) {
+                            throw new IllegalArgumentException(String.format(
+                                    "IPC message %d is not a valid Arrow RecordBatch IPC message", mi));
+                        }
+                        final RecordBatch batch = (RecordBatch) recordBatchMessageInfo.header.header(new RecordBatch());
+
+                        final Iterator<ChunkInputStreamGenerator.FieldNodeInfo> fieldNodeIter =
+                                new FlatBufferIteratorAdapter<>(batch.nodesLength(),
+                                        i -> new ChunkInputStreamGenerator.FieldNodeInfo(batch.nodes(i)));
+
+                        final PrimitiveIterator.OfLong bufferInfoIter = ArrowToTableConverter.extractBufferInfo(batch);
+
+                        resultChunks.add(reader.readChunk(
+                                fieldNodeIter, bufferInfoIter, recordBatchMessageInfo.inputStream, null, 0, 0));
+                    }
+
+                    asyncState.setResult(resultChunks);
+                } catch (final IOException ioe) {
+                    SafeCloseable.closeAll(resultChunks.iterator());
+                    asyncState.setError(new UncheckedDeephavenException(String.format(
+                            "failed to read IPC message %d", mi), ioe));
+                } catch (final RuntimeException e) {
+                    SafeCloseable.closeAll(resultChunks.iterator());
+                    asyncState.setError(e);
+                }
+            };
+
+            final Consumer<String> onFailure = errorString -> asyncState.setError(
+                    new UncheckedDeephavenException(errorString));
+
+            pyTableDataService.call("_column_values",
+                    tableKey.key, tableLocationKey.locationKey, columnName, firstRowPosition,
+                    minimumSize, maximumSize, onMessages, onFailure);
+
+            return asyncState.awaitResult(err -> new TableDataException(String.format(
+                    "%s:%s: column_values(%s, %d, %d, %d) failed",
+                    tableKey, tableLocationKey, columnName, firstRowPosition, minimumSize, maximumSize), err));
+        }
+    }
+
+    @Override
+    protected @NotNull TableLocationProvider makeTableLocationProvider(@NotNull final TableKey tableKey) {
+        if (!(tableKey instanceof TableKeyImpl)) {
+            throw new IllegalArgumentException(String.format("%s: unsupported TableKey %s", this, tableKey));
+        }
+        return new TableLocationProviderImpl((TableKeyImpl) tableKey);
+    }
+
+    /**
+     * {@link TableKey} implementation for TableService.
+     */
+    public static class TableKeyImpl implements ImmutableTableKey {
+
+        private final PyObject key;
+        private int cachedHashCode;
+
+        public TableKeyImpl(@NotNull final PyObject key) {
+            this.key = key;
+        }
+
+        @Override
+        public boolean equals(final Object other) {
+            if (this == other) {
+                return true;
+            }
+            if (!(other instanceof TableKeyImpl)) {
+                return false;
+            }
+            final TableKeyImpl otherTableKey = (TableKeyImpl) other;
+            return this.key.equals(otherTableKey.key);
+        }
+
+        @Override
+        public int hashCode() {
+            if (cachedHashCode == 0) {
+                final int computedHashCode = Long.hashCode(key.call("__hash__").getLongValue());
+                // Don't use 0; that's used by StandaloneTableKey, and also our sentinel for the need to compute
+                if (computedHashCode == 0) {
+                    final int fallbackHashCode = TableKeyImpl.class.hashCode();
+                    cachedHashCode = fallbackHashCode == 0 ? 1 : fallbackHashCode;
+                } else {
+                    cachedHashCode = computedHashCode;
+                }
+            }
+            return cachedHashCode;
+        }
+
+        @Override
+        public LogOutput append(@NotNull final LogOutput logOutput) {
+            return logOutput.append(getImplementationName())
+                    .append("[key=").append(key.toString()).append(']');
+        }
+
+        @Override
+        public String toString() {
+            return new LogOutputStringImpl().append(this).toString();
+        }
+
+        @Override
+        public String getImplementationName() {
+            return "PythonTableDataService.TableKeyImpl";
+        }
+    }
+
+    /**
+     * {@link TableLocationProvider} implementation for TableService.
+     */
+    private class TableLocationProviderImpl extends AbstractTableLocationProvider {
+
+        private final TableDefinition tableDefinition;
+
+        private Subscription subscription = null;
+
+        private TableLocationProviderImpl(@NotNull final TableKeyImpl tableKey) {
+            super(tableKey, true, TableUpdateMode.APPEND_ONLY, TableUpdateMode.APPEND_ONLY);
+            final BarrageUtil.ConvertedArrowSchema[] schemas = backend.getTableSchema(tableKey);
+
+            final TableDefinition partitioningDef = schemas[0].tableDef;
+            final TableDefinition tableDataDef = schemas[1].tableDef;
+            final Map<String, ColumnDefinition<?>> columns = new LinkedHashMap<>(
+                    partitioningDef.numColumns() + tableDataDef.numColumns());
+
+            // all partitioning columns default to the front
+            for (final ColumnDefinition<?> column : partitioningDef.getColumns()) {
+                columns.put(column.getName(), column.withPartitioning());
+            }
+
+            for (final ColumnDefinition<?> column : tableDataDef.getColumns()) {
+                final ColumnDefinition<?> existingDef = columns.get(column.getName());
+
+                if (existingDef == null) {
+                    columns.put(column.getName(), column);
+                } else if (!existingDef.isCompatible(column)) {
+                    // validate that both definitions are the same
+                    throw new IllegalArgumentException(String.format("%s: column %s has conflicting definitions in "
+                            + "partitioning and table data schemas: %s vs %s", tableKey, column.getName(),
+                            existingDef, column));
+                }
+            }
+
+            tableDefinition = TableDefinition.of(columns.values());
+        }
+
+        @Override
+        protected @NotNull TableLocation makeTableLocation(@NotNull final TableLocationKey locationKey) {
+            if (!(locationKey instanceof TableLocationKeyImpl)) {
+                throw new IllegalArgumentException(String.format("%s: Unsupported TableLocationKey %s", this,
+                        locationKey));
+            }
+            return new TableLocationImpl((TableKeyImpl) getKey(), (TableLocationKeyImpl) locationKey);
+        }
+
+        @Override
+        public void refresh() {
+            TableKeyImpl key = (TableKeyImpl) getKey();
+            backend.getTableLocations(tableDefinition, key, this::handleTableLocationKeyAdded);
+        }
+
+        @Override
+        protected void activateUnderlyingDataSource() {
+            TableKeyImpl key = (TableKeyImpl) getKey();
+            final Subscription localSubscription = subscription = new Subscription();
+            localSubscription.cancellationCallback = backend.subscribeToTableLocations(
+                    tableDefinition, key, this::handleTableLocationKeyAdded,
+                    () -> activationSuccessful(localSubscription),
+                    error -> activationFailed(localSubscription, new TableDataException(
+                            String.format("%s: subscribe_to_table_locations failed", key), error)));
+        }
+
+        @Override
+        protected void deactivateUnderlyingDataSource() {
+            final Subscription localSubscription = subscription;
+            subscription = null;
+            if (localSubscription != null) {
+                localSubscription.cancellationCallback.close();
+            }
+        }
+
+        @Override
+        protected <T> boolean matchSubscriptionToken(final T token) {
+            return token == subscription;
+        }
+
+        @Override
+        public String getImplementationName() {
+            return "PythonTableDataService.TableLocationProvider";
+        }
+    }
+
+    /**
+     * {@link TableLocationKey} implementation for TableService.
+     */
+    public static class TableLocationKeyImpl extends PartitionedTableLocationKey {
+
+        private final PyObject locationKey;
+        private int cachedHashCode;
+
+        /**
+         * Construct a TableLocationKeyImpl. Used by the Python adapter.
+         *
+         * @param locationKey the location key
+         */
+        @ScriptApi
+        public TableLocationKeyImpl(@NotNull final PyObject locationKey) {
+            this(locationKey, Map.of());
+        }
+
+        private TableLocationKeyImpl(
+                @NotNull final PyObject locationKey,
+                @NotNull final Map<String, Comparable<?>> partitionValues) {
+            super(partitionValues);
+            this.locationKey = locationKey;
+        }
+
+        @Override
+        public boolean equals(final Object other) {
+            if (this == other) {
+                return true;
+            }
+            if (!(other instanceof TableLocationKeyImpl)) {
+                return false;
+            }
+            final TableLocationKeyImpl otherTyped = (TableLocationKeyImpl) other;
+            return partitions.equals((otherTyped).partitions) && locationKey.equals(otherTyped.locationKey);
+        }
+
+        @Override
+        public int hashCode() {
+            if (cachedHashCode == 0) {
+                final int computedHashCode =
+                        31 * partitions.hashCode() + Long.hashCode(locationKey.call("__hash__").getLongValue());
+                // Don't use 0; that's used by StandaloneTableLocationKey, and also our sentinel for the need to compute
+                if (computedHashCode == 0) {
+                    final int fallbackHashCode = TableLocationKeyImpl.class.hashCode();
+                    cachedHashCode = fallbackHashCode == 0 ? 1 : fallbackHashCode;
+                } else {
+                    cachedHashCode = computedHashCode;
+                }
+            }
+            return cachedHashCode;
+        }
+
+        @Override
+        public LogOutput append(@NotNull final LogOutput logOutput) {
+            return logOutput.append(getImplementationName())
+                    .append(":[key=").append(locationKey.toString())
+                    .append(", partitions=").append(PartitionsFormatter.INSTANCE, partitions)
+                    .append(']');
+        }
+
+        @Override
+        public String toString() {
+            return new LogOutputStringImpl().append(this).toString();
+        }
+
+        @Override
+        public String getImplementationName() {
+            return "PythonTableDataService.TableLocationKeyImpl";
+        }
+    }
+
+    /**
+     * {@link TableLocation} implementation for TableService.
+     */
+    public class TableLocationImpl extends AbstractTableLocation {
+
+        volatile Subscription subscription = null;
+
+        private long size;
+
+        private TableLocationImpl(
+                @NotNull final TableKeyImpl tableKey,
+                @NotNull final TableLocationKeyImpl locationKey) {
+            super(tableKey, locationKey, true);
+        }
+
+        private synchronized void onSizeChanged(final long newSize) {
+            if (size >= newSize) {
+                return;
+            }
+            size = newSize;
+            handleUpdate(RowSetFactory.flat(size), System.currentTimeMillis());
+        }
+
+        @Override
+        protected @NotNull ColumnLocation makeColumnLocation(@NotNull final String name) {
+            return new ColumnLocationImpl(this, name);
+        }
+
+        @Override
+        public void refresh() {
+            final TableKeyImpl key = (TableKeyImpl) getTableKey();
+            final TableLocationKeyImpl location = (TableLocationKeyImpl) getKey();
+            backend.getTableLocationSize(key, location, this::onSizeChanged);
+        }
+
+        @Override
+        public @NotNull List<SortColumn> getSortedColumns() {
+            return List.of();
+        }
+
+        @Override
+        public @NotNull List<String[]> getDataIndexColumns() {
+            return List.of();
+        }
+
+        @Override
+        public boolean hasDataIndex(@NotNull final String... columns) {
+            return false;
+        }
+
+        @Override
+        public @Nullable BasicDataIndex loadDataIndex(@NotNull final String... columns) {
+            return null;
+        }
+
+        @Override
+        protected void activateUnderlyingDataSource() {
+            final TableKeyImpl key = (TableKeyImpl) getTableKey();
+            final TableLocationKeyImpl location = (TableLocationKeyImpl) getKey();
+
+            final Subscription localSubscription = subscription = new Subscription();
+            final LongConsumer subscriptionFilter = newSize -> {
+                if (localSubscription != subscription) {
+                    // we've been cancelled and/or replaced
+                    return;
+                }
+
+                onSizeChanged(newSize);
+            };
+            localSubscription.cancellationCallback = backend.subscribeToTableLocationSize(
+                    key, location, subscriptionFilter, () -> activationSuccessful(localSubscription),
+                    errorString -> activationFailed(localSubscription, new TableDataException(errorString)));
+        }
+
+        @Override
+        protected void deactivateUnderlyingDataSource() {
+            final Subscription localSubscription = subscription;
+            subscription = null;
+            if (localSubscription != null) {
+                localSubscription.cancellationCallback.close();
+            }
+        }
+
+        @Override
+        protected <T> boolean matchSubscriptionToken(final T token) {
+            return token == subscription;
+        }
+
+        @Override
+        public String getImplementationName() {
+            return "PythonTableDataService.TableLocationImpl";
+        }
+    }
+
+    /**
+     * {@link ColumnLocation} implementation for TableService.
+     */
+    public class ColumnLocationImpl extends AbstractColumnLocation {
+
+        protected ColumnLocationImpl(
+                @NotNull final PythonTableDataService.TableLocationImpl tableLocation,
+                @NotNull final String name) {
+            super(tableLocation, name);
+        }
+
+        @Override
+        public boolean exists() {
+            // Schema is consistent across all column locations with the same segment ID. This implementation should be
+            // changed when/if we add support for rich schema evolution.
+            return true;
+        }
+
+        @Override
+        public ColumnRegionChar<Values> makeColumnRegionChar(
+                @NotNull final ColumnDefinition<?> columnDefinition) {
+            return new AppendOnlyFixedSizePageRegionChar<>(REGION_MASK, pageSize,
+                    new TableServiceGetRangeAdapter(columnDefinition));
+        }
+
+        @Override
+        public ColumnRegionByte<Values> makeColumnRegionByte(
+                @NotNull final ColumnDefinition<?> columnDefinition) {
+            return new AppendOnlyFixedSizePageRegionByte<>(REGION_MASK, pageSize,
+                    new TableServiceGetRangeAdapter(columnDefinition));
+        }
+
+        @Override
+        public ColumnRegionShort<Values> makeColumnRegionShort(
+                @NotNull final ColumnDefinition<?> columnDefinition) {
+            return new AppendOnlyFixedSizePageRegionShort<>(REGION_MASK, pageSize,
+                    new TableServiceGetRangeAdapter(columnDefinition));
+        }
+
+        @Override
+        public ColumnRegionInt<Values> makeColumnRegionInt(
+                @NotNull final ColumnDefinition<?> columnDefinition) {
+            return new AppendOnlyFixedSizePageRegionInt<>(REGION_MASK, pageSize,
+                    new TableServiceGetRangeAdapter(columnDefinition));
+
+        }
+
+        @Override
+        public ColumnRegionLong<Values> makeColumnRegionLong(
+                @NotNull final ColumnDefinition<?> columnDefinition) {
+            return new AppendOnlyFixedSizePageRegionLong<>(REGION_MASK, pageSize,
+                    new TableServiceGetRangeAdapter(columnDefinition));
+
+        }
+
+        @Override
+        public ColumnRegionFloat<Values> makeColumnRegionFloat(
+                @NotNull final ColumnDefinition<?> columnDefinition) {
+            return new AppendOnlyFixedSizePageRegionFloat<>(REGION_MASK, pageSize,
+                    new TableServiceGetRangeAdapter(columnDefinition));
+        }
+
+        @Override
+        public ColumnRegionDouble<Values> makeColumnRegionDouble(
+                @NotNull final ColumnDefinition<?> columnDefinition) {
+            return new AppendOnlyFixedSizePageRegionDouble<>(REGION_MASK, pageSize,
+                    new TableServiceGetRangeAdapter(columnDefinition));
+        }
+
+        @Override
+        public <TYPE> ColumnRegionObject<TYPE, Values> makeColumnRegionObject(
+                @NotNull final ColumnDefinition<TYPE> columnDefinition) {
+            return new AppendOnlyFixedSizePageRegionObject<>(REGION_MASK, pageSize,
+                    new TableServiceGetRangeAdapter(columnDefinition));
+        }
+
+        private class TableServiceGetRangeAdapter implements AppendOnlyRegionAccessor<Values> {
+            private final @NotNull ColumnDefinition<?> columnDefinition;
+
+            public TableServiceGetRangeAdapter(@NotNull ColumnDefinition<?> columnDefinition) {
+                this.columnDefinition = columnDefinition;
+            }
+
+            @Override
+            public void readChunkPage(
+                    final long firstRowPosition,
+                    final int minimumSize,
+                    @NotNull final WritableChunk<Values> destination) {
+                final TableLocationImpl location = (TableLocationImpl) getTableLocation();
+                final TableKeyImpl key = (TableKeyImpl) location.getTableKey();
+
+                final List<WritableChunk<Values>> values = backend.getColumnValues(
+                        key, (TableLocationKeyImpl) location.getKey(), columnDefinition,
+                        firstRowPosition, minimumSize, destination.capacity());
+
+                final int numRows = values.stream().mapToInt(WritableChunk::size).sum();
+
+                if (numRows < minimumSize) {
+                    throw new TableDataException(String.format("%s:%s: column_values(%s, %d, %d, %d) did not return "
+                            + "enough data. Read %d rows but expected row range was %d to %d.",
+                            key, location, columnDefinition.getName(), firstRowPosition, minimumSize,
+                            destination.capacity(), numRows, minimumSize, destination.capacity()));
+                }
+                if (numRows > destination.capacity()) {
+                    throw new TableDataException(String.format("%s:%s: column_values(%s, %d, %d, %d) returned too much "
+                            + "data. Read %d rows but maximum allowed is %d.", key, location,
+                            columnDefinition.getName(), firstRowPosition, minimumSize, destination.capacity(), numRows,
+                            destination.capacity()));
+                }
+
+                int offset = 0;
+                for (final Chunk<Values> rbChunk : values) {
+                    final int length = Math.min(destination.capacity() - offset, rbChunk.size());
+                    destination.copyFromChunk(rbChunk, 0, offset, length);
+                    offset += length;
+                }
+                destination.setSize(offset);
+            }
+
+            @Override
+            public long size() {
+                return getTableLocation().getSize();
+            }
+        }
+    }
+
+    private static class Subscription {
+        SafeCloseable cancellationCallback;
+    }
+
+    /**
+     * Helper used to simplify backend asynchronous RPC patterns for otherwise synchronous operations.
+     */
+    private static class AsyncState<T> {
+        private T result;
+        private Exception error;
+
+        public synchronized void setResult(final T result) {
+            if (this.result != null) {
+                throw new IllegalStateException("Callback can only be called once");
+            }
+            if (result == null) {
+                throw new IllegalArgumentException("Callback invoked with null result");
+            }
+            this.result = result;
+            notifyAll();
+        }
+
+        public synchronized void setError(@NotNull final Exception error) {
+            if (this.error == null) {
+                this.error = error;
+            }
+            notifyAll();
+        }
+
+        public synchronized T awaitResult(@NotNull final Function<Exception, RuntimeException> errorMapper) {
+            while (result == null && error == null) {
+                try {
+                    wait();
+                } catch (InterruptedException e) {
+                    Thread.currentThread().interrupt();
+                    throw errorMapper.apply(e);
+                }
+            }
+            if (error != null) {
+                throw errorMapper.apply(error);
+            }
+            return result;
+        }
+    }
+}
diff --git a/extensions/barrage/src/main/java/io/deephaven/extensions/barrage/util/StreamReader.java b/extensions/barrage/src/main/java/io/deephaven/extensions/barrage/util/StreamReader.java
index 93b35af0863..be389e894b6 100644
--- a/extensions/barrage/src/main/java/io/deephaven/extensions/barrage/util/StreamReader.java
+++ b/extensions/barrage/src/main/java/io/deephaven/extensions/barrage/util/StreamReader.java
@@ -18,7 +18,6 @@ public interface StreamReader {
      * Converts an InputStream to a BarrageMessage in the context of the provided parameters.
      *
      * @param options the options related to parsing this message
-     * @param expectedColumns the columns expected to appear in the stream, null implies all columns
      * @param columnChunkTypes the types to use for each column chunk
      * @param columnTypes the actual type for the column
      * @param componentTypes the actual component type for the column
@@ -26,7 +25,6 @@ public interface StreamReader {
      * @return a BarrageMessage filled out by the stream's payload
      */
     BarrageMessage safelyParseFrom(final StreamReaderOptions options,
-            BitSet expectedColumns,
             ChunkType[] columnChunkTypes,
             Class<?>[] columnTypes,
             Class<?>[] componentTypes,
diff --git a/extensions/barrage/src/main/java/io/deephaven/extensions/barrage/util/StreamReaderOptions.java b/extensions/barrage/src/main/java/io/deephaven/extensions/barrage/util/StreamReaderOptions.java
index e00d9f3c6cd..3ea7291a0e1 100644
--- a/extensions/barrage/src/main/java/io/deephaven/extensions/barrage/util/StreamReaderOptions.java
+++ b/extensions/barrage/src/main/java/io/deephaven/extensions/barrage/util/StreamReaderOptions.java
@@ -5,6 +5,7 @@
 
 import io.deephaven.extensions.barrage.ColumnConversionMode;
 import io.deephaven.util.QueryConstants;
+import io.deephaven.util.annotations.FinalDefault;
 
 public interface StreamReaderOptions {
     /**
@@ -13,9 +14,15 @@ public interface StreamReaderOptions {
     boolean useDeephavenNulls();
 
     /**
+     * @deprecated Since 0.37.0 and is marked for removal. (Note, GWT does not support encoding this context via
+     *             annotation values.)
      * @return the conversion mode to use for object columns
      */
-    ColumnConversionMode columnConversionMode();
+    @FinalDefault
+    @Deprecated
+    default ColumnConversionMode columnConversionMode() {
+        return ColumnConversionMode.Stringify;
+    }
 
     /**
      * @return the ideal number of records to send per record batch
@@ -36,4 +43,24 @@ public interface StreamReaderOptions {
     default boolean columnsAsList() {
         return false;
     }
+
+    /**
+     * The maximum length of any list / array to encode.
+     * <ul>
+     * <li>If zero, list lengths will not be limited.</li>
+     * <li>If non-zero, the server will limit the length of any encoded list / array to the absolute value of the
+     * returned length.</li>
+     * <li>If less than zero, the server will encode elements from the end of the list / array, rather than rom the
+     * beginning.</li>
+     * </ul>
+     * <p>
+     * Note: The server is unable to indicate when truncation occurs. To detect truncation request one more element than
+     * the maximum number you wish to display.
+     *
+     * @return the maximum length of any list / array to encode; zero means no limit; negative values indicate to treat
+     *         the limit as a tail instead of a head
+     */
+    default long previewListLengthLimit() {
+        return 0;
+    }
 }
diff --git a/extensions/barrage/src/main/java/io/deephaven/extensions/barrage/util/TableToArrowConverter.java b/extensions/barrage/src/main/java/io/deephaven/extensions/barrage/util/TableToArrowConverter.java
index 88cb365980c..948010a5f1d 100644
--- a/extensions/barrage/src/main/java/io/deephaven/extensions/barrage/util/TableToArrowConverter.java
+++ b/extensions/barrage/src/main/java/io/deephaven/extensions/barrage/util/TableToArrowConverter.java
@@ -7,7 +7,6 @@
 import io.deephaven.extensions.barrage.BarragePerformanceLog;
 import io.deephaven.extensions.barrage.BarrageStreamGenerator;
 import io.deephaven.extensions.barrage.BarrageStreamGeneratorImpl;
-import io.grpc.Drainable;
 import io.grpc.stub.StreamObserver;
 
 import java.io.IOException;
@@ -66,9 +65,8 @@ private static class ArrowBuilderObserver implements StreamObserver<BarrageStrea
         public void onNext(final BarrageStreamGenerator.MessageView messageView) {
             try {
                 messageView.forEachStream(inputStream -> {
-                    try (final BarrageProtoUtil.ExposedByteArrayOutputStream baos =
-                            new BarrageProtoUtil.ExposedByteArrayOutputStream()) {
-                        ((Drainable) inputStream).drainTo(baos);
+                    try (final ExposedByteArrayOutputStream baos = new ExposedByteArrayOutputStream()) {
+                        inputStream.drainTo(baos);
                         batchMessages.add(baos.toByteArray());
                         inputStream.close();
                     } catch (final IOException e) {
diff --git a/extensions/barrage/src/main/resources/io/deephaven/extensions/barrage/Barrage.gwt.xml b/extensions/barrage/src/main/resources/io/deephaven/extensions/barrage/Barrage.gwt.xml
new file mode 100644
index 00000000000..a29af5b6ca8
--- /dev/null
+++ b/extensions/barrage/src/main/resources/io/deephaven/extensions/barrage/Barrage.gwt.xml
@@ -0,0 +1,14 @@
+<module>
+    <inherits name="io.deephaven.chunk.Chunk" />
+    <inherits name="io.deephaven.engine.primitive.function.Function" />
+    <inherits name="io.grpc.Grpc" />
+    <source path="" includes="BarrageSnapshotOptions.java,BarrageSubscriptionOptions.java,ColumnConversionMode.java,ImmutableBarrageSnapshotOptions.java,ImmutableBarrageSubscriptionOptions.java,DrainableByteArrayInputStream.java" />
+    <source path="util" includes="StreamReaderOptions.java,FlatBufferIteratorAdapter.java,DefensiveDrainable.java,DefensiveCapture.java,ExposedByteArrayOutputStream.java" />
+    <source path="chunk">
+        <exclude name="vector/*" />
+        <exclude name="VectorChunkInputStreamGenerator.java" />
+        <exclude name="VectorChunkReader.java" />
+        <exclude name="DefaultChunkReadingFactory.java" />
+        <exclude name="DefaultChunkInputStreamGeneratorFactory.java" />
+    </source>
+</module>
diff --git a/extensions/barrage/src/test/java/io/deephaven/extensions/barrage/chunk/BarrageColumnRoundTripTest.java b/extensions/barrage/src/test/java/io/deephaven/extensions/barrage/chunk/BarrageColumnRoundTripTest.java
index fdda13a40bf..505fd420ec8 100644
--- a/extensions/barrage/src/test/java/io/deephaven/extensions/barrage/chunk/BarrageColumnRoundTripTest.java
+++ b/extensions/barrage/src/test/java/io/deephaven/extensions/barrage/chunk/BarrageColumnRoundTripTest.java
@@ -4,9 +4,12 @@
 package io.deephaven.extensions.barrage.chunk;
 
 import com.google.common.io.LittleEndianDataInputStream;
+import com.google.protobuf.ByteString;
 import io.deephaven.base.verify.Assert;
 import io.deephaven.chunk.attributes.Values;
 import io.deephaven.engine.rowset.RowSequence;
+import io.deephaven.engine.table.ColumnDefinition;
+import io.deephaven.engine.table.TableDefinition;
 import io.deephaven.engine.testutil.testcase.RefreshingTableTestCase;
 import io.deephaven.engine.rowset.RowSet;
 import io.deephaven.engine.rowset.RowSetBuilderSequential;
@@ -22,13 +25,19 @@
 import io.deephaven.chunk.WritableLongChunk;
 import io.deephaven.chunk.WritableObjectChunk;
 import io.deephaven.chunk.WritableShortChunk;
-import io.deephaven.extensions.barrage.util.BarrageProtoUtil;
+import io.deephaven.extensions.barrage.util.BarrageUtil;
+import io.deephaven.extensions.barrage.util.ExposedByteArrayOutputStream;
+import io.deephaven.extensions.barrage.util.StreamReaderOptions;
+import io.deephaven.proto.flight.util.SchemaHelper;
+import io.deephaven.qst.type.Type;
 import io.deephaven.util.BooleanUtils;
 import io.deephaven.util.QueryConstants;
 import io.deephaven.util.SafeCloseable;
 import io.deephaven.util.mutable.MutableInt;
 import io.deephaven.vector.LongVector;
 import io.deephaven.vector.LongVectorDirect;
+import org.apache.arrow.flatbuf.Field;
+import org.apache.arrow.flatbuf.Schema;
 import org.jetbrains.annotations.Nullable;
 
 import java.io.ByteArrayInputStream;
@@ -39,11 +48,16 @@
 import java.time.LocalTime;
 import java.util.ArrayList;
 import java.util.Arrays;
+import java.util.Collections;
+import java.util.Iterator;
+import java.util.PrimitiveIterator;
 import java.util.Random;
 import java.util.function.Consumer;
 import java.util.function.IntFunction;
 import java.util.stream.LongStream;
 
+import static io.deephaven.extensions.barrage.chunk.ChunkReader.typeInfo;
+
 public class BarrageColumnRoundTripTest extends RefreshingTableTestCase {
 
     private static final BarrageSubscriptionOptions OPT_DEFAULT_DH_NULLS =
@@ -58,6 +72,23 @@ public class BarrageColumnRoundTripTest extends RefreshingTableTestCase {
             OPT_DEFAULT
     };
 
+    private static WritableChunk<Values> readChunk(
+            final StreamReaderOptions options,
+            final ChunkType chunkType,
+            final Class<?> type,
+            final Class<?> componentType,
+            final Field field,
+            final Iterator<ChunkInputStreamGenerator.FieldNodeInfo> fieldNodeIter,
+            final PrimitiveIterator.OfLong bufferInfoIter,
+            final DataInput is,
+            final WritableChunk<Values> outChunk,
+            final int offset,
+            final int totalRows) throws IOException {
+        return DefaultChunkReadingFactory.INSTANCE
+                .getReader(options, typeInfo(chunkType, type, componentType, field))
+                .readChunk(fieldNodeIter, bufferInfoIter, is, outChunk, offset, totalRows);
+    }
+
     public void testCharChunkSerialization() throws IOException {
         final Random random = new Random(0);
         for (final BarrageSubscriptionOptions opts : options) {
@@ -637,6 +668,10 @@ private static <T> void testRoundTripSerialization(
         } else {
             chunkType = ChunkType.fromElementType(type);
         }
+        ByteString schemaBytes = BarrageUtil.schemaBytesFromTableDefinition(
+                TableDefinition.of(ColumnDefinition.of("col", Type.find(type))), Collections.emptyMap(), false);
+        Schema schema = SchemaHelper.flatbufSchema(schemaBytes.asReadOnlyByteBuffer());
+        Field field = schema.fields(0);
 
         final WritableChunk<Values> srcData = chunkType.makeWritableChunk(4096);
         initData.accept(srcData);
@@ -646,13 +681,11 @@ private static <T> void testRoundTripSerialization(
         data.copyFromChunk(srcData, 0, 0, srcData.size());
 
         try (SafeCloseable ignored = data;
-                ChunkInputStreamGenerator generator = ChunkInputStreamGenerator.makeInputStreamGenerator(
-                        chunkType, type, type.getComponentType(), srcData, 0)) {
+                ChunkInputStreamGenerator generator = DefaultChunkInputStreamGeneratorFactory.INSTANCE
+                        .makeInputStreamGenerator(chunkType, type, type.getComponentType(), srcData, 0)) {
             // full sub logic
-            try (final BarrageProtoUtil.ExposedByteArrayOutputStream baos =
-                    new BarrageProtoUtil.ExposedByteArrayOutputStream();
-                    final ChunkInputStreamGenerator.DrainableColumn column =
-                            generator.getInputStream(options, null)) {
+            try (final ExposedByteArrayOutputStream baos = new ExposedByteArrayOutputStream();
+                    final ChunkInputStreamGenerator.DrainableColumn column = generator.getInputStream(options, null)) {
 
 
                 final ArrayList<ChunkInputStreamGenerator.FieldNodeInfo> fieldNodes = new ArrayList<>();
@@ -663,19 +696,15 @@ private static <T> void testRoundTripSerialization(
                 column.drainTo(baos);
                 final DataInput dis =
                         new LittleEndianDataInputStream(new ByteArrayInputStream(baos.peekBuffer(), 0, baos.size()));
-                try (final WritableChunk<Values> rtData =
-                        ChunkInputStreamGenerator.extractChunkFromInputStream(options,
-                                chunkType, type, type.getComponentType(), fieldNodes.iterator(),
-                                bufferNodes.build().iterator(),
-                                dis, null, 0, 0)) {
+                try (final WritableChunk<Values> rtData = readChunk(options, chunkType, type, type.getComponentType(),
+                        field, fieldNodes.iterator(), bufferNodes.build().iterator(), dis, null, 0, 0)) {
                     Assert.eq(data.size(), "data.size()", rtData.size(), "rtData.size()");
                     validator.assertExpected(data, rtData, null, 0);
                 }
             }
 
             // empty subset
-            try (final BarrageProtoUtil.ExposedByteArrayOutputStream baos =
-                    new BarrageProtoUtil.ExposedByteArrayOutputStream();
+            try (final ExposedByteArrayOutputStream baos = new ExposedByteArrayOutputStream();
                     final ChunkInputStreamGenerator.DrainableColumn column =
                             generator.getInputStream(options, RowSetFactory.empty())) {
 
@@ -687,11 +716,8 @@ private static <T> void testRoundTripSerialization(
                 column.drainTo(baos);
                 final DataInput dis =
                         new LittleEndianDataInputStream(new ByteArrayInputStream(baos.peekBuffer(), 0, baos.size()));
-                try (final WritableChunk<Values> rtData =
-                        ChunkInputStreamGenerator.extractChunkFromInputStream(options,
-                                chunkType, type, type.getComponentType(), fieldNodes.iterator(),
-                                bufferNodes.build().iterator(),
-                                dis, null, 0, 0)) {
+                try (final WritableChunk<Values> rtData = readChunk(options, chunkType, type, type.getComponentType(),
+                        field, fieldNodes.iterator(), bufferNodes.build().iterator(), dis, null, 0, 0)) {
                     Assert.eq(rtData.size(), "rtData.size()", 0);
                 }
             }
@@ -704,8 +730,7 @@ private static <T> void testRoundTripSerialization(
                     builder.appendKey(i);
                 }
             }
-            try (final BarrageProtoUtil.ExposedByteArrayOutputStream baos =
-                    new BarrageProtoUtil.ExposedByteArrayOutputStream();
+            try (final ExposedByteArrayOutputStream baos = new ExposedByteArrayOutputStream();
                     final RowSet subset = builder.build();
                     final ChunkInputStreamGenerator.DrainableColumn column =
                             generator.getInputStream(options, subset)) {
@@ -718,19 +743,15 @@ private static <T> void testRoundTripSerialization(
                 column.drainTo(baos);
                 final DataInput dis =
                         new LittleEndianDataInputStream(new ByteArrayInputStream(baos.peekBuffer(), 0, baos.size()));
-                try (final WritableChunk<Values> rtData =
-                        ChunkInputStreamGenerator.extractChunkFromInputStream(options,
-                                chunkType, type, type.getComponentType(), fieldNodes.iterator(),
-                                bufferNodes.build().iterator(),
-                                dis, null, 0, 0)) {
+                try (final WritableChunk<Values> rtData = readChunk(options, chunkType, type, type.getComponentType(),
+                        field, fieldNodes.iterator(), bufferNodes.build().iterator(), dis, null, 0, 0)) {
                     Assert.eq(subset.intSize(), "subset.intSize()", rtData.size(), "rtData.size()");
                     validator.assertExpected(data, rtData, subset, 0);
                 }
             }
 
             // test append to existing chunk logic
-            try (final BarrageProtoUtil.ExposedByteArrayOutputStream baos =
-                    new BarrageProtoUtil.ExposedByteArrayOutputStream();
+            try (final ExposedByteArrayOutputStream baos = new ExposedByteArrayOutputStream();
                     final ChunkInputStreamGenerator.DrainableColumn column =
                             generator.getInputStream(options, null)) {
 
@@ -745,19 +766,15 @@ private static <T> void testRoundTripSerialization(
                 // first message
                 DataInput dis = new LittleEndianDataInputStream(
                         new ByteArrayInputStream(baos.peekBuffer(), 0, baos.size()));
-                try (final WritableChunk<Values> rtData =
-                        ChunkInputStreamGenerator.extractChunkFromInputStream(options,
-                                chunkType, type, type.getComponentType(), fieldNodes.iterator(),
-                                Arrays.stream(buffers).iterator(),
-                                dis, null, 0, data.size() * 2)) {
+                try (final WritableChunk<Values> rtData = readChunk(options, chunkType, type, type.getComponentType(),
+                        field, fieldNodes.iterator(), Arrays.stream(buffers).iterator(), dis, null, 0,
+                        data.size() * 2)) {
                     // second message
                     dis = new LittleEndianDataInputStream(
                             new ByteArrayInputStream(baos.peekBuffer(), 0, baos.size()));
-                    final WritableChunk<Values> rtData2 =
-                            ChunkInputStreamGenerator.extractChunkFromInputStream(options,
-                                    chunkType, type, type.getComponentType(), fieldNodes.iterator(),
-                                    Arrays.stream(buffers).iterator(),
-                                    dis, rtData, data.size(), data.size() * 2);
+                    final WritableChunk<Values> rtData2 = readChunk(options, chunkType, type, type.getComponentType(),
+                            field, fieldNodes.iterator(), Arrays.stream(buffers).iterator(), dis, rtData, data.size(),
+                            data.size() * 2);
                     Assert.eq(rtData, "rtData", rtData2, "rtData2");
                     validator.assertExpected(data, rtData, null, 0);
                     validator.assertExpected(data, rtData, null, data.size());
diff --git a/extensions/barrage/src/test/java/io/deephaven/extensions/barrage/util/ArrowIpcUtilTest.java b/extensions/barrage/src/test/java/io/deephaven/extensions/barrage/util/ArrowIpcUtilTest.java
new file mode 100644
index 00000000000..8c8781ab20a
--- /dev/null
+++ b/extensions/barrage/src/test/java/io/deephaven/extensions/barrage/util/ArrowIpcUtilTest.java
@@ -0,0 +1,44 @@
+//
+// Copyright (c) 2016-2024 Deephaven Data Labs and Patent Pending
+//
+package io.deephaven.extensions.barrage.util;
+
+import org.apache.arrow.vector.types.Types;
+import org.apache.arrow.vector.types.pojo.Field;
+import org.apache.arrow.vector.types.pojo.FieldType;
+import org.apache.arrow.vector.types.pojo.Schema;
+import org.junit.Test;
+
+import java.io.ByteArrayOutputStream;
+import java.io.IOException;
+import java.util.List;
+import java.util.Map;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+public class ArrowIpcUtilTest {
+
+    public static final Field FOO = new Field("Foo", FieldType.nullable(Types.MinorType.INT.getType()), null);
+    public static final Field BAR = new Field("Bar", FieldType.notNullable(Types.MinorType.INT.getType()), null);
+    public static final Field BAZ = new Field("Baz",
+            new FieldType(true, Types.MinorType.VARCHAR.getType(), null, Map.of("k1", "v1", "k2", "v2")), null);
+
+    private static final Schema SCHEMA_1 = new Schema(List.of(FOO, BAR, BAZ));
+    private static final Schema SCHEMA_2 =
+            new Schema(List.of(FOO, BAR, BAZ), Map.of("key1", "value1", "key2", "value2"));
+
+    @Test
+    public void testSchemas() throws IOException {
+        verifySerDeser(SCHEMA_1);
+        verifySerDeser(SCHEMA_2);
+    }
+
+    // A bit circular, but better than nothing.
+    public static void verifySerDeser(Schema schema) throws IOException {
+        final ByteArrayOutputStream baos = new ByteArrayOutputStream();
+        final long length = ArrowIpcUtil.serialize(baos, schema);
+        assertThat(length).isEqualTo(baos.size());
+        Schema deserialized = ArrowIpcUtil.deserialize(baos.toByteArray(), 0, (int) length);
+        assertThat(deserialized).isEqualTo(schema);
+    }
+}
diff --git a/extensions/bson-jackson/build.gradle b/extensions/bson-jackson/build.gradle
index 660ef1b207f..0b66ea6ca7d 100644
--- a/extensions/bson-jackson/build.gradle
+++ b/extensions/bson-jackson/build.gradle
@@ -6,16 +6,19 @@ plugins {
 dependencies {
     api project(':extensions-json-jackson')
     api project(':engine-processor')
-    api 'de.undercouch:bson4jackson:2.15.1'
+    api libs.undercouch.bson4jackson
 
-    Classpaths.inheritImmutables(project)
-    compileOnly 'com.google.code.findbugs:jsr305:3.0.2'
+    compileOnly project(':util-immutables')
+    annotationProcessor libs.immutables.value
 
-    Classpaths.inheritJacksonPlatform(project, 'testImplementation')
-    Classpaths.inheritJUnitPlatform(project)
-    Classpaths.inheritAssertJ(project)
-    testImplementation 'org.junit.jupiter:junit-jupiter'
-    testImplementation 'com.fasterxml.jackson.core:jackson-databind'
+    compileOnly libs.google.findbugs.jsr305
+
+    testImplementation platform(libs.jackson.bom)
+    testImplementation libs.jackson.databind
+
+    testImplementation libs.assertj
+    testImplementation platform(libs.junit.bom)
+    testImplementation libs.junit.jupiter
 }
 
 test {
diff --git a/extensions/classgraph/build.gradle b/extensions/classgraph/build.gradle
index be3aec5d81c..4f165a5d69e 100644
--- a/extensions/classgraph/build.gradle
+++ b/extensions/classgraph/build.gradle
@@ -7,9 +7,10 @@ dependencies {
   compileOnly project(':engine-table')
   compileOnly project(':Util')
 
-  compileOnly 'javax.inject:javax.inject:1'
+  compileOnly libs.javax.inject
 
-  api 'io.github.classgraph:classgraph:4.8.154'
+  api libs.classgraph
 
-  Classpaths.inheritAutoService(project)
+  compileOnly libs.autoservice
+  annotationProcessor libs.autoservice.compiler
 }
diff --git a/extensions/csv/build.gradle b/extensions/csv/build.gradle
index a1d85bcbf62..38b4b7a8f9f 100644
--- a/extensions/csv/build.gradle
+++ b/extensions/csv/build.gradle
@@ -7,28 +7,29 @@ description 'CSV: Support to read and write engine tables from/to CSV'
 
 dependencies {
     api project(':engine-api')
-    api 'io.deephaven:deephaven-csv:0.12.0'
-    runtimeOnly 'io.deephaven:deephaven-csv-fast-double-parser:0.12.0'
+    api libs.deephaven.csv
+    runtimeOnly libs.deephaven.csv.fast.double.parser
 
     implementation project(':engine-table')
     implementation project(':engine-base')
-    implementation depTrove3
+    implementation libs.trove
 
-    Classpaths.inheritImmutables(project)
+    compileOnly project(':util-immutables')
+    annotationProcessor libs.immutables.value
 
-    Classpaths.inheritJUnitPlatform(project)
-    Classpaths.inheritAssertJ(project)
+    testImplementation platform(libs.junit.bom)
+    testImplementation libs.assertj
 
-    testImplementation depCommonsCompress
-    testImplementation depCommonsIo
+    testImplementation libs.commons.compress
+    testImplementation libs.commons.io
     testImplementation project(':engine-test-utils')
 
-    Classpaths.inheritJUnitClassic(project, 'testImplementation')
+    testImplementation libs.junit4
 
     testRuntimeOnly project(':log-to-slf4j'),
             project(path: ':configs'),
             project(path: ':test-configs')
-    Classpaths.inheritSlf4j(project, 'slf4j-simple', 'testRuntimeOnly')
+    testRuntimeOnly libs.slf4j.simple
 }
 
 TestTools.addEngineOutOfBandTest(project)
diff --git a/extensions/csv/src/main/java/io/deephaven/csv/CsvTools.java b/extensions/csv/src/main/java/io/deephaven/csv/CsvTools.java
index 9b52b133e14..b6aa66ec0a2 100644
--- a/extensions/csv/src/main/java/io/deephaven/csv/CsvTools.java
+++ b/extensions/csv/src/main/java/io/deephaven/csv/CsvTools.java
@@ -17,7 +17,6 @@
 import io.deephaven.csv.sinks.Source;
 import io.deephaven.csv.tokenization.Tokenizer.CustomTimeZoneParser;
 import io.deephaven.csv.util.CsvReaderException;
-import io.deephaven.datastructures.util.CollectionUtil;
 import io.deephaven.engine.rowset.RowSequence;
 import io.deephaven.engine.rowset.RowSequenceFactory;
 import io.deephaven.engine.rowset.RowSet;
@@ -527,7 +526,7 @@ public static void writeCsv(Table[] sources, String destPath, boolean compressed
 
         if (columns.length == 0) {
             List<String> columnNames = sources[0].getDefinition().getColumnNames();
-            columns = columnNames.toArray(CollectionUtil.ZERO_LENGTH_STRING_ARRAY);
+            columns = columnNames.toArray(String[]::new);
         }
 
         writeCsvHeader(out, fieldSeparator, columns);
@@ -641,7 +640,7 @@ public static void writeCsv(Table source, Writer out, ZoneId timeZone,
 
         if (columns == null || columns.length == 0) {
             List<String> columnNames = source.getDefinition().getColumnNames();
-            columns = columnNames.toArray(CollectionUtil.ZERO_LENGTH_STRING_ARRAY);
+            columns = columnNames.toArray(String[]::new);
         }
 
         writeCsvHeader(out, separator, columns);
diff --git a/extensions/flight-sql/README.md b/extensions/flight-sql/README.md
new file mode 100644
index 00000000000..9f5c3e54907
--- /dev/null
+++ b/extensions/flight-sql/README.md
@@ -0,0 +1,24 @@
+# Flight SQL
+
+See [FlightSqlResolver](src/main/java/io/deephaven/server/flightsql/FlightSqlResolver.java) for documentation on
+Deephaven's Flight SQL service.
+
+## Client
+
+The Flight SQL client is simple constructed based on the underlying Flight client.
+
+```java
+FlightClient flightClient = ...;
+FlightSqlClient flightSqlClient = new FlightSqlClient(flightClient);
+```
+
+## JDBC
+
+The default Flight SQL JDBC driver uses cookie authorization; by default, this is not enabled on the Deephaven server.
+To enable this, the request header "x-deephaven-auth-cookie-request" must be set to "true".
+
+Example JDBC connection string to self-signed TLS:
+
+```
+jdbc:arrow-flight-sql://localhost:8443/?Authorization=Anonymous&useEncryption=1&disableCertificateVerification=1&x-deephaven-auth-cookie-request=true
+```
diff --git a/extensions/flight-sql/build.gradle b/extensions/flight-sql/build.gradle
new file mode 100644
index 00000000000..3c4e155e411
--- /dev/null
+++ b/extensions/flight-sql/build.gradle
@@ -0,0 +1,78 @@
+plugins {
+    id 'java-library'
+    id 'io.deephaven.project.register'
+}
+
+description = 'The Deephaven Flight SQL library'
+
+sourceSets {
+    jdbcTest {
+        compileClasspath += sourceSets.main.output
+        runtimeClasspath += sourceSets.main.output
+    }
+}
+
+configurations {
+    jdbcTestImplementation.extendsFrom implementation
+    jdbcTestRuntimeOnly.extendsFrom runtimeOnly
+}
+
+dependencies {
+    api project(':server')
+    implementation project(':sql')
+    implementation project(':engine-sql')
+    // :sql does not expose calcite as a dependency (maybe it should?); in the meantime, we want to make sure we can
+    // provide reasonable error messages to the client
+    implementation libs.calcite.core
+
+    implementation libs.dagger
+    implementation libs.arrow.flight.sql
+
+    // FlightSqlClient testing does not depend on a public port being bound (ie, does not require server-jetty) because
+    // it can use io.grpc.inprocess.InProcessChannelBuilder (via io.deephaven.server.runner.ServerBuilderInProcessModule).
+
+    testImplementation project(':authorization')
+    testImplementation project(':server-test-utils')
+    testAnnotationProcessor libs.dagger.compiler
+    testImplementation libs.assertj
+    testImplementation platform(libs.junit.bom)
+    testImplementation libs.junit.jupiter
+    testRuntimeOnly libs.junit.platform.launcher
+    testRuntimeOnly libs.junit.vintage.engine
+    testRuntimeOnly project(':log-to-slf4j')
+    testRuntimeOnly libs.slf4j.simple
+
+    // JDBC testing needs an actually server instance bound to a port because it can only connect over JDBC URIs like
+    // jdbc:arrow-flight-sql://localhost:1000.
+    jdbcTestImplementation project(':server-jetty')
+    jdbcTestRuntimeOnly libs.arrow.flight.sql.jdbc
+
+    jdbcTestImplementation project(':server-test-utils')
+    jdbcTestAnnotationProcessor libs.dagger.compiler
+    jdbcTestImplementation libs.assertj
+    jdbcTestImplementation platform(libs.junit.bom)
+    jdbcTestImplementation libs.junit.jupiter
+    jdbcTestRuntimeOnly libs.junit.platform.launcher
+    jdbcTestRuntimeOnly libs.junit.vintage.engine
+    jdbcTestRuntimeOnly project(':log-to-slf4j')
+    jdbcTestRuntimeOnly libs.slf4j.simple
+}
+
+test {
+    useJUnitPlatform()
+}
+
+def jdbcTest = tasks.register('jdbcTest', Test) {
+    description = 'Runs JDBC tests.'
+    group = 'verification'
+
+    testClassesDirs = sourceSets.jdbcTest.output.classesDirs
+    classpath = sourceSets.jdbcTest.runtimeClasspath
+    shouldRunAfter test
+
+    useJUnitPlatform()
+}
+
+check.dependsOn jdbcTest
+
+apply plugin: 'io.deephaven.java-open-nio'
diff --git a/extensions/flight-sql/gradle.properties b/extensions/flight-sql/gradle.properties
new file mode 100644
index 00000000000..c186bbfdde1
--- /dev/null
+++ b/extensions/flight-sql/gradle.properties
@@ -0,0 +1 @@
+io.deephaven.project.ProjectType=JAVA_PUBLIC
diff --git a/extensions/flight-sql/src/jdbcTest/java/io/deephaven/server/DeephavenServerTestBase.java b/extensions/flight-sql/src/jdbcTest/java/io/deephaven/server/DeephavenServerTestBase.java
new file mode 100644
index 00000000000..76458d91a57
--- /dev/null
+++ b/extensions/flight-sql/src/jdbcTest/java/io/deephaven/server/DeephavenServerTestBase.java
@@ -0,0 +1,62 @@
+//
+// Copyright (c) 2016-2024 Deephaven Data Labs and Patent Pending
+//
+package io.deephaven.server;
+
+import io.deephaven.engine.context.ExecutionContext;
+import io.deephaven.io.logger.LogBuffer;
+import io.deephaven.io.logger.LogBufferGlobal;
+import io.deephaven.server.runner.GrpcServer;
+import io.deephaven.server.runner.MainHelper;
+import io.deephaven.util.SafeCloseable;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Timeout;
+
+import java.io.IOException;
+import java.util.concurrent.TimeUnit;
+
+@Timeout(30)
+public abstract class DeephavenServerTestBase {
+
+    public interface TestComponent {
+
+        GrpcServer server();
+
+        ExecutionContext executionContext();
+    }
+
+    protected TestComponent component;
+
+    private LogBuffer logBuffer;
+    private SafeCloseable executionContext;
+    private GrpcServer server;
+    protected int localPort;
+
+    protected abstract TestComponent component();
+
+    @BeforeAll
+    static void setupOnce() throws IOException {
+        MainHelper.bootstrapProjectDirectories();
+    }
+
+    @BeforeEach
+    void setup() throws IOException {
+        logBuffer = new LogBuffer(128);
+        LogBufferGlobal.setInstance(logBuffer);
+        component = component();
+        executionContext = component.executionContext().open();
+        server = component.server();
+        server.start();
+        localPort = server.getPort();
+    }
+
+    @AfterEach
+    void tearDown() throws InterruptedException {
+        server.stopWithTimeout(10, TimeUnit.SECONDS);
+        server.join();
+        executionContext.close();
+        LogBufferGlobal.clear(logBuffer);
+    }
+}
diff --git a/extensions/flight-sql/src/jdbcTest/java/io/deephaven/server/flightsql/FlightSqlJdbcTestBase.java b/extensions/flight-sql/src/jdbcTest/java/io/deephaven/server/flightsql/FlightSqlJdbcTestBase.java
new file mode 100644
index 00000000000..0c5c4993edb
--- /dev/null
+++ b/extensions/flight-sql/src/jdbcTest/java/io/deephaven/server/flightsql/FlightSqlJdbcTestBase.java
@@ -0,0 +1,175 @@
+//
+// Copyright (c) 2016-2024 Deephaven Data Labs and Patent Pending
+//
+package io.deephaven.server.flightsql;
+
+import io.deephaven.server.DeephavenServerTestBase;
+import org.junit.jupiter.api.Test;
+
+import java.sql.Connection;
+import java.sql.DriverManager;
+import java.sql.PreparedStatement;
+import java.sql.ResultSet;
+import java.sql.ResultSetMetaData;
+import java.sql.SQLException;
+import java.sql.Statement;
+
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.assertj.core.api.Assertions.failBecauseExceptionWasNotThrown;
+
+public abstract class FlightSqlJdbcTestBase extends DeephavenServerTestBase {
+
+    private String jdbcUrl(boolean requestCookie) {
+        return String.format(
+                "jdbc:arrow-flight-sql://localhost:%d/?Authorization=Anonymous&useEncryption=false%s",
+                localPort,
+                (requestCookie ? "&x-deephaven-auth-cookie-request=true" : ""));
+    }
+
+    private Connection connect(boolean requestCookie) throws SQLException {
+        return DriverManager.getConnection(jdbcUrl(requestCookie));
+    }
+
+    @Test
+    void execute() throws SQLException {
+        try (
+                final Connection connection = connect(true);
+                final Statement statement = connection.createStatement()) {
+            if (statement.execute("SELECT 1 as Foo, 2 as Bar")) {
+                consume(statement.getResultSet(), 2, 1);
+            }
+        }
+    }
+
+    @Test
+    void executeQuery() throws SQLException {
+        try (
+                final Connection connection = connect(true);
+                final Statement statement = connection.createStatement()) {
+            consume(statement.executeQuery("SELECT 1 as Foo, 2 as Bar"), 2, 1);
+        }
+    }
+
+    @Test
+    void executeUpdate() throws SQLException {
+        try (
+                final Connection connection = connect(true);
+                final Statement statement = connection.createStatement()) {
+            try {
+                statement.executeUpdate("INSERT INTO fake(name) VALUES('Smith')");
+                failBecauseExceptionWasNotThrown(SQLException.class);
+            } catch (SQLException e) {
+                assertThat((Throwable) e).getRootCause()
+                        .hasMessageContaining("Object 'fake' not found");
+            }
+        }
+    }
+
+    @Test
+    void preparedExecute() throws SQLException {
+        try (
+                final Connection connection = connect(true);
+                final PreparedStatement preparedStatement = connection.prepareStatement("SELECT 1 as Foo, 2 as Bar")) {
+            if (preparedStatement.execute()) {
+                consume(preparedStatement.getResultSet(), 2, 1);
+            }
+            consume(preparedStatement.executeQuery(), 2, 1);
+            try {
+                preparedStatement.executeUpdate();
+                failBecauseExceptionWasNotThrown(SQLException.class);
+            } catch (SQLException e) {
+                assertThat((Throwable) e).getRootCause()
+                        .hasMessageContaining("Flight SQL descriptors cannot be published to");
+            }
+        }
+    }
+
+    @Test
+    void preparedExecuteQuery() throws SQLException {
+        try (
+                final Connection connection = connect(true);
+                final PreparedStatement preparedStatement = connection.prepareStatement("SELECT 1 as Foo, 2 as Bar")) {
+            consume(preparedStatement.executeQuery(), 2, 1);
+        }
+    }
+
+    @Test
+    void preparedUpdate() throws SQLException {
+        try (
+                final Connection connection = connect(true);
+                final PreparedStatement preparedStatement =
+                        connection.prepareStatement("INSERT INTO fake(name) VALUES('Smith')")) {
+            try {
+                preparedStatement.executeUpdate();
+                failBecauseExceptionWasNotThrown(SQLException.class);
+            } catch (SQLException e) {
+                assertThat((Throwable) e).getRootCause()
+                        .hasMessageContaining("Flight SQL descriptors cannot be published to");
+            }
+        }
+    }
+
+    @Test
+    void executeQueryNoCookie() throws SQLException {
+        try (final Connection connection = connect(false)) {
+            final Statement statement = connection.createStatement();
+            try {
+                statement.executeQuery("SELECT 1 as Foo, 2 as Bar");
+                failBecauseExceptionWasNotThrown(SQLException.class);
+            } catch (SQLException e) {
+                assertThat((Throwable) e).getRootCause()
+                        .hasMessageContaining(
+                                "Flight SQL: Must use the original session; is the client echoing the authentication token properly?");
+            }
+            try {
+                statement.close();
+                failBecauseExceptionWasNotThrown(SQLException.class);
+            } catch (SQLException e) {
+                assertThat((Throwable) e).getRootCause()
+                        .hasMessageContaining(
+                                "Flight SQL: Must use the original session; is the client echoing the authentication token properly?");
+            }
+        }
+    }
+
+    @Test
+    void preparedExecuteQueryNoCookie() throws SQLException {
+        try (final Connection connection = connect(false)) {
+            final PreparedStatement preparedStatement = connection.prepareStatement("SELECT 1 as Foo, 2 as Bar");
+            try {
+                preparedStatement.executeQuery();
+                failBecauseExceptionWasNotThrown(SQLException.class);
+            } catch (RuntimeException e) {
+                assertHelpfulClientErrorMessage(e);
+            }
+            // If our authentication is bad, we won't be able to close the prepared statement either. If we want to
+            // solve for this scenario, we would probably need to use randomized handles for the prepared statements
+            // (instead of incrementing handle ids).
+            try {
+                preparedStatement.close();
+                failBecauseExceptionWasNotThrown(RuntimeException.class);
+            } catch (RuntimeException e) {
+                assertHelpfulClientErrorMessage(e);
+            }
+        }
+    }
+
+    private static void assertHelpfulClientErrorMessage(RuntimeException e) {
+        // Note: this is arguably a JDBC implementation bug; it should be throwing java.sql.SQLException, but it's
+        // exposing shadowed internal error from Flight.
+        assertThat(e.getClass().getName()).isEqualTo(
+                "org.apache.arrow.driver.jdbc.shaded.org.apache.arrow.flight.FlightRuntimeException");
+        assertThat(e).hasMessageContaining(
+                "Flight SQL: Must use the original session; is the client echoing the authentication token properly?");
+    }
+
+    private static void consume(ResultSet rs, int numCols, int numRows) throws SQLException {
+        final ResultSetMetaData rsmd = rs.getMetaData();
+        assertThat(rsmd.getColumnCount()).isEqualTo(numCols);
+        int rows = 0;
+        while (rs.next()) {
+            ++rows;
+        }
+        assertThat(rows).isEqualTo(numRows);
+    }
+}
diff --git a/extensions/flight-sql/src/jdbcTest/java/io/deephaven/server/flightsql/FlightSqlJdbcUnauthenticatedTestBase.java b/extensions/flight-sql/src/jdbcTest/java/io/deephaven/server/flightsql/FlightSqlJdbcUnauthenticatedTestBase.java
new file mode 100644
index 00000000000..746949cd4cd
--- /dev/null
+++ b/extensions/flight-sql/src/jdbcTest/java/io/deephaven/server/flightsql/FlightSqlJdbcUnauthenticatedTestBase.java
@@ -0,0 +1,89 @@
+//
+// Copyright (c) 2016-2024 Deephaven Data Labs and Patent Pending
+//
+package io.deephaven.server.flightsql;
+
+import io.deephaven.server.DeephavenServerTestBase;
+import org.junit.jupiter.api.Test;
+
+import java.sql.Connection;
+import java.sql.DriverManager;
+import java.sql.SQLException;
+import java.sql.Statement;
+
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.assertj.core.api.Assertions.failBecauseExceptionWasNotThrown;
+
+public abstract class FlightSqlJdbcUnauthenticatedTestBase extends DeephavenServerTestBase {
+    private String jdbcUrl() {
+        return String.format(
+                "jdbc:arrow-flight-sql://localhost:%d/?useEncryption=false",
+                localPort);
+    }
+
+    private Connection connect() throws SQLException {
+        return DriverManager.getConnection(jdbcUrl());
+    }
+
+    @Test
+    void executeQuery() throws SQLException {
+        // uses prepared statement internally
+        try (
+                final Connection connection = connect();
+                final Statement statement = connection.createStatement()) {
+            try {
+                statement.executeQuery("SELECT 1 as Foo, 2 as Bar");
+                failBecauseExceptionWasNotThrown(SQLException.class);
+            } catch (SQLException e) {
+                unauthenticated(e);
+            }
+        }
+    }
+
+    @Test
+    void execute() throws SQLException {
+        // uses prepared statement internally
+        try (
+                final Connection connection = connect();
+                final Statement statement = connection.createStatement()) {
+            try {
+                statement.execute("SELECT 1 as Foo, 2 as Bar");
+                failBecauseExceptionWasNotThrown(SQLException.class);
+            } catch (SQLException e) {
+                unauthenticated(e);
+            }
+        }
+    }
+
+    @Test
+    void executeUpdate() throws SQLException {
+        // uses prepared statement internally
+        try (
+                final Connection connection = connect();
+                final Statement statement = connection.createStatement()) {
+            try {
+                statement.executeUpdate("INSERT INTO fake(name) VALUES('Smith')");
+                failBecauseExceptionWasNotThrown(SQLException.class);
+            } catch (SQLException e) {
+                unauthenticated(e);
+            }
+        }
+    }
+
+    @Test
+    void prepareStatement() throws SQLException {
+        try (
+                final Connection connection = connect()) {
+            try {
+                connection.prepareStatement("SELECT 1");
+            } catch (SQLException e) {
+                unauthenticated(e);
+            }
+        }
+    }
+
+    private static void unauthenticated(SQLException e) {
+        assertThat((Throwable) e).getRootCause()
+                .hasMessageContaining("Flight SQL: Must be authenticated");
+    }
+}
diff --git a/extensions/flight-sql/src/jdbcTest/java/io/deephaven/server/flightsql/FlightSqlTestModule.java b/extensions/flight-sql/src/jdbcTest/java/io/deephaven/server/flightsql/FlightSqlTestModule.java
new file mode 100644
index 00000000000..203b2863784
--- /dev/null
+++ b/extensions/flight-sql/src/jdbcTest/java/io/deephaven/server/flightsql/FlightSqlTestModule.java
@@ -0,0 +1,124 @@
+//
+// Copyright (c) 2016-2024 Deephaven Data Labs and Patent Pending
+//
+package io.deephaven.server.flightsql;
+
+import dagger.Module;
+import dagger.Provides;
+import dagger.multibindings.IntoSet;
+import io.deephaven.base.clock.Clock;
+import io.deephaven.engine.context.ExecutionContext;
+import io.deephaven.engine.updategraph.OperationInitializer;
+import io.deephaven.engine.updategraph.UpdateGraph;
+import io.deephaven.engine.util.AbstractScriptSession;
+import io.deephaven.engine.util.NoLanguageDeephavenSession;
+import io.deephaven.engine.util.ScriptSession;
+import io.deephaven.server.arrow.ArrowModule;
+import io.deephaven.server.auth.AuthorizationProvider;
+import io.deephaven.server.config.ConfigServiceModule;
+import io.deephaven.server.console.ConsoleModule;
+import io.deephaven.server.log.LogModule;
+import io.deephaven.server.plugin.PluginsModule;
+import io.deephaven.server.session.ExportTicketResolver;
+import io.deephaven.server.session.ObfuscatingErrorTransformerModule;
+import io.deephaven.server.session.SessionModule;
+import io.deephaven.server.session.TicketResolver;
+import io.deephaven.server.table.TableModule;
+import io.deephaven.server.test.TestAuthModule;
+import io.deephaven.server.test.TestAuthorizationProvider;
+import io.deephaven.server.util.Scheduler;
+import org.jetbrains.annotations.Nullable;
+
+import javax.inject.Named;
+import javax.inject.Singleton;
+import java.util.concurrent.Executors;
+import java.util.concurrent.ScheduledExecutorService;
+
+@Module(includes = {
+        ArrowModule.class,
+        ConfigServiceModule.class,
+        ConsoleModule.class,
+        LogModule.class,
+        SessionModule.class,
+        TableModule.class,
+        TestAuthModule.class,
+        ObfuscatingErrorTransformerModule.class,
+        PluginsModule.class,
+        FlightSqlModule.class
+})
+public class FlightSqlTestModule {
+    @IntoSet
+    @Provides
+    TicketResolver ticketResolver(ExportTicketResolver resolver) {
+        return resolver;
+    }
+
+    @Singleton
+    @Provides
+    AbstractScriptSession<?> provideAbstractScriptSession(
+            final UpdateGraph updateGraph,
+            final OperationInitializer operationInitializer) {
+        return new NoLanguageDeephavenSession(
+                updateGraph, operationInitializer, "non-script-session");
+    }
+
+    @Provides
+    ScriptSession provideScriptSession(AbstractScriptSession<?> scriptSession) {
+        return scriptSession;
+    }
+
+    @Provides
+    @Singleton
+    ScheduledExecutorService provideExecutorService() {
+        return Executors.newScheduledThreadPool(1);
+    }
+
+    @Provides
+    Scheduler provideScheduler(ScheduledExecutorService concurrentExecutor) {
+        return new Scheduler.DelegatingImpl(
+                Executors.newSingleThreadExecutor(),
+                concurrentExecutor,
+                Clock.system());
+    }
+
+    @Provides
+    @Named("session.tokenExpireMs")
+    long provideTokenExpireMs() {
+        return 60_000_000;
+    }
+
+    @Provides
+    @Named("http.port")
+    int provideHttpPort() {
+        return 0;// 'select first available'
+    }
+
+    @Provides
+    @Named("grpc.maxInboundMessageSize")
+    int provideMaxInboundMessageSize() {
+        return 1024 * 1024;
+    }
+
+    @Provides
+    AuthorizationProvider provideAuthorizationProvider(TestAuthorizationProvider provider) {
+        return provider;
+    }
+
+    @Provides
+    @Singleton
+    TestAuthorizationProvider provideTestAuthorizationProvider() {
+        return new TestAuthorizationProvider();
+    }
+
+    @Provides
+    @Singleton
+    static UpdateGraph provideUpdateGraph() {
+        return ExecutionContext.getContext().getUpdateGraph();
+    }
+
+    @Provides
+    @Singleton
+    static OperationInitializer provideOperationInitializer() {
+        return ExecutionContext.getContext().getOperationInitializer();
+    }
+}
diff --git a/extensions/flight-sql/src/jdbcTest/java/io/deephaven/server/flightsql/JettyTestComponent.java b/extensions/flight-sql/src/jdbcTest/java/io/deephaven/server/flightsql/JettyTestComponent.java
new file mode 100644
index 00000000000..add6799ad28
--- /dev/null
+++ b/extensions/flight-sql/src/jdbcTest/java/io/deephaven/server/flightsql/JettyTestComponent.java
@@ -0,0 +1,38 @@
+//
+// Copyright (c) 2016-2024 Deephaven Data Labs and Patent Pending
+//
+package io.deephaven.server.flightsql;
+
+import dagger.Component;
+import dagger.Module;
+import dagger.Provides;
+import io.deephaven.server.DeephavenServerTestBase.TestComponent;
+import io.deephaven.server.flightsql.JettyTestComponent.JettyTestConfig;
+import io.deephaven.server.jetty.JettyConfig;
+import io.deephaven.server.jetty.JettyServerModule;
+import io.deephaven.server.runner.ExecutionContextUnitTestModule;
+
+import javax.inject.Singleton;
+import java.time.Duration;
+import java.time.temporal.ChronoUnit;
+
+@Singleton
+@Component(modules = {
+        ExecutionContextUnitTestModule.class,
+        JettyServerModule.class,
+        JettyTestConfig.class,
+        FlightSqlTestModule.class,
+})
+public interface JettyTestComponent extends TestComponent {
+
+    @Module
+    interface JettyTestConfig {
+        @Provides
+        static JettyConfig providesJettyConfig() {
+            return JettyConfig.builder()
+                    .port(0)
+                    .tokenExpire(Duration.of(5, ChronoUnit.MINUTES))
+                    .build();
+        }
+    }
+}
diff --git a/extensions/flight-sql/src/jdbcTest/java/io/deephaven/server/flightsql/jetty/FlightSqlJdbcTestJetty.java b/extensions/flight-sql/src/jdbcTest/java/io/deephaven/server/flightsql/jetty/FlightSqlJdbcTestJetty.java
new file mode 100644
index 00000000000..892c2cd1a81
--- /dev/null
+++ b/extensions/flight-sql/src/jdbcTest/java/io/deephaven/server/flightsql/jetty/FlightSqlJdbcTestJetty.java
@@ -0,0 +1,15 @@
+//
+// Copyright (c) 2016-2024 Deephaven Data Labs and Patent Pending
+//
+package io.deephaven.server.flightsql.jetty;
+
+import io.deephaven.server.flightsql.DaggerJettyTestComponent;
+import io.deephaven.server.flightsql.FlightSqlJdbcTestBase;
+
+public class FlightSqlJdbcTestJetty extends FlightSqlJdbcTestBase {
+
+    @Override
+    protected TestComponent component() {
+        return DaggerJettyTestComponent.create();
+    }
+}
diff --git a/extensions/flight-sql/src/jdbcTest/java/io/deephaven/server/flightsql/jetty/FlightSqlJdbcUnauthenticatedTestJetty.java b/extensions/flight-sql/src/jdbcTest/java/io/deephaven/server/flightsql/jetty/FlightSqlJdbcUnauthenticatedTestJetty.java
new file mode 100644
index 00000000000..2941df3ee15
--- /dev/null
+++ b/extensions/flight-sql/src/jdbcTest/java/io/deephaven/server/flightsql/jetty/FlightSqlJdbcUnauthenticatedTestJetty.java
@@ -0,0 +1,15 @@
+//
+// Copyright (c) 2016-2024 Deephaven Data Labs and Patent Pending
+//
+package io.deephaven.server.flightsql.jetty;
+
+import io.deephaven.server.flightsql.DaggerJettyTestComponent;
+import io.deephaven.server.flightsql.FlightSqlJdbcUnauthenticatedTestBase;
+
+public class FlightSqlJdbcUnauthenticatedTestJetty extends FlightSqlJdbcUnauthenticatedTestBase {
+
+    @Override
+    protected TestComponent component() {
+        return DaggerJettyTestComponent.create();
+    }
+}
diff --git a/extensions/flight-sql/src/main/java/io/deephaven/server/flightsql/FlightSqlActionHelper.java b/extensions/flight-sql/src/main/java/io/deephaven/server/flightsql/FlightSqlActionHelper.java
new file mode 100644
index 00000000000..289423ecfd0
--- /dev/null
+++ b/extensions/flight-sql/src/main/java/io/deephaven/server/flightsql/FlightSqlActionHelper.java
@@ -0,0 +1,191 @@
+//
+// Copyright (c) 2016-2024 Deephaven Data Labs and Patent Pending
+//
+package io.deephaven.server.flightsql;
+
+import com.google.protobuf.Any;
+import com.google.protobuf.InvalidProtocolBufferException;
+import com.google.protobuf.Message;
+import io.deephaven.base.verify.Assert;
+import io.deephaven.util.annotations.VisibleForTesting;
+import io.grpc.Status;
+import org.apache.arrow.flight.Action;
+import org.apache.arrow.flight.ActionType;
+import org.apache.arrow.flight.sql.FlightSqlUtils;
+import org.apache.arrow.flight.sql.impl.FlightSql.ActionBeginSavepointRequest;
+import org.apache.arrow.flight.sql.impl.FlightSql.ActionBeginTransactionRequest;
+import org.apache.arrow.flight.sql.impl.FlightSql.ActionCancelQueryRequest;
+import org.apache.arrow.flight.sql.impl.FlightSql.ActionClosePreparedStatementRequest;
+import org.apache.arrow.flight.sql.impl.FlightSql.ActionCreatePreparedStatementRequest;
+import org.apache.arrow.flight.sql.impl.FlightSql.ActionCreatePreparedSubstraitPlanRequest;
+import org.apache.arrow.flight.sql.impl.FlightSql.ActionEndSavepointRequest;
+import org.apache.arrow.flight.sql.impl.FlightSql.ActionEndTransactionRequest;
+
+import java.util.Set;
+import java.util.stream.Collectors;
+import java.util.stream.Stream;
+
+final class FlightSqlActionHelper {
+
+    @VisibleForTesting
+    static final String CREATE_PREPARED_STATEMENT_ACTION_TYPE = "CreatePreparedStatement";
+
+    @VisibleForTesting
+    static final String CLOSE_PREPARED_STATEMENT_ACTION_TYPE = "ClosePreparedStatement";
+
+    @VisibleForTesting
+    static final String BEGIN_SAVEPOINT_ACTION_TYPE = "BeginSavepoint";
+
+    @VisibleForTesting
+    static final String END_SAVEPOINT_ACTION_TYPE = "EndSavepoint";
+
+    @VisibleForTesting
+    static final String BEGIN_TRANSACTION_ACTION_TYPE = "BeginTransaction";
+
+    @VisibleForTesting
+    static final String END_TRANSACTION_ACTION_TYPE = "EndTransaction";
+
+    @VisibleForTesting
+    static final String CANCEL_QUERY_ACTION_TYPE = "CancelQuery";
+
+    @VisibleForTesting
+    static final String CREATE_PREPARED_SUBSTRAIT_PLAN_ACTION_TYPE = "CreatePreparedSubstraitPlan";
+
+    /**
+     * Note: FlightSqlUtils.FLIGHT_SQL_ACTIONS is not all the actions, see
+     * <a href="https://github.com/apache/arrow/pull/43718">Add all ActionTypes to FlightSqlUtils.FLIGHT_SQL_ACTIONS</a>
+     *
+     * <p>
+     * It is unfortunate that there is no proper prefix or namespace for these action types, which would make it much
+     * easier to route correctly.
+     */
+    private static final Set<String> FLIGHT_SQL_ACTION_TYPES = Stream.of(
+            FlightSqlUtils.FLIGHT_SQL_BEGIN_SAVEPOINT,
+            FlightSqlUtils.FLIGHT_SQL_BEGIN_TRANSACTION,
+            FlightSqlUtils.FLIGHT_SQL_CREATE_PREPARED_STATEMENT,
+            FlightSqlUtils.FLIGHT_SQL_CLOSE_PREPARED_STATEMENT,
+            FlightSqlUtils.FLIGHT_SQL_CREATE_PREPARED_SUBSTRAIT_PLAN,
+            FlightSqlUtils.FLIGHT_SQL_CANCEL_QUERY,
+            FlightSqlUtils.FLIGHT_SQL_END_SAVEPOINT,
+            FlightSqlUtils.FLIGHT_SQL_END_TRANSACTION)
+            .map(ActionType::getType)
+            .collect(Collectors.toSet());
+
+    interface ActionVisitor<T> {
+
+        T visit(ActionCreatePreparedStatementRequest action);
+
+        T visit(ActionClosePreparedStatementRequest action);
+
+        T visit(ActionBeginSavepointRequest action);
+
+        T visit(ActionEndSavepointRequest action);
+
+        T visit(ActionBeginTransactionRequest action);
+
+        T visit(ActionEndTransactionRequest action);
+
+        T visit(@SuppressWarnings("deprecation") ActionCancelQueryRequest action);
+
+        T visit(ActionCreatePreparedSubstraitPlanRequest action);
+    }
+
+    public static boolean handlesAction(String type) {
+        // There is no prefix for Flight SQL action types, so the best we can do is a set-based lookup. This also means
+        // that this resolver will not be able to respond with an appropriately scoped error message for new Flight SQL
+        // action types (io.deephaven.server.flightsql.FlightSqlResolver.UnsupportedAction).
+        return FLIGHT_SQL_ACTION_TYPES.contains(type);
+    }
+
+    public static <T> T visit(Action action, ActionVisitor<T> visitor) {
+        final String type = action.getType();
+        switch (type) {
+            case CREATE_PREPARED_STATEMENT_ACTION_TYPE:
+                return visitor.visit(unpack(action.getBody(), ActionCreatePreparedStatementRequest.class));
+            case CLOSE_PREPARED_STATEMENT_ACTION_TYPE:
+                return visitor.visit(unpack(action.getBody(), ActionClosePreparedStatementRequest.class));
+            case BEGIN_SAVEPOINT_ACTION_TYPE:
+                return visitor.visit(unpack(action.getBody(), ActionBeginSavepointRequest.class));
+            case END_SAVEPOINT_ACTION_TYPE:
+                return visitor.visit(unpack(action.getBody(), ActionEndSavepointRequest.class));
+            case BEGIN_TRANSACTION_ACTION_TYPE:
+                return visitor.visit(unpack(action.getBody(), ActionBeginTransactionRequest.class));
+            case END_TRANSACTION_ACTION_TYPE:
+                return visitor.visit(unpack(action.getBody(), ActionEndTransactionRequest.class));
+            case CANCEL_QUERY_ACTION_TYPE:
+                // noinspection deprecation
+                return visitor.visit(unpack(action.getBody(), ActionCancelQueryRequest.class));
+            case CREATE_PREPARED_SUBSTRAIT_PLAN_ACTION_TYPE:
+                return visitor.visit(unpack(action.getBody(), ActionCreatePreparedSubstraitPlanRequest.class));
+        }
+        // noinspection DataFlowIssue
+        throw Assert.statementNeverExecuted();
+    }
+
+    private static <T extends com.google.protobuf.Message> T unpack(byte[] body, Class<T> clazz) {
+        final Any any = parseActionOrThrow(body);
+        return unpackActionOrThrow(any, clazz);
+    }
+
+    private static Any parseActionOrThrow(byte[] data) {
+        try {
+            return Any.parseFrom(data);
+        } catch (final InvalidProtocolBufferException e) {
+            throw FlightSqlErrorHelper.error(Status.Code.INVALID_ARGUMENT, "Invalid action");
+        }
+    }
+
+    private static <T extends Message> T unpackActionOrThrow(Any source, Class<T> clazz) {
+        try {
+            return source.unpack(clazz);
+        } catch (final InvalidProtocolBufferException e) {
+            throw FlightSqlErrorHelper.error(Status.Code.INVALID_ARGUMENT,
+                    "Invalid action, provided message cannot be unpacked as " + clazz.getName(), e);
+        }
+    }
+
+    public static abstract class ActionVisitorBase<T> implements ActionVisitor<T> {
+
+        public abstract T visitDefault(ActionType actionType, Object action);
+
+        @Override
+        public T visit(ActionCreatePreparedStatementRequest action) {
+            return visitDefault(FlightSqlUtils.FLIGHT_SQL_CREATE_PREPARED_STATEMENT, action);
+        }
+
+        @Override
+        public T visit(ActionClosePreparedStatementRequest action) {
+            return visitDefault(FlightSqlUtils.FLIGHT_SQL_CLOSE_PREPARED_STATEMENT, action);
+        }
+
+        @Override
+        public T visit(ActionBeginSavepointRequest action) {
+            return visitDefault(FlightSqlUtils.FLIGHT_SQL_BEGIN_SAVEPOINT, action);
+        }
+
+        @Override
+        public T visit(ActionEndSavepointRequest action) {
+            return visitDefault(FlightSqlUtils.FLIGHT_SQL_END_SAVEPOINT, action);
+        }
+
+        @Override
+        public T visit(ActionBeginTransactionRequest action) {
+            return visitDefault(FlightSqlUtils.FLIGHT_SQL_BEGIN_TRANSACTION, action);
+        }
+
+        @Override
+        public T visit(ActionEndTransactionRequest action) {
+            return visitDefault(FlightSqlUtils.FLIGHT_SQL_END_TRANSACTION, action);
+        }
+
+        @Override
+        public T visit(@SuppressWarnings("deprecation") ActionCancelQueryRequest action) {
+            return visitDefault(FlightSqlUtils.FLIGHT_SQL_CANCEL_QUERY, action);
+        }
+
+        @Override
+        public T visit(ActionCreatePreparedSubstraitPlanRequest action) {
+            return visitDefault(FlightSqlUtils.FLIGHT_SQL_CREATE_PREPARED_SUBSTRAIT_PLAN, action);
+        }
+    }
+}
diff --git a/extensions/flight-sql/src/main/java/io/deephaven/server/flightsql/FlightSqlCommandHelper.java b/extensions/flight-sql/src/main/java/io/deephaven/server/flightsql/FlightSqlCommandHelper.java
new file mode 100644
index 00000000000..09c9417d88f
--- /dev/null
+++ b/extensions/flight-sql/src/main/java/io/deephaven/server/flightsql/FlightSqlCommandHelper.java
@@ -0,0 +1,225 @@
+//
+// Copyright (c) 2016-2024 Deephaven Data Labs and Patent Pending
+//
+package io.deephaven.server.flightsql;
+
+import com.google.protobuf.Any;
+import com.google.protobuf.ByteString;
+import com.google.protobuf.Descriptors.Descriptor;
+import com.google.protobuf.InvalidProtocolBufferException;
+import com.google.protobuf.Message;
+import io.deephaven.base.verify.Assert;
+import io.grpc.Status;
+import org.apache.arrow.flight.impl.Flight.FlightDescriptor;
+import org.apache.arrow.flight.sql.impl.FlightSql.CommandGetCatalogs;
+import org.apache.arrow.flight.sql.impl.FlightSql.CommandGetCrossReference;
+import org.apache.arrow.flight.sql.impl.FlightSql.CommandGetDbSchemas;
+import org.apache.arrow.flight.sql.impl.FlightSql.CommandGetExportedKeys;
+import org.apache.arrow.flight.sql.impl.FlightSql.CommandGetImportedKeys;
+import org.apache.arrow.flight.sql.impl.FlightSql.CommandGetPrimaryKeys;
+import org.apache.arrow.flight.sql.impl.FlightSql.CommandGetSqlInfo;
+import org.apache.arrow.flight.sql.impl.FlightSql.CommandGetTableTypes;
+import org.apache.arrow.flight.sql.impl.FlightSql.CommandGetTables;
+import org.apache.arrow.flight.sql.impl.FlightSql.CommandGetXdbcTypeInfo;
+import org.apache.arrow.flight.sql.impl.FlightSql.CommandPreparedStatementQuery;
+import org.apache.arrow.flight.sql.impl.FlightSql.CommandPreparedStatementUpdate;
+import org.apache.arrow.flight.sql.impl.FlightSql.CommandStatementIngest;
+import org.apache.arrow.flight.sql.impl.FlightSql.CommandStatementQuery;
+import org.apache.arrow.flight.sql.impl.FlightSql.CommandStatementSubstraitPlan;
+import org.apache.arrow.flight.sql.impl.FlightSql.CommandStatementUpdate;
+
+final class FlightSqlCommandHelper {
+
+    interface CommandVisitor<T> {
+
+        T visit(CommandGetCatalogs command);
+
+        T visit(CommandGetDbSchemas command);
+
+        T visit(CommandGetTableTypes command);
+
+        T visit(CommandGetImportedKeys command);
+
+        T visit(CommandGetExportedKeys command);
+
+        T visit(CommandGetPrimaryKeys command);
+
+        T visit(CommandGetTables command);
+
+        T visit(CommandStatementQuery command);
+
+        T visit(CommandPreparedStatementQuery command);
+
+        T visit(CommandGetSqlInfo command);
+
+        T visit(CommandStatementUpdate command);
+
+        T visit(CommandGetCrossReference command);
+
+        T visit(CommandStatementSubstraitPlan command);
+
+        T visit(CommandPreparedStatementUpdate command);
+
+        T visit(CommandGetXdbcTypeInfo command);
+
+        T visit(CommandStatementIngest command);
+    }
+
+    public static boolean handlesCommand(FlightDescriptor descriptor) {
+        // If not CMD, there is an error with io.deephaven.server.session.TicketRouter.getPathResolver / handlesPath
+        Assert.eq(descriptor.getType(), "descriptor.getType()", FlightDescriptor.DescriptorType.CMD, "CMD");
+        // No good way to check if this is a valid command without parsing to Any first.
+        final Any command = parseOrNull(descriptor.getCmd());
+        return command != null
+                && command.getTypeUrl().startsWith(FlightSqlSharedConstants.FLIGHT_SQL_COMMAND_TYPE_PREFIX);
+    }
+
+    public static <T> T visit(FlightDescriptor descriptor, CommandVisitor<T> visitor, String logId) {
+        // If not CMD, there is an error with io.deephaven.server.session.TicketRouter.getPathResolver / handlesPath
+        Assert.eq(descriptor.getType(), "descriptor.getType()", FlightDescriptor.DescriptorType.CMD, "CMD");
+        final Any command = parseOrNull(descriptor.getCmd());
+        // If null, there is an error with io.deephaven.server.session.TicketRouter.getCommandResolver / handlesCommand
+        Assert.neqNull(command, "command");
+        final String typeUrl = command.getTypeUrl();
+        // If not true, there is an error with io.deephaven.server.session.TicketRouter.getCommandResolver /
+        // handlesCommand
+        Assert.eqTrue(typeUrl.startsWith(FlightSqlSharedConstants.FLIGHT_SQL_COMMAND_TYPE_PREFIX),
+                "typeUrl.startsWith");
+        switch (typeUrl) {
+            case FlightSqlSharedConstants.COMMAND_STATEMENT_QUERY_TYPE_URL:
+                return visitor.visit(unpack(command, CommandStatementQuery.class, logId));
+            case FlightSqlSharedConstants.COMMAND_PREPARED_STATEMENT_QUERY_TYPE_URL:
+                return visitor.visit(unpack(command, CommandPreparedStatementQuery.class, logId));
+            case FlightSqlSharedConstants.COMMAND_GET_TABLES_TYPE_URL:
+                return visitor.visit(unpack(command, CommandGetTables.class, logId));
+            case FlightSqlSharedConstants.COMMAND_GET_TABLE_TYPES_TYPE_URL:
+                return visitor.visit(unpack(command, CommandGetTableTypes.class, logId));
+            case FlightSqlSharedConstants.COMMAND_GET_CATALOGS_TYPE_URL:
+                return visitor.visit(unpack(command, CommandGetCatalogs.class, logId));
+            case FlightSqlSharedConstants.COMMAND_GET_DB_SCHEMAS_TYPE_URL:
+                return visitor.visit(unpack(command, CommandGetDbSchemas.class, logId));
+            case FlightSqlSharedConstants.COMMAND_GET_PRIMARY_KEYS_TYPE_URL:
+                return visitor.visit(unpack(command, CommandGetPrimaryKeys.class, logId));
+            case FlightSqlSharedConstants.COMMAND_GET_IMPORTED_KEYS_TYPE_URL:
+                return visitor.visit(unpack(command, CommandGetImportedKeys.class, logId));
+            case FlightSqlSharedConstants.COMMAND_GET_EXPORTED_KEYS_TYPE_URL:
+                return visitor.visit(unpack(command, CommandGetExportedKeys.class, logId));
+            case FlightSqlSharedConstants.COMMAND_GET_SQL_INFO_TYPE_URL:
+                return visitor.visit(unpack(command, CommandGetSqlInfo.class, logId));
+            case FlightSqlSharedConstants.COMMAND_STATEMENT_UPDATE_TYPE_URL:
+                return visitor.visit(unpack(command, CommandStatementUpdate.class, logId));
+            case FlightSqlSharedConstants.COMMAND_GET_CROSS_REFERENCE_TYPE_URL:
+                return visitor.visit(unpack(command, CommandGetCrossReference.class, logId));
+            case FlightSqlSharedConstants.COMMAND_STATEMENT_SUBSTRAIT_PLAN_TYPE_URL:
+                return visitor.visit(unpack(command, CommandStatementSubstraitPlan.class, logId));
+            case FlightSqlSharedConstants.COMMAND_PREPARED_STATEMENT_UPDATE_TYPE_URL:
+                return visitor.visit(unpack(command, CommandPreparedStatementUpdate.class, logId));
+            case FlightSqlSharedConstants.COMMAND_GET_XDBC_TYPE_INFO_TYPE_URL:
+                return visitor.visit(unpack(command, CommandGetXdbcTypeInfo.class, logId));
+            case FlightSqlSharedConstants.COMMAND_STATEMENT_INGEST_TYPE_URL:
+                return visitor.visit(unpack(command, CommandStatementIngest.class, logId));
+        }
+        throw FlightSqlErrorHelper.error(Status.Code.UNIMPLEMENTED, String.format("command '%s' is unknown", typeUrl));
+    }
+
+    private static Any parseOrNull(ByteString data) {
+        try {
+            return Any.parseFrom(data);
+        } catch (final InvalidProtocolBufferException e) {
+            return null;
+        }
+    }
+
+    private static <T extends Message> T unpack(Any command, Class<T> clazz, String logId) {
+        try {
+            return command.unpack(clazz);
+        } catch (InvalidProtocolBufferException e) {
+            throw FlightSqlErrorHelper.error(Status.Code.FAILED_PRECONDITION, String
+                    .format("Invalid command, provided message cannot be unpacked as %s, %s", clazz.getName(), logId));
+        }
+    }
+
+    public static abstract class CommandVisitorBase<T> implements CommandVisitor<T> {
+        public abstract T visitDefault(Descriptor descriptor, Object command);
+
+        @Override
+        public T visit(CommandGetCatalogs command) {
+            return visitDefault(CommandGetCatalogs.getDescriptor(), command);
+        }
+
+        @Override
+        public T visit(CommandGetDbSchemas command) {
+            return visitDefault(CommandGetDbSchemas.getDescriptor(), command);
+        }
+
+        @Override
+        public T visit(CommandGetTableTypes command) {
+            return visitDefault(CommandGetTableTypes.getDescriptor(), command);
+        }
+
+        @Override
+        public T visit(CommandGetImportedKeys command) {
+            return visitDefault(CommandGetImportedKeys.getDescriptor(), command);
+        }
+
+        @Override
+        public T visit(CommandGetExportedKeys command) {
+            return visitDefault(CommandGetExportedKeys.getDescriptor(), command);
+        }
+
+        @Override
+        public T visit(CommandGetPrimaryKeys command) {
+            return visitDefault(CommandGetPrimaryKeys.getDescriptor(), command);
+        }
+
+        @Override
+        public T visit(CommandGetTables command) {
+            return visitDefault(CommandGetTables.getDescriptor(), command);
+        }
+
+        @Override
+        public T visit(CommandStatementQuery command) {
+            return visitDefault(CommandStatementQuery.getDescriptor(), command);
+        }
+
+        @Override
+        public T visit(CommandPreparedStatementQuery command) {
+            return visitDefault(CommandPreparedStatementQuery.getDescriptor(), command);
+        }
+
+        @Override
+        public T visit(CommandGetSqlInfo command) {
+            return visitDefault(CommandGetSqlInfo.getDescriptor(), command);
+        }
+
+        @Override
+        public T visit(CommandStatementUpdate command) {
+            return visitDefault(CommandStatementUpdate.getDescriptor(), command);
+        }
+
+        @Override
+        public T visit(CommandGetCrossReference command) {
+            return visitDefault(CommandGetCrossReference.getDescriptor(), command);
+        }
+
+        @Override
+        public T visit(CommandStatementSubstraitPlan command) {
+            return visitDefault(CommandStatementSubstraitPlan.getDescriptor(), command);
+        }
+
+        @Override
+        public T visit(CommandPreparedStatementUpdate command) {
+            return visitDefault(CommandPreparedStatementUpdate.getDescriptor(), command);
+        }
+
+        @Override
+        public T visit(CommandGetXdbcTypeInfo command) {
+            return visitDefault(CommandGetXdbcTypeInfo.getDescriptor(), command);
+        }
+
+        @Override
+        public T visit(CommandStatementIngest command) {
+            return visitDefault(CommandStatementIngest.getDescriptor(), command);
+        }
+    }
+}
diff --git a/extensions/flight-sql/src/main/java/io/deephaven/server/flightsql/FlightSqlErrorHelper.java b/extensions/flight-sql/src/main/java/io/deephaven/server/flightsql/FlightSqlErrorHelper.java
new file mode 100644
index 00000000000..3b9a49334e7
--- /dev/null
+++ b/extensions/flight-sql/src/main/java/io/deephaven/server/flightsql/FlightSqlErrorHelper.java
@@ -0,0 +1,25 @@
+//
+// Copyright (c) 2016-2024 Deephaven Data Labs and Patent Pending
+//
+package io.deephaven.server.flightsql;
+
+import io.grpc.Status;
+import io.grpc.StatusRuntimeException;
+
+final class FlightSqlErrorHelper {
+
+    static StatusRuntimeException error(Status.Code code, String message) {
+        return code
+                .toStatus()
+                .withDescription("Flight SQL: " + message)
+                .asRuntimeException();
+    }
+
+    static StatusRuntimeException error(Status.Code code, String message, Throwable cause) {
+        return code
+                .toStatus()
+                .withDescription("Flight SQL: " + message)
+                .withCause(cause)
+                .asRuntimeException();
+    }
+}
diff --git a/extensions/flight-sql/src/main/java/io/deephaven/server/flightsql/FlightSqlModule.java b/extensions/flight-sql/src/main/java/io/deephaven/server/flightsql/FlightSqlModule.java
new file mode 100644
index 00000000000..4e3c4b2b812
--- /dev/null
+++ b/extensions/flight-sql/src/main/java/io/deephaven/server/flightsql/FlightSqlModule.java
@@ -0,0 +1,25 @@
+//
+// Copyright (c) 2016-2024 Deephaven Data Labs and Patent Pending
+//
+package io.deephaven.server.flightsql;
+
+import dagger.Binds;
+import dagger.Module;
+import dagger.multibindings.IntoSet;
+import io.deephaven.server.session.ActionResolver;
+import io.deephaven.server.session.TicketResolver;
+
+/**
+ * Binds {@link FlightSqlResolver} as a {@link TicketResolver} and an {@link ActionResolver}.
+ */
+@Module
+public interface FlightSqlModule {
+
+    @Binds
+    @IntoSet
+    TicketResolver bindFlightSqlAsTicketResolver(FlightSqlResolver resolver);
+
+    @Binds
+    @IntoSet
+    ActionResolver bindFlightSqlAsActionResolver(FlightSqlResolver resolver);
+}
diff --git a/extensions/flight-sql/src/main/java/io/deephaven/server/flightsql/FlightSqlResolver.java b/extensions/flight-sql/src/main/java/io/deephaven/server/flightsql/FlightSqlResolver.java
new file mode 100644
index 00000000000..6fb7b4cdf76
--- /dev/null
+++ b/extensions/flight-sql/src/main/java/io/deephaven/server/flightsql/FlightSqlResolver.java
@@ -0,0 +1,1802 @@
+//
+// Copyright (c) 2016-2024 Deephaven Data Labs and Patent Pending
+//
+package io.deephaven.server.flightsql;
+
+import com.google.protobuf.Any;
+import com.google.protobuf.ByteString;
+import com.google.protobuf.ByteStringAccess;
+import com.google.protobuf.Descriptors.Descriptor;
+import com.google.protobuf.Message;
+import com.google.protobuf.Timestamp;
+import io.deephaven.base.log.LogOutput;
+import io.deephaven.base.verify.Assert;
+import io.deephaven.configuration.Configuration;
+import io.deephaven.engine.context.ExecutionContext;
+import io.deephaven.engine.context.QueryScope;
+import io.deephaven.engine.liveness.LivenessScopeStack;
+import io.deephaven.engine.sql.Sql;
+import io.deephaven.engine.table.ColumnDefinition;
+import io.deephaven.engine.table.Table;
+import io.deephaven.engine.table.TableDefinition;
+import io.deephaven.engine.table.impl.TableCreatorImpl;
+import io.deephaven.engine.table.impl.perf.QueryPerformanceNugget;
+import io.deephaven.engine.table.impl.perf.QueryPerformanceRecorder;
+import io.deephaven.engine.table.impl.util.ColumnHolder;
+import io.deephaven.engine.updategraph.NotificationQueue;
+import io.deephaven.engine.updategraph.UpdateGraph;
+import io.deephaven.engine.util.TableTools;
+import io.deephaven.extensions.barrage.util.ArrowIpcUtil;
+import io.deephaven.extensions.barrage.util.BarrageUtil;
+import io.deephaven.extensions.barrage.util.GrpcUtil;
+import io.deephaven.hash.KeyedObjectHashMap;
+import io.deephaven.hash.KeyedObjectKey;
+import io.deephaven.internal.log.LoggerFactory;
+import io.deephaven.io.logger.Logger;
+import io.deephaven.proto.backplane.grpc.ExportNotification;
+import io.deephaven.proto.util.ByteHelper;
+import io.deephaven.qst.TableCreator;
+import io.deephaven.qst.table.ParentsVisitor;
+import io.deephaven.qst.table.TableSpec;
+import io.deephaven.qst.table.TicketTable;
+import io.deephaven.server.auth.AuthorizationProvider;
+import io.deephaven.server.session.ActionResolver;
+import io.deephaven.server.session.CommandResolver;
+import io.deephaven.server.session.SessionState;
+import io.deephaven.server.session.SessionState.ExportObject;
+import io.deephaven.server.session.TicketRouter;
+import io.deephaven.server.util.Scheduler;
+import io.deephaven.sql.SqlParseException;
+import io.deephaven.sql.UnsupportedSqlOperation;
+import io.deephaven.util.SafeCloseable;
+import io.deephaven.util.annotations.VisibleForTesting;
+import io.grpc.Status.Code;
+import io.grpc.StatusRuntimeException;
+import io.grpc.stub.StreamObserver;
+import org.apache.arrow.flight.Action;
+import org.apache.arrow.flight.ActionType;
+import org.apache.arrow.flight.Result;
+import org.apache.arrow.flight.impl.Flight;
+import org.apache.arrow.flight.impl.Flight.Empty;
+import org.apache.arrow.flight.impl.Flight.FlightDescriptor;
+import org.apache.arrow.flight.impl.Flight.FlightEndpoint;
+import org.apache.arrow.flight.impl.Flight.FlightInfo;
+import org.apache.arrow.flight.impl.Flight.Ticket;
+import org.apache.arrow.flight.sql.FlightSqlProducer;
+import org.apache.arrow.flight.sql.FlightSqlUtils;
+import org.apache.arrow.flight.sql.impl.FlightSql.ActionClosePreparedStatementRequest;
+import org.apache.arrow.flight.sql.impl.FlightSql.ActionCreatePreparedStatementRequest;
+import org.apache.arrow.flight.sql.impl.FlightSql.ActionCreatePreparedStatementResult;
+import org.apache.arrow.flight.sql.impl.FlightSql.CommandGetCatalogs;
+import org.apache.arrow.flight.sql.impl.FlightSql.CommandGetDbSchemas;
+import org.apache.arrow.flight.sql.impl.FlightSql.CommandGetExportedKeys;
+import org.apache.arrow.flight.sql.impl.FlightSql.CommandGetImportedKeys;
+import org.apache.arrow.flight.sql.impl.FlightSql.CommandGetPrimaryKeys;
+import org.apache.arrow.flight.sql.impl.FlightSql.CommandGetTableTypes;
+import org.apache.arrow.flight.sql.impl.FlightSql.CommandGetTables;
+import org.apache.arrow.flight.sql.impl.FlightSql.CommandPreparedStatementQuery;
+import org.apache.arrow.flight.sql.impl.FlightSql.CommandStatementQuery;
+import org.apache.arrow.flight.sql.impl.FlightSql.TicketStatementQuery;
+import org.apache.arrow.vector.types.pojo.ArrowType.Utf8;
+import org.apache.arrow.vector.types.pojo.Field;
+import org.apache.arrow.vector.types.pojo.Schema;
+import org.apache.calcite.rex.RexDynamicParam;
+import org.apache.calcite.runtime.CalciteContextException;
+import org.apache.calcite.sql.validate.SqlValidatorException;
+import org.jetbrains.annotations.Nullable;
+
+import javax.inject.Inject;
+import javax.inject.Singleton;
+import java.io.ByteArrayOutputStream;
+import java.io.Closeable;
+import java.io.IOException;
+import java.io.UncheckedIOException;
+import java.nio.ByteBuffer;
+import java.security.SecureRandom;
+import java.time.Duration;
+import java.time.Instant;
+import java.util.ArrayList;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Map;
+import java.util.Map.Entry;
+import java.util.Objects;
+import java.util.PrimitiveIterator;
+import java.util.Set;
+import java.util.function.Consumer;
+import java.util.function.Function;
+import java.util.function.Predicate;
+import java.util.regex.Pattern;
+import java.util.stream.IntStream;
+
+import static io.deephaven.server.flightsql.FlightSqlErrorHelper.error;
+
+/**
+ * A <a href="https://arrow.apache.org/docs/format/FlightSql.html">Flight SQL</a> resolver. This supports the read-only
+ * querying of the global query scope, which is presented simply with the query scope variables names as the table names
+ * without a catalog and schema name.
+ *
+ * <p>
+ * This implementation does not currently follow the Flight SQL protocol to exact specification. Namely, all the
+ * returned {@link Schema Flight schemas} have nullable {@link Field fields}, and some of the fields on specific
+ * commands have different types (see {@link #flightInfoFor(SessionState, FlightDescriptor, String)} for specifics).
+ *
+ * <p>
+ * All commands, actions, and resolution must be called by authenticated users.
+ */
+@Singleton
+public final class FlightSqlResolver implements ActionResolver, CommandResolver {
+
+    private static final String CATALOG_NAME = "catalog_name";
+    private static final String PK_CATALOG_NAME = "pk_catalog_name";
+    private static final String FK_CATALOG_NAME = "fk_catalog_name";
+
+    private static final String DB_SCHEMA_NAME = "db_schema_name";
+    private static final String PK_DB_SCHEMA_NAME = "pk_db_schema_name";
+    private static final String FK_DB_SCHEMA_NAME = "fk_db_schema_name";
+
+    private static final String TABLE_NAME = "table_name";
+    private static final String PK_TABLE_NAME = "pk_table_name";
+    private static final String FK_TABLE_NAME = "fk_table_name";
+
+    private static final String COLUMN_NAME = "column_name";
+    private static final String PK_COLUMN_NAME = "pk_column_name";
+    private static final String FK_COLUMN_NAME = "fk_column_name";
+
+    private static final String KEY_NAME = "key_name";
+    private static final String PK_KEY_NAME = "pk_key_name";
+    private static final String FK_KEY_NAME = "fk_key_name";
+
+    private static final String TABLE_TYPE = "table_type";
+    private static final String KEY_SEQUENCE = "key_sequence";
+    private static final String TABLE_SCHEMA = "table_schema";
+    private static final String UPDATE_RULE = "update_rule";
+    private static final String DELETE_RULE = "delete_rule";
+
+    private static final String TABLE_TYPE_TABLE = "TABLE";
+    private static final Duration FIXED_TICKET_EXPIRE_DURATION = Duration.ofMinutes(1);
+    private static final long QUERY_WATCHDOG_TIMEOUT_MILLIS = Duration
+            .parse(Configuration.getInstance().getStringWithDefault("FlightSQL.queryTimeout", "PT5s")).toMillis();
+
+    private static final Logger log = LoggerFactory.getLogger(FlightSqlResolver.class);
+
+    private static final KeyedObjectKey<ByteString, QueryBase> QUERY_KEY =
+            new KeyedObjectKey.BasicAdapter<>(QueryBase::handleId);
+
+    private static final KeyedObjectKey<ByteString, PreparedStatement> PREPARED_STATEMENT_KEY =
+            new KeyedObjectKey.BasicAdapter<>(PreparedStatement::handleId);
+
+    @VisibleForTesting
+    static final Schema DATASET_SCHEMA_SENTINEL = new Schema(List.of(Field.nullable("DO_NOT_USE", Utf8.INSTANCE)));
+
+    private final Scheduler scheduler;
+    private final Authorization authorization;
+    private final KeyedObjectHashMap<ByteString, QueryBase> queries;
+    private final KeyedObjectHashMap<ByteString, PreparedStatement> preparedStatements;
+
+    @Inject
+    public FlightSqlResolver(
+            final AuthorizationProvider authProvider,
+            final Scheduler scheduler) {
+        this.authorization = Objects.requireNonNull(authProvider.getTicketResolverAuthorization());
+        this.scheduler = Objects.requireNonNull(scheduler);
+        this.queries = new KeyedObjectHashMap<>(QUERY_KEY);
+        this.preparedStatements = new KeyedObjectHashMap<>(PREPARED_STATEMENT_KEY);
+    }
+
+    /**
+     * The Flight SQL ticket route, equal to {@value FlightSqlTicketHelper#TICKET_PREFIX}.
+     *
+     * @return the Flight SQL ticket route
+     */
+    @Override
+    public byte ticketRoute() {
+        return FlightSqlTicketHelper.TICKET_PREFIX;
+    }
+
+    // ---------------------------------------------------------------------------------------------------------------
+
+    /**
+     * Returns {@code true} if the given command {@code descriptor} appears to be a valid Flight SQL command; that is,
+     * it is parsable as an {@code Any} protobuf message with the type URL prefixed with
+     * {@value FlightSqlSharedConstants#FLIGHT_SQL_COMMAND_TYPE_PREFIX}.
+     *
+     * @param descriptor the descriptor
+     * @return {@code true} if the given command appears to be a valid Flight SQL command
+     */
+    @Override
+    public boolean handlesCommand(Flight.FlightDescriptor descriptor) {
+        return FlightSqlCommandHelper.handlesCommand(descriptor);
+    }
+
+    /**
+     * Executes the given {@code descriptor} command. Only supports authenticated access.
+     *
+     * <p>
+     * {@link CommandStatementQuery}: Executes the given SQL query. The returned Flight info should be promptly
+     * resolved, and resolved at most once. Transactions are not currently supported.
+     *
+     * <p>
+     * {@link CommandPreparedStatementQuery}: Executes the prepared SQL query (must be executed within the scope of a
+     * {@link FlightSqlUtils#FLIGHT_SQL_CREATE_PREPARED_STATEMENT} /
+     * {@link FlightSqlUtils#FLIGHT_SQL_CLOSE_PREPARED_STATEMENT}). The returned Flight info should be promptly
+     * resolved, and resolved at most once.
+     *
+     * <p>
+     * {@link CommandGetTables}: Retrieve the tables authorized for the user. The {@value TABLE_NAME},
+     * {@value TABLE_TYPE}, and (optional) {@value TABLE_SCHEMA} fields will be out-of-spec as nullable columns (the
+     * returned data for these columns will never be {@code null}).
+     *
+     * <p>
+     * {@link CommandGetCatalogs}: Retrieves the catalogs authorized for the user. The {@value CATALOG_NAME} field will
+     * be out-of-spec as a nullable column (the returned data for this column will never be {@code null}). Currently,
+     * always an empty table.
+     *
+     * <p>
+     * {@link CommandGetDbSchemas}: Retrieves the catalogs and schemas authorized for the user. The
+     * {@value DB_SCHEMA_NAME} field will be out-of-spec as a nullable (the returned data for this column will never be
+     * {@code null}). Currently, always an empty table.
+     *
+     * <p>
+     * {@link CommandGetTableTypes}: Retrieves the table types authorized for the user. The {@value TABLE_TYPE} field
+     * will be out-of-spec as a nullable (the returned data for this column will never be {@code null}). Currently,
+     * always a table with a single row with value {@value TABLE_TYPE_TABLE}.
+     *
+     * <p>
+     * {@link CommandGetPrimaryKeys}: Retrieves the primary keys for a table if the user is authorized. If the table
+     * does not exist (or the user is not authorized), a {@link Code#NOT_FOUND} exception will be thrown. The
+     * {@value TABLE_NAME}, {@value COLUMN_NAME}, and {@value KEY_SEQUENCE} will be out-of-spec as nullable columns (the
+     * returned data for these columns will never be {@code null}). Currently, always an empty table.
+     *
+     * <p>
+     * {@link CommandGetImportedKeys}: Retrieves the imported keys for a table if the user is authorized. If the table
+     * does not exist (or the user is not authorized), a {@link Code#NOT_FOUND} exception will be thrown. The
+     * {@value PK_TABLE_NAME}, {@value PK_COLUMN_NAME}, {@value FK_TABLE_NAME}, {@value FK_COLUMN_NAME}, and
+     * {@value KEY_SEQUENCE} will be out-of-spec as nullable columns (the returned data for these columns will never be
+     * {@code null}). The {@value UPDATE_RULE} and {@value DELETE_RULE} will be out-of-spec as nullable {@code int8}
+     * types instead of {@code uint8} (the returned data for these columns will never be {@code null}). Currently,
+     * always an empty table.
+     *
+     * <p>
+     * {@link CommandGetExportedKeys}: Retrieves the exported keys for a table if the user is authorized. If the table
+     * does not exist (or the user is not authorized), a {@link Code#NOT_FOUND} exception will be thrown. The
+     * {@value PK_TABLE_NAME}, {@value PK_COLUMN_NAME}, {@value FK_TABLE_NAME}, {@value FK_COLUMN_NAME}, and
+     * {@value KEY_SEQUENCE} will be out-of-spec as nullable columns (the returned data for these columns will never be
+     * {@code null}). The {@value UPDATE_RULE} and {@value DELETE_RULE} will be out-of-spec as nullable {@code int8}
+     * types instead of {@code uint8} (the returned data for these columns will never be {@code null}). Currently,
+     * always an empty table.
+     *
+     * <p>
+     * All other commands will throw an {@link Code#UNIMPLEMENTED} exception.
+     *
+     * @param session the session
+     * @param descriptor the flight descriptor to retrieve a ticket for
+     * @param logId an end-user friendly identification of the ticket should an error occur
+     * @return the flight info for the given {@code descriptor} command
+     */
+    @Override
+    public ExportObject<FlightInfo> flightInfoFor(
+            @Nullable final SessionState session, final Flight.FlightDescriptor descriptor, final String logId) {
+        if (session == null) {
+            throw unauthenticatedError();
+        }
+        return FlightSqlCommandHelper.visit(descriptor, new GetFlightInfoImpl(session, descriptor), logId);
+    }
+
+    private class GetFlightInfoImpl extends FlightSqlCommandHelper.CommandVisitorBase<ExportObject<FlightInfo>> {
+        private final SessionState session;
+        private final FlightDescriptor descriptor;
+
+        public GetFlightInfoImpl(SessionState session, FlightDescriptor descriptor) {
+            this.session = Objects.requireNonNull(session);
+            this.descriptor = Objects.requireNonNull(descriptor);
+        }
+
+        @Override
+        public ExportObject<FlightInfo> visitDefault(Descriptor descriptor, Object command) {
+            return submit(new UnsupportedCommand<>(descriptor), command);
+        }
+
+        @Override
+        public ExportObject<FlightInfo> visit(CommandGetCatalogs command) {
+            return submit(CommandGetCatalogsConstants.HANDLER, command);
+        }
+
+        @Override
+        public ExportObject<FlightInfo> visit(CommandGetDbSchemas command) {
+            return submit(CommandGetDbSchemasConstants.HANDLER, command);
+        }
+
+        @Override
+        public ExportObject<FlightInfo> visit(CommandGetTableTypes command) {
+            return submit(CommandGetTableTypesConstants.HANDLER, command);
+        }
+
+        @Override
+        public ExportObject<FlightInfo> visit(CommandGetImportedKeys command) {
+            return submit(commandGetImportedKeysHandler, command);
+        }
+
+        @Override
+        public ExportObject<FlightInfo> visit(CommandGetExportedKeys command) {
+            return submit(commandGetExportedKeysHandler, command);
+        }
+
+        @Override
+        public ExportObject<FlightInfo> visit(CommandGetPrimaryKeys command) {
+            return submit(commandGetPrimaryKeysHandler, command);
+        }
+
+        @Override
+        public ExportObject<FlightInfo> visit(CommandGetTables command) {
+            return submit(new CommandGetTablesImpl(), command);
+        }
+
+        @Override
+        public ExportObject<FlightInfo> visit(CommandStatementQuery command) {
+            return submit(new CommandStatementQueryImpl(session), command);
+        }
+
+        @Override
+        public ExportObject<FlightInfo> visit(CommandPreparedStatementQuery command) {
+            return submit(new CommandPreparedStatementQueryImpl(session), command);
+        }
+
+        private <T> ExportObject<FlightInfo> submit(CommandHandler<T> handler, T command) {
+            return session.<FlightInfo>nonExport().submit(() -> getInfo(handler, command));
+        }
+
+        private <T> FlightInfo getInfo(CommandHandler<T> handler, T command) {
+            final QueryPerformanceRecorder qpr = QueryPerformanceRecorder.getInstance();
+            try (final QueryPerformanceNugget ignore =
+                    qpr.getNugget(String.format("FlightSQL.getInfo/%s", command.getClass().getSimpleName()))) {
+                return flightInfo(handler, command);
+            }
+        }
+
+        private <T> FlightInfo flightInfo(CommandHandler<T> handler, T command) {
+            final TicketHandler ticketHandler = handler.execute(command);
+            try {
+                return ticketHandler.getInfo(descriptor);
+            } catch (Throwable t) {
+                if (ticketHandler instanceof TicketHandlerReleasable) {
+                    ((TicketHandlerReleasable) ticketHandler).release();
+                }
+                throw t;
+            }
+        }
+    }
+
+    // ---------------------------------------------------------------------------------------------------------------
+
+    /**
+     * Only supports authenticated access.
+     *
+     * @param session the user session context
+     * @param ticket (as ByteByffer) the ticket to resolve
+     * @param logId an end-user friendly identification of the ticket should an error occur
+     * @return the exported table
+     * @param <T> the type, must be Table
+     */
+    @Override
+    public <T> SessionState.ExportObject<T> resolve(
+            @Nullable final SessionState session, final ByteBuffer ticket, final String logId) {
+        if (session == null) {
+            throw unauthenticatedError();
+        }
+        final ExportObject<Table> tableExport = FlightSqlTicketHelper.visit(ticket, new ResolveImpl(session), logId);
+        // noinspection unchecked
+        return (ExportObject<T>) tableExport;
+    }
+
+    private class ResolveImpl implements FlightSqlTicketHelper.TicketVisitor<ExportObject<Table>> {
+        private final SessionState session;
+
+        public ResolveImpl(SessionState session) {
+            this.session = Objects.requireNonNull(session);
+        }
+
+        @Override
+        public ExportObject<Table> visit(CommandGetCatalogs ticket) {
+            return submit(CommandGetCatalogsConstants.HANDLER, ticket);
+        }
+
+        @Override
+        public ExportObject<Table> visit(CommandGetDbSchemas ticket) {
+            return submit(CommandGetDbSchemasConstants.HANDLER, ticket);
+        }
+
+        @Override
+        public ExportObject<Table> visit(CommandGetTableTypes ticket) {
+            return submit(CommandGetTableTypesConstants.HANDLER, ticket);
+        }
+
+        @Override
+        public ExportObject<Table> visit(CommandGetImportedKeys ticket) {
+            return submit(commandGetImportedKeysHandler, ticket);
+        }
+
+        @Override
+        public ExportObject<Table> visit(CommandGetExportedKeys ticket) {
+            return submit(commandGetExportedKeysHandler, ticket);
+        }
+
+        @Override
+        public ExportObject<Table> visit(CommandGetPrimaryKeys ticket) {
+            return submit(commandGetPrimaryKeysHandler, ticket);
+        }
+
+        @Override
+        public ExportObject<Table> visit(CommandGetTables ticket) {
+            return submit(commandGetTables, ticket);
+        }
+
+        private <C extends Message> ExportObject<Table> submit(CommandHandlerFixedBase<C> fixed, C command) {
+            // We know this is a trivial execute, okay to do on RPC thread
+            return submit(fixed.execute(command));
+        }
+
+        @Override
+        public ExportObject<Table> visit(TicketStatementQuery ticket) {
+            final TicketHandler ticketHandler = queries.get(ticket.getStatementHandle());
+            if (ticketHandler == null) {
+                throw error(Code.NOT_FOUND,
+                        "Unable to find Flight SQL query. Flight SQL tickets should be resolved promptly and resolved at most once.");
+            }
+            if (!ticketHandler.isOwner(session)) {
+                // We should not be concerned about returning "NOT_FOUND" here; the handleId is sufficiently random that
+                // it is much more likely an authentication setup issue.
+                throw permissionDeniedWithHelpfulMessage();
+            }
+            return submit(ticketHandler);
+        }
+
+        // Note: we could be more efficient and do the static table resolution on thread instead of submitting. For
+        // simplicity purposes for now, we will submit all of them for resolution.
+        private ExportObject<Table> submit(TicketHandler handler) {
+            return new TableResolver(session, handler).submit();
+        }
+    }
+
+    private static class TableResolver implements SessionState.ExportErrorHandler {
+        private final SessionState session;
+        private final TicketHandler handler;
+
+        public TableResolver(SessionState session, TicketHandler handler) {
+            this.handler = Objects.requireNonNull(handler);
+            this.session = Objects.requireNonNull(session);
+        }
+
+        public ExportObject<Table> submit() {
+            // We need to provide clean handoff of the Table for Liveness management between the resolver and the
+            // export; as such, we _can't_ unmanage the Table during a call to TicketHandler.resolve, so we must rely
+            // on onSuccess / onError callbacks (after export has started managing the Table).
+            return session.<Table>nonExport()
+                    .onSuccess(this::onSuccess)
+                    .onError(this)
+                    .submit(handler::resolve);
+        }
+
+        private void onSuccess() {
+            release();
+        }
+
+        @Override
+        public void onError(ExportNotification.State resultState, String errorContext, @Nullable Exception cause,
+                @Nullable String dependentExportId) {
+            release();
+        }
+
+        private void release() {
+            if (!(handler instanceof TicketHandlerReleasable)) {
+                return;
+            }
+            ((TicketHandlerReleasable) handler).release();
+        }
+    }
+
+    @Override
+    public <T> SessionState.ExportObject<T> resolve(
+            @Nullable final SessionState session, final Flight.FlightDescriptor descriptor, final String logId) {
+        // This general interface does not make sense; resolution should always be done against a _ticket_. Nothing
+        // calls io.deephaven.server.session.TicketRouter.resolve(SessionState, FlightDescriptor, String)
+        // noinspection DataFlowIssue
+        throw Assert.statementNeverExecuted();
+    }
+
+    // ---------------------------------------------------------------------------------------------------------------
+
+    /**
+     * Supports unauthenticated access. When unauthenticated, will not return any actions types. When authenticated,
+     * will return the action types the user is authorized to access. Currently, supports
+     * {@link FlightSqlUtils#FLIGHT_SQL_CREATE_PREPARED_STATEMENT} and
+     * {@link FlightSqlUtils#FLIGHT_SQL_CLOSE_PREPARED_STATEMENT}.
+     *
+     * @param session the session
+     * @param visitor the visitor
+     */
+    @Override
+    public void listActions(@Nullable SessionState session, Consumer<ActionType> visitor) {
+        if (session == null) {
+            return;
+        }
+        visitor.accept(FlightSqlUtils.FLIGHT_SQL_CREATE_PREPARED_STATEMENT);
+        visitor.accept(FlightSqlUtils.FLIGHT_SQL_CLOSE_PREPARED_STATEMENT);
+    }
+
+    /**
+     * Returns {@code true} if {@code type} is a known Flight SQL action type (even if this implementation does not
+     * implement it).
+     *
+     * @param type the action type
+     * @return if {@code type} is a known Flight SQL action type
+     */
+    @Override
+    public boolean handlesActionType(String type) {
+        return FlightSqlActionHelper.handlesAction(type);
+    }
+
+    /**
+     * Executes the given {@code action}. Only supports authenticated access. Currently, supports
+     * {@link FlightSqlUtils#FLIGHT_SQL_CREATE_PREPARED_STATEMENT} and
+     * {@link FlightSqlUtils#FLIGHT_SQL_CLOSE_PREPARED_STATEMENT}; all other action types will throw an
+     * {@link Code#UNIMPLEMENTED} exception. Transactions are not currently supported.
+     *
+     * @param session the session
+     * @param action the action
+     * @param observer the observer
+     */
+    @Override
+    public void doAction(
+            @Nullable final SessionState session,
+            final Action action,
+            final StreamObserver<Result> observer) {
+        // If false, there is an error with io.deephaven.server.session.ActionRouter.doAction / handlesActionType
+        Assert.eqTrue(handlesActionType(action.getType()), "handlesActionType(action.getType())");
+        if (session == null) {
+            throw unauthenticatedError();
+        }
+        executeAction(session, FlightSqlActionHelper.visit(action, new ActionHandlerVisitor()), observer);
+    }
+
+    // ---------------------------------------------------------------------------------------------------------------
+
+    /**
+     * Supports unauthenticated access. When unauthenticated, will not return any Flight info. When authenticated, this
+     * may return Flight info the user is authorized to access. Currently, no Flight info is returned.
+     *
+     * @param session optional session that the resolver can use to filter which flights a visitor sees
+     * @param visitor the callback to invoke per descriptor path
+     */
+    @Override
+    public void forAllFlightInfo(@Nullable final SessionState session, final Consumer<Flight.FlightInfo> visitor) {
+        if (session == null) {
+            return;
+        }
+        // Potential support for listing here in the future
+    }
+
+    // ---------------------------------------------------------------------------------------------------------------
+
+    /**
+     * Publishing to Flight SQL descriptors is not currently supported. Throws a {@link Code#FAILED_PRECONDITION} error.
+     */
+    @Override
+    public <T> SessionState.ExportBuilder<T> publish(
+            final SessionState session,
+            final Flight.FlightDescriptor descriptor,
+            final String logId,
+            @Nullable final Runnable onPublish) {
+        if (session == null) {
+            throw unauthenticatedError();
+        }
+        throw error(Code.FAILED_PRECONDITION,
+                "Could not publish '" + logId + "': Flight SQL descriptors cannot be published to");
+    }
+
+    /**
+     * Publishing to Flight SQL tickets is not currently supported. Throws a {@link Code#FAILED_PRECONDITION} error.
+     */
+    @Override
+    public <T> SessionState.ExportBuilder<T> publish(
+            final SessionState session,
+            final ByteBuffer ticket,
+            final String logId,
+            @Nullable final Runnable onPublish) {
+        if (session == null) {
+            throw unauthenticatedError();
+        }
+        throw error(Code.FAILED_PRECONDITION,
+                "Could not publish '" + logId + "': Flight SQL tickets cannot be published to");
+    }
+
+    // ---------------------------------------------------------------------------------------------------------------
+
+    @Override
+    public String getLogNameFor(final ByteBuffer ticket, final String logId) {
+        // This is a bit different from the other resolvers; a ticket may be a very long byte string here since it
+        // may represent a command.
+        return FlightSqlTicketHelper.toReadableString(ticket, logId);
+    }
+
+    // ---------------------------------------------------------------------------------------------------------------
+
+    interface CommandHandler<C> {
+
+        TicketHandler execute(C command);
+    }
+
+    interface TicketHandler {
+
+        boolean isOwner(SessionState session);
+
+        FlightInfo getInfo(FlightDescriptor descriptor);
+
+        Table resolve();
+    }
+
+    interface TicketHandlerReleasable extends TicketHandler {
+
+        void release();
+    }
+
+    private Table executeSqlQuery(String sql) {
+        final ExecutionContext executionContext = ExecutionContext.getContext();
+        final QueryScope queryScope = executionContext.getQueryScope();
+        // We aren't managing the liveness of Tables that come verbatim (authorization un-transformed) from the query
+        // scope (we are ensuring that any transformed, or operation created, tables don't escape to a higher-layer's
+        // liveness scope). In the case where they either are already not live, or become not live by the time the
+        // operation logic is executed, an appropriate exception will be thrown. While this is a liveness race, it isn't
+        // technically much different than a liveness race possible via ScopeTicketResolver.resolve.
+        //
+        // The proper way to do this would be to re-model the table execution logic of GrpcTableOperation (gRPC) into a
+        // QST form, whereby table dependencies are presented as properly-scoped, liveness-managed Exports for the
+        // duration of the operation.
+        try (final SafeCloseable ignored = LivenessScopeStack.open()) {
+            // See SQLTODO(catalog-reader-implementation)
+            // Unfortunately, we must do authorization.transform on all the query scope tables up-front; to make this
+            // on-demand, we need to implement a Calcite Catalog Reader (non-trivial). Technically, parseSql only needs
+            // to know the definitions of the tables; we could consider a table-specific authorization interface that
+            // presents the specialization Authorization.transformedDefinition(Table) to make this cheaper in a lot of
+            // cases.
+            final Map<String, Table> queryScopeTables =
+                    queryScope.toMap(o -> queryScopeAuthorizedTableMapper(queryScope, o), (n, t) -> t != null);
+            final TableSpec tableSpec =
+                    Sql.parseSql(sql, queryScopeTables, TableCreatorScopeTickets::ticketTable, null);
+            final TableCreator<Table> tableCreator =
+                    new TableCreatorScopeTickets(TableCreatorImpl.INSTANCE, queryScopeTables);
+            // We could consider doing finer-grained sharedLock in the future; right now, taking it for the whole
+            // operation if any of the TicketTable sources are refreshing.
+            final List<Table> refreshingTables = new ArrayList<>();
+            for (final TableSpec node : ParentsVisitor.reachable(List.of(tableSpec))) {
+                // Of the source tables, SQL can produce a NewTable or a TicketTable (until we introduce custom
+                // functions, where we could conceivable have it produce EmptyTable, TimeTable, etc).
+                if (!(node instanceof TicketTable)) {
+                    continue;
+                }
+                final Table sourceTable = tableCreator.of((TicketTable) node);
+                if (sourceTable.isRefreshing()) {
+                    refreshingTables.add(sourceTable);
+                }
+            }
+            final UpdateGraph updateGraph = refreshingTables.isEmpty()
+                    ? null
+                    : NotificationQueue.Dependency.getUpdateGraph(null, refreshingTables.toArray(new Table[0]));
+            // Note: Authorization.transform has already been performed, but we are _not_ doing
+            // io.deephaven.auth.ServiceAuthWiring checks.
+            // TODO(deephaven-core#6307): Declarative server-side table execution logic that preserves authorization
+            // logic
+            try (
+                    final SafeCloseable ignored0 =
+                            updateGraph == null ? null : executionContext.withUpdateGraph(updateGraph).open();
+                    final SafeCloseable ignored1 =
+                            updateGraph == null ? null : updateGraph.sharedLock().lockCloseable()) {
+                final Table table = tableSpec.logic().create(tableCreator);
+                if (table.isRefreshing()) {
+                    table.retainReference();
+                }
+                return table;
+            }
+        }
+    }
+
+    private Table queryScopeTableMapper(QueryScope queryScope, Object object) {
+        if (object == null) {
+            return null;
+        }
+        object = queryScope.unwrapObject(object);
+        if (!(object instanceof Table)) {
+            return null;
+        }
+        return (Table) object;
+    }
+
+    private Table queryScopeAuthorizedTableMapper(QueryScope queryScope, Object object) {
+        final Table table = queryScopeTableMapper(queryScope, object);
+        return table == null ? null : authorization.transform(table);
+    }
+
+    /**
+     * This is the base class for "easy" commands; that is, commands that have a fixed schema and are cheap to
+     * initialize.
+     */
+    static abstract class CommandHandlerFixedBase<T extends Message> implements CommandHandler<T> {
+
+        /**
+         * This is called as the first part of {@link TicketHandler#getInfo(FlightDescriptor)} for the handler returned
+         * from {@link #execute(T)}. It can be used as an early signal to let clients know that the command is not
+         * supported, or one of the arguments is not valid.
+         */
+        void checkForGetInfo(T command) {
+
+        }
+
+        /**
+         * This is called as the first part of {@link TicketHandler#resolve()} for the handler returned from
+         * {@link #execute(T)}.
+         */
+        void checkForResolve(T command) {
+            // This is provided for completeness, but the current implementations don't use it.
+            //
+            // The callers that override checkForGetInfo, for example, all involve table names; if that table exists and
+            // they are authorized, they will get back a ticket that upon resolve will be an (empty) table. Otherwise,
+            // they will get a NOT_FOUND exception at getFlightInfo time.
+            //
+            // In this context, it is incorrect to do the same check at resolve time because we need to ensure that
+            // getFlightInfo / doGet (/ doExchange) appears stateful - it would be incorrect to return getFlightInfo
+            // with the semantics "this table exists" and then potentially throw a NOT_FOUND at resolve time.
+            //
+            // If Deephaven Flight SQL implements CommandGetExportedKeys, CommandGetImportedKeys, or
+            // CommandGetPrimaryKeys, we'll likely need to "upgrade" the implementation to a properly stateful one like
+            // QueryBase with handle-based tickets.
+        }
+
+        long totalRecords() {
+            return -1;
+        }
+
+        abstract Ticket ticket(T command);
+
+        abstract ByteString schemaBytes(T command);
+
+        abstract Table table(T command);
+
+        /**
+         * The handler. Will invoke {@link #checkForGetInfo(Message)} as the first part of
+         * {@link TicketHandler#getInfo(FlightDescriptor)}. Will invoke {@link #checkForResolve(Message)} as the first
+         * part of {@link TicketHandler#resolve()}.
+         */
+        @Override
+        public final TicketHandler execute(T command) {
+            return new TicketHandlerFixed(command);
+        }
+
+        private class TicketHandlerFixed implements TicketHandler {
+            private final T command;
+
+            private TicketHandlerFixed(T command) {
+                this.command = Objects.requireNonNull(command);
+            }
+
+            @Override
+            public boolean isOwner(SessionState session) {
+                return true;
+            }
+
+            @Override
+            public FlightInfo getInfo(FlightDescriptor descriptor) {
+                checkForGetInfo(command);
+                // Note: the presence of expirationTime is mainly a way to let clients know that they can retry a DoGet
+                // / DoExchange with an existing ticket without needing to do a new getFlightInfo first (for at least
+                // the amount of time as specified by expirationTime). Given that the tables resolved via this code-path
+                // are "easy" (in a lot of the cases, they are static empty tables or "easily" computable)...
+                // We are not setting an expiration timestamp for the SQL queries - they are only meant to be resolvable
+                // once; this is different from the watchdog concept.
+                return FlightInfo.newBuilder()
+                        .setFlightDescriptor(descriptor)
+                        .setSchema(schemaBytes(command))
+                        .addEndpoint(FlightEndpoint.newBuilder()
+                                .setTicket(ticket(command))
+                                .setExpirationTime(timestamp(Instant.now().plus(FIXED_TICKET_EXPIRE_DURATION)))
+                                .build())
+                        .setTotalRecords(totalRecords())
+                        .setTotalBytes(-1)
+                        .build();
+            }
+
+            @Override
+            public Table resolve() {
+                checkForResolve(command);
+                final Table table = CommandHandlerFixedBase.this.table(command);
+                final long totalRecords = totalRecords();
+                if (totalRecords != -1) {
+                    // If true, TicketHandler implementation error; should only override totalRecords for
+                    // non-refreshing tables
+                    Assert.eqFalse(table.isRefreshing(), "table.isRefreshing()");
+                    // If false, Ticket handler implementation error; totalRecords does not match the table size
+                    Assert.eq(table.size(), "table.size()", totalRecords, "totalRecords");
+                }
+                return table;
+            }
+        }
+    }
+
+    private static final class UnsupportedCommand<T> implements CommandHandler<T>, TicketHandler {
+        private final Descriptor descriptor;
+
+        UnsupportedCommand(Descriptor descriptor) {
+            this.descriptor = Objects.requireNonNull(descriptor);
+        }
+
+        @Override
+        public TicketHandler execute(T command) {
+            return this;
+        }
+
+        @Override
+        public boolean isOwner(SessionState session) {
+            return true;
+        }
+
+        @Override
+        public FlightInfo getInfo(FlightDescriptor descriptor) {
+            throw error(Code.UNIMPLEMENTED,
+                    String.format("command '%s' is unimplemented", this.descriptor.getFullName()));
+        }
+
+        @Override
+        public Table resolve() {
+            throw error(Code.INVALID_ARGUMENT, String.format(
+                    "client is misbehaving, should use getInfo for command '%s'", this.descriptor.getFullName()));
+        }
+    }
+
+    abstract class QueryBase<C> implements CommandHandler<C>, TicketHandlerReleasable {
+        private final ByteString handleId;
+        protected final SessionState session;
+
+        private boolean initialized;
+        private boolean resolved;
+        private Table table;
+
+        QueryBase(SessionState session) {
+            this.handleId = randomHandleId();
+            this.session = Objects.requireNonNull(session);
+            queries.put(handleId, this);
+        }
+
+        public ByteString handleId() {
+            return handleId;
+        }
+
+        @Override
+        public final TicketHandlerReleasable execute(C command) {
+            try {
+                return executeImpl(command);
+            } catch (Throwable t) {
+                release();
+                throw t;
+            }
+        }
+
+        private synchronized QueryBase<C> executeImpl(C command) {
+            Assert.eqFalse(initialized, "initialized");
+            initialized = true;
+            executeSql(command);
+            Assert.neqNull(table, "table");
+            // Note: we aren't currently providing a way to proactively cleanup query watchdogs - given their
+            // short-lived nature, they will execute "quick enough" for most use cases.
+            scheduler.runAfterDelay(QUERY_WATCHDOG_TIMEOUT_MILLIS, this::onWatchdog);
+            return this;
+        }
+
+        // responsible for setting table and schemaBytes
+        protected abstract void executeSql(C command);
+
+        protected void executeSql(String sql) {
+            try {
+                table = executeSqlQuery(sql);
+            } catch (SqlParseException e) {
+                throw error(Code.INVALID_ARGUMENT, "query can't be parsed", e);
+            } catch (UnsupportedSqlOperation e) {
+                if (e.clazz() == RexDynamicParam.class) {
+                    throw queryParametersNotSupported(e);
+                }
+                throw error(Code.INVALID_ARGUMENT,
+                        String.format("Unsupported calcite type '%s'", e.clazz().getName()),
+                        e);
+            } catch (CalciteContextException e) {
+                // See org.apache.calcite.runtime.CalciteResource for the various messages we might encounter
+                final Throwable cause = e.getCause();
+                if (cause instanceof SqlValidatorException) {
+                    if (cause.getMessage().contains("not found")) {
+                        throw error(Code.NOT_FOUND, cause.getMessage(), cause);
+                    }
+                    throw error(Code.INVALID_ARGUMENT, cause.getMessage(), cause);
+                }
+                throw e;
+            }
+        }
+
+        // ----------------------------------------------------------------------------------------------------------
+
+        @Override
+        public final boolean isOwner(SessionState session) {
+            return this.session.equals(session);
+        }
+
+        @Override
+        public final synchronized FlightInfo getInfo(FlightDescriptor descriptor) {
+            return TicketRouter.getFlightInfo(table, descriptor, ticket());
+        }
+
+        @Override
+        public final synchronized Table resolve() {
+            if (resolved) {
+                throw error(Code.FAILED_PRECONDITION, "Should only resolve once");
+            }
+            resolved = true;
+            if (table == null) {
+                throw error(Code.FAILED_PRECONDITION, "Should resolve table quicker");
+            }
+            return table;
+        }
+
+        @Override
+        public synchronized void release() {
+            if (!queries.remove(handleId, this)) {
+                return;
+            }
+            doRelease();
+        }
+
+        private void doRelease() {
+            if (table != null) {
+                if (table.isRefreshing()) {
+                    table.dropReference();
+                }
+                table = null;
+            }
+        }
+
+        // ----------------------------------------------------------------------------------------------------------
+
+        private synchronized void onWatchdog() {
+            if (!queries.remove(handleId, this)) {
+                return;
+            }
+            log.debug().append("Watchdog cleaning up query handleId=")
+                    .append(ByteStringAsHex.INSTANCE, handleId)
+                    .endl();
+            doRelease();
+        }
+
+        private Ticket ticket() {
+            return FlightSqlTicketHelper.ticketCreator().visit(TicketStatementQuery.newBuilder()
+                    .setStatementHandle(handleId)
+                    .build());
+        }
+    }
+
+    final class CommandStatementQueryImpl extends QueryBase<CommandStatementQuery> {
+
+        CommandStatementQueryImpl(SessionState session) {
+            super(session);
+        }
+
+        @Override
+        public void executeSql(CommandStatementQuery command) {
+            if (command.hasTransactionId()) {
+                throw transactionIdsNotSupported();
+            }
+            executeSql(command.getQuery());
+        }
+    }
+
+    final class CommandPreparedStatementQueryImpl extends QueryBase<CommandPreparedStatementQuery> {
+
+        private PreparedStatement prepared;
+
+        CommandPreparedStatementQueryImpl(SessionState session) {
+            super(session);
+        }
+
+        @Override
+        public void executeSql(CommandPreparedStatementQuery command) {
+            prepared = getPreparedStatement(session, command.getPreparedStatementHandle());
+            // Assumed this is not actually parameterized.
+            final String sql = prepared.parameterizedQuery();
+            executeSql(sql);
+            prepared.attach(this);
+        }
+
+        @Override
+        public void release() {
+            releaseImpl(true);
+        }
+
+        private void releaseImpl(boolean detach) {
+            if (detach && prepared != null) {
+                prepared.detach(this);
+            }
+            super.release();
+        }
+    }
+
+    private static class CommandStaticTable<T extends Message> extends CommandHandlerFixedBase<T> {
+        private final Table table;
+        private final Function<T, Ticket> f;
+        private final ByteString schemaBytes;
+
+        CommandStaticTable(Table table, Function<T, Ticket> f) {
+            super();
+            Assert.eqFalse(table.isRefreshing(), "table.isRefreshing()");
+            this.table = Objects.requireNonNull(table);
+            this.f = Objects.requireNonNull(f);
+            this.schemaBytes = BarrageUtil.schemaBytesFromTable(table);
+        }
+
+        @Override
+        Ticket ticket(T command) {
+            return f.apply(command);
+        }
+
+        @Override
+        ByteString schemaBytes(T command) {
+            return schemaBytes;
+        }
+
+        @Override
+        Table table(T command) {
+            return table;
+        }
+
+        @Override
+        long totalRecords() {
+            return table.size();
+        }
+    }
+
+    @VisibleForTesting
+    static final class CommandGetTableTypesConstants {
+
+        /**
+         * Models return type for {@link CommandGetTableTypes},
+         * {@link FlightSqlProducer.Schemas#GET_TABLE_TYPES_SCHEMA}.
+         *
+         * <pre>
+         * table_type: utf8 not null
+         * </pre>
+         */
+        @VisibleForTesting
+        static final TableDefinition DEFINITION = TableDefinition.of(
+                ColumnDefinition.ofString(TABLE_TYPE) // out-of-spec
+        );
+        private static final Map<String, Object> ATTRIBUTES = Map.of();
+        private static final Table TABLE =
+                TableTools.newTable(DEFINITION, ATTRIBUTES, TableTools.stringCol(TABLE_TYPE, TABLE_TYPE_TABLE));
+
+        public static final CommandHandlerFixedBase<CommandGetTableTypes> HANDLER = new CommandStaticTable<>(
+                TABLE, FlightSqlTicketHelper.ticketCreator()::visit);
+    }
+
+    @VisibleForTesting
+    static final class CommandGetCatalogsConstants {
+
+        /**
+         * Models return type for {@link CommandGetCatalogs}, {@link FlightSqlProducer.Schemas#GET_CATALOGS_SCHEMA}.
+         * 
+         * <pre>
+         * catalog_name: utf8 not null
+         * </pre>
+         */
+        @VisibleForTesting
+        static final TableDefinition DEFINITION = TableDefinition.of(
+                ColumnDefinition.ofString(CATALOG_NAME) // out-of-spec
+        );
+        private static final Map<String, Object> ATTRIBUTES = Map.of();
+        private static final Table TABLE = TableTools.newTable(DEFINITION, ATTRIBUTES);
+
+        public static final CommandHandlerFixedBase<CommandGetCatalogs> HANDLER =
+                new CommandStaticTable<>(TABLE, FlightSqlTicketHelper.ticketCreator()::visit);
+    }
+
+    @VisibleForTesting
+    static final class CommandGetDbSchemasConstants {
+
+        /**
+         * Models return type for {@link CommandGetDbSchemas}, {@link FlightSqlProducer.Schemas#GET_SCHEMAS_SCHEMA}.
+         * 
+         * <pre>
+         * catalog_name: utf8,
+         * db_schema_name: utf8 not null
+         * </pre>
+         */
+        @VisibleForTesting
+        static final TableDefinition DEFINITION = TableDefinition.of(
+                ColumnDefinition.ofString(CATALOG_NAME),
+                ColumnDefinition.ofString(DB_SCHEMA_NAME) // out-of-spec
+        );
+        private static final Map<String, Object> ATTRIBUTES = Map.of();
+        private static final Table TABLE = TableTools.newTable(DEFINITION, ATTRIBUTES);
+        public static final CommandHandlerFixedBase<CommandGetDbSchemas> HANDLER = new CommandStaticTable<>(
+                TABLE, FlightSqlTicketHelper.ticketCreator()::visit);
+    }
+
+    @VisibleForTesting
+    static final class CommandGetKeysConstants {
+
+        /**
+         * Models return type for {@link CommandGetImportedKeys} / {@link CommandGetExportedKeys},
+         * {@link FlightSqlProducer.Schemas#GET_IMPORTED_KEYS_SCHEMA},
+         * {@link FlightSqlProducer.Schemas#GET_EXPORTED_KEYS_SCHEMA}.
+         * 
+         * <pre>
+         * pk_catalog_name: utf8,
+         * pk_db_schema_name: utf8,
+         * pk_table_name: utf8 not null,
+         * pk_column_name: utf8 not null,
+         * fk_catalog_name: utf8,
+         * fk_db_schema_name: utf8,
+         * fk_table_name: utf8 not null,
+         * fk_column_name: utf8 not null,
+         * key_sequence: int32 not null,
+         * fk_key_name: utf8,
+         * pk_key_name: utf8,
+         * update_rule: uint8 not null,
+         * delete_rule: uint8 not null
+         * </pre>
+         */
+        @VisibleForTesting
+        static final TableDefinition DEFINITION = TableDefinition.of(
+                ColumnDefinition.ofString(PK_CATALOG_NAME),
+                ColumnDefinition.ofString(PK_DB_SCHEMA_NAME),
+                ColumnDefinition.ofString(PK_TABLE_NAME), // out-of-spec
+                ColumnDefinition.ofString(PK_COLUMN_NAME), // out-of-spec
+                ColumnDefinition.ofString(FK_CATALOG_NAME),
+                ColumnDefinition.ofString(FK_DB_SCHEMA_NAME),
+                ColumnDefinition.ofString(FK_TABLE_NAME), // out-of-spec
+                ColumnDefinition.ofString(FK_COLUMN_NAME), // out-of-spec
+                ColumnDefinition.ofInt(KEY_SEQUENCE), // out-of-spec
+                ColumnDefinition.ofString(FK_KEY_NAME), // yes, this does come _before_ the PK version
+                ColumnDefinition.ofString(PK_KEY_NAME),
+                ColumnDefinition.ofByte(UPDATE_RULE), // out-of-spec
+                ColumnDefinition.ofByte(DELETE_RULE) // out-of-spec
+        );
+
+        private static final Map<String, Object> ATTRIBUTES = Map.of();
+        private static final Table TABLE = TableTools.newTable(DEFINITION, ATTRIBUTES);
+    }
+
+    @VisibleForTesting
+    static final class CommandGetPrimaryKeysConstants {
+
+        /**
+         * Models return type for {@link CommandGetPrimaryKeys} /
+         * {@link FlightSqlProducer.Schemas#GET_PRIMARY_KEYS_SCHEMA}.
+         * 
+         * <pre>
+         * catalog_name: utf8,
+         * db_schema_name: utf8,
+         * table_name: utf8 not null,
+         * column_name: utf8 not null,
+         * key_name: utf8,
+         * key_sequence: int32 not null
+         * </pre>
+         */
+        @VisibleForTesting
+        static final TableDefinition DEFINITION = TableDefinition.of(
+                ColumnDefinition.ofString(CATALOG_NAME),
+                ColumnDefinition.ofString(DB_SCHEMA_NAME),
+                ColumnDefinition.ofString(TABLE_NAME), // out-of-spec
+                ColumnDefinition.ofString(COLUMN_NAME), // out-of-spec
+                ColumnDefinition.ofString(KEY_NAME),
+                ColumnDefinition.ofInt(KEY_SEQUENCE) // out-of-spec
+        );
+
+        private static final Map<String, Object> ATTRIBUTES = Map.of();
+        private static final Table TABLE = TableTools.newTable(DEFINITION, ATTRIBUTES);
+    }
+
+    private boolean hasTable(String catalog, String dbSchema, String table) {
+        if (catalog != null && !catalog.isEmpty()) {
+            return false;
+        }
+        if (dbSchema != null && !dbSchema.isEmpty()) {
+            return false;
+        }
+        final Object obj;
+        final QueryScope scope = ExecutionContext.getContext().getQueryScope();
+        try {
+            obj = scope.readParamValue(table);
+        } catch (QueryScope.MissingVariableException e) {
+            return false;
+        }
+        if (!(obj instanceof Table)) {
+            return false;
+        }
+        return !authorization.isDeniedAccess(obj);
+    }
+
+    private final CommandHandlerFixedBase<CommandGetPrimaryKeys> commandGetPrimaryKeysHandler =
+            new CommandStaticTable<>(CommandGetPrimaryKeysConstants.TABLE,
+                    FlightSqlTicketHelper.ticketCreator()::visit) {
+                @Override
+                void checkForGetInfo(CommandGetPrimaryKeys command) {
+                    if (CommandGetPrimaryKeys.getDefaultInstance().equals(command)) {
+                        // We need to pretend that CommandGetPrimaryKeys.getDefaultInstance() is a valid command until
+                        // we can plumb getSchema through to the resolvers.
+                        // TODO(deephaven-core#6218): feat: expose getSchema to TicketResolvers
+                        return;
+                    }
+                    if (!hasTable(
+                            command.hasCatalog() ? command.getCatalog() : null,
+                            command.hasDbSchema() ? command.getDbSchema() : null,
+                            command.getTable())) {
+                        throw tableNotFound();
+                    }
+                }
+            };
+
+    private final CommandHandlerFixedBase<CommandGetImportedKeys> commandGetImportedKeysHandler =
+            new CommandStaticTable<>(CommandGetKeysConstants.TABLE, FlightSqlTicketHelper.ticketCreator()::visit) {
+                @Override
+                void checkForGetInfo(CommandGetImportedKeys command) {
+                    if (CommandGetImportedKeys.getDefaultInstance().equals(command)) {
+                        // We need to pretend that CommandGetImportedKeys.getDefaultInstance() is a valid command until
+                        // we can plumb getSchema through to the resolvers.
+                        // TODO(deephaven-core#6218): feat: expose getSchema to TicketResolvers
+                        return;
+                    }
+                    if (!hasTable(
+                            command.hasCatalog() ? command.getCatalog() : null,
+                            command.hasDbSchema() ? command.getDbSchema() : null,
+                            command.getTable())) {
+                        throw tableNotFound();
+                    }
+                }
+            };
+
+    private final CommandHandlerFixedBase<CommandGetExportedKeys> commandGetExportedKeysHandler =
+            new CommandStaticTable<>(CommandGetKeysConstants.TABLE, FlightSqlTicketHelper.ticketCreator()::visit) {
+                @Override
+                void checkForGetInfo(CommandGetExportedKeys command) {
+                    if (CommandGetExportedKeys.getDefaultInstance().equals(command)) {
+                        // We need to pretend that CommandGetExportedKeys.getDefaultInstance() is a valid command until
+                        // we can plumb getSchema through to the resolvers.
+                        // TODO(deephaven-core#6218): feat: expose getSchema to TicketResolvers
+                        return;
+                    }
+                    if (!hasTable(
+                            command.hasCatalog() ? command.getCatalog() : null,
+                            command.hasDbSchema() ? command.getDbSchema() : null,
+                            command.getTable())) {
+                        throw tableNotFound();
+                    }
+                }
+            };
+
+    private final CommandHandlerFixedBase<CommandGetTables> commandGetTables = new CommandGetTablesImpl();
+
+    @VisibleForTesting
+    static final class CommandGetTablesConstants {
+
+        /**
+         * Models return type for {@link CommandGetTables} / {@link FlightSqlProducer.Schemas#GET_TABLES_SCHEMA}.
+         * 
+         * <pre>
+         * catalog_name: utf8,
+         * db_schema_name: utf8,
+         * table_name: utf8 not null,
+         * table_type: utf8 not null,
+         * table_schema: bytes not null
+         * </pre>
+         */
+        @VisibleForTesting
+        static final TableDefinition DEFINITION = TableDefinition.of(
+                ColumnDefinition.ofString(CATALOG_NAME),
+                ColumnDefinition.ofString(DB_SCHEMA_NAME),
+                ColumnDefinition.ofString(TABLE_NAME), // out-of-spec
+                ColumnDefinition.ofString(TABLE_TYPE), // out-of-spec
+                ColumnDefinition.fromGenericType(TABLE_SCHEMA, Schema.class) // out-of-spec
+        );
+
+        /**
+         * Models return type for {@link CommandGetTables} /
+         * {@link FlightSqlProducer.Schemas#GET_TABLES_SCHEMA_NO_SCHEMA}.
+         * 
+         * <pre>
+         * catalog_name: utf8,
+         * db_schema_name: utf8,
+         * table_name: utf8 not null,
+         * table_type: utf8 not null,
+         * </pre>
+         */
+        @VisibleForTesting
+        static final TableDefinition DEFINITION_NO_SCHEMA = TableDefinition.of(
+                ColumnDefinition.ofString(CATALOG_NAME),
+                ColumnDefinition.ofString(DB_SCHEMA_NAME), // out-of-spec
+                ColumnDefinition.ofString(TABLE_NAME), // out-of-spec
+                ColumnDefinition.ofString(TABLE_TYPE));
+
+        private static final Map<String, Object> ATTRIBUTES = Map.of();
+
+        private static final ByteString SCHEMA_BYTES_NO_SCHEMA =
+                BarrageUtil.schemaBytesFromTableDefinition(DEFINITION_NO_SCHEMA, ATTRIBUTES, true);
+
+        private static final ByteString SCHEMA_BYTES =
+                BarrageUtil.schemaBytesFromTableDefinition(DEFINITION, ATTRIBUTES, true);
+    }
+
+    private class CommandGetTablesImpl extends CommandHandlerFixedBase<CommandGetTables> {
+
+        @Override
+        Ticket ticket(CommandGetTables command) {
+            return FlightSqlTicketHelper.ticketCreator().visit(command);
+        }
+
+        @Override
+        ByteString schemaBytes(CommandGetTables command) {
+            return command.getIncludeSchema()
+                    ? CommandGetTablesConstants.SCHEMA_BYTES
+                    : CommandGetTablesConstants.SCHEMA_BYTES_NO_SCHEMA;
+        }
+
+        @Override
+        public Table table(CommandGetTables request) {
+            // A not present `catalog` means "don't filter based on catalog".
+            // An empty `catalog` string explicitly means "only return tables that don't have a catalog".
+            // In our case (since we don't expose catalogs ATM), we can combine them.
+            final boolean hasCatalog = request.hasCatalog() && !request.getCatalog().isEmpty();
+
+            // `table_types` is a set that the user wants to include, empty means "include all".
+            final boolean hasTableTypeTable =
+                    request.getTableTypesCount() == 0 || request.getTableTypesList().contains(TABLE_TYPE_TABLE);
+
+            final boolean includeSchema = request.getIncludeSchema();
+            if (hasCatalog || !hasTableTypeTable || request.hasDbSchemaFilterPattern()) {
+                return getTablesEmpty(includeSchema, CommandGetTablesConstants.ATTRIBUTES);
+            }
+            final Predicate<String> tableNameFilter = request.hasTableNameFilterPattern()
+                    ? flightSqlFilterPredicate(request.getTableNameFilterPattern())
+                    : x -> true;
+            return getTables(includeSchema, ExecutionContext.getContext().getQueryScope(),
+                    CommandGetTablesConstants.ATTRIBUTES, tableNameFilter);
+        }
+
+        private Table getTablesEmpty(boolean includeSchema, Map<String, Object> attributes) {
+            return includeSchema
+                    ? TableTools.newTable(CommandGetTablesConstants.DEFINITION, attributes)
+                    : TableTools.newTable(CommandGetTablesConstants.DEFINITION_NO_SCHEMA, attributes);
+        }
+
+        private Table getTables(boolean includeSchema, QueryScope queryScope, Map<String, Object> attributes,
+                Predicate<String> tableNameFilter) {
+            Objects.requireNonNull(attributes);
+            // Note: _not_ using queryScopeAuthorizedTable mapper; we can have a more efficient implementation when
+            // !includeSchema that only needs to check authorization.isDeniedAccess.
+            final Map<String, Table> queryScopeTables = queryScope.toMap(
+                    o -> queryScopeTableMapper(queryScope, o),
+                    (tableName, table) -> table != null && tableNameFilter.test(tableName));
+            final int size = queryScopeTables.size();
+            final String[] catalogNames = new String[size];
+            final String[] dbSchemaNames = new String[size];
+            final String[] tableNames = new String[size];
+            final String[] tableTypes = new String[size];
+            final Schema[] tableSchemas = includeSchema ? new Schema[size] : null;
+            int count = 0;
+            for (Entry<String, Table> e : queryScopeTables.entrySet()) {
+                final String tableName = e.getKey();
+                final Schema schema;
+                if (includeSchema) {
+                    final Table table = authorization.transform(e.getValue());
+                    if (table == null) {
+                        continue;
+                    }
+                    schema = BarrageUtil.schemaFromTable(table);
+                } else {
+                    if (authorization.isDeniedAccess(e.getValue())) {
+                        continue;
+                    }
+                    schema = null;
+                }
+                catalogNames[count] = null;
+                dbSchemaNames[count] = null;
+                tableNames[count] = tableName;
+                tableTypes[count] = TABLE_TYPE_TABLE;
+                if (includeSchema) {
+                    tableSchemas[count] = schema;
+                }
+                ++count;
+            }
+            final ColumnHolder<String> c1 = TableTools.stringCol(CATALOG_NAME, catalogNames);
+            final ColumnHolder<String> c2 = TableTools.stringCol(DB_SCHEMA_NAME, dbSchemaNames);
+            final ColumnHolder<String> c3 = TableTools.stringCol(TABLE_NAME, tableNames);
+            final ColumnHolder<String> c4 = TableTools.stringCol(TABLE_TYPE, tableTypes);
+            final ColumnHolder<Schema> c5 = includeSchema
+                    ? new ColumnHolder<>(TABLE_SCHEMA, Schema.class, null, false, tableSchemas)
+                    : null;
+            final Table newTable = includeSchema
+                    ? TableTools.newTable(CommandGetTablesConstants.DEFINITION, attributes, c1, c2, c3, c4, c5)
+                    : TableTools.newTable(CommandGetTablesConstants.DEFINITION_NO_SCHEMA, attributes, c1, c2, c3, c4);
+            return count == size
+                    ? newTable
+                    : newTable.head(count);
+        }
+    }
+
+    // ---------------------------------------------------------------------------------------------------------------
+
+    private <Response extends Message> void executeAction(
+            final SessionState session,
+            final ActionHandler<Response> handler,
+            final StreamObserver<Result> observer) {
+        // If there was complicated logic going on (actual building of tables), or needed to block, we would instead use
+        // exports or some other mechanism of doing this work off-thread. For now, it's simple enough that we can do it
+        // all on this RPC thread.
+        handler.execute(session, new SafelyOnNextConsumer<>(observer));
+        GrpcUtil.safelyComplete(observer);
+    }
+
+    private class ActionHandlerVisitor
+            extends FlightSqlActionHelper.ActionVisitorBase<ActionHandler<? extends Message>> {
+        @Override
+        public ActionHandler<? extends Message> visit(ActionCreatePreparedStatementRequest action) {
+            return new CreatePreparedStatementImpl(action);
+        }
+
+        @Override
+        public ActionHandler<? extends Message> visit(ActionClosePreparedStatementRequest action) {
+            return new ClosePreparedStatementImpl(action);
+        }
+
+        @Override
+        public ActionHandler<? extends Message> visitDefault(ActionType actionType, Object action) {
+            return new UnsupportedAction<>(actionType);
+        }
+    }
+
+    private static org.apache.arrow.flight.Result pack(com.google.protobuf.Message message) {
+        return new org.apache.arrow.flight.Result(Any.pack(message).toByteArray());
+    }
+
+    private PreparedStatement getPreparedStatement(SessionState session, ByteString handle) {
+        Objects.requireNonNull(session);
+        final PreparedStatement preparedStatement = preparedStatements.get(handle);
+        if (preparedStatement == null) {
+            throw error(Code.NOT_FOUND, "Unknown Prepared Statement");
+        }
+        preparedStatement.verifyOwner(session);
+        return preparedStatement;
+    }
+
+    interface ActionHandler<Response> {
+
+        void execute(SessionState session, Consumer<Response> visitor);
+    }
+
+    static abstract class ActionBase<Request extends com.google.protobuf.Message, Response>
+            implements ActionHandler<Response> {
+
+        final ActionType type;
+        final Request request;
+
+        public ActionBase(Request request, ActionType type) {
+            this.type = Objects.requireNonNull(type);
+            this.request = Objects.requireNonNull(request);
+        }
+    }
+
+    final class CreatePreparedStatementImpl
+            extends ActionBase<ActionCreatePreparedStatementRequest, ActionCreatePreparedStatementResult> {
+        public CreatePreparedStatementImpl(ActionCreatePreparedStatementRequest request) {
+            super(request, FlightSqlUtils.FLIGHT_SQL_CREATE_PREPARED_STATEMENT);
+        }
+
+        @Override
+        public void execute(
+                final SessionState session,
+                final Consumer<ActionCreatePreparedStatementResult> visitor) {
+            if (request.hasTransactionId()) {
+                throw transactionIdsNotSupported();
+            }
+            // It could be good to parse the query at this point in time to ensure it's valid and _not_ parameterized;
+            // we will need to dig into Calcite further to explore this possibility. For now, we will error out either
+            // when the client tries to do a DoPut for the parameter value, or during the Ticket execution, if the query
+            // is invalid.
+            final PreparedStatement prepared = new PreparedStatement(session, request.getQuery());
+
+            // Note: we are providing a fake dataset schema here since the Flight SQL JDBC driver uses the results as an
+            // indication of whether the query is a SELECT or UPDATE, see
+            // org.apache.arrow.driver.jdbc.client.ArrowFlightSqlClientHandler.PreparedStatement.getType. There should
+            // likely be some better way the driver could be implemented...
+            //
+            // Regardless, the client is not allowed to assume correctness of the returned schema. For example, the
+            // parameterized query `SELECT ?` is undefined at this point in time. We may need to re-examine this if we
+            // eventually support non-trivial parameterized queries (it may be necessary to set setParameterSchema, even
+            // if we don't know exactly what they will be).
+            //
+            // There does seem to be some conflicting guidance on whether dataset_schema is actually required or not.
+            //
+            // From the FlightSql.proto:
+            //
+            // > If a result set generating query was provided, dataset_schema contains the schema of the result set.
+            // It should be an IPC-encapsulated Schema, as described in Schema.fbs. For some queries, the schema of the
+            // results may depend on the schema of the parameters. The server should provide its best guess as to the
+            // schema at this point. Clients must not assume that this schema, if provided, will be accurate.
+            //
+            // From https://arrow.apache.org/docs/format/FlightSql.html#query-execution
+            //
+            // > The response will contain an opaque handle used to identify the prepared statement. It may also contain
+            // two optional schemas: the Arrow schema of the result set, and the Arrow schema of the bind parameters (if
+            // any). Because the schema of the result set may depend on the bind parameters, the schemas may not
+            // necessarily be provided here as a result, or if provided, they may not be accurate. Clients should not
+            // assume the schema provided here will be the schema of any data actually returned by executing the
+            // prepared statement.
+            //
+            // > Some statements may have bind parameters without any specific type. (As a trivial example for SQL,
+            // consider SELECT ?.) It is not currently specified how this should be handled in the bind parameter schema
+            // above. We suggest either using a union type to enumerate the possible types, or using the NA (null) type
+            // as a wildcard/placeholder.
+            final ByteString datasetSchemaBytes;
+            try {
+                datasetSchemaBytes = serializeToByteString(DATASET_SCHEMA_SENTINEL);
+            } catch (IOException e) {
+                throw new UncheckedIOException(e);
+            }
+            final ActionCreatePreparedStatementResult response = ActionCreatePreparedStatementResult.newBuilder()
+                    .setPreparedStatementHandle(prepared.handleId())
+                    .setDatasetSchema(datasetSchemaBytes)
+                    // .setParameterSchema(...)
+                    .build();
+            visitor.accept(response);
+        }
+    }
+
+    // Faking it as Empty message so it types check
+    final class ClosePreparedStatementImpl extends ActionBase<ActionClosePreparedStatementRequest, Empty> {
+        public ClosePreparedStatementImpl(ActionClosePreparedStatementRequest request) {
+            super(request, FlightSqlUtils.FLIGHT_SQL_CLOSE_PREPARED_STATEMENT);
+        }
+
+        @Override
+        public void execute(
+                final SessionState session,
+                final Consumer<Empty> visitor) {
+            final PreparedStatement prepared = getPreparedStatement(session, request.getPreparedStatementHandle());
+            prepared.close();
+            // no responses
+        }
+    }
+
+    static final class UnsupportedAction<Response> implements ActionHandler<Response> {
+        private final ActionType type;
+
+        public UnsupportedAction(ActionType type) {
+            this.type = Objects.requireNonNull(type);
+        }
+
+        @Override
+        public void execute(SessionState session, Consumer<Response> visitor) {
+            throw error(Code.UNIMPLEMENTED,
+                    String.format("Action type '%s' is unimplemented", type.getType()));
+        }
+    }
+
+    private static class SafelyOnNextConsumer<Response extends Message> implements Consumer<Response> {
+        private final StreamObserver<Result> delegate;
+
+        public SafelyOnNextConsumer(StreamObserver<Result> delegate) {
+            this.delegate = Objects.requireNonNull(delegate);
+        }
+
+        @Override
+        public void accept(Response response) {
+            GrpcUtil.safelyOnNext(delegate, pack(response));
+        }
+    }
+
+    // ---------------------------------------------------------------------------------------------------------------
+
+    private static StatusRuntimeException unauthenticatedError() {
+        return error(Code.UNAUTHENTICATED, "Must be authenticated");
+    }
+
+    private static StatusRuntimeException permissionDeniedWithHelpfulMessage() {
+        return error(Code.PERMISSION_DENIED,
+                "Must use the original session; is the client echoing the authentication token properly? Some clients may need to explicitly enable cookie-based authentication with the header x-deephaven-auth-cookie-request=true (namely, Java Flight SQL JDBC drivers, and maybe others).");
+    }
+
+    private static StatusRuntimeException tableNotFound() {
+        return error(Code.NOT_FOUND, "table not found");
+    }
+
+    private static StatusRuntimeException transactionIdsNotSupported() {
+        return error(Code.INVALID_ARGUMENT, "transaction ids are not supported");
+    }
+
+    private static StatusRuntimeException queryParametersNotSupported(RuntimeException cause) {
+        return error(Code.INVALID_ARGUMENT, "query parameters are not supported", cause);
+    }
+
+    /*
+     * The random number generator used by this class to create random based UUIDs. In a holder class to defer
+     * initialization until needed.
+     */
+    private static class Holder {
+        static final SecureRandom SECURE_RANDOM = new SecureRandom();
+    }
+
+    private static ByteString randomHandleId() {
+        // While we don't _rely_ on security through obscurity, we don't want to have a simple incrementing counter
+        // since it would be trivial to deduce other users' handleIds.
+        final byte[] handleIdBytes = new byte[16];
+        Holder.SECURE_RANDOM.nextBytes(handleIdBytes);
+        return ByteStringAccess.wrap(handleIdBytes);
+    }
+
+    private enum ByteStringAsHex implements LogOutput.ObjFormatter<ByteString> {
+        INSTANCE;
+
+        @Override
+        public void format(LogOutput logOutput, ByteString bytes) {
+            logOutput.append("0x").append(ByteHelper.byteBufToHex(bytes.asReadOnlyByteBuffer()));
+        }
+    }
+
+    private class PreparedStatement {
+        private final ByteString handleId;
+        private final SessionState session;
+        private final String parameterizedQuery;
+        private final Set<CommandPreparedStatementQueryImpl> queries;
+        private final Closeable onSessionClosedCallback;
+
+        PreparedStatement(SessionState session, String parameterizedQuery) {
+            this.session = Objects.requireNonNull(session);
+            this.parameterizedQuery = Objects.requireNonNull(parameterizedQuery);
+            this.handleId = randomHandleId();
+            this.queries = new HashSet<>();
+            preparedStatements.put(handleId, this);
+            this.session.addOnCloseCallback(onSessionClosedCallback = this::onSessionClosed);
+        }
+
+        public ByteString handleId() {
+            return handleId;
+        }
+
+        public String parameterizedQuery() {
+            return parameterizedQuery;
+        }
+
+        public void verifyOwner(SessionState session) {
+            if (!this.session.equals(session)) {
+                // We should not be concerned about returning "NOT_FOUND" here; the handleId is sufficiently random that
+                // it is much more likely an authentication setup issue.
+                throw permissionDeniedWithHelpfulMessage();
+            }
+        }
+
+        public synchronized void attach(CommandPreparedStatementQueryImpl query) {
+            queries.add(query);
+        }
+
+        public synchronized void detach(CommandPreparedStatementQueryImpl query) {
+            queries.remove(query);
+        }
+
+        public void close() {
+            closeImpl();
+            session.removeOnCloseCallback(onSessionClosedCallback);
+        }
+
+        private void onSessionClosed() {
+            log.debug()
+                    .append("onSessionClosed: removing prepared statement handleId=")
+                    .append(ByteStringAsHex.INSTANCE, handleId)
+                    .endl();
+            closeImpl();
+        }
+
+        private synchronized void closeImpl() {
+            if (!preparedStatements.remove(handleId, this)) {
+                return;
+            }
+            for (CommandPreparedStatementQueryImpl query : queries) {
+                query.releaseImpl(false);
+            }
+            queries.clear();
+        }
+    }
+
+    /**
+     * The Arrow "specification" for filter pattern leaves a lot to be desired. In totality:
+     *
+     * <pre>
+     * In the pattern string, two special characters can be used to denote matching rules:
+     *    - "%" means to match any substring with 0 or more characters.
+     *    - "_" means to match any one character.
+     * </pre>
+     *
+     * There does not seem to be any potential for escaping, which means that underscores can't explicitly be matched
+     * against, which is a common pattern used in Deephaven table names. As mentioned below, it also follows that an
+     * empty string should only explicitly match against an empty string.
+     *
+     * <p>
+     * The <a href=
+     * "https://github.com/apache/arrow/blob/apache-arrow-18.0.0/java/flight/flight-sql-jdbc-core/src/main/java/org/apache/arrow/driver/jdbc/ArrowDatabaseMetadata.java#L1253-L1277">flight-sql-jdbc-core
+     * implement of sqlToRegexLike</a> uses a similar approach, but appears more fragile as it is doing manual escaping
+     * of regex as opposed to {@link Pattern#quote(String)}.
+     */
+    @VisibleForTesting
+    static Predicate<String> flightSqlFilterPredicate(String flightSqlPattern) {
+        // TODO(deephaven-core#6403): Flight SQL filter pattern improvements
+        // This is the technically correct, although likely represents a Flight SQL client mis-use, as the results will
+        // be empty (unless an empty db_schema_name is allowed).
+        //
+        // Unlike the "catalog" field in CommandGetDbSchemas (/ CommandGetTables) where an empty string means
+        // "retrieves those without a catalog", an empty filter pattern does not seem to be meant to match the
+        // respective field where the value is not present.
+        //
+        // The Arrow schema for CommandGetDbSchemas explicitly points out that the returned db_schema_name is not null,
+        // which implies that filter patterns are not meant to match against fields where the value is not present
+        // (null).
+        if (flightSqlPattern.isEmpty()) {
+            // If Deephaven supports catalog / db_schema_name in the future and db_schema_name can be empty, we'd need
+            // to match on that.
+            // return String::isEmpty;
+            return x -> false;
+        }
+        if ("%".equals(flightSqlPattern)) {
+            return x -> true;
+        }
+        if (flightSqlPattern.indexOf('%') == -1 && flightSqlPattern.indexOf('_') == -1) {
+            // If there are no special characters, search for an exact match; this case was explicitly seen via the
+            // Flight SQL JDBC driver.
+            return flightSqlPattern::equals;
+        }
+        final StringBuilder pattern = new StringBuilder();
+        final StringBuilder quoted = new StringBuilder();
+        final Runnable appendQuoted = () -> {
+            if (quoted.length() != 0) {
+                pattern.append(Pattern.quote(quoted.toString()));
+                quoted.setLength(0);
+            }
+        };
+        try (final IntStream codePoints = flightSqlPattern.codePoints()) {
+            final PrimitiveIterator.OfInt it = codePoints.iterator();
+            while (it.hasNext()) {
+                final int codePoint = it.nextInt();
+                if (Character.isBmpCodePoint(codePoint)) {
+                    final char c = (char) codePoint;
+                    if (c == '%') {
+                        appendQuoted.run();
+                        pattern.append(".*");
+                    } else if (c == '_') {
+                        appendQuoted.run();
+                        pattern.append('.');
+                    } else {
+                        quoted.append(c);
+                    }
+                } else {
+                    quoted.appendCodePoint(codePoint);
+                }
+            }
+        }
+        appendQuoted.run();
+        final Pattern p = Pattern.compile(pattern.toString());
+        return x -> p.matcher(x).matches();
+    }
+
+    private static ByteString serializeToByteString(Schema schema) throws IOException {
+        final ByteArrayOutputStream outputStream = new ByteArrayOutputStream();
+        ArrowIpcUtil.serialize(outputStream, schema);
+        return ByteStringAccess.wrap(outputStream.toByteArray());
+    }
+
+    private static Timestamp timestamp(Instant instant) {
+        return Timestamp.newBuilder()
+                .setSeconds(instant.getEpochSecond())
+                .setNanos(instant.getNano())
+                .build();
+    }
+}
diff --git a/extensions/flight-sql/src/main/java/io/deephaven/server/flightsql/FlightSqlSharedConstants.java b/extensions/flight-sql/src/main/java/io/deephaven/server/flightsql/FlightSqlSharedConstants.java
new file mode 100644
index 00000000000..f605d068cde
--- /dev/null
+++ b/extensions/flight-sql/src/main/java/io/deephaven/server/flightsql/FlightSqlSharedConstants.java
@@ -0,0 +1,45 @@
+//
+// Copyright (c) 2016-2024 Deephaven Data Labs and Patent Pending
+//
+package io.deephaven.server.flightsql;
+
+final class FlightSqlSharedConstants {
+    static final String FLIGHT_SQL_TYPE_PREFIX = "type.googleapis.com/arrow.flight.protocol.sql.";
+
+    static final String FLIGHT_SQL_COMMAND_TYPE_PREFIX = FLIGHT_SQL_TYPE_PREFIX + "Command";
+
+    static final String COMMAND_GET_XDBC_TYPE_INFO_TYPE_URL = FLIGHT_SQL_COMMAND_TYPE_PREFIX + "GetXdbcTypeInfo";
+
+    static final String COMMAND_GET_PRIMARY_KEYS_TYPE_URL = FLIGHT_SQL_COMMAND_TYPE_PREFIX + "GetPrimaryKeys";
+
+    static final String COMMAND_GET_IMPORTED_KEYS_TYPE_URL = FLIGHT_SQL_COMMAND_TYPE_PREFIX + "GetImportedKeys";
+
+    static final String COMMAND_GET_EXPORTED_KEYS_TYPE_URL = FLIGHT_SQL_COMMAND_TYPE_PREFIX + "GetExportedKeys";
+
+    static final String COMMAND_GET_CROSS_REFERENCE_TYPE_URL = FLIGHT_SQL_COMMAND_TYPE_PREFIX + "GetCrossReference";
+
+    static final String COMMAND_GET_SQL_INFO_TYPE_URL = FLIGHT_SQL_COMMAND_TYPE_PREFIX + "GetSqlInfo";
+
+    static final String COMMAND_GET_TABLES_TYPE_URL = FLIGHT_SQL_COMMAND_TYPE_PREFIX + "GetTables";
+
+    static final String COMMAND_GET_DB_SCHEMAS_TYPE_URL = FLIGHT_SQL_COMMAND_TYPE_PREFIX + "GetDbSchemas";
+
+    static final String COMMAND_GET_CATALOGS_TYPE_URL = FLIGHT_SQL_COMMAND_TYPE_PREFIX + "GetCatalogs";
+
+    static final String COMMAND_GET_TABLE_TYPES_TYPE_URL = FLIGHT_SQL_COMMAND_TYPE_PREFIX + "GetTableTypes";
+
+    static final String COMMAND_PREPARED_STATEMENT_UPDATE_TYPE_URL =
+            FLIGHT_SQL_COMMAND_TYPE_PREFIX + "PreparedStatementUpdate";
+
+    static final String COMMAND_PREPARED_STATEMENT_QUERY_TYPE_URL =
+            FLIGHT_SQL_COMMAND_TYPE_PREFIX + "PreparedStatementQuery";
+
+    static final String COMMAND_STATEMENT_SUBSTRAIT_PLAN_TYPE_URL =
+            FLIGHT_SQL_COMMAND_TYPE_PREFIX + "StatementSubstraitPlan";
+
+    static final String COMMAND_STATEMENT_UPDATE_TYPE_URL = FLIGHT_SQL_COMMAND_TYPE_PREFIX + "StatementUpdate";
+
+    static final String COMMAND_STATEMENT_QUERY_TYPE_URL = FLIGHT_SQL_COMMAND_TYPE_PREFIX + "StatementQuery";
+
+    static final String COMMAND_STATEMENT_INGEST_TYPE_URL = FLIGHT_SQL_COMMAND_TYPE_PREFIX + "StatementIngest";
+}
diff --git a/extensions/flight-sql/src/main/java/io/deephaven/server/flightsql/FlightSqlTicketHelper.java b/extensions/flight-sql/src/main/java/io/deephaven/server/flightsql/FlightSqlTicketHelper.java
new file mode 100644
index 00000000000..77c4681cf39
--- /dev/null
+++ b/extensions/flight-sql/src/main/java/io/deephaven/server/flightsql/FlightSqlTicketHelper.java
@@ -0,0 +1,178 @@
+//
+// Copyright (c) 2016-2024 Deephaven Data Labs and Patent Pending
+//
+package io.deephaven.server.flightsql;
+
+import com.google.protobuf.Any;
+import com.google.protobuf.ByteString;
+import com.google.protobuf.InvalidProtocolBufferException;
+import com.google.protobuf.Message;
+import io.deephaven.base.verify.Assert;
+import io.deephaven.util.annotations.VisibleForTesting;
+import io.grpc.Status;
+import io.grpc.StatusRuntimeException;
+import org.apache.arrow.flight.impl.Flight.Ticket;
+import org.apache.arrow.flight.sql.impl.FlightSql.CommandGetCatalogs;
+import org.apache.arrow.flight.sql.impl.FlightSql.CommandGetDbSchemas;
+import org.apache.arrow.flight.sql.impl.FlightSql.CommandGetExportedKeys;
+import org.apache.arrow.flight.sql.impl.FlightSql.CommandGetImportedKeys;
+import org.apache.arrow.flight.sql.impl.FlightSql.CommandGetPrimaryKeys;
+import org.apache.arrow.flight.sql.impl.FlightSql.CommandGetTableTypes;
+import org.apache.arrow.flight.sql.impl.FlightSql.CommandGetTables;
+import org.apache.arrow.flight.sql.impl.FlightSql.TicketStatementQuery;
+
+import java.nio.ByteBuffer;
+
+import static io.deephaven.server.flightsql.FlightSqlSharedConstants.COMMAND_GET_CATALOGS_TYPE_URL;
+import static io.deephaven.server.flightsql.FlightSqlSharedConstants.COMMAND_GET_DB_SCHEMAS_TYPE_URL;
+import static io.deephaven.server.flightsql.FlightSqlSharedConstants.COMMAND_GET_EXPORTED_KEYS_TYPE_URL;
+import static io.deephaven.server.flightsql.FlightSqlSharedConstants.COMMAND_GET_IMPORTED_KEYS_TYPE_URL;
+import static io.deephaven.server.flightsql.FlightSqlSharedConstants.COMMAND_GET_PRIMARY_KEYS_TYPE_URL;
+import static io.deephaven.server.flightsql.FlightSqlSharedConstants.COMMAND_GET_TABLES_TYPE_URL;
+import static io.deephaven.server.flightsql.FlightSqlSharedConstants.COMMAND_GET_TABLE_TYPES_TYPE_URL;
+
+final class FlightSqlTicketHelper {
+
+    public static final char TICKET_PREFIX = 'q';
+
+    // This is a server-implementation detail, but happens to be the same scheme that Flight SQL
+    // org.apache.arrow.flight.sql.FlightSqlProducer uses
+    @VisibleForTesting
+    static final String TICKET_STATEMENT_QUERY_TYPE_URL =
+            FlightSqlSharedConstants.FLIGHT_SQL_TYPE_PREFIX + "TicketStatementQuery";
+
+    private static final ByteString PREFIX = ByteString.copyFrom(new byte[] {(byte) TICKET_PREFIX});
+
+    interface TicketVisitor<T> {
+
+        // These ticket objects could be anything we want; they don't _have_ to be the protobuf objects. But, they are
+        // convenient as they already contain the information needed to act on the ticket.
+
+        T visit(CommandGetCatalogs ticket);
+
+        T visit(CommandGetDbSchemas ticket);
+
+        T visit(CommandGetTableTypes ticket);
+
+        T visit(CommandGetImportedKeys ticket);
+
+        T visit(CommandGetExportedKeys ticket);
+
+        T visit(CommandGetPrimaryKeys ticket);
+
+        T visit(CommandGetTables ticket);
+
+        T visit(TicketStatementQuery ticket);
+    }
+
+    public static TicketVisitor<Ticket> ticketCreator() {
+        return TicketCreator.INSTANCE;
+    }
+
+    public static String toReadableString(final ByteBuffer ticket, final String logId) {
+        final Any any = partialUnpackTicket(ticket, logId);
+        // We don't necessarily want to print out the full protobuf; this will at least give some more logging info on
+        // the type of the ticket.
+        return any.getTypeUrl();
+    }
+
+    public static <T> T visit(ByteBuffer ticket, TicketVisitor<T> visitor, String logId) {
+        return visit(partialUnpackTicket(ticket, logId), visitor, logId);
+    }
+
+    private static Any partialUnpackTicket(ByteBuffer ticket, final String logId) {
+        ticket = ticket.slice();
+        // If false, it means there is an error with FlightSqlResolver.ticketRoute / TicketRouter.getResolver
+        Assert.eq(ticket.get(), "ticket.get()", TICKET_PREFIX, "TICKET_PREFIX");
+        try {
+            return Any.parseFrom(ticket);
+        } catch (InvalidProtocolBufferException e) {
+            throw invalidTicket(logId);
+        }
+    }
+
+    private static <T> T visit(Any ticket, TicketVisitor<T> visitor, String logId) {
+        switch (ticket.getTypeUrl()) {
+            case TICKET_STATEMENT_QUERY_TYPE_URL:
+                return visitor.visit(unpack(ticket, TicketStatementQuery.class, logId));
+            case COMMAND_GET_TABLES_TYPE_URL:
+                return visitor.visit(unpack(ticket, CommandGetTables.class, logId));
+            case COMMAND_GET_TABLE_TYPES_TYPE_URL:
+                return visitor.visit(unpack(ticket, CommandGetTableTypes.class, logId));
+            case COMMAND_GET_CATALOGS_TYPE_URL:
+                return visitor.visit(unpack(ticket, CommandGetCatalogs.class, logId));
+            case COMMAND_GET_DB_SCHEMAS_TYPE_URL:
+                return visitor.visit(unpack(ticket, CommandGetDbSchemas.class, logId));
+            case COMMAND_GET_PRIMARY_KEYS_TYPE_URL:
+                return visitor.visit(unpack(ticket, CommandGetPrimaryKeys.class, logId));
+            case COMMAND_GET_IMPORTED_KEYS_TYPE_URL:
+                return visitor.visit(unpack(ticket, CommandGetImportedKeys.class, logId));
+            case COMMAND_GET_EXPORTED_KEYS_TYPE_URL:
+                return visitor.visit(unpack(ticket, CommandGetExportedKeys.class, logId));
+        }
+        throw invalidTicket(logId);
+    }
+
+    private enum TicketCreator implements TicketVisitor<Ticket> {
+        INSTANCE;
+
+        @Override
+        public Ticket visit(CommandGetCatalogs ticket) {
+            return packedTicket(ticket);
+        }
+
+        @Override
+        public Ticket visit(CommandGetDbSchemas ticket) {
+            return packedTicket(ticket);
+        }
+
+        @Override
+        public Ticket visit(CommandGetTableTypes ticket) {
+            return packedTicket(ticket);
+        }
+
+        @Override
+        public Ticket visit(CommandGetImportedKeys ticket) {
+            return packedTicket(ticket);
+        }
+
+        @Override
+        public Ticket visit(CommandGetExportedKeys ticket) {
+            return packedTicket(ticket);
+        }
+
+        @Override
+        public Ticket visit(CommandGetPrimaryKeys ticket) {
+            return packedTicket(ticket);
+        }
+
+        @Override
+        public Ticket visit(CommandGetTables ticket) {
+            return packedTicket(ticket);
+        }
+
+        @Override
+        public Ticket visit(TicketStatementQuery ticket) {
+            return packedTicket(ticket);
+        }
+
+        private static Ticket packedTicket(Message message) {
+            // Note: this is _similar_ to how the Flight SQL example server implementation constructs tickets using
+            // Any#pack; the big difference is that all DH tickets must (currently) be uniquely route-able based on the
+            // first byte of the ticket.
+            return Ticket.newBuilder().setTicket(PREFIX.concat(Any.pack(message).toByteString())).build();
+        }
+    }
+
+    private static StatusRuntimeException invalidTicket(String logId) {
+        return FlightSqlErrorHelper.error(Status.Code.FAILED_PRECONDITION, String.format("Invalid ticket, %s", logId));
+    }
+
+    private static <T extends Message> T unpack(Any ticket, Class<T> clazz, String logId) {
+        try {
+            return ticket.unpack(clazz);
+        } catch (InvalidProtocolBufferException e) {
+            throw invalidTicket(logId);
+        }
+    }
+}
diff --git a/extensions/flight-sql/src/main/java/io/deephaven/server/flightsql/TableCreatorScopeTickets.java b/extensions/flight-sql/src/main/java/io/deephaven/server/flightsql/TableCreatorScopeTickets.java
new file mode 100644
index 00000000000..e2cd52c52b6
--- /dev/null
+++ b/extensions/flight-sql/src/main/java/io/deephaven/server/flightsql/TableCreatorScopeTickets.java
@@ -0,0 +1,37 @@
+//
+// Copyright (c) 2016-2024 Deephaven Data Labs and Patent Pending
+//
+package io.deephaven.server.flightsql;
+
+import io.deephaven.base.verify.Assert;
+import io.deephaven.engine.table.Table;
+import io.deephaven.qst.TableCreator;
+import io.deephaven.qst.TableCreatorDelegate;
+import io.deephaven.qst.table.TicketTable;
+
+import java.util.Map;
+import java.util.Objects;
+
+final class TableCreatorScopeTickets extends TableCreatorDelegate<Table> {
+
+    static TicketTable ticketTable(String variableName) {
+        return TicketTable.fromQueryScopeField(variableName);
+    }
+
+    private final Map<String, Table> map;
+
+    TableCreatorScopeTickets(TableCreator<Table> delegate, Map<String, Table> map) {
+        super(delegate);
+        this.map = Objects.requireNonNull(map);
+    }
+
+    @Override
+    public Table of(TicketTable ticketTable) {
+        final byte[] ticket = ticketTable.ticket();
+        Assert.gt(ticket.length, "ticket.length", 2);
+        Assert.eq(ticket[0], "ticket[0]", (byte) 's');
+        Assert.eq(ticket[1], "ticket[1]", (byte) '/');
+        final String variableName = new String(ticket, 2, ticket.length - 2);
+        return Objects.requireNonNull(map.get(variableName));
+    }
+}
diff --git a/extensions/flight-sql/src/test/java/io/deephaven/server/flightsql/FlightSqlFilterPredicateTest.java b/extensions/flight-sql/src/test/java/io/deephaven/server/flightsql/FlightSqlFilterPredicateTest.java
new file mode 100644
index 00000000000..9ac5c4221a0
--- /dev/null
+++ b/extensions/flight-sql/src/test/java/io/deephaven/server/flightsql/FlightSqlFilterPredicateTest.java
@@ -0,0 +1,179 @@
+//
+// Copyright (c) 2016-2024 Deephaven Data Labs and Patent Pending
+//
+package io.deephaven.server.flightsql;
+
+import org.assertj.core.api.PredicateAssert;
+import org.junit.jupiter.api.Disabled;
+import org.junit.jupiter.api.Test;
+
+import java.util.List;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+class FlightSqlFilterPredicateTest {
+
+    private static final List<String> EMPTY_STRING = List.of("");
+
+    private static final List<String> ONE_CHARS = List.of(" ", "X", "%", "_", ".", "*", "\uD83D\uDCA9");
+
+    private static final List<String> TWO_CHARS =
+            List.of("ab", "Cd", "F ", " f", "_-", "  ", "\uD83D\uDCA9\uD83D\uDCA9");
+
+    private static final List<String> THREE_CHARS =
+            List.of("abc", "Cde", "F  ", "  f", " v ", "_-_", "   ", "\uD83D\uDCA9\uD83D\uDCA9\uD83D\uDCA9");
+
+    @Test
+    void rejectAll() {
+        predicate("")
+                .rejectsAll(EMPTY_STRING)
+                .rejectsAll(ONE_CHARS)
+                .rejectsAll(TWO_CHARS)
+                .rejectsAll(THREE_CHARS);
+    }
+
+    @Test
+    void acceptAll() {
+        for (String flightSqlPattern : new String[] {"%", "%%", "%%%", "%%%%"}) {
+            predicate(flightSqlPattern)
+                    .acceptsAll(EMPTY_STRING)
+                    .acceptsAll(ONE_CHARS)
+                    .acceptsAll(TWO_CHARS)
+                    .acceptsAll(THREE_CHARS);
+        }
+    }
+
+    @Test
+    void acceptsAnyOneChar() {
+        predicate("_")
+                .rejectsAll(EMPTY_STRING)
+                .acceptsAll(ONE_CHARS)
+                .rejectsAll(TWO_CHARS)
+                .rejectsAll(THREE_CHARS);
+    }
+
+    @Test
+    void acceptsOnePlusChar() {
+        for (String flightSqlPattern : new String[] {"_%", "%_"}) {
+            predicate(flightSqlPattern)
+                    .rejectsAll(EMPTY_STRING)
+                    .acceptsAll(ONE_CHARS)
+                    .acceptsAll(TWO_CHARS)
+                    .acceptsAll(THREE_CHARS);
+        }
+    }
+
+    @Test
+    void acceptsTwoPlusChar() {
+        for (String flightSqlPattern : new String[] {"__%", "%__", "_%_"}) {
+            predicate(flightSqlPattern)
+                    .rejectsAll(EMPTY_STRING)
+                    .rejectsAll(ONE_CHARS)
+                    .acceptsAll(TWO_CHARS)
+                    .acceptsAll(THREE_CHARS);
+        }
+    }
+
+    @Test
+    void acceptLiteralString() {
+        predicate("Foo")
+                .accepts("Foo")
+                .rejects("Bar")
+                .rejectsAll(EMPTY_STRING)
+                .rejectsAll(ONE_CHARS)
+                .rejectsAll(TWO_CHARS)
+                .rejectsAll(THREE_CHARS);
+
+    }
+
+    @Test
+    void acceptUndescoreAsAnyOne() {
+        predicate("foo_ball")
+                .accepts("foo_ball", "foosball", "foodball", "foo\uD83D\uDCA9ball")
+                .rejects("foo__ball", "Foo_ball", "foo_all", "foo\uD83D\uDCA9\uD83D\uDCA9ball")
+                .rejectsAll(EMPTY_STRING)
+                .rejectsAll(ONE_CHARS)
+                .rejectsAll(TWO_CHARS)
+                .rejectsAll(THREE_CHARS);
+    }
+
+    @Test
+    void acceptUndescoreAsOnePlus() {
+        predicate("foo%ball")
+                .accepts("foo_ball", "foosball", "foodball", "foo\uD83D\uDCA9ball", "foo__ball",
+                        "foo\uD83D\uDCA9\uD83D\uDCA9ball")
+                .rejects("Foo_ball", "foo_all")
+                .rejectsAll(EMPTY_STRING)
+                .rejectsAll(ONE_CHARS)
+                .rejectsAll(TWO_CHARS)
+                .rejectsAll(THREE_CHARS);
+    }
+
+    @Disabled("No way to match literal underscore")
+    @Test
+    void matchLiteralUnderscore() {
+
+    }
+
+    @Disabled("No way to match literal percentage")
+    @Test
+    void matchLiteralPercentage() {
+
+    }
+
+    @Test
+    void plusIsNotSpecial() {
+        predicate("A+")
+                .accepts("A+")
+                .rejects("A", "AA", "A ")
+                .rejectsAll(EMPTY_STRING)
+                .rejectsAll(ONE_CHARS)
+                .rejectsAll(TWO_CHARS)
+                .rejectsAll(THREE_CHARS);
+    }
+
+    @Test
+    void starIsNotSpecial() {
+        predicate("A*")
+                .accepts("A*")
+                .rejects("A", "AA", "A ", "AAA")
+                .rejectsAll(EMPTY_STRING)
+                .rejectsAll(ONE_CHARS)
+                .rejectsAll(TWO_CHARS)
+                .rejectsAll(THREE_CHARS);
+    }
+
+    @Test
+    void dotstarIsNotSpecial() {
+        predicate(".*")
+                .accepts(".*")
+                .rejects("A", "AA", "A ", "AAA")
+                .rejectsAll(EMPTY_STRING)
+                .rejectsAll(ONE_CHARS)
+                .rejectsAll(TWO_CHARS)
+                .rejectsAll(THREE_CHARS);
+    }
+
+    @Test
+    void predicateContainsUnicode() {
+        // A better test would be to include a Unicode character that contains '_' or '%' encoded as part of the low
+        // surrogate (if this is possible), that way we could ensure that it is not treated as a special character
+        predicate("𞸷")
+                .accepts("𞸷")
+                .rejectsAll(EMPTY_STRING)
+                .rejectsAll(ONE_CHARS)
+                .rejectsAll(TWO_CHARS)
+                .rejectsAll(THREE_CHARS);
+        predicate("_𞸷_")
+                .accepts("𞸷𞸷𞸷", "x𞸷X", "T𞸷a", " 𞸷 ")
+                .rejects("𞸷", "𞸷𞸷")
+                .rejectsAll(EMPTY_STRING)
+                .rejectsAll(ONE_CHARS)
+                .rejectsAll(TWO_CHARS)
+                .rejectsAll(THREE_CHARS);
+    }
+
+    private static PredicateAssert<String> predicate(String flightSqlPattern) {
+        return assertThat(FlightSqlResolver.flightSqlFilterPredicate(flightSqlPattern));
+    }
+}
diff --git a/extensions/flight-sql/src/test/java/io/deephaven/server/flightsql/FlightSqlTest.java b/extensions/flight-sql/src/test/java/io/deephaven/server/flightsql/FlightSqlTest.java
new file mode 100644
index 00000000000..b761c7aa039
--- /dev/null
+++ b/extensions/flight-sql/src/test/java/io/deephaven/server/flightsql/FlightSqlTest.java
@@ -0,0 +1,1147 @@
+//
+// Copyright (c) 2016-2024 Deephaven Data Labs and Patent Pending
+//
+package io.deephaven.server.flightsql;
+
+import com.google.protobuf.Any;
+import com.google.protobuf.ByteString;
+import com.google.protobuf.Descriptors.Descriptor;
+import com.google.protobuf.Message;
+import dagger.BindsInstance;
+import dagger.Component;
+import dagger.Module;
+import io.deephaven.engine.context.ExecutionContext;
+import io.deephaven.engine.context.QueryScope;
+import io.deephaven.engine.table.ColumnDefinition;
+import io.deephaven.engine.table.Table;
+import io.deephaven.engine.table.TableDefinition;
+import io.deephaven.engine.util.TableTools;
+import io.deephaven.proto.backplane.grpc.WrappedAuthenticationRequest;
+import io.deephaven.server.auth.AuthorizationProvider;
+import io.deephaven.server.config.ServerConfig;
+import io.deephaven.server.runner.DeephavenApiServerTestBase;
+import io.deephaven.server.runner.DeephavenApiServerTestBase.TestComponent.Builder;
+import io.grpc.ManagedChannel;
+import org.apache.arrow.flight.Action;
+import org.apache.arrow.flight.ActionType;
+import org.apache.arrow.flight.CancelFlightInfoRequest;
+import org.apache.arrow.flight.Criteria;
+import org.apache.arrow.flight.FlightClient;
+import org.apache.arrow.flight.FlightConstants;
+import org.apache.arrow.flight.FlightDescriptor;
+import org.apache.arrow.flight.FlightEndpoint;
+import org.apache.arrow.flight.FlightGrpcUtilsExtension;
+import org.apache.arrow.flight.FlightInfo;
+import org.apache.arrow.flight.FlightRuntimeException;
+import org.apache.arrow.flight.FlightStatusCode;
+import org.apache.arrow.flight.FlightStream;
+import org.apache.arrow.flight.ProtocolExposer;
+import org.apache.arrow.flight.Result;
+import org.apache.arrow.flight.SchemaResult;
+import org.apache.arrow.flight.Ticket;
+import org.apache.arrow.flight.auth.ClientAuthHandler;
+import org.apache.arrow.flight.impl.Flight;
+import org.apache.arrow.flight.sql.FlightSqlClient;
+import org.apache.arrow.flight.sql.FlightSqlClient.PreparedStatement;
+import org.apache.arrow.flight.sql.FlightSqlClient.Savepoint;
+import org.apache.arrow.flight.sql.FlightSqlClient.SubstraitPlan;
+import org.apache.arrow.flight.sql.FlightSqlClient.Transaction;
+import org.apache.arrow.flight.sql.FlightSqlUtils;
+import org.apache.arrow.flight.sql.impl.FlightSql.ActionBeginSavepointRequest;
+import org.apache.arrow.flight.sql.impl.FlightSql.ActionBeginTransactionRequest;
+import org.apache.arrow.flight.sql.impl.FlightSql.ActionCancelQueryRequest;
+import org.apache.arrow.flight.sql.impl.FlightSql.ActionClosePreparedStatementRequest;
+import org.apache.arrow.flight.sql.impl.FlightSql.ActionCreatePreparedStatementRequest;
+import org.apache.arrow.flight.sql.impl.FlightSql.ActionCreatePreparedSubstraitPlanRequest;
+import org.apache.arrow.flight.sql.impl.FlightSql.ActionEndSavepointRequest;
+import org.apache.arrow.flight.sql.impl.FlightSql.ActionEndTransactionRequest;
+import org.apache.arrow.flight.sql.impl.FlightSql.CommandGetCatalogs;
+import org.apache.arrow.flight.sql.impl.FlightSql.CommandGetCrossReference;
+import org.apache.arrow.flight.sql.impl.FlightSql.CommandGetDbSchemas;
+import org.apache.arrow.flight.sql.impl.FlightSql.CommandGetExportedKeys;
+import org.apache.arrow.flight.sql.impl.FlightSql.CommandGetImportedKeys;
+import org.apache.arrow.flight.sql.impl.FlightSql.CommandGetPrimaryKeys;
+import org.apache.arrow.flight.sql.impl.FlightSql.CommandGetSqlInfo;
+import org.apache.arrow.flight.sql.impl.FlightSql.CommandGetTableTypes;
+import org.apache.arrow.flight.sql.impl.FlightSql.CommandGetTables;
+import org.apache.arrow.flight.sql.impl.FlightSql.CommandGetXdbcTypeInfo;
+import org.apache.arrow.flight.sql.impl.FlightSql.CommandPreparedStatementQuery;
+import org.apache.arrow.flight.sql.impl.FlightSql.CommandStatementIngest;
+import org.apache.arrow.flight.sql.impl.FlightSql.CommandStatementQuery;
+import org.apache.arrow.flight.sql.impl.FlightSql.CommandStatementSubstraitPlan;
+import org.apache.arrow.flight.sql.impl.FlightSql.CommandStatementUpdate;
+import org.apache.arrow.flight.sql.util.TableRef;
+import org.apache.arrow.memory.BufferAllocator;
+import org.apache.arrow.memory.RootAllocator;
+import org.apache.arrow.vector.types.Types.MinorType;
+import org.apache.arrow.vector.types.pojo.ArrowType.Utf8;
+import org.apache.arrow.vector.types.pojo.Field;
+import org.apache.arrow.vector.types.pojo.FieldType;
+import org.apache.arrow.vector.types.pojo.Schema;
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.junit.runners.JUnit4;
+
+import javax.inject.Named;
+import javax.inject.Singleton;
+import java.io.PrintStream;
+import java.nio.charset.StandardCharsets;
+import java.time.Duration;
+import java.time.Instant;
+import java.util.ArrayList;
+import java.util.Comparator;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
+
+import static io.deephaven.server.flightsql.FlightSqlTicketHelper.TICKET_PREFIX;
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.assertj.core.api.Assertions.failBecauseExceptionWasNotThrown;
+
+// using JUnit4 so we can inherit properly from DeephavenApiServerTestBase
+@RunWith(JUnit4.class)
+public class FlightSqlTest extends DeephavenApiServerTestBase {
+
+    private static final Map<String, String> DEEPHAVEN_STRING = Map.of(
+            "deephaven:isSortable", "true",
+            "deephaven:isRowStyle", "false",
+            "deephaven:isPartitioning", "false",
+            "deephaven:type", "java.lang.String",
+            "deephaven:isNumberFormat", "false",
+            "deephaven:isStyle", "false",
+            "deephaven:isDateFormat", "false");
+
+    private static final Map<String, String> DEEPHAVEN_INT = Map.of(
+            "deephaven:isSortable", "true",
+            "deephaven:isRowStyle", "false",
+            "deephaven:isPartitioning", "false",
+            "deephaven:type", "int",
+            "deephaven:isNumberFormat", "false",
+            "deephaven:isStyle", "false",
+            "deephaven:isDateFormat", "false");
+
+    private static final Map<String, String> DEEPHAVEN_BYTE = Map.of(
+            "deephaven:isSortable", "true",
+            "deephaven:isRowStyle", "false",
+            "deephaven:isPartitioning", "false",
+            "deephaven:type", "byte",
+            "deephaven:isNumberFormat", "false",
+            "deephaven:isStyle", "false",
+            "deephaven:isDateFormat", "false");
+
+    private static final Map<String, String> DEEPHAVEN_SCHEMA = Map.of(
+            "deephaven:isSortable", "false",
+            "deephaven:isRowStyle", "false",
+            "deephaven:isPartitioning", "false",
+            "deephaven:type", "org.apache.arrow.vector.types.pojo.Schema",
+            "deephaven:isNumberFormat", "false",
+            "deephaven:isStyle", "false",
+            "deephaven:isDateFormat", "false");
+
+    private static final Map<String, String> FLAT_ATTRIBUTES = Map.of(
+            "deephaven:attribute_type.IsFlat", "java.lang.Boolean",
+            "deephaven:attribute.IsFlat", "true");
+
+    private static final Field CATALOG_NAME =
+            new Field("catalog_name", new FieldType(true, Utf8.INSTANCE, null, DEEPHAVEN_STRING), null);
+
+    private static final Field PK_CATALOG_NAME =
+            new Field("pk_catalog_name", new FieldType(true, Utf8.INSTANCE, null, DEEPHAVEN_STRING), null);
+
+    private static final Field FK_CATALOG_NAME =
+            new Field("fk_catalog_name", new FieldType(true, Utf8.INSTANCE, null, DEEPHAVEN_STRING), null);
+
+    private static final Field DB_SCHEMA_NAME =
+            new Field("db_schema_name", new FieldType(true, Utf8.INSTANCE, null, DEEPHAVEN_STRING), null);
+
+    private static final Field PK_DB_SCHEMA_NAME =
+            new Field("pk_db_schema_name", new FieldType(true, Utf8.INSTANCE, null, DEEPHAVEN_STRING), null);
+
+    private static final Field FK_DB_SCHEMA_NAME =
+            new Field("fk_db_schema_name", new FieldType(true, Utf8.INSTANCE, null, DEEPHAVEN_STRING), null);
+
+    private static final Field TABLE_NAME =
+            new Field("table_name", new FieldType(true, Utf8.INSTANCE, null, DEEPHAVEN_STRING), null);
+
+    private static final Field COLUMN_NAME =
+            new Field("column_name", new FieldType(true, Utf8.INSTANCE, null, DEEPHAVEN_STRING), null);
+
+    private static final Field KEY_NAME =
+            new Field("key_name", new FieldType(true, Utf8.INSTANCE, null, DEEPHAVEN_STRING), null);
+
+    private static final Field PK_TABLE_NAME =
+            new Field("pk_table_name", new FieldType(true, Utf8.INSTANCE, null, DEEPHAVEN_STRING), null);
+
+    private static final Field FK_TABLE_NAME =
+            new Field("fk_table_name", new FieldType(true, Utf8.INSTANCE, null, DEEPHAVEN_STRING), null);
+
+    private static final Field TABLE_TYPE =
+            new Field("table_type", new FieldType(true, Utf8.INSTANCE, null, DEEPHAVEN_STRING), null);
+
+    private static final Field PK_COLUMN_NAME =
+            new Field("pk_column_name", new FieldType(true, Utf8.INSTANCE, null, DEEPHAVEN_STRING), null);
+
+    private static final Field FK_COLUMN_NAME =
+            new Field("fk_column_name", new FieldType(true, Utf8.INSTANCE, null, DEEPHAVEN_STRING), null);
+
+    private static final Field KEY_SEQUENCE =
+            new Field("key_sequence", new FieldType(true, MinorType.INT.getType(), null, DEEPHAVEN_INT), null);
+
+    private static final Field PK_KEY_NAME =
+            new Field("pk_key_name", new FieldType(true, Utf8.INSTANCE, null, DEEPHAVEN_STRING), null);
+
+    private static final Field FK_KEY_NAME =
+            new Field("fk_key_name", new FieldType(true, Utf8.INSTANCE, null, DEEPHAVEN_STRING), null);
+
+    private static final Field UPDATE_RULE =
+            new Field("update_rule", new FieldType(true, MinorType.TINYINT.getType(), null, DEEPHAVEN_BYTE), null);
+
+    private static final Field DELETE_RULE =
+            new Field("delete_rule", new FieldType(true, MinorType.TINYINT.getType(), null, DEEPHAVEN_BYTE), null);
+
+    private static final Field TABLE_SCHEMA =
+            new Field("table_schema", new FieldType(true, MinorType.VARBINARY.getType(), null, DEEPHAVEN_SCHEMA), null);
+
+    private static final TableRef FOO_TABLE_REF = TableRef.of(null, null, "foo_table");
+    public static final TableRef BAR_TABLE_REF = TableRef.of(null, null, "barTable");
+
+    @Module(includes = {
+            TestModule.class,
+            FlightSqlModule.class,
+    })
+    public interface MyModule {
+
+    }
+
+    @Singleton
+    @Component(modules = MyModule.class)
+    public interface MyComponent extends TestComponent {
+
+        @Component.Builder
+        interface Builder extends TestComponent.Builder {
+
+            @BindsInstance
+            Builder withServerConfig(ServerConfig serverConfig);
+
+            @BindsInstance
+            Builder withOut(@Named("out") PrintStream out);
+
+            @BindsInstance
+            Builder withErr(@Named("err") PrintStream err);
+
+            @BindsInstance
+            Builder withAuthorizationProvider(AuthorizationProvider authorizationProvider);
+
+            MyComponent build();
+        }
+    }
+
+    BufferAllocator bufferAllocator;
+    FlightClient flightClient;
+    FlightSqlClient flightSqlClient;
+
+    @Override
+    protected Builder testComponentBuilder() {
+        return DaggerFlightSqlTest_MyComponent.builder();
+    }
+
+    @Before
+    @Override
+    public void setUp() throws Exception {
+        super.setUp();
+        ManagedChannel channel = channelBuilder().build();
+        register(channel);
+        bufferAllocator = new RootAllocator();
+        // Note: this pattern of FlightClient owning the ManagedChannel does not mesh well with the idea that some
+        // other entity may be managing the authentication lifecycle. We'd prefer to pass in the stubs or "intercepted"
+        // channel directly, but that's not supported. So, we need to create the specific middleware interfaces so
+        // flight can do its own shims.
+        flightClient = FlightGrpcUtilsExtension.createFlightClientWithSharedChannel(bufferAllocator, channel,
+                new ArrayList<>());
+        // Note: this is not extensible, at least not with Auth v2 / JDBC.
+        flightClient.authenticate(new ClientAuthHandler() {
+            private byte[] callToken = new byte[0];
+
+            @Override
+            public void authenticate(ClientAuthSender outgoing, Iterator<byte[]> incoming) {
+                WrappedAuthenticationRequest request = WrappedAuthenticationRequest.newBuilder()
+                        .setType("Anonymous")
+                        .setPayload(ByteString.EMPTY)
+                        .build();
+                outgoing.send(request.toByteArray());
+                callToken = incoming.next();
+            }
+
+            @Override
+            public byte[] getCallToken() {
+                return callToken;
+            }
+        });
+        flightSqlClient = new FlightSqlClient(flightClient);
+    }
+
+    @Override
+    public void tearDown() throws Exception {
+        // this also closes flightClient
+        flightSqlClient.close();
+        bufferAllocator.close();
+        super.tearDown();
+    }
+
+    @Test
+    public void listFlights() {
+        assertThat(flightClient.listFlights(Criteria.ALL)).isEmpty();
+    }
+
+    @Test
+    public void listActions() {
+        assertThat(flightClient.listActions())
+                .usingElementComparator(Comparator.comparing(ActionType::getType))
+                .containsExactlyInAnyOrder(
+                        FlightSqlUtils.FLIGHT_SQL_CREATE_PREPARED_STATEMENT,
+                        FlightSqlUtils.FLIGHT_SQL_CLOSE_PREPARED_STATEMENT);
+    }
+
+    @Test
+    public void getCatalogs() throws Exception {
+        final Schema expectedSchema = flatTableSchema(CATALOG_NAME);
+        {
+            final SchemaResult schemaResult = flightSqlClient.getCatalogsSchema();
+            assertThat(schemaResult.getSchema()).isEqualTo(expectedSchema);
+        }
+        {
+            final FlightInfo info = flightSqlClient.getCatalogs();
+            assertThat(info.getSchema()).isEqualTo(expectedSchema);
+            consume(info, 0, 0, true);
+        }
+        unpackable(CommandGetCatalogs.getDescriptor(), CommandGetCatalogs.class);
+    }
+
+    @Test
+    public void getSchemas() throws Exception {
+        final Schema expectedSchema = flatTableSchema(CATALOG_NAME, DB_SCHEMA_NAME);
+        {
+            final SchemaResult schemasSchema = flightSqlClient.getSchemasSchema();
+            assertThat(schemasSchema.getSchema()).isEqualTo(expectedSchema);
+        }
+        for (final FlightInfo info : new FlightInfo[] {
+                flightSqlClient.getSchemas(null, null),
+                flightSqlClient.getSchemas("DoesNotExist", null),
+                flightSqlClient.getSchemas(null, ""),
+                flightSqlClient.getSchemas(null, "%"),
+                flightSqlClient.getSchemas(null, "SomeSchema"),
+        }) {
+            assertThat(info.getSchema()).isEqualTo(expectedSchema);
+            consume(info, 0, 0, true);
+        }
+        unpackable(CommandGetDbSchemas.getDescriptor(), CommandGetDbSchemas.class);
+    }
+
+    @Test
+    public void getTables() throws Exception {
+        setFooTable();
+        setFoodTable();
+        setBarTable();
+        for (final boolean includeSchema : new boolean[] {false, true}) {
+            final Schema expectedSchema = includeSchema
+                    ? flatTableSchema(CATALOG_NAME, DB_SCHEMA_NAME, TABLE_NAME, TABLE_TYPE, TABLE_SCHEMA)
+                    : flatTableSchema(CATALOG_NAME, DB_SCHEMA_NAME, TABLE_NAME, TABLE_TYPE);
+            {
+                final SchemaResult schema = flightSqlClient.getTablesSchema(includeSchema);
+                assertThat(schema.getSchema()).isEqualTo(expectedSchema);
+            }
+            // Any of these queries will fetch everything from query scope
+            for (final FlightInfo info : new FlightInfo[] {
+                    flightSqlClient.getTables(null, null, null, null, includeSchema),
+                    flightSqlClient.getTables("", null, null, null, includeSchema),
+                    flightSqlClient.getTables(null, null, null, List.of("TABLE"), includeSchema),
+                    flightSqlClient.getTables(null, null, null, List.of("IRRELEVANT_TYPE", "TABLE"), includeSchema),
+                    flightSqlClient.getTables(null, null, "%", null, includeSchema),
+                    flightSqlClient.getTables(null, null, "%able", null, includeSchema),
+            }) {
+                assertThat(info.getSchema()).isEqualTo(expectedSchema);
+                consume(info, 1, 3, true);
+            }
+
+            // Any of these queries will fetch foo_table and foodtable; there is no way to uniquely filter based on the
+            // `_` literal
+            for (final FlightInfo info : new FlightInfo[] {
+                    flightSqlClient.getTables(null, null, "foo_table", null, includeSchema),
+                    flightSqlClient.getTables(null, null, "foo_%", null, includeSchema),
+                    flightSqlClient.getTables(null, null, "f%", null, includeSchema),
+                    flightSqlClient.getTables(null, null, "%table", null, includeSchema),
+            }) {
+                assertThat(info.getSchema()).isEqualTo(expectedSchema);
+                consume(info, 1, 2, true);
+            }
+
+            // Any of these queries will fetch foodtable
+            for (final FlightInfo info : new FlightInfo[] {
+                    flightSqlClient.getTables(null, null, "foodtable", null, includeSchema),
+            }) {
+                assertThat(info.getSchema()).isEqualTo(expectedSchema);
+                consume(info, 1, 1, true);
+            }
+
+            // Any of these queries will fetch barTable
+            for (final FlightInfo info : new FlightInfo[] {
+                    flightSqlClient.getTables(null, null, "barTable", null, includeSchema),
+                    flightSqlClient.getTables(null, null, "bar%", null, includeSchema),
+                    flightSqlClient.getTables(null, null, "b%", null, includeSchema),
+                    flightSqlClient.getTables(null, null, "%Table", null, includeSchema),
+            }) {
+                assertThat(info.getSchema()).isEqualTo(expectedSchema);
+                consume(info, 1, 1, true);
+            }
+
+            // Any of these queries will fetch an empty table
+            for (final FlightInfo info : new FlightInfo[] {
+                    flightSqlClient.getTables("DoesNotExistCatalog", null, null, null, includeSchema),
+                    flightSqlClient.getTables(null, null, null, List.of("IRRELEVANT_TYPE"), includeSchema),
+                    flightSqlClient.getTables(null, "", null, null, includeSchema),
+                    flightSqlClient.getTables(null, "%", null, null, includeSchema),
+                    flightSqlClient.getTables(null, null, "", null, includeSchema),
+                    flightSqlClient.getTables(null, null, "doesNotExist", null, includeSchema),
+                    flightSqlClient.getTables(null, null, "%_table2", null, includeSchema),
+            }) {
+                assertThat(info.getSchema()).isEqualTo(expectedSchema);
+                consume(info, 0, 0, true);
+            }
+        }
+        unpackable(CommandGetTables.getDescriptor(), CommandGetTables.class);
+    }
+
+    @Test
+    public void getTableTypes() throws Exception {
+        final Schema expectedSchema = flatTableSchema(TABLE_TYPE);
+        {
+            final SchemaResult schema = flightSqlClient.getTableTypesSchema();
+            assertThat(schema.getSchema()).isEqualTo(expectedSchema);
+        }
+        {
+            final FlightInfo info = flightSqlClient.getTableTypes();
+            assertThat(info.getSchema()).isEqualTo(expectedSchema);
+            consume(info, 1, 1, true);
+        }
+        unpackable(CommandGetTableTypes.getDescriptor(), CommandGetTableTypes.class);
+    }
+
+    @Test
+    public void select1() throws Exception {
+        final Schema expectedSchema = new Schema(
+                List.of(new Field("Foo", new FieldType(true, MinorType.INT.getType(), null, DEEPHAVEN_INT), null)));
+        {
+            final SchemaResult schema = flightSqlClient.getExecuteSchema("SELECT 1 as Foo");
+            assertThat(schema.getSchema()).isEqualTo(expectedSchema);
+        }
+        {
+            final FlightInfo info = flightSqlClient.execute("SELECT 1 as Foo");
+            assertThat(info.getSchema()).isEqualTo(expectedSchema);
+            consume(info, 1, 1, false);
+        }
+        unpackable(CommandStatementQuery.getDescriptor(), CommandStatementQuery.class);
+    }
+
+    @Test
+    public void select1Prepared() throws Exception {
+        final Schema expectedSchema = new Schema(
+                List.of(new Field("Foo", new FieldType(true, MinorType.INT.getType(), null, DEEPHAVEN_INT), null)));
+        try (final PreparedStatement prepared = flightSqlClient.prepare("SELECT 1 as Foo")) {
+            assertThat(prepared.getResultSetSchema()).isEqualTo(FlightSqlResolver.DATASET_SCHEMA_SENTINEL);
+            {
+                final SchemaResult schema = prepared.fetchSchema();
+                assertThat(schema.getSchema()).isEqualTo(expectedSchema);
+            }
+            {
+                final FlightInfo info = prepared.execute();
+                assertThat(info.getSchema()).isEqualTo(expectedSchema);
+                consume(info, 1, 1, false);
+            }
+            unpackable(CommandPreparedStatementQuery.getDescriptor(), CommandPreparedStatementQuery.class);
+        }
+    }
+
+    @Test
+    public void selectStarFromQueryScopeTable() throws Exception {
+        setFooTable();
+
+        final Schema expectedSchema = flatTableSchema(
+                new Field("Foo", new FieldType(true, MinorType.INT.getType(), null, DEEPHAVEN_INT), null));
+        {
+            final SchemaResult schema = flightSqlClient.getExecuteSchema("SELECT * FROM foo_table");
+            assertThat(schema.getSchema()).isEqualTo(expectedSchema);
+        }
+        {
+            final FlightInfo info = flightSqlClient.execute("SELECT * FROM foo_table");
+            assertThat(info.getSchema()).isEqualTo(expectedSchema);
+            consume(info, 1, 3, false);
+        }
+        // The Flight SQL resolver will maintain state to ensure results are resolvable, even if the underlying table
+        // goes away between flightInfo and doGet.
+        {
+            final FlightInfo info = flightSqlClient.execute("SELECT * FROM foo_table");
+            assertThat(info.getSchema()).isEqualTo(expectedSchema);
+            removeFooTable();
+            consume(info, 1, 3, false);
+        }
+        unpackable(CommandStatementQuery.getDescriptor(), CommandStatementQuery.class);
+
+    }
+
+    @Test
+    public void selectStarPreparedFromQueryScopeTable() throws Exception {
+        setFooTable();
+        {
+            final Schema expectedSchema = flatTableSchema(
+                    new Field("Foo", new FieldType(true, MinorType.INT.getType(), null, DEEPHAVEN_INT), null));
+            try (final PreparedStatement prepared = flightSqlClient.prepare("SELECT * FROM foo_table")) {
+                assertThat(prepared.getResultSetSchema()).isEqualTo(FlightSqlResolver.DATASET_SCHEMA_SENTINEL);
+                {
+                    final SchemaResult schema = prepared.fetchSchema();
+                    assertThat(schema.getSchema()).isEqualTo(expectedSchema);
+                }
+                {
+                    final FlightInfo info = prepared.execute();
+                    assertThat(info.getSchema()).isEqualTo(expectedSchema);
+                    consume(info, 1, 3, false);
+                }
+                // The Flight SQL resolver will maintain state to ensure results are resolvable, even if the underlying
+                // table goes away between flightInfo and doGet.
+                {
+                    final FlightInfo info = prepared.execute();
+                    assertThat(info.getSchema()).isEqualTo(expectedSchema);
+                    removeFooTable();
+                    consume(info, 1, 3, false);
+                }
+                // The states in _not_ maintained by the PreparedStatement state though, and will not be available for
+                // the next execute
+                expectException(prepared::execute, FlightStatusCode.NOT_FOUND, "Object 'foo_table' not found");
+                unpackable(CommandPreparedStatementQuery.getDescriptor(), CommandPreparedStatementQuery.class);
+            }
+            unpackable(FlightSqlUtils.FLIGHT_SQL_CREATE_PREPARED_STATEMENT, ActionCreatePreparedStatementRequest.class);
+            unpackable(FlightSqlUtils.FLIGHT_SQL_CLOSE_PREPARED_STATEMENT, ActionClosePreparedStatementRequest.class);
+        }
+    }
+
+    @Test
+    public void preparedStatementIsLazy() throws Exception {
+        try (final PreparedStatement prepared = flightSqlClient.prepare("SELECT * FROM foo_table")) {
+            assertThat(prepared.getResultSetSchema()).isEqualTo(FlightSqlResolver.DATASET_SCHEMA_SENTINEL);
+            expectException(prepared::fetchSchema, FlightStatusCode.NOT_FOUND, "Object 'foo_table' not found");
+            expectException(prepared::execute, FlightStatusCode.NOT_FOUND, "Object 'foo_table' not found");
+            // If the state-of-the-world changes, this will be reflected in new calls against the prepared statement.
+            // This also implies that we won't error out at the start of prepare call if the table doesn't exist.
+            //
+            // We could introduce some sort of reference-based Transactional model (orthogonal to a snapshot-based
+            // Transactional model) which would ensure schema consistency, but that would be an effort outside of a
+            // PreparedStatement.
+            setFooTable();
+            final Schema expectedSchema = flatTableSchema(
+                    new Field("Foo", new FieldType(true, MinorType.INT.getType(), null, DEEPHAVEN_INT), null));
+            {
+                final SchemaResult schema = prepared.fetchSchema();
+                assertThat(schema.getSchema()).isEqualTo(expectedSchema);
+            }
+            {
+                final FlightInfo info = prepared.execute();
+                assertThat(info.getSchema()).isEqualTo(expectedSchema);
+                consume(info, 1, 3, false);
+            }
+        }
+    }
+
+    @Test
+    public void selectQuestionMark() {
+        queryError("SELECT ?", FlightStatusCode.INVALID_ARGUMENT, "Illegal use of dynamic parameter");
+    }
+
+    @Test
+    public void selectFooParam() {
+        setFooTable();
+        queryError("SELECT Foo FROM foo_table WHERE Foo = ?", FlightStatusCode.INVALID_ARGUMENT,
+                "Flight SQL: query parameters are not supported");
+    }
+
+    @Test
+    public void selectTableDoesNotExist() {
+        queryError("SELECT * FROM my_table", FlightStatusCode.NOT_FOUND, "Object 'my_table' not found");
+    }
+
+    @Test
+    public void selectColumnDoesNotExist() {
+        setFooTable();
+        queryError("SELECT BadColumn FROM foo_table", FlightStatusCode.NOT_FOUND,
+                "Column 'BadColumn' not found in any table");
+    }
+
+    @Test
+    public void selectFunctionDoesNotExist() {
+        setFooTable();
+        queryError("SELECT my_function(Foo) FROM foo_table", FlightStatusCode.INVALID_ARGUMENT,
+                "No match found for function signature");
+    }
+
+    @Test
+    public void badSqlQuery() {
+        queryError("this is not SQL", FlightStatusCode.INVALID_ARGUMENT, "Flight SQL: query can't be parsed");
+    }
+
+    @Test
+    public void executeSubstrait() {
+        getSchemaUnimplemented(() -> flightSqlClient.getExecuteSubstraitSchema(fakePlan()),
+                CommandStatementSubstraitPlan.getDescriptor());
+        commandUnimplemented(() -> flightSqlClient.executeSubstrait(fakePlan()),
+                CommandStatementSubstraitPlan.getDescriptor());
+        misbehave(CommandStatementSubstraitPlan.getDefaultInstance(), CommandStatementSubstraitPlan.getDescriptor());
+        unpackable(CommandStatementSubstraitPlan.getDescriptor(), CommandStatementSubstraitPlan.class);
+    }
+
+    @Test
+    public void executeSubstraitUpdate() {
+        // Note: this is the same descriptor as the executeSubstrait
+        getSchemaUnimplemented(() -> flightSqlClient.getExecuteSubstraitSchema(fakePlan()),
+                CommandStatementSubstraitPlan.getDescriptor());
+        expectUnpublishable(() -> flightSqlClient.executeSubstraitUpdate(fakePlan()));
+        unpackable(CommandStatementSubstraitPlan.getDescriptor(), CommandStatementSubstraitPlan.class);
+    }
+
+    @Test
+    public void insert1() {
+        expectUnpublishable(() -> flightSqlClient.executeUpdate("INSERT INTO fake(name) VALUES('Smith')"));
+        unpackable(CommandStatementUpdate.getDescriptor(), CommandStatementUpdate.class);
+    }
+
+    private void queryError(String query, FlightStatusCode expectedCode, String expectedMessage) {
+        expectException(() -> flightSqlClient.getExecuteSchema(query), expectedCode, expectedMessage);
+        expectException(() -> flightSqlClient.execute(query), expectedCode, expectedMessage);
+        try (final PreparedStatement prepared = flightSqlClient.prepare(query)) {
+            assertThat(prepared.getResultSetSchema()).isEqualTo(FlightSqlResolver.DATASET_SCHEMA_SENTINEL);
+            expectException(prepared::fetchSchema, expectedCode, expectedMessage);
+            expectException(prepared::execute, expectedCode, expectedMessage);
+        }
+    }
+
+    @Test
+    public void insertPrepared() {
+        setFooTable();
+        try (final PreparedStatement prepared = flightSqlClient.prepare("INSERT INTO foo_table(Foo) VALUES(42)")) {
+            expectException(prepared::fetchSchema, FlightStatusCode.INVALID_ARGUMENT,
+                    "Flight SQL: Unsupported calcite type 'org.apache.calcite.rel.logical.LogicalTableModify'");
+            expectException(prepared::execute, FlightStatusCode.INVALID_ARGUMENT,
+                    "Flight SQL: Unsupported calcite type 'org.apache.calcite.rel.logical.LogicalTableModify'");
+        }
+        try (final PreparedStatement prepared = flightSqlClient.prepare("INSERT INTO foo_table(MyArg) VALUES(42)")) {
+            expectException(prepared::fetchSchema, FlightStatusCode.INVALID_ARGUMENT,
+                    "Flight SQL: Unknown target column 'MyArg'");
+            expectException(prepared::execute, FlightStatusCode.INVALID_ARGUMENT,
+                    "Flight SQL: Unknown target column 'MyArg'");
+        }
+        try (final PreparedStatement prepared = flightSqlClient.prepare("INSERT INTO x(Foo) VALUES(42)")) {
+            expectException(prepared::fetchSchema, FlightStatusCode.NOT_FOUND, "Flight SQL: Object 'x' not found");
+            expectException(prepared::execute, FlightStatusCode.NOT_FOUND, "Flight SQL: Object 'x' not found");
+        }
+    }
+
+    @Test
+    public void getSqlInfo() {
+        getSchemaUnimplemented(() -> flightSqlClient.getSqlInfoSchema(), CommandGetSqlInfo.getDescriptor());
+        commandUnimplemented(() -> flightSqlClient.getSqlInfo(), CommandGetSqlInfo.getDescriptor());
+        misbehave(CommandGetSqlInfo.getDefaultInstance(), CommandGetSqlInfo.getDescriptor());
+        unpackable(CommandGetSqlInfo.getDescriptor(), CommandGetSqlInfo.class);
+    }
+
+    @Test
+    public void getXdbcTypeInfo() {
+        getSchemaUnimplemented(() -> flightSqlClient.getXdbcTypeInfoSchema(), CommandGetXdbcTypeInfo.getDescriptor());
+        commandUnimplemented(() -> flightSqlClient.getXdbcTypeInfo(), CommandGetXdbcTypeInfo.getDescriptor());
+        misbehave(CommandGetXdbcTypeInfo.getDefaultInstance(), CommandGetXdbcTypeInfo.getDescriptor());
+        unpackable(CommandGetXdbcTypeInfo.getDescriptor(), CommandGetXdbcTypeInfo.class);
+    }
+
+    @Test
+    public void getCrossReference() {
+        setFooTable();
+        setBarTable();
+        getSchemaUnimplemented(() -> flightSqlClient.getCrossReferenceSchema(),
+                CommandGetCrossReference.getDescriptor());
+        commandUnimplemented(() -> flightSqlClient.getCrossReference(FOO_TABLE_REF, BAR_TABLE_REF),
+                CommandGetCrossReference.getDescriptor());
+        misbehave(CommandGetCrossReference.getDefaultInstance(), CommandGetCrossReference.getDescriptor());
+        unpackable(CommandGetCrossReference.getDescriptor(), CommandGetCrossReference.class);
+    }
+
+    @Test
+    public void getPrimaryKeys() throws Exception {
+        setFooTable();
+        final Schema expectedSchema =
+                flatTableSchema(CATALOG_NAME, DB_SCHEMA_NAME, TABLE_NAME, COLUMN_NAME, KEY_NAME, KEY_SEQUENCE);
+        {
+            final SchemaResult exportedKeysSchema = flightSqlClient.getPrimaryKeysSchema();
+            assertThat(exportedKeysSchema.getSchema()).isEqualTo(expectedSchema);
+        }
+        {
+            final FlightInfo info = flightSqlClient.getPrimaryKeys(FOO_TABLE_REF);
+            assertThat(info.getSchema()).isEqualTo(expectedSchema);
+            consume(info, 0, 0, true);
+        }
+        // Note: the info must remain valid even if the server state goes away.
+        {
+            final FlightInfo info = flightSqlClient.getPrimaryKeys(FOO_TABLE_REF);
+            assertThat(info.getSchema()).isEqualTo(expectedSchema);
+            removeFooTable();
+            // resolve should still be OK
+            consume(info, 0, 0, true);
+        }
+        expectException(() -> flightSqlClient.getPrimaryKeys(BAR_TABLE_REF), FlightStatusCode.NOT_FOUND,
+                "Flight SQL: table not found");
+
+        // Note: misbehaving clients who fudge tickets directly will not get errors; but they will also not learn any
+        // information on whether the tables actually exist or not since the returned table is always empty.
+        for (final CommandGetPrimaryKeys command : new CommandGetPrimaryKeys[] {
+                CommandGetPrimaryKeys.newBuilder().setTable("DoesNotExist").build(),
+                CommandGetPrimaryKeys.newBuilder().setCatalog("Catalog").setDbSchema("DbSchema")
+                        .setTable("DoesNotExist").build()
+        }) {
+            final Ticket ticket =
+                    ProtocolExposer.fromProtocol(FlightSqlTicketHelper.ticketCreator().visit(command));
+            try (final FlightStream stream = flightSqlClient.getStream(ticket)) {
+                consume(stream, 0, 0);
+            }
+        }
+        unpackable(CommandGetPrimaryKeys.getDescriptor(), CommandGetPrimaryKeys.class);
+    }
+
+    @Test
+    public void getExportedKeys() throws Exception {
+        setFooTable();
+        final Schema expectedSchema = flatTableSchema(PK_CATALOG_NAME, PK_DB_SCHEMA_NAME, PK_TABLE_NAME, PK_COLUMN_NAME,
+                FK_CATALOG_NAME, FK_DB_SCHEMA_NAME, FK_TABLE_NAME, FK_COLUMN_NAME, KEY_SEQUENCE, FK_KEY_NAME,
+                PK_KEY_NAME, UPDATE_RULE, DELETE_RULE);
+        {
+            final SchemaResult exportedKeysSchema = flightSqlClient.getExportedKeysSchema();
+            assertThat(exportedKeysSchema.getSchema()).isEqualTo(expectedSchema);
+        }
+        {
+            final FlightInfo info = flightSqlClient.getExportedKeys(FOO_TABLE_REF);
+            assertThat(info.getSchema()).isEqualTo(expectedSchema);
+            consume(info, 0, 0, true);
+        }
+        // Note: the info must remain valid even if the server state goes away.
+        {
+            final FlightInfo info = flightSqlClient.getExportedKeys(FOO_TABLE_REF);
+            assertThat(info.getSchema()).isEqualTo(expectedSchema);
+            removeFooTable();
+            // resolve should still be OK
+            consume(info, 0, 0, true);
+        }
+        expectException(() -> flightSqlClient.getExportedKeys(BAR_TABLE_REF), FlightStatusCode.NOT_FOUND,
+                "Flight SQL: table not found");
+
+        // Note: misbehaving clients who fudge tickets directly will not get errors; but they will also not learn any
+        // information on whether the tables actually exist or not since the returned table is always empty.
+        for (final CommandGetExportedKeys command : new CommandGetExportedKeys[] {
+                CommandGetExportedKeys.newBuilder().setTable("DoesNotExist").build(),
+                CommandGetExportedKeys.newBuilder().setCatalog("Catalog").setDbSchema("DbSchema")
+                        .setTable("DoesNotExist").build()
+        }) {
+            final Ticket ticket =
+                    ProtocolExposer.fromProtocol(FlightSqlTicketHelper.ticketCreator().visit(command));
+            try (final FlightStream stream = flightSqlClient.getStream(ticket)) {
+                consume(stream, 0, 0);
+            }
+        }
+        unpackable(CommandGetExportedKeys.getDescriptor(), CommandGetExportedKeys.class);
+    }
+
+    @Test
+    public void getImportedKeys() throws Exception {
+        setFooTable();
+        final Schema expectedSchema = flatTableSchema(PK_CATALOG_NAME, PK_DB_SCHEMA_NAME, PK_TABLE_NAME, PK_COLUMN_NAME,
+                FK_CATALOG_NAME, FK_DB_SCHEMA_NAME, FK_TABLE_NAME, FK_COLUMN_NAME, KEY_SEQUENCE, FK_KEY_NAME,
+                PK_KEY_NAME, UPDATE_RULE, DELETE_RULE);
+        {
+            final SchemaResult importedKeysSchema = flightSqlClient.getImportedKeysSchema();
+            assertThat(importedKeysSchema.getSchema()).isEqualTo(expectedSchema);
+        }
+        {
+            final FlightInfo info = flightSqlClient.getImportedKeys(FOO_TABLE_REF);
+            assertThat(info.getSchema()).isEqualTo(expectedSchema);
+            consume(info, 0, 0, true);
+        }
+        // Note: the info must remain valid even if the server state goes away.
+        {
+            final FlightInfo info = flightSqlClient.getImportedKeys(FOO_TABLE_REF);
+            assertThat(info.getSchema()).isEqualTo(expectedSchema);
+            removeFooTable();
+            // resolve should still be OK
+            consume(info, 0, 0, true);
+        }
+
+        expectException(() -> flightSqlClient.getImportedKeys(BAR_TABLE_REF), FlightStatusCode.NOT_FOUND,
+                "Flight SQL: table not found");
+
+        // Note: misbehaving clients who fudge tickets directly will not get errors; but they will also not learn any
+        // information on whether the tables actually exist or not since the returned table is always empty.
+        for (final CommandGetImportedKeys command : new CommandGetImportedKeys[] {
+                CommandGetImportedKeys.newBuilder().setTable("DoesNotExist").build(),
+                CommandGetImportedKeys.newBuilder().setCatalog("Catalog").setDbSchema("DbSchema")
+                        .setTable("DoesNotExist").build()
+        }) {
+            final Ticket ticket =
+                    ProtocolExposer.fromProtocol(FlightSqlTicketHelper.ticketCreator().visit(command));
+            try (final FlightStream stream = flightSqlClient.getStream(ticket)) {
+                consume(stream, 0, 0);
+            }
+        }
+        unpackable(CommandGetImportedKeys.getDescriptor(), CommandGetImportedKeys.class);
+    }
+
+    @Test
+    public void commandStatementIngest() {
+        // Note: if we actually want to test out FlightSqlClient behavior more directly, we can set up scaffolding to
+        // call FlightSqlClient#executeIngest.
+        final FlightDescriptor ingestCommand =
+                FlightDescriptor.command(Any.pack(CommandStatementIngest.getDefaultInstance()).toByteArray());
+        getSchemaUnimplemented(() -> flightClient.getSchema(ingestCommand), CommandStatementIngest.getDescriptor());
+        commandUnimplemented(() -> flightClient.getInfo(ingestCommand), CommandStatementIngest.getDescriptor());
+        misbehave(CommandStatementIngest.getDefaultInstance(), CommandStatementIngest.getDescriptor());
+        unpackable(CommandStatementIngest.getDescriptor(), CommandStatementIngest.class);
+    }
+
+    @Test
+    public void unknownCommandLooksLikeFlightSql() {
+        final String typeUrl = "type.googleapis.com/arrow.flight.protocol.sql.CommandLooksRealButDoesNotExist";
+        final FlightDescriptor descriptor = unpackableCommand(typeUrl);
+        getSchemaUnknown(() -> flightClient.getSchema(descriptor), typeUrl);
+        commandUnknown(() -> flightClient.getInfo(descriptor), typeUrl);
+    }
+
+    @Test
+    public void unknownCommand() {
+        // Note: this should likely be tested in the context of Flight, not Flight SQL
+        final String typeUrl = "type.googleapis.com/com.example.SomeRandomCommand";
+        final FlightDescriptor descriptor = unpackableCommand(typeUrl);
+        expectException(() -> flightClient.getSchema(descriptor), FlightStatusCode.INVALID_ARGUMENT,
+                "no resolver for command");
+        expectException(() -> flightClient.getInfo(descriptor), FlightStatusCode.INVALID_ARGUMENT,
+                "no resolver for command");
+    }
+
+    @Test
+    public void prepareSubstrait() {
+        actionUnimplemented(() -> flightSqlClient.prepare(fakePlan()),
+                FlightSqlUtils.FLIGHT_SQL_CREATE_PREPARED_SUBSTRAIT_PLAN);
+        unpackable(FlightSqlUtils.FLIGHT_SQL_CREATE_PREPARED_SUBSTRAIT_PLAN,
+                ActionCreatePreparedSubstraitPlanRequest.class);
+    }
+
+    @Test
+    public void beginTransaction() {
+        actionUnimplemented(() -> flightSqlClient.beginTransaction(), FlightSqlUtils.FLIGHT_SQL_BEGIN_TRANSACTION);
+        unpackable(FlightSqlUtils.FLIGHT_SQL_BEGIN_TRANSACTION, ActionBeginTransactionRequest.class);
+    }
+
+    @Test
+    public void commit() {
+        actionUnimplemented(() -> flightSqlClient.commit(fakeTxn()), FlightSqlUtils.FLIGHT_SQL_END_TRANSACTION);
+        unpackable(FlightSqlUtils.FLIGHT_SQL_END_TRANSACTION, ActionEndTransactionRequest.class);
+    }
+
+    @Test
+    public void rollbackTxn() {
+        actionUnimplemented(() -> flightSqlClient.rollback(fakeTxn()), FlightSqlUtils.FLIGHT_SQL_END_TRANSACTION);
+        unpackable(FlightSqlUtils.FLIGHT_SQL_END_TRANSACTION, ActionEndTransactionRequest.class);
+    }
+
+    @Test
+    public void beginSavepoint() {
+        actionUnimplemented(() -> flightSqlClient.beginSavepoint(fakeTxn(), "fakeName"),
+                FlightSqlUtils.FLIGHT_SQL_BEGIN_SAVEPOINT);
+        unpackable(FlightSqlUtils.FLIGHT_SQL_BEGIN_SAVEPOINT, ActionBeginSavepointRequest.class);
+    }
+
+    @Test
+    public void release() {
+        actionUnimplemented(() -> flightSqlClient.release(fakeSavepoint()), FlightSqlUtils.FLIGHT_SQL_END_SAVEPOINT);
+        unpackable(FlightSqlUtils.FLIGHT_SQL_END_SAVEPOINT, ActionEndSavepointRequest.class);
+    }
+
+    @Test
+    public void rollbackSavepoint() {
+        actionUnimplemented(() -> flightSqlClient.rollback(fakeSavepoint()), FlightSqlUtils.FLIGHT_SQL_END_SAVEPOINT);
+        unpackable(FlightSqlUtils.FLIGHT_SQL_END_SAVEPOINT, ActionEndSavepointRequest.class);
+    }
+
+    @Test
+    public void cancelQuery() {
+        final FlightInfo info = flightSqlClient.execute("SELECT 1");
+        actionUnimplemented(() -> flightSqlClient.cancelQuery(info), FlightSqlUtils.FLIGHT_SQL_CANCEL_QUERY);
+        unpackable(FlightSqlUtils.FLIGHT_SQL_CANCEL_QUERY, ActionCancelQueryRequest.class);
+    }
+
+    @Test
+    public void cancelFlightInfo() {
+        // Note: this should likely be tested in the context of Flight, not Flight SQL
+        final FlightInfo info = flightSqlClient.execute("SELECT 1");
+        actionNoResolver(() -> flightClient.cancelFlightInfo(new CancelFlightInfoRequest(info)),
+                FlightConstants.CANCEL_FLIGHT_INFO.getType());
+    }
+
+    @Test
+    public void unknownAction() {
+        // Note: this should likely be tested in the context of Flight, not Flight SQL
+        final String type = "SomeFakeAction";
+        final Action action = new Action(type, new byte[0]);
+        actionNoResolver(() -> doAction(action), type);
+    }
+
+    @Test
+    public void refreshingTableTest() throws Exception {
+        // Set a start time so we can test we get out the expected number of rows
+        final Instant startTime = Instant.now().minus(Duration.ofHours(1));
+        final Table tt1 = TableTools.timeTableBuilder()
+                .startTime(startTime)
+                .period(Duration.ofSeconds(1))
+                .build()
+                .view("Timestamp1=Timestamp", "Id=ii % 11")
+                .lastBy("Id");
+        final Table tt2 = TableTools.timeTableBuilder()
+                .startTime(startTime)
+                .period(Duration.ofSeconds(5))
+                .build()
+                .view("Timestamp2=Timestamp", "Id=ii % 11")
+                .lastBy("Id");
+        final QueryScope queryScope = ExecutionContext.getContext().getQueryScope();
+        queryScope.putParam("my_table_1", tt1);
+        queryScope.putParam("my_table_2", tt2);
+        try {
+            final String query = "SELECT\n" +
+                    "  my_table_1.Id,\n" +
+                    "  my_table_1.Timestamp1,\n" +
+                    "  my_table_2.Timestamp2\n" +
+                    "FROM\n" +
+                    "  my_table_1\n" +
+                    "  INNER JOIN my_table_2 ON my_table_1.Id = my_table_2.Id";
+            {
+                final FlightInfo info = flightSqlClient.execute(query);
+                consume(info, 1, 11, false);
+            }
+            {
+                final PreparedStatement prepared = flightSqlClient.prepare(query);
+                {
+                    final FlightInfo info = prepared.execute();
+                    consume(info, 1, 11, false);
+                }
+                {
+                    final FlightInfo info = prepared.execute();
+                    consume(info, 1, 11, false);
+                }
+            }
+        } finally {
+            queryScope.putParam("my_table_2", null);
+            queryScope.putParam("my_table_1", null);
+        }
+
+    }
+
+    private Result doAction(Action action) {
+        final Iterator<Result> it = flightClient.doAction(action);
+        if (!it.hasNext()) {
+            throw new IllegalStateException();
+        }
+        final Result result = it.next();
+        if (it.hasNext()) {
+            throw new IllegalStateException();
+        }
+        return result;
+    }
+
+    private void misbehave(Message message, Descriptor descriptor) {
+        final Ticket ticket = ProtocolExposer.fromProtocol(Flight.Ticket.newBuilder()
+                .setTicket(
+                        ByteString.copyFrom(new byte[] {(byte) TICKET_PREFIX}).concat(Any.pack(message).toByteString()))
+                .build());
+        expectException(() -> flightSqlClient.getStream(ticket).next(), FlightStatusCode.INVALID_ARGUMENT,
+                "Flight SQL: Invalid ticket");
+    }
+
+    private static FlightDescriptor unpackableCommand(Descriptor descriptor) {
+        return unpackableCommand("type.googleapis.com/" + descriptor.getFullName());
+    }
+
+    private static FlightDescriptor unpackableCommand(String typeUrl) {
+        return FlightDescriptor.command(
+                Any.newBuilder().setTypeUrl(typeUrl).setValue(ByteString.copyFrom(new byte[1])).build().toByteArray());
+    }
+
+    private void getSchemaUnimplemented(Runnable r, Descriptor command) {
+        // right now our server impl routes all getSchema through their respective commands
+        commandUnimplemented(r, command);
+    }
+
+    private void commandUnimplemented(Runnable r, Descriptor command) {
+        expectException(r, FlightStatusCode.UNIMPLEMENTED,
+                String.format("Flight SQL: command '%s' is unimplemented", command.getFullName()));
+    }
+
+    private void getSchemaUnknown(Runnable r, String command) {
+        // right now our server impl routes all getSchema through their respective commands
+        commandUnknown(r, command);
+    }
+
+    private void commandUnknown(Runnable r, String command) {
+        expectException(r, FlightStatusCode.UNIMPLEMENTED,
+                String.format("Flight SQL: command '%s' is unknown", command));
+    }
+
+    private void unpackable(Descriptor descriptor, Class<?> clazz) {
+        final FlightDescriptor flightDescriptor = unpackableCommand(descriptor);
+        getSchemaUnpackable(() -> flightClient.getSchema(flightDescriptor), clazz);
+        commandUnpackable(() -> flightClient.getInfo(flightDescriptor), clazz);
+    }
+
+
+    private void unpackable(ActionType type, Class<?> actionProto) {
+        {
+            final Action action = new Action(type.getType(), Any.getDefaultInstance().toByteArray());
+            expectException(() -> doAction(action), FlightStatusCode.INVALID_ARGUMENT, String.format(
+                    "Flight SQL: Invalid action, provided message cannot be unpacked as %s", actionProto.getName()));
+        }
+        {
+            final Action action = new Action(type.getType(), new byte[] {-1});
+            expectException(() -> doAction(action), FlightStatusCode.INVALID_ARGUMENT, "Flight SQL: Invalid action");
+        }
+    }
+
+    private void getSchemaUnpackable(Runnable r, Class<?> clazz) {
+        commandUnpackable(r, clazz);
+    }
+
+    private void commandUnpackable(Runnable r, Class<?> clazz) {
+        expectUnpackableCommand(r, clazz);
+    }
+
+    private void expectUnpackableCommand(Runnable r, Class<?> clazz) {
+        expectException(r, FlightStatusCode.INVALID_ARGUMENT,
+                String.format("Flight SQL: Invalid command, provided message cannot be unpacked as %s",
+                        clazz.getName()));
+    }
+
+    private void expectUnpublishable(Runnable r) {
+        expectException(r, FlightStatusCode.INVALID_ARGUMENT, "Flight SQL descriptors cannot be published to");
+    }
+
+    private void actionUnimplemented(Runnable r, ActionType actionType) {
+        expectException(r, FlightStatusCode.UNIMPLEMENTED,
+                String.format("Flight SQL: Action type '%s' is unimplemented", actionType.getType()));
+    }
+
+    private void actionNoResolver(Runnable r, String actionType) {
+        expectException(r, FlightStatusCode.UNIMPLEMENTED,
+                String.format("No action resolver found for action type '%s'", actionType));
+    }
+
+    private static void expectException(Runnable r, FlightStatusCode code, String messagePart) {
+        try {
+            r.run();
+            failBecauseExceptionWasNotThrown(FlightRuntimeException.class);
+        } catch (FlightRuntimeException e) {
+            assertThat(e.status().code()).isEqualTo(code);
+            assertThat(e).hasMessageContaining(messagePart);
+        }
+    }
+
+    private static FlightEndpoint endpoint(FlightInfo info) {
+        assertThat(info.getEndpoints()).hasSize(1);
+        return info.getEndpoints().get(0);
+    }
+
+    private static Schema flatTableSchema(Field... fields) {
+        return new Schema(List.of(fields), FLAT_ATTRIBUTES);
+    }
+
+    private static void setFooTable() {
+        setSimpleTable("foo_table", "Foo");
+    }
+
+    private static void setFoodTable() {
+        setSimpleTable("foodtable", "Food");
+    }
+
+    private static void setBarTable() {
+        setSimpleTable("barTable", "Bar");
+    }
+
+    private static void removeFooTable() {
+        removeTable("foo_table");
+    }
+
+    private static void removeFoodTable() {
+        removeTable("foodtable");
+    }
+
+    private static void removeBarTable() {
+        removeTable("barTable");
+    }
+
+    private static void setSimpleTable(String tableName, String columnName) {
+        final TableDefinition td = TableDefinition.of(ColumnDefinition.ofInt(columnName));
+        final Table table = TableTools.newTable(td, TableTools.intCol(columnName, 1, 2, 3));
+        ExecutionContext.getContext().getQueryScope().putParam(tableName, table);
+    }
+
+    private static void removeTable(String tableName) {
+        ExecutionContext.getContext().getQueryScope().putParam(tableName, null);
+    }
+
+    private void consume(FlightInfo info, int expectedFlightCount, int expectedNumRows, boolean expectReusable)
+            throws Exception {
+        final FlightEndpoint endpoint = endpoint(info);
+        if (expectReusable) {
+            assertThat(endpoint.getExpirationTime()).isPresent();
+        } else {
+            assertThat(endpoint.getExpirationTime()).isEmpty();
+        }
+        try (final FlightStream stream = flightSqlClient.getStream(endpoint.getTicket())) {
+            consume(stream, expectedFlightCount, expectedNumRows);
+        }
+        if (expectReusable) {
+            try (final FlightStream stream = flightSqlClient.getStream(endpoint.getTicket())) {
+                consume(stream, expectedFlightCount, expectedNumRows);
+            }
+        } else {
+            try (final FlightStream stream = flightSqlClient.getStream(endpoint.getTicket())) {
+                consumeNotFound(stream);
+            }
+        }
+    }
+
+    private static void consume(FlightStream stream, int expectedFlightCount, int expectedNumRows) {
+        int numRows = 0;
+        int flightCount = 0;
+        while (stream.next()) {
+            ++flightCount;
+            numRows += stream.getRoot().getRowCount();
+        }
+        assertThat(flightCount).isEqualTo(expectedFlightCount);
+        assertThat(numRows).isEqualTo(expectedNumRows);
+    }
+
+    private static void consumeNotFound(FlightStream stream) {
+        expectException(stream::next, FlightStatusCode.NOT_FOUND,
+                "Unable to find Flight SQL query. Flight SQL tickets should be resolved promptly and resolved at most once.");
+    }
+
+    private static SubstraitPlan fakePlan() {
+        return new SubstraitPlan("fake".getBytes(StandardCharsets.UTF_8), "1");
+    }
+
+    private static Transaction fakeTxn() {
+        return new Transaction("fake".getBytes(StandardCharsets.UTF_8));
+    }
+
+    private static Savepoint fakeSavepoint() {
+        return new Savepoint("fake".getBytes(StandardCharsets.UTF_8));
+    }
+}
diff --git a/extensions/flight-sql/src/test/java/io/deephaven/server/flightsql/FlightSqlTicketResolverTest.java b/extensions/flight-sql/src/test/java/io/deephaven/server/flightsql/FlightSqlTicketResolverTest.java
new file mode 100644
index 00000000000..abb7dca0d5a
--- /dev/null
+++ b/extensions/flight-sql/src/test/java/io/deephaven/server/flightsql/FlightSqlTicketResolverTest.java
@@ -0,0 +1,170 @@
+//
+// Copyright (c) 2016-2024 Deephaven Data Labs and Patent Pending
+//
+package io.deephaven.server.flightsql;
+
+import com.google.protobuf.Any;
+import com.google.protobuf.Message;
+import io.deephaven.engine.table.TableDefinition;
+import io.deephaven.extensions.barrage.util.BarrageUtil;
+import io.deephaven.server.flightsql.FlightSqlResolver.CommandGetCatalogsConstants;
+import io.deephaven.server.flightsql.FlightSqlResolver.CommandGetDbSchemasConstants;
+import io.deephaven.server.flightsql.FlightSqlResolver.CommandGetKeysConstants;
+import io.deephaven.server.flightsql.FlightSqlResolver.CommandGetPrimaryKeysConstants;
+import io.deephaven.server.flightsql.FlightSqlResolver.CommandGetTableTypesConstants;
+import io.deephaven.server.flightsql.FlightSqlResolver.CommandGetTablesConstants;
+import org.apache.arrow.flight.ActionType;
+import org.apache.arrow.flight.sql.FlightSqlProducer.Schemas;
+import org.apache.arrow.flight.sql.FlightSqlUtils;
+import org.apache.arrow.flight.sql.impl.FlightSql.CommandGetCatalogs;
+import org.apache.arrow.flight.sql.impl.FlightSql.CommandGetCrossReference;
+import org.apache.arrow.flight.sql.impl.FlightSql.CommandGetDbSchemas;
+import org.apache.arrow.flight.sql.impl.FlightSql.CommandGetExportedKeys;
+import org.apache.arrow.flight.sql.impl.FlightSql.CommandGetImportedKeys;
+import org.apache.arrow.flight.sql.impl.FlightSql.CommandGetPrimaryKeys;
+import org.apache.arrow.flight.sql.impl.FlightSql.CommandGetSqlInfo;
+import org.apache.arrow.flight.sql.impl.FlightSql.CommandGetTableTypes;
+import org.apache.arrow.flight.sql.impl.FlightSql.CommandGetTables;
+import org.apache.arrow.flight.sql.impl.FlightSql.CommandGetXdbcTypeInfo;
+import org.apache.arrow.flight.sql.impl.FlightSql.CommandPreparedStatementQuery;
+import org.apache.arrow.flight.sql.impl.FlightSql.CommandPreparedStatementUpdate;
+import org.apache.arrow.flight.sql.impl.FlightSql.CommandStatementQuery;
+import org.apache.arrow.flight.sql.impl.FlightSql.CommandStatementSubstraitPlan;
+import org.apache.arrow.flight.sql.impl.FlightSql.CommandStatementUpdate;
+import org.apache.arrow.flight.sql.impl.FlightSql.TicketStatementQuery;
+import org.apache.arrow.vector.types.pojo.Field;
+import org.apache.arrow.vector.types.pojo.FieldType;
+import org.apache.arrow.vector.types.pojo.Schema;
+import org.junit.jupiter.api.Disabled;
+import org.junit.jupiter.api.Test;
+
+import java.util.Map;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+public class FlightSqlTicketResolverTest {
+    @Test
+    public void actionTypes() {
+        checkActionType(FlightSqlActionHelper.CREATE_PREPARED_STATEMENT_ACTION_TYPE,
+                FlightSqlUtils.FLIGHT_SQL_CREATE_PREPARED_STATEMENT);
+        checkActionType(FlightSqlActionHelper.CLOSE_PREPARED_STATEMENT_ACTION_TYPE,
+                FlightSqlUtils.FLIGHT_SQL_CLOSE_PREPARED_STATEMENT);
+        checkActionType(FlightSqlActionHelper.BEGIN_SAVEPOINT_ACTION_TYPE, FlightSqlUtils.FLIGHT_SQL_BEGIN_SAVEPOINT);
+        checkActionType(FlightSqlActionHelper.END_SAVEPOINT_ACTION_TYPE, FlightSqlUtils.FLIGHT_SQL_END_SAVEPOINT);
+        checkActionType(FlightSqlActionHelper.BEGIN_TRANSACTION_ACTION_TYPE,
+                FlightSqlUtils.FLIGHT_SQL_BEGIN_TRANSACTION);
+        checkActionType(FlightSqlActionHelper.END_TRANSACTION_ACTION_TYPE, FlightSqlUtils.FLIGHT_SQL_END_TRANSACTION);
+        checkActionType(FlightSqlActionHelper.CANCEL_QUERY_ACTION_TYPE, FlightSqlUtils.FLIGHT_SQL_CANCEL_QUERY);
+        checkActionType(FlightSqlActionHelper.CREATE_PREPARED_SUBSTRAIT_PLAN_ACTION_TYPE,
+                FlightSqlUtils.FLIGHT_SQL_CREATE_PREPARED_SUBSTRAIT_PLAN);
+    }
+
+    @Test
+    public void packedTypeUrls() {
+        checkPackedType(FlightSqlSharedConstants.COMMAND_STATEMENT_QUERY_TYPE_URL,
+                CommandStatementQuery.getDefaultInstance());
+        checkPackedType(FlightSqlSharedConstants.COMMAND_STATEMENT_UPDATE_TYPE_URL,
+                CommandStatementUpdate.getDefaultInstance());
+        // Need to update to newer FlightSql version for this
+        // checkPackedType(FlightSqlTicketResolver.COMMAND_STATEMENT_INGEST_TYPE_URL,
+        // CommandStatementIngest.getDefaultInstance());
+        checkPackedType(FlightSqlSharedConstants.COMMAND_STATEMENT_SUBSTRAIT_PLAN_TYPE_URL,
+                CommandStatementSubstraitPlan.getDefaultInstance());
+        checkPackedType(FlightSqlSharedConstants.COMMAND_PREPARED_STATEMENT_QUERY_TYPE_URL,
+                CommandPreparedStatementQuery.getDefaultInstance());
+        checkPackedType(FlightSqlSharedConstants.COMMAND_PREPARED_STATEMENT_UPDATE_TYPE_URL,
+                CommandPreparedStatementUpdate.getDefaultInstance());
+        checkPackedType(FlightSqlSharedConstants.COMMAND_GET_TABLE_TYPES_TYPE_URL,
+                CommandGetTableTypes.getDefaultInstance());
+        checkPackedType(FlightSqlSharedConstants.COMMAND_GET_CATALOGS_TYPE_URL,
+                CommandGetCatalogs.getDefaultInstance());
+        checkPackedType(FlightSqlSharedConstants.COMMAND_GET_DB_SCHEMAS_TYPE_URL,
+                CommandGetDbSchemas.getDefaultInstance());
+        checkPackedType(FlightSqlSharedConstants.COMMAND_GET_TABLES_TYPE_URL,
+                CommandGetTables.getDefaultInstance());
+        checkPackedType(FlightSqlSharedConstants.COMMAND_GET_SQL_INFO_TYPE_URL,
+                CommandGetSqlInfo.getDefaultInstance());
+        checkPackedType(FlightSqlSharedConstants.COMMAND_GET_CROSS_REFERENCE_TYPE_URL,
+                CommandGetCrossReference.getDefaultInstance());
+        checkPackedType(FlightSqlSharedConstants.COMMAND_GET_EXPORTED_KEYS_TYPE_URL,
+                CommandGetExportedKeys.getDefaultInstance());
+        checkPackedType(FlightSqlSharedConstants.COMMAND_GET_IMPORTED_KEYS_TYPE_URL,
+                CommandGetImportedKeys.getDefaultInstance());
+        checkPackedType(FlightSqlSharedConstants.COMMAND_GET_PRIMARY_KEYS_TYPE_URL,
+                CommandGetPrimaryKeys.getDefaultInstance());
+        checkPackedType(FlightSqlSharedConstants.COMMAND_GET_XDBC_TYPE_INFO_TYPE_URL,
+                CommandGetXdbcTypeInfo.getDefaultInstance());
+        checkPackedType(FlightSqlTicketHelper.TICKET_STATEMENT_QUERY_TYPE_URL,
+                TicketStatementQuery.getDefaultInstance());
+    }
+
+    @Test
+    void getTableTypesSchema() {
+        isSimilar(CommandGetTableTypesConstants.DEFINITION, Schemas.GET_TABLE_TYPES_SCHEMA);
+    }
+
+    @Test
+    void getCatalogsSchema() {
+        isSimilar(CommandGetCatalogsConstants.DEFINITION, Schemas.GET_CATALOGS_SCHEMA);
+    }
+
+    @Test
+    void getDbSchemasSchema() {
+        isSimilar(CommandGetDbSchemasConstants.DEFINITION, Schemas.GET_SCHEMAS_SCHEMA);
+    }
+
+    @Disabled("Deephaven is unable to serialize byte as uint8")
+    @Test
+    void getImportedKeysSchema() {
+        isSimilar(CommandGetKeysConstants.DEFINITION, Schemas.GET_IMPORTED_KEYS_SCHEMA);
+    }
+
+    @Disabled("Deephaven is unable to serialize byte as uint8")
+    @Test
+    void getExportedKeysSchema() {
+        isSimilar(CommandGetKeysConstants.DEFINITION, Schemas.GET_EXPORTED_KEYS_SCHEMA);
+    }
+
+    @Disabled("Arrow Java Flight SQL has a bug in ordering, not the same as documented in the protobuf spec, see https://github.com/apache/arrow/issues/44521")
+    @Test
+    void getPrimaryKeysSchema() {
+        isSimilar(CommandGetPrimaryKeysConstants.DEFINITION, Schemas.GET_PRIMARY_KEYS_SCHEMA);
+    }
+
+    @Test
+    void getTablesSchema() {
+        isSimilar(CommandGetTablesConstants.DEFINITION, Schemas.GET_TABLES_SCHEMA);
+        isSimilar(CommandGetTablesConstants.DEFINITION_NO_SCHEMA, Schemas.GET_TABLES_SCHEMA_NO_SCHEMA);
+    }
+
+    private static void checkActionType(String actionType, ActionType expected) {
+        assertThat(actionType).isEqualTo(expected.getType());
+    }
+
+    private static void checkPackedType(String typeUrl, Message expected) {
+        assertThat(typeUrl).isEqualTo(Any.pack(expected).getTypeUrl());
+    }
+
+    private static void isSimilar(TableDefinition definition, Schema expected) {
+        isSimilar(BarrageUtil.toSchema(definition, Map.of(), true), expected);
+    }
+
+    private static void isSimilar(Schema actual, Schema expected) {
+        assertThat(actual.getFields()).hasSameSizeAs(expected.getFields());
+        int L = actual.getFields().size();
+        for (int i = 0; i < L; ++i) {
+            isSimilar(actual.getFields().get(i), expected.getFields().get(i));
+        }
+    }
+
+    private static void isSimilar(Field actual, Field expected) {
+        assertThat(actual.getName()).isEqualTo(expected.getName());
+        assertThat(actual.getChildren()).isEqualTo(expected.getChildren());
+        isSimilar(actual.getFieldType(), expected.getFieldType());
+    }
+
+    private static void isSimilar(FieldType actual, FieldType expected) {
+        assertThat(actual.getType()).isEqualTo(expected.getType());
+        assertThat(actual.getDictionary()).isEqualTo(expected.getDictionary());
+    }
+}
diff --git a/extensions/flight-sql/src/test/java/io/deephaven/server/flightsql/FlightSqlUnauthenticatedTest.java b/extensions/flight-sql/src/test/java/io/deephaven/server/flightsql/FlightSqlUnauthenticatedTest.java
new file mode 100644
index 00000000000..35ddf3e4ce3
--- /dev/null
+++ b/extensions/flight-sql/src/test/java/io/deephaven/server/flightsql/FlightSqlUnauthenticatedTest.java
@@ -0,0 +1,350 @@
+//
+// Copyright (c) 2016-2024 Deephaven Data Labs and Patent Pending
+//
+package io.deephaven.server.flightsql;
+
+import com.google.protobuf.Any;
+import com.google.protobuf.ByteString;
+import dagger.BindsInstance;
+import dagger.Component;
+import dagger.Module;
+import io.deephaven.server.auth.AuthorizationProvider;
+import io.deephaven.server.config.ServerConfig;
+import io.deephaven.server.runner.DeephavenApiServerTestBase;
+import io.deephaven.server.runner.DeephavenApiServerTestBase.TestComponent.Builder;
+import io.grpc.ManagedChannel;
+import org.apache.arrow.flight.*;
+import org.apache.arrow.flight.sql.FlightSqlClient;
+import org.apache.arrow.flight.sql.FlightSqlClient.Savepoint;
+import org.apache.arrow.flight.sql.FlightSqlClient.SubstraitPlan;
+import org.apache.arrow.flight.sql.FlightSqlClient.Transaction;
+import org.apache.arrow.flight.sql.util.TableRef;
+import org.apache.arrow.memory.BufferAllocator;
+import org.apache.arrow.memory.RootAllocator;
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.junit.runners.JUnit4;
+
+import javax.inject.Named;
+import javax.inject.Singleton;
+import java.io.PrintStream;
+import java.nio.charset.StandardCharsets;
+import java.util.ArrayList;
+import java.util.Iterator;
+
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.assertj.core.api.Assertions.failBecauseExceptionWasNotThrown;
+
+// using JUnit4 so we can inherit properly from DeephavenApiServerTestBase
+@RunWith(JUnit4.class)
+public class FlightSqlUnauthenticatedTest extends DeephavenApiServerTestBase {
+
+    private static final TableRef FOO_TABLE_REF = TableRef.of(null, null, "foo_table");
+    public static final TableRef BAR_TABLE_REF = TableRef.of(null, null, "bar_table");
+
+    @Module(includes = {
+            TestModule.class,
+            FlightSqlModule.class,
+    })
+    public interface MyModule {
+
+    }
+
+    @Singleton
+    @Component(modules = MyModule.class)
+    public interface MyComponent extends TestComponent {
+
+        @Component.Builder
+        interface Builder extends TestComponent.Builder {
+
+            @BindsInstance
+            Builder withServerConfig(ServerConfig serverConfig);
+
+            @BindsInstance
+            Builder withOut(@Named("out") PrintStream out);
+
+            @BindsInstance
+            Builder withErr(@Named("err") PrintStream err);
+
+            @BindsInstance
+            Builder withAuthorizationProvider(AuthorizationProvider authorizationProvider);
+
+            MyComponent build();
+        }
+    }
+
+    private BufferAllocator bufferAllocator;
+    private FlightClient flightClient;
+    private FlightSqlClient flightSqlClient;
+
+    @Override
+    protected Builder testComponentBuilder() {
+        return DaggerFlightSqlTest_MyComponent.builder();
+    }
+
+    @Before
+    @Override
+    public void setUp() throws Exception {
+        super.setUp();
+        ManagedChannel channel = channelBuilder().build();
+        register(channel);
+        bufferAllocator = new RootAllocator();
+        // Note: this pattern of FlightClient owning the ManagedChannel does not mesh well with the idea that some
+        // other entity may be managing the authentication lifecycle. We'd prefer to pass in the stubs or "intercepted"
+        // channel directly, but that's not supported. So, we need to create the specific middleware interfaces so
+        // flight can do its own shims.
+        flightClient = FlightGrpcUtilsExtension.createFlightClientWithSharedChannel(bufferAllocator, channel,
+                new ArrayList<>());
+        flightSqlClient = new FlightSqlClient(flightClient);
+    }
+
+    @Override
+    public void tearDown() throws Exception {
+        // this also closes flightClient
+        flightSqlClient.close();
+        bufferAllocator.close();
+        super.tearDown();
+    }
+
+    @Test
+    public void listActions() {
+        // Note: this should likely be tested in the context of Flight, not Flight SQL
+        assertThat(flightClient.listActions()).isEmpty();
+    }
+
+    @Test
+    public void listFlights() {
+        // Note: this should likely be tested in the context of Flight, not Flight SQL
+        assertThat(flightClient.listFlights(Criteria.ALL)).isEmpty();
+    }
+
+    @Test
+    public void getCatalogs() {
+        unauthenticated(() -> flightSqlClient.getCatalogsSchema());
+        unauthenticated(() -> flightSqlClient.getCatalogs());
+    }
+
+    @Test
+    public void getSchemas() {
+        unauthenticated(() -> flightSqlClient.getSchemasSchema());
+        unauthenticated(() -> flightSqlClient.getSchemas(null, null));
+    }
+
+    @Test
+    public void getTables() throws Exception {
+        unauthenticated(() -> flightSqlClient.getTablesSchema(false));
+        unauthenticated(() -> flightSqlClient.getTablesSchema(true));
+        unauthenticated(() -> flightSqlClient.getTables(null, null, null, null, false));
+        unauthenticated(() -> flightSqlClient.getTables(null, null, null, null, true));
+    }
+
+    @Test
+    public void getTableTypes() throws Exception {
+        unauthenticated(() -> flightSqlClient.getTableTypesSchema());
+        unauthenticated(() -> flightSqlClient.getTableTypes());
+    }
+
+    @Test
+    public void select1() throws Exception {
+        unauthenticated(() -> flightSqlClient.getExecuteSchema("SELECT 1 as Foo"));
+        unauthenticated(() -> flightSqlClient.execute("SELECT 1 as Foo"));
+    }
+
+    @Test
+    public void select1Prepared() throws Exception {
+        unauthenticated(() -> flightSqlClient.prepare("SELECT 1 as Foo"));
+    }
+
+    @Test
+    public void executeSubstrait() {
+        unauthenticated(() -> flightSqlClient.getExecuteSubstraitSchema(fakePlan()));
+        unauthenticated(() -> flightSqlClient.executeSubstrait(fakePlan()));
+    }
+
+    @Test
+    public void executeUpdate() {
+        // We are unable to hook in earlier atm than
+        // io.deephaven.server.arrow.ArrowFlightUtil.DoPutObserver.DoPutObserver
+        // so we are unable to provide Flight SQL-specific error message. This could be remedied in the future with an
+        // update to TicketResolver.
+        try {
+            flightSqlClient.executeUpdate("INSERT INTO fake(name) VALUES('Smith')");
+            failBecauseExceptionWasNotThrown(FlightRuntimeException.class);
+        } catch (FlightRuntimeException e) {
+            assertThat(e.status().code()).isEqualTo(FlightStatusCode.UNAUTHENTICATED);
+            assertThat(e).hasMessage("");
+        }
+    }
+
+    @Test
+    public void executeSubstraitUpdate() {
+        // We are unable to hook in earlier atm than
+        // io.deephaven.server.arrow.ArrowFlightUtil.DoPutObserver.DoPutObserver
+        // so we are unable to provide Flight SQL-specific error message. This could be remedied in the future with an
+        // update to TicketResolver.
+        try {
+            flightSqlClient.executeSubstraitUpdate(fakePlan());
+            failBecauseExceptionWasNotThrown(FlightRuntimeException.class);
+        } catch (FlightRuntimeException e) {
+            assertThat(e.status().code()).isEqualTo(FlightStatusCode.UNAUTHENTICATED);
+            assertThat(e).hasMessage("");
+        }
+    }
+
+    @Test
+    public void getSqlInfo() {
+        unauthenticated(() -> flightSqlClient.getSqlInfoSchema());
+        unauthenticated(() -> flightSqlClient.getSqlInfo());
+    }
+
+    @Test
+    public void getXdbcTypeInfo() {
+        unauthenticated(() -> flightSqlClient.getXdbcTypeInfoSchema());
+        unauthenticated(() -> flightSqlClient.getXdbcTypeInfo());
+    }
+
+    @Test
+    public void getCrossReference() {
+        unauthenticated(() -> flightSqlClient.getCrossReferenceSchema());
+        unauthenticated(() -> flightSqlClient.getCrossReference(FOO_TABLE_REF, BAR_TABLE_REF));
+    }
+
+    @Test
+    public void getPrimaryKeys() {
+        unauthenticated(() -> flightSqlClient.getPrimaryKeysSchema());
+        unauthenticated(() -> flightSqlClient.getPrimaryKeys(FOO_TABLE_REF));
+    }
+
+    @Test
+    public void getExportedKeys() {
+        unauthenticated(() -> flightSqlClient.getExportedKeysSchema());
+        unauthenticated(() -> flightSqlClient.getExportedKeys(FOO_TABLE_REF));
+    }
+
+    @Test
+    public void getImportedKeys() {
+        unauthenticated(() -> flightSqlClient.getImportedKeysSchema());
+        unauthenticated(() -> flightSqlClient.getImportedKeys(FOO_TABLE_REF));
+    }
+
+    @Test
+    public void commandStatementIngest() {
+        // This is a real newer Flight SQL command.
+        // Once we upgrade to newer Flight SQL, we can change this to Unimplemented and use the proper APIs.
+        final String typeUrl = "type.googleapis.com/arrow.flight.protocol.sql.CommandStatementIngest";
+        final FlightDescriptor descriptor = unpackableCommand(typeUrl);
+        unauthenticated(() -> flightClient.getSchema(descriptor));
+        unauthenticated(() -> flightClient.getInfo(descriptor));
+    }
+
+    @Test
+    public void unknownCommandLooksLikeFlightSql() {
+        final String typeUrl = "type.googleapis.com/arrow.flight.protocol.sql.CommandLooksRealButDoesNotExist";
+        final FlightDescriptor descriptor = unpackableCommand(typeUrl);
+        unauthenticated(() -> flightClient.getSchema(descriptor));
+        unauthenticated(() -> flightClient.getInfo(descriptor));
+    }
+
+    @Test
+    public void unknownCommand() {
+        // Note: this should likely be tested in the context of Flight, not Flight SQL
+        final String typeUrl = "type.googleapis.com/com.example.SomeRandomCommand";
+        final FlightDescriptor descriptor = unpackableCommand(typeUrl);
+        expectException(() -> flightClient.getSchema(descriptor), FlightStatusCode.INVALID_ARGUMENT,
+                "no resolver for command");
+        expectException(() -> flightClient.getInfo(descriptor), FlightStatusCode.INVALID_ARGUMENT,
+                "no resolver for command");
+    }
+
+    @Test
+    public void prepareSubstrait() {
+        unauthenticated(() -> flightSqlClient.prepare(fakePlan()));
+    }
+
+    @Test
+    public void beginTransaction() {
+        unauthenticated(() -> flightSqlClient.beginTransaction());
+    }
+
+    @Test
+    public void commit() {
+        unauthenticated(() -> flightSqlClient.commit(fakeTxn()));
+    }
+
+    @Test
+    public void rollbackTxn() {
+        unauthenticated(() -> flightSqlClient.rollback(fakeTxn()));
+    }
+
+    @Test
+    public void beginSavepoint() {
+        unauthenticated(() -> flightSqlClient.beginSavepoint(fakeTxn(), "fakeName"));
+    }
+
+    @Test
+    public void release() {
+        unauthenticated(() -> flightSqlClient.release(fakeSavepoint()));
+    }
+
+    @Test
+    public void rollbackSavepoint() {
+        unauthenticated(() -> flightSqlClient.rollback(fakeSavepoint()));
+    }
+
+    @Test
+    public void unknownAction() {
+        // Note: this should likely be tested in the context of Flight, not Flight SQL
+        final String type = "SomeFakeAction";
+        final Action action = new Action(type, new byte[0]);
+        actionNoResolver(() -> doAction(action), type);
+    }
+
+    private Result doAction(Action action) {
+        final Iterator<Result> it = flightClient.doAction(action);
+        if (!it.hasNext()) {
+            throw new IllegalStateException();
+        }
+        final Result result = it.next();
+        if (it.hasNext()) {
+            throw new IllegalStateException();
+        }
+        return result;
+    }
+
+    private static FlightDescriptor unpackableCommand(String typeUrl) {
+        return FlightDescriptor.command(
+                Any.newBuilder().setTypeUrl(typeUrl).setValue(ByteString.copyFrom(new byte[1])).build().toByteArray());
+    }
+
+    private void unauthenticated(Runnable r) {
+        expectException(r, FlightStatusCode.UNAUTHENTICATED, "Flight SQL: Must be authenticated");
+    }
+
+    private void actionNoResolver(Runnable r, String actionType) {
+        expectException(r, FlightStatusCode.UNIMPLEMENTED,
+                String.format("No action resolver found for action type '%s'", actionType));
+    }
+
+    private static void expectException(Runnable r, FlightStatusCode code, String messagePart) {
+        try {
+            r.run();
+            failBecauseExceptionWasNotThrown(FlightRuntimeException.class);
+        } catch (FlightRuntimeException e) {
+            assertThat(e.status().code()).isEqualTo(code);
+            assertThat(e).hasMessageContaining(messagePart);
+        }
+    }
+
+    private static SubstraitPlan fakePlan() {
+        return new SubstraitPlan("fake".getBytes(StandardCharsets.UTF_8), "1");
+    }
+
+    private static Transaction fakeTxn() {
+        return new Transaction("fake".getBytes(StandardCharsets.UTF_8));
+    }
+
+    private static Savepoint fakeSavepoint() {
+        return new Savepoint("fake".getBytes(StandardCharsets.UTF_8));
+    }
+}
diff --git a/extensions/iceberg/TESTING.md b/extensions/iceberg/TESTING.md
new file mode 100644
index 00000000000..ed638f84419
--- /dev/null
+++ b/extensions/iceberg/TESTING.md
@@ -0,0 +1,125 @@
+# sqlite catalogs
+
+The sqlite JDBC catalog is able to support multiple catalogs through a single database file.
+As such, the following convention has been established for testing purposes:
+
+* database file: `<rootDir>/dh-iceberg-test.db`
+* warehouse directory: `<rootDir>/catalogs/<catalogName>/`
+
+Both writers and readers of this catalog need to be setup to support relative metadata locations to ensure portability.
+
+A root directory for extension-iceberg testing has been established at `extensions/iceberg/src/test/resources/io/deephaven/iceberg/sqlite/db_resource`.
+
+## Usage
+
+### Java
+
+```java
+import org.apache.iceberg.catalog.Catalog;
+import io.deephaven.iceberg.sqlite.DbResource;
+
+Catalog catalog = DbResource.openCatalog("<catalogName>");
+```
+
+### pyiceberg
+
+To setup in [pyiceberg](https://py.iceberg.apache.org/):
+
+```python
+from pyiceberg.catalog.sql import SqlCatalog
+
+catalog = SqlCatalog(
+    "<catalogName>",
+    **{
+        "uri": f"sqlite:///dh-iceberg-test.db",
+        "warehouse": f"catalogs/<catalogName>",
+    },
+)
+```
+
+## Generating data
+
+Note that any scripts that write data should be run relative to
+[db_resource](src/test/resources/io/deephaven/iceberg/sqlite/db_resource) working directory to ensure unit testability.
+
+### pyiceberg-1
+
+Here's an example of what was needed to generate this data:
+
+```shell
+$ cd extensions/iceberg/src/test/resources/io/deephaven/iceberg/sqlite/db_resource
+
+# Note: 3.10 explicitly chosen b/c it doesn't seem like pyiceberg produces 3.12 wheels yet
+$ python3.10 -m venv /tmp/iceberg
+
+$ source /tmp/iceberg/bin/activate
+
+$ pip install --only-binary=":all:" "pyiceberg[sql-sqlite, pyarrow]"
+
+$ pip freeze
+annotated-types==0.7.0
+certifi==2024.8.30
+charset-normalizer==3.3.2
+click==8.1.7
+fsspec==2024.9.0
+greenlet==3.1.1
+idna==3.10
+markdown-it-py==3.0.0
+mdurl==0.1.2
+mmh3==4.1.0
+numpy==1.26.4
+pyarrow==17.0.0
+pydantic==2.9.2
+pydantic_core==2.23.4
+Pygments==2.18.0
+pyiceberg==0.7.1
+pyparsing==3.1.4
+python-dateutil==2.9.0.post0
+requests==2.32.3
+rich==13.8.1
+six==1.16.0
+sortedcontainers==2.4.0
+SQLAlchemy==2.0.35
+strictyaml==1.7.3
+tenacity==8.5.0
+typing_extensions==4.12.2
+urllib3==2.2.3
+
+$ python generate-pyiceberg-1.py
+
+$ sqlite3 dh-iceberg-test.db 
+SQLite version 3.45.1 2024-01-30 16:01:20
+Enter ".help" for usage hints.
+sqlite> .dump
+PRAGMA foreign_keys=OFF;
+BEGIN TRANSACTION;
+CREATE TABLE iceberg_tables (
+        catalog_name VARCHAR(255) NOT NULL, 
+        table_namespace VARCHAR(255) NOT NULL, 
+        table_name VARCHAR(255) NOT NULL, 
+        metadata_location VARCHAR(1000), 
+        previous_metadata_location VARCHAR(1000), 
+        PRIMARY KEY (catalog_name, table_namespace, table_name)
+);
+INSERT INTO iceberg_tables VALUES('pyiceberg-1','dh-default','cities','catalogs/pyiceberg-1/dh-default.db/cities/metadata/00003-68091f71-d3c5-42bb-8161-e2e187dece14.metadata.json','catalogs/pyiceberg-1/dh-default.db/cities/metadata/00002-106b37f8-8818-439d-87c5-3cae608d1972.metadata.json');
+CREATE TABLE iceberg_namespace_properties (
+        catalog_name VARCHAR(255) NOT NULL, 
+        namespace VARCHAR(255) NOT NULL, 
+        property_key VARCHAR(255) NOT NULL, 
+        property_value VARCHAR(1000) NOT NULL, 
+        PRIMARY KEY (catalog_name, namespace, property_key)
+);
+INSERT INTO iceberg_namespace_properties VALUES('pyiceberg-1','dh-default','exists','true');
+COMMIT;
+sqlite> 
+```
+
+### sqlite
+
+If we add a lot of catalogs to the database, we may want to look into vacuuming the database to keep the file size small.
+
+`sqlite3 dh-iceberg-test.db 'VACUUM;'`
+
+Ideally, the sqlite database can be a small collection of catalogs that were created via external tooling to verify that
+we can integrate with them successfully.
+
diff --git a/extensions/iceberg/build.gradle b/extensions/iceberg/build.gradle
index 2eba0158fb1..5254157088e 100644
--- a/extensions/iceberg/build.gradle
+++ b/extensions/iceberg/build.gradle
@@ -1,6 +1,7 @@
 plugins {
     id 'java-library'
     id 'io.deephaven.project.register'
+    id 'io.deephaven.hadoop-common-dependencies'
 }
 
 description 'Iceberg: Support to read iceberg catalogs.'
@@ -13,27 +14,74 @@ dependencies {
     implementation project(':log-factory')
     implementation project(':Configuration')
 
-    Classpaths.inheritAutoService(project)
-    Classpaths.inheritImmutables(project)
+    compileOnly libs.autoservice
+    annotationProcessor libs.autoservice.compiler
 
-    Classpaths.inheritParquetHadoop(project)
+    compileOnly project(':util-immutables')
+    annotationProcessor libs.immutables.value
+
+    implementation libs.parquet.hadoop
 
     implementation project(':extensions-parquet-base')
     implementation project(':extensions-parquet-table')
 
-    Classpaths.inheritIcebergCore(project)
-    Classpaths.inheritIcebergHadoop(project)
+    api platform(libs.iceberg.bom)
+    api libs.iceberg.api
+    implementation libs.iceberg.core
+    implementation libs.iceberg.bundled.guava
+
+    // Also inherits hadoop-common, see io.deephaven.hadoop-common-dependencies
+
+    implementation libs.avro
 
-    Classpaths.inheritJUnitPlatform(project)
-    Classpaths.inheritAssertJ(project)
+    implementation libs.commons.lang3
 
-    testImplementation 'org.junit.jupiter:junit-jupiter'
-    testRuntimeOnly 'org.junit.jupiter:junit-jupiter-engine'
-    testRuntimeOnly 'org.junit.platform:junit-platform-launcher'
+    testImplementation libs.assertj
 
-    Classpaths.inheritTestContainers(project)
+    testImplementation platform(libs.junit.bom)
+    testImplementation libs.junit.jupiter
+    testRuntimeOnly libs.junit.jupiter.engine
+    testRuntimeOnly libs.junit.platform.launcher
 
     testRuntimeOnly project(':test-configs')
     testRuntimeOnly project(':log-to-slf4j')
-    Classpaths.inheritSlf4j(project, 'slf4j-simple', 'testRuntimeOnly')
+    testRuntimeOnly libs.slf4j.simple
+
+    testRuntimeOnly libs.xerial.sqlite.jdbc
+
+    // NOTE: we need to pull down more hadoop dependencies,
+    // buildSrc/src/main/groovy/io.deephaven.hadoop-common-dependencies.gradle excludes some stuff we need to do
+    // Hadoop FileIO.
+    testRuntimeOnly libs.hadoop.common
+
+    testImplementation project(':engine-test-utils')
 }
+
+/**
+ * We are setting up a "security-manage-allow" tag to add the system property `-Djava.security.manager=allow`
+ * to the tests that need it for Java 23+. Otherwise, the following exception is thrown:
+ *
+ * java.lang.UnsupportedOperationException: getSubject is supported only if a security manager is allowed
+ *   at java.base/javax.security.auth.Subject.getSubject(Subject.java:347)
+ *   at org.apache.hadoop.security.UserGroupInformation.getCurrentUser(UserGroupInformation.java:588)
+ *
+ * See https://issues.apache.org/jira/browse/HADOOP-19212
+ * See https://jdk.java.net/23/release-notes#JDK-8296244
+ */
+
+test {
+    useJUnitPlatform {
+        excludeTags("security-manager-allow")
+    }
+}
+
+def testSecurityManagerAllow = tasks.register('testSecurityManagerAllow', Test) {
+    useJUnitPlatform {
+        includeTags("security-manager-allow")
+    }
+    if (it.javaLauncher.get().metadata.languageVersion >= JavaLanguageVersion.of(23)) {
+        it.systemProperty("java.security.manager", "allow")
+    }
+}
+
+check.dependsOn testSecurityManagerAllow
diff --git a/extensions/iceberg/s3/build.gradle b/extensions/iceberg/s3/build.gradle
index be495b1373d..9979cf011f2 100644
--- a/extensions/iceberg/s3/build.gradle
+++ b/extensions/iceberg/s3/build.gradle
@@ -1,6 +1,7 @@
 plugins {
     id 'java-library'
     id 'io.deephaven.project.register'
+    id 'io.deephaven.hadoop-common-dependencies'
 }
 
 evaluationDependsOn Docker.registryProject('localstack')
@@ -9,26 +10,52 @@ evaluationDependsOn Docker.registryProject('minio')
 description 'Iceberg: Support to read iceberg catalogs.'
 
 dependencies {
-    implementation project(':extensions-iceberg')
+    api project(':extensions-iceberg')
 
     // Bring in the AWS / S3 extensions
-    Classpaths.inheritIcebergCore(project)
+    api platform(libs.iceberg.bom)
+    api libs.iceberg.api
+    implementation libs.iceberg.core
+    implementation libs.iceberg.bundled.guava
 
     implementation project(':extensions-s3')
-    implementation "org.apache.iceberg:iceberg-aws"
+    implementation libs.iceberg.aws
 
-    Classpaths.inheritAWSSDK(project)
-    runtimeOnly "software.amazon.awssdk:sts"
-    runtimeOnly "software.amazon.awssdk:glue"
+    implementation platform(libs.awssdk.bom)
+    implementation libs.awssdk.s3
+    implementation libs.awssdk.crt.client
+    runtimeOnly libs.awssdk.sts
+    implementation libs.awssdk.glue
 
-    Classpaths.inheritTestContainers(project)
+    // We don't want to explicitly pull in dependencies for dynamodb (org.apache.iceberg.aws.dynamodb.DynamoDbCatalog),
+    // but we need to be able to compile against it to implement AwsClientFactory
+    compileOnly libs.awssdk.dynamodb
+
+    // We don't want to explicitly pull in dependencies for KMS (there doesn't seem to be anything in Iceberg that
+    // actually calls it?), but we need to be able to compile against it to implement AwsClientFactory
+    compileOnly libs.awssdk.kms
+
+    compileOnly libs.autoservice
+    annotationProcessor libs.autoservice.compiler
+
+    testImplementation project(':engine-test-utils')
+
+    testImplementation libs.testcontainers
+    testImplementation libs.testcontainers.junit.jupiter
+    testImplementation libs.testcontainers.localstack
+    testImplementation libs.testcontainers.minio
 
     testImplementation TestTools.projectDependency(project, 'extensions-s3')
     testImplementation TestTools.projectDependency(project, 'extensions-iceberg')
 
     testRuntimeOnly project(':test-configs')
     testRuntimeOnly project(':log-to-slf4j')
-    Classpaths.inheritSlf4j(project, 'slf4j-simple', 'testRuntimeOnly')
+    testRuntimeOnly libs.slf4j.simple
+
+    testImplementation platform(libs.junit.bom)
+    testImplementation libs.junit.jupiter
+    testRuntimeOnly libs.junit.jupiter.engine
+    testRuntimeOnly libs.junit.platform.launcher
 }
 
 test {
diff --git a/extensions/iceberg/s3/src/main/java/io/deephaven/extensions/s3/DeephavenAwsClientFactory.java b/extensions/iceberg/s3/src/main/java/io/deephaven/extensions/s3/DeephavenAwsClientFactory.java
new file mode 100644
index 00000000000..efdd89ac730
--- /dev/null
+++ b/extensions/iceberg/s3/src/main/java/io/deephaven/extensions/s3/DeephavenAwsClientFactory.java
@@ -0,0 +1,137 @@
+//
+// Copyright (c) 2016-2024 Deephaven Data Labs and Patent Pending
+//
+package io.deephaven.extensions.s3;
+
+import org.apache.iceberg.aws.AwsClientFactory;
+import org.apache.iceberg.aws.AwsProperties;
+import org.apache.iceberg.aws.s3.S3FileIOAwsClientFactory;
+import org.apache.iceberg.aws.s3.S3FileIOProperties;
+import software.amazon.awssdk.services.dynamodb.DynamoDbClient;
+import software.amazon.awssdk.services.glue.GlueClient;
+import software.amazon.awssdk.services.kms.KmsClient;
+import software.amazon.awssdk.services.s3.S3Client;
+
+import java.util.Map;
+import java.util.Objects;
+import java.util.Optional;
+import java.util.UUID;
+import java.util.concurrent.ConcurrentHashMap;
+
+/**
+ * An {@link AwsClientFactory} and {@link S3FileIOAwsClientFactory} implementation that assumes ownership of AWS client
+ * creation as configured via {@link S3Instructions}.
+ */
+public final class DeephavenAwsClientFactory implements AwsClientFactory, S3FileIOAwsClientFactory {
+
+    private static final String UUID_KEY = DeephavenAwsClientFactory.class.getName() + ".__uuid";
+
+    /**
+     * Adds {@link DeephavenAwsClientFactory} to {@code propertiesOut} with the keys
+     * {@value AwsProperties#CLIENT_FACTORY} and {@value S3FileIOProperties#CLIENT_FACTORY}; it is an error if either of
+     * these properties is already set. After the corresponding {@link org.apache.iceberg.catalog.Catalog} is no longer
+     * in use, the caller should invoke the returned {@link Runnable} to clean up.
+     *
+     * @param instructions the instructions
+     * @param propertiesOut the properties
+     * @return the runnable to be invoked after initialization
+     */
+    public static Runnable addToProperties(S3Instructions instructions, Map<String, String> propertiesOut) {
+        Objects.requireNonNull(instructions);
+        putOrThrow(propertiesOut, AwsProperties.CLIENT_FACTORY, DeephavenAwsClientFactory.class.getName());
+        putOrThrow(propertiesOut, S3FileIOProperties.CLIENT_FACTORY, DeephavenAwsClientFactory.class.getName());
+        final String uuid = UUID.randomUUID().toString();
+        putOrThrow(propertiesOut, UUID_KEY, uuid);
+        S3_INSTRUCTIONS_MAP.put(uuid, instructions);
+        return () -> S3_INSTRUCTIONS_MAP.remove(uuid);
+    }
+
+    /**
+     * Get the {@link S3Instructions} as set in the corresponding {@link #addToProperties(S3Instructions, Map)} if the
+     * properties were built with that. If the properties were built with {@link #addToProperties(S3Instructions, Map)},
+     * but the {@link Runnable} was already invoked for cleanup, an {@link IllegalStateException} will be thrown.
+     *
+     * @param properties the properties
+     * @return the instructions
+     */
+    public static Optional<S3Instructions> getInstructions(Map<String, String> properties) {
+        final String uuid = properties.get(UUID_KEY);
+        if (uuid == null) {
+            return Optional.empty();
+        }
+        final S3Instructions instructions = S3_INSTRUCTIONS_MAP.get(uuid);
+        if (instructions == null) {
+            throw new IllegalStateException(
+                    "This S3Instructions were already cleaned up; please ensure that the returned Runnable from addToProperties is not invoked until the Catalog is no longer in use.");
+        }
+        return Optional.of(instructions);
+    }
+
+    private static <K, V> void putOrThrow(Map<K, V> map, K key, V value) {
+        if (map.putIfAbsent(key, value) != null) {
+            throw new IllegalArgumentException(String.format("Key '%s' already exists in map", key));
+        }
+    }
+
+    private static final Map<String, S3Instructions> S3_INSTRUCTIONS_MAP = new ConcurrentHashMap<>();
+
+    private S3Instructions instructions;
+
+    public DeephavenAwsClientFactory() {
+        // This follows the pattern established by other Iceberg classes that have an initialize method; they have a
+        // default value that is set in construction, with the expectation that they are properly constructed in the
+        // initialize call. While those implementations likely could be stricter and implemented defensively (throwing
+        // an exception if any other methods are called before initialize), that does not seem to be the pattern in use.
+        // We do not _expect_ the default instructions as set here to ever be used, but we are choosing to follow the
+        // "established convention" in the rare case there is some caller misusing this in a way that does not effect
+        // the correctness of the end Catalog.
+        this.instructions = S3Instructions.DEFAULT;
+    }
+
+    @Override
+    public void initialize(Map<String, String> properties) {
+        this.instructions = getInstructions(properties).orElseThrow(() -> new IllegalArgumentException(
+                "DeephavenAwsClientFactory was setup improperly; it must be configured with DeephavenAwsClientFactory.addToProperties"));
+    }
+
+    @Override
+    public S3Client s3() {
+        // Iceberg calls this from org.apache.iceberg.aws.s3.S3FileIO which multiple Catalog implementations use. This
+        // implementation is backed by the same configuration primitives that our own async S3 client uses. It is well
+        // tested and provides parity between how Iceberg S3 and Deephaven S3 clients are initialized.
+        return S3ClientFactory.getSyncClient(instructions);
+    }
+
+    @Override
+    public GlueClient glue() {
+        // Iceberg calls this from org.apache.iceberg.aws.glue.GlueCatalog, and it's possible that other
+        // custom Catalog implementations could make use out of this interface. This implementation has been manually
+        // tested and confirmed to work in simple cases.
+        return GlueClient.builder()
+                .applyMutation(b -> S3ClientFactory.applyAllSharedSync(b, instructions))
+                .build();
+    }
+
+    @Override
+    public KmsClient kms() {
+        // Iceberg does not call this method. It is likely part of the interface to support advanced authorization that
+        // enterprise users may need. It's likely in those scenarios that the user is owning the full Catalog creation
+        // as well, with their own custom AwsClientFactory, so it's not clear if this implementation will be of value.
+        // That said, it is easy to build and follows the same pattern as the other clients, so it is provided in a
+        // "best-effort" basis without further testing.
+        return KmsClient.builder()
+                .applyMutation(b -> S3ClientFactory.applyAllSharedSync(b, instructions))
+                .build();
+    }
+
+    @Override
+    public DynamoDbClient dynamo() {
+        // Iceberg calls this from org.apache.iceberg.aws.dynamodb.DynamoDbCatalog, and it's possible that other
+        // custom Catalog implementations could make use out of this interface. This implementation is easy to build
+        // and follows the same pattern as the other clients, so it is provided in a "best-effort" basis without further
+        // testing.
+        return DynamoDbClient.builder()
+                .applyMutation(b -> S3ClientFactory.applyAllSharedSync(b, instructions))
+                .build();
+    }
+}
diff --git a/extensions/iceberg/s3/src/main/java/io/deephaven/iceberg/util/IcebergToolsS3.java b/extensions/iceberg/s3/src/main/java/io/deephaven/iceberg/util/IcebergToolsS3.java
index 166b47e5d28..ef4f98b5d11 100644
--- a/extensions/iceberg/s3/src/main/java/io/deephaven/iceberg/util/IcebergToolsS3.java
+++ b/extensions/iceberg/s3/src/main/java/io/deephaven/iceberg/util/IcebergToolsS3.java
@@ -4,12 +4,18 @@
 package io.deephaven.iceberg.util;
 
 import com.google.common.base.Strings;
+import io.deephaven.extensions.s3.DeephavenAwsClientFactory;
+import io.deephaven.extensions.s3.S3Instructions;
+import io.deephaven.util.reference.CleanupReferenceProcessor;
+import org.apache.hadoop.conf.Configuration;
 import org.apache.iceberg.CatalogProperties;
-import org.apache.iceberg.CatalogUtil;
 import org.apache.iceberg.aws.AwsClientProperties;
+import org.apache.iceberg.aws.AwsProperties;
+import org.apache.iceberg.aws.HttpClientProperties;
 import org.apache.iceberg.aws.glue.GlueCatalog;
+import org.apache.iceberg.aws.s3.S3FileIO;
 import org.apache.iceberg.aws.s3.S3FileIOProperties;
-import org.apache.iceberg.io.FileIO;
+import org.apache.iceberg.catalog.Catalog;
 import org.apache.iceberg.rest.RESTCatalog;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
@@ -18,11 +24,9 @@
 import java.util.Map;
 
 /**
- * Tools for accessing tables in the Iceberg table format.
+ * Tools for accessing tables in the Iceberg table format from S3.
  */
-@SuppressWarnings("unused")
-public class IcebergToolsS3 extends IcebergTools {
-    private static final String S3_FILE_IO_CLASS = "org.apache.iceberg.aws.s3.S3FileIO";
+public final class IcebergToolsS3 {
 
     /**
      * Create an Iceberg catalog adapter for a REST catalog backed by S3 storage. If {@code null} is provided for a
@@ -49,14 +53,6 @@ public static IcebergCatalogAdapter createS3Rest(
 
         // Set up the properties map for the Iceberg catalog
         final Map<String, String> properties = new HashMap<>();
-
-        final RESTCatalog catalog = new RESTCatalog();
-
-        properties.put(CatalogProperties.CATALOG_IMPL, catalog.getClass().getName());
-        properties.put(CatalogProperties.URI, catalogURI);
-        properties.put(CatalogProperties.WAREHOUSE_LOCATION, warehouseLocation);
-
-        // Configure the properties map from the Iceberg instructions.
         if (!Strings.isNullOrEmpty(accessKeyId) && !Strings.isNullOrEmpty(secretAccessKey)) {
             properties.put(S3FileIOProperties.ACCESS_KEY_ID, accessKeyId);
             properties.put(S3FileIOProperties.SECRET_ACCESS_KEY, secretAccessKey);
@@ -68,12 +64,9 @@ public static IcebergCatalogAdapter createS3Rest(
             properties.put(S3FileIOProperties.ENDPOINT, endpointOverride);
         }
 
-        final FileIO fileIO = CatalogUtil.loadFileIO(S3_FILE_IO_CLASS, properties, null);
-
-        final String catalogName = name != null ? name : "IcebergCatalog-" + catalogURI;
-        catalog.initialize(catalogName, properties);
-
-        return new IcebergCatalogAdapter(catalog, fileIO);
+        final RESTCatalog catalog = new RESTCatalog();
+        catalog.setConf(new Configuration());
+        return createAdapterCommon(name, catalogURI, warehouseLocation, catalog, properties);
     }
 
     /**
@@ -96,16 +89,75 @@ public static IcebergCatalogAdapter createGlue(
         final Map<String, String> properties = new HashMap<>();
 
         final GlueCatalog catalog = new GlueCatalog();
+        catalog.setConf(new Configuration());
+        return createAdapterCommon(name, catalogURI, warehouseLocation, catalog, properties);
+    }
 
+    private static IcebergCatalogAdapter createAdapterCommon(
+            @Nullable final String name,
+            @NotNull final String catalogURI,
+            @NotNull final String warehouseLocation,
+            @NotNull final Catalog catalog,
+            @NotNull final Map<String, String> properties) {
         properties.put(CatalogProperties.CATALOG_IMPL, catalog.getClass().getName());
         properties.put(CatalogProperties.URI, catalogURI);
         properties.put(CatalogProperties.WAREHOUSE_LOCATION, warehouseLocation);
 
-        final FileIO fileIO = CatalogUtil.loadFileIO(S3_FILE_IO_CLASS, properties, null);
+        // Following is needed to write new manifest files when writing new data.
+        // Not setting this will result in using ResolvingFileIO.
+        properties.put(CatalogProperties.FILE_IO_IMPL, S3FileIO.class.getName());
 
         final String catalogName = name != null ? name : "IcebergCatalog-" + catalogURI;
         catalog.initialize(catalogName, properties);
 
-        return new IcebergCatalogAdapter(catalog, fileIO);
+        return IcebergCatalogAdapter.of(catalog, properties);
+    }
+
+    /**
+     * Create an Iceberg catalog adapter.
+     *
+     * <p>
+     * This is the preferred way to configure an Iceberg catalog adapter when the caller is responsible for providing
+     * AWS / S3 connectivity details; specifically, this allows for the parity of construction logic between
+     * Iceberg-managed and Deephaven-managed AWS clients. For advanced use-cases, users are encouraged to use
+     * {@link S3Instructions#profileName() profiles} which allows a rich degree of configurability. The
+     * {@code instructions} will automatically be used as special instructions if
+     * {@link IcebergReadInstructions#dataInstructions()} is not explicitly set. The caller is still responsible for
+     * providing any other properties necessary to configure their {@link org.apache.iceberg.catalog.Catalog}
+     * implementation.
+     *
+     * <p>
+     * In cases where the caller prefers to use Iceberg's AWS properties (found amongst {@link AwsProperties},
+     * {@link S3FileIOProperties}, and {@link HttpClientProperties}), they should use
+     * {@link IcebergTools#createAdapter(String, Map, Map) IcebergTools} directly. In this case, parity will be limited
+     * to what {@link S3InstructionsProviderPlugin} is able to infer; in advanced cases, it's possible that there will
+     * be a difference in construction logic between the Iceberg-managed and Deephaven-managed AWS clients which
+     * manifests itself as being able to browse {@link org.apache.iceberg.catalog.Catalog} metadata, but not retrieve
+     * {@link org.apache.iceberg.Table} data.
+     *
+     * <p>
+     * Note: this method does not explicitly set, nor impose, that {@link org.apache.iceberg.aws.s3.S3FileIO} be used.
+     * It's possible that a {@link org.apache.iceberg.catalog.Catalog} implementations depends on an AWS client for
+     * purposes unrelated to storing the warehouse data via S3.
+     *
+     * @param name the name of the catalog; if omitted, the catalog URI will be used to generate a name
+     * @param properties a map containing the Iceberg catalog properties to use
+     * @param hadoopConfig a map containing Hadoop configuration properties to use
+     * @param instructions the s3 instructions
+     * @return the Iceberg catalog adapter
+     */
+    public static IcebergCatalogAdapter createAdapter(
+            @Nullable final String name,
+            @NotNull final Map<String, String> properties,
+            @NotNull final Map<String, String> hadoopConfig,
+            @NotNull final S3Instructions instructions) {
+        final Map<String, String> newProperties = new HashMap<>(properties);
+        final Runnable cleanup = DeephavenAwsClientFactory.addToProperties(instructions, newProperties);
+        final IcebergCatalogAdapter adapter = IcebergTools.createAdapter(name, newProperties, hadoopConfig);
+        // When the Catalog becomes phantom reachable, we can invoke the DeephavenAwsClientFactory cleanup.
+        // Note: it would be incorrect to register the cleanup against the adapter since the Catalog can outlive the
+        // adapter (and the DeephavenAwsClientFactory properties are needed by the Catalog).
+        CleanupReferenceProcessor.getDefault().registerPhantom(adapter.catalog(), cleanup);
+        return adapter;
     }
 }
diff --git a/extensions/iceberg/s3/src/main/java/io/deephaven/iceberg/util/S3InstructionsProviderPlugin.java b/extensions/iceberg/s3/src/main/java/io/deephaven/iceberg/util/S3InstructionsProviderPlugin.java
new file mode 100644
index 00000000000..6e8b1d1bf1f
--- /dev/null
+++ b/extensions/iceberg/s3/src/main/java/io/deephaven/iceberg/util/S3InstructionsProviderPlugin.java
@@ -0,0 +1,63 @@
+//
+// Copyright (c) 2016-2024 Deephaven Data Labs and Patent Pending
+//
+package io.deephaven.iceberg.util;
+
+import com.google.auto.service.AutoService;
+import io.deephaven.extensions.s3.Credentials;
+import io.deephaven.extensions.s3.DeephavenAwsClientFactory;
+import io.deephaven.extensions.s3.S3Instructions;
+import io.deephaven.iceberg.internal.DataInstructionsProviderPlugin;
+import org.apache.iceberg.aws.AwsClientProperties;
+import org.apache.iceberg.aws.s3.S3FileIOProperties;
+import org.jetbrains.annotations.NotNull;
+
+import java.util.Map;
+
+/**
+ * {@link DataInstructionsProviderPlugin} implementation for producing a {@link S3Instructions}. The produced
+ * instructions will be from {@link DeephavenAwsClientFactory#getInstructions(Map)} if present, and otherwise will make
+ * a best-effort attempt to create an equivalent instructions based on properties from {@link AwsClientProperties} and
+ * {@link S3FileIOProperties}.
+ */
+@AutoService(DataInstructionsProviderPlugin.class)
+@SuppressWarnings("unused")
+public final class S3InstructionsProviderPlugin implements DataInstructionsProviderPlugin {
+    @Override
+    public S3Instructions createInstructions(@NotNull final String uriScheme,
+            @NotNull final Map<String, String> properties) {
+        final S3Instructions s3Instructions = DeephavenAwsClientFactory.getInstructions(properties).orElse(null);
+        if (s3Instructions != null) {
+            return s3Instructions;
+        }
+
+        // If the URI scheme is "s3","s3a","s3n" or if the properties contain one of these specific keys, we can
+        // create a useful S3Instructions object.
+        if (uriScheme.equals("s3")
+                || uriScheme.equals("s3a")
+                || uriScheme.equals("s3n")
+                || properties.containsKey(AwsClientProperties.CLIENT_REGION)
+                || properties.containsKey(S3FileIOProperties.ACCESS_KEY_ID)
+                || properties.containsKey(S3FileIOProperties.SECRET_ACCESS_KEY)
+                || properties.containsKey(S3FileIOProperties.ENDPOINT)) {
+
+            final S3Instructions.Builder builder = S3Instructions.builder();
+            if (properties.containsKey(AwsClientProperties.CLIENT_REGION)) {
+                builder.regionName(properties.get(AwsClientProperties.CLIENT_REGION));
+            }
+            if (properties.containsKey(S3FileIOProperties.ENDPOINT)) {
+                builder.endpointOverride(properties.get(S3FileIOProperties.ENDPOINT));
+            }
+            if (properties.containsKey(S3FileIOProperties.ACCESS_KEY_ID)
+                    && properties.containsKey(S3FileIOProperties.SECRET_ACCESS_KEY)) {
+                builder.credentials(
+                        Credentials.basic(properties.get(S3FileIOProperties.ACCESS_KEY_ID),
+                                properties.get(S3FileIOProperties.SECRET_ACCESS_KEY)));
+            }
+            return builder.build();
+        }
+
+        // We have no useful properties for creating an S3Instructions object.
+        return null;
+    }
+}
diff --git a/extensions/iceberg/s3/src/test/java/io/deephaven/iceberg/util/IcebergLocalStackTest.java b/extensions/iceberg/s3/src/test/java/io/deephaven/iceberg/util/IcebergLocalStackTest.java
index 578e358985e..acfac006733 100644
--- a/extensions/iceberg/s3/src/test/java/io/deephaven/iceberg/util/IcebergLocalStackTest.java
+++ b/extensions/iceberg/s3/src/test/java/io/deephaven/iceberg/util/IcebergLocalStackTest.java
@@ -3,29 +3,45 @@
 //
 package io.deephaven.iceberg.util;
 
-
 import io.deephaven.extensions.s3.S3Instructions.Builder;
-import io.deephaven.extensions.s3.testlib.SingletonContainers;
+import io.deephaven.extensions.s3.testlib.SingletonContainers.LocalStack;
 import org.junit.jupiter.api.BeforeAll;
 import org.junit.jupiter.api.Tag;
 import software.amazon.awssdk.services.s3.S3AsyncClient;
 
+import java.util.Map;
+
+import static org.apache.iceberg.aws.AwsClientProperties.CLIENT_REGION;
+import static org.apache.iceberg.aws.s3.S3FileIOProperties.ACCESS_KEY_ID;
+import static org.apache.iceberg.aws.s3.S3FileIOProperties.ENDPOINT;
+import static org.apache.iceberg.aws.s3.S3FileIOProperties.SECRET_ACCESS_KEY;
+
 @Tag("testcontainers")
+@Deprecated
 public class IcebergLocalStackTest extends IcebergToolsTest {
 
     @BeforeAll
-    static void initContainer() {
+    public static void initContainer() {
         // ensure container is started so container startup time isn't associated with a specific test
-        SingletonContainers.LocalStack.init();
+        LocalStack.init();
     }
 
     @Override
-    public Builder s3Instructions(Builder builder) {
-        return SingletonContainers.LocalStack.s3Instructions(builder);
+    public Builder s3Instructions(final Builder builder) {
+        return LocalStack.s3Instructions(builder);
     }
 
     @Override
     public S3AsyncClient s3AsyncClient() {
-        return SingletonContainers.LocalStack.s3AsyncClient();
+        return LocalStack.s3AsyncClient();
+    }
+
+    @Override
+    public Map<String, String> properties() {
+        return Map.of(
+                ENDPOINT, LocalStack.s3Endpoint(),
+                CLIENT_REGION, LocalStack.region(),
+                ACCESS_KEY_ID, LocalStack.accessKey(),
+                SECRET_ACCESS_KEY, LocalStack.secretAccessKey());
     }
 }
diff --git a/extensions/iceberg/s3/src/test/java/io/deephaven/iceberg/util/IcebergMinIOTest.java b/extensions/iceberg/s3/src/test/java/io/deephaven/iceberg/util/IcebergMinIOTest.java
index 804d2d01746..8c2d8aef0f6 100644
--- a/extensions/iceberg/s3/src/test/java/io/deephaven/iceberg/util/IcebergMinIOTest.java
+++ b/extensions/iceberg/s3/src/test/java/io/deephaven/iceberg/util/IcebergMinIOTest.java
@@ -3,33 +3,49 @@
 //
 package io.deephaven.iceberg.util;
 
-
 import io.deephaven.extensions.s3.S3Instructions.Builder;
-import io.deephaven.extensions.s3.testlib.SingletonContainers;
-import io.deephaven.stats.util.OSUtil;
+import io.deephaven.extensions.s3.testlib.SingletonContainers.MinIO;
+import io.deephaven.base.OSUtil;
 import org.junit.jupiter.api.Assumptions;
 import org.junit.jupiter.api.BeforeAll;
 import org.junit.jupiter.api.Tag;
 import software.amazon.awssdk.services.s3.S3AsyncClient;
 
+import java.util.Map;
+
+import static org.apache.iceberg.aws.AwsClientProperties.CLIENT_REGION;
+import static org.apache.iceberg.aws.s3.S3FileIOProperties.ACCESS_KEY_ID;
+import static org.apache.iceberg.aws.s3.S3FileIOProperties.ENDPOINT;
+import static org.apache.iceberg.aws.s3.S3FileIOProperties.SECRET_ACCESS_KEY;
+
 @Tag("testcontainers")
+@Deprecated
 public class IcebergMinIOTest extends IcebergToolsTest {
 
     @BeforeAll
-    static void initContainer() {
+    public static void initContainer() {
         // TODO(deephaven-core#5116): MinIO testcontainers does not work on OS X
         Assumptions.assumeFalse(OSUtil.runningMacOS(), "OSUtil.runningMacOS()");
         // ensure container is started so container startup time isn't associated with a specific test
-        SingletonContainers.MinIO.init();
+        MinIO.init();
     }
 
     @Override
-    public Builder s3Instructions(Builder builder) {
-        return SingletonContainers.MinIO.s3Instructions(builder);
+    public Builder s3Instructions(final Builder builder) {
+        return MinIO.s3Instructions(builder);
     }
 
     @Override
     public S3AsyncClient s3AsyncClient() {
-        return SingletonContainers.MinIO.s3AsyncClient();
+        return MinIO.s3AsyncClient();
+    }
+
+    @Override
+    public Map<String, String> properties() {
+        return Map.of(
+                ENDPOINT, MinIO.s3Endpoint(),
+                CLIENT_REGION, MinIO.region(),
+                ACCESS_KEY_ID, MinIO.accessKey(),
+                SECRET_ACCESS_KEY, MinIO.secretAccessKey());
     }
 }
diff --git a/extensions/iceberg/s3/src/test/java/io/deephaven/iceberg/util/IcebergToolsTest.java b/extensions/iceberg/s3/src/test/java/io/deephaven/iceberg/util/IcebergToolsTest.java
index a2db0131879..0920d803fae 100644
--- a/extensions/iceberg/s3/src/test/java/io/deephaven/iceberg/util/IcebergToolsTest.java
+++ b/extensions/iceberg/s3/src/test/java/io/deephaven/iceberg/util/IcebergToolsTest.java
@@ -5,80 +5,158 @@
 
 import gnu.trove.list.array.TLongArrayList;
 import io.deephaven.base.verify.Assert;
+import io.deephaven.engine.context.ExecutionContext;
 import io.deephaven.engine.table.ColumnDefinition;
 import io.deephaven.engine.table.Table;
 import io.deephaven.engine.table.TableDefinition;
 import io.deephaven.engine.table.impl.locations.TableDataException;
-import io.deephaven.engine.util.TableTools;
+import io.deephaven.engine.testutil.ControlledUpdateGraph;
+import io.deephaven.engine.testutil.junit4.EngineCleanup;
 import io.deephaven.extensions.s3.S3Instructions;
 import io.deephaven.iceberg.TestCatalog.IcebergTestCatalog;
-import io.deephaven.iceberg.TestCatalog.IcebergTestFileIO;
-import io.deephaven.time.DateTimeUtils;
+import org.apache.iceberg.Schema;
+import io.deephaven.iceberg.base.IcebergUtils;
 import org.apache.iceberg.Snapshot;
-import org.apache.iceberg.catalog.Catalog;
 import org.apache.iceberg.catalog.Namespace;
 import org.apache.iceberg.catalog.TableIdentifier;
-import org.apache.iceberg.io.FileIO;
-import org.junit.jupiter.api.Test;
+import org.apache.iceberg.types.Type;
 import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 import software.amazon.awssdk.core.async.AsyncRequestBody;
 import software.amazon.awssdk.services.s3.S3AsyncClient;
-import software.amazon.awssdk.services.s3.model.*;
+import software.amazon.awssdk.services.s3.model.CreateBucketRequest;
+import software.amazon.awssdk.services.s3.model.DeleteBucketRequest;
+import software.amazon.awssdk.services.s3.model.DeleteObjectRequest;
+import software.amazon.awssdk.services.s3.model.PutObjectRequest;
+import software.amazon.awssdk.services.s3.model.PutObjectResponse;
 
 import java.io.File;
+import java.math.BigDecimal;
 import java.time.Instant;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.List;
-import java.util.Map;
+import java.time.LocalDate;
+import java.time.LocalDateTime;
+import java.time.LocalTime;
+import java.util.*;
 import java.util.concurrent.CompletableFuture;
 import java.util.concurrent.ExecutionException;
 import java.util.concurrent.TimeUnit;
 import java.util.concurrent.TimeoutException;
 import java.util.stream.Collectors;
 
+import static io.deephaven.iceberg.util.IcebergCatalogAdapter.NAMESPACE_DEFINITION;
+import static io.deephaven.iceberg.util.IcebergCatalogAdapter.TABLES_DEFINITION;
+import static io.deephaven.iceberg.util.IcebergTableAdapter.SNAPSHOT_DEFINITION;
+
+/**
+ * @deprecated tests against a fresh catalog should be added to {@link io.deephaven.iceberg.junit5.SqliteCatalogBase}
+ *             and tests against pre-created catalogs should likely be migrated
+ *             {@link io.deephaven.iceberg.sqlite.DbResource}
+ */
+@Deprecated
 public abstract class IcebergToolsTest {
-    IcebergInstructions instructions;
+
+    private static final TableDefinition SALES_SINGLE_DEFINITION = TableDefinition.of(
+            ColumnDefinition.ofString("Region"),
+            ColumnDefinition.ofString("Item_Type"),
+            ColumnDefinition.ofInt("Units_Sold"),
+            ColumnDefinition.ofDouble("Unit_Price"),
+            ColumnDefinition.ofTime("Order_Date"));
+
+    private static final TableDefinition SALES_RENAMED_DEFINITION = TableDefinition.of(
+            ColumnDefinition.ofString("Region_Name"),
+            ColumnDefinition.ofString("ItemType"),
+            ColumnDefinition.ofInt("UnitsSold"),
+            ColumnDefinition.ofDouble("Unit_Price"),
+            ColumnDefinition.ofTime("Order_Date"));
+
+    private static final TableDefinition SALES_MULTI_DEFINITION = SALES_SINGLE_DEFINITION;
+
+    private static final TableDefinition SALES_PARTITIONED_DEFINITION = TableDefinition.of(
+            ColumnDefinition.ofString("Region"),
+            ColumnDefinition.ofString("Item_Type"),
+            ColumnDefinition.ofInt("Units_Sold"),
+            ColumnDefinition.ofDouble("Unit_Price"),
+            ColumnDefinition.ofTime("Order_Date"),
+            ColumnDefinition.ofInt("year").withPartitioning(),
+            ColumnDefinition.ofInt("month").withPartitioning());
+
+    private static final TableDefinition ALL_TYPES_DEF = TableDefinition.of(
+            ColumnDefinition.ofBoolean("booleanField"),
+            ColumnDefinition.ofInt("integerField"),
+            ColumnDefinition.ofLong("longField"),
+            ColumnDefinition.ofFloat("floatField"),
+            ColumnDefinition.ofDouble("doubleField"),
+            ColumnDefinition.ofString("stringField"),
+            ColumnDefinition.fromGenericType("dateField", LocalDate.class),
+            ColumnDefinition.fromGenericType("timeField", LocalTime.class),
+            ColumnDefinition.fromGenericType("timestampField", LocalDateTime.class),
+            ColumnDefinition.fromGenericType("decimalField", BigDecimal.class),
+            ColumnDefinition.fromGenericType("fixedField", byte[].class),
+            ColumnDefinition.fromGenericType("binaryField", byte[].class),
+            ColumnDefinition.ofTime("instantField"));
+
+    private static final TableDefinition META_DEF = TableDefinition.of(
+            ColumnDefinition.ofString("Name"),
+            ColumnDefinition.ofString("DataType"),
+            ColumnDefinition.ofString("ColumnType"),
+            ColumnDefinition.ofBoolean("IsPartitioning"));
+
+    private IcebergReadInstructions instructions;
 
     public abstract S3AsyncClient s3AsyncClient();
 
     public abstract S3Instructions.Builder s3Instructions(S3Instructions.Builder builder);
 
+    public abstract Map<String, String> properties();
+
     private S3AsyncClient asyncClient;
     private String bucket;
 
     private final List<String> keys = new ArrayList<>();
 
     private String warehousePath;
-    private Catalog resourceCatalog;
-    private FileIO resourceFileIO;
+    private IcebergTestCatalog resourceCatalog;
+
+    private final EngineCleanup framework = new EngineCleanup();
 
     @BeforeEach
-    void setUp() throws ExecutionException, InterruptedException {
+    void setUp() throws Exception {
+        framework.setUp();
         bucket = "warehouse";
         asyncClient = s3AsyncClient();
         asyncClient.createBucket(CreateBucketRequest.builder().bucket(bucket).build()).get();
 
         warehousePath = IcebergToolsTest.class.getResource("/warehouse").getPath();
-        resourceFileIO = new IcebergTestFileIO("s3://warehouse", warehousePath);
 
         // Create the test catalog for the tests
-        resourceCatalog = IcebergTestCatalog.create(warehousePath, resourceFileIO);
+        resourceCatalog = IcebergTestCatalog.create(warehousePath, properties());
 
         final S3Instructions s3Instructions = s3Instructions(S3Instructions.builder()).build();
 
-        instructions = IcebergInstructions.builder()
+        instructions = IcebergReadInstructions.builder()
                 .dataInstructions(s3Instructions)
                 .build();
     }
 
-    private void uploadParquetFiles(final File root, final String prefixToRemove)
+    @AfterEach
+    void tearDown() throws Exception {
+        resourceCatalog.close();
+        for (String key : keys) {
+            asyncClient.deleteObject(DeleteObjectRequest.builder().bucket(bucket).key(key).build()).get();
+        }
+        keys.clear();
+        asyncClient.deleteBucket(DeleteBucketRequest.builder().bucket(bucket).build()).get();
+        asyncClient.close();
+        framework.tearDown();
+    }
+
+    private void uploadFiles(final File root, final String prefixToRemove)
             throws ExecutionException, InterruptedException, TimeoutException {
         for (final File file : root.listFiles()) {
             if (file.isDirectory()) {
-                uploadParquetFiles(file, prefixToRemove);
-            } else if (file.getName().endsWith(".parquet")) {
+                uploadFiles(file, prefixToRemove);
+            } else {
                 final String key = file.getPath().substring(prefixToRemove.length() + 1);
 
                 keys.add(key);
@@ -94,202 +172,178 @@ private void uploadParquetFiles(final File root, final String prefixToRemove)
         }
     }
 
-    @AfterEach
-    public void tearDown() throws ExecutionException, InterruptedException {
-        for (String key : keys) {
-            asyncClient.deleteObject(DeleteObjectRequest.builder().bucket(bucket).key(key).build()).get();
-        }
-        keys.clear();
-        asyncClient.deleteBucket(DeleteBucketRequest.builder().bucket(bucket).build()).get();
-        asyncClient.close();
+    private void uploadSalesPartitioned() throws ExecutionException, InterruptedException, TimeoutException {
+        uploadFiles(new File(IcebergToolsTest.class.getResource("/warehouse/sales/sales_partitioned").getPath()),
+                warehousePath);
+    }
+
+    private void uploadAllTypes() throws ExecutionException, InterruptedException, TimeoutException {
+        uploadFiles(new File(IcebergToolsTest.class.getResource("/warehouse/sample/all_types").getPath()),
+                warehousePath);
+    }
+
+    private void uploadSalesSingle() throws ExecutionException, InterruptedException, TimeoutException {
+        uploadFiles(new File(IcebergToolsTest.class.getResource("/warehouse/sales/sales_single").getPath()),
+                warehousePath);
+    }
+
+    private void uploadSalesMulti() throws ExecutionException, InterruptedException, TimeoutException {
+        uploadFiles(new File(IcebergToolsTest.class.getResource("/warehouse/sales/sales_multi").getPath()),
+                warehousePath);
+    }
+
+    private void uploadSalesRenamed() throws ExecutionException, InterruptedException, TimeoutException {
+        uploadFiles(new File(IcebergToolsTest.class.getResource("/warehouse/sales/sales_renamed").getPath()),
+                warehousePath);
     }
 
     @Test
-    public void testListNamespaces() {
-        final IcebergCatalogAdapter adapter = IcebergTools.createAdapter(resourceCatalog, resourceFileIO);
+    void testListNamespaces() {
+        final IcebergCatalogAdapter adapter = IcebergTools.createAdapter(resourceCatalog);
 
         final Collection<Namespace> namespaces = adapter.listNamespaces();
         final Collection<String> namespaceNames =
                 namespaces.stream().map(Namespace::toString).collect(Collectors.toList());
 
-        Assert.eq(namespaceNames.size(), "namespaceNames.size()", 2, "2 namespace in the catalog");
+        Assert.eq(namespaceNames.size(), "namespaceNames.size()", 2, "namespace in the catalog");
         Assert.eqTrue(namespaceNames.contains("sales"), "namespaceNames.contains(sales)");
         Assert.eqTrue(namespaceNames.contains("sample"), "namespaceNames.contains(sample)");
 
-        final Table table = adapter.listNamespacesAsTable();
-        Assert.eq(table.size(), "table.size()", 2, "2 namespace in the catalog");
-        Assert.eqTrue(table.getColumnSource("Namespace").getType().equals(String.class), "namespace column type");
-        Assert.eqTrue(table.getColumnSource("NamespaceObject").getType().equals(Namespace.class),
-                "namespace_object column type");
+        final Table table = adapter.namespaces();
+        Assert.eq(table.size(), "table.size()", 2, "namespace in the catalog");
+        Assert.equals(table.getDefinition(), "table.getDefinition()", NAMESPACE_DEFINITION);
     }
 
     @Test
-    public void testListTables() {
-        final IcebergCatalogAdapter adapter = IcebergTools.createAdapter(resourceCatalog, resourceFileIO);
+    void testListTables() {
+        final IcebergCatalogAdapter adapter = IcebergTools.createAdapter(resourceCatalog);
 
         final Namespace ns = Namespace.of("sales");
 
         Collection<TableIdentifier> tables = adapter.listTables(ns);
-        Assert.eq(tables.size(), "tables.size()", 3, "3 tables in the namespace");
+        Assert.eq(tables.size(), "tables.size()", 4, "tables in the namespace");
         Assert.eqTrue(tables.contains(TableIdentifier.of(ns, "sales_multi")), "tables.contains(sales_multi)");
         Assert.eqTrue(tables.contains(TableIdentifier.of(ns, "sales_partitioned")),
                 "tables.contains(sales_partitioned)");
         Assert.eqTrue(tables.contains(TableIdentifier.of(ns, "sales_single")), "tables.contains(sales_single)");
+        Assert.eqTrue(tables.contains(TableIdentifier.of(ns, "sales_renamed")), "tables.contains(sales_renamed)");
 
-        Table table = adapter.listTablesAsTable(ns);
-        Assert.eq(table.size(), "table.size()", 3, "3 tables in the namespace");
-        Assert.eqTrue(table.getColumnSource("Namespace").getType().equals(String.class), "namespace column type");
-        Assert.eqTrue(table.getColumnSource("TableName").getType().equals(String.class), "table_name column type");
-        Assert.eqTrue(table.getColumnSource("TableIdentifierObject").getType().equals(TableIdentifier.class),
-                "table_identifier_object column type");
+        Table table = adapter.tables(ns);
+        Assert.eq(table.size(), "table.size()", 4, "tables in the namespace");
+        Assert.equals(table.getDefinition(), "table.getDefinition()", TABLES_DEFINITION);
 
         // Test the string versions of the methods
-        table = adapter.listTablesAsTable("sales");
-        Assert.eq(table.size(), "table.size()", 3, "3 tables in the namespace");
+        table = adapter.tables("sales");
+        Assert.eq(table.size(), "table.size()", 4, "tables in the namespace");
+        Assert.equals(table.getDefinition(), "table.getDefinition()", TABLES_DEFINITION);
     }
 
     @Test
-    public void testListSnapshots() {
-        final IcebergCatalogAdapter adapter = IcebergTools.createAdapter(resourceCatalog, resourceFileIO);
+    void testGetTableAdapter() {
+        final IcebergCatalogAdapter adapter = IcebergTools.createAdapter(resourceCatalog);
 
-        final TLongArrayList snapshotIds = new TLongArrayList();
-        final TableIdentifier tableIdentifier = TableIdentifier.of("sales", "sales_multi");
-        adapter.listSnapshots(tableIdentifier)
-                .forEach(snapshot -> snapshotIds.add(snapshot.snapshotId()));
-
-        Assert.eq(snapshotIds.size(), "snapshots.size()", 4, "4 snapshots for sales/sales_multi");
-
-        Assert.eqTrue(snapshotIds.contains(2001582482032951248L), "snapshots.contains(2001582482032951248)");
-        Assert.eqTrue(snapshotIds.contains(8325605756612719366L), "snapshots.contains(8325605756612719366L)");
-        Assert.eqTrue(snapshotIds.contains(3247344357341484163L), "snapshots.contains(3247344357341484163L)");
-        Assert.eqTrue(snapshotIds.contains(1792185872197984875L), "snapshots.contains(1792185872197984875L)");
-
-        Table table = adapter.listSnapshotsAsTable(tableIdentifier);
-        Assert.eq(table.size(), "table.size()", 4, "4 snapshots for sales/sales_multi");
-        Assert.eqTrue(table.getColumnSource("Id").getType().equals(long.class), "id column type");
-        Assert.eqTrue(table.getColumnSource("TimestampMs").getType().equals(long.class), "timestamp_ms column type");
-        Assert.eqTrue(table.getColumnSource("Operation").getType().equals(String.class), "operation column type");
-        Assert.eqTrue(table.getColumnSource("Summary").getType().equals(Map.class), "summary column type");
-        Assert.eqTrue(table.getColumnSource("SnapshotObject").getType().equals(Snapshot.class),
-                "snapshot_object column type");
+        // Test the overloads of the load() method.
+        final IcebergTableAdapter tableAdapter0 = adapter.loadTable("sales.sales_single");
+        final IcebergTableAdapter tableAdapter1 = adapter.loadTable(TableIdentifier.of("sales", "sales_single"));
 
-        // Test the string versions of the methods
-        table = adapter.listSnapshotsAsTable("sales.sales_multi");
-        Assert.eq(table.size(), "table.size()", 4, "4 snapshots for sales/sales_multi");
+        Assert.eq(tableAdapter0.listSnapshots().size(), "tableAdapter0.listSnapshots().size()",
+                tableAdapter1.listSnapshots().size(), "tableAdapter1.listSnapshots().size()");
+
+        Assert.eq(tableAdapter0.currentSnapshot().timestampMillis(),
+                "tableAdapter0.currentSnapshot().timestampMillis()",
+                tableAdapter1.currentSnapshot().timestampMillis(), "tableAdapter1.currentSnapshot().timestampMillis()");
     }
 
     @Test
-    public void testOpenTableA() throws ExecutionException, InterruptedException, TimeoutException {
-        uploadParquetFiles(new File(IcebergToolsTest.class.getResource("/warehouse/sales/sales_partitioned").getPath()),
-                warehousePath);
+    void testListSnapshots() {
+        final IcebergCatalogAdapter adapter = IcebergTools.createAdapter(resourceCatalog);
+        final IcebergTableAdapter tableAdapter = adapter.loadTable("sales.sales_multi");
 
-        final IcebergCatalogAdapter adapter =
-                IcebergTools.createAdapter(resourceCatalog, resourceFileIO);
+        final TLongArrayList snapshotIds = new TLongArrayList();
 
-        final Namespace ns = Namespace.of("sales");
-        final TableIdentifier tableId = TableIdentifier.of(ns, "sales_partitioned");
-        io.deephaven.engine.table.Table table = adapter.readTable(tableId, instructions);
+        tableAdapter.listSnapshots().forEach(snapshot -> snapshotIds.add(snapshot.snapshotId()));
 
-        // Verify we retrieved all the rows.
-        Assert.eq(table.size(), "table.size()", 100_000, "100_000 rows in the table");
+        Assert.eq(snapshotIds.size(), "snapshots.size()", 6, "snapshots for sales/sales_multi");
 
-        // Test the string versions of the methods
-        table = adapter.readTable("sales.sales_partitioned", instructions);
+        Assert.eqTrue(snapshotIds.contains(8121674823173822790L), "snapshots.contains(8121674823173822790L)");
+        Assert.eqTrue(snapshotIds.contains(6040260770188877244L), "snapshots.contains(6040260770188877244L)");
+        Assert.eqTrue(snapshotIds.contains(5693547373255393922L), "snapshots.contains(5693547373255393922L)");
+        Assert.eqTrue(snapshotIds.contains(3445166522731196553L), "snapshots.contains(3445166522731196553L)");
+        Assert.eqTrue(snapshotIds.contains(1277776933184906785L), "snapshots.contains(1277776933184906785L)");
+        Assert.eqTrue(snapshotIds.contains(3825168261540020388L), "snapshots.contains(3825168261540020388L)");
 
-        // Verify we retrieved all the rows.
-        Assert.eq(table.size(), "table.size()", 100_000, "100_000 rows in the table");
+        Table table = tableAdapter.snapshots();
+        Assert.eq(table.size(), "table.size()", 6, "snapshots for sales/sales_multi");
+        Assert.equals(table.getDefinition(), "table.getDefinition()", SNAPSHOT_DEFINITION);
     }
 
     @Test
-    public void testOpenTableB() throws ExecutionException, InterruptedException, TimeoutException {
-        uploadParquetFiles(new File(IcebergToolsTest.class.getResource("/warehouse/sales/sales_multi").getPath()),
-                warehousePath);
-
-        final IcebergCatalogAdapter adapter =
-                IcebergTools.createAdapter(resourceCatalog, resourceFileIO);
-
-        final Namespace ns = Namespace.of("sales");
-        final TableIdentifier tableId = TableIdentifier.of(ns, "sales_multi");
-        io.deephaven.engine.table.Table table = adapter.readTable(tableId, instructions);
-
-        Assert.eq(table.size(), "table.size()", 100_000, "100_000 rows in the table");
+    void testOpenTableA() throws ExecutionException, InterruptedException, TimeoutException {
+        uploadSalesPartitioned();
 
-        // Test the string versions of the methods
-        table = adapter.readTable("sales.sales_multi", instructions);
+        final IcebergCatalogAdapter adapter = IcebergTools.createAdapter(resourceCatalog);
+        final IcebergTableAdapter tableAdapter = adapter.loadTable("sales.sales_partitioned");
+        final io.deephaven.engine.table.Table table = tableAdapter.table(instructions);
 
         // Verify we retrieved all the rows.
-        Assert.eq(table.size(), "table.size()", 100_000, "100_000 rows in the table");
+        Assert.eq(table.size(), "table.size()", 100_000, "expected rows in the table");
+        Assert.equals(table.getDefinition(), "table.getDefinition()", SALES_PARTITIONED_DEFINITION);
     }
 
     @Test
-    public void testOpenTableC() throws ExecutionException, InterruptedException, TimeoutException {
-        uploadParquetFiles(new File(IcebergToolsTest.class.getResource("/warehouse/sales/sales_single").getPath()),
-                warehousePath);
+    public void testOpenTableB() throws ExecutionException, InterruptedException, TimeoutException {
+        uploadSalesMulti();
 
-        final IcebergCatalogAdapter adapter =
-                IcebergTools.createAdapter(resourceCatalog, resourceFileIO);
+        final IcebergCatalogAdapter adapter = IcebergTools.createAdapter(resourceCatalog);
+        final IcebergTableAdapter tableAdapter = adapter.loadTable("sales.sales_multi");
+        final io.deephaven.engine.table.Table table = tableAdapter.table(instructions);
 
-        final Namespace ns = Namespace.of("sales");
-        final TableIdentifier tableId = TableIdentifier.of(ns, "sales_single");
-        io.deephaven.engine.table.Table table = adapter.readTable(tableId, instructions);
+        // This table ends up with zero records
+        Assert.eq(table.size(), "table.size()", 0, "expected rows in the table");
+        Assert.equals(table.getDefinition(), "table.getDefinition()", SALES_MULTI_DEFINITION);
+    }
 
-        // Verify we retrieved all the rows.
-        Assert.eq(table.size(), "table.size()", 100_000, "100_000 rows in the table");
+    @Test
+    void testOpenTableC() throws ExecutionException, InterruptedException, TimeoutException {
+        uploadSalesSingle();
 
-        // Test the string versions of the methods
-        table = adapter.readTable("sales.sales_single", instructions);
+        final IcebergCatalogAdapter adapter = IcebergTools.createAdapter(resourceCatalog);
+        final IcebergTableAdapter tableAdapter = adapter.loadTable("sales.sales_single");
+        final io.deephaven.engine.table.Table table = tableAdapter.table(instructions);
 
         // Verify we retrieved all the rows.
-        Assert.eq(table.size(), "table.size()", 100_000, "100_000 rows in the table");
+        Assert.eq(table.size(), "table.size()", 100_000, "expected rows in the table");
+        Assert.equals(table.getDefinition(), "table.getDefinition()", SALES_SINGLE_DEFINITION);
     }
 
     @Test
-    public void testOpenTableS3Only() throws ExecutionException, InterruptedException, TimeoutException {
-        uploadParquetFiles(new File(IcebergToolsTest.class.getResource("/warehouse/sales/sales_partitioned").getPath()),
-                warehousePath);
+    void testOpenTableS3Only() throws ExecutionException, InterruptedException, TimeoutException {
+        uploadSalesPartitioned();
 
-        final IcebergCatalogAdapter adapter = IcebergTools.createAdapter(resourceCatalog, resourceFileIO);
-
-        final Namespace ns = Namespace.of("sales");
-        final TableIdentifier tableId = TableIdentifier.of(ns, "sales_partitioned");
-        final io.deephaven.engine.table.Table table = adapter.readTable(tableId, instructions);
+        final IcebergCatalogAdapter adapter = IcebergTools.createAdapter(resourceCatalog);
+        final IcebergTableAdapter tableAdapter = adapter.loadTable("sales.sales_partitioned");
+        final io.deephaven.engine.table.Table table = tableAdapter.table(instructions);
 
         // Verify we retrieved all the rows.
-        Assert.eq(table.size(), "table.size()", 100_000, "100_000 rows in the table");
+        Assert.eq(table.size(), "table.size()", 100_000, "expected rows in the table");
+        Assert.equals(table.getDefinition(), "table.getDefinition()", SALES_PARTITIONED_DEFINITION);
     }
 
     @Test
-    public void testOpenTableDefinition() throws ExecutionException, InterruptedException, TimeoutException {
-        uploadParquetFiles(new File(IcebergToolsTest.class.getResource("/warehouse/sales/sales_partitioned").getPath()),
-                warehousePath);
+    void testOpenTableDefinition() throws ExecutionException, InterruptedException, TimeoutException {
+        uploadSalesPartitioned();
 
-        final TableDefinition tableDef = TableDefinition.of(
-                ColumnDefinition.ofInt("year").withPartitioning(),
-                ColumnDefinition.ofInt("month").withPartitioning(),
-                ColumnDefinition.ofString("Region"),
-                ColumnDefinition.ofString("Item_Type"),
-                ColumnDefinition.ofInt("Units_Sold"),
-                ColumnDefinition.ofDouble("Unit_Price"),
-                ColumnDefinition.fromGenericType("Order_Date", Instant.class));
-
-        final IcebergInstructions localInstructions = IcebergInstructions.builder()
-                .tableDefinition(tableDef)
-                .dataInstructions(instructions.dataInstructions().get())
-                .build();
-
-        final IcebergCatalogAdapter adapter =
-                IcebergTools.createAdapter(resourceCatalog, resourceFileIO);
-
-        final Namespace ns = Namespace.of("sales");
-        final TableIdentifier tableId = TableIdentifier.of(ns, "sales_partitioned");
-        final io.deephaven.engine.table.Table table = adapter.readTable(tableId, localInstructions);
+        final IcebergCatalogAdapter adapter = IcebergTools.createAdapter(resourceCatalog);
+        final IcebergTableAdapter tableAdapter = adapter.loadTable("sales.sales_partitioned");
+        final io.deephaven.engine.table.Table table = tableAdapter.table(instructions);
 
         // Verify we retrieved all the rows.
-        Assert.eq(table.size(), "table.size()", 100_000, "100_000 rows in the table");
+        Assert.eq(table.size(), "table.size()", 100_000, "expected rows in the table");
+        Assert.equals(table.getDefinition(), "table.getDefinition()", SALES_PARTITIONED_DEFINITION);
     }
 
     @Test
-    public void testOpenTablePartitionTypeException() {
+    void testOpenTablePartitionTypeException() {
         final TableDefinition tableDef = TableDefinition.of(
                 ColumnDefinition.ofLong("year").withPartitioning(),
                 ColumnDefinition.ofInt("month").withPartitioning(),
@@ -297,43 +351,44 @@ public void testOpenTablePartitionTypeException() {
                 ColumnDefinition.ofString("Item_Type"),
                 ColumnDefinition.ofDouble("Units_Sold"),
                 ColumnDefinition.ofLong("Unit_Price"),
-                ColumnDefinition.fromGenericType("Order_Date", Instant.class));
+                ColumnDefinition.ofTime("Order_Date"));
 
-        final IcebergInstructions localInstructions = IcebergInstructions.builder()
+        final IcebergReadInstructions localInstructions = IcebergReadInstructions.builder()
                 .tableDefinition(tableDef)
                 .dataInstructions(instructions.dataInstructions().get())
                 .build();
 
-        final IcebergCatalogAdapter adapter =
-                IcebergTools.createAdapter(resourceCatalog, resourceFileIO);
-
-        final Namespace ns = Namespace.of("sales");
-        final TableIdentifier tableId = TableIdentifier.of(ns, "sales_partitioned");
-        try {
-            final io.deephaven.engine.table.Table table = adapter.readTable(tableId, localInstructions);
-            TableTools.showWithRowSet(table, 100, DateTimeUtils.timeZone(), System.out);
-            Assert.statementNeverExecuted("Expected an exception for missing columns");
-        } catch (final TableDefinition.IncompatibleTableDefinitionException e) {
-            Assert.eqTrue(e.getMessage().startsWith("Table definition incompatibilities"), "Exception message");
+        final IcebergCatalogAdapter adapter = IcebergTools.createAdapter(resourceCatalog);
+        final IcebergTableAdapter tableAdapter = adapter.loadTable("sales.sales_partitioned");
+
+        for (Runnable runnable : Arrays.<Runnable>asList(
+                () -> tableAdapter.table(localInstructions),
+                () -> tableAdapter.definition(localInstructions),
+                () -> tableAdapter.definitionTable(localInstructions))) {
+            try {
+                runnable.run();
+                Assert.statementNeverExecuted("Expected an exception for missing columns");
+            } catch (final TableDefinition.IncompatibleTableDefinitionException e) {
+                Assert.eqTrue(e.getMessage().startsWith("Table definition incompatibilities"), "Exception message");
+            }
         }
     }
 
     @Test
-    public void testOpenTableDefinitionRename() throws ExecutionException, InterruptedException, TimeoutException {
-        uploadParquetFiles(new File(IcebergToolsTest.class.getResource("/warehouse/sales/sales_partitioned").getPath()),
-                warehousePath);
+    void testOpenTableDefinitionRename() throws ExecutionException, InterruptedException, TimeoutException {
+        uploadSalesPartitioned();
 
-        final TableDefinition tableDef = TableDefinition.of(
+        final TableDefinition renamed = TableDefinition.of(
                 ColumnDefinition.ofInt("__year").withPartitioning(),
                 ColumnDefinition.ofInt("__month").withPartitioning(),
                 ColumnDefinition.ofString("RegionName"),
                 ColumnDefinition.ofString("ItemType"),
                 ColumnDefinition.ofInt("UnitsSold"),
                 ColumnDefinition.ofDouble("UnitPrice"),
-                ColumnDefinition.fromGenericType("OrderDate", Instant.class));
+                ColumnDefinition.ofTime("OrderDate"));
 
-        final IcebergInstructions localInstructions = IcebergInstructions.builder()
-                .tableDefinition(tableDef)
+        final IcebergReadInstructions localInstructions = IcebergReadInstructions.builder()
+                .tableDefinition(renamed)
                 .dataInstructions(instructions.dataInstructions().get())
                 .putColumnRenames("Region", "RegionName")
                 .putColumnRenames("Item_Type", "ItemType")
@@ -344,21 +399,18 @@ public void testOpenTableDefinitionRename() throws ExecutionException, Interrupt
                 .putColumnRenames("month", "__month")
                 .build();
 
-        final IcebergCatalogAdapter adapter =
-                IcebergTools.createAdapter(resourceCatalog, resourceFileIO);
-
-        final Namespace ns = Namespace.of("sales");
-        final TableIdentifier tableId = TableIdentifier.of(ns, "sales_partitioned");
-        final io.deephaven.engine.table.Table table = adapter.readTable(tableId, localInstructions);
+        final IcebergCatalogAdapter adapter = IcebergTools.createAdapter(resourceCatalog);
+        final IcebergTableAdapter tableAdapter = adapter.loadTable("sales.sales_partitioned");
+        final io.deephaven.engine.table.Table table = tableAdapter.table(localInstructions);
 
         // Verify we retrieved all the rows.
-        Assert.eq(table.size(), "table.size()", 100_000, "100_000 rows in the table");
+        Assert.eq(table.size(), "table.size()", 100_000, "expected rows in the table");
+        Assert.equals(table.getDefinition(), "table.getDefinition()", renamed);
     }
 
     @Test
-    public void testSkippedPartitioningColumn() throws ExecutionException, InterruptedException, TimeoutException {
-        uploadParquetFiles(new File(IcebergToolsTest.class.getResource("/warehouse/sales/sales_partitioned").getPath()),
-                warehousePath);
+    void testSkippedPartitioningColumn() throws ExecutionException, InterruptedException, TimeoutException {
+        uploadSalesPartitioned();
 
         final TableDefinition tableDef = TableDefinition.of(
                 ColumnDefinition.ofInt("year").withPartitioning(),
@@ -367,28 +419,26 @@ public void testSkippedPartitioningColumn() throws ExecutionException, Interrupt
                 ColumnDefinition.ofString("Item_Type"),
                 ColumnDefinition.ofInt("Units_Sold"),
                 ColumnDefinition.ofDouble("Unit_Price"),
-                ColumnDefinition.fromGenericType("Order_Date", Instant.class));
+                ColumnDefinition.ofTime("Order_Date"));
 
-        final IcebergInstructions localInstructions = IcebergInstructions.builder()
+        final IcebergReadInstructions localInstructions = IcebergReadInstructions.builder()
                 .tableDefinition(tableDef)
                 .dataInstructions(instructions.dataInstructions().get())
                 .build();
 
-        final IcebergCatalogAdapter adapter =
-                IcebergTools.createAdapter(resourceCatalog, resourceFileIO);
-
-        final Namespace ns = Namespace.of("sales");
-        final TableIdentifier tableId = TableIdentifier.of(ns, "sales_partitioned");
-        final io.deephaven.engine.table.Table table = adapter.readTable(tableId, localInstructions);
+        final IcebergCatalogAdapter adapter = IcebergTools.createAdapter(resourceCatalog);
+        final IcebergTableAdapter tableAdapter = adapter.loadTable("sales.sales_partitioned");
+        final io.deephaven.engine.table.Table table = tableAdapter.table(localInstructions);
 
         // Verify we retrieved all the rows.
-        Assert.eq(table.size(), "table.size()", 100_000, "100_000 rows in the table");
+        Assert.eq(table.size(), "table.size()", 100_000, "expected rows in the table");
+        Assert.equals(table.getDefinition(), "table.getDefinition()", tableDef);
     }
 
+
     @Test
-    public void testReorderedPartitioningColumn() throws ExecutionException, InterruptedException, TimeoutException {
-        uploadParquetFiles(new File(IcebergToolsTest.class.getResource("/warehouse/sales/sales_partitioned").getPath()),
-                warehousePath);
+    void testReorderedPartitioningColumn() throws ExecutionException, InterruptedException, TimeoutException {
+        uploadSalesPartitioned();
 
         final TableDefinition tableDef = TableDefinition.of(
                 ColumnDefinition.ofInt("month").withPartitioning(),
@@ -397,54 +447,42 @@ public void testReorderedPartitioningColumn() throws ExecutionException, Interru
                 ColumnDefinition.ofString("Item_Type"),
                 ColumnDefinition.ofInt("Units_Sold"),
                 ColumnDefinition.ofDouble("Unit_Price"),
-                ColumnDefinition.fromGenericType("Order_Date", Instant.class));
+                ColumnDefinition.ofTime("Order_Date"));
 
-        final IcebergInstructions localInstructions = IcebergInstructions.builder()
+        final IcebergReadInstructions localInstructions = IcebergReadInstructions.builder()
                 .tableDefinition(tableDef)
                 .dataInstructions(instructions.dataInstructions().get())
                 .build();
 
-        final IcebergCatalogAdapter adapter =
-                IcebergTools.createAdapter(resourceCatalog, resourceFileIO);
-
-        final Namespace ns = Namespace.of("sales");
-        final TableIdentifier tableId = TableIdentifier.of(ns, "sales_partitioned");
-        final io.deephaven.engine.table.Table table = adapter.readTable(tableId, localInstructions);
+        final IcebergCatalogAdapter adapter = IcebergTools.createAdapter(resourceCatalog);
+        final IcebergTableAdapter tableAdapter = adapter.loadTable("sales.sales_partitioned");
+        final io.deephaven.engine.table.Table table = tableAdapter.table(localInstructions);
 
         // Verify we retrieved all the rows.
-        Assert.eq(table.size(), "table.size()", 100_000, "100_000 rows in the table");
+        Assert.eq(table.size(), "table.size()", 100_000, "expected rows in the table");
+        Assert.equals(table.getDefinition(), "table.getDefinition()", tableDef);
     }
 
     @Test
-    public void testZeroPartitioningColumns() throws ExecutionException, InterruptedException, TimeoutException {
-        uploadParquetFiles(new File(IcebergToolsTest.class.getResource("/warehouse/sales/sales_partitioned").getPath()),
-                warehousePath);
-
-        final TableDefinition tableDef = TableDefinition.of(
-                ColumnDefinition.ofString("Region"),
-                ColumnDefinition.ofString("Item_Type"),
-                ColumnDefinition.ofInt("Units_Sold"),
-                ColumnDefinition.ofDouble("Unit_Price"),
-                ColumnDefinition.fromGenericType("Order_Date", Instant.class));
+    void testZeroPartitioningColumns() throws ExecutionException, InterruptedException, TimeoutException {
+        uploadSalesPartitioned();
 
-        final IcebergInstructions localInstructions = IcebergInstructions.builder()
-                .tableDefinition(tableDef)
+        final IcebergReadInstructions localInstructions = IcebergReadInstructions.builder()
+                .tableDefinition(SALES_MULTI_DEFINITION)
                 .dataInstructions(instructions.dataInstructions().get())
                 .build();
 
-        final IcebergCatalogAdapter adapter =
-                IcebergTools.createAdapter(resourceCatalog, resourceFileIO);
-
-        final Namespace ns = Namespace.of("sales");
-        final TableIdentifier tableId = TableIdentifier.of(ns, "sales_partitioned");
-        final io.deephaven.engine.table.Table table = adapter.readTable(tableId, localInstructions);
+        final IcebergCatalogAdapter adapter = IcebergTools.createAdapter(resourceCatalog);
+        final IcebergTableAdapter tableAdapter = adapter.loadTable("sales.sales_partitioned");
+        final io.deephaven.engine.table.Table table = tableAdapter.table(localInstructions);
 
         // Verify we retrieved all the rows.
-        Assert.eq(table.size(), "table.size()", 100_000, "100_000 rows in the table");
+        Assert.eq(table.size(), "table.size()", 100_000, "expected rows in the table");
+        Assert.equals(table.getDefinition(), "table.getDefinition()", SALES_MULTI_DEFINITION);
     }
 
     @Test
-    public void testIncorrectPartitioningColumns() throws ExecutionException, InterruptedException, TimeoutException {
+    void testIncorrectPartitioningColumns() throws ExecutionException, InterruptedException, TimeoutException {
         final TableDefinition tableDef = TableDefinition.of(
                 ColumnDefinition.ofInt("month").withPartitioning(),
                 ColumnDefinition.ofInt("year").withPartitioning(),
@@ -452,29 +490,32 @@ public void testIncorrectPartitioningColumns() throws ExecutionException, Interr
                 ColumnDefinition.ofString("Item_Type"),
                 ColumnDefinition.ofInt("Units_Sold"),
                 ColumnDefinition.ofDouble("Unit_Price"),
-                ColumnDefinition.fromGenericType("Order_Date", Instant.class));
+                ColumnDefinition.ofTime("Order_Date"));
 
-        final IcebergInstructions localInstructions = IcebergInstructions.builder()
+        final IcebergReadInstructions localInstructions = IcebergReadInstructions.builder()
                 .tableDefinition(tableDef)
                 .dataInstructions(instructions.dataInstructions().get())
                 .build();
 
-        final IcebergCatalogAdapter adapter =
-                IcebergTools.createAdapter(resourceCatalog, resourceFileIO);
-
-        final Namespace ns = Namespace.of("sales");
-        final TableIdentifier tableId = TableIdentifier.of(ns, "sales_partitioned");
-
-        try {
-            final io.deephaven.engine.table.Table table = adapter.readTable(tableId, localInstructions);
-            Assert.statementNeverExecuted("Expected an exception for missing columns");
-        } catch (final TableDataException e) {
-            Assert.eqTrue(e.getMessage().startsWith("The following columns are not partitioned"), "Exception message");
+        final IcebergCatalogAdapter adapter = IcebergTools.createAdapter(resourceCatalog);
+        final IcebergTableAdapter tableAdapter = adapter.loadTable("sales.sales_partitioned");
+
+        for (Runnable runnable : Arrays.<Runnable>asList(
+                () -> tableAdapter.table(localInstructions),
+                () -> tableAdapter.definition(localInstructions),
+                () -> tableAdapter.definitionTable(localInstructions))) {
+            try {
+                runnable.run();
+                Assert.statementNeverExecuted("Expected an exception for missing columns");
+            } catch (final TableDataException e) {
+                Assert.eqTrue(e.getMessage().startsWith("The following columns are not partitioned"),
+                        "Exception message");
+            }
         }
     }
 
     @Test
-    public void testMissingPartitioningColumns() {
+    void testMissingPartitioningColumns() {
         final TableDefinition tableDef = TableDefinition.of(
                 ColumnDefinition.ofInt("__year").withPartitioning(), // Incorrect name
                 ColumnDefinition.ofInt("__month").withPartitioning(), // Incorrect name
@@ -482,154 +523,428 @@ public void testMissingPartitioningColumns() {
                 ColumnDefinition.ofString("Item_Type"),
                 ColumnDefinition.ofDouble("Units_Sold"),
                 ColumnDefinition.ofLong("Unit_Price"),
-                ColumnDefinition.fromGenericType("Order_Date", Instant.class));
+                ColumnDefinition.ofTime("Order_Date"));
 
-        final IcebergInstructions localInstructions = IcebergInstructions.builder()
+        final IcebergReadInstructions localInstructions = IcebergReadInstructions.builder()
                 .tableDefinition(tableDef)
                 .dataInstructions(instructions.dataInstructions().get())
                 .build();
 
-        final IcebergCatalogAdapter adapter =
-                IcebergTools.createAdapter(resourceCatalog, resourceFileIO);
-
-        final Namespace ns = Namespace.of("sales");
-        final TableIdentifier tableId = TableIdentifier.of(ns, "sales_partitioned");
-        try {
-            final io.deephaven.engine.table.Table table = adapter.readTable(tableId, localInstructions);
-            Assert.statementNeverExecuted("Expected an exception for missing columns");
-        } catch (final TableDefinition.IncompatibleTableDefinitionException e) {
-            Assert.eqTrue(e.getMessage().startsWith("Table definition incompatibilities"), "Exception message");
+        final IcebergCatalogAdapter adapter = IcebergTools.createAdapter(resourceCatalog);
+        final IcebergTableAdapter tableAdapter = adapter.loadTable("sales.sales_partitioned");
+
+        for (Runnable runnable : Arrays.<Runnable>asList(
+                () -> tableAdapter.table(localInstructions),
+                () -> tableAdapter.definition(localInstructions),
+                () -> tableAdapter.definitionTable(localInstructions))) {
+            try {
+                runnable.run();
+                Assert.statementNeverExecuted("Expected an exception for missing columns");
+            } catch (final TableDefinition.IncompatibleTableDefinitionException e) {
+                Assert.eqTrue(e.getMessage().startsWith("Table definition incompatibilities"), "Exception message");
+            }
         }
     }
 
     @Test
-    public void testOpenTableColumnRename() throws ExecutionException, InterruptedException, TimeoutException {
-        uploadParquetFiles(new File(IcebergToolsTest.class.getResource("/warehouse/sales/sales_partitioned").getPath()),
-                warehousePath);
+    void testOpenTableColumnRename() throws ExecutionException, InterruptedException, TimeoutException {
+        uploadSalesPartitioned();
 
-        final IcebergInstructions localInstructions = IcebergInstructions.builder()
+        final IcebergReadInstructions localInstructions = IcebergReadInstructions.builder()
                 .dataInstructions(instructions.dataInstructions().get())
-                .putColumnRenames("RegionName", "Region")
-                .putColumnRenames("ItemType", "Item_Type")
+                .putColumnRenames("Region", "RegionName")
+                .putColumnRenames("Item_Type", "ItemType")
                 .build();
 
-        final IcebergCatalogAdapter adapter =
-                IcebergTools.createAdapter(resourceCatalog, resourceFileIO);
+        final IcebergCatalogAdapter adapter = IcebergTools.createAdapter(resourceCatalog);
+        final IcebergTableAdapter tableAdapter = adapter.loadTable("sales.sales_partitioned");
+        final io.deephaven.engine.table.Table table = tableAdapter.table(localInstructions);
 
-        final Namespace ns = Namespace.of("sales");
-        final TableIdentifier tableId = TableIdentifier.of(ns, "sales_partitioned");
-        final io.deephaven.engine.table.Table table = adapter.readTable(tableId, localInstructions);
+        // Verify we retrieved all the rows.
+        Assert.eq(table.size(), "table.size()", 100_000, "expected rows in the table");
+    }
+
+    @Test
+    void testOpenTableColumnLegalization() throws ExecutionException, InterruptedException, TimeoutException {
+        uploadSalesRenamed();
+
+        final IcebergReadInstructions localInstructions = IcebergReadInstructions.builder()
+                .dataInstructions(instructions.dataInstructions().get())
+                .build();
+
+        final IcebergCatalogAdapter adapter = IcebergTools.createAdapter(resourceCatalog);
+        final IcebergTableAdapter tableAdapter = adapter.loadTable("sales.sales_renamed");
+        final io.deephaven.engine.table.Table table = tableAdapter.table(localInstructions);
 
         // Verify we retrieved all the rows.
-        Assert.eq(table.size(), "table.size()", 100_000, "100_000 rows in the table");
+        Assert.eq(table.size(), "table.size()", 100_000, "expected rows in the table");
+        Assert.equals(table.getDefinition(), "table.getDefinition()", SALES_RENAMED_DEFINITION);
     }
 
     @Test
-    public void testOpenTableColumnRenamePartitioningColumns()
+    void testOpenTableColumnLegalizationRename()
             throws ExecutionException, InterruptedException, TimeoutException {
-        uploadParquetFiles(new File(IcebergToolsTest.class.getResource("/warehouse/sales/sales_partitioned").getPath()),
-                warehousePath);
+        uploadSalesRenamed();
 
-        final IcebergInstructions localInstructions = IcebergInstructions.builder()
+        final IcebergReadInstructions localInstructions = IcebergReadInstructions.builder()
+                .dataInstructions(instructions.dataInstructions().get())
+                .putColumnRenames("Item&Type", "Item_Type")
+                .putColumnRenames("Units/Sold", "Units_Sold")
+                .build();
+
+
+        final IcebergCatalogAdapter adapter = IcebergTools.createAdapter(resourceCatalog);
+        final IcebergTableAdapter tableAdapter = adapter.loadTable("sales.sales_renamed");
+        final io.deephaven.engine.table.Table table = tableAdapter.table(localInstructions);
+
+        final TableDefinition expected = TableDefinition.of(
+                ColumnDefinition.ofString("Region_Name"),
+                ColumnDefinition.ofString("Item_Type"),
+                ColumnDefinition.ofInt("Units_Sold"),
+                ColumnDefinition.ofDouble("Unit_Price"),
+                ColumnDefinition.ofTime("Order_Date"));
+
+        // Verify we retrieved all the rows.
+        Assert.eq(table.size(), "table.size()", 100_000, "expected rows in the table");
+        Assert.equals(table.getDefinition(), "table.getDefinition()", expected);
+    }
+
+    @Test
+    void testOpenTableColumnLegalizationPartitionException() {
+        final TableDefinition tableDef = TableDefinition.of(
+                ColumnDefinition.ofInt("Year").withPartitioning(),
+                ColumnDefinition.ofInt("Month").withPartitioning());
+
+        final IcebergReadInstructions localInstructions = IcebergReadInstructions.builder()
+                .tableDefinition(tableDef)
+                .putColumnRenames("Year", "Current Year")
+                .putColumnRenames("Month", "Current Month")
+                .dataInstructions(instructions.dataInstructions().get())
+                .build();
+
+        final IcebergCatalogAdapter adapter = IcebergTools.createAdapter(resourceCatalog);
+        final IcebergTableAdapter tableAdapter = adapter.loadTable("sales.sales_partitioned");
+
+        for (Runnable runnable : Arrays.<Runnable>asList(
+                () -> tableAdapter.table(localInstructions),
+                () -> tableAdapter.definition(localInstructions),
+                () -> tableAdapter.definitionTable(localInstructions))) {
+            try {
+                runnable.run();
+                Assert.statementNeverExecuted("Expected an exception for missing columns");
+            } catch (final TableDataException e) {
+                Assert.eqTrue(e.getMessage().contains("invalid column name provided"), "Exception message");
+            }
+        }
+    }
+
+    @Test
+    void testOpenTableColumnRenamePartitioningColumns()
+            throws ExecutionException, InterruptedException, TimeoutException {
+        uploadSalesPartitioned();
+
+        final IcebergReadInstructions localInstructions = IcebergReadInstructions.builder()
                 .dataInstructions(instructions.dataInstructions().get())
                 .putColumnRenames("VendorID", "vendor_id")
                 .putColumnRenames("month", "__month")
                 .putColumnRenames("year", "__year")
                 .build();
 
-        final IcebergCatalogAdapter adapter =
-                IcebergTools.createAdapter(resourceCatalog, resourceFileIO);
+        final IcebergCatalogAdapter adapter = IcebergTools.createAdapter(resourceCatalog);
+        final IcebergTableAdapter tableAdapter = adapter.loadTable("sales.sales_partitioned");
+        final io.deephaven.engine.table.Table table = tableAdapter.table(localInstructions);
 
-        final Namespace ns = Namespace.of("sales");
-        final TableIdentifier tableId = TableIdentifier.of(ns, "sales_partitioned");
-        final io.deephaven.engine.table.Table table = adapter.readTable(tableId, localInstructions);
+        final TableDefinition expected = TableDefinition.of(
+                ColumnDefinition.ofString("Region"),
+                ColumnDefinition.ofString("Item_Type"),
+                ColumnDefinition.ofInt("Units_Sold"),
+                ColumnDefinition.ofDouble("Unit_Price"),
+                ColumnDefinition.ofTime("Order_Date"),
+                ColumnDefinition.ofInt("__year").withPartitioning(),
+                ColumnDefinition.ofInt("__month").withPartitioning());
 
         // Verify we retrieved all the rows.
         Assert.eq(table.size(), "table.size()", 100_000, "100_000 rows in the table");
+        Assert.equals(table.getDefinition(), "table.getDefinition()", expected);
     }
 
     @Test
-    public void testOpenTableSnapshot() throws ExecutionException, InterruptedException, TimeoutException {
-        uploadParquetFiles(new File(IcebergToolsTest.class.getResource("/warehouse/sales/sales_multi").getPath()),
-                warehousePath);
+    void testOpenTableSnapshot() throws ExecutionException, InterruptedException, TimeoutException {
+        uploadSalesMulti();
 
-        final IcebergCatalogAdapter adapter = IcebergTools.createAdapter(resourceCatalog, resourceFileIO);
-
-        final Namespace ns = Namespace.of("sales");
-        final TableIdentifier tableId = TableIdentifier.of(ns, "sales_multi");
-        final List<Snapshot> snapshots = adapter.listSnapshots(tableId);
+        final IcebergCatalogAdapter adapter = IcebergTools.createAdapter(resourceCatalog);
+        final IcebergTableAdapter tableAdapter = adapter.loadTable("sales.sales_multi");
+        final List<Snapshot> snapshots = tableAdapter.listSnapshots();
 
         // Verify we retrieved all the rows.
         final io.deephaven.engine.table.Table table0 =
-                adapter.readTable(tableId, snapshots.get(0).snapshotId(), instructions);
-        Assert.eq(table0.size(), "table0.size()", 18266, "18266 rows in the table");
+                tableAdapter.table(instructions.withSnapshotId(snapshots.get(0).snapshotId()));
+        Assert.eq(table0.size(), "table0.size()", 18073, "expected rows in the table");
+        Assert.equals(table0.getDefinition(), "table0.getDefinition()", SALES_MULTI_DEFINITION);
 
         final io.deephaven.engine.table.Table table1 =
-                adapter.readTable(tableId, snapshots.get(1).snapshotId(), instructions);
-        Assert.eq(table1.size(), "table1.size()", 54373, "54373 rows in the table");
+                tableAdapter.table(instructions.withSnapshotId(snapshots.get(1).snapshotId()));
+        Assert.eq(table1.size(), "table1.size()", 54433, "expected rows in the table");
+        Assert.equals(table1.getDefinition(), "table1.getDefinition()", SALES_MULTI_DEFINITION);
 
         final io.deephaven.engine.table.Table table2 =
-                adapter.readTable(tableId, snapshots.get(2).snapshotId(), instructions);
-        Assert.eq(table2.size(), "table2.size()", 72603, "72603 rows in the table");
+                tableAdapter.table(instructions.withSnapshotId(snapshots.get(2).snapshotId()));
+        Assert.eq(table2.size(), "table2.size()", 72551, "expected rows in the table");
+        Assert.equals(table2.getDefinition(), "table2.getDefinition()", SALES_MULTI_DEFINITION);
 
         final io.deephaven.engine.table.Table table3 =
-                adapter.readTable(tableId, snapshots.get(3).snapshotId(), instructions);
-        Assert.eq(table3.size(), "table3.size()", 100_000, "100_000 rows in the table");
+                tableAdapter.table(instructions.withSnapshotId(snapshots.get(3).snapshotId()));
+        Assert.eq(table3.size(), "table3.size()", 100_000, "expected rows in the table");
+        Assert.equals(table3.getDefinition(), "table3.getDefinition()", SALES_MULTI_DEFINITION);
+
+        final io.deephaven.engine.table.Table table4 =
+                tableAdapter.table(instructions.withSnapshotId(snapshots.get(4).snapshotId()));
+        Assert.eq(table4.size(), "table4.size()", 100_000, "expected rows in the table");
+        Assert.equals(table4.getDefinition(), "table4.getDefinition()", SALES_MULTI_DEFINITION);
+
+        final io.deephaven.engine.table.Table table5 =
+                tableAdapter.table(instructions.withSnapshotId(snapshots.get(5).snapshotId()));
+        Assert.eq(table5.size(), "table5.size()", 0, "expected rows in the table");
+        Assert.equals(table5.getDefinition(), "table5.getDefinition()", SALES_MULTI_DEFINITION);
     }
 
     @Test
-    public void testOpenTableSnapshotByID() throws ExecutionException, InterruptedException, TimeoutException {
-        uploadParquetFiles(new File(IcebergToolsTest.class.getResource("/warehouse/sales/sales_multi").getPath()),
-                warehousePath);
-
-        final IcebergCatalogAdapter adapter = IcebergTools.createAdapter(resourceCatalog, resourceFileIO);
+    void testOpenTableSnapshotByID() throws ExecutionException, InterruptedException, TimeoutException {
+        uploadSalesMulti();
 
-        final Namespace ns = Namespace.of("sales");
-        final TableIdentifier tableId = TableIdentifier.of(ns, "sales_multi");
-        final List<Snapshot> snapshots = adapter.listSnapshots(tableId);
+        final IcebergCatalogAdapter adapter = IcebergTools.createAdapter(resourceCatalog);
+        final IcebergTableAdapter tableAdapter = adapter.loadTable("sales.sales_multi");
+        final List<Snapshot> snapshots = tableAdapter.listSnapshots();
 
         // Verify we retrieved all the rows.
-        io.deephaven.engine.table.Table table0 = adapter.readTable(tableId, snapshots.get(0), instructions);
-        Assert.eq(table0.size(), "table0.size()", 18266, "18266 rows in the table");
+        io.deephaven.engine.table.Table table0 = tableAdapter.table(instructions.withSnapshot(snapshots.get(0)));
+        Assert.eq(table0.size(), "table0.size()", 18073, "expected rows in the table");
+        Assert.equals(table0.getDefinition(), "table0.getDefinition()", SALES_MULTI_DEFINITION);
 
-        io.deephaven.engine.table.Table table1 = adapter.readTable(tableId, snapshots.get(1), instructions);
-        Assert.eq(table1.size(), "table1.size()", 54373, "54373 rows in the table");
+        io.deephaven.engine.table.Table table1 = tableAdapter.table(instructions.withSnapshot(snapshots.get(1)));
+        Assert.eq(table1.size(), "table1.size()", 54433, "expected rows in the table");
+        Assert.equals(table1.getDefinition(), "table1.getDefinition()", SALES_MULTI_DEFINITION);
 
-        io.deephaven.engine.table.Table table2 = adapter.readTable(tableId, snapshots.get(2), instructions);
-        Assert.eq(table2.size(), "table2.size()", 72603, "72603 rows in the table");
+        io.deephaven.engine.table.Table table2 = tableAdapter.table(instructions.withSnapshot(snapshots.get(2)));
+        Assert.eq(table2.size(), "table2.size()", 72551, "expected rows in the table");
+        Assert.equals(table2.getDefinition(), "table2.getDefinition()", SALES_MULTI_DEFINITION);
 
-        io.deephaven.engine.table.Table table3 = adapter.readTable(tableId, snapshots.get(3), instructions);
-        Assert.eq(table3.size(), "table3.size()", 100_000, "100_000 rows in the table");
+        io.deephaven.engine.table.Table table3 = tableAdapter.table(instructions.withSnapshot(snapshots.get(3)));
+        Assert.eq(table3.size(), "table3.size()", 100_000, "expected rows in the table");
+        Assert.equals(table3.getDefinition(), "table3.getDefinition()", SALES_MULTI_DEFINITION);
 
-        // Test the string versions of the methods
+        io.deephaven.engine.table.Table table4 = tableAdapter.table(instructions.withSnapshot(snapshots.get(4)));
+        Assert.eq(table4.size(), "table4.size()", 100_000, "expected rows in the table");
+        Assert.equals(table4.getDefinition(), "table4.getDefinition()", SALES_MULTI_DEFINITION);
+
+        io.deephaven.engine.table.Table table5 = tableAdapter.table(instructions.withSnapshot(snapshots.get(5)));
+        Assert.eq(table5.size(), "table5.size()", 0, "expected rows in the table");
+        Assert.equals(table5.getDefinition(), "table5.getDefinition()", SALES_MULTI_DEFINITION);
+
+        try {
+            io.deephaven.engine.table.Table missing = tableAdapter.table(instructions.withSnapshotId(987654321L));
+            Assert.statementNeverExecuted("Expected an exception for invalid snapshot");
+        } catch (final Exception e) {
+            Assert.assertion(e instanceof IllegalArgumentException, "e instanceof IllegalArgumentException");
+            Assert.eqTrue(e.getMessage().contains("Snapshot with id 987654321 not found"), "Exception message");
+        }
+    }
+
+    @Test
+    void testOpenAllTypesTable() throws ExecutionException, InterruptedException, TimeoutException {
+        uploadAllTypes();
+
+        final IcebergCatalogAdapter adapter = IcebergTools.createAdapter(resourceCatalog);
+        final IcebergTableAdapter tableAdapter = adapter.loadTable("sample.all_types");
+        final io.deephaven.engine.table.Table table = tableAdapter.table(instructions).select();
 
         // Verify we retrieved all the rows.
-        table0 = adapter.readTable("sales.sales_multi", snapshots.get(0).snapshotId(), instructions);
-        Assert.eq(table0.size(), "table0.size()", 18266, "18266 rows in the table");
+        Assert.eq(table.size(), "table.size()", 10, "expected rows in the table");
+        Assert.equals(table.getDefinition(), "table.getDefinition()", ALL_TYPES_DEF);
+    }
+
+    @Test
+    void testTableDefinition() {
+        final IcebergCatalogAdapter adapter = IcebergTools.createAdapter(resourceCatalog);
+        final IcebergTableAdapter tableAdapter = adapter.loadTable("sales.sales_multi");
+        final List<Snapshot> snapshots = tableAdapter.listSnapshots();
+
+        // Use string and current snapshot
+        TableDefinition tableDef = tableAdapter.definition();
+        Assert.equals(tableDef, "tableDef", SALES_MULTI_DEFINITION);
+
+        // Use TableIdentifier and Snapshot
+        tableDef = tableAdapter.definition(instructions);
+        Assert.equals(tableDef, "tableDef", SALES_MULTI_DEFINITION);
+
+        // Use string and long snapshot ID
+        tableDef = tableAdapter.definition(IcebergReadInstructions.builder()
+                .snapshotId(snapshots.get(0).snapshotId())
+                .build());
+        Assert.equals(tableDef, "tableDef", SALES_MULTI_DEFINITION);
+
+        // Use TableIdentifier and Snapshot
+        tableDef = tableAdapter.definition(IcebergReadInstructions.builder()
+                .snapshot(snapshots.get(0))
+                .build());
+        Assert.equals(tableDef, "tableDef", SALES_MULTI_DEFINITION);
+    }
+
+    @Test
+    void testTableSchema() {
+        final IcebergCatalogAdapter adapter = IcebergTools.createAdapter(resourceCatalog);
+        final IcebergTableAdapter tableAdapter = adapter.loadTable("sales.sales_multi");
+
+        // Request a schema that does not exist.
+        final Optional<Schema> missingSchema = tableAdapter.schema(1000);
+        Assert.eqFalse(missingSchema.isPresent(), "schema.isPresent()");
 
-        table1 = adapter.readTable(tableId, snapshots.get(1).snapshotId(), instructions);
-        Assert.eq(table1.size(), "table1.size()", 54373, "54373 rows in the table");
+        // Request a schema that does exist.
+        final Optional<Schema> schema0 = tableAdapter.schema(0);
+        Assert.eqTrue(schema0.isPresent(), "schema.isPresent()");
 
-        table2 = adapter.readTable(tableId, snapshots.get(2).snapshotId(), instructions);
-        Assert.eq(table2.size(), "table2.size()", 72603, "72603 rows in the table");
+        // Request the current schema, assert it matches schema0
+        final Schema currentSchema = tableAdapter.currentSchema();
+        Assert.eq(currentSchema, "currentSchema", schema0.get(), "schema0.get()");
 
-        table3 = adapter.readTable(tableId, snapshots.get(3).snapshotId(), instructions);
-        Assert.eq(table3.size(), "table3.size()", 100_000, "100_000 rows in the table");
+        // Request the schema map.
+        final Map<Integer, Schema> schemaMap = tableAdapter.schemas();
+        Assert.eq(schemaMap.size(), "schemaMap.size()", 1, "expected number of schemas");
     }
 
     @Test
-    public void testOpenAllTypesTable() throws ExecutionException, InterruptedException, TimeoutException {
-        uploadParquetFiles(new File(IcebergToolsTest.class.getResource("/warehouse/sample/all_types").getPath()),
-                warehousePath);
+    void testTableDefinitionTable() {
+        final IcebergCatalogAdapter adapter = IcebergTools.createAdapter(resourceCatalog);
+        final IcebergTableAdapter tableAdapter = adapter.loadTable("sales.sales_multi");
+        final List<Snapshot> snapshots = tableAdapter.listSnapshots();
 
-        final IcebergCatalogAdapter adapter = IcebergTools.createAdapter(resourceCatalog, resourceFileIO);
+        // Use string and current snapshot
+        Table tableDefTable = tableAdapter.definitionTable();
 
-        final Namespace ns = Namespace.of("sample");
-        final TableIdentifier tableId = TableIdentifier.of(ns, "all_types");
-        final List<Snapshot> snapshots = adapter.listSnapshots(tableId);
+        Assert.eq(tableDefTable.size(), "tableDefTable.size()", 5, "expected rows in the table");
+        Assert.equals(tableDefTable.getDefinition(), "tableDefTable.getDefinition()", META_DEF);
 
-        // Verify we retrieved all the rows.
-        final io.deephaven.engine.table.Table table = adapter.readTable(tableId, instructions);
-        Assert.eq(table.size(), "table.size()", 10, "10 rows in the table");
+        // Use TableIdentifier and Snapshot
+        tableDefTable = tableAdapter.definitionTable(instructions);
+
+        Assert.eq(tableDefTable.size(), "tableDefTable.size()", 5, "expected rows in the table");
+        Assert.equals(tableDefTable.getDefinition(), "tableDefTable.getDefinition()", META_DEF);
+
+        // Use string and long snapshot ID
+        tableDefTable = tableAdapter
+                .definitionTable(IcebergReadInstructions.DEFAULT.withSnapshotId(snapshots.get(0).snapshotId()));
+
+        Assert.eq(tableDefTable.size(), "tableDefTable.size()", 5, "expected rows in the table");
+        Assert.equals(tableDefTable.getDefinition(), "tableDefTable.getDefinition()", META_DEF);
+
+        // Use TableIdentifier and Snapshot
+        tableDefTable = tableAdapter.definitionTable(IcebergReadInstructions.DEFAULT.withSnapshot(snapshots.get(0)));
+
+        Assert.eq(tableDefTable.size(), "tableDefTable.size()", 5, "expected rows in the table");
+        Assert.equals(tableDefTable.getDefinition(), "tableDefTable.getDefinition()", META_DEF);
+    }
+
+    @Test
+    void testTableDefinitionWithInstructions() {
+        final IcebergCatalogAdapter adapter = IcebergTools.createAdapter(resourceCatalog);
+        final IcebergTableAdapter tableAdapter = adapter.loadTable("sales.sales_multi");
+
+        IcebergReadInstructions localInstructions = IcebergReadInstructions.builder()
+                .dataInstructions(instructions.dataInstructions().get())
+                .putColumnRenames("Region", "Area")
+                .putColumnRenames("Item_Type", "ItemType")
+                .putColumnRenames("Units_Sold", "UnitsSold")
+                .putColumnRenames("Unit_Price", "UnitPrice")
+                .putColumnRenames("Order_Date", "OrderDate")
+                .build();
+
+        final TableDefinition renamed = TableDefinition.of(
+                ColumnDefinition.ofString("Area"),
+                ColumnDefinition.ofString("ItemType"),
+                ColumnDefinition.ofInt("UnitsSold"),
+                ColumnDefinition.ofDouble("UnitPrice"),
+                ColumnDefinition.ofTime("OrderDate"));
+
+        // Use string and current snapshot
+        TableDefinition tableDef = tableAdapter.definition(localInstructions);
+        Assert.equals(tableDef, "tableDef", renamed);
+
+        /////////////////////////////////////////////////////
+
+        final TableDefinition userTableDef = TableDefinition.of(
+                ColumnDefinition.ofString("Region"),
+                ColumnDefinition.ofString("Item_Type"),
+                ColumnDefinition.ofTime("Order_Date"));
+
+        localInstructions = IcebergReadInstructions.builder()
+                .dataInstructions(instructions.dataInstructions().get())
+                .tableDefinition(userTableDef)
+                .build();
+
+        // Use string and current snapshot
+        tableDef = tableAdapter.definition(localInstructions);
+        Assert.equals(tableDef, "tableDef", userTableDef);
+    }
+
+    @Test
+    void testManualRefreshingTable() throws ExecutionException, InterruptedException, TimeoutException {
+        uploadSalesMulti();
+
+        final IcebergCatalogAdapter adapter = IcebergTools.createAdapter(resourceCatalog);
+
+        final IcebergReadInstructions localInstructions = IcebergReadInstructions.builder()
+                .dataInstructions(instructions.dataInstructions().get())
+                .updateMode(IcebergUpdateMode.manualRefreshingMode())
+                .build();
+
+        final IcebergTableAdapter tableAdapter = adapter.loadTable("sales.sales_multi");
+        final List<Snapshot> snapshots = tableAdapter.listSnapshots();
+
+        final ControlledUpdateGraph updateGraph = ExecutionContext.getContext().getUpdateGraph().cast();
+        final IcebergTableImpl table =
+                (IcebergTableImpl) tableAdapter.table(localInstructions.withSnapshot(snapshots.get(0)));
+
+        // Initial size
+        Assert.eq(table.size(), "table.size()", 18073, "expected rows in the table");
+        Assert.equals(table.getDefinition(), "table.getDefinition()", SALES_MULTI_DEFINITION);
+
+        table.update(snapshots.get(1).snapshotId());
+        updateGraph.runWithinUnitTestCycle(table::refresh);
+        Assert.eq(table.size(), "table.size()", 54433, "expected rows in the table");
+
+        table.update(snapshots.get(2).snapshotId());
+        updateGraph.runWithinUnitTestCycle(table::refresh);
+        Assert.eq(table.size(), "table.size()", 72551, "expected rows in the table");
+
+        table.update(snapshots.get(3).snapshotId());
+        updateGraph.runWithinUnitTestCycle(table::refresh);
+        Assert.eq(table.size(), "table.size()", 100_000, "expected rows in the table");
+
+        table.update(snapshots.get(4).snapshotId());
+        updateGraph.runWithinUnitTestCycle(table::refresh);
+        Assert.eq(table.size(), "table.size()", 100_000, "expected rows in the table");
+
+        table.update(snapshots.get(5).snapshotId());
+        updateGraph.runWithinUnitTestCycle(table::refresh);
+        Assert.eq(table.size(), "table.size()", 0, "expected rows in the table");
+    }
+
+    @Test
+    void testConvertToIcebergTypeAndBack() {
+        final Class<?>[] javaTypes = {
+                Boolean.class, double.class, float.class, int.class, long.class, String.class, Instant.class,
+                LocalDateTime.class, LocalDate.class, LocalTime.class, byte[].class
+        };
+
+        for (final Class<?> javaType : javaTypes) {
+            // Java type -> Iceberg type
+            final Type icebergType = IcebergUtils.convertToIcebergType(javaType);
+
+            // Iceberg type -> Deephaven type
+            final io.deephaven.qst.type.Type<?> deephavenType = IcebergUtils.convertToDHType(icebergType);
+
+            // Deephaven type == Java type
+            Assert.eq(javaType, javaType.getName(), deephavenType.clazz(), deephavenType.clazz().getName());
+        }
     }
 }
diff --git a/extensions/iceberg/s3/src/test/java/io/deephaven/iceberg/util/IcebergWriteInstructionsTest.java b/extensions/iceberg/s3/src/test/java/io/deephaven/iceberg/util/IcebergWriteInstructionsTest.java
new file mode 100644
index 00000000000..631fea540f1
--- /dev/null
+++ b/extensions/iceberg/s3/src/test/java/io/deephaven/iceberg/util/IcebergWriteInstructionsTest.java
@@ -0,0 +1,51 @@
+//
+// Copyright (c) 2016-2024 Deephaven Data Labs and Patent Pending
+//
+package io.deephaven.iceberg.util;
+
+import io.deephaven.engine.table.Table;
+import io.deephaven.engine.util.TableTools;
+import org.junit.jupiter.api.Test;
+
+import static org.assertj.core.api.Assertions.failBecauseExceptionWasNotThrown;
+import static org.assertj.core.api.Assertions.assertThat;
+
+class IcebergWriteInstructionsTest {
+
+    @Test
+    void testSetDhTables() {
+        final Table table1 = TableTools.emptyTable(3);
+        final Table table2 = TableTools.emptyTable(4);
+        final IcebergWriteInstructions instructions = IcebergWriteInstructions.builder()
+                .addTables(table1)
+                .addTables(table2)
+                .build();
+        assertThat(instructions.tables()).hasSize(2);
+        assertThat(instructions.tables()).contains(table1);
+        assertThat(instructions.tables()).contains(table2);
+    }
+
+    @Test
+    void testSetPartitionPaths() {
+        final Table table1 = TableTools.emptyTable(3);
+        final String pp1 = "P1C=1/PC2=2";
+        final Table table2 = TableTools.emptyTable(4);
+        final String pp2 = "P1C=2/PC2=3";
+        try {
+            final IcebergWriteInstructions instructions = IcebergWriteInstructions.builder()
+                    .addPartitionPaths(pp1, pp2)
+                    .build();
+            failBecauseExceptionWasNotThrown(IllegalArgumentException.class);
+        } catch (final IllegalArgumentException e) {
+            assertThat(e).hasMessageContaining("Partition path must be provided for each table");
+        }
+
+        final IcebergWriteInstructions instructions = IcebergWriteInstructions.builder()
+                .addTables(table1, table2)
+                .addPartitionPaths(pp1, pp2)
+                .build();
+        assertThat(instructions.partitionPaths()).hasSize(2);
+        assertThat(instructions.partitionPaths()).contains(pp1);
+        assertThat(instructions.partitionPaths()).contains(pp2);
+    }
+}
diff --git a/extensions/iceberg/s3/src/test/java/io/deephaven/iceberg/util/LocalstackWarehouseSqliteCatalogTest.java b/extensions/iceberg/s3/src/test/java/io/deephaven/iceberg/util/LocalstackWarehouseSqliteCatalogTest.java
new file mode 100644
index 00000000000..29b27a8485f
--- /dev/null
+++ b/extensions/iceberg/s3/src/test/java/io/deephaven/iceberg/util/LocalstackWarehouseSqliteCatalogTest.java
@@ -0,0 +1,32 @@
+//
+// Copyright (c) 2016-2024 Deephaven Data Labs and Patent Pending
+//
+package io.deephaven.iceberg.util;
+
+import io.deephaven.extensions.s3.S3Instructions;
+import io.deephaven.extensions.s3.testlib.SingletonContainers.LocalStack;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Tag;
+import software.amazon.awssdk.services.s3.S3AsyncClient;
+
+import java.time.Duration;
+
+@Tag("testcontainers")
+final class LocalstackWarehouseSqliteCatalogTest extends S3WarehouseSqliteCatalogBase {
+    @BeforeAll
+    static void initContainer() {
+        // ensure container is started so container startup time isn't associated with a specific test
+        LocalStack.init();
+    }
+
+    @Override
+    public S3Instructions s3Instructions() {
+        return LocalStack.s3Instructions(S3Instructions.builder()
+                .readTimeout(Duration.ofSeconds(10))).build();
+    }
+
+    @Override
+    public S3AsyncClient s3AsyncClient() {
+        return LocalStack.s3AsyncClient();
+    }
+}
diff --git a/extensions/iceberg/s3/src/test/java/io/deephaven/iceberg/util/MinioWarehouseSqliteCatalogTest.java b/extensions/iceberg/s3/src/test/java/io/deephaven/iceberg/util/MinioWarehouseSqliteCatalogTest.java
new file mode 100644
index 00000000000..ed4f8560c57
--- /dev/null
+++ b/extensions/iceberg/s3/src/test/java/io/deephaven/iceberg/util/MinioWarehouseSqliteCatalogTest.java
@@ -0,0 +1,36 @@
+//
+// Copyright (c) 2016-2024 Deephaven Data Labs and Patent Pending
+//
+package io.deephaven.iceberg.util;
+
+import io.deephaven.extensions.s3.S3Instructions;
+import io.deephaven.extensions.s3.testlib.SingletonContainers.MinIO;
+import io.deephaven.base.OSUtil;
+import org.junit.jupiter.api.Assumptions;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Tag;
+import software.amazon.awssdk.services.s3.S3AsyncClient;
+
+import java.time.Duration;
+
+@Tag("testcontainers")
+final class MinioWarehouseSqliteCatalogTest extends S3WarehouseSqliteCatalogBase {
+    @BeforeAll
+    static void initContainer() {
+        // TODO(deephaven-core#5116): MinIO testcontainers does not work on OS X
+        Assumptions.assumeFalse(OSUtil.runningMacOS(), "OSUtil.runningMacOS()");
+        // ensure container is started so container startup time isn't associated with a specific test
+        MinIO.init();
+    }
+
+    @Override
+    public S3Instructions s3Instructions() {
+        return MinIO.s3Instructions(S3Instructions.builder()
+                .readTimeout(Duration.ofSeconds(10))).build();
+    }
+
+    @Override
+    public S3AsyncClient s3AsyncClient() {
+        return MinIO.s3AsyncClient();
+    }
+}
diff --git a/extensions/iceberg/s3/src/test/java/io/deephaven/iceberg/util/S3WarehouseSqliteCatalogBase.java b/extensions/iceberg/s3/src/test/java/io/deephaven/iceberg/util/S3WarehouseSqliteCatalogBase.java
new file mode 100644
index 00000000000..8beca64e938
--- /dev/null
+++ b/extensions/iceberg/s3/src/test/java/io/deephaven/iceberg/util/S3WarehouseSqliteCatalogBase.java
@@ -0,0 +1,48 @@
+//
+// Copyright (c) 2016-2024 Deephaven Data Labs and Patent Pending
+//
+package io.deephaven.iceberg.util;
+
+import io.deephaven.extensions.s3.S3Instructions;
+import io.deephaven.iceberg.junit5.SqliteCatalogBase;
+import org.apache.iceberg.CatalogProperties;
+import org.apache.iceberg.aws.s3.S3FileIO;
+import org.junit.jupiter.api.TestInfo;
+import software.amazon.awssdk.services.s3.S3AsyncClient;
+import software.amazon.awssdk.services.s3.model.CreateBucketRequest;
+
+import java.nio.file.Path;
+import java.util.Locale;
+import java.util.Map;
+import java.util.concurrent.ExecutionException;
+import java.util.concurrent.TimeUnit;
+import java.util.concurrent.TimeoutException;
+
+import static io.deephaven.extensions.s3.testlib.S3Helper.TIMEOUT_SECONDS;
+
+abstract class S3WarehouseSqliteCatalogBase extends SqliteCatalogBase {
+
+    public abstract S3Instructions s3Instructions();
+
+    public abstract S3AsyncClient s3AsyncClient();
+
+    @Override
+    public final Object dataInstructions() {
+        return s3Instructions();
+    }
+
+    @Override
+    protected IcebergCatalogAdapter catalogAdapter(TestInfo testInfo, Path rootDir, Map<String, String> properties)
+            throws ExecutionException, InterruptedException, TimeoutException {
+        final String methodName = testInfo.getTestMethod().orElseThrow().getName();
+        final String catalogName = methodName + "-catalog";
+        final String bucket = methodName.toLowerCase(Locale.US) + "-bucket";
+        try (final S3AsyncClient client = s3AsyncClient()) {
+            client.createBucket(CreateBucketRequest.builder().bucket(bucket).build())
+                    .get(TIMEOUT_SECONDS, TimeUnit.SECONDS);
+        }
+        properties.put(CatalogProperties.WAREHOUSE_LOCATION, "s3://" + bucket + "/warehouse");
+        properties.put(CatalogProperties.FILE_IO_IMPL, S3FileIO.class.getName());
+        return IcebergToolsS3.createAdapter(catalogName, properties, Map.of(), s3Instructions());
+    }
+}
diff --git a/extensions/iceberg/s3/src/test/java/io/deephaven/iceberg/util/TableParquetWriterOptionsTest.java b/extensions/iceberg/s3/src/test/java/io/deephaven/iceberg/util/TableParquetWriterOptionsTest.java
new file mode 100644
index 00000000000..d6d555321c0
--- /dev/null
+++ b/extensions/iceberg/s3/src/test/java/io/deephaven/iceberg/util/TableParquetWriterOptionsTest.java
@@ -0,0 +1,160 @@
+//
+// Copyright (c) 2016-2024 Deephaven Data Labs and Patent Pending
+//
+package io.deephaven.iceberg.util;
+
+import io.deephaven.engine.table.ColumnDefinition;
+import io.deephaven.engine.table.TableDefinition;
+import io.deephaven.parquet.table.ParquetInstructions;
+import org.junit.jupiter.api.Test;
+
+import java.util.Map;
+
+import static org.assertj.core.api.Assertions.failBecauseExceptionWasNotThrown;
+import static org.assertj.core.api.AssertionsForClassTypes.assertThat;
+
+class TableParquetWriterOptionsTest {
+
+    /**
+     * Create a new TableParquetWriterOptions builder with an empty table definition.
+     */
+    private static TableParquetWriterOptions.Builder instructions() {
+        return TableParquetWriterOptions.builder().tableDefinition(TableDefinition.of(
+                ColumnDefinition.ofInt("someCol")));
+    }
+
+    @Test
+    void defaults() {
+        final TableParquetWriterOptions instructions = instructions().build();
+        assertThat(instructions.dataInstructions()).isEmpty();
+        assertThat(instructions.compressionCodecName()).isEqualTo("SNAPPY");
+        assertThat(instructions.maximumDictionaryKeys()).isEqualTo(1048576);
+        assertThat(instructions.maximumDictionarySize()).isEqualTo(1048576);
+        assertThat(instructions.targetPageSize()).isEqualTo(65536);
+    }
+
+    @Test
+    void testSetTableDefinition() {
+        final TableDefinition definition = TableDefinition.of(
+                ColumnDefinition.ofInt("PC1").withPartitioning(),
+                ColumnDefinition.ofInt("PC2").withPartitioning(),
+                ColumnDefinition.ofLong("I"));
+        assertThat(TableParquetWriterOptions.builder()
+                .tableDefinition(definition)
+                .build()
+                .tableDefinition())
+                .isEqualTo(definition);
+    }
+
+    @Test
+    void testEmptyTableDefinition() {
+        try {
+            TableParquetWriterOptions.builder()
+                    .tableDefinition(TableDefinition.of())
+                    .build();
+            failBecauseExceptionWasNotThrown(IllegalArgumentException.class);
+        } catch (IllegalArgumentException e) {
+            assertThat(e).hasMessageContaining("table definition");
+        }
+    }
+
+    @Test
+    void testSetCompressionCodecName() {
+        assertThat(instructions()
+                .compressionCodecName("GZIP")
+                .build()
+                .compressionCodecName())
+                .isEqualTo("GZIP");
+    }
+
+    @Test
+    void testSetMaximumDictionaryKeys() {
+        assertThat(instructions()
+                .maximumDictionaryKeys(100)
+                .build()
+                .maximumDictionaryKeys())
+                .isEqualTo(100);
+    }
+
+    @Test
+    void testSetMaximumDictionarySize() {
+        assertThat(instructions()
+                .maximumDictionarySize(100)
+                .build()
+                .maximumDictionarySize())
+                .isEqualTo(100);
+    }
+
+    @Test
+    void testSetTargetPageSize() {
+        assertThat(instructions()
+                .targetPageSize(1 << 20)
+                .build()
+                .targetPageSize())
+                .isEqualTo(1 << 20);
+    }
+
+    @Test
+    void testMinMaximumDictionaryKeys() {
+
+        try {
+            instructions()
+                    .maximumDictionaryKeys(-1)
+                    .build();
+            failBecauseExceptionWasNotThrown(IllegalArgumentException.class);
+        } catch (IllegalArgumentException e) {
+            assertThat(e).hasMessageContaining("maximumDictionaryKeys");
+        }
+    }
+
+    @Test
+    void testMinMaximumDictionarySize() {
+        try {
+            instructions()
+                    .maximumDictionarySize(-1)
+                    .build();
+            failBecauseExceptionWasNotThrown(IllegalArgumentException.class);
+        } catch (IllegalArgumentException e) {
+            assertThat(e).hasMessageContaining("maximumDictionarySize");
+        }
+    }
+
+    @Test
+    void testMinTargetPageSize() {
+        try {
+            instructions()
+                    .targetPageSize(1024)
+                    .build();
+            failBecauseExceptionWasNotThrown(IllegalArgumentException.class);
+        } catch (IllegalArgumentException e) {
+            assertThat(e).hasMessageContaining("targetPageSize");
+        }
+    }
+
+    @Test
+    void toParquetInstructionTest() {
+        final TableParquetWriterOptions writeInstructions = instructions()
+                .compressionCodecName("GZIP")
+                .maximumDictionaryKeys(100)
+                .maximumDictionarySize(200)
+                .targetPageSize(1 << 20)
+                .build();
+        final TableDefinition definition = TableDefinition.of(
+                ColumnDefinition.ofInt("PC1").withPartitioning(),
+                ColumnDefinition.ofInt("PC2").withPartitioning(),
+                ColumnDefinition.ofLong("I"));
+        final Map<Integer, String> fieldIdToName = Map.of(2, "field2", 3, "field3");
+        final ParquetInstructions parquetInstructions = writeInstructions.toParquetInstructions(
+                null, definition, fieldIdToName);
+
+        assertThat(parquetInstructions.getCompressionCodecName()).isEqualTo("GZIP");
+        assertThat(parquetInstructions.getMaximumDictionaryKeys()).isEqualTo(100);
+        assertThat(parquetInstructions.getMaximumDictionarySize()).isEqualTo(200);
+        assertThat(parquetInstructions.getTargetPageSize()).isEqualTo(1 << 20);
+        assertThat(parquetInstructions.getFieldId("field1")).isEmpty();
+        assertThat(parquetInstructions.getFieldId("field2")).hasValue(2);
+        assertThat(parquetInstructions.getFieldId("field3")).hasValue(3);
+        assertThat(parquetInstructions.onWriteCompleted()).isEmpty();
+        assertThat(parquetInstructions.getTableDefinition()).hasValue(definition);
+    }
+}
diff --git a/extensions/iceberg/s3/src/test/resources/warehouse/sales/sales_multi/data/00000-2-6f8d12ab-3efb-4a24-a6a6-46b2b34b986c-0-00001.parquet b/extensions/iceberg/s3/src/test/resources/warehouse/sales/sales_multi/data/00000-2-6f8d12ab-3efb-4a24-a6a6-46b2b34b986c-0-00001.parquet
new file mode 100644
index 00000000000..4ec41a05ae1
--- /dev/null
+++ b/extensions/iceberg/s3/src/test/resources/warehouse/sales/sales_multi/data/00000-2-6f8d12ab-3efb-4a24-a6a6-46b2b34b986c-0-00001.parquet
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:463d2a2753ebcf86deacc9cea3042918c2ad8adc2f124dd5ca2a5eb6cf86ae54
+size 175359
diff --git a/extensions/iceberg/s3/src/test/resources/warehouse/sales/sales_multi/data/00000-3-57e22ac8-7e7d-4830-aedb-14dab6fabdd6-0-00001.parquet b/extensions/iceberg/s3/src/test/resources/warehouse/sales/sales_multi/data/00000-3-57e22ac8-7e7d-4830-aedb-14dab6fabdd6-0-00001.parquet
deleted file mode 100644
index 04d259decea..00000000000
--- a/extensions/iceberg/s3/src/test/resources/warehouse/sales/sales_multi/data/00000-3-57e22ac8-7e7d-4830-aedb-14dab6fabdd6-0-00001.parquet
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:9749ae2922aa9d21b7e779142d6c2476d0444c2c24f7e93397e6750147180724
-size 176970
diff --git a/extensions/iceberg/s3/src/test/resources/warehouse/sales/sales_multi/data/00000-3-75fe700e-5fc0-40f8-9349-fcd5763dd691-0-00001.parquet b/extensions/iceberg/s3/src/test/resources/warehouse/sales/sales_multi/data/00000-3-75fe700e-5fc0-40f8-9349-fcd5763dd691-0-00001.parquet
new file mode 100644
index 00000000000..634d73c5d51
--- /dev/null
+++ b/extensions/iceberg/s3/src/test/resources/warehouse/sales/sales_multi/data/00000-3-75fe700e-5fc0-40f8-9349-fcd5763dd691-0-00001.parquet
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:432d8cdd6e09203748f800b914728a63b2541b99fceaa215d764910adaa000e3
+size 333827
diff --git a/extensions/iceberg/s3/src/test/resources/warehouse/sales/sales_multi/data/00000-4-3aacc74b-7f10-4e08-89ae-f1b1b578ce63-0-00001.parquet b/extensions/iceberg/s3/src/test/resources/warehouse/sales/sales_multi/data/00000-4-3aacc74b-7f10-4e08-89ae-f1b1b578ce63-0-00001.parquet
deleted file mode 100644
index 206e1f84a6c..00000000000
--- a/extensions/iceberg/s3/src/test/resources/warehouse/sales/sales_multi/data/00000-4-3aacc74b-7f10-4e08-89ae-f1b1b578ce63-0-00001.parquet
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:d5007c70d0e8be33ef012c48d7f067b47812b22747c145cfa4bab4bef944fb0f
-size 331675
diff --git a/extensions/iceberg/s3/src/test/resources/warehouse/sales/sales_multi/data/00000-4-4be14704-ebcf-44c9-8482-90d09621c2ee-0-00001.parquet b/extensions/iceberg/s3/src/test/resources/warehouse/sales/sales_multi/data/00000-4-4be14704-ebcf-44c9-8482-90d09621c2ee-0-00001.parquet
new file mode 100644
index 00000000000..1cb0281c073
--- /dev/null
+++ b/extensions/iceberg/s3/src/test/resources/warehouse/sales/sales_multi/data/00000-4-4be14704-ebcf-44c9-8482-90d09621c2ee-0-00001.parquet
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:3f5d595ce8cd13180368f05c2dfe57f4f2c8fba7c7437066bf998fc805662dc0
+size 175594
diff --git a/extensions/iceberg/s3/src/test/resources/warehouse/sales/sales_multi/data/00000-5-47debf3c-b256-4a04-9248-d7c69bec4881-0-00001.parquet b/extensions/iceberg/s3/src/test/resources/warehouse/sales/sales_multi/data/00000-5-47debf3c-b256-4a04-9248-d7c69bec4881-0-00001.parquet
deleted file mode 100644
index 6d552bf0e9a..00000000000
--- a/extensions/iceberg/s3/src/test/resources/warehouse/sales/sales_multi/data/00000-5-47debf3c-b256-4a04-9248-d7c69bec4881-0-00001.parquet
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:c02909448106787f93e8a2550e9db360aedd9ab25c925e8a536b18096aa8ed91
-size 176482
diff --git a/extensions/iceberg/s3/src/test/resources/warehouse/sales/sales_multi/data/00000-5-efdf14cf-15de-4aac-bafc-cf750f9f7f70-0-00001.parquet b/extensions/iceberg/s3/src/test/resources/warehouse/sales/sales_multi/data/00000-5-efdf14cf-15de-4aac-bafc-cf750f9f7f70-0-00001.parquet
new file mode 100644
index 00000000000..3455ea39555
--- /dev/null
+++ b/extensions/iceberg/s3/src/test/resources/warehouse/sales/sales_multi/data/00000-5-efdf14cf-15de-4aac-bafc-cf750f9f7f70-0-00001.parquet
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:c127833dec01dac8258db8dbd0acd9a3bc7e23957e4dce46c0a07c1174498875
+size 257345
diff --git a/extensions/iceberg/s3/src/test/resources/warehouse/sales/sales_multi/data/00000-6-01e5d979-ab08-46a6-bd9d-c8008dc66519-0-00001.parquet b/extensions/iceberg/s3/src/test/resources/warehouse/sales/sales_multi/data/00000-6-01e5d979-ab08-46a6-bd9d-c8008dc66519-0-00001.parquet
new file mode 100644
index 00000000000..1a06c24b196
--- /dev/null
+++ b/extensions/iceberg/s3/src/test/resources/warehouse/sales/sales_multi/data/00000-6-01e5d979-ab08-46a6-bd9d-c8008dc66519-0-00001.parquet
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:d5dbc201439bcf1bf4afb778a5cfc4e40a6b5d9d1a9a9b77cacd25bea21c2486
+size 729342
diff --git a/extensions/iceberg/s3/src/test/resources/warehouse/sales/sales_multi/data/00000-6-7860a7c9-b3cb-4b2a-a69b-0f1e5c068512-0-00001.parquet b/extensions/iceberg/s3/src/test/resources/warehouse/sales/sales_multi/data/00000-6-7860a7c9-b3cb-4b2a-a69b-0f1e5c068512-0-00001.parquet
deleted file mode 100644
index 540e5bc3392..00000000000
--- a/extensions/iceberg/s3/src/test/resources/warehouse/sales/sales_multi/data/00000-6-7860a7c9-b3cb-4b2a-a69b-0f1e5c068512-0-00001.parquet
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:c872a3defa86826496fbc76fa4235c858d45edb5441e196c2c812f4c8a1166e7
-size 256855
diff --git a/extensions/iceberg/s3/src/test/resources/warehouse/sales/sales_multi/metadata/00000-8bdf65c1-a414-468b-b7b2-78558b2e8c1f.metadata.json b/extensions/iceberg/s3/src/test/resources/warehouse/sales/sales_multi/metadata/00000-8bdf65c1-a414-468b-b7b2-78558b2e8c1f.metadata.json
deleted file mode 100644
index 53c1afcba7b..00000000000
--- a/extensions/iceberg/s3/src/test/resources/warehouse/sales/sales_multi/metadata/00000-8bdf65c1-a414-468b-b7b2-78558b2e8c1f.metadata.json
+++ /dev/null
@@ -1,91 +0,0 @@
-{
-  "format-version" : 2,
-  "table-uuid" : "49ca5b8c-6402-40f9-96b0-4c09f9f1b512",
-  "location" : "s3://warehouse/sales/sales_multi",
-  "last-sequence-number" : 1,
-  "last-updated-ms" : 1716234545155,
-  "last-column-id" : 5,
-  "current-schema-id" : 0,
-  "schemas" : [ {
-    "type" : "struct",
-    "schema-id" : 0,
-    "fields" : [ {
-      "id" : 1,
-      "name" : "Region",
-      "required" : false,
-      "type" : "string"
-    }, {
-      "id" : 2,
-      "name" : "Item_Type",
-      "required" : false,
-      "type" : "string"
-    }, {
-      "id" : 3,
-      "name" : "Units_Sold",
-      "required" : false,
-      "type" : "int"
-    }, {
-      "id" : 4,
-      "name" : "Unit_Price",
-      "required" : false,
-      "type" : "double"
-    }, {
-      "id" : 5,
-      "name" : "Order_Date",
-      "required" : false,
-      "type" : "timestamptz"
-    } ]
-  } ],
-  "default-spec-id" : 0,
-  "partition-specs" : [ {
-    "spec-id" : 0,
-    "fields" : [ ]
-  } ],
-  "last-partition-id" : 999,
-  "default-sort-order-id" : 0,
-  "sort-orders" : [ {
-    "order-id" : 0,
-    "fields" : [ ]
-  } ],
-  "properties" : {
-    "owner" : "root",
-    "created-at" : "2024-05-20T19:49:04.669537174Z",
-    "write.format.default" : "parquet",
-    "write.parquet.compression-codec" : "zstd"
-  },
-  "current-snapshot-id" : 2001582482032951248,
-  "refs" : {
-    "main" : {
-      "snapshot-id" : 2001582482032951248,
-      "type" : "branch"
-    }
-  },
-  "snapshots" : [ {
-    "sequence-number" : 1,
-    "snapshot-id" : 2001582482032951248,
-    "timestamp-ms" : 1716234545155,
-    "summary" : {
-      "operation" : "append",
-      "spark.app.id" : "local-1716234462547",
-      "added-data-files" : "1",
-      "added-records" : "18266",
-      "added-files-size" : "176970",
-      "changed-partition-count" : "1",
-      "total-records" : "18266",
-      "total-files-size" : "176970",
-      "total-data-files" : "1",
-      "total-delete-files" : "0",
-      "total-position-deletes" : "0",
-      "total-equality-deletes" : "0"
-    },
-    "manifest-list" : "s3://warehouse/sales/sales_multi/metadata/snap-2001582482032951248-1-a61cde47-0ced-4b74-b91a-9e32dd59b212.avro",
-    "schema-id" : 0
-  } ],
-  "statistics" : [ ],
-  "partition-statistics" : [ ],
-  "snapshot-log" : [ {
-    "timestamp-ms" : 1716234545155,
-    "snapshot-id" : 2001582482032951248
-  } ],
-  "metadata-log" : [ ]
-}
\ No newline at end of file
diff --git a/extensions/iceberg/s3/src/test/resources/warehouse/sales/sales_multi/metadata/00000-e433b4ac-9c89-46e8-b0f7-b4ec128b0f5e.metadata.json b/extensions/iceberg/s3/src/test/resources/warehouse/sales/sales_multi/metadata/00000-e433b4ac-9c89-46e8-b0f7-b4ec128b0f5e.metadata.json
new file mode 100644
index 00000000000..90bd5751ba7
--- /dev/null
+++ b/extensions/iceberg/s3/src/test/resources/warehouse/sales/sales_multi/metadata/00000-e433b4ac-9c89-46e8-b0f7-b4ec128b0f5e.metadata.json
@@ -0,0 +1,91 @@
+{
+  "format-version" : 2,
+  "table-uuid" : "533f8120-9943-4b64-a0cf-6cfab18e4a79",
+  "location" : "s3://warehouse/sales/sales_multi",
+  "last-sequence-number" : 1,
+  "last-updated-ms" : 1725396294486,
+  "last-column-id" : 5,
+  "current-schema-id" : 0,
+  "schemas" : [ {
+    "type" : "struct",
+    "schema-id" : 0,
+    "fields" : [ {
+      "id" : 1,
+      "name" : "Region",
+      "required" : false,
+      "type" : "string"
+    }, {
+      "id" : 2,
+      "name" : "Item_Type",
+      "required" : false,
+      "type" : "string"
+    }, {
+      "id" : 3,
+      "name" : "Units_Sold",
+      "required" : false,
+      "type" : "int"
+    }, {
+      "id" : 4,
+      "name" : "Unit_Price",
+      "required" : false,
+      "type" : "double"
+    }, {
+      "id" : 5,
+      "name" : "Order_Date",
+      "required" : false,
+      "type" : "timestamptz"
+    } ]
+  } ],
+  "default-spec-id" : 0,
+  "partition-specs" : [ {
+    "spec-id" : 0,
+    "fields" : [ ]
+  } ],
+  "last-partition-id" : 999,
+  "default-sort-order-id" : 0,
+  "sort-orders" : [ {
+    "order-id" : 0,
+    "fields" : [ ]
+  } ],
+  "properties" : {
+    "owner" : "root",
+    "created-at" : "2024-09-03T20:44:52.796187633Z",
+    "write.format.default" : "parquet",
+    "write.parquet.compression-codec" : "zstd"
+  },
+  "current-snapshot-id" : 8121674823173822790,
+  "refs" : {
+    "main" : {
+      "snapshot-id" : 8121674823173822790,
+      "type" : "branch"
+    }
+  },
+  "snapshots" : [ {
+    "sequence-number" : 1,
+    "snapshot-id" : 8121674823173822790,
+    "timestamp-ms" : 1725396294486,
+    "summary" : {
+      "operation" : "append",
+      "spark.app.id" : "local-1725396284766",
+      "added-data-files" : "1",
+      "added-records" : "18073",
+      "added-files-size" : "175359",
+      "changed-partition-count" : "1",
+      "total-records" : "18073",
+      "total-files-size" : "175359",
+      "total-data-files" : "1",
+      "total-delete-files" : "0",
+      "total-position-deletes" : "0",
+      "total-equality-deletes" : "0"
+    },
+    "manifest-list" : "s3://warehouse/sales/sales_multi/metadata/snap-8121674823173822790-1-ddb2a84e-df73-4cb9-a92f-18d737a54489.avro",
+    "schema-id" : 0
+  } ],
+  "statistics" : [ ],
+  "partition-statistics" : [ ],
+  "snapshot-log" : [ {
+    "timestamp-ms" : 1725396294486,
+    "snapshot-id" : 8121674823173822790
+  } ],
+  "metadata-log" : [ ]
+}
\ No newline at end of file
diff --git a/extensions/iceberg/s3/src/test/resources/warehouse/sales/sales_multi/metadata/00001-1e0eb3be-5f28-4965-b390-ab426779517b.metadata.json b/extensions/iceberg/s3/src/test/resources/warehouse/sales/sales_multi/metadata/00001-1e0eb3be-5f28-4965-b390-ab426779517b.metadata.json
new file mode 100644
index 00000000000..9ce7f8b1bd1
--- /dev/null
+++ b/extensions/iceberg/s3/src/test/resources/warehouse/sales/sales_multi/metadata/00001-1e0eb3be-5f28-4965-b390-ab426779517b.metadata.json
@@ -0,0 +1,118 @@
+{
+  "format-version" : 2,
+  "table-uuid" : "533f8120-9943-4b64-a0cf-6cfab18e4a79",
+  "location" : "s3://warehouse/sales/sales_multi",
+  "last-sequence-number" : 2,
+  "last-updated-ms" : 1725396298768,
+  "last-column-id" : 5,
+  "current-schema-id" : 0,
+  "schemas" : [ {
+    "type" : "struct",
+    "schema-id" : 0,
+    "fields" : [ {
+      "id" : 1,
+      "name" : "Region",
+      "required" : false,
+      "type" : "string"
+    }, {
+      "id" : 2,
+      "name" : "Item_Type",
+      "required" : false,
+      "type" : "string"
+    }, {
+      "id" : 3,
+      "name" : "Units_Sold",
+      "required" : false,
+      "type" : "int"
+    }, {
+      "id" : 4,
+      "name" : "Unit_Price",
+      "required" : false,
+      "type" : "double"
+    }, {
+      "id" : 5,
+      "name" : "Order_Date",
+      "required" : false,
+      "type" : "timestamptz"
+    } ]
+  } ],
+  "default-spec-id" : 0,
+  "partition-specs" : [ {
+    "spec-id" : 0,
+    "fields" : [ ]
+  } ],
+  "last-partition-id" : 999,
+  "default-sort-order-id" : 0,
+  "sort-orders" : [ {
+    "order-id" : 0,
+    "fields" : [ ]
+  } ],
+  "properties" : {
+    "owner" : "root",
+    "created-at" : "2024-09-03T20:44:52.796187633Z",
+    "write.format.default" : "parquet",
+    "write.parquet.compression-codec" : "zstd"
+  },
+  "current-snapshot-id" : 6040260770188877244,
+  "refs" : {
+    "main" : {
+      "snapshot-id" : 6040260770188877244,
+      "type" : "branch"
+    }
+  },
+  "snapshots" : [ {
+    "sequence-number" : 1,
+    "snapshot-id" : 8121674823173822790,
+    "timestamp-ms" : 1725396294486,
+    "summary" : {
+      "operation" : "append",
+      "spark.app.id" : "local-1725396284766",
+      "added-data-files" : "1",
+      "added-records" : "18073",
+      "added-files-size" : "175359",
+      "changed-partition-count" : "1",
+      "total-records" : "18073",
+      "total-files-size" : "175359",
+      "total-data-files" : "1",
+      "total-delete-files" : "0",
+      "total-position-deletes" : "0",
+      "total-equality-deletes" : "0"
+    },
+    "manifest-list" : "s3://warehouse/sales/sales_multi/metadata/snap-8121674823173822790-1-ddb2a84e-df73-4cb9-a92f-18d737a54489.avro",
+    "schema-id" : 0
+  }, {
+    "sequence-number" : 2,
+    "snapshot-id" : 6040260770188877244,
+    "parent-snapshot-id" : 8121674823173822790,
+    "timestamp-ms" : 1725396298768,
+    "summary" : {
+      "operation" : "append",
+      "spark.app.id" : "local-1725396284766",
+      "added-data-files" : "1",
+      "added-records" : "36360",
+      "added-files-size" : "333827",
+      "changed-partition-count" : "1",
+      "total-records" : "54433",
+      "total-files-size" : "509186",
+      "total-data-files" : "2",
+      "total-delete-files" : "0",
+      "total-position-deletes" : "0",
+      "total-equality-deletes" : "0"
+    },
+    "manifest-list" : "s3://warehouse/sales/sales_multi/metadata/snap-6040260770188877244-1-4b9446ba-c04a-440a-afad-f090aa27c81a.avro",
+    "schema-id" : 0
+  } ],
+  "statistics" : [ ],
+  "partition-statistics" : [ ],
+  "snapshot-log" : [ {
+    "timestamp-ms" : 1725396294486,
+    "snapshot-id" : 8121674823173822790
+  }, {
+    "timestamp-ms" : 1725396298768,
+    "snapshot-id" : 6040260770188877244
+  } ],
+  "metadata-log" : [ {
+    "timestamp-ms" : 1725396294486,
+    "metadata-file" : "s3://warehouse/sales/sales_multi/metadata/00000-e433b4ac-9c89-46e8-b0f7-b4ec128b0f5e.metadata.json"
+  } ]
+}
\ No newline at end of file
diff --git a/extensions/iceberg/s3/src/test/resources/warehouse/sales/sales_multi/metadata/00001-30972e0f-9c8a-4fa9-911d-e356b2b04061.metadata.json b/extensions/iceberg/s3/src/test/resources/warehouse/sales/sales_multi/metadata/00001-30972e0f-9c8a-4fa9-911d-e356b2b04061.metadata.json
deleted file mode 100644
index 5aa1996ce92..00000000000
--- a/extensions/iceberg/s3/src/test/resources/warehouse/sales/sales_multi/metadata/00001-30972e0f-9c8a-4fa9-911d-e356b2b04061.metadata.json
+++ /dev/null
@@ -1,118 +0,0 @@
-{
-  "format-version" : 2,
-  "table-uuid" : "49ca5b8c-6402-40f9-96b0-4c09f9f1b512",
-  "location" : "s3://warehouse/sales/sales_multi",
-  "last-sequence-number" : 2,
-  "last-updated-ms" : 1716234545529,
-  "last-column-id" : 5,
-  "current-schema-id" : 0,
-  "schemas" : [ {
-    "type" : "struct",
-    "schema-id" : 0,
-    "fields" : [ {
-      "id" : 1,
-      "name" : "Region",
-      "required" : false,
-      "type" : "string"
-    }, {
-      "id" : 2,
-      "name" : "Item_Type",
-      "required" : false,
-      "type" : "string"
-    }, {
-      "id" : 3,
-      "name" : "Units_Sold",
-      "required" : false,
-      "type" : "int"
-    }, {
-      "id" : 4,
-      "name" : "Unit_Price",
-      "required" : false,
-      "type" : "double"
-    }, {
-      "id" : 5,
-      "name" : "Order_Date",
-      "required" : false,
-      "type" : "timestamptz"
-    } ]
-  } ],
-  "default-spec-id" : 0,
-  "partition-specs" : [ {
-    "spec-id" : 0,
-    "fields" : [ ]
-  } ],
-  "last-partition-id" : 999,
-  "default-sort-order-id" : 0,
-  "sort-orders" : [ {
-    "order-id" : 0,
-    "fields" : [ ]
-  } ],
-  "properties" : {
-    "owner" : "root",
-    "created-at" : "2024-05-20T19:49:04.669537174Z",
-    "write.format.default" : "parquet",
-    "write.parquet.compression-codec" : "zstd"
-  },
-  "current-snapshot-id" : 8325605756612719366,
-  "refs" : {
-    "main" : {
-      "snapshot-id" : 8325605756612719366,
-      "type" : "branch"
-    }
-  },
-  "snapshots" : [ {
-    "sequence-number" : 1,
-    "snapshot-id" : 2001582482032951248,
-    "timestamp-ms" : 1716234545155,
-    "summary" : {
-      "operation" : "append",
-      "spark.app.id" : "local-1716234462547",
-      "added-data-files" : "1",
-      "added-records" : "18266",
-      "added-files-size" : "176970",
-      "changed-partition-count" : "1",
-      "total-records" : "18266",
-      "total-files-size" : "176970",
-      "total-data-files" : "1",
-      "total-delete-files" : "0",
-      "total-position-deletes" : "0",
-      "total-equality-deletes" : "0"
-    },
-    "manifest-list" : "s3://warehouse/sales/sales_multi/metadata/snap-2001582482032951248-1-a61cde47-0ced-4b74-b91a-9e32dd59b212.avro",
-    "schema-id" : 0
-  }, {
-    "sequence-number" : 2,
-    "snapshot-id" : 8325605756612719366,
-    "parent-snapshot-id" : 2001582482032951248,
-    "timestamp-ms" : 1716234545529,
-    "summary" : {
-      "operation" : "append",
-      "spark.app.id" : "local-1716234462547",
-      "added-data-files" : "1",
-      "added-records" : "36107",
-      "added-files-size" : "331675",
-      "changed-partition-count" : "1",
-      "total-records" : "54373",
-      "total-files-size" : "508645",
-      "total-data-files" : "2",
-      "total-delete-files" : "0",
-      "total-position-deletes" : "0",
-      "total-equality-deletes" : "0"
-    },
-    "manifest-list" : "s3://warehouse/sales/sales_multi/metadata/snap-8325605756612719366-1-02f91282-fecb-4479-bd3b-20a8a3aaa795.avro",
-    "schema-id" : 0
-  } ],
-  "statistics" : [ ],
-  "partition-statistics" : [ ],
-  "snapshot-log" : [ {
-    "timestamp-ms" : 1716234545155,
-    "snapshot-id" : 2001582482032951248
-  }, {
-    "timestamp-ms" : 1716234545529,
-    "snapshot-id" : 8325605756612719366
-  } ],
-  "metadata-log" : [ {
-    "timestamp-ms" : 1716234545155,
-    "metadata-file" : "s3://warehouse/sales/sales_multi/metadata/00000-8bdf65c1-a414-468b-b7b2-78558b2e8c1f.metadata.json"
-  } ]
-}
\ No newline at end of file
diff --git a/extensions/iceberg/s3/src/test/resources/warehouse/sales/sales_multi/metadata/00002-559f7323-a010-4afe-8461-f5261787aae9.metadata.json b/extensions/iceberg/s3/src/test/resources/warehouse/sales/sales_multi/metadata/00002-559f7323-a010-4afe-8461-f5261787aae9.metadata.json
deleted file mode 100644
index 1be00194c4e..00000000000
--- a/extensions/iceberg/s3/src/test/resources/warehouse/sales/sales_multi/metadata/00002-559f7323-a010-4afe-8461-f5261787aae9.metadata.json
+++ /dev/null
@@ -1,145 +0,0 @@
-{
-  "format-version" : 2,
-  "table-uuid" : "49ca5b8c-6402-40f9-96b0-4c09f9f1b512",
-  "location" : "s3://warehouse/sales/sales_multi",
-  "last-sequence-number" : 3,
-  "last-updated-ms" : 1716234545865,
-  "last-column-id" : 5,
-  "current-schema-id" : 0,
-  "schemas" : [ {
-    "type" : "struct",
-    "schema-id" : 0,
-    "fields" : [ {
-      "id" : 1,
-      "name" : "Region",
-      "required" : false,
-      "type" : "string"
-    }, {
-      "id" : 2,
-      "name" : "Item_Type",
-      "required" : false,
-      "type" : "string"
-    }, {
-      "id" : 3,
-      "name" : "Units_Sold",
-      "required" : false,
-      "type" : "int"
-    }, {
-      "id" : 4,
-      "name" : "Unit_Price",
-      "required" : false,
-      "type" : "double"
-    }, {
-      "id" : 5,
-      "name" : "Order_Date",
-      "required" : false,
-      "type" : "timestamptz"
-    } ]
-  } ],
-  "default-spec-id" : 0,
-  "partition-specs" : [ {
-    "spec-id" : 0,
-    "fields" : [ ]
-  } ],
-  "last-partition-id" : 999,
-  "default-sort-order-id" : 0,
-  "sort-orders" : [ {
-    "order-id" : 0,
-    "fields" : [ ]
-  } ],
-  "properties" : {
-    "owner" : "root",
-    "created-at" : "2024-05-20T19:49:04.669537174Z",
-    "write.format.default" : "parquet",
-    "write.parquet.compression-codec" : "zstd"
-  },
-  "current-snapshot-id" : 3247344357341484163,
-  "refs" : {
-    "main" : {
-      "snapshot-id" : 3247344357341484163,
-      "type" : "branch"
-    }
-  },
-  "snapshots" : [ {
-    "sequence-number" : 1,
-    "snapshot-id" : 2001582482032951248,
-    "timestamp-ms" : 1716234545155,
-    "summary" : {
-      "operation" : "append",
-      "spark.app.id" : "local-1716234462547",
-      "added-data-files" : "1",
-      "added-records" : "18266",
-      "added-files-size" : "176970",
-      "changed-partition-count" : "1",
-      "total-records" : "18266",
-      "total-files-size" : "176970",
-      "total-data-files" : "1",
-      "total-delete-files" : "0",
-      "total-position-deletes" : "0",
-      "total-equality-deletes" : "0"
-    },
-    "manifest-list" : "s3://warehouse/sales/sales_multi/metadata/snap-2001582482032951248-1-a61cde47-0ced-4b74-b91a-9e32dd59b212.avro",
-    "schema-id" : 0
-  }, {
-    "sequence-number" : 2,
-    "snapshot-id" : 8325605756612719366,
-    "parent-snapshot-id" : 2001582482032951248,
-    "timestamp-ms" : 1716234545529,
-    "summary" : {
-      "operation" : "append",
-      "spark.app.id" : "local-1716234462547",
-      "added-data-files" : "1",
-      "added-records" : "36107",
-      "added-files-size" : "331675",
-      "changed-partition-count" : "1",
-      "total-records" : "54373",
-      "total-files-size" : "508645",
-      "total-data-files" : "2",
-      "total-delete-files" : "0",
-      "total-position-deletes" : "0",
-      "total-equality-deletes" : "0"
-    },
-    "manifest-list" : "s3://warehouse/sales/sales_multi/metadata/snap-8325605756612719366-1-02f91282-fecb-4479-bd3b-20a8a3aaa795.avro",
-    "schema-id" : 0
-  }, {
-    "sequence-number" : 3,
-    "snapshot-id" : 3247344357341484163,
-    "parent-snapshot-id" : 8325605756612719366,
-    "timestamp-ms" : 1716234545865,
-    "summary" : {
-      "operation" : "append",
-      "spark.app.id" : "local-1716234462547",
-      "added-data-files" : "1",
-      "added-records" : "18230",
-      "added-files-size" : "176482",
-      "changed-partition-count" : "1",
-      "total-records" : "72603",
-      "total-files-size" : "685127",
-      "total-data-files" : "3",
-      "total-delete-files" : "0",
-      "total-position-deletes" : "0",
-      "total-equality-deletes" : "0"
-    },
-    "manifest-list" : "s3://warehouse/sales/sales_multi/metadata/snap-3247344357341484163-1-77bfad1c-123c-452c-814d-298a1483a99f.avro",
-    "schema-id" : 0
-  } ],
-  "statistics" : [ ],
-  "partition-statistics" : [ ],
-  "snapshot-log" : [ {
-    "timestamp-ms" : 1716234545155,
-    "snapshot-id" : 2001582482032951248
-  }, {
-    "timestamp-ms" : 1716234545529,
-    "snapshot-id" : 8325605756612719366
-  }, {
-    "timestamp-ms" : 1716234545865,
-    "snapshot-id" : 3247344357341484163
-  } ],
-  "metadata-log" : [ {
-    "timestamp-ms" : 1716234545155,
-    "metadata-file" : "s3://warehouse/sales/sales_multi/metadata/00000-8bdf65c1-a414-468b-b7b2-78558b2e8c1f.metadata.json"
-  }, {
-    "timestamp-ms" : 1716234545529,
-    "metadata-file" : "s3://warehouse/sales/sales_multi/metadata/00001-30972e0f-9c8a-4fa9-911d-e356b2b04061.metadata.json"
-  } ]
-}
\ No newline at end of file
diff --git a/extensions/iceberg/s3/src/test/resources/warehouse/sales/sales_multi/metadata/00002-b1745d7e-fa56-47ec-9639-079621849f5a.metadata.json b/extensions/iceberg/s3/src/test/resources/warehouse/sales/sales_multi/metadata/00002-b1745d7e-fa56-47ec-9639-079621849f5a.metadata.json
new file mode 100644
index 00000000000..f233d8d55b1
--- /dev/null
+++ b/extensions/iceberg/s3/src/test/resources/warehouse/sales/sales_multi/metadata/00002-b1745d7e-fa56-47ec-9639-079621849f5a.metadata.json
@@ -0,0 +1,145 @@
+{
+  "format-version" : 2,
+  "table-uuid" : "533f8120-9943-4b64-a0cf-6cfab18e4a79",
+  "location" : "s3://warehouse/sales/sales_multi",
+  "last-sequence-number" : 3,
+  "last-updated-ms" : 1725396300069,
+  "last-column-id" : 5,
+  "current-schema-id" : 0,
+  "schemas" : [ {
+    "type" : "struct",
+    "schema-id" : 0,
+    "fields" : [ {
+      "id" : 1,
+      "name" : "Region",
+      "required" : false,
+      "type" : "string"
+    }, {
+      "id" : 2,
+      "name" : "Item_Type",
+      "required" : false,
+      "type" : "string"
+    }, {
+      "id" : 3,
+      "name" : "Units_Sold",
+      "required" : false,
+      "type" : "int"
+    }, {
+      "id" : 4,
+      "name" : "Unit_Price",
+      "required" : false,
+      "type" : "double"
+    }, {
+      "id" : 5,
+      "name" : "Order_Date",
+      "required" : false,
+      "type" : "timestamptz"
+    } ]
+  } ],
+  "default-spec-id" : 0,
+  "partition-specs" : [ {
+    "spec-id" : 0,
+    "fields" : [ ]
+  } ],
+  "last-partition-id" : 999,
+  "default-sort-order-id" : 0,
+  "sort-orders" : [ {
+    "order-id" : 0,
+    "fields" : [ ]
+  } ],
+  "properties" : {
+    "owner" : "root",
+    "created-at" : "2024-09-03T20:44:52.796187633Z",
+    "write.format.default" : "parquet",
+    "write.parquet.compression-codec" : "zstd"
+  },
+  "current-snapshot-id" : 5693547373255393922,
+  "refs" : {
+    "main" : {
+      "snapshot-id" : 5693547373255393922,
+      "type" : "branch"
+    }
+  },
+  "snapshots" : [ {
+    "sequence-number" : 1,
+    "snapshot-id" : 8121674823173822790,
+    "timestamp-ms" : 1725396294486,
+    "summary" : {
+      "operation" : "append",
+      "spark.app.id" : "local-1725396284766",
+      "added-data-files" : "1",
+      "added-records" : "18073",
+      "added-files-size" : "175359",
+      "changed-partition-count" : "1",
+      "total-records" : "18073",
+      "total-files-size" : "175359",
+      "total-data-files" : "1",
+      "total-delete-files" : "0",
+      "total-position-deletes" : "0",
+      "total-equality-deletes" : "0"
+    },
+    "manifest-list" : "s3://warehouse/sales/sales_multi/metadata/snap-8121674823173822790-1-ddb2a84e-df73-4cb9-a92f-18d737a54489.avro",
+    "schema-id" : 0
+  }, {
+    "sequence-number" : 2,
+    "snapshot-id" : 6040260770188877244,
+    "parent-snapshot-id" : 8121674823173822790,
+    "timestamp-ms" : 1725396298768,
+    "summary" : {
+      "operation" : "append",
+      "spark.app.id" : "local-1725396284766",
+      "added-data-files" : "1",
+      "added-records" : "36360",
+      "added-files-size" : "333827",
+      "changed-partition-count" : "1",
+      "total-records" : "54433",
+      "total-files-size" : "509186",
+      "total-data-files" : "2",
+      "total-delete-files" : "0",
+      "total-position-deletes" : "0",
+      "total-equality-deletes" : "0"
+    },
+    "manifest-list" : "s3://warehouse/sales/sales_multi/metadata/snap-6040260770188877244-1-4b9446ba-c04a-440a-afad-f090aa27c81a.avro",
+    "schema-id" : 0
+  }, {
+    "sequence-number" : 3,
+    "snapshot-id" : 5693547373255393922,
+    "parent-snapshot-id" : 6040260770188877244,
+    "timestamp-ms" : 1725396300069,
+    "summary" : {
+      "operation" : "append",
+      "spark.app.id" : "local-1725396284766",
+      "added-data-files" : "1",
+      "added-records" : "18118",
+      "added-files-size" : "175594",
+      "changed-partition-count" : "1",
+      "total-records" : "72551",
+      "total-files-size" : "684780",
+      "total-data-files" : "3",
+      "total-delete-files" : "0",
+      "total-position-deletes" : "0",
+      "total-equality-deletes" : "0"
+    },
+    "manifest-list" : "s3://warehouse/sales/sales_multi/metadata/snap-5693547373255393922-1-e1bd1067-e40a-4222-bab9-959f5af4dd4d.avro",
+    "schema-id" : 0
+  } ],
+  "statistics" : [ ],
+  "partition-statistics" : [ ],
+  "snapshot-log" : [ {
+    "timestamp-ms" : 1725396294486,
+    "snapshot-id" : 8121674823173822790
+  }, {
+    "timestamp-ms" : 1725396298768,
+    "snapshot-id" : 6040260770188877244
+  }, {
+    "timestamp-ms" : 1725396300069,
+    "snapshot-id" : 5693547373255393922
+  } ],
+  "metadata-log" : [ {
+    "timestamp-ms" : 1725396294486,
+    "metadata-file" : "s3://warehouse/sales/sales_multi/metadata/00000-e433b4ac-9c89-46e8-b0f7-b4ec128b0f5e.metadata.json"
+  }, {
+    "timestamp-ms" : 1725396298768,
+    "metadata-file" : "s3://warehouse/sales/sales_multi/metadata/00001-1e0eb3be-5f28-4965-b390-ab426779517b.metadata.json"
+  } ]
+}
\ No newline at end of file
diff --git a/extensions/iceberg/s3/src/test/resources/warehouse/sales/sales_multi/metadata/00003-1d6e8486-a6bf-4d78-b6f0-d927d58feb4c.metadata.json b/extensions/iceberg/s3/src/test/resources/warehouse/sales/sales_multi/metadata/00003-1d6e8486-a6bf-4d78-b6f0-d927d58feb4c.metadata.json
new file mode 100644
index 00000000000..f63543c318f
--- /dev/null
+++ b/extensions/iceberg/s3/src/test/resources/warehouse/sales/sales_multi/metadata/00003-1d6e8486-a6bf-4d78-b6f0-d927d58feb4c.metadata.json
@@ -0,0 +1,172 @@
+{
+  "format-version" : 2,
+  "table-uuid" : "533f8120-9943-4b64-a0cf-6cfab18e4a79",
+  "location" : "s3://warehouse/sales/sales_multi",
+  "last-sequence-number" : 4,
+  "last-updated-ms" : 1725396301293,
+  "last-column-id" : 5,
+  "current-schema-id" : 0,
+  "schemas" : [ {
+    "type" : "struct",
+    "schema-id" : 0,
+    "fields" : [ {
+      "id" : 1,
+      "name" : "Region",
+      "required" : false,
+      "type" : "string"
+    }, {
+      "id" : 2,
+      "name" : "Item_Type",
+      "required" : false,
+      "type" : "string"
+    }, {
+      "id" : 3,
+      "name" : "Units_Sold",
+      "required" : false,
+      "type" : "int"
+    }, {
+      "id" : 4,
+      "name" : "Unit_Price",
+      "required" : false,
+      "type" : "double"
+    }, {
+      "id" : 5,
+      "name" : "Order_Date",
+      "required" : false,
+      "type" : "timestamptz"
+    } ]
+  } ],
+  "default-spec-id" : 0,
+  "partition-specs" : [ {
+    "spec-id" : 0,
+    "fields" : [ ]
+  } ],
+  "last-partition-id" : 999,
+  "default-sort-order-id" : 0,
+  "sort-orders" : [ {
+    "order-id" : 0,
+    "fields" : [ ]
+  } ],
+  "properties" : {
+    "owner" : "root",
+    "created-at" : "2024-09-03T20:44:52.796187633Z",
+    "write.format.default" : "parquet",
+    "write.parquet.compression-codec" : "zstd"
+  },
+  "current-snapshot-id" : 3445166522731196553,
+  "refs" : {
+    "main" : {
+      "snapshot-id" : 3445166522731196553,
+      "type" : "branch"
+    }
+  },
+  "snapshots" : [ {
+    "sequence-number" : 1,
+    "snapshot-id" : 8121674823173822790,
+    "timestamp-ms" : 1725396294486,
+    "summary" : {
+      "operation" : "append",
+      "spark.app.id" : "local-1725396284766",
+      "added-data-files" : "1",
+      "added-records" : "18073",
+      "added-files-size" : "175359",
+      "changed-partition-count" : "1",
+      "total-records" : "18073",
+      "total-files-size" : "175359",
+      "total-data-files" : "1",
+      "total-delete-files" : "0",
+      "total-position-deletes" : "0",
+      "total-equality-deletes" : "0"
+    },
+    "manifest-list" : "s3://warehouse/sales/sales_multi/metadata/snap-8121674823173822790-1-ddb2a84e-df73-4cb9-a92f-18d737a54489.avro",
+    "schema-id" : 0
+  }, {
+    "sequence-number" : 2,
+    "snapshot-id" : 6040260770188877244,
+    "parent-snapshot-id" : 8121674823173822790,
+    "timestamp-ms" : 1725396298768,
+    "summary" : {
+      "operation" : "append",
+      "spark.app.id" : "local-1725396284766",
+      "added-data-files" : "1",
+      "added-records" : "36360",
+      "added-files-size" : "333827",
+      "changed-partition-count" : "1",
+      "total-records" : "54433",
+      "total-files-size" : "509186",
+      "total-data-files" : "2",
+      "total-delete-files" : "0",
+      "total-position-deletes" : "0",
+      "total-equality-deletes" : "0"
+    },
+    "manifest-list" : "s3://warehouse/sales/sales_multi/metadata/snap-6040260770188877244-1-4b9446ba-c04a-440a-afad-f090aa27c81a.avro",
+    "schema-id" : 0
+  }, {
+    "sequence-number" : 3,
+    "snapshot-id" : 5693547373255393922,
+    "parent-snapshot-id" : 6040260770188877244,
+    "timestamp-ms" : 1725396300069,
+    "summary" : {
+      "operation" : "append",
+      "spark.app.id" : "local-1725396284766",
+      "added-data-files" : "1",
+      "added-records" : "18118",
+      "added-files-size" : "175594",
+      "changed-partition-count" : "1",
+      "total-records" : "72551",
+      "total-files-size" : "684780",
+      "total-data-files" : "3",
+      "total-delete-files" : "0",
+      "total-position-deletes" : "0",
+      "total-equality-deletes" : "0"
+    },
+    "manifest-list" : "s3://warehouse/sales/sales_multi/metadata/snap-5693547373255393922-1-e1bd1067-e40a-4222-bab9-959f5af4dd4d.avro",
+    "schema-id" : 0
+  }, {
+    "sequence-number" : 4,
+    "snapshot-id" : 3445166522731196553,
+    "parent-snapshot-id" : 5693547373255393922,
+    "timestamp-ms" : 1725396301293,
+    "summary" : {
+      "operation" : "append",
+      "spark.app.id" : "local-1725396284766",
+      "added-data-files" : "1",
+      "added-records" : "27449",
+      "added-files-size" : "257345",
+      "changed-partition-count" : "1",
+      "total-records" : "100000",
+      "total-files-size" : "942125",
+      "total-data-files" : "4",
+      "total-delete-files" : "0",
+      "total-position-deletes" : "0",
+      "total-equality-deletes" : "0"
+    },
+    "manifest-list" : "s3://warehouse/sales/sales_multi/metadata/snap-3445166522731196553-1-226480b9-ac20-4445-b67e-7cd3f7ef27d0.avro",
+    "schema-id" : 0
+  } ],
+  "statistics" : [ ],
+  "partition-statistics" : [ ],
+  "snapshot-log" : [ {
+    "timestamp-ms" : 1725396294486,
+    "snapshot-id" : 8121674823173822790
+  }, {
+    "timestamp-ms" : 1725396298768,
+    "snapshot-id" : 6040260770188877244
+  }, {
+    "timestamp-ms" : 1725396300069,
+    "snapshot-id" : 5693547373255393922
+  }, {
+    "timestamp-ms" : 1725396301293,
+    "snapshot-id" : 3445166522731196553
+  } ],
+  "metadata-log" : [ {
+    "timestamp-ms" : 1725396294486,
+    "metadata-file" : "s3://warehouse/sales/sales_multi/metadata/00000-e433b4ac-9c89-46e8-b0f7-b4ec128b0f5e.metadata.json"
+  }, {
+    "timestamp-ms" : 1725396298768,
+    "metadata-file" : "s3://warehouse/sales/sales_multi/metadata/00001-1e0eb3be-5f28-4965-b390-ab426779517b.metadata.json"
+  }, {
+    "timestamp-ms" : 1725396300069,
+    "metadata-file" : "s3://warehouse/sales/sales_multi/metadata/00002-b1745d7e-fa56-47ec-9639-079621849f5a.metadata.json"
+  } ]
+}
\ No newline at end of file
diff --git a/extensions/iceberg/s3/src/test/resources/warehouse/sales/sales_multi/metadata/00003-366e4cb2-48c8-4f6d-bd6b-9b452de74dc3.metadata.json b/extensions/iceberg/s3/src/test/resources/warehouse/sales/sales_multi/metadata/00003-366e4cb2-48c8-4f6d-bd6b-9b452de74dc3.metadata.json
deleted file mode 100644
index 16cca0f3f8d..00000000000
--- a/extensions/iceberg/s3/src/test/resources/warehouse/sales/sales_multi/metadata/00003-366e4cb2-48c8-4f6d-bd6b-9b452de74dc3.metadata.json
+++ /dev/null
@@ -1,172 +0,0 @@
-{
-  "format-version" : 2,
-  "table-uuid" : "49ca5b8c-6402-40f9-96b0-4c09f9f1b512",
-  "location" : "s3://warehouse/sales/sales_multi",
-  "last-sequence-number" : 4,
-  "last-updated-ms" : 1716234546189,
-  "last-column-id" : 5,
-  "current-schema-id" : 0,
-  "schemas" : [ {
-    "type" : "struct",
-    "schema-id" : 0,
-    "fields" : [ {
-      "id" : 1,
-      "name" : "Region",
-      "required" : false,
-      "type" : "string"
-    }, {
-      "id" : 2,
-      "name" : "Item_Type",
-      "required" : false,
-      "type" : "string"
-    }, {
-      "id" : 3,
-      "name" : "Units_Sold",
-      "required" : false,
-      "type" : "int"
-    }, {
-      "id" : 4,
-      "name" : "Unit_Price",
-      "required" : false,
-      "type" : "double"
-    }, {
-      "id" : 5,
-      "name" : "Order_Date",
-      "required" : false,
-      "type" : "timestamptz"
-    } ]
-  } ],
-  "default-spec-id" : 0,
-  "partition-specs" : [ {
-    "spec-id" : 0,
-    "fields" : [ ]
-  } ],
-  "last-partition-id" : 999,
-  "default-sort-order-id" : 0,
-  "sort-orders" : [ {
-    "order-id" : 0,
-    "fields" : [ ]
-  } ],
-  "properties" : {
-    "owner" : "root",
-    "created-at" : "2024-05-20T19:49:04.669537174Z",
-    "write.format.default" : "parquet",
-    "write.parquet.compression-codec" : "zstd"
-  },
-  "current-snapshot-id" : 1792185872197984875,
-  "refs" : {
-    "main" : {
-      "snapshot-id" : 1792185872197984875,
-      "type" : "branch"
-    }
-  },
-  "snapshots" : [ {
-    "sequence-number" : 1,
-    "snapshot-id" : 2001582482032951248,
-    "timestamp-ms" : 1716234545155,
-    "summary" : {
-      "operation" : "append",
-      "spark.app.id" : "local-1716234462547",
-      "added-data-files" : "1",
-      "added-records" : "18266",
-      "added-files-size" : "176970",
-      "changed-partition-count" : "1",
-      "total-records" : "18266",
-      "total-files-size" : "176970",
-      "total-data-files" : "1",
-      "total-delete-files" : "0",
-      "total-position-deletes" : "0",
-      "total-equality-deletes" : "0"
-    },
-    "manifest-list" : "s3://warehouse/sales/sales_multi/metadata/snap-2001582482032951248-1-a61cde47-0ced-4b74-b91a-9e32dd59b212.avro",
-    "schema-id" : 0
-  }, {
-    "sequence-number" : 2,
-    "snapshot-id" : 8325605756612719366,
-    "parent-snapshot-id" : 2001582482032951248,
-    "timestamp-ms" : 1716234545529,
-    "summary" : {
-      "operation" : "append",
-      "spark.app.id" : "local-1716234462547",
-      "added-data-files" : "1",
-      "added-records" : "36107",
-      "added-files-size" : "331675",
-      "changed-partition-count" : "1",
-      "total-records" : "54373",
-      "total-files-size" : "508645",
-      "total-data-files" : "2",
-      "total-delete-files" : "0",
-      "total-position-deletes" : "0",
-      "total-equality-deletes" : "0"
-    },
-    "manifest-list" : "s3://warehouse/sales/sales_multi/metadata/snap-8325605756612719366-1-02f91282-fecb-4479-bd3b-20a8a3aaa795.avro",
-    "schema-id" : 0
-  }, {
-    "sequence-number" : 3,
-    "snapshot-id" : 3247344357341484163,
-    "parent-snapshot-id" : 8325605756612719366,
-    "timestamp-ms" : 1716234545865,
-    "summary" : {
-      "operation" : "append",
-      "spark.app.id" : "local-1716234462547",
-      "added-data-files" : "1",
-      "added-records" : "18230",
-      "added-files-size" : "176482",
-      "changed-partition-count" : "1",
-      "total-records" : "72603",
-      "total-files-size" : "685127",
-      "total-data-files" : "3",
-      "total-delete-files" : "0",
-      "total-position-deletes" : "0",
-      "total-equality-deletes" : "0"
-    },
-    "manifest-list" : "s3://warehouse/sales/sales_multi/metadata/snap-3247344357341484163-1-77bfad1c-123c-452c-814d-298a1483a99f.avro",
-    "schema-id" : 0
-  }, {
-    "sequence-number" : 4,
-    "snapshot-id" : 1792185872197984875,
-    "parent-snapshot-id" : 3247344357341484163,
-    "timestamp-ms" : 1716234546189,
-    "summary" : {
-      "operation" : "append",
-      "spark.app.id" : "local-1716234462547",
-      "added-data-files" : "1",
-      "added-records" : "27397",
-      "added-files-size" : "256855",
-      "changed-partition-count" : "1",
-      "total-records" : "100000",
-      "total-files-size" : "941982",
-      "total-data-files" : "4",
-      "total-delete-files" : "0",
-      "total-position-deletes" : "0",
-      "total-equality-deletes" : "0"
-    },
-    "manifest-list" : "s3://warehouse/sales/sales_multi/metadata/snap-1792185872197984875-1-51be90a2-7294-4ebb-8eee-20d512fff8b0.avro",
-    "schema-id" : 0
-  } ],
-  "statistics" : [ ],
-  "partition-statistics" : [ ],
-  "snapshot-log" : [ {
-    "timestamp-ms" : 1716234545155,
-    "snapshot-id" : 2001582482032951248
-  }, {
-    "timestamp-ms" : 1716234545529,
-    "snapshot-id" : 8325605756612719366
-  }, {
-    "timestamp-ms" : 1716234545865,
-    "snapshot-id" : 3247344357341484163
-  }, {
-    "timestamp-ms" : 1716234546189,
-    "snapshot-id" : 1792185872197984875
-  } ],
-  "metadata-log" : [ {
-    "timestamp-ms" : 1716234545155,
-    "metadata-file" : "s3://warehouse/sales/sales_multi/metadata/00000-8bdf65c1-a414-468b-b7b2-78558b2e8c1f.metadata.json"
-  }, {
-    "timestamp-ms" : 1716234545529,
-    "metadata-file" : "s3://warehouse/sales/sales_multi/metadata/00001-30972e0f-9c8a-4fa9-911d-e356b2b04061.metadata.json"
-  }, {
-    "timestamp-ms" : 1716234545865,
-    "metadata-file" : "s3://warehouse/sales/sales_multi/metadata/00002-559f7323-a010-4afe-8461-f5261787aae9.metadata.json"
-  } ]
-}
\ No newline at end of file
diff --git a/extensions/iceberg/s3/src/test/resources/warehouse/sales/sales_multi/metadata/00004-bdf13c5f-b50f-4ccf-94a0-14c7b9e6ccb7.metadata.json b/extensions/iceberg/s3/src/test/resources/warehouse/sales/sales_multi/metadata/00004-bdf13c5f-b50f-4ccf-94a0-14c7b9e6ccb7.metadata.json
new file mode 100644
index 00000000000..32367a81a58
--- /dev/null
+++ b/extensions/iceberg/s3/src/test/resources/warehouse/sales/sales_multi/metadata/00004-bdf13c5f-b50f-4ccf-94a0-14c7b9e6ccb7.metadata.json
@@ -0,0 +1,186 @@
+{
+  "format-version" : 2,
+  "table-uuid" : "533f8120-9943-4b64-a0cf-6cfab18e4a79",
+  "location" : "s3://warehouse/sales/sales_multi",
+  "last-sequence-number" : 5,
+  "last-updated-ms" : 1725396302818,
+  "last-column-id" : 5,
+  "current-schema-id" : 0,
+  "schemas" : [ {
+    "type" : "struct",
+    "schema-id" : 0,
+    "fields" : [ {
+      "id" : 1,
+      "name" : "Region",
+      "required" : false,
+      "type" : "string"
+    }, {
+      "id" : 2,
+      "name" : "Item_Type",
+      "required" : false,
+      "type" : "string"
+    }, {
+      "id" : 3,
+      "name" : "Units_Sold",
+      "required" : false,
+      "type" : "int"
+    }, {
+      "id" : 4,
+      "name" : "Unit_Price",
+      "required" : false,
+      "type" : "double"
+    }, {
+      "id" : 5,
+      "name" : "Order_Date",
+      "required" : false,
+      "type" : "timestamptz"
+    } ]
+  } ],
+  "default-spec-id" : 0,
+  "partition-specs" : [ {
+    "spec-id" : 0,
+    "fields" : [ ]
+  } ],
+  "last-partition-id" : 999,
+  "default-sort-order-id" : 0,
+  "sort-orders" : [ {
+    "order-id" : 0,
+    "fields" : [ ]
+  } ],
+  "properties" : {
+    "owner" : "root",
+    "created-at" : "2024-09-03T20:44:52.796187633Z",
+    "write.format.default" : "parquet",
+    "write.parquet.compression-codec" : "zstd"
+  },
+  "current-snapshot-id" : 1277776933184906785,
+  "refs" : {
+    "main" : {
+      "snapshot-id" : 1277776933184906785,
+      "type" : "branch"
+    }
+  },
+  "snapshots" : [ {
+    "sequence-number" : 1,
+    "snapshot-id" : 8121674823173822790,
+    "timestamp-ms" : 1725396294486,
+    "summary" : {
+      "operation" : "append",
+      "spark.app.id" : "local-1725396284766",
+      "added-data-files" : "1",
+      "added-records" : "18073",
+      "added-files-size" : "175359",
+      "changed-partition-count" : "1",
+      "total-records" : "18073",
+      "total-files-size" : "175359",
+      "total-data-files" : "1",
+      "total-delete-files" : "0",
+      "total-position-deletes" : "0",
+      "total-equality-deletes" : "0"
+    },
+    "manifest-list" : "s3://warehouse/sales/sales_multi/metadata/snap-8121674823173822790-1-ddb2a84e-df73-4cb9-a92f-18d737a54489.avro",
+    "schema-id" : 0
+  }, {
+    "sequence-number" : 2,
+    "snapshot-id" : 6040260770188877244,
+    "parent-snapshot-id" : 8121674823173822790,
+    "timestamp-ms" : 1725396298768,
+    "summary" : {
+      "operation" : "append",
+      "spark.app.id" : "local-1725396284766",
+      "added-data-files" : "1",
+      "added-records" : "36360",
+      "added-files-size" : "333827",
+      "changed-partition-count" : "1",
+      "total-records" : "54433",
+      "total-files-size" : "509186",
+      "total-data-files" : "2",
+      "total-delete-files" : "0",
+      "total-position-deletes" : "0",
+      "total-equality-deletes" : "0"
+    },
+    "manifest-list" : "s3://warehouse/sales/sales_multi/metadata/snap-6040260770188877244-1-4b9446ba-c04a-440a-afad-f090aa27c81a.avro",
+    "schema-id" : 0
+  }, {
+    "sequence-number" : 3,
+    "snapshot-id" : 5693547373255393922,
+    "parent-snapshot-id" : 6040260770188877244,
+    "timestamp-ms" : 1725396300069,
+    "summary" : {
+      "operation" : "append",
+      "spark.app.id" : "local-1725396284766",
+      "added-data-files" : "1",
+      "added-records" : "18118",
+      "added-files-size" : "175594",
+      "changed-partition-count" : "1",
+      "total-records" : "72551",
+      "total-files-size" : "684780",
+      "total-data-files" : "3",
+      "total-delete-files" : "0",
+      "total-position-deletes" : "0",
+      "total-equality-deletes" : "0"
+    },
+    "manifest-list" : "s3://warehouse/sales/sales_multi/metadata/snap-5693547373255393922-1-e1bd1067-e40a-4222-bab9-959f5af4dd4d.avro",
+    "schema-id" : 0
+  }, {
+    "sequence-number" : 4,
+    "snapshot-id" : 3445166522731196553,
+    "parent-snapshot-id" : 5693547373255393922,
+    "timestamp-ms" : 1725396301293,
+    "summary" : {
+      "operation" : "append",
+      "spark.app.id" : "local-1725396284766",
+      "added-data-files" : "1",
+      "added-records" : "27449",
+      "added-files-size" : "257345",
+      "changed-partition-count" : "1",
+      "total-records" : "100000",
+      "total-files-size" : "942125",
+      "total-data-files" : "4",
+      "total-delete-files" : "0",
+      "total-position-deletes" : "0",
+      "total-equality-deletes" : "0"
+    },
+    "manifest-list" : "s3://warehouse/sales/sales_multi/metadata/snap-3445166522731196553-1-226480b9-ac20-4445-b67e-7cd3f7ef27d0.avro",
+    "schema-id" : 0
+  }, {
+    "sequence-number" : 5,
+    "snapshot-id" : 1277776933184906785,
+    "timestamp-ms" : 1725396302818,
+    "summary" : {
+      "operation" : "append",
+      "spark.app.id" : "local-1725396284766",
+      "added-data-files" : "1",
+      "added-records" : "100000",
+      "added-files-size" : "729342",
+      "changed-partition-count" : "1",
+      "total-records" : "100000",
+      "total-files-size" : "729342",
+      "total-data-files" : "1",
+      "total-delete-files" : "0",
+      "total-position-deletes" : "0",
+      "total-equality-deletes" : "0"
+    },
+    "manifest-list" : "s3://warehouse/sales/sales_multi/metadata/snap-1277776933184906785-1-bb0d7049-0780-4636-972a-7f46bb6c395a.avro",
+    "schema-id" : 0
+  } ],
+  "statistics" : [ ],
+  "partition-statistics" : [ ],
+  "snapshot-log" : [ {
+    "timestamp-ms" : 1725396302818,
+    "snapshot-id" : 1277776933184906785
+  } ],
+  "metadata-log" : [ {
+    "timestamp-ms" : 1725396294486,
+    "metadata-file" : "s3://warehouse/sales/sales_multi/metadata/00000-e433b4ac-9c89-46e8-b0f7-b4ec128b0f5e.metadata.json"
+  }, {
+    "timestamp-ms" : 1725396298768,
+    "metadata-file" : "s3://warehouse/sales/sales_multi/metadata/00001-1e0eb3be-5f28-4965-b390-ab426779517b.metadata.json"
+  }, {
+    "timestamp-ms" : 1725396300069,
+    "metadata-file" : "s3://warehouse/sales/sales_multi/metadata/00002-b1745d7e-fa56-47ec-9639-079621849f5a.metadata.json"
+  }, {
+    "timestamp-ms" : 1725396301293,
+    "metadata-file" : "s3://warehouse/sales/sales_multi/metadata/00003-1d6e8486-a6bf-4d78-b6f0-d927d58feb4c.metadata.json"
+  } ]
+}
\ No newline at end of file
diff --git a/extensions/iceberg/s3/src/test/resources/warehouse/sales/sales_multi/metadata/00005-3476adcd-1647-44c6-930e-df3fe7867d8f.metadata.json b/extensions/iceberg/s3/src/test/resources/warehouse/sales/sales_multi/metadata/00005-3476adcd-1647-44c6-930e-df3fe7867d8f.metadata.json
new file mode 100644
index 00000000000..fe4f6176a8d
--- /dev/null
+++ b/extensions/iceberg/s3/src/test/resources/warehouse/sales/sales_multi/metadata/00005-3476adcd-1647-44c6-930e-df3fe7867d8f.metadata.json
@@ -0,0 +1,206 @@
+{
+  "format-version" : 2,
+  "table-uuid" : "533f8120-9943-4b64-a0cf-6cfab18e4a79",
+  "location" : "s3://warehouse/sales/sales_multi",
+  "last-sequence-number" : 6,
+  "last-updated-ms" : 1725396304540,
+  "last-column-id" : 5,
+  "current-schema-id" : 0,
+  "schemas" : [ {
+    "type" : "struct",
+    "schema-id" : 0,
+    "fields" : [ {
+      "id" : 1,
+      "name" : "Region",
+      "required" : false,
+      "type" : "string"
+    }, {
+      "id" : 2,
+      "name" : "Item_Type",
+      "required" : false,
+      "type" : "string"
+    }, {
+      "id" : 3,
+      "name" : "Units_Sold",
+      "required" : false,
+      "type" : "int"
+    }, {
+      "id" : 4,
+      "name" : "Unit_Price",
+      "required" : false,
+      "type" : "double"
+    }, {
+      "id" : 5,
+      "name" : "Order_Date",
+      "required" : false,
+      "type" : "timestamptz"
+    } ]
+  } ],
+  "default-spec-id" : 0,
+  "partition-specs" : [ {
+    "spec-id" : 0,
+    "fields" : [ ]
+  } ],
+  "last-partition-id" : 999,
+  "default-sort-order-id" : 0,
+  "sort-orders" : [ {
+    "order-id" : 0,
+    "fields" : [ ]
+  } ],
+  "properties" : {
+    "owner" : "root",
+    "created-at" : "2024-09-03T20:44:52.796187633Z",
+    "write.format.default" : "parquet",
+    "write.parquet.compression-codec" : "zstd"
+  },
+  "current-snapshot-id" : 3825168261540020388,
+  "refs" : {
+    "main" : {
+      "snapshot-id" : 3825168261540020388,
+      "type" : "branch"
+    }
+  },
+  "snapshots" : [ {
+    "sequence-number" : 1,
+    "snapshot-id" : 8121674823173822790,
+    "timestamp-ms" : 1725396294486,
+    "summary" : {
+      "operation" : "append",
+      "spark.app.id" : "local-1725396284766",
+      "added-data-files" : "1",
+      "added-records" : "18073",
+      "added-files-size" : "175359",
+      "changed-partition-count" : "1",
+      "total-records" : "18073",
+      "total-files-size" : "175359",
+      "total-data-files" : "1",
+      "total-delete-files" : "0",
+      "total-position-deletes" : "0",
+      "total-equality-deletes" : "0"
+    },
+    "manifest-list" : "s3://warehouse/sales/sales_multi/metadata/snap-8121674823173822790-1-ddb2a84e-df73-4cb9-a92f-18d737a54489.avro",
+    "schema-id" : 0
+  }, {
+    "sequence-number" : 2,
+    "snapshot-id" : 6040260770188877244,
+    "parent-snapshot-id" : 8121674823173822790,
+    "timestamp-ms" : 1725396298768,
+    "summary" : {
+      "operation" : "append",
+      "spark.app.id" : "local-1725396284766",
+      "added-data-files" : "1",
+      "added-records" : "36360",
+      "added-files-size" : "333827",
+      "changed-partition-count" : "1",
+      "total-records" : "54433",
+      "total-files-size" : "509186",
+      "total-data-files" : "2",
+      "total-delete-files" : "0",
+      "total-position-deletes" : "0",
+      "total-equality-deletes" : "0"
+    },
+    "manifest-list" : "s3://warehouse/sales/sales_multi/metadata/snap-6040260770188877244-1-4b9446ba-c04a-440a-afad-f090aa27c81a.avro",
+    "schema-id" : 0
+  }, {
+    "sequence-number" : 3,
+    "snapshot-id" : 5693547373255393922,
+    "parent-snapshot-id" : 6040260770188877244,
+    "timestamp-ms" : 1725396300069,
+    "summary" : {
+      "operation" : "append",
+      "spark.app.id" : "local-1725396284766",
+      "added-data-files" : "1",
+      "added-records" : "18118",
+      "added-files-size" : "175594",
+      "changed-partition-count" : "1",
+      "total-records" : "72551",
+      "total-files-size" : "684780",
+      "total-data-files" : "3",
+      "total-delete-files" : "0",
+      "total-position-deletes" : "0",
+      "total-equality-deletes" : "0"
+    },
+    "manifest-list" : "s3://warehouse/sales/sales_multi/metadata/snap-5693547373255393922-1-e1bd1067-e40a-4222-bab9-959f5af4dd4d.avro",
+    "schema-id" : 0
+  }, {
+    "sequence-number" : 4,
+    "snapshot-id" : 3445166522731196553,
+    "parent-snapshot-id" : 5693547373255393922,
+    "timestamp-ms" : 1725396301293,
+    "summary" : {
+      "operation" : "append",
+      "spark.app.id" : "local-1725396284766",
+      "added-data-files" : "1",
+      "added-records" : "27449",
+      "added-files-size" : "257345",
+      "changed-partition-count" : "1",
+      "total-records" : "100000",
+      "total-files-size" : "942125",
+      "total-data-files" : "4",
+      "total-delete-files" : "0",
+      "total-position-deletes" : "0",
+      "total-equality-deletes" : "0"
+    },
+    "manifest-list" : "s3://warehouse/sales/sales_multi/metadata/snap-3445166522731196553-1-226480b9-ac20-4445-b67e-7cd3f7ef27d0.avro",
+    "schema-id" : 0
+  }, {
+    "sequence-number" : 5,
+    "snapshot-id" : 1277776933184906785,
+    "timestamp-ms" : 1725396302818,
+    "summary" : {
+      "operation" : "append",
+      "spark.app.id" : "local-1725396284766",
+      "added-data-files" : "1",
+      "added-records" : "100000",
+      "added-files-size" : "729342",
+      "changed-partition-count" : "1",
+      "total-records" : "100000",
+      "total-files-size" : "729342",
+      "total-data-files" : "1",
+      "total-delete-files" : "0",
+      "total-position-deletes" : "0",
+      "total-equality-deletes" : "0"
+    },
+    "manifest-list" : "s3://warehouse/sales/sales_multi/metadata/snap-1277776933184906785-1-bb0d7049-0780-4636-972a-7f46bb6c395a.avro",
+    "schema-id" : 0
+  }, {
+    "sequence-number" : 6,
+    "snapshot-id" : 3825168261540020388,
+    "timestamp-ms" : 1725396304540,
+    "summary" : {
+      "operation" : "append",
+      "spark.app.id" : "local-1725396284766",
+      "changed-partition-count" : "0",
+      "total-records" : "0",
+      "total-files-size" : "0",
+      "total-data-files" : "0",
+      "total-delete-files" : "0",
+      "total-position-deletes" : "0",
+      "total-equality-deletes" : "0"
+    },
+    "manifest-list" : "s3://warehouse/sales/sales_multi/metadata/snap-3825168261540020388-1-bdc6d711-4699-4d21-a7f8-907c7740c70c.avro",
+    "schema-id" : 0
+  } ],
+  "statistics" : [ ],
+  "partition-statistics" : [ ],
+  "snapshot-log" : [ {
+    "timestamp-ms" : 1725396304540,
+    "snapshot-id" : 3825168261540020388
+  } ],
+  "metadata-log" : [ {
+    "timestamp-ms" : 1725396294486,
+    "metadata-file" : "s3://warehouse/sales/sales_multi/metadata/00000-e433b4ac-9c89-46e8-b0f7-b4ec128b0f5e.metadata.json"
+  }, {
+    "timestamp-ms" : 1725396298768,
+    "metadata-file" : "s3://warehouse/sales/sales_multi/metadata/00001-1e0eb3be-5f28-4965-b390-ab426779517b.metadata.json"
+  }, {
+    "timestamp-ms" : 1725396300069,
+    "metadata-file" : "s3://warehouse/sales/sales_multi/metadata/00002-b1745d7e-fa56-47ec-9639-079621849f5a.metadata.json"
+  }, {
+    "timestamp-ms" : 1725396301293,
+    "metadata-file" : "s3://warehouse/sales/sales_multi/metadata/00003-1d6e8486-a6bf-4d78-b6f0-d927d58feb4c.metadata.json"
+  }, {
+    "timestamp-ms" : 1725396302818,
+    "metadata-file" : "s3://warehouse/sales/sales_multi/metadata/00004-bdf13c5f-b50f-4ccf-94a0-14c7b9e6ccb7.metadata.json"
+  } ]
+}
\ No newline at end of file
diff --git a/extensions/iceberg/s3/src/test/resources/warehouse/sales/sales_multi/metadata/02f91282-fecb-4479-bd3b-20a8a3aaa795-m0.avro b/extensions/iceberg/s3/src/test/resources/warehouse/sales/sales_multi/metadata/02f91282-fecb-4479-bd3b-20a8a3aaa795-m0.avro
deleted file mode 100644
index d871fbb9fd0..00000000000
Binary files a/extensions/iceberg/s3/src/test/resources/warehouse/sales/sales_multi/metadata/02f91282-fecb-4479-bd3b-20a8a3aaa795-m0.avro and /dev/null differ
diff --git a/extensions/iceberg/s3/src/test/resources/warehouse/sales/sales_multi/metadata/226480b9-ac20-4445-b67e-7cd3f7ef27d0-m0.avro b/extensions/iceberg/s3/src/test/resources/warehouse/sales/sales_multi/metadata/226480b9-ac20-4445-b67e-7cd3f7ef27d0-m0.avro
new file mode 100644
index 00000000000..2de91cb1f34
Binary files /dev/null and b/extensions/iceberg/s3/src/test/resources/warehouse/sales/sales_multi/metadata/226480b9-ac20-4445-b67e-7cd3f7ef27d0-m0.avro differ
diff --git a/extensions/iceberg/s3/src/test/resources/warehouse/sales/sales_multi/metadata/4b9446ba-c04a-440a-afad-f090aa27c81a-m0.avro b/extensions/iceberg/s3/src/test/resources/warehouse/sales/sales_multi/metadata/4b9446ba-c04a-440a-afad-f090aa27c81a-m0.avro
new file mode 100644
index 00000000000..d91a8b5dc74
Binary files /dev/null and b/extensions/iceberg/s3/src/test/resources/warehouse/sales/sales_multi/metadata/4b9446ba-c04a-440a-afad-f090aa27c81a-m0.avro differ
diff --git a/extensions/iceberg/s3/src/test/resources/warehouse/sales/sales_multi/metadata/51be90a2-7294-4ebb-8eee-20d512fff8b0-m0.avro b/extensions/iceberg/s3/src/test/resources/warehouse/sales/sales_multi/metadata/51be90a2-7294-4ebb-8eee-20d512fff8b0-m0.avro
deleted file mode 100644
index 21c52f9fe1c..00000000000
Binary files a/extensions/iceberg/s3/src/test/resources/warehouse/sales/sales_multi/metadata/51be90a2-7294-4ebb-8eee-20d512fff8b0-m0.avro and /dev/null differ
diff --git a/extensions/iceberg/s3/src/test/resources/warehouse/sales/sales_multi/metadata/77bfad1c-123c-452c-814d-298a1483a99f-m0.avro b/extensions/iceberg/s3/src/test/resources/warehouse/sales/sales_multi/metadata/77bfad1c-123c-452c-814d-298a1483a99f-m0.avro
deleted file mode 100644
index 9501a6ce37e..00000000000
Binary files a/extensions/iceberg/s3/src/test/resources/warehouse/sales/sales_multi/metadata/77bfad1c-123c-452c-814d-298a1483a99f-m0.avro and /dev/null differ
diff --git a/extensions/iceberg/s3/src/test/resources/warehouse/sales/sales_multi/metadata/a61cde47-0ced-4b74-b91a-9e32dd59b212-m0.avro b/extensions/iceberg/s3/src/test/resources/warehouse/sales/sales_multi/metadata/a61cde47-0ced-4b74-b91a-9e32dd59b212-m0.avro
deleted file mode 100644
index 462894acbde..00000000000
Binary files a/extensions/iceberg/s3/src/test/resources/warehouse/sales/sales_multi/metadata/a61cde47-0ced-4b74-b91a-9e32dd59b212-m0.avro and /dev/null differ
diff --git a/extensions/iceberg/s3/src/test/resources/warehouse/sales/sales_multi/metadata/bb0d7049-0780-4636-972a-7f46bb6c395a-m0.avro b/extensions/iceberg/s3/src/test/resources/warehouse/sales/sales_multi/metadata/bb0d7049-0780-4636-972a-7f46bb6c395a-m0.avro
new file mode 100644
index 00000000000..463995b0f52
Binary files /dev/null and b/extensions/iceberg/s3/src/test/resources/warehouse/sales/sales_multi/metadata/bb0d7049-0780-4636-972a-7f46bb6c395a-m0.avro differ
diff --git a/extensions/iceberg/s3/src/test/resources/warehouse/sales/sales_multi/metadata/ddb2a84e-df73-4cb9-a92f-18d737a54489-m0.avro b/extensions/iceberg/s3/src/test/resources/warehouse/sales/sales_multi/metadata/ddb2a84e-df73-4cb9-a92f-18d737a54489-m0.avro
new file mode 100644
index 00000000000..3e3c02833a0
Binary files /dev/null and b/extensions/iceberg/s3/src/test/resources/warehouse/sales/sales_multi/metadata/ddb2a84e-df73-4cb9-a92f-18d737a54489-m0.avro differ
diff --git a/extensions/iceberg/s3/src/test/resources/warehouse/sales/sales_multi/metadata/e1bd1067-e40a-4222-bab9-959f5af4dd4d-m0.avro b/extensions/iceberg/s3/src/test/resources/warehouse/sales/sales_multi/metadata/e1bd1067-e40a-4222-bab9-959f5af4dd4d-m0.avro
new file mode 100644
index 00000000000..2cda88a5e78
Binary files /dev/null and b/extensions/iceberg/s3/src/test/resources/warehouse/sales/sales_multi/metadata/e1bd1067-e40a-4222-bab9-959f5af4dd4d-m0.avro differ
diff --git a/extensions/iceberg/s3/src/test/resources/warehouse/sales/sales_multi/metadata/snap-1277776933184906785-1-bb0d7049-0780-4636-972a-7f46bb6c395a.avro b/extensions/iceberg/s3/src/test/resources/warehouse/sales/sales_multi/metadata/snap-1277776933184906785-1-bb0d7049-0780-4636-972a-7f46bb6c395a.avro
new file mode 100644
index 00000000000..efb0d789589
Binary files /dev/null and b/extensions/iceberg/s3/src/test/resources/warehouse/sales/sales_multi/metadata/snap-1277776933184906785-1-bb0d7049-0780-4636-972a-7f46bb6c395a.avro differ
diff --git a/extensions/iceberg/s3/src/test/resources/warehouse/sales/sales_multi/metadata/snap-1792185872197984875-1-51be90a2-7294-4ebb-8eee-20d512fff8b0.avro b/extensions/iceberg/s3/src/test/resources/warehouse/sales/sales_multi/metadata/snap-1792185872197984875-1-51be90a2-7294-4ebb-8eee-20d512fff8b0.avro
deleted file mode 100644
index c6e3e85459b..00000000000
Binary files a/extensions/iceberg/s3/src/test/resources/warehouse/sales/sales_multi/metadata/snap-1792185872197984875-1-51be90a2-7294-4ebb-8eee-20d512fff8b0.avro and /dev/null differ
diff --git a/extensions/iceberg/s3/src/test/resources/warehouse/sales/sales_multi/metadata/snap-2001582482032951248-1-a61cde47-0ced-4b74-b91a-9e32dd59b212.avro b/extensions/iceberg/s3/src/test/resources/warehouse/sales/sales_multi/metadata/snap-2001582482032951248-1-a61cde47-0ced-4b74-b91a-9e32dd59b212.avro
deleted file mode 100644
index 28d439215a0..00000000000
Binary files a/extensions/iceberg/s3/src/test/resources/warehouse/sales/sales_multi/metadata/snap-2001582482032951248-1-a61cde47-0ced-4b74-b91a-9e32dd59b212.avro and /dev/null differ
diff --git a/extensions/iceberg/s3/src/test/resources/warehouse/sales/sales_multi/metadata/snap-3247344357341484163-1-77bfad1c-123c-452c-814d-298a1483a99f.avro b/extensions/iceberg/s3/src/test/resources/warehouse/sales/sales_multi/metadata/snap-3247344357341484163-1-77bfad1c-123c-452c-814d-298a1483a99f.avro
deleted file mode 100644
index 8774b62b1e7..00000000000
Binary files a/extensions/iceberg/s3/src/test/resources/warehouse/sales/sales_multi/metadata/snap-3247344357341484163-1-77bfad1c-123c-452c-814d-298a1483a99f.avro and /dev/null differ
diff --git a/extensions/iceberg/s3/src/test/resources/warehouse/sales/sales_multi/metadata/snap-3445166522731196553-1-226480b9-ac20-4445-b67e-7cd3f7ef27d0.avro b/extensions/iceberg/s3/src/test/resources/warehouse/sales/sales_multi/metadata/snap-3445166522731196553-1-226480b9-ac20-4445-b67e-7cd3f7ef27d0.avro
new file mode 100644
index 00000000000..dc24dd3d8e4
Binary files /dev/null and b/extensions/iceberg/s3/src/test/resources/warehouse/sales/sales_multi/metadata/snap-3445166522731196553-1-226480b9-ac20-4445-b67e-7cd3f7ef27d0.avro differ
diff --git a/extensions/iceberg/s3/src/test/resources/warehouse/sales/sales_multi/metadata/snap-3825168261540020388-1-bdc6d711-4699-4d21-a7f8-907c7740c70c.avro b/extensions/iceberg/s3/src/test/resources/warehouse/sales/sales_multi/metadata/snap-3825168261540020388-1-bdc6d711-4699-4d21-a7f8-907c7740c70c.avro
new file mode 100644
index 00000000000..ca67d791ceb
Binary files /dev/null and b/extensions/iceberg/s3/src/test/resources/warehouse/sales/sales_multi/metadata/snap-3825168261540020388-1-bdc6d711-4699-4d21-a7f8-907c7740c70c.avro differ
diff --git a/extensions/iceberg/s3/src/test/resources/warehouse/sales/sales_multi/metadata/snap-5693547373255393922-1-e1bd1067-e40a-4222-bab9-959f5af4dd4d.avro b/extensions/iceberg/s3/src/test/resources/warehouse/sales/sales_multi/metadata/snap-5693547373255393922-1-e1bd1067-e40a-4222-bab9-959f5af4dd4d.avro
new file mode 100644
index 00000000000..b77fb08206c
Binary files /dev/null and b/extensions/iceberg/s3/src/test/resources/warehouse/sales/sales_multi/metadata/snap-5693547373255393922-1-e1bd1067-e40a-4222-bab9-959f5af4dd4d.avro differ
diff --git a/extensions/iceberg/s3/src/test/resources/warehouse/sales/sales_multi/metadata/snap-6040260770188877244-1-4b9446ba-c04a-440a-afad-f090aa27c81a.avro b/extensions/iceberg/s3/src/test/resources/warehouse/sales/sales_multi/metadata/snap-6040260770188877244-1-4b9446ba-c04a-440a-afad-f090aa27c81a.avro
new file mode 100644
index 00000000000..790df47dae8
Binary files /dev/null and b/extensions/iceberg/s3/src/test/resources/warehouse/sales/sales_multi/metadata/snap-6040260770188877244-1-4b9446ba-c04a-440a-afad-f090aa27c81a.avro differ
diff --git a/extensions/iceberg/s3/src/test/resources/warehouse/sales/sales_multi/metadata/snap-8121674823173822790-1-ddb2a84e-df73-4cb9-a92f-18d737a54489.avro b/extensions/iceberg/s3/src/test/resources/warehouse/sales/sales_multi/metadata/snap-8121674823173822790-1-ddb2a84e-df73-4cb9-a92f-18d737a54489.avro
new file mode 100644
index 00000000000..2a43520a033
Binary files /dev/null and b/extensions/iceberg/s3/src/test/resources/warehouse/sales/sales_multi/metadata/snap-8121674823173822790-1-ddb2a84e-df73-4cb9-a92f-18d737a54489.avro differ
diff --git a/extensions/iceberg/s3/src/test/resources/warehouse/sales/sales_multi/metadata/snap-8325605756612719366-1-02f91282-fecb-4479-bd3b-20a8a3aaa795.avro b/extensions/iceberg/s3/src/test/resources/warehouse/sales/sales_multi/metadata/snap-8325605756612719366-1-02f91282-fecb-4479-bd3b-20a8a3aaa795.avro
deleted file mode 100644
index b5659a5c9b9..00000000000
Binary files a/extensions/iceberg/s3/src/test/resources/warehouse/sales/sales_multi/metadata/snap-8325605756612719366-1-02f91282-fecb-4479-bd3b-20a8a3aaa795.avro and /dev/null differ
diff --git a/extensions/iceberg/s3/src/test/resources/warehouse/sales/sales_renamed/data/00000-4-62bcda08-a24a-4b17-a20a-e18edfea5b5a-0-00001.parquet b/extensions/iceberg/s3/src/test/resources/warehouse/sales/sales_renamed/data/00000-4-62bcda08-a24a-4b17-a20a-e18edfea5b5a-0-00001.parquet
new file mode 100644
index 00000000000..36034385967
--- /dev/null
+++ b/extensions/iceberg/s3/src/test/resources/warehouse/sales/sales_renamed/data/00000-4-62bcda08-a24a-4b17-a20a-e18edfea5b5a-0-00001.parquet
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:a9f083874b7d88483cbcc81e5104c9fa1cdc74c43dc1a1e14302459e68d99ab6
+size 729387
diff --git a/extensions/iceberg/s3/src/test/resources/warehouse/sales/sales_renamed/metadata/00000-556b3c6d-3a0e-4912-916a-151f5d772a7b.metadata.json b/extensions/iceberg/s3/src/test/resources/warehouse/sales/sales_renamed/metadata/00000-556b3c6d-3a0e-4912-916a-151f5d772a7b.metadata.json
new file mode 100644
index 00000000000..dd0687b087a
--- /dev/null
+++ b/extensions/iceberg/s3/src/test/resources/warehouse/sales/sales_renamed/metadata/00000-556b3c6d-3a0e-4912-916a-151f5d772a7b.metadata.json
@@ -0,0 +1,91 @@
+{
+  "format-version" : 2,
+  "table-uuid" : "49f61dcb-0c7a-414d-8e67-9bf190a24032",
+  "location" : "s3://warehouse/sales/sales_renamed",
+  "last-sequence-number" : 1,
+  "last-updated-ms" : 1720562597002,
+  "last-column-id" : 5,
+  "current-schema-id" : 0,
+  "schemas" : [ {
+    "type" : "struct",
+    "schema-id" : 0,
+    "fields" : [ {
+      "id" : 1,
+      "name" : "Region Name",
+      "required" : false,
+      "type" : "string"
+    }, {
+      "id" : 2,
+      "name" : "Item&Type",
+      "required" : false,
+      "type" : "string"
+    }, {
+      "id" : 3,
+      "name" : "Units/Sold",
+      "required" : false,
+      "type" : "int"
+    }, {
+      "id" : 4,
+      "name" : "Unit Price",
+      "required" : false,
+      "type" : "double"
+    }, {
+      "id" : 5,
+      "name" : "Order Date",
+      "required" : false,
+      "type" : "timestamptz"
+    } ]
+  } ],
+  "default-spec-id" : 0,
+  "partition-specs" : [ {
+    "spec-id" : 0,
+    "fields" : [ ]
+  } ],
+  "last-partition-id" : 999,
+  "default-sort-order-id" : 0,
+  "sort-orders" : [ {
+    "order-id" : 0,
+    "fields" : [ ]
+  } ],
+  "properties" : {
+    "owner" : "root",
+    "created-at" : "2024-07-09T22:03:15.386555127Z",
+    "write.format.default" : "parquet",
+    "write.parquet.compression-codec" : "zstd"
+  },
+  "current-snapshot-id" : 1014870679100567484,
+  "refs" : {
+    "main" : {
+      "snapshot-id" : 1014870679100567484,
+      "type" : "branch"
+    }
+  },
+  "snapshots" : [ {
+    "sequence-number" : 1,
+    "snapshot-id" : 1014870679100567484,
+    "timestamp-ms" : 1720562597002,
+    "summary" : {
+      "operation" : "append",
+      "spark.app.id" : "local-1720562294285",
+      "added-data-files" : "1",
+      "added-records" : "100000",
+      "added-files-size" : "729387",
+      "changed-partition-count" : "1",
+      "total-records" : "100000",
+      "total-files-size" : "729387",
+      "total-data-files" : "1",
+      "total-delete-files" : "0",
+      "total-position-deletes" : "0",
+      "total-equality-deletes" : "0"
+    },
+    "manifest-list" : "s3://warehouse/sales/sales_renamed/metadata/snap-1014870679100567484-1-6154af6b-49cf-41eb-a340-ff60964e750d.avro",
+    "schema-id" : 0
+  } ],
+  "statistics" : [ ],
+  "partition-statistics" : [ ],
+  "snapshot-log" : [ {
+    "timestamp-ms" : 1720562597002,
+    "snapshot-id" : 1014870679100567484
+  } ],
+  "metadata-log" : [ ]
+}
\ No newline at end of file
diff --git a/extensions/iceberg/s3/src/test/resources/warehouse/sales/sales_renamed/metadata/6154af6b-49cf-41eb-a340-ff60964e750d-m0.avro b/extensions/iceberg/s3/src/test/resources/warehouse/sales/sales_renamed/metadata/6154af6b-49cf-41eb-a340-ff60964e750d-m0.avro
new file mode 100644
index 00000000000..296ea64c6b5
Binary files /dev/null and b/extensions/iceberg/s3/src/test/resources/warehouse/sales/sales_renamed/metadata/6154af6b-49cf-41eb-a340-ff60964e750d-m0.avro differ
diff --git a/extensions/iceberg/s3/src/test/resources/warehouse/sales/sales_renamed/metadata/snap-1014870679100567484-1-6154af6b-49cf-41eb-a340-ff60964e750d.avro b/extensions/iceberg/s3/src/test/resources/warehouse/sales/sales_renamed/metadata/snap-1014870679100567484-1-6154af6b-49cf-41eb-a340-ff60964e750d.avro
new file mode 100644
index 00000000000..7c8b46c5495
Binary files /dev/null and b/extensions/iceberg/s3/src/test/resources/warehouse/sales/sales_renamed/metadata/snap-1014870679100567484-1-6154af6b-49cf-41eb-a340-ff60964e750d.avro differ
diff --git a/extensions/iceberg/src/main/java/io/deephaven/iceberg/base/IcebergUtils.java b/extensions/iceberg/src/main/java/io/deephaven/iceberg/base/IcebergUtils.java
new file mode 100644
index 00000000000..a0607d671db
--- /dev/null
+++ b/extensions/iceberg/src/main/java/io/deephaven/iceberg/base/IcebergUtils.java
@@ -0,0 +1,314 @@
+//
+// Copyright (c) 2016-2024 Deephaven Data Labs and Patent Pending
+//
+package io.deephaven.iceberg.base;
+
+import io.deephaven.engine.table.ColumnDefinition;
+import io.deephaven.engine.table.TableDefinition;
+import io.deephaven.engine.table.impl.locations.TableDataException;
+import io.deephaven.iceberg.util.IcebergReadInstructions;
+import org.apache.iceberg.DataFile;
+import org.apache.iceberg.ManifestContent;
+import org.apache.iceberg.ManifestFile;
+import org.apache.iceberg.ManifestFiles;
+import org.apache.iceberg.PartitionField;
+import org.apache.iceberg.PartitionSpec;
+import org.apache.iceberg.Schema;
+import org.apache.iceberg.Snapshot;
+import org.apache.iceberg.Table;
+import org.apache.iceberg.catalog.Catalog;
+import org.apache.iceberg.catalog.Namespace;
+import org.apache.iceberg.catalog.SupportsNamespaces;
+import org.apache.iceberg.exceptions.AlreadyExistsException;
+import org.apache.iceberg.exceptions.NamespaceNotEmptyException;
+import org.apache.iceberg.types.Type;
+import org.apache.iceberg.types.Types;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
+
+import java.io.IOException;
+import java.io.UncheckedIOException;
+import java.math.BigDecimal;
+import java.time.Instant;
+import java.time.LocalDate;
+import java.time.LocalDateTime;
+import java.time.LocalTime;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
+import java.util.stream.Stream;
+import java.util.stream.StreamSupport;
+
+public final class IcebergUtils {
+
+    private static final Map<Class<?>, Type> DH_TO_ICEBERG_TYPE_MAP = new HashMap<>();
+
+    static {
+        DH_TO_ICEBERG_TYPE_MAP.put(Boolean.class, Types.BooleanType.get());
+        DH_TO_ICEBERG_TYPE_MAP.put(double.class, Types.DoubleType.get());
+        DH_TO_ICEBERG_TYPE_MAP.put(float.class, Types.FloatType.get());
+        DH_TO_ICEBERG_TYPE_MAP.put(int.class, Types.IntegerType.get());
+        DH_TO_ICEBERG_TYPE_MAP.put(long.class, Types.LongType.get());
+        DH_TO_ICEBERG_TYPE_MAP.put(String.class, Types.StringType.get());
+        DH_TO_ICEBERG_TYPE_MAP.put(Instant.class, Types.TimestampType.withZone());
+        DH_TO_ICEBERG_TYPE_MAP.put(LocalDateTime.class, Types.TimestampType.withoutZone());
+        DH_TO_ICEBERG_TYPE_MAP.put(LocalDate.class, Types.DateType.get());
+        DH_TO_ICEBERG_TYPE_MAP.put(LocalTime.class, Types.TimeType.get());
+        DH_TO_ICEBERG_TYPE_MAP.put(byte[].class, Types.BinaryType.get());
+        // TODO (deephaven-core#6327) Add support for more types like ZonedDateTime, Big Decimals, and Lists
+    }
+
+    /**
+     * Get a stream of all {@link DataFile} objects from the given {@link Table} and {@link Snapshot}.
+     *
+     * @param table The {@link Table} to retrieve data files for.
+     * @param snapshot The {@link Snapshot} to retrieve data files from.
+     *
+     * @return A stream of {@link DataFile} objects.
+     */
+    public static Stream<DataFile> allDataFiles(@NotNull final Table table, @NotNull final Snapshot snapshot) {
+        return allManifestFiles(table, snapshot)
+                .map(manifestFile -> ManifestFiles.read(manifestFile, table.io()))
+                .flatMap(IcebergUtils::toStream);
+    }
+
+    /**
+     * Get a stream of all {@link ManifestFile} objects from the given {@link Table} and {@link Snapshot}.
+     *
+     * @param table The {@link Table} to retrieve manifest files for.
+     * @param snapshot The {@link Snapshot} to retrieve manifest files from.
+     *
+     * @return A stream of {@link ManifestFile} objects.
+     */
+    public static Stream<ManifestFile> allManifestFiles(@NotNull final Table table, @NotNull final Snapshot snapshot) {
+        return allManifests(table, snapshot).stream()
+                .peek(manifestFile -> {
+                    if (manifestFile.content() != ManifestContent.DATA) {
+                        throw new TableDataException(
+                                String.format(
+                                        "%s:%d - only DATA manifest files are currently supported, encountered %s",
+                                        table, snapshot.snapshotId(), manifestFile.content()));
+                    }
+                });
+    }
+
+    /**
+     * Retrieves a {@link List} of manifest files from the given {@link Table} and {@link Snapshot}.
+     *
+     * @param table The {@link Table} to retrieve manifest files for.
+     * @param snapshot The {@link Snapshot} to retrieve manifest files from.
+     *
+     * @return A {@link List} of {@link ManifestFile} objects.
+     * @throws TableDataException if there is an error retrieving the manifest files.
+     */
+    static List<ManifestFile> allManifests(@NotNull final Table table, @NotNull final Snapshot snapshot) {
+        try {
+            return snapshot.allManifests(table.io());
+        } catch (final RuntimeException e) {
+            throw new TableDataException(
+                    String.format("%s:%d - error retrieving manifest files", table, snapshot.snapshotId()), e);
+        }
+    }
+
+    /**
+     * Convert a {@link org.apache.iceberg.io.CloseableIterable} to a {@link Stream} that will close the iterable when
+     * the stream is closed.
+     */
+    public static <T> Stream<T> toStream(final org.apache.iceberg.io.CloseableIterable<T> iterable) {
+        return StreamSupport.stream(iterable.spliterator(), false).onClose(() -> {
+            try {
+                iterable.close();
+            } catch (final IOException e) {
+                throw new UncheckedIOException(e);
+            }
+        });
+    }
+
+    /**
+     * Convert an Iceberg data type to a Deephaven type.
+     *
+     * @param icebergType The Iceberg data type to be converted.
+     * @return The converted Deephaven type.
+     */
+    public static io.deephaven.qst.type.Type<?> convertToDHType(@NotNull final Type icebergType) {
+        final Type.TypeID typeId = icebergType.typeId();
+        switch (typeId) {
+            case BOOLEAN:
+                return io.deephaven.qst.type.Type.booleanType().boxedType();
+            case DOUBLE:
+                return io.deephaven.qst.type.Type.doubleType();
+            case FLOAT:
+                return io.deephaven.qst.type.Type.floatType();
+            case INTEGER:
+                return io.deephaven.qst.type.Type.intType();
+            case LONG:
+                return io.deephaven.qst.type.Type.longType();
+            case STRING:
+                return io.deephaven.qst.type.Type.stringType();
+            case TIMESTAMP:
+                final Types.TimestampType timestampType = (Types.TimestampType) icebergType;
+                if (timestampType == Types.TimestampType.withZone()) {
+                    return io.deephaven.qst.type.Type.find(Instant.class);
+                }
+                return io.deephaven.qst.type.Type.find(LocalDateTime.class);
+            case DATE:
+                return io.deephaven.qst.type.Type.find(LocalDate.class);
+            case TIME:
+                return io.deephaven.qst.type.Type.find(LocalTime.class);
+            case DECIMAL:
+                return io.deephaven.qst.type.Type.find(BigDecimal.class);
+            case FIXED: // Fall through
+            case BINARY:
+                return io.deephaven.qst.type.Type.find(byte[].class);
+            case UUID: // Fall through
+            case STRUCT: // Fall through
+            case LIST: // Fall through
+            case MAP: // Fall through
+            default:
+                throw new TableDataException("Unsupported iceberg column type " + typeId.name());
+        }
+    }
+
+    /**
+     * Convert a Deephaven type to an Iceberg type.
+     *
+     * @param columnType The Deephaven type to be converted.
+     * @return The converted Iceberg type.
+     */
+    public static Type convertToIcebergType(final Class<?> columnType) {
+        final Type icebergType = DH_TO_ICEBERG_TYPE_MAP.get(columnType);
+        if (icebergType != null) {
+            return icebergType;
+        } else {
+            throw new TableDataException("Unsupported deephaven column type " + columnType.getName());
+        }
+    }
+
+    /**
+     * Used to hold a {@link Schema}, {@link PartitionSpec} and {@link IcebergReadInstructions} together.
+     */
+    public static final class SpecAndSchema {
+        public final Schema schema;
+        public final PartitionSpec partitionSpec;
+        public final IcebergReadInstructions readInstructions;
+
+        public SpecAndSchema(
+                @NotNull final Schema schema,
+                @NotNull final PartitionSpec partitionSpec,
+                @Nullable final IcebergReadInstructions readInstructions) {
+            this.schema = schema;
+            this.partitionSpec = partitionSpec;
+            this.readInstructions = readInstructions;
+        }
+    }
+
+    /**
+     * Create {@link PartitionSpec} and {@link Schema} from a {@link TableDefinition}.
+     *
+     * @return A {@link SpecAndSchema} object containing the partition spec and schema, and {@code null} for read
+     *         instructions.
+     */
+    public static SpecAndSchema createSpecAndSchema(@NotNull final TableDefinition tableDefinition) {
+        final Collection<String> partitioningColumnNames = new ArrayList<>();
+        final List<Types.NestedField> fields = new ArrayList<>();
+        int fieldID = 1; // Iceberg field IDs start from 1
+
+        // Create the schema first and use it to build the partition spec
+        for (final ColumnDefinition<?> columnDefinition : tableDefinition.getColumns()) {
+            final String dhColumnName = columnDefinition.getName();
+            final Type icebergType = convertToIcebergType(columnDefinition.getDataType());
+            fields.add(Types.NestedField.optional(fieldID, dhColumnName, icebergType));
+            if (columnDefinition.isPartitioning()) {
+                partitioningColumnNames.add(dhColumnName);
+            }
+            fieldID++;
+        }
+        final Schema schema = new Schema(fields);
+
+        final PartitionSpec partitionSpec = createPartitionSpec(schema, partitioningColumnNames);
+        return new SpecAndSchema(schema, partitionSpec, null);
+    }
+
+    public static PartitionSpec createPartitionSpec(
+            @NotNull final Schema schema,
+            @NotNull final Iterable<String> partitionColumnNames) {
+        final PartitionSpec.Builder partitionSpecBuilder = PartitionSpec.builderFor(schema);
+        for (final String partitioningColumnName : partitionColumnNames) {
+            partitionSpecBuilder.identity(partitioningColumnName);
+        }
+        return partitionSpecBuilder.build();
+    }
+
+    public static boolean createNamespaceIfNotExists(
+            @NotNull final Catalog catalog,
+            @NotNull final Namespace namespace) {
+        if (catalog instanceof SupportsNamespaces) {
+            final SupportsNamespaces nsCatalog = (SupportsNamespaces) catalog;
+            try {
+                nsCatalog.createNamespace(namespace);
+                return true;
+            } catch (final AlreadyExistsException | UnsupportedOperationException e) {
+                return false;
+            }
+        }
+        return false;
+    }
+
+    public static boolean dropNamespaceIfExists(
+            @NotNull final Catalog catalog,
+            @NotNull final Namespace namespace) {
+        if (catalog instanceof SupportsNamespaces) {
+            final SupportsNamespaces nsCatalog = (SupportsNamespaces) catalog;
+            try {
+                return nsCatalog.dropNamespace(namespace);
+            } catch (final NamespaceNotEmptyException e) {
+                return false;
+            }
+        }
+        return false;
+    }
+
+    /**
+     * Check that all required fields are present in the table definition
+     */
+    public static void verifyRequiredFields(final Schema tableSchema, final TableDefinition tableDefinition) {
+        final List<String> columnNames = tableDefinition.getColumnNames();
+        for (final Types.NestedField field : tableSchema.columns()) {
+            if (field.isRequired() && !columnNames.contains(field.name())) {
+                // TODO (deephaven-core#6343): Add check for writeDefault() not set for required fields
+                throw new IllegalArgumentException("Field " + field + " is required in the table schema, but is not " +
+                        "present in the table definition, table schema " + tableSchema + ", tableDefinition " +
+                        tableDefinition);
+            }
+        }
+    }
+
+    /**
+     * Check that all the partitioning columns from the partition spec are present in the Table Definition.
+     */
+    public static void verifyPartitioningColumns(
+            final PartitionSpec tablePartitionSpec,
+            final TableDefinition tableDefinition) {
+        final List<String> partitioningColumnNamesFromDefinition = tableDefinition.getColumnStream()
+                .filter(ColumnDefinition::isPartitioning)
+                .map(ColumnDefinition::getName)
+                .collect(Collectors.toList());
+        final List<PartitionField> partitionFieldsFromSchema = tablePartitionSpec.fields();
+        if (partitionFieldsFromSchema.size() != partitioningColumnNamesFromDefinition.size()) {
+            throw new IllegalArgumentException("Partition spec contains " + partitionFieldsFromSchema.size() +
+                    " fields, but the table definition contains " + partitioningColumnNamesFromDefinition.size()
+                    + " fields, partition spec " + tablePartitionSpec + ", table definition " + tableDefinition);
+        }
+        for (int colIdx = 0; colIdx < partitionFieldsFromSchema.size(); colIdx += 1) {
+            final PartitionField partitionField = partitionFieldsFromSchema.get(colIdx);
+            if (!partitioningColumnNamesFromDefinition.get(colIdx).equals(partitionField.name())) {
+                throw new IllegalArgumentException("Partitioning column " + partitionField.name() + " is not present " +
+                        "in the table definition at idx " + colIdx + ", table definition " + tableDefinition +
+                        ", partition spec " + tablePartitionSpec);
+            }
+        }
+    }
+}
diff --git a/extensions/iceberg/src/main/java/io/deephaven/iceberg/internal/DataInstructionsProviderLoader.java b/extensions/iceberg/src/main/java/io/deephaven/iceberg/internal/DataInstructionsProviderLoader.java
new file mode 100644
index 00000000000..b2c7cefcbf3
--- /dev/null
+++ b/extensions/iceberg/src/main/java/io/deephaven/iceberg/internal/DataInstructionsProviderLoader.java
@@ -0,0 +1,95 @@
+//
+// Copyright (c) 2016-2024 Deephaven Data Labs and Patent Pending
+//
+package io.deephaven.iceberg.internal;
+
+import org.jetbrains.annotations.NotNull;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+import java.util.Objects;
+import java.util.ServiceLoader;
+
+/**
+ * A service loader class for loading {@link DataInstructionsProviderPlugin} implementations at runtime which provide
+ * {@link DataInstructionsProviderLoader} implementations for different URI schemes.
+ */
+public final class DataInstructionsProviderLoader {
+    /**
+     * The list of plugins loaded by the {@link ServiceLoader}.
+     */
+    private static volatile List<DataInstructionsProviderPlugin> cachedProviders;
+
+    /**
+     * Ensure that the {@link DataInstructionsProviderPlugin plugins} are loaded exactly once.
+     */
+    private static List<DataInstructionsProviderPlugin> ensureProviders() {
+        List<DataInstructionsProviderPlugin> localProviders;
+        if ((localProviders = cachedProviders) == null) {
+            synchronized (DataInstructionsProviderLoader.class) {
+                if ((localProviders = cachedProviders) == null) {
+                    localProviders = new ArrayList<>();
+                    // Load the plugins
+                    for (final DataInstructionsProviderPlugin plugin : ServiceLoader
+                            .load(DataInstructionsProviderPlugin.class)) {
+                        localProviders.add(plugin);
+                    }
+                    cachedProviders = localProviders;
+                }
+            }
+        }
+        return localProviders;
+    }
+
+    /**
+     * Create a {@link DataInstructionsProviderLoader} instance for the given property collection with a static list of
+     * {@link DataInstructionsProviderPlugin} provided via {@link ServiceLoader#load(Class)}.
+     *
+     * @param properties The property collection.
+     * @return A {@link DataInstructionsProviderLoader} instance.
+     */
+    public static DataInstructionsProviderLoader create(final Map<String, String> properties) {
+        return new DataInstructionsProviderLoader(properties, ensureProviders());
+    }
+
+    /**
+     * The properties collection for this instance.
+     */
+    private final Map<String, String> properties;
+
+    /**
+     * The local list of plugins loaded by the {@link ServiceLoader}.
+     */
+    private final List<DataInstructionsProviderPlugin> providers;
+
+    /**
+     * Create a new {@link DataInstructionsProviderLoader} instance for the given property collection.
+     *
+     * @param properties The property collection.
+     */
+    private DataInstructionsProviderLoader(
+            final Map<String, String> properties,
+            final List<DataInstructionsProviderPlugin> providers) {
+        this.properties = Objects.requireNonNull(properties);
+        this.providers = Objects.requireNonNull(providers);
+    }
+
+    /**
+     * Create a new data instructions object compatible with reading from and writing to the given URI scheme. For
+     * example, for an "S3" URI scheme will create an {@code S3Instructions} object which can read files from S3.
+     *
+     * @param uriScheme The URI scheme
+     * @return A data instructions object for the given URI scheme or null if one cannot be found
+     */
+    public Object load(@NotNull final String uriScheme) {
+        for (final DataInstructionsProviderPlugin plugin : providers) {
+            final Object pluginInstructions = plugin.createInstructions(uriScheme, properties);
+            if (pluginInstructions != null) {
+                return pluginInstructions;
+            }
+        }
+        // No plugin found for this URI scheme and property collection.
+        return null;
+    }
+}
diff --git a/extensions/iceberg/src/main/java/io/deephaven/iceberg/internal/DataInstructionsProviderPlugin.java b/extensions/iceberg/src/main/java/io/deephaven/iceberg/internal/DataInstructionsProviderPlugin.java
new file mode 100644
index 00000000000..632312d6605
--- /dev/null
+++ b/extensions/iceberg/src/main/java/io/deephaven/iceberg/internal/DataInstructionsProviderPlugin.java
@@ -0,0 +1,19 @@
+//
+// Copyright (c) 2016-2024 Deephaven Data Labs and Patent Pending
+//
+package io.deephaven.iceberg.internal;
+
+import org.jetbrains.annotations.NotNull;
+
+import java.util.Map;
+
+/**
+ * A plugin interface for providing {@link DataInstructionsProviderPlugin} implementations for different property
+ * collections and URI schemes. Check out {@link DataInstructionsProviderLoader} for more details.
+ */
+public interface DataInstructionsProviderPlugin {
+    /**
+     * Create a data instructions object for the given URI scheme.
+     */
+    Object createInstructions(@NotNull String uriScheme, @NotNull Map<String, String> properties);
+}
diff --git a/extensions/iceberg/src/main/java/io/deephaven/iceberg/layout/IcebergAutoRefreshTableLocationProvider.java b/extensions/iceberg/src/main/java/io/deephaven/iceberg/layout/IcebergAutoRefreshTableLocationProvider.java
new file mode 100644
index 00000000000..25c413a7183
--- /dev/null
+++ b/extensions/iceberg/src/main/java/io/deephaven/iceberg/layout/IcebergAutoRefreshTableLocationProvider.java
@@ -0,0 +1,122 @@
+//
+// Copyright (c) 2016-2024 Deephaven Data Labs and Patent Pending
+//
+package io.deephaven.iceberg.layout;
+
+import io.deephaven.base.verify.Assert;
+import io.deephaven.engine.table.impl.TableUpdateMode;
+import io.deephaven.engine.table.impl.locations.*;
+import io.deephaven.engine.table.impl.locations.impl.TableLocationFactory;
+import io.deephaven.engine.table.impl.locations.impl.TableLocationKeyFinder;
+import io.deephaven.engine.table.impl.locations.util.TableDataRefreshService;
+import io.deephaven.iceberg.util.IcebergTableAdapter;
+import org.apache.iceberg.Snapshot;
+import org.apache.iceberg.catalog.TableIdentifier;
+import org.jetbrains.annotations.NotNull;
+
+/**
+ * <p>
+ * Automatically refreshing {@link TableLocationProvider} implementation that delegates {@link TableLocationKey location
+ * key} discovery to a {@link TableLocationKeyFinder} and {@link TableLocation location} creation to a
+ * {@link TableLocationFactory}.
+ * </p>
+ */
+public class IcebergAutoRefreshTableLocationProvider<TK extends TableKey, TLK extends TableLocationKey>
+        extends IcebergTableLocationProviderBase<TK, TLK> {
+
+    private static final String IMPLEMENTATION_NAME = IcebergAutoRefreshTableLocationProvider.class.getSimpleName();
+
+    private final TableDataRefreshService refreshService;
+    private final long refreshIntervalMs;
+
+    private TableDataRefreshService.CancellableSubscriptionToken subscriptionToken;
+
+    public IcebergAutoRefreshTableLocationProvider(
+            @NotNull final TK tableKey,
+            @NotNull final IcebergBaseLayout locationKeyFinder,
+            @NotNull final TableLocationFactory<TK, TLK> locationFactory,
+            @NotNull final TableDataRefreshService refreshService,
+            final long refreshIntervalMs,
+            @NotNull final IcebergTableAdapter adapter,
+            @NotNull final TableIdentifier tableIdentifier) {
+        super(tableKey,
+                locationKeyFinder,
+                locationFactory,
+                true,
+                adapter,
+                tableIdentifier,
+                TableUpdateMode.ADD_REMOVE, // New locations can be added and removed
+                TableUpdateMode.STATIC // Individual locations cannot add or remove rows
+        );
+
+        Assert.neqNull(refreshService, "refreshService");
+        this.refreshService = refreshService;
+        this.refreshIntervalMs = refreshIntervalMs;
+    }
+
+    // ------------------------------------------------------------------------------------------------------------------
+    // AbstractTableLocationProvider implementation
+    // ------------------------------------------------------------------------------------------------------------------
+
+    @Override
+    public String getImplementationName() {
+        return IMPLEMENTATION_NAME;
+    }
+
+    @Override
+    protected synchronized void doInitialization() {
+        if (!isInitialized()) {
+            refreshLocations();
+        }
+    }
+
+    @Override
+    public synchronized void refresh() {
+        if (locationKeyFinder.maybeUpdateSnapshot()) {
+            refreshLocations();
+        }
+    }
+
+    @Override
+    public void update() {
+        throw new UnsupportedOperationException("Automatically refreshing Iceberg tables cannot be manually updated");
+    }
+
+    @Override
+    public void update(long snapshotId) {
+        throw new UnsupportedOperationException("Automatically refreshing Iceberg tables cannot be manually updated");
+    }
+
+    @Override
+    public void update(Snapshot snapshot) {
+        throw new UnsupportedOperationException("Automatically refreshing Iceberg tables cannot be manually updated");
+    }
+
+    // ------------------------------------------------------------------------------------------------------------------
+    // SubscriptionAggregator implementation
+    // ------------------------------------------------------------------------------------------------------------------
+
+    @Override
+    protected final void activateUnderlyingDataSource() {
+        synchronized (this) {
+            if (locationKeyFinder.maybeUpdateSnapshot() || !isInitialized()) {
+                refreshLocations();
+            }
+        }
+        subscriptionToken = refreshService.scheduleTableLocationProviderRefresh(this, refreshIntervalMs);
+        activationSuccessful(this);
+    }
+
+    @Override
+    protected final void deactivateUnderlyingDataSource() {
+        if (subscriptionToken != null) {
+            subscriptionToken.cancel();
+            subscriptionToken = null;
+        }
+    }
+
+    @Override
+    protected <T> boolean matchSubscriptionToken(final T token) {
+        return token == subscriptionToken;
+    }
+}
diff --git a/extensions/iceberg/src/main/java/io/deephaven/iceberg/layout/IcebergBaseLayout.java b/extensions/iceberg/src/main/java/io/deephaven/iceberg/layout/IcebergBaseLayout.java
index f5334cf866c..d711119641b 100644
--- a/extensions/iceberg/src/main/java/io/deephaven/iceberg/layout/IcebergBaseLayout.java
+++ b/extensions/iceberg/src/main/java/io/deephaven/iceberg/layout/IcebergBaseLayout.java
@@ -7,139 +7,249 @@
 import io.deephaven.engine.table.TableDefinition;
 import io.deephaven.engine.table.impl.locations.TableDataException;
 import io.deephaven.engine.table.impl.locations.impl.TableLocationKeyFinder;
+import io.deephaven.iceberg.base.IcebergUtils;
 import io.deephaven.iceberg.location.IcebergTableLocationKey;
 import io.deephaven.iceberg.location.IcebergTableParquetLocationKey;
-import io.deephaven.iceberg.util.IcebergInstructions;
+import io.deephaven.iceberg.relative.RelativeFileIO;
+import io.deephaven.iceberg.util.IcebergReadInstructions;
+import io.deephaven.iceberg.util.IcebergTableAdapter;
 import io.deephaven.parquet.table.ParquetInstructions;
+import io.deephaven.iceberg.internal.DataInstructionsProviderLoader;
+import io.deephaven.util.channel.SeekableChannelsProvider;
+import io.deephaven.util.channel.SeekableChannelsProviderLoader;
 import org.apache.iceberg.*;
+import org.apache.iceberg.catalog.Catalog;
+import org.apache.iceberg.catalog.TableIdentifier;
 import org.apache.iceberg.io.FileIO;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
 import java.net.URI;
-import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
+import java.util.Objects;
+import java.util.UUID;
 import java.util.function.Consumer;
+import java.util.stream.Stream;
+
+import static io.deephaven.iceberg.base.IcebergUtils.allManifestFiles;
 
 public abstract class IcebergBaseLayout implements TableLocationKeyFinder<IcebergTableLocationKey> {
     /**
-     * The {@link TableDefinition} that will be used for the table.
+     * The {@link IcebergTableAdapter} that will be used to access the table.
      */
-    final TableDefinition tableDef;
+    final IcebergTableAdapter tableAdapter;
 
     /**
-     * The Iceberg {@link Table} to discover locations for.
+     * The UUID of the table, if available.
      */
-    final Table table;
+    @Nullable
+    private final UUID tableUuid;
 
     /**
-     * The {@link Snapshot} to discover locations for.
+     * Name of the {@link Catalog} used to access this table, if available.
      */
-    final Snapshot snapshot;
+    @Nullable
+    private final String catalogName;
 
     /**
-     * The {@link FileIO} to use for passing to the catalog reading manifest data files.
+     * The table identifier used to access this table.
+     */
+    private final TableIdentifier tableIdentifier;
+    /**
+     * The {@link TableDefinition} that will be used for life of this table. Although Iceberg table schema may change,
+     * schema changes are not supported in Deephaven.
      */
-    final FileIO fileIO;
+    final TableDefinition tableDef;
 
     /**
-     * The instructions for customizations while reading.
+     * The URI scheme from the Table {@link Table#location() location}.
      */
-    final IcebergInstructions instructions;
+    private final String uriScheme;
 
     /**
-     * A cache of {@link IcebergTableLocationKey IcebergTableLocationKeys} keyed by the URI of the file they represent.
+     * The {@link Snapshot} from which to discover data files.
      */
-    final Map<URI, IcebergTableLocationKey> cache;
+    Snapshot snapshot;
 
     /**
-     * The {@link ParquetInstructions} object that will be used to read any Parquet data files in this table. Only
-     * accessed while synchronized on {@code this}.
+     * The {@link ParquetInstructions} object that will be used to read any Parquet data files in this table.
      */
-    ParquetInstructions parquetInstructions;
+    private final ParquetInstructions parquetInstructions;
 
+    /**
+     * The {@link SeekableChannelsProvider} object that will be used for {@link IcebergTableParquetLocationKey}
+     * creation.
+     */
+    private final SeekableChannelsProvider channelsProvider;
+
+
+    /**
+     * Create a new {@link IcebergTableLocationKey} for the given {@link ManifestFile}, {@link DataFile} and
+     * {@link URI}.
+     *
+     * @param manifestFile The manifest file from which the data file was discovered
+     * @param dataFile The data file that backs the keyed location
+     * @param fileUri The {@link URI} for the file that backs the keyed location
+     * @param partitions The table partitions enclosing the table location keyed by the returned key. If {@code null},
+     *        the location will be a member of no partitions.
+     *
+     * @return A new {@link IcebergTableLocationKey}
+     */
     protected IcebergTableLocationKey locationKey(
-            final org.apache.iceberg.FileFormat format,
-            final URI fileUri,
+            @NotNull final ManifestFile manifestFile,
+            @NotNull final DataFile dataFile,
+            @NotNull final URI fileUri,
             @Nullable final Map<String, Comparable<?>> partitions) {
-
+        final org.apache.iceberg.FileFormat format = dataFile.format();
         if (format == org.apache.iceberg.FileFormat.PARQUET) {
-            if (parquetInstructions == null) {
-                // Start with user-supplied instructions (if provided).
-                final ParquetInstructions.Builder builder = new ParquetInstructions.Builder();
-
-                // Add the table definition.
-                builder.setTableDefinition(tableDef);
-
-                // Add any column rename mappings.
-                if (!instructions.columnRenames().isEmpty()) {
-                    for (Map.Entry<String, String> entry : instructions.columnRenames().entrySet()) {
-                        builder.addColumnNameMapping(entry.getKey(), entry.getValue());
-                    }
-                }
-
-                // Add the data instructions.
-                instructions.dataInstructions().ifPresent(builder::setSpecialInstructions);
-
-                parquetInstructions = builder.build();
-            }
-            return new IcebergTableParquetLocationKey(fileUri, 0, partitions, parquetInstructions);
+            return new IcebergTableParquetLocationKey(catalogName, tableUuid, tableIdentifier, manifestFile, dataFile,
+                    fileUri, 0, partitions, parquetInstructions, channelsProvider);
         }
         throw new UnsupportedOperationException(String.format("%s:%d - an unsupported file format %s for URI '%s'",
-                table, snapshot.snapshotId(), format, fileUri));
+                tableAdapter, snapshot.snapshotId(), format, fileUri));
     }
 
     /**
-     * @param tableDef The {@link TableDefinition} that will be used for the table.
-     * @param table The {@link Table} to discover locations for.
-     * @param tableSnapshot The {@link Snapshot} from which to discover data files.
-     * @param fileIO The file IO to use for reading manifest data files.
+     * @param tableAdapter The {@link IcebergTableAdapter} that will be used to access the table.
      * @param instructions The instructions for customizations while reading.
      */
     public IcebergBaseLayout(
-            @NotNull final TableDefinition tableDef,
-            @NotNull final Table table,
-            @NotNull final Snapshot tableSnapshot,
-            @NotNull final FileIO fileIO,
-            @NotNull final IcebergInstructions instructions) {
-        this.tableDef = tableDef;
-        this.table = table;
-        this.snapshot = tableSnapshot;
-        this.fileIO = fileIO;
-        this.instructions = instructions;
-
-        this.cache = new HashMap<>();
+            @NotNull final IcebergTableAdapter tableAdapter,
+            @NotNull final IcebergReadInstructions instructions,
+            @NotNull final DataInstructionsProviderLoader dataInstructionsProvider) {
+        this.tableAdapter = tableAdapter;
+        {
+            UUID uuid;
+            try {
+                uuid = tableAdapter.icebergTable().uuid();
+            } catch (final RuntimeException e) {
+                // The UUID method is unsupported for v1 Iceberg tables since uuid is optional for v1 tables.
+                uuid = null;
+            }
+            this.tableUuid = uuid;
+        }
+
+        this.catalogName = tableAdapter.catalog().name();
+        this.tableIdentifier = tableAdapter.tableIdentifier();
+
+        this.snapshot = tableAdapter.getSnapshot(instructions);
+        this.tableDef = tableAdapter.definition(instructions);
+        this.uriScheme = locationUri(tableAdapter.icebergTable()).getScheme();
+        // Add the data instructions if provided as part of the IcebergReadInstructions, or else attempt to create
+        // data instructions from the properties collection and URI scheme.
+        final Object specialInstructions = instructions.dataInstructions()
+                .orElseGet(() -> dataInstructionsProvider.load(uriScheme));
+        {
+            // Start with user-supplied instructions (if provided).
+            final ParquetInstructions.Builder builder = new ParquetInstructions.Builder();
+
+            // Add the table definition.
+            builder.setTableDefinition(tableDef);
+
+            // Add any column rename mappings.
+            if (!instructions.columnRenames().isEmpty()) {
+                for (Map.Entry<String, String> entry : instructions.columnRenames().entrySet()) {
+                    builder.addColumnNameMapping(entry.getKey(), entry.getValue());
+                }
+            }
+            if (specialInstructions != null) {
+                builder.setSpecialInstructions(specialInstructions);
+            }
+            this.parquetInstructions = builder.build();
+        }
+        this.channelsProvider = SeekableChannelsProviderLoader.getInstance().load(uriScheme, specialInstructions);
+    }
+
+    abstract IcebergTableLocationKey keyFromDataFile(ManifestFile manifestFile, DataFile dataFile, URI fileUri);
+
+    private static String path(String path, FileIO io) {
+        return io instanceof RelativeFileIO ? ((RelativeFileIO) io).absoluteLocation(path) : path;
     }
 
-    abstract IcebergTableLocationKey keyFromDataFile(DataFile df, URI fileUri);
+    private static URI locationUri(Table table) {
+        return FileUtils.convertToURI(path(table.location(), table.io()), true);
+    }
+
+    private static URI dataFileUri(Table table, DataFile dataFile) {
+        return FileUtils.convertToURI(path(dataFile.path().toString(), table.io()), false);
+    }
 
     @Override
     public synchronized void findKeys(@NotNull final Consumer<IcebergTableLocationKey> locationKeyObserver) {
-        try {
-            // Retrieve the manifest files from the snapshot
-            final List<ManifestFile> manifestFiles = snapshot.allManifests(fileIO);
-            for (final ManifestFile manifestFile : manifestFiles) {
-                // Currently only can process manifest files with DATA content type.
-                if (manifestFile.content() != ManifestContent.DATA) {
-                    throw new TableDataException(
-                            String.format("%s:%d - only DATA manifest files are currently supported, encountered %s",
-                                    table, snapshot.snapshotId(), manifestFile.content()));
-                }
-                try (final ManifestReader<DataFile> reader = ManifestFiles.read(manifestFile, fileIO)) {
-                    for (DataFile df : reader) {
-                        final URI fileUri = FileUtils.convertToURI(df.path().toString(), false);
-                        final IcebergTableLocationKey locationKey =
-                                cache.computeIfAbsent(fileUri, uri -> keyFromDataFile(df, fileUri));
-                        if (locationKey != null) {
-                            locationKeyObserver.accept(locationKey);
-                        }
-                    }
-                }
-            }
-        } catch (final Exception e) {
+        if (snapshot == null) {
+            return;
+        }
+        final Table table = tableAdapter.icebergTable();
+        try (final Stream<ManifestFile> manifestFiles = allManifestFiles(table, snapshot)) {
+            manifestFiles.forEach(manifestFile -> {
+                final ManifestReader<DataFile> reader = ManifestFiles.read(manifestFile, table.io());
+                IcebergUtils.toStream(reader)
+                        .map(dataFile -> {
+                            final URI fileUri = dataFileUri(table, dataFile);
+                            if (!uriScheme.equals(fileUri.getScheme())) {
+                                throw new TableDataException(String.format(
+                                        "%s:%d - multiple URI schemes are not currently supported. uriScheme=%s, " +
+                                                "fileUri=%s",
+                                        table, snapshot.snapshotId(), uriScheme, fileUri));
+                            }
+                            return keyFromDataFile(manifestFile, dataFile, fileUri);
+                        })
+                        .forEach(locationKeyObserver);
+            });
+        } catch (final RuntimeException e) {
             throw new TableDataException(
-                    String.format("%s:%d - error finding Iceberg locations", table, snapshot.snapshotId()), e);
+                    String.format("%s:%d - error finding Iceberg locations", tableAdapter, snapshot.snapshotId()), e);
+        }
+    }
+
+    /**
+     * Update the snapshot to the latest snapshot from the catalog if
+     */
+    protected synchronized boolean maybeUpdateSnapshot() {
+        final Snapshot latestSnapshot = tableAdapter.currentSnapshot();
+        if (latestSnapshot == null) {
+            return false;
+        }
+        if (snapshot == null || latestSnapshot.sequenceNumber() > snapshot.sequenceNumber()) {
+            snapshot = latestSnapshot;
+            return true;
         }
+        return false;
+    }
+
+    /**
+     * Update the snapshot to the user specified snapshot. See
+     * {@link io.deephaven.iceberg.util.IcebergTable#update(long)} for more details.
+     */
+    protected void updateSnapshot(long snapshotId) {
+        final List<Snapshot> snapshots = tableAdapter.listSnapshots();
+
+        final Snapshot snapshot = snapshots.stream()
+                .filter(s -> s.snapshotId() == snapshotId).findFirst()
+                .orElse(null);
+
+        if (snapshot == null) {
+            throw new IllegalArgumentException(
+                    "Snapshot " + snapshotId + " was not found in the list of snapshots for table " + tableAdapter
+                            + ". Snapshots: " + snapshots);
+        }
+        updateSnapshot(snapshot);
+    }
+
+    /**
+     * Update the snapshot to the user specified snapshot. See
+     * {@link io.deephaven.iceberg.util.IcebergTable#update(Snapshot)} for more details.
+     */
+    protected void updateSnapshot(@NotNull final Snapshot updateSnapshot) {
+        // Validate that we are not trying to update to an older snapshot.
+        if (snapshot != null && updateSnapshot.sequenceNumber() <= snapshot.sequenceNumber()) {
+            throw new IllegalArgumentException(
+                    "Update snapshot sequence number (" + updateSnapshot.sequenceNumber()
+                            + ") must be higher than the current snapshot sequence number ("
+                            + snapshot.sequenceNumber() + ") for table " + tableAdapter);
+        }
+
+        snapshot = updateSnapshot;
     }
 }
diff --git a/extensions/iceberg/src/main/java/io/deephaven/iceberg/layout/IcebergFlatLayout.java b/extensions/iceberg/src/main/java/io/deephaven/iceberg/layout/IcebergFlatLayout.java
index ac4c19283f9..f1d527f5cb8 100644
--- a/extensions/iceberg/src/main/java/io/deephaven/iceberg/layout/IcebergFlatLayout.java
+++ b/extensions/iceberg/src/main/java/io/deephaven/iceberg/layout/IcebergFlatLayout.java
@@ -3,12 +3,12 @@
 //
 package io.deephaven.iceberg.layout;
 
-import io.deephaven.engine.table.TableDefinition;
 import io.deephaven.engine.table.impl.locations.impl.TableLocationKeyFinder;
 import io.deephaven.iceberg.location.IcebergTableLocationKey;
-import io.deephaven.iceberg.util.IcebergInstructions;
+import io.deephaven.iceberg.util.IcebergReadInstructions;
+import io.deephaven.iceberg.internal.DataInstructionsProviderLoader;
+import io.deephaven.iceberg.util.IcebergTableAdapter;
 import org.apache.iceberg.*;
-import org.apache.iceberg.io.FileIO;
 import org.jetbrains.annotations.NotNull;
 
 import java.net.URI;
@@ -19,28 +19,26 @@
  */
 public final class IcebergFlatLayout extends IcebergBaseLayout {
     /**
-     * @param tableDef The {@link TableDefinition} that will be used for the table.
-     * @param table The {@link Table} to discover locations for.
-     * @param tableSnapshot The {@link Snapshot} from which to discover data files.
-     * @param fileIO The file IO to use for reading manifest data files.
+     * @param tableAdapter The {@link IcebergTableAdapter} that will be used to access the table.
      * @param instructions The instructions for customizations while reading.
      */
     public IcebergFlatLayout(
-            @NotNull final TableDefinition tableDef,
-            @NotNull final Table table,
-            @NotNull final Snapshot tableSnapshot,
-            @NotNull final FileIO fileIO,
-            @NotNull final IcebergInstructions instructions) {
-        super(tableDef, table, tableSnapshot, fileIO, instructions);
+            @NotNull final IcebergTableAdapter tableAdapter,
+            @NotNull final IcebergReadInstructions instructions,
+            @NotNull final DataInstructionsProviderLoader dataInstructionsProvider) {
+        super(tableAdapter, instructions, dataInstructionsProvider);
     }
 
     @Override
     public String toString() {
-        return IcebergFlatLayout.class.getSimpleName() + '[' + table.name() + ']';
+        return IcebergFlatLayout.class.getSimpleName() + '[' + tableAdapter + ']';
     }
 
     @Override
-    IcebergTableLocationKey keyFromDataFile(DataFile df, URI fileUri) {
-        return locationKey(df.format(), fileUri, null);
+    IcebergTableLocationKey keyFromDataFile(
+            @NotNull final ManifestFile manifestFile,
+            @NotNull final DataFile dataFile,
+            @NotNull final URI fileUri) {
+        return locationKey(manifestFile, dataFile, fileUri, null);
     }
 }
diff --git a/extensions/iceberg/src/main/java/io/deephaven/iceberg/layout/IcebergKeyValuePartitionedLayout.java b/extensions/iceberg/src/main/java/io/deephaven/iceberg/layout/IcebergKeyValuePartitionedLayout.java
index 47ec05dfd74..288d27b064b 100644
--- a/extensions/iceberg/src/main/java/io/deephaven/iceberg/layout/IcebergKeyValuePartitionedLayout.java
+++ b/extensions/iceberg/src/main/java/io/deephaven/iceberg/layout/IcebergKeyValuePartitionedLayout.java
@@ -4,101 +4,105 @@
 package io.deephaven.iceberg.layout;
 
 import io.deephaven.engine.table.ColumnDefinition;
-import io.deephaven.engine.table.TableDefinition;
 import io.deephaven.engine.table.impl.locations.TableDataException;
 import io.deephaven.engine.table.impl.locations.impl.TableLocationKeyFinder;
 import io.deephaven.iceberg.location.IcebergTableLocationKey;
-import io.deephaven.iceberg.util.IcebergInstructions;
+import io.deephaven.iceberg.util.IcebergReadInstructions;
+import io.deephaven.iceberg.util.IcebergTableAdapter;
+import io.deephaven.iceberg.internal.DataInstructionsProviderLoader;
 import io.deephaven.util.type.TypeUtils;
-import org.apache.commons.lang3.mutable.MutableInt;
 import org.apache.iceberg.*;
-import org.apache.iceberg.io.FileIO;
+import org.apache.iceberg.data.IdentityPartitionConverters;
 import org.jetbrains.annotations.NotNull;
 
 import java.net.URI;
 import java.util.*;
-import java.util.stream.Collectors;
 
 /**
  * Iceberg {@link TableLocationKeyFinder location finder} for tables with partitions that will discover data files from
  * a {@link Snapshot}
  */
 public final class IcebergKeyValuePartitionedLayout extends IcebergBaseLayout {
-    private class ColumnData {
+    private static class IdentityPartitioningColData {
         final String name;
         final Class<?> type;
-        final int index;
+        final int index; // position in the partition spec
 
-        public ColumnData(String name, Class<?> type, int index) {
+        private IdentityPartitioningColData(String name, Class<?> type, int index) {
             this.name = name;
             this.type = type;
             this.index = index;
         }
     }
 
-    private final List<ColumnData> outputPartitioningColumns;
+    private final List<IdentityPartitioningColData> identityPartitioningColumns;
 
     /**
-     * @param tableDef The {@link TableDefinition} that will be used for the table.
-     * @param table The {@link Table} to discover locations for.
-     * @param tableSnapshot The {@link Snapshot} from which to discover data files.
-     * @param fileIO The file IO to use for reading manifest data files.
+     * @param tableAdapter The {@link IcebergTableAdapter} that will be used to access the table.
      * @param partitionSpec The Iceberg {@link PartitionSpec partition spec} for the table.
      * @param instructions The instructions for customizations while reading.
      */
     public IcebergKeyValuePartitionedLayout(
-            @NotNull final TableDefinition tableDef,
-            @NotNull final org.apache.iceberg.Table table,
-            @NotNull final org.apache.iceberg.Snapshot tableSnapshot,
-            @NotNull final FileIO fileIO,
+            @NotNull final IcebergTableAdapter tableAdapter,
             @NotNull final PartitionSpec partitionSpec,
-            @NotNull final IcebergInstructions instructions) {
-        super(tableDef, table, tableSnapshot, fileIO, instructions);
+            @NotNull final IcebergReadInstructions instructions,
+            @NotNull final DataInstructionsProviderLoader dataInstructionsProvider) {
+        super(tableAdapter, instructions, dataInstructionsProvider);
 
         // We can assume due to upstream validation that there are no duplicate names (after renaming) that are included
         // in the output definition, so we can ignore duplicates.
-        final MutableInt icebergIndex = new MutableInt(0);
-        final Map<String, Integer> availablePartitioningColumns = partitionSpec.fields().stream()
-                .map(PartitionField::name)
-                .map(name -> instructions.columnRenames().getOrDefault(name, name))
-                .collect(Collectors.toMap(
-                        name -> name,
-                        name -> icebergIndex.getAndIncrement(),
-                        (v1, v2) -> v1,
-                        LinkedHashMap::new));
+        final List<PartitionField> partitionFields = partitionSpec.fields();
+        final int numPartitionFields = partitionFields.size();
+        identityPartitioningColumns = new ArrayList<>(numPartitionFields);
+        for (int fieldId = 0; fieldId < numPartitionFields; ++fieldId) {
+            final PartitionField partitionField = partitionFields.get(fieldId);
+            if (!partitionField.transform().isIdentity()) {
+                // TODO (DH-18160): Improve support for handling non-identity transforms
+                continue;
+            }
+            final String icebergColName = partitionField.name();
+            final String dhColName = instructions.columnRenames().getOrDefault(icebergColName, icebergColName);
+            final ColumnDefinition<?> columnDef = tableDef.getColumn(dhColName);
+            if (columnDef == null) {
+                // Table definition provided by the user doesn't have this column, so skip.
+                continue;
+            }
+            identityPartitioningColumns.add(new IdentityPartitioningColData(dhColName,
+                    TypeUtils.getBoxedType(columnDef.getDataType()), fieldId));
 
-        outputPartitioningColumns = tableDef.getColumnStream()
-                .map((final ColumnDefinition<?> columnDef) -> {
-                    final Integer index = availablePartitioningColumns.get(columnDef.getName());
-                    if (index == null) {
-                        return null;
-                    }
-                    return new ColumnData(columnDef.getName(), TypeUtils.getBoxedType(columnDef.getDataType()), index);
-                })
-                .filter(Objects::nonNull)
-                .collect(Collectors.toList());
+        }
     }
 
     @Override
     public String toString() {
-        return IcebergKeyValuePartitionedLayout.class.getSimpleName() + '[' + table.name() + ']';
+        return IcebergKeyValuePartitionedLayout.class.getSimpleName() + '[' + tableAdapter + ']';
     }
 
     @Override
-    IcebergTableLocationKey keyFromDataFile(DataFile df, URI fileUri) {
+    IcebergTableLocationKey keyFromDataFile(
+            @NotNull final ManifestFile manifestFile,
+            @NotNull final DataFile dataFile,
+            @NotNull final URI fileUri) {
         final Map<String, Comparable<?>> partitions = new LinkedHashMap<>();
 
-        final PartitionData partitionData = (PartitionData) df.partition();
-        for (final ColumnData colData : outputPartitioningColumns) {
+        final PartitionData partitionData = (PartitionData) dataFile.partition();
+        for (final IdentityPartitioningColData colData : identityPartitioningColumns) {
             final String colName = colData.name;
-            final Object colValue = partitionData.get(colData.index);
-            if (colValue != null && !colData.type.isAssignableFrom(colValue.getClass())) {
-                throw new TableDataException("Partitioning column " + colName
-                        + " has type " + colValue.getClass().getName()
-                        + " but expected " + colData.type.getName());
+            final Object colValue;
+            final Object valueFromPartitionData = partitionData.get(colData.index);
+            if (valueFromPartitionData != null) {
+                colValue = IdentityPartitionConverters.convertConstant(
+                        partitionData.getType(colData.index), valueFromPartitionData);
+                if (!colData.type.isAssignableFrom(colValue.getClass())) {
+                    throw new TableDataException("Partitioning column " + colName
+                            + " has type " + colValue.getClass().getName()
+                            + " but expected " + colData.type.getName());
+                }
+            } else {
+                colValue = null;
             }
             partitions.put(colName, (Comparable<?>) colValue);
         }
-        return locationKey(df.format(), fileUri, partitions);
+        return locationKey(manifestFile, dataFile, fileUri, partitions);
     }
 }
diff --git a/extensions/iceberg/src/main/java/io/deephaven/iceberg/layout/IcebergManualRefreshTableLocationProvider.java b/extensions/iceberg/src/main/java/io/deephaven/iceberg/layout/IcebergManualRefreshTableLocationProvider.java
new file mode 100644
index 00000000000..45d65f921ea
--- /dev/null
+++ b/extensions/iceberg/src/main/java/io/deephaven/iceberg/layout/IcebergManualRefreshTableLocationProvider.java
@@ -0,0 +1,108 @@
+//
+// Copyright (c) 2016-2024 Deephaven Data Labs and Patent Pending
+//
+package io.deephaven.iceberg.layout;
+
+import io.deephaven.engine.table.impl.TableUpdateMode;
+import io.deephaven.engine.table.impl.locations.*;
+import io.deephaven.engine.table.impl.locations.impl.TableLocationFactory;
+import io.deephaven.engine.table.impl.locations.impl.TableLocationKeyFinder;
+import io.deephaven.iceberg.util.IcebergTableAdapter;
+import org.apache.iceberg.Snapshot;
+import org.apache.iceberg.catalog.TableIdentifier;
+import org.jetbrains.annotations.NotNull;
+
+/**
+ * <p>
+ * Manually refreshing {@link TableLocationProvider} implementation that delegates {@link TableLocationKey location key}
+ * discovery to a {@link TableLocationKeyFinder} and {@link TableLocation location} creation to a
+ * {@link TableLocationFactory}.
+ * </p>
+ */
+public class IcebergManualRefreshTableLocationProvider<TK extends TableKey, TLK extends TableLocationKey>
+        extends IcebergTableLocationProviderBase<TK, TLK> {
+
+    private static final String IMPLEMENTATION_NAME = IcebergManualRefreshTableLocationProvider.class.getSimpleName();
+
+    public IcebergManualRefreshTableLocationProvider(
+            @NotNull final TK tableKey,
+            @NotNull final IcebergBaseLayout locationKeyFinder,
+            @NotNull final TableLocationFactory<TK, TLK> locationFactory,
+            @NotNull final IcebergTableAdapter adapter,
+            @NotNull final TableIdentifier tableIdentifier) {
+        super(tableKey,
+                locationKeyFinder,
+                locationFactory,
+                true,
+                adapter,
+                tableIdentifier,
+                TableUpdateMode.ADD_REMOVE, // New locations can be added and removed
+                TableUpdateMode.STATIC // Individual locations cannot add or remove rows
+        );
+    }
+
+    // ------------------------------------------------------------------------------------------------------------------
+    // AbstractTableLocationProvider implementation
+    // ------------------------------------------------------------------------------------------------------------------
+
+    @Override
+    public String getImplementationName() {
+        return IMPLEMENTATION_NAME;
+    }
+
+    @Override
+    public void refresh() {
+        ensureInitialized();
+    }
+
+    @Override
+    public synchronized void update() {
+        if (locationKeyFinder.maybeUpdateSnapshot()) {
+            refreshLocations();
+        }
+    }
+
+    @Override
+    public synchronized void update(final long snapshotId) {
+        // delegate to the locationKeyFinder to update the snapshot
+        locationKeyFinder.updateSnapshot(snapshotId);
+        refreshLocations();
+    }
+
+    @Override
+    public synchronized void update(final Snapshot snapshot) {
+        if (snapshot == null) {
+            throw new IllegalArgumentException("Input snapshot cannot be null");
+        }
+        // Update the snapshot.
+        locationKeyFinder.updateSnapshot(snapshot);
+        refreshLocations();
+    }
+
+    @Override
+    protected synchronized void doInitialization() {
+        if (!isInitialized()) {
+            refreshLocations();
+        }
+    }
+
+    // ------------------------------------------------------------------------------------------------------------------
+    // SubscriptionAggregator implementation
+    // ------------------------------------------------------------------------------------------------------------------
+
+    @Override
+    protected void activateUnderlyingDataSource() {
+        ensureInitialized();
+        activationSuccessful(this);
+    }
+
+    @Override
+    protected void deactivateUnderlyingDataSource() {
+        // NOP for manually refreshing Iceberg table location provider.
+    }
+
+    @Override
+    protected <T> boolean matchSubscriptionToken(T token) {
+        return token == this;
+    }
+}
diff --git a/extensions/iceberg/src/main/java/io/deephaven/iceberg/layout/IcebergStaticTableLocationProvider.java b/extensions/iceberg/src/main/java/io/deephaven/iceberg/layout/IcebergStaticTableLocationProvider.java
new file mode 100644
index 00000000000..a07806eb9fe
--- /dev/null
+++ b/extensions/iceberg/src/main/java/io/deephaven/iceberg/layout/IcebergStaticTableLocationProvider.java
@@ -0,0 +1,79 @@
+//
+// Copyright (c) 2016-2024 Deephaven Data Labs and Patent Pending
+//
+package io.deephaven.iceberg.layout;
+
+import io.deephaven.engine.table.impl.TableUpdateMode;
+import io.deephaven.engine.table.impl.locations.*;
+import io.deephaven.engine.table.impl.locations.impl.TableLocationFactory;
+import io.deephaven.engine.table.impl.locations.impl.TableLocationKeyFinder;
+import org.apache.iceberg.Snapshot;
+import org.apache.iceberg.catalog.TableIdentifier;
+import org.jetbrains.annotations.NotNull;
+
+/**
+ * <p>
+ * Static {@link TableLocationProvider} implementation that delegates {@link TableLocationKey location key} discovery to
+ * a {@link TableLocationKeyFinder} and {@link TableLocation location} creation to a {@link TableLocationFactory}.
+ * </p>
+ */
+public class IcebergStaticTableLocationProvider<TK extends TableKey, TLK extends TableLocationKey>
+        extends IcebergTableLocationProviderBase<TK, TLK> {
+
+    private static final String IMPLEMENTATION_NAME = IcebergStaticTableLocationProvider.class.getSimpleName();
+
+    public IcebergStaticTableLocationProvider(
+            @NotNull final TK tableKey,
+            @NotNull final IcebergBaseLayout locationKeyFinder,
+            @NotNull final TableLocationFactory<TK, TLK> locationFactory,
+            @NotNull final TableIdentifier tableIdentifier) {
+        super(tableKey,
+                locationKeyFinder,
+                locationFactory,
+                false,
+                null,
+                tableIdentifier,
+                TableUpdateMode.STATIC, // The set of locations is static
+                TableUpdateMode.STATIC // Individual locations cannot add or remove rows
+        );
+    }
+
+    // ------------------------------------------------------------------------------------------------------------------
+    // AbstractTableLocationProvider implementation
+    // ------------------------------------------------------------------------------------------------------------------
+
+    @Override
+    public String getImplementationName() {
+        return IMPLEMENTATION_NAME;
+    }
+
+    @Override
+    protected synchronized void doInitialization() {
+        if (!isInitialized()) {
+            refresh();
+        }
+    }
+
+    @Override
+    public synchronized void refresh() {
+        beginTransaction(this);
+        locationKeyFinder.findKeys(tlk -> handleTableLocationKeyAdded(tlk, this));
+        endTransaction(this);
+        setInitialized();
+    }
+
+    @Override
+    public void update() {
+        throw new UnsupportedOperationException("A static table location provider cannot be updated");
+    }
+
+    @Override
+    public void update(long snapshotId) {
+        throw new UnsupportedOperationException("A static table location provider cannot be updated");
+    }
+
+    @Override
+    public void update(Snapshot snapshot) {
+        throw new UnsupportedOperationException("A static table location provider cannot be updated");
+    }
+}
diff --git a/extensions/iceberg/src/main/java/io/deephaven/iceberg/layout/IcebergTableLocationProviderBase.java b/extensions/iceberg/src/main/java/io/deephaven/iceberg/layout/IcebergTableLocationProviderBase.java
new file mode 100644
index 00000000000..f53b2a843be
--- /dev/null
+++ b/extensions/iceberg/src/main/java/io/deephaven/iceberg/layout/IcebergTableLocationProviderBase.java
@@ -0,0 +1,94 @@
+//
+// Copyright (c) 2016-2024 Deephaven Data Labs and Patent Pending
+//
+package io.deephaven.iceberg.layout;
+
+import io.deephaven.engine.table.impl.TableUpdateMode;
+import io.deephaven.engine.table.impl.locations.*;
+import io.deephaven.engine.table.impl.locations.impl.AbstractTableLocationProvider;
+import io.deephaven.engine.table.impl.locations.impl.TableLocationFactory;
+import io.deephaven.iceberg.util.IcebergTableAdapter;
+import org.apache.iceberg.Snapshot;
+import org.apache.iceberg.catalog.TableIdentifier;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
+
+import java.util.HashSet;
+import java.util.Set;
+
+public abstract class IcebergTableLocationProviderBase<TK extends TableKey, TLK extends TableLocationKey>
+        extends AbstractTableLocationProvider {
+
+    final IcebergBaseLayout locationKeyFinder;
+    final TableLocationFactory<TK, TLK> locationFactory;
+    final IcebergTableAdapter adapter;
+    final TableIdentifier tableIdentifier;
+
+    public IcebergTableLocationProviderBase(
+            @NotNull final TK tableKey,
+            @NotNull final IcebergBaseLayout locationKeyFinder,
+            @NotNull final TableLocationFactory<TK, TLK> locationFactory,
+            final boolean isRefreshing,
+            @Nullable final IcebergTableAdapter adapter,
+            @NotNull final TableIdentifier tableIdentifier,
+            final TableUpdateMode updateMode,
+            final TableUpdateMode locationUpdateMode) {
+        super(tableKey, isRefreshing, updateMode, locationUpdateMode);
+        this.locationKeyFinder = locationKeyFinder;
+        this.locationFactory = locationFactory;
+        this.adapter = adapter;
+        this.tableIdentifier = tableIdentifier;
+    }
+
+    /**
+     * Update a manually refreshing table location provider with the latest snapshot from the catalog. This will throw
+     * an {@link UnsupportedOperationException} if the table is not manually refreshing.
+     */
+    public abstract void update();
+
+    /**
+     * Update a manually refreshing table location provider with a specific snapshot from the catalog. If the
+     * {@code snapshotId} is not found in the list of snapshots for the table, an {@link IllegalArgumentException} is
+     * thrown. The input snapshot must also be newer (higher in sequence number) than the current snapshot or an
+     * {@link IllegalArgumentException} is thrown. This will throw an {@link UnsupportedOperationException} if the table
+     * is not manually refreshing.
+     *
+     * @param snapshotId The identifier of the snapshot to use when updating the table.
+     */
+    public abstract void update(final long snapshotId);
+
+    /**
+     * Update a manually refreshing table location provider with a specific snapshot from the catalog. The input
+     * snapshot must be newer (higher in sequence number) than the current snapshot or an
+     * {@link IllegalArgumentException} is thrown. This will throw an {@link UnsupportedOperationException} if the table
+     * is not manually refreshing.
+     * 
+     * @param snapshot The snapshot to use when updating the table.
+     */
+    public abstract void update(final Snapshot snapshot);
+
+    @Override
+    @NotNull
+    protected TableLocation makeTableLocation(@NotNull final TableLocationKey locationKey) {
+        // noinspection unchecked
+        return locationFactory.makeLocation((TK) getKey(), (TLK) locationKey, null);
+    }
+
+    /**
+     * Refresh the table location provider with the latest snapshot from the catalog. This method will identify new
+     * locations and removed locations.
+     */
+    protected void refreshLocations() {
+        final Object token = new Object();
+        beginTransaction(token);
+        final Set<ImmutableTableLocationKey> missedKeys = new HashSet<>();
+        getTableLocationKeys(ttlk -> missedKeys.add(ttlk.get()));
+        locationKeyFinder.findKeys(tlk -> {
+            missedKeys.remove(tlk);
+            handleTableLocationKeyAdded(tlk, token);
+        });
+        missedKeys.forEach(tlk -> handleTableLocationKeyRemoved(tlk, token));
+        endTransaction(token);
+        setInitialized();
+    }
+}
diff --git a/extensions/iceberg/src/main/java/io/deephaven/iceberg/location/IcebergTableLocationKey.java b/extensions/iceberg/src/main/java/io/deephaven/iceberg/location/IcebergTableLocationKey.java
index d6d5d4fb514..0fb37d9132d 100644
--- a/extensions/iceberg/src/main/java/io/deephaven/iceberg/location/IcebergTableLocationKey.java
+++ b/extensions/iceberg/src/main/java/io/deephaven/iceberg/location/IcebergTableLocationKey.java
@@ -3,12 +3,13 @@
 //
 package io.deephaven.iceberg.location;
 
+import io.deephaven.engine.table.impl.locations.ImmutableTableLocationKey;
 import io.deephaven.engine.table.impl.locations.TableLocationKey;
 
 /**
  * {@link TableLocationKey} implementation for use with data stored in Iceberg tables.
  */
-public interface IcebergTableLocationKey extends TableLocationKey {
+public interface IcebergTableLocationKey extends ImmutableTableLocationKey {
     /**
      * Get the read instructions for the location.
      *
diff --git a/extensions/iceberg/src/main/java/io/deephaven/iceberg/location/IcebergTableParquetLocationKey.java b/extensions/iceberg/src/main/java/io/deephaven/iceberg/location/IcebergTableParquetLocationKey.java
index e356d0ecb92..46c1abf77e2 100644
--- a/extensions/iceberg/src/main/java/io/deephaven/iceberg/location/IcebergTableParquetLocationKey.java
+++ b/extensions/iceberg/src/main/java/io/deephaven/iceberg/location/IcebergTableParquetLocationKey.java
@@ -3,39 +3,114 @@
 //
 package io.deephaven.iceberg.location;
 
+import io.deephaven.base.verify.Require;
 import io.deephaven.engine.table.impl.locations.TableLocationKey;
 import io.deephaven.parquet.table.ParquetInstructions;
 import io.deephaven.parquet.table.location.ParquetTableLocationKey;
+import org.apache.iceberg.DataFile;
+import org.apache.iceberg.ManifestFile;
+import io.deephaven.util.channel.SeekableChannelsProvider;
+import org.apache.iceberg.catalog.TableIdentifier;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
 import java.net.URI;
+import java.util.Comparator;
 import java.util.Map;
+import java.util.Objects;
+import java.util.UUID;
 
 /**
  * {@link TableLocationKey} implementation for use with data stored in Iceberg tables in the parquet format.
  */
 public class IcebergTableParquetLocationKey extends ParquetTableLocationKey implements IcebergTableLocationKey {
+
     private static final String IMPLEMENTATION_NAME = IcebergTableParquetLocationKey.class.getSimpleName();
 
+    private static final Comparator<String> CATALONG_NAME_COMPARATOR = Comparator.nullsFirst(Comparator.naturalOrder());
+    private static final Comparator<UUID> UUID_COMPARATOR = Comparator.nullsFirst(Comparator.naturalOrder());
+    private static final Comparator<TableIdentifier> TABLE_IDENTIFIER_COMPARATOR =
+            Comparator.nullsFirst(TableIdentifierComparator.INSTANCE);
+
+    @Nullable
+    private final String catalogName;
+
+    @Nullable
+    private final UUID tableUuid;
+
+    @Nullable
+    private final TableIdentifier tableIdentifier;
+
+    /**
+     * The {@link DataFile#dataSequenceNumber()} of the data file backing this keyed location.
+     */
+    private final long dataSequenceNumber;
+
+    /**
+     * The {@link DataFile#fileSequenceNumber()} of the data file backing this keyed location.
+     */
+    private final long fileSequenceNumber;
+
+    /**
+     * The {@link DataFile#pos()} of data file backing this keyed location.
+     */
+    private final long dataFilePos;
+
+    /**
+     * The {@link ManifestFile#sequenceNumber()} of the manifest file from which the data file was discovered.
+     */
+    private final long manifestSequenceNumber;
+
+    @NotNull
     private final ParquetInstructions readInstructions;
 
+    private int cachedHashCode;
+
     /**
      * Construct a new IcebergTableParquetLocationKey for the supplied {@code fileUri} and {@code partitions}.
      *
-     * @param fileUri The file that backs the keyed location
+     * @param catalogName The name of the catalog using which the table is accessed
+     * @param tableUuid The UUID of the table, or {@code null} if not available
+     * @param tableIdentifier The table identifier used to access the table
+     * @param manifestFile The manifest file from which the data file was discovered
+     * @param dataFile The data file that backs the keyed location
+     * @param fileUri The {@link URI} for the file that backs the keyed location
      * @param order Explicit ordering index, taking precedence over other fields
      * @param partitions The table partitions enclosing the table location keyed by {@code this}. Note that if this
      *        parameter is {@code null}, the location will be a member of no partitions. An ordered copy of the map will
      *        be made, so the calling code is free to mutate the map after this call
      * @param readInstructions the instructions for customizations while reading
+     * @param channelsProvider the provider for reading the file
      */
     public IcebergTableParquetLocationKey(
+            @Nullable final String catalogName,
+            @Nullable final UUID tableUuid,
+            @NotNull final TableIdentifier tableIdentifier,
+            @NotNull final ManifestFile manifestFile,
+            @NotNull final DataFile dataFile,
             @NotNull final URI fileUri,
             final int order,
             @Nullable final Map<String, Comparable<?>> partitions,
-            @NotNull final ParquetInstructions readInstructions) {
-        super(fileUri, order, partitions, readInstructions);
+            @NotNull final ParquetInstructions readInstructions,
+            @NotNull final SeekableChannelsProvider channelsProvider) {
+        super(fileUri, order, partitions, channelsProvider);
+
+        this.catalogName = catalogName;
+        this.tableUuid = tableUuid;
+
+        // We don't save tableIdentifier (and thus don't use it in comparisons/equality-testing/hashCode) unless
+        // tableUUID was null
+        this.tableIdentifier = tableUuid != null ? null : tableIdentifier;
+
+        // Files with unknown sequence numbers should be ordered first
+        dataSequenceNumber = dataFile.dataSequenceNumber() != null ? dataFile.dataSequenceNumber() : Long.MIN_VALUE;
+        fileSequenceNumber = dataFile.fileSequenceNumber() != null ? dataFile.fileSequenceNumber() : Long.MIN_VALUE;
+
+        // This should never be null because we are discovering this data file through a non-null manifest file
+        dataFilePos = Require.neqNull(dataFile.pos(), "dataFile.pos()");
+
+        manifestSequenceNumber = manifestFile.sequenceNumber();
+
         this.readInstructions = readInstructions;
     }
 
@@ -48,4 +123,104 @@ public String getImplementationName() {
     public ParquetInstructions readInstructions() {
         return readInstructions;
     }
+
+    /**
+     * When comparing with another {@link IcebergTableParquetLocationKey}, precedence-wise this implementation compares:
+     * <ul>
+     * <li>{@code order}</li>
+     * <li>{@code catalogName}</li>
+     * <li>{@code uuid}</li>
+     * <li>{@code tableIdentifier}</li>
+     * <li>{@code dataSequenceNumber}</li>
+     * <li>{@code fileSequenceNumber}</li>
+     * <li>{@code manifestSequenceNumber}</li>
+     * <li>{@code dataFilePos}</li>
+     * <li>{@code uri}</li>
+     * </ul>
+     * Otherwise, it delegates to the parent class.
+     * <p>
+     * {@inheritDoc}
+     */
+    @Override
+    public int compareTo(@NotNull final TableLocationKey other) {
+        if (other instanceof IcebergTableParquetLocationKey) {
+            // TODO(deephaven-core#5989): Add unit tests for the ordering of data files
+            final IcebergTableParquetLocationKey otherTyped = (IcebergTableParquetLocationKey) other;
+            int comparisonResult;
+            if ((comparisonResult = Integer.compare(order, otherTyped.order)) != 0) {
+                return comparisonResult;
+            }
+            if ((comparisonResult = CATALONG_NAME_COMPARATOR.compare(catalogName, otherTyped.catalogName)) != 0) {
+                return comparisonResult;
+            }
+            if ((comparisonResult = UUID_COMPARATOR.compare(tableUuid, otherTyped.tableUuid)) != 0) {
+                return comparisonResult;
+            }
+            if ((comparisonResult =
+                    TABLE_IDENTIFIER_COMPARATOR.compare(tableIdentifier, otherTyped.tableIdentifier)) != 0) {
+                return comparisonResult;
+            }
+            if ((comparisonResult = Long.compare(dataSequenceNumber, otherTyped.dataSequenceNumber)) != 0) {
+                return comparisonResult;
+            }
+            if ((comparisonResult = Long.compare(fileSequenceNumber, otherTyped.fileSequenceNumber)) != 0) {
+                return comparisonResult;
+            }
+            if ((comparisonResult = Long.compare(manifestSequenceNumber, otherTyped.manifestSequenceNumber)) != 0) {
+                return comparisonResult;
+            }
+            if ((comparisonResult = Long.compare(dataFilePos, otherTyped.dataFilePos)) != 0) {
+                return comparisonResult;
+            }
+            return uri.compareTo(otherTyped.uri);
+        }
+        // When comparing with non-iceberg location key, we want to compare both partitions and URI
+        return super.compareTo(other);
+    }
+
+    @Override
+    public boolean equals(@Nullable final Object other) {
+        if (this == other) {
+            return true;
+        }
+        if (!(other instanceof IcebergTableParquetLocationKey)) {
+            return false;
+        }
+        // Iceberg devs have confirmed that uri's are supposed to be unique across data files, but Iceberg doesn't have
+        // enough checks to enforce that. So for safety, we are comparing all fields and not just URI.
+        // https://apache-iceberg.slack.com/archives/C03LG1D563F/p1731352244907559
+        final IcebergTableParquetLocationKey otherTyped = (IcebergTableParquetLocationKey) other;
+        return Objects.equals(catalogName, otherTyped.catalogName)
+                && Objects.equals(tableUuid, otherTyped.tableUuid)
+                && Objects.equals(tableIdentifier, otherTyped.tableIdentifier)
+                && dataSequenceNumber == otherTyped.dataSequenceNumber
+                && fileSequenceNumber == otherTyped.fileSequenceNumber
+                && dataFilePos == otherTyped.dataFilePos
+                && manifestSequenceNumber == otherTyped.manifestSequenceNumber
+                && uri.equals(otherTyped.uri);
+    }
+
+    @Override
+    public int hashCode() {
+        if (cachedHashCode == 0) {
+            final int prime = 31;
+            int result = 1;
+            result = prime * result + Objects.hashCode(catalogName);
+            result = prime * result + Objects.hashCode(tableUuid);
+            result = prime * result + Objects.hashCode(tableIdentifier);
+            result = prime * result + Long.hashCode(dataSequenceNumber);
+            result = prime * result + Long.hashCode(fileSequenceNumber);
+            result = prime * result + Long.hashCode(dataFilePos);
+            result = prime * result + Long.hashCode(manifestSequenceNumber);
+            result = prime * result + uri.hashCode();
+            // Don't use 0; that's used by StandaloneTableLocationKey, and also our sentinel for the need to compute
+            if (result == 0) {
+                final int fallbackHashCode = IcebergTableParquetLocationKey.class.hashCode();
+                cachedHashCode = fallbackHashCode == 0 ? 1 : fallbackHashCode;
+            } else {
+                cachedHashCode = result;
+            }
+        }
+        return cachedHashCode;
+    }
 }
diff --git a/extensions/iceberg/src/main/java/io/deephaven/iceberg/location/TableIdentifierComparator.java b/extensions/iceberg/src/main/java/io/deephaven/iceberg/location/TableIdentifierComparator.java
new file mode 100644
index 00000000000..c9fc1709650
--- /dev/null
+++ b/extensions/iceberg/src/main/java/io/deephaven/iceberg/location/TableIdentifierComparator.java
@@ -0,0 +1,44 @@
+//
+// Copyright (c) 2016-2024 Deephaven Data Labs and Patent Pending
+//
+package io.deephaven.iceberg.location;
+
+import org.apache.iceberg.catalog.Namespace;
+import org.apache.iceberg.catalog.TableIdentifier;
+import org.jetbrains.annotations.NotNull;
+
+import java.util.Arrays;
+import java.util.Comparator;
+
+enum TableIdentifierComparator implements Comparator<TableIdentifier> {
+    INSTANCE;
+
+    /**
+     * Compare two {@link TableIdentifier} instances.
+     * <p>
+     * Note that this method assumes:
+     * <ul>
+     * <li>There are just two fields {@link TableIdentifier#namespace()} and {@link TableIdentifier#name()} in
+     * {@link TableIdentifier} class, and both are not null for the objects being compared.</li>
+     * <li>There is just a single field {@link Namespace#levels()} in the {@link Namespace} class.</li>
+     * </ul>
+     * <p>
+     * {@inheritDoc}
+     *
+     * @param ti1 the first object to be compared.
+     * @param ti2 the second object to be compared.
+     * @return a negative integer, zero, or a positive integer as the first argument is less than, equal to, or greater
+     *         than the second, respectively.
+     */
+    @Override
+    public int compare(@NotNull final TableIdentifier ti1, @NotNull final TableIdentifier ti2) {
+        if (ti1 == ti2) {
+            return 0;
+        }
+        final int comparisonResult;
+        if ((comparisonResult = Arrays.compare(ti1.namespace().levels(), ti2.namespace().levels())) != 0) {
+            return comparisonResult;
+        }
+        return ti1.name().compareTo(ti2.name());
+    }
+}
diff --git a/extensions/iceberg/src/main/java/io/deephaven/iceberg/relative/RelativeFileIO.java b/extensions/iceberg/src/main/java/io/deephaven/iceberg/relative/RelativeFileIO.java
new file mode 100644
index 00000000000..4b7244985b2
--- /dev/null
+++ b/extensions/iceberg/src/main/java/io/deephaven/iceberg/relative/RelativeFileIO.java
@@ -0,0 +1,138 @@
+//
+// Copyright (c) 2016-2024 Deephaven Data Labs and Patent Pending
+//
+package io.deephaven.iceberg.relative;
+
+import io.deephaven.util.annotations.VisibleForTesting;
+import org.apache.commons.lang3.StringUtils;
+import org.apache.hadoop.conf.Configuration;
+import org.apache.iceberg.CatalogUtil;
+import org.apache.iceberg.hadoop.HadoopConfigurable;
+import org.apache.iceberg.hadoop.SerializableConfiguration;
+import org.apache.iceberg.io.BulkDeletionFailureException;
+import org.apache.iceberg.io.DelegateFileIO;
+import org.apache.iceberg.io.FileIO;
+import org.apache.iceberg.io.FileInfo;
+import org.apache.iceberg.io.InputFile;
+import org.apache.iceberg.io.OutputFile;
+import org.apache.iceberg.io.ResolvingFileIO;
+import org.apache.iceberg.relocated.com.google.common.collect.Streams;
+import org.apache.iceberg.util.SerializableSupplier;
+
+import java.util.Map;
+import java.util.function.Function;
+
+/**
+ * While this class is in the public source set, it is meant to support testing use cases only and should not be used in
+ * production.
+ *
+ * @see <a href="https://github.com/apache/iceberg/issues/1617">Support relative paths in Table Metadata</a>
+ */
+@VisibleForTesting
+public final class RelativeFileIO implements HadoopConfigurable, DelegateFileIO {
+    public static final String BASE_PATH = RelativeFileIO.class.getName() + ".base-path";
+    public static final String IO_IMPL = RelativeFileIO.class.getName() + ".io-impl";
+
+    public static final String IO_DEFAULT_IMPL = ResolvingFileIO.class.getName();
+
+    private String basePath;
+
+    private DelegateFileIO io;
+
+    private SerializableSupplier<Configuration> hadoopConf;
+
+    public RelativeFileIO() {}
+
+    public RelativeFileIO(Configuration hadoopConf) {
+        this(new SerializableConfiguration(hadoopConf)::get);
+    }
+
+    public RelativeFileIO(SerializableSupplier<Configuration> hadoopConf) {
+        this.hadoopConf = hadoopConf;
+    }
+
+    @Override
+    public Configuration getConf() {
+        return hadoopConf.get();
+    }
+
+    @Override
+    public void setConf(Configuration conf) {
+        this.hadoopConf = new SerializableConfiguration(conf)::get;
+    }
+
+    @Override
+    public void serializeConfWith(Function<Configuration, SerializableSupplier<Configuration>> confSerializer) {
+        this.hadoopConf = confSerializer.apply(getConf());
+    }
+
+    public String absoluteLocation(String location) {
+        return basePath + location;
+    }
+
+    private String relativeLocation(String location) {
+        if (!location.startsWith(basePath)) {
+            throw new IllegalStateException();
+        }
+        return location.substring(basePath.length());
+    }
+
+    @Override
+    public void initialize(Map<String, String> properties) {
+        this.basePath = StringUtils.appendIfMissing(properties.get(BASE_PATH), "/");
+        final String impl = properties.getOrDefault(IO_IMPL, IO_DEFAULT_IMPL);
+        final FileIO fileIO = CatalogUtil.loadFileIO(impl, properties, hadoopConf.get());
+        if (!(fileIO instanceof DelegateFileIO)) {
+            throw new IllegalArgumentException("filoIO must be DelegateFileIO, " + fileIO.getClass());
+        }
+        this.io = (DelegateFileIO) fileIO;
+    }
+
+    @Override
+    public Map<String, String> properties() {
+        return io.properties();
+    }
+
+    @Override
+    public InputFile newInputFile(String path) {
+        return new RelativeInputFile(path, io.newInputFile(absoluteLocation(path)));
+    }
+
+    @Override
+    public InputFile newInputFile(String path, long length) {
+        return new RelativeInputFile(path, io.newInputFile(absoluteLocation(path), length));
+    }
+
+    @Override
+    public OutputFile newOutputFile(String path) {
+        return new RelativeOutputFile(path, io.newOutputFile(absoluteLocation(path)));
+    }
+
+    @Override
+    public void deleteFiles(Iterable<String> iterable) throws BulkDeletionFailureException {
+        io.deleteFiles(Streams.stream(iterable).map(this::absoluteLocation)::iterator);
+    }
+
+    @Override
+    public Iterable<FileInfo> listPrefix(String s) {
+        return Streams.stream(io.listPrefix(absoluteLocation(s)))
+                .map(x -> new FileInfo(relativeLocation(x.location()), x.size(), x.createdAtMillis()))::iterator;
+    }
+
+    @Override
+    public void deletePrefix(String s) {
+        io.deletePrefix(absoluteLocation(s));
+    }
+
+    @Override
+    public void deleteFile(String path) {
+        io.deleteFile(absoluteLocation(path));
+    }
+
+    @Override
+    public void close() {
+        if (io != null) {
+            io.close();
+        }
+    }
+}
diff --git a/extensions/iceberg/src/main/java/io/deephaven/iceberg/relative/RelativeInputFile.java b/extensions/iceberg/src/main/java/io/deephaven/iceberg/relative/RelativeInputFile.java
new file mode 100644
index 00000000000..81fc85ac540
--- /dev/null
+++ b/extensions/iceberg/src/main/java/io/deephaven/iceberg/relative/RelativeInputFile.java
@@ -0,0 +1,39 @@
+//
+// Copyright (c) 2016-2024 Deephaven Data Labs and Patent Pending
+//
+package io.deephaven.iceberg.relative;
+
+import org.apache.iceberg.io.InputFile;
+import org.apache.iceberg.io.SeekableInputStream;
+
+import java.util.Objects;
+
+final class RelativeInputFile implements InputFile {
+    private final String location;
+    private final InputFile file;
+
+    public RelativeInputFile(String location, InputFile file) {
+        this.location = Objects.requireNonNull(location);
+        this.file = Objects.requireNonNull(file);
+    }
+
+    @Override
+    public long getLength() {
+        return file.getLength();
+    }
+
+    @Override
+    public SeekableInputStream newStream() {
+        return file.newStream();
+    }
+
+    @Override
+    public String location() {
+        return location;
+    }
+
+    @Override
+    public boolean exists() {
+        return file.exists();
+    }
+}
diff --git a/extensions/iceberg/src/main/java/io/deephaven/iceberg/relative/RelativeOutputFile.java b/extensions/iceberg/src/main/java/io/deephaven/iceberg/relative/RelativeOutputFile.java
new file mode 100644
index 00000000000..638814b782d
--- /dev/null
+++ b/extensions/iceberg/src/main/java/io/deephaven/iceberg/relative/RelativeOutputFile.java
@@ -0,0 +1,40 @@
+//
+// Copyright (c) 2016-2024 Deephaven Data Labs and Patent Pending
+//
+package io.deephaven.iceberg.relative;
+
+import org.apache.iceberg.io.InputFile;
+import org.apache.iceberg.io.OutputFile;
+import org.apache.iceberg.io.PositionOutputStream;
+
+import java.util.Objects;
+
+final class RelativeOutputFile implements OutputFile {
+    private final String location;
+    private final OutputFile file;
+
+    public RelativeOutputFile(String location, OutputFile file) {
+        this.location = Objects.requireNonNull(location);
+        this.file = Objects.requireNonNull(file);
+    }
+
+    @Override
+    public PositionOutputStream create() {
+        return file.create();
+    }
+
+    @Override
+    public PositionOutputStream createOrOverwrite() {
+        return file.createOrOverwrite();
+    }
+
+    @Override
+    public String location() {
+        return location;
+    }
+
+    @Override
+    public InputFile toInputFile() {
+        return new RelativeInputFile(location, file.toInputFile());
+    }
+}
diff --git a/extensions/iceberg/src/main/java/io/deephaven/iceberg/util/IcebergCatalogAdapter.java b/extensions/iceberg/src/main/java/io/deephaven/iceberg/util/IcebergCatalogAdapter.java
index c54535599c3..2c0206c0c89 100644
--- a/extensions/iceberg/src/main/java/io/deephaven/iceberg/util/IcebergCatalogAdapter.java
+++ b/extensions/iceberg/src/main/java/io/deephaven/iceberg/util/IcebergCatalogAdapter.java
@@ -5,144 +5,93 @@
 
 import io.deephaven.engine.rowset.RowSetFactory;
 import io.deephaven.engine.table.*;
-import io.deephaven.engine.table.impl.PartitionAwareSourceTable;
 import io.deephaven.engine.table.impl.QueryTable;
-import io.deephaven.engine.table.impl.locations.TableDataException;
-import io.deephaven.engine.table.impl.locations.impl.AbstractTableLocationProvider;
-import io.deephaven.engine.table.impl.locations.impl.PollingTableLocationProvider;
-import io.deephaven.engine.table.impl.locations.impl.StandaloneTableKey;
-import io.deephaven.engine.table.impl.locations.impl.TableLocationKeyFinder;
-import io.deephaven.engine.table.impl.locations.util.TableDataRefreshService;
 import io.deephaven.engine.table.impl.sources.InMemoryColumnSource;
-import io.deephaven.engine.table.impl.sources.regioned.RegionedTableComponentFactoryImpl;
-import io.deephaven.engine.updategraph.UpdateSourceRegistrar;
-import io.deephaven.iceberg.layout.IcebergFlatLayout;
-import io.deephaven.iceberg.layout.IcebergKeyValuePartitionedLayout;
-import io.deephaven.iceberg.location.IcebergTableLocationFactory;
-import io.deephaven.iceberg.location.IcebergTableLocationKey;
-import org.apache.iceberg.PartitionField;
+import io.deephaven.iceberg.base.IcebergUtils;
+import io.deephaven.iceberg.internal.DataInstructionsProviderLoader;
+import io.deephaven.iceberg.internal.DataInstructionsProviderPlugin;
+import io.deephaven.util.annotations.VisibleForTesting;
 import org.apache.iceberg.PartitionSpec;
 import org.apache.iceberg.Schema;
-import org.apache.iceberg.Snapshot;
+import org.apache.iceberg.TableProperties;
 import org.apache.iceberg.catalog.Catalog;
 import org.apache.iceberg.catalog.Namespace;
 import org.apache.iceberg.catalog.SupportsNamespaces;
 import org.apache.iceberg.catalog.TableIdentifier;
-import org.apache.iceberg.io.FileIO;
-import org.apache.iceberg.types.Type;
-import org.apache.iceberg.types.Types;
+import org.apache.iceberg.exceptions.AlreadyExistsException;
 import org.jetbrains.annotations.NotNull;
-import org.jetbrains.annotations.Nullable;
+import org.apache.iceberg.rest.RESTCatalog;
+import org.apache.iceberg.rest.ResourcePaths;
 
-import java.time.Instant;
-import java.time.LocalDateTime;
 import java.util.*;
-import java.util.stream.Collectors;
+
+import static io.deephaven.iceberg.base.IcebergUtils.createNamespaceIfNotExists;
+import static io.deephaven.iceberg.base.IcebergUtils.dropNamespaceIfExists;
 
 public class IcebergCatalogAdapter {
+
+    @VisibleForTesting
+    static final TableDefinition NAMESPACE_DEFINITION = TableDefinition.of(
+            ColumnDefinition.ofString("Namespace"),
+            ColumnDefinition.fromGenericType("NamespaceObject", Namespace.class));
+
+    @VisibleForTesting
+    static final TableDefinition TABLES_DEFINITION = TableDefinition.of(
+            ColumnDefinition.ofString("Namespace"),
+            ColumnDefinition.ofString("TableName"),
+            ColumnDefinition.fromGenericType("TableIdentifierObject", TableIdentifier.class));
+
     private final Catalog catalog;
-    private final FileIO fileIO;
+
+    private final DataInstructionsProviderLoader dataInstructionsProvider;
 
     /**
-     * Construct an IcebergCatalogAdapter from a catalog and file IO.
+     * Construct an IcebergCatalogAdapter from a Catalog. The properties supplied are provided to support
+     * {@link DataInstructionsProviderPlugin} resolution. In the case where {@code catalog} is a {@link RESTCatalog},
+     * {@link RESTCatalog#properties()} will be used instead.
+     *
+     * @param catalog the catalog
+     * @return the catalog adapter
      */
-    IcebergCatalogAdapter(
-            @NotNull final Catalog catalog,
-            @NotNull final FileIO fileIO) {
-        this.catalog = catalog;
-        this.fileIO = fileIO;
+    static IcebergCatalogAdapter of(Catalog catalog, Map<String, String> properties) {
+        if (catalog instanceof RESTCatalog) {
+            return of((RESTCatalog) catalog);
+        }
+        return new IcebergCatalogAdapter(catalog, properties);
     }
 
     /**
-     * Create a single {@link TableDefinition} from a given Schema, PartitionSpec, and TableDefinition. Takes into
-     * account {@link Map<> column rename instructions}
+     * Construct an IcebergCatalogAdapter from a REST catalog. This passes along {@link RESTCatalog#properties()} which
+     * will include any additional properties the REST Catalog implementation sent back as part of the initial
+     * {@link ResourcePaths#config() config} call. These properties will be used for resolving
+     * {@link io.deephaven.iceberg.internal.DataInstructionsProviderPlugin}.
      *
-     * @param schema The schema of the table.
-     * @param partitionSpec The partition specification of the table.
-     * @param tableDefinition The table definition.
-     * @param columnRename The map for renaming columns.
-     * @return The generated TableDefinition.
+     * @param restCatalog the rest catalog
+     * @return the catalog adapter
      */
-    private static TableDefinition fromSchema(
-            @NotNull final Schema schema,
-            @NotNull final PartitionSpec partitionSpec,
-            @Nullable final TableDefinition tableDefinition,
-            @NotNull final Map<String, String> columnRename) {
-
-        final Set<String> columnNames = tableDefinition != null
-                ? tableDefinition.getColumnNameSet()
-                : null;
-
-        final Set<String> partitionNames =
-                partitionSpec.fields().stream()
-                        .map(PartitionField::name)
-                        .map(colName -> columnRename.getOrDefault(colName, colName))
-                        .collect(Collectors.toSet());
-
-        final List<ColumnDefinition<?>> columns = new ArrayList<>();
-
-        for (final Types.NestedField field : schema.columns()) {
-            final String name = columnRename.getOrDefault(field.name(), field.name());
-            // Skip columns that are not in the provided table definition.
-            if (columnNames != null && !columnNames.contains(name)) {
-                continue;
-            }
-            final Type type = field.type();
-            final io.deephaven.qst.type.Type<?> qstType = convertPrimitiveType(type);
-            final ColumnDefinition<?> column;
-            if (partitionNames.contains(name)) {
-                column = ColumnDefinition.of(name, qstType).withPartitioning();
-            } else {
-                column = ColumnDefinition.of(name, qstType);
-            }
-            columns.add(column);
-        }
-
-        return TableDefinition.of(columns);
+    static IcebergCatalogAdapter of(RESTCatalog restCatalog) {
+        return new IcebergCatalogAdapter(restCatalog, restCatalog.properties());
     }
 
     /**
-     * Convert an Iceberg data type to a Deephaven type.
+     * Construct an IcebergCatalogAdapter from a catalog.
      *
-     * @param icebergType The Iceberg data type to be converted.
-     * @return The converted Deephaven type.
+     * @deprecated use a method or constructor which is more explicit about the properties it uses
      */
-    static io.deephaven.qst.type.Type<?> convertPrimitiveType(@NotNull final Type icebergType) {
-        final Type.TypeID typeId = icebergType.typeId();
-        switch (typeId) {
-            case BOOLEAN:
-                return io.deephaven.qst.type.Type.booleanType().boxedType();
-            case DOUBLE:
-                return io.deephaven.qst.type.Type.doubleType();
-            case FLOAT:
-                return io.deephaven.qst.type.Type.floatType();
-            case INTEGER:
-                return io.deephaven.qst.type.Type.intType();
-            case LONG:
-                return io.deephaven.qst.type.Type.longType();
-            case STRING:
-                return io.deephaven.qst.type.Type.stringType();
-            case TIMESTAMP:
-                final Types.TimestampType timestampType = (Types.TimestampType) icebergType;
-                return timestampType.shouldAdjustToUTC()
-                        ? io.deephaven.qst.type.Type.find(Instant.class)
-                        : io.deephaven.qst.type.Type.find(LocalDateTime.class);
-            case DATE:
-                return io.deephaven.qst.type.Type.find(java.time.LocalDate.class);
-            case TIME:
-                return io.deephaven.qst.type.Type.find(java.time.LocalTime.class);
-            case DECIMAL:
-                return io.deephaven.qst.type.Type.find(java.math.BigDecimal.class);
-            case FIXED: // Fall through
-            case BINARY:
-                return io.deephaven.qst.type.Type.find(byte[].class);
-            case UUID: // Fall through
-            case STRUCT: // Fall through
-            case LIST: // Fall through
-            case MAP: // Fall through
-            default:
-                throw new TableDataException("Unsupported iceberg column type " + typeId.name());
-        }
+    @Deprecated(forRemoval = true)
+    IcebergCatalogAdapter(@NotNull final Catalog catalog) {
+        this(catalog, Map.of());
+    }
+
+    /**
+     * Construct an IcebergCatalogAdapter from a catalog and property collection.
+     */
+    IcebergCatalogAdapter(
+            @NotNull final Catalog catalog,
+            @NotNull final Map<String, String> properties) {
+        this.catalog = catalog;
+
+        dataInstructionsProvider = DataInstructionsProviderLoader.create(Map.copyOf(properties));
     }
 
     /**
@@ -178,8 +127,8 @@ public List<Namespace> listNamespaces(@NotNull final Namespace namespace) {
      *
      * @return A {@link Table table} of all namespaces.
      */
-    public Table listNamespacesAsTable() {
-        return listNamespacesAsTable(Namespace.empty());
+    public Table namespaces() {
+        return namespaces(Namespace.empty());
     }
 
     /**
@@ -188,7 +137,7 @@ public Table listNamespacesAsTable() {
      *
      * @return A {@link Table table} of all namespaces.
      */
-    public Table listNamespacesAsTable(@NotNull final Namespace namespace) {
+    public Table namespaces(@NotNull final Namespace namespace) {
         final List<Namespace> namespaces = listNamespaces(namespace);
         final long size = namespaces.size();
 
@@ -212,7 +161,7 @@ public Table listNamespacesAsTable(@NotNull final Namespace namespace) {
         }
 
         // Create and return the table
-        return new QueryTable(RowSetFactory.flat(size).toTracking(), columnSourceMap);
+        return new QueryTable(NAMESPACE_DEFINITION, RowSetFactory.flat(size).toTracking(), columnSourceMap);
     }
 
     /**
@@ -221,8 +170,9 @@ public Table listNamespacesAsTable(@NotNull final Namespace namespace) {
      *
      * @return A {@link Table table} of all namespaces.
      */
-    public Table listNamespacesAsTable(@NotNull final String... namespace) {
-        return listNamespacesAsTable(Namespace.of(namespace));
+    @SuppressWarnings("unused")
+    public Table namespaces(@NotNull final String... namespace) {
+        return namespaces(Namespace.of(namespace));
     }
 
     /**
@@ -242,7 +192,7 @@ public List<TableIdentifier> listTables(@NotNull final Namespace namespace) {
      * @param namespace The namespace from which to gather the tables
      * @return A list of all tables in the given namespace.
      */
-    public Table listTablesAsTable(@NotNull final Namespace namespace) {
+    public Table tables(@NotNull final Namespace namespace) {
         final List<TableIdentifier> tableIdentifiers = listTables(namespace);
         final long size = tableIdentifiers.size();
 
@@ -271,258 +221,100 @@ public Table listTablesAsTable(@NotNull final Namespace namespace) {
         }
 
         // Create and return the table
-        return new QueryTable(RowSetFactory.flat(size).toTracking(), columnSourceMap);
+        return new QueryTable(TABLES_DEFINITION, RowSetFactory.flat(size).toTracking(), columnSourceMap);
     }
 
-    public Table listTablesAsTable(@NotNull final String... namespace) {
-        return listTablesAsTable(Namespace.of(namespace));
+    public Table tables(@NotNull final String... namespace) {
+        return tables(Namespace.of(namespace));
     }
 
     /**
-     * List all {@link Snapshot snapshots} of a given Iceberg table.
+     * Load an Iceberg table from the catalog.
      *
-     * @param tableIdentifier The identifier of the table from which to gather snapshots.
-     * @return A list of all snapshots of the given table.
+     * @param tableIdentifier The identifier of the table to load.
+     * @return The {@link IcebergTableAdapter table adapter} for the Iceberg table.
      */
-    public List<Snapshot> listSnapshots(@NotNull final TableIdentifier tableIdentifier) {
-        final List<Snapshot> snapshots = new ArrayList<>();
-        catalog.loadTable(tableIdentifier).snapshots().forEach(snapshots::add);
-        return snapshots;
+    public IcebergTableAdapter loadTable(final String tableIdentifier) {
+        return loadTable(TableIdentifier.parse(tableIdentifier));
     }
 
     /**
-     * List all {@link Snapshot snapshots} of a given Iceberg table as a Deephaven {@link Table table}. The resulting
-     * table will be static and contain the same information as {@link #listSnapshots(TableIdentifier)}.
+     * Load an Iceberg table from the catalog.
      *
-     * @param tableIdentifier The identifier of the table from which to gather snapshots.
-     * @return A list of all tables in the given namespace.
+     * @param tableIdentifier The identifier of the table to load.
+     * @return The {@link IcebergTableAdapter table adapter} for the Iceberg table.
      */
-    public Table listSnapshotsAsTable(@NotNull final TableIdentifier tableIdentifier) {
-        final List<Snapshot> snapshots = listSnapshots(tableIdentifier);
-        final long size = snapshots.size();
-
-        // Create and return a table containing the namespaces as strings
-        final Map<String, ColumnSource<?>> columnSourceMap = new LinkedHashMap<>();
-
-        // Create the column source(s)
-        final long[] idArr = new long[(int) size];
-        columnSourceMap.put("Id", InMemoryColumnSource.getImmutableMemoryColumnSource(idArr, long.class, null));
-
-        final long[] timestampArr = new long[(int) size];
-        columnSourceMap.put("TimestampMs",
-                InMemoryColumnSource.getImmutableMemoryColumnSource(timestampArr, long.class, null));
-
-        final String[] operatorArr = new String[(int) size];
-        columnSourceMap.put("Operation",
-                InMemoryColumnSource.getImmutableMemoryColumnSource(operatorArr, String.class, null));
-
-        final Map<String, String>[] summaryArr = new Map[(int) size];
-        columnSourceMap.put("Summary",
-                InMemoryColumnSource.getImmutableMemoryColumnSource(summaryArr, Map.class, null));
-
-        final Snapshot[] snapshotArr = new Snapshot[(int) size];
-        columnSourceMap.put("SnapshotObject",
-                InMemoryColumnSource.getImmutableMemoryColumnSource(snapshotArr, Snapshot.class, null));
-
-        // Populate the column source(s)
-        for (int i = 0; i < size; i++) {
-            final Snapshot snapshot = snapshots.get(i);
-            idArr[i] = snapshot.snapshotId();
-            timestampArr[i] = snapshot.timestampMillis();
-            operatorArr[i] = snapshot.operation();
-            summaryArr[i] = snapshot.summary();
-            snapshotArr[i] = snapshot;
+    public IcebergTableAdapter loadTable(@NotNull final TableIdentifier tableIdentifier) {
+        // Load the table from the catalog.
+        final org.apache.iceberg.Table table = catalog.loadTable(tableIdentifier);
+        if (table == null) {
+            throw new IllegalArgumentException("Table not found: " + tableIdentifier);
         }
-
-        // Create and return the table
-        return new QueryTable(RowSetFactory.flat(size).toTracking(), columnSourceMap);
-    }
-
-    /**
-     * List all {@link Snapshot snapshots} of a given Iceberg table as a Deephaven {@link Table table}. The resulting
-     * table will be static and contain the same information as {@link #listSnapshots(TableIdentifier)}.
-     *
-     * @param tableIdentifier The identifier of the table from which to gather snapshots.
-     * @return A list of all tables in the given namespace.
-     */
-    public Table listSnapshotsAsTable(@NotNull final String tableIdentifier) {
-        return listSnapshotsAsTable(TableIdentifier.parse(tableIdentifier));
-    }
-
-    /**
-     * Read the latest static snapshot of an Iceberg table from the Iceberg catalog.
-     *
-     * @param tableIdentifier The table identifier to load
-     * @param instructions The instructions for customizations while reading
-     * @return The loaded table
-     */
-    @SuppressWarnings("unused")
-    public Table readTable(
-            @NotNull final TableIdentifier tableIdentifier,
-            @Nullable final IcebergInstructions instructions) {
-        return readTableInternal(tableIdentifier, null, instructions);
+        return new IcebergTableAdapter(catalog, tableIdentifier, table, dataInstructionsProvider);
     }
 
     /**
-     * Read the latest static snapshot of an Iceberg table from the Iceberg catalog.
-     *
-     * @param tableIdentifier The table identifier to load
-     * @param instructions The instructions for customizations while reading
-     * @return The loaded table
-     */
-    @SuppressWarnings("unused")
-    public Table readTable(
-            @NotNull final String tableIdentifier,
-            @Nullable final IcebergInstructions instructions) {
-        return readTable(TableIdentifier.parse(tableIdentifier), instructions);
-    }
-
-    /**
-     * Read a static snapshot of an Iceberg table from the Iceberg catalog.
-     *
-     * @param tableIdentifier The table identifier to load
-     * @param tableSnapshotId The snapshot id to load
-     * @param instructions The instructions for customizations while reading
-     * @return The loaded table
+     * Returns the underlying Iceberg {@link Catalog catalog} used by this adapter.
      */
-    @SuppressWarnings("unused")
-    public Table readTable(
-            @NotNull final TableIdentifier tableIdentifier,
-            final long tableSnapshotId,
-            @Nullable final IcebergInstructions instructions) {
-
-        // Find the snapshot with the given snapshot id
-        final Snapshot tableSnapshot = listSnapshots(tableIdentifier).stream()
-                .filter(snapshot -> snapshot.snapshotId() == tableSnapshotId)
-                .findFirst()
-                .orElseThrow(() -> new IllegalArgumentException("Snapshot with id " + tableSnapshotId + " not found"));
-
-        return readTableInternal(tableIdentifier, tableSnapshot, instructions);
+    public Catalog catalog() {
+        return catalog;
     }
 
     /**
-     * Read a static snapshot of an Iceberg table from the Iceberg catalog.
+     * Create a new Iceberg table in the catalog with the given table identifier and definition.
+     * <p>
+     * All columns of type {@link ColumnDefinition.ColumnType#Partitioning partitioning} will be used to create the
+     * partition spec for the table.
      *
-     * @param tableIdentifier The table identifier to load
-     * @param tableSnapshotId The snapshot id to load
-     * @param instructions The instructions for customizations while reading
-     * @return The loaded table
+     * @param tableIdentifier The identifier string of the new table.
+     * @param definition The {@link TableDefinition} of the new table.
+     * @return The {@link IcebergTableAdapter table adapter} for the new Iceberg table.
+     * @throws AlreadyExistsException if the table already exists
      */
-    @SuppressWarnings("unused")
-    public Table readTable(
+    public IcebergTableAdapter createTable(
             @NotNull final String tableIdentifier,
-            final long tableSnapshotId,
-            @Nullable final IcebergInstructions instructions) {
-        return readTable(TableIdentifier.parse(tableIdentifier), tableSnapshotId, instructions);
+            @NotNull final TableDefinition definition) {
+        return createTable(TableIdentifier.parse(tableIdentifier), definition);
     }
 
     /**
-     * Read a static snapshot of an Iceberg table from the Iceberg catalog.
+     * Create a new Iceberg table in the catalog with the given table identifier and definition.
+     * <p>
+     * All columns of type {@link ColumnDefinition.ColumnType#Partitioning partitioning} will be used to create the
+     * partition spec for the table.
      *
-     * @param tableIdentifier The table identifier to load
-     * @param tableSnapshot The {@link Snapshot snapshot} to load
-     * @param instructions The instructions for customizations while reading
-     * @return The loaded table
+     * @param tableIdentifier The identifier of the new table.
+     * @param definition The {@link TableDefinition} of the new table.
+     * @return The {@link IcebergTableAdapter table adapter} for the new Iceberg table.
+     * @throws AlreadyExistsException if the table already exists
      */
-    @SuppressWarnings("unused")
-    public Table readTable(
+    public IcebergTableAdapter createTable(
             @NotNull final TableIdentifier tableIdentifier,
-            @NotNull final Snapshot tableSnapshot,
-            @Nullable final IcebergInstructions instructions) {
-        return readTableInternal(tableIdentifier, tableSnapshot, instructions);
+            @NotNull final TableDefinition definition) {
+        final IcebergUtils.SpecAndSchema specAndSchema = IcebergUtils.createSpecAndSchema(definition);
+        return createTable(tableIdentifier, specAndSchema.schema, specAndSchema.partitionSpec);
     }
 
-    private Table readTableInternal(
+    private IcebergTableAdapter createTable(
             @NotNull final TableIdentifier tableIdentifier,
-            @Nullable final Snapshot tableSnapshot,
-            @Nullable final IcebergInstructions instructions) {
-
-        // Load the table from the catalog.
-        final org.apache.iceberg.Table table = catalog.loadTable(tableIdentifier);
-
-        // Do we want the latest or a specific snapshot?
-        final Snapshot snapshot = tableSnapshot != null ? tableSnapshot : table.currentSnapshot();
-        final Schema schema = table.schemas().get(snapshot.schemaId());
-
-        // Load the partitioning schema.
-        final org.apache.iceberg.PartitionSpec partitionSpec = table.spec();
-
-        // Get default instructions if none are provided
-        final IcebergInstructions userInstructions = instructions == null ? IcebergInstructions.DEFAULT : instructions;
-
-        // Get the user supplied table definition.
-        final TableDefinition userTableDef = userInstructions.tableDefinition().orElse(null);
-
-        // Get the table definition from the schema (potentially limited by the user supplied table definition and
-        // applying column renames).
-        final TableDefinition icebergTableDef =
-                fromSchema(schema, partitionSpec, userTableDef, userInstructions.columnRenames());
-
-        // If the user supplied a table definition, make sure it's fully compatible.
-        final TableDefinition tableDef;
-        if (userTableDef != null) {
-            tableDef = icebergTableDef.checkCompatibility(userTableDef);
-
-            // Ensure that the user has not marked non-partitioned columns as partitioned.
-            final Set<String> userPartitionColumns = userTableDef.getPartitioningColumns().stream()
-                    .map(ColumnDefinition::getName)
-                    .collect(Collectors.toSet());
-            final Set<String> partitionColumns = tableDef.getPartitioningColumns().stream()
-                    .map(ColumnDefinition::getName)
-                    .collect(Collectors.toSet());
-
-            // The working partitioning column set must be a super-set of the user-supplied set.
-            if (!partitionColumns.containsAll(userPartitionColumns)) {
-                final Set<String> invalidColumns = new HashSet<>(userPartitionColumns);
-                invalidColumns.removeAll(partitionColumns);
-
-                throw new TableDataException("The following columns are not partitioned in the Iceberg table: " +
-                        invalidColumns);
+            @NotNull final Schema schema,
+            @NotNull final PartitionSpec partitionSpec) {
+        final boolean newNamespaceCreated = createNamespaceIfNotExists(catalog, tableIdentifier.namespace());
+        try {
+            final org.apache.iceberg.Table table =
+                    catalog.createTable(tableIdentifier, schema, partitionSpec,
+                            Map.of(TableProperties.DEFAULT_FILE_FORMAT, TableProperties.DEFAULT_FILE_FORMAT_DEFAULT));
+            return new IcebergTableAdapter(catalog, tableIdentifier, table, dataInstructionsProvider);
+        } catch (final Throwable throwable) {
+            if (newNamespaceCreated) {
+                // Delete it to avoid leaving a partial namespace in the catalog
+                try {
+                    dropNamespaceIfExists(catalog, tableIdentifier.namespace());
+                } catch (final RuntimeException dropException) {
+                    throwable.addSuppressed(dropException);
+                }
             }
-        } else {
-            // Use the snapshot schema as the table definition.
-            tableDef = icebergTableDef;
-        }
-
-        final String description;
-        final TableLocationKeyFinder<IcebergTableLocationKey> keyFinder;
-        final TableDataRefreshService refreshService;
-        final UpdateSourceRegistrar updateSourceRegistrar;
-
-        if (partitionSpec.isUnpartitioned()) {
-            // Create the flat layout location key finder
-            keyFinder = new IcebergFlatLayout(tableDef, table, snapshot, fileIO, userInstructions);
-        } else {
-            // Create the partitioning column location key finder
-            keyFinder = new IcebergKeyValuePartitionedLayout(tableDef, table, snapshot, fileIO, partitionSpec,
-                    userInstructions);
+            throw throwable;
         }
-
-        refreshService = null;
-        updateSourceRegistrar = null;
-        description = "Read static iceberg table with " + keyFinder;
-
-        final AbstractTableLocationProvider locationProvider = new PollingTableLocationProvider<>(
-                StandaloneTableKey.getInstance(),
-                keyFinder,
-                new IcebergTableLocationFactory(),
-                refreshService);
-
-        final PartitionAwareSourceTable result = new PartitionAwareSourceTable(
-                tableDef,
-                description,
-                RegionedTableComponentFactoryImpl.INSTANCE,
-                locationProvider,
-                updateSourceRegistrar);
-
-        return result;
-    }
-
-    /**
-     * Returns the underlying Iceberg {@link Catalog catalog} used by this adapter.
-     */
-    @SuppressWarnings("unused")
-    public Catalog catalog() {
-        return catalog;
     }
 }
diff --git a/extensions/iceberg/src/main/java/io/deephaven/iceberg/util/IcebergInstructions.java b/extensions/iceberg/src/main/java/io/deephaven/iceberg/util/IcebergInstructions.java
deleted file mode 100644
index b595b4cfd14..00000000000
--- a/extensions/iceberg/src/main/java/io/deephaven/iceberg/util/IcebergInstructions.java
+++ /dev/null
@@ -1,63 +0,0 @@
-//
-// Copyright (c) 2016-2024 Deephaven Data Labs and Patent Pending
-//
-package io.deephaven.iceberg.util;
-
-import io.deephaven.annotations.BuildableStyle;
-import io.deephaven.engine.table.TableDefinition;
-import org.immutables.value.Value.Immutable;
-
-import java.util.Map;
-import java.util.Optional;
-
-/**
- * This class provides instructions intended for reading Iceberg catalogs and tables. The default values documented in
- * this class may change in the future. As such, callers may wish to explicitly set the values.
- */
-@Immutable
-@BuildableStyle
-public abstract class IcebergInstructions {
-    /**
-     * The default {@link IcebergInstructions} to use when reading Iceberg data files. Providing this will use system
-     * defaults for cloud provider-specific parameters
-     */
-    @SuppressWarnings("unused")
-    public static final IcebergInstructions DEFAULT = builder().build();
-
-    public static Builder builder() {
-        return ImmutableIcebergInstructions.builder();
-    }
-
-    /**
-     * The {@link TableDefinition} to use when reading Iceberg data files.
-     */
-    public abstract Optional<TableDefinition> tableDefinition();
-
-    /**
-     * The data instructions to use for reading the Iceberg data files (might be S3Instructions or other cloud
-     * provider-specific instructions).
-     */
-    public abstract Optional<Object> dataInstructions();
-
-    /**
-     * A {@link Map map} of rename instructions from Iceberg to Deephaven column names to use when reading the Iceberg
-     * data files.
-     */
-    public abstract Map<String, String> columnRenames();
-
-    public interface Builder {
-        @SuppressWarnings("unused")
-        Builder tableDefinition(TableDefinition tableDefinition);
-
-        @SuppressWarnings("unused")
-        Builder dataInstructions(Object s3Instructions);
-
-        @SuppressWarnings("unused")
-        Builder putColumnRenames(String key, String value);
-
-        @SuppressWarnings("unused")
-        Builder putAllColumnRenames(Map<String, ? extends String> entries);
-
-        IcebergInstructions build();
-    }
-}
diff --git a/extensions/iceberg/src/main/java/io/deephaven/iceberg/util/IcebergReadInstructions.java b/extensions/iceberg/src/main/java/io/deephaven/iceberg/util/IcebergReadInstructions.java
new file mode 100644
index 00000000000..fa91cc9c2d3
--- /dev/null
+++ b/extensions/iceberg/src/main/java/io/deephaven/iceberg/util/IcebergReadInstructions.java
@@ -0,0 +1,114 @@
+//
+// Copyright (c) 2016-2024 Deephaven Data Labs and Patent Pending
+//
+package io.deephaven.iceberg.util;
+
+import io.deephaven.annotations.CopyableStyle;
+import io.deephaven.engine.table.TableDefinition;
+import org.apache.iceberg.Snapshot;
+import org.immutables.value.Value;
+import org.immutables.value.Value.Immutable;
+
+import java.util.Map;
+import java.util.Optional;
+import java.util.OptionalLong;
+
+/**
+ * This class provides instructions intended for reading Iceberg catalogs and tables. The default values documented in
+ * this class may change in the future. As such, callers may wish to explicitly set the values.
+ */
+@Immutable
+@CopyableStyle
+public abstract class IcebergReadInstructions {
+    /**
+     * The default {@link IcebergReadInstructions} to use when reading Iceberg data files. Providing this will use
+     * system defaults for cloud provider-specific parameters.
+     */
+    public static final IcebergReadInstructions DEFAULT = builder().build();
+
+    public static Builder builder() {
+        return ImmutableIcebergReadInstructions.builder();
+    }
+
+    /**
+     * The {@link TableDefinition} to use when reading Iceberg data files.
+     */
+    public abstract Optional<TableDefinition> tableDefinition();
+
+    /**
+     * The data instructions to use for reading the Iceberg data files (might be S3Instructions or other cloud
+     * provider-specific instructions).
+     */
+    public abstract Optional<Object> dataInstructions();
+
+    /**
+     * A {@link Map map} of rename instructions from Iceberg to Deephaven column names to use when reading the Iceberg
+     * data files.
+     */
+    public abstract Map<String, String> columnRenames();
+
+    /**
+     * Return a copy of this instructions object with the column renames replaced by {@code entries}.
+     */
+    public abstract IcebergReadInstructions withColumnRenames(Map<String, ? extends String> entries);
+
+    /**
+     * The {@link IcebergUpdateMode} mode to use when reading the Iceberg data files. Default is
+     * {@link IcebergUpdateMode#staticMode()}.
+     */
+    @Value.Default
+    public IcebergUpdateMode updateMode() {
+        return IcebergUpdateMode.staticMode();
+    }
+
+    /**
+     * The identifier of the snapshot to load for reading. If both this and {@link #snapshot()} are provided, the
+     * {@link Snapshot#snapshotId()} should match this. Otherwise, only one of them should be provided. If neither is
+     * provided, the latest snapshot will be loaded.
+     */
+    public abstract OptionalLong snapshotId();
+
+    /**
+     * Return a copy of this instructions object with the snapshot ID replaced by {@code value}.
+     */
+    public abstract IcebergReadInstructions withSnapshotId(long value);
+
+    /**
+     * The snapshot to load for reading. If both this and {@link #snapshotId()} are provided, the
+     * {@link Snapshot#snapshotId()} should match the {@link #snapshotId()}. Otherwise, only one of them should be
+     * provided. If neither is provided, the latest snapshot will be loaded.
+     */
+    public abstract Optional<Snapshot> snapshot();
+
+    /**
+     * Return a copy of this instructions object with the snapshot replaced by {@code value}.
+     */
+    public abstract IcebergReadInstructions withSnapshot(Snapshot value);
+
+    public interface Builder {
+        Builder tableDefinition(TableDefinition tableDefinition);
+
+        Builder dataInstructions(Object s3Instructions);
+
+        Builder putColumnRenames(String key, String value);
+
+        Builder putAllColumnRenames(Map<String, ? extends String> entries);
+
+        Builder updateMode(IcebergUpdateMode updateMode);
+
+        Builder snapshotId(long snapshotId);
+
+        Builder snapshot(Snapshot snapshot);
+
+        IcebergReadInstructions build();
+    }
+
+    @Value.Check
+    final void checkSnapshotId() {
+        if (snapshotId().isPresent() && snapshot().isPresent() &&
+                snapshotId().getAsLong() != snapshot().get().snapshotId()) {
+            throw new IllegalArgumentException("If both snapshotID and snapshot are provided, the snapshot Ids " +
+                    "must match, found " + snapshotId().getAsLong() + " and " + snapshot().get().snapshotId());
+        }
+    }
+}
diff --git a/extensions/iceberg/src/main/java/io/deephaven/iceberg/util/IcebergTable.java b/extensions/iceberg/src/main/java/io/deephaven/iceberg/util/IcebergTable.java
new file mode 100644
index 00000000000..2779731c306
--- /dev/null
+++ b/extensions/iceberg/src/main/java/io/deephaven/iceberg/util/IcebergTable.java
@@ -0,0 +1,44 @@
+//
+// Copyright (c) 2016-2024 Deephaven Data Labs and Patent Pending
+//
+package io.deephaven.iceberg.util;
+
+import io.deephaven.engine.table.Table;
+import org.apache.iceberg.Snapshot;
+import org.jetbrains.annotations.NotNull;
+
+public interface IcebergTable extends Table {
+    /**
+     * When the {@link IcebergReadInstructions#updateMode() update mode} for this table is
+     * {@link IcebergUpdateMode#manualRefreshingMode()}, this call will update the table with the latest snapshot from
+     * the catalog.
+     * <p>
+     * If any other update mode is specified, this call will throw an {@link UnsupportedOperationException}.
+     */
+    void update();
+
+    /**
+     * When the {@link IcebergReadInstructions#updateMode() update mode} for this table is
+     * {@link IcebergUpdateMode#manualRefreshingMode()}, this call will update the table with a specific snapshot from
+     * the catalog. If the {@code snapshotId} is not found in the list of snapshots for the table, an
+     * {@link IllegalArgumentException} is thrown. The input snapshot must also be newer (higher in sequence number)
+     * than the current snapshot or an {@link IllegalArgumentException} is thrown.
+     * <p>
+     * If any other update mode is specified, this call will throw an {@link UnsupportedOperationException}.
+     *
+     * @param snapshotId The identifier of the snapshot to use when updating the table.
+     */
+    void update(final long snapshotId);
+
+    /**
+     * When the {@link IcebergReadInstructions#updateMode() update mode} for this table is
+     * {@link IcebergUpdateMode#manualRefreshingMode()}, this call will update the table with a specific snapshot from
+     * the catalog. The input snapshot must be newer (higher in sequence number) than the current snapshot or an
+     * {@link IllegalArgumentException} is thrown.
+     * <p>
+     * If any other update mode is specified, this call will throw an {@link UnsupportedOperationException}.
+     *
+     * @param snapshot The snapshot to use when updating the table.
+     */
+    void update(final @NotNull Snapshot snapshot);
+}
diff --git a/extensions/iceberg/src/main/java/io/deephaven/iceberg/util/IcebergTableAdapter.java b/extensions/iceberg/src/main/java/io/deephaven/iceberg/util/IcebergTableAdapter.java
new file mode 100644
index 00000000000..dff4f620a25
--- /dev/null
+++ b/extensions/iceberg/src/main/java/io/deephaven/iceberg/util/IcebergTableAdapter.java
@@ -0,0 +1,589 @@
+//
+// Copyright (c) 2016-2024 Deephaven Data Labs and Patent Pending
+//
+package io.deephaven.iceberg.util;
+
+import io.deephaven.api.util.NameValidator;
+import io.deephaven.engine.context.ExecutionContext;
+import io.deephaven.engine.rowset.RowSetFactory;
+import io.deephaven.engine.table.ColumnDefinition;
+import io.deephaven.engine.table.ColumnSource;
+import io.deephaven.engine.table.Table;
+import io.deephaven.engine.table.TableDefinition;
+import io.deephaven.engine.table.impl.QueryTable;
+import io.deephaven.engine.table.impl.locations.TableDataException;
+import io.deephaven.engine.table.impl.locations.TableKey;
+import io.deephaven.engine.table.impl.locations.impl.StandaloneTableKey;
+import io.deephaven.engine.table.impl.locations.util.TableDataRefreshService;
+import io.deephaven.engine.table.impl.sources.InMemoryColumnSource;
+import io.deephaven.engine.table.impl.sources.regioned.RegionedTableComponentFactoryImpl;
+import io.deephaven.engine.updategraph.UpdateSourceRegistrar;
+import io.deephaven.engine.util.TableTools;
+import io.deephaven.iceberg.base.IcebergUtils.SpecAndSchema;
+import io.deephaven.iceberg.internal.DataInstructionsProviderLoader;
+import io.deephaven.iceberg.layout.*;
+import io.deephaven.iceberg.location.IcebergTableLocationFactory;
+import io.deephaven.iceberg.location.IcebergTableLocationKey;
+import io.deephaven.time.DateTimeUtils;
+import io.deephaven.util.annotations.InternalUseOnly;
+import io.deephaven.util.annotations.VisibleForTesting;
+import org.apache.iceberg.PartitionField;
+import org.apache.iceberg.PartitionSpec;
+import org.apache.iceberg.Schema;
+import org.apache.iceberg.Snapshot;
+import org.apache.iceberg.catalog.Catalog;
+import org.apache.iceberg.catalog.TableIdentifier;
+import org.apache.iceberg.types.Type;
+import org.apache.iceberg.types.Types;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
+
+import java.time.Instant;
+import java.util.*;
+import java.util.stream.Collectors;
+
+import static io.deephaven.iceberg.base.IcebergUtils.convertToDHType;
+
+/**
+ * This class manages an Iceberg {@link org.apache.iceberg.Table table} and provides methods to interact with it.
+ */
+public class IcebergTableAdapter {
+    @VisibleForTesting
+    static final TableDefinition SNAPSHOT_DEFINITION = TableDefinition.of(
+            ColumnDefinition.ofLong("Id"),
+            ColumnDefinition.ofTime("Timestamp"),
+            ColumnDefinition.ofString("Operation"),
+            ColumnDefinition.fromGenericType("Summary", Map.class),
+            ColumnDefinition.fromGenericType("SnapshotObject", Snapshot.class));
+
+    private final Catalog catalog;
+    private final org.apache.iceberg.Table table;
+    private final TableIdentifier tableIdentifier;
+    private final DataInstructionsProviderLoader dataInstructionsProviderLoader;
+
+    public IcebergTableAdapter(
+            final Catalog catalog,
+            final TableIdentifier tableIdentifier,
+            final org.apache.iceberg.Table table,
+            final DataInstructionsProviderLoader dataInstructionsProviderLoader) {
+        this.catalog = catalog;
+        this.table = table;
+        this.tableIdentifier = tableIdentifier;
+        this.dataInstructionsProviderLoader = dataInstructionsProviderLoader;
+    }
+
+    /**
+     * {@link Catalog} used to access this table.
+     */
+    public Catalog catalog() {
+        return catalog;
+    }
+
+    /**
+     * Get the Iceberg {@link TableIdentifier table identifier}.
+     */
+    public TableIdentifier tableIdentifier() {
+        return tableIdentifier;
+    }
+
+    /**
+     * Get the current {@link Snapshot snapshot} of a given Iceberg table or {@code null} if there are no snapshots.
+     *
+     * @return The current snapshot of the table or {@code null} if there are no snapshots.
+     */
+    public synchronized Snapshot currentSnapshot() {
+        // Refresh the table to update the current snapshot.
+        refresh();
+        return table.currentSnapshot();
+    }
+
+    /**
+     * Get the current list of all {@link Snapshot snapshots} of the Iceberg table.
+     *
+     * @return A list of all snapshots of the given table.
+     */
+    public synchronized List<Snapshot> listSnapshots() {
+        // Refresh the table to update the snapshot list.
+        refresh();
+        return getSnapshots();
+    }
+
+    /**
+     * Get a list of all {@link Snapshot snapshots} of the Iceberg table (without refreshing).
+     *
+     * @return A list of all snapshots of the given table.
+     */
+    private List<Snapshot> getSnapshots() {
+        final List<Snapshot> snapshots = new ArrayList<>();
+        table.snapshots().forEach(snapshots::add);
+        return snapshots;
+    }
+
+    /**
+     * List all {@link Snapshot snapshots} of a given Iceberg table as a Deephaven {@link Table table}. The resulting
+     * table will be static and contain the following columns:
+     * <table>
+     * <caption></caption>
+     * <tr>
+     * <th>Column Name</th>
+     * <th>Description</th>
+     * </tr>
+     * <tr>
+     * <td>Id</td>
+     * <td>The snapshot identifier (can be used for updating the table or loading a specific snapshot)</td>
+     * </tr>
+     * <tr>
+     * <td>Timestamp</td>
+     * <td>The timestamp of the snapshot</td>
+     * </tr>
+     * <tr>
+     * <td>Operation</td>
+     * <td>The data operation that created this snapshot</td>
+     * </tr>
+     * <tr>
+     * <td>Summary</td>
+     * <td>Additional information about the snapshot from the Iceberg metadata</td>
+     * </tr>
+     * <tr>
+     * <td>SnapshotObject</td>
+     * <td>A Java object containing the Iceberg API snapshot</td>
+     * </tr>
+     * <tr>
+     * </tr>
+     * </table>
+     *
+     * @return A Table containing a list of all tables in the given namespace.
+     */
+    public Table snapshots() {
+        // Retrieve the current list of snapshots
+        final List<Snapshot> snapshots = listSnapshots();
+        final long size = snapshots.size();
+
+        // Create and return a table containing the namespaces as strings
+        final Map<String, ColumnSource<?>> columnSourceMap = new LinkedHashMap<>();
+
+        // Create the column source(s)
+        final long[] idArr = new long[(int) size];
+        columnSourceMap.put("Id", InMemoryColumnSource.getImmutableMemoryColumnSource(idArr, long.class, null));
+
+        final long[] timestampArr = new long[(int) size];
+        columnSourceMap.put("Timestamp",
+                InMemoryColumnSource.getImmutableMemoryColumnSource(timestampArr, Instant.class, null));
+
+        final String[] operatorArr = new String[(int) size];
+        columnSourceMap.put("Operation",
+                InMemoryColumnSource.getImmutableMemoryColumnSource(operatorArr, String.class, null));
+
+        final Map<String, String>[] summaryArr = new Map[(int) size];
+        columnSourceMap.put("Summary",
+                InMemoryColumnSource.getImmutableMemoryColumnSource(summaryArr, Map.class, null));
+
+        final Snapshot[] snapshotArr = new Snapshot[(int) size];
+        columnSourceMap.put("SnapshotObject",
+                InMemoryColumnSource.getImmutableMemoryColumnSource(snapshotArr, Snapshot.class, null));
+
+        // Populate the column source(s)
+        for (int i = 0; i < size; i++) {
+            final Snapshot snapshot = snapshots.get(i);
+            idArr[i] = snapshot.snapshotId();
+            // Provided as millis from epoch, convert to nanos
+            timestampArr[i] = DateTimeUtils.millisToNanos(snapshot.timestampMillis());
+            operatorArr[i] = snapshot.operation();
+            summaryArr[i] = snapshot.summary();
+            snapshotArr[i] = snapshot;
+        }
+
+        // Create and return the table
+        return new QueryTable(SNAPSHOT_DEFINITION, RowSetFactory.flat(size).toTracking(), columnSourceMap);
+    }
+
+    /**
+     * Retrieve a specific {@link Snapshot snapshot} of an Iceberg table.
+     *
+     * @param snapshotId The identifier of the snapshot to load.
+     *
+     * @return An {@link Optional} containing the requested {@link Snapshot} if it exists.
+     */
+    private Optional<Snapshot> snapshot(final long snapshotId) {
+        Optional<Snapshot> found = getSnapshots().stream()
+                .filter(snapshot -> snapshot.snapshotId() == snapshotId)
+                .findFirst();
+        if (found.isEmpty()) {
+            // Refresh the table to update the snapshot list, then try again.
+            refresh();
+            found = getSnapshots().stream()
+                    .filter(snapshot -> snapshot.snapshotId() == snapshotId)
+                    .findFirst();
+        }
+        return found;
+    }
+
+    /**
+     * Retrieve the current {@link Schema schema} of an Iceberg table.
+     */
+    public synchronized Schema currentSchema() {
+        refresh();
+        return table.schema();
+    }
+
+    /**
+     * Retrieve the current {@link Schema schema} of an Iceberg table.
+     */
+    public synchronized Map<Integer, Schema> schemas() {
+        refresh();
+        return Map.copyOf(table.schemas());
+    }
+
+    /**
+     * Retrieve a specific {@link Schema schema} of an Iceberg table.
+     *
+     * @param schemaId The identifier of the schema to load.
+     */
+    public synchronized Optional<Schema> schema(final int schemaId) {
+        Schema found = table.schemas().get(schemaId);
+        if (found == null) {
+            // Refresh the table to update the snapshot list, then try again.
+            refresh();
+            found = table.schemas().get(schemaId);
+        }
+        return Optional.ofNullable(found);
+    }
+
+    /**
+     * Retrieves the appropriate {@link Snapshot} based on the provided {@link IcebergReadInstructions}, or {@code null}
+     * if no {@link IcebergReadInstructions#snapshot() snapshot} or {@link IcebergReadInstructions#snapshotId()
+     * snapshotId} is provided.
+     */
+    @InternalUseOnly
+    @Nullable
+    public Snapshot getSnapshot(@NotNull final IcebergReadInstructions readInstructions) {
+        if (readInstructions.snapshot().isPresent()) {
+            return readInstructions.snapshot().get();
+        } else if (readInstructions.snapshotId().isPresent()) {
+            return snapshot(readInstructions.snapshotId().getAsLong())
+                    .orElseThrow(() -> new IllegalArgumentException(
+                            "Snapshot with id " + readInstructions.snapshotId().getAsLong() + " not found for " +
+                                    "table " + tableIdentifier));
+        }
+        return null;
+    }
+
+    /**
+     * Retrieve the schema and partition spec for the table based on the provided read instructions. Also, populate the
+     * read instructions with the requested snapshot, or the latest snapshot if none is requested.
+     */
+    private SpecAndSchema getSpecAndSchema(@NotNull final IcebergReadInstructions readInstructions) {
+        final Snapshot snapshot;
+        final Schema schema;
+        final PartitionSpec partitionSpec;
+        final IcebergReadInstructions updatedInstructions;
+
+        final Snapshot snapshotFromInstructions = getSnapshot(readInstructions);
+        if (snapshotFromInstructions == null) {
+            synchronized (this) {
+                // Refresh only once and record the current schema and partition spec.
+                refresh();
+                snapshot = table.currentSnapshot();
+                schema = table.schema();
+                partitionSpec = table.spec();
+            }
+            if (snapshot != null) {
+                // Update the read instructions with the snapshot.
+                updatedInstructions = readInstructions.withSnapshot(snapshot);
+            } else {
+                updatedInstructions = readInstructions;
+            }
+        } else {
+            // Use the schema from the snapshot
+            snapshot = snapshotFromInstructions;
+            schema = schema(snapshot.schemaId()).orElseThrow(() -> new IllegalArgumentException(
+                    "Schema with id " + snapshot.schemaId() + " not found for table " + tableIdentifier + ", snapshot "
+                            + snapshot.snapshotId()));
+            partitionSpec = table.spec();
+            updatedInstructions = readInstructions.withSnapshot(snapshot);
+        }
+
+        return new SpecAndSchema(schema, partitionSpec, updatedInstructions);
+    }
+
+    /**
+     * Return {@link TableDefinition table definition} corresponding to this iceberg table
+     *
+     * @return The table definition
+     */
+    public TableDefinition definition() {
+        return definition(IcebergReadInstructions.DEFAULT);
+    }
+
+    /**
+     * Return {@link TableDefinition table definition} corresponding to this iceberg table
+     *
+     * @param readInstructions The instructions for customizations while reading the table.
+     * @return The table definition
+     */
+    public TableDefinition definition(@NotNull final IcebergReadInstructions readInstructions) {
+        final SpecAndSchema specAndSchema = getSpecAndSchema(readInstructions);
+        final Schema schema = specAndSchema.schema;
+        final PartitionSpec partitionSpec = specAndSchema.partitionSpec;
+        final IcebergReadInstructions updatedInstructions = specAndSchema.readInstructions;
+
+        return fromSchema(schema,
+                partitionSpec,
+                updatedInstructions.tableDefinition().orElse(null),
+                getRenameColumnMap(table, schema, updatedInstructions));
+    }
+
+    /**
+     * Return {@link Table table} containing the {@link TableDefinition definition} of this Iceberg table.
+     *
+     * @return The table definition as a Deephaven table
+     */
+    public Table definitionTable() {
+        return definitionTable(IcebergReadInstructions.DEFAULT);
+    }
+
+    /**
+     * Return {@link Table table} containing the {@link TableDefinition definition} of this Iceberg table.
+     *
+     * @param readInstructions The instructions for customizations while reading the table.
+     * @return The table definition as a Deephaven table
+     */
+    public Table definitionTable(final IcebergReadInstructions readInstructions) {
+        return TableTools.metaTable(definition(readInstructions));
+    }
+
+    /**
+     * Read the latest snapshot of this Iceberg table from the Iceberg catalog as a Deephaven {@link Table table}.
+     *
+     * @return The loaded table
+     */
+    public IcebergTable table() {
+        return table(IcebergReadInstructions.DEFAULT);
+    }
+
+    /**
+     * Read a snapshot of this Iceberg table from the Iceberg catalog as a Deephaven {@link Table table}.
+     *
+     * @param readInstructions The instructions for customizations while reading the table.
+     * @return The loaded table
+     */
+    public IcebergTable table(@NotNull final IcebergReadInstructions readInstructions) {
+        final SpecAndSchema specAndSchema = getSpecAndSchema(readInstructions);
+        final Schema schema = specAndSchema.schema;
+        final PartitionSpec partitionSpec = specAndSchema.partitionSpec;
+        IcebergReadInstructions updatedInstructions = specAndSchema.readInstructions;
+
+        // Get the user supplied table definition.
+        final TableDefinition userTableDef = updatedInstructions.tableDefinition().orElse(null);
+
+        // Map all the column names in the schema to their legalized names.
+        final Map<String, String> legalizedColumnRenames = getRenameColumnMap(table, schema, updatedInstructions);
+
+        // Get the table definition from the schema (potentially limited by the user supplied table definition and
+        // applying column renames).
+        final TableDefinition tableDef = fromSchema(schema, partitionSpec, userTableDef, legalizedColumnRenames);
+
+        // Create the final instructions with the legalized column renames.
+        updatedInstructions = updatedInstructions.withColumnRenames(legalizedColumnRenames);
+
+        final IcebergBaseLayout keyFinder;
+        if (partitionSpec.isUnpartitioned()) {
+            // Create the flat layout location key finder
+            keyFinder = new IcebergFlatLayout(this, updatedInstructions, dataInstructionsProviderLoader);
+        } else {
+            // Create the partitioning column location key finder
+            keyFinder = new IcebergKeyValuePartitionedLayout(this, partitionSpec, updatedInstructions,
+                    dataInstructionsProviderLoader);
+        }
+
+        if (updatedInstructions.updateMode().updateType() == IcebergUpdateMode.IcebergUpdateType.STATIC) {
+            final IcebergTableLocationProviderBase<TableKey, IcebergTableLocationKey> locationProvider =
+                    new IcebergStaticTableLocationProvider<>(
+                            StandaloneTableKey.getInstance(),
+                            keyFinder,
+                            new IcebergTableLocationFactory(),
+                            tableIdentifier);
+
+            return new IcebergTableImpl(
+                    tableDef,
+                    tableIdentifier.toString(),
+                    RegionedTableComponentFactoryImpl.INSTANCE,
+                    locationProvider,
+                    null);
+        }
+
+        final UpdateSourceRegistrar updateSourceRegistrar = ExecutionContext.getContext().getUpdateGraph();
+        final IcebergTableLocationProviderBase<TableKey, IcebergTableLocationKey> locationProvider;
+
+        if (updatedInstructions.updateMode().updateType() == IcebergUpdateMode.IcebergUpdateType.MANUAL_REFRESHING) {
+            locationProvider = new IcebergManualRefreshTableLocationProvider<>(
+                    StandaloneTableKey.getInstance(),
+                    keyFinder,
+                    new IcebergTableLocationFactory(),
+                    this,
+                    tableIdentifier);
+        } else {
+            locationProvider = new IcebergAutoRefreshTableLocationProvider<>(
+                    StandaloneTableKey.getInstance(),
+                    keyFinder,
+                    new IcebergTableLocationFactory(),
+                    TableDataRefreshService.getSharedRefreshService(),
+                    updatedInstructions.updateMode().autoRefreshMs(),
+                    this,
+                    tableIdentifier);
+        }
+
+        return new IcebergTableImpl(
+                tableDef,
+                tableIdentifier.toString(),
+                RegionedTableComponentFactoryImpl.INSTANCE,
+                locationProvider,
+                updateSourceRegistrar);
+    }
+
+    /**
+     * Refresh the table with the latest information from the Iceberg catalog, including new snapshots and schema.
+     */
+    public synchronized void refresh() {
+        table.refresh();
+    }
+
+    /**
+     * Return the underlying Iceberg table.
+     */
+    public org.apache.iceberg.Table icebergTable() {
+        return table;
+    }
+
+    @Override
+    public String toString() {
+        return table.toString();
+    }
+
+    /**
+     * Get a legalized column rename map from a table schema and user instructions.
+     */
+    private Map<String, String> getRenameColumnMap(
+            @NotNull final org.apache.iceberg.Table table,
+            @NotNull final Schema schema,
+            @NotNull final IcebergReadInstructions instructions) {
+
+        final Set<String> takenNames = new HashSet<>();
+
+        // Map all the column names in the schema to their legalized names.
+        final Map<String, String> legalizedColumnRenames = new HashMap<>();
+
+        // Validate user-supplied names meet legalization instructions
+        for (final Map.Entry<String, String> entry : instructions.columnRenames().entrySet()) {
+            final String destinationName = entry.getValue();
+            if (!NameValidator.isValidColumnName(destinationName)) {
+                throw new TableDataException(
+                        String.format("%s - invalid column name provided (%s)", table, destinationName));
+            }
+            // Add these renames to the legalized list.
+            legalizedColumnRenames.put(entry.getKey(), destinationName);
+            takenNames.add(destinationName);
+        }
+
+        for (final Types.NestedField field : schema.columns()) {
+            final String name = field.name();
+            // Do we already have a valid rename for this column from the user or a partitioned column?
+            if (!legalizedColumnRenames.containsKey(name)) {
+                final String legalizedName =
+                        NameValidator.legalizeColumnName(name, s -> s.replace(" ", "_"), takenNames);
+                if (!legalizedName.equals(name)) {
+                    legalizedColumnRenames.put(name, legalizedName);
+                    takenNames.add(legalizedName);
+                }
+            }
+        }
+
+        return legalizedColumnRenames;
+    }
+
+    /**
+     * Create a single {@link TableDefinition} from a given Schema, PartitionSpec, and TableDefinition. Takes into
+     * account {@link Map<> column rename instructions}
+     *
+     * @param schema The schema of the table.
+     * @param partitionSpec The partition specification of the table.
+     * @param userTableDef The table definition.
+     * @param columnRenameMap The map for renaming columns.
+     * @return The generated TableDefinition.
+     */
+    private static TableDefinition fromSchema(
+            @NotNull final Schema schema,
+            @NotNull final PartitionSpec partitionSpec,
+            @Nullable final TableDefinition userTableDef,
+            @NotNull final Map<String, String> columnRenameMap) {
+
+        final Set<String> columnNames = userTableDef != null
+                ? userTableDef.getColumnNameSet()
+                : null;
+
+        final Set<String> partitionNames =
+                partitionSpec.fields().stream()
+                        .map(PartitionField::name)
+                        .map(colName -> columnRenameMap.getOrDefault(colName, colName))
+                        .collect(Collectors.toSet());
+
+        final List<ColumnDefinition<?>> columns = new ArrayList<>();
+
+        for (final Types.NestedField field : schema.columns()) {
+            final String name = columnRenameMap.getOrDefault(field.name(), field.name());
+            // Skip columns that are not in the provided table definition.
+            if (columnNames != null && !columnNames.contains(name)) {
+                continue;
+            }
+            final Type type = field.type();
+            final io.deephaven.qst.type.Type<?> qstType = convertToDHType(type);
+            final ColumnDefinition<?> column;
+            if (partitionNames.contains(name)) {
+                column = ColumnDefinition.of(name, qstType).withPartitioning();
+            } else {
+                column = ColumnDefinition.of(name, qstType);
+            }
+            columns.add(column);
+        }
+
+        final TableDefinition icebergTableDef = TableDefinition.of(columns);
+        if (userTableDef == null) {
+            return icebergTableDef;
+        }
+
+        // If the user supplied a table definition, make sure it's fully compatible.
+        final TableDefinition tableDef = icebergTableDef.checkCompatibility(userTableDef);
+
+        // Ensure that the user has not marked non-partitioned columns as partitioned.
+        final Set<String> userPartitionColumns = userTableDef.getPartitioningColumns().stream()
+                .map(ColumnDefinition::getName)
+                .collect(Collectors.toSet());
+        final Set<String> partitionColumns = tableDef.getPartitioningColumns().stream()
+                .map(ColumnDefinition::getName)
+                .collect(Collectors.toSet());
+
+        // The working partitioning column set must be a super-set of the user-supplied set.
+        if (!partitionColumns.containsAll(userPartitionColumns)) {
+            final Set<String> invalidColumns = new HashSet<>(userPartitionColumns);
+            invalidColumns.removeAll(partitionColumns);
+
+            throw new TableDataException("The following columns are not partitioned in the Iceberg table: " +
+                    invalidColumns);
+        }
+        return tableDef;
+    }
+
+    /**
+     * Create a new {@link IcebergTableWriter} for this Iceberg table using the provided {@link TableWriterOptions}.
+     * <p>
+     * This method will perform schema validation to ensure that the provided
+     * {@link TableWriterOptions#tableDefinition()} is compatible with the Iceberg table schema. All further writes
+     * performed by the returned writer will not be validated against the table's schema, and thus will be faster.
+     *
+     * @param tableWriterOptions The options to configure the table writer.
+     * @return A new instance of {@link IcebergTableWriter} configured with the provided options.
+     */
+    public IcebergTableWriter tableWriter(final TableWriterOptions tableWriterOptions) {
+        return new IcebergTableWriter(tableWriterOptions, this);
+    }
+}
diff --git a/extensions/iceberg/src/main/java/io/deephaven/iceberg/util/IcebergTableImpl.java b/extensions/iceberg/src/main/java/io/deephaven/iceberg/util/IcebergTableImpl.java
new file mode 100644
index 00000000000..a801cf5bebe
--- /dev/null
+++ b/extensions/iceberg/src/main/java/io/deephaven/iceberg/util/IcebergTableImpl.java
@@ -0,0 +1,60 @@
+//
+// Copyright (c) 2016-2024 Deephaven Data Labs and Patent Pending
+//
+package io.deephaven.iceberg.util;
+
+import io.deephaven.engine.table.TableDefinition;
+import io.deephaven.engine.table.impl.PartitionAwareSourceTable;
+import io.deephaven.engine.table.impl.SourceTableComponentFactory;
+import io.deephaven.engine.table.impl.locations.TableKey;
+import io.deephaven.engine.updategraph.UpdateSourceRegistrar;
+import io.deephaven.iceberg.layout.IcebergTableLocationProviderBase;
+import io.deephaven.iceberg.location.IcebergTableLocationKey;
+import org.apache.iceberg.Snapshot;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
+
+/**
+ * Table implementation for static and refreshing Iceberg tables.
+ */
+public class IcebergTableImpl extends PartitionAwareSourceTable implements IcebergTable {
+    /**
+     * Location discovery.
+     */
+    final IcebergTableLocationProviderBase<TableKey, IcebergTableLocationKey> locationProvider;
+
+    /**
+     * Create an instance of the class with the provided parameters.
+     *
+     * @param tableDefinition The {@link TableDefinition} describing the table schema
+     * @param description A human-readable description for this table
+     * @param componentFactory A component factory for creating column source managers
+     * @param locationProvider A {@link IcebergTableLocationProviderBase}, for use in discovering the locations that
+     *        compose this table
+     * @param updateSourceRegistrar Callback for registering live tables for refreshes, null if this table is not live
+     */
+    IcebergTableImpl(
+            @NotNull TableDefinition tableDefinition,
+            @NotNull String description,
+            @NotNull SourceTableComponentFactory componentFactory,
+            @NotNull IcebergTableLocationProviderBase<TableKey, IcebergTableLocationKey> locationProvider,
+            @Nullable UpdateSourceRegistrar updateSourceRegistrar) {
+        super(tableDefinition, description, componentFactory, locationProvider, updateSourceRegistrar);
+        this.locationProvider = locationProvider;
+    }
+
+    @Override
+    public void update() {
+        locationProvider.update();
+    }
+
+    @Override
+    public void update(final long snapshotId) {
+        locationProvider.update(snapshotId);
+    }
+
+    @Override
+    public void update(final @NotNull Snapshot snapshot) {
+        locationProvider.update(snapshot);
+    }
+}
diff --git a/extensions/iceberg/src/main/java/io/deephaven/iceberg/util/IcebergTableWriter.java b/extensions/iceberg/src/main/java/io/deephaven/iceberg/util/IcebergTableWriter.java
new file mode 100644
index 00000000000..1f4fa3597af
--- /dev/null
+++ b/extensions/iceberg/src/main/java/io/deephaven/iceberg/util/IcebergTableWriter.java
@@ -0,0 +1,525 @@
+//
+// Copyright (c) 2016-2024 Deephaven Data Labs and Patent Pending
+//
+package io.deephaven.iceberg.util;
+
+import io.deephaven.base.Pair;
+import io.deephaven.base.verify.Require;
+import io.deephaven.engine.context.ExecutionContext;
+import io.deephaven.engine.context.QueryScope;
+import io.deephaven.engine.context.StandaloneQueryScope;
+import io.deephaven.engine.table.ColumnDefinition;
+import io.deephaven.engine.table.Table;
+import io.deephaven.engine.table.TableDefinition;
+import io.deephaven.engine.table.impl.locations.TableDataException;
+import io.deephaven.parquet.table.CompletedParquetWrite;
+import io.deephaven.parquet.table.ParquetInstructions;
+import io.deephaven.parquet.table.ParquetTools;
+import io.deephaven.iceberg.util.SchemaProviderInternal.SchemaProviderImpl;
+import io.deephaven.util.SafeCloseable;
+import org.apache.iceberg.AppendFiles;
+import org.apache.iceberg.DataFile;
+import org.apache.iceberg.DataFiles;
+import org.apache.iceberg.FileFormat;
+import org.apache.iceberg.HasTableOperations;
+import org.apache.iceberg.PartitionData;
+import org.apache.iceberg.PartitionField;
+import org.apache.iceberg.PartitionSpec;
+import org.apache.iceberg.Schema;
+import org.apache.iceberg.TableMetadata;
+import org.apache.iceberg.TableProperties;
+import org.apache.iceberg.Transaction;
+import org.apache.iceberg.encryption.EncryptedOutputFile;
+import org.apache.iceberg.io.OutputFileFactory;
+import org.apache.iceberg.mapping.MappedField;
+import org.apache.iceberg.mapping.NameMapping;
+import org.apache.iceberg.mapping.NameMappingParser;
+import org.apache.iceberg.types.Conversions;
+import org.apache.iceberg.types.Type;
+import org.apache.iceberg.types.Types;
+import org.jetbrains.annotations.NotNull;
+
+import java.time.Instant;
+import java.time.LocalDate;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Random;
+
+import static io.deephaven.iceberg.base.IcebergUtils.verifyPartitioningColumns;
+import static io.deephaven.iceberg.base.IcebergUtils.verifyRequiredFields;
+
+/**
+ * This class is responsible for writing Deephaven tables to an Iceberg table. Each instance of this class is associated
+ * with a single {@link IcebergTableAdapter} and can be used to write multiple Deephaven tables to this Iceberg table.
+ */
+public class IcebergTableWriter {
+
+    /**
+     * The options used to configure the behavior of this writer instance.
+     */
+    private final TableParquetWriterOptions tableWriterOptions;
+
+    /**
+     * The Iceberg table which will be written to by this instance.
+     */
+    private final org.apache.iceberg.Table table;
+
+    /**
+     * Store the partition spec of the Iceberg table at the time of creation of this writer instance and use it for all
+     * writes, so that even if the table spec, the writer will still work.
+     */
+    private final PartitionSpec tableSpec;
+
+    /**
+     * The table definition used for all writes by this writer instance.
+     */
+    private final TableDefinition tableDefinition;
+
+    /**
+     * The table definition consisting of non-partitioning columns from {@link #tableDefinition}. All tables written by
+     * this writer are expected to have a compatible definition with this.
+     */
+    private final TableDefinition nonPartitioningTableDefinition;
+
+    /**
+     * The schema to use when in conjunction with the {@link #fieldIdToColumnName} to map Deephaven columns from
+     * {@link #tableDefinition} to Iceberg columns.
+     */
+    private final Schema userSchema;
+
+    /**
+     * Mapping from Iceberg field IDs to Deephaven column names, populated inside the parquet file.
+     */
+    private final Map<Integer, String> fieldIdToColumnName;
+
+    /**
+     * The factory to create new output file locations for writing data files.
+     */
+    private final OutputFileFactory outputFileFactory;
+
+    /**
+     * Characters to be used for generating random variable names of length {@link #VARIABLE_NAME_LENGTH}.
+     */
+    private static final String CHARACTERS = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz";
+    private static final int VARIABLE_NAME_LENGTH = 6;
+
+    IcebergTableWriter(
+            final TableWriterOptions tableWriterOptions,
+            final IcebergTableAdapter tableAdapter) {
+        this.tableWriterOptions = verifyWriterOptions(tableWriterOptions);
+        this.table = tableAdapter.icebergTable();
+
+        this.tableSpec = table.spec();
+
+        this.tableDefinition = tableWriterOptions.tableDefinition();
+        this.nonPartitioningTableDefinition = nonPartitioningTableDefinition(tableDefinition);
+        verifyRequiredFields(table.schema(), tableDefinition);
+        verifyPartitioningColumns(tableSpec, tableDefinition);
+
+        this.userSchema = ((SchemaProviderImpl) tableWriterOptions.schemaProvider()).getSchema(table);
+        verifyFieldIdsInSchema(tableWriterOptions.fieldIdToColumnName().keySet(), userSchema);
+
+        // Create a copy of the fieldIdToColumnName map since we might need to add new entries for columns which are not
+        // provided by the user.
+        this.fieldIdToColumnName = new HashMap<>(tableWriterOptions.fieldIdToColumnName());
+        addFieldIdsForAllColumns();
+
+        outputFileFactory = OutputFileFactory.builderFor(table, 0, 0)
+                .format(FileFormat.PARQUET)
+                .build();
+    }
+
+    private static TableParquetWriterOptions verifyWriterOptions(
+            @NotNull final TableWriterOptions tableWriterOptions) {
+        // We ony support writing to Parquet files
+        if (!(tableWriterOptions instanceof TableParquetWriterOptions)) {
+            throw new IllegalArgumentException(
+                    "Unsupported options of class " + tableWriterOptions.getClass() + " for" +
+                            " writing Iceberg table, expected: " + TableParquetWriterOptions.class);
+        }
+        return (TableParquetWriterOptions) tableWriterOptions;
+    }
+
+    /**
+     * Return a {@link TableDefinition} which contains only the non-partitioning columns from the provided table
+     * definition.
+     */
+    private static TableDefinition nonPartitioningTableDefinition(
+            @NotNull final TableDefinition tableDefinition) {
+        final Collection<ColumnDefinition<?>> nonPartitioningColumns = new ArrayList<>();
+        for (final ColumnDefinition<?> columnDefinition : tableDefinition.getColumns()) {
+            if (!columnDefinition.isPartitioning()) {
+                nonPartitioningColumns.add(columnDefinition);
+            }
+        }
+        return TableDefinition.of(nonPartitioningColumns);
+    }
+
+    /**
+     * Check that all the field IDs are present in the schema.
+     */
+    private static void verifyFieldIdsInSchema(final Collection<Integer> fieldIds, final Schema schema) {
+        if (!fieldIds.isEmpty()) {
+            for (final Integer fieldId : fieldIds) {
+                if (schema.findField(fieldId) == null) {
+                    throw new IllegalArgumentException("Column corresponding to field ID " + fieldId + " not " +
+                            "found in schema, available columns in schema are: " + schema.columns());
+                }
+            }
+        }
+    }
+
+    /**
+     * Populate the {@link #fieldIdToColumnName} map for all the columns in the {@link #tableDefinition} and do
+     * additional checks to ensure that the table definition is compatible with schema provided by user.
+     */
+    private void addFieldIdsForAllColumns() {
+        final Map<String, Integer> dhColumnNameToFieldId = tableWriterOptions.dhColumnNameToFieldId();
+        Map<String, Integer> nameMappingDefault = null; // Lazily initialized
+        for (final ColumnDefinition<?> columnDefinition : tableDefinition.getColumns()) {
+            final String columnName = columnDefinition.getName();
+
+            // We are done if we already have the mapping between column name and field ID
+            if (dhColumnNameToFieldId.containsKey(columnName)) {
+                continue;
+            }
+
+            // To be populated by the end of this block for each column, else throw an exception
+            Integer fieldId = null;
+            Types.NestedField nestedField;
+
+            // Check in the schema.name_mapping.default map
+            if (nameMappingDefault == null) {
+                nameMappingDefault = readNameMappingDefault();
+            }
+            fieldId = nameMappingDefault.get(columnName);
+            if (fieldId != null) {
+                nestedField = userSchema.findField(fieldId);
+                if (nestedField == null) {
+                    throw new IllegalArgumentException("Field ID " + fieldId + " extracted for " +
+                            "column " + columnName + " from the schema.name_mapping map not found in schema " +
+                            userSchema);
+                }
+            }
+
+            // Directly lookup in the user provided schema using column name
+            if (fieldId == null) {
+                nestedField = userSchema.findField(columnName);
+                if (nestedField != null) {
+                    fieldId = nestedField.fieldId();
+                }
+            }
+
+            if (fieldId == null) {
+                throw new IllegalArgumentException("Column " + columnName + " not found in the schema or " +
+                        "the name mapping for the table");
+            }
+
+            fieldIdToColumnName.put(fieldId, columnName);
+        }
+    }
+
+    /**
+     * Build the mapping from column names to field IDs on demand using the
+     * {@value TableProperties#DEFAULT_NAME_MAPPING} map.
+     * <p>
+     * Return an empty map if the table metadata is null or the mapping is not present in the table metadata.
+     */
+    private Map<String, Integer> readNameMappingDefault() {
+        final TableMetadata tableMetadata;
+        if (table instanceof HasTableOperations) {
+            tableMetadata = ((HasTableOperations) table).operations().current();
+        } else {
+            // TableMetadata is not available, so nothing to add to the map
+            return Map.of();
+        }
+        final String nameMappingJson = tableMetadata.property(TableProperties.DEFAULT_NAME_MAPPING, null);
+        if (nameMappingJson == null) {
+            return Map.of();
+        }
+        // Iterate over all mapped fields and build a reverse map from column name to field ID
+        final Map<String, Integer> nameMappingDefault = new HashMap<>();
+        final NameMapping nameMapping = NameMappingParser.fromJson(nameMappingJson);
+        for (final MappedField field : nameMapping.asMappedFields().fields()) {
+            final Integer fieldId = field.id();
+            for (final String name : field.names()) {
+                nameMappingDefault.put(name, fieldId);
+            }
+        }
+        return nameMappingDefault;
+    }
+
+    /**
+     * Append the provided Deephaven {@link IcebergWriteInstructions#tables()} as new partitions to the existing Iceberg
+     * table in a single snapshot. This method will not perform any compatibility checks between the existing schema and
+     * the provided Deephaven tables.
+     *
+     * @param writeInstructions The instructions for customizations while writing.
+     */
+    public void append(@NotNull final IcebergWriteInstructions writeInstructions) {
+        final List<DataFile> dataFilesWritten = writeDataFiles(writeInstructions);
+        commit(dataFilesWritten);
+    }
+
+    /**
+     * Writes data from Deephaven {@link IcebergWriteInstructions#tables()} to an Iceberg table without creating a new
+     * snapshot. This method returns a list of data files that were written. Users can use this list to create a
+     * transaction/snapshot if needed. This method will not perform any compatibility checks between the existing schema
+     * and the provided Deephaven tables.
+     *
+     * @param writeInstructions The instructions for customizations while writing.
+     */
+    public List<DataFile> writeDataFiles(@NotNull final IcebergWriteInstructions writeInstructions) {
+        verifyCompatible(writeInstructions.tables(), nonPartitioningTableDefinition);
+        final List<String> partitionPaths = writeInstructions.partitionPaths();
+        verifyPartitionPaths(tableSpec, partitionPaths);
+        final List<PartitionData> partitionData;
+        final List<CompletedParquetWrite> parquetFileInfo;
+        // Start a new query scope to avoid polluting the existing query scope with new parameters added for
+        // partitioning columns
+        try (final SafeCloseable _ignore =
+                ExecutionContext.getContext().withQueryScope(new StandaloneQueryScope()).open()) {
+            final Pair<List<PartitionData>, List<String[]>> ret = partitionDataFromPaths(tableSpec, partitionPaths);
+            partitionData = ret.getFirst();
+            final List<String[]> dhTableUpdateStrings = ret.getSecond();
+            parquetFileInfo = writeParquet(partitionData, dhTableUpdateStrings, writeInstructions);
+        }
+        return dataFilesFromParquet(parquetFileInfo, partitionData);
+    }
+
+    /**
+     * Verify that all the tables are compatible with the provided table definition.
+     */
+    private static void verifyCompatible(
+            @NotNull final Iterable<Table> tables,
+            @NotNull final TableDefinition expectedDefinition) {
+        for (final Table table : tables) {
+            expectedDefinition.checkMutualCompatibility(table.getDefinition());
+        }
+    }
+
+    private static void verifyPartitionPaths(
+            final PartitionSpec partitionSpec,
+            final Collection<String> partitionPaths) {
+        if (partitionSpec.isPartitioned() && partitionPaths.isEmpty()) {
+            throw new IllegalArgumentException("Cannot write data to a partitioned table without partition paths.");
+        }
+        if (!partitionSpec.isPartitioned() && !partitionPaths.isEmpty()) {
+            throw new IllegalArgumentException("Cannot write data to an un-partitioned table with partition paths.");
+        }
+    }
+
+    /**
+     * Creates a list of {@link PartitionData} and corresponding update strings for Deephaven tables from partition
+     * paths and spec. Also, validates that the partition paths are compatible with the provided partition spec.
+     *
+     * @param partitionSpec The partition spec to use for validation.
+     * @param partitionPaths The list of partition paths to process.
+     * @return A pair containing a list of PartitionData objects and a list of update strings for Deephaven tables.
+     * @throws IllegalArgumentException if the partition paths are not compatible with the partition spec.
+     *
+     * @implNote Check implementations of {@link DataFiles#data} and {@link Conversions#fromPartitionString} for more
+     *           details on how partition paths should be parsed, how each type of value is parsed from a string and
+     *           what types are allowed for partitioning columns.
+     */
+    private static Pair<List<PartitionData>, List<String[]>> partitionDataFromPaths(
+            final PartitionSpec partitionSpec,
+            final Collection<String> partitionPaths) {
+        final List<PartitionData> partitionDataList = new ArrayList<>(partitionPaths.size());
+        final List<String[]> dhTableUpdateStringList = new ArrayList<>(partitionPaths.size());
+        final int numPartitioningFields = partitionSpec.fields().size();
+        final QueryScope queryScope = ExecutionContext.getContext().getQueryScope();
+        for (final String partitionPath : partitionPaths) {
+            final String[] dhTableUpdateString = new String[numPartitioningFields];
+            try {
+                final String[] partitions = partitionPath.split("/", -1);
+                if (partitions.length != numPartitioningFields) {
+                    throw new IllegalArgumentException("Expecting " + numPartitioningFields + " number of fields, " +
+                            "found " + partitions.length);
+                }
+                final PartitionData partitionData = new PartitionData(partitionSpec.partitionType());
+                for (int colIdx = 0; colIdx < partitions.length; colIdx += 1) {
+                    final String[] parts = partitions[colIdx].split("=", 2);
+                    if (parts.length != 2) {
+                        throw new IllegalArgumentException("Expecting key=value format, found " + partitions[colIdx]);
+                    }
+                    final PartitionField field = partitionSpec.fields().get(colIdx);
+                    if (!field.name().equals(parts[0])) {
+                        throw new IllegalArgumentException("Expecting field name " + field.name() + " at idx " +
+                                colIdx + ", found " + parts[0]);
+                    }
+                    final Type type = partitionData.getType(colIdx);
+                    dhTableUpdateString[colIdx] = getTableUpdateString(field.name(), type, parts[1], queryScope);
+                    partitionData.set(colIdx, Conversions.fromPartitionString(partitionData.getType(colIdx), parts[1]));
+                }
+            } catch (final Exception e) {
+                throw new IllegalArgumentException("Failed to parse partition path: " + partitionPath + " using" +
+                        " partition spec " + partitionSpec + ", check cause for more details ", e);
+            }
+            dhTableUpdateStringList.add(dhTableUpdateString);
+            partitionDataList.add(DataFiles.data(partitionSpec, partitionPath));
+        }
+        return new Pair<>(partitionDataList, dhTableUpdateStringList);
+    }
+
+    /**
+     * This method would convert a partitioning column info to a string which can be used in
+     * {@link io.deephaven.engine.table.Table#updateView(Collection) Table#updateView} method. For example, if the
+     * partitioning column of name "partitioningColumnName" if of type {@link Types.TimestampType} and the value is
+     * "2021-01-01T00:00:00Z", then this method would:
+     * <ul>
+     * <li>Add a new parameter to the query scope with a random name and value as {@link Instant} parsed from the string
+     * "2021-01-01T00:00:00Z"</li>
+     * <li>Return the string "partitioningColumnName = randomName"</li>
+     * </ul>
+     *
+     * @param colName The name of the partitioning column
+     * @param colType The type of the partitioning column
+     * @param value The value of the partitioning column
+     * @param queryScope The query scope to add the parameter to
+     */
+    private static String getTableUpdateString(
+            @NotNull final String colName,
+            @NotNull final Type colType,
+            @NotNull final String value,
+            @NotNull final QueryScope queryScope) {
+        // Randomly generated name to be added to the query scope for each value to avoid repeated casts
+        // TODO(deephaven-core#6418): Find a better way to handle these table updates instead of using query scope
+        final String paramName = generateRandomAlphabetString(VARIABLE_NAME_LENGTH);
+        final Type.TypeID typeId = colType.typeId();
+        if (typeId == Type.TypeID.BOOLEAN) {
+            queryScope.putParam(paramName, Boolean.parseBoolean(value));
+        } else if (typeId == Type.TypeID.DOUBLE) {
+            queryScope.putParam(paramName, Double.parseDouble(value));
+        } else if (typeId == Type.TypeID.FLOAT) {
+            queryScope.putParam(paramName, Float.parseFloat(value));
+        } else if (typeId == Type.TypeID.INTEGER) {
+            queryScope.putParam(paramName, Integer.parseInt(value));
+        } else if (typeId == Type.TypeID.LONG) {
+            queryScope.putParam(paramName, Long.parseLong(value));
+        } else if (typeId == Type.TypeID.STRING) {
+            queryScope.putParam(paramName, value);
+        } else if (typeId == Type.TypeID.DATE) {
+            queryScope.putParam(paramName, LocalDate.parse(value));
+        } else {
+            // TODO (deephaven-core#6327) Add support for more partitioning types like Big Decimals
+            throw new TableDataException("Unsupported partitioning column type " + typeId.name());
+        }
+        return colName + " = " + paramName;
+    }
+
+    /**
+     * Generate a random string of length {@code length} using just alphabets.
+     */
+    private static String generateRandomAlphabetString(final int length) {
+        final StringBuilder stringBuilder = new StringBuilder();
+        final Random random = new Random();
+        for (int i = 0; i < length; i++) {
+            final int index = random.nextInt(CHARACTERS.length());
+            stringBuilder.append(CHARACTERS.charAt(index));
+        }
+        return stringBuilder.toString();
+    }
+
+    @NotNull
+    private List<CompletedParquetWrite> writeParquet(
+            @NotNull final List<PartitionData> partitionDataList,
+            @NotNull final List<String[]> dhTableUpdateStrings,
+            @NotNull final IcebergWriteInstructions writeInstructions) {
+        final List<Table> dhTables = writeInstructions.tables();
+        final boolean isPartitioned = tableSpec.isPartitioned();
+        if (isPartitioned) {
+            Require.eq(dhTables.size(), "dhTables.size()",
+                    partitionDataList.size(), "partitionDataList.size()");
+            Require.eq(dhTables.size(), "dhTables.size()",
+                    dhTableUpdateStrings.size(), "dhTableUpdateStrings.size()");
+        } else {
+            Require.eqZero(partitionDataList.size(), "partitionDataList.size()");
+            Require.eqZero(dhTableUpdateStrings.size(), "dhTableUpdateStrings.size()");
+        }
+
+        // Build the parquet instructions
+        final List<CompletedParquetWrite> parquetFilesWritten = new ArrayList<>(dhTables.size());
+        final ParquetInstructions.OnWriteCompleted onWriteCompleted = parquetFilesWritten::add;
+        final ParquetInstructions parquetInstructions = tableWriterOptions.toParquetInstructions(
+                onWriteCompleted, tableDefinition, fieldIdToColumnName);
+
+        // Write the data to parquet files
+        for (int idx = 0; idx < dhTables.size(); idx++) {
+            Table dhTable = dhTables.get(idx);
+            if (dhTable.numColumns() == 0) {
+                // Skip writing empty tables with no columns
+                continue;
+            }
+            final String newDataLocation;
+            if (isPartitioned) {
+                newDataLocation = getDataLocation(partitionDataList.get(idx));
+                dhTable = dhTable.updateView(dhTableUpdateStrings.get(idx));
+            } else {
+                newDataLocation = getDataLocation();
+            }
+            // TODO (deephaven-core#6343): Set writeDefault() values for required columns that not present in the table
+            ParquetTools.writeTable(dhTable, newDataLocation, parquetInstructions);
+        }
+        return parquetFilesWritten;
+    }
+
+    /**
+     * Generate the location string for a new data file for the given partition data.
+     */
+    private String getDataLocation(@NotNull final PartitionData partitionData) {
+        final EncryptedOutputFile outputFile = outputFileFactory.newOutputFile(tableSpec, partitionData);
+        return outputFile.encryptingOutputFile().location();
+    }
+
+    /**
+     * Generate the location string for a new data file for the unpartitioned table.
+     */
+    private String getDataLocation() {
+        final EncryptedOutputFile outputFile = outputFileFactory.newOutputFile();
+        return outputFile.encryptingOutputFile().location();
+    }
+
+    /**
+     * Commit the changes to the Iceberg table by creating a snapshot.
+     */
+    private void commit(
+            @NotNull final Iterable<DataFile> dataFiles) {
+        final Transaction icebergTransaction = table.newTransaction();
+
+        // Append the new data files to the table
+        final AppendFiles append = icebergTransaction.newAppend();
+        dataFiles.forEach(append::appendFile);
+        append.commit();
+
+        // Commit the transaction, creating new snapshot
+        icebergTransaction.commitTransaction();
+    }
+
+    /**
+     * Generate a list of {@link DataFile} objects from a list of parquet files written.
+     */
+    private List<DataFile> dataFilesFromParquet(
+            @NotNull final List<CompletedParquetWrite> parquetFilesWritten,
+            @NotNull final List<PartitionData> partitionDataList) {
+        final int numFiles = parquetFilesWritten.size();
+        final List<DataFile> dataFiles = new ArrayList<>(numFiles);
+        final PartitionSpec partitionSpec = tableSpec;
+        for (int idx = 0; idx < numFiles; idx++) {
+            final CompletedParquetWrite completedWrite = parquetFilesWritten.get(idx);
+            final DataFiles.Builder dataFileBuilder = DataFiles.builder(partitionSpec)
+                    .withPath(completedWrite.destination().toString())
+                    .withFormat(FileFormat.PARQUET)
+                    .withRecordCount(completedWrite.numRows())
+                    .withFileSizeInBytes(completedWrite.numBytes());
+            if (partitionSpec.isPartitioned()) {
+                dataFileBuilder.withPartition(partitionDataList.get(idx));
+            }
+            dataFiles.add(dataFileBuilder.build());
+        }
+        return dataFiles;
+    }
+}
diff --git a/extensions/iceberg/src/main/java/io/deephaven/iceberg/util/IcebergTools.java b/extensions/iceberg/src/main/java/io/deephaven/iceberg/util/IcebergTools.java
index bcdda326dca..ad2eac9ade7 100644
--- a/extensions/iceberg/src/main/java/io/deephaven/iceberg/util/IcebergTools.java
+++ b/extensions/iceberg/src/main/java/io/deephaven/iceberg/util/IcebergTools.java
@@ -3,17 +3,131 @@
 //
 package io.deephaven.iceberg.util;
 
+import org.apache.hadoop.conf.Configuration;
+import org.apache.iceberg.CatalogProperties;
+import org.apache.iceberg.CatalogUtil;
 import org.apache.iceberg.catalog.Catalog;
-import org.apache.iceberg.io.FileIO;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
+
+import java.util.Map;
 
 /**
  * Tools for accessing tables in the Iceberg table format.
  */
-public abstract class IcebergTools {
+public final class IcebergTools {
+    @SuppressWarnings("unused")
+    public static IcebergCatalogAdapter createAdapter(
+            final Catalog catalog) {
+        return IcebergCatalogAdapter.of(catalog, Map.of());
+    }
+
+    /**
+     * <p>
+     * Create an Iceberg catalog adapter for an Iceberg catalog created from configuration properties. These properties
+     * map to the Iceberg catalog Java API properties and are used to create the catalog and file IO implementations.
+     * </p>
+     * <p>
+     * The minimal set of properties required to create an Iceberg catalog are:
+     * <ul>
+     * <li>{@value CatalogProperties#CATALOG_IMPL} or {@value CatalogUtil#ICEBERG_CATALOG_TYPE} - the Java catalog
+     * implementation to use. When providing {@value CatalogProperties#CATALOG_IMPL}, the implementing Java class should
+     * be provided (e.g. {@code "org.apache.iceberg.rest.RESTCatalog"} or
+     * {@code "org.apache.iceberg.aws.glue.GlueCatalog")}. Choices for {@value CatalogUtil#ICEBERG_CATALOG_TYPE} include
+     * {@value CatalogUtil#ICEBERG_CATALOG_TYPE_HIVE}, {@value CatalogUtil#ICEBERG_CATALOG_TYPE_HADOOP},
+     * {@value CatalogUtil#ICEBERG_CATALOG_TYPE_REST}, {@value CatalogUtil#ICEBERG_CATALOG_TYPE_GLUE},
+     * {@value CatalogUtil#ICEBERG_CATALOG_TYPE_NESSIE}, {@value CatalogUtil#ICEBERG_CATALOG_TYPE_JDBC}.</li>
+     * </ul>
+     * <p>
+     * Other common properties include:
+     * </p>
+     * <ul>
+     * <li>{@value CatalogProperties#URI} - the URI of the catalog.</li>
+     * <li>{@value CatalogProperties#WAREHOUSE_LOCATION} - the location of the data warehouse.</li>
+     * <li>{@code "client.region"} - the region of the AWS client.</li>
+     * <li>{@code "s3.access-key-id"} - the S3 access key for reading files.</li>
+     * <li>{@code "s3.secret-access-key"} - the S3 secret access key for reading files.</li>
+     * <li>{@code "s3.endpoint"} - the S3 endpoint to connect to.</li>
+     * </ul>
+     * <p>
+     * Additional properties for the specific catalog should also be included, such as as S3-specific properties for
+     * authentication or endpoint overriding.
+     * </p>
+     *
+     * @param name the name of the catalog; if omitted, the catalog URI will be used to generate a name
+     * @param properties a map containing the Iceberg catalog properties to use
+     * @return the Iceberg catalog adapter
+     */
+    @SuppressWarnings("unused")
+    public static IcebergCatalogAdapter createAdapter(
+            @Nullable final String name,
+            @NotNull final Map<String, String> properties) {
+        return createAdapter(name, properties, Map.of());
+    }
+
+    /**
+     * <p>
+     * Create an Iceberg catalog adapter for an Iceberg catalog created from configuration properties. These properties
+     * map to the Iceberg catalog Java API properties and are used to create the catalog and file IO implementations.
+     * </p>
+     * <p>
+     * The minimal set of properties required to create an Iceberg catalog are:
+     * <ul>
+     * <li>{@value CatalogProperties#CATALOG_IMPL} or {@value CatalogUtil#ICEBERG_CATALOG_TYPE} - the Java catalog
+     * implementation to use. When providing {@value CatalogProperties#CATALOG_IMPL}, the implementing Java class should
+     * be provided (e.g. {@code "org.apache.iceberg.rest.RESTCatalog"} or
+     * {@code "org.apache.iceberg.aws.glue.GlueCatalog")}. Choices for {@value CatalogUtil#ICEBERG_CATALOG_TYPE} include
+     * {@value CatalogUtil#ICEBERG_CATALOG_TYPE_HIVE}, {@value CatalogUtil#ICEBERG_CATALOG_TYPE_HADOOP},
+     * {@value CatalogUtil#ICEBERG_CATALOG_TYPE_REST}, {@value CatalogUtil#ICEBERG_CATALOG_TYPE_GLUE},
+     * {@value CatalogUtil#ICEBERG_CATALOG_TYPE_NESSIE}, {@value CatalogUtil#ICEBERG_CATALOG_TYPE_JDBC}.</li>
+     * </ul>
+     * <p>
+     * Other common properties include:
+     * </p>
+     * <ul>
+     * <li>{@value CatalogProperties#URI} - the URI of the catalog.</li>
+     * <li>{@value CatalogProperties#WAREHOUSE_LOCATION} - the location of the data warehouse.</li>
+     * <li>{@code "client.region"} - the region of the AWS client.</li>
+     * <li>{@code "s3.access-key-id"} - the S3 access key for reading files.</li>
+     * <li>{@code "s3.secret-access-key"} - the S3 secret access key for reading files.</li>
+     * <li>{@code "s3.endpoint"} - the S3 endpoint to connect to.</li>
+     * </ul>
+     * <p>
+     * Additional properties for the specific catalog should also be included, such as as S3-specific properties for
+     * authentication or endpoint overriding.
+     * </p>
+     *
+     * @param name the name of the catalog; if omitted, the catalog URI will be used to generate a name
+     * @param properties a map containing the Iceberg catalog properties to use
+     * @param hadoopConfig a map containing Hadoop configuration properties to use
+     * @return the Iceberg catalog adapter
+     */
     @SuppressWarnings("unused")
     public static IcebergCatalogAdapter createAdapter(
-            final Catalog catalog,
-            final FileIO fileIO) {
-        return new IcebergCatalogAdapter(catalog, fileIO);
+            @Nullable final String name,
+            @NotNull final Map<String, String> properties,
+            @NotNull final Map<String, String> hadoopConfig) {
+        // Validate the minimum required properties are set
+        if (!properties.containsKey(CatalogProperties.CATALOG_IMPL)
+                && !properties.containsKey(CatalogUtil.ICEBERG_CATALOG_TYPE)) {
+            throw new IllegalArgumentException(
+                    String.format("Catalog type '%s' or implementation class '%s' is required",
+                            CatalogUtil.ICEBERG_CATALOG_TYPE, CatalogProperties.CATALOG_IMPL));
+        }
+
+        final String catalogUri = properties.get(CatalogProperties.URI);
+        final String catalogName = name != null
+                ? name
+                : "IcebergCatalog" + (catalogUri == null ? "" : "-" + catalogUri);
+
+        // Load the Hadoop configuration with the provided properties
+        final Configuration hadoopConf = new Configuration();
+        hadoopConfig.forEach(hadoopConf::set);
+
+        // Create the Iceberg catalog from the properties
+        final Catalog catalog = CatalogUtil.buildIcebergCatalog(catalogName, properties, hadoopConf);
+
+        return IcebergCatalogAdapter.of(catalog, properties);
     }
+
 }
diff --git a/extensions/iceberg/src/main/java/io/deephaven/iceberg/util/IcebergUpdateMode.java b/extensions/iceberg/src/main/java/io/deephaven/iceberg/util/IcebergUpdateMode.java
new file mode 100644
index 00000000000..cf8583c811d
--- /dev/null
+++ b/extensions/iceberg/src/main/java/io/deephaven/iceberg/util/IcebergUpdateMode.java
@@ -0,0 +1,102 @@
+//
+// Copyright (c) 2016-2024 Deephaven Data Labs and Patent Pending
+//
+package io.deephaven.iceberg.util;
+
+import io.deephaven.annotations.BuildableStyle;
+import org.immutables.value.Value;
+
+@Value.Immutable
+@BuildableStyle
+public abstract class IcebergUpdateMode {
+    private static final long REFRESH_INTERVAL_MS = 60_000L;
+
+    private static final IcebergUpdateMode STATIC = builder().updateType(IcebergUpdateType.STATIC).build();
+    private static final IcebergUpdateMode AUTO_REFRESHING =
+            builder().updateType(IcebergUpdateType.AUTO_REFRESHING).autoRefreshMs(REFRESH_INTERVAL_MS).build();
+    private static final IcebergUpdateMode MANUAL_REFRESHING =
+            builder().updateType(IcebergUpdateType.MANUAL_REFRESHING).build();
+
+    public enum IcebergUpdateType {
+        STATIC, AUTO_REFRESHING, MANUAL_REFRESHING
+    }
+
+    /**
+     * Set a static update mode for this table.
+     */
+    public static IcebergUpdateMode staticMode() {
+        return STATIC;
+    }
+
+    /**
+     * Set a manually-refreshing update mode for this table. The ordering of the data in the table will depend on the
+     * order in which the data files are discovered on refresh.
+     */
+    public static IcebergUpdateMode manualRefreshingMode() {
+        return MANUAL_REFRESHING;
+    }
+
+    /**
+     * Set an automatically-refreshing update mode for this table using the default refresh interval of 60 seconds. The
+     * ordering of the data in the table will depend on the order in which the data files are discovered on refresh.
+     */
+    public static IcebergUpdateMode autoRefreshingMode() {
+        return AUTO_REFRESHING;
+    }
+
+    /**
+     * Set an automatically-refreshing update mode for this table using the provided refresh interval. The ordering of
+     * the data in the table will depend on the order in which the data files are discovered on refresh.
+     *
+     * @param refreshMs the refresh interval in milliseconds
+     */
+    public static IcebergUpdateMode autoRefreshingMode(final long refreshMs) {
+        return ImmutableIcebergUpdateMode.builder()
+                .updateType(IcebergUpdateType.AUTO_REFRESHING)
+                .autoRefreshMs(refreshMs)
+                .build();
+    }
+
+    /**
+     * Set the update mode for the result table. The default is {@link IcebergUpdateType#STATIC}.
+     */
+    @Value.Default
+    public IcebergUpdateType updateType() {
+        return IcebergUpdateType.STATIC;
+    }
+
+    /**
+     * When the update type is {@link IcebergUpdateType#AUTO_REFRESHING}, this value specifies the minimum interval in
+     * milliseconds between automatic refreshes of the table.
+     */
+    @Value.Default
+    public long autoRefreshMs() {
+        return 0;
+    }
+
+
+    private static Builder builder() {
+        return ImmutableIcebergUpdateMode.builder();
+    }
+
+    protected interface Builder {
+        @SuppressWarnings("unused")
+        Builder updateType(IcebergUpdateType updateType);
+
+        @SuppressWarnings("unused")
+        Builder autoRefreshMs(long autoRefreshMs);
+
+        IcebergUpdateMode build();
+    }
+
+    @Value.Check
+    protected void checkAutoRefreshingInterval() {
+        if (updateType() != IcebergUpdateType.AUTO_REFRESHING && autoRefreshMs() != 0) {
+            throw new IllegalArgumentException(
+                    "Auto-refresh interval must not be set when update type is not auto-refreshing");
+        }
+        if (updateType() == IcebergUpdateType.AUTO_REFRESHING && autoRefreshMs() <= 0) {
+            throw new IllegalArgumentException("Auto-refresh interval must be positive");
+        }
+    }
+}
diff --git a/extensions/iceberg/src/main/java/io/deephaven/iceberg/util/IcebergWriteInstructions.java b/extensions/iceberg/src/main/java/io/deephaven/iceberg/util/IcebergWriteInstructions.java
new file mode 100644
index 00000000000..12afb5ef9e4
--- /dev/null
+++ b/extensions/iceberg/src/main/java/io/deephaven/iceberg/util/IcebergWriteInstructions.java
@@ -0,0 +1,76 @@
+//
+// Copyright (c) 2016-2024 Deephaven Data Labs and Patent Pending
+//
+package io.deephaven.iceberg.util;
+
+import io.deephaven.annotations.BuildableStyle;
+import io.deephaven.engine.table.Table;
+import org.immutables.value.Value;
+import org.immutables.value.Value.Immutable;
+
+import java.util.List;
+
+/**
+ * This class provides instructions intended for writing deephaven tables as partitions to Iceberg tables.
+ */
+@Immutable
+@BuildableStyle
+public abstract class IcebergWriteInstructions {
+
+    public static Builder builder() {
+        return ImmutableIcebergWriteInstructions.builder();
+    }
+
+    /**
+     * The Deephaven tables to be written.
+     * <p>
+     * All tables must have the same table definition as definition for non-partitioning columns specified in the
+     * {@link IcebergTableWriter}. For example, if an iceberg table is partitioned by "year" and "month" and has a
+     * non-partitioning column "data," then {@link IcebergTableWriter} should be configured with a definition that
+     * includes all three columns: "year," "month," and "data." But, the tables provided here should only include the
+     * non-partitioning column, such as "data."
+     */
+    public abstract List<Table> tables();
+
+    /**
+     * The partition paths where each table will be written. For example, if the table is partitioned by "year" and
+     * "month", the partition path could be "year=2021/month=01".
+     * <p>
+     * If writing to a partitioned iceberg table, users must provide partition path for each table in {@link #tables()}
+     * in the same order. Else, this should be an empty list.
+     */
+    public abstract List<String> partitionPaths();
+
+    // @formatter:off
+    public interface Builder {
+    // @formatter:on
+        Builder addTables(Table element);
+
+        Builder addTables(Table... elements);
+
+        Builder addAllTables(Iterable<? extends Table> elements);
+
+        Builder addPartitionPaths(String element);
+
+        Builder addPartitionPaths(String... elements);
+
+        Builder addAllPartitionPaths(Iterable<String> elements);
+
+        IcebergWriteInstructions build();
+    }
+
+    @Value.Check
+    final void countCheckTables() {
+        if (tables().isEmpty()) {
+            throw new IllegalArgumentException("At least one table must be provided");
+        }
+    }
+
+    @Value.Check
+    final void countCheckPartitionPaths() {
+        if (!partitionPaths().isEmpty() && partitionPaths().size() != tables().size()) {
+            throw new IllegalArgumentException("Partition path must be provided for each table, partitionPaths.size()="
+                    + partitionPaths().size() + ", tables.size()=" + tables().size());
+        }
+    }
+}
diff --git a/extensions/iceberg/src/main/java/io/deephaven/iceberg/util/SchemaProvider.java b/extensions/iceberg/src/main/java/io/deephaven/iceberg/util/SchemaProvider.java
new file mode 100644
index 00000000000..579c849bfe4
--- /dev/null
+++ b/extensions/iceberg/src/main/java/io/deephaven/iceberg/util/SchemaProvider.java
@@ -0,0 +1,33 @@
+//
+// Copyright (c) 2016-2024 Deephaven Data Labs and Patent Pending
+//
+package io.deephaven.iceberg.util;
+
+import org.apache.iceberg.Schema;
+
+/**
+ * A specification for extracting the schema from a table.
+ */
+public interface SchemaProvider {
+
+    // Static factory methods for creating SchemaProvider instances
+    static SchemaProvider fromCurrent() {
+        return new SchemaProviderInternal.CurrentSchemaProvider();
+    }
+
+    static SchemaProvider fromSchemaId(final int id) {
+        return new SchemaProviderInternal.IdSchemaProvider(id);
+    }
+
+    static SchemaProvider fromSchema(final Schema schema) {
+        return new SchemaProviderInternal.DirectSchemaProvider(schema);
+    }
+
+    static SchemaProvider fromSnapshotId(final int snapshotId) {
+        return new SchemaProviderInternal.SnapshotIdSchemaProvider(snapshotId);
+    }
+
+    static SchemaProvider fromCurrentSnapshot() {
+        return new SchemaProviderInternal.CurrentSnapshotSchemaProvider();
+    }
+}
diff --git a/extensions/iceberg/src/main/java/io/deephaven/iceberg/util/SchemaProviderInternal.java b/extensions/iceberg/src/main/java/io/deephaven/iceberg/util/SchemaProviderInternal.java
new file mode 100644
index 00000000000..25989d7609e
--- /dev/null
+++ b/extensions/iceberg/src/main/java/io/deephaven/iceberg/util/SchemaProviderInternal.java
@@ -0,0 +1,117 @@
+//
+// Copyright (c) 2016-2024 Deephaven Data Labs and Patent Pending
+//
+package io.deephaven.iceberg.util;
+
+import org.apache.iceberg.Schema;
+import org.apache.iceberg.Snapshot;
+import org.apache.iceberg.Table;
+
+/**
+ * Internal class containing the implementations of {@link SchemaProvider}.
+ */
+class SchemaProviderInternal {
+
+    interface SchemaProviderImpl {
+        /**
+         * Returns the schema for the given table based on this {@link SchemaProvider}.
+         */
+        Schema getSchema(Table table);
+    }
+
+    // Implementations of SchemaProvider
+    static class CurrentSchemaProvider implements SchemaProvider, SchemaProviderImpl {
+        @Override
+        public Schema getSchema(final Table table) {
+            return getCurrentSchema(table);
+        }
+    }
+
+    static class IdSchemaProvider implements SchemaProvider, SchemaProviderImpl {
+        private final int schemaId;
+
+        IdSchemaProvider(final int schemaId) {
+            this.schemaId = schemaId;
+        }
+
+        @Override
+        public Schema getSchema(final Table table) {
+            return getSchemaForId(table, schemaId);
+        }
+    }
+
+    static class DirectSchemaProvider implements SchemaProvider, SchemaProviderImpl {
+        private final Schema schema;
+
+        DirectSchemaProvider(final Schema schema) {
+            this.schema = schema;
+        }
+
+        @Override
+        public Schema getSchema(final Table table) {
+            return schema;
+        }
+    }
+
+    static class SnapshotIdSchemaProvider implements SchemaProvider, SchemaProviderImpl {
+        private final int snapshotId;
+
+        SnapshotIdSchemaProvider(final int snapshotId) {
+            this.snapshotId = snapshotId;
+        }
+
+        @Override
+        public Schema getSchema(final Table table) {
+            return getSchemaForSnapshotId(table, snapshotId);
+        }
+    }
+
+    static class CurrentSnapshotSchemaProvider implements SchemaProvider, SchemaProviderImpl {
+        @Override
+        public Schema getSchema(final Table table) {
+            return getSchemaForCurrentSnapshot(table);
+        }
+    }
+
+    // --------------------------------------------------------------------------------------------------
+
+    // Methods for extracting the schema from the table
+    private static Schema getCurrentSchema(final Table table) {
+        return table.schema();
+    }
+
+    private static Schema getSchemaForId(final Table table, final int schemaId) {
+        final Schema schema = table.schemas().get(schemaId);
+        if (schema == null) {
+            throw new IllegalArgumentException("Schema with ID " + schemaId + " not found for table " + table);
+        }
+        return schema;
+    }
+
+    private static Schema getSchemaForSnapshotId(final Table table, final int snapshotId) {
+        final Snapshot snapshot = table.snapshot(snapshotId);
+        if (snapshot == null) {
+            throw new IllegalArgumentException("Snapshot with ID " + snapshotId + " not found for table " +
+                    table);
+        }
+        final Integer schemaId = snapshot.schemaId();
+        if (schemaId == null) {
+            throw new IllegalArgumentException("Snapshot with ID " + snapshotId + " does not have a schema ID");
+        }
+        return getSchemaForId(table, schemaId);
+    }
+
+    private static Schema getSchemaForCurrentSnapshot(final Table table) {
+        final Snapshot currentSnapshot = table.currentSnapshot();
+        if (currentSnapshot == null) {
+            throw new IllegalArgumentException("Table " + table + " does not have a current snapshot");
+        }
+        final Integer schemaId = currentSnapshot.schemaId();
+        if (schemaId == null) {
+            throw new IllegalArgumentException("Current snapshot with ID " + currentSnapshot.snapshotId() +
+                    " for table " + table + " does not have a schema ID");
+        }
+        return getSchemaForId(table, schemaId);
+    }
+}
+
diff --git a/extensions/iceberg/src/main/java/io/deephaven/iceberg/util/TableParquetWriterOptions.java b/extensions/iceberg/src/main/java/io/deephaven/iceberg/util/TableParquetWriterOptions.java
new file mode 100644
index 00000000000..98f2211907a
--- /dev/null
+++ b/extensions/iceberg/src/main/java/io/deephaven/iceberg/util/TableParquetWriterOptions.java
@@ -0,0 +1,130 @@
+//
+// Copyright (c) 2016-2024 Deephaven Data Labs and Patent Pending
+//
+package io.deephaven.iceberg.util;
+
+import io.deephaven.annotations.BuildableStyle;
+import io.deephaven.engine.table.TableDefinition;
+import io.deephaven.parquet.table.ParquetInstructions;
+import org.immutables.value.Value;
+import org.jetbrains.annotations.NotNull;
+
+import java.util.Map;
+
+import static io.deephaven.parquet.table.ParquetInstructions.MIN_TARGET_PAGE_SIZE;
+
+/**
+ * This class provides instructions for building {@link IcebergTableWriter} intended for writing Iceberg tables as
+ * Parquet data files. The default values documented in this class may change in the future. As such, callers may wish
+ * to explicitly set the values.
+ */
+@Value.Immutable
+@BuildableStyle
+public abstract class TableParquetWriterOptions extends TableWriterOptions {
+
+    public static Builder builder() {
+        return ImmutableTableParquetWriterOptions.builder();
+    }
+
+    /**
+     * The name of the compression codec to use when writing Parquet files; defaults to
+     * {@link ParquetInstructions#DEFAULT_COMPRESSION_CODEC_NAME}.
+     */
+    @Value.Default
+    public String compressionCodecName() {
+        return ParquetInstructions.DEFAULT_COMPRESSION_CODEC_NAME;
+    }
+
+    /**
+     * The maximum number of unique keys the parquet file writer should add to a dictionary page before switching to
+     * non-dictionary encoding; defaults to {@value ParquetInstructions#DEFAULT_MAXIMUM_DICTIONARY_KEYS}; never
+     * evaluated for non-String columns.
+     */
+    @Value.Default
+    public int maximumDictionaryKeys() {
+        return ParquetInstructions.DEFAULT_MAXIMUM_DICTIONARY_KEYS;
+    }
+
+    /**
+     * The maximum number of bytes the parquet file writer should add to a dictionary before switching to non-dictionary
+     * encoding; defaults to {@value ParquetInstructions#DEFAULT_MAXIMUM_DICTIONARY_SIZE}; never evaluated for
+     * non-String columns.
+     */
+    @Value.Default
+    public int maximumDictionarySize() {
+        return ParquetInstructions.DEFAULT_MAXIMUM_DICTIONARY_SIZE;
+    }
+
+    /**
+     * The target page size for writing the parquet files; defaults to
+     * {@link ParquetInstructions#DEFAULT_TARGET_PAGE_SIZE}, should be greater than or equal to
+     * {@link ParquetInstructions#MIN_TARGET_PAGE_SIZE}.
+     */
+    @Value.Default
+    public int targetPageSize() {
+        return ParquetInstructions.DEFAULT_TARGET_PAGE_SIZE;
+    }
+
+    /**
+     * Convert this to a {@link ParquetInstructions}.
+     *
+     * @param onWriteCompleted The callback to be invoked after writing the parquet file.
+     * @param tableDefinition The table definition to be populated inside the parquet file's schema
+     * @param fieldIdToName Mapping of field id to field name, to be populated inside the parquet file's schema
+     */
+    ParquetInstructions toParquetInstructions(
+            @NotNull final ParquetInstructions.OnWriteCompleted onWriteCompleted,
+            @NotNull final TableDefinition tableDefinition,
+            @NotNull final Map<Integer, String> fieldIdToName) {
+        final ParquetInstructions.Builder builder = new ParquetInstructions.Builder();
+
+        dataInstructions().ifPresent(builder::setSpecialInstructions);
+
+        // Add parquet writing specific instructions.
+        builder.setTableDefinition(tableDefinition);
+        for (final Map.Entry<Integer, String> entry : fieldIdToName.entrySet()) {
+            builder.setFieldId(entry.getValue(), entry.getKey());
+        }
+        builder.setCompressionCodecName(compressionCodecName());
+        builder.setMaximumDictionaryKeys(maximumDictionaryKeys());
+        builder.setMaximumDictionarySize(maximumDictionarySize());
+        builder.setTargetPageSize(targetPageSize());
+        builder.setOnWriteCompleted(onWriteCompleted);
+
+        return builder.build();
+    }
+
+    public interface Builder extends TableWriterOptions.Builder<Builder> {
+        Builder compressionCodecName(String compressionCodecName);
+
+        Builder maximumDictionaryKeys(int maximumDictionaryKeys);
+
+        Builder maximumDictionarySize(int maximumDictionarySize);
+
+        Builder targetPageSize(int targetPageSize);
+
+        TableParquetWriterOptions build();
+    }
+
+    @Value.Check
+    final void boundsCheckMaxDictionaryKeys() {
+        if (maximumDictionaryKeys() < 0) {
+            throw new IllegalArgumentException("maximumDictionaryKeys(=" + maximumDictionaryKeys() + ") must be >= 0");
+        }
+    }
+
+    @Value.Check
+    final void boundsCheckMaxDictionarySize() {
+        if (maximumDictionarySize() < 0) {
+            throw new IllegalArgumentException("maximumDictionarySize(=" + maximumDictionarySize() + ") must be >= 0");
+        }
+    }
+
+    @Value.Check
+    final void boundsCheckTargetPageSize() {
+        if (targetPageSize() < MIN_TARGET_PAGE_SIZE) {
+            throw new IllegalArgumentException(
+                    "targetPageSize(=" + targetPageSize() + ") must be >= " + MIN_TARGET_PAGE_SIZE);
+        }
+    }
+}
diff --git a/extensions/iceberg/src/main/java/io/deephaven/iceberg/util/TableWriterOptions.java b/extensions/iceberg/src/main/java/io/deephaven/iceberg/util/TableWriterOptions.java
new file mode 100644
index 00000000000..95bcb2d8036
--- /dev/null
+++ b/extensions/iceberg/src/main/java/io/deephaven/iceberg/util/TableWriterOptions.java
@@ -0,0 +1,114 @@
+//
+// Copyright (c) 2016-2024 Deephaven Data Labs and Patent Pending
+//
+package io.deephaven.iceberg.util;
+
+import io.deephaven.engine.table.TableDefinition;
+import org.apache.iceberg.Schema;
+import org.immutables.value.Value;
+
+import java.util.Collection;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.Map;
+import java.util.Optional;
+import java.util.Set;
+
+public abstract class TableWriterOptions {
+
+    /**
+     * The {@link TableDefinition} to use when writing Iceberg data files, instead of the one implied by the table being
+     * written itself. This definition can be used to skip some columns or add additional columns with {@code null}
+     * values.
+     */
+    public abstract TableDefinition tableDefinition();
+
+    /**
+     * The data instructions to use for reading/writing the Iceberg data files (might be S3Instructions or other cloud
+     * provider-specific instructions).
+     */
+    public abstract Optional<Object> dataInstructions();
+
+    /**
+     * Used to extract a {@link Schema} from a table. That schema will be used in conjunction with the
+     * {@link #fieldIdToColumnName()} to map Deephaven columns from {@link #tableDefinition()} to Iceberg columns. If
+     * {@link #fieldIdToColumnName()} is not provided, the mapping is done by column name.
+     * <p>
+     * Users can specify how to extract the schema in multiple ways (by schema ID, snapshot ID, etc.).
+     * <p>
+     * Defaults to {@link SchemaProvider#fromCurrent()}, which means use the current schema from the table.
+     */
+    @Value.Default
+    public SchemaProvider schemaProvider() {
+        return SchemaProvider.fromCurrent();
+    }
+
+    /**
+     * A one-to-one {@link Map map} from Iceberg field IDs from the {@link #schemaProvider()} to Deephaven column names
+     * from the {@link #tableDefinition()}.
+     */
+    public abstract Map<Integer, String> fieldIdToColumnName();
+
+    /**
+     * A reverse mapping of {@link #fieldIdToColumnName()}.
+     */
+    @Value.Lazy
+    Map<String, Integer> dhColumnNameToFieldId() {
+        final Map<String, Integer> reversedMap = new HashMap<>(fieldIdToColumnName().size());
+        for (final Map.Entry<Integer, String> entry : fieldIdToColumnName().entrySet()) {
+            reversedMap.put(entry.getValue(), entry.getKey());
+        }
+        return reversedMap;
+    }
+
+    // @formatter:off
+    interface Builder<INSTRUCTIONS_BUILDER extends TableWriterOptions.Builder<INSTRUCTIONS_BUILDER>> {
+        // @formatter:on
+        INSTRUCTIONS_BUILDER tableDefinition(TableDefinition tableDefinition);
+
+        INSTRUCTIONS_BUILDER dataInstructions(Object s3Instructions);
+
+        INSTRUCTIONS_BUILDER schemaProvider(SchemaProvider schemaProvider);
+
+        INSTRUCTIONS_BUILDER putFieldIdToColumnName(int value, String key);
+
+        INSTRUCTIONS_BUILDER putAllFieldIdToColumnName(Map<Integer, ? extends String> entries);
+    }
+
+    /**
+     * Check all column names present in the {@link #fieldIdToColumnName()} map are present in the
+     * {@link #tableDefinition()}.
+     */
+    @Value.Check
+    final void checkDhColumnsToIcebergFieldIds() {
+        if (!fieldIdToColumnName().isEmpty()) {
+            final Set<String> columnNamesFromDefinition = tableDefinition().getColumnNameSet();
+            final Map<Integer, String> fieldIdToColumnName = fieldIdToColumnName();
+            for (final String columnNameFromMap : fieldIdToColumnName.values()) {
+                if (!columnNamesFromDefinition.contains(columnNameFromMap)) {
+                    throw new IllegalArgumentException("Column " + columnNameFromMap + " not found in table " +
+                            "definition, available columns are: " + columnNamesFromDefinition);
+                }
+            }
+        }
+    }
+
+    @Value.Check
+    final void checkOneToOneMapping() {
+        final Collection<String> columnNames = new HashSet<>(fieldIdToColumnName().size());
+        for (final String columnName : fieldIdToColumnName().values()) {
+            if (columnNames.contains(columnName)) {
+                throw new IllegalArgumentException("Duplicate mapping found: " + columnName + " in field Id to column" +
+                        " name map, expected one-to-one mapping");
+            }
+            columnNames.add(columnName);
+        }
+    }
+
+    @Value.Check
+    final void checkNonEmptyDefinition() {
+        if (tableDefinition().numColumns() == 0) {
+            throw new IllegalArgumentException("Cannot write to an Iceberg table using empty table definition");
+        }
+    }
+}
diff --git a/extensions/iceberg/src/test/java/io/deephaven/iceberg/PyIceberg1Test.java b/extensions/iceberg/src/test/java/io/deephaven/iceberg/PyIceberg1Test.java
new file mode 100644
index 00000000000..52a6f5a4b9b
--- /dev/null
+++ b/extensions/iceberg/src/test/java/io/deephaven/iceberg/PyIceberg1Test.java
@@ -0,0 +1,126 @@
+//
+// Copyright (c) 2016-2024 Deephaven Data Labs and Patent Pending
+//
+package io.deephaven.iceberg;
+
+import io.deephaven.engine.table.ColumnDefinition;
+import io.deephaven.engine.table.Table;
+import io.deephaven.engine.table.TableDefinition;
+import io.deephaven.engine.testutil.TstUtils;
+import io.deephaven.engine.util.TableTools;
+import io.deephaven.iceberg.sqlite.DbResource;
+import io.deephaven.iceberg.util.IcebergCatalogAdapter;
+import io.deephaven.iceberg.util.IcebergReadInstructions;
+import io.deephaven.iceberg.util.IcebergTableAdapter;
+import org.apache.iceberg.Snapshot;
+import org.apache.iceberg.catalog.Namespace;
+import org.apache.iceberg.catalog.TableIdentifier;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Tag;
+import org.junit.jupiter.api.Test;
+
+import java.net.URISyntaxException;
+import java.util.List;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+/**
+ * This test shows that we can integrate with data written by <a href="https://py.iceberg.apache.org/">pyiceberg</a>.
+ * See TESTING.md and generate-pyiceberg-1.py for more details.
+ */
+@Tag("security-manager-allow")
+class PyIceberg1Test {
+    private static final Namespace NAMESPACE = Namespace.of("dh-default");
+    private static final TableIdentifier CITIES_ID = TableIdentifier.of(NAMESPACE, "cities");
+
+    // This will need to be updated if the data is regenerated
+    private static final long SNAPSHOT_1_ID = 1743193108934390753L;
+    private static final long SNAPSHOT_2_ID = 4630159959461529013L;
+
+    private static final TableDefinition CITIES_1_TD = TableDefinition.of(
+            ColumnDefinition.ofString("city"),
+            ColumnDefinition.ofDouble("latitude"),
+            ColumnDefinition.ofDouble("lon"));
+
+    private static final TableDefinition CITIES_2_TD = TableDefinition.of(
+            ColumnDefinition.ofString("city"),
+            ColumnDefinition.ofDouble("latitude"),
+            ColumnDefinition.ofDouble("longitude"));
+
+    private IcebergCatalogAdapter catalogAdapter;
+
+    @BeforeEach
+    void setUp() throws URISyntaxException {
+        catalogAdapter = DbResource.openCatalog("pyiceberg-1");
+    }
+
+    @Test
+    void catalogInfo() {
+        assertThat(catalogAdapter.listNamespaces()).containsExactly(NAMESPACE);
+        assertThat(catalogAdapter.listTables(NAMESPACE)).containsExactly(CITIES_ID);
+
+        final IcebergTableAdapter tableAdapter = catalogAdapter.loadTable(CITIES_ID);
+        final List<Snapshot> snapshots = tableAdapter.listSnapshots();
+        assertThat(snapshots).hasSize(2);
+        {
+            final Snapshot snapshot = snapshots.get(0);
+            assertThat(snapshot.parentId()).isNull();
+            assertThat(snapshot.schemaId()).isEqualTo(0);
+            assertThat(snapshot.sequenceNumber()).isEqualTo(1L);
+            assertThat(snapshot.snapshotId()).isEqualTo(SNAPSHOT_1_ID);
+        }
+        {
+            final Snapshot snapshot = snapshots.get(1);
+            assertThat(snapshot.parentId()).isEqualTo(SNAPSHOT_1_ID);
+            assertThat(snapshot.schemaId()).isEqualTo(1);
+            assertThat(snapshot.sequenceNumber()).isEqualTo(2L);
+            assertThat(snapshot.snapshotId()).isEqualTo(SNAPSHOT_2_ID);
+        }
+    }
+
+    @Test
+    void cities1() {
+        final Table cities1;
+        {
+            final IcebergTableAdapter tableAdapter = catalogAdapter.loadTable(CITIES_ID);
+            final TableDefinition td = tableAdapter.definition(IcebergReadInstructions.builder()
+                    .snapshotId(SNAPSHOT_1_ID)
+                    .build());
+            assertThat(td).isEqualTo(CITIES_1_TD);
+
+            cities1 = tableAdapter.table(IcebergReadInstructions.builder()
+                    .snapshotId(SNAPSHOT_1_ID)
+                    .build());
+            assertThat(cities1.getDefinition()).isEqualTo(CITIES_1_TD);
+        }
+        final Table expectedCities1 = TableTools.newTable(CITIES_1_TD,
+                TableTools.stringCol("city", "Amsterdam", "San Francisco", "Drachten", "Paris"),
+                TableTools.doubleCol("latitude", 52.371807, 37.773972, 53.11254, 48.864716),
+                TableTools.doubleCol("lon", 4.896029, -122.431297, 6.0989, 2.349014));
+        TstUtils.assertTableEquals(expectedCities1, cities1);
+    }
+
+    @Test
+    void cities2() {
+        final Table cities2;
+        {
+            final IcebergTableAdapter tableAdapter = catalogAdapter.loadTable(CITIES_ID);
+            final TableDefinition td = tableAdapter.definition(IcebergReadInstructions.builder()
+                    .snapshotId(SNAPSHOT_2_ID)
+                    .build());
+            assertThat(td).isEqualTo(CITIES_2_TD);
+
+            cities2 = tableAdapter.table(IcebergReadInstructions.builder()
+                    .snapshotId(SNAPSHOT_2_ID)
+                    .build());
+            assertThat(cities2.getDefinition()).isEqualTo(CITIES_2_TD);
+        }
+        // TODO(deephaven-core#6118): Iceberg column rename handling
+        // final Table expectedCities2 = TableTools.newTable(CITIES_2_TD,
+        // TableTools.stringCol("city", "Amsterdam", "San Francisco", "Drachten", "Paris", "Minneapolis", "New York"),
+        // TableTools.doubleCol("latitude", 52.371807, 37.773972, 53.11254, 48.864716, 44.977479, 40.730610),
+        // TableTools.doubleCol("longitude", 4.896029, -122.431297, 6.0989, 2.349014, -93.264358, -73.935242)
+        // );
+        // TstUtils.assertTableEquals(expectedCities2, cities2);
+    }
+}
diff --git a/extensions/iceberg/src/test/java/io/deephaven/iceberg/Pyiceberg2Test.java b/extensions/iceberg/src/test/java/io/deephaven/iceberg/Pyiceberg2Test.java
new file mode 100644
index 00000000000..afcb7af1779
--- /dev/null
+++ b/extensions/iceberg/src/test/java/io/deephaven/iceberg/Pyiceberg2Test.java
@@ -0,0 +1,108 @@
+//
+// Copyright (c) 2016-2024 Deephaven Data Labs and Patent Pending
+//
+package io.deephaven.iceberg;
+
+import io.deephaven.engine.table.ColumnDefinition;
+import io.deephaven.engine.table.Table;
+import io.deephaven.engine.table.TableDefinition;
+import io.deephaven.engine.testutil.TstUtils;
+import io.deephaven.engine.util.TableTools;
+import io.deephaven.iceberg.sqlite.DbResource;
+import io.deephaven.iceberg.util.IcebergCatalogAdapter;
+import io.deephaven.iceberg.util.IcebergTableAdapter;
+import org.apache.iceberg.PartitionField;
+import org.apache.iceberg.PartitionSpec;
+import org.apache.iceberg.Snapshot;
+import org.apache.iceberg.catalog.Namespace;
+import org.apache.iceberg.catalog.TableIdentifier;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Tag;
+import org.junit.jupiter.api.Test;
+
+import java.time.LocalDateTime;
+import java.net.URISyntaxException;
+import java.util.List;
+import static io.deephaven.util.QueryConstants.NULL_DOUBLE;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+/**
+ * This test shows that we can integrate with data written by <a href="https://py.iceberg.apache.org/">pyiceberg</a>.
+ * See TESTING.md and generate-pyiceberg-2.py for more details.
+ */
+@Tag("security-manager-allow")
+class Pyiceberg2Test {
+    private static final Namespace NAMESPACE = Namespace.of("trading");
+    private static final TableIdentifier TRADING_DATA = TableIdentifier.of(NAMESPACE, "data");
+
+    // This will need to be updated if the data is regenerated
+    private static final long SNAPSHOT_1_ID = 2806418501596315192L;
+
+    private static final TableDefinition TABLE_DEFINITION = TableDefinition.of(
+            ColumnDefinition.fromGenericType("datetime", LocalDateTime.class),
+            ColumnDefinition.ofString("symbol").withPartitioning(),
+            ColumnDefinition.ofDouble("bid"),
+            ColumnDefinition.ofDouble("ask"));
+
+    private IcebergCatalogAdapter catalogAdapter;
+
+    @BeforeEach
+    void setUp() throws URISyntaxException {
+        catalogAdapter = DbResource.openCatalog("pyiceberg-2");
+    }
+
+    @Test
+    void catalogInfo() {
+        assertThat(catalogAdapter.listNamespaces()).containsExactly(NAMESPACE);
+        assertThat(catalogAdapter.listTables(NAMESPACE)).containsExactly(TRADING_DATA);
+
+        final IcebergTableAdapter tableAdapter = catalogAdapter.loadTable(TRADING_DATA);
+        final List<Snapshot> snapshots = tableAdapter.listSnapshots();
+        assertThat(snapshots).hasSize(1);
+        {
+            final Snapshot snapshot = snapshots.get(0);
+            assertThat(snapshot.parentId()).isNull();
+            assertThat(snapshot.schemaId()).isEqualTo(0);
+            assertThat(snapshot.sequenceNumber()).isEqualTo(1L);
+            assertThat(snapshot.snapshotId()).isEqualTo(SNAPSHOT_1_ID);
+        }
+    }
+
+    @Test
+    void testDefinition() {
+        final IcebergTableAdapter tableAdapter = catalogAdapter.loadTable(TRADING_DATA);
+        final TableDefinition td = tableAdapter.definition();
+        assertThat(td).isEqualTo(TABLE_DEFINITION);
+
+        // Check the partition spec
+        final PartitionSpec partitionSpec = tableAdapter.icebergTable().spec();
+        assertThat(partitionSpec.fields().size()).isEqualTo(2);
+        final PartitionField firstPartitionField = partitionSpec.fields().get(0);
+        assertThat(firstPartitionField.name()).isEqualTo("datetime_day");
+        assertThat(firstPartitionField.transform().toString()).isEqualTo("day");
+
+        final PartitionField secondPartitionField = partitionSpec.fields().get(1);
+        assertThat(secondPartitionField.name()).isEqualTo("symbol");
+        assertThat(secondPartitionField.transform().toString()).isEqualTo("identity");
+    }
+
+    @Test
+    void testData() {
+        final IcebergTableAdapter tableAdapter = catalogAdapter.loadTable(TRADING_DATA);
+        final Table fromIceberg = tableAdapter.table();
+        assertThat(fromIceberg.size()).isEqualTo(5);
+        final Table expectedData = TableTools.newTable(TABLE_DEFINITION,
+                TableTools.col("datetime",
+                        LocalDateTime.of(2024, 11, 27, 10, 0, 0),
+                        LocalDateTime.of(2024, 11, 27, 10, 0, 0),
+                        LocalDateTime.of(2024, 11, 26, 10, 1, 0),
+                        LocalDateTime.of(2024, 11, 26, 10, 2, 0),
+                        LocalDateTime.of(2024, 11, 28, 10, 3, 0)),
+                TableTools.stringCol("symbol", "AAPL", "MSFT", "GOOG", "AMZN", "MSFT"),
+                TableTools.doubleCol("bid", 150.25, 150.25, 2800.75, 3400.5, NULL_DOUBLE),
+                TableTools.doubleCol("ask", 151.0, 151.0, 2810.5, 3420.0, 250.0));
+        TstUtils.assertTableEquals(expectedData.sort("datetime", "symbol"),
+                fromIceberg.sort("datetime", "symbol"));
+    }
+}
diff --git a/extensions/iceberg/src/test/java/io/deephaven/iceberg/TestCatalog/IcebergRefreshingTestTable.java b/extensions/iceberg/src/test/java/io/deephaven/iceberg/TestCatalog/IcebergRefreshingTestTable.java
new file mode 100644
index 00000000000..8f29da976d3
--- /dev/null
+++ b/extensions/iceberg/src/test/java/io/deephaven/iceberg/TestCatalog/IcebergRefreshingTestTable.java
@@ -0,0 +1,222 @@
+//
+// Copyright (c) 2016-2024 Deephaven Data Labs and Patent Pending
+//
+package io.deephaven.iceberg.TestCatalog;
+
+import org.apache.commons.lang3.NotImplementedException;
+import org.apache.iceberg.*;
+import org.apache.iceberg.encryption.EncryptionManager;
+import org.apache.iceberg.io.FileIO;
+import org.apache.iceberg.io.LocationProvider;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * Test table wrapper that restricts available snapshots to a given sequence number which the user can advance using
+ * {@link #advanceSequenceNumber()}.
+ */
+public class IcebergRefreshingTestTable implements Table {
+    private final IcebergTestTable testTable;
+
+    private long currentSnapshotSequenceNumber;
+
+    private IcebergRefreshingTestTable(final IcebergTestTable testTable) {
+        this.testTable = testTable;
+        currentSnapshotSequenceNumber = 1;
+    }
+
+    public static IcebergRefreshingTestTable fromTestTable(final IcebergTestTable testTable) {
+        return new IcebergRefreshingTestTable(testTable);
+    }
+
+    public void advanceSequenceNumber() {
+        currentSnapshotSequenceNumber++;
+    }
+
+    @Override
+    public void refresh() {}
+
+    @Override
+    public TableScan newScan() {
+        throw new NotImplementedException("Not implemented");
+    }
+
+    @Override
+    public Schema schema() {
+        return testTable.schema();
+    }
+
+    @Override
+    public Map<Integer, Schema> schemas() {
+        return testTable.schemas();
+    }
+
+    @Override
+    public PartitionSpec spec() {
+        return testTable.spec();
+    }
+
+    @Override
+    public Map<Integer, PartitionSpec> specs() {
+        return testTable.specs();
+
+    }
+
+    @Override
+    public SortOrder sortOrder() {
+        return testTable.sortOrder();
+    }
+
+    @Override
+    public Map<Integer, SortOrder> sortOrders() {
+        return testTable.sortOrders();
+
+    }
+
+    @Override
+    public Map<String, String> properties() {
+        return testTable.properties();
+    }
+
+    @Override
+    public String location() {
+        return testTable.location();
+    }
+
+    @Override
+    public Snapshot currentSnapshot() {
+        Snapshot snapshot = null;
+        for (final Snapshot s : snapshots()) {
+            snapshot = s; // grab the last snapshot
+        }
+        return snapshot;
+    }
+
+    @Override
+    public Snapshot snapshot(long l) {
+        for (final Snapshot snapshot : snapshots()) {
+            if (snapshot.snapshotId() == l) {
+                return snapshot;
+            }
+        }
+        return null;
+    }
+
+    @Override
+    public Iterable<Snapshot> snapshots() {
+        final List<Snapshot> snapshots = new ArrayList<>();
+        for (final Snapshot s : testTable.snapshots()) {
+            if (s.sequenceNumber() <= currentSnapshotSequenceNumber) {
+                snapshots.add(s);
+            }
+        }
+        return snapshots;
+    }
+
+    @Override
+    public List<HistoryEntry> history() {
+        throw new NotImplementedException("Not implemented");
+    }
+
+    @Override
+    public UpdateSchema updateSchema() {
+        throw new NotImplementedException("Not implemented");
+    }
+
+    @Override
+    public UpdatePartitionSpec updateSpec() {
+        throw new NotImplementedException("Not implemented");
+    }
+
+    @Override
+    public UpdateProperties updateProperties() {
+        throw new NotImplementedException("Not implemented");
+    }
+
+    @Override
+    public ReplaceSortOrder replaceSortOrder() {
+        throw new NotImplementedException("Not implemented");
+    }
+
+    @Override
+    public UpdateLocation updateLocation() {
+        throw new NotImplementedException("Not implemented");
+    }
+
+    @Override
+    public AppendFiles newAppend() {
+        throw new NotImplementedException("Not implemented");
+    }
+
+    @Override
+    public RewriteFiles newRewrite() {
+        throw new NotImplementedException("Not implemented");
+    }
+
+    @Override
+    public RewriteManifests rewriteManifests() {
+        throw new NotImplementedException("Not implemented");
+    }
+
+    @Override
+    public OverwriteFiles newOverwrite() {
+        throw new NotImplementedException("Not implemented");
+    }
+
+    @Override
+    public RowDelta newRowDelta() {
+        throw new NotImplementedException("Not implemented");
+    }
+
+    @Override
+    public ReplacePartitions newReplacePartitions() {
+        throw new NotImplementedException("Not implemented");
+    }
+
+    @Override
+    public DeleteFiles newDelete() {
+        throw new NotImplementedException("Not implemented");
+    }
+
+    @Override
+    public ExpireSnapshots expireSnapshots() {
+        throw new NotImplementedException("Not implemented");
+    }
+
+    @Override
+    public ManageSnapshots manageSnapshots() {
+        throw new NotImplementedException("Not implemented");
+    }
+
+    @Override
+    public Transaction newTransaction() {
+        throw new NotImplementedException("Not implemented");
+    }
+
+    @Override
+    public FileIO io() {
+        return testTable.io();
+    }
+
+    @Override
+    public EncryptionManager encryption() {
+        throw new NotImplementedException("Not implemented");
+    }
+
+    @Override
+    public LocationProvider locationProvider() {
+        throw new NotImplementedException("Not implemented");
+    }
+
+    @Override
+    public List<StatisticsFile> statisticsFiles() {
+        return testTable.statisticsFiles();
+    }
+
+    @Override
+    public Map<String, SnapshotRef> refs() {
+        throw new NotImplementedException("Not implemented");
+    }
+}
diff --git a/extensions/iceberg/src/test/java/io/deephaven/iceberg/TestCatalog/IcebergTestCatalog.java b/extensions/iceberg/src/test/java/io/deephaven/iceberg/TestCatalog/IcebergTestCatalog.java
index e62fbd282e0..75fffc8cf9d 100644
--- a/extensions/iceberg/src/test/java/io/deephaven/iceberg/TestCatalog/IcebergTestCatalog.java
+++ b/extensions/iceberg/src/test/java/io/deephaven/iceberg/TestCatalog/IcebergTestCatalog.java
@@ -3,6 +3,7 @@
 //
 package io.deephaven.iceberg.TestCatalog;
 
+import org.apache.hadoop.conf.Configuration;
 import org.apache.iceberg.*;
 import org.apache.iceberg.catalog.Catalog;
 import org.apache.iceberg.catalog.Namespace;
@@ -10,18 +11,25 @@
 import org.apache.iceberg.catalog.TableIdentifier;
 import org.apache.iceberg.exceptions.NamespaceNotEmptyException;
 import org.apache.iceberg.exceptions.NoSuchNamespaceException;
-import org.apache.iceberg.io.FileIO;
+import org.apache.iceberg.io.ResolvingFileIO;
+import org.jetbrains.annotations.NotNull;
 
 import java.io.File;
 import java.util.*;
 
-public class IcebergTestCatalog implements Catalog, SupportsNamespaces {
+public class IcebergTestCatalog implements Catalog, SupportsNamespaces, AutoCloseable {
     private final Map<Namespace, Map<TableIdentifier, Table>> namespaceTableMap;
     private final Map<TableIdentifier, Table> tableMap;
 
-    private IcebergTestCatalog(final String path, final FileIO fileIO) {
+    private final ResolvingFileIO fileIO;
+
+    private IcebergTestCatalog(final String path, @NotNull final Map<String, String> properties) {
         namespaceTableMap = new HashMap<>();
         tableMap = new HashMap<>();
+        final Configuration hadoopConf = new Configuration();
+        fileIO = new ResolvingFileIO();
+        fileIO.setConf(hadoopConf);
+        fileIO.initialize(properties);
 
         // Assume first level is namespace.
         final File root = new File(path);
@@ -44,8 +52,8 @@ private IcebergTestCatalog(final String path, final FileIO fileIO) {
         }
     }
 
-    public static IcebergTestCatalog create(final String path, final FileIO fileIO) {
-        return new IcebergTestCatalog(path, fileIO);
+    public static IcebergTestCatalog create(final String path, @NotNull final Map<String, String> properties) {
+        return new IcebergTestCatalog(path, properties);
     }
 
     @Override
@@ -103,4 +111,9 @@ public boolean setProperties(Namespace namespace, Map<String, String> map) throw
     public boolean removeProperties(Namespace namespace, Set<String> set) throws NoSuchNamespaceException {
         return false;
     }
+
+    @Override
+    public void close() {
+        fileIO.close();
+    }
 }
diff --git a/extensions/iceberg/src/test/java/io/deephaven/iceberg/TestCatalog/IcebergTestFileIO.java b/extensions/iceberg/src/test/java/io/deephaven/iceberg/TestCatalog/IcebergTestFileIO.java
deleted file mode 100644
index 03be6ca1b5e..00000000000
--- a/extensions/iceberg/src/test/java/io/deephaven/iceberg/TestCatalog/IcebergTestFileIO.java
+++ /dev/null
@@ -1,49 +0,0 @@
-//
-// Copyright (c) 2016-2024 Deephaven Data Labs and Patent Pending
-//
-package io.deephaven.iceberg.TestCatalog;
-
-import org.apache.iceberg.inmemory.InMemoryFileIO;
-import org.apache.iceberg.io.InputFile;
-import org.apache.iceberg.io.OutputFile;
-
-import java.io.IOException;
-import java.nio.file.Files;
-import java.nio.file.Path;
-import java.util.HashSet;
-import java.util.Set;
-
-public class IcebergTestFileIO extends InMemoryFileIO {
-    private final Set<String> inputFiles;
-    private final String matchPrefix;
-    private final String replacePrefix;
-
-    public IcebergTestFileIO(final String matchPrefix, final String replacePrefix) {
-        this.matchPrefix = matchPrefix;
-        this.replacePrefix = replacePrefix;
-        inputFiles = new HashSet<>();
-    }
-
-    @Override
-    public InputFile newInputFile(String s) {
-        if (!inputFiles.contains(s)) {
-            try {
-                final String replaced = s.replace(matchPrefix, replacePrefix);
-                final byte[] data = Files.readAllBytes(Path.of(replaced));
-                addFile(s, data);
-                inputFiles.add(s);
-            } catch (IOException e) {
-                throw new RuntimeException(e);
-            }
-        }
-        return super.newInputFile(s);
-    }
-
-    @Override
-    public OutputFile newOutputFile(String s) {
-        return null;
-    }
-
-    @Override
-    public void deleteFile(String s) {}
-}
diff --git a/extensions/iceberg/src/test/java/io/deephaven/iceberg/TestCatalog/IcebergTestTable.java b/extensions/iceberg/src/test/java/io/deephaven/iceberg/TestCatalog/IcebergTestTable.java
index d1cf5c2ee0e..f64e1af71ad 100644
--- a/extensions/iceberg/src/test/java/io/deephaven/iceberg/TestCatalog/IcebergTestTable.java
+++ b/extensions/iceberg/src/test/java/io/deephaven/iceberg/TestCatalog/IcebergTestTable.java
@@ -8,7 +8,6 @@
 import org.apache.iceberg.io.FileIO;
 import org.apache.iceberg.io.LocationProvider;
 import org.jetbrains.annotations.NotNull;
-import org.testcontainers.shaded.org.apache.commons.lang3.NotImplementedException;
 
 import java.io.File;
 import java.nio.file.Path;
@@ -20,10 +19,13 @@ public class IcebergTestTable implements Table {
     private final TableMetadata metadata;
     private final FileIO fileIO;
 
-    private IcebergTestTable(@NotNull final String path, @NotNull final FileIO fileIO) {
-        final File metadataRoot = new File(path, "metadata");
+    private IcebergTestTable(
+            @NotNull final String path,
+            @NotNull final FileIO fileIO) {
         this.fileIO = fileIO;
 
+        final File metadataRoot = new File(path, "metadata");
+
         final List<String> metadataFiles = new ArrayList<>();
 
         // Get a list of the JSON files.
@@ -44,7 +46,9 @@ private IcebergTestTable(@NotNull final String path, @NotNull final FileIO fileI
         }
     }
 
-    public static IcebergTestTable loadFromMetadata(@NotNull final String path, @NotNull final FileIO fileIO) {
+    public static IcebergTestTable loadFromMetadata(
+            @NotNull final String path,
+            @NotNull final FileIO fileIO) {
         return new IcebergTestTable(path, fileIO);
     }
 
@@ -53,7 +57,7 @@ public void refresh() {}
 
     @Override
     public TableScan newScan() {
-        throw new NotImplementedException("Not implemented");
+        throw new UnsupportedOperationException("Not implemented");
     }
 
     @Override
@@ -134,82 +138,82 @@ public Iterable<Snapshot> snapshots() {
 
     @Override
     public List<HistoryEntry> history() {
-        throw new NotImplementedException("Not implemented");
+        throw new UnsupportedOperationException("Not implemented");
     }
 
     @Override
     public UpdateSchema updateSchema() {
-        throw new NotImplementedException("Not implemented");
+        throw new UnsupportedOperationException("Not implemented");
     }
 
     @Override
     public UpdatePartitionSpec updateSpec() {
-        throw new NotImplementedException("Not implemented");
+        throw new UnsupportedOperationException("Not implemented");
     }
 
     @Override
     public UpdateProperties updateProperties() {
-        throw new NotImplementedException("Not implemented");
+        throw new UnsupportedOperationException("Not implemented");
     }
 
     @Override
     public ReplaceSortOrder replaceSortOrder() {
-        throw new NotImplementedException("Not implemented");
+        throw new UnsupportedOperationException("Not implemented");
     }
 
     @Override
     public UpdateLocation updateLocation() {
-        throw new NotImplementedException("Not implemented");
+        throw new UnsupportedOperationException("Not implemented");
     }
 
     @Override
     public AppendFiles newAppend() {
-        throw new NotImplementedException("Not implemented");
+        throw new UnsupportedOperationException("Not implemented");
     }
 
     @Override
     public RewriteFiles newRewrite() {
-        throw new NotImplementedException("Not implemented");
+        throw new UnsupportedOperationException("Not implemented");
     }
 
     @Override
     public RewriteManifests rewriteManifests() {
-        throw new NotImplementedException("Not implemented");
+        throw new UnsupportedOperationException("Not implemented");
     }
 
     @Override
     public OverwriteFiles newOverwrite() {
-        throw new NotImplementedException("Not implemented");
+        throw new UnsupportedOperationException("Not implemented");
     }
 
     @Override
     public RowDelta newRowDelta() {
-        throw new NotImplementedException("Not implemented");
+        throw new UnsupportedOperationException("Not implemented");
     }
 
     @Override
     public ReplacePartitions newReplacePartitions() {
-        throw new NotImplementedException("Not implemented");
+        throw new UnsupportedOperationException("Not implemented");
     }
 
     @Override
     public DeleteFiles newDelete() {
-        throw new NotImplementedException("Not implemented");
+        throw new UnsupportedOperationException("Not implemented");
     }
 
     @Override
     public ExpireSnapshots expireSnapshots() {
-        throw new NotImplementedException("Not implemented");
+        throw new UnsupportedOperationException("Not implemented");
     }
 
     @Override
     public ManageSnapshots manageSnapshots() {
-        throw new NotImplementedException("Not implemented");
+        throw new UnsupportedOperationException("Not implemented");
     }
 
     @Override
     public Transaction newTransaction() {
-        throw new NotImplementedException("Not implemented");
+        throw new UnsupportedOperationException("Not implemented");
     }
 
     @Override
@@ -219,12 +223,12 @@ public FileIO io() {
 
     @Override
     public EncryptionManager encryption() {
-        throw new NotImplementedException("Not implemented");
+        throw new UnsupportedOperationException("Not implemented");
     }
 
     @Override
     public LocationProvider locationProvider() {
-        throw new NotImplementedException("Not implemented");
+        throw new UnsupportedOperationException("Not implemented");
     }
 
     @Override
@@ -234,6 +238,6 @@ public List<StatisticsFile> statisticsFiles() {
 
     @Override
     public Map<String, SnapshotRef> refs() {
-        throw new NotImplementedException("Not implemented");
+        throw new UnsupportedOperationException("Not implemented");
     }
 }
diff --git a/extensions/iceberg/src/test/java/io/deephaven/iceberg/junit5/FileWarehouseSqliteCatalogTest.java b/extensions/iceberg/src/test/java/io/deephaven/iceberg/junit5/FileWarehouseSqliteCatalogTest.java
new file mode 100644
index 00000000000..9b4eabe929d
--- /dev/null
+++ b/extensions/iceberg/src/test/java/io/deephaven/iceberg/junit5/FileWarehouseSqliteCatalogTest.java
@@ -0,0 +1,36 @@
+//
+// Copyright (c) 2016-2024 Deephaven Data Labs and Patent Pending
+//
+package io.deephaven.iceberg.junit5;
+
+import io.deephaven.iceberg.sqlite.SqliteHelper;
+import io.deephaven.iceberg.util.IcebergCatalogAdapter;
+import io.deephaven.iceberg.util.IcebergTools;
+import org.jetbrains.annotations.Nullable;
+import org.junit.jupiter.api.Tag;
+import org.junit.jupiter.api.TestInfo;
+
+import java.nio.file.Path;
+import java.util.Map;
+
+/**
+ * This is a test base that allows the complete local testing of a Catalog via a JDBC catalog driver, with files being
+ * served via local file IO.
+ */
+@Tag("security-manager-allow")
+final class FileWarehouseSqliteCatalogTest extends SqliteCatalogBase {
+
+    @Override
+    @Nullable
+    public Object dataInstructions() {
+        return null;
+    }
+
+    @Override
+    protected IcebergCatalogAdapter catalogAdapter(TestInfo testInfo, Path rootDir, Map<String, String> properties) {
+        final String catalogName = testInfo.getTestMethod().orElseThrow().getName() + "-catalog";;
+        // no relative support needed, we don't need this data to be persistent / portable
+        SqliteHelper.setLocalFileIoProperties(properties, rootDir, catalogName, false);
+        return IcebergTools.createAdapter(catalogName, properties);
+    }
+}
diff --git a/extensions/iceberg/src/test/java/io/deephaven/iceberg/junit5/SqliteCatalogBase.java b/extensions/iceberg/src/test/java/io/deephaven/iceberg/junit5/SqliteCatalogBase.java
new file mode 100644
index 00000000000..11962bf71ec
--- /dev/null
+++ b/extensions/iceberg/src/test/java/io/deephaven/iceberg/junit5/SqliteCatalogBase.java
@@ -0,0 +1,969 @@
+//
+// Copyright (c) 2016-2024 Deephaven Data Labs and Patent Pending
+//
+package io.deephaven.iceberg.junit5;
+
+import io.deephaven.UncheckedDeephavenException;
+import io.deephaven.engine.context.ExecutionContext;
+import io.deephaven.engine.table.ColumnDefinition;
+import io.deephaven.engine.table.Table;
+import io.deephaven.engine.table.TableDefinition;
+import io.deephaven.engine.table.impl.PartitionAwareSourceTable;
+import io.deephaven.engine.table.impl.select.FormulaEvaluationException;
+import io.deephaven.engine.testutil.ControlledUpdateGraph;
+import io.deephaven.engine.util.TableTools;
+import io.deephaven.iceberg.base.IcebergUtils;
+import io.deephaven.engine.testutil.junit4.EngineCleanup;
+import io.deephaven.iceberg.sqlite.SqliteHelper;
+import io.deephaven.iceberg.util.IcebergCatalogAdapter;
+import io.deephaven.iceberg.util.IcebergReadInstructions;
+import io.deephaven.iceberg.util.IcebergTableAdapter;
+import io.deephaven.iceberg.util.IcebergTableImpl;
+import io.deephaven.iceberg.util.IcebergTableWriter;
+import io.deephaven.iceberg.util.IcebergUpdateMode;
+import io.deephaven.iceberg.util.IcebergWriteInstructions;
+import io.deephaven.iceberg.util.TableParquetWriterOptions;
+import io.deephaven.parquet.table.ParquetInstructions;
+import io.deephaven.parquet.table.ParquetTools;
+import io.deephaven.parquet.table.location.ParquetTableLocationKey;
+import io.deephaven.qst.type.Type;
+import org.apache.iceberg.AppendFiles;
+import org.apache.iceberg.DataFile;
+import org.apache.iceberg.Schema;
+import org.apache.iceberg.Snapshot;
+import org.apache.iceberg.catalog.Namespace;
+import org.apache.iceberg.catalog.TableIdentifier;
+import org.apache.iceberg.types.Types;
+import org.apache.parquet.column.ColumnDescriptor;
+import org.apache.parquet.hadoop.metadata.ParquetMetadata;
+import org.jetbrains.annotations.Nullable;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.TestInfo;
+import org.junit.jupiter.api.io.TempDir;
+
+import java.net.URI;
+import java.net.URISyntaxException;
+import java.nio.file.Path;
+import java.time.LocalDate;
+import java.util.HashMap;
+import java.util.Map;
+
+import java.util.List;
+import java.util.stream.Collectors;
+import static io.deephaven.engine.testutil.TstUtils.assertTableEquals;
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.assertj.core.api.Assertions.failBecauseExceptionWasNotThrown;
+
+public abstract class SqliteCatalogBase {
+
+    private IcebergCatalogAdapter catalogAdapter;
+    private final EngineCleanup engineCleanup = new EngineCleanup();
+
+    protected abstract IcebergCatalogAdapter catalogAdapter(TestInfo testInfo, Path rootDir,
+            Map<String, String> properties) throws Exception;
+
+    @Nullable
+    protected abstract Object dataInstructions();
+
+    @BeforeEach
+    void setUp(TestInfo testInfo, @TempDir Path rootDir) throws Exception {
+        engineCleanup.setUp();
+        final Map<String, String> properties = new HashMap<>();
+        SqliteHelper.setJdbcCatalogProperties(properties, rootDir);
+        catalogAdapter = catalogAdapter(testInfo, rootDir, properties);
+    }
+
+    @AfterEach
+    void tearDown() throws Exception {
+        engineCleanup.tearDown();
+    }
+
+    private TableParquetWriterOptions.Builder writerOptionsBuilder() {
+        final TableParquetWriterOptions.Builder builder = TableParquetWriterOptions.builder();
+        final Object dataInstructions;
+        if ((dataInstructions = dataInstructions()) != null) {
+            return builder.dataInstructions(dataInstructions);
+        }
+        return builder;
+    }
+
+    @Test
+    void empty() {
+        assertThat(catalogAdapter.listNamespaces()).isEmpty();
+    }
+
+    @Test
+    void createEmptyTable() {
+        final Schema schema = new Schema(
+                Types.NestedField.required(1, "Foo", Types.StringType.get()),
+                Types.NestedField.required(2, "Bar", Types.IntegerType.get()),
+                Types.NestedField.optional(3, "Baz", Types.DoubleType.get()));
+        final Namespace myNamespace = Namespace.of("MyNamespace");
+        final TableIdentifier myTableId = TableIdentifier.of(myNamespace, "MyTable");
+        catalogAdapter.catalog().createTable(myTableId, schema);
+
+        final IcebergTableAdapter tableAdapter = catalogAdapter.loadTable(myTableId);
+
+        assertThat(catalogAdapter.listNamespaces()).containsExactly(myNamespace);
+        assertThat(catalogAdapter.listTables(myNamespace)).containsExactly(myTableId);
+        final Table table;
+        {
+            final TableDefinition expectedDefinition = TableDefinition.of(
+                    ColumnDefinition.ofString("Foo"),
+                    ColumnDefinition.ofInt("Bar"),
+                    ColumnDefinition.ofDouble("Baz"));
+
+            assertThat(tableAdapter.definition()).isEqualTo(expectedDefinition);
+            table = tableAdapter.table();
+            assertThat(table.getDefinition()).isEqualTo(expectedDefinition);
+        }
+        assertThat(table.isEmpty()).isTrue();
+    }
+
+    @Test
+    void appendTableBasicTest() {
+        final Table source = TableTools.emptyTable(10)
+                .update("intCol = (int) 2 * i + 10",
+                        "doubleCol = (double) 2.5 * i + 10");
+        final TableIdentifier tableIdentifier = TableIdentifier.parse("MyNamespace.MyTable");
+        final IcebergTableAdapter tableAdapter = catalogAdapter.createTable(tableIdentifier, source.getDefinition());
+        {
+            final IcebergTableWriter tableWriter = tableAdapter.tableWriter(writerOptionsBuilder()
+                    .tableDefinition(source.getDefinition())
+                    .build());
+            tableWriter.append(IcebergWriteInstructions.builder()
+                    .addTables(source)
+                    .build());
+        }
+
+        Table fromIceberg = tableAdapter.table();
+        assertTableEquals(source, fromIceberg);
+        verifySnapshots(tableIdentifier, List.of("append"));
+
+        // Append more data with different compression codec
+        final Table moreData = TableTools.emptyTable(5)
+                .update("intCol = (int) 3 * i + 20",
+                        "doubleCol = (double) 3.5 * i + 20");
+        final IcebergTableWriter lz4TableWriter = tableAdapter.tableWriter(writerOptionsBuilder()
+                .tableDefinition(source.getDefinition())
+                .compressionCodecName("LZ4")
+                .build());
+        lz4TableWriter.append(IcebergWriteInstructions.builder()
+                .addTables(moreData)
+                .build());
+
+        fromIceberg = tableAdapter.table();
+        final Table expected = TableTools.merge(source, moreData);
+        assertTableEquals(expected, fromIceberg);
+        verifySnapshots(tableIdentifier, List.of("append", "append"));
+
+        // Append an empty table
+        final Table emptyTable = TableTools.emptyTable(0)
+                .update("intCol = (int) 4 * i + 30",
+                        "doubleCol = (double) 4.5 * i + 30");
+        lz4TableWriter.append(IcebergWriteInstructions.builder()
+                .addTables(emptyTable)
+                .build());
+        fromIceberg = tableAdapter.table();
+        assertTableEquals(expected, fromIceberg);
+        verifySnapshots(tableIdentifier, List.of("append", "append", "append"));
+
+        // Append multiple tables in a single call with different compression codec
+        final Table someMoreData = TableTools.emptyTable(3)
+                .update("intCol = (int) 5 * i + 40",
+                        "doubleCol = (double) 5.5 * i + 40");
+        {
+            final IcebergTableWriter gzipTableWriter = tableAdapter.tableWriter(writerOptionsBuilder()
+                    .tableDefinition(source.getDefinition())
+                    .compressionCodecName("GZIP")
+                    .build());
+            gzipTableWriter.append(IcebergWriteInstructions.builder()
+                    .addTables(someMoreData, moreData, emptyTable)
+                    .build());
+        }
+
+        fromIceberg = tableAdapter.table();
+        final Table expected2 = TableTools.merge(expected, someMoreData, moreData);
+        assertTableEquals(expected2, fromIceberg);
+        verifySnapshots(tableIdentifier, List.of("append", "append", "append", "append"));
+    }
+
+    private void verifySnapshots(final TableIdentifier tableIdentifier, final List<String> expectedOperations) {
+        final Iterable<Snapshot> snapshots = catalogAdapter.catalog().loadTable(tableIdentifier).snapshots();
+        assertThat(snapshots).map(Snapshot::operation).isEqualTo(expectedOperations);
+    }
+
+    @Test
+    void appendWithDifferentDefinition() {
+        final Table source = TableTools.emptyTable(10)
+                .update("intCol = (int) 2 * i + 10",
+                        "doubleCol = (double) 2.5 * i + 10");
+        final TableIdentifier tableIdentifier = TableIdentifier.parse("MyNamespace.MyTable");
+
+        final IcebergTableAdapter tableAdapter = catalogAdapter.createTable(tableIdentifier, source.getDefinition());
+        final IcebergTableWriter tableWriter = tableAdapter.tableWriter(writerOptionsBuilder()
+                .tableDefinition(source.getDefinition())
+                .build());
+        tableWriter.append(IcebergWriteInstructions.builder()
+                .addTables(source)
+                .build());
+        Table fromIceberg = tableAdapter.table();
+        assertTableEquals(source, fromIceberg);
+        verifySnapshots(tableIdentifier, List.of("append"));
+
+        // Append a table with just the int column
+        final Table expected;
+        {
+            final IcebergTableWriter tableWriterWithOneColumn = tableAdapter.tableWriter(writerOptionsBuilder()
+                    .tableDefinition(TableDefinition.of(ColumnDefinition.ofInt("intCol")))
+                    .build());
+            final Table singleColumnSource = TableTools.emptyTable(10)
+                    .update("intCol = (int) 5 * i + 10");
+            tableWriterWithOneColumn.append(IcebergWriteInstructions.builder()
+                    .addTables(singleColumnSource)
+                    .build());
+            fromIceberg = tableAdapter.table();
+            expected = TableTools.merge(source, singleColumnSource.update("doubleCol = NULL_DOUBLE"));
+            assertTableEquals(expected, fromIceberg);
+            verifySnapshots(tableIdentifier, List.of("append", "append"));
+        }
+
+        // Append more data
+        final Table moreData = TableTools.emptyTable(5)
+                .update("intCol = (int) 3 * i + 20",
+                        "doubleCol = (double) 3.5 * i + 20");
+        tableWriter.append(IcebergWriteInstructions.builder()
+                .addTables(moreData)
+                .build());
+        fromIceberg = tableAdapter.table();
+        final Table expected2 = TableTools.merge(expected, moreData);
+        assertTableEquals(expected2, fromIceberg);
+        verifySnapshots(tableIdentifier, List.of("append", "append", "append"));
+
+        // Append an empty table
+        tableWriter.append(IcebergWriteInstructions.builder()
+                .addTables(TableTools.emptyTable(0).update(
+                        "intCol = (int) 3 * i + 20",
+                        "doubleCol = (double) 3.5 * i + 20"))
+                .build());
+        fromIceberg = tableAdapter.table();
+        assertTableEquals(expected2, fromIceberg);
+        verifySnapshots(tableIdentifier, List.of("append", "append", "append", "append"));
+    }
+
+    @Test
+    void appendMultipleTablesWithDifferentDefinitionTest() {
+        final Table source = TableTools.emptyTable(10)
+                .update("intCol = (int) 2 * i + 10",
+                        "doubleCol = (double) 2.5 * i + 10");
+        final TableIdentifier tableIdentifier = TableIdentifier.parse("MyNamespace.MyTable");
+        final IcebergTableAdapter tableAdapter = catalogAdapter.createTable(tableIdentifier, source.getDefinition());
+        final IcebergTableWriter tableWriter = tableAdapter.tableWriter(writerOptionsBuilder()
+                .tableDefinition(source.getDefinition())
+                .build());
+        tableWriter.append(IcebergWriteInstructions.builder()
+                .addTables(source)
+                .build());
+        Table fromIceberg = tableAdapter.table();
+        assertTableEquals(source, fromIceberg);
+
+        try {
+            final Table appendTable = TableTools.emptyTable(5)
+                    .update("intCol = (int) 3 * i + 20",
+                            "doubleCol = (double) 3.5 * i + 20",
+                            "shortCol = (short) 3 * i + 20");
+            tableWriter.append(IcebergWriteInstructions.builder()
+                    .addTables(appendTable)
+                    .build());
+            failBecauseExceptionWasNotThrown(UncheckedDeephavenException.class);
+        } catch (TableDefinition.IncompatibleTableDefinitionException e) {
+            // Table definition mismatch between table writer and append table
+            assertThat(e).hasMessageContaining("Table definition");
+        }
+    }
+
+    @Test
+    void appendToCatalogTableWithAllDataTypesTest() {
+        final Schema schema = new Schema(
+                Types.NestedField.required(1, "booleanCol", Types.BooleanType.get()),
+                Types.NestedField.required(2, "doubleCol", Types.DoubleType.get()),
+                Types.NestedField.required(3, "floatCol", Types.FloatType.get()),
+                Types.NestedField.required(4, "intCol", Types.IntegerType.get()),
+                Types.NestedField.required(5, "longCol", Types.LongType.get()),
+                Types.NestedField.required(6, "stringCol", Types.StringType.get()),
+                Types.NestedField.required(7, "instantCol", Types.TimestampType.withZone()),
+                Types.NestedField.required(8, "localDateTimeCol", Types.TimestampType.withoutZone()),
+                Types.NestedField.required(9, "localDateCol", Types.DateType.get()),
+                Types.NestedField.required(10, "localTimeCol", Types.TimeType.get()),
+                Types.NestedField.required(11, "binaryCol", Types.BinaryType.get()));
+        final Namespace myNamespace = Namespace.of("MyNamespace");
+        final TableIdentifier myTableId = TableIdentifier.of(myNamespace, "MyTableWithAllDataTypes");
+        catalogAdapter.catalog().createTable(myTableId, schema);
+
+        final Table source = TableTools.emptyTable(10)
+                .update(
+                        "booleanCol = i % 2 == 0",
+                        "doubleCol = (double) 2.5 * i + 10",
+                        "floatCol = (float) (2.5 * i + 10)",
+                        "intCol = 2 * i + 10",
+                        "longCol = (long) (2 * i + 10)",
+                        "stringCol = String.valueOf(2 * i + 10)",
+                        "instantCol = java.time.Instant.now()",
+                        "localDateTimeCol = java.time.LocalDateTime.now()",
+                        "localDateCol = java.time.LocalDate.now()",
+                        "localTimeCol = java.time.LocalTime.now()",
+                        "binaryCol = new byte[] {(byte) i}");
+        final IcebergTableAdapter tableAdapter = catalogAdapter.loadTable(myTableId);
+        final IcebergTableWriter tableWriter = tableAdapter.tableWriter(writerOptionsBuilder()
+                .tableDefinition(source.getDefinition())
+                .build());
+        tableWriter.append(IcebergWriteInstructions.builder()
+                .addTables(source)
+                .build());
+        final Table fromIceberg = tableAdapter.table();
+        assertTableEquals(source, fromIceberg);
+    }
+
+    @Test
+    void testFailureInWrite() {
+        // Try creating a new iceberg table with bad data
+        final Table badSource = TableTools.emptyTable(5)
+                .updateView(
+                        "stringCol = ii % 2 == 0 ? Long.toString(ii) : null",
+                        "intCol = (int) stringCol.charAt(0)");
+        final Namespace myNamespace = Namespace.of("MyNamespace");
+        final TableIdentifier tableIdentifier = TableIdentifier.of(myNamespace, "MyTable");
+        final IcebergTableAdapter tableAdapter = catalogAdapter.createTable(tableIdentifier, badSource.getDefinition());
+        final IcebergTableWriter tableWriter = tableAdapter.tableWriter(writerOptionsBuilder()
+                .tableDefinition(badSource.getDefinition())
+                .build());
+
+        try {
+            tableWriter.append(IcebergWriteInstructions.builder()
+                    .addTables(badSource)
+                    .build());
+            failBecauseExceptionWasNotThrown(UncheckedDeephavenException.class);
+        } catch (UncheckedDeephavenException e) {
+            // Exception expected for invalid formula in table
+            assertThat(e).cause().isInstanceOf(FormulaEvaluationException.class);
+        }
+
+        // Now create a table with good data with same schema and append a bad source to it
+        final Table goodSource = TableTools.emptyTable(5)
+                .update("stringCol = Long.toString(ii)",
+                        "intCol = (int) i");
+        tableWriter.append(IcebergWriteInstructions.builder()
+                .addTables(goodSource)
+                .build());
+        Table fromIceberg = tableAdapter.table();
+        assertTableEquals(goodSource, fromIceberg);
+
+        try {
+            tableWriter.append(IcebergWriteInstructions.builder()
+                    .addTables(badSource)
+                    .build());
+            failBecauseExceptionWasNotThrown(UncheckedDeephavenException.class);
+        } catch (UncheckedDeephavenException e) {
+            // Exception expected for invalid formula in table
+            assertThat(e).cause().isInstanceOf(FormulaEvaluationException.class);
+        }
+
+        try {
+            final IcebergTableWriter badWriter = tableAdapter.tableWriter(writerOptionsBuilder()
+                    .tableDefinition(TableDefinition.of(ColumnDefinition.ofDouble("doubleCol")))
+                    .build());
+            failBecauseExceptionWasNotThrown(UncheckedDeephavenException.class);
+        } catch (IllegalArgumentException e) {
+            // Exception expected because "doubleCol" is not present in the table
+            assertThat(e).hasMessageContaining("Column doubleCol not found in the schema");
+        }
+
+        // Make sure existing good data is not deleted
+        assertThat(catalogAdapter.listNamespaces()).contains(myNamespace);
+        assertThat(catalogAdapter.listTables(myNamespace)).containsExactly(tableIdentifier);
+        fromIceberg = tableAdapter.table();
+        assertTableEquals(goodSource, fromIceberg);
+    }
+
+    @Test
+    void testColumnRenameWhileWriting() throws URISyntaxException {
+        final Table source = TableTools.emptyTable(10)
+                .update("intCol = (int) 2 * i + 10",
+                        "doubleCol = (double) 2.5 * i + 10");
+        final TableIdentifier tableIdentifier = TableIdentifier.parse("MyNamespace.MyTable");
+        final TableDefinition originalDefinition = source.getDefinition();
+        final IcebergTableAdapter tableAdapter = catalogAdapter.createTable(tableIdentifier, originalDefinition);
+        {
+            final IcebergTableWriter tableWriter = tableAdapter.tableWriter(writerOptionsBuilder()
+                    .tableDefinition(source.getDefinition())
+                    .build());
+            tableWriter.append(IcebergWriteInstructions.builder()
+                    .addTables(source)
+                    .build());
+
+            verifyDataFiles(tableIdentifier, List.of(source));
+        }
+
+        // Get field IDs for the columns for this table
+        final Map<String, Integer> nameToFieldIdFromSchema = new HashMap<>();
+        final Schema schema = tableAdapter.icebergTable().schema();
+        for (final Types.NestedField field : schema.columns()) {
+            nameToFieldIdFromSchema.put(field.name(), field.fieldId());
+        }
+
+        {
+            final List<String> parquetFiles = getAllParquetFilesFromDataFiles(tableIdentifier);
+            assertThat(parquetFiles).hasSize(1);
+            verifyFieldIdsFromParquetFile(parquetFiles.get(0), originalDefinition.getColumnNames(),
+                    nameToFieldIdFromSchema);
+        }
+
+        final Table moreData = TableTools.emptyTable(5)
+                .update("newIntCol = (int) 3 * i + 20",
+                        "newDoubleCol = (double) 3.5 * i + 20");
+        {
+            // Now append more data to it but with different column names and field Id mapping
+            final IcebergTableWriter tableWriter = tableAdapter.tableWriter(writerOptionsBuilder()
+                    .tableDefinition(moreData.getDefinition())
+                    .putFieldIdToColumnName(nameToFieldIdFromSchema.get("intCol"), "newIntCol")
+                    .putFieldIdToColumnName(nameToFieldIdFromSchema.get("doubleCol"), "newDoubleCol")
+                    .build());
+            tableWriter.append(IcebergWriteInstructions.builder()
+                    .addTables(moreData)
+                    .build());
+
+            verifyDataFiles(tableIdentifier, List.of(moreData, source));
+
+            final Map<String, Integer> newNameToFieldId = new HashMap<>();
+            newNameToFieldId.put("newIntCol", nameToFieldIdFromSchema.get("intCol"));
+            newNameToFieldId.put("newDoubleCol", nameToFieldIdFromSchema.get("doubleCol"));
+
+            final List<String> parquetFiles = getAllParquetFilesFromDataFiles(tableIdentifier);
+            assertThat(parquetFiles).hasSize(2);
+            verifyFieldIdsFromParquetFile(parquetFiles.get(0), moreData.getDefinition().getColumnNames(),
+                    newNameToFieldId);
+            verifyFieldIdsFromParquetFile(parquetFiles.get(1), originalDefinition.getColumnNames(),
+                    nameToFieldIdFromSchema);
+        }
+
+        // TODO: This is failing because we don't map columns based on the column ID when reading. Uncomment this
+        // when #6156 is merged
+        // final Table fromIceberg = tableAdapter.table();
+        // assertTableEquals(TableTools.merge(source,
+        // moreData.renameColumns("intCol = newIntCol", "doubleCol = newDoubleCol")), fromIceberg);
+    }
+
+    /**
+     * Verify that the schema of the parquet file read from the provided path has the provided column and corresponding
+     * field IDs.
+     */
+    private void verifyFieldIdsFromParquetFile(
+            final String path,
+            final List<String> columnNames,
+            final Map<String, Integer> nameToFieldId) throws URISyntaxException {
+        final ParquetMetadata metadata =
+                new ParquetTableLocationKey(new URI(path), 0, null, ParquetInstructions.builder()
+                        .setSpecialInstructions(dataInstructions())
+                        .build())
+                        .getMetadata();
+        final List<ColumnDescriptor> columnsMetadata = metadata.getFileMetaData().getSchema().getColumns();
+
+        final int numColumns = columnNames.size();
+        for (int colIdx = 0; colIdx < numColumns; colIdx++) {
+            final String columnName = columnNames.get(colIdx);
+            final String columnNameFromParquetFile = columnsMetadata.get(colIdx).getPath()[0];
+            assertThat(columnName).isEqualTo(columnNameFromParquetFile);
+
+            final int expectedFieldId = nameToFieldId.get(columnName);
+            final int fieldIdFromParquetFile = columnsMetadata.get(colIdx).getPrimitiveType().getId().intValue();
+            assertThat(fieldIdFromParquetFile).isEqualTo(expectedFieldId);
+        }
+    }
+
+    /**
+     * Verify that the data files in the table match the Deephaven tables in the given sequence.
+     */
+    private void verifyDataFiles(
+            final TableIdentifier tableIdentifier,
+            final List<Table> dhTables) {
+        final org.apache.iceberg.Table table = catalogAdapter.catalog().loadTable(tableIdentifier);
+        final List<DataFile> dataFileList = IcebergUtils.allDataFiles(table, table.currentSnapshot())
+                .collect(Collectors.toList());
+        assertThat(dataFileList).hasSize(dhTables.size());
+
+        // Check that each Deephaven table matches the corresponding data file in sequence
+        for (int i = 0; i < dhTables.size(); i++) {
+            final Table dhTable = dhTables.get(i);
+            final DataFile dataFile = dataFileList.get(i);
+            final String parquetFilePath = dataFile.path().toString();
+            final Table fromParquet = ParquetTools.readTable(parquetFilePath, ParquetInstructions.builder()
+                    .setSpecialInstructions(dataInstructions())
+                    .build());
+            assertTableEquals(dhTable, fromParquet);
+        }
+    }
+
+    /**
+     * Get all the parquet files in the table.
+     */
+    private List<String> getAllParquetFilesFromDataFiles(final TableIdentifier tableIdentifier) {
+        final org.apache.iceberg.Table table = catalogAdapter.catalog().loadTable(tableIdentifier);
+        return IcebergUtils.allDataFiles(table, table.currentSnapshot())
+                .map(dataFile -> dataFile.path().toString())
+                .collect(Collectors.toList());
+    }
+
+    @Test
+    void writeDataFilesBasicTest() {
+        final Table source = TableTools.emptyTable(10)
+                .update("intCol = (int) 2 * i + 10",
+                        "doubleCol = (double) 2.5 * i + 10");
+        final Table anotherSource = TableTools.emptyTable(5)
+                .update("intCol = (int) 3 * i + 20",
+                        "doubleCol = (double) 3.5 * i + 20");
+
+        final TableIdentifier tableIdentifier = TableIdentifier.parse("MyNamespace.MyTable");
+        final IcebergTableAdapter tableAdapter = catalogAdapter.createTable(tableIdentifier, source.getDefinition());
+
+        final IcebergTableWriter tableWriter = tableAdapter.tableWriter(writerOptionsBuilder()
+                .tableDefinition(source.getDefinition())
+                .build());
+
+        final List<DataFile> dataFilesWritten = tableWriter.writeDataFiles(IcebergWriteInstructions.builder()
+                .addTables(source, anotherSource)
+                .build());
+        verifySnapshots(tableIdentifier, List.of());
+        assertThat(dataFilesWritten).hasSize(2);
+
+        // Append some data to the table
+        final Table moreData = TableTools.emptyTable(5)
+                .update("intCol = (int) 3 * i + 20",
+                        "doubleCol = (double) 3.5 * i + 20");
+        tableWriter.append(IcebergWriteInstructions.builder()
+                .addTables(moreData)
+                .build());
+        {
+            final Table fromIceberg = tableAdapter.table();
+            assertTableEquals(moreData, fromIceberg);
+            verifySnapshots(tableIdentifier, List.of("append"));
+            verifyDataFiles(tableIdentifier, List.of(moreData));
+        }
+
+        // Now commit those data files to the table
+        final org.apache.iceberg.Table icebergTable = catalogAdapter.catalog().loadTable(tableIdentifier);
+        final AppendFiles append = icebergTable.newAppend();
+        dataFilesWritten.forEach(append::appendFile);
+        append.commit();
+
+        // Verify that the data files are now in the table
+        verifySnapshots(tableIdentifier, List.of("append", "append"));
+        verifyDataFiles(tableIdentifier, List.of(source, anotherSource, moreData));
+
+        {
+            // Verify thaty we read the data files in the correct order
+            final Table fromIceberg = tableAdapter.table();
+            assertTableEquals(TableTools.merge(moreData, source, anotherSource), fromIceberg);
+        }
+    }
+
+    @Test
+    void testPartitionedAppendBasic() {
+        final Table part1 = TableTools.emptyTable(10)
+                .update("intCol = (int) 2 * i + 10",
+                        "doubleCol = (double) 2.5 * i + 10");
+        final Table part2 = TableTools.emptyTable(5)
+                .update("intCol = (int) 3 * i + 20",
+                        "doubleCol = (double) 3.5 * i + 20");
+        final List<String> partitionPaths = List.of("PC=cat", "PC=apple");
+        final TableIdentifier tableIdentifier = TableIdentifier.parse("MyNamespace.MyTable");
+        {
+            final TableDefinition tableDefinition = part1.getDefinition();
+            final IcebergTableAdapter tableAdapter = catalogAdapter.createTable(tableIdentifier, tableDefinition);
+            final IcebergTableWriter tableWriter = tableAdapter.tableWriter(writerOptionsBuilder()
+                    .tableDefinition(tableDefinition)
+                    .build());
+            try {
+                tableWriter.append(IcebergWriteInstructions.builder()
+                        .addTables(part1, part2)
+                        .addAllPartitionPaths(partitionPaths)
+                        .build());
+                failBecauseExceptionWasNotThrown(IllegalArgumentException.class);
+            } catch (IllegalArgumentException e) {
+                // Exception expected since partition paths provided with non partitioned table
+                assertThat(e).hasMessageContaining("partition paths");
+            }
+            catalogAdapter.catalog().dropTable(tableIdentifier, true);
+        }
+
+        final TableDefinition partitioningTableDef = TableDefinition.of(
+                ColumnDefinition.ofInt("intCol"),
+                ColumnDefinition.ofDouble("doubleCol"),
+                ColumnDefinition.ofString("PC").withPartitioning());
+        final IcebergTableAdapter tableAdapter = catalogAdapter.createTable(tableIdentifier, partitioningTableDef);
+        final IcebergTableWriter tableWriter = tableAdapter.tableWriter(writerOptionsBuilder()
+                .tableDefinition(partitioningTableDef)
+                .build());
+
+        try {
+            tableWriter.append(IcebergWriteInstructions.builder()
+                    .addTables(part1, part2)
+                    .build());
+            failBecauseExceptionWasNotThrown(IllegalArgumentException.class);
+        } catch (IllegalArgumentException e) {
+            // Exception expected since partition paths not provided with a partitioned table
+            assertThat(e).hasMessageContaining("partition paths");
+        }
+
+        tableWriter.append(IcebergWriteInstructions.builder()
+                .addTables(part1, part2)
+                .addAllPartitionPaths(partitionPaths)
+                .build());
+        final Table fromIceberg = tableAdapter.table();
+        assertThat(tableAdapter.definition()).isEqualTo(partitioningTableDef);
+        assertThat(fromIceberg.getDefinition()).isEqualTo(partitioningTableDef);
+        assertThat(fromIceberg).isInstanceOf(PartitionAwareSourceTable.class);
+        final Table expected = TableTools.merge(
+                part1.update("PC = `cat`"),
+                part2.update("PC = `apple`"));
+        assertTableEquals(expected, fromIceberg.select());
+
+        final Table part3 = TableTools.emptyTable(5)
+                .update("intCol = (int) 4 * i + 30",
+                        "doubleCol = (double) 4.5 * i + 30");
+        final String partitionPath = "PC=boy";
+        tableWriter.append(IcebergWriteInstructions.builder()
+                .addTables(part3)
+                .addPartitionPaths(partitionPath)
+                .build());
+        final Table fromIceberg2 = tableAdapter.table();
+        final Table expected2 = TableTools.merge(
+                part1.update("PC = `cat`"),
+                part2.update("PC = `apple`"),
+                part3.update("PC = `boy`"));
+        assertTableEquals(expected2, fromIceberg2.select());
+    }
+
+    @Test
+    void testPartitionedAppendBasicIntegerPartitions() {
+        final Table part1 = TableTools.emptyTable(10)
+                .update("intCol = (int) 2 * i + 10",
+                        "doubleCol = (double) 2.5 * i + 10");
+        final Table part2 = TableTools.emptyTable(5)
+                .update("intCol = (int) 3 * i + 20",
+                        "doubleCol = (double) 3.5 * i + 20");
+        final TableIdentifier tableIdentifier = TableIdentifier.parse("MyNamespace.MyTable");
+
+        final TableDefinition tableDefinition = TableDefinition.of(
+                ColumnDefinition.ofInt("intCol"),
+                ColumnDefinition.ofDouble("doubleCol"),
+                ColumnDefinition.ofInt("PC").withPartitioning());
+        final IcebergTableAdapter tableAdapter = catalogAdapter.createTable(tableIdentifier, tableDefinition);
+        final IcebergTableWriter tableWriter = tableAdapter.tableWriter(writerOptionsBuilder()
+                .tableDefinition(tableDefinition)
+                .build());
+
+        {
+            // Add partition paths of incorrect type
+            try {
+                tableWriter.append(IcebergWriteInstructions.builder()
+                        .addTables(part1, part2)
+                        .addAllPartitionPaths(List.of("PC=cat", "PC=apple"))
+                        .build());
+                failBecauseExceptionWasNotThrown(IllegalArgumentException.class);
+            } catch (IllegalArgumentException e) {
+                // Exception expected since partition paths provided of incorrect type
+                assertThat(e).hasMessageContaining("partition path");
+            }
+        }
+
+        tableWriter.append(IcebergWriteInstructions.builder()
+                .addTables(part1, part2)
+                .addAllPartitionPaths(List.of("PC=3", "PC=1"))
+                .build());
+        final Table fromIceberg = tableAdapter.table();
+        assertThat(tableAdapter.definition()).isEqualTo(tableDefinition);
+        assertThat(fromIceberg.getDefinition()).isEqualTo(tableDefinition);
+        assertThat(fromIceberg).isInstanceOf(PartitionAwareSourceTable.class);
+        final Table expected = TableTools.merge(
+                part1.update("PC = 3"),
+                part2.update("PC = 1"));
+        assertTableEquals(expected, fromIceberg.select());
+
+        final Table part3 = TableTools.emptyTable(5)
+                .update("intCol = (int) 4 * i + 30",
+                        "doubleCol = (double) 4.5 * i + 30");
+        final String partitionPath = "PC=2";
+        tableWriter.append(IcebergWriteInstructions.builder()
+                .addTables(part3)
+                .addPartitionPaths(partitionPath)
+                .build());
+        final Table fromIceberg2 = tableAdapter.table();
+        final Table expected2 = TableTools.merge(
+                part1.update("PC = 3"),
+                part2.update("PC = 1"),
+                part3.update("PC = 2"));
+        assertTableEquals(expected2, fromIceberg2.select());
+    }
+
+    @Test
+    void testPartitionedAppendWithAllPartitioningTypes() {
+        final TableDefinition definition = TableDefinition.of(
+                ColumnDefinition.ofString("StringPC").withPartitioning(),
+                ColumnDefinition.ofBoolean("BooleanPC").withPartitioning(),
+                ColumnDefinition.ofInt("IntegerPC").withPartitioning(),
+                ColumnDefinition.ofLong("LongPC").withPartitioning(),
+                ColumnDefinition.ofFloat("FloatPC").withPartitioning(),
+                ColumnDefinition.ofDouble("DoublePC").withPartitioning(),
+                ColumnDefinition.of("LocalDatePC", Type.find(LocalDate.class)).withPartitioning(),
+                ColumnDefinition.ofInt("data"));
+
+        final TableIdentifier tableIdentifier = TableIdentifier.parse("MyNamespace.MyTable");
+        final IcebergTableAdapter tableAdapter = catalogAdapter.createTable(tableIdentifier, definition);
+
+        final Table source = TableTools.emptyTable(10)
+                .update("data = (int) 2 * i + 10");
+        final IcebergTableWriter tableWriter = tableAdapter.tableWriter(writerOptionsBuilder()
+                .tableDefinition(definition)
+                .build());
+
+        final List<String> partitionPaths = List.of(
+                "StringPC=AA/" +
+                        "BooleanPC=true/" +
+                        "IntegerPC=1/" +
+                        "LongPC=2/" +
+                        "FloatPC=3.0/" +
+                        "DoublePC=4.0/" +
+                        "LocalDatePC=2023-10-01");
+        tableWriter.append(IcebergWriteInstructions.builder()
+                .addTables(source)
+                .addAllPartitionPaths(partitionPaths)
+                .build());
+        final Table fromIceberg = tableAdapter.table();
+        assertThat(tableAdapter.definition()).isEqualTo(definition);
+        assertThat(fromIceberg.getDefinition()).isEqualTo(definition);
+        assertThat(fromIceberg).isInstanceOf(PartitionAwareSourceTable.class);
+
+        final Table expected = source.updateView(
+                "StringPC = `AA`",
+                "BooleanPC = (Boolean) true",
+                "IntegerPC = (int) 1",
+                "LongPC = (long) 2",
+                "FloatPC = (float) 3.0",
+                "DoublePC = (double) 4.0",
+                "LocalDatePC = LocalDate.parse(`2023-10-01`)")
+                .moveColumns(7, "data");
+        assertTableEquals(expected, fromIceberg);
+    }
+
+    @Test
+    void testManualRefreshingAppend() {
+        final Table source = TableTools.emptyTable(10)
+                .update("intCol = (int) 2 * i + 10",
+                        "doubleCol = (double) 2.5 * i + 10");
+        final TableIdentifier tableIdentifier = TableIdentifier.parse("MyNamespace.MyTable");
+        final IcebergTableAdapter tableAdapter = catalogAdapter.createTable(tableIdentifier, source.getDefinition());
+        {
+            final IcebergTableWriter tableWriter = tableAdapter.tableWriter(writerOptionsBuilder()
+                    .tableDefinition(source.getDefinition())
+                    .build());
+            tableWriter.append(IcebergWriteInstructions.builder()
+                    .addTables(source)
+                    .build());
+        }
+
+        final ControlledUpdateGraph updateGraph = ExecutionContext.getContext().getUpdateGraph().cast();
+
+        final IcebergTableImpl fromIcebergRefreshing =
+                (IcebergTableImpl) tableAdapter.table(IcebergReadInstructions.builder()
+                        .updateMode(IcebergUpdateMode.manualRefreshingMode())
+                        .build());
+        assertTableEquals(source, fromIcebergRefreshing);
+        verifySnapshots(tableIdentifier, List.of("append"));
+
+
+        // Append more data with different compression codec
+        final Table moreData = TableTools.emptyTable(5)
+                .update("intCol = (int) 3 * i + 20",
+                        "doubleCol = (double) 3.5 * i + 20");
+        {
+            final IcebergTableWriter tableWriter = tableAdapter.tableWriter(writerOptionsBuilder()
+                    .tableDefinition(source.getDefinition())
+                    .compressionCodecName("LZ4")
+                    .build());
+            tableWriter.append(IcebergWriteInstructions.builder()
+                    .addTables(moreData)
+                    .build());
+        }
+
+        fromIcebergRefreshing.update();
+        updateGraph.runWithinUnitTestCycle(fromIcebergRefreshing::refresh);
+
+        final Table expected = TableTools.merge(source, moreData);
+        assertTableEquals(expected, fromIcebergRefreshing);
+        verifySnapshots(tableIdentifier, List.of("append", "append"));
+
+        assertTableEquals(expected, tableAdapter.table());
+    }
+
+    @Test
+    void testAutomaticRefreshingAppend() throws InterruptedException {
+        final Table source = TableTools.emptyTable(10)
+                .update("intCol = (int) 2 * i + 10",
+                        "doubleCol = (double) 2.5 * i + 10");
+        final TableIdentifier tableIdentifier = TableIdentifier.parse("MyNamespace.MyTable");
+        final IcebergTableAdapter tableAdapter = catalogAdapter.createTable(tableIdentifier, source.getDefinition());
+        {
+            final IcebergTableWriter tableWriter = tableAdapter.tableWriter(writerOptionsBuilder()
+                    .tableDefinition(source.getDefinition())
+                    .build());
+            tableWriter.append(IcebergWriteInstructions.builder()
+                    .addTables(source)
+                    .build());
+        }
+
+        final IcebergTableImpl fromIcebergRefreshing =
+                (IcebergTableImpl) tableAdapter.table(IcebergReadInstructions.builder()
+                        .updateMode(IcebergUpdateMode.autoRefreshingMode(10))
+                        .build());
+        assertTableEquals(source, fromIcebergRefreshing);
+        verifySnapshots(tableIdentifier, List.of("append"));
+
+        // Append more data with different compression codec
+        final Table moreData = TableTools.emptyTable(5)
+                .update("intCol = (int) 3 * i + 20",
+                        "doubleCol = (double) 3.5 * i + 20");
+        {
+            final IcebergTableWriter tableWriter = tableAdapter.tableWriter(writerOptionsBuilder()
+                    .tableDefinition(source.getDefinition())
+                    .compressionCodecName("LZ4")
+                    .build());
+            tableWriter.append(IcebergWriteInstructions.builder()
+                    .addTables(moreData)
+                    .build());
+        }
+
+        // Sleep for 0.5 second
+        Thread.sleep(500);
+
+        final ControlledUpdateGraph updateGraph = ExecutionContext.getContext().getUpdateGraph().cast();
+        updateGraph.runWithinUnitTestCycle(fromIcebergRefreshing::refresh);
+
+        final Table expected = TableTools.merge(source, moreData);
+        assertTableEquals(expected, fromIcebergRefreshing);
+        verifySnapshots(tableIdentifier, List.of("append", "append"));
+
+        assertTableEquals(expected, tableAdapter.table());
+    }
+
+    @Test
+    void testManualRefreshingPartitionedAppend() {
+        final Table part1 = TableTools.emptyTable(10)
+                .update("intCol = (int) 2 * i + 10",
+                        "doubleCol = (double) 2.5 * i + 10");
+        final Table part2 = TableTools.emptyTable(5)
+                .update("intCol = (int) 3 * i + 20",
+                        "doubleCol = (double) 3.5 * i + 20");
+        final List<String> partitionPaths = List.of("PC=apple", "PC=boy");
+        final TableIdentifier tableIdentifier = TableIdentifier.parse("MyNamespace.MyTable");
+
+        final TableDefinition tableDefinition = TableDefinition.of(
+                ColumnDefinition.ofInt("intCol"),
+                ColumnDefinition.ofDouble("doubleCol"),
+                ColumnDefinition.ofString("PC").withPartitioning());
+        final IcebergTableAdapter tableAdapter = catalogAdapter.createTable(tableIdentifier, tableDefinition);
+        final IcebergTableWriter tableWriter = tableAdapter.tableWriter(writerOptionsBuilder()
+                .tableDefinition(tableDefinition)
+                .build());
+        tableWriter.append(IcebergWriteInstructions.builder()
+                .addTables(part1, part2)
+                .addAllPartitionPaths(partitionPaths)
+                .build());
+
+        final ControlledUpdateGraph updateGraph = ExecutionContext.getContext().getUpdateGraph().cast();
+
+        final IcebergTableImpl fromIcebergRefreshing =
+                (IcebergTableImpl) tableAdapter.table(IcebergReadInstructions.builder()
+                        .updateMode(IcebergUpdateMode.manualRefreshingMode())
+                        .build());
+        assertThat(tableAdapter.definition()).isEqualTo(tableDefinition);
+        assertThat(fromIcebergRefreshing.getDefinition()).isEqualTo(tableDefinition);
+        assertThat(fromIcebergRefreshing).isInstanceOf(PartitionAwareSourceTable.class);
+        final Table expected = TableTools.merge(
+                part1.update("PC = `apple`"),
+                part2.update("PC = `boy`"));
+        assertTableEquals(expected, fromIcebergRefreshing.select());
+
+        final Table part3 = TableTools.emptyTable(5)
+                .update("intCol = (int) 4 * i + 30",
+                        "doubleCol = (double) 4.5 * i + 30");
+        final String partitionPath = "PC=cat";
+        tableWriter.append(IcebergWriteInstructions.builder()
+                .addTables(part3)
+                .addPartitionPaths(partitionPath)
+                .build());
+
+        fromIcebergRefreshing.update();
+        updateGraph.runWithinUnitTestCycle(fromIcebergRefreshing::refresh);
+
+        final Table expected2 = TableTools.merge(expected, part3.update("PC = `cat`"));
+        assertTableEquals(expected2, fromIcebergRefreshing.select());
+    }
+
+    @Test
+    void testAutoRefreshingPartitionedAppend() throws InterruptedException {
+        final Table part1 = TableTools.emptyTable(10)
+                .update("intCol = (int) 2 * i + 10",
+                        "doubleCol = (double) 2.5 * i + 10");
+        final Table part2 = TableTools.emptyTable(5)
+                .update("intCol = (int) 3 * i + 20",
+                        "doubleCol = (double) 3.5 * i + 20");
+        final List<String> partitionPaths = List.of("PC=apple", "PC=boy");
+        final TableIdentifier tableIdentifier = TableIdentifier.parse("MyNamespace.MyTable");
+
+        final TableDefinition tableDefinition = TableDefinition.of(
+                ColumnDefinition.ofInt("intCol"),
+                ColumnDefinition.ofDouble("doubleCol"),
+                ColumnDefinition.ofString("PC").withPartitioning());
+        final IcebergTableAdapter tableAdapter = catalogAdapter.createTable(tableIdentifier, tableDefinition);
+        final IcebergTableWriter tableWriter = tableAdapter.tableWriter(writerOptionsBuilder()
+                .tableDefinition(tableDefinition)
+                .build());
+        tableWriter.append(IcebergWriteInstructions.builder()
+                .addTables(part1, part2)
+                .addAllPartitionPaths(partitionPaths)
+                .build());
+
+        final ControlledUpdateGraph updateGraph = ExecutionContext.getContext().getUpdateGraph().cast();
+
+        final IcebergTableImpl fromIcebergRefreshing =
+                (IcebergTableImpl) tableAdapter.table(IcebergReadInstructions.builder()
+                        .updateMode(IcebergUpdateMode.autoRefreshingMode(10))
+                        .build());
+        assertThat(tableAdapter.definition()).isEqualTo(tableDefinition);
+        assertThat(fromIcebergRefreshing.getDefinition()).isEqualTo(tableDefinition);
+        assertThat(fromIcebergRefreshing).isInstanceOf(PartitionAwareSourceTable.class);
+        final Table expected = TableTools.merge(
+                part1.update("PC = `apple`"),
+                part2.update("PC = `boy`"));
+        assertTableEquals(expected, fromIcebergRefreshing.select());
+
+        final Table part3 = TableTools.emptyTable(5)
+                .update("intCol = (int) 4 * i + 30",
+                        "doubleCol = (double) 4.5 * i + 30");
+        final String partitionPath = "PC=cat";
+        tableWriter.append(IcebergWriteInstructions.builder()
+                .addTables(part3)
+                .addPartitionPaths(partitionPath)
+                .build());
+
+        // Sleep for 0.5 second
+        Thread.sleep(500);
+
+        updateGraph.runWithinUnitTestCycle(fromIcebergRefreshing::refresh);
+
+        final Table expected2 = TableTools.merge(expected, part3.update("PC = `cat`"));
+        assertTableEquals(expected2, fromIcebergRefreshing.select());
+    }
+}
diff --git a/extensions/iceberg/src/test/java/io/deephaven/iceberg/sqlite/DbResource.java b/extensions/iceberg/src/test/java/io/deephaven/iceberg/sqlite/DbResource.java
new file mode 100644
index 00000000000..b20f774dd91
--- /dev/null
+++ b/extensions/iceberg/src/test/java/io/deephaven/iceberg/sqlite/DbResource.java
@@ -0,0 +1,26 @@
+//
+// Copyright (c) 2016-2024 Deephaven Data Labs and Patent Pending
+//
+package io.deephaven.iceberg.sqlite;
+
+import io.deephaven.iceberg.util.IcebergCatalogAdapter;
+import io.deephaven.iceberg.util.IcebergTools;
+
+import java.net.URISyntaxException;
+import java.nio.file.Path;
+import java.util.HashMap;
+import java.util.Map;
+
+public class DbResource {
+    public static IcebergCatalogAdapter openCatalog(String catalogName) throws URISyntaxException {
+        // Note: we are using a resource path that is not shared with our build classes to ensure we are
+        // resolving against the actual resource directory
+        final Path rootDir = Path.of(DbResource.class.getResource("db_resource").toURI());
+        final Map<String, String> properties = new HashMap<>();
+        SqliteHelper.setJdbcCatalogProperties(properties, rootDir);
+        SqliteHelper.setLocalFileIoProperties(properties, rootDir, catalogName, true);
+        // Note: the catalogName is very important here, the JDBC catalog uses it for lookups. In this way, a single
+        // dbFile can be used for multiple catalogs.
+        return IcebergTools.createAdapter(catalogName, properties);
+    }
+}
diff --git a/extensions/iceberg/src/test/java/io/deephaven/iceberg/sqlite/SqliteHelper.java b/extensions/iceberg/src/test/java/io/deephaven/iceberg/sqlite/SqliteHelper.java
new file mode 100644
index 00000000000..86e848c05a7
--- /dev/null
+++ b/extensions/iceberg/src/test/java/io/deephaven/iceberg/sqlite/SqliteHelper.java
@@ -0,0 +1,44 @@
+//
+// Copyright (c) 2016-2024 Deephaven Data Labs and Patent Pending
+//
+package io.deephaven.iceberg.sqlite;
+
+import io.deephaven.iceberg.relative.RelativeFileIO;
+import org.apache.iceberg.CatalogProperties;
+import org.apache.iceberg.hadoop.HadoopFileIO;
+import org.apache.iceberg.jdbc.JdbcCatalog;
+
+import java.nio.file.Path;
+import java.util.Map;
+
+public class SqliteHelper {
+
+    private static final String DB_FILE = "dh-iceberg-test.db";
+    private static final String CATALOGS_DIR = "catalogs";
+
+    public static void setJdbcCatalogProperties(Map<String, String> props, Path rootDir) {
+        put(props, CatalogProperties.CATALOG_IMPL, JdbcCatalog.class.getName());
+        put(props, CatalogProperties.URI, String.format("jdbc:sqlite:%s", rootDir.resolve(DB_FILE)));
+    }
+
+    public static void setLocalFileIoProperties(
+            Map<String, String> properties, Path rootDir, String catalogName, boolean relativeSupport) {
+        final Path warehouseDir = rootDir.resolve(CATALOGS_DIR).resolve(catalogName);
+        put(properties, CatalogProperties.WAREHOUSE_LOCATION, warehouseDir.toString());
+        if (relativeSupport) {
+            // When we are referring to a catalog that already exists in our unit testing filesystem, we need to make
+            // hook in relative file support. See https://github.com/apache/iceberg/issues/1617
+            put(properties, CatalogProperties.FILE_IO_IMPL, RelativeFileIO.class.getName());
+            put(properties, RelativeFileIO.BASE_PATH, rootDir.toString());
+            put(properties, RelativeFileIO.IO_IMPL, HadoopFileIO.class.getName());
+        } else {
+            put(properties, CatalogProperties.FILE_IO_IMPL, HadoopFileIO.class.getName());
+        }
+    }
+
+    private static <K, V> void put(Map<K, V> map, K key, V value) {
+        if (map.putIfAbsent(key, value) != null) {
+            throw new IllegalStateException(String.format("Key '%s' already exists in map", key));
+        }
+    }
+}
diff --git a/extensions/iceberg/src/test/resources/io/deephaven/iceberg/sqlite/db_resource/catalogs/pyiceberg-1/dh-default.db/cities/data/00000-0-6976b5d5-cc59-4f48-bcc5-3a4bf37e5139.parquet b/extensions/iceberg/src/test/resources/io/deephaven/iceberg/sqlite/db_resource/catalogs/pyiceberg-1/dh-default.db/cities/data/00000-0-6976b5d5-cc59-4f48-bcc5-3a4bf37e5139.parquet
new file mode 100644
index 00000000000..d142358a461
--- /dev/null
+++ b/extensions/iceberg/src/test/resources/io/deephaven/iceberg/sqlite/db_resource/catalogs/pyiceberg-1/dh-default.db/cities/data/00000-0-6976b5d5-cc59-4f48-bcc5-3a4bf37e5139.parquet
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:9cee42864f62bfb767514cac315aba2c6c7bc3cec7a37edd696ca01e690375ba
+size 1616
diff --git a/extensions/iceberg/src/test/resources/io/deephaven/iceberg/sqlite/db_resource/catalogs/pyiceberg-1/dh-default.db/cities/data/00000-0-cc668bfb-107c-4122-8d64-9a078f2f45a9.parquet b/extensions/iceberg/src/test/resources/io/deephaven/iceberg/sqlite/db_resource/catalogs/pyiceberg-1/dh-default.db/cities/data/00000-0-cc668bfb-107c-4122-8d64-9a078f2f45a9.parquet
new file mode 100644
index 00000000000..ada32f6e0b2
--- /dev/null
+++ b/extensions/iceberg/src/test/resources/io/deephaven/iceberg/sqlite/db_resource/catalogs/pyiceberg-1/dh-default.db/cities/data/00000-0-cc668bfb-107c-4122-8d64-9a078f2f45a9.parquet
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:0a2932c3351e5164283e7d76ed8439b08c420a1d6b039081121ed58eeefe2a4e
+size 1660
diff --git a/extensions/iceberg/src/test/resources/io/deephaven/iceberg/sqlite/db_resource/catalogs/pyiceberg-1/dh-default.db/cities/metadata/00000-4aec1d46-5bde-4642-bac7-cc7573558c7e.metadata.json b/extensions/iceberg/src/test/resources/io/deephaven/iceberg/sqlite/db_resource/catalogs/pyiceberg-1/dh-default.db/cities/metadata/00000-4aec1d46-5bde-4642-bac7-cc7573558c7e.metadata.json
new file mode 100644
index 00000000000..90a76f4767a
--- /dev/null
+++ b/extensions/iceberg/src/test/resources/io/deephaven/iceberg/sqlite/db_resource/catalogs/pyiceberg-1/dh-default.db/cities/metadata/00000-4aec1d46-5bde-4642-bac7-cc7573558c7e.metadata.json
@@ -0,0 +1 @@
+{"location":"catalogs/pyiceberg-1/dh-default.db/cities","table-uuid":"5f168e92-7a3c-4277-aa9d-0bf8425e0e05","last-updated-ms":1727458044013,"last-column-id":3,"schemas":[{"type":"struct","fields":[{"id":1,"name":"city","type":"string","required":false},{"id":2,"name":"latitude","type":"double","required":false},{"id":3,"name":"lon","type":"double","required":false}],"schema-id":0,"identifier-field-ids":[]}],"current-schema-id":0,"partition-specs":[{"spec-id":0,"fields":[]}],"default-spec-id":0,"last-partition-id":999,"properties":{},"snapshots":[],"snapshot-log":[],"metadata-log":[],"sort-orders":[{"order-id":0,"fields":[]}],"default-sort-order-id":0,"refs":{},"format-version":2,"last-sequence-number":0}
\ No newline at end of file
diff --git a/extensions/iceberg/src/test/resources/io/deephaven/iceberg/sqlite/db_resource/catalogs/pyiceberg-1/dh-default.db/cities/metadata/00001-3128d2b2-934f-483e-b2b0-4c08baebc5b2.metadata.json b/extensions/iceberg/src/test/resources/io/deephaven/iceberg/sqlite/db_resource/catalogs/pyiceberg-1/dh-default.db/cities/metadata/00001-3128d2b2-934f-483e-b2b0-4c08baebc5b2.metadata.json
new file mode 100644
index 00000000000..dd42fa006b9
--- /dev/null
+++ b/extensions/iceberg/src/test/resources/io/deephaven/iceberg/sqlite/db_resource/catalogs/pyiceberg-1/dh-default.db/cities/metadata/00001-3128d2b2-934f-483e-b2b0-4c08baebc5b2.metadata.json
@@ -0,0 +1 @@
+{"location":"catalogs/pyiceberg-1/dh-default.db/cities","table-uuid":"5f168e92-7a3c-4277-aa9d-0bf8425e0e05","last-updated-ms":1727458044082,"last-column-id":3,"schemas":[{"type":"struct","fields":[{"id":1,"name":"city","type":"string","required":false},{"id":2,"name":"latitude","type":"double","required":false},{"id":3,"name":"lon","type":"double","required":false}],"schema-id":0,"identifier-field-ids":[]}],"current-schema-id":0,"partition-specs":[{"spec-id":0,"fields":[]}],"default-spec-id":0,"last-partition-id":999,"properties":{},"current-snapshot-id":1743193108934390753,"snapshots":[{"snapshot-id":1743193108934390753,"sequence-number":1,"timestamp-ms":1727458044082,"manifest-list":"catalogs/pyiceberg-1/dh-default.db/cities/metadata/snap-1743193108934390753-0-cc668bfb-107c-4122-8d64-9a078f2f45a9.avro","summary":{"operation":"append","added-files-size":"1660","added-data-files":"1","added-records":"4","total-data-files":"1","total-delete-files":"0","total-records":"4","total-files-size":"1660","total-position-deletes":"0","total-equality-deletes":"0"},"schema-id":0}],"snapshot-log":[{"snapshot-id":1743193108934390753,"timestamp-ms":1727458044082}],"metadata-log":[],"sort-orders":[{"order-id":0,"fields":[]}],"default-sort-order-id":0,"refs":{"main":{"snapshot-id":1743193108934390753,"type":"branch"}},"format-version":2,"last-sequence-number":1}
\ No newline at end of file
diff --git a/extensions/iceberg/src/test/resources/io/deephaven/iceberg/sqlite/db_resource/catalogs/pyiceberg-1/dh-default.db/cities/metadata/00002-262f9917-5f0d-478c-aba2-a05842613e29.metadata.json b/extensions/iceberg/src/test/resources/io/deephaven/iceberg/sqlite/db_resource/catalogs/pyiceberg-1/dh-default.db/cities/metadata/00002-262f9917-5f0d-478c-aba2-a05842613e29.metadata.json
new file mode 100644
index 00000000000..01108ba0fe1
--- /dev/null
+++ b/extensions/iceberg/src/test/resources/io/deephaven/iceberg/sqlite/db_resource/catalogs/pyiceberg-1/dh-default.db/cities/metadata/00002-262f9917-5f0d-478c-aba2-a05842613e29.metadata.json
@@ -0,0 +1 @@
+{"location":"catalogs/pyiceberg-1/dh-default.db/cities","table-uuid":"5f168e92-7a3c-4277-aa9d-0bf8425e0e05","last-updated-ms":1727458044091,"last-column-id":3,"schemas":[{"type":"struct","fields":[{"id":1,"name":"city","type":"string","required":false},{"id":2,"name":"latitude","type":"double","required":false},{"id":3,"name":"lon","type":"double","required":false}],"schema-id":0,"identifier-field-ids":[]},{"type":"struct","fields":[{"id":1,"name":"city","type":"string","required":false},{"id":2,"name":"latitude","type":"double","required":false},{"id":3,"name":"longitude","type":"double","required":false}],"schema-id":1,"identifier-field-ids":[]}],"current-schema-id":1,"partition-specs":[{"spec-id":0,"fields":[]}],"default-spec-id":0,"last-partition-id":999,"properties":{},"current-snapshot-id":1743193108934390753,"snapshots":[{"snapshot-id":1743193108934390753,"sequence-number":1,"timestamp-ms":1727458044082,"manifest-list":"catalogs/pyiceberg-1/dh-default.db/cities/metadata/snap-1743193108934390753-0-cc668bfb-107c-4122-8d64-9a078f2f45a9.avro","summary":{"operation":"append","added-files-size":"1660","added-data-files":"1","added-records":"4","total-data-files":"1","total-delete-files":"0","total-records":"4","total-files-size":"1660","total-position-deletes":"0","total-equality-deletes":"0"},"schema-id":0}],"snapshot-log":[{"snapshot-id":1743193108934390753,"timestamp-ms":1727458044082}],"metadata-log":[],"sort-orders":[{"order-id":0,"fields":[]}],"default-sort-order-id":0,"refs":{"main":{"snapshot-id":1743193108934390753,"type":"branch"}},"format-version":2,"last-sequence-number":1}
\ No newline at end of file
diff --git a/extensions/iceberg/src/test/resources/io/deephaven/iceberg/sqlite/db_resource/catalogs/pyiceberg-1/dh-default.db/cities/metadata/00003-979e64ae-2052-4569-b9f1-1b45ab0c2be0.metadata.json b/extensions/iceberg/src/test/resources/io/deephaven/iceberg/sqlite/db_resource/catalogs/pyiceberg-1/dh-default.db/cities/metadata/00003-979e64ae-2052-4569-b9f1-1b45ab0c2be0.metadata.json
new file mode 100644
index 00000000000..48001734dc6
--- /dev/null
+++ b/extensions/iceberg/src/test/resources/io/deephaven/iceberg/sqlite/db_resource/catalogs/pyiceberg-1/dh-default.db/cities/metadata/00003-979e64ae-2052-4569-b9f1-1b45ab0c2be0.metadata.json
@@ -0,0 +1 @@
+{"location":"catalogs/pyiceberg-1/dh-default.db/cities","table-uuid":"5f168e92-7a3c-4277-aa9d-0bf8425e0e05","last-updated-ms":1727458044105,"last-column-id":3,"schemas":[{"type":"struct","fields":[{"id":1,"name":"city","type":"string","required":false},{"id":2,"name":"latitude","type":"double","required":false},{"id":3,"name":"lon","type":"double","required":false}],"schema-id":0,"identifier-field-ids":[]},{"type":"struct","fields":[{"id":1,"name":"city","type":"string","required":false},{"id":2,"name":"latitude","type":"double","required":false},{"id":3,"name":"longitude","type":"double","required":false}],"schema-id":1,"identifier-field-ids":[]}],"current-schema-id":1,"partition-specs":[{"spec-id":0,"fields":[]}],"default-spec-id":0,"last-partition-id":999,"properties":{},"current-snapshot-id":4630159959461529013,"snapshots":[{"snapshot-id":1743193108934390753,"sequence-number":1,"timestamp-ms":1727458044082,"manifest-list":"catalogs/pyiceberg-1/dh-default.db/cities/metadata/snap-1743193108934390753-0-cc668bfb-107c-4122-8d64-9a078f2f45a9.avro","summary":{"operation":"append","added-files-size":"1660","added-data-files":"1","added-records":"4","total-data-files":"1","total-delete-files":"0","total-records":"4","total-files-size":"1660","total-position-deletes":"0","total-equality-deletes":"0"},"schema-id":0},{"snapshot-id":4630159959461529013,"parent-snapshot-id":1743193108934390753,"sequence-number":2,"timestamp-ms":1727458044105,"manifest-list":"catalogs/pyiceberg-1/dh-default.db/cities/metadata/snap-4630159959461529013-0-6976b5d5-cc59-4f48-bcc5-3a4bf37e5139.avro","summary":{"operation":"append","added-files-size":"1616","added-data-files":"1","added-records":"2","total-data-files":"2","total-delete-files":"0","total-records":"6","total-files-size":"3276","total-position-deletes":"0","total-equality-deletes":"0"},"schema-id":1}],"snapshot-log":[{"snapshot-id":1743193108934390753,"timestamp-ms":1727458044082},{"snapshot-id":4630159959461529013,"timestamp-ms":1727458044105}],"metadata-log":[],"sort-orders":[{"order-id":0,"fields":[]}],"default-sort-order-id":0,"refs":{"main":{"snapshot-id":4630159959461529013,"type":"branch"}},"format-version":2,"last-sequence-number":2}
\ No newline at end of file
diff --git a/extensions/iceberg/src/test/resources/io/deephaven/iceberg/sqlite/db_resource/catalogs/pyiceberg-1/dh-default.db/cities/metadata/6976b5d5-cc59-4f48-bcc5-3a4bf37e5139-m0.avro b/extensions/iceberg/src/test/resources/io/deephaven/iceberg/sqlite/db_resource/catalogs/pyiceberg-1/dh-default.db/cities/metadata/6976b5d5-cc59-4f48-bcc5-3a4bf37e5139-m0.avro
new file mode 100644
index 00000000000..37bf6fa4609
Binary files /dev/null and b/extensions/iceberg/src/test/resources/io/deephaven/iceberg/sqlite/db_resource/catalogs/pyiceberg-1/dh-default.db/cities/metadata/6976b5d5-cc59-4f48-bcc5-3a4bf37e5139-m0.avro differ
diff --git a/extensions/iceberg/src/test/resources/io/deephaven/iceberg/sqlite/db_resource/catalogs/pyiceberg-1/dh-default.db/cities/metadata/cc668bfb-107c-4122-8d64-9a078f2f45a9-m0.avro b/extensions/iceberg/src/test/resources/io/deephaven/iceberg/sqlite/db_resource/catalogs/pyiceberg-1/dh-default.db/cities/metadata/cc668bfb-107c-4122-8d64-9a078f2f45a9-m0.avro
new file mode 100644
index 00000000000..651f0a05ccb
Binary files /dev/null and b/extensions/iceberg/src/test/resources/io/deephaven/iceberg/sqlite/db_resource/catalogs/pyiceberg-1/dh-default.db/cities/metadata/cc668bfb-107c-4122-8d64-9a078f2f45a9-m0.avro differ
diff --git a/extensions/iceberg/src/test/resources/io/deephaven/iceberg/sqlite/db_resource/catalogs/pyiceberg-1/dh-default.db/cities/metadata/snap-1743193108934390753-0-cc668bfb-107c-4122-8d64-9a078f2f45a9.avro b/extensions/iceberg/src/test/resources/io/deephaven/iceberg/sqlite/db_resource/catalogs/pyiceberg-1/dh-default.db/cities/metadata/snap-1743193108934390753-0-cc668bfb-107c-4122-8d64-9a078f2f45a9.avro
new file mode 100644
index 00000000000..0afb2b512da
Binary files /dev/null and b/extensions/iceberg/src/test/resources/io/deephaven/iceberg/sqlite/db_resource/catalogs/pyiceberg-1/dh-default.db/cities/metadata/snap-1743193108934390753-0-cc668bfb-107c-4122-8d64-9a078f2f45a9.avro differ
diff --git a/extensions/iceberg/src/test/resources/io/deephaven/iceberg/sqlite/db_resource/catalogs/pyiceberg-1/dh-default.db/cities/metadata/snap-4630159959461529013-0-6976b5d5-cc59-4f48-bcc5-3a4bf37e5139.avro b/extensions/iceberg/src/test/resources/io/deephaven/iceberg/sqlite/db_resource/catalogs/pyiceberg-1/dh-default.db/cities/metadata/snap-4630159959461529013-0-6976b5d5-cc59-4f48-bcc5-3a4bf37e5139.avro
new file mode 100644
index 00000000000..e16fb1846a6
Binary files /dev/null and b/extensions/iceberg/src/test/resources/io/deephaven/iceberg/sqlite/db_resource/catalogs/pyiceberg-1/dh-default.db/cities/metadata/snap-4630159959461529013-0-6976b5d5-cc59-4f48-bcc5-3a4bf37e5139.avro differ
diff --git a/extensions/iceberg/src/test/resources/io/deephaven/iceberg/sqlite/db_resource/catalogs/pyiceberg-2/trading.db/data/data/datetime_day=2024-11-26/symbol=AMZN/00000-0-d9c06748-9892-404f-a744-7bbfd06d0eeb.parquet b/extensions/iceberg/src/test/resources/io/deephaven/iceberg/sqlite/db_resource/catalogs/pyiceberg-2/trading.db/data/data/datetime_day=2024-11-26/symbol=AMZN/00000-0-d9c06748-9892-404f-a744-7bbfd06d0eeb.parquet
new file mode 100644
index 00000000000..c9dd7a2aca7
--- /dev/null
+++ b/extensions/iceberg/src/test/resources/io/deephaven/iceberg/sqlite/db_resource/catalogs/pyiceberg-2/trading.db/data/data/datetime_day=2024-11-26/symbol=AMZN/00000-0-d9c06748-9892-404f-a744-7bbfd06d0eeb.parquet
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:aef59cba214467bee2cb2d91118aadc6114718be02ab4f04d7742471f9436955
+size 1990
diff --git a/extensions/iceberg/src/test/resources/io/deephaven/iceberg/sqlite/db_resource/catalogs/pyiceberg-2/trading.db/data/data/datetime_day=2024-11-26/symbol=GOOG/00000-1-d9c06748-9892-404f-a744-7bbfd06d0eeb.parquet b/extensions/iceberg/src/test/resources/io/deephaven/iceberg/sqlite/db_resource/catalogs/pyiceberg-2/trading.db/data/data/datetime_day=2024-11-26/symbol=GOOG/00000-1-d9c06748-9892-404f-a744-7bbfd06d0eeb.parquet
new file mode 100644
index 00000000000..8d7be97be08
--- /dev/null
+++ b/extensions/iceberg/src/test/resources/io/deephaven/iceberg/sqlite/db_resource/catalogs/pyiceberg-2/trading.db/data/data/datetime_day=2024-11-26/symbol=GOOG/00000-1-d9c06748-9892-404f-a744-7bbfd06d0eeb.parquet
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:9481c165c6356f03b3d4fe5df967a03422557d8d2bfc1c58d8dc052fe18fec06
+size 1990
diff --git a/extensions/iceberg/src/test/resources/io/deephaven/iceberg/sqlite/db_resource/catalogs/pyiceberg-2/trading.db/data/data/datetime_day=2024-11-27/symbol=AAPL/00000-2-d9c06748-9892-404f-a744-7bbfd06d0eeb.parquet b/extensions/iceberg/src/test/resources/io/deephaven/iceberg/sqlite/db_resource/catalogs/pyiceberg-2/trading.db/data/data/datetime_day=2024-11-27/symbol=AAPL/00000-2-d9c06748-9892-404f-a744-7bbfd06d0eeb.parquet
new file mode 100644
index 00000000000..4106ca81801
--- /dev/null
+++ b/extensions/iceberg/src/test/resources/io/deephaven/iceberg/sqlite/db_resource/catalogs/pyiceberg-2/trading.db/data/data/datetime_day=2024-11-27/symbol=AAPL/00000-2-d9c06748-9892-404f-a744-7bbfd06d0eeb.parquet
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:e1568c608054bbd0de727d4909b29a3bdb777e2b6723a74d1641c6326d3b35cd
+size 1990
diff --git a/extensions/iceberg/src/test/resources/io/deephaven/iceberg/sqlite/db_resource/catalogs/pyiceberg-2/trading.db/data/data/datetime_day=2024-11-27/symbol=MSFT/00000-3-d9c06748-9892-404f-a744-7bbfd06d0eeb.parquet b/extensions/iceberg/src/test/resources/io/deephaven/iceberg/sqlite/db_resource/catalogs/pyiceberg-2/trading.db/data/data/datetime_day=2024-11-27/symbol=MSFT/00000-3-d9c06748-9892-404f-a744-7bbfd06d0eeb.parquet
new file mode 100644
index 00000000000..38515dcd35b
--- /dev/null
+++ b/extensions/iceberg/src/test/resources/io/deephaven/iceberg/sqlite/db_resource/catalogs/pyiceberg-2/trading.db/data/data/datetime_day=2024-11-27/symbol=MSFT/00000-3-d9c06748-9892-404f-a744-7bbfd06d0eeb.parquet
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:79f26f9cb4e2b00548491122eb8a0efb04a8ff37d0f5bce65350c38b7b17af19
+size 1990
diff --git a/extensions/iceberg/src/test/resources/io/deephaven/iceberg/sqlite/db_resource/catalogs/pyiceberg-2/trading.db/data/data/datetime_day=2024-11-28/symbol=MSFT/00000-4-d9c06748-9892-404f-a744-7bbfd06d0eeb.parquet b/extensions/iceberg/src/test/resources/io/deephaven/iceberg/sqlite/db_resource/catalogs/pyiceberg-2/trading.db/data/data/datetime_day=2024-11-28/symbol=MSFT/00000-4-d9c06748-9892-404f-a744-7bbfd06d0eeb.parquet
new file mode 100644
index 00000000000..d3b061d46b0
--- /dev/null
+++ b/extensions/iceberg/src/test/resources/io/deephaven/iceberg/sqlite/db_resource/catalogs/pyiceberg-2/trading.db/data/data/datetime_day=2024-11-28/symbol=MSFT/00000-4-d9c06748-9892-404f-a744-7bbfd06d0eeb.parquet
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:a6a8ee2286b0cdf702fef4745471375adf9b819883726d659129e0ba95e0c8dd
+size 1856
diff --git a/extensions/iceberg/src/test/resources/io/deephaven/iceberg/sqlite/db_resource/catalogs/pyiceberg-2/trading.db/data/metadata/00000-0956ea6c-b522-447f-a2f4-5c6e7b104783.metadata.json b/extensions/iceberg/src/test/resources/io/deephaven/iceberg/sqlite/db_resource/catalogs/pyiceberg-2/trading.db/data/metadata/00000-0956ea6c-b522-447f-a2f4-5c6e7b104783.metadata.json
new file mode 100644
index 00000000000..0bf00e06545
--- /dev/null
+++ b/extensions/iceberg/src/test/resources/io/deephaven/iceberg/sqlite/db_resource/catalogs/pyiceberg-2/trading.db/data/metadata/00000-0956ea6c-b522-447f-a2f4-5c6e7b104783.metadata.json
@@ -0,0 +1 @@
+{"location":"catalogs/pyiceberg-2/trading.db/data","table-uuid":"d1f874d4-c065-432d-969b-39efb3e9eb1c","last-updated-ms":1733868694938,"last-column-id":4,"schemas":[{"type":"struct","fields":[{"id":1,"name":"datetime","type":"timestamp","required":false},{"id":2,"name":"symbol","type":"string","required":false},{"id":3,"name":"bid","type":"double","required":false},{"id":4,"name":"ask","type":"double","required":false}],"schema-id":0,"identifier-field-ids":[]}],"current-schema-id":0,"partition-specs":[{"spec-id":0,"fields":[{"source-id":1,"field-id":1000,"transform":"day","name":"datetime_day"},{"source-id":2,"field-id":1001,"transform":"identity","name":"symbol"}]}],"default-spec-id":0,"last-partition-id":1001,"properties":{},"snapshots":[],"snapshot-log":[],"metadata-log":[],"sort-orders":[{"order-id":0,"fields":[]}],"default-sort-order-id":0,"refs":{},"format-version":2,"last-sequence-number":0}
\ No newline at end of file
diff --git a/extensions/iceberg/src/test/resources/io/deephaven/iceberg/sqlite/db_resource/catalogs/pyiceberg-2/trading.db/data/metadata/00001-4e3fe6dc-5e3e-4da1-9da3-666cbad70ace.metadata.json b/extensions/iceberg/src/test/resources/io/deephaven/iceberg/sqlite/db_resource/catalogs/pyiceberg-2/trading.db/data/metadata/00001-4e3fe6dc-5e3e-4da1-9da3-666cbad70ace.metadata.json
new file mode 100644
index 00000000000..fea345f31a8
--- /dev/null
+++ b/extensions/iceberg/src/test/resources/io/deephaven/iceberg/sqlite/db_resource/catalogs/pyiceberg-2/trading.db/data/metadata/00001-4e3fe6dc-5e3e-4da1-9da3-666cbad70ace.metadata.json
@@ -0,0 +1 @@
+{"location":"catalogs/pyiceberg-2/trading.db/data","table-uuid":"d1f874d4-c065-432d-969b-39efb3e9eb1c","last-updated-ms":1733868695120,"last-column-id":4,"schemas":[{"type":"struct","fields":[{"id":1,"name":"datetime","type":"timestamp","required":false},{"id":2,"name":"symbol","type":"string","required":false},{"id":3,"name":"bid","type":"double","required":false},{"id":4,"name":"ask","type":"double","required":false}],"schema-id":0,"identifier-field-ids":[]}],"current-schema-id":0,"partition-specs":[{"spec-id":0,"fields":[{"source-id":1,"field-id":1000,"transform":"day","name":"datetime_day"},{"source-id":2,"field-id":1001,"transform":"identity","name":"symbol"}]}],"default-spec-id":0,"last-partition-id":1001,"properties":{},"current-snapshot-id":2806418501596315192,"snapshots":[{"snapshot-id":2806418501596315192,"sequence-number":1,"timestamp-ms":1733868695120,"manifest-list":"catalogs/pyiceberg-2/trading.db/data/metadata/snap-2806418501596315192-0-d9c06748-9892-404f-a744-7bbfd06d0eeb.avro","summary":{"operation":"append","added-files-size":"9816","added-data-files":"5","added-records":"5","changed-partition-count":"5","total-data-files":"5","total-delete-files":"0","total-records":"5","total-files-size":"9816","total-position-deletes":"0","total-equality-deletes":"0"},"schema-id":0}],"snapshot-log":[{"snapshot-id":2806418501596315192,"timestamp-ms":1733868695120}],"metadata-log":[],"sort-orders":[{"order-id":0,"fields":[]}],"default-sort-order-id":0,"refs":{"main":{"snapshot-id":2806418501596315192,"type":"branch"}},"format-version":2,"last-sequence-number":1}
\ No newline at end of file
diff --git a/extensions/iceberg/src/test/resources/io/deephaven/iceberg/sqlite/db_resource/catalogs/pyiceberg-2/trading.db/data/metadata/d9c06748-9892-404f-a744-7bbfd06d0eeb-m0.avro b/extensions/iceberg/src/test/resources/io/deephaven/iceberg/sqlite/db_resource/catalogs/pyiceberg-2/trading.db/data/metadata/d9c06748-9892-404f-a744-7bbfd06d0eeb-m0.avro
new file mode 100644
index 00000000000..36d7d3ca191
Binary files /dev/null and b/extensions/iceberg/src/test/resources/io/deephaven/iceberg/sqlite/db_resource/catalogs/pyiceberg-2/trading.db/data/metadata/d9c06748-9892-404f-a744-7bbfd06d0eeb-m0.avro differ
diff --git a/extensions/iceberg/src/test/resources/io/deephaven/iceberg/sqlite/db_resource/catalogs/pyiceberg-2/trading.db/data/metadata/snap-2806418501596315192-0-d9c06748-9892-404f-a744-7bbfd06d0eeb.avro b/extensions/iceberg/src/test/resources/io/deephaven/iceberg/sqlite/db_resource/catalogs/pyiceberg-2/trading.db/data/metadata/snap-2806418501596315192-0-d9c06748-9892-404f-a744-7bbfd06d0eeb.avro
new file mode 100644
index 00000000000..20d65fea166
Binary files /dev/null and b/extensions/iceberg/src/test/resources/io/deephaven/iceberg/sqlite/db_resource/catalogs/pyiceberg-2/trading.db/data/metadata/snap-2806418501596315192-0-d9c06748-9892-404f-a744-7bbfd06d0eeb.avro differ
diff --git a/extensions/iceberg/src/test/resources/io/deephaven/iceberg/sqlite/db_resource/dh-iceberg-test.db b/extensions/iceberg/src/test/resources/io/deephaven/iceberg/sqlite/db_resource/dh-iceberg-test.db
new file mode 100644
index 00000000000..44c557bd98e
Binary files /dev/null and b/extensions/iceberg/src/test/resources/io/deephaven/iceberg/sqlite/db_resource/dh-iceberg-test.db differ
diff --git a/extensions/iceberg/src/test/resources/io/deephaven/iceberg/sqlite/db_resource/generate-pyiceberg-1.py b/extensions/iceberg/src/test/resources/io/deephaven/iceberg/sqlite/db_resource/generate-pyiceberg-1.py
new file mode 100644
index 00000000000..25b9c88da8d
--- /dev/null
+++ b/extensions/iceberg/src/test/resources/io/deephaven/iceberg/sqlite/db_resource/generate-pyiceberg-1.py
@@ -0,0 +1,57 @@
+'''
+See TESTING.md for how to run this script.
+'''
+
+from pyiceberg.schema import Schema
+from pyiceberg.types import NestedField, StringType, DoubleType
+from pyiceberg.catalog.sql import SqlCatalog
+
+import pyarrow as pa
+
+catalog = SqlCatalog(
+    "pyiceberg-1",
+    **{
+        "uri": f"sqlite:///dh-iceberg-test.db",
+        "warehouse": f"catalogs/pyiceberg-1",
+    },
+)
+
+original_schema = Schema(
+    NestedField(1, "city", StringType(), required=False),
+    NestedField(2, "latitude", DoubleType(), required=False),
+    NestedField(3, "lon", DoubleType(), required=False),
+)
+
+#  Using specific names to make clear these aren't a standard / convention
+catalog.create_namespace("dh-default")
+
+table = catalog.create_table(
+    "dh-default.cities",
+    schema=original_schema,
+)
+
+# Add some data
+table.append(
+    pa.Table.from_pylist(
+        [
+            {"city": "Amsterdam", "latitude": 52.371807, "lon": 4.896029},
+            {"city": "San Francisco", "latitude": 37.773972, "lon": -122.431297},
+            {"city": "Drachten", "latitude": 53.11254, "lon": 6.0989},
+            {"city": "Paris", "latitude": 48.864716, "lon": 2.349014},
+        ],
+    )
+)
+
+# Oops, we should be consistent with naming
+with table.update_schema() as update:
+    update.rename_column("lon", "longitude")
+
+# Add some data. Note, to simplify ingestion, we are matching the latest column names
+table.append(
+    pa.Table.from_pylist(
+        [
+            {"city": "Minneapolis", "latitude": 44.977479, "longitude": -93.264358},
+            {"city": "New York", "latitude": 40.730610, "longitude": -73.935242},
+        ],
+    )
+)
diff --git a/extensions/iceberg/src/test/resources/io/deephaven/iceberg/sqlite/db_resource/generate-pyiceberg-2.py b/extensions/iceberg/src/test/resources/io/deephaven/iceberg/sqlite/db_resource/generate-pyiceberg-2.py
new file mode 100644
index 00000000000..fc7b2c5a588
--- /dev/null
+++ b/extensions/iceberg/src/test/resources/io/deephaven/iceberg/sqlite/db_resource/generate-pyiceberg-2.py
@@ -0,0 +1,58 @@
+'''
+See TESTING.md for how to run this script.
+'''
+
+import pyarrow as pa
+from datetime import datetime
+from pyiceberg.catalog.sql import SqlCatalog
+from pyiceberg.schema import Schema
+from pyiceberg.types import TimestampType, FloatType, DoubleType, StringType, NestedField, StructType
+from pyiceberg.partitioning import PartitionSpec, PartitionField
+from pyiceberg.transforms import DayTransform, IdentityTransform
+
+catalog = SqlCatalog(
+    "pyiceberg-2",
+    **{
+        "uri": f"sqlite:///dh-iceberg-test.db",
+        "warehouse": f"catalogs/pyiceberg-2",
+    },
+)
+
+schema = Schema(
+    NestedField(field_id=1, name="datetime", field_type=TimestampType(), required=False),
+    NestedField(field_id=2, name="symbol", field_type=StringType(), required=False),
+    NestedField(field_id=3, name="bid", field_type=DoubleType(), required=False),
+    NestedField(field_id=4, name="ask", field_type=DoubleType(), required=False),
+)
+
+partition_spec = PartitionSpec(
+    PartitionField(
+        source_id=1, field_id=1000, transform=DayTransform(), name="datetime_day",
+    ),
+    PartitionField(
+        source_id=2, field_id=1001, transform=IdentityTransform(), name="symbol",
+    )
+)
+
+catalog.create_namespace("trading")
+
+tbl = catalog.create_table(
+    identifier="trading.data",
+    schema=schema,
+    partition_spec=partition_spec,
+)
+
+# Define the data according to your Iceberg schema
+data = [
+    {"datetime": datetime(2024, 11, 27, 10, 0, 0), "symbol": "AAPL", "bid": 150.25, "ask": 151.0},
+    {"datetime": datetime(2024, 11, 27, 10, 0, 0), "symbol": "MSFT", "bid": 150.25, "ask": 151.0},
+    {"datetime": datetime(2024, 11, 26, 10, 1, 0), "symbol": "GOOG", "bid": 2800.75, "ask": 2810.5},
+    {"datetime": datetime(2024, 11, 26, 10, 2, 0), "symbol": "AMZN", "bid": 3400.5, "ask": 3420.0},
+    {"datetime": datetime(2024, 11, 28, 10, 3, 0), "symbol": "MSFT", "bid": None, "ask": 250.0},
+]
+
+# Create a PyArrow Table
+table = pa.Table.from_pylist(data)
+
+# Append the table to the Iceberg table
+tbl.append(table)
diff --git a/extensions/jdbc/build.gradle b/extensions/jdbc/build.gradle
index ce1da76ed4d..f2ac49ccc84 100644
--- a/extensions/jdbc/build.gradle
+++ b/extensions/jdbc/build.gradle
@@ -11,16 +11,16 @@ dependencies {
     implementation project(':engine-table'),
             project(':engine-base')
 
-    Classpaths.inheritGuava(project)
+    implementation libs.guava
 
-    Classpaths.inheritJUnitPlatform(project)
-    Classpaths.inheritAssertJ(project)
+    testImplementation platform(libs.junit.bom)
+    testImplementation libs.assertj
 
     testImplementation project(':engine-test-utils')
-    testImplementation 'com.h2database:h2:2.1.212'
+    testImplementation libs.h2database.h2
 
     testRuntimeOnly project(':log-to-slf4j')
     testRuntimeOnly project(':configs')
     testRuntimeOnly project(':test-configs')
-    Classpaths.inheritSlf4j(project, 'slf4j-simple', 'testRuntimeOnly')
+    testRuntimeOnly libs.slf4j.simple
 }
diff --git a/extensions/json-jackson/build.gradle b/extensions/json-jackson/build.gradle
index bd18f5a88b4..c46c5c96896 100644
--- a/extensions/json-jackson/build.gradle
+++ b/extensions/json-jackson/build.gradle
@@ -6,12 +6,11 @@ plugins {
 dependencies {
     api project(':engine-processor')
 
-    Classpaths.inheritJacksonPlatform(project, 'api')
-    Classpaths.inheritJacksonPlatform(project, 'testImplementation')
+    api platform(libs.jackson.bom)
+    api libs.jackson.core
 
-    api 'com.fasterxml.jackson.core:jackson-core'
     // https://github.com/FasterXML/jackson-core/issues/1229
-    implementation 'ch.randelshofer:fastdoubleparser:1.0.0'
+    implementation libs.randelshofer.fastdoubleparser
 
     api project(':extensions-json')
 
@@ -19,14 +18,20 @@ dependencies {
 
     implementation project(':engine-query-constants')
     implementation project(':engine-time')
-    Classpaths.inheritImmutables(project)
-    Classpaths.inheritAutoService(project)
-    compileOnly 'com.google.code.findbugs:jsr305:3.0.2'
-
-    Classpaths.inheritJUnitPlatform(project)
-    Classpaths.inheritAssertJ(project)
-    testImplementation 'org.junit.jupiter:junit-jupiter'
-    testImplementation 'com.fasterxml.jackson.core:jackson-databind'
+
+    compileOnly project(':util-immutables')
+    annotationProcessor libs.immutables.value
+
+    compileOnly libs.autoservice
+    annotationProcessor libs.autoservice.compiler
+    compileOnly libs.google.findbugs.jsr305
+
+    testImplementation libs.assertj
+    testImplementation platform(libs.junit.bom)
+    testImplementation libs.junit.jupiter
+
+    testImplementation platform(libs.jackson.bom)
+    testImplementation libs.jackson.databind
 }
 
 test {
diff --git a/extensions/json/build.gradle b/extensions/json/build.gradle
index 2eb199e160e..95e1a7534ad 100644
--- a/extensions/json/build.gradle
+++ b/extensions/json/build.gradle
@@ -4,12 +4,14 @@ plugins {
 }
 
 dependencies {
-    Classpaths.inheritImmutables(project)
-    compileOnly 'com.google.code.findbugs:jsr305:3.0.2'
+    compileOnly project(':util-immutables')
+    annotationProcessor libs.immutables.value
 
-    Classpaths.inheritJUnitPlatform(project)
-    Classpaths.inheritAssertJ(project)
-    testImplementation 'org.junit.jupiter:junit-jupiter'
+    compileOnly libs.google.findbugs.jsr305
+
+    testImplementation libs.assertj
+    testImplementation platform(libs.junit.bom)
+    testImplementation libs.junit.jupiter
 }
 
 test {
diff --git a/extensions/kafka/build.gradle b/extensions/kafka/build.gradle
index 39c39e4f980..65968c51d52 100644
--- a/extensions/kafka/build.gradle
+++ b/extensions/kafka/build.gradle
@@ -10,14 +10,15 @@ dependencies {
 
     api project(':engine-processor')
 
-    api 'org.apache.avro:avro:1.11.3'
+    // Expose Avro to the users of this extension.
+    api libs.avro
 
     // Using io.confluent dependencies requires code in the toplevel build.gradle to add their maven repository.
     // Note: the -ccs flavor is provided by confluent as their community edition. It is equivalent to the maven central
     // version, but has a different version to make it easier to keep confluent dependencies aligned.
-    api 'org.apache.kafka:kafka-clients:7.6.0-ccs'
-    api 'io.confluent:kafka-avro-serializer:7.6.0'
-    api 'io.confluent:kafka-protobuf-serializer:7.6.0'
+    api libs.confluent.kafka.clients
+    api libs.confluent.avro.serializer
+    api libs.confluent.protobuf.serializer
 
     // When updating the kafka implementation, it may be useful to test out the minimum kafka version that our code
     // compiles, tests, and runs with. If we want to offer more strict guarantees in these regards in the future, at
@@ -31,18 +32,19 @@ dependencies {
     implementation project(':engine-processor-function')
     implementation project(':Configuration')
     implementation project(':log-factory')
-    implementation depTrove3
-    implementation depCommonsLang3
+    implementation libs.trove
+    implementation libs.commons.lang3
 
-    Classpaths.inheritImmutables(project)
+    compileOnly project(':util-immutables')
+    annotationProcessor libs.immutables.value
 
     testImplementation project(':engine-test-utils')
-    Classpaths.inheritJUnitClassic(project, 'testImplementation')
+    testImplementation libs.junit4
 
     testRuntimeOnly project(':log-to-slf4j')
     testRuntimeOnly project(':configs')
     testRuntimeOnly project(':test-configs')
-    Classpaths.inheritSlf4j(project, 'slf4j-simple', 'testRuntimeOnly')
+    testRuntimeOnly libs.slf4j.simple
 
-    Classpaths.inheritAssertJ(project)
+    testImplementation libs.assertj
 }
diff --git a/extensions/kafka/src/main/java/io/deephaven/kafka/KafkaTools.java b/extensions/kafka/src/main/java/io/deephaven/kafka/KafkaTools.java
index e51f44251d6..34cee93c488 100644
--- a/extensions/kafka/src/main/java/io/deephaven/kafka/KafkaTools.java
+++ b/extensions/kafka/src/main/java/io/deephaven/kafka/KafkaTools.java
@@ -1218,33 +1218,30 @@ public Function<TopicPartition, KafkaRecordConsumer> visit(@NotNull final PerPar
     }
 
     /**
-     * Consume from Kafka to {@link StreamConsumer stream consumers} supplied by {@code streamConsumerRegistrar}.
-     *
-     * @param kafkaProperties Properties to configure this table and also to be passed to create the KafkaConsumer
-     * @param topic Kafka topic name
-     * @param partitionFilter A predicate returning true for the partitions to consume. The convenience constant
-     *        {@code ALL_PARTITIONS} is defined to facilitate requesting all partitions.
-     * @param partitionToInitialOffset A function specifying the desired initial offset for each partition consumed
-     * @param keySpec Conversion specification for Kafka record keys
-     * @param valueSpec Conversion specification for Kafka record values
-     * @param streamConsumerRegistrarProvider A provider for a function to
-     *        {@link StreamPublisher#register(StreamConsumer) register} {@link StreamConsumer} instances. The registered
-     *        stream consumers must accept {@link ChunkType chunk types} that correspond to
-     *        {@link StreamChunkUtils#chunkTypeForColumnIndex(TableDefinition, int)} for the supplied
-     *        {@link TableDefinition}. See {@link StreamConsumerRegistrarProvider#single(SingleConsumerRegistrar)
-     *        single} and {@link StreamConsumerRegistrarProvider#perPartition(PerPartitionConsumerRegistrar)
-     *        per-partition}.
-     * @param consumerLoopCallback callback to inject logic into the ingester's consumer loop
+     * Basic holder structure used to pass multiple objects back to a calling method.
      */
-    public static void consume(
+    private static class ConsumeStruct {
+        final TableDefinition tableDefinition;
+        final KafkaStreamPublisher.Parameters publisherParameters;
+        final Deserializer<?> keyDeser;
+        final Deserializer<?> valueDeser;
+
+        private ConsumeStruct(
+                @NotNull final TableDefinition tableDefinition,
+                @NotNull final KafkaStreamPublisher.Parameters publisherParameters,
+                @NotNull final Deserializer<?> keyDeser,
+                @NotNull final Deserializer<?> valueDeser) {
+            this.tableDefinition = tableDefinition;
+            this.publisherParameters = publisherParameters;
+            this.keyDeser = keyDeser;
+            this.valueDeser = valueDeser;
+        }
+    }
+
+    private static ConsumeStruct getConsumeStruct(
             @NotNull final Properties kafkaProperties,
-            @NotNull final String topic,
-            @NotNull final IntPredicate partitionFilter,
-            @NotNull final InitialOffsetLookup partitionToInitialOffset,
             @NotNull final Consume.KeyOrValueSpec keySpec,
-            @NotNull final Consume.KeyOrValueSpec valueSpec,
-            @NotNull final StreamConsumerRegistrarProvider streamConsumerRegistrarProvider,
-            @Nullable final ConsumerLoopCallback consumerLoopCallback) {
+            @NotNull final Consume.KeyOrValueSpec valueSpec) {
         if (Consume.isIgnore(keySpec) && Consume.isIgnore(valueSpec)) {
             throw new IllegalArgumentException(
                     "can't ignore both key and value: keySpec and valueSpec can't both be ignore specs");
@@ -1297,12 +1294,64 @@ public static void consume(
                     .setValueToChunkObjectMapper(valueIngestData.toObjectChunkMapper);
         }
 
-        final KafkaStreamPublisher.Parameters publisherParameters = publisherParametersBuilder.build();
+        return new ConsumeStruct(tableDefinition, publisherParametersBuilder.build(), keyDeser, valueDeser);
+    }
+
+    /**
+     * Construct a {@link TableDefinition} based on the input Properties and {@link Consume.KeyOrValueSpec} parameters.
+     * Given the same input Properties and Consume.KeyOrValueSpec parameters, the returned TableDefinition is the same
+     * as the TableDefinition of the table produced by
+     * {@link #consumeToTable(Properties, String, IntPredicate, IntToLongFunction, Consume.KeyOrValueSpec, Consume.KeyOrValueSpec, TableType)}
+     *
+     * @param kafkaProperties Properties to configure this table
+     * @param keySpec Conversion specification for Kafka record keys
+     * @param valueSpec Conversion specification for Kafka record values
+     * @return A TableDefinition derived from the input Properties and KeyOrValueSpec instances
+     */
+    @SuppressWarnings("unused")
+    public static TableDefinition getTableDefinition(
+            @NotNull final Properties kafkaProperties,
+            @NotNull final Consume.KeyOrValueSpec keySpec,
+            @NotNull final Consume.KeyOrValueSpec valueSpec) {
+        return getConsumeStruct(kafkaProperties, keySpec, valueSpec).tableDefinition;
+    }
+
+    /**
+     * Consume from Kafka to {@link StreamConsumer stream consumers} supplied by {@code streamConsumerRegistrar}.
+     *
+     * @param kafkaProperties Properties to configure this table and also to be passed to create the KafkaConsumer
+     * @param topic Kafka topic name
+     * @param partitionFilter A predicate returning true for the partitions to consume. The convenience constant
+     *        {@code ALL_PARTITIONS} is defined to facilitate requesting all partitions.
+     * @param partitionToInitialOffset A function specifying the desired initial offset for each partition consumed
+     * @param keySpec Conversion specification for Kafka record keys
+     * @param valueSpec Conversion specification for Kafka record values
+     * @param streamConsumerRegistrarProvider A provider for a function to
+     *        {@link StreamPublisher#register(StreamConsumer) register} {@link StreamConsumer} instances. The registered
+     *        stream consumers must accept {@link ChunkType chunk types} that correspond to
+     *        {@link StreamChunkUtils#chunkTypeForColumnIndex(TableDefinition, int)} for the supplied
+     *        {@link TableDefinition}. See {@link StreamConsumerRegistrarProvider#single(SingleConsumerRegistrar)
+     *        single} and {@link StreamConsumerRegistrarProvider#perPartition(PerPartitionConsumerRegistrar)
+     *        per-partition}.
+     * @param consumerLoopCallback callback to inject logic into the ingester's consumer loop
+     */
+    public static void consume(
+            @NotNull final Properties kafkaProperties,
+            @NotNull final String topic,
+            @NotNull final IntPredicate partitionFilter,
+            @NotNull final InitialOffsetLookup partitionToInitialOffset,
+            @NotNull final Consume.KeyOrValueSpec keySpec,
+            @NotNull final Consume.KeyOrValueSpec valueSpec,
+            @NotNull final StreamConsumerRegistrarProvider streamConsumerRegistrarProvider,
+            @Nullable final ConsumerLoopCallback consumerLoopCallback) {
+        final ConsumeStruct consumeStruct = getConsumeStruct(kafkaProperties, keySpec, valueSpec);
+
         final MutableObject<KafkaIngester> kafkaIngesterHolder = new MutableObject<>();
 
         final Function<TopicPartition, KafkaRecordConsumer> kafkaRecordConsumerFactory =
                 streamConsumerRegistrarProvider.walk(
-                        new KafkaRecordConsumerFactoryCreator(publisherParameters, kafkaIngesterHolder::getValue));
+                        new KafkaRecordConsumerFactoryCreator(consumeStruct.publisherParameters,
+                                kafkaIngesterHolder::getValue));
 
         final KafkaIngester ingester = new KafkaIngester(
                 log,
@@ -1311,8 +1360,8 @@ public static void consume(
                 partitionFilter,
                 kafkaRecordConsumerFactory,
                 partitionToInitialOffset,
-                keyDeser,
-                valueDeser,
+                consumeStruct.keyDeser,
+                consumeStruct.valueDeser,
                 consumerLoopCallback);
         kafkaIngesterHolder.setValue(ingester);
         ingester.start();
diff --git a/extensions/kafka/src/main/java/io/deephaven/kafka/ProtobufImpl.java b/extensions/kafka/src/main/java/io/deephaven/kafka/ProtobufImpl.java
index df0f2306458..0ab3719e209 100644
--- a/extensions/kafka/src/main/java/io/deephaven/kafka/ProtobufImpl.java
+++ b/extensions/kafka/src/main/java/io/deephaven/kafka/ProtobufImpl.java
@@ -17,9 +17,7 @@
 import io.deephaven.api.ColumnName;
 import io.deephaven.engine.table.ColumnDefinition;
 import io.deephaven.engine.table.TableDefinition;
-import io.deephaven.function.ToObjectFunction;
-import io.deephaven.function.ToPrimitiveFunction;
-import io.deephaven.function.TypedFunction;
+import io.deephaven.function.*;
 import io.deephaven.kafka.KafkaTools.Consume;
 import io.deephaven.kafka.KafkaTools.KeyOrValue;
 import io.deephaven.kafka.KafkaTools.KeyOrValueIngestData;
@@ -38,6 +36,7 @@
 import io.deephaven.protobuf.ProtobufFunction;
 import io.deephaven.protobuf.ProtobufFunctions;
 import io.deephaven.protobuf.ProtobufFunctions.Builder;
+import io.deephaven.function.ToChunkTypeTransform;
 import io.deephaven.qst.type.Type;
 import io.deephaven.util.annotations.VisibleForTesting;
 import io.deephaven.util.mutable.MutableInt;
diff --git a/extensions/kafka/src/main/java/io/deephaven/kafka/publish/JsonKeyOrValueSerializer.java b/extensions/kafka/src/main/java/io/deephaven/kafka/publish/JsonKeyOrValueSerializer.java
index d084747c564..faca56355cf 100644
--- a/extensions/kafka/src/main/java/io/deephaven/kafka/publish/JsonKeyOrValueSerializer.java
+++ b/extensions/kafka/src/main/java/io/deephaven/kafka/publish/JsonKeyOrValueSerializer.java
@@ -214,7 +214,7 @@ private JSONFieldProcessor makeIntFieldProcessor(final String fieldName, final C
             @Override
             void outputField(final int ii, final ObjectNode node, final IntChunk<Values> inputChunk) {
                 final int raw = inputChunk.get(ii);
-                if (raw == QueryConstants.NULL_SHORT) {
+                if (raw == QueryConstants.NULL_INT) {
                     if (outputNulls) {
                         node.putNull(childNodeFieldName);
                     }
diff --git a/extensions/kafka/src/main/java/io/deephaven/kafka/publish/PublishToKafka.java b/extensions/kafka/src/main/java/io/deephaven/kafka/publish/PublishToKafka.java
index d3b311323ba..61e4a3191f8 100644
--- a/extensions/kafka/src/main/java/io/deephaven/kafka/publish/PublishToKafka.java
+++ b/extensions/kafka/src/main/java/io/deephaven/kafka/publish/PublishToKafka.java
@@ -35,6 +35,7 @@
 import org.apache.kafka.common.serialization.Serializer;
 import org.jetbrains.annotations.NotNull;
 
+import javax.annotation.OverridingMethodsMustInvokeSuper;
 import java.time.Instant;
 import java.util.Objects;
 import java.util.Properties;
@@ -398,6 +399,7 @@ public void onUpdate(TableUpdate upstream) {
         }
     }
 
+    @OverridingMethodsMustInvokeSuper
     @Override
     protected void destroy() {
         super.destroy();
diff --git a/extensions/parquet/base/build.gradle b/extensions/parquet/base/build.gradle
index 6f50b1feeee..76bcfd2f7ed 100644
--- a/extensions/parquet/base/build.gradle
+++ b/extensions/parquet/base/build.gradle
@@ -7,17 +7,20 @@ description 'Parquet Base: Libraries for working with Parquet files'
 
 dependencies {
     api project(':util-channel')
+    api project(':codec-api')
 
-    Classpaths.inheritParquetHadoop(project)
+    implementation libs.parquet.hadoop
 
     implementation project(':extensions-parquet-compression')
     implementation project(':Base')
     implementation project(':Util')
     implementation project(':engine-time')
+    implementation project(':engine-chunk')
     implementation project(':Configuration')
     implementation project(':DataStructures')
-    implementation depCommonsIo
+    implementation libs.commons.io
+    implementation libs.guava
 
-    compileOnly depAnnotations
-    Classpaths.inheritJUnitClassic(project, 'testImplementation')
+    compileOnly libs.jetbrains.annotations
+    testImplementation libs.junit4
 }
diff --git a/extensions/parquet/base/src/main/java/io/deephaven/parquet/base/BigDecimalParquetBytesCodec.java b/extensions/parquet/base/src/main/java/io/deephaven/parquet/base/BigDecimalParquetBytesCodec.java
index d158d9f3456..35dfdee57e2 100644
--- a/extensions/parquet/base/src/main/java/io/deephaven/parquet/base/BigDecimalParquetBytesCodec.java
+++ b/extensions/parquet/base/src/main/java/io/deephaven/parquet/base/BigDecimalParquetBytesCodec.java
@@ -3,8 +3,8 @@
 //
 package io.deephaven.parquet.base;
 
-import io.deephaven.datastructures.util.CollectionUtil;
 import io.deephaven.util.codec.ObjectCodec;
+import io.deephaven.util.type.ArrayTypeUtils;
 import org.apache.parquet.schema.PrimitiveType;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
@@ -94,7 +94,7 @@ public BigDecimalParquetBytesCodec(final int precision, final int scale, final i
                 nullBytes[i] = (byte) 0xff;
             }
         } else {
-            nullBytes = CollectionUtil.ZERO_LENGTH_BYTE_ARRAY;
+            nullBytes = ArrayTypeUtils.EMPTY_BYTE_ARRAY;
         }
     }
 
diff --git a/extensions/parquet/base/src/main/java/io/deephaven/parquet/base/BigIntegerParquetBytesCodec.java b/extensions/parquet/base/src/main/java/io/deephaven/parquet/base/BigIntegerParquetBytesCodec.java
index 0a11a7e1023..a1ab7eb5d5e 100644
--- a/extensions/parquet/base/src/main/java/io/deephaven/parquet/base/BigIntegerParquetBytesCodec.java
+++ b/extensions/parquet/base/src/main/java/io/deephaven/parquet/base/BigIntegerParquetBytesCodec.java
@@ -3,8 +3,8 @@
 //
 package io.deephaven.parquet.base;
 
-import io.deephaven.datastructures.util.CollectionUtil;
 import io.deephaven.util.codec.ObjectCodec;
+import io.deephaven.util.type.ArrayTypeUtils;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
@@ -30,7 +30,7 @@ public BigIntegerParquetBytesCodec(final int encodedSizeInBytes) {
                 nullBytes[i] = (byte) 0xff;
             }
         } else {
-            nullBytes = CollectionUtil.ZERO_LENGTH_BYTE_ARRAY;
+            nullBytes = ArrayTypeUtils.EMPTY_BYTE_ARRAY;
         }
     }
 
diff --git a/extensions/parquet/base/src/main/java/io/deephaven/parquet/base/ColumnChunkReader.java b/extensions/parquet/base/src/main/java/io/deephaven/parquet/base/ColumnChunkReader.java
index 00d67f43860..d3cc0657078 100644
--- a/extensions/parquet/base/src/main/java/io/deephaven/parquet/base/ColumnChunkReader.java
+++ b/extensions/parquet/base/src/main/java/io/deephaven/parquet/base/ColumnChunkReader.java
@@ -71,9 +71,10 @@ interface ColumnPageReaderIterator {
     }
 
     /**
+     * @param pageMaterializerFactory The factory to use for constructing page materializers.
      * @return An iterator over individual parquet pages.
      */
-    ColumnPageReaderIterator getPageIterator() throws IOException;
+    ColumnPageReaderIterator getPageIterator(PageMaterializerFactory pageMaterializerFactory) throws IOException;
 
     interface ColumnPageDirectAccessor {
         /**
@@ -86,9 +87,10 @@ interface ColumnPageDirectAccessor {
     }
 
     /**
+     * @param pageMaterializerFactory The factory to use for constructing page materializers.
      * @return An accessor for individual parquet pages which uses the provided offset index.
      */
-    ColumnPageDirectAccessor getPageAccessor(OffsetIndex offsetIndex);
+    ColumnPageDirectAccessor getPageAccessor(OffsetIndex offsetIndex, PageMaterializerFactory pageMaterializerFactory);
 
     /**
      * @return Whether this column chunk uses a dictionary-based encoding on every page.
diff --git a/extensions/parquet/base/src/main/java/io/deephaven/parquet/base/ColumnChunkReaderImpl.java b/extensions/parquet/base/src/main/java/io/deephaven/parquet/base/ColumnChunkReaderImpl.java
index 504b31c17c5..47126bc595a 100644
--- a/extensions/parquet/base/src/main/java/io/deephaven/parquet/base/ColumnChunkReaderImpl.java
+++ b/extensions/parquet/base/src/main/java/io/deephaven/parquet/base/ColumnChunkReaderImpl.java
@@ -10,7 +10,6 @@
 import io.deephaven.parquet.compress.DeephavenCompressorAdapterFactory;
 import io.deephaven.util.channel.SeekableChannelContext.ContextHolder;
 import io.deephaven.util.datastructures.SoftCachingFunction;
-import org.apache.commons.io.FilenameUtils;
 import org.apache.parquet.bytes.BytesInput;
 import org.apache.parquet.column.ColumnDescriptor;
 import org.apache.parquet.column.Dictionary;
@@ -28,13 +27,12 @@
 import java.io.UncheckedIOException;
 import java.net.URI;
 import java.nio.channels.SeekableByteChannel;
-import java.nio.file.Path;
 import java.util.List;
 import java.util.NoSuchElementException;
 import java.util.function.Function;
 
-import static io.deephaven.base.FileUtils.convertToURI;
-import static io.deephaven.parquet.base.ParquetFileReader.FILE_URI_SCHEME;
+import static io.deephaven.parquet.base.ParquetUtils.resolve;
+import static io.deephaven.parquet.base.ColumnPageReaderImpl.getDecompressorHolder;
 import static org.apache.parquet.format.Encoding.PLAIN_DICTIONARY;
 import static org.apache.parquet.format.Encoding.RLE_DICTIONARY;
 
@@ -48,7 +46,6 @@ final class ColumnChunkReaderImpl implements ColumnChunkReader {
     private final OffsetIndexReader offsetIndexReader;
     private final List<Type> fieldTypes;
     private final Function<SeekableChannelContext, Dictionary> dictionarySupplier;
-    private final PageMaterializerFactory pageMaterializerFactory;
     private final URI columnChunkURI;
     /**
      * Number of rows in the row group of this column chunk.
@@ -81,15 +78,12 @@ final class ColumnChunkReaderImpl implements ColumnChunkReader {
         }
         this.fieldTypes = fieldTypes;
         this.dictionarySupplier = new SoftCachingFunction<>(this::getDictionary);
-        this.pageMaterializerFactory = PageMaterializer.factoryForType(path.getPrimitiveType());
         this.numRows = numRows;
         this.version = version;
-        if (columnChunk.isSetFile_path() && FILE_URI_SCHEME.equals(rootURI.getScheme())) {
-            final String relativePath = FilenameUtils.separatorsToSystem(columnChunk.getFile_path());
-            this.columnChunkURI = convertToURI(Path.of(rootURI).resolve(relativePath), false);
+        if (columnChunk.isSetFile_path()) {
+            columnChunkURI = resolve(rootURI, columnChunk.getFile_path());
         } else {
-            // TODO(deephaven-core#5066): Add support for reading metadata files from non-file URIs
-            this.columnChunkURI = rootURI;
+            columnChunkURI = rootURI;
         }
         // Construct the reader object but don't read the offset index yet
         this.offsetIndexReader = (columnChunk.isSetOffset_index_offset())
@@ -130,16 +124,18 @@ public OffsetIndex getOffsetIndex(final SeekableChannelContext context) {
     }
 
     @Override
-    public ColumnPageReaderIterator getPageIterator() {
-        return new ColumnPageReaderIteratorImpl();
+    public ColumnPageReaderIterator getPageIterator(final PageMaterializerFactory pageMaterializerFactory) {
+        return new ColumnPageReaderIteratorImpl(pageMaterializerFactory);
     }
 
     @Override
-    public ColumnPageDirectAccessor getPageAccessor(final OffsetIndex offsetIndex) {
+    public ColumnPageDirectAccessor getPageAccessor(
+            final OffsetIndex offsetIndex,
+            final PageMaterializerFactory pageMaterializerFactory) {
         if (offsetIndex == null) {
             throw new UnsupportedOperationException("Cannot use direct accessor without offset index");
         }
-        return new ColumnPageDirectAccessorImpl(offsetIndex);
+        return new ColumnPageDirectAccessorImpl(offsetIndex, pageMaterializerFactory);
     }
 
     @Override
@@ -176,21 +172,14 @@ public Function<SeekableChannelContext, Dictionary> getDictionarySupplier() {
 
     @NotNull
     private Dictionary getDictionary(final SeekableChannelContext channelContext) {
-        final long dictionaryPageOffset;
         final ColumnMetaData chunkMeta = columnChunk.getMeta_data();
-        if (chunkMeta.isSetDictionary_page_offset()) {
-            dictionaryPageOffset = chunkMeta.getDictionary_page_offset();
-        } else if ((chunkMeta.isSetEncoding_stats() && (chunkMeta.getEncoding_stats().stream()
-                .anyMatch(pes -> pes.getEncoding() == PLAIN_DICTIONARY
-                        || pes.getEncoding() == RLE_DICTIONARY)))
-                || (chunkMeta.isSetEncodings() && (chunkMeta.getEncodings().stream()
-                        .anyMatch(en -> en == PLAIN_DICTIONARY || en == RLE_DICTIONARY)))) {
-            // Fallback, inspired by
-            // https://stackoverflow.com/questions/55225108/why-is-dictionary-page-offset-0-for-plain-dictionary-encoding
-            dictionaryPageOffset = chunkMeta.getData_page_offset();
-        } else {
-            return NULL_DICTIONARY;
-        }
+        // If the dictionary page offset is set, use it, otherwise inspect the first data page -- it might be the
+        // dictionary page. Fallback, inspired by
+        // https://stackoverflow.com/questions/55225108/why-is-dictionary-page-offset-0-for-plain-dictionary-encoding
+        final long dictionaryPageOffset = chunkMeta.isSetDictionary_page_offset()
+                ? chunkMeta.getDictionary_page_offset()
+                : chunkMeta.getData_page_offset();
+
         return readDictionary(dictionaryPageOffset, channelContext);
     }
 
@@ -230,8 +219,10 @@ private Dictionary readDictionary(long dictionaryPageOffset, SeekableChannelCont
                     // Sometimes the size is explicitly empty, just use an empty payload
                     payload = BytesInput.empty();
                 } else {
-                    payload = decompressor.decompress(in, compressedPageSize, pageHeader.getUncompressed_page_size(),
-                            holder.get());
+                    payload = BytesInput.from(
+                            decompressor.decompress(in, compressedPageSize, pageHeader.getUncompressed_page_size(),
+                                    getDecompressorHolder(holder.get())),
+                            pageHeader.getUncompressed_page_size());
                 }
                 final Encoding encoding = Encoding.valueOf(dictHeader.getEncoding().name());
                 final DictionaryPage dictionaryPage = new DictionaryPage(payload, dictHeader.getNum_values(), encoding);
@@ -247,10 +238,12 @@ private Dictionary readDictionary(long dictionaryPageOffset, SeekableChannelCont
     private final class ColumnPageReaderIteratorImpl implements ColumnPageReaderIterator {
         private long nextHeaderOffset;
         private long remainingValues;
+        PageMaterializerFactory pageMaterializerFactory;
 
-        ColumnPageReaderIteratorImpl() {
+        ColumnPageReaderIteratorImpl(final PageMaterializerFactory pageMaterializerFactory) {
             this.remainingValues = columnChunk.meta_data.getNum_values();
             this.nextHeaderOffset = columnChunk.meta_data.getData_page_offset();
+            this.pageMaterializerFactory = pageMaterializerFactory;
         }
 
         @Override
@@ -274,9 +267,7 @@ public ColumnPageReader next(@NotNull final SeekableChannelContext channelContex
                 final long dataOffset = ch.position();
                 nextHeaderOffset = dataOffset + pageHeader.getCompressed_page_size();
                 final PageType pageType = pageHeader.type;
-                if (pageType == PageType.DICTIONARY_PAGE && headerOffset == columnChunk.meta_data.getData_page_offset()
-                        && columnChunk.meta_data.getDictionary_page_offset() == 0) {
-                    // https://stackoverflow.com/questions/55225108/why-is-dictionary-page-offset-0-for-plain-dictionary-encoding
+                if (pageType == PageType.DICTIONARY_PAGE) {
                     // Skip the dictionary page and jump to the data page
                     return next(holder.get());
                 }
@@ -335,9 +326,12 @@ private static int getNumValues(PageHeader pageHeader) {
     private final class ColumnPageDirectAccessorImpl implements ColumnPageDirectAccessor {
 
         private final OffsetIndex offsetIndex;
+        private final PageMaterializerFactory pageMaterializerFactory;
 
-        ColumnPageDirectAccessorImpl(final OffsetIndex offsetIndex) {
+        ColumnPageDirectAccessorImpl(@NotNull final OffsetIndex offsetIndex,
+                @NotNull final PageMaterializerFactory pageMaterializerFactory) {
             this.offsetIndex = offsetIndex;
+            this.pageMaterializerFactory = pageMaterializerFactory;
         }
 
         @Override
diff --git a/extensions/parquet/base/src/main/java/io/deephaven/parquet/base/ColumnPageReaderImpl.java b/extensions/parquet/base/src/main/java/io/deephaven/parquet/base/ColumnPageReaderImpl.java
index 14c60369f01..d708397f5e6 100644
--- a/extensions/parquet/base/src/main/java/io/deephaven/parquet/base/ColumnPageReaderImpl.java
+++ b/extensions/parquet/base/src/main/java/io/deephaven/parquet/base/ColumnPageReaderImpl.java
@@ -4,20 +4,21 @@
 package io.deephaven.parquet.base;
 
 import io.deephaven.UncheckedDeephavenException;
+import io.deephaven.base.MathUtil;
 import io.deephaven.base.Pair;
 import io.deephaven.base.verify.Require;
+import io.deephaven.chunk.WritableByteChunk;
+import io.deephaven.chunk.sized.SizedByteChunk;
 import io.deephaven.parquet.base.materializers.IntMaterializer;
 import io.deephaven.parquet.compress.CompressorAdapter;
+import io.deephaven.util.SafeCloseable;
 import io.deephaven.util.channel.SeekableChannelContext;
 import io.deephaven.util.channel.SeekableChannelsProvider;
 import io.deephaven.util.channel.SeekableChannelContext.ContextHolder;
 import org.apache.parquet.bytes.ByteBufferInputStream;
-import org.apache.parquet.bytes.BytesInput;
 import org.apache.parquet.column.ColumnDescriptor;
 import org.apache.parquet.column.Dictionary;
 import org.apache.parquet.column.Encoding;
-import org.apache.parquet.column.page.DataPageV1;
-import org.apache.parquet.column.page.DataPageV2;
 import org.apache.parquet.column.values.ValuesReader;
 import org.apache.parquet.column.values.dictionary.DictionaryValuesReader;
 import org.apache.parquet.format.DataPageHeader;
@@ -40,10 +41,15 @@
 import java.util.List;
 import java.util.function.Function;
 
+import static io.deephaven.parquet.compress.CompressorAdapter.readNBytes;
 import static org.apache.parquet.column.ValuesType.VALUES;
 
 final class ColumnPageReaderImpl implements ColumnPageReader {
     private static final int NULL_OFFSET = -1;
+    private static final String REPETITION_LEVELS_BUFFER_KEY = "PARQUET_REPETITION_LEVELS_BUFFER";
+    private static final String DEFINITION_LEVELS_BUFFER_KEY = "PARQUET_DEFINITION_LEVELS_BUFFER";
+    private static final String PAGE_BUFFER_KEY = "PARQUET_PAGE_BUFFER";
+    private static final String DECOMPRESSOR_HOLDER_KEY = "DECOMPRESSOR_HOLDER";
 
     private final String columnName;
     private final SeekableChannelsProvider channelsProvider;
@@ -140,7 +146,7 @@ public IntBuffer readKeyValues(
     /**
      * Callers must ensure resulting data page does not outlive the input stream.
      */
-    private DataPageV1 readV1Unsafe(
+    private InputStream readV1Unsafe(
             final InputStream in,
             @NotNull final SeekableChannelContext channelContext) throws IOException {
         if (pageHeader.type != PageType.DATA_PAGE) {
@@ -149,23 +155,40 @@ private DataPageV1 readV1Unsafe(
         }
         final int uncompressedPageSize = pageHeader.getUncompressed_page_size();
         final int compressedPageSize = pageHeader.getCompressed_page_size();
-        final BytesInput decompressedInput =
-                compressorAdapter.decompress(in, compressedPageSize, uncompressedPageSize, channelContext);
-        final DataPageHeader header = pageHeader.getData_page_header();
-        return new DataPageV1(
-                decompressedInput,
-                header.getNum_values(),
-                uncompressedPageSize,
-                null, // TODO in the future might want to pull in statistics
-                getEncoding(header.getRepetition_level_encoding()),
-                getEncoding(header.getDefinition_level_encoding()),
-                getEncoding(header.getEncoding()));
+        return compressorAdapter.decompress(in, compressedPageSize, uncompressedPageSize,
+                getDecompressorHolder(channelContext));
+    }
+
+    static CompressorAdapter.ResourceCache getDecompressorHolder(@NotNull SeekableChannelContext channelContext) {
+        // dhs = Decompressor Holder Supplier
+        return dhs -> channelContext.getCachedResource(DECOMPRESSOR_HOLDER_KEY, dhs);
+    }
+
+    /**
+     * Helper struct for holding the fields of a DATA_PAGE_V2 page while reading it.
+     */
+    private static class DataPageV2Partial {
+        final ByteBuffer repetitionLevels;
+        final ByteBuffer definitionLevels;
+        final InputStream decompressedStream;
+        final int uncompressedSize;
+
+        DataPageV2Partial(
+                final ByteBuffer repetitionLevels,
+                final ByteBuffer definitionLevels,
+                final InputStream decompressedStream,
+                final int uncompressedSize) {
+            this.repetitionLevels = repetitionLevels;
+            this.definitionLevels = definitionLevels;
+            this.decompressedStream = decompressedStream;
+            this.uncompressedSize = uncompressedSize;
+        }
     }
 
     /**
      * Callers must ensure resulting data page does not outlive the input stream.
      */
-    private DataPageV2 readV2Unsafe(
+    private DataPageV2Partial readV2Unsafe(
             final InputStream in,
             @NotNull final SeekableChannelContext channelContext) throws IOException {
         if (pageHeader.type != PageType.DATA_PAGE_V2) {
@@ -181,25 +204,20 @@ private DataPageV2 readV2Unsafe(
                 - header.getDefinition_levels_byte_length();
         // With our current single input stream `in` construction, we must copy out the bytes for repetition and
         // definition levels to proceed to data. We could theoretically restructure this to be fully lazy, either by
-        // creating a BytesInput impl for SeekableByteChannel, or by migrating this logic one layer up and ensuring we
+        // creating a ByteBuffer impl for SeekableByteChannel, or by migrating this logic one layer up and ensuring we
         // construct input streams separately for repetitionLevelsIn, definitionLevelsIn, and dataIn. Both of these
         // solutions would potentially suffer from a disconnect in cache-ability that a single input stream provides.
-        final BytesInput repetitionLevels =
-                BytesInput.copy(BytesInput.from(in, header.getRepetition_levels_byte_length()));
-        final BytesInput definitionLevels =
-                BytesInput.copy(BytesInput.from(in, header.getDefinition_levels_byte_length()));
-        final BytesInput data = compressorAdapter.decompress(in, compressedSize, uncompressedSize, channelContext);
-        return new DataPageV2(
-                header.getNum_rows(),
-                header.getNum_nulls(),
-                header.getNum_values(),
-                repetitionLevels,
-                definitionLevels,
-                getEncoding(header.getEncoding()),
-                data,
-                uncompressedPageSize,
-                null, // TODO in the future might want to pull in statistics,
-                false);
+        final int repetitionLevelsLength = header.getRepetition_levels_byte_length();
+        final ByteBuffer repetitionLevels =
+                getCachedBuffer(channelContext, REPETITION_LEVELS_BUFFER_KEY, repetitionLevelsLength);
+        readNBytes(in, repetitionLevels.array(), repetitionLevels.arrayOffset(), repetitionLevelsLength);
+        final int definitionLevelsLength = header.getDefinition_levels_byte_length();
+        final ByteBuffer definitionLevels =
+                getCachedBuffer(channelContext, DEFINITION_LEVELS_BUFFER_KEY, definitionLevelsLength);
+        readNBytes(in, definitionLevels.array(), definitionLevels.arrayOffset(), definitionLevelsLength);
+        final InputStream decompressed = compressorAdapter.decompress(in, compressedSize, uncompressedSize,
+                getDecompressorHolder(channelContext));
+        return new DataPageV2Partial(repetitionLevels, definitionLevels, decompressed, uncompressedSize);
     }
 
     private int readRowCountFromDataPage(
@@ -208,7 +226,7 @@ private int readRowCountFromDataPage(
         switch (pageHeader.type) {
             case DATA_PAGE:
                 try (final InputStream in = channelsProvider.getInputStream(ch, pageHeader.getCompressed_page_size())) {
-                    return readRowCountFromPageV1(readV1Unsafe(in, channelContext));
+                    return readRowCountFromPageV1(readV1Unsafe(in, channelContext), channelContext);
                 }
             case DATA_PAGE_V2:
                 final DataPageHeaderV2 dataHeaderV2 = pageHeader.getData_page_header_v2();
@@ -264,16 +282,72 @@ private static Encoding getEncoding(final org.apache.parquet.format.Encoding enc
         return org.apache.parquet.column.Encoding.valueOf(encoding.name());
     }
 
-    private int readRowCountFromPageV1(final DataPageV1 page) {
+    /**
+     * Helper struct for holding a ByteBuffer backed by a {@link SizedByteChunk}.
+     */
+    private static class SizedByteBuffer implements SafeCloseable {
+        private SizedByteChunk<?> chunk;
+        private ByteBuffer buffer;
+
+        SizedByteBuffer() {}
+
+        /**
+         * Ensure the underlying chunk has a capacity of at least {@code capacity}.
+         */
+        @NotNull
+        private ByteBuffer ensureCapacity(final int capacity) {
+            if (buffer != null && buffer.capacity() >= capacity) {
+                return buffer;
+            }
+            final int roundedCapacity = MathUtil.roundUpArraySize(capacity);
+            if (chunk == null) {
+                chunk = new SizedByteChunk<>(roundedCapacity);
+            } else {
+                chunk.ensureCapacity(roundedCapacity);
+            }
+            final WritableByteChunk<?> currentChunk = chunk.get();
+            // noinspection DataFlowIssue
+            buffer = ByteBuffer.wrap(currentChunk.array(), currentChunk.arrayOffset(), roundedCapacity);
+            return buffer;
+        }
+
+        @Override
+        public void close() {
+            chunk.close();
+        }
+    }
+
+    /**
+     * Get a cached array-backed ByteBuffer from the channel context for the provided key, or create a new one if it
+     * doesn't exist or is too small.
+     */
+    private static ByteBuffer getCachedBuffer(@NotNull final SeekableChannelContext channelContext, final String key,
+            final int size) {
+        final SizedByteBuffer sizedByteBuffer = channelContext.getCachedResource(key, SizedByteBuffer::new);
+        // Not checking for null here because we know the above factory will create a new instance if it doesn't exist
+        // noinspection DataFlowIssue
+        return sizedByteBuffer.ensureCapacity(size).limit(size).position(0);
+    }
+
+    private int readRowCountFromPageV1(
+            final InputStream decompressedInput,
+            @NotNull final SeekableChannelContext channelContext) {
         try {
             if (path.getMaxRepetitionLevel() != 0) {
-                // TODO - move away from page and use ByteBuffers directly
-                final ByteBuffer bytes = page.getBytes().toByteBuffer();
-                bytes.order(ByteOrder.LITTLE_ENDIAN);
-                final int length = bytes.getInt();
-                return readRepetitionLevels(bytes.slice().limit(length));
+                final int length;
+                {
+                    // Use the page buffer to read the length of page data
+                    final ByteBuffer lengthBuffer = getCachedBuffer(channelContext, PAGE_BUFFER_KEY, Integer.BYTES)
+                            .order(ByteOrder.LITTLE_ENDIAN);
+                    readNBytes(decompressedInput, lengthBuffer.array(), lengthBuffer.arrayOffset(), Integer.BYTES);
+                    length = lengthBuffer.getInt();
+                }
+                final ByteBuffer pageBytes = getCachedBuffer(channelContext, PAGE_BUFFER_KEY, length)
+                        .order(ByteOrder.LITTLE_ENDIAN);
+                readNBytes(decompressedInput, pageBytes.array(), pageBytes.arrayOffset(), length);
+                return readRepetitionLevels(pageBytes);
             } else {
-                return page.getValueCount();
+                return pageHeader.getData_page_header().getNum_values();
             }
         } catch (final IOException e) {
             throw new ParquetDecodingException("Failed to read row count from Parquet V1 page for column: " +
@@ -319,22 +393,25 @@ private RunLengthBitPackingHybridBufferDecoder getDlDecoderPageV1(final ByteBuff
 
     @Nullable
     private IntBuffer readKeysFromPageV1(
-            final DataPageV1 page,
+            final InputStream decompressedInput,
             final IntBuffer keyDest,
             final int nullPlaceholder,
             @NotNull final SeekableChannelContext channelContext) {
+        final DataPageHeader header = pageHeader.getData_page_header();
+        final int uncompressedSize = pageHeader.getUncompressed_page_size();
+        final ByteBuffer bytes = getCachedBuffer(channelContext, PAGE_BUFFER_KEY, uncompressedSize)
+                .order(ByteOrder.LITTLE_ENDIAN);
         try {
-            // TODO - move away from page and use ByteBuffers directly
-            final ByteBuffer bytes = page.getBytes().toByteBuffer();
-            bytes.order(ByteOrder.LITTLE_ENDIAN);
+            readNBytes(decompressedInput, bytes.array(), bytes.arrayOffset(), uncompressedSize);
             final RunLengthBitPackingHybridBufferDecoder rlDecoder = getRlDecoderPageV1(bytes);
             final RunLengthBitPackingHybridBufferDecoder dlDecoder = getDlDecoderPageV1(bytes);
             final ValuesReader dataReader =
-                    new KeyIndexReader((DictionaryValuesReader) getDataReader(page.getValueEncoding(),
-                            bytes, page.getValueCount(), channelContext));
+                    new KeyIndexReader((DictionaryValuesReader) getDataReader(getEncoding(header.getEncoding()),
+                            bytes, header.getNum_values(), channelContext));
             return readKeysFromPageCommon(keyDest, nullPlaceholder, rlDecoder, dlDecoder, dataReader);
         } catch (final IOException e) {
-            throw new ParquetDecodingException("could not read page " + page + " in col " + path, e);
+            throw new ParquetDecodingException("Failed to read keys from parquet V1 page for column: " + columnName +
+                    ", uri: " + uri, e);
         }
     }
 
@@ -345,7 +422,7 @@ private IntBuffer readKeysFromPageCommon(
             final RunLengthBitPackingHybridBufferDecoder rlDecoder,
             final RunLengthBitPackingHybridBufferDecoder dlDecoder,
             final ValuesReader dataReader) throws IOException {
-        final Object result = materialize(IntMaterializer.Factory, dlDecoder, rlDecoder, dataReader, nullPlaceholder);
+        final Object result = materialize(IntMaterializer.FACTORY, dlDecoder, rlDecoder, dataReader, nullPlaceholder);
         if (result instanceof DataWithOffsets) {
             keyDest.put((int[]) ((DataWithOffsets) result).materializeResult);
             return ((DataWithOffsets) result).offsets;
@@ -375,17 +452,19 @@ private int readRepetitionLevels(final ByteBuffer byteBuffer) throws IOException
     }
 
     private Object readPageV1(
-            final DataPageV1 page,
+            final InputStream decompressedInput,
             final Object nullValue,
             @NotNull final SeekableChannelContext channelContext) {
+        final DataPageHeader header = pageHeader.getData_page_header();
+        final int uncompressedSize = pageHeader.getUncompressed_page_size();
+        final ByteBuffer bytes = getCachedBuffer(channelContext, PAGE_BUFFER_KEY, uncompressedSize)
+                .order(ByteOrder.LITTLE_ENDIAN);
         try {
-            // TODO - move away from page and use ByteBuffers directly
-            final ByteBuffer bytes = page.getBytes().toByteBuffer();
-            bytes.order(ByteOrder.LITTLE_ENDIAN);
+            readNBytes(decompressedInput, bytes.array(), bytes.arrayOffset(), uncompressedSize);
             final RunLengthBitPackingHybridBufferDecoder rlDecoder = getRlDecoderPageV1(bytes);
             final RunLengthBitPackingHybridBufferDecoder dlDecoder = getDlDecoderPageV1(bytes);
             final ValuesReader dataReader =
-                    getDataReader(page.getValueEncoding(), bytes, page.getValueCount(), channelContext);
+                    getDataReader(getEncoding(header.getEncoding()), bytes, header.getNum_values(), channelContext);
             return materialize(pageMaterializerFactory, dlDecoder, rlDecoder, dataReader, nullValue);
         } catch (final IOException e) {
             throw new ParquetDecodingException("Failed to read parquet V1 page for column: " + columnName +
@@ -407,46 +486,55 @@ private Object materialize(
     }
 
     @Nullable
-    private RunLengthBitPackingHybridBufferDecoder getRlDecoderPageV2(final DataPageV2 page) throws IOException {
+    private RunLengthBitPackingHybridBufferDecoder getRlDecoderPageV2(final DataPageV2Partial page) throws IOException {
         if (path.getMaxRepetitionLevel() != 0) {
-            return new RunLengthBitPackingHybridBufferDecoder(path.getMaxRepetitionLevel(),
-                    page.getRepetitionLevels().toByteBuffer());
+            return new RunLengthBitPackingHybridBufferDecoder(path.getMaxRepetitionLevel(), page.repetitionLevels);
         }
         return null;
     }
 
     @Nullable
-    private RunLengthBitPackingHybridBufferDecoder getDlDecoderPageV2(final DataPageV2 page) throws IOException {
+    private RunLengthBitPackingHybridBufferDecoder getDlDecoderPageV2(final DataPageV2Partial page) throws IOException {
         if (path.getMaxDefinitionLevel() > 0) {
-            return new RunLengthBitPackingHybridBufferDecoder(path.getMaxDefinitionLevel(),
-                    page.getDefinitionLevels().toByteBuffer());
+            return new RunLengthBitPackingHybridBufferDecoder(path.getMaxDefinitionLevel(), page.definitionLevels);
         }
         return null;
     }
 
     @Nullable
     private IntBuffer readKeysFromPageV2(
-            final DataPageV2 page,
+            final DataPageV2Partial page,
             final IntBuffer keyDest,
             final int nullPlaceholder,
-            @NotNull final SeekableChannelContext channelContext) throws IOException {
-        final RunLengthBitPackingHybridBufferDecoder rlDecoder = getRlDecoderPageV2(page);
-        final RunLengthBitPackingHybridBufferDecoder dlDecoder = getDlDecoderPageV2(page);
-        final ValuesReader dataReader =
-                new KeyIndexReader((DictionaryValuesReader) getDataReader(page.getDataEncoding(),
-                        page.getData().toByteBuffer(), page.getValueCount(), channelContext));
-        return readKeysFromPageCommon(keyDest, nullPlaceholder, rlDecoder, dlDecoder, dataReader);
+            @NotNull final SeekableChannelContext channelContext) {
+        final DataPageHeaderV2 header = pageHeader.getData_page_header_v2();
+        try {
+            final RunLengthBitPackingHybridBufferDecoder rlDecoder = getRlDecoderPageV2(page);
+            final RunLengthBitPackingHybridBufferDecoder dlDecoder = getDlDecoderPageV2(page);
+            final ByteBuffer bytes = getCachedBuffer(channelContext, PAGE_BUFFER_KEY, page.uncompressedSize);
+            readNBytes(page.decompressedStream, bytes.array(), bytes.arrayOffset(), page.uncompressedSize);
+            final ValuesReader dataReader =
+                    new KeyIndexReader((DictionaryValuesReader) getDataReader(getEncoding(header.getEncoding()),
+                            bytes, header.getNum_values(), channelContext));
+            return readKeysFromPageCommon(keyDest, nullPlaceholder, rlDecoder, dlDecoder, dataReader);
+        } catch (final IOException e) {
+            throw new ParquetDecodingException("Failed to read keys from parquet V2 page for column: " + columnName +
+                    ", uri: " + uri, e);
+        }
     }
 
     private Object readPageV2(
-            final DataPageV2 page,
+            final DataPageV2Partial page,
             final Object nullValue,
             @NotNull final SeekableChannelContext channelContext) {
+        final DataPageHeaderV2 header = pageHeader.getData_page_header_v2();
         try {
             final RunLengthBitPackingHybridBufferDecoder rlDecoder = getRlDecoderPageV2(page);
             final RunLengthBitPackingHybridBufferDecoder dlDecoder = getDlDecoderPageV2(page);
-            final ValuesReader dataReader = getDataReader(page.getDataEncoding(),
-                    page.getData().toByteBuffer(), page.getValueCount(), channelContext);
+            final ByteBuffer bytes = getCachedBuffer(channelContext, PAGE_BUFFER_KEY, page.uncompressedSize);
+            readNBytes(page.decompressedStream, bytes.array(), bytes.arrayOffset(), page.uncompressedSize);
+            final ValuesReader dataReader = getDataReader(getEncoding(header.getEncoding()),
+                    bytes, header.getNum_values(), channelContext);
             return materialize(pageMaterializerFactory, dlDecoder, rlDecoder, dataReader, nullValue);
         } catch (final IOException e) {
             throw new ParquetDecodingException("Failed to read parquet V2 page for column: " + columnName +
diff --git a/extensions/parquet/base/src/main/java/io/deephaven/parquet/base/ColumnWriterImpl.java b/extensions/parquet/base/src/main/java/io/deephaven/parquet/base/ColumnWriterImpl.java
index 7072ab0120f..53e8f47103c 100644
--- a/extensions/parquet/base/src/main/java/io/deephaven/parquet/base/ColumnWriterImpl.java
+++ b/extensions/parquet/base/src/main/java/io/deephaven/parquet/base/ColumnWriterImpl.java
@@ -3,6 +3,7 @@
 //
 package io.deephaven.parquet.base;
 
+import com.google.common.io.CountingOutputStream;
 import org.apache.parquet.format.converter.ParquetMetadataConverter;
 import io.deephaven.parquet.compress.CompressorAdapter;
 import io.deephaven.util.QueryConstants;
@@ -30,7 +31,7 @@
 import java.nio.IntBuffer;
 import java.nio.channels.Channels;
 import java.nio.channels.WritableByteChannel;
-import java.util.HashSet;
+import java.util.EnumSet;
 import java.util.Set;
 
 import static org.apache.parquet.bytes.BytesUtils.getWidthFromMaxInt;
@@ -40,7 +41,7 @@ final class ColumnWriterImpl implements ColumnWriter {
 
     private static final int MIN_SLAB_SIZE = 64;
 
-    private final PositionedBufferedOutputStream bufferedOutput;
+    private final CountingOutputStream countingOutput;
     private final ColumnDescriptor column;
     private final RowGroupWriterImpl owner;
     private final CompressorAdapter compressorAdapter;
@@ -56,7 +57,9 @@ final class ColumnWriterImpl implements ColumnWriter {
     private final RunLengthBitPackingHybridEncoder dlEncoder;
     private final RunLengthBitPackingHybridEncoder rlEncoder;
     private long dictionaryOffset = -1;
-    private final Set<Encoding> encodings = new HashSet<>();
+    // The downstream writing code (ParquetFileWriter) seems to respect the traversal order of this set. As such, to
+    // improve determinism, we are using an EnumSet.
+    private final Set<Encoding> encodings = EnumSet.noneOf(Encoding.class);
     private long firstDataPageOffset = -1;
     private long uncompressedLength;
     private long compressedLength;
@@ -68,12 +71,12 @@ final class ColumnWriterImpl implements ColumnWriter {
 
     ColumnWriterImpl(
             final RowGroupWriterImpl owner,
-            final PositionedBufferedOutputStream bufferedOutput,
+            final CountingOutputStream countingOutput,
             final ColumnDescriptor column,
             final CompressorAdapter compressorAdapter,
             final int targetPageSize,
             final ByteBufferAllocator allocator) {
-        this.bufferedOutput = bufferedOutput;
+        this.countingOutput = countingOutput;
         this.column = column;
         this.compressorAdapter = compressorAdapter;
         this.targetPageSize = targetPageSize;
@@ -132,7 +135,7 @@ public void addDictionaryPage(@NotNull final Object dictionaryValues, final int
 
         // noinspection unchecked
         dictionaryWriter.writeBulk(dictionaryValues, valuesCount, NullStatistics.INSTANCE);
-        dictionaryOffset = bufferedOutput.position();
+        dictionaryOffset = countingOutput.getCount();
         writeDictionaryPage(dictionaryWriter.getByteBufferView(), valuesCount);
         pageCount++;
         hasDictionary = true;
@@ -140,7 +143,7 @@ public void addDictionaryPage(@NotNull final Object dictionaryValues, final int
     }
 
     private void writeDictionaryPage(final ByteBuffer dictionaryBuffer, final int valuesCount) throws IOException {
-        final long currentChunkDictionaryPageOffset = bufferedOutput.position();
+        final long currentChunkDictionaryPageOffset = countingOutput.getCount();
         final int uncompressedSize = dictionaryBuffer.remaining();
 
         final ByteArrayOutputStream baos = new ByteArrayOutputStream();
@@ -157,11 +160,11 @@ private void writeDictionaryPage(final ByteBuffer dictionaryBuffer, final int va
                 compressedPageSize,
                 valuesCount,
                 Encoding.PLAIN,
-                bufferedOutput);
-        final long headerSize = bufferedOutput.position() - currentChunkDictionaryPageOffset;
+                countingOutput);
+        final long headerSize = countingOutput.getCount() - currentChunkDictionaryPageOffset;
         this.uncompressedLength += uncompressedSize + headerSize;
         this.compressedLength += compressedPageSize + headerSize;
-        compressedBytes.writeAllTo(bufferedOutput);
+        compressedBytes.writeAllTo(countingOutput);
         encodings.add(Encoding.PLAIN);
     }
 
@@ -294,7 +297,7 @@ public void writePageV2(
         final BytesInput compressedData = BytesInput.from(baos);
         final int compressedSize = (int) (compressedData.size() + repetitionLevels.size() + definitionLevels.size());
 
-        final long initialOffset = bufferedOutput.position();
+        final long initialOffset = countingOutput.getCount();
         if (firstDataPageOffset == -1) {
             firstDataPageOffset = initialOffset;
         }
@@ -303,20 +306,20 @@ public void writePageV2(
                 valueCount, nullCount, rowCount,
                 rlByteLength,
                 dlByteLength,
-                bufferedOutput);
-        final long headerSize = bufferedOutput.position() - initialOffset;
+                countingOutput);
+        final long headerSize = countingOutput.getCount() - initialOffset;
         this.uncompressedLength += (uncompressedSize + headerSize);
         this.compressedLength += (compressedSize + headerSize);
         this.totalValueCount += valueCount;
         this.pageCount += 1;
 
-        definitionLevels.writeAllTo(bufferedOutput);
-        compressedData.writeAllTo(bufferedOutput);
+        definitionLevels.writeAllTo(countingOutput);
+        compressedData.writeAllTo(countingOutput);
     }
 
     private void writePage(final BytesInput bytes, final int valueCount, final long rowCount,
             final Encoding valuesEncoding) throws IOException {
-        final long initialOffset = bufferedOutput.position();
+        final long initialOffset = countingOutput.getCount();
         if (firstDataPageOffset == -1) {
             firstDataPageOffset = initialOffset;
         }
@@ -346,15 +349,15 @@ private void writePage(final BytesInput bytes, final int valueCount, final long
                 (int) compressedSize,
                 valueCount,
                 valuesEncoding,
-                bufferedOutput);
-        final long headerSize = bufferedOutput.position() - initialOffset;
+                countingOutput);
+        final long headerSize = countingOutput.getCount() - initialOffset;
         this.uncompressedLength += (uncompressedSize + headerSize);
         this.compressedLength += (compressedSize + headerSize);
         this.totalValueCount += valueCount;
         this.pageCount += 1;
 
-        compressedBytes.writeAllTo(bufferedOutput);
-        offsetIndexBuilder.add((int) (bufferedOutput.position() - initialOffset), rowCount);
+        compressedBytes.writeAllTo(countingOutput);
+        offsetIndexBuilder.add((int) (countingOutput.getCount() - initialOffset), rowCount);
         encodings.add(valuesEncoding);
         encodingStatsBuilder.addDataEncoding(valuesEncoding);
     }
diff --git a/extensions/parquet/base/src/main/java/io/deephaven/parquet/base/NullParquetMetadataFileWriter.java b/extensions/parquet/base/src/main/java/io/deephaven/parquet/base/NullParquetMetadataFileWriter.java
index bb9be1350e6..e0878476b09 100644
--- a/extensions/parquet/base/src/main/java/io/deephaven/parquet/base/NullParquetMetadataFileWriter.java
+++ b/extensions/parquet/base/src/main/java/io/deephaven/parquet/base/NullParquetMetadataFileWriter.java
@@ -3,8 +3,11 @@
 //
 package io.deephaven.parquet.base;
 
+import io.deephaven.util.channel.CompletableOutputStream;
 import org.apache.parquet.hadoop.metadata.ParquetMetadata;
 
+import java.net.URI;
+
 /**
  * A no-op implementation of MetadataFileWriterBase when we don't want to write metadata files for Parquet files.
  */
@@ -13,11 +16,10 @@ public enum NullParquetMetadataFileWriter implements ParquetMetadataFileWriter {
     INSTANCE;
 
     @Override
-    public void addParquetFileMetadata(final String parquetFilePath, final ParquetMetadata metadata) {}
-
-    @Override
-    public void writeMetadataFiles(final String metadataFilePath, final String commonMetadataFilePath) {}
+    public void addParquetFileMetadata(final URI parquetFileURI, final ParquetMetadata metadata) {}
 
     @Override
-    public void clear() {}
+    public void writeMetadataFiles(
+            final CompletableOutputStream metadataOutputStream,
+            final CompletableOutputStream commonMetadataOutputStream) {}
 }
diff --git a/extensions/parquet/base/src/main/java/io/deephaven/parquet/base/PageMaterializer.java b/extensions/parquet/base/src/main/java/io/deephaven/parquet/base/PageMaterializer.java
index 8aca259445b..8b5039cd7b3 100644
--- a/extensions/parquet/base/src/main/java/io/deephaven/parquet/base/PageMaterializer.java
+++ b/extensions/parquet/base/src/main/java/io/deephaven/parquet/base/PageMaterializer.java
@@ -3,148 +3,8 @@
 //
 package io.deephaven.parquet.base;
 
-import io.deephaven.parquet.base.materializers.*;
-import org.apache.parquet.schema.LogicalTypeAnnotation;
-import org.apache.parquet.schema.PrimitiveType;
-import org.jetbrains.annotations.NotNull;
-
-import java.math.BigDecimal;
-import java.math.BigInteger;
-
-import static org.apache.parquet.schema.PrimitiveType.PrimitiveTypeName.BINARY;
-
 public interface PageMaterializer {
 
-    /**
-     * Get the internal type used by Deephaven to represent a Parquet
-     * {@link LogicalTypeAnnotation.DecimalLogicalTypeAnnotation Decimal} logical type
-     */
-    static Class<?> resolveDecimalLogicalType(
-            final LogicalTypeAnnotation.DecimalLogicalTypeAnnotation decimalLogicalType) {
-        // This pair of values (precision=1, scale=0) is set at write time as a marker so that we can recover
-        // the fact that the type is a BigInteger, not a BigDecimal when the fies are read.
-        if (decimalLogicalType.getPrecision() == 1 && decimalLogicalType.getScale() == 0) {
-            return BigInteger.class;
-        }
-        return BigDecimal.class;
-    }
-
-    static PageMaterializerFactory factoryForType(@NotNull final PrimitiveType primitiveType) {
-        final PrimitiveType.PrimitiveTypeName primitiveTypeName = primitiveType.getPrimitiveTypeName();
-        final LogicalTypeAnnotation logicalTypeAnnotation = primitiveType.getLogicalTypeAnnotation();
-        switch (primitiveTypeName) {
-            case INT32:
-                if (logicalTypeAnnotation instanceof LogicalTypeAnnotation.IntLogicalTypeAnnotation) {
-                    final LogicalTypeAnnotation.IntLogicalTypeAnnotation intLogicalType =
-                            (LogicalTypeAnnotation.IntLogicalTypeAnnotation) logicalTypeAnnotation;
-                    if (intLogicalType.isSigned()) {
-                        switch (intLogicalType.getBitWidth()) {
-                            case 8:
-                                return ByteMaterializer.Factory;
-                            case 16:
-                                return ShortMaterializer.Factory;
-                            case 32:
-                                return IntMaterializer.Factory;
-                        }
-                    } else {
-                        switch (intLogicalType.getBitWidth()) {
-                            case 8:
-                            case 16:
-                                return CharMaterializer.Factory;
-                            case 32:
-                                return LongFromUnsignedIntMaterializer.Factory;
-                        }
-                    }
-                } else if (logicalTypeAnnotation instanceof LogicalTypeAnnotation.DateLogicalTypeAnnotation) {
-                    return LocalDateMaterializer.Factory;
-                } else if (logicalTypeAnnotation instanceof LogicalTypeAnnotation.TimeLogicalTypeAnnotation) {
-                    final LogicalTypeAnnotation.TimeLogicalTypeAnnotation timeLogicalType =
-                            (LogicalTypeAnnotation.TimeLogicalTypeAnnotation) logicalTypeAnnotation;
-                    if (timeLogicalType.getUnit() != LogicalTypeAnnotation.TimeUnit.MILLIS) {
-                        throw new IllegalArgumentException(
-                                "Expected unit type to be MILLIS, found " + timeLogicalType.getUnit());
-                    }
-                    // isAdjustedToUTC parameter is ignored while reading LocalTime from Parquet files
-                    return LocalTimeFromMillisMaterializer.Factory;
-                } else if (logicalTypeAnnotation instanceof LogicalTypeAnnotation.DecimalLogicalTypeAnnotation) {
-                    final LogicalTypeAnnotation.DecimalLogicalTypeAnnotation decimalLogicalType =
-                            (LogicalTypeAnnotation.DecimalLogicalTypeAnnotation) logicalTypeAnnotation;
-                    return new BigDecimalFromIntMaterializer.Factory(decimalLogicalType.getScale());
-                }
-                return IntMaterializer.Factory;
-            case INT64:
-                if (logicalTypeAnnotation instanceof LogicalTypeAnnotation.TimestampLogicalTypeAnnotation) {
-                    final LogicalTypeAnnotation.TimestampLogicalTypeAnnotation timestampLogicalType =
-                            (LogicalTypeAnnotation.TimestampLogicalTypeAnnotation) logicalTypeAnnotation;
-                    if (timestampLogicalType.isAdjustedToUTC()) {
-                        // The column will store nanoseconds elapsed since epoch as long values
-                        switch (timestampLogicalType.getUnit()) {
-                            case MILLIS:
-                                return InstantNanosFromMillisMaterializer.Factory;
-                            case MICROS:
-                                return InstantNanosFromMicrosMaterializer.Factory;
-                            case NANOS:
-                                return LongMaterializer.Factory;
-                        }
-                    } else {
-                        // The column will be stored as LocalDateTime values
-                        // Ref:https://github.com/apache/parquet-format/blob/master/LogicalTypes.md#local-semantics-timestamps-not-normalized-to-utc
-                        switch (timestampLogicalType.getUnit()) {
-                            case MILLIS:
-                                return LocalDateTimeFromMillisMaterializer.Factory;
-                            case MICROS:
-                                return LocalDateTimeFromMicrosMaterializer.Factory;
-                            case NANOS:
-                                return LocalDateTimeFromNanosMaterializer.Factory;
-                        }
-                    }
-                } else if (logicalTypeAnnotation instanceof LogicalTypeAnnotation.TimeLogicalTypeAnnotation) {
-                    final LogicalTypeAnnotation.TimeLogicalTypeAnnotation timeLogicalType =
-                            (LogicalTypeAnnotation.TimeLogicalTypeAnnotation) logicalTypeAnnotation;
-                    // isAdjustedToUTC parameter is ignored while reading LocalTime from Parquet files
-                    switch (timeLogicalType.getUnit()) {
-                        case MICROS:
-                            return LocalTimeFromMicrosMaterializer.Factory;
-                        case NANOS:
-                            return LocalTimeFromNanosMaterializer.Factory;
-                        default:
-                            throw new IllegalArgumentException("Unsupported unit=" + timeLogicalType.getUnit());
-                    }
-                } else if (logicalTypeAnnotation instanceof LogicalTypeAnnotation.DecimalLogicalTypeAnnotation) {
-                    final LogicalTypeAnnotation.DecimalLogicalTypeAnnotation decimalLogicalType =
-                            (LogicalTypeAnnotation.DecimalLogicalTypeAnnotation) logicalTypeAnnotation;
-                    return new BigDecimalFromLongMaterializer.Factory(decimalLogicalType.getScale());
-                }
-                return LongMaterializer.Factory;
-            case INT96:
-                return InstantFromInt96Materializer.Factory;
-            case FLOAT:
-                return FloatMaterializer.Factory;
-            case DOUBLE:
-                return DoubleMaterializer.Factory;
-            case BOOLEAN:
-                return BoolMaterializer.Factory;
-            case BINARY:
-                if (logicalTypeAnnotation instanceof LogicalTypeAnnotation.StringLogicalTypeAnnotation) {
-                    return StringMaterializer.Factory;
-                }
-            case FIXED_LEN_BYTE_ARRAY: // fall through
-                if (logicalTypeAnnotation instanceof LogicalTypeAnnotation.DecimalLogicalTypeAnnotation) {
-                    final LogicalTypeAnnotation.DecimalLogicalTypeAnnotation decimalLogicalType =
-                            (LogicalTypeAnnotation.DecimalLogicalTypeAnnotation) logicalTypeAnnotation;
-                    final int encodedSizeInBytes = primitiveTypeName == BINARY ? -1 : primitiveType.getTypeLength();
-                    if (resolveDecimalLogicalType(decimalLogicalType) == BigInteger.class) {
-                        return new BigIntegerMaterializer.Factory(new BigIntegerParquetBytesCodec(encodedSizeInBytes));
-                    }
-                    return new BigDecimalFromBytesMaterializer.Factory(new BigDecimalParquetBytesCodec(
-                            decimalLogicalType.getPrecision(), decimalLogicalType.getScale(), encodedSizeInBytes));
-                }
-                return BlobMaterializer.Factory;
-            default:
-                throw new RuntimeException("Unexpected type name:" + primitiveTypeName);
-        }
-    }
-
     void fillNulls(int startIndex, int endIndex);
 
     void fillValues(int startIndex, int endIndex);
diff --git a/extensions/parquet/base/src/main/java/io/deephaven/parquet/base/PageMaterializerFactory.java b/extensions/parquet/base/src/main/java/io/deephaven/parquet/base/PageMaterializerFactory.java
index a276ca24ff0..1db402b14d4 100644
--- a/extensions/parquet/base/src/main/java/io/deephaven/parquet/base/PageMaterializerFactory.java
+++ b/extensions/parquet/base/src/main/java/io/deephaven/parquet/base/PageMaterializerFactory.java
@@ -9,4 +9,16 @@ public interface PageMaterializerFactory {
     PageMaterializer makeMaterializerWithNulls(ValuesReader dataReader, Object nullValue, int numValues);
 
     PageMaterializer makeMaterializerNonNull(ValuesReader dataReader, int numValues);
+
+    PageMaterializerFactory NULL_FACTORY = new PageMaterializerFactory() {
+        @Override
+        public PageMaterializer makeMaterializerWithNulls(ValuesReader dataReader, Object nullValue, int numValues) {
+            throw new UnsupportedOperationException("Does not support materializing pages");
+        }
+
+        @Override
+        public PageMaterializer makeMaterializerNonNull(ValuesReader dataReader, int numValues) {
+            throw new UnsupportedOperationException("Does not support materializing pages");
+        }
+    };
 }
diff --git a/extensions/parquet/base/src/main/java/io/deephaven/parquet/base/ParquetFileReader.java b/extensions/parquet/base/src/main/java/io/deephaven/parquet/base/ParquetFileReader.java
index b7227e2f6a5..87ce0690771 100644
--- a/extensions/parquet/base/src/main/java/io/deephaven/parquet/base/ParquetFileReader.java
+++ b/extensions/parquet/base/src/main/java/io/deephaven/parquet/base/ParquetFileReader.java
@@ -11,6 +11,7 @@
 import org.apache.parquet.format.Type;
 import org.apache.parquet.schema.*;
 import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
 
 import java.io.File;
 import java.io.IOException;
@@ -24,8 +25,7 @@
 import static io.deephaven.base.FileUtils.convertToURI;
 
 /**
- * Top level accessor for a parquet file which can read both from a file path string or a CLI style file URI,
- * ex."s3://bucket/key".
+ * Top level accessor for a parquet file which can read from a CLI style file URI, ex."s3://bucket/key".
  */
 public class ParquetFileReader {
     private static final int FOOTER_LENGTH_SIZE = 4;
@@ -38,25 +38,7 @@ public class ParquetFileReader {
      * If reading a single parquet file, root URI is the URI of the file, else the parent directory for a metadata file
      */
     private final URI rootURI;
-    private final MessageType type;
-
-    /**
-     * Make a {@link ParquetFileReader} for the supplied {@link File}. Wraps {@link IOException} as
-     * {@link UncheckedIOException}.
-     *
-     * @param parquetFile The parquet file or the parquet metadata file
-     * @param channelsProvider The {@link SeekableChannelsProvider} to use for reading the file
-     * @return The new {@link ParquetFileReader}
-     */
-    public static ParquetFileReader create(
-            @NotNull final File parquetFile,
-            @NotNull final SeekableChannelsProvider channelsProvider) {
-        try {
-            return new ParquetFileReader(convertToURI(parquetFile, false), channelsProvider);
-        } catch (final IOException e) {
-            throw new UncheckedIOException("Failed to create Parquet file reader: " + parquetFile, e);
-        }
-    }
+    private final MessageType schema;
 
     /**
      * Make a {@link ParquetFileReader} for the supplied {@link URI}. Wraps {@link IOException} as
@@ -90,7 +72,6 @@ private ParquetFileReader(
             // Construct a new file URI for the parent directory
             rootURI = convertToURI(new File(parquetFileURI).getParentFile(), true);
         } else {
-            // TODO(deephaven-core#5066): Add support for reading metadata files from non-file URIs
             rootURI = parquetFileURI;
         }
         try (
@@ -101,7 +82,7 @@ private ParquetFileReader(
                 fileMetaData = Util.readFileMetaData(in);
             }
         }
-        type = fromParquetSchema(fileMetaData.schema, fileMetaData.column_orders);
+        schema = fromParquetSchema(fileMetaData.schema, fileMetaData.column_orders);
     }
 
     /**
@@ -147,87 +128,6 @@ public SeekableChannelsProvider getChannelsProvider() {
         return channelsProvider;
     }
 
-    private Set<String> columnsWithDictionaryUsedOnEveryDataPage = null;
-
-    /**
-     * Get the name of all columns that we can know for certain (a) have a dictionary, and (b) use the dictionary on all
-     * data pages.
-     *
-     * @return A set of parquet column names that satisfies the required condition.
-     */
-    @SuppressWarnings("unused")
-    public Set<String> getColumnsWithDictionaryUsedOnEveryDataPage() {
-        if (columnsWithDictionaryUsedOnEveryDataPage == null) {
-            columnsWithDictionaryUsedOnEveryDataPage =
-                    calculateColumnsWithDictionaryUsedOnEveryDataPage();
-        }
-        return columnsWithDictionaryUsedOnEveryDataPage;
-    }
-
-    /**
-     * True only if we are certain every data page in this column chunk uses dictionary encoding; note false also covers
-     * the "we can't tell" case.
-     */
-    private static boolean columnChunkUsesDictionaryOnEveryPage(final ColumnChunk columnChunk) {
-        final ColumnMetaData columnMeta = columnChunk.getMeta_data();
-        if (columnMeta.encoding_stats == null) {
-            return false; // this is false as "don't know".
-        }
-        for (PageEncodingStats encodingStat : columnMeta.encoding_stats) {
-            if (encodingStat.page_type != PageType.DATA_PAGE
-                    && encodingStat.page_type != PageType.DATA_PAGE_V2) {
-                // skip non-data pages.
-                continue;
-            }
-            // this is a data page.
-            if (encodingStat.encoding != Encoding.PLAIN_DICTIONARY
-                    && encodingStat.encoding != Encoding.RLE_DICTIONARY) {
-                return false;
-            }
-        }
-        return true;
-    }
-
-    private Set<String> calculateColumnsWithDictionaryUsedOnEveryDataPage() {
-        final Set<String> result = new HashSet<>(fileMetaData.getSchemaSize());
-        final List<RowGroup> rowGroups = fileMetaData.getRow_groups();
-        final Iterator<RowGroup> riter = rowGroups.iterator();
-        if (!riter.hasNext()) {
-            // For an empty file we say all columns satisfy the property.
-            for (SchemaElement se : fileMetaData.getSchema()) {
-                if (!se.isSetNum_children()) { // We want only the leaves.
-                    result.add(se.getName());
-                }
-            }
-            return result;
-        }
-        // On the first pass, for row group zero, we are going to add all columns to the set
-        // that satisfy the restriction.
-        // On later passes after zero, we will remove any column that does not satisfy
-        // the restriction.
-        final RowGroup rg0 = riter.next();
-        for (ColumnChunk columnChunk : rg0.columns) {
-            if (columnChunkUsesDictionaryOnEveryPage(columnChunk)) {
-                final String parquetColumnName = columnChunk.getMeta_data().path_in_schema.get(0);
-                result.add(parquetColumnName);
-            }
-        }
-
-        while (riter.hasNext()) {
-            final RowGroup rowGroup = riter.next();
-            for (ColumnChunk columnChunk : rowGroup.columns) {
-                final String parquetColumnName = columnChunk.getMeta_data().path_in_schema.get(0);
-                if (!result.contains(parquetColumnName)) {
-                    continue;
-                }
-                if (!columnChunkUsesDictionaryOnEveryPage(columnChunk)) {
-                    result.remove(parquetColumnName);
-                }
-            }
-        }
-        return result;
-    }
-
     /**
      * Create a {@link RowGroupReader} object for provided row group number
      *
@@ -238,7 +138,7 @@ public RowGroupReader getRowGroup(final int groupNumber, final String version) {
                 fileMetaData.getRow_groups().get(groupNumber),
                 channelsProvider,
                 rootURI,
-                type,
+                schema,
                 getSchema(),
                 version);
     }
@@ -297,19 +197,12 @@ private static void buildChildren(Types.GroupBuilder builder, Iterator<SchemaEle
             }
 
             if (schemaElement.isSetLogicalType()) {
-                ((Types.Builder) childBuilder).as(getLogicalTypeAnnotation(schemaElement.logicalType));
-            }
-
-            if (schemaElement.isSetConverted_type()) {
-                final LogicalTypeAnnotation originalType = getLogicalTypeAnnotation(
-                        schemaElement.converted_type, schemaElement.logicalType, schemaElement);
-                final LogicalTypeAnnotation newOriginalType = schemaElement.isSetLogicalType()
-                        && getLogicalTypeAnnotation(schemaElement.logicalType) != null
-                                ? getLogicalTypeAnnotation(schemaElement.logicalType)
-                                : null;
-                if (!originalType.equals(newOriginalType)) {
-                    ((Types.Builder) childBuilder).as(originalType);
-                }
+                final LogicalTypeAnnotation logicalType = getLogicalTypeAnnotation(schemaElement.logicalType);
+                ((Types.Builder) childBuilder).as(logicalType);
+            } else if (schemaElement.isSetConverted_type()) {
+                final LogicalTypeAnnotation logicalType = getLogicalTypeFromConvertedType(
+                        schemaElement.converted_type, schemaElement);
+                ((Types.Builder) childBuilder).as(logicalType);
             }
 
             if (schemaElement.isSetField_id()) {
@@ -335,7 +228,9 @@ private static LogicalTypeAnnotation.TimeUnit convertTimeUnit(TimeUnit unit) thr
         }
     }
 
-    static LogicalTypeAnnotation getLogicalTypeAnnotation(LogicalType type) throws ParquetFileReaderException {
+    @Nullable
+    private static LogicalTypeAnnotation getLogicalTypeAnnotation(@NotNull final LogicalType type)
+            throws ParquetFileReaderException {
         switch (type.getSetField()) {
             case MAP:
                 return LogicalTypeAnnotation.mapType();
@@ -405,8 +300,15 @@ private static org.apache.parquet.schema.ColumnOrder fromParquetColumnOrder(Colu
         return org.apache.parquet.schema.ColumnOrder.undefined();
     }
 
-    private static LogicalTypeAnnotation getLogicalTypeAnnotation(final ConvertedType convertedType,
-            final LogicalType logicalType, final SchemaElement schemaElement) throws ParquetFileReaderException {
+    /**
+     * This method will convert the {@link ConvertedType} to a {@link LogicalTypeAnnotation} and should only be called
+     * if the logical type is not set in the schema element.
+     *
+     * @see <a href="https://github.com/apache/parquet-format/blob/master/LogicalTypes.md">Reference for conversions</a>
+     */
+    private static LogicalTypeAnnotation getLogicalTypeFromConvertedType(
+            final ConvertedType convertedType,
+            final SchemaElement schemaElement) throws ParquetFileReaderException {
         switch (convertedType) {
             case UTF8:
                 return LogicalTypeAnnotation.stringType();
@@ -425,17 +327,13 @@ private static LogicalTypeAnnotation getLogicalTypeAnnotation(final ConvertedTyp
             case DATE:
                 return LogicalTypeAnnotation.dateType();
             case TIME_MILLIS:
-                // isAdjustedToUTC parameter is ignored while reading Parquet TIME type, so disregard it here
                 return LogicalTypeAnnotation.timeType(true, LogicalTypeAnnotation.TimeUnit.MILLIS);
             case TIME_MICROS:
                 return LogicalTypeAnnotation.timeType(true, LogicalTypeAnnotation.TimeUnit.MICROS);
             case TIMESTAMP_MILLIS:
-                // Converted type doesn't have isAdjustedToUTC parameter, so use the information from logical type
-                return LogicalTypeAnnotation.timestampType(isAdjustedToUTC(logicalType),
-                        LogicalTypeAnnotation.TimeUnit.MILLIS);
+                return LogicalTypeAnnotation.timestampType(true, LogicalTypeAnnotation.TimeUnit.MILLIS);
             case TIMESTAMP_MICROS:
-                return LogicalTypeAnnotation.timestampType(isAdjustedToUTC(logicalType),
-                        LogicalTypeAnnotation.TimeUnit.MICROS);
+                return LogicalTypeAnnotation.timestampType(true, LogicalTypeAnnotation.TimeUnit.MICROS);
             case INTERVAL:
                 return LogicalTypeAnnotation.IntervalLogicalTypeAnnotation.getInstance();
             case INT_8:
@@ -464,24 +362,7 @@ private static LogicalTypeAnnotation getLogicalTypeAnnotation(final ConvertedTyp
         }
     }
 
-    /**
-     * Helper method to determine if a logical type is adjusted to UTC.
-     *
-     * @param logicalType the logical type to check
-     * @return true if the logical type is a timestamp adjusted to UTC, false otherwise
-     */
-    private static boolean isAdjustedToUTC(final LogicalType logicalType) {
-        if (logicalType.getSetField() == LogicalType._Fields.TIMESTAMP) {
-            return logicalType.getTIMESTAMP().isAdjustedToUTC;
-        }
-        return false;
-    }
-
     public MessageType getSchema() {
-        return type;
-    }
-
-    public int rowGroupCount() {
-        return fileMetaData.getRow_groups().size();
+        return schema;
     }
 }
diff --git a/extensions/parquet/base/src/main/java/io/deephaven/parquet/base/ParquetFileWriter.java b/extensions/parquet/base/src/main/java/io/deephaven/parquet/base/ParquetFileWriter.java
index 81dc13a4430..d14916a6f93 100644
--- a/extensions/parquet/base/src/main/java/io/deephaven/parquet/base/ParquetFileWriter.java
+++ b/extensions/parquet/base/src/main/java/io/deephaven/parquet/base/ParquetFileWriter.java
@@ -3,13 +3,12 @@
 //
 package io.deephaven.parquet.base;
 
+import com.google.common.io.CountingOutputStream;
 import org.apache.parquet.format.converter.ParquetMetadataConverter;
-import io.deephaven.util.channel.SeekableChannelsProvider;
 import io.deephaven.parquet.compress.CompressorAdapter;
 import io.deephaven.parquet.compress.DeephavenCompressorAdapterFactory;
 import org.apache.parquet.Version;
 import org.apache.parquet.bytes.ByteBufferAllocator;
-import org.apache.parquet.bytes.BytesUtils;
 
 import org.apache.parquet.format.Util;
 import org.apache.parquet.hadoop.metadata.*;
@@ -19,20 +18,21 @@
 import org.jetbrains.annotations.NotNull;
 
 import java.io.IOException;
+import java.io.OutputStream;
+import java.net.URI;
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
 import static io.deephaven.parquet.base.ParquetUtils.MAGIC;
-import static io.deephaven.parquet.base.ParquetUtils.PARQUET_OUTPUT_BUFFER_SIZE;
 import static org.apache.parquet.format.Util.writeFileMetaData;
 
-public final class ParquetFileWriter {
+public final class ParquetFileWriter implements AutoCloseable {
     private static final ParquetMetadataConverter metadataConverter = new ParquetMetadataConverter();
     private static final int VERSION = 1;
 
-    private final PositionedBufferedOutputStream bufferedOutput;
+    private final CountingOutputStream countingOutput;
     private final MessageType type;
     private final int targetPageSize;
     private final ByteBufferAllocator allocator;
@@ -40,13 +40,12 @@ public final class ParquetFileWriter {
     private final Map<String, String> extraMetaData;
     private final List<BlockMetaData> blocks = new ArrayList<>();
     private final List<List<OffsetIndex>> offsetIndexes = new ArrayList<>();
-    private final String destFilePathForMetadata;
+    private final URI dest;
     private final ParquetMetadataFileWriter metadataFileWriter;
 
     public ParquetFileWriter(
-            final String destFilePath,
-            final String destFilePathForMetadata,
-            final SeekableChannelsProvider channelsProvider,
+            final URI dest,
+            final OutputStream destOutputStream,
             final int targetPageSize,
             final ByteBufferAllocator allocator,
             final MessageType type,
@@ -56,44 +55,59 @@ public ParquetFileWriter(
         this.targetPageSize = targetPageSize;
         this.allocator = allocator;
         this.extraMetaData = new HashMap<>(extraMetaData);
-        bufferedOutput = new PositionedBufferedOutputStream(channelsProvider.getWriteChannel(destFilePath, false),
-                PARQUET_OUTPUT_BUFFER_SIZE);
-        bufferedOutput.write(MAGIC);
+        this.countingOutput = new CountingOutputStream(destOutputStream);
+        countingOutput.write(MAGIC);
         this.type = type;
         this.compressorAdapter = DeephavenCompressorAdapterFactory.getInstance().getByName(codecName);
-        this.destFilePathForMetadata = destFilePathForMetadata;
+        this.dest = dest;
         this.metadataFileWriter = metadataFileWriter;
     }
 
     public RowGroupWriter addRowGroup(final long size) {
         final RowGroupWriterImpl rowGroupWriter =
-                new RowGroupWriterImpl(bufferedOutput, type, targetPageSize, allocator, compressorAdapter);
+                new RowGroupWriterImpl(countingOutput, type, targetPageSize, allocator, compressorAdapter);
         rowGroupWriter.getBlock().setRowCount(size);
         blocks.add(rowGroupWriter.getBlock());
         offsetIndexes.add(rowGroupWriter.offsetIndexes());
         return rowGroupWriter;
     }
 
+    /**
+     * Get the number of bytes written to the parquet file so far.
+     */
+    public long bytesWritten() {
+        return countingOutput.getCount();
+    }
+
+    @Override
     public void close() throws IOException {
         serializeOffsetIndexes();
         final ParquetMetadata footer =
                 new ParquetMetadata(new FileMetaData(type, extraMetaData, Version.FULL_VERSION), blocks);
-        serializeFooter(footer, bufferedOutput);
-        metadataFileWriter.addParquetFileMetadata(destFilePathForMetadata, footer);
-        // Flush any buffered data and close the channel
-        bufferedOutput.close();
+        serializeFooter(footer, countingOutput);
+        metadataFileWriter.addParquetFileMetadata(dest, footer);
+        // Flush any buffered data, do not close the stream since it is managed by the layer above
+        countingOutput.flush();
         compressorAdapter.close();
     }
 
-    public static void serializeFooter(final ParquetMetadata footer,
-            final PositionedBufferedOutputStream bufferedOutput)
+    public static void serializeFooter(final ParquetMetadata footer, final CountingOutputStream countingOutput)
             throws IOException {
-        final long footerIndex = bufferedOutput.position();
+        final long footerIndex = countingOutput.getCount();
         final org.apache.parquet.format.FileMetaData parquetMetadata =
                 metadataConverter.toParquetMetadata(VERSION, footer);
-        writeFileMetaData(parquetMetadata, bufferedOutput);
-        BytesUtils.writeIntLittleEndian(bufferedOutput, (int) (bufferedOutput.position() - footerIndex));
-        bufferedOutput.write(MAGIC);
+        writeFileMetaData(parquetMetadata, countingOutput);
+        countingOutput.write(intToLittleEndian((int) (countingOutput.getCount() - footerIndex)));
+        countingOutput.write(MAGIC);
+    }
+
+    private static byte[] intToLittleEndian(final int value) {
+        return new byte[] {
+                (byte) (value & 0xFF),
+                (byte) ((value >> 8) & 0xFF),
+                (byte) ((value >> 16) & 0xFF),
+                (byte) ((value >> 24) & 0xFF)
+        };
     }
 
     private void serializeOffsetIndexes() throws IOException {
@@ -106,9 +120,10 @@ private void serializeOffsetIndexes() throws IOException {
                     continue;
                 }
                 final ColumnChunkMetaData column = columns.get(cIndex);
-                final long offset = bufferedOutput.position();
-                Util.writeOffsetIndex(ParquetMetadataConverter.toParquetOffsetIndex(offsetIndex), bufferedOutput);
-                column.setOffsetIndexReference(new IndexReference(offset, (int) (bufferedOutput.position() - offset)));
+                final long offset = countingOutput.getCount();
+                Util.writeOffsetIndex(ParquetMetadataConverter.toParquetOffsetIndex(offsetIndex), countingOutput);
+                column.setOffsetIndexReference(
+                        new IndexReference(offset, (int) (countingOutput.getCount() - offset)));
             }
         }
     }
diff --git a/extensions/parquet/base/src/main/java/io/deephaven/parquet/base/ParquetMetadataFileWriter.java b/extensions/parquet/base/src/main/java/io/deephaven/parquet/base/ParquetMetadataFileWriter.java
index 42a93dc24e1..0a8c9c4ef42 100644
--- a/extensions/parquet/base/src/main/java/io/deephaven/parquet/base/ParquetMetadataFileWriter.java
+++ b/extensions/parquet/base/src/main/java/io/deephaven/parquet/base/ParquetMetadataFileWriter.java
@@ -3,9 +3,11 @@
 //
 package io.deephaven.parquet.base;
 
+import io.deephaven.util.channel.CompletableOutputStream;
 import org.apache.parquet.hadoop.metadata.ParquetMetadata;
 
 import java.io.IOException;
+import java.net.URI;
 
 /**
  * Used to write {@value ParquetUtils#METADATA_FILE_NAME} and {@value ParquetUtils#COMMON_METADATA_FILE_NAME} files for
@@ -17,21 +19,19 @@ public interface ParquetMetadataFileWriter {
      * Add the parquet metadata for the provided parquet file to the list of metadata to be written to combined metadata
      * files.
      *
-     * @param parquetFilePath The parquet file destination path
+     * @param parquetFileURI The parquet file destination URI
      * @param metadata The parquet metadata corresponding to the parquet file
      */
-    void addParquetFileMetadata(String parquetFilePath, ParquetMetadata metadata);
+    void addParquetFileMetadata(URI parquetFileURI, ParquetMetadata metadata);
 
     /**
-     * Write the combined metadata files for all metadata accumulated so far and clear the list.
+     * Write the combined metadata to the provided streams and clear the metadata accumulated so far. The output streams
+     * should be marked as {@link CompletableOutputStream#done()} after writing is finished.
      *
-     * @param metadataFilePath The destination path for the {@value ParquetUtils#METADATA_FILE_NAME} file
-     * @param commonMetadataFilePath The destination path for the {@value ParquetUtils#COMMON_METADATA_FILE_NAME} file
+     * @param metadataOutputStream The output stream for the {@value ParquetUtils#METADATA_FILE_NAME} file
+     * @param commonMetadataOutputStream The output stream for the {@value ParquetUtils#COMMON_METADATA_FILE_NAME} file
      */
-    void writeMetadataFiles(String metadataFilePath, String commonMetadataFilePath) throws IOException;
-
-    /**
-     * Clear the list of metadata accumulated so far.
-     */
-    void clear();
+    void writeMetadataFiles(
+            CompletableOutputStream metadataOutputStream,
+            CompletableOutputStream commonMetadataOutputStream) throws IOException;
 }
diff --git a/extensions/parquet/base/src/main/java/io/deephaven/parquet/base/ParquetUtils.java b/extensions/parquet/base/src/main/java/io/deephaven/parquet/base/ParquetUtils.java
index 5af9e80e98b..467c7b22d8a 100644
--- a/extensions/parquet/base/src/main/java/io/deephaven/parquet/base/ParquetUtils.java
+++ b/extensions/parquet/base/src/main/java/io/deephaven/parquet/base/ParquetUtils.java
@@ -3,26 +3,34 @@
 //
 package io.deephaven.parquet.base;
 
+import io.deephaven.UncheckedDeephavenException;
 import org.jetbrains.annotations.NotNull;
 
 import java.io.File;
+import java.net.URI;
+import java.net.URISyntaxException;
 import java.nio.charset.StandardCharsets;
 import java.nio.file.Path;
 
+import static io.deephaven.base.FileUtils.URI_SEPARATOR;
 import static io.deephaven.base.FileUtils.URI_SEPARATOR_CHAR;
 
 public final class ParquetUtils {
 
+    public static final String PARQUET_FILE_EXTENSION = ".parquet";
+
     public static final String METADATA_FILE_NAME = "_metadata";
     public static final String COMMON_METADATA_FILE_NAME = "_common_metadata";
-    public static final String PARQUET_FILE_EXTENSION = ".parquet";
     public static final String METADATA_FILE_URI_SUFFIX = URI_SEPARATOR_CHAR + METADATA_FILE_NAME;
     public static final String COMMON_METADATA_FILE_URI_SUFFIX = URI_SEPARATOR_CHAR + COMMON_METADATA_FILE_NAME;
-    public static final String METADATA_FILE_SUFFIX = File.separatorChar + METADATA_FILE_NAME;
-    public static final String COMMON_METADATA_FILE_SUFFIX = File.separatorChar + COMMON_METADATA_FILE_NAME;
+    private static final String METADATA_FILE_SUFFIX = File.separatorChar + METADATA_FILE_NAME;
+    private static final String COMMON_METADATA_FILE_SUFFIX = File.separatorChar + COMMON_METADATA_FILE_NAME;
+
     private static final String MAGIC_STR = "PAR1";
     public static final byte[] MAGIC = MAGIC_STR.getBytes(StandardCharsets.US_ASCII);
 
+    private static final String WINDOWS_FILE_SEPARATOR = "\\";
+
     /**
      * The number of bytes to buffer before flushing while writing parquet files and metadata files.
      */
@@ -42,17 +50,23 @@ public static String getPerFileMetadataKey(final String filePath) {
     }
 
     /**
-     * This method verifies if the source points to a parquet file or a metadata file. Provided source can be a local
-     * file path or a URI. Also, it can point to a parquet file, metadata file or a directory.
+     * This method verifies if the source points to a parquet file. Provided source can be a local file path or a URI.
      */
     public static boolean isParquetFile(@NotNull final String source) {
-        boolean ret = source.endsWith(PARQUET_FILE_EXTENSION)
-                || source.endsWith(METADATA_FILE_URI_SUFFIX)
-                || source.endsWith(COMMON_METADATA_FILE_URI_SUFFIX);
+        return source.endsWith(PARQUET_FILE_EXTENSION);
+    }
+
+    /**
+     * This method verifies if the source points to a metadata file. Provided source can be a local file path or a URI.
+     */
+    public static boolean isMetadataFile(@NotNull final String source) {
+        if (source.endsWith(METADATA_FILE_URI_SUFFIX) || source.endsWith(COMMON_METADATA_FILE_URI_SUFFIX)) {
+            return true;
+        }
         if (File.separatorChar != URI_SEPARATOR_CHAR) {
-            ret = ret || source.endsWith(METADATA_FILE_SUFFIX) || source.endsWith(COMMON_METADATA_FILE_SUFFIX);
+            return source.endsWith(METADATA_FILE_SUFFIX) || source.endsWith(COMMON_METADATA_FILE_SUFFIX);
         }
-        return ret;
+        return false;
     }
 
     /**
@@ -74,4 +88,20 @@ public static boolean isVisibleParquetFile(@NotNull final Path rootDir, @NotNull
         }
         return true;
     }
+
+    /**
+     * Resolve a relative path against a base URI. The path can be from Windows or Unix systems. This method should be
+     * used if we expect the relative path to contain file separators or special characters, otherwise use
+     * {@code base.resolve(relativePath)}
+     */
+    public static URI resolve(final URI base, final String relativePath) {
+        final URI relativeURI;
+        try {
+            // Sanitize the relative path before resolving it to avoid issues with separators and special characters
+            relativeURI = new URI(null, null, relativePath.replace(WINDOWS_FILE_SEPARATOR, URI_SEPARATOR), null);
+        } catch (final URISyntaxException e) {
+            throw new UncheckedDeephavenException("Failed to create URI from relative path: " + relativePath, e);
+        }
+        return base.resolve(relativeURI);
+    }
 }
diff --git a/extensions/parquet/base/src/main/java/io/deephaven/parquet/base/PositionedBufferedOutputStream.java b/extensions/parquet/base/src/main/java/io/deephaven/parquet/base/PositionedBufferedOutputStream.java
deleted file mode 100644
index 3d26162f806..00000000000
--- a/extensions/parquet/base/src/main/java/io/deephaven/parquet/base/PositionedBufferedOutputStream.java
+++ /dev/null
@@ -1,29 +0,0 @@
-//
-// Copyright (c) 2016-2024 Deephaven Data Labs and Patent Pending
-//
-package io.deephaven.parquet.base;
-
-import org.jetbrains.annotations.NotNull;
-
-import java.io.BufferedOutputStream;
-import java.io.IOException;
-import java.nio.channels.Channels;
-import java.nio.channels.SeekableByteChannel;
-
-public final class PositionedBufferedOutputStream extends BufferedOutputStream {
-
-    private final SeekableByteChannel writeChannel;
-
-    public PositionedBufferedOutputStream(@NotNull final SeekableByteChannel writeChannel, final int size) {
-        super(Channels.newOutputStream(writeChannel), size);
-        this.writeChannel = writeChannel;
-    }
-
-    /**
-     * Get the total number of bytes written to this stream
-     */
-    long position() throws IOException {
-        // Number of bytes buffered in the stream + bytes written to the underlying channel
-        return this.count + writeChannel.position();
-    }
-}
diff --git a/extensions/parquet/base/src/main/java/io/deephaven/parquet/base/RowGroupWriterImpl.java b/extensions/parquet/base/src/main/java/io/deephaven/parquet/base/RowGroupWriterImpl.java
index c873f15d495..6d387228866 100644
--- a/extensions/parquet/base/src/main/java/io/deephaven/parquet/base/RowGroupWriterImpl.java
+++ b/extensions/parquet/base/src/main/java/io/deephaven/parquet/base/RowGroupWriterImpl.java
@@ -3,6 +3,7 @@
 //
 package io.deephaven.parquet.base;
 
+import com.google.common.io.CountingOutputStream;
 import io.deephaven.parquet.compress.CompressorAdapter;
 import org.apache.parquet.bytes.ByteBufferAllocator;
 import org.apache.parquet.hadoop.metadata.BlockMetaData;
@@ -17,7 +18,7 @@
 import java.util.List;
 
 final class RowGroupWriterImpl implements RowGroupWriter {
-    private final PositionedBufferedOutputStream bufferedOutput;
+    private final CountingOutputStream countingOutput;
     private final MessageType type;
     private final int targetPageSize;
     private final ByteBufferAllocator allocator;
@@ -26,22 +27,22 @@ final class RowGroupWriterImpl implements RowGroupWriter {
     private final List<OffsetIndex> currentOffsetIndexes = new ArrayList<>();
     private final CompressorAdapter compressorAdapter;
 
-    RowGroupWriterImpl(PositionedBufferedOutputStream bufferedOutput,
+    RowGroupWriterImpl(CountingOutputStream countingOutput,
             MessageType type,
             int targetPageSize,
             ByteBufferAllocator allocator,
             CompressorAdapter compressorAdapter) {
-        this(bufferedOutput, type, targetPageSize, allocator, new BlockMetaData(), compressorAdapter);
+        this(countingOutput, type, targetPageSize, allocator, new BlockMetaData(), compressorAdapter);
     }
 
 
-    private RowGroupWriterImpl(PositionedBufferedOutputStream bufferedOutput,
+    private RowGroupWriterImpl(CountingOutputStream countingOutput,
             MessageType type,
             int targetPageSize,
             ByteBufferAllocator allocator,
             BlockMetaData blockMetaData,
             CompressorAdapter compressorAdapter) {
-        this.bufferedOutput = bufferedOutput;
+        this.countingOutput = countingOutput;
         this.type = type;
         this.targetPageSize = targetPageSize;
         this.allocator = allocator;
@@ -72,7 +73,7 @@ public ColumnWriter addColumn(String columnName) {
                             + " need to close that before opening a writer for " + columnName);
         }
         activeWriter = new ColumnWriterImpl(this,
-                bufferedOutput,
+                countingOutput,
                 type.getColumnDescription(getPrimitivePath(columnName)),
                 compressorAdapter,
                 targetPageSize,
diff --git a/extensions/parquet/base/src/main/java/io/deephaven/parquet/base/materializers/BigDecimalFromBytesMaterializer.java b/extensions/parquet/base/src/main/java/io/deephaven/parquet/base/materializers/BigDecimalFromBytesMaterializer.java
index 5080ea35dd8..754e4b156f8 100644
--- a/extensions/parquet/base/src/main/java/io/deephaven/parquet/base/materializers/BigDecimalFromBytesMaterializer.java
+++ b/extensions/parquet/base/src/main/java/io/deephaven/parquet/base/materializers/BigDecimalFromBytesMaterializer.java
@@ -49,8 +49,7 @@ private BigDecimalFromBytesMaterializer(ValuesReader dataReader, BigDecimal null
     @Override
     public void fillValues(int startIndex, int endIndex) {
         for (int ii = startIndex; ii < endIndex; ii++) {
-            final byte[] bytes = dataReader.readBytes().getBytes();
-            data[ii] = codec.decode(bytes, 0, bytes.length);
+            data[ii] = codec.decode(dataReader.readBytes().toByteBuffer());
         }
     }
 }
diff --git a/extensions/parquet/base/src/main/java/io/deephaven/parquet/base/materializers/BigIntegerMaterializer.java b/extensions/parquet/base/src/main/java/io/deephaven/parquet/base/materializers/BigIntegerMaterializer.java
index 36589a48a41..944b9a8f965 100644
--- a/extensions/parquet/base/src/main/java/io/deephaven/parquet/base/materializers/BigIntegerMaterializer.java
+++ b/extensions/parquet/base/src/main/java/io/deephaven/parquet/base/materializers/BigIntegerMaterializer.java
@@ -53,8 +53,7 @@ private BigIntegerMaterializer(ValuesReader dataReader, BigInteger nullValue, in
     @Override
     public void fillValues(int startIndex, int endIndex) {
         for (int ii = startIndex; ii < endIndex; ii++) {
-            final byte[] bytes = dataReader.readBytes().getBytes();
-            data[ii] = codec.decode(bytes, 0, bytes.length);
+            data[ii] = codec.decode(dataReader.readBytes().toByteBuffer());
         }
     }
 }
diff --git a/extensions/parquet/base/src/main/java/io/deephaven/parquet/base/materializers/BlobMaterializer.java b/extensions/parquet/base/src/main/java/io/deephaven/parquet/base/materializers/BlobMaterializer.java
index f796d94979e..7e21a194398 100644
--- a/extensions/parquet/base/src/main/java/io/deephaven/parquet/base/materializers/BlobMaterializer.java
+++ b/extensions/parquet/base/src/main/java/io/deephaven/parquet/base/materializers/BlobMaterializer.java
@@ -8,9 +8,12 @@
 import org.apache.parquet.column.values.ValuesReader;
 import org.apache.parquet.io.api.Binary;
 
+/**
+ * Materializer for binary data.
+ */
 public class BlobMaterializer extends ObjectMaterializerBase<Binary> implements PageMaterializer {
 
-    public static final PageMaterializerFactory Factory = new PageMaterializerFactory() {
+    public static final PageMaterializerFactory FACTORY = new PageMaterializerFactory() {
         @Override
         public PageMaterializer makeMaterializerWithNulls(ValuesReader dataReader, Object nullValue, int numValues) {
             return new BlobMaterializer(dataReader, (Binary) nullValue, numValues);
diff --git a/extensions/parquet/base/src/main/java/io/deephaven/parquet/base/materializers/BoolMaterializer.java b/extensions/parquet/base/src/main/java/io/deephaven/parquet/base/materializers/BoolMaterializer.java
deleted file mode 100644
index 89871fbf277..00000000000
--- a/extensions/parquet/base/src/main/java/io/deephaven/parquet/base/materializers/BoolMaterializer.java
+++ /dev/null
@@ -1,63 +0,0 @@
-//
-// Copyright (c) 2016-2024 Deephaven Data Labs and Patent Pending
-//
-package io.deephaven.parquet.base.materializers;
-
-import io.deephaven.parquet.base.PageMaterializer;
-import io.deephaven.parquet.base.PageMaterializerFactory;
-import org.apache.parquet.column.values.ValuesReader;
-
-import java.util.Arrays;
-
-public class BoolMaterializer implements PageMaterializer {
-
-    public static final PageMaterializerFactory Factory = new PageMaterializerFactory() {
-        @Override
-        public PageMaterializer makeMaterializerWithNulls(ValuesReader dataReader, Object nullValue, int numValues) {
-            return new BoolMaterializer(dataReader, (byte) nullValue, numValues);
-        }
-
-        @Override
-        public PageMaterializer makeMaterializerNonNull(ValuesReader dataReader, int numValues) {
-            return new BoolMaterializer(dataReader, numValues);
-        }
-    };
-
-    private final ValuesReader dataReader;
-
-    private final byte nullValue;
-    private final byte[] data;
-
-    private BoolMaterializer(ValuesReader dataReader, int numValues) {
-        this(dataReader, (byte) 0, numValues);
-    }
-
-    private BoolMaterializer(ValuesReader dataReader, byte nullValue, int numValues) {
-        this.dataReader = dataReader;
-        this.nullValue = nullValue;
-        this.data = new byte[numValues];
-    }
-
-    @Override
-    public void fillNulls(int startIndex, int endIndex) {
-        Arrays.fill(data, startIndex, endIndex, nullValue);
-    }
-
-    @Override
-    public void fillValues(int startIndex, int endIndex) {
-        for (int ii = startIndex; ii < endIndex; ii++) {
-            data[ii] = (byte) (dataReader.readBoolean() ? 1 : 0);
-        }
-    }
-
-    @Override
-    public Object fillAll() {
-        fillValues(0, data.length);
-        return data;
-    }
-
-    @Override
-    public Object data() {
-        return data;
-    }
-}
diff --git a/extensions/parquet/base/src/main/java/io/deephaven/parquet/base/materializers/BooleanAsByteMaterializer.java b/extensions/parquet/base/src/main/java/io/deephaven/parquet/base/materializers/BooleanAsByteMaterializer.java
new file mode 100644
index 00000000000..e3475a5a6d8
--- /dev/null
+++ b/extensions/parquet/base/src/main/java/io/deephaven/parquet/base/materializers/BooleanAsByteMaterializer.java
@@ -0,0 +1,63 @@
+//
+// Copyright (c) 2016-2024 Deephaven Data Labs and Patent Pending
+//
+package io.deephaven.parquet.base.materializers;
+
+import io.deephaven.parquet.base.PageMaterializer;
+import io.deephaven.parquet.base.PageMaterializerFactory;
+import org.apache.parquet.column.values.ValuesReader;
+
+import java.util.Arrays;
+
+public class BooleanAsByteMaterializer implements PageMaterializer {
+
+    public static final PageMaterializerFactory FACTORY = new PageMaterializerFactory() {
+        @Override
+        public PageMaterializer makeMaterializerWithNulls(ValuesReader dataReader, Object nullValue, int numValues) {
+            return new BooleanAsByteMaterializer(dataReader, (byte) nullValue, numValues);
+        }
+
+        @Override
+        public PageMaterializer makeMaterializerNonNull(ValuesReader dataReader, int numValues) {
+            return new BooleanAsByteMaterializer(dataReader, numValues);
+        }
+    };
+
+    private final ValuesReader dataReader;
+
+    private final byte nullValue;
+    private final byte[] data;
+
+    private BooleanAsByteMaterializer(ValuesReader dataReader, int numValues) {
+        this(dataReader, (byte) 0, numValues);
+    }
+
+    private BooleanAsByteMaterializer(ValuesReader dataReader, byte nullValue, int numValues) {
+        this.dataReader = dataReader;
+        this.nullValue = nullValue;
+        this.data = new byte[numValues];
+    }
+
+    @Override
+    public void fillNulls(int startIndex, int endIndex) {
+        Arrays.fill(data, startIndex, endIndex, nullValue);
+    }
+
+    @Override
+    public void fillValues(int startIndex, int endIndex) {
+        for (int ii = startIndex; ii < endIndex; ii++) {
+            data[ii] = (byte) (dataReader.readBoolean() ? 1 : 0);
+        }
+    }
+
+    @Override
+    public Object fillAll() {
+        fillValues(0, data.length);
+        return data;
+    }
+
+    @Override
+    public Object data() {
+        return data;
+    }
+}
diff --git a/extensions/parquet/base/src/main/java/io/deephaven/parquet/base/materializers/ByteMaterializer.java b/extensions/parquet/base/src/main/java/io/deephaven/parquet/base/materializers/ByteMaterializer.java
index 66477aed7c5..d110d91e564 100644
--- a/extensions/parquet/base/src/main/java/io/deephaven/parquet/base/materializers/ByteMaterializer.java
+++ b/extensions/parquet/base/src/main/java/io/deephaven/parquet/base/materializers/ByteMaterializer.java
@@ -15,7 +15,7 @@
 
 public class ByteMaterializer implements PageMaterializer {
 
-    public static final PageMaterializerFactory Factory = new PageMaterializerFactory() {
+    public static final PageMaterializerFactory FACTORY = new PageMaterializerFactory() {
         @Override
         public PageMaterializer makeMaterializerWithNulls(ValuesReader dataReader, Object nullValue, int numValues) {
             return new ByteMaterializer(dataReader, (byte) nullValue, numValues);
diff --git a/extensions/parquet/base/src/main/java/io/deephaven/parquet/base/materializers/CharMaterializer.java b/extensions/parquet/base/src/main/java/io/deephaven/parquet/base/materializers/CharMaterializer.java
index ee752bdecd8..ea3a28b4586 100644
--- a/extensions/parquet/base/src/main/java/io/deephaven/parquet/base/materializers/CharMaterializer.java
+++ b/extensions/parquet/base/src/main/java/io/deephaven/parquet/base/materializers/CharMaterializer.java
@@ -11,7 +11,7 @@
 
 public class CharMaterializer implements PageMaterializer {
 
-    public static final PageMaterializerFactory Factory = new PageMaterializerFactory() {
+    public static final PageMaterializerFactory FACTORY = new PageMaterializerFactory() {
         @Override
         public PageMaterializer makeMaterializerWithNulls(ValuesReader dataReader, Object nullValue, int numValues) {
             return new CharMaterializer(dataReader, (char) nullValue, numValues);
diff --git a/extensions/parquet/base/src/main/java/io/deephaven/parquet/base/materializers/DoubleFromFloatMaterializer.java b/extensions/parquet/base/src/main/java/io/deephaven/parquet/base/materializers/DoubleFromFloatMaterializer.java
new file mode 100644
index 00000000000..4d97c220c7a
--- /dev/null
+++ b/extensions/parquet/base/src/main/java/io/deephaven/parquet/base/materializers/DoubleFromFloatMaterializer.java
@@ -0,0 +1,45 @@
+//
+// Copyright (c) 2016-2024 Deephaven Data Labs and Patent Pending
+//
+// ****** AUTO-GENERATED CLASS - DO NOT EDIT MANUALLY
+// ****** Edit DoubleMaterializer and run "./gradlew replicatePageMaterializers" to regenerate
+//
+// @formatter:off
+package io.deephaven.parquet.base.materializers;
+
+import io.deephaven.parquet.base.PageMaterializer;
+import io.deephaven.parquet.base.PageMaterializerFactory;
+import org.apache.parquet.column.values.ValuesReader;
+
+public class DoubleFromFloatMaterializer extends DoubleMaterializerBase implements PageMaterializer {
+
+    public static final PageMaterializerFactory FACTORY = new PageMaterializerFactory() {
+        @Override
+        public PageMaterializer makeMaterializerWithNulls(ValuesReader dataReader, Object nullValue, int numValues) {
+            return new DoubleFromFloatMaterializer(dataReader, (double) nullValue, numValues);
+        }
+
+        @Override
+        public PageMaterializer makeMaterializerNonNull(ValuesReader dataReader, int numValues) {
+            return new DoubleFromFloatMaterializer(dataReader, numValues);
+        }
+    };
+
+    private final ValuesReader dataReader;
+
+    private DoubleFromFloatMaterializer(ValuesReader dataReader, int numValues) {
+        this(dataReader, 0, numValues);
+    }
+
+    private DoubleFromFloatMaterializer(ValuesReader dataReader, double nullValue, int numValues) {
+        super(nullValue, numValues);
+        this.dataReader = dataReader;
+    }
+
+    @Override
+    public void fillValues(int startIndex, int endIndex) {
+        for (int ii = startIndex; ii < endIndex; ii++) {
+            data[ii] = dataReader.readFloat();
+        }
+    }
+}
diff --git a/extensions/parquet/base/src/main/java/io/deephaven/parquet/base/materializers/DoubleMaterializer.java b/extensions/parquet/base/src/main/java/io/deephaven/parquet/base/materializers/DoubleMaterializer.java
index 2e373e20172..c8345eff522 100644
--- a/extensions/parquet/base/src/main/java/io/deephaven/parquet/base/materializers/DoubleMaterializer.java
+++ b/extensions/parquet/base/src/main/java/io/deephaven/parquet/base/materializers/DoubleMaterializer.java
@@ -2,7 +2,7 @@
 // Copyright (c) 2016-2024 Deephaven Data Labs and Patent Pending
 //
 // ****** AUTO-GENERATED CLASS - DO NOT EDIT MANUALLY
-// ****** Edit FloatMaterializer and run "./gradlew replicatePageMaterializers" to regenerate
+// ****** Edit LongMaterializer and run "./gradlew replicatePageMaterializers" to regenerate
 //
 // @formatter:off
 package io.deephaven.parquet.base.materializers;
@@ -11,11 +11,9 @@
 import io.deephaven.parquet.base.PageMaterializerFactory;
 import org.apache.parquet.column.values.ValuesReader;
 
-import java.util.Arrays;
+public class DoubleMaterializer extends DoubleMaterializerBase implements PageMaterializer {
 
-public class DoubleMaterializer implements PageMaterializer {
-
-    public static final PageMaterializerFactory Factory = new PageMaterializerFactory() {
+    public static final PageMaterializerFactory FACTORY = new PageMaterializerFactory() {
         @Override
         public PageMaterializer makeMaterializerWithNulls(ValuesReader dataReader, Object nullValue, int numValues) {
             return new DoubleMaterializer(dataReader, (double) nullValue, numValues);
@@ -29,22 +27,13 @@ public PageMaterializer makeMaterializerNonNull(ValuesReader dataReader, int num
 
     private final ValuesReader dataReader;
 
-    private final double nullValue;
-    private final double[] data;
-
     private DoubleMaterializer(ValuesReader dataReader, int numValues) {
         this(dataReader, 0, numValues);
     }
 
     private DoubleMaterializer(ValuesReader dataReader, double nullValue, int numValues) {
+        super(nullValue, numValues);
         this.dataReader = dataReader;
-        this.nullValue = nullValue;
-        this.data = new double[numValues];
-    }
-
-    @Override
-    public void fillNulls(int startIndex, int endIndex) {
-        Arrays.fill(data, startIndex, endIndex, nullValue);
     }
 
     @Override
@@ -53,15 +42,4 @@ public void fillValues(int startIndex, int endIndex) {
             data[ii] = dataReader.readDouble();
         }
     }
-
-    @Override
-    public Object fillAll() {
-        fillValues(0, data.length);
-        return data;
-    }
-
-    @Override
-    public Object data() {
-        return data;
-    }
 }
diff --git a/extensions/parquet/base/src/main/java/io/deephaven/parquet/base/materializers/DoubleMaterializerBase.java b/extensions/parquet/base/src/main/java/io/deephaven/parquet/base/materializers/DoubleMaterializerBase.java
new file mode 100644
index 00000000000..22e1c430f33
--- /dev/null
+++ b/extensions/parquet/base/src/main/java/io/deephaven/parquet/base/materializers/DoubleMaterializerBase.java
@@ -0,0 +1,39 @@
+//
+// Copyright (c) 2016-2024 Deephaven Data Labs and Patent Pending
+//
+// ****** AUTO-GENERATED CLASS - DO NOT EDIT MANUALLY
+// ****** Edit LongMaterializerBase and run "./gradlew replicatePageMaterializers" to regenerate
+//
+// @formatter:off
+package io.deephaven.parquet.base.materializers;
+
+import io.deephaven.parquet.base.PageMaterializer;
+
+import java.util.Arrays;
+
+abstract class DoubleMaterializerBase implements PageMaterializer {
+
+    private final double nullValue;
+    final double[] data;
+
+    DoubleMaterializerBase(double nullValue, int numValues) {
+        this.nullValue = nullValue;
+        this.data = new double[numValues];
+    }
+
+    @Override
+    public void fillNulls(int startIndex, int endIndex) {
+        Arrays.fill(data, startIndex, endIndex, nullValue);
+    }
+
+    @Override
+    public Object fillAll() {
+        fillValues(0, data.length);
+        return data;
+    }
+
+    @Override
+    public Object data() {
+        return data;
+    }
+}
diff --git a/extensions/parquet/base/src/main/java/io/deephaven/parquet/base/materializers/FloatMaterializer.java b/extensions/parquet/base/src/main/java/io/deephaven/parquet/base/materializers/FloatMaterializer.java
index fff9142984a..4e802b0b73b 100644
--- a/extensions/parquet/base/src/main/java/io/deephaven/parquet/base/materializers/FloatMaterializer.java
+++ b/extensions/parquet/base/src/main/java/io/deephaven/parquet/base/materializers/FloatMaterializer.java
@@ -11,7 +11,7 @@
 
 public class FloatMaterializer implements PageMaterializer {
 
-    public static final PageMaterializerFactory Factory = new PageMaterializerFactory() {
+    public static final PageMaterializerFactory FACTORY = new PageMaterializerFactory() {
         @Override
         public PageMaterializer makeMaterializerWithNulls(ValuesReader dataReader, Object nullValue, int numValues) {
             return new FloatMaterializer(dataReader, (float) nullValue, numValues);
diff --git a/extensions/parquet/base/src/main/java/io/deephaven/parquet/base/materializers/InstantFromInt96Materializer.java b/extensions/parquet/base/src/main/java/io/deephaven/parquet/base/materializers/InstantFromInt96Materializer.java
deleted file mode 100644
index 4782303467d..00000000000
--- a/extensions/parquet/base/src/main/java/io/deephaven/parquet/base/materializers/InstantFromInt96Materializer.java
+++ /dev/null
@@ -1,84 +0,0 @@
-//
-// Copyright (c) 2016-2024 Deephaven Data Labs and Patent Pending
-//
-package io.deephaven.parquet.base.materializers;
-
-import io.deephaven.configuration.Configuration;
-import io.deephaven.parquet.base.PageMaterializer;
-import io.deephaven.parquet.base.PageMaterializerFactory;
-import io.deephaven.time.DateTimeUtils;
-import org.apache.parquet.column.values.ValuesReader;
-import org.jetbrains.annotations.NotNull;
-
-import java.nio.ByteBuffer;
-import java.time.Instant;
-import java.time.ZoneId;
-
-/**
- * {@link PageMaterializer} implementation for {@link Instant Instants} stored as Int96s representing an Impala format
- * Timestamp (nanoseconds of day and Julian date encoded as 8 bytes and 4 bytes, respectively)
- */
-public class InstantFromInt96Materializer extends LongMaterializerBase implements PageMaterializer {
-
-    public static final PageMaterializerFactory Factory = new PageMaterializerFactory() {
-        @Override
-        public PageMaterializer makeMaterializerWithNulls(ValuesReader dataReader, Object nullValue, int numValues) {
-            return new InstantFromInt96Materializer(dataReader, (long) nullValue, numValues);
-        }
-
-        @Override
-        public PageMaterializer makeMaterializerNonNull(ValuesReader dataReader, int numValues) {
-            return new InstantFromInt96Materializer(dataReader, numValues);
-        }
-    };
-
-    /*
-     * Potential references/points of comparison for this algorithm: https://github.com/apache/iceberg/pull/1184/files
-     * https://github.com/apache/arrow/blob/master/cpp/src/parquet/types.h (last retrieved as
-     * https://github.com/apache/arrow/blob/d5a2aa2ffb1c2fc4f3ca48c829fcdba80ec67916/cpp/src/parquet/types.h)
-     */
-    private static final long NANOS_PER_DAY = 86400L * 1000 * 1000 * 1000;
-    private static final int JULIAN_OFFSET_TO_UNIX_EPOCH_DAYS = 2_440_588;
-    private static long offset;
-    static {
-        final String referenceTimeZone =
-                Configuration.getInstance().getStringWithDefault("deephaven.parquet.referenceTimeZone", "UTC");
-        setReferenceTimeZone(referenceTimeZone);
-    }
-
-    private final ValuesReader dataReader;
-
-    private InstantFromInt96Materializer(ValuesReader dataReader, int numValues) {
-        this(dataReader, 0, numValues);
-    }
-
-    private InstantFromInt96Materializer(ValuesReader dataReader, long nullValue, int numValues) {
-        super(nullValue, numValues);
-        this.dataReader = dataReader;
-    }
-
-    /**
-     * Allows overriding the time zone to be used when interpreting Int96 timestamp values. Default is UTC. Can be set
-     * globally with the parameter deephaven.parquet.referenceTimeZone. Valid values are time zone strings that would be
-     * used in {@link DateTimeUtils#parseInstant(String) parseInstant}, such as NY.
-     */
-    private static void setReferenceTimeZone(@NotNull final String timeZone) {
-        offset = DateTimeUtils.nanosOfDay(DateTimeUtils.parseInstant("1970-01-01T00:00:00 " + timeZone),
-                ZoneId.of("UTC"), false);
-    }
-
-    @Override
-    public void fillValues(int startIndex, int endIndex) {
-        for (int ii = startIndex; ii < endIndex; ii++) {
-            data[ii] = readInstantNanos();
-        }
-    }
-
-    long readInstantNanos() {
-        final ByteBuffer resultBuffer = ByteBuffer.wrap(dataReader.readBytes().getBytesUnsafe());
-        resultBuffer.order(java.nio.ByteOrder.LITTLE_ENDIAN);
-        final long nanos = resultBuffer.getLong();
-        final int julianDate = resultBuffer.getInt();
-        return (julianDate - JULIAN_OFFSET_TO_UNIX_EPOCH_DAYS) * (NANOS_PER_DAY) + nanos + offset;
-    }
-}
diff --git a/extensions/parquet/base/src/main/java/io/deephaven/parquet/base/materializers/InstantNanosFromInt96Materializer.java b/extensions/parquet/base/src/main/java/io/deephaven/parquet/base/materializers/InstantNanosFromInt96Materializer.java
new file mode 100644
index 00000000000..eb5f731cc6e
--- /dev/null
+++ b/extensions/parquet/base/src/main/java/io/deephaven/parquet/base/materializers/InstantNanosFromInt96Materializer.java
@@ -0,0 +1,84 @@
+//
+// Copyright (c) 2016-2024 Deephaven Data Labs and Patent Pending
+//
+package io.deephaven.parquet.base.materializers;
+
+import io.deephaven.configuration.Configuration;
+import io.deephaven.parquet.base.PageMaterializer;
+import io.deephaven.parquet.base.PageMaterializerFactory;
+import io.deephaven.time.DateTimeUtils;
+import org.apache.parquet.column.values.ValuesReader;
+import org.jetbrains.annotations.NotNull;
+
+import java.nio.ByteBuffer;
+import java.time.Instant;
+import java.time.ZoneId;
+
+/**
+ * {@link PageMaterializer} implementation for {@link Instant Instants} stored as Int96s representing an Impala format
+ * Timestamp (nanoseconds of day and Julian date encoded as 8 bytes and 4 bytes, respectively)
+ */
+public class InstantNanosFromInt96Materializer extends LongMaterializerBase implements PageMaterializer {
+
+    public static final PageMaterializerFactory FACTORY = new PageMaterializerFactory() {
+        @Override
+        public PageMaterializer makeMaterializerWithNulls(ValuesReader dataReader, Object nullValue, int numValues) {
+            return new InstantNanosFromInt96Materializer(dataReader, (long) nullValue, numValues);
+        }
+
+        @Override
+        public PageMaterializer makeMaterializerNonNull(ValuesReader dataReader, int numValues) {
+            return new InstantNanosFromInt96Materializer(dataReader, numValues);
+        }
+    };
+
+    /*
+     * Potential references/points of comparison for this algorithm: https://github.com/apache/iceberg/pull/1184/files
+     * https://github.com/apache/arrow/blob/master/cpp/src/parquet/types.h (last retrieved as
+     * https://github.com/apache/arrow/blob/d5a2aa2ffb1c2fc4f3ca48c829fcdba80ec67916/cpp/src/parquet/types.h)
+     */
+    private static final long NANOS_PER_DAY = 86400L * 1000 * 1000 * 1000;
+    private static final int JULIAN_OFFSET_TO_UNIX_EPOCH_DAYS = 2_440_588;
+    private static long offset;
+    static {
+        final String referenceTimeZone =
+                Configuration.getInstance().getStringWithDefault("deephaven.parquet.referenceTimeZone", "UTC");
+        setReferenceTimeZone(referenceTimeZone);
+    }
+
+    private final ValuesReader dataReader;
+
+    private InstantNanosFromInt96Materializer(ValuesReader dataReader, int numValues) {
+        this(dataReader, 0, numValues);
+    }
+
+    private InstantNanosFromInt96Materializer(ValuesReader dataReader, long nullValue, int numValues) {
+        super(nullValue, numValues);
+        this.dataReader = dataReader;
+    }
+
+    /**
+     * Allows overriding the time zone to be used when interpreting Int96 timestamp values. Default is UTC. Can be set
+     * globally with the parameter deephaven.parquet.referenceTimeZone. Valid values are time zone strings that would be
+     * used in {@link DateTimeUtils#parseInstant(String) parseInstant}, such as NY.
+     */
+    private static void setReferenceTimeZone(@NotNull final String timeZone) {
+        offset = DateTimeUtils.nanosOfDay(DateTimeUtils.parseInstant("1970-01-01T00:00:00 " + timeZone),
+                ZoneId.of("UTC"), false);
+    }
+
+    @Override
+    public void fillValues(int startIndex, int endIndex) {
+        for (int ii = startIndex; ii < endIndex; ii++) {
+            data[ii] = readInstantNanos();
+        }
+    }
+
+    long readInstantNanos() {
+        final ByteBuffer resultBuffer = ByteBuffer.wrap(dataReader.readBytes().getBytesUnsafe());
+        resultBuffer.order(java.nio.ByteOrder.LITTLE_ENDIAN);
+        final long nanos = resultBuffer.getLong();
+        final int julianDate = resultBuffer.getInt();
+        return (julianDate - JULIAN_OFFSET_TO_UNIX_EPOCH_DAYS) * (NANOS_PER_DAY) + nanos + offset;
+    }
+}
diff --git a/extensions/parquet/base/src/main/java/io/deephaven/parquet/base/materializers/InstantNanosFromMicrosMaterializer.java b/extensions/parquet/base/src/main/java/io/deephaven/parquet/base/materializers/InstantNanosFromMicrosMaterializer.java
index 751bf7ab1b0..97a25b6d6e0 100644
--- a/extensions/parquet/base/src/main/java/io/deephaven/parquet/base/materializers/InstantNanosFromMicrosMaterializer.java
+++ b/extensions/parquet/base/src/main/java/io/deephaven/parquet/base/materializers/InstantNanosFromMicrosMaterializer.java
@@ -10,7 +10,7 @@
 
 public class InstantNanosFromMicrosMaterializer extends LongMaterializerBase implements PageMaterializer {
 
-    public static final PageMaterializerFactory Factory = new PageMaterializerFactory() {
+    public static final PageMaterializerFactory FACTORY = new PageMaterializerFactory() {
         @Override
         public PageMaterializer makeMaterializerWithNulls(ValuesReader dataReader, Object nullValue, int numValues) {
             return new InstantNanosFromMicrosMaterializer(dataReader, (long) nullValue, numValues);
diff --git a/extensions/parquet/base/src/main/java/io/deephaven/parquet/base/materializers/InstantNanosFromMillisMaterializer.java b/extensions/parquet/base/src/main/java/io/deephaven/parquet/base/materializers/InstantNanosFromMillisMaterializer.java
index 9e7907a0f82..ee08531571c 100644
--- a/extensions/parquet/base/src/main/java/io/deephaven/parquet/base/materializers/InstantNanosFromMillisMaterializer.java
+++ b/extensions/parquet/base/src/main/java/io/deephaven/parquet/base/materializers/InstantNanosFromMillisMaterializer.java
@@ -14,7 +14,7 @@
 
 public class InstantNanosFromMillisMaterializer extends LongMaterializerBase implements PageMaterializer {
 
-    public static final PageMaterializerFactory Factory = new PageMaterializerFactory() {
+    public static final PageMaterializerFactory FACTORY = new PageMaterializerFactory() {
         @Override
         public PageMaterializer makeMaterializerWithNulls(ValuesReader dataReader, Object nullValue, int numValues) {
             return new InstantNanosFromMillisMaterializer(dataReader, (long) nullValue, numValues);
diff --git a/extensions/parquet/base/src/main/java/io/deephaven/parquet/base/materializers/IntFromBooleanMaterializer.java b/extensions/parquet/base/src/main/java/io/deephaven/parquet/base/materializers/IntFromBooleanMaterializer.java
new file mode 100644
index 00000000000..6255c5d6bde
--- /dev/null
+++ b/extensions/parquet/base/src/main/java/io/deephaven/parquet/base/materializers/IntFromBooleanMaterializer.java
@@ -0,0 +1,45 @@
+//
+// Copyright (c) 2016-2024 Deephaven Data Labs and Patent Pending
+//
+// ****** AUTO-GENERATED CLASS - DO NOT EDIT MANUALLY
+// ****** Edit IntMaterializer and run "./gradlew replicatePageMaterializers" to regenerate
+//
+// @formatter:off
+package io.deephaven.parquet.base.materializers;
+
+import io.deephaven.parquet.base.PageMaterializer;
+import io.deephaven.parquet.base.PageMaterializerFactory;
+import org.apache.parquet.column.values.ValuesReader;
+
+public class IntFromBooleanMaterializer extends IntMaterializerBase implements PageMaterializer {
+
+    public static final PageMaterializerFactory FACTORY = new PageMaterializerFactory() {
+        @Override
+        public PageMaterializer makeMaterializerWithNulls(ValuesReader dataReader, Object nullValue, int numValues) {
+            return new IntFromBooleanMaterializer(dataReader, (int) nullValue, numValues);
+        }
+
+        @Override
+        public PageMaterializer makeMaterializerNonNull(ValuesReader dataReader, int numValues) {
+            return new IntFromBooleanMaterializer(dataReader, numValues);
+        }
+    };
+
+    private final ValuesReader dataReader;
+
+    private IntFromBooleanMaterializer(ValuesReader dataReader, int numValues) {
+        this(dataReader, 0, numValues);
+    }
+
+    private IntFromBooleanMaterializer(ValuesReader dataReader, int nullValue, int numValues) {
+        super(nullValue, numValues);
+        this.dataReader = dataReader;
+    }
+
+    @Override
+    public void fillValues(int startIndex, int endIndex) {
+        for (int ii = startIndex; ii < endIndex; ii++) {
+            data[ii] = dataReader.readBoolean() ? 1 : 0;
+        }
+    }
+}
diff --git a/extensions/parquet/base/src/main/java/io/deephaven/parquet/base/materializers/IntFromUnsignedByteMaterializer.java b/extensions/parquet/base/src/main/java/io/deephaven/parquet/base/materializers/IntFromUnsignedByteMaterializer.java
new file mode 100644
index 00000000000..30b0ae5a86a
--- /dev/null
+++ b/extensions/parquet/base/src/main/java/io/deephaven/parquet/base/materializers/IntFromUnsignedByteMaterializer.java
@@ -0,0 +1,45 @@
+//
+// Copyright (c) 2016-2024 Deephaven Data Labs and Patent Pending
+//
+// ****** AUTO-GENERATED CLASS - DO NOT EDIT MANUALLY
+// ****** Edit LongFromUnsignedShortMaterializer and run "./gradlew replicatePageMaterializers" to regenerate
+//
+// @formatter:off
+package io.deephaven.parquet.base.materializers;
+
+import io.deephaven.parquet.base.PageMaterializer;
+import io.deephaven.parquet.base.PageMaterializerFactory;
+import org.apache.parquet.column.values.ValuesReader;
+
+public class IntFromUnsignedByteMaterializer extends IntMaterializerBase implements PageMaterializer {
+
+    public static final PageMaterializerFactory FACTORY = new PageMaterializerFactory() {
+        @Override
+        public PageMaterializer makeMaterializerWithNulls(ValuesReader dataReader, Object nullValue, int numValues) {
+            return new IntFromUnsignedByteMaterializer(dataReader, (int) nullValue, numValues);
+        }
+
+        @Override
+        public PageMaterializer makeMaterializerNonNull(ValuesReader dataReader, int numValues) {
+            return new IntFromUnsignedByteMaterializer(dataReader, numValues);
+        }
+    };
+
+    private final ValuesReader dataReader;
+
+    private IntFromUnsignedByteMaterializer(ValuesReader dataReader, int numValues) {
+        this(dataReader, 0, numValues);
+    }
+
+    private IntFromUnsignedByteMaterializer(ValuesReader dataReader, int nullValue, int numValues) {
+        super(nullValue, numValues);
+        this.dataReader = dataReader;
+    }
+
+    @Override
+    public void fillValues(int startIndex, int endIndex) {
+        for (int ii = startIndex; ii < endIndex; ii++) {
+            data[ii] = Byte.toUnsignedInt((byte) dataReader.readInteger());
+        }
+    }
+}
diff --git a/extensions/parquet/base/src/main/java/io/deephaven/parquet/base/materializers/IntFromUnsignedShortMaterializer.java b/extensions/parquet/base/src/main/java/io/deephaven/parquet/base/materializers/IntFromUnsignedShortMaterializer.java
new file mode 100644
index 00000000000..369a83d56db
--- /dev/null
+++ b/extensions/parquet/base/src/main/java/io/deephaven/parquet/base/materializers/IntFromUnsignedShortMaterializer.java
@@ -0,0 +1,45 @@
+//
+// Copyright (c) 2016-2024 Deephaven Data Labs and Patent Pending
+//
+// ****** AUTO-GENERATED CLASS - DO NOT EDIT MANUALLY
+// ****** Edit LongFromUnsignedShortMaterializer and run "./gradlew replicatePageMaterializers" to regenerate
+//
+// @formatter:off
+package io.deephaven.parquet.base.materializers;
+
+import io.deephaven.parquet.base.PageMaterializer;
+import io.deephaven.parquet.base.PageMaterializerFactory;
+import org.apache.parquet.column.values.ValuesReader;
+
+public class IntFromUnsignedShortMaterializer extends IntMaterializerBase implements PageMaterializer {
+
+    public static final PageMaterializerFactory FACTORY = new PageMaterializerFactory() {
+        @Override
+        public PageMaterializer makeMaterializerWithNulls(ValuesReader dataReader, Object nullValue, int numValues) {
+            return new IntFromUnsignedShortMaterializer(dataReader, (int) nullValue, numValues);
+        }
+
+        @Override
+        public PageMaterializer makeMaterializerNonNull(ValuesReader dataReader, int numValues) {
+            return new IntFromUnsignedShortMaterializer(dataReader, numValues);
+        }
+    };
+
+    private final ValuesReader dataReader;
+
+    private IntFromUnsignedShortMaterializer(ValuesReader dataReader, int numValues) {
+        this(dataReader, 0, numValues);
+    }
+
+    private IntFromUnsignedShortMaterializer(ValuesReader dataReader, int nullValue, int numValues) {
+        super(nullValue, numValues);
+        this.dataReader = dataReader;
+    }
+
+    @Override
+    public void fillValues(int startIndex, int endIndex) {
+        for (int ii = startIndex; ii < endIndex; ii++) {
+            data[ii] = Short.toUnsignedInt((short) dataReader.readInteger());
+        }
+    }
+}
diff --git a/extensions/parquet/base/src/main/java/io/deephaven/parquet/base/materializers/IntMaterializer.java b/extensions/parquet/base/src/main/java/io/deephaven/parquet/base/materializers/IntMaterializer.java
index 847ea3a3e18..9b6f423c08a 100644
--- a/extensions/parquet/base/src/main/java/io/deephaven/parquet/base/materializers/IntMaterializer.java
+++ b/extensions/parquet/base/src/main/java/io/deephaven/parquet/base/materializers/IntMaterializer.java
@@ -2,7 +2,7 @@
 // Copyright (c) 2016-2024 Deephaven Data Labs and Patent Pending
 //
 // ****** AUTO-GENERATED CLASS - DO NOT EDIT MANUALLY
-// ****** Edit FloatMaterializer and run "./gradlew replicatePageMaterializers" to regenerate
+// ****** Edit LongMaterializer and run "./gradlew replicatePageMaterializers" to regenerate
 //
 // @formatter:off
 package io.deephaven.parquet.base.materializers;
@@ -11,11 +11,9 @@
 import io.deephaven.parquet.base.PageMaterializerFactory;
 import org.apache.parquet.column.values.ValuesReader;
 
-import java.util.Arrays;
+public class IntMaterializer extends IntMaterializerBase implements PageMaterializer {
 
-public class IntMaterializer implements PageMaterializer {
-
-    public static final PageMaterializerFactory Factory = new PageMaterializerFactory() {
+    public static final PageMaterializerFactory FACTORY = new PageMaterializerFactory() {
         @Override
         public PageMaterializer makeMaterializerWithNulls(ValuesReader dataReader, Object nullValue, int numValues) {
             return new IntMaterializer(dataReader, (int) nullValue, numValues);
@@ -29,22 +27,13 @@ public PageMaterializer makeMaterializerNonNull(ValuesReader dataReader, int num
 
     private final ValuesReader dataReader;
 
-    private final int nullValue;
-    private final int[] data;
-
     private IntMaterializer(ValuesReader dataReader, int numValues) {
         this(dataReader, 0, numValues);
     }
 
     private IntMaterializer(ValuesReader dataReader, int nullValue, int numValues) {
+        super(nullValue, numValues);
         this.dataReader = dataReader;
-        this.nullValue = nullValue;
-        this.data = new int[numValues];
-    }
-
-    @Override
-    public void fillNulls(int startIndex, int endIndex) {
-        Arrays.fill(data, startIndex, endIndex, nullValue);
     }
 
     @Override
@@ -53,15 +42,4 @@ public void fillValues(int startIndex, int endIndex) {
             data[ii] = dataReader.readInteger();
         }
     }
-
-    @Override
-    public Object fillAll() {
-        fillValues(0, data.length);
-        return data;
-    }
-
-    @Override
-    public Object data() {
-        return data;
-    }
 }
diff --git a/extensions/parquet/base/src/main/java/io/deephaven/parquet/base/materializers/IntMaterializerBase.java b/extensions/parquet/base/src/main/java/io/deephaven/parquet/base/materializers/IntMaterializerBase.java
new file mode 100644
index 00000000000..a307e0c36d7
--- /dev/null
+++ b/extensions/parquet/base/src/main/java/io/deephaven/parquet/base/materializers/IntMaterializerBase.java
@@ -0,0 +1,39 @@
+//
+// Copyright (c) 2016-2024 Deephaven Data Labs and Patent Pending
+//
+// ****** AUTO-GENERATED CLASS - DO NOT EDIT MANUALLY
+// ****** Edit LongMaterializerBase and run "./gradlew replicatePageMaterializers" to regenerate
+//
+// @formatter:off
+package io.deephaven.parquet.base.materializers;
+
+import io.deephaven.parquet.base.PageMaterializer;
+
+import java.util.Arrays;
+
+abstract class IntMaterializerBase implements PageMaterializer {
+
+    private final int nullValue;
+    final int[] data;
+
+    IntMaterializerBase(int nullValue, int numValues) {
+        this.nullValue = nullValue;
+        this.data = new int[numValues];
+    }
+
+    @Override
+    public void fillNulls(int startIndex, int endIndex) {
+        Arrays.fill(data, startIndex, endIndex, nullValue);
+    }
+
+    @Override
+    public Object fillAll() {
+        fillValues(0, data.length);
+        return data;
+    }
+
+    @Override
+    public Object data() {
+        return data;
+    }
+}
diff --git a/extensions/parquet/base/src/main/java/io/deephaven/parquet/base/materializers/LocalDateMaterializer.java b/extensions/parquet/base/src/main/java/io/deephaven/parquet/base/materializers/LocalDateMaterializer.java
index 202e54d83cb..5cd7a76c298 100644
--- a/extensions/parquet/base/src/main/java/io/deephaven/parquet/base/materializers/LocalDateMaterializer.java
+++ b/extensions/parquet/base/src/main/java/io/deephaven/parquet/base/materializers/LocalDateMaterializer.java
@@ -12,7 +12,7 @@
 
 public class LocalDateMaterializer extends ObjectMaterializerBase<LocalDate> implements PageMaterializer {
 
-    public static final PageMaterializerFactory Factory = new PageMaterializerFactory() {
+    public static final PageMaterializerFactory FACTORY = new PageMaterializerFactory() {
         @Override
         public PageMaterializer makeMaterializerWithNulls(ValuesReader dataReader, Object nullValue, int numValues) {
             return new LocalDateMaterializer(dataReader, (LocalDate) nullValue, numValues);
diff --git a/extensions/parquet/base/src/main/java/io/deephaven/parquet/base/materializers/LocalDateTimeFromMicrosMaterializer.java b/extensions/parquet/base/src/main/java/io/deephaven/parquet/base/materializers/LocalDateTimeFromMicrosMaterializer.java
index 022586e6a73..e8b37cc889b 100644
--- a/extensions/parquet/base/src/main/java/io/deephaven/parquet/base/materializers/LocalDateTimeFromMicrosMaterializer.java
+++ b/extensions/parquet/base/src/main/java/io/deephaven/parquet/base/materializers/LocalDateTimeFromMicrosMaterializer.java
@@ -17,7 +17,7 @@
 public class LocalDateTimeFromMicrosMaterializer extends ObjectMaterializerBase<LocalDateTime>
         implements PageMaterializer {
 
-    public static final PageMaterializerFactory Factory = new PageMaterializerFactory() {
+    public static final PageMaterializerFactory FACTORY = new PageMaterializerFactory() {
         @Override
         public PageMaterializer makeMaterializerWithNulls(ValuesReader dataReader, Object nullValue, int numValues) {
             return new LocalDateTimeFromMicrosMaterializer(dataReader, (LocalDateTime) nullValue, numValues);
diff --git a/extensions/parquet/base/src/main/java/io/deephaven/parquet/base/materializers/LocalDateTimeFromMillisMaterializer.java b/extensions/parquet/base/src/main/java/io/deephaven/parquet/base/materializers/LocalDateTimeFromMillisMaterializer.java
index 7f2f5ec1f92..023be3cdd97 100644
--- a/extensions/parquet/base/src/main/java/io/deephaven/parquet/base/materializers/LocalDateTimeFromMillisMaterializer.java
+++ b/extensions/parquet/base/src/main/java/io/deephaven/parquet/base/materializers/LocalDateTimeFromMillisMaterializer.java
@@ -13,7 +13,7 @@
 public class LocalDateTimeFromMillisMaterializer extends ObjectMaterializerBase<LocalDateTime>
         implements PageMaterializer {
 
-    public static final PageMaterializerFactory Factory = new PageMaterializerFactory() {
+    public static final PageMaterializerFactory FACTORY = new PageMaterializerFactory() {
         @Override
         public PageMaterializer makeMaterializerWithNulls(ValuesReader dataReader, Object nullValue, int numValues) {
             return new LocalDateTimeFromMillisMaterializer(dataReader, (LocalDateTime) nullValue, numValues);
diff --git a/extensions/parquet/base/src/main/java/io/deephaven/parquet/base/materializers/LocalDateTimeFromNanosMaterializer.java b/extensions/parquet/base/src/main/java/io/deephaven/parquet/base/materializers/LocalDateTimeFromNanosMaterializer.java
index ae3f66bd813..9fd20c3b6ec 100644
--- a/extensions/parquet/base/src/main/java/io/deephaven/parquet/base/materializers/LocalDateTimeFromNanosMaterializer.java
+++ b/extensions/parquet/base/src/main/java/io/deephaven/parquet/base/materializers/LocalDateTimeFromNanosMaterializer.java
@@ -17,7 +17,7 @@
 public class LocalDateTimeFromNanosMaterializer extends ObjectMaterializerBase<LocalDateTime>
         implements PageMaterializer {
 
-    public static final PageMaterializerFactory Factory = new PageMaterializerFactory() {
+    public static final PageMaterializerFactory FACTORY = new PageMaterializerFactory() {
         @Override
         public PageMaterializer makeMaterializerWithNulls(ValuesReader dataReader, Object nullValue, int numValues) {
             return new LocalDateTimeFromNanosMaterializer(dataReader, (LocalDateTime) nullValue, numValues);
diff --git a/extensions/parquet/base/src/main/java/io/deephaven/parquet/base/materializers/LocalTimeFromMicrosMaterializer.java b/extensions/parquet/base/src/main/java/io/deephaven/parquet/base/materializers/LocalTimeFromMicrosMaterializer.java
index b276c808e4c..9067936bf5b 100644
--- a/extensions/parquet/base/src/main/java/io/deephaven/parquet/base/materializers/LocalTimeFromMicrosMaterializer.java
+++ b/extensions/parquet/base/src/main/java/io/deephaven/parquet/base/materializers/LocalTimeFromMicrosMaterializer.java
@@ -12,7 +12,7 @@
 
 public class LocalTimeFromMicrosMaterializer extends ObjectMaterializerBase<LocalTime> implements PageMaterializer {
 
-    public static final PageMaterializerFactory Factory = new PageMaterializerFactory() {
+    public static final PageMaterializerFactory FACTORY = new PageMaterializerFactory() {
         @Override
         public PageMaterializer makeMaterializerWithNulls(ValuesReader dataReader, Object nullValue, int numValues) {
             return new LocalTimeFromMicrosMaterializer(dataReader, (LocalTime) nullValue, numValues);
diff --git a/extensions/parquet/base/src/main/java/io/deephaven/parquet/base/materializers/LocalTimeFromMillisMaterializer.java b/extensions/parquet/base/src/main/java/io/deephaven/parquet/base/materializers/LocalTimeFromMillisMaterializer.java
index aed1d7e6308..aaf3aeaed4e 100644
--- a/extensions/parquet/base/src/main/java/io/deephaven/parquet/base/materializers/LocalTimeFromMillisMaterializer.java
+++ b/extensions/parquet/base/src/main/java/io/deephaven/parquet/base/materializers/LocalTimeFromMillisMaterializer.java
@@ -16,7 +16,7 @@
 
 public class LocalTimeFromMillisMaterializer extends ObjectMaterializerBase<LocalTime> implements PageMaterializer {
 
-    public static final PageMaterializerFactory Factory = new PageMaterializerFactory() {
+    public static final PageMaterializerFactory FACTORY = new PageMaterializerFactory() {
         @Override
         public PageMaterializer makeMaterializerWithNulls(ValuesReader dataReader, Object nullValue, int numValues) {
             return new LocalTimeFromMillisMaterializer(dataReader, (LocalTime) nullValue, numValues);
diff --git a/extensions/parquet/base/src/main/java/io/deephaven/parquet/base/materializers/LocalTimeFromNanosMaterializer.java b/extensions/parquet/base/src/main/java/io/deephaven/parquet/base/materializers/LocalTimeFromNanosMaterializer.java
index 75e707442c9..28f34528344 100644
--- a/extensions/parquet/base/src/main/java/io/deephaven/parquet/base/materializers/LocalTimeFromNanosMaterializer.java
+++ b/extensions/parquet/base/src/main/java/io/deephaven/parquet/base/materializers/LocalTimeFromNanosMaterializer.java
@@ -16,7 +16,7 @@
 
 public class LocalTimeFromNanosMaterializer extends ObjectMaterializerBase<LocalTime> implements PageMaterializer {
 
-    public static final PageMaterializerFactory Factory = new PageMaterializerFactory() {
+    public static final PageMaterializerFactory FACTORY = new PageMaterializerFactory() {
         @Override
         public PageMaterializer makeMaterializerWithNulls(ValuesReader dataReader, Object nullValue, int numValues) {
             return new LocalTimeFromNanosMaterializer(dataReader, (LocalTime) nullValue, numValues);
diff --git a/extensions/parquet/base/src/main/java/io/deephaven/parquet/base/materializers/LongFromBooleanMaterializer.java b/extensions/parquet/base/src/main/java/io/deephaven/parquet/base/materializers/LongFromBooleanMaterializer.java
new file mode 100644
index 00000000000..b3ff8fea210
--- /dev/null
+++ b/extensions/parquet/base/src/main/java/io/deephaven/parquet/base/materializers/LongFromBooleanMaterializer.java
@@ -0,0 +1,45 @@
+//
+// Copyright (c) 2016-2024 Deephaven Data Labs and Patent Pending
+//
+// ****** AUTO-GENERATED CLASS - DO NOT EDIT MANUALLY
+// ****** Edit LongMaterializer and run "./gradlew replicatePageMaterializers" to regenerate
+//
+// @formatter:off
+package io.deephaven.parquet.base.materializers;
+
+import io.deephaven.parquet.base.PageMaterializer;
+import io.deephaven.parquet.base.PageMaterializerFactory;
+import org.apache.parquet.column.values.ValuesReader;
+
+public class LongFromBooleanMaterializer extends LongMaterializerBase implements PageMaterializer {
+
+    public static final PageMaterializerFactory FACTORY = new PageMaterializerFactory() {
+        @Override
+        public PageMaterializer makeMaterializerWithNulls(ValuesReader dataReader, Object nullValue, int numValues) {
+            return new LongFromBooleanMaterializer(dataReader, (long) nullValue, numValues);
+        }
+
+        @Override
+        public PageMaterializer makeMaterializerNonNull(ValuesReader dataReader, int numValues) {
+            return new LongFromBooleanMaterializer(dataReader, numValues);
+        }
+    };
+
+    private final ValuesReader dataReader;
+
+    private LongFromBooleanMaterializer(ValuesReader dataReader, int numValues) {
+        this(dataReader, 0, numValues);
+    }
+
+    private LongFromBooleanMaterializer(ValuesReader dataReader, long nullValue, int numValues) {
+        super(nullValue, numValues);
+        this.dataReader = dataReader;
+    }
+
+    @Override
+    public void fillValues(int startIndex, int endIndex) {
+        for (int ii = startIndex; ii < endIndex; ii++) {
+            data[ii] = dataReader.readBoolean() ? 1 : 0;
+        }
+    }
+}
diff --git a/extensions/parquet/base/src/main/java/io/deephaven/parquet/base/materializers/LongFromIntMaterializer.java b/extensions/parquet/base/src/main/java/io/deephaven/parquet/base/materializers/LongFromIntMaterializer.java
new file mode 100644
index 00000000000..a2359344597
--- /dev/null
+++ b/extensions/parquet/base/src/main/java/io/deephaven/parquet/base/materializers/LongFromIntMaterializer.java
@@ -0,0 +1,45 @@
+//
+// Copyright (c) 2016-2024 Deephaven Data Labs and Patent Pending
+//
+// ****** AUTO-GENERATED CLASS - DO NOT EDIT MANUALLY
+// ****** Edit LongMaterializer and run "./gradlew replicatePageMaterializers" to regenerate
+//
+// @formatter:off
+package io.deephaven.parquet.base.materializers;
+
+import io.deephaven.parquet.base.PageMaterializer;
+import io.deephaven.parquet.base.PageMaterializerFactory;
+import org.apache.parquet.column.values.ValuesReader;
+
+public class LongFromIntMaterializer extends LongMaterializerBase implements PageMaterializer {
+
+    public static final PageMaterializerFactory FACTORY = new PageMaterializerFactory() {
+        @Override
+        public PageMaterializer makeMaterializerWithNulls(ValuesReader dataReader, Object nullValue, int numValues) {
+            return new LongFromIntMaterializer(dataReader, (long) nullValue, numValues);
+        }
+
+        @Override
+        public PageMaterializer makeMaterializerNonNull(ValuesReader dataReader, int numValues) {
+            return new LongFromIntMaterializer(dataReader, numValues);
+        }
+    };
+
+    private final ValuesReader dataReader;
+
+    private LongFromIntMaterializer(ValuesReader dataReader, int numValues) {
+        this(dataReader, 0, numValues);
+    }
+
+    private LongFromIntMaterializer(ValuesReader dataReader, long nullValue, int numValues) {
+        super(nullValue, numValues);
+        this.dataReader = dataReader;
+    }
+
+    @Override
+    public void fillValues(int startIndex, int endIndex) {
+        for (int ii = startIndex; ii < endIndex; ii++) {
+            data[ii] = dataReader.readInteger();
+        }
+    }
+}
diff --git a/extensions/parquet/base/src/main/java/io/deephaven/parquet/base/materializers/LongFromUnsignedByteMaterializer.java b/extensions/parquet/base/src/main/java/io/deephaven/parquet/base/materializers/LongFromUnsignedByteMaterializer.java
new file mode 100644
index 00000000000..014d6f2d487
--- /dev/null
+++ b/extensions/parquet/base/src/main/java/io/deephaven/parquet/base/materializers/LongFromUnsignedByteMaterializer.java
@@ -0,0 +1,45 @@
+//
+// Copyright (c) 2016-2024 Deephaven Data Labs and Patent Pending
+//
+// ****** AUTO-GENERATED CLASS - DO NOT EDIT MANUALLY
+// ****** Edit LongFromUnsignedShortMaterializer and run "./gradlew replicatePageMaterializers" to regenerate
+//
+// @formatter:off
+package io.deephaven.parquet.base.materializers;
+
+import io.deephaven.parquet.base.PageMaterializer;
+import io.deephaven.parquet.base.PageMaterializerFactory;
+import org.apache.parquet.column.values.ValuesReader;
+
+public class LongFromUnsignedByteMaterializer extends LongMaterializerBase implements PageMaterializer {
+
+    public static final PageMaterializerFactory FACTORY = new PageMaterializerFactory() {
+        @Override
+        public PageMaterializer makeMaterializerWithNulls(ValuesReader dataReader, Object nullValue, int numValues) {
+            return new LongFromUnsignedByteMaterializer(dataReader, (long) nullValue, numValues);
+        }
+
+        @Override
+        public PageMaterializer makeMaterializerNonNull(ValuesReader dataReader, int numValues) {
+            return new LongFromUnsignedByteMaterializer(dataReader, numValues);
+        }
+    };
+
+    private final ValuesReader dataReader;
+
+    private LongFromUnsignedByteMaterializer(ValuesReader dataReader, int numValues) {
+        this(dataReader, 0, numValues);
+    }
+
+    private LongFromUnsignedByteMaterializer(ValuesReader dataReader, long nullValue, int numValues) {
+        super(nullValue, numValues);
+        this.dataReader = dataReader;
+    }
+
+    @Override
+    public void fillValues(int startIndex, int endIndex) {
+        for (int ii = startIndex; ii < endIndex; ii++) {
+            data[ii] = Byte.toUnsignedLong((byte) dataReader.readInteger());
+        }
+    }
+}
diff --git a/extensions/parquet/base/src/main/java/io/deephaven/parquet/base/materializers/LongFromUnsignedIntMaterializer.java b/extensions/parquet/base/src/main/java/io/deephaven/parquet/base/materializers/LongFromUnsignedIntMaterializer.java
index add4270f164..cd37ad39c6a 100644
--- a/extensions/parquet/base/src/main/java/io/deephaven/parquet/base/materializers/LongFromUnsignedIntMaterializer.java
+++ b/extensions/parquet/base/src/main/java/io/deephaven/parquet/base/materializers/LongFromUnsignedIntMaterializer.java
@@ -1,6 +1,10 @@
 //
 // Copyright (c) 2016-2024 Deephaven Data Labs and Patent Pending
 //
+// ****** AUTO-GENERATED CLASS - DO NOT EDIT MANUALLY
+// ****** Edit LongFromUnsignedShortMaterializer and run "./gradlew replicatePageMaterializers" to regenerate
+//
+// @formatter:off
 package io.deephaven.parquet.base.materializers;
 
 import io.deephaven.parquet.base.PageMaterializer;
@@ -9,7 +13,7 @@
 
 public class LongFromUnsignedIntMaterializer extends LongMaterializerBase implements PageMaterializer {
 
-    public static final PageMaterializerFactory Factory = new PageMaterializerFactory() {
+    public static final PageMaterializerFactory FACTORY = new PageMaterializerFactory() {
         @Override
         public PageMaterializer makeMaterializerWithNulls(ValuesReader dataReader, Object nullValue, int numValues) {
             return new LongFromUnsignedIntMaterializer(dataReader, (long) nullValue, numValues);
@@ -35,7 +39,7 @@ private LongFromUnsignedIntMaterializer(ValuesReader dataReader, long nullValue,
     @Override
     public void fillValues(int startIndex, int endIndex) {
         for (int ii = startIndex; ii < endIndex; ii++) {
-            data[ii] = Integer.toUnsignedLong(dataReader.readInteger());
+            data[ii] = Integer.toUnsignedLong((int) dataReader.readInteger());
         }
     }
 }
diff --git a/extensions/parquet/base/src/main/java/io/deephaven/parquet/base/materializers/LongFromUnsignedShortMaterializer.java b/extensions/parquet/base/src/main/java/io/deephaven/parquet/base/materializers/LongFromUnsignedShortMaterializer.java
new file mode 100644
index 00000000000..cf6f10049b8
--- /dev/null
+++ b/extensions/parquet/base/src/main/java/io/deephaven/parquet/base/materializers/LongFromUnsignedShortMaterializer.java
@@ -0,0 +1,41 @@
+//
+// Copyright (c) 2016-2024 Deephaven Data Labs and Patent Pending
+//
+package io.deephaven.parquet.base.materializers;
+
+import io.deephaven.parquet.base.PageMaterializer;
+import io.deephaven.parquet.base.PageMaterializerFactory;
+import org.apache.parquet.column.values.ValuesReader;
+
+public class LongFromUnsignedShortMaterializer extends LongMaterializerBase implements PageMaterializer {
+
+    public static final PageMaterializerFactory FACTORY = new PageMaterializerFactory() {
+        @Override
+        public PageMaterializer makeMaterializerWithNulls(ValuesReader dataReader, Object nullValue, int numValues) {
+            return new LongFromUnsignedShortMaterializer(dataReader, (long) nullValue, numValues);
+        }
+
+        @Override
+        public PageMaterializer makeMaterializerNonNull(ValuesReader dataReader, int numValues) {
+            return new LongFromUnsignedShortMaterializer(dataReader, numValues);
+        }
+    };
+
+    private final ValuesReader dataReader;
+
+    private LongFromUnsignedShortMaterializer(ValuesReader dataReader, int numValues) {
+        this(dataReader, 0, numValues);
+    }
+
+    private LongFromUnsignedShortMaterializer(ValuesReader dataReader, long nullValue, int numValues) {
+        super(nullValue, numValues);
+        this.dataReader = dataReader;
+    }
+
+    @Override
+    public void fillValues(int startIndex, int endIndex) {
+        for (int ii = startIndex; ii < endIndex; ii++) {
+            data[ii] = Short.toUnsignedLong((short) dataReader.readInteger());
+        }
+    }
+}
diff --git a/extensions/parquet/base/src/main/java/io/deephaven/parquet/base/materializers/LongMaterializer.java b/extensions/parquet/base/src/main/java/io/deephaven/parquet/base/materializers/LongMaterializer.java
index 9f57f184ddb..f28bc8cdcc7 100644
--- a/extensions/parquet/base/src/main/java/io/deephaven/parquet/base/materializers/LongMaterializer.java
+++ b/extensions/parquet/base/src/main/java/io/deephaven/parquet/base/materializers/LongMaterializer.java
@@ -9,7 +9,7 @@
 
 public class LongMaterializer extends LongMaterializerBase implements PageMaterializer {
 
-    public static final PageMaterializerFactory Factory = new PageMaterializerFactory() {
+    public static final PageMaterializerFactory FACTORY = new PageMaterializerFactory() {
         @Override
         public PageMaterializer makeMaterializerWithNulls(ValuesReader dataReader, Object nullValue, int numValues) {
             return new LongMaterializer(dataReader, (long) nullValue, numValues);
diff --git a/extensions/parquet/base/src/main/java/io/deephaven/parquet/base/materializers/ObjectMaterializer.java b/extensions/parquet/base/src/main/java/io/deephaven/parquet/base/materializers/ObjectMaterializer.java
new file mode 100644
index 00000000000..fe542b83c1b
--- /dev/null
+++ b/extensions/parquet/base/src/main/java/io/deephaven/parquet/base/materializers/ObjectMaterializer.java
@@ -0,0 +1,59 @@
+//
+// Copyright (c) 2016-2024 Deephaven Data Labs and Patent Pending
+//
+package io.deephaven.parquet.base.materializers;
+
+import io.deephaven.parquet.base.PageMaterializer;
+import io.deephaven.parquet.base.PageMaterializerFactory;
+import io.deephaven.util.codec.ObjectCodec;
+import org.apache.parquet.column.values.ValuesReader;
+
+import java.lang.reflect.Array;
+
+public class ObjectMaterializer<TYPE> extends ObjectMaterializerBase<TYPE> implements PageMaterializer {
+
+    public static final class Factory<TYPE> implements PageMaterializerFactory {
+
+        final ObjectCodec<TYPE> codec;
+        final Class<TYPE> nativeType;
+
+        public Factory(ObjectCodec<TYPE> codec, final Class<TYPE> nativeType) {
+            this.codec = codec;
+            this.nativeType = nativeType;
+        }
+
+        @Override
+        public PageMaterializer makeMaterializerWithNulls(ValuesReader dataReader, Object nullValue, int numValues) {
+            // noinspection unchecked
+            return new ObjectMaterializer<>(dataReader, (TYPE) nullValue, numValues, codec, nativeType);
+        }
+
+        @Override
+        public PageMaterializer makeMaterializerNonNull(ValuesReader dataReader, int numValues) {
+            return new ObjectMaterializer<>(dataReader, numValues, codec, nativeType);
+        }
+    };
+
+    private final ValuesReader dataReader;
+    private final ObjectCodec<TYPE> codec;
+
+    private ObjectMaterializer(ValuesReader dataReader, int numValues, final ObjectCodec<TYPE> codec,
+            final Class<TYPE> nativeType) {
+        this(dataReader, null, numValues, codec, nativeType);
+    }
+
+    private ObjectMaterializer(ValuesReader dataReader, TYPE nullValue, int numValues, final ObjectCodec<TYPE> codec,
+            final Class<TYPE> nativeType) {
+        // noinspection unchecked
+        super(nullValue, (TYPE[]) Array.newInstance(nativeType, numValues));
+        this.dataReader = dataReader;
+        this.codec = codec;
+    }
+
+    @Override
+    public void fillValues(int startIndex, int endIndex) {
+        for (int ii = startIndex; ii < endIndex; ii++) {
+            data[ii] = codec.decode(dataReader.readBytes().toByteBuffer());
+        }
+    }
+}
diff --git a/extensions/parquet/base/src/main/java/io/deephaven/parquet/base/materializers/ShortFromBooleanMaterializer.java b/extensions/parquet/base/src/main/java/io/deephaven/parquet/base/materializers/ShortFromBooleanMaterializer.java
new file mode 100644
index 00000000000..df09abb1b8f
--- /dev/null
+++ b/extensions/parquet/base/src/main/java/io/deephaven/parquet/base/materializers/ShortFromBooleanMaterializer.java
@@ -0,0 +1,45 @@
+//
+// Copyright (c) 2016-2024 Deephaven Data Labs and Patent Pending
+//
+// ****** AUTO-GENERATED CLASS - DO NOT EDIT MANUALLY
+// ****** Edit ShortMaterializer and run "./gradlew replicatePageMaterializers" to regenerate
+//
+// @formatter:off
+package io.deephaven.parquet.base.materializers;
+
+import io.deephaven.parquet.base.PageMaterializer;
+import io.deephaven.parquet.base.PageMaterializerFactory;
+import org.apache.parquet.column.values.ValuesReader;
+
+public class ShortFromBooleanMaterializer extends ShortMaterializerBase implements PageMaterializer {
+
+    public static final PageMaterializerFactory FACTORY = new PageMaterializerFactory() {
+        @Override
+        public PageMaterializer makeMaterializerWithNulls(ValuesReader dataReader, Object nullValue, int numValues) {
+            return new ShortFromBooleanMaterializer(dataReader, (short) nullValue, numValues);
+        }
+
+        @Override
+        public PageMaterializer makeMaterializerNonNull(ValuesReader dataReader, int numValues) {
+            return new ShortFromBooleanMaterializer(dataReader, numValues);
+        }
+    };
+
+    private final ValuesReader dataReader;
+
+    private ShortFromBooleanMaterializer(ValuesReader dataReader, int numValues) {
+        this(dataReader, (short) 0, numValues);
+    }
+
+    private ShortFromBooleanMaterializer(ValuesReader dataReader, short nullValue, int numValues) {
+        super(nullValue, numValues);
+        this.dataReader = dataReader;
+    }
+
+    @Override
+    public void fillValues(int startIndex, int endIndex) {
+        for (int ii = startIndex; ii < endIndex; ii++) {
+            data[ii] = (short) (dataReader.readBoolean() ? 1 : 0);
+        }
+    }
+}
diff --git a/extensions/parquet/base/src/main/java/io/deephaven/parquet/base/materializers/ShortFromUnsignedByteMaterializer.java b/extensions/parquet/base/src/main/java/io/deephaven/parquet/base/materializers/ShortFromUnsignedByteMaterializer.java
new file mode 100644
index 00000000000..833724a06cc
--- /dev/null
+++ b/extensions/parquet/base/src/main/java/io/deephaven/parquet/base/materializers/ShortFromUnsignedByteMaterializer.java
@@ -0,0 +1,41 @@
+//
+// Copyright (c) 2016-2024 Deephaven Data Labs and Patent Pending
+//
+package io.deephaven.parquet.base.materializers;
+
+import io.deephaven.parquet.base.PageMaterializer;
+import io.deephaven.parquet.base.PageMaterializerFactory;
+import org.apache.parquet.column.values.ValuesReader;
+
+public class ShortFromUnsignedByteMaterializer extends ShortMaterializerBase implements PageMaterializer {
+
+    public static final PageMaterializerFactory FACTORY = new PageMaterializerFactory() {
+        @Override
+        public PageMaterializer makeMaterializerWithNulls(ValuesReader dataReader, Object nullValue, int numValues) {
+            return new ShortFromUnsignedByteMaterializer(dataReader, (short) nullValue, numValues);
+        }
+
+        @Override
+        public PageMaterializer makeMaterializerNonNull(ValuesReader dataReader, int numValues) {
+            return new ShortFromUnsignedByteMaterializer(dataReader, numValues);
+        }
+    };
+
+    private final ValuesReader dataReader;
+
+    private ShortFromUnsignedByteMaterializer(ValuesReader dataReader, int numValues) {
+        this(dataReader, (short) 0, numValues);
+    }
+
+    private ShortFromUnsignedByteMaterializer(ValuesReader dataReader, short nullValue, int numValues) {
+        super(nullValue, numValues);
+        this.dataReader = dataReader;
+    }
+
+    @Override
+    public void fillValues(int startIndex, int endIndex) {
+        for (int ii = startIndex; ii < endIndex; ii++) {
+            data[ii] = (short) Byte.toUnsignedInt((byte) dataReader.readInteger());
+        }
+    }
+}
diff --git a/extensions/parquet/base/src/main/java/io/deephaven/parquet/base/materializers/ShortMaterializer.java b/extensions/parquet/base/src/main/java/io/deephaven/parquet/base/materializers/ShortMaterializer.java
index cff03881692..cfc389081f0 100644
--- a/extensions/parquet/base/src/main/java/io/deephaven/parquet/base/materializers/ShortMaterializer.java
+++ b/extensions/parquet/base/src/main/java/io/deephaven/parquet/base/materializers/ShortMaterializer.java
@@ -2,7 +2,7 @@
 // Copyright (c) 2016-2024 Deephaven Data Labs and Patent Pending
 //
 // ****** AUTO-GENERATED CLASS - DO NOT EDIT MANUALLY
-// ****** Edit CharMaterializer and run "./gradlew replicatePageMaterializers" to regenerate
+// ****** Edit LongMaterializer and run "./gradlew replicatePageMaterializers" to regenerate
 //
 // @formatter:off
 package io.deephaven.parquet.base.materializers;
@@ -11,11 +11,9 @@
 import io.deephaven.parquet.base.PageMaterializerFactory;
 import org.apache.parquet.column.values.ValuesReader;
 
-import java.util.Arrays;
+public class ShortMaterializer extends ShortMaterializerBase implements PageMaterializer {
 
-public class ShortMaterializer implements PageMaterializer {
-
-    public static final PageMaterializerFactory Factory = new PageMaterializerFactory() {
+    public static final PageMaterializerFactory FACTORY = new PageMaterializerFactory() {
         @Override
         public PageMaterializer makeMaterializerWithNulls(ValuesReader dataReader, Object nullValue, int numValues) {
             return new ShortMaterializer(dataReader, (short) nullValue, numValues);
@@ -29,22 +27,13 @@ public PageMaterializer makeMaterializerNonNull(ValuesReader dataReader, int num
 
     private final ValuesReader dataReader;
 
-    private final short nullValue;
-    private final short[] data;
-
     private ShortMaterializer(ValuesReader dataReader, int numValues) {
         this(dataReader, (short) 0, numValues);
     }
 
     private ShortMaterializer(ValuesReader dataReader, short nullValue, int numValues) {
+        super(nullValue, numValues);
         this.dataReader = dataReader;
-        this.nullValue = nullValue;
-        this.data = new short[numValues];
-    }
-
-    @Override
-    public void fillNulls(int startIndex, int endIndex) {
-        Arrays.fill(data, startIndex, endIndex, nullValue);
     }
 
     @Override
@@ -53,15 +42,4 @@ public void fillValues(int startIndex, int endIndex) {
             data[ii] = (short) dataReader.readInteger();
         }
     }
-
-    @Override
-    public Object fillAll() {
-        fillValues(0, data.length);
-        return data;
-    }
-
-    @Override
-    public Object data() {
-        return data;
-    }
 }
diff --git a/extensions/parquet/base/src/main/java/io/deephaven/parquet/base/materializers/ShortMaterializerBase.java b/extensions/parquet/base/src/main/java/io/deephaven/parquet/base/materializers/ShortMaterializerBase.java
new file mode 100644
index 00000000000..ff9265748e5
--- /dev/null
+++ b/extensions/parquet/base/src/main/java/io/deephaven/parquet/base/materializers/ShortMaterializerBase.java
@@ -0,0 +1,39 @@
+//
+// Copyright (c) 2016-2024 Deephaven Data Labs and Patent Pending
+//
+// ****** AUTO-GENERATED CLASS - DO NOT EDIT MANUALLY
+// ****** Edit LongMaterializerBase and run "./gradlew replicatePageMaterializers" to regenerate
+//
+// @formatter:off
+package io.deephaven.parquet.base.materializers;
+
+import io.deephaven.parquet.base.PageMaterializer;
+
+import java.util.Arrays;
+
+abstract class ShortMaterializerBase implements PageMaterializer {
+
+    private final short nullValue;
+    final short[] data;
+
+    ShortMaterializerBase(short nullValue, int numValues) {
+        this.nullValue = nullValue;
+        this.data = new short[numValues];
+    }
+
+    @Override
+    public void fillNulls(int startIndex, int endIndex) {
+        Arrays.fill(data, startIndex, endIndex, nullValue);
+    }
+
+    @Override
+    public Object fillAll() {
+        fillValues(0, data.length);
+        return data;
+    }
+
+    @Override
+    public Object data() {
+        return data;
+    }
+}
diff --git a/extensions/parquet/base/src/main/java/io/deephaven/parquet/base/materializers/StringMaterializer.java b/extensions/parquet/base/src/main/java/io/deephaven/parquet/base/materializers/StringMaterializer.java
index b594aeb351e..b179c5fb5e9 100644
--- a/extensions/parquet/base/src/main/java/io/deephaven/parquet/base/materializers/StringMaterializer.java
+++ b/extensions/parquet/base/src/main/java/io/deephaven/parquet/base/materializers/StringMaterializer.java
@@ -9,7 +9,7 @@
 
 public class StringMaterializer extends ObjectMaterializerBase<String> implements PageMaterializer {
 
-    public static final PageMaterializerFactory Factory = new PageMaterializerFactory() {
+    public static final PageMaterializerFactory FACTORY = new PageMaterializerFactory() {
         @Override
         public PageMaterializer makeMaterializerWithNulls(ValuesReader dataReader, Object nullValue, int numValues) {
             return new StringMaterializer(dataReader, (String) nullValue, numValues);
diff --git a/extensions/parquet/benchmark/build.gradle b/extensions/parquet/benchmark/build.gradle
index eb76219b9f3..a2a1109908c 100644
--- a/extensions/parquet/benchmark/build.gradle
+++ b/extensions/parquet/benchmark/build.gradle
@@ -20,8 +20,8 @@ dependencies {
     testImplementation TestTools.projectDependency(project, 'engine-rowset')
     testImplementation TestTools.projectDependency(project, 'engine-table')
 
-    testAnnotationProcessor 'org.openjdk.jmh:jmh-generator-annprocess:1.21'
-    testCompileOnly 'org.openjdk.jmh:jmh-generator-annprocess:1.21'
+    testAnnotationProcessor libs.jmh.generator.annprocess
+    testCompileOnly libs.jmh.generator.annprocess
 
     testRuntimeOnly project(path: ':configs')
     testRuntimeOnly project(path: ':test-configs')
diff --git a/extensions/parquet/compression/build.gradle b/extensions/parquet/compression/build.gradle
index 26ce52b1cc3..1e39b94910d 100644
--- a/extensions/parquet/compression/build.gradle
+++ b/extensions/parquet/compression/build.gradle
@@ -1,32 +1,34 @@
 plugins {
     id 'java-library'
     id 'io.deephaven.project.register'
+    id 'io.deephaven.hadoop-common-dependencies'
 }
 
 dependencies {
     api project(':Util')
 
-    Classpaths.inheritParquetHadoop(project)
-    Classpaths.inheritParquetHadoopConfiguration(project)
+    implementation libs.parquet.hadoop
+    // Also inherits hadoop-common, see io.deephaven.hadoop-common-dependencies
 
     implementation project(':Configuration')
 
-    implementation depCommonsIo
+    implementation libs.commons.io
+    implementation project(':IO')
 
-    Classpaths.inheritGuava(project)
+    implementation libs.guava
 
-    compileOnly depAnnotations
+    compileOnly libs.jetbrains.annotations
 
-    runtimeOnly('org.lz4:lz4-java:1.8.0') {
+    runtimeOnly(libs.lz4.java) {
         // also consider lz4-pure-java to avoid native code
         because 'hadoop-common required dependency for LZ4Codec'
     }
     // Pick up default jvm-compatible compression codecs
-    implementation('io.airlift:aircompressor:0.27') {
+    implementation(libs.airlift.aircompressor) {
         because 'Provides Lz4, LZO, Zstd compression support for parquet'
     }
 
-    implementation('org.xerial.snappy:snappy-java:1.1.10.5') {
+    implementation(libs.snappy.java) {
         because 'Provides snappy compression for parquet, with native support for all platforms deephaven works on'
     }
 }
diff --git a/extensions/parquet/compression/src/main/java/io/deephaven/parquet/compress/CompressorAdapter.java b/extensions/parquet/compression/src/main/java/io/deephaven/parquet/compress/CompressorAdapter.java
index 86d710b5296..bfdf8875d4d 100644
--- a/extensions/parquet/compression/src/main/java/io/deephaven/parquet/compress/CompressorAdapter.java
+++ b/extensions/parquet/compression/src/main/java/io/deephaven/parquet/compress/CompressorAdapter.java
@@ -5,13 +5,12 @@
 
 import io.deephaven.util.SafeCloseable;
 import org.apache.hadoop.io.compress.Decompressor;
-import org.apache.parquet.bytes.BytesInput;
 import org.apache.parquet.hadoop.metadata.CompressionCodecName;
 
+import java.io.FilterInputStream;
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.OutputStream;
-import java.util.function.Function;
 import java.util.function.Supplier;
 
 /**
@@ -33,10 +32,12 @@ public CompressionCodecName getCodecName() {
         }
 
         @Override
-        public BytesInput decompress(final InputStream inputStream, final int compressedSize,
+        public InputStream decompress(
+                final InputStream inputStream,
+                final int compressedSize,
                 final int uncompressedSize,
-                final Function<Supplier<SafeCloseable>, SafeCloseable> decompressorCache) {
-            return BytesInput.from(inputStream, compressedSize);
+                final ResourceCache decompressorCache) {
+            return inputStream;
         }
 
         @Override
@@ -46,6 +47,63 @@ public void reset() {}
         public void close() {}
     };
 
+    /**
+     * Reads exactly {@code length} number of bytes from the input stream into the provided byte array.
+     *
+     * @param in The input stream to read from
+     * @param bytes The byte array to read into
+     * @param offset The offset in the byte array to start reading at
+     * @param length The number of bytes to read
+     * @throws IOException If an error occurs while reading from the input stream
+     * @throws IllegalArgumentException If the byte array is too small to read {@code length} number of bytes
+     * @throws IOException If the expected number of bytes could not be read
+     */
+    static void readNBytes(final InputStream in, final byte[] bytes, final int offset, final int length)
+            throws IOException {
+        if (length > bytes.length - offset) {
+            throw new IllegalArgumentException("Bytes array of length " + bytes.length + " with offset " + offset +
+                    " is too small to read " + length + " bytes");
+        }
+        readNBytesHelper(in, bytes, offset, length);
+    }
+
+    /**
+     * Reads exactly {@code length} number of bytes from the input stream into a new byte array and returns it.
+     *
+     * @see #readNBytesHelper(InputStream, byte[], int, int)
+     */
+    static byte[] readNBytes(final InputStream in, final int length) throws IOException {
+        final byte[] bytes = new byte[length];
+        readNBytesHelper(in, bytes, 0, length);
+        return bytes;
+    }
+
+    private static void readNBytesHelper(final InputStream in, final byte[] bytes, final int offset, final int length)
+            throws IOException {
+        int numRead = 0;
+        while (numRead < length) {
+            final int count = in.read(bytes, offset + numRead, length - numRead);
+            if (count == -1) {
+                throw new IOException("Expected to read " + length + " bytes, but read " + numRead + " bytes");
+            }
+            numRead += count;
+        }
+    }
+
+    /**
+     * An {@link InputStream} that will not close the underlying stream when {@link InputStream#close()} is called.
+     */
+    final class InputStreamNoClose extends FilterInputStream {
+        InputStreamNoClose(final InputStream in) {
+            super(in);
+        }
+
+        @Override
+        public void close() {
+            // Do not close the underlying stream.
+        }
+    }
+
     /**
      * Creates a new output stream that will take uncompressed writes, and flush data to the provided stream as
      * compressed data.
@@ -58,9 +116,17 @@ public void close() {}
      */
     OutputStream compress(OutputStream os) throws IOException;
 
+    interface ResourceCache {
+        DecompressorHolder get(Supplier<DecompressorHolder> factory);
+    }
+
     /**
-     * Returns an in-memory instance of BytesInput containing the fully decompressed results of the input stream. The
-     * provided {@link DecompressorHolder} is used for decompressing if compatible with the compression codec.
+     * Creates a new input stream that will read compressed data from the provided stream, and return uncompressed data.
+     * Caller should not close the returned {@link InputStream} because this might return an internally cached
+     * decompressor to the pool. Also, callers should not read more data from the returned {@link InputStream} after
+     * closing the argument {@code inputStream}.
+     * <p>
+     * The provided {@link DecompressorHolder} is used for decompressing if compatible with the compression codec.
      * Otherwise, a new decompressor is created and set in the DecompressorHolder.
      * <p>
      * Note that this method is thread safe, assuming the cached decompressor instances are not shared across threads.
@@ -69,11 +135,14 @@ public void close() {}
      * @param compressedSize the number of bytes in the compressed data
      * @param uncompressedSize the number of bytes that should be present when decompressed
      * @param decompressorCache Used to cache {@link Decompressor} instances for reuse
-     * @return the decompressed bytes, copied into memory
+     * @return an input stream that will return uncompressed data
      * @throws IOException thrown if an error occurs reading data.
      */
-    BytesInput decompress(InputStream inputStream, int compressedSize, int uncompressedSize,
-            Function<Supplier<SafeCloseable>, SafeCloseable> decompressorCache) throws IOException;
+    InputStream decompress(
+            InputStream inputStream,
+            int compressedSize,
+            int uncompressedSize,
+            ResourceCache decompressorCache) throws IOException;
 
     /**
      * @return the CompressionCodecName enum value that represents this compressor.
diff --git a/extensions/parquet/compression/src/main/java/io/deephaven/parquet/compress/DecompressorHolder.java b/extensions/parquet/compression/src/main/java/io/deephaven/parquet/compress/DecompressorHolder.java
index e64dd37c859..2a9d17e89fd 100644
--- a/extensions/parquet/compression/src/main/java/io/deephaven/parquet/compress/DecompressorHolder.java
+++ b/extensions/parquet/compression/src/main/java/io/deephaven/parquet/compress/DecompressorHolder.java
@@ -11,7 +11,7 @@
 
 import javax.annotation.Nullable;
 
-class DecompressorHolder implements SafeCloseable {
+public class DecompressorHolder implements SafeCloseable {
     private CompressionCodecName codecName;
     private Decompressor decompressor;
 
@@ -52,6 +52,8 @@ Decompressor getDecompressor() {
     @Override
     public void close() {
         if (decompressor != null) {
+            // No need to reset the decompressor before returning it to the pool; CodecPool.returnDecompressor resets it
+            // internally.
             CodecPool.returnDecompressor(decompressor);
             codecName = null;
             decompressor = null;
diff --git a/extensions/parquet/compression/src/main/java/io/deephaven/parquet/compress/DeephavenCompressorAdapterFactory.java b/extensions/parquet/compression/src/main/java/io/deephaven/parquet/compress/DeephavenCompressorAdapterFactory.java
index 66d8ebbeef3..489e0946c35 100644
--- a/extensions/parquet/compression/src/main/java/io/deephaven/parquet/compress/DeephavenCompressorAdapterFactory.java
+++ b/extensions/parquet/compression/src/main/java/io/deephaven/parquet/compress/DeephavenCompressorAdapterFactory.java
@@ -8,16 +8,12 @@
 import io.airlift.compress.lz4.Lz4Codec;
 import io.airlift.compress.lzo.LzoCodec;
 import io.airlift.compress.zstd.ZstdCodec;
-import io.deephaven.util.SafeCloseable;
-import org.apache.commons.io.IOUtils;
 import org.apache.hadoop.conf.Configuration;
 import org.apache.hadoop.io.compress.CodecPool;
 import org.apache.hadoop.io.compress.CompressionCodec;
 import org.apache.hadoop.io.compress.CompressionCodecFactory;
-import org.apache.hadoop.io.compress.CompressionInputStream;
 import org.apache.hadoop.io.compress.Compressor;
 import org.apache.hadoop.io.compress.Decompressor;
-import org.apache.parquet.bytes.BytesInput;
 import org.apache.parquet.hadoop.codec.SnappyCodec;
 import org.apache.parquet.hadoop.codec.Lz4RawCodec;
 import org.apache.parquet.hadoop.metadata.CompressionCodecName;
@@ -32,8 +28,6 @@
 import java.util.Map;
 import java.util.Map.Entry;
 import java.util.Objects;
-import java.util.function.Function;
-import java.util.function.Supplier;
 
 
 /**
@@ -128,20 +122,23 @@ public CompressionCodecName getCodecName() {
         }
 
         @Override
-        public BytesInput decompress(final InputStream inputStream, final int compressedSize,
+        public InputStream decompress(
+                final InputStream inputStream,
+                final int compressedSize,
                 final int uncompressedSize,
-                final Function<Supplier<SafeCloseable>, SafeCloseable> decompressorCache) throws IOException {
+                final ResourceCache decompressorCache) throws IOException {
             final Decompressor decompressor;
             if (canCreateDecompressorObject) {
                 // Currently, we only cache a single decompressor object inside the holder. If needed in the future, we
                 // can cache multiple decompressor objects based on the codec name.
-                final DecompressorHolder decompressorHolder =
-                        (DecompressorHolder) decompressorCache.apply(DecompressorHolder::new);
+                final DecompressorHolder decompressorHolder = decompressorCache.get(DecompressorHolder::new);
                 if (decompressorHolder.holdsDecompressor(compressionCodecName)) {
                     decompressor = decompressorHolder.getDecompressor();
                     decompressor.reset();
                 } else {
                     decompressor = CodecPool.getDecompressor(compressionCodec);
+                    // Not resetting decompressor here since it's either a new instance or was reset when previously
+                    // returned to the pool
                     if (decompressor == null) {
                         canCreateCompressorObject = false;
                     } else {
@@ -151,17 +148,10 @@ public BytesInput decompress(final InputStream inputStream, final int compressed
             } else {
                 decompressor = null;
             }
-            try {
-                // Note that we don't close the decompressed stream because doing so may return the decompressor to the
-                // pool
-                final InputStream buffered = ByteStreams.limit(IOUtils.buffer(inputStream), compressedSize);
-                final CompressionInputStream decompressed = compressionCodec.createInputStream(buffered, decompressor);
-                return BytesInput.copy(BytesInput.from(decompressed, uncompressedSize));
-            } finally {
-                if (decompressor != null) {
-                    decompressor.reset();
-                }
-            }
+            // Note that we don't want the caller to close the decompressed stream because doing so may return the
+            // decompressor to the pool.
+            final InputStream limitedInputStream = ByteStreams.limit(inputStream, compressedSize);
+            return new InputStreamNoClose(compressionCodec.createInputStream(limitedInputStream, decompressor));
         }
 
         @Override
diff --git a/extensions/parquet/compression/src/main/java/io/deephaven/parquet/compress/LZ4WithLZ4RawBackupCompressorAdapter.java b/extensions/parquet/compression/src/main/java/io/deephaven/parquet/compress/LZ4WithLZ4RawBackupCompressorAdapter.java
index 1a8a91fad70..aa5aefee2c5 100644
--- a/extensions/parquet/compression/src/main/java/io/deephaven/parquet/compress/LZ4WithLZ4RawBackupCompressorAdapter.java
+++ b/extensions/parquet/compression/src/main/java/io/deephaven/parquet/compress/LZ4WithLZ4RawBackupCompressorAdapter.java
@@ -3,16 +3,15 @@
 //
 package io.deephaven.parquet.compress;
 
-import io.deephaven.util.SafeCloseable;
+import io.deephaven.io.streams.ByteBufferInputStream;
+import org.apache.commons.io.IOUtils;
 import org.apache.hadoop.io.compress.CompressionCodec;
-import org.apache.parquet.bytes.BytesInput;
 import org.apache.parquet.hadoop.metadata.CompressionCodecName;
 
 import java.io.BufferedInputStream;
+import java.io.ByteArrayInputStream;
 import java.io.IOException;
 import java.io.InputStream;
-import java.util.function.Function;
-import java.util.function.Supplier;
 
 /**
  * This is the default adapter for LZ4 files. It attempts to decompress with LZ4 and falls back to LZ4_RAW on failure.
@@ -30,7 +29,7 @@ private enum DecompressionMode {
     /**
      * Only initialized if we hit an exception while decompressing with LZ4.
      */
-    private CompressorAdapter lz4RawAdapter = null;
+    private CompressorAdapter lz4RawAdapter;
 
     LZ4WithLZ4RawBackupCompressorAdapter(CompressionCodec compressionCodec,
             CompressionCodecName compressionCodecName) {
@@ -38,8 +37,11 @@ private enum DecompressionMode {
     }
 
     @Override
-    public BytesInput decompress(final InputStream inputStream, final int compressedSize,
-            final int uncompressedSize, final Function<Supplier<SafeCloseable>, SafeCloseable> decompressorCache)
+    public InputStream decompress(
+            final InputStream inputStream,
+            final int compressedSize,
+            final int uncompressedSize,
+            final ResourceCache decompressorCache)
             throws IOException {
         if (mode == DecompressionMode.LZ4) {
             return super.decompress(inputStream, compressedSize, uncompressedSize, decompressorCache);
@@ -49,19 +51,24 @@ public BytesInput decompress(final InputStream inputStream, final int compressed
             return lz4RawAdapter.decompress(inputStream, compressedSize, uncompressedSize, decompressorCache);
         }
         // Buffer input data in case we need to retry with LZ4_RAW.
-        final BufferedInputStream bufferedInputStream = new BufferedInputStream(inputStream, compressedSize);
+        final BufferedInputStream bufferedInputStream = IOUtils.buffer(inputStream, compressedSize);
         bufferedInputStream.mark(compressedSize);
-        BytesInput ret;
         try {
-            ret = super.decompress(bufferedInputStream, compressedSize, uncompressedSize, decompressorCache);
+            // Try to decompress the bytes with LZ4 first.
+            final InputStream decompressedInput =
+                    super.decompress(bufferedInputStream, compressedSize, uncompressedSize, decompressorCache);
+            final byte[] decompressedBytes = CompressorAdapter.readNBytes(decompressedInput, uncompressedSize);
+            // If we got here, we successfully decompressed with LZ4.
             mode = DecompressionMode.LZ4;
-        } catch (IOException e) {
-            bufferedInputStream.reset();
-            lz4RawAdapter = DeephavenCompressorAdapterFactory.getInstance().getByName("LZ4_RAW");
-            ret = lz4RawAdapter.decompress(bufferedInputStream, compressedSize, uncompressedSize, decompressorCache);
-            mode = DecompressionMode.LZ4_RAW;
+            return new ByteArrayInputStream(decompressedBytes);
+        } catch (final IOException ignored) {
         }
-        return ret;
+
+        // Retry with LZ4_RAW.
+        lz4RawAdapter = DeephavenCompressorAdapterFactory.getInstance().getByName("LZ4_RAW");
+        mode = DecompressionMode.LZ4_RAW;
+        bufferedInputStream.reset();
+        return lz4RawAdapter.decompress(bufferedInputStream, compressedSize, uncompressedSize, decompressorCache);
     }
 
     @Override
diff --git a/extensions/parquet/table/build.gradle b/extensions/parquet/table/build.gradle
index 789b90c571f..5b7d43ddf67 100644
--- a/extensions/parquet/table/build.gradle
+++ b/extensions/parquet/table/build.gradle
@@ -24,44 +24,52 @@ dependencies {
     api project(':engine-api')
     api project(':engine-stringset')
     api project(':engine-table')
+    api project(':codec-api')
 
     implementation project(':extensions-parquet-base')
-    Classpaths.inheritParquetHadoop(project)
+    implementation libs.parquet.hadoop
 
     implementation project(':engine-base')
     implementation project(':extensions-csv')
     implementation project(':log-factory')
     implementation project(':Configuration')
-    implementation depCommonsLang3
     implementation project(':Util')
+    implementation project(':codec-builtin')
+    implementation project(':codec-cache')
 
-    Classpaths.inheritCommonsText(project, 'implementation')
+    implementation libs.commons.lang3
+    implementation libs.commons.text
+    implementation libs.commons.compress
 
-    Classpaths.inheritJacksonPlatform(project)
-    implementation 'com.fasterxml.jackson.dataformat:jackson-dataformat-yaml'
-    implementation 'com.fasterxml.jackson.datatype:jackson-datatype-jdk8'
+    implementation platform(libs.jackson.bom)
+    implementation libs.jackson.dataformat.yaml
+    implementation libs.jackson.datatype.jdk8
 
-    Classpaths.inheritImmutables(project)
+    compileOnly project(':util-immutables')
+    annotationProcessor libs.immutables.value
 
-    compileOnly 'com.google.code.findbugs:jsr305:3.0.2'
+    compileOnly libs.google.findbugs.jsr305
 
     testImplementation project(':base-test-utils')
     testImplementation project(':engine-test-utils')
 
     testImplementation TestTools.projectDependency(project, 'extensions-s3')
-    Classpaths.inheritJUnitClassic(project, 'testImplementation')
+    testImplementation libs.junit4
 
-    Classpaths.inheritTestContainers(project)
+    testImplementation libs.testcontainers
+    testImplementation libs.testcontainers.junit.jupiter
+    testImplementation libs.testcontainers.localstack
+    testImplementation libs.testcontainers.minio
 
     testRuntimeOnly project(':log-to-slf4j'),
             project(path: ':configs'),
             project(path: ':test-configs')
-    Classpaths.inheritSlf4j(project, 'slf4j-simple', 'testRuntimeOnly')
+    testRuntimeOnly libs.slf4j.simple
 
     runtimeOnly project(':extensions-trackedfile')
 
     brotliTestImplementation project(':extensions-parquet-table')
-    brotliTestImplementation('com.github.rdblue:brotli-codec:0.1.1')
+    brotliTestImplementation(libs.rdblue.brotli.codec)
     brotliTestRuntimeOnly project(':log-to-slf4j'),
                          project(path: ':configs'),
                          project(path: ':test-configs')
diff --git a/extensions/parquet/table/src/main/java/io/deephaven/parquet/table/CompletedParquetWrite.java b/extensions/parquet/table/src/main/java/io/deephaven/parquet/table/CompletedParquetWrite.java
new file mode 100644
index 00000000000..90ab4989a03
--- /dev/null
+++ b/extensions/parquet/table/src/main/java/io/deephaven/parquet/table/CompletedParquetWrite.java
@@ -0,0 +1,61 @@
+//
+// Copyright (c) 2016-2024 Deephaven Data Labs and Patent Pending
+//
+package io.deephaven.parquet.table;
+
+import io.deephaven.annotations.BuildableStyle;
+import org.immutables.value.Value;
+
+import java.net.URI;
+
+/**
+ * This class is used as a return POJO for the result of a Parquet write operation.
+ * <p>
+ * It is intended to be used with the {@link ParquetInstructions#onWriteCompleted()} callback.
+ */
+@Value.Immutable
+@BuildableStyle
+public abstract class CompletedParquetWrite {
+    /**
+     * The destination URI of the written Parquet file.
+     */
+    public abstract URI destination();
+
+    /**
+     * The number of rows written to the Parquet file.
+     */
+    public abstract long numRows();
+
+    /**
+     * The number of bytes written to the Parquet file.
+     */
+    public abstract long numBytes();
+
+    public static Builder builder() {
+        return ImmutableCompletedParquetWrite.builder();
+    }
+
+    interface Builder {
+        Builder destination(URI destination);
+
+        Builder numRows(long numRows);
+
+        Builder numBytes(long numBytes);
+
+        CompletedParquetWrite build();
+    }
+
+    @Value.Check
+    final void numRowsBoundsCheck() {
+        if (numRows() < 0) {
+            throw new IllegalArgumentException("numRows must be non-negative");
+        }
+    }
+
+    @Value.Check
+    final void numBytesBoundsCheck() {
+        if (numBytes() <= 0) {
+            throw new IllegalArgumentException("numBytes must be positive");
+        }
+    }
+}
diff --git a/extensions/parquet/table/src/main/java/io/deephaven/parquet/table/MappedSchema.java b/extensions/parquet/table/src/main/java/io/deephaven/parquet/table/MappedSchema.java
index d818443bb58..f6ce19a4bb5 100644
--- a/extensions/parquet/table/src/main/java/io/deephaven/parquet/table/MappedSchema.java
+++ b/extensions/parquet/table/src/main/java/io/deephaven/parquet/table/MappedSchema.java
@@ -7,6 +7,7 @@
 import io.deephaven.engine.table.ColumnDefinition;
 import io.deephaven.engine.table.ColumnSource;
 import io.deephaven.engine.table.TableDefinition;
+import io.deephaven.util.annotations.VisibleForTesting;
 import org.apache.parquet.schema.MessageType;
 import org.apache.parquet.schema.Type;
 import org.apache.parquet.schema.Types;
@@ -21,30 +22,35 @@
  */
 class MappedSchema {
 
+    @VisibleForTesting
+    static final String SCHEMA_NAME = "root";
+
     static MappedSchema create(
             final Map<String, Map<ParquetCacheTags, Object>> computedCache,
             final TableDefinition definition,
             final RowSet rowSet,
             final Map<String, ? extends ColumnSource<?>> columnSourceMap,
-            final ParquetInstructions instructions,
-            final ColumnDefinition<?>... extraColumns) {
+            final ParquetInstructions instructions) {
         final MessageTypeBuilder builder = Types.buildMessage();
         for (final ColumnDefinition<?> columnDefinition : definition.getColumns()) {
-            TypeInfos.TypeInfo typeInfo =
-                    getTypeInfo(computedCache, columnDefinition, rowSet, columnSourceMap, instructions);
-            Type schemaType = typeInfo.createSchemaType(columnDefinition, instructions);
-            builder.addField(schemaType);
-        }
-
-        for (final ColumnDefinition<?> extraColumn : extraColumns) {
-            builder.addField(getTypeInfo(computedCache, extraColumn, rowSet, columnSourceMap, instructions)
-                    .createSchemaType(extraColumn, instructions));
+            builder.addField(createType(computedCache, columnDefinition, rowSet, columnSourceMap, instructions));
         }
-
-        final MessageType schema = builder.named("root");
+        final MessageType schema = builder.named(SCHEMA_NAME);
         return new MappedSchema(definition, schema);
     }
 
+    @VisibleForTesting
+    static Type createType(
+            final Map<String, Map<ParquetCacheTags, Object>> computedCache,
+            final ColumnDefinition<?> columnDefinition,
+            final RowSet rowSet,
+            final Map<String, ? extends ColumnSource<?>> columnSourceMap,
+            final ParquetInstructions instructions) {
+        final TypeInfos.TypeInfo typeInfo =
+                getTypeInfo(computedCache, columnDefinition, rowSet, columnSourceMap, instructions);
+        return typeInfo.createSchemaType(columnDefinition, instructions);
+    }
+
     private final TableDefinition tableDefinition;
     private final MessageType parquetSchema;
 
diff --git a/extensions/parquet/table/src/main/java/io/deephaven/parquet/table/ParquetInstructions.java b/extensions/parquet/table/src/main/java/io/deephaven/parquet/table/ParquetInstructions.java
index 069ddd4dac6..d8fa3ff9aa7 100644
--- a/extensions/parquet/table/src/main/java/io/deephaven/parquet/table/ParquetInstructions.java
+++ b/extensions/parquet/table/src/main/java/io/deephaven/parquet/table/ParquetInstructions.java
@@ -3,12 +3,14 @@
 //
 package io.deephaven.parquet.table;
 
+import io.deephaven.api.util.NameValidator;
 import io.deephaven.base.verify.Require;
 import io.deephaven.configuration.Configuration;
 import io.deephaven.engine.table.TableDefinition;
 import io.deephaven.engine.table.impl.ColumnToCodecMappings;
 import io.deephaven.hash.KeyedObjectHashMap;
 import io.deephaven.hash.KeyedObjectKey;
+import io.deephaven.hash.KeyedObjectKey.Basic;
 import io.deephaven.parquet.base.ParquetUtils;
 import io.deephaven.util.annotations.VisibleForTesting;
 import org.apache.parquet.hadoop.metadata.CompressionCodecName;
@@ -21,6 +23,7 @@
 import java.util.List;
 import java.util.Objects;
 import java.util.Optional;
+import java.util.OptionalInt;
 import java.util.Set;
 import java.util.function.Function;
 import java.util.function.Predicate;
@@ -33,93 +36,31 @@
  */
 public abstract class ParquetInstructions implements ColumnToCodecMappings {
 
-    private static volatile String defaultCompressionCodecName = CompressionCodecName.SNAPPY.toString();
+    public static final String DEFAULT_COMPRESSION_CODEC_NAME = CompressionCodecName.SNAPPY.toString();
+    public static final int DEFAULT_MAXIMUM_DICTIONARY_KEYS = 1 << 20;
+    public static final int DEFAULT_MAXIMUM_DICTIONARY_SIZE = 1 << 20;
 
-    /**
-     * Set the default for {@link #getCompressionCodecName()}.
-     *
-     * @deprecated Use {@link Builder#setCompressionCodecName(String)} instead.
-     * @param name The new default
-     */
-    @Deprecated
-    public static void setDefaultCompressionCodecName(final String name) {
-        defaultCompressionCodecName = name;
-    }
-
-    /**
-     * @return The default for {@link #getCompressionCodecName()}
-     */
-    public static String getDefaultCompressionCodecName() {
-        return defaultCompressionCodecName;
-    }
-
-    private static volatile int defaultMaximumDictionaryKeys = 1 << 20;
-
-    /**
-     * Set the default for {@link #getMaximumDictionaryKeys()}.
-     *
-     * @param maximumDictionaryKeys The new default
-     * @see Builder#setMaximumDictionaryKeys(int)
-     */
-    public static void setDefaultMaximumDictionaryKeys(final int maximumDictionaryKeys) {
-        defaultMaximumDictionaryKeys = Require.geqZero(maximumDictionaryKeys, "maximumDictionaryKeys");
-    }
-
-    /**
-     * @return The default for {@link #getMaximumDictionaryKeys()}
-     */
-    public static int getDefaultMaximumDictionaryKeys() {
-        return defaultMaximumDictionaryKeys;
-    }
+    public static final int MIN_TARGET_PAGE_SIZE = Configuration.getInstance().getIntegerWithDefault(
+            "Parquet.minTargetPageSize", 1 << 11); // 2KB
 
-    private static volatile int defaultMaximumDictionarySize = 1 << 20;
+    public static final int DEFAULT_TARGET_PAGE_SIZE = Configuration.getInstance().getIntegerWithDefault(
+            "Parquet.defaultTargetPageSize", 1 << 16); // 64KB
 
     /**
-     * Set the default for {@link #getMaximumDictionarySize()}.
+     * Throws an exception if {@link ParquetInstructions#getTableDefinition()} is empty.
      *
-     * @param maximumDictionarySize The new default
-     * @see Builder#setMaximumDictionarySize(int)
+     * @param parquetInstructions the parquet instructions
+     * @throws IllegalArgumentException if there is not a table definition
      */
-    public static void setDefaultMaximumDictionarySize(final int maximumDictionarySize) {
-        defaultMaximumDictionarySize = Require.geqZero(maximumDictionarySize, "maximumDictionarySize");
+    static TableDefinition ensureDefinition(final ParquetInstructions parquetInstructions) {
+        return parquetInstructions.getTableDefinition()
+                .orElseThrow(() -> new IllegalArgumentException("Table definition must be provided"));
     }
 
-    /**
-     * @return The default for {@link #getMaximumDictionarySize()}
-     */
-    public static int getDefaultMaximumDictionarySize() {
-        return defaultMaximumDictionarySize;
-    }
-
-    public static final int MIN_TARGET_PAGE_SIZE =
-            Configuration.getInstance().getIntegerWithDefault("Parquet.minTargetPageSize", 1 << 11); // 2KB
-    private static final int DEFAULT_TARGET_PAGE_SIZE =
-            Configuration.getInstance().getIntegerWithDefault("Parquet.defaultTargetPageSize", 1 << 16); // 64KB
-    private static volatile int defaultTargetPageSize = DEFAULT_TARGET_PAGE_SIZE;
-
     private static final boolean DEFAULT_IS_REFRESHING = false;
 
-    /**
-     * Set the default target page size (in bytes) used to section rows of data into pages during column writing. This
-     * number should be no smaller than {@link #MIN_TARGET_PAGE_SIZE}.
-     *
-     * @param newDefaultSizeBytes the new default target page size.
-     */
-    public static void setDefaultTargetPageSize(final int newDefaultSizeBytes) {
-        if (newDefaultSizeBytes < MIN_TARGET_PAGE_SIZE) {
-            throw new IllegalArgumentException(
-                    "Default target page size should be larger than " + MIN_TARGET_PAGE_SIZE + " bytes");
-        }
-        defaultTargetPageSize = newDefaultSizeBytes;
-    }
-
-    /**
-     * Get the current default target page size in bytes.
-     * 
-     * @return the current default target page size in bytes.
-     */
-    public static int getDefaultTargetPageSize() {
-        return defaultTargetPageSize;
+    public interface OnWriteCompleted {
+        void onWriteCompleted(CompletedParquetWrite completedParquetWrite);
     }
 
     public enum ParquetFileLayout {
@@ -157,7 +98,7 @@ public enum ParquetFileLayout {
     static final String FILE_INDEX_TOKEN = "{i}";
     private static final String DEFAULT_BASE_NAME_FOR_PARTITIONED_PARQUET_DATA = UUID_TOKEN;
 
-    public ParquetInstructions() {}
+    private ParquetInstructions() {}
 
     public final String getColumnNameFromParquetColumnNameOrDefault(final String parquetColumnName) {
         final String mapped = getColumnNameFromParquetColumnName(parquetColumnName);
@@ -180,6 +121,14 @@ public final String getColumnNameFromParquetColumnNameOrDefault(final String par
      */
     public abstract boolean useDictionary(String columnName);
 
+    /**
+     * The field ID for the given {@code columnName}.
+     *
+     * @param columnName the Deephaven column name
+     * @return the field id
+     */
+    public abstract OptionalInt getFieldId(final String columnName);
+
     public abstract Object getSpecialInstructions();
 
     public abstract String getCompressionCodecName();
@@ -251,6 +200,12 @@ public abstract ParquetInstructions withTableDefinitionAndLayout(final TableDefi
      */
     public abstract String baseNameForPartitionedParquetData();
 
+    /**
+     * @return A callback to be executed when on completing each parquet data file write (excluding the index and
+     *         metadata files). This callback gets invoked by the writing thread in a linear fashion.
+     */
+    public abstract Optional<OnWriteCompleted> onWriteCompleted();
+
     @VisibleForTesting
     public static boolean sameColumnNamesAndCodecMappings(final ParquetInstructions i1, final ParquetInstructions i2) {
         if (i1 == EMPTY) {
@@ -266,6 +221,7 @@ public static boolean sameColumnNamesAndCodecMappings(final ParquetInstructions
     }
 
     public static final ParquetInstructions EMPTY = new ParquetInstructions() {
+
         @Override
         public String getParquetColumnNameFromColumnNameOrDefault(final String columnName) {
             return columnName;
@@ -294,6 +250,11 @@ public boolean useDictionary(final String columnName) {
             return false;
         }
 
+        @Override
+        public OptionalInt getFieldId(String columnName) {
+            return OptionalInt.empty();
+        }
+
         @Override
         @Nullable
         public Object getSpecialInstructions() {
@@ -302,17 +263,17 @@ public Object getSpecialInstructions() {
 
         @Override
         public String getCompressionCodecName() {
-            return defaultCompressionCodecName;
+            return DEFAULT_COMPRESSION_CODEC_NAME;
         }
 
         @Override
         public int getMaximumDictionaryKeys() {
-            return defaultMaximumDictionaryKeys;
+            return DEFAULT_MAXIMUM_DICTIONARY_KEYS;
         }
 
         @Override
         public int getMaximumDictionarySize() {
-            return defaultMaximumDictionarySize;
+            return DEFAULT_MAXIMUM_DICTIONARY_SIZE;
         }
 
         @Override
@@ -322,7 +283,7 @@ public boolean isLegacyParquet() {
 
         @Override
         public int getTargetPageSize() {
-            return defaultTargetPageSize;
+            return DEFAULT_TARGET_PAGE_SIZE;
         }
 
         @Override
@@ -372,7 +333,7 @@ public ParquetInstructions withTableDefinitionAndLayout(
             return new ReadOnly(null, null, getCompressionCodecName(), getMaximumDictionaryKeys(),
                     getMaximumDictionarySize(), isLegacyParquet(), getTargetPageSize(), isRefreshing(),
                     getSpecialInstructions(), generateMetadataFiles(), baseNameForPartitionedParquetData(),
-                    useLayout, useDefinition, null);
+                    useLayout, useDefinition, null, null);
         }
 
         @Override
@@ -380,19 +341,41 @@ ParquetInstructions withIndexColumns(final Collection<List<String>> indexColumns
             return new ReadOnly(null, null, getCompressionCodecName(), getMaximumDictionaryKeys(),
                     getMaximumDictionarySize(), isLegacyParquet(), getTargetPageSize(), isRefreshing(),
                     getSpecialInstructions(), generateMetadataFiles(), baseNameForPartitionedParquetData(),
-                    null, null, indexColumns);
+                    null, null, indexColumns, null);
+        }
+
+        @Override
+        public Optional<OnWriteCompleted> onWriteCompleted() {
+            return Optional.empty();
         }
     };
 
     private static class ColumnInstructions {
+
+        private static final KeyedObjectKey<String, ColumnInstructions> COLUMN_NAME_KEY = new Basic<>() {
+            @Override
+            public String getKey(@NotNull final ColumnInstructions columnInstructions) {
+                return columnInstructions.getColumnName();
+            }
+        };
+
+        private static final KeyedObjectKey<String, ColumnInstructions> PARQUET_COLUMN_NAME_KEY = new Basic<>() {
+            @Override
+            public String getKey(@NotNull final ColumnInstructions columnInstructions) {
+                return columnInstructions.getParquetColumnName();
+            }
+        };
+
         private final String columnName;
         private String parquetColumnName;
         private String codecName;
         private String codecArgs;
         private boolean useDictionary;
+        private Integer fieldId;
 
         public ColumnInstructions(final String columnName) {
-            this.columnName = columnName;
+            this.columnName = Objects.requireNonNull(columnName);
+            NameValidator.validateColumnName(columnName);
         }
 
         public String getColumnName() {
@@ -404,6 +387,12 @@ public String getParquetColumnName() {
         }
 
         public ColumnInstructions setParquetColumnName(final String parquetColumnName) {
+            if (this.parquetColumnName != null && !this.parquetColumnName.equals(parquetColumnName)) {
+                throw new IllegalArgumentException(
+                        "Cannot add a mapping from parquetColumnName=" + parquetColumnName
+                                + ": columnName=" + columnName + " already mapped to parquetColumnName="
+                                + this.parquetColumnName);
+            }
             this.parquetColumnName = parquetColumnName;
             return this;
         }
@@ -433,6 +422,19 @@ public boolean useDictionary() {
         public void useDictionary(final boolean useDictionary) {
             this.useDictionary = useDictionary;
         }
+
+        public OptionalInt fieldId() {
+            return fieldId == null ? OptionalInt.empty() : OptionalInt.of(fieldId);
+        }
+
+        public void setFieldId(final int fieldId) {
+            if (this.fieldId != null && this.fieldId != fieldId) {
+                throw new IllegalArgumentException(
+                        String.format("Inconsistent fieldId for columnName=%s, already set fieldId=%d", columnName,
+                                this.fieldId));
+            }
+            this.fieldId = fieldId;
+        }
     }
 
     private static final class ReadOnly extends ParquetInstructions {
@@ -455,6 +457,7 @@ private static final class ReadOnly extends ParquetInstructions {
         private final ParquetFileLayout fileLayout;
         private final TableDefinition tableDefinition;
         private final Collection<List<String>> indexColumns;
+        private final OnWriteCompleted onWriteCompleted;
 
         private ReadOnly(
                 final KeyedObjectHashMap<String, ColumnInstructions> columnNameToInstructions,
@@ -470,7 +473,8 @@ private ReadOnly(
                 final String baseNameForPartitionedParquetData,
                 final ParquetFileLayout fileLayout,
                 final TableDefinition tableDefinition,
-                final Collection<List<String>> indexColumns) {
+                final Collection<List<String>> indexColumns,
+                final OnWriteCompleted onWriteCompleted) {
             this.columnNameToInstructions = columnNameToInstructions;
             this.parquetColumnNameToInstructions = parquetColumnNameToColumnName;
             this.compressionCodecName = compressionCodecName;
@@ -488,10 +492,11 @@ private ReadOnly(
                     : indexColumns.stream()
                             .map(List::copyOf)
                             .collect(Collectors.toUnmodifiableList());
+            this.onWriteCompleted = onWriteCompleted;
         }
 
-        private String getOrDefault(final String columnName, final String defaultValue,
-                final Function<ColumnInstructions, String> fun) {
+        private <T> T getOrDefault(final String columnName, final T defaultValue,
+                final Function<ColumnInstructions, T> fun) {
             if (columnNameToInstructions == null) {
                 return defaultValue;
             }
@@ -546,6 +551,11 @@ public boolean useDictionary(final String columnName) {
             return getOrDefault(columnName, false, ColumnInstructions::useDictionary);
         }
 
+        @Override
+        public OptionalInt getFieldId(String columnName) {
+            return getOrDefault(columnName, OptionalInt.empty(), ColumnInstructions::fieldId);
+        }
+
         @Override
         public String getCompressionCodecName() {
             return compressionCodecName;
@@ -625,7 +635,7 @@ public ParquetInstructions withTableDefinitionAndLayout(
                     getCompressionCodecName(), getMaximumDictionaryKeys(), getMaximumDictionarySize(),
                     isLegacyParquet(), getTargetPageSize(), isRefreshing(), getSpecialInstructions(),
                     generateMetadataFiles(), baseNameForPartitionedParquetData(), useLayout, useDefinition,
-                    indexColumns);
+                    indexColumns, onWriteCompleted);
         }
 
         @Override
@@ -634,7 +644,12 @@ ParquetInstructions withIndexColumns(final Collection<List<String>> useIndexColu
                     getCompressionCodecName(), getMaximumDictionaryKeys(), getMaximumDictionarySize(),
                     isLegacyParquet(), getTargetPageSize(), isRefreshing(), getSpecialInstructions(),
                     generateMetadataFiles(), baseNameForPartitionedParquetData(), fileLayout,
-                    tableDefinition, useIndexColumns);
+                    tableDefinition, useIndexColumns, onWriteCompleted);
+        }
+
+        @Override
+        public Optional<OnWriteCompleted> onWriteCompleted() {
+            return Optional.ofNullable(onWriteCompleted);
         }
 
         KeyedObjectHashMap<String, ColumnInstructions> copyColumnNameToInstructions() {
@@ -681,11 +696,11 @@ public static class Builder {
         // We only store entries in parquetColumnNameToInstructions when the parquetColumnName is
         // different than the columnName (ie, the column name mapping is not the default mapping)
         private KeyedObjectHashMap<String, ColumnInstructions> parquetColumnNameToInstructions;
-        private String compressionCodecName = defaultCompressionCodecName;
-        private int maximumDictionaryKeys = defaultMaximumDictionaryKeys;
-        private int maximumDictionarySize = defaultMaximumDictionarySize;
+        private String compressionCodecName = DEFAULT_COMPRESSION_CODEC_NAME;
+        private int maximumDictionaryKeys = DEFAULT_MAXIMUM_DICTIONARY_KEYS;
+        private int maximumDictionarySize = DEFAULT_MAXIMUM_DICTIONARY_SIZE;
         private boolean isLegacyParquet;
-        private int targetPageSize = defaultTargetPageSize;
+        private int targetPageSize = DEFAULT_TARGET_PAGE_SIZE;
         private boolean isRefreshing = DEFAULT_IS_REFRESHING;
         private Object specialInstructions;
         private boolean generateMetadataFiles = DEFAULT_GENERATE_METADATA_FILES;
@@ -693,6 +708,7 @@ public static class Builder {
         private ParquetFileLayout fileLayout;
         private TableDefinition tableDefinition;
         private Collection<List<String>> indexColumns;
+        private OnWriteCompleted onWriteCompleted;
 
         /**
          * For each additional field added, make sure to update the copy constructor builder
@@ -720,77 +736,25 @@ public Builder(final ParquetInstructions parquetInstructions) {
             fileLayout = readOnlyParquetInstructions.getFileLayout().orElse(null);
             tableDefinition = readOnlyParquetInstructions.getTableDefinition().orElse(null);
             indexColumns = readOnlyParquetInstructions.getIndexColumns().orElse(null);
-        }
-
-        private void newColumnNameToInstructionsMap() {
-            columnNameToInstructions = new KeyedObjectHashMap<>(new KeyedObjectKey.Basic<>() {
-                @Override
-                public String getKey(@NotNull final ColumnInstructions value) {
-                    return value.getColumnName();
-                }
-            });
-        }
-
-        private void newParquetColumnNameToInstructionsMap() {
-            parquetColumnNameToInstructions =
-                    new KeyedObjectHashMap<>(new KeyedObjectKey.Basic<>() {
-                        @Override
-                        public String getKey(@NotNull final ColumnInstructions value) {
-                            return value.getParquetColumnName();
-                        }
-                    });
+            onWriteCompleted = readOnlyParquetInstructions.onWriteCompleted().orElse(null);
         }
 
         public Builder addColumnNameMapping(final String parquetColumnName, final String columnName) {
-            if (parquetColumnName.equals(columnName)) {
-                return this;
-            }
-            if (columnNameToInstructions == null) {
-                newColumnNameToInstructionsMap();
-                final ColumnInstructions ci = new ColumnInstructions(columnName);
-                ci.setParquetColumnName(parquetColumnName);
-                columnNameToInstructions.put(columnName, ci);
-                newParquetColumnNameToInstructionsMap();
-                parquetColumnNameToInstructions.put(parquetColumnName, ci);
-                return this;
-            }
-
-            ColumnInstructions ci = columnNameToInstructions.get(columnName);
-            if (ci != null) {
-                if (ci.parquetColumnName != null) {
-                    if (ci.parquetColumnName.equals(parquetColumnName)) {
-                        return this;
-                    }
-                    throw new IllegalArgumentException(
-                            "Cannot add a mapping from parquetColumnName=" + parquetColumnName
-                                    + ": columnName=" + columnName + " already mapped to parquetColumnName="
-                                    + ci.parquetColumnName);
-                }
-            } else {
-                ci = new ColumnInstructions(columnName);
-                columnNameToInstructions.put(columnName, ci);
-            }
-
+            final ColumnInstructions ci = getOrCreateColumnInstructions(columnName);
+            ci.setParquetColumnName(parquetColumnName);
             if (parquetColumnNameToInstructions == null) {
-                newParquetColumnNameToInstructionsMap();
-                parquetColumnNameToInstructions.put(parquetColumnName, ci);
-                return this;
+                parquetColumnNameToInstructions = new KeyedObjectHashMap<>(ColumnInstructions.PARQUET_COLUMN_NAME_KEY);
             }
-
-            final ColumnInstructions fromParquetColumnNameInstructions =
-                    parquetColumnNameToInstructions.get(parquetColumnName);
-            if (fromParquetColumnNameInstructions != null) {
-                if (fromParquetColumnNameInstructions == ci) {
-                    return this;
-                }
+            final ColumnInstructions existing = parquetColumnNameToInstructions.putIfAbsent(parquetColumnName, ci);
+            if (existing != null) {
+                // Note: this is a limitation that doesn't need to exist. Technically, we could allow a single physical
+                // parquet column to manifest as multiple Deephaven columns.
                 throw new IllegalArgumentException(
                         "Cannot add new mapping from parquetColumnName=" + parquetColumnName + " to columnName="
                                 + columnName
                                 + ": already mapped to columnName="
-                                + fromParquetColumnNameInstructions.getColumnName());
+                                + existing.getColumnName());
             }
-            ci.setParquetColumnName(parquetColumnName);
-            parquetColumnNameToInstructions.put(parquetColumnName, ci);
             return this;
         }
 
@@ -803,7 +767,7 @@ public Builder addColumnCodec(final String columnName, final String codecName) {
         }
 
         public Builder addColumnCodec(final String columnName, final String codecName, final String codecArgs) {
-            final ColumnInstructions ci = getColumnInstructions(columnName);
+            final ColumnInstructions ci = getOrCreateColumnInstructions(columnName);
             ci.setCodecName(codecName);
             ci.setCodecArgs(codecArgs);
             return this;
@@ -817,21 +781,35 @@ public Builder addColumnCodec(final String columnName, final String codecName, f
          * @param useDictionary The hint value
          */
         public Builder useDictionary(final String columnName, final boolean useDictionary) {
-            final ColumnInstructions ci = getColumnInstructions(columnName);
+            final ColumnInstructions ci = getOrCreateColumnInstructions(columnName);
             ci.useDictionary(useDictionary);
             return this;
         }
 
-        private ColumnInstructions getColumnInstructions(final String columnName) {
-            final ColumnInstructions ci;
+        /**
+         * This is currently only used for writing, allowing the setting of {@code field_id} in the proper Parquet
+         * {@code SchemaElement}.
+         *
+         * <p>
+         * Setting multiple field ids for a single column name is not allowed.
+         *
+         * <p>
+         * Field ids are not typically configured by end users.
+         *
+         * @param columnName the Deephaven column name
+         * @param fieldId the field id
+         */
+        public Builder setFieldId(final String columnName, final int fieldId) {
+            final ColumnInstructions ci = getOrCreateColumnInstructions(columnName);
+            ci.setFieldId(fieldId);
+            return this;
+        }
+
+        private ColumnInstructions getOrCreateColumnInstructions(final String columnName) {
             if (columnNameToInstructions == null) {
-                newColumnNameToInstructionsMap();
-                ci = new ColumnInstructions(columnName);
-                columnNameToInstructions.put(columnName, ci);
-            } else {
-                ci = columnNameToInstructions.putIfAbsent(columnName, ColumnInstructions::new);
+                columnNameToInstructions = new KeyedObjectHashMap<>(ColumnInstructions.COLUMN_NAME_KEY);
             }
-            return ci;
+            return columnNameToInstructions.putIfAbsent(columnName, ColumnInstructions::new);
         }
 
         public Builder setCompressionCodecName(final String compressionCodecName) {
@@ -987,6 +965,15 @@ public Builder addAllIndexColumns(final Iterable<List<String>> indexColumns) {
             return this;
         }
 
+        /**
+         * Adds a callback to be executed when on completing each parquet data file write (excluding the index and
+         * metadata files).
+         */
+        public Builder setOnWriteCompleted(final OnWriteCompleted onWriteCompleted) {
+            this.onWriteCompleted = onWriteCompleted;
+            return this;
+        }
+
         public ParquetInstructions build() {
             final KeyedObjectHashMap<String, ColumnInstructions> columnNameToInstructionsOut = columnNameToInstructions;
             columnNameToInstructions = null;
@@ -996,7 +983,7 @@ public ParquetInstructions build() {
             return new ReadOnly(columnNameToInstructionsOut, parquetColumnNameToColumnNameOut, compressionCodecName,
                     maximumDictionaryKeys, maximumDictionarySize, isLegacyParquet, targetPageSize, isRefreshing,
                     specialInstructions, generateMetadataFiles, baseNameForPartitionedParquetData, fileLayout,
-                    tableDefinition, indexColumns);
+                    tableDefinition, indexColumns, onWriteCompleted);
         }
     }
 
diff --git a/extensions/parquet/table/src/main/java/io/deephaven/parquet/table/ParquetMetadataFileWriterImpl.java b/extensions/parquet/table/src/main/java/io/deephaven/parquet/table/ParquetMetadataFileWriterImpl.java
index 90da731eb0c..c0ea3a6f43c 100644
--- a/extensions/parquet/table/src/main/java/io/deephaven/parquet/table/ParquetMetadataFileWriterImpl.java
+++ b/extensions/parquet/table/src/main/java/io/deephaven/parquet/table/ParquetMetadataFileWriterImpl.java
@@ -3,15 +3,14 @@
 //
 package io.deephaven.parquet.table;
 
+import com.google.common.io.CountingOutputStream;
 import io.deephaven.UncheckedDeephavenException;
 import io.deephaven.parquet.base.ParquetFileWriter;
 import io.deephaven.parquet.base.ParquetMetadataFileWriter;
 import io.deephaven.parquet.base.ParquetUtils;
-import io.deephaven.parquet.base.PositionedBufferedOutputStream;
 import io.deephaven.parquet.table.metadata.ColumnTypeInfo;
 import io.deephaven.parquet.table.metadata.TableInfo;
-import io.deephaven.util.channel.SeekableChannelsProvider;
-import io.deephaven.util.channel.SeekableChannelsProviderLoader;
+import io.deephaven.util.channel.CompletableOutputStream;
 import org.apache.parquet.hadoop.metadata.BlockMetaData;
 import org.apache.parquet.hadoop.metadata.FileMetaData;
 import org.apache.parquet.hadoop.metadata.ParquetMetadata;
@@ -19,9 +18,9 @@
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
-import java.io.File;
 import java.io.IOException;
-import java.nio.file.Path;
+import java.io.OutputStream;
+import java.net.URI;
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.HashMap;
@@ -29,7 +28,6 @@
 import java.util.List;
 import java.util.Map;
 
-import static io.deephaven.base.FileUtils.convertToURI;
 import static io.deephaven.parquet.base.ParquetUtils.MAGIC;
 import static io.deephaven.parquet.base.ParquetUtils.METADATA_KEY;
 import static io.deephaven.parquet.base.ParquetUtils.getPerFileMetadataKey;
@@ -45,18 +43,17 @@ final class ParquetMetadataFileWriterImpl implements ParquetMetadataFileWriter {
      * A class to hold the parquet file and its metadata.
      */
     private static class ParquetFileMetadata {
-        final String filePath;
+        final URI uri;
         final ParquetMetadata metadata;
 
-        ParquetFileMetadata(final String filePath, final ParquetMetadata metadata) {
-            this.filePath = filePath;
+        ParquetFileMetadata(final URI uri, final ParquetMetadata metadata) {
+            this.uri = uri;
             this.metadata = metadata;
         }
     }
 
-    private final Path metadataRootDirAbsPath;
+    private final URI metadataRootDir;
     private final List<ParquetFileMetadata> parquetFileMetadataList;
-    private final SeekableChannelsProvider channelsProvider;
     private final MessageType partitioningColumnsSchema;
 
     // The following fields are used to accumulate metadata for all parquet files
@@ -76,23 +73,22 @@ private static class ParquetFileMetadata {
      * @param partitioningColumnsSchema The common schema for partitioning columns to be included in the
      *        {@value ParquetUtils#COMMON_METADATA_FILE_NAME} file, can be null if there are no partitioning columns.
      */
-    ParquetMetadataFileWriterImpl(@NotNull final File metadataRootDir, @NotNull final File[] destinations,
+    ParquetMetadataFileWriterImpl(
+            @NotNull final URI metadataRootDir,
+            @NotNull final URI[] destinations,
             @Nullable final MessageType partitioningColumnsSchema) {
         if (destinations.length == 0) {
             throw new IllegalArgumentException("No destinations provided");
         }
-        this.metadataRootDirAbsPath = metadataRootDir.getAbsoluteFile().toPath();
-        final String metadataRootDirAbsPathString = metadataRootDirAbsPath.toString();
-        for (final File destination : destinations) {
-            if (!destination.getAbsolutePath().startsWith(metadataRootDirAbsPathString)) {
+        this.metadataRootDir = metadataRootDir;
+        final String metadataRootDirStr = metadataRootDir.toString();
+        for (final URI destination : destinations) {
+            if (!destination.toString().startsWith(metadataRootDirStr)) {
                 throw new UncheckedDeephavenException("All destinations must be nested under the provided metadata root"
-                        + " directory, provided destination " + destination.getAbsolutePath() + " is not under " +
-                        metadataRootDirAbsPathString);
+                        + " directory, provided destination " + destination + " is not under " + metadataRootDir);
             }
         }
         this.parquetFileMetadataList = new ArrayList<>(destinations.length);
-        this.channelsProvider = SeekableChannelsProviderLoader.getInstance().fromServiceLoader(
-                convertToURI(metadataRootDirAbsPathString, true), null);
         this.partitioningColumnsSchema = partitioningColumnsSchema;
 
         this.mergedSchema = null;
@@ -106,28 +102,31 @@ private static class ParquetFileMetadata {
     /**
      * Add parquet metadata for the provided parquet file to the combined metadata file.
      *
-     * @param parquetFilePath The parquet file destination path
+     * @param parquetFileURI The parquet file destination URI
      * @param metadata The parquet metadata
      */
-    public void addParquetFileMetadata(final String parquetFilePath, final ParquetMetadata metadata) {
-        parquetFileMetadataList.add(new ParquetFileMetadata(parquetFilePath, metadata));
+    public void addParquetFileMetadata(final URI parquetFileURI, final ParquetMetadata metadata) {
+        parquetFileMetadataList.add(new ParquetFileMetadata(parquetFileURI, metadata));
     }
 
     /**
-     * Write the accumulated metadata to the provided files and clear the metadata accumulated so far.
+     * Write the combined metadata to the provided streams and clear the metadata accumulated so far. The output streams
+     * are marked as {@link CompletableOutputStream#done()} after writing is finished.
      *
-     * @param metadataFilePath The destination path for the {@value ParquetUtils#METADATA_FILE_NAME} file
-     * @param commonMetadataFilePath The destination path for the {@value ParquetUtils#COMMON_METADATA_FILE_NAME} file
+     * @param metadataOutputStream The output stream for the {@value ParquetUtils#METADATA_FILE_NAME} file
+     * @param commonMetadataOutputStream The output stream for the {@value ParquetUtils#COMMON_METADATA_FILE_NAME} file
      */
-    public void writeMetadataFiles(final String metadataFilePath, final String commonMetadataFilePath)
-            throws IOException {
+    public void writeMetadataFiles(
+            final CompletableOutputStream metadataOutputStream,
+            final CompletableOutputStream commonMetadataOutputStream) throws IOException {
         if (parquetFileMetadataList.isEmpty()) {
             throw new UncheckedDeephavenException("No parquet files to write metadata for");
         }
         mergeMetadata();
         final ParquetMetadata metadataFooter = new ParquetMetadata(new FileMetaData(mergedSchema,
                 mergedKeyValueMetaData, mergedCreatedByString), mergedBlocks);
-        writeMetadataFile(metadataFooter, metadataFilePath);
+        writeMetadataFile(metadataFooter, metadataOutputStream);
+        metadataOutputStream.done();
 
         // Skip the blocks data and merge schema with partitioning columns' schema to write the common metadata file.
         // The ordering of arguments in method call is important because we want to keep partitioning columns in the
@@ -136,7 +135,8 @@ public void writeMetadataFiles(final String metadataFilePath, final String commo
         final ParquetMetadata commonMetadataFooter =
                 new ParquetMetadata(new FileMetaData(mergedSchema, mergedKeyValueMetaData, mergedCreatedByString),
                         new ArrayList<>());
-        writeMetadataFile(commonMetadataFooter, commonMetadataFilePath);
+        writeMetadataFile(commonMetadataFooter, commonMetadataOutputStream);
+        commonMetadataOutputStream.done();
 
         // Clear the accumulated metadata
         clear();
@@ -150,7 +150,7 @@ private void mergeMetadata() throws IOException {
         for (final ParquetFileMetadata parquetFileMetadata : parquetFileMetadataList) {
             final FileMetaData fileMetaData = parquetFileMetadata.metadata.getFileMetaData();
             mergedSchema = mergeSchemaInto(fileMetaData.getSchema(), mergedSchema);
-            final String relativePath = getRelativePath(parquetFileMetadata.filePath, metadataRootDirAbsPath);
+            final String relativePath = metadataRootDir.relativize(parquetFileMetadata.uri).getPath();
             mergeKeyValueMetaData(parquetFileMetadata, relativePath);
             mergeBlocksInto(parquetFileMetadata, relativePath, mergedBlocks);
             mergedCreatedBy.add(fileMetaData.getCreatedBy());
@@ -218,7 +218,7 @@ private void mergeKeyValueMetaData(@NotNull final ParquetFileMetadata parquetFil
                 // Assuming the keys are unique for each file because file names are unique, verified in the constructor
                 if (mergedKeyValueMetaData.containsKey(fileKey)) {
                     throw new IllegalStateException("Could not merge metadata for file " +
-                            parquetFileMetadata.filePath + " because it has conflicting file key: " + fileKey);
+                            parquetFileMetadata.uri + " because it has conflicting file key: " + fileKey);
                 }
                 mergedKeyValueMetaData.put(fileKey, entry.getValue());
 
@@ -253,21 +253,18 @@ private static void mergeBlocksInto(final ParquetFileMetadata parquetFileMetadat
         }
     }
 
-    private static String getRelativePath(final String parquetFilePath, final Path metadataRootDirAbsPath) {
-        final Path parquetFileAbsPath = new File(parquetFilePath).getAbsoluteFile().toPath();
-        return metadataRootDirAbsPath.relativize(parquetFileAbsPath).toString();
-    }
-
-    private void writeMetadataFile(final ParquetMetadata metadataFooter, final String outputPath) throws IOException {
-        final PositionedBufferedOutputStream metadataOutputStream =
-                new PositionedBufferedOutputStream(channelsProvider.getWriteChannel(outputPath, false),
-                        ParquetUtils.PARQUET_OUTPUT_BUFFER_SIZE);
-        metadataOutputStream.write(MAGIC);
-        ParquetFileWriter.serializeFooter(metadataFooter, metadataOutputStream);
-        metadataOutputStream.close();
+    private static void writeMetadataFile(final ParquetMetadata metadataFooter, final OutputStream outputStream)
+            throws IOException {
+        final CountingOutputStream countingOutputStream = new CountingOutputStream(outputStream);
+        countingOutputStream.write(MAGIC);
+        ParquetFileWriter.serializeFooter(metadataFooter, countingOutputStream);
+        countingOutputStream.flush();
     }
 
-    public void clear() {
+    /**
+     * Clear the list of metadata accumulated so far.
+     */
+    private void clear() {
         parquetFileMetadataList.clear();
         mergedKeyValueMetaData.clear();
         mergedBlocks.clear();
diff --git a/extensions/parquet/table/src/main/java/io/deephaven/parquet/table/ParquetSchemaReader.java b/extensions/parquet/table/src/main/java/io/deephaven/parquet/table/ParquetSchemaReader.java
index 4a61cbef58a..dc99271414b 100644
--- a/extensions/parquet/table/src/main/java/io/deephaven/parquet/table/ParquetSchemaReader.java
+++ b/extensions/parquet/table/src/main/java/io/deephaven/parquet/table/ParquetSchemaReader.java
@@ -35,6 +35,8 @@
 import org.jetbrains.annotations.NotNull;
 
 import java.io.IOException;
+import java.math.BigDecimal;
+import java.math.BigInteger;
 import java.time.Instant;
 import java.time.LocalDate;
 import java.time.LocalDateTime;
@@ -43,7 +45,6 @@
 import java.util.function.BiFunction;
 import java.util.function.Supplier;
 
-import static io.deephaven.parquet.base.PageMaterializer.resolveDecimalLogicalType;
 import static io.deephaven.parquet.base.ParquetUtils.METADATA_KEY;
 
 public class ParquetSchemaReader {
@@ -402,7 +403,12 @@ public Optional<Class<?>> visit(final LogicalTypeAnnotation.EnumLogicalTypeAnnot
             @Override
             public Optional<Class<?>> visit(
                     final LogicalTypeAnnotation.DecimalLogicalTypeAnnotation decimalLogicalType) {
-                return Optional.of(resolveDecimalLogicalType(decimalLogicalType));
+                // This pair of values (precision=1, scale=0) is set at write time as a marker so that we can recover
+                // the fact that the type is a BigInteger, not a BigDecimal when the fies are read.
+                if (decimalLogicalType.getPrecision() == 1 && decimalLogicalType.getScale() == 0) {
+                    return Optional.of(BigInteger.class);
+                }
+                return Optional.of(BigDecimal.class);
             }
 
             @Override
diff --git a/extensions/parquet/table/src/main/java/io/deephaven/parquet/table/ParquetTableWriter.java b/extensions/parquet/table/src/main/java/io/deephaven/parquet/table/ParquetTableWriter.java
index a0c63614a82..c4fdfbb11d8 100644
--- a/extensions/parquet/table/src/main/java/io/deephaven/parquet/table/ParquetTableWriter.java
+++ b/extensions/parquet/table/src/main/java/io/deephaven/parquet/table/ParquetTableWriter.java
@@ -27,8 +27,7 @@
 import io.deephaven.stringset.StringSet;
 import io.deephaven.util.QueryConstants;
 import io.deephaven.util.SafeCloseable;
-import io.deephaven.util.annotations.VisibleForTesting;
-import io.deephaven.util.channel.SeekableChannelsProviderLoader;
+import io.deephaven.util.channel.CompletableOutputStream;
 import io.deephaven.vector.Vector;
 import org.apache.commons.lang3.tuple.Pair;
 import org.apache.parquet.bytes.HeapByteBufferAllocator;
@@ -39,14 +38,13 @@
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
-import java.io.File;
 import java.io.IOException;
+import java.io.OutputStream;
+import java.net.URI;
 import java.nio.IntBuffer;
-import java.nio.file.Path;
 import java.util.*;
 
 import static io.deephaven.parquet.base.ParquetUtils.METADATA_KEY;
-import static io.deephaven.base.FileUtils.convertToURI;
 
 /**
  * API for writing DH tables in parquet format
@@ -72,25 +70,23 @@ static class IndexWritingInfo {
          */
         final String[] parquetColumnNames;
         /**
-         * File path to be added in the index metadata of the main parquet file
+         * Destination for writing the index file
          */
-        final File destFileForMetadata;
+        final URI dest;
         /**
-         * Destination path for writing the index file. The two filenames can differ because we write index files to
-         * shadow file paths first and then place them at the final path once the write is complete. The metadata should
-         * always hold the accurate path.
+         * Output stream to write the index file
          */
-        final File destFile;
+        final CompletableOutputStream destOutputStream;
 
         IndexWritingInfo(
                 final List<String> indexColumnNames,
                 final String[] parquetColumnNames,
-                final File destFileForMetadata,
-                final File destFile) {
+                final URI dest,
+                final CompletableOutputStream destOutputStream) {
             this.indexColumnNames = indexColumnNames;
             this.parquetColumnNames = parquetColumnNames;
-            this.destFileForMetadata = destFileForMetadata.getAbsoluteFile();
-            this.destFile = destFile.getAbsoluteFile();
+            this.dest = dest;
+            this.destOutputStream = destOutputStream;
         }
     }
 
@@ -100,10 +96,9 @@ static class IndexWritingInfo {
      * @param t The table to write
      * @param definition Table definition
      * @param writeInstructions Write instructions for customizations while writing
-     * @param destFilePath The destination path
-     * @param destFilePathForMetadata The destination path to store in the metadata files. This can be different from
-     *        {@code destFilePath} if we are writing the parquet file to a shadow location first since the metadata
-     *        should always hold the accurate path.
+     * @param dest The destination URI to write to
+     * @param destOutputStream The output stream to write to dest, should be marked as
+     *        {@link CompletableOutputStream#done()} once writing is finished
      * @param incomingMeta A map of metadata values to be stores in the file footer
      * @param indexInfoList Arrays containing the column names for indexes to persist as sidecar tables. Indexes that
      *        are specified but missing will be computed on demand.
@@ -120,8 +115,8 @@ static void write(
             @NotNull final Table t,
             @NotNull final TableDefinition definition,
             @NotNull final ParquetInstructions writeInstructions,
-            @NotNull final String destFilePath,
-            @NotNull final String destFilePathForMetadata,
+            @NotNull final URI dest,
+            @NotNull final CompletableOutputStream destOutputStream,
             @NotNull final Map<String, String> incomingMeta,
             @Nullable final List<ParquetTableWriter.IndexWritingInfo> indexInfoList,
             @NotNull final ParquetMetadataFileWriter metadataFileWriter,
@@ -137,66 +132,55 @@ static void write(
         }
 
         final TableInfo.Builder tableInfoBuilder = TableInfo.builder();
-        List<File> cleanupFiles = null;
-        try {
-            if (indexInfoList != null) {
-                cleanupFiles = new ArrayList<>(indexInfoList.size());
-                final Path destDirPath = new File(destFilePath).getAbsoluteFile().getParentFile().toPath();
-                for (final ParquetTableWriter.IndexWritingInfo info : indexInfoList) {
-                    try (final SafeCloseable ignored = t.isRefreshing() ? LivenessScopeStack.open() : null) {
-                        // This will retrieve an existing index if one exists, or create a new one if not
-                        final BasicDataIndex dataIndex = Optional
-                                .ofNullable(DataIndexer.getDataIndex(t, info.indexColumnNames))
-                                .or(() -> Optional.of(DataIndexer.getOrCreateDataIndex(t, info.indexColumnNames)))
-                                .get()
-                                .transform(DataIndexTransformer.builder().invertRowSet(t.getRowSet()).build());
-                        final Table indexTable = dataIndex.table().sort(info.indexColumnNames.toArray(new String[0]));
-                        final TableInfo.Builder indexTableInfoBuilder = TableInfo.builder().addSortingColumns(
-                                info.indexColumnNames.stream()
-                                        .map(cn -> SortColumnInfo.of(cn, SortColumnInfo.SortDirection.Ascending))
-                                        .toArray(SortColumnInfo[]::new));
+        if (indexInfoList != null) {
+            final URI destDir = dest.resolve(".");
+            for (final ParquetTableWriter.IndexWritingInfo info : indexInfoList) {
+                try (final SafeCloseable ignored = t.isRefreshing() ? LivenessScopeStack.open() : null) {
+                    // This will retrieve an existing index if one exists, or create a new one if not
+                    final BasicDataIndex dataIndex = Optional
+                            .ofNullable(DataIndexer.getDataIndex(t, info.indexColumnNames))
+                            .or(() -> Optional.of(DataIndexer.getOrCreateDataIndex(t, info.indexColumnNames)))
+                            .get()
+                            .transform(DataIndexTransformer.builder().invertRowSet(t.getRowSet()).build());
+                    final Table indexTable = dataIndex.table().sort(info.indexColumnNames.toArray(new String[0]));
+                    final TableInfo.Builder indexTableInfoBuilder = TableInfo.builder().addSortingColumns(
+                            info.indexColumnNames.stream()
+                                    .map(cn -> SortColumnInfo.of(cn, SortColumnInfo.SortDirection.Ascending))
+                                    .toArray(SortColumnInfo[]::new));
 
-                        cleanupFiles.add(info.destFile);
-                        tableInfoBuilder.addDataIndexes(DataIndexInfo.of(
-                                destDirPath.relativize(info.destFileForMetadata.toPath()).toString(),
-                                info.parquetColumnNames));
-                        final ParquetInstructions writeInstructionsToUse;
-                        if (INDEX_ROW_SET_COLUMN_NAME.equals(dataIndex.rowSetColumnName())) {
-                            writeInstructionsToUse = writeInstructions;
-                        } else {
-                            writeInstructionsToUse = new ParquetInstructions.Builder(writeInstructions)
-                                    .addColumnNameMapping(INDEX_ROW_SET_COLUMN_NAME, dataIndex.rowSetColumnName())
-                                    .build();
-                        }
-                        write(indexTable, indexTable.getDefinition(), writeInstructionsToUse,
-                                info.destFile.getAbsolutePath(), info.destFileForMetadata.getAbsolutePath(),
-                                Collections.emptyMap(), indexTableInfoBuilder, NullParquetMetadataFileWriter.INSTANCE,
-                                computedCache);
+                    tableInfoBuilder.addDataIndexes(DataIndexInfo.of(
+                            destDir.relativize(info.dest).getPath(),
+                            info.parquetColumnNames));
+                    final ParquetInstructions writeInstructionsToUse;
+                    if (INDEX_ROW_SET_COLUMN_NAME.equals(dataIndex.rowSetColumnName())) {
+                        writeInstructionsToUse = writeInstructions;
+                    } else {
+                        writeInstructionsToUse = new ParquetInstructions.Builder(writeInstructions)
+                                .addColumnNameMapping(INDEX_ROW_SET_COLUMN_NAME, dataIndex.rowSetColumnName())
+                                .build();
                     }
+                    write(indexTable, indexTable.getDefinition(), writeInstructionsToUse, info.dest,
+                            info.destOutputStream, Collections.emptyMap(), indexTableInfoBuilder,
+                            NullParquetMetadataFileWriter.INSTANCE, computedCache);
                 }
             }
+        }
 
-            // SortedColumnsAttribute effectively only stores (zero or more) individual columns by which the table is
-            // sorted, rather than ordered sets expressing multi-column sorts. Given that mismatch, we can only reflect
-            // a single column sort in the metadata at this time.
-            final List<SortColumn> sortedColumns = SortedColumnsAttribute.getSortedColumns(t);
-            if (!sortedColumns.isEmpty()) {
-                tableInfoBuilder.addSortingColumns(SortColumnInfo.of(sortedColumns.get(0)));
-            }
-            write(t, definition, writeInstructions, destFilePath, destFilePathForMetadata, incomingMeta,
-                    tableInfoBuilder, metadataFileWriter, computedCache);
-        } catch (Exception e) {
-            if (cleanupFiles != null) {
-                for (final File cleanupFile : cleanupFiles) {
-                    try {
-                        // noinspection ResultOfMethodCallIgnored
-                        cleanupFile.delete();
-                    } catch (Exception ignored) {
-                    }
-                }
-            }
-            throw e;
+        // SortedColumnsAttribute effectively only stores (zero or more) individual columns by which the table is
+        // sorted, rather than ordered sets expressing multi-column sorts. Given that mismatch, we can only reflect
+        // a single column sort in the metadata at this time.
+        final List<SortColumn> sortedColumns = SortedColumnsAttribute.getSortedColumns(t);
+        if (!sortedColumns.isEmpty()) {
+            tableInfoBuilder.addSortingColumns(SortColumnInfo.of(sortedColumns.get(0)));
         }
+        final long numBytes = write(t, definition, writeInstructions, dest, destOutputStream, incomingMeta,
+                tableInfoBuilder, metadataFileWriter, computedCache);
+        writeInstructions.onWriteCompleted()
+                .ifPresent(callback -> callback.onWriteCompleted(CompletedParquetWrite.builder()
+                        .destination(dest)
+                        .numRows(t.size())
+                        .numBytes(numBytes)
+                        .build()));
     }
 
     /**
@@ -205,23 +189,24 @@ static void write(
      * @param table The table to write
      * @param definition The table definition
      * @param writeInstructions Write instructions for customizations while writing
-     * @param destFilePath The destination path
-     * @param destFilePathForMetadata The destination path to store in the metadata files. This can be different from
-     *        {@code destFilePath} if we are writing the parquet file to a shadow location first since the metadata
-     *        should always hold the accurate path.
+     * @param dest The destination URI to write to
+     * @param destOutputStream The output stream to write to dest, should be marked as
+     *        {@link CompletableOutputStream#done()} once writing is finished
      * @param tableMeta A map of metadata values to be stores in the file footer
      * @param tableInfoBuilder A partially constructed builder for the metadata object
      * @param metadataFileWriter The writer for the {@value ParquetUtils#METADATA_FILE_NAME} and
      *        {@value ParquetUtils#COMMON_METADATA_FILE_NAME} files
      * @param computedCache Per column cache tags
+     * @return The number of bytes written
+     *
      * @throws IOException For file writing related errors
      */
-    static void write(
+    private static long write(
             @NotNull final Table table,
             @NotNull final TableDefinition definition,
             @NotNull final ParquetInstructions writeInstructions,
-            @NotNull final String destFilePath,
-            @NotNull final String destFilePathForMetadata,
+            @NotNull final URI dest,
+            @NotNull final CompletableOutputStream destOutputStream,
             @NotNull final Map<String, String> tableMeta,
             @NotNull final TableInfo.Builder tableInfoBuilder,
             @NotNull final ParquetMetadataFileWriter metadataFileWriter,
@@ -230,11 +215,18 @@ static void write(
             final Table t = pretransformTable(table, definition);
             final TrackingRowSet tableRowSet = t.getRowSet();
             final Map<String, ? extends ColumnSource<?>> columnSourceMap = t.getColumnSourceMap();
-            final ParquetFileWriter parquetFileWriter = getParquetFileWriter(computedCache, definition, tableRowSet,
-                    columnSourceMap, destFilePath, destFilePathForMetadata, writeInstructions, tableMeta,
-                    tableInfoBuilder, metadataFileWriter);
-            // Given the transformation, do not use the original table's "definition" for writing
-            write(t, writeInstructions, parquetFileWriter, computedCache);
+            final long numBytesWritten;
+            {
+                final ParquetFileWriter parquetFileWriter = getParquetFileWriter(computedCache, definition,
+                        tableRowSet, columnSourceMap, dest, destOutputStream, writeInstructions, tableMeta,
+                        tableInfoBuilder, metadataFileWriter);
+                // Given the transformation, do not use the original table's "definition" for writing
+                write(t, writeInstructions, parquetFileWriter, computedCache);
+                parquetFileWriter.close();
+                numBytesWritten = parquetFileWriter.bytesWritten();
+            }
+            destOutputStream.done();
+            return numBytesWritten;
         }
     }
 
@@ -269,8 +261,6 @@ private static void write(
                 }
             }
         }
-
-        parquetFileWriter.close();
     }
 
     /**
@@ -336,19 +326,16 @@ private static Table pretransformTable(@NotNull final Table table, @NotNull fina
      * Create a {@link ParquetFileWriter} for writing the table to disk.
      *
      * @param computedCache Per column cache tags
-     * @param definition the writable definition
-     * @param tableRowSet the row set being written
-     * @param columnSourceMap the columns of the table
-     * @param destFilePath the destination to write to
-     * @param destFilePathForMetadata The destination path to store in the metadata files. This can be different from
-     *        {@code destFilePath} if we are writing the parquet file to a shadow location first since the metadata
-     *        should always hold the accurate path.
-     * @param writeInstructions write instructions for the file
-     * @param tableMeta metadata to include in the parquet metadata
-     * @param tableInfoBuilder a builder for accumulating per-column information to construct the deephaven metadata
+     * @param definition The writable definition
+     * @param tableRowSet The row set being written
+     * @param columnSourceMap The columns of the table
+     * @param dest The destination URI to write to
+     * @param destOutputStream The output stream to write to dest
+     * @param writeInstructions Write instructions for the file
+     * @param tableMeta Metadata to include in the parquet metadata
+     * @param tableInfoBuilder Builder for accumulating per-column information to construct the deephaven metadata
      * @param metadataFileWriter The writer for the {@value ParquetUtils#METADATA_FILE_NAME} and
      *        {@value ParquetUtils#COMMON_METADATA_FILE_NAME} files
-     *
      * @return a new file writer
      */
     @NotNull
@@ -357,8 +344,8 @@ private static ParquetFileWriter getParquetFileWriter(
             @NotNull final TableDefinition definition,
             @NotNull final RowSet tableRowSet,
             @NotNull final Map<String, ? extends ColumnSource<?>> columnSourceMap,
-            @NotNull final String destFilePath,
-            @NotNull final String destFilePathForMetadata,
+            @NotNull final URI dest,
+            @NotNull final OutputStream destOutputStream,
             @NotNull final ParquetInstructions writeInstructions,
             @NotNull final Map<String, String> tableMeta,
             @NotNull final TableInfo.Builder tableInfoBuilder,
@@ -404,21 +391,18 @@ private static ParquetFileWriter getParquetFileWriter(
 
         final Map<String, String> extraMetaData = new HashMap<>(tableMeta);
         extraMetaData.put(METADATA_KEY, tableInfoBuilder.build().serializeToJSON());
-        return new ParquetFileWriter(destFilePath, destFilePathForMetadata,
-                SeekableChannelsProviderLoader.getInstance().fromServiceLoader(convertToURI(destFilePath, false), null),
-                writeInstructions.getTargetPageSize(),
+        return new ParquetFileWriter(dest, destOutputStream, writeInstructions.getTargetPageSize(),
                 new HeapByteBufferAllocator(), mappedSchema.getParquetSchema(),
                 writeInstructions.getCompressionCodecName(), extraMetaData, metadataFileWriter);
     }
 
-    @VisibleForTesting
-    static <DATA_TYPE> void writeColumnSource(
+    private static <DATA_TYPE> void writeColumnSource(
             @NotNull final RowSet tableRowSet,
             @NotNull final ParquetInstructions writeInstructions,
             @NotNull final RowGroupWriter rowGroupWriter,
             @NotNull final Map<String, Map<ParquetCacheTags, Object>> computedCache,
             @NotNull final String columnName,
-            @NotNull ColumnSource<DATA_TYPE> columnSource) throws IllegalAccessException, IOException {
+            @NotNull final ColumnSource<DATA_TYPE> columnSource) throws IllegalAccessException, IOException {
         try (final ColumnWriter columnWriter = rowGroupWriter.addColumn(
                 writeInstructions.getParquetColumnNameFromColumnNameOrDefault(columnName))) {
             boolean usedDictionary = false;
@@ -435,8 +419,8 @@ static <DATA_TYPE> void writeColumnSource(
     /**
      * Makes a copy of the given buffer
      */
-    private static IntBuffer makeCopy(IntBuffer orig) {
-        IntBuffer copy = IntBuffer.allocate(orig.capacity());
+    private static IntBuffer makeCopy(final IntBuffer orig) {
+        final IntBuffer copy = IntBuffer.allocate(orig.capacity());
         copy.put(orig).flip();
         return copy;
     }
@@ -534,9 +518,9 @@ private static <DATA_TYPE> void encodePlain(
         try (final TransferObject<?> transferObject = TransferObject.create(
                 tableRowSet, writeInstructions, computedCache, columnName, columnSource)) {
             final Statistics<?> statistics = columnWriter.getStats();
-            boolean writeVectorPages = (transferObject instanceof ArrayAndVectorTransfer);
+            final boolean writeVectorPages = (transferObject instanceof ArrayAndVectorTransfer);
             do {
-                int numValuesBuffered = transferObject.transferOnePageToBuffer();
+                final int numValuesBuffered = transferObject.transferOnePageToBuffer();
                 if (writeVectorPages) {
                     columnWriter.addVectorPage(transferObject.getBuffer(), transferObject.getRepeatCount(),
                             numValuesBuffered, statistics);
diff --git a/extensions/parquet/table/src/main/java/io/deephaven/parquet/table/ParquetTools.java b/extensions/parquet/table/src/main/java/io/deephaven/parquet/table/ParquetTools.java
index bf2c227828e..aaf3cf616d8 100644
--- a/extensions/parquet/table/src/main/java/io/deephaven/parquet/table/ParquetTools.java
+++ b/extensions/parquet/table/src/main/java/io/deephaven/parquet/table/ParquetTools.java
@@ -16,13 +16,16 @@
 import io.deephaven.engine.table.PartitionedTableFactory;
 import io.deephaven.engine.table.Table;
 import io.deephaven.engine.table.TableDefinition;
+import io.deephaven.engine.table.impl.TableUpdateMode;
 import io.deephaven.engine.table.impl.locations.util.PartitionFormatter;
 import io.deephaven.engine.table.impl.locations.util.TableDataRefreshService;
 import io.deephaven.engine.updategraph.UpdateSourceRegistrar;
 import io.deephaven.parquet.base.ParquetMetadataFileWriter;
 import io.deephaven.parquet.base.NullParquetMetadataFileWriter;
 import io.deephaven.util.SafeCloseable;
-import io.deephaven.util.channel.SeekableChannelsProviderPlugin;
+import io.deephaven.util.channel.CompletableOutputStream;
+import io.deephaven.util.channel.SeekableChannelsProvider;
+import io.deephaven.util.channel.SeekableChannelsProviderLoader;
 import io.deephaven.vector.*;
 import io.deephaven.engine.table.*;
 import io.deephaven.engine.table.impl.PartitionAwareSourceTable;
@@ -37,7 +40,7 @@
 import io.deephaven.engine.table.impl.sources.regioned.RegionedTableComponentFactoryImpl;
 import io.deephaven.internal.log.LoggerFactory;
 import io.deephaven.io.logger.Logger;
-import io.deephaven.parquet.base.ParquetFileReader;
+import io.deephaven.parquet.base.ParquetUtils;
 import io.deephaven.parquet.table.layout.ParquetFlatPartitionedLayout;
 import io.deephaven.parquet.table.layout.ParquetKeyValuePartitionedLayout;
 import io.deephaven.parquet.table.layout.ParquetMetadataFileLayout;
@@ -54,19 +57,14 @@
 import java.io.IOException;
 import java.math.BigDecimal;
 import java.net.URI;
-import java.nio.file.DirectoryStream;
-import java.nio.file.Files;
-import java.nio.file.Path;
-import java.nio.file.attribute.BasicFileAttributes;
 import java.util.*;
 import java.util.function.Supplier;
 import java.util.stream.Collectors;
 
+import static io.deephaven.base.FileUtils.URI_SEPARATOR_CHAR;
 import static io.deephaven.base.FileUtils.convertToURI;
-import static io.deephaven.parquet.base.ParquetFileReader.FILE_URI_SCHEME;
-import static io.deephaven.parquet.base.ParquetUtils.COMMON_METADATA_FILE_URI_SUFFIX;
-import static io.deephaven.parquet.base.ParquetUtils.METADATA_FILE_URI_SUFFIX;
-import static io.deephaven.parquet.base.ParquetUtils.isParquetFile;
+import static io.deephaven.parquet.base.ParquetUtils.PARQUET_OUTPUT_BUFFER_SIZE;
+import static io.deephaven.parquet.base.ParquetUtils.resolve;
 import static io.deephaven.parquet.table.ParquetInstructions.FILE_INDEX_TOKEN;
 import static io.deephaven.parquet.table.ParquetInstructions.PARTITIONS_TOKEN;
 import static io.deephaven.parquet.table.ParquetInstructions.UUID_TOKEN;
@@ -91,9 +89,7 @@ private ParquetTools() {}
 
     /**
      * Reads in a table from a single parquet file, metadata file, or directory with recognized layout. The source
-     * provided can be a local file path or a URI to be resolved via the provided
-     * {@link SeekableChannelsProviderPlugin}.
-     *
+     * provided can be a local file path or a URI to be resolved.
      * <p>
      * This method attempts to "do the right thing." It examines the source to determine if it's a single parquet file,
      * a metadata file, or a directory. If it's a directory, it additionally tries to guess the layout to use. Unless a
@@ -112,8 +108,7 @@ public static Table readTable(@NotNull final String source) {
 
     /**
      * Reads in a table from a single parquet file, metadata file, or directory with recognized layout. The source
-     * provided can be a local file path or a URI to be resolved via the provided
-     * {@link SeekableChannelsProviderPlugin}.
+     * provided can be a local file path or a URI to be resolved.
      *
      * <p>
      * If the {@link ParquetFileLayout} is not provided in the {@link ParquetInstructions instructions}, this method
@@ -132,7 +127,9 @@ public static Table readTable(@NotNull final String source) {
     public static Table readTable(
             @NotNull final String source,
             @NotNull final ParquetInstructions readInstructions) {
-        final boolean isDirectory = !isParquetFile(source);
+        final boolean isParquetFile = ParquetUtils.isParquetFile(source);
+        final boolean isMetadataFile = !isParquetFile && ParquetUtils.isMetadataFile(source);
+        final boolean isDirectory = !isParquetFile && !isMetadataFile;
         final URI sourceURI = convertToURI(source, isDirectory);
         if (readInstructions.getFileLayout().isPresent()) {
             switch (readInstructions.getFileLayout().get()) {
@@ -141,23 +138,18 @@ public static Table readTable(
                 case FLAT_PARTITIONED:
                     return readFlatPartitionedTable(sourceURI, readInstructions);
                 case KV_PARTITIONED:
-                    return readKeyValuePartitionedTable(sourceURI, readInstructions);
+                    return readKeyValuePartitionedTable(sourceURI, readInstructions, null);
                 case METADATA_PARTITIONED:
-                    return readPartitionedTableWithMetadata(sourceURI, readInstructions);
+                    return readPartitionedTableWithMetadata(sourceURI, readInstructions, null);
             }
         }
-        if (FILE_URI_SCHEME.equals(sourceURI.getScheme())) {
-            return readTableFromFileUri(sourceURI, readInstructions);
-        }
-        if (source.endsWith(METADATA_FILE_URI_SUFFIX) || source.endsWith(COMMON_METADATA_FILE_URI_SUFFIX)) {
-            throw new UnsupportedOperationException("We currently do not support reading parquet metadata files " +
-                    "from non local storage");
-        }
-        if (!isDirectory) {
+        if (isParquetFile) {
             return readSingleFileTable(sourceURI, readInstructions);
         }
-        // Both flat partitioned and key-value partitioned data can be read under key-value partitioned layout
-        return readKeyValuePartitionedTable(sourceURI, readInstructions);
+        if (isMetadataFile) {
+            return readPartitionedTableWithMetadata(sourceURI, readInstructions, null);
+        }
+        return readPartitionedTableDirectory(sourceURI, readInstructions);
     }
 
     /**
@@ -205,15 +197,6 @@ private static ParquetInstructions ensureTableDefinition(
         return instructions;
     }
 
-    private static File getShadowFile(final File destFile) {
-        return new File(destFile.getParent(), ".NEW_" + destFile.getName());
-    }
-
-    @VisibleForTesting
-    static File getBackupFile(final File destFile) {
-        return new File(destFile.getParent(), ".OLD_" + destFile.getName());
-    }
-
     private static String minusParquetSuffix(@NotNull final String s) {
         if (s.endsWith(PARQUET_FILE_EXTENSION)) {
             return s.substring(0, s.length() - PARQUET_FILE_EXTENSION.length());
@@ -221,10 +204,22 @@ private static String minusParquetSuffix(@NotNull final String s) {
         return s;
     }
 
+    /**
+     * Get the name of the file from the URI.
+     */
+    private static String getFileName(@NotNull final URI uri) {
+        final String path = uri.getPath();
+        final int lastSlash = path.lastIndexOf(URI_SEPARATOR_CHAR);
+        if (lastSlash == path.length() - 1) {
+            throw new IllegalArgumentException("Directory URIs are not supported, found" + uri);
+        }
+        return lastSlash == -1 ? path : path.substring(lastSlash + 1);
+    }
+
     /**
      * Generates the index file path relative to the table destination file path.
      *
-     * @param tableDest Destination path for the main table containing these indexing columns
+     * @param destFileName Destination name for the main table containing these indexing columns
      * @param columnNames Array of indexing column names
      *
      * @return The relative index file path. For example, for table with destination {@code "table.parquet"} and
@@ -232,10 +227,10 @@ private static String minusParquetSuffix(@NotNull final String s) {
      *         {@code ".dh_metadata/indexes/IndexingColName/index_IndexingColName_table.parquet"} on unix systems.
      */
     @VisibleForTesting
-    static String getRelativeIndexFilePath(@NotNull final File tableDest, @NotNull final String... columnNames) {
+    static String getRelativeIndexFilePath(@NotNull final String destFileName, @NotNull final String... columnNames) {
         final String columns = String.join(",", columnNames);
         return String.format(".dh_metadata%sindexes%s%s%sindex_%s_%s", File.separator, File.separator, columns,
-                File.separator, columns, tableDest.getName());
+                File.separator, columns, destFileName);
     }
 
     /**
@@ -255,139 +250,36 @@ public static String legacyGroupingFileName(@NotNull final File tableDest, @NotN
         return prefix + "_" + columnName + "_grouping.parquet";
     }
 
-    /**
-     * Delete any old backup files created for this destination, and throw an exception on failure
-     */
-    private static void deleteBackupFile(@NotNull final File destFile) {
-        if (!deleteBackupFileNoExcept(destFile)) {
-            throw new UncheckedDeephavenException(
-                    String.format("Failed to delete backup file at %s", getBackupFile(destFile).getAbsolutePath()));
-        }
-    }
-
-    /**
-     * Delete any old backup files created for this destination with no exception in case of failure
-     */
-    private static boolean deleteBackupFileNoExcept(@NotNull final File destFile) {
-        final File backupDestFile = getBackupFile(destFile);
-        if (backupDestFile.exists() && !backupDestFile.delete()) {
-            log.error().append("Error in deleting backup file at path ")
-                    .append(backupDestFile.getAbsolutePath())
-                    .endl();
-            return false;
-        }
-        return true;
-    }
-
-    /**
-     * Backup any existing files at location destFile and rename the shadow file to destFile
-     */
-    private static void installShadowFile(@NotNull final File destFile, @NotNull final File shadowDestFile) {
-        final File backupDestFile = getBackupFile(destFile);
-        if (destFile.exists() && !destFile.renameTo(backupDestFile)) {
-            throw new UncheckedDeephavenException(
-                    String.format(
-                            "Failed to install shadow file at %s because a file already exists at the path which couldn't be renamed to %s",
-                            destFile.getAbsolutePath(), backupDestFile.getAbsolutePath()));
-        }
-        if (!shadowDestFile.renameTo(destFile)) {
-            throw new UncheckedDeephavenException(String.format(
-                    "Failed to install shadow file at %s because couldn't rename temporary shadow file from %s to %s",
-                    destFile.getAbsolutePath(), shadowDestFile.getAbsolutePath(), destFile.getAbsolutePath()));
-        }
-    }
-
-    /**
-     * Roll back any changes made in the {@link #installShadowFile} in best-effort manner
-     */
-    private static void rollbackFile(@NotNull final File destFile) {
-        final File backupDestFile = getBackupFile(destFile);
-        final File shadowDestFile = getShadowFile(destFile);
-        destFile.renameTo(shadowDestFile);
-        backupDestFile.renameTo(destFile);
-    }
-
-    /**
-     * Make any missing ancestor directories of {@code destination}.
-     *
-     * @param destination The destination parquet file
-     * @return The first created directory, or null if no directories were made.
-     */
-    private static File prepareDestinationFileLocation(@NotNull File destination) {
-        destination = destination.getAbsoluteFile();
-        if (!destination.getPath().endsWith(PARQUET_FILE_EXTENSION)) {
-            throw new UncheckedDeephavenException(
-                    String.format("Destination %s does not end in %s extension", destination, PARQUET_FILE_EXTENSION));
-        }
-        if (destination.exists()) {
-            if (destination.isDirectory()) {
-                throw new UncheckedDeephavenException(
-                        String.format("Destination %s exists and is a directory", destination));
-            }
-            if (!destination.canWrite()) {
-                throw new UncheckedDeephavenException(
-                        String.format("Destination %s exists but is not writable", destination));
-            }
-            return null;
-        }
-        final File firstParent = destination.getParentFile();
-        if (firstParent.isDirectory()) {
-            if (firstParent.canWrite()) {
-                return null;
-            }
-            throw new UncheckedDeephavenException(
-                    String.format("Destination %s has non writable parent directory", destination));
-        }
-        File firstCreated = firstParent;
-        File parent;
-        for (parent = destination.getParentFile(); parent != null && !parent.exists(); parent =
-                parent.getParentFile()) {
-            firstCreated = parent;
-        }
-        if (parent == null) {
-            throw new IllegalArgumentException(
-                    String.format("Can't find any existing parent directory for destination path: %s", destination));
-        }
-        if (!parent.isDirectory()) {
-            throw new IllegalArgumentException(
-                    String.format("Existing parent file %s of %s is not a directory", parent, destination));
-        }
-        if (!firstParent.mkdirs()) {
-            throw new UncheckedDeephavenException("Couldn't (re)create destination directory " + firstParent);
-        }
-        return firstCreated;
-    }
-
     /**
      * Helper function for building index column info for writing and deleting any backup index column files
      *
      * @param indexColumns Names of index columns, stored as String list for each index
      * @param parquetColumnNameArr Names of index columns for the parquet file, stored as String[] for each index
-     * @param destFile The destination path for the main table containing these index columns
+     * @param dest The destination URI for the main table containing these index columns
+     * @param channelProvider The channel provider to use for creating channels to the index files
      */
     private static List<ParquetTableWriter.IndexWritingInfo> indexInfoBuilderHelper(
             @NotNull final Collection<List<String>> indexColumns,
             @NotNull final String[][] parquetColumnNameArr,
-            @NotNull final File destFile) {
+            @NotNull final URI dest,
+            @NotNull final SeekableChannelsProvider channelProvider) throws IOException {
         Require.eq(indexColumns.size(), "indexColumns.size", parquetColumnNameArr.length,
                 "parquetColumnNameArr.length");
         final int numIndexes = indexColumns.size();
         final List<ParquetTableWriter.IndexWritingInfo> indexInfoList = new ArrayList<>(numIndexes);
         int gci = 0;
+        final String destFileName = getFileName(dest);
         for (final List<String> indexColumnNames : indexColumns) {
             final String[] parquetColumnNames = parquetColumnNameArr[gci];
-            final String indexFileRelativePath = getRelativeIndexFilePath(destFile, parquetColumnNames);
-            final File indexFile = new File(destFile.getParent(), indexFileRelativePath);
-            prepareDestinationFileLocation(indexFile);
-            deleteBackupFile(indexFile);
-
-            final File shadowIndexFile = getShadowFile(indexFile);
-
+            final String indexFileRelativePath = getRelativeIndexFilePath(destFileName, parquetColumnNames);
+            final URI indexFileURI = resolve(dest, indexFileRelativePath);
+            final CompletableOutputStream indexFileOutputStream =
+                    channelProvider.getOutputStream(indexFileURI, PARQUET_OUTPUT_BUFFER_SIZE);
             final ParquetTableWriter.IndexWritingInfo info = new ParquetTableWriter.IndexWritingInfo(
                     indexColumnNames,
                     parquetColumnNames,
-                    indexFile,
-                    shadowIndexFile);
+                    indexFileURI,
+                    indexFileOutputStream);
             indexInfoList.add(info);
             gci++;
         }
@@ -404,7 +296,7 @@ private static List<ParquetTableWriter.IndexWritingInfo> indexInfoBuilderHelper(
      * while writing, use {@link ParquetInstructions.Builder#addIndexColumns}.
      *
      * @param sourceTable The table to partition and write
-     * @param destinationDir The path to destination root directory to store partitioned data in nested format.
+     * @param destinationDir The path or URI to destination root directory to store partitioned data in nested format.
      *        Non-existing directories are created.
      * @param writeInstructions Write instructions for customizations while writing
      */
@@ -439,7 +331,7 @@ public static void writeKeyValuePartitionedTable(
      * {@link ParquetInstructions.Builder#addIndexColumns}.
      *
      * @param partitionedTable The partitioned table to write
-     * @param destinationDir The path to destination root directory to store partitioned data in nested format.
+     * @param destinationDir The path or URI to destination root directory to store partitioned data in nested format.
      *        Non-existing directories are created.
      * @param writeInstructions Write instructions for customizations while writing
      */
@@ -470,7 +362,7 @@ public static void writeKeyValuePartitionedTable(
      * @param partitionedTable The partitioned table to write
      * @param keyTableDefinition The definition for key columns
      * @param leafDefinition The definition for leaf parquet files to be written
-     * @param destinationRoot The path to destination root directory to store partitioned data in nested format
+     * @param destinationRoot The path or URI to destination root directory to store partitioned data in nested format
      * @param writeInstructions Write instructions for customizations while writing
      * @param indexColumns Collection containing the column names for indexes to persist. The write operation will store
      *        the index info as sidecar tables. This argument is used to narrow the set of indexes to write, or to be
@@ -524,14 +416,16 @@ private static void writeKeyValuePartitionedTableImpl(
         });
         // For the constituent column for each row, accumulate the constituent tables and build the final file paths
         final Collection<Table> partitionedData = new ArrayList<>();
-        final Collection<File> destinations = new ArrayList<>();
+        final Collection<URI> destinations = new ArrayList<>();
         try (final CloseableIterator<ObjectVector<? extends Table>> constituentIterator =
                 withGroupConstituents.objectColumnIterator(partitionedTable.constituentColumnName())) {
             int row = 0;
+            final URI destinationDir = convertToURI(destinationRoot, true);
             while (constituentIterator.hasNext()) {
                 final ObjectVector<? extends Table> constituentVector = constituentIterator.next();
                 final List<String> partitionStrings = partitionStringsList.get(row);
-                final File relativePath = new File(destinationRoot, String.join(File.separator, partitionStrings));
+                final String relativePath = concatenatePartitions(partitionStrings);
+                final URI partitionDir = resolve(destinationDir, relativePath);
                 int count = 0;
                 for (final Table constituent : constituentVector) {
                     String filename = baseName;
@@ -545,7 +439,7 @@ private static void writeKeyValuePartitionedTableImpl(
                         filename = filename.replace(UUID_TOKEN, UUID.randomUUID().toString());
                     }
                     filename += PARQUET_FILE_EXTENSION;
-                    destinations.add(new File(relativePath, filename));
+                    destinations.add(resolve(partitionDir, filename));
                     partitionedData.add(constituent);
                     count++;
                 }
@@ -569,14 +463,22 @@ private static void writeKeyValuePartitionedTableImpl(
             // Store hard reference to prevent indexes from being garbage collected
             final List<DataIndex> dataIndexes = addIndexesToTables(partitionedDataArray, indexColumns);
             writeTablesImpl(partitionedDataArray, leafDefinition, writeInstructions,
-                    destinations.toArray(File[]::new), indexColumns, partitioningColumnsSchema,
-                    new File(destinationRoot), computedCache);
+                    destinations.toArray(URI[]::new), indexColumns, partitioningColumnsSchema,
+                    convertToURI(destinationRoot, true), computedCache);
             if (dataIndexes != null) {
                 dataIndexes.clear();
             }
         }
     }
 
+    private static String concatenatePartitions(final List<String> partitions) {
+        final StringBuilder builder = new StringBuilder();
+        for (final String partition : partitions) {
+            builder.append(partition).append(File.separator);
+        }
+        return builder.toString();
+    }
+
     /**
      * Add data indexes to provided tables, if not present, and return a list of hard references to the indexes.
      */
@@ -658,10 +560,10 @@ private static void writeTablesImpl(
             @NotNull final Table[] sources,
             @NotNull final TableDefinition definition,
             @NotNull final ParquetInstructions writeInstructions,
-            @NotNull final File[] destinations,
+            @NotNull final URI[] destinations,
             @NotNull final Collection<List<String>> indexColumns,
             @Nullable final MessageType partitioningColumnsSchema,
-            @Nullable final File metadataRootDir,
+            @Nullable final URI metadataRootDir,
             @NotNull final Map<String, Map<ParquetCacheTags, Object>> computedCache) {
         Require.eq(sources.length, "sources.length", destinations.length, "destinations.length");
         if (writeInstructions.getFileLayout().isPresent()) {
@@ -671,14 +573,9 @@ private static void writeTablesImpl(
         if (definition.numColumns() == 0) {
             throw new TableDataException("Cannot write a parquet table with zero columns");
         }
-        Arrays.stream(destinations).forEach(ParquetTools::deleteBackupFile);
-
-        // Write all files at temporary shadow file paths in the same directory to prevent overwriting any existing
-        // data in case of failure
-        final File[] shadowDestFiles =
-                Arrays.stream(destinations).map(ParquetTools::getShadowFile).toArray(File[]::new);
-        final File[] firstCreatedDirs =
-                Arrays.stream(shadowDestFiles).map(ParquetTools::prepareDestinationFileLocation).toArray(File[]::new);
+        // Assuming all destination URIs have the same scheme, and will use the same channels provider instance
+        final SeekableChannelsProvider channelsProvider = SeekableChannelsProviderLoader.getInstance()
+                .load(destinations[0].getScheme(), writeInstructions.getSpecialInstructions());
 
         final ParquetMetadataFileWriter metadataFileWriter;
         if (writeInstructions.generateMetadataFiles()) {
@@ -691,104 +588,75 @@ private static void writeTablesImpl(
             metadataFileWriter = NullParquetMetadataFileWriter.INSTANCE;
         }
 
-        // List of shadow files, to clean up in case of exceptions
-        final List<File> shadowFiles = new ArrayList<>();
-        // List of all destination files (including index files), to roll back in case of exceptions
-        final List<File> destFiles = new ArrayList<>();
-        try {
-            final List<List<ParquetTableWriter.IndexWritingInfo>> indexInfoLists;
-            if (indexColumns.isEmpty()) {
-                // Write the tables without any index info
-                indexInfoLists = null;
-                for (int tableIdx = 0; tableIdx < sources.length; tableIdx++) {
-                    shadowFiles.add(shadowDestFiles[tableIdx]);
-                    final Table source = sources[tableIdx];
-                    ParquetTableWriter.write(source, definition, writeInstructions, shadowDestFiles[tableIdx].getPath(),
-                            destinations[tableIdx].getPath(), Collections.emptyMap(),
-                            (List<ParquetTableWriter.IndexWritingInfo>) null, metadataFileWriter,
-                            computedCache);
+        // List of output streams created, to rollback in case of exceptions
+        final List<CompletableOutputStream> outputStreams = new ArrayList<>(destinations.length);
+        try (final SafeCloseable ignored = () -> SafeCloseable.closeAll(outputStreams.stream())) {
+            try {
+                if (indexColumns.isEmpty()) {
+                    // Write the tables without any index info
+                    for (int tableIdx = 0; tableIdx < sources.length; tableIdx++) {
+                        final Table source = sources[tableIdx];
+                        final URI tableDestination = destinations[tableIdx];
+                        final CompletableOutputStream outputStream = channelsProvider.getOutputStream(
+                                tableDestination, PARQUET_OUTPUT_BUFFER_SIZE);
+                        outputStreams.add(outputStream);
+                        ParquetTableWriter.write(source, definition, writeInstructions, tableDestination, outputStream,
+                                Collections.emptyMap(), (List<ParquetTableWriter.IndexWritingInfo>) null,
+                                metadataFileWriter, computedCache);
+                    }
+                } else {
+                    // Shared parquet column names across all tables
+                    final String[][] parquetColumnNameArr = indexColumns.stream()
+                            .map((Collection<String> columns) -> columns.stream()
+                                    .map(writeInstructions::getParquetColumnNameFromColumnNameOrDefault)
+                                    .toArray(String[]::new))
+                            .toArray(String[][]::new);
+
+                    for (int tableIdx = 0; tableIdx < sources.length; tableIdx++) {
+                        final URI tableDestination = destinations[tableIdx];
+                        final List<ParquetTableWriter.IndexWritingInfo> indexInfoList =
+                                indexInfoBuilderHelper(indexColumns, parquetColumnNameArr, tableDestination,
+                                        channelsProvider);
+                        final CompletableOutputStream outputStream = channelsProvider.getOutputStream(
+                                destinations[tableIdx], PARQUET_OUTPUT_BUFFER_SIZE);
+                        outputStreams.add(outputStream);
+                        for (final ParquetTableWriter.IndexWritingInfo info : indexInfoList) {
+                            outputStreams.add(info.destOutputStream);
+                        }
+                        final Table source = sources[tableIdx];
+                        ParquetTableWriter.write(source, definition, writeInstructions, tableDestination, outputStream,
+                                Collections.emptyMap(), indexInfoList, metadataFileWriter, computedCache);
+                    }
                 }
-            } else {
-                // Create index info for each table and write the table and index files to shadow path
-                indexInfoLists = new ArrayList<>(sources.length);
-
-                // Shared parquet column names across all tables
-                final String[][] parquetColumnNameArr = indexColumns.stream()
-                        .map((Collection<String> columns) -> columns.stream()
-                                .map(writeInstructions::getParquetColumnNameFromColumnNameOrDefault)
-                                .toArray(String[]::new))
-                        .toArray(String[][]::new);
-
-                for (int tableIdx = 0; tableIdx < sources.length; tableIdx++) {
-                    final File tableDestination = destinations[tableIdx];
-                    final List<ParquetTableWriter.IndexWritingInfo> indexInfoList =
-                            indexInfoBuilderHelper(indexColumns, parquetColumnNameArr, tableDestination);
-                    indexInfoLists.add(indexInfoList);
 
-                    shadowFiles.add(shadowDestFiles[tableIdx]);
-                    indexInfoList.forEach(item -> shadowFiles.add(item.destFile));
-
-                    final Table sourceTable = sources[tableIdx];
-                    ParquetTableWriter.write(sourceTable, definition, writeInstructions,
-                            shadowDestFiles[tableIdx].getPath(), tableDestination.getPath(), Collections.emptyMap(),
-                            indexInfoList, metadataFileWriter, computedCache);
+                if (writeInstructions.generateMetadataFiles()) {
+                    final URI metadataDest = metadataRootDir.resolve(METADATA_FILE_NAME);
+                    final CompletableOutputStream metadataOutputStream = channelsProvider.getOutputStream(
+                            metadataDest, PARQUET_OUTPUT_BUFFER_SIZE);
+                    outputStreams.add(metadataOutputStream);
+                    final URI commonMetadataDest = metadataRootDir.resolve(COMMON_METADATA_FILE_NAME);
+                    final CompletableOutputStream commonMetadataOutputStream = channelsProvider.getOutputStream(
+                            commonMetadataDest, PARQUET_OUTPUT_BUFFER_SIZE);
+                    outputStreams.add(commonMetadataOutputStream);
+                    metadataFileWriter.writeMetadataFiles(metadataOutputStream, commonMetadataOutputStream);
                 }
-            }
-
-            // Write the combined metadata files to shadow destinations
-            final File metadataDestFile, shadowMetadataFile, commonMetadataDestFile, shadowCommonMetadataFile;
-            if (writeInstructions.generateMetadataFiles()) {
-                metadataDestFile = new File(metadataRootDir, METADATA_FILE_NAME);
-                shadowMetadataFile = ParquetTools.getShadowFile(metadataDestFile);
-                shadowFiles.add(shadowMetadataFile);
-                commonMetadataDestFile = new File(metadataRootDir, COMMON_METADATA_FILE_NAME);
-                shadowCommonMetadataFile = ParquetTools.getShadowFile(commonMetadataDestFile);
-                shadowFiles.add(shadowCommonMetadataFile);
-                metadataFileWriter.writeMetadataFiles(shadowMetadataFile.getAbsolutePath(),
-                        shadowCommonMetadataFile.getAbsolutePath());
-            } else {
-                metadataDestFile = shadowMetadataFile = commonMetadataDestFile = shadowCommonMetadataFile = null;
-            }
 
-            // Write to shadow files was successful, now replace the original files with the shadow files
-            for (int tableIdx = 0; tableIdx < sources.length; tableIdx++) {
-                destFiles.add(destinations[tableIdx]);
-                installShadowFile(destinations[tableIdx], shadowDestFiles[tableIdx]);
-                if (indexInfoLists != null) {
-                    final List<ParquetTableWriter.IndexWritingInfo> indexInfoList = indexInfoLists.get(tableIdx);
-                    for (final ParquetTableWriter.IndexWritingInfo info : indexInfoList) {
-                        final File indexDestFile = info.destFileForMetadata;
-                        final File shadowIndexFile = info.destFile;
-                        destFiles.add(indexDestFile);
-                        installShadowFile(indexDestFile, shadowIndexFile);
-                    }
+                // Commit all the writes to underlying file system, to detect any exceptions early before closing
+                for (final CompletableOutputStream outputStream : outputStreams) {
+                    outputStream.complete();
                 }
-            }
-            if (writeInstructions.generateMetadataFiles()) {
-                destFiles.add(metadataDestFile);
-                installShadowFile(metadataDestFile, shadowMetadataFile);
-                destFiles.add(commonMetadataDestFile);
-                installShadowFile(commonMetadataDestFile, shadowCommonMetadataFile);
-            }
-        } catch (Exception e) {
-            for (final File file : destFiles) {
-                rollbackFile(file);
-            }
-            for (final File file : shadowFiles) {
-                file.delete();
-            }
-            for (final File firstCreatedDir : firstCreatedDirs) {
-                if (firstCreatedDir == null) {
-                    continue;
+            } catch (final Exception e) {
+                // Try to rollback all the output streams in reverse order to undo any writes
+                for (int idx = outputStreams.size() - 1; idx >= 0; idx--) {
+                    try {
+                        outputStreams.get(idx).rollback();
+                    } catch (IOException e1) {
+                        log.error().append("Error in rolling back output stream ").append(e1).endl();
+                    }
                 }
-                log.error().append(
-                        "Error in table writing, cleaning up potentially incomplete table destination path starting from ")
-                        .append(firstCreatedDir.getAbsolutePath()).append(e).endl();
-                FileUtils.deleteRecursivelyOnNFS(firstCreatedDir);
+                throw new UncheckedDeephavenException("Error writing parquet tables", e);
             }
-            throw new UncheckedDeephavenException("Error writing parquet tables", e);
         }
-        destFiles.forEach(ParquetTools::deleteBackupFileNoExcept);
     }
 
     /**
@@ -885,28 +753,35 @@ public static void writeTables(
             }
             definition = firstDefinition;
         }
-        final File[] destinationFiles = new File[destinations.length];
+        final URI[] destinationUris = new URI[destinations.length];
+        String firstScheme = null;
         for (int idx = 0; idx < destinations.length; idx++) {
-            final URI destinationURI = convertToURI(destinations[idx], false);
-            if (!FILE_URI_SCHEME.equals(destinationURI.getScheme())) {
+            if (!destinations[idx].endsWith(PARQUET_FILE_EXTENSION)) {
                 throw new IllegalArgumentException(
-                        "Only file URI scheme is supported for writing parquet files, found" +
-                                "non-file URI: " + destinations[idx]);
+                        String.format("Destination %s does not end in %s extension", destinations[idx],
+                                PARQUET_FILE_EXTENSION));
+            }
+            destinationUris[idx] = convertToURI(destinations[idx], false);
+            if (idx == 0) {
+                firstScheme = destinationUris[0].getScheme();
+            } else if (!firstScheme.equals(destinationUris[idx].getScheme())) {
+                throw new IllegalArgumentException("All destination URIs must have the same scheme, expected " +
+                        firstScheme + " found " + destinationUris[idx].getScheme());
             }
-            destinationFiles[idx] = new File(destinationURI);
         }
-        final File metadataRootDir;
+        final URI metadataRootDir;
         if (writeInstructions.generateMetadataFiles()) {
             // We insist on writing the metadata file in the same directory as the destination files, thus all
             // destination files should be in the same directory.
-            final String firstDestinationDir = destinationFiles[0].getAbsoluteFile().getParentFile().getAbsolutePath();
+            final URI firstDestinationDir = destinationUris[0].resolve(".");
             for (int i = 1; i < destinations.length; i++) {
-                if (!firstDestinationDir.equals(destinationFiles[i].getParentFile().getAbsolutePath())) {
+                final URI destinationDir = destinationUris[i].resolve(".");
+                if (!firstDestinationDir.equals(destinationDir)) {
                     throw new IllegalArgumentException("All destination files must be in the same directory for " +
-                            " generating metadata files");
+                            " generating metadata files, found " + firstDestinationDir + " and " + destinationDir);
                 }
             }
-            metadataRootDir = new File(firstDestinationDir);
+            metadataRootDir = firstDestinationDir;
         } else {
             metadataRootDir = null;
         }
@@ -916,7 +791,7 @@ public static void writeTables(
                 buildComputedCache(() -> PartitionedTableFactory.ofTables(definition, sources).merge(), definition);
         // We do not have any additional schema for partitioning columns in this case. Schema for all columns will be
         // generated at the time of writing the parquet files and merged to generate the metadata files.
-        writeTablesImpl(sources, definition, writeInstructions, destinationFiles, indexColumns, null, metadataRootDir,
+        writeTablesImpl(sources, definition, writeInstructions, destinationUris, indexColumns, null, metadataRootDir,
                 computedCache);
     }
 
@@ -930,82 +805,6 @@ public static void deleteTable(final String path) {
         FileUtils.deleteRecursivelyOnNFS(new File(path));
     }
 
-    /**
-     * This method attempts to "do the right thing." It examines the source file URI to determine if it's a single
-     * parquet file, a metadata file, or a directory. If it's a directory, it additionally tries to guess the layout to
-     * use. Unless a metadata file is supplied or discovered in the directory, the highest (by
-     * {@link ParquetTableLocationKey location key} order) location found will be used to infer schema.
-     *
-     * @param source The source URI with {@value ParquetFileReader#FILE_URI_SCHEME} scheme
-     * @param instructions Instructions for reading
-     * @return A {@link Table}
-     */
-    private static Table readTableFromFileUri(
-            @NotNull final URI source,
-            @NotNull final ParquetInstructions instructions) {
-        final Path sourcePath = Path.of(source);
-        if (!Files.exists(sourcePath)) {
-            throw new TableDataException("Source file " + source + " does not exist");
-        }
-        final String sourceFileName = sourcePath.getFileName().toString();
-        final BasicFileAttributes sourceAttr = readAttributes(sourcePath);
-        if (sourceAttr.isRegularFile()) {
-            if (sourceFileName.endsWith(PARQUET_FILE_EXTENSION)) {
-                return readSingleFileTable(source, instructions);
-            }
-            final URI parentDirURI = convertToURI(sourcePath.getParent(), true);
-            if (sourceFileName.equals(METADATA_FILE_NAME)) {
-                return readPartitionedTableWithMetadata(parentDirURI, instructions);
-            }
-            if (sourceFileName.equals(COMMON_METADATA_FILE_NAME)) {
-                return readPartitionedTableWithMetadata(parentDirURI, instructions);
-            }
-            throw new TableDataException(
-                    "Source file " + source + " does not appear to be a parquet file or metadata file");
-        }
-        if (sourceAttr.isDirectory()) {
-            final Path metadataPath = sourcePath.resolve(METADATA_FILE_NAME);
-            if (Files.exists(metadataPath)) {
-                return readPartitionedTableWithMetadata(source, instructions);
-            }
-            final Path firstEntryPath;
-            // Ignore dot files while looking for the first entry
-            try (final DirectoryStream<Path> sourceStream =
-                    Files.newDirectoryStream(sourcePath, ParquetTools::ignoreDotFiles)) {
-                final Iterator<Path> entryIterator = sourceStream.iterator();
-                if (!entryIterator.hasNext()) {
-                    throw new TableDataException("Source directory " + source + " is empty");
-                }
-                firstEntryPath = entryIterator.next();
-            } catch (IOException e) {
-                throw new TableDataException("Error reading source directory " + source, e);
-            }
-            final String firstEntryFileName = firstEntryPath.getFileName().toString();
-            final BasicFileAttributes firstEntryAttr = readAttributes(firstEntryPath);
-            if (firstEntryAttr.isDirectory() && firstEntryFileName.contains("=")) {
-                return readKeyValuePartitionedTable(source, instructions);
-            }
-            if (firstEntryAttr.isRegularFile() && firstEntryFileName.endsWith(PARQUET_FILE_EXTENSION)) {
-                return readFlatPartitionedTable(source, instructions);
-            }
-            throw new TableDataException("No recognized Parquet table layout found in " + source);
-        }
-        throw new TableDataException("Source " + source + " is neither a directory nor a regular file");
-    }
-
-    private static boolean ignoreDotFiles(Path path) {
-        final String filename = path.getFileName().toString();
-        return !filename.isEmpty() && filename.charAt(0) != '.';
-    }
-
-    private static BasicFileAttributes readAttributes(@NotNull final Path path) {
-        try {
-            return Files.readAttributes(path, BasicFileAttributes.class);
-        } catch (IOException e) {
-            throw new TableDataException("Failed to read " + path + " file attributes", e);
-        }
-    }
-
     /**
      * Reads in a table from a single parquet file using the table definition provided through the
      * {@link ParquetInstructions}.
@@ -1025,14 +824,15 @@ private static Table readTable(
         if (readInstructions.isRefreshing()) {
             throw new IllegalArgumentException("Unable to have a refreshing single parquet file");
         }
-        final TableDefinition tableDefinition = readInstructions.getTableDefinition().orElseThrow(
-                () -> new IllegalArgumentException("Table definition must be provided"));
+        final TableDefinition tableDefinition = ParquetInstructions.ensureDefinition(readInstructions);
         verifyFileLayout(readInstructions, ParquetFileLayout.SINGLE_FILE);
         final TableLocationProvider locationProvider = new PollingTableLocationProvider<>(
                 StandaloneTableKey.getInstance(),
                 new KnownLocationKeyFinder<>(tableLocationKey),
                 new ParquetTableLocationFactory(readInstructions),
-                null);
+                null,
+                TableUpdateMode.STATIC, // exactly one location here
+                TableUpdateMode.STATIC); // parquet files are static
         return new SimpleSourceTable(tableDefinition.getWritable(),
                 "Read single parquet file from " + tableLocationKey.getURI(),
                 RegionedTableComponentFactoryImpl.INSTANCE, locationProvider, null);
@@ -1060,11 +860,10 @@ public static Table readTable(
         if (readInstructions.getTableDefinition().isEmpty()) {
             // Infer the definition
             final KnownLocationKeyFinder<ParquetTableLocationKey> inferenceKeys = toKnownKeys(locationKeyFinder);
-            final Pair<TableDefinition, ParquetInstructions> inference = infer(inferenceKeys, readInstructions);
+            useInstructions = infer(inferenceKeys, readInstructions);
+            definition = useInstructions.getTableDefinition().orElseThrow();
             // In the case of a static output table, we can re-use the already fetched inference keys
-            useLocationKeyFinder = readInstructions.isRefreshing() ? locationKeyFinder : inferenceKeys;
-            definition = inference.getFirst();
-            useInstructions = inference.getSecond();
+            useLocationKeyFinder = useInstructions.isRefreshing() ? locationKeyFinder : inferenceKeys;
         } else {
             definition = readInstructions.getTableDefinition().get();
             useInstructions = readInstructions;
@@ -1093,11 +892,23 @@ public static Table readTable(
                         StandaloneTableKey.getInstance(),
                         keyFinder,
                         new ParquetTableLocationFactory(useInstructions),
-                        refreshService),
+                        refreshService,
+                        // If refreshing, new locations can be discovered but they will be appended
+                        // to the locations list
+                        useInstructions.isRefreshing()
+                                ? TableUpdateMode.APPEND_ONLY
+                                : TableUpdateMode.STATIC,
+                        TableUpdateMode.STATIC // parquet files are static
+                ),
                 updateSourceRegistrar);
     }
 
-    private static Pair<TableDefinition, ParquetInstructions> infer(
+    /**
+     * Infers additional information regarding the parquet file(s) based on the inferenceKeys and returns a potentially
+     * updated parquet instructions. If the incoming {@code readInstructions} does not have a {@link TableDefinition},
+     * the returned instructions will have an inferred {@link TableDefinition}.
+     */
+    private static ParquetInstructions infer(
             final KnownLocationKeyFinder<ParquetTableLocationKey> inferenceKeys,
             final ParquetInstructions readInstructions) {
         // TODO(deephaven-core#877): Support schema merge when discovering multiple parquet files
@@ -1132,7 +943,7 @@ private static Pair<TableDefinition, ParquetInstructions> infer(
         columnDefinitionsFromParquetFile.stream()
                 .filter(columnDefinition -> !partitionKeys.contains(columnDefinition.getName()))
                 .forEach(allColumns::add);
-        return new Pair<>(TableDefinition.of(allColumns), schemaInfo.getSecond());
+        return ensureTableDefinition(schemaInfo.getSecond(), TableDefinition.of(allColumns), true);
     }
 
     private static KnownLocationKeyFinder<ParquetTableLocationKey> toKnownKeys(
@@ -1142,26 +953,39 @@ private static KnownLocationKeyFinder<ParquetTableLocationKey> toKnownKeys(
                 : KnownLocationKeyFinder.copyFrom(keyFinder, Comparator.naturalOrder());
     }
 
-    private static Table readPartitionedTableWithMetadata(
-            @NotNull final URI sourceURI,
+    private static Table readPartitionedTableDirectory(
+            @NotNull final URI tableRootDirectory,
             @NotNull final ParquetInstructions readInstructions) {
-        if (!FILE_URI_SCHEME.equals(sourceURI.getScheme())) {
-            throw new UnsupportedOperationException("Reading metadata files from non local storage is not supported");
+        // Check if the directory has a metadata file
+        final URI metadataFileURI = tableRootDirectory.resolve(METADATA_FILE_NAME);
+        final SeekableChannelsProvider channelsProvider =
+                SeekableChannelsProviderLoader.getInstance().load(tableRootDirectory.getScheme(),
+                        readInstructions.getSpecialInstructions());
+        if (channelsProvider.exists(metadataFileURI)) {
+            return readPartitionedTableWithMetadata(metadataFileURI, readInstructions, channelsProvider);
         }
+        // Both flat partitioned and key-value partitioned data can be read under key-value partitioned layout
+        return readKeyValuePartitionedTable(tableRootDirectory, readInstructions, channelsProvider);
+    }
+
+    /**
+     * Creates a partitioned table via the metadata parquet files from the root {@code directory}, inferring the table
+     * definition from those files.
+     *
+     * @param sourceURI the path or URI for the directory to search for .parquet files, the
+     *        {@value ParquetUtils#METADATA_FILE_NAME} file or the {@value ParquetUtils#COMMON_METADATA_FILE_NAME} file.
+     *        Note that the {@value ParquetUtils#COMMON_METADATA_FILE_NAME} file must be present in the same directory.
+     * @param readInstructions the instructions for customizations while reading
+     * @param channelsProvider the provider for creating seekable channels. If null, a new provider will be created and
+     *        used for all channels created while reading the table.
+     */
+    private static Table readPartitionedTableWithMetadata(
+            @NotNull final URI sourceURI,
+            @NotNull final ParquetInstructions readInstructions,
+            @Nullable final SeekableChannelsProvider channelsProvider) {
         verifyFileLayout(readInstructions, ParquetFileLayout.METADATA_PARTITIONED);
-        if (readInstructions.getTableDefinition().isPresent()) {
-            throw new UnsupportedOperationException("Detected table definition inside read instructions, reading " +
-                    "metadata files with custom table definition is currently not supported");
-        }
-        final File sourceFile = new File(sourceURI);
-        final String fileName = sourceFile.getName();
-        final File directory;
-        if (fileName.equals(METADATA_FILE_NAME) || fileName.equals(COMMON_METADATA_FILE_NAME)) {
-            directory = sourceFile.getParentFile();
-        } else {
-            directory = sourceFile;
-        }
-        final ParquetMetadataFileLayout layout = new ParquetMetadataFileLayout(directory, readInstructions);
+        final ParquetMetadataFileLayout layout =
+                ParquetMetadataFileLayout.create(sourceURI, readInstructions, channelsProvider);
         return readTable(layout,
                 ensureTableDefinition(layout.getInstructions(), layout.getTableDefinition(), true));
     }
@@ -1184,22 +1008,22 @@ private static void verifyFileLayout(
      *
      * @param directoryUri the URI for the root directory to search for .parquet files
      * @param readInstructions the instructions for customizations while reading
+     * @param channelsProvider the provider for creating seekable channels. If null, a new provider will be created and
+     *        used for all channels created while reading the table.
      * @return the table
      */
     private static Table readKeyValuePartitionedTable(
             @NotNull final URI directoryUri,
-            @NotNull final ParquetInstructions readInstructions) {
+            @NotNull final ParquetInstructions readInstructions,
+            @Nullable final SeekableChannelsProvider channelsProvider) {
         verifyFileLayout(readInstructions, ParquetFileLayout.KV_PARTITIONED);
         if (readInstructions.getTableDefinition().isEmpty()) {
-            return readTable(new ParquetKeyValuePartitionedLayout(directoryUri,
-                    MAX_PARTITIONING_LEVELS_INFERENCE, readInstructions), readInstructions);
+            return readTable(ParquetKeyValuePartitionedLayout.create(directoryUri,
+                    MAX_PARTITIONING_LEVELS_INFERENCE, readInstructions, channelsProvider), readInstructions);
         }
         final TableDefinition tableDefinition = readInstructions.getTableDefinition().get();
-        if (tableDefinition.getColumnStream().noneMatch(ColumnDefinition::isPartitioning)) {
-            throw new IllegalArgumentException("No partitioning columns");
-        }
-        return readTable(new ParquetKeyValuePartitionedLayout(directoryUri, tableDefinition,
-                readInstructions), readInstructions);
+        return readTable(ParquetKeyValuePartitionedLayout.create(directoryUri, tableDefinition,
+                readInstructions, channelsProvider), readInstructions);
     }
 
     /**
@@ -1230,11 +1054,7 @@ private static Table readSingleFileTable(
         }
         // Infer the table definition
         final KnownLocationKeyFinder<ParquetTableLocationKey> inferenceKeys = new KnownLocationKeyFinder<>(locationKey);
-        final Pair<TableDefinition, ParquetInstructions> inference = infer(inferenceKeys, readInstructions);
-        final TableDefinition inferredTableDefinition = inference.getFirst();
-        final ParquetInstructions inferredInstructions = inference.getSecond();
-        return readTable(inferenceKeys.getFirstKey().orElseThrow(),
-                ensureTableDefinition(inferredInstructions, inferredTableDefinition, true));
+        return readTable(inferenceKeys.getFirstKey().orElseThrow(), infer(inferenceKeys, readInstructions));
     }
 
     @VisibleForTesting
diff --git a/extensions/parquet/table/src/main/java/io/deephaven/parquet/table/TypeInfos.java b/extensions/parquet/table/src/main/java/io/deephaven/parquet/table/TypeInfos.java
index eecfdde8d1c..d3aa98ab2db 100644
--- a/extensions/parquet/table/src/main/java/io/deephaven/parquet/table/TypeInfos.java
+++ b/extensions/parquet/table/src/main/java/io/deephaven/parquet/table/TypeInfos.java
@@ -8,12 +8,12 @@
 import io.deephaven.engine.table.ColumnSource;
 import io.deephaven.engine.table.impl.CodecLookup;
 import io.deephaven.engine.table.impl.dataindex.RowSetCodec;
-import io.deephaven.parquet.base.PageMaterializer;
 import io.deephaven.stringset.StringSet;
 import io.deephaven.util.codec.ExternalizableCodec;
 import io.deephaven.util.codec.SerializableCodec;
 import org.apache.commons.lang3.tuple.ImmutablePair;
 import org.apache.commons.lang3.tuple.Pair;
+import org.apache.parquet.schema.GroupType;
 import org.apache.parquet.schema.LogicalTypeAnnotation;
 import org.apache.parquet.schema.PrimitiveType;
 import org.apache.parquet.schema.PrimitiveType.PrimitiveTypeName;
@@ -59,6 +59,12 @@ public class TypeInfos {
 
     private static final Map<Class<?>, TypeInfo> BY_CLASS;
 
+    /**
+     * A list's element must be named this, see
+     * <a href="https://github.com/apache/parquet-format/blob/master/LogicalTypes.md#lists">lists</a>
+     */
+    private static final String ELEMENT_NAME = "element";
+
     static {
         final Map<Class<?>, TypeInfo> fa = new HashMap<>();
         for (final TypeInfo typeInfo : TYPE_INFOS) {
@@ -125,7 +131,7 @@ public static PrecisionAndScale getPrecisionAndScale(
             @NotNull final Map<String, Map<ParquetCacheTags, Object>> computedCache,
             @NotNull final String columnName,
             @NotNull final RowSet rowSet,
-            @NotNull Supplier<ColumnSource<BigDecimal>> columnSourceSupplier) {
+            @NotNull final Supplier<ColumnSource<?>> columnSourceSupplier) {
         return (PrecisionAndScale) computedCache
                 .computeIfAbsent(columnName, unusedColumnName -> new HashMap<>())
                 .computeIfAbsent(ParquetCacheTags.DECIMAL_ARGS,
@@ -153,7 +159,7 @@ static TypeInfo bigDecimalTypeInfo(
         final String columnName = column.getName();
         // noinspection unchecked
         final PrecisionAndScale precisionAndScale = getPrecisionAndScale(
-                computedCache, columnName, rowSet, () -> (ColumnSource<BigDecimal>) columnSourceMap.get(columnName));
+                computedCache, columnName, rowSet, () -> columnSourceMap.get(columnName));
         final Set<Class<?>> clazzes = Set.of(BigDecimal.class);
         return new TypeInfo() {
             @Override
@@ -176,8 +182,7 @@ static TypeInfo getTypeInfo(
             final RowSet rowSet,
             final Map<String, ? extends ColumnSource<?>> columnSourceMap,
             @NotNull final ParquetInstructions instructions) {
-        final Class<?> dataType = column.getDataType();
-        if (BigDecimal.class.equals(dataType)) {
+        if (column.getDataType() == BigDecimal.class || column.getComponentType() == BigDecimal.class) {
             return bigDecimalTypeInfo(computedCache, column, rowSet, columnSourceMap);
         }
         return lookupTypeInfo(column, instructions);
@@ -413,7 +418,7 @@ public PrimitiveBuilder<PrimitiveType> getBuilderImpl(boolean required, boolean
      * external compatibility by encoding them as fixed length decimals of scale 1. Internally, we'll record that we
      * wrote this as a decimal, so we can properly decode it back to BigInteger.
      *
-     * @see PageMaterializer#resolveDecimalLogicalType
+     * @see ParquetSchemaReader
      */
     private enum BigIntegerType implements TypeInfo {
         INSTANCE;
@@ -477,12 +482,19 @@ default Type createSchemaType(
                 isRepeating = false;
             }
             if (!isRepeating) {
+                instructions.getFieldId(columnDefinition.getName()).ifPresent(builder::id);
                 return builder.named(parquetColumnName);
             }
-            return Types.buildGroup(Type.Repetition.OPTIONAL).addField(
-                    Types.buildGroup(Type.Repetition.REPEATED).addField(
-                            builder.named("item")).named(parquetColumnName))
-                    .as(LogicalTypeAnnotation.listType()).named(parquetColumnName);
+            // Note: the Parquet type builder would take care of the element name for us if we were constructing it
+            // ahead of time via ListBuilder.optionalElement
+            // (org.apache.parquet.schema.Types.BaseListBuilder.ElementBuilder.named) when we named the outer list; but
+            // since we are constructing types recursively (without regard to the outer type), we are responsible for
+            // setting the element name correctly at this point in time.
+            final Types.ListBuilder<GroupType> listBuilder = Types.optionalList();
+            instructions.getFieldId(columnDefinition.getName()).ifPresent(listBuilder::id);
+            return listBuilder
+                    .element(builder.named(ELEMENT_NAME))
+                    .named(parquetColumnName);
         }
     }
 
diff --git a/extensions/parquet/table/src/main/java/io/deephaven/parquet/table/layout/DeephavenNestedPartitionLayout.java b/extensions/parquet/table/src/main/java/io/deephaven/parquet/table/layout/DeephavenNestedPartitionLayout.java
index 830e3e719cf..31f367763bf 100644
--- a/extensions/parquet/table/src/main/java/io/deephaven/parquet/table/layout/DeephavenNestedPartitionLayout.java
+++ b/extensions/parquet/table/src/main/java/io/deephaven/parquet/table/layout/DeephavenNestedPartitionLayout.java
@@ -3,6 +3,7 @@
 //
 package io.deephaven.parquet.table.layout;
 
+import io.deephaven.base.FileUtils;
 import io.deephaven.engine.table.impl.locations.TableDataException;
 import io.deephaven.engine.table.impl.locations.impl.TableLocationKeyFinder;
 import io.deephaven.engine.table.impl.locations.local.URITableLocationKey;
@@ -53,16 +54,16 @@ public static DeephavenNestedPartitionLayout<ParquetTableLocationKey> forParquet
             @NotNull final String columnPartitionKey,
             @Nullable final Predicate<String> internalPartitionValueFilter,
             @NotNull final ParquetInstructions readInstructions) {
-        final SeekableChannelsProvider channelsProvider =
-                SeekableChannelsProviderLoader.getInstance().fromServiceLoader(convertToURI(tableRootDirectory, true),
-                        readInstructions.getSpecialInstructions());
+        // noinspection resource
+        final SeekableChannelsProvider channelsProvider = SeekableChannelsProviderLoader.getInstance()
+                .load(FileUtils.FILE_URI_SCHEME, readInstructions.getSpecialInstructions());
         return new DeephavenNestedPartitionLayout<>(tableRootDirectory, tableName,
                 columnPartitionKey, internalPartitionValueFilter) {
             @Override
             protected ParquetTableLocationKey makeKey(@NotNull Path tableLeafDirectory,
                     @NotNull Map<String, Comparable<?>> partitions) {
                 final URI fileURI = convertToURI(tableLeafDirectory.resolve(PARQUET_FILE_NAME), false);
-                return new ParquetTableLocationKey(fileURI, 0, partitions, readInstructions, channelsProvider);
+                return new ParquetTableLocationKey(fileURI, 0, partitions, channelsProvider);
             }
         };
     }
diff --git a/extensions/parquet/table/src/main/java/io/deephaven/parquet/table/layout/ParquetFlatPartitionedLayout.java b/extensions/parquet/table/src/main/java/io/deephaven/parquet/table/layout/ParquetFlatPartitionedLayout.java
index 71f0068383b..cd0ec0add51 100644
--- a/extensions/parquet/table/src/main/java/io/deephaven/parquet/table/layout/ParquetFlatPartitionedLayout.java
+++ b/extensions/parquet/table/src/main/java/io/deephaven/parquet/table/layout/ParquetFlatPartitionedLayout.java
@@ -31,7 +31,6 @@ public final class ParquetFlatPartitionedLayout implements TableLocationKeyFinde
 
     private final URI tableRootDirectory;
     private final Map<URI, ParquetTableLocationKey> cache;
-    private final ParquetInstructions readInstructions;
     private final SeekableChannelsProvider channelsProvider;
 
     /**
@@ -42,9 +41,8 @@ public ParquetFlatPartitionedLayout(@NotNull final URI tableRootDirectoryURI,
             @NotNull final ParquetInstructions readInstructions) {
         this.tableRootDirectory = tableRootDirectoryURI;
         this.cache = Collections.synchronizedMap(new HashMap<>());
-        this.readInstructions = readInstructions;
-        this.channelsProvider = SeekableChannelsProviderLoader.getInstance().fromServiceLoader(tableRootDirectory,
-                readInstructions.getSpecialInstructions());
+        this.channelsProvider = SeekableChannelsProviderLoader.getInstance()
+                .load(tableRootDirectory.getScheme(), readInstructions.getSpecialInstructions());
     }
 
     public String toString() {
@@ -80,6 +78,6 @@ public void findKeys(@NotNull final Consumer<ParquetTableLocationKey> locationKe
     }
 
     private ParquetTableLocationKey locationKey(@NotNull final URI uri) {
-        return new ParquetTableLocationKey(uri, 0, null, readInstructions, channelsProvider);
+        return new ParquetTableLocationKey(uri, 0, null, channelsProvider);
     }
 }
diff --git a/extensions/parquet/table/src/main/java/io/deephaven/parquet/table/layout/ParquetKeyValuePartitionedLayout.java b/extensions/parquet/table/src/main/java/io/deephaven/parquet/table/layout/ParquetKeyValuePartitionedLayout.java
index 53a057c0c95..310fc015161 100644
--- a/extensions/parquet/table/src/main/java/io/deephaven/parquet/table/layout/ParquetKeyValuePartitionedLayout.java
+++ b/extensions/parquet/table/src/main/java/io/deephaven/parquet/table/layout/ParquetKeyValuePartitionedLayout.java
@@ -18,6 +18,7 @@
 import io.deephaven.util.channel.SeekableChannelsProvider;
 import io.deephaven.util.channel.SeekableChannelsProviderLoader;
 import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
 
 import java.io.IOException;
 import java.net.URI;
@@ -27,7 +28,6 @@
 import java.util.function.Predicate;
 import java.util.stream.Stream;
 
-import static io.deephaven.base.FileUtils.convertToURI;
 import static io.deephaven.parquet.base.ParquetFileReader.FILE_URI_SCHEME;
 import static io.deephaven.parquet.base.ParquetUtils.isVisibleParquetFile;
 
@@ -49,46 +49,71 @@ public class ParquetKeyValuePartitionedLayout
 
     private final SeekableChannelsProvider channelsProvider;
 
-    public ParquetKeyValuePartitionedLayout(
+    /**
+     * Create a new {@link ParquetKeyValuePartitionedLayout} for the given {@code tableRootDirectory} and
+     * {@code tableDefinition}.
+     *
+     * @param tableRootDirectory The root directory for the table.
+     * @param tableDefinition The table definition to use for the layout.
+     * @param readInstructions The instructions for customizations while reading.
+     * @param channelsProvider The provider for seekable channels. If {@code null}, a new provider will be created and
+     *        used for all location keys.
+     */
+    public static ParquetKeyValuePartitionedLayout create(
             @NotNull final URI tableRootDirectory,
             @NotNull final TableDefinition tableDefinition,
-            @NotNull final ParquetInstructions readInstructions) {
-        this(tableRootDirectory, tableDefinition, readInstructions,
-                SeekableChannelsProviderLoader.getInstance().fromServiceLoader(tableRootDirectory,
-                        readInstructions.getSpecialInstructions()));
+            @NotNull final ParquetInstructions readInstructions,
+            @Nullable SeekableChannelsProvider channelsProvider) {
+        if (channelsProvider == null) {
+            // noinspection resource
+            channelsProvider = SeekableChannelsProviderLoader.getInstance()
+                    .load(tableRootDirectory.getScheme(), readInstructions.getSpecialInstructions());
+        }
+        return new ParquetKeyValuePartitionedLayout(tableRootDirectory, tableDefinition, channelsProvider);
     }
 
     private ParquetKeyValuePartitionedLayout(
             @NotNull final URI tableRootDirectory,
             @NotNull final TableDefinition tableDefinition,
-            @NotNull final ParquetInstructions readInstructions,
             @NotNull final SeekableChannelsProvider channelsProvider) {
         super(tableRootDirectory,
                 () -> new LocationTableBuilderDefinition(tableDefinition),
-                (uri, partitions) -> new ParquetTableLocationKey(uri, 0, partitions, readInstructions,
-                        channelsProvider),
+                (uri, partitions) -> new ParquetTableLocationKey(uri, 0, partitions, channelsProvider),
                 Math.toIntExact(tableDefinition.getColumnStream().filter(ColumnDefinition::isPartitioning).count()));
         this.channelsProvider = channelsProvider;
     }
 
-    public ParquetKeyValuePartitionedLayout(
+    /**
+     * Create a new {@link ParquetKeyValuePartitionedLayout} for the given {@code tableRootDirectory}. The table
+     * definition will be inferred from the data using {@link CsvTools#readCsv(java.io.InputStream) CsvTools.readCsv}.
+     *
+     * @param tableRootDirectory The root directory for the table.
+     * @param maxPartitioningLevels The maximum number of partitioning levels to use.
+     * @param readInstructions The instructions for customizations while reading.
+     * @param channelsProvider The provider for seekable channels. If {@code null}, a new provider will be created and
+     *        used for all location keys.
+     */
+
+    public static ParquetKeyValuePartitionedLayout create(
             @NotNull final URI tableRootDirectory,
             final int maxPartitioningLevels,
-            @NotNull final ParquetInstructions readInstructions) {
-        this(tableRootDirectory, maxPartitioningLevels, readInstructions,
-                SeekableChannelsProviderLoader.getInstance().fromServiceLoader(tableRootDirectory,
-                        readInstructions.getSpecialInstructions()));
+            @NotNull final ParquetInstructions readInstructions,
+            @Nullable SeekableChannelsProvider channelsProvider) {
+        if (channelsProvider == null) {
+            // noinspection resource
+            channelsProvider = SeekableChannelsProviderLoader.getInstance()
+                    .load(tableRootDirectory.getScheme(), readInstructions.getSpecialInstructions());
+        }
+        return new ParquetKeyValuePartitionedLayout(tableRootDirectory, maxPartitioningLevels, channelsProvider);
     }
 
     private ParquetKeyValuePartitionedLayout(
             @NotNull final URI tableRootDirectory,
             final int maxPartitioningLevels,
-            @NotNull final ParquetInstructions readInstructions,
             @NotNull final SeekableChannelsProvider channelsProvider) {
         super(tableRootDirectory,
                 () -> new LocationTableBuilderCsv(tableRootDirectory),
-                (uri, partitions) -> new ParquetTableLocationKey(uri, 0, partitions, readInstructions,
-                        channelsProvider),
+                (uri, partitions) -> new ParquetTableLocationKey(uri, 0, partitions, channelsProvider),
                 maxPartitioningLevels);
         this.channelsProvider = channelsProvider;
     }
diff --git a/extensions/parquet/table/src/main/java/io/deephaven/parquet/table/layout/ParquetMetadataFileLayout.java b/extensions/parquet/table/src/main/java/io/deephaven/parquet/table/layout/ParquetMetadataFileLayout.java
index cb5c495b6e7..09700f17280 100644
--- a/extensions/parquet/table/src/main/java/io/deephaven/parquet/table/layout/ParquetMetadataFileLayout.java
+++ b/extensions/parquet/table/src/main/java/io/deephaven/parquet/table/layout/ParquetMetadataFileLayout.java
@@ -28,13 +28,13 @@
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
-import java.io.File;
 import java.io.IOException;
 import java.net.URI;
 import java.nio.file.Path;
 import java.nio.file.Paths;
 import java.util.ArrayList;
 import java.util.Arrays;
+import java.util.Collection;
 import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Map;
@@ -42,11 +42,13 @@
 import java.util.function.Function;
 import java.util.stream.Collectors;
 
-import static io.deephaven.base.FileUtils.convertToURI;
 import static io.deephaven.parquet.base.ParquetUtils.COMMON_METADATA_FILE_NAME;
+import static io.deephaven.parquet.base.ParquetUtils.COMMON_METADATA_FILE_URI_SUFFIX;
 import static io.deephaven.parquet.base.ParquetUtils.METADATA_FILE_NAME;
+import static io.deephaven.parquet.base.ParquetUtils.METADATA_FILE_URI_SUFFIX;
 import static io.deephaven.parquet.base.ParquetUtils.METADATA_KEY;
 import static io.deephaven.parquet.base.ParquetUtils.getPerFileMetadataKey;
+import static io.deephaven.parquet.base.ParquetUtils.resolve;
 import static java.util.stream.Collectors.toMap;
 
 /**
@@ -67,85 +69,105 @@
  */
 public class ParquetMetadataFileLayout implements TableLocationKeyFinder<ParquetTableLocationKey> {
 
-    private final File metadataFile;
-    private final File commonMetadataFile;
+    private final URI metadataFileURI;
+    private final URI commonMetadataFileURI;
 
     private final TableDefinition definition;
     private final ParquetInstructions instructions;
     private final List<ParquetTableLocationKey> keys;
-    private final SeekableChannelsProvider channelsProvider;
 
-    public ParquetMetadataFileLayout(@NotNull final File directory) {
-        this(directory, ParquetInstructions.EMPTY);
-    }
-
-    public ParquetMetadataFileLayout(
-            @NotNull final File directory,
-            @NotNull final ParquetInstructions inputInstructions) {
-        this(new File(directory, METADATA_FILE_NAME), new File(directory, COMMON_METADATA_FILE_NAME),
-                inputInstructions);
-    }
-
-    public ParquetMetadataFileLayout(
-            @NotNull final File metadataFile,
-            @Nullable final File commonMetadataFile) {
-        this(metadataFile, commonMetadataFile, ParquetInstructions.EMPTY);
+    /**
+     * Create a new {@link ParquetMetadataFileLayout} for the given {@code source} and {@code inputInstructions}.
+     *
+     * @param source The source URI for the metadata file or directory containing the metadata file.
+     * @param inputInstructions The instructions for customizations while reading.
+     * @param channelsProvider The provider for seekable channels. If {@code null}, a new provider will be created and
+     *        used for all location keys.
+     */
+    public static ParquetMetadataFileLayout create(
+            @NotNull final URI source,
+            @NotNull final ParquetInstructions inputInstructions,
+            @Nullable SeekableChannelsProvider channelsProvider) {
+        final String path = source.getRawPath();
+        final boolean isMetadataFile = path.endsWith(METADATA_FILE_URI_SUFFIX);
+        final boolean isCommonMetadataFile = !isMetadataFile && path.endsWith(COMMON_METADATA_FILE_URI_SUFFIX);
+        final boolean isDirectory = !isMetadataFile && !isCommonMetadataFile;
+        final URI directory = isDirectory ? source : source.resolve(".");
+        final URI metadataFileURI = isMetadataFile ? source : directory.resolve(METADATA_FILE_NAME);
+        final URI commonMetadataFileURI = isCommonMetadataFile ? source : directory.resolve(COMMON_METADATA_FILE_NAME);
+        if (channelsProvider == null) {
+            // noinspection resource
+            channelsProvider = SeekableChannelsProviderLoader.getInstance()
+                    .load(source.getScheme(), inputInstructions.getSpecialInstructions());
+        }
+        return new ParquetMetadataFileLayout(directory, metadataFileURI, commonMetadataFileURI, inputInstructions,
+                channelsProvider);
     }
 
-    public ParquetMetadataFileLayout(
-            @NotNull final File metadataFile,
-            @Nullable final File commonMetadataFile,
-            @NotNull final ParquetInstructions inputInstructions) {
+    private ParquetMetadataFileLayout(
+            @NotNull final URI tableRootDirectory,
+            @NotNull final URI metadataFileURI,
+            @NotNull final URI commonMetadataFileURI,
+            @NotNull final ParquetInstructions inputInstructions,
+            @NotNull final SeekableChannelsProvider channelsProvider) {
         if (inputInstructions.isRefreshing()) {
             throw new IllegalArgumentException("ParquetMetadataFileLayout does not support refreshing");
         }
-        this.metadataFile = metadataFile;
-        this.commonMetadataFile = commonMetadataFile;
-        channelsProvider =
-                SeekableChannelsProviderLoader.getInstance().fromServiceLoader(convertToURI(metadataFile, false),
-                        inputInstructions.getSpecialInstructions());
-        if (!metadataFile.exists()) {
-            throw new TableDataException(String.format("Parquet metadata file %s does not exist", metadataFile));
+        this.metadataFileURI = metadataFileURI;
+        this.commonMetadataFileURI = commonMetadataFileURI;
+        if (!channelsProvider.exists(metadataFileURI)) {
+            throw new TableDataException(String.format("Parquet metadata file %s does not exist", metadataFileURI));
         }
-        final ParquetFileReader metadataFileReader = ParquetFileReader.create(metadataFile, channelsProvider);
+        final ParquetFileReader metadataFileReader = ParquetFileReader.create(metadataFileURI, channelsProvider);
         final ParquetMetadataConverter converter = new ParquetMetadataConverter();
-        final ParquetMetadata metadataFileMetadata = convertMetadata(metadataFile, metadataFileReader, converter);
-        final Pair<List<ColumnDefinition<?>>, ParquetInstructions> leafSchemaInfo = ParquetSchemaReader.convertSchema(
-                metadataFileReader.getSchema(),
-                metadataFileMetadata.getFileMetaData().getKeyValueMetaData(),
-                inputInstructions);
-
-        if (commonMetadataFile != null && commonMetadataFile.exists()) {
-            final ParquetFileReader commonMetadataFileReader =
-                    ParquetFileReader.create(commonMetadataFile, channelsProvider);
-            final Pair<List<ColumnDefinition<?>>, ParquetInstructions> fullSchemaInfo =
+        final ParquetMetadata metadataFileMetadata = convertMetadata(metadataFileURI, metadataFileReader, converter);
+        if (inputInstructions.getTableDefinition().isEmpty()) {
+            // Infer the definition from the metadata file
+            final Pair<List<ColumnDefinition<?>>, ParquetInstructions> leafSchemaInfo =
                     ParquetSchemaReader.convertSchema(
-                            commonMetadataFileReader.getSchema(),
-                            convertMetadata(commonMetadataFile, commonMetadataFileReader, converter).getFileMetaData()
-                                    .getKeyValueMetaData(),
-                            leafSchemaInfo.getSecond());
-            final List<ColumnDefinition<?>> adjustedColumnDefinitions = new ArrayList<>();
-            final Map<String, ColumnDefinition<?>> leafDefinitionsMap =
-                    leafSchemaInfo.getFirst().stream().collect(toMap(ColumnDefinition::getName, Function.identity()));
-            for (final ColumnDefinition<?> fullDefinition : fullSchemaInfo.getFirst()) {
-                final ColumnDefinition<?> leafDefinition = leafDefinitionsMap.get(fullDefinition.getName());
-                if (leafDefinition == null) {
-                    adjustedColumnDefinitions.add(adjustPartitionDefinition(fullDefinition));
-                } else if (fullDefinition.equals(leafDefinition)) {
-                    adjustedColumnDefinitions.add(fullDefinition); // No adjustments to apply in this case
-                } else {
-                    final List<String> differences = new ArrayList<>();
-                    fullDefinition.describeDifferences(differences, leafDefinition, "full schema", "file schema",
-                            "", false);
-                    throw new TableDataException(String.format("Schema mismatch between %s and %s for column %s: %s",
-                            metadataFile, commonMetadataFile, fullDefinition.getName(), differences));
+                            metadataFileReader.getSchema(),
+                            metadataFileMetadata.getFileMetaData().getKeyValueMetaData(),
+                            inputInstructions);
+
+            if (channelsProvider.exists(commonMetadataFileURI)) {
+                // Infer the partitioning columns using the common metadata file
+                final ParquetFileReader commonMetadataFileReader =
+                        ParquetFileReader.create(commonMetadataFileURI, channelsProvider);
+                final Pair<List<ColumnDefinition<?>>, ParquetInstructions> fullSchemaInfo =
+                        ParquetSchemaReader.convertSchema(
+                                commonMetadataFileReader.getSchema(),
+                                convertMetadata(commonMetadataFileURI, commonMetadataFileReader, converter)
+                                        .getFileMetaData()
+                                        .getKeyValueMetaData(),
+                                leafSchemaInfo.getSecond());
+                final Collection<ColumnDefinition<?>> adjustedColumnDefinitions = new ArrayList<>();
+                final Map<String, ColumnDefinition<?>> leafDefinitionsMap =
+                        leafSchemaInfo.getFirst().stream()
+                                .collect(toMap(ColumnDefinition::getName, Function.identity()));
+                for (final ColumnDefinition<?> fullDefinition : fullSchemaInfo.getFirst()) {
+                    final ColumnDefinition<?> leafDefinition = leafDefinitionsMap.get(fullDefinition.getName());
+                    if (leafDefinition == null) {
+                        adjustedColumnDefinitions.add(adjustPartitionDefinition(fullDefinition));
+                    } else if (fullDefinition.equals(leafDefinition)) {
+                        adjustedColumnDefinitions.add(fullDefinition); // No adjustments to apply in this case
+                    } else {
+                        final List<String> differences = new ArrayList<>();
+                        fullDefinition.describeDifferences(differences, leafDefinition, "full schema", "file schema",
+                                "", false);
+                        throw new TableDataException(
+                                String.format("Schema mismatch between %s and %s for column %s: %s",
+                                        metadataFileURI, commonMetadataFileURI, fullDefinition.getName(), differences));
+                    }
                 }
+                definition = TableDefinition.of(adjustedColumnDefinitions);
+                instructions = fullSchemaInfo.getSecond();
+            } else {
+                definition = TableDefinition.of(leafSchemaInfo.getFirst());
+                instructions = leafSchemaInfo.getSecond();
             }
-            definition = TableDefinition.of(adjustedColumnDefinitions);
-            instructions = fullSchemaInfo.getSecond();
         } else {
-            definition = TableDefinition.of(leafSchemaInfo.getFirst());
-            instructions = leafSchemaInfo.getSecond();
+            definition = inputInstructions.getTableDefinition().get();
+            instructions = inputInstructions;
         }
 
         final List<ColumnDefinition<?>> partitioningColumns = definition.getPartitioningColumns();
@@ -160,7 +182,6 @@ public ParquetMetadataFileLayout(
                     FilenameUtils.separatorsToSystem(rowGroups.get(rgi).getColumns().get(0).getFile_path());
             filePathToRowGroupIndices.computeIfAbsent(relativePath, fn -> new TIntArrayList()).add(rgi);
         }
-        final File directory = metadataFile.getParentFile();
         final MutableInt partitionOrder = new MutableInt(0);
         keys = filePathToRowGroupIndices.entrySet().stream().map(entry -> {
             final String relativePathString = entry.getKey();
@@ -168,7 +189,7 @@ public ParquetMetadataFileLayout(
             if (relativePathString == null || relativePathString.isEmpty()) {
                 throw new TableDataException(String.format(
                         "Missing parquet file name for row groups %s in %s",
-                        Arrays.toString(rowGroupIndices), metadataFile));
+                        Arrays.toString(rowGroupIndices), metadataFileURI));
             }
             final LinkedHashMap<String, Comparable<?>> partitions =
                     partitioningColumns.isEmpty() ? null : new LinkedHashMap<>();
@@ -177,8 +198,10 @@ public ParquetMetadataFileLayout(
                 final int numPartitions = filePath.getNameCount() - 1;
                 if (numPartitions != partitioningColumns.size()) {
                     throw new TableDataException(String.format(
-                            "Unexpected number of path elements in %s for partitions %s",
-                            relativePathString, partitions.keySet()));
+                            "Unexpected number of path elements in %s for partitions %s, found %d elements, expected " +
+                                    "%d based on definition %s",
+                            relativePathString, partitions.keySet(), numPartitions, partitioningColumns.size(),
+                            definition));
                 }
                 final boolean useHiveStyle = filePath.getName(0).toString().contains("=");
                 for (int pi = 0; pi < numPartitions; ++pi) {
@@ -190,7 +213,7 @@ public ParquetMetadataFileLayout(
                         if (pathComponents.length != 2) {
                             throw new TableDataException(String.format(
                                     "Unexpected path format found for hive-style partitioning from %s for %s",
-                                    relativePathString, metadataFile));
+                                    relativePathString, metadataFileURI));
                         }
                         partitionKey = instructions.getColumnNameFromParquetColumnNameOrDefault(pathComponents[0]);
                         partitionValueRaw = pathComponents[1];
@@ -203,14 +226,14 @@ public ParquetMetadataFileLayout(
                     if (partitions.containsKey(partitionKey)) {
                         throw new TableDataException(String.format(
                                 "Unexpected duplicate partition key %s when parsing %s for %s",
-                                partitionKey, relativePathString, metadataFile));
+                                partitionKey, relativePathString, metadataFileURI));
                     }
                     partitions.put(partitionKey, partitionValue);
                 }
             }
-            final URI partitionFileURI = convertToURI(new File(directory, relativePathString), false);
+            final URI partitionFileURI = resolve(tableRootDirectory, relativePathString);
             final ParquetTableLocationKey tlk = new ParquetTableLocationKey(partitionFileURI,
-                    partitionOrder.getAndIncrement(), partitions, inputInstructions, channelsProvider);
+                    partitionOrder.getAndIncrement(), partitions, channelsProvider);
             tlk.setFileReader(metadataFileReader);
             tlk.setMetadata(getParquetMetadataForFile(relativePathString, metadataFileMetadata));
             tlk.setRowGroupIndices(rowGroupIndices);
@@ -246,16 +269,17 @@ private static ParquetMetadata getParquetMetadataForFile(@NotNull final String p
     }
 
     public String toString() {
-        return ParquetMetadataFileLayout.class.getSimpleName() + '[' + metadataFile + ',' + commonMetadataFile + ']';
+        return ParquetMetadataFileLayout.class.getSimpleName() + '[' + metadataFileURI + ',' + commonMetadataFileURI
+                + ']';
     }
 
-    private static ParquetMetadata convertMetadata(@NotNull final File file,
+    private static ParquetMetadata convertMetadata(@NotNull final URI uri,
             @NotNull final ParquetFileReader fileReader,
             @NotNull final ParquetMetadataConverter converter) {
         try {
             return converter.fromParquetMetadata(fileReader.fileMetaData);
         } catch (IOException e) {
-            throw new TableDataException("Error while converting file metadata from " + file);
+            throw new TableDataException("Error while converting file metadata from " + uri);
         }
     }
 
diff --git a/extensions/parquet/table/src/main/java/io/deephaven/parquet/table/location/ParquetColumnLocation.java b/extensions/parquet/table/src/main/java/io/deephaven/parquet/table/location/ParquetColumnLocation.java
index a131d8d8d06..4ddebb33685 100644
--- a/extensions/parquet/table/src/main/java/io/deephaven/parquet/table/location/ParquetColumnLocation.java
+++ b/extensions/parquet/table/src/main/java/io/deephaven/parquet/table/location/ParquetColumnLocation.java
@@ -37,6 +37,7 @@
 import java.io.IOException;
 import java.math.BigDecimal;
 import java.math.BigInteger;
+import java.time.Instant;
 import java.util.Arrays;
 import java.util.Optional;
 import java.util.function.Function;
@@ -370,22 +371,59 @@ private static <ATTR extends Any, RESULT> ToPage<ATTR, RESULT> makeToPage(
                 final PrimitiveType.PrimitiveTypeName typeName = type.getPrimitiveTypeName();
                 switch (typeName) {
                     case BOOLEAN:
-                        toPage = ToBooleanAsBytePage.create(pageType);
+                        if (pageType == Boolean.class) {
+                            toPage = ToBooleanAsBytePage.create(pageType);
+                        } else if (pageType == byte.class) {
+                            toPage = ToBytePage.createFromBoolean(pageType);
+                        } else if (pageType == short.class) {
+                            toPage = ToShortPage.createFromBoolean(pageType);
+                        } else if (pageType == int.class) {
+                            toPage = ToIntPage.createFromBoolean(pageType);
+                        } else if (pageType == long.class) {
+                            toPage = ToLongPage.createFromBoolean(pageType);
+                        } else {
+                            throw new IllegalArgumentException(
+                                    "Cannot convert parquet BOOLEAN primitive column to " + pageType);
+                        }
                         break;
                     case INT32:
-                        toPage = ToIntPage.create(pageType);
+                        if (pageType == int.class) {
+                            toPage = ToIntPage.create(pageType);
+                        } else if (pageType == long.class) {
+                            toPage = ToLongPage.createFromInt(pageType);
+                        } else {
+                            throw new IllegalArgumentException("Cannot convert parquet INT32 column to " + pageType);
+                        }
                         break;
                     case INT64:
-                        toPage = ToLongPage.create(pageType);
+                        if (pageType == long.class) {
+                            toPage = ToLongPage.create(pageType);
+                        } else {
+                            throw new IllegalArgumentException("Cannot convert parquet INT64 column to " + pageType);
+                        }
                         break;
                     case INT96:
-                        toPage = ToInstantPage.create(pageType);
+                        if (pageType == Instant.class) {
+                            toPage = ToInstantPage.createFromInt96(pageType);
+                        } else {
+                            throw new IllegalArgumentException("Cannot convert parquet INT96 column to " + pageType);
+                        }
                         break;
                     case DOUBLE:
-                        toPage = ToDoublePage.create(pageType);
+                        if (pageType == double.class) {
+                            toPage = ToDoublePage.create(pageType);
+                        } else {
+                            throw new IllegalArgumentException("Cannot convert parquet DOUBLE column to " + pageType);
+                        }
                         break;
                     case FLOAT:
-                        toPage = ToFloatPage.create(pageType);
+                        if (pageType == float.class) {
+                            toPage = ToFloatPage.create(pageType);
+                        } else if (pageType == double.class) {
+                            toPage = ToDoublePage.createFromFloat(pageType);
+                        } else {
+                            throw new IllegalArgumentException("Cannot convert parquet FLOAT column to " + pageType);
+                        }
                         break;
                     case BINARY:
                     case FIXED_LEN_BYTE_ARRAY:
@@ -413,9 +451,9 @@ private static <ATTR extends Any, RESULT> ToPage<ATTR, RESULT> makeToPage(
             }
 
             if (toPage == null) {
-                throw new TableDataException(
+                throw new IllegalArgumentException(
                         "Unsupported parquet column type " + type.getPrimitiveTypeName() +
-                                " with logical type " + logicalTypeAnnotation);
+                                " with logical type " + logicalTypeAnnotation + " and page type " + pageType);
             }
 
             if (specialTypeName == ColumnTypeInfo.SpecialType.StringSet) {
@@ -433,7 +471,7 @@ private static <ATTR extends Any, RESULT> ToPage<ATTR, RESULT> makeToPage(
             // noinspection unchecked
             return (ToPage<ATTR, RESULT>) toPage;
 
-        } catch (RuntimeException except) {
+        } catch (final RuntimeException except) {
             throw new TableDataException(
                     "Unexpected exception accessing column " + parquetColumnName, except);
         }
@@ -456,17 +494,37 @@ private static class LogicalTypeVisitor<ATTR extends Any>
         @Override
         public Optional<ToPage<ATTR, ?>> visit(
                 final LogicalTypeAnnotation.StringLogicalTypeAnnotation stringLogicalType) {
-            return Optional
-                    .of(ToStringPage.create(pageType, columnChunkReader.getDictionarySupplier()));
+            return Optional.of(ToStringPage.create(pageType, columnChunkReader.getDictionarySupplier()));
         }
 
         @Override
         public Optional<ToPage<ATTR, ?>> visit(
                 final LogicalTypeAnnotation.TimestampLogicalTypeAnnotation timestampLogicalType) {
             if (timestampLogicalType.isAdjustedToUTC()) {
-                return Optional.of(ToInstantPage.create(pageType));
+                // The column will be stored as nanoseconds elapsed since epoch as long values
+                switch (timestampLogicalType.getUnit()) {
+                    case MILLIS:
+                        return Optional.of(ToInstantPage.createFromMillis(pageType));
+                    case MICROS:
+                        return Optional.of(ToInstantPage.createFromMicros(pageType));
+                    case NANOS:
+                        return Optional.of(ToInstantPage.createFromNanos(pageType));
+                    default:
+                        throw new IllegalArgumentException("Unsupported unit=" + timestampLogicalType.getUnit());
+                }
+            }
+            // The column will be stored as as LocalDateTime
+            // Ref:https://github.com/apache/parquet-format/blob/master/LogicalTypes.md#local-semantics-timestamps-not-normalized-to-utc
+            switch (timestampLogicalType.getUnit()) {
+                case MILLIS:
+                    return Optional.of(ToLocalDateTimePage.createFromMillis(pageType));
+                case MICROS:
+                    return Optional.of(ToLocalDateTimePage.createFromMicros(pageType));
+                case NANOS:
+                    return Optional.of(ToLocalDateTimePage.createFromNanos(pageType));
+                default:
+                    throw new IllegalArgumentException("Unsupported unit=" + timestampLogicalType.getUnit());
             }
-            return Optional.of(ToLocalDateTimePage.create(pageType));
         }
 
         @Override
@@ -474,21 +532,61 @@ private static class LogicalTypeVisitor<ATTR extends Any>
             if (intLogicalType.isSigned()) {
                 switch (intLogicalType.getBitWidth()) {
                     case 8:
-                        return Optional.of(ToBytePage.create(pageType));
+                        if (pageType == byte.class) {
+                            return Optional.of(ToBytePage.create(pageType));
+                        } else if (pageType == short.class) {
+                            return Optional.of(ToShortPage.create(pageType));
+                        } else if (pageType == int.class) {
+                            return Optional.of(ToIntPage.create(pageType));
+                        } else if (pageType == long.class) {
+                            return Optional.of(ToLongPage.createFromInt(pageType));
+                        }
+                        throw new IllegalArgumentException("Cannot convert parquet byte column to " + pageType);
                     case 16:
-                        return Optional.of(ToShortPage.create(pageType));
+                        if (pageType == short.class) {
+                            return Optional.of(ToShortPage.create(pageType));
+                        } else if (pageType == int.class) {
+                            return Optional.of(ToIntPage.create(pageType));
+                        } else if (pageType == long.class) {
+                            return Optional.of(ToLongPage.createFromInt(pageType));
+                        }
+                        throw new IllegalArgumentException("Cannot convert parquet short column to " + pageType);
                     case 32:
-                        return Optional.of(ToIntPage.create(pageType));
+                        if (pageType == int.class) {
+                            return Optional.of(ToIntPage.create(pageType));
+                        } else if (pageType == long.class) {
+                            return Optional.of(ToLongPage.createFromInt(pageType));
+                        }
+                        throw new IllegalArgumentException("Cannot convert parquet int column to " + pageType);
                     case 64:
                         return Optional.of(ToLongPage.create(pageType));
                 }
             } else {
                 switch (intLogicalType.getBitWidth()) {
                     case 8:
+                        if (pageType == char.class) {
+                            return Optional.of(ToCharPage.create(pageType));
+                        } else if (pageType == short.class) {
+                            return Optional.of(ToShortPage.createFromUnsignedByte(pageType));
+                        } else if (pageType == int.class) {
+                            return Optional.of(ToIntPage.createFromUnsignedByte(pageType));
+                        } else if (pageType == long.class) {
+                            return Optional.of(ToLongPage.createFromUnsignedByte(pageType));
+                        }
+                        throw new IllegalArgumentException(
+                                "Cannot convert parquet unsigned byte column to " + pageType);
                     case 16:
-                        return Optional.of(ToCharPage.create(pageType));
+                        if (pageType == char.class) {
+                            return Optional.of(ToCharPage.create(pageType));
+                        } else if (pageType == int.class) {
+                            return Optional.of(ToIntPage.createFromUnsignedShort(pageType));
+                        } else if (pageType == long.class) {
+                            return Optional.of(ToLongPage.createFromUnsignedShort(pageType));
+                        }
+                        throw new IllegalArgumentException(
+                                "Cannot convert parquet unsigned short column to " + pageType);
                     case 32:
-                        return Optional.of(ToLongPage.create(pageType));
+                        return Optional.of(ToLongPage.createFromUnsignedInt(pageType));
                 }
             }
             return Optional.empty();
@@ -501,7 +599,17 @@ private static class LogicalTypeVisitor<ATTR extends Any>
 
         @Override
         public Optional<ToPage<ATTR, ?>> visit(final LogicalTypeAnnotation.TimeLogicalTypeAnnotation timeLogicalType) {
-            return Optional.of(ToLocalTimePage.create(pageType));
+            // isAdjustedToUTC parameter is ignored while reading LocalTime from Parquet files
+            switch (timeLogicalType.getUnit()) {
+                case MILLIS:
+                    return Optional.of(ToLocalTimePage.createFromMillis(pageType));
+                case MICROS:
+                    return Optional.of(ToLocalTimePage.createFromMicros(pageType));
+                case NANOS:
+                    return Optional.of(ToLocalTimePage.createFromNanos(pageType));
+                default:
+                    throw new IllegalArgumentException("Unsupported unit=" + timeLogicalType.getUnit());
+            }
         }
 
         @Override
@@ -509,28 +617,37 @@ private static class LogicalTypeVisitor<ATTR extends Any>
                 final LogicalTypeAnnotation.DecimalLogicalTypeAnnotation decimalLogicalType) {
             final PrimitiveType type = columnChunkReader.getType();
             final PrimitiveType.PrimitiveTypeName typeName = type.getPrimitiveTypeName();
-            final int encodedSizeInBytes = typeName == BINARY ? -1 : type.getTypeLength();
-            if (BigDecimal.class.equals(pageType)) {
-                final int precision = decimalLogicalType.getPrecision();
-                final int scale = decimalLogicalType.getScale();
-                try {
-                    verifyPrecisionAndScale(precision, scale, typeName);
-                } catch (final IllegalArgumentException exception) {
-                    throw new TableDataException(
-                            "Invalid scale and precision for column " + name + ": " + exception.getMessage());
-                }
-                return Optional.of(ToBigDecimalPage.create(
-                        pageType,
-                        new BigDecimalParquetBytesCodec(precision, scale, encodedSizeInBytes),
-                        columnChunkReader.getDictionarySupplier()));
-            } else if (BigInteger.class.equals(pageType)) {
-                return Optional.of(ToBigIntegerPage.create(
-                        pageType,
-                        new BigIntegerParquetBytesCodec(encodedSizeInBytes),
-                        columnChunkReader.getDictionarySupplier()));
+            switch (typeName) {
+                case INT32:
+                    return Optional.of(ToBigDecimalFromNumeric.createFromInt(pageType, decimalLogicalType.getScale()));
+                case INT64:
+                    return Optional.of(ToBigDecimalFromNumeric.createFromLong(pageType, decimalLogicalType.getScale()));
+                case FIXED_LEN_BYTE_ARRAY: // fall through
+                case BINARY:
+                    final int encodedSizeInBytes = typeName == BINARY ? -1 : type.getTypeLength();
+                    if (pageType == BigDecimal.class) {
+                        final int precision = decimalLogicalType.getPrecision();
+                        final int scale = decimalLogicalType.getScale();
+                        try {
+                            verifyPrecisionAndScale(precision, scale, typeName);
+                        } catch (final IllegalArgumentException exception) {
+                            throw new TableDataException(
+                                    "Invalid scale and precision for column " + name + ": " + exception.getMessage());
+                        }
+                        return Optional.of(ToBigDecimalPage.create(
+                                pageType,
+                                new BigDecimalParquetBytesCodec(precision, scale, encodedSizeInBytes),
+                                columnChunkReader.getDictionarySupplier()));
+                    } else if (pageType == BigInteger.class) {
+                        return Optional.of(ToBigIntegerPage.create(
+                                pageType,
+                                new BigIntegerParquetBytesCodec(encodedSizeInBytes),
+                                columnChunkReader.getDictionarySupplier()));
+                    }
+                    // We won't blow up here, Maybe someone will provide us a codec instead.
+                default:
+                    return Optional.empty();
             }
-            // We won't blow up here, Maybe someone will provide us a codec instead.
-            return Optional.empty();
         }
     }
 }
diff --git a/extensions/parquet/table/src/main/java/io/deephaven/parquet/table/location/ParquetTableLocation.java b/extensions/parquet/table/src/main/java/io/deephaven/parquet/table/location/ParquetTableLocation.java
index b782c8488c6..7c8f47636e5 100644
--- a/extensions/parquet/table/src/main/java/io/deephaven/parquet/table/location/ParquetTableLocation.java
+++ b/extensions/parquet/table/src/main/java/io/deephaven/parquet/table/location/ParquetTableLocation.java
@@ -197,6 +197,10 @@ private RowSet computeIndex() {
 
         for (int rgi = 0; rgi < rowGroups.length; ++rgi) {
             final long subRegionSize = rowGroups[rgi].getNum_rows();
+            if (subRegionSize == 0) {
+                // Skip empty row groups
+                continue;
+            }
             final long subRegionFirstKey = (long) rgi << regionParameters.regionMaskNumBits;
             final long subRegionLastKey = subRegionFirstKey + subRegionSize - 1;
             sequentialBuilder.appendRange(subRegionFirstKey, subRegionLastKey);
diff --git a/extensions/parquet/table/src/main/java/io/deephaven/parquet/table/location/ParquetTableLocationKey.java b/extensions/parquet/table/src/main/java/io/deephaven/parquet/table/location/ParquetTableLocationKey.java
index cafff0a3210..685d973cf35 100644
--- a/extensions/parquet/table/src/main/java/io/deephaven/parquet/table/location/ParquetTableLocationKey.java
+++ b/extensions/parquet/table/src/main/java/io/deephaven/parquet/table/location/ParquetTableLocationKey.java
@@ -21,6 +21,7 @@
 import java.net.URI;
 import java.util.List;
 import java.util.Map;
+import java.util.Objects;
 import java.util.stream.IntStream;
 
 import static io.deephaven.parquet.base.ParquetUtils.PARQUET_FILE_EXTENSION;
@@ -54,9 +55,8 @@ public class ParquetTableLocationKey extends URITableLocationKey {
     public ParquetTableLocationKey(@NotNull final URI parquetFileUri, final int order,
             @Nullable final Map<String, Comparable<?>> partitions,
             @NotNull final ParquetInstructions readInstructions) {
-        this(parquetFileUri, order, partitions, readInstructions,
-                SeekableChannelsProviderLoader.getInstance().fromServiceLoader(parquetFileUri,
-                        readInstructions.getSpecialInstructions()));
+        this(parquetFileUri, order, partitions, SeekableChannelsProviderLoader.getInstance()
+                .load(parquetFileUri.getScheme(), readInstructions.getSpecialInstructions()));
     }
 
     /**
@@ -67,15 +67,36 @@ public ParquetTableLocationKey(@NotNull final URI parquetFileUri, final int orde
      * @param partitions The table partitions enclosing the table location keyed by {@code this}. Note that if this
      *        parameter is {@code null}, the location will be a member of no partitions. An ordered copy of the map will
      *        be made, so the calling code is free to mutate the map after this call
-     * @param readInstructions the instructions for customizations while reading
+     * @param readInstructions the instructions for customizations while reading, unused
      * @param channelsProvider the provider for reading the file
+     * @deprecated the {@code readInstructions} parameter is unused, please
+     *             use{@link #ParquetTableLocationKey(URI, int, Map, SeekableChannelsProvider)}
      */
+    @Deprecated(forRemoval = true)
     public ParquetTableLocationKey(@NotNull final URI parquetFileUri, final int order,
             @Nullable final Map<String, Comparable<?>> partitions,
             @NotNull final ParquetInstructions readInstructions,
             @NotNull final SeekableChannelsProvider channelsProvider) {
+        this(parquetFileUri, order, partitions, channelsProvider);
+    }
+
+    /**
+     * Construct a new ParquetTableLocationKey for the supplied {@code parquetFileUri} and {@code partitions}.
+     *
+     * @param parquetFileUri The parquet file that backs the keyed location. Will be adjusted to an absolute path.
+     * @param order Explicit ordering index, taking precedence over other fields
+     * @param partitions The table partitions enclosing the table location keyed by {@code this}. Note that if this
+     *        parameter is {@code null}, the location will be a member of no partitions. An ordered copy of the map will
+     *        be made, so the calling code is free to mutate the map after this call
+     * @param channelsProvider the provider for reading the file
+     */
+    public ParquetTableLocationKey(
+            @NotNull final URI parquetFileUri,
+            final int order,
+            @Nullable final Map<String, Comparable<?>> partitions,
+            @NotNull final SeekableChannelsProvider channelsProvider) {
         super(validateParquetFile(parquetFileUri), order, partitions);
-        this.channelsProvider = channelsProvider;
+        this.channelsProvider = Objects.requireNonNull(channelsProvider);
     }
 
     private static URI validateParquetFile(@NotNull final URI parquetFileUri) {
@@ -178,4 +199,12 @@ public synchronized int[] getRowGroupIndices() {
     public synchronized void setRowGroupIndices(final int[] rowGroupIndices) {
         this.rowGroupIndices = rowGroupIndices;
     }
+
+    @Override
+    public synchronized void clear() {
+        metadata = null;
+        fileReader = null;
+        rowGroupIndices = null;
+        channelsProvider = null;
+    }
 }
diff --git a/extensions/parquet/table/src/main/java/io/deephaven/parquet/table/pagestore/ColumnChunkPageStore.java b/extensions/parquet/table/src/main/java/io/deephaven/parquet/table/pagestore/ColumnChunkPageStore.java
index ba3ca21a328..daed8692a55 100644
--- a/extensions/parquet/table/src/main/java/io/deephaven/parquet/table/pagestore/ColumnChunkPageStore.java
+++ b/extensions/parquet/table/src/main/java/io/deephaven/parquet/table/pagestore/ColumnChunkPageStore.java
@@ -39,7 +39,7 @@ public abstract class ColumnChunkPageStore<ATTR extends Any>
     final PageCache<ATTR> pageCache;
     final ColumnChunkReader columnChunkReader;
     private final long mask;
-    private final ToPage<ATTR, ?> toPage;
+    final ToPage<ATTR, ?> toPage;
 
     private final long numRows;
 
@@ -108,8 +108,7 @@ public static <ATTR extends Any> CreatorResult<ATTR> create(
         final ColumnChunkPageStore<ATTR> columnChunkPageStore = canUseOffsetIndex
                 ? new OffsetIndexBasedColumnChunkPageStore<>(pageCache, columnChunkReader, mask, toPage)
                 : new VariablePageSizeColumnChunkPageStore<>(pageCache, columnChunkReader, mask, toPage);
-        final ToPage<DictionaryKeys, long[]> dictionaryKeysToPage =
-                toPage.getDictionaryKeysToPage();
+        final ToPage<DictionaryKeys, long[]> dictionaryKeysToPage = toPage.getDictionaryKeysToPage();
         final ColumnChunkPageStore<DictionaryKeys> dictionaryKeysColumnChunkPageStore =
                 dictionaryKeysToPage == null ? null
                         : canUseOffsetIndex
diff --git a/extensions/parquet/table/src/main/java/io/deephaven/parquet/table/pagestore/OffsetIndexBasedColumnChunkPageStore.java b/extensions/parquet/table/src/main/java/io/deephaven/parquet/table/pagestore/OffsetIndexBasedColumnChunkPageStore.java
index a4721ca2384..30a18dd00f4 100644
--- a/extensions/parquet/table/src/main/java/io/deephaven/parquet/table/pagestore/OffsetIndexBasedColumnChunkPageStore.java
+++ b/extensions/parquet/table/src/main/java/io/deephaven/parquet/table/pagestore/OffsetIndexBasedColumnChunkPageStore.java
@@ -80,7 +80,8 @@ private void ensureInitialized(@Nullable final FillContext fillContext) {
             numPages = offsetIndex.getPageCount();
             Assert.gtZero(numPages, "numPages");
             pageStates = new AtomicReferenceArray<>(numPages);
-            columnPageDirectAccessor = columnChunkReader.getPageAccessor(offsetIndex);
+            columnPageDirectAccessor =
+                    columnChunkReader.getPageAccessor(offsetIndex, toPage.getPageMaterializerFactory());
 
             if (numPages == 1) {
                 fixedPageSize = numRows();
diff --git a/extensions/parquet/table/src/main/java/io/deephaven/parquet/table/pagestore/VariablePageSizeColumnChunkPageStore.java b/extensions/parquet/table/src/main/java/io/deephaven/parquet/table/pagestore/VariablePageSizeColumnChunkPageStore.java
index 0a0ea268a21..55af02eb5af 100644
--- a/extensions/parquet/table/src/main/java/io/deephaven/parquet/table/pagestore/VariablePageSizeColumnChunkPageStore.java
+++ b/extensions/parquet/table/src/main/java/io/deephaven/parquet/table/pagestore/VariablePageSizeColumnChunkPageStore.java
@@ -47,7 +47,7 @@ final class VariablePageSizeColumnChunkPageStore<ATTR extends Any> extends Colum
         columnPageReaders = new ColumnPageReader[INIT_ARRAY_SIZE];
         // TODO(deephaven-core#4836): We probably need a super-interface of Iterator to allow ourselves to set or clear
         // the inner fill context to be used by next.
-        columnPageReaderIterator = columnChunkReader.getPageIterator();
+        columnPageReaderIterator = columnChunkReader.getPageIterator(toPage.getPageMaterializerFactory());
 
         // noinspection unchecked
         pages = (WeakReference<PageCache.IntrusivePage<ATTR>>[]) new WeakReference[INIT_ARRAY_SIZE];
diff --git a/extensions/parquet/table/src/main/java/io/deephaven/parquet/table/pagestore/topage/ToBigDecimalFromNumeric.java b/extensions/parquet/table/src/main/java/io/deephaven/parquet/table/pagestore/topage/ToBigDecimalFromNumeric.java
new file mode 100644
index 00000000000..0cb3ae7477d
--- /dev/null
+++ b/extensions/parquet/table/src/main/java/io/deephaven/parquet/table/pagestore/topage/ToBigDecimalFromNumeric.java
@@ -0,0 +1,58 @@
+//
+// Copyright (c) 2016-2024 Deephaven Data Labs and Patent Pending
+//
+package io.deephaven.parquet.table.pagestore.topage;
+
+import io.deephaven.chunk.ChunkType;
+import io.deephaven.chunk.attributes.Any;
+import io.deephaven.parquet.base.PageMaterializerFactory;
+import io.deephaven.parquet.base.materializers.BigDecimalFromIntMaterializer;
+import io.deephaven.parquet.base.materializers.BigDecimalFromLongMaterializer;
+import org.jetbrains.annotations.NotNull;
+
+import java.math.BigDecimal;
+
+public class ToBigDecimalFromNumeric<ATTR extends Any> implements ToPage<ATTR, BigDecimal[]> {
+
+    public static <ATTR extends Any> ToPage<ATTR, BigDecimal[]> createFromInt(
+            @NotNull final Class<?> nativeType,
+            final int scale) {
+        return new ToBigDecimalFromNumeric<>(nativeType, new BigDecimalFromIntMaterializer.Factory(scale));
+    }
+
+    public static <ATTR extends Any> ToPage<ATTR, BigDecimal[]> createFromLong(
+            @NotNull final Class<?> nativeType,
+            final int scale) {
+        return new ToBigDecimalFromNumeric<>(nativeType, new BigDecimalFromLongMaterializer.Factory(scale));
+    }
+
+    private final PageMaterializerFactory pageMaterializerFactory;
+
+    private ToBigDecimalFromNumeric(
+            @NotNull final Class<?> nativeType,
+            @NotNull final PageMaterializerFactory pageMaterializerFactory) {
+        if (!BigDecimal.class.equals(nativeType)) {
+            throw new IllegalArgumentException(
+                    "The native type for a BigDecimal column is " + nativeType.getCanonicalName());
+        }
+        this.pageMaterializerFactory = pageMaterializerFactory;
+    }
+
+    @NotNull
+    @Override
+    public final Class<?> getNativeType() {
+        return BigDecimal.class;
+    }
+
+    @Override
+    @NotNull
+    public final ChunkType getChunkType() {
+        return ChunkType.Object;
+    }
+
+    @Override
+    @NotNull
+    public final PageMaterializerFactory getPageMaterializerFactory() {
+        return pageMaterializerFactory;
+    }
+}
diff --git a/extensions/parquet/table/src/main/java/io/deephaven/parquet/table/pagestore/topage/ToBigDecimalPage.java b/extensions/parquet/table/src/main/java/io/deephaven/parquet/table/pagestore/topage/ToBigDecimalPage.java
index 0e60264aa3e..07d3f11e999 100644
--- a/extensions/parquet/table/src/main/java/io/deephaven/parquet/table/pagestore/topage/ToBigDecimalPage.java
+++ b/extensions/parquet/table/src/main/java/io/deephaven/parquet/table/pagestore/topage/ToBigDecimalPage.java
@@ -9,7 +9,8 @@
 
 import io.deephaven.chunk.ChunkType;
 import io.deephaven.chunk.attributes.Any;
-import io.deephaven.parquet.base.BigDecimalParquetBytesCodec;
+import io.deephaven.parquet.base.PageMaterializerFactory;
+import io.deephaven.parquet.base.materializers.BigDecimalFromBytesMaterializer;
 import io.deephaven.util.channel.SeekableChannelContext;
 import io.deephaven.util.codec.ObjectCodec;
 import org.apache.parquet.column.Dictionary;
@@ -20,7 +21,7 @@
 
 public class ToBigDecimalPage<ATTR extends Any> implements ToPage<ATTR, BigDecimal[]> {
 
-    private static final ToBigDecimalPage<? extends Any> INSTANCE = new ToBigDecimalPage<>();
+    private final PageMaterializerFactory pageMaterializerFactory;
 
     public static <ATTR extends Any> ToPage<ATTR, BigDecimal[]> create(
             final Class<?> nativeType,
@@ -28,8 +29,7 @@ public static <ATTR extends Any> ToPage<ATTR, BigDecimal[]> create(
             final Function<SeekableChannelContext, Dictionary> dictionarySupplier) {
         if (nativeType == null || BigDecimal.class.equals(nativeType)) {
             if (dictionarySupplier == null) {
-                // noinspection unchecked
-                return (ToPage<ATTR, BigDecimal[]>) INSTANCE;
+                return new ToBigDecimalPage<>(codec);
             }
             // Note that dictionary supplier is never null, even if it points to a NULL_DICTIONARY.
             // So we always use the following dictionary version of ToPage but internally, we check if the dictionary is
@@ -37,18 +37,18 @@ public static <ATTR extends Any> ToPage<ATTR, BigDecimal[]> create(
             return new ToPageWithDictionary<>(
                     BigDecimal.class,
                     new ChunkDictionary<>(
-                            (dictionary, key) -> {
-                                final byte[] bytes = dictionary.decodeToBinary(key).getBytes();
-                                return codec.decode(bytes, 0, bytes.length);
-                            },
+                            (dictionary, key) -> codec.decode(dictionary.decodeToBinary(key).toByteBuffer()),
                             dictionarySupplier),
-                    INSTANCE::convertResult);
+                    (final Object result) -> (BigDecimal[]) result,
+                    new BigDecimalFromBytesMaterializer.Factory(codec));
         }
         throw new IllegalArgumentException(
                 "The native type for a BigDecimal column is " + nativeType.getCanonicalName());
     }
 
-    private ToBigDecimalPage() {}
+    private ToBigDecimalPage(@NotNull final ObjectCodec<BigDecimal> codec) {
+        pageMaterializerFactory = new BigDecimalFromBytesMaterializer.Factory(codec);
+    }
 
     @Override
     @NotNull
@@ -61,4 +61,10 @@ public final Class<?> getNativeType() {
     public final ChunkType getChunkType() {
         return ChunkType.Object;
     }
+
+    @Override
+    @NotNull
+    public final PageMaterializerFactory getPageMaterializerFactory() {
+        return pageMaterializerFactory;
+    }
 }
diff --git a/extensions/parquet/table/src/main/java/io/deephaven/parquet/table/pagestore/topage/ToBigIntegerPage.java b/extensions/parquet/table/src/main/java/io/deephaven/parquet/table/pagestore/topage/ToBigIntegerPage.java
index 7b38928009d..9597eafb5c7 100644
--- a/extensions/parquet/table/src/main/java/io/deephaven/parquet/table/pagestore/topage/ToBigIntegerPage.java
+++ b/extensions/parquet/table/src/main/java/io/deephaven/parquet/table/pagestore/topage/ToBigIntegerPage.java
@@ -5,7 +5,8 @@
 
 import io.deephaven.chunk.ChunkType;
 import io.deephaven.chunk.attributes.Any;
-import io.deephaven.parquet.base.BigIntegerParquetBytesCodec;
+import io.deephaven.parquet.base.PageMaterializerFactory;
+import io.deephaven.parquet.base.materializers.BigIntegerMaterializer;
 import io.deephaven.util.channel.SeekableChannelContext;
 import io.deephaven.util.codec.ObjectCodec;
 import org.apache.parquet.column.Dictionary;
@@ -16,7 +17,7 @@
 
 public class ToBigIntegerPage<ATTR extends Any> implements ToPage<ATTR, BigInteger[]> {
 
-    private static final ToBigIntegerPage<? extends Any> INSTANCE = new ToBigIntegerPage<>();
+    private final PageMaterializerFactory pageMaterializerFactory;
 
     public static <ATTR extends Any> ToPage<ATTR, BigInteger[]> create(
             final Class<?> nativeType,
@@ -24,8 +25,7 @@ public static <ATTR extends Any> ToPage<ATTR, BigInteger[]> create(
             final Function<SeekableChannelContext, Dictionary> dictionarySupplier) {
         if (nativeType == null || BigInteger.class.equals(nativeType)) {
             if (dictionarySupplier == null) {
-                // noinspection unchecked
-                return (ToPage<ATTR, BigInteger[]>) INSTANCE;
+                return new ToBigIntegerPage<>(codec);
             }
             // Note that dictionary supplier is never null, even if it points to a NULL_DICTIONARY.
             // So we always use the following dictionary version of ToPage but internally, we check if the dictionary is
@@ -33,18 +33,18 @@ public static <ATTR extends Any> ToPage<ATTR, BigInteger[]> create(
             return new ToPageWithDictionary<>(
                     BigInteger.class,
                     new ChunkDictionary<>(
-                            (dictionary, key) -> {
-                                final byte[] bytes = dictionary.decodeToBinary(key).getBytes();
-                                return codec.decode(bytes, 0, bytes.length);
-                            },
+                            (dictionary, key) -> codec.decode(dictionary.decodeToBinary(key).toByteBuffer()),
                             dictionarySupplier),
-                    INSTANCE::convertResult);
+                    (final Object result) -> (BigInteger[]) result,
+                    new BigIntegerMaterializer.Factory(codec));
         }
         throw new IllegalArgumentException(
                 "The native type for a BigInteger column is " + nativeType.getCanonicalName());
     }
 
-    private ToBigIntegerPage() {}
+    private ToBigIntegerPage(@NotNull final ObjectCodec<BigInteger> codec) {
+        pageMaterializerFactory = new BigIntegerMaterializer.Factory(codec);
+    }
 
     @Override
     @NotNull
@@ -57,4 +57,10 @@ public final Class<?> getNativeType() {
     public final ChunkType getChunkType() {
         return ChunkType.Object;
     }
+
+    @Override
+    @NotNull
+    public final PageMaterializerFactory getPageMaterializerFactory() {
+        return pageMaterializerFactory;
+    }
 }
diff --git a/extensions/parquet/table/src/main/java/io/deephaven/parquet/table/pagestore/topage/ToBooleanAsBytePage.java b/extensions/parquet/table/src/main/java/io/deephaven/parquet/table/pagestore/topage/ToBooleanAsBytePage.java
index f7e13a3e036..529bba27066 100644
--- a/extensions/parquet/table/src/main/java/io/deephaven/parquet/table/pagestore/topage/ToBooleanAsBytePage.java
+++ b/extensions/parquet/table/src/main/java/io/deephaven/parquet/table/pagestore/topage/ToBooleanAsBytePage.java
@@ -4,6 +4,8 @@
 package io.deephaven.parquet.table.pagestore.topage;
 
 import io.deephaven.chunk.attributes.Any;
+import io.deephaven.parquet.base.PageMaterializerFactory;
+import io.deephaven.parquet.base.materializers.BooleanAsByteMaterializer;
 import io.deephaven.vector.ObjectVector;
 import io.deephaven.vector.ObjectVectorDirect;
 import io.deephaven.util.BooleanUtils;
@@ -14,6 +16,7 @@
 
 public class ToBooleanAsBytePage<ATTR extends Any> implements ToPage<ATTR, byte[]> {
 
+    @SuppressWarnings("rawtypes")
     private static final ToBooleanAsBytePage INSTANCE = new ToBooleanAsBytePage<>();
 
     public static <ATTR extends Any> ToBooleanAsBytePage<ATTR> create(Class<?> nativeType) {
@@ -51,6 +54,11 @@ public final Object nullValue() {
         return NULL_BOOLEAN_AS_BYTE_BOXED;
     }
 
+    @Override
+    public final PageMaterializerFactory getPageMaterializerFactory() {
+        return BooleanAsByteMaterializer.FACTORY;
+    }
+
     @Override
     @NotNull
     public ObjectVector<Boolean> makeVector(byte[] result) {
diff --git a/extensions/parquet/table/src/main/java/io/deephaven/parquet/table/pagestore/topage/ToBytePage.java b/extensions/parquet/table/src/main/java/io/deephaven/parquet/table/pagestore/topage/ToBytePage.java
index ff24ec4aeda..1f953292d20 100644
--- a/extensions/parquet/table/src/main/java/io/deephaven/parquet/table/pagestore/topage/ToBytePage.java
+++ b/extensions/parquet/table/src/main/java/io/deephaven/parquet/table/pagestore/topage/ToBytePage.java
@@ -1,32 +1,48 @@
 //
 // Copyright (c) 2016-2024 Deephaven Data Labs and Patent Pending
 //
-// ****** AUTO-GENERATED CLASS - DO NOT EDIT MANUALLY
-// ****** Edit ToIntPage and run "./gradlew replicateToPage" to regenerate
-//
-// @formatter:off
 package io.deephaven.parquet.table.pagestore.topage;
 
 import io.deephaven.chunk.ChunkType;
 import io.deephaven.chunk.attributes.Any;
+import io.deephaven.parquet.base.PageMaterializerFactory;
+import io.deephaven.parquet.base.materializers.BooleanAsByteMaterializer;
+import io.deephaven.parquet.base.materializers.ByteMaterializer;
 import org.jetbrains.annotations.NotNull;
 
 import static io.deephaven.util.QueryConstants.NULL_BYTE_BOXED;
 
 public class ToBytePage<ATTR extends Any> implements ToPage<ATTR, byte[]> {
 
-    private static final ToBytePage INSTANCE = new ToBytePage<>();
-
     public static <ATTR extends Any> ToBytePage<ATTR> create(Class<?> nativeType) {
+        verifyNativeType(nativeType);
+        // noinspection unchecked
+        return FROM_BYTE;
+    }
+
+    public static <ATTR extends Any> ToBytePage<ATTR> createFromBoolean(final Class<?> nativeType) {
+        verifyNativeType(nativeType);
+        // noinspection unchecked
+        return FROM_BOOLEAN;
+    }
+
+    @SuppressWarnings("rawtypes")
+    private static final ToBytePage FROM_BYTE = new ToBytePage<>(ByteMaterializer.FACTORY);
+    @SuppressWarnings("rawtypes")
+    private static final ToBytePage FROM_BOOLEAN = new ToBytePage<>(BooleanAsByteMaterializer.FACTORY);
+
+    private static void verifyNativeType(final Class<?> nativeType) {
         if (nativeType == null || byte.class.equals(nativeType)) {
-            // noinspection unchecked
-            return INSTANCE;
+            return;
         }
-
         throw new IllegalArgumentException("The native type for a Byte column is " + nativeType.getCanonicalName());
     }
 
-    private ToBytePage() {}
+    private final PageMaterializerFactory pageMaterializerFactory;
+
+    private ToBytePage(@NotNull final PageMaterializerFactory pageMaterializerFactory) {
+        this.pageMaterializerFactory = pageMaterializerFactory;
+    }
 
     @Override
     @NotNull
@@ -45,4 +61,10 @@ public final ChunkType getChunkType() {
     public final Object nullValue() {
         return NULL_BYTE_BOXED;
     }
+
+    @Override
+    @NotNull
+    public final PageMaterializerFactory getPageMaterializerFactory() {
+        return pageMaterializerFactory;
+    }
 }
diff --git a/extensions/parquet/table/src/main/java/io/deephaven/parquet/table/pagestore/topage/ToCharPage.java b/extensions/parquet/table/src/main/java/io/deephaven/parquet/table/pagestore/topage/ToCharPage.java
index 45f13abec94..2248cede91a 100644
--- a/extensions/parquet/table/src/main/java/io/deephaven/parquet/table/pagestore/topage/ToCharPage.java
+++ b/extensions/parquet/table/src/main/java/io/deephaven/parquet/table/pagestore/topage/ToCharPage.java
@@ -1,20 +1,19 @@
 //
 // Copyright (c) 2016-2024 Deephaven Data Labs and Patent Pending
 //
-// ****** AUTO-GENERATED CLASS - DO NOT EDIT MANUALLY
-// ****** Edit ToIntPage and run "./gradlew replicateToPage" to regenerate
-//
-// @formatter:off
 package io.deephaven.parquet.table.pagestore.topage;
 
 import io.deephaven.chunk.ChunkType;
 import io.deephaven.chunk.attributes.Any;
+import io.deephaven.parquet.base.PageMaterializerFactory;
+import io.deephaven.parquet.base.materializers.CharMaterializer;
 import org.jetbrains.annotations.NotNull;
 
 import static io.deephaven.util.QueryConstants.NULL_CHAR_BOXED;
 
 public class ToCharPage<ATTR extends Any> implements ToPage<ATTR, char[]> {
 
+    @SuppressWarnings("rawtypes")
     private static final ToCharPage INSTANCE = new ToCharPage<>();
 
     public static <ATTR extends Any> ToCharPage<ATTR> create(Class<?> nativeType) {
@@ -45,4 +44,10 @@ public final ChunkType getChunkType() {
     public final Object nullValue() {
         return NULL_CHAR_BOXED;
     }
+
+    @Override
+    @NotNull
+    public final PageMaterializerFactory getPageMaterializerFactory() {
+        return CharMaterializer.FACTORY;
+    }
 }
diff --git a/extensions/parquet/table/src/main/java/io/deephaven/parquet/table/pagestore/topage/ToDoublePage.java b/extensions/parquet/table/src/main/java/io/deephaven/parquet/table/pagestore/topage/ToDoublePage.java
index 3a68addb35e..474b4d3106f 100644
--- a/extensions/parquet/table/src/main/java/io/deephaven/parquet/table/pagestore/topage/ToDoublePage.java
+++ b/extensions/parquet/table/src/main/java/io/deephaven/parquet/table/pagestore/topage/ToDoublePage.java
@@ -1,32 +1,48 @@
 //
 // Copyright (c) 2016-2024 Deephaven Data Labs and Patent Pending
 //
-// ****** AUTO-GENERATED CLASS - DO NOT EDIT MANUALLY
-// ****** Edit ToIntPage and run "./gradlew replicateToPage" to regenerate
-//
-// @formatter:off
 package io.deephaven.parquet.table.pagestore.topage;
 
 import io.deephaven.chunk.ChunkType;
 import io.deephaven.chunk.attributes.Any;
+import io.deephaven.parquet.base.PageMaterializerFactory;
+import io.deephaven.parquet.base.materializers.DoubleFromFloatMaterializer;
+import io.deephaven.parquet.base.materializers.DoubleMaterializer;
 import org.jetbrains.annotations.NotNull;
 
 import static io.deephaven.util.QueryConstants.NULL_DOUBLE_BOXED;
 
 public class ToDoublePage<ATTR extends Any> implements ToPage<ATTR, double[]> {
 
-    private static final ToDoublePage INSTANCE = new ToDoublePage<>();
+    public static <ATTR extends Any> ToDoublePage<ATTR> create(final Class<?> nativeType) {
+        verifyNativeType(nativeType);
+        // noinspection unchecked
+        return FROM_DOUBLE;
+    }
+
+    public static <ATTR extends Any> ToDoublePage<ATTR> createFromFloat(final Class<?> nativeType) {
+        verifyNativeType(nativeType);
+        // noinspection unchecked
+        return FROM_FLOAT;
+    }
+
+    @SuppressWarnings("rawtypes")
+    private static final ToDoublePage FROM_DOUBLE = new ToDoublePage<>(DoubleMaterializer.FACTORY);
+    @SuppressWarnings("rawtypes")
+    private static final ToDoublePage FROM_FLOAT = new ToDoublePage<>(DoubleFromFloatMaterializer.FACTORY);
 
-    public static <ATTR extends Any> ToDoublePage<ATTR> create(Class<?> nativeType) {
+    private static void verifyNativeType(final Class<?> nativeType) {
         if (nativeType == null || double.class.equals(nativeType)) {
-            // noinspection unchecked
-            return INSTANCE;
+            return;
         }
-
         throw new IllegalArgumentException("The native type for a Double column is " + nativeType.getCanonicalName());
     }
 
-    private ToDoublePage() {}
+    private final PageMaterializerFactory pageMaterializerFactory;
+
+    private ToDoublePage(@NotNull final PageMaterializerFactory pageMaterializerFactory) {
+        this.pageMaterializerFactory = pageMaterializerFactory;
+    }
 
     @Override
     @NotNull
@@ -45,4 +61,10 @@ public final ChunkType getChunkType() {
     public final Object nullValue() {
         return NULL_DOUBLE_BOXED;
     }
+
+    @Override
+    @NotNull
+    public final PageMaterializerFactory getPageMaterializerFactory() {
+        return pageMaterializerFactory;
+    }
 }
diff --git a/extensions/parquet/table/src/main/java/io/deephaven/parquet/table/pagestore/topage/ToFloatPage.java b/extensions/parquet/table/src/main/java/io/deephaven/parquet/table/pagestore/topage/ToFloatPage.java
index 3801e9ae21d..63bb095afec 100644
--- a/extensions/parquet/table/src/main/java/io/deephaven/parquet/table/pagestore/topage/ToFloatPage.java
+++ b/extensions/parquet/table/src/main/java/io/deephaven/parquet/table/pagestore/topage/ToFloatPage.java
@@ -2,19 +2,22 @@
 // Copyright (c) 2016-2024 Deephaven Data Labs and Patent Pending
 //
 // ****** AUTO-GENERATED CLASS - DO NOT EDIT MANUALLY
-// ****** Edit ToIntPage and run "./gradlew replicateToPage" to regenerate
+// ****** Edit ToCharPage and run "./gradlew replicateToPage" to regenerate
 //
 // @formatter:off
 package io.deephaven.parquet.table.pagestore.topage;
 
 import io.deephaven.chunk.ChunkType;
 import io.deephaven.chunk.attributes.Any;
+import io.deephaven.parquet.base.PageMaterializerFactory;
+import io.deephaven.parquet.base.materializers.FloatMaterializer;
 import org.jetbrains.annotations.NotNull;
 
 import static io.deephaven.util.QueryConstants.NULL_FLOAT_BOXED;
 
 public class ToFloatPage<ATTR extends Any> implements ToPage<ATTR, float[]> {
 
+    @SuppressWarnings("rawtypes")
     private static final ToFloatPage INSTANCE = new ToFloatPage<>();
 
     public static <ATTR extends Any> ToFloatPage<ATTR> create(Class<?> nativeType) {
@@ -45,4 +48,10 @@ public final ChunkType getChunkType() {
     public final Object nullValue() {
         return NULL_FLOAT_BOXED;
     }
+
+    @Override
+    @NotNull
+    public final PageMaterializerFactory getPageMaterializerFactory() {
+        return FloatMaterializer.FACTORY;
+    }
 }
diff --git a/extensions/parquet/table/src/main/java/io/deephaven/parquet/table/pagestore/topage/ToInstantPage.java b/extensions/parquet/table/src/main/java/io/deephaven/parquet/table/pagestore/topage/ToInstantPage.java
index 2a961f688fe..ed53a510dc7 100644
--- a/extensions/parquet/table/src/main/java/io/deephaven/parquet/table/pagestore/topage/ToInstantPage.java
+++ b/extensions/parquet/table/src/main/java/io/deephaven/parquet/table/pagestore/topage/ToInstantPage.java
@@ -5,6 +5,11 @@
 
 import io.deephaven.chunk.ChunkType;
 import io.deephaven.chunk.attributes.Any;
+import io.deephaven.parquet.base.PageMaterializerFactory;
+import io.deephaven.parquet.base.materializers.InstantNanosFromInt96Materializer;
+import io.deephaven.parquet.base.materializers.InstantNanosFromMicrosMaterializer;
+import io.deephaven.parquet.base.materializers.InstantNanosFromMillisMaterializer;
+import io.deephaven.parquet.base.materializers.LongMaterializer;
 import io.deephaven.time.DateTimeUtils;
 import io.deephaven.vector.ObjectVector;
 import io.deephaven.vector.ObjectVectorDirect;
@@ -16,20 +21,51 @@
 
 public class ToInstantPage<ATTR extends Any> implements ToPage<ATTR, long[]> {
 
-    private static final ToInstantPage INSTANCE = new ToInstantPage<>();
+    public static <ATTR extends Any> ToPage<ATTR, Instant[]> createFromMillis(final Class<?> nativeType) {
+        verifyNativeType(nativeType);
+        // noinspection unchecked
+        return FROM_MILLIS;
+    }
 
-    @SuppressWarnings("unchecked")
-    public static <ATTR extends Any> ToPage<ATTR, Instant[]> create(final Class<?> nativeType) {
-        if (nativeType == null || Instant.class.equals(nativeType)) {
-            // noinspection unchecked
-            return INSTANCE;
-        }
+    public static <ATTR extends Any> ToPage<ATTR, Instant[]> createFromMicros(final Class<?> nativeType) {
+        verifyNativeType(nativeType);
+        // noinspection unchecked
+        return FROM_MICROS;
+    }
+
+    public static <ATTR extends Any> ToPage<ATTR, Instant[]> createFromNanos(final Class<?> nativeType) {
+        verifyNativeType(nativeType);
+        // noinspection unchecked
+        return FROM_NANOS;
+    }
 
-        throw new IllegalArgumentException(
-                "The native type for an Instant column is " + nativeType.getCanonicalName());
+    public static <ATTR extends Any> ToPage<ATTR, Instant[]> createFromInt96(final Class<?> nativeType) {
+        verifyNativeType(nativeType);
+        // noinspection unchecked
+        return FROM_INT96;
     }
 
-    private ToInstantPage() {}
+    @SuppressWarnings("rawtypes")
+    private static final ToPage FROM_MILLIS = new ToInstantPage<>(InstantNanosFromMillisMaterializer.FACTORY);
+    @SuppressWarnings("rawtypes")
+    private static final ToPage FROM_MICROS = new ToInstantPage<>(InstantNanosFromMicrosMaterializer.FACTORY);
+    @SuppressWarnings("rawtypes")
+    private static final ToPage FROM_NANOS = new ToInstantPage<>(LongMaterializer.FACTORY);
+    @SuppressWarnings("rawtypes")
+    private static final ToPage FROM_INT96 = new ToInstantPage<>(InstantNanosFromInt96Materializer.FACTORY);
+
+    private static void verifyNativeType(final Class<?> nativeType) {
+        if (nativeType != null && !Instant.class.equals(nativeType)) {
+            throw new IllegalArgumentException(
+                    "The native type for an Instant column is " + nativeType.getCanonicalName());
+        }
+    }
+
+    private final PageMaterializerFactory pageMaterializerFactory;
+
+    private ToInstantPage(@NotNull final PageMaterializerFactory pageMaterializerFactory) {
+        this.pageMaterializerFactory = pageMaterializerFactory;
+    }
 
     @Override
     @NotNull
@@ -55,10 +91,16 @@ public final Object nullValue() {
         return NULL_LONG_BOXED;
     }
 
+    @Override
+    @NotNull
+    public final PageMaterializerFactory getPageMaterializerFactory() {
+        return pageMaterializerFactory;
+    }
+
     @Override
     @NotNull
     public ObjectVector<Instant> makeVector(long[] result) {
-        Instant[] to = new Instant[result.length];
+        final Instant[] to = new Instant[result.length];
 
         for (int i = 0; i < result.length; ++i) {
             to[i] = DateTimeUtils.epochNanosToInstant(result[i]);
diff --git a/extensions/parquet/table/src/main/java/io/deephaven/parquet/table/pagestore/topage/ToIntPage.java b/extensions/parquet/table/src/main/java/io/deephaven/parquet/table/pagestore/topage/ToIntPage.java
index 845ea12ec9a..4b0ef392fd3 100644
--- a/extensions/parquet/table/src/main/java/io/deephaven/parquet/table/pagestore/topage/ToIntPage.java
+++ b/extensions/parquet/table/src/main/java/io/deephaven/parquet/table/pagestore/topage/ToIntPage.java
@@ -5,24 +5,62 @@
 
 import io.deephaven.chunk.ChunkType;
 import io.deephaven.chunk.attributes.Any;
+import io.deephaven.parquet.base.PageMaterializerFactory;
+import io.deephaven.parquet.base.materializers.IntFromBooleanMaterializer;
+import io.deephaven.parquet.base.materializers.IntFromUnsignedByteMaterializer;
+import io.deephaven.parquet.base.materializers.IntFromUnsignedShortMaterializer;
+import io.deephaven.parquet.base.materializers.IntMaterializer;
 import org.jetbrains.annotations.NotNull;
 
 import static io.deephaven.util.QueryConstants.NULL_INT_BOXED;
 
 public class ToIntPage<ATTR extends Any> implements ToPage<ATTR, int[]> {
 
-    private static final ToIntPage INSTANCE = new ToIntPage<>();
-
     public static <ATTR extends Any> ToIntPage<ATTR> create(Class<?> nativeType) {
+        verifyNativeType(nativeType);
+        // noinspection unchecked
+        return FROM_INT;
+    }
+
+    public static <ATTR extends Any> ToIntPage<ATTR> createFromUnsignedShort(final Class<?> nativeType) {
+        verifyNativeType(nativeType);
+        // noinspection unchecked
+        return FROM_UNSIGNED_SHORT;
+    }
+
+    public static <ATTR extends Any> ToIntPage<ATTR> createFromUnsignedByte(final Class<?> nativeType) {
+        verifyNativeType(nativeType);
+        // noinspection unchecked
+        return FROM_UNSIGNED_BYTE;
+    }
+
+    public static <ARRT extends Any> ToIntPage<ARRT> createFromBoolean(final Class<?> nativeType) {
+        verifyNativeType(nativeType);
+        // noinspection unchecked
+        return FROM_BOOLEAN;
+    }
+
+    @SuppressWarnings("rawtypes")
+    private static final ToIntPage FROM_INT = new ToIntPage<>(IntMaterializer.FACTORY);
+    @SuppressWarnings("rawtypes")
+    private static final ToIntPage FROM_UNSIGNED_SHORT = new ToIntPage<>(IntFromUnsignedShortMaterializer.FACTORY);
+    @SuppressWarnings("rawtypes")
+    private static final ToIntPage FROM_UNSIGNED_BYTE = new ToIntPage<>(IntFromUnsignedByteMaterializer.FACTORY);
+    @SuppressWarnings("rawtypes")
+    private static final ToIntPage FROM_BOOLEAN = new ToIntPage<>(IntFromBooleanMaterializer.FACTORY);
+
+    private static void verifyNativeType(final Class<?> nativeType) {
         if (nativeType == null || int.class.equals(nativeType)) {
-            // noinspection unchecked
-            return INSTANCE;
+            return;
         }
-
         throw new IllegalArgumentException("The native type for a Int column is " + nativeType.getCanonicalName());
     }
 
-    private ToIntPage() {}
+    private final PageMaterializerFactory pageMaterializerFactory;
+
+    private ToIntPage(@NotNull final PageMaterializerFactory pageMaterializerFactory) {
+        this.pageMaterializerFactory = pageMaterializerFactory;
+    }
 
     @Override
     @NotNull
@@ -41,4 +79,10 @@ public final ChunkType getChunkType() {
     public final Object nullValue() {
         return NULL_INT_BOXED;
     }
+
+    @Override
+    @NotNull
+    public final PageMaterializerFactory getPageMaterializerFactory() {
+        return pageMaterializerFactory;
+    }
 }
diff --git a/extensions/parquet/table/src/main/java/io/deephaven/parquet/table/pagestore/topage/ToLocalDatePage.java b/extensions/parquet/table/src/main/java/io/deephaven/parquet/table/pagestore/topage/ToLocalDatePage.java
index a2747a8d78e..96dce0d8bfd 100644
--- a/extensions/parquet/table/src/main/java/io/deephaven/parquet/table/pagestore/topage/ToLocalDatePage.java
+++ b/extensions/parquet/table/src/main/java/io/deephaven/parquet/table/pagestore/topage/ToLocalDatePage.java
@@ -5,12 +5,15 @@
 
 import io.deephaven.chunk.ChunkType;
 import io.deephaven.chunk.attributes.Any;
+import io.deephaven.parquet.base.PageMaterializerFactory;
+import io.deephaven.parquet.base.materializers.LocalDateMaterializer;
 import org.jetbrains.annotations.NotNull;
 
 import java.time.LocalDate;
 
 public class ToLocalDatePage<ATTR extends Any> implements ToPage<ATTR, LocalDate[]> {
 
+    @SuppressWarnings("rawtypes")
     private static final ToLocalDatePage INSTANCE = new ToLocalDatePage<>();
 
     public static <ATTR extends Any> ToLocalDatePage<ATTR> create(final Class<?> nativeType) {
@@ -35,4 +38,10 @@ public final Class<LocalDate> getNativeType() {
     public final ChunkType getChunkType() {
         return ChunkType.Object;
     }
+
+    @Override
+    @NotNull
+    public final PageMaterializerFactory getPageMaterializerFactory() {
+        return LocalDateMaterializer.FACTORY;
+    }
 }
diff --git a/extensions/parquet/table/src/main/java/io/deephaven/parquet/table/pagestore/topage/ToLocalDateTimePage.java b/extensions/parquet/table/src/main/java/io/deephaven/parquet/table/pagestore/topage/ToLocalDateTimePage.java
index 97f8ef5842c..3e78bb797dd 100644
--- a/extensions/parquet/table/src/main/java/io/deephaven/parquet/table/pagestore/topage/ToLocalDateTimePage.java
+++ b/extensions/parquet/table/src/main/java/io/deephaven/parquet/table/pagestore/topage/ToLocalDateTimePage.java
@@ -1,32 +1,57 @@
 //
 // Copyright (c) 2016-2024 Deephaven Data Labs and Patent Pending
 //
-// ****** AUTO-GENERATED CLASS - DO NOT EDIT MANUALLY
-// ****** Edit ToLocalDatePage and run "./gradlew replicateToPage" to regenerate
-//
-// @formatter:off
 package io.deephaven.parquet.table.pagestore.topage;
 
 import io.deephaven.chunk.ChunkType;
 import io.deephaven.chunk.attributes.Any;
+import io.deephaven.parquet.base.PageMaterializerFactory;
+import io.deephaven.parquet.base.materializers.LocalDateTimeFromMillisMaterializer;
+import io.deephaven.parquet.base.materializers.LocalDateTimeFromMicrosMaterializer;
+import io.deephaven.parquet.base.materializers.LocalDateTimeFromNanosMaterializer;
 import org.jetbrains.annotations.NotNull;
 
 import java.time.LocalDateTime;
 
 public class ToLocalDateTimePage<ATTR extends Any> implements ToPage<ATTR, LocalDateTime[]> {
 
-    private static final ToLocalDateTimePage INSTANCE = new ToLocalDateTimePage<>();
+    public static <ATTR extends Any> ToPage<ATTR, LocalDateTime[]> createFromMillis(final Class<?> nativeType) {
+        verifyNativeType(nativeType);
+        // noinspection unchecked
+        return FROM_MILLIS;
+    }
+
+    public static <ATTR extends Any> ToPage<ATTR, LocalDateTime[]> createFromMicros(final Class<?> nativeType) {
+        verifyNativeType(nativeType);
+        // noinspection unchecked
+        return FROM_MICROS;
+    }
+
+    public static <ATTR extends Any> ToPage<ATTR, LocalDateTime[]> createFromNanos(final Class<?> nativeType) {
+        verifyNativeType(nativeType);
+        // noinspection unchecked
+        return FROM_NANOS;
+    }
+
+    @SuppressWarnings("rawtypes")
+    private static final ToPage FROM_MILLIS = new ToLocalDateTimePage<>(LocalDateTimeFromMillisMaterializer.FACTORY);
+    @SuppressWarnings("rawtypes")
+    private static final ToPage FROM_MICROS = new ToLocalDateTimePage<>(LocalDateTimeFromMicrosMaterializer.FACTORY);
+    @SuppressWarnings("rawtypes")
+    private static final ToPage FROM_NANOS = new ToLocalDateTimePage<>(LocalDateTimeFromNanosMaterializer.FACTORY);
 
-    public static <ATTR extends Any> ToLocalDateTimePage<ATTR> create(final Class<?> nativeType) {
-        if (nativeType == null || LocalDateTime.class.equals(nativeType)) {
-            // noinspection unchecked
-            return INSTANCE;
+    private static void verifyNativeType(final Class<?> nativeType) {
+        if (nativeType != null && !LocalDateTime.class.equals(nativeType)) {
+            throw new IllegalArgumentException(
+                    "The native type for a LocalDateTime column is " + nativeType.getCanonicalName());
         }
-        throw new IllegalArgumentException(
-                "The native type for a LocalDateTime column is " + nativeType.getCanonicalName());
     }
 
-    private ToLocalDateTimePage() {}
+    private final PageMaterializerFactory pageMaterializerFactory;
+
+    private ToLocalDateTimePage(@NotNull final PageMaterializerFactory pageMaterializerFactory) {
+        this.pageMaterializerFactory = pageMaterializerFactory;
+    }
 
     @Override
     @NotNull
@@ -39,4 +64,10 @@ public final Class<LocalDateTime> getNativeType() {
     public final ChunkType getChunkType() {
         return ChunkType.Object;
     }
+
+    @Override
+    @NotNull
+    public final PageMaterializerFactory getPageMaterializerFactory() {
+        return pageMaterializerFactory;
+    }
 }
diff --git a/extensions/parquet/table/src/main/java/io/deephaven/parquet/table/pagestore/topage/ToLocalTimePage.java b/extensions/parquet/table/src/main/java/io/deephaven/parquet/table/pagestore/topage/ToLocalTimePage.java
index 2c6fa645e27..265b277ff37 100644
--- a/extensions/parquet/table/src/main/java/io/deephaven/parquet/table/pagestore/topage/ToLocalTimePage.java
+++ b/extensions/parquet/table/src/main/java/io/deephaven/parquet/table/pagestore/topage/ToLocalTimePage.java
@@ -2,31 +2,60 @@
 // Copyright (c) 2016-2024 Deephaven Data Labs and Patent Pending
 //
 // ****** AUTO-GENERATED CLASS - DO NOT EDIT MANUALLY
-// ****** Edit ToLocalDatePage and run "./gradlew replicateToPage" to regenerate
+// ****** Edit ToLocalDateTimePage and run "./gradlew replicateToPage" to regenerate
 //
 // @formatter:off
 package io.deephaven.parquet.table.pagestore.topage;
 
 import io.deephaven.chunk.ChunkType;
 import io.deephaven.chunk.attributes.Any;
+import io.deephaven.parquet.base.PageMaterializerFactory;
+import io.deephaven.parquet.base.materializers.LocalTimeFromMillisMaterializer;
+import io.deephaven.parquet.base.materializers.LocalTimeFromMicrosMaterializer;
+import io.deephaven.parquet.base.materializers.LocalTimeFromNanosMaterializer;
 import org.jetbrains.annotations.NotNull;
 
 import java.time.LocalTime;
 
 public class ToLocalTimePage<ATTR extends Any> implements ToPage<ATTR, LocalTime[]> {
 
-    private static final ToLocalTimePage INSTANCE = new ToLocalTimePage<>();
+    public static <ATTR extends Any> ToPage<ATTR, LocalTime[]> createFromMillis(final Class<?> nativeType) {
+        verifyNativeType(nativeType);
+        // noinspection unchecked
+        return FROM_MILLIS;
+    }
+
+    public static <ATTR extends Any> ToPage<ATTR, LocalTime[]> createFromMicros(final Class<?> nativeType) {
+        verifyNativeType(nativeType);
+        // noinspection unchecked
+        return FROM_MICROS;
+    }
+
+    public static <ATTR extends Any> ToPage<ATTR, LocalTime[]> createFromNanos(final Class<?> nativeType) {
+        verifyNativeType(nativeType);
+        // noinspection unchecked
+        return FROM_NANOS;
+    }
+
+    @SuppressWarnings("rawtypes")
+    private static final ToPage FROM_MILLIS = new ToLocalTimePage<>(LocalTimeFromMillisMaterializer.FACTORY);
+    @SuppressWarnings("rawtypes")
+    private static final ToPage FROM_MICROS = new ToLocalTimePage<>(LocalTimeFromMicrosMaterializer.FACTORY);
+    @SuppressWarnings("rawtypes")
+    private static final ToPage FROM_NANOS = new ToLocalTimePage<>(LocalTimeFromNanosMaterializer.FACTORY);
 
-    public static <ATTR extends Any> ToLocalTimePage<ATTR> create(final Class<?> nativeType) {
-        if (nativeType == null || LocalTime.class.equals(nativeType)) {
-            // noinspection unchecked
-            return INSTANCE;
+    private static void verifyNativeType(final Class<?> nativeType) {
+        if (nativeType != null && !LocalTime.class.equals(nativeType)) {
+            throw new IllegalArgumentException(
+                    "The native type for a LocalTime column is " + nativeType.getCanonicalName());
         }
-        throw new IllegalArgumentException(
-                "The native type for a LocalTime column is " + nativeType.getCanonicalName());
     }
 
-    private ToLocalTimePage() {}
+    private final PageMaterializerFactory pageMaterializerFactory;
+
+    private ToLocalTimePage(@NotNull final PageMaterializerFactory pageMaterializerFactory) {
+        this.pageMaterializerFactory = pageMaterializerFactory;
+    }
 
     @Override
     @NotNull
@@ -39,4 +68,10 @@ public final Class<LocalTime> getNativeType() {
     public final ChunkType getChunkType() {
         return ChunkType.Object;
     }
+
+    @Override
+    @NotNull
+    public final PageMaterializerFactory getPageMaterializerFactory() {
+        return pageMaterializerFactory;
+    }
 }
diff --git a/extensions/parquet/table/src/main/java/io/deephaven/parquet/table/pagestore/topage/ToLongPage.java b/extensions/parquet/table/src/main/java/io/deephaven/parquet/table/pagestore/topage/ToLongPage.java
index 51f77f9ed24..befd67571a1 100644
--- a/extensions/parquet/table/src/main/java/io/deephaven/parquet/table/pagestore/topage/ToLongPage.java
+++ b/extensions/parquet/table/src/main/java/io/deephaven/parquet/table/pagestore/topage/ToLongPage.java
@@ -1,32 +1,84 @@
 //
 // Copyright (c) 2016-2024 Deephaven Data Labs and Patent Pending
 //
-// ****** AUTO-GENERATED CLASS - DO NOT EDIT MANUALLY
-// ****** Edit ToIntPage and run "./gradlew replicateToPage" to regenerate
-//
-// @formatter:off
 package io.deephaven.parquet.table.pagestore.topage;
 
 import io.deephaven.chunk.ChunkType;
 import io.deephaven.chunk.attributes.Any;
+import io.deephaven.parquet.base.PageMaterializerFactory;
+import io.deephaven.parquet.base.materializers.LongFromBooleanMaterializer;
+import io.deephaven.parquet.base.materializers.LongFromIntMaterializer;
+import io.deephaven.parquet.base.materializers.LongFromUnsignedByteMaterializer;
+import io.deephaven.parquet.base.materializers.LongFromUnsignedIntMaterializer;
+import io.deephaven.parquet.base.materializers.LongFromUnsignedShortMaterializer;
+import io.deephaven.parquet.base.materializers.LongMaterializer;
 import org.jetbrains.annotations.NotNull;
 
 import static io.deephaven.util.QueryConstants.NULL_LONG_BOXED;
 
 public class ToLongPage<ATTR extends Any> implements ToPage<ATTR, long[]> {
 
-    private static final ToLongPage INSTANCE = new ToLongPage<>();
+    public static <ATTR extends Any> ToLongPage<ATTR> create(final Class<?> nativeType) {
+        verifyNativeType(nativeType);
+        // noinspection unchecked
+        return FROM_LONG;
+    }
+
+    public static <ATTR extends Any> ToLongPage<ATTR> createFromUnsignedInt(final Class<?> nativeType) {
+        verifyNativeType(nativeType);
+        // noinspection unchecked
+        return FROM_UNSIGNED_INT;
+    }
+
+    public static <ATTR extends Any> ToLongPage<ATTR> createFromInt(final Class<?> nativeType) {
+        verifyNativeType(nativeType);
+        // noinspection unchecked
+        return FROM_INT;
+    }
+
+    public static <ATTR extends Any> ToLongPage<ATTR> createFromUnsignedShort(final Class<?> nativeType) {
+        verifyNativeType(nativeType);
+        // noinspection unchecked
+        return FROM_UNSIGNED_SHORT;
+    }
+
+    public static <ATTR extends Any> ToLongPage<ATTR> createFromUnsignedByte(final Class<?> nativeType) {
+        verifyNativeType(nativeType);
+        // noinspection unchecked
+        return FROM_UNSIGNED_BYTE;
+    }
+
+    public static <ATTR extends Any> ToLongPage<ATTR> createFromBoolean(final Class<?> nativeType) {
+        verifyNativeType(nativeType);
+        // noinspection unchecked
+        return FROM_BOOLEAN;
+    }
+
+    @SuppressWarnings("rawtypes")
+    private static final ToLongPage FROM_LONG = new ToLongPage<>(LongMaterializer.FACTORY);
+    @SuppressWarnings("rawtypes")
+    private static final ToLongPage FROM_UNSIGNED_INT = new ToLongPage<>(LongFromUnsignedIntMaterializer.FACTORY);
+    @SuppressWarnings("rawtypes")
+    private static final ToLongPage FROM_INT = new ToLongPage<>(LongFromIntMaterializer.FACTORY);
+    @SuppressWarnings("rawtypes")
+    private static final ToLongPage FROM_UNSIGNED_SHORT = new ToLongPage<>(LongFromUnsignedShortMaterializer.FACTORY);
+    @SuppressWarnings("rawtypes")
+    private static final ToLongPage FROM_UNSIGNED_BYTE = new ToLongPage<>(LongFromUnsignedByteMaterializer.FACTORY);
+    @SuppressWarnings("rawtypes")
+    private static final ToLongPage FROM_BOOLEAN = new ToLongPage<>(LongFromBooleanMaterializer.FACTORY);
 
-    public static <ATTR extends Any> ToLongPage<ATTR> create(Class<?> nativeType) {
+    private static void verifyNativeType(final Class<?> nativeType) {
         if (nativeType == null || long.class.equals(nativeType)) {
-            // noinspection unchecked
-            return INSTANCE;
+            return;
         }
-
         throw new IllegalArgumentException("The native type for a Long column is " + nativeType.getCanonicalName());
     }
 
-    private ToLongPage() {}
+    private final PageMaterializerFactory pageMaterializerFactory;
+
+    private ToLongPage(@NotNull final PageMaterializerFactory pageMaterializerFactory) {
+        this.pageMaterializerFactory = pageMaterializerFactory;
+    }
 
     @Override
     @NotNull
@@ -45,4 +97,10 @@ public final ChunkType getChunkType() {
     public final Object nullValue() {
         return NULL_LONG_BOXED;
     }
+
+    @Override
+    @NotNull
+    public final PageMaterializerFactory getPageMaterializerFactory() {
+        return pageMaterializerFactory;
+    }
 }
diff --git a/extensions/parquet/table/src/main/java/io/deephaven/parquet/table/pagestore/topage/ToObjectPage.java b/extensions/parquet/table/src/main/java/io/deephaven/parquet/table/pagestore/topage/ToObjectPage.java
index e13c7b9fe7f..d03bc420641 100644
--- a/extensions/parquet/table/src/main/java/io/deephaven/parquet/table/pagestore/topage/ToObjectPage.java
+++ b/extensions/parquet/table/src/main/java/io/deephaven/parquet/table/pagestore/topage/ToObjectPage.java
@@ -5,35 +5,39 @@
 
 import io.deephaven.chunk.attributes.Any;
 import io.deephaven.chunk.ChunkType;
+import io.deephaven.parquet.base.PageMaterializerFactory;
+import io.deephaven.parquet.base.materializers.ObjectMaterializer;
 import io.deephaven.util.channel.SeekableChannelContext;
 import io.deephaven.util.codec.ObjectCodec;
 import org.apache.parquet.column.Dictionary;
-import org.apache.parquet.io.api.Binary;
 import org.jetbrains.annotations.NotNull;
 
-import java.lang.reflect.Array;
 import java.util.function.Function;
 
 public class ToObjectPage<T, ATTR extends Any> implements ToPage<ATTR, T[]> {
 
+    private final PageMaterializerFactory pageMaterializerFactory;
     private final Class<T> nativeType;
-    private final ObjectCodec<T> codec;
 
     public static <T, ATTR extends Any> ToPage<ATTR, T[]> create(
             final Class<T> nativeType,
             @NotNull final ObjectCodec<T> codec,
             final Function<SeekableChannelContext, Dictionary> dictionarySupplier) {
         if (!nativeType.isPrimitive()) {
-            return dictionarySupplier == null ? new ToObjectPage<>(nativeType, codec)
-                    : new ToPageWithDictionary<>(
-                            nativeType,
-                            new ChunkDictionary<>(
-                                    (dictionary, key) -> {
-                                        final byte[] bytes = dictionary.decodeToBinary(key).getBytes();
-                                        return codec.decode(bytes, 0, bytes.length);
-                                    },
-                                    dictionarySupplier),
-                            (final Object result) -> convertResult(nativeType, codec, result));
+            if (dictionarySupplier == null) {
+                return new ToObjectPage<>(nativeType, codec);
+            }
+            // Note that dictionary supplier is never null, even if it points to a NULL_DICTIONARY.
+            // So we always use the following dictionary version of ToPage but internally, we check if the dictionary is
+            // NULL and fall back to the default implementation.
+            // noinspection unchecked
+            return new ToPageWithDictionary<>(
+                    nativeType,
+                    new ChunkDictionary<>(
+                            (dictionary, key) -> codec.decode(dictionary.decodeToBinary(key).toByteBuffer()),
+                            dictionarySupplier),
+                    (final Object result) -> (T[]) result,
+                    new ObjectMaterializer.Factory<>(codec, nativeType));
         }
 
         throw new IllegalArgumentException("The native type for a Object column is " + nativeType.getCanonicalName());
@@ -41,7 +45,7 @@ public static <T, ATTR extends Any> ToPage<ATTR, T[]> create(
 
     private ToObjectPage(Class<T> nativeType, ObjectCodec<T> codec) {
         this.nativeType = nativeType;
-        this.codec = codec;
+        this.pageMaterializerFactory = new ObjectMaterializer.Factory<>(codec, nativeType);
     }
 
     @Override
@@ -58,23 +62,7 @@ public final ChunkType getChunkType() {
 
     @Override
     @NotNull
-    public final T[] convertResult(Object result) {
-        return convertResult(nativeType, codec, result);
-    }
-
-    private static <T2> T2[] convertResult(final Class<T2> nativeType, final ObjectCodec<T2> codec,
-            final Object result) {
-        Binary[] from = (Binary[]) result;
-        // noinspection unchecked
-        T2[] to = (T2[]) Array.newInstance(nativeType, from.length);
-
-        for (int ri = 0; ri < to.length; ++ri) {
-            if (from[ri] != null) {
-                byte[] bytes = from[ri].getBytes();
-                to[ri] = codec.decode(bytes, 0, bytes.length);
-            }
-        }
-
-        return to;
+    public final PageMaterializerFactory getPageMaterializerFactory() {
+        return pageMaterializerFactory;
     }
 }
diff --git a/extensions/parquet/table/src/main/java/io/deephaven/parquet/table/pagestore/topage/ToPage.java b/extensions/parquet/table/src/main/java/io/deephaven/parquet/table/pagestore/topage/ToPage.java
index c8bf4476115..0db2710f488 100644
--- a/extensions/parquet/table/src/main/java/io/deephaven/parquet/table/pagestore/topage/ToPage.java
+++ b/extensions/parquet/table/src/main/java/io/deephaven/parquet/table/pagestore/topage/ToPage.java
@@ -6,6 +6,7 @@
 import io.deephaven.chunk.attributes.Any;
 import io.deephaven.engine.page.ChunkPageFactory;
 import io.deephaven.engine.table.impl.chunkattributes.DictionaryKeys;
+import io.deephaven.parquet.base.PageMaterializerFactory;
 import io.deephaven.util.channel.SeekableChannelContext;
 import io.deephaven.vector.Vector;
 import io.deephaven.engine.page.ChunkPage;
@@ -105,13 +106,18 @@ default ToPage<DictionaryKeys, long[]> getDictionaryKeysToPage() {
     }
 
     /**
-     * @return an reverse lookup map of the dictionary.
+     * @return a reverse lookup map of the dictionary.
      * @apiNote null iff {@link #getDictionaryChunk()} is null.
      */
     default LongBitmapStringSet.ReversibleLookup getReversibleLookup() {
         return null;
     }
 
+    /**
+     * @return the factory to create the materializers for this column.
+     */
+    PageMaterializerFactory getPageMaterializerFactory();
+
     abstract class Wrap<ATTR extends Any, INNER_RESULT, OUTER_RESULT>
             implements ToPage<ATTR, OUTER_RESULT> {
 
@@ -150,5 +156,10 @@ public ToPage<DictionaryKeys, long[]> getDictionaryKeysToPage() {
         public LongBitmapStringSet.ReversibleLookup getReversibleLookup() {
             return toPage.getReversibleLookup();
         }
+
+        @Override
+        public PageMaterializerFactory getPageMaterializerFactory() {
+            return toPage.getPageMaterializerFactory();
+        }
     }
 }
diff --git a/extensions/parquet/table/src/main/java/io/deephaven/parquet/table/pagestore/topage/ToPageWithDictionary.java b/extensions/parquet/table/src/main/java/io/deephaven/parquet/table/pagestore/topage/ToPageWithDictionary.java
index 94cb1ccc415..8797282c29d 100644
--- a/extensions/parquet/table/src/main/java/io/deephaven/parquet/table/pagestore/topage/ToPageWithDictionary.java
+++ b/extensions/parquet/table/src/main/java/io/deephaven/parquet/table/pagestore/topage/ToPageWithDictionary.java
@@ -3,6 +3,7 @@
 //
 package io.deephaven.parquet.table.pagestore.topage;
 
+import io.deephaven.parquet.base.PageMaterializerFactory;
 import io.deephaven.util.channel.SeekableChannelContext;
 import io.deephaven.stringset.LongBitmapStringSet;
 import io.deephaven.chunk.attributes.Any;
@@ -28,14 +29,17 @@ public class ToPageWithDictionary<DATA_TYPE, ATTR extends Any>
     private final Class<DATA_TYPE> nativeType;
     private final ChunkDictionary<DATA_TYPE, ATTR> chunkDictionary;
     private final Function<Object, DATA_TYPE[]> convertResultFallbackFun;
+    private final PageMaterializerFactory pageMaterializerFactory;
 
     ToPageWithDictionary(
             @NotNull final Class<DATA_TYPE> nativeType,
             @NotNull final ChunkDictionary<DATA_TYPE, ATTR> chunkDictionary,
-            @NotNull final Function<Object, DATA_TYPE[]> convertResultFallbackFun) {
+            @NotNull final Function<Object, DATA_TYPE[]> convertResultFallbackFun,
+            @NotNull final PageMaterializerFactory pageMaterializerFactory) {
         this.nativeType = nativeType;
         this.chunkDictionary = chunkDictionary;
         this.convertResultFallbackFun = convertResultFallbackFun;
+        this.pageMaterializerFactory = pageMaterializerFactory;
     }
 
     @Override
@@ -50,6 +54,12 @@ public final ChunkType getChunkType() {
         return ChunkType.Object;
     }
 
+    @Override
+    @NotNull
+    public final PageMaterializerFactory getPageMaterializerFactory() {
+        return pageMaterializerFactory;
+    }
+
     @Override
     @NotNull
     public final Object getResult(@NotNull final ColumnPageReader columnPageReader,
@@ -115,6 +125,14 @@ public Object nullValue() {
                 return NULL_INT;
             }
 
+            @Override
+            @NotNull
+            public PageMaterializerFactory getPageMaterializerFactory() {
+                // This factory should not be used for materializing any pages.
+                // The factory used for reading dictionary keys is provided inside ColumnPageReader#readKeyValues
+                return PageMaterializerFactory.NULL_FACTORY;
+            }
+
             @Override
             public Object getResult(@NotNull final ColumnPageReader columnPageReader,
                     @NotNull final SeekableChannelContext channelContext)
diff --git a/extensions/parquet/table/src/main/java/io/deephaven/parquet/table/pagestore/topage/ToShortPage.java b/extensions/parquet/table/src/main/java/io/deephaven/parquet/table/pagestore/topage/ToShortPage.java
index 23368baa1b8..706617025b9 100644
--- a/extensions/parquet/table/src/main/java/io/deephaven/parquet/table/pagestore/topage/ToShortPage.java
+++ b/extensions/parquet/table/src/main/java/io/deephaven/parquet/table/pagestore/topage/ToShortPage.java
@@ -1,32 +1,57 @@
 //
 // Copyright (c) 2016-2024 Deephaven Data Labs and Patent Pending
 //
-// ****** AUTO-GENERATED CLASS - DO NOT EDIT MANUALLY
-// ****** Edit ToIntPage and run "./gradlew replicateToPage" to regenerate
-//
-// @formatter:off
 package io.deephaven.parquet.table.pagestore.topage;
 
 import io.deephaven.chunk.ChunkType;
 import io.deephaven.chunk.attributes.Any;
+import io.deephaven.parquet.base.PageMaterializerFactory;
+import io.deephaven.parquet.base.materializers.ShortFromBooleanMaterializer;
+import io.deephaven.parquet.base.materializers.ShortFromUnsignedByteMaterializer;
+import io.deephaven.parquet.base.materializers.ShortMaterializer;
 import org.jetbrains.annotations.NotNull;
 
 import static io.deephaven.util.QueryConstants.NULL_SHORT_BOXED;
 
 public class ToShortPage<ATTR extends Any> implements ToPage<ATTR, short[]> {
 
-    private static final ToShortPage INSTANCE = new ToShortPage<>();
+    public static <ATTR extends Any> ToShortPage<ATTR> create(final Class<?> nativeType) {
+        verifyNativeType(nativeType);
+        // noinspection unchecked
+        return FROM_SHORT;
+    }
+
+    public static <ATTR extends Any> ToShortPage<ATTR> createFromUnsignedByte(final Class<?> nativeType) {
+        verifyNativeType(nativeType);
+        // noinspection unchecked
+        return FROM_UNSIGNED_BYTE;
+    }
+
+    public static <ATTR extends Any> ToShortPage<ATTR> createFromBoolean(final Class<?> nativeType) {
+        verifyNativeType(nativeType);
+        // noinspection unchecked
+        return FROM_BOOLEAN;
+    }
+
+    @SuppressWarnings("rawtypes")
+    private static final ToShortPage FROM_SHORT = new ToShortPage<>(ShortMaterializer.FACTORY);
+    @SuppressWarnings("rawtypes")
+    private static final ToShortPage FROM_UNSIGNED_BYTE = new ToShortPage<>(ShortFromUnsignedByteMaterializer.FACTORY);
+    @SuppressWarnings("rawtypes")
+    private static final ToShortPage FROM_BOOLEAN = new ToShortPage<>(ShortFromBooleanMaterializer.FACTORY);
 
-    public static <ATTR extends Any> ToShortPage<ATTR> create(Class<?> nativeType) {
+    private static void verifyNativeType(final Class<?> nativeType) {
         if (nativeType == null || short.class.equals(nativeType)) {
-            // noinspection unchecked
-            return INSTANCE;
+            return;
         }
-
         throw new IllegalArgumentException("The native type for a Short column is " + nativeType.getCanonicalName());
     }
 
-    private ToShortPage() {}
+    private final PageMaterializerFactory pageMaterializerFactory;
+
+    private ToShortPage(@NotNull final PageMaterializerFactory pageMaterializerFactory) {
+        this.pageMaterializerFactory = pageMaterializerFactory;
+    }
 
     @Override
     @NotNull
@@ -45,4 +70,10 @@ public final ChunkType getChunkType() {
     public final Object nullValue() {
         return NULL_SHORT_BOXED;
     }
+
+    @Override
+    @NotNull
+    public final PageMaterializerFactory getPageMaterializerFactory() {
+        return pageMaterializerFactory;
+    }
 }
diff --git a/extensions/parquet/table/src/main/java/io/deephaven/parquet/table/pagestore/topage/ToStringPage.java b/extensions/parquet/table/src/main/java/io/deephaven/parquet/table/pagestore/topage/ToStringPage.java
index 83447e68e93..1884fc83832 100644
--- a/extensions/parquet/table/src/main/java/io/deephaven/parquet/table/pagestore/topage/ToStringPage.java
+++ b/extensions/parquet/table/src/main/java/io/deephaven/parquet/table/pagestore/topage/ToStringPage.java
@@ -5,6 +5,8 @@
 
 import io.deephaven.chunk.attributes.Any;
 import io.deephaven.chunk.ChunkType;
+import io.deephaven.parquet.base.PageMaterializerFactory;
+import io.deephaven.parquet.base.materializers.StringMaterializer;
 import io.deephaven.util.channel.SeekableChannelContext;
 import org.apache.parquet.column.Dictionary;
 import org.jetbrains.annotations.NotNull;
@@ -26,15 +28,14 @@ public static <ATTR extends Any> ToPage<ATTR, String[]> create(
                             new ChunkDictionary<>(
                                     (dictionary, key) -> dictionary.decodeToBinary(key).toStringUsingUTF8(),
                                     dictionarySupplier),
-                            INSTANCE::convertResult);
+                            INSTANCE::convertResult,
+                            INSTANCE.getPageMaterializerFactory());
         }
 
         throw new IllegalArgumentException(
                 "The native type for a String column is " + nativeType.getCanonicalName());
     }
 
-    private ToStringPage() {}
-
     @Override
     @NotNull
     public final Class<?> getNativeType() {
@@ -46,4 +47,10 @@ public final Class<?> getNativeType() {
     public final ChunkType getChunkType() {
         return ChunkType.Object;
     }
+
+    @Override
+    @NotNull
+    public final PageMaterializerFactory getPageMaterializerFactory() {
+        return StringMaterializer.FACTORY;
+    }
 }
diff --git a/extensions/parquet/table/src/main/java/io/deephaven/parquet/table/transfer/TransferObject.java b/extensions/parquet/table/src/main/java/io/deephaven/parquet/table/transfer/TransferObject.java
index e87eff5aa85..fac10941cf1 100644
--- a/extensions/parquet/table/src/main/java/io/deephaven/parquet/table/transfer/TransferObject.java
+++ b/extensions/parquet/table/src/main/java/io/deephaven/parquet/table/transfer/TransferObject.java
@@ -39,7 +39,7 @@ static <DATA_TYPE> TransferObject<?> create(
             @NotNull final Map<String, Map<ParquetCacheTags, Object>> computedCache,
             @NotNull final String columnName,
             @NotNull final ColumnSource<DATA_TYPE> columnSource) {
-        Class<DATA_TYPE> columnType = columnSource.getType();
+        final Class<DATA_TYPE> columnType = columnSource.getType();
         if (columnType == int.class) {
             return IntTransfer.create(columnSource, tableRowSet, instructions.getTargetPageSize());
         }
@@ -84,13 +84,11 @@ static <DATA_TYPE> TransferObject<?> create(
             return new CodecTransfer<>(columnSource, codec, tableRowSet, instructions.getTargetPageSize());
         }
         if (columnType == BigDecimal.class) {
-            // noinspection unchecked
-            final ColumnSource<BigDecimal> bigDecimalColumnSource = (ColumnSource<BigDecimal>) columnSource;
             final BigDecimalUtils.PrecisionAndScale precisionAndScale = TypeInfos.getPrecisionAndScale(
-                    computedCache, columnName, tableRowSet, () -> bigDecimalColumnSource);
+                    computedCache, columnName, tableRowSet, () -> columnSource);
             final ObjectCodec<BigDecimal> codec = new BigDecimalParquetBytesCodec(
                     precisionAndScale.precision, precisionAndScale.scale);
-            return new CodecTransfer<>(bigDecimalColumnSource, codec, tableRowSet, instructions.getTargetPageSize());
+            return new CodecTransfer<>(columnSource, codec, tableRowSet, instructions.getTargetPageSize());
         }
         if (columnType == BigInteger.class) {
             return new CodecTransfer<>(columnSource, new BigIntegerParquetBytesCodec(), tableRowSet,
@@ -136,6 +134,13 @@ static <DATA_TYPE> TransferObject<?> create(
             if (componentType == String.class) {
                 return new StringArrayTransfer(columnSource, tableRowSet, instructions.getTargetPageSize());
             }
+            if (componentType == BigDecimal.class) {
+                final BigDecimalUtils.PrecisionAndScale precisionAndScale = TypeInfos.getPrecisionAndScale(
+                        computedCache, columnName, tableRowSet, () -> columnSource);
+                final ObjectCodec<BigDecimal> codec = new BigDecimalParquetBytesCodec(
+                        precisionAndScale.precision, precisionAndScale.scale);
+                return new CodecArrayTransfer<>(columnSource, codec, tableRowSet, instructions.getTargetPageSize());
+            }
             if (componentType == BigInteger.class) {
                 return new CodecArrayTransfer<>(columnSource, new BigIntegerParquetBytesCodec(),
                         tableRowSet, instructions.getTargetPageSize());
@@ -152,7 +157,7 @@ static <DATA_TYPE> TransferObject<?> create(
             if (componentType == LocalDateTime.class) {
                 return new LocalDateTimeArrayTransfer(columnSource, tableRowSet, instructions.getTargetPageSize());
             }
-            // TODO(deephaven-core#4612): Handle arrays of BigDecimal and if explicit codec provided
+            // TODO(deephaven-core#4612): Handle if explicit codec provided
         }
         if (Vector.class.isAssignableFrom(columnType)) {
             if (componentType == int.class) {
@@ -182,6 +187,13 @@ static <DATA_TYPE> TransferObject<?> create(
             if (componentType == String.class) {
                 return new StringVectorTransfer(columnSource, tableRowSet, instructions.getTargetPageSize());
             }
+            if (componentType == BigDecimal.class) {
+                final BigDecimalUtils.PrecisionAndScale precisionAndScale = TypeInfos.getPrecisionAndScale(
+                        computedCache, columnName, tableRowSet, () -> columnSource);
+                final ObjectCodec<BigDecimal> codec = new BigDecimalParquetBytesCodec(
+                        precisionAndScale.precision, precisionAndScale.scale);
+                return new CodecVectorTransfer<>(columnSource, codec, tableRowSet, instructions.getTargetPageSize());
+            }
             if (componentType == BigInteger.class) {
                 return new CodecVectorTransfer<>(columnSource, new BigIntegerParquetBytesCodec(),
                         tableRowSet, instructions.getTargetPageSize());
@@ -198,7 +210,7 @@ static <DATA_TYPE> TransferObject<?> create(
             if (componentType == LocalDateTime.class) {
                 return new LocalDateTimeVectorTransfer(columnSource, tableRowSet, instructions.getTargetPageSize());
             }
-            // TODO(deephaven-core#4612): Handle vectors of BigDecimal and if explicit codec provided
+            // TODO(deephaven-core#4612): Handle if explicit codec provided
         }
 
         // Go with the default
diff --git a/extensions/parquet/table/src/test/java/io/deephaven/parquet/table/MappedSchemaTest.java b/extensions/parquet/table/src/test/java/io/deephaven/parquet/table/MappedSchemaTest.java
new file mode 100644
index 00000000000..a4e95f7656b
--- /dev/null
+++ b/extensions/parquet/table/src/test/java/io/deephaven/parquet/table/MappedSchemaTest.java
@@ -0,0 +1,58 @@
+//
+// Copyright (c) 2016-2024 Deephaven Data Labs and Patent Pending
+//
+package io.deephaven.parquet.table;
+
+import io.deephaven.engine.table.ColumnDefinition;
+import org.apache.parquet.schema.GroupType;
+import org.apache.parquet.schema.LogicalTypeAnnotation;
+import org.apache.parquet.schema.PrimitiveType;
+import org.apache.parquet.schema.PrimitiveType.PrimitiveTypeName;
+import org.apache.parquet.schema.Type;
+import org.apache.parquet.schema.Types;
+import org.junit.Test;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+public class MappedSchemaTest {
+
+    private static final String FOO = "Foo";
+
+    @Test
+    public void intType() {
+        PrimitiveType expected = Types.optional(PrimitiveTypeName.INT32)
+                .as(LogicalTypeAnnotation.intType(32))
+                .named(FOO);
+        assertThat(type(ColumnDefinition.ofInt(FOO))).isEqualTo(expected);
+    }
+
+    @Test
+    public void stringType() {
+        PrimitiveType expected = Types.optional(PrimitiveTypeName.BINARY)
+                .as(LogicalTypeAnnotation.stringType())
+                .named(FOO);
+        assertThat(type(ColumnDefinition.ofString(FOO))).isEqualTo(expected);
+    }
+
+    @Test
+    public void intListType() {
+        GroupType expected = Types.optionalList()
+                .optionalElement(PrimitiveTypeName.INT32)
+                .as(LogicalTypeAnnotation.intType(32))
+                .named(FOO);
+        assertThat(type(ColumnDefinition.fromGenericType(FOO, int[].class, int.class))).isEqualTo(expected);
+    }
+
+    @Test
+    public void stringListType() {
+        GroupType expected = Types.optionalList()
+                .optionalElement(PrimitiveTypeName.BINARY)
+                .as(LogicalTypeAnnotation.stringType())
+                .named(FOO);
+        assertThat(type(ColumnDefinition.fromGenericType(FOO, String[].class, String.class))).isEqualTo(expected);
+    }
+
+    private static Type type(ColumnDefinition<?> columnDefinition) {
+        return MappedSchema.createType(null, columnDefinition, null, null, ParquetInstructions.EMPTY);
+    }
+}
diff --git a/extensions/parquet/table/src/test/java/io/deephaven/parquet/table/ParquetDeephavenExamplesTest.java b/extensions/parquet/table/src/test/java/io/deephaven/parquet/table/ParquetDeephavenExamplesTest.java
new file mode 100644
index 00000000000..996745ac6e5
--- /dev/null
+++ b/extensions/parquet/table/src/test/java/io/deephaven/parquet/table/ParquetDeephavenExamplesTest.java
@@ -0,0 +1,77 @@
+//
+// Copyright (c) 2016-2024 Deephaven Data Labs and Patent Pending
+//
+package io.deephaven.parquet.table;
+
+import io.deephaven.engine.table.Table;
+import io.deephaven.engine.testutil.junit4.EngineCleanup;
+import org.junit.BeforeClass;
+import org.junit.Rule;
+import org.junit.Test;
+
+import java.nio.file.Path;
+
+import static io.deephaven.engine.testutil.TstUtils.assertTableEquals;
+import static org.junit.Assume.assumeTrue;
+
+/**
+ * Assumes that there is already a checkout of <a href="https://github.com/deephaven/examples">deephaven-examples</a>.
+ * This is currently meant to be run locally.
+ */
+public class ParquetDeephavenExamplesTest {
+
+    private static final Path CHECKOUT_ROOT = null; // Path.of("/path/to/deephaven-examples");
+
+    @Rule
+    public final EngineCleanup framework = new EngineCleanup();
+
+    @BeforeClass
+    public static void beforeClass() {
+        assumeTrue(CHECKOUT_ROOT != null);
+    }
+
+    @Test
+    public void pems() {
+        read("Pems/parquet/pems");
+    }
+
+    @Test
+    public void crypto() {
+        read("CryptoCurrencyHistory/Parquet/crypto.parquet");
+        read("CryptoCurrencyHistory/Parquet/crypto_sept7.parquet");
+        read("CryptoCurrencyHistory/Parquet/crypto_sept8.parquet");
+        read("CryptoCurrencyHistory/Parquet/CryptoTrades_20210922.parquet");
+        read("CryptoCurrencyHistory/Parquet/FakeCryptoTrades_20230209.parquet");
+    }
+
+    @Test
+    public void taxi() {
+        read("Taxi/parquet/taxi.parquet");
+    }
+
+    @Test
+    public void sensorData() {
+        read("SensorData/parquet/SensorData_gzip.parquet");
+    }
+
+    @Test
+    public void grades() {
+        assertTableEquals(
+                read("ParquetExamples/grades"),
+                read("ParquetExamples/grades_meta"));
+        assertTableEquals(
+                read("ParquetExamples/grades_flat").sort("Name", "Class"),
+                read("ParquetExamples/grades_flat_meta").sort("Name", "Class"));
+        assertTableEquals(
+                read("ParquetExamples/grades_kv").sort("Name", "Class"),
+                read("ParquetExamples/grades_kv_meta").sort("Name", "Class"));
+    }
+
+    private static Table read(String name) {
+        final String path = CHECKOUT_ROOT
+                .resolve(name)
+                .toUri()
+                .toString();
+        return ParquetTools.readTable(path).select();
+    }
+}
diff --git a/extensions/parquet/table/src/test/java/io/deephaven/parquet/table/ParquetInstructionsTest.java b/extensions/parquet/table/src/test/java/io/deephaven/parquet/table/ParquetInstructionsTest.java
new file mode 100644
index 00000000000..c1a6a4864b8
--- /dev/null
+++ b/extensions/parquet/table/src/test/java/io/deephaven/parquet/table/ParquetInstructionsTest.java
@@ -0,0 +1,122 @@
+//
+// Copyright (c) 2016-2024 Deephaven Data Labs and Patent Pending
+//
+package io.deephaven.parquet.table;
+
+import org.junit.Test;
+
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.assertj.core.api.Assertions.failBecauseExceptionWasNotThrown;
+
+public class ParquetInstructionsTest {
+
+    @Test
+    public void setFieldId() {
+        final ParquetInstructions instructions = ParquetInstructions.builder()
+                .setFieldId("Foo", 42)
+                .setFieldId("Bar", 99)
+                .setFieldId("Baz", 99)
+                .build();
+
+        assertThat(instructions.getFieldId("Foo")).hasValue(42);
+        assertThat(instructions.getFieldId("Bar")).hasValue(99);
+        assertThat(instructions.getFieldId("Baz")).hasValue(99);
+        assertThat(instructions.getFieldId("Zap")).isEmpty();
+    }
+
+    @Test
+    public void setFieldIdAlreadySet() {
+        // Setting the same fieldId on a given column name is "ok" if it's the same value, this is to be more consistent
+        // with how addColumnNameMapping works.
+        {
+            final ParquetInstructions instructions = ParquetInstructions.builder()
+                    .setFieldId("Foo", 42)
+                    .setFieldId("Foo", 42)
+                    .build();
+            assertThat(instructions.getFieldId("Foo")).hasValue(42);
+        }
+
+        try {
+            ParquetInstructions.builder()
+                    .setFieldId("Foo", 42)
+                    .setFieldId("Foo", 43)
+                    .build();
+            failBecauseExceptionWasNotThrown(IllegalArgumentException.class);
+        } catch (IllegalArgumentException e) {
+            assertThat(e).hasMessage("Inconsistent fieldId for columnName=Foo, already set fieldId=42");
+        }
+    }
+
+    @Test
+    public void setFieldBadName() {
+        try {
+            ParquetInstructions.builder()
+                    .setFieldId("Not a legal column name", 42)
+                    .build();
+            failBecauseExceptionWasNotThrown(IllegalArgumentException.class);
+        } catch (IllegalArgumentException e) {
+            assertThat(e).hasMessageContaining("Invalid column name");
+        }
+    }
+
+    @Test
+    public void addColumnNameMapping() {
+        final ParquetInstructions instructions = ParquetInstructions.builder()
+                .addColumnNameMapping("Foo", "Foo")
+                .addColumnNameMapping("PARQUET COLUMN 2!", "Bar")
+                .addColumnNameMapping("ParquetColumn3", "Baz")
+                .build();
+
+        assertThat(instructions.getColumnNameFromParquetColumnName("Foo")).isEqualTo("Foo");
+        assertThat(instructions.getColumnNameFromParquetColumnName("PARQUET COLUMN 2!")).isEqualTo("Bar");
+        assertThat(instructions.getColumnNameFromParquetColumnName("ParquetColumn3")).isEqualTo("Baz");
+        assertThat(instructions.getColumnNameFromParquetColumnName("Does Not Exist")).isNull();
+
+        assertThat(instructions.getParquetColumnNameFromColumnNameOrDefault("Foo")).isEqualTo("Foo");
+        assertThat(instructions.getParquetColumnNameFromColumnNameOrDefault("Bar")).isEqualTo("PARQUET COLUMN 2!");
+        assertThat(instructions.getParquetColumnNameFromColumnNameOrDefault("Baz")).isEqualTo("ParquetColumn3");
+        assertThat(instructions.getParquetColumnNameFromColumnNameOrDefault("Zap")).isEqualTo("Zap");
+    }
+
+    @Test
+    public void addColumnNameMappingMultipleParquetColumnsToSameDeephavenColumn() {
+        try {
+            ParquetInstructions.builder()
+                    .addColumnNameMapping("ParquetColumn1", "Foo")
+                    .addColumnNameMapping("ParquetColumn2", "Foo")
+                    .build();
+            failBecauseExceptionWasNotThrown(IllegalArgumentException.class);
+        } catch (IllegalArgumentException e) {
+            assertThat(e).hasMessage(
+                    "Cannot add a mapping from parquetColumnName=ParquetColumn2: columnName=Foo already mapped to parquetColumnName=ParquetColumn1");
+        }
+    }
+
+    @Test
+    public void addColumnNameMappingSameParquetColumnToMultipleDeephavenColumns() {
+        // Note: this is a limitation that doesn't need to exist. Technically, we could allow a single physical
+        // parquet column to manifest as multiple Deephaven columns.
+        try {
+            ParquetInstructions.builder()
+                    .addColumnNameMapping("ParquetColumn1", "Foo")
+                    .addColumnNameMapping("ParquetColumn1", "Bar")
+                    .build();
+            failBecauseExceptionWasNotThrown(IllegalArgumentException.class);
+        } catch (IllegalArgumentException e) {
+            assertThat(e).hasMessage(
+                    "Cannot add new mapping from parquetColumnName=ParquetColumn1 to columnName=Bar: already mapped to columnName=Foo");
+        }
+    }
+
+    @Test
+    public void addColumnNameMappingBadName() {
+        try {
+            ParquetInstructions.builder()
+                    .addColumnNameMapping("SomeParquetColumnName", "Not a legal column name")
+                    .build();
+            failBecauseExceptionWasNotThrown(IllegalArgumentException.class);
+        } catch (IllegalArgumentException e) {
+            assertThat(e).hasMessageContaining("Invalid column name");
+        }
+    }
+}
diff --git a/extensions/parquet/table/src/test/java/io/deephaven/parquet/table/ParquetTableReadWriteTest.java b/extensions/parquet/table/src/test/java/io/deephaven/parquet/table/ParquetTableReadWriteTest.java
index 67bcc373e4c..e7faf5be88c 100644
--- a/extensions/parquet/table/src/test/java/io/deephaven/parquet/table/ParquetTableReadWriteTest.java
+++ b/extensions/parquet/table/src/test/java/io/deephaven/parquet/table/ParquetTableReadWriteTest.java
@@ -15,6 +15,13 @@
 import io.deephaven.engine.primitive.function.FloatConsumer;
 import io.deephaven.engine.primitive.function.ShortConsumer;
 import io.deephaven.engine.primitive.iterator.CloseableIterator;
+import io.deephaven.engine.primitive.iterator.CloseablePrimitiveIteratorOfByte;
+import io.deephaven.engine.primitive.iterator.CloseablePrimitiveIteratorOfChar;
+import io.deephaven.engine.primitive.iterator.CloseablePrimitiveIteratorOfDouble;
+import io.deephaven.engine.primitive.iterator.CloseablePrimitiveIteratorOfFloat;
+import io.deephaven.engine.primitive.iterator.CloseablePrimitiveIteratorOfInt;
+import io.deephaven.engine.primitive.iterator.CloseablePrimitiveIteratorOfLong;
+import io.deephaven.engine.primitive.iterator.CloseablePrimitiveIteratorOfShort;
 import io.deephaven.engine.table.ColumnDefinition;
 import io.deephaven.engine.table.ColumnSource;
 import io.deephaven.engine.table.PartitionedTable;
@@ -38,6 +45,7 @@
 import io.deephaven.engine.util.TableTools;
 import io.deephaven.engine.util.file.TrackedFileHandleFactory;
 import io.deephaven.parquet.base.BigDecimalParquetBytesCodec;
+import io.deephaven.parquet.base.BigIntegerParquetBytesCodec;
 import io.deephaven.parquet.base.InvalidParquetFileException;
 import io.deephaven.parquet.base.NullStatistics;
 import io.deephaven.parquet.table.location.ParquetTableLocation;
@@ -79,6 +87,8 @@
 import java.math.BigDecimal;
 import java.math.BigInteger;
 import java.net.URI;
+import java.nio.file.Files;
+import java.nio.file.StandardCopyOption;
 import java.time.Instant;
 import java.time.LocalDate;
 import java.time.LocalTime;
@@ -112,6 +122,7 @@
 import static io.deephaven.engine.util.TableTools.newTable;
 import static io.deephaven.engine.util.TableTools.shortCol;
 import static io.deephaven.engine.util.TableTools.stringCol;
+import static io.deephaven.parquet.table.ParquetTableWriter.INDEX_ROW_SET_COLUMN_NAME;
 import static io.deephaven.parquet.table.ParquetTools.readTable;
 import static io.deephaven.parquet.table.ParquetTools.writeKeyValuePartitionedTable;
 import static io.deephaven.parquet.table.ParquetTools.writeTable;
@@ -164,7 +175,7 @@ private static Table getTableFlat(int size, boolean includeSerializable, boolean
                         "someCharColumn = (char)i",
                         "someTime = DateTimeUtils.now() + i",
                         "someKey = `` + (int)(i /100)",
-                        "someBiColumn = java.math.BigInteger.valueOf(ii)",
+                        "someBiColumn = i % 10 == 0 ? null : java.math.BigInteger.valueOf(ii)",
                         "someDateColumn = i % 10 == 0 ? null : java.time.LocalDate.ofEpochDay(i)",
                         "someTimeColumn = i % 10 == 0 ? null : java.time.LocalTime.of(i%24, i%60, (i+10)%60)",
                         "someDateTimeColumn = i % 10 == 0 ? null : java.time.LocalDateTime.of(2000+i%10, i%12+1, i%30+1, (i+4)%24, (i+5)%60, (i+6)%60, i)",
@@ -183,10 +194,10 @@ private static Table getTableFlat(int size, boolean includeSerializable, boolean
                         "nullDateColumn = (java.time.LocalDate)null",
                         "nullTimeColumn = (java.time.LocalTime)null"));
         if (includeBigDecimal) {
-            columns.add("bdColumn = java.math.BigDecimal.valueOf(ii).stripTrailingZeros()");
+            columns.add("bdColumn = i % 10 == 0 ? null : java.math.BigDecimal.valueOf(ii).stripTrailingZeros()");
         }
         if (includeSerializable) {
-            columns.add("someSerializable = new SomeSillyTest(i)");
+            columns.add("someSerializable = i % 10 == 0 ? null : new SomeSillyTest(i)");
         }
         return TableTools.emptyTable(size).select(
                 Selectable.from(columns));
@@ -430,7 +441,7 @@ public void testSortingMetadata() {
                 StandaloneTableKey.getInstance(),
                 new ParquetTableLocationKey(
                         convertToURI(new File(rootFile,
-                                ParquetTools.getRelativeIndexFilePath(dest, "someString")), false),
+                                ParquetTools.getRelativeIndexFilePath(dest.getName(), "someString")), false),
                         0, Map.of(), EMPTY),
                 EMPTY);
         assertEquals(index1Location.getSortedColumns(), List.of(SortColumn.asc(ColumnName.of("someString"))));
@@ -441,7 +452,7 @@ public void testSortingMetadata() {
                 StandaloneTableKey.getInstance(),
                 new ParquetTableLocationKey(
                         convertToURI(new File(rootFile,
-                                ParquetTools.getRelativeIndexFilePath(dest, "someInt", "someString")), false),
+                                ParquetTools.getRelativeIndexFilePath(dest.getName(), "someInt", "someString")), false),
                         0, Map.of(), EMPTY),
                 EMPTY);
         assertEquals(index2Location.getSortedColumns(), List.of(
@@ -451,7 +462,7 @@ public void testSortingMetadata() {
         assertTableEquals(index2Table, index2Table.sort("someInt", "someString"));
     }
 
-    private static void verifyIndexingInfoExists(final Table table, final String... columnNames) {
+    static void verifyIndexingInfoExists(final Table table, final String... columnNames) {
         assertTrue(DataIndexer.hasDataIndex(table, columnNames));
         final DataIndex fullIndex = DataIndexer.getDataIndex(table, columnNames);
         Assert.neqNull(fullIndex, "fullIndex");
@@ -514,7 +525,7 @@ public void testParquetLz4CompressionCodec() {
     }
 
     @Test
-    public void test_lz4_compressed() {
+    public void testLz4RawCompressed() {
         // Write and read a LZ4 compressed file
         File dest = new File(rootFile + File.separator + "Table.parquet");
         final Table table = getTableFlat(100, false, false);
@@ -524,7 +535,8 @@ public void test_lz4_compressed() {
 
         // The following file is tagged as LZ4 compressed based on its metadata, but is actually compressed with
         // LZ4_RAW. We should be able to read it anyway with no exceptions.
-        String path = TestParquetTools.class.getResource("/sample_lz4_compressed.parquet").getFile();
+        final String path =
+                ParquetTableReadWriteTest.class.getResource("/sample_lz4_compressed.parquet").getFile();
         readTable(path, EMPTY.withLayout(ParquetInstructions.ParquetFileLayout.SINGLE_FILE)).select();
         final File randomDest = new File(rootFile, "random.parquet");
         writeTable(fromDisk, randomDest.getPath(), ParquetTools.LZ4_RAW);
@@ -590,6 +602,19 @@ private static void writeReadTableTest(final Table table, final File dest,
         checkSingleTable(table, dest);
     }
 
+    @Test
+    public void basicParquetWrongDestinationTest() {
+        final Table table = TableTools.emptyTable(5).update("A=(int)i");
+        final File dest = new File(rootFile, "basicParquetWrongDestinationTest.parquet");
+        writeTable(table, dest.getPath());
+        final File wrongDest = new File(rootFile, "basicParquetWrongDestinationTest");
+        try {
+            writeTable(table, wrongDest.getPath());
+            fail("Expected an exception because destination does not end with .parquet");
+        } catch (final IllegalArgumentException expected) {
+        }
+    }
+
     @Test
     public void basicParquetWithMetadataTest() {
         final Table table = TableTools.emptyTable(5).update("A=(int)i", "B=(long)i", "C=(double)i");
@@ -620,10 +645,319 @@ public void basicParquetWithMetadataTest() {
         assertTableEquals(table, fromDiskWithMetadata);
         fromDiskWithCommonMetadata = readTable(commonMetadataFile.getPath(), readInstructions);
         assertTableEquals(table, fromDiskWithCommonMetadata);
+    }
+
+    @Test
+    public void testOverrideBooleanColumnType() {
+        final Table table = TableTools.emptyTable(5).update("A = i % 3 == 0 ? true : i % 3 == 1 ? false : null");
+        final File dest = new File(rootFile, "testOverrideBooleanColumnType.parquet");
+        ParquetTools.writeTable(table, dest.getPath());
+        assertTableEquals(table, ParquetTools.readTable(dest.getPath()));
+
+        final Table arrayTable =
+                TableTools.emptyTable(5).update("A = new Boolean[] {i % 3 == 0 ? true : i % 3 == 1 ? false : null}");
+        final File arrayTableDest = new File(rootFile, "testOverrideBooleanArrayType.parquet");
+        ParquetTools.writeTable(arrayTable, arrayTableDest.getPath());
+        assertTableEquals(arrayTable, ParquetTools.readTable(arrayTableDest.getPath()));
+        // Boolean -> byte
+        {
+            final ParquetInstructions readInstructions = ParquetInstructions.builder()
+                    .setTableDefinition(TableDefinition.of(ColumnDefinition.ofByte("A")))
+                    .build();
+            final Table byteTable =
+                    TableTools.emptyTable(5).update("A = i % 3 == 0 ? (byte)1 : i % 3 == 1 ? (byte)0 : null");
+            assertTableEquals(byteTable, ParquetTools.readTable(dest.getPath(), readInstructions));
+
+            final Table byteArrayTable =
+                    TableTools.emptyTable(5)
+                            .update("A = new byte[] {i % 3 == 0 ? (byte)1 : i % 3 == 1 ? (byte)0 : (byte)null}");
+            assertTableEquals(byteArrayTable, ParquetTools.readTable(arrayTableDest.getPath(),
+                    readInstructions.withTableDefinition(byteArrayTable.getDefinition())).select());
+        }
+
+        // Boolean -> short
+        {
+            final ParquetInstructions readInstructions = ParquetInstructions.builder()
+                    .setTableDefinition(TableDefinition.of(ColumnDefinition.ofShort("A")))
+                    .build();
+            final Table shortTable =
+                    TableTools.emptyTable(5).update("A = i % 3 == 0 ? (short)1 : i % 3 == 1 ? (short)0 : null");
+            assertTableEquals(shortTable, ParquetTools.readTable(dest.getPath(), readInstructions));
+
+            final Table shortArrayTable =
+                    TableTools.emptyTable(5)
+                            .update("A = new short[] {i % 3 == 0 ? (short)1 : i % 3 == (short)1 ? 0 : (short)null}");
+            assertTableEquals(shortArrayTable, ParquetTools.readTable(arrayTableDest.getPath(),
+                    readInstructions.withTableDefinition(shortArrayTable.getDefinition())).select());
+        }
+
+        // Boolean -> int
+        {
+            final ParquetInstructions readInstructions = ParquetInstructions.builder()
+                    .setTableDefinition(TableDefinition.of(ColumnDefinition.ofInt("A")))
+                    .build();
+            final Table intTable = TableTools.emptyTable(5).update("A = i % 3 == 0 ? 1 : i % 3 == 1 ? 0 : null");
+            assertTableEquals(intTable, ParquetTools.readTable(dest.getPath(), readInstructions));
+
+            final Table intArrayTable =
+                    TableTools.emptyTable(5).update("A = new int[] {i % 3 == 0 ? 1 : i % 3 == 1 ? 0 : null}");
+            assertTableEquals(intArrayTable, ParquetTools.readTable(arrayTableDest.getPath(),
+                    readInstructions.withTableDefinition(intArrayTable.getDefinition())).select());
+        }
+        // Boolean -> long
+        {
+            final ParquetInstructions readInstructions = ParquetInstructions.builder()
+                    .setTableDefinition(TableDefinition.of(ColumnDefinition.ofLong("A")))
+                    .build();
+            final Table longTable = TableTools.emptyTable(5).update("A = i % 3 == 0 ? 1L : i % 3 == 1 ? 0L : null");
+            assertTableEquals(longTable, ParquetTools.readTable(dest.getPath(), readInstructions));
+
+            final Table longArrayTable =
+                    TableTools.emptyTable(5).update("A = new long[] {i % 3 == 0 ? 1L : i % 3 == 1 ? 0L : null}");
+            assertTableEquals(longArrayTable, ParquetTools.readTable(arrayTableDest.getPath(),
+                    readInstructions.withTableDefinition(longArrayTable.getDefinition())).select());
+        }
+    }
+
+    @Test
+    public void testOverrideByteColumnType() {
+        final Table table = TableTools.emptyTable(5).update("A=(byte)(i-2)");
+        final File dest = new File(rootFile, "testOverrideByteColumnType.parquet");
+        ParquetTools.writeTable(table, dest.getPath());
+        assertTableEquals(table, ParquetTools.readTable(dest.getPath()));
+
+        final Table arrayTable = TableTools.emptyTable(5).update("A = new byte[] {i == 0 ? null : (byte)(i-2)}");
+        final File arrayTableDest = new File(rootFile, "testOverrideByteArrayColumnType.parquet");
+        ParquetTools.writeTable(arrayTable, arrayTableDest.getPath());
+        assertTableEquals(arrayTable, ParquetTools.readTable(arrayTableDest.getPath()));
+
+        // byte -> short
+        {
+            final ParquetInstructions readInstructions = ParquetInstructions.builder()
+                    .setTableDefinition(TableDefinition.of(ColumnDefinition.ofShort("A")))
+                    .build();
+            assertTableEquals(table.updateView("A=(short)A"),
+                    ParquetTools.readTable(dest.getPath(), readInstructions));
+
+            final Table shortArrayTable =
+                    TableTools.emptyTable(5).update("A = new short[] {i == 0 ? null : (short)(i-2)}");
+            assertTableEquals(shortArrayTable, ParquetTools.readTable(arrayTableDest.getPath(),
+                    readInstructions.withTableDefinition(shortArrayTable.getDefinition())).select());
+        }
+        // byte -> int
+        {
+            final ParquetInstructions readInstructions = ParquetInstructions.builder()
+                    .setTableDefinition(TableDefinition.of(ColumnDefinition.ofInt("A")))
+                    .build();
+            assertTableEquals(table.updateView("A=(int)A"),
+                    ParquetTools.readTable(dest.getPath(), readInstructions));
+
+            final Table intArrayTable = TableTools.emptyTable(5).update("A = new int[] {i == 0 ? null : (int)(i-2)}");
+            assertTableEquals(intArrayTable, ParquetTools.readTable(arrayTableDest.getPath(),
+                    readInstructions.withTableDefinition(intArrayTable.getDefinition())).select());
+        }
+        // byte -> long
+        {
+            final ParquetInstructions readInstructions = ParquetInstructions.builder()
+                    .setTableDefinition(TableDefinition.of(ColumnDefinition.ofLong("A")))
+                    .build();
+            assertTableEquals(table.updateView("A=(long)A"),
+                    ParquetTools.readTable(dest.getPath(), readInstructions));
+
+            final Table longArrayTable =
+                    TableTools.emptyTable(5).update("A = new long[] {i == 0 ? null : (long)(i-2)}");
+            assertTableEquals(longArrayTable, ParquetTools.readTable(arrayTableDest.getPath(),
+                    readInstructions.withTableDefinition(longArrayTable.getDefinition())).select());
+        }
+        // byte -> char
+        {
+            final ParquetInstructions readInstructions = ParquetInstructions.builder()
+                    .setTableDefinition(TableDefinition.of(ColumnDefinition.ofChar("A")))
+                    .build();
+            try {
+                ParquetTools.readTable(dest.getPath(), readInstructions).select();
+                fail("Expected an exception because cannot convert byte to char");
+            } catch (final RuntimeException ignored) {
+            }
+        }
+    }
+
+    @Test
+    public void testOverrideShortColumnType() {
+        final Table table = TableTools.emptyTable(5).update("A=(short)(i-2)");
+        final File dest = new File(rootFile, "testOverrideShortColumnType.parquet");
+        ParquetTools.writeTable(table, dest.getPath());
+        assertTableEquals(table, ParquetTools.readTable(dest.getPath()));
+
+        final Table arrayTable = TableTools.emptyTable(5).update("A = new short[] {i == 0 ? null : (short)(i-2)}");
+        final File arrayTableDest = new File(rootFile, "testOverrideShortArrayColumnType.parquet");
+        ParquetTools.writeTable(arrayTable, arrayTableDest.getPath());
+        assertTableEquals(arrayTable, ParquetTools.readTable(arrayTableDest.getPath()));
+
+        // short -> int
+        {
+            final ParquetInstructions readInstructions = ParquetInstructions.builder()
+                    .setTableDefinition(TableDefinition.of(ColumnDefinition.ofInt("A")))
+                    .build();
+            assertTableEquals(table.updateView("A=(int)A"),
+                    ParquetTools.readTable(dest.getPath(), readInstructions));
+
+            final Table intArrayTable = TableTools.emptyTable(5).update("A = new int[] {i == 0 ? null : (int)(i-2)}");
+            assertTableEquals(intArrayTable, ParquetTools.readTable(arrayTableDest.getPath(),
+                    readInstructions.withTableDefinition(intArrayTable.getDefinition())).select());
+        }
+        // short -> long
+        {
+            final ParquetInstructions readInstructions = ParquetInstructions.builder()
+                    .setTableDefinition(TableDefinition.of(ColumnDefinition.ofLong("A")))
+                    .build();
+            assertTableEquals(table.updateView("A=(long)A"),
+                    ParquetTools.readTable(dest.getPath(), readInstructions));
+
+            final Table longArrayTable =
+                    TableTools.emptyTable(5).update("A = new long[] {i == 0 ? null : (long)(i-2)}");
+            assertTableEquals(longArrayTable, ParquetTools.readTable(arrayTableDest.getPath(),
+                    readInstructions.withTableDefinition(longArrayTable.getDefinition())).select());
+        }
+        // short -> byte
+        {
+            final ParquetInstructions readInstructions = ParquetInstructions.builder()
+                    .setTableDefinition(TableDefinition.of(ColumnDefinition.ofByte("A")))
+                    .build();
+            try {
+                ParquetTools.readTable(dest.getPath(), readInstructions).select();
+                fail("Expected an exception because cannot convert short to byte");
+            } catch (final RuntimeException ignored) {
+            }
+        }
+    }
+
+    @Test
+    public void testOverrideCharColumnType() {
+        final Table table = TableTools.emptyTable(5).update("A=(char)i");
+        final File dest = new File(rootFile, "testOverrideCharColumnType.parquet");
+        ParquetTools.writeTable(table, dest.getPath());
+        assertTableEquals(table, ParquetTools.readTable(dest.getPath()));
+
+        final Table arrayTable = TableTools.emptyTable(5).update("A = new char[] {i == 0 ? null : (char)i}");
+        final File arrayTableDest = new File(rootFile, "testOverrideCharArrayColumnType.parquet");
+        ParquetTools.writeTable(arrayTable, arrayTableDest.getPath());
+        assertTableEquals(arrayTable, ParquetTools.readTable(arrayTableDest.getPath()));
+
+        // char -> int
+        {
+            final ParquetInstructions readInstructions = ParquetInstructions.builder()
+                    .setTableDefinition(TableDefinition.of(ColumnDefinition.ofInt("A")))
+                    .build();
+            assertTableEquals(table.updateView("A=(int)A"),
+                    ParquetTools.readTable(dest.getPath(), readInstructions));
+
+            final Table intArrayTable = TableTools.emptyTable(5).update("A = new int[] {i == 0 ? null : (int)i}");
+            assertTableEquals(intArrayTable, ParquetTools.readTable(arrayTableDest.getPath(),
+                    readInstructions.withTableDefinition(intArrayTable.getDefinition())).select());
+        }
+        // char -> long
+        {
+            final ParquetInstructions readInstructions = ParquetInstructions.builder()
+                    .setTableDefinition(TableDefinition.of(ColumnDefinition.ofLong("A")))
+                    .build();
+            assertTableEquals(table.updateView("A=(long)A"),
+                    ParquetTools.readTable(dest.getPath(), readInstructions));
+
+            final Table longArrayTable = TableTools.emptyTable(5).update("A = new long[] {i == 0 ? null : (long)i}");
+            assertTableEquals(longArrayTable, ParquetTools.readTable(arrayTableDest.getPath(),
+                    readInstructions.withTableDefinition(longArrayTable.getDefinition())).select());
+        }
+        // char -> short
+        {
+            final ParquetInstructions readInstructions = ParquetInstructions.builder()
+                    .setTableDefinition(TableDefinition.of(ColumnDefinition.ofShort("A")))
+                    .build();
+            try {
+                ParquetTools.readTable(dest.getPath(), readInstructions).select();
+                fail("Expected an exception because cannot convert char to short");
+            } catch (final RuntimeException ignored) {
+            }
+        }
+    }
+
+    @Test
+    public void testOverrideIntColumnType() {
+        final Table table = TableTools.emptyTable(5).update("A=(int)(i-2)");
+        final File dest = new File(rootFile, "testOverrideIntColumnType.parquet");
+        ParquetTools.writeTable(table, dest.getPath());
+        assertTableEquals(table, ParquetTools.readTable(dest.getPath()));
+
+        final Table arrayTable = TableTools.emptyTable(5).update("A = new int[] {i == 0 ? null : (int)(i-2)}");
+        final File arrayTableDest = new File(rootFile, "testOverrideIntArrayColumnType.parquet");
+        ParquetTools.writeTable(arrayTable, arrayTableDest.getPath());
+        assertTableEquals(arrayTable, ParquetTools.readTable(arrayTableDest.getPath()));
+
+        // int -> long
+        {
+            final ParquetInstructions readInstructions = ParquetInstructions.builder()
+                    .setTableDefinition(TableDefinition.of(ColumnDefinition.ofLong("A")))
+                    .build();
+            assertTableEquals(table.updateView("A=(long)A"),
+                    ParquetTools.readTable(dest.getPath(), readInstructions));
+            final Table longArrayTable =
+                    TableTools.emptyTable(5).update("A = new long[] {i == 0 ? null : (long)(i-2)}");
+            assertTableEquals(longArrayTable, ParquetTools.readTable(arrayTableDest.getPath(),
+                    readInstructions.withTableDefinition(longArrayTable.getDefinition())).select());
+        }
+
+        // int -> short
+        {
+            final ParquetInstructions readInstructions = ParquetInstructions.builder()
+                    .setTableDefinition(TableDefinition.of(ColumnDefinition.ofShort("A")))
+                    .build();
+            try {
+                ParquetTools.readTable(dest.getPath(), readInstructions).select();
+                fail("Expected an exception because cannot convert int to short");
+            } catch (final RuntimeException ignored) {
+            }
+        }
+    }
 
+    @Test
+    public void testOverrideFloatColumnType() {
+        final Table table = TableTools.emptyTable(5).update("A=(float)(i-2)");
+        final File dest = new File(rootFile, "testOverrideFloatColumnType.parquet");
+        ParquetTools.writeTable(table, dest.getPath());
+        assertTableEquals(table, ParquetTools.readTable(dest.getPath()));
+
+        final Table arrayTable = TableTools.emptyTable(5).update("A = new float[] {i == 0 ? null : (float)(i-2)}");
+        final File arrayTableDest = new File(rootFile, "testOverrideFloatArrayColumnType.parquet");
+        ParquetTools.writeTable(arrayTable, arrayTableDest.getPath());
+        assertTableEquals(arrayTable, ParquetTools.readTable(arrayTableDest.getPath()));
+
+        // float -> double
+        {
+            final ParquetInstructions readInstructions = ParquetInstructions.builder()
+                    .setTableDefinition(TableDefinition.of(ColumnDefinition.ofDouble("A")))
+                    .build();
+            assertTableEquals(table.updateView("A=(double)A"),
+                    ParquetTools.readTable(dest.getPath(), readInstructions));
+            final Table doubleArrayTable =
+                    TableTools.emptyTable(5).update("A = new double[] {i == 0 ? null : (double)(i-2)}");
+            assertTableEquals(doubleArrayTable, ParquetTools.readTable(arrayTableDest.getPath(),
+                    readInstructions.withTableDefinition(doubleArrayTable.getDefinition())).select());
+        }
 
+        // float -> short
+        {
+            final ParquetInstructions readInstructions = ParquetInstructions.builder()
+                    .setTableDefinition(TableDefinition.of(ColumnDefinition.ofShort("A")))
+                    .build();
+            try {
+                ParquetTools.readTable(dest.getPath(), readInstructions).select();
+                fail("Expected an exception because cannot convert float to short");
+            } catch (final RuntimeException ignored) {
+            }
+        }
     }
 
+
     @Test
     public void parquetIndexingBuilderTest() {
         final Table source = TableTools.emptyTable(1_000_000).updateView(
@@ -1114,6 +1448,12 @@ public void writeKeyValuePartitionedDataWithMixedPartitionsTest() {
 
     @Test
     public void someMoreKeyValuePartitionedTestsWithComplexKeys() {
+        // Verify complex keys both with and without data index
+        someMoreKeyValuePartitionedTestsWithComplexKeysHelper(true);
+        someMoreKeyValuePartitionedTestsWithComplexKeysHelper(false);
+    }
+
+    private void someMoreKeyValuePartitionedTestsWithComplexKeysHelper(final boolean addDataIndex) {
         final TableDefinition definition = TableDefinition.of(
                 ColumnDefinition.ofString("symbol").withPartitioning(),
                 ColumnDefinition.ofString("epic_collection_id"),
@@ -1126,26 +1466,56 @@ public void someMoreKeyValuePartitionedTestsWithComplexKeys() {
                         "I = ii"))
                 .withDefinitionUnsafe(definition);
 
-        final File parentDir = new File(rootFile, "someTest");
-        final ParquetInstructions writeInstructions = ParquetInstructions.builder()
-                .setGenerateMetadataFiles(true)
-                .build();
+        final File parentDir = new File(rootFile, "someMoreKeyValuePartitionedTestsWithComplexKeys");
+        if (parentDir.exists()) {
+            FileUtils.deleteRecursively(parentDir);
+        }
+        final ParquetInstructions writeInstructions;
+        if (addDataIndex) {
+            writeInstructions = ParquetInstructions.builder()
+                    .setGenerateMetadataFiles(true)
+                    .addIndexColumns("I", "epic_request_id")
+                    .build();
+        } else {
+            writeInstructions = ParquetInstructions.builder()
+                    .setGenerateMetadataFiles(true)
+                    .build();
+        }
         final String[] partitioningCols = new String[] {"symbol", "epic_collection_id", "epic_request_id"};
         final PartitionedTable partitionedTable = inputData.partitionBy(partitioningCols);
         writeKeyValuePartitionedTable(partitionedTable, parentDir.getPath(), writeInstructions);
 
         final Table fromDisk =
                 readTable(parentDir.getPath(), EMPTY.withLayout(ParquetInstructions.ParquetFileLayout.KV_PARTITIONED));
+        if (addDataIndex) {
+            // Verify if index present on columns "I, epic_request_id"
+            verifyIndexingInfoExists(fromDisk, "I", "epic_request_id");
+        }
+
         for (final String col : partitioningCols) {
             assertTrue(fromDisk.getDefinition().getColumn(col).isPartitioning());
         }
         assertTableEquals(inputData.sort("symbol", "epic_collection_id"),
                 fromDisk.sort("symbol", "epic_collection_id"));
 
-        final File commonMetadata = new File(parentDir, "_common_metadata");
-        final Table fromDiskWithMetadata = readTable(commonMetadata.getPath());
+        final Table fromDiskMetadataPartitioned =
+                readTable(parentDir.getPath(),
+                        EMPTY.withLayout(ParquetInstructions.ParquetFileLayout.METADATA_PARTITIONED));
+        for (final String col : partitioningCols) {
+            assertTrue(fromDiskMetadataPartitioned.getDefinition().getColumn(col).isPartitioning());
+        }
+        assertTableEquals(inputData.sort("symbol", "epic_collection_id"),
+                fromDiskMetadataPartitioned.sort("symbol", "epic_collection_id"));
+
+        final File metadata = new File(parentDir, "_metadata");
+        final Table fromDiskWithMetadata = readTable(metadata.getPath());
         assertTableEquals(inputData.sort("symbol", "epic_collection_id"),
                 fromDiskWithMetadata.sort("symbol", "epic_collection_id"));
+
+        final File commonMetadata = new File(parentDir, "_common_metadata");
+        final Table fromDiskWithCommonMetadata = readTable(commonMetadata.getPath());
+        assertTableEquals(inputData.sort("symbol", "epic_collection_id"),
+                fromDiskWithCommonMetadata.sort("symbol", "epic_collection_id"));
     }
 
     @Test
@@ -1191,13 +1561,15 @@ public void testAllPartitioningColumnTypes() {
                 .build();
         writeKeyValuePartitionedTable(inputData, parentDir.getPath(), writeInstructions);
 
-        // Verify that we can read the partition values, but types like LocalDate or LocalTime will be read as strings
-        // Therefore, we cannot compare the tables directly
-        readTable(parentDir.getPath(), EMPTY.withLayout(ParquetInstructions.ParquetFileLayout.KV_PARTITIONED)).select();
+        // Verify that we can read the partition values, but types like LocalDate or LocalTime will be read as strings,
+        // and byte, short will be read as integers. Therefore, we cannot compare the tables directly
+        final Table fromDiskPartitioned = readTable(parentDir.getPath(),
+                EMPTY.withLayout(ParquetInstructions.ParquetFileLayout.KV_PARTITIONED));
+        assertNotEquals(fromDiskPartitioned.getDefinition(), inputData.getDefinition());
 
-        // Reading with metadata file should deduce the correct type, so we can compare the tables
-        final File commonMetadata = new File(parentDir, "_common_metadata");
-        final Table fromDiskWithMetadata = readTable(commonMetadata.getPath());
+        // Reading the directory directly should correctly detect the metadata files and deduce the correct types
+        final Table fromDiskWithMetadata = readTable(parentDir.getPath());
+        assertEquals(fromDiskWithMetadata.getDefinition(), inputData.getDefinition());
         final String[] partitioningColumns = definition.getPartitioningColumns().stream()
                 .map(ColumnDefinition::getName).toArray(String[]::new);
         assertTableEquals(inputData.sort(partitioningColumns), fromDiskWithMetadata.sort(partitioningColumns));
@@ -1366,11 +1738,129 @@ public void testAllNonPartitioningColumnTypes() {
         }
     }
 
+    @Test
+    public void testReadingParquetDataWithEmptyRowGroups() {
+        {
+            // Single parquet file with empty row group
+            final String path =
+                    ParquetTableReadWriteTest.class.getResource("/ReferenceParquetWithEmptyRowGroup1.parquet")
+                            .getFile();
+            final Table fromDisk =
+                    readTable(path, EMPTY.withLayout(ParquetInstructions.ParquetFileLayout.SINGLE_FILE)).select();
+            assertEquals(0, fromDisk.size());
+            assertTrue(fromDisk.getRowSet().isEmpty());
+        }
+
+        {
+            // Single parquet file with three row groups, first and third row group are non-empty, and second row group
+            // is empty. To generate this file, the following branch was used:
+            // https://github.com/malhotrashivam/deephaven-core/tree/sm-ref-branch
+            final String path =
+                    ParquetTableReadWriteTest.class.getResource("/ReferenceParquetWithEmptyRowGroup2.parquet")
+                            .getFile();
+            final Table fromDisk =
+                    readTable(path, EMPTY.withLayout(ParquetInstructions.ParquetFileLayout.SINGLE_FILE)).select();
+            assertEquals(20, fromDisk.size());
+            final Table table = TableTools.emptyTable(10).update("integers = (int)(ii%3)");
+            final Table expected = merge(table, table);
+            assertTableEquals(expected, fromDisk);
+        }
+
+        {
+            // Parquet dataset with three files, first and third file have three row groups, two non-empty followed by
+            // an empty row group, and second file has just one empty row group.
+            final String dirPath = ParquetTableReadWriteTest.class.getResource("/datasetWithEmptyRowgroups").getFile();
+            assertFalse(readTable(dirPath + "/file1.parquet").isEmpty());
+            assertTrue(readTable(dirPath + "/file2.parquet").isEmpty());
+            assertFalse(readTable(dirPath + "/file3.parquet").isEmpty());
+
+            final Table table = readTable(dirPath).select();
+            assertEquals(2138182, table.size());
+            assertEquals(4, table.numColumns());
+            assertEquals(1068950, table.selectDistinct("price").size());
+        }
+    }
+
+    @Test
+    public void testReadingReferenceParquetDataWithCodec() {
+        {
+            final BigDecimalParquetBytesCodec bdCodec = new BigDecimalParquetBytesCodec(20, 1);
+            final BigIntegerParquetBytesCodec biCodec = new BigIntegerParquetBytesCodec();
+            ExecutionContext.getContext().getQueryScope().putParam("__bdCodec", bdCodec);
+            ExecutionContext.getContext().getQueryScope().putParam("__biCodec", biCodec);
+            final Table source = TableTools.emptyTable(10_000).update(
+                    "LocalDateColumn = ii % 10 == 0 ? null :  java.time.LocalDate.ofEpochDay(ii)",
+                    "CompactLocalDateColumn = ii % 10 == 0 ? null :  java.time.LocalDate.ofEpochDay(ii)",
+                    "LocalTimeColumn = ii % 10 == 0 ? null :  java.time.LocalTime.ofSecondOfDay(ii % 86400)",
+                    "ZonedDateTimeColumn = ii % 10 == 0 ? null :  java.time.ZonedDateTime.ofInstant(java.time.Instant.ofEpochSecond(ii), java.time.ZoneId.of(\"UTC\"))",
+                    "StringColumn = ii % 10 == 0 ? null : java.lang.String.valueOf(ii)",
+                    "BigDecimalColumn = ii % 10 == 0 ? null : ii % 2 == 0 ? java.math.BigDecimal.valueOf(ii).stripTrailingZeros() : java.math.BigDecimal.valueOf(-1 * ii).stripTrailingZeros()",
+                    "BigDecimalColumnEncoded = ii % 10 == 0 ? null : __bdCodec.encode(BigDecimalColumn)",
+                    "BigDecimalColumnDecoded = ii % 10 == 0 ? null : __bdCodec.decode(BigDecimalColumnEncoded, 0, BigDecimalColumnEncoded.length)",
+                    "BigIntegerColumn = ii % 10 == 0 ? null : ii % 2 == 0 ? java.math.BigInteger.valueOf(ii*512) : java.math.BigInteger.valueOf(-1*ii*512)",
+                    "BigIntegerColumnEncoded = ii % 10 == 0 ? null : __biCodec.encode(BigIntegerColumn)",
+                    "BigIntegerColumnDecoded = ii % 10 == 0 ? null : __biCodec.decode(BigIntegerColumnEncoded, 0, BigIntegerColumnEncoded.length)");
+
+            // Set codecs for each column
+            final ParquetInstructions instructions = ParquetInstructions.builder()
+                    .addColumnCodec("LocalDateColumn", "io.deephaven.util.codec.LocalDateCodec")
+                    .addColumnCodec("CompactLocalDateColumn", "io.deephaven.util.codec.LocalDateCodec", "Compact")
+                    .addColumnCodec("LocalTimeColumn", "io.deephaven.util.codec.LocalTimeCodec")
+                    .addColumnCodec("ZonedDateTimeColumn", "io.deephaven.util.codec.ZonedDateTimeCodec")
+                    .addColumnCodec("StringColumn", "io.deephaven.util.codec.UTF8StringAsByteArrayCodec")
+                    .addColumnCodec("BigDecimalColumn", "io.deephaven.util.codec.BigDecimalCodec", "20,1,allowrounding")
+                    .addColumnCodec("BigIntegerColumn", "io.deephaven.util.codec.BigIntegerCodec")
+                    .build();
+
+            {
+                // Verify that we can write and read the table with codecs
+                final File dest = new File(rootFile, "ReferenceParquetWithCodecData.parquet");
+                ParquetTools.writeTable(source, dest.getPath(), instructions);
+                checkSingleTable(source, dest);
+                dest.delete();
+            }
+            {
+                // Verify that we can read the reference parquet file with these codecs
+                final String path =
+                        ParquetTableReadWriteTest.class.getResource("/ReferenceParquetWithCodecData.parquet").getFile();
+                final Table fromDisk = readParquetFileFromGitLFS(new File(path));
+                assertTableEquals(source, fromDisk);
+            }
+        }
+
+        {
+            // Repeat similar tests for RowSetCodec
+            final Table source = TableTools.emptyTable(10_000).updateView(
+                    "A = (int)(ii%3)",
+                    "B = (double)(ii%2)",
+                    "C = ii");
+            final DataIndex dataIndex = DataIndexer.getOrCreateDataIndex(source, "A", "B");
+            final File destFile = new File(rootFile, "ReferenceParquetWithRowsetCodecData.parquet");
+            final Table indexTable = dataIndex.table();
+            final ParquetInstructions instructions = ParquetInstructions.builder()
+                    .addColumnCodec(INDEX_ROW_SET_COLUMN_NAME, "io.deephaven.engine.table.impl.dataindex.RowSetCodec")
+                    .build();
+            {
+                writeTable(indexTable, destFile.getPath(), instructions);
+                final Table fromDisk = readTable(destFile.getPath());
+                assertTableEquals(indexTable, fromDisk);
+                destFile.delete();
+            }
+            {
+                final String path =
+                        ParquetTableReadWriteTest.class.getResource("/ReferenceParquetWithRowsetCodecData.parquet")
+                                .getFile();
+                final Table fromDiskWithCodec = readParquetFileFromGitLFS(new File(path));
+                assertTableEquals(indexTable, fromDiskWithCodec);
+            }
+        }
+    }
+
     @Test
     public void decimalLogicalTypeTest() {
         final Table expected = TableTools.emptyTable(100_000).update(
-                "DecimalIntCol = java.math.BigDecimal.valueOf(ii*12, 5)",
-                "DecimalLongCol = java.math.BigDecimal.valueOf(ii*212, 8)");
+                "DecimalIntCol = ii % 10 == 0 ? null : java.math.BigDecimal.valueOf(ii*12, 5)",
+                "DecimalLongCol = ii % 10 == 0 ? null : java.math.BigDecimal.valueOf(ii*212, 8)");
 
         {
             // This reference file has Decimal logical type columns stored as INT32 and INT64 physical types
@@ -1413,6 +1903,202 @@ public void decimalLogicalTypeTest() {
         }
     }
 
+    @Test
+    public void metadataPartitionedDataWithCustomTableDefinition() throws IOException {
+        final Table inputData = TableTools.emptyTable(100).update(
+                "PC1 = (ii%2 == 0) ? `Apple` : `Ball`",
+                "PC2 = (ii%3 == 0) ? `Pen` : `Pencil`",
+                "numbers = ii",
+                "characters = (char) (65 + (ii % 23))");
+        final TableDefinition tableDefinition = TableDefinition.of(
+                ColumnDefinition.ofString("PC1").withPartitioning(),
+                ColumnDefinition.ofString("PC2").withPartitioning(),
+                ColumnDefinition.ofLong("numbers"),
+                ColumnDefinition.ofChar("characters"));
+        final File parentDir = new File(rootFile, "metadataPartitionedDataWithCustomTableDefinition");
+        final ParquetInstructions writeInstructions = ParquetInstructions.builder()
+                .setGenerateMetadataFiles(true)
+                .setTableDefinition(tableDefinition)
+                .build();
+        writeKeyValuePartitionedTable(inputData, parentDir.getAbsolutePath(), writeInstructions);
+        final Table fromDisk = readTable(parentDir.getPath(),
+                EMPTY.withLayout(ParquetInstructions.ParquetFileLayout.METADATA_PARTITIONED));
+        assertEquals(fromDisk.getDefinition(), tableDefinition);
+        assertTableEquals(inputData.sort("PC1", "PC2"), fromDisk.sort("PC1", "PC2"));
+
+        // Now set a different table definitions and read the data
+        {
+            // Remove a column
+            final TableDefinition newTableDefinition = TableDefinition.of(
+                    ColumnDefinition.ofString("PC1").withPartitioning(),
+                    ColumnDefinition.ofString("PC2").withPartitioning(),
+                    ColumnDefinition.ofLong("numbers"));
+            final ParquetInstructions readInstructions = ParquetInstructions.builder()
+                    .setTableDefinition(newTableDefinition)
+                    .setFileLayout(ParquetInstructions.ParquetFileLayout.METADATA_PARTITIONED)
+                    .build();
+            final Table fromDiskWithNewDefinition = readTable(parentDir.getPath(), readInstructions);
+            assertEquals(newTableDefinition, fromDiskWithNewDefinition.getDefinition());
+            assertTableEquals(inputData.select("PC1", "PC2", "numbers").sort("PC1", "PC2"),
+                    fromDiskWithNewDefinition.sort("PC1", "PC2"));
+        }
+
+        {
+            // Remove another column
+            final TableDefinition newTableDefinition = TableDefinition.of(
+                    ColumnDefinition.ofString("PC1").withPartitioning(),
+                    ColumnDefinition.ofString("PC2").withPartitioning(),
+                    ColumnDefinition.ofChar("characters"));
+            final ParquetInstructions readInstructions = ParquetInstructions.builder()
+                    .setTableDefinition(newTableDefinition)
+                    .setFileLayout(ParquetInstructions.ParquetFileLayout.METADATA_PARTITIONED)
+                    .build();
+            final Table fromDiskWithNewDefinition = readTable(parentDir.getPath(), readInstructions);
+            assertEquals(newTableDefinition, fromDiskWithNewDefinition.getDefinition());
+            assertTableEquals(inputData.select("PC1", "PC2", "characters").sort("PC1", "PC2"),
+                    fromDiskWithNewDefinition.sort("PC1", "PC2"));
+        }
+
+        {
+            // Remove a partitioning column
+            final TableDefinition newTableDefinition = TableDefinition.of(
+                    ColumnDefinition.ofString("PC1").withPartitioning(),
+                    ColumnDefinition.ofChar("characters"),
+                    ColumnDefinition.ofLong("numbers"));
+            final ParquetInstructions readInstructions = ParquetInstructions.builder()
+                    .setTableDefinition(newTableDefinition)
+                    .setFileLayout(ParquetInstructions.ParquetFileLayout.METADATA_PARTITIONED)
+                    .build();
+            try {
+                readTable(parentDir.getPath(), readInstructions);
+                fail("Exception expected because of missing partitioning column in table definition");
+            } catch (final RuntimeException expected) {
+            }
+        }
+
+        {
+            // Add an extra column
+            final TableDefinition newTableDefinition = TableDefinition.of(
+                    ColumnDefinition.ofString("PC1").withPartitioning(),
+                    ColumnDefinition.ofString("PC2").withPartitioning(),
+                    ColumnDefinition.ofLong("numbers"),
+                    ColumnDefinition.ofChar("characters"),
+                    ColumnDefinition.ofInt("extraColumn"));
+            final ParquetInstructions readInstructions = ParquetInstructions.builder()
+                    .setTableDefinition(newTableDefinition)
+                    .setFileLayout(ParquetInstructions.ParquetFileLayout.METADATA_PARTITIONED)
+                    .build();
+            final Table fromDiskWithNewDefinition = readTable(parentDir.getPath(), readInstructions);
+            assertEquals(newTableDefinition, fromDiskWithNewDefinition.getDefinition());
+            assertTableEquals(inputData.update("extraColumn = (int) null").sort("PC1", "PC2"),
+                    fromDiskWithNewDefinition.sort("PC1", "PC2"));
+        }
+
+        {
+            // Reorder partitioning and non-partitioning columns
+            final TableDefinition newTableDefinition = TableDefinition.of(
+                    ColumnDefinition.ofString("PC2").withPartitioning(),
+                    ColumnDefinition.ofString("PC1").withPartitioning(),
+                    ColumnDefinition.ofChar("characters"),
+                    ColumnDefinition.ofLong("numbers"));
+            final ParquetInstructions readInstructions = ParquetInstructions.builder()
+                    .setTableDefinition(newTableDefinition)
+                    .setFileLayout(ParquetInstructions.ParquetFileLayout.METADATA_PARTITIONED)
+                    .build();
+            final Table fromDiskWithNewDefinition = readTable(parentDir.getPath(), readInstructions);
+            assertEquals(newTableDefinition, fromDiskWithNewDefinition.getDefinition());
+            assertTableEquals(inputData.select("PC2", "PC1", "characters", "numbers").sort("PC2", "PC1"),
+                    fromDiskWithNewDefinition.sort("PC2", "PC1"));
+        }
+
+        {
+            // Rename partitioning and non partitioning columns
+            final TableDefinition newTableDefinition = TableDefinition.of(
+                    ColumnDefinition.ofString("PartCol1").withPartitioning(),
+                    ColumnDefinition.ofString("PartCol2").withPartitioning(),
+                    ColumnDefinition.ofLong("nums"),
+                    ColumnDefinition.ofChar("chars"));
+            final ParquetInstructions readInstructions = ParquetInstructions.builder()
+                    .setTableDefinition(newTableDefinition)
+                    .setFileLayout(ParquetInstructions.ParquetFileLayout.METADATA_PARTITIONED)
+                    .addColumnNameMapping("PC1", "PartCol1")
+                    .addColumnNameMapping("PC2", "PartCol2")
+                    .addColumnNameMapping("numbers", "nums")
+                    .addColumnNameMapping("characters", "chars")
+                    .build();
+            final Table fromDiskWithNewDefinition = readTable(parentDir.getPath(), readInstructions);
+            assertEquals(newTableDefinition, fromDiskWithNewDefinition.getDefinition());
+            assertTableEquals(
+                    inputData.sort("PC1", "PC2"),
+                    fromDiskWithNewDefinition
+                            .renameColumns("PC1 = PartCol1", "PC2 = PartCol2", "numbers = nums", "characters = chars")
+                            .sort("PC1", "PC2"));
+        }
+    }
+
+    @Test
+    public void metadataPartitionedDataWithCustomTableDefinition2() throws IOException {
+        final Table inputData = TableTools.emptyTable(100)
+                .update("PC1 = (ii%2 == 0) ? `Apple` : `Ball`",
+                        "PC2 = (ii%3 == 0) ? `Pen` : `Pencil`",
+                        "numbers = ii",
+                        "characters = (char) (65 + (ii % 23))");
+        final TableDefinition tableDefinition = TableDefinition.of(
+                ColumnDefinition.ofString("PC1").withPartitioning(),
+                ColumnDefinition.ofString("PC2").withPartitioning(),
+                ColumnDefinition.ofLong("numbers"),
+                ColumnDefinition.ofChar("characters"));
+        final File parentDir = new File(rootFile, "metadataPartitionedDataWithCustomTableDefinition");
+        final ParquetInstructions writeInstructions = ParquetInstructions.builder()
+                .setGenerateMetadataFiles(true)
+                .setTableDefinition(tableDefinition)
+                .build();
+        writeKeyValuePartitionedTable(inputData, parentDir.getAbsolutePath(), writeInstructions);
+
+        // Replace files in directory with empty files and read the data
+        final File dir = new File(parentDir, "PC1=Apple" + File.separator + "PC2=Pen");
+        final String[] dataFileList = dir.list();
+        assertNotNull(dataFileList);
+        for (final String dataFile : dataFileList) {
+            final File file = new File(dir, dataFile);
+            assertTrue(file.delete());
+            assertTrue(file.createNewFile());
+        }
+
+        {
+            // Read as metadata partitioned
+            final ParquetInstructions readInstructions = ParquetInstructions.builder()
+                    .setFileLayout(ParquetInstructions.ParquetFileLayout.METADATA_PARTITIONED)
+                    .build();
+            final Table fromDiskAfterDelete = readTable(parentDir.getPath(), readInstructions);
+
+            // Make sure the definition is correct, and we can read the size as well as data for the remaining
+            // partitions
+            assertEquals(tableDefinition, fromDiskAfterDelete.getDefinition());
+            assertEquals(inputData.size(), fromDiskAfterDelete.size());
+            assertTableEquals(
+                    inputData.where("PC1 == `Ball` && PC2 == `Pencil`").sort("PC1", "PC2"),
+                    fromDiskAfterDelete.where("PC1 == `Ball` && PC2 == `Pencil`").sort("PC1", "PC2"));
+        }
+
+        {
+            // Read as key-value partitioned
+            final ParquetInstructions readInstructions = ParquetInstructions.builder()
+                    .setFileLayout(ParquetInstructions.ParquetFileLayout.KV_PARTITIONED)
+                    .build();
+            final Table fromDiskAfterDelete = readTable(parentDir.getPath(), readInstructions);
+
+            // The definition should be the same as the original table definition, but it won't be able to compute the
+            // size
+            assertEquals(tableDefinition, fromDiskAfterDelete.getDefinition());
+            try {
+                fromDiskAfterDelete.size();
+                fail("Exception expected because one of the partitions is not a valid parquet file");
+            } catch (final RuntimeException expected) {
+            }
+        }
+    }
+
     @Test
     public void testVectorColumns() {
         final Table table = getTableFlat(20000, true, false);
@@ -1477,6 +2163,7 @@ public void testArrayColumns() {
                         "someByteArrayColumn = new byte[] {i % 10 == 0 ? null : (byte)i}",
                         "someCharArrayColumn = new char[] {i % 10 == 0 ? null : (char)i}",
                         "someTimeArrayColumn = new Instant[] {i % 10 == 0 ? null : (Instant)DateTimeUtils.now() + i}",
+                        "someBigDecimalArrayColumn = new java.math.BigDecimal[] {i % 10 == 0 ? null : java.math.BigDecimal.valueOf(ii).stripTrailingZeros()}",
                         "someBiArrayColumn = new java.math.BigInteger[] {i % 10 == 0 ? null : java.math.BigInteger.valueOf(i)}",
                         "someDateArrayColumn = new java.time.LocalDate[] {i % 10 == 0 ? null : java.time.LocalDate.ofEpochDay(i)}",
                         "someTimeArrayColumn = new java.time.LocalTime[] {i % 10 == 0 ? null : java.time.LocalTime.of(i%24, i%60, (i+10)%60)}",
@@ -1565,6 +2252,127 @@ public void stringDictionaryTest() {
         }
     }
 
+    /**
+     * Test if we can read/sort a parquet file with a null string column encoded as a dictionary.
+     */
+    @Test
+    public void nullStringDictEncodingTest() {
+        final int NUM_ROWS = 2048;
+        {
+            // The following file has a null string column encoded as a dictionary. We should be able to read/sort
+            // it without any exceptions.
+            final String path =
+                    ParquetTableReadWriteTest.class.getResource("/ReferenceNullStringDictEncoded1.parquet").getFile();
+            final Table expected = TableTools.emptyTable(NUM_ROWS).update("someLong = i",
+                    "someString = (String)null");
+            nullStringDictEncodingTestHelper(path, expected);
+        }
+
+        {
+            // The following file has a string column with all values null except for the last one encoded as a
+            // dictionary. We should be able to read/sort it without any exceptions.
+            final String path =
+                    ParquetTableReadWriteTest.class.getResource("/ReferenceNullStringDictEncoded2.parquet").getFile();
+            final Table expected = TableTools.emptyTable(NUM_ROWS).update("someLong = i",
+                    "someString = i == 2047 ? `Hello` : (String)null");
+            nullStringDictEncodingTestHelper(path, expected);
+        }
+    }
+
+    private static void nullStringDictEncodingTestHelper(final String path, final Table expected) {
+        // Verify that the column uses dictionary encoding.
+        final ParquetMetadata metadata =
+                new ParquetTableLocationKey(new File(path).toURI(), 0, null, ParquetInstructions.EMPTY)
+                        .getMetadata();
+        final String strColumnMetadata = metadata.getBlocks().get(0).getColumns().get(1).toString();
+        assertTrue(strColumnMetadata.contains("someString") && strColumnMetadata.contains("RLE_DICTIONARY"));
+
+        // Sort and compare
+        assertTableEquals(expected, readTable(path).sort("someString"));
+        assertTableEquals(expected.sortDescending("someString"),
+                readTable(path).sortDescending("someString"));
+    }
+
+    /**
+     * Extension of {@link #nullStringDictEncodingTest()} test, for testing if we can read/sort a table with regions
+     * having null string columns encoded as a dictionary.
+     */
+    @Test
+    public void nullRegionDictionaryEncodingTest() throws IOException {
+        // The following file has a null string column encoded as a dictionary.
+        final File allNullsFile = new File(
+                ParquetTableReadWriteTest.class.getResource("/ReferenceNullStringDictEncoded1.parquet").getFile());
+        final Table allNullsTable = readTable(allNullsFile.toString()).select();
+        final File allButOneNullFile = new File(
+                ParquetTableReadWriteTest.class.getResource("/ReferenceNullStringDictEncoded2.parquet").getFile());
+        final Table allButOneNullTable = readTable(allButOneNullFile.toString()).select();
+        final File testDir = new File(rootFile, "nullRegionDictionaryEncodingTest");
+        final File firstRegion = new File(testDir, "Region1.parquet");
+        final File secondRegion = new File(testDir, "Region2.parquet");
+        final File thirdRegion = new File(testDir, "Region3.parquet");
+        final File fourthRegion = new File(testDir, "Region4.parquet");
+
+        // The first test is for a table where all three regions have null values for the string column.
+        nullRegionDictionaryEncodingTestHelper(
+                allNullsFile, allNullsFile, allNullsFile,
+                allNullsTable, allNullsTable, allNullsTable,
+                firstRegion, secondRegion, thirdRegion);
+
+        // The next test is for a table where the first-region has non-null values and the second and third have null
+        // values for the string column.
+        nullRegionDictionaryEncodingTestHelper(
+                allButOneNullFile, allNullsFile, allNullsFile,
+                allButOneNullTable, allNullsTable, allNullsTable,
+                firstRegion, secondRegion, thirdRegion);
+
+        // The next test is for a table where the second-region has non-null values, and the first and third have null
+        // values for the string column.
+        nullRegionDictionaryEncodingTestHelper(
+                allNullsFile, allButOneNullFile, allNullsFile,
+                allNullsTable, allButOneNullTable, allNullsTable,
+                firstRegion, secondRegion, thirdRegion);
+
+        // The next test is for a table where the third-region has non-null values, and the first two have null values
+        // for the string column.
+        nullRegionDictionaryEncodingTestHelper(
+                allNullsFile, allNullsFile, allButOneNullFile,
+                allNullsTable, allNullsTable, allButOneNullTable,
+                firstRegion, secondRegion, thirdRegion);
+
+        {
+            // The next test is for a table where the first and region have null values and the second and fourth two
+            // have null values for the string column.
+            testDir.mkdir();
+            Files.copy(allNullsFile.toPath(), firstRegion.toPath(), StandardCopyOption.REPLACE_EXISTING);
+            Files.copy(allButOneNullFile.toPath(), secondRegion.toPath(), StandardCopyOption.REPLACE_EXISTING);
+            Files.copy(allNullsFile.toPath(), thirdRegion.toPath(), StandardCopyOption.REPLACE_EXISTING);
+            Files.copy(allButOneNullFile.toPath(), fourthRegion.toPath(), StandardCopyOption.REPLACE_EXISTING);
+            final Table expected = merge(allNullsTable, allButOneNullTable, allNullsTable, allButOneNullTable);
+            assertTableEquals(expected.sort("someString"),
+                    readTable(testDir.toString()).sort("someString"));
+            assertTableEquals(expected.sortDescending("someString"),
+                    readTable(testDir.toString()).sortDescending("someString"));
+            FileUtils.deleteRecursively(testDir);
+        }
+    }
+
+    private static void nullRegionDictionaryEncodingTestHelper(
+            final File firstSource, final File secondSource, final File thirdSource,
+            final Table firstTable, final Table secondTable, final Table thirdTable,
+            final File firstRegion, final File secondRegion, final File thirdRegion) throws IOException {
+        final File testDir = new File(rootFile, "nullRegionDictionaryEncodingTest");
+        testDir.mkdir();
+        Files.copy(firstSource.toPath(), firstRegion.toPath(), StandardCopyOption.REPLACE_EXISTING);
+        Files.copy(secondSource.toPath(), secondRegion.toPath(), StandardCopyOption.REPLACE_EXISTING);
+        Files.copy(thirdSource.toPath(), thirdRegion.toPath(), StandardCopyOption.REPLACE_EXISTING);
+        final Table expected = merge(firstTable, secondTable, thirdTable);
+        assertTableEquals(expected.sort("someString"),
+                readTable(testDir.toString()).sort("someString"));
+        assertTableEquals(expected.sortDescending("someString"),
+                readTable(testDir.toString()).sortDescending("someString"));
+        FileUtils.deleteRecursively(testDir);
+    }
+
     /**
      * Encoding bigDecimal is tricky -- the writer will try to pick the precision and scale automatically. Because of
      * that tableTools.assertTableEquals will fail because, even though the numbers are identical, the representation
@@ -1815,6 +2623,40 @@ public void testReadingParquetFilesWithDifferentPageSizes() {
         assertTableEquals(expected, fromDisk);
     }
 
+    @Test
+    public void testOnWriteCallback() {
+        // Write a few tables to disk and check the sizes and number of rows in the files
+        final Table table1 = TableTools.emptyTable(100_000).update(
+                "someIntColumn = i * 200",
+                "someLongColumn = ii * 500");
+        final File dest1 = new File(rootFile, "table1.parquet");
+        final Table table2 = TableTools.emptyTable(2000).update(
+                "someIntColumn = i",
+                "someLongColumn = ii");
+        final File dest2 = new File(rootFile, "table2.parquet");
+
+        final List<CompletedParquetWrite> parquetFilesWritten = new ArrayList<>();
+        final ParquetInstructions.OnWriteCompleted onWriteCompleted = parquetFilesWritten::add;
+        final ParquetInstructions writeInstructions = new ParquetInstructions.Builder()
+                .setOnWriteCompleted(onWriteCompleted)
+                .build();
+        ParquetTools.writeTables(new Table[] {table1, table2},
+                new String[] {dest1.getPath(), dest2.getPath()}, writeInstructions);
+
+        assertEquals(2, parquetFilesWritten.size());
+        // Check the destination URIs
+        assertEquals(dest1.toURI(), parquetFilesWritten.get(0).destination());
+        assertEquals(dest2.toURI(), parquetFilesWritten.get(1).destination());
+
+        // Check the number of rows
+        assertEquals(100_000, parquetFilesWritten.get(0).numRows());
+        assertEquals(2000, parquetFilesWritten.get(1).numRows());
+
+        // Check the size of the files
+        assertEquals(dest1.length(), parquetFilesWritten.get(0).numBytes());
+        assertEquals(dest2.length(), parquetFilesWritten.get(1).numBytes());
+    }
+
     // Following is used for testing both writing APIs for parquet tables
     private interface TestParquetTableWriter {
         void writeTable(final Table table, final File destFile);
@@ -1887,16 +2729,6 @@ public void readFromDirTest() {
         assertTableEquals(expected, fromDisk);
     }
 
-    /**
-     * These are tests for writing a table to a parquet file and making sure there are no unnecessary files left in the
-     * directory after we finish writing.
-     */
-    @Test
-    public void basicWriteTests() {
-        basicWriteTestsImpl(SINGLE_WRITER);
-        basicWriteTestsImpl(MULTI_WRITER);
-    }
-
     @Test
     public void readPartitionedDataGeneratedOnWindows() {
         final String path = ParquetTableReadWriteTest.class
@@ -1909,6 +2741,16 @@ public void readPartitionedDataGeneratedOnWindows() {
         assertTableEquals(expected, partitionedDataFromWindows.sort("year"));
     }
 
+    /**
+     * These are tests for writing a table to a parquet file and making sure there are no unnecessary files left in the
+     * directory after we finish writing.
+     */
+    @Test
+    public void basicWriteTests() {
+        basicWriteTestsImpl(SINGLE_WRITER);
+        basicWriteTestsImpl(MULTI_WRITER);
+    }
+
     private static void basicWriteTestsImpl(TestParquetTableWriter writer) {
         // Create an empty parent directory
         final File parentDir = new File(rootFile, "tempDir");
@@ -1927,6 +2769,7 @@ private static void basicWriteTestsImpl(TestParquetTableWriter writer) {
         // This write should fail
         final Table badTable = TableTools.emptyTable(5)
                 .updateView("InputString = ii % 2 == 0 ? Long.toString(ii) : null", "A=InputString.charAt(0)");
+        DataIndexer.getOrCreateDataIndex(badTable, "InputString");
         try {
             writer.writeTable(badTable, destFile);
             TestCase.fail("Exception expected for invalid formula");
@@ -2031,9 +2874,10 @@ public void writeMultiTableExceptionTest() {
         final File parentDir = new File(rootFile, "tempDir");
         parentDir.mkdir();
 
-        // Write two tables to parquet file and read them back
+        // Write two tables to parquet file
         final Table firstTable = TableTools.emptyTable(5)
                 .updateView("InputString = Long.toString(ii)", "A=InputString.charAt(0)");
+        DataIndexer.getOrCreateDataIndex(firstTable, "InputString");
         final File firstDestFile = new File(parentDir, "firstTable.parquet");
 
         final Table secondTable = TableTools.emptyTable(5)
@@ -2043,7 +2887,7 @@ public void writeMultiTableExceptionTest() {
         final Table[] tablesToSave = new Table[] {firstTable, secondTable};
         final String[] destinations = new String[] {firstDestFile.getPath(), secondDestFile.getPath()};
 
-        // This write should fail
+        // This write should fail because of the null value in the second table
         try {
             writeTables(tablesToSave, destinations,
                     ParquetInstructions.EMPTY.withTableDefinition(firstTable.getDefinition()));
@@ -2349,6 +3193,26 @@ public void partitionedParquetWithDotFilesTest() throws IOException {
         assertTableEquals(fromDisk, partitionedTable);
     }
 
+    @Test
+    public void readParquetFilesWithCodec() {
+        final Table table = TableTools.emptyTable(10000)
+                .update("bdColumn = java.math.BigDecimal.valueOf(ii).stripTrailingZeros()",
+                        "biColumn = i % 10 == 0 ? null : java.math.BigInteger.valueOf(ii*512)")
+                .select();
+
+        // Set codecs for each column
+        final ParquetInstructions instructions = ParquetInstructions.builder()
+                .addColumnCodec("bdColumn", "io.deephaven.util.codec.BigDecimalCodec", "20,1,allowrounding")
+                .addColumnCodec("biColumn", "io.deephaven.util.codec.BigIntegerCodec")
+                .build();
+
+        final File parentDir = new File(rootFile, "tempDir");
+        parentDir.mkdir();
+        final File dest = new File(parentDir, "dataWithCodecInfo.parquet");
+        ParquetTools.writeTable(table, dest.getPath(), instructions);
+        checkSingleTable(table, dest);
+    }
+
     @Test
     public void partitionedParquetWithDuplicateDataTest() throws IOException {
         // Create an empty parent directory
@@ -2427,6 +3291,10 @@ public void indexOverwritingTests() {
         indexOverwritingTestsImpl(MULTI_WRITER);
     }
 
+    private static File getBackupFile(final File destFile) {
+        return new File(destFile.getParent(), ".OLD_" + destFile.getName());
+    }
+
     private void indexOverwritingTestsImpl(TestParquetTableWriter writer) {
         // Create an empty parent directory
         final File parentDir = new File(rootFile, "tempDir");
@@ -2472,7 +3340,7 @@ private void indexOverwritingTestsImpl(TestParquetTableWriter writer) {
         // The directory should still contain the updated table, its index file for column xxx, and old index file
         // for column vvv
         final File xxxIndexFile = new File(parentDir, xxxIndexFilePath);
-        final File backupXXXIndexFile = ParquetTools.getBackupFile(xxxIndexFile);
+        final File backupXXXIndexFile = getBackupFile(xxxIndexFile);
         final String backupXXXIndexFileName = backupXXXIndexFile.getName();
         verifyFilesInDir(parentDir, new String[] {destFilename},
                 Map.of("vvv", new String[] {vvvIndexFilePath},
@@ -2831,10 +3699,6 @@ public void singleTable() {
         final TableDefinition fooBarDefinition;
         final TableDefinition barDefinition;
         {
-            fooSource.mkdirs();
-            fooBarSource.mkdirs();
-            barSource.mkdirs();
-
             final ColumnHolder<Integer> fooCol = intCol("Foo", 1, 2, 3);
             final ColumnHolder<String> barCol = stringCol("Bar", "Zip", "Zap", "Zoom");
 
@@ -2946,8 +3810,6 @@ public void flatPartitionedTable() {
             final File p1FileEmpty = new File(emptySource, "01.parquet");
             final File p2FileEmpty = new File(emptySource, "02.parquet");
 
-            p1File.mkdirs();
-            p2File.mkdirs();
             emptySource.mkdirs();
 
             final ColumnHolder<Integer> foo1 = intCol("Foo", 1, 2, 3);
@@ -2961,8 +3823,6 @@ public void flatPartitionedTable() {
             writeTable(p1, p1File.getPath());
             writeTable(p2, p2File.getPath());
             writeIntoEmptySource = () -> {
-                p1FileEmpty.mkdirs();
-                p2FileEmpty.mkdirs();
                 writeTable(p1, p1FileEmpty.getPath());
                 writeTable(p2, p2FileEmpty.getPath());
             };
@@ -3065,8 +3925,6 @@ public void keyValuePartitionedTable() {
             final File p1FileEmpty = new File(emptySource, "Partition=1/z.parquet");
             final File p2FileEmpty = new File(emptySource, "Partition=2/a.parquet");
 
-            p1File.mkdirs();
-            p2File.mkdirs();
             emptySource.mkdirs();
 
             final ColumnHolder<Integer> part1 = intCol("Partition", 1, 1, 1);
@@ -3083,8 +3941,6 @@ public void keyValuePartitionedTable() {
             writeTable(p1, p1File.getPath());
             writeTable(p2, p2File.getPath());
             writeIntoEmptySource = () -> {
-                p1FileEmpty.mkdirs();
-                p2FileEmpty.mkdirs();
                 writeTable(p1, p1FileEmpty.getPath());
                 writeTable(p2, p2FileEmpty.getPath());
             };
@@ -3593,18 +4449,20 @@ private void assertByteVectorColumnStatistics(SerialObjectColumnIterator<ByteVec
                 nullCount.increment();
                 return;
             }
-            for (final byte value : values) {
-                itemCount.increment();
-                if (value == NULL_BYTE) {
-                    nullCount.increment();
-                } else {
-                    if (min.get() == NULL_BYTE || value < min.get()) {
-                        min.set(value);
-                    }
-                    if (max.get() == NULL_BYTE || value > max.get()) {
-                        max.set(value);
+            try (final CloseablePrimitiveIteratorOfByte valuesIterator = values.iterator()) {
+                valuesIterator.forEachRemaining((final byte value) -> {
+                    itemCount.increment();
+                    if (value == NULL_BYTE) {
+                        nullCount.increment();
+                    } else {
+                        if (min.get() == NULL_BYTE || value < min.get()) {
+                            min.set(value);
+                        }
+                        if (max.get() == NULL_BYTE || value > max.get()) {
+                            max.set(value);
+                        }
                     }
-                }
+                });
             }
         });
 
@@ -3702,18 +4560,20 @@ private void assertCharVectorColumnStatistics(SerialObjectColumnIterator<CharVec
                 nullCount.increment();
                 return;
             }
-            for (final char value : values) {
-                itemCount.increment();
-                if (value == NULL_CHAR) {
-                    nullCount.increment();
-                } else {
-                    if (min.get() == NULL_CHAR || value < min.get()) {
-                        min.set(value);
-                    }
-                    if (max.get() == NULL_CHAR || value > max.get()) {
-                        max.set(value);
+            try (final CloseablePrimitiveIteratorOfChar valuesIterator = values.iterator()) {
+                valuesIterator.forEachRemaining((final char value) -> {
+                    itemCount.increment();
+                    if (value == NULL_CHAR) {
+                        nullCount.increment();
+                    } else {
+                        if (min.get() == NULL_CHAR || value < min.get()) {
+                            min.set(value);
+                        }
+                        if (max.get() == NULL_CHAR || value > max.get()) {
+                            max.set(value);
+                        }
                     }
-                }
+                });
             }
         });
 
@@ -3811,18 +4671,20 @@ private void assertShortVectorColumnStatistics(SerialObjectColumnIterator<ShortV
                 nullCount.increment();
                 return;
             }
-            for (final short value : values) {
-                itemCount.increment();
-                if (value == NULL_SHORT) {
-                    nullCount.increment();
-                } else {
-                    if (min.get() == NULL_SHORT || value < min.get()) {
-                        min.set(value);
-                    }
-                    if (max.get() == NULL_SHORT || value > max.get()) {
-                        max.set(value);
+            try (final CloseablePrimitiveIteratorOfShort valuesIterator = values.iterator()) {
+                valuesIterator.forEachRemaining((final short value) -> {
+                    itemCount.increment();
+                    if (value == NULL_SHORT) {
+                        nullCount.increment();
+                    } else {
+                        if (min.get() == NULL_SHORT || value < min.get()) {
+                            min.set(value);
+                        }
+                        if (max.get() == NULL_SHORT || value > max.get()) {
+                            max.set(value);
+                        }
                     }
-                }
+                });
             }
         });
 
@@ -3920,18 +4782,20 @@ private void assertIntVectorColumnStatistics(SerialObjectColumnIterator<IntVecto
                 nullCount.increment();
                 return;
             }
-            for (final int value : values) {
-                itemCount.increment();
-                if (value == NULL_INT) {
-                    nullCount.increment();
-                } else {
-                    if (min.get() == NULL_INT || value < min.get()) {
-                        min.set(value);
+            try (final CloseablePrimitiveIteratorOfInt valuesIterator = values.iterator()) {
+                valuesIterator.forEachRemaining((final int value) -> {
+                    itemCount.increment();
+                    if (value == NULL_INT) {
+                        nullCount.increment();
+                    } else {
+                        if (min.get() == NULL_INT || value < min.get()) {
+                            min.set(value);
+                        }
+                        if (max.get() == NULL_INT || value > max.get()) {
+                            max.set(value);
+                        }
                     }
-                    if (max.get() == NULL_INT || value > max.get()) {
-                        max.set(value);
-                    }
-                }
+                });
             }
         });
 
@@ -4029,18 +4893,20 @@ private void assertLongVectorColumnStatistics(SerialObjectColumnIterator<LongVec
                 nullCount.increment();
                 return;
             }
-            for (final long value : values) {
-                itemCount.increment();
-                if (value == NULL_LONG) {
-                    nullCount.increment();
-                } else {
-                    if (min.get() == NULL_LONG || value < min.get()) {
-                        min.set(value);
-                    }
-                    if (max.get() == NULL_LONG || value > max.get()) {
-                        max.set(value);
+            try (final CloseablePrimitiveIteratorOfLong valuesIterator = values.iterator()) {
+                valuesIterator.forEachRemaining((final long value) -> {
+                    itemCount.increment();
+                    if (value == NULL_LONG) {
+                        nullCount.increment();
+                    } else {
+                        if (min.get() == NULL_LONG || value < min.get()) {
+                            min.set(value);
+                        }
+                        if (max.get() == NULL_LONG || value > max.get()) {
+                            max.set(value);
+                        }
                     }
-                }
+                });
             }
         });
 
@@ -4140,18 +5006,20 @@ private void assertFloatVectorColumnStatistics(SerialObjectColumnIterator<FloatV
                 nullCount.increment();
                 return;
             }
-            for (final float value : values) {
-                itemCount.increment();
-                if (value == NULL_FLOAT) {
-                    nullCount.increment();
-                } else {
-                    if (min.floatValue() == NULL_FLOAT || value < min.floatValue()) {
-                        min.setValue(value);
+            try (final CloseablePrimitiveIteratorOfFloat valuesIterator = values.iterator()) {
+                valuesIterator.forEachRemaining((final float value) -> {
+                    itemCount.increment();
+                    if (value == NULL_FLOAT) {
+                        nullCount.increment();
+                    } else {
+                        if (min.floatValue() == NULL_FLOAT || value < min.floatValue()) {
+                            min.setValue(value);
+                        }
+                        if (max.floatValue() == NULL_FLOAT || value > max.floatValue()) {
+                            max.setValue(value);
+                        }
                     }
-                    if (max.floatValue() == NULL_FLOAT || value > max.floatValue()) {
-                        max.setValue(value);
-                    }
-                }
+                });
             }
         });
 
@@ -4252,18 +5120,20 @@ private void assertDoubleVectorColumnStatistics(SerialObjectColumnIterator<Doubl
                 nullCount.increment();
                 return;
             }
-            for (final double value : values) {
-                itemCount.increment();
-                if (value == NULL_DOUBLE) {
-                    nullCount.increment();
-                } else {
-                    if (min.doubleValue() == NULL_DOUBLE || value < min.doubleValue()) {
-                        min.setValue(value);
+            try (final CloseablePrimitiveIteratorOfDouble valuesIterator = values.iterator()) {
+                valuesIterator.forEachRemaining((final double value) -> {
+                    itemCount.increment();
+                    if (value == NULL_DOUBLE) {
+                        nullCount.increment();
+                    } else {
+                        if (min.doubleValue() == NULL_DOUBLE || value < min.doubleValue()) {
+                            min.setValue(value);
+                        }
+                        if (max.doubleValue() == NULL_DOUBLE || value > max.doubleValue()) {
+                            max.setValue(value);
+                        }
                     }
-                    if (max.doubleValue() == NULL_DOUBLE || value > max.doubleValue()) {
-                        max.setValue(value);
-                    }
-                }
+                });
             }
         });
 
@@ -4363,18 +5233,20 @@ private void assertStringVectorColumnStatistics(SerialObjectColumnIterator<Objec
                 nullCount.increment();
                 return;
             }
-            for (String value : values) {
-                itemCount.increment();
-                if (value == null) {
-                    nullCount.increment();
-                } else {
-                    if (min.getValue() == null || value.compareTo(min.getValue()) < 0) {
-                        min.setValue(value);
+            try (final CloseableIterator<String> valuesIterator = values.iterator()) {
+                valuesIterator.forEachRemaining((final String value) -> {
+                    itemCount.increment();
+                    if (value == null) {
+                        nullCount.increment();
+                    } else {
+                        if (min.getValue() == null || value.compareTo(min.getValue()) < 0) {
+                            min.setValue(value);
+                        }
+                        if (max.getValue() == null || value.compareTo(max.getValue()) > 0) {
+                            max.setValue(value);
+                        }
                     }
-                    if (max.getValue() == null || value.compareTo(max.getValue()) > 0) {
-                        max.setValue(value);
-                    }
-                }
+                });
             }
         });
 
@@ -4475,19 +5347,21 @@ private void assertInstantVectorColumnStatistics(SerialObjectColumnIterator<Obje
                 nullCount.increment();
                 return;
             }
-            for (Instant value : values) {
-                itemCount.increment();
-                if (value == null) {
-                    nullCount.increment();
-                } else {
-                    // DateTimeUtils.epochNanos() is the correct conversion for Instant to long.
-                    if (min.get() == NULL_LONG || DateTimeUtils.epochNanos(value) < min.get()) {
-                        min.set(DateTimeUtils.epochNanos(value));
+            try (final CloseableIterator<Instant> valuesIterator = values.iterator()) {
+                valuesIterator.forEachRemaining((final Instant value) -> {
+                    itemCount.increment();
+                    if (value == null) {
+                        nullCount.increment();
+                    } else {
+                        // DateTimeUtils.epochNanos() is the correct conversion for Instant to long.
+                        if (min.get() == NULL_LONG || DateTimeUtils.epochNanos(value) < min.get()) {
+                            min.set(DateTimeUtils.epochNanos(value));
+                        }
+                        if (max.get() == NULL_LONG || DateTimeUtils.epochNanos(value) > max.get()) {
+                            max.set(DateTimeUtils.epochNanos(value));
+                        }
                     }
-                    if (max.get() == NULL_LONG || DateTimeUtils.epochNanos(value) > max.get()) {
-                        max.set(DateTimeUtils.epochNanos(value));
-                    }
-                }
+                });
             }
         });
 
diff --git a/extensions/parquet/table/src/test/java/io/deephaven/parquet/table/ParquetToolsTestDataTest.java b/extensions/parquet/table/src/test/java/io/deephaven/parquet/table/ParquetToolsTestDataTest.java
new file mode 100644
index 00000000000..168199f87c9
--- /dev/null
+++ b/extensions/parquet/table/src/test/java/io/deephaven/parquet/table/ParquetToolsTestDataTest.java
@@ -0,0 +1,251 @@
+//
+// Copyright (c) 2016-2024 Deephaven Data Labs and Patent Pending
+//
+package io.deephaven.parquet.table;
+
+import io.deephaven.engine.exceptions.TableInitializationException;
+import io.deephaven.engine.table.Table;
+import io.deephaven.engine.table.impl.locations.TableDataException;
+import io.deephaven.engine.testutil.junit4.EngineCleanup;
+import org.junit.BeforeClass;
+import org.junit.Rule;
+import org.junit.Test;
+
+import java.nio.file.Path;
+
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.assertj.core.api.Assertions.failBecauseExceptionWasNotThrown;
+import static org.junit.Assume.assumeTrue;
+
+/**
+ * Assumes that there is already a checkout of
+ * <a href="https://github.com/deephaven/deephaven-core-test-data">deephaven-core-test-data</a>. This is currently meant
+ * to be run locally.
+ */
+public class ParquetToolsTestDataTest {
+
+    private static final Path CHECKOUT_ROOT = null; // Path.of("/path/to/deephaven-core-test-data");
+
+    @Rule
+    public final EngineCleanup framework = new EngineCleanup();
+
+    @BeforeClass
+    public static void beforeClass() {
+        assumeTrue(CHECKOUT_ROOT != null);
+    }
+
+    @Test
+    public void London_v1() {
+        read("London_v1_Whitespace_SNAPPY");
+    }
+
+    @Test
+    public void Product_v1() {
+        read("Product_v1_CPP_SNAPPY_Whitespace");
+    }
+
+    @Test
+    public void alltypes() {
+        read("alltypes_dictionary_v1_IMPALA_NONE");
+        read("alltypes_plain_v1_IMPALA_NONE");
+        read("alltypes_plain_v1_IMPALA_SNAPPY");
+    }
+
+    @Test
+    public void customer() {
+        read("customer_v1_IMPALA_GZIP");
+        read("customer_v1_IMPALA_NONE");
+        read("customer_v1_IMPALA_SNAPPY");
+    }
+
+    @Test
+    public void eth() {
+        final String prefix = "eth_";
+        for (String part : new String[] {"cBROTLI_L9", "cBROTLI_PS5"}) {
+            codecFail(prefix + part);
+        }
+        for (String part : new String[] {"cGZIP_PS5", "cLZ4_PS5", "cNONE_PS5", "cSNAPPY_PS5", "cZSTD_L9",
+                "cZSTD_PS5"}) {
+            read(prefix + part);
+        }
+    }
+
+    @Test
+    public void eth_r2_v1() {
+        final String prefix = "eth_r2_v1_";
+        for (String part : new String[] {"cBROTLI"}) {
+            codecFail(prefix + part);
+        }
+        for (String part : new String[] {"cGZIP", "cGZIP_l5", "cLZ4", "cNONE", "cSNAPPY", "cZSTD", "cZSTD_l20"}) {
+            read(prefix + part);
+        }
+    }
+
+    @Test
+    public void eth_r2_v1_p2() {
+        read("eth_r2_v1_p2");
+    }
+
+    @Test
+    public void eth_r2_v2() {
+        final String prefix = "eth_r2_v2_";
+        for (String part : new String[] {"cBROTLI"}) {
+            codecFail(prefix + part);
+        }
+        for (String part : new String[] {"cGZIP", "cLZ4", "cNONE", "cSNAPPY", "cZSTD"}) {
+            read(prefix + part);
+        }
+    }
+
+    @Test
+    public void eth_v1() {
+        final String prefix = "eth_v1_";
+        for (String part : new String[] {"cBROTLI", "cBROTLI_l10", "cBROTLI_l100"}) {
+            codecFail(prefix + part);
+        }
+        for (String part : new String[] {"cGZIP", "cGZIP_l5", "cGZIP_l9", "cLZ4", "cNONE", "cSNAPPY", "cZSTD"}) {
+            read(prefix + part);
+        }
+    }
+
+    @Test
+    public void eth_v1_p1() {
+        final String prefix = "eth_v1_p1_";
+        for (String part : new String[] {"cBROTLI"}) {
+            codecFail(prefix + part);
+        }
+        for (String part : new String[] {"cGZIP", "cLZ4", "cNSAPPY", "cZSTD"}) {
+            read(prefix + part);
+        }
+    }
+
+    @Test
+    public void eth_v1_p2() {
+        final String prefix = "eth_v1_p2_";
+        for (String part : new String[] {"cBROTLI"}) {
+            codecFail(prefix + part);
+        }
+        for (String part : new String[] {"cGZIP", "cLZ4", "cNONE", "cSNAPPY", "cZSTD"}) {
+            read(prefix + part);
+        }
+    }
+
+    @Test
+    public void eth_v2() {
+        final String prefix = "eth_v2_";
+        for (String part : new String[] {"cBROTLI"}) {
+            codecFail(prefix + part);
+        }
+        for (String part : new String[] {"cGZIP", "cLZ4", "cLZ4_PS5", "cNONE", "cSNAPPY", "cZSTD", "fSpark"}) {
+            read(prefix + part);
+        }
+    }
+
+    @Test
+    public void eth_v2_p1() {
+        for (String part : new String[] {"cBROTLI"}) {
+            codecFail("eth_v2_p1_" + part);
+        }
+        for (String part : new String[] {"cGZIP", "cLZ4", "cNONE", "cSNAPPY", "cZSTD"}) {
+            read("eth_v2_p1_" + part);
+        }
+    }
+
+    @Test
+    public void eth_v2_p2() {
+        for (String part : new String[] {"cBROTLI"}) {
+            codecFail("eth_v2_p2_" + part);
+        }
+        for (String part : new String[] {"cGZIP", "cLZ4", "cNONE", "cSNAPPY", "cZSTD"}) {
+            read("eth_v2_p2_" + part);
+        }
+    }
+
+    @Test
+    public void flow_v1() {
+        read("flow_v1_NULLS_SNAPPY");
+    }
+
+    @Test
+    public void nation() {
+        read("nation_dict_MALFORMED");
+    }
+
+    @Test
+    public void nested_maps_v1() {
+        openFail("nested_maps_v1_NULLS_SNAPPY", UnsupportedOperationException.class,
+                "Unsupported maximum repetition level");
+    }
+
+    @Test
+    public void nested_v1() {
+        openFail("nested_v1_NULLS_SNAPPY", UnsupportedOperationException.class, "Unsupported maximum repetition level");
+    }
+
+    @Test
+    public void nonnullable_nested_v1() {
+        openFail("nonnullable_nested_v1_IMPALA_NULLS_NONE", UnsupportedOperationException.class,
+                "Unsupported maximum repetition level");
+    }
+
+    @Test
+    public void nulls_v1() {
+        // Note: it would be better if we could figure this out before actually reading a column.
+        readFail("nulls_v1_NULLS_SNAPPY", TableInitializationException.class,
+                "Failed to read parquet page because nested optional levels are not supported");
+    }
+
+    @Test
+    public void repeated_nested() {
+        openFail("repeated_nested_RUST_NONE", UnsupportedOperationException.class,
+                "Encountered unsupported multi-column field");
+    }
+
+    @Test
+    public void stock_v1() {
+        read("stock_v1_CPP_SNAPPY");
+    }
+
+    @Test
+    public void taxi() {
+        read("taxi");
+    }
+
+    private static Table open(String name) {
+        final String path = CHECKOUT_ROOT
+                .resolve("parquetFiles")
+                .resolve(name + ".parquet")
+                .toUri()
+                .toString();
+        return ParquetTools.readTable(path);
+    }
+
+    private static void read(String name) {
+        open(name).select();
+    }
+
+    private static void openFail(String name, Class<? extends Exception> error, String messagePart) {
+        try {
+            open(name);
+            failBecauseExceptionWasNotThrown(error);
+        } catch (Throwable e) {
+            assertThat(e).isInstanceOf(error);
+            assertThat(e).hasMessageContaining(messagePart);
+        }
+    }
+
+    private static void readFail(String name, Class<? extends Exception> error, String messagePart) {
+        try {
+            read(name);
+            failBecauseExceptionWasNotThrown(error);
+        } catch (Throwable e) {
+            assertThat(e).isInstanceOf(error);
+            assertThat(e).getRootCause().hasMessageContaining(messagePart);
+        }
+    }
+
+    private static void codecFail(String name) {
+        // Note: it would be better if we could figure this out before actually reading a column.
+        readFail(name, TableDataException.class, "Failed to find CompressionCodec");
+    }
+}
diff --git a/extensions/parquet/table/src/test/java/io/deephaven/parquet/table/S3ParquetLocalStackTest.java b/extensions/parquet/table/src/test/java/io/deephaven/parquet/table/S3ParquetLocalStackTest.java
index 796776eda1b..69115fee18b 100644
--- a/extensions/parquet/table/src/test/java/io/deephaven/parquet/table/S3ParquetLocalStackTest.java
+++ b/extensions/parquet/table/src/test/java/io/deephaven/parquet/table/S3ParquetLocalStackTest.java
@@ -5,10 +5,12 @@
 
 import io.deephaven.extensions.s3.S3Instructions.Builder;
 import io.deephaven.extensions.s3.testlib.SingletonContainers.LocalStack;
-import io.deephaven.extensions.s3.testlib.SingletonContainers;
+import org.junit.Assume;
 import org.junit.BeforeClass;
 import software.amazon.awssdk.services.s3.S3AsyncClient;
 
+import java.io.IOException;
+
 public class S3ParquetLocalStackTest extends S3ParquetTestBase {
 
     @BeforeClass
@@ -22,8 +24,38 @@ public Builder s3Instructions(Builder builder) {
         return LocalStack.s3Instructions(builder);
     }
 
+    @Override
+    public String s3Endpoint() {
+        return LocalStack.s3Endpoint();
+    }
+
+    @Override
+    public String region() {
+        return LocalStack.region();
+    }
+
+    @Override
+    public String accessKey() {
+        return LocalStack.accessKey();
+    }
+
+    @Override
+    public String secretAccessKey() {
+        return LocalStack.secretAccessKey();
+    }
+
     @Override
     public S3AsyncClient s3AsyncClient() {
-        return SingletonContainers.LocalStack.s3AsyncClient();
+        return LocalStack.s3AsyncClient();
+    }
+
+    // Ignore annotation does not seem to work with Override
+    // @Ignore
+    @Override
+    public void testInvalidKeysFromProfile() throws IOException {
+        Assume.assumeTrue(
+                "localstack 3.7 behavior changed, an 'invalid' key does not seem to cause an error anymore (potentially silently fails?)",
+                false);
+        super.testInvalidKeysFromProfile();
     }
 }
diff --git a/extensions/parquet/table/src/test/java/io/deephaven/parquet/table/S3ParquetMinIOTest.java b/extensions/parquet/table/src/test/java/io/deephaven/parquet/table/S3ParquetMinIOTest.java
index 2b3cb60e609..c8113421be9 100644
--- a/extensions/parquet/table/src/test/java/io/deephaven/parquet/table/S3ParquetMinIOTest.java
+++ b/extensions/parquet/table/src/test/java/io/deephaven/parquet/table/S3ParquetMinIOTest.java
@@ -5,8 +5,7 @@
 
 import io.deephaven.extensions.s3.S3Instructions.Builder;
 import io.deephaven.extensions.s3.testlib.SingletonContainers.MinIO;
-import io.deephaven.extensions.s3.testlib.SingletonContainers;
-import io.deephaven.stats.util.OSUtil;
+import io.deephaven.base.OSUtil;
 import org.junit.Assume;
 import org.junit.BeforeClass;
 import software.amazon.awssdk.services.s3.S3AsyncClient;
@@ -26,8 +25,28 @@ public Builder s3Instructions(final Builder builder) {
         return MinIO.s3Instructions(builder);
     }
 
+    @Override
+    public String s3Endpoint() {
+        return MinIO.s3Endpoint();
+    }
+
+    @Override
+    public String region() {
+        return MinIO.region();
+    }
+
+    @Override
+    public String accessKey() {
+        return MinIO.accessKey();
+    }
+
+    @Override
+    public String secretAccessKey() {
+        return MinIO.secretAccessKey();
+    }
+
     @Override
     public S3AsyncClient s3AsyncClient() {
-        return SingletonContainers.MinIO.s3AsyncClient();
+        return MinIO.s3AsyncClient();
     }
 }
diff --git a/extensions/parquet/table/src/test/java/io/deephaven/parquet/table/S3ParquetRemoteTest.java b/extensions/parquet/table/src/test/java/io/deephaven/parquet/table/S3ParquetRemoteTest.java
index 70df7cf5534..e93bb00fefb 100644
--- a/extensions/parquet/table/src/test/java/io/deephaven/parquet/table/S3ParquetRemoteTest.java
+++ b/extensions/parquet/table/src/test/java/io/deephaven/parquet/table/S3ParquetRemoteTest.java
@@ -6,7 +6,9 @@
 import io.deephaven.engine.table.ColumnDefinition;
 import io.deephaven.engine.table.Table;
 import io.deephaven.engine.table.TableDefinition;
+import io.deephaven.engine.table.impl.QueryTable;
 import io.deephaven.engine.testutil.junit4.EngineCleanup;
+import io.deephaven.engine.util.TableTools;
 import io.deephaven.extensions.s3.Credentials;
 import io.deephaven.extensions.s3.S3Instructions;
 import io.deephaven.test.types.OutOfBandTest;
@@ -17,7 +19,10 @@
 
 import java.time.Duration;
 
+import static io.deephaven.engine.testutil.TstUtils.assertTableEquals;
+import static io.deephaven.parquet.table.ParquetTools.readTable;
 import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
 
 /**
  * These tests verify the behavior of Parquet implementation when reading against remote S3 servers.
@@ -32,7 +37,7 @@ public class S3ParquetRemoteTest {
     public final EngineCleanup framework = new EngineCleanup();
 
     @Test
-    public void readSampleParquetFilesFromPublicS3() {
+    public void readSampleParquetFilesFromPublicS3Part1() {
         Assume.assumeTrue("Skipping test because s3 testing disabled.", ENABLE_REMOTE_S3_TESTING);
         final S3Instructions s3Instructions = S3Instructions.builder()
                 .regionName("us-east-2")
@@ -67,6 +72,132 @@ public void readSampleParquetFilesFromPublicS3() {
                 readInstructions).head(10).select();
     }
 
+    @Test
+    public void readSampleParquetFilesFromPublicS3Part2() {
+        Assume.assumeTrue("Skipping test because s3 testing disabled.", ENABLE_REMOTE_S3_TESTING);
+        {
+            final S3Instructions s3Instructions = S3Instructions.builder()
+                    .regionName("eu-west-3")
+                    .readTimeout(Duration.ofSeconds(60))
+                    .credentials(Credentials.anonymous())
+                    .build();
+            final ParquetInstructions readInstructions = new ParquetInstructions.Builder()
+                    .setSpecialInstructions(s3Instructions)
+                    .build();
+            readTable("s3://datasets-documentation/pypi/2023/pypi_66_7_29.snappy.parquet", readInstructions)
+                    .head(10).select();
+        }
+
+        // Now read the same file without a region
+        {
+            final S3Instructions s3Instructions = S3Instructions.builder()
+                    .readTimeout(Duration.ofSeconds(60))
+                    .credentials(Credentials.anonymous())
+                    .build();
+            final ParquetInstructions readInstructions = new ParquetInstructions.Builder()
+                    .setSpecialInstructions(s3Instructions)
+                    .build();
+            readTable("s3://datasets-documentation/pypi/2023/pypi_66_7_29.snappy.parquet", readInstructions)
+                    .head(10).select();
+        }
+
+        // Now read the same file with credentials not set as anonymous
+        {
+            final S3Instructions s3Instructions = S3Instructions.builder()
+                    .readTimeout(Duration.ofSeconds(60))
+                    .build();
+            final ParquetInstructions readInstructions = new ParquetInstructions.Builder()
+                    .setSpecialInstructions(s3Instructions)
+                    .build();
+            readTable("s3://datasets-documentation/pypi/2023/pypi_66_7_29.snappy.parquet", readInstructions)
+                    .head(10).select();
+        }
+    }
+
+    @Test
+    public void readSampleParquetFilesFromPublicS3Part3() {
+        Assume.assumeTrue("Skipping test because s3 testing disabled.", ENABLE_REMOTE_S3_TESTING);
+        final S3Instructions s3Instructions = S3Instructions.builder()
+                .regionName("us-east-1")
+                .readTimeout(Duration.ofSeconds(60))
+                .credentials(Credentials.anonymous())
+                .build();
+        final ParquetInstructions readInstructions = new ParquetInstructions.Builder()
+                .setSpecialInstructions(s3Instructions)
+                .build();
+        readTable("s3://redshift-downloads/redset/serverless/full.parquet", readInstructions).head(10).select();
+    }
+
+    @Test
+    public void readSampleParquetFromPublicGCS() {
+        Assume.assumeTrue("Skipping test because s3 testing disabled.", ENABLE_REMOTE_S3_TESTING);
+        final Table tableWithEndpointOverride;
+        {
+            final ParquetInstructions readInstructions = new ParquetInstructions.Builder()
+                    .setSpecialInstructions(S3Instructions.builder()
+                            .readTimeout(Duration.ofSeconds(60))
+                            .credentials(Credentials.anonymous())
+                            .regionName("us-east-1")
+                            .endpointOverride("https://storage.googleapis.com")
+                            .build())
+                    .build();
+            tableWithEndpointOverride = ParquetTools.readTable(
+                    "s3://cloud-samples-data/bigquery/us-states/us-states.parquet", readInstructions).select();
+            assertEquals(2, tableWithEndpointOverride.numColumns());
+            assertEquals(50, tableWithEndpointOverride.size());
+        }
+
+        final Table tableWithoutEndpointOverride;
+        {
+            final ParquetInstructions readInstructions = new ParquetInstructions.Builder()
+                    .setSpecialInstructions(S3Instructions.builder()
+                            .readTimeout(Duration.ofSeconds(60))
+                            .regionName("us-east-1")
+                            .credentials(Credentials.anonymous())
+                            .build())
+                    .build();
+            tableWithoutEndpointOverride = ParquetTools.readTable(
+                    "gs://cloud-samples-data/bigquery/us-states/us-states.parquet", readInstructions).select();
+            assertEquals(2, tableWithoutEndpointOverride.numColumns());
+            assertEquals(50, tableWithoutEndpointOverride.size());
+        }
+        assertTableEquals(tableWithEndpointOverride, tableWithoutEndpointOverride);
+
+        final Table tableWithNoRegionAndCredentials;
+        {
+            // Note that this assumes that credentials are not present in the credentials file. If they are, this test
+            // will fail.
+            final ParquetInstructions readInstructions = new ParquetInstructions.Builder()
+                    .setSpecialInstructions(S3Instructions.builder()
+                            .readTimeout(Duration.ofSeconds(60))
+                            .endpointOverride("https://storage.googleapis.com")
+                            .build())
+                    .build();
+            tableWithNoRegionAndCredentials = ParquetTools.readTable(
+                    "gs://cloud-samples-data/bigquery/us-states/us-states.parquet", readInstructions).select();
+            assertEquals(2, tableWithNoRegionAndCredentials.numColumns());
+            assertEquals(50, tableWithNoRegionAndCredentials.size());
+        }
+        assertTableEquals(tableWithEndpointOverride, tableWithNoRegionAndCredentials);
+    }
+
+    @Test
+    public void testReadFromGCSFailure() {
+        final ParquetInstructions readInstructions = new ParquetInstructions.Builder()
+                .setSpecialInstructions(S3Instructions.builder()
+                        .readTimeout(Duration.ofSeconds(60))
+                        .credentials(Credentials.anonymous())
+                        .endpointOverride("https://storage.com")
+                        .build())
+                .build();
+        try {
+            ParquetTools.readTable(
+                    "gs://cloud-samples-data/bigquery/us-states/us-states.parquet", readInstructions).select();
+        } catch (final IllegalArgumentException e) {
+            assertTrue(e.toString().contains("endpoint override"));
+        }
+    }
+
     @Test
     public void readKeyValuePartitionedParquetFromPublicS3() {
         Assume.assumeTrue("Skipping test because s3 testing disabled.", ENABLE_REMOTE_S3_TESTING);
@@ -86,4 +217,42 @@ public void readKeyValuePartitionedParquetFromPublicS3() {
                 readInstructions).head(10).select();
         assertEquals(2, table.numColumns());
     }
+
+    /**
+     * The follow test reads from Deephaven's s3 bucket, thus requires the credentials to be set up, else will fail.
+     */
+    @Test
+    public void readMetadataPartitionedParquetFromS3() {
+        Assume.assumeTrue("Skipping test because s3 testing disabled.", ENABLE_REMOTE_S3_TESTING);
+        final TableDefinition definition = TableDefinition.of(
+                ColumnDefinition.ofInt("PC1").withPartitioning(),
+                ColumnDefinition.ofInt("PC2").withPartitioning(),
+                ColumnDefinition.ofLong("I"));
+        final Table source = ((QueryTable) TableTools.emptyTable(1_000_000)
+                .updateView("PC1 = (int)(ii%3)",
+                        "PC2 = (int)(ii%2)",
+                        "I = ii"))
+                .withDefinitionUnsafe(definition);
+
+        final S3Instructions s3Instructions = S3Instructions.builder()
+                .regionName("us-east-1")
+                .build();
+        final ParquetInstructions readInstructions = new ParquetInstructions.Builder()
+                .setSpecialInstructions(s3Instructions)
+                .setFileLayout(ParquetInstructions.ParquetFileLayout.METADATA_PARTITIONED)
+                .build();
+        final Table fromS3Partitioned = readTable("s3://dh-s3-parquet-test1/keyValuePartitionedWithMetadataTest/",
+                readInstructions);
+        assertTableEquals(source.sort("PC1", "PC2"), fromS3Partitioned.sort("PC1", "PC2"));
+
+        final Table fromDiskWithMetadata =
+                readTable("s3://dh-s3-parquet-test1/keyValuePartitionedWithMetadataTest/_metadata",
+                        readInstructions);
+        assertTableEquals(source.sort("PC1", "PC2"), fromDiskWithMetadata.sort("PC1", "PC2"));
+
+        final Table fromDiskWithCommonMetadata =
+                readTable("s3://dh-s3-parquet-test1/keyValuePartitionedWithMetadataTest/_common_metadata",
+                        readInstructions);
+        assertTableEquals(source.sort("PC1", "PC2"), fromDiskWithCommonMetadata.sort("PC1", "PC2"));
+    }
 }
diff --git a/extensions/parquet/table/src/test/java/io/deephaven/parquet/table/S3ParquetTestBase.java b/extensions/parquet/table/src/test/java/io/deephaven/parquet/table/S3ParquetTestBase.java
index 1aa86dc9b5d..7c0bd5d9369 100644
--- a/extensions/parquet/table/src/test/java/io/deephaven/parquet/table/S3ParquetTestBase.java
+++ b/extensions/parquet/table/src/test/java/io/deephaven/parquet/table/S3ParquetTestBase.java
@@ -3,17 +3,22 @@
 //
 package io.deephaven.parquet.table;
 
+import io.deephaven.UncheckedDeephavenException;
 import io.deephaven.engine.table.ColumnDefinition;
 import io.deephaven.engine.table.Table;
 import io.deephaven.engine.table.TableDefinition;
 import io.deephaven.engine.table.impl.QueryTable;
+import io.deephaven.engine.table.impl.indexer.DataIndexer;
+import io.deephaven.engine.table.impl.locations.TableDataException;
+import io.deephaven.engine.table.impl.select.FormulaEvaluationException;
 import io.deephaven.engine.testutil.junit4.EngineCleanup;
 import io.deephaven.engine.util.TableTools;
+import io.deephaven.extensions.s3.Credentials;
 import io.deephaven.extensions.s3.S3Instructions;
 import io.deephaven.extensions.s3.testlib.S3SeekableChannelTestSetup;
 import io.deephaven.test.types.OutOfBandTest;
+import junit.framework.TestCase;
 import org.junit.After;
-import org.junit.Assert;
 import org.junit.Before;
 import org.junit.Rule;
 import org.junit.Test;
@@ -24,14 +29,21 @@
 import java.io.File;
 import java.io.IOException;
 import java.net.URI;
+import java.nio.file.Files;
+import java.nio.file.Path;
 import java.time.Duration;
+import java.util.Optional;
 import java.util.concurrent.ExecutionException;
 import java.util.concurrent.TimeoutException;
 
 import static io.deephaven.engine.testutil.TstUtils.assertTableEquals;
 import static io.deephaven.engine.util.TableTools.merge;
+import static io.deephaven.parquet.table.ParquetTableReadWriteTest.verifyIndexingInfoExists;
 import static io.deephaven.parquet.table.ParquetTools.writeKeyValuePartitionedTable;
+import static io.deephaven.parquet.table.ParquetTools.writeTable;
+import static io.deephaven.parquet.table.ParquetTools.writeTables;
 import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
 
 @Category(OutOfBandTest.class)
 abstract class S3ParquetTestBase extends S3SeekableChannelTestSetup {
@@ -42,6 +54,14 @@ abstract class S3ParquetTestBase extends S3SeekableChannelTestSetup {
     @Rule
     public final EngineCleanup framework = new EngineCleanup();
 
+    public abstract String s3Endpoint();
+
+    public abstract String region();
+
+    public abstract String accessKey();
+
+    public abstract String secretAccessKey();
+
     @Before
     public void setUp() throws ExecutionException, InterruptedException, TimeoutException {
         super.doSetUp();
@@ -65,19 +85,139 @@ private static Table getTable(final int numRows) {
     public final void readSingleParquetFile()
             throws IOException, ExecutionException, InterruptedException, TimeoutException {
         final Table table = getTable(500_000);
+        final URI uri = uri("table.parquet");
+        final ParquetInstructions instructions = ParquetInstructions.builder()
+                .setSpecialInstructions(s3Instructions(
+                        S3Instructions.builder()
+                                .readTimeout(Duration.ofSeconds(10)))
+                        .build())
+                .build();
+
+        // Write the table to S3 using the test async client
         final File dest = new File(folder.newFolder(), "table.parquet");
         ParquetTools.writeTable(table, dest.getAbsolutePath());
         putObject("table.parquet", AsyncRequestBody.fromFile(dest));
+        final Table fromS3 = ParquetTools.readTable(uri.toString(), instructions);
+        assertTableEquals(table, fromS3);
+    }
 
+    @Test
+    public final void readWriteSingleParquetFile() {
+        readWriteSingleParquetFileHelper(0, true); // Empty table
+        readWriteSingleParquetFileHelper(0, false);
+        readWriteSingleParquetFileHelper(5_000, true);
+        readWriteSingleParquetFileHelper(5_000, false);
+        readWriteSingleParquetFileHelper(50_000, true);
+        readWriteSingleParquetFileHelper(500_000, true);
+    }
+
+    private void readWriteSingleParquetFileHelper(final int numRows, boolean withRegion) {
+        final Table table = getTable(numRows);
         final URI uri = uri("table.parquet");
-        final ParquetInstructions readInstructions = ParquetInstructions.builder()
+        S3Instructions s3Instructions = s3Instructions(
+                S3Instructions.builder()
+                        .writePartSize(5 << 20)
+                        .numConcurrentWriteParts(5)
+                        .readTimeout(Duration.ofSeconds(10)))
+                .build();
+        if (!withRegion) {
+            s3Instructions = s3Instructions.withRegionName(Optional.empty());
+        }
+        final ParquetInstructions instructions = ParquetInstructions.builder()
+                .setSpecialInstructions(s3Instructions)
+                .build();
+
+        // Write the table to S3 using ParquetTools write API
+        ParquetTools.writeTable(table, uri.toString(), instructions);
+        final Table fromS3 = ParquetTools.readTable(uri.toString(), instructions);
+        assertTableEquals(table, fromS3);
+    }
+
+    @Test
+    public final void mixURIWritingTest() {
+        final Table table1, table2;
+        table1 = table2 = getTable(5000);
+        final String uri1 = uri("table1.parquet").toString();
+        final String uri2 = new File(folder.getRoot(), "table2.parquet").toURI().toString();
+        try {
+            ParquetTools.writeTables(new Table[] {table1, table2}, new String[] {uri1, uri2},
+                    ParquetInstructions.EMPTY);
+            fail("Expected exception because writing to file and to S3 are not allowed in the same call");
+        } catch (final IllegalArgumentException e) {
+            assertTrue(e.getMessage().contains("URIs must have the same scheme"));
+        }
+    }
+
+    @Test
+    public final void writeSingleTableExceptionTest() {
+        final Table tableToSave = TableTools.emptyTable(5).update("A=(int)i", "B=(long)i", "C=(double)i");
+        final URI fileUri = uri("destDir/table.parquet");
+        final ParquetInstructions instructions = ParquetInstructions.builder()
                 .setSpecialInstructions(s3Instructions(
                         S3Instructions.builder()
                                 .readTimeout(Duration.ofSeconds(10)))
                         .build())
                 .build();
-        final Table fromS3 = ParquetTools.readTable(uri.toString(), readInstructions);
-        assertTableEquals(table, fromS3);
+        ParquetTools.writeTable(tableToSave, fileUri.toString(), instructions);
+
+        final URI parentDir = uri("destDir");
+        Table fromS3 = ParquetTools.readTable(parentDir.toString(), instructions);
+        assertTableEquals(tableToSave, fromS3);
+
+        // Try to write a bad table at the same destination. This write should fail midway and the original file should
+        // be preserved.
+        final Table badTable = TableTools.emptyTable(5)
+                .updateView("InputString = ii % 2 == 0 ? Long.toString(ii) : null", "A=InputString.charAt(0)");
+        try {
+            ParquetTools.writeTable(badTable, fileUri.toString(), instructions);
+            TestCase.fail("Exception expected for invalid formula");
+        } catch (UncheckedDeephavenException e) {
+            assertTrue(e.getCause() instanceof FormulaEvaluationException);
+        }
+
+        // Make sure that original file is preserved
+        fromS3 = ParquetTools.readTable(parentDir.toString(), instructions);
+        assertTableEquals(tableToSave, fromS3);
+    }
+
+    /**
+     * These are tests for writing multiple parquet tables such that there is an exception in the second write.
+     */
+    @Test
+    public void writeMultiTableExceptionTest() {
+        // Write some initial data to S3
+        final Table initialData = TableTools.emptyTable(5).update("A=(int)i", "B=(long)i", "C=(double)i");
+        final URI initialDataUri = uri("destDir/initialDate.parquet");
+        final ParquetInstructions instructions = ParquetInstructions.builder()
+                .setSpecialInstructions(s3Instructions(
+                        S3Instructions.builder()
+                                .readTimeout(Duration.ofSeconds(10)))
+                        .build())
+                .build();
+        ParquetTools.writeTable(initialData, initialDataUri.toString(), instructions);
+
+        // Write two tables to parquet file and read them back
+        final Table firstTable = TableTools.emptyTable(5)
+                .updateView("InputString = Long.toString(ii)", "A=InputString.charAt(0)");
+        final URI firstFileUri = uri("destDir/table1.parquet");
+        final Table badTable = TableTools.emptyTable(5)
+                .updateView("InputString = ii % 2 == 0 ? Long.toString(ii*5) : null", "A=InputString.charAt(0)");
+        final URI secondFileUri = uri("destDir/table2.parquet");
+
+        // This write should fail for the second table
+        try {
+            writeTables(new Table[] {firstTable, badTable},
+                    new String[] {firstFileUri.toString(), secondFileUri.toString()}, instructions);
+            TestCase.fail("Exception expected for invalid formula");
+        } catch (UncheckedDeephavenException e) {
+            assertTrue(e.getCause() instanceof FormulaEvaluationException);
+        }
+
+        // All new files should be deleted even though first table would be written successfully. The directory should
+        // just have initial data.
+        final URI parentDir = uri("destDir");
+        final Table fromS3 = ParquetTools.readTable(parentDir.toString(), instructions);
+        assertTableEquals(initialData, fromS3);
     }
 
     @Test
@@ -135,6 +275,11 @@ public final void readFlatPartitionedParquetDataAsKVPartitioned()
         final Table fromS3AsKV = ParquetTools.readTable(uri.toString(),
                 readInstructions.withLayout(ParquetInstructions.ParquetFileLayout.KV_PARTITIONED));
         assertTableEquals(expected, fromS3AsKV);
+
+        // Read with definition without layout
+        final Table fromS3AsFlatWithDefinition = ParquetTools.readTable(uri.toString(),
+                readInstructions.withTableDefinition(expected.getDefinition()));
+        assertTableEquals(expected, fromS3AsFlatWithDefinition);
     }
 
     @Test
@@ -167,9 +312,52 @@ public void readKeyValuePartitionedParquetData()
                 .setTableDefinition(definition)
                 .build();
         final Table fromS3 = ParquetTools.readTable(uri.toString(), readInstructions);
-        assertTrue(fromS3.getDefinition().getColumn("PC1").isPartitioning());
-        assertTrue(fromS3.getDefinition().getColumn("PC2").isPartitioning());
-        assertTableEquals(table.sort("PC1", "PC2"), fromS3);
+        final Table fromDisk = ParquetTools.readTable(destDir.getPath());
+        readPartitionedParquetTestHelper(fromDisk, fromS3);
+
+        // Failure cases for missing metadata files
+        try {
+            ParquetTools.readTable(uri.toString(),
+                    readInstructions.withTableDefinitionAndLayout(null,
+                            ParquetInstructions.ParquetFileLayout.METADATA_PARTITIONED));
+            fail("Expected exception because metadata file is not present");
+        } catch (final TableDataException expected) {
+            assertTrue(expected.getMessage().contains("metadata"));
+        }
+        final URI metadataFileURI = uri(destDirName + "/_metadata");
+        try {
+            ParquetTools.readTable(metadataFileURI.toString(), readInstructions.withTableDefinition(null));
+            fail("Expected exception because metadata file is not present");
+        } catch (final TableDataException expected) {
+            assertTrue(expected.getMessage().contains("metadata"));
+        }
+    }
+
+    @Test
+    public void readWriteKeyValuePartitionedParquetData() {
+        final TableDefinition definition = TableDefinition.of(
+                ColumnDefinition.ofInt("PC1").withPartitioning(),
+                ColumnDefinition.ofInt("PC2").withPartitioning(),
+                ColumnDefinition.ofInt("someIntColumn"),
+                ColumnDefinition.ofString("someStringColumn"));
+        final Table table = ((QueryTable) TableTools.emptyTable(500_000)
+                .updateView("PC1 = (int)(ii%3)",
+                        "PC2 = (int)(ii%2)",
+                        "someIntColumn = (int) i",
+                        "someStringColumn = String.valueOf(i)"))
+                .withDefinitionUnsafe(definition);
+        final URI uri = uri("keyValuePartitionedDataDir");
+        final ParquetInstructions instructions = ParquetInstructions.builder()
+                .setSpecialInstructions(s3Instructions(
+                        S3Instructions.builder()
+                                .readTimeout(Duration.ofSeconds(10)))
+                        .build())
+                .setTableDefinition(definition)
+                .setBaseNameForPartitionedParquetData("data")
+                .build();
+        writeKeyValuePartitionedTable(table, uri.toString(), instructions);
+        final Table fromS3 = ParquetTools.readTable(uri.toString(), instructions);
+        assertTableEquals(table.sort("PC1", "PC2"), fromS3.sort("PC1", "PC2"));
     }
 
     @Test
@@ -196,25 +384,269 @@ public void readMetadataPartitionedParquetData()
         assertTrue(new File(destDir, "_metadata").exists());
         assertTrue(new File(destDir, "_common_metadata").exists());
         uploadDirectory(destDir.toPath(), destDirName);
+        final ParquetInstructions readInstructions = ParquetInstructions.builder()
+                .setSpecialInstructions(s3Instructions(
+                        S3Instructions.builder()
+                                .readTimeout(Duration.ofSeconds(10)))
+                        .build())
+                .build();
+        final URI directoryURI = uri(destDirName);
+        final Table fromS3MetadataPartitioned = ParquetTools.readTable(directoryURI.toString(),
+                readInstructions.withLayout(ParquetInstructions.ParquetFileLayout.METADATA_PARTITIONED));
+        final Table fromDiskMetadataPartitioned = ParquetTools.readTable(destDir.getPath(),
+                ParquetInstructions.EMPTY.withLayout(ParquetInstructions.ParquetFileLayout.METADATA_PARTITIONED));
+        readPartitionedParquetTestHelper(fromDiskMetadataPartitioned, fromS3MetadataPartitioned);
+
         final URI metadataFileURI = uri(destDirName + "/_metadata");
+        final Table fromS3WithMetadata = ParquetTools.readTable(metadataFileURI.toString(), readInstructions);
+        final Table fromDiskWithMetadata = ParquetTools.readTable(new File(destDir, "_metadata").getPath());
+        readPartitionedParquetTestHelper(fromDiskWithMetadata, fromS3WithMetadata);
+
+        final URI commonMetadataFileURI = uri(destDirName + "/_common_metadata");
+        final Table fromS3WithCommonMetadata =
+                ParquetTools.readTable(commonMetadataFileURI.toString(), readInstructions);
+        final Table fromDiskWithCommonMetadata =
+                ParquetTools.readTable(new File(destDir, "_common_metadata").getPath());
+        readPartitionedParquetTestHelper(fromDiskWithCommonMetadata, fromS3WithCommonMetadata);
+    }
+
+    private static void readPartitionedParquetTestHelper(final Table expected, final Table fromS3) {
+        assertTrue(fromS3.getDefinition().getColumn("PC1").isPartitioning());
+        assertTrue(fromS3.getDefinition().getColumn("PC2").isPartitioning());
+        assertTableEquals(expected, fromS3);
+    }
+
+    @Test
+    public void readMetadataPartitionedParquetWithMissingMetadataFile()
+            throws ExecutionException, InterruptedException, TimeoutException, IOException {
+        final TableDefinition definition = TableDefinition.of(
+                ColumnDefinition.ofInt("PC1").withPartitioning(),
+                ColumnDefinition.ofInt("PC2").withPartitioning(),
+                ColumnDefinition.ofInt("someIntColumn"),
+                ColumnDefinition.ofString("someStringColumn"));
+        final Table table = ((QueryTable) TableTools.emptyTable(500_000)
+                .updateView("PC1 = (int)(ii%3)",
+                        "PC2 = (int)(ii%2)",
+                        "someIntColumn = (int) i",
+                        "someStringColumn = String.valueOf(i)"))
+                .withDefinitionUnsafe(definition);
+        final String destDirName = "metadataPartitionedDataDir";
+        final File destDir = new File(folder.newFolder(), destDirName);
+        final ParquetInstructions writeInstructions = ParquetInstructions.builder()
+                .setBaseNameForPartitionedParquetData("data")
+                .setGenerateMetadataFiles(true)
+                .build();
+        writeKeyValuePartitionedTable(table, destDir.getPath(), writeInstructions);
+
+        // Delete the metadata file before uploading
+        final File metadataFile = new File(destDir, "_metadata");
+        metadataFile.delete();
+
+        uploadDirectory(destDir.toPath(), destDirName);
+        final URI directoryURI = uri(destDirName);
         final ParquetInstructions readInstructions = ParquetInstructions.builder()
+                .setSpecialInstructions(s3Instructions(
+                        S3Instructions.builder()
+                                .readTimeout(Duration.ofSeconds(10)))
+                        .build())
+                .build();
+        try {
+            ParquetTools.readTable(directoryURI.toString(),
+                    readInstructions.withLayout(ParquetInstructions.ParquetFileLayout.METADATA_PARTITIONED));
+            fail("Expected exception because metadata file is not present");
+        } catch (final TableDataException expected) {
+            assertTrue(expected.getMessage().contains("metadata"));
+        }
+    }
+
+    @Test
+    public void readWriteMetadataPartitionedParquetData() {
+        final TableDefinition definition = TableDefinition.of(
+                ColumnDefinition.ofInt("PC1").withPartitioning(),
+                ColumnDefinition.ofInt("PC2").withPartitioning(),
+                ColumnDefinition.ofInt("someIntColumn"),
+                ColumnDefinition.ofString("someStringColumn"));
+        final Table table = ((QueryTable) TableTools.emptyTable(500_000)
+                .updateView("PC1 = (int)(ii%3)",
+                        "PC2 = (int)(ii%2)",
+                        "someIntColumn = (int) i",
+                        "someStringColumn = String.valueOf(i)"))
+                .withDefinitionUnsafe(definition);
+        final URI uri = uri("keyValuePartitionedDataDir");
+        final ParquetInstructions instructions = ParquetInstructions.builder()
                 .setSpecialInstructions(s3Instructions(
                         S3Instructions.builder()
                                 .readTimeout(Duration.ofSeconds(10)))
                         .build())
                 .setTableDefinition(definition)
+                .setBaseNameForPartitionedParquetData("data")
+                .setGenerateMetadataFiles(true)
+                .build();
+        writeKeyValuePartitionedTable(table, uri.toString(), instructions);
+        final Table fromS3 = ParquetTools.readTable(uri.toString(), instructions.withTableDefinitionAndLayout(null,
+                ParquetInstructions.ParquetFileLayout.METADATA_PARTITIONED));
+        assertTableEquals(table.sort("PC1", "PC2"), fromS3.sort("PC1", "PC2"));
+    }
+
+    @Test
+    public void indexByLongKey() {
+        final TableDefinition definition = TableDefinition.of(
+                ColumnDefinition.ofInt("someInt"),
+                ColumnDefinition.ofLong("someLong"));
+        final Table testTable =
+                ((QueryTable) TableTools.emptyTable(10).select("someInt = i", "someLong  = ii % 3")
+                        .groupBy("someLong").ungroup("someInt")).withDefinitionUnsafe(definition);
+        DataIndexer.getOrCreateDataIndex(testTable, "someLong");
+        DataIndexer.getOrCreateDataIndex(testTable, "someInt", "someLong");
+
+        final URI uri = uri("table.parquet");
+        final ParquetInstructions instructions = ParquetInstructions.builder()
+                .setSpecialInstructions(s3Instructions(
+                        S3Instructions.builder()
+                                .readTimeout(Duration.ofSeconds(10)))
+                        .build())
                 .build();
+
+        writeTable(testTable, uri.toString(), instructions);
+        final Table fromS3 = ParquetTools.readTable(uri.toString(), instructions);
+        assertTableEquals(testTable, fromS3);
+
+        // Validate the indexes and lookup functions.
+        verifyIndexingInfoExists(fromS3, "someLong");
+        verifyIndexingInfoExists(fromS3, "someInt", "someLong");
+        verifyIndexingInfoExists(fromS3, "someLong", "someInt");
+    }
+
+    @Test
+    public void testInvalidKeysFromProfile() throws IOException {
+        final Table table = TableTools.emptyTable(5).update("someIntColumn = (int) i");
+        // Create temporary config and credentials file and write correct credentials and region to them
+        final Path tempConfigFile = Files.createTempFile("config", ".tmp");
+        final Path tempCredentialsFile = Files.createTempFile("credentials", ".tmp");
         try {
-            ParquetTools.readTable(metadataFileURI.toString(), readInstructions);
-            Assert.fail("Exception expected for unsupported metadata file read from S3");
-        } catch (UnsupportedOperationException e) {
+            final String configData = "[profile test-user]\nregion = " + region();
+            Files.write(tempConfigFile, configData.getBytes());
+            final String credentialsData = "[test-user]\naws_access_key_id = badaccesskey" +
+                    "\naws_secret_access_key = badsecretkey";
+            Files.write(tempCredentialsFile, credentialsData.getBytes());
+            final S3Instructions s3Instructions = S3Instructions.builder()
+                    .readTimeout(Duration.ofSeconds(3))
+                    .endpointOverride(s3Endpoint())
+                    .profileName("test-user")
+                    .credentialsFilePath(tempCredentialsFile.toString())
+                    .configFilePath(tempConfigFile.toString())
+                    .credentials(Credentials.profile())
+                    .build();
+            final ParquetInstructions instructions = ParquetInstructions.builder()
+                    .setSpecialInstructions(s3Instructions)
+                    .build();
+            try {
+                final URI uri = uri("table1.parquet");
+                ParquetTools.writeTable(table, uri.toString(), instructions);
+                fail("Expected exception");
+            } catch (final UncheckedDeephavenException expected) {
+            }
+        } finally {
+            // Delete the temporary files
+            Files.delete(tempConfigFile);
+            Files.delete(tempCredentialsFile);
         }
-        final URI directoryURI = uri(destDirName);
+    }
+
+    @Test
+    public void testReadWriteUsingProfile() throws IOException {
+        final Table table = TableTools.emptyTable(5).update("someIntColumn = (int) i");
+        // Create temporary config and credentials file and write correct credentials and region to them
+        final Path tempConfigFile = Files.createTempFile("config", ".tmp");
+        final Path tempCredentialsFile = Files.createTempFile("credentials", ".tmp");
         try {
-            ParquetTools.readTable(directoryURI.toString(),
-                    readInstructions.withLayout(ParquetInstructions.ParquetFileLayout.METADATA_PARTITIONED));
-            Assert.fail("Exception expected for unsupported metadata file read from S3");
-        } catch (UnsupportedOperationException e) {
+            final String configData = "[profile test-user]\nregion = " + region();
+            Files.write(tempConfigFile, configData.getBytes());
+            final String credentialsData = "[test-user]\naws_access_key_id = " + accessKey() +
+                    "\naws_secret_access_key = " + secretAccessKey();
+            Files.write(tempCredentialsFile, credentialsData.getBytes());
+
+            final S3Instructions s3Instructions = S3Instructions.builder()
+                    .readTimeout(Duration.ofSeconds(3))
+                    .endpointOverride(s3Endpoint())
+                    .profileName("test-user")
+                    .credentialsFilePath(tempCredentialsFile.toString())
+                    .configFilePath(tempConfigFile.toString())
+                    .credentials(Credentials.profile())
+                    .build();
+            final ParquetInstructions instructions = ParquetInstructions.builder()
+                    .setSpecialInstructions(s3Instructions)
+                    .build();
+            final URI uri = uri("table2.parquet");
+            ParquetTools.writeTable(table, uri.toString(), instructions);
+            final Table fromS3 = ParquetTools.readTable(uri.toString(), instructions);
+            assertTableEquals(table, fromS3);
+        } finally {
+            // Delete the temporary files
+            Files.delete(tempConfigFile);
+            Files.delete(tempCredentialsFile);
+        }
+    }
+
+    @Test
+    public void testReadBucketRootKeyValuePartitioned() {
+        final TableDefinition definition = TableDefinition.of(
+                ColumnDefinition.ofInt("PC1").withPartitioning(),
+                ColumnDefinition.ofInt("PC2").withPartitioning(),
+                ColumnDefinition.ofInt("someIntColumn"),
+                ColumnDefinition.ofString("someStringColumn"));
+        final Table table = ((QueryTable) TableTools.emptyTable(500_000)
+                .updateView("PC1 = (int)(ii%3)",
+                        "PC2 = (int)(ii%2)",
+                        "someIntColumn = (int) i",
+                        "someStringColumn = String.valueOf(i)"))
+                .withDefinitionUnsafe(definition);
+        final URI bucketRoot = URI.create(String.format("s3://%s", bucket));
+        final ParquetInstructions instructions = ParquetInstructions.builder()
+                .setSpecialInstructions(s3Instructions(
+                        S3Instructions.builder()
+                                .readTimeout(Duration.ofSeconds(10)))
+                        .build())
+                .setTableDefinition(definition)
+                .setBaseNameForPartitionedParquetData("data")
+                .build();
+        writeKeyValuePartitionedTable(table, bucketRoot.toString(), instructions);
+        {
+            final Table fromS3 = ParquetTools.readTable(bucketRoot.toString(), instructions);
+            assertTableEquals(table.sort("PC1", "PC2"), fromS3.sort("PC1", "PC2"));
+        }
+        {
+            final URI bucketRootWithSlash = URI.create(String.format("s3://%s/", bucket));
+            final Table fromS3 = ParquetTools.readTable(bucketRootWithSlash.toString(), instructions);
+            assertTableEquals(table.sort("PC1", "PC2"), fromS3.sort("PC1", "PC2"));
+        }
+    }
+
+    @Test
+    public void testReadBucketRootFlatPartitioned() {
+        final Table table = getTable(100_000);
+        final ParquetInstructions instructions = ParquetInstructions.builder()
+                .setSpecialInstructions(s3Instructions(
+                        S3Instructions.builder()
+                                .readTimeout(Duration.ofSeconds(10)))
+                        .build())
+                .build();
+        for (int i = 0; i < 3; ++i) {
+            final URI dest = uri("table" + i + ".parquet");
+            ParquetTools.writeTable(table, dest.toString(), instructions);
+        }
+
+        final URI bucketRoot = URI.create(String.format("s3://%s", bucket));
+        final Table expected = merge(table, table, table);
+        {
+            final Table fromS3AsFlat = ParquetTools.readTable(bucketRoot.toString(),
+                    instructions.withLayout(ParquetInstructions.ParquetFileLayout.FLAT_PARTITIONED));
+            assertTableEquals(expected, fromS3AsFlat);
+        }
+        {
+            final Table fromS3AsKV = ParquetTools.readTable(bucketRoot.toString(),
+                    instructions.withLayout(ParquetInstructions.ParquetFileLayout.KV_PARTITIONED));
+            assertTableEquals(expected, fromS3AsKV);
         }
     }
 }
diff --git a/extensions/parquet/table/src/test/java/io/deephaven/parquet/table/TestParquetTools.java b/extensions/parquet/table/src/test/java/io/deephaven/parquet/table/TestParquetTools.java
index 2d951a3c654..ddb1894d25a 100644
--- a/extensions/parquet/table/src/test/java/io/deephaven/parquet/table/TestParquetTools.java
+++ b/extensions/parquet/table/src/test/java/io/deephaven/parquet/table/TestParquetTools.java
@@ -3,6 +3,7 @@
 //
 package io.deephaven.parquet.table;
 
+import com.google.common.io.BaseEncoding;
 import io.deephaven.UncheckedDeephavenException;
 import io.deephaven.base.FileUtils;
 import io.deephaven.engine.context.ExecutionContext;
@@ -13,21 +14,40 @@
 import io.deephaven.engine.table.impl.UncoalescedTable;
 import io.deephaven.engine.table.impl.indexer.DataIndexer;
 import io.deephaven.engine.table.impl.locations.TableDataException;
+import io.deephaven.engine.table.impl.util.ColumnHolder;
 import io.deephaven.engine.table.vectors.ColumnVectors;
 import io.deephaven.engine.testutil.junit4.EngineCleanup;
 import io.deephaven.engine.util.TableTools;
 import io.deephaven.parquet.base.InvalidParquetFileException;
 import io.deephaven.parquet.table.layout.ParquetKeyValuePartitionedLayout;
+import io.deephaven.parquet.table.location.ParquetTableLocationKey;
+import io.deephaven.qst.type.Type;
 import io.deephaven.stringset.HashStringSet;
 import io.deephaven.stringset.StringSet;
+import io.deephaven.time.DateTimeUtils;
+import io.deephaven.util.QueryConstants;
+import io.deephaven.util.channel.SeekableChannelsProvider;
+import io.deephaven.util.channel.SeekableChannelsProviderLoader;
 import io.deephaven.vector.*;
 import junit.framework.TestCase;
+import org.apache.parquet.schema.LogicalTypeAnnotation;
+import org.apache.parquet.schema.MessageType;
+import org.apache.parquet.schema.PrimitiveType;
+import org.apache.parquet.schema.Types;
+import org.assertj.core.api.Assertions;
 import org.junit.*;
 
 import java.io.File;
 import java.io.IOException;
+import java.io.OutputStream;
 import java.lang.reflect.Proxy;
+import java.net.URI;
 import java.nio.file.Files;
+import java.nio.file.Path;
+import java.security.DigestOutputStream;
+import java.security.MessageDigest;
+import java.security.NoSuchAlgorithmException;
+import java.time.Instant;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.HashSet;
@@ -39,7 +59,9 @@
 import static io.deephaven.engine.testutil.TstUtils.assertTableEquals;
 import static io.deephaven.engine.testutil.TstUtils.tableRangesAreEqual;
 import static io.deephaven.engine.util.TableTools.*;
-import static org.junit.Assert.*;
+import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNull;
 
 /**
  * Tests for {@link ParquetTools}.
@@ -255,7 +277,7 @@ public void testWriteTableExceptions() throws IOException {
         try {
             ParquetTools.writeTable(table1, testRoot + File.separator + "unexpectedFile" + File.separator + "Table1");
             TestCase.fail("Expected exception");
-        } catch (UncheckedDeephavenException e) {
+        } catch (IllegalArgumentException e) {
             // Expected
         }
 
@@ -264,7 +286,7 @@ public void testWriteTableExceptions() throws IOException {
         try {
             ParquetTools.writeTable(table1, testRoot + File.separator + "Table1");
             TestCase.fail("Expected exception");
-        } catch (UncheckedDeephavenException e) {
+        } catch (IllegalArgumentException e) {
             // Expected
         }
         new File(testRoot + File.separator + "Nested").mkdirs();
@@ -349,7 +371,7 @@ public void testPartitionedRead() {
         final TableDefinition partitionedDefinition = TableDefinition.of(allColumns);
 
         final Table result = ParquetTools.readTable(
-                new ParquetKeyValuePartitionedLayout(testRootFile.toURI(), 2, ParquetInstructions.EMPTY),
+                ParquetKeyValuePartitionedLayout.create(testRootFile.toURI(), 2, ParquetInstructions.EMPTY, null),
                 ParquetInstructions.EMPTY);
         TestCase.assertEquals(partitionedDefinition, result.getDefinition());
         final Table expected = TableTools.merge(
@@ -527,6 +549,8 @@ private void testWriteRead(Table source, Function<Table, Table> transform) {
         assertTableEquals(transform.apply(source), transform.apply(readBack));
     }
 
+    // This method is used in a formula. Do not remove
+    @SuppressWarnings("unused")
     public static DoubleVector generateDoubles(int howMany) {
         final double[] yarr = new double[howMany];
         for (int ii = 0; ii < howMany; ii++) {
@@ -535,6 +559,8 @@ public static DoubleVector generateDoubles(int howMany) {
         return new DoubleVectorDirect(yarr);
     }
 
+    // This method is used in a formula. Do not remove
+    @SuppressWarnings("unused")
     public static FloatVector generateFloats(int howMany) {
         final float[] yarr = new float[howMany];
         for (int ii = 0; ii < howMany; ii++) {
@@ -543,6 +569,8 @@ public static FloatVector generateFloats(int howMany) {
         return new FloatVectorDirect(yarr);
     }
 
+    // This method is used in a formula. Do not remove
+    @SuppressWarnings("unused")
     public static ObjectVector<String> makeSillyStringArray(int howMany) {
         final String[] fireTruck = new String[howMany];
         for (int ii = 0; ii < howMany; ii++) {
@@ -550,4 +578,622 @@ public static ObjectVector<String> makeSillyStringArray(int howMany) {
         }
         return new ObjectVectorDirect<>(fireTruck);
     }
+
+    /**
+     * This test checks that we can read old parquet files that don't properly have dictionary page offset set, and also
+     * that we can read int96 columns with null values.
+     */
+    @Test
+    public void testNoDictionaryOffset() {
+        final Table withNullsAndMissingOffsets =
+                ParquetTools.readTable(TestParquetTools.class.getResource("/dictOffset/dh17395.parquet").getFile());
+        final Table clean = ParquetTools
+                .readTable(TestParquetTools.class.getResource("/dictOffset/dh17395_clean.parquet").getFile());
+
+        assertEquals("D2442F78-AEFB-49F7-85A0-00506BBE74D4",
+                withNullsAndMissingOffsets.getColumnSource("LISTID").get(0));
+        assertNull(withNullsAndMissingOffsets.getColumnSource("TIMESTAMP").get(0));
+        assertNull(withNullsAndMissingOffsets.getColumnSource("SETTLEMENT_DATE").get(0));
+        assertEquals(1698672050703000000L,
+                DateTimeUtils.epochNanos((Instant) withNullsAndMissingOffsets.getColumnSource("CREATE_DATE").get(0)));
+        assertTableEquals(withNullsAndMissingOffsets, clean);
+    }
+
+    @Test
+    public void testWriteParquetFieldIds() throws NoSuchAlgorithmException, IOException {
+        final int BAZ_ID = 111;
+        final int ZAP_ID = 112;
+        final String BAZ = "Baz";
+        final String ZAP = "Zap";
+        final String BAZ_PARQUET_NAME = "Some Random Parquet Column Name";
+        final String ZAP_PARQUET_NAME = "ABCDEFG";
+        final ColumnDefinition<Long> bazCol = ColumnDefinition.ofLong(BAZ);
+        final ColumnDefinition<?> zapCol = ColumnDefinition.of(ZAP, Type.stringType().arrayType());
+        final TableDefinition td = TableDefinition.of(bazCol, zapCol);
+        final Table expected = newTable(td,
+                longCol(BAZ, 99, 101),
+                new ColumnHolder<>(ZAP, String[].class, String.class, false, new String[] {"Foo", "Bar"},
+                        new String[] {"Hello"}));
+        final File file = new File(testRoot, "testWriteParquetFieldIds.parquet");
+        {
+            final ParquetInstructions writeInstructions = ParquetInstructions.builder()
+                    .setFieldId(BAZ, BAZ_ID)
+                    .setFieldId(ZAP, ZAP_ID)
+                    .addColumnNameMapping(BAZ_PARQUET_NAME, BAZ)
+                    .addColumnNameMapping(ZAP_PARQUET_NAME, ZAP)
+                    .build();
+            ParquetTools.writeTable(expected, file.getPath(), writeInstructions);
+        }
+
+        {
+            final MessageType expectedSchema = Types.buildMessage()
+                    .optional(PrimitiveType.PrimitiveTypeName.INT64)
+                    .id(BAZ_ID)
+                    .named(BAZ_PARQUET_NAME)
+                    .optionalList()
+                    .id(ZAP_ID)
+                    .optionalElement(PrimitiveType.PrimitiveTypeName.BINARY)
+                    .as(LogicalTypeAnnotation.stringType())
+                    .named(ZAP_PARQUET_NAME)
+                    .named(MappedSchema.SCHEMA_NAME);
+            final MessageType actualSchema = readSchema(file);
+            assertEquals(expectedSchema, actualSchema);
+        }
+
+        //
+        // This is somewhat fragile, but has been manually verified to contain the field_ids that we expect.
+        // We may want to consider more explicit tests that verify our writing logic is consistent, as it would be good
+        // to know whenever serialization changes in any way.
+        assertEquals("2ea68b0ddaeb432e9c2721f15460b6c42449a479c1960e836f6ebe3b14f33dc1", sha256sum(file.toPath()));
+
+        // TODO(deephaven-core#6128): Allow Parquet column access by field_id
+        // This test is a bit circular; but assuming we trust our reading code, we should have relative confidence that
+        // we are writing it down correctly if we can read it correctly.
+        // {
+        // final ParquetInstructions readInstructions = ParquetInstructions.builder()
+        // .setFieldId(BAZ, BAZ_ID)
+        // .setFieldId(ZAP, ZAP_ID)
+        // .build();
+        // {
+        // final Table actual = ParquetTools.readTable(file.getPath(), readInstructions);
+        // assertEquals(td, actual.getDefinition());
+        // assertTableEquals(expected, actual);
+        // }
+        // {
+        // final Table actual = ParquetTools.readTable(file.getPath(), readInstructions.withTableDefinition(td));
+        // assertEquals(td, actual.getDefinition());
+        // assertTableEquals(expected, actual);
+        // }
+        // }
+    }
+
+    /**
+     * This data was generated via the script:
+     *
+     * <pre>
+     * import pyarrow as pa
+     * import pyarrow.parquet as pq
+     *
+     * field_id = b"PARQUET:field_id"
+     * fields = [
+     *     pa.field(
+     *         "e0cf7927-45dc-4dfc-b4ef-36bf4b6ae463", pa.int64(), metadata={field_id: b"0"}
+     *     ),
+     *     pa.field(
+     *         "53f0de5a-e06f-476e-b82a-a3f9294fcd05", pa.string(), metadata={field_id: b"1"}
+     *     ),
+     * ]
+     * table = pa.table([[99, 101], ["Foo", "Bar"]], schema=pa.schema(fields))
+     * pq.write_table(table, "ReferenceSimpleParquetFieldIds.parquet")
+     * </pre>
+     *
+     * @see <a href="https://arrow.apache.org/docs/cpp/parquet.html#parquet-field-id">Arrow Parquet field_id</a>
+     */
+    @Ignore("TODO(deephaven-core#6128): Allow Parquet column access by field_id")
+    @Test
+    public void testParquetFieldIds() {
+        final String file = TestParquetTools.class.getResource("/ReferenceSimpleParquetFieldIds.parquet").getFile();
+
+        // No instructions; will sanitize the names. Both columns get the "-" removed and the second column gets the
+        // "column_" prefix added because it starts with a digit.
+        {
+            final TableDefinition expectedInferredTD = TableDefinition.of(
+                    ColumnDefinition.ofLong("e0cf792745dc4dfcb4ef36bf4b6ae463"),
+                    ColumnDefinition.ofString("column_53f0de5ae06f476eb82aa3f9294fcd05"));
+            final Table table = ParquetTools.readTable(file);
+            assertEquals(expectedInferredTD, table.getDefinition());
+            assertTableEquals(newTable(expectedInferredTD,
+                    longCol("e0cf792745dc4dfcb4ef36bf4b6ae463", 99, 101),
+                    stringCol("column_53f0de5ae06f476eb82aa3f9294fcd05", "Foo", "Bar")), table);
+        }
+
+        final int BAZ_ID = 0;
+        final int ZAP_ID = 1;
+        final String BAZ = "Baz";
+        final String ZAP = "Zap";
+        final ColumnDefinition<Long> bazCol = ColumnDefinition.ofLong(BAZ);
+        final ColumnDefinition<String> zapCol = ColumnDefinition.ofString(ZAP);
+
+        final ParquetInstructions instructions = ParquetInstructions.builder()
+                .setFieldId(BAZ, BAZ_ID)
+                .setFieldId(ZAP, ZAP_ID)
+                .build();
+
+        final TableDefinition td = TableDefinition.of(bazCol, zapCol);
+
+        // It's enough to just provide the mapping based on field_id
+        {
+            final Table table = ParquetTools.readTable(file, instructions);
+            assertEquals(td, table.getDefinition());
+            assertTableEquals(newTable(td,
+                    longCol(BAZ, 99, 101),
+                    stringCol(ZAP, "Foo", "Bar")), table);
+        }
+
+        // But, the user can still provide a TableDefinition
+        {
+            final Table table = ParquetTools.readTable(file, instructions.withTableDefinition(td));
+            assertEquals(td, table.getDefinition());
+            assertTableEquals(newTable(td,
+                    longCol(BAZ, 99, 101),
+                    stringCol(ZAP, "Foo", "Bar")), table);
+        }
+
+        // The user can provide the full mapping, but still a more limited definition
+        {
+            final TableDefinition justIdTD = TableDefinition.of(bazCol);
+            final Table table = ParquetTools.readTable(file, instructions.withTableDefinition(justIdTD));
+            assertEquals(justIdTD, table.getDefinition());
+            assertTableEquals(newTable(justIdTD,
+                    longCol(BAZ, 99, 101)), table);
+        }
+
+        // If only a partial id mapping is provided, only that will be "properly" mapped
+        {
+            final TableDefinition partialTD = TableDefinition.of(
+                    ColumnDefinition.ofLong(BAZ),
+                    ColumnDefinition.ofString("column_53f0de5ae06f476eb82aa3f9294fcd05"));
+            final ParquetInstructions partialInstructions = ParquetInstructions.builder()
+                    .setFieldId(BAZ, BAZ_ID)
+                    .build();
+            final Table table = ParquetTools.readTable(file, partialInstructions);
+            assertEquals(partialTD, table.getDefinition());
+        }
+
+        // There are no errors if a field ID is configured but not found; it won't be inferred.
+        {
+            final Table table = ParquetTools.readTable(file, ParquetInstructions.builder()
+                    .setFieldId(BAZ, BAZ_ID)
+                    .setFieldId(ZAP, ZAP_ID)
+                    .setFieldId("Fake", 99)
+                    .build());
+            assertEquals(td, table.getDefinition());
+            assertTableEquals(newTable(td,
+                    longCol(BAZ, 99, 101),
+                    stringCol(ZAP, "Foo", "Bar")), table);
+        }
+
+        // If it's explicitly asked for, like other columns, it will return an appropriate null value
+        {
+            final TableDefinition tdWithFake =
+                    TableDefinition.of(bazCol, zapCol, ColumnDefinition.ofShort("Fake"));
+            final Table table = ParquetTools.readTable(file, ParquetInstructions.builder()
+                    .setFieldId(BAZ, BAZ_ID)
+                    .setFieldId(ZAP, ZAP_ID)
+                    .setFieldId("Fake", 99)
+                    .build()
+                    .withTableDefinition(tdWithFake));
+            assertEquals(tdWithFake, table.getDefinition());
+            assertTableEquals(newTable(tdWithFake,
+                    longCol(BAZ, 99, 101),
+                    stringCol(ZAP, "Foo", "Bar"),
+                    shortCol("Fake", QueryConstants.NULL_SHORT, QueryConstants.NULL_SHORT)), table);
+        }
+
+        // You can even re-use IDs to get the same physical column out multiple times
+        {
+            final String BAZ_DUPE = "BazDupe";
+            final TableDefinition dupeTd =
+                    TableDefinition.of(bazCol, zapCol, ColumnDefinition.ofLong(BAZ_DUPE));
+            final ParquetInstructions dupeInstructions = ParquetInstructions.builder()
+                    .setFieldId(BAZ, BAZ_ID)
+                    .setFieldId(ZAP, ZAP_ID)
+                    .setFieldId(BAZ_DUPE, BAZ_ID)
+                    .build();
+            {
+                final Table table = ParquetTools.readTable(file, dupeInstructions.withTableDefinition(dupeTd));
+                assertEquals(dupeTd, table.getDefinition());
+                assertTableEquals(newTable(dupeTd,
+                        longCol(BAZ, 99, 101),
+                        stringCol(ZAP, "Foo", "Bar"),
+                        longCol(BAZ_DUPE, 99, 101)), table);
+            }
+
+            // In the case where we have dupe field IDs and don't provide an explicit definition, we are preferring to
+            // fail during the inference step
+            {
+                try {
+                    ParquetTools.readTable(file, dupeInstructions);
+                    Assertions.failBecauseExceptionWasNotThrown(IllegalArgumentException.class);
+                } catch (IllegalArgumentException e) {
+                    Assertions.assertThat(e).hasMessageContaining("Non-unique Field ID mapping provided");
+                }
+            }
+        }
+
+        // If both a field id and parquet column name mapping is provided, they need to map to the same parquet column.
+        {
+            final TableDefinition bazTd = TableDefinition.of(bazCol);
+            final ParquetInstructions inconsistent = ParquetInstructions.builder()
+                    .setFieldId(BAZ, BAZ_ID)
+                    .addColumnNameMapping("53f0de5a-e06f-476e-b82a-a3f9294fcd05", BAZ)
+                    .build();
+            // In the case where we are inferring the TableDefinition from parquet schema, the inconsistency will be
+            // noticed up front
+            try {
+                ParquetTools.readTable(file, inconsistent);
+                Assertions.failBecauseExceptionWasNotThrown(IllegalArgumentException.class);
+            } catch (IllegalArgumentException e) {
+                Assertions.assertThat(e)
+                        .hasMessageContaining("Supplied ColumnDefinitions include duplicate names [Baz]");
+            }
+            // In the case where we provide a TableDefinition, the inconsistency will be noticed when reading the
+            // data
+            try {
+                // Need to force read of data
+                ParquetTools.readTable(file, inconsistent.withTableDefinition(bazTd)).select();
+                Assertions.failBecauseExceptionWasNotThrown(TableDataException.class);
+            } catch (TableDataException e) {
+                Assertions.assertThat(e).getRootCause().hasMessageContaining(
+                        "For columnName=Baz, providing an explicit parquet column name path ([53f0de5a-e06f-476e-b82a-a3f9294fcd05]) and field id (0) mapping, but they are resolving to different columns, byFieldId=[colIx=0, pathKey=[e0cf7927-45dc-4dfc-b4ef-36bf4b6ae463], fieldId=0], byPath=[colIx=1, pathKey=[53f0de5a-e06f-476e-b82a-a3f9294fcd05], fieldId=1]");
+            }
+        }
+    }
+
+    /**
+     * This data was generated via the script:
+     *
+     * <pre>
+     * import uuid
+     * import pyarrow as pa
+     * import pyarrow.parquet as pq
+     *
+     *
+     * def write_to(path: str):
+     *     field_id = b"PARQUET:field_id"
+     *     fields = [
+     *         pa.field(str(uuid.uuid4()), pa.int64(), metadata={field_id: b"42"}),
+     *         pa.field(str(uuid.uuid4()), pa.string(), metadata={field_id: b"43"}),
+     *     ]
+     *     table = pa.table([[] for _ in fields], schema=pa.schema(fields))
+     *     pq.write_table(table, path)
+     *
+     *
+     * write_to("/ReferencePartitionedFieldIds/Partition=0/table.parquet")
+     * write_to("/ReferencePartitionedFieldIds/Partition=1/table.parquet")
+     * </pre>
+     *
+     * It mimics the case of a higher-level schema management where the physical column names may be random.
+     *
+     * @see <a href="https://arrow.apache.org/docs/cpp/parquet.html#parquet-field-id">Arrow Parquet field_id</a>
+     */
+    @Ignore("TODO(deephaven-core#6128): Allow Parquet column access by field_id")
+    @Test
+    public void testPartitionedParquetFieldIds() {
+        final String file = TestParquetTools.class.getResource("/ReferencePartitionedFieldIds").getFile();
+
+        final int BAZ_ID = 42;
+        final int ZAP_ID = 43;
+        final String BAZ = "Baz";
+        final String ZAP = "Zap";
+        final String PARTITION = "Partition";
+        final ColumnDefinition<Integer> partitionColumn = ColumnDefinition.ofInt(PARTITION).withPartitioning();
+        final ColumnDefinition<Long> bazCol = ColumnDefinition.ofLong(BAZ);
+        final ColumnDefinition<String> zapCol = ColumnDefinition.ofString(ZAP);
+        final ParquetInstructions instructions = ParquetInstructions.builder()
+                .setFieldId(BAZ, BAZ_ID)
+                .setFieldId(ZAP, ZAP_ID)
+                .build();
+
+        final TableDefinition expectedTd = TableDefinition.of(partitionColumn, bazCol, zapCol);
+
+        final Table expected = newTable(expectedTd,
+                intCol(PARTITION, 0, 0, 1, 1),
+                longCol(BAZ, 99, 101, 99, 101),
+                stringCol(ZAP, "Foo", "Bar", "Foo", "Bar"));
+
+        {
+            final Table actual = ParquetTools.readTable(file, instructions);
+            assertEquals(expectedTd, actual.getDefinition());
+            assertTableEquals(expected, actual);
+        }
+
+        {
+            final Table actual = ParquetTools.readTable(file, instructions.withTableDefinition(expectedTd));
+            assertEquals(expectedTd, actual.getDefinition());
+            assertTableEquals(expected, actual);
+        }
+    }
+
+    /**
+     * This data was generated via the script:
+     *
+     * <pre>
+     * import pyarrow as pa
+     * import pyarrow.parquet as pq
+     *
+     * field_id = b"PARQUET:field_id"
+     * schema = pa.schema(
+     *     [pa.field("some random name", pa.list_(pa.int32()), metadata={field_id: b"999"})]
+     * )
+     * data = [pa.array([[1, 2, 3], None, [], [42]], type=pa.list_(pa.int32()))]
+     * table = pa.Table.from_arrays(data, schema=schema)
+     * pq.write_table(table, "ReferenceListParquetFieldIds.parquet")
+     * </pre>
+     *
+     * @see <a href="https://arrow.apache.org/docs/cpp/parquet.html#parquet-field-id">Arrow Parquet field_id</a>
+     */
+    @Ignore("TODO(deephaven-core#6128): Allow Parquet column access by field_id")
+    @Test
+    public void testParquetFieldIdsWithListType() {
+        final String file = TestParquetTools.class.getResource("/ReferenceListParquetFieldIds.parquet").getFile();
+        final String FOO = "Foo";
+        final TableDefinition td = TableDefinition.of(ColumnDefinition.of(FOO, Type.intType().arrayType()));
+        final ParquetInstructions instructions = ParquetInstructions.builder()
+                .setFieldId(FOO, 999)
+                .build();
+        final Table expected = TableTools.newTable(td, new ColumnHolder<>(FOO, int[].class, int.class, false,
+                new int[] {1, 2, 3},
+                null,
+                new int[0],
+                new int[] {42}));
+        {
+            final Table actual = ParquetTools.readTable(file, instructions);
+            assertEquals(td, actual.getDefinition());
+            assertTableEquals(expected, actual);
+        }
+        {
+            final Table actual = ParquetTools.readTable(file, instructions.withTableDefinition(td));
+            assertEquals(td, actual.getDefinition());
+            assertTableEquals(expected, actual);
+        }
+    }
+
+    /**
+     * This is meant to test a "common" renaming scenario. Originally, a schema might be written down with a column
+     * named "Name" where semantically, this was really a first name. Later, the schema might be "corrected" to label
+     * this column as "FirstName". Both standalone, and in combination with the newer file, we should be able to read it
+     * with the latest schema.
+     */
+    @Ignore("TODO(deephaven-core#6128): Allow Parquet column access by field_id")
+    @Test
+    public void testRenamingResolveViaFieldId() {
+        final File f1 = new File(testRoot, "testRenamingResolveViaFieldId.00.parquet");
+        final File f2 = new File(testRoot, "testRenamingResolveViaFieldId.01.parquet");
+
+        final int FIRST_NAME_ID = 15;
+        {
+            final String NAME = "Name";
+            final Table t1 = newTable(TableDefinition.of(ColumnDefinition.ofString(NAME)),
+                    stringCol(NAME, "Shivam", "Ryan"));
+            ParquetTools.writeTable(t1, f1.getPath(), ParquetInstructions.builder()
+                    .setFieldId(NAME, FIRST_NAME_ID)
+                    .build());
+        }
+
+        final int LAST_NAME_ID = 16;
+        final String FIRST_NAME = "FirstName";
+        final String LAST_NAME = "LastName";
+        final TableDefinition td = TableDefinition.of(
+                ColumnDefinition.ofString(FIRST_NAME),
+                ColumnDefinition.ofString(LAST_NAME));
+        final ParquetInstructions instructions = ParquetInstructions.builder()
+                .setFieldId(FIRST_NAME, FIRST_NAME_ID)
+                .setFieldId(LAST_NAME, LAST_NAME_ID)
+                .build();
+        {
+            final Table t = newTable(td,
+                    stringCol(FIRST_NAME, "Pete", "Colin"),
+                    stringCol(LAST_NAME, "Goddard", "Alworth"));
+            ParquetTools.writeTable(t, f2.getPath(), instructions);
+        }
+
+        // If we read first file without an explicit definition, we should only get the column from the file
+        {
+            final TableDefinition expectedTd = TableDefinition.of(ColumnDefinition.ofString(FIRST_NAME));
+            final Table expected = newTable(expectedTd, stringCol(FIRST_NAME, "Shivam", "Ryan"));
+            final Table actual = ParquetTools.readTable(f1.getPath(), instructions);
+            assertEquals(expectedTd, actual.getDefinition());
+            assertTableEquals(expected, actual);
+        }
+
+        // If we read first file with an explicit definition, the new column should return nulls
+        {
+            final Table expected = newTable(td,
+                    stringCol(FIRST_NAME, "Shivam", "Ryan"),
+                    stringCol(LAST_NAME, null, null));
+            final Table actual = ParquetTools.readTable(f1.getPath(), instructions.withTableDefinition(td));
+            assertEquals(td, actual.getDefinition());
+            assertTableEquals(expected, actual);
+        }
+
+        // We should be able to read both (flat partitioning) with the latest schema
+        {
+            final Table expected = newTable(td,
+                    stringCol(FIRST_NAME, "Shivam", "Ryan", "Pete", "Colin"),
+                    stringCol(LAST_NAME, null, null, "Goddard", "Alworth"));
+            {
+                final Table actual = ParquetTools.readTable(testRoot, instructions);
+                assertEquals(td, actual.getDefinition());
+                assertTableEquals(expected, actual);
+            }
+            {
+                final Table actual = ParquetTools.readTable(testRoot, instructions.withTableDefinition(td));
+                assertEquals(td, actual.getDefinition());
+                assertTableEquals(expected, actual);
+            }
+        }
+    }
+
+
+    @Test
+    public void parquetWithNonUniqueFieldIds() {
+        final File f = new File(testRoot, "parquetWithNonUniqueFieldIds.parquet");
+        final String FOO = "Foo";
+        final String BAR = "Bar";
+        final int fieldId = 31337;
+        final ParquetInstructions instructions = ParquetInstructions.builder()
+                .setFieldId(FOO, fieldId)
+                .setFieldId(BAR, fieldId)
+                .build();
+        final TableDefinition td = TableDefinition.of(ColumnDefinition.ofInt(FOO), ColumnDefinition.ofString(BAR));
+        final Table expected = newTable(td,
+                intCol(FOO, 44, 45),
+                stringCol(BAR, "Zip", "Zap"));
+        {
+            ParquetTools.writeTable(expected, f.getPath(), instructions);
+        }
+
+        {
+            final String BAZ = "Baz";
+            final ParquetInstructions bazInstructions = ParquetInstructions.builder()
+                    .setFieldId(BAZ, fieldId)
+                    .build();
+
+            // fieldId _won't_ be used to actually create a Baz column since the underlying file has multiple. In this
+            // case, we just infer the physical parquet column names.
+            {
+
+                final Table actual = ParquetTools.readTable(f.getPath(), bazInstructions);
+                assertEquals(td, actual.getDefinition());
+                assertTableEquals(expected, actual);
+            }
+
+            // If the user explicitly asks for a definition with a mapping to a non-unique field id, they will get back
+            // the column of default (null) values.
+            {
+                final TableDefinition bazTd = TableDefinition.of(ColumnDefinition.ofInt(BAZ));
+                final Table bazTable = newTable(bazTd, intCol(BAZ, QueryConstants.NULL_INT, QueryConstants.NULL_INT));
+                final Table actual = ParquetTools.readTable(f.getPath(), bazInstructions.withTableDefinition(bazTd));
+                assertEquals(bazTd, actual.getDefinition());
+                assertTableEquals(bazTable, actual);
+            }
+        }
+    }
+
+    /**
+     * <pre>
+     * import pyarrow as pa
+     * import pyarrow.parquet as pq
+     *
+     * fields = [
+     *     pa.field("Foo", pa.int64()),
+     *     pa.field(
+     *         "MyStruct",
+     *         pa.struct(
+     *             [
+     *                 pa.field("Zip", pa.int16()),
+     *                 pa.field("Zap", pa.int32()),
+     *             ]
+     *         ),
+     *     ),
+     *     pa.field("Bar", pa.string()),
+     * ]
+     *
+     * table = pa.table([[] for _ in fields], schema=pa.schema(fields))
+     * pq.write_table(table, "NestedStruct1.parquet", compression="none")
+     * </pre>
+     */
+    @Test
+    public void nestedMessageEmpty() {
+        final String file = TestParquetTools.class.getResource("/NestedStruct1.parquet").getFile();
+        final TableDefinition expectedTd =
+                TableDefinition.of(ColumnDefinition.ofLong("Foo"), ColumnDefinition.ofString("Bar"));
+        final Table table = TableTools.newTable(expectedTd, longCol("Foo"), stringCol("Bar"));
+        // If we use an explicit definition, we can skip over MyStruct and read Foo, Bar
+        {
+            final Table actual =
+                    ParquetTools.readTable(file, ParquetInstructions.EMPTY.withTableDefinition(expectedTd));
+            assertEquals(expectedTd, actual.getDefinition());
+            assertTableEquals(table, actual);
+        }
+
+        // If we try to infer, we currently throw an error.
+        // TODO(deephaven-core#871): Parquet: Support repetition level >1 and multi-column fields
+        try {
+            ParquetTools.readTable(file);
+            Assertions.failBecauseExceptionWasNotThrown(UnsupportedOperationException.class);
+        } catch (UnsupportedOperationException e) {
+            Assertions.assertThat(e)
+                    .hasMessageContaining("Encountered unsupported multi-column field MyStruct");
+        }
+    }
+
+    /**
+     * <pre>
+     * import pyarrow as pa
+     * import pyarrow.parquet as pq
+     *
+     * fields = [
+     *     pa.field("Foo", pa.int64()),
+     *     pa.field(
+     *         "MyStruct",
+     *         pa.struct(
+     *             [
+     *                 pa.field("Zip", pa.int16()),
+     *                 pa.field("Zap", pa.int32()),
+     *             ]
+     *         ),
+     *     ),
+     *     pa.field("Bar", pa.string()),
+     * ]
+     *
+     * table = pa.table([[None] for _ in fields], schema=pa.schema(fields))
+     * pq.write_table(table, "NestedStruct2.parquet", compression="none")
+     * </pre>
+     */
+    @Test
+    public void nestedMessage1Row() {
+        final String file = TestParquetTools.class.getResource("/NestedStruct2.parquet").getFile();
+        final TableDefinition expectedTd =
+                TableDefinition.of(ColumnDefinition.ofLong("Foo"), ColumnDefinition.ofString("Bar"));
+        final Table table = TableTools.newTable(expectedTd, longCol("Foo", QueryConstants.NULL_LONG),
+                stringCol("Bar", (String) null));
+        // If we use an explicit definition, we can skip over MyStruct and read Foo, Bar
+        {
+            final Table actual =
+                    ParquetTools.readTable(file, ParquetInstructions.EMPTY.withTableDefinition(expectedTd));
+            assertEquals(expectedTd, actual.getDefinition());
+            assertTableEquals(table, actual);
+        }
+
+        // If we try to infer, we currently throw an error.
+        // TODO(deephaven-core#871): Parquet: Support repetition level >1 and multi-column fields
+        try {
+            ParquetTools.readTable(file);
+            Assertions.failBecauseExceptionWasNotThrown(UnsupportedOperationException.class);
+        } catch (UnsupportedOperationException e) {
+            Assertions.assertThat(e)
+                    .hasMessageContaining("Encountered unsupported multi-column field MyStruct");
+        }
+    }
+
+    private static String sha256sum(Path path) throws NoSuchAlgorithmException, IOException {
+        final MessageDigest digest = MessageDigest.getInstance("SHA-256");
+        final DigestOutputStream out = new DigestOutputStream(OutputStream.nullOutputStream(), digest);
+        Files.copy(path, out);
+        return BaseEncoding.base16().lowerCase().encode(digest.digest());
+    }
+
+    private static MessageType readSchema(File file) {
+        final URI uri = FileUtils.convertToURI(file, false);
+        try (final SeekableChannelsProvider channelsProvider =
+                SeekableChannelsProviderLoader.getInstance().load(FileUtils.FILE_URI_SCHEME, null)) {
+            final ParquetTableLocationKey locationKey = new ParquetTableLocationKey(uri, 0, null, channelsProvider);
+            // TODO: which is more appropriate?
+            // locationKey.getFileReader().getSchema();
+            // locationKey.getMetadata().getFileMetaData().getSchema();
+            return locationKey.getFileReader().getSchema();
+        }
+    }
 }
diff --git a/extensions/parquet/table/src/test/resources/NestedStruct1.parquet b/extensions/parquet/table/src/test/resources/NestedStruct1.parquet
new file mode 100644
index 00000000000..d592f378b92
--- /dev/null
+++ b/extensions/parquet/table/src/test/resources/NestedStruct1.parquet
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:d3b0b28c657e8991f0ffa48aedb68f23d1a746da8ddeaa473dbee82a3f80c66c
+size 1019
diff --git a/extensions/parquet/table/src/test/resources/NestedStruct2.parquet b/extensions/parquet/table/src/test/resources/NestedStruct2.parquet
new file mode 100644
index 00000000000..f8cee910583
--- /dev/null
+++ b/extensions/parquet/table/src/test/resources/NestedStruct2.parquet
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:a6ea5e3b9a2d5907adf6ecc3909a6491a62e78c0ae7ca9516f96ad9d4db3432d
+size 1237
diff --git a/extensions/parquet/table/src/test/resources/ReferenceDecimalLogicalType.parquet b/extensions/parquet/table/src/test/resources/ReferenceDecimalLogicalType.parquet
index f6cb4cf8507..b64f1f8c01b 100644
--- a/extensions/parquet/table/src/test/resources/ReferenceDecimalLogicalType.parquet
+++ b/extensions/parquet/table/src/test/resources/ReferenceDecimalLogicalType.parquet
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:e559539ce712961badc6f4af7586f02f281c7164b762ca39bacef962ad70c203
-size 891184
+oid sha256:d4c3cab569de5ba8e8a7648f5047f6e5ba8f2360dd85fe1dc175f1baa95955cc
+size 800150
diff --git a/extensions/parquet/table/src/test/resources/ReferenceDecimalLogicalType2.parquet b/extensions/parquet/table/src/test/resources/ReferenceDecimalLogicalType2.parquet
index e9aa389d375..47b9cbf3093 100644
--- a/extensions/parquet/table/src/test/resources/ReferenceDecimalLogicalType2.parquet
+++ b/extensions/parquet/table/src/test/resources/ReferenceDecimalLogicalType2.parquet
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:6b37b67a9b5aa942e23bec6fa9c9db3d1af847626c0a5f0d2c3e6d0c45cd53cd
-size 1249011
+oid sha256:81d82b705cec5c7c0c9ac2c4681c5ed857b8dd8f8260d8557eff347cfab74b9a
+size 1128004
diff --git a/extensions/parquet/table/src/test/resources/ReferenceListParquetFieldIds.parquet b/extensions/parquet/table/src/test/resources/ReferenceListParquetFieldIds.parquet
new file mode 100644
index 00000000000..72ebdb26baa
--- /dev/null
+++ b/extensions/parquet/table/src/test/resources/ReferenceListParquetFieldIds.parquet
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:037307d886a9eade2dca4982917eec86516686fdb2d33b66ec9e8724ee59aeb0
+size 843
diff --git a/extensions/parquet/table/src/test/resources/ReferenceNullStringDictEncoded1.parquet b/extensions/parquet/table/src/test/resources/ReferenceNullStringDictEncoded1.parquet
new file mode 100644
index 00000000000..e01037545de
--- /dev/null
+++ b/extensions/parquet/table/src/test/resources/ReferenceNullStringDictEncoded1.parquet
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:f736ad4bce9fb4e6433ed6a4bb58b5a1a2b1b967383e6bb630340c705e0a7612
+size 8734
diff --git a/extensions/parquet/table/src/test/resources/ReferenceNullStringDictEncoded2.parquet b/extensions/parquet/table/src/test/resources/ReferenceNullStringDictEncoded2.parquet
new file mode 100644
index 00000000000..eb40644f2b7
--- /dev/null
+++ b/extensions/parquet/table/src/test/resources/ReferenceNullStringDictEncoded2.parquet
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:3f5cf40486008b9b0dab8feffa3a2df40db17119431845e2e4dd7f5e24416dac
+size 8777
diff --git a/extensions/parquet/table/src/test/resources/ReferenceParquetWithCodecData.parquet b/extensions/parquet/table/src/test/resources/ReferenceParquetWithCodecData.parquet
new file mode 100644
index 00000000000..dc8de747fe5
--- /dev/null
+++ b/extensions/parquet/table/src/test/resources/ReferenceParquetWithCodecData.parquet
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:9eb021d46a7c13f07fe855a9b3644109e6030e4ec4eb136e65d7965ee25f150b
+size 487055
diff --git a/extensions/parquet/table/src/test/resources/ReferenceParquetWithEmptyRowGroup1.parquet b/extensions/parquet/table/src/test/resources/ReferenceParquetWithEmptyRowGroup1.parquet
new file mode 100644
index 00000000000..11c4bc2ce8c
--- /dev/null
+++ b/extensions/parquet/table/src/test/resources/ReferenceParquetWithEmptyRowGroup1.parquet
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:44d4d437881c25c71de1e1d2dccc1727cef00871defce35bd68c81f22cba6d25
+size 553
diff --git a/extensions/parquet/table/src/test/resources/ReferenceParquetWithEmptyRowGroup2.parquet b/extensions/parquet/table/src/test/resources/ReferenceParquetWithEmptyRowGroup2.parquet
new file mode 100644
index 00000000000..2ce0097288d
--- /dev/null
+++ b/extensions/parquet/table/src/test/resources/ReferenceParquetWithEmptyRowGroup2.parquet
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:0d13c8bb7cb58dba15328674290eb12ae559aae5d175dd33f9a769137acb9f31
+size 489
diff --git a/extensions/parquet/table/src/test/resources/ReferenceParquetWithRowsetCodecData.parquet b/extensions/parquet/table/src/test/resources/ReferenceParquetWithRowsetCodecData.parquet
new file mode 100644
index 00000000000..d2f49db0d41
--- /dev/null
+++ b/extensions/parquet/table/src/test/resources/ReferenceParquetWithRowsetCodecData.parquet
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:8d03203101a9ba55022f7c1c42288f3c20c771473904f315ad25f09fb45c023c
+size 4588
diff --git a/extensions/parquet/table/src/test/resources/ReferencePartitionedFieldIds/Partition=0/table.parquet b/extensions/parquet/table/src/test/resources/ReferencePartitionedFieldIds/Partition=0/table.parquet
new file mode 100644
index 00000000000..5a20bee6eeb
--- /dev/null
+++ b/extensions/parquet/table/src/test/resources/ReferencePartitionedFieldIds/Partition=0/table.parquet
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:6f7c9501d597752d7295cd7b5f098336df5c67a341cceb583f661f2d0ac6d265
+size 1323
diff --git a/extensions/parquet/table/src/test/resources/ReferencePartitionedFieldIds/Partition=1/table.parquet b/extensions/parquet/table/src/test/resources/ReferencePartitionedFieldIds/Partition=1/table.parquet
new file mode 100644
index 00000000000..b31a2c3ee60
--- /dev/null
+++ b/extensions/parquet/table/src/test/resources/ReferencePartitionedFieldIds/Partition=1/table.parquet
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:61fa98e653bb6d913c4828a53d92977d3c443796e616996d3fcec76821d89b92
+size 1323
diff --git a/extensions/parquet/table/src/test/resources/ReferenceSimpleParquetFieldIds.parquet b/extensions/parquet/table/src/test/resources/ReferenceSimpleParquetFieldIds.parquet
new file mode 100644
index 00000000000..4fa8b5ebdb2
--- /dev/null
+++ b/extensions/parquet/table/src/test/resources/ReferenceSimpleParquetFieldIds.parquet
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:439904cfa5209c40a7c0c75c38e0835d7ce7af79a850ab270216dfff833ec0a8
+size 1315
diff --git a/extensions/parquet/table/src/test/resources/datasetWithEmptyRowgroups/file1.parquet b/extensions/parquet/table/src/test/resources/datasetWithEmptyRowgroups/file1.parquet
new file mode 100644
index 00000000000..2b3343ecf6f
--- /dev/null
+++ b/extensions/parquet/table/src/test/resources/datasetWithEmptyRowgroups/file1.parquet
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:5cbf99224de156d82106cc716affbc9bf156a95697de545112f86dfd6be56a4b
+size 11443200
diff --git a/extensions/parquet/table/src/test/resources/datasetWithEmptyRowgroups/file2.parquet b/extensions/parquet/table/src/test/resources/datasetWithEmptyRowgroups/file2.parquet
new file mode 100644
index 00000000000..11c4bc2ce8c
--- /dev/null
+++ b/extensions/parquet/table/src/test/resources/datasetWithEmptyRowgroups/file2.parquet
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:44d4d437881c25c71de1e1d2dccc1727cef00871defce35bd68c81f22cba6d25
+size 553
diff --git a/extensions/parquet/table/src/test/resources/datasetWithEmptyRowgroups/file3.parquet b/extensions/parquet/table/src/test/resources/datasetWithEmptyRowgroups/file3.parquet
new file mode 100644
index 00000000000..2b3343ecf6f
--- /dev/null
+++ b/extensions/parquet/table/src/test/resources/datasetWithEmptyRowgroups/file3.parquet
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:5cbf99224de156d82106cc716affbc9bf156a95697de545112f86dfd6be56a4b
+size 11443200
diff --git a/extensions/parquet/table/src/test/resources/dictOffset/dh17395.parquet b/extensions/parquet/table/src/test/resources/dictOffset/dh17395.parquet
new file mode 100644
index 00000000000..163acf8ab44
--- /dev/null
+++ b/extensions/parquet/table/src/test/resources/dictOffset/dh17395.parquet
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:9d24ba27e14918c1fd9d7e8e822c0a79a4c92b7bbd46b9645cc4d06e8b85bc09
+size 1504
diff --git a/extensions/parquet/table/src/test/resources/dictOffset/dh17395_clean.parquet b/extensions/parquet/table/src/test/resources/dictOffset/dh17395_clean.parquet
new file mode 100644
index 00000000000..23734a5662a
--- /dev/null
+++ b/extensions/parquet/table/src/test/resources/dictOffset/dh17395_clean.parquet
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:17f923985b2e6f431ebbb23bf315b201dac38f67ad304e8386758b93d2e231d8
+size 934
diff --git a/extensions/performance/build.gradle b/extensions/performance/build.gradle
index 087183810f8..2ef90d557e5 100644
--- a/extensions/performance/build.gradle
+++ b/extensions/performance/build.gradle
@@ -7,6 +7,7 @@ dependencies {
     implementation project(':DHProcess')
     implementation project(':engine-table')
     implementation project(':Plot')
-    Classpaths.inheritAutoService(project)
-    Classpaths.inheritGroovy(project, 'groovy', 'implementation')
+    compileOnly libs.autoservice
+    annotationProcessor libs.autoservice.compiler
+    implementation libs.groovy
 }
\ No newline at end of file
diff --git a/extensions/protobuf/build.gradle b/extensions/protobuf/build.gradle
index 50755880755..96e53642c9d 100644
--- a/extensions/protobuf/build.gradle
+++ b/extensions/protobuf/build.gradle
@@ -7,26 +7,29 @@ plugins {
 dependencies {
     api project(':qst-type')
     api project(':util-function')
-    api 'com.google.protobuf:protobuf-java:3.25.3'
+    api libs.protobuf.java
     implementation project(':engine-query-constants')
+    implementation project(':engine-time')
 
-    Classpaths.inheritImmutables(project)
+    compileOnly project(':util-immutables')
+    annotationProcessor libs.immutables.value
 
-    compileOnly depAnnotations
+    compileOnly libs.jetbrains.annotations
 
-    Classpaths.inheritJUnitPlatform(project)
-    Classpaths.inheritAssertJ(project)
+    testImplementation libs.assertj
 
-    testImplementation 'org.junit.jupiter:junit-jupiter'
-    testRuntimeOnly 'org.junit.jupiter:junit-jupiter-engine'
-    testRuntimeOnly 'org.junit.platform:junit-platform-launcher'
+    testImplementation platform(libs.junit.bom)
+    testImplementation libs.junit.jupiter
+    testRuntimeOnly libs.junit.jupiter.engine
+    testRuntimeOnly libs.junit.platform.launcher
 
     testRuntimeOnly project(':log-to-slf4j')
     testRuntimeOnly project(':configs')
     testRuntimeOnly project(':test-configs')
-    Classpaths.inheritSlf4j(project, 'slf4j-simple', 'testRuntimeOnly')
+    testRuntimeOnly libs.slf4j.simple
 
-    Classpaths.inheritAutoService(project, true)
+    testCompileOnly libs.autoservice
+    testAnnotationProcessor libs.autoservice.compiler
 }
 
 test {
@@ -43,6 +46,6 @@ spotless {
 
 protobuf {
     protoc {
-        artifact = 'com.google.protobuf:protoc:3.25.3'
+        artifact = "com.google.protobuf:protoc:${libs.versions.protobuf.get()}"
     }
 }
diff --git a/extensions/kafka/src/main/java/io/deephaven/kafka/ToChunkTypeTransform.java b/extensions/protobuf/src/main/java/io/deephaven/function/ToChunkTypeTransform.java
similarity index 89%
rename from extensions/kafka/src/main/java/io/deephaven/kafka/ToChunkTypeTransform.java
rename to extensions/protobuf/src/main/java/io/deephaven/function/ToChunkTypeTransform.java
index 97d2a23832d..cbcaeeea97c 100644
--- a/extensions/kafka/src/main/java/io/deephaven/kafka/ToChunkTypeTransform.java
+++ b/extensions/protobuf/src/main/java/io/deephaven/function/ToChunkTypeTransform.java
@@ -1,13 +1,8 @@
 //
 // Copyright (c) 2016-2024 Deephaven Data Labs and Patent Pending
 //
-package io.deephaven.kafka;
+package io.deephaven.function;
 
-import io.deephaven.function.ToByteFunction;
-import io.deephaven.function.ToLongFunction;
-import io.deephaven.function.ToObjectFunction;
-import io.deephaven.function.ToPrimitiveFunction;
-import io.deephaven.function.TypedFunction;
 import io.deephaven.qst.type.ArrayType;
 import io.deephaven.qst.type.BoxedBooleanType;
 import io.deephaven.qst.type.BoxedByteType;
@@ -28,15 +23,15 @@
 import java.time.Instant;
 import java.util.Objects;
 
-import static io.deephaven.kafka.UnboxTransform.unboxByte;
-import static io.deephaven.kafka.UnboxTransform.unboxChar;
-import static io.deephaven.kafka.UnboxTransform.unboxDouble;
-import static io.deephaven.kafka.UnboxTransform.unboxFloat;
-import static io.deephaven.kafka.UnboxTransform.unboxInt;
-import static io.deephaven.kafka.UnboxTransform.unboxLong;
-import static io.deephaven.kafka.UnboxTransform.unboxShort;
+import static io.deephaven.function.UnboxTransform.unboxByte;
+import static io.deephaven.function.UnboxTransform.unboxChar;
+import static io.deephaven.function.UnboxTransform.unboxDouble;
+import static io.deephaven.function.UnboxTransform.unboxFloat;
+import static io.deephaven.function.UnboxTransform.unboxInt;
+import static io.deephaven.function.UnboxTransform.unboxLong;
+import static io.deephaven.function.UnboxTransform.unboxShort;
 
-class ToChunkTypeTransform {
+public class ToChunkTypeTransform {
 
     private static final ToByteFunction<Boolean> BOOLEAN_AS_BYTE = BooleanUtils::booleanAsByte;
     private static final ToLongFunction<Instant> EPOCH_NANOS = DateTimeUtils::epochNanos;
diff --git a/extensions/protobuf/src/main/java/io/deephaven/protobuf/ProtobufDescriptorParserImpl.java b/extensions/protobuf/src/main/java/io/deephaven/protobuf/ProtobufDescriptorParserImpl.java
index a2365ea853e..91c4850e976 100644
--- a/extensions/protobuf/src/main/java/io/deephaven/protobuf/ProtobufDescriptorParserImpl.java
+++ b/extensions/protobuf/src/main/java/io/deephaven/protobuf/ProtobufDescriptorParserImpl.java
@@ -32,7 +32,6 @@
 import io.deephaven.function.ToShortFunction;
 import io.deephaven.function.TypedFunction;
 import io.deephaven.function.TypedFunction.Visitor;
-import io.deephaven.util.QueryConstants;
 
 import java.lang.reflect.Array;
 import java.util.HashMap;
@@ -362,40 +361,46 @@ private ProtobufFunctions functions() {
                 }
             }
 
+            private <T> ToObjectFunction<Message, T> maybeBypass(ToObjectFunction<Message, T> f) {
+                // Ideally, we could be very targetted in our application of null checks; in a lot of contexts, our
+                // implementation could know it will never be called with a null message to produce an array.
+                return BypassOnNull.of(f);
+            }
+
             private ToObjectFunction<Message, char[]> mapChars(ToCharFunction<Object> f) {
-                return ToObjectFunction.of(m -> toChars(m, fd, f), Type.charType().arrayType());
+                return maybeBypass(ToObjectFunction.of(m -> toChars(m, fd, f), Type.charType().arrayType()));
             }
 
             private ToObjectFunction<Message, byte[]> mapBytes(ToByteFunction<Object> f) {
-                return ToObjectFunction.of(m -> toBytes(m, fd, f), Type.byteType().arrayType());
+                return maybeBypass(ToObjectFunction.of(m -> toBytes(m, fd, f), Type.byteType().arrayType()));
             }
 
             private ToObjectFunction<Message, short[]> mapShorts(ToShortFunction<Object> f) {
-                return ToObjectFunction.of(m -> toShorts(m, fd, f), Type.shortType().arrayType());
+                return maybeBypass(ToObjectFunction.of(m -> toShorts(m, fd, f), Type.shortType().arrayType()));
             }
 
             private ToObjectFunction<Message, int[]> mapInts(ToIntFunction<Object> f) {
-                return ToObjectFunction.of(m -> toInts(m, fd, f), Type.intType().arrayType());
+                return maybeBypass(ToObjectFunction.of(m -> toInts(m, fd, f), Type.intType().arrayType()));
             }
 
             private ToObjectFunction<Message, long[]> mapLongs(ToLongFunction<Object> f) {
-                return ToObjectFunction.of(m -> toLongs(m, fd, f), Type.longType().arrayType());
+                return maybeBypass(ToObjectFunction.of(m -> toLongs(m, fd, f), Type.longType().arrayType()));
             }
 
             private ToObjectFunction<Message, float[]> mapFloats(ToFloatFunction<Object> f) {
-                return ToObjectFunction.of(m -> toFloats(m, fd, f), Type.floatType().arrayType());
+                return maybeBypass(ToObjectFunction.of(m -> toFloats(m, fd, f), Type.floatType().arrayType()));
             }
 
             private ToObjectFunction<Message, double[]> mapDoubles(ToDoubleFunction<Object> f) {
-                return ToObjectFunction.of(m -> toDoubles(m, fd, f), Type.doubleType().arrayType());
+                return maybeBypass(ToObjectFunction.of(m -> toDoubles(m, fd, f), Type.doubleType().arrayType()));
             }
 
             private ToObjectFunction<Message, boolean[]> mapBooleans(ToBooleanFunction<Object> f) {
-                return ToObjectFunction.of(m -> toBooleans(m, fd, f), Type.booleanType().arrayType());
+                return maybeBypass(ToObjectFunction.of(m -> toBooleans(m, fd, f), Type.booleanType().arrayType()));
             }
 
             private <T> ToObjectFunction<Message, T[]> mapGenerics(ToObjectFunction<Object, T> f) {
-                return ToObjectFunction.of(message -> toArray(message, fd, f), f.returnType().arrayType());
+                return maybeBypass(ToObjectFunction.of(message -> toArray(message, fd, f), f.returnType().arrayType()));
             }
 
             private class ToRepeatedType implements
diff --git a/extensions/protobuf/src/test/java/io/deephaven/protobuf/ProtobufDescriptorParserTest.java b/extensions/protobuf/src/test/java/io/deephaven/protobuf/ProtobufDescriptorParserTest.java
index 975f13fa6c1..fd4e3a4e1e2 100644
--- a/extensions/protobuf/src/test/java/io/deephaven/protobuf/ProtobufDescriptorParserTest.java
+++ b/extensions/protobuf/src/test/java/io/deephaven/protobuf/ProtobufDescriptorParserTest.java
@@ -45,6 +45,7 @@
 import io.deephaven.protobuf.test.ByteWrapperRepeated;
 import io.deephaven.protobuf.test.FieldMaskWrapper;
 import io.deephaven.protobuf.test.MultiRepeated;
+import io.deephaven.protobuf.test.NestedArrays;
 import io.deephaven.protobuf.test.NestedByteWrapper;
 import io.deephaven.protobuf.test.NestedRepeatedTimestamps;
 import io.deephaven.protobuf.test.NestedRepeatedTimestamps.Timestamps;
@@ -1470,6 +1471,111 @@ void twoTimestampsOneAsWellKnown() {
         assertThat(nf.keySet()).containsExactly(List.of("ts1"), List.of("ts2", "seconds"), List.of("ts2", "nanos"));
     }
 
+    @Test
+    void nestedArraysADirect() {
+        checkKey(
+                NestedArrays.getDescriptor(),
+                List.of("a_direct", "b", "c"),
+                Type.stringType().arrayType(),
+                new HashMap<>() {
+                    {
+                        put(NestedArrays.getDefaultInstance(), null);
+
+                        put(NestedArrays.newBuilder()
+                                .setADirect(NestedArrays.A.getDefaultInstance())
+                                .build(), null);
+
+                        // c is only non-null when b has been explicitly set
+
+                        put(NestedArrays.newBuilder()
+                                .setADirect(NestedArrays.A.newBuilder()
+                                        .setB(NestedArrays.B.getDefaultInstance())
+                                        .build())
+                                .build(), new String[0]);
+
+                        put(NestedArrays.newBuilder()
+                                .setADirect(NestedArrays.A.newBuilder()
+                                        .setB(NestedArrays.B.newBuilder()
+                                                .addC("Foo")
+                                                .addC("Bar")
+                                                .build())
+                                        .build())
+                                .build(), new String[] {"Foo", "Bar"});
+                    }
+                });
+    }
+
+    @Test
+    void nestedArraysARepeated() {
+        checkKey(
+                NestedArrays.getDescriptor(),
+                List.of("a_repeated", "b", "c"),
+                Type.stringType().arrayType().arrayType(),
+                new HashMap<>() {
+                    {
+                        put(NestedArrays.getDefaultInstance(), new String[0][]);
+                        put(NestedArrays.newBuilder()
+                                .addARepeated(NestedArrays.A.getDefaultInstance())
+                                .addARepeated(NestedArrays.A.newBuilder()
+                                        .setB(NestedArrays.B.getDefaultInstance())
+                                        .build())
+                                .addARepeated(NestedArrays.A.newBuilder()
+                                        .setB(NestedArrays.B.newBuilder()
+                                                .addC("Foo")
+                                                .addC("Bar")
+                                                .build())
+                                        .build())
+                                .build(), new String[][] {null, new String[0], new String[] {"Foo", "Bar"}});
+                    }
+                });
+    }
+
+    @Test
+    void nestedArraysBDirect() {
+        checkKey(
+                NestedArrays.getDescriptor(),
+                List.of("b_direct", "c"),
+                Type.stringType().arrayType(),
+                new HashMap<>() {
+                    {
+                        put(NestedArrays.getDefaultInstance(), null);
+
+                        put(NestedArrays.newBuilder()
+                                .setBDirect(NestedArrays.B.getDefaultInstance())
+                                .build(), new String[0]);
+
+                        put(NestedArrays.newBuilder()
+                                .setBDirect(NestedArrays.B.newBuilder()
+                                        .addC("Foo")
+                                        .addC("Bar")
+                                        .build())
+                                .build(), new String[] {"Foo", "Bar"});
+                    }
+                });
+    }
+
+    @Test
+    void nestedArraysBRepeated() {
+        checkKey(
+                NestedArrays.getDescriptor(),
+                List.of("b_repeated", "c"),
+                Type.stringType().arrayType().arrayType(),
+                new HashMap<>() {
+                    {
+                        put(NestedArrays.getDefaultInstance(), new String[0][]);
+
+                        put(NestedArrays.newBuilder()
+                                .addBRepeated(NestedArrays.B.getDefaultInstance())
+                                .addBRepeated(NestedArrays.B.newBuilder()
+                                        .addC("Foo")
+                                        .addC("Bar")
+                                        .build())
+
+                                .build(), new String[][] {new String[0], new String[] {"Foo", "Bar"}});
+                    }
+                });
+    }
+
     private static Map<List<String>, TypedFunction<Message>> nf(Descriptor descriptor) {
         return nf(descriptor, ProtobufDescriptorParserOptions.defaults());
     }
diff --git a/extensions/protobuf/src/test/proto/mytest.proto b/extensions/protobuf/src/test/proto/mytest.proto
index da6a6e169db..46d6e2a9513 100644
--- a/extensions/protobuf/src/test/proto/mytest.proto
+++ b/extensions/protobuf/src/test/proto/mytest.proto
@@ -131,6 +131,21 @@ message RepeatedObject {
   repeated XYZ xyz = 1;
 }
 
+message NestedArrays {
+  message A {
+    B b = 1;
+  }
+  message B {
+    repeated string c = 1;
+  }
+
+  A a_direct = 1;
+  repeated A a_repeated = 2;
+
+  B b_direct = 3;
+  repeated B b_repeated = 4;
+}
+
 message MultiRepeated {
   repeated RepeatedBasics my_basics = 1;
   repeated RepeatedWrappers my_wrappers = 2;
diff --git a/extensions/s3/build.gradle b/extensions/s3/build.gradle
index e376ee51930..a149d6d24bb 100644
--- a/extensions/s3/build.gradle
+++ b/extensions/s3/build.gradle
@@ -15,29 +15,38 @@ dependencies {
     implementation project(':Util')
     implementation project(':Configuration')
     implementation project(':log-factory')
+    implementation project(':util-thread')
 
-    Classpaths.inheritAWSSDK(project)
+    implementation platform(libs.awssdk.bom)
+    implementation libs.awssdk.s3
+    implementation libs.awssdk.crt.client
 
-    compileOnly depAnnotations
+    compileOnly libs.jetbrains.annotations
 
     // For OSUtil
     testImplementation project(':Stats')
 
-    Classpaths.inheritAutoService(project)
-    Classpaths.inheritImmutables(project)
+    compileOnly libs.autoservice
+    annotationProcessor libs.autoservice.compiler
 
-    Classpaths.inheritJUnitPlatform(project)
-    Classpaths.inheritAssertJ(project)
-    testImplementation 'org.junit.jupiter:junit-jupiter'
-    testRuntimeOnly 'org.junit.jupiter:junit-jupiter-engine'
-    testRuntimeOnly 'org.junit.platform:junit-platform-launcher'
+    compileOnly project(':util-immutables')
+    annotationProcessor libs.immutables.value
 
-    testImplementation 'software.amazon.awssdk:s3-transfer-manager'
-    Classpaths.inheritTestContainers(project)
+    testImplementation libs.assertj
+    testImplementation platform(libs.junit.bom)
+    testImplementation libs.junit.jupiter
+    testRuntimeOnly libs.junit.jupiter.engine
+    testRuntimeOnly libs.junit.platform.launcher
+
+    testImplementation libs.awssdk.s3.transfer.manager
+    testImplementation libs.testcontainers
+    testImplementation libs.testcontainers.junit.jupiter
+    testImplementation libs.testcontainers.localstack
+    testImplementation libs.testcontainers.minio
 
     testRuntimeOnly project(':test-configs')
     testRuntimeOnly project(':log-to-slf4j')
-    Classpaths.inheritSlf4j(project, 'slf4j-simple', 'testRuntimeOnly')
+    testRuntimeOnly libs.slf4j.simple
 }
 
 test {
diff --git a/extensions/s3/src/main/java/io/deephaven/extensions/s3/AnonymousCredentials.java b/extensions/s3/src/main/java/io/deephaven/extensions/s3/AnonymousCredentials.java
index b637a61f770..d88ff59996e 100644
--- a/extensions/s3/src/main/java/io/deephaven/extensions/s3/AnonymousCredentials.java
+++ b/extensions/s3/src/main/java/io/deephaven/extensions/s3/AnonymousCredentials.java
@@ -3,6 +3,7 @@
 //
 package io.deephaven.extensions.s3;
 
+import org.jetbrains.annotations.NotNull;
 import software.amazon.awssdk.auth.credentials.AnonymousCredentialsProvider;
 import software.amazon.awssdk.auth.credentials.AwsCredentialsProvider;
 
@@ -10,7 +11,7 @@ enum AnonymousCredentials implements AwsSdkV2Credentials {
     ANONYMOUS_CREDENTIALS;
 
     @Override
-    public AwsCredentialsProvider awsV2CredentialsProvider() {
+    public AwsCredentialsProvider awsV2CredentialsProvider(@NotNull final S3Instructions instructions) {
         return AnonymousCredentialsProvider.create();
     }
 }
diff --git a/extensions/s3/src/main/java/io/deephaven/extensions/s3/AwsSdkV2Credentials.java b/extensions/s3/src/main/java/io/deephaven/extensions/s3/AwsSdkV2Credentials.java
index c7936e0daa2..6dfef882612 100644
--- a/extensions/s3/src/main/java/io/deephaven/extensions/s3/AwsSdkV2Credentials.java
+++ b/extensions/s3/src/main/java/io/deephaven/extensions/s3/AwsSdkV2Credentials.java
@@ -3,9 +3,14 @@
 //
 package io.deephaven.extensions.s3;
 
+import io.deephaven.util.annotations.InternalUseOnly;
 import software.amazon.awssdk.auth.credentials.AwsCredentialsProvider;
 
-interface AwsSdkV2Credentials extends Credentials {
+@InternalUseOnly
+public interface AwsSdkV2Credentials extends Credentials {
 
-    AwsCredentialsProvider awsV2CredentialsProvider();
+    /**
+     * Get the AWS credentials provider based on the given instructions.
+     */
+    AwsCredentialsProvider awsV2CredentialsProvider(S3Instructions instructions);
 }
diff --git a/extensions/s3/src/main/java/io/deephaven/extensions/s3/BasicCredentials.java b/extensions/s3/src/main/java/io/deephaven/extensions/s3/BasicCredentials.java
index b058426987b..880cfd39278 100644
--- a/extensions/s3/src/main/java/io/deephaven/extensions/s3/BasicCredentials.java
+++ b/extensions/s3/src/main/java/io/deephaven/extensions/s3/BasicCredentials.java
@@ -6,6 +6,7 @@
 import io.deephaven.annotations.SimpleStyle;
 import org.immutables.value.Value;
 import org.immutables.value.Value.Immutable;
+import org.jetbrains.annotations.NotNull;
 import software.amazon.awssdk.auth.credentials.AwsBasicCredentials;
 import software.amazon.awssdk.auth.credentials.AwsCredentialsProvider;
 import software.amazon.awssdk.auth.credentials.StaticCredentialsProvider;
@@ -29,7 +30,7 @@ static BasicCredentials of(final String accessKeyId, final String secretAccessKe
     abstract String secretAccessKey();
 
     @Override
-    public final AwsCredentialsProvider awsV2CredentialsProvider() {
+    public final AwsCredentialsProvider awsV2CredentialsProvider(@NotNull final S3Instructions instructions) {
         return StaticCredentialsProvider.create(AwsBasicCredentials.create(accessKeyId(), secretAccessKey()));
     }
 }
diff --git a/extensions/s3/src/main/java/io/deephaven/extensions/s3/Credentials.java b/extensions/s3/src/main/java/io/deephaven/extensions/s3/Credentials.java
index 597c0435bb0..a8cb8230262 100644
--- a/extensions/s3/src/main/java/io/deephaven/extensions/s3/Credentials.java
+++ b/extensions/s3/src/main/java/io/deephaven/extensions/s3/Credentials.java
@@ -3,16 +3,37 @@
 //
 package io.deephaven.extensions.s3;
 
+import software.amazon.awssdk.auth.credentials.AnonymousCredentialsProvider;
+import software.amazon.awssdk.auth.credentials.DefaultCredentialsProvider;
+import software.amazon.awssdk.auth.credentials.ProfileCredentialsProvider;
+
 public interface Credentials {
 
     /**
-     * The default credentials.
+     * Default credentials provider used by Deephaven which resolves credentials in the following order:
+     * <ol>
+     * <li>If a profile name, config file path, or credentials file path is provided, use
+     * {@link ProfileCredentialsProvider}</li>
+     * <li>If not, check all places mentioned in {@link DefaultCredentialsProvider} and fall back to
+     * {@link AnonymousCredentialsProvider}</li>
+     * </ol>
+     *
+     * @see ProfileCredentialsProvider
+     * @see DefaultCredentialsProvider
+     * @see AnonymousCredentialsProvider
+     */
+    static Credentials resolving() {
+        return ResolvingCredentials.INSTANCE;
+    }
+
+    /**
+     * Default credentials provider used by the AWS SDK that looks for credentials at a number of locations as described
+     * in {@link DefaultCredentialsProvider}
      *
-     * @see <a href="https://docs.aws.amazon.com/sdk-for-java/latest/developer-guide/credentials-chain.html">Default
-     *      credentials provider chain</a>
+     * @see DefaultCredentialsProvider
      */
     static Credentials defaultCredentials() {
-        return DefaultCredentials.DEFAULT_CREDENTIALS;
+        return DefaultCredentials.INSTANCE;
     }
 
     /**
@@ -31,4 +52,13 @@ static Credentials basic(final String accessKeyId, final String secretAccessKey)
     static Credentials anonymous() {
         return AnonymousCredentials.ANONYMOUS_CREDENTIALS;
     }
+
+    /**
+     * Profile specific credentials that uses configuration and credentials files.
+     *
+     * @see ProfileCredentialsProvider
+     */
+    static Credentials profile() {
+        return ProfileCredentials.INSTANCE;
+    }
 }
diff --git a/extensions/s3/src/main/java/io/deephaven/extensions/s3/DefaultCredentials.java b/extensions/s3/src/main/java/io/deephaven/extensions/s3/DefaultCredentials.java
index 07936577e52..07f8e7c40dc 100644
--- a/extensions/s3/src/main/java/io/deephaven/extensions/s3/DefaultCredentials.java
+++ b/extensions/s3/src/main/java/io/deephaven/extensions/s3/DefaultCredentials.java
@@ -3,18 +3,19 @@
 //
 package io.deephaven.extensions.s3;
 
+import org.jetbrains.annotations.NotNull;
 import software.amazon.awssdk.auth.credentials.AwsCredentialsProvider;
 import software.amazon.awssdk.auth.credentials.DefaultCredentialsProvider;
 
 /**
- * Default AWS credentials provider that looks for credentials at a number of locations as described in
+ * Default credentials provider used by AWS SDK that looks for credentials at a number of locations as described in
  * {@link DefaultCredentialsProvider}
  */
 enum DefaultCredentials implements AwsSdkV2Credentials {
-    DEFAULT_CREDENTIALS;
+    INSTANCE;
 
     @Override
-    public final AwsCredentialsProvider awsV2CredentialsProvider() {
+    public final AwsCredentialsProvider awsV2CredentialsProvider(@NotNull final S3Instructions instructions) {
         return DefaultCredentialsProvider.create();
     }
 }
diff --git a/extensions/s3/src/main/java/io/deephaven/extensions/s3/GCSSeekableChannelProvider.java b/extensions/s3/src/main/java/io/deephaven/extensions/s3/GCSSeekableChannelProvider.java
new file mode 100644
index 00000000000..cbf7b410101
--- /dev/null
+++ b/extensions/s3/src/main/java/io/deephaven/extensions/s3/GCSSeekableChannelProvider.java
@@ -0,0 +1,72 @@
+//
+// Copyright (c) 2016-2024 Deephaven Data Labs and Patent Pending
+//
+package io.deephaven.extensions.s3;
+
+import io.deephaven.internal.log.LoggerFactory;
+import io.deephaven.io.logger.Logger;
+import io.deephaven.util.channel.CompletableOutputStream;
+import io.deephaven.util.channel.SeekableChannelContext;
+import org.jetbrains.annotations.NotNull;
+
+import java.net.URI;
+import java.net.URISyntaxException;
+import java.nio.channels.SeekableByteChannel;
+import java.util.stream.Stream;
+
+import static io.deephaven.extensions.s3.GCSSeekableChannelProviderPlugin.GCS_URI_SCHEME;
+import static io.deephaven.extensions.s3.S3SeekableChannelProviderPlugin.S3_URI_SCHEME;
+
+final class GCSSeekableChannelProvider extends S3SeekableChannelProvider {
+
+    private static final Logger log = LoggerFactory.getLogger(GCSSeekableChannelProvider.class);
+
+    GCSSeekableChannelProvider(@NotNull final S3Instructions s3Instructions) {
+        super(s3Instructions);
+    }
+
+    @Override
+    public boolean exists(@NotNull final URI uri) {
+        return super.exists(gcsToS3Uri(uri));
+    }
+
+    @Override
+    public SeekableByteChannel getReadChannel(
+            @NotNull final SeekableChannelContext channelContext,
+            @NotNull final URI uri) {
+        return super.getReadChannel(channelContext, gcsToS3Uri(uri));
+    }
+
+    @Override
+    public CompletableOutputStream getOutputStream(@NotNull final URI uri, final int bufferSizeHint) {
+        return super.getOutputStream(gcsToS3Uri(uri), bufferSizeHint);
+    }
+
+    @Override
+    public Stream<URI> list(@NotNull final URI directory) {
+        if (log.isDebugEnabled()) {
+            log.debug().append("Fetching child URIs for directory: ").append(directory.toString()).endl();
+        }
+        return createStream(gcsToS3Uri(directory), false, GCS_URI_SCHEME);
+    }
+
+    @Override
+    public Stream<URI> walk(@NotNull final URI directory) {
+        if (log.isDebugEnabled()) {
+            log.debug().append("Performing recursive traversal from directory: ").append(directory.toString()).endl();
+        }
+        return createStream(gcsToS3Uri(directory), true, GCS_URI_SCHEME);
+    }
+
+    private static URI gcsToS3Uri(@NotNull final URI uri) {
+        try {
+            if (S3_URI_SCHEME.equals(uri.getScheme())) {
+                return uri;
+            }
+            return new URI(S3_URI_SCHEME, uri.getUserInfo(), uri.getHost(), uri.getPort(), uri.getPath(),
+                    uri.getQuery(), uri.getFragment());
+        } catch (final URISyntaxException e) {
+            throw new IllegalArgumentException("Failed to convert GCS URI " + uri + " to s3 URI", e);
+        }
+    }
+}
diff --git a/extensions/s3/src/main/java/io/deephaven/extensions/s3/GCSSeekableChannelProviderPlugin.java b/extensions/s3/src/main/java/io/deephaven/extensions/s3/GCSSeekableChannelProviderPlugin.java
new file mode 100644
index 00000000000..bdd954c6e08
--- /dev/null
+++ b/extensions/s3/src/main/java/io/deephaven/extensions/s3/GCSSeekableChannelProviderPlugin.java
@@ -0,0 +1,63 @@
+//
+// Copyright (c) 2016-2024 Deephaven Data Labs and Patent Pending
+//
+package io.deephaven.extensions.s3;
+
+import com.google.auto.service.AutoService;
+import io.deephaven.util.channel.SeekableChannelsProvider;
+import io.deephaven.util.channel.SeekableChannelsProviderPlugin;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
+
+import java.net.URI;
+
+/**
+ * {@link SeekableChannelsProviderPlugin} implementation used for reading files from Google Cloud Storage.
+ */
+@AutoService(SeekableChannelsProviderPlugin.class)
+public final class GCSSeekableChannelProviderPlugin implements SeekableChannelsProviderPlugin {
+
+    static final String GCS_URI_SCHEME = "gs";
+
+    private static final String ENDPOINT_OVERRIDE_SUFFIX = ".googleapis.com";
+    private static final URI DEFAULT_ENDPOINT_OVERRIDE = URI.create("https://storage.googleapis.com");
+    private static final S3Instructions DEFAULT_INSTRUCTIONS =
+            S3Instructions.builder().endpointOverride(DEFAULT_ENDPOINT_OVERRIDE).build();
+
+    @Override
+    public boolean isCompatible(@NotNull final String uriScheme, @Nullable final Object config) {
+        return GCS_URI_SCHEME.equals(uriScheme);
+    }
+
+    @Override
+    public SeekableChannelsProvider createProvider(@NotNull final String uriScheme, @Nullable final Object config) {
+        if (!isCompatible(uriScheme, config)) {
+            throw new IllegalArgumentException("Arguments not compatible, provided uri scheme " + uriScheme);
+        }
+        return new GCSSeekableChannelProvider(s3Instructions(config));
+    }
+
+    /**
+     * Get the S3Instructions from the config object, or use the default if the config is null.
+     */
+    private static S3Instructions s3Instructions(@Nullable final Object config) {
+        if (config == null) {
+            return DEFAULT_INSTRUCTIONS;
+        }
+        if (!(config instanceof S3Instructions)) {
+            throw new IllegalArgumentException("Only S3Instructions are valid when reading GCS URIs, " +
+                    "provided config instance of class " + config.getClass().getName());
+        }
+        final S3Instructions s3Instructions = (S3Instructions) config;
+        if (s3Instructions.endpointOverride().isEmpty()) {
+            return s3Instructions.withEndpointOverride(DEFAULT_ENDPOINT_OVERRIDE);
+        }
+        if (!(s3Instructions.endpointOverride().get()).toString().endsWith(ENDPOINT_OVERRIDE_SUFFIX)) {
+            throw new IllegalArgumentException("Provided endpoint override=(" +
+                    s3Instructions.endpointOverride().get() + " not supported when reading GCS URIs, must end with " +
+                    ENDPOINT_OVERRIDE_SUFFIX);
+        }
+        return s3Instructions;
+    }
+}
+
diff --git a/extensions/s3/src/main/java/io/deephaven/extensions/s3/ProfileCredentials.java b/extensions/s3/src/main/java/io/deephaven/extensions/s3/ProfileCredentials.java
new file mode 100644
index 00000000000..c74e5cabe57
--- /dev/null
+++ b/extensions/s3/src/main/java/io/deephaven/extensions/s3/ProfileCredentials.java
@@ -0,0 +1,25 @@
+//
+// Copyright (c) 2016-2024 Deephaven Data Labs and Patent Pending
+//
+package io.deephaven.extensions.s3;
+
+import org.jetbrains.annotations.NotNull;
+import software.amazon.awssdk.auth.credentials.AwsCredentialsProvider;
+import software.amazon.awssdk.auth.credentials.ProfileCredentialsProvider;
+
+/**
+ * Profile specific credentials that uses a profile file.
+ *
+ * @see ProfileCredentialsProvider
+ */
+enum ProfileCredentials implements AwsSdkV2Credentials {
+    INSTANCE;
+
+    @Override
+    public final AwsCredentialsProvider awsV2CredentialsProvider(@NotNull final S3Instructions instructions) {
+        final ProfileCredentialsProvider.Builder builder = ProfileCredentialsProvider.builder();
+        instructions.profileName().ifPresent(builder::profileName);
+        instructions.aggregatedProfileFile().ifPresent(builder::profileFile);
+        return builder.build();
+    }
+}
diff --git a/extensions/s3/src/main/java/io/deephaven/extensions/s3/ResolvingCredentials.java b/extensions/s3/src/main/java/io/deephaven/extensions/s3/ResolvingCredentials.java
new file mode 100644
index 00000000000..199eb4a5eff
--- /dev/null
+++ b/extensions/s3/src/main/java/io/deephaven/extensions/s3/ResolvingCredentials.java
@@ -0,0 +1,43 @@
+//
+// Copyright (c) 2016-2024 Deephaven Data Labs and Patent Pending
+//
+package io.deephaven.extensions.s3;
+
+import org.jetbrains.annotations.NotNull;
+import software.amazon.awssdk.auth.credentials.AnonymousCredentialsProvider;
+import software.amazon.awssdk.auth.credentials.AwsCredentialsProvider;
+import software.amazon.awssdk.auth.credentials.AwsCredentialsProviderChain;
+import software.amazon.awssdk.auth.credentials.DefaultCredentialsProvider;
+import software.amazon.awssdk.auth.credentials.ProfileCredentialsProvider;
+
+/**
+ * Default credentials provider used by Deephaven which resolves credentials in the following order:
+ * <ol>
+ * <li>If a profile name, config file path, or credentials file path is provided, use
+ * {@link ProfileCredentialsProvider}</li>
+ * <li>If not, check all places mentioned in {@link DefaultCredentialsProvider} and fall back to
+ * {@link AnonymousCredentialsProvider}</li>
+ * </ol>
+ *
+ * @see ProfileCredentialsProvider
+ * @see DefaultCredentialsProvider
+ * @see AnonymousCredentialsProvider
+ */
+enum ResolvingCredentials implements AwsSdkV2Credentials {
+    INSTANCE;
+
+    @Override
+    public final AwsCredentialsProvider awsV2CredentialsProvider(@NotNull final S3Instructions instructions) {
+        if (instructions.profileName().isPresent()
+                || instructions.configFilePath().isPresent()
+                || instructions.credentialsFilePath().isPresent()) {
+            return ProfileCredentials.INSTANCE.awsV2CredentialsProvider(instructions);
+        }
+        return AwsCredentialsProviderChain.builder()
+                .credentialsProviders(
+                        DefaultCredentialsProvider.create(),
+                        AnonymousCredentialsProvider.create())
+                .reuseLastProviderEnabled(true)
+                .build();
+    }
+}
diff --git a/extensions/s3/src/main/java/io/deephaven/extensions/s3/S3AsyncClientFactory.java b/extensions/s3/src/main/java/io/deephaven/extensions/s3/S3AsyncClientFactory.java
deleted file mode 100644
index 69150aafa00..00000000000
--- a/extensions/s3/src/main/java/io/deephaven/extensions/s3/S3AsyncClientFactory.java
+++ /dev/null
@@ -1,151 +0,0 @@
-//
-// Copyright (c) 2016-2024 Deephaven Data Labs and Patent Pending
-//
-package io.deephaven.extensions.s3;
-
-import io.deephaven.internal.log.LoggerFactory;
-import io.deephaven.io.logger.Logger;
-import org.jetbrains.annotations.NotNull;
-import software.amazon.awssdk.core.client.config.ClientOverrideConfiguration;
-import software.amazon.awssdk.core.client.config.SdkAdvancedAsyncClientOption;
-import software.amazon.awssdk.core.retry.RetryMode;
-import software.amazon.awssdk.http.async.SdkAsyncHttpClient;
-import software.amazon.awssdk.http.crt.AwsCrtAsyncHttpClient;
-import software.amazon.awssdk.regions.Region;
-import software.amazon.awssdk.services.s3.S3AsyncClient;
-import software.amazon.awssdk.services.s3.S3AsyncClientBuilder;
-import software.amazon.awssdk.utils.ThreadFactoryBuilder;
-
-import java.time.Duration;
-import java.util.Map;
-import java.util.concurrent.ConcurrentHashMap;
-import java.util.concurrent.Executor;
-import java.util.concurrent.Executors;
-import java.util.concurrent.ScheduledExecutorService;
-
-import static io.deephaven.util.thread.ThreadHelpers.getOrComputeThreadCountProperty;
-
-class S3AsyncClientFactory {
-
-    private static final int NUM_FUTURE_COMPLETION_THREADS =
-            getOrComputeThreadCountProperty("S3.numFutureCompletionThreads", -1);
-    private static final int NUM_SCHEDULED_EXECUTOR_THREADS =
-            getOrComputeThreadCountProperty("S3.numScheduledExecutorThreads", 5);
-
-    private static final Logger log = LoggerFactory.getLogger(S3AsyncClientFactory.class);
-    private static final Map<HttpClientConfig, SdkAsyncHttpClient> httpClientCache = new ConcurrentHashMap<>();
-
-    private static volatile Executor futureCompletionExecutor;
-    private static volatile ScheduledExecutorService scheduledExecutor;
-
-    static S3AsyncClient getAsyncClient(@NotNull final S3Instructions instructions) {
-        final S3AsyncClientBuilder builder = S3AsyncClient.builder()
-                .asyncConfiguration(
-                        b -> b.advancedOption(SdkAdvancedAsyncClientOption.FUTURE_COMPLETION_EXECUTOR,
-                                ensureAsyncFutureCompletionExecutor()))
-                .httpClient(getOrBuildHttpClient(instructions))
-                .overrideConfiguration(ClientOverrideConfiguration.builder()
-                        // If we find that the STANDARD retry policy does not work well in all situations, we might
-                        // try experimenting with ADAPTIVE retry policy, potentially with fast fail.
-                        // .retryPolicy(RetryPolicy.builder(RetryMode.ADAPTIVE).fastFailRateLimiting(true).build())
-                        .retryPolicy(RetryMode.STANDARD)
-                        .apiCallAttemptTimeout(instructions.readTimeout().dividedBy(3))
-                        .apiCallTimeout(instructions.readTimeout())
-                        // Adding a metrics publisher may be useful for debugging, but it's very verbose.
-                        // .addMetricPublisher(LoggingMetricPublisher.create(Level.INFO, Format.PRETTY))
-                        .scheduledExecutorService(ensureScheduledExecutor())
-                        .build())
-                .credentialsProvider(instructions.awsV2CredentialsProvider());
-        instructions.regionName().map(Region::of).ifPresent(builder::region);
-        instructions.endpointOverride().ifPresent(builder::endpointOverride);
-        final S3AsyncClient ret = builder.build();
-        if (log.isDebugEnabled()) {
-            log.debug().append("Building S3AsyncClient with instructions: ").append(instructions).endl();
-        }
-        return ret;
-    }
-
-    private static class HttpClientConfig {
-        private final int maxConcurrentRequests;
-        private final Duration connectionTimeout;
-
-        HttpClientConfig(final int maxConcurrentRequests, final Duration connectionTimeout) {
-            this.maxConcurrentRequests = maxConcurrentRequests;
-            this.connectionTimeout = connectionTimeout;
-        }
-
-        int maxConcurrentRequests() {
-            return maxConcurrentRequests;
-        }
-
-        Duration connectionTimeout() {
-            return connectionTimeout;
-        }
-
-        @Override
-        public int hashCode() {
-            int result = maxConcurrentRequests;
-            result = 31 * result + connectionTimeout.hashCode();
-            return result;
-        }
-
-        @Override
-        public boolean equals(final Object other) {
-            if (this == other) {
-                return true;
-            }
-            if (other == null || getClass() != other.getClass()) {
-                return false;
-            }
-            final HttpClientConfig that = (HttpClientConfig) other;
-            return maxConcurrentRequests == that.maxConcurrentRequests
-                    && connectionTimeout.equals(that.connectionTimeout);
-        }
-    }
-
-    private static SdkAsyncHttpClient getOrBuildHttpClient(@NotNull final S3Instructions instructions) {
-        final HttpClientConfig config = new HttpClientConfig(instructions.maxConcurrentRequests(),
-                instructions.connectionTimeout());
-        return httpClientCache.computeIfAbsent(config, key -> AwsCrtAsyncHttpClient.builder()
-                .maxConcurrency(config.maxConcurrentRequests())
-                .connectionTimeout(config.connectionTimeout())
-                .build());
-    }
-
-    /**
-     * The following executor will be used to complete the futures returned by the async client. This is a shared
-     * executor across all clients with fixed number of threads. This pattern is inspired by the default executor used
-     * by the SDK
-     * ({@code software.amazon.awssdk.core.client.builder.SdkDefaultClientBuilder#resolveAsyncFutureCompletionExecutor})
-     *
-     */
-    private static Executor ensureAsyncFutureCompletionExecutor() {
-        if (futureCompletionExecutor == null) {
-            synchronized (S3AsyncClientFactory.class) {
-                if (futureCompletionExecutor == null) {
-                    futureCompletionExecutor = Executors.newFixedThreadPool(NUM_FUTURE_COMPLETION_THREADS,
-                            new ThreadFactoryBuilder().threadNamePrefix("s3-async-future-completion").build());
-                }
-            }
-        }
-        return futureCompletionExecutor;
-    }
-
-    /**
-     * The following executor will be used to schedule tasks for the async client, such as timeouts and retries. This is
-     * a shared executor across all clients with fixed number of threads. This pattern is inspired by the default
-     * executor used by the SDK
-     * ({@code software.amazon.awssdk.core.client.builder.SdkDefaultClientBuilder#resolveScheduledExecutorService}).
-     */
-    private static ScheduledExecutorService ensureScheduledExecutor() {
-        if (scheduledExecutor == null) {
-            synchronized (S3AsyncClientFactory.class) {
-                if (scheduledExecutor == null) {
-                    scheduledExecutor = Executors.newScheduledThreadPool(NUM_SCHEDULED_EXECUTOR_THREADS,
-                            new ThreadFactoryBuilder().threadNamePrefix("s3-scheduled-executor").build());
-                }
-            }
-        }
-        return scheduledExecutor;
-    }
-}
diff --git a/extensions/s3/src/main/java/io/deephaven/extensions/s3/S3ChannelContext.java b/extensions/s3/src/main/java/io/deephaven/extensions/s3/S3ChannelContext.java
index fb58ee43632..9bf54929446 100644
--- a/extensions/s3/src/main/java/io/deephaven/extensions/s3/S3ChannelContext.java
+++ b/extensions/s3/src/main/java/io/deephaven/extensions/s3/S3ChannelContext.java
@@ -10,15 +10,13 @@
 import org.jetbrains.annotations.NotNull;
 import software.amazon.awssdk.services.s3.S3AsyncClient;
 import software.amazon.awssdk.services.s3.S3Uri;
-import software.amazon.awssdk.services.s3.model.HeadObjectRequest;
-import software.amazon.awssdk.services.s3.model.HeadObjectResponse;
+import software.amazon.awssdk.services.s3.model.NoSuchKeyException;
 
 import java.io.IOException;
 import java.nio.ByteBuffer;
 import java.util.Objects;
 import java.util.concurrent.CancellationException;
 import java.util.concurrent.ExecutionException;
-import java.util.concurrent.TimeUnit;
 import java.util.concurrent.TimeoutException;
 
 /**
@@ -184,6 +182,9 @@ static IOException handleS3Exception(final Exception e, final String operationDe
             return new IOException(String.format("Thread interrupted while %s", operationDescription), e);
         }
         if (e instanceof ExecutionException) {
+            if (e.getCause() instanceof NoSuchKeyException) {
+                throw (NoSuchKeyException) e.getCause();
+            }
             return new IOException(String.format("Execution exception occurred while %s", operationDescription), e);
         }
         if (e instanceof TimeoutException) {
@@ -201,25 +202,7 @@ private void ensureSize() throws IOException {
         if (size != UNINITIALIZED_SIZE) {
             return;
         }
-        if (log.isDebugEnabled()) {
-            log.debug().append("Head: ").append(ctxStr()).endl();
-        }
-        // Fetch the size of the file on the first read using a blocking HEAD request, and store it in the context
-        // for future use
-        final HeadObjectResponse headObjectResponse;
-        try {
-            headObjectResponse = client
-                    .headObject(HeadObjectRequest.builder()
-                            .bucket(uri.bucket().orElseThrow())
-                            .key(uri.key().orElseThrow())
-                            .build())
-                    .get(instructions.readTimeout().toNanos(), TimeUnit.NANOSECONDS);
-        } catch (final InterruptedException | ExecutionException | TimeoutException | CancellationException e) {
-            throw handleS3Exception(e, String.format("fetching HEAD for file %s, %s", uri, ctxStr()), instructions);
-        }
-        final long fileSize = headObjectResponse.contentLength();
-        setSize(fileSize);
-        provider.updateFileSizeCache(uri.uri(), fileSize);
+        setSize(provider.fetchFileSize(uri));
     }
 
     private void setSize(final long size) {
diff --git a/extensions/s3/src/main/java/io/deephaven/extensions/s3/S3ClientFactory.java b/extensions/s3/src/main/java/io/deephaven/extensions/s3/S3ClientFactory.java
new file mode 100644
index 00000000000..79c25e361ea
--- /dev/null
+++ b/extensions/s3/src/main/java/io/deephaven/extensions/s3/S3ClientFactory.java
@@ -0,0 +1,285 @@
+//
+// Copyright (c) 2016-2024 Deephaven Data Labs and Patent Pending
+//
+package io.deephaven.extensions.s3;
+
+import io.deephaven.internal.log.LoggerFactory;
+import io.deephaven.io.logger.Logger;
+import org.jetbrains.annotations.NotNull;
+import software.amazon.awssdk.awscore.AwsClient;
+import software.amazon.awssdk.awscore.client.builder.AwsAsyncClientBuilder;
+import software.amazon.awssdk.awscore.client.builder.AwsClientBuilder;
+import software.amazon.awssdk.awscore.client.builder.AwsSyncClientBuilder;
+import software.amazon.awssdk.core.client.builder.SdkAsyncClientBuilder;
+import software.amazon.awssdk.core.client.builder.SdkClientBuilder;
+import software.amazon.awssdk.core.client.builder.SdkSyncClientBuilder;
+import software.amazon.awssdk.core.client.config.ClientAsyncConfiguration;
+import software.amazon.awssdk.core.client.config.ClientOverrideConfiguration;
+import software.amazon.awssdk.core.client.config.SdkAdvancedAsyncClientOption;
+import software.amazon.awssdk.core.exception.SdkClientException;
+import software.amazon.awssdk.core.retry.RetryMode;
+import software.amazon.awssdk.http.SdkHttpClient;
+import software.amazon.awssdk.http.async.SdkAsyncHttpClient;
+import software.amazon.awssdk.http.crt.AwsCrtAsyncHttpClient;
+import software.amazon.awssdk.http.crt.AwsCrtHttpClient;
+import software.amazon.awssdk.regions.Region;
+import software.amazon.awssdk.services.s3.S3AsyncClient;
+import software.amazon.awssdk.services.s3.S3AsyncClientBuilder;
+import software.amazon.awssdk.services.s3.S3BaseClientBuilder;
+import software.amazon.awssdk.services.s3.S3Client;
+import software.amazon.awssdk.services.s3.S3ClientBuilder;
+import software.amazon.awssdk.utils.ThreadFactoryBuilder;
+
+import java.time.Duration;
+import java.util.Map;
+import java.util.concurrent.ConcurrentHashMap;
+import java.util.concurrent.Executor;
+import java.util.concurrent.Executors;
+import java.util.concurrent.ScheduledExecutorService;
+import java.util.function.Function;
+
+import static io.deephaven.util.thread.ThreadHelpers.getOrComputeThreadCountProperty;
+
+final class S3ClientFactory {
+
+    private static final int NUM_FUTURE_COMPLETION_THREADS =
+            getOrComputeThreadCountProperty("S3.numFutureCompletionThreads", -1);
+    private static final int NUM_SCHEDULED_EXECUTOR_THREADS =
+            getOrComputeThreadCountProperty("S3.numScheduledExecutorThreads", 5);
+
+    private static final Logger log = LoggerFactory.getLogger(S3ClientFactory.class);
+    private static final Map<HttpClientConfig, SdkAsyncHttpClient> httpAsyncClientCache = new ConcurrentHashMap<>();
+    private static final Map<HttpClientConfig, SdkHttpClient> httpSyncClientCache = new ConcurrentHashMap<>();
+
+    private static volatile Executor futureCompletionExecutor;
+    private static volatile ScheduledExecutorService scheduledExecutor;
+
+    static S3AsyncClient getAsyncClient(@NotNull final S3Instructions instructions) {
+        return buildForS3(S3ClientFactory::getAsyncClientBuilder, instructions, S3AsyncClient.class);
+    }
+
+    static S3Client getSyncClient(@NotNull final S3Instructions instructions) {
+        return buildForS3(S3ClientFactory::getSyncClientBuilder, instructions, S3Client.class);
+    }
+
+    static <Builder extends AwsAsyncClientBuilder<Builder, Client> & AwsClientBuilder<Builder, Client>, Client> void applyAllSharedAsync(
+            @NotNull final Builder builder,
+            @NotNull final S3Instructions instructions) {
+        builder
+                .applyMutation(b -> applyAsyncHttpClient(b, instructions))
+                .applyMutation(b -> applyAsyncConfiguration(b, instructions))
+                .applyMutation(b -> applyAllSharedCommon(b, instructions));
+    }
+
+    static <Builder extends AwsSyncClientBuilder<Builder, Client> & AwsClientBuilder<Builder, Client>, Client> void applyAllSharedSync(
+            @NotNull final Builder builder,
+            @NotNull final S3Instructions instructions) {
+        builder
+                .applyMutation(b -> applySyncHttpClient(b, instructions))
+                .applyMutation(b -> applyAllSharedCommon(b, instructions));
+    }
+
+    private static <Builder extends S3BaseClientBuilder<Builder, Client>, Client extends AwsClient> Client buildForS3(
+            @NotNull final Function<S3Instructions, Builder> builderFactory,
+            @NotNull final S3Instructions instructions,
+            @NotNull final Class<Client> clientClass) {
+        if (log.isDebugEnabled()) {
+            log.debug().append("Building ").append(clientClass.getSimpleName()).append(" with instructions: ")
+                    .append(instructions).endl();
+        }
+        try {
+            return builderFactory.apply(instructions).build();
+        } catch (final SdkClientException e) {
+            if (instructions.crossRegionAccessEnabled() && e.getMessage().contains("Unable to load region")) {
+                // We might have failed because region was not provided and could not be determined by the SDK.
+                // We will try again with a default region.
+                return builderFactory.apply(instructions).region(Region.US_EAST_1).build();
+            } else {
+                throw e;
+            }
+        }
+    }
+
+    private static S3AsyncClientBuilder getAsyncClientBuilder(@NotNull final S3Instructions instructions) {
+        return S3AsyncClient.builder()
+                .applyMutation(b -> applyAllSharedAsync(b, instructions))
+                .applyMutation(b -> applyCrossRegionAccess(b, instructions));
+    }
+
+    private static S3ClientBuilder getSyncClientBuilder(@NotNull final S3Instructions instructions) {
+        return S3Client.builder()
+                .applyMutation(b -> applyAllSharedSync(b, instructions))
+                .applyMutation(b -> applyCrossRegionAccess(b, instructions));
+    }
+
+    private static <Builder extends AwsClientBuilder<Builder, Client>, Client> void applyAllSharedCommon(
+            @NotNull final Builder builder,
+            @NotNull final S3Instructions instructions) {
+        builder
+                .applyMutation(b -> applyOverrideConfiguration(b, instructions))
+                .applyMutation(b -> applyCredentialsProvider(b, instructions))
+                .applyMutation(b -> applyRegion(b, instructions))
+                .applyMutation(b -> applyEndpointOverride(b, instructions));
+    }
+
+    private static <Builder extends SdkSyncClientBuilder<Builder, Client>, Client> void applySyncHttpClient(
+            @NotNull final Builder builder,
+            @NotNull final S3Instructions instructions) {
+        builder.httpClient(getOrBuildHttpSyncClient(instructions));
+    }
+
+    private static <Builder extends SdkAsyncClientBuilder<Builder, Client>, Client> void applyAsyncHttpClient(
+            @NotNull final Builder builder,
+            @NotNull final S3Instructions instructions) {
+        builder.httpClient(getOrBuildHttpAsyncClient(instructions));
+    }
+
+    private static <Builder extends SdkAsyncClientBuilder<Builder, Client>, Client> void applyAsyncConfiguration(
+            @NotNull final Builder builder,
+            @SuppressWarnings("unused") @NotNull final S3Instructions instructions) {
+        builder.asyncConfiguration(ClientAsyncConfiguration.builder()
+                .advancedOption(SdkAdvancedAsyncClientOption.FUTURE_COMPLETION_EXECUTOR,
+                        ensureAsyncFutureCompletionExecutor())
+                .build());
+    }
+
+    private static <Builder extends SdkClientBuilder<Builder, Client>, Client> void applyOverrideConfiguration(
+            @NotNull final Builder builder,
+            @NotNull final S3Instructions instructions) {
+        final ClientOverrideConfiguration.Builder overideConfigurationBuilder = ClientOverrideConfiguration.builder()
+                // If we find that the STANDARD retry policy does not work well in all situations, we might
+                // try experimenting with ADAPTIVE retry policy, potentially with fast fail.
+                // .retryPolicy(RetryPolicy.builder(RetryMode.ADAPTIVE).fastFailRateLimiting(true).build())
+                .retryPolicy(RetryMode.STANDARD)
+                .apiCallAttemptTimeout(instructions.readTimeout().dividedBy(3))
+                .apiCallTimeout(instructions.readTimeout())
+                // Adding a metrics publisher may be useful for debugging, but it's very verbose.
+                // .addMetricPublisher(LoggingMetricPublisher.create(Level.INFO, Format.PRETTY))
+                .scheduledExecutorService(ensureScheduledExecutor());
+        instructions.profileName().ifPresent(overideConfigurationBuilder::defaultProfileName);
+        instructions.aggregatedProfileFile().ifPresent(overideConfigurationBuilder::defaultProfileFile);
+        builder.overrideConfiguration(overideConfigurationBuilder.build());
+    }
+
+    private static <Builder extends AwsClientBuilder<Builder, Client>, Client> void applyCredentialsProvider(
+            @NotNull final Builder builder,
+            @NotNull final S3Instructions instructions) {
+        builder.credentialsProvider(instructions.awsV2CredentialsProvider());
+    }
+
+    private static <Builder extends AwsClientBuilder<Builder, Client>, Client> void applyRegion(
+            @NotNull final Builder builder,
+            @NotNull final S3Instructions instructions) {
+        instructions.regionName().map(Region::of).ifPresent(builder::region);
+    }
+
+    private static <Builder extends S3BaseClientBuilder<Builder, Client>, Client> void applyCrossRegionAccess(
+            @NotNull final Builder builder,
+            @NotNull final S3Instructions instructions) {
+        if (instructions.crossRegionAccessEnabled()) {
+            // If region is not provided, we enable cross-region access to allow the SDK to determine the region
+            // based on the bucket location and cache it for future requests.
+            builder.crossRegionAccessEnabled(true);
+        }
+    }
+
+    private static <Builder extends SdkClientBuilder<Builder, Client>, Client> void applyEndpointOverride(
+            @NotNull final Builder builder,
+            @NotNull final S3Instructions instructions) {
+        instructions.endpointOverride().ifPresent(builder::endpointOverride);
+    }
+
+    private static class HttpClientConfig {
+
+        static HttpClientConfig of(S3Instructions instructions) {
+            return new HttpClientConfig(instructions.maxConcurrentRequests(), instructions.connectionTimeout());
+        }
+
+        private final int maxConcurrentRequests;
+        private final Duration connectionTimeout;
+
+        HttpClientConfig(final int maxConcurrentRequests, final Duration connectionTimeout) {
+            this.maxConcurrentRequests = maxConcurrentRequests;
+            this.connectionTimeout = connectionTimeout;
+        }
+
+        @Override
+        public int hashCode() {
+            int result = maxConcurrentRequests;
+            result = 31 * result + connectionTimeout.hashCode();
+            return result;
+        }
+
+        @Override
+        public boolean equals(final Object other) {
+            if (this == other) {
+                return true;
+            }
+            if (other == null || getClass() != other.getClass()) {
+                return false;
+            }
+            final HttpClientConfig that = (HttpClientConfig) other;
+            return maxConcurrentRequests == that.maxConcurrentRequests
+                    && connectionTimeout.equals(that.connectionTimeout);
+        }
+
+        SdkAsyncHttpClient buildAsync() {
+            return AwsCrtAsyncHttpClient.builder()
+                    .maxConcurrency(maxConcurrentRequests)
+                    .connectionTimeout(connectionTimeout)
+                    .build();
+        }
+
+        SdkHttpClient buildSync() {
+            return AwsCrtHttpClient.builder()
+                    .maxConcurrency(maxConcurrentRequests)
+                    .connectionTimeout(connectionTimeout)
+                    .build();
+        }
+    }
+
+    private static SdkAsyncHttpClient getOrBuildHttpAsyncClient(@NotNull final S3Instructions instructions) {
+        return httpAsyncClientCache.computeIfAbsent(HttpClientConfig.of(instructions), HttpClientConfig::buildAsync);
+    }
+
+    private static SdkHttpClient getOrBuildHttpSyncClient(@NotNull final S3Instructions instructions) {
+        return httpSyncClientCache.computeIfAbsent(HttpClientConfig.of(instructions), HttpClientConfig::buildSync);
+    }
+
+    /**
+     * The following executor will be used to complete the futures returned by the async client. This is a shared
+     * executor across all clients with fixed number of threads. This pattern is inspired by the default executor used
+     * by the SDK
+     * ({@code software.amazon.awssdk.core.client.builder.SdkDefaultClientBuilder#resolveAsyncFutureCompletionExecutor})
+     *
+     */
+    private static Executor ensureAsyncFutureCompletionExecutor() {
+        if (futureCompletionExecutor == null) {
+            synchronized (S3ClientFactory.class) {
+                if (futureCompletionExecutor == null) {
+                    futureCompletionExecutor = Executors.newFixedThreadPool(NUM_FUTURE_COMPLETION_THREADS,
+                            new ThreadFactoryBuilder().threadNamePrefix("s3-async-future-completion").build());
+                }
+            }
+        }
+        return futureCompletionExecutor;
+    }
+
+    /**
+     * The following executor will be used to schedule tasks for the async client, such as timeouts and retries. This is
+     * a shared executor across all clients with fixed number of threads. This pattern is inspired by the default
+     * executor used by the SDK
+     * ({@code software.amazon.awssdk.core.client.builder.SdkDefaultClientBuilder#resolveScheduledExecutorService}).
+     */
+    private static ScheduledExecutorService ensureScheduledExecutor() {
+        if (scheduledExecutor == null) {
+            synchronized (S3ClientFactory.class) {
+                if (scheduledExecutor == null) {
+                    scheduledExecutor = Executors.newScheduledThreadPool(NUM_SCHEDULED_EXECUTOR_THREADS,
+                            new ThreadFactoryBuilder().threadNamePrefix("s3-scheduled-executor").build());
+                }
+            }
+        }
+        return scheduledExecutor;
+    }
+}
diff --git a/extensions/s3/src/main/java/io/deephaven/extensions/s3/S3CompletableOutputStream.java b/extensions/s3/src/main/java/io/deephaven/extensions/s3/S3CompletableOutputStream.java
new file mode 100644
index 00000000000..af74d3cf3ae
--- /dev/null
+++ b/extensions/s3/src/main/java/io/deephaven/extensions/s3/S3CompletableOutputStream.java
@@ -0,0 +1,362 @@
+//
+// Copyright (c) 2016-2024 Deephaven Data Labs and Patent Pending
+//
+package io.deephaven.extensions.s3;
+
+import io.deephaven.util.channel.CompletableOutputStream;
+import org.jetbrains.annotations.NotNull;
+import software.amazon.awssdk.core.async.AsyncRequestBody;
+import software.amazon.awssdk.services.s3.S3AsyncClient;
+import software.amazon.awssdk.services.s3.S3Uri;
+import software.amazon.awssdk.services.s3.internal.multipart.SdkPojoConversionUtils;
+import software.amazon.awssdk.services.s3.model.AbortMultipartUploadRequest;
+import software.amazon.awssdk.services.s3.model.CompleteMultipartUploadRequest;
+import software.amazon.awssdk.services.s3.model.CompletedMultipartUpload;
+import software.amazon.awssdk.services.s3.model.CompletedPart;
+import software.amazon.awssdk.services.s3.model.CreateMultipartUploadRequest;
+import software.amazon.awssdk.services.s3.model.CreateMultipartUploadResponse;
+import software.amazon.awssdk.services.s3.model.UploadPartRequest;
+import software.amazon.awssdk.services.s3.model.UploadPartResponse;
+
+import java.io.IOException;
+import java.net.URI;
+import java.nio.ByteBuffer;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.concurrent.CompletableFuture;
+import java.util.concurrent.ExecutionException;
+
+import static io.deephaven.extensions.s3.S3ChannelContext.handleS3Exception;
+import static io.deephaven.extensions.s3.S3Instructions.MIN_WRITE_PART_SIZE;
+
+class S3CompletableOutputStream extends CompletableOutputStream {
+
+    /**
+     * @see <a href="https://docs.aws.amazon.com/AmazonS3/latest/userguide/qfacts.html">Amazon S3 User Guide</a>
+     */
+    private static final int MIN_PART_NUMBER = 1;
+    private static final int MAX_PART_NUMBER = 10000;
+    private static final int INVALID_PART_NUMBER = -1;
+
+    private enum State {
+        OPEN, DONE, COMPLETED, ABORTED
+    }
+
+    private final S3Uri uri;
+    private final S3AsyncClient s3AsyncClient;
+    private final S3Instructions s3Instructions;
+
+    private final int writePartSize;
+    private final int numConcurrentWriteParts;
+
+    private final List<CompletedPart> completedParts;
+    private final List<OutgoingRequest> pendingRequests;
+
+    private int nextPartNumber;
+    private String uploadId; // Initialized on first write, changed back to null when multipart upload completed/aborted
+    private State state;
+
+    S3CompletableOutputStream(
+            @NotNull final URI uri,
+            @NotNull final S3AsyncClient s3AsyncClient,
+            @NotNull final S3Instructions s3Instructions) {
+        this.uri = s3AsyncClient.utilities().parseUri(uri);
+        this.s3AsyncClient = s3AsyncClient;
+        this.s3Instructions = s3Instructions;
+
+        this.writePartSize = s3Instructions.writePartSize();
+        this.numConcurrentWriteParts = s3Instructions.numConcurrentWriteParts();
+        this.pendingRequests = new ArrayList<>(numConcurrentWriteParts);
+
+        this.nextPartNumber = MIN_PART_NUMBER;
+        this.completedParts = new ArrayList<>();
+        this.state = State.OPEN;
+    }
+
+    @Override
+    public void write(final int b) throws IOException {
+        write((dest, destOff, destCount) -> {
+            dest.put((byte) b);
+            return 1;
+        }, 0, 1);
+    }
+
+    @Override
+    public void write(final byte @NotNull [] b) throws IOException {
+        write(b, 0, b.length);
+    }
+
+    @Override
+    public void write(final byte @NotNull [] b, final int off, final int len) throws IOException {
+        write((dest, currentOffset, remainingLength) -> {
+            final int lengthToWrite = Math.min(remainingLength, dest.remaining());
+            dest.put(b, currentOffset, lengthToWrite);
+            return lengthToWrite;
+        }, off, len);
+    }
+
+    @FunctionalInterface
+    private interface DataWriter {
+        /**
+         * Writes source data from a single {@code outputStream.write} call to the given destination buffer, starting
+         * from the current offset in the source data.
+         *
+         * @param dest the destination buffer to write data to
+         * @param currentOffset the current offset in the source data
+         * @param remainingLength the remaining number of bytes of source data to write
+         * @return the number of bytes written to the destination buffer
+         *
+         * @throws IOException if an I/O error occurs during the write operation
+         */
+        int write(ByteBuffer dest, int currentOffset, int remainingLength) throws IOException;
+    }
+
+    /**
+     * Writes source data from a single {@code outputStream.write} call to S3 using the provided {@link DataWriter}.
+     *
+     * @param writer the {@link DataWriter} used to write data to the destination buffer
+     * @param off the offset in the source data from which to start writing
+     * @param len the length of the data to be written
+     *
+     * @throws IOException if an I/O error occurs during the write operation or if the stream is not {@link State#OPEN}
+     */
+    private void write(@NotNull final DataWriter writer, int off, int len) throws IOException {
+        if (state != State.OPEN) {
+            throw new IOException("Cannot write to stream for uri " + uri + " because stream in state " + state +
+                    " instead of OPEN");
+        }
+        while (len != 0) {
+            if (uploadId == null) {
+                // Initialize the upload ID for the multipart upload
+                uploadId = initiateMultipartUpload();
+            }
+
+            // We use request slots in a circular queue fashion
+            final int nextSlotId = (nextPartNumber - 1) % numConcurrentWriteParts;
+            final OutgoingRequest useRequest;
+            if (pendingRequests.size() == nextSlotId) {
+                pendingRequests.add(useRequest = new OutgoingRequest(writePartSize));
+            } else if (pendingRequests.size() < nextSlotId) {
+                throw new IllegalStateException("Unexpected slot ID " + nextSlotId + " for uri " + uri + " with " +
+                        pendingRequests.size() + " pending requests.");
+            } else {
+                useRequest = pendingRequests.get(nextSlotId);
+                // Wait for the oldest upload to complete if no space is available
+                if (useRequest.future != null) {
+                    waitForCompletion(useRequest);
+                }
+            }
+
+            // Write as much as possible to this buffer
+            final ByteBuffer buffer = useRequest.buffer;
+            final int lengthWritten = writer.write(buffer, off, len);
+            if (!buffer.hasRemaining()) {
+                sendPartRequest(useRequest);
+            }
+            off += lengthWritten;
+            len -= lengthWritten;
+        }
+    }
+
+    @Override
+    public void flush() throws IOException {
+        // Flush the next part if it is larger than the minimum part size
+        flushImpl(false);
+    }
+
+    @Override
+    public void done() throws IOException {
+        if (state == State.DONE) {
+            return;
+        }
+        if (state != State.OPEN) {
+            throw new IOException("Cannot mark stream as done for uri " + uri + " because stream in state " + state +
+                    " instead of OPEN");
+        }
+        flushImpl(true);
+        state = State.DONE;
+    }
+
+    @Override
+    public void complete() throws IOException {
+        if (state == State.COMPLETED) {
+            return;
+        }
+        done();
+        completeMultipartUpload();
+        state = State.COMPLETED;
+    }
+
+    @Override
+    public void rollback() throws IOException {
+        if (state == State.COMPLETED || state == State.ABORTED) {
+            // Cannot roll back a completed or aborted multipart upload
+            return;
+        }
+        abortMultipartUpload();
+        state = State.ABORTED;
+    }
+
+    @Override
+    public void close() throws IOException {
+        if (state == State.COMPLETED || state == State.ABORTED) {
+            return;
+        }
+        abortMultipartUpload();
+        state = State.ABORTED;
+    }
+
+    ////////// Helper methods and classes //////////
+
+    private static class OutgoingRequest {
+        /**
+         * The buffer for this request
+         */
+        private final ByteBuffer buffer;
+
+        /**
+         * The part number for the part to be uploaded
+         */
+        private int partNumber;
+
+        /**
+         * The future for the part upload
+         */
+        private CompletableFuture<UploadPartResponse> future;
+
+        OutgoingRequest(final int writePartSize) {
+            // TODO(deephaven-core#5935): Experiment with buffer pool here
+            buffer = ByteBuffer.allocate(writePartSize);
+            partNumber = INVALID_PART_NUMBER;
+        }
+    }
+
+    private String initiateMultipartUpload() throws IOException {
+        final CreateMultipartUploadRequest createMultipartUploadRequest = CreateMultipartUploadRequest.builder()
+                .bucket(uri.bucket().orElseThrow())
+                .key(uri.key().orElseThrow())
+                .build();
+        // Note: We can add support for other parameters like tagging, storage class, encryption, permissions, etc. in
+        // future
+        final CompletableFuture<CreateMultipartUploadResponse> future =
+                s3AsyncClient.createMultipartUpload(createMultipartUploadRequest);
+        final CreateMultipartUploadResponse response;
+        try {
+            response = future.get();
+        } catch (final InterruptedException | ExecutionException e) {
+            throw handleS3Exception(e, String.format("initiating multipart upload for uri %s", uri), s3Instructions);
+        }
+        return response.uploadId();
+    }
+
+    /**
+     * Send a part request for the given buffer. This method assumes that the buffer is non-empty.
+     */
+    private void sendPartRequest(final OutgoingRequest request) throws IOException {
+        if (nextPartNumber > MAX_PART_NUMBER) {
+            throw new IOException("Cannot upload more than " + MAX_PART_NUMBER + " parts for uri " + uri + ", please" +
+                    " try again with a larger part size");
+        }
+        if (request.future != null) {
+            throw new IllegalStateException("Request already in progress for uri " + uri + " with part number " +
+                    nextPartNumber);
+        }
+        final UploadPartRequest uploadPartRequest = UploadPartRequest.builder()
+                .bucket(uri.bucket().orElseThrow())
+                .key(uri.key().orElseThrow())
+                .uploadId(uploadId)
+                .partNumber(nextPartNumber)
+                .build();
+        request.buffer.flip();
+        request.future = s3AsyncClient.uploadPart(uploadPartRequest,
+                AsyncRequestBody.fromByteBufferUnsafe(request.buffer));
+        request.partNumber = nextPartNumber;
+        nextPartNumber++;
+    }
+
+    private void waitForCompletion(final OutgoingRequest request) throws IOException {
+        final UploadPartResponse uploadPartResponse;
+        try {
+            uploadPartResponse = request.future.get();
+        } catch (final InterruptedException | ExecutionException e) {
+            throw handleS3Exception(e, String.format("waiting for part %d for uri %s to complete uploading",
+                    request.partNumber, uri), s3Instructions);
+        }
+        completedParts.add(SdkPojoConversionUtils.toCompletedPart(uploadPartResponse, request.partNumber));
+        request.buffer.clear();
+        request.future = null;
+        request.partNumber = INVALID_PART_NUMBER;
+    }
+
+    /**
+     * Flushes the current buffer to S3.
+     *
+     * @param force if true, forces the buffer to be flushed even if it is smaller than the minimum
+     *        {@value S3Instructions#MIN_WRITE_PART_SIZE} MiB threshold, which should only be done for the very last
+     *        part.
+     * @throws IOException if an I/O error occurs during the flush operation
+     */
+    private void flushImpl(final boolean force) throws IOException {
+        final int nextSlotId = (nextPartNumber - 1) % numConcurrentWriteParts;
+        if (pendingRequests.size() == nextSlotId) {
+            // Nothing to flush
+            return;
+        }
+        final OutgoingRequest request = pendingRequests.get(nextSlotId);
+        if (request.buffer.position() != 0
+                && request.future == null
+                && (force || request.buffer.position() >= MIN_WRITE_PART_SIZE)) {
+            sendPartRequest(request);
+        }
+    }
+
+    private void completeMultipartUpload() throws IOException {
+        if (uploadId == null) {
+            throw new IllegalStateException("Cannot complete multipart upload for uri " + uri + " because upload ID " +
+                    "is null");
+        }
+        // Complete all pending requests in the exact order they were sent
+        final int partCount = nextPartNumber - 1;
+        for (int partNumber = completedParts.size() + 1; partNumber <= partCount; partNumber++) {
+            // Part numbers start from 1, therefore, we use (partNumber - 1) for the slot ID
+            final int slotId = (partNumber - 1) % numConcurrentWriteParts;
+            final OutgoingRequest request = pendingRequests.get(slotId);
+            waitForCompletion(request);
+        }
+        final CompleteMultipartUploadRequest completeRequest = CompleteMultipartUploadRequest.builder()
+                .bucket(uri.bucket().orElseThrow())
+                .key(uri.key().orElseThrow())
+                .uploadId(uploadId)
+                .multipartUpload(CompletedMultipartUpload.builder()
+                        .parts(completedParts)
+                        .build())
+                .build();
+        try {
+            s3AsyncClient.completeMultipartUpload(completeRequest).get();
+        } catch (final InterruptedException | ExecutionException e) {
+            throw handleS3Exception(e, String.format("completing multipart upload for uri %s", uri), s3Instructions);
+        }
+        uploadId = null;
+    }
+
+    /**
+     * Abort the multipart upload if it is in progress.
+     */
+    private void abortMultipartUpload() throws IOException {
+        if (uploadId == null) {
+            // We didn't start the upload, so nothing to abort
+            return;
+        }
+        final AbortMultipartUploadRequest abortRequest = AbortMultipartUploadRequest.builder()
+                .bucket(uri.bucket().orElseThrow())
+                .key(uri.key().orElseThrow())
+                .uploadId(uploadId)
+                .build();
+        try {
+            s3AsyncClient.abortMultipartUpload(abortRequest).get();
+        } catch (final InterruptedException | ExecutionException e) {
+            throw handleS3Exception(e, String.format("aborting multipart upload for uri %s", uri), s3Instructions);
+        }
+        uploadId = null;
+    }
+}
diff --git a/extensions/s3/src/main/java/io/deephaven/extensions/s3/S3Instructions.java b/extensions/s3/src/main/java/io/deephaven/extensions/s3/S3Instructions.java
index 27d313a235c..0bb99e9ba28 100644
--- a/extensions/s3/src/main/java/io/deephaven/extensions/s3/S3Instructions.java
+++ b/extensions/s3/src/main/java/io/deephaven/extensions/s3/S3Instructions.java
@@ -6,13 +6,17 @@
 import io.deephaven.annotations.CopyableStyle;
 import io.deephaven.base.log.LogOutput;
 import io.deephaven.base.log.LogOutputAppendable;
+import io.deephaven.util.annotations.VisibleForTesting;
 import org.immutables.value.Value.Check;
 import org.immutables.value.Value.Default;
 import org.immutables.value.Value.Immutable;
 import org.immutables.value.Value.Lazy;
 import software.amazon.awssdk.auth.credentials.AwsCredentialsProvider;
+import software.amazon.awssdk.core.client.config.ClientOverrideConfiguration;
+import software.amazon.awssdk.profiles.ProfileFile;
 
 import java.net.URI;
+import java.nio.file.Path;
 import java.time.Duration;
 import java.util.Optional;
 
@@ -24,12 +28,23 @@
 @CopyableStyle
 public abstract class S3Instructions implements LogOutputAppendable {
 
-    private final static int DEFAULT_MAX_CONCURRENT_REQUESTS = 256;
-    private final static int DEFAULT_READ_AHEAD_COUNT = 32;
-    private final static int DEFAULT_FRAGMENT_SIZE = 1 << 16; // 64 KiB
-    private final static int MIN_FRAGMENT_SIZE = 8 << 10; // 8 KiB
-    private final static Duration DEFAULT_CONNECTION_TIMEOUT = Duration.ofSeconds(2);
-    private final static Duration DEFAULT_READ_TIMEOUT = Duration.ofSeconds(2);
+    private static final int DEFAULT_MAX_CONCURRENT_REQUESTS = 256;
+    private static final int DEFAULT_READ_AHEAD_COUNT = 32;
+    private static final int DEFAULT_FRAGMENT_SIZE = 1 << 16; // 64 KiB
+    private static final int MIN_FRAGMENT_SIZE = 8 << 10; // 8 KiB
+    private static final Duration DEFAULT_CONNECTION_TIMEOUT = Duration.ofSeconds(2);
+    private static final Duration DEFAULT_READ_TIMEOUT = Duration.ofSeconds(2);
+    private static final int DEFAULT_NUM_CONCURRENT_WRITE_PARTS = 64;
+
+    /**
+     * We set default part size to 10 MiB. The maximum number of parts allowed is 10,000. This means maximum size of a
+     * single file that we can write is roughly 100k MiB (or about 98 GiB). For uploading larger files, user would need
+     * to set a larger part size.
+     *
+     * @see <a href="https://docs.aws.amazon.com/AmazonS3/latest/userguide/qfacts.html">Amazon S3 User Guide</a>
+     */
+    private static final int DEFAULT_WRITE_PART_SIZE = 10 << 20; // 10 MiB
+    static final int MIN_WRITE_PART_SIZE = 5 << 20; // 5 MiB
 
     static final S3Instructions DEFAULT = builder().build();
 
@@ -40,7 +55,9 @@ public static Builder builder() {
     /**
      * The region name to use when reading or writing to S3. If not provided, the region name is picked by the AWS SDK
      * from 'aws.region' system property, "AWS_REGION" environment variable, the {user.home}/.aws/credentials or
-     * {user.home}/.aws/config files, or from EC2 metadata service, if running in EC2.
+     * {user.home}/.aws/config files, or from EC2 metadata service, if running in EC2. If no region name is derived from
+     * the above chain or derived the region name derived is incorrect for the bucket accessed, the correct region name
+     * will be derived internally, at the cost of one additional request.
      */
     public abstract Optional<String> regionName();
 
@@ -63,9 +80,9 @@ public int readAheadCount() {
     }
 
     /**
-     * The maximum byte size of each fragment to read from S3, defaults to {@value DEFAULT_FRAGMENT_SIZE}, must be
-     * larger than {@value MIN_FRAGMENT_SIZE}. If there are fewer bytes remaining in the file, the fetched fragment can
-     * be smaller.
+     * The maximum byte size of each fragment to read from S3 in bytes, defaults to {@value DEFAULT_FRAGMENT_SIZE}, must
+     * be larger than {@value MIN_FRAGMENT_SIZE}. If there are fewer bytes remaining in the file, the fetched fragment
+     * can be smaller.
      */
     @Default
     public int fragmentSize() {
@@ -92,11 +109,80 @@ public Duration readTimeout() {
     }
 
     /**
-     * The credentials to use when reading or writing to S3. By default, uses {@link Credentials#defaultCredentials()}.
+     * The credentials to use when reading or writing to S3. By default, uses {@link Credentials#resolving()}.
      */
     @Default
     public Credentials credentials() {
-        return Credentials.defaultCredentials();
+        return Credentials.resolving();
+    }
+
+    /**
+     * The size of each part (in bytes) to upload when writing to S3, defaults to {@value #DEFAULT_WRITE_PART_SIZE}. The
+     * minimum allowed part size is {@value #MIN_WRITE_PART_SIZE}. Setting a higher value may increase throughput, but
+     * may also increase memory usage. Note that the maximum number of parts allowed for a single file is 10,000.
+     * Therefore, for {@value #DEFAULT_WRITE_PART_SIZE} part size, the maximum size of a single file that can be written
+     * is {@value #DEFAULT_WRITE_PART_SIZE} * 10,000 bytes.
+     */
+    @Default
+    public int writePartSize() {
+        return DEFAULT_WRITE_PART_SIZE;
+    }
+
+    /**
+     * The maximum number of parts that can be uploaded concurrently when writing to S3 without blocking. Setting a
+     * higher value may increase throughput, but may also increase memory usage. Defaults to
+     * {@value #DEFAULT_NUM_CONCURRENT_WRITE_PARTS}.
+     */
+    @Default
+    public int numConcurrentWriteParts() {
+        return DEFAULT_NUM_CONCURRENT_WRITE_PARTS;
+    }
+
+    /**
+     * The default profile name used for configuring the default region, credentials, etc., when reading or writing to
+     * S3. If not provided, the AWS SDK picks the profile name from the 'aws.profile' system property, the "AWS_PROFILE"
+     * environment variable, or defaults to "default".
+     * <p>
+     * Setting a profile name assumes that the credentials are provided via this profile; if that is not the case, you
+     * must explicitly set {@link #credentials() credentials}.
+     *
+     * @see ClientOverrideConfiguration.Builder#defaultProfileName(String)
+     */
+    public abstract Optional<String> profileName();
+
+    /**
+     * The path to the configuration file to use for configuring the default region, credentials, etc. when reading or
+     * writing to S3. If not provided, the AWS SDK picks the configuration file from the 'aws.configFile' system
+     * property, the "AWS_CONFIG_FILE" environment variable, or defaults to "{user.home}/.aws/config".
+     * <p>
+     * Setting a configuration file path assumes that the credentials are provided via the configuration and credentials
+     * files; if that is not the case, you must explicitly set {@link #credentials() credentials}.
+     *
+     * @see ClientOverrideConfiguration.Builder#defaultProfileFile(ProfileFile)
+     */
+    public abstract Optional<Path> configFilePath();
+
+    /**
+     * The path to the credentials file to use for configuring the default region, credentials, etc. when reading or
+     * writing to S3. If not provided, the AWS SDK picks the credentials file from the 'aws.credentialsFile' system
+     * property, the "AWS_CREDENTIALS_FILE" environment variable, or defaults to "{user.home}/.aws/credentials".
+     * <p>
+     * Setting a credentials file path assumes that the credentials are provided via the config and credentials files;
+     * if that is not the case, you must explicitly set {@link #credentials() credentials}.
+     *
+     * @see ClientOverrideConfiguration.Builder#defaultProfileFile(ProfileFile)
+     */
+    public abstract Optional<Path> credentialsFilePath();
+
+    /**
+     * The aggregated profile file that combines the configuration and credentials files.
+     */
+    @Lazy
+    Optional<ProfileFile> aggregatedProfileFile() {
+        if (configFilePath().isPresent() || credentialsFilePath().isPresent()) {
+            return Optional.of(S3Utils.aggregateProfileFile(configFilePath(), credentialsFilePath()));
+        }
+        return Optional.empty();
     }
 
     @Override
@@ -112,6 +198,8 @@ public LogOutput append(final LogOutput logOutput) {
      */
     public abstract Optional<URI> endpointOverride();
 
+    public abstract S3Instructions withEndpointOverride(final URI endpointOverride);
+
     public interface Builder {
         Builder regionName(String regionName);
 
@@ -129,15 +217,36 @@ public interface Builder {
 
         Builder endpointOverride(URI endpointOverride);
 
-        default Builder endpointOverride(String endpointOverride) {
+        Builder writePartSize(int writePartSize);
+
+        Builder numConcurrentWriteParts(int numConcurrentWriteParts);
+
+        Builder profileName(String profileName);
+
+        Builder configFilePath(Path configFilePath);
+
+        Builder credentialsFilePath(Path credentialsFilePath);
+
+        default Builder endpointOverride(final String endpointOverride) {
             return endpointOverride(URI.create(endpointOverride));
         }
 
+        default Builder configFilePath(final String configFilePath) {
+            return configFilePath(Path.of(configFilePath));
+        }
+
+        default Builder credentialsFilePath(final String credentialsFilePath) {
+            return credentialsFilePath(Path.of(credentialsFilePath));
+        }
+
         S3Instructions build();
     }
 
     abstract S3Instructions withReadAheadCount(int readAheadCount);
 
+    @VisibleForTesting
+    public abstract S3Instructions withRegionName(Optional<String> regionName);
+
     @Lazy
     S3Instructions singleUse() {
         final int readAheadCount = Math.min(DEFAULT_READ_AHEAD_COUNT, readAheadCount());
@@ -174,8 +283,38 @@ final void awsSdkV2Credentials() {
         }
     }
 
+    @Check
+    final void boundsCheckWritePartSize() {
+        if (writePartSize() < MIN_WRITE_PART_SIZE) {
+            throw new IllegalArgumentException(
+                    "writePartSize(=" + writePartSize() + ") must be >= " + MIN_WRITE_PART_SIZE + " MiB");
+        }
+    }
+
+    @Check
+    final void boundsCheckMinNumConcurrentWriteParts() {
+        if (numConcurrentWriteParts() < 1) {
+            throw new IllegalArgumentException(
+                    "numConcurrentWriteParts(=" + numConcurrentWriteParts() + ") must be >= 1");
+        }
+    }
+
+    @Check
+    final void boundsCheckMaxNumConcurrentWriteParts() {
+        if (numConcurrentWriteParts() > maxConcurrentRequests()) {
+            throw new IllegalArgumentException(
+                    "numConcurrentWriteParts(=" + numConcurrentWriteParts() + ") must be <= " +
+                            "maxConcurrentRequests(=" + maxConcurrentRequests() + ")");
+        }
+    }
+
     final AwsCredentialsProvider awsV2CredentialsProvider() {
-        return ((AwsSdkV2Credentials) credentials()).awsV2CredentialsProvider();
+        return ((AwsSdkV2Credentials) credentials()).awsV2CredentialsProvider(this);
+    }
+
+    final boolean crossRegionAccessEnabled() {
+        // Note: this can be elevated to user-level control (with the same default) in the future if necessary
+        return regionName().isEmpty();
     }
 
     // If necessary, we _could_ plumb support for "S3-compatible" services which don't support virtual-host style
diff --git a/extensions/s3/src/main/java/io/deephaven/extensions/s3/S3SeekableChannelProvider.java b/extensions/s3/src/main/java/io/deephaven/extensions/s3/S3SeekableChannelProvider.java
index d819fc4d3c6..477c2031831 100644
--- a/extensions/s3/src/main/java/io/deephaven/extensions/s3/S3SeekableChannelProvider.java
+++ b/extensions/s3/src/main/java/io/deephaven/extensions/s3/S3SeekableChannelProvider.java
@@ -11,13 +11,17 @@
 import io.deephaven.internal.log.LoggerFactory;
 import io.deephaven.io.logger.Logger;
 import io.deephaven.util.channel.Channels;
+import io.deephaven.util.channel.CompletableOutputStream;
 import io.deephaven.util.channel.SeekableChannelContext;
 import io.deephaven.util.channel.SeekableChannelsProvider;
 import org.jetbrains.annotations.NotNull;
 import software.amazon.awssdk.services.s3.S3AsyncClient;
 import software.amazon.awssdk.services.s3.S3Uri;
+import software.amazon.awssdk.services.s3.model.HeadObjectRequest;
+import software.amazon.awssdk.services.s3.model.HeadObjectResponse;
 import software.amazon.awssdk.services.s3.model.ListObjectsV2Request;
 import software.amazon.awssdk.services.s3.model.ListObjectsV2Response;
+import software.amazon.awssdk.services.s3.model.NoSuchKeyException;
 
 import java.io.IOException;
 import java.io.InputStream;
@@ -25,7 +29,6 @@
 import java.net.URI;
 import java.net.URISyntaxException;
 import java.nio.channels.SeekableByteChannel;
-import java.nio.file.Path;
 import java.util.Iterator;
 import java.util.Map;
 import java.util.NoSuchElementException;
@@ -48,9 +51,10 @@
 /**
  * {@link SeekableChannelsProvider} implementation that is used to fetch objects from an S3-compatible API.
  */
-final class S3SeekableChannelProvider implements SeekableChannelsProvider {
+class S3SeekableChannelProvider implements SeekableChannelsProvider {
 
     private static final int MAX_KEYS_PER_BATCH = 1000;
+    private static final int UNKNOWN_SIZE = -1;
 
     private static final Logger log = LoggerFactory.getLogger(S3SeekableChannelProvider.class);
 
@@ -70,20 +74,37 @@ final class S3SeekableChannelProvider implements SeekableChannelsProvider {
     private volatile SoftReference<Map<URI, FileSizeInfo>> fileSizeCacheRef;
 
     S3SeekableChannelProvider(@NotNull final S3Instructions s3Instructions) {
-        this.s3AsyncClient = S3AsyncClientFactory.getAsyncClient(s3Instructions);
+        this.s3AsyncClient = S3ClientFactory.getAsyncClient(s3Instructions);
         this.s3Instructions = s3Instructions;
         this.sharedCache = new S3RequestCache(s3Instructions.fragmentSize());
         this.fileSizeCacheRef = new SoftReference<>(new KeyedObjectHashMap<>(FileSizeInfo.URI_MATCH_KEY));
     }
 
     @Override
-    public SeekableByteChannel getReadChannel(@NotNull final SeekableChannelContext channelContext,
+    public boolean exists(@NotNull final URI uri) {
+        if (getCachedSize(uri) != UNKNOWN_SIZE) {
+            return true;
+        }
+        final S3Uri s3Uri = s3AsyncClient.utilities().parseUri(uri);
+        try {
+            fetchFileSize(s3Uri);
+        } catch (final NoSuchKeyException e) {
+            return false;
+        } catch (final IOException e) {
+            throw new UncheckedDeephavenException("Error fetching file size for URI " + uri, e);
+        }
+        return true;
+    }
+
+    @Override
+    public SeekableByteChannel getReadChannel(
+            @NotNull final SeekableChannelContext channelContext,
             @NotNull final URI uri) {
         final S3Uri s3Uri = s3AsyncClient.utilities().parseUri(uri);
         // context is unused here, will be set before reading from the channel
-        final Map<URI, FileSizeInfo> fileSizeCache = fileSizeCacheRef.get();
-        if (fileSizeCache != null && fileSizeCache.containsKey(uri)) {
-            return new S3SeekableByteChannel(s3Uri, fileSizeCache.get(uri).size);
+        final long cachedSize = getCachedSize(uri);
+        if (cachedSize != UNKNOWN_SIZE) {
+            return new S3SeekableByteChannel(s3Uri, cachedSize);
         }
         return new S3SeekableByteChannel(s3Uri);
     }
@@ -110,8 +131,9 @@ public boolean isCompatibleWith(@NotNull final SeekableChannelContext channelCon
     }
 
     @Override
-    public SeekableByteChannel getWriteChannel(@NotNull final Path path, final boolean append) {
-        throw new UnsupportedOperationException("Writing to S3 is currently unsupported");
+    public CompletableOutputStream getOutputStream(@NotNull final URI uri, final int bufferSizeHint) {
+        // bufferSizeHint is unused because s3 output stream is buffered internally into parts
+        return new S3CompletableOutputStream(uri, s3AsyncClient, s3Instructions);
     }
 
     @Override
@@ -119,7 +141,7 @@ public Stream<URI> list(@NotNull final URI directory) {
         if (log.isDebugEnabled()) {
             log.debug().append("Fetching child URIs for directory: ").append(directory.toString()).endl();
         }
-        return createStream(directory, false);
+        return createStream(directory, false, S3_URI_SCHEME);
     }
 
     @Override
@@ -127,10 +149,20 @@ public Stream<URI> walk(@NotNull final URI directory) {
         if (log.isDebugEnabled()) {
             log.debug().append("Performing recursive traversal from directory: ").append(directory.toString()).endl();
         }
-        return createStream(directory, true);
+        return createStream(directory, true, S3_URI_SCHEME);
     }
 
-    private Stream<URI> createStream(@NotNull final URI directory, final boolean isRecursive) {
+    /**
+     * Create a stream of URIs, the elements of which are the entries in the directory.
+     *
+     * @param directory The parent directory to list.
+     * @param isRecursive Whether to list the entries recursively.
+     * @param childScheme The scheme to apply to the children URIs in the returned stream.
+     */
+    Stream<URI> createStream(
+            @NotNull final URI directory,
+            final boolean isRecursive,
+            @NotNull final String childScheme) {
         // The following iterator fetches URIs from S3 in batches and creates a stream
         final Iterator<URI> iterator = new Iterator<>() {
             private final String bucketName;
@@ -142,7 +174,7 @@ private Stream<URI> createStream(@NotNull final URI directory, final boolean isR
             {
                 final S3Uri s3DirectoryURI = s3AsyncClient.utilities().parseUri(directory);
                 bucketName = s3DirectoryURI.bucket().orElseThrow();
-                directoryKey = s3DirectoryURI.key().orElseThrow();
+                directoryKey = s3DirectoryURI.key().orElse(""); // Empty string for the bucket root
             }
 
             @Override
@@ -177,8 +209,10 @@ public URI next() {
             private void fetchNextBatch() throws IOException {
                 final ListObjectsV2Request.Builder requestBuilder = ListObjectsV2Request.builder()
                         .bucket(bucketName)
-                        .prefix(directoryKey)
                         .maxKeys(MAX_KEYS_PER_BATCH);
+                if (!directoryKey.isEmpty()) {
+                    requestBuilder.prefix(directoryKey);
+                }
                 if (!isRecursive) {
                     // Add a delimiter to the request if we don't want to fetch all files recursively
                     requestBuilder.delimiter("/");
@@ -201,7 +235,7 @@ private void fetchNextBatch() throws IOException {
                             }
                             final URI uri;
                             try {
-                                uri = new URI(S3_URI_SCHEME, directory.getUserInfo(), directory.getHost(),
+                                uri = new URI(childScheme, directory.getUserInfo(), directory.getHost(),
                                         directory.getPort(), path, null, null);
                             } catch (final URISyntaxException e) {
                                 throw new UncheckedDeephavenException("Failed to create URI for S3 object with key: "
@@ -234,10 +268,58 @@ private Map<URI, FileSizeInfo> getFileSizeCache() {
         return cache;
     }
 
+    /**
+     * Fetch the size of the file at the given S3 URI.
+     *
+     * @throws NoSuchKeyException if the file does not exist
+     * @throws IOException if there is an error fetching the file size
+     */
+    long fetchFileSize(@NotNull final S3Uri s3Uri) throws IOException {
+        final long cachedSize = getCachedSize(s3Uri.uri());
+        if (cachedSize != UNKNOWN_SIZE) {
+            return cachedSize;
+        }
+        // Fetch the size of the file using a blocking HEAD request, and store it in the cache for future use
+        if (log.isDebugEnabled()) {
+            log.debug().append("Head: ").append(s3Uri.toString()).endl();
+        }
+        final HeadObjectResponse headObjectResponse;
+        try {
+            headObjectResponse = s3AsyncClient
+                    .headObject(HeadObjectRequest.builder()
+                            .bucket(s3Uri.bucket().orElseThrow())
+                            .key(s3Uri.key().orElseThrow())
+                            .build())
+                    .get(s3Instructions.readTimeout().toNanos(), TimeUnit.NANOSECONDS);
+        } catch (final InterruptedException | ExecutionException | TimeoutException | CancellationException e) {
+            throw handleS3Exception(e, String.format("fetching HEAD for file %s", s3Uri), s3Instructions);
+        }
+        final long fileSize = headObjectResponse.contentLength();
+        updateFileSizeCache(s3Uri.uri(), fileSize);
+        return fileSize;
+    }
+
+    /**
+     * Get the cached size for the given URI, or {@value UNKNOWN_SIZE} if the size is not cached.
+     */
+    private long getCachedSize(final URI uri) {
+        final Map<URI, FileSizeInfo> fileSizeCache = fileSizeCacheRef.get();
+        if (fileSizeCache != null) {
+            final FileSizeInfo sizeInfo = fileSizeCache.get(uri);
+            if (sizeInfo != null) {
+                return sizeInfo.size;
+            }
+        }
+        return UNKNOWN_SIZE;
+    }
+
     /**
      * Cache the file size for the given URI.
      */
-    void updateFileSizeCache(@NotNull final URI uri, final long size) {
+    private void updateFileSizeCache(@NotNull final URI uri, final long size) {
+        if (size < 0) {
+            throw new IllegalArgumentException("Invalid file size: " + size + " for URI " + uri);
+        }
         final Map<URI, FileSizeInfo> fileSizeCache = getFileSizeCache();
         fileSizeCache.compute(uri, (key, existingInfo) -> {
             if (existingInfo == null) {
diff --git a/extensions/s3/src/main/java/io/deephaven/extensions/s3/S3SeekableChannelProviderPlugin.java b/extensions/s3/src/main/java/io/deephaven/extensions/s3/S3SeekableChannelProviderPlugin.java
index 619e31b3824..c7c7eac5ad7 100644
--- a/extensions/s3/src/main/java/io/deephaven/extensions/s3/S3SeekableChannelProviderPlugin.java
+++ b/extensions/s3/src/main/java/io/deephaven/extensions/s3/S3SeekableChannelProviderPlugin.java
@@ -20,14 +20,14 @@ public final class S3SeekableChannelProviderPlugin implements SeekableChannelsPr
     static final String S3_URI_SCHEME = "s3";
 
     @Override
-    public boolean isCompatible(@NotNull final URI uri, @Nullable final Object config) {
-        return S3_URI_SCHEME.equals(uri.getScheme());
+    public boolean isCompatible(@NotNull final String uriScheme, @Nullable final Object config) {
+        return S3_URI_SCHEME.equals(uriScheme);
     }
 
     @Override
-    public SeekableChannelsProvider createProvider(@NotNull final URI uri, @Nullable final Object config) {
-        if (!isCompatible(uri, config)) {
-            throw new IllegalArgumentException("Arguments not compatible, provided uri " + uri);
+    public SeekableChannelsProvider createProvider(@NotNull final String uriScheme, @Nullable final Object config) {
+        if (!isCompatible(uriScheme, config)) {
+            throw new IllegalArgumentException("Arguments not compatible, provided uri scheme " + uriScheme);
         }
         if (config != null && !(config instanceof S3Instructions)) {
             throw new IllegalArgumentException("Only S3Instructions are valid when reading files from S3, provided " +
diff --git a/extensions/s3/src/main/java/io/deephaven/extensions/s3/S3Utils.java b/extensions/s3/src/main/java/io/deephaven/extensions/s3/S3Utils.java
new file mode 100644
index 00000000000..1d0b95a4e00
--- /dev/null
+++ b/extensions/s3/src/main/java/io/deephaven/extensions/s3/S3Utils.java
@@ -0,0 +1,51 @@
+//
+// Copyright (c) 2016-2024 Deephaven Data Labs and Patent Pending
+//
+package io.deephaven.extensions.s3;
+
+import org.jetbrains.annotations.NotNull;
+import software.amazon.awssdk.profiles.ProfileFile;
+import software.amazon.awssdk.profiles.ProfileFileLocation;
+
+import java.nio.file.Path;
+import java.util.Optional;
+
+class S3Utils {
+
+    /**
+     * Aggregates the profile files for configuration and credentials files into a single {@link ProfileFile}.
+     *
+     * @param configFilePath An {@link Optional} containing the path to the configuration file. If empty, the aws sdk
+     *        default location is used.
+     * @param credentialsFilePath An {@link Optional} containing the path to the credentials file, If empty, the aws sdk
+     *        default location is used.
+     *
+     * @return A {@link ProfileFile} that aggregates the configuration and credentials files.
+     */
+    @SuppressWarnings("OptionalUsedAsFieldOrParameterType")
+    static ProfileFile aggregateProfileFile(
+            @NotNull final Optional<Path> configFilePath,
+            @NotNull final Optional<Path> credentialsFilePath) {
+        final ProfileFile.Aggregator builder = ProfileFile.aggregator();
+
+        // Add the credentials file
+        credentialsFilePath.or(ProfileFileLocation::credentialsFileLocation)
+                .ifPresent(path -> addProfileFile(builder, ProfileFile.Type.CREDENTIALS, path));
+
+        // Add the configuration file
+        configFilePath.or(ProfileFileLocation::configurationFileLocation)
+                .ifPresent(path -> addProfileFile(builder, ProfileFile.Type.CONFIGURATION, path));
+
+        return builder.build();
+    }
+
+    private static void addProfileFile(
+            @NotNull final ProfileFile.Aggregator builder,
+            @NotNull final ProfileFile.Type type,
+            @NotNull final Path path) {
+        builder.addFile(ProfileFile.builder()
+                .type(type)
+                .content(path)
+                .build());
+    }
+}
diff --git a/extensions/s3/src/test/java/io/deephaven/extensions/s3/CredentialsTest.java b/extensions/s3/src/test/java/io/deephaven/extensions/s3/CredentialsTest.java
index 07e9b825563..5e30478d8aa 100644
--- a/extensions/s3/src/test/java/io/deephaven/extensions/s3/CredentialsTest.java
+++ b/extensions/s3/src/test/java/io/deephaven/extensions/s3/CredentialsTest.java
@@ -3,12 +3,11 @@
 //
 package io.deephaven.extensions.s3;
 
-
 import org.junit.jupiter.api.Test;
 
 import static org.assertj.core.api.Assertions.assertThat;
 
-public class CredentialsTest {
+class CredentialsTest {
 
     @Test
     void defaultCredentials() {
diff --git a/extensions/s3/src/test/java/io/deephaven/extensions/s3/S3InstructionsTest.java b/extensions/s3/src/test/java/io/deephaven/extensions/s3/S3InstructionsTest.java
index 521bc02f6be..36d20b85102 100644
--- a/extensions/s3/src/test/java/io/deephaven/extensions/s3/S3InstructionsTest.java
+++ b/extensions/s3/src/test/java/io/deephaven/extensions/s3/S3InstructionsTest.java
@@ -4,13 +4,18 @@
 package io.deephaven.extensions.s3;
 
 import org.junit.jupiter.api.Test;
+import software.amazon.awssdk.profiles.ProfileFile;
 
+import java.io.IOException;
+import java.nio.file.Files;
+import java.nio.file.Path;
 import java.time.Duration;
 import java.util.Optional;
 
+import static org.assertj.core.api.Assertions.failBecauseExceptionWasNotThrown;
 import static org.assertj.core.api.AssertionsForClassTypes.assertThat;
 
-public class S3InstructionsTest {
+class S3InstructionsTest {
 
     @Test
     void defaults() {
@@ -21,8 +26,14 @@ void defaults() {
         assertThat(instructions.fragmentSize()).isEqualTo(65536);
         assertThat(instructions.connectionTimeout()).isEqualTo(Duration.ofSeconds(2));
         assertThat(instructions.readTimeout()).isEqualTo(Duration.ofSeconds(2));
-        assertThat(instructions.credentials()).isEqualTo(Credentials.defaultCredentials());
+        assertThat(instructions.credentials()).isEqualTo(Credentials.resolving());
+        assertThat(instructions.writePartSize()).isEqualTo(10485760);
+        assertThat(instructions.numConcurrentWriteParts()).isEqualTo(64);
         assertThat(instructions.endpointOverride()).isEmpty();
+        assertThat(instructions.profileName()).isEmpty();
+        assertThat(instructions.configFilePath()).isEmpty();
+        assertThat(instructions.credentialsFilePath()).isEmpty();
+        assertThat(instructions.aggregatedProfileFile()).isEmpty();
     }
 
     @Test
@@ -36,13 +47,26 @@ void testSetRegion() {
     }
 
     @Test
-    void minMaxConcurrentRequests() {
+    void testSetMaxConcurrentRequests() {
         assertThat(S3Instructions.builder()
                 .regionName("some-region")
-                .maxConcurrentRequests(1)
+                .maxConcurrentRequests(100)
                 .build()
                 .maxConcurrentRequests())
-                .isEqualTo(1);
+                .isEqualTo(100);
+    }
+
+    @Test
+    void testMinMaxConcurrentRequests() {
+        try {
+            S3Instructions.builder()
+                    .regionName("some-region")
+                    .maxConcurrentRequests(-1)
+                    .build();
+            failBecauseExceptionWasNotThrown(IllegalArgumentException.class);
+        } catch (IllegalArgumentException e) {
+            assertThat(e).hasMessageContaining("maxConcurrentRequests");
+        }
     }
 
     @Test
@@ -52,6 +76,7 @@ void tooSmallMaxConcurrentRequests() {
                     .regionName("some-region")
                     .maxConcurrentRequests(0)
                     .build();
+            failBecauseExceptionWasNotThrown(IllegalArgumentException.class);
         } catch (IllegalArgumentException e) {
             assertThat(e).hasMessageContaining("maxConcurrentRequests");
         }
@@ -74,6 +99,7 @@ void tooSmallReadAheadCount() {
                     .regionName("some-region")
                     .readAheadCount(-1)
                     .build();
+            failBecauseExceptionWasNotThrown(IllegalArgumentException.class);
         } catch (IllegalArgumentException e) {
             assertThat(e).hasMessageContaining("readAheadCount");
         }
@@ -96,6 +122,7 @@ void tooSmallFragmentSize() {
                     .regionName("some-region")
                     .fragmentSize(8 * (1 << 10) - 1)
                     .build();
+            failBecauseExceptionWasNotThrown(IllegalArgumentException.class);
         } catch (IllegalArgumentException e) {
             assertThat(e).hasMessageContaining("fragmentSize");
         }
@@ -118,8 +145,116 @@ void badCredentials() {
                     .regionName("some-region")
                     .credentials(new Credentials() {})
                     .build();
+            failBecauseExceptionWasNotThrown(IllegalArgumentException.class);
         } catch (IllegalArgumentException e) {
             assertThat(e).hasMessageContaining("credentials");
         }
     }
+
+    @Test
+    void tooSmallWritePartSize() {
+        try {
+            S3Instructions.builder()
+                    .regionName("some-region")
+                    .writePartSize(1024)
+                    .build();
+            failBecauseExceptionWasNotThrown(IllegalArgumentException.class);
+        } catch (IllegalArgumentException e) {
+            assertThat(e).hasMessageContaining("writePartSize");
+        }
+    }
+
+    @Test
+    void tooSmallNumConcurrentWriteParts() {
+        try {
+            S3Instructions.builder()
+                    .regionName("some-region")
+                    .numConcurrentWriteParts(0)
+                    .build();
+            failBecauseExceptionWasNotThrown(IllegalArgumentException.class);
+        } catch (IllegalArgumentException e) {
+            assertThat(e).hasMessageContaining("numConcurrentWriteParts");
+        }
+    }
+
+    @Test
+    void tooLargeNumConcurrentWriteParts() {
+        try {
+            S3Instructions.builder()
+                    .regionName("some-region")
+                    .numConcurrentWriteParts(1001)
+                    .maxConcurrentRequests(1000)
+                    .build();
+            failBecauseExceptionWasNotThrown(IllegalArgumentException.class);
+        } catch (IllegalArgumentException e) {
+            assertThat(e).hasMessageContaining("numConcurrentWriteParts");
+        }
+    }
+
+    @Test
+    void testSetProfileName() {
+        final Optional<String> profileName = S3Instructions.builder()
+                .regionName("some-region")
+                .profileName("some-profile")
+                .build()
+                .profileName();
+        assertThat(profileName.isPresent()).isTrue();
+        assertThat(profileName.get()).isEqualTo("some-profile");
+    }
+
+    @Test
+    void testSetConfigFilePath() throws IOException {
+        // Create temporary config and credentials file and write some data to them
+        final Path tempConfigFile = Files.createTempFile("config", ".tmp");
+        final String configData = "[default]\nregion = us-east-1\n\n[profile test-user]\nregion = us-east-2";
+        Files.write(tempConfigFile, configData.getBytes());
+
+        final Path tempCredentialsFile = Files.createTempFile("credentials", ".tmp");
+        final String credentialsData = "[default]\naws_access_key_id = foo\naws_secret_access_key = bar";
+        Files.write(tempCredentialsFile, credentialsData.getBytes());
+
+        try {
+            final Optional<ProfileFile> ret = S3Instructions.builder()
+                    .configFilePath(tempConfigFile.toString())
+                    .credentialsFilePath(tempCredentialsFile.toString())
+                    .build()
+                    .aggregatedProfileFile();
+            assertThat(ret.isPresent()).isTrue();
+            final ProfileFile profileFile = ret.get();
+            assertThat(profileFile.profiles().size()).isEqualTo(2);
+            assertThat(profileFile.profile("default").get().properties().get("region")).isEqualTo("us-east-1");
+            assertThat(profileFile.profile("default").get().properties().get("aws_access_key_id")).isEqualTo("foo");
+            assertThat(profileFile.profile("default").get().properties().get("aws_secret_access_key")).isEqualTo("bar");
+            assertThat(profileFile.profile("test-user").get().properties().get("region")).isEqualTo("us-east-2");
+        } finally {
+            Files.delete(tempConfigFile);
+            Files.delete(tempCredentialsFile);
+        }
+    }
+
+    @Test
+    void testBadConfigFilePath() {
+        try {
+            S3Instructions.builder()
+                    .configFilePath("/some/random/path")
+                    .build()
+                    .aggregatedProfileFile();
+            failBecauseExceptionWasNotThrown(IllegalStateException.class);
+        } catch (IllegalStateException e) {
+            assertThat(e).hasMessageContaining("/some/random/path");
+        }
+    }
+
+    @Test
+    void testBadCredentialsFilePath() {
+        try {
+            S3Instructions.builder()
+                    .credentialsFilePath("/some/random/path")
+                    .build()
+                    .aggregatedProfileFile();
+            failBecauseExceptionWasNotThrown(IllegalStateException.class);
+        } catch (IllegalStateException e) {
+            assertThat(e).hasMessageContaining("/some/random/path");
+        }
+    }
 }
diff --git a/extensions/s3/src/test/java/io/deephaven/extensions/s3/S3SeekableChannelSimpleMinIOTest.java b/extensions/s3/src/test/java/io/deephaven/extensions/s3/S3SeekableChannelSimpleMinIOTest.java
index 1a91cd0c860..010341d08c2 100644
--- a/extensions/s3/src/test/java/io/deephaven/extensions/s3/S3SeekableChannelSimpleMinIOTest.java
+++ b/extensions/s3/src/test/java/io/deephaven/extensions/s3/S3SeekableChannelSimpleMinIOTest.java
@@ -5,7 +5,7 @@
 
 import io.deephaven.extensions.s3.S3Instructions.Builder;
 import io.deephaven.extensions.s3.testlib.SingletonContainers.MinIO;
-import io.deephaven.stats.util.OSUtil;
+import io.deephaven.base.OSUtil;
 import org.junit.jupiter.api.Assumptions;
 import org.junit.jupiter.api.BeforeAll;
 import org.junit.jupiter.api.Tag;
diff --git a/extensions/s3/src/test/java/io/deephaven/extensions/s3/S3SeekableChannelSimpleTestBase.java b/extensions/s3/src/test/java/io/deephaven/extensions/s3/S3SeekableChannelSimpleTestBase.java
index 68f6a9042c7..aebd6ec5fdf 100644
--- a/extensions/s3/src/test/java/io/deephaven/extensions/s3/S3SeekableChannelSimpleTestBase.java
+++ b/extensions/s3/src/test/java/io/deephaven/extensions/s3/S3SeekableChannelSimpleTestBase.java
@@ -5,8 +5,10 @@
 
 import io.deephaven.extensions.s3.testlib.S3SeekableChannelTestSetup;
 import io.deephaven.util.channel.CachedChannelProvider;
+import io.deephaven.util.channel.CompletableOutputStream;
 import io.deephaven.util.channel.SeekableChannelContext;
 import io.deephaven.util.channel.SeekableChannelsProvider;
+import junit.framework.TestCase;
 import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
@@ -44,7 +46,7 @@ void readSimpleFiles()
             final URI uri = uri("empty.txt");
             final ByteBuffer buffer = ByteBuffer.allocate(1);
             try (
-                    final SeekableChannelsProvider providerImpl = providerImpl(uri);
+                    final SeekableChannelsProvider providerImpl = providerImpl();
                     final SeekableChannelsProvider provider = CachedChannelProvider.create(providerImpl, 32);
                     final SeekableChannelContext context = provider.makeContext();
                     final SeekableByteChannel readChannel = provider.getReadChannel(context, uri)) {
@@ -54,7 +56,7 @@ void readSimpleFiles()
         {
             final URI uri = uri("hello/world.txt");
             try (
-                    final SeekableChannelsProvider providerImpl = providerImpl(uri);
+                    final SeekableChannelsProvider providerImpl = providerImpl();
                     final SeekableChannelsProvider provider = CachedChannelProvider.create(providerImpl, 32);
                     final SeekableChannelContext context = provider.makeContext();
                     final SeekableByteChannel readChannel = provider.getReadChannel(context, uri)) {
@@ -76,7 +78,7 @@ public int read() {
         final URI uri = uri("32MiB.bin");
         final ByteBuffer buffer = ByteBuffer.allocate(1);
         try (
-                final SeekableChannelsProvider providerImpl = providerImpl(uri);
+                final SeekableChannelsProvider providerImpl = providerImpl();
                 final SeekableChannelsProvider provider = CachedChannelProvider.create(providerImpl, 32);
                 final SeekableChannelContext context = provider.makeContext();
                 final SeekableByteChannel readChannel = provider.getReadChannel(context, uri)) {
@@ -88,4 +90,60 @@ public int read() {
             assertThat(readChannel.read(buffer)).isEqualTo(-1);
         }
     }
+
+    @Test
+    void readWriteTest() throws IOException {
+        final URI uri = uri("writeReadTest.txt");
+        final String content = "Hello, world!";
+        final byte[] contentBytes = content.getBytes(StandardCharsets.UTF_8);
+        try (
+                final SeekableChannelsProvider providerImpl = providerImpl();
+                final SeekableChannelsProvider provider = CachedChannelProvider.create(providerImpl, 32);
+                final CompletableOutputStream outputStream = provider.getOutputStream(uri, 0)) {
+            final int numBytes = 36 * 1024 * 1024; // 36 Mib -> Three 10-MiB parts + One 6-MiB part
+            final int numIters = numBytes / contentBytes.length;
+            for (int i = 0; i < numIters; ++i) {
+                outputStream.write(contentBytes);
+            }
+            outputStream.flush();
+            outputStream.flush();
+            outputStream.write(contentBytes);
+            outputStream.flush();
+            outputStream.flush();
+            outputStream.done();
+            outputStream.flush();
+            try {
+                outputStream.write(contentBytes);
+                TestCase.fail("Failure expected on writing since the stream is marked as done.");
+            } catch (IOException expected) {
+            }
+
+            // Push data to S3, but don't close the stream
+            outputStream.complete();
+            try (
+                    final SeekableChannelContext context = provider.makeContext();
+                    final SeekableByteChannel readChannel = provider.getReadChannel(context, uri)) {
+                final ByteBuffer buffer = ByteBuffer.allocate(contentBytes.length);
+                // We wrote total of numIters + 1 times
+                for (int i = 0; i < numIters + 1; ++i) {
+                    fillBuffer(readChannel, buffer);
+                    assertThat(buffer).isEqualTo(ByteBuffer.wrap(contentBytes));
+                    buffer.clear();
+                }
+                // We should have read all the data from the channel
+                assertThat(readChannel.read(buffer)).isEqualTo(-1);
+            }
+
+            // Try rollback, should not delete the file
+            outputStream.rollback();
+            try (
+                    final SeekableChannelContext context = provider.makeContext();
+                    final SeekableByteChannel readChannel = provider.getReadChannel(context, uri)) {
+                final ByteBuffer buffer = ByteBuffer.allocate(contentBytes.length);
+                readChannel.read(buffer);
+                buffer.flip();
+                assertThat(buffer).isEqualTo(ByteBuffer.wrap(contentBytes));
+            }
+        }
+    }
 }
diff --git a/extensions/s3/src/test/java/io/deephaven/extensions/s3/testlib/S3Helper.java b/extensions/s3/src/test/java/io/deephaven/extensions/s3/testlib/S3Helper.java
index 933c63bd288..2e03388bba5 100644
--- a/extensions/s3/src/test/java/io/deephaven/extensions/s3/testlib/S3Helper.java
+++ b/extensions/s3/src/test/java/io/deephaven/extensions/s3/testlib/S3Helper.java
@@ -26,6 +26,12 @@
 import java.util.stream.Collectors;
 
 public final class S3Helper {
+
+    /**
+     * Timeout in seconds for S3 operations for testing.
+     */
+    public static final int TIMEOUT_SECONDS = 30;
+
     public static void uploadDirectory(
             S3AsyncClient s3AsyncClient,
             Path dir,
@@ -59,7 +65,8 @@ private static void uploadDirectory(
     public static void deleteAllKeys(S3AsyncClient s3AsyncClient, String bucket)
             throws ExecutionException, InterruptedException, TimeoutException {
         ListObjectsV2Response response = s3AsyncClient
-                .listObjectsV2(ListObjectsV2Request.builder().bucket(bucket).build()).get(5, TimeUnit.SECONDS);
+                .listObjectsV2(ListObjectsV2Request.builder().bucket(bucket).build())
+                .get(TIMEOUT_SECONDS, TimeUnit.SECONDS);
         final List<CompletableFuture<?>> futures = new ArrayList<>();
         while (true) {
             final List<ObjectIdentifier> deletes = response.contents()
@@ -80,12 +87,13 @@ public static void deleteAllKeys(S3AsyncClient s3AsyncClient, String bucket)
             }
             response = s3AsyncClient.listObjectsV2(
                     ListObjectsV2Request.builder().bucket(bucket).continuationToken(nextContinuationToken).build())
-                    .get(5, TimeUnit.SECONDS);
+                    .get(TIMEOUT_SECONDS, TimeUnit.SECONDS);
         }
         if (futures.isEmpty()) {
             return;
         }
-        CompletableFuture.allOf(futures.stream().toArray(CompletableFuture[]::new)).get(5, TimeUnit.SECONDS);
+        CompletableFuture.allOf(futures.stream().toArray(CompletableFuture[]::new))
+                .get(TIMEOUT_SECONDS, TimeUnit.SECONDS);
     }
 
     private static ObjectIdentifier objectId(String o) {
diff --git a/extensions/s3/src/test/java/io/deephaven/extensions/s3/testlib/S3SeekableChannelTestSetup.java b/extensions/s3/src/test/java/io/deephaven/extensions/s3/testlib/S3SeekableChannelTestSetup.java
index 9d4df0a5744..9f4826476df 100644
--- a/extensions/s3/src/test/java/io/deephaven/extensions/s3/testlib/S3SeekableChannelTestSetup.java
+++ b/extensions/s3/src/test/java/io/deephaven/extensions/s3/testlib/S3SeekableChannelTestSetup.java
@@ -25,8 +25,12 @@
 import java.util.concurrent.TimeUnit;
 import java.util.concurrent.TimeoutException;
 
+import static io.deephaven.extensions.s3.testlib.S3Helper.TIMEOUT_SECONDS;
+
 public abstract class S3SeekableChannelTestSetup {
 
+    protected static final String SCHEME = "s3";
+
     protected ExecutorService executor;
     protected S3AsyncClient asyncClient;
     protected String bucket;
@@ -39,23 +43,25 @@ protected final void doSetUp() throws ExecutionException, InterruptedException,
         executor = Executors.newCachedThreadPool();
         bucket = UUID.randomUUID().toString();
         asyncClient = s3AsyncClient();
-        asyncClient.createBucket(CreateBucketRequest.builder().bucket(bucket).build()).get(5, TimeUnit.SECONDS);
+        asyncClient.createBucket(CreateBucketRequest.builder().bucket(bucket).build())
+                .get(TIMEOUT_SECONDS, TimeUnit.SECONDS);
     }
 
     protected final void doTearDown() throws ExecutionException, InterruptedException, TimeoutException {
         S3Helper.deleteAllKeys(asyncClient, bucket);
-        asyncClient.deleteBucket(DeleteBucketRequest.builder().bucket(bucket).build()).get(5, TimeUnit.SECONDS);
+        asyncClient.deleteBucket(DeleteBucketRequest.builder().bucket(bucket).build())
+                .get(TIMEOUT_SECONDS, TimeUnit.SECONDS);
         asyncClient.close();
         executor.shutdownNow();
     }
 
     protected void uploadDirectory(final Path directory, final String prefix)
             throws ExecutionException, InterruptedException, TimeoutException {
-        S3Helper.uploadDirectory(asyncClient, directory, bucket, prefix, Duration.ofSeconds(5));
+        S3Helper.uploadDirectory(asyncClient, directory, bucket, prefix, Duration.ofSeconds(TIMEOUT_SECONDS));
     }
 
     protected final URI uri(String key) {
-        return URI.create(String.format("s3://%s/%s", bucket, key));
+        return URI.create(String.format("%s://%s/%s", SCHEME, bucket, key));
     }
 
     protected final void putObject(String key, AsyncRequestBody body)
@@ -64,10 +70,10 @@ protected final void putObject(String key, AsyncRequestBody body)
                 TimeUnit.SECONDS);
     }
 
-    protected final SeekableChannelsProvider providerImpl(URI uri) {
+    protected final SeekableChannelsProvider providerImpl() {
         final S3SeekableChannelProviderPlugin plugin = new S3SeekableChannelProviderPlugin();
         final S3Instructions instructions = s3Instructions(S3Instructions.builder()).build();
-        return plugin.createProvider(uri, instructions);
+        return plugin.createProvider(SCHEME, instructions);
     }
 
     protected static ByteBuffer readAll(ReadableByteChannel channel, int maxBytes) throws IOException {
@@ -83,4 +89,15 @@ protected static ByteBuffer readAll(ReadableByteChannel channel, int maxBytes) t
         dst.flip();
         return dst;
     }
+
+    protected static void fillBuffer(ReadableByteChannel channel, final ByteBuffer dst) throws IOException {
+        final int numBytes = dst.remaining();
+        while (dst.remaining() > 0 && channel.read(dst) != -1) {
+            // continue
+        }
+        if (dst.remaining() > 0) {
+            throw new RuntimeException(String.format("channel has less than %d bytes", numBytes));
+        }
+        dst.flip();
+    }
 }
diff --git a/extensions/s3/src/test/java/io/deephaven/extensions/s3/testlib/SingletonContainers.java b/extensions/s3/src/test/java/io/deephaven/extensions/s3/testlib/SingletonContainers.java
index befd758f980..004f34558cd 100644
--- a/extensions/s3/src/test/java/io/deephaven/extensions/s3/testlib/SingletonContainers.java
+++ b/extensions/s3/src/test/java/io/deephaven/extensions/s3/testlib/SingletonContainers.java
@@ -16,6 +16,7 @@
 import software.amazon.awssdk.services.s3.S3AsyncClient;
 
 import java.net.URI;
+import java.util.Map;
 
 public final class SingletonContainers {
 
@@ -53,6 +54,22 @@ public static S3AsyncClient s3AsyncClient() {
                             AwsBasicCredentials.create(LOCALSTACK_S3.getAccessKey(), LOCALSTACK_S3.getSecretKey())))
                     .build();
         }
+
+        public static String s3Endpoint() {
+            return LOCALSTACK_S3.getEndpoint().toString();
+        }
+
+        public static String region() {
+            return LOCALSTACK_S3.getRegion();
+        }
+
+        public static String accessKey() {
+            return LOCALSTACK_S3.getAccessKey();
+        }
+
+        public static String secretAccessKey() {
+            return LOCALSTACK_S3.getSecretKey();
+        }
     }
 
     public static final class MinIO {
@@ -87,5 +104,21 @@ public static S3AsyncClient s3AsyncClient() {
                             AwsBasicCredentials.create(MINIO.getUserName(), MINIO.getPassword())))
                     .build();
         }
+
+        public static String s3Endpoint() {
+            return MINIO.getS3URL();
+        }
+
+        public static String region() {
+            return Region.AWS_GLOBAL.toString();
+        }
+
+        public static String accessKey() {
+            return MINIO.getUserName();
+        }
+
+        public static String secretAccessKey() {
+            return MINIO.getPassword();
+        }
     }
 }
diff --git a/extensions/source-support/build.gradle b/extensions/source-support/build.gradle
index f061b6036fe..8bfbe64f98a 100644
--- a/extensions/source-support/build.gradle
+++ b/extensions/source-support/build.gradle
@@ -13,18 +13,18 @@ dependencies {
     implementation project(':log-factory')
     implementation project(':Configuration')
 
-    compileOnly 'com.google.code.findbugs:jsr305:3.0.2'
+    compileOnly libs.google.findbugs.jsr305
 
     testImplementation project(':engine-test-utils')
-    testImplementation depCommonsLang3
+    testImplementation libs.commons.lang3
 
-    Classpaths.inheritJUnitClassic(project, 'testImplementation')
-    Classpaths.inheritAssertJ(project)
+    testImplementation libs.junit4
+    testImplementation libs.assertj
 
     testRuntimeOnly project(':log-to-slf4j'),
             project(path: ':configs'),
             project(path: ':test-configs')
-    Classpaths.inheritSlf4j(project, 'slf4j-simple', 'testRuntimeOnly')
+    testRuntimeOnly libs.slf4j.simple
 }
 
 TestTools.addEngineOutOfBandTest(project)
diff --git a/extensions/source-support/src/test/java/io/deephaven/generic/region/AppendOnlyFixedSizePageRegionTest.java b/extensions/source-support/src/test/java/io/deephaven/generic/region/AppendOnlyFixedSizePageRegionTest.java
index 6e23ee92523..83ee282bc25 100644
--- a/extensions/source-support/src/test/java/io/deephaven/generic/region/AppendOnlyFixedSizePageRegionTest.java
+++ b/extensions/source-support/src/test/java/io/deephaven/generic/region/AppendOnlyFixedSizePageRegionTest.java
@@ -97,7 +97,8 @@ private static Table makeRegioned(
                 constituents[0].getDefinition(),
                 "Test SimpleSourceTable",
                 RegionedTableComponentFactoryImpl.INSTANCE,
-                new TableBackedTableLocationProvider(registrar, false, constituents),
+                new TableBackedTableLocationProvider(registrar, false, TableUpdateMode.STATIC, TableUpdateMode.STATIC,
+                        constituents),
                 registrar).coalesce();
     }
 
diff --git a/extensions/suanshu/build.gradle b/extensions/suanshu/build.gradle
index df00044e0a6..10998aed8b4 100644
--- a/extensions/suanshu/build.gradle
+++ b/extensions/suanshu/build.gradle
@@ -3,20 +3,18 @@ plugins {
     id 'io.deephaven.project.register'
 }
 
-configurations {
-    testImplementation.extendsFrom fishBaseTest
-}
-
 dependencies {
     compileOnly project(':Base')
     compileOnly project(':engine-table')
 
-    compileOnly 'javax.inject:javax.inject:1'
+    compileOnly libs.javax.inject
 
-    api 'io.deephaven:SuanShu:0.1.0'
+    api libs.deephaven.suan.shu
 
-    Classpaths.inheritAutoService(project)
+    compileOnly libs.autoservice
+    annotationProcessor libs.autoservice.compiler
 
     testImplementation project(':engine-table')
     testImplementation project(':base-test-utils')
+    testImplementation project(path: ':Base', configuration: 'tests')
 }
diff --git a/extensions/trackedfile/build.gradle b/extensions/trackedfile/build.gradle
index e5df2b81c16..f7e7910289d 100644
--- a/extensions/trackedfile/build.gradle
+++ b/extensions/trackedfile/build.gradle
@@ -11,8 +11,10 @@ dependencies {
     implementation project(':Base')
     implementation project(':Util')
     implementation project(':engine-table')
+    implementation project(':log-factory')
 
-    compileOnly depAnnotations
+    compileOnly libs.jetbrains.annotations
 
-    Classpaths.inheritAutoService(project)
+    compileOnly libs.autoservice
+    annotationProcessor libs.autoservice.compiler
 }
diff --git a/extensions/trackedfile/src/main/java/io/deephaven/extensions/trackedfile/LocalCompletableOutputStream.java b/extensions/trackedfile/src/main/java/io/deephaven/extensions/trackedfile/LocalCompletableOutputStream.java
new file mode 100644
index 00000000000..5f6961f8bf6
--- /dev/null
+++ b/extensions/trackedfile/src/main/java/io/deephaven/extensions/trackedfile/LocalCompletableOutputStream.java
@@ -0,0 +1,245 @@
+//
+// Copyright (c) 2016-2024 Deephaven Data Labs and Patent Pending
+//
+package io.deephaven.extensions.trackedfile;
+
+import io.deephaven.UncheckedDeephavenException;
+import io.deephaven.base.FileUtils;
+import io.deephaven.internal.log.LoggerFactory;
+import io.deephaven.io.logger.Logger;
+import io.deephaven.util.channel.CompletableOutputStream;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
+
+import java.io.BufferedOutputStream;
+import java.io.File;
+import java.io.IOException;
+import java.io.OutputStream;
+import java.nio.channels.Channels;
+
+/**
+ * A {@link CompletableOutputStream} that writes to a temporary shadow file paths in the same directory to prevent
+ * overwriting any existing data in case of failure.
+ */
+class LocalCompletableOutputStream extends CompletableOutputStream {
+
+    private static final Logger log = LoggerFactory.getLogger(LocalCompletableOutputStream.class);
+
+    private enum State {
+        OPEN, DONE, COMPLETED, ROLLED_BACK
+    }
+
+    private final File firstCreatedDir;
+    private final File destFile;
+    private final File shadowDestFile;
+    private final OutputStream shadowDelegateStream; // Writes to the shadow file
+
+    private State state;
+
+    LocalCompletableOutputStream(
+            @NotNull final File destFile,
+            @NotNull final TrackedSeekableChannelsProvider provider,
+            final int bufferSizeHint) throws IOException {
+        this.firstCreatedDir = prepareDestinationFileLocation(destFile);
+        this.destFile = destFile;
+        deleteBackupFile(destFile);
+        this.shadowDestFile = getShadowFile(destFile);
+        this.shadowDelegateStream = new BufferedOutputStream(Channels.newOutputStream(
+                provider.getWriteChannel(shadowDestFile)), bufferSizeHint);
+        this.state = State.OPEN;
+    }
+
+    @Override
+    public void write(int b) throws IOException {
+        verifyOpen();
+        shadowDelegateStream.write(b);
+    }
+
+    @Override
+    public void write(byte[] b) throws IOException {
+        verifyOpen();
+        shadowDelegateStream.write(b);
+    }
+
+    @Override
+    public void write(byte[] b, int off, int len) throws IOException {
+        verifyOpen();
+        shadowDelegateStream.write(b, off, len);
+    }
+
+    @Override
+    public void flush() throws IOException {
+        verifyOpen();
+        shadowDelegateStream.flush();
+    }
+
+    public void done() throws IOException {
+        if (state == State.DONE) {
+            return;
+        }
+        if (state != State.OPEN) {
+            throw new IOException("Cannot mark stream as done for file " + destFile.getAbsolutePath() + " because " +
+                    "stream in state " + state + " instead of OPEN");
+        }
+        flush();
+        state = State.DONE;
+    }
+
+    public void complete() throws IOException {
+        if (state == State.COMPLETED) {
+            return;
+        }
+        done();
+        shadowDelegateStream.close();
+        installShadowFile(destFile, shadowDestFile);
+        state = State.COMPLETED;
+    }
+
+    @Override
+    public void rollback() {
+        if (state == State.ROLLED_BACK) {
+            return;
+        }
+        if (state == State.COMPLETED) {
+            rollbackShadowFiles(destFile);
+        }
+        // noinspection ResultOfMethodCallIgnored
+        shadowDestFile.delete();
+        if (firstCreatedDir != null) {
+            log.error().append("Cleaning up potentially incomplete table destination path starting from ")
+                    .append(firstCreatedDir.getAbsolutePath()).endl();
+            FileUtils.deleteRecursivelyOnNFS(firstCreatedDir);
+        }
+        state = State.ROLLED_BACK;
+    }
+
+    @Override
+    public void close() throws IOException {
+        if (state == State.ROLLED_BACK) {
+            return;
+        }
+        if (state != State.COMPLETED) {
+            rollback();
+            return;
+        }
+        deleteBackupFileNoExcept(destFile);
+    }
+
+    ////////////// Helper methods /////////////
+
+    private void verifyOpen() throws IOException {
+        if (state != State.OPEN) {
+            throw new IOException("Cannot write to stream for file " + destFile.getAbsolutePath() + " because stream " +
+                    "in state " + state + " instead of OPEN");
+        }
+    }
+
+    /**
+     * Delete any old backup files created for this destination, and throw an exception on failure.
+     */
+    private static void deleteBackupFile(@NotNull final File destFile) {
+        if (!deleteBackupFileNoExcept(destFile)) {
+            throw new UncheckedDeephavenException(
+                    String.format("Failed to delete backup file at %s", getBackupFile(destFile).getAbsolutePath()));
+        }
+    }
+
+    /**
+     * Delete any old backup files created for this destination with no exception in case of failure.
+     */
+    private static boolean deleteBackupFileNoExcept(@NotNull final File destFile) {
+        final File backupDestFile = getBackupFile(destFile);
+        if (backupDestFile.exists() && !backupDestFile.delete()) {
+            log.error().append("Error in deleting backup file at path ")
+                    .append(backupDestFile.getAbsolutePath())
+                    .endl();
+            return false;
+        }
+        return true;
+    }
+
+    private static File getBackupFile(final File destFile) {
+        return new File(destFile.getParent(), ".OLD_" + destFile.getName());
+    }
+
+    private static File getShadowFile(final File destFile) {
+        return new File(destFile.getParent(), ".NEW_" + destFile.getName());
+    }
+
+    /**
+     * Make any missing ancestor directories of {@code destination}.
+     *
+     * @param destination The destination file
+     * @return The first created directory, or null if no directories were made.
+     */
+    @Nullable
+    private static File prepareDestinationFileLocation(@NotNull File destination) {
+        destination = destination.getAbsoluteFile();
+        if (destination.exists()) {
+            if (destination.isDirectory()) {
+                throw new UncheckedDeephavenException(
+                        String.format("Destination %s exists and is a directory", destination));
+            }
+            if (!destination.canWrite()) {
+                throw new UncheckedDeephavenException(
+                        String.format("Destination %s exists but is not writable", destination));
+            }
+            return null;
+        }
+        final File firstParent = destination.getParentFile();
+        if (firstParent.isDirectory()) {
+            if (firstParent.canWrite()) {
+                return null;
+            }
+            throw new UncheckedDeephavenException(
+                    String.format("Destination %s has non writable parent directory", destination));
+        }
+        File firstCreated = firstParent;
+        File parent;
+        for (parent = destination.getParentFile(); parent != null && !parent.exists(); parent =
+                parent.getParentFile()) {
+            firstCreated = parent;
+        }
+        if (parent == null) {
+            throw new IllegalArgumentException(
+                    String.format("Can't find any existing parent directory for destination path: %s", destination));
+        }
+        if (!parent.isDirectory()) {
+            throw new IllegalArgumentException(
+                    String.format("Existing parent file %s of %s is not a directory", parent, destination));
+        }
+        if (!firstParent.mkdirs()) {
+            throw new UncheckedDeephavenException("Couldn't (re)create destination directory " + firstParent);
+        }
+        return firstCreated;
+    }
+
+
+    /**
+     * Backup any existing files at destination and rename the shadow file to destination file.
+     */
+    private static void installShadowFile(@NotNull final File destFile, @NotNull final File shadowDestFile) {
+        final File backupDestFile = getBackupFile(destFile);
+        if (destFile.exists() && !destFile.renameTo(backupDestFile)) {
+            throw new UncheckedDeephavenException(
+                    String.format("Failed to install shadow file at %s because a file already exists at the path " +
+                            "which couldn't be renamed to %s", destFile.getAbsolutePath(),
+                            backupDestFile.getAbsolutePath()));
+        }
+        if (!shadowDestFile.renameTo(destFile)) {
+            throw new UncheckedDeephavenException(String.format(
+                    "Failed to install shadow file at %s because couldn't rename temporary shadow file from %s to %s",
+                    destFile.getAbsolutePath(), shadowDestFile.getAbsolutePath(), destFile.getAbsolutePath()));
+        }
+    }
+
+    /**
+     * Roll back any changes made in the {@link #installShadowFile} in best-effort manner.
+     */
+    private static void rollbackShadowFiles(@NotNull final File destFile) {
+        final File backupDestFile = getBackupFile(destFile);
+        final File shadowDestFile = getShadowFile(destFile);
+        destFile.renameTo(shadowDestFile);
+        backupDestFile.renameTo(destFile);
+    }
+}
diff --git a/extensions/trackedfile/src/main/java/io/deephaven/extensions/trackedfile/TrackedSeekableChannelsProvider.java b/extensions/trackedfile/src/main/java/io/deephaven/extensions/trackedfile/TrackedSeekableChannelsProvider.java
index 56235d6c336..b4fdf1b6157 100644
--- a/extensions/trackedfile/src/main/java/io/deephaven/extensions/trackedfile/TrackedSeekableChannelsProvider.java
+++ b/extensions/trackedfile/src/main/java/io/deephaven/extensions/trackedfile/TrackedSeekableChannelsProvider.java
@@ -10,6 +10,7 @@
 import io.deephaven.engine.util.file.TrackedFileHandleFactory;
 import io.deephaven.engine.util.file.TrackedSeekableByteChannel;
 import io.deephaven.util.channel.Channels;
+import io.deephaven.util.channel.CompletableOutputStream;
 import io.deephaven.util.channel.SeekableChannelContext;
 import io.deephaven.util.channel.BaseSeekableChannelContext;
 import io.deephaven.util.channel.SeekableChannelsProvider;
@@ -52,6 +53,11 @@ public boolean isCompatibleWith(@Nullable final SeekableChannelContext channelCo
         return channelContext instanceof BaseSeekableChannelContext;
     }
 
+    @Override
+    public boolean exists(@NotNull final URI uri) {
+        return Files.exists(Path.of(uri));
+    }
+
     @Override
     public SeekableByteChannel getReadChannel(@Nullable final SeekableChannelContext channelContext,
             @NotNull final URI uri) throws IOException {
@@ -68,11 +74,8 @@ public InputStream getInputStream(SeekableByteChannel channel, int sizeHint) {
     }
 
     @Override
-    public SeekableByteChannel getWriteChannel(@NotNull final Path filePath, final boolean append)
-            throws IOException {
-        // NB: I'm not sure this is actually the intended behavior; the "truncate-once" is per-handle, not per file.
-        return new TrackedSeekableByteChannel(append ? fileHandleFactory.writeAppendCreateHandleCreator
-                : new TruncateOnceFileCreator(fileHandleFactory), filePath.toFile());
+    public CompletableOutputStream getOutputStream(@NotNull final URI uri, int bufferSizeHint) throws IOException {
+        return new LocalCompletableOutputStream(new File(uri), this, bufferSizeHint);
     }
 
     @Override
@@ -89,6 +92,10 @@ public Stream<URI> walk(@NotNull final URI directory) throws IOException {
         return Files.walk(Path.of(directory)).map(path -> FileUtils.convertToURI(path, false));
     }
 
+    SeekableByteChannel getWriteChannel(@NotNull final File destFile) throws IOException {
+        return new TrackedSeekableByteChannel(new TruncateOnceFileCreator(fileHandleFactory), destFile);
+    }
+
     private static final class TruncateOnceFileCreator implements FileHandleFactory.FileToHandleFunction {
 
         private static final AtomicIntegerFieldUpdater<TruncateOnceFileCreator> FIRST_TIME_UPDATER =
@@ -106,7 +113,7 @@ private TruncateOnceFileCreator(@NotNull final TrackedFileHandleFactory fileHand
 
         @NotNull
         @Override
-        public final FileHandle invoke(@NotNull final File file) throws IOException {
+        public FileHandle invoke(@NotNull final File file) throws IOException {
             if (FIRST_TIME_UPDATER.compareAndSet(this, FIRST_TIME_TRUE, FIRST_TIME_FALSE)) {
                 return fileHandleFactory.writeTruncateCreateHandleCreator.invoke(file);
             }
diff --git a/extensions/trackedfile/src/main/java/io/deephaven/extensions/trackedfile/TrackedSeekableChannelsProviderPlugin.java b/extensions/trackedfile/src/main/java/io/deephaven/extensions/trackedfile/TrackedSeekableChannelsProviderPlugin.java
index 32ec7a3564a..1fba21ba4c6 100644
--- a/extensions/trackedfile/src/main/java/io/deephaven/extensions/trackedfile/TrackedSeekableChannelsProviderPlugin.java
+++ b/extensions/trackedfile/src/main/java/io/deephaven/extensions/trackedfile/TrackedSeekableChannelsProviderPlugin.java
@@ -10,8 +10,6 @@
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
-import java.net.URI;
-
 import static io.deephaven.base.FileUtils.FILE_URI_SCHEME;
 
 /**
@@ -21,14 +19,14 @@
 public final class TrackedSeekableChannelsProviderPlugin implements SeekableChannelsProviderPlugin {
 
     @Override
-    public boolean isCompatible(@NotNull final URI uri, @Nullable final Object object) {
-        return FILE_URI_SCHEME.equals(uri.getScheme());
+    public boolean isCompatible(@NotNull final String uriScheme, @Nullable final Object object) {
+        return FILE_URI_SCHEME.equals(uriScheme);
     }
 
     @Override
-    public SeekableChannelsProvider createProvider(@NotNull final URI uri, @Nullable final Object object) {
-        if (!isCompatible(uri, object)) {
-            throw new IllegalArgumentException("Arguments not compatible, provided uri " + uri);
+    public SeekableChannelsProvider createProvider(@NotNull final String uriScheme, @Nullable final Object object) {
+        if (!isCompatible(uriScheme, object)) {
+            throw new IllegalArgumentException("Arguments not compatible, provided uri scheme " + uriScheme);
         }
         if (object != null) {
             throw new IllegalArgumentException("Arguments not compatible, provided non null object");
diff --git a/go/internal/proto/application/application.pb.go b/go/internal/proto/application/application.pb.go
index 964728dfdfb..c39b338c9f3 100644
--- a/go/internal/proto/application/application.pb.go
+++ b/go/internal/proto/application/application.pb.go
@@ -5,7 +5,7 @@
 // versions:
 // 	protoc-gen-go v1.28.1
 // 	protoc        v4.25.3
-// source: deephaven/proto/application.proto
+// source: deephaven_core/proto/application.proto
 
 package application
 
@@ -33,7 +33,7 @@ type ListFieldsRequest struct {
 func (x *ListFieldsRequest) Reset() {
 	*x = ListFieldsRequest{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_deephaven_proto_application_proto_msgTypes[0]
+		mi := &file_deephaven_core_proto_application_proto_msgTypes[0]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -46,7 +46,7 @@ func (x *ListFieldsRequest) String() string {
 func (*ListFieldsRequest) ProtoMessage() {}
 
 func (x *ListFieldsRequest) ProtoReflect() protoreflect.Message {
-	mi := &file_deephaven_proto_application_proto_msgTypes[0]
+	mi := &file_deephaven_core_proto_application_proto_msgTypes[0]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -59,7 +59,7 @@ func (x *ListFieldsRequest) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use ListFieldsRequest.ProtoReflect.Descriptor instead.
 func (*ListFieldsRequest) Descriptor() ([]byte, []int) {
-	return file_deephaven_proto_application_proto_rawDescGZIP(), []int{0}
+	return file_deephaven_core_proto_application_proto_rawDescGZIP(), []int{0}
 }
 
 //
@@ -77,7 +77,7 @@ type FieldsChangeUpdate struct {
 func (x *FieldsChangeUpdate) Reset() {
 	*x = FieldsChangeUpdate{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_deephaven_proto_application_proto_msgTypes[1]
+		mi := &file_deephaven_core_proto_application_proto_msgTypes[1]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -90,7 +90,7 @@ func (x *FieldsChangeUpdate) String() string {
 func (*FieldsChangeUpdate) ProtoMessage() {}
 
 func (x *FieldsChangeUpdate) ProtoReflect() protoreflect.Message {
-	mi := &file_deephaven_proto_application_proto_msgTypes[1]
+	mi := &file_deephaven_core_proto_application_proto_msgTypes[1]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -103,7 +103,7 @@ func (x *FieldsChangeUpdate) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use FieldsChangeUpdate.ProtoReflect.Descriptor instead.
 func (*FieldsChangeUpdate) Descriptor() ([]byte, []int) {
-	return file_deephaven_proto_application_proto_rawDescGZIP(), []int{1}
+	return file_deephaven_core_proto_application_proto_rawDescGZIP(), []int{1}
 }
 
 func (x *FieldsChangeUpdate) GetCreated() []*FieldInfo {
@@ -144,7 +144,7 @@ type FieldInfo struct {
 func (x *FieldInfo) Reset() {
 	*x = FieldInfo{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_deephaven_proto_application_proto_msgTypes[2]
+		mi := &file_deephaven_core_proto_application_proto_msgTypes[2]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -157,7 +157,7 @@ func (x *FieldInfo) String() string {
 func (*FieldInfo) ProtoMessage() {}
 
 func (x *FieldInfo) ProtoReflect() protoreflect.Message {
-	mi := &file_deephaven_proto_application_proto_msgTypes[2]
+	mi := &file_deephaven_core_proto_application_proto_msgTypes[2]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -170,7 +170,7 @@ func (x *FieldInfo) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use FieldInfo.ProtoReflect.Descriptor instead.
 func (*FieldInfo) Descriptor() ([]byte, []int) {
-	return file_deephaven_proto_application_proto_rawDescGZIP(), []int{2}
+	return file_deephaven_core_proto_application_proto_rawDescGZIP(), []int{2}
 }
 
 func (x *FieldInfo) GetTypedTicket() *ticket.TypedTicket {
@@ -208,84 +208,85 @@ func (x *FieldInfo) GetApplicationId() string {
 	return ""
 }
 
-var File_deephaven_proto_application_proto protoreflect.FileDescriptor
-
-var file_deephaven_proto_application_proto_rawDesc = []byte{
-	0x0a, 0x21, 0x64, 0x65, 0x65, 0x70, 0x68, 0x61, 0x76, 0x65, 0x6e, 0x2f, 0x70, 0x72, 0x6f, 0x74,
-	0x6f, 0x2f, 0x61, 0x70, 0x70, 0x6c, 0x69, 0x63, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x2e, 0x70, 0x72,
-	0x6f, 0x74, 0x6f, 0x12, 0x21, 0x69, 0x6f, 0x2e, 0x64, 0x65, 0x65, 0x70, 0x68, 0x61, 0x76, 0x65,
-	0x6e, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x62, 0x61, 0x63, 0x6b, 0x70, 0x6c, 0x61, 0x6e,
-	0x65, 0x2e, 0x67, 0x72, 0x70, 0x63, 0x1a, 0x1c, 0x64, 0x65, 0x65, 0x70, 0x68, 0x61, 0x76, 0x65,
-	0x6e, 0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2f, 0x74, 0x69, 0x63, 0x6b, 0x65, 0x74, 0x2e, 0x70,
-	0x72, 0x6f, 0x74, 0x6f, 0x22, 0x13, 0x0a, 0x11, 0x4c, 0x69, 0x73, 0x74, 0x46, 0x69, 0x65, 0x6c,
-	0x64, 0x73, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x22, 0xec, 0x01, 0x0a, 0x12, 0x46, 0x69,
-	0x65, 0x6c, 0x64, 0x73, 0x43, 0x68, 0x61, 0x6e, 0x67, 0x65, 0x55, 0x70, 0x64, 0x61, 0x74, 0x65,
-	0x12, 0x46, 0x0a, 0x07, 0x63, 0x72, 0x65, 0x61, 0x74, 0x65, 0x64, 0x18, 0x01, 0x20, 0x03, 0x28,
-	0x0b, 0x32, 0x2c, 0x2e, 0x69, 0x6f, 0x2e, 0x64, 0x65, 0x65, 0x70, 0x68, 0x61, 0x76, 0x65, 0x6e,
-	0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x62, 0x61, 0x63, 0x6b, 0x70, 0x6c, 0x61, 0x6e, 0x65,
-	0x2e, 0x67, 0x72, 0x70, 0x63, 0x2e, 0x46, 0x69, 0x65, 0x6c, 0x64, 0x49, 0x6e, 0x66, 0x6f, 0x52,
-	0x07, 0x63, 0x72, 0x65, 0x61, 0x74, 0x65, 0x64, 0x12, 0x46, 0x0a, 0x07, 0x75, 0x70, 0x64, 0x61,
-	0x74, 0x65, 0x64, 0x18, 0x02, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x2c, 0x2e, 0x69, 0x6f, 0x2e, 0x64,
-	0x65, 0x65, 0x70, 0x68, 0x61, 0x76, 0x65, 0x6e, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x62,
-	0x61, 0x63, 0x6b, 0x70, 0x6c, 0x61, 0x6e, 0x65, 0x2e, 0x67, 0x72, 0x70, 0x63, 0x2e, 0x46, 0x69,
-	0x65, 0x6c, 0x64, 0x49, 0x6e, 0x66, 0x6f, 0x52, 0x07, 0x75, 0x70, 0x64, 0x61, 0x74, 0x65, 0x64,
-	0x12, 0x46, 0x0a, 0x07, 0x72, 0x65, 0x6d, 0x6f, 0x76, 0x65, 0x64, 0x18, 0x03, 0x20, 0x03, 0x28,
-	0x0b, 0x32, 0x2c, 0x2e, 0x69, 0x6f, 0x2e, 0x64, 0x65, 0x65, 0x70, 0x68, 0x61, 0x76, 0x65, 0x6e,
-	0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x62, 0x61, 0x63, 0x6b, 0x70, 0x6c, 0x61, 0x6e, 0x65,
-	0x2e, 0x67, 0x72, 0x70, 0x63, 0x2e, 0x46, 0x69, 0x65, 0x6c, 0x64, 0x49, 0x6e, 0x66, 0x6f, 0x52,
-	0x07, 0x72, 0x65, 0x6d, 0x6f, 0x76, 0x65, 0x64, 0x22, 0xfc, 0x01, 0x0a, 0x09, 0x46, 0x69, 0x65,
-	0x6c, 0x64, 0x49, 0x6e, 0x66, 0x6f, 0x12, 0x51, 0x0a, 0x0c, 0x74, 0x79, 0x70, 0x65, 0x64, 0x5f,
-	0x74, 0x69, 0x63, 0x6b, 0x65, 0x74, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x2e, 0x2e, 0x69,
+var File_deephaven_core_proto_application_proto protoreflect.FileDescriptor
+
+var file_deephaven_core_proto_application_proto_rawDesc = []byte{
+	0x0a, 0x26, 0x64, 0x65, 0x65, 0x70, 0x68, 0x61, 0x76, 0x65, 0x6e, 0x5f, 0x63, 0x6f, 0x72, 0x65,
+	0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2f, 0x61, 0x70, 0x70, 0x6c, 0x69, 0x63, 0x61, 0x74, 0x69,
+	0x6f, 0x6e, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x12, 0x21, 0x69, 0x6f, 0x2e, 0x64, 0x65, 0x65,
+	0x70, 0x68, 0x61, 0x76, 0x65, 0x6e, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x62, 0x61, 0x63,
+	0x6b, 0x70, 0x6c, 0x61, 0x6e, 0x65, 0x2e, 0x67, 0x72, 0x70, 0x63, 0x1a, 0x21, 0x64, 0x65, 0x65,
+	0x70, 0x68, 0x61, 0x76, 0x65, 0x6e, 0x5f, 0x63, 0x6f, 0x72, 0x65, 0x2f, 0x70, 0x72, 0x6f, 0x74,
+	0x6f, 0x2f, 0x74, 0x69, 0x63, 0x6b, 0x65, 0x74, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x22, 0x13,
+	0x0a, 0x11, 0x4c, 0x69, 0x73, 0x74, 0x46, 0x69, 0x65, 0x6c, 0x64, 0x73, 0x52, 0x65, 0x71, 0x75,
+	0x65, 0x73, 0x74, 0x22, 0xec, 0x01, 0x0a, 0x12, 0x46, 0x69, 0x65, 0x6c, 0x64, 0x73, 0x43, 0x68,
+	0x61, 0x6e, 0x67, 0x65, 0x55, 0x70, 0x64, 0x61, 0x74, 0x65, 0x12, 0x46, 0x0a, 0x07, 0x63, 0x72,
+	0x65, 0x61, 0x74, 0x65, 0x64, 0x18, 0x01, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x2c, 0x2e, 0x69, 0x6f,
+	0x2e, 0x64, 0x65, 0x65, 0x70, 0x68, 0x61, 0x76, 0x65, 0x6e, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f,
+	0x2e, 0x62, 0x61, 0x63, 0x6b, 0x70, 0x6c, 0x61, 0x6e, 0x65, 0x2e, 0x67, 0x72, 0x70, 0x63, 0x2e,
+	0x46, 0x69, 0x65, 0x6c, 0x64, 0x49, 0x6e, 0x66, 0x6f, 0x52, 0x07, 0x63, 0x72, 0x65, 0x61, 0x74,
+	0x65, 0x64, 0x12, 0x46, 0x0a, 0x07, 0x75, 0x70, 0x64, 0x61, 0x74, 0x65, 0x64, 0x18, 0x02, 0x20,
+	0x03, 0x28, 0x0b, 0x32, 0x2c, 0x2e, 0x69, 0x6f, 0x2e, 0x64, 0x65, 0x65, 0x70, 0x68, 0x61, 0x76,
+	0x65, 0x6e, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x62, 0x61, 0x63, 0x6b, 0x70, 0x6c, 0x61,
+	0x6e, 0x65, 0x2e, 0x67, 0x72, 0x70, 0x63, 0x2e, 0x46, 0x69, 0x65, 0x6c, 0x64, 0x49, 0x6e, 0x66,
+	0x6f, 0x52, 0x07, 0x75, 0x70, 0x64, 0x61, 0x74, 0x65, 0x64, 0x12, 0x46, 0x0a, 0x07, 0x72, 0x65,
+	0x6d, 0x6f, 0x76, 0x65, 0x64, 0x18, 0x03, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x2c, 0x2e, 0x69, 0x6f,
+	0x2e, 0x64, 0x65, 0x65, 0x70, 0x68, 0x61, 0x76, 0x65, 0x6e, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f,
+	0x2e, 0x62, 0x61, 0x63, 0x6b, 0x70, 0x6c, 0x61, 0x6e, 0x65, 0x2e, 0x67, 0x72, 0x70, 0x63, 0x2e,
+	0x46, 0x69, 0x65, 0x6c, 0x64, 0x49, 0x6e, 0x66, 0x6f, 0x52, 0x07, 0x72, 0x65, 0x6d, 0x6f, 0x76,
+	0x65, 0x64, 0x22, 0xfc, 0x01, 0x0a, 0x09, 0x46, 0x69, 0x65, 0x6c, 0x64, 0x49, 0x6e, 0x66, 0x6f,
+	0x12, 0x51, 0x0a, 0x0c, 0x74, 0x79, 0x70, 0x65, 0x64, 0x5f, 0x74, 0x69, 0x63, 0x6b, 0x65, 0x74,
+	0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x2e, 0x2e, 0x69, 0x6f, 0x2e, 0x64, 0x65, 0x65, 0x70,
+	0x68, 0x61, 0x76, 0x65, 0x6e, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x62, 0x61, 0x63, 0x6b,
+	0x70, 0x6c, 0x61, 0x6e, 0x65, 0x2e, 0x67, 0x72, 0x70, 0x63, 0x2e, 0x54, 0x79, 0x70, 0x65, 0x64,
+	0x54, 0x69, 0x63, 0x6b, 0x65, 0x74, 0x52, 0x0b, 0x74, 0x79, 0x70, 0x65, 0x64, 0x54, 0x69, 0x63,
+	0x6b, 0x65, 0x74, 0x12, 0x1d, 0x0a, 0x0a, 0x66, 0x69, 0x65, 0x6c, 0x64, 0x5f, 0x6e, 0x61, 0x6d,
+	0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x09, 0x66, 0x69, 0x65, 0x6c, 0x64, 0x4e, 0x61,
+	0x6d, 0x65, 0x12, 0x2b, 0x0a, 0x11, 0x66, 0x69, 0x65, 0x6c, 0x64, 0x5f, 0x64, 0x65, 0x73, 0x63,
+	0x72, 0x69, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x52, 0x10, 0x66,
+	0x69, 0x65, 0x6c, 0x64, 0x44, 0x65, 0x73, 0x63, 0x72, 0x69, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x12,
+	0x29, 0x0a, 0x10, 0x61, 0x70, 0x70, 0x6c, 0x69, 0x63, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x5f, 0x6e,
+	0x61, 0x6d, 0x65, 0x18, 0x04, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0f, 0x61, 0x70, 0x70, 0x6c, 0x69,
+	0x63, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x4e, 0x61, 0x6d, 0x65, 0x12, 0x25, 0x0a, 0x0e, 0x61, 0x70,
+	0x70, 0x6c, 0x69, 0x63, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x5f, 0x69, 0x64, 0x18, 0x05, 0x20, 0x01,
+	0x28, 0x09, 0x52, 0x0d, 0x61, 0x70, 0x70, 0x6c, 0x69, 0x63, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x49,
+	0x64, 0x32, 0x93, 0x01, 0x0a, 0x12, 0x41, 0x70, 0x70, 0x6c, 0x69, 0x63, 0x61, 0x74, 0x69, 0x6f,
+	0x6e, 0x53, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x12, 0x7d, 0x0a, 0x0a, 0x4c, 0x69, 0x73, 0x74,
+	0x46, 0x69, 0x65, 0x6c, 0x64, 0x73, 0x12, 0x34, 0x2e, 0x69, 0x6f, 0x2e, 0x64, 0x65, 0x65, 0x70,
+	0x68, 0x61, 0x76, 0x65, 0x6e, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x62, 0x61, 0x63, 0x6b,
+	0x70, 0x6c, 0x61, 0x6e, 0x65, 0x2e, 0x67, 0x72, 0x70, 0x63, 0x2e, 0x4c, 0x69, 0x73, 0x74, 0x46,
+	0x69, 0x65, 0x6c, 0x64, 0x73, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x35, 0x2e, 0x69,
 	0x6f, 0x2e, 0x64, 0x65, 0x65, 0x70, 0x68, 0x61, 0x76, 0x65, 0x6e, 0x2e, 0x70, 0x72, 0x6f, 0x74,
 	0x6f, 0x2e, 0x62, 0x61, 0x63, 0x6b, 0x70, 0x6c, 0x61, 0x6e, 0x65, 0x2e, 0x67, 0x72, 0x70, 0x63,
-	0x2e, 0x54, 0x79, 0x70, 0x65, 0x64, 0x54, 0x69, 0x63, 0x6b, 0x65, 0x74, 0x52, 0x0b, 0x74, 0x79,
-	0x70, 0x65, 0x64, 0x54, 0x69, 0x63, 0x6b, 0x65, 0x74, 0x12, 0x1d, 0x0a, 0x0a, 0x66, 0x69, 0x65,
-	0x6c, 0x64, 0x5f, 0x6e, 0x61, 0x6d, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x09, 0x66,
-	0x69, 0x65, 0x6c, 0x64, 0x4e, 0x61, 0x6d, 0x65, 0x12, 0x2b, 0x0a, 0x11, 0x66, 0x69, 0x65, 0x6c,
-	0x64, 0x5f, 0x64, 0x65, 0x73, 0x63, 0x72, 0x69, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x18, 0x03, 0x20,
-	0x01, 0x28, 0x09, 0x52, 0x10, 0x66, 0x69, 0x65, 0x6c, 0x64, 0x44, 0x65, 0x73, 0x63, 0x72, 0x69,
-	0x70, 0x74, 0x69, 0x6f, 0x6e, 0x12, 0x29, 0x0a, 0x10, 0x61, 0x70, 0x70, 0x6c, 0x69, 0x63, 0x61,
-	0x74, 0x69, 0x6f, 0x6e, 0x5f, 0x6e, 0x61, 0x6d, 0x65, 0x18, 0x04, 0x20, 0x01, 0x28, 0x09, 0x52,
-	0x0f, 0x61, 0x70, 0x70, 0x6c, 0x69, 0x63, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x4e, 0x61, 0x6d, 0x65,
-	0x12, 0x25, 0x0a, 0x0e, 0x61, 0x70, 0x70, 0x6c, 0x69, 0x63, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x5f,
-	0x69, 0x64, 0x18, 0x05, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0d, 0x61, 0x70, 0x70, 0x6c, 0x69, 0x63,
-	0x61, 0x74, 0x69, 0x6f, 0x6e, 0x49, 0x64, 0x32, 0x93, 0x01, 0x0a, 0x12, 0x41, 0x70, 0x70, 0x6c,
-	0x69, 0x63, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x53, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x12, 0x7d,
-	0x0a, 0x0a, 0x4c, 0x69, 0x73, 0x74, 0x46, 0x69, 0x65, 0x6c, 0x64, 0x73, 0x12, 0x34, 0x2e, 0x69,
-	0x6f, 0x2e, 0x64, 0x65, 0x65, 0x70, 0x68, 0x61, 0x76, 0x65, 0x6e, 0x2e, 0x70, 0x72, 0x6f, 0x74,
-	0x6f, 0x2e, 0x62, 0x61, 0x63, 0x6b, 0x70, 0x6c, 0x61, 0x6e, 0x65, 0x2e, 0x67, 0x72, 0x70, 0x63,
-	0x2e, 0x4c, 0x69, 0x73, 0x74, 0x46, 0x69, 0x65, 0x6c, 0x64, 0x73, 0x52, 0x65, 0x71, 0x75, 0x65,
-	0x73, 0x74, 0x1a, 0x35, 0x2e, 0x69, 0x6f, 0x2e, 0x64, 0x65, 0x65, 0x70, 0x68, 0x61, 0x76, 0x65,
-	0x6e, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x62, 0x61, 0x63, 0x6b, 0x70, 0x6c, 0x61, 0x6e,
-	0x65, 0x2e, 0x67, 0x72, 0x70, 0x63, 0x2e, 0x46, 0x69, 0x65, 0x6c, 0x64, 0x73, 0x43, 0x68, 0x61,
-	0x6e, 0x67, 0x65, 0x55, 0x70, 0x64, 0x61, 0x74, 0x65, 0x22, 0x00, 0x30, 0x01, 0x42, 0x47, 0x48,
-	0x01, 0x50, 0x01, 0x5a, 0x41, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f,
-	0x64, 0x65, 0x65, 0x70, 0x68, 0x61, 0x76, 0x65, 0x6e, 0x2f, 0x64, 0x65, 0x65, 0x70, 0x68, 0x61,
-	0x76, 0x65, 0x6e, 0x2d, 0x63, 0x6f, 0x72, 0x65, 0x2f, 0x67, 0x6f, 0x2f, 0x69, 0x6e, 0x74, 0x65,
-	0x72, 0x6e, 0x61, 0x6c, 0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2f, 0x61, 0x70, 0x70, 0x6c, 0x69,
-	0x63, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
+	0x2e, 0x46, 0x69, 0x65, 0x6c, 0x64, 0x73, 0x43, 0x68, 0x61, 0x6e, 0x67, 0x65, 0x55, 0x70, 0x64,
+	0x61, 0x74, 0x65, 0x22, 0x00, 0x30, 0x01, 0x42, 0x47, 0x48, 0x01, 0x50, 0x01, 0x5a, 0x41, 0x67,
+	0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x64, 0x65, 0x65, 0x70, 0x68, 0x61,
+	0x76, 0x65, 0x6e, 0x2f, 0x64, 0x65, 0x65, 0x70, 0x68, 0x61, 0x76, 0x65, 0x6e, 0x2d, 0x63, 0x6f,
+	0x72, 0x65, 0x2f, 0x67, 0x6f, 0x2f, 0x69, 0x6e, 0x74, 0x65, 0x72, 0x6e, 0x61, 0x6c, 0x2f, 0x70,
+	0x72, 0x6f, 0x74, 0x6f, 0x2f, 0x61, 0x70, 0x70, 0x6c, 0x69, 0x63, 0x61, 0x74, 0x69, 0x6f, 0x6e,
+	0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
 }
 
 var (
-	file_deephaven_proto_application_proto_rawDescOnce sync.Once
-	file_deephaven_proto_application_proto_rawDescData = file_deephaven_proto_application_proto_rawDesc
+	file_deephaven_core_proto_application_proto_rawDescOnce sync.Once
+	file_deephaven_core_proto_application_proto_rawDescData = file_deephaven_core_proto_application_proto_rawDesc
 )
 
-func file_deephaven_proto_application_proto_rawDescGZIP() []byte {
-	file_deephaven_proto_application_proto_rawDescOnce.Do(func() {
-		file_deephaven_proto_application_proto_rawDescData = protoimpl.X.CompressGZIP(file_deephaven_proto_application_proto_rawDescData)
+func file_deephaven_core_proto_application_proto_rawDescGZIP() []byte {
+	file_deephaven_core_proto_application_proto_rawDescOnce.Do(func() {
+		file_deephaven_core_proto_application_proto_rawDescData = protoimpl.X.CompressGZIP(file_deephaven_core_proto_application_proto_rawDescData)
 	})
-	return file_deephaven_proto_application_proto_rawDescData
+	return file_deephaven_core_proto_application_proto_rawDescData
 }
 
-var file_deephaven_proto_application_proto_msgTypes = make([]protoimpl.MessageInfo, 3)
-var file_deephaven_proto_application_proto_goTypes = []interface{}{
+var file_deephaven_core_proto_application_proto_msgTypes = make([]protoimpl.MessageInfo, 3)
+var file_deephaven_core_proto_application_proto_goTypes = []interface{}{
 	(*ListFieldsRequest)(nil),  // 0: io.deephaven.proto.backplane.grpc.ListFieldsRequest
 	(*FieldsChangeUpdate)(nil), // 1: io.deephaven.proto.backplane.grpc.FieldsChangeUpdate
 	(*FieldInfo)(nil),          // 2: io.deephaven.proto.backplane.grpc.FieldInfo
 	(*ticket.TypedTicket)(nil), // 3: io.deephaven.proto.backplane.grpc.TypedTicket
 }
-var file_deephaven_proto_application_proto_depIdxs = []int32{
+var file_deephaven_core_proto_application_proto_depIdxs = []int32{
 	2, // 0: io.deephaven.proto.backplane.grpc.FieldsChangeUpdate.created:type_name -> io.deephaven.proto.backplane.grpc.FieldInfo
 	2, // 1: io.deephaven.proto.backplane.grpc.FieldsChangeUpdate.updated:type_name -> io.deephaven.proto.backplane.grpc.FieldInfo
 	2, // 2: io.deephaven.proto.backplane.grpc.FieldsChangeUpdate.removed:type_name -> io.deephaven.proto.backplane.grpc.FieldInfo
@@ -299,13 +300,13 @@ var file_deephaven_proto_application_proto_depIdxs = []int32{
 	0, // [0:4] is the sub-list for field type_name
 }
 
-func init() { file_deephaven_proto_application_proto_init() }
-func file_deephaven_proto_application_proto_init() {
-	if File_deephaven_proto_application_proto != nil {
+func init() { file_deephaven_core_proto_application_proto_init() }
+func file_deephaven_core_proto_application_proto_init() {
+	if File_deephaven_core_proto_application_proto != nil {
 		return
 	}
 	if !protoimpl.UnsafeEnabled {
-		file_deephaven_proto_application_proto_msgTypes[0].Exporter = func(v interface{}, i int) interface{} {
+		file_deephaven_core_proto_application_proto_msgTypes[0].Exporter = func(v interface{}, i int) interface{} {
 			switch v := v.(*ListFieldsRequest); i {
 			case 0:
 				return &v.state
@@ -317,7 +318,7 @@ func file_deephaven_proto_application_proto_init() {
 				return nil
 			}
 		}
-		file_deephaven_proto_application_proto_msgTypes[1].Exporter = func(v interface{}, i int) interface{} {
+		file_deephaven_core_proto_application_proto_msgTypes[1].Exporter = func(v interface{}, i int) interface{} {
 			switch v := v.(*FieldsChangeUpdate); i {
 			case 0:
 				return &v.state
@@ -329,7 +330,7 @@ func file_deephaven_proto_application_proto_init() {
 				return nil
 			}
 		}
-		file_deephaven_proto_application_proto_msgTypes[2].Exporter = func(v interface{}, i int) interface{} {
+		file_deephaven_core_proto_application_proto_msgTypes[2].Exporter = func(v interface{}, i int) interface{} {
 			switch v := v.(*FieldInfo); i {
 			case 0:
 				return &v.state
@@ -346,18 +347,18 @@ func file_deephaven_proto_application_proto_init() {
 	out := protoimpl.TypeBuilder{
 		File: protoimpl.DescBuilder{
 			GoPackagePath: reflect.TypeOf(x{}).PkgPath(),
-			RawDescriptor: file_deephaven_proto_application_proto_rawDesc,
+			RawDescriptor: file_deephaven_core_proto_application_proto_rawDesc,
 			NumEnums:      0,
 			NumMessages:   3,
 			NumExtensions: 0,
 			NumServices:   1,
 		},
-		GoTypes:           file_deephaven_proto_application_proto_goTypes,
-		DependencyIndexes: file_deephaven_proto_application_proto_depIdxs,
-		MessageInfos:      file_deephaven_proto_application_proto_msgTypes,
+		GoTypes:           file_deephaven_core_proto_application_proto_goTypes,
+		DependencyIndexes: file_deephaven_core_proto_application_proto_depIdxs,
+		MessageInfos:      file_deephaven_core_proto_application_proto_msgTypes,
 	}.Build()
-	File_deephaven_proto_application_proto = out.File
-	file_deephaven_proto_application_proto_rawDesc = nil
-	file_deephaven_proto_application_proto_goTypes = nil
-	file_deephaven_proto_application_proto_depIdxs = nil
+	File_deephaven_core_proto_application_proto = out.File
+	file_deephaven_core_proto_application_proto_rawDesc = nil
+	file_deephaven_core_proto_application_proto_goTypes = nil
+	file_deephaven_core_proto_application_proto_depIdxs = nil
 }
diff --git a/go/internal/proto/application/application_grpc.pb.go b/go/internal/proto/application/application_grpc.pb.go
index 51a0e1580bb..e244f021ad9 100644
--- a/go/internal/proto/application/application_grpc.pb.go
+++ b/go/internal/proto/application/application_grpc.pb.go
@@ -2,7 +2,7 @@
 // versions:
 // - protoc-gen-go-grpc v1.2.0
 // - protoc             v4.25.3
-// source: deephaven/proto/application.proto
+// source: deephaven_core/proto/application.proto
 
 package application
 
@@ -142,5 +142,5 @@ var ApplicationService_ServiceDesc = grpc.ServiceDesc{
 			ServerStreams: true,
 		},
 	},
-	Metadata: "deephaven/proto/application.proto",
+	Metadata: "deephaven_core/proto/application.proto",
 }
diff --git a/go/internal/proto/config/config.pb.go b/go/internal/proto/config/config.pb.go
index e362f9444ad..3a0e8c7abbb 100644
--- a/go/internal/proto/config/config.pb.go
+++ b/go/internal/proto/config/config.pb.go
@@ -5,7 +5,7 @@
 // versions:
 // 	protoc-gen-go v1.28.1
 // 	protoc        v4.25.3
-// source: deephaven/proto/config.proto
+// source: deephaven_core/proto/config.proto
 
 package config
 
@@ -32,7 +32,7 @@ type AuthenticationConstantsRequest struct {
 func (x *AuthenticationConstantsRequest) Reset() {
 	*x = AuthenticationConstantsRequest{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_deephaven_proto_config_proto_msgTypes[0]
+		mi := &file_deephaven_core_proto_config_proto_msgTypes[0]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -45,7 +45,7 @@ func (x *AuthenticationConstantsRequest) String() string {
 func (*AuthenticationConstantsRequest) ProtoMessage() {}
 
 func (x *AuthenticationConstantsRequest) ProtoReflect() protoreflect.Message {
-	mi := &file_deephaven_proto_config_proto_msgTypes[0]
+	mi := &file_deephaven_core_proto_config_proto_msgTypes[0]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -58,7 +58,7 @@ func (x *AuthenticationConstantsRequest) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use AuthenticationConstantsRequest.ProtoReflect.Descriptor instead.
 func (*AuthenticationConstantsRequest) Descriptor() ([]byte, []int) {
-	return file_deephaven_proto_config_proto_rawDescGZIP(), []int{0}
+	return file_deephaven_core_proto_config_proto_rawDescGZIP(), []int{0}
 }
 
 type ConfigurationConstantsRequest struct {
@@ -70,7 +70,7 @@ type ConfigurationConstantsRequest struct {
 func (x *ConfigurationConstantsRequest) Reset() {
 	*x = ConfigurationConstantsRequest{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_deephaven_proto_config_proto_msgTypes[1]
+		mi := &file_deephaven_core_proto_config_proto_msgTypes[1]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -83,7 +83,7 @@ func (x *ConfigurationConstantsRequest) String() string {
 func (*ConfigurationConstantsRequest) ProtoMessage() {}
 
 func (x *ConfigurationConstantsRequest) ProtoReflect() protoreflect.Message {
-	mi := &file_deephaven_proto_config_proto_msgTypes[1]
+	mi := &file_deephaven_core_proto_config_proto_msgTypes[1]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -96,7 +96,7 @@ func (x *ConfigurationConstantsRequest) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use ConfigurationConstantsRequest.ProtoReflect.Descriptor instead.
 func (*ConfigurationConstantsRequest) Descriptor() ([]byte, []int) {
-	return file_deephaven_proto_config_proto_rawDescGZIP(), []int{1}
+	return file_deephaven_core_proto_config_proto_rawDescGZIP(), []int{1}
 }
 
 type AuthenticationConstantsResponse struct {
@@ -110,7 +110,7 @@ type AuthenticationConstantsResponse struct {
 func (x *AuthenticationConstantsResponse) Reset() {
 	*x = AuthenticationConstantsResponse{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_deephaven_proto_config_proto_msgTypes[2]
+		mi := &file_deephaven_core_proto_config_proto_msgTypes[2]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -123,7 +123,7 @@ func (x *AuthenticationConstantsResponse) String() string {
 func (*AuthenticationConstantsResponse) ProtoMessage() {}
 
 func (x *AuthenticationConstantsResponse) ProtoReflect() protoreflect.Message {
-	mi := &file_deephaven_proto_config_proto_msgTypes[2]
+	mi := &file_deephaven_core_proto_config_proto_msgTypes[2]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -136,7 +136,7 @@ func (x *AuthenticationConstantsResponse) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use AuthenticationConstantsResponse.ProtoReflect.Descriptor instead.
 func (*AuthenticationConstantsResponse) Descriptor() ([]byte, []int) {
-	return file_deephaven_proto_config_proto_rawDescGZIP(), []int{2}
+	return file_deephaven_core_proto_config_proto_rawDescGZIP(), []int{2}
 }
 
 func (x *AuthenticationConstantsResponse) GetConfigValues() map[string]*ConfigValue {
@@ -157,7 +157,7 @@ type ConfigurationConstantsResponse struct {
 func (x *ConfigurationConstantsResponse) Reset() {
 	*x = ConfigurationConstantsResponse{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_deephaven_proto_config_proto_msgTypes[3]
+		mi := &file_deephaven_core_proto_config_proto_msgTypes[3]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -170,7 +170,7 @@ func (x *ConfigurationConstantsResponse) String() string {
 func (*ConfigurationConstantsResponse) ProtoMessage() {}
 
 func (x *ConfigurationConstantsResponse) ProtoReflect() protoreflect.Message {
-	mi := &file_deephaven_proto_config_proto_msgTypes[3]
+	mi := &file_deephaven_core_proto_config_proto_msgTypes[3]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -183,7 +183,7 @@ func (x *ConfigurationConstantsResponse) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use ConfigurationConstantsResponse.ProtoReflect.Descriptor instead.
 func (*ConfigurationConstantsResponse) Descriptor() ([]byte, []int) {
-	return file_deephaven_proto_config_proto_rawDescGZIP(), []int{3}
+	return file_deephaven_core_proto_config_proto_rawDescGZIP(), []int{3}
 }
 
 func (x *ConfigurationConstantsResponse) GetConfigValues() map[string]*ConfigValue {
@@ -209,7 +209,7 @@ type ConfigValue struct {
 func (x *ConfigValue) Reset() {
 	*x = ConfigValue{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_deephaven_proto_config_proto_msgTypes[4]
+		mi := &file_deephaven_core_proto_config_proto_msgTypes[4]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -222,7 +222,7 @@ func (x *ConfigValue) String() string {
 func (*ConfigValue) ProtoMessage() {}
 
 func (x *ConfigValue) ProtoReflect() protoreflect.Message {
-	mi := &file_deephaven_proto_config_proto_msgTypes[4]
+	mi := &file_deephaven_core_proto_config_proto_msgTypes[4]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -235,7 +235,7 @@ func (x *ConfigValue) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use ConfigValue.ProtoReflect.Descriptor instead.
 func (*ConfigValue) Descriptor() ([]byte, []int) {
-	return file_deephaven_proto_config_proto_rawDescGZIP(), []int{4}
+	return file_deephaven_core_proto_config_proto_rawDescGZIP(), []int{4}
 }
 
 func (m *ConfigValue) GetKind() isConfigValue_Kind {
@@ -262,98 +262,98 @@ type ConfigValue_StringValue struct {
 
 func (*ConfigValue_StringValue) isConfigValue_Kind() {}
 
-var File_deephaven_proto_config_proto protoreflect.FileDescriptor
+var File_deephaven_core_proto_config_proto protoreflect.FileDescriptor
 
-var file_deephaven_proto_config_proto_rawDesc = []byte{
-	0x0a, 0x1c, 0x64, 0x65, 0x65, 0x70, 0x68, 0x61, 0x76, 0x65, 0x6e, 0x2f, 0x70, 0x72, 0x6f, 0x74,
-	0x6f, 0x2f, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x12, 0x21,
-	0x69, 0x6f, 0x2e, 0x64, 0x65, 0x65, 0x70, 0x68, 0x61, 0x76, 0x65, 0x6e, 0x2e, 0x70, 0x72, 0x6f,
-	0x74, 0x6f, 0x2e, 0x62, 0x61, 0x63, 0x6b, 0x70, 0x6c, 0x61, 0x6e, 0x65, 0x2e, 0x67, 0x72, 0x70,
-	0x63, 0x22, 0x20, 0x0a, 0x1e, 0x41, 0x75, 0x74, 0x68, 0x65, 0x6e, 0x74, 0x69, 0x63, 0x61, 0x74,
-	0x69, 0x6f, 0x6e, 0x43, 0x6f, 0x6e, 0x73, 0x74, 0x61, 0x6e, 0x74, 0x73, 0x52, 0x65, 0x71, 0x75,
-	0x65, 0x73, 0x74, 0x22, 0x1f, 0x0a, 0x1d, 0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x75, 0x72, 0x61,
-	0x74, 0x69, 0x6f, 0x6e, 0x43, 0x6f, 0x6e, 0x73, 0x74, 0x61, 0x6e, 0x74, 0x73, 0x52, 0x65, 0x71,
-	0x75, 0x65, 0x73, 0x74, 0x22, 0x8d, 0x02, 0x0a, 0x1f, 0x41, 0x75, 0x74, 0x68, 0x65, 0x6e, 0x74,
+var file_deephaven_core_proto_config_proto_rawDesc = []byte{
+	0x0a, 0x21, 0x64, 0x65, 0x65, 0x70, 0x68, 0x61, 0x76, 0x65, 0x6e, 0x5f, 0x63, 0x6f, 0x72, 0x65,
+	0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2f, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x2e, 0x70, 0x72,
+	0x6f, 0x74, 0x6f, 0x12, 0x21, 0x69, 0x6f, 0x2e, 0x64, 0x65, 0x65, 0x70, 0x68, 0x61, 0x76, 0x65,
+	0x6e, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x62, 0x61, 0x63, 0x6b, 0x70, 0x6c, 0x61, 0x6e,
+	0x65, 0x2e, 0x67, 0x72, 0x70, 0x63, 0x22, 0x20, 0x0a, 0x1e, 0x41, 0x75, 0x74, 0x68, 0x65, 0x6e,
+	0x74, 0x69, 0x63, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x43, 0x6f, 0x6e, 0x73, 0x74, 0x61, 0x6e, 0x74,
+	0x73, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x22, 0x1f, 0x0a, 0x1d, 0x43, 0x6f, 0x6e, 0x66,
+	0x69, 0x67, 0x75, 0x72, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x43, 0x6f, 0x6e, 0x73, 0x74, 0x61, 0x6e,
+	0x74, 0x73, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x22, 0x8d, 0x02, 0x0a, 0x1f, 0x41, 0x75,
+	0x74, 0x68, 0x65, 0x6e, 0x74, 0x69, 0x63, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x43, 0x6f, 0x6e, 0x73,
+	0x74, 0x61, 0x6e, 0x74, 0x73, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x79, 0x0a,
+	0x0d, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x5f, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x73, 0x18, 0x01,
+	0x20, 0x03, 0x28, 0x0b, 0x32, 0x54, 0x2e, 0x69, 0x6f, 0x2e, 0x64, 0x65, 0x65, 0x70, 0x68, 0x61,
+	0x76, 0x65, 0x6e, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x62, 0x61, 0x63, 0x6b, 0x70, 0x6c,
+	0x61, 0x6e, 0x65, 0x2e, 0x67, 0x72, 0x70, 0x63, 0x2e, 0x41, 0x75, 0x74, 0x68, 0x65, 0x6e, 0x74,
 	0x69, 0x63, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x43, 0x6f, 0x6e, 0x73, 0x74, 0x61, 0x6e, 0x74, 0x73,
-	0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x79, 0x0a, 0x0d, 0x63, 0x6f, 0x6e, 0x66,
-	0x69, 0x67, 0x5f, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x73, 0x18, 0x01, 0x20, 0x03, 0x28, 0x0b, 0x32,
-	0x54, 0x2e, 0x69, 0x6f, 0x2e, 0x64, 0x65, 0x65, 0x70, 0x68, 0x61, 0x76, 0x65, 0x6e, 0x2e, 0x70,
-	0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x62, 0x61, 0x63, 0x6b, 0x70, 0x6c, 0x61, 0x6e, 0x65, 0x2e, 0x67,
-	0x72, 0x70, 0x63, 0x2e, 0x41, 0x75, 0x74, 0x68, 0x65, 0x6e, 0x74, 0x69, 0x63, 0x61, 0x74, 0x69,
-	0x6f, 0x6e, 0x43, 0x6f, 0x6e, 0x73, 0x74, 0x61, 0x6e, 0x74, 0x73, 0x52, 0x65, 0x73, 0x70, 0x6f,
-	0x6e, 0x73, 0x65, 0x2e, 0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x56, 0x61, 0x6c, 0x75, 0x65, 0x73,
-	0x45, 0x6e, 0x74, 0x72, 0x79, 0x52, 0x0c, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x56, 0x61, 0x6c,
-	0x75, 0x65, 0x73, 0x1a, 0x6f, 0x0a, 0x11, 0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x56, 0x61, 0x6c,
-	0x75, 0x65, 0x73, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65, 0x79, 0x18,
-	0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x6b, 0x65, 0x79, 0x12, 0x44, 0x0a, 0x05, 0x76, 0x61,
-	0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x2e, 0x2e, 0x69, 0x6f, 0x2e, 0x64,
-	0x65, 0x65, 0x70, 0x68, 0x61, 0x76, 0x65, 0x6e, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x62,
-	0x61, 0x63, 0x6b, 0x70, 0x6c, 0x61, 0x6e, 0x65, 0x2e, 0x67, 0x72, 0x70, 0x63, 0x2e, 0x43, 0x6f,
-	0x6e, 0x66, 0x69, 0x67, 0x56, 0x61, 0x6c, 0x75, 0x65, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65,
-	0x3a, 0x02, 0x38, 0x01, 0x22, 0x8b, 0x02, 0x0a, 0x1e, 0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x75,
-	0x72, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x43, 0x6f, 0x6e, 0x73, 0x74, 0x61, 0x6e, 0x74, 0x73, 0x52,
-	0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x78, 0x0a, 0x0d, 0x63, 0x6f, 0x6e, 0x66, 0x69,
-	0x67, 0x5f, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x73, 0x18, 0x01, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x53,
+	0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x2e, 0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x56,
+	0x61, 0x6c, 0x75, 0x65, 0x73, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x52, 0x0c, 0x63, 0x6f, 0x6e, 0x66,
+	0x69, 0x67, 0x56, 0x61, 0x6c, 0x75, 0x65, 0x73, 0x1a, 0x6f, 0x0a, 0x11, 0x43, 0x6f, 0x6e, 0x66,
+	0x69, 0x67, 0x56, 0x61, 0x6c, 0x75, 0x65, 0x73, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x12, 0x10, 0x0a,
+	0x03, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x6b, 0x65, 0x79, 0x12,
+	0x44, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x2e,
 	0x2e, 0x69, 0x6f, 0x2e, 0x64, 0x65, 0x65, 0x70, 0x68, 0x61, 0x76, 0x65, 0x6e, 0x2e, 0x70, 0x72,
 	0x6f, 0x74, 0x6f, 0x2e, 0x62, 0x61, 0x63, 0x6b, 0x70, 0x6c, 0x61, 0x6e, 0x65, 0x2e, 0x67, 0x72,
-	0x70, 0x63, 0x2e, 0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x75, 0x72, 0x61, 0x74, 0x69, 0x6f, 0x6e,
-	0x43, 0x6f, 0x6e, 0x73, 0x74, 0x61, 0x6e, 0x74, 0x73, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73,
-	0x65, 0x2e, 0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x56, 0x61, 0x6c, 0x75, 0x65, 0x73, 0x45, 0x6e,
-	0x74, 0x72, 0x79, 0x52, 0x0c, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x56, 0x61, 0x6c, 0x75, 0x65,
-	0x73, 0x1a, 0x6f, 0x0a, 0x11, 0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x56, 0x61, 0x6c, 0x75, 0x65,
-	0x73, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20,
-	0x01, 0x28, 0x09, 0x52, 0x03, 0x6b, 0x65, 0x79, 0x12, 0x44, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75,
-	0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x2e, 0x2e, 0x69, 0x6f, 0x2e, 0x64, 0x65, 0x65,
-	0x70, 0x68, 0x61, 0x76, 0x65, 0x6e, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x62, 0x61, 0x63,
-	0x6b, 0x70, 0x6c, 0x61, 0x6e, 0x65, 0x2e, 0x67, 0x72, 0x70, 0x63, 0x2e, 0x43, 0x6f, 0x6e, 0x66,
-	0x69, 0x67, 0x56, 0x61, 0x6c, 0x75, 0x65, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02,
-	0x38, 0x01, 0x22, 0x3a, 0x0a, 0x0b, 0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x56, 0x61, 0x6c, 0x75,
-	0x65, 0x12, 0x23, 0x0a, 0x0c, 0x73, 0x74, 0x72, 0x69, 0x6e, 0x67, 0x5f, 0x76, 0x61, 0x6c, 0x75,
-	0x65, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x48, 0x00, 0x52, 0x0b, 0x73, 0x74, 0x72, 0x69, 0x6e,
-	0x67, 0x56, 0x61, 0x6c, 0x75, 0x65, 0x42, 0x06, 0x0a, 0x04, 0x6b, 0x69, 0x6e, 0x64, 0x32, 0xdc,
-	0x02, 0x0a, 0x0d, 0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x53, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65,
-	0x12, 0xa5, 0x01, 0x0a, 0x1a, 0x47, 0x65, 0x74, 0x41, 0x75, 0x74, 0x68, 0x65, 0x6e, 0x74, 0x69,
-	0x63, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x43, 0x6f, 0x6e, 0x73, 0x74, 0x61, 0x6e, 0x74, 0x73, 0x12,
-	0x41, 0x2e, 0x69, 0x6f, 0x2e, 0x64, 0x65, 0x65, 0x70, 0x68, 0x61, 0x76, 0x65, 0x6e, 0x2e, 0x70,
-	0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x62, 0x61, 0x63, 0x6b, 0x70, 0x6c, 0x61, 0x6e, 0x65, 0x2e, 0x67,
-	0x72, 0x70, 0x63, 0x2e, 0x41, 0x75, 0x74, 0x68, 0x65, 0x6e, 0x74, 0x69, 0x63, 0x61, 0x74, 0x69,
-	0x6f, 0x6e, 0x43, 0x6f, 0x6e, 0x73, 0x74, 0x61, 0x6e, 0x74, 0x73, 0x52, 0x65, 0x71, 0x75, 0x65,
-	0x73, 0x74, 0x1a, 0x42, 0x2e, 0x69, 0x6f, 0x2e, 0x64, 0x65, 0x65, 0x70, 0x68, 0x61, 0x76, 0x65,
-	0x6e, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x62, 0x61, 0x63, 0x6b, 0x70, 0x6c, 0x61, 0x6e,
-	0x65, 0x2e, 0x67, 0x72, 0x70, 0x63, 0x2e, 0x41, 0x75, 0x74, 0x68, 0x65, 0x6e, 0x74, 0x69, 0x63,
+	0x70, 0x63, 0x2e, 0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x56, 0x61, 0x6c, 0x75, 0x65, 0x52, 0x05,
+	0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, 0x22, 0x8b, 0x02, 0x0a, 0x1e, 0x43, 0x6f,
+	0x6e, 0x66, 0x69, 0x67, 0x75, 0x72, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x43, 0x6f, 0x6e, 0x73, 0x74,
+	0x61, 0x6e, 0x74, 0x73, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x78, 0x0a, 0x0d,
+	0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x5f, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x73, 0x18, 0x01, 0x20,
+	0x03, 0x28, 0x0b, 0x32, 0x53, 0x2e, 0x69, 0x6f, 0x2e, 0x64, 0x65, 0x65, 0x70, 0x68, 0x61, 0x76,
+	0x65, 0x6e, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x62, 0x61, 0x63, 0x6b, 0x70, 0x6c, 0x61,
+	0x6e, 0x65, 0x2e, 0x67, 0x72, 0x70, 0x63, 0x2e, 0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x75, 0x72,
 	0x61, 0x74, 0x69, 0x6f, 0x6e, 0x43, 0x6f, 0x6e, 0x73, 0x74, 0x61, 0x6e, 0x74, 0x73, 0x52, 0x65,
-	0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x00, 0x12, 0xa2, 0x01, 0x0a, 0x19, 0x47, 0x65, 0x74,
+	0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x2e, 0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x56, 0x61, 0x6c,
+	0x75, 0x65, 0x73, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x52, 0x0c, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67,
+	0x56, 0x61, 0x6c, 0x75, 0x65, 0x73, 0x1a, 0x6f, 0x0a, 0x11, 0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67,
+	0x56, 0x61, 0x6c, 0x75, 0x65, 0x73, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x12, 0x10, 0x0a, 0x03, 0x6b,
+	0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x6b, 0x65, 0x79, 0x12, 0x44, 0x0a,
+	0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x2e, 0x2e, 0x69,
+	0x6f, 0x2e, 0x64, 0x65, 0x65, 0x70, 0x68, 0x61, 0x76, 0x65, 0x6e, 0x2e, 0x70, 0x72, 0x6f, 0x74,
+	0x6f, 0x2e, 0x62, 0x61, 0x63, 0x6b, 0x70, 0x6c, 0x61, 0x6e, 0x65, 0x2e, 0x67, 0x72, 0x70, 0x63,
+	0x2e, 0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x56, 0x61, 0x6c, 0x75, 0x65, 0x52, 0x05, 0x76, 0x61,
+	0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, 0x22, 0x3a, 0x0a, 0x0b, 0x43, 0x6f, 0x6e, 0x66, 0x69,
+	0x67, 0x56, 0x61, 0x6c, 0x75, 0x65, 0x12, 0x23, 0x0a, 0x0c, 0x73, 0x74, 0x72, 0x69, 0x6e, 0x67,
+	0x5f, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x48, 0x00, 0x52, 0x0b,
+	0x73, 0x74, 0x72, 0x69, 0x6e, 0x67, 0x56, 0x61, 0x6c, 0x75, 0x65, 0x42, 0x06, 0x0a, 0x04, 0x6b,
+	0x69, 0x6e, 0x64, 0x32, 0xdc, 0x02, 0x0a, 0x0d, 0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x53, 0x65,
+	0x72, 0x76, 0x69, 0x63, 0x65, 0x12, 0xa5, 0x01, 0x0a, 0x1a, 0x47, 0x65, 0x74, 0x41, 0x75, 0x74,
+	0x68, 0x65, 0x6e, 0x74, 0x69, 0x63, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x43, 0x6f, 0x6e, 0x73, 0x74,
+	0x61, 0x6e, 0x74, 0x73, 0x12, 0x41, 0x2e, 0x69, 0x6f, 0x2e, 0x64, 0x65, 0x65, 0x70, 0x68, 0x61,
+	0x76, 0x65, 0x6e, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x62, 0x61, 0x63, 0x6b, 0x70, 0x6c,
+	0x61, 0x6e, 0x65, 0x2e, 0x67, 0x72, 0x70, 0x63, 0x2e, 0x41, 0x75, 0x74, 0x68, 0x65, 0x6e, 0x74,
+	0x69, 0x63, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x43, 0x6f, 0x6e, 0x73, 0x74, 0x61, 0x6e, 0x74, 0x73,
+	0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x42, 0x2e, 0x69, 0x6f, 0x2e, 0x64, 0x65, 0x65,
+	0x70, 0x68, 0x61, 0x76, 0x65, 0x6e, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x62, 0x61, 0x63,
+	0x6b, 0x70, 0x6c, 0x61, 0x6e, 0x65, 0x2e, 0x67, 0x72, 0x70, 0x63, 0x2e, 0x41, 0x75, 0x74, 0x68,
+	0x65, 0x6e, 0x74, 0x69, 0x63, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x43, 0x6f, 0x6e, 0x73, 0x74, 0x61,
+	0x6e, 0x74, 0x73, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x00, 0x12, 0xa2, 0x01,
+	0x0a, 0x19, 0x47, 0x65, 0x74, 0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x75, 0x72, 0x61, 0x74, 0x69,
+	0x6f, 0x6e, 0x43, 0x6f, 0x6e, 0x73, 0x74, 0x61, 0x6e, 0x74, 0x73, 0x12, 0x40, 0x2e, 0x69, 0x6f,
+	0x2e, 0x64, 0x65, 0x65, 0x70, 0x68, 0x61, 0x76, 0x65, 0x6e, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f,
+	0x2e, 0x62, 0x61, 0x63, 0x6b, 0x70, 0x6c, 0x61, 0x6e, 0x65, 0x2e, 0x67, 0x72, 0x70, 0x63, 0x2e,
 	0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x75, 0x72, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x43, 0x6f, 0x6e,
-	0x73, 0x74, 0x61, 0x6e, 0x74, 0x73, 0x12, 0x40, 0x2e, 0x69, 0x6f, 0x2e, 0x64, 0x65, 0x65, 0x70,
-	0x68, 0x61, 0x76, 0x65, 0x6e, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x62, 0x61, 0x63, 0x6b,
-	0x70, 0x6c, 0x61, 0x6e, 0x65, 0x2e, 0x67, 0x72, 0x70, 0x63, 0x2e, 0x43, 0x6f, 0x6e, 0x66, 0x69,
-	0x67, 0x75, 0x72, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x43, 0x6f, 0x6e, 0x73, 0x74, 0x61, 0x6e, 0x74,
-	0x73, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x41, 0x2e, 0x69, 0x6f, 0x2e, 0x64, 0x65,
-	0x65, 0x70, 0x68, 0x61, 0x76, 0x65, 0x6e, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x62, 0x61,
-	0x63, 0x6b, 0x70, 0x6c, 0x61, 0x6e, 0x65, 0x2e, 0x67, 0x72, 0x70, 0x63, 0x2e, 0x43, 0x6f, 0x6e,
-	0x66, 0x69, 0x67, 0x75, 0x72, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x43, 0x6f, 0x6e, 0x73, 0x74, 0x61,
-	0x6e, 0x74, 0x73, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x00, 0x42, 0x42, 0x48,
-	0x01, 0x50, 0x01, 0x5a, 0x3c, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f,
-	0x64, 0x65, 0x65, 0x70, 0x68, 0x61, 0x76, 0x65, 0x6e, 0x2f, 0x64, 0x65, 0x65, 0x70, 0x68, 0x61,
-	0x76, 0x65, 0x6e, 0x2d, 0x63, 0x6f, 0x72, 0x65, 0x2f, 0x67, 0x6f, 0x2f, 0x69, 0x6e, 0x74, 0x65,
-	0x72, 0x6e, 0x61, 0x6c, 0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2f, 0x63, 0x6f, 0x6e, 0x66, 0x69,
-	0x67, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
+	0x73, 0x74, 0x61, 0x6e, 0x74, 0x73, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x41, 0x2e,
+	0x69, 0x6f, 0x2e, 0x64, 0x65, 0x65, 0x70, 0x68, 0x61, 0x76, 0x65, 0x6e, 0x2e, 0x70, 0x72, 0x6f,
+	0x74, 0x6f, 0x2e, 0x62, 0x61, 0x63, 0x6b, 0x70, 0x6c, 0x61, 0x6e, 0x65, 0x2e, 0x67, 0x72, 0x70,
+	0x63, 0x2e, 0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x75, 0x72, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x43,
+	0x6f, 0x6e, 0x73, 0x74, 0x61, 0x6e, 0x74, 0x73, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65,
+	0x22, 0x00, 0x42, 0x42, 0x48, 0x01, 0x50, 0x01, 0x5a, 0x3c, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62,
+	0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x64, 0x65, 0x65, 0x70, 0x68, 0x61, 0x76, 0x65, 0x6e, 0x2f, 0x64,
+	0x65, 0x65, 0x70, 0x68, 0x61, 0x76, 0x65, 0x6e, 0x2d, 0x63, 0x6f, 0x72, 0x65, 0x2f, 0x67, 0x6f,
+	0x2f, 0x69, 0x6e, 0x74, 0x65, 0x72, 0x6e, 0x61, 0x6c, 0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2f,
+	0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
 }
 
 var (
-	file_deephaven_proto_config_proto_rawDescOnce sync.Once
-	file_deephaven_proto_config_proto_rawDescData = file_deephaven_proto_config_proto_rawDesc
+	file_deephaven_core_proto_config_proto_rawDescOnce sync.Once
+	file_deephaven_core_proto_config_proto_rawDescData = file_deephaven_core_proto_config_proto_rawDesc
 )
 
-func file_deephaven_proto_config_proto_rawDescGZIP() []byte {
-	file_deephaven_proto_config_proto_rawDescOnce.Do(func() {
-		file_deephaven_proto_config_proto_rawDescData = protoimpl.X.CompressGZIP(file_deephaven_proto_config_proto_rawDescData)
+func file_deephaven_core_proto_config_proto_rawDescGZIP() []byte {
+	file_deephaven_core_proto_config_proto_rawDescOnce.Do(func() {
+		file_deephaven_core_proto_config_proto_rawDescData = protoimpl.X.CompressGZIP(file_deephaven_core_proto_config_proto_rawDescData)
 	})
-	return file_deephaven_proto_config_proto_rawDescData
+	return file_deephaven_core_proto_config_proto_rawDescData
 }
 
-var file_deephaven_proto_config_proto_msgTypes = make([]protoimpl.MessageInfo, 7)
-var file_deephaven_proto_config_proto_goTypes = []interface{}{
+var file_deephaven_core_proto_config_proto_msgTypes = make([]protoimpl.MessageInfo, 7)
+var file_deephaven_core_proto_config_proto_goTypes = []interface{}{
 	(*AuthenticationConstantsRequest)(nil),  // 0: io.deephaven.proto.backplane.grpc.AuthenticationConstantsRequest
 	(*ConfigurationConstantsRequest)(nil),   // 1: io.deephaven.proto.backplane.grpc.ConfigurationConstantsRequest
 	(*AuthenticationConstantsResponse)(nil), // 2: io.deephaven.proto.backplane.grpc.AuthenticationConstantsResponse
@@ -362,7 +362,7 @@ var file_deephaven_proto_config_proto_goTypes = []interface{}{
 	nil,                                     // 5: io.deephaven.proto.backplane.grpc.AuthenticationConstantsResponse.ConfigValuesEntry
 	nil,                                     // 6: io.deephaven.proto.backplane.grpc.ConfigurationConstantsResponse.ConfigValuesEntry
 }
-var file_deephaven_proto_config_proto_depIdxs = []int32{
+var file_deephaven_core_proto_config_proto_depIdxs = []int32{
 	5, // 0: io.deephaven.proto.backplane.grpc.AuthenticationConstantsResponse.config_values:type_name -> io.deephaven.proto.backplane.grpc.AuthenticationConstantsResponse.ConfigValuesEntry
 	6, // 1: io.deephaven.proto.backplane.grpc.ConfigurationConstantsResponse.config_values:type_name -> io.deephaven.proto.backplane.grpc.ConfigurationConstantsResponse.ConfigValuesEntry
 	4, // 2: io.deephaven.proto.backplane.grpc.AuthenticationConstantsResponse.ConfigValuesEntry.value:type_name -> io.deephaven.proto.backplane.grpc.ConfigValue
@@ -378,13 +378,13 @@ var file_deephaven_proto_config_proto_depIdxs = []int32{
 	0, // [0:4] is the sub-list for field type_name
 }
 
-func init() { file_deephaven_proto_config_proto_init() }
-func file_deephaven_proto_config_proto_init() {
-	if File_deephaven_proto_config_proto != nil {
+func init() { file_deephaven_core_proto_config_proto_init() }
+func file_deephaven_core_proto_config_proto_init() {
+	if File_deephaven_core_proto_config_proto != nil {
 		return
 	}
 	if !protoimpl.UnsafeEnabled {
-		file_deephaven_proto_config_proto_msgTypes[0].Exporter = func(v interface{}, i int) interface{} {
+		file_deephaven_core_proto_config_proto_msgTypes[0].Exporter = func(v interface{}, i int) interface{} {
 			switch v := v.(*AuthenticationConstantsRequest); i {
 			case 0:
 				return &v.state
@@ -396,7 +396,7 @@ func file_deephaven_proto_config_proto_init() {
 				return nil
 			}
 		}
-		file_deephaven_proto_config_proto_msgTypes[1].Exporter = func(v interface{}, i int) interface{} {
+		file_deephaven_core_proto_config_proto_msgTypes[1].Exporter = func(v interface{}, i int) interface{} {
 			switch v := v.(*ConfigurationConstantsRequest); i {
 			case 0:
 				return &v.state
@@ -408,7 +408,7 @@ func file_deephaven_proto_config_proto_init() {
 				return nil
 			}
 		}
-		file_deephaven_proto_config_proto_msgTypes[2].Exporter = func(v interface{}, i int) interface{} {
+		file_deephaven_core_proto_config_proto_msgTypes[2].Exporter = func(v interface{}, i int) interface{} {
 			switch v := v.(*AuthenticationConstantsResponse); i {
 			case 0:
 				return &v.state
@@ -420,7 +420,7 @@ func file_deephaven_proto_config_proto_init() {
 				return nil
 			}
 		}
-		file_deephaven_proto_config_proto_msgTypes[3].Exporter = func(v interface{}, i int) interface{} {
+		file_deephaven_core_proto_config_proto_msgTypes[3].Exporter = func(v interface{}, i int) interface{} {
 			switch v := v.(*ConfigurationConstantsResponse); i {
 			case 0:
 				return &v.state
@@ -432,7 +432,7 @@ func file_deephaven_proto_config_proto_init() {
 				return nil
 			}
 		}
-		file_deephaven_proto_config_proto_msgTypes[4].Exporter = func(v interface{}, i int) interface{} {
+		file_deephaven_core_proto_config_proto_msgTypes[4].Exporter = func(v interface{}, i int) interface{} {
 			switch v := v.(*ConfigValue); i {
 			case 0:
 				return &v.state
@@ -445,25 +445,25 @@ func file_deephaven_proto_config_proto_init() {
 			}
 		}
 	}
-	file_deephaven_proto_config_proto_msgTypes[4].OneofWrappers = []interface{}{
+	file_deephaven_core_proto_config_proto_msgTypes[4].OneofWrappers = []interface{}{
 		(*ConfigValue_StringValue)(nil),
 	}
 	type x struct{}
 	out := protoimpl.TypeBuilder{
 		File: protoimpl.DescBuilder{
 			GoPackagePath: reflect.TypeOf(x{}).PkgPath(),
-			RawDescriptor: file_deephaven_proto_config_proto_rawDesc,
+			RawDescriptor: file_deephaven_core_proto_config_proto_rawDesc,
 			NumEnums:      0,
 			NumMessages:   7,
 			NumExtensions: 0,
 			NumServices:   1,
 		},
-		GoTypes:           file_deephaven_proto_config_proto_goTypes,
-		DependencyIndexes: file_deephaven_proto_config_proto_depIdxs,
-		MessageInfos:      file_deephaven_proto_config_proto_msgTypes,
+		GoTypes:           file_deephaven_core_proto_config_proto_goTypes,
+		DependencyIndexes: file_deephaven_core_proto_config_proto_depIdxs,
+		MessageInfos:      file_deephaven_core_proto_config_proto_msgTypes,
 	}.Build()
-	File_deephaven_proto_config_proto = out.File
-	file_deephaven_proto_config_proto_rawDesc = nil
-	file_deephaven_proto_config_proto_goTypes = nil
-	file_deephaven_proto_config_proto_depIdxs = nil
+	File_deephaven_core_proto_config_proto = out.File
+	file_deephaven_core_proto_config_proto_rawDesc = nil
+	file_deephaven_core_proto_config_proto_goTypes = nil
+	file_deephaven_core_proto_config_proto_depIdxs = nil
 }
diff --git a/go/internal/proto/config/config_grpc.pb.go b/go/internal/proto/config/config_grpc.pb.go
index d82ce59cb25..492db16e1ef 100644
--- a/go/internal/proto/config/config_grpc.pb.go
+++ b/go/internal/proto/config/config_grpc.pb.go
@@ -2,7 +2,7 @@
 // versions:
 // - protoc-gen-go-grpc v1.2.0
 // - protoc             v4.25.3
-// source: deephaven/proto/config.proto
+// source: deephaven_core/proto/config.proto
 
 package config
 
@@ -137,5 +137,5 @@ var ConfigService_ServiceDesc = grpc.ServiceDesc{
 		},
 	},
 	Streams:  []grpc.StreamDesc{},
-	Metadata: "deephaven/proto/config.proto",
+	Metadata: "deephaven_core/proto/config.proto",
 }
diff --git a/go/internal/proto/console/console.pb.go b/go/internal/proto/console/console.pb.go
index 46c4a826df2..1a828f267d1 100644
--- a/go/internal/proto/console/console.pb.go
+++ b/go/internal/proto/console/console.pb.go
@@ -5,7 +5,7 @@
 // versions:
 // 	protoc-gen-go v1.28.1
 // 	protoc        v4.25.3
-// source: deephaven/proto/console.proto
+// source: deephaven_core/proto/console.proto
 
 package console
 
@@ -64,11 +64,11 @@ func (x Diagnostic_DiagnosticSeverity) String() string {
 }
 
 func (Diagnostic_DiagnosticSeverity) Descriptor() protoreflect.EnumDescriptor {
-	return file_deephaven_proto_console_proto_enumTypes[0].Descriptor()
+	return file_deephaven_core_proto_console_proto_enumTypes[0].Descriptor()
 }
 
 func (Diagnostic_DiagnosticSeverity) Type() protoreflect.EnumType {
-	return &file_deephaven_proto_console_proto_enumTypes[0]
+	return &file_deephaven_core_proto_console_proto_enumTypes[0]
 }
 
 func (x Diagnostic_DiagnosticSeverity) Number() protoreflect.EnumNumber {
@@ -77,7 +77,7 @@ func (x Diagnostic_DiagnosticSeverity) Number() protoreflect.EnumNumber {
 
 // Deprecated: Use Diagnostic_DiagnosticSeverity.Descriptor instead.
 func (Diagnostic_DiagnosticSeverity) EnumDescriptor() ([]byte, []int) {
-	return file_deephaven_proto_console_proto_rawDescGZIP(), []int{42, 0}
+	return file_deephaven_core_proto_console_proto_rawDescGZIP(), []int{42, 0}
 }
 
 type Diagnostic_DiagnosticTag int32
@@ -113,11 +113,11 @@ func (x Diagnostic_DiagnosticTag) String() string {
 }
 
 func (Diagnostic_DiagnosticTag) Descriptor() protoreflect.EnumDescriptor {
-	return file_deephaven_proto_console_proto_enumTypes[1].Descriptor()
+	return file_deephaven_core_proto_console_proto_enumTypes[1].Descriptor()
 }
 
 func (Diagnostic_DiagnosticTag) Type() protoreflect.EnumType {
-	return &file_deephaven_proto_console_proto_enumTypes[1]
+	return &file_deephaven_core_proto_console_proto_enumTypes[1]
 }
 
 func (x Diagnostic_DiagnosticTag) Number() protoreflect.EnumNumber {
@@ -126,7 +126,7 @@ func (x Diagnostic_DiagnosticTag) Number() protoreflect.EnumNumber {
 
 // Deprecated: Use Diagnostic_DiagnosticTag.Descriptor instead.
 func (Diagnostic_DiagnosticTag) EnumDescriptor() ([]byte, []int) {
-	return file_deephaven_proto_console_proto_rawDescGZIP(), []int{42, 1}
+	return file_deephaven_core_proto_console_proto_rawDescGZIP(), []int{42, 1}
 }
 
 type FigureDescriptor_SeriesPlotStyle int32
@@ -189,11 +189,11 @@ func (x FigureDescriptor_SeriesPlotStyle) String() string {
 }
 
 func (FigureDescriptor_SeriesPlotStyle) Descriptor() protoreflect.EnumDescriptor {
-	return file_deephaven_proto_console_proto_enumTypes[2].Descriptor()
+	return file_deephaven_core_proto_console_proto_enumTypes[2].Descriptor()
 }
 
 func (FigureDescriptor_SeriesPlotStyle) Type() protoreflect.EnumType {
-	return &file_deephaven_proto_console_proto_enumTypes[2]
+	return &file_deephaven_core_proto_console_proto_enumTypes[2]
 }
 
 func (x FigureDescriptor_SeriesPlotStyle) Number() protoreflect.EnumNumber {
@@ -202,7 +202,7 @@ func (x FigureDescriptor_SeriesPlotStyle) Number() protoreflect.EnumNumber {
 
 // Deprecated: Use FigureDescriptor_SeriesPlotStyle.Descriptor instead.
 func (FigureDescriptor_SeriesPlotStyle) EnumDescriptor() ([]byte, []int) {
-	return file_deephaven_proto_console_proto_rawDescGZIP(), []int{43, 0}
+	return file_deephaven_core_proto_console_proto_rawDescGZIP(), []int{43, 0}
 }
 
 type FigureDescriptor_SourceType int32
@@ -286,11 +286,11 @@ func (x FigureDescriptor_SourceType) String() string {
 }
 
 func (FigureDescriptor_SourceType) Descriptor() protoreflect.EnumDescriptor {
-	return file_deephaven_proto_console_proto_enumTypes[3].Descriptor()
+	return file_deephaven_core_proto_console_proto_enumTypes[3].Descriptor()
 }
 
 func (FigureDescriptor_SourceType) Type() protoreflect.EnumType {
-	return &file_deephaven_proto_console_proto_enumTypes[3]
+	return &file_deephaven_core_proto_console_proto_enumTypes[3]
 }
 
 func (x FigureDescriptor_SourceType) Number() protoreflect.EnumNumber {
@@ -299,7 +299,7 @@ func (x FigureDescriptor_SourceType) Number() protoreflect.EnumNumber {
 
 // Deprecated: Use FigureDescriptor_SourceType.Descriptor instead.
 func (FigureDescriptor_SourceType) EnumDescriptor() ([]byte, []int) {
-	return file_deephaven_proto_console_proto_rawDescGZIP(), []int{43, 1}
+	return file_deephaven_core_proto_console_proto_rawDescGZIP(), []int{43, 1}
 }
 
 type FigureDescriptor_ChartDescriptor_ChartType int32
@@ -348,11 +348,11 @@ func (x FigureDescriptor_ChartDescriptor_ChartType) String() string {
 }
 
 func (FigureDescriptor_ChartDescriptor_ChartType) Descriptor() protoreflect.EnumDescriptor {
-	return file_deephaven_proto_console_proto_enumTypes[4].Descriptor()
+	return file_deephaven_core_proto_console_proto_enumTypes[4].Descriptor()
 }
 
 func (FigureDescriptor_ChartDescriptor_ChartType) Type() protoreflect.EnumType {
-	return &file_deephaven_proto_console_proto_enumTypes[4]
+	return &file_deephaven_core_proto_console_proto_enumTypes[4]
 }
 
 func (x FigureDescriptor_ChartDescriptor_ChartType) Number() protoreflect.EnumNumber {
@@ -361,7 +361,7 @@ func (x FigureDescriptor_ChartDescriptor_ChartType) Number() protoreflect.EnumNu
 
 // Deprecated: Use FigureDescriptor_ChartDescriptor_ChartType.Descriptor instead.
 func (FigureDescriptor_ChartDescriptor_ChartType) EnumDescriptor() ([]byte, []int) {
-	return file_deephaven_proto_console_proto_rawDescGZIP(), []int{43, 0, 0}
+	return file_deephaven_core_proto_console_proto_rawDescGZIP(), []int{43, 0, 0}
 }
 
 type FigureDescriptor_AxisDescriptor_AxisFormatType int32
@@ -394,11 +394,11 @@ func (x FigureDescriptor_AxisDescriptor_AxisFormatType) String() string {
 }
 
 func (FigureDescriptor_AxisDescriptor_AxisFormatType) Descriptor() protoreflect.EnumDescriptor {
-	return file_deephaven_proto_console_proto_enumTypes[5].Descriptor()
+	return file_deephaven_core_proto_console_proto_enumTypes[5].Descriptor()
 }
 
 func (FigureDescriptor_AxisDescriptor_AxisFormatType) Type() protoreflect.EnumType {
-	return &file_deephaven_proto_console_proto_enumTypes[5]
+	return &file_deephaven_core_proto_console_proto_enumTypes[5]
 }
 
 func (x FigureDescriptor_AxisDescriptor_AxisFormatType) Number() protoreflect.EnumNumber {
@@ -407,7 +407,7 @@ func (x FigureDescriptor_AxisDescriptor_AxisFormatType) Number() protoreflect.En
 
 // Deprecated: Use FigureDescriptor_AxisDescriptor_AxisFormatType.Descriptor instead.
 func (FigureDescriptor_AxisDescriptor_AxisFormatType) EnumDescriptor() ([]byte, []int) {
-	return file_deephaven_proto_console_proto_rawDescGZIP(), []int{43, 6, 0}
+	return file_deephaven_core_proto_console_proto_rawDescGZIP(), []int{43, 6, 0}
 }
 
 type FigureDescriptor_AxisDescriptor_AxisType int32
@@ -452,11 +452,11 @@ func (x FigureDescriptor_AxisDescriptor_AxisType) String() string {
 }
 
 func (FigureDescriptor_AxisDescriptor_AxisType) Descriptor() protoreflect.EnumDescriptor {
-	return file_deephaven_proto_console_proto_enumTypes[6].Descriptor()
+	return file_deephaven_core_proto_console_proto_enumTypes[6].Descriptor()
 }
 
 func (FigureDescriptor_AxisDescriptor_AxisType) Type() protoreflect.EnumType {
-	return &file_deephaven_proto_console_proto_enumTypes[6]
+	return &file_deephaven_core_proto_console_proto_enumTypes[6]
 }
 
 func (x FigureDescriptor_AxisDescriptor_AxisType) Number() protoreflect.EnumNumber {
@@ -465,7 +465,7 @@ func (x FigureDescriptor_AxisDescriptor_AxisType) Number() protoreflect.EnumNumb
 
 // Deprecated: Use FigureDescriptor_AxisDescriptor_AxisType.Descriptor instead.
 func (FigureDescriptor_AxisDescriptor_AxisType) EnumDescriptor() ([]byte, []int) {
-	return file_deephaven_proto_console_proto_rawDescGZIP(), []int{43, 6, 1}
+	return file_deephaven_core_proto_console_proto_rawDescGZIP(), []int{43, 6, 1}
 }
 
 type FigureDescriptor_AxisDescriptor_AxisPosition int32
@@ -507,11 +507,11 @@ func (x FigureDescriptor_AxisDescriptor_AxisPosition) String() string {
 }
 
 func (FigureDescriptor_AxisDescriptor_AxisPosition) Descriptor() protoreflect.EnumDescriptor {
-	return file_deephaven_proto_console_proto_enumTypes[7].Descriptor()
+	return file_deephaven_core_proto_console_proto_enumTypes[7].Descriptor()
 }
 
 func (FigureDescriptor_AxisDescriptor_AxisPosition) Type() protoreflect.EnumType {
-	return &file_deephaven_proto_console_proto_enumTypes[7]
+	return &file_deephaven_core_proto_console_proto_enumTypes[7]
 }
 
 func (x FigureDescriptor_AxisDescriptor_AxisPosition) Number() protoreflect.EnumNumber {
@@ -520,7 +520,7 @@ func (x FigureDescriptor_AxisDescriptor_AxisPosition) Number() protoreflect.Enum
 
 // Deprecated: Use FigureDescriptor_AxisDescriptor_AxisPosition.Descriptor instead.
 func (FigureDescriptor_AxisDescriptor_AxisPosition) EnumDescriptor() ([]byte, []int) {
-	return file_deephaven_proto_console_proto_rawDescGZIP(), []int{43, 6, 2}
+	return file_deephaven_core_proto_console_proto_rawDescGZIP(), []int{43, 6, 2}
 }
 
 type FigureDescriptor_BusinessCalendarDescriptor_DayOfWeek int32
@@ -568,11 +568,11 @@ func (x FigureDescriptor_BusinessCalendarDescriptor_DayOfWeek) String() string {
 }
 
 func (FigureDescriptor_BusinessCalendarDescriptor_DayOfWeek) Descriptor() protoreflect.EnumDescriptor {
-	return file_deephaven_proto_console_proto_enumTypes[8].Descriptor()
+	return file_deephaven_core_proto_console_proto_enumTypes[8].Descriptor()
 }
 
 func (FigureDescriptor_BusinessCalendarDescriptor_DayOfWeek) Type() protoreflect.EnumType {
-	return &file_deephaven_proto_console_proto_enumTypes[8]
+	return &file_deephaven_core_proto_console_proto_enumTypes[8]
 }
 
 func (x FigureDescriptor_BusinessCalendarDescriptor_DayOfWeek) Number() protoreflect.EnumNumber {
@@ -581,7 +581,7 @@ func (x FigureDescriptor_BusinessCalendarDescriptor_DayOfWeek) Number() protoref
 
 // Deprecated: Use FigureDescriptor_BusinessCalendarDescriptor_DayOfWeek.Descriptor instead.
 func (FigureDescriptor_BusinessCalendarDescriptor_DayOfWeek) EnumDescriptor() ([]byte, []int) {
-	return file_deephaven_proto_console_proto_rawDescGZIP(), []int{43, 7, 0}
+	return file_deephaven_core_proto_console_proto_rawDescGZIP(), []int{43, 7, 0}
 }
 
 type GetConsoleTypesRequest struct {
@@ -593,7 +593,7 @@ type GetConsoleTypesRequest struct {
 func (x *GetConsoleTypesRequest) Reset() {
 	*x = GetConsoleTypesRequest{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_deephaven_proto_console_proto_msgTypes[0]
+		mi := &file_deephaven_core_proto_console_proto_msgTypes[0]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -606,7 +606,7 @@ func (x *GetConsoleTypesRequest) String() string {
 func (*GetConsoleTypesRequest) ProtoMessage() {}
 
 func (x *GetConsoleTypesRequest) ProtoReflect() protoreflect.Message {
-	mi := &file_deephaven_proto_console_proto_msgTypes[0]
+	mi := &file_deephaven_core_proto_console_proto_msgTypes[0]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -619,7 +619,7 @@ func (x *GetConsoleTypesRequest) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use GetConsoleTypesRequest.ProtoReflect.Descriptor instead.
 func (*GetConsoleTypesRequest) Descriptor() ([]byte, []int) {
-	return file_deephaven_proto_console_proto_rawDescGZIP(), []int{0}
+	return file_deephaven_core_proto_console_proto_rawDescGZIP(), []int{0}
 }
 
 type GetConsoleTypesResponse struct {
@@ -633,7 +633,7 @@ type GetConsoleTypesResponse struct {
 func (x *GetConsoleTypesResponse) Reset() {
 	*x = GetConsoleTypesResponse{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_deephaven_proto_console_proto_msgTypes[1]
+		mi := &file_deephaven_core_proto_console_proto_msgTypes[1]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -646,7 +646,7 @@ func (x *GetConsoleTypesResponse) String() string {
 func (*GetConsoleTypesResponse) ProtoMessage() {}
 
 func (x *GetConsoleTypesResponse) ProtoReflect() protoreflect.Message {
-	mi := &file_deephaven_proto_console_proto_msgTypes[1]
+	mi := &file_deephaven_core_proto_console_proto_msgTypes[1]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -659,7 +659,7 @@ func (x *GetConsoleTypesResponse) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use GetConsoleTypesResponse.ProtoReflect.Descriptor instead.
 func (*GetConsoleTypesResponse) Descriptor() ([]byte, []int) {
-	return file_deephaven_proto_console_proto_rawDescGZIP(), []int{1}
+	return file_deephaven_core_proto_console_proto_rawDescGZIP(), []int{1}
 }
 
 func (x *GetConsoleTypesResponse) GetConsoleTypes() []string {
@@ -681,7 +681,7 @@ type StartConsoleRequest struct {
 func (x *StartConsoleRequest) Reset() {
 	*x = StartConsoleRequest{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_deephaven_proto_console_proto_msgTypes[2]
+		mi := &file_deephaven_core_proto_console_proto_msgTypes[2]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -694,7 +694,7 @@ func (x *StartConsoleRequest) String() string {
 func (*StartConsoleRequest) ProtoMessage() {}
 
 func (x *StartConsoleRequest) ProtoReflect() protoreflect.Message {
-	mi := &file_deephaven_proto_console_proto_msgTypes[2]
+	mi := &file_deephaven_core_proto_console_proto_msgTypes[2]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -707,7 +707,7 @@ func (x *StartConsoleRequest) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use StartConsoleRequest.ProtoReflect.Descriptor instead.
 func (*StartConsoleRequest) Descriptor() ([]byte, []int) {
-	return file_deephaven_proto_console_proto_rawDescGZIP(), []int{2}
+	return file_deephaven_core_proto_console_proto_rawDescGZIP(), []int{2}
 }
 
 func (x *StartConsoleRequest) GetResultId() *ticket.Ticket {
@@ -735,7 +735,7 @@ type StartConsoleResponse struct {
 func (x *StartConsoleResponse) Reset() {
 	*x = StartConsoleResponse{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_deephaven_proto_console_proto_msgTypes[3]
+		mi := &file_deephaven_core_proto_console_proto_msgTypes[3]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -748,7 +748,7 @@ func (x *StartConsoleResponse) String() string {
 func (*StartConsoleResponse) ProtoMessage() {}
 
 func (x *StartConsoleResponse) ProtoReflect() protoreflect.Message {
-	mi := &file_deephaven_proto_console_proto_msgTypes[3]
+	mi := &file_deephaven_core_proto_console_proto_msgTypes[3]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -761,7 +761,7 @@ func (x *StartConsoleResponse) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use StartConsoleResponse.ProtoReflect.Descriptor instead.
 func (*StartConsoleResponse) Descriptor() ([]byte, []int) {
-	return file_deephaven_proto_console_proto_rawDescGZIP(), []int{3}
+	return file_deephaven_core_proto_console_proto_rawDescGZIP(), []int{3}
 }
 
 func (x *StartConsoleResponse) GetResultId() *ticket.Ticket {
@@ -780,7 +780,7 @@ type GetHeapInfoRequest struct {
 func (x *GetHeapInfoRequest) Reset() {
 	*x = GetHeapInfoRequest{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_deephaven_proto_console_proto_msgTypes[4]
+		mi := &file_deephaven_core_proto_console_proto_msgTypes[4]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -793,7 +793,7 @@ func (x *GetHeapInfoRequest) String() string {
 func (*GetHeapInfoRequest) ProtoMessage() {}
 
 func (x *GetHeapInfoRequest) ProtoReflect() protoreflect.Message {
-	mi := &file_deephaven_proto_console_proto_msgTypes[4]
+	mi := &file_deephaven_core_proto_console_proto_msgTypes[4]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -806,7 +806,7 @@ func (x *GetHeapInfoRequest) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use GetHeapInfoRequest.ProtoReflect.Descriptor instead.
 func (*GetHeapInfoRequest) Descriptor() ([]byte, []int) {
-	return file_deephaven_proto_console_proto_rawDescGZIP(), []int{4}
+	return file_deephaven_core_proto_console_proto_rawDescGZIP(), []int{4}
 }
 
 type GetHeapInfoResponse struct {
@@ -830,7 +830,7 @@ type GetHeapInfoResponse struct {
 func (x *GetHeapInfoResponse) Reset() {
 	*x = GetHeapInfoResponse{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_deephaven_proto_console_proto_msgTypes[5]
+		mi := &file_deephaven_core_proto_console_proto_msgTypes[5]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -843,7 +843,7 @@ func (x *GetHeapInfoResponse) String() string {
 func (*GetHeapInfoResponse) ProtoMessage() {}
 
 func (x *GetHeapInfoResponse) ProtoReflect() protoreflect.Message {
-	mi := &file_deephaven_proto_console_proto_msgTypes[5]
+	mi := &file_deephaven_core_proto_console_proto_msgTypes[5]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -856,7 +856,7 @@ func (x *GetHeapInfoResponse) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use GetHeapInfoResponse.ProtoReflect.Descriptor instead.
 func (*GetHeapInfoResponse) Descriptor() ([]byte, []int) {
-	return file_deephaven_proto_console_proto_rawDescGZIP(), []int{5}
+	return file_deephaven_core_proto_console_proto_rawDescGZIP(), []int{5}
 }
 
 func (x *GetHeapInfoResponse) GetMaxMemory() int64 {
@@ -899,7 +899,7 @@ type LogSubscriptionRequest struct {
 func (x *LogSubscriptionRequest) Reset() {
 	*x = LogSubscriptionRequest{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_deephaven_proto_console_proto_msgTypes[6]
+		mi := &file_deephaven_core_proto_console_proto_msgTypes[6]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -912,7 +912,7 @@ func (x *LogSubscriptionRequest) String() string {
 func (*LogSubscriptionRequest) ProtoMessage() {}
 
 func (x *LogSubscriptionRequest) ProtoReflect() protoreflect.Message {
-	mi := &file_deephaven_proto_console_proto_msgTypes[6]
+	mi := &file_deephaven_core_proto_console_proto_msgTypes[6]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -925,7 +925,7 @@ func (x *LogSubscriptionRequest) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use LogSubscriptionRequest.ProtoReflect.Descriptor instead.
 func (*LogSubscriptionRequest) Descriptor() ([]byte, []int) {
-	return file_deephaven_proto_console_proto_rawDescGZIP(), []int{6}
+	return file_deephaven_core_proto_console_proto_rawDescGZIP(), []int{6}
 }
 
 func (x *LogSubscriptionRequest) GetLastSeenLogTimestamp() int64 {
@@ -955,7 +955,7 @@ type LogSubscriptionData struct {
 func (x *LogSubscriptionData) Reset() {
 	*x = LogSubscriptionData{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_deephaven_proto_console_proto_msgTypes[7]
+		mi := &file_deephaven_core_proto_console_proto_msgTypes[7]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -968,7 +968,7 @@ func (x *LogSubscriptionData) String() string {
 func (*LogSubscriptionData) ProtoMessage() {}
 
 func (x *LogSubscriptionData) ProtoReflect() protoreflect.Message {
-	mi := &file_deephaven_proto_console_proto_msgTypes[7]
+	mi := &file_deephaven_core_proto_console_proto_msgTypes[7]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -981,7 +981,7 @@ func (x *LogSubscriptionData) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use LogSubscriptionData.ProtoReflect.Descriptor instead.
 func (*LogSubscriptionData) Descriptor() ([]byte, []int) {
-	return file_deephaven_proto_console_proto_rawDescGZIP(), []int{7}
+	return file_deephaven_core_proto_console_proto_rawDescGZIP(), []int{7}
 }
 
 func (x *LogSubscriptionData) GetMicros() int64 {
@@ -1017,7 +1017,7 @@ type ExecuteCommandRequest struct {
 func (x *ExecuteCommandRequest) Reset() {
 	*x = ExecuteCommandRequest{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_deephaven_proto_console_proto_msgTypes[8]
+		mi := &file_deephaven_core_proto_console_proto_msgTypes[8]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -1030,7 +1030,7 @@ func (x *ExecuteCommandRequest) String() string {
 func (*ExecuteCommandRequest) ProtoMessage() {}
 
 func (x *ExecuteCommandRequest) ProtoReflect() protoreflect.Message {
-	mi := &file_deephaven_proto_console_proto_msgTypes[8]
+	mi := &file_deephaven_core_proto_console_proto_msgTypes[8]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -1043,7 +1043,7 @@ func (x *ExecuteCommandRequest) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use ExecuteCommandRequest.ProtoReflect.Descriptor instead.
 func (*ExecuteCommandRequest) Descriptor() ([]byte, []int) {
-	return file_deephaven_proto_console_proto_rawDescGZIP(), []int{8}
+	return file_deephaven_core_proto_console_proto_rawDescGZIP(), []int{8}
 }
 
 func (x *ExecuteCommandRequest) GetConsoleId() *ticket.Ticket {
@@ -1072,7 +1072,7 @@ type ExecuteCommandResponse struct {
 func (x *ExecuteCommandResponse) Reset() {
 	*x = ExecuteCommandResponse{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_deephaven_proto_console_proto_msgTypes[9]
+		mi := &file_deephaven_core_proto_console_proto_msgTypes[9]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -1085,7 +1085,7 @@ func (x *ExecuteCommandResponse) String() string {
 func (*ExecuteCommandResponse) ProtoMessage() {}
 
 func (x *ExecuteCommandResponse) ProtoReflect() protoreflect.Message {
-	mi := &file_deephaven_proto_console_proto_msgTypes[9]
+	mi := &file_deephaven_core_proto_console_proto_msgTypes[9]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -1098,7 +1098,7 @@ func (x *ExecuteCommandResponse) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use ExecuteCommandResponse.ProtoReflect.Descriptor instead.
 func (*ExecuteCommandResponse) Descriptor() ([]byte, []int) {
-	return file_deephaven_proto_console_proto_rawDescGZIP(), []int{9}
+	return file_deephaven_core_proto_console_proto_rawDescGZIP(), []int{9}
 }
 
 func (x *ExecuteCommandResponse) GetErrorMessage() string {
@@ -1128,7 +1128,7 @@ type BindTableToVariableRequest struct {
 func (x *BindTableToVariableRequest) Reset() {
 	*x = BindTableToVariableRequest{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_deephaven_proto_console_proto_msgTypes[10]
+		mi := &file_deephaven_core_proto_console_proto_msgTypes[10]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -1141,7 +1141,7 @@ func (x *BindTableToVariableRequest) String() string {
 func (*BindTableToVariableRequest) ProtoMessage() {}
 
 func (x *BindTableToVariableRequest) ProtoReflect() protoreflect.Message {
-	mi := &file_deephaven_proto_console_proto_msgTypes[10]
+	mi := &file_deephaven_core_proto_console_proto_msgTypes[10]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -1154,7 +1154,7 @@ func (x *BindTableToVariableRequest) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use BindTableToVariableRequest.ProtoReflect.Descriptor instead.
 func (*BindTableToVariableRequest) Descriptor() ([]byte, []int) {
-	return file_deephaven_proto_console_proto_rawDescGZIP(), []int{10}
+	return file_deephaven_core_proto_console_proto_rawDescGZIP(), []int{10}
 }
 
 func (x *BindTableToVariableRequest) GetConsoleId() *ticket.Ticket {
@@ -1187,7 +1187,7 @@ type BindTableToVariableResponse struct {
 func (x *BindTableToVariableResponse) Reset() {
 	*x = BindTableToVariableResponse{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_deephaven_proto_console_proto_msgTypes[11]
+		mi := &file_deephaven_core_proto_console_proto_msgTypes[11]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -1200,7 +1200,7 @@ func (x *BindTableToVariableResponse) String() string {
 func (*BindTableToVariableResponse) ProtoMessage() {}
 
 func (x *BindTableToVariableResponse) ProtoReflect() protoreflect.Message {
-	mi := &file_deephaven_proto_console_proto_msgTypes[11]
+	mi := &file_deephaven_core_proto_console_proto_msgTypes[11]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -1213,7 +1213,7 @@ func (x *BindTableToVariableResponse) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use BindTableToVariableResponse.ProtoReflect.Descriptor instead.
 func (*BindTableToVariableResponse) Descriptor() ([]byte, []int) {
-	return file_deephaven_proto_console_proto_rawDescGZIP(), []int{11}
+	return file_deephaven_core_proto_console_proto_rawDescGZIP(), []int{11}
 }
 
 type CancelCommandRequest struct {
@@ -1228,7 +1228,7 @@ type CancelCommandRequest struct {
 func (x *CancelCommandRequest) Reset() {
 	*x = CancelCommandRequest{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_deephaven_proto_console_proto_msgTypes[12]
+		mi := &file_deephaven_core_proto_console_proto_msgTypes[12]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -1241,7 +1241,7 @@ func (x *CancelCommandRequest) String() string {
 func (*CancelCommandRequest) ProtoMessage() {}
 
 func (x *CancelCommandRequest) ProtoReflect() protoreflect.Message {
-	mi := &file_deephaven_proto_console_proto_msgTypes[12]
+	mi := &file_deephaven_core_proto_console_proto_msgTypes[12]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -1254,7 +1254,7 @@ func (x *CancelCommandRequest) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use CancelCommandRequest.ProtoReflect.Descriptor instead.
 func (*CancelCommandRequest) Descriptor() ([]byte, []int) {
-	return file_deephaven_proto_console_proto_rawDescGZIP(), []int{12}
+	return file_deephaven_core_proto_console_proto_rawDescGZIP(), []int{12}
 }
 
 func (x *CancelCommandRequest) GetConsoleId() *ticket.Ticket {
@@ -1280,7 +1280,7 @@ type CancelCommandResponse struct {
 func (x *CancelCommandResponse) Reset() {
 	*x = CancelCommandResponse{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_deephaven_proto_console_proto_msgTypes[13]
+		mi := &file_deephaven_core_proto_console_proto_msgTypes[13]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -1293,7 +1293,7 @@ func (x *CancelCommandResponse) String() string {
 func (*CancelCommandResponse) ProtoMessage() {}
 
 func (x *CancelCommandResponse) ProtoReflect() protoreflect.Message {
-	mi := &file_deephaven_proto_console_proto_msgTypes[13]
+	mi := &file_deephaven_core_proto_console_proto_msgTypes[13]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -1306,7 +1306,7 @@ func (x *CancelCommandResponse) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use CancelCommandResponse.ProtoReflect.Descriptor instead.
 func (*CancelCommandResponse) Descriptor() ([]byte, []int) {
-	return file_deephaven_proto_console_proto_rawDescGZIP(), []int{13}
+	return file_deephaven_core_proto_console_proto_rawDescGZIP(), []int{13}
 }
 
 type CancelAutoCompleteRequest struct {
@@ -1321,7 +1321,7 @@ type CancelAutoCompleteRequest struct {
 func (x *CancelAutoCompleteRequest) Reset() {
 	*x = CancelAutoCompleteRequest{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_deephaven_proto_console_proto_msgTypes[14]
+		mi := &file_deephaven_core_proto_console_proto_msgTypes[14]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -1334,7 +1334,7 @@ func (x *CancelAutoCompleteRequest) String() string {
 func (*CancelAutoCompleteRequest) ProtoMessage() {}
 
 func (x *CancelAutoCompleteRequest) ProtoReflect() protoreflect.Message {
-	mi := &file_deephaven_proto_console_proto_msgTypes[14]
+	mi := &file_deephaven_core_proto_console_proto_msgTypes[14]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -1347,7 +1347,7 @@ func (x *CancelAutoCompleteRequest) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use CancelAutoCompleteRequest.ProtoReflect.Descriptor instead.
 func (*CancelAutoCompleteRequest) Descriptor() ([]byte, []int) {
-	return file_deephaven_proto_console_proto_rawDescGZIP(), []int{14}
+	return file_deephaven_core_proto_console_proto_rawDescGZIP(), []int{14}
 }
 
 func (x *CancelAutoCompleteRequest) GetConsoleId() *ticket.Ticket {
@@ -1373,7 +1373,7 @@ type CancelAutoCompleteResponse struct {
 func (x *CancelAutoCompleteResponse) Reset() {
 	*x = CancelAutoCompleteResponse{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_deephaven_proto_console_proto_msgTypes[15]
+		mi := &file_deephaven_core_proto_console_proto_msgTypes[15]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -1386,7 +1386,7 @@ func (x *CancelAutoCompleteResponse) String() string {
 func (*CancelAutoCompleteResponse) ProtoMessage() {}
 
 func (x *CancelAutoCompleteResponse) ProtoReflect() protoreflect.Message {
-	mi := &file_deephaven_proto_console_proto_msgTypes[15]
+	mi := &file_deephaven_core_proto_console_proto_msgTypes[15]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -1399,7 +1399,7 @@ func (x *CancelAutoCompleteResponse) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use CancelAutoCompleteResponse.ProtoReflect.Descriptor instead.
 func (*CancelAutoCompleteResponse) Descriptor() ([]byte, []int) {
-	return file_deephaven_proto_console_proto_rawDescGZIP(), []int{15}
+	return file_deephaven_core_proto_console_proto_rawDescGZIP(), []int{15}
 }
 
 type AutoCompleteRequest struct {
@@ -1423,7 +1423,7 @@ type AutoCompleteRequest struct {
 func (x *AutoCompleteRequest) Reset() {
 	*x = AutoCompleteRequest{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_deephaven_proto_console_proto_msgTypes[16]
+		mi := &file_deephaven_core_proto_console_proto_msgTypes[16]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -1436,7 +1436,7 @@ func (x *AutoCompleteRequest) String() string {
 func (*AutoCompleteRequest) ProtoMessage() {}
 
 func (x *AutoCompleteRequest) ProtoReflect() protoreflect.Message {
-	mi := &file_deephaven_proto_console_proto_msgTypes[16]
+	mi := &file_deephaven_core_proto_console_proto_msgTypes[16]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -1449,7 +1449,7 @@ func (x *AutoCompleteRequest) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use AutoCompleteRequest.ProtoReflect.Descriptor instead.
 func (*AutoCompleteRequest) Descriptor() ([]byte, []int) {
-	return file_deephaven_proto_console_proto_rawDescGZIP(), []int{16}
+	return file_deephaven_core_proto_console_proto_rawDescGZIP(), []int{16}
 }
 
 func (x *AutoCompleteRequest) GetConsoleId() *ticket.Ticket {
@@ -1594,7 +1594,7 @@ type AutoCompleteResponse struct {
 func (x *AutoCompleteResponse) Reset() {
 	*x = AutoCompleteResponse{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_deephaven_proto_console_proto_msgTypes[17]
+		mi := &file_deephaven_core_proto_console_proto_msgTypes[17]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -1607,7 +1607,7 @@ func (x *AutoCompleteResponse) String() string {
 func (*AutoCompleteResponse) ProtoMessage() {}
 
 func (x *AutoCompleteResponse) ProtoReflect() protoreflect.Message {
-	mi := &file_deephaven_proto_console_proto_msgTypes[17]
+	mi := &file_deephaven_core_proto_console_proto_msgTypes[17]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -1620,7 +1620,7 @@ func (x *AutoCompleteResponse) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use AutoCompleteResponse.ProtoReflect.Descriptor instead.
 func (*AutoCompleteResponse) Descriptor() ([]byte, []int) {
-	return file_deephaven_proto_console_proto_rawDescGZIP(), []int{17}
+	return file_deephaven_core_proto_console_proto_rawDescGZIP(), []int{17}
 }
 
 func (x *AutoCompleteResponse) GetRequestId() int32 {
@@ -1722,7 +1722,7 @@ type BrowserNextResponse struct {
 func (x *BrowserNextResponse) Reset() {
 	*x = BrowserNextResponse{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_deephaven_proto_console_proto_msgTypes[18]
+		mi := &file_deephaven_core_proto_console_proto_msgTypes[18]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -1735,7 +1735,7 @@ func (x *BrowserNextResponse) String() string {
 func (*BrowserNextResponse) ProtoMessage() {}
 
 func (x *BrowserNextResponse) ProtoReflect() protoreflect.Message {
-	mi := &file_deephaven_proto_console_proto_msgTypes[18]
+	mi := &file_deephaven_core_proto_console_proto_msgTypes[18]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -1748,7 +1748,7 @@ func (x *BrowserNextResponse) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use BrowserNextResponse.ProtoReflect.Descriptor instead.
 func (*BrowserNextResponse) Descriptor() ([]byte, []int) {
-	return file_deephaven_proto_console_proto_rawDescGZIP(), []int{18}
+	return file_deephaven_core_proto_console_proto_rawDescGZIP(), []int{18}
 }
 
 type OpenDocumentRequest struct {
@@ -1764,7 +1764,7 @@ type OpenDocumentRequest struct {
 func (x *OpenDocumentRequest) Reset() {
 	*x = OpenDocumentRequest{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_deephaven_proto_console_proto_msgTypes[19]
+		mi := &file_deephaven_core_proto_console_proto_msgTypes[19]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -1777,7 +1777,7 @@ func (x *OpenDocumentRequest) String() string {
 func (*OpenDocumentRequest) ProtoMessage() {}
 
 func (x *OpenDocumentRequest) ProtoReflect() protoreflect.Message {
-	mi := &file_deephaven_proto_console_proto_msgTypes[19]
+	mi := &file_deephaven_core_proto_console_proto_msgTypes[19]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -1790,7 +1790,7 @@ func (x *OpenDocumentRequest) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use OpenDocumentRequest.ProtoReflect.Descriptor instead.
 func (*OpenDocumentRequest) Descriptor() ([]byte, []int) {
-	return file_deephaven_proto_console_proto_rawDescGZIP(), []int{19}
+	return file_deephaven_core_proto_console_proto_rawDescGZIP(), []int{19}
 }
 
 // Deprecated: Do not use.
@@ -1822,7 +1822,7 @@ type TextDocumentItem struct {
 func (x *TextDocumentItem) Reset() {
 	*x = TextDocumentItem{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_deephaven_proto_console_proto_msgTypes[20]
+		mi := &file_deephaven_core_proto_console_proto_msgTypes[20]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -1835,7 +1835,7 @@ func (x *TextDocumentItem) String() string {
 func (*TextDocumentItem) ProtoMessage() {}
 
 func (x *TextDocumentItem) ProtoReflect() protoreflect.Message {
-	mi := &file_deephaven_proto_console_proto_msgTypes[20]
+	mi := &file_deephaven_core_proto_console_proto_msgTypes[20]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -1848,7 +1848,7 @@ func (x *TextDocumentItem) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use TextDocumentItem.ProtoReflect.Descriptor instead.
 func (*TextDocumentItem) Descriptor() ([]byte, []int) {
-	return file_deephaven_proto_console_proto_rawDescGZIP(), []int{20}
+	return file_deephaven_core_proto_console_proto_rawDescGZIP(), []int{20}
 }
 
 func (x *TextDocumentItem) GetUri() string {
@@ -1892,7 +1892,7 @@ type CloseDocumentRequest struct {
 func (x *CloseDocumentRequest) Reset() {
 	*x = CloseDocumentRequest{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_deephaven_proto_console_proto_msgTypes[21]
+		mi := &file_deephaven_core_proto_console_proto_msgTypes[21]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -1905,7 +1905,7 @@ func (x *CloseDocumentRequest) String() string {
 func (*CloseDocumentRequest) ProtoMessage() {}
 
 func (x *CloseDocumentRequest) ProtoReflect() protoreflect.Message {
-	mi := &file_deephaven_proto_console_proto_msgTypes[21]
+	mi := &file_deephaven_core_proto_console_proto_msgTypes[21]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -1918,7 +1918,7 @@ func (x *CloseDocumentRequest) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use CloseDocumentRequest.ProtoReflect.Descriptor instead.
 func (*CloseDocumentRequest) Descriptor() ([]byte, []int) {
-	return file_deephaven_proto_console_proto_rawDescGZIP(), []int{21}
+	return file_deephaven_core_proto_console_proto_rawDescGZIP(), []int{21}
 }
 
 // Deprecated: Do not use.
@@ -1950,7 +1950,7 @@ type ChangeDocumentRequest struct {
 func (x *ChangeDocumentRequest) Reset() {
 	*x = ChangeDocumentRequest{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_deephaven_proto_console_proto_msgTypes[22]
+		mi := &file_deephaven_core_proto_console_proto_msgTypes[22]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -1963,7 +1963,7 @@ func (x *ChangeDocumentRequest) String() string {
 func (*ChangeDocumentRequest) ProtoMessage() {}
 
 func (x *ChangeDocumentRequest) ProtoReflect() protoreflect.Message {
-	mi := &file_deephaven_proto_console_proto_msgTypes[22]
+	mi := &file_deephaven_core_proto_console_proto_msgTypes[22]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -1976,7 +1976,7 @@ func (x *ChangeDocumentRequest) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use ChangeDocumentRequest.ProtoReflect.Descriptor instead.
 func (*ChangeDocumentRequest) Descriptor() ([]byte, []int) {
-	return file_deephaven_proto_console_proto_rawDescGZIP(), []int{22}
+	return file_deephaven_core_proto_console_proto_rawDescGZIP(), []int{22}
 }
 
 // Deprecated: Do not use.
@@ -2013,7 +2013,7 @@ type DocumentRange struct {
 func (x *DocumentRange) Reset() {
 	*x = DocumentRange{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_deephaven_proto_console_proto_msgTypes[23]
+		mi := &file_deephaven_core_proto_console_proto_msgTypes[23]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -2026,7 +2026,7 @@ func (x *DocumentRange) String() string {
 func (*DocumentRange) ProtoMessage() {}
 
 func (x *DocumentRange) ProtoReflect() protoreflect.Message {
-	mi := &file_deephaven_proto_console_proto_msgTypes[23]
+	mi := &file_deephaven_core_proto_console_proto_msgTypes[23]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -2039,7 +2039,7 @@ func (x *DocumentRange) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use DocumentRange.ProtoReflect.Descriptor instead.
 func (*DocumentRange) Descriptor() ([]byte, []int) {
-	return file_deephaven_proto_console_proto_rawDescGZIP(), []int{23}
+	return file_deephaven_core_proto_console_proto_rawDescGZIP(), []int{23}
 }
 
 func (x *DocumentRange) GetStart() *Position {
@@ -2068,7 +2068,7 @@ type VersionedTextDocumentIdentifier struct {
 func (x *VersionedTextDocumentIdentifier) Reset() {
 	*x = VersionedTextDocumentIdentifier{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_deephaven_proto_console_proto_msgTypes[24]
+		mi := &file_deephaven_core_proto_console_proto_msgTypes[24]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -2081,7 +2081,7 @@ func (x *VersionedTextDocumentIdentifier) String() string {
 func (*VersionedTextDocumentIdentifier) ProtoMessage() {}
 
 func (x *VersionedTextDocumentIdentifier) ProtoReflect() protoreflect.Message {
-	mi := &file_deephaven_proto_console_proto_msgTypes[24]
+	mi := &file_deephaven_core_proto_console_proto_msgTypes[24]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -2094,7 +2094,7 @@ func (x *VersionedTextDocumentIdentifier) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use VersionedTextDocumentIdentifier.ProtoReflect.Descriptor instead.
 func (*VersionedTextDocumentIdentifier) Descriptor() ([]byte, []int) {
-	return file_deephaven_proto_console_proto_rawDescGZIP(), []int{24}
+	return file_deephaven_core_proto_console_proto_rawDescGZIP(), []int{24}
 }
 
 func (x *VersionedTextDocumentIdentifier) GetUri() string {
@@ -2123,7 +2123,7 @@ type Position struct {
 func (x *Position) Reset() {
 	*x = Position{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_deephaven_proto_console_proto_msgTypes[25]
+		mi := &file_deephaven_core_proto_console_proto_msgTypes[25]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -2136,7 +2136,7 @@ func (x *Position) String() string {
 func (*Position) ProtoMessage() {}
 
 func (x *Position) ProtoReflect() protoreflect.Message {
-	mi := &file_deephaven_proto_console_proto_msgTypes[25]
+	mi := &file_deephaven_core_proto_console_proto_msgTypes[25]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -2149,7 +2149,7 @@ func (x *Position) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use Position.ProtoReflect.Descriptor instead.
 func (*Position) Descriptor() ([]byte, []int) {
-	return file_deephaven_proto_console_proto_rawDescGZIP(), []int{25}
+	return file_deephaven_core_proto_console_proto_rawDescGZIP(), []int{25}
 }
 
 func (x *Position) GetLine() int32 {
@@ -2178,7 +2178,7 @@ type MarkupContent struct {
 func (x *MarkupContent) Reset() {
 	*x = MarkupContent{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_deephaven_proto_console_proto_msgTypes[26]
+		mi := &file_deephaven_core_proto_console_proto_msgTypes[26]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -2191,7 +2191,7 @@ func (x *MarkupContent) String() string {
 func (*MarkupContent) ProtoMessage() {}
 
 func (x *MarkupContent) ProtoReflect() protoreflect.Message {
-	mi := &file_deephaven_proto_console_proto_msgTypes[26]
+	mi := &file_deephaven_core_proto_console_proto_msgTypes[26]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -2204,7 +2204,7 @@ func (x *MarkupContent) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use MarkupContent.ProtoReflect.Descriptor instead.
 func (*MarkupContent) Descriptor() ([]byte, []int) {
-	return file_deephaven_proto_console_proto_rawDescGZIP(), []int{26}
+	return file_deephaven_core_proto_console_proto_rawDescGZIP(), []int{26}
 }
 
 func (x *MarkupContent) GetKind() string {
@@ -2238,7 +2238,7 @@ type GetCompletionItemsRequest struct {
 func (x *GetCompletionItemsRequest) Reset() {
 	*x = GetCompletionItemsRequest{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_deephaven_proto_console_proto_msgTypes[27]
+		mi := &file_deephaven_core_proto_console_proto_msgTypes[27]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -2251,7 +2251,7 @@ func (x *GetCompletionItemsRequest) String() string {
 func (*GetCompletionItemsRequest) ProtoMessage() {}
 
 func (x *GetCompletionItemsRequest) ProtoReflect() protoreflect.Message {
-	mi := &file_deephaven_proto_console_proto_msgTypes[27]
+	mi := &file_deephaven_core_proto_console_proto_msgTypes[27]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -2264,7 +2264,7 @@ func (x *GetCompletionItemsRequest) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use GetCompletionItemsRequest.ProtoReflect.Descriptor instead.
 func (*GetCompletionItemsRequest) Descriptor() ([]byte, []int) {
-	return file_deephaven_proto_console_proto_rawDescGZIP(), []int{27}
+	return file_deephaven_core_proto_console_proto_rawDescGZIP(), []int{27}
 }
 
 // Deprecated: Do not use.
@@ -2316,7 +2316,7 @@ type CompletionContext struct {
 func (x *CompletionContext) Reset() {
 	*x = CompletionContext{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_deephaven_proto_console_proto_msgTypes[28]
+		mi := &file_deephaven_core_proto_console_proto_msgTypes[28]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -2329,7 +2329,7 @@ func (x *CompletionContext) String() string {
 func (*CompletionContext) ProtoMessage() {}
 
 func (x *CompletionContext) ProtoReflect() protoreflect.Message {
-	mi := &file_deephaven_proto_console_proto_msgTypes[28]
+	mi := &file_deephaven_core_proto_console_proto_msgTypes[28]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -2342,7 +2342,7 @@ func (x *CompletionContext) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use CompletionContext.ProtoReflect.Descriptor instead.
 func (*CompletionContext) Descriptor() ([]byte, []int) {
-	return file_deephaven_proto_console_proto_rawDescGZIP(), []int{28}
+	return file_deephaven_core_proto_console_proto_rawDescGZIP(), []int{28}
 }
 
 func (x *CompletionContext) GetTriggerKind() int32 {
@@ -2378,7 +2378,7 @@ type GetCompletionItemsResponse struct {
 func (x *GetCompletionItemsResponse) Reset() {
 	*x = GetCompletionItemsResponse{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_deephaven_proto_console_proto_msgTypes[29]
+		mi := &file_deephaven_core_proto_console_proto_msgTypes[29]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -2391,7 +2391,7 @@ func (x *GetCompletionItemsResponse) String() string {
 func (*GetCompletionItemsResponse) ProtoMessage() {}
 
 func (x *GetCompletionItemsResponse) ProtoReflect() protoreflect.Message {
-	mi := &file_deephaven_proto_console_proto_msgTypes[29]
+	mi := &file_deephaven_core_proto_console_proto_msgTypes[29]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -2404,7 +2404,7 @@ func (x *GetCompletionItemsResponse) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use GetCompletionItemsResponse.ProtoReflect.Descriptor instead.
 func (*GetCompletionItemsResponse) Descriptor() ([]byte, []int) {
-	return file_deephaven_proto_console_proto_rawDescGZIP(), []int{29}
+	return file_deephaven_core_proto_console_proto_rawDescGZIP(), []int{29}
 }
 
 func (x *GetCompletionItemsResponse) GetItems() []*CompletionItem {
@@ -2454,7 +2454,7 @@ type CompletionItem struct {
 func (x *CompletionItem) Reset() {
 	*x = CompletionItem{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_deephaven_proto_console_proto_msgTypes[30]
+		mi := &file_deephaven_core_proto_console_proto_msgTypes[30]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -2467,7 +2467,7 @@ func (x *CompletionItem) String() string {
 func (*CompletionItem) ProtoMessage() {}
 
 func (x *CompletionItem) ProtoReflect() protoreflect.Message {
-	mi := &file_deephaven_proto_console_proto_msgTypes[30]
+	mi := &file_deephaven_core_proto_console_proto_msgTypes[30]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -2480,7 +2480,7 @@ func (x *CompletionItem) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use CompletionItem.ProtoReflect.Descriptor instead.
 func (*CompletionItem) Descriptor() ([]byte, []int) {
-	return file_deephaven_proto_console_proto_rawDescGZIP(), []int{30}
+	return file_deephaven_core_proto_console_proto_rawDescGZIP(), []int{30}
 }
 
 func (x *CompletionItem) GetStart() int32 {
@@ -2593,7 +2593,7 @@ type TextEdit struct {
 func (x *TextEdit) Reset() {
 	*x = TextEdit{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_deephaven_proto_console_proto_msgTypes[31]
+		mi := &file_deephaven_core_proto_console_proto_msgTypes[31]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -2606,7 +2606,7 @@ func (x *TextEdit) String() string {
 func (*TextEdit) ProtoMessage() {}
 
 func (x *TextEdit) ProtoReflect() protoreflect.Message {
-	mi := &file_deephaven_proto_console_proto_msgTypes[31]
+	mi := &file_deephaven_core_proto_console_proto_msgTypes[31]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -2619,7 +2619,7 @@ func (x *TextEdit) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use TextEdit.ProtoReflect.Descriptor instead.
 func (*TextEdit) Descriptor() ([]byte, []int) {
-	return file_deephaven_proto_console_proto_rawDescGZIP(), []int{31}
+	return file_deephaven_core_proto_console_proto_rawDescGZIP(), []int{31}
 }
 
 func (x *TextEdit) GetRange() *DocumentRange {
@@ -2649,7 +2649,7 @@ type GetSignatureHelpRequest struct {
 func (x *GetSignatureHelpRequest) Reset() {
 	*x = GetSignatureHelpRequest{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_deephaven_proto_console_proto_msgTypes[32]
+		mi := &file_deephaven_core_proto_console_proto_msgTypes[32]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -2662,7 +2662,7 @@ func (x *GetSignatureHelpRequest) String() string {
 func (*GetSignatureHelpRequest) ProtoMessage() {}
 
 func (x *GetSignatureHelpRequest) ProtoReflect() protoreflect.Message {
-	mi := &file_deephaven_proto_console_proto_msgTypes[32]
+	mi := &file_deephaven_core_proto_console_proto_msgTypes[32]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -2675,7 +2675,7 @@ func (x *GetSignatureHelpRequest) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use GetSignatureHelpRequest.ProtoReflect.Descriptor instead.
 func (*GetSignatureHelpRequest) Descriptor() ([]byte, []int) {
-	return file_deephaven_proto_console_proto_rawDescGZIP(), []int{32}
+	return file_deephaven_core_proto_console_proto_rawDescGZIP(), []int{32}
 }
 
 func (x *GetSignatureHelpRequest) GetContext() *SignatureHelpContext {
@@ -2713,7 +2713,7 @@ type SignatureHelpContext struct {
 func (x *SignatureHelpContext) Reset() {
 	*x = SignatureHelpContext{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_deephaven_proto_console_proto_msgTypes[33]
+		mi := &file_deephaven_core_proto_console_proto_msgTypes[33]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -2726,7 +2726,7 @@ func (x *SignatureHelpContext) String() string {
 func (*SignatureHelpContext) ProtoMessage() {}
 
 func (x *SignatureHelpContext) ProtoReflect() protoreflect.Message {
-	mi := &file_deephaven_proto_console_proto_msgTypes[33]
+	mi := &file_deephaven_core_proto_console_proto_msgTypes[33]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -2739,7 +2739,7 @@ func (x *SignatureHelpContext) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use SignatureHelpContext.ProtoReflect.Descriptor instead.
 func (*SignatureHelpContext) Descriptor() ([]byte, []int) {
-	return file_deephaven_proto_console_proto_rawDescGZIP(), []int{33}
+	return file_deephaven_core_proto_console_proto_rawDescGZIP(), []int{33}
 }
 
 func (x *SignatureHelpContext) GetTriggerKind() int32 {
@@ -2783,7 +2783,7 @@ type GetSignatureHelpResponse struct {
 func (x *GetSignatureHelpResponse) Reset() {
 	*x = GetSignatureHelpResponse{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_deephaven_proto_console_proto_msgTypes[34]
+		mi := &file_deephaven_core_proto_console_proto_msgTypes[34]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -2796,7 +2796,7 @@ func (x *GetSignatureHelpResponse) String() string {
 func (*GetSignatureHelpResponse) ProtoMessage() {}
 
 func (x *GetSignatureHelpResponse) ProtoReflect() protoreflect.Message {
-	mi := &file_deephaven_proto_console_proto_msgTypes[34]
+	mi := &file_deephaven_core_proto_console_proto_msgTypes[34]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -2809,7 +2809,7 @@ func (x *GetSignatureHelpResponse) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use GetSignatureHelpResponse.ProtoReflect.Descriptor instead.
 func (*GetSignatureHelpResponse) Descriptor() ([]byte, []int) {
-	return file_deephaven_proto_console_proto_rawDescGZIP(), []int{34}
+	return file_deephaven_core_proto_console_proto_rawDescGZIP(), []int{34}
 }
 
 func (x *GetSignatureHelpResponse) GetSignatures() []*SignatureInformation {
@@ -2847,7 +2847,7 @@ type SignatureInformation struct {
 func (x *SignatureInformation) Reset() {
 	*x = SignatureInformation{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_deephaven_proto_console_proto_msgTypes[35]
+		mi := &file_deephaven_core_proto_console_proto_msgTypes[35]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -2860,7 +2860,7 @@ func (x *SignatureInformation) String() string {
 func (*SignatureInformation) ProtoMessage() {}
 
 func (x *SignatureInformation) ProtoReflect() protoreflect.Message {
-	mi := &file_deephaven_proto_console_proto_msgTypes[35]
+	mi := &file_deephaven_core_proto_console_proto_msgTypes[35]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -2873,7 +2873,7 @@ func (x *SignatureInformation) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use SignatureInformation.ProtoReflect.Descriptor instead.
 func (*SignatureInformation) Descriptor() ([]byte, []int) {
-	return file_deephaven_proto_console_proto_rawDescGZIP(), []int{35}
+	return file_deephaven_core_proto_console_proto_rawDescGZIP(), []int{35}
 }
 
 func (x *SignatureInformation) GetLabel() string {
@@ -2916,7 +2916,7 @@ type ParameterInformation struct {
 func (x *ParameterInformation) Reset() {
 	*x = ParameterInformation{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_deephaven_proto_console_proto_msgTypes[36]
+		mi := &file_deephaven_core_proto_console_proto_msgTypes[36]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -2929,7 +2929,7 @@ func (x *ParameterInformation) String() string {
 func (*ParameterInformation) ProtoMessage() {}
 
 func (x *ParameterInformation) ProtoReflect() protoreflect.Message {
-	mi := &file_deephaven_proto_console_proto_msgTypes[36]
+	mi := &file_deephaven_core_proto_console_proto_msgTypes[36]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -2942,7 +2942,7 @@ func (x *ParameterInformation) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use ParameterInformation.ProtoReflect.Descriptor instead.
 func (*ParameterInformation) Descriptor() ([]byte, []int) {
-	return file_deephaven_proto_console_proto_rawDescGZIP(), []int{36}
+	return file_deephaven_core_proto_console_proto_rawDescGZIP(), []int{36}
 }
 
 func (x *ParameterInformation) GetLabel() string {
@@ -2971,7 +2971,7 @@ type GetHoverRequest struct {
 func (x *GetHoverRequest) Reset() {
 	*x = GetHoverRequest{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_deephaven_proto_console_proto_msgTypes[37]
+		mi := &file_deephaven_core_proto_console_proto_msgTypes[37]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -2984,7 +2984,7 @@ func (x *GetHoverRequest) String() string {
 func (*GetHoverRequest) ProtoMessage() {}
 
 func (x *GetHoverRequest) ProtoReflect() protoreflect.Message {
-	mi := &file_deephaven_proto_console_proto_msgTypes[37]
+	mi := &file_deephaven_core_proto_console_proto_msgTypes[37]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -2997,7 +2997,7 @@ func (x *GetHoverRequest) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use GetHoverRequest.ProtoReflect.Descriptor instead.
 func (*GetHoverRequest) Descriptor() ([]byte, []int) {
-	return file_deephaven_proto_console_proto_rawDescGZIP(), []int{37}
+	return file_deephaven_core_proto_console_proto_rawDescGZIP(), []int{37}
 }
 
 func (x *GetHoverRequest) GetTextDocument() *VersionedTextDocumentIdentifier {
@@ -3026,7 +3026,7 @@ type GetHoverResponse struct {
 func (x *GetHoverResponse) Reset() {
 	*x = GetHoverResponse{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_deephaven_proto_console_proto_msgTypes[38]
+		mi := &file_deephaven_core_proto_console_proto_msgTypes[38]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -3039,7 +3039,7 @@ func (x *GetHoverResponse) String() string {
 func (*GetHoverResponse) ProtoMessage() {}
 
 func (x *GetHoverResponse) ProtoReflect() protoreflect.Message {
-	mi := &file_deephaven_proto_console_proto_msgTypes[38]
+	mi := &file_deephaven_core_proto_console_proto_msgTypes[38]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -3052,7 +3052,7 @@ func (x *GetHoverResponse) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use GetHoverResponse.ProtoReflect.Descriptor instead.
 func (*GetHoverResponse) Descriptor() ([]byte, []int) {
-	return file_deephaven_proto_console_proto_rawDescGZIP(), []int{38}
+	return file_deephaven_core_proto_console_proto_rawDescGZIP(), []int{38}
 }
 
 func (x *GetHoverResponse) GetContents() *MarkupContent {
@@ -3082,7 +3082,7 @@ type GetDiagnosticRequest struct {
 func (x *GetDiagnosticRequest) Reset() {
 	*x = GetDiagnosticRequest{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_deephaven_proto_console_proto_msgTypes[39]
+		mi := &file_deephaven_core_proto_console_proto_msgTypes[39]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -3095,7 +3095,7 @@ func (x *GetDiagnosticRequest) String() string {
 func (*GetDiagnosticRequest) ProtoMessage() {}
 
 func (x *GetDiagnosticRequest) ProtoReflect() protoreflect.Message {
-	mi := &file_deephaven_proto_console_proto_msgTypes[39]
+	mi := &file_deephaven_core_proto_console_proto_msgTypes[39]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -3108,7 +3108,7 @@ func (x *GetDiagnosticRequest) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use GetDiagnosticRequest.ProtoReflect.Descriptor instead.
 func (*GetDiagnosticRequest) Descriptor() ([]byte, []int) {
-	return file_deephaven_proto_console_proto_rawDescGZIP(), []int{39}
+	return file_deephaven_core_proto_console_proto_rawDescGZIP(), []int{39}
 }
 
 func (x *GetDiagnosticRequest) GetTextDocument() *VersionedTextDocumentIdentifier {
@@ -3145,7 +3145,7 @@ type GetPullDiagnosticResponse struct {
 func (x *GetPullDiagnosticResponse) Reset() {
 	*x = GetPullDiagnosticResponse{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_deephaven_proto_console_proto_msgTypes[40]
+		mi := &file_deephaven_core_proto_console_proto_msgTypes[40]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -3158,7 +3158,7 @@ func (x *GetPullDiagnosticResponse) String() string {
 func (*GetPullDiagnosticResponse) ProtoMessage() {}
 
 func (x *GetPullDiagnosticResponse) ProtoReflect() protoreflect.Message {
-	mi := &file_deephaven_proto_console_proto_msgTypes[40]
+	mi := &file_deephaven_core_proto_console_proto_msgTypes[40]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -3171,7 +3171,7 @@ func (x *GetPullDiagnosticResponse) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use GetPullDiagnosticResponse.ProtoReflect.Descriptor instead.
 func (*GetPullDiagnosticResponse) Descriptor() ([]byte, []int) {
-	return file_deephaven_proto_console_proto_rawDescGZIP(), []int{40}
+	return file_deephaven_core_proto_console_proto_rawDescGZIP(), []int{40}
 }
 
 func (x *GetPullDiagnosticResponse) GetKind() string {
@@ -3208,7 +3208,7 @@ type GetPublishDiagnosticResponse struct {
 func (x *GetPublishDiagnosticResponse) Reset() {
 	*x = GetPublishDiagnosticResponse{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_deephaven_proto_console_proto_msgTypes[41]
+		mi := &file_deephaven_core_proto_console_proto_msgTypes[41]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -3221,7 +3221,7 @@ func (x *GetPublishDiagnosticResponse) String() string {
 func (*GetPublishDiagnosticResponse) ProtoMessage() {}
 
 func (x *GetPublishDiagnosticResponse) ProtoReflect() protoreflect.Message {
-	mi := &file_deephaven_proto_console_proto_msgTypes[41]
+	mi := &file_deephaven_core_proto_console_proto_msgTypes[41]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -3234,7 +3234,7 @@ func (x *GetPublishDiagnosticResponse) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use GetPublishDiagnosticResponse.ProtoReflect.Descriptor instead.
 func (*GetPublishDiagnosticResponse) Descriptor() ([]byte, []int) {
-	return file_deephaven_proto_console_proto_rawDescGZIP(), []int{41}
+	return file_deephaven_core_proto_console_proto_rawDescGZIP(), []int{41}
 }
 
 func (x *GetPublishDiagnosticResponse) GetUri() string {
@@ -3276,7 +3276,7 @@ type Diagnostic struct {
 func (x *Diagnostic) Reset() {
 	*x = Diagnostic{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_deephaven_proto_console_proto_msgTypes[42]
+		mi := &file_deephaven_core_proto_console_proto_msgTypes[42]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -3289,7 +3289,7 @@ func (x *Diagnostic) String() string {
 func (*Diagnostic) ProtoMessage() {}
 
 func (x *Diagnostic) ProtoReflect() protoreflect.Message {
-	mi := &file_deephaven_proto_console_proto_msgTypes[42]
+	mi := &file_deephaven_core_proto_console_proto_msgTypes[42]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -3302,7 +3302,7 @@ func (x *Diagnostic) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use Diagnostic.ProtoReflect.Descriptor instead.
 func (*Diagnostic) Descriptor() ([]byte, []int) {
-	return file_deephaven_proto_console_proto_rawDescGZIP(), []int{42}
+	return file_deephaven_core_proto_console_proto_rawDescGZIP(), []int{42}
 }
 
 func (x *Diagnostic) GetRange() *DocumentRange {
@@ -3379,7 +3379,7 @@ type FigureDescriptor struct {
 func (x *FigureDescriptor) Reset() {
 	*x = FigureDescriptor{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_deephaven_proto_console_proto_msgTypes[43]
+		mi := &file_deephaven_core_proto_console_proto_msgTypes[43]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -3392,7 +3392,7 @@ func (x *FigureDescriptor) String() string {
 func (*FigureDescriptor) ProtoMessage() {}
 
 func (x *FigureDescriptor) ProtoReflect() protoreflect.Message {
-	mi := &file_deephaven_proto_console_proto_msgTypes[43]
+	mi := &file_deephaven_core_proto_console_proto_msgTypes[43]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -3405,7 +3405,7 @@ func (x *FigureDescriptor) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use FigureDescriptor.ProtoReflect.Descriptor instead.
 func (*FigureDescriptor) Descriptor() ([]byte, []int) {
-	return file_deephaven_proto_console_proto_rawDescGZIP(), []int{43}
+	return file_deephaven_core_proto_console_proto_rawDescGZIP(), []int{43}
 }
 
 func (x *FigureDescriptor) GetTitle() string {
@@ -3477,7 +3477,7 @@ type ChangeDocumentRequest_TextDocumentContentChangeEvent struct {
 func (x *ChangeDocumentRequest_TextDocumentContentChangeEvent) Reset() {
 	*x = ChangeDocumentRequest_TextDocumentContentChangeEvent{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_deephaven_proto_console_proto_msgTypes[44]
+		mi := &file_deephaven_core_proto_console_proto_msgTypes[44]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -3490,7 +3490,7 @@ func (x *ChangeDocumentRequest_TextDocumentContentChangeEvent) String() string {
 func (*ChangeDocumentRequest_TextDocumentContentChangeEvent) ProtoMessage() {}
 
 func (x *ChangeDocumentRequest_TextDocumentContentChangeEvent) ProtoReflect() protoreflect.Message {
-	mi := &file_deephaven_proto_console_proto_msgTypes[44]
+	mi := &file_deephaven_core_proto_console_proto_msgTypes[44]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -3503,7 +3503,7 @@ func (x *ChangeDocumentRequest_TextDocumentContentChangeEvent) ProtoReflect() pr
 
 // Deprecated: Use ChangeDocumentRequest_TextDocumentContentChangeEvent.ProtoReflect.Descriptor instead.
 func (*ChangeDocumentRequest_TextDocumentContentChangeEvent) Descriptor() ([]byte, []int) {
-	return file_deephaven_proto_console_proto_rawDescGZIP(), []int{22, 0}
+	return file_deephaven_core_proto_console_proto_rawDescGZIP(), []int{22, 0}
 }
 
 func (x *ChangeDocumentRequest_TextDocumentContentChangeEvent) GetRange() *DocumentRange {
@@ -3538,7 +3538,7 @@ type Diagnostic_CodeDescription struct {
 func (x *Diagnostic_CodeDescription) Reset() {
 	*x = Diagnostic_CodeDescription{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_deephaven_proto_console_proto_msgTypes[45]
+		mi := &file_deephaven_core_proto_console_proto_msgTypes[45]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -3551,7 +3551,7 @@ func (x *Diagnostic_CodeDescription) String() string {
 func (*Diagnostic_CodeDescription) ProtoMessage() {}
 
 func (x *Diagnostic_CodeDescription) ProtoReflect() protoreflect.Message {
-	mi := &file_deephaven_proto_console_proto_msgTypes[45]
+	mi := &file_deephaven_core_proto_console_proto_msgTypes[45]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -3564,7 +3564,7 @@ func (x *Diagnostic_CodeDescription) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use Diagnostic_CodeDescription.ProtoReflect.Descriptor instead.
 func (*Diagnostic_CodeDescription) Descriptor() ([]byte, []int) {
-	return file_deephaven_proto_console_proto_rawDescGZIP(), []int{42, 0}
+	return file_deephaven_core_proto_console_proto_rawDescGZIP(), []int{42, 0}
 }
 
 func (x *Diagnostic_CodeDescription) GetHref() string {
@@ -3599,7 +3599,7 @@ type FigureDescriptor_ChartDescriptor struct {
 func (x *FigureDescriptor_ChartDescriptor) Reset() {
 	*x = FigureDescriptor_ChartDescriptor{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_deephaven_proto_console_proto_msgTypes[46]
+		mi := &file_deephaven_core_proto_console_proto_msgTypes[46]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -3612,7 +3612,7 @@ func (x *FigureDescriptor_ChartDescriptor) String() string {
 func (*FigureDescriptor_ChartDescriptor) ProtoMessage() {}
 
 func (x *FigureDescriptor_ChartDescriptor) ProtoReflect() protoreflect.Message {
-	mi := &file_deephaven_proto_console_proto_msgTypes[46]
+	mi := &file_deephaven_core_proto_console_proto_msgTypes[46]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -3625,7 +3625,7 @@ func (x *FigureDescriptor_ChartDescriptor) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use FigureDescriptor_ChartDescriptor.ProtoReflect.Descriptor instead.
 func (*FigureDescriptor_ChartDescriptor) Descriptor() ([]byte, []int) {
-	return file_deephaven_proto_console_proto_rawDescGZIP(), []int{43, 0}
+	return file_deephaven_core_proto_console_proto_rawDescGZIP(), []int{43, 0}
 }
 
 func (x *FigureDescriptor_ChartDescriptor) GetColspan() int32 {
@@ -3757,7 +3757,7 @@ type FigureDescriptor_SeriesDescriptor struct {
 func (x *FigureDescriptor_SeriesDescriptor) Reset() {
 	*x = FigureDescriptor_SeriesDescriptor{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_deephaven_proto_console_proto_msgTypes[47]
+		mi := &file_deephaven_core_proto_console_proto_msgTypes[47]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -3770,7 +3770,7 @@ func (x *FigureDescriptor_SeriesDescriptor) String() string {
 func (*FigureDescriptor_SeriesDescriptor) ProtoMessage() {}
 
 func (x *FigureDescriptor_SeriesDescriptor) ProtoReflect() protoreflect.Message {
-	mi := &file_deephaven_proto_console_proto_msgTypes[47]
+	mi := &file_deephaven_core_proto_console_proto_msgTypes[47]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -3783,7 +3783,7 @@ func (x *FigureDescriptor_SeriesDescriptor) ProtoReflect() protoreflect.Message
 
 // Deprecated: Use FigureDescriptor_SeriesDescriptor.ProtoReflect.Descriptor instead.
 func (*FigureDescriptor_SeriesDescriptor) Descriptor() ([]byte, []int) {
-	return file_deephaven_proto_console_proto_rawDescGZIP(), []int{43, 1}
+	return file_deephaven_core_proto_console_proto_rawDescGZIP(), []int{43, 1}
 }
 
 func (x *FigureDescriptor_SeriesDescriptor) GetPlotStyle() FigureDescriptor_SeriesPlotStyle {
@@ -3908,7 +3908,7 @@ type FigureDescriptor_MultiSeriesDescriptor struct {
 func (x *FigureDescriptor_MultiSeriesDescriptor) Reset() {
 	*x = FigureDescriptor_MultiSeriesDescriptor{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_deephaven_proto_console_proto_msgTypes[48]
+		mi := &file_deephaven_core_proto_console_proto_msgTypes[48]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -3921,7 +3921,7 @@ func (x *FigureDescriptor_MultiSeriesDescriptor) String() string {
 func (*FigureDescriptor_MultiSeriesDescriptor) ProtoMessage() {}
 
 func (x *FigureDescriptor_MultiSeriesDescriptor) ProtoReflect() protoreflect.Message {
-	mi := &file_deephaven_proto_console_proto_msgTypes[48]
+	mi := &file_deephaven_core_proto_console_proto_msgTypes[48]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -3934,7 +3934,7 @@ func (x *FigureDescriptor_MultiSeriesDescriptor) ProtoReflect() protoreflect.Mes
 
 // Deprecated: Use FigureDescriptor_MultiSeriesDescriptor.ProtoReflect.Descriptor instead.
 func (*FigureDescriptor_MultiSeriesDescriptor) Descriptor() ([]byte, []int) {
-	return file_deephaven_proto_console_proto_rawDescGZIP(), []int{43, 2}
+	return file_deephaven_core_proto_console_proto_rawDescGZIP(), []int{43, 2}
 }
 
 func (x *FigureDescriptor_MultiSeriesDescriptor) GetPlotStyle() FigureDescriptor_SeriesPlotStyle {
@@ -4048,7 +4048,7 @@ type FigureDescriptor_StringMapWithDefault struct {
 func (x *FigureDescriptor_StringMapWithDefault) Reset() {
 	*x = FigureDescriptor_StringMapWithDefault{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_deephaven_proto_console_proto_msgTypes[49]
+		mi := &file_deephaven_core_proto_console_proto_msgTypes[49]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -4061,7 +4061,7 @@ func (x *FigureDescriptor_StringMapWithDefault) String() string {
 func (*FigureDescriptor_StringMapWithDefault) ProtoMessage() {}
 
 func (x *FigureDescriptor_StringMapWithDefault) ProtoReflect() protoreflect.Message {
-	mi := &file_deephaven_proto_console_proto_msgTypes[49]
+	mi := &file_deephaven_core_proto_console_proto_msgTypes[49]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -4074,7 +4074,7 @@ func (x *FigureDescriptor_StringMapWithDefault) ProtoReflect() protoreflect.Mess
 
 // Deprecated: Use FigureDescriptor_StringMapWithDefault.ProtoReflect.Descriptor instead.
 func (*FigureDescriptor_StringMapWithDefault) Descriptor() ([]byte, []int) {
-	return file_deephaven_proto_console_proto_rawDescGZIP(), []int{43, 3}
+	return file_deephaven_core_proto_console_proto_rawDescGZIP(), []int{43, 3}
 }
 
 func (x *FigureDescriptor_StringMapWithDefault) GetDefaultString() string {
@@ -4111,7 +4111,7 @@ type FigureDescriptor_DoubleMapWithDefault struct {
 func (x *FigureDescriptor_DoubleMapWithDefault) Reset() {
 	*x = FigureDescriptor_DoubleMapWithDefault{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_deephaven_proto_console_proto_msgTypes[50]
+		mi := &file_deephaven_core_proto_console_proto_msgTypes[50]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -4124,7 +4124,7 @@ func (x *FigureDescriptor_DoubleMapWithDefault) String() string {
 func (*FigureDescriptor_DoubleMapWithDefault) ProtoMessage() {}
 
 func (x *FigureDescriptor_DoubleMapWithDefault) ProtoReflect() protoreflect.Message {
-	mi := &file_deephaven_proto_console_proto_msgTypes[50]
+	mi := &file_deephaven_core_proto_console_proto_msgTypes[50]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -4137,7 +4137,7 @@ func (x *FigureDescriptor_DoubleMapWithDefault) ProtoReflect() protoreflect.Mess
 
 // Deprecated: Use FigureDescriptor_DoubleMapWithDefault.ProtoReflect.Descriptor instead.
 func (*FigureDescriptor_DoubleMapWithDefault) Descriptor() ([]byte, []int) {
-	return file_deephaven_proto_console_proto_rawDescGZIP(), []int{43, 4}
+	return file_deephaven_core_proto_console_proto_rawDescGZIP(), []int{43, 4}
 }
 
 func (x *FigureDescriptor_DoubleMapWithDefault) GetDefaultDouble() float64 {
@@ -4174,7 +4174,7 @@ type FigureDescriptor_BoolMapWithDefault struct {
 func (x *FigureDescriptor_BoolMapWithDefault) Reset() {
 	*x = FigureDescriptor_BoolMapWithDefault{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_deephaven_proto_console_proto_msgTypes[51]
+		mi := &file_deephaven_core_proto_console_proto_msgTypes[51]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -4187,7 +4187,7 @@ func (x *FigureDescriptor_BoolMapWithDefault) String() string {
 func (*FigureDescriptor_BoolMapWithDefault) ProtoMessage() {}
 
 func (x *FigureDescriptor_BoolMapWithDefault) ProtoReflect() protoreflect.Message {
-	mi := &file_deephaven_proto_console_proto_msgTypes[51]
+	mi := &file_deephaven_core_proto_console_proto_msgTypes[51]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -4200,7 +4200,7 @@ func (x *FigureDescriptor_BoolMapWithDefault) ProtoReflect() protoreflect.Messag
 
 // Deprecated: Use FigureDescriptor_BoolMapWithDefault.ProtoReflect.Descriptor instead.
 func (*FigureDescriptor_BoolMapWithDefault) Descriptor() ([]byte, []int) {
-	return file_deephaven_proto_console_proto_rawDescGZIP(), []int{43, 5}
+	return file_deephaven_core_proto_console_proto_rawDescGZIP(), []int{43, 5}
 }
 
 func (x *FigureDescriptor_BoolMapWithDefault) GetDefaultBool() bool {
@@ -4255,7 +4255,7 @@ type FigureDescriptor_AxisDescriptor struct {
 func (x *FigureDescriptor_AxisDescriptor) Reset() {
 	*x = FigureDescriptor_AxisDescriptor{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_deephaven_proto_console_proto_msgTypes[52]
+		mi := &file_deephaven_core_proto_console_proto_msgTypes[52]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -4268,7 +4268,7 @@ func (x *FigureDescriptor_AxisDescriptor) String() string {
 func (*FigureDescriptor_AxisDescriptor) ProtoMessage() {}
 
 func (x *FigureDescriptor_AxisDescriptor) ProtoReflect() protoreflect.Message {
-	mi := &file_deephaven_proto_console_proto_msgTypes[52]
+	mi := &file_deephaven_core_proto_console_proto_msgTypes[52]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -4281,7 +4281,7 @@ func (x *FigureDescriptor_AxisDescriptor) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use FigureDescriptor_AxisDescriptor.ProtoReflect.Descriptor instead.
 func (*FigureDescriptor_AxisDescriptor) Descriptor() ([]byte, []int) {
-	return file_deephaven_proto_console_proto_rawDescGZIP(), []int{43, 6}
+	return file_deephaven_core_proto_console_proto_rawDescGZIP(), []int{43, 6}
 }
 
 func (x *FigureDescriptor_AxisDescriptor) GetId() string {
@@ -4446,7 +4446,7 @@ type FigureDescriptor_BusinessCalendarDescriptor struct {
 func (x *FigureDescriptor_BusinessCalendarDescriptor) Reset() {
 	*x = FigureDescriptor_BusinessCalendarDescriptor{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_deephaven_proto_console_proto_msgTypes[53]
+		mi := &file_deephaven_core_proto_console_proto_msgTypes[53]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -4459,7 +4459,7 @@ func (x *FigureDescriptor_BusinessCalendarDescriptor) String() string {
 func (*FigureDescriptor_BusinessCalendarDescriptor) ProtoMessage() {}
 
 func (x *FigureDescriptor_BusinessCalendarDescriptor) ProtoReflect() protoreflect.Message {
-	mi := &file_deephaven_proto_console_proto_msgTypes[53]
+	mi := &file_deephaven_core_proto_console_proto_msgTypes[53]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -4472,7 +4472,7 @@ func (x *FigureDescriptor_BusinessCalendarDescriptor) ProtoReflect() protoreflec
 
 // Deprecated: Use FigureDescriptor_BusinessCalendarDescriptor.ProtoReflect.Descriptor instead.
 func (*FigureDescriptor_BusinessCalendarDescriptor) Descriptor() ([]byte, []int) {
-	return file_deephaven_proto_console_proto_rawDescGZIP(), []int{43, 7}
+	return file_deephaven_core_proto_console_proto_rawDescGZIP(), []int{43, 7}
 }
 
 func (x *FigureDescriptor_BusinessCalendarDescriptor) GetName() string {
@@ -4524,7 +4524,7 @@ type FigureDescriptor_MultiSeriesSourceDescriptor struct {
 func (x *FigureDescriptor_MultiSeriesSourceDescriptor) Reset() {
 	*x = FigureDescriptor_MultiSeriesSourceDescriptor{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_deephaven_proto_console_proto_msgTypes[54]
+		mi := &file_deephaven_core_proto_console_proto_msgTypes[54]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -4537,7 +4537,7 @@ func (x *FigureDescriptor_MultiSeriesSourceDescriptor) String() string {
 func (*FigureDescriptor_MultiSeriesSourceDescriptor) ProtoMessage() {}
 
 func (x *FigureDescriptor_MultiSeriesSourceDescriptor) ProtoReflect() protoreflect.Message {
-	mi := &file_deephaven_proto_console_proto_msgTypes[54]
+	mi := &file_deephaven_core_proto_console_proto_msgTypes[54]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -4550,7 +4550,7 @@ func (x *FigureDescriptor_MultiSeriesSourceDescriptor) ProtoReflect() protorefle
 
 // Deprecated: Use FigureDescriptor_MultiSeriesSourceDescriptor.ProtoReflect.Descriptor instead.
 func (*FigureDescriptor_MultiSeriesSourceDescriptor) Descriptor() ([]byte, []int) {
-	return file_deephaven_proto_console_proto_rawDescGZIP(), []int{43, 8}
+	return file_deephaven_core_proto_console_proto_rawDescGZIP(), []int{43, 8}
 }
 
 func (x *FigureDescriptor_MultiSeriesSourceDescriptor) GetAxisId() string {
@@ -4598,7 +4598,7 @@ type FigureDescriptor_SourceDescriptor struct {
 func (x *FigureDescriptor_SourceDescriptor) Reset() {
 	*x = FigureDescriptor_SourceDescriptor{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_deephaven_proto_console_proto_msgTypes[55]
+		mi := &file_deephaven_core_proto_console_proto_msgTypes[55]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -4611,7 +4611,7 @@ func (x *FigureDescriptor_SourceDescriptor) String() string {
 func (*FigureDescriptor_SourceDescriptor) ProtoMessage() {}
 
 func (x *FigureDescriptor_SourceDescriptor) ProtoReflect() protoreflect.Message {
-	mi := &file_deephaven_proto_console_proto_msgTypes[55]
+	mi := &file_deephaven_core_proto_console_proto_msgTypes[55]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -4624,7 +4624,7 @@ func (x *FigureDescriptor_SourceDescriptor) ProtoReflect() protoreflect.Message
 
 // Deprecated: Use FigureDescriptor_SourceDescriptor.ProtoReflect.Descriptor instead.
 func (*FigureDescriptor_SourceDescriptor) Descriptor() ([]byte, []int) {
-	return file_deephaven_proto_console_proto_rawDescGZIP(), []int{43, 9}
+	return file_deephaven_core_proto_console_proto_rawDescGZIP(), []int{43, 9}
 }
 
 func (x *FigureDescriptor_SourceDescriptor) GetAxisId() string {
@@ -4689,7 +4689,7 @@ type FigureDescriptor_OneClickDescriptor struct {
 func (x *FigureDescriptor_OneClickDescriptor) Reset() {
 	*x = FigureDescriptor_OneClickDescriptor{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_deephaven_proto_console_proto_msgTypes[56]
+		mi := &file_deephaven_core_proto_console_proto_msgTypes[56]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -4702,7 +4702,7 @@ func (x *FigureDescriptor_OneClickDescriptor) String() string {
 func (*FigureDescriptor_OneClickDescriptor) ProtoMessage() {}
 
 func (x *FigureDescriptor_OneClickDescriptor) ProtoReflect() protoreflect.Message {
-	mi := &file_deephaven_proto_console_proto_msgTypes[56]
+	mi := &file_deephaven_core_proto_console_proto_msgTypes[56]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -4715,7 +4715,7 @@ func (x *FigureDescriptor_OneClickDescriptor) ProtoReflect() protoreflect.Messag
 
 // Deprecated: Use FigureDescriptor_OneClickDescriptor.ProtoReflect.Descriptor instead.
 func (*FigureDescriptor_OneClickDescriptor) Descriptor() ([]byte, []int) {
-	return file_deephaven_proto_console_proto_rawDescGZIP(), []int{43, 10}
+	return file_deephaven_core_proto_console_proto_rawDescGZIP(), []int{43, 10}
 }
 
 func (x *FigureDescriptor_OneClickDescriptor) GetColumns() []string {
@@ -4751,7 +4751,7 @@ type FigureDescriptor_BusinessCalendarDescriptor_BusinessPeriod struct {
 func (x *FigureDescriptor_BusinessCalendarDescriptor_BusinessPeriod) Reset() {
 	*x = FigureDescriptor_BusinessCalendarDescriptor_BusinessPeriod{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_deephaven_proto_console_proto_msgTypes[57]
+		mi := &file_deephaven_core_proto_console_proto_msgTypes[57]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -4764,7 +4764,7 @@ func (x *FigureDescriptor_BusinessCalendarDescriptor_BusinessPeriod) String() st
 func (*FigureDescriptor_BusinessCalendarDescriptor_BusinessPeriod) ProtoMessage() {}
 
 func (x *FigureDescriptor_BusinessCalendarDescriptor_BusinessPeriod) ProtoReflect() protoreflect.Message {
-	mi := &file_deephaven_proto_console_proto_msgTypes[57]
+	mi := &file_deephaven_core_proto_console_proto_msgTypes[57]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -4777,7 +4777,7 @@ func (x *FigureDescriptor_BusinessCalendarDescriptor_BusinessPeriod) ProtoReflec
 
 // Deprecated: Use FigureDescriptor_BusinessCalendarDescriptor_BusinessPeriod.ProtoReflect.Descriptor instead.
 func (*FigureDescriptor_BusinessCalendarDescriptor_BusinessPeriod) Descriptor() ([]byte, []int) {
-	return file_deephaven_proto_console_proto_rawDescGZIP(), []int{43, 7, 0}
+	return file_deephaven_core_proto_console_proto_rawDescGZIP(), []int{43, 7, 0}
 }
 
 func (x *FigureDescriptor_BusinessCalendarDescriptor_BusinessPeriod) GetOpen() string {
@@ -4806,7 +4806,7 @@ type FigureDescriptor_BusinessCalendarDescriptor_Holiday struct {
 func (x *FigureDescriptor_BusinessCalendarDescriptor_Holiday) Reset() {
 	*x = FigureDescriptor_BusinessCalendarDescriptor_Holiday{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_deephaven_proto_console_proto_msgTypes[58]
+		mi := &file_deephaven_core_proto_console_proto_msgTypes[58]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -4819,7 +4819,7 @@ func (x *FigureDescriptor_BusinessCalendarDescriptor_Holiday) String() string {
 func (*FigureDescriptor_BusinessCalendarDescriptor_Holiday) ProtoMessage() {}
 
 func (x *FigureDescriptor_BusinessCalendarDescriptor_Holiday) ProtoReflect() protoreflect.Message {
-	mi := &file_deephaven_proto_console_proto_msgTypes[58]
+	mi := &file_deephaven_core_proto_console_proto_msgTypes[58]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -4832,7 +4832,7 @@ func (x *FigureDescriptor_BusinessCalendarDescriptor_Holiday) ProtoReflect() pro
 
 // Deprecated: Use FigureDescriptor_BusinessCalendarDescriptor_Holiday.ProtoReflect.Descriptor instead.
 func (*FigureDescriptor_BusinessCalendarDescriptor_Holiday) Descriptor() ([]byte, []int) {
-	return file_deephaven_proto_console_proto_rawDescGZIP(), []int{43, 7, 1}
+	return file_deephaven_core_proto_console_proto_rawDescGZIP(), []int{43, 7, 1}
 }
 
 func (x *FigureDescriptor_BusinessCalendarDescriptor_Holiday) GetDate() *FigureDescriptor_BusinessCalendarDescriptor_LocalDate {
@@ -4862,7 +4862,7 @@ type FigureDescriptor_BusinessCalendarDescriptor_LocalDate struct {
 func (x *FigureDescriptor_BusinessCalendarDescriptor_LocalDate) Reset() {
 	*x = FigureDescriptor_BusinessCalendarDescriptor_LocalDate{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_deephaven_proto_console_proto_msgTypes[59]
+		mi := &file_deephaven_core_proto_console_proto_msgTypes[59]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -4875,7 +4875,7 @@ func (x *FigureDescriptor_BusinessCalendarDescriptor_LocalDate) String() string
 func (*FigureDescriptor_BusinessCalendarDescriptor_LocalDate) ProtoMessage() {}
 
 func (x *FigureDescriptor_BusinessCalendarDescriptor_LocalDate) ProtoReflect() protoreflect.Message {
-	mi := &file_deephaven_proto_console_proto_msgTypes[59]
+	mi := &file_deephaven_core_proto_console_proto_msgTypes[59]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -4888,7 +4888,7 @@ func (x *FigureDescriptor_BusinessCalendarDescriptor_LocalDate) ProtoReflect() p
 
 // Deprecated: Use FigureDescriptor_BusinessCalendarDescriptor_LocalDate.ProtoReflect.Descriptor instead.
 func (*FigureDescriptor_BusinessCalendarDescriptor_LocalDate) Descriptor() ([]byte, []int) {
-	return file_deephaven_proto_console_proto_rawDescGZIP(), []int{43, 7, 2}
+	return file_deephaven_core_proto_console_proto_rawDescGZIP(), []int{43, 7, 2}
 }
 
 func (x *FigureDescriptor_BusinessCalendarDescriptor_LocalDate) GetYear() int32 {
@@ -4912,1180 +4912,1181 @@ func (x *FigureDescriptor_BusinessCalendarDescriptor_LocalDate) GetDay() int32 {
 	return 0
 }
 
-var File_deephaven_proto_console_proto protoreflect.FileDescriptor
+var File_deephaven_core_proto_console_proto protoreflect.FileDescriptor
 
-var file_deephaven_proto_console_proto_rawDesc = []byte{
-	0x0a, 0x1d, 0x64, 0x65, 0x65, 0x70, 0x68, 0x61, 0x76, 0x65, 0x6e, 0x2f, 0x70, 0x72, 0x6f, 0x74,
-	0x6f, 0x2f, 0x63, 0x6f, 0x6e, 0x73, 0x6f, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x12,
-	0x28, 0x69, 0x6f, 0x2e, 0x64, 0x65, 0x65, 0x70, 0x68, 0x61, 0x76, 0x65, 0x6e, 0x2e, 0x70, 0x72,
-	0x6f, 0x74, 0x6f, 0x2e, 0x62, 0x61, 0x63, 0x6b, 0x70, 0x6c, 0x61, 0x6e, 0x65, 0x2e, 0x73, 0x63,
-	0x72, 0x69, 0x70, 0x74, 0x2e, 0x67, 0x72, 0x70, 0x63, 0x1a, 0x1c, 0x64, 0x65, 0x65, 0x70, 0x68,
-	0x61, 0x76, 0x65, 0x6e, 0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2f, 0x74, 0x69, 0x63, 0x6b, 0x65,
-	0x74, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x1a, 0x21, 0x64, 0x65, 0x65, 0x70, 0x68, 0x61, 0x76,
-	0x65, 0x6e, 0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2f, 0x61, 0x70, 0x70, 0x6c, 0x69, 0x63, 0x61,
-	0x74, 0x69, 0x6f, 0x6e, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x22, 0x18, 0x0a, 0x16, 0x47, 0x65,
-	0x74, 0x43, 0x6f, 0x6e, 0x73, 0x6f, 0x6c, 0x65, 0x54, 0x79, 0x70, 0x65, 0x73, 0x52, 0x65, 0x71,
-	0x75, 0x65, 0x73, 0x74, 0x22, 0x3e, 0x0a, 0x17, 0x47, 0x65, 0x74, 0x43, 0x6f, 0x6e, 0x73, 0x6f,
-	0x6c, 0x65, 0x54, 0x79, 0x70, 0x65, 0x73, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12,
-	0x23, 0x0a, 0x0d, 0x63, 0x6f, 0x6e, 0x73, 0x6f, 0x6c, 0x65, 0x5f, 0x74, 0x79, 0x70, 0x65, 0x73,
-	0x18, 0x01, 0x20, 0x03, 0x28, 0x09, 0x52, 0x0c, 0x63, 0x6f, 0x6e, 0x73, 0x6f, 0x6c, 0x65, 0x54,
-	0x79, 0x70, 0x65, 0x73, 0x22, 0x80, 0x01, 0x0a, 0x13, 0x53, 0x74, 0x61, 0x72, 0x74, 0x43, 0x6f,
-	0x6e, 0x73, 0x6f, 0x6c, 0x65, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x46, 0x0a, 0x09,
-	0x72, 0x65, 0x73, 0x75, 0x6c, 0x74, 0x5f, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32,
-	0x29, 0x2e, 0x69, 0x6f, 0x2e, 0x64, 0x65, 0x65, 0x70, 0x68, 0x61, 0x76, 0x65, 0x6e, 0x2e, 0x70,
-	0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x62, 0x61, 0x63, 0x6b, 0x70, 0x6c, 0x61, 0x6e, 0x65, 0x2e, 0x67,
-	0x72, 0x70, 0x63, 0x2e, 0x54, 0x69, 0x63, 0x6b, 0x65, 0x74, 0x52, 0x08, 0x72, 0x65, 0x73, 0x75,
-	0x6c, 0x74, 0x49, 0x64, 0x12, 0x21, 0x0a, 0x0c, 0x73, 0x65, 0x73, 0x73, 0x69, 0x6f, 0x6e, 0x5f,
-	0x74, 0x79, 0x70, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0b, 0x73, 0x65, 0x73, 0x73,
-	0x69, 0x6f, 0x6e, 0x54, 0x79, 0x70, 0x65, 0x22, 0x5e, 0x0a, 0x14, 0x53, 0x74, 0x61, 0x72, 0x74,
-	0x43, 0x6f, 0x6e, 0x73, 0x6f, 0x6c, 0x65, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12,
-	0x46, 0x0a, 0x09, 0x72, 0x65, 0x73, 0x75, 0x6c, 0x74, 0x5f, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01,
-	0x28, 0x0b, 0x32, 0x29, 0x2e, 0x69, 0x6f, 0x2e, 0x64, 0x65, 0x65, 0x70, 0x68, 0x61, 0x76, 0x65,
-	0x6e, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x62, 0x61, 0x63, 0x6b, 0x70, 0x6c, 0x61, 0x6e,
-	0x65, 0x2e, 0x67, 0x72, 0x70, 0x63, 0x2e, 0x54, 0x69, 0x63, 0x6b, 0x65, 0x74, 0x52, 0x08, 0x72,
-	0x65, 0x73, 0x75, 0x6c, 0x74, 0x49, 0x64, 0x22, 0x14, 0x0a, 0x12, 0x47, 0x65, 0x74, 0x48, 0x65,
-	0x61, 0x70, 0x49, 0x6e, 0x66, 0x6f, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x22, 0x84, 0x01,
-	0x0a, 0x13, 0x47, 0x65, 0x74, 0x48, 0x65, 0x61, 0x70, 0x49, 0x6e, 0x66, 0x6f, 0x52, 0x65, 0x73,
-	0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x21, 0x0a, 0x0a, 0x6d, 0x61, 0x78, 0x5f, 0x6d, 0x65, 0x6d,
-	0x6f, 0x72, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x03, 0x42, 0x02, 0x30, 0x01, 0x52, 0x09, 0x6d,
-	0x61, 0x78, 0x4d, 0x65, 0x6d, 0x6f, 0x72, 0x79, 0x12, 0x25, 0x0a, 0x0c, 0x74, 0x6f, 0x74, 0x61,
-	0x6c, 0x5f, 0x6d, 0x65, 0x6d, 0x6f, 0x72, 0x79, 0x18, 0x02, 0x20, 0x01, 0x28, 0x03, 0x42, 0x02,
-	0x30, 0x01, 0x52, 0x0b, 0x74, 0x6f, 0x74, 0x61, 0x6c, 0x4d, 0x65, 0x6d, 0x6f, 0x72, 0x79, 0x12,
-	0x23, 0x0a, 0x0b, 0x66, 0x72, 0x65, 0x65, 0x5f, 0x6d, 0x65, 0x6d, 0x6f, 0x72, 0x79, 0x18, 0x03,
-	0x20, 0x01, 0x28, 0x03, 0x42, 0x02, 0x30, 0x01, 0x52, 0x0a, 0x66, 0x72, 0x65, 0x65, 0x4d, 0x65,
-	0x6d, 0x6f, 0x72, 0x79, 0x22, 0x6b, 0x0a, 0x16, 0x4c, 0x6f, 0x67, 0x53, 0x75, 0x62, 0x73, 0x63,
-	0x72, 0x69, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x39,
-	0x0a, 0x17, 0x6c, 0x61, 0x73, 0x74, 0x5f, 0x73, 0x65, 0x65, 0x6e, 0x5f, 0x6c, 0x6f, 0x67, 0x5f,
-	0x74, 0x69, 0x6d, 0x65, 0x73, 0x74, 0x61, 0x6d, 0x70, 0x18, 0x01, 0x20, 0x01, 0x28, 0x03, 0x42,
-	0x02, 0x30, 0x01, 0x52, 0x14, 0x6c, 0x61, 0x73, 0x74, 0x53, 0x65, 0x65, 0x6e, 0x4c, 0x6f, 0x67,
-	0x54, 0x69, 0x6d, 0x65, 0x73, 0x74, 0x61, 0x6d, 0x70, 0x12, 0x16, 0x0a, 0x06, 0x6c, 0x65, 0x76,
-	0x65, 0x6c, 0x73, 0x18, 0x02, 0x20, 0x03, 0x28, 0x09, 0x52, 0x06, 0x6c, 0x65, 0x76, 0x65, 0x6c,
-	0x73, 0x22, 0x6e, 0x0a, 0x13, 0x4c, 0x6f, 0x67, 0x53, 0x75, 0x62, 0x73, 0x63, 0x72, 0x69, 0x70,
-	0x74, 0x69, 0x6f, 0x6e, 0x44, 0x61, 0x74, 0x61, 0x12, 0x1a, 0x0a, 0x06, 0x6d, 0x69, 0x63, 0x72,
-	0x6f, 0x73, 0x18, 0x01, 0x20, 0x01, 0x28, 0x03, 0x42, 0x02, 0x30, 0x01, 0x52, 0x06, 0x6d, 0x69,
-	0x63, 0x72, 0x6f, 0x73, 0x12, 0x1b, 0x0a, 0x09, 0x6c, 0x6f, 0x67, 0x5f, 0x6c, 0x65, 0x76, 0x65,
-	0x6c, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x08, 0x6c, 0x6f, 0x67, 0x4c, 0x65, 0x76, 0x65,
-	0x6c, 0x12, 0x18, 0x0a, 0x07, 0x6d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x18, 0x03, 0x20, 0x01,
-	0x28, 0x09, 0x52, 0x07, 0x6d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x4a, 0x04, 0x08, 0x04, 0x10,
-	0x05, 0x22, 0x7b, 0x0a, 0x15, 0x45, 0x78, 0x65, 0x63, 0x75, 0x74, 0x65, 0x43, 0x6f, 0x6d, 0x6d,
-	0x61, 0x6e, 0x64, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x48, 0x0a, 0x0a, 0x63, 0x6f,
-	0x6e, 0x73, 0x6f, 0x6c, 0x65, 0x5f, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x29,
+var file_deephaven_core_proto_console_proto_rawDesc = []byte{
+	0x0a, 0x22, 0x64, 0x65, 0x65, 0x70, 0x68, 0x61, 0x76, 0x65, 0x6e, 0x5f, 0x63, 0x6f, 0x72, 0x65,
+	0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2f, 0x63, 0x6f, 0x6e, 0x73, 0x6f, 0x6c, 0x65, 0x2e, 0x70,
+	0x72, 0x6f, 0x74, 0x6f, 0x12, 0x28, 0x69, 0x6f, 0x2e, 0x64, 0x65, 0x65, 0x70, 0x68, 0x61, 0x76,
+	0x65, 0x6e, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x62, 0x61, 0x63, 0x6b, 0x70, 0x6c, 0x61,
+	0x6e, 0x65, 0x2e, 0x73, 0x63, 0x72, 0x69, 0x70, 0x74, 0x2e, 0x67, 0x72, 0x70, 0x63, 0x1a, 0x21,
+	0x64, 0x65, 0x65, 0x70, 0x68, 0x61, 0x76, 0x65, 0x6e, 0x5f, 0x63, 0x6f, 0x72, 0x65, 0x2f, 0x70,
+	0x72, 0x6f, 0x74, 0x6f, 0x2f, 0x74, 0x69, 0x63, 0x6b, 0x65, 0x74, 0x2e, 0x70, 0x72, 0x6f, 0x74,
+	0x6f, 0x1a, 0x26, 0x64, 0x65, 0x65, 0x70, 0x68, 0x61, 0x76, 0x65, 0x6e, 0x5f, 0x63, 0x6f, 0x72,
+	0x65, 0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2f, 0x61, 0x70, 0x70, 0x6c, 0x69, 0x63, 0x61, 0x74,
+	0x69, 0x6f, 0x6e, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x22, 0x18, 0x0a, 0x16, 0x47, 0x65, 0x74,
+	0x43, 0x6f, 0x6e, 0x73, 0x6f, 0x6c, 0x65, 0x54, 0x79, 0x70, 0x65, 0x73, 0x52, 0x65, 0x71, 0x75,
+	0x65, 0x73, 0x74, 0x22, 0x3e, 0x0a, 0x17, 0x47, 0x65, 0x74, 0x43, 0x6f, 0x6e, 0x73, 0x6f, 0x6c,
+	0x65, 0x54, 0x79, 0x70, 0x65, 0x73, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x23,
+	0x0a, 0x0d, 0x63, 0x6f, 0x6e, 0x73, 0x6f, 0x6c, 0x65, 0x5f, 0x74, 0x79, 0x70, 0x65, 0x73, 0x18,
+	0x01, 0x20, 0x03, 0x28, 0x09, 0x52, 0x0c, 0x63, 0x6f, 0x6e, 0x73, 0x6f, 0x6c, 0x65, 0x54, 0x79,
+	0x70, 0x65, 0x73, 0x22, 0x80, 0x01, 0x0a, 0x13, 0x53, 0x74, 0x61, 0x72, 0x74, 0x43, 0x6f, 0x6e,
+	0x73, 0x6f, 0x6c, 0x65, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x46, 0x0a, 0x09, 0x72,
+	0x65, 0x73, 0x75, 0x6c, 0x74, 0x5f, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x29,
 	0x2e, 0x69, 0x6f, 0x2e, 0x64, 0x65, 0x65, 0x70, 0x68, 0x61, 0x76, 0x65, 0x6e, 0x2e, 0x70, 0x72,
 	0x6f, 0x74, 0x6f, 0x2e, 0x62, 0x61, 0x63, 0x6b, 0x70, 0x6c, 0x61, 0x6e, 0x65, 0x2e, 0x67, 0x72,
-	0x70, 0x63, 0x2e, 0x54, 0x69, 0x63, 0x6b, 0x65, 0x74, 0x52, 0x09, 0x63, 0x6f, 0x6e, 0x73, 0x6f,
-	0x6c, 0x65, 0x49, 0x64, 0x12, 0x12, 0x0a, 0x04, 0x63, 0x6f, 0x64, 0x65, 0x18, 0x03, 0x20, 0x01,
-	0x28, 0x09, 0x52, 0x04, 0x63, 0x6f, 0x64, 0x65, 0x4a, 0x04, 0x08, 0x02, 0x10, 0x03, 0x22, 0x8e,
-	0x01, 0x0a, 0x16, 0x45, 0x78, 0x65, 0x63, 0x75, 0x74, 0x65, 0x43, 0x6f, 0x6d, 0x6d, 0x61, 0x6e,
-	0x64, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x23, 0x0a, 0x0d, 0x65, 0x72, 0x72,
-	0x6f, 0x72, 0x5f, 0x6d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09,
-	0x52, 0x0c, 0x65, 0x72, 0x72, 0x6f, 0x72, 0x4d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x12, 0x4f,
-	0x0a, 0x07, 0x63, 0x68, 0x61, 0x6e, 0x67, 0x65, 0x73, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32,
-	0x35, 0x2e, 0x69, 0x6f, 0x2e, 0x64, 0x65, 0x65, 0x70, 0x68, 0x61, 0x76, 0x65, 0x6e, 0x2e, 0x70,
-	0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x62, 0x61, 0x63, 0x6b, 0x70, 0x6c, 0x61, 0x6e, 0x65, 0x2e, 0x67,
-	0x72, 0x70, 0x63, 0x2e, 0x46, 0x69, 0x65, 0x6c, 0x64, 0x73, 0x43, 0x68, 0x61, 0x6e, 0x67, 0x65,
-	0x55, 0x70, 0x64, 0x61, 0x74, 0x65, 0x52, 0x07, 0x63, 0x68, 0x61, 0x6e, 0x67, 0x65, 0x73, 0x22,
-	0xd7, 0x01, 0x0a, 0x1a, 0x42, 0x69, 0x6e, 0x64, 0x54, 0x61, 0x62, 0x6c, 0x65, 0x54, 0x6f, 0x56,
-	0x61, 0x72, 0x69, 0x61, 0x62, 0x6c, 0x65, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x48,
-	0x0a, 0x0a, 0x63, 0x6f, 0x6e, 0x73, 0x6f, 0x6c, 0x65, 0x5f, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01,
-	0x28, 0x0b, 0x32, 0x29, 0x2e, 0x69, 0x6f, 0x2e, 0x64, 0x65, 0x65, 0x70, 0x68, 0x61, 0x76, 0x65,
-	0x6e, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x62, 0x61, 0x63, 0x6b, 0x70, 0x6c, 0x61, 0x6e,
-	0x65, 0x2e, 0x67, 0x72, 0x70, 0x63, 0x2e, 0x54, 0x69, 0x63, 0x6b, 0x65, 0x74, 0x52, 0x09, 0x63,
-	0x6f, 0x6e, 0x73, 0x6f, 0x6c, 0x65, 0x49, 0x64, 0x12, 0x23, 0x0a, 0x0d, 0x76, 0x61, 0x72, 0x69,
-	0x61, 0x62, 0x6c, 0x65, 0x5f, 0x6e, 0x61, 0x6d, 0x65, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x52,
-	0x0c, 0x76, 0x61, 0x72, 0x69, 0x61, 0x62, 0x6c, 0x65, 0x4e, 0x61, 0x6d, 0x65, 0x12, 0x44, 0x0a,
-	0x08, 0x74, 0x61, 0x62, 0x6c, 0x65, 0x5f, 0x69, 0x64, 0x18, 0x04, 0x20, 0x01, 0x28, 0x0b, 0x32,
-	0x29, 0x2e, 0x69, 0x6f, 0x2e, 0x64, 0x65, 0x65, 0x70, 0x68, 0x61, 0x76, 0x65, 0x6e, 0x2e, 0x70,
-	0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x62, 0x61, 0x63, 0x6b, 0x70, 0x6c, 0x61, 0x6e, 0x65, 0x2e, 0x67,
-	0x72, 0x70, 0x63, 0x2e, 0x54, 0x69, 0x63, 0x6b, 0x65, 0x74, 0x52, 0x07, 0x74, 0x61, 0x62, 0x6c,
-	0x65, 0x49, 0x64, 0x4a, 0x04, 0x08, 0x02, 0x10, 0x03, 0x22, 0x1d, 0x0a, 0x1b, 0x42, 0x69, 0x6e,
-	0x64, 0x54, 0x61, 0x62, 0x6c, 0x65, 0x54, 0x6f, 0x56, 0x61, 0x72, 0x69, 0x61, 0x62, 0x6c, 0x65,
-	0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0xaa, 0x01, 0x0a, 0x14, 0x43, 0x61, 0x6e,
-	0x63, 0x65, 0x6c, 0x43, 0x6f, 0x6d, 0x6d, 0x61, 0x6e, 0x64, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73,
-	0x74, 0x12, 0x48, 0x0a, 0x0a, 0x63, 0x6f, 0x6e, 0x73, 0x6f, 0x6c, 0x65, 0x5f, 0x69, 0x64, 0x18,
-	0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x29, 0x2e, 0x69, 0x6f, 0x2e, 0x64, 0x65, 0x65, 0x70, 0x68,
-	0x61, 0x76, 0x65, 0x6e, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x62, 0x61, 0x63, 0x6b, 0x70,
-	0x6c, 0x61, 0x6e, 0x65, 0x2e, 0x67, 0x72, 0x70, 0x63, 0x2e, 0x54, 0x69, 0x63, 0x6b, 0x65, 0x74,
-	0x52, 0x09, 0x63, 0x6f, 0x6e, 0x73, 0x6f, 0x6c, 0x65, 0x49, 0x64, 0x12, 0x48, 0x0a, 0x0a, 0x63,
-	0x6f, 0x6d, 0x6d, 0x61, 0x6e, 0x64, 0x5f, 0x69, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32,
-	0x29, 0x2e, 0x69, 0x6f, 0x2e, 0x64, 0x65, 0x65, 0x70, 0x68, 0x61, 0x76, 0x65, 0x6e, 0x2e, 0x70,
-	0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x62, 0x61, 0x63, 0x6b, 0x70, 0x6c, 0x61, 0x6e, 0x65, 0x2e, 0x67,
-	0x72, 0x70, 0x63, 0x2e, 0x54, 0x69, 0x63, 0x6b, 0x65, 0x74, 0x52, 0x09, 0x63, 0x6f, 0x6d, 0x6d,
-	0x61, 0x6e, 0x64, 0x49, 0x64, 0x22, 0x17, 0x0a, 0x15, 0x43, 0x61, 0x6e, 0x63, 0x65, 0x6c, 0x43,
-	0x6f, 0x6d, 0x6d, 0x61, 0x6e, 0x64, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x84,
-	0x01, 0x0a, 0x19, 0x43, 0x61, 0x6e, 0x63, 0x65, 0x6c, 0x41, 0x75, 0x74, 0x6f, 0x43, 0x6f, 0x6d,
-	0x70, 0x6c, 0x65, 0x74, 0x65, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x48, 0x0a, 0x0a,
-	0x63, 0x6f, 0x6e, 0x73, 0x6f, 0x6c, 0x65, 0x5f, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b,
-	0x32, 0x29, 0x2e, 0x69, 0x6f, 0x2e, 0x64, 0x65, 0x65, 0x70, 0x68, 0x61, 0x76, 0x65, 0x6e, 0x2e,
-	0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x62, 0x61, 0x63, 0x6b, 0x70, 0x6c, 0x61, 0x6e, 0x65, 0x2e,
-	0x67, 0x72, 0x70, 0x63, 0x2e, 0x54, 0x69, 0x63, 0x6b, 0x65, 0x74, 0x52, 0x09, 0x63, 0x6f, 0x6e,
-	0x73, 0x6f, 0x6c, 0x65, 0x49, 0x64, 0x12, 0x1d, 0x0a, 0x0a, 0x72, 0x65, 0x71, 0x75, 0x65, 0x73,
-	0x74, 0x5f, 0x69, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x09, 0x72, 0x65, 0x71, 0x75,
-	0x65, 0x73, 0x74, 0x49, 0x64, 0x22, 0x1c, 0x0a, 0x1a, 0x43, 0x61, 0x6e, 0x63, 0x65, 0x6c, 0x41,
-	0x75, 0x74, 0x6f, 0x43, 0x6f, 0x6d, 0x70, 0x6c, 0x65, 0x74, 0x65, 0x52, 0x65, 0x73, 0x70, 0x6f,
-	0x6e, 0x73, 0x65, 0x22, 0xf3, 0x06, 0x0a, 0x13, 0x41, 0x75, 0x74, 0x6f, 0x43, 0x6f, 0x6d, 0x70,
+	0x70, 0x63, 0x2e, 0x54, 0x69, 0x63, 0x6b, 0x65, 0x74, 0x52, 0x08, 0x72, 0x65, 0x73, 0x75, 0x6c,
+	0x74, 0x49, 0x64, 0x12, 0x21, 0x0a, 0x0c, 0x73, 0x65, 0x73, 0x73, 0x69, 0x6f, 0x6e, 0x5f, 0x74,
+	0x79, 0x70, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0b, 0x73, 0x65, 0x73, 0x73, 0x69,
+	0x6f, 0x6e, 0x54, 0x79, 0x70, 0x65, 0x22, 0x5e, 0x0a, 0x14, 0x53, 0x74, 0x61, 0x72, 0x74, 0x43,
+	0x6f, 0x6e, 0x73, 0x6f, 0x6c, 0x65, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x46,
+	0x0a, 0x09, 0x72, 0x65, 0x73, 0x75, 0x6c, 0x74, 0x5f, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28,
+	0x0b, 0x32, 0x29, 0x2e, 0x69, 0x6f, 0x2e, 0x64, 0x65, 0x65, 0x70, 0x68, 0x61, 0x76, 0x65, 0x6e,
+	0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x62, 0x61, 0x63, 0x6b, 0x70, 0x6c, 0x61, 0x6e, 0x65,
+	0x2e, 0x67, 0x72, 0x70, 0x63, 0x2e, 0x54, 0x69, 0x63, 0x6b, 0x65, 0x74, 0x52, 0x08, 0x72, 0x65,
+	0x73, 0x75, 0x6c, 0x74, 0x49, 0x64, 0x22, 0x14, 0x0a, 0x12, 0x47, 0x65, 0x74, 0x48, 0x65, 0x61,
+	0x70, 0x49, 0x6e, 0x66, 0x6f, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x22, 0x84, 0x01, 0x0a,
+	0x13, 0x47, 0x65, 0x74, 0x48, 0x65, 0x61, 0x70, 0x49, 0x6e, 0x66, 0x6f, 0x52, 0x65, 0x73, 0x70,
+	0x6f, 0x6e, 0x73, 0x65, 0x12, 0x21, 0x0a, 0x0a, 0x6d, 0x61, 0x78, 0x5f, 0x6d, 0x65, 0x6d, 0x6f,
+	0x72, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x03, 0x42, 0x02, 0x30, 0x01, 0x52, 0x09, 0x6d, 0x61,
+	0x78, 0x4d, 0x65, 0x6d, 0x6f, 0x72, 0x79, 0x12, 0x25, 0x0a, 0x0c, 0x74, 0x6f, 0x74, 0x61, 0x6c,
+	0x5f, 0x6d, 0x65, 0x6d, 0x6f, 0x72, 0x79, 0x18, 0x02, 0x20, 0x01, 0x28, 0x03, 0x42, 0x02, 0x30,
+	0x01, 0x52, 0x0b, 0x74, 0x6f, 0x74, 0x61, 0x6c, 0x4d, 0x65, 0x6d, 0x6f, 0x72, 0x79, 0x12, 0x23,
+	0x0a, 0x0b, 0x66, 0x72, 0x65, 0x65, 0x5f, 0x6d, 0x65, 0x6d, 0x6f, 0x72, 0x79, 0x18, 0x03, 0x20,
+	0x01, 0x28, 0x03, 0x42, 0x02, 0x30, 0x01, 0x52, 0x0a, 0x66, 0x72, 0x65, 0x65, 0x4d, 0x65, 0x6d,
+	0x6f, 0x72, 0x79, 0x22, 0x6b, 0x0a, 0x16, 0x4c, 0x6f, 0x67, 0x53, 0x75, 0x62, 0x73, 0x63, 0x72,
+	0x69, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x39, 0x0a,
+	0x17, 0x6c, 0x61, 0x73, 0x74, 0x5f, 0x73, 0x65, 0x65, 0x6e, 0x5f, 0x6c, 0x6f, 0x67, 0x5f, 0x74,
+	0x69, 0x6d, 0x65, 0x73, 0x74, 0x61, 0x6d, 0x70, 0x18, 0x01, 0x20, 0x01, 0x28, 0x03, 0x42, 0x02,
+	0x30, 0x01, 0x52, 0x14, 0x6c, 0x61, 0x73, 0x74, 0x53, 0x65, 0x65, 0x6e, 0x4c, 0x6f, 0x67, 0x54,
+	0x69, 0x6d, 0x65, 0x73, 0x74, 0x61, 0x6d, 0x70, 0x12, 0x16, 0x0a, 0x06, 0x6c, 0x65, 0x76, 0x65,
+	0x6c, 0x73, 0x18, 0x02, 0x20, 0x03, 0x28, 0x09, 0x52, 0x06, 0x6c, 0x65, 0x76, 0x65, 0x6c, 0x73,
+	0x22, 0x6e, 0x0a, 0x13, 0x4c, 0x6f, 0x67, 0x53, 0x75, 0x62, 0x73, 0x63, 0x72, 0x69, 0x70, 0x74,
+	0x69, 0x6f, 0x6e, 0x44, 0x61, 0x74, 0x61, 0x12, 0x1a, 0x0a, 0x06, 0x6d, 0x69, 0x63, 0x72, 0x6f,
+	0x73, 0x18, 0x01, 0x20, 0x01, 0x28, 0x03, 0x42, 0x02, 0x30, 0x01, 0x52, 0x06, 0x6d, 0x69, 0x63,
+	0x72, 0x6f, 0x73, 0x12, 0x1b, 0x0a, 0x09, 0x6c, 0x6f, 0x67, 0x5f, 0x6c, 0x65, 0x76, 0x65, 0x6c,
+	0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x08, 0x6c, 0x6f, 0x67, 0x4c, 0x65, 0x76, 0x65, 0x6c,
+	0x12, 0x18, 0x0a, 0x07, 0x6d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x18, 0x03, 0x20, 0x01, 0x28,
+	0x09, 0x52, 0x07, 0x6d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x4a, 0x04, 0x08, 0x04, 0x10, 0x05,
+	0x22, 0x7b, 0x0a, 0x15, 0x45, 0x78, 0x65, 0x63, 0x75, 0x74, 0x65, 0x43, 0x6f, 0x6d, 0x6d, 0x61,
+	0x6e, 0x64, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x48, 0x0a, 0x0a, 0x63, 0x6f, 0x6e,
+	0x73, 0x6f, 0x6c, 0x65, 0x5f, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x29, 0x2e,
+	0x69, 0x6f, 0x2e, 0x64, 0x65, 0x65, 0x70, 0x68, 0x61, 0x76, 0x65, 0x6e, 0x2e, 0x70, 0x72, 0x6f,
+	0x74, 0x6f, 0x2e, 0x62, 0x61, 0x63, 0x6b, 0x70, 0x6c, 0x61, 0x6e, 0x65, 0x2e, 0x67, 0x72, 0x70,
+	0x63, 0x2e, 0x54, 0x69, 0x63, 0x6b, 0x65, 0x74, 0x52, 0x09, 0x63, 0x6f, 0x6e, 0x73, 0x6f, 0x6c,
+	0x65, 0x49, 0x64, 0x12, 0x12, 0x0a, 0x04, 0x63, 0x6f, 0x64, 0x65, 0x18, 0x03, 0x20, 0x01, 0x28,
+	0x09, 0x52, 0x04, 0x63, 0x6f, 0x64, 0x65, 0x4a, 0x04, 0x08, 0x02, 0x10, 0x03, 0x22, 0x8e, 0x01,
+	0x0a, 0x16, 0x45, 0x78, 0x65, 0x63, 0x75, 0x74, 0x65, 0x43, 0x6f, 0x6d, 0x6d, 0x61, 0x6e, 0x64,
+	0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x23, 0x0a, 0x0d, 0x65, 0x72, 0x72, 0x6f,
+	0x72, 0x5f, 0x6d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52,
+	0x0c, 0x65, 0x72, 0x72, 0x6f, 0x72, 0x4d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x12, 0x4f, 0x0a,
+	0x07, 0x63, 0x68, 0x61, 0x6e, 0x67, 0x65, 0x73, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x35,
+	0x2e, 0x69, 0x6f, 0x2e, 0x64, 0x65, 0x65, 0x70, 0x68, 0x61, 0x76, 0x65, 0x6e, 0x2e, 0x70, 0x72,
+	0x6f, 0x74, 0x6f, 0x2e, 0x62, 0x61, 0x63, 0x6b, 0x70, 0x6c, 0x61, 0x6e, 0x65, 0x2e, 0x67, 0x72,
+	0x70, 0x63, 0x2e, 0x46, 0x69, 0x65, 0x6c, 0x64, 0x73, 0x43, 0x68, 0x61, 0x6e, 0x67, 0x65, 0x55,
+	0x70, 0x64, 0x61, 0x74, 0x65, 0x52, 0x07, 0x63, 0x68, 0x61, 0x6e, 0x67, 0x65, 0x73, 0x22, 0xd7,
+	0x01, 0x0a, 0x1a, 0x42, 0x69, 0x6e, 0x64, 0x54, 0x61, 0x62, 0x6c, 0x65, 0x54, 0x6f, 0x56, 0x61,
+	0x72, 0x69, 0x61, 0x62, 0x6c, 0x65, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x48, 0x0a,
+	0x0a, 0x63, 0x6f, 0x6e, 0x73, 0x6f, 0x6c, 0x65, 0x5f, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28,
+	0x0b, 0x32, 0x29, 0x2e, 0x69, 0x6f, 0x2e, 0x64, 0x65, 0x65, 0x70, 0x68, 0x61, 0x76, 0x65, 0x6e,
+	0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x62, 0x61, 0x63, 0x6b, 0x70, 0x6c, 0x61, 0x6e, 0x65,
+	0x2e, 0x67, 0x72, 0x70, 0x63, 0x2e, 0x54, 0x69, 0x63, 0x6b, 0x65, 0x74, 0x52, 0x09, 0x63, 0x6f,
+	0x6e, 0x73, 0x6f, 0x6c, 0x65, 0x49, 0x64, 0x12, 0x23, 0x0a, 0x0d, 0x76, 0x61, 0x72, 0x69, 0x61,
+	0x62, 0x6c, 0x65, 0x5f, 0x6e, 0x61, 0x6d, 0x65, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0c,
+	0x76, 0x61, 0x72, 0x69, 0x61, 0x62, 0x6c, 0x65, 0x4e, 0x61, 0x6d, 0x65, 0x12, 0x44, 0x0a, 0x08,
+	0x74, 0x61, 0x62, 0x6c, 0x65, 0x5f, 0x69, 0x64, 0x18, 0x04, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x29,
+	0x2e, 0x69, 0x6f, 0x2e, 0x64, 0x65, 0x65, 0x70, 0x68, 0x61, 0x76, 0x65, 0x6e, 0x2e, 0x70, 0x72,
+	0x6f, 0x74, 0x6f, 0x2e, 0x62, 0x61, 0x63, 0x6b, 0x70, 0x6c, 0x61, 0x6e, 0x65, 0x2e, 0x67, 0x72,
+	0x70, 0x63, 0x2e, 0x54, 0x69, 0x63, 0x6b, 0x65, 0x74, 0x52, 0x07, 0x74, 0x61, 0x62, 0x6c, 0x65,
+	0x49, 0x64, 0x4a, 0x04, 0x08, 0x02, 0x10, 0x03, 0x22, 0x1d, 0x0a, 0x1b, 0x42, 0x69, 0x6e, 0x64,
+	0x54, 0x61, 0x62, 0x6c, 0x65, 0x54, 0x6f, 0x56, 0x61, 0x72, 0x69, 0x61, 0x62, 0x6c, 0x65, 0x52,
+	0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0xaa, 0x01, 0x0a, 0x14, 0x43, 0x61, 0x6e, 0x63,
+	0x65, 0x6c, 0x43, 0x6f, 0x6d, 0x6d, 0x61, 0x6e, 0x64, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74,
+	0x12, 0x48, 0x0a, 0x0a, 0x63, 0x6f, 0x6e, 0x73, 0x6f, 0x6c, 0x65, 0x5f, 0x69, 0x64, 0x18, 0x01,
+	0x20, 0x01, 0x28, 0x0b, 0x32, 0x29, 0x2e, 0x69, 0x6f, 0x2e, 0x64, 0x65, 0x65, 0x70, 0x68, 0x61,
+	0x76, 0x65, 0x6e, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x62, 0x61, 0x63, 0x6b, 0x70, 0x6c,
+	0x61, 0x6e, 0x65, 0x2e, 0x67, 0x72, 0x70, 0x63, 0x2e, 0x54, 0x69, 0x63, 0x6b, 0x65, 0x74, 0x52,
+	0x09, 0x63, 0x6f, 0x6e, 0x73, 0x6f, 0x6c, 0x65, 0x49, 0x64, 0x12, 0x48, 0x0a, 0x0a, 0x63, 0x6f,
+	0x6d, 0x6d, 0x61, 0x6e, 0x64, 0x5f, 0x69, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x29,
+	0x2e, 0x69, 0x6f, 0x2e, 0x64, 0x65, 0x65, 0x70, 0x68, 0x61, 0x76, 0x65, 0x6e, 0x2e, 0x70, 0x72,
+	0x6f, 0x74, 0x6f, 0x2e, 0x62, 0x61, 0x63, 0x6b, 0x70, 0x6c, 0x61, 0x6e, 0x65, 0x2e, 0x67, 0x72,
+	0x70, 0x63, 0x2e, 0x54, 0x69, 0x63, 0x6b, 0x65, 0x74, 0x52, 0x09, 0x63, 0x6f, 0x6d, 0x6d, 0x61,
+	0x6e, 0x64, 0x49, 0x64, 0x22, 0x17, 0x0a, 0x15, 0x43, 0x61, 0x6e, 0x63, 0x65, 0x6c, 0x43, 0x6f,
+	0x6d, 0x6d, 0x61, 0x6e, 0x64, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x84, 0x01,
+	0x0a, 0x19, 0x43, 0x61, 0x6e, 0x63, 0x65, 0x6c, 0x41, 0x75, 0x74, 0x6f, 0x43, 0x6f, 0x6d, 0x70,
 	0x6c, 0x65, 0x74, 0x65, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x48, 0x0a, 0x0a, 0x63,
-	0x6f, 0x6e, 0x73, 0x6f, 0x6c, 0x65, 0x5f, 0x69, 0x64, 0x18, 0x05, 0x20, 0x01, 0x28, 0x0b, 0x32,
+	0x6f, 0x6e, 0x73, 0x6f, 0x6c, 0x65, 0x5f, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32,
 	0x29, 0x2e, 0x69, 0x6f, 0x2e, 0x64, 0x65, 0x65, 0x70, 0x68, 0x61, 0x76, 0x65, 0x6e, 0x2e, 0x70,
 	0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x62, 0x61, 0x63, 0x6b, 0x70, 0x6c, 0x61, 0x6e, 0x65, 0x2e, 0x67,
 	0x72, 0x70, 0x63, 0x2e, 0x54, 0x69, 0x63, 0x6b, 0x65, 0x74, 0x52, 0x09, 0x63, 0x6f, 0x6e, 0x73,
 	0x6f, 0x6c, 0x65, 0x49, 0x64, 0x12, 0x1d, 0x0a, 0x0a, 0x72, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74,
-	0x5f, 0x69, 0x64, 0x18, 0x06, 0x20, 0x01, 0x28, 0x05, 0x52, 0x09, 0x72, 0x65, 0x71, 0x75, 0x65,
-	0x73, 0x74, 0x49, 0x64, 0x12, 0x64, 0x0a, 0x0d, 0x6f, 0x70, 0x65, 0x6e, 0x5f, 0x64, 0x6f, 0x63,
-	0x75, 0x6d, 0x65, 0x6e, 0x74, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x3d, 0x2e, 0x69, 0x6f,
-	0x2e, 0x64, 0x65, 0x65, 0x70, 0x68, 0x61, 0x76, 0x65, 0x6e, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f,
-	0x2e, 0x62, 0x61, 0x63, 0x6b, 0x70, 0x6c, 0x61, 0x6e, 0x65, 0x2e, 0x73, 0x63, 0x72, 0x69, 0x70,
-	0x74, 0x2e, 0x67, 0x72, 0x70, 0x63, 0x2e, 0x4f, 0x70, 0x65, 0x6e, 0x44, 0x6f, 0x63, 0x75, 0x6d,
-	0x65, 0x6e, 0x74, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x48, 0x00, 0x52, 0x0c, 0x6f, 0x70,
-	0x65, 0x6e, 0x44, 0x6f, 0x63, 0x75, 0x6d, 0x65, 0x6e, 0x74, 0x12, 0x6a, 0x0a, 0x0f, 0x63, 0x68,
-	0x61, 0x6e, 0x67, 0x65, 0x5f, 0x64, 0x6f, 0x63, 0x75, 0x6d, 0x65, 0x6e, 0x74, 0x18, 0x02, 0x20,
-	0x01, 0x28, 0x0b, 0x32, 0x3f, 0x2e, 0x69, 0x6f, 0x2e, 0x64, 0x65, 0x65, 0x70, 0x68, 0x61, 0x76,
+	0x5f, 0x69, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x09, 0x72, 0x65, 0x71, 0x75, 0x65,
+	0x73, 0x74, 0x49, 0x64, 0x22, 0x1c, 0x0a, 0x1a, 0x43, 0x61, 0x6e, 0x63, 0x65, 0x6c, 0x41, 0x75,
+	0x74, 0x6f, 0x43, 0x6f, 0x6d, 0x70, 0x6c, 0x65, 0x74, 0x65, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e,
+	0x73, 0x65, 0x22, 0xf3, 0x06, 0x0a, 0x13, 0x41, 0x75, 0x74, 0x6f, 0x43, 0x6f, 0x6d, 0x70, 0x6c,
+	0x65, 0x74, 0x65, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x48, 0x0a, 0x0a, 0x63, 0x6f,
+	0x6e, 0x73, 0x6f, 0x6c, 0x65, 0x5f, 0x69, 0x64, 0x18, 0x05, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x29,
+	0x2e, 0x69, 0x6f, 0x2e, 0x64, 0x65, 0x65, 0x70, 0x68, 0x61, 0x76, 0x65, 0x6e, 0x2e, 0x70, 0x72,
+	0x6f, 0x74, 0x6f, 0x2e, 0x62, 0x61, 0x63, 0x6b, 0x70, 0x6c, 0x61, 0x6e, 0x65, 0x2e, 0x67, 0x72,
+	0x70, 0x63, 0x2e, 0x54, 0x69, 0x63, 0x6b, 0x65, 0x74, 0x52, 0x09, 0x63, 0x6f, 0x6e, 0x73, 0x6f,
+	0x6c, 0x65, 0x49, 0x64, 0x12, 0x1d, 0x0a, 0x0a, 0x72, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x5f,
+	0x69, 0x64, 0x18, 0x06, 0x20, 0x01, 0x28, 0x05, 0x52, 0x09, 0x72, 0x65, 0x71, 0x75, 0x65, 0x73,
+	0x74, 0x49, 0x64, 0x12, 0x64, 0x0a, 0x0d, 0x6f, 0x70, 0x65, 0x6e, 0x5f, 0x64, 0x6f, 0x63, 0x75,
+	0x6d, 0x65, 0x6e, 0x74, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x3d, 0x2e, 0x69, 0x6f, 0x2e,
+	0x64, 0x65, 0x65, 0x70, 0x68, 0x61, 0x76, 0x65, 0x6e, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e,
+	0x62, 0x61, 0x63, 0x6b, 0x70, 0x6c, 0x61, 0x6e, 0x65, 0x2e, 0x73, 0x63, 0x72, 0x69, 0x70, 0x74,
+	0x2e, 0x67, 0x72, 0x70, 0x63, 0x2e, 0x4f, 0x70, 0x65, 0x6e, 0x44, 0x6f, 0x63, 0x75, 0x6d, 0x65,
+	0x6e, 0x74, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x48, 0x00, 0x52, 0x0c, 0x6f, 0x70, 0x65,
+	0x6e, 0x44, 0x6f, 0x63, 0x75, 0x6d, 0x65, 0x6e, 0x74, 0x12, 0x6a, 0x0a, 0x0f, 0x63, 0x68, 0x61,
+	0x6e, 0x67, 0x65, 0x5f, 0x64, 0x6f, 0x63, 0x75, 0x6d, 0x65, 0x6e, 0x74, 0x18, 0x02, 0x20, 0x01,
+	0x28, 0x0b, 0x32, 0x3f, 0x2e, 0x69, 0x6f, 0x2e, 0x64, 0x65, 0x65, 0x70, 0x68, 0x61, 0x76, 0x65,
+	0x6e, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x62, 0x61, 0x63, 0x6b, 0x70, 0x6c, 0x61, 0x6e,
+	0x65, 0x2e, 0x73, 0x63, 0x72, 0x69, 0x70, 0x74, 0x2e, 0x67, 0x72, 0x70, 0x63, 0x2e, 0x43, 0x68,
+	0x61, 0x6e, 0x67, 0x65, 0x44, 0x6f, 0x63, 0x75, 0x6d, 0x65, 0x6e, 0x74, 0x52, 0x65, 0x71, 0x75,
+	0x65, 0x73, 0x74, 0x48, 0x00, 0x52, 0x0e, 0x63, 0x68, 0x61, 0x6e, 0x67, 0x65, 0x44, 0x6f, 0x63,
+	0x75, 0x6d, 0x65, 0x6e, 0x74, 0x12, 0x77, 0x0a, 0x14, 0x67, 0x65, 0x74, 0x5f, 0x63, 0x6f, 0x6d,
+	0x70, 0x6c, 0x65, 0x74, 0x69, 0x6f, 0x6e, 0x5f, 0x69, 0x74, 0x65, 0x6d, 0x73, 0x18, 0x03, 0x20,
+	0x01, 0x28, 0x0b, 0x32, 0x43, 0x2e, 0x69, 0x6f, 0x2e, 0x64, 0x65, 0x65, 0x70, 0x68, 0x61, 0x76,
 	0x65, 0x6e, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x62, 0x61, 0x63, 0x6b, 0x70, 0x6c, 0x61,
-	0x6e, 0x65, 0x2e, 0x73, 0x63, 0x72, 0x69, 0x70, 0x74, 0x2e, 0x67, 0x72, 0x70, 0x63, 0x2e, 0x43,
-	0x68, 0x61, 0x6e, 0x67, 0x65, 0x44, 0x6f, 0x63, 0x75, 0x6d, 0x65, 0x6e, 0x74, 0x52, 0x65, 0x71,
-	0x75, 0x65, 0x73, 0x74, 0x48, 0x00, 0x52, 0x0e, 0x63, 0x68, 0x61, 0x6e, 0x67, 0x65, 0x44, 0x6f,
-	0x63, 0x75, 0x6d, 0x65, 0x6e, 0x74, 0x12, 0x77, 0x0a, 0x14, 0x67, 0x65, 0x74, 0x5f, 0x63, 0x6f,
-	0x6d, 0x70, 0x6c, 0x65, 0x74, 0x69, 0x6f, 0x6e, 0x5f, 0x69, 0x74, 0x65, 0x6d, 0x73, 0x18, 0x03,
-	0x20, 0x01, 0x28, 0x0b, 0x32, 0x43, 0x2e, 0x69, 0x6f, 0x2e, 0x64, 0x65, 0x65, 0x70, 0x68, 0x61,
-	0x76, 0x65, 0x6e, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x62, 0x61, 0x63, 0x6b, 0x70, 0x6c,
-	0x61, 0x6e, 0x65, 0x2e, 0x73, 0x63, 0x72, 0x69, 0x70, 0x74, 0x2e, 0x67, 0x72, 0x70, 0x63, 0x2e,
-	0x47, 0x65, 0x74, 0x43, 0x6f, 0x6d, 0x70, 0x6c, 0x65, 0x74, 0x69, 0x6f, 0x6e, 0x49, 0x74, 0x65,
-	0x6d, 0x73, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x48, 0x00, 0x52, 0x12, 0x67, 0x65, 0x74,
-	0x43, 0x6f, 0x6d, 0x70, 0x6c, 0x65, 0x74, 0x69, 0x6f, 0x6e, 0x49, 0x74, 0x65, 0x6d, 0x73, 0x12,
-	0x71, 0x0a, 0x12, 0x67, 0x65, 0x74, 0x5f, 0x73, 0x69, 0x67, 0x6e, 0x61, 0x74, 0x75, 0x72, 0x65,
-	0x5f, 0x68, 0x65, 0x6c, 0x70, 0x18, 0x07, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x41, 0x2e, 0x69, 0x6f,
-	0x2e, 0x64, 0x65, 0x65, 0x70, 0x68, 0x61, 0x76, 0x65, 0x6e, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f,
-	0x2e, 0x62, 0x61, 0x63, 0x6b, 0x70, 0x6c, 0x61, 0x6e, 0x65, 0x2e, 0x73, 0x63, 0x72, 0x69, 0x70,
-	0x74, 0x2e, 0x67, 0x72, 0x70, 0x63, 0x2e, 0x47, 0x65, 0x74, 0x53, 0x69, 0x67, 0x6e, 0x61, 0x74,
-	0x75, 0x72, 0x65, 0x48, 0x65, 0x6c, 0x70, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x48, 0x00,
-	0x52, 0x10, 0x67, 0x65, 0x74, 0x53, 0x69, 0x67, 0x6e, 0x61, 0x74, 0x75, 0x72, 0x65, 0x48, 0x65,
-	0x6c, 0x70, 0x12, 0x58, 0x0a, 0x09, 0x67, 0x65, 0x74, 0x5f, 0x68, 0x6f, 0x76, 0x65, 0x72, 0x18,
-	0x08, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x39, 0x2e, 0x69, 0x6f, 0x2e, 0x64, 0x65, 0x65, 0x70, 0x68,
-	0x61, 0x76, 0x65, 0x6e, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x62, 0x61, 0x63, 0x6b, 0x70,
-	0x6c, 0x61, 0x6e, 0x65, 0x2e, 0x73, 0x63, 0x72, 0x69, 0x70, 0x74, 0x2e, 0x67, 0x72, 0x70, 0x63,
-	0x2e, 0x47, 0x65, 0x74, 0x48, 0x6f, 0x76, 0x65, 0x72, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74,
-	0x48, 0x00, 0x52, 0x08, 0x67, 0x65, 0x74, 0x48, 0x6f, 0x76, 0x65, 0x72, 0x12, 0x67, 0x0a, 0x0e,
-	0x67, 0x65, 0x74, 0x5f, 0x64, 0x69, 0x61, 0x67, 0x6e, 0x6f, 0x73, 0x74, 0x69, 0x63, 0x18, 0x09,
-	0x20, 0x01, 0x28, 0x0b, 0x32, 0x3e, 0x2e, 0x69, 0x6f, 0x2e, 0x64, 0x65, 0x65, 0x70, 0x68, 0x61,
+	0x6e, 0x65, 0x2e, 0x73, 0x63, 0x72, 0x69, 0x70, 0x74, 0x2e, 0x67, 0x72, 0x70, 0x63, 0x2e, 0x47,
+	0x65, 0x74, 0x43, 0x6f, 0x6d, 0x70, 0x6c, 0x65, 0x74, 0x69, 0x6f, 0x6e, 0x49, 0x74, 0x65, 0x6d,
+	0x73, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x48, 0x00, 0x52, 0x12, 0x67, 0x65, 0x74, 0x43,
+	0x6f, 0x6d, 0x70, 0x6c, 0x65, 0x74, 0x69, 0x6f, 0x6e, 0x49, 0x74, 0x65, 0x6d, 0x73, 0x12, 0x71,
+	0x0a, 0x12, 0x67, 0x65, 0x74, 0x5f, 0x73, 0x69, 0x67, 0x6e, 0x61, 0x74, 0x75, 0x72, 0x65, 0x5f,
+	0x68, 0x65, 0x6c, 0x70, 0x18, 0x07, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x41, 0x2e, 0x69, 0x6f, 0x2e,
+	0x64, 0x65, 0x65, 0x70, 0x68, 0x61, 0x76, 0x65, 0x6e, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e,
+	0x62, 0x61, 0x63, 0x6b, 0x70, 0x6c, 0x61, 0x6e, 0x65, 0x2e, 0x73, 0x63, 0x72, 0x69, 0x70, 0x74,
+	0x2e, 0x67, 0x72, 0x70, 0x63, 0x2e, 0x47, 0x65, 0x74, 0x53, 0x69, 0x67, 0x6e, 0x61, 0x74, 0x75,
+	0x72, 0x65, 0x48, 0x65, 0x6c, 0x70, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x48, 0x00, 0x52,
+	0x10, 0x67, 0x65, 0x74, 0x53, 0x69, 0x67, 0x6e, 0x61, 0x74, 0x75, 0x72, 0x65, 0x48, 0x65, 0x6c,
+	0x70, 0x12, 0x58, 0x0a, 0x09, 0x67, 0x65, 0x74, 0x5f, 0x68, 0x6f, 0x76, 0x65, 0x72, 0x18, 0x08,
+	0x20, 0x01, 0x28, 0x0b, 0x32, 0x39, 0x2e, 0x69, 0x6f, 0x2e, 0x64, 0x65, 0x65, 0x70, 0x68, 0x61,
 	0x76, 0x65, 0x6e, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x62, 0x61, 0x63, 0x6b, 0x70, 0x6c,
 	0x61, 0x6e, 0x65, 0x2e, 0x73, 0x63, 0x72, 0x69, 0x70, 0x74, 0x2e, 0x67, 0x72, 0x70, 0x63, 0x2e,
-	0x47, 0x65, 0x74, 0x44, 0x69, 0x61, 0x67, 0x6e, 0x6f, 0x73, 0x74, 0x69, 0x63, 0x52, 0x65, 0x71,
-	0x75, 0x65, 0x73, 0x74, 0x48, 0x00, 0x52, 0x0d, 0x67, 0x65, 0x74, 0x44, 0x69, 0x61, 0x67, 0x6e,
-	0x6f, 0x73, 0x74, 0x69, 0x63, 0x12, 0x67, 0x0a, 0x0e, 0x63, 0x6c, 0x6f, 0x73, 0x65, 0x5f, 0x64,
-	0x6f, 0x63, 0x75, 0x6d, 0x65, 0x6e, 0x74, 0x18, 0x04, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x3e, 0x2e,
-	0x69, 0x6f, 0x2e, 0x64, 0x65, 0x65, 0x70, 0x68, 0x61, 0x76, 0x65, 0x6e, 0x2e, 0x70, 0x72, 0x6f,
-	0x74, 0x6f, 0x2e, 0x62, 0x61, 0x63, 0x6b, 0x70, 0x6c, 0x61, 0x6e, 0x65, 0x2e, 0x73, 0x63, 0x72,
-	0x69, 0x70, 0x74, 0x2e, 0x67, 0x72, 0x70, 0x63, 0x2e, 0x43, 0x6c, 0x6f, 0x73, 0x65, 0x44, 0x6f,
-	0x63, 0x75, 0x6d, 0x65, 0x6e, 0x74, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x48, 0x00, 0x52,
-	0x0d, 0x63, 0x6c, 0x6f, 0x73, 0x65, 0x44, 0x6f, 0x63, 0x75, 0x6d, 0x65, 0x6e, 0x74, 0x42, 0x09,
-	0x0a, 0x07, 0x72, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x22, 0xe8, 0x04, 0x0a, 0x14, 0x41, 0x75,
-	0x74, 0x6f, 0x43, 0x6f, 0x6d, 0x70, 0x6c, 0x65, 0x74, 0x65, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e,
-	0x73, 0x65, 0x12, 0x1d, 0x0a, 0x0a, 0x72, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x5f, 0x69, 0x64,
-	0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x09, 0x72, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x49,
-	0x64, 0x12, 0x18, 0x0a, 0x07, 0x73, 0x75, 0x63, 0x63, 0x65, 0x73, 0x73, 0x18, 0x03, 0x20, 0x01,
-	0x28, 0x08, 0x52, 0x07, 0x73, 0x75, 0x63, 0x63, 0x65, 0x73, 0x73, 0x12, 0x71, 0x0a, 0x10, 0x63,
-	0x6f, 0x6d, 0x70, 0x6c, 0x65, 0x74, 0x69, 0x6f, 0x6e, 0x5f, 0x69, 0x74, 0x65, 0x6d, 0x73, 0x18,
-	0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x44, 0x2e, 0x69, 0x6f, 0x2e, 0x64, 0x65, 0x65, 0x70, 0x68,
-	0x61, 0x76, 0x65, 0x6e, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x62, 0x61, 0x63, 0x6b, 0x70,
-	0x6c, 0x61, 0x6e, 0x65, 0x2e, 0x73, 0x63, 0x72, 0x69, 0x70, 0x74, 0x2e, 0x67, 0x72, 0x70, 0x63,
-	0x2e, 0x47, 0x65, 0x74, 0x43, 0x6f, 0x6d, 0x70, 0x6c, 0x65, 0x74, 0x69, 0x6f, 0x6e, 0x49, 0x74,
-	0x65, 0x6d, 0x73, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x48, 0x00, 0x52, 0x0f, 0x63,
-	0x6f, 0x6d, 0x70, 0x6c, 0x65, 0x74, 0x69, 0x6f, 0x6e, 0x49, 0x74, 0x65, 0x6d, 0x73, 0x12, 0x64,
-	0x0a, 0x0a, 0x73, 0x69, 0x67, 0x6e, 0x61, 0x74, 0x75, 0x72, 0x65, 0x73, 0x18, 0x04, 0x20, 0x01,
-	0x28, 0x0b, 0x32, 0x42, 0x2e, 0x69, 0x6f, 0x2e, 0x64, 0x65, 0x65, 0x70, 0x68, 0x61, 0x76, 0x65,
-	0x6e, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x62, 0x61, 0x63, 0x6b, 0x70, 0x6c, 0x61, 0x6e,
-	0x65, 0x2e, 0x73, 0x63, 0x72, 0x69, 0x70, 0x74, 0x2e, 0x67, 0x72, 0x70, 0x63, 0x2e, 0x47, 0x65,
-	0x74, 0x53, 0x69, 0x67, 0x6e, 0x61, 0x74, 0x75, 0x72, 0x65, 0x48, 0x65, 0x6c, 0x70, 0x52, 0x65,
-	0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x48, 0x00, 0x52, 0x0a, 0x73, 0x69, 0x67, 0x6e, 0x61, 0x74,
-	0x75, 0x72, 0x65, 0x73, 0x12, 0x52, 0x0a, 0x05, 0x68, 0x6f, 0x76, 0x65, 0x72, 0x18, 0x05, 0x20,
-	0x01, 0x28, 0x0b, 0x32, 0x3a, 0x2e, 0x69, 0x6f, 0x2e, 0x64, 0x65, 0x65, 0x70, 0x68, 0x61, 0x76,
+	0x47, 0x65, 0x74, 0x48, 0x6f, 0x76, 0x65, 0x72, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x48,
+	0x00, 0x52, 0x08, 0x67, 0x65, 0x74, 0x48, 0x6f, 0x76, 0x65, 0x72, 0x12, 0x67, 0x0a, 0x0e, 0x67,
+	0x65, 0x74, 0x5f, 0x64, 0x69, 0x61, 0x67, 0x6e, 0x6f, 0x73, 0x74, 0x69, 0x63, 0x18, 0x09, 0x20,
+	0x01, 0x28, 0x0b, 0x32, 0x3e, 0x2e, 0x69, 0x6f, 0x2e, 0x64, 0x65, 0x65, 0x70, 0x68, 0x61, 0x76,
 	0x65, 0x6e, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x62, 0x61, 0x63, 0x6b, 0x70, 0x6c, 0x61,
 	0x6e, 0x65, 0x2e, 0x73, 0x63, 0x72, 0x69, 0x70, 0x74, 0x2e, 0x67, 0x72, 0x70, 0x63, 0x2e, 0x47,
-	0x65, 0x74, 0x48, 0x6f, 0x76, 0x65, 0x72, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x48,
-	0x00, 0x52, 0x05, 0x68, 0x6f, 0x76, 0x65, 0x72, 0x12, 0x65, 0x0a, 0x0a, 0x64, 0x69, 0x61, 0x67,
-	0x6e, 0x6f, 0x73, 0x74, 0x69, 0x63, 0x18, 0x06, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x43, 0x2e, 0x69,
+	0x65, 0x74, 0x44, 0x69, 0x61, 0x67, 0x6e, 0x6f, 0x73, 0x74, 0x69, 0x63, 0x52, 0x65, 0x71, 0x75,
+	0x65, 0x73, 0x74, 0x48, 0x00, 0x52, 0x0d, 0x67, 0x65, 0x74, 0x44, 0x69, 0x61, 0x67, 0x6e, 0x6f,
+	0x73, 0x74, 0x69, 0x63, 0x12, 0x67, 0x0a, 0x0e, 0x63, 0x6c, 0x6f, 0x73, 0x65, 0x5f, 0x64, 0x6f,
+	0x63, 0x75, 0x6d, 0x65, 0x6e, 0x74, 0x18, 0x04, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x3e, 0x2e, 0x69,
 	0x6f, 0x2e, 0x64, 0x65, 0x65, 0x70, 0x68, 0x61, 0x76, 0x65, 0x6e, 0x2e, 0x70, 0x72, 0x6f, 0x74,
 	0x6f, 0x2e, 0x62, 0x61, 0x63, 0x6b, 0x70, 0x6c, 0x61, 0x6e, 0x65, 0x2e, 0x73, 0x63, 0x72, 0x69,
-	0x70, 0x74, 0x2e, 0x67, 0x72, 0x70, 0x63, 0x2e, 0x47, 0x65, 0x74, 0x50, 0x75, 0x6c, 0x6c, 0x44,
-	0x69, 0x61, 0x67, 0x6e, 0x6f, 0x73, 0x74, 0x69, 0x63, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73,
-	0x65, 0x48, 0x00, 0x52, 0x0a, 0x64, 0x69, 0x61, 0x67, 0x6e, 0x6f, 0x73, 0x74, 0x69, 0x63, 0x12,
-	0x77, 0x0a, 0x12, 0x64, 0x69, 0x61, 0x67, 0x6e, 0x6f, 0x73, 0x74, 0x69, 0x63, 0x5f, 0x70, 0x75,
-	0x62, 0x6c, 0x69, 0x73, 0x68, 0x18, 0x07, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x46, 0x2e, 0x69, 0x6f,
-	0x2e, 0x64, 0x65, 0x65, 0x70, 0x68, 0x61, 0x76, 0x65, 0x6e, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f,
-	0x2e, 0x62, 0x61, 0x63, 0x6b, 0x70, 0x6c, 0x61, 0x6e, 0x65, 0x2e, 0x73, 0x63, 0x72, 0x69, 0x70,
-	0x74, 0x2e, 0x67, 0x72, 0x70, 0x63, 0x2e, 0x47, 0x65, 0x74, 0x50, 0x75, 0x62, 0x6c, 0x69, 0x73,
-	0x68, 0x44, 0x69, 0x61, 0x67, 0x6e, 0x6f, 0x73, 0x74, 0x69, 0x63, 0x52, 0x65, 0x73, 0x70, 0x6f,
-	0x6e, 0x73, 0x65, 0x48, 0x00, 0x52, 0x11, 0x64, 0x69, 0x61, 0x67, 0x6e, 0x6f, 0x73, 0x74, 0x69,
-	0x63, 0x50, 0x75, 0x62, 0x6c, 0x69, 0x73, 0x68, 0x42, 0x0a, 0x0a, 0x08, 0x72, 0x65, 0x73, 0x70,
-	0x6f, 0x6e, 0x73, 0x65, 0x22, 0x15, 0x0a, 0x13, 0x42, 0x72, 0x6f, 0x77, 0x73, 0x65, 0x72, 0x4e,
-	0x65, 0x78, 0x74, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0xc4, 0x01, 0x0a, 0x13,
-	0x4f, 0x70, 0x65, 0x6e, 0x44, 0x6f, 0x63, 0x75, 0x6d, 0x65, 0x6e, 0x74, 0x52, 0x65, 0x71, 0x75,
-	0x65, 0x73, 0x74, 0x12, 0x4c, 0x0a, 0x0a, 0x63, 0x6f, 0x6e, 0x73, 0x6f, 0x6c, 0x65, 0x5f, 0x69,
-	0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x29, 0x2e, 0x69, 0x6f, 0x2e, 0x64, 0x65, 0x65,
-	0x70, 0x68, 0x61, 0x76, 0x65, 0x6e, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x62, 0x61, 0x63,
-	0x6b, 0x70, 0x6c, 0x61, 0x6e, 0x65, 0x2e, 0x67, 0x72, 0x70, 0x63, 0x2e, 0x54, 0x69, 0x63, 0x6b,
-	0x65, 0x74, 0x42, 0x02, 0x18, 0x01, 0x52, 0x09, 0x63, 0x6f, 0x6e, 0x73, 0x6f, 0x6c, 0x65, 0x49,
-	0x64, 0x12, 0x5f, 0x0a, 0x0d, 0x74, 0x65, 0x78, 0x74, 0x5f, 0x64, 0x6f, 0x63, 0x75, 0x6d, 0x65,
-	0x6e, 0x74, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x3a, 0x2e, 0x69, 0x6f, 0x2e, 0x64, 0x65,
-	0x65, 0x70, 0x68, 0x61, 0x76, 0x65, 0x6e, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x62, 0x61,
-	0x63, 0x6b, 0x70, 0x6c, 0x61, 0x6e, 0x65, 0x2e, 0x73, 0x63, 0x72, 0x69, 0x70, 0x74, 0x2e, 0x67,
-	0x72, 0x70, 0x63, 0x2e, 0x54, 0x65, 0x78, 0x74, 0x44, 0x6f, 0x63, 0x75, 0x6d, 0x65, 0x6e, 0x74,
-	0x49, 0x74, 0x65, 0x6d, 0x52, 0x0c, 0x74, 0x65, 0x78, 0x74, 0x44, 0x6f, 0x63, 0x75, 0x6d, 0x65,
-	0x6e, 0x74, 0x22, 0x73, 0x0a, 0x10, 0x54, 0x65, 0x78, 0x74, 0x44, 0x6f, 0x63, 0x75, 0x6d, 0x65,
-	0x6e, 0x74, 0x49, 0x74, 0x65, 0x6d, 0x12, 0x10, 0x0a, 0x03, 0x75, 0x72, 0x69, 0x18, 0x01, 0x20,
-	0x01, 0x28, 0x09, 0x52, 0x03, 0x75, 0x72, 0x69, 0x12, 0x1f, 0x0a, 0x0b, 0x6c, 0x61, 0x6e, 0x67,
-	0x75, 0x61, 0x67, 0x65, 0x5f, 0x69, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0a, 0x6c,
-	0x61, 0x6e, 0x67, 0x75, 0x61, 0x67, 0x65, 0x49, 0x64, 0x12, 0x18, 0x0a, 0x07, 0x76, 0x65, 0x72,
-	0x73, 0x69, 0x6f, 0x6e, 0x18, 0x03, 0x20, 0x01, 0x28, 0x05, 0x52, 0x07, 0x76, 0x65, 0x72, 0x73,
-	0x69, 0x6f, 0x6e, 0x12, 0x12, 0x0a, 0x04, 0x74, 0x65, 0x78, 0x74, 0x18, 0x04, 0x20, 0x01, 0x28,
-	0x09, 0x52, 0x04, 0x74, 0x65, 0x78, 0x74, 0x22, 0xd4, 0x01, 0x0a, 0x14, 0x43, 0x6c, 0x6f, 0x73,
-	0x65, 0x44, 0x6f, 0x63, 0x75, 0x6d, 0x65, 0x6e, 0x74, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74,
-	0x12, 0x4c, 0x0a, 0x0a, 0x63, 0x6f, 0x6e, 0x73, 0x6f, 0x6c, 0x65, 0x5f, 0x69, 0x64, 0x18, 0x01,
-	0x20, 0x01, 0x28, 0x0b, 0x32, 0x29, 0x2e, 0x69, 0x6f, 0x2e, 0x64, 0x65, 0x65, 0x70, 0x68, 0x61,
+	0x70, 0x74, 0x2e, 0x67, 0x72, 0x70, 0x63, 0x2e, 0x43, 0x6c, 0x6f, 0x73, 0x65, 0x44, 0x6f, 0x63,
+	0x75, 0x6d, 0x65, 0x6e, 0x74, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x48, 0x00, 0x52, 0x0d,
+	0x63, 0x6c, 0x6f, 0x73, 0x65, 0x44, 0x6f, 0x63, 0x75, 0x6d, 0x65, 0x6e, 0x74, 0x42, 0x09, 0x0a,
+	0x07, 0x72, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x22, 0xe8, 0x04, 0x0a, 0x14, 0x41, 0x75, 0x74,
+	0x6f, 0x43, 0x6f, 0x6d, 0x70, 0x6c, 0x65, 0x74, 0x65, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73,
+	0x65, 0x12, 0x1d, 0x0a, 0x0a, 0x72, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x5f, 0x69, 0x64, 0x18,
+	0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x09, 0x72, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x49, 0x64,
+	0x12, 0x18, 0x0a, 0x07, 0x73, 0x75, 0x63, 0x63, 0x65, 0x73, 0x73, 0x18, 0x03, 0x20, 0x01, 0x28,
+	0x08, 0x52, 0x07, 0x73, 0x75, 0x63, 0x63, 0x65, 0x73, 0x73, 0x12, 0x71, 0x0a, 0x10, 0x63, 0x6f,
+	0x6d, 0x70, 0x6c, 0x65, 0x74, 0x69, 0x6f, 0x6e, 0x5f, 0x69, 0x74, 0x65, 0x6d, 0x73, 0x18, 0x01,
+	0x20, 0x01, 0x28, 0x0b, 0x32, 0x44, 0x2e, 0x69, 0x6f, 0x2e, 0x64, 0x65, 0x65, 0x70, 0x68, 0x61,
 	0x76, 0x65, 0x6e, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x62, 0x61, 0x63, 0x6b, 0x70, 0x6c,
-	0x61, 0x6e, 0x65, 0x2e, 0x67, 0x72, 0x70, 0x63, 0x2e, 0x54, 0x69, 0x63, 0x6b, 0x65, 0x74, 0x42,
-	0x02, 0x18, 0x01, 0x52, 0x09, 0x63, 0x6f, 0x6e, 0x73, 0x6f, 0x6c, 0x65, 0x49, 0x64, 0x12, 0x6e,
-	0x0a, 0x0d, 0x74, 0x65, 0x78, 0x74, 0x5f, 0x64, 0x6f, 0x63, 0x75, 0x6d, 0x65, 0x6e, 0x74, 0x18,
-	0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x49, 0x2e, 0x69, 0x6f, 0x2e, 0x64, 0x65, 0x65, 0x70, 0x68,
-	0x61, 0x76, 0x65, 0x6e, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x62, 0x61, 0x63, 0x6b, 0x70,
-	0x6c, 0x61, 0x6e, 0x65, 0x2e, 0x73, 0x63, 0x72, 0x69, 0x70, 0x74, 0x2e, 0x67, 0x72, 0x70, 0x63,
-	0x2e, 0x56, 0x65, 0x72, 0x73, 0x69, 0x6f, 0x6e, 0x65, 0x64, 0x54, 0x65, 0x78, 0x74, 0x44, 0x6f,
-	0x63, 0x75, 0x6d, 0x65, 0x6e, 0x74, 0x49, 0x64, 0x65, 0x6e, 0x74, 0x69, 0x66, 0x69, 0x65, 0x72,
-	0x52, 0x0c, 0x74, 0x65, 0x78, 0x74, 0x44, 0x6f, 0x63, 0x75, 0x6d, 0x65, 0x6e, 0x74, 0x22, 0x88,
-	0x04, 0x0a, 0x15, 0x43, 0x68, 0x61, 0x6e, 0x67, 0x65, 0x44, 0x6f, 0x63, 0x75, 0x6d, 0x65, 0x6e,
-	0x74, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x4c, 0x0a, 0x0a, 0x63, 0x6f, 0x6e, 0x73,
-	0x6f, 0x6c, 0x65, 0x5f, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x29, 0x2e, 0x69,
-	0x6f, 0x2e, 0x64, 0x65, 0x65, 0x70, 0x68, 0x61, 0x76, 0x65, 0x6e, 0x2e, 0x70, 0x72, 0x6f, 0x74,
-	0x6f, 0x2e, 0x62, 0x61, 0x63, 0x6b, 0x70, 0x6c, 0x61, 0x6e, 0x65, 0x2e, 0x67, 0x72, 0x70, 0x63,
-	0x2e, 0x54, 0x69, 0x63, 0x6b, 0x65, 0x74, 0x42, 0x02, 0x18, 0x01, 0x52, 0x09, 0x63, 0x6f, 0x6e,
-	0x73, 0x6f, 0x6c, 0x65, 0x49, 0x64, 0x12, 0x6e, 0x0a, 0x0d, 0x74, 0x65, 0x78, 0x74, 0x5f, 0x64,
-	0x6f, 0x63, 0x75, 0x6d, 0x65, 0x6e, 0x74, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x49, 0x2e,
-	0x69, 0x6f, 0x2e, 0x64, 0x65, 0x65, 0x70, 0x68, 0x61, 0x76, 0x65, 0x6e, 0x2e, 0x70, 0x72, 0x6f,
-	0x74, 0x6f, 0x2e, 0x62, 0x61, 0x63, 0x6b, 0x70, 0x6c, 0x61, 0x6e, 0x65, 0x2e, 0x73, 0x63, 0x72,
-	0x69, 0x70, 0x74, 0x2e, 0x67, 0x72, 0x70, 0x63, 0x2e, 0x56, 0x65, 0x72, 0x73, 0x69, 0x6f, 0x6e,
-	0x65, 0x64, 0x54, 0x65, 0x78, 0x74, 0x44, 0x6f, 0x63, 0x75, 0x6d, 0x65, 0x6e, 0x74, 0x49, 0x64,
-	0x65, 0x6e, 0x74, 0x69, 0x66, 0x69, 0x65, 0x72, 0x52, 0x0c, 0x74, 0x65, 0x78, 0x74, 0x44, 0x6f,
-	0x63, 0x75, 0x6d, 0x65, 0x6e, 0x74, 0x12, 0x87, 0x01, 0x0a, 0x0f, 0x63, 0x6f, 0x6e, 0x74, 0x65,
-	0x6e, 0x74, 0x5f, 0x63, 0x68, 0x61, 0x6e, 0x67, 0x65, 0x73, 0x18, 0x03, 0x20, 0x03, 0x28, 0x0b,
-	0x32, 0x5e, 0x2e, 0x69, 0x6f, 0x2e, 0x64, 0x65, 0x65, 0x70, 0x68, 0x61, 0x76, 0x65, 0x6e, 0x2e,
-	0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x62, 0x61, 0x63, 0x6b, 0x70, 0x6c, 0x61, 0x6e, 0x65, 0x2e,
-	0x73, 0x63, 0x72, 0x69, 0x70, 0x74, 0x2e, 0x67, 0x72, 0x70, 0x63, 0x2e, 0x43, 0x68, 0x61, 0x6e,
-	0x67, 0x65, 0x44, 0x6f, 0x63, 0x75, 0x6d, 0x65, 0x6e, 0x74, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73,
-	0x74, 0x2e, 0x54, 0x65, 0x78, 0x74, 0x44, 0x6f, 0x63, 0x75, 0x6d, 0x65, 0x6e, 0x74, 0x43, 0x6f,
-	0x6e, 0x74, 0x65, 0x6e, 0x74, 0x43, 0x68, 0x61, 0x6e, 0x67, 0x65, 0x45, 0x76, 0x65, 0x6e, 0x74,
-	0x52, 0x0e, 0x63, 0x6f, 0x6e, 0x74, 0x65, 0x6e, 0x74, 0x43, 0x68, 0x61, 0x6e, 0x67, 0x65, 0x73,
-	0x1a, 0xa6, 0x01, 0x0a, 0x1e, 0x54, 0x65, 0x78, 0x74, 0x44, 0x6f, 0x63, 0x75, 0x6d, 0x65, 0x6e,
-	0x74, 0x43, 0x6f, 0x6e, 0x74, 0x65, 0x6e, 0x74, 0x43, 0x68, 0x61, 0x6e, 0x67, 0x65, 0x45, 0x76,
-	0x65, 0x6e, 0x74, 0x12, 0x4d, 0x0a, 0x05, 0x72, 0x61, 0x6e, 0x67, 0x65, 0x18, 0x01, 0x20, 0x01,
-	0x28, 0x0b, 0x32, 0x37, 0x2e, 0x69, 0x6f, 0x2e, 0x64, 0x65, 0x65, 0x70, 0x68, 0x61, 0x76, 0x65,
+	0x61, 0x6e, 0x65, 0x2e, 0x73, 0x63, 0x72, 0x69, 0x70, 0x74, 0x2e, 0x67, 0x72, 0x70, 0x63, 0x2e,
+	0x47, 0x65, 0x74, 0x43, 0x6f, 0x6d, 0x70, 0x6c, 0x65, 0x74, 0x69, 0x6f, 0x6e, 0x49, 0x74, 0x65,
+	0x6d, 0x73, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x48, 0x00, 0x52, 0x0f, 0x63, 0x6f,
+	0x6d, 0x70, 0x6c, 0x65, 0x74, 0x69, 0x6f, 0x6e, 0x49, 0x74, 0x65, 0x6d, 0x73, 0x12, 0x64, 0x0a,
+	0x0a, 0x73, 0x69, 0x67, 0x6e, 0x61, 0x74, 0x75, 0x72, 0x65, 0x73, 0x18, 0x04, 0x20, 0x01, 0x28,
+	0x0b, 0x32, 0x42, 0x2e, 0x69, 0x6f, 0x2e, 0x64, 0x65, 0x65, 0x70, 0x68, 0x61, 0x76, 0x65, 0x6e,
+	0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x62, 0x61, 0x63, 0x6b, 0x70, 0x6c, 0x61, 0x6e, 0x65,
+	0x2e, 0x73, 0x63, 0x72, 0x69, 0x70, 0x74, 0x2e, 0x67, 0x72, 0x70, 0x63, 0x2e, 0x47, 0x65, 0x74,
+	0x53, 0x69, 0x67, 0x6e, 0x61, 0x74, 0x75, 0x72, 0x65, 0x48, 0x65, 0x6c, 0x70, 0x52, 0x65, 0x73,
+	0x70, 0x6f, 0x6e, 0x73, 0x65, 0x48, 0x00, 0x52, 0x0a, 0x73, 0x69, 0x67, 0x6e, 0x61, 0x74, 0x75,
+	0x72, 0x65, 0x73, 0x12, 0x52, 0x0a, 0x05, 0x68, 0x6f, 0x76, 0x65, 0x72, 0x18, 0x05, 0x20, 0x01,
+	0x28, 0x0b, 0x32, 0x3a, 0x2e, 0x69, 0x6f, 0x2e, 0x64, 0x65, 0x65, 0x70, 0x68, 0x61, 0x76, 0x65,
 	0x6e, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x62, 0x61, 0x63, 0x6b, 0x70, 0x6c, 0x61, 0x6e,
-	0x65, 0x2e, 0x73, 0x63, 0x72, 0x69, 0x70, 0x74, 0x2e, 0x67, 0x72, 0x70, 0x63, 0x2e, 0x44, 0x6f,
-	0x63, 0x75, 0x6d, 0x65, 0x6e, 0x74, 0x52, 0x61, 0x6e, 0x67, 0x65, 0x52, 0x05, 0x72, 0x61, 0x6e,
-	0x67, 0x65, 0x12, 0x21, 0x0a, 0x0c, 0x72, 0x61, 0x6e, 0x67, 0x65, 0x5f, 0x6c, 0x65, 0x6e, 0x67,
-	0x74, 0x68, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x0b, 0x72, 0x61, 0x6e, 0x67, 0x65, 0x4c,
-	0x65, 0x6e, 0x67, 0x74, 0x68, 0x12, 0x12, 0x0a, 0x04, 0x74, 0x65, 0x78, 0x74, 0x18, 0x03, 0x20,
-	0x01, 0x28, 0x09, 0x52, 0x04, 0x74, 0x65, 0x78, 0x74, 0x22, 0x9f, 0x01, 0x0a, 0x0d, 0x44, 0x6f,
-	0x63, 0x75, 0x6d, 0x65, 0x6e, 0x74, 0x52, 0x61, 0x6e, 0x67, 0x65, 0x12, 0x48, 0x0a, 0x05, 0x73,
-	0x74, 0x61, 0x72, 0x74, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x32, 0x2e, 0x69, 0x6f, 0x2e,
+	0x65, 0x2e, 0x73, 0x63, 0x72, 0x69, 0x70, 0x74, 0x2e, 0x67, 0x72, 0x70, 0x63, 0x2e, 0x47, 0x65,
+	0x74, 0x48, 0x6f, 0x76, 0x65, 0x72, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x48, 0x00,
+	0x52, 0x05, 0x68, 0x6f, 0x76, 0x65, 0x72, 0x12, 0x65, 0x0a, 0x0a, 0x64, 0x69, 0x61, 0x67, 0x6e,
+	0x6f, 0x73, 0x74, 0x69, 0x63, 0x18, 0x06, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x43, 0x2e, 0x69, 0x6f,
+	0x2e, 0x64, 0x65, 0x65, 0x70, 0x68, 0x61, 0x76, 0x65, 0x6e, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f,
+	0x2e, 0x62, 0x61, 0x63, 0x6b, 0x70, 0x6c, 0x61, 0x6e, 0x65, 0x2e, 0x73, 0x63, 0x72, 0x69, 0x70,
+	0x74, 0x2e, 0x67, 0x72, 0x70, 0x63, 0x2e, 0x47, 0x65, 0x74, 0x50, 0x75, 0x6c, 0x6c, 0x44, 0x69,
+	0x61, 0x67, 0x6e, 0x6f, 0x73, 0x74, 0x69, 0x63, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65,
+	0x48, 0x00, 0x52, 0x0a, 0x64, 0x69, 0x61, 0x67, 0x6e, 0x6f, 0x73, 0x74, 0x69, 0x63, 0x12, 0x77,
+	0x0a, 0x12, 0x64, 0x69, 0x61, 0x67, 0x6e, 0x6f, 0x73, 0x74, 0x69, 0x63, 0x5f, 0x70, 0x75, 0x62,
+	0x6c, 0x69, 0x73, 0x68, 0x18, 0x07, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x46, 0x2e, 0x69, 0x6f, 0x2e,
 	0x64, 0x65, 0x65, 0x70, 0x68, 0x61, 0x76, 0x65, 0x6e, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e,
 	0x62, 0x61, 0x63, 0x6b, 0x70, 0x6c, 0x61, 0x6e, 0x65, 0x2e, 0x73, 0x63, 0x72, 0x69, 0x70, 0x74,
-	0x2e, 0x67, 0x72, 0x70, 0x63, 0x2e, 0x50, 0x6f, 0x73, 0x69, 0x74, 0x69, 0x6f, 0x6e, 0x52, 0x05,
-	0x73, 0x74, 0x61, 0x72, 0x74, 0x12, 0x44, 0x0a, 0x03, 0x65, 0x6e, 0x64, 0x18, 0x02, 0x20, 0x01,
-	0x28, 0x0b, 0x32, 0x32, 0x2e, 0x69, 0x6f, 0x2e, 0x64, 0x65, 0x65, 0x70, 0x68, 0x61, 0x76, 0x65,
-	0x6e, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x62, 0x61, 0x63, 0x6b, 0x70, 0x6c, 0x61, 0x6e,
-	0x65, 0x2e, 0x73, 0x63, 0x72, 0x69, 0x70, 0x74, 0x2e, 0x67, 0x72, 0x70, 0x63, 0x2e, 0x50, 0x6f,
-	0x73, 0x69, 0x74, 0x69, 0x6f, 0x6e, 0x52, 0x03, 0x65, 0x6e, 0x64, 0x22, 0x4d, 0x0a, 0x1f, 0x56,
-	0x65, 0x72, 0x73, 0x69, 0x6f, 0x6e, 0x65, 0x64, 0x54, 0x65, 0x78, 0x74, 0x44, 0x6f, 0x63, 0x75,
-	0x6d, 0x65, 0x6e, 0x74, 0x49, 0x64, 0x65, 0x6e, 0x74, 0x69, 0x66, 0x69, 0x65, 0x72, 0x12, 0x10,
-	0x0a, 0x03, 0x75, 0x72, 0x69, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x75, 0x72, 0x69,
-	0x12, 0x18, 0x0a, 0x07, 0x76, 0x65, 0x72, 0x73, 0x69, 0x6f, 0x6e, 0x18, 0x02, 0x20, 0x01, 0x28,
-	0x05, 0x52, 0x07, 0x76, 0x65, 0x72, 0x73, 0x69, 0x6f, 0x6e, 0x22, 0x3c, 0x0a, 0x08, 0x50, 0x6f,
-	0x73, 0x69, 0x74, 0x69, 0x6f, 0x6e, 0x12, 0x12, 0x0a, 0x04, 0x6c, 0x69, 0x6e, 0x65, 0x18, 0x01,
-	0x20, 0x01, 0x28, 0x05, 0x52, 0x04, 0x6c, 0x69, 0x6e, 0x65, 0x12, 0x1c, 0x0a, 0x09, 0x63, 0x68,
-	0x61, 0x72, 0x61, 0x63, 0x74, 0x65, 0x72, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x09, 0x63,
-	0x68, 0x61, 0x72, 0x61, 0x63, 0x74, 0x65, 0x72, 0x22, 0x39, 0x0a, 0x0d, 0x4d, 0x61, 0x72, 0x6b,
-	0x75, 0x70, 0x43, 0x6f, 0x6e, 0x74, 0x65, 0x6e, 0x74, 0x12, 0x12, 0x0a, 0x04, 0x6b, 0x69, 0x6e,
-	0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x6b, 0x69, 0x6e, 0x64, 0x12, 0x14, 0x0a,
-	0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x05, 0x76, 0x61,
-	0x6c, 0x75, 0x65, 0x22, 0xa3, 0x03, 0x0a, 0x19, 0x47, 0x65, 0x74, 0x43, 0x6f, 0x6d, 0x70, 0x6c,
-	0x65, 0x74, 0x69, 0x6f, 0x6e, 0x49, 0x74, 0x65, 0x6d, 0x73, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73,
-	0x74, 0x12, 0x4c, 0x0a, 0x0a, 0x63, 0x6f, 0x6e, 0x73, 0x6f, 0x6c, 0x65, 0x5f, 0x69, 0x64, 0x18,
-	0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x29, 0x2e, 0x69, 0x6f, 0x2e, 0x64, 0x65, 0x65, 0x70, 0x68,
-	0x61, 0x76, 0x65, 0x6e, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x62, 0x61, 0x63, 0x6b, 0x70,
-	0x6c, 0x61, 0x6e, 0x65, 0x2e, 0x67, 0x72, 0x70, 0x63, 0x2e, 0x54, 0x69, 0x63, 0x6b, 0x65, 0x74,
-	0x42, 0x02, 0x18, 0x01, 0x52, 0x09, 0x63, 0x6f, 0x6e, 0x73, 0x6f, 0x6c, 0x65, 0x49, 0x64, 0x12,
-	0x55, 0x0a, 0x07, 0x63, 0x6f, 0x6e, 0x74, 0x65, 0x78, 0x74, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b,
-	0x32, 0x3b, 0x2e, 0x69, 0x6f, 0x2e, 0x64, 0x65, 0x65, 0x70, 0x68, 0x61, 0x76, 0x65, 0x6e, 0x2e,
-	0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x62, 0x61, 0x63, 0x6b, 0x70, 0x6c, 0x61, 0x6e, 0x65, 0x2e,
-	0x73, 0x63, 0x72, 0x69, 0x70, 0x74, 0x2e, 0x67, 0x72, 0x70, 0x63, 0x2e, 0x43, 0x6f, 0x6d, 0x70,
-	0x6c, 0x65, 0x74, 0x69, 0x6f, 0x6e, 0x43, 0x6f, 0x6e, 0x74, 0x65, 0x78, 0x74, 0x52, 0x07, 0x63,
-	0x6f, 0x6e, 0x74, 0x65, 0x78, 0x74, 0x12, 0x6e, 0x0a, 0x0d, 0x74, 0x65, 0x78, 0x74, 0x5f, 0x64,
-	0x6f, 0x63, 0x75, 0x6d, 0x65, 0x6e, 0x74, 0x18, 0x03, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x49, 0x2e,
-	0x69, 0x6f, 0x2e, 0x64, 0x65, 0x65, 0x70, 0x68, 0x61, 0x76, 0x65, 0x6e, 0x2e, 0x70, 0x72, 0x6f,
-	0x74, 0x6f, 0x2e, 0x62, 0x61, 0x63, 0x6b, 0x70, 0x6c, 0x61, 0x6e, 0x65, 0x2e, 0x73, 0x63, 0x72,
-	0x69, 0x70, 0x74, 0x2e, 0x67, 0x72, 0x70, 0x63, 0x2e, 0x56, 0x65, 0x72, 0x73, 0x69, 0x6f, 0x6e,
-	0x65, 0x64, 0x54, 0x65, 0x78, 0x74, 0x44, 0x6f, 0x63, 0x75, 0x6d, 0x65, 0x6e, 0x74, 0x49, 0x64,
-	0x65, 0x6e, 0x74, 0x69, 0x66, 0x69, 0x65, 0x72, 0x52, 0x0c, 0x74, 0x65, 0x78, 0x74, 0x44, 0x6f,
-	0x63, 0x75, 0x6d, 0x65, 0x6e, 0x74, 0x12, 0x4e, 0x0a, 0x08, 0x70, 0x6f, 0x73, 0x69, 0x74, 0x69,
-	0x6f, 0x6e, 0x18, 0x04, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x32, 0x2e, 0x69, 0x6f, 0x2e, 0x64, 0x65,
-	0x65, 0x70, 0x68, 0x61, 0x76, 0x65, 0x6e, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x62, 0x61,
-	0x63, 0x6b, 0x70, 0x6c, 0x61, 0x6e, 0x65, 0x2e, 0x73, 0x63, 0x72, 0x69, 0x70, 0x74, 0x2e, 0x67,
-	0x72, 0x70, 0x63, 0x2e, 0x50, 0x6f, 0x73, 0x69, 0x74, 0x69, 0x6f, 0x6e, 0x52, 0x08, 0x70, 0x6f,
-	0x73, 0x69, 0x74, 0x69, 0x6f, 0x6e, 0x12, 0x21, 0x0a, 0x0a, 0x72, 0x65, 0x71, 0x75, 0x65, 0x73,
-	0x74, 0x5f, 0x69, 0x64, 0x18, 0x05, 0x20, 0x01, 0x28, 0x05, 0x42, 0x02, 0x18, 0x01, 0x52, 0x09,
-	0x72, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x49, 0x64, 0x22, 0x63, 0x0a, 0x11, 0x43, 0x6f, 0x6d,
-	0x70, 0x6c, 0x65, 0x74, 0x69, 0x6f, 0x6e, 0x43, 0x6f, 0x6e, 0x74, 0x65, 0x78, 0x74, 0x12, 0x21,
-	0x0a, 0x0c, 0x74, 0x72, 0x69, 0x67, 0x67, 0x65, 0x72, 0x5f, 0x6b, 0x69, 0x6e, 0x64, 0x18, 0x01,
-	0x20, 0x01, 0x28, 0x05, 0x52, 0x0b, 0x74, 0x72, 0x69, 0x67, 0x67, 0x65, 0x72, 0x4b, 0x69, 0x6e,
-	0x64, 0x12, 0x2b, 0x0a, 0x11, 0x74, 0x72, 0x69, 0x67, 0x67, 0x65, 0x72, 0x5f, 0x63, 0x68, 0x61,
-	0x72, 0x61, 0x63, 0x74, 0x65, 0x72, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x10, 0x74, 0x72,
-	0x69, 0x67, 0x67, 0x65, 0x72, 0x43, 0x68, 0x61, 0x72, 0x61, 0x63, 0x74, 0x65, 0x72, 0x22, 0xad,
-	0x01, 0x0a, 0x1a, 0x47, 0x65, 0x74, 0x43, 0x6f, 0x6d, 0x70, 0x6c, 0x65, 0x74, 0x69, 0x6f, 0x6e,
-	0x49, 0x74, 0x65, 0x6d, 0x73, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x4e, 0x0a,
-	0x05, 0x69, 0x74, 0x65, 0x6d, 0x73, 0x18, 0x01, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x38, 0x2e, 0x69,
+	0x2e, 0x67, 0x72, 0x70, 0x63, 0x2e, 0x47, 0x65, 0x74, 0x50, 0x75, 0x62, 0x6c, 0x69, 0x73, 0x68,
+	0x44, 0x69, 0x61, 0x67, 0x6e, 0x6f, 0x73, 0x74, 0x69, 0x63, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e,
+	0x73, 0x65, 0x48, 0x00, 0x52, 0x11, 0x64, 0x69, 0x61, 0x67, 0x6e, 0x6f, 0x73, 0x74, 0x69, 0x63,
+	0x50, 0x75, 0x62, 0x6c, 0x69, 0x73, 0x68, 0x42, 0x0a, 0x0a, 0x08, 0x72, 0x65, 0x73, 0x70, 0x6f,
+	0x6e, 0x73, 0x65, 0x22, 0x15, 0x0a, 0x13, 0x42, 0x72, 0x6f, 0x77, 0x73, 0x65, 0x72, 0x4e, 0x65,
+	0x78, 0x74, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0xc4, 0x01, 0x0a, 0x13, 0x4f,
+	0x70, 0x65, 0x6e, 0x44, 0x6f, 0x63, 0x75, 0x6d, 0x65, 0x6e, 0x74, 0x52, 0x65, 0x71, 0x75, 0x65,
+	0x73, 0x74, 0x12, 0x4c, 0x0a, 0x0a, 0x63, 0x6f, 0x6e, 0x73, 0x6f, 0x6c, 0x65, 0x5f, 0x69, 0x64,
+	0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x29, 0x2e, 0x69, 0x6f, 0x2e, 0x64, 0x65, 0x65, 0x70,
+	0x68, 0x61, 0x76, 0x65, 0x6e, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x62, 0x61, 0x63, 0x6b,
+	0x70, 0x6c, 0x61, 0x6e, 0x65, 0x2e, 0x67, 0x72, 0x70, 0x63, 0x2e, 0x54, 0x69, 0x63, 0x6b, 0x65,
+	0x74, 0x42, 0x02, 0x18, 0x01, 0x52, 0x09, 0x63, 0x6f, 0x6e, 0x73, 0x6f, 0x6c, 0x65, 0x49, 0x64,
+	0x12, 0x5f, 0x0a, 0x0d, 0x74, 0x65, 0x78, 0x74, 0x5f, 0x64, 0x6f, 0x63, 0x75, 0x6d, 0x65, 0x6e,
+	0x74, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x3a, 0x2e, 0x69, 0x6f, 0x2e, 0x64, 0x65, 0x65,
+	0x70, 0x68, 0x61, 0x76, 0x65, 0x6e, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x62, 0x61, 0x63,
+	0x6b, 0x70, 0x6c, 0x61, 0x6e, 0x65, 0x2e, 0x73, 0x63, 0x72, 0x69, 0x70, 0x74, 0x2e, 0x67, 0x72,
+	0x70, 0x63, 0x2e, 0x54, 0x65, 0x78, 0x74, 0x44, 0x6f, 0x63, 0x75, 0x6d, 0x65, 0x6e, 0x74, 0x49,
+	0x74, 0x65, 0x6d, 0x52, 0x0c, 0x74, 0x65, 0x78, 0x74, 0x44, 0x6f, 0x63, 0x75, 0x6d, 0x65, 0x6e,
+	0x74, 0x22, 0x73, 0x0a, 0x10, 0x54, 0x65, 0x78, 0x74, 0x44, 0x6f, 0x63, 0x75, 0x6d, 0x65, 0x6e,
+	0x74, 0x49, 0x74, 0x65, 0x6d, 0x12, 0x10, 0x0a, 0x03, 0x75, 0x72, 0x69, 0x18, 0x01, 0x20, 0x01,
+	0x28, 0x09, 0x52, 0x03, 0x75, 0x72, 0x69, 0x12, 0x1f, 0x0a, 0x0b, 0x6c, 0x61, 0x6e, 0x67, 0x75,
+	0x61, 0x67, 0x65, 0x5f, 0x69, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0a, 0x6c, 0x61,
+	0x6e, 0x67, 0x75, 0x61, 0x67, 0x65, 0x49, 0x64, 0x12, 0x18, 0x0a, 0x07, 0x76, 0x65, 0x72, 0x73,
+	0x69, 0x6f, 0x6e, 0x18, 0x03, 0x20, 0x01, 0x28, 0x05, 0x52, 0x07, 0x76, 0x65, 0x72, 0x73, 0x69,
+	0x6f, 0x6e, 0x12, 0x12, 0x0a, 0x04, 0x74, 0x65, 0x78, 0x74, 0x18, 0x04, 0x20, 0x01, 0x28, 0x09,
+	0x52, 0x04, 0x74, 0x65, 0x78, 0x74, 0x22, 0xd4, 0x01, 0x0a, 0x14, 0x43, 0x6c, 0x6f, 0x73, 0x65,
+	0x44, 0x6f, 0x63, 0x75, 0x6d, 0x65, 0x6e, 0x74, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12,
+	0x4c, 0x0a, 0x0a, 0x63, 0x6f, 0x6e, 0x73, 0x6f, 0x6c, 0x65, 0x5f, 0x69, 0x64, 0x18, 0x01, 0x20,
+	0x01, 0x28, 0x0b, 0x32, 0x29, 0x2e, 0x69, 0x6f, 0x2e, 0x64, 0x65, 0x65, 0x70, 0x68, 0x61, 0x76,
+	0x65, 0x6e, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x62, 0x61, 0x63, 0x6b, 0x70, 0x6c, 0x61,
+	0x6e, 0x65, 0x2e, 0x67, 0x72, 0x70, 0x63, 0x2e, 0x54, 0x69, 0x63, 0x6b, 0x65, 0x74, 0x42, 0x02,
+	0x18, 0x01, 0x52, 0x09, 0x63, 0x6f, 0x6e, 0x73, 0x6f, 0x6c, 0x65, 0x49, 0x64, 0x12, 0x6e, 0x0a,
+	0x0d, 0x74, 0x65, 0x78, 0x74, 0x5f, 0x64, 0x6f, 0x63, 0x75, 0x6d, 0x65, 0x6e, 0x74, 0x18, 0x02,
+	0x20, 0x01, 0x28, 0x0b, 0x32, 0x49, 0x2e, 0x69, 0x6f, 0x2e, 0x64, 0x65, 0x65, 0x70, 0x68, 0x61,
+	0x76, 0x65, 0x6e, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x62, 0x61, 0x63, 0x6b, 0x70, 0x6c,
+	0x61, 0x6e, 0x65, 0x2e, 0x73, 0x63, 0x72, 0x69, 0x70, 0x74, 0x2e, 0x67, 0x72, 0x70, 0x63, 0x2e,
+	0x56, 0x65, 0x72, 0x73, 0x69, 0x6f, 0x6e, 0x65, 0x64, 0x54, 0x65, 0x78, 0x74, 0x44, 0x6f, 0x63,
+	0x75, 0x6d, 0x65, 0x6e, 0x74, 0x49, 0x64, 0x65, 0x6e, 0x74, 0x69, 0x66, 0x69, 0x65, 0x72, 0x52,
+	0x0c, 0x74, 0x65, 0x78, 0x74, 0x44, 0x6f, 0x63, 0x75, 0x6d, 0x65, 0x6e, 0x74, 0x22, 0x88, 0x04,
+	0x0a, 0x15, 0x43, 0x68, 0x61, 0x6e, 0x67, 0x65, 0x44, 0x6f, 0x63, 0x75, 0x6d, 0x65, 0x6e, 0x74,
+	0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x4c, 0x0a, 0x0a, 0x63, 0x6f, 0x6e, 0x73, 0x6f,
+	0x6c, 0x65, 0x5f, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x29, 0x2e, 0x69, 0x6f,
+	0x2e, 0x64, 0x65, 0x65, 0x70, 0x68, 0x61, 0x76, 0x65, 0x6e, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f,
+	0x2e, 0x62, 0x61, 0x63, 0x6b, 0x70, 0x6c, 0x61, 0x6e, 0x65, 0x2e, 0x67, 0x72, 0x70, 0x63, 0x2e,
+	0x54, 0x69, 0x63, 0x6b, 0x65, 0x74, 0x42, 0x02, 0x18, 0x01, 0x52, 0x09, 0x63, 0x6f, 0x6e, 0x73,
+	0x6f, 0x6c, 0x65, 0x49, 0x64, 0x12, 0x6e, 0x0a, 0x0d, 0x74, 0x65, 0x78, 0x74, 0x5f, 0x64, 0x6f,
+	0x63, 0x75, 0x6d, 0x65, 0x6e, 0x74, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x49, 0x2e, 0x69,
 	0x6f, 0x2e, 0x64, 0x65, 0x65, 0x70, 0x68, 0x61, 0x76, 0x65, 0x6e, 0x2e, 0x70, 0x72, 0x6f, 0x74,
 	0x6f, 0x2e, 0x62, 0x61, 0x63, 0x6b, 0x70, 0x6c, 0x61, 0x6e, 0x65, 0x2e, 0x73, 0x63, 0x72, 0x69,
-	0x70, 0x74, 0x2e, 0x67, 0x72, 0x70, 0x63, 0x2e, 0x43, 0x6f, 0x6d, 0x70, 0x6c, 0x65, 0x74, 0x69,
-	0x6f, 0x6e, 0x49, 0x74, 0x65, 0x6d, 0x52, 0x05, 0x69, 0x74, 0x65, 0x6d, 0x73, 0x12, 0x21, 0x0a,
-	0x0a, 0x72, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x5f, 0x69, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28,
-	0x05, 0x42, 0x02, 0x18, 0x01, 0x52, 0x09, 0x72, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x49, 0x64,
-	0x12, 0x1c, 0x0a, 0x07, 0x73, 0x75, 0x63, 0x63, 0x65, 0x73, 0x73, 0x18, 0x03, 0x20, 0x01, 0x28,
-	0x08, 0x42, 0x02, 0x18, 0x01, 0x52, 0x07, 0x73, 0x75, 0x63, 0x63, 0x65, 0x73, 0x73, 0x22, 0xf5,
-	0x04, 0x0a, 0x0e, 0x43, 0x6f, 0x6d, 0x70, 0x6c, 0x65, 0x74, 0x69, 0x6f, 0x6e, 0x49, 0x74, 0x65,
-	0x6d, 0x12, 0x14, 0x0a, 0x05, 0x73, 0x74, 0x61, 0x72, 0x74, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05,
-	0x52, 0x05, 0x73, 0x74, 0x61, 0x72, 0x74, 0x12, 0x16, 0x0a, 0x06, 0x6c, 0x65, 0x6e, 0x67, 0x74,
-	0x68, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x06, 0x6c, 0x65, 0x6e, 0x67, 0x74, 0x68, 0x12,
-	0x14, 0x0a, 0x05, 0x6c, 0x61, 0x62, 0x65, 0x6c, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x52, 0x05,
-	0x6c, 0x61, 0x62, 0x65, 0x6c, 0x12, 0x12, 0x0a, 0x04, 0x6b, 0x69, 0x6e, 0x64, 0x18, 0x04, 0x20,
-	0x01, 0x28, 0x05, 0x52, 0x04, 0x6b, 0x69, 0x6e, 0x64, 0x12, 0x16, 0x0a, 0x06, 0x64, 0x65, 0x74,
-	0x61, 0x69, 0x6c, 0x18, 0x05, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06, 0x64, 0x65, 0x74, 0x61, 0x69,
-	0x6c, 0x12, 0x1e, 0x0a, 0x0a, 0x64, 0x65, 0x70, 0x72, 0x65, 0x63, 0x61, 0x74, 0x65, 0x64, 0x18,
-	0x07, 0x20, 0x01, 0x28, 0x08, 0x52, 0x0a, 0x64, 0x65, 0x70, 0x72, 0x65, 0x63, 0x61, 0x74, 0x65,
-	0x64, 0x12, 0x1c, 0x0a, 0x09, 0x70, 0x72, 0x65, 0x73, 0x65, 0x6c, 0x65, 0x63, 0x74, 0x18, 0x08,
-	0x20, 0x01, 0x28, 0x08, 0x52, 0x09, 0x70, 0x72, 0x65, 0x73, 0x65, 0x6c, 0x65, 0x63, 0x74, 0x12,
-	0x4f, 0x0a, 0x09, 0x74, 0x65, 0x78, 0x74, 0x5f, 0x65, 0x64, 0x69, 0x74, 0x18, 0x09, 0x20, 0x01,
-	0x28, 0x0b, 0x32, 0x32, 0x2e, 0x69, 0x6f, 0x2e, 0x64, 0x65, 0x65, 0x70, 0x68, 0x61, 0x76, 0x65,
-	0x6e, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x62, 0x61, 0x63, 0x6b, 0x70, 0x6c, 0x61, 0x6e,
-	0x65, 0x2e, 0x73, 0x63, 0x72, 0x69, 0x70, 0x74, 0x2e, 0x67, 0x72, 0x70, 0x63, 0x2e, 0x54, 0x65,
-	0x78, 0x74, 0x45, 0x64, 0x69, 0x74, 0x52, 0x08, 0x74, 0x65, 0x78, 0x74, 0x45, 0x64, 0x69, 0x74,
-	0x12, 0x1b, 0x0a, 0x09, 0x73, 0x6f, 0x72, 0x74, 0x5f, 0x74, 0x65, 0x78, 0x74, 0x18, 0x0a, 0x20,
-	0x01, 0x28, 0x09, 0x52, 0x08, 0x73, 0x6f, 0x72, 0x74, 0x54, 0x65, 0x78, 0x74, 0x12, 0x1f, 0x0a,
-	0x0b, 0x66, 0x69, 0x6c, 0x74, 0x65, 0x72, 0x5f, 0x74, 0x65, 0x78, 0x74, 0x18, 0x0b, 0x20, 0x01,
-	0x28, 0x09, 0x52, 0x0a, 0x66, 0x69, 0x6c, 0x74, 0x65, 0x72, 0x54, 0x65, 0x78, 0x74, 0x12, 0x2c,
-	0x0a, 0x12, 0x69, 0x6e, 0x73, 0x65, 0x72, 0x74, 0x5f, 0x74, 0x65, 0x78, 0x74, 0x5f, 0x66, 0x6f,
-	0x72, 0x6d, 0x61, 0x74, 0x18, 0x0c, 0x20, 0x01, 0x28, 0x05, 0x52, 0x10, 0x69, 0x6e, 0x73, 0x65,
-	0x72, 0x74, 0x54, 0x65, 0x78, 0x74, 0x46, 0x6f, 0x72, 0x6d, 0x61, 0x74, 0x12, 0x66, 0x0a, 0x15,
-	0x61, 0x64, 0x64, 0x69, 0x74, 0x69, 0x6f, 0x6e, 0x61, 0x6c, 0x5f, 0x74, 0x65, 0x78, 0x74, 0x5f,
-	0x65, 0x64, 0x69, 0x74, 0x73, 0x18, 0x0d, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x32, 0x2e, 0x69, 0x6f,
-	0x2e, 0x64, 0x65, 0x65, 0x70, 0x68, 0x61, 0x76, 0x65, 0x6e, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f,
-	0x2e, 0x62, 0x61, 0x63, 0x6b, 0x70, 0x6c, 0x61, 0x6e, 0x65, 0x2e, 0x73, 0x63, 0x72, 0x69, 0x70,
-	0x74, 0x2e, 0x67, 0x72, 0x70, 0x63, 0x2e, 0x54, 0x65, 0x78, 0x74, 0x45, 0x64, 0x69, 0x74, 0x52,
-	0x13, 0x61, 0x64, 0x64, 0x69, 0x74, 0x69, 0x6f, 0x6e, 0x61, 0x6c, 0x54, 0x65, 0x78, 0x74, 0x45,
-	0x64, 0x69, 0x74, 0x73, 0x12, 0x2b, 0x0a, 0x11, 0x63, 0x6f, 0x6d, 0x6d, 0x69, 0x74, 0x5f, 0x63,
-	0x68, 0x61, 0x72, 0x61, 0x63, 0x74, 0x65, 0x72, 0x73, 0x18, 0x0e, 0x20, 0x03, 0x28, 0x09, 0x52,
-	0x10, 0x63, 0x6f, 0x6d, 0x6d, 0x69, 0x74, 0x43, 0x68, 0x61, 0x72, 0x61, 0x63, 0x74, 0x65, 0x72,
-	0x73, 0x12, 0x5d, 0x0a, 0x0d, 0x64, 0x6f, 0x63, 0x75, 0x6d, 0x65, 0x6e, 0x74, 0x61, 0x74, 0x69,
-	0x6f, 0x6e, 0x18, 0x0f, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x37, 0x2e, 0x69, 0x6f, 0x2e, 0x64, 0x65,
-	0x65, 0x70, 0x68, 0x61, 0x76, 0x65, 0x6e, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x62, 0x61,
-	0x63, 0x6b, 0x70, 0x6c, 0x61, 0x6e, 0x65, 0x2e, 0x73, 0x63, 0x72, 0x69, 0x70, 0x74, 0x2e, 0x67,
-	0x72, 0x70, 0x63, 0x2e, 0x4d, 0x61, 0x72, 0x6b, 0x75, 0x70, 0x43, 0x6f, 0x6e, 0x74, 0x65, 0x6e,
-	0x74, 0x52, 0x0d, 0x64, 0x6f, 0x63, 0x75, 0x6d, 0x65, 0x6e, 0x74, 0x61, 0x74, 0x69, 0x6f, 0x6e,
-	0x4a, 0x04, 0x08, 0x06, 0x10, 0x07, 0x22, 0x6d, 0x0a, 0x08, 0x54, 0x65, 0x78, 0x74, 0x45, 0x64,
-	0x69, 0x74, 0x12, 0x4d, 0x0a, 0x05, 0x72, 0x61, 0x6e, 0x67, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28,
+	0x70, 0x74, 0x2e, 0x67, 0x72, 0x70, 0x63, 0x2e, 0x56, 0x65, 0x72, 0x73, 0x69, 0x6f, 0x6e, 0x65,
+	0x64, 0x54, 0x65, 0x78, 0x74, 0x44, 0x6f, 0x63, 0x75, 0x6d, 0x65, 0x6e, 0x74, 0x49, 0x64, 0x65,
+	0x6e, 0x74, 0x69, 0x66, 0x69, 0x65, 0x72, 0x52, 0x0c, 0x74, 0x65, 0x78, 0x74, 0x44, 0x6f, 0x63,
+	0x75, 0x6d, 0x65, 0x6e, 0x74, 0x12, 0x87, 0x01, 0x0a, 0x0f, 0x63, 0x6f, 0x6e, 0x74, 0x65, 0x6e,
+	0x74, 0x5f, 0x63, 0x68, 0x61, 0x6e, 0x67, 0x65, 0x73, 0x18, 0x03, 0x20, 0x03, 0x28, 0x0b, 0x32,
+	0x5e, 0x2e, 0x69, 0x6f, 0x2e, 0x64, 0x65, 0x65, 0x70, 0x68, 0x61, 0x76, 0x65, 0x6e, 0x2e, 0x70,
+	0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x62, 0x61, 0x63, 0x6b, 0x70, 0x6c, 0x61, 0x6e, 0x65, 0x2e, 0x73,
+	0x63, 0x72, 0x69, 0x70, 0x74, 0x2e, 0x67, 0x72, 0x70, 0x63, 0x2e, 0x43, 0x68, 0x61, 0x6e, 0x67,
+	0x65, 0x44, 0x6f, 0x63, 0x75, 0x6d, 0x65, 0x6e, 0x74, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74,
+	0x2e, 0x54, 0x65, 0x78, 0x74, 0x44, 0x6f, 0x63, 0x75, 0x6d, 0x65, 0x6e, 0x74, 0x43, 0x6f, 0x6e,
+	0x74, 0x65, 0x6e, 0x74, 0x43, 0x68, 0x61, 0x6e, 0x67, 0x65, 0x45, 0x76, 0x65, 0x6e, 0x74, 0x52,
+	0x0e, 0x63, 0x6f, 0x6e, 0x74, 0x65, 0x6e, 0x74, 0x43, 0x68, 0x61, 0x6e, 0x67, 0x65, 0x73, 0x1a,
+	0xa6, 0x01, 0x0a, 0x1e, 0x54, 0x65, 0x78, 0x74, 0x44, 0x6f, 0x63, 0x75, 0x6d, 0x65, 0x6e, 0x74,
+	0x43, 0x6f, 0x6e, 0x74, 0x65, 0x6e, 0x74, 0x43, 0x68, 0x61, 0x6e, 0x67, 0x65, 0x45, 0x76, 0x65,
+	0x6e, 0x74, 0x12, 0x4d, 0x0a, 0x05, 0x72, 0x61, 0x6e, 0x67, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28,
 	0x0b, 0x32, 0x37, 0x2e, 0x69, 0x6f, 0x2e, 0x64, 0x65, 0x65, 0x70, 0x68, 0x61, 0x76, 0x65, 0x6e,
 	0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x62, 0x61, 0x63, 0x6b, 0x70, 0x6c, 0x61, 0x6e, 0x65,
 	0x2e, 0x73, 0x63, 0x72, 0x69, 0x70, 0x74, 0x2e, 0x67, 0x72, 0x70, 0x63, 0x2e, 0x44, 0x6f, 0x63,
 	0x75, 0x6d, 0x65, 0x6e, 0x74, 0x52, 0x61, 0x6e, 0x67, 0x65, 0x52, 0x05, 0x72, 0x61, 0x6e, 0x67,
-	0x65, 0x12, 0x12, 0x0a, 0x04, 0x74, 0x65, 0x78, 0x74, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52,
-	0x04, 0x74, 0x65, 0x78, 0x74, 0x22, 0xb3, 0x02, 0x0a, 0x17, 0x47, 0x65, 0x74, 0x53, 0x69, 0x67,
-	0x6e, 0x61, 0x74, 0x75, 0x72, 0x65, 0x48, 0x65, 0x6c, 0x70, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73,
-	0x74, 0x12, 0x58, 0x0a, 0x07, 0x63, 0x6f, 0x6e, 0x74, 0x65, 0x78, 0x74, 0x18, 0x01, 0x20, 0x01,
-	0x28, 0x0b, 0x32, 0x3e, 0x2e, 0x69, 0x6f, 0x2e, 0x64, 0x65, 0x65, 0x70, 0x68, 0x61, 0x76, 0x65,
-	0x6e, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x62, 0x61, 0x63, 0x6b, 0x70, 0x6c, 0x61, 0x6e,
-	0x65, 0x2e, 0x73, 0x63, 0x72, 0x69, 0x70, 0x74, 0x2e, 0x67, 0x72, 0x70, 0x63, 0x2e, 0x53, 0x69,
-	0x67, 0x6e, 0x61, 0x74, 0x75, 0x72, 0x65, 0x48, 0x65, 0x6c, 0x70, 0x43, 0x6f, 0x6e, 0x74, 0x65,
-	0x78, 0x74, 0x52, 0x07, 0x63, 0x6f, 0x6e, 0x74, 0x65, 0x78, 0x74, 0x12, 0x6e, 0x0a, 0x0d, 0x74,
-	0x65, 0x78, 0x74, 0x5f, 0x64, 0x6f, 0x63, 0x75, 0x6d, 0x65, 0x6e, 0x74, 0x18, 0x02, 0x20, 0x01,
-	0x28, 0x0b, 0x32, 0x49, 0x2e, 0x69, 0x6f, 0x2e, 0x64, 0x65, 0x65, 0x70, 0x68, 0x61, 0x76, 0x65,
-	0x6e, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x62, 0x61, 0x63, 0x6b, 0x70, 0x6c, 0x61, 0x6e,
-	0x65, 0x2e, 0x73, 0x63, 0x72, 0x69, 0x70, 0x74, 0x2e, 0x67, 0x72, 0x70, 0x63, 0x2e, 0x56, 0x65,
+	0x65, 0x12, 0x21, 0x0a, 0x0c, 0x72, 0x61, 0x6e, 0x67, 0x65, 0x5f, 0x6c, 0x65, 0x6e, 0x67, 0x74,
+	0x68, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x0b, 0x72, 0x61, 0x6e, 0x67, 0x65, 0x4c, 0x65,
+	0x6e, 0x67, 0x74, 0x68, 0x12, 0x12, 0x0a, 0x04, 0x74, 0x65, 0x78, 0x74, 0x18, 0x03, 0x20, 0x01,
+	0x28, 0x09, 0x52, 0x04, 0x74, 0x65, 0x78, 0x74, 0x22, 0x9f, 0x01, 0x0a, 0x0d, 0x44, 0x6f, 0x63,
+	0x75, 0x6d, 0x65, 0x6e, 0x74, 0x52, 0x61, 0x6e, 0x67, 0x65, 0x12, 0x48, 0x0a, 0x05, 0x73, 0x74,
+	0x61, 0x72, 0x74, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x32, 0x2e, 0x69, 0x6f, 0x2e, 0x64,
+	0x65, 0x65, 0x70, 0x68, 0x61, 0x76, 0x65, 0x6e, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x62,
+	0x61, 0x63, 0x6b, 0x70, 0x6c, 0x61, 0x6e, 0x65, 0x2e, 0x73, 0x63, 0x72, 0x69, 0x70, 0x74, 0x2e,
+	0x67, 0x72, 0x70, 0x63, 0x2e, 0x50, 0x6f, 0x73, 0x69, 0x74, 0x69, 0x6f, 0x6e, 0x52, 0x05, 0x73,
+	0x74, 0x61, 0x72, 0x74, 0x12, 0x44, 0x0a, 0x03, 0x65, 0x6e, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28,
+	0x0b, 0x32, 0x32, 0x2e, 0x69, 0x6f, 0x2e, 0x64, 0x65, 0x65, 0x70, 0x68, 0x61, 0x76, 0x65, 0x6e,
+	0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x62, 0x61, 0x63, 0x6b, 0x70, 0x6c, 0x61, 0x6e, 0x65,
+	0x2e, 0x73, 0x63, 0x72, 0x69, 0x70, 0x74, 0x2e, 0x67, 0x72, 0x70, 0x63, 0x2e, 0x50, 0x6f, 0x73,
+	0x69, 0x74, 0x69, 0x6f, 0x6e, 0x52, 0x03, 0x65, 0x6e, 0x64, 0x22, 0x4d, 0x0a, 0x1f, 0x56, 0x65,
 	0x72, 0x73, 0x69, 0x6f, 0x6e, 0x65, 0x64, 0x54, 0x65, 0x78, 0x74, 0x44, 0x6f, 0x63, 0x75, 0x6d,
-	0x65, 0x6e, 0x74, 0x49, 0x64, 0x65, 0x6e, 0x74, 0x69, 0x66, 0x69, 0x65, 0x72, 0x52, 0x0c, 0x74,
-	0x65, 0x78, 0x74, 0x44, 0x6f, 0x63, 0x75, 0x6d, 0x65, 0x6e, 0x74, 0x12, 0x4e, 0x0a, 0x08, 0x70,
-	0x6f, 0x73, 0x69, 0x74, 0x69, 0x6f, 0x6e, 0x18, 0x03, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x32, 0x2e,
-	0x69, 0x6f, 0x2e, 0x64, 0x65, 0x65, 0x70, 0x68, 0x61, 0x76, 0x65, 0x6e, 0x2e, 0x70, 0x72, 0x6f,
-	0x74, 0x6f, 0x2e, 0x62, 0x61, 0x63, 0x6b, 0x70, 0x6c, 0x61, 0x6e, 0x65, 0x2e, 0x73, 0x63, 0x72,
-	0x69, 0x70, 0x74, 0x2e, 0x67, 0x72, 0x70, 0x63, 0x2e, 0x50, 0x6f, 0x73, 0x69, 0x74, 0x69, 0x6f,
-	0x6e, 0x52, 0x08, 0x70, 0x6f, 0x73, 0x69, 0x74, 0x69, 0x6f, 0x6e, 0x22, 0x9c, 0x02, 0x0a, 0x14,
-	0x53, 0x69, 0x67, 0x6e, 0x61, 0x74, 0x75, 0x72, 0x65, 0x48, 0x65, 0x6c, 0x70, 0x43, 0x6f, 0x6e,
-	0x74, 0x65, 0x78, 0x74, 0x12, 0x21, 0x0a, 0x0c, 0x74, 0x72, 0x69, 0x67, 0x67, 0x65, 0x72, 0x5f,
-	0x6b, 0x69, 0x6e, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x0b, 0x74, 0x72, 0x69, 0x67,
-	0x67, 0x65, 0x72, 0x4b, 0x69, 0x6e, 0x64, 0x12, 0x30, 0x0a, 0x11, 0x74, 0x72, 0x69, 0x67, 0x67,
-	0x65, 0x72, 0x5f, 0x63, 0x68, 0x61, 0x72, 0x61, 0x63, 0x74, 0x65, 0x72, 0x18, 0x02, 0x20, 0x01,
-	0x28, 0x09, 0x48, 0x00, 0x52, 0x10, 0x74, 0x72, 0x69, 0x67, 0x67, 0x65, 0x72, 0x43, 0x68, 0x61,
-	0x72, 0x61, 0x63, 0x74, 0x65, 0x72, 0x88, 0x01, 0x01, 0x12, 0x21, 0x0a, 0x0c, 0x69, 0x73, 0x5f,
-	0x72, 0x65, 0x74, 0x72, 0x69, 0x67, 0x67, 0x65, 0x72, 0x18, 0x03, 0x20, 0x01, 0x28, 0x08, 0x52,
-	0x0b, 0x69, 0x73, 0x52, 0x65, 0x74, 0x72, 0x69, 0x67, 0x67, 0x65, 0x72, 0x12, 0x76, 0x0a, 0x15,
-	0x61, 0x63, 0x74, 0x69, 0x76, 0x65, 0x5f, 0x73, 0x69, 0x67, 0x6e, 0x61, 0x74, 0x75, 0x72, 0x65,
-	0x5f, 0x68, 0x65, 0x6c, 0x70, 0x18, 0x04, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x42, 0x2e, 0x69, 0x6f,
-	0x2e, 0x64, 0x65, 0x65, 0x70, 0x68, 0x61, 0x76, 0x65, 0x6e, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f,
-	0x2e, 0x62, 0x61, 0x63, 0x6b, 0x70, 0x6c, 0x61, 0x6e, 0x65, 0x2e, 0x73, 0x63, 0x72, 0x69, 0x70,
-	0x74, 0x2e, 0x67, 0x72, 0x70, 0x63, 0x2e, 0x47, 0x65, 0x74, 0x53, 0x69, 0x67, 0x6e, 0x61, 0x74,
-	0x75, 0x72, 0x65, 0x48, 0x65, 0x6c, 0x70, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x52,
-	0x13, 0x61, 0x63, 0x74, 0x69, 0x76, 0x65, 0x53, 0x69, 0x67, 0x6e, 0x61, 0x74, 0x75, 0x72, 0x65,
-	0x48, 0x65, 0x6c, 0x70, 0x42, 0x14, 0x0a, 0x12, 0x5f, 0x74, 0x72, 0x69, 0x67, 0x67, 0x65, 0x72,
-	0x5f, 0x63, 0x68, 0x61, 0x72, 0x61, 0x63, 0x74, 0x65, 0x72, 0x22, 0x84, 0x02, 0x0a, 0x18, 0x47,
-	0x65, 0x74, 0x53, 0x69, 0x67, 0x6e, 0x61, 0x74, 0x75, 0x72, 0x65, 0x48, 0x65, 0x6c, 0x70, 0x52,
-	0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x5e, 0x0a, 0x0a, 0x73, 0x69, 0x67, 0x6e, 0x61,
-	0x74, 0x75, 0x72, 0x65, 0x73, 0x18, 0x01, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x3e, 0x2e, 0x69, 0x6f,
+	0x65, 0x6e, 0x74, 0x49, 0x64, 0x65, 0x6e, 0x74, 0x69, 0x66, 0x69, 0x65, 0x72, 0x12, 0x10, 0x0a,
+	0x03, 0x75, 0x72, 0x69, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x75, 0x72, 0x69, 0x12,
+	0x18, 0x0a, 0x07, 0x76, 0x65, 0x72, 0x73, 0x69, 0x6f, 0x6e, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05,
+	0x52, 0x07, 0x76, 0x65, 0x72, 0x73, 0x69, 0x6f, 0x6e, 0x22, 0x3c, 0x0a, 0x08, 0x50, 0x6f, 0x73,
+	0x69, 0x74, 0x69, 0x6f, 0x6e, 0x12, 0x12, 0x0a, 0x04, 0x6c, 0x69, 0x6e, 0x65, 0x18, 0x01, 0x20,
+	0x01, 0x28, 0x05, 0x52, 0x04, 0x6c, 0x69, 0x6e, 0x65, 0x12, 0x1c, 0x0a, 0x09, 0x63, 0x68, 0x61,
+	0x72, 0x61, 0x63, 0x74, 0x65, 0x72, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x09, 0x63, 0x68,
+	0x61, 0x72, 0x61, 0x63, 0x74, 0x65, 0x72, 0x22, 0x39, 0x0a, 0x0d, 0x4d, 0x61, 0x72, 0x6b, 0x75,
+	0x70, 0x43, 0x6f, 0x6e, 0x74, 0x65, 0x6e, 0x74, 0x12, 0x12, 0x0a, 0x04, 0x6b, 0x69, 0x6e, 0x64,
+	0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x6b, 0x69, 0x6e, 0x64, 0x12, 0x14, 0x0a, 0x05,
+	0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x05, 0x76, 0x61, 0x6c,
+	0x75, 0x65, 0x22, 0xa3, 0x03, 0x0a, 0x19, 0x47, 0x65, 0x74, 0x43, 0x6f, 0x6d, 0x70, 0x6c, 0x65,
+	0x74, 0x69, 0x6f, 0x6e, 0x49, 0x74, 0x65, 0x6d, 0x73, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74,
+	0x12, 0x4c, 0x0a, 0x0a, 0x63, 0x6f, 0x6e, 0x73, 0x6f, 0x6c, 0x65, 0x5f, 0x69, 0x64, 0x18, 0x01,
+	0x20, 0x01, 0x28, 0x0b, 0x32, 0x29, 0x2e, 0x69, 0x6f, 0x2e, 0x64, 0x65, 0x65, 0x70, 0x68, 0x61,
+	0x76, 0x65, 0x6e, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x62, 0x61, 0x63, 0x6b, 0x70, 0x6c,
+	0x61, 0x6e, 0x65, 0x2e, 0x67, 0x72, 0x70, 0x63, 0x2e, 0x54, 0x69, 0x63, 0x6b, 0x65, 0x74, 0x42,
+	0x02, 0x18, 0x01, 0x52, 0x09, 0x63, 0x6f, 0x6e, 0x73, 0x6f, 0x6c, 0x65, 0x49, 0x64, 0x12, 0x55,
+	0x0a, 0x07, 0x63, 0x6f, 0x6e, 0x74, 0x65, 0x78, 0x74, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32,
+	0x3b, 0x2e, 0x69, 0x6f, 0x2e, 0x64, 0x65, 0x65, 0x70, 0x68, 0x61, 0x76, 0x65, 0x6e, 0x2e, 0x70,
+	0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x62, 0x61, 0x63, 0x6b, 0x70, 0x6c, 0x61, 0x6e, 0x65, 0x2e, 0x73,
+	0x63, 0x72, 0x69, 0x70, 0x74, 0x2e, 0x67, 0x72, 0x70, 0x63, 0x2e, 0x43, 0x6f, 0x6d, 0x70, 0x6c,
+	0x65, 0x74, 0x69, 0x6f, 0x6e, 0x43, 0x6f, 0x6e, 0x74, 0x65, 0x78, 0x74, 0x52, 0x07, 0x63, 0x6f,
+	0x6e, 0x74, 0x65, 0x78, 0x74, 0x12, 0x6e, 0x0a, 0x0d, 0x74, 0x65, 0x78, 0x74, 0x5f, 0x64, 0x6f,
+	0x63, 0x75, 0x6d, 0x65, 0x6e, 0x74, 0x18, 0x03, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x49, 0x2e, 0x69,
+	0x6f, 0x2e, 0x64, 0x65, 0x65, 0x70, 0x68, 0x61, 0x76, 0x65, 0x6e, 0x2e, 0x70, 0x72, 0x6f, 0x74,
+	0x6f, 0x2e, 0x62, 0x61, 0x63, 0x6b, 0x70, 0x6c, 0x61, 0x6e, 0x65, 0x2e, 0x73, 0x63, 0x72, 0x69,
+	0x70, 0x74, 0x2e, 0x67, 0x72, 0x70, 0x63, 0x2e, 0x56, 0x65, 0x72, 0x73, 0x69, 0x6f, 0x6e, 0x65,
+	0x64, 0x54, 0x65, 0x78, 0x74, 0x44, 0x6f, 0x63, 0x75, 0x6d, 0x65, 0x6e, 0x74, 0x49, 0x64, 0x65,
+	0x6e, 0x74, 0x69, 0x66, 0x69, 0x65, 0x72, 0x52, 0x0c, 0x74, 0x65, 0x78, 0x74, 0x44, 0x6f, 0x63,
+	0x75, 0x6d, 0x65, 0x6e, 0x74, 0x12, 0x4e, 0x0a, 0x08, 0x70, 0x6f, 0x73, 0x69, 0x74, 0x69, 0x6f,
+	0x6e, 0x18, 0x04, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x32, 0x2e, 0x69, 0x6f, 0x2e, 0x64, 0x65, 0x65,
+	0x70, 0x68, 0x61, 0x76, 0x65, 0x6e, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x62, 0x61, 0x63,
+	0x6b, 0x70, 0x6c, 0x61, 0x6e, 0x65, 0x2e, 0x73, 0x63, 0x72, 0x69, 0x70, 0x74, 0x2e, 0x67, 0x72,
+	0x70, 0x63, 0x2e, 0x50, 0x6f, 0x73, 0x69, 0x74, 0x69, 0x6f, 0x6e, 0x52, 0x08, 0x70, 0x6f, 0x73,
+	0x69, 0x74, 0x69, 0x6f, 0x6e, 0x12, 0x21, 0x0a, 0x0a, 0x72, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74,
+	0x5f, 0x69, 0x64, 0x18, 0x05, 0x20, 0x01, 0x28, 0x05, 0x42, 0x02, 0x18, 0x01, 0x52, 0x09, 0x72,
+	0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x49, 0x64, 0x22, 0x63, 0x0a, 0x11, 0x43, 0x6f, 0x6d, 0x70,
+	0x6c, 0x65, 0x74, 0x69, 0x6f, 0x6e, 0x43, 0x6f, 0x6e, 0x74, 0x65, 0x78, 0x74, 0x12, 0x21, 0x0a,
+	0x0c, 0x74, 0x72, 0x69, 0x67, 0x67, 0x65, 0x72, 0x5f, 0x6b, 0x69, 0x6e, 0x64, 0x18, 0x01, 0x20,
+	0x01, 0x28, 0x05, 0x52, 0x0b, 0x74, 0x72, 0x69, 0x67, 0x67, 0x65, 0x72, 0x4b, 0x69, 0x6e, 0x64,
+	0x12, 0x2b, 0x0a, 0x11, 0x74, 0x72, 0x69, 0x67, 0x67, 0x65, 0x72, 0x5f, 0x63, 0x68, 0x61, 0x72,
+	0x61, 0x63, 0x74, 0x65, 0x72, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x10, 0x74, 0x72, 0x69,
+	0x67, 0x67, 0x65, 0x72, 0x43, 0x68, 0x61, 0x72, 0x61, 0x63, 0x74, 0x65, 0x72, 0x22, 0xad, 0x01,
+	0x0a, 0x1a, 0x47, 0x65, 0x74, 0x43, 0x6f, 0x6d, 0x70, 0x6c, 0x65, 0x74, 0x69, 0x6f, 0x6e, 0x49,
+	0x74, 0x65, 0x6d, 0x73, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x4e, 0x0a, 0x05,
+	0x69, 0x74, 0x65, 0x6d, 0x73, 0x18, 0x01, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x38, 0x2e, 0x69, 0x6f,
 	0x2e, 0x64, 0x65, 0x65, 0x70, 0x68, 0x61, 0x76, 0x65, 0x6e, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f,
 	0x2e, 0x62, 0x61, 0x63, 0x6b, 0x70, 0x6c, 0x61, 0x6e, 0x65, 0x2e, 0x73, 0x63, 0x72, 0x69, 0x70,
-	0x74, 0x2e, 0x67, 0x72, 0x70, 0x63, 0x2e, 0x53, 0x69, 0x67, 0x6e, 0x61, 0x74, 0x75, 0x72, 0x65,
-	0x49, 0x6e, 0x66, 0x6f, 0x72, 0x6d, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x52, 0x0a, 0x73, 0x69, 0x67,
-	0x6e, 0x61, 0x74, 0x75, 0x72, 0x65, 0x73, 0x12, 0x2e, 0x0a, 0x10, 0x61, 0x63, 0x74, 0x69, 0x76,
-	0x65, 0x5f, 0x73, 0x69, 0x67, 0x6e, 0x61, 0x74, 0x75, 0x72, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28,
-	0x05, 0x48, 0x00, 0x52, 0x0f, 0x61, 0x63, 0x74, 0x69, 0x76, 0x65, 0x53, 0x69, 0x67, 0x6e, 0x61,
-	0x74, 0x75, 0x72, 0x65, 0x88, 0x01, 0x01, 0x12, 0x2e, 0x0a, 0x10, 0x61, 0x63, 0x74, 0x69, 0x76,
-	0x65, 0x5f, 0x70, 0x61, 0x72, 0x61, 0x6d, 0x65, 0x74, 0x65, 0x72, 0x18, 0x03, 0x20, 0x01, 0x28,
-	0x05, 0x48, 0x01, 0x52, 0x0f, 0x61, 0x63, 0x74, 0x69, 0x76, 0x65, 0x50, 0x61, 0x72, 0x61, 0x6d,
-	0x65, 0x74, 0x65, 0x72, 0x88, 0x01, 0x01, 0x42, 0x13, 0x0a, 0x11, 0x5f, 0x61, 0x63, 0x74, 0x69,
-	0x76, 0x65, 0x5f, 0x73, 0x69, 0x67, 0x6e, 0x61, 0x74, 0x75, 0x72, 0x65, 0x42, 0x13, 0x0a, 0x11,
-	0x5f, 0x61, 0x63, 0x74, 0x69, 0x76, 0x65, 0x5f, 0x70, 0x61, 0x72, 0x61, 0x6d, 0x65, 0x74, 0x65,
-	0x72, 0x22, 0xb0, 0x02, 0x0a, 0x14, 0x53, 0x69, 0x67, 0x6e, 0x61, 0x74, 0x75, 0x72, 0x65, 0x49,
-	0x6e, 0x66, 0x6f, 0x72, 0x6d, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x12, 0x14, 0x0a, 0x05, 0x6c, 0x61,
-	0x62, 0x65, 0x6c, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x05, 0x6c, 0x61, 0x62, 0x65, 0x6c,
+	0x74, 0x2e, 0x67, 0x72, 0x70, 0x63, 0x2e, 0x43, 0x6f, 0x6d, 0x70, 0x6c, 0x65, 0x74, 0x69, 0x6f,
+	0x6e, 0x49, 0x74, 0x65, 0x6d, 0x52, 0x05, 0x69, 0x74, 0x65, 0x6d, 0x73, 0x12, 0x21, 0x0a, 0x0a,
+	0x72, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x5f, 0x69, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05,
+	0x42, 0x02, 0x18, 0x01, 0x52, 0x09, 0x72, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x49, 0x64, 0x12,
+	0x1c, 0x0a, 0x07, 0x73, 0x75, 0x63, 0x63, 0x65, 0x73, 0x73, 0x18, 0x03, 0x20, 0x01, 0x28, 0x08,
+	0x42, 0x02, 0x18, 0x01, 0x52, 0x07, 0x73, 0x75, 0x63, 0x63, 0x65, 0x73, 0x73, 0x22, 0xf5, 0x04,
+	0x0a, 0x0e, 0x43, 0x6f, 0x6d, 0x70, 0x6c, 0x65, 0x74, 0x69, 0x6f, 0x6e, 0x49, 0x74, 0x65, 0x6d,
+	0x12, 0x14, 0x0a, 0x05, 0x73, 0x74, 0x61, 0x72, 0x74, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52,
+	0x05, 0x73, 0x74, 0x61, 0x72, 0x74, 0x12, 0x16, 0x0a, 0x06, 0x6c, 0x65, 0x6e, 0x67, 0x74, 0x68,
+	0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x06, 0x6c, 0x65, 0x6e, 0x67, 0x74, 0x68, 0x12, 0x14,
+	0x0a, 0x05, 0x6c, 0x61, 0x62, 0x65, 0x6c, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x52, 0x05, 0x6c,
+	0x61, 0x62, 0x65, 0x6c, 0x12, 0x12, 0x0a, 0x04, 0x6b, 0x69, 0x6e, 0x64, 0x18, 0x04, 0x20, 0x01,
+	0x28, 0x05, 0x52, 0x04, 0x6b, 0x69, 0x6e, 0x64, 0x12, 0x16, 0x0a, 0x06, 0x64, 0x65, 0x74, 0x61,
+	0x69, 0x6c, 0x18, 0x05, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06, 0x64, 0x65, 0x74, 0x61, 0x69, 0x6c,
+	0x12, 0x1e, 0x0a, 0x0a, 0x64, 0x65, 0x70, 0x72, 0x65, 0x63, 0x61, 0x74, 0x65, 0x64, 0x18, 0x07,
+	0x20, 0x01, 0x28, 0x08, 0x52, 0x0a, 0x64, 0x65, 0x70, 0x72, 0x65, 0x63, 0x61, 0x74, 0x65, 0x64,
+	0x12, 0x1c, 0x0a, 0x09, 0x70, 0x72, 0x65, 0x73, 0x65, 0x6c, 0x65, 0x63, 0x74, 0x18, 0x08, 0x20,
+	0x01, 0x28, 0x08, 0x52, 0x09, 0x70, 0x72, 0x65, 0x73, 0x65, 0x6c, 0x65, 0x63, 0x74, 0x12, 0x4f,
+	0x0a, 0x09, 0x74, 0x65, 0x78, 0x74, 0x5f, 0x65, 0x64, 0x69, 0x74, 0x18, 0x09, 0x20, 0x01, 0x28,
+	0x0b, 0x32, 0x32, 0x2e, 0x69, 0x6f, 0x2e, 0x64, 0x65, 0x65, 0x70, 0x68, 0x61, 0x76, 0x65, 0x6e,
+	0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x62, 0x61, 0x63, 0x6b, 0x70, 0x6c, 0x61, 0x6e, 0x65,
+	0x2e, 0x73, 0x63, 0x72, 0x69, 0x70, 0x74, 0x2e, 0x67, 0x72, 0x70, 0x63, 0x2e, 0x54, 0x65, 0x78,
+	0x74, 0x45, 0x64, 0x69, 0x74, 0x52, 0x08, 0x74, 0x65, 0x78, 0x74, 0x45, 0x64, 0x69, 0x74, 0x12,
+	0x1b, 0x0a, 0x09, 0x73, 0x6f, 0x72, 0x74, 0x5f, 0x74, 0x65, 0x78, 0x74, 0x18, 0x0a, 0x20, 0x01,
+	0x28, 0x09, 0x52, 0x08, 0x73, 0x6f, 0x72, 0x74, 0x54, 0x65, 0x78, 0x74, 0x12, 0x1f, 0x0a, 0x0b,
+	0x66, 0x69, 0x6c, 0x74, 0x65, 0x72, 0x5f, 0x74, 0x65, 0x78, 0x74, 0x18, 0x0b, 0x20, 0x01, 0x28,
+	0x09, 0x52, 0x0a, 0x66, 0x69, 0x6c, 0x74, 0x65, 0x72, 0x54, 0x65, 0x78, 0x74, 0x12, 0x2c, 0x0a,
+	0x12, 0x69, 0x6e, 0x73, 0x65, 0x72, 0x74, 0x5f, 0x74, 0x65, 0x78, 0x74, 0x5f, 0x66, 0x6f, 0x72,
+	0x6d, 0x61, 0x74, 0x18, 0x0c, 0x20, 0x01, 0x28, 0x05, 0x52, 0x10, 0x69, 0x6e, 0x73, 0x65, 0x72,
+	0x74, 0x54, 0x65, 0x78, 0x74, 0x46, 0x6f, 0x72, 0x6d, 0x61, 0x74, 0x12, 0x66, 0x0a, 0x15, 0x61,
+	0x64, 0x64, 0x69, 0x74, 0x69, 0x6f, 0x6e, 0x61, 0x6c, 0x5f, 0x74, 0x65, 0x78, 0x74, 0x5f, 0x65,
+	0x64, 0x69, 0x74, 0x73, 0x18, 0x0d, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x32, 0x2e, 0x69, 0x6f, 0x2e,
+	0x64, 0x65, 0x65, 0x70, 0x68, 0x61, 0x76, 0x65, 0x6e, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e,
+	0x62, 0x61, 0x63, 0x6b, 0x70, 0x6c, 0x61, 0x6e, 0x65, 0x2e, 0x73, 0x63, 0x72, 0x69, 0x70, 0x74,
+	0x2e, 0x67, 0x72, 0x70, 0x63, 0x2e, 0x54, 0x65, 0x78, 0x74, 0x45, 0x64, 0x69, 0x74, 0x52, 0x13,
+	0x61, 0x64, 0x64, 0x69, 0x74, 0x69, 0x6f, 0x6e, 0x61, 0x6c, 0x54, 0x65, 0x78, 0x74, 0x45, 0x64,
+	0x69, 0x74, 0x73, 0x12, 0x2b, 0x0a, 0x11, 0x63, 0x6f, 0x6d, 0x6d, 0x69, 0x74, 0x5f, 0x63, 0x68,
+	0x61, 0x72, 0x61, 0x63, 0x74, 0x65, 0x72, 0x73, 0x18, 0x0e, 0x20, 0x03, 0x28, 0x09, 0x52, 0x10,
+	0x63, 0x6f, 0x6d, 0x6d, 0x69, 0x74, 0x43, 0x68, 0x61, 0x72, 0x61, 0x63, 0x74, 0x65, 0x72, 0x73,
 	0x12, 0x5d, 0x0a, 0x0d, 0x64, 0x6f, 0x63, 0x75, 0x6d, 0x65, 0x6e, 0x74, 0x61, 0x74, 0x69, 0x6f,
-	0x6e, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x37, 0x2e, 0x69, 0x6f, 0x2e, 0x64, 0x65, 0x65,
+	0x6e, 0x18, 0x0f, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x37, 0x2e, 0x69, 0x6f, 0x2e, 0x64, 0x65, 0x65,
 	0x70, 0x68, 0x61, 0x76, 0x65, 0x6e, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x62, 0x61, 0x63,
 	0x6b, 0x70, 0x6c, 0x61, 0x6e, 0x65, 0x2e, 0x73, 0x63, 0x72, 0x69, 0x70, 0x74, 0x2e, 0x67, 0x72,
 	0x70, 0x63, 0x2e, 0x4d, 0x61, 0x72, 0x6b, 0x75, 0x70, 0x43, 0x6f, 0x6e, 0x74, 0x65, 0x6e, 0x74,
-	0x52, 0x0d, 0x64, 0x6f, 0x63, 0x75, 0x6d, 0x65, 0x6e, 0x74, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x12,
-	0x5e, 0x0a, 0x0a, 0x70, 0x61, 0x72, 0x61, 0x6d, 0x65, 0x74, 0x65, 0x72, 0x73, 0x18, 0x03, 0x20,
-	0x03, 0x28, 0x0b, 0x32, 0x3e, 0x2e, 0x69, 0x6f, 0x2e, 0x64, 0x65, 0x65, 0x70, 0x68, 0x61, 0x76,
-	0x65, 0x6e, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x62, 0x61, 0x63, 0x6b, 0x70, 0x6c, 0x61,
-	0x6e, 0x65, 0x2e, 0x73, 0x63, 0x72, 0x69, 0x70, 0x74, 0x2e, 0x67, 0x72, 0x70, 0x63, 0x2e, 0x50,
-	0x61, 0x72, 0x61, 0x6d, 0x65, 0x74, 0x65, 0x72, 0x49, 0x6e, 0x66, 0x6f, 0x72, 0x6d, 0x61, 0x74,
-	0x69, 0x6f, 0x6e, 0x52, 0x0a, 0x70, 0x61, 0x72, 0x61, 0x6d, 0x65, 0x74, 0x65, 0x72, 0x73, 0x12,
-	0x2e, 0x0a, 0x10, 0x61, 0x63, 0x74, 0x69, 0x76, 0x65, 0x5f, 0x70, 0x61, 0x72, 0x61, 0x6d, 0x65,
-	0x74, 0x65, 0x72, 0x18, 0x04, 0x20, 0x01, 0x28, 0x05, 0x48, 0x00, 0x52, 0x0f, 0x61, 0x63, 0x74,
-	0x69, 0x76, 0x65, 0x50, 0x61, 0x72, 0x61, 0x6d, 0x65, 0x74, 0x65, 0x72, 0x88, 0x01, 0x01, 0x42,
-	0x13, 0x0a, 0x11, 0x5f, 0x61, 0x63, 0x74, 0x69, 0x76, 0x65, 0x5f, 0x70, 0x61, 0x72, 0x61, 0x6d,
-	0x65, 0x74, 0x65, 0x72, 0x22, 0x8b, 0x01, 0x0a, 0x14, 0x50, 0x61, 0x72, 0x61, 0x6d, 0x65, 0x74,
-	0x65, 0x72, 0x49, 0x6e, 0x66, 0x6f, 0x72, 0x6d, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x12, 0x14, 0x0a,
-	0x05, 0x6c, 0x61, 0x62, 0x65, 0x6c, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x05, 0x6c, 0x61,
-	0x62, 0x65, 0x6c, 0x12, 0x5d, 0x0a, 0x0d, 0x64, 0x6f, 0x63, 0x75, 0x6d, 0x65, 0x6e, 0x74, 0x61,
-	0x74, 0x69, 0x6f, 0x6e, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x37, 0x2e, 0x69, 0x6f, 0x2e,
+	0x52, 0x0d, 0x64, 0x6f, 0x63, 0x75, 0x6d, 0x65, 0x6e, 0x74, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x4a,
+	0x04, 0x08, 0x06, 0x10, 0x07, 0x22, 0x6d, 0x0a, 0x08, 0x54, 0x65, 0x78, 0x74, 0x45, 0x64, 0x69,
+	0x74, 0x12, 0x4d, 0x0a, 0x05, 0x72, 0x61, 0x6e, 0x67, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b,
+	0x32, 0x37, 0x2e, 0x69, 0x6f, 0x2e, 0x64, 0x65, 0x65, 0x70, 0x68, 0x61, 0x76, 0x65, 0x6e, 0x2e,
+	0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x62, 0x61, 0x63, 0x6b, 0x70, 0x6c, 0x61, 0x6e, 0x65, 0x2e,
+	0x73, 0x63, 0x72, 0x69, 0x70, 0x74, 0x2e, 0x67, 0x72, 0x70, 0x63, 0x2e, 0x44, 0x6f, 0x63, 0x75,
+	0x6d, 0x65, 0x6e, 0x74, 0x52, 0x61, 0x6e, 0x67, 0x65, 0x52, 0x05, 0x72, 0x61, 0x6e, 0x67, 0x65,
+	0x12, 0x12, 0x0a, 0x04, 0x74, 0x65, 0x78, 0x74, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04,
+	0x74, 0x65, 0x78, 0x74, 0x22, 0xb3, 0x02, 0x0a, 0x17, 0x47, 0x65, 0x74, 0x53, 0x69, 0x67, 0x6e,
+	0x61, 0x74, 0x75, 0x72, 0x65, 0x48, 0x65, 0x6c, 0x70, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74,
+	0x12, 0x58, 0x0a, 0x07, 0x63, 0x6f, 0x6e, 0x74, 0x65, 0x78, 0x74, 0x18, 0x01, 0x20, 0x01, 0x28,
+	0x0b, 0x32, 0x3e, 0x2e, 0x69, 0x6f, 0x2e, 0x64, 0x65, 0x65, 0x70, 0x68, 0x61, 0x76, 0x65, 0x6e,
+	0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x62, 0x61, 0x63, 0x6b, 0x70, 0x6c, 0x61, 0x6e, 0x65,
+	0x2e, 0x73, 0x63, 0x72, 0x69, 0x70, 0x74, 0x2e, 0x67, 0x72, 0x70, 0x63, 0x2e, 0x53, 0x69, 0x67,
+	0x6e, 0x61, 0x74, 0x75, 0x72, 0x65, 0x48, 0x65, 0x6c, 0x70, 0x43, 0x6f, 0x6e, 0x74, 0x65, 0x78,
+	0x74, 0x52, 0x07, 0x63, 0x6f, 0x6e, 0x74, 0x65, 0x78, 0x74, 0x12, 0x6e, 0x0a, 0x0d, 0x74, 0x65,
+	0x78, 0x74, 0x5f, 0x64, 0x6f, 0x63, 0x75, 0x6d, 0x65, 0x6e, 0x74, 0x18, 0x02, 0x20, 0x01, 0x28,
+	0x0b, 0x32, 0x49, 0x2e, 0x69, 0x6f, 0x2e, 0x64, 0x65, 0x65, 0x70, 0x68, 0x61, 0x76, 0x65, 0x6e,
+	0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x62, 0x61, 0x63, 0x6b, 0x70, 0x6c, 0x61, 0x6e, 0x65,
+	0x2e, 0x73, 0x63, 0x72, 0x69, 0x70, 0x74, 0x2e, 0x67, 0x72, 0x70, 0x63, 0x2e, 0x56, 0x65, 0x72,
+	0x73, 0x69, 0x6f, 0x6e, 0x65, 0x64, 0x54, 0x65, 0x78, 0x74, 0x44, 0x6f, 0x63, 0x75, 0x6d, 0x65,
+	0x6e, 0x74, 0x49, 0x64, 0x65, 0x6e, 0x74, 0x69, 0x66, 0x69, 0x65, 0x72, 0x52, 0x0c, 0x74, 0x65,
+	0x78, 0x74, 0x44, 0x6f, 0x63, 0x75, 0x6d, 0x65, 0x6e, 0x74, 0x12, 0x4e, 0x0a, 0x08, 0x70, 0x6f,
+	0x73, 0x69, 0x74, 0x69, 0x6f, 0x6e, 0x18, 0x03, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x32, 0x2e, 0x69,
+	0x6f, 0x2e, 0x64, 0x65, 0x65, 0x70, 0x68, 0x61, 0x76, 0x65, 0x6e, 0x2e, 0x70, 0x72, 0x6f, 0x74,
+	0x6f, 0x2e, 0x62, 0x61, 0x63, 0x6b, 0x70, 0x6c, 0x61, 0x6e, 0x65, 0x2e, 0x73, 0x63, 0x72, 0x69,
+	0x70, 0x74, 0x2e, 0x67, 0x72, 0x70, 0x63, 0x2e, 0x50, 0x6f, 0x73, 0x69, 0x74, 0x69, 0x6f, 0x6e,
+	0x52, 0x08, 0x70, 0x6f, 0x73, 0x69, 0x74, 0x69, 0x6f, 0x6e, 0x22, 0x9c, 0x02, 0x0a, 0x14, 0x53,
+	0x69, 0x67, 0x6e, 0x61, 0x74, 0x75, 0x72, 0x65, 0x48, 0x65, 0x6c, 0x70, 0x43, 0x6f, 0x6e, 0x74,
+	0x65, 0x78, 0x74, 0x12, 0x21, 0x0a, 0x0c, 0x74, 0x72, 0x69, 0x67, 0x67, 0x65, 0x72, 0x5f, 0x6b,
+	0x69, 0x6e, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x0b, 0x74, 0x72, 0x69, 0x67, 0x67,
+	0x65, 0x72, 0x4b, 0x69, 0x6e, 0x64, 0x12, 0x30, 0x0a, 0x11, 0x74, 0x72, 0x69, 0x67, 0x67, 0x65,
+	0x72, 0x5f, 0x63, 0x68, 0x61, 0x72, 0x61, 0x63, 0x74, 0x65, 0x72, 0x18, 0x02, 0x20, 0x01, 0x28,
+	0x09, 0x48, 0x00, 0x52, 0x10, 0x74, 0x72, 0x69, 0x67, 0x67, 0x65, 0x72, 0x43, 0x68, 0x61, 0x72,
+	0x61, 0x63, 0x74, 0x65, 0x72, 0x88, 0x01, 0x01, 0x12, 0x21, 0x0a, 0x0c, 0x69, 0x73, 0x5f, 0x72,
+	0x65, 0x74, 0x72, 0x69, 0x67, 0x67, 0x65, 0x72, 0x18, 0x03, 0x20, 0x01, 0x28, 0x08, 0x52, 0x0b,
+	0x69, 0x73, 0x52, 0x65, 0x74, 0x72, 0x69, 0x67, 0x67, 0x65, 0x72, 0x12, 0x76, 0x0a, 0x15, 0x61,
+	0x63, 0x74, 0x69, 0x76, 0x65, 0x5f, 0x73, 0x69, 0x67, 0x6e, 0x61, 0x74, 0x75, 0x72, 0x65, 0x5f,
+	0x68, 0x65, 0x6c, 0x70, 0x18, 0x04, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x42, 0x2e, 0x69, 0x6f, 0x2e,
 	0x64, 0x65, 0x65, 0x70, 0x68, 0x61, 0x76, 0x65, 0x6e, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e,
 	0x62, 0x61, 0x63, 0x6b, 0x70, 0x6c, 0x61, 0x6e, 0x65, 0x2e, 0x73, 0x63, 0x72, 0x69, 0x70, 0x74,
-	0x2e, 0x67, 0x72, 0x70, 0x63, 0x2e, 0x4d, 0x61, 0x72, 0x6b, 0x75, 0x70, 0x43, 0x6f, 0x6e, 0x74,
-	0x65, 0x6e, 0x74, 0x52, 0x0d, 0x64, 0x6f, 0x63, 0x75, 0x6d, 0x65, 0x6e, 0x74, 0x61, 0x74, 0x69,
-	0x6f, 0x6e, 0x22, 0xd1, 0x01, 0x0a, 0x0f, 0x47, 0x65, 0x74, 0x48, 0x6f, 0x76, 0x65, 0x72, 0x52,
-	0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x6e, 0x0a, 0x0d, 0x74, 0x65, 0x78, 0x74, 0x5f, 0x64,
-	0x6f, 0x63, 0x75, 0x6d, 0x65, 0x6e, 0x74, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x49, 0x2e,
-	0x69, 0x6f, 0x2e, 0x64, 0x65, 0x65, 0x70, 0x68, 0x61, 0x76, 0x65, 0x6e, 0x2e, 0x70, 0x72, 0x6f,
-	0x74, 0x6f, 0x2e, 0x62, 0x61, 0x63, 0x6b, 0x70, 0x6c, 0x61, 0x6e, 0x65, 0x2e, 0x73, 0x63, 0x72,
-	0x69, 0x70, 0x74, 0x2e, 0x67, 0x72, 0x70, 0x63, 0x2e, 0x56, 0x65, 0x72, 0x73, 0x69, 0x6f, 0x6e,
-	0x65, 0x64, 0x54, 0x65, 0x78, 0x74, 0x44, 0x6f, 0x63, 0x75, 0x6d, 0x65, 0x6e, 0x74, 0x49, 0x64,
-	0x65, 0x6e, 0x74, 0x69, 0x66, 0x69, 0x65, 0x72, 0x52, 0x0c, 0x74, 0x65, 0x78, 0x74, 0x44, 0x6f,
-	0x63, 0x75, 0x6d, 0x65, 0x6e, 0x74, 0x12, 0x4e, 0x0a, 0x08, 0x70, 0x6f, 0x73, 0x69, 0x74, 0x69,
-	0x6f, 0x6e, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x32, 0x2e, 0x69, 0x6f, 0x2e, 0x64, 0x65,
-	0x65, 0x70, 0x68, 0x61, 0x76, 0x65, 0x6e, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x62, 0x61,
-	0x63, 0x6b, 0x70, 0x6c, 0x61, 0x6e, 0x65, 0x2e, 0x73, 0x63, 0x72, 0x69, 0x70, 0x74, 0x2e, 0x67,
-	0x72, 0x70, 0x63, 0x2e, 0x50, 0x6f, 0x73, 0x69, 0x74, 0x69, 0x6f, 0x6e, 0x52, 0x08, 0x70, 0x6f,
-	0x73, 0x69, 0x74, 0x69, 0x6f, 0x6e, 0x22, 0xb6, 0x01, 0x0a, 0x10, 0x47, 0x65, 0x74, 0x48, 0x6f,
-	0x76, 0x65, 0x72, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x53, 0x0a, 0x08, 0x63,
-	0x6f, 0x6e, 0x74, 0x65, 0x6e, 0x74, 0x73, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x37, 0x2e,
-	0x69, 0x6f, 0x2e, 0x64, 0x65, 0x65, 0x70, 0x68, 0x61, 0x76, 0x65, 0x6e, 0x2e, 0x70, 0x72, 0x6f,
-	0x74, 0x6f, 0x2e, 0x62, 0x61, 0x63, 0x6b, 0x70, 0x6c, 0x61, 0x6e, 0x65, 0x2e, 0x73, 0x63, 0x72,
-	0x69, 0x70, 0x74, 0x2e, 0x67, 0x72, 0x70, 0x63, 0x2e, 0x4d, 0x61, 0x72, 0x6b, 0x75, 0x70, 0x43,
-	0x6f, 0x6e, 0x74, 0x65, 0x6e, 0x74, 0x52, 0x08, 0x63, 0x6f, 0x6e, 0x74, 0x65, 0x6e, 0x74, 0x73,
-	0x12, 0x4d, 0x0a, 0x05, 0x72, 0x61, 0x6e, 0x67, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32,
-	0x37, 0x2e, 0x69, 0x6f, 0x2e, 0x64, 0x65, 0x65, 0x70, 0x68, 0x61, 0x76, 0x65, 0x6e, 0x2e, 0x70,
-	0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x62, 0x61, 0x63, 0x6b, 0x70, 0x6c, 0x61, 0x6e, 0x65, 0x2e, 0x73,
-	0x63, 0x72, 0x69, 0x70, 0x74, 0x2e, 0x67, 0x72, 0x70, 0x63, 0x2e, 0x44, 0x6f, 0x63, 0x75, 0x6d,
-	0x65, 0x6e, 0x74, 0x52, 0x61, 0x6e, 0x67, 0x65, 0x52, 0x05, 0x72, 0x61, 0x6e, 0x67, 0x65, 0x22,
-	0x84, 0x02, 0x0a, 0x14, 0x47, 0x65, 0x74, 0x44, 0x69, 0x61, 0x67, 0x6e, 0x6f, 0x73, 0x74, 0x69,
-	0x63, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x6e, 0x0a, 0x0d, 0x74, 0x65, 0x78, 0x74,
-	0x5f, 0x64, 0x6f, 0x63, 0x75, 0x6d, 0x65, 0x6e, 0x74, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32,
-	0x49, 0x2e, 0x69, 0x6f, 0x2e, 0x64, 0x65, 0x65, 0x70, 0x68, 0x61, 0x76, 0x65, 0x6e, 0x2e, 0x70,
-	0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x62, 0x61, 0x63, 0x6b, 0x70, 0x6c, 0x61, 0x6e, 0x65, 0x2e, 0x73,
-	0x63, 0x72, 0x69, 0x70, 0x74, 0x2e, 0x67, 0x72, 0x70, 0x63, 0x2e, 0x56, 0x65, 0x72, 0x73, 0x69,
-	0x6f, 0x6e, 0x65, 0x64, 0x54, 0x65, 0x78, 0x74, 0x44, 0x6f, 0x63, 0x75, 0x6d, 0x65, 0x6e, 0x74,
-	0x49, 0x64, 0x65, 0x6e, 0x74, 0x69, 0x66, 0x69, 0x65, 0x72, 0x52, 0x0c, 0x74, 0x65, 0x78, 0x74,
-	0x44, 0x6f, 0x63, 0x75, 0x6d, 0x65, 0x6e, 0x74, 0x12, 0x23, 0x0a, 0x0a, 0x69, 0x64, 0x65, 0x6e,
-	0x74, 0x69, 0x66, 0x69, 0x65, 0x72, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x48, 0x00, 0x52, 0x0a,
-	0x69, 0x64, 0x65, 0x6e, 0x74, 0x69, 0x66, 0x69, 0x65, 0x72, 0x88, 0x01, 0x01, 0x12, 0x31, 0x0a,
-	0x12, 0x70, 0x72, 0x65, 0x76, 0x69, 0x6f, 0x75, 0x73, 0x5f, 0x72, 0x65, 0x73, 0x75, 0x6c, 0x74,
-	0x5f, 0x69, 0x64, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x48, 0x01, 0x52, 0x10, 0x70, 0x72, 0x65,
-	0x76, 0x69, 0x6f, 0x75, 0x73, 0x52, 0x65, 0x73, 0x75, 0x6c, 0x74, 0x49, 0x64, 0x88, 0x01, 0x01,
-	0x42, 0x0d, 0x0a, 0x0b, 0x5f, 0x69, 0x64, 0x65, 0x6e, 0x74, 0x69, 0x66, 0x69, 0x65, 0x72, 0x42,
-	0x15, 0x0a, 0x13, 0x5f, 0x70, 0x72, 0x65, 0x76, 0x69, 0x6f, 0x75, 0x73, 0x5f, 0x72, 0x65, 0x73,
-	0x75, 0x6c, 0x74, 0x5f, 0x69, 0x64, 0x22, 0xab, 0x01, 0x0a, 0x19, 0x47, 0x65, 0x74, 0x50, 0x75,
-	0x6c, 0x6c, 0x44, 0x69, 0x61, 0x67, 0x6e, 0x6f, 0x73, 0x74, 0x69, 0x63, 0x52, 0x65, 0x73, 0x70,
-	0x6f, 0x6e, 0x73, 0x65, 0x12, 0x12, 0x0a, 0x04, 0x6b, 0x69, 0x6e, 0x64, 0x18, 0x01, 0x20, 0x01,
-	0x28, 0x09, 0x52, 0x04, 0x6b, 0x69, 0x6e, 0x64, 0x12, 0x20, 0x0a, 0x09, 0x72, 0x65, 0x73, 0x75,
-	0x6c, 0x74, 0x5f, 0x69, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x48, 0x00, 0x52, 0x08, 0x72,
-	0x65, 0x73, 0x75, 0x6c, 0x74, 0x49, 0x64, 0x88, 0x01, 0x01, 0x12, 0x4a, 0x0a, 0x05, 0x69, 0x74,
-	0x65, 0x6d, 0x73, 0x18, 0x03, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x34, 0x2e, 0x69, 0x6f, 0x2e, 0x64,
+	0x2e, 0x67, 0x72, 0x70, 0x63, 0x2e, 0x47, 0x65, 0x74, 0x53, 0x69, 0x67, 0x6e, 0x61, 0x74, 0x75,
+	0x72, 0x65, 0x48, 0x65, 0x6c, 0x70, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x52, 0x13,
+	0x61, 0x63, 0x74, 0x69, 0x76, 0x65, 0x53, 0x69, 0x67, 0x6e, 0x61, 0x74, 0x75, 0x72, 0x65, 0x48,
+	0x65, 0x6c, 0x70, 0x42, 0x14, 0x0a, 0x12, 0x5f, 0x74, 0x72, 0x69, 0x67, 0x67, 0x65, 0x72, 0x5f,
+	0x63, 0x68, 0x61, 0x72, 0x61, 0x63, 0x74, 0x65, 0x72, 0x22, 0x84, 0x02, 0x0a, 0x18, 0x47, 0x65,
+	0x74, 0x53, 0x69, 0x67, 0x6e, 0x61, 0x74, 0x75, 0x72, 0x65, 0x48, 0x65, 0x6c, 0x70, 0x52, 0x65,
+	0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x5e, 0x0a, 0x0a, 0x73, 0x69, 0x67, 0x6e, 0x61, 0x74,
+	0x75, 0x72, 0x65, 0x73, 0x18, 0x01, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x3e, 0x2e, 0x69, 0x6f, 0x2e,
+	0x64, 0x65, 0x65, 0x70, 0x68, 0x61, 0x76, 0x65, 0x6e, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e,
+	0x62, 0x61, 0x63, 0x6b, 0x70, 0x6c, 0x61, 0x6e, 0x65, 0x2e, 0x73, 0x63, 0x72, 0x69, 0x70, 0x74,
+	0x2e, 0x67, 0x72, 0x70, 0x63, 0x2e, 0x53, 0x69, 0x67, 0x6e, 0x61, 0x74, 0x75, 0x72, 0x65, 0x49,
+	0x6e, 0x66, 0x6f, 0x72, 0x6d, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x52, 0x0a, 0x73, 0x69, 0x67, 0x6e,
+	0x61, 0x74, 0x75, 0x72, 0x65, 0x73, 0x12, 0x2e, 0x0a, 0x10, 0x61, 0x63, 0x74, 0x69, 0x76, 0x65,
+	0x5f, 0x73, 0x69, 0x67, 0x6e, 0x61, 0x74, 0x75, 0x72, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05,
+	0x48, 0x00, 0x52, 0x0f, 0x61, 0x63, 0x74, 0x69, 0x76, 0x65, 0x53, 0x69, 0x67, 0x6e, 0x61, 0x74,
+	0x75, 0x72, 0x65, 0x88, 0x01, 0x01, 0x12, 0x2e, 0x0a, 0x10, 0x61, 0x63, 0x74, 0x69, 0x76, 0x65,
+	0x5f, 0x70, 0x61, 0x72, 0x61, 0x6d, 0x65, 0x74, 0x65, 0x72, 0x18, 0x03, 0x20, 0x01, 0x28, 0x05,
+	0x48, 0x01, 0x52, 0x0f, 0x61, 0x63, 0x74, 0x69, 0x76, 0x65, 0x50, 0x61, 0x72, 0x61, 0x6d, 0x65,
+	0x74, 0x65, 0x72, 0x88, 0x01, 0x01, 0x42, 0x13, 0x0a, 0x11, 0x5f, 0x61, 0x63, 0x74, 0x69, 0x76,
+	0x65, 0x5f, 0x73, 0x69, 0x67, 0x6e, 0x61, 0x74, 0x75, 0x72, 0x65, 0x42, 0x13, 0x0a, 0x11, 0x5f,
+	0x61, 0x63, 0x74, 0x69, 0x76, 0x65, 0x5f, 0x70, 0x61, 0x72, 0x61, 0x6d, 0x65, 0x74, 0x65, 0x72,
+	0x22, 0xb0, 0x02, 0x0a, 0x14, 0x53, 0x69, 0x67, 0x6e, 0x61, 0x74, 0x75, 0x72, 0x65, 0x49, 0x6e,
+	0x66, 0x6f, 0x72, 0x6d, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x12, 0x14, 0x0a, 0x05, 0x6c, 0x61, 0x62,
+	0x65, 0x6c, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x05, 0x6c, 0x61, 0x62, 0x65, 0x6c, 0x12,
+	0x5d, 0x0a, 0x0d, 0x64, 0x6f, 0x63, 0x75, 0x6d, 0x65, 0x6e, 0x74, 0x61, 0x74, 0x69, 0x6f, 0x6e,
+	0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x37, 0x2e, 0x69, 0x6f, 0x2e, 0x64, 0x65, 0x65, 0x70,
+	0x68, 0x61, 0x76, 0x65, 0x6e, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x62, 0x61, 0x63, 0x6b,
+	0x70, 0x6c, 0x61, 0x6e, 0x65, 0x2e, 0x73, 0x63, 0x72, 0x69, 0x70, 0x74, 0x2e, 0x67, 0x72, 0x70,
+	0x63, 0x2e, 0x4d, 0x61, 0x72, 0x6b, 0x75, 0x70, 0x43, 0x6f, 0x6e, 0x74, 0x65, 0x6e, 0x74, 0x52,
+	0x0d, 0x64, 0x6f, 0x63, 0x75, 0x6d, 0x65, 0x6e, 0x74, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x12, 0x5e,
+	0x0a, 0x0a, 0x70, 0x61, 0x72, 0x61, 0x6d, 0x65, 0x74, 0x65, 0x72, 0x73, 0x18, 0x03, 0x20, 0x03,
+	0x28, 0x0b, 0x32, 0x3e, 0x2e, 0x69, 0x6f, 0x2e, 0x64, 0x65, 0x65, 0x70, 0x68, 0x61, 0x76, 0x65,
+	0x6e, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x62, 0x61, 0x63, 0x6b, 0x70, 0x6c, 0x61, 0x6e,
+	0x65, 0x2e, 0x73, 0x63, 0x72, 0x69, 0x70, 0x74, 0x2e, 0x67, 0x72, 0x70, 0x63, 0x2e, 0x50, 0x61,
+	0x72, 0x61, 0x6d, 0x65, 0x74, 0x65, 0x72, 0x49, 0x6e, 0x66, 0x6f, 0x72, 0x6d, 0x61, 0x74, 0x69,
+	0x6f, 0x6e, 0x52, 0x0a, 0x70, 0x61, 0x72, 0x61, 0x6d, 0x65, 0x74, 0x65, 0x72, 0x73, 0x12, 0x2e,
+	0x0a, 0x10, 0x61, 0x63, 0x74, 0x69, 0x76, 0x65, 0x5f, 0x70, 0x61, 0x72, 0x61, 0x6d, 0x65, 0x74,
+	0x65, 0x72, 0x18, 0x04, 0x20, 0x01, 0x28, 0x05, 0x48, 0x00, 0x52, 0x0f, 0x61, 0x63, 0x74, 0x69,
+	0x76, 0x65, 0x50, 0x61, 0x72, 0x61, 0x6d, 0x65, 0x74, 0x65, 0x72, 0x88, 0x01, 0x01, 0x42, 0x13,
+	0x0a, 0x11, 0x5f, 0x61, 0x63, 0x74, 0x69, 0x76, 0x65, 0x5f, 0x70, 0x61, 0x72, 0x61, 0x6d, 0x65,
+	0x74, 0x65, 0x72, 0x22, 0x8b, 0x01, 0x0a, 0x14, 0x50, 0x61, 0x72, 0x61, 0x6d, 0x65, 0x74, 0x65,
+	0x72, 0x49, 0x6e, 0x66, 0x6f, 0x72, 0x6d, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x12, 0x14, 0x0a, 0x05,
+	0x6c, 0x61, 0x62, 0x65, 0x6c, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x05, 0x6c, 0x61, 0x62,
+	0x65, 0x6c, 0x12, 0x5d, 0x0a, 0x0d, 0x64, 0x6f, 0x63, 0x75, 0x6d, 0x65, 0x6e, 0x74, 0x61, 0x74,
+	0x69, 0x6f, 0x6e, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x37, 0x2e, 0x69, 0x6f, 0x2e, 0x64,
 	0x65, 0x65, 0x70, 0x68, 0x61, 0x76, 0x65, 0x6e, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x62,
 	0x61, 0x63, 0x6b, 0x70, 0x6c, 0x61, 0x6e, 0x65, 0x2e, 0x73, 0x63, 0x72, 0x69, 0x70, 0x74, 0x2e,
-	0x67, 0x72, 0x70, 0x63, 0x2e, 0x44, 0x69, 0x61, 0x67, 0x6e, 0x6f, 0x73, 0x74, 0x69, 0x63, 0x52,
-	0x05, 0x69, 0x74, 0x65, 0x6d, 0x73, 0x42, 0x0c, 0x0a, 0x0a, 0x5f, 0x72, 0x65, 0x73, 0x75, 0x6c,
-	0x74, 0x5f, 0x69, 0x64, 0x22, 0xb3, 0x01, 0x0a, 0x1c, 0x47, 0x65, 0x74, 0x50, 0x75, 0x62, 0x6c,
-	0x69, 0x73, 0x68, 0x44, 0x69, 0x61, 0x67, 0x6e, 0x6f, 0x73, 0x74, 0x69, 0x63, 0x52, 0x65, 0x73,
-	0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x10, 0x0a, 0x03, 0x75, 0x72, 0x69, 0x18, 0x01, 0x20, 0x01,
-	0x28, 0x09, 0x52, 0x03, 0x75, 0x72, 0x69, 0x12, 0x1d, 0x0a, 0x07, 0x76, 0x65, 0x72, 0x73, 0x69,
-	0x6f, 0x6e, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x48, 0x00, 0x52, 0x07, 0x76, 0x65, 0x72, 0x73,
-	0x69, 0x6f, 0x6e, 0x88, 0x01, 0x01, 0x12, 0x56, 0x0a, 0x0b, 0x64, 0x69, 0x61, 0x67, 0x6e, 0x6f,
-	0x73, 0x74, 0x69, 0x63, 0x73, 0x18, 0x03, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x34, 0x2e, 0x69, 0x6f,
-	0x2e, 0x64, 0x65, 0x65, 0x70, 0x68, 0x61, 0x76, 0x65, 0x6e, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f,
-	0x2e, 0x62, 0x61, 0x63, 0x6b, 0x70, 0x6c, 0x61, 0x6e, 0x65, 0x2e, 0x73, 0x63, 0x72, 0x69, 0x70,
-	0x74, 0x2e, 0x67, 0x72, 0x70, 0x63, 0x2e, 0x44, 0x69, 0x61, 0x67, 0x6e, 0x6f, 0x73, 0x74, 0x69,
-	0x63, 0x52, 0x0b, 0x64, 0x69, 0x61, 0x67, 0x6e, 0x6f, 0x73, 0x74, 0x69, 0x63, 0x73, 0x42, 0x0a,
-	0x0a, 0x08, 0x5f, 0x76, 0x65, 0x72, 0x73, 0x69, 0x6f, 0x6e, 0x22, 0xf2, 0x05, 0x0a, 0x0a, 0x44,
-	0x69, 0x61, 0x67, 0x6e, 0x6f, 0x73, 0x74, 0x69, 0x63, 0x12, 0x4d, 0x0a, 0x05, 0x72, 0x61, 0x6e,
-	0x67, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x37, 0x2e, 0x69, 0x6f, 0x2e, 0x64, 0x65,
+	0x67, 0x72, 0x70, 0x63, 0x2e, 0x4d, 0x61, 0x72, 0x6b, 0x75, 0x70, 0x43, 0x6f, 0x6e, 0x74, 0x65,
+	0x6e, 0x74, 0x52, 0x0d, 0x64, 0x6f, 0x63, 0x75, 0x6d, 0x65, 0x6e, 0x74, 0x61, 0x74, 0x69, 0x6f,
+	0x6e, 0x22, 0xd1, 0x01, 0x0a, 0x0f, 0x47, 0x65, 0x74, 0x48, 0x6f, 0x76, 0x65, 0x72, 0x52, 0x65,
+	0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x6e, 0x0a, 0x0d, 0x74, 0x65, 0x78, 0x74, 0x5f, 0x64, 0x6f,
+	0x63, 0x75, 0x6d, 0x65, 0x6e, 0x74, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x49, 0x2e, 0x69,
+	0x6f, 0x2e, 0x64, 0x65, 0x65, 0x70, 0x68, 0x61, 0x76, 0x65, 0x6e, 0x2e, 0x70, 0x72, 0x6f, 0x74,
+	0x6f, 0x2e, 0x62, 0x61, 0x63, 0x6b, 0x70, 0x6c, 0x61, 0x6e, 0x65, 0x2e, 0x73, 0x63, 0x72, 0x69,
+	0x70, 0x74, 0x2e, 0x67, 0x72, 0x70, 0x63, 0x2e, 0x56, 0x65, 0x72, 0x73, 0x69, 0x6f, 0x6e, 0x65,
+	0x64, 0x54, 0x65, 0x78, 0x74, 0x44, 0x6f, 0x63, 0x75, 0x6d, 0x65, 0x6e, 0x74, 0x49, 0x64, 0x65,
+	0x6e, 0x74, 0x69, 0x66, 0x69, 0x65, 0x72, 0x52, 0x0c, 0x74, 0x65, 0x78, 0x74, 0x44, 0x6f, 0x63,
+	0x75, 0x6d, 0x65, 0x6e, 0x74, 0x12, 0x4e, 0x0a, 0x08, 0x70, 0x6f, 0x73, 0x69, 0x74, 0x69, 0x6f,
+	0x6e, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x32, 0x2e, 0x69, 0x6f, 0x2e, 0x64, 0x65, 0x65,
+	0x70, 0x68, 0x61, 0x76, 0x65, 0x6e, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x62, 0x61, 0x63,
+	0x6b, 0x70, 0x6c, 0x61, 0x6e, 0x65, 0x2e, 0x73, 0x63, 0x72, 0x69, 0x70, 0x74, 0x2e, 0x67, 0x72,
+	0x70, 0x63, 0x2e, 0x50, 0x6f, 0x73, 0x69, 0x74, 0x69, 0x6f, 0x6e, 0x52, 0x08, 0x70, 0x6f, 0x73,
+	0x69, 0x74, 0x69, 0x6f, 0x6e, 0x22, 0xb6, 0x01, 0x0a, 0x10, 0x47, 0x65, 0x74, 0x48, 0x6f, 0x76,
+	0x65, 0x72, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x53, 0x0a, 0x08, 0x63, 0x6f,
+	0x6e, 0x74, 0x65, 0x6e, 0x74, 0x73, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x37, 0x2e, 0x69,
+	0x6f, 0x2e, 0x64, 0x65, 0x65, 0x70, 0x68, 0x61, 0x76, 0x65, 0x6e, 0x2e, 0x70, 0x72, 0x6f, 0x74,
+	0x6f, 0x2e, 0x62, 0x61, 0x63, 0x6b, 0x70, 0x6c, 0x61, 0x6e, 0x65, 0x2e, 0x73, 0x63, 0x72, 0x69,
+	0x70, 0x74, 0x2e, 0x67, 0x72, 0x70, 0x63, 0x2e, 0x4d, 0x61, 0x72, 0x6b, 0x75, 0x70, 0x43, 0x6f,
+	0x6e, 0x74, 0x65, 0x6e, 0x74, 0x52, 0x08, 0x63, 0x6f, 0x6e, 0x74, 0x65, 0x6e, 0x74, 0x73, 0x12,
+	0x4d, 0x0a, 0x05, 0x72, 0x61, 0x6e, 0x67, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x37,
+	0x2e, 0x69, 0x6f, 0x2e, 0x64, 0x65, 0x65, 0x70, 0x68, 0x61, 0x76, 0x65, 0x6e, 0x2e, 0x70, 0x72,
+	0x6f, 0x74, 0x6f, 0x2e, 0x62, 0x61, 0x63, 0x6b, 0x70, 0x6c, 0x61, 0x6e, 0x65, 0x2e, 0x73, 0x63,
+	0x72, 0x69, 0x70, 0x74, 0x2e, 0x67, 0x72, 0x70, 0x63, 0x2e, 0x44, 0x6f, 0x63, 0x75, 0x6d, 0x65,
+	0x6e, 0x74, 0x52, 0x61, 0x6e, 0x67, 0x65, 0x52, 0x05, 0x72, 0x61, 0x6e, 0x67, 0x65, 0x22, 0x84,
+	0x02, 0x0a, 0x14, 0x47, 0x65, 0x74, 0x44, 0x69, 0x61, 0x67, 0x6e, 0x6f, 0x73, 0x74, 0x69, 0x63,
+	0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x6e, 0x0a, 0x0d, 0x74, 0x65, 0x78, 0x74, 0x5f,
+	0x64, 0x6f, 0x63, 0x75, 0x6d, 0x65, 0x6e, 0x74, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x49,
+	0x2e, 0x69, 0x6f, 0x2e, 0x64, 0x65, 0x65, 0x70, 0x68, 0x61, 0x76, 0x65, 0x6e, 0x2e, 0x70, 0x72,
+	0x6f, 0x74, 0x6f, 0x2e, 0x62, 0x61, 0x63, 0x6b, 0x70, 0x6c, 0x61, 0x6e, 0x65, 0x2e, 0x73, 0x63,
+	0x72, 0x69, 0x70, 0x74, 0x2e, 0x67, 0x72, 0x70, 0x63, 0x2e, 0x56, 0x65, 0x72, 0x73, 0x69, 0x6f,
+	0x6e, 0x65, 0x64, 0x54, 0x65, 0x78, 0x74, 0x44, 0x6f, 0x63, 0x75, 0x6d, 0x65, 0x6e, 0x74, 0x49,
+	0x64, 0x65, 0x6e, 0x74, 0x69, 0x66, 0x69, 0x65, 0x72, 0x52, 0x0c, 0x74, 0x65, 0x78, 0x74, 0x44,
+	0x6f, 0x63, 0x75, 0x6d, 0x65, 0x6e, 0x74, 0x12, 0x23, 0x0a, 0x0a, 0x69, 0x64, 0x65, 0x6e, 0x74,
+	0x69, 0x66, 0x69, 0x65, 0x72, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x48, 0x00, 0x52, 0x0a, 0x69,
+	0x64, 0x65, 0x6e, 0x74, 0x69, 0x66, 0x69, 0x65, 0x72, 0x88, 0x01, 0x01, 0x12, 0x31, 0x0a, 0x12,
+	0x70, 0x72, 0x65, 0x76, 0x69, 0x6f, 0x75, 0x73, 0x5f, 0x72, 0x65, 0x73, 0x75, 0x6c, 0x74, 0x5f,
+	0x69, 0x64, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x48, 0x01, 0x52, 0x10, 0x70, 0x72, 0x65, 0x76,
+	0x69, 0x6f, 0x75, 0x73, 0x52, 0x65, 0x73, 0x75, 0x6c, 0x74, 0x49, 0x64, 0x88, 0x01, 0x01, 0x42,
+	0x0d, 0x0a, 0x0b, 0x5f, 0x69, 0x64, 0x65, 0x6e, 0x74, 0x69, 0x66, 0x69, 0x65, 0x72, 0x42, 0x15,
+	0x0a, 0x13, 0x5f, 0x70, 0x72, 0x65, 0x76, 0x69, 0x6f, 0x75, 0x73, 0x5f, 0x72, 0x65, 0x73, 0x75,
+	0x6c, 0x74, 0x5f, 0x69, 0x64, 0x22, 0xab, 0x01, 0x0a, 0x19, 0x47, 0x65, 0x74, 0x50, 0x75, 0x6c,
+	0x6c, 0x44, 0x69, 0x61, 0x67, 0x6e, 0x6f, 0x73, 0x74, 0x69, 0x63, 0x52, 0x65, 0x73, 0x70, 0x6f,
+	0x6e, 0x73, 0x65, 0x12, 0x12, 0x0a, 0x04, 0x6b, 0x69, 0x6e, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28,
+	0x09, 0x52, 0x04, 0x6b, 0x69, 0x6e, 0x64, 0x12, 0x20, 0x0a, 0x09, 0x72, 0x65, 0x73, 0x75, 0x6c,
+	0x74, 0x5f, 0x69, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x48, 0x00, 0x52, 0x08, 0x72, 0x65,
+	0x73, 0x75, 0x6c, 0x74, 0x49, 0x64, 0x88, 0x01, 0x01, 0x12, 0x4a, 0x0a, 0x05, 0x69, 0x74, 0x65,
+	0x6d, 0x73, 0x18, 0x03, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x34, 0x2e, 0x69, 0x6f, 0x2e, 0x64, 0x65,
 	0x65, 0x70, 0x68, 0x61, 0x76, 0x65, 0x6e, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x62, 0x61,
 	0x63, 0x6b, 0x70, 0x6c, 0x61, 0x6e, 0x65, 0x2e, 0x73, 0x63, 0x72, 0x69, 0x70, 0x74, 0x2e, 0x67,
-	0x72, 0x70, 0x63, 0x2e, 0x44, 0x6f, 0x63, 0x75, 0x6d, 0x65, 0x6e, 0x74, 0x52, 0x61, 0x6e, 0x67,
-	0x65, 0x52, 0x05, 0x72, 0x61, 0x6e, 0x67, 0x65, 0x12, 0x63, 0x0a, 0x08, 0x73, 0x65, 0x76, 0x65,
-	0x72, 0x69, 0x74, 0x79, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0e, 0x32, 0x47, 0x2e, 0x69, 0x6f, 0x2e,
+	0x72, 0x70, 0x63, 0x2e, 0x44, 0x69, 0x61, 0x67, 0x6e, 0x6f, 0x73, 0x74, 0x69, 0x63, 0x52, 0x05,
+	0x69, 0x74, 0x65, 0x6d, 0x73, 0x42, 0x0c, 0x0a, 0x0a, 0x5f, 0x72, 0x65, 0x73, 0x75, 0x6c, 0x74,
+	0x5f, 0x69, 0x64, 0x22, 0xb3, 0x01, 0x0a, 0x1c, 0x47, 0x65, 0x74, 0x50, 0x75, 0x62, 0x6c, 0x69,
+	0x73, 0x68, 0x44, 0x69, 0x61, 0x67, 0x6e, 0x6f, 0x73, 0x74, 0x69, 0x63, 0x52, 0x65, 0x73, 0x70,
+	0x6f, 0x6e, 0x73, 0x65, 0x12, 0x10, 0x0a, 0x03, 0x75, 0x72, 0x69, 0x18, 0x01, 0x20, 0x01, 0x28,
+	0x09, 0x52, 0x03, 0x75, 0x72, 0x69, 0x12, 0x1d, 0x0a, 0x07, 0x76, 0x65, 0x72, 0x73, 0x69, 0x6f,
+	0x6e, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x48, 0x00, 0x52, 0x07, 0x76, 0x65, 0x72, 0x73, 0x69,
+	0x6f, 0x6e, 0x88, 0x01, 0x01, 0x12, 0x56, 0x0a, 0x0b, 0x64, 0x69, 0x61, 0x67, 0x6e, 0x6f, 0x73,
+	0x74, 0x69, 0x63, 0x73, 0x18, 0x03, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x34, 0x2e, 0x69, 0x6f, 0x2e,
 	0x64, 0x65, 0x65, 0x70, 0x68, 0x61, 0x76, 0x65, 0x6e, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e,
 	0x62, 0x61, 0x63, 0x6b, 0x70, 0x6c, 0x61, 0x6e, 0x65, 0x2e, 0x73, 0x63, 0x72, 0x69, 0x70, 0x74,
 	0x2e, 0x67, 0x72, 0x70, 0x63, 0x2e, 0x44, 0x69, 0x61, 0x67, 0x6e, 0x6f, 0x73, 0x74, 0x69, 0x63,
-	0x2e, 0x44, 0x69, 0x61, 0x67, 0x6e, 0x6f, 0x73, 0x74, 0x69, 0x63, 0x53, 0x65, 0x76, 0x65, 0x72,
-	0x69, 0x74, 0x79, 0x52, 0x08, 0x73, 0x65, 0x76, 0x65, 0x72, 0x69, 0x74, 0x79, 0x12, 0x17, 0x0a,
-	0x04, 0x63, 0x6f, 0x64, 0x65, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x48, 0x00, 0x52, 0x04, 0x63,
-	0x6f, 0x64, 0x65, 0x88, 0x01, 0x01, 0x12, 0x74, 0x0a, 0x10, 0x63, 0x6f, 0x64, 0x65, 0x5f, 0x64,
-	0x65, 0x73, 0x63, 0x72, 0x69, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x18, 0x04, 0x20, 0x01, 0x28, 0x0b,
-	0x32, 0x44, 0x2e, 0x69, 0x6f, 0x2e, 0x64, 0x65, 0x65, 0x70, 0x68, 0x61, 0x76, 0x65, 0x6e, 0x2e,
+	0x52, 0x0b, 0x64, 0x69, 0x61, 0x67, 0x6e, 0x6f, 0x73, 0x74, 0x69, 0x63, 0x73, 0x42, 0x0a, 0x0a,
+	0x08, 0x5f, 0x76, 0x65, 0x72, 0x73, 0x69, 0x6f, 0x6e, 0x22, 0xf2, 0x05, 0x0a, 0x0a, 0x44, 0x69,
+	0x61, 0x67, 0x6e, 0x6f, 0x73, 0x74, 0x69, 0x63, 0x12, 0x4d, 0x0a, 0x05, 0x72, 0x61, 0x6e, 0x67,
+	0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x37, 0x2e, 0x69, 0x6f, 0x2e, 0x64, 0x65, 0x65,
+	0x70, 0x68, 0x61, 0x76, 0x65, 0x6e, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x62, 0x61, 0x63,
+	0x6b, 0x70, 0x6c, 0x61, 0x6e, 0x65, 0x2e, 0x73, 0x63, 0x72, 0x69, 0x70, 0x74, 0x2e, 0x67, 0x72,
+	0x70, 0x63, 0x2e, 0x44, 0x6f, 0x63, 0x75, 0x6d, 0x65, 0x6e, 0x74, 0x52, 0x61, 0x6e, 0x67, 0x65,
+	0x52, 0x05, 0x72, 0x61, 0x6e, 0x67, 0x65, 0x12, 0x63, 0x0a, 0x08, 0x73, 0x65, 0x76, 0x65, 0x72,
+	0x69, 0x74, 0x79, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0e, 0x32, 0x47, 0x2e, 0x69, 0x6f, 0x2e, 0x64,
+	0x65, 0x65, 0x70, 0x68, 0x61, 0x76, 0x65, 0x6e, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x62,
+	0x61, 0x63, 0x6b, 0x70, 0x6c, 0x61, 0x6e, 0x65, 0x2e, 0x73, 0x63, 0x72, 0x69, 0x70, 0x74, 0x2e,
+	0x67, 0x72, 0x70, 0x63, 0x2e, 0x44, 0x69, 0x61, 0x67, 0x6e, 0x6f, 0x73, 0x74, 0x69, 0x63, 0x2e,
+	0x44, 0x69, 0x61, 0x67, 0x6e, 0x6f, 0x73, 0x74, 0x69, 0x63, 0x53, 0x65, 0x76, 0x65, 0x72, 0x69,
+	0x74, 0x79, 0x52, 0x08, 0x73, 0x65, 0x76, 0x65, 0x72, 0x69, 0x74, 0x79, 0x12, 0x17, 0x0a, 0x04,
+	0x63, 0x6f, 0x64, 0x65, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x48, 0x00, 0x52, 0x04, 0x63, 0x6f,
+	0x64, 0x65, 0x88, 0x01, 0x01, 0x12, 0x74, 0x0a, 0x10, 0x63, 0x6f, 0x64, 0x65, 0x5f, 0x64, 0x65,
+	0x73, 0x63, 0x72, 0x69, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x18, 0x04, 0x20, 0x01, 0x28, 0x0b, 0x32,
+	0x44, 0x2e, 0x69, 0x6f, 0x2e, 0x64, 0x65, 0x65, 0x70, 0x68, 0x61, 0x76, 0x65, 0x6e, 0x2e, 0x70,
+	0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x62, 0x61, 0x63, 0x6b, 0x70, 0x6c, 0x61, 0x6e, 0x65, 0x2e, 0x73,
+	0x63, 0x72, 0x69, 0x70, 0x74, 0x2e, 0x67, 0x72, 0x70, 0x63, 0x2e, 0x44, 0x69, 0x61, 0x67, 0x6e,
+	0x6f, 0x73, 0x74, 0x69, 0x63, 0x2e, 0x43, 0x6f, 0x64, 0x65, 0x44, 0x65, 0x73, 0x63, 0x72, 0x69,
+	0x70, 0x74, 0x69, 0x6f, 0x6e, 0x48, 0x01, 0x52, 0x0f, 0x63, 0x6f, 0x64, 0x65, 0x44, 0x65, 0x73,
+	0x63, 0x72, 0x69, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x88, 0x01, 0x01, 0x12, 0x1b, 0x0a, 0x06, 0x73,
+	0x6f, 0x75, 0x72, 0x63, 0x65, 0x18, 0x05, 0x20, 0x01, 0x28, 0x09, 0x48, 0x02, 0x52, 0x06, 0x73,
+	0x6f, 0x75, 0x72, 0x63, 0x65, 0x88, 0x01, 0x01, 0x12, 0x18, 0x0a, 0x07, 0x6d, 0x65, 0x73, 0x73,
+	0x61, 0x67, 0x65, 0x18, 0x06, 0x20, 0x01, 0x28, 0x09, 0x52, 0x07, 0x6d, 0x65, 0x73, 0x73, 0x61,
+	0x67, 0x65, 0x12, 0x56, 0x0a, 0x04, 0x74, 0x61, 0x67, 0x73, 0x18, 0x07, 0x20, 0x03, 0x28, 0x0e,
+	0x32, 0x42, 0x2e, 0x69, 0x6f, 0x2e, 0x64, 0x65, 0x65, 0x70, 0x68, 0x61, 0x76, 0x65, 0x6e, 0x2e,
 	0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x62, 0x61, 0x63, 0x6b, 0x70, 0x6c, 0x61, 0x6e, 0x65, 0x2e,
 	0x73, 0x63, 0x72, 0x69, 0x70, 0x74, 0x2e, 0x67, 0x72, 0x70, 0x63, 0x2e, 0x44, 0x69, 0x61, 0x67,
-	0x6e, 0x6f, 0x73, 0x74, 0x69, 0x63, 0x2e, 0x43, 0x6f, 0x64, 0x65, 0x44, 0x65, 0x73, 0x63, 0x72,
-	0x69, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x48, 0x01, 0x52, 0x0f, 0x63, 0x6f, 0x64, 0x65, 0x44, 0x65,
-	0x73, 0x63, 0x72, 0x69, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x88, 0x01, 0x01, 0x12, 0x1b, 0x0a, 0x06,
-	0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x18, 0x05, 0x20, 0x01, 0x28, 0x09, 0x48, 0x02, 0x52, 0x06,
-	0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x88, 0x01, 0x01, 0x12, 0x18, 0x0a, 0x07, 0x6d, 0x65, 0x73,
-	0x73, 0x61, 0x67, 0x65, 0x18, 0x06, 0x20, 0x01, 0x28, 0x09, 0x52, 0x07, 0x6d, 0x65, 0x73, 0x73,
-	0x61, 0x67, 0x65, 0x12, 0x56, 0x0a, 0x04, 0x74, 0x61, 0x67, 0x73, 0x18, 0x07, 0x20, 0x03, 0x28,
-	0x0e, 0x32, 0x42, 0x2e, 0x69, 0x6f, 0x2e, 0x64, 0x65, 0x65, 0x70, 0x68, 0x61, 0x76, 0x65, 0x6e,
-	0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x62, 0x61, 0x63, 0x6b, 0x70, 0x6c, 0x61, 0x6e, 0x65,
-	0x2e, 0x73, 0x63, 0x72, 0x69, 0x70, 0x74, 0x2e, 0x67, 0x72, 0x70, 0x63, 0x2e, 0x44, 0x69, 0x61,
-	0x67, 0x6e, 0x6f, 0x73, 0x74, 0x69, 0x63, 0x2e, 0x44, 0x69, 0x61, 0x67, 0x6e, 0x6f, 0x73, 0x74,
-	0x69, 0x63, 0x54, 0x61, 0x67, 0x52, 0x04, 0x74, 0x61, 0x67, 0x73, 0x12, 0x17, 0x0a, 0x04, 0x64,
-	0x61, 0x74, 0x61, 0x18, 0x09, 0x20, 0x01, 0x28, 0x0c, 0x48, 0x03, 0x52, 0x04, 0x64, 0x61, 0x74,
-	0x61, 0x88, 0x01, 0x01, 0x1a, 0x25, 0x0a, 0x0f, 0x43, 0x6f, 0x64, 0x65, 0x44, 0x65, 0x73, 0x63,
-	0x72, 0x69, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x12, 0x12, 0x0a, 0x04, 0x68, 0x72, 0x65, 0x66, 0x18,
-	0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x68, 0x72, 0x65, 0x66, 0x22, 0x5d, 0x0a, 0x12, 0x44,
-	0x69, 0x61, 0x67, 0x6e, 0x6f, 0x73, 0x74, 0x69, 0x63, 0x53, 0x65, 0x76, 0x65, 0x72, 0x69, 0x74,
-	0x79, 0x12, 0x14, 0x0a, 0x10, 0x4e, 0x4f, 0x54, 0x5f, 0x53, 0x45, 0x54, 0x5f, 0x53, 0x45, 0x56,
-	0x45, 0x52, 0x49, 0x54, 0x59, 0x10, 0x00, 0x12, 0x09, 0x0a, 0x05, 0x45, 0x52, 0x52, 0x4f, 0x52,
-	0x10, 0x01, 0x12, 0x0b, 0x0a, 0x07, 0x57, 0x41, 0x52, 0x4e, 0x49, 0x4e, 0x47, 0x10, 0x02, 0x12,
-	0x0f, 0x0a, 0x0b, 0x49, 0x4e, 0x46, 0x4f, 0x52, 0x4d, 0x41, 0x54, 0x49, 0x4f, 0x4e, 0x10, 0x03,
-	0x12, 0x08, 0x0a, 0x04, 0x48, 0x49, 0x4e, 0x54, 0x10, 0x04, 0x22, 0x41, 0x0a, 0x0d, 0x44, 0x69,
-	0x61, 0x67, 0x6e, 0x6f, 0x73, 0x74, 0x69, 0x63, 0x54, 0x61, 0x67, 0x12, 0x0f, 0x0a, 0x0b, 0x4e,
-	0x4f, 0x54, 0x5f, 0x53, 0x45, 0x54, 0x5f, 0x54, 0x41, 0x47, 0x10, 0x00, 0x12, 0x0f, 0x0a, 0x0b,
-	0x55, 0x4e, 0x4e, 0x45, 0x43, 0x45, 0x53, 0x53, 0x41, 0x52, 0x59, 0x10, 0x01, 0x12, 0x0e, 0x0a,
-	0x0a, 0x44, 0x45, 0x50, 0x52, 0x45, 0x43, 0x41, 0x54, 0x45, 0x44, 0x10, 0x02, 0x42, 0x07, 0x0a,
-	0x05, 0x5f, 0x63, 0x6f, 0x64, 0x65, 0x42, 0x13, 0x0a, 0x11, 0x5f, 0x63, 0x6f, 0x64, 0x65, 0x5f,
-	0x64, 0x65, 0x73, 0x63, 0x72, 0x69, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x42, 0x09, 0x0a, 0x07, 0x5f,
-	0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x42, 0x07, 0x0a, 0x05, 0x5f, 0x64, 0x61, 0x74, 0x61, 0x22,
-	0xb1, 0x3a, 0x0a, 0x10, 0x46, 0x69, 0x67, 0x75, 0x72, 0x65, 0x44, 0x65, 0x73, 0x63, 0x72, 0x69,
-	0x70, 0x74, 0x6f, 0x72, 0x12, 0x19, 0x0a, 0x05, 0x74, 0x69, 0x74, 0x6c, 0x65, 0x18, 0x01, 0x20,
-	0x01, 0x28, 0x09, 0x48, 0x00, 0x52, 0x05, 0x74, 0x69, 0x74, 0x6c, 0x65, 0x88, 0x01, 0x01, 0x12,
-	0x1d, 0x0a, 0x0a, 0x74, 0x69, 0x74, 0x6c, 0x65, 0x5f, 0x66, 0x6f, 0x6e, 0x74, 0x18, 0x02, 0x20,
-	0x01, 0x28, 0x09, 0x52, 0x09, 0x74, 0x69, 0x74, 0x6c, 0x65, 0x46, 0x6f, 0x6e, 0x74, 0x12, 0x1f,
-	0x0a, 0x0b, 0x74, 0x69, 0x74, 0x6c, 0x65, 0x5f, 0x63, 0x6f, 0x6c, 0x6f, 0x72, 0x18, 0x03, 0x20,
-	0x01, 0x28, 0x09, 0x52, 0x0a, 0x74, 0x69, 0x74, 0x6c, 0x65, 0x43, 0x6f, 0x6c, 0x6f, 0x72, 0x12,
-	0x2b, 0x0a, 0x0f, 0x75, 0x70, 0x64, 0x61, 0x74, 0x65, 0x5f, 0x69, 0x6e, 0x74, 0x65, 0x72, 0x76,
-	0x61, 0x6c, 0x18, 0x07, 0x20, 0x01, 0x28, 0x03, 0x42, 0x02, 0x30, 0x01, 0x52, 0x0e, 0x75, 0x70,
-	0x64, 0x61, 0x74, 0x65, 0x49, 0x6e, 0x74, 0x65, 0x72, 0x76, 0x61, 0x6c, 0x12, 0x12, 0x0a, 0x04,
-	0x63, 0x6f, 0x6c, 0x73, 0x18, 0x08, 0x20, 0x01, 0x28, 0x05, 0x52, 0x04, 0x63, 0x6f, 0x6c, 0x73,
-	0x12, 0x12, 0x0a, 0x04, 0x72, 0x6f, 0x77, 0x73, 0x18, 0x09, 0x20, 0x01, 0x28, 0x05, 0x52, 0x04,
-	0x72, 0x6f, 0x77, 0x73, 0x12, 0x62, 0x0a, 0x06, 0x63, 0x68, 0x61, 0x72, 0x74, 0x73, 0x18, 0x0a,
-	0x20, 0x03, 0x28, 0x0b, 0x32, 0x4a, 0x2e, 0x69, 0x6f, 0x2e, 0x64, 0x65, 0x65, 0x70, 0x68, 0x61,
+	0x6e, 0x6f, 0x73, 0x74, 0x69, 0x63, 0x2e, 0x44, 0x69, 0x61, 0x67, 0x6e, 0x6f, 0x73, 0x74, 0x69,
+	0x63, 0x54, 0x61, 0x67, 0x52, 0x04, 0x74, 0x61, 0x67, 0x73, 0x12, 0x17, 0x0a, 0x04, 0x64, 0x61,
+	0x74, 0x61, 0x18, 0x09, 0x20, 0x01, 0x28, 0x0c, 0x48, 0x03, 0x52, 0x04, 0x64, 0x61, 0x74, 0x61,
+	0x88, 0x01, 0x01, 0x1a, 0x25, 0x0a, 0x0f, 0x43, 0x6f, 0x64, 0x65, 0x44, 0x65, 0x73, 0x63, 0x72,
+	0x69, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x12, 0x12, 0x0a, 0x04, 0x68, 0x72, 0x65, 0x66, 0x18, 0x01,
+	0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x68, 0x72, 0x65, 0x66, 0x22, 0x5d, 0x0a, 0x12, 0x44, 0x69,
+	0x61, 0x67, 0x6e, 0x6f, 0x73, 0x74, 0x69, 0x63, 0x53, 0x65, 0x76, 0x65, 0x72, 0x69, 0x74, 0x79,
+	0x12, 0x14, 0x0a, 0x10, 0x4e, 0x4f, 0x54, 0x5f, 0x53, 0x45, 0x54, 0x5f, 0x53, 0x45, 0x56, 0x45,
+	0x52, 0x49, 0x54, 0x59, 0x10, 0x00, 0x12, 0x09, 0x0a, 0x05, 0x45, 0x52, 0x52, 0x4f, 0x52, 0x10,
+	0x01, 0x12, 0x0b, 0x0a, 0x07, 0x57, 0x41, 0x52, 0x4e, 0x49, 0x4e, 0x47, 0x10, 0x02, 0x12, 0x0f,
+	0x0a, 0x0b, 0x49, 0x4e, 0x46, 0x4f, 0x52, 0x4d, 0x41, 0x54, 0x49, 0x4f, 0x4e, 0x10, 0x03, 0x12,
+	0x08, 0x0a, 0x04, 0x48, 0x49, 0x4e, 0x54, 0x10, 0x04, 0x22, 0x41, 0x0a, 0x0d, 0x44, 0x69, 0x61,
+	0x67, 0x6e, 0x6f, 0x73, 0x74, 0x69, 0x63, 0x54, 0x61, 0x67, 0x12, 0x0f, 0x0a, 0x0b, 0x4e, 0x4f,
+	0x54, 0x5f, 0x53, 0x45, 0x54, 0x5f, 0x54, 0x41, 0x47, 0x10, 0x00, 0x12, 0x0f, 0x0a, 0x0b, 0x55,
+	0x4e, 0x4e, 0x45, 0x43, 0x45, 0x53, 0x53, 0x41, 0x52, 0x59, 0x10, 0x01, 0x12, 0x0e, 0x0a, 0x0a,
+	0x44, 0x45, 0x50, 0x52, 0x45, 0x43, 0x41, 0x54, 0x45, 0x44, 0x10, 0x02, 0x42, 0x07, 0x0a, 0x05,
+	0x5f, 0x63, 0x6f, 0x64, 0x65, 0x42, 0x13, 0x0a, 0x11, 0x5f, 0x63, 0x6f, 0x64, 0x65, 0x5f, 0x64,
+	0x65, 0x73, 0x63, 0x72, 0x69, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x42, 0x09, 0x0a, 0x07, 0x5f, 0x73,
+	0x6f, 0x75, 0x72, 0x63, 0x65, 0x42, 0x07, 0x0a, 0x05, 0x5f, 0x64, 0x61, 0x74, 0x61, 0x22, 0xb1,
+	0x3a, 0x0a, 0x10, 0x46, 0x69, 0x67, 0x75, 0x72, 0x65, 0x44, 0x65, 0x73, 0x63, 0x72, 0x69, 0x70,
+	0x74, 0x6f, 0x72, 0x12, 0x19, 0x0a, 0x05, 0x74, 0x69, 0x74, 0x6c, 0x65, 0x18, 0x01, 0x20, 0x01,
+	0x28, 0x09, 0x48, 0x00, 0x52, 0x05, 0x74, 0x69, 0x74, 0x6c, 0x65, 0x88, 0x01, 0x01, 0x12, 0x1d,
+	0x0a, 0x0a, 0x74, 0x69, 0x74, 0x6c, 0x65, 0x5f, 0x66, 0x6f, 0x6e, 0x74, 0x18, 0x02, 0x20, 0x01,
+	0x28, 0x09, 0x52, 0x09, 0x74, 0x69, 0x74, 0x6c, 0x65, 0x46, 0x6f, 0x6e, 0x74, 0x12, 0x1f, 0x0a,
+	0x0b, 0x74, 0x69, 0x74, 0x6c, 0x65, 0x5f, 0x63, 0x6f, 0x6c, 0x6f, 0x72, 0x18, 0x03, 0x20, 0x01,
+	0x28, 0x09, 0x52, 0x0a, 0x74, 0x69, 0x74, 0x6c, 0x65, 0x43, 0x6f, 0x6c, 0x6f, 0x72, 0x12, 0x2b,
+	0x0a, 0x0f, 0x75, 0x70, 0x64, 0x61, 0x74, 0x65, 0x5f, 0x69, 0x6e, 0x74, 0x65, 0x72, 0x76, 0x61,
+	0x6c, 0x18, 0x07, 0x20, 0x01, 0x28, 0x03, 0x42, 0x02, 0x30, 0x01, 0x52, 0x0e, 0x75, 0x70, 0x64,
+	0x61, 0x74, 0x65, 0x49, 0x6e, 0x74, 0x65, 0x72, 0x76, 0x61, 0x6c, 0x12, 0x12, 0x0a, 0x04, 0x63,
+	0x6f, 0x6c, 0x73, 0x18, 0x08, 0x20, 0x01, 0x28, 0x05, 0x52, 0x04, 0x63, 0x6f, 0x6c, 0x73, 0x12,
+	0x12, 0x0a, 0x04, 0x72, 0x6f, 0x77, 0x73, 0x18, 0x09, 0x20, 0x01, 0x28, 0x05, 0x52, 0x04, 0x72,
+	0x6f, 0x77, 0x73, 0x12, 0x62, 0x0a, 0x06, 0x63, 0x68, 0x61, 0x72, 0x74, 0x73, 0x18, 0x0a, 0x20,
+	0x03, 0x28, 0x0b, 0x32, 0x4a, 0x2e, 0x69, 0x6f, 0x2e, 0x64, 0x65, 0x65, 0x70, 0x68, 0x61, 0x76,
+	0x65, 0x6e, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x62, 0x61, 0x63, 0x6b, 0x70, 0x6c, 0x61,
+	0x6e, 0x65, 0x2e, 0x73, 0x63, 0x72, 0x69, 0x70, 0x74, 0x2e, 0x67, 0x72, 0x70, 0x63, 0x2e, 0x46,
+	0x69, 0x67, 0x75, 0x72, 0x65, 0x44, 0x65, 0x73, 0x63, 0x72, 0x69, 0x70, 0x74, 0x6f, 0x72, 0x2e,
+	0x43, 0x68, 0x61, 0x72, 0x74, 0x44, 0x65, 0x73, 0x63, 0x72, 0x69, 0x70, 0x74, 0x6f, 0x72, 0x52,
+	0x06, 0x63, 0x68, 0x61, 0x72, 0x74, 0x73, 0x12, 0x16, 0x0a, 0x06, 0x65, 0x72, 0x72, 0x6f, 0x72,
+	0x73, 0x18, 0x0d, 0x20, 0x03, 0x28, 0x09, 0x52, 0x06, 0x65, 0x72, 0x72, 0x6f, 0x72, 0x73, 0x1a,
+	0xdc, 0x06, 0x0a, 0x0f, 0x43, 0x68, 0x61, 0x72, 0x74, 0x44, 0x65, 0x73, 0x63, 0x72, 0x69, 0x70,
+	0x74, 0x6f, 0x72, 0x12, 0x18, 0x0a, 0x07, 0x63, 0x6f, 0x6c, 0x73, 0x70, 0x61, 0x6e, 0x18, 0x01,
+	0x20, 0x01, 0x28, 0x05, 0x52, 0x07, 0x63, 0x6f, 0x6c, 0x73, 0x70, 0x61, 0x6e, 0x12, 0x18, 0x0a,
+	0x07, 0x72, 0x6f, 0x77, 0x73, 0x70, 0x61, 0x6e, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x07,
+	0x72, 0x6f, 0x77, 0x73, 0x70, 0x61, 0x6e, 0x12, 0x63, 0x0a, 0x06, 0x73, 0x65, 0x72, 0x69, 0x65,
+	0x73, 0x18, 0x03, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x4b, 0x2e, 0x69, 0x6f, 0x2e, 0x64, 0x65, 0x65,
+	0x70, 0x68, 0x61, 0x76, 0x65, 0x6e, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x62, 0x61, 0x63,
+	0x6b, 0x70, 0x6c, 0x61, 0x6e, 0x65, 0x2e, 0x73, 0x63, 0x72, 0x69, 0x70, 0x74, 0x2e, 0x67, 0x72,
+	0x70, 0x63, 0x2e, 0x46, 0x69, 0x67, 0x75, 0x72, 0x65, 0x44, 0x65, 0x73, 0x63, 0x72, 0x69, 0x70,
+	0x74, 0x6f, 0x72, 0x2e, 0x53, 0x65, 0x72, 0x69, 0x65, 0x73, 0x44, 0x65, 0x73, 0x63, 0x72, 0x69,
+	0x70, 0x74, 0x6f, 0x72, 0x52, 0x06, 0x73, 0x65, 0x72, 0x69, 0x65, 0x73, 0x12, 0x73, 0x0a, 0x0c,
+	0x6d, 0x75, 0x6c, 0x74, 0x69, 0x5f, 0x73, 0x65, 0x72, 0x69, 0x65, 0x73, 0x18, 0x04, 0x20, 0x03,
+	0x28, 0x0b, 0x32, 0x50, 0x2e, 0x69, 0x6f, 0x2e, 0x64, 0x65, 0x65, 0x70, 0x68, 0x61, 0x76, 0x65,
+	0x6e, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x62, 0x61, 0x63, 0x6b, 0x70, 0x6c, 0x61, 0x6e,
+	0x65, 0x2e, 0x73, 0x63, 0x72, 0x69, 0x70, 0x74, 0x2e, 0x67, 0x72, 0x70, 0x63, 0x2e, 0x46, 0x69,
+	0x67, 0x75, 0x72, 0x65, 0x44, 0x65, 0x73, 0x63, 0x72, 0x69, 0x70, 0x74, 0x6f, 0x72, 0x2e, 0x4d,
+	0x75, 0x6c, 0x74, 0x69, 0x53, 0x65, 0x72, 0x69, 0x65, 0x73, 0x44, 0x65, 0x73, 0x63, 0x72, 0x69,
+	0x70, 0x74, 0x6f, 0x72, 0x52, 0x0b, 0x6d, 0x75, 0x6c, 0x74, 0x69, 0x53, 0x65, 0x72, 0x69, 0x65,
+	0x73, 0x12, 0x5d, 0x0a, 0x04, 0x61, 0x78, 0x65, 0x73, 0x18, 0x05, 0x20, 0x03, 0x28, 0x0b, 0x32,
+	0x49, 0x2e, 0x69, 0x6f, 0x2e, 0x64, 0x65, 0x65, 0x70, 0x68, 0x61, 0x76, 0x65, 0x6e, 0x2e, 0x70,
+	0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x62, 0x61, 0x63, 0x6b, 0x70, 0x6c, 0x61, 0x6e, 0x65, 0x2e, 0x73,
+	0x63, 0x72, 0x69, 0x70, 0x74, 0x2e, 0x67, 0x72, 0x70, 0x63, 0x2e, 0x46, 0x69, 0x67, 0x75, 0x72,
+	0x65, 0x44, 0x65, 0x73, 0x63, 0x72, 0x69, 0x70, 0x74, 0x6f, 0x72, 0x2e, 0x41, 0x78, 0x69, 0x73,
+	0x44, 0x65, 0x73, 0x63, 0x72, 0x69, 0x70, 0x74, 0x6f, 0x72, 0x52, 0x04, 0x61, 0x78, 0x65, 0x73,
+	0x12, 0x73, 0x0a, 0x0a, 0x63, 0x68, 0x61, 0x72, 0x74, 0x5f, 0x74, 0x79, 0x70, 0x65, 0x18, 0x06,
+	0x20, 0x01, 0x28, 0x0e, 0x32, 0x54, 0x2e, 0x69, 0x6f, 0x2e, 0x64, 0x65, 0x65, 0x70, 0x68, 0x61,
 	0x76, 0x65, 0x6e, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x62, 0x61, 0x63, 0x6b, 0x70, 0x6c,
 	0x61, 0x6e, 0x65, 0x2e, 0x73, 0x63, 0x72, 0x69, 0x70, 0x74, 0x2e, 0x67, 0x72, 0x70, 0x63, 0x2e,
 	0x46, 0x69, 0x67, 0x75, 0x72, 0x65, 0x44, 0x65, 0x73, 0x63, 0x72, 0x69, 0x70, 0x74, 0x6f, 0x72,
 	0x2e, 0x43, 0x68, 0x61, 0x72, 0x74, 0x44, 0x65, 0x73, 0x63, 0x72, 0x69, 0x70, 0x74, 0x6f, 0x72,
-	0x52, 0x06, 0x63, 0x68, 0x61, 0x72, 0x74, 0x73, 0x12, 0x16, 0x0a, 0x06, 0x65, 0x72, 0x72, 0x6f,
-	0x72, 0x73, 0x18, 0x0d, 0x20, 0x03, 0x28, 0x09, 0x52, 0x06, 0x65, 0x72, 0x72, 0x6f, 0x72, 0x73,
-	0x1a, 0xdc, 0x06, 0x0a, 0x0f, 0x43, 0x68, 0x61, 0x72, 0x74, 0x44, 0x65, 0x73, 0x63, 0x72, 0x69,
-	0x70, 0x74, 0x6f, 0x72, 0x12, 0x18, 0x0a, 0x07, 0x63, 0x6f, 0x6c, 0x73, 0x70, 0x61, 0x6e, 0x18,
-	0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x07, 0x63, 0x6f, 0x6c, 0x73, 0x70, 0x61, 0x6e, 0x12, 0x18,
-	0x0a, 0x07, 0x72, 0x6f, 0x77, 0x73, 0x70, 0x61, 0x6e, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52,
-	0x07, 0x72, 0x6f, 0x77, 0x73, 0x70, 0x61, 0x6e, 0x12, 0x63, 0x0a, 0x06, 0x73, 0x65, 0x72, 0x69,
-	0x65, 0x73, 0x18, 0x03, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x4b, 0x2e, 0x69, 0x6f, 0x2e, 0x64, 0x65,
-	0x65, 0x70, 0x68, 0x61, 0x76, 0x65, 0x6e, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x62, 0x61,
-	0x63, 0x6b, 0x70, 0x6c, 0x61, 0x6e, 0x65, 0x2e, 0x73, 0x63, 0x72, 0x69, 0x70, 0x74, 0x2e, 0x67,
-	0x72, 0x70, 0x63, 0x2e, 0x46, 0x69, 0x67, 0x75, 0x72, 0x65, 0x44, 0x65, 0x73, 0x63, 0x72, 0x69,
-	0x70, 0x74, 0x6f, 0x72, 0x2e, 0x53, 0x65, 0x72, 0x69, 0x65, 0x73, 0x44, 0x65, 0x73, 0x63, 0x72,
-	0x69, 0x70, 0x74, 0x6f, 0x72, 0x52, 0x06, 0x73, 0x65, 0x72, 0x69, 0x65, 0x73, 0x12, 0x73, 0x0a,
-	0x0c, 0x6d, 0x75, 0x6c, 0x74, 0x69, 0x5f, 0x73, 0x65, 0x72, 0x69, 0x65, 0x73, 0x18, 0x04, 0x20,
-	0x03, 0x28, 0x0b, 0x32, 0x50, 0x2e, 0x69, 0x6f, 0x2e, 0x64, 0x65, 0x65, 0x70, 0x68, 0x61, 0x76,
-	0x65, 0x6e, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x62, 0x61, 0x63, 0x6b, 0x70, 0x6c, 0x61,
-	0x6e, 0x65, 0x2e, 0x73, 0x63, 0x72, 0x69, 0x70, 0x74, 0x2e, 0x67, 0x72, 0x70, 0x63, 0x2e, 0x46,
-	0x69, 0x67, 0x75, 0x72, 0x65, 0x44, 0x65, 0x73, 0x63, 0x72, 0x69, 0x70, 0x74, 0x6f, 0x72, 0x2e,
-	0x4d, 0x75, 0x6c, 0x74, 0x69, 0x53, 0x65, 0x72, 0x69, 0x65, 0x73, 0x44, 0x65, 0x73, 0x63, 0x72,
-	0x69, 0x70, 0x74, 0x6f, 0x72, 0x52, 0x0b, 0x6d, 0x75, 0x6c, 0x74, 0x69, 0x53, 0x65, 0x72, 0x69,
-	0x65, 0x73, 0x12, 0x5d, 0x0a, 0x04, 0x61, 0x78, 0x65, 0x73, 0x18, 0x05, 0x20, 0x03, 0x28, 0x0b,
-	0x32, 0x49, 0x2e, 0x69, 0x6f, 0x2e, 0x64, 0x65, 0x65, 0x70, 0x68, 0x61, 0x76, 0x65, 0x6e, 0x2e,
-	0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x62, 0x61, 0x63, 0x6b, 0x70, 0x6c, 0x61, 0x6e, 0x65, 0x2e,
-	0x73, 0x63, 0x72, 0x69, 0x70, 0x74, 0x2e, 0x67, 0x72, 0x70, 0x63, 0x2e, 0x46, 0x69, 0x67, 0x75,
-	0x72, 0x65, 0x44, 0x65, 0x73, 0x63, 0x72, 0x69, 0x70, 0x74, 0x6f, 0x72, 0x2e, 0x41, 0x78, 0x69,
-	0x73, 0x44, 0x65, 0x73, 0x63, 0x72, 0x69, 0x70, 0x74, 0x6f, 0x72, 0x52, 0x04, 0x61, 0x78, 0x65,
-	0x73, 0x12, 0x73, 0x0a, 0x0a, 0x63, 0x68, 0x61, 0x72, 0x74, 0x5f, 0x74, 0x79, 0x70, 0x65, 0x18,
-	0x06, 0x20, 0x01, 0x28, 0x0e, 0x32, 0x54, 0x2e, 0x69, 0x6f, 0x2e, 0x64, 0x65, 0x65, 0x70, 0x68,
-	0x61, 0x76, 0x65, 0x6e, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x62, 0x61, 0x63, 0x6b, 0x70,
-	0x6c, 0x61, 0x6e, 0x65, 0x2e, 0x73, 0x63, 0x72, 0x69, 0x70, 0x74, 0x2e, 0x67, 0x72, 0x70, 0x63,
-	0x2e, 0x46, 0x69, 0x67, 0x75, 0x72, 0x65, 0x44, 0x65, 0x73, 0x63, 0x72, 0x69, 0x70, 0x74, 0x6f,
-	0x72, 0x2e, 0x43, 0x68, 0x61, 0x72, 0x74, 0x44, 0x65, 0x73, 0x63, 0x72, 0x69, 0x70, 0x74, 0x6f,
-	0x72, 0x2e, 0x43, 0x68, 0x61, 0x72, 0x74, 0x54, 0x79, 0x70, 0x65, 0x52, 0x09, 0x63, 0x68, 0x61,
-	0x72, 0x74, 0x54, 0x79, 0x70, 0x65, 0x12, 0x19, 0x0a, 0x05, 0x74, 0x69, 0x74, 0x6c, 0x65, 0x18,
-	0x07, 0x20, 0x01, 0x28, 0x09, 0x48, 0x00, 0x52, 0x05, 0x74, 0x69, 0x74, 0x6c, 0x65, 0x88, 0x01,
-	0x01, 0x12, 0x1d, 0x0a, 0x0a, 0x74, 0x69, 0x74, 0x6c, 0x65, 0x5f, 0x66, 0x6f, 0x6e, 0x74, 0x18,
-	0x08, 0x20, 0x01, 0x28, 0x09, 0x52, 0x09, 0x74, 0x69, 0x74, 0x6c, 0x65, 0x46, 0x6f, 0x6e, 0x74,
-	0x12, 0x1f, 0x0a, 0x0b, 0x74, 0x69, 0x74, 0x6c, 0x65, 0x5f, 0x63, 0x6f, 0x6c, 0x6f, 0x72, 0x18,
-	0x09, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0a, 0x74, 0x69, 0x74, 0x6c, 0x65, 0x43, 0x6f, 0x6c, 0x6f,
-	0x72, 0x12, 0x1f, 0x0a, 0x0b, 0x73, 0x68, 0x6f, 0x77, 0x5f, 0x6c, 0x65, 0x67, 0x65, 0x6e, 0x64,
-	0x18, 0x0a, 0x20, 0x01, 0x28, 0x08, 0x52, 0x0a, 0x73, 0x68, 0x6f, 0x77, 0x4c, 0x65, 0x67, 0x65,
-	0x6e, 0x64, 0x12, 0x1f, 0x0a, 0x0b, 0x6c, 0x65, 0x67, 0x65, 0x6e, 0x64, 0x5f, 0x66, 0x6f, 0x6e,
-	0x74, 0x18, 0x0b, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0a, 0x6c, 0x65, 0x67, 0x65, 0x6e, 0x64, 0x46,
-	0x6f, 0x6e, 0x74, 0x12, 0x21, 0x0a, 0x0c, 0x6c, 0x65, 0x67, 0x65, 0x6e, 0x64, 0x5f, 0x63, 0x6f,
-	0x6c, 0x6f, 0x72, 0x18, 0x0c, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0b, 0x6c, 0x65, 0x67, 0x65, 0x6e,
-	0x64, 0x43, 0x6f, 0x6c, 0x6f, 0x72, 0x12, 0x12, 0x0a, 0x04, 0x69, 0x73, 0x33, 0x64, 0x18, 0x0d,
-	0x20, 0x01, 0x28, 0x08, 0x52, 0x04, 0x69, 0x73, 0x33, 0x64, 0x12, 0x16, 0x0a, 0x06, 0x63, 0x6f,
-	0x6c, 0x75, 0x6d, 0x6e, 0x18, 0x0e, 0x20, 0x01, 0x28, 0x05, 0x52, 0x06, 0x63, 0x6f, 0x6c, 0x75,
-	0x6d, 0x6e, 0x12, 0x10, 0x0a, 0x03, 0x72, 0x6f, 0x77, 0x18, 0x0f, 0x20, 0x01, 0x28, 0x05, 0x52,
-	0x03, 0x72, 0x6f, 0x77, 0x22, 0x5f, 0x0a, 0x09, 0x43, 0x68, 0x61, 0x72, 0x74, 0x54, 0x79, 0x70,
-	0x65, 0x12, 0x06, 0x0a, 0x02, 0x58, 0x59, 0x10, 0x00, 0x12, 0x07, 0x0a, 0x03, 0x50, 0x49, 0x45,
-	0x10, 0x01, 0x12, 0x0c, 0x0a, 0x04, 0x4f, 0x48, 0x4c, 0x43, 0x10, 0x02, 0x1a, 0x02, 0x08, 0x01,
-	0x12, 0x0c, 0x0a, 0x08, 0x43, 0x41, 0x54, 0x45, 0x47, 0x4f, 0x52, 0x59, 0x10, 0x03, 0x12, 0x07,
-	0x0a, 0x03, 0x58, 0x59, 0x5a, 0x10, 0x04, 0x12, 0x0f, 0x0a, 0x0b, 0x43, 0x41, 0x54, 0x45, 0x47,
-	0x4f, 0x52, 0x59, 0x5f, 0x33, 0x44, 0x10, 0x05, 0x12, 0x0b, 0x0a, 0x07, 0x54, 0x52, 0x45, 0x45,
-	0x4d, 0x41, 0x50, 0x10, 0x06, 0x42, 0x08, 0x0a, 0x06, 0x5f, 0x74, 0x69, 0x74, 0x6c, 0x65, 0x1a,
-	0xb3, 0x06, 0x0a, 0x10, 0x53, 0x65, 0x72, 0x69, 0x65, 0x73, 0x44, 0x65, 0x73, 0x63, 0x72, 0x69,
-	0x70, 0x74, 0x6f, 0x72, 0x12, 0x69, 0x0a, 0x0a, 0x70, 0x6c, 0x6f, 0x74, 0x5f, 0x73, 0x74, 0x79,
-	0x6c, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0e, 0x32, 0x4a, 0x2e, 0x69, 0x6f, 0x2e, 0x64, 0x65,
-	0x65, 0x70, 0x68, 0x61, 0x76, 0x65, 0x6e, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x62, 0x61,
-	0x63, 0x6b, 0x70, 0x6c, 0x61, 0x6e, 0x65, 0x2e, 0x73, 0x63, 0x72, 0x69, 0x70, 0x74, 0x2e, 0x67,
-	0x72, 0x70, 0x63, 0x2e, 0x46, 0x69, 0x67, 0x75, 0x72, 0x65, 0x44, 0x65, 0x73, 0x63, 0x72, 0x69,
-	0x70, 0x74, 0x6f, 0x72, 0x2e, 0x53, 0x65, 0x72, 0x69, 0x65, 0x73, 0x50, 0x6c, 0x6f, 0x74, 0x53,
-	0x74, 0x79, 0x6c, 0x65, 0x52, 0x09, 0x70, 0x6c, 0x6f, 0x74, 0x53, 0x74, 0x79, 0x6c, 0x65, 0x12,
-	0x12, 0x0a, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x6e,
-	0x61, 0x6d, 0x65, 0x12, 0x28, 0x0a, 0x0d, 0x6c, 0x69, 0x6e, 0x65, 0x73, 0x5f, 0x76, 0x69, 0x73,
-	0x69, 0x62, 0x6c, 0x65, 0x18, 0x03, 0x20, 0x01, 0x28, 0x08, 0x48, 0x00, 0x52, 0x0c, 0x6c, 0x69,
-	0x6e, 0x65, 0x73, 0x56, 0x69, 0x73, 0x69, 0x62, 0x6c, 0x65, 0x88, 0x01, 0x01, 0x12, 0x2a, 0x0a,
-	0x0e, 0x73, 0x68, 0x61, 0x70, 0x65, 0x73, 0x5f, 0x76, 0x69, 0x73, 0x69, 0x62, 0x6c, 0x65, 0x18,
-	0x04, 0x20, 0x01, 0x28, 0x08, 0x48, 0x01, 0x52, 0x0d, 0x73, 0x68, 0x61, 0x70, 0x65, 0x73, 0x56,
-	0x69, 0x73, 0x69, 0x62, 0x6c, 0x65, 0x88, 0x01, 0x01, 0x12, 0x29, 0x0a, 0x10, 0x67, 0x72, 0x61,
-	0x64, 0x69, 0x65, 0x6e, 0x74, 0x5f, 0x76, 0x69, 0x73, 0x69, 0x62, 0x6c, 0x65, 0x18, 0x05, 0x20,
-	0x01, 0x28, 0x08, 0x52, 0x0f, 0x67, 0x72, 0x61, 0x64, 0x69, 0x65, 0x6e, 0x74, 0x56, 0x69, 0x73,
-	0x69, 0x62, 0x6c, 0x65, 0x12, 0x1d, 0x0a, 0x0a, 0x6c, 0x69, 0x6e, 0x65, 0x5f, 0x63, 0x6f, 0x6c,
-	0x6f, 0x72, 0x18, 0x06, 0x20, 0x01, 0x28, 0x09, 0x52, 0x09, 0x6c, 0x69, 0x6e, 0x65, 0x43, 0x6f,
-	0x6c, 0x6f, 0x72, 0x12, 0x31, 0x0a, 0x12, 0x70, 0x6f, 0x69, 0x6e, 0x74, 0x5f, 0x6c, 0x61, 0x62,
-	0x65, 0x6c, 0x5f, 0x66, 0x6f, 0x72, 0x6d, 0x61, 0x74, 0x18, 0x08, 0x20, 0x01, 0x28, 0x09, 0x48,
-	0x02, 0x52, 0x10, 0x70, 0x6f, 0x69, 0x6e, 0x74, 0x4c, 0x61, 0x62, 0x65, 0x6c, 0x46, 0x6f, 0x72,
-	0x6d, 0x61, 0x74, 0x88, 0x01, 0x01, 0x12, 0x30, 0x0a, 0x12, 0x78, 0x5f, 0x74, 0x6f, 0x6f, 0x6c,
-	0x5f, 0x74, 0x69, 0x70, 0x5f, 0x70, 0x61, 0x74, 0x74, 0x65, 0x72, 0x6e, 0x18, 0x09, 0x20, 0x01,
-	0x28, 0x09, 0x48, 0x03, 0x52, 0x0f, 0x78, 0x54, 0x6f, 0x6f, 0x6c, 0x54, 0x69, 0x70, 0x50, 0x61,
-	0x74, 0x74, 0x65, 0x72, 0x6e, 0x88, 0x01, 0x01, 0x12, 0x30, 0x0a, 0x12, 0x79, 0x5f, 0x74, 0x6f,
-	0x6f, 0x6c, 0x5f, 0x74, 0x69, 0x70, 0x5f, 0x70, 0x61, 0x74, 0x74, 0x65, 0x72, 0x6e, 0x18, 0x0a,
-	0x20, 0x01, 0x28, 0x09, 0x48, 0x04, 0x52, 0x0f, 0x79, 0x54, 0x6f, 0x6f, 0x6c, 0x54, 0x69, 0x70,
-	0x50, 0x61, 0x74, 0x74, 0x65, 0x72, 0x6e, 0x88, 0x01, 0x01, 0x12, 0x1f, 0x0a, 0x0b, 0x73, 0x68,
-	0x61, 0x70, 0x65, 0x5f, 0x6c, 0x61, 0x62, 0x65, 0x6c, 0x18, 0x0b, 0x20, 0x01, 0x28, 0x09, 0x52,
-	0x0a, 0x73, 0x68, 0x61, 0x70, 0x65, 0x4c, 0x61, 0x62, 0x65, 0x6c, 0x12, 0x22, 0x0a, 0x0a, 0x73,
-	0x68, 0x61, 0x70, 0x65, 0x5f, 0x73, 0x69, 0x7a, 0x65, 0x18, 0x0c, 0x20, 0x01, 0x28, 0x01, 0x48,
-	0x05, 0x52, 0x09, 0x73, 0x68, 0x61, 0x70, 0x65, 0x53, 0x69, 0x7a, 0x65, 0x88, 0x01, 0x01, 0x12,
-	0x1f, 0x0a, 0x0b, 0x73, 0x68, 0x61, 0x70, 0x65, 0x5f, 0x63, 0x6f, 0x6c, 0x6f, 0x72, 0x18, 0x0d,
-	0x20, 0x01, 0x28, 0x09, 0x52, 0x0a, 0x73, 0x68, 0x61, 0x70, 0x65, 0x43, 0x6f, 0x6c, 0x6f, 0x72,
-	0x12, 0x14, 0x0a, 0x05, 0x73, 0x68, 0x61, 0x70, 0x65, 0x18, 0x0e, 0x20, 0x01, 0x28, 0x09, 0x52,
-	0x05, 0x73, 0x68, 0x61, 0x70, 0x65, 0x12, 0x6e, 0x0a, 0x0c, 0x64, 0x61, 0x74, 0x61, 0x5f, 0x73,
-	0x6f, 0x75, 0x72, 0x63, 0x65, 0x73, 0x18, 0x0f, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x4b, 0x2e, 0x69,
-	0x6f, 0x2e, 0x64, 0x65, 0x65, 0x70, 0x68, 0x61, 0x76, 0x65, 0x6e, 0x2e, 0x70, 0x72, 0x6f, 0x74,
-	0x6f, 0x2e, 0x62, 0x61, 0x63, 0x6b, 0x70, 0x6c, 0x61, 0x6e, 0x65, 0x2e, 0x73, 0x63, 0x72, 0x69,
-	0x70, 0x74, 0x2e, 0x67, 0x72, 0x70, 0x63, 0x2e, 0x46, 0x69, 0x67, 0x75, 0x72, 0x65, 0x44, 0x65,
-	0x73, 0x63, 0x72, 0x69, 0x70, 0x74, 0x6f, 0x72, 0x2e, 0x53, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x44,
-	0x65, 0x73, 0x63, 0x72, 0x69, 0x70, 0x74, 0x6f, 0x72, 0x52, 0x0b, 0x64, 0x61, 0x74, 0x61, 0x53,
-	0x6f, 0x75, 0x72, 0x63, 0x65, 0x73, 0x42, 0x10, 0x0a, 0x0e, 0x5f, 0x6c, 0x69, 0x6e, 0x65, 0x73,
-	0x5f, 0x76, 0x69, 0x73, 0x69, 0x62, 0x6c, 0x65, 0x42, 0x11, 0x0a, 0x0f, 0x5f, 0x73, 0x68, 0x61,
-	0x70, 0x65, 0x73, 0x5f, 0x76, 0x69, 0x73, 0x69, 0x62, 0x6c, 0x65, 0x42, 0x15, 0x0a, 0x13, 0x5f,
-	0x70, 0x6f, 0x69, 0x6e, 0x74, 0x5f, 0x6c, 0x61, 0x62, 0x65, 0x6c, 0x5f, 0x66, 0x6f, 0x72, 0x6d,
-	0x61, 0x74, 0x42, 0x15, 0x0a, 0x13, 0x5f, 0x78, 0x5f, 0x74, 0x6f, 0x6f, 0x6c, 0x5f, 0x74, 0x69,
-	0x70, 0x5f, 0x70, 0x61, 0x74, 0x74, 0x65, 0x72, 0x6e, 0x42, 0x15, 0x0a, 0x13, 0x5f, 0x79, 0x5f,
-	0x74, 0x6f, 0x6f, 0x6c, 0x5f, 0x74, 0x69, 0x70, 0x5f, 0x70, 0x61, 0x74, 0x74, 0x65, 0x72, 0x6e,
-	0x42, 0x0d, 0x0a, 0x0b, 0x5f, 0x73, 0x68, 0x61, 0x70, 0x65, 0x5f, 0x73, 0x69, 0x7a, 0x65, 0x4a,
-	0x04, 0x08, 0x07, 0x10, 0x08, 0x1a, 0xa6, 0x0c, 0x0a, 0x15, 0x4d, 0x75, 0x6c, 0x74, 0x69, 0x53,
-	0x65, 0x72, 0x69, 0x65, 0x73, 0x44, 0x65, 0x73, 0x63, 0x72, 0x69, 0x70, 0x74, 0x6f, 0x72, 0x12,
-	0x69, 0x0a, 0x0a, 0x70, 0x6c, 0x6f, 0x74, 0x5f, 0x73, 0x74, 0x79, 0x6c, 0x65, 0x18, 0x01, 0x20,
-	0x01, 0x28, 0x0e, 0x32, 0x4a, 0x2e, 0x69, 0x6f, 0x2e, 0x64, 0x65, 0x65, 0x70, 0x68, 0x61, 0x76,
-	0x65, 0x6e, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x62, 0x61, 0x63, 0x6b, 0x70, 0x6c, 0x61,
-	0x6e, 0x65, 0x2e, 0x73, 0x63, 0x72, 0x69, 0x70, 0x74, 0x2e, 0x67, 0x72, 0x70, 0x63, 0x2e, 0x46,
-	0x69, 0x67, 0x75, 0x72, 0x65, 0x44, 0x65, 0x73, 0x63, 0x72, 0x69, 0x70, 0x74, 0x6f, 0x72, 0x2e,
-	0x53, 0x65, 0x72, 0x69, 0x65, 0x73, 0x50, 0x6c, 0x6f, 0x74, 0x53, 0x74, 0x79, 0x6c, 0x65, 0x52,
-	0x09, 0x70, 0x6c, 0x6f, 0x74, 0x53, 0x74, 0x79, 0x6c, 0x65, 0x12, 0x12, 0x0a, 0x04, 0x6e, 0x61,
-	0x6d, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x12, 0x6e,
-	0x0a, 0x0a, 0x6c, 0x69, 0x6e, 0x65, 0x5f, 0x63, 0x6f, 0x6c, 0x6f, 0x72, 0x18, 0x03, 0x20, 0x01,
+	0x2e, 0x43, 0x68, 0x61, 0x72, 0x74, 0x54, 0x79, 0x70, 0x65, 0x52, 0x09, 0x63, 0x68, 0x61, 0x72,
+	0x74, 0x54, 0x79, 0x70, 0x65, 0x12, 0x19, 0x0a, 0x05, 0x74, 0x69, 0x74, 0x6c, 0x65, 0x18, 0x07,
+	0x20, 0x01, 0x28, 0x09, 0x48, 0x00, 0x52, 0x05, 0x74, 0x69, 0x74, 0x6c, 0x65, 0x88, 0x01, 0x01,
+	0x12, 0x1d, 0x0a, 0x0a, 0x74, 0x69, 0x74, 0x6c, 0x65, 0x5f, 0x66, 0x6f, 0x6e, 0x74, 0x18, 0x08,
+	0x20, 0x01, 0x28, 0x09, 0x52, 0x09, 0x74, 0x69, 0x74, 0x6c, 0x65, 0x46, 0x6f, 0x6e, 0x74, 0x12,
+	0x1f, 0x0a, 0x0b, 0x74, 0x69, 0x74, 0x6c, 0x65, 0x5f, 0x63, 0x6f, 0x6c, 0x6f, 0x72, 0x18, 0x09,
+	0x20, 0x01, 0x28, 0x09, 0x52, 0x0a, 0x74, 0x69, 0x74, 0x6c, 0x65, 0x43, 0x6f, 0x6c, 0x6f, 0x72,
+	0x12, 0x1f, 0x0a, 0x0b, 0x73, 0x68, 0x6f, 0x77, 0x5f, 0x6c, 0x65, 0x67, 0x65, 0x6e, 0x64, 0x18,
+	0x0a, 0x20, 0x01, 0x28, 0x08, 0x52, 0x0a, 0x73, 0x68, 0x6f, 0x77, 0x4c, 0x65, 0x67, 0x65, 0x6e,
+	0x64, 0x12, 0x1f, 0x0a, 0x0b, 0x6c, 0x65, 0x67, 0x65, 0x6e, 0x64, 0x5f, 0x66, 0x6f, 0x6e, 0x74,
+	0x18, 0x0b, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0a, 0x6c, 0x65, 0x67, 0x65, 0x6e, 0x64, 0x46, 0x6f,
+	0x6e, 0x74, 0x12, 0x21, 0x0a, 0x0c, 0x6c, 0x65, 0x67, 0x65, 0x6e, 0x64, 0x5f, 0x63, 0x6f, 0x6c,
+	0x6f, 0x72, 0x18, 0x0c, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0b, 0x6c, 0x65, 0x67, 0x65, 0x6e, 0x64,
+	0x43, 0x6f, 0x6c, 0x6f, 0x72, 0x12, 0x12, 0x0a, 0x04, 0x69, 0x73, 0x33, 0x64, 0x18, 0x0d, 0x20,
+	0x01, 0x28, 0x08, 0x52, 0x04, 0x69, 0x73, 0x33, 0x64, 0x12, 0x16, 0x0a, 0x06, 0x63, 0x6f, 0x6c,
+	0x75, 0x6d, 0x6e, 0x18, 0x0e, 0x20, 0x01, 0x28, 0x05, 0x52, 0x06, 0x63, 0x6f, 0x6c, 0x75, 0x6d,
+	0x6e, 0x12, 0x10, 0x0a, 0x03, 0x72, 0x6f, 0x77, 0x18, 0x0f, 0x20, 0x01, 0x28, 0x05, 0x52, 0x03,
+	0x72, 0x6f, 0x77, 0x22, 0x5f, 0x0a, 0x09, 0x43, 0x68, 0x61, 0x72, 0x74, 0x54, 0x79, 0x70, 0x65,
+	0x12, 0x06, 0x0a, 0x02, 0x58, 0x59, 0x10, 0x00, 0x12, 0x07, 0x0a, 0x03, 0x50, 0x49, 0x45, 0x10,
+	0x01, 0x12, 0x0c, 0x0a, 0x04, 0x4f, 0x48, 0x4c, 0x43, 0x10, 0x02, 0x1a, 0x02, 0x08, 0x01, 0x12,
+	0x0c, 0x0a, 0x08, 0x43, 0x41, 0x54, 0x45, 0x47, 0x4f, 0x52, 0x59, 0x10, 0x03, 0x12, 0x07, 0x0a,
+	0x03, 0x58, 0x59, 0x5a, 0x10, 0x04, 0x12, 0x0f, 0x0a, 0x0b, 0x43, 0x41, 0x54, 0x45, 0x47, 0x4f,
+	0x52, 0x59, 0x5f, 0x33, 0x44, 0x10, 0x05, 0x12, 0x0b, 0x0a, 0x07, 0x54, 0x52, 0x45, 0x45, 0x4d,
+	0x41, 0x50, 0x10, 0x06, 0x42, 0x08, 0x0a, 0x06, 0x5f, 0x74, 0x69, 0x74, 0x6c, 0x65, 0x1a, 0xb3,
+	0x06, 0x0a, 0x10, 0x53, 0x65, 0x72, 0x69, 0x65, 0x73, 0x44, 0x65, 0x73, 0x63, 0x72, 0x69, 0x70,
+	0x74, 0x6f, 0x72, 0x12, 0x69, 0x0a, 0x0a, 0x70, 0x6c, 0x6f, 0x74, 0x5f, 0x73, 0x74, 0x79, 0x6c,
+	0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0e, 0x32, 0x4a, 0x2e, 0x69, 0x6f, 0x2e, 0x64, 0x65, 0x65,
+	0x70, 0x68, 0x61, 0x76, 0x65, 0x6e, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x62, 0x61, 0x63,
+	0x6b, 0x70, 0x6c, 0x61, 0x6e, 0x65, 0x2e, 0x73, 0x63, 0x72, 0x69, 0x70, 0x74, 0x2e, 0x67, 0x72,
+	0x70, 0x63, 0x2e, 0x46, 0x69, 0x67, 0x75, 0x72, 0x65, 0x44, 0x65, 0x73, 0x63, 0x72, 0x69, 0x70,
+	0x74, 0x6f, 0x72, 0x2e, 0x53, 0x65, 0x72, 0x69, 0x65, 0x73, 0x50, 0x6c, 0x6f, 0x74, 0x53, 0x74,
+	0x79, 0x6c, 0x65, 0x52, 0x09, 0x70, 0x6c, 0x6f, 0x74, 0x53, 0x74, 0x79, 0x6c, 0x65, 0x12, 0x12,
+	0x0a, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x6e, 0x61,
+	0x6d, 0x65, 0x12, 0x28, 0x0a, 0x0d, 0x6c, 0x69, 0x6e, 0x65, 0x73, 0x5f, 0x76, 0x69, 0x73, 0x69,
+	0x62, 0x6c, 0x65, 0x18, 0x03, 0x20, 0x01, 0x28, 0x08, 0x48, 0x00, 0x52, 0x0c, 0x6c, 0x69, 0x6e,
+	0x65, 0x73, 0x56, 0x69, 0x73, 0x69, 0x62, 0x6c, 0x65, 0x88, 0x01, 0x01, 0x12, 0x2a, 0x0a, 0x0e,
+	0x73, 0x68, 0x61, 0x70, 0x65, 0x73, 0x5f, 0x76, 0x69, 0x73, 0x69, 0x62, 0x6c, 0x65, 0x18, 0x04,
+	0x20, 0x01, 0x28, 0x08, 0x48, 0x01, 0x52, 0x0d, 0x73, 0x68, 0x61, 0x70, 0x65, 0x73, 0x56, 0x69,
+	0x73, 0x69, 0x62, 0x6c, 0x65, 0x88, 0x01, 0x01, 0x12, 0x29, 0x0a, 0x10, 0x67, 0x72, 0x61, 0x64,
+	0x69, 0x65, 0x6e, 0x74, 0x5f, 0x76, 0x69, 0x73, 0x69, 0x62, 0x6c, 0x65, 0x18, 0x05, 0x20, 0x01,
+	0x28, 0x08, 0x52, 0x0f, 0x67, 0x72, 0x61, 0x64, 0x69, 0x65, 0x6e, 0x74, 0x56, 0x69, 0x73, 0x69,
+	0x62, 0x6c, 0x65, 0x12, 0x1d, 0x0a, 0x0a, 0x6c, 0x69, 0x6e, 0x65, 0x5f, 0x63, 0x6f, 0x6c, 0x6f,
+	0x72, 0x18, 0x06, 0x20, 0x01, 0x28, 0x09, 0x52, 0x09, 0x6c, 0x69, 0x6e, 0x65, 0x43, 0x6f, 0x6c,
+	0x6f, 0x72, 0x12, 0x31, 0x0a, 0x12, 0x70, 0x6f, 0x69, 0x6e, 0x74, 0x5f, 0x6c, 0x61, 0x62, 0x65,
+	0x6c, 0x5f, 0x66, 0x6f, 0x72, 0x6d, 0x61, 0x74, 0x18, 0x08, 0x20, 0x01, 0x28, 0x09, 0x48, 0x02,
+	0x52, 0x10, 0x70, 0x6f, 0x69, 0x6e, 0x74, 0x4c, 0x61, 0x62, 0x65, 0x6c, 0x46, 0x6f, 0x72, 0x6d,
+	0x61, 0x74, 0x88, 0x01, 0x01, 0x12, 0x30, 0x0a, 0x12, 0x78, 0x5f, 0x74, 0x6f, 0x6f, 0x6c, 0x5f,
+	0x74, 0x69, 0x70, 0x5f, 0x70, 0x61, 0x74, 0x74, 0x65, 0x72, 0x6e, 0x18, 0x09, 0x20, 0x01, 0x28,
+	0x09, 0x48, 0x03, 0x52, 0x0f, 0x78, 0x54, 0x6f, 0x6f, 0x6c, 0x54, 0x69, 0x70, 0x50, 0x61, 0x74,
+	0x74, 0x65, 0x72, 0x6e, 0x88, 0x01, 0x01, 0x12, 0x30, 0x0a, 0x12, 0x79, 0x5f, 0x74, 0x6f, 0x6f,
+	0x6c, 0x5f, 0x74, 0x69, 0x70, 0x5f, 0x70, 0x61, 0x74, 0x74, 0x65, 0x72, 0x6e, 0x18, 0x0a, 0x20,
+	0x01, 0x28, 0x09, 0x48, 0x04, 0x52, 0x0f, 0x79, 0x54, 0x6f, 0x6f, 0x6c, 0x54, 0x69, 0x70, 0x50,
+	0x61, 0x74, 0x74, 0x65, 0x72, 0x6e, 0x88, 0x01, 0x01, 0x12, 0x1f, 0x0a, 0x0b, 0x73, 0x68, 0x61,
+	0x70, 0x65, 0x5f, 0x6c, 0x61, 0x62, 0x65, 0x6c, 0x18, 0x0b, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0a,
+	0x73, 0x68, 0x61, 0x70, 0x65, 0x4c, 0x61, 0x62, 0x65, 0x6c, 0x12, 0x22, 0x0a, 0x0a, 0x73, 0x68,
+	0x61, 0x70, 0x65, 0x5f, 0x73, 0x69, 0x7a, 0x65, 0x18, 0x0c, 0x20, 0x01, 0x28, 0x01, 0x48, 0x05,
+	0x52, 0x09, 0x73, 0x68, 0x61, 0x70, 0x65, 0x53, 0x69, 0x7a, 0x65, 0x88, 0x01, 0x01, 0x12, 0x1f,
+	0x0a, 0x0b, 0x73, 0x68, 0x61, 0x70, 0x65, 0x5f, 0x63, 0x6f, 0x6c, 0x6f, 0x72, 0x18, 0x0d, 0x20,
+	0x01, 0x28, 0x09, 0x52, 0x0a, 0x73, 0x68, 0x61, 0x70, 0x65, 0x43, 0x6f, 0x6c, 0x6f, 0x72, 0x12,
+	0x14, 0x0a, 0x05, 0x73, 0x68, 0x61, 0x70, 0x65, 0x18, 0x0e, 0x20, 0x01, 0x28, 0x09, 0x52, 0x05,
+	0x73, 0x68, 0x61, 0x70, 0x65, 0x12, 0x6e, 0x0a, 0x0c, 0x64, 0x61, 0x74, 0x61, 0x5f, 0x73, 0x6f,
+	0x75, 0x72, 0x63, 0x65, 0x73, 0x18, 0x0f, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x4b, 0x2e, 0x69, 0x6f,
+	0x2e, 0x64, 0x65, 0x65, 0x70, 0x68, 0x61, 0x76, 0x65, 0x6e, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f,
+	0x2e, 0x62, 0x61, 0x63, 0x6b, 0x70, 0x6c, 0x61, 0x6e, 0x65, 0x2e, 0x73, 0x63, 0x72, 0x69, 0x70,
+	0x74, 0x2e, 0x67, 0x72, 0x70, 0x63, 0x2e, 0x46, 0x69, 0x67, 0x75, 0x72, 0x65, 0x44, 0x65, 0x73,
+	0x63, 0x72, 0x69, 0x70, 0x74, 0x6f, 0x72, 0x2e, 0x53, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x44, 0x65,
+	0x73, 0x63, 0x72, 0x69, 0x70, 0x74, 0x6f, 0x72, 0x52, 0x0b, 0x64, 0x61, 0x74, 0x61, 0x53, 0x6f,
+	0x75, 0x72, 0x63, 0x65, 0x73, 0x42, 0x10, 0x0a, 0x0e, 0x5f, 0x6c, 0x69, 0x6e, 0x65, 0x73, 0x5f,
+	0x76, 0x69, 0x73, 0x69, 0x62, 0x6c, 0x65, 0x42, 0x11, 0x0a, 0x0f, 0x5f, 0x73, 0x68, 0x61, 0x70,
+	0x65, 0x73, 0x5f, 0x76, 0x69, 0x73, 0x69, 0x62, 0x6c, 0x65, 0x42, 0x15, 0x0a, 0x13, 0x5f, 0x70,
+	0x6f, 0x69, 0x6e, 0x74, 0x5f, 0x6c, 0x61, 0x62, 0x65, 0x6c, 0x5f, 0x66, 0x6f, 0x72, 0x6d, 0x61,
+	0x74, 0x42, 0x15, 0x0a, 0x13, 0x5f, 0x78, 0x5f, 0x74, 0x6f, 0x6f, 0x6c, 0x5f, 0x74, 0x69, 0x70,
+	0x5f, 0x70, 0x61, 0x74, 0x74, 0x65, 0x72, 0x6e, 0x42, 0x15, 0x0a, 0x13, 0x5f, 0x79, 0x5f, 0x74,
+	0x6f, 0x6f, 0x6c, 0x5f, 0x74, 0x69, 0x70, 0x5f, 0x70, 0x61, 0x74, 0x74, 0x65, 0x72, 0x6e, 0x42,
+	0x0d, 0x0a, 0x0b, 0x5f, 0x73, 0x68, 0x61, 0x70, 0x65, 0x5f, 0x73, 0x69, 0x7a, 0x65, 0x4a, 0x04,
+	0x08, 0x07, 0x10, 0x08, 0x1a, 0xa6, 0x0c, 0x0a, 0x15, 0x4d, 0x75, 0x6c, 0x74, 0x69, 0x53, 0x65,
+	0x72, 0x69, 0x65, 0x73, 0x44, 0x65, 0x73, 0x63, 0x72, 0x69, 0x70, 0x74, 0x6f, 0x72, 0x12, 0x69,
+	0x0a, 0x0a, 0x70, 0x6c, 0x6f, 0x74, 0x5f, 0x73, 0x74, 0x79, 0x6c, 0x65, 0x18, 0x01, 0x20, 0x01,
+	0x28, 0x0e, 0x32, 0x4a, 0x2e, 0x69, 0x6f, 0x2e, 0x64, 0x65, 0x65, 0x70, 0x68, 0x61, 0x76, 0x65,
+	0x6e, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x62, 0x61, 0x63, 0x6b, 0x70, 0x6c, 0x61, 0x6e,
+	0x65, 0x2e, 0x73, 0x63, 0x72, 0x69, 0x70, 0x74, 0x2e, 0x67, 0x72, 0x70, 0x63, 0x2e, 0x46, 0x69,
+	0x67, 0x75, 0x72, 0x65, 0x44, 0x65, 0x73, 0x63, 0x72, 0x69, 0x70, 0x74, 0x6f, 0x72, 0x2e, 0x53,
+	0x65, 0x72, 0x69, 0x65, 0x73, 0x50, 0x6c, 0x6f, 0x74, 0x53, 0x74, 0x79, 0x6c, 0x65, 0x52, 0x09,
+	0x70, 0x6c, 0x6f, 0x74, 0x53, 0x74, 0x79, 0x6c, 0x65, 0x12, 0x12, 0x0a, 0x04, 0x6e, 0x61, 0x6d,
+	0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x12, 0x6e, 0x0a,
+	0x0a, 0x6c, 0x69, 0x6e, 0x65, 0x5f, 0x63, 0x6f, 0x6c, 0x6f, 0x72, 0x18, 0x03, 0x20, 0x01, 0x28,
+	0x0b, 0x32, 0x4f, 0x2e, 0x69, 0x6f, 0x2e, 0x64, 0x65, 0x65, 0x70, 0x68, 0x61, 0x76, 0x65, 0x6e,
+	0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x62, 0x61, 0x63, 0x6b, 0x70, 0x6c, 0x61, 0x6e, 0x65,
+	0x2e, 0x73, 0x63, 0x72, 0x69, 0x70, 0x74, 0x2e, 0x67, 0x72, 0x70, 0x63, 0x2e, 0x46, 0x69, 0x67,
+	0x75, 0x72, 0x65, 0x44, 0x65, 0x73, 0x63, 0x72, 0x69, 0x70, 0x74, 0x6f, 0x72, 0x2e, 0x53, 0x74,
+	0x72, 0x69, 0x6e, 0x67, 0x4d, 0x61, 0x70, 0x57, 0x69, 0x74, 0x68, 0x44, 0x65, 0x66, 0x61, 0x75,
+	0x6c, 0x74, 0x52, 0x09, 0x6c, 0x69, 0x6e, 0x65, 0x43, 0x6f, 0x6c, 0x6f, 0x72, 0x12, 0x70, 0x0a,
+	0x0b, 0x70, 0x6f, 0x69, 0x6e, 0x74, 0x5f, 0x63, 0x6f, 0x6c, 0x6f, 0x72, 0x18, 0x04, 0x20, 0x01,
 	0x28, 0x0b, 0x32, 0x4f, 0x2e, 0x69, 0x6f, 0x2e, 0x64, 0x65, 0x65, 0x70, 0x68, 0x61, 0x76, 0x65,
 	0x6e, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x62, 0x61, 0x63, 0x6b, 0x70, 0x6c, 0x61, 0x6e,
 	0x65, 0x2e, 0x73, 0x63, 0x72, 0x69, 0x70, 0x74, 0x2e, 0x67, 0x72, 0x70, 0x63, 0x2e, 0x46, 0x69,
 	0x67, 0x75, 0x72, 0x65, 0x44, 0x65, 0x73, 0x63, 0x72, 0x69, 0x70, 0x74, 0x6f, 0x72, 0x2e, 0x53,
 	0x74, 0x72, 0x69, 0x6e, 0x67, 0x4d, 0x61, 0x70, 0x57, 0x69, 0x74, 0x68, 0x44, 0x65, 0x66, 0x61,
-	0x75, 0x6c, 0x74, 0x52, 0x09, 0x6c, 0x69, 0x6e, 0x65, 0x43, 0x6f, 0x6c, 0x6f, 0x72, 0x12, 0x70,
-	0x0a, 0x0b, 0x70, 0x6f, 0x69, 0x6e, 0x74, 0x5f, 0x63, 0x6f, 0x6c, 0x6f, 0x72, 0x18, 0x04, 0x20,
-	0x01, 0x28, 0x0b, 0x32, 0x4f, 0x2e, 0x69, 0x6f, 0x2e, 0x64, 0x65, 0x65, 0x70, 0x68, 0x61, 0x76,
+	0x75, 0x6c, 0x74, 0x52, 0x0a, 0x70, 0x6f, 0x69, 0x6e, 0x74, 0x43, 0x6f, 0x6c, 0x6f, 0x72, 0x12,
+	0x72, 0x0a, 0x0d, 0x6c, 0x69, 0x6e, 0x65, 0x73, 0x5f, 0x76, 0x69, 0x73, 0x69, 0x62, 0x6c, 0x65,
+	0x18, 0x05, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x4d, 0x2e, 0x69, 0x6f, 0x2e, 0x64, 0x65, 0x65, 0x70,
+	0x68, 0x61, 0x76, 0x65, 0x6e, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x62, 0x61, 0x63, 0x6b,
+	0x70, 0x6c, 0x61, 0x6e, 0x65, 0x2e, 0x73, 0x63, 0x72, 0x69, 0x70, 0x74, 0x2e, 0x67, 0x72, 0x70,
+	0x63, 0x2e, 0x46, 0x69, 0x67, 0x75, 0x72, 0x65, 0x44, 0x65, 0x73, 0x63, 0x72, 0x69, 0x70, 0x74,
+	0x6f, 0x72, 0x2e, 0x42, 0x6f, 0x6f, 0x6c, 0x4d, 0x61, 0x70, 0x57, 0x69, 0x74, 0x68, 0x44, 0x65,
+	0x66, 0x61, 0x75, 0x6c, 0x74, 0x52, 0x0c, 0x6c, 0x69, 0x6e, 0x65, 0x73, 0x56, 0x69, 0x73, 0x69,
+	0x62, 0x6c, 0x65, 0x12, 0x74, 0x0a, 0x0e, 0x70, 0x6f, 0x69, 0x6e, 0x74, 0x73, 0x5f, 0x76, 0x69,
+	0x73, 0x69, 0x62, 0x6c, 0x65, 0x18, 0x06, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x4d, 0x2e, 0x69, 0x6f,
+	0x2e, 0x64, 0x65, 0x65, 0x70, 0x68, 0x61, 0x76, 0x65, 0x6e, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f,
+	0x2e, 0x62, 0x61, 0x63, 0x6b, 0x70, 0x6c, 0x61, 0x6e, 0x65, 0x2e, 0x73, 0x63, 0x72, 0x69, 0x70,
+	0x74, 0x2e, 0x67, 0x72, 0x70, 0x63, 0x2e, 0x46, 0x69, 0x67, 0x75, 0x72, 0x65, 0x44, 0x65, 0x73,
+	0x63, 0x72, 0x69, 0x70, 0x74, 0x6f, 0x72, 0x2e, 0x42, 0x6f, 0x6f, 0x6c, 0x4d, 0x61, 0x70, 0x57,
+	0x69, 0x74, 0x68, 0x44, 0x65, 0x66, 0x61, 0x75, 0x6c, 0x74, 0x52, 0x0d, 0x70, 0x6f, 0x69, 0x6e,
+	0x74, 0x73, 0x56, 0x69, 0x73, 0x69, 0x62, 0x6c, 0x65, 0x12, 0x78, 0x0a, 0x10, 0x67, 0x72, 0x61,
+	0x64, 0x69, 0x65, 0x6e, 0x74, 0x5f, 0x76, 0x69, 0x73, 0x69, 0x62, 0x6c, 0x65, 0x18, 0x07, 0x20,
+	0x01, 0x28, 0x0b, 0x32, 0x4d, 0x2e, 0x69, 0x6f, 0x2e, 0x64, 0x65, 0x65, 0x70, 0x68, 0x61, 0x76,
 	0x65, 0x6e, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x62, 0x61, 0x63, 0x6b, 0x70, 0x6c, 0x61,
 	0x6e, 0x65, 0x2e, 0x73, 0x63, 0x72, 0x69, 0x70, 0x74, 0x2e, 0x67, 0x72, 0x70, 0x63, 0x2e, 0x46,
 	0x69, 0x67, 0x75, 0x72, 0x65, 0x44, 0x65, 0x73, 0x63, 0x72, 0x69, 0x70, 0x74, 0x6f, 0x72, 0x2e,
-	0x53, 0x74, 0x72, 0x69, 0x6e, 0x67, 0x4d, 0x61, 0x70, 0x57, 0x69, 0x74, 0x68, 0x44, 0x65, 0x66,
-	0x61, 0x75, 0x6c, 0x74, 0x52, 0x0a, 0x70, 0x6f, 0x69, 0x6e, 0x74, 0x43, 0x6f, 0x6c, 0x6f, 0x72,
-	0x12, 0x72, 0x0a, 0x0d, 0x6c, 0x69, 0x6e, 0x65, 0x73, 0x5f, 0x76, 0x69, 0x73, 0x69, 0x62, 0x6c,
-	0x65, 0x18, 0x05, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x4d, 0x2e, 0x69, 0x6f, 0x2e, 0x64, 0x65, 0x65,
-	0x70, 0x68, 0x61, 0x76, 0x65, 0x6e, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x62, 0x61, 0x63,
-	0x6b, 0x70, 0x6c, 0x61, 0x6e, 0x65, 0x2e, 0x73, 0x63, 0x72, 0x69, 0x70, 0x74, 0x2e, 0x67, 0x72,
-	0x70, 0x63, 0x2e, 0x46, 0x69, 0x67, 0x75, 0x72, 0x65, 0x44, 0x65, 0x73, 0x63, 0x72, 0x69, 0x70,
-	0x74, 0x6f, 0x72, 0x2e, 0x42, 0x6f, 0x6f, 0x6c, 0x4d, 0x61, 0x70, 0x57, 0x69, 0x74, 0x68, 0x44,
-	0x65, 0x66, 0x61, 0x75, 0x6c, 0x74, 0x52, 0x0c, 0x6c, 0x69, 0x6e, 0x65, 0x73, 0x56, 0x69, 0x73,
-	0x69, 0x62, 0x6c, 0x65, 0x12, 0x74, 0x0a, 0x0e, 0x70, 0x6f, 0x69, 0x6e, 0x74, 0x73, 0x5f, 0x76,
-	0x69, 0x73, 0x69, 0x62, 0x6c, 0x65, 0x18, 0x06, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x4d, 0x2e, 0x69,
-	0x6f, 0x2e, 0x64, 0x65, 0x65, 0x70, 0x68, 0x61, 0x76, 0x65, 0x6e, 0x2e, 0x70, 0x72, 0x6f, 0x74,
-	0x6f, 0x2e, 0x62, 0x61, 0x63, 0x6b, 0x70, 0x6c, 0x61, 0x6e, 0x65, 0x2e, 0x73, 0x63, 0x72, 0x69,
-	0x70, 0x74, 0x2e, 0x67, 0x72, 0x70, 0x63, 0x2e, 0x46, 0x69, 0x67, 0x75, 0x72, 0x65, 0x44, 0x65,
-	0x73, 0x63, 0x72, 0x69, 0x70, 0x74, 0x6f, 0x72, 0x2e, 0x42, 0x6f, 0x6f, 0x6c, 0x4d, 0x61, 0x70,
-	0x57, 0x69, 0x74, 0x68, 0x44, 0x65, 0x66, 0x61, 0x75, 0x6c, 0x74, 0x52, 0x0d, 0x70, 0x6f, 0x69,
-	0x6e, 0x74, 0x73, 0x56, 0x69, 0x73, 0x69, 0x62, 0x6c, 0x65, 0x12, 0x78, 0x0a, 0x10, 0x67, 0x72,
-	0x61, 0x64, 0x69, 0x65, 0x6e, 0x74, 0x5f, 0x76, 0x69, 0x73, 0x69, 0x62, 0x6c, 0x65, 0x18, 0x07,
-	0x20, 0x01, 0x28, 0x0b, 0x32, 0x4d, 0x2e, 0x69, 0x6f, 0x2e, 0x64, 0x65, 0x65, 0x70, 0x68, 0x61,
-	0x76, 0x65, 0x6e, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x62, 0x61, 0x63, 0x6b, 0x70, 0x6c,
-	0x61, 0x6e, 0x65, 0x2e, 0x73, 0x63, 0x72, 0x69, 0x70, 0x74, 0x2e, 0x67, 0x72, 0x70, 0x63, 0x2e,
-	0x46, 0x69, 0x67, 0x75, 0x72, 0x65, 0x44, 0x65, 0x73, 0x63, 0x72, 0x69, 0x70, 0x74, 0x6f, 0x72,
-	0x2e, 0x42, 0x6f, 0x6f, 0x6c, 0x4d, 0x61, 0x70, 0x57, 0x69, 0x74, 0x68, 0x44, 0x65, 0x66, 0x61,
-	0x75, 0x6c, 0x74, 0x52, 0x0f, 0x67, 0x72, 0x61, 0x64, 0x69, 0x65, 0x6e, 0x74, 0x56, 0x69, 0x73,
-	0x69, 0x62, 0x6c, 0x65, 0x12, 0x7d, 0x0a, 0x12, 0x70, 0x6f, 0x69, 0x6e, 0x74, 0x5f, 0x6c, 0x61,
-	0x62, 0x65, 0x6c, 0x5f, 0x66, 0x6f, 0x72, 0x6d, 0x61, 0x74, 0x18, 0x08, 0x20, 0x01, 0x28, 0x0b,
-	0x32, 0x4f, 0x2e, 0x69, 0x6f, 0x2e, 0x64, 0x65, 0x65, 0x70, 0x68, 0x61, 0x76, 0x65, 0x6e, 0x2e,
-	0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x62, 0x61, 0x63, 0x6b, 0x70, 0x6c, 0x61, 0x6e, 0x65, 0x2e,
-	0x73, 0x63, 0x72, 0x69, 0x70, 0x74, 0x2e, 0x67, 0x72, 0x70, 0x63, 0x2e, 0x46, 0x69, 0x67, 0x75,
-	0x72, 0x65, 0x44, 0x65, 0x73, 0x63, 0x72, 0x69, 0x70, 0x74, 0x6f, 0x72, 0x2e, 0x53, 0x74, 0x72,
-	0x69, 0x6e, 0x67, 0x4d, 0x61, 0x70, 0x57, 0x69, 0x74, 0x68, 0x44, 0x65, 0x66, 0x61, 0x75, 0x6c,
-	0x74, 0x52, 0x10, 0x70, 0x6f, 0x69, 0x6e, 0x74, 0x4c, 0x61, 0x62, 0x65, 0x6c, 0x46, 0x6f, 0x72,
-	0x6d, 0x61, 0x74, 0x12, 0x7c, 0x0a, 0x12, 0x78, 0x5f, 0x74, 0x6f, 0x6f, 0x6c, 0x5f, 0x74, 0x69,
-	0x70, 0x5f, 0x70, 0x61, 0x74, 0x74, 0x65, 0x72, 0x6e, 0x18, 0x09, 0x20, 0x01, 0x28, 0x0b, 0x32,
+	0x42, 0x6f, 0x6f, 0x6c, 0x4d, 0x61, 0x70, 0x57, 0x69, 0x74, 0x68, 0x44, 0x65, 0x66, 0x61, 0x75,
+	0x6c, 0x74, 0x52, 0x0f, 0x67, 0x72, 0x61, 0x64, 0x69, 0x65, 0x6e, 0x74, 0x56, 0x69, 0x73, 0x69,
+	0x62, 0x6c, 0x65, 0x12, 0x7d, 0x0a, 0x12, 0x70, 0x6f, 0x69, 0x6e, 0x74, 0x5f, 0x6c, 0x61, 0x62,
+	0x65, 0x6c, 0x5f, 0x66, 0x6f, 0x72, 0x6d, 0x61, 0x74, 0x18, 0x08, 0x20, 0x01, 0x28, 0x0b, 0x32,
 	0x4f, 0x2e, 0x69, 0x6f, 0x2e, 0x64, 0x65, 0x65, 0x70, 0x68, 0x61, 0x76, 0x65, 0x6e, 0x2e, 0x70,
 	0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x62, 0x61, 0x63, 0x6b, 0x70, 0x6c, 0x61, 0x6e, 0x65, 0x2e, 0x73,
 	0x63, 0x72, 0x69, 0x70, 0x74, 0x2e, 0x67, 0x72, 0x70, 0x63, 0x2e, 0x46, 0x69, 0x67, 0x75, 0x72,
 	0x65, 0x44, 0x65, 0x73, 0x63, 0x72, 0x69, 0x70, 0x74, 0x6f, 0x72, 0x2e, 0x53, 0x74, 0x72, 0x69,
 	0x6e, 0x67, 0x4d, 0x61, 0x70, 0x57, 0x69, 0x74, 0x68, 0x44, 0x65, 0x66, 0x61, 0x75, 0x6c, 0x74,
-	0x52, 0x0f, 0x78, 0x54, 0x6f, 0x6f, 0x6c, 0x54, 0x69, 0x70, 0x50, 0x61, 0x74, 0x74, 0x65, 0x72,
-	0x6e, 0x12, 0x7c, 0x0a, 0x12, 0x79, 0x5f, 0x74, 0x6f, 0x6f, 0x6c, 0x5f, 0x74, 0x69, 0x70, 0x5f,
-	0x70, 0x61, 0x74, 0x74, 0x65, 0x72, 0x6e, 0x18, 0x0a, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x4f, 0x2e,
-	0x69, 0x6f, 0x2e, 0x64, 0x65, 0x65, 0x70, 0x68, 0x61, 0x76, 0x65, 0x6e, 0x2e, 0x70, 0x72, 0x6f,
-	0x74, 0x6f, 0x2e, 0x62, 0x61, 0x63, 0x6b, 0x70, 0x6c, 0x61, 0x6e, 0x65, 0x2e, 0x73, 0x63, 0x72,
-	0x69, 0x70, 0x74, 0x2e, 0x67, 0x72, 0x70, 0x63, 0x2e, 0x46, 0x69, 0x67, 0x75, 0x72, 0x65, 0x44,
-	0x65, 0x73, 0x63, 0x72, 0x69, 0x70, 0x74, 0x6f, 0x72, 0x2e, 0x53, 0x74, 0x72, 0x69, 0x6e, 0x67,
-	0x4d, 0x61, 0x70, 0x57, 0x69, 0x74, 0x68, 0x44, 0x65, 0x66, 0x61, 0x75, 0x6c, 0x74, 0x52, 0x0f,
-	0x79, 0x54, 0x6f, 0x6f, 0x6c, 0x54, 0x69, 0x70, 0x50, 0x61, 0x74, 0x74, 0x65, 0x72, 0x6e, 0x12,
-	0x70, 0x0a, 0x0b, 0x70, 0x6f, 0x69, 0x6e, 0x74, 0x5f, 0x6c, 0x61, 0x62, 0x65, 0x6c, 0x18, 0x0b,
+	0x52, 0x10, 0x70, 0x6f, 0x69, 0x6e, 0x74, 0x4c, 0x61, 0x62, 0x65, 0x6c, 0x46, 0x6f, 0x72, 0x6d,
+	0x61, 0x74, 0x12, 0x7c, 0x0a, 0x12, 0x78, 0x5f, 0x74, 0x6f, 0x6f, 0x6c, 0x5f, 0x74, 0x69, 0x70,
+	0x5f, 0x70, 0x61, 0x74, 0x74, 0x65, 0x72, 0x6e, 0x18, 0x09, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x4f,
+	0x2e, 0x69, 0x6f, 0x2e, 0x64, 0x65, 0x65, 0x70, 0x68, 0x61, 0x76, 0x65, 0x6e, 0x2e, 0x70, 0x72,
+	0x6f, 0x74, 0x6f, 0x2e, 0x62, 0x61, 0x63, 0x6b, 0x70, 0x6c, 0x61, 0x6e, 0x65, 0x2e, 0x73, 0x63,
+	0x72, 0x69, 0x70, 0x74, 0x2e, 0x67, 0x72, 0x70, 0x63, 0x2e, 0x46, 0x69, 0x67, 0x75, 0x72, 0x65,
+	0x44, 0x65, 0x73, 0x63, 0x72, 0x69, 0x70, 0x74, 0x6f, 0x72, 0x2e, 0x53, 0x74, 0x72, 0x69, 0x6e,
+	0x67, 0x4d, 0x61, 0x70, 0x57, 0x69, 0x74, 0x68, 0x44, 0x65, 0x66, 0x61, 0x75, 0x6c, 0x74, 0x52,
+	0x0f, 0x78, 0x54, 0x6f, 0x6f, 0x6c, 0x54, 0x69, 0x70, 0x50, 0x61, 0x74, 0x74, 0x65, 0x72, 0x6e,
+	0x12, 0x7c, 0x0a, 0x12, 0x79, 0x5f, 0x74, 0x6f, 0x6f, 0x6c, 0x5f, 0x74, 0x69, 0x70, 0x5f, 0x70,
+	0x61, 0x74, 0x74, 0x65, 0x72, 0x6e, 0x18, 0x0a, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x4f, 0x2e, 0x69,
+	0x6f, 0x2e, 0x64, 0x65, 0x65, 0x70, 0x68, 0x61, 0x76, 0x65, 0x6e, 0x2e, 0x70, 0x72, 0x6f, 0x74,
+	0x6f, 0x2e, 0x62, 0x61, 0x63, 0x6b, 0x70, 0x6c, 0x61, 0x6e, 0x65, 0x2e, 0x73, 0x63, 0x72, 0x69,
+	0x70, 0x74, 0x2e, 0x67, 0x72, 0x70, 0x63, 0x2e, 0x46, 0x69, 0x67, 0x75, 0x72, 0x65, 0x44, 0x65,
+	0x73, 0x63, 0x72, 0x69, 0x70, 0x74, 0x6f, 0x72, 0x2e, 0x53, 0x74, 0x72, 0x69, 0x6e, 0x67, 0x4d,
+	0x61, 0x70, 0x57, 0x69, 0x74, 0x68, 0x44, 0x65, 0x66, 0x61, 0x75, 0x6c, 0x74, 0x52, 0x0f, 0x79,
+	0x54, 0x6f, 0x6f, 0x6c, 0x54, 0x69, 0x70, 0x50, 0x61, 0x74, 0x74, 0x65, 0x72, 0x6e, 0x12, 0x70,
+	0x0a, 0x0b, 0x70, 0x6f, 0x69, 0x6e, 0x74, 0x5f, 0x6c, 0x61, 0x62, 0x65, 0x6c, 0x18, 0x0b, 0x20,
+	0x01, 0x28, 0x0b, 0x32, 0x4f, 0x2e, 0x69, 0x6f, 0x2e, 0x64, 0x65, 0x65, 0x70, 0x68, 0x61, 0x76,
+	0x65, 0x6e, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x62, 0x61, 0x63, 0x6b, 0x70, 0x6c, 0x61,
+	0x6e, 0x65, 0x2e, 0x73, 0x63, 0x72, 0x69, 0x70, 0x74, 0x2e, 0x67, 0x72, 0x70, 0x63, 0x2e, 0x46,
+	0x69, 0x67, 0x75, 0x72, 0x65, 0x44, 0x65, 0x73, 0x63, 0x72, 0x69, 0x70, 0x74, 0x6f, 0x72, 0x2e,
+	0x53, 0x74, 0x72, 0x69, 0x6e, 0x67, 0x4d, 0x61, 0x70, 0x57, 0x69, 0x74, 0x68, 0x44, 0x65, 0x66,
+	0x61, 0x75, 0x6c, 0x74, 0x52, 0x0a, 0x70, 0x6f, 0x69, 0x6e, 0x74, 0x4c, 0x61, 0x62, 0x65, 0x6c,
+	0x12, 0x6e, 0x0a, 0x0a, 0x70, 0x6f, 0x69, 0x6e, 0x74, 0x5f, 0x73, 0x69, 0x7a, 0x65, 0x18, 0x0c,
 	0x20, 0x01, 0x28, 0x0b, 0x32, 0x4f, 0x2e, 0x69, 0x6f, 0x2e, 0x64, 0x65, 0x65, 0x70, 0x68, 0x61,
 	0x76, 0x65, 0x6e, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x62, 0x61, 0x63, 0x6b, 0x70, 0x6c,
 	0x61, 0x6e, 0x65, 0x2e, 0x73, 0x63, 0x72, 0x69, 0x70, 0x74, 0x2e, 0x67, 0x72, 0x70, 0x63, 0x2e,
 	0x46, 0x69, 0x67, 0x75, 0x72, 0x65, 0x44, 0x65, 0x73, 0x63, 0x72, 0x69, 0x70, 0x74, 0x6f, 0x72,
-	0x2e, 0x53, 0x74, 0x72, 0x69, 0x6e, 0x67, 0x4d, 0x61, 0x70, 0x57, 0x69, 0x74, 0x68, 0x44, 0x65,
-	0x66, 0x61, 0x75, 0x6c, 0x74, 0x52, 0x0a, 0x70, 0x6f, 0x69, 0x6e, 0x74, 0x4c, 0x61, 0x62, 0x65,
-	0x6c, 0x12, 0x6e, 0x0a, 0x0a, 0x70, 0x6f, 0x69, 0x6e, 0x74, 0x5f, 0x73, 0x69, 0x7a, 0x65, 0x18,
-	0x0c, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x4f, 0x2e, 0x69, 0x6f, 0x2e, 0x64, 0x65, 0x65, 0x70, 0x68,
+	0x2e, 0x44, 0x6f, 0x75, 0x62, 0x6c, 0x65, 0x4d, 0x61, 0x70, 0x57, 0x69, 0x74, 0x68, 0x44, 0x65,
+	0x66, 0x61, 0x75, 0x6c, 0x74, 0x52, 0x09, 0x70, 0x6f, 0x69, 0x6e, 0x74, 0x53, 0x69, 0x7a, 0x65,
+	0x12, 0x70, 0x0a, 0x0b, 0x70, 0x6f, 0x69, 0x6e, 0x74, 0x5f, 0x73, 0x68, 0x61, 0x70, 0x65, 0x18,
+	0x0d, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x4f, 0x2e, 0x69, 0x6f, 0x2e, 0x64, 0x65, 0x65, 0x70, 0x68,
 	0x61, 0x76, 0x65, 0x6e, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x62, 0x61, 0x63, 0x6b, 0x70,
 	0x6c, 0x61, 0x6e, 0x65, 0x2e, 0x73, 0x63, 0x72, 0x69, 0x70, 0x74, 0x2e, 0x67, 0x72, 0x70, 0x63,
 	0x2e, 0x46, 0x69, 0x67, 0x75, 0x72, 0x65, 0x44, 0x65, 0x73, 0x63, 0x72, 0x69, 0x70, 0x74, 0x6f,
-	0x72, 0x2e, 0x44, 0x6f, 0x75, 0x62, 0x6c, 0x65, 0x4d, 0x61, 0x70, 0x57, 0x69, 0x74, 0x68, 0x44,
-	0x65, 0x66, 0x61, 0x75, 0x6c, 0x74, 0x52, 0x09, 0x70, 0x6f, 0x69, 0x6e, 0x74, 0x53, 0x69, 0x7a,
-	0x65, 0x12, 0x70, 0x0a, 0x0b, 0x70, 0x6f, 0x69, 0x6e, 0x74, 0x5f, 0x73, 0x68, 0x61, 0x70, 0x65,
-	0x18, 0x0d, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x4f, 0x2e, 0x69, 0x6f, 0x2e, 0x64, 0x65, 0x65, 0x70,
-	0x68, 0x61, 0x76, 0x65, 0x6e, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x62, 0x61, 0x63, 0x6b,
-	0x70, 0x6c, 0x61, 0x6e, 0x65, 0x2e, 0x73, 0x63, 0x72, 0x69, 0x70, 0x74, 0x2e, 0x67, 0x72, 0x70,
-	0x63, 0x2e, 0x46, 0x69, 0x67, 0x75, 0x72, 0x65, 0x44, 0x65, 0x73, 0x63, 0x72, 0x69, 0x70, 0x74,
-	0x6f, 0x72, 0x2e, 0x53, 0x74, 0x72, 0x69, 0x6e, 0x67, 0x4d, 0x61, 0x70, 0x57, 0x69, 0x74, 0x68,
-	0x44, 0x65, 0x66, 0x61, 0x75, 0x6c, 0x74, 0x52, 0x0a, 0x70, 0x6f, 0x69, 0x6e, 0x74, 0x53, 0x68,
-	0x61, 0x70, 0x65, 0x12, 0x79, 0x0a, 0x0c, 0x64, 0x61, 0x74, 0x61, 0x5f, 0x73, 0x6f, 0x75, 0x72,
-	0x63, 0x65, 0x73, 0x18, 0x0e, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x56, 0x2e, 0x69, 0x6f, 0x2e, 0x64,
-	0x65, 0x65, 0x70, 0x68, 0x61, 0x76, 0x65, 0x6e, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x62,
-	0x61, 0x63, 0x6b, 0x70, 0x6c, 0x61, 0x6e, 0x65, 0x2e, 0x73, 0x63, 0x72, 0x69, 0x70, 0x74, 0x2e,
-	0x67, 0x72, 0x70, 0x63, 0x2e, 0x46, 0x69, 0x67, 0x75, 0x72, 0x65, 0x44, 0x65, 0x73, 0x63, 0x72,
-	0x69, 0x70, 0x74, 0x6f, 0x72, 0x2e, 0x4d, 0x75, 0x6c, 0x74, 0x69, 0x53, 0x65, 0x72, 0x69, 0x65,
-	0x73, 0x53, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x44, 0x65, 0x73, 0x63, 0x72, 0x69, 0x70, 0x74, 0x6f,
-	0x72, 0x52, 0x0b, 0x64, 0x61, 0x74, 0x61, 0x53, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x73, 0x1a, 0x81,
-	0x01, 0x0a, 0x14, 0x53, 0x74, 0x72, 0x69, 0x6e, 0x67, 0x4d, 0x61, 0x70, 0x57, 0x69, 0x74, 0x68,
-	0x44, 0x65, 0x66, 0x61, 0x75, 0x6c, 0x74, 0x12, 0x2a, 0x0a, 0x0e, 0x64, 0x65, 0x66, 0x61, 0x75,
-	0x6c, 0x74, 0x5f, 0x73, 0x74, 0x72, 0x69, 0x6e, 0x67, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x48,
-	0x00, 0x52, 0x0d, 0x64, 0x65, 0x66, 0x61, 0x75, 0x6c, 0x74, 0x53, 0x74, 0x72, 0x69, 0x6e, 0x67,
+	0x72, 0x2e, 0x53, 0x74, 0x72, 0x69, 0x6e, 0x67, 0x4d, 0x61, 0x70, 0x57, 0x69, 0x74, 0x68, 0x44,
+	0x65, 0x66, 0x61, 0x75, 0x6c, 0x74, 0x52, 0x0a, 0x70, 0x6f, 0x69, 0x6e, 0x74, 0x53, 0x68, 0x61,
+	0x70, 0x65, 0x12, 0x79, 0x0a, 0x0c, 0x64, 0x61, 0x74, 0x61, 0x5f, 0x73, 0x6f, 0x75, 0x72, 0x63,
+	0x65, 0x73, 0x18, 0x0e, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x56, 0x2e, 0x69, 0x6f, 0x2e, 0x64, 0x65,
+	0x65, 0x70, 0x68, 0x61, 0x76, 0x65, 0x6e, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x62, 0x61,
+	0x63, 0x6b, 0x70, 0x6c, 0x61, 0x6e, 0x65, 0x2e, 0x73, 0x63, 0x72, 0x69, 0x70, 0x74, 0x2e, 0x67,
+	0x72, 0x70, 0x63, 0x2e, 0x46, 0x69, 0x67, 0x75, 0x72, 0x65, 0x44, 0x65, 0x73, 0x63, 0x72, 0x69,
+	0x70, 0x74, 0x6f, 0x72, 0x2e, 0x4d, 0x75, 0x6c, 0x74, 0x69, 0x53, 0x65, 0x72, 0x69, 0x65, 0x73,
+	0x53, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x44, 0x65, 0x73, 0x63, 0x72, 0x69, 0x70, 0x74, 0x6f, 0x72,
+	0x52, 0x0b, 0x64, 0x61, 0x74, 0x61, 0x53, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x73, 0x1a, 0x81, 0x01,
+	0x0a, 0x14, 0x53, 0x74, 0x72, 0x69, 0x6e, 0x67, 0x4d, 0x61, 0x70, 0x57, 0x69, 0x74, 0x68, 0x44,
+	0x65, 0x66, 0x61, 0x75, 0x6c, 0x74, 0x12, 0x2a, 0x0a, 0x0e, 0x64, 0x65, 0x66, 0x61, 0x75, 0x6c,
+	0x74, 0x5f, 0x73, 0x74, 0x72, 0x69, 0x6e, 0x67, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x48, 0x00,
+	0x52, 0x0d, 0x64, 0x65, 0x66, 0x61, 0x75, 0x6c, 0x74, 0x53, 0x74, 0x72, 0x69, 0x6e, 0x67, 0x88,
+	0x01, 0x01, 0x12, 0x12, 0x0a, 0x04, 0x6b, 0x65, 0x79, 0x73, 0x18, 0x02, 0x20, 0x03, 0x28, 0x09,
+	0x52, 0x04, 0x6b, 0x65, 0x79, 0x73, 0x12, 0x16, 0x0a, 0x06, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x73,
+	0x18, 0x03, 0x20, 0x03, 0x28, 0x09, 0x52, 0x06, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x73, 0x42, 0x11,
+	0x0a, 0x0f, 0x5f, 0x64, 0x65, 0x66, 0x61, 0x75, 0x6c, 0x74, 0x5f, 0x73, 0x74, 0x72, 0x69, 0x6e,
+	0x67, 0x1a, 0x81, 0x01, 0x0a, 0x14, 0x44, 0x6f, 0x75, 0x62, 0x6c, 0x65, 0x4d, 0x61, 0x70, 0x57,
+	0x69, 0x74, 0x68, 0x44, 0x65, 0x66, 0x61, 0x75, 0x6c, 0x74, 0x12, 0x2a, 0x0a, 0x0e, 0x64, 0x65,
+	0x66, 0x61, 0x75, 0x6c, 0x74, 0x5f, 0x64, 0x6f, 0x75, 0x62, 0x6c, 0x65, 0x18, 0x01, 0x20, 0x01,
+	0x28, 0x01, 0x48, 0x00, 0x52, 0x0d, 0x64, 0x65, 0x66, 0x61, 0x75, 0x6c, 0x74, 0x44, 0x6f, 0x75,
+	0x62, 0x6c, 0x65, 0x88, 0x01, 0x01, 0x12, 0x12, 0x0a, 0x04, 0x6b, 0x65, 0x79, 0x73, 0x18, 0x02,
+	0x20, 0x03, 0x28, 0x09, 0x52, 0x04, 0x6b, 0x65, 0x79, 0x73, 0x12, 0x16, 0x0a, 0x06, 0x76, 0x61,
+	0x6c, 0x75, 0x65, 0x73, 0x18, 0x03, 0x20, 0x03, 0x28, 0x01, 0x52, 0x06, 0x76, 0x61, 0x6c, 0x75,
+	0x65, 0x73, 0x42, 0x11, 0x0a, 0x0f, 0x5f, 0x64, 0x65, 0x66, 0x61, 0x75, 0x6c, 0x74, 0x5f, 0x64,
+	0x6f, 0x75, 0x62, 0x6c, 0x65, 0x1a, 0x79, 0x0a, 0x12, 0x42, 0x6f, 0x6f, 0x6c, 0x4d, 0x61, 0x70,
+	0x57, 0x69, 0x74, 0x68, 0x44, 0x65, 0x66, 0x61, 0x75, 0x6c, 0x74, 0x12, 0x26, 0x0a, 0x0c, 0x64,
+	0x65, 0x66, 0x61, 0x75, 0x6c, 0x74, 0x5f, 0x62, 0x6f, 0x6f, 0x6c, 0x18, 0x01, 0x20, 0x01, 0x28,
+	0x08, 0x48, 0x00, 0x52, 0x0b, 0x64, 0x65, 0x66, 0x61, 0x75, 0x6c, 0x74, 0x42, 0x6f, 0x6f, 0x6c,
 	0x88, 0x01, 0x01, 0x12, 0x12, 0x0a, 0x04, 0x6b, 0x65, 0x79, 0x73, 0x18, 0x02, 0x20, 0x03, 0x28,
 	0x09, 0x52, 0x04, 0x6b, 0x65, 0x79, 0x73, 0x12, 0x16, 0x0a, 0x06, 0x76, 0x61, 0x6c, 0x75, 0x65,
-	0x73, 0x18, 0x03, 0x20, 0x03, 0x28, 0x09, 0x52, 0x06, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x73, 0x42,
-	0x11, 0x0a, 0x0f, 0x5f, 0x64, 0x65, 0x66, 0x61, 0x75, 0x6c, 0x74, 0x5f, 0x73, 0x74, 0x72, 0x69,
-	0x6e, 0x67, 0x1a, 0x81, 0x01, 0x0a, 0x14, 0x44, 0x6f, 0x75, 0x62, 0x6c, 0x65, 0x4d, 0x61, 0x70,
-	0x57, 0x69, 0x74, 0x68, 0x44, 0x65, 0x66, 0x61, 0x75, 0x6c, 0x74, 0x12, 0x2a, 0x0a, 0x0e, 0x64,
-	0x65, 0x66, 0x61, 0x75, 0x6c, 0x74, 0x5f, 0x64, 0x6f, 0x75, 0x62, 0x6c, 0x65, 0x18, 0x01, 0x20,
-	0x01, 0x28, 0x01, 0x48, 0x00, 0x52, 0x0d, 0x64, 0x65, 0x66, 0x61, 0x75, 0x6c, 0x74, 0x44, 0x6f,
-	0x75, 0x62, 0x6c, 0x65, 0x88, 0x01, 0x01, 0x12, 0x12, 0x0a, 0x04, 0x6b, 0x65, 0x79, 0x73, 0x18,
-	0x02, 0x20, 0x03, 0x28, 0x09, 0x52, 0x04, 0x6b, 0x65, 0x79, 0x73, 0x12, 0x16, 0x0a, 0x06, 0x76,
-	0x61, 0x6c, 0x75, 0x65, 0x73, 0x18, 0x03, 0x20, 0x03, 0x28, 0x01, 0x52, 0x06, 0x76, 0x61, 0x6c,
-	0x75, 0x65, 0x73, 0x42, 0x11, 0x0a, 0x0f, 0x5f, 0x64, 0x65, 0x66, 0x61, 0x75, 0x6c, 0x74, 0x5f,
-	0x64, 0x6f, 0x75, 0x62, 0x6c, 0x65, 0x1a, 0x79, 0x0a, 0x12, 0x42, 0x6f, 0x6f, 0x6c, 0x4d, 0x61,
-	0x70, 0x57, 0x69, 0x74, 0x68, 0x44, 0x65, 0x66, 0x61, 0x75, 0x6c, 0x74, 0x12, 0x26, 0x0a, 0x0c,
-	0x64, 0x65, 0x66, 0x61, 0x75, 0x6c, 0x74, 0x5f, 0x62, 0x6f, 0x6f, 0x6c, 0x18, 0x01, 0x20, 0x01,
-	0x28, 0x08, 0x48, 0x00, 0x52, 0x0b, 0x64, 0x65, 0x66, 0x61, 0x75, 0x6c, 0x74, 0x42, 0x6f, 0x6f,
-	0x6c, 0x88, 0x01, 0x01, 0x12, 0x12, 0x0a, 0x04, 0x6b, 0x65, 0x79, 0x73, 0x18, 0x02, 0x20, 0x03,
-	0x28, 0x09, 0x52, 0x04, 0x6b, 0x65, 0x79, 0x73, 0x12, 0x16, 0x0a, 0x06, 0x76, 0x61, 0x6c, 0x75,
-	0x65, 0x73, 0x18, 0x03, 0x20, 0x03, 0x28, 0x08, 0x52, 0x06, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x73,
-	0x42, 0x0f, 0x0a, 0x0d, 0x5f, 0x64, 0x65, 0x66, 0x61, 0x75, 0x6c, 0x74, 0x5f, 0x62, 0x6f, 0x6f,
-	0x6c, 0x1a, 0xb3, 0x0a, 0x0a, 0x0e, 0x41, 0x78, 0x69, 0x73, 0x44, 0x65, 0x73, 0x63, 0x72, 0x69,
-	0x70, 0x74, 0x6f, 0x72, 0x12, 0x0e, 0x0a, 0x02, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09,
-	0x52, 0x02, 0x69, 0x64, 0x12, 0x79, 0x0a, 0x0b, 0x66, 0x6f, 0x72, 0x6d, 0x61, 0x74, 0x5f, 0x74,
-	0x79, 0x70, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0e, 0x32, 0x58, 0x2e, 0x69, 0x6f, 0x2e, 0x64,
-	0x65, 0x65, 0x70, 0x68, 0x61, 0x76, 0x65, 0x6e, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x62,
-	0x61, 0x63, 0x6b, 0x70, 0x6c, 0x61, 0x6e, 0x65, 0x2e, 0x73, 0x63, 0x72, 0x69, 0x70, 0x74, 0x2e,
-	0x67, 0x72, 0x70, 0x63, 0x2e, 0x46, 0x69, 0x67, 0x75, 0x72, 0x65, 0x44, 0x65, 0x73, 0x63, 0x72,
-	0x69, 0x70, 0x74, 0x6f, 0x72, 0x2e, 0x41, 0x78, 0x69, 0x73, 0x44, 0x65, 0x73, 0x63, 0x72, 0x69,
-	0x70, 0x74, 0x6f, 0x72, 0x2e, 0x41, 0x78, 0x69, 0x73, 0x46, 0x6f, 0x72, 0x6d, 0x61, 0x74, 0x54,
-	0x79, 0x70, 0x65, 0x52, 0x0a, 0x66, 0x6f, 0x72, 0x6d, 0x61, 0x74, 0x54, 0x79, 0x70, 0x65, 0x12,
-	0x66, 0x0a, 0x04, 0x74, 0x79, 0x70, 0x65, 0x18, 0x03, 0x20, 0x01, 0x28, 0x0e, 0x32, 0x52, 0x2e,
-	0x69, 0x6f, 0x2e, 0x64, 0x65, 0x65, 0x70, 0x68, 0x61, 0x76, 0x65, 0x6e, 0x2e, 0x70, 0x72, 0x6f,
-	0x74, 0x6f, 0x2e, 0x62, 0x61, 0x63, 0x6b, 0x70, 0x6c, 0x61, 0x6e, 0x65, 0x2e, 0x73, 0x63, 0x72,
-	0x69, 0x70, 0x74, 0x2e, 0x67, 0x72, 0x70, 0x63, 0x2e, 0x46, 0x69, 0x67, 0x75, 0x72, 0x65, 0x44,
-	0x65, 0x73, 0x63, 0x72, 0x69, 0x70, 0x74, 0x6f, 0x72, 0x2e, 0x41, 0x78, 0x69, 0x73, 0x44, 0x65,
-	0x73, 0x63, 0x72, 0x69, 0x70, 0x74, 0x6f, 0x72, 0x2e, 0x41, 0x78, 0x69, 0x73, 0x54, 0x79, 0x70,
-	0x65, 0x52, 0x04, 0x74, 0x79, 0x70, 0x65, 0x12, 0x72, 0x0a, 0x08, 0x70, 0x6f, 0x73, 0x69, 0x74,
-	0x69, 0x6f, 0x6e, 0x18, 0x04, 0x20, 0x01, 0x28, 0x0e, 0x32, 0x56, 0x2e, 0x69, 0x6f, 0x2e, 0x64,
-	0x65, 0x65, 0x70, 0x68, 0x61, 0x76, 0x65, 0x6e, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x62,
-	0x61, 0x63, 0x6b, 0x70, 0x6c, 0x61, 0x6e, 0x65, 0x2e, 0x73, 0x63, 0x72, 0x69, 0x70, 0x74, 0x2e,
-	0x67, 0x72, 0x70, 0x63, 0x2e, 0x46, 0x69, 0x67, 0x75, 0x72, 0x65, 0x44, 0x65, 0x73, 0x63, 0x72,
-	0x69, 0x70, 0x74, 0x6f, 0x72, 0x2e, 0x41, 0x78, 0x69, 0x73, 0x44, 0x65, 0x73, 0x63, 0x72, 0x69,
-	0x70, 0x74, 0x6f, 0x72, 0x2e, 0x41, 0x78, 0x69, 0x73, 0x50, 0x6f, 0x73, 0x69, 0x74, 0x69, 0x6f,
-	0x6e, 0x52, 0x08, 0x70, 0x6f, 0x73, 0x69, 0x74, 0x69, 0x6f, 0x6e, 0x12, 0x10, 0x0a, 0x03, 0x6c,
-	0x6f, 0x67, 0x18, 0x05, 0x20, 0x01, 0x28, 0x08, 0x52, 0x03, 0x6c, 0x6f, 0x67, 0x12, 0x14, 0x0a,
-	0x05, 0x6c, 0x61, 0x62, 0x65, 0x6c, 0x18, 0x06, 0x20, 0x01, 0x28, 0x09, 0x52, 0x05, 0x6c, 0x61,
-	0x62, 0x65, 0x6c, 0x12, 0x1d, 0x0a, 0x0a, 0x6c, 0x61, 0x62, 0x65, 0x6c, 0x5f, 0x66, 0x6f, 0x6e,
-	0x74, 0x18, 0x07, 0x20, 0x01, 0x28, 0x09, 0x52, 0x09, 0x6c, 0x61, 0x62, 0x65, 0x6c, 0x46, 0x6f,
-	0x6e, 0x74, 0x12, 0x1d, 0x0a, 0x0a, 0x74, 0x69, 0x63, 0x6b, 0x73, 0x5f, 0x66, 0x6f, 0x6e, 0x74,
-	0x18, 0x08, 0x20, 0x01, 0x28, 0x09, 0x52, 0x09, 0x74, 0x69, 0x63, 0x6b, 0x73, 0x46, 0x6f, 0x6e,
-	0x74, 0x12, 0x2a, 0x0a, 0x0e, 0x66, 0x6f, 0x72, 0x6d, 0x61, 0x74, 0x5f, 0x70, 0x61, 0x74, 0x74,
-	0x65, 0x72, 0x6e, 0x18, 0x09, 0x20, 0x01, 0x28, 0x09, 0x48, 0x00, 0x52, 0x0d, 0x66, 0x6f, 0x72,
-	0x6d, 0x61, 0x74, 0x50, 0x61, 0x74, 0x74, 0x65, 0x72, 0x6e, 0x88, 0x01, 0x01, 0x12, 0x14, 0x0a,
-	0x05, 0x63, 0x6f, 0x6c, 0x6f, 0x72, 0x18, 0x0a, 0x20, 0x01, 0x28, 0x09, 0x52, 0x05, 0x63, 0x6f,
-	0x6c, 0x6f, 0x72, 0x12, 0x1b, 0x0a, 0x09, 0x6d, 0x69, 0x6e, 0x5f, 0x72, 0x61, 0x6e, 0x67, 0x65,
-	0x18, 0x0b, 0x20, 0x01, 0x28, 0x01, 0x52, 0x08, 0x6d, 0x69, 0x6e, 0x52, 0x61, 0x6e, 0x67, 0x65,
-	0x12, 0x1b, 0x0a, 0x09, 0x6d, 0x61, 0x78, 0x5f, 0x72, 0x61, 0x6e, 0x67, 0x65, 0x18, 0x0c, 0x20,
-	0x01, 0x28, 0x01, 0x52, 0x08, 0x6d, 0x61, 0x78, 0x52, 0x61, 0x6e, 0x67, 0x65, 0x12, 0x2e, 0x0a,
-	0x13, 0x6d, 0x69, 0x6e, 0x6f, 0x72, 0x5f, 0x74, 0x69, 0x63, 0x6b, 0x73, 0x5f, 0x76, 0x69, 0x73,
-	0x69, 0x62, 0x6c, 0x65, 0x18, 0x0d, 0x20, 0x01, 0x28, 0x08, 0x52, 0x11, 0x6d, 0x69, 0x6e, 0x6f,
-	0x72, 0x54, 0x69, 0x63, 0x6b, 0x73, 0x56, 0x69, 0x73, 0x69, 0x62, 0x6c, 0x65, 0x12, 0x2e, 0x0a,
-	0x13, 0x6d, 0x61, 0x6a, 0x6f, 0x72, 0x5f, 0x74, 0x69, 0x63, 0x6b, 0x73, 0x5f, 0x76, 0x69, 0x73,
-	0x69, 0x62, 0x6c, 0x65, 0x18, 0x0e, 0x20, 0x01, 0x28, 0x08, 0x52, 0x11, 0x6d, 0x61, 0x6a, 0x6f,
-	0x72, 0x54, 0x69, 0x63, 0x6b, 0x73, 0x56, 0x69, 0x73, 0x69, 0x62, 0x6c, 0x65, 0x12, 0x28, 0x0a,
-	0x10, 0x6d, 0x69, 0x6e, 0x6f, 0x72, 0x5f, 0x74, 0x69, 0x63, 0x6b, 0x5f, 0x63, 0x6f, 0x75, 0x6e,
-	0x74, 0x18, 0x0f, 0x20, 0x01, 0x28, 0x05, 0x52, 0x0e, 0x6d, 0x69, 0x6e, 0x6f, 0x72, 0x54, 0x69,
-	0x63, 0x6b, 0x43, 0x6f, 0x75, 0x6e, 0x74, 0x12, 0x3a, 0x0a, 0x17, 0x67, 0x61, 0x70, 0x5f, 0x62,
-	0x65, 0x74, 0x77, 0x65, 0x65, 0x6e, 0x5f, 0x6d, 0x61, 0x6a, 0x6f, 0x72, 0x5f, 0x74, 0x69, 0x63,
-	0x6b, 0x73, 0x18, 0x10, 0x20, 0x01, 0x28, 0x01, 0x48, 0x01, 0x52, 0x14, 0x67, 0x61, 0x70, 0x42,
-	0x65, 0x74, 0x77, 0x65, 0x65, 0x6e, 0x4d, 0x61, 0x6a, 0x6f, 0x72, 0x54, 0x69, 0x63, 0x6b, 0x73,
-	0x88, 0x01, 0x01, 0x12, 0x30, 0x0a, 0x14, 0x6d, 0x61, 0x6a, 0x6f, 0x72, 0x5f, 0x74, 0x69, 0x63,
-	0x6b, 0x5f, 0x6c, 0x6f, 0x63, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x18, 0x11, 0x20, 0x03, 0x28,
-	0x01, 0x52, 0x12, 0x6d, 0x61, 0x6a, 0x6f, 0x72, 0x54, 0x69, 0x63, 0x6b, 0x4c, 0x6f, 0x63, 0x61,
-	0x74, 0x69, 0x6f, 0x6e, 0x73, 0x12, 0x28, 0x0a, 0x10, 0x74, 0x69, 0x63, 0x6b, 0x5f, 0x6c, 0x61,
-	0x62, 0x65, 0x6c, 0x5f, 0x61, 0x6e, 0x67, 0x6c, 0x65, 0x18, 0x12, 0x20, 0x01, 0x28, 0x01, 0x52,
-	0x0e, 0x74, 0x69, 0x63, 0x6b, 0x4c, 0x61, 0x62, 0x65, 0x6c, 0x41, 0x6e, 0x67, 0x6c, 0x65, 0x12,
-	0x16, 0x0a, 0x06, 0x69, 0x6e, 0x76, 0x65, 0x72, 0x74, 0x18, 0x13, 0x20, 0x01, 0x28, 0x08, 0x52,
-	0x06, 0x69, 0x6e, 0x76, 0x65, 0x72, 0x74, 0x12, 0x20, 0x0a, 0x0c, 0x69, 0x73, 0x5f, 0x74, 0x69,
-	0x6d, 0x65, 0x5f, 0x61, 0x78, 0x69, 0x73, 0x18, 0x14, 0x20, 0x01, 0x28, 0x08, 0x52, 0x0a, 0x69,
-	0x73, 0x54, 0x69, 0x6d, 0x65, 0x41, 0x78, 0x69, 0x73, 0x12, 0x97, 0x01, 0x0a, 0x1c, 0x62, 0x75,
-	0x73, 0x69, 0x6e, 0x65, 0x73, 0x73, 0x5f, 0x63, 0x61, 0x6c, 0x65, 0x6e, 0x64, 0x61, 0x72, 0x5f,
-	0x64, 0x65, 0x73, 0x63, 0x72, 0x69, 0x70, 0x74, 0x6f, 0x72, 0x18, 0x15, 0x20, 0x01, 0x28, 0x0b,
-	0x32, 0x55, 0x2e, 0x69, 0x6f, 0x2e, 0x64, 0x65, 0x65, 0x70, 0x68, 0x61, 0x76, 0x65, 0x6e, 0x2e,
-	0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x62, 0x61, 0x63, 0x6b, 0x70, 0x6c, 0x61, 0x6e, 0x65, 0x2e,
-	0x73, 0x63, 0x72, 0x69, 0x70, 0x74, 0x2e, 0x67, 0x72, 0x70, 0x63, 0x2e, 0x46, 0x69, 0x67, 0x75,
-	0x72, 0x65, 0x44, 0x65, 0x73, 0x63, 0x72, 0x69, 0x70, 0x74, 0x6f, 0x72, 0x2e, 0x42, 0x75, 0x73,
-	0x69, 0x6e, 0x65, 0x73, 0x73, 0x43, 0x61, 0x6c, 0x65, 0x6e, 0x64, 0x61, 0x72, 0x44, 0x65, 0x73,
-	0x63, 0x72, 0x69, 0x70, 0x74, 0x6f, 0x72, 0x52, 0x1a, 0x62, 0x75, 0x73, 0x69, 0x6e, 0x65, 0x73,
-	0x73, 0x43, 0x61, 0x6c, 0x65, 0x6e, 0x64, 0x61, 0x72, 0x44, 0x65, 0x73, 0x63, 0x72, 0x69, 0x70,
-	0x74, 0x6f, 0x72, 0x22, 0x2a, 0x0a, 0x0e, 0x41, 0x78, 0x69, 0x73, 0x46, 0x6f, 0x72, 0x6d, 0x61,
-	0x74, 0x54, 0x79, 0x70, 0x65, 0x12, 0x0c, 0x0a, 0x08, 0x43, 0x41, 0x54, 0x45, 0x47, 0x4f, 0x52,
-	0x59, 0x10, 0x00, 0x12, 0x0a, 0x0a, 0x06, 0x4e, 0x55, 0x4d, 0x42, 0x45, 0x52, 0x10, 0x01, 0x22,
-	0x43, 0x0a, 0x08, 0x41, 0x78, 0x69, 0x73, 0x54, 0x79, 0x70, 0x65, 0x12, 0x05, 0x0a, 0x01, 0x58,
-	0x10, 0x00, 0x12, 0x05, 0x0a, 0x01, 0x59, 0x10, 0x01, 0x12, 0x09, 0x0a, 0x05, 0x53, 0x48, 0x41,
-	0x50, 0x45, 0x10, 0x02, 0x12, 0x08, 0x0a, 0x04, 0x53, 0x49, 0x5a, 0x45, 0x10, 0x03, 0x12, 0x09,
-	0x0a, 0x05, 0x4c, 0x41, 0x42, 0x45, 0x4c, 0x10, 0x04, 0x12, 0x09, 0x0a, 0x05, 0x43, 0x4f, 0x4c,
-	0x4f, 0x52, 0x10, 0x05, 0x22, 0x42, 0x0a, 0x0c, 0x41, 0x78, 0x69, 0x73, 0x50, 0x6f, 0x73, 0x69,
-	0x74, 0x69, 0x6f, 0x6e, 0x12, 0x07, 0x0a, 0x03, 0x54, 0x4f, 0x50, 0x10, 0x00, 0x12, 0x0a, 0x0a,
-	0x06, 0x42, 0x4f, 0x54, 0x54, 0x4f, 0x4d, 0x10, 0x01, 0x12, 0x08, 0x0a, 0x04, 0x4c, 0x45, 0x46,
-	0x54, 0x10, 0x02, 0x12, 0x09, 0x0a, 0x05, 0x52, 0x49, 0x47, 0x48, 0x54, 0x10, 0x03, 0x12, 0x08,
-	0x0a, 0x04, 0x4e, 0x4f, 0x4e, 0x45, 0x10, 0x04, 0x42, 0x11, 0x0a, 0x0f, 0x5f, 0x66, 0x6f, 0x72,
-	0x6d, 0x61, 0x74, 0x5f, 0x70, 0x61, 0x74, 0x74, 0x65, 0x72, 0x6e, 0x42, 0x1a, 0x0a, 0x18, 0x5f,
-	0x67, 0x61, 0x70, 0x5f, 0x62, 0x65, 0x74, 0x77, 0x65, 0x65, 0x6e, 0x5f, 0x6d, 0x61, 0x6a, 0x6f,
-	0x72, 0x5f, 0x74, 0x69, 0x63, 0x6b, 0x73, 0x1a, 0xe2, 0x07, 0x0a, 0x1a, 0x42, 0x75, 0x73, 0x69,
-	0x6e, 0x65, 0x73, 0x73, 0x43, 0x61, 0x6c, 0x65, 0x6e, 0x64, 0x61, 0x72, 0x44, 0x65, 0x73, 0x63,
-	0x72, 0x69, 0x70, 0x74, 0x6f, 0x72, 0x12, 0x12, 0x0a, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x18, 0x01,
-	0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x12, 0x1b, 0x0a, 0x09, 0x74, 0x69,
-	0x6d, 0x65, 0x5f, 0x7a, 0x6f, 0x6e, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x08, 0x74,
-	0x69, 0x6d, 0x65, 0x5a, 0x6f, 0x6e, 0x65, 0x12, 0x84, 0x01, 0x0a, 0x0d, 0x62, 0x75, 0x73, 0x69,
-	0x6e, 0x65, 0x73, 0x73, 0x5f, 0x64, 0x61, 0x79, 0x73, 0x18, 0x03, 0x20, 0x03, 0x28, 0x0e, 0x32,
-	0x5f, 0x2e, 0x69, 0x6f, 0x2e, 0x64, 0x65, 0x65, 0x70, 0x68, 0x61, 0x76, 0x65, 0x6e, 0x2e, 0x70,
+	0x73, 0x18, 0x03, 0x20, 0x03, 0x28, 0x08, 0x52, 0x06, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x73, 0x42,
+	0x0f, 0x0a, 0x0d, 0x5f, 0x64, 0x65, 0x66, 0x61, 0x75, 0x6c, 0x74, 0x5f, 0x62, 0x6f, 0x6f, 0x6c,
+	0x1a, 0xb3, 0x0a, 0x0a, 0x0e, 0x41, 0x78, 0x69, 0x73, 0x44, 0x65, 0x73, 0x63, 0x72, 0x69, 0x70,
+	0x74, 0x6f, 0x72, 0x12, 0x0e, 0x0a, 0x02, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52,
+	0x02, 0x69, 0x64, 0x12, 0x79, 0x0a, 0x0b, 0x66, 0x6f, 0x72, 0x6d, 0x61, 0x74, 0x5f, 0x74, 0x79,
+	0x70, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0e, 0x32, 0x58, 0x2e, 0x69, 0x6f, 0x2e, 0x64, 0x65,
+	0x65, 0x70, 0x68, 0x61, 0x76, 0x65, 0x6e, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x62, 0x61,
+	0x63, 0x6b, 0x70, 0x6c, 0x61, 0x6e, 0x65, 0x2e, 0x73, 0x63, 0x72, 0x69, 0x70, 0x74, 0x2e, 0x67,
+	0x72, 0x70, 0x63, 0x2e, 0x46, 0x69, 0x67, 0x75, 0x72, 0x65, 0x44, 0x65, 0x73, 0x63, 0x72, 0x69,
+	0x70, 0x74, 0x6f, 0x72, 0x2e, 0x41, 0x78, 0x69, 0x73, 0x44, 0x65, 0x73, 0x63, 0x72, 0x69, 0x70,
+	0x74, 0x6f, 0x72, 0x2e, 0x41, 0x78, 0x69, 0x73, 0x46, 0x6f, 0x72, 0x6d, 0x61, 0x74, 0x54, 0x79,
+	0x70, 0x65, 0x52, 0x0a, 0x66, 0x6f, 0x72, 0x6d, 0x61, 0x74, 0x54, 0x79, 0x70, 0x65, 0x12, 0x66,
+	0x0a, 0x04, 0x74, 0x79, 0x70, 0x65, 0x18, 0x03, 0x20, 0x01, 0x28, 0x0e, 0x32, 0x52, 0x2e, 0x69,
+	0x6f, 0x2e, 0x64, 0x65, 0x65, 0x70, 0x68, 0x61, 0x76, 0x65, 0x6e, 0x2e, 0x70, 0x72, 0x6f, 0x74,
+	0x6f, 0x2e, 0x62, 0x61, 0x63, 0x6b, 0x70, 0x6c, 0x61, 0x6e, 0x65, 0x2e, 0x73, 0x63, 0x72, 0x69,
+	0x70, 0x74, 0x2e, 0x67, 0x72, 0x70, 0x63, 0x2e, 0x46, 0x69, 0x67, 0x75, 0x72, 0x65, 0x44, 0x65,
+	0x73, 0x63, 0x72, 0x69, 0x70, 0x74, 0x6f, 0x72, 0x2e, 0x41, 0x78, 0x69, 0x73, 0x44, 0x65, 0x73,
+	0x63, 0x72, 0x69, 0x70, 0x74, 0x6f, 0x72, 0x2e, 0x41, 0x78, 0x69, 0x73, 0x54, 0x79, 0x70, 0x65,
+	0x52, 0x04, 0x74, 0x79, 0x70, 0x65, 0x12, 0x72, 0x0a, 0x08, 0x70, 0x6f, 0x73, 0x69, 0x74, 0x69,
+	0x6f, 0x6e, 0x18, 0x04, 0x20, 0x01, 0x28, 0x0e, 0x32, 0x56, 0x2e, 0x69, 0x6f, 0x2e, 0x64, 0x65,
+	0x65, 0x70, 0x68, 0x61, 0x76, 0x65, 0x6e, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x62, 0x61,
+	0x63, 0x6b, 0x70, 0x6c, 0x61, 0x6e, 0x65, 0x2e, 0x73, 0x63, 0x72, 0x69, 0x70, 0x74, 0x2e, 0x67,
+	0x72, 0x70, 0x63, 0x2e, 0x46, 0x69, 0x67, 0x75, 0x72, 0x65, 0x44, 0x65, 0x73, 0x63, 0x72, 0x69,
+	0x70, 0x74, 0x6f, 0x72, 0x2e, 0x41, 0x78, 0x69, 0x73, 0x44, 0x65, 0x73, 0x63, 0x72, 0x69, 0x70,
+	0x74, 0x6f, 0x72, 0x2e, 0x41, 0x78, 0x69, 0x73, 0x50, 0x6f, 0x73, 0x69, 0x74, 0x69, 0x6f, 0x6e,
+	0x52, 0x08, 0x70, 0x6f, 0x73, 0x69, 0x74, 0x69, 0x6f, 0x6e, 0x12, 0x10, 0x0a, 0x03, 0x6c, 0x6f,
+	0x67, 0x18, 0x05, 0x20, 0x01, 0x28, 0x08, 0x52, 0x03, 0x6c, 0x6f, 0x67, 0x12, 0x14, 0x0a, 0x05,
+	0x6c, 0x61, 0x62, 0x65, 0x6c, 0x18, 0x06, 0x20, 0x01, 0x28, 0x09, 0x52, 0x05, 0x6c, 0x61, 0x62,
+	0x65, 0x6c, 0x12, 0x1d, 0x0a, 0x0a, 0x6c, 0x61, 0x62, 0x65, 0x6c, 0x5f, 0x66, 0x6f, 0x6e, 0x74,
+	0x18, 0x07, 0x20, 0x01, 0x28, 0x09, 0x52, 0x09, 0x6c, 0x61, 0x62, 0x65, 0x6c, 0x46, 0x6f, 0x6e,
+	0x74, 0x12, 0x1d, 0x0a, 0x0a, 0x74, 0x69, 0x63, 0x6b, 0x73, 0x5f, 0x66, 0x6f, 0x6e, 0x74, 0x18,
+	0x08, 0x20, 0x01, 0x28, 0x09, 0x52, 0x09, 0x74, 0x69, 0x63, 0x6b, 0x73, 0x46, 0x6f, 0x6e, 0x74,
+	0x12, 0x2a, 0x0a, 0x0e, 0x66, 0x6f, 0x72, 0x6d, 0x61, 0x74, 0x5f, 0x70, 0x61, 0x74, 0x74, 0x65,
+	0x72, 0x6e, 0x18, 0x09, 0x20, 0x01, 0x28, 0x09, 0x48, 0x00, 0x52, 0x0d, 0x66, 0x6f, 0x72, 0x6d,
+	0x61, 0x74, 0x50, 0x61, 0x74, 0x74, 0x65, 0x72, 0x6e, 0x88, 0x01, 0x01, 0x12, 0x14, 0x0a, 0x05,
+	0x63, 0x6f, 0x6c, 0x6f, 0x72, 0x18, 0x0a, 0x20, 0x01, 0x28, 0x09, 0x52, 0x05, 0x63, 0x6f, 0x6c,
+	0x6f, 0x72, 0x12, 0x1b, 0x0a, 0x09, 0x6d, 0x69, 0x6e, 0x5f, 0x72, 0x61, 0x6e, 0x67, 0x65, 0x18,
+	0x0b, 0x20, 0x01, 0x28, 0x01, 0x52, 0x08, 0x6d, 0x69, 0x6e, 0x52, 0x61, 0x6e, 0x67, 0x65, 0x12,
+	0x1b, 0x0a, 0x09, 0x6d, 0x61, 0x78, 0x5f, 0x72, 0x61, 0x6e, 0x67, 0x65, 0x18, 0x0c, 0x20, 0x01,
+	0x28, 0x01, 0x52, 0x08, 0x6d, 0x61, 0x78, 0x52, 0x61, 0x6e, 0x67, 0x65, 0x12, 0x2e, 0x0a, 0x13,
+	0x6d, 0x69, 0x6e, 0x6f, 0x72, 0x5f, 0x74, 0x69, 0x63, 0x6b, 0x73, 0x5f, 0x76, 0x69, 0x73, 0x69,
+	0x62, 0x6c, 0x65, 0x18, 0x0d, 0x20, 0x01, 0x28, 0x08, 0x52, 0x11, 0x6d, 0x69, 0x6e, 0x6f, 0x72,
+	0x54, 0x69, 0x63, 0x6b, 0x73, 0x56, 0x69, 0x73, 0x69, 0x62, 0x6c, 0x65, 0x12, 0x2e, 0x0a, 0x13,
+	0x6d, 0x61, 0x6a, 0x6f, 0x72, 0x5f, 0x74, 0x69, 0x63, 0x6b, 0x73, 0x5f, 0x76, 0x69, 0x73, 0x69,
+	0x62, 0x6c, 0x65, 0x18, 0x0e, 0x20, 0x01, 0x28, 0x08, 0x52, 0x11, 0x6d, 0x61, 0x6a, 0x6f, 0x72,
+	0x54, 0x69, 0x63, 0x6b, 0x73, 0x56, 0x69, 0x73, 0x69, 0x62, 0x6c, 0x65, 0x12, 0x28, 0x0a, 0x10,
+	0x6d, 0x69, 0x6e, 0x6f, 0x72, 0x5f, 0x74, 0x69, 0x63, 0x6b, 0x5f, 0x63, 0x6f, 0x75, 0x6e, 0x74,
+	0x18, 0x0f, 0x20, 0x01, 0x28, 0x05, 0x52, 0x0e, 0x6d, 0x69, 0x6e, 0x6f, 0x72, 0x54, 0x69, 0x63,
+	0x6b, 0x43, 0x6f, 0x75, 0x6e, 0x74, 0x12, 0x3a, 0x0a, 0x17, 0x67, 0x61, 0x70, 0x5f, 0x62, 0x65,
+	0x74, 0x77, 0x65, 0x65, 0x6e, 0x5f, 0x6d, 0x61, 0x6a, 0x6f, 0x72, 0x5f, 0x74, 0x69, 0x63, 0x6b,
+	0x73, 0x18, 0x10, 0x20, 0x01, 0x28, 0x01, 0x48, 0x01, 0x52, 0x14, 0x67, 0x61, 0x70, 0x42, 0x65,
+	0x74, 0x77, 0x65, 0x65, 0x6e, 0x4d, 0x61, 0x6a, 0x6f, 0x72, 0x54, 0x69, 0x63, 0x6b, 0x73, 0x88,
+	0x01, 0x01, 0x12, 0x30, 0x0a, 0x14, 0x6d, 0x61, 0x6a, 0x6f, 0x72, 0x5f, 0x74, 0x69, 0x63, 0x6b,
+	0x5f, 0x6c, 0x6f, 0x63, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x18, 0x11, 0x20, 0x03, 0x28, 0x01,
+	0x52, 0x12, 0x6d, 0x61, 0x6a, 0x6f, 0x72, 0x54, 0x69, 0x63, 0x6b, 0x4c, 0x6f, 0x63, 0x61, 0x74,
+	0x69, 0x6f, 0x6e, 0x73, 0x12, 0x28, 0x0a, 0x10, 0x74, 0x69, 0x63, 0x6b, 0x5f, 0x6c, 0x61, 0x62,
+	0x65, 0x6c, 0x5f, 0x61, 0x6e, 0x67, 0x6c, 0x65, 0x18, 0x12, 0x20, 0x01, 0x28, 0x01, 0x52, 0x0e,
+	0x74, 0x69, 0x63, 0x6b, 0x4c, 0x61, 0x62, 0x65, 0x6c, 0x41, 0x6e, 0x67, 0x6c, 0x65, 0x12, 0x16,
+	0x0a, 0x06, 0x69, 0x6e, 0x76, 0x65, 0x72, 0x74, 0x18, 0x13, 0x20, 0x01, 0x28, 0x08, 0x52, 0x06,
+	0x69, 0x6e, 0x76, 0x65, 0x72, 0x74, 0x12, 0x20, 0x0a, 0x0c, 0x69, 0x73, 0x5f, 0x74, 0x69, 0x6d,
+	0x65, 0x5f, 0x61, 0x78, 0x69, 0x73, 0x18, 0x14, 0x20, 0x01, 0x28, 0x08, 0x52, 0x0a, 0x69, 0x73,
+	0x54, 0x69, 0x6d, 0x65, 0x41, 0x78, 0x69, 0x73, 0x12, 0x97, 0x01, 0x0a, 0x1c, 0x62, 0x75, 0x73,
+	0x69, 0x6e, 0x65, 0x73, 0x73, 0x5f, 0x63, 0x61, 0x6c, 0x65, 0x6e, 0x64, 0x61, 0x72, 0x5f, 0x64,
+	0x65, 0x73, 0x63, 0x72, 0x69, 0x70, 0x74, 0x6f, 0x72, 0x18, 0x15, 0x20, 0x01, 0x28, 0x0b, 0x32,
+	0x55, 0x2e, 0x69, 0x6f, 0x2e, 0x64, 0x65, 0x65, 0x70, 0x68, 0x61, 0x76, 0x65, 0x6e, 0x2e, 0x70,
 	0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x62, 0x61, 0x63, 0x6b, 0x70, 0x6c, 0x61, 0x6e, 0x65, 0x2e, 0x73,
 	0x63, 0x72, 0x69, 0x70, 0x74, 0x2e, 0x67, 0x72, 0x70, 0x63, 0x2e, 0x46, 0x69, 0x67, 0x75, 0x72,
 	0x65, 0x44, 0x65, 0x73, 0x63, 0x72, 0x69, 0x70, 0x74, 0x6f, 0x72, 0x2e, 0x42, 0x75, 0x73, 0x69,
 	0x6e, 0x65, 0x73, 0x73, 0x43, 0x61, 0x6c, 0x65, 0x6e, 0x64, 0x61, 0x72, 0x44, 0x65, 0x73, 0x63,
-	0x72, 0x69, 0x70, 0x74, 0x6f, 0x72, 0x2e, 0x44, 0x61, 0x79, 0x4f, 0x66, 0x57, 0x65, 0x65, 0x6b,
-	0x52, 0x0c, 0x62, 0x75, 0x73, 0x69, 0x6e, 0x65, 0x73, 0x73, 0x44, 0x61, 0x79, 0x73, 0x12, 0x8f,
-	0x01, 0x0a, 0x10, 0x62, 0x75, 0x73, 0x69, 0x6e, 0x65, 0x73, 0x73, 0x5f, 0x70, 0x65, 0x72, 0x69,
-	0x6f, 0x64, 0x73, 0x18, 0x04, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x64, 0x2e, 0x69, 0x6f, 0x2e, 0x64,
-	0x65, 0x65, 0x70, 0x68, 0x61, 0x76, 0x65, 0x6e, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x62,
-	0x61, 0x63, 0x6b, 0x70, 0x6c, 0x61, 0x6e, 0x65, 0x2e, 0x73, 0x63, 0x72, 0x69, 0x70, 0x74, 0x2e,
-	0x67, 0x72, 0x70, 0x63, 0x2e, 0x46, 0x69, 0x67, 0x75, 0x72, 0x65, 0x44, 0x65, 0x73, 0x63, 0x72,
-	0x69, 0x70, 0x74, 0x6f, 0x72, 0x2e, 0x42, 0x75, 0x73, 0x69, 0x6e, 0x65, 0x73, 0x73, 0x43, 0x61,
-	0x6c, 0x65, 0x6e, 0x64, 0x61, 0x72, 0x44, 0x65, 0x73, 0x63, 0x72, 0x69, 0x70, 0x74, 0x6f, 0x72,
-	0x2e, 0x42, 0x75, 0x73, 0x69, 0x6e, 0x65, 0x73, 0x73, 0x50, 0x65, 0x72, 0x69, 0x6f, 0x64, 0x52,
-	0x0f, 0x62, 0x75, 0x73, 0x69, 0x6e, 0x65, 0x73, 0x73, 0x50, 0x65, 0x72, 0x69, 0x6f, 0x64, 0x73,
-	0x12, 0x79, 0x0a, 0x08, 0x68, 0x6f, 0x6c, 0x69, 0x64, 0x61, 0x79, 0x73, 0x18, 0x05, 0x20, 0x03,
-	0x28, 0x0b, 0x32, 0x5d, 0x2e, 0x69, 0x6f, 0x2e, 0x64, 0x65, 0x65, 0x70, 0x68, 0x61, 0x76, 0x65,
-	0x6e, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x62, 0x61, 0x63, 0x6b, 0x70, 0x6c, 0x61, 0x6e,
-	0x65, 0x2e, 0x73, 0x63, 0x72, 0x69, 0x70, 0x74, 0x2e, 0x67, 0x72, 0x70, 0x63, 0x2e, 0x46, 0x69,
-	0x67, 0x75, 0x72, 0x65, 0x44, 0x65, 0x73, 0x63, 0x72, 0x69, 0x70, 0x74, 0x6f, 0x72, 0x2e, 0x42,
-	0x75, 0x73, 0x69, 0x6e, 0x65, 0x73, 0x73, 0x43, 0x61, 0x6c, 0x65, 0x6e, 0x64, 0x61, 0x72, 0x44,
-	0x65, 0x73, 0x63, 0x72, 0x69, 0x70, 0x74, 0x6f, 0x72, 0x2e, 0x48, 0x6f, 0x6c, 0x69, 0x64, 0x61,
-	0x79, 0x52, 0x08, 0x68, 0x6f, 0x6c, 0x69, 0x64, 0x61, 0x79, 0x73, 0x1a, 0x3a, 0x0a, 0x0e, 0x42,
-	0x75, 0x73, 0x69, 0x6e, 0x65, 0x73, 0x73, 0x50, 0x65, 0x72, 0x69, 0x6f, 0x64, 0x12, 0x12, 0x0a,
-	0x04, 0x6f, 0x70, 0x65, 0x6e, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x6f, 0x70, 0x65,
-	0x6e, 0x12, 0x14, 0x0a, 0x05, 0x63, 0x6c, 0x6f, 0x73, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09,
-	0x52, 0x05, 0x63, 0x6c, 0x6f, 0x73, 0x65, 0x1a, 0x90, 0x02, 0x0a, 0x07, 0x48, 0x6f, 0x6c, 0x69,
-	0x64, 0x61, 0x79, 0x12, 0x73, 0x0a, 0x04, 0x64, 0x61, 0x74, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28,
-	0x0b, 0x32, 0x5f, 0x2e, 0x69, 0x6f, 0x2e, 0x64, 0x65, 0x65, 0x70, 0x68, 0x61, 0x76, 0x65, 0x6e,
+	0x72, 0x69, 0x70, 0x74, 0x6f, 0x72, 0x52, 0x1a, 0x62, 0x75, 0x73, 0x69, 0x6e, 0x65, 0x73, 0x73,
+	0x43, 0x61, 0x6c, 0x65, 0x6e, 0x64, 0x61, 0x72, 0x44, 0x65, 0x73, 0x63, 0x72, 0x69, 0x70, 0x74,
+	0x6f, 0x72, 0x22, 0x2a, 0x0a, 0x0e, 0x41, 0x78, 0x69, 0x73, 0x46, 0x6f, 0x72, 0x6d, 0x61, 0x74,
+	0x54, 0x79, 0x70, 0x65, 0x12, 0x0c, 0x0a, 0x08, 0x43, 0x41, 0x54, 0x45, 0x47, 0x4f, 0x52, 0x59,
+	0x10, 0x00, 0x12, 0x0a, 0x0a, 0x06, 0x4e, 0x55, 0x4d, 0x42, 0x45, 0x52, 0x10, 0x01, 0x22, 0x43,
+	0x0a, 0x08, 0x41, 0x78, 0x69, 0x73, 0x54, 0x79, 0x70, 0x65, 0x12, 0x05, 0x0a, 0x01, 0x58, 0x10,
+	0x00, 0x12, 0x05, 0x0a, 0x01, 0x59, 0x10, 0x01, 0x12, 0x09, 0x0a, 0x05, 0x53, 0x48, 0x41, 0x50,
+	0x45, 0x10, 0x02, 0x12, 0x08, 0x0a, 0x04, 0x53, 0x49, 0x5a, 0x45, 0x10, 0x03, 0x12, 0x09, 0x0a,
+	0x05, 0x4c, 0x41, 0x42, 0x45, 0x4c, 0x10, 0x04, 0x12, 0x09, 0x0a, 0x05, 0x43, 0x4f, 0x4c, 0x4f,
+	0x52, 0x10, 0x05, 0x22, 0x42, 0x0a, 0x0c, 0x41, 0x78, 0x69, 0x73, 0x50, 0x6f, 0x73, 0x69, 0x74,
+	0x69, 0x6f, 0x6e, 0x12, 0x07, 0x0a, 0x03, 0x54, 0x4f, 0x50, 0x10, 0x00, 0x12, 0x0a, 0x0a, 0x06,
+	0x42, 0x4f, 0x54, 0x54, 0x4f, 0x4d, 0x10, 0x01, 0x12, 0x08, 0x0a, 0x04, 0x4c, 0x45, 0x46, 0x54,
+	0x10, 0x02, 0x12, 0x09, 0x0a, 0x05, 0x52, 0x49, 0x47, 0x48, 0x54, 0x10, 0x03, 0x12, 0x08, 0x0a,
+	0x04, 0x4e, 0x4f, 0x4e, 0x45, 0x10, 0x04, 0x42, 0x11, 0x0a, 0x0f, 0x5f, 0x66, 0x6f, 0x72, 0x6d,
+	0x61, 0x74, 0x5f, 0x70, 0x61, 0x74, 0x74, 0x65, 0x72, 0x6e, 0x42, 0x1a, 0x0a, 0x18, 0x5f, 0x67,
+	0x61, 0x70, 0x5f, 0x62, 0x65, 0x74, 0x77, 0x65, 0x65, 0x6e, 0x5f, 0x6d, 0x61, 0x6a, 0x6f, 0x72,
+	0x5f, 0x74, 0x69, 0x63, 0x6b, 0x73, 0x1a, 0xe2, 0x07, 0x0a, 0x1a, 0x42, 0x75, 0x73, 0x69, 0x6e,
+	0x65, 0x73, 0x73, 0x43, 0x61, 0x6c, 0x65, 0x6e, 0x64, 0x61, 0x72, 0x44, 0x65, 0x73, 0x63, 0x72,
+	0x69, 0x70, 0x74, 0x6f, 0x72, 0x12, 0x12, 0x0a, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x18, 0x01, 0x20,
+	0x01, 0x28, 0x09, 0x52, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x12, 0x1b, 0x0a, 0x09, 0x74, 0x69, 0x6d,
+	0x65, 0x5f, 0x7a, 0x6f, 0x6e, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x08, 0x74, 0x69,
+	0x6d, 0x65, 0x5a, 0x6f, 0x6e, 0x65, 0x12, 0x84, 0x01, 0x0a, 0x0d, 0x62, 0x75, 0x73, 0x69, 0x6e,
+	0x65, 0x73, 0x73, 0x5f, 0x64, 0x61, 0x79, 0x73, 0x18, 0x03, 0x20, 0x03, 0x28, 0x0e, 0x32, 0x5f,
+	0x2e, 0x69, 0x6f, 0x2e, 0x64, 0x65, 0x65, 0x70, 0x68, 0x61, 0x76, 0x65, 0x6e, 0x2e, 0x70, 0x72,
+	0x6f, 0x74, 0x6f, 0x2e, 0x62, 0x61, 0x63, 0x6b, 0x70, 0x6c, 0x61, 0x6e, 0x65, 0x2e, 0x73, 0x63,
+	0x72, 0x69, 0x70, 0x74, 0x2e, 0x67, 0x72, 0x70, 0x63, 0x2e, 0x46, 0x69, 0x67, 0x75, 0x72, 0x65,
+	0x44, 0x65, 0x73, 0x63, 0x72, 0x69, 0x70, 0x74, 0x6f, 0x72, 0x2e, 0x42, 0x75, 0x73, 0x69, 0x6e,
+	0x65, 0x73, 0x73, 0x43, 0x61, 0x6c, 0x65, 0x6e, 0x64, 0x61, 0x72, 0x44, 0x65, 0x73, 0x63, 0x72,
+	0x69, 0x70, 0x74, 0x6f, 0x72, 0x2e, 0x44, 0x61, 0x79, 0x4f, 0x66, 0x57, 0x65, 0x65, 0x6b, 0x52,
+	0x0c, 0x62, 0x75, 0x73, 0x69, 0x6e, 0x65, 0x73, 0x73, 0x44, 0x61, 0x79, 0x73, 0x12, 0x8f, 0x01,
+	0x0a, 0x10, 0x62, 0x75, 0x73, 0x69, 0x6e, 0x65, 0x73, 0x73, 0x5f, 0x70, 0x65, 0x72, 0x69, 0x6f,
+	0x64, 0x73, 0x18, 0x04, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x64, 0x2e, 0x69, 0x6f, 0x2e, 0x64, 0x65,
+	0x65, 0x70, 0x68, 0x61, 0x76, 0x65, 0x6e, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x62, 0x61,
+	0x63, 0x6b, 0x70, 0x6c, 0x61, 0x6e, 0x65, 0x2e, 0x73, 0x63, 0x72, 0x69, 0x70, 0x74, 0x2e, 0x67,
+	0x72, 0x70, 0x63, 0x2e, 0x46, 0x69, 0x67, 0x75, 0x72, 0x65, 0x44, 0x65, 0x73, 0x63, 0x72, 0x69,
+	0x70, 0x74, 0x6f, 0x72, 0x2e, 0x42, 0x75, 0x73, 0x69, 0x6e, 0x65, 0x73, 0x73, 0x43, 0x61, 0x6c,
+	0x65, 0x6e, 0x64, 0x61, 0x72, 0x44, 0x65, 0x73, 0x63, 0x72, 0x69, 0x70, 0x74, 0x6f, 0x72, 0x2e,
+	0x42, 0x75, 0x73, 0x69, 0x6e, 0x65, 0x73, 0x73, 0x50, 0x65, 0x72, 0x69, 0x6f, 0x64, 0x52, 0x0f,
+	0x62, 0x75, 0x73, 0x69, 0x6e, 0x65, 0x73, 0x73, 0x50, 0x65, 0x72, 0x69, 0x6f, 0x64, 0x73, 0x12,
+	0x79, 0x0a, 0x08, 0x68, 0x6f, 0x6c, 0x69, 0x64, 0x61, 0x79, 0x73, 0x18, 0x05, 0x20, 0x03, 0x28,
+	0x0b, 0x32, 0x5d, 0x2e, 0x69, 0x6f, 0x2e, 0x64, 0x65, 0x65, 0x70, 0x68, 0x61, 0x76, 0x65, 0x6e,
 	0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x62, 0x61, 0x63, 0x6b, 0x70, 0x6c, 0x61, 0x6e, 0x65,
 	0x2e, 0x73, 0x63, 0x72, 0x69, 0x70, 0x74, 0x2e, 0x67, 0x72, 0x70, 0x63, 0x2e, 0x46, 0x69, 0x67,
 	0x75, 0x72, 0x65, 0x44, 0x65, 0x73, 0x63, 0x72, 0x69, 0x70, 0x74, 0x6f, 0x72, 0x2e, 0x42, 0x75,
 	0x73, 0x69, 0x6e, 0x65, 0x73, 0x73, 0x43, 0x61, 0x6c, 0x65, 0x6e, 0x64, 0x61, 0x72, 0x44, 0x65,
-	0x73, 0x63, 0x72, 0x69, 0x70, 0x74, 0x6f, 0x72, 0x2e, 0x4c, 0x6f, 0x63, 0x61, 0x6c, 0x44, 0x61,
-	0x74, 0x65, 0x52, 0x04, 0x64, 0x61, 0x74, 0x65, 0x12, 0x8f, 0x01, 0x0a, 0x10, 0x62, 0x75, 0x73,
-	0x69, 0x6e, 0x65, 0x73, 0x73, 0x5f, 0x70, 0x65, 0x72, 0x69, 0x6f, 0x64, 0x73, 0x18, 0x02, 0x20,
-	0x03, 0x28, 0x0b, 0x32, 0x64, 0x2e, 0x69, 0x6f, 0x2e, 0x64, 0x65, 0x65, 0x70, 0x68, 0x61, 0x76,
-	0x65, 0x6e, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x62, 0x61, 0x63, 0x6b, 0x70, 0x6c, 0x61,
-	0x6e, 0x65, 0x2e, 0x73, 0x63, 0x72, 0x69, 0x70, 0x74, 0x2e, 0x67, 0x72, 0x70, 0x63, 0x2e, 0x46,
-	0x69, 0x67, 0x75, 0x72, 0x65, 0x44, 0x65, 0x73, 0x63, 0x72, 0x69, 0x70, 0x74, 0x6f, 0x72, 0x2e,
-	0x42, 0x75, 0x73, 0x69, 0x6e, 0x65, 0x73, 0x73, 0x43, 0x61, 0x6c, 0x65, 0x6e, 0x64, 0x61, 0x72,
-	0x44, 0x65, 0x73, 0x63, 0x72, 0x69, 0x70, 0x74, 0x6f, 0x72, 0x2e, 0x42, 0x75, 0x73, 0x69, 0x6e,
-	0x65, 0x73, 0x73, 0x50, 0x65, 0x72, 0x69, 0x6f, 0x64, 0x52, 0x0f, 0x62, 0x75, 0x73, 0x69, 0x6e,
-	0x65, 0x73, 0x73, 0x50, 0x65, 0x72, 0x69, 0x6f, 0x64, 0x73, 0x1a, 0x47, 0x0a, 0x09, 0x4c, 0x6f,
-	0x63, 0x61, 0x6c, 0x44, 0x61, 0x74, 0x65, 0x12, 0x12, 0x0a, 0x04, 0x79, 0x65, 0x61, 0x72, 0x18,
-	0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x04, 0x79, 0x65, 0x61, 0x72, 0x12, 0x14, 0x0a, 0x05, 0x6d,
-	0x6f, 0x6e, 0x74, 0x68, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x6d, 0x6f, 0x6e, 0x74,
-	0x68, 0x12, 0x10, 0x0a, 0x03, 0x64, 0x61, 0x79, 0x18, 0x03, 0x20, 0x01, 0x28, 0x05, 0x52, 0x03,
-	0x64, 0x61, 0x79, 0x22, 0x67, 0x0a, 0x09, 0x44, 0x61, 0x79, 0x4f, 0x66, 0x57, 0x65, 0x65, 0x6b,
-	0x12, 0x0a, 0x0a, 0x06, 0x53, 0x55, 0x4e, 0x44, 0x41, 0x59, 0x10, 0x00, 0x12, 0x0a, 0x0a, 0x06,
-	0x4d, 0x4f, 0x4e, 0x44, 0x41, 0x59, 0x10, 0x01, 0x12, 0x0b, 0x0a, 0x07, 0x54, 0x55, 0x45, 0x53,
-	0x44, 0x41, 0x59, 0x10, 0x02, 0x12, 0x0d, 0x0a, 0x09, 0x57, 0x45, 0x44, 0x4e, 0x45, 0x53, 0x44,
-	0x41, 0x59, 0x10, 0x03, 0x12, 0x0c, 0x0a, 0x08, 0x54, 0x48, 0x55, 0x52, 0x53, 0x44, 0x41, 0x59,
-	0x10, 0x04, 0x12, 0x0a, 0x0a, 0x06, 0x46, 0x52, 0x49, 0x44, 0x41, 0x59, 0x10, 0x05, 0x12, 0x0c,
-	0x0a, 0x08, 0x53, 0x41, 0x54, 0x55, 0x52, 0x44, 0x41, 0x59, 0x10, 0x06, 0x1a, 0xe4, 0x01, 0x0a,
-	0x1b, 0x4d, 0x75, 0x6c, 0x74, 0x69, 0x53, 0x65, 0x72, 0x69, 0x65, 0x73, 0x53, 0x6f, 0x75, 0x72,
-	0x63, 0x65, 0x44, 0x65, 0x73, 0x63, 0x72, 0x69, 0x70, 0x74, 0x6f, 0x72, 0x12, 0x17, 0x0a, 0x07,
-	0x61, 0x78, 0x69, 0x73, 0x5f, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06, 0x61,
-	0x78, 0x69, 0x73, 0x49, 0x64, 0x12, 0x59, 0x0a, 0x04, 0x74, 0x79, 0x70, 0x65, 0x18, 0x02, 0x20,
-	0x01, 0x28, 0x0e, 0x32, 0x45, 0x2e, 0x69, 0x6f, 0x2e, 0x64, 0x65, 0x65, 0x70, 0x68, 0x61, 0x76,
-	0x65, 0x6e, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x62, 0x61, 0x63, 0x6b, 0x70, 0x6c, 0x61,
-	0x6e, 0x65, 0x2e, 0x73, 0x63, 0x72, 0x69, 0x70, 0x74, 0x2e, 0x67, 0x72, 0x70, 0x63, 0x2e, 0x46,
-	0x69, 0x67, 0x75, 0x72, 0x65, 0x44, 0x65, 0x73, 0x63, 0x72, 0x69, 0x70, 0x74, 0x6f, 0x72, 0x2e,
-	0x53, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x54, 0x79, 0x70, 0x65, 0x52, 0x04, 0x74, 0x79, 0x70, 0x65,
-	0x12, 0x30, 0x0a, 0x14, 0x70, 0x61, 0x72, 0x74, 0x69, 0x74, 0x69, 0x6f, 0x6e, 0x65, 0x64, 0x5f,
-	0x74, 0x61, 0x62, 0x6c, 0x65, 0x5f, 0x69, 0x64, 0x18, 0x03, 0x20, 0x01, 0x28, 0x05, 0x52, 0x12,
-	0x70, 0x61, 0x72, 0x74, 0x69, 0x74, 0x69, 0x6f, 0x6e, 0x65, 0x64, 0x54, 0x61, 0x62, 0x6c, 0x65,
-	0x49, 0x64, 0x12, 0x1f, 0x0a, 0x0b, 0x63, 0x6f, 0x6c, 0x75, 0x6d, 0x6e, 0x5f, 0x6e, 0x61, 0x6d,
-	0x65, 0x18, 0x04, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0a, 0x63, 0x6f, 0x6c, 0x75, 0x6d, 0x6e, 0x4e,
-	0x61, 0x6d, 0x65, 0x1a, 0x81, 0x03, 0x0a, 0x10, 0x53, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x44, 0x65,
-	0x73, 0x63, 0x72, 0x69, 0x70, 0x74, 0x6f, 0x72, 0x12, 0x17, 0x0a, 0x07, 0x61, 0x78, 0x69, 0x73,
-	0x5f, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06, 0x61, 0x78, 0x69, 0x73, 0x49,
-	0x64, 0x12, 0x59, 0x0a, 0x04, 0x74, 0x79, 0x70, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0e, 0x32,
-	0x45, 0x2e, 0x69, 0x6f, 0x2e, 0x64, 0x65, 0x65, 0x70, 0x68, 0x61, 0x76, 0x65, 0x6e, 0x2e, 0x70,
-	0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x62, 0x61, 0x63, 0x6b, 0x70, 0x6c, 0x61, 0x6e, 0x65, 0x2e, 0x73,
-	0x63, 0x72, 0x69, 0x70, 0x74, 0x2e, 0x67, 0x72, 0x70, 0x63, 0x2e, 0x46, 0x69, 0x67, 0x75, 0x72,
-	0x65, 0x44, 0x65, 0x73, 0x63, 0x72, 0x69, 0x70, 0x74, 0x6f, 0x72, 0x2e, 0x53, 0x6f, 0x75, 0x72,
-	0x63, 0x65, 0x54, 0x79, 0x70, 0x65, 0x52, 0x04, 0x74, 0x79, 0x70, 0x65, 0x12, 0x19, 0x0a, 0x08,
-	0x74, 0x61, 0x62, 0x6c, 0x65, 0x5f, 0x69, 0x64, 0x18, 0x03, 0x20, 0x01, 0x28, 0x05, 0x52, 0x07,
-	0x74, 0x61, 0x62, 0x6c, 0x65, 0x49, 0x64, 0x12, 0x30, 0x0a, 0x14, 0x70, 0x61, 0x72, 0x74, 0x69,
-	0x74, 0x69, 0x6f, 0x6e, 0x65, 0x64, 0x5f, 0x74, 0x61, 0x62, 0x6c, 0x65, 0x5f, 0x69, 0x64, 0x18,
-	0x04, 0x20, 0x01, 0x28, 0x05, 0x52, 0x12, 0x70, 0x61, 0x72, 0x74, 0x69, 0x74, 0x69, 0x6f, 0x6e,
-	0x65, 0x64, 0x54, 0x61, 0x62, 0x6c, 0x65, 0x49, 0x64, 0x12, 0x1f, 0x0a, 0x0b, 0x63, 0x6f, 0x6c,
-	0x75, 0x6d, 0x6e, 0x5f, 0x6e, 0x61, 0x6d, 0x65, 0x18, 0x05, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0a,
-	0x63, 0x6f, 0x6c, 0x75, 0x6d, 0x6e, 0x4e, 0x61, 0x6d, 0x65, 0x12, 0x1f, 0x0a, 0x0b, 0x63, 0x6f,
-	0x6c, 0x75, 0x6d, 0x6e, 0x5f, 0x74, 0x79, 0x70, 0x65, 0x18, 0x06, 0x20, 0x01, 0x28, 0x09, 0x52,
-	0x0a, 0x63, 0x6f, 0x6c, 0x75, 0x6d, 0x6e, 0x54, 0x79, 0x70, 0x65, 0x12, 0x6a, 0x0a, 0x09, 0x6f,
-	0x6e, 0x65, 0x5f, 0x63, 0x6c, 0x69, 0x63, 0x6b, 0x18, 0x07, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x4d,
+	0x73, 0x63, 0x72, 0x69, 0x70, 0x74, 0x6f, 0x72, 0x2e, 0x48, 0x6f, 0x6c, 0x69, 0x64, 0x61, 0x79,
+	0x52, 0x08, 0x68, 0x6f, 0x6c, 0x69, 0x64, 0x61, 0x79, 0x73, 0x1a, 0x3a, 0x0a, 0x0e, 0x42, 0x75,
+	0x73, 0x69, 0x6e, 0x65, 0x73, 0x73, 0x50, 0x65, 0x72, 0x69, 0x6f, 0x64, 0x12, 0x12, 0x0a, 0x04,
+	0x6f, 0x70, 0x65, 0x6e, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x6f, 0x70, 0x65, 0x6e,
+	0x12, 0x14, 0x0a, 0x05, 0x63, 0x6c, 0x6f, 0x73, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52,
+	0x05, 0x63, 0x6c, 0x6f, 0x73, 0x65, 0x1a, 0x90, 0x02, 0x0a, 0x07, 0x48, 0x6f, 0x6c, 0x69, 0x64,
+	0x61, 0x79, 0x12, 0x73, 0x0a, 0x04, 0x64, 0x61, 0x74, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b,
+	0x32, 0x5f, 0x2e, 0x69, 0x6f, 0x2e, 0x64, 0x65, 0x65, 0x70, 0x68, 0x61, 0x76, 0x65, 0x6e, 0x2e,
+	0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x62, 0x61, 0x63, 0x6b, 0x70, 0x6c, 0x61, 0x6e, 0x65, 0x2e,
+	0x73, 0x63, 0x72, 0x69, 0x70, 0x74, 0x2e, 0x67, 0x72, 0x70, 0x63, 0x2e, 0x46, 0x69, 0x67, 0x75,
+	0x72, 0x65, 0x44, 0x65, 0x73, 0x63, 0x72, 0x69, 0x70, 0x74, 0x6f, 0x72, 0x2e, 0x42, 0x75, 0x73,
+	0x69, 0x6e, 0x65, 0x73, 0x73, 0x43, 0x61, 0x6c, 0x65, 0x6e, 0x64, 0x61, 0x72, 0x44, 0x65, 0x73,
+	0x63, 0x72, 0x69, 0x70, 0x74, 0x6f, 0x72, 0x2e, 0x4c, 0x6f, 0x63, 0x61, 0x6c, 0x44, 0x61, 0x74,
+	0x65, 0x52, 0x04, 0x64, 0x61, 0x74, 0x65, 0x12, 0x8f, 0x01, 0x0a, 0x10, 0x62, 0x75, 0x73, 0x69,
+	0x6e, 0x65, 0x73, 0x73, 0x5f, 0x70, 0x65, 0x72, 0x69, 0x6f, 0x64, 0x73, 0x18, 0x02, 0x20, 0x03,
+	0x28, 0x0b, 0x32, 0x64, 0x2e, 0x69, 0x6f, 0x2e, 0x64, 0x65, 0x65, 0x70, 0x68, 0x61, 0x76, 0x65,
+	0x6e, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x62, 0x61, 0x63, 0x6b, 0x70, 0x6c, 0x61, 0x6e,
+	0x65, 0x2e, 0x73, 0x63, 0x72, 0x69, 0x70, 0x74, 0x2e, 0x67, 0x72, 0x70, 0x63, 0x2e, 0x46, 0x69,
+	0x67, 0x75, 0x72, 0x65, 0x44, 0x65, 0x73, 0x63, 0x72, 0x69, 0x70, 0x74, 0x6f, 0x72, 0x2e, 0x42,
+	0x75, 0x73, 0x69, 0x6e, 0x65, 0x73, 0x73, 0x43, 0x61, 0x6c, 0x65, 0x6e, 0x64, 0x61, 0x72, 0x44,
+	0x65, 0x73, 0x63, 0x72, 0x69, 0x70, 0x74, 0x6f, 0x72, 0x2e, 0x42, 0x75, 0x73, 0x69, 0x6e, 0x65,
+	0x73, 0x73, 0x50, 0x65, 0x72, 0x69, 0x6f, 0x64, 0x52, 0x0f, 0x62, 0x75, 0x73, 0x69, 0x6e, 0x65,
+	0x73, 0x73, 0x50, 0x65, 0x72, 0x69, 0x6f, 0x64, 0x73, 0x1a, 0x47, 0x0a, 0x09, 0x4c, 0x6f, 0x63,
+	0x61, 0x6c, 0x44, 0x61, 0x74, 0x65, 0x12, 0x12, 0x0a, 0x04, 0x79, 0x65, 0x61, 0x72, 0x18, 0x01,
+	0x20, 0x01, 0x28, 0x05, 0x52, 0x04, 0x79, 0x65, 0x61, 0x72, 0x12, 0x14, 0x0a, 0x05, 0x6d, 0x6f,
+	0x6e, 0x74, 0x68, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x6d, 0x6f, 0x6e, 0x74, 0x68,
+	0x12, 0x10, 0x0a, 0x03, 0x64, 0x61, 0x79, 0x18, 0x03, 0x20, 0x01, 0x28, 0x05, 0x52, 0x03, 0x64,
+	0x61, 0x79, 0x22, 0x67, 0x0a, 0x09, 0x44, 0x61, 0x79, 0x4f, 0x66, 0x57, 0x65, 0x65, 0x6b, 0x12,
+	0x0a, 0x0a, 0x06, 0x53, 0x55, 0x4e, 0x44, 0x41, 0x59, 0x10, 0x00, 0x12, 0x0a, 0x0a, 0x06, 0x4d,
+	0x4f, 0x4e, 0x44, 0x41, 0x59, 0x10, 0x01, 0x12, 0x0b, 0x0a, 0x07, 0x54, 0x55, 0x45, 0x53, 0x44,
+	0x41, 0x59, 0x10, 0x02, 0x12, 0x0d, 0x0a, 0x09, 0x57, 0x45, 0x44, 0x4e, 0x45, 0x53, 0x44, 0x41,
+	0x59, 0x10, 0x03, 0x12, 0x0c, 0x0a, 0x08, 0x54, 0x48, 0x55, 0x52, 0x53, 0x44, 0x41, 0x59, 0x10,
+	0x04, 0x12, 0x0a, 0x0a, 0x06, 0x46, 0x52, 0x49, 0x44, 0x41, 0x59, 0x10, 0x05, 0x12, 0x0c, 0x0a,
+	0x08, 0x53, 0x41, 0x54, 0x55, 0x52, 0x44, 0x41, 0x59, 0x10, 0x06, 0x1a, 0xe4, 0x01, 0x0a, 0x1b,
+	0x4d, 0x75, 0x6c, 0x74, 0x69, 0x53, 0x65, 0x72, 0x69, 0x65, 0x73, 0x53, 0x6f, 0x75, 0x72, 0x63,
+	0x65, 0x44, 0x65, 0x73, 0x63, 0x72, 0x69, 0x70, 0x74, 0x6f, 0x72, 0x12, 0x17, 0x0a, 0x07, 0x61,
+	0x78, 0x69, 0x73, 0x5f, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06, 0x61, 0x78,
+	0x69, 0x73, 0x49, 0x64, 0x12, 0x59, 0x0a, 0x04, 0x74, 0x79, 0x70, 0x65, 0x18, 0x02, 0x20, 0x01,
+	0x28, 0x0e, 0x32, 0x45, 0x2e, 0x69, 0x6f, 0x2e, 0x64, 0x65, 0x65, 0x70, 0x68, 0x61, 0x76, 0x65,
+	0x6e, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x62, 0x61, 0x63, 0x6b, 0x70, 0x6c, 0x61, 0x6e,
+	0x65, 0x2e, 0x73, 0x63, 0x72, 0x69, 0x70, 0x74, 0x2e, 0x67, 0x72, 0x70, 0x63, 0x2e, 0x46, 0x69,
+	0x67, 0x75, 0x72, 0x65, 0x44, 0x65, 0x73, 0x63, 0x72, 0x69, 0x70, 0x74, 0x6f, 0x72, 0x2e, 0x53,
+	0x6f, 0x75, 0x72, 0x63, 0x65, 0x54, 0x79, 0x70, 0x65, 0x52, 0x04, 0x74, 0x79, 0x70, 0x65, 0x12,
+	0x30, 0x0a, 0x14, 0x70, 0x61, 0x72, 0x74, 0x69, 0x74, 0x69, 0x6f, 0x6e, 0x65, 0x64, 0x5f, 0x74,
+	0x61, 0x62, 0x6c, 0x65, 0x5f, 0x69, 0x64, 0x18, 0x03, 0x20, 0x01, 0x28, 0x05, 0x52, 0x12, 0x70,
+	0x61, 0x72, 0x74, 0x69, 0x74, 0x69, 0x6f, 0x6e, 0x65, 0x64, 0x54, 0x61, 0x62, 0x6c, 0x65, 0x49,
+	0x64, 0x12, 0x1f, 0x0a, 0x0b, 0x63, 0x6f, 0x6c, 0x75, 0x6d, 0x6e, 0x5f, 0x6e, 0x61, 0x6d, 0x65,
+	0x18, 0x04, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0a, 0x63, 0x6f, 0x6c, 0x75, 0x6d, 0x6e, 0x4e, 0x61,
+	0x6d, 0x65, 0x1a, 0x81, 0x03, 0x0a, 0x10, 0x53, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x44, 0x65, 0x73,
+	0x63, 0x72, 0x69, 0x70, 0x74, 0x6f, 0x72, 0x12, 0x17, 0x0a, 0x07, 0x61, 0x78, 0x69, 0x73, 0x5f,
+	0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06, 0x61, 0x78, 0x69, 0x73, 0x49, 0x64,
+	0x12, 0x59, 0x0a, 0x04, 0x74, 0x79, 0x70, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0e, 0x32, 0x45,
 	0x2e, 0x69, 0x6f, 0x2e, 0x64, 0x65, 0x65, 0x70, 0x68, 0x61, 0x76, 0x65, 0x6e, 0x2e, 0x70, 0x72,
 	0x6f, 0x74, 0x6f, 0x2e, 0x62, 0x61, 0x63, 0x6b, 0x70, 0x6c, 0x61, 0x6e, 0x65, 0x2e, 0x73, 0x63,
 	0x72, 0x69, 0x70, 0x74, 0x2e, 0x67, 0x72, 0x70, 0x63, 0x2e, 0x46, 0x69, 0x67, 0x75, 0x72, 0x65,
-	0x44, 0x65, 0x73, 0x63, 0x72, 0x69, 0x70, 0x74, 0x6f, 0x72, 0x2e, 0x4f, 0x6e, 0x65, 0x43, 0x6c,
-	0x69, 0x63, 0x6b, 0x44, 0x65, 0x73, 0x63, 0x72, 0x69, 0x70, 0x74, 0x6f, 0x72, 0x52, 0x08, 0x6f,
-	0x6e, 0x65, 0x43, 0x6c, 0x69, 0x63, 0x6b, 0x1a, 0x95, 0x01, 0x0a, 0x12, 0x4f, 0x6e, 0x65, 0x43,
-	0x6c, 0x69, 0x63, 0x6b, 0x44, 0x65, 0x73, 0x63, 0x72, 0x69, 0x70, 0x74, 0x6f, 0x72, 0x12, 0x18,
-	0x0a, 0x07, 0x63, 0x6f, 0x6c, 0x75, 0x6d, 0x6e, 0x73, 0x18, 0x01, 0x20, 0x03, 0x28, 0x09, 0x52,
-	0x07, 0x63, 0x6f, 0x6c, 0x75, 0x6d, 0x6e, 0x73, 0x12, 0x21, 0x0a, 0x0c, 0x63, 0x6f, 0x6c, 0x75,
-	0x6d, 0x6e, 0x5f, 0x74, 0x79, 0x70, 0x65, 0x73, 0x18, 0x02, 0x20, 0x03, 0x28, 0x09, 0x52, 0x0b,
-	0x63, 0x6f, 0x6c, 0x75, 0x6d, 0x6e, 0x54, 0x79, 0x70, 0x65, 0x73, 0x12, 0x42, 0x0a, 0x1e, 0x72,
-	0x65, 0x71, 0x75, 0x69, 0x72, 0x65, 0x5f, 0x61, 0x6c, 0x6c, 0x5f, 0x66, 0x69, 0x6c, 0x74, 0x65,
-	0x72, 0x73, 0x5f, 0x74, 0x6f, 0x5f, 0x64, 0x69, 0x73, 0x70, 0x6c, 0x61, 0x79, 0x18, 0x03, 0x20,
-	0x01, 0x28, 0x08, 0x52, 0x1a, 0x72, 0x65, 0x71, 0x75, 0x69, 0x72, 0x65, 0x41, 0x6c, 0x6c, 0x46,
-	0x69, 0x6c, 0x74, 0x65, 0x72, 0x73, 0x54, 0x6f, 0x44, 0x69, 0x73, 0x70, 0x6c, 0x61, 0x79, 0x22,
-	0xa6, 0x01, 0x0a, 0x0f, 0x53, 0x65, 0x72, 0x69, 0x65, 0x73, 0x50, 0x6c, 0x6f, 0x74, 0x53, 0x74,
-	0x79, 0x6c, 0x65, 0x12, 0x07, 0x0a, 0x03, 0x42, 0x41, 0x52, 0x10, 0x00, 0x12, 0x0f, 0x0a, 0x0b,
-	0x53, 0x54, 0x41, 0x43, 0x4b, 0x45, 0x44, 0x5f, 0x42, 0x41, 0x52, 0x10, 0x01, 0x12, 0x08, 0x0a,
-	0x04, 0x4c, 0x49, 0x4e, 0x45, 0x10, 0x02, 0x12, 0x08, 0x0a, 0x04, 0x41, 0x52, 0x45, 0x41, 0x10,
-	0x03, 0x12, 0x10, 0x0a, 0x0c, 0x53, 0x54, 0x41, 0x43, 0x4b, 0x45, 0x44, 0x5f, 0x41, 0x52, 0x45,
-	0x41, 0x10, 0x04, 0x12, 0x07, 0x0a, 0x03, 0x50, 0x49, 0x45, 0x10, 0x05, 0x12, 0x0d, 0x0a, 0x09,
-	0x48, 0x49, 0x53, 0x54, 0x4f, 0x47, 0x52, 0x41, 0x4d, 0x10, 0x06, 0x12, 0x08, 0x0a, 0x04, 0x4f,
-	0x48, 0x4c, 0x43, 0x10, 0x07, 0x12, 0x0b, 0x0a, 0x07, 0x53, 0x43, 0x41, 0x54, 0x54, 0x45, 0x52,
-	0x10, 0x08, 0x12, 0x08, 0x0a, 0x04, 0x53, 0x54, 0x45, 0x50, 0x10, 0x09, 0x12, 0x0d, 0x0a, 0x09,
-	0x45, 0x52, 0x52, 0x4f, 0x52, 0x5f, 0x42, 0x41, 0x52, 0x10, 0x0a, 0x12, 0x0b, 0x0a, 0x07, 0x54,
-	0x52, 0x45, 0x45, 0x4d, 0x41, 0x50, 0x10, 0x0b, 0x22, 0xd2, 0x01, 0x0a, 0x0a, 0x53, 0x6f, 0x75,
-	0x72, 0x63, 0x65, 0x54, 0x79, 0x70, 0x65, 0x12, 0x05, 0x0a, 0x01, 0x58, 0x10, 0x00, 0x12, 0x05,
-	0x0a, 0x01, 0x59, 0x10, 0x01, 0x12, 0x05, 0x0a, 0x01, 0x5a, 0x10, 0x02, 0x12, 0x09, 0x0a, 0x05,
-	0x58, 0x5f, 0x4c, 0x4f, 0x57, 0x10, 0x03, 0x12, 0x0a, 0x0a, 0x06, 0x58, 0x5f, 0x48, 0x49, 0x47,
-	0x48, 0x10, 0x04, 0x12, 0x09, 0x0a, 0x05, 0x59, 0x5f, 0x4c, 0x4f, 0x57, 0x10, 0x05, 0x12, 0x0a,
-	0x0a, 0x06, 0x59, 0x5f, 0x48, 0x49, 0x47, 0x48, 0x10, 0x06, 0x12, 0x08, 0x0a, 0x04, 0x54, 0x49,
-	0x4d, 0x45, 0x10, 0x07, 0x12, 0x08, 0x0a, 0x04, 0x4f, 0x50, 0x45, 0x4e, 0x10, 0x08, 0x12, 0x08,
-	0x0a, 0x04, 0x48, 0x49, 0x47, 0x48, 0x10, 0x09, 0x12, 0x07, 0x0a, 0x03, 0x4c, 0x4f, 0x57, 0x10,
-	0x0a, 0x12, 0x09, 0x0a, 0x05, 0x43, 0x4c, 0x4f, 0x53, 0x45, 0x10, 0x0b, 0x12, 0x09, 0x0a, 0x05,
-	0x53, 0x48, 0x41, 0x50, 0x45, 0x10, 0x0c, 0x12, 0x08, 0x0a, 0x04, 0x53, 0x49, 0x5a, 0x45, 0x10,
-	0x0d, 0x12, 0x09, 0x0a, 0x05, 0x4c, 0x41, 0x42, 0x45, 0x4c, 0x10, 0x0e, 0x12, 0x09, 0x0a, 0x05,
-	0x43, 0x4f, 0x4c, 0x4f, 0x52, 0x10, 0x0f, 0x12, 0x0a, 0x0a, 0x06, 0x50, 0x41, 0x52, 0x45, 0x4e,
-	0x54, 0x10, 0x10, 0x12, 0x0e, 0x0a, 0x0a, 0x48, 0x4f, 0x56, 0x45, 0x52, 0x5f, 0x54, 0x45, 0x58,
-	0x54, 0x10, 0x11, 0x12, 0x08, 0x0a, 0x04, 0x54, 0x45, 0x58, 0x54, 0x10, 0x12, 0x42, 0x08, 0x0a,
-	0x06, 0x5f, 0x74, 0x69, 0x74, 0x6c, 0x65, 0x4a, 0x04, 0x08, 0x0b, 0x10, 0x0c, 0x4a, 0x04, 0x08,
-	0x0c, 0x10, 0x0d, 0x32, 0xb2, 0x0d, 0x0a, 0x0e, 0x43, 0x6f, 0x6e, 0x73, 0x6f, 0x6c, 0x65, 0x53,
-	0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x12, 0x98, 0x01, 0x0a, 0x0f, 0x47, 0x65, 0x74, 0x43, 0x6f,
-	0x6e, 0x73, 0x6f, 0x6c, 0x65, 0x54, 0x79, 0x70, 0x65, 0x73, 0x12, 0x40, 0x2e, 0x69, 0x6f, 0x2e,
-	0x64, 0x65, 0x65, 0x70, 0x68, 0x61, 0x76, 0x65, 0x6e, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e,
-	0x62, 0x61, 0x63, 0x6b, 0x70, 0x6c, 0x61, 0x6e, 0x65, 0x2e, 0x73, 0x63, 0x72, 0x69, 0x70, 0x74,
-	0x2e, 0x67, 0x72, 0x70, 0x63, 0x2e, 0x47, 0x65, 0x74, 0x43, 0x6f, 0x6e, 0x73, 0x6f, 0x6c, 0x65,
-	0x54, 0x79, 0x70, 0x65, 0x73, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x41, 0x2e, 0x69,
-	0x6f, 0x2e, 0x64, 0x65, 0x65, 0x70, 0x68, 0x61, 0x76, 0x65, 0x6e, 0x2e, 0x70, 0x72, 0x6f, 0x74,
-	0x6f, 0x2e, 0x62, 0x61, 0x63, 0x6b, 0x70, 0x6c, 0x61, 0x6e, 0x65, 0x2e, 0x73, 0x63, 0x72, 0x69,
-	0x70, 0x74, 0x2e, 0x67, 0x72, 0x70, 0x63, 0x2e, 0x47, 0x65, 0x74, 0x43, 0x6f, 0x6e, 0x73, 0x6f,
-	0x6c, 0x65, 0x54, 0x79, 0x70, 0x65, 0x73, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22,
-	0x00, 0x12, 0x8f, 0x01, 0x0a, 0x0c, 0x53, 0x74, 0x61, 0x72, 0x74, 0x43, 0x6f, 0x6e, 0x73, 0x6f,
-	0x6c, 0x65, 0x12, 0x3d, 0x2e, 0x69, 0x6f, 0x2e, 0x64, 0x65, 0x65, 0x70, 0x68, 0x61, 0x76, 0x65,
-	0x6e, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x62, 0x61, 0x63, 0x6b, 0x70, 0x6c, 0x61, 0x6e,
-	0x65, 0x2e, 0x73, 0x63, 0x72, 0x69, 0x70, 0x74, 0x2e, 0x67, 0x72, 0x70, 0x63, 0x2e, 0x53, 0x74,
-	0x61, 0x72, 0x74, 0x43, 0x6f, 0x6e, 0x73, 0x6f, 0x6c, 0x65, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73,
-	0x74, 0x1a, 0x3e, 0x2e, 0x69, 0x6f, 0x2e, 0x64, 0x65, 0x65, 0x70, 0x68, 0x61, 0x76, 0x65, 0x6e,
+	0x44, 0x65, 0x73, 0x63, 0x72, 0x69, 0x70, 0x74, 0x6f, 0x72, 0x2e, 0x53, 0x6f, 0x75, 0x72, 0x63,
+	0x65, 0x54, 0x79, 0x70, 0x65, 0x52, 0x04, 0x74, 0x79, 0x70, 0x65, 0x12, 0x19, 0x0a, 0x08, 0x74,
+	0x61, 0x62, 0x6c, 0x65, 0x5f, 0x69, 0x64, 0x18, 0x03, 0x20, 0x01, 0x28, 0x05, 0x52, 0x07, 0x74,
+	0x61, 0x62, 0x6c, 0x65, 0x49, 0x64, 0x12, 0x30, 0x0a, 0x14, 0x70, 0x61, 0x72, 0x74, 0x69, 0x74,
+	0x69, 0x6f, 0x6e, 0x65, 0x64, 0x5f, 0x74, 0x61, 0x62, 0x6c, 0x65, 0x5f, 0x69, 0x64, 0x18, 0x04,
+	0x20, 0x01, 0x28, 0x05, 0x52, 0x12, 0x70, 0x61, 0x72, 0x74, 0x69, 0x74, 0x69, 0x6f, 0x6e, 0x65,
+	0x64, 0x54, 0x61, 0x62, 0x6c, 0x65, 0x49, 0x64, 0x12, 0x1f, 0x0a, 0x0b, 0x63, 0x6f, 0x6c, 0x75,
+	0x6d, 0x6e, 0x5f, 0x6e, 0x61, 0x6d, 0x65, 0x18, 0x05, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0a, 0x63,
+	0x6f, 0x6c, 0x75, 0x6d, 0x6e, 0x4e, 0x61, 0x6d, 0x65, 0x12, 0x1f, 0x0a, 0x0b, 0x63, 0x6f, 0x6c,
+	0x75, 0x6d, 0x6e, 0x5f, 0x74, 0x79, 0x70, 0x65, 0x18, 0x06, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0a,
+	0x63, 0x6f, 0x6c, 0x75, 0x6d, 0x6e, 0x54, 0x79, 0x70, 0x65, 0x12, 0x6a, 0x0a, 0x09, 0x6f, 0x6e,
+	0x65, 0x5f, 0x63, 0x6c, 0x69, 0x63, 0x6b, 0x18, 0x07, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x4d, 0x2e,
+	0x69, 0x6f, 0x2e, 0x64, 0x65, 0x65, 0x70, 0x68, 0x61, 0x76, 0x65, 0x6e, 0x2e, 0x70, 0x72, 0x6f,
+	0x74, 0x6f, 0x2e, 0x62, 0x61, 0x63, 0x6b, 0x70, 0x6c, 0x61, 0x6e, 0x65, 0x2e, 0x73, 0x63, 0x72,
+	0x69, 0x70, 0x74, 0x2e, 0x67, 0x72, 0x70, 0x63, 0x2e, 0x46, 0x69, 0x67, 0x75, 0x72, 0x65, 0x44,
+	0x65, 0x73, 0x63, 0x72, 0x69, 0x70, 0x74, 0x6f, 0x72, 0x2e, 0x4f, 0x6e, 0x65, 0x43, 0x6c, 0x69,
+	0x63, 0x6b, 0x44, 0x65, 0x73, 0x63, 0x72, 0x69, 0x70, 0x74, 0x6f, 0x72, 0x52, 0x08, 0x6f, 0x6e,
+	0x65, 0x43, 0x6c, 0x69, 0x63, 0x6b, 0x1a, 0x95, 0x01, 0x0a, 0x12, 0x4f, 0x6e, 0x65, 0x43, 0x6c,
+	0x69, 0x63, 0x6b, 0x44, 0x65, 0x73, 0x63, 0x72, 0x69, 0x70, 0x74, 0x6f, 0x72, 0x12, 0x18, 0x0a,
+	0x07, 0x63, 0x6f, 0x6c, 0x75, 0x6d, 0x6e, 0x73, 0x18, 0x01, 0x20, 0x03, 0x28, 0x09, 0x52, 0x07,
+	0x63, 0x6f, 0x6c, 0x75, 0x6d, 0x6e, 0x73, 0x12, 0x21, 0x0a, 0x0c, 0x63, 0x6f, 0x6c, 0x75, 0x6d,
+	0x6e, 0x5f, 0x74, 0x79, 0x70, 0x65, 0x73, 0x18, 0x02, 0x20, 0x03, 0x28, 0x09, 0x52, 0x0b, 0x63,
+	0x6f, 0x6c, 0x75, 0x6d, 0x6e, 0x54, 0x79, 0x70, 0x65, 0x73, 0x12, 0x42, 0x0a, 0x1e, 0x72, 0x65,
+	0x71, 0x75, 0x69, 0x72, 0x65, 0x5f, 0x61, 0x6c, 0x6c, 0x5f, 0x66, 0x69, 0x6c, 0x74, 0x65, 0x72,
+	0x73, 0x5f, 0x74, 0x6f, 0x5f, 0x64, 0x69, 0x73, 0x70, 0x6c, 0x61, 0x79, 0x18, 0x03, 0x20, 0x01,
+	0x28, 0x08, 0x52, 0x1a, 0x72, 0x65, 0x71, 0x75, 0x69, 0x72, 0x65, 0x41, 0x6c, 0x6c, 0x46, 0x69,
+	0x6c, 0x74, 0x65, 0x72, 0x73, 0x54, 0x6f, 0x44, 0x69, 0x73, 0x70, 0x6c, 0x61, 0x79, 0x22, 0xa6,
+	0x01, 0x0a, 0x0f, 0x53, 0x65, 0x72, 0x69, 0x65, 0x73, 0x50, 0x6c, 0x6f, 0x74, 0x53, 0x74, 0x79,
+	0x6c, 0x65, 0x12, 0x07, 0x0a, 0x03, 0x42, 0x41, 0x52, 0x10, 0x00, 0x12, 0x0f, 0x0a, 0x0b, 0x53,
+	0x54, 0x41, 0x43, 0x4b, 0x45, 0x44, 0x5f, 0x42, 0x41, 0x52, 0x10, 0x01, 0x12, 0x08, 0x0a, 0x04,
+	0x4c, 0x49, 0x4e, 0x45, 0x10, 0x02, 0x12, 0x08, 0x0a, 0x04, 0x41, 0x52, 0x45, 0x41, 0x10, 0x03,
+	0x12, 0x10, 0x0a, 0x0c, 0x53, 0x54, 0x41, 0x43, 0x4b, 0x45, 0x44, 0x5f, 0x41, 0x52, 0x45, 0x41,
+	0x10, 0x04, 0x12, 0x07, 0x0a, 0x03, 0x50, 0x49, 0x45, 0x10, 0x05, 0x12, 0x0d, 0x0a, 0x09, 0x48,
+	0x49, 0x53, 0x54, 0x4f, 0x47, 0x52, 0x41, 0x4d, 0x10, 0x06, 0x12, 0x08, 0x0a, 0x04, 0x4f, 0x48,
+	0x4c, 0x43, 0x10, 0x07, 0x12, 0x0b, 0x0a, 0x07, 0x53, 0x43, 0x41, 0x54, 0x54, 0x45, 0x52, 0x10,
+	0x08, 0x12, 0x08, 0x0a, 0x04, 0x53, 0x54, 0x45, 0x50, 0x10, 0x09, 0x12, 0x0d, 0x0a, 0x09, 0x45,
+	0x52, 0x52, 0x4f, 0x52, 0x5f, 0x42, 0x41, 0x52, 0x10, 0x0a, 0x12, 0x0b, 0x0a, 0x07, 0x54, 0x52,
+	0x45, 0x45, 0x4d, 0x41, 0x50, 0x10, 0x0b, 0x22, 0xd2, 0x01, 0x0a, 0x0a, 0x53, 0x6f, 0x75, 0x72,
+	0x63, 0x65, 0x54, 0x79, 0x70, 0x65, 0x12, 0x05, 0x0a, 0x01, 0x58, 0x10, 0x00, 0x12, 0x05, 0x0a,
+	0x01, 0x59, 0x10, 0x01, 0x12, 0x05, 0x0a, 0x01, 0x5a, 0x10, 0x02, 0x12, 0x09, 0x0a, 0x05, 0x58,
+	0x5f, 0x4c, 0x4f, 0x57, 0x10, 0x03, 0x12, 0x0a, 0x0a, 0x06, 0x58, 0x5f, 0x48, 0x49, 0x47, 0x48,
+	0x10, 0x04, 0x12, 0x09, 0x0a, 0x05, 0x59, 0x5f, 0x4c, 0x4f, 0x57, 0x10, 0x05, 0x12, 0x0a, 0x0a,
+	0x06, 0x59, 0x5f, 0x48, 0x49, 0x47, 0x48, 0x10, 0x06, 0x12, 0x08, 0x0a, 0x04, 0x54, 0x49, 0x4d,
+	0x45, 0x10, 0x07, 0x12, 0x08, 0x0a, 0x04, 0x4f, 0x50, 0x45, 0x4e, 0x10, 0x08, 0x12, 0x08, 0x0a,
+	0x04, 0x48, 0x49, 0x47, 0x48, 0x10, 0x09, 0x12, 0x07, 0x0a, 0x03, 0x4c, 0x4f, 0x57, 0x10, 0x0a,
+	0x12, 0x09, 0x0a, 0x05, 0x43, 0x4c, 0x4f, 0x53, 0x45, 0x10, 0x0b, 0x12, 0x09, 0x0a, 0x05, 0x53,
+	0x48, 0x41, 0x50, 0x45, 0x10, 0x0c, 0x12, 0x08, 0x0a, 0x04, 0x53, 0x49, 0x5a, 0x45, 0x10, 0x0d,
+	0x12, 0x09, 0x0a, 0x05, 0x4c, 0x41, 0x42, 0x45, 0x4c, 0x10, 0x0e, 0x12, 0x09, 0x0a, 0x05, 0x43,
+	0x4f, 0x4c, 0x4f, 0x52, 0x10, 0x0f, 0x12, 0x0a, 0x0a, 0x06, 0x50, 0x41, 0x52, 0x45, 0x4e, 0x54,
+	0x10, 0x10, 0x12, 0x0e, 0x0a, 0x0a, 0x48, 0x4f, 0x56, 0x45, 0x52, 0x5f, 0x54, 0x45, 0x58, 0x54,
+	0x10, 0x11, 0x12, 0x08, 0x0a, 0x04, 0x54, 0x45, 0x58, 0x54, 0x10, 0x12, 0x42, 0x08, 0x0a, 0x06,
+	0x5f, 0x74, 0x69, 0x74, 0x6c, 0x65, 0x4a, 0x04, 0x08, 0x0b, 0x10, 0x0c, 0x4a, 0x04, 0x08, 0x0c,
+	0x10, 0x0d, 0x32, 0xb2, 0x0d, 0x0a, 0x0e, 0x43, 0x6f, 0x6e, 0x73, 0x6f, 0x6c, 0x65, 0x53, 0x65,
+	0x72, 0x76, 0x69, 0x63, 0x65, 0x12, 0x98, 0x01, 0x0a, 0x0f, 0x47, 0x65, 0x74, 0x43, 0x6f, 0x6e,
+	0x73, 0x6f, 0x6c, 0x65, 0x54, 0x79, 0x70, 0x65, 0x73, 0x12, 0x40, 0x2e, 0x69, 0x6f, 0x2e, 0x64,
+	0x65, 0x65, 0x70, 0x68, 0x61, 0x76, 0x65, 0x6e, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x62,
+	0x61, 0x63, 0x6b, 0x70, 0x6c, 0x61, 0x6e, 0x65, 0x2e, 0x73, 0x63, 0x72, 0x69, 0x70, 0x74, 0x2e,
+	0x67, 0x72, 0x70, 0x63, 0x2e, 0x47, 0x65, 0x74, 0x43, 0x6f, 0x6e, 0x73, 0x6f, 0x6c, 0x65, 0x54,
+	0x79, 0x70, 0x65, 0x73, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x41, 0x2e, 0x69, 0x6f,
+	0x2e, 0x64, 0x65, 0x65, 0x70, 0x68, 0x61, 0x76, 0x65, 0x6e, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f,
+	0x2e, 0x62, 0x61, 0x63, 0x6b, 0x70, 0x6c, 0x61, 0x6e, 0x65, 0x2e, 0x73, 0x63, 0x72, 0x69, 0x70,
+	0x74, 0x2e, 0x67, 0x72, 0x70, 0x63, 0x2e, 0x47, 0x65, 0x74, 0x43, 0x6f, 0x6e, 0x73, 0x6f, 0x6c,
+	0x65, 0x54, 0x79, 0x70, 0x65, 0x73, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x00,
+	0x12, 0x8f, 0x01, 0x0a, 0x0c, 0x53, 0x74, 0x61, 0x72, 0x74, 0x43, 0x6f, 0x6e, 0x73, 0x6f, 0x6c,
+	0x65, 0x12, 0x3d, 0x2e, 0x69, 0x6f, 0x2e, 0x64, 0x65, 0x65, 0x70, 0x68, 0x61, 0x76, 0x65, 0x6e,
 	0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x62, 0x61, 0x63, 0x6b, 0x70, 0x6c, 0x61, 0x6e, 0x65,
 	0x2e, 0x73, 0x63, 0x72, 0x69, 0x70, 0x74, 0x2e, 0x67, 0x72, 0x70, 0x63, 0x2e, 0x53, 0x74, 0x61,
-	0x72, 0x74, 0x43, 0x6f, 0x6e, 0x73, 0x6f, 0x6c, 0x65, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73,
-	0x65, 0x22, 0x00, 0x12, 0x8c, 0x01, 0x0a, 0x0b, 0x47, 0x65, 0x74, 0x48, 0x65, 0x61, 0x70, 0x49,
-	0x6e, 0x66, 0x6f, 0x12, 0x3c, 0x2e, 0x69, 0x6f, 0x2e, 0x64, 0x65, 0x65, 0x70, 0x68, 0x61, 0x76,
-	0x65, 0x6e, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x62, 0x61, 0x63, 0x6b, 0x70, 0x6c, 0x61,
-	0x6e, 0x65, 0x2e, 0x73, 0x63, 0x72, 0x69, 0x70, 0x74, 0x2e, 0x67, 0x72, 0x70, 0x63, 0x2e, 0x47,
-	0x65, 0x74, 0x48, 0x65, 0x61, 0x70, 0x49, 0x6e, 0x66, 0x6f, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73,
-	0x74, 0x1a, 0x3d, 0x2e, 0x69, 0x6f, 0x2e, 0x64, 0x65, 0x65, 0x70, 0x68, 0x61, 0x76, 0x65, 0x6e,
-	0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x62, 0x61, 0x63, 0x6b, 0x70, 0x6c, 0x61, 0x6e, 0x65,
-	0x2e, 0x73, 0x63, 0x72, 0x69, 0x70, 0x74, 0x2e, 0x67, 0x72, 0x70, 0x63, 0x2e, 0x47, 0x65, 0x74,
-	0x48, 0x65, 0x61, 0x70, 0x49, 0x6e, 0x66, 0x6f, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65,
-	0x22, 0x00, 0x12, 0x96, 0x01, 0x0a, 0x0f, 0x53, 0x75, 0x62, 0x73, 0x63, 0x72, 0x69, 0x62, 0x65,
-	0x54, 0x6f, 0x4c, 0x6f, 0x67, 0x73, 0x12, 0x40, 0x2e, 0x69, 0x6f, 0x2e, 0x64, 0x65, 0x65, 0x70,
-	0x68, 0x61, 0x76, 0x65, 0x6e, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x62, 0x61, 0x63, 0x6b,
-	0x70, 0x6c, 0x61, 0x6e, 0x65, 0x2e, 0x73, 0x63, 0x72, 0x69, 0x70, 0x74, 0x2e, 0x67, 0x72, 0x70,
-	0x63, 0x2e, 0x4c, 0x6f, 0x67, 0x53, 0x75, 0x62, 0x73, 0x63, 0x72, 0x69, 0x70, 0x74, 0x69, 0x6f,
-	0x6e, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x3d, 0x2e, 0x69, 0x6f, 0x2e, 0x64, 0x65,
-	0x65, 0x70, 0x68, 0x61, 0x76, 0x65, 0x6e, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x62, 0x61,
-	0x63, 0x6b, 0x70, 0x6c, 0x61, 0x6e, 0x65, 0x2e, 0x73, 0x63, 0x72, 0x69, 0x70, 0x74, 0x2e, 0x67,
-	0x72, 0x70, 0x63, 0x2e, 0x4c, 0x6f, 0x67, 0x53, 0x75, 0x62, 0x73, 0x63, 0x72, 0x69, 0x70, 0x74,
-	0x69, 0x6f, 0x6e, 0x44, 0x61, 0x74, 0x61, 0x22, 0x00, 0x30, 0x01, 0x12, 0x95, 0x01, 0x0a, 0x0e,
-	0x45, 0x78, 0x65, 0x63, 0x75, 0x74, 0x65, 0x43, 0x6f, 0x6d, 0x6d, 0x61, 0x6e, 0x64, 0x12, 0x3f,
+	0x72, 0x74, 0x43, 0x6f, 0x6e, 0x73, 0x6f, 0x6c, 0x65, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74,
+	0x1a, 0x3e, 0x2e, 0x69, 0x6f, 0x2e, 0x64, 0x65, 0x65, 0x70, 0x68, 0x61, 0x76, 0x65, 0x6e, 0x2e,
+	0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x62, 0x61, 0x63, 0x6b, 0x70, 0x6c, 0x61, 0x6e, 0x65, 0x2e,
+	0x73, 0x63, 0x72, 0x69, 0x70, 0x74, 0x2e, 0x67, 0x72, 0x70, 0x63, 0x2e, 0x53, 0x74, 0x61, 0x72,
+	0x74, 0x43, 0x6f, 0x6e, 0x73, 0x6f, 0x6c, 0x65, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65,
+	0x22, 0x00, 0x12, 0x8c, 0x01, 0x0a, 0x0b, 0x47, 0x65, 0x74, 0x48, 0x65, 0x61, 0x70, 0x49, 0x6e,
+	0x66, 0x6f, 0x12, 0x3c, 0x2e, 0x69, 0x6f, 0x2e, 0x64, 0x65, 0x65, 0x70, 0x68, 0x61, 0x76, 0x65,
+	0x6e, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x62, 0x61, 0x63, 0x6b, 0x70, 0x6c, 0x61, 0x6e,
+	0x65, 0x2e, 0x73, 0x63, 0x72, 0x69, 0x70, 0x74, 0x2e, 0x67, 0x72, 0x70, 0x63, 0x2e, 0x47, 0x65,
+	0x74, 0x48, 0x65, 0x61, 0x70, 0x49, 0x6e, 0x66, 0x6f, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74,
+	0x1a, 0x3d, 0x2e, 0x69, 0x6f, 0x2e, 0x64, 0x65, 0x65, 0x70, 0x68, 0x61, 0x76, 0x65, 0x6e, 0x2e,
+	0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x62, 0x61, 0x63, 0x6b, 0x70, 0x6c, 0x61, 0x6e, 0x65, 0x2e,
+	0x73, 0x63, 0x72, 0x69, 0x70, 0x74, 0x2e, 0x67, 0x72, 0x70, 0x63, 0x2e, 0x47, 0x65, 0x74, 0x48,
+	0x65, 0x61, 0x70, 0x49, 0x6e, 0x66, 0x6f, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22,
+	0x00, 0x12, 0x96, 0x01, 0x0a, 0x0f, 0x53, 0x75, 0x62, 0x73, 0x63, 0x72, 0x69, 0x62, 0x65, 0x54,
+	0x6f, 0x4c, 0x6f, 0x67, 0x73, 0x12, 0x40, 0x2e, 0x69, 0x6f, 0x2e, 0x64, 0x65, 0x65, 0x70, 0x68,
+	0x61, 0x76, 0x65, 0x6e, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x62, 0x61, 0x63, 0x6b, 0x70,
+	0x6c, 0x61, 0x6e, 0x65, 0x2e, 0x73, 0x63, 0x72, 0x69, 0x70, 0x74, 0x2e, 0x67, 0x72, 0x70, 0x63,
+	0x2e, 0x4c, 0x6f, 0x67, 0x53, 0x75, 0x62, 0x73, 0x63, 0x72, 0x69, 0x70, 0x74, 0x69, 0x6f, 0x6e,
+	0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x3d, 0x2e, 0x69, 0x6f, 0x2e, 0x64, 0x65, 0x65,
+	0x70, 0x68, 0x61, 0x76, 0x65, 0x6e, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x62, 0x61, 0x63,
+	0x6b, 0x70, 0x6c, 0x61, 0x6e, 0x65, 0x2e, 0x73, 0x63, 0x72, 0x69, 0x70, 0x74, 0x2e, 0x67, 0x72,
+	0x70, 0x63, 0x2e, 0x4c, 0x6f, 0x67, 0x53, 0x75, 0x62, 0x73, 0x63, 0x72, 0x69, 0x70, 0x74, 0x69,
+	0x6f, 0x6e, 0x44, 0x61, 0x74, 0x61, 0x22, 0x00, 0x30, 0x01, 0x12, 0x95, 0x01, 0x0a, 0x0e, 0x45,
+	0x78, 0x65, 0x63, 0x75, 0x74, 0x65, 0x43, 0x6f, 0x6d, 0x6d, 0x61, 0x6e, 0x64, 0x12, 0x3f, 0x2e,
+	0x69, 0x6f, 0x2e, 0x64, 0x65, 0x65, 0x70, 0x68, 0x61, 0x76, 0x65, 0x6e, 0x2e, 0x70, 0x72, 0x6f,
+	0x74, 0x6f, 0x2e, 0x62, 0x61, 0x63, 0x6b, 0x70, 0x6c, 0x61, 0x6e, 0x65, 0x2e, 0x73, 0x63, 0x72,
+	0x69, 0x70, 0x74, 0x2e, 0x67, 0x72, 0x70, 0x63, 0x2e, 0x45, 0x78, 0x65, 0x63, 0x75, 0x74, 0x65,
+	0x43, 0x6f, 0x6d, 0x6d, 0x61, 0x6e, 0x64, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x40,
 	0x2e, 0x69, 0x6f, 0x2e, 0x64, 0x65, 0x65, 0x70, 0x68, 0x61, 0x76, 0x65, 0x6e, 0x2e, 0x70, 0x72,
 	0x6f, 0x74, 0x6f, 0x2e, 0x62, 0x61, 0x63, 0x6b, 0x70, 0x6c, 0x61, 0x6e, 0x65, 0x2e, 0x73, 0x63,
 	0x72, 0x69, 0x70, 0x74, 0x2e, 0x67, 0x72, 0x70, 0x63, 0x2e, 0x45, 0x78, 0x65, 0x63, 0x75, 0x74,
-	0x65, 0x43, 0x6f, 0x6d, 0x6d, 0x61, 0x6e, 0x64, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a,
-	0x40, 0x2e, 0x69, 0x6f, 0x2e, 0x64, 0x65, 0x65, 0x70, 0x68, 0x61, 0x76, 0x65, 0x6e, 0x2e, 0x70,
+	0x65, 0x43, 0x6f, 0x6d, 0x6d, 0x61, 0x6e, 0x64, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65,
+	0x22, 0x00, 0x12, 0x92, 0x01, 0x0a, 0x0d, 0x43, 0x61, 0x6e, 0x63, 0x65, 0x6c, 0x43, 0x6f, 0x6d,
+	0x6d, 0x61, 0x6e, 0x64, 0x12, 0x3e, 0x2e, 0x69, 0x6f, 0x2e, 0x64, 0x65, 0x65, 0x70, 0x68, 0x61,
+	0x76, 0x65, 0x6e, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x62, 0x61, 0x63, 0x6b, 0x70, 0x6c,
+	0x61, 0x6e, 0x65, 0x2e, 0x73, 0x63, 0x72, 0x69, 0x70, 0x74, 0x2e, 0x67, 0x72, 0x70, 0x63, 0x2e,
+	0x43, 0x61, 0x6e, 0x63, 0x65, 0x6c, 0x43, 0x6f, 0x6d, 0x6d, 0x61, 0x6e, 0x64, 0x52, 0x65, 0x71,
+	0x75, 0x65, 0x73, 0x74, 0x1a, 0x3f, 0x2e, 0x69, 0x6f, 0x2e, 0x64, 0x65, 0x65, 0x70, 0x68, 0x61,
+	0x76, 0x65, 0x6e, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x62, 0x61, 0x63, 0x6b, 0x70, 0x6c,
+	0x61, 0x6e, 0x65, 0x2e, 0x73, 0x63, 0x72, 0x69, 0x70, 0x74, 0x2e, 0x67, 0x72, 0x70, 0x63, 0x2e,
+	0x43, 0x61, 0x6e, 0x63, 0x65, 0x6c, 0x43, 0x6f, 0x6d, 0x6d, 0x61, 0x6e, 0x64, 0x52, 0x65, 0x73,
+	0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x00, 0x12, 0xa4, 0x01, 0x0a, 0x13, 0x42, 0x69, 0x6e, 0x64,
+	0x54, 0x61, 0x62, 0x6c, 0x65, 0x54, 0x6f, 0x56, 0x61, 0x72, 0x69, 0x61, 0x62, 0x6c, 0x65, 0x12,
+	0x44, 0x2e, 0x69, 0x6f, 0x2e, 0x64, 0x65, 0x65, 0x70, 0x68, 0x61, 0x76, 0x65, 0x6e, 0x2e, 0x70,
 	0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x62, 0x61, 0x63, 0x6b, 0x70, 0x6c, 0x61, 0x6e, 0x65, 0x2e, 0x73,
-	0x63, 0x72, 0x69, 0x70, 0x74, 0x2e, 0x67, 0x72, 0x70, 0x63, 0x2e, 0x45, 0x78, 0x65, 0x63, 0x75,
-	0x74, 0x65, 0x43, 0x6f, 0x6d, 0x6d, 0x61, 0x6e, 0x64, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73,
-	0x65, 0x22, 0x00, 0x12, 0x92, 0x01, 0x0a, 0x0d, 0x43, 0x61, 0x6e, 0x63, 0x65, 0x6c, 0x43, 0x6f,
-	0x6d, 0x6d, 0x61, 0x6e, 0x64, 0x12, 0x3e, 0x2e, 0x69, 0x6f, 0x2e, 0x64, 0x65, 0x65, 0x70, 0x68,
+	0x63, 0x72, 0x69, 0x70, 0x74, 0x2e, 0x67, 0x72, 0x70, 0x63, 0x2e, 0x42, 0x69, 0x6e, 0x64, 0x54,
+	0x61, 0x62, 0x6c, 0x65, 0x54, 0x6f, 0x56, 0x61, 0x72, 0x69, 0x61, 0x62, 0x6c, 0x65, 0x52, 0x65,
+	0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x45, 0x2e, 0x69, 0x6f, 0x2e, 0x64, 0x65, 0x65, 0x70, 0x68,
 	0x61, 0x76, 0x65, 0x6e, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x62, 0x61, 0x63, 0x6b, 0x70,
 	0x6c, 0x61, 0x6e, 0x65, 0x2e, 0x73, 0x63, 0x72, 0x69, 0x70, 0x74, 0x2e, 0x67, 0x72, 0x70, 0x63,
-	0x2e, 0x43, 0x61, 0x6e, 0x63, 0x65, 0x6c, 0x43, 0x6f, 0x6d, 0x6d, 0x61, 0x6e, 0x64, 0x52, 0x65,
-	0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x3f, 0x2e, 0x69, 0x6f, 0x2e, 0x64, 0x65, 0x65, 0x70, 0x68,
+	0x2e, 0x42, 0x69, 0x6e, 0x64, 0x54, 0x61, 0x62, 0x6c, 0x65, 0x54, 0x6f, 0x56, 0x61, 0x72, 0x69,
+	0x61, 0x62, 0x6c, 0x65, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x00, 0x12, 0x99,
+	0x01, 0x0a, 0x12, 0x41, 0x75, 0x74, 0x6f, 0x43, 0x6f, 0x6d, 0x70, 0x6c, 0x65, 0x74, 0x65, 0x53,
+	0x74, 0x72, 0x65, 0x61, 0x6d, 0x12, 0x3d, 0x2e, 0x69, 0x6f, 0x2e, 0x64, 0x65, 0x65, 0x70, 0x68,
 	0x61, 0x76, 0x65, 0x6e, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x62, 0x61, 0x63, 0x6b, 0x70,
 	0x6c, 0x61, 0x6e, 0x65, 0x2e, 0x73, 0x63, 0x72, 0x69, 0x70, 0x74, 0x2e, 0x67, 0x72, 0x70, 0x63,
-	0x2e, 0x43, 0x61, 0x6e, 0x63, 0x65, 0x6c, 0x43, 0x6f, 0x6d, 0x6d, 0x61, 0x6e, 0x64, 0x52, 0x65,
-	0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x00, 0x12, 0xa4, 0x01, 0x0a, 0x13, 0x42, 0x69, 0x6e,
-	0x64, 0x54, 0x61, 0x62, 0x6c, 0x65, 0x54, 0x6f, 0x56, 0x61, 0x72, 0x69, 0x61, 0x62, 0x6c, 0x65,
-	0x12, 0x44, 0x2e, 0x69, 0x6f, 0x2e, 0x64, 0x65, 0x65, 0x70, 0x68, 0x61, 0x76, 0x65, 0x6e, 0x2e,
-	0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x62, 0x61, 0x63, 0x6b, 0x70, 0x6c, 0x61, 0x6e, 0x65, 0x2e,
-	0x73, 0x63, 0x72, 0x69, 0x70, 0x74, 0x2e, 0x67, 0x72, 0x70, 0x63, 0x2e, 0x42, 0x69, 0x6e, 0x64,
-	0x54, 0x61, 0x62, 0x6c, 0x65, 0x54, 0x6f, 0x56, 0x61, 0x72, 0x69, 0x61, 0x62, 0x6c, 0x65, 0x52,
-	0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x45, 0x2e, 0x69, 0x6f, 0x2e, 0x64, 0x65, 0x65, 0x70,
-	0x68, 0x61, 0x76, 0x65, 0x6e, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x62, 0x61, 0x63, 0x6b,
-	0x70, 0x6c, 0x61, 0x6e, 0x65, 0x2e, 0x73, 0x63, 0x72, 0x69, 0x70, 0x74, 0x2e, 0x67, 0x72, 0x70,
-	0x63, 0x2e, 0x42, 0x69, 0x6e, 0x64, 0x54, 0x61, 0x62, 0x6c, 0x65, 0x54, 0x6f, 0x56, 0x61, 0x72,
-	0x69, 0x61, 0x62, 0x6c, 0x65, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x00, 0x12,
-	0x99, 0x01, 0x0a, 0x12, 0x41, 0x75, 0x74, 0x6f, 0x43, 0x6f, 0x6d, 0x70, 0x6c, 0x65, 0x74, 0x65,
-	0x53, 0x74, 0x72, 0x65, 0x61, 0x6d, 0x12, 0x3d, 0x2e, 0x69, 0x6f, 0x2e, 0x64, 0x65, 0x65, 0x70,
+	0x2e, 0x41, 0x75, 0x74, 0x6f, 0x43, 0x6f, 0x6d, 0x70, 0x6c, 0x65, 0x74, 0x65, 0x52, 0x65, 0x71,
+	0x75, 0x65, 0x73, 0x74, 0x1a, 0x3e, 0x2e, 0x69, 0x6f, 0x2e, 0x64, 0x65, 0x65, 0x70, 0x68, 0x61,
+	0x76, 0x65, 0x6e, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x62, 0x61, 0x63, 0x6b, 0x70, 0x6c,
+	0x61, 0x6e, 0x65, 0x2e, 0x73, 0x63, 0x72, 0x69, 0x70, 0x74, 0x2e, 0x67, 0x72, 0x70, 0x63, 0x2e,
+	0x41, 0x75, 0x74, 0x6f, 0x43, 0x6f, 0x6d, 0x70, 0x6c, 0x65, 0x74, 0x65, 0x52, 0x65, 0x73, 0x70,
+	0x6f, 0x6e, 0x73, 0x65, 0x22, 0x00, 0x28, 0x01, 0x30, 0x01, 0x12, 0xa1, 0x01, 0x0a, 0x12, 0x43,
+	0x61, 0x6e, 0x63, 0x65, 0x6c, 0x41, 0x75, 0x74, 0x6f, 0x43, 0x6f, 0x6d, 0x70, 0x6c, 0x65, 0x74,
+	0x65, 0x12, 0x43, 0x2e, 0x69, 0x6f, 0x2e, 0x64, 0x65, 0x65, 0x70, 0x68, 0x61, 0x76, 0x65, 0x6e,
+	0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x62, 0x61, 0x63, 0x6b, 0x70, 0x6c, 0x61, 0x6e, 0x65,
+	0x2e, 0x73, 0x63, 0x72, 0x69, 0x70, 0x74, 0x2e, 0x67, 0x72, 0x70, 0x63, 0x2e, 0x43, 0x61, 0x6e,
+	0x63, 0x65, 0x6c, 0x41, 0x75, 0x74, 0x6f, 0x43, 0x6f, 0x6d, 0x70, 0x6c, 0x65, 0x74, 0x65, 0x52,
+	0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x44, 0x2e, 0x69, 0x6f, 0x2e, 0x64, 0x65, 0x65, 0x70,
 	0x68, 0x61, 0x76, 0x65, 0x6e, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x62, 0x61, 0x63, 0x6b,
 	0x70, 0x6c, 0x61, 0x6e, 0x65, 0x2e, 0x73, 0x63, 0x72, 0x69, 0x70, 0x74, 0x2e, 0x67, 0x72, 0x70,
-	0x63, 0x2e, 0x41, 0x75, 0x74, 0x6f, 0x43, 0x6f, 0x6d, 0x70, 0x6c, 0x65, 0x74, 0x65, 0x52, 0x65,
-	0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x3e, 0x2e, 0x69, 0x6f, 0x2e, 0x64, 0x65, 0x65, 0x70, 0x68,
-	0x61, 0x76, 0x65, 0x6e, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x62, 0x61, 0x63, 0x6b, 0x70,
-	0x6c, 0x61, 0x6e, 0x65, 0x2e, 0x73, 0x63, 0x72, 0x69, 0x70, 0x74, 0x2e, 0x67, 0x72, 0x70, 0x63,
-	0x2e, 0x41, 0x75, 0x74, 0x6f, 0x43, 0x6f, 0x6d, 0x70, 0x6c, 0x65, 0x74, 0x65, 0x52, 0x65, 0x73,
-	0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x00, 0x28, 0x01, 0x30, 0x01, 0x12, 0xa1, 0x01, 0x0a, 0x12,
-	0x43, 0x61, 0x6e, 0x63, 0x65, 0x6c, 0x41, 0x75, 0x74, 0x6f, 0x43, 0x6f, 0x6d, 0x70, 0x6c, 0x65,
-	0x74, 0x65, 0x12, 0x43, 0x2e, 0x69, 0x6f, 0x2e, 0x64, 0x65, 0x65, 0x70, 0x68, 0x61, 0x76, 0x65,
-	0x6e, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x62, 0x61, 0x63, 0x6b, 0x70, 0x6c, 0x61, 0x6e,
-	0x65, 0x2e, 0x73, 0x63, 0x72, 0x69, 0x70, 0x74, 0x2e, 0x67, 0x72, 0x70, 0x63, 0x2e, 0x43, 0x61,
-	0x6e, 0x63, 0x65, 0x6c, 0x41, 0x75, 0x74, 0x6f, 0x43, 0x6f, 0x6d, 0x70, 0x6c, 0x65, 0x74, 0x65,
-	0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x44, 0x2e, 0x69, 0x6f, 0x2e, 0x64, 0x65, 0x65,
-	0x70, 0x68, 0x61, 0x76, 0x65, 0x6e, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x62, 0x61, 0x63,
-	0x6b, 0x70, 0x6c, 0x61, 0x6e, 0x65, 0x2e, 0x73, 0x63, 0x72, 0x69, 0x70, 0x74, 0x2e, 0x67, 0x72,
-	0x70, 0x63, 0x2e, 0x43, 0x61, 0x6e, 0x63, 0x65, 0x6c, 0x41, 0x75, 0x74, 0x6f, 0x43, 0x6f, 0x6d,
-	0x70, 0x6c, 0x65, 0x74, 0x65, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x00, 0x12,
-	0x9b, 0x01, 0x0a, 0x16, 0x4f, 0x70, 0x65, 0x6e, 0x41, 0x75, 0x74, 0x6f, 0x43, 0x6f, 0x6d, 0x70,
-	0x6c, 0x65, 0x74, 0x65, 0x53, 0x74, 0x72, 0x65, 0x61, 0x6d, 0x12, 0x3d, 0x2e, 0x69, 0x6f, 0x2e,
-	0x64, 0x65, 0x65, 0x70, 0x68, 0x61, 0x76, 0x65, 0x6e, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e,
-	0x62, 0x61, 0x63, 0x6b, 0x70, 0x6c, 0x61, 0x6e, 0x65, 0x2e, 0x73, 0x63, 0x72, 0x69, 0x70, 0x74,
-	0x2e, 0x67, 0x72, 0x70, 0x63, 0x2e, 0x41, 0x75, 0x74, 0x6f, 0x43, 0x6f, 0x6d, 0x70, 0x6c, 0x65,
-	0x74, 0x65, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x3e, 0x2e, 0x69, 0x6f, 0x2e, 0x64,
+	0x63, 0x2e, 0x43, 0x61, 0x6e, 0x63, 0x65, 0x6c, 0x41, 0x75, 0x74, 0x6f, 0x43, 0x6f, 0x6d, 0x70,
+	0x6c, 0x65, 0x74, 0x65, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x00, 0x12, 0x9b,
+	0x01, 0x0a, 0x16, 0x4f, 0x70, 0x65, 0x6e, 0x41, 0x75, 0x74, 0x6f, 0x43, 0x6f, 0x6d, 0x70, 0x6c,
+	0x65, 0x74, 0x65, 0x53, 0x74, 0x72, 0x65, 0x61, 0x6d, 0x12, 0x3d, 0x2e, 0x69, 0x6f, 0x2e, 0x64,
 	0x65, 0x65, 0x70, 0x68, 0x61, 0x76, 0x65, 0x6e, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x62,
 	0x61, 0x63, 0x6b, 0x70, 0x6c, 0x61, 0x6e, 0x65, 0x2e, 0x73, 0x63, 0x72, 0x69, 0x70, 0x74, 0x2e,
 	0x67, 0x72, 0x70, 0x63, 0x2e, 0x41, 0x75, 0x74, 0x6f, 0x43, 0x6f, 0x6d, 0x70, 0x6c, 0x65, 0x74,
-	0x65, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x00, 0x30, 0x01, 0x12, 0x98, 0x01,
-	0x0a, 0x16, 0x4e, 0x65, 0x78, 0x74, 0x41, 0x75, 0x74, 0x6f, 0x43, 0x6f, 0x6d, 0x70, 0x6c, 0x65,
-	0x74, 0x65, 0x53, 0x74, 0x72, 0x65, 0x61, 0x6d, 0x12, 0x3d, 0x2e, 0x69, 0x6f, 0x2e, 0x64, 0x65,
+	0x65, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x3e, 0x2e, 0x69, 0x6f, 0x2e, 0x64, 0x65,
 	0x65, 0x70, 0x68, 0x61, 0x76, 0x65, 0x6e, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x62, 0x61,
 	0x63, 0x6b, 0x70, 0x6c, 0x61, 0x6e, 0x65, 0x2e, 0x73, 0x63, 0x72, 0x69, 0x70, 0x74, 0x2e, 0x67,
 	0x72, 0x70, 0x63, 0x2e, 0x41, 0x75, 0x74, 0x6f, 0x43, 0x6f, 0x6d, 0x70, 0x6c, 0x65, 0x74, 0x65,
-	0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x3d, 0x2e, 0x69, 0x6f, 0x2e, 0x64, 0x65, 0x65,
+	0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x00, 0x30, 0x01, 0x12, 0x98, 0x01, 0x0a,
+	0x16, 0x4e, 0x65, 0x78, 0x74, 0x41, 0x75, 0x74, 0x6f, 0x43, 0x6f, 0x6d, 0x70, 0x6c, 0x65, 0x74,
+	0x65, 0x53, 0x74, 0x72, 0x65, 0x61, 0x6d, 0x12, 0x3d, 0x2e, 0x69, 0x6f, 0x2e, 0x64, 0x65, 0x65,
 	0x70, 0x68, 0x61, 0x76, 0x65, 0x6e, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x62, 0x61, 0x63,
 	0x6b, 0x70, 0x6c, 0x61, 0x6e, 0x65, 0x2e, 0x73, 0x63, 0x72, 0x69, 0x70, 0x74, 0x2e, 0x67, 0x72,
-	0x70, 0x63, 0x2e, 0x42, 0x72, 0x6f, 0x77, 0x73, 0x65, 0x72, 0x4e, 0x65, 0x78, 0x74, 0x52, 0x65,
-	0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x00, 0x42, 0x43, 0x48, 0x01, 0x50, 0x01, 0x5a, 0x3d,
-	0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x64, 0x65, 0x65, 0x70, 0x68,
-	0x61, 0x76, 0x65, 0x6e, 0x2f, 0x64, 0x65, 0x65, 0x70, 0x68, 0x61, 0x76, 0x65, 0x6e, 0x2d, 0x63,
-	0x6f, 0x72, 0x65, 0x2f, 0x67, 0x6f, 0x2f, 0x69, 0x6e, 0x74, 0x65, 0x72, 0x6e, 0x61, 0x6c, 0x2f,
-	0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2f, 0x63, 0x6f, 0x6e, 0x73, 0x6f, 0x6c, 0x65, 0x62, 0x06, 0x70,
-	0x72, 0x6f, 0x74, 0x6f, 0x33,
+	0x70, 0x63, 0x2e, 0x41, 0x75, 0x74, 0x6f, 0x43, 0x6f, 0x6d, 0x70, 0x6c, 0x65, 0x74, 0x65, 0x52,
+	0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x3d, 0x2e, 0x69, 0x6f, 0x2e, 0x64, 0x65, 0x65, 0x70,
+	0x68, 0x61, 0x76, 0x65, 0x6e, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x62, 0x61, 0x63, 0x6b,
+	0x70, 0x6c, 0x61, 0x6e, 0x65, 0x2e, 0x73, 0x63, 0x72, 0x69, 0x70, 0x74, 0x2e, 0x67, 0x72, 0x70,
+	0x63, 0x2e, 0x42, 0x72, 0x6f, 0x77, 0x73, 0x65, 0x72, 0x4e, 0x65, 0x78, 0x74, 0x52, 0x65, 0x73,
+	0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x00, 0x42, 0x43, 0x48, 0x01, 0x50, 0x01, 0x5a, 0x3d, 0x67,
+	0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x64, 0x65, 0x65, 0x70, 0x68, 0x61,
+	0x76, 0x65, 0x6e, 0x2f, 0x64, 0x65, 0x65, 0x70, 0x68, 0x61, 0x76, 0x65, 0x6e, 0x2d, 0x63, 0x6f,
+	0x72, 0x65, 0x2f, 0x67, 0x6f, 0x2f, 0x69, 0x6e, 0x74, 0x65, 0x72, 0x6e, 0x61, 0x6c, 0x2f, 0x70,
+	0x72, 0x6f, 0x74, 0x6f, 0x2f, 0x63, 0x6f, 0x6e, 0x73, 0x6f, 0x6c, 0x65, 0x62, 0x06, 0x70, 0x72,
+	0x6f, 0x74, 0x6f, 0x33,
 }
 
 var (
-	file_deephaven_proto_console_proto_rawDescOnce sync.Once
-	file_deephaven_proto_console_proto_rawDescData = file_deephaven_proto_console_proto_rawDesc
+	file_deephaven_core_proto_console_proto_rawDescOnce sync.Once
+	file_deephaven_core_proto_console_proto_rawDescData = file_deephaven_core_proto_console_proto_rawDesc
 )
 
-func file_deephaven_proto_console_proto_rawDescGZIP() []byte {
-	file_deephaven_proto_console_proto_rawDescOnce.Do(func() {
-		file_deephaven_proto_console_proto_rawDescData = protoimpl.X.CompressGZIP(file_deephaven_proto_console_proto_rawDescData)
+func file_deephaven_core_proto_console_proto_rawDescGZIP() []byte {
+	file_deephaven_core_proto_console_proto_rawDescOnce.Do(func() {
+		file_deephaven_core_proto_console_proto_rawDescData = protoimpl.X.CompressGZIP(file_deephaven_core_proto_console_proto_rawDescData)
 	})
-	return file_deephaven_proto_console_proto_rawDescData
+	return file_deephaven_core_proto_console_proto_rawDescData
 }
 
-var file_deephaven_proto_console_proto_enumTypes = make([]protoimpl.EnumInfo, 9)
-var file_deephaven_proto_console_proto_msgTypes = make([]protoimpl.MessageInfo, 60)
-var file_deephaven_proto_console_proto_goTypes = []interface{}{
+var file_deephaven_core_proto_console_proto_enumTypes = make([]protoimpl.EnumInfo, 9)
+var file_deephaven_core_proto_console_proto_msgTypes = make([]protoimpl.MessageInfo, 60)
+var file_deephaven_core_proto_console_proto_goTypes = []interface{}{
 	(Diagnostic_DiagnosticSeverity)(0),                                 // 0: io.deephaven.proto.backplane.script.grpc.Diagnostic.DiagnosticSeverity
 	(Diagnostic_DiagnosticTag)(0),                                      // 1: io.deephaven.proto.backplane.script.grpc.Diagnostic.DiagnosticTag
 	(FigureDescriptor_SeriesPlotStyle)(0),                              // 2: io.deephaven.proto.backplane.script.grpc.FigureDescriptor.SeriesPlotStyle
@@ -6158,7 +6159,7 @@ var file_deephaven_proto_console_proto_goTypes = []interface{}{
 	(*ticket.Ticket)(nil),                                              // 69: io.deephaven.proto.backplane.grpc.Ticket
 	(*application.FieldsChangeUpdate)(nil),                             // 70: io.deephaven.proto.backplane.grpc.FieldsChangeUpdate
 }
-var file_deephaven_proto_console_proto_depIdxs = []int32{
+var file_deephaven_core_proto_console_proto_depIdxs = []int32{
 	69,  // 0: io.deephaven.proto.backplane.script.grpc.StartConsoleRequest.result_id:type_name -> io.deephaven.proto.backplane.grpc.Ticket
 	69,  // 1: io.deephaven.proto.backplane.script.grpc.StartConsoleResponse.result_id:type_name -> io.deephaven.proto.backplane.grpc.Ticket
 	69,  // 2: io.deephaven.proto.backplane.script.grpc.ExecuteCommandRequest.console_id:type_name -> io.deephaven.proto.backplane.grpc.Ticket
@@ -6280,13 +6281,13 @@ var file_deephaven_proto_console_proto_depIdxs = []int32{
 	0,   // [0:92] is the sub-list for field type_name
 }
 
-func init() { file_deephaven_proto_console_proto_init() }
-func file_deephaven_proto_console_proto_init() {
-	if File_deephaven_proto_console_proto != nil {
+func init() { file_deephaven_core_proto_console_proto_init() }
+func file_deephaven_core_proto_console_proto_init() {
+	if File_deephaven_core_proto_console_proto != nil {
 		return
 	}
 	if !protoimpl.UnsafeEnabled {
-		file_deephaven_proto_console_proto_msgTypes[0].Exporter = func(v interface{}, i int) interface{} {
+		file_deephaven_core_proto_console_proto_msgTypes[0].Exporter = func(v interface{}, i int) interface{} {
 			switch v := v.(*GetConsoleTypesRequest); i {
 			case 0:
 				return &v.state
@@ -6298,7 +6299,7 @@ func file_deephaven_proto_console_proto_init() {
 				return nil
 			}
 		}
-		file_deephaven_proto_console_proto_msgTypes[1].Exporter = func(v interface{}, i int) interface{} {
+		file_deephaven_core_proto_console_proto_msgTypes[1].Exporter = func(v interface{}, i int) interface{} {
 			switch v := v.(*GetConsoleTypesResponse); i {
 			case 0:
 				return &v.state
@@ -6310,7 +6311,7 @@ func file_deephaven_proto_console_proto_init() {
 				return nil
 			}
 		}
-		file_deephaven_proto_console_proto_msgTypes[2].Exporter = func(v interface{}, i int) interface{} {
+		file_deephaven_core_proto_console_proto_msgTypes[2].Exporter = func(v interface{}, i int) interface{} {
 			switch v := v.(*StartConsoleRequest); i {
 			case 0:
 				return &v.state
@@ -6322,7 +6323,7 @@ func file_deephaven_proto_console_proto_init() {
 				return nil
 			}
 		}
-		file_deephaven_proto_console_proto_msgTypes[3].Exporter = func(v interface{}, i int) interface{} {
+		file_deephaven_core_proto_console_proto_msgTypes[3].Exporter = func(v interface{}, i int) interface{} {
 			switch v := v.(*StartConsoleResponse); i {
 			case 0:
 				return &v.state
@@ -6334,7 +6335,7 @@ func file_deephaven_proto_console_proto_init() {
 				return nil
 			}
 		}
-		file_deephaven_proto_console_proto_msgTypes[4].Exporter = func(v interface{}, i int) interface{} {
+		file_deephaven_core_proto_console_proto_msgTypes[4].Exporter = func(v interface{}, i int) interface{} {
 			switch v := v.(*GetHeapInfoRequest); i {
 			case 0:
 				return &v.state
@@ -6346,7 +6347,7 @@ func file_deephaven_proto_console_proto_init() {
 				return nil
 			}
 		}
-		file_deephaven_proto_console_proto_msgTypes[5].Exporter = func(v interface{}, i int) interface{} {
+		file_deephaven_core_proto_console_proto_msgTypes[5].Exporter = func(v interface{}, i int) interface{} {
 			switch v := v.(*GetHeapInfoResponse); i {
 			case 0:
 				return &v.state
@@ -6358,7 +6359,7 @@ func file_deephaven_proto_console_proto_init() {
 				return nil
 			}
 		}
-		file_deephaven_proto_console_proto_msgTypes[6].Exporter = func(v interface{}, i int) interface{} {
+		file_deephaven_core_proto_console_proto_msgTypes[6].Exporter = func(v interface{}, i int) interface{} {
 			switch v := v.(*LogSubscriptionRequest); i {
 			case 0:
 				return &v.state
@@ -6370,7 +6371,7 @@ func file_deephaven_proto_console_proto_init() {
 				return nil
 			}
 		}
-		file_deephaven_proto_console_proto_msgTypes[7].Exporter = func(v interface{}, i int) interface{} {
+		file_deephaven_core_proto_console_proto_msgTypes[7].Exporter = func(v interface{}, i int) interface{} {
 			switch v := v.(*LogSubscriptionData); i {
 			case 0:
 				return &v.state
@@ -6382,7 +6383,7 @@ func file_deephaven_proto_console_proto_init() {
 				return nil
 			}
 		}
-		file_deephaven_proto_console_proto_msgTypes[8].Exporter = func(v interface{}, i int) interface{} {
+		file_deephaven_core_proto_console_proto_msgTypes[8].Exporter = func(v interface{}, i int) interface{} {
 			switch v := v.(*ExecuteCommandRequest); i {
 			case 0:
 				return &v.state
@@ -6394,7 +6395,7 @@ func file_deephaven_proto_console_proto_init() {
 				return nil
 			}
 		}
-		file_deephaven_proto_console_proto_msgTypes[9].Exporter = func(v interface{}, i int) interface{} {
+		file_deephaven_core_proto_console_proto_msgTypes[9].Exporter = func(v interface{}, i int) interface{} {
 			switch v := v.(*ExecuteCommandResponse); i {
 			case 0:
 				return &v.state
@@ -6406,7 +6407,7 @@ func file_deephaven_proto_console_proto_init() {
 				return nil
 			}
 		}
-		file_deephaven_proto_console_proto_msgTypes[10].Exporter = func(v interface{}, i int) interface{} {
+		file_deephaven_core_proto_console_proto_msgTypes[10].Exporter = func(v interface{}, i int) interface{} {
 			switch v := v.(*BindTableToVariableRequest); i {
 			case 0:
 				return &v.state
@@ -6418,7 +6419,7 @@ func file_deephaven_proto_console_proto_init() {
 				return nil
 			}
 		}
-		file_deephaven_proto_console_proto_msgTypes[11].Exporter = func(v interface{}, i int) interface{} {
+		file_deephaven_core_proto_console_proto_msgTypes[11].Exporter = func(v interface{}, i int) interface{} {
 			switch v := v.(*BindTableToVariableResponse); i {
 			case 0:
 				return &v.state
@@ -6430,7 +6431,7 @@ func file_deephaven_proto_console_proto_init() {
 				return nil
 			}
 		}
-		file_deephaven_proto_console_proto_msgTypes[12].Exporter = func(v interface{}, i int) interface{} {
+		file_deephaven_core_proto_console_proto_msgTypes[12].Exporter = func(v interface{}, i int) interface{} {
 			switch v := v.(*CancelCommandRequest); i {
 			case 0:
 				return &v.state
@@ -6442,7 +6443,7 @@ func file_deephaven_proto_console_proto_init() {
 				return nil
 			}
 		}
-		file_deephaven_proto_console_proto_msgTypes[13].Exporter = func(v interface{}, i int) interface{} {
+		file_deephaven_core_proto_console_proto_msgTypes[13].Exporter = func(v interface{}, i int) interface{} {
 			switch v := v.(*CancelCommandResponse); i {
 			case 0:
 				return &v.state
@@ -6454,7 +6455,7 @@ func file_deephaven_proto_console_proto_init() {
 				return nil
 			}
 		}
-		file_deephaven_proto_console_proto_msgTypes[14].Exporter = func(v interface{}, i int) interface{} {
+		file_deephaven_core_proto_console_proto_msgTypes[14].Exporter = func(v interface{}, i int) interface{} {
 			switch v := v.(*CancelAutoCompleteRequest); i {
 			case 0:
 				return &v.state
@@ -6466,7 +6467,7 @@ func file_deephaven_proto_console_proto_init() {
 				return nil
 			}
 		}
-		file_deephaven_proto_console_proto_msgTypes[15].Exporter = func(v interface{}, i int) interface{} {
+		file_deephaven_core_proto_console_proto_msgTypes[15].Exporter = func(v interface{}, i int) interface{} {
 			switch v := v.(*CancelAutoCompleteResponse); i {
 			case 0:
 				return &v.state
@@ -6478,7 +6479,7 @@ func file_deephaven_proto_console_proto_init() {
 				return nil
 			}
 		}
-		file_deephaven_proto_console_proto_msgTypes[16].Exporter = func(v interface{}, i int) interface{} {
+		file_deephaven_core_proto_console_proto_msgTypes[16].Exporter = func(v interface{}, i int) interface{} {
 			switch v := v.(*AutoCompleteRequest); i {
 			case 0:
 				return &v.state
@@ -6490,7 +6491,7 @@ func file_deephaven_proto_console_proto_init() {
 				return nil
 			}
 		}
-		file_deephaven_proto_console_proto_msgTypes[17].Exporter = func(v interface{}, i int) interface{} {
+		file_deephaven_core_proto_console_proto_msgTypes[17].Exporter = func(v interface{}, i int) interface{} {
 			switch v := v.(*AutoCompleteResponse); i {
 			case 0:
 				return &v.state
@@ -6502,7 +6503,7 @@ func file_deephaven_proto_console_proto_init() {
 				return nil
 			}
 		}
-		file_deephaven_proto_console_proto_msgTypes[18].Exporter = func(v interface{}, i int) interface{} {
+		file_deephaven_core_proto_console_proto_msgTypes[18].Exporter = func(v interface{}, i int) interface{} {
 			switch v := v.(*BrowserNextResponse); i {
 			case 0:
 				return &v.state
@@ -6514,7 +6515,7 @@ func file_deephaven_proto_console_proto_init() {
 				return nil
 			}
 		}
-		file_deephaven_proto_console_proto_msgTypes[19].Exporter = func(v interface{}, i int) interface{} {
+		file_deephaven_core_proto_console_proto_msgTypes[19].Exporter = func(v interface{}, i int) interface{} {
 			switch v := v.(*OpenDocumentRequest); i {
 			case 0:
 				return &v.state
@@ -6526,7 +6527,7 @@ func file_deephaven_proto_console_proto_init() {
 				return nil
 			}
 		}
-		file_deephaven_proto_console_proto_msgTypes[20].Exporter = func(v interface{}, i int) interface{} {
+		file_deephaven_core_proto_console_proto_msgTypes[20].Exporter = func(v interface{}, i int) interface{} {
 			switch v := v.(*TextDocumentItem); i {
 			case 0:
 				return &v.state
@@ -6538,7 +6539,7 @@ func file_deephaven_proto_console_proto_init() {
 				return nil
 			}
 		}
-		file_deephaven_proto_console_proto_msgTypes[21].Exporter = func(v interface{}, i int) interface{} {
+		file_deephaven_core_proto_console_proto_msgTypes[21].Exporter = func(v interface{}, i int) interface{} {
 			switch v := v.(*CloseDocumentRequest); i {
 			case 0:
 				return &v.state
@@ -6550,7 +6551,7 @@ func file_deephaven_proto_console_proto_init() {
 				return nil
 			}
 		}
-		file_deephaven_proto_console_proto_msgTypes[22].Exporter = func(v interface{}, i int) interface{} {
+		file_deephaven_core_proto_console_proto_msgTypes[22].Exporter = func(v interface{}, i int) interface{} {
 			switch v := v.(*ChangeDocumentRequest); i {
 			case 0:
 				return &v.state
@@ -6562,7 +6563,7 @@ func file_deephaven_proto_console_proto_init() {
 				return nil
 			}
 		}
-		file_deephaven_proto_console_proto_msgTypes[23].Exporter = func(v interface{}, i int) interface{} {
+		file_deephaven_core_proto_console_proto_msgTypes[23].Exporter = func(v interface{}, i int) interface{} {
 			switch v := v.(*DocumentRange); i {
 			case 0:
 				return &v.state
@@ -6574,7 +6575,7 @@ func file_deephaven_proto_console_proto_init() {
 				return nil
 			}
 		}
-		file_deephaven_proto_console_proto_msgTypes[24].Exporter = func(v interface{}, i int) interface{} {
+		file_deephaven_core_proto_console_proto_msgTypes[24].Exporter = func(v interface{}, i int) interface{} {
 			switch v := v.(*VersionedTextDocumentIdentifier); i {
 			case 0:
 				return &v.state
@@ -6586,7 +6587,7 @@ func file_deephaven_proto_console_proto_init() {
 				return nil
 			}
 		}
-		file_deephaven_proto_console_proto_msgTypes[25].Exporter = func(v interface{}, i int) interface{} {
+		file_deephaven_core_proto_console_proto_msgTypes[25].Exporter = func(v interface{}, i int) interface{} {
 			switch v := v.(*Position); i {
 			case 0:
 				return &v.state
@@ -6598,7 +6599,7 @@ func file_deephaven_proto_console_proto_init() {
 				return nil
 			}
 		}
-		file_deephaven_proto_console_proto_msgTypes[26].Exporter = func(v interface{}, i int) interface{} {
+		file_deephaven_core_proto_console_proto_msgTypes[26].Exporter = func(v interface{}, i int) interface{} {
 			switch v := v.(*MarkupContent); i {
 			case 0:
 				return &v.state
@@ -6610,7 +6611,7 @@ func file_deephaven_proto_console_proto_init() {
 				return nil
 			}
 		}
-		file_deephaven_proto_console_proto_msgTypes[27].Exporter = func(v interface{}, i int) interface{} {
+		file_deephaven_core_proto_console_proto_msgTypes[27].Exporter = func(v interface{}, i int) interface{} {
 			switch v := v.(*GetCompletionItemsRequest); i {
 			case 0:
 				return &v.state
@@ -6622,7 +6623,7 @@ func file_deephaven_proto_console_proto_init() {
 				return nil
 			}
 		}
-		file_deephaven_proto_console_proto_msgTypes[28].Exporter = func(v interface{}, i int) interface{} {
+		file_deephaven_core_proto_console_proto_msgTypes[28].Exporter = func(v interface{}, i int) interface{} {
 			switch v := v.(*CompletionContext); i {
 			case 0:
 				return &v.state
@@ -6634,7 +6635,7 @@ func file_deephaven_proto_console_proto_init() {
 				return nil
 			}
 		}
-		file_deephaven_proto_console_proto_msgTypes[29].Exporter = func(v interface{}, i int) interface{} {
+		file_deephaven_core_proto_console_proto_msgTypes[29].Exporter = func(v interface{}, i int) interface{} {
 			switch v := v.(*GetCompletionItemsResponse); i {
 			case 0:
 				return &v.state
@@ -6646,7 +6647,7 @@ func file_deephaven_proto_console_proto_init() {
 				return nil
 			}
 		}
-		file_deephaven_proto_console_proto_msgTypes[30].Exporter = func(v interface{}, i int) interface{} {
+		file_deephaven_core_proto_console_proto_msgTypes[30].Exporter = func(v interface{}, i int) interface{} {
 			switch v := v.(*CompletionItem); i {
 			case 0:
 				return &v.state
@@ -6658,7 +6659,7 @@ func file_deephaven_proto_console_proto_init() {
 				return nil
 			}
 		}
-		file_deephaven_proto_console_proto_msgTypes[31].Exporter = func(v interface{}, i int) interface{} {
+		file_deephaven_core_proto_console_proto_msgTypes[31].Exporter = func(v interface{}, i int) interface{} {
 			switch v := v.(*TextEdit); i {
 			case 0:
 				return &v.state
@@ -6670,7 +6671,7 @@ func file_deephaven_proto_console_proto_init() {
 				return nil
 			}
 		}
-		file_deephaven_proto_console_proto_msgTypes[32].Exporter = func(v interface{}, i int) interface{} {
+		file_deephaven_core_proto_console_proto_msgTypes[32].Exporter = func(v interface{}, i int) interface{} {
 			switch v := v.(*GetSignatureHelpRequest); i {
 			case 0:
 				return &v.state
@@ -6682,7 +6683,7 @@ func file_deephaven_proto_console_proto_init() {
 				return nil
 			}
 		}
-		file_deephaven_proto_console_proto_msgTypes[33].Exporter = func(v interface{}, i int) interface{} {
+		file_deephaven_core_proto_console_proto_msgTypes[33].Exporter = func(v interface{}, i int) interface{} {
 			switch v := v.(*SignatureHelpContext); i {
 			case 0:
 				return &v.state
@@ -6694,7 +6695,7 @@ func file_deephaven_proto_console_proto_init() {
 				return nil
 			}
 		}
-		file_deephaven_proto_console_proto_msgTypes[34].Exporter = func(v interface{}, i int) interface{} {
+		file_deephaven_core_proto_console_proto_msgTypes[34].Exporter = func(v interface{}, i int) interface{} {
 			switch v := v.(*GetSignatureHelpResponse); i {
 			case 0:
 				return &v.state
@@ -6706,7 +6707,7 @@ func file_deephaven_proto_console_proto_init() {
 				return nil
 			}
 		}
-		file_deephaven_proto_console_proto_msgTypes[35].Exporter = func(v interface{}, i int) interface{} {
+		file_deephaven_core_proto_console_proto_msgTypes[35].Exporter = func(v interface{}, i int) interface{} {
 			switch v := v.(*SignatureInformation); i {
 			case 0:
 				return &v.state
@@ -6718,7 +6719,7 @@ func file_deephaven_proto_console_proto_init() {
 				return nil
 			}
 		}
-		file_deephaven_proto_console_proto_msgTypes[36].Exporter = func(v interface{}, i int) interface{} {
+		file_deephaven_core_proto_console_proto_msgTypes[36].Exporter = func(v interface{}, i int) interface{} {
 			switch v := v.(*ParameterInformation); i {
 			case 0:
 				return &v.state
@@ -6730,7 +6731,7 @@ func file_deephaven_proto_console_proto_init() {
 				return nil
 			}
 		}
-		file_deephaven_proto_console_proto_msgTypes[37].Exporter = func(v interface{}, i int) interface{} {
+		file_deephaven_core_proto_console_proto_msgTypes[37].Exporter = func(v interface{}, i int) interface{} {
 			switch v := v.(*GetHoverRequest); i {
 			case 0:
 				return &v.state
@@ -6742,7 +6743,7 @@ func file_deephaven_proto_console_proto_init() {
 				return nil
 			}
 		}
-		file_deephaven_proto_console_proto_msgTypes[38].Exporter = func(v interface{}, i int) interface{} {
+		file_deephaven_core_proto_console_proto_msgTypes[38].Exporter = func(v interface{}, i int) interface{} {
 			switch v := v.(*GetHoverResponse); i {
 			case 0:
 				return &v.state
@@ -6754,7 +6755,7 @@ func file_deephaven_proto_console_proto_init() {
 				return nil
 			}
 		}
-		file_deephaven_proto_console_proto_msgTypes[39].Exporter = func(v interface{}, i int) interface{} {
+		file_deephaven_core_proto_console_proto_msgTypes[39].Exporter = func(v interface{}, i int) interface{} {
 			switch v := v.(*GetDiagnosticRequest); i {
 			case 0:
 				return &v.state
@@ -6766,7 +6767,7 @@ func file_deephaven_proto_console_proto_init() {
 				return nil
 			}
 		}
-		file_deephaven_proto_console_proto_msgTypes[40].Exporter = func(v interface{}, i int) interface{} {
+		file_deephaven_core_proto_console_proto_msgTypes[40].Exporter = func(v interface{}, i int) interface{} {
 			switch v := v.(*GetPullDiagnosticResponse); i {
 			case 0:
 				return &v.state
@@ -6778,7 +6779,7 @@ func file_deephaven_proto_console_proto_init() {
 				return nil
 			}
 		}
-		file_deephaven_proto_console_proto_msgTypes[41].Exporter = func(v interface{}, i int) interface{} {
+		file_deephaven_core_proto_console_proto_msgTypes[41].Exporter = func(v interface{}, i int) interface{} {
 			switch v := v.(*GetPublishDiagnosticResponse); i {
 			case 0:
 				return &v.state
@@ -6790,7 +6791,7 @@ func file_deephaven_proto_console_proto_init() {
 				return nil
 			}
 		}
-		file_deephaven_proto_console_proto_msgTypes[42].Exporter = func(v interface{}, i int) interface{} {
+		file_deephaven_core_proto_console_proto_msgTypes[42].Exporter = func(v interface{}, i int) interface{} {
 			switch v := v.(*Diagnostic); i {
 			case 0:
 				return &v.state
@@ -6802,7 +6803,7 @@ func file_deephaven_proto_console_proto_init() {
 				return nil
 			}
 		}
-		file_deephaven_proto_console_proto_msgTypes[43].Exporter = func(v interface{}, i int) interface{} {
+		file_deephaven_core_proto_console_proto_msgTypes[43].Exporter = func(v interface{}, i int) interface{} {
 			switch v := v.(*FigureDescriptor); i {
 			case 0:
 				return &v.state
@@ -6814,7 +6815,7 @@ func file_deephaven_proto_console_proto_init() {
 				return nil
 			}
 		}
-		file_deephaven_proto_console_proto_msgTypes[44].Exporter = func(v interface{}, i int) interface{} {
+		file_deephaven_core_proto_console_proto_msgTypes[44].Exporter = func(v interface{}, i int) interface{} {
 			switch v := v.(*ChangeDocumentRequest_TextDocumentContentChangeEvent); i {
 			case 0:
 				return &v.state
@@ -6826,7 +6827,7 @@ func file_deephaven_proto_console_proto_init() {
 				return nil
 			}
 		}
-		file_deephaven_proto_console_proto_msgTypes[45].Exporter = func(v interface{}, i int) interface{} {
+		file_deephaven_core_proto_console_proto_msgTypes[45].Exporter = func(v interface{}, i int) interface{} {
 			switch v := v.(*Diagnostic_CodeDescription); i {
 			case 0:
 				return &v.state
@@ -6838,7 +6839,7 @@ func file_deephaven_proto_console_proto_init() {
 				return nil
 			}
 		}
-		file_deephaven_proto_console_proto_msgTypes[46].Exporter = func(v interface{}, i int) interface{} {
+		file_deephaven_core_proto_console_proto_msgTypes[46].Exporter = func(v interface{}, i int) interface{} {
 			switch v := v.(*FigureDescriptor_ChartDescriptor); i {
 			case 0:
 				return &v.state
@@ -6850,7 +6851,7 @@ func file_deephaven_proto_console_proto_init() {
 				return nil
 			}
 		}
-		file_deephaven_proto_console_proto_msgTypes[47].Exporter = func(v interface{}, i int) interface{} {
+		file_deephaven_core_proto_console_proto_msgTypes[47].Exporter = func(v interface{}, i int) interface{} {
 			switch v := v.(*FigureDescriptor_SeriesDescriptor); i {
 			case 0:
 				return &v.state
@@ -6862,7 +6863,7 @@ func file_deephaven_proto_console_proto_init() {
 				return nil
 			}
 		}
-		file_deephaven_proto_console_proto_msgTypes[48].Exporter = func(v interface{}, i int) interface{} {
+		file_deephaven_core_proto_console_proto_msgTypes[48].Exporter = func(v interface{}, i int) interface{} {
 			switch v := v.(*FigureDescriptor_MultiSeriesDescriptor); i {
 			case 0:
 				return &v.state
@@ -6874,7 +6875,7 @@ func file_deephaven_proto_console_proto_init() {
 				return nil
 			}
 		}
-		file_deephaven_proto_console_proto_msgTypes[49].Exporter = func(v interface{}, i int) interface{} {
+		file_deephaven_core_proto_console_proto_msgTypes[49].Exporter = func(v interface{}, i int) interface{} {
 			switch v := v.(*FigureDescriptor_StringMapWithDefault); i {
 			case 0:
 				return &v.state
@@ -6886,7 +6887,7 @@ func file_deephaven_proto_console_proto_init() {
 				return nil
 			}
 		}
-		file_deephaven_proto_console_proto_msgTypes[50].Exporter = func(v interface{}, i int) interface{} {
+		file_deephaven_core_proto_console_proto_msgTypes[50].Exporter = func(v interface{}, i int) interface{} {
 			switch v := v.(*FigureDescriptor_DoubleMapWithDefault); i {
 			case 0:
 				return &v.state
@@ -6898,7 +6899,7 @@ func file_deephaven_proto_console_proto_init() {
 				return nil
 			}
 		}
-		file_deephaven_proto_console_proto_msgTypes[51].Exporter = func(v interface{}, i int) interface{} {
+		file_deephaven_core_proto_console_proto_msgTypes[51].Exporter = func(v interface{}, i int) interface{} {
 			switch v := v.(*FigureDescriptor_BoolMapWithDefault); i {
 			case 0:
 				return &v.state
@@ -6910,7 +6911,7 @@ func file_deephaven_proto_console_proto_init() {
 				return nil
 			}
 		}
-		file_deephaven_proto_console_proto_msgTypes[52].Exporter = func(v interface{}, i int) interface{} {
+		file_deephaven_core_proto_console_proto_msgTypes[52].Exporter = func(v interface{}, i int) interface{} {
 			switch v := v.(*FigureDescriptor_AxisDescriptor); i {
 			case 0:
 				return &v.state
@@ -6922,7 +6923,7 @@ func file_deephaven_proto_console_proto_init() {
 				return nil
 			}
 		}
-		file_deephaven_proto_console_proto_msgTypes[53].Exporter = func(v interface{}, i int) interface{} {
+		file_deephaven_core_proto_console_proto_msgTypes[53].Exporter = func(v interface{}, i int) interface{} {
 			switch v := v.(*FigureDescriptor_BusinessCalendarDescriptor); i {
 			case 0:
 				return &v.state
@@ -6934,7 +6935,7 @@ func file_deephaven_proto_console_proto_init() {
 				return nil
 			}
 		}
-		file_deephaven_proto_console_proto_msgTypes[54].Exporter = func(v interface{}, i int) interface{} {
+		file_deephaven_core_proto_console_proto_msgTypes[54].Exporter = func(v interface{}, i int) interface{} {
 			switch v := v.(*FigureDescriptor_MultiSeriesSourceDescriptor); i {
 			case 0:
 				return &v.state
@@ -6946,7 +6947,7 @@ func file_deephaven_proto_console_proto_init() {
 				return nil
 			}
 		}
-		file_deephaven_proto_console_proto_msgTypes[55].Exporter = func(v interface{}, i int) interface{} {
+		file_deephaven_core_proto_console_proto_msgTypes[55].Exporter = func(v interface{}, i int) interface{} {
 			switch v := v.(*FigureDescriptor_SourceDescriptor); i {
 			case 0:
 				return &v.state
@@ -6958,7 +6959,7 @@ func file_deephaven_proto_console_proto_init() {
 				return nil
 			}
 		}
-		file_deephaven_proto_console_proto_msgTypes[56].Exporter = func(v interface{}, i int) interface{} {
+		file_deephaven_core_proto_console_proto_msgTypes[56].Exporter = func(v interface{}, i int) interface{} {
 			switch v := v.(*FigureDescriptor_OneClickDescriptor); i {
 			case 0:
 				return &v.state
@@ -6970,7 +6971,7 @@ func file_deephaven_proto_console_proto_init() {
 				return nil
 			}
 		}
-		file_deephaven_proto_console_proto_msgTypes[57].Exporter = func(v interface{}, i int) interface{} {
+		file_deephaven_core_proto_console_proto_msgTypes[57].Exporter = func(v interface{}, i int) interface{} {
 			switch v := v.(*FigureDescriptor_BusinessCalendarDescriptor_BusinessPeriod); i {
 			case 0:
 				return &v.state
@@ -6982,7 +6983,7 @@ func file_deephaven_proto_console_proto_init() {
 				return nil
 			}
 		}
-		file_deephaven_proto_console_proto_msgTypes[58].Exporter = func(v interface{}, i int) interface{} {
+		file_deephaven_core_proto_console_proto_msgTypes[58].Exporter = func(v interface{}, i int) interface{} {
 			switch v := v.(*FigureDescriptor_BusinessCalendarDescriptor_Holiday); i {
 			case 0:
 				return &v.state
@@ -6994,7 +6995,7 @@ func file_deephaven_proto_console_proto_init() {
 				return nil
 			}
 		}
-		file_deephaven_proto_console_proto_msgTypes[59].Exporter = func(v interface{}, i int) interface{} {
+		file_deephaven_core_proto_console_proto_msgTypes[59].Exporter = func(v interface{}, i int) interface{} {
 			switch v := v.(*FigureDescriptor_BusinessCalendarDescriptor_LocalDate); i {
 			case 0:
 				return &v.state
@@ -7007,7 +7008,7 @@ func file_deephaven_proto_console_proto_init() {
 			}
 		}
 	}
-	file_deephaven_proto_console_proto_msgTypes[16].OneofWrappers = []interface{}{
+	file_deephaven_core_proto_console_proto_msgTypes[16].OneofWrappers = []interface{}{
 		(*AutoCompleteRequest_OpenDocument)(nil),
 		(*AutoCompleteRequest_ChangeDocument)(nil),
 		(*AutoCompleteRequest_GetCompletionItems)(nil),
@@ -7016,44 +7017,44 @@ func file_deephaven_proto_console_proto_init() {
 		(*AutoCompleteRequest_GetDiagnostic)(nil),
 		(*AutoCompleteRequest_CloseDocument)(nil),
 	}
-	file_deephaven_proto_console_proto_msgTypes[17].OneofWrappers = []interface{}{
+	file_deephaven_core_proto_console_proto_msgTypes[17].OneofWrappers = []interface{}{
 		(*AutoCompleteResponse_CompletionItems)(nil),
 		(*AutoCompleteResponse_Signatures)(nil),
 		(*AutoCompleteResponse_Hover)(nil),
 		(*AutoCompleteResponse_Diagnostic)(nil),
 		(*AutoCompleteResponse_DiagnosticPublish)(nil),
 	}
-	file_deephaven_proto_console_proto_msgTypes[33].OneofWrappers = []interface{}{}
-	file_deephaven_proto_console_proto_msgTypes[34].OneofWrappers = []interface{}{}
-	file_deephaven_proto_console_proto_msgTypes[35].OneofWrappers = []interface{}{}
-	file_deephaven_proto_console_proto_msgTypes[39].OneofWrappers = []interface{}{}
-	file_deephaven_proto_console_proto_msgTypes[40].OneofWrappers = []interface{}{}
-	file_deephaven_proto_console_proto_msgTypes[41].OneofWrappers = []interface{}{}
-	file_deephaven_proto_console_proto_msgTypes[42].OneofWrappers = []interface{}{}
-	file_deephaven_proto_console_proto_msgTypes[43].OneofWrappers = []interface{}{}
-	file_deephaven_proto_console_proto_msgTypes[46].OneofWrappers = []interface{}{}
-	file_deephaven_proto_console_proto_msgTypes[47].OneofWrappers = []interface{}{}
-	file_deephaven_proto_console_proto_msgTypes[49].OneofWrappers = []interface{}{}
-	file_deephaven_proto_console_proto_msgTypes[50].OneofWrappers = []interface{}{}
-	file_deephaven_proto_console_proto_msgTypes[51].OneofWrappers = []interface{}{}
-	file_deephaven_proto_console_proto_msgTypes[52].OneofWrappers = []interface{}{}
+	file_deephaven_core_proto_console_proto_msgTypes[33].OneofWrappers = []interface{}{}
+	file_deephaven_core_proto_console_proto_msgTypes[34].OneofWrappers = []interface{}{}
+	file_deephaven_core_proto_console_proto_msgTypes[35].OneofWrappers = []interface{}{}
+	file_deephaven_core_proto_console_proto_msgTypes[39].OneofWrappers = []interface{}{}
+	file_deephaven_core_proto_console_proto_msgTypes[40].OneofWrappers = []interface{}{}
+	file_deephaven_core_proto_console_proto_msgTypes[41].OneofWrappers = []interface{}{}
+	file_deephaven_core_proto_console_proto_msgTypes[42].OneofWrappers = []interface{}{}
+	file_deephaven_core_proto_console_proto_msgTypes[43].OneofWrappers = []interface{}{}
+	file_deephaven_core_proto_console_proto_msgTypes[46].OneofWrappers = []interface{}{}
+	file_deephaven_core_proto_console_proto_msgTypes[47].OneofWrappers = []interface{}{}
+	file_deephaven_core_proto_console_proto_msgTypes[49].OneofWrappers = []interface{}{}
+	file_deephaven_core_proto_console_proto_msgTypes[50].OneofWrappers = []interface{}{}
+	file_deephaven_core_proto_console_proto_msgTypes[51].OneofWrappers = []interface{}{}
+	file_deephaven_core_proto_console_proto_msgTypes[52].OneofWrappers = []interface{}{}
 	type x struct{}
 	out := protoimpl.TypeBuilder{
 		File: protoimpl.DescBuilder{
 			GoPackagePath: reflect.TypeOf(x{}).PkgPath(),
-			RawDescriptor: file_deephaven_proto_console_proto_rawDesc,
+			RawDescriptor: file_deephaven_core_proto_console_proto_rawDesc,
 			NumEnums:      9,
 			NumMessages:   60,
 			NumExtensions: 0,
 			NumServices:   1,
 		},
-		GoTypes:           file_deephaven_proto_console_proto_goTypes,
-		DependencyIndexes: file_deephaven_proto_console_proto_depIdxs,
-		EnumInfos:         file_deephaven_proto_console_proto_enumTypes,
-		MessageInfos:      file_deephaven_proto_console_proto_msgTypes,
+		GoTypes:           file_deephaven_core_proto_console_proto_goTypes,
+		DependencyIndexes: file_deephaven_core_proto_console_proto_depIdxs,
+		EnumInfos:         file_deephaven_core_proto_console_proto_enumTypes,
+		MessageInfos:      file_deephaven_core_proto_console_proto_msgTypes,
 	}.Build()
-	File_deephaven_proto_console_proto = out.File
-	file_deephaven_proto_console_proto_rawDesc = nil
-	file_deephaven_proto_console_proto_goTypes = nil
-	file_deephaven_proto_console_proto_depIdxs = nil
+	File_deephaven_core_proto_console_proto = out.File
+	file_deephaven_core_proto_console_proto_rawDesc = nil
+	file_deephaven_core_proto_console_proto_goTypes = nil
+	file_deephaven_core_proto_console_proto_depIdxs = nil
 }
diff --git a/go/internal/proto/console/console_grpc.pb.go b/go/internal/proto/console/console_grpc.pb.go
index 9937a0df792..64827328495 100644
--- a/go/internal/proto/console/console_grpc.pb.go
+++ b/go/internal/proto/console/console_grpc.pb.go
@@ -2,7 +2,7 @@
 // versions:
 // - protoc-gen-go-grpc v1.2.0
 // - protoc             v4.25.3
-// source: deephaven/proto/console.proto
+// source: deephaven_core/proto/console.proto
 
 package console
 
@@ -568,5 +568,5 @@ var ConsoleService_ServiceDesc = grpc.ServiceDesc{
 			ServerStreams: true,
 		},
 	},
-	Metadata: "deephaven/proto/console.proto",
+	Metadata: "deephaven_core/proto/console.proto",
 }
diff --git a/go/internal/proto/hierarchicaltable/hierarchicaltable.pb.go b/go/internal/proto/hierarchicaltable/hierarchicaltable.pb.go
index 23f7fd6a7f0..a9b4d7112a1 100644
--- a/go/internal/proto/hierarchicaltable/hierarchicaltable.pb.go
+++ b/go/internal/proto/hierarchicaltable/hierarchicaltable.pb.go
@@ -5,7 +5,7 @@
 // versions:
 // 	protoc-gen-go v1.28.1
 // 	protoc        v4.25.3
-// source: deephaven/proto/hierarchicaltable.proto
+// source: deephaven_core/proto/hierarchicaltable.proto
 
 package hierarchicaltable
 
@@ -45,7 +45,7 @@ type RollupRequest struct {
 func (x *RollupRequest) Reset() {
 	*x = RollupRequest{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_deephaven_proto_hierarchicaltable_proto_msgTypes[0]
+		mi := &file_deephaven_core_proto_hierarchicaltable_proto_msgTypes[0]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -58,7 +58,7 @@ func (x *RollupRequest) String() string {
 func (*RollupRequest) ProtoMessage() {}
 
 func (x *RollupRequest) ProtoReflect() protoreflect.Message {
-	mi := &file_deephaven_proto_hierarchicaltable_proto_msgTypes[0]
+	mi := &file_deephaven_core_proto_hierarchicaltable_proto_msgTypes[0]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -71,7 +71,7 @@ func (x *RollupRequest) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use RollupRequest.ProtoReflect.Descriptor instead.
 func (*RollupRequest) Descriptor() ([]byte, []int) {
-	return file_deephaven_proto_hierarchicaltable_proto_rawDescGZIP(), []int{0}
+	return file_deephaven_core_proto_hierarchicaltable_proto_rawDescGZIP(), []int{0}
 }
 
 func (x *RollupRequest) GetResultRollupTableId() *ticket.Ticket {
@@ -118,7 +118,7 @@ type RollupResponse struct {
 func (x *RollupResponse) Reset() {
 	*x = RollupResponse{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_deephaven_proto_hierarchicaltable_proto_msgTypes[1]
+		mi := &file_deephaven_core_proto_hierarchicaltable_proto_msgTypes[1]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -131,7 +131,7 @@ func (x *RollupResponse) String() string {
 func (*RollupResponse) ProtoMessage() {}
 
 func (x *RollupResponse) ProtoReflect() protoreflect.Message {
-	mi := &file_deephaven_proto_hierarchicaltable_proto_msgTypes[1]
+	mi := &file_deephaven_core_proto_hierarchicaltable_proto_msgTypes[1]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -144,7 +144,7 @@ func (x *RollupResponse) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use RollupResponse.ProtoReflect.Descriptor instead.
 func (*RollupResponse) Descriptor() ([]byte, []int) {
-	return file_deephaven_proto_hierarchicaltable_proto_rawDescGZIP(), []int{1}
+	return file_deephaven_core_proto_hierarchicaltable_proto_rawDescGZIP(), []int{1}
 }
 
 type TreeRequest struct {
@@ -168,7 +168,7 @@ type TreeRequest struct {
 func (x *TreeRequest) Reset() {
 	*x = TreeRequest{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_deephaven_proto_hierarchicaltable_proto_msgTypes[2]
+		mi := &file_deephaven_core_proto_hierarchicaltable_proto_msgTypes[2]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -181,7 +181,7 @@ func (x *TreeRequest) String() string {
 func (*TreeRequest) ProtoMessage() {}
 
 func (x *TreeRequest) ProtoReflect() protoreflect.Message {
-	mi := &file_deephaven_proto_hierarchicaltable_proto_msgTypes[2]
+	mi := &file_deephaven_core_proto_hierarchicaltable_proto_msgTypes[2]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -194,7 +194,7 @@ func (x *TreeRequest) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use TreeRequest.ProtoReflect.Descriptor instead.
 func (*TreeRequest) Descriptor() ([]byte, []int) {
-	return file_deephaven_proto_hierarchicaltable_proto_rawDescGZIP(), []int{2}
+	return file_deephaven_core_proto_hierarchicaltable_proto_rawDescGZIP(), []int{2}
 }
 
 func (x *TreeRequest) GetResultTreeTableId() *ticket.Ticket {
@@ -241,7 +241,7 @@ type TreeResponse struct {
 func (x *TreeResponse) Reset() {
 	*x = TreeResponse{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_deephaven_proto_hierarchicaltable_proto_msgTypes[3]
+		mi := &file_deephaven_core_proto_hierarchicaltable_proto_msgTypes[3]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -254,7 +254,7 @@ func (x *TreeResponse) String() string {
 func (*TreeResponse) ProtoMessage() {}
 
 func (x *TreeResponse) ProtoReflect() protoreflect.Message {
-	mi := &file_deephaven_proto_hierarchicaltable_proto_msgTypes[3]
+	mi := &file_deephaven_core_proto_hierarchicaltable_proto_msgTypes[3]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -267,7 +267,7 @@ func (x *TreeResponse) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use TreeResponse.ProtoReflect.Descriptor instead.
 func (*TreeResponse) Descriptor() ([]byte, []int) {
-	return file_deephaven_proto_hierarchicaltable_proto_rawDescGZIP(), []int{3}
+	return file_deephaven_core_proto_hierarchicaltable_proto_rawDescGZIP(), []int{3}
 }
 
 type HierarchicalTableApplyRequest struct {
@@ -299,7 +299,7 @@ type HierarchicalTableApplyRequest struct {
 func (x *HierarchicalTableApplyRequest) Reset() {
 	*x = HierarchicalTableApplyRequest{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_deephaven_proto_hierarchicaltable_proto_msgTypes[4]
+		mi := &file_deephaven_core_proto_hierarchicaltable_proto_msgTypes[4]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -312,7 +312,7 @@ func (x *HierarchicalTableApplyRequest) String() string {
 func (*HierarchicalTableApplyRequest) ProtoMessage() {}
 
 func (x *HierarchicalTableApplyRequest) ProtoReflect() protoreflect.Message {
-	mi := &file_deephaven_proto_hierarchicaltable_proto_msgTypes[4]
+	mi := &file_deephaven_core_proto_hierarchicaltable_proto_msgTypes[4]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -325,7 +325,7 @@ func (x *HierarchicalTableApplyRequest) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use HierarchicalTableApplyRequest.ProtoReflect.Descriptor instead.
 func (*HierarchicalTableApplyRequest) Descriptor() ([]byte, []int) {
-	return file_deephaven_proto_hierarchicaltable_proto_rawDescGZIP(), []int{4}
+	return file_deephaven_core_proto_hierarchicaltable_proto_rawDescGZIP(), []int{4}
 }
 
 func (x *HierarchicalTableApplyRequest) GetResultHierarchicalTableId() *ticket.Ticket {
@@ -365,7 +365,7 @@ type HierarchicalTableApplyResponse struct {
 func (x *HierarchicalTableApplyResponse) Reset() {
 	*x = HierarchicalTableApplyResponse{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_deephaven_proto_hierarchicaltable_proto_msgTypes[5]
+		mi := &file_deephaven_core_proto_hierarchicaltable_proto_msgTypes[5]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -378,7 +378,7 @@ func (x *HierarchicalTableApplyResponse) String() string {
 func (*HierarchicalTableApplyResponse) ProtoMessage() {}
 
 func (x *HierarchicalTableApplyResponse) ProtoReflect() protoreflect.Message {
-	mi := &file_deephaven_proto_hierarchicaltable_proto_msgTypes[5]
+	mi := &file_deephaven_core_proto_hierarchicaltable_proto_msgTypes[5]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -391,7 +391,7 @@ func (x *HierarchicalTableApplyResponse) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use HierarchicalTableApplyResponse.ProtoReflect.Descriptor instead.
 func (*HierarchicalTableApplyResponse) Descriptor() ([]byte, []int) {
-	return file_deephaven_proto_hierarchicaltable_proto_rawDescGZIP(), []int{5}
+	return file_deephaven_core_proto_hierarchicaltable_proto_rawDescGZIP(), []int{5}
 }
 
 type HierarchicalTableDescriptor struct {
@@ -453,7 +453,7 @@ type HierarchicalTableDescriptor struct {
 func (x *HierarchicalTableDescriptor) Reset() {
 	*x = HierarchicalTableDescriptor{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_deephaven_proto_hierarchicaltable_proto_msgTypes[6]
+		mi := &file_deephaven_core_proto_hierarchicaltable_proto_msgTypes[6]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -466,7 +466,7 @@ func (x *HierarchicalTableDescriptor) String() string {
 func (*HierarchicalTableDescriptor) ProtoMessage() {}
 
 func (x *HierarchicalTableDescriptor) ProtoReflect() protoreflect.Message {
-	mi := &file_deephaven_proto_hierarchicaltable_proto_msgTypes[6]
+	mi := &file_deephaven_core_proto_hierarchicaltable_proto_msgTypes[6]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -479,7 +479,7 @@ func (x *HierarchicalTableDescriptor) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use HierarchicalTableDescriptor.ProtoReflect.Descriptor instead.
 func (*HierarchicalTableDescriptor) Descriptor() ([]byte, []int) {
-	return file_deephaven_proto_hierarchicaltable_proto_rawDescGZIP(), []int{6}
+	return file_deephaven_core_proto_hierarchicaltable_proto_rawDescGZIP(), []int{6}
 }
 
 func (x *HierarchicalTableDescriptor) GetSnapshotSchema() []byte {
@@ -517,7 +517,7 @@ type HierarchicalTableViewRequest struct {
 func (x *HierarchicalTableViewRequest) Reset() {
 	*x = HierarchicalTableViewRequest{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_deephaven_proto_hierarchicaltable_proto_msgTypes[7]
+		mi := &file_deephaven_core_proto_hierarchicaltable_proto_msgTypes[7]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -530,7 +530,7 @@ func (x *HierarchicalTableViewRequest) String() string {
 func (*HierarchicalTableViewRequest) ProtoMessage() {}
 
 func (x *HierarchicalTableViewRequest) ProtoReflect() protoreflect.Message {
-	mi := &file_deephaven_proto_hierarchicaltable_proto_msgTypes[7]
+	mi := &file_deephaven_core_proto_hierarchicaltable_proto_msgTypes[7]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -543,7 +543,7 @@ func (x *HierarchicalTableViewRequest) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use HierarchicalTableViewRequest.ProtoReflect.Descriptor instead.
 func (*HierarchicalTableViewRequest) Descriptor() ([]byte, []int) {
-	return file_deephaven_proto_hierarchicaltable_proto_rawDescGZIP(), []int{7}
+	return file_deephaven_core_proto_hierarchicaltable_proto_rawDescGZIP(), []int{7}
 }
 
 func (x *HierarchicalTableViewRequest) GetResultViewId() *ticket.Ticket {
@@ -623,7 +623,7 @@ type HierarchicalTableViewKeyTableDescriptor struct {
 func (x *HierarchicalTableViewKeyTableDescriptor) Reset() {
 	*x = HierarchicalTableViewKeyTableDescriptor{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_deephaven_proto_hierarchicaltable_proto_msgTypes[8]
+		mi := &file_deephaven_core_proto_hierarchicaltable_proto_msgTypes[8]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -636,7 +636,7 @@ func (x *HierarchicalTableViewKeyTableDescriptor) String() string {
 func (*HierarchicalTableViewKeyTableDescriptor) ProtoMessage() {}
 
 func (x *HierarchicalTableViewKeyTableDescriptor) ProtoReflect() protoreflect.Message {
-	mi := &file_deephaven_proto_hierarchicaltable_proto_msgTypes[8]
+	mi := &file_deephaven_core_proto_hierarchicaltable_proto_msgTypes[8]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -649,7 +649,7 @@ func (x *HierarchicalTableViewKeyTableDescriptor) ProtoReflect() protoreflect.Me
 
 // Deprecated: Use HierarchicalTableViewKeyTableDescriptor.ProtoReflect.Descriptor instead.
 func (*HierarchicalTableViewKeyTableDescriptor) Descriptor() ([]byte, []int) {
-	return file_deephaven_proto_hierarchicaltable_proto_rawDescGZIP(), []int{8}
+	return file_deephaven_core_proto_hierarchicaltable_proto_rawDescGZIP(), []int{8}
 }
 
 func (x *HierarchicalTableViewKeyTableDescriptor) GetKeyTableId() *ticket.Ticket {
@@ -675,7 +675,7 @@ type HierarchicalTableViewResponse struct {
 func (x *HierarchicalTableViewResponse) Reset() {
 	*x = HierarchicalTableViewResponse{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_deephaven_proto_hierarchicaltable_proto_msgTypes[9]
+		mi := &file_deephaven_core_proto_hierarchicaltable_proto_msgTypes[9]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -688,7 +688,7 @@ func (x *HierarchicalTableViewResponse) String() string {
 func (*HierarchicalTableViewResponse) ProtoMessage() {}
 
 func (x *HierarchicalTableViewResponse) ProtoReflect() protoreflect.Message {
-	mi := &file_deephaven_proto_hierarchicaltable_proto_msgTypes[9]
+	mi := &file_deephaven_core_proto_hierarchicaltable_proto_msgTypes[9]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -701,7 +701,7 @@ func (x *HierarchicalTableViewResponse) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use HierarchicalTableViewResponse.ProtoReflect.Descriptor instead.
 func (*HierarchicalTableViewResponse) Descriptor() ([]byte, []int) {
-	return file_deephaven_proto_hierarchicaltable_proto_rawDescGZIP(), []int{9}
+	return file_deephaven_core_proto_hierarchicaltable_proto_rawDescGZIP(), []int{9}
 }
 
 type HierarchicalTableSourceExportRequest struct {
@@ -718,7 +718,7 @@ type HierarchicalTableSourceExportRequest struct {
 func (x *HierarchicalTableSourceExportRequest) Reset() {
 	*x = HierarchicalTableSourceExportRequest{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_deephaven_proto_hierarchicaltable_proto_msgTypes[10]
+		mi := &file_deephaven_core_proto_hierarchicaltable_proto_msgTypes[10]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -731,7 +731,7 @@ func (x *HierarchicalTableSourceExportRequest) String() string {
 func (*HierarchicalTableSourceExportRequest) ProtoMessage() {}
 
 func (x *HierarchicalTableSourceExportRequest) ProtoReflect() protoreflect.Message {
-	mi := &file_deephaven_proto_hierarchicaltable_proto_msgTypes[10]
+	mi := &file_deephaven_core_proto_hierarchicaltable_proto_msgTypes[10]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -744,7 +744,7 @@ func (x *HierarchicalTableSourceExportRequest) ProtoReflect() protoreflect.Messa
 
 // Deprecated: Use HierarchicalTableSourceExportRequest.ProtoReflect.Descriptor instead.
 func (*HierarchicalTableSourceExportRequest) Descriptor() ([]byte, []int) {
-	return file_deephaven_proto_hierarchicaltable_proto_rawDescGZIP(), []int{10}
+	return file_deephaven_core_proto_hierarchicaltable_proto_rawDescGZIP(), []int{10}
 }
 
 func (x *HierarchicalTableSourceExportRequest) GetResultTableId() *ticket.Ticket {
@@ -761,216 +761,217 @@ func (x *HierarchicalTableSourceExportRequest) GetHierarchicalTableId() *ticket.
 	return nil
 }
 
-var File_deephaven_proto_hierarchicaltable_proto protoreflect.FileDescriptor
+var File_deephaven_core_proto_hierarchicaltable_proto protoreflect.FileDescriptor
 
-var file_deephaven_proto_hierarchicaltable_proto_rawDesc = []byte{
-	0x0a, 0x27, 0x64, 0x65, 0x65, 0x70, 0x68, 0x61, 0x76, 0x65, 0x6e, 0x2f, 0x70, 0x72, 0x6f, 0x74,
-	0x6f, 0x2f, 0x68, 0x69, 0x65, 0x72, 0x61, 0x72, 0x63, 0x68, 0x69, 0x63, 0x61, 0x6c, 0x74, 0x61,
-	0x62, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x12, 0x21, 0x69, 0x6f, 0x2e, 0x64, 0x65,
-	0x65, 0x70, 0x68, 0x61, 0x76, 0x65, 0x6e, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x62, 0x61,
-	0x63, 0x6b, 0x70, 0x6c, 0x61, 0x6e, 0x65, 0x2e, 0x67, 0x72, 0x70, 0x63, 0x1a, 0x1b, 0x64, 0x65,
-	0x65, 0x70, 0x68, 0x61, 0x76, 0x65, 0x6e, 0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2f, 0x74, 0x61,
-	0x62, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x1a, 0x1c, 0x64, 0x65, 0x65, 0x70, 0x68,
-	0x61, 0x76, 0x65, 0x6e, 0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2f, 0x74, 0x69, 0x63, 0x6b, 0x65,
-	0x74, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x22, 0xf3, 0x02, 0x0a, 0x0d, 0x52, 0x6f, 0x6c, 0x6c,
-	0x75, 0x70, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x5e, 0x0a, 0x16, 0x72, 0x65, 0x73,
-	0x75, 0x6c, 0x74, 0x5f, 0x72, 0x6f, 0x6c, 0x6c, 0x75, 0x70, 0x5f, 0x74, 0x61, 0x62, 0x6c, 0x65,
-	0x5f, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x29, 0x2e, 0x69, 0x6f, 0x2e, 0x64,
-	0x65, 0x65, 0x70, 0x68, 0x61, 0x76, 0x65, 0x6e, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x62,
-	0x61, 0x63, 0x6b, 0x70, 0x6c, 0x61, 0x6e, 0x65, 0x2e, 0x67, 0x72, 0x70, 0x63, 0x2e, 0x54, 0x69,
-	0x63, 0x6b, 0x65, 0x74, 0x52, 0x13, 0x72, 0x65, 0x73, 0x75, 0x6c, 0x74, 0x52, 0x6f, 0x6c, 0x6c,
-	0x75, 0x70, 0x54, 0x61, 0x62, 0x6c, 0x65, 0x49, 0x64, 0x12, 0x51, 0x0a, 0x0f, 0x73, 0x6f, 0x75,
-	0x72, 0x63, 0x65, 0x5f, 0x74, 0x61, 0x62, 0x6c, 0x65, 0x5f, 0x69, 0x64, 0x18, 0x02, 0x20, 0x01,
-	0x28, 0x0b, 0x32, 0x29, 0x2e, 0x69, 0x6f, 0x2e, 0x64, 0x65, 0x65, 0x70, 0x68, 0x61, 0x76, 0x65,
-	0x6e, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x62, 0x61, 0x63, 0x6b, 0x70, 0x6c, 0x61, 0x6e,
-	0x65, 0x2e, 0x67, 0x72, 0x70, 0x63, 0x2e, 0x54, 0x69, 0x63, 0x6b, 0x65, 0x74, 0x52, 0x0d, 0x73,
-	0x6f, 0x75, 0x72, 0x63, 0x65, 0x54, 0x61, 0x62, 0x6c, 0x65, 0x49, 0x64, 0x12, 0x52, 0x0a, 0x0c,
-	0x61, 0x67, 0x67, 0x72, 0x65, 0x67, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x18, 0x03, 0x20, 0x03,
-	0x28, 0x0b, 0x32, 0x2e, 0x2e, 0x69, 0x6f, 0x2e, 0x64, 0x65, 0x65, 0x70, 0x68, 0x61, 0x76, 0x65,
-	0x6e, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x62, 0x61, 0x63, 0x6b, 0x70, 0x6c, 0x61, 0x6e,
-	0x65, 0x2e, 0x67, 0x72, 0x70, 0x63, 0x2e, 0x41, 0x67, 0x67, 0x72, 0x65, 0x67, 0x61, 0x74, 0x69,
-	0x6f, 0x6e, 0x52, 0x0c, 0x61, 0x67, 0x67, 0x72, 0x65, 0x67, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x73,
-	0x12, 0x31, 0x0a, 0x14, 0x69, 0x6e, 0x63, 0x6c, 0x75, 0x64, 0x65, 0x5f, 0x63, 0x6f, 0x6e, 0x73,
-	0x74, 0x69, 0x74, 0x75, 0x65, 0x6e, 0x74, 0x73, 0x18, 0x04, 0x20, 0x01, 0x28, 0x08, 0x52, 0x13,
-	0x69, 0x6e, 0x63, 0x6c, 0x75, 0x64, 0x65, 0x43, 0x6f, 0x6e, 0x73, 0x74, 0x69, 0x74, 0x75, 0x65,
-	0x6e, 0x74, 0x73, 0x12, 0x28, 0x0a, 0x10, 0x67, 0x72, 0x6f, 0x75, 0x70, 0x5f, 0x62, 0x79, 0x5f,
-	0x63, 0x6f, 0x6c, 0x75, 0x6d, 0x6e, 0x73, 0x18, 0x05, 0x20, 0x03, 0x28, 0x09, 0x52, 0x0e, 0x67,
-	0x72, 0x6f, 0x75, 0x70, 0x42, 0x79, 0x43, 0x6f, 0x6c, 0x75, 0x6d, 0x6e, 0x73, 0x22, 0x10, 0x0a,
-	0x0e, 0x52, 0x6f, 0x6c, 0x6c, 0x75, 0x70, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22,
-	0xcc, 0x02, 0x0a, 0x0b, 0x54, 0x72, 0x65, 0x65, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12,
-	0x5a, 0x0a, 0x14, 0x72, 0x65, 0x73, 0x75, 0x6c, 0x74, 0x5f, 0x74, 0x72, 0x65, 0x65, 0x5f, 0x74,
-	0x61, 0x62, 0x6c, 0x65, 0x5f, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x29, 0x2e,
+var file_deephaven_core_proto_hierarchicaltable_proto_rawDesc = []byte{
+	0x0a, 0x2c, 0x64, 0x65, 0x65, 0x70, 0x68, 0x61, 0x76, 0x65, 0x6e, 0x5f, 0x63, 0x6f, 0x72, 0x65,
+	0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2f, 0x68, 0x69, 0x65, 0x72, 0x61, 0x72, 0x63, 0x68, 0x69,
+	0x63, 0x61, 0x6c, 0x74, 0x61, 0x62, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x12, 0x21,
 	0x69, 0x6f, 0x2e, 0x64, 0x65, 0x65, 0x70, 0x68, 0x61, 0x76, 0x65, 0x6e, 0x2e, 0x70, 0x72, 0x6f,
 	0x74, 0x6f, 0x2e, 0x62, 0x61, 0x63, 0x6b, 0x70, 0x6c, 0x61, 0x6e, 0x65, 0x2e, 0x67, 0x72, 0x70,
-	0x63, 0x2e, 0x54, 0x69, 0x63, 0x6b, 0x65, 0x74, 0x52, 0x11, 0x72, 0x65, 0x73, 0x75, 0x6c, 0x74,
-	0x54, 0x72, 0x65, 0x65, 0x54, 0x61, 0x62, 0x6c, 0x65, 0x49, 0x64, 0x12, 0x51, 0x0a, 0x0f, 0x73,
-	0x6f, 0x75, 0x72, 0x63, 0x65, 0x5f, 0x74, 0x61, 0x62, 0x6c, 0x65, 0x5f, 0x69, 0x64, 0x18, 0x02,
-	0x20, 0x01, 0x28, 0x0b, 0x32, 0x29, 0x2e, 0x69, 0x6f, 0x2e, 0x64, 0x65, 0x65, 0x70, 0x68, 0x61,
-	0x76, 0x65, 0x6e, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x62, 0x61, 0x63, 0x6b, 0x70, 0x6c,
-	0x61, 0x6e, 0x65, 0x2e, 0x67, 0x72, 0x70, 0x63, 0x2e, 0x54, 0x69, 0x63, 0x6b, 0x65, 0x74, 0x52,
-	0x0d, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x54, 0x61, 0x62, 0x6c, 0x65, 0x49, 0x64, 0x12, 0x2b,
-	0x0a, 0x11, 0x69, 0x64, 0x65, 0x6e, 0x74, 0x69, 0x66, 0x69, 0x65, 0x72, 0x5f, 0x63, 0x6f, 0x6c,
-	0x75, 0x6d, 0x6e, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x52, 0x10, 0x69, 0x64, 0x65, 0x6e, 0x74,
-	0x69, 0x66, 0x69, 0x65, 0x72, 0x43, 0x6f, 0x6c, 0x75, 0x6d, 0x6e, 0x12, 0x38, 0x0a, 0x18, 0x70,
-	0x61, 0x72, 0x65, 0x6e, 0x74, 0x5f, 0x69, 0x64, 0x65, 0x6e, 0x74, 0x69, 0x66, 0x69, 0x65, 0x72,
-	0x5f, 0x63, 0x6f, 0x6c, 0x75, 0x6d, 0x6e, 0x18, 0x04, 0x20, 0x01, 0x28, 0x09, 0x52, 0x16, 0x70,
-	0x61, 0x72, 0x65, 0x6e, 0x74, 0x49, 0x64, 0x65, 0x6e, 0x74, 0x69, 0x66, 0x69, 0x65, 0x72, 0x43,
-	0x6f, 0x6c, 0x75, 0x6d, 0x6e, 0x12, 0x27, 0x0a, 0x0f, 0x70, 0x72, 0x6f, 0x6d, 0x6f, 0x74, 0x65,
-	0x5f, 0x6f, 0x72, 0x70, 0x68, 0x61, 0x6e, 0x73, 0x18, 0x05, 0x20, 0x01, 0x28, 0x08, 0x52, 0x0e,
-	0x70, 0x72, 0x6f, 0x6d, 0x6f, 0x74, 0x65, 0x4f, 0x72, 0x70, 0x68, 0x61, 0x6e, 0x73, 0x22, 0x0e,
-	0x0a, 0x0c, 0x54, 0x72, 0x65, 0x65, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x86,
-	0x03, 0x0a, 0x1d, 0x48, 0x69, 0x65, 0x72, 0x61, 0x72, 0x63, 0x68, 0x69, 0x63, 0x61, 0x6c, 0x54,
-	0x61, 0x62, 0x6c, 0x65, 0x41, 0x70, 0x70, 0x6c, 0x79, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74,
-	0x12, 0x6a, 0x0a, 0x1c, 0x72, 0x65, 0x73, 0x75, 0x6c, 0x74, 0x5f, 0x68, 0x69, 0x65, 0x72, 0x61,
-	0x72, 0x63, 0x68, 0x69, 0x63, 0x61, 0x6c, 0x5f, 0x74, 0x61, 0x62, 0x6c, 0x65, 0x5f, 0x69, 0x64,
-	0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x29, 0x2e, 0x69, 0x6f, 0x2e, 0x64, 0x65, 0x65, 0x70,
-	0x68, 0x61, 0x76, 0x65, 0x6e, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x62, 0x61, 0x63, 0x6b,
-	0x70, 0x6c, 0x61, 0x6e, 0x65, 0x2e, 0x67, 0x72, 0x70, 0x63, 0x2e, 0x54, 0x69, 0x63, 0x6b, 0x65,
-	0x74, 0x52, 0x19, 0x72, 0x65, 0x73, 0x75, 0x6c, 0x74, 0x48, 0x69, 0x65, 0x72, 0x61, 0x72, 0x63,
-	0x68, 0x69, 0x63, 0x61, 0x6c, 0x54, 0x61, 0x62, 0x6c, 0x65, 0x49, 0x64, 0x12, 0x68, 0x0a, 0x1b,
-	0x69, 0x6e, 0x70, 0x75, 0x74, 0x5f, 0x68, 0x69, 0x65, 0x72, 0x61, 0x72, 0x63, 0x68, 0x69, 0x63,
-	0x61, 0x6c, 0x5f, 0x74, 0x61, 0x62, 0x6c, 0x65, 0x5f, 0x69, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28,
+	0x63, 0x1a, 0x20, 0x64, 0x65, 0x65, 0x70, 0x68, 0x61, 0x76, 0x65, 0x6e, 0x5f, 0x63, 0x6f, 0x72,
+	0x65, 0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2f, 0x74, 0x61, 0x62, 0x6c, 0x65, 0x2e, 0x70, 0x72,
+	0x6f, 0x74, 0x6f, 0x1a, 0x21, 0x64, 0x65, 0x65, 0x70, 0x68, 0x61, 0x76, 0x65, 0x6e, 0x5f, 0x63,
+	0x6f, 0x72, 0x65, 0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2f, 0x74, 0x69, 0x63, 0x6b, 0x65, 0x74,
+	0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x22, 0xf3, 0x02, 0x0a, 0x0d, 0x52, 0x6f, 0x6c, 0x6c, 0x75,
+	0x70, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x5e, 0x0a, 0x16, 0x72, 0x65, 0x73, 0x75,
+	0x6c, 0x74, 0x5f, 0x72, 0x6f, 0x6c, 0x6c, 0x75, 0x70, 0x5f, 0x74, 0x61, 0x62, 0x6c, 0x65, 0x5f,
+	0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x29, 0x2e, 0x69, 0x6f, 0x2e, 0x64, 0x65,
+	0x65, 0x70, 0x68, 0x61, 0x76, 0x65, 0x6e, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x62, 0x61,
+	0x63, 0x6b, 0x70, 0x6c, 0x61, 0x6e, 0x65, 0x2e, 0x67, 0x72, 0x70, 0x63, 0x2e, 0x54, 0x69, 0x63,
+	0x6b, 0x65, 0x74, 0x52, 0x13, 0x72, 0x65, 0x73, 0x75, 0x6c, 0x74, 0x52, 0x6f, 0x6c, 0x6c, 0x75,
+	0x70, 0x54, 0x61, 0x62, 0x6c, 0x65, 0x49, 0x64, 0x12, 0x51, 0x0a, 0x0f, 0x73, 0x6f, 0x75, 0x72,
+	0x63, 0x65, 0x5f, 0x74, 0x61, 0x62, 0x6c, 0x65, 0x5f, 0x69, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28,
 	0x0b, 0x32, 0x29, 0x2e, 0x69, 0x6f, 0x2e, 0x64, 0x65, 0x65, 0x70, 0x68, 0x61, 0x76, 0x65, 0x6e,
 	0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x62, 0x61, 0x63, 0x6b, 0x70, 0x6c, 0x61, 0x6e, 0x65,
-	0x2e, 0x67, 0x72, 0x70, 0x63, 0x2e, 0x54, 0x69, 0x63, 0x6b, 0x65, 0x74, 0x52, 0x18, 0x69, 0x6e,
-	0x70, 0x75, 0x74, 0x48, 0x69, 0x65, 0x72, 0x61, 0x72, 0x63, 0x68, 0x69, 0x63, 0x61, 0x6c, 0x54,
-	0x61, 0x62, 0x6c, 0x65, 0x49, 0x64, 0x12, 0x46, 0x0a, 0x07, 0x66, 0x69, 0x6c, 0x74, 0x65, 0x72,
-	0x73, 0x18, 0x03, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x2c, 0x2e, 0x69, 0x6f, 0x2e, 0x64, 0x65, 0x65,
-	0x70, 0x68, 0x61, 0x76, 0x65, 0x6e, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x62, 0x61, 0x63,
-	0x6b, 0x70, 0x6c, 0x61, 0x6e, 0x65, 0x2e, 0x67, 0x72, 0x70, 0x63, 0x2e, 0x43, 0x6f, 0x6e, 0x64,
-	0x69, 0x74, 0x69, 0x6f, 0x6e, 0x52, 0x07, 0x66, 0x69, 0x6c, 0x74, 0x65, 0x72, 0x73, 0x12, 0x47,
-	0x0a, 0x05, 0x73, 0x6f, 0x72, 0x74, 0x73, 0x18, 0x04, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x31, 0x2e,
-	0x69, 0x6f, 0x2e, 0x64, 0x65, 0x65, 0x70, 0x68, 0x61, 0x76, 0x65, 0x6e, 0x2e, 0x70, 0x72, 0x6f,
-	0x74, 0x6f, 0x2e, 0x62, 0x61, 0x63, 0x6b, 0x70, 0x6c, 0x61, 0x6e, 0x65, 0x2e, 0x67, 0x72, 0x70,
-	0x63, 0x2e, 0x53, 0x6f, 0x72, 0x74, 0x44, 0x65, 0x73, 0x63, 0x72, 0x69, 0x70, 0x74, 0x6f, 0x72,
-	0x52, 0x05, 0x73, 0x6f, 0x72, 0x74, 0x73, 0x22, 0x20, 0x0a, 0x1e, 0x48, 0x69, 0x65, 0x72, 0x61,
-	0x72, 0x63, 0x68, 0x69, 0x63, 0x61, 0x6c, 0x54, 0x61, 0x62, 0x6c, 0x65, 0x41, 0x70, 0x70, 0x6c,
-	0x79, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x63, 0x0a, 0x1b, 0x48, 0x69, 0x65,
-	0x72, 0x61, 0x72, 0x63, 0x68, 0x69, 0x63, 0x61, 0x6c, 0x54, 0x61, 0x62, 0x6c, 0x65, 0x44, 0x65,
-	0x73, 0x63, 0x72, 0x69, 0x70, 0x74, 0x6f, 0x72, 0x12, 0x27, 0x0a, 0x0f, 0x73, 0x6e, 0x61, 0x70,
-	0x73, 0x68, 0x6f, 0x74, 0x5f, 0x73, 0x63, 0x68, 0x65, 0x6d, 0x61, 0x18, 0x01, 0x20, 0x01, 0x28,
-	0x0c, 0x52, 0x0e, 0x73, 0x6e, 0x61, 0x70, 0x73, 0x68, 0x6f, 0x74, 0x53, 0x63, 0x68, 0x65, 0x6d,
-	0x61, 0x12, 0x1b, 0x0a, 0x09, 0x69, 0x73, 0x5f, 0x73, 0x74, 0x61, 0x74, 0x69, 0x63, 0x18, 0x02,
-	0x20, 0x01, 0x28, 0x08, 0x52, 0x08, 0x69, 0x73, 0x53, 0x74, 0x61, 0x74, 0x69, 0x63, 0x22, 0x9d,
-	0x03, 0x0a, 0x1c, 0x48, 0x69, 0x65, 0x72, 0x61, 0x72, 0x63, 0x68, 0x69, 0x63, 0x61, 0x6c, 0x54,
-	0x61, 0x62, 0x6c, 0x65, 0x56, 0x69, 0x65, 0x77, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12,
-	0x4f, 0x0a, 0x0e, 0x72, 0x65, 0x73, 0x75, 0x6c, 0x74, 0x5f, 0x76, 0x69, 0x65, 0x77, 0x5f, 0x69,
-	0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x29, 0x2e, 0x69, 0x6f, 0x2e, 0x64, 0x65, 0x65,
-	0x70, 0x68, 0x61, 0x76, 0x65, 0x6e, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x62, 0x61, 0x63,
-	0x6b, 0x70, 0x6c, 0x61, 0x6e, 0x65, 0x2e, 0x67, 0x72, 0x70, 0x63, 0x2e, 0x54, 0x69, 0x63, 0x6b,
-	0x65, 0x74, 0x52, 0x0c, 0x72, 0x65, 0x73, 0x75, 0x6c, 0x74, 0x56, 0x69, 0x65, 0x77, 0x49, 0x64,
-	0x12, 0x5f, 0x0a, 0x15, 0x68, 0x69, 0x65, 0x72, 0x61, 0x72, 0x63, 0x68, 0x69, 0x63, 0x61, 0x6c,
-	0x5f, 0x74, 0x61, 0x62, 0x6c, 0x65, 0x5f, 0x69, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32,
-	0x29, 0x2e, 0x69, 0x6f, 0x2e, 0x64, 0x65, 0x65, 0x70, 0x68, 0x61, 0x76, 0x65, 0x6e, 0x2e, 0x70,
-	0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x62, 0x61, 0x63, 0x6b, 0x70, 0x6c, 0x61, 0x6e, 0x65, 0x2e, 0x67,
-	0x72, 0x70, 0x63, 0x2e, 0x54, 0x69, 0x63, 0x6b, 0x65, 0x74, 0x48, 0x00, 0x52, 0x13, 0x68, 0x69,
-	0x65, 0x72, 0x61, 0x72, 0x63, 0x68, 0x69, 0x63, 0x61, 0x6c, 0x54, 0x61, 0x62, 0x6c, 0x65, 0x49,
-	0x64, 0x12, 0x55, 0x0a, 0x10, 0x65, 0x78, 0x69, 0x73, 0x74, 0x69, 0x6e, 0x67, 0x5f, 0x76, 0x69,
-	0x65, 0x77, 0x5f, 0x69, 0x64, 0x18, 0x03, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x29, 0x2e, 0x69, 0x6f,
-	0x2e, 0x64, 0x65, 0x65, 0x70, 0x68, 0x61, 0x76, 0x65, 0x6e, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f,
-	0x2e, 0x62, 0x61, 0x63, 0x6b, 0x70, 0x6c, 0x61, 0x6e, 0x65, 0x2e, 0x67, 0x72, 0x70, 0x63, 0x2e,
-	0x54, 0x69, 0x63, 0x6b, 0x65, 0x74, 0x48, 0x00, 0x52, 0x0e, 0x65, 0x78, 0x69, 0x73, 0x74, 0x69,
-	0x6e, 0x67, 0x56, 0x69, 0x65, 0x77, 0x49, 0x64, 0x12, 0x6a, 0x0a, 0x0a, 0x65, 0x78, 0x70, 0x61,
-	0x6e, 0x73, 0x69, 0x6f, 0x6e, 0x73, 0x18, 0x04, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x4a, 0x2e, 0x69,
+	0x2e, 0x67, 0x72, 0x70, 0x63, 0x2e, 0x54, 0x69, 0x63, 0x6b, 0x65, 0x74, 0x52, 0x0d, 0x73, 0x6f,
+	0x75, 0x72, 0x63, 0x65, 0x54, 0x61, 0x62, 0x6c, 0x65, 0x49, 0x64, 0x12, 0x52, 0x0a, 0x0c, 0x61,
+	0x67, 0x67, 0x72, 0x65, 0x67, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x18, 0x03, 0x20, 0x03, 0x28,
+	0x0b, 0x32, 0x2e, 0x2e, 0x69, 0x6f, 0x2e, 0x64, 0x65, 0x65, 0x70, 0x68, 0x61, 0x76, 0x65, 0x6e,
+	0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x62, 0x61, 0x63, 0x6b, 0x70, 0x6c, 0x61, 0x6e, 0x65,
+	0x2e, 0x67, 0x72, 0x70, 0x63, 0x2e, 0x41, 0x67, 0x67, 0x72, 0x65, 0x67, 0x61, 0x74, 0x69, 0x6f,
+	0x6e, 0x52, 0x0c, 0x61, 0x67, 0x67, 0x72, 0x65, 0x67, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x12,
+	0x31, 0x0a, 0x14, 0x69, 0x6e, 0x63, 0x6c, 0x75, 0x64, 0x65, 0x5f, 0x63, 0x6f, 0x6e, 0x73, 0x74,
+	0x69, 0x74, 0x75, 0x65, 0x6e, 0x74, 0x73, 0x18, 0x04, 0x20, 0x01, 0x28, 0x08, 0x52, 0x13, 0x69,
+	0x6e, 0x63, 0x6c, 0x75, 0x64, 0x65, 0x43, 0x6f, 0x6e, 0x73, 0x74, 0x69, 0x74, 0x75, 0x65, 0x6e,
+	0x74, 0x73, 0x12, 0x28, 0x0a, 0x10, 0x67, 0x72, 0x6f, 0x75, 0x70, 0x5f, 0x62, 0x79, 0x5f, 0x63,
+	0x6f, 0x6c, 0x75, 0x6d, 0x6e, 0x73, 0x18, 0x05, 0x20, 0x03, 0x28, 0x09, 0x52, 0x0e, 0x67, 0x72,
+	0x6f, 0x75, 0x70, 0x42, 0x79, 0x43, 0x6f, 0x6c, 0x75, 0x6d, 0x6e, 0x73, 0x22, 0x10, 0x0a, 0x0e,
+	0x52, 0x6f, 0x6c, 0x6c, 0x75, 0x70, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0xcc,
+	0x02, 0x0a, 0x0b, 0x54, 0x72, 0x65, 0x65, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x5a,
+	0x0a, 0x14, 0x72, 0x65, 0x73, 0x75, 0x6c, 0x74, 0x5f, 0x74, 0x72, 0x65, 0x65, 0x5f, 0x74, 0x61,
+	0x62, 0x6c, 0x65, 0x5f, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x29, 0x2e, 0x69,
 	0x6f, 0x2e, 0x64, 0x65, 0x65, 0x70, 0x68, 0x61, 0x76, 0x65, 0x6e, 0x2e, 0x70, 0x72, 0x6f, 0x74,
 	0x6f, 0x2e, 0x62, 0x61, 0x63, 0x6b, 0x70, 0x6c, 0x61, 0x6e, 0x65, 0x2e, 0x67, 0x72, 0x70, 0x63,
-	0x2e, 0x48, 0x69, 0x65, 0x72, 0x61, 0x72, 0x63, 0x68, 0x69, 0x63, 0x61, 0x6c, 0x54, 0x61, 0x62,
-	0x6c, 0x65, 0x56, 0x69, 0x65, 0x77, 0x4b, 0x65, 0x79, 0x54, 0x61, 0x62, 0x6c, 0x65, 0x44, 0x65,
-	0x73, 0x63, 0x72, 0x69, 0x70, 0x74, 0x6f, 0x72, 0x52, 0x0a, 0x65, 0x78, 0x70, 0x61, 0x6e, 0x73,
-	0x69, 0x6f, 0x6e, 0x73, 0x42, 0x08, 0x0a, 0x06, 0x74, 0x61, 0x72, 0x67, 0x65, 0x74, 0x22, 0xce,
-	0x01, 0x0a, 0x27, 0x48, 0x69, 0x65, 0x72, 0x61, 0x72, 0x63, 0x68, 0x69, 0x63, 0x61, 0x6c, 0x54,
-	0x61, 0x62, 0x6c, 0x65, 0x56, 0x69, 0x65, 0x77, 0x4b, 0x65, 0x79, 0x54, 0x61, 0x62, 0x6c, 0x65,
-	0x44, 0x65, 0x73, 0x63, 0x72, 0x69, 0x70, 0x74, 0x6f, 0x72, 0x12, 0x4b, 0x0a, 0x0c, 0x6b, 0x65,
-	0x79, 0x5f, 0x74, 0x61, 0x62, 0x6c, 0x65, 0x5f, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b,
+	0x2e, 0x54, 0x69, 0x63, 0x6b, 0x65, 0x74, 0x52, 0x11, 0x72, 0x65, 0x73, 0x75, 0x6c, 0x74, 0x54,
+	0x72, 0x65, 0x65, 0x54, 0x61, 0x62, 0x6c, 0x65, 0x49, 0x64, 0x12, 0x51, 0x0a, 0x0f, 0x73, 0x6f,
+	0x75, 0x72, 0x63, 0x65, 0x5f, 0x74, 0x61, 0x62, 0x6c, 0x65, 0x5f, 0x69, 0x64, 0x18, 0x02, 0x20,
+	0x01, 0x28, 0x0b, 0x32, 0x29, 0x2e, 0x69, 0x6f, 0x2e, 0x64, 0x65, 0x65, 0x70, 0x68, 0x61, 0x76,
+	0x65, 0x6e, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x62, 0x61, 0x63, 0x6b, 0x70, 0x6c, 0x61,
+	0x6e, 0x65, 0x2e, 0x67, 0x72, 0x70, 0x63, 0x2e, 0x54, 0x69, 0x63, 0x6b, 0x65, 0x74, 0x52, 0x0d,
+	0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x54, 0x61, 0x62, 0x6c, 0x65, 0x49, 0x64, 0x12, 0x2b, 0x0a,
+	0x11, 0x69, 0x64, 0x65, 0x6e, 0x74, 0x69, 0x66, 0x69, 0x65, 0x72, 0x5f, 0x63, 0x6f, 0x6c, 0x75,
+	0x6d, 0x6e, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x52, 0x10, 0x69, 0x64, 0x65, 0x6e, 0x74, 0x69,
+	0x66, 0x69, 0x65, 0x72, 0x43, 0x6f, 0x6c, 0x75, 0x6d, 0x6e, 0x12, 0x38, 0x0a, 0x18, 0x70, 0x61,
+	0x72, 0x65, 0x6e, 0x74, 0x5f, 0x69, 0x64, 0x65, 0x6e, 0x74, 0x69, 0x66, 0x69, 0x65, 0x72, 0x5f,
+	0x63, 0x6f, 0x6c, 0x75, 0x6d, 0x6e, 0x18, 0x04, 0x20, 0x01, 0x28, 0x09, 0x52, 0x16, 0x70, 0x61,
+	0x72, 0x65, 0x6e, 0x74, 0x49, 0x64, 0x65, 0x6e, 0x74, 0x69, 0x66, 0x69, 0x65, 0x72, 0x43, 0x6f,
+	0x6c, 0x75, 0x6d, 0x6e, 0x12, 0x27, 0x0a, 0x0f, 0x70, 0x72, 0x6f, 0x6d, 0x6f, 0x74, 0x65, 0x5f,
+	0x6f, 0x72, 0x70, 0x68, 0x61, 0x6e, 0x73, 0x18, 0x05, 0x20, 0x01, 0x28, 0x08, 0x52, 0x0e, 0x70,
+	0x72, 0x6f, 0x6d, 0x6f, 0x74, 0x65, 0x4f, 0x72, 0x70, 0x68, 0x61, 0x6e, 0x73, 0x22, 0x0e, 0x0a,
+	0x0c, 0x54, 0x72, 0x65, 0x65, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x86, 0x03,
+	0x0a, 0x1d, 0x48, 0x69, 0x65, 0x72, 0x61, 0x72, 0x63, 0x68, 0x69, 0x63, 0x61, 0x6c, 0x54, 0x61,
+	0x62, 0x6c, 0x65, 0x41, 0x70, 0x70, 0x6c, 0x79, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12,
+	0x6a, 0x0a, 0x1c, 0x72, 0x65, 0x73, 0x75, 0x6c, 0x74, 0x5f, 0x68, 0x69, 0x65, 0x72, 0x61, 0x72,
+	0x63, 0x68, 0x69, 0x63, 0x61, 0x6c, 0x5f, 0x74, 0x61, 0x62, 0x6c, 0x65, 0x5f, 0x69, 0x64, 0x18,
+	0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x29, 0x2e, 0x69, 0x6f, 0x2e, 0x64, 0x65, 0x65, 0x70, 0x68,
+	0x61, 0x76, 0x65, 0x6e, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x62, 0x61, 0x63, 0x6b, 0x70,
+	0x6c, 0x61, 0x6e, 0x65, 0x2e, 0x67, 0x72, 0x70, 0x63, 0x2e, 0x54, 0x69, 0x63, 0x6b, 0x65, 0x74,
+	0x52, 0x19, 0x72, 0x65, 0x73, 0x75, 0x6c, 0x74, 0x48, 0x69, 0x65, 0x72, 0x61, 0x72, 0x63, 0x68,
+	0x69, 0x63, 0x61, 0x6c, 0x54, 0x61, 0x62, 0x6c, 0x65, 0x49, 0x64, 0x12, 0x68, 0x0a, 0x1b, 0x69,
+	0x6e, 0x70, 0x75, 0x74, 0x5f, 0x68, 0x69, 0x65, 0x72, 0x61, 0x72, 0x63, 0x68, 0x69, 0x63, 0x61,
+	0x6c, 0x5f, 0x74, 0x61, 0x62, 0x6c, 0x65, 0x5f, 0x69, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b,
 	0x32, 0x29, 0x2e, 0x69, 0x6f, 0x2e, 0x64, 0x65, 0x65, 0x70, 0x68, 0x61, 0x76, 0x65, 0x6e, 0x2e,
 	0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x62, 0x61, 0x63, 0x6b, 0x70, 0x6c, 0x61, 0x6e, 0x65, 0x2e,
-	0x67, 0x72, 0x70, 0x63, 0x2e, 0x54, 0x69, 0x63, 0x6b, 0x65, 0x74, 0x52, 0x0a, 0x6b, 0x65, 0x79,
-	0x54, 0x61, 0x62, 0x6c, 0x65, 0x49, 0x64, 0x12, 0x3a, 0x0a, 0x17, 0x6b, 0x65, 0x79, 0x5f, 0x74,
-	0x61, 0x62, 0x6c, 0x65, 0x5f, 0x61, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x5f, 0x63, 0x6f, 0x6c, 0x75,
-	0x6d, 0x6e, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x48, 0x00, 0x52, 0x14, 0x6b, 0x65, 0x79, 0x54,
-	0x61, 0x62, 0x6c, 0x65, 0x41, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x43, 0x6f, 0x6c, 0x75, 0x6d, 0x6e,
-	0x88, 0x01, 0x01, 0x42, 0x1a, 0x0a, 0x18, 0x5f, 0x6b, 0x65, 0x79, 0x5f, 0x74, 0x61, 0x62, 0x6c,
-	0x65, 0x5f, 0x61, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x5f, 0x63, 0x6f, 0x6c, 0x75, 0x6d, 0x6e, 0x22,
-	0x1f, 0x0a, 0x1d, 0x48, 0x69, 0x65, 0x72, 0x61, 0x72, 0x63, 0x68, 0x69, 0x63, 0x61, 0x6c, 0x54,
-	0x61, 0x62, 0x6c, 0x65, 0x56, 0x69, 0x65, 0x77, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65,
-	0x22, 0xd8, 0x01, 0x0a, 0x24, 0x48, 0x69, 0x65, 0x72, 0x61, 0x72, 0x63, 0x68, 0x69, 0x63, 0x61,
-	0x6c, 0x54, 0x61, 0x62, 0x6c, 0x65, 0x53, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x45, 0x78, 0x70, 0x6f,
-	0x72, 0x74, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x51, 0x0a, 0x0f, 0x72, 0x65, 0x73,
-	0x75, 0x6c, 0x74, 0x5f, 0x74, 0x61, 0x62, 0x6c, 0x65, 0x5f, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01,
-	0x28, 0x0b, 0x32, 0x29, 0x2e, 0x69, 0x6f, 0x2e, 0x64, 0x65, 0x65, 0x70, 0x68, 0x61, 0x76, 0x65,
-	0x6e, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x62, 0x61, 0x63, 0x6b, 0x70, 0x6c, 0x61, 0x6e,
-	0x65, 0x2e, 0x67, 0x72, 0x70, 0x63, 0x2e, 0x54, 0x69, 0x63, 0x6b, 0x65, 0x74, 0x52, 0x0d, 0x72,
-	0x65, 0x73, 0x75, 0x6c, 0x74, 0x54, 0x61, 0x62, 0x6c, 0x65, 0x49, 0x64, 0x12, 0x5d, 0x0a, 0x15,
-	0x68, 0x69, 0x65, 0x72, 0x61, 0x72, 0x63, 0x68, 0x69, 0x63, 0x61, 0x6c, 0x5f, 0x74, 0x61, 0x62,
-	0x6c, 0x65, 0x5f, 0x69, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x29, 0x2e, 0x69, 0x6f,
+	0x67, 0x72, 0x70, 0x63, 0x2e, 0x54, 0x69, 0x63, 0x6b, 0x65, 0x74, 0x52, 0x18, 0x69, 0x6e, 0x70,
+	0x75, 0x74, 0x48, 0x69, 0x65, 0x72, 0x61, 0x72, 0x63, 0x68, 0x69, 0x63, 0x61, 0x6c, 0x54, 0x61,
+	0x62, 0x6c, 0x65, 0x49, 0x64, 0x12, 0x46, 0x0a, 0x07, 0x66, 0x69, 0x6c, 0x74, 0x65, 0x72, 0x73,
+	0x18, 0x03, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x2c, 0x2e, 0x69, 0x6f, 0x2e, 0x64, 0x65, 0x65, 0x70,
+	0x68, 0x61, 0x76, 0x65, 0x6e, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x62, 0x61, 0x63, 0x6b,
+	0x70, 0x6c, 0x61, 0x6e, 0x65, 0x2e, 0x67, 0x72, 0x70, 0x63, 0x2e, 0x43, 0x6f, 0x6e, 0x64, 0x69,
+	0x74, 0x69, 0x6f, 0x6e, 0x52, 0x07, 0x66, 0x69, 0x6c, 0x74, 0x65, 0x72, 0x73, 0x12, 0x47, 0x0a,
+	0x05, 0x73, 0x6f, 0x72, 0x74, 0x73, 0x18, 0x04, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x31, 0x2e, 0x69,
+	0x6f, 0x2e, 0x64, 0x65, 0x65, 0x70, 0x68, 0x61, 0x76, 0x65, 0x6e, 0x2e, 0x70, 0x72, 0x6f, 0x74,
+	0x6f, 0x2e, 0x62, 0x61, 0x63, 0x6b, 0x70, 0x6c, 0x61, 0x6e, 0x65, 0x2e, 0x67, 0x72, 0x70, 0x63,
+	0x2e, 0x53, 0x6f, 0x72, 0x74, 0x44, 0x65, 0x73, 0x63, 0x72, 0x69, 0x70, 0x74, 0x6f, 0x72, 0x52,
+	0x05, 0x73, 0x6f, 0x72, 0x74, 0x73, 0x22, 0x20, 0x0a, 0x1e, 0x48, 0x69, 0x65, 0x72, 0x61, 0x72,
+	0x63, 0x68, 0x69, 0x63, 0x61, 0x6c, 0x54, 0x61, 0x62, 0x6c, 0x65, 0x41, 0x70, 0x70, 0x6c, 0x79,
+	0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x63, 0x0a, 0x1b, 0x48, 0x69, 0x65, 0x72,
+	0x61, 0x72, 0x63, 0x68, 0x69, 0x63, 0x61, 0x6c, 0x54, 0x61, 0x62, 0x6c, 0x65, 0x44, 0x65, 0x73,
+	0x63, 0x72, 0x69, 0x70, 0x74, 0x6f, 0x72, 0x12, 0x27, 0x0a, 0x0f, 0x73, 0x6e, 0x61, 0x70, 0x73,
+	0x68, 0x6f, 0x74, 0x5f, 0x73, 0x63, 0x68, 0x65, 0x6d, 0x61, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0c,
+	0x52, 0x0e, 0x73, 0x6e, 0x61, 0x70, 0x73, 0x68, 0x6f, 0x74, 0x53, 0x63, 0x68, 0x65, 0x6d, 0x61,
+	0x12, 0x1b, 0x0a, 0x09, 0x69, 0x73, 0x5f, 0x73, 0x74, 0x61, 0x74, 0x69, 0x63, 0x18, 0x02, 0x20,
+	0x01, 0x28, 0x08, 0x52, 0x08, 0x69, 0x73, 0x53, 0x74, 0x61, 0x74, 0x69, 0x63, 0x22, 0x9d, 0x03,
+	0x0a, 0x1c, 0x48, 0x69, 0x65, 0x72, 0x61, 0x72, 0x63, 0x68, 0x69, 0x63, 0x61, 0x6c, 0x54, 0x61,
+	0x62, 0x6c, 0x65, 0x56, 0x69, 0x65, 0x77, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x4f,
+	0x0a, 0x0e, 0x72, 0x65, 0x73, 0x75, 0x6c, 0x74, 0x5f, 0x76, 0x69, 0x65, 0x77, 0x5f, 0x69, 0x64,
+	0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x29, 0x2e, 0x69, 0x6f, 0x2e, 0x64, 0x65, 0x65, 0x70,
+	0x68, 0x61, 0x76, 0x65, 0x6e, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x62, 0x61, 0x63, 0x6b,
+	0x70, 0x6c, 0x61, 0x6e, 0x65, 0x2e, 0x67, 0x72, 0x70, 0x63, 0x2e, 0x54, 0x69, 0x63, 0x6b, 0x65,
+	0x74, 0x52, 0x0c, 0x72, 0x65, 0x73, 0x75, 0x6c, 0x74, 0x56, 0x69, 0x65, 0x77, 0x49, 0x64, 0x12,
+	0x5f, 0x0a, 0x15, 0x68, 0x69, 0x65, 0x72, 0x61, 0x72, 0x63, 0x68, 0x69, 0x63, 0x61, 0x6c, 0x5f,
+	0x74, 0x61, 0x62, 0x6c, 0x65, 0x5f, 0x69, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x29,
+	0x2e, 0x69, 0x6f, 0x2e, 0x64, 0x65, 0x65, 0x70, 0x68, 0x61, 0x76, 0x65, 0x6e, 0x2e, 0x70, 0x72,
+	0x6f, 0x74, 0x6f, 0x2e, 0x62, 0x61, 0x63, 0x6b, 0x70, 0x6c, 0x61, 0x6e, 0x65, 0x2e, 0x67, 0x72,
+	0x70, 0x63, 0x2e, 0x54, 0x69, 0x63, 0x6b, 0x65, 0x74, 0x48, 0x00, 0x52, 0x13, 0x68, 0x69, 0x65,
+	0x72, 0x61, 0x72, 0x63, 0x68, 0x69, 0x63, 0x61, 0x6c, 0x54, 0x61, 0x62, 0x6c, 0x65, 0x49, 0x64,
+	0x12, 0x55, 0x0a, 0x10, 0x65, 0x78, 0x69, 0x73, 0x74, 0x69, 0x6e, 0x67, 0x5f, 0x76, 0x69, 0x65,
+	0x77, 0x5f, 0x69, 0x64, 0x18, 0x03, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x29, 0x2e, 0x69, 0x6f, 0x2e,
+	0x64, 0x65, 0x65, 0x70, 0x68, 0x61, 0x76, 0x65, 0x6e, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e,
+	0x62, 0x61, 0x63, 0x6b, 0x70, 0x6c, 0x61, 0x6e, 0x65, 0x2e, 0x67, 0x72, 0x70, 0x63, 0x2e, 0x54,
+	0x69, 0x63, 0x6b, 0x65, 0x74, 0x48, 0x00, 0x52, 0x0e, 0x65, 0x78, 0x69, 0x73, 0x74, 0x69, 0x6e,
+	0x67, 0x56, 0x69, 0x65, 0x77, 0x49, 0x64, 0x12, 0x6a, 0x0a, 0x0a, 0x65, 0x78, 0x70, 0x61, 0x6e,
+	0x73, 0x69, 0x6f, 0x6e, 0x73, 0x18, 0x04, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x4a, 0x2e, 0x69, 0x6f,
 	0x2e, 0x64, 0x65, 0x65, 0x70, 0x68, 0x61, 0x76, 0x65, 0x6e, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f,
 	0x2e, 0x62, 0x61, 0x63, 0x6b, 0x70, 0x6c, 0x61, 0x6e, 0x65, 0x2e, 0x67, 0x72, 0x70, 0x63, 0x2e,
-	0x54, 0x69, 0x63, 0x6b, 0x65, 0x74, 0x52, 0x13, 0x68, 0x69, 0x65, 0x72, 0x61, 0x72, 0x63, 0x68,
-	0x69, 0x63, 0x61, 0x6c, 0x54, 0x61, 0x62, 0x6c, 0x65, 0x49, 0x64, 0x32, 0xa9, 0x05, 0x0a, 0x18,
 	0x48, 0x69, 0x65, 0x72, 0x61, 0x72, 0x63, 0x68, 0x69, 0x63, 0x61, 0x6c, 0x54, 0x61, 0x62, 0x6c,
-	0x65, 0x53, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x12, 0x6d, 0x0a, 0x06, 0x52, 0x6f, 0x6c, 0x6c,
-	0x75, 0x70, 0x12, 0x30, 0x2e, 0x69, 0x6f, 0x2e, 0x64, 0x65, 0x65, 0x70, 0x68, 0x61, 0x76, 0x65,
-	0x6e, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x62, 0x61, 0x63, 0x6b, 0x70, 0x6c, 0x61, 0x6e,
-	0x65, 0x2e, 0x67, 0x72, 0x70, 0x63, 0x2e, 0x52, 0x6f, 0x6c, 0x6c, 0x75, 0x70, 0x52, 0x65, 0x71,
-	0x75, 0x65, 0x73, 0x74, 0x1a, 0x31, 0x2e, 0x69, 0x6f, 0x2e, 0x64, 0x65, 0x65, 0x70, 0x68, 0x61,
-	0x76, 0x65, 0x6e, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x62, 0x61, 0x63, 0x6b, 0x70, 0x6c,
-	0x61, 0x6e, 0x65, 0x2e, 0x67, 0x72, 0x70, 0x63, 0x2e, 0x52, 0x6f, 0x6c, 0x6c, 0x75, 0x70, 0x52,
-	0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x67, 0x0a, 0x04, 0x54, 0x72, 0x65, 0x65, 0x12,
-	0x2e, 0x2e, 0x69, 0x6f, 0x2e, 0x64, 0x65, 0x65, 0x70, 0x68, 0x61, 0x76, 0x65, 0x6e, 0x2e, 0x70,
-	0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x62, 0x61, 0x63, 0x6b, 0x70, 0x6c, 0x61, 0x6e, 0x65, 0x2e, 0x67,
-	0x72, 0x70, 0x63, 0x2e, 0x54, 0x72, 0x65, 0x65, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a,
-	0x2f, 0x2e, 0x69, 0x6f, 0x2e, 0x64, 0x65, 0x65, 0x70, 0x68, 0x61, 0x76, 0x65, 0x6e, 0x2e, 0x70,
+	0x65, 0x56, 0x69, 0x65, 0x77, 0x4b, 0x65, 0x79, 0x54, 0x61, 0x62, 0x6c, 0x65, 0x44, 0x65, 0x73,
+	0x63, 0x72, 0x69, 0x70, 0x74, 0x6f, 0x72, 0x52, 0x0a, 0x65, 0x78, 0x70, 0x61, 0x6e, 0x73, 0x69,
+	0x6f, 0x6e, 0x73, 0x42, 0x08, 0x0a, 0x06, 0x74, 0x61, 0x72, 0x67, 0x65, 0x74, 0x22, 0xce, 0x01,
+	0x0a, 0x27, 0x48, 0x69, 0x65, 0x72, 0x61, 0x72, 0x63, 0x68, 0x69, 0x63, 0x61, 0x6c, 0x54, 0x61,
+	0x62, 0x6c, 0x65, 0x56, 0x69, 0x65, 0x77, 0x4b, 0x65, 0x79, 0x54, 0x61, 0x62, 0x6c, 0x65, 0x44,
+	0x65, 0x73, 0x63, 0x72, 0x69, 0x70, 0x74, 0x6f, 0x72, 0x12, 0x4b, 0x0a, 0x0c, 0x6b, 0x65, 0x79,
+	0x5f, 0x74, 0x61, 0x62, 0x6c, 0x65, 0x5f, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32,
+	0x29, 0x2e, 0x69, 0x6f, 0x2e, 0x64, 0x65, 0x65, 0x70, 0x68, 0x61, 0x76, 0x65, 0x6e, 0x2e, 0x70,
 	0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x62, 0x61, 0x63, 0x6b, 0x70, 0x6c, 0x61, 0x6e, 0x65, 0x2e, 0x67,
-	0x72, 0x70, 0x63, 0x2e, 0x54, 0x72, 0x65, 0x65, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65,
-	0x12, 0x8c, 0x01, 0x0a, 0x05, 0x41, 0x70, 0x70, 0x6c, 0x79, 0x12, 0x40, 0x2e, 0x69, 0x6f, 0x2e,
+	0x72, 0x70, 0x63, 0x2e, 0x54, 0x69, 0x63, 0x6b, 0x65, 0x74, 0x52, 0x0a, 0x6b, 0x65, 0x79, 0x54,
+	0x61, 0x62, 0x6c, 0x65, 0x49, 0x64, 0x12, 0x3a, 0x0a, 0x17, 0x6b, 0x65, 0x79, 0x5f, 0x74, 0x61,
+	0x62, 0x6c, 0x65, 0x5f, 0x61, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x5f, 0x63, 0x6f, 0x6c, 0x75, 0x6d,
+	0x6e, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x48, 0x00, 0x52, 0x14, 0x6b, 0x65, 0x79, 0x54, 0x61,
+	0x62, 0x6c, 0x65, 0x41, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x43, 0x6f, 0x6c, 0x75, 0x6d, 0x6e, 0x88,
+	0x01, 0x01, 0x42, 0x1a, 0x0a, 0x18, 0x5f, 0x6b, 0x65, 0x79, 0x5f, 0x74, 0x61, 0x62, 0x6c, 0x65,
+	0x5f, 0x61, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x5f, 0x63, 0x6f, 0x6c, 0x75, 0x6d, 0x6e, 0x22, 0x1f,
+	0x0a, 0x1d, 0x48, 0x69, 0x65, 0x72, 0x61, 0x72, 0x63, 0x68, 0x69, 0x63, 0x61, 0x6c, 0x54, 0x61,
+	0x62, 0x6c, 0x65, 0x56, 0x69, 0x65, 0x77, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22,
+	0xd8, 0x01, 0x0a, 0x24, 0x48, 0x69, 0x65, 0x72, 0x61, 0x72, 0x63, 0x68, 0x69, 0x63, 0x61, 0x6c,
+	0x54, 0x61, 0x62, 0x6c, 0x65, 0x53, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x45, 0x78, 0x70, 0x6f, 0x72,
+	0x74, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x51, 0x0a, 0x0f, 0x72, 0x65, 0x73, 0x75,
+	0x6c, 0x74, 0x5f, 0x74, 0x61, 0x62, 0x6c, 0x65, 0x5f, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28,
+	0x0b, 0x32, 0x29, 0x2e, 0x69, 0x6f, 0x2e, 0x64, 0x65, 0x65, 0x70, 0x68, 0x61, 0x76, 0x65, 0x6e,
+	0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x62, 0x61, 0x63, 0x6b, 0x70, 0x6c, 0x61, 0x6e, 0x65,
+	0x2e, 0x67, 0x72, 0x70, 0x63, 0x2e, 0x54, 0x69, 0x63, 0x6b, 0x65, 0x74, 0x52, 0x0d, 0x72, 0x65,
+	0x73, 0x75, 0x6c, 0x74, 0x54, 0x61, 0x62, 0x6c, 0x65, 0x49, 0x64, 0x12, 0x5d, 0x0a, 0x15, 0x68,
+	0x69, 0x65, 0x72, 0x61, 0x72, 0x63, 0x68, 0x69, 0x63, 0x61, 0x6c, 0x5f, 0x74, 0x61, 0x62, 0x6c,
+	0x65, 0x5f, 0x69, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x29, 0x2e, 0x69, 0x6f, 0x2e,
 	0x64, 0x65, 0x65, 0x70, 0x68, 0x61, 0x76, 0x65, 0x6e, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e,
-	0x62, 0x61, 0x63, 0x6b, 0x70, 0x6c, 0x61, 0x6e, 0x65, 0x2e, 0x67, 0x72, 0x70, 0x63, 0x2e, 0x48,
+	0x62, 0x61, 0x63, 0x6b, 0x70, 0x6c, 0x61, 0x6e, 0x65, 0x2e, 0x67, 0x72, 0x70, 0x63, 0x2e, 0x54,
+	0x69, 0x63, 0x6b, 0x65, 0x74, 0x52, 0x13, 0x68, 0x69, 0x65, 0x72, 0x61, 0x72, 0x63, 0x68, 0x69,
+	0x63, 0x61, 0x6c, 0x54, 0x61, 0x62, 0x6c, 0x65, 0x49, 0x64, 0x32, 0xa9, 0x05, 0x0a, 0x18, 0x48,
 	0x69, 0x65, 0x72, 0x61, 0x72, 0x63, 0x68, 0x69, 0x63, 0x61, 0x6c, 0x54, 0x61, 0x62, 0x6c, 0x65,
-	0x41, 0x70, 0x70, 0x6c, 0x79, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x41, 0x2e, 0x69,
-	0x6f, 0x2e, 0x64, 0x65, 0x65, 0x70, 0x68, 0x61, 0x76, 0x65, 0x6e, 0x2e, 0x70, 0x72, 0x6f, 0x74,
-	0x6f, 0x2e, 0x62, 0x61, 0x63, 0x6b, 0x70, 0x6c, 0x61, 0x6e, 0x65, 0x2e, 0x67, 0x72, 0x70, 0x63,
-	0x2e, 0x48, 0x69, 0x65, 0x72, 0x61, 0x72, 0x63, 0x68, 0x69, 0x63, 0x61, 0x6c, 0x54, 0x61, 0x62,
-	0x6c, 0x65, 0x41, 0x70, 0x70, 0x6c, 0x79, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12,
-	0x89, 0x01, 0x0a, 0x04, 0x56, 0x69, 0x65, 0x77, 0x12, 0x3f, 0x2e, 0x69, 0x6f, 0x2e, 0x64, 0x65,
+	0x53, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x12, 0x6d, 0x0a, 0x06, 0x52, 0x6f, 0x6c, 0x6c, 0x75,
+	0x70, 0x12, 0x30, 0x2e, 0x69, 0x6f, 0x2e, 0x64, 0x65, 0x65, 0x70, 0x68, 0x61, 0x76, 0x65, 0x6e,
+	0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x62, 0x61, 0x63, 0x6b, 0x70, 0x6c, 0x61, 0x6e, 0x65,
+	0x2e, 0x67, 0x72, 0x70, 0x63, 0x2e, 0x52, 0x6f, 0x6c, 0x6c, 0x75, 0x70, 0x52, 0x65, 0x71, 0x75,
+	0x65, 0x73, 0x74, 0x1a, 0x31, 0x2e, 0x69, 0x6f, 0x2e, 0x64, 0x65, 0x65, 0x70, 0x68, 0x61, 0x76,
+	0x65, 0x6e, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x62, 0x61, 0x63, 0x6b, 0x70, 0x6c, 0x61,
+	0x6e, 0x65, 0x2e, 0x67, 0x72, 0x70, 0x63, 0x2e, 0x52, 0x6f, 0x6c, 0x6c, 0x75, 0x70, 0x52, 0x65,
+	0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x67, 0x0a, 0x04, 0x54, 0x72, 0x65, 0x65, 0x12, 0x2e,
+	0x2e, 0x69, 0x6f, 0x2e, 0x64, 0x65, 0x65, 0x70, 0x68, 0x61, 0x76, 0x65, 0x6e, 0x2e, 0x70, 0x72,
+	0x6f, 0x74, 0x6f, 0x2e, 0x62, 0x61, 0x63, 0x6b, 0x70, 0x6c, 0x61, 0x6e, 0x65, 0x2e, 0x67, 0x72,
+	0x70, 0x63, 0x2e, 0x54, 0x72, 0x65, 0x65, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x2f,
+	0x2e, 0x69, 0x6f, 0x2e, 0x64, 0x65, 0x65, 0x70, 0x68, 0x61, 0x76, 0x65, 0x6e, 0x2e, 0x70, 0x72,
+	0x6f, 0x74, 0x6f, 0x2e, 0x62, 0x61, 0x63, 0x6b, 0x70, 0x6c, 0x61, 0x6e, 0x65, 0x2e, 0x67, 0x72,
+	0x70, 0x63, 0x2e, 0x54, 0x72, 0x65, 0x65, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12,
+	0x8c, 0x01, 0x0a, 0x05, 0x41, 0x70, 0x70, 0x6c, 0x79, 0x12, 0x40, 0x2e, 0x69, 0x6f, 0x2e, 0x64,
+	0x65, 0x65, 0x70, 0x68, 0x61, 0x76, 0x65, 0x6e, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x62,
+	0x61, 0x63, 0x6b, 0x70, 0x6c, 0x61, 0x6e, 0x65, 0x2e, 0x67, 0x72, 0x70, 0x63, 0x2e, 0x48, 0x69,
+	0x65, 0x72, 0x61, 0x72, 0x63, 0x68, 0x69, 0x63, 0x61, 0x6c, 0x54, 0x61, 0x62, 0x6c, 0x65, 0x41,
+	0x70, 0x70, 0x6c, 0x79, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x41, 0x2e, 0x69, 0x6f,
+	0x2e, 0x64, 0x65, 0x65, 0x70, 0x68, 0x61, 0x76, 0x65, 0x6e, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f,
+	0x2e, 0x62, 0x61, 0x63, 0x6b, 0x70, 0x6c, 0x61, 0x6e, 0x65, 0x2e, 0x67, 0x72, 0x70, 0x63, 0x2e,
+	0x48, 0x69, 0x65, 0x72, 0x61, 0x72, 0x63, 0x68, 0x69, 0x63, 0x61, 0x6c, 0x54, 0x61, 0x62, 0x6c,
+	0x65, 0x41, 0x70, 0x70, 0x6c, 0x79, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x89,
+	0x01, 0x0a, 0x04, 0x56, 0x69, 0x65, 0x77, 0x12, 0x3f, 0x2e, 0x69, 0x6f, 0x2e, 0x64, 0x65, 0x65,
+	0x70, 0x68, 0x61, 0x76, 0x65, 0x6e, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x62, 0x61, 0x63,
+	0x6b, 0x70, 0x6c, 0x61, 0x6e, 0x65, 0x2e, 0x67, 0x72, 0x70, 0x63, 0x2e, 0x48, 0x69, 0x65, 0x72,
+	0x61, 0x72, 0x63, 0x68, 0x69, 0x63, 0x61, 0x6c, 0x54, 0x61, 0x62, 0x6c, 0x65, 0x56, 0x69, 0x65,
+	0x77, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x40, 0x2e, 0x69, 0x6f, 0x2e, 0x64, 0x65,
 	0x65, 0x70, 0x68, 0x61, 0x76, 0x65, 0x6e, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x62, 0x61,
 	0x63, 0x6b, 0x70, 0x6c, 0x61, 0x6e, 0x65, 0x2e, 0x67, 0x72, 0x70, 0x63, 0x2e, 0x48, 0x69, 0x65,
 	0x72, 0x61, 0x72, 0x63, 0x68, 0x69, 0x63, 0x61, 0x6c, 0x54, 0x61, 0x62, 0x6c, 0x65, 0x56, 0x69,
-	0x65, 0x77, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x40, 0x2e, 0x69, 0x6f, 0x2e, 0x64,
-	0x65, 0x65, 0x70, 0x68, 0x61, 0x76, 0x65, 0x6e, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x62,
-	0x61, 0x63, 0x6b, 0x70, 0x6c, 0x61, 0x6e, 0x65, 0x2e, 0x67, 0x72, 0x70, 0x63, 0x2e, 0x48, 0x69,
-	0x65, 0x72, 0x61, 0x72, 0x63, 0x68, 0x69, 0x63, 0x61, 0x6c, 0x54, 0x61, 0x62, 0x6c, 0x65, 0x56,
-	0x69, 0x65, 0x77, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x99, 0x01, 0x0a, 0x0c,
-	0x45, 0x78, 0x70, 0x6f, 0x72, 0x74, 0x53, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x12, 0x47, 0x2e, 0x69,
-	0x6f, 0x2e, 0x64, 0x65, 0x65, 0x70, 0x68, 0x61, 0x76, 0x65, 0x6e, 0x2e, 0x70, 0x72, 0x6f, 0x74,
-	0x6f, 0x2e, 0x62, 0x61, 0x63, 0x6b, 0x70, 0x6c, 0x61, 0x6e, 0x65, 0x2e, 0x67, 0x72, 0x70, 0x63,
-	0x2e, 0x48, 0x69, 0x65, 0x72, 0x61, 0x72, 0x63, 0x68, 0x69, 0x63, 0x61, 0x6c, 0x54, 0x61, 0x62,
-	0x6c, 0x65, 0x53, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x45, 0x78, 0x70, 0x6f, 0x72, 0x74, 0x52, 0x65,
-	0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x40, 0x2e, 0x69, 0x6f, 0x2e, 0x64, 0x65, 0x65, 0x70, 0x68,
-	0x61, 0x76, 0x65, 0x6e, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x62, 0x61, 0x63, 0x6b, 0x70,
-	0x6c, 0x61, 0x6e, 0x65, 0x2e, 0x67, 0x72, 0x70, 0x63, 0x2e, 0x45, 0x78, 0x70, 0x6f, 0x72, 0x74,
-	0x65, 0x64, 0x54, 0x61, 0x62, 0x6c, 0x65, 0x43, 0x72, 0x65, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x52,
-	0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x42, 0x4d, 0x48, 0x01, 0x50, 0x01, 0x5a, 0x47, 0x67,
-	0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x64, 0x65, 0x65, 0x70, 0x68, 0x61,
-	0x76, 0x65, 0x6e, 0x2f, 0x64, 0x65, 0x65, 0x70, 0x68, 0x61, 0x76, 0x65, 0x6e, 0x2d, 0x63, 0x6f,
-	0x72, 0x65, 0x2f, 0x67, 0x6f, 0x2f, 0x69, 0x6e, 0x74, 0x65, 0x72, 0x6e, 0x61, 0x6c, 0x2f, 0x70,
-	0x72, 0x6f, 0x74, 0x6f, 0x2f, 0x68, 0x69, 0x65, 0x72, 0x61, 0x72, 0x63, 0x68, 0x69, 0x63, 0x61,
-	0x6c, 0x74, 0x61, 0x62, 0x6c, 0x65, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
+	0x65, 0x77, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x99, 0x01, 0x0a, 0x0c, 0x45,
+	0x78, 0x70, 0x6f, 0x72, 0x74, 0x53, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x12, 0x47, 0x2e, 0x69, 0x6f,
+	0x2e, 0x64, 0x65, 0x65, 0x70, 0x68, 0x61, 0x76, 0x65, 0x6e, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f,
+	0x2e, 0x62, 0x61, 0x63, 0x6b, 0x70, 0x6c, 0x61, 0x6e, 0x65, 0x2e, 0x67, 0x72, 0x70, 0x63, 0x2e,
+	0x48, 0x69, 0x65, 0x72, 0x61, 0x72, 0x63, 0x68, 0x69, 0x63, 0x61, 0x6c, 0x54, 0x61, 0x62, 0x6c,
+	0x65, 0x53, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x45, 0x78, 0x70, 0x6f, 0x72, 0x74, 0x52, 0x65, 0x71,
+	0x75, 0x65, 0x73, 0x74, 0x1a, 0x40, 0x2e, 0x69, 0x6f, 0x2e, 0x64, 0x65, 0x65, 0x70, 0x68, 0x61,
+	0x76, 0x65, 0x6e, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x62, 0x61, 0x63, 0x6b, 0x70, 0x6c,
+	0x61, 0x6e, 0x65, 0x2e, 0x67, 0x72, 0x70, 0x63, 0x2e, 0x45, 0x78, 0x70, 0x6f, 0x72, 0x74, 0x65,
+	0x64, 0x54, 0x61, 0x62, 0x6c, 0x65, 0x43, 0x72, 0x65, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x52, 0x65,
+	0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x42, 0x4d, 0x48, 0x01, 0x50, 0x01, 0x5a, 0x47, 0x67, 0x69,
+	0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x64, 0x65, 0x65, 0x70, 0x68, 0x61, 0x76,
+	0x65, 0x6e, 0x2f, 0x64, 0x65, 0x65, 0x70, 0x68, 0x61, 0x76, 0x65, 0x6e, 0x2d, 0x63, 0x6f, 0x72,
+	0x65, 0x2f, 0x67, 0x6f, 0x2f, 0x69, 0x6e, 0x74, 0x65, 0x72, 0x6e, 0x61, 0x6c, 0x2f, 0x70, 0x72,
+	0x6f, 0x74, 0x6f, 0x2f, 0x68, 0x69, 0x65, 0x72, 0x61, 0x72, 0x63, 0x68, 0x69, 0x63, 0x61, 0x6c,
+	0x74, 0x61, 0x62, 0x6c, 0x65, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
 }
 
 var (
-	file_deephaven_proto_hierarchicaltable_proto_rawDescOnce sync.Once
-	file_deephaven_proto_hierarchicaltable_proto_rawDescData = file_deephaven_proto_hierarchicaltable_proto_rawDesc
+	file_deephaven_core_proto_hierarchicaltable_proto_rawDescOnce sync.Once
+	file_deephaven_core_proto_hierarchicaltable_proto_rawDescData = file_deephaven_core_proto_hierarchicaltable_proto_rawDesc
 )
 
-func file_deephaven_proto_hierarchicaltable_proto_rawDescGZIP() []byte {
-	file_deephaven_proto_hierarchicaltable_proto_rawDescOnce.Do(func() {
-		file_deephaven_proto_hierarchicaltable_proto_rawDescData = protoimpl.X.CompressGZIP(file_deephaven_proto_hierarchicaltable_proto_rawDescData)
+func file_deephaven_core_proto_hierarchicaltable_proto_rawDescGZIP() []byte {
+	file_deephaven_core_proto_hierarchicaltable_proto_rawDescOnce.Do(func() {
+		file_deephaven_core_proto_hierarchicaltable_proto_rawDescData = protoimpl.X.CompressGZIP(file_deephaven_core_proto_hierarchicaltable_proto_rawDescData)
 	})
-	return file_deephaven_proto_hierarchicaltable_proto_rawDescData
+	return file_deephaven_core_proto_hierarchicaltable_proto_rawDescData
 }
 
-var file_deephaven_proto_hierarchicaltable_proto_msgTypes = make([]protoimpl.MessageInfo, 11)
-var file_deephaven_proto_hierarchicaltable_proto_goTypes = []interface{}{
+var file_deephaven_core_proto_hierarchicaltable_proto_msgTypes = make([]protoimpl.MessageInfo, 11)
+var file_deephaven_core_proto_hierarchicaltable_proto_goTypes = []interface{}{
 	(*RollupRequest)(nil),                           // 0: io.deephaven.proto.backplane.grpc.RollupRequest
 	(*RollupResponse)(nil),                          // 1: io.deephaven.proto.backplane.grpc.RollupResponse
 	(*TreeRequest)(nil),                             // 2: io.deephaven.proto.backplane.grpc.TreeRequest
@@ -988,7 +989,7 @@ var file_deephaven_proto_hierarchicaltable_proto_goTypes = []interface{}{
 	(*table.SortDescriptor)(nil),                    // 14: io.deephaven.proto.backplane.grpc.SortDescriptor
 	(*table.ExportedTableCreationResponse)(nil),     // 15: io.deephaven.proto.backplane.grpc.ExportedTableCreationResponse
 }
-var file_deephaven_proto_hierarchicaltable_proto_depIdxs = []int32{
+var file_deephaven_core_proto_hierarchicaltable_proto_depIdxs = []int32{
 	11, // 0: io.deephaven.proto.backplane.grpc.RollupRequest.result_rollup_table_id:type_name -> io.deephaven.proto.backplane.grpc.Ticket
 	11, // 1: io.deephaven.proto.backplane.grpc.RollupRequest.source_table_id:type_name -> io.deephaven.proto.backplane.grpc.Ticket
 	12, // 2: io.deephaven.proto.backplane.grpc.RollupRequest.aggregations:type_name -> io.deephaven.proto.backplane.grpc.Aggregation
@@ -1022,13 +1023,13 @@ var file_deephaven_proto_hierarchicaltable_proto_depIdxs = []int32{
 	0,  // [0:16] is the sub-list for field type_name
 }
 
-func init() { file_deephaven_proto_hierarchicaltable_proto_init() }
-func file_deephaven_proto_hierarchicaltable_proto_init() {
-	if File_deephaven_proto_hierarchicaltable_proto != nil {
+func init() { file_deephaven_core_proto_hierarchicaltable_proto_init() }
+func file_deephaven_core_proto_hierarchicaltable_proto_init() {
+	if File_deephaven_core_proto_hierarchicaltable_proto != nil {
 		return
 	}
 	if !protoimpl.UnsafeEnabled {
-		file_deephaven_proto_hierarchicaltable_proto_msgTypes[0].Exporter = func(v interface{}, i int) interface{} {
+		file_deephaven_core_proto_hierarchicaltable_proto_msgTypes[0].Exporter = func(v interface{}, i int) interface{} {
 			switch v := v.(*RollupRequest); i {
 			case 0:
 				return &v.state
@@ -1040,7 +1041,7 @@ func file_deephaven_proto_hierarchicaltable_proto_init() {
 				return nil
 			}
 		}
-		file_deephaven_proto_hierarchicaltable_proto_msgTypes[1].Exporter = func(v interface{}, i int) interface{} {
+		file_deephaven_core_proto_hierarchicaltable_proto_msgTypes[1].Exporter = func(v interface{}, i int) interface{} {
 			switch v := v.(*RollupResponse); i {
 			case 0:
 				return &v.state
@@ -1052,7 +1053,7 @@ func file_deephaven_proto_hierarchicaltable_proto_init() {
 				return nil
 			}
 		}
-		file_deephaven_proto_hierarchicaltable_proto_msgTypes[2].Exporter = func(v interface{}, i int) interface{} {
+		file_deephaven_core_proto_hierarchicaltable_proto_msgTypes[2].Exporter = func(v interface{}, i int) interface{} {
 			switch v := v.(*TreeRequest); i {
 			case 0:
 				return &v.state
@@ -1064,7 +1065,7 @@ func file_deephaven_proto_hierarchicaltable_proto_init() {
 				return nil
 			}
 		}
-		file_deephaven_proto_hierarchicaltable_proto_msgTypes[3].Exporter = func(v interface{}, i int) interface{} {
+		file_deephaven_core_proto_hierarchicaltable_proto_msgTypes[3].Exporter = func(v interface{}, i int) interface{} {
 			switch v := v.(*TreeResponse); i {
 			case 0:
 				return &v.state
@@ -1076,7 +1077,7 @@ func file_deephaven_proto_hierarchicaltable_proto_init() {
 				return nil
 			}
 		}
-		file_deephaven_proto_hierarchicaltable_proto_msgTypes[4].Exporter = func(v interface{}, i int) interface{} {
+		file_deephaven_core_proto_hierarchicaltable_proto_msgTypes[4].Exporter = func(v interface{}, i int) interface{} {
 			switch v := v.(*HierarchicalTableApplyRequest); i {
 			case 0:
 				return &v.state
@@ -1088,7 +1089,7 @@ func file_deephaven_proto_hierarchicaltable_proto_init() {
 				return nil
 			}
 		}
-		file_deephaven_proto_hierarchicaltable_proto_msgTypes[5].Exporter = func(v interface{}, i int) interface{} {
+		file_deephaven_core_proto_hierarchicaltable_proto_msgTypes[5].Exporter = func(v interface{}, i int) interface{} {
 			switch v := v.(*HierarchicalTableApplyResponse); i {
 			case 0:
 				return &v.state
@@ -1100,7 +1101,7 @@ func file_deephaven_proto_hierarchicaltable_proto_init() {
 				return nil
 			}
 		}
-		file_deephaven_proto_hierarchicaltable_proto_msgTypes[6].Exporter = func(v interface{}, i int) interface{} {
+		file_deephaven_core_proto_hierarchicaltable_proto_msgTypes[6].Exporter = func(v interface{}, i int) interface{} {
 			switch v := v.(*HierarchicalTableDescriptor); i {
 			case 0:
 				return &v.state
@@ -1112,7 +1113,7 @@ func file_deephaven_proto_hierarchicaltable_proto_init() {
 				return nil
 			}
 		}
-		file_deephaven_proto_hierarchicaltable_proto_msgTypes[7].Exporter = func(v interface{}, i int) interface{} {
+		file_deephaven_core_proto_hierarchicaltable_proto_msgTypes[7].Exporter = func(v interface{}, i int) interface{} {
 			switch v := v.(*HierarchicalTableViewRequest); i {
 			case 0:
 				return &v.state
@@ -1124,7 +1125,7 @@ func file_deephaven_proto_hierarchicaltable_proto_init() {
 				return nil
 			}
 		}
-		file_deephaven_proto_hierarchicaltable_proto_msgTypes[8].Exporter = func(v interface{}, i int) interface{} {
+		file_deephaven_core_proto_hierarchicaltable_proto_msgTypes[8].Exporter = func(v interface{}, i int) interface{} {
 			switch v := v.(*HierarchicalTableViewKeyTableDescriptor); i {
 			case 0:
 				return &v.state
@@ -1136,7 +1137,7 @@ func file_deephaven_proto_hierarchicaltable_proto_init() {
 				return nil
 			}
 		}
-		file_deephaven_proto_hierarchicaltable_proto_msgTypes[9].Exporter = func(v interface{}, i int) interface{} {
+		file_deephaven_core_proto_hierarchicaltable_proto_msgTypes[9].Exporter = func(v interface{}, i int) interface{} {
 			switch v := v.(*HierarchicalTableViewResponse); i {
 			case 0:
 				return &v.state
@@ -1148,7 +1149,7 @@ func file_deephaven_proto_hierarchicaltable_proto_init() {
 				return nil
 			}
 		}
-		file_deephaven_proto_hierarchicaltable_proto_msgTypes[10].Exporter = func(v interface{}, i int) interface{} {
+		file_deephaven_core_proto_hierarchicaltable_proto_msgTypes[10].Exporter = func(v interface{}, i int) interface{} {
 			switch v := v.(*HierarchicalTableSourceExportRequest); i {
 			case 0:
 				return &v.state
@@ -1161,27 +1162,27 @@ func file_deephaven_proto_hierarchicaltable_proto_init() {
 			}
 		}
 	}
-	file_deephaven_proto_hierarchicaltable_proto_msgTypes[7].OneofWrappers = []interface{}{
+	file_deephaven_core_proto_hierarchicaltable_proto_msgTypes[7].OneofWrappers = []interface{}{
 		(*HierarchicalTableViewRequest_HierarchicalTableId)(nil),
 		(*HierarchicalTableViewRequest_ExistingViewId)(nil),
 	}
-	file_deephaven_proto_hierarchicaltable_proto_msgTypes[8].OneofWrappers = []interface{}{}
+	file_deephaven_core_proto_hierarchicaltable_proto_msgTypes[8].OneofWrappers = []interface{}{}
 	type x struct{}
 	out := protoimpl.TypeBuilder{
 		File: protoimpl.DescBuilder{
 			GoPackagePath: reflect.TypeOf(x{}).PkgPath(),
-			RawDescriptor: file_deephaven_proto_hierarchicaltable_proto_rawDesc,
+			RawDescriptor: file_deephaven_core_proto_hierarchicaltable_proto_rawDesc,
 			NumEnums:      0,
 			NumMessages:   11,
 			NumExtensions: 0,
 			NumServices:   1,
 		},
-		GoTypes:           file_deephaven_proto_hierarchicaltable_proto_goTypes,
-		DependencyIndexes: file_deephaven_proto_hierarchicaltable_proto_depIdxs,
-		MessageInfos:      file_deephaven_proto_hierarchicaltable_proto_msgTypes,
+		GoTypes:           file_deephaven_core_proto_hierarchicaltable_proto_goTypes,
+		DependencyIndexes: file_deephaven_core_proto_hierarchicaltable_proto_depIdxs,
+		MessageInfos:      file_deephaven_core_proto_hierarchicaltable_proto_msgTypes,
 	}.Build()
-	File_deephaven_proto_hierarchicaltable_proto = out.File
-	file_deephaven_proto_hierarchicaltable_proto_rawDesc = nil
-	file_deephaven_proto_hierarchicaltable_proto_goTypes = nil
-	file_deephaven_proto_hierarchicaltable_proto_depIdxs = nil
+	File_deephaven_core_proto_hierarchicaltable_proto = out.File
+	file_deephaven_core_proto_hierarchicaltable_proto_rawDesc = nil
+	file_deephaven_core_proto_hierarchicaltable_proto_goTypes = nil
+	file_deephaven_core_proto_hierarchicaltable_proto_depIdxs = nil
 }
diff --git a/go/internal/proto/hierarchicaltable/hierarchicaltable_grpc.pb.go b/go/internal/proto/hierarchicaltable/hierarchicaltable_grpc.pb.go
index 54bbc4a1015..b50917702f1 100644
--- a/go/internal/proto/hierarchicaltable/hierarchicaltable_grpc.pb.go
+++ b/go/internal/proto/hierarchicaltable/hierarchicaltable_grpc.pb.go
@@ -2,7 +2,7 @@
 // versions:
 // - protoc-gen-go-grpc v1.2.0
 // - protoc             v4.25.3
-// source: deephaven/proto/hierarchicaltable.proto
+// source: deephaven_core/proto/hierarchicaltable.proto
 
 package hierarchicaltable
 
@@ -261,5 +261,5 @@ var HierarchicalTableService_ServiceDesc = grpc.ServiceDesc{
 		},
 	},
 	Streams:  []grpc.StreamDesc{},
-	Metadata: "deephaven/proto/hierarchicaltable.proto",
+	Metadata: "deephaven_core/proto/hierarchicaltable.proto",
 }
diff --git a/go/internal/proto/inputtable/inputtable.pb.go b/go/internal/proto/inputtable/inputtable.pb.go
index b25ed6389ac..da5e8568fb4 100644
--- a/go/internal/proto/inputtable/inputtable.pb.go
+++ b/go/internal/proto/inputtable/inputtable.pb.go
@@ -5,7 +5,7 @@
 // versions:
 // 	protoc-gen-go v1.28.1
 // 	protoc        v4.25.3
-// source: deephaven/proto/inputtable.proto
+// source: deephaven_core/proto/inputtable.proto
 
 package inputtable
 
@@ -36,7 +36,7 @@ type AddTableRequest struct {
 func (x *AddTableRequest) Reset() {
 	*x = AddTableRequest{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_deephaven_proto_inputtable_proto_msgTypes[0]
+		mi := &file_deephaven_core_proto_inputtable_proto_msgTypes[0]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -49,7 +49,7 @@ func (x *AddTableRequest) String() string {
 func (*AddTableRequest) ProtoMessage() {}
 
 func (x *AddTableRequest) ProtoReflect() protoreflect.Message {
-	mi := &file_deephaven_proto_inputtable_proto_msgTypes[0]
+	mi := &file_deephaven_core_proto_inputtable_proto_msgTypes[0]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -62,7 +62,7 @@ func (x *AddTableRequest) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use AddTableRequest.ProtoReflect.Descriptor instead.
 func (*AddTableRequest) Descriptor() ([]byte, []int) {
-	return file_deephaven_proto_inputtable_proto_rawDescGZIP(), []int{0}
+	return file_deephaven_core_proto_inputtable_proto_rawDescGZIP(), []int{0}
 }
 
 func (x *AddTableRequest) GetInputTable() *ticket.Ticket {
@@ -88,7 +88,7 @@ type AddTableResponse struct {
 func (x *AddTableResponse) Reset() {
 	*x = AddTableResponse{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_deephaven_proto_inputtable_proto_msgTypes[1]
+		mi := &file_deephaven_core_proto_inputtable_proto_msgTypes[1]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -101,7 +101,7 @@ func (x *AddTableResponse) String() string {
 func (*AddTableResponse) ProtoMessage() {}
 
 func (x *AddTableResponse) ProtoReflect() protoreflect.Message {
-	mi := &file_deephaven_proto_inputtable_proto_msgTypes[1]
+	mi := &file_deephaven_core_proto_inputtable_proto_msgTypes[1]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -114,7 +114,7 @@ func (x *AddTableResponse) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use AddTableResponse.ProtoReflect.Descriptor instead.
 func (*AddTableResponse) Descriptor() ([]byte, []int) {
-	return file_deephaven_proto_inputtable_proto_rawDescGZIP(), []int{1}
+	return file_deephaven_core_proto_inputtable_proto_rawDescGZIP(), []int{1}
 }
 
 type DeleteTableRequest struct {
@@ -129,7 +129,7 @@ type DeleteTableRequest struct {
 func (x *DeleteTableRequest) Reset() {
 	*x = DeleteTableRequest{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_deephaven_proto_inputtable_proto_msgTypes[2]
+		mi := &file_deephaven_core_proto_inputtable_proto_msgTypes[2]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -142,7 +142,7 @@ func (x *DeleteTableRequest) String() string {
 func (*DeleteTableRequest) ProtoMessage() {}
 
 func (x *DeleteTableRequest) ProtoReflect() protoreflect.Message {
-	mi := &file_deephaven_proto_inputtable_proto_msgTypes[2]
+	mi := &file_deephaven_core_proto_inputtable_proto_msgTypes[2]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -155,7 +155,7 @@ func (x *DeleteTableRequest) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use DeleteTableRequest.ProtoReflect.Descriptor instead.
 func (*DeleteTableRequest) Descriptor() ([]byte, []int) {
-	return file_deephaven_proto_inputtable_proto_rawDescGZIP(), []int{2}
+	return file_deephaven_core_proto_inputtable_proto_rawDescGZIP(), []int{2}
 }
 
 func (x *DeleteTableRequest) GetInputTable() *ticket.Ticket {
@@ -181,7 +181,7 @@ type DeleteTableResponse struct {
 func (x *DeleteTableResponse) Reset() {
 	*x = DeleteTableResponse{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_deephaven_proto_inputtable_proto_msgTypes[3]
+		mi := &file_deephaven_core_proto_inputtable_proto_msgTypes[3]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -194,7 +194,7 @@ func (x *DeleteTableResponse) String() string {
 func (*DeleteTableResponse) ProtoMessage() {}
 
 func (x *DeleteTableResponse) ProtoReflect() protoreflect.Message {
-	mi := &file_deephaven_proto_inputtable_proto_msgTypes[3]
+	mi := &file_deephaven_core_proto_inputtable_proto_msgTypes[3]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -207,90 +207,91 @@ func (x *DeleteTableResponse) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use DeleteTableResponse.ProtoReflect.Descriptor instead.
 func (*DeleteTableResponse) Descriptor() ([]byte, []int) {
-	return file_deephaven_proto_inputtable_proto_rawDescGZIP(), []int{3}
+	return file_deephaven_core_proto_inputtable_proto_rawDescGZIP(), []int{3}
 }
 
-var File_deephaven_proto_inputtable_proto protoreflect.FileDescriptor
-
-var file_deephaven_proto_inputtable_proto_rawDesc = []byte{
-	0x0a, 0x20, 0x64, 0x65, 0x65, 0x70, 0x68, 0x61, 0x76, 0x65, 0x6e, 0x2f, 0x70, 0x72, 0x6f, 0x74,
-	0x6f, 0x2f, 0x69, 0x6e, 0x70, 0x75, 0x74, 0x74, 0x61, 0x62, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f,
-	0x74, 0x6f, 0x12, 0x21, 0x69, 0x6f, 0x2e, 0x64, 0x65, 0x65, 0x70, 0x68, 0x61, 0x76, 0x65, 0x6e,
-	0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x62, 0x61, 0x63, 0x6b, 0x70, 0x6c, 0x61, 0x6e, 0x65,
-	0x2e, 0x67, 0x72, 0x70, 0x63, 0x1a, 0x1c, 0x64, 0x65, 0x65, 0x70, 0x68, 0x61, 0x76, 0x65, 0x6e,
-	0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2f, 0x74, 0x69, 0x63, 0x6b, 0x65, 0x74, 0x2e, 0x70, 0x72,
-	0x6f, 0x74, 0x6f, 0x22, 0xaa, 0x01, 0x0a, 0x0f, 0x41, 0x64, 0x64, 0x54, 0x61, 0x62, 0x6c, 0x65,
-	0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x4a, 0x0a, 0x0b, 0x69, 0x6e, 0x70, 0x75, 0x74,
-	0x5f, 0x74, 0x61, 0x62, 0x6c, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x29, 0x2e, 0x69,
-	0x6f, 0x2e, 0x64, 0x65, 0x65, 0x70, 0x68, 0x61, 0x76, 0x65, 0x6e, 0x2e, 0x70, 0x72, 0x6f, 0x74,
-	0x6f, 0x2e, 0x62, 0x61, 0x63, 0x6b, 0x70, 0x6c, 0x61, 0x6e, 0x65, 0x2e, 0x67, 0x72, 0x70, 0x63,
-	0x2e, 0x54, 0x69, 0x63, 0x6b, 0x65, 0x74, 0x52, 0x0a, 0x69, 0x6e, 0x70, 0x75, 0x74, 0x54, 0x61,
-	0x62, 0x6c, 0x65, 0x12, 0x4b, 0x0a, 0x0c, 0x74, 0x61, 0x62, 0x6c, 0x65, 0x5f, 0x74, 0x6f, 0x5f,
-	0x61, 0x64, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x29, 0x2e, 0x69, 0x6f, 0x2e, 0x64,
-	0x65, 0x65, 0x70, 0x68, 0x61, 0x76, 0x65, 0x6e, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x62,
-	0x61, 0x63, 0x6b, 0x70, 0x6c, 0x61, 0x6e, 0x65, 0x2e, 0x67, 0x72, 0x70, 0x63, 0x2e, 0x54, 0x69,
-	0x63, 0x6b, 0x65, 0x74, 0x52, 0x0a, 0x74, 0x61, 0x62, 0x6c, 0x65, 0x54, 0x6f, 0x41, 0x64, 0x64,
-	0x22, 0x12, 0x0a, 0x10, 0x41, 0x64, 0x64, 0x54, 0x61, 0x62, 0x6c, 0x65, 0x52, 0x65, 0x73, 0x70,
-	0x6f, 0x6e, 0x73, 0x65, 0x22, 0xb3, 0x01, 0x0a, 0x12, 0x44, 0x65, 0x6c, 0x65, 0x74, 0x65, 0x54,
-	0x61, 0x62, 0x6c, 0x65, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x4a, 0x0a, 0x0b, 0x69,
-	0x6e, 0x70, 0x75, 0x74, 0x5f, 0x74, 0x61, 0x62, 0x6c, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b,
-	0x32, 0x29, 0x2e, 0x69, 0x6f, 0x2e, 0x64, 0x65, 0x65, 0x70, 0x68, 0x61, 0x76, 0x65, 0x6e, 0x2e,
-	0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x62, 0x61, 0x63, 0x6b, 0x70, 0x6c, 0x61, 0x6e, 0x65, 0x2e,
-	0x67, 0x72, 0x70, 0x63, 0x2e, 0x54, 0x69, 0x63, 0x6b, 0x65, 0x74, 0x52, 0x0a, 0x69, 0x6e, 0x70,
-	0x75, 0x74, 0x54, 0x61, 0x62, 0x6c, 0x65, 0x12, 0x51, 0x0a, 0x0f, 0x74, 0x61, 0x62, 0x6c, 0x65,
-	0x5f, 0x74, 0x6f, 0x5f, 0x72, 0x65, 0x6d, 0x6f, 0x76, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b,
-	0x32, 0x29, 0x2e, 0x69, 0x6f, 0x2e, 0x64, 0x65, 0x65, 0x70, 0x68, 0x61, 0x76, 0x65, 0x6e, 0x2e,
-	0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x62, 0x61, 0x63, 0x6b, 0x70, 0x6c, 0x61, 0x6e, 0x65, 0x2e,
-	0x67, 0x72, 0x70, 0x63, 0x2e, 0x54, 0x69, 0x63, 0x6b, 0x65, 0x74, 0x52, 0x0d, 0x74, 0x61, 0x62,
-	0x6c, 0x65, 0x54, 0x6f, 0x52, 0x65, 0x6d, 0x6f, 0x76, 0x65, 0x22, 0x15, 0x0a, 0x13, 0x44, 0x65,
-	0x6c, 0x65, 0x74, 0x65, 0x54, 0x61, 0x62, 0x6c, 0x65, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73,
-	0x65, 0x32, 0xa6, 0x02, 0x0a, 0x11, 0x49, 0x6e, 0x70, 0x75, 0x74, 0x54, 0x61, 0x62, 0x6c, 0x65,
-	0x53, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x12, 0x81, 0x01, 0x0a, 0x14, 0x41, 0x64, 0x64, 0x54,
-	0x61, 0x62, 0x6c, 0x65, 0x54, 0x6f, 0x49, 0x6e, 0x70, 0x75, 0x74, 0x54, 0x61, 0x62, 0x6c, 0x65,
-	0x12, 0x32, 0x2e, 0x69, 0x6f, 0x2e, 0x64, 0x65, 0x65, 0x70, 0x68, 0x61, 0x76, 0x65, 0x6e, 0x2e,
-	0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x62, 0x61, 0x63, 0x6b, 0x70, 0x6c, 0x61, 0x6e, 0x65, 0x2e,
-	0x67, 0x72, 0x70, 0x63, 0x2e, 0x41, 0x64, 0x64, 0x54, 0x61, 0x62, 0x6c, 0x65, 0x52, 0x65, 0x71,
-	0x75, 0x65, 0x73, 0x74, 0x1a, 0x33, 0x2e, 0x69, 0x6f, 0x2e, 0x64, 0x65, 0x65, 0x70, 0x68, 0x61,
-	0x76, 0x65, 0x6e, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x62, 0x61, 0x63, 0x6b, 0x70, 0x6c,
-	0x61, 0x6e, 0x65, 0x2e, 0x67, 0x72, 0x70, 0x63, 0x2e, 0x41, 0x64, 0x64, 0x54, 0x61, 0x62, 0x6c,
-	0x65, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x00, 0x12, 0x8c, 0x01, 0x0a, 0x19,
-	0x44, 0x65, 0x6c, 0x65, 0x74, 0x65, 0x54, 0x61, 0x62, 0x6c, 0x65, 0x46, 0x72, 0x6f, 0x6d, 0x49,
-	0x6e, 0x70, 0x75, 0x74, 0x54, 0x61, 0x62, 0x6c, 0x65, 0x12, 0x35, 0x2e, 0x69, 0x6f, 0x2e, 0x64,
-	0x65, 0x65, 0x70, 0x68, 0x61, 0x76, 0x65, 0x6e, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x62,
-	0x61, 0x63, 0x6b, 0x70, 0x6c, 0x61, 0x6e, 0x65, 0x2e, 0x67, 0x72, 0x70, 0x63, 0x2e, 0x44, 0x65,
-	0x6c, 0x65, 0x74, 0x65, 0x54, 0x61, 0x62, 0x6c, 0x65, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74,
-	0x1a, 0x36, 0x2e, 0x69, 0x6f, 0x2e, 0x64, 0x65, 0x65, 0x70, 0x68, 0x61, 0x76, 0x65, 0x6e, 0x2e,
-	0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x62, 0x61, 0x63, 0x6b, 0x70, 0x6c, 0x61, 0x6e, 0x65, 0x2e,
-	0x67, 0x72, 0x70, 0x63, 0x2e, 0x44, 0x65, 0x6c, 0x65, 0x74, 0x65, 0x54, 0x61, 0x62, 0x6c, 0x65,
-	0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x00, 0x42, 0x46, 0x48, 0x01, 0x50, 0x01,
-	0x5a, 0x40, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x64, 0x65, 0x65,
-	0x70, 0x68, 0x61, 0x76, 0x65, 0x6e, 0x2f, 0x64, 0x65, 0x65, 0x70, 0x68, 0x61, 0x76, 0x65, 0x6e,
-	0x2d, 0x63, 0x6f, 0x72, 0x65, 0x2f, 0x67, 0x6f, 0x2f, 0x69, 0x6e, 0x74, 0x65, 0x72, 0x6e, 0x61,
-	0x6c, 0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2f, 0x69, 0x6e, 0x70, 0x75, 0x74, 0x74, 0x61, 0x62,
-	0x6c, 0x65, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
+var File_deephaven_core_proto_inputtable_proto protoreflect.FileDescriptor
+
+var file_deephaven_core_proto_inputtable_proto_rawDesc = []byte{
+	0x0a, 0x25, 0x64, 0x65, 0x65, 0x70, 0x68, 0x61, 0x76, 0x65, 0x6e, 0x5f, 0x63, 0x6f, 0x72, 0x65,
+	0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2f, 0x69, 0x6e, 0x70, 0x75, 0x74, 0x74, 0x61, 0x62, 0x6c,
+	0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x12, 0x21, 0x69, 0x6f, 0x2e, 0x64, 0x65, 0x65, 0x70,
+	0x68, 0x61, 0x76, 0x65, 0x6e, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x62, 0x61, 0x63, 0x6b,
+	0x70, 0x6c, 0x61, 0x6e, 0x65, 0x2e, 0x67, 0x72, 0x70, 0x63, 0x1a, 0x21, 0x64, 0x65, 0x65, 0x70,
+	0x68, 0x61, 0x76, 0x65, 0x6e, 0x5f, 0x63, 0x6f, 0x72, 0x65, 0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f,
+	0x2f, 0x74, 0x69, 0x63, 0x6b, 0x65, 0x74, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x22, 0xaa, 0x01,
+	0x0a, 0x0f, 0x41, 0x64, 0x64, 0x54, 0x61, 0x62, 0x6c, 0x65, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73,
+	0x74, 0x12, 0x4a, 0x0a, 0x0b, 0x69, 0x6e, 0x70, 0x75, 0x74, 0x5f, 0x74, 0x61, 0x62, 0x6c, 0x65,
+	0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x29, 0x2e, 0x69, 0x6f, 0x2e, 0x64, 0x65, 0x65, 0x70,
+	0x68, 0x61, 0x76, 0x65, 0x6e, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x62, 0x61, 0x63, 0x6b,
+	0x70, 0x6c, 0x61, 0x6e, 0x65, 0x2e, 0x67, 0x72, 0x70, 0x63, 0x2e, 0x54, 0x69, 0x63, 0x6b, 0x65,
+	0x74, 0x52, 0x0a, 0x69, 0x6e, 0x70, 0x75, 0x74, 0x54, 0x61, 0x62, 0x6c, 0x65, 0x12, 0x4b, 0x0a,
+	0x0c, 0x74, 0x61, 0x62, 0x6c, 0x65, 0x5f, 0x74, 0x6f, 0x5f, 0x61, 0x64, 0x64, 0x18, 0x02, 0x20,
+	0x01, 0x28, 0x0b, 0x32, 0x29, 0x2e, 0x69, 0x6f, 0x2e, 0x64, 0x65, 0x65, 0x70, 0x68, 0x61, 0x76,
+	0x65, 0x6e, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x62, 0x61, 0x63, 0x6b, 0x70, 0x6c, 0x61,
+	0x6e, 0x65, 0x2e, 0x67, 0x72, 0x70, 0x63, 0x2e, 0x54, 0x69, 0x63, 0x6b, 0x65, 0x74, 0x52, 0x0a,
+	0x74, 0x61, 0x62, 0x6c, 0x65, 0x54, 0x6f, 0x41, 0x64, 0x64, 0x22, 0x12, 0x0a, 0x10, 0x41, 0x64,
+	0x64, 0x54, 0x61, 0x62, 0x6c, 0x65, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0xb3,
+	0x01, 0x0a, 0x12, 0x44, 0x65, 0x6c, 0x65, 0x74, 0x65, 0x54, 0x61, 0x62, 0x6c, 0x65, 0x52, 0x65,
+	0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x4a, 0x0a, 0x0b, 0x69, 0x6e, 0x70, 0x75, 0x74, 0x5f, 0x74,
+	0x61, 0x62, 0x6c, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x29, 0x2e, 0x69, 0x6f, 0x2e,
+	0x64, 0x65, 0x65, 0x70, 0x68, 0x61, 0x76, 0x65, 0x6e, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e,
+	0x62, 0x61, 0x63, 0x6b, 0x70, 0x6c, 0x61, 0x6e, 0x65, 0x2e, 0x67, 0x72, 0x70, 0x63, 0x2e, 0x54,
+	0x69, 0x63, 0x6b, 0x65, 0x74, 0x52, 0x0a, 0x69, 0x6e, 0x70, 0x75, 0x74, 0x54, 0x61, 0x62, 0x6c,
+	0x65, 0x12, 0x51, 0x0a, 0x0f, 0x74, 0x61, 0x62, 0x6c, 0x65, 0x5f, 0x74, 0x6f, 0x5f, 0x72, 0x65,
+	0x6d, 0x6f, 0x76, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x29, 0x2e, 0x69, 0x6f, 0x2e,
+	0x64, 0x65, 0x65, 0x70, 0x68, 0x61, 0x76, 0x65, 0x6e, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e,
+	0x62, 0x61, 0x63, 0x6b, 0x70, 0x6c, 0x61, 0x6e, 0x65, 0x2e, 0x67, 0x72, 0x70, 0x63, 0x2e, 0x54,
+	0x69, 0x63, 0x6b, 0x65, 0x74, 0x52, 0x0d, 0x74, 0x61, 0x62, 0x6c, 0x65, 0x54, 0x6f, 0x52, 0x65,
+	0x6d, 0x6f, 0x76, 0x65, 0x22, 0x15, 0x0a, 0x13, 0x44, 0x65, 0x6c, 0x65, 0x74, 0x65, 0x54, 0x61,
+	0x62, 0x6c, 0x65, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x32, 0xa6, 0x02, 0x0a, 0x11,
+	0x49, 0x6e, 0x70, 0x75, 0x74, 0x54, 0x61, 0x62, 0x6c, 0x65, 0x53, 0x65, 0x72, 0x76, 0x69, 0x63,
+	0x65, 0x12, 0x81, 0x01, 0x0a, 0x14, 0x41, 0x64, 0x64, 0x54, 0x61, 0x62, 0x6c, 0x65, 0x54, 0x6f,
+	0x49, 0x6e, 0x70, 0x75, 0x74, 0x54, 0x61, 0x62, 0x6c, 0x65, 0x12, 0x32, 0x2e, 0x69, 0x6f, 0x2e,
+	0x64, 0x65, 0x65, 0x70, 0x68, 0x61, 0x76, 0x65, 0x6e, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e,
+	0x62, 0x61, 0x63, 0x6b, 0x70, 0x6c, 0x61, 0x6e, 0x65, 0x2e, 0x67, 0x72, 0x70, 0x63, 0x2e, 0x41,
+	0x64, 0x64, 0x54, 0x61, 0x62, 0x6c, 0x65, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x33,
+	0x2e, 0x69, 0x6f, 0x2e, 0x64, 0x65, 0x65, 0x70, 0x68, 0x61, 0x76, 0x65, 0x6e, 0x2e, 0x70, 0x72,
+	0x6f, 0x74, 0x6f, 0x2e, 0x62, 0x61, 0x63, 0x6b, 0x70, 0x6c, 0x61, 0x6e, 0x65, 0x2e, 0x67, 0x72,
+	0x70, 0x63, 0x2e, 0x41, 0x64, 0x64, 0x54, 0x61, 0x62, 0x6c, 0x65, 0x52, 0x65, 0x73, 0x70, 0x6f,
+	0x6e, 0x73, 0x65, 0x22, 0x00, 0x12, 0x8c, 0x01, 0x0a, 0x19, 0x44, 0x65, 0x6c, 0x65, 0x74, 0x65,
+	0x54, 0x61, 0x62, 0x6c, 0x65, 0x46, 0x72, 0x6f, 0x6d, 0x49, 0x6e, 0x70, 0x75, 0x74, 0x54, 0x61,
+	0x62, 0x6c, 0x65, 0x12, 0x35, 0x2e, 0x69, 0x6f, 0x2e, 0x64, 0x65, 0x65, 0x70, 0x68, 0x61, 0x76,
+	0x65, 0x6e, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x62, 0x61, 0x63, 0x6b, 0x70, 0x6c, 0x61,
+	0x6e, 0x65, 0x2e, 0x67, 0x72, 0x70, 0x63, 0x2e, 0x44, 0x65, 0x6c, 0x65, 0x74, 0x65, 0x54, 0x61,
+	0x62, 0x6c, 0x65, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x36, 0x2e, 0x69, 0x6f, 0x2e,
+	0x64, 0x65, 0x65, 0x70, 0x68, 0x61, 0x76, 0x65, 0x6e, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e,
+	0x62, 0x61, 0x63, 0x6b, 0x70, 0x6c, 0x61, 0x6e, 0x65, 0x2e, 0x67, 0x72, 0x70, 0x63, 0x2e, 0x44,
+	0x65, 0x6c, 0x65, 0x74, 0x65, 0x54, 0x61, 0x62, 0x6c, 0x65, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e,
+	0x73, 0x65, 0x22, 0x00, 0x42, 0x46, 0x48, 0x01, 0x50, 0x01, 0x5a, 0x40, 0x67, 0x69, 0x74, 0x68,
+	0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x64, 0x65, 0x65, 0x70, 0x68, 0x61, 0x76, 0x65, 0x6e,
+	0x2f, 0x64, 0x65, 0x65, 0x70, 0x68, 0x61, 0x76, 0x65, 0x6e, 0x2d, 0x63, 0x6f, 0x72, 0x65, 0x2f,
+	0x67, 0x6f, 0x2f, 0x69, 0x6e, 0x74, 0x65, 0x72, 0x6e, 0x61, 0x6c, 0x2f, 0x70, 0x72, 0x6f, 0x74,
+	0x6f, 0x2f, 0x69, 0x6e, 0x70, 0x75, 0x74, 0x74, 0x61, 0x62, 0x6c, 0x65, 0x62, 0x06, 0x70, 0x72,
+	0x6f, 0x74, 0x6f, 0x33,
 }
 
 var (
-	file_deephaven_proto_inputtable_proto_rawDescOnce sync.Once
-	file_deephaven_proto_inputtable_proto_rawDescData = file_deephaven_proto_inputtable_proto_rawDesc
+	file_deephaven_core_proto_inputtable_proto_rawDescOnce sync.Once
+	file_deephaven_core_proto_inputtable_proto_rawDescData = file_deephaven_core_proto_inputtable_proto_rawDesc
 )
 
-func file_deephaven_proto_inputtable_proto_rawDescGZIP() []byte {
-	file_deephaven_proto_inputtable_proto_rawDescOnce.Do(func() {
-		file_deephaven_proto_inputtable_proto_rawDescData = protoimpl.X.CompressGZIP(file_deephaven_proto_inputtable_proto_rawDescData)
+func file_deephaven_core_proto_inputtable_proto_rawDescGZIP() []byte {
+	file_deephaven_core_proto_inputtable_proto_rawDescOnce.Do(func() {
+		file_deephaven_core_proto_inputtable_proto_rawDescData = protoimpl.X.CompressGZIP(file_deephaven_core_proto_inputtable_proto_rawDescData)
 	})
-	return file_deephaven_proto_inputtable_proto_rawDescData
+	return file_deephaven_core_proto_inputtable_proto_rawDescData
 }
 
-var file_deephaven_proto_inputtable_proto_msgTypes = make([]protoimpl.MessageInfo, 4)
-var file_deephaven_proto_inputtable_proto_goTypes = []interface{}{
+var file_deephaven_core_proto_inputtable_proto_msgTypes = make([]protoimpl.MessageInfo, 4)
+var file_deephaven_core_proto_inputtable_proto_goTypes = []interface{}{
 	(*AddTableRequest)(nil),     // 0: io.deephaven.proto.backplane.grpc.AddTableRequest
 	(*AddTableResponse)(nil),    // 1: io.deephaven.proto.backplane.grpc.AddTableResponse
 	(*DeleteTableRequest)(nil),  // 2: io.deephaven.proto.backplane.grpc.DeleteTableRequest
 	(*DeleteTableResponse)(nil), // 3: io.deephaven.proto.backplane.grpc.DeleteTableResponse
 	(*ticket.Ticket)(nil),       // 4: io.deephaven.proto.backplane.grpc.Ticket
 }
-var file_deephaven_proto_inputtable_proto_depIdxs = []int32{
+var file_deephaven_core_proto_inputtable_proto_depIdxs = []int32{
 	4, // 0: io.deephaven.proto.backplane.grpc.AddTableRequest.input_table:type_name -> io.deephaven.proto.backplane.grpc.Ticket
 	4, // 1: io.deephaven.proto.backplane.grpc.AddTableRequest.table_to_add:type_name -> io.deephaven.proto.backplane.grpc.Ticket
 	4, // 2: io.deephaven.proto.backplane.grpc.DeleteTableRequest.input_table:type_name -> io.deephaven.proto.backplane.grpc.Ticket
@@ -306,13 +307,13 @@ var file_deephaven_proto_inputtable_proto_depIdxs = []int32{
 	0, // [0:4] is the sub-list for field type_name
 }
 
-func init() { file_deephaven_proto_inputtable_proto_init() }
-func file_deephaven_proto_inputtable_proto_init() {
-	if File_deephaven_proto_inputtable_proto != nil {
+func init() { file_deephaven_core_proto_inputtable_proto_init() }
+func file_deephaven_core_proto_inputtable_proto_init() {
+	if File_deephaven_core_proto_inputtable_proto != nil {
 		return
 	}
 	if !protoimpl.UnsafeEnabled {
-		file_deephaven_proto_inputtable_proto_msgTypes[0].Exporter = func(v interface{}, i int) interface{} {
+		file_deephaven_core_proto_inputtable_proto_msgTypes[0].Exporter = func(v interface{}, i int) interface{} {
 			switch v := v.(*AddTableRequest); i {
 			case 0:
 				return &v.state
@@ -324,7 +325,7 @@ func file_deephaven_proto_inputtable_proto_init() {
 				return nil
 			}
 		}
-		file_deephaven_proto_inputtable_proto_msgTypes[1].Exporter = func(v interface{}, i int) interface{} {
+		file_deephaven_core_proto_inputtable_proto_msgTypes[1].Exporter = func(v interface{}, i int) interface{} {
 			switch v := v.(*AddTableResponse); i {
 			case 0:
 				return &v.state
@@ -336,7 +337,7 @@ func file_deephaven_proto_inputtable_proto_init() {
 				return nil
 			}
 		}
-		file_deephaven_proto_inputtable_proto_msgTypes[2].Exporter = func(v interface{}, i int) interface{} {
+		file_deephaven_core_proto_inputtable_proto_msgTypes[2].Exporter = func(v interface{}, i int) interface{} {
 			switch v := v.(*DeleteTableRequest); i {
 			case 0:
 				return &v.state
@@ -348,7 +349,7 @@ func file_deephaven_proto_inputtable_proto_init() {
 				return nil
 			}
 		}
-		file_deephaven_proto_inputtable_proto_msgTypes[3].Exporter = func(v interface{}, i int) interface{} {
+		file_deephaven_core_proto_inputtable_proto_msgTypes[3].Exporter = func(v interface{}, i int) interface{} {
 			switch v := v.(*DeleteTableResponse); i {
 			case 0:
 				return &v.state
@@ -365,18 +366,18 @@ func file_deephaven_proto_inputtable_proto_init() {
 	out := protoimpl.TypeBuilder{
 		File: protoimpl.DescBuilder{
 			GoPackagePath: reflect.TypeOf(x{}).PkgPath(),
-			RawDescriptor: file_deephaven_proto_inputtable_proto_rawDesc,
+			RawDescriptor: file_deephaven_core_proto_inputtable_proto_rawDesc,
 			NumEnums:      0,
 			NumMessages:   4,
 			NumExtensions: 0,
 			NumServices:   1,
 		},
-		GoTypes:           file_deephaven_proto_inputtable_proto_goTypes,
-		DependencyIndexes: file_deephaven_proto_inputtable_proto_depIdxs,
-		MessageInfos:      file_deephaven_proto_inputtable_proto_msgTypes,
+		GoTypes:           file_deephaven_core_proto_inputtable_proto_goTypes,
+		DependencyIndexes: file_deephaven_core_proto_inputtable_proto_depIdxs,
+		MessageInfos:      file_deephaven_core_proto_inputtable_proto_msgTypes,
 	}.Build()
-	File_deephaven_proto_inputtable_proto = out.File
-	file_deephaven_proto_inputtable_proto_rawDesc = nil
-	file_deephaven_proto_inputtable_proto_goTypes = nil
-	file_deephaven_proto_inputtable_proto_depIdxs = nil
+	File_deephaven_core_proto_inputtable_proto = out.File
+	file_deephaven_core_proto_inputtable_proto_rawDesc = nil
+	file_deephaven_core_proto_inputtable_proto_goTypes = nil
+	file_deephaven_core_proto_inputtable_proto_depIdxs = nil
 }
diff --git a/go/internal/proto/inputtable/inputtable_grpc.pb.go b/go/internal/proto/inputtable/inputtable_grpc.pb.go
index 5e56b810568..7a02727bfb0 100644
--- a/go/internal/proto/inputtable/inputtable_grpc.pb.go
+++ b/go/internal/proto/inputtable/inputtable_grpc.pb.go
@@ -2,7 +2,7 @@
 // versions:
 // - protoc-gen-go-grpc v1.2.0
 // - protoc             v4.25.3
-// source: deephaven/proto/inputtable.proto
+// source: deephaven_core/proto/inputtable.proto
 
 package inputtable
 
@@ -149,5 +149,5 @@ var InputTableService_ServiceDesc = grpc.ServiceDesc{
 		},
 	},
 	Streams:  []grpc.StreamDesc{},
-	Metadata: "deephaven/proto/inputtable.proto",
+	Metadata: "deephaven_core/proto/inputtable.proto",
 }
diff --git a/go/internal/proto/object/object.pb.go b/go/internal/proto/object/object.pb.go
index 81e7caad680..425f4afb85c 100644
--- a/go/internal/proto/object/object.pb.go
+++ b/go/internal/proto/object/object.pb.go
@@ -5,7 +5,7 @@
 // versions:
 // 	protoc-gen-go v1.28.1
 // 	protoc        v4.25.3
-// source: deephaven/proto/object.proto
+// source: deephaven_core/proto/object.proto
 
 package object
 
@@ -35,7 +35,7 @@ type FetchObjectRequest struct {
 func (x *FetchObjectRequest) Reset() {
 	*x = FetchObjectRequest{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_deephaven_proto_object_proto_msgTypes[0]
+		mi := &file_deephaven_core_proto_object_proto_msgTypes[0]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -48,7 +48,7 @@ func (x *FetchObjectRequest) String() string {
 func (*FetchObjectRequest) ProtoMessage() {}
 
 func (x *FetchObjectRequest) ProtoReflect() protoreflect.Message {
-	mi := &file_deephaven_proto_object_proto_msgTypes[0]
+	mi := &file_deephaven_core_proto_object_proto_msgTypes[0]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -61,7 +61,7 @@ func (x *FetchObjectRequest) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use FetchObjectRequest.ProtoReflect.Descriptor instead.
 func (*FetchObjectRequest) Descriptor() ([]byte, []int) {
-	return file_deephaven_proto_object_proto_rawDescGZIP(), []int{0}
+	return file_deephaven_core_proto_object_proto_rawDescGZIP(), []int{0}
 }
 
 func (x *FetchObjectRequest) GetSourceId() *ticket.TypedTicket {
@@ -84,7 +84,7 @@ type FetchObjectResponse struct {
 func (x *FetchObjectResponse) Reset() {
 	*x = FetchObjectResponse{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_deephaven_proto_object_proto_msgTypes[1]
+		mi := &file_deephaven_core_proto_object_proto_msgTypes[1]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -97,7 +97,7 @@ func (x *FetchObjectResponse) String() string {
 func (*FetchObjectResponse) ProtoMessage() {}
 
 func (x *FetchObjectResponse) ProtoReflect() protoreflect.Message {
-	mi := &file_deephaven_proto_object_proto_msgTypes[1]
+	mi := &file_deephaven_core_proto_object_proto_msgTypes[1]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -110,7 +110,7 @@ func (x *FetchObjectResponse) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use FetchObjectResponse.ProtoReflect.Descriptor instead.
 func (*FetchObjectResponse) Descriptor() ([]byte, []int) {
-	return file_deephaven_proto_object_proto_rawDescGZIP(), []int{1}
+	return file_deephaven_core_proto_object_proto_rawDescGZIP(), []int{1}
 }
 
 func (x *FetchObjectResponse) GetType() string {
@@ -148,7 +148,7 @@ type ConnectRequest struct {
 func (x *ConnectRequest) Reset() {
 	*x = ConnectRequest{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_deephaven_proto_object_proto_msgTypes[2]
+		mi := &file_deephaven_core_proto_object_proto_msgTypes[2]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -161,7 +161,7 @@ func (x *ConnectRequest) String() string {
 func (*ConnectRequest) ProtoMessage() {}
 
 func (x *ConnectRequest) ProtoReflect() protoreflect.Message {
-	mi := &file_deephaven_proto_object_proto_msgTypes[2]
+	mi := &file_deephaven_core_proto_object_proto_msgTypes[2]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -174,7 +174,7 @@ func (x *ConnectRequest) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use ConnectRequest.ProtoReflect.Descriptor instead.
 func (*ConnectRequest) Descriptor() ([]byte, []int) {
-	return file_deephaven_proto_object_proto_rawDescGZIP(), []int{2}
+	return file_deephaven_core_proto_object_proto_rawDescGZIP(), []int{2}
 }
 
 func (x *ConnectRequest) GetSourceId() *ticket.TypedTicket {
@@ -208,7 +208,7 @@ type ClientData struct {
 func (x *ClientData) Reset() {
 	*x = ClientData{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_deephaven_proto_object_proto_msgTypes[3]
+		mi := &file_deephaven_core_proto_object_proto_msgTypes[3]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -221,7 +221,7 @@ func (x *ClientData) String() string {
 func (*ClientData) ProtoMessage() {}
 
 func (x *ClientData) ProtoReflect() protoreflect.Message {
-	mi := &file_deephaven_proto_object_proto_msgTypes[3]
+	mi := &file_deephaven_core_proto_object_proto_msgTypes[3]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -234,7 +234,7 @@ func (x *ClientData) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use ClientData.ProtoReflect.Descriptor instead.
 func (*ClientData) Descriptor() ([]byte, []int) {
-	return file_deephaven_proto_object_proto_rawDescGZIP(), []int{3}
+	return file_deephaven_core_proto_object_proto_rawDescGZIP(), []int{3}
 }
 
 func (x *ClientData) GetPayload() []byte {
@@ -275,7 +275,7 @@ type ServerData struct {
 func (x *ServerData) Reset() {
 	*x = ServerData{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_deephaven_proto_object_proto_msgTypes[4]
+		mi := &file_deephaven_core_proto_object_proto_msgTypes[4]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -288,7 +288,7 @@ func (x *ServerData) String() string {
 func (*ServerData) ProtoMessage() {}
 
 func (x *ServerData) ProtoReflect() protoreflect.Message {
-	mi := &file_deephaven_proto_object_proto_msgTypes[4]
+	mi := &file_deephaven_core_proto_object_proto_msgTypes[4]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -301,7 +301,7 @@ func (x *ServerData) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use ServerData.ProtoReflect.Descriptor instead.
 func (*ServerData) Descriptor() ([]byte, []int) {
-	return file_deephaven_proto_object_proto_rawDescGZIP(), []int{4}
+	return file_deephaven_core_proto_object_proto_rawDescGZIP(), []int{4}
 }
 
 func (x *ServerData) GetPayload() []byte {
@@ -334,7 +334,7 @@ type StreamRequest struct {
 func (x *StreamRequest) Reset() {
 	*x = StreamRequest{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_deephaven_proto_object_proto_msgTypes[5]
+		mi := &file_deephaven_core_proto_object_proto_msgTypes[5]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -347,7 +347,7 @@ func (x *StreamRequest) String() string {
 func (*StreamRequest) ProtoMessage() {}
 
 func (x *StreamRequest) ProtoReflect() protoreflect.Message {
-	mi := &file_deephaven_proto_object_proto_msgTypes[5]
+	mi := &file_deephaven_core_proto_object_proto_msgTypes[5]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -360,7 +360,7 @@ func (x *StreamRequest) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use StreamRequest.ProtoReflect.Descriptor instead.
 func (*StreamRequest) Descriptor() ([]byte, []int) {
-	return file_deephaven_proto_object_proto_rawDescGZIP(), []int{5}
+	return file_deephaven_core_proto_object_proto_rawDescGZIP(), []int{5}
 }
 
 func (m *StreamRequest) GetMessage() isStreamRequest_Message {
@@ -418,7 +418,7 @@ type StreamResponse struct {
 func (x *StreamResponse) Reset() {
 	*x = StreamResponse{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_deephaven_proto_object_proto_msgTypes[6]
+		mi := &file_deephaven_core_proto_object_proto_msgTypes[6]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -431,7 +431,7 @@ func (x *StreamResponse) String() string {
 func (*StreamResponse) ProtoMessage() {}
 
 func (x *StreamResponse) ProtoReflect() protoreflect.Message {
-	mi := &file_deephaven_proto_object_proto_msgTypes[6]
+	mi := &file_deephaven_core_proto_object_proto_msgTypes[6]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -444,7 +444,7 @@ func (x *StreamResponse) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use StreamResponse.ProtoReflect.Descriptor instead.
 func (*StreamResponse) Descriptor() ([]byte, []int) {
-	return file_deephaven_proto_object_proto_rawDescGZIP(), []int{6}
+	return file_deephaven_core_proto_object_proto_rawDescGZIP(), []int{6}
 }
 
 func (m *StreamResponse) GetMessage() isStreamResponse_Message {
@@ -481,7 +481,7 @@ type BrowserNextResponse struct {
 func (x *BrowserNextResponse) Reset() {
 	*x = BrowserNextResponse{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_deephaven_proto_object_proto_msgTypes[7]
+		mi := &file_deephaven_core_proto_object_proto_msgTypes[7]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -494,7 +494,7 @@ func (x *BrowserNextResponse) String() string {
 func (*BrowserNextResponse) ProtoMessage() {}
 
 func (x *BrowserNextResponse) ProtoReflect() protoreflect.Message {
-	mi := &file_deephaven_proto_object_proto_msgTypes[7]
+	mi := &file_deephaven_core_proto_object_proto_msgTypes[7]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -507,129 +507,129 @@ func (x *BrowserNextResponse) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use BrowserNextResponse.ProtoReflect.Descriptor instead.
 func (*BrowserNextResponse) Descriptor() ([]byte, []int) {
-	return file_deephaven_proto_object_proto_rawDescGZIP(), []int{7}
-}
-
-var File_deephaven_proto_object_proto protoreflect.FileDescriptor
-
-var file_deephaven_proto_object_proto_rawDesc = []byte{
-	0x0a, 0x1c, 0x64, 0x65, 0x65, 0x70, 0x68, 0x61, 0x76, 0x65, 0x6e, 0x2f, 0x70, 0x72, 0x6f, 0x74,
-	0x6f, 0x2f, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x12, 0x21,
-	0x69, 0x6f, 0x2e, 0x64, 0x65, 0x65, 0x70, 0x68, 0x61, 0x76, 0x65, 0x6e, 0x2e, 0x70, 0x72, 0x6f,
-	0x74, 0x6f, 0x2e, 0x62, 0x61, 0x63, 0x6b, 0x70, 0x6c, 0x61, 0x6e, 0x65, 0x2e, 0x67, 0x72, 0x70,
-	0x63, 0x1a, 0x1c, 0x64, 0x65, 0x65, 0x70, 0x68, 0x61, 0x76, 0x65, 0x6e, 0x2f, 0x70, 0x72, 0x6f,
-	0x74, 0x6f, 0x2f, 0x74, 0x69, 0x63, 0x6b, 0x65, 0x74, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x22,
-	0x61, 0x0a, 0x12, 0x46, 0x65, 0x74, 0x63, 0x68, 0x4f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x52, 0x65,
-	0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x4b, 0x0a, 0x09, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x5f,
-	0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x2e, 0x2e, 0x69, 0x6f, 0x2e, 0x64, 0x65,
-	0x65, 0x70, 0x68, 0x61, 0x76, 0x65, 0x6e, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x62, 0x61,
-	0x63, 0x6b, 0x70, 0x6c, 0x61, 0x6e, 0x65, 0x2e, 0x67, 0x72, 0x70, 0x63, 0x2e, 0x54, 0x79, 0x70,
-	0x65, 0x64, 0x54, 0x69, 0x63, 0x6b, 0x65, 0x74, 0x52, 0x08, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65,
-	0x49, 0x64, 0x22, 0x97, 0x01, 0x0a, 0x13, 0x46, 0x65, 0x74, 0x63, 0x68, 0x4f, 0x62, 0x6a, 0x65,
-	0x63, 0x74, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x12, 0x0a, 0x04, 0x74, 0x79,
-	0x70, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x74, 0x79, 0x70, 0x65, 0x12, 0x12,
-	0x0a, 0x04, 0x64, 0x61, 0x74, 0x61, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0c, 0x52, 0x04, 0x64, 0x61,
-	0x74, 0x61, 0x12, 0x58, 0x0a, 0x10, 0x74, 0x79, 0x70, 0x65, 0x64, 0x5f, 0x65, 0x78, 0x70, 0x6f,
-	0x72, 0x74, 0x5f, 0x69, 0x64, 0x73, 0x18, 0x03, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x2e, 0x2e, 0x69,
-	0x6f, 0x2e, 0x64, 0x65, 0x65, 0x70, 0x68, 0x61, 0x76, 0x65, 0x6e, 0x2e, 0x70, 0x72, 0x6f, 0x74,
-	0x6f, 0x2e, 0x62, 0x61, 0x63, 0x6b, 0x70, 0x6c, 0x61, 0x6e, 0x65, 0x2e, 0x67, 0x72, 0x70, 0x63,
-	0x2e, 0x54, 0x79, 0x70, 0x65, 0x64, 0x54, 0x69, 0x63, 0x6b, 0x65, 0x74, 0x52, 0x0e, 0x74, 0x79,
-	0x70, 0x65, 0x64, 0x45, 0x78, 0x70, 0x6f, 0x72, 0x74, 0x49, 0x64, 0x73, 0x22, 0x5d, 0x0a, 0x0e,
-	0x43, 0x6f, 0x6e, 0x6e, 0x65, 0x63, 0x74, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x4b,
-	0x0a, 0x09, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x5f, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28,
+	return file_deephaven_core_proto_object_proto_rawDescGZIP(), []int{7}
+}
+
+var File_deephaven_core_proto_object_proto protoreflect.FileDescriptor
+
+var file_deephaven_core_proto_object_proto_rawDesc = []byte{
+	0x0a, 0x21, 0x64, 0x65, 0x65, 0x70, 0x68, 0x61, 0x76, 0x65, 0x6e, 0x5f, 0x63, 0x6f, 0x72, 0x65,
+	0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2f, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x2e, 0x70, 0x72,
+	0x6f, 0x74, 0x6f, 0x12, 0x21, 0x69, 0x6f, 0x2e, 0x64, 0x65, 0x65, 0x70, 0x68, 0x61, 0x76, 0x65,
+	0x6e, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x62, 0x61, 0x63, 0x6b, 0x70, 0x6c, 0x61, 0x6e,
+	0x65, 0x2e, 0x67, 0x72, 0x70, 0x63, 0x1a, 0x21, 0x64, 0x65, 0x65, 0x70, 0x68, 0x61, 0x76, 0x65,
+	0x6e, 0x5f, 0x63, 0x6f, 0x72, 0x65, 0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2f, 0x74, 0x69, 0x63,
+	0x6b, 0x65, 0x74, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x22, 0x61, 0x0a, 0x12, 0x46, 0x65, 0x74,
+	0x63, 0x68, 0x4f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12,
+	0x4b, 0x0a, 0x09, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x5f, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01,
+	0x28, 0x0b, 0x32, 0x2e, 0x2e, 0x69, 0x6f, 0x2e, 0x64, 0x65, 0x65, 0x70, 0x68, 0x61, 0x76, 0x65,
+	0x6e, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x62, 0x61, 0x63, 0x6b, 0x70, 0x6c, 0x61, 0x6e,
+	0x65, 0x2e, 0x67, 0x72, 0x70, 0x63, 0x2e, 0x54, 0x79, 0x70, 0x65, 0x64, 0x54, 0x69, 0x63, 0x6b,
+	0x65, 0x74, 0x52, 0x08, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x49, 0x64, 0x22, 0x97, 0x01, 0x0a,
+	0x13, 0x46, 0x65, 0x74, 0x63, 0x68, 0x4f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x52, 0x65, 0x73, 0x70,
+	0x6f, 0x6e, 0x73, 0x65, 0x12, 0x12, 0x0a, 0x04, 0x74, 0x79, 0x70, 0x65, 0x18, 0x01, 0x20, 0x01,
+	0x28, 0x09, 0x52, 0x04, 0x74, 0x79, 0x70, 0x65, 0x12, 0x12, 0x0a, 0x04, 0x64, 0x61, 0x74, 0x61,
+	0x18, 0x02, 0x20, 0x01, 0x28, 0x0c, 0x52, 0x04, 0x64, 0x61, 0x74, 0x61, 0x12, 0x58, 0x0a, 0x10,
+	0x74, 0x79, 0x70, 0x65, 0x64, 0x5f, 0x65, 0x78, 0x70, 0x6f, 0x72, 0x74, 0x5f, 0x69, 0x64, 0x73,
+	0x18, 0x03, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x2e, 0x2e, 0x69, 0x6f, 0x2e, 0x64, 0x65, 0x65, 0x70,
+	0x68, 0x61, 0x76, 0x65, 0x6e, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x62, 0x61, 0x63, 0x6b,
+	0x70, 0x6c, 0x61, 0x6e, 0x65, 0x2e, 0x67, 0x72, 0x70, 0x63, 0x2e, 0x54, 0x79, 0x70, 0x65, 0x64,
+	0x54, 0x69, 0x63, 0x6b, 0x65, 0x74, 0x52, 0x0e, 0x74, 0x79, 0x70, 0x65, 0x64, 0x45, 0x78, 0x70,
+	0x6f, 0x72, 0x74, 0x49, 0x64, 0x73, 0x22, 0x5d, 0x0a, 0x0e, 0x43, 0x6f, 0x6e, 0x6e, 0x65, 0x63,
+	0x74, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x4b, 0x0a, 0x09, 0x73, 0x6f, 0x75, 0x72,
+	0x63, 0x65, 0x5f, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x2e, 0x2e, 0x69, 0x6f,
+	0x2e, 0x64, 0x65, 0x65, 0x70, 0x68, 0x61, 0x76, 0x65, 0x6e, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f,
+	0x2e, 0x62, 0x61, 0x63, 0x6b, 0x70, 0x6c, 0x61, 0x6e, 0x65, 0x2e, 0x67, 0x72, 0x70, 0x63, 0x2e,
+	0x54, 0x79, 0x70, 0x65, 0x64, 0x54, 0x69, 0x63, 0x6b, 0x65, 0x74, 0x52, 0x08, 0x73, 0x6f, 0x75,
+	0x72, 0x63, 0x65, 0x49, 0x64, 0x22, 0x76, 0x0a, 0x0a, 0x43, 0x6c, 0x69, 0x65, 0x6e, 0x74, 0x44,
+	0x61, 0x74, 0x61, 0x12, 0x18, 0x0a, 0x07, 0x70, 0x61, 0x79, 0x6c, 0x6f, 0x61, 0x64, 0x18, 0x01,
+	0x20, 0x01, 0x28, 0x0c, 0x52, 0x07, 0x70, 0x61, 0x79, 0x6c, 0x6f, 0x61, 0x64, 0x12, 0x4e, 0x0a,
+	0x0a, 0x72, 0x65, 0x66, 0x65, 0x72, 0x65, 0x6e, 0x63, 0x65, 0x73, 0x18, 0x02, 0x20, 0x03, 0x28,
 	0x0b, 0x32, 0x2e, 0x2e, 0x69, 0x6f, 0x2e, 0x64, 0x65, 0x65, 0x70, 0x68, 0x61, 0x76, 0x65, 0x6e,
 	0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x62, 0x61, 0x63, 0x6b, 0x70, 0x6c, 0x61, 0x6e, 0x65,
 	0x2e, 0x67, 0x72, 0x70, 0x63, 0x2e, 0x54, 0x79, 0x70, 0x65, 0x64, 0x54, 0x69, 0x63, 0x6b, 0x65,
-	0x74, 0x52, 0x08, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x49, 0x64, 0x22, 0x76, 0x0a, 0x0a, 0x43,
-	0x6c, 0x69, 0x65, 0x6e, 0x74, 0x44, 0x61, 0x74, 0x61, 0x12, 0x18, 0x0a, 0x07, 0x70, 0x61, 0x79,
-	0x6c, 0x6f, 0x61, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0c, 0x52, 0x07, 0x70, 0x61, 0x79, 0x6c,
-	0x6f, 0x61, 0x64, 0x12, 0x4e, 0x0a, 0x0a, 0x72, 0x65, 0x66, 0x65, 0x72, 0x65, 0x6e, 0x63, 0x65,
-	0x73, 0x18, 0x02, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x2e, 0x2e, 0x69, 0x6f, 0x2e, 0x64, 0x65, 0x65,
-	0x70, 0x68, 0x61, 0x76, 0x65, 0x6e, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x62, 0x61, 0x63,
-	0x6b, 0x70, 0x6c, 0x61, 0x6e, 0x65, 0x2e, 0x67, 0x72, 0x70, 0x63, 0x2e, 0x54, 0x79, 0x70, 0x65,
-	0x64, 0x54, 0x69, 0x63, 0x6b, 0x65, 0x74, 0x52, 0x0a, 0x72, 0x65, 0x66, 0x65, 0x72, 0x65, 0x6e,
-	0x63, 0x65, 0x73, 0x22, 0x87, 0x01, 0x0a, 0x0a, 0x53, 0x65, 0x72, 0x76, 0x65, 0x72, 0x44, 0x61,
-	0x74, 0x61, 0x12, 0x18, 0x0a, 0x07, 0x70, 0x61, 0x79, 0x6c, 0x6f, 0x61, 0x64, 0x18, 0x01, 0x20,
-	0x01, 0x28, 0x0c, 0x52, 0x07, 0x70, 0x61, 0x79, 0x6c, 0x6f, 0x61, 0x64, 0x12, 0x5f, 0x0a, 0x13,
-	0x65, 0x78, 0x70, 0x6f, 0x72, 0x74, 0x65, 0x64, 0x5f, 0x72, 0x65, 0x66, 0x65, 0x72, 0x65, 0x6e,
-	0x63, 0x65, 0x73, 0x18, 0x02, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x2e, 0x2e, 0x69, 0x6f, 0x2e, 0x64,
-	0x65, 0x65, 0x70, 0x68, 0x61, 0x76, 0x65, 0x6e, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x62,
-	0x61, 0x63, 0x6b, 0x70, 0x6c, 0x61, 0x6e, 0x65, 0x2e, 0x67, 0x72, 0x70, 0x63, 0x2e, 0x54, 0x79,
-	0x70, 0x65, 0x64, 0x54, 0x69, 0x63, 0x6b, 0x65, 0x74, 0x52, 0x12, 0x65, 0x78, 0x70, 0x6f, 0x72,
-	0x74, 0x65, 0x64, 0x52, 0x65, 0x66, 0x65, 0x72, 0x65, 0x6e, 0x63, 0x65, 0x73, 0x22, 0xae, 0x01,
-	0x0a, 0x0d, 0x53, 0x74, 0x72, 0x65, 0x61, 0x6d, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12,
-	0x4d, 0x0a, 0x07, 0x63, 0x6f, 0x6e, 0x6e, 0x65, 0x63, 0x74, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b,
-	0x32, 0x31, 0x2e, 0x69, 0x6f, 0x2e, 0x64, 0x65, 0x65, 0x70, 0x68, 0x61, 0x76, 0x65, 0x6e, 0x2e,
-	0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x62, 0x61, 0x63, 0x6b, 0x70, 0x6c, 0x61, 0x6e, 0x65, 0x2e,
-	0x67, 0x72, 0x70, 0x63, 0x2e, 0x43, 0x6f, 0x6e, 0x6e, 0x65, 0x63, 0x74, 0x52, 0x65, 0x71, 0x75,
-	0x65, 0x73, 0x74, 0x48, 0x00, 0x52, 0x07, 0x63, 0x6f, 0x6e, 0x6e, 0x65, 0x63, 0x74, 0x12, 0x43,
-	0x0a, 0x04, 0x64, 0x61, 0x74, 0x61, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x2d, 0x2e, 0x69,
-	0x6f, 0x2e, 0x64, 0x65, 0x65, 0x70, 0x68, 0x61, 0x76, 0x65, 0x6e, 0x2e, 0x70, 0x72, 0x6f, 0x74,
-	0x6f, 0x2e, 0x62, 0x61, 0x63, 0x6b, 0x70, 0x6c, 0x61, 0x6e, 0x65, 0x2e, 0x67, 0x72, 0x70, 0x63,
-	0x2e, 0x43, 0x6c, 0x69, 0x65, 0x6e, 0x74, 0x44, 0x61, 0x74, 0x61, 0x48, 0x00, 0x52, 0x04, 0x64,
-	0x61, 0x74, 0x61, 0x42, 0x09, 0x0a, 0x07, 0x6d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x22, 0x60,
-	0x0a, 0x0e, 0x53, 0x74, 0x72, 0x65, 0x61, 0x6d, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65,
-	0x12, 0x43, 0x0a, 0x04, 0x64, 0x61, 0x74, 0x61, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x2d,
-	0x2e, 0x69, 0x6f, 0x2e, 0x64, 0x65, 0x65, 0x70, 0x68, 0x61, 0x76, 0x65, 0x6e, 0x2e, 0x70, 0x72,
-	0x6f, 0x74, 0x6f, 0x2e, 0x62, 0x61, 0x63, 0x6b, 0x70, 0x6c, 0x61, 0x6e, 0x65, 0x2e, 0x67, 0x72,
-	0x70, 0x63, 0x2e, 0x53, 0x65, 0x72, 0x76, 0x65, 0x72, 0x44, 0x61, 0x74, 0x61, 0x48, 0x00, 0x52,
-	0x04, 0x64, 0x61, 0x74, 0x61, 0x42, 0x09, 0x0a, 0x07, 0x6d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65,
-	0x22, 0x15, 0x0a, 0x13, 0x42, 0x72, 0x6f, 0x77, 0x73, 0x65, 0x72, 0x4e, 0x65, 0x78, 0x74, 0x52,
-	0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x32, 0x8e, 0x04, 0x0a, 0x0d, 0x4f, 0x62, 0x6a, 0x65,
-	0x63, 0x74, 0x53, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x12, 0x81, 0x01, 0x0a, 0x0b, 0x46, 0x65,
-	0x74, 0x63, 0x68, 0x4f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x12, 0x35, 0x2e, 0x69, 0x6f, 0x2e, 0x64,
-	0x65, 0x65, 0x70, 0x68, 0x61, 0x76, 0x65, 0x6e, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x62,
-	0x61, 0x63, 0x6b, 0x70, 0x6c, 0x61, 0x6e, 0x65, 0x2e, 0x67, 0x72, 0x70, 0x63, 0x2e, 0x46, 0x65,
-	0x74, 0x63, 0x68, 0x4f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74,
-	0x1a, 0x36, 0x2e, 0x69, 0x6f, 0x2e, 0x64, 0x65, 0x65, 0x70, 0x68, 0x61, 0x76, 0x65, 0x6e, 0x2e,
-	0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x62, 0x61, 0x63, 0x6b, 0x70, 0x6c, 0x61, 0x6e, 0x65, 0x2e,
-	0x67, 0x72, 0x70, 0x63, 0x2e, 0x46, 0x65, 0x74, 0x63, 0x68, 0x4f, 0x62, 0x6a, 0x65, 0x63, 0x74,
-	0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x03, 0x88, 0x02, 0x01, 0x12, 0x7a, 0x0a,
-	0x0d, 0x4d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x53, 0x74, 0x72, 0x65, 0x61, 0x6d, 0x12, 0x30,
-	0x2e, 0x69, 0x6f, 0x2e, 0x64, 0x65, 0x65, 0x70, 0x68, 0x61, 0x76, 0x65, 0x6e, 0x2e, 0x70, 0x72,
-	0x6f, 0x74, 0x6f, 0x2e, 0x62, 0x61, 0x63, 0x6b, 0x70, 0x6c, 0x61, 0x6e, 0x65, 0x2e, 0x67, 0x72,
-	0x70, 0x63, 0x2e, 0x53, 0x74, 0x72, 0x65, 0x61, 0x6d, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74,
-	0x1a, 0x31, 0x2e, 0x69, 0x6f, 0x2e, 0x64, 0x65, 0x65, 0x70, 0x68, 0x61, 0x76, 0x65, 0x6e, 0x2e,
-	0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x62, 0x61, 0x63, 0x6b, 0x70, 0x6c, 0x61, 0x6e, 0x65, 0x2e,
-	0x67, 0x72, 0x70, 0x63, 0x2e, 0x53, 0x74, 0x72, 0x65, 0x61, 0x6d, 0x52, 0x65, 0x73, 0x70, 0x6f,
-	0x6e, 0x73, 0x65, 0x22, 0x00, 0x28, 0x01, 0x30, 0x01, 0x12, 0x7c, 0x0a, 0x11, 0x4f, 0x70, 0x65,
-	0x6e, 0x4d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x53, 0x74, 0x72, 0x65, 0x61, 0x6d, 0x12, 0x30,
-	0x2e, 0x69, 0x6f, 0x2e, 0x64, 0x65, 0x65, 0x70, 0x68, 0x61, 0x76, 0x65, 0x6e, 0x2e, 0x70, 0x72,
-	0x6f, 0x74, 0x6f, 0x2e, 0x62, 0x61, 0x63, 0x6b, 0x70, 0x6c, 0x61, 0x6e, 0x65, 0x2e, 0x67, 0x72,
-	0x70, 0x63, 0x2e, 0x53, 0x74, 0x72, 0x65, 0x61, 0x6d, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74,
-	0x1a, 0x31, 0x2e, 0x69, 0x6f, 0x2e, 0x64, 0x65, 0x65, 0x70, 0x68, 0x61, 0x76, 0x65, 0x6e, 0x2e,
-	0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x62, 0x61, 0x63, 0x6b, 0x70, 0x6c, 0x61, 0x6e, 0x65, 0x2e,
-	0x67, 0x72, 0x70, 0x63, 0x2e, 0x53, 0x74, 0x72, 0x65, 0x61, 0x6d, 0x52, 0x65, 0x73, 0x70, 0x6f,
-	0x6e, 0x73, 0x65, 0x22, 0x00, 0x30, 0x01, 0x12, 0x7f, 0x0a, 0x11, 0x4e, 0x65, 0x78, 0x74, 0x4d,
-	0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x53, 0x74, 0x72, 0x65, 0x61, 0x6d, 0x12, 0x30, 0x2e, 0x69,
-	0x6f, 0x2e, 0x64, 0x65, 0x65, 0x70, 0x68, 0x61, 0x76, 0x65, 0x6e, 0x2e, 0x70, 0x72, 0x6f, 0x74,
-	0x6f, 0x2e, 0x62, 0x61, 0x63, 0x6b, 0x70, 0x6c, 0x61, 0x6e, 0x65, 0x2e, 0x67, 0x72, 0x70, 0x63,
-	0x2e, 0x53, 0x74, 0x72, 0x65, 0x61, 0x6d, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x36,
-	0x2e, 0x69, 0x6f, 0x2e, 0x64, 0x65, 0x65, 0x70, 0x68, 0x61, 0x76, 0x65, 0x6e, 0x2e, 0x70, 0x72,
-	0x6f, 0x74, 0x6f, 0x2e, 0x62, 0x61, 0x63, 0x6b, 0x70, 0x6c, 0x61, 0x6e, 0x65, 0x2e, 0x67, 0x72,
-	0x70, 0x63, 0x2e, 0x42, 0x72, 0x6f, 0x77, 0x73, 0x65, 0x72, 0x4e, 0x65, 0x78, 0x74, 0x52, 0x65,
-	0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x00, 0x42, 0x42, 0x48, 0x01, 0x50, 0x01, 0x5a, 0x3c,
-	0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x64, 0x65, 0x65, 0x70, 0x68,
-	0x61, 0x76, 0x65, 0x6e, 0x2f, 0x64, 0x65, 0x65, 0x70, 0x68, 0x61, 0x76, 0x65, 0x6e, 0x2d, 0x63,
-	0x6f, 0x72, 0x65, 0x2f, 0x67, 0x6f, 0x2f, 0x69, 0x6e, 0x74, 0x65, 0x72, 0x6e, 0x61, 0x6c, 0x2f,
-	0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2f, 0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x62, 0x06, 0x70, 0x72,
-	0x6f, 0x74, 0x6f, 0x33,
+	0x74, 0x52, 0x0a, 0x72, 0x65, 0x66, 0x65, 0x72, 0x65, 0x6e, 0x63, 0x65, 0x73, 0x22, 0x87, 0x01,
+	0x0a, 0x0a, 0x53, 0x65, 0x72, 0x76, 0x65, 0x72, 0x44, 0x61, 0x74, 0x61, 0x12, 0x18, 0x0a, 0x07,
+	0x70, 0x61, 0x79, 0x6c, 0x6f, 0x61, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0c, 0x52, 0x07, 0x70,
+	0x61, 0x79, 0x6c, 0x6f, 0x61, 0x64, 0x12, 0x5f, 0x0a, 0x13, 0x65, 0x78, 0x70, 0x6f, 0x72, 0x74,
+	0x65, 0x64, 0x5f, 0x72, 0x65, 0x66, 0x65, 0x72, 0x65, 0x6e, 0x63, 0x65, 0x73, 0x18, 0x02, 0x20,
+	0x03, 0x28, 0x0b, 0x32, 0x2e, 0x2e, 0x69, 0x6f, 0x2e, 0x64, 0x65, 0x65, 0x70, 0x68, 0x61, 0x76,
+	0x65, 0x6e, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x62, 0x61, 0x63, 0x6b, 0x70, 0x6c, 0x61,
+	0x6e, 0x65, 0x2e, 0x67, 0x72, 0x70, 0x63, 0x2e, 0x54, 0x79, 0x70, 0x65, 0x64, 0x54, 0x69, 0x63,
+	0x6b, 0x65, 0x74, 0x52, 0x12, 0x65, 0x78, 0x70, 0x6f, 0x72, 0x74, 0x65, 0x64, 0x52, 0x65, 0x66,
+	0x65, 0x72, 0x65, 0x6e, 0x63, 0x65, 0x73, 0x22, 0xae, 0x01, 0x0a, 0x0d, 0x53, 0x74, 0x72, 0x65,
+	0x61, 0x6d, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x4d, 0x0a, 0x07, 0x63, 0x6f, 0x6e,
+	0x6e, 0x65, 0x63, 0x74, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x31, 0x2e, 0x69, 0x6f, 0x2e,
+	0x64, 0x65, 0x65, 0x70, 0x68, 0x61, 0x76, 0x65, 0x6e, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e,
+	0x62, 0x61, 0x63, 0x6b, 0x70, 0x6c, 0x61, 0x6e, 0x65, 0x2e, 0x67, 0x72, 0x70, 0x63, 0x2e, 0x43,
+	0x6f, 0x6e, 0x6e, 0x65, 0x63, 0x74, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x48, 0x00, 0x52,
+	0x07, 0x63, 0x6f, 0x6e, 0x6e, 0x65, 0x63, 0x74, 0x12, 0x43, 0x0a, 0x04, 0x64, 0x61, 0x74, 0x61,
+	0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x2d, 0x2e, 0x69, 0x6f, 0x2e, 0x64, 0x65, 0x65, 0x70,
+	0x68, 0x61, 0x76, 0x65, 0x6e, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x62, 0x61, 0x63, 0x6b,
+	0x70, 0x6c, 0x61, 0x6e, 0x65, 0x2e, 0x67, 0x72, 0x70, 0x63, 0x2e, 0x43, 0x6c, 0x69, 0x65, 0x6e,
+	0x74, 0x44, 0x61, 0x74, 0x61, 0x48, 0x00, 0x52, 0x04, 0x64, 0x61, 0x74, 0x61, 0x42, 0x09, 0x0a,
+	0x07, 0x6d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x22, 0x60, 0x0a, 0x0e, 0x53, 0x74, 0x72, 0x65,
+	0x61, 0x6d, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x43, 0x0a, 0x04, 0x64, 0x61,
+	0x74, 0x61, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x2d, 0x2e, 0x69, 0x6f, 0x2e, 0x64, 0x65,
+	0x65, 0x70, 0x68, 0x61, 0x76, 0x65, 0x6e, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x62, 0x61,
+	0x63, 0x6b, 0x70, 0x6c, 0x61, 0x6e, 0x65, 0x2e, 0x67, 0x72, 0x70, 0x63, 0x2e, 0x53, 0x65, 0x72,
+	0x76, 0x65, 0x72, 0x44, 0x61, 0x74, 0x61, 0x48, 0x00, 0x52, 0x04, 0x64, 0x61, 0x74, 0x61, 0x42,
+	0x09, 0x0a, 0x07, 0x6d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x22, 0x15, 0x0a, 0x13, 0x42, 0x72,
+	0x6f, 0x77, 0x73, 0x65, 0x72, 0x4e, 0x65, 0x78, 0x74, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73,
+	0x65, 0x32, 0x8e, 0x04, 0x0a, 0x0d, 0x4f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x53, 0x65, 0x72, 0x76,
+	0x69, 0x63, 0x65, 0x12, 0x81, 0x01, 0x0a, 0x0b, 0x46, 0x65, 0x74, 0x63, 0x68, 0x4f, 0x62, 0x6a,
+	0x65, 0x63, 0x74, 0x12, 0x35, 0x2e, 0x69, 0x6f, 0x2e, 0x64, 0x65, 0x65, 0x70, 0x68, 0x61, 0x76,
+	0x65, 0x6e, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x62, 0x61, 0x63, 0x6b, 0x70, 0x6c, 0x61,
+	0x6e, 0x65, 0x2e, 0x67, 0x72, 0x70, 0x63, 0x2e, 0x46, 0x65, 0x74, 0x63, 0x68, 0x4f, 0x62, 0x6a,
+	0x65, 0x63, 0x74, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x36, 0x2e, 0x69, 0x6f, 0x2e,
+	0x64, 0x65, 0x65, 0x70, 0x68, 0x61, 0x76, 0x65, 0x6e, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e,
+	0x62, 0x61, 0x63, 0x6b, 0x70, 0x6c, 0x61, 0x6e, 0x65, 0x2e, 0x67, 0x72, 0x70, 0x63, 0x2e, 0x46,
+	0x65, 0x74, 0x63, 0x68, 0x4f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e,
+	0x73, 0x65, 0x22, 0x03, 0x88, 0x02, 0x01, 0x12, 0x7a, 0x0a, 0x0d, 0x4d, 0x65, 0x73, 0x73, 0x61,
+	0x67, 0x65, 0x53, 0x74, 0x72, 0x65, 0x61, 0x6d, 0x12, 0x30, 0x2e, 0x69, 0x6f, 0x2e, 0x64, 0x65,
+	0x65, 0x70, 0x68, 0x61, 0x76, 0x65, 0x6e, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x62, 0x61,
+	0x63, 0x6b, 0x70, 0x6c, 0x61, 0x6e, 0x65, 0x2e, 0x67, 0x72, 0x70, 0x63, 0x2e, 0x53, 0x74, 0x72,
+	0x65, 0x61, 0x6d, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x31, 0x2e, 0x69, 0x6f, 0x2e,
+	0x64, 0x65, 0x65, 0x70, 0x68, 0x61, 0x76, 0x65, 0x6e, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e,
+	0x62, 0x61, 0x63, 0x6b, 0x70, 0x6c, 0x61, 0x6e, 0x65, 0x2e, 0x67, 0x72, 0x70, 0x63, 0x2e, 0x53,
+	0x74, 0x72, 0x65, 0x61, 0x6d, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x00, 0x28,
+	0x01, 0x30, 0x01, 0x12, 0x7c, 0x0a, 0x11, 0x4f, 0x70, 0x65, 0x6e, 0x4d, 0x65, 0x73, 0x73, 0x61,
+	0x67, 0x65, 0x53, 0x74, 0x72, 0x65, 0x61, 0x6d, 0x12, 0x30, 0x2e, 0x69, 0x6f, 0x2e, 0x64, 0x65,
+	0x65, 0x70, 0x68, 0x61, 0x76, 0x65, 0x6e, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x62, 0x61,
+	0x63, 0x6b, 0x70, 0x6c, 0x61, 0x6e, 0x65, 0x2e, 0x67, 0x72, 0x70, 0x63, 0x2e, 0x53, 0x74, 0x72,
+	0x65, 0x61, 0x6d, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x31, 0x2e, 0x69, 0x6f, 0x2e,
+	0x64, 0x65, 0x65, 0x70, 0x68, 0x61, 0x76, 0x65, 0x6e, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e,
+	0x62, 0x61, 0x63, 0x6b, 0x70, 0x6c, 0x61, 0x6e, 0x65, 0x2e, 0x67, 0x72, 0x70, 0x63, 0x2e, 0x53,
+	0x74, 0x72, 0x65, 0x61, 0x6d, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x00, 0x30,
+	0x01, 0x12, 0x7f, 0x0a, 0x11, 0x4e, 0x65, 0x78, 0x74, 0x4d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65,
+	0x53, 0x74, 0x72, 0x65, 0x61, 0x6d, 0x12, 0x30, 0x2e, 0x69, 0x6f, 0x2e, 0x64, 0x65, 0x65, 0x70,
+	0x68, 0x61, 0x76, 0x65, 0x6e, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x62, 0x61, 0x63, 0x6b,
+	0x70, 0x6c, 0x61, 0x6e, 0x65, 0x2e, 0x67, 0x72, 0x70, 0x63, 0x2e, 0x53, 0x74, 0x72, 0x65, 0x61,
+	0x6d, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x36, 0x2e, 0x69, 0x6f, 0x2e, 0x64, 0x65,
+	0x65, 0x70, 0x68, 0x61, 0x76, 0x65, 0x6e, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x62, 0x61,
+	0x63, 0x6b, 0x70, 0x6c, 0x61, 0x6e, 0x65, 0x2e, 0x67, 0x72, 0x70, 0x63, 0x2e, 0x42, 0x72, 0x6f,
+	0x77, 0x73, 0x65, 0x72, 0x4e, 0x65, 0x78, 0x74, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65,
+	0x22, 0x00, 0x42, 0x42, 0x48, 0x01, 0x50, 0x01, 0x5a, 0x3c, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62,
+	0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x64, 0x65, 0x65, 0x70, 0x68, 0x61, 0x76, 0x65, 0x6e, 0x2f, 0x64,
+	0x65, 0x65, 0x70, 0x68, 0x61, 0x76, 0x65, 0x6e, 0x2d, 0x63, 0x6f, 0x72, 0x65, 0x2f, 0x67, 0x6f,
+	0x2f, 0x69, 0x6e, 0x74, 0x65, 0x72, 0x6e, 0x61, 0x6c, 0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2f,
+	0x6f, 0x62, 0x6a, 0x65, 0x63, 0x74, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
 }
 
 var (
-	file_deephaven_proto_object_proto_rawDescOnce sync.Once
-	file_deephaven_proto_object_proto_rawDescData = file_deephaven_proto_object_proto_rawDesc
+	file_deephaven_core_proto_object_proto_rawDescOnce sync.Once
+	file_deephaven_core_proto_object_proto_rawDescData = file_deephaven_core_proto_object_proto_rawDesc
 )
 
-func file_deephaven_proto_object_proto_rawDescGZIP() []byte {
-	file_deephaven_proto_object_proto_rawDescOnce.Do(func() {
-		file_deephaven_proto_object_proto_rawDescData = protoimpl.X.CompressGZIP(file_deephaven_proto_object_proto_rawDescData)
+func file_deephaven_core_proto_object_proto_rawDescGZIP() []byte {
+	file_deephaven_core_proto_object_proto_rawDescOnce.Do(func() {
+		file_deephaven_core_proto_object_proto_rawDescData = protoimpl.X.CompressGZIP(file_deephaven_core_proto_object_proto_rawDescData)
 	})
-	return file_deephaven_proto_object_proto_rawDescData
+	return file_deephaven_core_proto_object_proto_rawDescData
 }
 
-var file_deephaven_proto_object_proto_msgTypes = make([]protoimpl.MessageInfo, 8)
-var file_deephaven_proto_object_proto_goTypes = []interface{}{
+var file_deephaven_core_proto_object_proto_msgTypes = make([]protoimpl.MessageInfo, 8)
+var file_deephaven_core_proto_object_proto_goTypes = []interface{}{
 	(*FetchObjectRequest)(nil),  // 0: io.deephaven.proto.backplane.grpc.FetchObjectRequest
 	(*FetchObjectResponse)(nil), // 1: io.deephaven.proto.backplane.grpc.FetchObjectResponse
 	(*ConnectRequest)(nil),      // 2: io.deephaven.proto.backplane.grpc.ConnectRequest
@@ -640,7 +640,7 @@ var file_deephaven_proto_object_proto_goTypes = []interface{}{
 	(*BrowserNextResponse)(nil), // 7: io.deephaven.proto.backplane.grpc.BrowserNextResponse
 	(*ticket.TypedTicket)(nil),  // 8: io.deephaven.proto.backplane.grpc.TypedTicket
 }
-var file_deephaven_proto_object_proto_depIdxs = []int32{
+var file_deephaven_core_proto_object_proto_depIdxs = []int32{
 	8,  // 0: io.deephaven.proto.backplane.grpc.FetchObjectRequest.source_id:type_name -> io.deephaven.proto.backplane.grpc.TypedTicket
 	8,  // 1: io.deephaven.proto.backplane.grpc.FetchObjectResponse.typed_export_ids:type_name -> io.deephaven.proto.backplane.grpc.TypedTicket
 	8,  // 2: io.deephaven.proto.backplane.grpc.ConnectRequest.source_id:type_name -> io.deephaven.proto.backplane.grpc.TypedTicket
@@ -664,13 +664,13 @@ var file_deephaven_proto_object_proto_depIdxs = []int32{
 	0,  // [0:8] is the sub-list for field type_name
 }
 
-func init() { file_deephaven_proto_object_proto_init() }
-func file_deephaven_proto_object_proto_init() {
-	if File_deephaven_proto_object_proto != nil {
+func init() { file_deephaven_core_proto_object_proto_init() }
+func file_deephaven_core_proto_object_proto_init() {
+	if File_deephaven_core_proto_object_proto != nil {
 		return
 	}
 	if !protoimpl.UnsafeEnabled {
-		file_deephaven_proto_object_proto_msgTypes[0].Exporter = func(v interface{}, i int) interface{} {
+		file_deephaven_core_proto_object_proto_msgTypes[0].Exporter = func(v interface{}, i int) interface{} {
 			switch v := v.(*FetchObjectRequest); i {
 			case 0:
 				return &v.state
@@ -682,7 +682,7 @@ func file_deephaven_proto_object_proto_init() {
 				return nil
 			}
 		}
-		file_deephaven_proto_object_proto_msgTypes[1].Exporter = func(v interface{}, i int) interface{} {
+		file_deephaven_core_proto_object_proto_msgTypes[1].Exporter = func(v interface{}, i int) interface{} {
 			switch v := v.(*FetchObjectResponse); i {
 			case 0:
 				return &v.state
@@ -694,7 +694,7 @@ func file_deephaven_proto_object_proto_init() {
 				return nil
 			}
 		}
-		file_deephaven_proto_object_proto_msgTypes[2].Exporter = func(v interface{}, i int) interface{} {
+		file_deephaven_core_proto_object_proto_msgTypes[2].Exporter = func(v interface{}, i int) interface{} {
 			switch v := v.(*ConnectRequest); i {
 			case 0:
 				return &v.state
@@ -706,7 +706,7 @@ func file_deephaven_proto_object_proto_init() {
 				return nil
 			}
 		}
-		file_deephaven_proto_object_proto_msgTypes[3].Exporter = func(v interface{}, i int) interface{} {
+		file_deephaven_core_proto_object_proto_msgTypes[3].Exporter = func(v interface{}, i int) interface{} {
 			switch v := v.(*ClientData); i {
 			case 0:
 				return &v.state
@@ -718,7 +718,7 @@ func file_deephaven_proto_object_proto_init() {
 				return nil
 			}
 		}
-		file_deephaven_proto_object_proto_msgTypes[4].Exporter = func(v interface{}, i int) interface{} {
+		file_deephaven_core_proto_object_proto_msgTypes[4].Exporter = func(v interface{}, i int) interface{} {
 			switch v := v.(*ServerData); i {
 			case 0:
 				return &v.state
@@ -730,7 +730,7 @@ func file_deephaven_proto_object_proto_init() {
 				return nil
 			}
 		}
-		file_deephaven_proto_object_proto_msgTypes[5].Exporter = func(v interface{}, i int) interface{} {
+		file_deephaven_core_proto_object_proto_msgTypes[5].Exporter = func(v interface{}, i int) interface{} {
 			switch v := v.(*StreamRequest); i {
 			case 0:
 				return &v.state
@@ -742,7 +742,7 @@ func file_deephaven_proto_object_proto_init() {
 				return nil
 			}
 		}
-		file_deephaven_proto_object_proto_msgTypes[6].Exporter = func(v interface{}, i int) interface{} {
+		file_deephaven_core_proto_object_proto_msgTypes[6].Exporter = func(v interface{}, i int) interface{} {
 			switch v := v.(*StreamResponse); i {
 			case 0:
 				return &v.state
@@ -754,7 +754,7 @@ func file_deephaven_proto_object_proto_init() {
 				return nil
 			}
 		}
-		file_deephaven_proto_object_proto_msgTypes[7].Exporter = func(v interface{}, i int) interface{} {
+		file_deephaven_core_proto_object_proto_msgTypes[7].Exporter = func(v interface{}, i int) interface{} {
 			switch v := v.(*BrowserNextResponse); i {
 			case 0:
 				return &v.state
@@ -767,29 +767,29 @@ func file_deephaven_proto_object_proto_init() {
 			}
 		}
 	}
-	file_deephaven_proto_object_proto_msgTypes[5].OneofWrappers = []interface{}{
+	file_deephaven_core_proto_object_proto_msgTypes[5].OneofWrappers = []interface{}{
 		(*StreamRequest_Connect)(nil),
 		(*StreamRequest_Data)(nil),
 	}
-	file_deephaven_proto_object_proto_msgTypes[6].OneofWrappers = []interface{}{
+	file_deephaven_core_proto_object_proto_msgTypes[6].OneofWrappers = []interface{}{
 		(*StreamResponse_Data)(nil),
 	}
 	type x struct{}
 	out := protoimpl.TypeBuilder{
 		File: protoimpl.DescBuilder{
 			GoPackagePath: reflect.TypeOf(x{}).PkgPath(),
-			RawDescriptor: file_deephaven_proto_object_proto_rawDesc,
+			RawDescriptor: file_deephaven_core_proto_object_proto_rawDesc,
 			NumEnums:      0,
 			NumMessages:   8,
 			NumExtensions: 0,
 			NumServices:   1,
 		},
-		GoTypes:           file_deephaven_proto_object_proto_goTypes,
-		DependencyIndexes: file_deephaven_proto_object_proto_depIdxs,
-		MessageInfos:      file_deephaven_proto_object_proto_msgTypes,
+		GoTypes:           file_deephaven_core_proto_object_proto_goTypes,
+		DependencyIndexes: file_deephaven_core_proto_object_proto_depIdxs,
+		MessageInfos:      file_deephaven_core_proto_object_proto_msgTypes,
 	}.Build()
-	File_deephaven_proto_object_proto = out.File
-	file_deephaven_proto_object_proto_rawDesc = nil
-	file_deephaven_proto_object_proto_goTypes = nil
-	file_deephaven_proto_object_proto_depIdxs = nil
+	File_deephaven_core_proto_object_proto = out.File
+	file_deephaven_core_proto_object_proto_rawDesc = nil
+	file_deephaven_core_proto_object_proto_goTypes = nil
+	file_deephaven_core_proto_object_proto_depIdxs = nil
 }
diff --git a/go/internal/proto/object/object_grpc.pb.go b/go/internal/proto/object/object_grpc.pb.go
index 9b0b37c554d..7a6cd5a56e1 100644
--- a/go/internal/proto/object/object_grpc.pb.go
+++ b/go/internal/proto/object/object_grpc.pb.go
@@ -2,7 +2,7 @@
 // versions:
 // - protoc-gen-go-grpc v1.2.0
 // - protoc             v4.25.3
-// source: deephaven/proto/object.proto
+// source: deephaven_core/proto/object.proto
 
 package object
 
@@ -374,5 +374,5 @@ var ObjectService_ServiceDesc = grpc.ServiceDesc{
 			ServerStreams: true,
 		},
 	},
-	Metadata: "deephaven/proto/object.proto",
+	Metadata: "deephaven_core/proto/object.proto",
 }
diff --git a/go/internal/proto/partitionedtable/partitionedtable.pb.go b/go/internal/proto/partitionedtable/partitionedtable.pb.go
index 96fac454d85..8e8315a246a 100644
--- a/go/internal/proto/partitionedtable/partitionedtable.pb.go
+++ b/go/internal/proto/partitionedtable/partitionedtable.pb.go
@@ -5,7 +5,7 @@
 // versions:
 // 	protoc-gen-go v1.28.1
 // 	protoc        v4.25.3
-// source: deephaven/proto/partitionedtable.proto
+// source: deephaven_core/proto/partitionedtable.proto
 
 package partitionedtable
 
@@ -39,7 +39,7 @@ type PartitionByRequest struct {
 func (x *PartitionByRequest) Reset() {
 	*x = PartitionByRequest{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_deephaven_proto_partitionedtable_proto_msgTypes[0]
+		mi := &file_deephaven_core_proto_partitionedtable_proto_msgTypes[0]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -52,7 +52,7 @@ func (x *PartitionByRequest) String() string {
 func (*PartitionByRequest) ProtoMessage() {}
 
 func (x *PartitionByRequest) ProtoReflect() protoreflect.Message {
-	mi := &file_deephaven_proto_partitionedtable_proto_msgTypes[0]
+	mi := &file_deephaven_core_proto_partitionedtable_proto_msgTypes[0]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -65,7 +65,7 @@ func (x *PartitionByRequest) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use PartitionByRequest.ProtoReflect.Descriptor instead.
 func (*PartitionByRequest) Descriptor() ([]byte, []int) {
-	return file_deephaven_proto_partitionedtable_proto_rawDescGZIP(), []int{0}
+	return file_deephaven_core_proto_partitionedtable_proto_rawDescGZIP(), []int{0}
 }
 
 func (x *PartitionByRequest) GetTableId() *ticket.Ticket {
@@ -105,7 +105,7 @@ type PartitionByResponse struct {
 func (x *PartitionByResponse) Reset() {
 	*x = PartitionByResponse{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_deephaven_proto_partitionedtable_proto_msgTypes[1]
+		mi := &file_deephaven_core_proto_partitionedtable_proto_msgTypes[1]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -118,7 +118,7 @@ func (x *PartitionByResponse) String() string {
 func (*PartitionByResponse) ProtoMessage() {}
 
 func (x *PartitionByResponse) ProtoReflect() protoreflect.Message {
-	mi := &file_deephaven_proto_partitionedtable_proto_msgTypes[1]
+	mi := &file_deephaven_core_proto_partitionedtable_proto_msgTypes[1]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -131,7 +131,7 @@ func (x *PartitionByResponse) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use PartitionByResponse.ProtoReflect.Descriptor instead.
 func (*PartitionByResponse) Descriptor() ([]byte, []int) {
-	return file_deephaven_proto_partitionedtable_proto_rawDescGZIP(), []int{1}
+	return file_deephaven_core_proto_partitionedtable_proto_rawDescGZIP(), []int{1}
 }
 
 type MergeRequest struct {
@@ -148,7 +148,7 @@ type MergeRequest struct {
 func (x *MergeRequest) Reset() {
 	*x = MergeRequest{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_deephaven_proto_partitionedtable_proto_msgTypes[2]
+		mi := &file_deephaven_core_proto_partitionedtable_proto_msgTypes[2]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -161,7 +161,7 @@ func (x *MergeRequest) String() string {
 func (*MergeRequest) ProtoMessage() {}
 
 func (x *MergeRequest) ProtoReflect() protoreflect.Message {
-	mi := &file_deephaven_proto_partitionedtable_proto_msgTypes[2]
+	mi := &file_deephaven_core_proto_partitionedtable_proto_msgTypes[2]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -174,7 +174,7 @@ func (x *MergeRequest) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use MergeRequest.ProtoReflect.Descriptor instead.
 func (*MergeRequest) Descriptor() ([]byte, []int) {
-	return file_deephaven_proto_partitionedtable_proto_rawDescGZIP(), []int{2}
+	return file_deephaven_core_proto_partitionedtable_proto_rawDescGZIP(), []int{2}
 }
 
 func (x *MergeRequest) GetPartitionedTable() *ticket.Ticket {
@@ -207,7 +207,7 @@ type GetTableRequest struct {
 func (x *GetTableRequest) Reset() {
 	*x = GetTableRequest{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_deephaven_proto_partitionedtable_proto_msgTypes[3]
+		mi := &file_deephaven_core_proto_partitionedtable_proto_msgTypes[3]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -220,7 +220,7 @@ func (x *GetTableRequest) String() string {
 func (*GetTableRequest) ProtoMessage() {}
 
 func (x *GetTableRequest) ProtoReflect() protoreflect.Message {
-	mi := &file_deephaven_proto_partitionedtable_proto_msgTypes[3]
+	mi := &file_deephaven_core_proto_partitionedtable_proto_msgTypes[3]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -233,7 +233,7 @@ func (x *GetTableRequest) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use GetTableRequest.ProtoReflect.Descriptor instead.
 func (*GetTableRequest) Descriptor() ([]byte, []int) {
-	return file_deephaven_proto_partitionedtable_proto_rawDescGZIP(), []int{3}
+	return file_deephaven_core_proto_partitionedtable_proto_rawDescGZIP(), []int{3}
 }
 
 func (x *GetTableRequest) GetPartitionedTable() *ticket.Ticket {
@@ -284,7 +284,7 @@ type PartitionedTableDescriptor struct {
 func (x *PartitionedTableDescriptor) Reset() {
 	*x = PartitionedTableDescriptor{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_deephaven_proto_partitionedtable_proto_msgTypes[4]
+		mi := &file_deephaven_core_proto_partitionedtable_proto_msgTypes[4]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -297,7 +297,7 @@ func (x *PartitionedTableDescriptor) String() string {
 func (*PartitionedTableDescriptor) ProtoMessage() {}
 
 func (x *PartitionedTableDescriptor) ProtoReflect() protoreflect.Message {
-	mi := &file_deephaven_proto_partitionedtable_proto_msgTypes[4]
+	mi := &file_deephaven_core_proto_partitionedtable_proto_msgTypes[4]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -310,7 +310,7 @@ func (x *PartitionedTableDescriptor) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use PartitionedTableDescriptor.ProtoReflect.Descriptor instead.
 func (*PartitionedTableDescriptor) Descriptor() ([]byte, []int) {
-	return file_deephaven_proto_partitionedtable_proto_rawDescGZIP(), []int{4}
+	return file_deephaven_core_proto_partitionedtable_proto_rawDescGZIP(), []int{4}
 }
 
 func (x *PartitionedTableDescriptor) GetKeyColumnNames() []string {
@@ -348,127 +348,128 @@ func (x *PartitionedTableDescriptor) GetConstituentChangesPermitted() bool {
 	return false
 }
 
-var File_deephaven_proto_partitionedtable_proto protoreflect.FileDescriptor
-
-var file_deephaven_proto_partitionedtable_proto_rawDesc = []byte{
-	0x0a, 0x26, 0x64, 0x65, 0x65, 0x70, 0x68, 0x61, 0x76, 0x65, 0x6e, 0x2f, 0x70, 0x72, 0x6f, 0x74,
-	0x6f, 0x2f, 0x70, 0x61, 0x72, 0x74, 0x69, 0x74, 0x69, 0x6f, 0x6e, 0x65, 0x64, 0x74, 0x61, 0x62,
-	0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x12, 0x21, 0x69, 0x6f, 0x2e, 0x64, 0x65, 0x65,
-	0x70, 0x68, 0x61, 0x76, 0x65, 0x6e, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x62, 0x61, 0x63,
-	0x6b, 0x70, 0x6c, 0x61, 0x6e, 0x65, 0x2e, 0x67, 0x72, 0x70, 0x63, 0x1a, 0x1b, 0x64, 0x65, 0x65,
-	0x70, 0x68, 0x61, 0x76, 0x65, 0x6e, 0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2f, 0x74, 0x61, 0x62,
-	0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x1a, 0x1c, 0x64, 0x65, 0x65, 0x70, 0x68, 0x61,
-	0x76, 0x65, 0x6e, 0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2f, 0x74, 0x69, 0x63, 0x6b, 0x65, 0x74,
-	0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x22, 0xe9, 0x01, 0x0a, 0x12, 0x50, 0x61, 0x72, 0x74, 0x69,
-	0x74, 0x69, 0x6f, 0x6e, 0x42, 0x79, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x44, 0x0a,
-	0x08, 0x74, 0x61, 0x62, 0x6c, 0x65, 0x5f, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32,
-	0x29, 0x2e, 0x69, 0x6f, 0x2e, 0x64, 0x65, 0x65, 0x70, 0x68, 0x61, 0x76, 0x65, 0x6e, 0x2e, 0x70,
-	0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x62, 0x61, 0x63, 0x6b, 0x70, 0x6c, 0x61, 0x6e, 0x65, 0x2e, 0x67,
-	0x72, 0x70, 0x63, 0x2e, 0x54, 0x69, 0x63, 0x6b, 0x65, 0x74, 0x52, 0x07, 0x74, 0x61, 0x62, 0x6c,
-	0x65, 0x49, 0x64, 0x12, 0x46, 0x0a, 0x09, 0x72, 0x65, 0x73, 0x75, 0x6c, 0x74, 0x5f, 0x69, 0x64,
-	0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x29, 0x2e, 0x69, 0x6f, 0x2e, 0x64, 0x65, 0x65, 0x70,
-	0x68, 0x61, 0x76, 0x65, 0x6e, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x62, 0x61, 0x63, 0x6b,
-	0x70, 0x6c, 0x61, 0x6e, 0x65, 0x2e, 0x67, 0x72, 0x70, 0x63, 0x2e, 0x54, 0x69, 0x63, 0x6b, 0x65,
-	0x74, 0x52, 0x08, 0x72, 0x65, 0x73, 0x75, 0x6c, 0x74, 0x49, 0x64, 0x12, 0x28, 0x0a, 0x10, 0x6b,
-	0x65, 0x79, 0x5f, 0x63, 0x6f, 0x6c, 0x75, 0x6d, 0x6e, 0x5f, 0x6e, 0x61, 0x6d, 0x65, 0x73, 0x18,
-	0x03, 0x20, 0x03, 0x28, 0x09, 0x52, 0x0e, 0x6b, 0x65, 0x79, 0x43, 0x6f, 0x6c, 0x75, 0x6d, 0x6e,
-	0x4e, 0x61, 0x6d, 0x65, 0x73, 0x12, 0x1b, 0x0a, 0x09, 0x64, 0x72, 0x6f, 0x70, 0x5f, 0x6b, 0x65,
-	0x79, 0x73, 0x18, 0x04, 0x20, 0x01, 0x28, 0x08, 0x52, 0x08, 0x64, 0x72, 0x6f, 0x70, 0x4b, 0x65,
-	0x79, 0x73, 0x22, 0x15, 0x0a, 0x13, 0x50, 0x61, 0x72, 0x74, 0x69, 0x74, 0x69, 0x6f, 0x6e, 0x42,
-	0x79, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0xae, 0x01, 0x0a, 0x0c, 0x4d, 0x65,
-	0x72, 0x67, 0x65, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x56, 0x0a, 0x11, 0x70, 0x61,
-	0x72, 0x74, 0x69, 0x74, 0x69, 0x6f, 0x6e, 0x65, 0x64, 0x5f, 0x74, 0x61, 0x62, 0x6c, 0x65, 0x18,
-	0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x29, 0x2e, 0x69, 0x6f, 0x2e, 0x64, 0x65, 0x65, 0x70, 0x68,
-	0x61, 0x76, 0x65, 0x6e, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x62, 0x61, 0x63, 0x6b, 0x70,
-	0x6c, 0x61, 0x6e, 0x65, 0x2e, 0x67, 0x72, 0x70, 0x63, 0x2e, 0x54, 0x69, 0x63, 0x6b, 0x65, 0x74,
-	0x52, 0x10, 0x70, 0x61, 0x72, 0x74, 0x69, 0x74, 0x69, 0x6f, 0x6e, 0x65, 0x64, 0x54, 0x61, 0x62,
-	0x6c, 0x65, 0x12, 0x46, 0x0a, 0x09, 0x72, 0x65, 0x73, 0x75, 0x6c, 0x74, 0x5f, 0x69, 0x64, 0x18,
+var File_deephaven_core_proto_partitionedtable_proto protoreflect.FileDescriptor
+
+var file_deephaven_core_proto_partitionedtable_proto_rawDesc = []byte{
+	0x0a, 0x2b, 0x64, 0x65, 0x65, 0x70, 0x68, 0x61, 0x76, 0x65, 0x6e, 0x5f, 0x63, 0x6f, 0x72, 0x65,
+	0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2f, 0x70, 0x61, 0x72, 0x74, 0x69, 0x74, 0x69, 0x6f, 0x6e,
+	0x65, 0x64, 0x74, 0x61, 0x62, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x12, 0x21, 0x69,
+	0x6f, 0x2e, 0x64, 0x65, 0x65, 0x70, 0x68, 0x61, 0x76, 0x65, 0x6e, 0x2e, 0x70, 0x72, 0x6f, 0x74,
+	0x6f, 0x2e, 0x62, 0x61, 0x63, 0x6b, 0x70, 0x6c, 0x61, 0x6e, 0x65, 0x2e, 0x67, 0x72, 0x70, 0x63,
+	0x1a, 0x20, 0x64, 0x65, 0x65, 0x70, 0x68, 0x61, 0x76, 0x65, 0x6e, 0x5f, 0x63, 0x6f, 0x72, 0x65,
+	0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2f, 0x74, 0x61, 0x62, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f,
+	0x74, 0x6f, 0x1a, 0x21, 0x64, 0x65, 0x65, 0x70, 0x68, 0x61, 0x76, 0x65, 0x6e, 0x5f, 0x63, 0x6f,
+	0x72, 0x65, 0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2f, 0x74, 0x69, 0x63, 0x6b, 0x65, 0x74, 0x2e,
+	0x70, 0x72, 0x6f, 0x74, 0x6f, 0x22, 0xe9, 0x01, 0x0a, 0x12, 0x50, 0x61, 0x72, 0x74, 0x69, 0x74,
+	0x69, 0x6f, 0x6e, 0x42, 0x79, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x44, 0x0a, 0x08,
+	0x74, 0x61, 0x62, 0x6c, 0x65, 0x5f, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x29,
+	0x2e, 0x69, 0x6f, 0x2e, 0x64, 0x65, 0x65, 0x70, 0x68, 0x61, 0x76, 0x65, 0x6e, 0x2e, 0x70, 0x72,
+	0x6f, 0x74, 0x6f, 0x2e, 0x62, 0x61, 0x63, 0x6b, 0x70, 0x6c, 0x61, 0x6e, 0x65, 0x2e, 0x67, 0x72,
+	0x70, 0x63, 0x2e, 0x54, 0x69, 0x63, 0x6b, 0x65, 0x74, 0x52, 0x07, 0x74, 0x61, 0x62, 0x6c, 0x65,
+	0x49, 0x64, 0x12, 0x46, 0x0a, 0x09, 0x72, 0x65, 0x73, 0x75, 0x6c, 0x74, 0x5f, 0x69, 0x64, 0x18,
 	0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x29, 0x2e, 0x69, 0x6f, 0x2e, 0x64, 0x65, 0x65, 0x70, 0x68,
 	0x61, 0x76, 0x65, 0x6e, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x62, 0x61, 0x63, 0x6b, 0x70,
 	0x6c, 0x61, 0x6e, 0x65, 0x2e, 0x67, 0x72, 0x70, 0x63, 0x2e, 0x54, 0x69, 0x63, 0x6b, 0x65, 0x74,
-	0x52, 0x08, 0x72, 0x65, 0x73, 0x75, 0x6c, 0x74, 0x49, 0x64, 0x22, 0x86, 0x02, 0x0a, 0x0f, 0x47,
-	0x65, 0x74, 0x54, 0x61, 0x62, 0x6c, 0x65, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x56,
-	0x0a, 0x11, 0x70, 0x61, 0x72, 0x74, 0x69, 0x74, 0x69, 0x6f, 0x6e, 0x65, 0x64, 0x5f, 0x74, 0x61,
-	0x62, 0x6c, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x29, 0x2e, 0x69, 0x6f, 0x2e, 0x64,
-	0x65, 0x65, 0x70, 0x68, 0x61, 0x76, 0x65, 0x6e, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x62,
-	0x61, 0x63, 0x6b, 0x70, 0x6c, 0x61, 0x6e, 0x65, 0x2e, 0x67, 0x72, 0x70, 0x63, 0x2e, 0x54, 0x69,
-	0x63, 0x6b, 0x65, 0x74, 0x52, 0x10, 0x70, 0x61, 0x72, 0x74, 0x69, 0x74, 0x69, 0x6f, 0x6e, 0x65,
-	0x64, 0x54, 0x61, 0x62, 0x6c, 0x65, 0x12, 0x53, 0x0a, 0x10, 0x6b, 0x65, 0x79, 0x5f, 0x74, 0x61,
-	0x62, 0x6c, 0x65, 0x5f, 0x74, 0x69, 0x63, 0x6b, 0x65, 0x74, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b,
-	0x32, 0x29, 0x2e, 0x69, 0x6f, 0x2e, 0x64, 0x65, 0x65, 0x70, 0x68, 0x61, 0x76, 0x65, 0x6e, 0x2e,
-	0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x62, 0x61, 0x63, 0x6b, 0x70, 0x6c, 0x61, 0x6e, 0x65, 0x2e,
-	0x67, 0x72, 0x70, 0x63, 0x2e, 0x54, 0x69, 0x63, 0x6b, 0x65, 0x74, 0x52, 0x0e, 0x6b, 0x65, 0x79,
-	0x54, 0x61, 0x62, 0x6c, 0x65, 0x54, 0x69, 0x63, 0x6b, 0x65, 0x74, 0x12, 0x46, 0x0a, 0x09, 0x72,
-	0x65, 0x73, 0x75, 0x6c, 0x74, 0x5f, 0x69, 0x64, 0x18, 0x04, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x29,
+	0x52, 0x08, 0x72, 0x65, 0x73, 0x75, 0x6c, 0x74, 0x49, 0x64, 0x12, 0x28, 0x0a, 0x10, 0x6b, 0x65,
+	0x79, 0x5f, 0x63, 0x6f, 0x6c, 0x75, 0x6d, 0x6e, 0x5f, 0x6e, 0x61, 0x6d, 0x65, 0x73, 0x18, 0x03,
+	0x20, 0x03, 0x28, 0x09, 0x52, 0x0e, 0x6b, 0x65, 0x79, 0x43, 0x6f, 0x6c, 0x75, 0x6d, 0x6e, 0x4e,
+	0x61, 0x6d, 0x65, 0x73, 0x12, 0x1b, 0x0a, 0x09, 0x64, 0x72, 0x6f, 0x70, 0x5f, 0x6b, 0x65, 0x79,
+	0x73, 0x18, 0x04, 0x20, 0x01, 0x28, 0x08, 0x52, 0x08, 0x64, 0x72, 0x6f, 0x70, 0x4b, 0x65, 0x79,
+	0x73, 0x22, 0x15, 0x0a, 0x13, 0x50, 0x61, 0x72, 0x74, 0x69, 0x74, 0x69, 0x6f, 0x6e, 0x42, 0x79,
+	0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0xae, 0x01, 0x0a, 0x0c, 0x4d, 0x65, 0x72,
+	0x67, 0x65, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x56, 0x0a, 0x11, 0x70, 0x61, 0x72,
+	0x74, 0x69, 0x74, 0x69, 0x6f, 0x6e, 0x65, 0x64, 0x5f, 0x74, 0x61, 0x62, 0x6c, 0x65, 0x18, 0x01,
+	0x20, 0x01, 0x28, 0x0b, 0x32, 0x29, 0x2e, 0x69, 0x6f, 0x2e, 0x64, 0x65, 0x65, 0x70, 0x68, 0x61,
+	0x76, 0x65, 0x6e, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x62, 0x61, 0x63, 0x6b, 0x70, 0x6c,
+	0x61, 0x6e, 0x65, 0x2e, 0x67, 0x72, 0x70, 0x63, 0x2e, 0x54, 0x69, 0x63, 0x6b, 0x65, 0x74, 0x52,
+	0x10, 0x70, 0x61, 0x72, 0x74, 0x69, 0x74, 0x69, 0x6f, 0x6e, 0x65, 0x64, 0x54, 0x61, 0x62, 0x6c,
+	0x65, 0x12, 0x46, 0x0a, 0x09, 0x72, 0x65, 0x73, 0x75, 0x6c, 0x74, 0x5f, 0x69, 0x64, 0x18, 0x02,
+	0x20, 0x01, 0x28, 0x0b, 0x32, 0x29, 0x2e, 0x69, 0x6f, 0x2e, 0x64, 0x65, 0x65, 0x70, 0x68, 0x61,
+	0x76, 0x65, 0x6e, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x62, 0x61, 0x63, 0x6b, 0x70, 0x6c,
+	0x61, 0x6e, 0x65, 0x2e, 0x67, 0x72, 0x70, 0x63, 0x2e, 0x54, 0x69, 0x63, 0x6b, 0x65, 0x74, 0x52,
+	0x08, 0x72, 0x65, 0x73, 0x75, 0x6c, 0x74, 0x49, 0x64, 0x22, 0x86, 0x02, 0x0a, 0x0f, 0x47, 0x65,
+	0x74, 0x54, 0x61, 0x62, 0x6c, 0x65, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x56, 0x0a,
+	0x11, 0x70, 0x61, 0x72, 0x74, 0x69, 0x74, 0x69, 0x6f, 0x6e, 0x65, 0x64, 0x5f, 0x74, 0x61, 0x62,
+	0x6c, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x29, 0x2e, 0x69, 0x6f, 0x2e, 0x64, 0x65,
+	0x65, 0x70, 0x68, 0x61, 0x76, 0x65, 0x6e, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x62, 0x61,
+	0x63, 0x6b, 0x70, 0x6c, 0x61, 0x6e, 0x65, 0x2e, 0x67, 0x72, 0x70, 0x63, 0x2e, 0x54, 0x69, 0x63,
+	0x6b, 0x65, 0x74, 0x52, 0x10, 0x70, 0x61, 0x72, 0x74, 0x69, 0x74, 0x69, 0x6f, 0x6e, 0x65, 0x64,
+	0x54, 0x61, 0x62, 0x6c, 0x65, 0x12, 0x53, 0x0a, 0x10, 0x6b, 0x65, 0x79, 0x5f, 0x74, 0x61, 0x62,
+	0x6c, 0x65, 0x5f, 0x74, 0x69, 0x63, 0x6b, 0x65, 0x74, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32,
+	0x29, 0x2e, 0x69, 0x6f, 0x2e, 0x64, 0x65, 0x65, 0x70, 0x68, 0x61, 0x76, 0x65, 0x6e, 0x2e, 0x70,
+	0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x62, 0x61, 0x63, 0x6b, 0x70, 0x6c, 0x61, 0x6e, 0x65, 0x2e, 0x67,
+	0x72, 0x70, 0x63, 0x2e, 0x54, 0x69, 0x63, 0x6b, 0x65, 0x74, 0x52, 0x0e, 0x6b, 0x65, 0x79, 0x54,
+	0x61, 0x62, 0x6c, 0x65, 0x54, 0x69, 0x63, 0x6b, 0x65, 0x74, 0x12, 0x46, 0x0a, 0x09, 0x72, 0x65,
+	0x73, 0x75, 0x6c, 0x74, 0x5f, 0x69, 0x64, 0x18, 0x04, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x29, 0x2e,
+	0x69, 0x6f, 0x2e, 0x64, 0x65, 0x65, 0x70, 0x68, 0x61, 0x76, 0x65, 0x6e, 0x2e, 0x70, 0x72, 0x6f,
+	0x74, 0x6f, 0x2e, 0x62, 0x61, 0x63, 0x6b, 0x70, 0x6c, 0x61, 0x6e, 0x65, 0x2e, 0x67, 0x72, 0x70,
+	0x63, 0x2e, 0x54, 0x69, 0x63, 0x6b, 0x65, 0x74, 0x52, 0x08, 0x72, 0x65, 0x73, 0x75, 0x6c, 0x74,
+	0x49, 0x64, 0x22, 0xa7, 0x02, 0x0a, 0x1a, 0x50, 0x61, 0x72, 0x74, 0x69, 0x74, 0x69, 0x6f, 0x6e,
+	0x65, 0x64, 0x54, 0x61, 0x62, 0x6c, 0x65, 0x44, 0x65, 0x73, 0x63, 0x72, 0x69, 0x70, 0x74, 0x6f,
+	0x72, 0x12, 0x28, 0x0a, 0x10, 0x6b, 0x65, 0x79, 0x5f, 0x63, 0x6f, 0x6c, 0x75, 0x6d, 0x6e, 0x5f,
+	0x6e, 0x61, 0x6d, 0x65, 0x73, 0x18, 0x01, 0x20, 0x03, 0x28, 0x09, 0x52, 0x0e, 0x6b, 0x65, 0x79,
+	0x43, 0x6f, 0x6c, 0x75, 0x6d, 0x6e, 0x4e, 0x61, 0x6d, 0x65, 0x73, 0x12, 0x36, 0x0a, 0x17, 0x63,
+	0x6f, 0x6e, 0x73, 0x74, 0x69, 0x74, 0x75, 0x65, 0x6e, 0x74, 0x5f, 0x63, 0x6f, 0x6c, 0x75, 0x6d,
+	0x6e, 0x5f, 0x6e, 0x61, 0x6d, 0x65, 0x18, 0x04, 0x20, 0x01, 0x28, 0x09, 0x52, 0x15, 0x63, 0x6f,
+	0x6e, 0x73, 0x74, 0x69, 0x74, 0x75, 0x65, 0x6e, 0x74, 0x43, 0x6f, 0x6c, 0x75, 0x6d, 0x6e, 0x4e,
+	0x61, 0x6d, 0x65, 0x12, 0x1f, 0x0a, 0x0b, 0x75, 0x6e, 0x69, 0x71, 0x75, 0x65, 0x5f, 0x6b, 0x65,
+	0x79, 0x73, 0x18, 0x02, 0x20, 0x01, 0x28, 0x08, 0x52, 0x0a, 0x75, 0x6e, 0x69, 0x71, 0x75, 0x65,
+	0x4b, 0x65, 0x79, 0x73, 0x12, 0x42, 0x0a, 0x1d, 0x63, 0x6f, 0x6e, 0x73, 0x74, 0x69, 0x74, 0x75,
+	0x65, 0x6e, 0x74, 0x5f, 0x64, 0x65, 0x66, 0x69, 0x6e, 0x69, 0x74, 0x69, 0x6f, 0x6e, 0x5f, 0x73,
+	0x63, 0x68, 0x65, 0x6d, 0x61, 0x18, 0x03, 0x20, 0x01, 0x28, 0x0c, 0x52, 0x1b, 0x63, 0x6f, 0x6e,
+	0x73, 0x74, 0x69, 0x74, 0x75, 0x65, 0x6e, 0x74, 0x44, 0x65, 0x66, 0x69, 0x6e, 0x69, 0x74, 0x69,
+	0x6f, 0x6e, 0x53, 0x63, 0x68, 0x65, 0x6d, 0x61, 0x12, 0x42, 0x0a, 0x1d, 0x63, 0x6f, 0x6e, 0x73,
+	0x74, 0x69, 0x74, 0x75, 0x65, 0x6e, 0x74, 0x5f, 0x63, 0x68, 0x61, 0x6e, 0x67, 0x65, 0x73, 0x5f,
+	0x70, 0x65, 0x72, 0x6d, 0x69, 0x74, 0x74, 0x65, 0x64, 0x18, 0x05, 0x20, 0x01, 0x28, 0x08, 0x52,
+	0x1b, 0x63, 0x6f, 0x6e, 0x73, 0x74, 0x69, 0x74, 0x75, 0x65, 0x6e, 0x74, 0x43, 0x68, 0x61, 0x6e,
+	0x67, 0x65, 0x73, 0x50, 0x65, 0x72, 0x6d, 0x69, 0x74, 0x74, 0x65, 0x64, 0x32, 0x96, 0x03, 0x0a,
+	0x17, 0x50, 0x61, 0x72, 0x74, 0x69, 0x74, 0x69, 0x6f, 0x6e, 0x65, 0x64, 0x54, 0x61, 0x62, 0x6c,
+	0x65, 0x53, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x12, 0x7c, 0x0a, 0x0b, 0x50, 0x61, 0x72, 0x74,
+	0x69, 0x74, 0x69, 0x6f, 0x6e, 0x42, 0x79, 0x12, 0x35, 0x2e, 0x69, 0x6f, 0x2e, 0x64, 0x65, 0x65,
+	0x70, 0x68, 0x61, 0x76, 0x65, 0x6e, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x62, 0x61, 0x63,
+	0x6b, 0x70, 0x6c, 0x61, 0x6e, 0x65, 0x2e, 0x67, 0x72, 0x70, 0x63, 0x2e, 0x50, 0x61, 0x72, 0x74,
+	0x69, 0x74, 0x69, 0x6f, 0x6e, 0x42, 0x79, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x36,
 	0x2e, 0x69, 0x6f, 0x2e, 0x64, 0x65, 0x65, 0x70, 0x68, 0x61, 0x76, 0x65, 0x6e, 0x2e, 0x70, 0x72,
 	0x6f, 0x74, 0x6f, 0x2e, 0x62, 0x61, 0x63, 0x6b, 0x70, 0x6c, 0x61, 0x6e, 0x65, 0x2e, 0x67, 0x72,
-	0x70, 0x63, 0x2e, 0x54, 0x69, 0x63, 0x6b, 0x65, 0x74, 0x52, 0x08, 0x72, 0x65, 0x73, 0x75, 0x6c,
-	0x74, 0x49, 0x64, 0x22, 0xa7, 0x02, 0x0a, 0x1a, 0x50, 0x61, 0x72, 0x74, 0x69, 0x74, 0x69, 0x6f,
-	0x6e, 0x65, 0x64, 0x54, 0x61, 0x62, 0x6c, 0x65, 0x44, 0x65, 0x73, 0x63, 0x72, 0x69, 0x70, 0x74,
-	0x6f, 0x72, 0x12, 0x28, 0x0a, 0x10, 0x6b, 0x65, 0x79, 0x5f, 0x63, 0x6f, 0x6c, 0x75, 0x6d, 0x6e,
-	0x5f, 0x6e, 0x61, 0x6d, 0x65, 0x73, 0x18, 0x01, 0x20, 0x03, 0x28, 0x09, 0x52, 0x0e, 0x6b, 0x65,
-	0x79, 0x43, 0x6f, 0x6c, 0x75, 0x6d, 0x6e, 0x4e, 0x61, 0x6d, 0x65, 0x73, 0x12, 0x36, 0x0a, 0x17,
-	0x63, 0x6f, 0x6e, 0x73, 0x74, 0x69, 0x74, 0x75, 0x65, 0x6e, 0x74, 0x5f, 0x63, 0x6f, 0x6c, 0x75,
-	0x6d, 0x6e, 0x5f, 0x6e, 0x61, 0x6d, 0x65, 0x18, 0x04, 0x20, 0x01, 0x28, 0x09, 0x52, 0x15, 0x63,
-	0x6f, 0x6e, 0x73, 0x74, 0x69, 0x74, 0x75, 0x65, 0x6e, 0x74, 0x43, 0x6f, 0x6c, 0x75, 0x6d, 0x6e,
-	0x4e, 0x61, 0x6d, 0x65, 0x12, 0x1f, 0x0a, 0x0b, 0x75, 0x6e, 0x69, 0x71, 0x75, 0x65, 0x5f, 0x6b,
-	0x65, 0x79, 0x73, 0x18, 0x02, 0x20, 0x01, 0x28, 0x08, 0x52, 0x0a, 0x75, 0x6e, 0x69, 0x71, 0x75,
-	0x65, 0x4b, 0x65, 0x79, 0x73, 0x12, 0x42, 0x0a, 0x1d, 0x63, 0x6f, 0x6e, 0x73, 0x74, 0x69, 0x74,
-	0x75, 0x65, 0x6e, 0x74, 0x5f, 0x64, 0x65, 0x66, 0x69, 0x6e, 0x69, 0x74, 0x69, 0x6f, 0x6e, 0x5f,
-	0x73, 0x63, 0x68, 0x65, 0x6d, 0x61, 0x18, 0x03, 0x20, 0x01, 0x28, 0x0c, 0x52, 0x1b, 0x63, 0x6f,
-	0x6e, 0x73, 0x74, 0x69, 0x74, 0x75, 0x65, 0x6e, 0x74, 0x44, 0x65, 0x66, 0x69, 0x6e, 0x69, 0x74,
-	0x69, 0x6f, 0x6e, 0x53, 0x63, 0x68, 0x65, 0x6d, 0x61, 0x12, 0x42, 0x0a, 0x1d, 0x63, 0x6f, 0x6e,
-	0x73, 0x74, 0x69, 0x74, 0x75, 0x65, 0x6e, 0x74, 0x5f, 0x63, 0x68, 0x61, 0x6e, 0x67, 0x65, 0x73,
-	0x5f, 0x70, 0x65, 0x72, 0x6d, 0x69, 0x74, 0x74, 0x65, 0x64, 0x18, 0x05, 0x20, 0x01, 0x28, 0x08,
-	0x52, 0x1b, 0x63, 0x6f, 0x6e, 0x73, 0x74, 0x69, 0x74, 0x75, 0x65, 0x6e, 0x74, 0x43, 0x68, 0x61,
-	0x6e, 0x67, 0x65, 0x73, 0x50, 0x65, 0x72, 0x6d, 0x69, 0x74, 0x74, 0x65, 0x64, 0x32, 0x96, 0x03,
-	0x0a, 0x17, 0x50, 0x61, 0x72, 0x74, 0x69, 0x74, 0x69, 0x6f, 0x6e, 0x65, 0x64, 0x54, 0x61, 0x62,
-	0x6c, 0x65, 0x53, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x12, 0x7c, 0x0a, 0x0b, 0x50, 0x61, 0x72,
-	0x74, 0x69, 0x74, 0x69, 0x6f, 0x6e, 0x42, 0x79, 0x12, 0x35, 0x2e, 0x69, 0x6f, 0x2e, 0x64, 0x65,
-	0x65, 0x70, 0x68, 0x61, 0x76, 0x65, 0x6e, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x62, 0x61,
-	0x63, 0x6b, 0x70, 0x6c, 0x61, 0x6e, 0x65, 0x2e, 0x67, 0x72, 0x70, 0x63, 0x2e, 0x50, 0x61, 0x72,
-	0x74, 0x69, 0x74, 0x69, 0x6f, 0x6e, 0x42, 0x79, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a,
-	0x36, 0x2e, 0x69, 0x6f, 0x2e, 0x64, 0x65, 0x65, 0x70, 0x68, 0x61, 0x76, 0x65, 0x6e, 0x2e, 0x70,
+	0x70, 0x63, 0x2e, 0x50, 0x61, 0x72, 0x74, 0x69, 0x74, 0x69, 0x6f, 0x6e, 0x42, 0x79, 0x52, 0x65,
+	0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x7a, 0x0a, 0x05, 0x4d, 0x65, 0x72, 0x67, 0x65, 0x12,
+	0x2f, 0x2e, 0x69, 0x6f, 0x2e, 0x64, 0x65, 0x65, 0x70, 0x68, 0x61, 0x76, 0x65, 0x6e, 0x2e, 0x70,
 	0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x62, 0x61, 0x63, 0x6b, 0x70, 0x6c, 0x61, 0x6e, 0x65, 0x2e, 0x67,
-	0x72, 0x70, 0x63, 0x2e, 0x50, 0x61, 0x72, 0x74, 0x69, 0x74, 0x69, 0x6f, 0x6e, 0x42, 0x79, 0x52,
-	0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x7a, 0x0a, 0x05, 0x4d, 0x65, 0x72, 0x67, 0x65,
-	0x12, 0x2f, 0x2e, 0x69, 0x6f, 0x2e, 0x64, 0x65, 0x65, 0x70, 0x68, 0x61, 0x76, 0x65, 0x6e, 0x2e,
-	0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x62, 0x61, 0x63, 0x6b, 0x70, 0x6c, 0x61, 0x6e, 0x65, 0x2e,
-	0x67, 0x72, 0x70, 0x63, 0x2e, 0x4d, 0x65, 0x72, 0x67, 0x65, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73,
-	0x74, 0x1a, 0x40, 0x2e, 0x69, 0x6f, 0x2e, 0x64, 0x65, 0x65, 0x70, 0x68, 0x61, 0x76, 0x65, 0x6e,
-	0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x62, 0x61, 0x63, 0x6b, 0x70, 0x6c, 0x61, 0x6e, 0x65,
-	0x2e, 0x67, 0x72, 0x70, 0x63, 0x2e, 0x45, 0x78, 0x70, 0x6f, 0x72, 0x74, 0x65, 0x64, 0x54, 0x61,
-	0x62, 0x6c, 0x65, 0x43, 0x72, 0x65, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x52, 0x65, 0x73, 0x70, 0x6f,
-	0x6e, 0x73, 0x65, 0x12, 0x80, 0x01, 0x0a, 0x08, 0x47, 0x65, 0x74, 0x54, 0x61, 0x62, 0x6c, 0x65,
-	0x12, 0x32, 0x2e, 0x69, 0x6f, 0x2e, 0x64, 0x65, 0x65, 0x70, 0x68, 0x61, 0x76, 0x65, 0x6e, 0x2e,
+	0x72, 0x70, 0x63, 0x2e, 0x4d, 0x65, 0x72, 0x67, 0x65, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74,
+	0x1a, 0x40, 0x2e, 0x69, 0x6f, 0x2e, 0x64, 0x65, 0x65, 0x70, 0x68, 0x61, 0x76, 0x65, 0x6e, 0x2e,
 	0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x62, 0x61, 0x63, 0x6b, 0x70, 0x6c, 0x61, 0x6e, 0x65, 0x2e,
-	0x67, 0x72, 0x70, 0x63, 0x2e, 0x47, 0x65, 0x74, 0x54, 0x61, 0x62, 0x6c, 0x65, 0x52, 0x65, 0x71,
-	0x75, 0x65, 0x73, 0x74, 0x1a, 0x40, 0x2e, 0x69, 0x6f, 0x2e, 0x64, 0x65, 0x65, 0x70, 0x68, 0x61,
-	0x76, 0x65, 0x6e, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x62, 0x61, 0x63, 0x6b, 0x70, 0x6c,
-	0x61, 0x6e, 0x65, 0x2e, 0x67, 0x72, 0x70, 0x63, 0x2e, 0x45, 0x78, 0x70, 0x6f, 0x72, 0x74, 0x65,
-	0x64, 0x54, 0x61, 0x62, 0x6c, 0x65, 0x43, 0x72, 0x65, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x52, 0x65,
-	0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x42, 0x4c, 0x48, 0x01, 0x50, 0x01, 0x5a, 0x46, 0x67, 0x69,
-	0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x64, 0x65, 0x65, 0x70, 0x68, 0x61, 0x76,
-	0x65, 0x6e, 0x2f, 0x64, 0x65, 0x65, 0x70, 0x68, 0x61, 0x76, 0x65, 0x6e, 0x2d, 0x63, 0x6f, 0x72,
-	0x65, 0x2f, 0x67, 0x6f, 0x2f, 0x69, 0x6e, 0x74, 0x65, 0x72, 0x6e, 0x61, 0x6c, 0x2f, 0x70, 0x72,
-	0x6f, 0x74, 0x6f, 0x2f, 0x70, 0x61, 0x72, 0x74, 0x69, 0x74, 0x69, 0x6f, 0x6e, 0x65, 0x64, 0x74,
-	0x61, 0x62, 0x6c, 0x65, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
+	0x67, 0x72, 0x70, 0x63, 0x2e, 0x45, 0x78, 0x70, 0x6f, 0x72, 0x74, 0x65, 0x64, 0x54, 0x61, 0x62,
+	0x6c, 0x65, 0x43, 0x72, 0x65, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e,
+	0x73, 0x65, 0x12, 0x80, 0x01, 0x0a, 0x08, 0x47, 0x65, 0x74, 0x54, 0x61, 0x62, 0x6c, 0x65, 0x12,
+	0x32, 0x2e, 0x69, 0x6f, 0x2e, 0x64, 0x65, 0x65, 0x70, 0x68, 0x61, 0x76, 0x65, 0x6e, 0x2e, 0x70,
+	0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x62, 0x61, 0x63, 0x6b, 0x70, 0x6c, 0x61, 0x6e, 0x65, 0x2e, 0x67,
+	0x72, 0x70, 0x63, 0x2e, 0x47, 0x65, 0x74, 0x54, 0x61, 0x62, 0x6c, 0x65, 0x52, 0x65, 0x71, 0x75,
+	0x65, 0x73, 0x74, 0x1a, 0x40, 0x2e, 0x69, 0x6f, 0x2e, 0x64, 0x65, 0x65, 0x70, 0x68, 0x61, 0x76,
+	0x65, 0x6e, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x62, 0x61, 0x63, 0x6b, 0x70, 0x6c, 0x61,
+	0x6e, 0x65, 0x2e, 0x67, 0x72, 0x70, 0x63, 0x2e, 0x45, 0x78, 0x70, 0x6f, 0x72, 0x74, 0x65, 0x64,
+	0x54, 0x61, 0x62, 0x6c, 0x65, 0x43, 0x72, 0x65, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x52, 0x65, 0x73,
+	0x70, 0x6f, 0x6e, 0x73, 0x65, 0x42, 0x4c, 0x48, 0x01, 0x50, 0x01, 0x5a, 0x46, 0x67, 0x69, 0x74,
+	0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x64, 0x65, 0x65, 0x70, 0x68, 0x61, 0x76, 0x65,
+	0x6e, 0x2f, 0x64, 0x65, 0x65, 0x70, 0x68, 0x61, 0x76, 0x65, 0x6e, 0x2d, 0x63, 0x6f, 0x72, 0x65,
+	0x2f, 0x67, 0x6f, 0x2f, 0x69, 0x6e, 0x74, 0x65, 0x72, 0x6e, 0x61, 0x6c, 0x2f, 0x70, 0x72, 0x6f,
+	0x74, 0x6f, 0x2f, 0x70, 0x61, 0x72, 0x74, 0x69, 0x74, 0x69, 0x6f, 0x6e, 0x65, 0x64, 0x74, 0x61,
+	0x62, 0x6c, 0x65, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
 }
 
 var (
-	file_deephaven_proto_partitionedtable_proto_rawDescOnce sync.Once
-	file_deephaven_proto_partitionedtable_proto_rawDescData = file_deephaven_proto_partitionedtable_proto_rawDesc
+	file_deephaven_core_proto_partitionedtable_proto_rawDescOnce sync.Once
+	file_deephaven_core_proto_partitionedtable_proto_rawDescData = file_deephaven_core_proto_partitionedtable_proto_rawDesc
 )
 
-func file_deephaven_proto_partitionedtable_proto_rawDescGZIP() []byte {
-	file_deephaven_proto_partitionedtable_proto_rawDescOnce.Do(func() {
-		file_deephaven_proto_partitionedtable_proto_rawDescData = protoimpl.X.CompressGZIP(file_deephaven_proto_partitionedtable_proto_rawDescData)
+func file_deephaven_core_proto_partitionedtable_proto_rawDescGZIP() []byte {
+	file_deephaven_core_proto_partitionedtable_proto_rawDescOnce.Do(func() {
+		file_deephaven_core_proto_partitionedtable_proto_rawDescData = protoimpl.X.CompressGZIP(file_deephaven_core_proto_partitionedtable_proto_rawDescData)
 	})
-	return file_deephaven_proto_partitionedtable_proto_rawDescData
+	return file_deephaven_core_proto_partitionedtable_proto_rawDescData
 }
 
-var file_deephaven_proto_partitionedtable_proto_msgTypes = make([]protoimpl.MessageInfo, 5)
-var file_deephaven_proto_partitionedtable_proto_goTypes = []interface{}{
+var file_deephaven_core_proto_partitionedtable_proto_msgTypes = make([]protoimpl.MessageInfo, 5)
+var file_deephaven_core_proto_partitionedtable_proto_goTypes = []interface{}{
 	(*PartitionByRequest)(nil),                  // 0: io.deephaven.proto.backplane.grpc.PartitionByRequest
 	(*PartitionByResponse)(nil),                 // 1: io.deephaven.proto.backplane.grpc.PartitionByResponse
 	(*MergeRequest)(nil),                        // 2: io.deephaven.proto.backplane.grpc.MergeRequest
@@ -477,7 +478,7 @@ var file_deephaven_proto_partitionedtable_proto_goTypes = []interface{}{
 	(*ticket.Ticket)(nil),                       // 5: io.deephaven.proto.backplane.grpc.Ticket
 	(*table.ExportedTableCreationResponse)(nil), // 6: io.deephaven.proto.backplane.grpc.ExportedTableCreationResponse
 }
-var file_deephaven_proto_partitionedtable_proto_depIdxs = []int32{
+var file_deephaven_core_proto_partitionedtable_proto_depIdxs = []int32{
 	5,  // 0: io.deephaven.proto.backplane.grpc.PartitionByRequest.table_id:type_name -> io.deephaven.proto.backplane.grpc.Ticket
 	5,  // 1: io.deephaven.proto.backplane.grpc.PartitionByRequest.result_id:type_name -> io.deephaven.proto.backplane.grpc.Ticket
 	5,  // 2: io.deephaven.proto.backplane.grpc.MergeRequest.partitioned_table:type_name -> io.deephaven.proto.backplane.grpc.Ticket
@@ -498,13 +499,13 @@ var file_deephaven_proto_partitionedtable_proto_depIdxs = []int32{
 	0,  // [0:7] is the sub-list for field type_name
 }
 
-func init() { file_deephaven_proto_partitionedtable_proto_init() }
-func file_deephaven_proto_partitionedtable_proto_init() {
-	if File_deephaven_proto_partitionedtable_proto != nil {
+func init() { file_deephaven_core_proto_partitionedtable_proto_init() }
+func file_deephaven_core_proto_partitionedtable_proto_init() {
+	if File_deephaven_core_proto_partitionedtable_proto != nil {
 		return
 	}
 	if !protoimpl.UnsafeEnabled {
-		file_deephaven_proto_partitionedtable_proto_msgTypes[0].Exporter = func(v interface{}, i int) interface{} {
+		file_deephaven_core_proto_partitionedtable_proto_msgTypes[0].Exporter = func(v interface{}, i int) interface{} {
 			switch v := v.(*PartitionByRequest); i {
 			case 0:
 				return &v.state
@@ -516,7 +517,7 @@ func file_deephaven_proto_partitionedtable_proto_init() {
 				return nil
 			}
 		}
-		file_deephaven_proto_partitionedtable_proto_msgTypes[1].Exporter = func(v interface{}, i int) interface{} {
+		file_deephaven_core_proto_partitionedtable_proto_msgTypes[1].Exporter = func(v interface{}, i int) interface{} {
 			switch v := v.(*PartitionByResponse); i {
 			case 0:
 				return &v.state
@@ -528,7 +529,7 @@ func file_deephaven_proto_partitionedtable_proto_init() {
 				return nil
 			}
 		}
-		file_deephaven_proto_partitionedtable_proto_msgTypes[2].Exporter = func(v interface{}, i int) interface{} {
+		file_deephaven_core_proto_partitionedtable_proto_msgTypes[2].Exporter = func(v interface{}, i int) interface{} {
 			switch v := v.(*MergeRequest); i {
 			case 0:
 				return &v.state
@@ -540,7 +541,7 @@ func file_deephaven_proto_partitionedtable_proto_init() {
 				return nil
 			}
 		}
-		file_deephaven_proto_partitionedtable_proto_msgTypes[3].Exporter = func(v interface{}, i int) interface{} {
+		file_deephaven_core_proto_partitionedtable_proto_msgTypes[3].Exporter = func(v interface{}, i int) interface{} {
 			switch v := v.(*GetTableRequest); i {
 			case 0:
 				return &v.state
@@ -552,7 +553,7 @@ func file_deephaven_proto_partitionedtable_proto_init() {
 				return nil
 			}
 		}
-		file_deephaven_proto_partitionedtable_proto_msgTypes[4].Exporter = func(v interface{}, i int) interface{} {
+		file_deephaven_core_proto_partitionedtable_proto_msgTypes[4].Exporter = func(v interface{}, i int) interface{} {
 			switch v := v.(*PartitionedTableDescriptor); i {
 			case 0:
 				return &v.state
@@ -569,18 +570,18 @@ func file_deephaven_proto_partitionedtable_proto_init() {
 	out := protoimpl.TypeBuilder{
 		File: protoimpl.DescBuilder{
 			GoPackagePath: reflect.TypeOf(x{}).PkgPath(),
-			RawDescriptor: file_deephaven_proto_partitionedtable_proto_rawDesc,
+			RawDescriptor: file_deephaven_core_proto_partitionedtable_proto_rawDesc,
 			NumEnums:      0,
 			NumMessages:   5,
 			NumExtensions: 0,
 			NumServices:   1,
 		},
-		GoTypes:           file_deephaven_proto_partitionedtable_proto_goTypes,
-		DependencyIndexes: file_deephaven_proto_partitionedtable_proto_depIdxs,
-		MessageInfos:      file_deephaven_proto_partitionedtable_proto_msgTypes,
+		GoTypes:           file_deephaven_core_proto_partitionedtable_proto_goTypes,
+		DependencyIndexes: file_deephaven_core_proto_partitionedtable_proto_depIdxs,
+		MessageInfos:      file_deephaven_core_proto_partitionedtable_proto_msgTypes,
 	}.Build()
-	File_deephaven_proto_partitionedtable_proto = out.File
-	file_deephaven_proto_partitionedtable_proto_rawDesc = nil
-	file_deephaven_proto_partitionedtable_proto_goTypes = nil
-	file_deephaven_proto_partitionedtable_proto_depIdxs = nil
+	File_deephaven_core_proto_partitionedtable_proto = out.File
+	file_deephaven_core_proto_partitionedtable_proto_rawDesc = nil
+	file_deephaven_core_proto_partitionedtable_proto_goTypes = nil
+	file_deephaven_core_proto_partitionedtable_proto_depIdxs = nil
 }
diff --git a/go/internal/proto/partitionedtable/partitionedtable_grpc.pb.go b/go/internal/proto/partitionedtable/partitionedtable_grpc.pb.go
index 1cd02d766ae..de239fe13c4 100644
--- a/go/internal/proto/partitionedtable/partitionedtable_grpc.pb.go
+++ b/go/internal/proto/partitionedtable/partitionedtable_grpc.pb.go
@@ -2,7 +2,7 @@
 // versions:
 // - protoc-gen-go-grpc v1.2.0
 // - protoc             v4.25.3
-// source: deephaven/proto/partitionedtable.proto
+// source: deephaven_core/proto/partitionedtable.proto
 
 package partitionedtable
 
@@ -211,5 +211,5 @@ var PartitionedTableService_ServiceDesc = grpc.ServiceDesc{
 		},
 	},
 	Streams:  []grpc.StreamDesc{},
-	Metadata: "deephaven/proto/partitionedtable.proto",
+	Metadata: "deephaven_core/proto/partitionedtable.proto",
 }
diff --git a/go/internal/proto/session/session.pb.go b/go/internal/proto/session/session.pb.go
index f49a6ec77f2..36bf54ff072 100644
--- a/go/internal/proto/session/session.pb.go
+++ b/go/internal/proto/session/session.pb.go
@@ -5,7 +5,7 @@
 // versions:
 // 	protoc-gen-go v1.28.1
 // 	protoc        v4.25.3
-// source: deephaven/proto/session.proto
+// source: deephaven_core/proto/session.proto
 
 package session
 
@@ -87,11 +87,11 @@ func (x ExportNotification_State) String() string {
 }
 
 func (ExportNotification_State) Descriptor() protoreflect.EnumDescriptor {
-	return file_deephaven_proto_session_proto_enumTypes[0].Descriptor()
+	return file_deephaven_core_proto_session_proto_enumTypes[0].Descriptor()
 }
 
 func (ExportNotification_State) Type() protoreflect.EnumType {
-	return &file_deephaven_proto_session_proto_enumTypes[0]
+	return &file_deephaven_core_proto_session_proto_enumTypes[0]
 }
 
 func (x ExportNotification_State) Number() protoreflect.EnumNumber {
@@ -100,7 +100,7 @@ func (x ExportNotification_State) Number() protoreflect.EnumNumber {
 
 // Deprecated: Use ExportNotification_State.Descriptor instead.
 func (ExportNotification_State) EnumDescriptor() ([]byte, []int) {
-	return file_deephaven_proto_session_proto_rawDescGZIP(), []int{11, 0}
+	return file_deephaven_core_proto_session_proto_rawDescGZIP(), []int{11, 0}
 }
 
 type WrappedAuthenticationRequest struct {
@@ -119,7 +119,7 @@ type WrappedAuthenticationRequest struct {
 func (x *WrappedAuthenticationRequest) Reset() {
 	*x = WrappedAuthenticationRequest{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_deephaven_proto_session_proto_msgTypes[0]
+		mi := &file_deephaven_core_proto_session_proto_msgTypes[0]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -132,7 +132,7 @@ func (x *WrappedAuthenticationRequest) String() string {
 func (*WrappedAuthenticationRequest) ProtoMessage() {}
 
 func (x *WrappedAuthenticationRequest) ProtoReflect() protoreflect.Message {
-	mi := &file_deephaven_proto_session_proto_msgTypes[0]
+	mi := &file_deephaven_core_proto_session_proto_msgTypes[0]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -145,7 +145,7 @@ func (x *WrappedAuthenticationRequest) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use WrappedAuthenticationRequest.ProtoReflect.Descriptor instead.
 func (*WrappedAuthenticationRequest) Descriptor() ([]byte, []int) {
-	return file_deephaven_proto_session_proto_rawDescGZIP(), []int{0}
+	return file_deephaven_core_proto_session_proto_rawDescGZIP(), []int{0}
 }
 
 func (x *WrappedAuthenticationRequest) GetType() string {
@@ -188,7 +188,7 @@ type HandshakeRequest struct {
 func (x *HandshakeRequest) Reset() {
 	*x = HandshakeRequest{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_deephaven_proto_session_proto_msgTypes[1]
+		mi := &file_deephaven_core_proto_session_proto_msgTypes[1]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -201,7 +201,7 @@ func (x *HandshakeRequest) String() string {
 func (*HandshakeRequest) ProtoMessage() {}
 
 func (x *HandshakeRequest) ProtoReflect() protoreflect.Message {
-	mi := &file_deephaven_proto_session_proto_msgTypes[1]
+	mi := &file_deephaven_core_proto_session_proto_msgTypes[1]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -214,7 +214,7 @@ func (x *HandshakeRequest) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use HandshakeRequest.ProtoReflect.Descriptor instead.
 func (*HandshakeRequest) Descriptor() ([]byte, []int) {
-	return file_deephaven_proto_session_proto_rawDescGZIP(), []int{1}
+	return file_deephaven_core_proto_session_proto_rawDescGZIP(), []int{1}
 }
 
 // Deprecated: Do not use.
@@ -268,7 +268,7 @@ type HandshakeResponse struct {
 func (x *HandshakeResponse) Reset() {
 	*x = HandshakeResponse{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_deephaven_proto_session_proto_msgTypes[2]
+		mi := &file_deephaven_core_proto_session_proto_msgTypes[2]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -281,7 +281,7 @@ func (x *HandshakeResponse) String() string {
 func (*HandshakeResponse) ProtoMessage() {}
 
 func (x *HandshakeResponse) ProtoReflect() protoreflect.Message {
-	mi := &file_deephaven_proto_session_proto_msgTypes[2]
+	mi := &file_deephaven_core_proto_session_proto_msgTypes[2]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -294,7 +294,7 @@ func (x *HandshakeResponse) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use HandshakeResponse.ProtoReflect.Descriptor instead.
 func (*HandshakeResponse) Descriptor() ([]byte, []int) {
-	return file_deephaven_proto_session_proto_rawDescGZIP(), []int{2}
+	return file_deephaven_core_proto_session_proto_rawDescGZIP(), []int{2}
 }
 
 // Deprecated: Do not use.
@@ -338,7 +338,7 @@ type CloseSessionResponse struct {
 func (x *CloseSessionResponse) Reset() {
 	*x = CloseSessionResponse{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_deephaven_proto_session_proto_msgTypes[3]
+		mi := &file_deephaven_core_proto_session_proto_msgTypes[3]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -351,7 +351,7 @@ func (x *CloseSessionResponse) String() string {
 func (*CloseSessionResponse) ProtoMessage() {}
 
 func (x *CloseSessionResponse) ProtoReflect() protoreflect.Message {
-	mi := &file_deephaven_proto_session_proto_msgTypes[3]
+	mi := &file_deephaven_core_proto_session_proto_msgTypes[3]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -364,7 +364,7 @@ func (x *CloseSessionResponse) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use CloseSessionResponse.ProtoReflect.Descriptor instead.
 func (*CloseSessionResponse) Descriptor() ([]byte, []int) {
-	return file_deephaven_proto_session_proto_rawDescGZIP(), []int{3}
+	return file_deephaven_core_proto_session_proto_rawDescGZIP(), []int{3}
 }
 
 type ReleaseRequest struct {
@@ -378,7 +378,7 @@ type ReleaseRequest struct {
 func (x *ReleaseRequest) Reset() {
 	*x = ReleaseRequest{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_deephaven_proto_session_proto_msgTypes[4]
+		mi := &file_deephaven_core_proto_session_proto_msgTypes[4]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -391,7 +391,7 @@ func (x *ReleaseRequest) String() string {
 func (*ReleaseRequest) ProtoMessage() {}
 
 func (x *ReleaseRequest) ProtoReflect() protoreflect.Message {
-	mi := &file_deephaven_proto_session_proto_msgTypes[4]
+	mi := &file_deephaven_core_proto_session_proto_msgTypes[4]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -404,7 +404,7 @@ func (x *ReleaseRequest) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use ReleaseRequest.ProtoReflect.Descriptor instead.
 func (*ReleaseRequest) Descriptor() ([]byte, []int) {
-	return file_deephaven_proto_session_proto_rawDescGZIP(), []int{4}
+	return file_deephaven_core_proto_session_proto_rawDescGZIP(), []int{4}
 }
 
 func (x *ReleaseRequest) GetId() *ticket.Ticket {
@@ -423,7 +423,7 @@ type ReleaseResponse struct {
 func (x *ReleaseResponse) Reset() {
 	*x = ReleaseResponse{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_deephaven_proto_session_proto_msgTypes[5]
+		mi := &file_deephaven_core_proto_session_proto_msgTypes[5]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -436,7 +436,7 @@ func (x *ReleaseResponse) String() string {
 func (*ReleaseResponse) ProtoMessage() {}
 
 func (x *ReleaseResponse) ProtoReflect() protoreflect.Message {
-	mi := &file_deephaven_proto_session_proto_msgTypes[5]
+	mi := &file_deephaven_core_proto_session_proto_msgTypes[5]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -449,7 +449,7 @@ func (x *ReleaseResponse) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use ReleaseResponse.ProtoReflect.Descriptor instead.
 func (*ReleaseResponse) Descriptor() ([]byte, []int) {
-	return file_deephaven_proto_session_proto_rawDescGZIP(), []int{5}
+	return file_deephaven_core_proto_session_proto_rawDescGZIP(), []int{5}
 }
 
 type ExportRequest struct {
@@ -464,7 +464,7 @@ type ExportRequest struct {
 func (x *ExportRequest) Reset() {
 	*x = ExportRequest{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_deephaven_proto_session_proto_msgTypes[6]
+		mi := &file_deephaven_core_proto_session_proto_msgTypes[6]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -477,7 +477,7 @@ func (x *ExportRequest) String() string {
 func (*ExportRequest) ProtoMessage() {}
 
 func (x *ExportRequest) ProtoReflect() protoreflect.Message {
-	mi := &file_deephaven_proto_session_proto_msgTypes[6]
+	mi := &file_deephaven_core_proto_session_proto_msgTypes[6]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -490,7 +490,7 @@ func (x *ExportRequest) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use ExportRequest.ProtoReflect.Descriptor instead.
 func (*ExportRequest) Descriptor() ([]byte, []int) {
-	return file_deephaven_proto_session_proto_rawDescGZIP(), []int{6}
+	return file_deephaven_core_proto_session_proto_rawDescGZIP(), []int{6}
 }
 
 func (x *ExportRequest) GetSourceId() *ticket.Ticket {
@@ -516,7 +516,7 @@ type ExportResponse struct {
 func (x *ExportResponse) Reset() {
 	*x = ExportResponse{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_deephaven_proto_session_proto_msgTypes[7]
+		mi := &file_deephaven_core_proto_session_proto_msgTypes[7]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -529,7 +529,7 @@ func (x *ExportResponse) String() string {
 func (*ExportResponse) ProtoMessage() {}
 
 func (x *ExportResponse) ProtoReflect() protoreflect.Message {
-	mi := &file_deephaven_proto_session_proto_msgTypes[7]
+	mi := &file_deephaven_core_proto_session_proto_msgTypes[7]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -542,7 +542,7 @@ func (x *ExportResponse) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use ExportResponse.ProtoReflect.Descriptor instead.
 func (*ExportResponse) Descriptor() ([]byte, []int) {
-	return file_deephaven_proto_session_proto_rawDescGZIP(), []int{7}
+	return file_deephaven_core_proto_session_proto_rawDescGZIP(), []int{7}
 }
 
 type PublishRequest struct {
@@ -557,7 +557,7 @@ type PublishRequest struct {
 func (x *PublishRequest) Reset() {
 	*x = PublishRequest{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_deephaven_proto_session_proto_msgTypes[8]
+		mi := &file_deephaven_core_proto_session_proto_msgTypes[8]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -570,7 +570,7 @@ func (x *PublishRequest) String() string {
 func (*PublishRequest) ProtoMessage() {}
 
 func (x *PublishRequest) ProtoReflect() protoreflect.Message {
-	mi := &file_deephaven_proto_session_proto_msgTypes[8]
+	mi := &file_deephaven_core_proto_session_proto_msgTypes[8]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -583,7 +583,7 @@ func (x *PublishRequest) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use PublishRequest.ProtoReflect.Descriptor instead.
 func (*PublishRequest) Descriptor() ([]byte, []int) {
-	return file_deephaven_proto_session_proto_rawDescGZIP(), []int{8}
+	return file_deephaven_core_proto_session_proto_rawDescGZIP(), []int{8}
 }
 
 func (x *PublishRequest) GetSourceId() *ticket.Ticket {
@@ -609,7 +609,7 @@ type PublishResponse struct {
 func (x *PublishResponse) Reset() {
 	*x = PublishResponse{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_deephaven_proto_session_proto_msgTypes[9]
+		mi := &file_deephaven_core_proto_session_proto_msgTypes[9]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -622,7 +622,7 @@ func (x *PublishResponse) String() string {
 func (*PublishResponse) ProtoMessage() {}
 
 func (x *PublishResponse) ProtoReflect() protoreflect.Message {
-	mi := &file_deephaven_proto_session_proto_msgTypes[9]
+	mi := &file_deephaven_core_proto_session_proto_msgTypes[9]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -635,7 +635,7 @@ func (x *PublishResponse) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use PublishResponse.ProtoReflect.Descriptor instead.
 func (*PublishResponse) Descriptor() ([]byte, []int) {
-	return file_deephaven_proto_session_proto_rawDescGZIP(), []int{9}
+	return file_deephaven_core_proto_session_proto_rawDescGZIP(), []int{9}
 }
 
 type ExportNotificationRequest struct {
@@ -647,7 +647,7 @@ type ExportNotificationRequest struct {
 func (x *ExportNotificationRequest) Reset() {
 	*x = ExportNotificationRequest{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_deephaven_proto_session_proto_msgTypes[10]
+		mi := &file_deephaven_core_proto_session_proto_msgTypes[10]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -660,7 +660,7 @@ func (x *ExportNotificationRequest) String() string {
 func (*ExportNotificationRequest) ProtoMessage() {}
 
 func (x *ExportNotificationRequest) ProtoReflect() protoreflect.Message {
-	mi := &file_deephaven_proto_session_proto_msgTypes[10]
+	mi := &file_deephaven_core_proto_session_proto_msgTypes[10]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -673,7 +673,7 @@ func (x *ExportNotificationRequest) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use ExportNotificationRequest.ProtoReflect.Descriptor instead.
 func (*ExportNotificationRequest) Descriptor() ([]byte, []int) {
-	return file_deephaven_proto_session_proto_rawDescGZIP(), []int{10}
+	return file_deephaven_core_proto_session_proto_rawDescGZIP(), []int{10}
 }
 
 type ExportNotification struct {
@@ -694,7 +694,7 @@ type ExportNotification struct {
 func (x *ExportNotification) Reset() {
 	*x = ExportNotification{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_deephaven_proto_session_proto_msgTypes[11]
+		mi := &file_deephaven_core_proto_session_proto_msgTypes[11]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -707,7 +707,7 @@ func (x *ExportNotification) String() string {
 func (*ExportNotification) ProtoMessage() {}
 
 func (x *ExportNotification) ProtoReflect() protoreflect.Message {
-	mi := &file_deephaven_proto_session_proto_msgTypes[11]
+	mi := &file_deephaven_core_proto_session_proto_msgTypes[11]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -720,7 +720,7 @@ func (x *ExportNotification) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use ExportNotification.ProtoReflect.Descriptor instead.
 func (*ExportNotification) Descriptor() ([]byte, []int) {
-	return file_deephaven_proto_session_proto_rawDescGZIP(), []int{11}
+	return file_deephaven_core_proto_session_proto_rawDescGZIP(), []int{11}
 }
 
 func (x *ExportNotification) GetTicket() *ticket.Ticket {
@@ -760,7 +760,7 @@ type TerminationNotificationRequest struct {
 func (x *TerminationNotificationRequest) Reset() {
 	*x = TerminationNotificationRequest{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_deephaven_proto_session_proto_msgTypes[12]
+		mi := &file_deephaven_core_proto_session_proto_msgTypes[12]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -773,7 +773,7 @@ func (x *TerminationNotificationRequest) String() string {
 func (*TerminationNotificationRequest) ProtoMessage() {}
 
 func (x *TerminationNotificationRequest) ProtoReflect() protoreflect.Message {
-	mi := &file_deephaven_proto_session_proto_msgTypes[12]
+	mi := &file_deephaven_core_proto_session_proto_msgTypes[12]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -786,7 +786,7 @@ func (x *TerminationNotificationRequest) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use TerminationNotificationRequest.ProtoReflect.Descriptor instead.
 func (*TerminationNotificationRequest) Descriptor() ([]byte, []int) {
-	return file_deephaven_proto_session_proto_rawDescGZIP(), []int{12}
+	return file_deephaven_core_proto_session_proto_rawDescGZIP(), []int{12}
 }
 
 type TerminationNotificationResponse struct {
@@ -807,7 +807,7 @@ type TerminationNotificationResponse struct {
 func (x *TerminationNotificationResponse) Reset() {
 	*x = TerminationNotificationResponse{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_deephaven_proto_session_proto_msgTypes[13]
+		mi := &file_deephaven_core_proto_session_proto_msgTypes[13]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -820,7 +820,7 @@ func (x *TerminationNotificationResponse) String() string {
 func (*TerminationNotificationResponse) ProtoMessage() {}
 
 func (x *TerminationNotificationResponse) ProtoReflect() protoreflect.Message {
-	mi := &file_deephaven_proto_session_proto_msgTypes[13]
+	mi := &file_deephaven_core_proto_session_proto_msgTypes[13]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -833,7 +833,7 @@ func (x *TerminationNotificationResponse) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use TerminationNotificationResponse.ProtoReflect.Descriptor instead.
 func (*TerminationNotificationResponse) Descriptor() ([]byte, []int) {
-	return file_deephaven_proto_session_proto_rawDescGZIP(), []int{13}
+	return file_deephaven_core_proto_session_proto_rawDescGZIP(), []int{13}
 }
 
 func (x *TerminationNotificationResponse) GetAbnormalTermination() bool {
@@ -877,7 +877,7 @@ type TerminationNotificationResponse_StackTrace struct {
 func (x *TerminationNotificationResponse_StackTrace) Reset() {
 	*x = TerminationNotificationResponse_StackTrace{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_deephaven_proto_session_proto_msgTypes[14]
+		mi := &file_deephaven_core_proto_session_proto_msgTypes[14]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -890,7 +890,7 @@ func (x *TerminationNotificationResponse_StackTrace) String() string {
 func (*TerminationNotificationResponse_StackTrace) ProtoMessage() {}
 
 func (x *TerminationNotificationResponse_StackTrace) ProtoReflect() protoreflect.Message {
-	mi := &file_deephaven_proto_session_proto_msgTypes[14]
+	mi := &file_deephaven_core_proto_session_proto_msgTypes[14]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -903,7 +903,7 @@ func (x *TerminationNotificationResponse_StackTrace) ProtoReflect() protoreflect
 
 // Deprecated: Use TerminationNotificationResponse_StackTrace.ProtoReflect.Descriptor instead.
 func (*TerminationNotificationResponse_StackTrace) Descriptor() ([]byte, []int) {
-	return file_deephaven_proto_session_proto_rawDescGZIP(), []int{13, 0}
+	return file_deephaven_core_proto_session_proto_rawDescGZIP(), []int{13, 0}
 }
 
 func (x *TerminationNotificationResponse_StackTrace) GetType() string {
@@ -927,220 +927,220 @@ func (x *TerminationNotificationResponse_StackTrace) GetElements() []string {
 	return nil
 }
 
-var File_deephaven_proto_session_proto protoreflect.FileDescriptor
+var File_deephaven_core_proto_session_proto protoreflect.FileDescriptor
 
-var file_deephaven_proto_session_proto_rawDesc = []byte{
-	0x0a, 0x1d, 0x64, 0x65, 0x65, 0x70, 0x68, 0x61, 0x76, 0x65, 0x6e, 0x2f, 0x70, 0x72, 0x6f, 0x74,
-	0x6f, 0x2f, 0x73, 0x65, 0x73, 0x73, 0x69, 0x6f, 0x6e, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x12,
-	0x21, 0x69, 0x6f, 0x2e, 0x64, 0x65, 0x65, 0x70, 0x68, 0x61, 0x76, 0x65, 0x6e, 0x2e, 0x70, 0x72,
-	0x6f, 0x74, 0x6f, 0x2e, 0x62, 0x61, 0x63, 0x6b, 0x70, 0x6c, 0x61, 0x6e, 0x65, 0x2e, 0x67, 0x72,
-	0x70, 0x63, 0x1a, 0x1c, 0x64, 0x65, 0x65, 0x70, 0x68, 0x61, 0x76, 0x65, 0x6e, 0x2f, 0x70, 0x72,
-	0x6f, 0x74, 0x6f, 0x2f, 0x74, 0x69, 0x63, 0x6b, 0x65, 0x74, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f,
-	0x22, 0x58, 0x0a, 0x1c, 0x57, 0x72, 0x61, 0x70, 0x70, 0x65, 0x64, 0x41, 0x75, 0x74, 0x68, 0x65,
-	0x6e, 0x74, 0x69, 0x63, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74,
-	0x12, 0x12, 0x0a, 0x04, 0x74, 0x79, 0x70, 0x65, 0x18, 0x04, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04,
-	0x74, 0x79, 0x70, 0x65, 0x12, 0x18, 0x0a, 0x07, 0x70, 0x61, 0x79, 0x6c, 0x6f, 0x61, 0x64, 0x18,
-	0x05, 0x20, 0x01, 0x28, 0x0c, 0x52, 0x07, 0x70, 0x61, 0x79, 0x6c, 0x6f, 0x61, 0x64, 0x4a, 0x04,
-	0x08, 0x02, 0x10, 0x03, 0x4a, 0x04, 0x08, 0x03, 0x10, 0x04, 0x22, 0x59, 0x0a, 0x10, 0x48, 0x61,
-	0x6e, 0x64, 0x73, 0x68, 0x61, 0x6b, 0x65, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x27,
-	0x0a, 0x0d, 0x61, 0x75, 0x74, 0x68, 0x5f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x63, 0x6f, 0x6c, 0x18,
-	0x01, 0x20, 0x01, 0x28, 0x11, 0x42, 0x02, 0x18, 0x01, 0x52, 0x0c, 0x61, 0x75, 0x74, 0x68, 0x50,
-	0x72, 0x6f, 0x74, 0x6f, 0x63, 0x6f, 0x6c, 0x12, 0x1c, 0x0a, 0x07, 0x70, 0x61, 0x79, 0x6c, 0x6f,
-	0x61, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0c, 0x42, 0x02, 0x18, 0x01, 0x52, 0x07, 0x70, 0x61,
-	0x79, 0x6c, 0x6f, 0x61, 0x64, 0x22, 0xf5, 0x01, 0x0a, 0x11, 0x48, 0x61, 0x6e, 0x64, 0x73, 0x68,
-	0x61, 0x6b, 0x65, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x2b, 0x0a, 0x0f, 0x6d,
-	0x65, 0x74, 0x61, 0x64, 0x61, 0x74, 0x61, 0x5f, 0x68, 0x65, 0x61, 0x64, 0x65, 0x72, 0x18, 0x01,
-	0x20, 0x01, 0x28, 0x0c, 0x42, 0x02, 0x18, 0x01, 0x52, 0x0e, 0x6d, 0x65, 0x74, 0x61, 0x64, 0x61,
-	0x74, 0x61, 0x48, 0x65, 0x61, 0x64, 0x65, 0x72, 0x12, 0x27, 0x0a, 0x0d, 0x73, 0x65, 0x73, 0x73,
-	0x69, 0x6f, 0x6e, 0x5f, 0x74, 0x6f, 0x6b, 0x65, 0x6e, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0c, 0x42,
-	0x02, 0x18, 0x01, 0x52, 0x0c, 0x73, 0x65, 0x73, 0x73, 0x69, 0x6f, 0x6e, 0x54, 0x6f, 0x6b, 0x65,
-	0x6e, 0x12, 0x41, 0x0a, 0x1a, 0x74, 0x6f, 0x6b, 0x65, 0x6e, 0x5f, 0x64, 0x65, 0x61, 0x64, 0x6c,
-	0x69, 0x6e, 0x65, 0x5f, 0x74, 0x69, 0x6d, 0x65, 0x5f, 0x6d, 0x69, 0x6c, 0x6c, 0x69, 0x73, 0x18,
-	0x03, 0x20, 0x01, 0x28, 0x12, 0x42, 0x04, 0x18, 0x01, 0x30, 0x01, 0x52, 0x17, 0x74, 0x6f, 0x6b,
-	0x65, 0x6e, 0x44, 0x65, 0x61, 0x64, 0x6c, 0x69, 0x6e, 0x65, 0x54, 0x69, 0x6d, 0x65, 0x4d, 0x69,
-	0x6c, 0x6c, 0x69, 0x73, 0x12, 0x47, 0x0a, 0x1d, 0x74, 0x6f, 0x6b, 0x65, 0x6e, 0x5f, 0x65, 0x78,
-	0x70, 0x69, 0x72, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x5f, 0x64, 0x65, 0x6c, 0x61, 0x79, 0x5f, 0x6d,
-	0x69, 0x6c, 0x6c, 0x69, 0x73, 0x18, 0x04, 0x20, 0x01, 0x28, 0x12, 0x42, 0x04, 0x18, 0x01, 0x30,
-	0x01, 0x52, 0x1a, 0x74, 0x6f, 0x6b, 0x65, 0x6e, 0x45, 0x78, 0x70, 0x69, 0x72, 0x61, 0x74, 0x69,
-	0x6f, 0x6e, 0x44, 0x65, 0x6c, 0x61, 0x79, 0x4d, 0x69, 0x6c, 0x6c, 0x69, 0x73, 0x22, 0x16, 0x0a,
-	0x14, 0x43, 0x6c, 0x6f, 0x73, 0x65, 0x53, 0x65, 0x73, 0x73, 0x69, 0x6f, 0x6e, 0x52, 0x65, 0x73,
-	0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x4b, 0x0a, 0x0e, 0x52, 0x65, 0x6c, 0x65, 0x61, 0x73, 0x65,
-	0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x39, 0x0a, 0x02, 0x69, 0x64, 0x18, 0x01, 0x20,
-	0x01, 0x28, 0x0b, 0x32, 0x29, 0x2e, 0x69, 0x6f, 0x2e, 0x64, 0x65, 0x65, 0x70, 0x68, 0x61, 0x76,
-	0x65, 0x6e, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x62, 0x61, 0x63, 0x6b, 0x70, 0x6c, 0x61,
-	0x6e, 0x65, 0x2e, 0x67, 0x72, 0x70, 0x63, 0x2e, 0x54, 0x69, 0x63, 0x6b, 0x65, 0x74, 0x52, 0x02,
-	0x69, 0x64, 0x22, 0x11, 0x0a, 0x0f, 0x52, 0x65, 0x6c, 0x65, 0x61, 0x73, 0x65, 0x52, 0x65, 0x73,
-	0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x9f, 0x01, 0x0a, 0x0d, 0x45, 0x78, 0x70, 0x6f, 0x72, 0x74,
-	0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x46, 0x0a, 0x09, 0x73, 0x6f, 0x75, 0x72, 0x63,
-	0x65, 0x5f, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x29, 0x2e, 0x69, 0x6f, 0x2e,
-	0x64, 0x65, 0x65, 0x70, 0x68, 0x61, 0x76, 0x65, 0x6e, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e,
-	0x62, 0x61, 0x63, 0x6b, 0x70, 0x6c, 0x61, 0x6e, 0x65, 0x2e, 0x67, 0x72, 0x70, 0x63, 0x2e, 0x54,
-	0x69, 0x63, 0x6b, 0x65, 0x74, 0x52, 0x08, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x49, 0x64, 0x12,
-	0x46, 0x0a, 0x09, 0x72, 0x65, 0x73, 0x75, 0x6c, 0x74, 0x5f, 0x69, 0x64, 0x18, 0x02, 0x20, 0x01,
-	0x28, 0x0b, 0x32, 0x29, 0x2e, 0x69, 0x6f, 0x2e, 0x64, 0x65, 0x65, 0x70, 0x68, 0x61, 0x76, 0x65,
-	0x6e, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x62, 0x61, 0x63, 0x6b, 0x70, 0x6c, 0x61, 0x6e,
-	0x65, 0x2e, 0x67, 0x72, 0x70, 0x63, 0x2e, 0x54, 0x69, 0x63, 0x6b, 0x65, 0x74, 0x52, 0x08, 0x72,
-	0x65, 0x73, 0x75, 0x6c, 0x74, 0x49, 0x64, 0x22, 0x10, 0x0a, 0x0e, 0x45, 0x78, 0x70, 0x6f, 0x72,
-	0x74, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0xa0, 0x01, 0x0a, 0x0e, 0x50, 0x75,
-	0x62, 0x6c, 0x69, 0x73, 0x68, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x46, 0x0a, 0x09,
-	0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x5f, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32,
-	0x29, 0x2e, 0x69, 0x6f, 0x2e, 0x64, 0x65, 0x65, 0x70, 0x68, 0x61, 0x76, 0x65, 0x6e, 0x2e, 0x70,
-	0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x62, 0x61, 0x63, 0x6b, 0x70, 0x6c, 0x61, 0x6e, 0x65, 0x2e, 0x67,
-	0x72, 0x70, 0x63, 0x2e, 0x54, 0x69, 0x63, 0x6b, 0x65, 0x74, 0x52, 0x08, 0x73, 0x6f, 0x75, 0x72,
-	0x63, 0x65, 0x49, 0x64, 0x12, 0x46, 0x0a, 0x09, 0x72, 0x65, 0x73, 0x75, 0x6c, 0x74, 0x5f, 0x69,
-	0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x29, 0x2e, 0x69, 0x6f, 0x2e, 0x64, 0x65, 0x65,
-	0x70, 0x68, 0x61, 0x76, 0x65, 0x6e, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x62, 0x61, 0x63,
-	0x6b, 0x70, 0x6c, 0x61, 0x6e, 0x65, 0x2e, 0x67, 0x72, 0x70, 0x63, 0x2e, 0x54, 0x69, 0x63, 0x6b,
-	0x65, 0x74, 0x52, 0x08, 0x72, 0x65, 0x73, 0x75, 0x6c, 0x74, 0x49, 0x64, 0x22, 0x11, 0x0a, 0x0f,
-	0x50, 0x75, 0x62, 0x6c, 0x69, 0x73, 0x68, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22,
-	0x1b, 0x0a, 0x19, 0x45, 0x78, 0x70, 0x6f, 0x72, 0x74, 0x4e, 0x6f, 0x74, 0x69, 0x66, 0x69, 0x63,
-	0x61, 0x74, 0x69, 0x6f, 0x6e, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x22, 0xe6, 0x03, 0x0a,
-	0x12, 0x45, 0x78, 0x70, 0x6f, 0x72, 0x74, 0x4e, 0x6f, 0x74, 0x69, 0x66, 0x69, 0x63, 0x61, 0x74,
-	0x69, 0x6f, 0x6e, 0x12, 0x41, 0x0a, 0x06, 0x74, 0x69, 0x63, 0x6b, 0x65, 0x74, 0x18, 0x01, 0x20,
-	0x01, 0x28, 0x0b, 0x32, 0x29, 0x2e, 0x69, 0x6f, 0x2e, 0x64, 0x65, 0x65, 0x70, 0x68, 0x61, 0x76,
+var file_deephaven_core_proto_session_proto_rawDesc = []byte{
+	0x0a, 0x22, 0x64, 0x65, 0x65, 0x70, 0x68, 0x61, 0x76, 0x65, 0x6e, 0x5f, 0x63, 0x6f, 0x72, 0x65,
+	0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2f, 0x73, 0x65, 0x73, 0x73, 0x69, 0x6f, 0x6e, 0x2e, 0x70,
+	0x72, 0x6f, 0x74, 0x6f, 0x12, 0x21, 0x69, 0x6f, 0x2e, 0x64, 0x65, 0x65, 0x70, 0x68, 0x61, 0x76,
 	0x65, 0x6e, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x62, 0x61, 0x63, 0x6b, 0x70, 0x6c, 0x61,
-	0x6e, 0x65, 0x2e, 0x67, 0x72, 0x70, 0x63, 0x2e, 0x54, 0x69, 0x63, 0x6b, 0x65, 0x74, 0x52, 0x06,
-	0x74, 0x69, 0x63, 0x6b, 0x65, 0x74, 0x12, 0x5e, 0x0a, 0x0c, 0x65, 0x78, 0x70, 0x6f, 0x72, 0x74,
-	0x5f, 0x73, 0x74, 0x61, 0x74, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0e, 0x32, 0x3b, 0x2e, 0x69,
+	0x6e, 0x65, 0x2e, 0x67, 0x72, 0x70, 0x63, 0x1a, 0x21, 0x64, 0x65, 0x65, 0x70, 0x68, 0x61, 0x76,
+	0x65, 0x6e, 0x5f, 0x63, 0x6f, 0x72, 0x65, 0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2f, 0x74, 0x69,
+	0x63, 0x6b, 0x65, 0x74, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x22, 0x58, 0x0a, 0x1c, 0x57, 0x72,
+	0x61, 0x70, 0x70, 0x65, 0x64, 0x41, 0x75, 0x74, 0x68, 0x65, 0x6e, 0x74, 0x69, 0x63, 0x61, 0x74,
+	0x69, 0x6f, 0x6e, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x12, 0x0a, 0x04, 0x74, 0x79,
+	0x70, 0x65, 0x18, 0x04, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x74, 0x79, 0x70, 0x65, 0x12, 0x18,
+	0x0a, 0x07, 0x70, 0x61, 0x79, 0x6c, 0x6f, 0x61, 0x64, 0x18, 0x05, 0x20, 0x01, 0x28, 0x0c, 0x52,
+	0x07, 0x70, 0x61, 0x79, 0x6c, 0x6f, 0x61, 0x64, 0x4a, 0x04, 0x08, 0x02, 0x10, 0x03, 0x4a, 0x04,
+	0x08, 0x03, 0x10, 0x04, 0x22, 0x59, 0x0a, 0x10, 0x48, 0x61, 0x6e, 0x64, 0x73, 0x68, 0x61, 0x6b,
+	0x65, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x27, 0x0a, 0x0d, 0x61, 0x75, 0x74, 0x68,
+	0x5f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x63, 0x6f, 0x6c, 0x18, 0x01, 0x20, 0x01, 0x28, 0x11, 0x42,
+	0x02, 0x18, 0x01, 0x52, 0x0c, 0x61, 0x75, 0x74, 0x68, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x63, 0x6f,
+	0x6c, 0x12, 0x1c, 0x0a, 0x07, 0x70, 0x61, 0x79, 0x6c, 0x6f, 0x61, 0x64, 0x18, 0x02, 0x20, 0x01,
+	0x28, 0x0c, 0x42, 0x02, 0x18, 0x01, 0x52, 0x07, 0x70, 0x61, 0x79, 0x6c, 0x6f, 0x61, 0x64, 0x22,
+	0xf5, 0x01, 0x0a, 0x11, 0x48, 0x61, 0x6e, 0x64, 0x73, 0x68, 0x61, 0x6b, 0x65, 0x52, 0x65, 0x73,
+	0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x2b, 0x0a, 0x0f, 0x6d, 0x65, 0x74, 0x61, 0x64, 0x61, 0x74,
+	0x61, 0x5f, 0x68, 0x65, 0x61, 0x64, 0x65, 0x72, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0c, 0x42, 0x02,
+	0x18, 0x01, 0x52, 0x0e, 0x6d, 0x65, 0x74, 0x61, 0x64, 0x61, 0x74, 0x61, 0x48, 0x65, 0x61, 0x64,
+	0x65, 0x72, 0x12, 0x27, 0x0a, 0x0d, 0x73, 0x65, 0x73, 0x73, 0x69, 0x6f, 0x6e, 0x5f, 0x74, 0x6f,
+	0x6b, 0x65, 0x6e, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0c, 0x42, 0x02, 0x18, 0x01, 0x52, 0x0c, 0x73,
+	0x65, 0x73, 0x73, 0x69, 0x6f, 0x6e, 0x54, 0x6f, 0x6b, 0x65, 0x6e, 0x12, 0x41, 0x0a, 0x1a, 0x74,
+	0x6f, 0x6b, 0x65, 0x6e, 0x5f, 0x64, 0x65, 0x61, 0x64, 0x6c, 0x69, 0x6e, 0x65, 0x5f, 0x74, 0x69,
+	0x6d, 0x65, 0x5f, 0x6d, 0x69, 0x6c, 0x6c, 0x69, 0x73, 0x18, 0x03, 0x20, 0x01, 0x28, 0x12, 0x42,
+	0x04, 0x18, 0x01, 0x30, 0x01, 0x52, 0x17, 0x74, 0x6f, 0x6b, 0x65, 0x6e, 0x44, 0x65, 0x61, 0x64,
+	0x6c, 0x69, 0x6e, 0x65, 0x54, 0x69, 0x6d, 0x65, 0x4d, 0x69, 0x6c, 0x6c, 0x69, 0x73, 0x12, 0x47,
+	0x0a, 0x1d, 0x74, 0x6f, 0x6b, 0x65, 0x6e, 0x5f, 0x65, 0x78, 0x70, 0x69, 0x72, 0x61, 0x74, 0x69,
+	0x6f, 0x6e, 0x5f, 0x64, 0x65, 0x6c, 0x61, 0x79, 0x5f, 0x6d, 0x69, 0x6c, 0x6c, 0x69, 0x73, 0x18,
+	0x04, 0x20, 0x01, 0x28, 0x12, 0x42, 0x04, 0x18, 0x01, 0x30, 0x01, 0x52, 0x1a, 0x74, 0x6f, 0x6b,
+	0x65, 0x6e, 0x45, 0x78, 0x70, 0x69, 0x72, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x44, 0x65, 0x6c, 0x61,
+	0x79, 0x4d, 0x69, 0x6c, 0x6c, 0x69, 0x73, 0x22, 0x16, 0x0a, 0x14, 0x43, 0x6c, 0x6f, 0x73, 0x65,
+	0x53, 0x65, 0x73, 0x73, 0x69, 0x6f, 0x6e, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22,
+	0x4b, 0x0a, 0x0e, 0x52, 0x65, 0x6c, 0x65, 0x61, 0x73, 0x65, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73,
+	0x74, 0x12, 0x39, 0x0a, 0x02, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x29, 0x2e,
+	0x69, 0x6f, 0x2e, 0x64, 0x65, 0x65, 0x70, 0x68, 0x61, 0x76, 0x65, 0x6e, 0x2e, 0x70, 0x72, 0x6f,
+	0x74, 0x6f, 0x2e, 0x62, 0x61, 0x63, 0x6b, 0x70, 0x6c, 0x61, 0x6e, 0x65, 0x2e, 0x67, 0x72, 0x70,
+	0x63, 0x2e, 0x54, 0x69, 0x63, 0x6b, 0x65, 0x74, 0x52, 0x02, 0x69, 0x64, 0x22, 0x11, 0x0a, 0x0f,
+	0x52, 0x65, 0x6c, 0x65, 0x61, 0x73, 0x65, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22,
+	0x9f, 0x01, 0x0a, 0x0d, 0x45, 0x78, 0x70, 0x6f, 0x72, 0x74, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73,
+	0x74, 0x12, 0x46, 0x0a, 0x09, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x5f, 0x69, 0x64, 0x18, 0x01,
+	0x20, 0x01, 0x28, 0x0b, 0x32, 0x29, 0x2e, 0x69, 0x6f, 0x2e, 0x64, 0x65, 0x65, 0x70, 0x68, 0x61,
+	0x76, 0x65, 0x6e, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x62, 0x61, 0x63, 0x6b, 0x70, 0x6c,
+	0x61, 0x6e, 0x65, 0x2e, 0x67, 0x72, 0x70, 0x63, 0x2e, 0x54, 0x69, 0x63, 0x6b, 0x65, 0x74, 0x52,
+	0x08, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x49, 0x64, 0x12, 0x46, 0x0a, 0x09, 0x72, 0x65, 0x73,
+	0x75, 0x6c, 0x74, 0x5f, 0x69, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x29, 0x2e, 0x69,
 	0x6f, 0x2e, 0x64, 0x65, 0x65, 0x70, 0x68, 0x61, 0x76, 0x65, 0x6e, 0x2e, 0x70, 0x72, 0x6f, 0x74,
 	0x6f, 0x2e, 0x62, 0x61, 0x63, 0x6b, 0x70, 0x6c, 0x61, 0x6e, 0x65, 0x2e, 0x67, 0x72, 0x70, 0x63,
-	0x2e, 0x45, 0x78, 0x70, 0x6f, 0x72, 0x74, 0x4e, 0x6f, 0x74, 0x69, 0x66, 0x69, 0x63, 0x61, 0x74,
-	0x69, 0x6f, 0x6e, 0x2e, 0x53, 0x74, 0x61, 0x74, 0x65, 0x52, 0x0b, 0x65, 0x78, 0x70, 0x6f, 0x72,
-	0x74, 0x53, 0x74, 0x61, 0x74, 0x65, 0x12, 0x18, 0x0a, 0x07, 0x63, 0x6f, 0x6e, 0x74, 0x65, 0x78,
-	0x74, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x52, 0x07, 0x63, 0x6f, 0x6e, 0x74, 0x65, 0x78, 0x74,
-	0x12, 0x29, 0x0a, 0x10, 0x64, 0x65, 0x70, 0x65, 0x6e, 0x64, 0x65, 0x6e, 0x74, 0x5f, 0x68, 0x61,
-	0x6e, 0x64, 0x6c, 0x65, 0x18, 0x04, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0f, 0x64, 0x65, 0x70, 0x65,
-	0x6e, 0x64, 0x65, 0x6e, 0x74, 0x48, 0x61, 0x6e, 0x64, 0x6c, 0x65, 0x22, 0xe7, 0x01, 0x0a, 0x05,
-	0x53, 0x74, 0x61, 0x74, 0x65, 0x12, 0x0b, 0x0a, 0x07, 0x55, 0x4e, 0x4b, 0x4e, 0x4f, 0x57, 0x4e,
-	0x10, 0x00, 0x12, 0x0b, 0x0a, 0x07, 0x50, 0x45, 0x4e, 0x44, 0x49, 0x4e, 0x47, 0x10, 0x01, 0x12,
-	0x0e, 0x0a, 0x0a, 0x50, 0x55, 0x42, 0x4c, 0x49, 0x53, 0x48, 0x49, 0x4e, 0x47, 0x10, 0x02, 0x12,
-	0x0a, 0x0a, 0x06, 0x51, 0x55, 0x45, 0x55, 0x45, 0x44, 0x10, 0x03, 0x12, 0x0b, 0x0a, 0x07, 0x52,
-	0x55, 0x4e, 0x4e, 0x49, 0x4e, 0x47, 0x10, 0x04, 0x12, 0x0c, 0x0a, 0x08, 0x45, 0x58, 0x50, 0x4f,
-	0x52, 0x54, 0x45, 0x44, 0x10, 0x05, 0x12, 0x0c, 0x0a, 0x08, 0x52, 0x45, 0x4c, 0x45, 0x41, 0x53,
-	0x45, 0x44, 0x10, 0x06, 0x12, 0x0d, 0x0a, 0x09, 0x43, 0x41, 0x4e, 0x43, 0x45, 0x4c, 0x4c, 0x45,
-	0x44, 0x10, 0x07, 0x12, 0x0a, 0x0a, 0x06, 0x46, 0x41, 0x49, 0x4c, 0x45, 0x44, 0x10, 0x08, 0x12,
-	0x15, 0x0a, 0x11, 0x44, 0x45, 0x50, 0x45, 0x4e, 0x44, 0x45, 0x4e, 0x43, 0x59, 0x5f, 0x46, 0x41,
-	0x49, 0x4c, 0x45, 0x44, 0x10, 0x09, 0x12, 0x1a, 0x0a, 0x16, 0x44, 0x45, 0x50, 0x45, 0x4e, 0x44,
-	0x45, 0x4e, 0x43, 0x59, 0x5f, 0x4e, 0x45, 0x56, 0x45, 0x52, 0x5f, 0x46, 0x4f, 0x55, 0x4e, 0x44,
-	0x10, 0x0a, 0x12, 0x18, 0x0a, 0x14, 0x44, 0x45, 0x50, 0x45, 0x4e, 0x44, 0x45, 0x4e, 0x43, 0x59,
-	0x5f, 0x43, 0x41, 0x4e, 0x43, 0x45, 0x4c, 0x4c, 0x45, 0x44, 0x10, 0x0b, 0x12, 0x17, 0x0a, 0x13,
-	0x44, 0x45, 0x50, 0x45, 0x4e, 0x44, 0x45, 0x4e, 0x43, 0x59, 0x5f, 0x52, 0x45, 0x4c, 0x45, 0x41,
-	0x53, 0x45, 0x44, 0x10, 0x0c, 0x22, 0x20, 0x0a, 0x1e, 0x54, 0x65, 0x72, 0x6d, 0x69, 0x6e, 0x61,
-	0x74, 0x69, 0x6f, 0x6e, 0x4e, 0x6f, 0x74, 0x69, 0x66, 0x69, 0x63, 0x61, 0x74, 0x69, 0x6f, 0x6e,
-	0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x22, 0xf3, 0x02, 0x0a, 0x1f, 0x54, 0x65, 0x72, 0x6d,
-	0x69, 0x6e, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x4e, 0x6f, 0x74, 0x69, 0x66, 0x69, 0x63, 0x61, 0x74,
-	0x69, 0x6f, 0x6e, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x31, 0x0a, 0x14, 0x61,
-	0x62, 0x6e, 0x6f, 0x72, 0x6d, 0x61, 0x6c, 0x5f, 0x74, 0x65, 0x72, 0x6d, 0x69, 0x6e, 0x61, 0x74,
-	0x69, 0x6f, 0x6e, 0x18, 0x01, 0x20, 0x01, 0x28, 0x08, 0x52, 0x13, 0x61, 0x62, 0x6e, 0x6f, 0x72,
-	0x6d, 0x61, 0x6c, 0x54, 0x65, 0x72, 0x6d, 0x69, 0x6e, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x12, 0x16,
-	0x0a, 0x06, 0x72, 0x65, 0x61, 0x73, 0x6f, 0x6e, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06,
-	0x72, 0x65, 0x61, 0x73, 0x6f, 0x6e, 0x12, 0x3b, 0x0a, 0x1a, 0x69, 0x73, 0x5f, 0x66, 0x72, 0x6f,
-	0x6d, 0x5f, 0x75, 0x6e, 0x63, 0x61, 0x75, 0x67, 0x68, 0x74, 0x5f, 0x65, 0x78, 0x63, 0x65, 0x70,
-	0x74, 0x69, 0x6f, 0x6e, 0x18, 0x03, 0x20, 0x01, 0x28, 0x08, 0x52, 0x17, 0x69, 0x73, 0x46, 0x72,
-	0x6f, 0x6d, 0x55, 0x6e, 0x63, 0x61, 0x75, 0x67, 0x68, 0x74, 0x45, 0x78, 0x63, 0x65, 0x70, 0x74,
-	0x69, 0x6f, 0x6e, 0x12, 0x70, 0x0a, 0x0c, 0x73, 0x74, 0x61, 0x63, 0x6b, 0x5f, 0x74, 0x72, 0x61,
-	0x63, 0x65, 0x73, 0x18, 0x04, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x4d, 0x2e, 0x69, 0x6f, 0x2e, 0x64,
+	0x2e, 0x54, 0x69, 0x63, 0x6b, 0x65, 0x74, 0x52, 0x08, 0x72, 0x65, 0x73, 0x75, 0x6c, 0x74, 0x49,
+	0x64, 0x22, 0x10, 0x0a, 0x0e, 0x45, 0x78, 0x70, 0x6f, 0x72, 0x74, 0x52, 0x65, 0x73, 0x70, 0x6f,
+	0x6e, 0x73, 0x65, 0x22, 0xa0, 0x01, 0x0a, 0x0e, 0x50, 0x75, 0x62, 0x6c, 0x69, 0x73, 0x68, 0x52,
+	0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x46, 0x0a, 0x09, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65,
+	0x5f, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x29, 0x2e, 0x69, 0x6f, 0x2e, 0x64,
 	0x65, 0x65, 0x70, 0x68, 0x61, 0x76, 0x65, 0x6e, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x62,
-	0x61, 0x63, 0x6b, 0x70, 0x6c, 0x61, 0x6e, 0x65, 0x2e, 0x67, 0x72, 0x70, 0x63, 0x2e, 0x54, 0x65,
-	0x72, 0x6d, 0x69, 0x6e, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x4e, 0x6f, 0x74, 0x69, 0x66, 0x69, 0x63,
-	0x61, 0x74, 0x69, 0x6f, 0x6e, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x2e, 0x53, 0x74,
-	0x61, 0x63, 0x6b, 0x54, 0x72, 0x61, 0x63, 0x65, 0x52, 0x0b, 0x73, 0x74, 0x61, 0x63, 0x6b, 0x54,
-	0x72, 0x61, 0x63, 0x65, 0x73, 0x1a, 0x56, 0x0a, 0x0a, 0x53, 0x74, 0x61, 0x63, 0x6b, 0x54, 0x72,
-	0x61, 0x63, 0x65, 0x12, 0x12, 0x0a, 0x04, 0x74, 0x79, 0x70, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28,
-	0x09, 0x52, 0x04, 0x74, 0x79, 0x70, 0x65, 0x12, 0x18, 0x0a, 0x07, 0x6d, 0x65, 0x73, 0x73, 0x61,
-	0x67, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x07, 0x6d, 0x65, 0x73, 0x73, 0x61, 0x67,
-	0x65, 0x12, 0x1a, 0x0a, 0x08, 0x65, 0x6c, 0x65, 0x6d, 0x65, 0x6e, 0x74, 0x73, 0x18, 0x03, 0x20,
-	0x03, 0x28, 0x09, 0x52, 0x08, 0x65, 0x6c, 0x65, 0x6d, 0x65, 0x6e, 0x74, 0x73, 0x32, 0xb9, 0x08,
-	0x0a, 0x0e, 0x53, 0x65, 0x73, 0x73, 0x69, 0x6f, 0x6e, 0x53, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65,
-	0x12, 0x7c, 0x0a, 0x0a, 0x4e, 0x65, 0x77, 0x53, 0x65, 0x73, 0x73, 0x69, 0x6f, 0x6e, 0x12, 0x33,
-	0x2e, 0x69, 0x6f, 0x2e, 0x64, 0x65, 0x65, 0x70, 0x68, 0x61, 0x76, 0x65, 0x6e, 0x2e, 0x70, 0x72,
-	0x6f, 0x74, 0x6f, 0x2e, 0x62, 0x61, 0x63, 0x6b, 0x70, 0x6c, 0x61, 0x6e, 0x65, 0x2e, 0x67, 0x72,
-	0x70, 0x63, 0x2e, 0x48, 0x61, 0x6e, 0x64, 0x73, 0x68, 0x61, 0x6b, 0x65, 0x52, 0x65, 0x71, 0x75,
-	0x65, 0x73, 0x74, 0x1a, 0x34, 0x2e, 0x69, 0x6f, 0x2e, 0x64, 0x65, 0x65, 0x70, 0x68, 0x61, 0x76,
-	0x65, 0x6e, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x62, 0x61, 0x63, 0x6b, 0x70, 0x6c, 0x61,
-	0x6e, 0x65, 0x2e, 0x67, 0x72, 0x70, 0x63, 0x2e, 0x48, 0x61, 0x6e, 0x64, 0x73, 0x68, 0x61, 0x6b,
-	0x65, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x03, 0x88, 0x02, 0x01, 0x12, 0x85,
-	0x01, 0x0a, 0x13, 0x52, 0x65, 0x66, 0x72, 0x65, 0x73, 0x68, 0x53, 0x65, 0x73, 0x73, 0x69, 0x6f,
-	0x6e, 0x54, 0x6f, 0x6b, 0x65, 0x6e, 0x12, 0x33, 0x2e, 0x69, 0x6f, 0x2e, 0x64, 0x65, 0x65, 0x70,
-	0x68, 0x61, 0x76, 0x65, 0x6e, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x62, 0x61, 0x63, 0x6b,
-	0x70, 0x6c, 0x61, 0x6e, 0x65, 0x2e, 0x67, 0x72, 0x70, 0x63, 0x2e, 0x48, 0x61, 0x6e, 0x64, 0x73,
-	0x68, 0x61, 0x6b, 0x65, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x34, 0x2e, 0x69, 0x6f,
-	0x2e, 0x64, 0x65, 0x65, 0x70, 0x68, 0x61, 0x76, 0x65, 0x6e, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f,
-	0x2e, 0x62, 0x61, 0x63, 0x6b, 0x70, 0x6c, 0x61, 0x6e, 0x65, 0x2e, 0x67, 0x72, 0x70, 0x63, 0x2e,
-	0x48, 0x61, 0x6e, 0x64, 0x73, 0x68, 0x61, 0x6b, 0x65, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73,
-	0x65, 0x22, 0x03, 0x88, 0x02, 0x01, 0x12, 0x7e, 0x0a, 0x0c, 0x43, 0x6c, 0x6f, 0x73, 0x65, 0x53,
-	0x65, 0x73, 0x73, 0x69, 0x6f, 0x6e, 0x12, 0x33, 0x2e, 0x69, 0x6f, 0x2e, 0x64, 0x65, 0x65, 0x70,
+	0x61, 0x63, 0x6b, 0x70, 0x6c, 0x61, 0x6e, 0x65, 0x2e, 0x67, 0x72, 0x70, 0x63, 0x2e, 0x54, 0x69,
+	0x63, 0x6b, 0x65, 0x74, 0x52, 0x08, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x49, 0x64, 0x12, 0x46,
+	0x0a, 0x09, 0x72, 0x65, 0x73, 0x75, 0x6c, 0x74, 0x5f, 0x69, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28,
+	0x0b, 0x32, 0x29, 0x2e, 0x69, 0x6f, 0x2e, 0x64, 0x65, 0x65, 0x70, 0x68, 0x61, 0x76, 0x65, 0x6e,
+	0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x62, 0x61, 0x63, 0x6b, 0x70, 0x6c, 0x61, 0x6e, 0x65,
+	0x2e, 0x67, 0x72, 0x70, 0x63, 0x2e, 0x54, 0x69, 0x63, 0x6b, 0x65, 0x74, 0x52, 0x08, 0x72, 0x65,
+	0x73, 0x75, 0x6c, 0x74, 0x49, 0x64, 0x22, 0x11, 0x0a, 0x0f, 0x50, 0x75, 0x62, 0x6c, 0x69, 0x73,
+	0x68, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x1b, 0x0a, 0x19, 0x45, 0x78, 0x70,
+	0x6f, 0x72, 0x74, 0x4e, 0x6f, 0x74, 0x69, 0x66, 0x69, 0x63, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x52,
+	0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x22, 0xe6, 0x03, 0x0a, 0x12, 0x45, 0x78, 0x70, 0x6f, 0x72,
+	0x74, 0x4e, 0x6f, 0x74, 0x69, 0x66, 0x69, 0x63, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x12, 0x41, 0x0a,
+	0x06, 0x74, 0x69, 0x63, 0x6b, 0x65, 0x74, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x29, 0x2e,
+	0x69, 0x6f, 0x2e, 0x64, 0x65, 0x65, 0x70, 0x68, 0x61, 0x76, 0x65, 0x6e, 0x2e, 0x70, 0x72, 0x6f,
+	0x74, 0x6f, 0x2e, 0x62, 0x61, 0x63, 0x6b, 0x70, 0x6c, 0x61, 0x6e, 0x65, 0x2e, 0x67, 0x72, 0x70,
+	0x63, 0x2e, 0x54, 0x69, 0x63, 0x6b, 0x65, 0x74, 0x52, 0x06, 0x74, 0x69, 0x63, 0x6b, 0x65, 0x74,
+	0x12, 0x5e, 0x0a, 0x0c, 0x65, 0x78, 0x70, 0x6f, 0x72, 0x74, 0x5f, 0x73, 0x74, 0x61, 0x74, 0x65,
+	0x18, 0x02, 0x20, 0x01, 0x28, 0x0e, 0x32, 0x3b, 0x2e, 0x69, 0x6f, 0x2e, 0x64, 0x65, 0x65, 0x70,
 	0x68, 0x61, 0x76, 0x65, 0x6e, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x62, 0x61, 0x63, 0x6b,
-	0x70, 0x6c, 0x61, 0x6e, 0x65, 0x2e, 0x67, 0x72, 0x70, 0x63, 0x2e, 0x48, 0x61, 0x6e, 0x64, 0x73,
-	0x68, 0x61, 0x6b, 0x65, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x37, 0x2e, 0x69, 0x6f,
+	0x70, 0x6c, 0x61, 0x6e, 0x65, 0x2e, 0x67, 0x72, 0x70, 0x63, 0x2e, 0x45, 0x78, 0x70, 0x6f, 0x72,
+	0x74, 0x4e, 0x6f, 0x74, 0x69, 0x66, 0x69, 0x63, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x2e, 0x53, 0x74,
+	0x61, 0x74, 0x65, 0x52, 0x0b, 0x65, 0x78, 0x70, 0x6f, 0x72, 0x74, 0x53, 0x74, 0x61, 0x74, 0x65,
+	0x12, 0x18, 0x0a, 0x07, 0x63, 0x6f, 0x6e, 0x74, 0x65, 0x78, 0x74, 0x18, 0x03, 0x20, 0x01, 0x28,
+	0x09, 0x52, 0x07, 0x63, 0x6f, 0x6e, 0x74, 0x65, 0x78, 0x74, 0x12, 0x29, 0x0a, 0x10, 0x64, 0x65,
+	0x70, 0x65, 0x6e, 0x64, 0x65, 0x6e, 0x74, 0x5f, 0x68, 0x61, 0x6e, 0x64, 0x6c, 0x65, 0x18, 0x04,
+	0x20, 0x01, 0x28, 0x09, 0x52, 0x0f, 0x64, 0x65, 0x70, 0x65, 0x6e, 0x64, 0x65, 0x6e, 0x74, 0x48,
+	0x61, 0x6e, 0x64, 0x6c, 0x65, 0x22, 0xe7, 0x01, 0x0a, 0x05, 0x53, 0x74, 0x61, 0x74, 0x65, 0x12,
+	0x0b, 0x0a, 0x07, 0x55, 0x4e, 0x4b, 0x4e, 0x4f, 0x57, 0x4e, 0x10, 0x00, 0x12, 0x0b, 0x0a, 0x07,
+	0x50, 0x45, 0x4e, 0x44, 0x49, 0x4e, 0x47, 0x10, 0x01, 0x12, 0x0e, 0x0a, 0x0a, 0x50, 0x55, 0x42,
+	0x4c, 0x49, 0x53, 0x48, 0x49, 0x4e, 0x47, 0x10, 0x02, 0x12, 0x0a, 0x0a, 0x06, 0x51, 0x55, 0x45,
+	0x55, 0x45, 0x44, 0x10, 0x03, 0x12, 0x0b, 0x0a, 0x07, 0x52, 0x55, 0x4e, 0x4e, 0x49, 0x4e, 0x47,
+	0x10, 0x04, 0x12, 0x0c, 0x0a, 0x08, 0x45, 0x58, 0x50, 0x4f, 0x52, 0x54, 0x45, 0x44, 0x10, 0x05,
+	0x12, 0x0c, 0x0a, 0x08, 0x52, 0x45, 0x4c, 0x45, 0x41, 0x53, 0x45, 0x44, 0x10, 0x06, 0x12, 0x0d,
+	0x0a, 0x09, 0x43, 0x41, 0x4e, 0x43, 0x45, 0x4c, 0x4c, 0x45, 0x44, 0x10, 0x07, 0x12, 0x0a, 0x0a,
+	0x06, 0x46, 0x41, 0x49, 0x4c, 0x45, 0x44, 0x10, 0x08, 0x12, 0x15, 0x0a, 0x11, 0x44, 0x45, 0x50,
+	0x45, 0x4e, 0x44, 0x45, 0x4e, 0x43, 0x59, 0x5f, 0x46, 0x41, 0x49, 0x4c, 0x45, 0x44, 0x10, 0x09,
+	0x12, 0x1a, 0x0a, 0x16, 0x44, 0x45, 0x50, 0x45, 0x4e, 0x44, 0x45, 0x4e, 0x43, 0x59, 0x5f, 0x4e,
+	0x45, 0x56, 0x45, 0x52, 0x5f, 0x46, 0x4f, 0x55, 0x4e, 0x44, 0x10, 0x0a, 0x12, 0x18, 0x0a, 0x14,
+	0x44, 0x45, 0x50, 0x45, 0x4e, 0x44, 0x45, 0x4e, 0x43, 0x59, 0x5f, 0x43, 0x41, 0x4e, 0x43, 0x45,
+	0x4c, 0x4c, 0x45, 0x44, 0x10, 0x0b, 0x12, 0x17, 0x0a, 0x13, 0x44, 0x45, 0x50, 0x45, 0x4e, 0x44,
+	0x45, 0x4e, 0x43, 0x59, 0x5f, 0x52, 0x45, 0x4c, 0x45, 0x41, 0x53, 0x45, 0x44, 0x10, 0x0c, 0x22,
+	0x20, 0x0a, 0x1e, 0x54, 0x65, 0x72, 0x6d, 0x69, 0x6e, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x4e, 0x6f,
+	0x74, 0x69, 0x66, 0x69, 0x63, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73,
+	0x74, 0x22, 0xf3, 0x02, 0x0a, 0x1f, 0x54, 0x65, 0x72, 0x6d, 0x69, 0x6e, 0x61, 0x74, 0x69, 0x6f,
+	0x6e, 0x4e, 0x6f, 0x74, 0x69, 0x66, 0x69, 0x63, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x52, 0x65, 0x73,
+	0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x31, 0x0a, 0x14, 0x61, 0x62, 0x6e, 0x6f, 0x72, 0x6d, 0x61,
+	0x6c, 0x5f, 0x74, 0x65, 0x72, 0x6d, 0x69, 0x6e, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x18, 0x01, 0x20,
+	0x01, 0x28, 0x08, 0x52, 0x13, 0x61, 0x62, 0x6e, 0x6f, 0x72, 0x6d, 0x61, 0x6c, 0x54, 0x65, 0x72,
+	0x6d, 0x69, 0x6e, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x12, 0x16, 0x0a, 0x06, 0x72, 0x65, 0x61, 0x73,
+	0x6f, 0x6e, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06, 0x72, 0x65, 0x61, 0x73, 0x6f, 0x6e,
+	0x12, 0x3b, 0x0a, 0x1a, 0x69, 0x73, 0x5f, 0x66, 0x72, 0x6f, 0x6d, 0x5f, 0x75, 0x6e, 0x63, 0x61,
+	0x75, 0x67, 0x68, 0x74, 0x5f, 0x65, 0x78, 0x63, 0x65, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x18, 0x03,
+	0x20, 0x01, 0x28, 0x08, 0x52, 0x17, 0x69, 0x73, 0x46, 0x72, 0x6f, 0x6d, 0x55, 0x6e, 0x63, 0x61,
+	0x75, 0x67, 0x68, 0x74, 0x45, 0x78, 0x63, 0x65, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x12, 0x70, 0x0a,
+	0x0c, 0x73, 0x74, 0x61, 0x63, 0x6b, 0x5f, 0x74, 0x72, 0x61, 0x63, 0x65, 0x73, 0x18, 0x04, 0x20,
+	0x03, 0x28, 0x0b, 0x32, 0x4d, 0x2e, 0x69, 0x6f, 0x2e, 0x64, 0x65, 0x65, 0x70, 0x68, 0x61, 0x76,
+	0x65, 0x6e, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x62, 0x61, 0x63, 0x6b, 0x70, 0x6c, 0x61,
+	0x6e, 0x65, 0x2e, 0x67, 0x72, 0x70, 0x63, 0x2e, 0x54, 0x65, 0x72, 0x6d, 0x69, 0x6e, 0x61, 0x74,
+	0x69, 0x6f, 0x6e, 0x4e, 0x6f, 0x74, 0x69, 0x66, 0x69, 0x63, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x52,
+	0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x2e, 0x53, 0x74, 0x61, 0x63, 0x6b, 0x54, 0x72, 0x61,
+	0x63, 0x65, 0x52, 0x0b, 0x73, 0x74, 0x61, 0x63, 0x6b, 0x54, 0x72, 0x61, 0x63, 0x65, 0x73, 0x1a,
+	0x56, 0x0a, 0x0a, 0x53, 0x74, 0x61, 0x63, 0x6b, 0x54, 0x72, 0x61, 0x63, 0x65, 0x12, 0x12, 0x0a,
+	0x04, 0x74, 0x79, 0x70, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x74, 0x79, 0x70,
+	0x65, 0x12, 0x18, 0x0a, 0x07, 0x6d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x18, 0x02, 0x20, 0x01,
+	0x28, 0x09, 0x52, 0x07, 0x6d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x12, 0x1a, 0x0a, 0x08, 0x65,
+	0x6c, 0x65, 0x6d, 0x65, 0x6e, 0x74, 0x73, 0x18, 0x03, 0x20, 0x03, 0x28, 0x09, 0x52, 0x08, 0x65,
+	0x6c, 0x65, 0x6d, 0x65, 0x6e, 0x74, 0x73, 0x32, 0xb9, 0x08, 0x0a, 0x0e, 0x53, 0x65, 0x73, 0x73,
+	0x69, 0x6f, 0x6e, 0x53, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x12, 0x7c, 0x0a, 0x0a, 0x4e, 0x65,
+	0x77, 0x53, 0x65, 0x73, 0x73, 0x69, 0x6f, 0x6e, 0x12, 0x33, 0x2e, 0x69, 0x6f, 0x2e, 0x64, 0x65,
+	0x65, 0x70, 0x68, 0x61, 0x76, 0x65, 0x6e, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x62, 0x61,
+	0x63, 0x6b, 0x70, 0x6c, 0x61, 0x6e, 0x65, 0x2e, 0x67, 0x72, 0x70, 0x63, 0x2e, 0x48, 0x61, 0x6e,
+	0x64, 0x73, 0x68, 0x61, 0x6b, 0x65, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x34, 0x2e,
+	0x69, 0x6f, 0x2e, 0x64, 0x65, 0x65, 0x70, 0x68, 0x61, 0x76, 0x65, 0x6e, 0x2e, 0x70, 0x72, 0x6f,
+	0x74, 0x6f, 0x2e, 0x62, 0x61, 0x63, 0x6b, 0x70, 0x6c, 0x61, 0x6e, 0x65, 0x2e, 0x67, 0x72, 0x70,
+	0x63, 0x2e, 0x48, 0x61, 0x6e, 0x64, 0x73, 0x68, 0x61, 0x6b, 0x65, 0x52, 0x65, 0x73, 0x70, 0x6f,
+	0x6e, 0x73, 0x65, 0x22, 0x03, 0x88, 0x02, 0x01, 0x12, 0x85, 0x01, 0x0a, 0x13, 0x52, 0x65, 0x66,
+	0x72, 0x65, 0x73, 0x68, 0x53, 0x65, 0x73, 0x73, 0x69, 0x6f, 0x6e, 0x54, 0x6f, 0x6b, 0x65, 0x6e,
+	0x12, 0x33, 0x2e, 0x69, 0x6f, 0x2e, 0x64, 0x65, 0x65, 0x70, 0x68, 0x61, 0x76, 0x65, 0x6e, 0x2e,
+	0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x62, 0x61, 0x63, 0x6b, 0x70, 0x6c, 0x61, 0x6e, 0x65, 0x2e,
+	0x67, 0x72, 0x70, 0x63, 0x2e, 0x48, 0x61, 0x6e, 0x64, 0x73, 0x68, 0x61, 0x6b, 0x65, 0x52, 0x65,
+	0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x34, 0x2e, 0x69, 0x6f, 0x2e, 0x64, 0x65, 0x65, 0x70, 0x68,
+	0x61, 0x76, 0x65, 0x6e, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x62, 0x61, 0x63, 0x6b, 0x70,
+	0x6c, 0x61, 0x6e, 0x65, 0x2e, 0x67, 0x72, 0x70, 0x63, 0x2e, 0x48, 0x61, 0x6e, 0x64, 0x73, 0x68,
+	0x61, 0x6b, 0x65, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x03, 0x88, 0x02, 0x01,
+	0x12, 0x7e, 0x0a, 0x0c, 0x43, 0x6c, 0x6f, 0x73, 0x65, 0x53, 0x65, 0x73, 0x73, 0x69, 0x6f, 0x6e,
+	0x12, 0x33, 0x2e, 0x69, 0x6f, 0x2e, 0x64, 0x65, 0x65, 0x70, 0x68, 0x61, 0x76, 0x65, 0x6e, 0x2e,
+	0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x62, 0x61, 0x63, 0x6b, 0x70, 0x6c, 0x61, 0x6e, 0x65, 0x2e,
+	0x67, 0x72, 0x70, 0x63, 0x2e, 0x48, 0x61, 0x6e, 0x64, 0x73, 0x68, 0x61, 0x6b, 0x65, 0x52, 0x65,
+	0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x37, 0x2e, 0x69, 0x6f, 0x2e, 0x64, 0x65, 0x65, 0x70, 0x68,
+	0x61, 0x76, 0x65, 0x6e, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x62, 0x61, 0x63, 0x6b, 0x70,
+	0x6c, 0x61, 0x6e, 0x65, 0x2e, 0x67, 0x72, 0x70, 0x63, 0x2e, 0x43, 0x6c, 0x6f, 0x73, 0x65, 0x53,
+	0x65, 0x73, 0x73, 0x69, 0x6f, 0x6e, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x00,
+	0x12, 0x72, 0x0a, 0x07, 0x52, 0x65, 0x6c, 0x65, 0x61, 0x73, 0x65, 0x12, 0x31, 0x2e, 0x69, 0x6f,
 	0x2e, 0x64, 0x65, 0x65, 0x70, 0x68, 0x61, 0x76, 0x65, 0x6e, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f,
 	0x2e, 0x62, 0x61, 0x63, 0x6b, 0x70, 0x6c, 0x61, 0x6e, 0x65, 0x2e, 0x67, 0x72, 0x70, 0x63, 0x2e,
-	0x43, 0x6c, 0x6f, 0x73, 0x65, 0x53, 0x65, 0x73, 0x73, 0x69, 0x6f, 0x6e, 0x52, 0x65, 0x73, 0x70,
-	0x6f, 0x6e, 0x73, 0x65, 0x22, 0x00, 0x12, 0x72, 0x0a, 0x07, 0x52, 0x65, 0x6c, 0x65, 0x61, 0x73,
-	0x65, 0x12, 0x31, 0x2e, 0x69, 0x6f, 0x2e, 0x64, 0x65, 0x65, 0x70, 0x68, 0x61, 0x76, 0x65, 0x6e,
-	0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x62, 0x61, 0x63, 0x6b, 0x70, 0x6c, 0x61, 0x6e, 0x65,
-	0x2e, 0x67, 0x72, 0x70, 0x63, 0x2e, 0x52, 0x65, 0x6c, 0x65, 0x61, 0x73, 0x65, 0x52, 0x65, 0x71,
-	0x75, 0x65, 0x73, 0x74, 0x1a, 0x32, 0x2e, 0x69, 0x6f, 0x2e, 0x64, 0x65, 0x65, 0x70, 0x68, 0x61,
-	0x76, 0x65, 0x6e, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x62, 0x61, 0x63, 0x6b, 0x70, 0x6c,
-	0x61, 0x6e, 0x65, 0x2e, 0x67, 0x72, 0x70, 0x63, 0x2e, 0x52, 0x65, 0x6c, 0x65, 0x61, 0x73, 0x65,
-	0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x00, 0x12, 0x79, 0x0a, 0x10, 0x45, 0x78,
-	0x70, 0x6f, 0x72, 0x74, 0x46, 0x72, 0x6f, 0x6d, 0x54, 0x69, 0x63, 0x6b, 0x65, 0x74, 0x12, 0x30,
+	0x52, 0x65, 0x6c, 0x65, 0x61, 0x73, 0x65, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x32,
 	0x2e, 0x69, 0x6f, 0x2e, 0x64, 0x65, 0x65, 0x70, 0x68, 0x61, 0x76, 0x65, 0x6e, 0x2e, 0x70, 0x72,
 	0x6f, 0x74, 0x6f, 0x2e, 0x62, 0x61, 0x63, 0x6b, 0x70, 0x6c, 0x61, 0x6e, 0x65, 0x2e, 0x67, 0x72,
-	0x70, 0x63, 0x2e, 0x45, 0x78, 0x70, 0x6f, 0x72, 0x74, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74,
-	0x1a, 0x31, 0x2e, 0x69, 0x6f, 0x2e, 0x64, 0x65, 0x65, 0x70, 0x68, 0x61, 0x76, 0x65, 0x6e, 0x2e,
-	0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x62, 0x61, 0x63, 0x6b, 0x70, 0x6c, 0x61, 0x6e, 0x65, 0x2e,
-	0x67, 0x72, 0x70, 0x63, 0x2e, 0x45, 0x78, 0x70, 0x6f, 0x72, 0x74, 0x52, 0x65, 0x73, 0x70, 0x6f,
-	0x6e, 0x73, 0x65, 0x22, 0x00, 0x12, 0x7c, 0x0a, 0x11, 0x50, 0x75, 0x62, 0x6c, 0x69, 0x73, 0x68,
-	0x46, 0x72, 0x6f, 0x6d, 0x54, 0x69, 0x63, 0x6b, 0x65, 0x74, 0x12, 0x31, 0x2e, 0x69, 0x6f, 0x2e,
+	0x70, 0x63, 0x2e, 0x52, 0x65, 0x6c, 0x65, 0x61, 0x73, 0x65, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e,
+	0x73, 0x65, 0x22, 0x00, 0x12, 0x79, 0x0a, 0x10, 0x45, 0x78, 0x70, 0x6f, 0x72, 0x74, 0x46, 0x72,
+	0x6f, 0x6d, 0x54, 0x69, 0x63, 0x6b, 0x65, 0x74, 0x12, 0x30, 0x2e, 0x69, 0x6f, 0x2e, 0x64, 0x65,
+	0x65, 0x70, 0x68, 0x61, 0x76, 0x65, 0x6e, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x62, 0x61,
+	0x63, 0x6b, 0x70, 0x6c, 0x61, 0x6e, 0x65, 0x2e, 0x67, 0x72, 0x70, 0x63, 0x2e, 0x45, 0x78, 0x70,
+	0x6f, 0x72, 0x74, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x31, 0x2e, 0x69, 0x6f, 0x2e,
 	0x64, 0x65, 0x65, 0x70, 0x68, 0x61, 0x76, 0x65, 0x6e, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e,
-	0x62, 0x61, 0x63, 0x6b, 0x70, 0x6c, 0x61, 0x6e, 0x65, 0x2e, 0x67, 0x72, 0x70, 0x63, 0x2e, 0x50,
-	0x75, 0x62, 0x6c, 0x69, 0x73, 0x68, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x32, 0x2e,
-	0x69, 0x6f, 0x2e, 0x64, 0x65, 0x65, 0x70, 0x68, 0x61, 0x76, 0x65, 0x6e, 0x2e, 0x70, 0x72, 0x6f,
-	0x74, 0x6f, 0x2e, 0x62, 0x61, 0x63, 0x6b, 0x70, 0x6c, 0x61, 0x6e, 0x65, 0x2e, 0x67, 0x72, 0x70,
-	0x63, 0x2e, 0x50, 0x75, 0x62, 0x6c, 0x69, 0x73, 0x68, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73,
-	0x65, 0x22, 0x00, 0x12, 0x8e, 0x01, 0x0a, 0x13, 0x45, 0x78, 0x70, 0x6f, 0x72, 0x74, 0x4e, 0x6f,
-	0x74, 0x69, 0x66, 0x69, 0x63, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x12, 0x3c, 0x2e, 0x69, 0x6f,
-	0x2e, 0x64, 0x65, 0x65, 0x70, 0x68, 0x61, 0x76, 0x65, 0x6e, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f,
-	0x2e, 0x62, 0x61, 0x63, 0x6b, 0x70, 0x6c, 0x61, 0x6e, 0x65, 0x2e, 0x67, 0x72, 0x70, 0x63, 0x2e,
-	0x45, 0x78, 0x70, 0x6f, 0x72, 0x74, 0x4e, 0x6f, 0x74, 0x69, 0x66, 0x69, 0x63, 0x61, 0x74, 0x69,
-	0x6f, 0x6e, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x35, 0x2e, 0x69, 0x6f, 0x2e, 0x64,
-	0x65, 0x65, 0x70, 0x68, 0x61, 0x76, 0x65, 0x6e, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x62,
-	0x61, 0x63, 0x6b, 0x70, 0x6c, 0x61, 0x6e, 0x65, 0x2e, 0x67, 0x72, 0x70, 0x63, 0x2e, 0x45, 0x78,
-	0x70, 0x6f, 0x72, 0x74, 0x4e, 0x6f, 0x74, 0x69, 0x66, 0x69, 0x63, 0x61, 0x74, 0x69, 0x6f, 0x6e,
-	0x22, 0x00, 0x30, 0x01, 0x12, 0xa2, 0x01, 0x0a, 0x17, 0x54, 0x65, 0x72, 0x6d, 0x69, 0x6e, 0x61,
-	0x74, 0x69, 0x6f, 0x6e, 0x4e, 0x6f, 0x74, 0x69, 0x66, 0x69, 0x63, 0x61, 0x74, 0x69, 0x6f, 0x6e,
-	0x12, 0x41, 0x2e, 0x69, 0x6f, 0x2e, 0x64, 0x65, 0x65, 0x70, 0x68, 0x61, 0x76, 0x65, 0x6e, 0x2e,
-	0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x62, 0x61, 0x63, 0x6b, 0x70, 0x6c, 0x61, 0x6e, 0x65, 0x2e,
-	0x67, 0x72, 0x70, 0x63, 0x2e, 0x54, 0x65, 0x72, 0x6d, 0x69, 0x6e, 0x61, 0x74, 0x69, 0x6f, 0x6e,
+	0x62, 0x61, 0x63, 0x6b, 0x70, 0x6c, 0x61, 0x6e, 0x65, 0x2e, 0x67, 0x72, 0x70, 0x63, 0x2e, 0x45,
+	0x78, 0x70, 0x6f, 0x72, 0x74, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x00, 0x12,
+	0x7c, 0x0a, 0x11, 0x50, 0x75, 0x62, 0x6c, 0x69, 0x73, 0x68, 0x46, 0x72, 0x6f, 0x6d, 0x54, 0x69,
+	0x63, 0x6b, 0x65, 0x74, 0x12, 0x31, 0x2e, 0x69, 0x6f, 0x2e, 0x64, 0x65, 0x65, 0x70, 0x68, 0x61,
+	0x76, 0x65, 0x6e, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x62, 0x61, 0x63, 0x6b, 0x70, 0x6c,
+	0x61, 0x6e, 0x65, 0x2e, 0x67, 0x72, 0x70, 0x63, 0x2e, 0x50, 0x75, 0x62, 0x6c, 0x69, 0x73, 0x68,
+	0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x32, 0x2e, 0x69, 0x6f, 0x2e, 0x64, 0x65, 0x65,
+	0x70, 0x68, 0x61, 0x76, 0x65, 0x6e, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x62, 0x61, 0x63,
+	0x6b, 0x70, 0x6c, 0x61, 0x6e, 0x65, 0x2e, 0x67, 0x72, 0x70, 0x63, 0x2e, 0x50, 0x75, 0x62, 0x6c,
+	0x69, 0x73, 0x68, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x00, 0x12, 0x8e, 0x01,
+	0x0a, 0x13, 0x45, 0x78, 0x70, 0x6f, 0x72, 0x74, 0x4e, 0x6f, 0x74, 0x69, 0x66, 0x69, 0x63, 0x61,
+	0x74, 0x69, 0x6f, 0x6e, 0x73, 0x12, 0x3c, 0x2e, 0x69, 0x6f, 0x2e, 0x64, 0x65, 0x65, 0x70, 0x68,
+	0x61, 0x76, 0x65, 0x6e, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x62, 0x61, 0x63, 0x6b, 0x70,
+	0x6c, 0x61, 0x6e, 0x65, 0x2e, 0x67, 0x72, 0x70, 0x63, 0x2e, 0x45, 0x78, 0x70, 0x6f, 0x72, 0x74,
 	0x4e, 0x6f, 0x74, 0x69, 0x66, 0x69, 0x63, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x52, 0x65, 0x71, 0x75,
-	0x65, 0x73, 0x74, 0x1a, 0x42, 0x2e, 0x69, 0x6f, 0x2e, 0x64, 0x65, 0x65, 0x70, 0x68, 0x61, 0x76,
+	0x65, 0x73, 0x74, 0x1a, 0x35, 0x2e, 0x69, 0x6f, 0x2e, 0x64, 0x65, 0x65, 0x70, 0x68, 0x61, 0x76,
 	0x65, 0x6e, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x62, 0x61, 0x63, 0x6b, 0x70, 0x6c, 0x61,
-	0x6e, 0x65, 0x2e, 0x67, 0x72, 0x70, 0x63, 0x2e, 0x54, 0x65, 0x72, 0x6d, 0x69, 0x6e, 0x61, 0x74,
-	0x69, 0x6f, 0x6e, 0x4e, 0x6f, 0x74, 0x69, 0x66, 0x69, 0x63, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x52,
-	0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x00, 0x42, 0x43, 0x48, 0x01, 0x50, 0x01, 0x5a,
-	0x3d, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x64, 0x65, 0x65, 0x70,
-	0x68, 0x61, 0x76, 0x65, 0x6e, 0x2f, 0x64, 0x65, 0x65, 0x70, 0x68, 0x61, 0x76, 0x65, 0x6e, 0x2d,
-	0x63, 0x6f, 0x72, 0x65, 0x2f, 0x67, 0x6f, 0x2f, 0x69, 0x6e, 0x74, 0x65, 0x72, 0x6e, 0x61, 0x6c,
-	0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2f, 0x73, 0x65, 0x73, 0x73, 0x69, 0x6f, 0x6e, 0x62, 0x06,
-	0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
+	0x6e, 0x65, 0x2e, 0x67, 0x72, 0x70, 0x63, 0x2e, 0x45, 0x78, 0x70, 0x6f, 0x72, 0x74, 0x4e, 0x6f,
+	0x74, 0x69, 0x66, 0x69, 0x63, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x22, 0x00, 0x30, 0x01, 0x12, 0xa2,
+	0x01, 0x0a, 0x17, 0x54, 0x65, 0x72, 0x6d, 0x69, 0x6e, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x4e, 0x6f,
+	0x74, 0x69, 0x66, 0x69, 0x63, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x12, 0x41, 0x2e, 0x69, 0x6f, 0x2e,
+	0x64, 0x65, 0x65, 0x70, 0x68, 0x61, 0x76, 0x65, 0x6e, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e,
+	0x62, 0x61, 0x63, 0x6b, 0x70, 0x6c, 0x61, 0x6e, 0x65, 0x2e, 0x67, 0x72, 0x70, 0x63, 0x2e, 0x54,
+	0x65, 0x72, 0x6d, 0x69, 0x6e, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x4e, 0x6f, 0x74, 0x69, 0x66, 0x69,
+	0x63, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x42, 0x2e,
+	0x69, 0x6f, 0x2e, 0x64, 0x65, 0x65, 0x70, 0x68, 0x61, 0x76, 0x65, 0x6e, 0x2e, 0x70, 0x72, 0x6f,
+	0x74, 0x6f, 0x2e, 0x62, 0x61, 0x63, 0x6b, 0x70, 0x6c, 0x61, 0x6e, 0x65, 0x2e, 0x67, 0x72, 0x70,
+	0x63, 0x2e, 0x54, 0x65, 0x72, 0x6d, 0x69, 0x6e, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x4e, 0x6f, 0x74,
+	0x69, 0x66, 0x69, 0x63, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73,
+	0x65, 0x22, 0x00, 0x42, 0x43, 0x48, 0x01, 0x50, 0x01, 0x5a, 0x3d, 0x67, 0x69, 0x74, 0x68, 0x75,
+	0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x64, 0x65, 0x65, 0x70, 0x68, 0x61, 0x76, 0x65, 0x6e, 0x2f,
+	0x64, 0x65, 0x65, 0x70, 0x68, 0x61, 0x76, 0x65, 0x6e, 0x2d, 0x63, 0x6f, 0x72, 0x65, 0x2f, 0x67,
+	0x6f, 0x2f, 0x69, 0x6e, 0x74, 0x65, 0x72, 0x6e, 0x61, 0x6c, 0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f,
+	0x2f, 0x73, 0x65, 0x73, 0x73, 0x69, 0x6f, 0x6e, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
 }
 
 var (
-	file_deephaven_proto_session_proto_rawDescOnce sync.Once
-	file_deephaven_proto_session_proto_rawDescData = file_deephaven_proto_session_proto_rawDesc
+	file_deephaven_core_proto_session_proto_rawDescOnce sync.Once
+	file_deephaven_core_proto_session_proto_rawDescData = file_deephaven_core_proto_session_proto_rawDesc
 )
 
-func file_deephaven_proto_session_proto_rawDescGZIP() []byte {
-	file_deephaven_proto_session_proto_rawDescOnce.Do(func() {
-		file_deephaven_proto_session_proto_rawDescData = protoimpl.X.CompressGZIP(file_deephaven_proto_session_proto_rawDescData)
+func file_deephaven_core_proto_session_proto_rawDescGZIP() []byte {
+	file_deephaven_core_proto_session_proto_rawDescOnce.Do(func() {
+		file_deephaven_core_proto_session_proto_rawDescData = protoimpl.X.CompressGZIP(file_deephaven_core_proto_session_proto_rawDescData)
 	})
-	return file_deephaven_proto_session_proto_rawDescData
+	return file_deephaven_core_proto_session_proto_rawDescData
 }
 
-var file_deephaven_proto_session_proto_enumTypes = make([]protoimpl.EnumInfo, 1)
-var file_deephaven_proto_session_proto_msgTypes = make([]protoimpl.MessageInfo, 15)
-var file_deephaven_proto_session_proto_goTypes = []interface{}{
+var file_deephaven_core_proto_session_proto_enumTypes = make([]protoimpl.EnumInfo, 1)
+var file_deephaven_core_proto_session_proto_msgTypes = make([]protoimpl.MessageInfo, 15)
+var file_deephaven_core_proto_session_proto_goTypes = []interface{}{
 	(ExportNotification_State)(0),                      // 0: io.deephaven.proto.backplane.grpc.ExportNotification.State
 	(*WrappedAuthenticationRequest)(nil),               // 1: io.deephaven.proto.backplane.grpc.WrappedAuthenticationRequest
 	(*HandshakeRequest)(nil),                           // 2: io.deephaven.proto.backplane.grpc.HandshakeRequest
@@ -1159,7 +1159,7 @@ var file_deephaven_proto_session_proto_goTypes = []interface{}{
 	(*TerminationNotificationResponse_StackTrace)(nil), // 15: io.deephaven.proto.backplane.grpc.TerminationNotificationResponse.StackTrace
 	(*ticket.Ticket)(nil),                              // 16: io.deephaven.proto.backplane.grpc.Ticket
 }
-var file_deephaven_proto_session_proto_depIdxs = []int32{
+var file_deephaven_core_proto_session_proto_depIdxs = []int32{
 	16, // 0: io.deephaven.proto.backplane.grpc.ReleaseRequest.id:type_name -> io.deephaven.proto.backplane.grpc.Ticket
 	16, // 1: io.deephaven.proto.backplane.grpc.ExportRequest.source_id:type_name -> io.deephaven.proto.backplane.grpc.Ticket
 	16, // 2: io.deephaven.proto.backplane.grpc.ExportRequest.result_id:type_name -> io.deephaven.proto.backplane.grpc.Ticket
@@ -1191,13 +1191,13 @@ var file_deephaven_proto_session_proto_depIdxs = []int32{
 	0,  // [0:8] is the sub-list for field type_name
 }
 
-func init() { file_deephaven_proto_session_proto_init() }
-func file_deephaven_proto_session_proto_init() {
-	if File_deephaven_proto_session_proto != nil {
+func init() { file_deephaven_core_proto_session_proto_init() }
+func file_deephaven_core_proto_session_proto_init() {
+	if File_deephaven_core_proto_session_proto != nil {
 		return
 	}
 	if !protoimpl.UnsafeEnabled {
-		file_deephaven_proto_session_proto_msgTypes[0].Exporter = func(v interface{}, i int) interface{} {
+		file_deephaven_core_proto_session_proto_msgTypes[0].Exporter = func(v interface{}, i int) interface{} {
 			switch v := v.(*WrappedAuthenticationRequest); i {
 			case 0:
 				return &v.state
@@ -1209,7 +1209,7 @@ func file_deephaven_proto_session_proto_init() {
 				return nil
 			}
 		}
-		file_deephaven_proto_session_proto_msgTypes[1].Exporter = func(v interface{}, i int) interface{} {
+		file_deephaven_core_proto_session_proto_msgTypes[1].Exporter = func(v interface{}, i int) interface{} {
 			switch v := v.(*HandshakeRequest); i {
 			case 0:
 				return &v.state
@@ -1221,7 +1221,7 @@ func file_deephaven_proto_session_proto_init() {
 				return nil
 			}
 		}
-		file_deephaven_proto_session_proto_msgTypes[2].Exporter = func(v interface{}, i int) interface{} {
+		file_deephaven_core_proto_session_proto_msgTypes[2].Exporter = func(v interface{}, i int) interface{} {
 			switch v := v.(*HandshakeResponse); i {
 			case 0:
 				return &v.state
@@ -1233,7 +1233,7 @@ func file_deephaven_proto_session_proto_init() {
 				return nil
 			}
 		}
-		file_deephaven_proto_session_proto_msgTypes[3].Exporter = func(v interface{}, i int) interface{} {
+		file_deephaven_core_proto_session_proto_msgTypes[3].Exporter = func(v interface{}, i int) interface{} {
 			switch v := v.(*CloseSessionResponse); i {
 			case 0:
 				return &v.state
@@ -1245,7 +1245,7 @@ func file_deephaven_proto_session_proto_init() {
 				return nil
 			}
 		}
-		file_deephaven_proto_session_proto_msgTypes[4].Exporter = func(v interface{}, i int) interface{} {
+		file_deephaven_core_proto_session_proto_msgTypes[4].Exporter = func(v interface{}, i int) interface{} {
 			switch v := v.(*ReleaseRequest); i {
 			case 0:
 				return &v.state
@@ -1257,7 +1257,7 @@ func file_deephaven_proto_session_proto_init() {
 				return nil
 			}
 		}
-		file_deephaven_proto_session_proto_msgTypes[5].Exporter = func(v interface{}, i int) interface{} {
+		file_deephaven_core_proto_session_proto_msgTypes[5].Exporter = func(v interface{}, i int) interface{} {
 			switch v := v.(*ReleaseResponse); i {
 			case 0:
 				return &v.state
@@ -1269,7 +1269,7 @@ func file_deephaven_proto_session_proto_init() {
 				return nil
 			}
 		}
-		file_deephaven_proto_session_proto_msgTypes[6].Exporter = func(v interface{}, i int) interface{} {
+		file_deephaven_core_proto_session_proto_msgTypes[6].Exporter = func(v interface{}, i int) interface{} {
 			switch v := v.(*ExportRequest); i {
 			case 0:
 				return &v.state
@@ -1281,7 +1281,7 @@ func file_deephaven_proto_session_proto_init() {
 				return nil
 			}
 		}
-		file_deephaven_proto_session_proto_msgTypes[7].Exporter = func(v interface{}, i int) interface{} {
+		file_deephaven_core_proto_session_proto_msgTypes[7].Exporter = func(v interface{}, i int) interface{} {
 			switch v := v.(*ExportResponse); i {
 			case 0:
 				return &v.state
@@ -1293,7 +1293,7 @@ func file_deephaven_proto_session_proto_init() {
 				return nil
 			}
 		}
-		file_deephaven_proto_session_proto_msgTypes[8].Exporter = func(v interface{}, i int) interface{} {
+		file_deephaven_core_proto_session_proto_msgTypes[8].Exporter = func(v interface{}, i int) interface{} {
 			switch v := v.(*PublishRequest); i {
 			case 0:
 				return &v.state
@@ -1305,7 +1305,7 @@ func file_deephaven_proto_session_proto_init() {
 				return nil
 			}
 		}
-		file_deephaven_proto_session_proto_msgTypes[9].Exporter = func(v interface{}, i int) interface{} {
+		file_deephaven_core_proto_session_proto_msgTypes[9].Exporter = func(v interface{}, i int) interface{} {
 			switch v := v.(*PublishResponse); i {
 			case 0:
 				return &v.state
@@ -1317,7 +1317,7 @@ func file_deephaven_proto_session_proto_init() {
 				return nil
 			}
 		}
-		file_deephaven_proto_session_proto_msgTypes[10].Exporter = func(v interface{}, i int) interface{} {
+		file_deephaven_core_proto_session_proto_msgTypes[10].Exporter = func(v interface{}, i int) interface{} {
 			switch v := v.(*ExportNotificationRequest); i {
 			case 0:
 				return &v.state
@@ -1329,7 +1329,7 @@ func file_deephaven_proto_session_proto_init() {
 				return nil
 			}
 		}
-		file_deephaven_proto_session_proto_msgTypes[11].Exporter = func(v interface{}, i int) interface{} {
+		file_deephaven_core_proto_session_proto_msgTypes[11].Exporter = func(v interface{}, i int) interface{} {
 			switch v := v.(*ExportNotification); i {
 			case 0:
 				return &v.state
@@ -1341,7 +1341,7 @@ func file_deephaven_proto_session_proto_init() {
 				return nil
 			}
 		}
-		file_deephaven_proto_session_proto_msgTypes[12].Exporter = func(v interface{}, i int) interface{} {
+		file_deephaven_core_proto_session_proto_msgTypes[12].Exporter = func(v interface{}, i int) interface{} {
 			switch v := v.(*TerminationNotificationRequest); i {
 			case 0:
 				return &v.state
@@ -1353,7 +1353,7 @@ func file_deephaven_proto_session_proto_init() {
 				return nil
 			}
 		}
-		file_deephaven_proto_session_proto_msgTypes[13].Exporter = func(v interface{}, i int) interface{} {
+		file_deephaven_core_proto_session_proto_msgTypes[13].Exporter = func(v interface{}, i int) interface{} {
 			switch v := v.(*TerminationNotificationResponse); i {
 			case 0:
 				return &v.state
@@ -1365,7 +1365,7 @@ func file_deephaven_proto_session_proto_init() {
 				return nil
 			}
 		}
-		file_deephaven_proto_session_proto_msgTypes[14].Exporter = func(v interface{}, i int) interface{} {
+		file_deephaven_core_proto_session_proto_msgTypes[14].Exporter = func(v interface{}, i int) interface{} {
 			switch v := v.(*TerminationNotificationResponse_StackTrace); i {
 			case 0:
 				return &v.state
@@ -1382,19 +1382,19 @@ func file_deephaven_proto_session_proto_init() {
 	out := protoimpl.TypeBuilder{
 		File: protoimpl.DescBuilder{
 			GoPackagePath: reflect.TypeOf(x{}).PkgPath(),
-			RawDescriptor: file_deephaven_proto_session_proto_rawDesc,
+			RawDescriptor: file_deephaven_core_proto_session_proto_rawDesc,
 			NumEnums:      1,
 			NumMessages:   15,
 			NumExtensions: 0,
 			NumServices:   1,
 		},
-		GoTypes:           file_deephaven_proto_session_proto_goTypes,
-		DependencyIndexes: file_deephaven_proto_session_proto_depIdxs,
-		EnumInfos:         file_deephaven_proto_session_proto_enumTypes,
-		MessageInfos:      file_deephaven_proto_session_proto_msgTypes,
+		GoTypes:           file_deephaven_core_proto_session_proto_goTypes,
+		DependencyIndexes: file_deephaven_core_proto_session_proto_depIdxs,
+		EnumInfos:         file_deephaven_core_proto_session_proto_enumTypes,
+		MessageInfos:      file_deephaven_core_proto_session_proto_msgTypes,
 	}.Build()
-	File_deephaven_proto_session_proto = out.File
-	file_deephaven_proto_session_proto_rawDesc = nil
-	file_deephaven_proto_session_proto_goTypes = nil
-	file_deephaven_proto_session_proto_depIdxs = nil
+	File_deephaven_core_proto_session_proto = out.File
+	file_deephaven_core_proto_session_proto_rawDesc = nil
+	file_deephaven_core_proto_session_proto_goTypes = nil
+	file_deephaven_core_proto_session_proto_depIdxs = nil
 }
diff --git a/go/internal/proto/session/session_grpc.pb.go b/go/internal/proto/session/session_grpc.pb.go
index 7776d43e82e..d868b0a80ef 100644
--- a/go/internal/proto/session/session_grpc.pb.go
+++ b/go/internal/proto/session/session_grpc.pb.go
@@ -2,7 +2,7 @@
 // versions:
 // - protoc-gen-go-grpc v1.2.0
 // - protoc             v4.25.3
-// source: deephaven/proto/session.proto
+// source: deephaven_core/proto/session.proto
 
 package session
 
@@ -453,5 +453,5 @@ var SessionService_ServiceDesc = grpc.ServiceDesc{
 			ServerStreams: true,
 		},
 	},
-	Metadata: "deephaven/proto/session.proto",
+	Metadata: "deephaven_core/proto/session.proto",
 }
diff --git a/go/internal/proto/storage/storage.pb.go b/go/internal/proto/storage/storage.pb.go
index 7744648cb62..224caa8fbdd 100644
--- a/go/internal/proto/storage/storage.pb.go
+++ b/go/internal/proto/storage/storage.pb.go
@@ -5,7 +5,7 @@
 // versions:
 // 	protoc-gen-go v1.28.1
 // 	protoc        v4.25.3
-// source: deephaven/proto/storage.proto
+// source: deephaven_core/proto/storage.proto
 
 package storage
 
@@ -56,11 +56,11 @@ func (x ItemType) String() string {
 }
 
 func (ItemType) Descriptor() protoreflect.EnumDescriptor {
-	return file_deephaven_proto_storage_proto_enumTypes[0].Descriptor()
+	return file_deephaven_core_proto_storage_proto_enumTypes[0].Descriptor()
 }
 
 func (ItemType) Type() protoreflect.EnumType {
-	return &file_deephaven_proto_storage_proto_enumTypes[0]
+	return &file_deephaven_core_proto_storage_proto_enumTypes[0]
 }
 
 func (x ItemType) Number() protoreflect.EnumNumber {
@@ -69,7 +69,7 @@ func (x ItemType) Number() protoreflect.EnumNumber {
 
 // Deprecated: Use ItemType.Descriptor instead.
 func (ItemType) EnumDescriptor() ([]byte, []int) {
-	return file_deephaven_proto_storage_proto_rawDescGZIP(), []int{0}
+	return file_deephaven_core_proto_storage_proto_rawDescGZIP(), []int{0}
 }
 
 type ListItemsRequest struct {
@@ -89,7 +89,7 @@ type ListItemsRequest struct {
 func (x *ListItemsRequest) Reset() {
 	*x = ListItemsRequest{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_deephaven_proto_storage_proto_msgTypes[0]
+		mi := &file_deephaven_core_proto_storage_proto_msgTypes[0]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -102,7 +102,7 @@ func (x *ListItemsRequest) String() string {
 func (*ListItemsRequest) ProtoMessage() {}
 
 func (x *ListItemsRequest) ProtoReflect() protoreflect.Message {
-	mi := &file_deephaven_proto_storage_proto_msgTypes[0]
+	mi := &file_deephaven_core_proto_storage_proto_msgTypes[0]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -115,7 +115,7 @@ func (x *ListItemsRequest) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use ListItemsRequest.ProtoReflect.Descriptor instead.
 func (*ListItemsRequest) Descriptor() ([]byte, []int) {
-	return file_deephaven_proto_storage_proto_rawDescGZIP(), []int{0}
+	return file_deephaven_core_proto_storage_proto_rawDescGZIP(), []int{0}
 }
 
 func (x *ListItemsRequest) GetPath() string {
@@ -150,7 +150,7 @@ type ItemInfo struct {
 func (x *ItemInfo) Reset() {
 	*x = ItemInfo{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_deephaven_proto_storage_proto_msgTypes[1]
+		mi := &file_deephaven_core_proto_storage_proto_msgTypes[1]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -163,7 +163,7 @@ func (x *ItemInfo) String() string {
 func (*ItemInfo) ProtoMessage() {}
 
 func (x *ItemInfo) ProtoReflect() protoreflect.Message {
-	mi := &file_deephaven_proto_storage_proto_msgTypes[1]
+	mi := &file_deephaven_core_proto_storage_proto_msgTypes[1]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -176,7 +176,7 @@ func (x *ItemInfo) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use ItemInfo.ProtoReflect.Descriptor instead.
 func (*ItemInfo) Descriptor() ([]byte, []int) {
-	return file_deephaven_proto_storage_proto_rawDescGZIP(), []int{1}
+	return file_deephaven_core_proto_storage_proto_rawDescGZIP(), []int{1}
 }
 
 func (x *ItemInfo) GetPath() string {
@@ -222,7 +222,7 @@ type ListItemsResponse struct {
 func (x *ListItemsResponse) Reset() {
 	*x = ListItemsResponse{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_deephaven_proto_storage_proto_msgTypes[2]
+		mi := &file_deephaven_core_proto_storage_proto_msgTypes[2]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -235,7 +235,7 @@ func (x *ListItemsResponse) String() string {
 func (*ListItemsResponse) ProtoMessage() {}
 
 func (x *ListItemsResponse) ProtoReflect() protoreflect.Message {
-	mi := &file_deephaven_proto_storage_proto_msgTypes[2]
+	mi := &file_deephaven_core_proto_storage_proto_msgTypes[2]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -248,7 +248,7 @@ func (x *ListItemsResponse) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use ListItemsResponse.ProtoReflect.Descriptor instead.
 func (*ListItemsResponse) Descriptor() ([]byte, []int) {
-	return file_deephaven_proto_storage_proto_rawDescGZIP(), []int{2}
+	return file_deephaven_core_proto_storage_proto_rawDescGZIP(), []int{2}
 }
 
 func (x *ListItemsResponse) GetItems() []*ItemInfo {
@@ -279,7 +279,7 @@ type FetchFileRequest struct {
 func (x *FetchFileRequest) Reset() {
 	*x = FetchFileRequest{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_deephaven_proto_storage_proto_msgTypes[3]
+		mi := &file_deephaven_core_proto_storage_proto_msgTypes[3]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -292,7 +292,7 @@ func (x *FetchFileRequest) String() string {
 func (*FetchFileRequest) ProtoMessage() {}
 
 func (x *FetchFileRequest) ProtoReflect() protoreflect.Message {
-	mi := &file_deephaven_proto_storage_proto_msgTypes[3]
+	mi := &file_deephaven_core_proto_storage_proto_msgTypes[3]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -305,7 +305,7 @@ func (x *FetchFileRequest) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use FetchFileRequest.ProtoReflect.Descriptor instead.
 func (*FetchFileRequest) Descriptor() ([]byte, []int) {
-	return file_deephaven_proto_storage_proto_rawDescGZIP(), []int{3}
+	return file_deephaven_core_proto_storage_proto_rawDescGZIP(), []int{3}
 }
 
 func (x *FetchFileRequest) GetPath() string {
@@ -338,7 +338,7 @@ type FetchFileResponse struct {
 func (x *FetchFileResponse) Reset() {
 	*x = FetchFileResponse{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_deephaven_proto_storage_proto_msgTypes[4]
+		mi := &file_deephaven_core_proto_storage_proto_msgTypes[4]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -351,7 +351,7 @@ func (x *FetchFileResponse) String() string {
 func (*FetchFileResponse) ProtoMessage() {}
 
 func (x *FetchFileResponse) ProtoReflect() protoreflect.Message {
-	mi := &file_deephaven_proto_storage_proto_msgTypes[4]
+	mi := &file_deephaven_core_proto_storage_proto_msgTypes[4]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -364,7 +364,7 @@ func (x *FetchFileResponse) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use FetchFileResponse.ProtoReflect.Descriptor instead.
 func (*FetchFileResponse) Descriptor() ([]byte, []int) {
-	return file_deephaven_proto_storage_proto_rawDescGZIP(), []int{4}
+	return file_deephaven_core_proto_storage_proto_rawDescGZIP(), []int{4}
 }
 
 func (x *FetchFileResponse) GetContents() []byte {
@@ -397,7 +397,7 @@ type SaveFileRequest struct {
 func (x *SaveFileRequest) Reset() {
 	*x = SaveFileRequest{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_deephaven_proto_storage_proto_msgTypes[5]
+		mi := &file_deephaven_core_proto_storage_proto_msgTypes[5]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -410,7 +410,7 @@ func (x *SaveFileRequest) String() string {
 func (*SaveFileRequest) ProtoMessage() {}
 
 func (x *SaveFileRequest) ProtoReflect() protoreflect.Message {
-	mi := &file_deephaven_proto_storage_proto_msgTypes[5]
+	mi := &file_deephaven_core_proto_storage_proto_msgTypes[5]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -423,7 +423,7 @@ func (x *SaveFileRequest) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use SaveFileRequest.ProtoReflect.Descriptor instead.
 func (*SaveFileRequest) Descriptor() ([]byte, []int) {
-	return file_deephaven_proto_storage_proto_rawDescGZIP(), []int{5}
+	return file_deephaven_core_proto_storage_proto_rawDescGZIP(), []int{5}
 }
 
 func (x *SaveFileRequest) GetAllowOverwrite() bool {
@@ -459,7 +459,7 @@ type SaveFileResponse struct {
 func (x *SaveFileResponse) Reset() {
 	*x = SaveFileResponse{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_deephaven_proto_storage_proto_msgTypes[6]
+		mi := &file_deephaven_core_proto_storage_proto_msgTypes[6]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -472,7 +472,7 @@ func (x *SaveFileResponse) String() string {
 func (*SaveFileResponse) ProtoMessage() {}
 
 func (x *SaveFileResponse) ProtoReflect() protoreflect.Message {
-	mi := &file_deephaven_proto_storage_proto_msgTypes[6]
+	mi := &file_deephaven_core_proto_storage_proto_msgTypes[6]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -485,7 +485,7 @@ func (x *SaveFileResponse) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use SaveFileResponse.ProtoReflect.Descriptor instead.
 func (*SaveFileResponse) Descriptor() ([]byte, []int) {
-	return file_deephaven_proto_storage_proto_rawDescGZIP(), []int{6}
+	return file_deephaven_core_proto_storage_proto_rawDescGZIP(), []int{6}
 }
 
 func (x *SaveFileResponse) GetEtag() string {
@@ -513,7 +513,7 @@ type MoveItemRequest struct {
 func (x *MoveItemRequest) Reset() {
 	*x = MoveItemRequest{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_deephaven_proto_storage_proto_msgTypes[7]
+		mi := &file_deephaven_core_proto_storage_proto_msgTypes[7]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -526,7 +526,7 @@ func (x *MoveItemRequest) String() string {
 func (*MoveItemRequest) ProtoMessage() {}
 
 func (x *MoveItemRequest) ProtoReflect() protoreflect.Message {
-	mi := &file_deephaven_proto_storage_proto_msgTypes[7]
+	mi := &file_deephaven_core_proto_storage_proto_msgTypes[7]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -539,7 +539,7 @@ func (x *MoveItemRequest) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use MoveItemRequest.ProtoReflect.Descriptor instead.
 func (*MoveItemRequest) Descriptor() ([]byte, []int) {
-	return file_deephaven_proto_storage_proto_rawDescGZIP(), []int{7}
+	return file_deephaven_core_proto_storage_proto_rawDescGZIP(), []int{7}
 }
 
 func (x *MoveItemRequest) GetOldPath() string {
@@ -572,7 +572,7 @@ type MoveItemResponse struct {
 func (x *MoveItemResponse) Reset() {
 	*x = MoveItemResponse{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_deephaven_proto_storage_proto_msgTypes[8]
+		mi := &file_deephaven_core_proto_storage_proto_msgTypes[8]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -585,7 +585,7 @@ func (x *MoveItemResponse) String() string {
 func (*MoveItemResponse) ProtoMessage() {}
 
 func (x *MoveItemResponse) ProtoReflect() protoreflect.Message {
-	mi := &file_deephaven_proto_storage_proto_msgTypes[8]
+	mi := &file_deephaven_core_proto_storage_proto_msgTypes[8]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -598,7 +598,7 @@ func (x *MoveItemResponse) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use MoveItemResponse.ProtoReflect.Descriptor instead.
 func (*MoveItemResponse) Descriptor() ([]byte, []int) {
-	return file_deephaven_proto_storage_proto_rawDescGZIP(), []int{8}
+	return file_deephaven_core_proto_storage_proto_rawDescGZIP(), []int{8}
 }
 
 type CreateDirectoryRequest struct {
@@ -613,7 +613,7 @@ type CreateDirectoryRequest struct {
 func (x *CreateDirectoryRequest) Reset() {
 	*x = CreateDirectoryRequest{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_deephaven_proto_storage_proto_msgTypes[9]
+		mi := &file_deephaven_core_proto_storage_proto_msgTypes[9]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -626,7 +626,7 @@ func (x *CreateDirectoryRequest) String() string {
 func (*CreateDirectoryRequest) ProtoMessage() {}
 
 func (x *CreateDirectoryRequest) ProtoReflect() protoreflect.Message {
-	mi := &file_deephaven_proto_storage_proto_msgTypes[9]
+	mi := &file_deephaven_core_proto_storage_proto_msgTypes[9]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -639,7 +639,7 @@ func (x *CreateDirectoryRequest) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use CreateDirectoryRequest.ProtoReflect.Descriptor instead.
 func (*CreateDirectoryRequest) Descriptor() ([]byte, []int) {
-	return file_deephaven_proto_storage_proto_rawDescGZIP(), []int{9}
+	return file_deephaven_core_proto_storage_proto_rawDescGZIP(), []int{9}
 }
 
 func (x *CreateDirectoryRequest) GetPath() string {
@@ -658,7 +658,7 @@ type CreateDirectoryResponse struct {
 func (x *CreateDirectoryResponse) Reset() {
 	*x = CreateDirectoryResponse{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_deephaven_proto_storage_proto_msgTypes[10]
+		mi := &file_deephaven_core_proto_storage_proto_msgTypes[10]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -671,7 +671,7 @@ func (x *CreateDirectoryResponse) String() string {
 func (*CreateDirectoryResponse) ProtoMessage() {}
 
 func (x *CreateDirectoryResponse) ProtoReflect() protoreflect.Message {
-	mi := &file_deephaven_proto_storage_proto_msgTypes[10]
+	mi := &file_deephaven_core_proto_storage_proto_msgTypes[10]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -684,7 +684,7 @@ func (x *CreateDirectoryResponse) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use CreateDirectoryResponse.ProtoReflect.Descriptor instead.
 func (*CreateDirectoryResponse) Descriptor() ([]byte, []int) {
-	return file_deephaven_proto_storage_proto_rawDescGZIP(), []int{10}
+	return file_deephaven_core_proto_storage_proto_rawDescGZIP(), []int{10}
 }
 
 type DeleteItemRequest struct {
@@ -699,7 +699,7 @@ type DeleteItemRequest struct {
 func (x *DeleteItemRequest) Reset() {
 	*x = DeleteItemRequest{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_deephaven_proto_storage_proto_msgTypes[11]
+		mi := &file_deephaven_core_proto_storage_proto_msgTypes[11]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -712,7 +712,7 @@ func (x *DeleteItemRequest) String() string {
 func (*DeleteItemRequest) ProtoMessage() {}
 
 func (x *DeleteItemRequest) ProtoReflect() protoreflect.Message {
-	mi := &file_deephaven_proto_storage_proto_msgTypes[11]
+	mi := &file_deephaven_core_proto_storage_proto_msgTypes[11]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -725,7 +725,7 @@ func (x *DeleteItemRequest) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use DeleteItemRequest.ProtoReflect.Descriptor instead.
 func (*DeleteItemRequest) Descriptor() ([]byte, []int) {
-	return file_deephaven_proto_storage_proto_rawDescGZIP(), []int{11}
+	return file_deephaven_core_proto_storage_proto_rawDescGZIP(), []int{11}
 }
 
 func (x *DeleteItemRequest) GetPath() string {
@@ -744,7 +744,7 @@ type DeleteItemResponse struct {
 func (x *DeleteItemResponse) Reset() {
 	*x = DeleteItemResponse{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_deephaven_proto_storage_proto_msgTypes[12]
+		mi := &file_deephaven_core_proto_storage_proto_msgTypes[12]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -757,7 +757,7 @@ func (x *DeleteItemResponse) String() string {
 func (*DeleteItemResponse) ProtoMessage() {}
 
 func (x *DeleteItemResponse) ProtoReflect() protoreflect.Message {
-	mi := &file_deephaven_proto_storage_proto_msgTypes[12]
+	mi := &file_deephaven_core_proto_storage_proto_msgTypes[12]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -770,150 +770,150 @@ func (x *DeleteItemResponse) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use DeleteItemResponse.ProtoReflect.Descriptor instead.
 func (*DeleteItemResponse) Descriptor() ([]byte, []int) {
-	return file_deephaven_proto_storage_proto_rawDescGZIP(), []int{12}
+	return file_deephaven_core_proto_storage_proto_rawDescGZIP(), []int{12}
 }
 
-var File_deephaven_proto_storage_proto protoreflect.FileDescriptor
+var File_deephaven_core_proto_storage_proto protoreflect.FileDescriptor
 
-var file_deephaven_proto_storage_proto_rawDesc = []byte{
-	0x0a, 0x1d, 0x64, 0x65, 0x65, 0x70, 0x68, 0x61, 0x76, 0x65, 0x6e, 0x2f, 0x70, 0x72, 0x6f, 0x74,
-	0x6f, 0x2f, 0x73, 0x74, 0x6f, 0x72, 0x61, 0x67, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x12,
-	0x21, 0x69, 0x6f, 0x2e, 0x64, 0x65, 0x65, 0x70, 0x68, 0x61, 0x76, 0x65, 0x6e, 0x2e, 0x70, 0x72,
-	0x6f, 0x74, 0x6f, 0x2e, 0x62, 0x61, 0x63, 0x6b, 0x70, 0x6c, 0x61, 0x6e, 0x65, 0x2e, 0x67, 0x72,
-	0x70, 0x63, 0x22, 0x5c, 0x0a, 0x10, 0x4c, 0x69, 0x73, 0x74, 0x49, 0x74, 0x65, 0x6d, 0x73, 0x52,
-	0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x12, 0x0a, 0x04, 0x70, 0x61, 0x74, 0x68, 0x18, 0x01,
-	0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x70, 0x61, 0x74, 0x68, 0x12, 0x24, 0x0a, 0x0b, 0x66, 0x69,
-	0x6c, 0x74, 0x65, 0x72, 0x5f, 0x67, 0x6c, 0x6f, 0x62, 0x18, 0x04, 0x20, 0x01, 0x28, 0x09, 0x48,
-	0x00, 0x52, 0x0a, 0x66, 0x69, 0x6c, 0x74, 0x65, 0x72, 0x47, 0x6c, 0x6f, 0x62, 0x88, 0x01, 0x01,
-	0x42, 0x0e, 0x0a, 0x0c, 0x5f, 0x66, 0x69, 0x6c, 0x74, 0x65, 0x72, 0x5f, 0x67, 0x6c, 0x6f, 0x62,
-	0x22, 0x99, 0x01, 0x0a, 0x08, 0x49, 0x74, 0x65, 0x6d, 0x49, 0x6e, 0x66, 0x6f, 0x12, 0x12, 0x0a,
-	0x04, 0x70, 0x61, 0x74, 0x68, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x70, 0x61, 0x74,
-	0x68, 0x12, 0x3f, 0x0a, 0x04, 0x74, 0x79, 0x70, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0e, 0x32,
-	0x2b, 0x2e, 0x69, 0x6f, 0x2e, 0x64, 0x65, 0x65, 0x70, 0x68, 0x61, 0x76, 0x65, 0x6e, 0x2e, 0x70,
-	0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x62, 0x61, 0x63, 0x6b, 0x70, 0x6c, 0x61, 0x6e, 0x65, 0x2e, 0x67,
-	0x72, 0x70, 0x63, 0x2e, 0x49, 0x74, 0x65, 0x6d, 0x54, 0x79, 0x70, 0x65, 0x52, 0x04, 0x74, 0x79,
-	0x70, 0x65, 0x12, 0x16, 0x0a, 0x04, 0x73, 0x69, 0x7a, 0x65, 0x18, 0x03, 0x20, 0x01, 0x28, 0x12,
-	0x42, 0x02, 0x30, 0x01, 0x52, 0x04, 0x73, 0x69, 0x7a, 0x65, 0x12, 0x17, 0x0a, 0x04, 0x65, 0x74,
-	0x61, 0x67, 0x18, 0x04, 0x20, 0x01, 0x28, 0x09, 0x48, 0x00, 0x52, 0x04, 0x65, 0x74, 0x61, 0x67,
-	0x88, 0x01, 0x01, 0x42, 0x07, 0x0a, 0x05, 0x5f, 0x65, 0x74, 0x61, 0x67, 0x22, 0x7d, 0x0a, 0x11,
-	0x4c, 0x69, 0x73, 0x74, 0x49, 0x74, 0x65, 0x6d, 0x73, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73,
-	0x65, 0x12, 0x41, 0x0a, 0x05, 0x69, 0x74, 0x65, 0x6d, 0x73, 0x18, 0x01, 0x20, 0x03, 0x28, 0x0b,
-	0x32, 0x2b, 0x2e, 0x69, 0x6f, 0x2e, 0x64, 0x65, 0x65, 0x70, 0x68, 0x61, 0x76, 0x65, 0x6e, 0x2e,
-	0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x62, 0x61, 0x63, 0x6b, 0x70, 0x6c, 0x61, 0x6e, 0x65, 0x2e,
-	0x67, 0x72, 0x70, 0x63, 0x2e, 0x49, 0x74, 0x65, 0x6d, 0x49, 0x6e, 0x66, 0x6f, 0x52, 0x05, 0x69,
-	0x74, 0x65, 0x6d, 0x73, 0x12, 0x25, 0x0a, 0x0e, 0x63, 0x61, 0x6e, 0x6f, 0x6e, 0x69, 0x63, 0x61,
-	0x6c, 0x5f, 0x70, 0x61, 0x74, 0x68, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0d, 0x63, 0x61,
-	0x6e, 0x6f, 0x6e, 0x69, 0x63, 0x61, 0x6c, 0x50, 0x61, 0x74, 0x68, 0x22, 0x48, 0x0a, 0x10, 0x46,
-	0x65, 0x74, 0x63, 0x68, 0x46, 0x69, 0x6c, 0x65, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12,
+var file_deephaven_core_proto_storage_proto_rawDesc = []byte{
+	0x0a, 0x22, 0x64, 0x65, 0x65, 0x70, 0x68, 0x61, 0x76, 0x65, 0x6e, 0x5f, 0x63, 0x6f, 0x72, 0x65,
+	0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2f, 0x73, 0x74, 0x6f, 0x72, 0x61, 0x67, 0x65, 0x2e, 0x70,
+	0x72, 0x6f, 0x74, 0x6f, 0x12, 0x21, 0x69, 0x6f, 0x2e, 0x64, 0x65, 0x65, 0x70, 0x68, 0x61, 0x76,
+	0x65, 0x6e, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x62, 0x61, 0x63, 0x6b, 0x70, 0x6c, 0x61,
+	0x6e, 0x65, 0x2e, 0x67, 0x72, 0x70, 0x63, 0x22, 0x5c, 0x0a, 0x10, 0x4c, 0x69, 0x73, 0x74, 0x49,
+	0x74, 0x65, 0x6d, 0x73, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x12, 0x0a, 0x04, 0x70,
+	0x61, 0x74, 0x68, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x70, 0x61, 0x74, 0x68, 0x12,
+	0x24, 0x0a, 0x0b, 0x66, 0x69, 0x6c, 0x74, 0x65, 0x72, 0x5f, 0x67, 0x6c, 0x6f, 0x62, 0x18, 0x04,
+	0x20, 0x01, 0x28, 0x09, 0x48, 0x00, 0x52, 0x0a, 0x66, 0x69, 0x6c, 0x74, 0x65, 0x72, 0x47, 0x6c,
+	0x6f, 0x62, 0x88, 0x01, 0x01, 0x42, 0x0e, 0x0a, 0x0c, 0x5f, 0x66, 0x69, 0x6c, 0x74, 0x65, 0x72,
+	0x5f, 0x67, 0x6c, 0x6f, 0x62, 0x22, 0x99, 0x01, 0x0a, 0x08, 0x49, 0x74, 0x65, 0x6d, 0x49, 0x6e,
+	0x66, 0x6f, 0x12, 0x12, 0x0a, 0x04, 0x70, 0x61, 0x74, 0x68, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09,
+	0x52, 0x04, 0x70, 0x61, 0x74, 0x68, 0x12, 0x3f, 0x0a, 0x04, 0x74, 0x79, 0x70, 0x65, 0x18, 0x02,
+	0x20, 0x01, 0x28, 0x0e, 0x32, 0x2b, 0x2e, 0x69, 0x6f, 0x2e, 0x64, 0x65, 0x65, 0x70, 0x68, 0x61,
+	0x76, 0x65, 0x6e, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x62, 0x61, 0x63, 0x6b, 0x70, 0x6c,
+	0x61, 0x6e, 0x65, 0x2e, 0x67, 0x72, 0x70, 0x63, 0x2e, 0x49, 0x74, 0x65, 0x6d, 0x54, 0x79, 0x70,
+	0x65, 0x52, 0x04, 0x74, 0x79, 0x70, 0x65, 0x12, 0x16, 0x0a, 0x04, 0x73, 0x69, 0x7a, 0x65, 0x18,
+	0x03, 0x20, 0x01, 0x28, 0x12, 0x42, 0x02, 0x30, 0x01, 0x52, 0x04, 0x73, 0x69, 0x7a, 0x65, 0x12,
+	0x17, 0x0a, 0x04, 0x65, 0x74, 0x61, 0x67, 0x18, 0x04, 0x20, 0x01, 0x28, 0x09, 0x48, 0x00, 0x52,
+	0x04, 0x65, 0x74, 0x61, 0x67, 0x88, 0x01, 0x01, 0x42, 0x07, 0x0a, 0x05, 0x5f, 0x65, 0x74, 0x61,
+	0x67, 0x22, 0x7d, 0x0a, 0x11, 0x4c, 0x69, 0x73, 0x74, 0x49, 0x74, 0x65, 0x6d, 0x73, 0x52, 0x65,
+	0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x41, 0x0a, 0x05, 0x69, 0x74, 0x65, 0x6d, 0x73, 0x18,
+	0x01, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x2b, 0x2e, 0x69, 0x6f, 0x2e, 0x64, 0x65, 0x65, 0x70, 0x68,
+	0x61, 0x76, 0x65, 0x6e, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x62, 0x61, 0x63, 0x6b, 0x70,
+	0x6c, 0x61, 0x6e, 0x65, 0x2e, 0x67, 0x72, 0x70, 0x63, 0x2e, 0x49, 0x74, 0x65, 0x6d, 0x49, 0x6e,
+	0x66, 0x6f, 0x52, 0x05, 0x69, 0x74, 0x65, 0x6d, 0x73, 0x12, 0x25, 0x0a, 0x0e, 0x63, 0x61, 0x6e,
+	0x6f, 0x6e, 0x69, 0x63, 0x61, 0x6c, 0x5f, 0x70, 0x61, 0x74, 0x68, 0x18, 0x02, 0x20, 0x01, 0x28,
+	0x09, 0x52, 0x0d, 0x63, 0x61, 0x6e, 0x6f, 0x6e, 0x69, 0x63, 0x61, 0x6c, 0x50, 0x61, 0x74, 0x68,
+	0x22, 0x48, 0x0a, 0x10, 0x46, 0x65, 0x74, 0x63, 0x68, 0x46, 0x69, 0x6c, 0x65, 0x52, 0x65, 0x71,
+	0x75, 0x65, 0x73, 0x74, 0x12, 0x12, 0x0a, 0x04, 0x70, 0x61, 0x74, 0x68, 0x18, 0x01, 0x20, 0x01,
+	0x28, 0x09, 0x52, 0x04, 0x70, 0x61, 0x74, 0x68, 0x12, 0x17, 0x0a, 0x04, 0x65, 0x74, 0x61, 0x67,
+	0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x48, 0x00, 0x52, 0x04, 0x65, 0x74, 0x61, 0x67, 0x88, 0x01,
+	0x01, 0x42, 0x07, 0x0a, 0x05, 0x5f, 0x65, 0x74, 0x61, 0x67, 0x22, 0x51, 0x0a, 0x11, 0x46, 0x65,
+	0x74, 0x63, 0x68, 0x46, 0x69, 0x6c, 0x65, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12,
+	0x1a, 0x0a, 0x08, 0x63, 0x6f, 0x6e, 0x74, 0x65, 0x6e, 0x74, 0x73, 0x18, 0x01, 0x20, 0x01, 0x28,
+	0x0c, 0x52, 0x08, 0x63, 0x6f, 0x6e, 0x74, 0x65, 0x6e, 0x74, 0x73, 0x12, 0x17, 0x0a, 0x04, 0x65,
+	0x74, 0x61, 0x67, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x48, 0x00, 0x52, 0x04, 0x65, 0x74, 0x61,
+	0x67, 0x88, 0x01, 0x01, 0x42, 0x07, 0x0a, 0x05, 0x5f, 0x65, 0x74, 0x61, 0x67, 0x22, 0x6a, 0x0a,
+	0x0f, 0x53, 0x61, 0x76, 0x65, 0x46, 0x69, 0x6c, 0x65, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74,
+	0x12, 0x27, 0x0a, 0x0f, 0x61, 0x6c, 0x6c, 0x6f, 0x77, 0x5f, 0x6f, 0x76, 0x65, 0x72, 0x77, 0x72,
+	0x69, 0x74, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x08, 0x52, 0x0e, 0x61, 0x6c, 0x6c, 0x6f, 0x77,
+	0x4f, 0x76, 0x65, 0x72, 0x77, 0x72, 0x69, 0x74, 0x65, 0x12, 0x12, 0x0a, 0x04, 0x70, 0x61, 0x74,
+	0x68, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x70, 0x61, 0x74, 0x68, 0x12, 0x1a, 0x0a,
+	0x08, 0x63, 0x6f, 0x6e, 0x74, 0x65, 0x6e, 0x74, 0x73, 0x18, 0x03, 0x20, 0x01, 0x28, 0x0c, 0x52,
+	0x08, 0x63, 0x6f, 0x6e, 0x74, 0x65, 0x6e, 0x74, 0x73, 0x22, 0x34, 0x0a, 0x10, 0x53, 0x61, 0x76,
+	0x65, 0x46, 0x69, 0x6c, 0x65, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x17, 0x0a,
+	0x04, 0x65, 0x74, 0x61, 0x67, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x48, 0x00, 0x52, 0x04, 0x65,
+	0x74, 0x61, 0x67, 0x88, 0x01, 0x01, 0x42, 0x07, 0x0a, 0x05, 0x5f, 0x65, 0x74, 0x61, 0x67, 0x22,
+	0x70, 0x0a, 0x0f, 0x4d, 0x6f, 0x76, 0x65, 0x49, 0x74, 0x65, 0x6d, 0x52, 0x65, 0x71, 0x75, 0x65,
+	0x73, 0x74, 0x12, 0x19, 0x0a, 0x08, 0x6f, 0x6c, 0x64, 0x5f, 0x70, 0x61, 0x74, 0x68, 0x18, 0x01,
+	0x20, 0x01, 0x28, 0x09, 0x52, 0x07, 0x6f, 0x6c, 0x64, 0x50, 0x61, 0x74, 0x68, 0x12, 0x19, 0x0a,
+	0x08, 0x6e, 0x65, 0x77, 0x5f, 0x70, 0x61, 0x74, 0x68, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52,
+	0x07, 0x6e, 0x65, 0x77, 0x50, 0x61, 0x74, 0x68, 0x12, 0x27, 0x0a, 0x0f, 0x61, 0x6c, 0x6c, 0x6f,
+	0x77, 0x5f, 0x6f, 0x76, 0x65, 0x72, 0x77, 0x72, 0x69, 0x74, 0x65, 0x18, 0x03, 0x20, 0x01, 0x28,
+	0x08, 0x52, 0x0e, 0x61, 0x6c, 0x6c, 0x6f, 0x77, 0x4f, 0x76, 0x65, 0x72, 0x77, 0x72, 0x69, 0x74,
+	0x65, 0x22, 0x12, 0x0a, 0x10, 0x4d, 0x6f, 0x76, 0x65, 0x49, 0x74, 0x65, 0x6d, 0x52, 0x65, 0x73,
+	0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x2c, 0x0a, 0x16, 0x43, 0x72, 0x65, 0x61, 0x74, 0x65, 0x44,
+	0x69, 0x72, 0x65, 0x63, 0x74, 0x6f, 0x72, 0x79, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12,
 	0x12, 0x0a, 0x04, 0x70, 0x61, 0x74, 0x68, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x70,
-	0x61, 0x74, 0x68, 0x12, 0x17, 0x0a, 0x04, 0x65, 0x74, 0x61, 0x67, 0x18, 0x02, 0x20, 0x01, 0x28,
-	0x09, 0x48, 0x00, 0x52, 0x04, 0x65, 0x74, 0x61, 0x67, 0x88, 0x01, 0x01, 0x42, 0x07, 0x0a, 0x05,
-	0x5f, 0x65, 0x74, 0x61, 0x67, 0x22, 0x51, 0x0a, 0x11, 0x46, 0x65, 0x74, 0x63, 0x68, 0x46, 0x69,
-	0x6c, 0x65, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x1a, 0x0a, 0x08, 0x63, 0x6f,
-	0x6e, 0x74, 0x65, 0x6e, 0x74, 0x73, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0c, 0x52, 0x08, 0x63, 0x6f,
-	0x6e, 0x74, 0x65, 0x6e, 0x74, 0x73, 0x12, 0x17, 0x0a, 0x04, 0x65, 0x74, 0x61, 0x67, 0x18, 0x02,
-	0x20, 0x01, 0x28, 0x09, 0x48, 0x00, 0x52, 0x04, 0x65, 0x74, 0x61, 0x67, 0x88, 0x01, 0x01, 0x42,
-	0x07, 0x0a, 0x05, 0x5f, 0x65, 0x74, 0x61, 0x67, 0x22, 0x6a, 0x0a, 0x0f, 0x53, 0x61, 0x76, 0x65,
-	0x46, 0x69, 0x6c, 0x65, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x27, 0x0a, 0x0f, 0x61,
-	0x6c, 0x6c, 0x6f, 0x77, 0x5f, 0x6f, 0x76, 0x65, 0x72, 0x77, 0x72, 0x69, 0x74, 0x65, 0x18, 0x01,
-	0x20, 0x01, 0x28, 0x08, 0x52, 0x0e, 0x61, 0x6c, 0x6c, 0x6f, 0x77, 0x4f, 0x76, 0x65, 0x72, 0x77,
-	0x72, 0x69, 0x74, 0x65, 0x12, 0x12, 0x0a, 0x04, 0x70, 0x61, 0x74, 0x68, 0x18, 0x02, 0x20, 0x01,
-	0x28, 0x09, 0x52, 0x04, 0x70, 0x61, 0x74, 0x68, 0x12, 0x1a, 0x0a, 0x08, 0x63, 0x6f, 0x6e, 0x74,
-	0x65, 0x6e, 0x74, 0x73, 0x18, 0x03, 0x20, 0x01, 0x28, 0x0c, 0x52, 0x08, 0x63, 0x6f, 0x6e, 0x74,
-	0x65, 0x6e, 0x74, 0x73, 0x22, 0x34, 0x0a, 0x10, 0x53, 0x61, 0x76, 0x65, 0x46, 0x69, 0x6c, 0x65,
-	0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x17, 0x0a, 0x04, 0x65, 0x74, 0x61, 0x67,
-	0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x48, 0x00, 0x52, 0x04, 0x65, 0x74, 0x61, 0x67, 0x88, 0x01,
-	0x01, 0x42, 0x07, 0x0a, 0x05, 0x5f, 0x65, 0x74, 0x61, 0x67, 0x22, 0x70, 0x0a, 0x0f, 0x4d, 0x6f,
-	0x76, 0x65, 0x49, 0x74, 0x65, 0x6d, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x19, 0x0a,
-	0x08, 0x6f, 0x6c, 0x64, 0x5f, 0x70, 0x61, 0x74, 0x68, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52,
-	0x07, 0x6f, 0x6c, 0x64, 0x50, 0x61, 0x74, 0x68, 0x12, 0x19, 0x0a, 0x08, 0x6e, 0x65, 0x77, 0x5f,
-	0x70, 0x61, 0x74, 0x68, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x07, 0x6e, 0x65, 0x77, 0x50,
-	0x61, 0x74, 0x68, 0x12, 0x27, 0x0a, 0x0f, 0x61, 0x6c, 0x6c, 0x6f, 0x77, 0x5f, 0x6f, 0x76, 0x65,
-	0x72, 0x77, 0x72, 0x69, 0x74, 0x65, 0x18, 0x03, 0x20, 0x01, 0x28, 0x08, 0x52, 0x0e, 0x61, 0x6c,
-	0x6c, 0x6f, 0x77, 0x4f, 0x76, 0x65, 0x72, 0x77, 0x72, 0x69, 0x74, 0x65, 0x22, 0x12, 0x0a, 0x10,
-	0x4d, 0x6f, 0x76, 0x65, 0x49, 0x74, 0x65, 0x6d, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65,
-	0x22, 0x2c, 0x0a, 0x16, 0x43, 0x72, 0x65, 0x61, 0x74, 0x65, 0x44, 0x69, 0x72, 0x65, 0x63, 0x74,
-	0x6f, 0x72, 0x79, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x12, 0x0a, 0x04, 0x70, 0x61,
-	0x74, 0x68, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x70, 0x61, 0x74, 0x68, 0x22, 0x19,
-	0x0a, 0x17, 0x43, 0x72, 0x65, 0x61, 0x74, 0x65, 0x44, 0x69, 0x72, 0x65, 0x63, 0x74, 0x6f, 0x72,
-	0x79, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x27, 0x0a, 0x11, 0x44, 0x65, 0x6c,
-	0x65, 0x74, 0x65, 0x49, 0x74, 0x65, 0x6d, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x12,
-	0x0a, 0x04, 0x70, 0x61, 0x74, 0x68, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x70, 0x61,
-	0x74, 0x68, 0x22, 0x14, 0x0a, 0x12, 0x44, 0x65, 0x6c, 0x65, 0x74, 0x65, 0x49, 0x74, 0x65, 0x6d,
-	0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x2a, 0x30, 0x0a, 0x08, 0x49, 0x74, 0x65, 0x6d,
-	0x54, 0x79, 0x70, 0x65, 0x12, 0x0b, 0x0a, 0x07, 0x55, 0x4e, 0x4b, 0x4e, 0x4f, 0x57, 0x4e, 0x10,
-	0x00, 0x12, 0x0d, 0x0a, 0x09, 0x44, 0x49, 0x52, 0x45, 0x43, 0x54, 0x4f, 0x52, 0x59, 0x10, 0x01,
-	0x12, 0x08, 0x0a, 0x04, 0x46, 0x49, 0x4c, 0x45, 0x10, 0x02, 0x32, 0xfc, 0x05, 0x0a, 0x0e, 0x53,
-	0x74, 0x6f, 0x72, 0x61, 0x67, 0x65, 0x53, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x12, 0x78, 0x0a,
-	0x09, 0x4c, 0x69, 0x73, 0x74, 0x49, 0x74, 0x65, 0x6d, 0x73, 0x12, 0x33, 0x2e, 0x69, 0x6f, 0x2e,
-	0x64, 0x65, 0x65, 0x70, 0x68, 0x61, 0x76, 0x65, 0x6e, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e,
-	0x62, 0x61, 0x63, 0x6b, 0x70, 0x6c, 0x61, 0x6e, 0x65, 0x2e, 0x67, 0x72, 0x70, 0x63, 0x2e, 0x4c,
-	0x69, 0x73, 0x74, 0x49, 0x74, 0x65, 0x6d, 0x73, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a,
-	0x34, 0x2e, 0x69, 0x6f, 0x2e, 0x64, 0x65, 0x65, 0x70, 0x68, 0x61, 0x76, 0x65, 0x6e, 0x2e, 0x70,
+	0x61, 0x74, 0x68, 0x22, 0x19, 0x0a, 0x17, 0x43, 0x72, 0x65, 0x61, 0x74, 0x65, 0x44, 0x69, 0x72,
+	0x65, 0x63, 0x74, 0x6f, 0x72, 0x79, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x27,
+	0x0a, 0x11, 0x44, 0x65, 0x6c, 0x65, 0x74, 0x65, 0x49, 0x74, 0x65, 0x6d, 0x52, 0x65, 0x71, 0x75,
+	0x65, 0x73, 0x74, 0x12, 0x12, 0x0a, 0x04, 0x70, 0x61, 0x74, 0x68, 0x18, 0x01, 0x20, 0x01, 0x28,
+	0x09, 0x52, 0x04, 0x70, 0x61, 0x74, 0x68, 0x22, 0x14, 0x0a, 0x12, 0x44, 0x65, 0x6c, 0x65, 0x74,
+	0x65, 0x49, 0x74, 0x65, 0x6d, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x2a, 0x30, 0x0a,
+	0x08, 0x49, 0x74, 0x65, 0x6d, 0x54, 0x79, 0x70, 0x65, 0x12, 0x0b, 0x0a, 0x07, 0x55, 0x4e, 0x4b,
+	0x4e, 0x4f, 0x57, 0x4e, 0x10, 0x00, 0x12, 0x0d, 0x0a, 0x09, 0x44, 0x49, 0x52, 0x45, 0x43, 0x54,
+	0x4f, 0x52, 0x59, 0x10, 0x01, 0x12, 0x08, 0x0a, 0x04, 0x46, 0x49, 0x4c, 0x45, 0x10, 0x02, 0x32,
+	0xfc, 0x05, 0x0a, 0x0e, 0x53, 0x74, 0x6f, 0x72, 0x61, 0x67, 0x65, 0x53, 0x65, 0x72, 0x76, 0x69,
+	0x63, 0x65, 0x12, 0x78, 0x0a, 0x09, 0x4c, 0x69, 0x73, 0x74, 0x49, 0x74, 0x65, 0x6d, 0x73, 0x12,
+	0x33, 0x2e, 0x69, 0x6f, 0x2e, 0x64, 0x65, 0x65, 0x70, 0x68, 0x61, 0x76, 0x65, 0x6e, 0x2e, 0x70,
 	0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x62, 0x61, 0x63, 0x6b, 0x70, 0x6c, 0x61, 0x6e, 0x65, 0x2e, 0x67,
-	0x72, 0x70, 0x63, 0x2e, 0x4c, 0x69, 0x73, 0x74, 0x49, 0x74, 0x65, 0x6d, 0x73, 0x52, 0x65, 0x73,
-	0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x00, 0x12, 0x78, 0x0a, 0x09, 0x46, 0x65, 0x74, 0x63, 0x68,
-	0x46, 0x69, 0x6c, 0x65, 0x12, 0x33, 0x2e, 0x69, 0x6f, 0x2e, 0x64, 0x65, 0x65, 0x70, 0x68, 0x61,
+	0x72, 0x70, 0x63, 0x2e, 0x4c, 0x69, 0x73, 0x74, 0x49, 0x74, 0x65, 0x6d, 0x73, 0x52, 0x65, 0x71,
+	0x75, 0x65, 0x73, 0x74, 0x1a, 0x34, 0x2e, 0x69, 0x6f, 0x2e, 0x64, 0x65, 0x65, 0x70, 0x68, 0x61,
 	0x76, 0x65, 0x6e, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x62, 0x61, 0x63, 0x6b, 0x70, 0x6c,
-	0x61, 0x6e, 0x65, 0x2e, 0x67, 0x72, 0x70, 0x63, 0x2e, 0x46, 0x65, 0x74, 0x63, 0x68, 0x46, 0x69,
-	0x6c, 0x65, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x34, 0x2e, 0x69, 0x6f, 0x2e, 0x64,
+	0x61, 0x6e, 0x65, 0x2e, 0x67, 0x72, 0x70, 0x63, 0x2e, 0x4c, 0x69, 0x73, 0x74, 0x49, 0x74, 0x65,
+	0x6d, 0x73, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x00, 0x12, 0x78, 0x0a, 0x09,
+	0x46, 0x65, 0x74, 0x63, 0x68, 0x46, 0x69, 0x6c, 0x65, 0x12, 0x33, 0x2e, 0x69, 0x6f, 0x2e, 0x64,
 	0x65, 0x65, 0x70, 0x68, 0x61, 0x76, 0x65, 0x6e, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x62,
 	0x61, 0x63, 0x6b, 0x70, 0x6c, 0x61, 0x6e, 0x65, 0x2e, 0x67, 0x72, 0x70, 0x63, 0x2e, 0x46, 0x65,
-	0x74, 0x63, 0x68, 0x46, 0x69, 0x6c, 0x65, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22,
-	0x00, 0x12, 0x75, 0x0a, 0x08, 0x53, 0x61, 0x76, 0x65, 0x46, 0x69, 0x6c, 0x65, 0x12, 0x32, 0x2e,
+	0x74, 0x63, 0x68, 0x46, 0x69, 0x6c, 0x65, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x34,
+	0x2e, 0x69, 0x6f, 0x2e, 0x64, 0x65, 0x65, 0x70, 0x68, 0x61, 0x76, 0x65, 0x6e, 0x2e, 0x70, 0x72,
+	0x6f, 0x74, 0x6f, 0x2e, 0x62, 0x61, 0x63, 0x6b, 0x70, 0x6c, 0x61, 0x6e, 0x65, 0x2e, 0x67, 0x72,
+	0x70, 0x63, 0x2e, 0x46, 0x65, 0x74, 0x63, 0x68, 0x46, 0x69, 0x6c, 0x65, 0x52, 0x65, 0x73, 0x70,
+	0x6f, 0x6e, 0x73, 0x65, 0x22, 0x00, 0x12, 0x75, 0x0a, 0x08, 0x53, 0x61, 0x76, 0x65, 0x46, 0x69,
+	0x6c, 0x65, 0x12, 0x32, 0x2e, 0x69, 0x6f, 0x2e, 0x64, 0x65, 0x65, 0x70, 0x68, 0x61, 0x76, 0x65,
+	0x6e, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x62, 0x61, 0x63, 0x6b, 0x70, 0x6c, 0x61, 0x6e,
+	0x65, 0x2e, 0x67, 0x72, 0x70, 0x63, 0x2e, 0x53, 0x61, 0x76, 0x65, 0x46, 0x69, 0x6c, 0x65, 0x52,
+	0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x33, 0x2e, 0x69, 0x6f, 0x2e, 0x64, 0x65, 0x65, 0x70,
+	0x68, 0x61, 0x76, 0x65, 0x6e, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x62, 0x61, 0x63, 0x6b,
+	0x70, 0x6c, 0x61, 0x6e, 0x65, 0x2e, 0x67, 0x72, 0x70, 0x63, 0x2e, 0x53, 0x61, 0x76, 0x65, 0x46,
+	0x69, 0x6c, 0x65, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x00, 0x12, 0x75, 0x0a,
+	0x08, 0x4d, 0x6f, 0x76, 0x65, 0x49, 0x74, 0x65, 0x6d, 0x12, 0x32, 0x2e, 0x69, 0x6f, 0x2e, 0x64,
+	0x65, 0x65, 0x70, 0x68, 0x61, 0x76, 0x65, 0x6e, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x62,
+	0x61, 0x63, 0x6b, 0x70, 0x6c, 0x61, 0x6e, 0x65, 0x2e, 0x67, 0x72, 0x70, 0x63, 0x2e, 0x4d, 0x6f,
+	0x76, 0x65, 0x49, 0x74, 0x65, 0x6d, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x33, 0x2e,
 	0x69, 0x6f, 0x2e, 0x64, 0x65, 0x65, 0x70, 0x68, 0x61, 0x76, 0x65, 0x6e, 0x2e, 0x70, 0x72, 0x6f,
 	0x74, 0x6f, 0x2e, 0x62, 0x61, 0x63, 0x6b, 0x70, 0x6c, 0x61, 0x6e, 0x65, 0x2e, 0x67, 0x72, 0x70,
-	0x63, 0x2e, 0x53, 0x61, 0x76, 0x65, 0x46, 0x69, 0x6c, 0x65, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73,
-	0x74, 0x1a, 0x33, 0x2e, 0x69, 0x6f, 0x2e, 0x64, 0x65, 0x65, 0x70, 0x68, 0x61, 0x76, 0x65, 0x6e,
-	0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x62, 0x61, 0x63, 0x6b, 0x70, 0x6c, 0x61, 0x6e, 0x65,
-	0x2e, 0x67, 0x72, 0x70, 0x63, 0x2e, 0x53, 0x61, 0x76, 0x65, 0x46, 0x69, 0x6c, 0x65, 0x52, 0x65,
-	0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x00, 0x12, 0x75, 0x0a, 0x08, 0x4d, 0x6f, 0x76, 0x65,
-	0x49, 0x74, 0x65, 0x6d, 0x12, 0x32, 0x2e, 0x69, 0x6f, 0x2e, 0x64, 0x65, 0x65, 0x70, 0x68, 0x61,
-	0x76, 0x65, 0x6e, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x62, 0x61, 0x63, 0x6b, 0x70, 0x6c,
-	0x61, 0x6e, 0x65, 0x2e, 0x67, 0x72, 0x70, 0x63, 0x2e, 0x4d, 0x6f, 0x76, 0x65, 0x49, 0x74, 0x65,
-	0x6d, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x33, 0x2e, 0x69, 0x6f, 0x2e, 0x64, 0x65,
+	0x63, 0x2e, 0x4d, 0x6f, 0x76, 0x65, 0x49, 0x74, 0x65, 0x6d, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e,
+	0x73, 0x65, 0x22, 0x00, 0x12, 0x8a, 0x01, 0x0a, 0x0f, 0x43, 0x72, 0x65, 0x61, 0x74, 0x65, 0x44,
+	0x69, 0x72, 0x65, 0x63, 0x74, 0x6f, 0x72, 0x79, 0x12, 0x39, 0x2e, 0x69, 0x6f, 0x2e, 0x64, 0x65,
 	0x65, 0x70, 0x68, 0x61, 0x76, 0x65, 0x6e, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x62, 0x61,
-	0x63, 0x6b, 0x70, 0x6c, 0x61, 0x6e, 0x65, 0x2e, 0x67, 0x72, 0x70, 0x63, 0x2e, 0x4d, 0x6f, 0x76,
-	0x65, 0x49, 0x74, 0x65, 0x6d, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x00, 0x12,
-	0x8a, 0x01, 0x0a, 0x0f, 0x43, 0x72, 0x65, 0x61, 0x74, 0x65, 0x44, 0x69, 0x72, 0x65, 0x63, 0x74,
-	0x6f, 0x72, 0x79, 0x12, 0x39, 0x2e, 0x69, 0x6f, 0x2e, 0x64, 0x65, 0x65, 0x70, 0x68, 0x61, 0x76,
+	0x63, 0x6b, 0x70, 0x6c, 0x61, 0x6e, 0x65, 0x2e, 0x67, 0x72, 0x70, 0x63, 0x2e, 0x43, 0x72, 0x65,
+	0x61, 0x74, 0x65, 0x44, 0x69, 0x72, 0x65, 0x63, 0x74, 0x6f, 0x72, 0x79, 0x52, 0x65, 0x71, 0x75,
+	0x65, 0x73, 0x74, 0x1a, 0x3a, 0x2e, 0x69, 0x6f, 0x2e, 0x64, 0x65, 0x65, 0x70, 0x68, 0x61, 0x76,
 	0x65, 0x6e, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x62, 0x61, 0x63, 0x6b, 0x70, 0x6c, 0x61,
 	0x6e, 0x65, 0x2e, 0x67, 0x72, 0x70, 0x63, 0x2e, 0x43, 0x72, 0x65, 0x61, 0x74, 0x65, 0x44, 0x69,
-	0x72, 0x65, 0x63, 0x74, 0x6f, 0x72, 0x79, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x3a,
-	0x2e, 0x69, 0x6f, 0x2e, 0x64, 0x65, 0x65, 0x70, 0x68, 0x61, 0x76, 0x65, 0x6e, 0x2e, 0x70, 0x72,
-	0x6f, 0x74, 0x6f, 0x2e, 0x62, 0x61, 0x63, 0x6b, 0x70, 0x6c, 0x61, 0x6e, 0x65, 0x2e, 0x67, 0x72,
-	0x70, 0x63, 0x2e, 0x43, 0x72, 0x65, 0x61, 0x74, 0x65, 0x44, 0x69, 0x72, 0x65, 0x63, 0x74, 0x6f,
-	0x72, 0x79, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x00, 0x12, 0x7b, 0x0a, 0x0a,
-	0x44, 0x65, 0x6c, 0x65, 0x74, 0x65, 0x49, 0x74, 0x65, 0x6d, 0x12, 0x34, 0x2e, 0x69, 0x6f, 0x2e,
-	0x64, 0x65, 0x65, 0x70, 0x68, 0x61, 0x76, 0x65, 0x6e, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e,
-	0x62, 0x61, 0x63, 0x6b, 0x70, 0x6c, 0x61, 0x6e, 0x65, 0x2e, 0x67, 0x72, 0x70, 0x63, 0x2e, 0x44,
-	0x65, 0x6c, 0x65, 0x74, 0x65, 0x49, 0x74, 0x65, 0x6d, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74,
-	0x1a, 0x35, 0x2e, 0x69, 0x6f, 0x2e, 0x64, 0x65, 0x65, 0x70, 0x68, 0x61, 0x76, 0x65, 0x6e, 0x2e,
-	0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x62, 0x61, 0x63, 0x6b, 0x70, 0x6c, 0x61, 0x6e, 0x65, 0x2e,
-	0x67, 0x72, 0x70, 0x63, 0x2e, 0x44, 0x65, 0x6c, 0x65, 0x74, 0x65, 0x49, 0x74, 0x65, 0x6d, 0x52,
-	0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x00, 0x42, 0x43, 0x48, 0x01, 0x50, 0x01, 0x5a,
-	0x3d, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x64, 0x65, 0x65, 0x70,
-	0x68, 0x61, 0x76, 0x65, 0x6e, 0x2f, 0x64, 0x65, 0x65, 0x70, 0x68, 0x61, 0x76, 0x65, 0x6e, 0x2d,
-	0x63, 0x6f, 0x72, 0x65, 0x2f, 0x67, 0x6f, 0x2f, 0x69, 0x6e, 0x74, 0x65, 0x72, 0x6e, 0x61, 0x6c,
-	0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2f, 0x73, 0x74, 0x6f, 0x72, 0x61, 0x67, 0x65, 0x62, 0x06,
-	0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
+	0x72, 0x65, 0x63, 0x74, 0x6f, 0x72, 0x79, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22,
+	0x00, 0x12, 0x7b, 0x0a, 0x0a, 0x44, 0x65, 0x6c, 0x65, 0x74, 0x65, 0x49, 0x74, 0x65, 0x6d, 0x12,
+	0x34, 0x2e, 0x69, 0x6f, 0x2e, 0x64, 0x65, 0x65, 0x70, 0x68, 0x61, 0x76, 0x65, 0x6e, 0x2e, 0x70,
+	0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x62, 0x61, 0x63, 0x6b, 0x70, 0x6c, 0x61, 0x6e, 0x65, 0x2e, 0x67,
+	0x72, 0x70, 0x63, 0x2e, 0x44, 0x65, 0x6c, 0x65, 0x74, 0x65, 0x49, 0x74, 0x65, 0x6d, 0x52, 0x65,
+	0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x35, 0x2e, 0x69, 0x6f, 0x2e, 0x64, 0x65, 0x65, 0x70, 0x68,
+	0x61, 0x76, 0x65, 0x6e, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x62, 0x61, 0x63, 0x6b, 0x70,
+	0x6c, 0x61, 0x6e, 0x65, 0x2e, 0x67, 0x72, 0x70, 0x63, 0x2e, 0x44, 0x65, 0x6c, 0x65, 0x74, 0x65,
+	0x49, 0x74, 0x65, 0x6d, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x00, 0x42, 0x43,
+	0x48, 0x01, 0x50, 0x01, 0x5a, 0x3d, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d,
+	0x2f, 0x64, 0x65, 0x65, 0x70, 0x68, 0x61, 0x76, 0x65, 0x6e, 0x2f, 0x64, 0x65, 0x65, 0x70, 0x68,
+	0x61, 0x76, 0x65, 0x6e, 0x2d, 0x63, 0x6f, 0x72, 0x65, 0x2f, 0x67, 0x6f, 0x2f, 0x69, 0x6e, 0x74,
+	0x65, 0x72, 0x6e, 0x61, 0x6c, 0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2f, 0x73, 0x74, 0x6f, 0x72,
+	0x61, 0x67, 0x65, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
 }
 
 var (
-	file_deephaven_proto_storage_proto_rawDescOnce sync.Once
-	file_deephaven_proto_storage_proto_rawDescData = file_deephaven_proto_storage_proto_rawDesc
+	file_deephaven_core_proto_storage_proto_rawDescOnce sync.Once
+	file_deephaven_core_proto_storage_proto_rawDescData = file_deephaven_core_proto_storage_proto_rawDesc
 )
 
-func file_deephaven_proto_storage_proto_rawDescGZIP() []byte {
-	file_deephaven_proto_storage_proto_rawDescOnce.Do(func() {
-		file_deephaven_proto_storage_proto_rawDescData = protoimpl.X.CompressGZIP(file_deephaven_proto_storage_proto_rawDescData)
+func file_deephaven_core_proto_storage_proto_rawDescGZIP() []byte {
+	file_deephaven_core_proto_storage_proto_rawDescOnce.Do(func() {
+		file_deephaven_core_proto_storage_proto_rawDescData = protoimpl.X.CompressGZIP(file_deephaven_core_proto_storage_proto_rawDescData)
 	})
-	return file_deephaven_proto_storage_proto_rawDescData
+	return file_deephaven_core_proto_storage_proto_rawDescData
 }
 
-var file_deephaven_proto_storage_proto_enumTypes = make([]protoimpl.EnumInfo, 1)
-var file_deephaven_proto_storage_proto_msgTypes = make([]protoimpl.MessageInfo, 13)
-var file_deephaven_proto_storage_proto_goTypes = []interface{}{
+var file_deephaven_core_proto_storage_proto_enumTypes = make([]protoimpl.EnumInfo, 1)
+var file_deephaven_core_proto_storage_proto_msgTypes = make([]protoimpl.MessageInfo, 13)
+var file_deephaven_core_proto_storage_proto_goTypes = []interface{}{
 	(ItemType)(0),                   // 0: io.deephaven.proto.backplane.grpc.ItemType
 	(*ListItemsRequest)(nil),        // 1: io.deephaven.proto.backplane.grpc.ListItemsRequest
 	(*ItemInfo)(nil),                // 2: io.deephaven.proto.backplane.grpc.ItemInfo
@@ -929,7 +929,7 @@ var file_deephaven_proto_storage_proto_goTypes = []interface{}{
 	(*DeleteItemRequest)(nil),       // 12: io.deephaven.proto.backplane.grpc.DeleteItemRequest
 	(*DeleteItemResponse)(nil),      // 13: io.deephaven.proto.backplane.grpc.DeleteItemResponse
 }
-var file_deephaven_proto_storage_proto_depIdxs = []int32{
+var file_deephaven_core_proto_storage_proto_depIdxs = []int32{
 	0,  // 0: io.deephaven.proto.backplane.grpc.ItemInfo.type:type_name -> io.deephaven.proto.backplane.grpc.ItemType
 	2,  // 1: io.deephaven.proto.backplane.grpc.ListItemsResponse.items:type_name -> io.deephaven.proto.backplane.grpc.ItemInfo
 	1,  // 2: io.deephaven.proto.backplane.grpc.StorageService.ListItems:input_type -> io.deephaven.proto.backplane.grpc.ListItemsRequest
@@ -951,13 +951,13 @@ var file_deephaven_proto_storage_proto_depIdxs = []int32{
 	0,  // [0:2] is the sub-list for field type_name
 }
 
-func init() { file_deephaven_proto_storage_proto_init() }
-func file_deephaven_proto_storage_proto_init() {
-	if File_deephaven_proto_storage_proto != nil {
+func init() { file_deephaven_core_proto_storage_proto_init() }
+func file_deephaven_core_proto_storage_proto_init() {
+	if File_deephaven_core_proto_storage_proto != nil {
 		return
 	}
 	if !protoimpl.UnsafeEnabled {
-		file_deephaven_proto_storage_proto_msgTypes[0].Exporter = func(v interface{}, i int) interface{} {
+		file_deephaven_core_proto_storage_proto_msgTypes[0].Exporter = func(v interface{}, i int) interface{} {
 			switch v := v.(*ListItemsRequest); i {
 			case 0:
 				return &v.state
@@ -969,7 +969,7 @@ func file_deephaven_proto_storage_proto_init() {
 				return nil
 			}
 		}
-		file_deephaven_proto_storage_proto_msgTypes[1].Exporter = func(v interface{}, i int) interface{} {
+		file_deephaven_core_proto_storage_proto_msgTypes[1].Exporter = func(v interface{}, i int) interface{} {
 			switch v := v.(*ItemInfo); i {
 			case 0:
 				return &v.state
@@ -981,7 +981,7 @@ func file_deephaven_proto_storage_proto_init() {
 				return nil
 			}
 		}
-		file_deephaven_proto_storage_proto_msgTypes[2].Exporter = func(v interface{}, i int) interface{} {
+		file_deephaven_core_proto_storage_proto_msgTypes[2].Exporter = func(v interface{}, i int) interface{} {
 			switch v := v.(*ListItemsResponse); i {
 			case 0:
 				return &v.state
@@ -993,7 +993,7 @@ func file_deephaven_proto_storage_proto_init() {
 				return nil
 			}
 		}
-		file_deephaven_proto_storage_proto_msgTypes[3].Exporter = func(v interface{}, i int) interface{} {
+		file_deephaven_core_proto_storage_proto_msgTypes[3].Exporter = func(v interface{}, i int) interface{} {
 			switch v := v.(*FetchFileRequest); i {
 			case 0:
 				return &v.state
@@ -1005,7 +1005,7 @@ func file_deephaven_proto_storage_proto_init() {
 				return nil
 			}
 		}
-		file_deephaven_proto_storage_proto_msgTypes[4].Exporter = func(v interface{}, i int) interface{} {
+		file_deephaven_core_proto_storage_proto_msgTypes[4].Exporter = func(v interface{}, i int) interface{} {
 			switch v := v.(*FetchFileResponse); i {
 			case 0:
 				return &v.state
@@ -1017,7 +1017,7 @@ func file_deephaven_proto_storage_proto_init() {
 				return nil
 			}
 		}
-		file_deephaven_proto_storage_proto_msgTypes[5].Exporter = func(v interface{}, i int) interface{} {
+		file_deephaven_core_proto_storage_proto_msgTypes[5].Exporter = func(v interface{}, i int) interface{} {
 			switch v := v.(*SaveFileRequest); i {
 			case 0:
 				return &v.state
@@ -1029,7 +1029,7 @@ func file_deephaven_proto_storage_proto_init() {
 				return nil
 			}
 		}
-		file_deephaven_proto_storage_proto_msgTypes[6].Exporter = func(v interface{}, i int) interface{} {
+		file_deephaven_core_proto_storage_proto_msgTypes[6].Exporter = func(v interface{}, i int) interface{} {
 			switch v := v.(*SaveFileResponse); i {
 			case 0:
 				return &v.state
@@ -1041,7 +1041,7 @@ func file_deephaven_proto_storage_proto_init() {
 				return nil
 			}
 		}
-		file_deephaven_proto_storage_proto_msgTypes[7].Exporter = func(v interface{}, i int) interface{} {
+		file_deephaven_core_proto_storage_proto_msgTypes[7].Exporter = func(v interface{}, i int) interface{} {
 			switch v := v.(*MoveItemRequest); i {
 			case 0:
 				return &v.state
@@ -1053,7 +1053,7 @@ func file_deephaven_proto_storage_proto_init() {
 				return nil
 			}
 		}
-		file_deephaven_proto_storage_proto_msgTypes[8].Exporter = func(v interface{}, i int) interface{} {
+		file_deephaven_core_proto_storage_proto_msgTypes[8].Exporter = func(v interface{}, i int) interface{} {
 			switch v := v.(*MoveItemResponse); i {
 			case 0:
 				return &v.state
@@ -1065,7 +1065,7 @@ func file_deephaven_proto_storage_proto_init() {
 				return nil
 			}
 		}
-		file_deephaven_proto_storage_proto_msgTypes[9].Exporter = func(v interface{}, i int) interface{} {
+		file_deephaven_core_proto_storage_proto_msgTypes[9].Exporter = func(v interface{}, i int) interface{} {
 			switch v := v.(*CreateDirectoryRequest); i {
 			case 0:
 				return &v.state
@@ -1077,7 +1077,7 @@ func file_deephaven_proto_storage_proto_init() {
 				return nil
 			}
 		}
-		file_deephaven_proto_storage_proto_msgTypes[10].Exporter = func(v interface{}, i int) interface{} {
+		file_deephaven_core_proto_storage_proto_msgTypes[10].Exporter = func(v interface{}, i int) interface{} {
 			switch v := v.(*CreateDirectoryResponse); i {
 			case 0:
 				return &v.state
@@ -1089,7 +1089,7 @@ func file_deephaven_proto_storage_proto_init() {
 				return nil
 			}
 		}
-		file_deephaven_proto_storage_proto_msgTypes[11].Exporter = func(v interface{}, i int) interface{} {
+		file_deephaven_core_proto_storage_proto_msgTypes[11].Exporter = func(v interface{}, i int) interface{} {
 			switch v := v.(*DeleteItemRequest); i {
 			case 0:
 				return &v.state
@@ -1101,7 +1101,7 @@ func file_deephaven_proto_storage_proto_init() {
 				return nil
 			}
 		}
-		file_deephaven_proto_storage_proto_msgTypes[12].Exporter = func(v interface{}, i int) interface{} {
+		file_deephaven_core_proto_storage_proto_msgTypes[12].Exporter = func(v interface{}, i int) interface{} {
 			switch v := v.(*DeleteItemResponse); i {
 			case 0:
 				return &v.state
@@ -1114,28 +1114,28 @@ func file_deephaven_proto_storage_proto_init() {
 			}
 		}
 	}
-	file_deephaven_proto_storage_proto_msgTypes[0].OneofWrappers = []interface{}{}
-	file_deephaven_proto_storage_proto_msgTypes[1].OneofWrappers = []interface{}{}
-	file_deephaven_proto_storage_proto_msgTypes[3].OneofWrappers = []interface{}{}
-	file_deephaven_proto_storage_proto_msgTypes[4].OneofWrappers = []interface{}{}
-	file_deephaven_proto_storage_proto_msgTypes[6].OneofWrappers = []interface{}{}
+	file_deephaven_core_proto_storage_proto_msgTypes[0].OneofWrappers = []interface{}{}
+	file_deephaven_core_proto_storage_proto_msgTypes[1].OneofWrappers = []interface{}{}
+	file_deephaven_core_proto_storage_proto_msgTypes[3].OneofWrappers = []interface{}{}
+	file_deephaven_core_proto_storage_proto_msgTypes[4].OneofWrappers = []interface{}{}
+	file_deephaven_core_proto_storage_proto_msgTypes[6].OneofWrappers = []interface{}{}
 	type x struct{}
 	out := protoimpl.TypeBuilder{
 		File: protoimpl.DescBuilder{
 			GoPackagePath: reflect.TypeOf(x{}).PkgPath(),
-			RawDescriptor: file_deephaven_proto_storage_proto_rawDesc,
+			RawDescriptor: file_deephaven_core_proto_storage_proto_rawDesc,
 			NumEnums:      1,
 			NumMessages:   13,
 			NumExtensions: 0,
 			NumServices:   1,
 		},
-		GoTypes:           file_deephaven_proto_storage_proto_goTypes,
-		DependencyIndexes: file_deephaven_proto_storage_proto_depIdxs,
-		EnumInfos:         file_deephaven_proto_storage_proto_enumTypes,
-		MessageInfos:      file_deephaven_proto_storage_proto_msgTypes,
+		GoTypes:           file_deephaven_core_proto_storage_proto_goTypes,
+		DependencyIndexes: file_deephaven_core_proto_storage_proto_depIdxs,
+		EnumInfos:         file_deephaven_core_proto_storage_proto_enumTypes,
+		MessageInfos:      file_deephaven_core_proto_storage_proto_msgTypes,
 	}.Build()
-	File_deephaven_proto_storage_proto = out.File
-	file_deephaven_proto_storage_proto_rawDesc = nil
-	file_deephaven_proto_storage_proto_goTypes = nil
-	file_deephaven_proto_storage_proto_depIdxs = nil
+	File_deephaven_core_proto_storage_proto = out.File
+	file_deephaven_core_proto_storage_proto_rawDesc = nil
+	file_deephaven_core_proto_storage_proto_goTypes = nil
+	file_deephaven_core_proto_storage_proto_depIdxs = nil
 }
diff --git a/go/internal/proto/storage/storage_grpc.pb.go b/go/internal/proto/storage/storage_grpc.pb.go
index 9e795a76b62..053facf077d 100644
--- a/go/internal/proto/storage/storage_grpc.pb.go
+++ b/go/internal/proto/storage/storage_grpc.pb.go
@@ -2,7 +2,7 @@
 // versions:
 // - protoc-gen-go-grpc v1.2.0
 // - protoc             v4.25.3
-// source: deephaven/proto/storage.proto
+// source: deephaven_core/proto/storage.proto
 
 package storage
 
@@ -295,5 +295,5 @@ var StorageService_ServiceDesc = grpc.ServiceDesc{
 		},
 	},
 	Streams:  []grpc.StreamDesc{},
-	Metadata: "deephaven/proto/storage.proto",
+	Metadata: "deephaven_core/proto/storage.proto",
 }
diff --git a/go/internal/proto/table/table.pb.go b/go/internal/proto/table/table.pb.go
index d1be1be5f77..fe6f76ab686 100644
--- a/go/internal/proto/table/table.pb.go
+++ b/go/internal/proto/table/table.pb.go
@@ -5,7 +5,7 @@
 // versions:
 // 	protoc-gen-go v1.28.1
 // 	protoc        v4.25.3
-// source: deephaven/proto/table.proto
+// source: deephaven_core/proto/table.proto
 
 package table
 
@@ -69,11 +69,11 @@ func (x BadDataBehavior) String() string {
 }
 
 func (BadDataBehavior) Descriptor() protoreflect.EnumDescriptor {
-	return file_deephaven_proto_table_proto_enumTypes[0].Descriptor()
+	return file_deephaven_core_proto_table_proto_enumTypes[0].Descriptor()
 }
 
 func (BadDataBehavior) Type() protoreflect.EnumType {
-	return &file_deephaven_proto_table_proto_enumTypes[0]
+	return &file_deephaven_core_proto_table_proto_enumTypes[0]
 }
 
 func (x BadDataBehavior) Number() protoreflect.EnumNumber {
@@ -82,7 +82,7 @@ func (x BadDataBehavior) Number() protoreflect.EnumNumber {
 
 // Deprecated: Use BadDataBehavior.Descriptor instead.
 func (BadDataBehavior) EnumDescriptor() ([]byte, []int) {
-	return file_deephaven_proto_table_proto_rawDescGZIP(), []int{0}
+	return file_deephaven_core_proto_table_proto_rawDescGZIP(), []int{0}
 }
 
 // Directives for how to handle {@code null} and {@code NaN} values
@@ -126,11 +126,11 @@ func (x UpdateByNullBehavior) String() string {
 }
 
 func (UpdateByNullBehavior) Descriptor() protoreflect.EnumDescriptor {
-	return file_deephaven_proto_table_proto_enumTypes[1].Descriptor()
+	return file_deephaven_core_proto_table_proto_enumTypes[1].Descriptor()
 }
 
 func (UpdateByNullBehavior) Type() protoreflect.EnumType {
-	return &file_deephaven_proto_table_proto_enumTypes[1]
+	return &file_deephaven_core_proto_table_proto_enumTypes[1]
 }
 
 func (x UpdateByNullBehavior) Number() protoreflect.EnumNumber {
@@ -139,7 +139,7 @@ func (x UpdateByNullBehavior) Number() protoreflect.EnumNumber {
 
 // Deprecated: Use UpdateByNullBehavior.Descriptor instead.
 func (UpdateByNullBehavior) EnumDescriptor() ([]byte, []int) {
-	return file_deephaven_proto_table_proto_rawDescGZIP(), []int{1}
+	return file_deephaven_core_proto_table_proto_rawDescGZIP(), []int{1}
 }
 
 type NullValue int32
@@ -169,11 +169,11 @@ func (x NullValue) String() string {
 }
 
 func (NullValue) Descriptor() protoreflect.EnumDescriptor {
-	return file_deephaven_proto_table_proto_enumTypes[2].Descriptor()
+	return file_deephaven_core_proto_table_proto_enumTypes[2].Descriptor()
 }
 
 func (NullValue) Type() protoreflect.EnumType {
-	return &file_deephaven_proto_table_proto_enumTypes[2]
+	return &file_deephaven_core_proto_table_proto_enumTypes[2]
 }
 
 func (x NullValue) Number() protoreflect.EnumNumber {
@@ -182,7 +182,7 @@ func (x NullValue) Number() protoreflect.EnumNumber {
 
 // Deprecated: Use NullValue.Descriptor instead.
 func (NullValue) EnumDescriptor() ([]byte, []int) {
-	return file_deephaven_proto_table_proto_rawDescGZIP(), []int{2}
+	return file_deephaven_core_proto_table_proto_rawDescGZIP(), []int{2}
 }
 
 type CaseSensitivity int32
@@ -215,11 +215,11 @@ func (x CaseSensitivity) String() string {
 }
 
 func (CaseSensitivity) Descriptor() protoreflect.EnumDescriptor {
-	return file_deephaven_proto_table_proto_enumTypes[3].Descriptor()
+	return file_deephaven_core_proto_table_proto_enumTypes[3].Descriptor()
 }
 
 func (CaseSensitivity) Type() protoreflect.EnumType {
-	return &file_deephaven_proto_table_proto_enumTypes[3]
+	return &file_deephaven_core_proto_table_proto_enumTypes[3]
 }
 
 func (x CaseSensitivity) Number() protoreflect.EnumNumber {
@@ -228,7 +228,7 @@ func (x CaseSensitivity) Number() protoreflect.EnumNumber {
 
 // Deprecated: Use CaseSensitivity.Descriptor instead.
 func (CaseSensitivity) EnumDescriptor() ([]byte, []int) {
-	return file_deephaven_proto_table_proto_rawDescGZIP(), []int{3}
+	return file_deephaven_core_proto_table_proto_rawDescGZIP(), []int{3}
 }
 
 type MatchType int32
@@ -261,11 +261,11 @@ func (x MatchType) String() string {
 }
 
 func (MatchType) Descriptor() protoreflect.EnumDescriptor {
-	return file_deephaven_proto_table_proto_enumTypes[4].Descriptor()
+	return file_deephaven_core_proto_table_proto_enumTypes[4].Descriptor()
 }
 
 func (MatchType) Type() protoreflect.EnumType {
-	return &file_deephaven_proto_table_proto_enumTypes[4]
+	return &file_deephaven_core_proto_table_proto_enumTypes[4]
 }
 
 func (x MatchType) Number() protoreflect.EnumNumber {
@@ -274,7 +274,7 @@ func (x MatchType) Number() protoreflect.EnumNumber {
 
 // Deprecated: Use MatchType.Descriptor instead.
 func (MatchType) EnumDescriptor() ([]byte, []int) {
-	return file_deephaven_proto_table_proto_rawDescGZIP(), []int{4}
+	return file_deephaven_core_proto_table_proto_rawDescGZIP(), []int{4}
 }
 
 type MathContext_RoundingMode int32
@@ -328,11 +328,11 @@ func (x MathContext_RoundingMode) String() string {
 }
 
 func (MathContext_RoundingMode) Descriptor() protoreflect.EnumDescriptor {
-	return file_deephaven_proto_table_proto_enumTypes[5].Descriptor()
+	return file_deephaven_core_proto_table_proto_enumTypes[5].Descriptor()
 }
 
 func (MathContext_RoundingMode) Type() protoreflect.EnumType {
-	return &file_deephaven_proto_table_proto_enumTypes[5]
+	return &file_deephaven_core_proto_table_proto_enumTypes[5]
 }
 
 func (x MathContext_RoundingMode) Number() protoreflect.EnumNumber {
@@ -341,7 +341,7 @@ func (x MathContext_RoundingMode) Number() protoreflect.EnumNumber {
 
 // Deprecated: Use MathContext_RoundingMode.Descriptor instead.
 func (MathContext_RoundingMode) EnumDescriptor() ([]byte, []int) {
-	return file_deephaven_proto_table_proto_rawDescGZIP(), []int{9, 0}
+	return file_deephaven_core_proto_table_proto_rawDescGZIP(), []int{10, 0}
 }
 
 // Deprecated: Do not use.
@@ -381,11 +381,11 @@ func (x AsOfJoinTablesRequest_MatchRule) String() string {
 }
 
 func (AsOfJoinTablesRequest_MatchRule) Descriptor() protoreflect.EnumDescriptor {
-	return file_deephaven_proto_table_proto_enumTypes[6].Descriptor()
+	return file_deephaven_core_proto_table_proto_enumTypes[6].Descriptor()
 }
 
 func (AsOfJoinTablesRequest_MatchRule) Type() protoreflect.EnumType {
-	return &file_deephaven_proto_table_proto_enumTypes[6]
+	return &file_deephaven_core_proto_table_proto_enumTypes[6]
 }
 
 func (x AsOfJoinTablesRequest_MatchRule) Number() protoreflect.EnumNumber {
@@ -394,7 +394,7 @@ func (x AsOfJoinTablesRequest_MatchRule) Number() protoreflect.EnumNumber {
 
 // Deprecated: Use AsOfJoinTablesRequest_MatchRule.Descriptor instead.
 func (AsOfJoinTablesRequest_MatchRule) EnumDescriptor() ([]byte, []int) {
-	return file_deephaven_proto_table_proto_rawDescGZIP(), []int{27, 0}
+	return file_deephaven_core_proto_table_proto_rawDescGZIP(), []int{28, 0}
 }
 
 type RangeJoinTablesRequest_RangeStartRule int32
@@ -433,11 +433,11 @@ func (x RangeJoinTablesRequest_RangeStartRule) String() string {
 }
 
 func (RangeJoinTablesRequest_RangeStartRule) Descriptor() protoreflect.EnumDescriptor {
-	return file_deephaven_proto_table_proto_enumTypes[7].Descriptor()
+	return file_deephaven_core_proto_table_proto_enumTypes[7].Descriptor()
 }
 
 func (RangeJoinTablesRequest_RangeStartRule) Type() protoreflect.EnumType {
-	return &file_deephaven_proto_table_proto_enumTypes[7]
+	return &file_deephaven_core_proto_table_proto_enumTypes[7]
 }
 
 func (x RangeJoinTablesRequest_RangeStartRule) Number() protoreflect.EnumNumber {
@@ -446,7 +446,7 @@ func (x RangeJoinTablesRequest_RangeStartRule) Number() protoreflect.EnumNumber
 
 // Deprecated: Use RangeJoinTablesRequest_RangeStartRule.Descriptor instead.
 func (RangeJoinTablesRequest_RangeStartRule) EnumDescriptor() ([]byte, []int) {
-	return file_deephaven_proto_table_proto_rawDescGZIP(), []int{31, 0}
+	return file_deephaven_core_proto_table_proto_rawDescGZIP(), []int{32, 0}
 }
 
 type RangeJoinTablesRequest_RangeEndRule int32
@@ -485,11 +485,11 @@ func (x RangeJoinTablesRequest_RangeEndRule) String() string {
 }
 
 func (RangeJoinTablesRequest_RangeEndRule) Descriptor() protoreflect.EnumDescriptor {
-	return file_deephaven_proto_table_proto_enumTypes[8].Descriptor()
+	return file_deephaven_core_proto_table_proto_enumTypes[8].Descriptor()
 }
 
 func (RangeJoinTablesRequest_RangeEndRule) Type() protoreflect.EnumType {
-	return &file_deephaven_proto_table_proto_enumTypes[8]
+	return &file_deephaven_core_proto_table_proto_enumTypes[8]
 }
 
 func (x RangeJoinTablesRequest_RangeEndRule) Number() protoreflect.EnumNumber {
@@ -498,7 +498,7 @@ func (x RangeJoinTablesRequest_RangeEndRule) Number() protoreflect.EnumNumber {
 
 // Deprecated: Use RangeJoinTablesRequest_RangeEndRule.Descriptor instead.
 func (RangeJoinTablesRequest_RangeEndRule) EnumDescriptor() ([]byte, []int) {
-	return file_deephaven_proto_table_proto_rawDescGZIP(), []int{31, 1}
+	return file_deephaven_core_proto_table_proto_rawDescGZIP(), []int{32, 1}
 }
 
 type ComboAggregateRequest_AggType int32
@@ -567,11 +567,11 @@ func (x ComboAggregateRequest_AggType) String() string {
 }
 
 func (ComboAggregateRequest_AggType) Descriptor() protoreflect.EnumDescriptor {
-	return file_deephaven_proto_table_proto_enumTypes[9].Descriptor()
+	return file_deephaven_core_proto_table_proto_enumTypes[9].Descriptor()
 }
 
 func (ComboAggregateRequest_AggType) Type() protoreflect.EnumType {
-	return &file_deephaven_proto_table_proto_enumTypes[9]
+	return &file_deephaven_core_proto_table_proto_enumTypes[9]
 }
 
 func (x ComboAggregateRequest_AggType) Number() protoreflect.EnumNumber {
@@ -580,7 +580,7 @@ func (x ComboAggregateRequest_AggType) Number() protoreflect.EnumNumber {
 
 // Deprecated: Use ComboAggregateRequest_AggType.Descriptor instead.
 func (ComboAggregateRequest_AggType) EnumDescriptor() ([]byte, []int) {
-	return file_deephaven_proto_table_proto_rawDescGZIP(), []int{32, 0}
+	return file_deephaven_core_proto_table_proto_rawDescGZIP(), []int{33, 0}
 }
 
 type SortDescriptor_SortDirection int32
@@ -619,11 +619,11 @@ func (x SortDescriptor_SortDirection) String() string {
 }
 
 func (SortDescriptor_SortDirection) Descriptor() protoreflect.EnumDescriptor {
-	return file_deephaven_proto_table_proto_enumTypes[10].Descriptor()
+	return file_deephaven_core_proto_table_proto_enumTypes[10].Descriptor()
 }
 
 func (SortDescriptor_SortDirection) Type() protoreflect.EnumType {
-	return &file_deephaven_proto_table_proto_enumTypes[10]
+	return &file_deephaven_core_proto_table_proto_enumTypes[10]
 }
 
 func (x SortDescriptor_SortDirection) Number() protoreflect.EnumNumber {
@@ -632,7 +632,7 @@ func (x SortDescriptor_SortDirection) Number() protoreflect.EnumNumber {
 
 // Deprecated: Use SortDescriptor_SortDirection.Descriptor instead.
 func (SortDescriptor_SortDirection) EnumDescriptor() ([]byte, []int) {
-	return file_deephaven_proto_table_proto_rawDescGZIP(), []int{37, 0}
+	return file_deephaven_core_proto_table_proto_rawDescGZIP(), []int{38, 0}
 }
 
 type CompareCondition_CompareOperation int32
@@ -677,11 +677,11 @@ func (x CompareCondition_CompareOperation) String() string {
 }
 
 func (CompareCondition_CompareOperation) Descriptor() protoreflect.EnumDescriptor {
-	return file_deephaven_proto_table_proto_enumTypes[11].Descriptor()
+	return file_deephaven_core_proto_table_proto_enumTypes[11].Descriptor()
 }
 
 func (CompareCondition_CompareOperation) Type() protoreflect.EnumType {
-	return &file_deephaven_proto_table_proto_enumTypes[11]
+	return &file_deephaven_core_proto_table_proto_enumTypes[11]
 }
 
 func (x CompareCondition_CompareOperation) Number() protoreflect.EnumNumber {
@@ -690,7 +690,7 @@ func (x CompareCondition_CompareOperation) Number() protoreflect.EnumNumber {
 
 // Deprecated: Use CompareCondition_CompareOperation.Descriptor instead.
 func (CompareCondition_CompareOperation) EnumDescriptor() ([]byte, []int) {
-	return file_deephaven_proto_table_proto_rawDescGZIP(), []int{49, 0}
+	return file_deephaven_core_proto_table_proto_rawDescGZIP(), []int{50, 0}
 }
 
 type TableReference struct {
@@ -707,7 +707,7 @@ type TableReference struct {
 func (x *TableReference) Reset() {
 	*x = TableReference{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_deephaven_proto_table_proto_msgTypes[0]
+		mi := &file_deephaven_core_proto_table_proto_msgTypes[0]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -720,7 +720,7 @@ func (x *TableReference) String() string {
 func (*TableReference) ProtoMessage() {}
 
 func (x *TableReference) ProtoReflect() protoreflect.Message {
-	mi := &file_deephaven_proto_table_proto_msgTypes[0]
+	mi := &file_deephaven_core_proto_table_proto_msgTypes[0]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -733,7 +733,7 @@ func (x *TableReference) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use TableReference.ProtoReflect.Descriptor instead.
 func (*TableReference) Descriptor() ([]byte, []int) {
-	return file_deephaven_proto_table_proto_rawDescGZIP(), []int{0}
+	return file_deephaven_core_proto_table_proto_rawDescGZIP(), []int{0}
 }
 
 func (m *TableReference) GetRef() isTableReference_Ref {
@@ -762,12 +762,15 @@ type isTableReference_Ref interface {
 }
 
 type TableReference_Ticket struct {
-	// an exported ticket
+	// A ticket to resolve to get the table. It's preferable to use export tickets in order to avoid races that are
+	// possible with tickets controlled by the server, but any ticket type will suffice as long as it resolves to a
+	// table.
 	Ticket *ticket.Ticket `protobuf:"bytes,1,opt,name=ticket,proto3,oneof"`
 }
 
 type TableReference_BatchOffset struct {
-	// an offset into a BatchRequest -- used to reference a result that will not be exported
+	// An offset into a BatchRequest's ops field, used to reference an intermediate operation which may not have been
+	// exported. Only valid to set when used in the context of a BatchRequest.
 	BatchOffset int32 `protobuf:"zigzag32,2,opt,name=batch_offset,json=batchOffset,proto3,oneof"`
 }
 
@@ -798,7 +801,7 @@ type ExportedTableCreationResponse struct {
 func (x *ExportedTableCreationResponse) Reset() {
 	*x = ExportedTableCreationResponse{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_deephaven_proto_table_proto_msgTypes[1]
+		mi := &file_deephaven_core_proto_table_proto_msgTypes[1]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -811,7 +814,7 @@ func (x *ExportedTableCreationResponse) String() string {
 func (*ExportedTableCreationResponse) ProtoMessage() {}
 
 func (x *ExportedTableCreationResponse) ProtoReflect() protoreflect.Message {
-	mi := &file_deephaven_proto_table_proto_msgTypes[1]
+	mi := &file_deephaven_core_proto_table_proto_msgTypes[1]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -824,7 +827,7 @@ func (x *ExportedTableCreationResponse) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use ExportedTableCreationResponse.ProtoReflect.Descriptor instead.
 func (*ExportedTableCreationResponse) Descriptor() ([]byte, []int) {
-	return file_deephaven_proto_table_proto_rawDescGZIP(), []int{1}
+	return file_deephaven_core_proto_table_proto_rawDescGZIP(), []int{1}
 }
 
 func (x *ExportedTableCreationResponse) GetResultId() *TableReference {
@@ -881,7 +884,7 @@ type FetchTableRequest struct {
 func (x *FetchTableRequest) Reset() {
 	*x = FetchTableRequest{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_deephaven_proto_table_proto_msgTypes[2]
+		mi := &file_deephaven_core_proto_table_proto_msgTypes[2]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -894,7 +897,7 @@ func (x *FetchTableRequest) String() string {
 func (*FetchTableRequest) ProtoMessage() {}
 
 func (x *FetchTableRequest) ProtoReflect() protoreflect.Message {
-	mi := &file_deephaven_proto_table_proto_msgTypes[2]
+	mi := &file_deephaven_core_proto_table_proto_msgTypes[2]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -907,7 +910,7 @@ func (x *FetchTableRequest) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use FetchTableRequest.ProtoReflect.Descriptor instead.
 func (*FetchTableRequest) Descriptor() ([]byte, []int) {
-	return file_deephaven_proto_table_proto_rawDescGZIP(), []int{2}
+	return file_deephaven_core_proto_table_proto_rawDescGZIP(), []int{2}
 }
 
 func (x *FetchTableRequest) GetSourceId() *TableReference {
@@ -936,7 +939,7 @@ type ApplyPreviewColumnsRequest struct {
 func (x *ApplyPreviewColumnsRequest) Reset() {
 	*x = ApplyPreviewColumnsRequest{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_deephaven_proto_table_proto_msgTypes[3]
+		mi := &file_deephaven_core_proto_table_proto_msgTypes[3]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -949,7 +952,7 @@ func (x *ApplyPreviewColumnsRequest) String() string {
 func (*ApplyPreviewColumnsRequest) ProtoMessage() {}
 
 func (x *ApplyPreviewColumnsRequest) ProtoReflect() protoreflect.Message {
-	mi := &file_deephaven_proto_table_proto_msgTypes[3]
+	mi := &file_deephaven_core_proto_table_proto_msgTypes[3]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -962,7 +965,7 @@ func (x *ApplyPreviewColumnsRequest) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use ApplyPreviewColumnsRequest.ProtoReflect.Descriptor instead.
 func (*ApplyPreviewColumnsRequest) Descriptor() ([]byte, []int) {
-	return file_deephaven_proto_table_proto_rawDescGZIP(), []int{3}
+	return file_deephaven_core_proto_table_proto_rawDescGZIP(), []int{3}
 }
 
 func (x *ApplyPreviewColumnsRequest) GetSourceId() *TableReference {
@@ -988,7 +991,7 @@ type ExportedTableUpdatesRequest struct {
 func (x *ExportedTableUpdatesRequest) Reset() {
 	*x = ExportedTableUpdatesRequest{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_deephaven_proto_table_proto_msgTypes[4]
+		mi := &file_deephaven_core_proto_table_proto_msgTypes[4]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -1001,7 +1004,7 @@ func (x *ExportedTableUpdatesRequest) String() string {
 func (*ExportedTableUpdatesRequest) ProtoMessage() {}
 
 func (x *ExportedTableUpdatesRequest) ProtoReflect() protoreflect.Message {
-	mi := &file_deephaven_proto_table_proto_msgTypes[4]
+	mi := &file_deephaven_core_proto_table_proto_msgTypes[4]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -1014,7 +1017,7 @@ func (x *ExportedTableUpdatesRequest) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use ExportedTableUpdatesRequest.ProtoReflect.Descriptor instead.
 func (*ExportedTableUpdatesRequest) Descriptor() ([]byte, []int) {
-	return file_deephaven_proto_table_proto_rawDescGZIP(), []int{4}
+	return file_deephaven_core_proto_table_proto_rawDescGZIP(), []int{4}
 }
 
 type ExportedTableUpdateMessage struct {
@@ -1030,7 +1033,7 @@ type ExportedTableUpdateMessage struct {
 func (x *ExportedTableUpdateMessage) Reset() {
 	*x = ExportedTableUpdateMessage{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_deephaven_proto_table_proto_msgTypes[5]
+		mi := &file_deephaven_core_proto_table_proto_msgTypes[5]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -1043,7 +1046,7 @@ func (x *ExportedTableUpdateMessage) String() string {
 func (*ExportedTableUpdateMessage) ProtoMessage() {}
 
 func (x *ExportedTableUpdateMessage) ProtoReflect() protoreflect.Message {
-	mi := &file_deephaven_proto_table_proto_msgTypes[5]
+	mi := &file_deephaven_core_proto_table_proto_msgTypes[5]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -1056,7 +1059,7 @@ func (x *ExportedTableUpdateMessage) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use ExportedTableUpdateMessage.ProtoReflect.Descriptor instead.
 func (*ExportedTableUpdateMessage) Descriptor() ([]byte, []int) {
-	return file_deephaven_proto_table_proto_rawDescGZIP(), []int{5}
+	return file_deephaven_core_proto_table_proto_rawDescGZIP(), []int{5}
 }
 
 func (x *ExportedTableUpdateMessage) GetExportId() *ticket.Ticket {
@@ -1092,7 +1095,7 @@ type EmptyTableRequest struct {
 func (x *EmptyTableRequest) Reset() {
 	*x = EmptyTableRequest{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_deephaven_proto_table_proto_msgTypes[6]
+		mi := &file_deephaven_core_proto_table_proto_msgTypes[6]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -1105,7 +1108,7 @@ func (x *EmptyTableRequest) String() string {
 func (*EmptyTableRequest) ProtoMessage() {}
 
 func (x *EmptyTableRequest) ProtoReflect() protoreflect.Message {
-	mi := &file_deephaven_proto_table_proto_msgTypes[6]
+	mi := &file_deephaven_core_proto_table_proto_msgTypes[6]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -1118,7 +1121,7 @@ func (x *EmptyTableRequest) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use EmptyTableRequest.ProtoReflect.Descriptor instead.
 func (*EmptyTableRequest) Descriptor() ([]byte, []int) {
-	return file_deephaven_proto_table_proto_rawDescGZIP(), []int{6}
+	return file_deephaven_core_proto_table_proto_rawDescGZIP(), []int{6}
 }
 
 func (x *EmptyTableRequest) GetResultId() *ticket.Ticket {
@@ -1155,7 +1158,7 @@ type TimeTableRequest struct {
 func (x *TimeTableRequest) Reset() {
 	*x = TimeTableRequest{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_deephaven_proto_table_proto_msgTypes[7]
+		mi := &file_deephaven_core_proto_table_proto_msgTypes[7]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -1168,7 +1171,7 @@ func (x *TimeTableRequest) String() string {
 func (*TimeTableRequest) ProtoMessage() {}
 
 func (x *TimeTableRequest) ProtoReflect() protoreflect.Message {
-	mi := &file_deephaven_proto_table_proto_msgTypes[7]
+	mi := &file_deephaven_core_proto_table_proto_msgTypes[7]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -1181,7 +1184,7 @@ func (x *TimeTableRequest) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use TimeTableRequest.ProtoReflect.Descriptor instead.
 func (*TimeTableRequest) Descriptor() ([]byte, []int) {
-	return file_deephaven_proto_table_proto_rawDescGZIP(), []int{7}
+	return file_deephaven_core_proto_table_proto_rawDescGZIP(), []int{7}
 }
 
 func (x *TimeTableRequest) GetResultId() *ticket.Ticket {
@@ -1285,7 +1288,7 @@ type SelectOrUpdateRequest struct {
 func (x *SelectOrUpdateRequest) Reset() {
 	*x = SelectOrUpdateRequest{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_deephaven_proto_table_proto_msgTypes[8]
+		mi := &file_deephaven_core_proto_table_proto_msgTypes[8]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -1298,7 +1301,7 @@ func (x *SelectOrUpdateRequest) String() string {
 func (*SelectOrUpdateRequest) ProtoMessage() {}
 
 func (x *SelectOrUpdateRequest) ProtoReflect() protoreflect.Message {
-	mi := &file_deephaven_proto_table_proto_msgTypes[8]
+	mi := &file_deephaven_core_proto_table_proto_msgTypes[8]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -1311,7 +1314,7 @@ func (x *SelectOrUpdateRequest) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use SelectOrUpdateRequest.ProtoReflect.Descriptor instead.
 func (*SelectOrUpdateRequest) Descriptor() ([]byte, []int) {
-	return file_deephaven_proto_table_proto_rawDescGZIP(), []int{8}
+	return file_deephaven_core_proto_table_proto_rawDescGZIP(), []int{8}
 }
 
 func (x *SelectOrUpdateRequest) GetResultId() *ticket.Ticket {
@@ -1335,6 +1338,77 @@ func (x *SelectOrUpdateRequest) GetColumnSpecs() []string {
 	return nil
 }
 
+type Selectable struct {
+	state         protoimpl.MessageState
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
+
+	// message ColumnExpression {
+	//  string column_name = 1;
+	//  Expression expression = 2;
+	// }
+	//
+	// Types that are assignable to Type:
+	//	*Selectable_Raw
+	Type isSelectable_Type `protobuf_oneof:"type"`
+}
+
+func (x *Selectable) Reset() {
+	*x = Selectable{}
+	if protoimpl.UnsafeEnabled {
+		mi := &file_deephaven_core_proto_table_proto_msgTypes[9]
+		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+		ms.StoreMessageInfo(mi)
+	}
+}
+
+func (x *Selectable) String() string {
+	return protoimpl.X.MessageStringOf(x)
+}
+
+func (*Selectable) ProtoMessage() {}
+
+func (x *Selectable) ProtoReflect() protoreflect.Message {
+	mi := &file_deephaven_core_proto_table_proto_msgTypes[9]
+	if protoimpl.UnsafeEnabled && x != nil {
+		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+		if ms.LoadMessageInfo() == nil {
+			ms.StoreMessageInfo(mi)
+		}
+		return ms
+	}
+	return mi.MessageOf(x)
+}
+
+// Deprecated: Use Selectable.ProtoReflect.Descriptor instead.
+func (*Selectable) Descriptor() ([]byte, []int) {
+	return file_deephaven_core_proto_table_proto_rawDescGZIP(), []int{9}
+}
+
+func (m *Selectable) GetType() isSelectable_Type {
+	if m != nil {
+		return m.Type
+	}
+	return nil
+}
+
+func (x *Selectable) GetRaw() string {
+	if x, ok := x.GetType().(*Selectable_Raw); ok {
+		return x.Raw
+	}
+	return ""
+}
+
+type isSelectable_Type interface {
+	isSelectable_Type()
+}
+
+type Selectable_Raw struct {
+	Raw string `protobuf:"bytes,1,opt,name=raw,proto3,oneof"` // ColumnExpression column_expression = 2;
+}
+
+func (*Selectable_Raw) isSelectable_Type() {}
+
 type MathContext struct {
 	state         protoimpl.MessageState
 	sizeCache     protoimpl.SizeCache
@@ -1347,7 +1421,7 @@ type MathContext struct {
 func (x *MathContext) Reset() {
 	*x = MathContext{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_deephaven_proto_table_proto_msgTypes[9]
+		mi := &file_deephaven_core_proto_table_proto_msgTypes[10]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -1360,7 +1434,7 @@ func (x *MathContext) String() string {
 func (*MathContext) ProtoMessage() {}
 
 func (x *MathContext) ProtoReflect() protoreflect.Message {
-	mi := &file_deephaven_proto_table_proto_msgTypes[9]
+	mi := &file_deephaven_core_proto_table_proto_msgTypes[10]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -1373,7 +1447,7 @@ func (x *MathContext) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use MathContext.ProtoReflect.Descriptor instead.
 func (*MathContext) Descriptor() ([]byte, []int) {
-	return file_deephaven_proto_table_proto_rawDescGZIP(), []int{9}
+	return file_deephaven_core_proto_table_proto_rawDescGZIP(), []int{10}
 }
 
 func (x *MathContext) GetPrecision() int32 {
@@ -1405,7 +1479,7 @@ type UpdateByWindowScale struct {
 func (x *UpdateByWindowScale) Reset() {
 	*x = UpdateByWindowScale{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_deephaven_proto_table_proto_msgTypes[10]
+		mi := &file_deephaven_core_proto_table_proto_msgTypes[11]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -1418,7 +1492,7 @@ func (x *UpdateByWindowScale) String() string {
 func (*UpdateByWindowScale) ProtoMessage() {}
 
 func (x *UpdateByWindowScale) ProtoReflect() protoreflect.Message {
-	mi := &file_deephaven_proto_table_proto_msgTypes[10]
+	mi := &file_deephaven_core_proto_table_proto_msgTypes[11]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -1431,7 +1505,7 @@ func (x *UpdateByWindowScale) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use UpdateByWindowScale.ProtoReflect.Descriptor instead.
 func (*UpdateByWindowScale) Descriptor() ([]byte, []int) {
-	return file_deephaven_proto_table_proto_rawDescGZIP(), []int{10}
+	return file_deephaven_core_proto_table_proto_rawDescGZIP(), []int{11}
 }
 
 func (m *UpdateByWindowScale) GetType() isUpdateByWindowScale_Type {
@@ -1488,7 +1562,7 @@ type UpdateByEmOptions struct {
 func (x *UpdateByEmOptions) Reset() {
 	*x = UpdateByEmOptions{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_deephaven_proto_table_proto_msgTypes[11]
+		mi := &file_deephaven_core_proto_table_proto_msgTypes[12]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -1501,7 +1575,7 @@ func (x *UpdateByEmOptions) String() string {
 func (*UpdateByEmOptions) ProtoMessage() {}
 
 func (x *UpdateByEmOptions) ProtoReflect() protoreflect.Message {
-	mi := &file_deephaven_proto_table_proto_msgTypes[11]
+	mi := &file_deephaven_core_proto_table_proto_msgTypes[12]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -1514,7 +1588,7 @@ func (x *UpdateByEmOptions) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use UpdateByEmOptions.ProtoReflect.Descriptor instead.
 func (*UpdateByEmOptions) Descriptor() ([]byte, []int) {
-	return file_deephaven_proto_table_proto_rawDescGZIP(), []int{11}
+	return file_deephaven_core_proto_table_proto_rawDescGZIP(), []int{12}
 }
 
 func (x *UpdateByEmOptions) GetOnNullValue() BadDataBehavior {
@@ -1571,7 +1645,7 @@ type UpdateByDeltaOptions struct {
 func (x *UpdateByDeltaOptions) Reset() {
 	*x = UpdateByDeltaOptions{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_deephaven_proto_table_proto_msgTypes[12]
+		mi := &file_deephaven_core_proto_table_proto_msgTypes[13]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -1584,7 +1658,7 @@ func (x *UpdateByDeltaOptions) String() string {
 func (*UpdateByDeltaOptions) ProtoMessage() {}
 
 func (x *UpdateByDeltaOptions) ProtoReflect() protoreflect.Message {
-	mi := &file_deephaven_proto_table_proto_msgTypes[12]
+	mi := &file_deephaven_core_proto_table_proto_msgTypes[13]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -1597,7 +1671,7 @@ func (x *UpdateByDeltaOptions) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use UpdateByDeltaOptions.ProtoReflect.Descriptor instead.
 func (*UpdateByDeltaOptions) Descriptor() ([]byte, []int) {
-	return file_deephaven_proto_table_proto_rawDescGZIP(), []int{12}
+	return file_deephaven_core_proto_table_proto_rawDescGZIP(), []int{13}
 }
 
 func (x *UpdateByDeltaOptions) GetNullBehavior() UpdateByNullBehavior {
@@ -1626,7 +1700,7 @@ type UpdateByRequest struct {
 func (x *UpdateByRequest) Reset() {
 	*x = UpdateByRequest{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_deephaven_proto_table_proto_msgTypes[13]
+		mi := &file_deephaven_core_proto_table_proto_msgTypes[14]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -1639,7 +1713,7 @@ func (x *UpdateByRequest) String() string {
 func (*UpdateByRequest) ProtoMessage() {}
 
 func (x *UpdateByRequest) ProtoReflect() protoreflect.Message {
-	mi := &file_deephaven_proto_table_proto_msgTypes[13]
+	mi := &file_deephaven_core_proto_table_proto_msgTypes[14]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -1652,7 +1726,7 @@ func (x *UpdateByRequest) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use UpdateByRequest.ProtoReflect.Descriptor instead.
 func (*UpdateByRequest) Descriptor() ([]byte, []int) {
-	return file_deephaven_proto_table_proto_rawDescGZIP(), []int{13}
+	return file_deephaven_core_proto_table_proto_rawDescGZIP(), []int{14}
 }
 
 func (x *UpdateByRequest) GetResultId() *ticket.Ticket {
@@ -1703,7 +1777,7 @@ type SelectDistinctRequest struct {
 func (x *SelectDistinctRequest) Reset() {
 	*x = SelectDistinctRequest{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_deephaven_proto_table_proto_msgTypes[14]
+		mi := &file_deephaven_core_proto_table_proto_msgTypes[15]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -1716,7 +1790,7 @@ func (x *SelectDistinctRequest) String() string {
 func (*SelectDistinctRequest) ProtoMessage() {}
 
 func (x *SelectDistinctRequest) ProtoReflect() protoreflect.Message {
-	mi := &file_deephaven_proto_table_proto_msgTypes[14]
+	mi := &file_deephaven_core_proto_table_proto_msgTypes[15]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -1729,7 +1803,7 @@ func (x *SelectDistinctRequest) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use SelectDistinctRequest.ProtoReflect.Descriptor instead.
 func (*SelectDistinctRequest) Descriptor() ([]byte, []int) {
-	return file_deephaven_proto_table_proto_rawDescGZIP(), []int{14}
+	return file_deephaven_core_proto_table_proto_rawDescGZIP(), []int{15}
 }
 
 func (x *SelectDistinctRequest) GetResultId() *ticket.Ticket {
@@ -1766,7 +1840,7 @@ type DropColumnsRequest struct {
 func (x *DropColumnsRequest) Reset() {
 	*x = DropColumnsRequest{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_deephaven_proto_table_proto_msgTypes[15]
+		mi := &file_deephaven_core_proto_table_proto_msgTypes[16]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -1779,7 +1853,7 @@ func (x *DropColumnsRequest) String() string {
 func (*DropColumnsRequest) ProtoMessage() {}
 
 func (x *DropColumnsRequest) ProtoReflect() protoreflect.Message {
-	mi := &file_deephaven_proto_table_proto_msgTypes[15]
+	mi := &file_deephaven_core_proto_table_proto_msgTypes[16]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -1792,7 +1866,7 @@ func (x *DropColumnsRequest) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use DropColumnsRequest.ProtoReflect.Descriptor instead.
 func (*DropColumnsRequest) Descriptor() ([]byte, []int) {
-	return file_deephaven_proto_table_proto_rawDescGZIP(), []int{15}
+	return file_deephaven_core_proto_table_proto_rawDescGZIP(), []int{16}
 }
 
 func (x *DropColumnsRequest) GetResultId() *ticket.Ticket {
@@ -1829,7 +1903,7 @@ type UnstructuredFilterTableRequest struct {
 func (x *UnstructuredFilterTableRequest) Reset() {
 	*x = UnstructuredFilterTableRequest{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_deephaven_proto_table_proto_msgTypes[16]
+		mi := &file_deephaven_core_proto_table_proto_msgTypes[17]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -1842,7 +1916,7 @@ func (x *UnstructuredFilterTableRequest) String() string {
 func (*UnstructuredFilterTableRequest) ProtoMessage() {}
 
 func (x *UnstructuredFilterTableRequest) ProtoReflect() protoreflect.Message {
-	mi := &file_deephaven_proto_table_proto_msgTypes[16]
+	mi := &file_deephaven_core_proto_table_proto_msgTypes[17]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -1855,7 +1929,7 @@ func (x *UnstructuredFilterTableRequest) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use UnstructuredFilterTableRequest.ProtoReflect.Descriptor instead.
 func (*UnstructuredFilterTableRequest) Descriptor() ([]byte, []int) {
-	return file_deephaven_proto_table_proto_rawDescGZIP(), []int{16}
+	return file_deephaven_core_proto_table_proto_rawDescGZIP(), []int{17}
 }
 
 func (x *UnstructuredFilterTableRequest) GetResultId() *ticket.Ticket {
@@ -1892,7 +1966,7 @@ type HeadOrTailRequest struct {
 func (x *HeadOrTailRequest) Reset() {
 	*x = HeadOrTailRequest{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_deephaven_proto_table_proto_msgTypes[17]
+		mi := &file_deephaven_core_proto_table_proto_msgTypes[18]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -1905,7 +1979,7 @@ func (x *HeadOrTailRequest) String() string {
 func (*HeadOrTailRequest) ProtoMessage() {}
 
 func (x *HeadOrTailRequest) ProtoReflect() protoreflect.Message {
-	mi := &file_deephaven_proto_table_proto_msgTypes[17]
+	mi := &file_deephaven_core_proto_table_proto_msgTypes[18]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -1918,7 +1992,7 @@ func (x *HeadOrTailRequest) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use HeadOrTailRequest.ProtoReflect.Descriptor instead.
 func (*HeadOrTailRequest) Descriptor() ([]byte, []int) {
-	return file_deephaven_proto_table_proto_rawDescGZIP(), []int{17}
+	return file_deephaven_core_proto_table_proto_rawDescGZIP(), []int{18}
 }
 
 func (x *HeadOrTailRequest) GetResultId() *ticket.Ticket {
@@ -1956,7 +2030,7 @@ type HeadOrTailByRequest struct {
 func (x *HeadOrTailByRequest) Reset() {
 	*x = HeadOrTailByRequest{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_deephaven_proto_table_proto_msgTypes[18]
+		mi := &file_deephaven_core_proto_table_proto_msgTypes[19]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -1969,7 +2043,7 @@ func (x *HeadOrTailByRequest) String() string {
 func (*HeadOrTailByRequest) ProtoMessage() {}
 
 func (x *HeadOrTailByRequest) ProtoReflect() protoreflect.Message {
-	mi := &file_deephaven_proto_table_proto_msgTypes[18]
+	mi := &file_deephaven_core_proto_table_proto_msgTypes[19]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -1982,7 +2056,7 @@ func (x *HeadOrTailByRequest) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use HeadOrTailByRequest.ProtoReflect.Descriptor instead.
 func (*HeadOrTailByRequest) Descriptor() ([]byte, []int) {
-	return file_deephaven_proto_table_proto_rawDescGZIP(), []int{18}
+	return file_deephaven_core_proto_table_proto_rawDescGZIP(), []int{19}
 }
 
 func (x *HeadOrTailByRequest) GetResultId() *ticket.Ticket {
@@ -2027,7 +2101,7 @@ type UngroupRequest struct {
 func (x *UngroupRequest) Reset() {
 	*x = UngroupRequest{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_deephaven_proto_table_proto_msgTypes[19]
+		mi := &file_deephaven_core_proto_table_proto_msgTypes[20]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -2040,7 +2114,7 @@ func (x *UngroupRequest) String() string {
 func (*UngroupRequest) ProtoMessage() {}
 
 func (x *UngroupRequest) ProtoReflect() protoreflect.Message {
-	mi := &file_deephaven_proto_table_proto_msgTypes[19]
+	mi := &file_deephaven_core_proto_table_proto_msgTypes[20]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -2053,7 +2127,7 @@ func (x *UngroupRequest) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use UngroupRequest.ProtoReflect.Descriptor instead.
 func (*UngroupRequest) Descriptor() ([]byte, []int) {
-	return file_deephaven_proto_table_proto_rawDescGZIP(), []int{19}
+	return file_deephaven_core_proto_table_proto_rawDescGZIP(), []int{20}
 }
 
 func (x *UngroupRequest) GetResultId() *ticket.Ticket {
@@ -2097,7 +2171,7 @@ type MergeTablesRequest struct {
 func (x *MergeTablesRequest) Reset() {
 	*x = MergeTablesRequest{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_deephaven_proto_table_proto_msgTypes[20]
+		mi := &file_deephaven_core_proto_table_proto_msgTypes[21]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -2110,7 +2184,7 @@ func (x *MergeTablesRequest) String() string {
 func (*MergeTablesRequest) ProtoMessage() {}
 
 func (x *MergeTablesRequest) ProtoReflect() protoreflect.Message {
-	mi := &file_deephaven_proto_table_proto_msgTypes[20]
+	mi := &file_deephaven_core_proto_table_proto_msgTypes[21]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -2123,7 +2197,7 @@ func (x *MergeTablesRequest) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use MergeTablesRequest.ProtoReflect.Descriptor instead.
 func (*MergeTablesRequest) Descriptor() ([]byte, []int) {
-	return file_deephaven_proto_table_proto_rawDescGZIP(), []int{20}
+	return file_deephaven_core_proto_table_proto_rawDescGZIP(), []int{21}
 }
 
 func (x *MergeTablesRequest) GetResultId() *ticket.Ticket {
@@ -2159,7 +2233,7 @@ type SnapshotTableRequest struct {
 func (x *SnapshotTableRequest) Reset() {
 	*x = SnapshotTableRequest{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_deephaven_proto_table_proto_msgTypes[21]
+		mi := &file_deephaven_core_proto_table_proto_msgTypes[22]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -2172,7 +2246,7 @@ func (x *SnapshotTableRequest) String() string {
 func (*SnapshotTableRequest) ProtoMessage() {}
 
 func (x *SnapshotTableRequest) ProtoReflect() protoreflect.Message {
-	mi := &file_deephaven_proto_table_proto_msgTypes[21]
+	mi := &file_deephaven_core_proto_table_proto_msgTypes[22]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -2185,7 +2259,7 @@ func (x *SnapshotTableRequest) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use SnapshotTableRequest.ProtoReflect.Descriptor instead.
 func (*SnapshotTableRequest) Descriptor() ([]byte, []int) {
-	return file_deephaven_proto_table_proto_rawDescGZIP(), []int{21}
+	return file_deephaven_core_proto_table_proto_rawDescGZIP(), []int{22}
 }
 
 func (x *SnapshotTableRequest) GetResultId() *ticket.Ticket {
@@ -2225,7 +2299,7 @@ type SnapshotWhenTableRequest struct {
 func (x *SnapshotWhenTableRequest) Reset() {
 	*x = SnapshotWhenTableRequest{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_deephaven_proto_table_proto_msgTypes[22]
+		mi := &file_deephaven_core_proto_table_proto_msgTypes[23]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -2238,7 +2312,7 @@ func (x *SnapshotWhenTableRequest) String() string {
 func (*SnapshotWhenTableRequest) ProtoMessage() {}
 
 func (x *SnapshotWhenTableRequest) ProtoReflect() protoreflect.Message {
-	mi := &file_deephaven_proto_table_proto_msgTypes[22]
+	mi := &file_deephaven_core_proto_table_proto_msgTypes[23]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -2251,7 +2325,7 @@ func (x *SnapshotWhenTableRequest) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use SnapshotWhenTableRequest.ProtoReflect.Descriptor instead.
 func (*SnapshotWhenTableRequest) Descriptor() ([]byte, []int) {
-	return file_deephaven_proto_table_proto_rawDescGZIP(), []int{22}
+	return file_deephaven_core_proto_table_proto_rawDescGZIP(), []int{23}
 }
 
 func (x *SnapshotWhenTableRequest) GetResultId() *ticket.Ticket {
@@ -2320,7 +2394,7 @@ type CrossJoinTablesRequest struct {
 func (x *CrossJoinTablesRequest) Reset() {
 	*x = CrossJoinTablesRequest{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_deephaven_proto_table_proto_msgTypes[23]
+		mi := &file_deephaven_core_proto_table_proto_msgTypes[24]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -2333,7 +2407,7 @@ func (x *CrossJoinTablesRequest) String() string {
 func (*CrossJoinTablesRequest) ProtoMessage() {}
 
 func (x *CrossJoinTablesRequest) ProtoReflect() protoreflect.Message {
-	mi := &file_deephaven_proto_table_proto_msgTypes[23]
+	mi := &file_deephaven_core_proto_table_proto_msgTypes[24]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -2346,7 +2420,7 @@ func (x *CrossJoinTablesRequest) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use CrossJoinTablesRequest.ProtoReflect.Descriptor instead.
 func (*CrossJoinTablesRequest) Descriptor() ([]byte, []int) {
-	return file_deephaven_proto_table_proto_rawDescGZIP(), []int{23}
+	return file_deephaven_core_proto_table_proto_rawDescGZIP(), []int{24}
 }
 
 func (x *CrossJoinTablesRequest) GetResultId() *ticket.Ticket {
@@ -2406,7 +2480,7 @@ type NaturalJoinTablesRequest struct {
 func (x *NaturalJoinTablesRequest) Reset() {
 	*x = NaturalJoinTablesRequest{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_deephaven_proto_table_proto_msgTypes[24]
+		mi := &file_deephaven_core_proto_table_proto_msgTypes[25]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -2419,7 +2493,7 @@ func (x *NaturalJoinTablesRequest) String() string {
 func (*NaturalJoinTablesRequest) ProtoMessage() {}
 
 func (x *NaturalJoinTablesRequest) ProtoReflect() protoreflect.Message {
-	mi := &file_deephaven_proto_table_proto_msgTypes[24]
+	mi := &file_deephaven_core_proto_table_proto_msgTypes[25]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -2432,7 +2506,7 @@ func (x *NaturalJoinTablesRequest) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use NaturalJoinTablesRequest.ProtoReflect.Descriptor instead.
 func (*NaturalJoinTablesRequest) Descriptor() ([]byte, []int) {
-	return file_deephaven_proto_table_proto_rawDescGZIP(), []int{24}
+	return file_deephaven_core_proto_table_proto_rawDescGZIP(), []int{25}
 }
 
 func (x *NaturalJoinTablesRequest) GetResultId() *ticket.Ticket {
@@ -2485,7 +2559,7 @@ type ExactJoinTablesRequest struct {
 func (x *ExactJoinTablesRequest) Reset() {
 	*x = ExactJoinTablesRequest{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_deephaven_proto_table_proto_msgTypes[25]
+		mi := &file_deephaven_core_proto_table_proto_msgTypes[26]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -2498,7 +2572,7 @@ func (x *ExactJoinTablesRequest) String() string {
 func (*ExactJoinTablesRequest) ProtoMessage() {}
 
 func (x *ExactJoinTablesRequest) ProtoReflect() protoreflect.Message {
-	mi := &file_deephaven_proto_table_proto_msgTypes[25]
+	mi := &file_deephaven_core_proto_table_proto_msgTypes[26]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -2511,7 +2585,7 @@ func (x *ExactJoinTablesRequest) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use ExactJoinTablesRequest.ProtoReflect.Descriptor instead.
 func (*ExactJoinTablesRequest) Descriptor() ([]byte, []int) {
-	return file_deephaven_proto_table_proto_rawDescGZIP(), []int{25}
+	return file_deephaven_core_proto_table_proto_rawDescGZIP(), []int{26}
 }
 
 func (x *ExactJoinTablesRequest) GetResultId() *ticket.Ticket {
@@ -2564,7 +2638,7 @@ type LeftJoinTablesRequest struct {
 func (x *LeftJoinTablesRequest) Reset() {
 	*x = LeftJoinTablesRequest{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_deephaven_proto_table_proto_msgTypes[26]
+		mi := &file_deephaven_core_proto_table_proto_msgTypes[27]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -2577,7 +2651,7 @@ func (x *LeftJoinTablesRequest) String() string {
 func (*LeftJoinTablesRequest) ProtoMessage() {}
 
 func (x *LeftJoinTablesRequest) ProtoReflect() protoreflect.Message {
-	mi := &file_deephaven_proto_table_proto_msgTypes[26]
+	mi := &file_deephaven_core_proto_table_proto_msgTypes[27]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -2590,7 +2664,7 @@ func (x *LeftJoinTablesRequest) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use LeftJoinTablesRequest.ProtoReflect.Descriptor instead.
 func (*LeftJoinTablesRequest) Descriptor() ([]byte, []int) {
-	return file_deephaven_proto_table_proto_rawDescGZIP(), []int{26}
+	return file_deephaven_core_proto_table_proto_rawDescGZIP(), []int{27}
 }
 
 func (x *LeftJoinTablesRequest) GetResultId() *ticket.Ticket {
@@ -2647,7 +2721,7 @@ type AsOfJoinTablesRequest struct {
 func (x *AsOfJoinTablesRequest) Reset() {
 	*x = AsOfJoinTablesRequest{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_deephaven_proto_table_proto_msgTypes[27]
+		mi := &file_deephaven_core_proto_table_proto_msgTypes[28]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -2660,7 +2734,7 @@ func (x *AsOfJoinTablesRequest) String() string {
 func (*AsOfJoinTablesRequest) ProtoMessage() {}
 
 func (x *AsOfJoinTablesRequest) ProtoReflect() protoreflect.Message {
-	mi := &file_deephaven_proto_table_proto_msgTypes[27]
+	mi := &file_deephaven_core_proto_table_proto_msgTypes[28]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -2673,7 +2747,7 @@ func (x *AsOfJoinTablesRequest) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use AsOfJoinTablesRequest.ProtoReflect.Descriptor instead.
 func (*AsOfJoinTablesRequest) Descriptor() ([]byte, []int) {
-	return file_deephaven_proto_table_proto_rawDescGZIP(), []int{27}
+	return file_deephaven_core_proto_table_proto_rawDescGZIP(), []int{28}
 }
 
 func (x *AsOfJoinTablesRequest) GetResultId() *ticket.Ticket {
@@ -2739,7 +2813,7 @@ type AjRajTablesRequest struct {
 func (x *AjRajTablesRequest) Reset() {
 	*x = AjRajTablesRequest{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_deephaven_proto_table_proto_msgTypes[28]
+		mi := &file_deephaven_core_proto_table_proto_msgTypes[29]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -2752,7 +2826,7 @@ func (x *AjRajTablesRequest) String() string {
 func (*AjRajTablesRequest) ProtoMessage() {}
 
 func (x *AjRajTablesRequest) ProtoReflect() protoreflect.Message {
-	mi := &file_deephaven_proto_table_proto_msgTypes[28]
+	mi := &file_deephaven_core_proto_table_proto_msgTypes[29]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -2765,7 +2839,7 @@ func (x *AjRajTablesRequest) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use AjRajTablesRequest.ProtoReflect.Descriptor instead.
 func (*AjRajTablesRequest) Descriptor() ([]byte, []int) {
-	return file_deephaven_proto_table_proto_rawDescGZIP(), []int{28}
+	return file_deephaven_core_proto_table_proto_rawDescGZIP(), []int{29}
 }
 
 func (x *AjRajTablesRequest) GetResultId() *ticket.Ticket {
@@ -2826,7 +2900,7 @@ type MultiJoinInput struct {
 func (x *MultiJoinInput) Reset() {
 	*x = MultiJoinInput{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_deephaven_proto_table_proto_msgTypes[29]
+		mi := &file_deephaven_core_proto_table_proto_msgTypes[30]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -2839,7 +2913,7 @@ func (x *MultiJoinInput) String() string {
 func (*MultiJoinInput) ProtoMessage() {}
 
 func (x *MultiJoinInput) ProtoReflect() protoreflect.Message {
-	mi := &file_deephaven_proto_table_proto_msgTypes[29]
+	mi := &file_deephaven_core_proto_table_proto_msgTypes[30]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -2852,7 +2926,7 @@ func (x *MultiJoinInput) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use MultiJoinInput.ProtoReflect.Descriptor instead.
 func (*MultiJoinInput) Descriptor() ([]byte, []int) {
-	return file_deephaven_proto_table_proto_rawDescGZIP(), []int{29}
+	return file_deephaven_core_proto_table_proto_rawDescGZIP(), []int{30}
 }
 
 func (x *MultiJoinInput) GetSourceId() *TableReference {
@@ -2889,7 +2963,7 @@ type MultiJoinTablesRequest struct {
 func (x *MultiJoinTablesRequest) Reset() {
 	*x = MultiJoinTablesRequest{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_deephaven_proto_table_proto_msgTypes[30]
+		mi := &file_deephaven_core_proto_table_proto_msgTypes[31]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -2902,7 +2976,7 @@ func (x *MultiJoinTablesRequest) String() string {
 func (*MultiJoinTablesRequest) ProtoMessage() {}
 
 func (x *MultiJoinTablesRequest) ProtoReflect() protoreflect.Message {
-	mi := &file_deephaven_proto_table_proto_msgTypes[30]
+	mi := &file_deephaven_core_proto_table_proto_msgTypes[31]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -2915,7 +2989,7 @@ func (x *MultiJoinTablesRequest) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use MultiJoinTablesRequest.ProtoReflect.Descriptor instead.
 func (*MultiJoinTablesRequest) Descriptor() ([]byte, []int) {
-	return file_deephaven_proto_table_proto_rawDescGZIP(), []int{30}
+	return file_deephaven_core_proto_table_proto_rawDescGZIP(), []int{31}
 }
 
 func (x *MultiJoinTablesRequest) GetResultId() *ticket.Ticket {
@@ -2957,7 +3031,7 @@ type RangeJoinTablesRequest struct {
 func (x *RangeJoinTablesRequest) Reset() {
 	*x = RangeJoinTablesRequest{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_deephaven_proto_table_proto_msgTypes[31]
+		mi := &file_deephaven_core_proto_table_proto_msgTypes[32]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -2970,7 +3044,7 @@ func (x *RangeJoinTablesRequest) String() string {
 func (*RangeJoinTablesRequest) ProtoMessage() {}
 
 func (x *RangeJoinTablesRequest) ProtoReflect() protoreflect.Message {
-	mi := &file_deephaven_proto_table_proto_msgTypes[31]
+	mi := &file_deephaven_core_proto_table_proto_msgTypes[32]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -2983,7 +3057,7 @@ func (x *RangeJoinTablesRequest) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use RangeJoinTablesRequest.ProtoReflect.Descriptor instead.
 func (*RangeJoinTablesRequest) Descriptor() ([]byte, []int) {
-	return file_deephaven_proto_table_proto_rawDescGZIP(), []int{31}
+	return file_deephaven_core_proto_table_proto_rawDescGZIP(), []int{32}
 }
 
 func (x *RangeJoinTablesRequest) GetResultId() *ticket.Ticket {
@@ -3079,7 +3153,7 @@ type ComboAggregateRequest struct {
 func (x *ComboAggregateRequest) Reset() {
 	*x = ComboAggregateRequest{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_deephaven_proto_table_proto_msgTypes[32]
+		mi := &file_deephaven_core_proto_table_proto_msgTypes[33]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -3092,7 +3166,7 @@ func (x *ComboAggregateRequest) String() string {
 func (*ComboAggregateRequest) ProtoMessage() {}
 
 func (x *ComboAggregateRequest) ProtoReflect() protoreflect.Message {
-	mi := &file_deephaven_proto_table_proto_msgTypes[32]
+	mi := &file_deephaven_core_proto_table_proto_msgTypes[33]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -3105,7 +3179,7 @@ func (x *ComboAggregateRequest) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use ComboAggregateRequest.ProtoReflect.Descriptor instead.
 func (*ComboAggregateRequest) Descriptor() ([]byte, []int) {
-	return file_deephaven_proto_table_proto_rawDescGZIP(), []int{32}
+	return file_deephaven_core_proto_table_proto_rawDescGZIP(), []int{33}
 }
 
 func (x *ComboAggregateRequest) GetResultId() *ticket.Ticket {
@@ -3157,7 +3231,7 @@ type AggregateAllRequest struct {
 func (x *AggregateAllRequest) Reset() {
 	*x = AggregateAllRequest{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_deephaven_proto_table_proto_msgTypes[33]
+		mi := &file_deephaven_core_proto_table_proto_msgTypes[34]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -3170,7 +3244,7 @@ func (x *AggregateAllRequest) String() string {
 func (*AggregateAllRequest) ProtoMessage() {}
 
 func (x *AggregateAllRequest) ProtoReflect() protoreflect.Message {
-	mi := &file_deephaven_proto_table_proto_msgTypes[33]
+	mi := &file_deephaven_core_proto_table_proto_msgTypes[34]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -3183,7 +3257,7 @@ func (x *AggregateAllRequest) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use AggregateAllRequest.ProtoReflect.Descriptor instead.
 func (*AggregateAllRequest) Descriptor() ([]byte, []int) {
-	return file_deephaven_proto_table_proto_rawDescGZIP(), []int{33}
+	return file_deephaven_core_proto_table_proto_rawDescGZIP(), []int{34}
 }
 
 func (x *AggregateAllRequest) GetResultId() *ticket.Ticket {
@@ -3249,7 +3323,7 @@ type AggSpec struct {
 func (x *AggSpec) Reset() {
 	*x = AggSpec{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_deephaven_proto_table_proto_msgTypes[34]
+		mi := &file_deephaven_core_proto_table_proto_msgTypes[35]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -3262,7 +3336,7 @@ func (x *AggSpec) String() string {
 func (*AggSpec) ProtoMessage() {}
 
 func (x *AggSpec) ProtoReflect() protoreflect.Message {
-	mi := &file_deephaven_proto_table_proto_msgTypes[34]
+	mi := &file_deephaven_core_proto_table_proto_msgTypes[35]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -3275,7 +3349,7 @@ func (x *AggSpec) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use AggSpec.ProtoReflect.Descriptor instead.
 func (*AggSpec) Descriptor() ([]byte, []int) {
-	return file_deephaven_proto_table_proto_rawDescGZIP(), []int{34}
+	return file_deephaven_core_proto_table_proto_rawDescGZIP(), []int{35}
 }
 
 func (m *AggSpec) GetType() isAggSpec_Type {
@@ -3613,7 +3687,7 @@ type AggregateRequest struct {
 func (x *AggregateRequest) Reset() {
 	*x = AggregateRequest{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_deephaven_proto_table_proto_msgTypes[35]
+		mi := &file_deephaven_core_proto_table_proto_msgTypes[36]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -3626,7 +3700,7 @@ func (x *AggregateRequest) String() string {
 func (*AggregateRequest) ProtoMessage() {}
 
 func (x *AggregateRequest) ProtoReflect() protoreflect.Message {
-	mi := &file_deephaven_proto_table_proto_msgTypes[35]
+	mi := &file_deephaven_core_proto_table_proto_msgTypes[36]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -3639,7 +3713,7 @@ func (x *AggregateRequest) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use AggregateRequest.ProtoReflect.Descriptor instead.
 func (*AggregateRequest) Descriptor() ([]byte, []int) {
-	return file_deephaven_proto_table_proto_rawDescGZIP(), []int{35}
+	return file_deephaven_core_proto_table_proto_rawDescGZIP(), []int{36}
 }
 
 func (x *AggregateRequest) GetResultId() *ticket.Ticket {
@@ -3695,13 +3769,15 @@ type Aggregation struct {
 	//	*Aggregation_FirstRowKey
 	//	*Aggregation_LastRowKey
 	//	*Aggregation_Partition
+	//	*Aggregation_Formula
+	//	*Aggregation_CountWhere
 	Type isAggregation_Type `protobuf_oneof:"type"`
 }
 
 func (x *Aggregation) Reset() {
 	*x = Aggregation{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_deephaven_proto_table_proto_msgTypes[36]
+		mi := &file_deephaven_core_proto_table_proto_msgTypes[37]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -3714,7 +3790,7 @@ func (x *Aggregation) String() string {
 func (*Aggregation) ProtoMessage() {}
 
 func (x *Aggregation) ProtoReflect() protoreflect.Message {
-	mi := &file_deephaven_proto_table_proto_msgTypes[36]
+	mi := &file_deephaven_core_proto_table_proto_msgTypes[37]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -3727,7 +3803,7 @@ func (x *Aggregation) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use Aggregation.ProtoReflect.Descriptor instead.
 func (*Aggregation) Descriptor() ([]byte, []int) {
-	return file_deephaven_proto_table_proto_rawDescGZIP(), []int{36}
+	return file_deephaven_core_proto_table_proto_rawDescGZIP(), []int{37}
 }
 
 func (m *Aggregation) GetType() isAggregation_Type {
@@ -3772,6 +3848,20 @@ func (x *Aggregation) GetPartition() *Aggregation_AggregationPartition {
 	return nil
 }
 
+func (x *Aggregation) GetFormula() *Aggregation_AggregationFormula {
+	if x, ok := x.GetType().(*Aggregation_Formula); ok {
+		return x.Formula
+	}
+	return nil
+}
+
+func (x *Aggregation) GetCountWhere() *Aggregation_AggregationCountWhere {
+	if x, ok := x.GetType().(*Aggregation_CountWhere); ok {
+		return x.CountWhere
+	}
+	return nil
+}
+
 type isAggregation_Type interface {
 	isAggregation_Type()
 }
@@ -3796,6 +3886,14 @@ type Aggregation_Partition struct {
 	Partition *Aggregation_AggregationPartition `protobuf:"bytes,5,opt,name=partition,proto3,oneof"`
 }
 
+type Aggregation_Formula struct {
+	Formula *Aggregation_AggregationFormula `protobuf:"bytes,6,opt,name=formula,proto3,oneof"`
+}
+
+type Aggregation_CountWhere struct {
+	CountWhere *Aggregation_AggregationCountWhere `protobuf:"bytes,7,opt,name=count_where,json=countWhere,proto3,oneof"`
+}
+
 func (*Aggregation_Columns) isAggregation_Type() {}
 
 func (*Aggregation_Count) isAggregation_Type() {}
@@ -3806,6 +3904,10 @@ func (*Aggregation_LastRowKey) isAggregation_Type() {}
 
 func (*Aggregation_Partition) isAggregation_Type() {}
 
+func (*Aggregation_Formula) isAggregation_Type() {}
+
+func (*Aggregation_CountWhere) isAggregation_Type() {}
+
 type SortDescriptor struct {
 	state         protoimpl.MessageState
 	sizeCache     protoimpl.SizeCache
@@ -3819,7 +3921,7 @@ type SortDescriptor struct {
 func (x *SortDescriptor) Reset() {
 	*x = SortDescriptor{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_deephaven_proto_table_proto_msgTypes[37]
+		mi := &file_deephaven_core_proto_table_proto_msgTypes[38]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -3832,7 +3934,7 @@ func (x *SortDescriptor) String() string {
 func (*SortDescriptor) ProtoMessage() {}
 
 func (x *SortDescriptor) ProtoReflect() protoreflect.Message {
-	mi := &file_deephaven_proto_table_proto_msgTypes[37]
+	mi := &file_deephaven_core_proto_table_proto_msgTypes[38]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -3845,7 +3947,7 @@ func (x *SortDescriptor) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use SortDescriptor.ProtoReflect.Descriptor instead.
 func (*SortDescriptor) Descriptor() ([]byte, []int) {
-	return file_deephaven_proto_table_proto_rawDescGZIP(), []int{37}
+	return file_deephaven_core_proto_table_proto_rawDescGZIP(), []int{38}
 }
 
 func (x *SortDescriptor) GetColumnName() string {
@@ -3882,7 +3984,7 @@ type SortTableRequest struct {
 func (x *SortTableRequest) Reset() {
 	*x = SortTableRequest{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_deephaven_proto_table_proto_msgTypes[38]
+		mi := &file_deephaven_core_proto_table_proto_msgTypes[39]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -3895,7 +3997,7 @@ func (x *SortTableRequest) String() string {
 func (*SortTableRequest) ProtoMessage() {}
 
 func (x *SortTableRequest) ProtoReflect() protoreflect.Message {
-	mi := &file_deephaven_proto_table_proto_msgTypes[38]
+	mi := &file_deephaven_core_proto_table_proto_msgTypes[39]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -3908,7 +4010,7 @@ func (x *SortTableRequest) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use SortTableRequest.ProtoReflect.Descriptor instead.
 func (*SortTableRequest) Descriptor() ([]byte, []int) {
-	return file_deephaven_proto_table_proto_rawDescGZIP(), []int{38}
+	return file_deephaven_core_proto_table_proto_rawDescGZIP(), []int{39}
 }
 
 func (x *SortTableRequest) GetResultId() *ticket.Ticket {
@@ -3945,7 +4047,7 @@ type FilterTableRequest struct {
 func (x *FilterTableRequest) Reset() {
 	*x = FilterTableRequest{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_deephaven_proto_table_proto_msgTypes[39]
+		mi := &file_deephaven_core_proto_table_proto_msgTypes[40]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -3958,7 +4060,7 @@ func (x *FilterTableRequest) String() string {
 func (*FilterTableRequest) ProtoMessage() {}
 
 func (x *FilterTableRequest) ProtoReflect() protoreflect.Message {
-	mi := &file_deephaven_proto_table_proto_msgTypes[39]
+	mi := &file_deephaven_core_proto_table_proto_msgTypes[40]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -3971,7 +4073,7 @@ func (x *FilterTableRequest) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use FilterTableRequest.ProtoReflect.Descriptor instead.
 func (*FilterTableRequest) Descriptor() ([]byte, []int) {
-	return file_deephaven_proto_table_proto_rawDescGZIP(), []int{39}
+	return file_deephaven_core_proto_table_proto_rawDescGZIP(), []int{40}
 }
 
 func (x *FilterTableRequest) GetResultId() *ticket.Ticket {
@@ -4012,7 +4114,7 @@ type SeekRowRequest struct {
 func (x *SeekRowRequest) Reset() {
 	*x = SeekRowRequest{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_deephaven_proto_table_proto_msgTypes[40]
+		mi := &file_deephaven_core_proto_table_proto_msgTypes[41]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -4025,7 +4127,7 @@ func (x *SeekRowRequest) String() string {
 func (*SeekRowRequest) ProtoMessage() {}
 
 func (x *SeekRowRequest) ProtoReflect() protoreflect.Message {
-	mi := &file_deephaven_proto_table_proto_msgTypes[40]
+	mi := &file_deephaven_core_proto_table_proto_msgTypes[41]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -4038,7 +4140,7 @@ func (x *SeekRowRequest) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use SeekRowRequest.ProtoReflect.Descriptor instead.
 func (*SeekRowRequest) Descriptor() ([]byte, []int) {
-	return file_deephaven_proto_table_proto_rawDescGZIP(), []int{40}
+	return file_deephaven_core_proto_table_proto_rawDescGZIP(), []int{41}
 }
 
 func (x *SeekRowRequest) GetSourceId() *ticket.Ticket {
@@ -4101,7 +4203,7 @@ type SeekRowResponse struct {
 func (x *SeekRowResponse) Reset() {
 	*x = SeekRowResponse{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_deephaven_proto_table_proto_msgTypes[41]
+		mi := &file_deephaven_core_proto_table_proto_msgTypes[42]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -4114,7 +4216,7 @@ func (x *SeekRowResponse) String() string {
 func (*SeekRowResponse) ProtoMessage() {}
 
 func (x *SeekRowResponse) ProtoReflect() protoreflect.Message {
-	mi := &file_deephaven_proto_table_proto_msgTypes[41]
+	mi := &file_deephaven_core_proto_table_proto_msgTypes[42]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -4127,7 +4229,7 @@ func (x *SeekRowResponse) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use SeekRowResponse.ProtoReflect.Descriptor instead.
 func (*SeekRowResponse) Descriptor() ([]byte, []int) {
-	return file_deephaven_proto_table_proto_rawDescGZIP(), []int{41}
+	return file_deephaven_core_proto_table_proto_rawDescGZIP(), []int{42}
 }
 
 func (x *SeekRowResponse) GetResultRow() int64 {
@@ -4148,7 +4250,7 @@ type Reference struct {
 func (x *Reference) Reset() {
 	*x = Reference{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_deephaven_proto_table_proto_msgTypes[42]
+		mi := &file_deephaven_core_proto_table_proto_msgTypes[43]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -4161,7 +4263,7 @@ func (x *Reference) String() string {
 func (*Reference) ProtoMessage() {}
 
 func (x *Reference) ProtoReflect() protoreflect.Message {
-	mi := &file_deephaven_proto_table_proto_msgTypes[42]
+	mi := &file_deephaven_core_proto_table_proto_msgTypes[43]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -4174,7 +4276,7 @@ func (x *Reference) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use Reference.ProtoReflect.Descriptor instead.
 func (*Reference) Descriptor() ([]byte, []int) {
-	return file_deephaven_proto_table_proto_rawDescGZIP(), []int{42}
+	return file_deephaven_core_proto_table_proto_rawDescGZIP(), []int{43}
 }
 
 func (x *Reference) GetColumnName() string {
@@ -4201,7 +4303,7 @@ type Literal struct {
 func (x *Literal) Reset() {
 	*x = Literal{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_deephaven_proto_table_proto_msgTypes[43]
+		mi := &file_deephaven_core_proto_table_proto_msgTypes[44]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -4214,7 +4316,7 @@ func (x *Literal) String() string {
 func (*Literal) ProtoMessage() {}
 
 func (x *Literal) ProtoReflect() protoreflect.Message {
-	mi := &file_deephaven_proto_table_proto_msgTypes[43]
+	mi := &file_deephaven_core_proto_table_proto_msgTypes[44]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -4227,7 +4329,7 @@ func (x *Literal) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use Literal.ProtoReflect.Descriptor instead.
 func (*Literal) Descriptor() ([]byte, []int) {
-	return file_deephaven_proto_table_proto_rawDescGZIP(), []int{43}
+	return file_deephaven_core_proto_table_proto_rawDescGZIP(), []int{44}
 }
 
 func (m *Literal) GetValue() isLiteral_Value {
@@ -4321,7 +4423,7 @@ type Value struct {
 func (x *Value) Reset() {
 	*x = Value{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_deephaven_proto_table_proto_msgTypes[44]
+		mi := &file_deephaven_core_proto_table_proto_msgTypes[45]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -4334,7 +4436,7 @@ func (x *Value) String() string {
 func (*Value) ProtoMessage() {}
 
 func (x *Value) ProtoReflect() protoreflect.Message {
-	mi := &file_deephaven_proto_table_proto_msgTypes[44]
+	mi := &file_deephaven_core_proto_table_proto_msgTypes[45]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -4347,7 +4449,7 @@ func (x *Value) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use Value.ProtoReflect.Descriptor instead.
 func (*Value) Descriptor() ([]byte, []int) {
-	return file_deephaven_proto_table_proto_rawDescGZIP(), []int{44}
+	return file_deephaven_core_proto_table_proto_rawDescGZIP(), []int{45}
 }
 
 func (m *Value) GetData() isValue_Data {
@@ -4409,7 +4511,7 @@ type Condition struct {
 func (x *Condition) Reset() {
 	*x = Condition{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_deephaven_proto_table_proto_msgTypes[45]
+		mi := &file_deephaven_core_proto_table_proto_msgTypes[46]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -4422,7 +4524,7 @@ func (x *Condition) String() string {
 func (*Condition) ProtoMessage() {}
 
 func (x *Condition) ProtoReflect() protoreflect.Message {
-	mi := &file_deephaven_proto_table_proto_msgTypes[45]
+	mi := &file_deephaven_core_proto_table_proto_msgTypes[46]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -4435,7 +4537,7 @@ func (x *Condition) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use Condition.ProtoReflect.Descriptor instead.
 func (*Condition) Descriptor() ([]byte, []int) {
-	return file_deephaven_proto_table_proto_rawDescGZIP(), []int{45}
+	return file_deephaven_core_proto_table_proto_rawDescGZIP(), []int{46}
 }
 
 func (m *Condition) GetData() isCondition_Data {
@@ -4591,7 +4693,7 @@ type AndCondition struct {
 func (x *AndCondition) Reset() {
 	*x = AndCondition{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_deephaven_proto_table_proto_msgTypes[46]
+		mi := &file_deephaven_core_proto_table_proto_msgTypes[47]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -4604,7 +4706,7 @@ func (x *AndCondition) String() string {
 func (*AndCondition) ProtoMessage() {}
 
 func (x *AndCondition) ProtoReflect() protoreflect.Message {
-	mi := &file_deephaven_proto_table_proto_msgTypes[46]
+	mi := &file_deephaven_core_proto_table_proto_msgTypes[47]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -4617,7 +4719,7 @@ func (x *AndCondition) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use AndCondition.ProtoReflect.Descriptor instead.
 func (*AndCondition) Descriptor() ([]byte, []int) {
-	return file_deephaven_proto_table_proto_rawDescGZIP(), []int{46}
+	return file_deephaven_core_proto_table_proto_rawDescGZIP(), []int{47}
 }
 
 func (x *AndCondition) GetFilters() []*Condition {
@@ -4638,7 +4740,7 @@ type OrCondition struct {
 func (x *OrCondition) Reset() {
 	*x = OrCondition{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_deephaven_proto_table_proto_msgTypes[47]
+		mi := &file_deephaven_core_proto_table_proto_msgTypes[48]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -4651,7 +4753,7 @@ func (x *OrCondition) String() string {
 func (*OrCondition) ProtoMessage() {}
 
 func (x *OrCondition) ProtoReflect() protoreflect.Message {
-	mi := &file_deephaven_proto_table_proto_msgTypes[47]
+	mi := &file_deephaven_core_proto_table_proto_msgTypes[48]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -4664,7 +4766,7 @@ func (x *OrCondition) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use OrCondition.ProtoReflect.Descriptor instead.
 func (*OrCondition) Descriptor() ([]byte, []int) {
-	return file_deephaven_proto_table_proto_rawDescGZIP(), []int{47}
+	return file_deephaven_core_proto_table_proto_rawDescGZIP(), []int{48}
 }
 
 func (x *OrCondition) GetFilters() []*Condition {
@@ -4685,7 +4787,7 @@ type NotCondition struct {
 func (x *NotCondition) Reset() {
 	*x = NotCondition{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_deephaven_proto_table_proto_msgTypes[48]
+		mi := &file_deephaven_core_proto_table_proto_msgTypes[49]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -4698,7 +4800,7 @@ func (x *NotCondition) String() string {
 func (*NotCondition) ProtoMessage() {}
 
 func (x *NotCondition) ProtoReflect() protoreflect.Message {
-	mi := &file_deephaven_proto_table_proto_msgTypes[48]
+	mi := &file_deephaven_core_proto_table_proto_msgTypes[49]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -4711,7 +4813,7 @@ func (x *NotCondition) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use NotCondition.ProtoReflect.Descriptor instead.
 func (*NotCondition) Descriptor() ([]byte, []int) {
-	return file_deephaven_proto_table_proto_rawDescGZIP(), []int{48}
+	return file_deephaven_core_proto_table_proto_rawDescGZIP(), []int{49}
 }
 
 func (x *NotCondition) GetFilter() *Condition {
@@ -4735,7 +4837,7 @@ type CompareCondition struct {
 func (x *CompareCondition) Reset() {
 	*x = CompareCondition{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_deephaven_proto_table_proto_msgTypes[49]
+		mi := &file_deephaven_core_proto_table_proto_msgTypes[50]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -4748,7 +4850,7 @@ func (x *CompareCondition) String() string {
 func (*CompareCondition) ProtoMessage() {}
 
 func (x *CompareCondition) ProtoReflect() protoreflect.Message {
-	mi := &file_deephaven_proto_table_proto_msgTypes[49]
+	mi := &file_deephaven_core_proto_table_proto_msgTypes[50]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -4761,7 +4863,7 @@ func (x *CompareCondition) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use CompareCondition.ProtoReflect.Descriptor instead.
 func (*CompareCondition) Descriptor() ([]byte, []int) {
-	return file_deephaven_proto_table_proto_rawDescGZIP(), []int{49}
+	return file_deephaven_core_proto_table_proto_rawDescGZIP(), []int{50}
 }
 
 func (x *CompareCondition) GetOperation() CompareCondition_CompareOperation {
@@ -4806,7 +4908,7 @@ type InCondition struct {
 func (x *InCondition) Reset() {
 	*x = InCondition{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_deephaven_proto_table_proto_msgTypes[50]
+		mi := &file_deephaven_core_proto_table_proto_msgTypes[51]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -4819,7 +4921,7 @@ func (x *InCondition) String() string {
 func (*InCondition) ProtoMessage() {}
 
 func (x *InCondition) ProtoReflect() protoreflect.Message {
-	mi := &file_deephaven_proto_table_proto_msgTypes[50]
+	mi := &file_deephaven_core_proto_table_proto_msgTypes[51]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -4832,7 +4934,7 @@ func (x *InCondition) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use InCondition.ProtoReflect.Descriptor instead.
 func (*InCondition) Descriptor() ([]byte, []int) {
-	return file_deephaven_proto_table_proto_rawDescGZIP(), []int{50}
+	return file_deephaven_core_proto_table_proto_rawDescGZIP(), []int{51}
 }
 
 func (x *InCondition) GetTarget() *Value {
@@ -4876,7 +4978,7 @@ type InvokeCondition struct {
 func (x *InvokeCondition) Reset() {
 	*x = InvokeCondition{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_deephaven_proto_table_proto_msgTypes[51]
+		mi := &file_deephaven_core_proto_table_proto_msgTypes[52]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -4889,7 +4991,7 @@ func (x *InvokeCondition) String() string {
 func (*InvokeCondition) ProtoMessage() {}
 
 func (x *InvokeCondition) ProtoReflect() protoreflect.Message {
-	mi := &file_deephaven_proto_table_proto_msgTypes[51]
+	mi := &file_deephaven_core_proto_table_proto_msgTypes[52]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -4902,7 +5004,7 @@ func (x *InvokeCondition) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use InvokeCondition.ProtoReflect.Descriptor instead.
 func (*InvokeCondition) Descriptor() ([]byte, []int) {
-	return file_deephaven_proto_table_proto_rawDescGZIP(), []int{51}
+	return file_deephaven_core_proto_table_proto_rawDescGZIP(), []int{52}
 }
 
 func (x *InvokeCondition) GetMethod() string {
@@ -4937,7 +5039,7 @@ type IsNullCondition struct {
 func (x *IsNullCondition) Reset() {
 	*x = IsNullCondition{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_deephaven_proto_table_proto_msgTypes[52]
+		mi := &file_deephaven_core_proto_table_proto_msgTypes[53]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -4950,7 +5052,7 @@ func (x *IsNullCondition) String() string {
 func (*IsNullCondition) ProtoMessage() {}
 
 func (x *IsNullCondition) ProtoReflect() protoreflect.Message {
-	mi := &file_deephaven_proto_table_proto_msgTypes[52]
+	mi := &file_deephaven_core_proto_table_proto_msgTypes[53]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -4963,7 +5065,7 @@ func (x *IsNullCondition) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use IsNullCondition.ProtoReflect.Descriptor instead.
 func (*IsNullCondition) Descriptor() ([]byte, []int) {
-	return file_deephaven_proto_table_proto_rawDescGZIP(), []int{52}
+	return file_deephaven_core_proto_table_proto_rawDescGZIP(), []int{53}
 }
 
 func (x *IsNullCondition) GetReference() *Reference {
@@ -4987,7 +5089,7 @@ type MatchesCondition struct {
 func (x *MatchesCondition) Reset() {
 	*x = MatchesCondition{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_deephaven_proto_table_proto_msgTypes[53]
+		mi := &file_deephaven_core_proto_table_proto_msgTypes[54]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -5000,7 +5102,7 @@ func (x *MatchesCondition) String() string {
 func (*MatchesCondition) ProtoMessage() {}
 
 func (x *MatchesCondition) ProtoReflect() protoreflect.Message {
-	mi := &file_deephaven_proto_table_proto_msgTypes[53]
+	mi := &file_deephaven_core_proto_table_proto_msgTypes[54]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -5013,7 +5115,7 @@ func (x *MatchesCondition) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use MatchesCondition.ProtoReflect.Descriptor instead.
 func (*MatchesCondition) Descriptor() ([]byte, []int) {
-	return file_deephaven_proto_table_proto_rawDescGZIP(), []int{53}
+	return file_deephaven_core_proto_table_proto_rawDescGZIP(), []int{54}
 }
 
 func (x *MatchesCondition) GetReference() *Reference {
@@ -5058,7 +5160,7 @@ type ContainsCondition struct {
 func (x *ContainsCondition) Reset() {
 	*x = ContainsCondition{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_deephaven_proto_table_proto_msgTypes[54]
+		mi := &file_deephaven_core_proto_table_proto_msgTypes[55]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -5071,7 +5173,7 @@ func (x *ContainsCondition) String() string {
 func (*ContainsCondition) ProtoMessage() {}
 
 func (x *ContainsCondition) ProtoReflect() protoreflect.Message {
-	mi := &file_deephaven_proto_table_proto_msgTypes[54]
+	mi := &file_deephaven_core_proto_table_proto_msgTypes[55]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -5084,7 +5186,7 @@ func (x *ContainsCondition) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use ContainsCondition.ProtoReflect.Descriptor instead.
 func (*ContainsCondition) Descriptor() ([]byte, []int) {
-	return file_deephaven_proto_table_proto_rawDescGZIP(), []int{54}
+	return file_deephaven_core_proto_table_proto_rawDescGZIP(), []int{55}
 }
 
 func (x *ContainsCondition) GetReference() *Reference {
@@ -5128,7 +5230,7 @@ type SearchCondition struct {
 func (x *SearchCondition) Reset() {
 	*x = SearchCondition{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_deephaven_proto_table_proto_msgTypes[55]
+		mi := &file_deephaven_core_proto_table_proto_msgTypes[56]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -5141,7 +5243,7 @@ func (x *SearchCondition) String() string {
 func (*SearchCondition) ProtoMessage() {}
 
 func (x *SearchCondition) ProtoReflect() protoreflect.Message {
-	mi := &file_deephaven_proto_table_proto_msgTypes[55]
+	mi := &file_deephaven_core_proto_table_proto_msgTypes[56]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -5154,7 +5256,7 @@ func (x *SearchCondition) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use SearchCondition.ProtoReflect.Descriptor instead.
 func (*SearchCondition) Descriptor() ([]byte, []int) {
-	return file_deephaven_proto_table_proto_rawDescGZIP(), []int{55}
+	return file_deephaven_core_proto_table_proto_rawDescGZIP(), []int{56}
 }
 
 func (x *SearchCondition) GetSearchString() string {
@@ -5183,7 +5285,7 @@ type FlattenRequest struct {
 func (x *FlattenRequest) Reset() {
 	*x = FlattenRequest{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_deephaven_proto_table_proto_msgTypes[56]
+		mi := &file_deephaven_core_proto_table_proto_msgTypes[57]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -5196,7 +5298,7 @@ func (x *FlattenRequest) String() string {
 func (*FlattenRequest) ProtoMessage() {}
 
 func (x *FlattenRequest) ProtoReflect() protoreflect.Message {
-	mi := &file_deephaven_proto_table_proto_msgTypes[56]
+	mi := &file_deephaven_core_proto_table_proto_msgTypes[57]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -5209,7 +5311,7 @@ func (x *FlattenRequest) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use FlattenRequest.ProtoReflect.Descriptor instead.
 func (*FlattenRequest) Descriptor() ([]byte, []int) {
-	return file_deephaven_proto_table_proto_rawDescGZIP(), []int{56}
+	return file_deephaven_core_proto_table_proto_rawDescGZIP(), []int{57}
 }
 
 func (x *FlattenRequest) GetResultId() *ticket.Ticket {
@@ -5238,7 +5340,7 @@ type MetaTableRequest struct {
 func (x *MetaTableRequest) Reset() {
 	*x = MetaTableRequest{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_deephaven_proto_table_proto_msgTypes[57]
+		mi := &file_deephaven_core_proto_table_proto_msgTypes[58]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -5251,7 +5353,7 @@ func (x *MetaTableRequest) String() string {
 func (*MetaTableRequest) ProtoMessage() {}
 
 func (x *MetaTableRequest) ProtoReflect() protoreflect.Message {
-	mi := &file_deephaven_proto_table_proto_msgTypes[57]
+	mi := &file_deephaven_core_proto_table_proto_msgTypes[58]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -5264,7 +5366,7 @@ func (x *MetaTableRequest) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use MetaTableRequest.ProtoReflect.Descriptor instead.
 func (*MetaTableRequest) Descriptor() ([]byte, []int) {
-	return file_deephaven_proto_table_proto_rawDescGZIP(), []int{57}
+	return file_deephaven_core_proto_table_proto_rawDescGZIP(), []int{58}
 }
 
 func (x *MetaTableRequest) GetResultId() *ticket.Ticket {
@@ -5297,7 +5399,7 @@ type RunChartDownsampleRequest struct {
 func (x *RunChartDownsampleRequest) Reset() {
 	*x = RunChartDownsampleRequest{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_deephaven_proto_table_proto_msgTypes[58]
+		mi := &file_deephaven_core_proto_table_proto_msgTypes[59]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -5310,7 +5412,7 @@ func (x *RunChartDownsampleRequest) String() string {
 func (*RunChartDownsampleRequest) ProtoMessage() {}
 
 func (x *RunChartDownsampleRequest) ProtoReflect() protoreflect.Message {
-	mi := &file_deephaven_proto_table_proto_msgTypes[58]
+	mi := &file_deephaven_core_proto_table_proto_msgTypes[59]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -5323,7 +5425,7 @@ func (x *RunChartDownsampleRequest) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use RunChartDownsampleRequest.ProtoReflect.Descriptor instead.
 func (*RunChartDownsampleRequest) Descriptor() ([]byte, []int) {
-	return file_deephaven_proto_table_proto_rawDescGZIP(), []int{58}
+	return file_deephaven_core_proto_table_proto_rawDescGZIP(), []int{59}
 }
 
 func (x *RunChartDownsampleRequest) GetResultId() *ticket.Ticket {
@@ -5385,7 +5487,7 @@ type CreateInputTableRequest struct {
 func (x *CreateInputTableRequest) Reset() {
 	*x = CreateInputTableRequest{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_deephaven_proto_table_proto_msgTypes[59]
+		mi := &file_deephaven_core_proto_table_proto_msgTypes[60]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -5398,7 +5500,7 @@ func (x *CreateInputTableRequest) String() string {
 func (*CreateInputTableRequest) ProtoMessage() {}
 
 func (x *CreateInputTableRequest) ProtoReflect() protoreflect.Message {
-	mi := &file_deephaven_proto_table_proto_msgTypes[59]
+	mi := &file_deephaven_core_proto_table_proto_msgTypes[60]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -5411,7 +5513,7 @@ func (x *CreateInputTableRequest) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use CreateInputTableRequest.ProtoReflect.Descriptor instead.
 func (*CreateInputTableRequest) Descriptor() ([]byte, []int) {
-	return file_deephaven_proto_table_proto_rawDescGZIP(), []int{59}
+	return file_deephaven_core_proto_table_proto_rawDescGZIP(), []int{60}
 }
 
 func (x *CreateInputTableRequest) GetResultId() *ticket.Ticket {
@@ -5483,7 +5585,7 @@ type WhereInRequest struct {
 func (x *WhereInRequest) Reset() {
 	*x = WhereInRequest{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_deephaven_proto_table_proto_msgTypes[60]
+		mi := &file_deephaven_core_proto_table_proto_msgTypes[61]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -5496,7 +5598,7 @@ func (x *WhereInRequest) String() string {
 func (*WhereInRequest) ProtoMessage() {}
 
 func (x *WhereInRequest) ProtoReflect() protoreflect.Message {
-	mi := &file_deephaven_proto_table_proto_msgTypes[60]
+	mi := &file_deephaven_core_proto_table_proto_msgTypes[61]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -5509,7 +5611,7 @@ func (x *WhereInRequest) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use WhereInRequest.ProtoReflect.Descriptor instead.
 func (*WhereInRequest) Descriptor() ([]byte, []int) {
-	return file_deephaven_proto_table_proto_rawDescGZIP(), []int{60}
+	return file_deephaven_core_proto_table_proto_rawDescGZIP(), []int{61}
 }
 
 func (x *WhereInRequest) GetResultId() *ticket.Ticket {
@@ -5564,7 +5666,7 @@ type ColumnStatisticsRequest struct {
 func (x *ColumnStatisticsRequest) Reset() {
 	*x = ColumnStatisticsRequest{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_deephaven_proto_table_proto_msgTypes[61]
+		mi := &file_deephaven_core_proto_table_proto_msgTypes[62]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -5577,7 +5679,7 @@ func (x *ColumnStatisticsRequest) String() string {
 func (*ColumnStatisticsRequest) ProtoMessage() {}
 
 func (x *ColumnStatisticsRequest) ProtoReflect() protoreflect.Message {
-	mi := &file_deephaven_proto_table_proto_msgTypes[61]
+	mi := &file_deephaven_core_proto_table_proto_msgTypes[62]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -5590,7 +5692,7 @@ func (x *ColumnStatisticsRequest) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use ColumnStatisticsRequest.ProtoReflect.Descriptor instead.
 func (*ColumnStatisticsRequest) Descriptor() ([]byte, []int) {
-	return file_deephaven_proto_table_proto_rawDescGZIP(), []int{61}
+	return file_deephaven_core_proto_table_proto_rawDescGZIP(), []int{62}
 }
 
 func (x *ColumnStatisticsRequest) GetResultId() *ticket.Ticket {
@@ -5621,6 +5723,77 @@ func (x *ColumnStatisticsRequest) GetUniqueValueLimit() int32 {
 	return 0
 }
 
+type SliceRequest struct {
+	state         protoimpl.MessageState
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
+
+	ResultId               *ticket.Ticket  `protobuf:"bytes,1,opt,name=result_id,json=resultId,proto3" json:"result_id,omitempty"`
+	SourceId               *TableReference `protobuf:"bytes,2,opt,name=source_id,json=sourceId,proto3" json:"source_id,omitempty"`
+	FirstPositionInclusive int64           `protobuf:"zigzag64,3,opt,name=first_position_inclusive,json=firstPositionInclusive,proto3" json:"first_position_inclusive,omitempty"`
+	LastPositionExclusive  int64           `protobuf:"zigzag64,4,opt,name=last_position_exclusive,json=lastPositionExclusive,proto3" json:"last_position_exclusive,omitempty"`
+}
+
+func (x *SliceRequest) Reset() {
+	*x = SliceRequest{}
+	if protoimpl.UnsafeEnabled {
+		mi := &file_deephaven_core_proto_table_proto_msgTypes[63]
+		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+		ms.StoreMessageInfo(mi)
+	}
+}
+
+func (x *SliceRequest) String() string {
+	return protoimpl.X.MessageStringOf(x)
+}
+
+func (*SliceRequest) ProtoMessage() {}
+
+func (x *SliceRequest) ProtoReflect() protoreflect.Message {
+	mi := &file_deephaven_core_proto_table_proto_msgTypes[63]
+	if protoimpl.UnsafeEnabled && x != nil {
+		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+		if ms.LoadMessageInfo() == nil {
+			ms.StoreMessageInfo(mi)
+		}
+		return ms
+	}
+	return mi.MessageOf(x)
+}
+
+// Deprecated: Use SliceRequest.ProtoReflect.Descriptor instead.
+func (*SliceRequest) Descriptor() ([]byte, []int) {
+	return file_deephaven_core_proto_table_proto_rawDescGZIP(), []int{63}
+}
+
+func (x *SliceRequest) GetResultId() *ticket.Ticket {
+	if x != nil {
+		return x.ResultId
+	}
+	return nil
+}
+
+func (x *SliceRequest) GetSourceId() *TableReference {
+	if x != nil {
+		return x.SourceId
+	}
+	return nil
+}
+
+func (x *SliceRequest) GetFirstPositionInclusive() int64 {
+	if x != nil {
+		return x.FirstPositionInclusive
+	}
+	return 0
+}
+
+func (x *SliceRequest) GetLastPositionExclusive() int64 {
+	if x != nil {
+		return x.LastPositionExclusive
+	}
+	return 0
+}
+
 type BatchTableRequest struct {
 	state         protoimpl.MessageState
 	sizeCache     protoimpl.SizeCache
@@ -5632,7 +5805,7 @@ type BatchTableRequest struct {
 func (x *BatchTableRequest) Reset() {
 	*x = BatchTableRequest{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_deephaven_proto_table_proto_msgTypes[62]
+		mi := &file_deephaven_core_proto_table_proto_msgTypes[64]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -5645,7 +5818,7 @@ func (x *BatchTableRequest) String() string {
 func (*BatchTableRequest) ProtoMessage() {}
 
 func (x *BatchTableRequest) ProtoReflect() protoreflect.Message {
-	mi := &file_deephaven_proto_table_proto_msgTypes[62]
+	mi := &file_deephaven_core_proto_table_proto_msgTypes[64]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -5658,7 +5831,7 @@ func (x *BatchTableRequest) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use BatchTableRequest.ProtoReflect.Descriptor instead.
 func (*BatchTableRequest) Descriptor() ([]byte, []int) {
-	return file_deephaven_proto_table_proto_rawDescGZIP(), []int{62}
+	return file_deephaven_core_proto_table_proto_rawDescGZIP(), []int{64}
 }
 
 func (x *BatchTableRequest) GetOps() []*BatchTableRequest_Operation {
@@ -5679,7 +5852,7 @@ type UpdateByWindowScale_UpdateByWindowTicks struct {
 func (x *UpdateByWindowScale_UpdateByWindowTicks) Reset() {
 	*x = UpdateByWindowScale_UpdateByWindowTicks{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_deephaven_proto_table_proto_msgTypes[63]
+		mi := &file_deephaven_core_proto_table_proto_msgTypes[65]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -5692,7 +5865,7 @@ func (x *UpdateByWindowScale_UpdateByWindowTicks) String() string {
 func (*UpdateByWindowScale_UpdateByWindowTicks) ProtoMessage() {}
 
 func (x *UpdateByWindowScale_UpdateByWindowTicks) ProtoReflect() protoreflect.Message {
-	mi := &file_deephaven_proto_table_proto_msgTypes[63]
+	mi := &file_deephaven_core_proto_table_proto_msgTypes[65]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -5705,7 +5878,7 @@ func (x *UpdateByWindowScale_UpdateByWindowTicks) ProtoReflect() protoreflect.Me
 
 // Deprecated: Use UpdateByWindowScale_UpdateByWindowTicks.ProtoReflect.Descriptor instead.
 func (*UpdateByWindowScale_UpdateByWindowTicks) Descriptor() ([]byte, []int) {
-	return file_deephaven_proto_table_proto_rawDescGZIP(), []int{10, 0}
+	return file_deephaven_core_proto_table_proto_rawDescGZIP(), []int{11, 0}
 }
 
 func (x *UpdateByWindowScale_UpdateByWindowTicks) GetTicks() float64 {
@@ -5730,7 +5903,7 @@ type UpdateByWindowScale_UpdateByWindowTime struct {
 func (x *UpdateByWindowScale_UpdateByWindowTime) Reset() {
 	*x = UpdateByWindowScale_UpdateByWindowTime{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_deephaven_proto_table_proto_msgTypes[64]
+		mi := &file_deephaven_core_proto_table_proto_msgTypes[66]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -5743,7 +5916,7 @@ func (x *UpdateByWindowScale_UpdateByWindowTime) String() string {
 func (*UpdateByWindowScale_UpdateByWindowTime) ProtoMessage() {}
 
 func (x *UpdateByWindowScale_UpdateByWindowTime) ProtoReflect() protoreflect.Message {
-	mi := &file_deephaven_proto_table_proto_msgTypes[64]
+	mi := &file_deephaven_core_proto_table_proto_msgTypes[66]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -5756,7 +5929,7 @@ func (x *UpdateByWindowScale_UpdateByWindowTime) ProtoReflect() protoreflect.Mes
 
 // Deprecated: Use UpdateByWindowScale_UpdateByWindowTime.ProtoReflect.Descriptor instead.
 func (*UpdateByWindowScale_UpdateByWindowTime) Descriptor() ([]byte, []int) {
-	return file_deephaven_proto_table_proto_rawDescGZIP(), []int{10, 1}
+	return file_deephaven_core_proto_table_proto_rawDescGZIP(), []int{11, 1}
 }
 
 func (x *UpdateByWindowScale_UpdateByWindowTime) GetColumn() string {
@@ -5837,7 +6010,7 @@ type UpdateByRequest_UpdateByOptions struct {
 func (x *UpdateByRequest_UpdateByOptions) Reset() {
 	*x = UpdateByRequest_UpdateByOptions{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_deephaven_proto_table_proto_msgTypes[65]
+		mi := &file_deephaven_core_proto_table_proto_msgTypes[67]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -5850,7 +6023,7 @@ func (x *UpdateByRequest_UpdateByOptions) String() string {
 func (*UpdateByRequest_UpdateByOptions) ProtoMessage() {}
 
 func (x *UpdateByRequest_UpdateByOptions) ProtoReflect() protoreflect.Message {
-	mi := &file_deephaven_proto_table_proto_msgTypes[65]
+	mi := &file_deephaven_core_proto_table_proto_msgTypes[67]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -5863,7 +6036,7 @@ func (x *UpdateByRequest_UpdateByOptions) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use UpdateByRequest_UpdateByOptions.ProtoReflect.Descriptor instead.
 func (*UpdateByRequest_UpdateByOptions) Descriptor() ([]byte, []int) {
-	return file_deephaven_proto_table_proto_rawDescGZIP(), []int{13, 0}
+	return file_deephaven_core_proto_table_proto_rawDescGZIP(), []int{14, 0}
 }
 
 func (x *UpdateByRequest_UpdateByOptions) GetUseRedirection() bool {
@@ -5928,7 +6101,7 @@ type UpdateByRequest_UpdateByOperation struct {
 func (x *UpdateByRequest_UpdateByOperation) Reset() {
 	*x = UpdateByRequest_UpdateByOperation{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_deephaven_proto_table_proto_msgTypes[66]
+		mi := &file_deephaven_core_proto_table_proto_msgTypes[68]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -5941,7 +6114,7 @@ func (x *UpdateByRequest_UpdateByOperation) String() string {
 func (*UpdateByRequest_UpdateByOperation) ProtoMessage() {}
 
 func (x *UpdateByRequest_UpdateByOperation) ProtoReflect() protoreflect.Message {
-	mi := &file_deephaven_proto_table_proto_msgTypes[66]
+	mi := &file_deephaven_core_proto_table_proto_msgTypes[68]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -5954,7 +6127,7 @@ func (x *UpdateByRequest_UpdateByOperation) ProtoReflect() protoreflect.Message
 
 // Deprecated: Use UpdateByRequest_UpdateByOperation.ProtoReflect.Descriptor instead.
 func (*UpdateByRequest_UpdateByOperation) Descriptor() ([]byte, []int) {
-	return file_deephaven_proto_table_proto_rawDescGZIP(), []int{13, 1}
+	return file_deephaven_core_proto_table_proto_rawDescGZIP(), []int{14, 1}
 }
 
 func (m *UpdateByRequest_UpdateByOperation) GetType() isUpdateByRequest_UpdateByOperation_Type {
@@ -5993,7 +6166,7 @@ type UpdateByRequest_UpdateByOperation_UpdateByColumn struct {
 func (x *UpdateByRequest_UpdateByOperation_UpdateByColumn) Reset() {
 	*x = UpdateByRequest_UpdateByOperation_UpdateByColumn{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_deephaven_proto_table_proto_msgTypes[67]
+		mi := &file_deephaven_core_proto_table_proto_msgTypes[69]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -6006,7 +6179,7 @@ func (x *UpdateByRequest_UpdateByOperation_UpdateByColumn) String() string {
 func (*UpdateByRequest_UpdateByOperation_UpdateByColumn) ProtoMessage() {}
 
 func (x *UpdateByRequest_UpdateByOperation_UpdateByColumn) ProtoReflect() protoreflect.Message {
-	mi := &file_deephaven_proto_table_proto_msgTypes[67]
+	mi := &file_deephaven_core_proto_table_proto_msgTypes[69]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -6019,7 +6192,7 @@ func (x *UpdateByRequest_UpdateByOperation_UpdateByColumn) ProtoReflect() protor
 
 // Deprecated: Use UpdateByRequest_UpdateByOperation_UpdateByColumn.ProtoReflect.Descriptor instead.
 func (*UpdateByRequest_UpdateByOperation_UpdateByColumn) Descriptor() ([]byte, []int) {
-	return file_deephaven_proto_table_proto_rawDescGZIP(), []int{13, 1, 0}
+	return file_deephaven_core_proto_table_proto_rawDescGZIP(), []int{14, 1, 0}
 }
 
 func (x *UpdateByRequest_UpdateByOperation_UpdateByColumn) GetSpec() *UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec {
@@ -6069,7 +6242,7 @@ type UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec struct {
 func (x *UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec) Reset() {
 	*x = UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_deephaven_proto_table_proto_msgTypes[68]
+		mi := &file_deephaven_core_proto_table_proto_msgTypes[70]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -6082,7 +6255,7 @@ func (x *UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec) String()
 func (*UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec) ProtoMessage() {}
 
 func (x *UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec) ProtoReflect() protoreflect.Message {
-	mi := &file_deephaven_proto_table_proto_msgTypes[68]
+	mi := &file_deephaven_core_proto_table_proto_msgTypes[70]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -6095,7 +6268,7 @@ func (x *UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec) ProtoRef
 
 // Deprecated: Use UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec.ProtoReflect.Descriptor instead.
 func (*UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec) Descriptor() ([]byte, []int) {
-	return file_deephaven_proto_table_proto_rawDescGZIP(), []int{13, 1, 0, 0}
+	return file_deephaven_core_proto_table_proto_rawDescGZIP(), []int{14, 1, 0, 0}
 }
 
 func (m *UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec) GetType() isUpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_Type {
@@ -6412,7 +6585,7 @@ type UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByCumul
 func (x *UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByCumulativeSum) Reset() {
 	*x = UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByCumulativeSum{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_deephaven_proto_table_proto_msgTypes[69]
+		mi := &file_deephaven_core_proto_table_proto_msgTypes[71]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -6426,7 +6599,7 @@ func (*UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByCum
 }
 
 func (x *UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByCumulativeSum) ProtoReflect() protoreflect.Message {
-	mi := &file_deephaven_proto_table_proto_msgTypes[69]
+	mi := &file_deephaven_core_proto_table_proto_msgTypes[71]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -6439,7 +6612,7 @@ func (x *UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByC
 
 // Deprecated: Use UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByCumulativeSum.ProtoReflect.Descriptor instead.
 func (*UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByCumulativeSum) Descriptor() ([]byte, []int) {
-	return file_deephaven_proto_table_proto_rawDescGZIP(), []int{13, 1, 0, 0, 0}
+	return file_deephaven_core_proto_table_proto_rawDescGZIP(), []int{14, 1, 0, 0, 0}
 }
 
 type UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByCumulativeMin struct {
@@ -6451,7 +6624,7 @@ type UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByCumul
 func (x *UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByCumulativeMin) Reset() {
 	*x = UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByCumulativeMin{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_deephaven_proto_table_proto_msgTypes[70]
+		mi := &file_deephaven_core_proto_table_proto_msgTypes[72]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -6465,7 +6638,7 @@ func (*UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByCum
 }
 
 func (x *UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByCumulativeMin) ProtoReflect() protoreflect.Message {
-	mi := &file_deephaven_proto_table_proto_msgTypes[70]
+	mi := &file_deephaven_core_proto_table_proto_msgTypes[72]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -6478,7 +6651,7 @@ func (x *UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByC
 
 // Deprecated: Use UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByCumulativeMin.ProtoReflect.Descriptor instead.
 func (*UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByCumulativeMin) Descriptor() ([]byte, []int) {
-	return file_deephaven_proto_table_proto_rawDescGZIP(), []int{13, 1, 0, 0, 1}
+	return file_deephaven_core_proto_table_proto_rawDescGZIP(), []int{14, 1, 0, 0, 1}
 }
 
 type UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByCumulativeMax struct {
@@ -6490,7 +6663,7 @@ type UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByCumul
 func (x *UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByCumulativeMax) Reset() {
 	*x = UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByCumulativeMax{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_deephaven_proto_table_proto_msgTypes[71]
+		mi := &file_deephaven_core_proto_table_proto_msgTypes[73]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -6504,7 +6677,7 @@ func (*UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByCum
 }
 
 func (x *UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByCumulativeMax) ProtoReflect() protoreflect.Message {
-	mi := &file_deephaven_proto_table_proto_msgTypes[71]
+	mi := &file_deephaven_core_proto_table_proto_msgTypes[73]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -6517,7 +6690,7 @@ func (x *UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByC
 
 // Deprecated: Use UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByCumulativeMax.ProtoReflect.Descriptor instead.
 func (*UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByCumulativeMax) Descriptor() ([]byte, []int) {
-	return file_deephaven_proto_table_proto_rawDescGZIP(), []int{13, 1, 0, 0, 2}
+	return file_deephaven_core_proto_table_proto_rawDescGZIP(), []int{14, 1, 0, 0, 2}
 }
 
 type UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByCumulativeProduct struct {
@@ -6529,7 +6702,7 @@ type UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByCumul
 func (x *UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByCumulativeProduct) Reset() {
 	*x = UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByCumulativeProduct{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_deephaven_proto_table_proto_msgTypes[72]
+		mi := &file_deephaven_core_proto_table_proto_msgTypes[74]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -6543,7 +6716,7 @@ func (*UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByCum
 }
 
 func (x *UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByCumulativeProduct) ProtoReflect() protoreflect.Message {
-	mi := &file_deephaven_proto_table_proto_msgTypes[72]
+	mi := &file_deephaven_core_proto_table_proto_msgTypes[74]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -6556,7 +6729,7 @@ func (x *UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByC
 
 // Deprecated: Use UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByCumulativeProduct.ProtoReflect.Descriptor instead.
 func (*UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByCumulativeProduct) Descriptor() ([]byte, []int) {
-	return file_deephaven_proto_table_proto_rawDescGZIP(), []int{13, 1, 0, 0, 3}
+	return file_deephaven_core_proto_table_proto_rawDescGZIP(), []int{14, 1, 0, 0, 3}
 }
 
 type UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByFill struct {
@@ -6568,7 +6741,7 @@ type UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByFill
 func (x *UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByFill) Reset() {
 	*x = UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByFill{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_deephaven_proto_table_proto_msgTypes[73]
+		mi := &file_deephaven_core_proto_table_proto_msgTypes[75]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -6581,7 +6754,7 @@ func (x *UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByF
 func (*UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByFill) ProtoMessage() {}
 
 func (x *UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByFill) ProtoReflect() protoreflect.Message {
-	mi := &file_deephaven_proto_table_proto_msgTypes[73]
+	mi := &file_deephaven_core_proto_table_proto_msgTypes[75]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -6594,7 +6767,7 @@ func (x *UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByF
 
 // Deprecated: Use UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByFill.ProtoReflect.Descriptor instead.
 func (*UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByFill) Descriptor() ([]byte, []int) {
-	return file_deephaven_proto_table_proto_rawDescGZIP(), []int{13, 1, 0, 0, 4}
+	return file_deephaven_core_proto_table_proto_rawDescGZIP(), []int{14, 1, 0, 0, 4}
 }
 
 type UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByEma struct {
@@ -6609,7 +6782,7 @@ type UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByEma s
 func (x *UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByEma) Reset() {
 	*x = UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByEma{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_deephaven_proto_table_proto_msgTypes[74]
+		mi := &file_deephaven_core_proto_table_proto_msgTypes[76]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -6622,7 +6795,7 @@ func (x *UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByE
 func (*UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByEma) ProtoMessage() {}
 
 func (x *UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByEma) ProtoReflect() protoreflect.Message {
-	mi := &file_deephaven_proto_table_proto_msgTypes[74]
+	mi := &file_deephaven_core_proto_table_proto_msgTypes[76]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -6635,7 +6808,7 @@ func (x *UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByE
 
 // Deprecated: Use UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByEma.ProtoReflect.Descriptor instead.
 func (*UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByEma) Descriptor() ([]byte, []int) {
-	return file_deephaven_proto_table_proto_rawDescGZIP(), []int{13, 1, 0, 0, 5}
+	return file_deephaven_core_proto_table_proto_rawDescGZIP(), []int{14, 1, 0, 0, 5}
 }
 
 func (x *UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByEma) GetOptions() *UpdateByEmOptions {
@@ -6664,7 +6837,7 @@ type UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByEms s
 func (x *UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByEms) Reset() {
 	*x = UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByEms{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_deephaven_proto_table_proto_msgTypes[75]
+		mi := &file_deephaven_core_proto_table_proto_msgTypes[77]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -6677,7 +6850,7 @@ func (x *UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByE
 func (*UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByEms) ProtoMessage() {}
 
 func (x *UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByEms) ProtoReflect() protoreflect.Message {
-	mi := &file_deephaven_proto_table_proto_msgTypes[75]
+	mi := &file_deephaven_core_proto_table_proto_msgTypes[77]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -6690,7 +6863,7 @@ func (x *UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByE
 
 // Deprecated: Use UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByEms.ProtoReflect.Descriptor instead.
 func (*UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByEms) Descriptor() ([]byte, []int) {
-	return file_deephaven_proto_table_proto_rawDescGZIP(), []int{13, 1, 0, 0, 6}
+	return file_deephaven_core_proto_table_proto_rawDescGZIP(), []int{14, 1, 0, 0, 6}
 }
 
 func (x *UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByEms) GetOptions() *UpdateByEmOptions {
@@ -6719,7 +6892,7 @@ type UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByEmMin
 func (x *UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByEmMin) Reset() {
 	*x = UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByEmMin{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_deephaven_proto_table_proto_msgTypes[76]
+		mi := &file_deephaven_core_proto_table_proto_msgTypes[78]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -6732,7 +6905,7 @@ func (x *UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByE
 func (*UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByEmMin) ProtoMessage() {}
 
 func (x *UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByEmMin) ProtoReflect() protoreflect.Message {
-	mi := &file_deephaven_proto_table_proto_msgTypes[76]
+	mi := &file_deephaven_core_proto_table_proto_msgTypes[78]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -6745,7 +6918,7 @@ func (x *UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByE
 
 // Deprecated: Use UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByEmMin.ProtoReflect.Descriptor instead.
 func (*UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByEmMin) Descriptor() ([]byte, []int) {
-	return file_deephaven_proto_table_proto_rawDescGZIP(), []int{13, 1, 0, 0, 7}
+	return file_deephaven_core_proto_table_proto_rawDescGZIP(), []int{14, 1, 0, 0, 7}
 }
 
 func (x *UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByEmMin) GetOptions() *UpdateByEmOptions {
@@ -6774,7 +6947,7 @@ type UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByEmMax
 func (x *UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByEmMax) Reset() {
 	*x = UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByEmMax{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_deephaven_proto_table_proto_msgTypes[77]
+		mi := &file_deephaven_core_proto_table_proto_msgTypes[79]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -6787,7 +6960,7 @@ func (x *UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByE
 func (*UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByEmMax) ProtoMessage() {}
 
 func (x *UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByEmMax) ProtoReflect() protoreflect.Message {
-	mi := &file_deephaven_proto_table_proto_msgTypes[77]
+	mi := &file_deephaven_core_proto_table_proto_msgTypes[79]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -6800,7 +6973,7 @@ func (x *UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByE
 
 // Deprecated: Use UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByEmMax.ProtoReflect.Descriptor instead.
 func (*UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByEmMax) Descriptor() ([]byte, []int) {
-	return file_deephaven_proto_table_proto_rawDescGZIP(), []int{13, 1, 0, 0, 8}
+	return file_deephaven_core_proto_table_proto_rawDescGZIP(), []int{14, 1, 0, 0, 8}
 }
 
 func (x *UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByEmMax) GetOptions() *UpdateByEmOptions {
@@ -6829,7 +7002,7 @@ type UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByEmStd
 func (x *UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByEmStd) Reset() {
 	*x = UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByEmStd{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_deephaven_proto_table_proto_msgTypes[78]
+		mi := &file_deephaven_core_proto_table_proto_msgTypes[80]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -6842,7 +7015,7 @@ func (x *UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByE
 func (*UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByEmStd) ProtoMessage() {}
 
 func (x *UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByEmStd) ProtoReflect() protoreflect.Message {
-	mi := &file_deephaven_proto_table_proto_msgTypes[78]
+	mi := &file_deephaven_core_proto_table_proto_msgTypes[80]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -6855,7 +7028,7 @@ func (x *UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByE
 
 // Deprecated: Use UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByEmStd.ProtoReflect.Descriptor instead.
 func (*UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByEmStd) Descriptor() ([]byte, []int) {
-	return file_deephaven_proto_table_proto_rawDescGZIP(), []int{13, 1, 0, 0, 9}
+	return file_deephaven_core_proto_table_proto_rawDescGZIP(), []int{14, 1, 0, 0, 9}
 }
 
 func (x *UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByEmStd) GetOptions() *UpdateByEmOptions {
@@ -6883,7 +7056,7 @@ type UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByDelta
 func (x *UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByDelta) Reset() {
 	*x = UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByDelta{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_deephaven_proto_table_proto_msgTypes[79]
+		mi := &file_deephaven_core_proto_table_proto_msgTypes[81]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -6896,7 +7069,7 @@ func (x *UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByD
 func (*UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByDelta) ProtoMessage() {}
 
 func (x *UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByDelta) ProtoReflect() protoreflect.Message {
-	mi := &file_deephaven_proto_table_proto_msgTypes[79]
+	mi := &file_deephaven_core_proto_table_proto_msgTypes[81]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -6909,7 +7082,7 @@ func (x *UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByD
 
 // Deprecated: Use UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByDelta.ProtoReflect.Descriptor instead.
 func (*UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByDelta) Descriptor() ([]byte, []int) {
-	return file_deephaven_proto_table_proto_rawDescGZIP(), []int{13, 1, 0, 0, 10}
+	return file_deephaven_core_proto_table_proto_rawDescGZIP(), []int{14, 1, 0, 0, 10}
 }
 
 func (x *UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByDelta) GetOptions() *UpdateByDeltaOptions {
@@ -6931,7 +7104,7 @@ type UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRolli
 func (x *UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingSum) Reset() {
 	*x = UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingSum{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_deephaven_proto_table_proto_msgTypes[80]
+		mi := &file_deephaven_core_proto_table_proto_msgTypes[82]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -6945,7 +7118,7 @@ func (*UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRol
 }
 
 func (x *UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingSum) ProtoReflect() protoreflect.Message {
-	mi := &file_deephaven_proto_table_proto_msgTypes[80]
+	mi := &file_deephaven_core_proto_table_proto_msgTypes[82]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -6958,7 +7131,7 @@ func (x *UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByR
 
 // Deprecated: Use UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingSum.ProtoReflect.Descriptor instead.
 func (*UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingSum) Descriptor() ([]byte, []int) {
-	return file_deephaven_proto_table_proto_rawDescGZIP(), []int{13, 1, 0, 0, 11}
+	return file_deephaven_core_proto_table_proto_rawDescGZIP(), []int{14, 1, 0, 0, 11}
 }
 
 func (x *UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingSum) GetReverseWindowScale() *UpdateByWindowScale {
@@ -6987,7 +7160,7 @@ type UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRolli
 func (x *UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingGroup) Reset() {
 	*x = UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingGroup{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_deephaven_proto_table_proto_msgTypes[81]
+		mi := &file_deephaven_core_proto_table_proto_msgTypes[83]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -7001,7 +7174,7 @@ func (*UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRol
 }
 
 func (x *UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingGroup) ProtoReflect() protoreflect.Message {
-	mi := &file_deephaven_proto_table_proto_msgTypes[81]
+	mi := &file_deephaven_core_proto_table_proto_msgTypes[83]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -7014,7 +7187,7 @@ func (x *UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByR
 
 // Deprecated: Use UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingGroup.ProtoReflect.Descriptor instead.
 func (*UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingGroup) Descriptor() ([]byte, []int) {
-	return file_deephaven_proto_table_proto_rawDescGZIP(), []int{13, 1, 0, 0, 12}
+	return file_deephaven_core_proto_table_proto_rawDescGZIP(), []int{14, 1, 0, 0, 12}
 }
 
 func (x *UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingGroup) GetReverseWindowScale() *UpdateByWindowScale {
@@ -7043,7 +7216,7 @@ type UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRolli
 func (x *UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingAvg) Reset() {
 	*x = UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingAvg{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_deephaven_proto_table_proto_msgTypes[82]
+		mi := &file_deephaven_core_proto_table_proto_msgTypes[84]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -7057,7 +7230,7 @@ func (*UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRol
 }
 
 func (x *UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingAvg) ProtoReflect() protoreflect.Message {
-	mi := &file_deephaven_proto_table_proto_msgTypes[82]
+	mi := &file_deephaven_core_proto_table_proto_msgTypes[84]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -7070,7 +7243,7 @@ func (x *UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByR
 
 // Deprecated: Use UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingAvg.ProtoReflect.Descriptor instead.
 func (*UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingAvg) Descriptor() ([]byte, []int) {
-	return file_deephaven_proto_table_proto_rawDescGZIP(), []int{13, 1, 0, 0, 13}
+	return file_deephaven_core_proto_table_proto_rawDescGZIP(), []int{14, 1, 0, 0, 13}
 }
 
 func (x *UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingAvg) GetReverseWindowScale() *UpdateByWindowScale {
@@ -7099,7 +7272,7 @@ type UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRolli
 func (x *UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingMin) Reset() {
 	*x = UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingMin{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_deephaven_proto_table_proto_msgTypes[83]
+		mi := &file_deephaven_core_proto_table_proto_msgTypes[85]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -7113,7 +7286,7 @@ func (*UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRol
 }
 
 func (x *UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingMin) ProtoReflect() protoreflect.Message {
-	mi := &file_deephaven_proto_table_proto_msgTypes[83]
+	mi := &file_deephaven_core_proto_table_proto_msgTypes[85]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -7126,7 +7299,7 @@ func (x *UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByR
 
 // Deprecated: Use UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingMin.ProtoReflect.Descriptor instead.
 func (*UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingMin) Descriptor() ([]byte, []int) {
-	return file_deephaven_proto_table_proto_rawDescGZIP(), []int{13, 1, 0, 0, 14}
+	return file_deephaven_core_proto_table_proto_rawDescGZIP(), []int{14, 1, 0, 0, 14}
 }
 
 func (x *UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingMin) GetReverseWindowScale() *UpdateByWindowScale {
@@ -7155,7 +7328,7 @@ type UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRolli
 func (x *UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingMax) Reset() {
 	*x = UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingMax{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_deephaven_proto_table_proto_msgTypes[84]
+		mi := &file_deephaven_core_proto_table_proto_msgTypes[86]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -7169,7 +7342,7 @@ func (*UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRol
 }
 
 func (x *UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingMax) ProtoReflect() protoreflect.Message {
-	mi := &file_deephaven_proto_table_proto_msgTypes[84]
+	mi := &file_deephaven_core_proto_table_proto_msgTypes[86]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -7182,7 +7355,7 @@ func (x *UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByR
 
 // Deprecated: Use UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingMax.ProtoReflect.Descriptor instead.
 func (*UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingMax) Descriptor() ([]byte, []int) {
-	return file_deephaven_proto_table_proto_rawDescGZIP(), []int{13, 1, 0, 0, 15}
+	return file_deephaven_core_proto_table_proto_rawDescGZIP(), []int{14, 1, 0, 0, 15}
 }
 
 func (x *UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingMax) GetReverseWindowScale() *UpdateByWindowScale {
@@ -7211,7 +7384,7 @@ type UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRolli
 func (x *UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingProduct) Reset() {
 	*x = UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingProduct{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_deephaven_proto_table_proto_msgTypes[85]
+		mi := &file_deephaven_core_proto_table_proto_msgTypes[87]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -7225,7 +7398,7 @@ func (*UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRol
 }
 
 func (x *UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingProduct) ProtoReflect() protoreflect.Message {
-	mi := &file_deephaven_proto_table_proto_msgTypes[85]
+	mi := &file_deephaven_core_proto_table_proto_msgTypes[87]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -7238,7 +7411,7 @@ func (x *UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByR
 
 // Deprecated: Use UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingProduct.ProtoReflect.Descriptor instead.
 func (*UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingProduct) Descriptor() ([]byte, []int) {
-	return file_deephaven_proto_table_proto_rawDescGZIP(), []int{13, 1, 0, 0, 16}
+	return file_deephaven_core_proto_table_proto_rawDescGZIP(), []int{14, 1, 0, 0, 16}
 }
 
 func (x *UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingProduct) GetReverseWindowScale() *UpdateByWindowScale {
@@ -7267,7 +7440,7 @@ type UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRolli
 func (x *UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingCount) Reset() {
 	*x = UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingCount{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_deephaven_proto_table_proto_msgTypes[86]
+		mi := &file_deephaven_core_proto_table_proto_msgTypes[88]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -7281,7 +7454,7 @@ func (*UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRol
 }
 
 func (x *UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingCount) ProtoReflect() protoreflect.Message {
-	mi := &file_deephaven_proto_table_proto_msgTypes[86]
+	mi := &file_deephaven_core_proto_table_proto_msgTypes[88]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -7294,7 +7467,7 @@ func (x *UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByR
 
 // Deprecated: Use UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingCount.ProtoReflect.Descriptor instead.
 func (*UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingCount) Descriptor() ([]byte, []int) {
-	return file_deephaven_proto_table_proto_rawDescGZIP(), []int{13, 1, 0, 0, 17}
+	return file_deephaven_core_proto_table_proto_rawDescGZIP(), []int{14, 1, 0, 0, 17}
 }
 
 func (x *UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingCount) GetReverseWindowScale() *UpdateByWindowScale {
@@ -7323,7 +7496,7 @@ type UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRolli
 func (x *UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingStd) Reset() {
 	*x = UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingStd{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_deephaven_proto_table_proto_msgTypes[87]
+		mi := &file_deephaven_core_proto_table_proto_msgTypes[89]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -7337,7 +7510,7 @@ func (*UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRol
 }
 
 func (x *UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingStd) ProtoReflect() protoreflect.Message {
-	mi := &file_deephaven_proto_table_proto_msgTypes[87]
+	mi := &file_deephaven_core_proto_table_proto_msgTypes[89]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -7350,7 +7523,7 @@ func (x *UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByR
 
 // Deprecated: Use UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingStd.ProtoReflect.Descriptor instead.
 func (*UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingStd) Descriptor() ([]byte, []int) {
-	return file_deephaven_proto_table_proto_rawDescGZIP(), []int{13, 1, 0, 0, 18}
+	return file_deephaven_core_proto_table_proto_rawDescGZIP(), []int{14, 1, 0, 0, 18}
 }
 
 func (x *UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingStd) GetReverseWindowScale() *UpdateByWindowScale {
@@ -7381,7 +7554,7 @@ type UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRolli
 func (x *UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingWAvg) Reset() {
 	*x = UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingWAvg{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_deephaven_proto_table_proto_msgTypes[88]
+		mi := &file_deephaven_core_proto_table_proto_msgTypes[90]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -7395,7 +7568,7 @@ func (*UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRol
 }
 
 func (x *UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingWAvg) ProtoReflect() protoreflect.Message {
-	mi := &file_deephaven_proto_table_proto_msgTypes[88]
+	mi := &file_deephaven_core_proto_table_proto_msgTypes[90]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -7408,7 +7581,7 @@ func (x *UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByR
 
 // Deprecated: Use UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingWAvg.ProtoReflect.Descriptor instead.
 func (*UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingWAvg) Descriptor() ([]byte, []int) {
-	return file_deephaven_proto_table_proto_rawDescGZIP(), []int{13, 1, 0, 0, 19}
+	return file_deephaven_core_proto_table_proto_rawDescGZIP(), []int{14, 1, 0, 0, 19}
 }
 
 func (x *UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingWAvg) GetReverseWindowScale() *UpdateByWindowScale {
@@ -7446,7 +7619,7 @@ type UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRolli
 func (x *UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingFormula) Reset() {
 	*x = UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingFormula{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_deephaven_proto_table_proto_msgTypes[89]
+		mi := &file_deephaven_core_proto_table_proto_msgTypes[91]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -7460,7 +7633,7 @@ func (*UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRol
 }
 
 func (x *UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingFormula) ProtoReflect() protoreflect.Message {
-	mi := &file_deephaven_proto_table_proto_msgTypes[89]
+	mi := &file_deephaven_core_proto_table_proto_msgTypes[91]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -7473,7 +7646,7 @@ func (x *UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByR
 
 // Deprecated: Use UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingFormula.ProtoReflect.Descriptor instead.
 func (*UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingFormula) Descriptor() ([]byte, []int) {
-	return file_deephaven_proto_table_proto_rawDescGZIP(), []int{13, 1, 0, 0, 20}
+	return file_deephaven_core_proto_table_proto_rawDescGZIP(), []int{14, 1, 0, 0, 20}
 }
 
 func (x *UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingFormula) GetReverseWindowScale() *UpdateByWindowScale {
@@ -7519,7 +7692,7 @@ type ComboAggregateRequest_Aggregate struct {
 func (x *ComboAggregateRequest_Aggregate) Reset() {
 	*x = ComboAggregateRequest_Aggregate{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_deephaven_proto_table_proto_msgTypes[90]
+		mi := &file_deephaven_core_proto_table_proto_msgTypes[92]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -7532,7 +7705,7 @@ func (x *ComboAggregateRequest_Aggregate) String() string {
 func (*ComboAggregateRequest_Aggregate) ProtoMessage() {}
 
 func (x *ComboAggregateRequest_Aggregate) ProtoReflect() protoreflect.Message {
-	mi := &file_deephaven_proto_table_proto_msgTypes[90]
+	mi := &file_deephaven_core_proto_table_proto_msgTypes[92]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -7545,7 +7718,7 @@ func (x *ComboAggregateRequest_Aggregate) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use ComboAggregateRequest_Aggregate.ProtoReflect.Descriptor instead.
 func (*ComboAggregateRequest_Aggregate) Descriptor() ([]byte, []int) {
-	return file_deephaven_proto_table_proto_rawDescGZIP(), []int{32, 0}
+	return file_deephaven_core_proto_table_proto_rawDescGZIP(), []int{33, 0}
 }
 
 func (x *ComboAggregateRequest_Aggregate) GetType() ComboAggregateRequest_AggType {
@@ -7598,7 +7771,7 @@ type AggSpec_AggSpecApproximatePercentile struct {
 func (x *AggSpec_AggSpecApproximatePercentile) Reset() {
 	*x = AggSpec_AggSpecApproximatePercentile{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_deephaven_proto_table_proto_msgTypes[91]
+		mi := &file_deephaven_core_proto_table_proto_msgTypes[93]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -7611,7 +7784,7 @@ func (x *AggSpec_AggSpecApproximatePercentile) String() string {
 func (*AggSpec_AggSpecApproximatePercentile) ProtoMessage() {}
 
 func (x *AggSpec_AggSpecApproximatePercentile) ProtoReflect() protoreflect.Message {
-	mi := &file_deephaven_proto_table_proto_msgTypes[91]
+	mi := &file_deephaven_core_proto_table_proto_msgTypes[93]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -7624,7 +7797,7 @@ func (x *AggSpec_AggSpecApproximatePercentile) ProtoReflect() protoreflect.Messa
 
 // Deprecated: Use AggSpec_AggSpecApproximatePercentile.ProtoReflect.Descriptor instead.
 func (*AggSpec_AggSpecApproximatePercentile) Descriptor() ([]byte, []int) {
-	return file_deephaven_proto_table_proto_rawDescGZIP(), []int{34, 0}
+	return file_deephaven_core_proto_table_proto_rawDescGZIP(), []int{35, 0}
 }
 
 func (x *AggSpec_AggSpecApproximatePercentile) GetPercentile() float64 {
@@ -7653,7 +7826,7 @@ type AggSpec_AggSpecCountDistinct struct {
 func (x *AggSpec_AggSpecCountDistinct) Reset() {
 	*x = AggSpec_AggSpecCountDistinct{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_deephaven_proto_table_proto_msgTypes[92]
+		mi := &file_deephaven_core_proto_table_proto_msgTypes[94]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -7666,7 +7839,7 @@ func (x *AggSpec_AggSpecCountDistinct) String() string {
 func (*AggSpec_AggSpecCountDistinct) ProtoMessage() {}
 
 func (x *AggSpec_AggSpecCountDistinct) ProtoReflect() protoreflect.Message {
-	mi := &file_deephaven_proto_table_proto_msgTypes[92]
+	mi := &file_deephaven_core_proto_table_proto_msgTypes[94]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -7679,7 +7852,7 @@ func (x *AggSpec_AggSpecCountDistinct) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use AggSpec_AggSpecCountDistinct.ProtoReflect.Descriptor instead.
 func (*AggSpec_AggSpecCountDistinct) Descriptor() ([]byte, []int) {
-	return file_deephaven_proto_table_proto_rawDescGZIP(), []int{34, 1}
+	return file_deephaven_core_proto_table_proto_rawDescGZIP(), []int{35, 1}
 }
 
 func (x *AggSpec_AggSpecCountDistinct) GetCountNulls() bool {
@@ -7701,7 +7874,7 @@ type AggSpec_AggSpecDistinct struct {
 func (x *AggSpec_AggSpecDistinct) Reset() {
 	*x = AggSpec_AggSpecDistinct{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_deephaven_proto_table_proto_msgTypes[93]
+		mi := &file_deephaven_core_proto_table_proto_msgTypes[95]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -7714,7 +7887,7 @@ func (x *AggSpec_AggSpecDistinct) String() string {
 func (*AggSpec_AggSpecDistinct) ProtoMessage() {}
 
 func (x *AggSpec_AggSpecDistinct) ProtoReflect() protoreflect.Message {
-	mi := &file_deephaven_proto_table_proto_msgTypes[93]
+	mi := &file_deephaven_core_proto_table_proto_msgTypes[95]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -7727,7 +7900,7 @@ func (x *AggSpec_AggSpecDistinct) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use AggSpec_AggSpecDistinct.ProtoReflect.Descriptor instead.
 func (*AggSpec_AggSpecDistinct) Descriptor() ([]byte, []int) {
-	return file_deephaven_proto_table_proto_rawDescGZIP(), []int{34, 2}
+	return file_deephaven_core_proto_table_proto_rawDescGZIP(), []int{35, 2}
 }
 
 func (x *AggSpec_AggSpecDistinct) GetIncludeNulls() bool {
@@ -7751,7 +7924,7 @@ type AggSpec_AggSpecFormula struct {
 func (x *AggSpec_AggSpecFormula) Reset() {
 	*x = AggSpec_AggSpecFormula{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_deephaven_proto_table_proto_msgTypes[94]
+		mi := &file_deephaven_core_proto_table_proto_msgTypes[96]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -7764,7 +7937,7 @@ func (x *AggSpec_AggSpecFormula) String() string {
 func (*AggSpec_AggSpecFormula) ProtoMessage() {}
 
 func (x *AggSpec_AggSpecFormula) ProtoReflect() protoreflect.Message {
-	mi := &file_deephaven_proto_table_proto_msgTypes[94]
+	mi := &file_deephaven_core_proto_table_proto_msgTypes[96]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -7777,7 +7950,7 @@ func (x *AggSpec_AggSpecFormula) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use AggSpec_AggSpecFormula.ProtoReflect.Descriptor instead.
 func (*AggSpec_AggSpecFormula) Descriptor() ([]byte, []int) {
-	return file_deephaven_proto_table_proto_rawDescGZIP(), []int{34, 3}
+	return file_deephaven_core_proto_table_proto_rawDescGZIP(), []int{35, 3}
 }
 
 func (x *AggSpec_AggSpecFormula) GetFormula() string {
@@ -7807,7 +7980,7 @@ type AggSpec_AggSpecMedian struct {
 func (x *AggSpec_AggSpecMedian) Reset() {
 	*x = AggSpec_AggSpecMedian{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_deephaven_proto_table_proto_msgTypes[95]
+		mi := &file_deephaven_core_proto_table_proto_msgTypes[97]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -7820,7 +7993,7 @@ func (x *AggSpec_AggSpecMedian) String() string {
 func (*AggSpec_AggSpecMedian) ProtoMessage() {}
 
 func (x *AggSpec_AggSpecMedian) ProtoReflect() protoreflect.Message {
-	mi := &file_deephaven_proto_table_proto_msgTypes[95]
+	mi := &file_deephaven_core_proto_table_proto_msgTypes[97]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -7833,7 +8006,7 @@ func (x *AggSpec_AggSpecMedian) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use AggSpec_AggSpecMedian.ProtoReflect.Descriptor instead.
 func (*AggSpec_AggSpecMedian) Descriptor() ([]byte, []int) {
-	return file_deephaven_proto_table_proto_rawDescGZIP(), []int{34, 4}
+	return file_deephaven_core_proto_table_proto_rawDescGZIP(), []int{35, 4}
 }
 
 func (x *AggSpec_AggSpecMedian) GetAverageEvenlyDivided() bool {
@@ -7858,7 +8031,7 @@ type AggSpec_AggSpecPercentile struct {
 func (x *AggSpec_AggSpecPercentile) Reset() {
 	*x = AggSpec_AggSpecPercentile{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_deephaven_proto_table_proto_msgTypes[96]
+		mi := &file_deephaven_core_proto_table_proto_msgTypes[98]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -7871,7 +8044,7 @@ func (x *AggSpec_AggSpecPercentile) String() string {
 func (*AggSpec_AggSpecPercentile) ProtoMessage() {}
 
 func (x *AggSpec_AggSpecPercentile) ProtoReflect() protoreflect.Message {
-	mi := &file_deephaven_proto_table_proto_msgTypes[96]
+	mi := &file_deephaven_core_proto_table_proto_msgTypes[98]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -7884,7 +8057,7 @@ func (x *AggSpec_AggSpecPercentile) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use AggSpec_AggSpecPercentile.ProtoReflect.Descriptor instead.
 func (*AggSpec_AggSpecPercentile) Descriptor() ([]byte, []int) {
-	return file_deephaven_proto_table_proto_rawDescGZIP(), []int{34, 5}
+	return file_deephaven_core_proto_table_proto_rawDescGZIP(), []int{35, 5}
 }
 
 func (x *AggSpec_AggSpecPercentile) GetPercentile() float64 {
@@ -7913,7 +8086,7 @@ type AggSpec_AggSpecSorted struct {
 func (x *AggSpec_AggSpecSorted) Reset() {
 	*x = AggSpec_AggSpecSorted{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_deephaven_proto_table_proto_msgTypes[97]
+		mi := &file_deephaven_core_proto_table_proto_msgTypes[99]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -7926,7 +8099,7 @@ func (x *AggSpec_AggSpecSorted) String() string {
 func (*AggSpec_AggSpecSorted) ProtoMessage() {}
 
 func (x *AggSpec_AggSpecSorted) ProtoReflect() protoreflect.Message {
-	mi := &file_deephaven_proto_table_proto_msgTypes[97]
+	mi := &file_deephaven_core_proto_table_proto_msgTypes[99]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -7939,7 +8112,7 @@ func (x *AggSpec_AggSpecSorted) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use AggSpec_AggSpecSorted.ProtoReflect.Descriptor instead.
 func (*AggSpec_AggSpecSorted) Descriptor() ([]byte, []int) {
-	return file_deephaven_proto_table_proto_rawDescGZIP(), []int{34, 6}
+	return file_deephaven_core_proto_table_proto_rawDescGZIP(), []int{35, 6}
 }
 
 func (x *AggSpec_AggSpecSorted) GetColumns() []*AggSpec_AggSpecSortedColumn {
@@ -7961,7 +8134,7 @@ type AggSpec_AggSpecSortedColumn struct {
 func (x *AggSpec_AggSpecSortedColumn) Reset() {
 	*x = AggSpec_AggSpecSortedColumn{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_deephaven_proto_table_proto_msgTypes[98]
+		mi := &file_deephaven_core_proto_table_proto_msgTypes[100]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -7974,7 +8147,7 @@ func (x *AggSpec_AggSpecSortedColumn) String() string {
 func (*AggSpec_AggSpecSortedColumn) ProtoMessage() {}
 
 func (x *AggSpec_AggSpecSortedColumn) ProtoReflect() protoreflect.Message {
-	mi := &file_deephaven_proto_table_proto_msgTypes[98]
+	mi := &file_deephaven_core_proto_table_proto_msgTypes[100]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -7987,7 +8160,7 @@ func (x *AggSpec_AggSpecSortedColumn) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use AggSpec_AggSpecSortedColumn.ProtoReflect.Descriptor instead.
 func (*AggSpec_AggSpecSortedColumn) Descriptor() ([]byte, []int) {
-	return file_deephaven_proto_table_proto_rawDescGZIP(), []int{34, 7}
+	return file_deephaven_core_proto_table_proto_rawDescGZIP(), []int{35, 7}
 }
 
 func (x *AggSpec_AggSpecSortedColumn) GetColumnName() string {
@@ -8010,7 +8183,7 @@ type AggSpec_AggSpecTDigest struct {
 func (x *AggSpec_AggSpecTDigest) Reset() {
 	*x = AggSpec_AggSpecTDigest{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_deephaven_proto_table_proto_msgTypes[99]
+		mi := &file_deephaven_core_proto_table_proto_msgTypes[101]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -8023,7 +8196,7 @@ func (x *AggSpec_AggSpecTDigest) String() string {
 func (*AggSpec_AggSpecTDigest) ProtoMessage() {}
 
 func (x *AggSpec_AggSpecTDigest) ProtoReflect() protoreflect.Message {
-	mi := &file_deephaven_proto_table_proto_msgTypes[99]
+	mi := &file_deephaven_core_proto_table_proto_msgTypes[101]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -8036,7 +8209,7 @@ func (x *AggSpec_AggSpecTDigest) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use AggSpec_AggSpecTDigest.ProtoReflect.Descriptor instead.
 func (*AggSpec_AggSpecTDigest) Descriptor() ([]byte, []int) {
-	return file_deephaven_proto_table_proto_rawDescGZIP(), []int{34, 8}
+	return file_deephaven_core_proto_table_proto_rawDescGZIP(), []int{35, 8}
 }
 
 func (x *AggSpec_AggSpecTDigest) GetCompression() float64 {
@@ -8060,7 +8233,7 @@ type AggSpec_AggSpecUnique struct {
 func (x *AggSpec_AggSpecUnique) Reset() {
 	*x = AggSpec_AggSpecUnique{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_deephaven_proto_table_proto_msgTypes[100]
+		mi := &file_deephaven_core_proto_table_proto_msgTypes[102]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -8073,7 +8246,7 @@ func (x *AggSpec_AggSpecUnique) String() string {
 func (*AggSpec_AggSpecUnique) ProtoMessage() {}
 
 func (x *AggSpec_AggSpecUnique) ProtoReflect() protoreflect.Message {
-	mi := &file_deephaven_proto_table_proto_msgTypes[100]
+	mi := &file_deephaven_core_proto_table_proto_msgTypes[102]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -8086,7 +8259,7 @@ func (x *AggSpec_AggSpecUnique) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use AggSpec_AggSpecUnique.ProtoReflect.Descriptor instead.
 func (*AggSpec_AggSpecUnique) Descriptor() ([]byte, []int) {
-	return file_deephaven_proto_table_proto_rawDescGZIP(), []int{34, 9}
+	return file_deephaven_core_proto_table_proto_rawDescGZIP(), []int{35, 9}
 }
 
 func (x *AggSpec_AggSpecUnique) GetIncludeNulls() bool {
@@ -8125,7 +8298,7 @@ type AggSpec_AggSpecNonUniqueSentinel struct {
 func (x *AggSpec_AggSpecNonUniqueSentinel) Reset() {
 	*x = AggSpec_AggSpecNonUniqueSentinel{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_deephaven_proto_table_proto_msgTypes[101]
+		mi := &file_deephaven_core_proto_table_proto_msgTypes[103]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -8138,7 +8311,7 @@ func (x *AggSpec_AggSpecNonUniqueSentinel) String() string {
 func (*AggSpec_AggSpecNonUniqueSentinel) ProtoMessage() {}
 
 func (x *AggSpec_AggSpecNonUniqueSentinel) ProtoReflect() protoreflect.Message {
-	mi := &file_deephaven_proto_table_proto_msgTypes[101]
+	mi := &file_deephaven_core_proto_table_proto_msgTypes[103]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -8151,7 +8324,7 @@ func (x *AggSpec_AggSpecNonUniqueSentinel) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use AggSpec_AggSpecNonUniqueSentinel.ProtoReflect.Descriptor instead.
 func (*AggSpec_AggSpecNonUniqueSentinel) Descriptor() ([]byte, []int) {
-	return file_deephaven_proto_table_proto_rawDescGZIP(), []int{34, 10}
+	return file_deephaven_core_proto_table_proto_rawDescGZIP(), []int{35, 10}
 }
 
 func (m *AggSpec_AggSpecNonUniqueSentinel) GetType() isAggSpec_AggSpecNonUniqueSentinel_Type {
@@ -8310,7 +8483,7 @@ type AggSpec_AggSpecWeighted struct {
 func (x *AggSpec_AggSpecWeighted) Reset() {
 	*x = AggSpec_AggSpecWeighted{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_deephaven_proto_table_proto_msgTypes[102]
+		mi := &file_deephaven_core_proto_table_proto_msgTypes[104]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -8323,7 +8496,7 @@ func (x *AggSpec_AggSpecWeighted) String() string {
 func (*AggSpec_AggSpecWeighted) ProtoMessage() {}
 
 func (x *AggSpec_AggSpecWeighted) ProtoReflect() protoreflect.Message {
-	mi := &file_deephaven_proto_table_proto_msgTypes[102]
+	mi := &file_deephaven_core_proto_table_proto_msgTypes[104]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -8336,7 +8509,7 @@ func (x *AggSpec_AggSpecWeighted) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use AggSpec_AggSpecWeighted.ProtoReflect.Descriptor instead.
 func (*AggSpec_AggSpecWeighted) Descriptor() ([]byte, []int) {
-	return file_deephaven_proto_table_proto_rawDescGZIP(), []int{34, 11}
+	return file_deephaven_core_proto_table_proto_rawDescGZIP(), []int{35, 11}
 }
 
 func (x *AggSpec_AggSpecWeighted) GetWeightColumn() string {
@@ -8355,7 +8528,7 @@ type AggSpec_AggSpecAbsSum struct {
 func (x *AggSpec_AggSpecAbsSum) Reset() {
 	*x = AggSpec_AggSpecAbsSum{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_deephaven_proto_table_proto_msgTypes[103]
+		mi := &file_deephaven_core_proto_table_proto_msgTypes[105]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -8368,7 +8541,7 @@ func (x *AggSpec_AggSpecAbsSum) String() string {
 func (*AggSpec_AggSpecAbsSum) ProtoMessage() {}
 
 func (x *AggSpec_AggSpecAbsSum) ProtoReflect() protoreflect.Message {
-	mi := &file_deephaven_proto_table_proto_msgTypes[103]
+	mi := &file_deephaven_core_proto_table_proto_msgTypes[105]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -8381,7 +8554,7 @@ func (x *AggSpec_AggSpecAbsSum) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use AggSpec_AggSpecAbsSum.ProtoReflect.Descriptor instead.
 func (*AggSpec_AggSpecAbsSum) Descriptor() ([]byte, []int) {
-	return file_deephaven_proto_table_proto_rawDescGZIP(), []int{34, 12}
+	return file_deephaven_core_proto_table_proto_rawDescGZIP(), []int{35, 12}
 }
 
 type AggSpec_AggSpecAvg struct {
@@ -8393,7 +8566,7 @@ type AggSpec_AggSpecAvg struct {
 func (x *AggSpec_AggSpecAvg) Reset() {
 	*x = AggSpec_AggSpecAvg{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_deephaven_proto_table_proto_msgTypes[104]
+		mi := &file_deephaven_core_proto_table_proto_msgTypes[106]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -8406,7 +8579,7 @@ func (x *AggSpec_AggSpecAvg) String() string {
 func (*AggSpec_AggSpecAvg) ProtoMessage() {}
 
 func (x *AggSpec_AggSpecAvg) ProtoReflect() protoreflect.Message {
-	mi := &file_deephaven_proto_table_proto_msgTypes[104]
+	mi := &file_deephaven_core_proto_table_proto_msgTypes[106]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -8419,7 +8592,7 @@ func (x *AggSpec_AggSpecAvg) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use AggSpec_AggSpecAvg.ProtoReflect.Descriptor instead.
 func (*AggSpec_AggSpecAvg) Descriptor() ([]byte, []int) {
-	return file_deephaven_proto_table_proto_rawDescGZIP(), []int{34, 13}
+	return file_deephaven_core_proto_table_proto_rawDescGZIP(), []int{35, 13}
 }
 
 type AggSpec_AggSpecFirst struct {
@@ -8431,7 +8604,7 @@ type AggSpec_AggSpecFirst struct {
 func (x *AggSpec_AggSpecFirst) Reset() {
 	*x = AggSpec_AggSpecFirst{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_deephaven_proto_table_proto_msgTypes[105]
+		mi := &file_deephaven_core_proto_table_proto_msgTypes[107]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -8444,7 +8617,7 @@ func (x *AggSpec_AggSpecFirst) String() string {
 func (*AggSpec_AggSpecFirst) ProtoMessage() {}
 
 func (x *AggSpec_AggSpecFirst) ProtoReflect() protoreflect.Message {
-	mi := &file_deephaven_proto_table_proto_msgTypes[105]
+	mi := &file_deephaven_core_proto_table_proto_msgTypes[107]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -8457,7 +8630,7 @@ func (x *AggSpec_AggSpecFirst) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use AggSpec_AggSpecFirst.ProtoReflect.Descriptor instead.
 func (*AggSpec_AggSpecFirst) Descriptor() ([]byte, []int) {
-	return file_deephaven_proto_table_proto_rawDescGZIP(), []int{34, 14}
+	return file_deephaven_core_proto_table_proto_rawDescGZIP(), []int{35, 14}
 }
 
 type AggSpec_AggSpecFreeze struct {
@@ -8469,7 +8642,7 @@ type AggSpec_AggSpecFreeze struct {
 func (x *AggSpec_AggSpecFreeze) Reset() {
 	*x = AggSpec_AggSpecFreeze{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_deephaven_proto_table_proto_msgTypes[106]
+		mi := &file_deephaven_core_proto_table_proto_msgTypes[108]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -8482,7 +8655,7 @@ func (x *AggSpec_AggSpecFreeze) String() string {
 func (*AggSpec_AggSpecFreeze) ProtoMessage() {}
 
 func (x *AggSpec_AggSpecFreeze) ProtoReflect() protoreflect.Message {
-	mi := &file_deephaven_proto_table_proto_msgTypes[106]
+	mi := &file_deephaven_core_proto_table_proto_msgTypes[108]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -8495,7 +8668,7 @@ func (x *AggSpec_AggSpecFreeze) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use AggSpec_AggSpecFreeze.ProtoReflect.Descriptor instead.
 func (*AggSpec_AggSpecFreeze) Descriptor() ([]byte, []int) {
-	return file_deephaven_proto_table_proto_rawDescGZIP(), []int{34, 15}
+	return file_deephaven_core_proto_table_proto_rawDescGZIP(), []int{35, 15}
 }
 
 type AggSpec_AggSpecGroup struct {
@@ -8507,7 +8680,7 @@ type AggSpec_AggSpecGroup struct {
 func (x *AggSpec_AggSpecGroup) Reset() {
 	*x = AggSpec_AggSpecGroup{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_deephaven_proto_table_proto_msgTypes[107]
+		mi := &file_deephaven_core_proto_table_proto_msgTypes[109]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -8520,7 +8693,7 @@ func (x *AggSpec_AggSpecGroup) String() string {
 func (*AggSpec_AggSpecGroup) ProtoMessage() {}
 
 func (x *AggSpec_AggSpecGroup) ProtoReflect() protoreflect.Message {
-	mi := &file_deephaven_proto_table_proto_msgTypes[107]
+	mi := &file_deephaven_core_proto_table_proto_msgTypes[109]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -8533,7 +8706,7 @@ func (x *AggSpec_AggSpecGroup) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use AggSpec_AggSpecGroup.ProtoReflect.Descriptor instead.
 func (*AggSpec_AggSpecGroup) Descriptor() ([]byte, []int) {
-	return file_deephaven_proto_table_proto_rawDescGZIP(), []int{34, 16}
+	return file_deephaven_core_proto_table_proto_rawDescGZIP(), []int{35, 16}
 }
 
 type AggSpec_AggSpecLast struct {
@@ -8545,7 +8718,7 @@ type AggSpec_AggSpecLast struct {
 func (x *AggSpec_AggSpecLast) Reset() {
 	*x = AggSpec_AggSpecLast{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_deephaven_proto_table_proto_msgTypes[108]
+		mi := &file_deephaven_core_proto_table_proto_msgTypes[110]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -8558,7 +8731,7 @@ func (x *AggSpec_AggSpecLast) String() string {
 func (*AggSpec_AggSpecLast) ProtoMessage() {}
 
 func (x *AggSpec_AggSpecLast) ProtoReflect() protoreflect.Message {
-	mi := &file_deephaven_proto_table_proto_msgTypes[108]
+	mi := &file_deephaven_core_proto_table_proto_msgTypes[110]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -8571,7 +8744,7 @@ func (x *AggSpec_AggSpecLast) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use AggSpec_AggSpecLast.ProtoReflect.Descriptor instead.
 func (*AggSpec_AggSpecLast) Descriptor() ([]byte, []int) {
-	return file_deephaven_proto_table_proto_rawDescGZIP(), []int{34, 17}
+	return file_deephaven_core_proto_table_proto_rawDescGZIP(), []int{35, 17}
 }
 
 type AggSpec_AggSpecMax struct {
@@ -8583,7 +8756,7 @@ type AggSpec_AggSpecMax struct {
 func (x *AggSpec_AggSpecMax) Reset() {
 	*x = AggSpec_AggSpecMax{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_deephaven_proto_table_proto_msgTypes[109]
+		mi := &file_deephaven_core_proto_table_proto_msgTypes[111]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -8596,7 +8769,7 @@ func (x *AggSpec_AggSpecMax) String() string {
 func (*AggSpec_AggSpecMax) ProtoMessage() {}
 
 func (x *AggSpec_AggSpecMax) ProtoReflect() protoreflect.Message {
-	mi := &file_deephaven_proto_table_proto_msgTypes[109]
+	mi := &file_deephaven_core_proto_table_proto_msgTypes[111]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -8609,7 +8782,7 @@ func (x *AggSpec_AggSpecMax) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use AggSpec_AggSpecMax.ProtoReflect.Descriptor instead.
 func (*AggSpec_AggSpecMax) Descriptor() ([]byte, []int) {
-	return file_deephaven_proto_table_proto_rawDescGZIP(), []int{34, 18}
+	return file_deephaven_core_proto_table_proto_rawDescGZIP(), []int{35, 18}
 }
 
 type AggSpec_AggSpecMin struct {
@@ -8621,7 +8794,7 @@ type AggSpec_AggSpecMin struct {
 func (x *AggSpec_AggSpecMin) Reset() {
 	*x = AggSpec_AggSpecMin{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_deephaven_proto_table_proto_msgTypes[110]
+		mi := &file_deephaven_core_proto_table_proto_msgTypes[112]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -8634,7 +8807,7 @@ func (x *AggSpec_AggSpecMin) String() string {
 func (*AggSpec_AggSpecMin) ProtoMessage() {}
 
 func (x *AggSpec_AggSpecMin) ProtoReflect() protoreflect.Message {
-	mi := &file_deephaven_proto_table_proto_msgTypes[110]
+	mi := &file_deephaven_core_proto_table_proto_msgTypes[112]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -8647,7 +8820,7 @@ func (x *AggSpec_AggSpecMin) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use AggSpec_AggSpecMin.ProtoReflect.Descriptor instead.
 func (*AggSpec_AggSpecMin) Descriptor() ([]byte, []int) {
-	return file_deephaven_proto_table_proto_rawDescGZIP(), []int{34, 19}
+	return file_deephaven_core_proto_table_proto_rawDescGZIP(), []int{35, 19}
 }
 
 type AggSpec_AggSpecStd struct {
@@ -8659,7 +8832,7 @@ type AggSpec_AggSpecStd struct {
 func (x *AggSpec_AggSpecStd) Reset() {
 	*x = AggSpec_AggSpecStd{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_deephaven_proto_table_proto_msgTypes[111]
+		mi := &file_deephaven_core_proto_table_proto_msgTypes[113]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -8672,7 +8845,7 @@ func (x *AggSpec_AggSpecStd) String() string {
 func (*AggSpec_AggSpecStd) ProtoMessage() {}
 
 func (x *AggSpec_AggSpecStd) ProtoReflect() protoreflect.Message {
-	mi := &file_deephaven_proto_table_proto_msgTypes[111]
+	mi := &file_deephaven_core_proto_table_proto_msgTypes[113]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -8685,7 +8858,7 @@ func (x *AggSpec_AggSpecStd) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use AggSpec_AggSpecStd.ProtoReflect.Descriptor instead.
 func (*AggSpec_AggSpecStd) Descriptor() ([]byte, []int) {
-	return file_deephaven_proto_table_proto_rawDescGZIP(), []int{34, 20}
+	return file_deephaven_core_proto_table_proto_rawDescGZIP(), []int{35, 20}
 }
 
 type AggSpec_AggSpecSum struct {
@@ -8697,7 +8870,7 @@ type AggSpec_AggSpecSum struct {
 func (x *AggSpec_AggSpecSum) Reset() {
 	*x = AggSpec_AggSpecSum{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_deephaven_proto_table_proto_msgTypes[112]
+		mi := &file_deephaven_core_proto_table_proto_msgTypes[114]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -8710,7 +8883,7 @@ func (x *AggSpec_AggSpecSum) String() string {
 func (*AggSpec_AggSpecSum) ProtoMessage() {}
 
 func (x *AggSpec_AggSpecSum) ProtoReflect() protoreflect.Message {
-	mi := &file_deephaven_proto_table_proto_msgTypes[112]
+	mi := &file_deephaven_core_proto_table_proto_msgTypes[114]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -8723,7 +8896,7 @@ func (x *AggSpec_AggSpecSum) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use AggSpec_AggSpecSum.ProtoReflect.Descriptor instead.
 func (*AggSpec_AggSpecSum) Descriptor() ([]byte, []int) {
-	return file_deephaven_proto_table_proto_rawDescGZIP(), []int{34, 21}
+	return file_deephaven_core_proto_table_proto_rawDescGZIP(), []int{35, 21}
 }
 
 type AggSpec_AggSpecVar struct {
@@ -8735,7 +8908,7 @@ type AggSpec_AggSpecVar struct {
 func (x *AggSpec_AggSpecVar) Reset() {
 	*x = AggSpec_AggSpecVar{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_deephaven_proto_table_proto_msgTypes[113]
+		mi := &file_deephaven_core_proto_table_proto_msgTypes[115]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -8748,7 +8921,7 @@ func (x *AggSpec_AggSpecVar) String() string {
 func (*AggSpec_AggSpecVar) ProtoMessage() {}
 
 func (x *AggSpec_AggSpecVar) ProtoReflect() protoreflect.Message {
-	mi := &file_deephaven_proto_table_proto_msgTypes[113]
+	mi := &file_deephaven_core_proto_table_proto_msgTypes[115]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -8761,7 +8934,7 @@ func (x *AggSpec_AggSpecVar) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use AggSpec_AggSpecVar.ProtoReflect.Descriptor instead.
 func (*AggSpec_AggSpecVar) Descriptor() ([]byte, []int) {
-	return file_deephaven_proto_table_proto_rawDescGZIP(), []int{34, 22}
+	return file_deephaven_core_proto_table_proto_rawDescGZIP(), []int{35, 22}
 }
 
 type Aggregation_AggregationColumns struct {
@@ -8776,7 +8949,7 @@ type Aggregation_AggregationColumns struct {
 func (x *Aggregation_AggregationColumns) Reset() {
 	*x = Aggregation_AggregationColumns{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_deephaven_proto_table_proto_msgTypes[114]
+		mi := &file_deephaven_core_proto_table_proto_msgTypes[116]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -8789,7 +8962,7 @@ func (x *Aggregation_AggregationColumns) String() string {
 func (*Aggregation_AggregationColumns) ProtoMessage() {}
 
 func (x *Aggregation_AggregationColumns) ProtoReflect() protoreflect.Message {
-	mi := &file_deephaven_proto_table_proto_msgTypes[114]
+	mi := &file_deephaven_core_proto_table_proto_msgTypes[116]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -8802,7 +8975,7 @@ func (x *Aggregation_AggregationColumns) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use Aggregation_AggregationColumns.ProtoReflect.Descriptor instead.
 func (*Aggregation_AggregationColumns) Descriptor() ([]byte, []int) {
-	return file_deephaven_proto_table_proto_rawDescGZIP(), []int{36, 0}
+	return file_deephaven_core_proto_table_proto_rawDescGZIP(), []int{37, 0}
 }
 
 func (x *Aggregation_AggregationColumns) GetSpec() *AggSpec {
@@ -8831,7 +9004,7 @@ type Aggregation_AggregationCount struct {
 func (x *Aggregation_AggregationCount) Reset() {
 	*x = Aggregation_AggregationCount{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_deephaven_proto_table_proto_msgTypes[115]
+		mi := &file_deephaven_core_proto_table_proto_msgTypes[117]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -8844,7 +9017,7 @@ func (x *Aggregation_AggregationCount) String() string {
 func (*Aggregation_AggregationCount) ProtoMessage() {}
 
 func (x *Aggregation_AggregationCount) ProtoReflect() protoreflect.Message {
-	mi := &file_deephaven_proto_table_proto_msgTypes[115]
+	mi := &file_deephaven_core_proto_table_proto_msgTypes[117]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -8857,7 +9030,7 @@ func (x *Aggregation_AggregationCount) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use Aggregation_AggregationCount.ProtoReflect.Descriptor instead.
 func (*Aggregation_AggregationCount) Descriptor() ([]byte, []int) {
-	return file_deephaven_proto_table_proto_rawDescGZIP(), []int{36, 1}
+	return file_deephaven_core_proto_table_proto_rawDescGZIP(), []int{37, 1}
 }
 
 func (x *Aggregation_AggregationCount) GetColumnName() string {
@@ -8867,6 +9040,62 @@ func (x *Aggregation_AggregationCount) GetColumnName() string {
 	return ""
 }
 
+type Aggregation_AggregationCountWhere struct {
+	state         protoimpl.MessageState
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
+
+	// The output column name
+	ColumnName string   `protobuf:"bytes,1,opt,name=column_name,json=columnName,proto3" json:"column_name,omitempty"`
+	Filters    []string `protobuf:"bytes,2,rep,name=filters,proto3" json:"filters,omitempty"`
+}
+
+func (x *Aggregation_AggregationCountWhere) Reset() {
+	*x = Aggregation_AggregationCountWhere{}
+	if protoimpl.UnsafeEnabled {
+		mi := &file_deephaven_core_proto_table_proto_msgTypes[118]
+		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+		ms.StoreMessageInfo(mi)
+	}
+}
+
+func (x *Aggregation_AggregationCountWhere) String() string {
+	return protoimpl.X.MessageStringOf(x)
+}
+
+func (*Aggregation_AggregationCountWhere) ProtoMessage() {}
+
+func (x *Aggregation_AggregationCountWhere) ProtoReflect() protoreflect.Message {
+	mi := &file_deephaven_core_proto_table_proto_msgTypes[118]
+	if protoimpl.UnsafeEnabled && x != nil {
+		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+		if ms.LoadMessageInfo() == nil {
+			ms.StoreMessageInfo(mi)
+		}
+		return ms
+	}
+	return mi.MessageOf(x)
+}
+
+// Deprecated: Use Aggregation_AggregationCountWhere.ProtoReflect.Descriptor instead.
+func (*Aggregation_AggregationCountWhere) Descriptor() ([]byte, []int) {
+	return file_deephaven_core_proto_table_proto_rawDescGZIP(), []int{37, 2}
+}
+
+func (x *Aggregation_AggregationCountWhere) GetColumnName() string {
+	if x != nil {
+		return x.ColumnName
+	}
+	return ""
+}
+
+func (x *Aggregation_AggregationCountWhere) GetFilters() []string {
+	if x != nil {
+		return x.Filters
+	}
+	return nil
+}
+
 type Aggregation_AggregationRowKey struct {
 	state         protoimpl.MessageState
 	sizeCache     protoimpl.SizeCache
@@ -8878,7 +9107,7 @@ type Aggregation_AggregationRowKey struct {
 func (x *Aggregation_AggregationRowKey) Reset() {
 	*x = Aggregation_AggregationRowKey{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_deephaven_proto_table_proto_msgTypes[116]
+		mi := &file_deephaven_core_proto_table_proto_msgTypes[119]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -8891,7 +9120,7 @@ func (x *Aggregation_AggregationRowKey) String() string {
 func (*Aggregation_AggregationRowKey) ProtoMessage() {}
 
 func (x *Aggregation_AggregationRowKey) ProtoReflect() protoreflect.Message {
-	mi := &file_deephaven_proto_table_proto_msgTypes[116]
+	mi := &file_deephaven_core_proto_table_proto_msgTypes[119]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -8904,7 +9133,7 @@ func (x *Aggregation_AggregationRowKey) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use Aggregation_AggregationRowKey.ProtoReflect.Descriptor instead.
 func (*Aggregation_AggregationRowKey) Descriptor() ([]byte, []int) {
-	return file_deephaven_proto_table_proto_rawDescGZIP(), []int{36, 2}
+	return file_deephaven_core_proto_table_proto_rawDescGZIP(), []int{37, 3}
 }
 
 func (x *Aggregation_AggregationRowKey) GetColumnName() string {
@@ -8926,7 +9155,7 @@ type Aggregation_AggregationPartition struct {
 func (x *Aggregation_AggregationPartition) Reset() {
 	*x = Aggregation_AggregationPartition{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_deephaven_proto_table_proto_msgTypes[117]
+		mi := &file_deephaven_core_proto_table_proto_msgTypes[120]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -8939,7 +9168,7 @@ func (x *Aggregation_AggregationPartition) String() string {
 func (*Aggregation_AggregationPartition) ProtoMessage() {}
 
 func (x *Aggregation_AggregationPartition) ProtoReflect() protoreflect.Message {
-	mi := &file_deephaven_proto_table_proto_msgTypes[117]
+	mi := &file_deephaven_core_proto_table_proto_msgTypes[120]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -8952,7 +9181,7 @@ func (x *Aggregation_AggregationPartition) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use Aggregation_AggregationPartition.ProtoReflect.Descriptor instead.
 func (*Aggregation_AggregationPartition) Descriptor() ([]byte, []int) {
-	return file_deephaven_proto_table_proto_rawDescGZIP(), []int{36, 3}
+	return file_deephaven_core_proto_table_proto_rawDescGZIP(), []int{37, 4}
 }
 
 func (x *Aggregation_AggregationPartition) GetColumnName() string {
@@ -8969,6 +9198,53 @@ func (x *Aggregation_AggregationPartition) GetIncludeGroupByColumns() bool {
 	return false
 }
 
+type Aggregation_AggregationFormula struct {
+	state         protoimpl.MessageState
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
+
+	Selectable *Selectable `protobuf:"bytes,1,opt,name=selectable,proto3" json:"selectable,omitempty"`
+}
+
+func (x *Aggregation_AggregationFormula) Reset() {
+	*x = Aggregation_AggregationFormula{}
+	if protoimpl.UnsafeEnabled {
+		mi := &file_deephaven_core_proto_table_proto_msgTypes[121]
+		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+		ms.StoreMessageInfo(mi)
+	}
+}
+
+func (x *Aggregation_AggregationFormula) String() string {
+	return protoimpl.X.MessageStringOf(x)
+}
+
+func (*Aggregation_AggregationFormula) ProtoMessage() {}
+
+func (x *Aggregation_AggregationFormula) ProtoReflect() protoreflect.Message {
+	mi := &file_deephaven_core_proto_table_proto_msgTypes[121]
+	if protoimpl.UnsafeEnabled && x != nil {
+		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+		if ms.LoadMessageInfo() == nil {
+			ms.StoreMessageInfo(mi)
+		}
+		return ms
+	}
+	return mi.MessageOf(x)
+}
+
+// Deprecated: Use Aggregation_AggregationFormula.ProtoReflect.Descriptor instead.
+func (*Aggregation_AggregationFormula) Descriptor() ([]byte, []int) {
+	return file_deephaven_core_proto_table_proto_rawDescGZIP(), []int{37, 5}
+}
+
+func (x *Aggregation_AggregationFormula) GetSelectable() *Selectable {
+	if x != nil {
+		return x.Selectable
+	}
+	return nil
+}
+
 type RunChartDownsampleRequest_ZoomRange struct {
 	state         protoimpl.MessageState
 	sizeCache     protoimpl.SizeCache
@@ -8981,7 +9257,7 @@ type RunChartDownsampleRequest_ZoomRange struct {
 func (x *RunChartDownsampleRequest_ZoomRange) Reset() {
 	*x = RunChartDownsampleRequest_ZoomRange{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_deephaven_proto_table_proto_msgTypes[118]
+		mi := &file_deephaven_core_proto_table_proto_msgTypes[122]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -8994,7 +9270,7 @@ func (x *RunChartDownsampleRequest_ZoomRange) String() string {
 func (*RunChartDownsampleRequest_ZoomRange) ProtoMessage() {}
 
 func (x *RunChartDownsampleRequest_ZoomRange) ProtoReflect() protoreflect.Message {
-	mi := &file_deephaven_proto_table_proto_msgTypes[118]
+	mi := &file_deephaven_core_proto_table_proto_msgTypes[122]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -9007,7 +9283,7 @@ func (x *RunChartDownsampleRequest_ZoomRange) ProtoReflect() protoreflect.Messag
 
 // Deprecated: Use RunChartDownsampleRequest_ZoomRange.ProtoReflect.Descriptor instead.
 func (*RunChartDownsampleRequest_ZoomRange) Descriptor() ([]byte, []int) {
-	return file_deephaven_proto_table_proto_rawDescGZIP(), []int{58, 0}
+	return file_deephaven_core_proto_table_proto_rawDescGZIP(), []int{59, 0}
 }
 
 func (x *RunChartDownsampleRequest_ZoomRange) GetMinDateNanos() int64 {
@@ -9039,7 +9315,7 @@ type CreateInputTableRequest_InputTableKind struct {
 func (x *CreateInputTableRequest_InputTableKind) Reset() {
 	*x = CreateInputTableRequest_InputTableKind{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_deephaven_proto_table_proto_msgTypes[119]
+		mi := &file_deephaven_core_proto_table_proto_msgTypes[123]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -9052,7 +9328,7 @@ func (x *CreateInputTableRequest_InputTableKind) String() string {
 func (*CreateInputTableRequest_InputTableKind) ProtoMessage() {}
 
 func (x *CreateInputTableRequest_InputTableKind) ProtoReflect() protoreflect.Message {
-	mi := &file_deephaven_proto_table_proto_msgTypes[119]
+	mi := &file_deephaven_core_proto_table_proto_msgTypes[123]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -9065,7 +9341,7 @@ func (x *CreateInputTableRequest_InputTableKind) ProtoReflect() protoreflect.Mes
 
 // Deprecated: Use CreateInputTableRequest_InputTableKind.ProtoReflect.Descriptor instead.
 func (*CreateInputTableRequest_InputTableKind) Descriptor() ([]byte, []int) {
-	return file_deephaven_proto_table_proto_rawDescGZIP(), []int{59, 0}
+	return file_deephaven_core_proto_table_proto_rawDescGZIP(), []int{60, 0}
 }
 
 func (m *CreateInputTableRequest_InputTableKind) GetKind() isCreateInputTableRequest_InputTableKind_Kind {
@@ -9131,7 +9407,7 @@ type CreateInputTableRequest_InputTableKind_InMemoryAppendOnly struct {
 func (x *CreateInputTableRequest_InputTableKind_InMemoryAppendOnly) Reset() {
 	*x = CreateInputTableRequest_InputTableKind_InMemoryAppendOnly{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_deephaven_proto_table_proto_msgTypes[120]
+		mi := &file_deephaven_core_proto_table_proto_msgTypes[124]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -9144,7 +9420,7 @@ func (x *CreateInputTableRequest_InputTableKind_InMemoryAppendOnly) String() str
 func (*CreateInputTableRequest_InputTableKind_InMemoryAppendOnly) ProtoMessage() {}
 
 func (x *CreateInputTableRequest_InputTableKind_InMemoryAppendOnly) ProtoReflect() protoreflect.Message {
-	mi := &file_deephaven_proto_table_proto_msgTypes[120]
+	mi := &file_deephaven_core_proto_table_proto_msgTypes[124]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -9157,7 +9433,7 @@ func (x *CreateInputTableRequest_InputTableKind_InMemoryAppendOnly) ProtoReflect
 
 // Deprecated: Use CreateInputTableRequest_InputTableKind_InMemoryAppendOnly.ProtoReflect.Descriptor instead.
 func (*CreateInputTableRequest_InputTableKind_InMemoryAppendOnly) Descriptor() ([]byte, []int) {
-	return file_deephaven_proto_table_proto_rawDescGZIP(), []int{59, 0, 0}
+	return file_deephaven_core_proto_table_proto_rawDescGZIP(), []int{60, 0, 0}
 }
 
 // Creates an in-memory table that supports updates and deletes by keys.
@@ -9172,7 +9448,7 @@ type CreateInputTableRequest_InputTableKind_InMemoryKeyBacked struct {
 func (x *CreateInputTableRequest_InputTableKind_InMemoryKeyBacked) Reset() {
 	*x = CreateInputTableRequest_InputTableKind_InMemoryKeyBacked{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_deephaven_proto_table_proto_msgTypes[121]
+		mi := &file_deephaven_core_proto_table_proto_msgTypes[125]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -9185,7 +9461,7 @@ func (x *CreateInputTableRequest_InputTableKind_InMemoryKeyBacked) String() stri
 func (*CreateInputTableRequest_InputTableKind_InMemoryKeyBacked) ProtoMessage() {}
 
 func (x *CreateInputTableRequest_InputTableKind_InMemoryKeyBacked) ProtoReflect() protoreflect.Message {
-	mi := &file_deephaven_proto_table_proto_msgTypes[121]
+	mi := &file_deephaven_core_proto_table_proto_msgTypes[125]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -9198,7 +9474,7 @@ func (x *CreateInputTableRequest_InputTableKind_InMemoryKeyBacked) ProtoReflect(
 
 // Deprecated: Use CreateInputTableRequest_InputTableKind_InMemoryKeyBacked.ProtoReflect.Descriptor instead.
 func (*CreateInputTableRequest_InputTableKind_InMemoryKeyBacked) Descriptor() ([]byte, []int) {
-	return file_deephaven_proto_table_proto_rawDescGZIP(), []int{59, 0, 1}
+	return file_deephaven_core_proto_table_proto_rawDescGZIP(), []int{60, 0, 1}
 }
 
 func (x *CreateInputTableRequest_InputTableKind_InMemoryKeyBacked) GetKeyColumns() []string {
@@ -9217,7 +9493,7 @@ type CreateInputTableRequest_InputTableKind_Blink struct {
 func (x *CreateInputTableRequest_InputTableKind_Blink) Reset() {
 	*x = CreateInputTableRequest_InputTableKind_Blink{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_deephaven_proto_table_proto_msgTypes[122]
+		mi := &file_deephaven_core_proto_table_proto_msgTypes[126]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -9230,7 +9506,7 @@ func (x *CreateInputTableRequest_InputTableKind_Blink) String() string {
 func (*CreateInputTableRequest_InputTableKind_Blink) ProtoMessage() {}
 
 func (x *CreateInputTableRequest_InputTableKind_Blink) ProtoReflect() protoreflect.Message {
-	mi := &file_deephaven_proto_table_proto_msgTypes[122]
+	mi := &file_deephaven_core_proto_table_proto_msgTypes[126]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -9243,7 +9519,7 @@ func (x *CreateInputTableRequest_InputTableKind_Blink) ProtoReflect() protorefle
 
 // Deprecated: Use CreateInputTableRequest_InputTableKind_Blink.ProtoReflect.Descriptor instead.
 func (*CreateInputTableRequest_InputTableKind_Blink) Descriptor() ([]byte, []int) {
-	return file_deephaven_proto_table_proto_rawDescGZIP(), []int{59, 0, 2}
+	return file_deephaven_core_proto_table_proto_rawDescGZIP(), []int{60, 0, 2}
 }
 
 type BatchTableRequest_Operation struct {
@@ -9293,13 +9569,14 @@ type BatchTableRequest_Operation struct {
 	//	*BatchTableRequest_Operation_Raj
 	//	*BatchTableRequest_Operation_ColumnStatistics
 	//	*BatchTableRequest_Operation_MultiJoin
+	//	*BatchTableRequest_Operation_Slice
 	Op isBatchTableRequest_Operation_Op `protobuf_oneof:"op"`
 }
 
 func (x *BatchTableRequest_Operation) Reset() {
 	*x = BatchTableRequest_Operation{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_deephaven_proto_table_proto_msgTypes[123]
+		mi := &file_deephaven_core_proto_table_proto_msgTypes[127]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -9312,7 +9589,7 @@ func (x *BatchTableRequest_Operation) String() string {
 func (*BatchTableRequest_Operation) ProtoMessage() {}
 
 func (x *BatchTableRequest_Operation) ProtoReflect() protoreflect.Message {
-	mi := &file_deephaven_proto_table_proto_msgTypes[123]
+	mi := &file_deephaven_core_proto_table_proto_msgTypes[127]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -9325,7 +9602,7 @@ func (x *BatchTableRequest_Operation) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use BatchTableRequest_Operation.ProtoReflect.Descriptor instead.
 func (*BatchTableRequest_Operation) Descriptor() ([]byte, []int) {
-	return file_deephaven_proto_table_proto_rawDescGZIP(), []int{62, 0}
+	return file_deephaven_core_proto_table_proto_rawDescGZIP(), []int{64, 0}
 }
 
 func (m *BatchTableRequest_Operation) GetOp() isBatchTableRequest_Operation_Op {
@@ -9623,6 +9900,13 @@ func (x *BatchTableRequest_Operation) GetMultiJoin() *MultiJoinTablesRequest {
 	return nil
 }
 
+func (x *BatchTableRequest_Operation) GetSlice() *SliceRequest {
+	if x, ok := x.GetOp().(*BatchTableRequest_Operation_Slice); ok {
+		return x.Slice
+	}
+	return nil
+}
+
 type isBatchTableRequest_Operation_Op interface {
 	isBatchTableRequest_Operation_Op()
 }
@@ -9792,6 +10076,10 @@ type BatchTableRequest_Operation_MultiJoin struct {
 	MultiJoin *MultiJoinTablesRequest `protobuf:"bytes,43,opt,name=multi_join,json=multiJoin,proto3,oneof"`
 }
 
+type BatchTableRequest_Operation_Slice struct {
+	Slice *SliceRequest `protobuf:"bytes,44,opt,name=slice,proto3,oneof"`
+}
+
 func (*BatchTableRequest_Operation_EmptyTable) isBatchTableRequest_Operation_Op() {}
 
 func (*BatchTableRequest_Operation_TimeTable) isBatchTableRequest_Operation_Op() {}
@@ -9874,612 +10162,647 @@ func (*BatchTableRequest_Operation_ColumnStatistics) isBatchTableRequest_Operati
 
 func (*BatchTableRequest_Operation_MultiJoin) isBatchTableRequest_Operation_Op() {}
 
-var File_deephaven_proto_table_proto protoreflect.FileDescriptor
+func (*BatchTableRequest_Operation_Slice) isBatchTableRequest_Operation_Op() {}
 
-var file_deephaven_proto_table_proto_rawDesc = []byte{
-	0x0a, 0x1b, 0x64, 0x65, 0x65, 0x70, 0x68, 0x61, 0x76, 0x65, 0x6e, 0x2f, 0x70, 0x72, 0x6f, 0x74,
-	0x6f, 0x2f, 0x74, 0x61, 0x62, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x12, 0x21, 0x69,
-	0x6f, 0x2e, 0x64, 0x65, 0x65, 0x70, 0x68, 0x61, 0x76, 0x65, 0x6e, 0x2e, 0x70, 0x72, 0x6f, 0x74,
-	0x6f, 0x2e, 0x62, 0x61, 0x63, 0x6b, 0x70, 0x6c, 0x61, 0x6e, 0x65, 0x2e, 0x67, 0x72, 0x70, 0x63,
-	0x1a, 0x1c, 0x64, 0x65, 0x65, 0x70, 0x68, 0x61, 0x76, 0x65, 0x6e, 0x2f, 0x70, 0x72, 0x6f, 0x74,
-	0x6f, 0x2f, 0x74, 0x69, 0x63, 0x6b, 0x65, 0x74, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x22, 0x81,
-	0x01, 0x0a, 0x0e, 0x54, 0x61, 0x62, 0x6c, 0x65, 0x52, 0x65, 0x66, 0x65, 0x72, 0x65, 0x6e, 0x63,
-	0x65, 0x12, 0x43, 0x0a, 0x06, 0x74, 0x69, 0x63, 0x6b, 0x65, 0x74, 0x18, 0x01, 0x20, 0x01, 0x28,
+var File_deephaven_core_proto_table_proto protoreflect.FileDescriptor
+
+var file_deephaven_core_proto_table_proto_rawDesc = []byte{
+	0x0a, 0x20, 0x64, 0x65, 0x65, 0x70, 0x68, 0x61, 0x76, 0x65, 0x6e, 0x5f, 0x63, 0x6f, 0x72, 0x65,
+	0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2f, 0x74, 0x61, 0x62, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f,
+	0x74, 0x6f, 0x12, 0x21, 0x69, 0x6f, 0x2e, 0x64, 0x65, 0x65, 0x70, 0x68, 0x61, 0x76, 0x65, 0x6e,
+	0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x62, 0x61, 0x63, 0x6b, 0x70, 0x6c, 0x61, 0x6e, 0x65,
+	0x2e, 0x67, 0x72, 0x70, 0x63, 0x1a, 0x21, 0x64, 0x65, 0x65, 0x70, 0x68, 0x61, 0x76, 0x65, 0x6e,
+	0x5f, 0x63, 0x6f, 0x72, 0x65, 0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2f, 0x74, 0x69, 0x63, 0x6b,
+	0x65, 0x74, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x22, 0x81, 0x01, 0x0a, 0x0e, 0x54, 0x61, 0x62,
+	0x6c, 0x65, 0x52, 0x65, 0x66, 0x65, 0x72, 0x65, 0x6e, 0x63, 0x65, 0x12, 0x43, 0x0a, 0x06, 0x74,
+	0x69, 0x63, 0x6b, 0x65, 0x74, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x29, 0x2e, 0x69, 0x6f,
+	0x2e, 0x64, 0x65, 0x65, 0x70, 0x68, 0x61, 0x76, 0x65, 0x6e, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f,
+	0x2e, 0x62, 0x61, 0x63, 0x6b, 0x70, 0x6c, 0x61, 0x6e, 0x65, 0x2e, 0x67, 0x72, 0x70, 0x63, 0x2e,
+	0x54, 0x69, 0x63, 0x6b, 0x65, 0x74, 0x48, 0x00, 0x52, 0x06, 0x74, 0x69, 0x63, 0x6b, 0x65, 0x74,
+	0x12, 0x23, 0x0a, 0x0c, 0x62, 0x61, 0x74, 0x63, 0x68, 0x5f, 0x6f, 0x66, 0x66, 0x73, 0x65, 0x74,
+	0x18, 0x02, 0x20, 0x01, 0x28, 0x11, 0x48, 0x00, 0x52, 0x0b, 0x62, 0x61, 0x74, 0x63, 0x68, 0x4f,
+	0x66, 0x66, 0x73, 0x65, 0x74, 0x42, 0x05, 0x0a, 0x03, 0x72, 0x65, 0x66, 0x22, 0x82, 0x02, 0x0a,
+	0x1d, 0x45, 0x78, 0x70, 0x6f, 0x72, 0x74, 0x65, 0x64, 0x54, 0x61, 0x62, 0x6c, 0x65, 0x43, 0x72,
+	0x65, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x4e,
+	0x0a, 0x09, 0x72, 0x65, 0x73, 0x75, 0x6c, 0x74, 0x5f, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28,
+	0x0b, 0x32, 0x31, 0x2e, 0x69, 0x6f, 0x2e, 0x64, 0x65, 0x65, 0x70, 0x68, 0x61, 0x76, 0x65, 0x6e,
+	0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x62, 0x61, 0x63, 0x6b, 0x70, 0x6c, 0x61, 0x6e, 0x65,
+	0x2e, 0x67, 0x72, 0x70, 0x63, 0x2e, 0x54, 0x61, 0x62, 0x6c, 0x65, 0x52, 0x65, 0x66, 0x65, 0x72,
+	0x65, 0x6e, 0x63, 0x65, 0x52, 0x08, 0x72, 0x65, 0x73, 0x75, 0x6c, 0x74, 0x49, 0x64, 0x12, 0x18,
+	0x0a, 0x07, 0x73, 0x75, 0x63, 0x63, 0x65, 0x73, 0x73, 0x18, 0x02, 0x20, 0x01, 0x28, 0x08, 0x52,
+	0x07, 0x73, 0x75, 0x63, 0x63, 0x65, 0x73, 0x73, 0x12, 0x1d, 0x0a, 0x0a, 0x65, 0x72, 0x72, 0x6f,
+	0x72, 0x5f, 0x69, 0x6e, 0x66, 0x6f, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x52, 0x09, 0x65, 0x72,
+	0x72, 0x6f, 0x72, 0x49, 0x6e, 0x66, 0x6f, 0x12, 0x23, 0x0a, 0x0d, 0x73, 0x63, 0x68, 0x65, 0x6d,
+	0x61, 0x5f, 0x68, 0x65, 0x61, 0x64, 0x65, 0x72, 0x18, 0x04, 0x20, 0x01, 0x28, 0x0c, 0x52, 0x0c,
+	0x73, 0x63, 0x68, 0x65, 0x6d, 0x61, 0x48, 0x65, 0x61, 0x64, 0x65, 0x72, 0x12, 0x1b, 0x0a, 0x09,
+	0x69, 0x73, 0x5f, 0x73, 0x74, 0x61, 0x74, 0x69, 0x63, 0x18, 0x05, 0x20, 0x01, 0x28, 0x08, 0x52,
+	0x08, 0x69, 0x73, 0x53, 0x74, 0x61, 0x74, 0x69, 0x63, 0x12, 0x16, 0x0a, 0x04, 0x73, 0x69, 0x7a,
+	0x65, 0x18, 0x06, 0x20, 0x01, 0x28, 0x12, 0x42, 0x02, 0x30, 0x01, 0x52, 0x04, 0x73, 0x69, 0x7a,
+	0x65, 0x22, 0xab, 0x01, 0x0a, 0x11, 0x46, 0x65, 0x74, 0x63, 0x68, 0x54, 0x61, 0x62, 0x6c, 0x65,
+	0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x4e, 0x0a, 0x09, 0x73, 0x6f, 0x75, 0x72, 0x63,
+	0x65, 0x5f, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x31, 0x2e, 0x69, 0x6f, 0x2e,
+	0x64, 0x65, 0x65, 0x70, 0x68, 0x61, 0x76, 0x65, 0x6e, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e,
+	0x62, 0x61, 0x63, 0x6b, 0x70, 0x6c, 0x61, 0x6e, 0x65, 0x2e, 0x67, 0x72, 0x70, 0x63, 0x2e, 0x54,
+	0x61, 0x62, 0x6c, 0x65, 0x52, 0x65, 0x66, 0x65, 0x72, 0x65, 0x6e, 0x63, 0x65, 0x52, 0x08, 0x73,
+	0x6f, 0x75, 0x72, 0x63, 0x65, 0x49, 0x64, 0x12, 0x46, 0x0a, 0x09, 0x72, 0x65, 0x73, 0x75, 0x6c,
+	0x74, 0x5f, 0x69, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x29, 0x2e, 0x69, 0x6f, 0x2e,
+	0x64, 0x65, 0x65, 0x70, 0x68, 0x61, 0x76, 0x65, 0x6e, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e,
+	0x62, 0x61, 0x63, 0x6b, 0x70, 0x6c, 0x61, 0x6e, 0x65, 0x2e, 0x67, 0x72, 0x70, 0x63, 0x2e, 0x54,
+	0x69, 0x63, 0x6b, 0x65, 0x74, 0x52, 0x08, 0x72, 0x65, 0x73, 0x75, 0x6c, 0x74, 0x49, 0x64, 0x22,
+	0xb4, 0x01, 0x0a, 0x1a, 0x41, 0x70, 0x70, 0x6c, 0x79, 0x50, 0x72, 0x65, 0x76, 0x69, 0x65, 0x77,
+	0x43, 0x6f, 0x6c, 0x75, 0x6d, 0x6e, 0x73, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x4e,
+	0x0a, 0x09, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x5f, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28,
+	0x0b, 0x32, 0x31, 0x2e, 0x69, 0x6f, 0x2e, 0x64, 0x65, 0x65, 0x70, 0x68, 0x61, 0x76, 0x65, 0x6e,
+	0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x62, 0x61, 0x63, 0x6b, 0x70, 0x6c, 0x61, 0x6e, 0x65,
+	0x2e, 0x67, 0x72, 0x70, 0x63, 0x2e, 0x54, 0x61, 0x62, 0x6c, 0x65, 0x52, 0x65, 0x66, 0x65, 0x72,
+	0x65, 0x6e, 0x63, 0x65, 0x52, 0x08, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x49, 0x64, 0x12, 0x46,
+	0x0a, 0x09, 0x72, 0x65, 0x73, 0x75, 0x6c, 0x74, 0x5f, 0x69, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28,
 	0x0b, 0x32, 0x29, 0x2e, 0x69, 0x6f, 0x2e, 0x64, 0x65, 0x65, 0x70, 0x68, 0x61, 0x76, 0x65, 0x6e,
 	0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x62, 0x61, 0x63, 0x6b, 0x70, 0x6c, 0x61, 0x6e, 0x65,
-	0x2e, 0x67, 0x72, 0x70, 0x63, 0x2e, 0x54, 0x69, 0x63, 0x6b, 0x65, 0x74, 0x48, 0x00, 0x52, 0x06,
-	0x74, 0x69, 0x63, 0x6b, 0x65, 0x74, 0x12, 0x23, 0x0a, 0x0c, 0x62, 0x61, 0x74, 0x63, 0x68, 0x5f,
-	0x6f, 0x66, 0x66, 0x73, 0x65, 0x74, 0x18, 0x02, 0x20, 0x01, 0x28, 0x11, 0x48, 0x00, 0x52, 0x0b,
-	0x62, 0x61, 0x74, 0x63, 0x68, 0x4f, 0x66, 0x66, 0x73, 0x65, 0x74, 0x42, 0x05, 0x0a, 0x03, 0x72,
-	0x65, 0x66, 0x22, 0x82, 0x02, 0x0a, 0x1d, 0x45, 0x78, 0x70, 0x6f, 0x72, 0x74, 0x65, 0x64, 0x54,
-	0x61, 0x62, 0x6c, 0x65, 0x43, 0x72, 0x65, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x52, 0x65, 0x73, 0x70,
-	0x6f, 0x6e, 0x73, 0x65, 0x12, 0x4e, 0x0a, 0x09, 0x72, 0x65, 0x73, 0x75, 0x6c, 0x74, 0x5f, 0x69,
-	0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x31, 0x2e, 0x69, 0x6f, 0x2e, 0x64, 0x65, 0x65,
+	0x2e, 0x67, 0x72, 0x70, 0x63, 0x2e, 0x54, 0x69, 0x63, 0x6b, 0x65, 0x74, 0x52, 0x08, 0x72, 0x65,
+	0x73, 0x75, 0x6c, 0x74, 0x49, 0x64, 0x22, 0x1d, 0x0a, 0x1b, 0x45, 0x78, 0x70, 0x6f, 0x72, 0x74,
+	0x65, 0x64, 0x54, 0x61, 0x62, 0x6c, 0x65, 0x55, 0x70, 0x64, 0x61, 0x74, 0x65, 0x73, 0x52, 0x65,
+	0x71, 0x75, 0x65, 0x73, 0x74, 0x22, 0xb2, 0x01, 0x0a, 0x1a, 0x45, 0x78, 0x70, 0x6f, 0x72, 0x74,
+	0x65, 0x64, 0x54, 0x61, 0x62, 0x6c, 0x65, 0x55, 0x70, 0x64, 0x61, 0x74, 0x65, 0x4d, 0x65, 0x73,
+	0x73, 0x61, 0x67, 0x65, 0x12, 0x46, 0x0a, 0x09, 0x65, 0x78, 0x70, 0x6f, 0x72, 0x74, 0x5f, 0x69,
+	0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x29, 0x2e, 0x69, 0x6f, 0x2e, 0x64, 0x65, 0x65,
 	0x70, 0x68, 0x61, 0x76, 0x65, 0x6e, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x62, 0x61, 0x63,
-	0x6b, 0x70, 0x6c, 0x61, 0x6e, 0x65, 0x2e, 0x67, 0x72, 0x70, 0x63, 0x2e, 0x54, 0x61, 0x62, 0x6c,
-	0x65, 0x52, 0x65, 0x66, 0x65, 0x72, 0x65, 0x6e, 0x63, 0x65, 0x52, 0x08, 0x72, 0x65, 0x73, 0x75,
-	0x6c, 0x74, 0x49, 0x64, 0x12, 0x18, 0x0a, 0x07, 0x73, 0x75, 0x63, 0x63, 0x65, 0x73, 0x73, 0x18,
-	0x02, 0x20, 0x01, 0x28, 0x08, 0x52, 0x07, 0x73, 0x75, 0x63, 0x63, 0x65, 0x73, 0x73, 0x12, 0x1d,
-	0x0a, 0x0a, 0x65, 0x72, 0x72, 0x6f, 0x72, 0x5f, 0x69, 0x6e, 0x66, 0x6f, 0x18, 0x03, 0x20, 0x01,
-	0x28, 0x09, 0x52, 0x09, 0x65, 0x72, 0x72, 0x6f, 0x72, 0x49, 0x6e, 0x66, 0x6f, 0x12, 0x23, 0x0a,
-	0x0d, 0x73, 0x63, 0x68, 0x65, 0x6d, 0x61, 0x5f, 0x68, 0x65, 0x61, 0x64, 0x65, 0x72, 0x18, 0x04,
-	0x20, 0x01, 0x28, 0x0c, 0x52, 0x0c, 0x73, 0x63, 0x68, 0x65, 0x6d, 0x61, 0x48, 0x65, 0x61, 0x64,
-	0x65, 0x72, 0x12, 0x1b, 0x0a, 0x09, 0x69, 0x73, 0x5f, 0x73, 0x74, 0x61, 0x74, 0x69, 0x63, 0x18,
-	0x05, 0x20, 0x01, 0x28, 0x08, 0x52, 0x08, 0x69, 0x73, 0x53, 0x74, 0x61, 0x74, 0x69, 0x63, 0x12,
-	0x16, 0x0a, 0x04, 0x73, 0x69, 0x7a, 0x65, 0x18, 0x06, 0x20, 0x01, 0x28, 0x12, 0x42, 0x02, 0x30,
-	0x01, 0x52, 0x04, 0x73, 0x69, 0x7a, 0x65, 0x22, 0xab, 0x01, 0x0a, 0x11, 0x46, 0x65, 0x74, 0x63,
-	0x68, 0x54, 0x61, 0x62, 0x6c, 0x65, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x4e, 0x0a,
-	0x09, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x5f, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b,
-	0x32, 0x31, 0x2e, 0x69, 0x6f, 0x2e, 0x64, 0x65, 0x65, 0x70, 0x68, 0x61, 0x76, 0x65, 0x6e, 0x2e,
-	0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x62, 0x61, 0x63, 0x6b, 0x70, 0x6c, 0x61, 0x6e, 0x65, 0x2e,
-	0x67, 0x72, 0x70, 0x63, 0x2e, 0x54, 0x61, 0x62, 0x6c, 0x65, 0x52, 0x65, 0x66, 0x65, 0x72, 0x65,
-	0x6e, 0x63, 0x65, 0x52, 0x08, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x49, 0x64, 0x12, 0x46, 0x0a,
-	0x09, 0x72, 0x65, 0x73, 0x75, 0x6c, 0x74, 0x5f, 0x69, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b,
+	0x6b, 0x70, 0x6c, 0x61, 0x6e, 0x65, 0x2e, 0x67, 0x72, 0x70, 0x63, 0x2e, 0x54, 0x69, 0x63, 0x6b,
+	0x65, 0x74, 0x52, 0x08, 0x65, 0x78, 0x70, 0x6f, 0x72, 0x74, 0x49, 0x64, 0x12, 0x16, 0x0a, 0x04,
+	0x73, 0x69, 0x7a, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x12, 0x42, 0x02, 0x30, 0x01, 0x52, 0x04,
+	0x73, 0x69, 0x7a, 0x65, 0x12, 0x34, 0x0a, 0x16, 0x75, 0x70, 0x64, 0x61, 0x74, 0x65, 0x5f, 0x66,
+	0x61, 0x69, 0x6c, 0x75, 0x72, 0x65, 0x5f, 0x6d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x18, 0x03,
+	0x20, 0x01, 0x28, 0x09, 0x52, 0x14, 0x75, 0x70, 0x64, 0x61, 0x74, 0x65, 0x46, 0x61, 0x69, 0x6c,
+	0x75, 0x72, 0x65, 0x4d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x22, 0x73, 0x0a, 0x11, 0x45, 0x6d,
+	0x70, 0x74, 0x79, 0x54, 0x61, 0x62, 0x6c, 0x65, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12,
+	0x46, 0x0a, 0x09, 0x72, 0x65, 0x73, 0x75, 0x6c, 0x74, 0x5f, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01,
+	0x28, 0x0b, 0x32, 0x29, 0x2e, 0x69, 0x6f, 0x2e, 0x64, 0x65, 0x65, 0x70, 0x68, 0x61, 0x76, 0x65,
+	0x6e, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x62, 0x61, 0x63, 0x6b, 0x70, 0x6c, 0x61, 0x6e,
+	0x65, 0x2e, 0x67, 0x72, 0x70, 0x63, 0x2e, 0x54, 0x69, 0x63, 0x6b, 0x65, 0x74, 0x52, 0x08, 0x72,
+	0x65, 0x73, 0x75, 0x6c, 0x74, 0x49, 0x64, 0x12, 0x16, 0x0a, 0x04, 0x73, 0x69, 0x7a, 0x65, 0x18,
+	0x02, 0x20, 0x01, 0x28, 0x12, 0x42, 0x02, 0x30, 0x01, 0x52, 0x04, 0x73, 0x69, 0x7a, 0x65, 0x22,
+	0xc1, 0x02, 0x0a, 0x10, 0x54, 0x69, 0x6d, 0x65, 0x54, 0x61, 0x62, 0x6c, 0x65, 0x52, 0x65, 0x71,
+	0x75, 0x65, 0x73, 0x74, 0x12, 0x46, 0x0a, 0x09, 0x72, 0x65, 0x73, 0x75, 0x6c, 0x74, 0x5f, 0x69,
+	0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x29, 0x2e, 0x69, 0x6f, 0x2e, 0x64, 0x65, 0x65,
+	0x70, 0x68, 0x61, 0x76, 0x65, 0x6e, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x62, 0x61, 0x63,
+	0x6b, 0x70, 0x6c, 0x61, 0x6e, 0x65, 0x2e, 0x67, 0x72, 0x70, 0x63, 0x2e, 0x54, 0x69, 0x63, 0x6b,
+	0x65, 0x74, 0x52, 0x08, 0x72, 0x65, 0x73, 0x75, 0x6c, 0x74, 0x49, 0x64, 0x12, 0x2e, 0x0a, 0x10,
+	0x73, 0x74, 0x61, 0x72, 0x74, 0x5f, 0x74, 0x69, 0x6d, 0x65, 0x5f, 0x6e, 0x61, 0x6e, 0x6f, 0x73,
+	0x18, 0x02, 0x20, 0x01, 0x28, 0x12, 0x42, 0x02, 0x30, 0x01, 0x48, 0x00, 0x52, 0x0e, 0x73, 0x74,
+	0x61, 0x72, 0x74, 0x54, 0x69, 0x6d, 0x65, 0x4e, 0x61, 0x6e, 0x6f, 0x73, 0x12, 0x2c, 0x0a, 0x11,
+	0x73, 0x74, 0x61, 0x72, 0x74, 0x5f, 0x74, 0x69, 0x6d, 0x65, 0x5f, 0x73, 0x74, 0x72, 0x69, 0x6e,
+	0x67, 0x18, 0x05, 0x20, 0x01, 0x28, 0x09, 0x48, 0x00, 0x52, 0x0f, 0x73, 0x74, 0x61, 0x72, 0x74,
+	0x54, 0x69, 0x6d, 0x65, 0x53, 0x74, 0x72, 0x69, 0x6e, 0x67, 0x12, 0x27, 0x0a, 0x0c, 0x70, 0x65,
+	0x72, 0x69, 0x6f, 0x64, 0x5f, 0x6e, 0x61, 0x6e, 0x6f, 0x73, 0x18, 0x03, 0x20, 0x01, 0x28, 0x12,
+	0x42, 0x02, 0x30, 0x01, 0x48, 0x01, 0x52, 0x0b, 0x70, 0x65, 0x72, 0x69, 0x6f, 0x64, 0x4e, 0x61,
+	0x6e, 0x6f, 0x73, 0x12, 0x25, 0x0a, 0x0d, 0x70, 0x65, 0x72, 0x69, 0x6f, 0x64, 0x5f, 0x73, 0x74,
+	0x72, 0x69, 0x6e, 0x67, 0x18, 0x06, 0x20, 0x01, 0x28, 0x09, 0x48, 0x01, 0x52, 0x0c, 0x70, 0x65,
+	0x72, 0x69, 0x6f, 0x64, 0x53, 0x74, 0x72, 0x69, 0x6e, 0x67, 0x12, 0x1f, 0x0a, 0x0b, 0x62, 0x6c,
+	0x69, 0x6e, 0x6b, 0x5f, 0x74, 0x61, 0x62, 0x6c, 0x65, 0x18, 0x04, 0x20, 0x01, 0x28, 0x08, 0x52,
+	0x0a, 0x62, 0x6c, 0x69, 0x6e, 0x6b, 0x54, 0x61, 0x62, 0x6c, 0x65, 0x42, 0x0c, 0x0a, 0x0a, 0x73,
+	0x74, 0x61, 0x72, 0x74, 0x5f, 0x74, 0x69, 0x6d, 0x65, 0x42, 0x08, 0x0a, 0x06, 0x70, 0x65, 0x72,
+	0x69, 0x6f, 0x64, 0x22, 0xd2, 0x01, 0x0a, 0x15, 0x53, 0x65, 0x6c, 0x65, 0x63, 0x74, 0x4f, 0x72,
+	0x55, 0x70, 0x64, 0x61, 0x74, 0x65, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x46, 0x0a,
+	0x09, 0x72, 0x65, 0x73, 0x75, 0x6c, 0x74, 0x5f, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b,
 	0x32, 0x29, 0x2e, 0x69, 0x6f, 0x2e, 0x64, 0x65, 0x65, 0x70, 0x68, 0x61, 0x76, 0x65, 0x6e, 0x2e,
 	0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x62, 0x61, 0x63, 0x6b, 0x70, 0x6c, 0x61, 0x6e, 0x65, 0x2e,
 	0x67, 0x72, 0x70, 0x63, 0x2e, 0x54, 0x69, 0x63, 0x6b, 0x65, 0x74, 0x52, 0x08, 0x72, 0x65, 0x73,
-	0x75, 0x6c, 0x74, 0x49, 0x64, 0x22, 0xb4, 0x01, 0x0a, 0x1a, 0x41, 0x70, 0x70, 0x6c, 0x79, 0x50,
-	0x72, 0x65, 0x76, 0x69, 0x65, 0x77, 0x43, 0x6f, 0x6c, 0x75, 0x6d, 0x6e, 0x73, 0x52, 0x65, 0x71,
-	0x75, 0x65, 0x73, 0x74, 0x12, 0x4e, 0x0a, 0x09, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x5f, 0x69,
-	0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x31, 0x2e, 0x69, 0x6f, 0x2e, 0x64, 0x65, 0x65,
-	0x70, 0x68, 0x61, 0x76, 0x65, 0x6e, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x62, 0x61, 0x63,
-	0x6b, 0x70, 0x6c, 0x61, 0x6e, 0x65, 0x2e, 0x67, 0x72, 0x70, 0x63, 0x2e, 0x54, 0x61, 0x62, 0x6c,
-	0x65, 0x52, 0x65, 0x66, 0x65, 0x72, 0x65, 0x6e, 0x63, 0x65, 0x52, 0x08, 0x73, 0x6f, 0x75, 0x72,
-	0x63, 0x65, 0x49, 0x64, 0x12, 0x46, 0x0a, 0x09, 0x72, 0x65, 0x73, 0x75, 0x6c, 0x74, 0x5f, 0x69,
-	0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x29, 0x2e, 0x69, 0x6f, 0x2e, 0x64, 0x65, 0x65,
+	0x75, 0x6c, 0x74, 0x49, 0x64, 0x12, 0x4e, 0x0a, 0x09, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x5f,
+	0x69, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x31, 0x2e, 0x69, 0x6f, 0x2e, 0x64, 0x65,
+	0x65, 0x70, 0x68, 0x61, 0x76, 0x65, 0x6e, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x62, 0x61,
+	0x63, 0x6b, 0x70, 0x6c, 0x61, 0x6e, 0x65, 0x2e, 0x67, 0x72, 0x70, 0x63, 0x2e, 0x54, 0x61, 0x62,
+	0x6c, 0x65, 0x52, 0x65, 0x66, 0x65, 0x72, 0x65, 0x6e, 0x63, 0x65, 0x52, 0x08, 0x73, 0x6f, 0x75,
+	0x72, 0x63, 0x65, 0x49, 0x64, 0x12, 0x21, 0x0a, 0x0c, 0x63, 0x6f, 0x6c, 0x75, 0x6d, 0x6e, 0x5f,
+	0x73, 0x70, 0x65, 0x63, 0x73, 0x18, 0x03, 0x20, 0x03, 0x28, 0x09, 0x52, 0x0b, 0x63, 0x6f, 0x6c,
+	0x75, 0x6d, 0x6e, 0x53, 0x70, 0x65, 0x63, 0x73, 0x22, 0x28, 0x0a, 0x0a, 0x53, 0x65, 0x6c, 0x65,
+	0x63, 0x74, 0x61, 0x62, 0x6c, 0x65, 0x12, 0x12, 0x0a, 0x03, 0x72, 0x61, 0x77, 0x18, 0x01, 0x20,
+	0x01, 0x28, 0x09, 0x48, 0x00, 0x52, 0x03, 0x72, 0x61, 0x77, 0x42, 0x06, 0x0a, 0x04, 0x74, 0x79,
+	0x70, 0x65, 0x22, 0xa5, 0x02, 0x0a, 0x0b, 0x4d, 0x61, 0x74, 0x68, 0x43, 0x6f, 0x6e, 0x74, 0x65,
+	0x78, 0x74, 0x12, 0x1c, 0x0a, 0x09, 0x70, 0x72, 0x65, 0x63, 0x69, 0x73, 0x69, 0x6f, 0x6e, 0x18,
+	0x01, 0x20, 0x01, 0x28, 0x11, 0x52, 0x09, 0x70, 0x72, 0x65, 0x63, 0x69, 0x73, 0x69, 0x6f, 0x6e,
+	0x12, 0x60, 0x0a, 0x0d, 0x72, 0x6f, 0x75, 0x6e, 0x64, 0x69, 0x6e, 0x67, 0x5f, 0x6d, 0x6f, 0x64,
+	0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0e, 0x32, 0x3b, 0x2e, 0x69, 0x6f, 0x2e, 0x64, 0x65, 0x65,
 	0x70, 0x68, 0x61, 0x76, 0x65, 0x6e, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x62, 0x61, 0x63,
-	0x6b, 0x70, 0x6c, 0x61, 0x6e, 0x65, 0x2e, 0x67, 0x72, 0x70, 0x63, 0x2e, 0x54, 0x69, 0x63, 0x6b,
-	0x65, 0x74, 0x52, 0x08, 0x72, 0x65, 0x73, 0x75, 0x6c, 0x74, 0x49, 0x64, 0x22, 0x1d, 0x0a, 0x1b,
-	0x45, 0x78, 0x70, 0x6f, 0x72, 0x74, 0x65, 0x64, 0x54, 0x61, 0x62, 0x6c, 0x65, 0x55, 0x70, 0x64,
-	0x61, 0x74, 0x65, 0x73, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x22, 0xb2, 0x01, 0x0a, 0x1a,
-	0x45, 0x78, 0x70, 0x6f, 0x72, 0x74, 0x65, 0x64, 0x54, 0x61, 0x62, 0x6c, 0x65, 0x55, 0x70, 0x64,
-	0x61, 0x74, 0x65, 0x4d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x12, 0x46, 0x0a, 0x09, 0x65, 0x78,
-	0x70, 0x6f, 0x72, 0x74, 0x5f, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x29, 0x2e,
-	0x69, 0x6f, 0x2e, 0x64, 0x65, 0x65, 0x70, 0x68, 0x61, 0x76, 0x65, 0x6e, 0x2e, 0x70, 0x72, 0x6f,
-	0x74, 0x6f, 0x2e, 0x62, 0x61, 0x63, 0x6b, 0x70, 0x6c, 0x61, 0x6e, 0x65, 0x2e, 0x67, 0x72, 0x70,
-	0x63, 0x2e, 0x54, 0x69, 0x63, 0x6b, 0x65, 0x74, 0x52, 0x08, 0x65, 0x78, 0x70, 0x6f, 0x72, 0x74,
-	0x49, 0x64, 0x12, 0x16, 0x0a, 0x04, 0x73, 0x69, 0x7a, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x12,
-	0x42, 0x02, 0x30, 0x01, 0x52, 0x04, 0x73, 0x69, 0x7a, 0x65, 0x12, 0x34, 0x0a, 0x16, 0x75, 0x70,
-	0x64, 0x61, 0x74, 0x65, 0x5f, 0x66, 0x61, 0x69, 0x6c, 0x75, 0x72, 0x65, 0x5f, 0x6d, 0x65, 0x73,
-	0x73, 0x61, 0x67, 0x65, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x52, 0x14, 0x75, 0x70, 0x64, 0x61,
-	0x74, 0x65, 0x46, 0x61, 0x69, 0x6c, 0x75, 0x72, 0x65, 0x4d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65,
-	0x22, 0x73, 0x0a, 0x11, 0x45, 0x6d, 0x70, 0x74, 0x79, 0x54, 0x61, 0x62, 0x6c, 0x65, 0x52, 0x65,
+	0x6b, 0x70, 0x6c, 0x61, 0x6e, 0x65, 0x2e, 0x67, 0x72, 0x70, 0x63, 0x2e, 0x4d, 0x61, 0x74, 0x68,
+	0x43, 0x6f, 0x6e, 0x74, 0x65, 0x78, 0x74, 0x2e, 0x52, 0x6f, 0x75, 0x6e, 0x64, 0x69, 0x6e, 0x67,
+	0x4d, 0x6f, 0x64, 0x65, 0x52, 0x0c, 0x72, 0x6f, 0x75, 0x6e, 0x64, 0x69, 0x6e, 0x67, 0x4d, 0x6f,
+	0x64, 0x65, 0x22, 0x95, 0x01, 0x0a, 0x0c, 0x52, 0x6f, 0x75, 0x6e, 0x64, 0x69, 0x6e, 0x67, 0x4d,
+	0x6f, 0x64, 0x65, 0x12, 0x1f, 0x0a, 0x1b, 0x52, 0x4f, 0x55, 0x4e, 0x44, 0x49, 0x4e, 0x47, 0x5f,
+	0x4d, 0x4f, 0x44, 0x45, 0x5f, 0x4e, 0x4f, 0x54, 0x5f, 0x53, 0x50, 0x45, 0x43, 0x49, 0x46, 0x49,
+	0x45, 0x44, 0x10, 0x00, 0x12, 0x06, 0x0a, 0x02, 0x55, 0x50, 0x10, 0x01, 0x12, 0x08, 0x0a, 0x04,
+	0x44, 0x4f, 0x57, 0x4e, 0x10, 0x02, 0x12, 0x0b, 0x0a, 0x07, 0x43, 0x45, 0x49, 0x4c, 0x49, 0x4e,
+	0x47, 0x10, 0x03, 0x12, 0x09, 0x0a, 0x05, 0x46, 0x4c, 0x4f, 0x4f, 0x52, 0x10, 0x04, 0x12, 0x0b,
+	0x0a, 0x07, 0x48, 0x41, 0x4c, 0x46, 0x5f, 0x55, 0x50, 0x10, 0x05, 0x12, 0x0d, 0x0a, 0x09, 0x48,
+	0x41, 0x4c, 0x46, 0x5f, 0x44, 0x4f, 0x57, 0x4e, 0x10, 0x06, 0x12, 0x0d, 0x0a, 0x09, 0x48, 0x41,
+	0x4c, 0x46, 0x5f, 0x45, 0x56, 0x45, 0x4e, 0x10, 0x07, 0x12, 0x0f, 0x0a, 0x0b, 0x55, 0x4e, 0x4e,
+	0x45, 0x43, 0x45, 0x53, 0x53, 0x41, 0x52, 0x59, 0x10, 0x08, 0x22, 0x8e, 0x03, 0x0a, 0x13, 0x55,
+	0x70, 0x64, 0x61, 0x74, 0x65, 0x42, 0x79, 0x57, 0x69, 0x6e, 0x64, 0x6f, 0x77, 0x53, 0x63, 0x61,
+	0x6c, 0x65, 0x12, 0x62, 0x0a, 0x05, 0x74, 0x69, 0x63, 0x6b, 0x73, 0x18, 0x01, 0x20, 0x01, 0x28,
+	0x0b, 0x32, 0x4a, 0x2e, 0x69, 0x6f, 0x2e, 0x64, 0x65, 0x65, 0x70, 0x68, 0x61, 0x76, 0x65, 0x6e,
+	0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x62, 0x61, 0x63, 0x6b, 0x70, 0x6c, 0x61, 0x6e, 0x65,
+	0x2e, 0x67, 0x72, 0x70, 0x63, 0x2e, 0x55, 0x70, 0x64, 0x61, 0x74, 0x65, 0x42, 0x79, 0x57, 0x69,
+	0x6e, 0x64, 0x6f, 0x77, 0x53, 0x63, 0x61, 0x6c, 0x65, 0x2e, 0x55, 0x70, 0x64, 0x61, 0x74, 0x65,
+	0x42, 0x79, 0x57, 0x69, 0x6e, 0x64, 0x6f, 0x77, 0x54, 0x69, 0x63, 0x6b, 0x73, 0x48, 0x00, 0x52,
+	0x05, 0x74, 0x69, 0x63, 0x6b, 0x73, 0x12, 0x5f, 0x0a, 0x04, 0x74, 0x69, 0x6d, 0x65, 0x18, 0x02,
+	0x20, 0x01, 0x28, 0x0b, 0x32, 0x49, 0x2e, 0x69, 0x6f, 0x2e, 0x64, 0x65, 0x65, 0x70, 0x68, 0x61,
+	0x76, 0x65, 0x6e, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x62, 0x61, 0x63, 0x6b, 0x70, 0x6c,
+	0x61, 0x6e, 0x65, 0x2e, 0x67, 0x72, 0x70, 0x63, 0x2e, 0x55, 0x70, 0x64, 0x61, 0x74, 0x65, 0x42,
+	0x79, 0x57, 0x69, 0x6e, 0x64, 0x6f, 0x77, 0x53, 0x63, 0x61, 0x6c, 0x65, 0x2e, 0x55, 0x70, 0x64,
+	0x61, 0x74, 0x65, 0x42, 0x79, 0x57, 0x69, 0x6e, 0x64, 0x6f, 0x77, 0x54, 0x69, 0x6d, 0x65, 0x48,
+	0x00, 0x52, 0x04, 0x74, 0x69, 0x6d, 0x65, 0x1a, 0x2b, 0x0a, 0x13, 0x55, 0x70, 0x64, 0x61, 0x74,
+	0x65, 0x42, 0x79, 0x57, 0x69, 0x6e, 0x64, 0x6f, 0x77, 0x54, 0x69, 0x63, 0x6b, 0x73, 0x12, 0x14,
+	0x0a, 0x05, 0x74, 0x69, 0x63, 0x6b, 0x73, 0x18, 0x01, 0x20, 0x01, 0x28, 0x01, 0x52, 0x05, 0x74,
+	0x69, 0x63, 0x6b, 0x73, 0x1a, 0x7d, 0x0a, 0x12, 0x55, 0x70, 0x64, 0x61, 0x74, 0x65, 0x42, 0x79,
+	0x57, 0x69, 0x6e, 0x64, 0x6f, 0x77, 0x54, 0x69, 0x6d, 0x65, 0x12, 0x16, 0x0a, 0x06, 0x63, 0x6f,
+	0x6c, 0x75, 0x6d, 0x6e, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06, 0x63, 0x6f, 0x6c, 0x75,
+	0x6d, 0x6e, 0x12, 0x1a, 0x0a, 0x05, 0x6e, 0x61, 0x6e, 0x6f, 0x73, 0x18, 0x02, 0x20, 0x01, 0x28,
+	0x12, 0x42, 0x02, 0x30, 0x01, 0x48, 0x00, 0x52, 0x05, 0x6e, 0x61, 0x6e, 0x6f, 0x73, 0x12, 0x29,
+	0x0a, 0x0f, 0x64, 0x75, 0x72, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x5f, 0x73, 0x74, 0x72, 0x69, 0x6e,
+	0x67, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x48, 0x00, 0x52, 0x0e, 0x64, 0x75, 0x72, 0x61, 0x74,
+	0x69, 0x6f, 0x6e, 0x53, 0x74, 0x72, 0x69, 0x6e, 0x67, 0x42, 0x08, 0x0a, 0x06, 0x77, 0x69, 0x6e,
+	0x64, 0x6f, 0x77, 0x42, 0x06, 0x0a, 0x04, 0x74, 0x79, 0x70, 0x65, 0x22, 0xbd, 0x04, 0x0a, 0x11,
+	0x55, 0x70, 0x64, 0x61, 0x74, 0x65, 0x42, 0x79, 0x45, 0x6d, 0x4f, 0x70, 0x74, 0x69, 0x6f, 0x6e,
+	0x73, 0x12, 0x56, 0x0a, 0x0d, 0x6f, 0x6e, 0x5f, 0x6e, 0x75, 0x6c, 0x6c, 0x5f, 0x76, 0x61, 0x6c,
+	0x75, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0e, 0x32, 0x32, 0x2e, 0x69, 0x6f, 0x2e, 0x64, 0x65,
+	0x65, 0x70, 0x68, 0x61, 0x76, 0x65, 0x6e, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x62, 0x61,
+	0x63, 0x6b, 0x70, 0x6c, 0x61, 0x6e, 0x65, 0x2e, 0x67, 0x72, 0x70, 0x63, 0x2e, 0x42, 0x61, 0x64,
+	0x44, 0x61, 0x74, 0x61, 0x42, 0x65, 0x68, 0x61, 0x76, 0x69, 0x6f, 0x72, 0x52, 0x0b, 0x6f, 0x6e,
+	0x4e, 0x75, 0x6c, 0x6c, 0x56, 0x61, 0x6c, 0x75, 0x65, 0x12, 0x54, 0x0a, 0x0c, 0x6f, 0x6e, 0x5f,
+	0x6e, 0x61, 0x6e, 0x5f, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0e, 0x32,
+	0x32, 0x2e, 0x69, 0x6f, 0x2e, 0x64, 0x65, 0x65, 0x70, 0x68, 0x61, 0x76, 0x65, 0x6e, 0x2e, 0x70,
+	0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x62, 0x61, 0x63, 0x6b, 0x70, 0x6c, 0x61, 0x6e, 0x65, 0x2e, 0x67,
+	0x72, 0x70, 0x63, 0x2e, 0x42, 0x61, 0x64, 0x44, 0x61, 0x74, 0x61, 0x42, 0x65, 0x68, 0x61, 0x76,
+	0x69, 0x6f, 0x72, 0x52, 0x0a, 0x6f, 0x6e, 0x4e, 0x61, 0x6e, 0x56, 0x61, 0x6c, 0x75, 0x65, 0x12,
+	0x54, 0x0a, 0x0c, 0x6f, 0x6e, 0x5f, 0x6e, 0x75, 0x6c, 0x6c, 0x5f, 0x74, 0x69, 0x6d, 0x65, 0x18,
+	0x03, 0x20, 0x01, 0x28, 0x0e, 0x32, 0x32, 0x2e, 0x69, 0x6f, 0x2e, 0x64, 0x65, 0x65, 0x70, 0x68,
+	0x61, 0x76, 0x65, 0x6e, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x62, 0x61, 0x63, 0x6b, 0x70,
+	0x6c, 0x61, 0x6e, 0x65, 0x2e, 0x67, 0x72, 0x70, 0x63, 0x2e, 0x42, 0x61, 0x64, 0x44, 0x61, 0x74,
+	0x61, 0x42, 0x65, 0x68, 0x61, 0x76, 0x69, 0x6f, 0x72, 0x52, 0x0a, 0x6f, 0x6e, 0x4e, 0x75, 0x6c,
+	0x6c, 0x54, 0x69, 0x6d, 0x65, 0x12, 0x67, 0x0a, 0x16, 0x6f, 0x6e, 0x5f, 0x6e, 0x65, 0x67, 0x61,
+	0x74, 0x69, 0x76, 0x65, 0x5f, 0x64, 0x65, 0x6c, 0x74, 0x61, 0x5f, 0x74, 0x69, 0x6d, 0x65, 0x18,
+	0x04, 0x20, 0x01, 0x28, 0x0e, 0x32, 0x32, 0x2e, 0x69, 0x6f, 0x2e, 0x64, 0x65, 0x65, 0x70, 0x68,
+	0x61, 0x76, 0x65, 0x6e, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x62, 0x61, 0x63, 0x6b, 0x70,
+	0x6c, 0x61, 0x6e, 0x65, 0x2e, 0x67, 0x72, 0x70, 0x63, 0x2e, 0x42, 0x61, 0x64, 0x44, 0x61, 0x74,
+	0x61, 0x42, 0x65, 0x68, 0x61, 0x76, 0x69, 0x6f, 0x72, 0x52, 0x13, 0x6f, 0x6e, 0x4e, 0x65, 0x67,
+	0x61, 0x74, 0x69, 0x76, 0x65, 0x44, 0x65, 0x6c, 0x74, 0x61, 0x54, 0x69, 0x6d, 0x65, 0x12, 0x5f,
+	0x0a, 0x12, 0x6f, 0x6e, 0x5f, 0x7a, 0x65, 0x72, 0x6f, 0x5f, 0x64, 0x65, 0x6c, 0x74, 0x61, 0x5f,
+	0x74, 0x69, 0x6d, 0x65, 0x18, 0x05, 0x20, 0x01, 0x28, 0x0e, 0x32, 0x32, 0x2e, 0x69, 0x6f, 0x2e,
+	0x64, 0x65, 0x65, 0x70, 0x68, 0x61, 0x76, 0x65, 0x6e, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e,
+	0x62, 0x61, 0x63, 0x6b, 0x70, 0x6c, 0x61, 0x6e, 0x65, 0x2e, 0x67, 0x72, 0x70, 0x63, 0x2e, 0x42,
+	0x61, 0x64, 0x44, 0x61, 0x74, 0x61, 0x42, 0x65, 0x68, 0x61, 0x76, 0x69, 0x6f, 0x72, 0x52, 0x0f,
+	0x6f, 0x6e, 0x5a, 0x65, 0x72, 0x6f, 0x44, 0x65, 0x6c, 0x74, 0x61, 0x54, 0x69, 0x6d, 0x65, 0x12,
+	0x5a, 0x0a, 0x11, 0x62, 0x69, 0x67, 0x5f, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x5f, 0x63, 0x6f, 0x6e,
+	0x74, 0x65, 0x78, 0x74, 0x18, 0x06, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x2e, 0x2e, 0x69, 0x6f, 0x2e,
+	0x64, 0x65, 0x65, 0x70, 0x68, 0x61, 0x76, 0x65, 0x6e, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e,
+	0x62, 0x61, 0x63, 0x6b, 0x70, 0x6c, 0x61, 0x6e, 0x65, 0x2e, 0x67, 0x72, 0x70, 0x63, 0x2e, 0x4d,
+	0x61, 0x74, 0x68, 0x43, 0x6f, 0x6e, 0x74, 0x65, 0x78, 0x74, 0x52, 0x0f, 0x62, 0x69, 0x67, 0x56,
+	0x61, 0x6c, 0x75, 0x65, 0x43, 0x6f, 0x6e, 0x74, 0x65, 0x78, 0x74, 0x22, 0x74, 0x0a, 0x14, 0x55,
+	0x70, 0x64, 0x61, 0x74, 0x65, 0x42, 0x79, 0x44, 0x65, 0x6c, 0x74, 0x61, 0x4f, 0x70, 0x74, 0x69,
+	0x6f, 0x6e, 0x73, 0x12, 0x5c, 0x0a, 0x0d, 0x6e, 0x75, 0x6c, 0x6c, 0x5f, 0x62, 0x65, 0x68, 0x61,
+	0x76, 0x69, 0x6f, 0x72, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0e, 0x32, 0x37, 0x2e, 0x69, 0x6f, 0x2e,
+	0x64, 0x65, 0x65, 0x70, 0x68, 0x61, 0x76, 0x65, 0x6e, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e,
+	0x62, 0x61, 0x63, 0x6b, 0x70, 0x6c, 0x61, 0x6e, 0x65, 0x2e, 0x67, 0x72, 0x70, 0x63, 0x2e, 0x55,
+	0x70, 0x64, 0x61, 0x74, 0x65, 0x42, 0x79, 0x4e, 0x75, 0x6c, 0x6c, 0x42, 0x65, 0x68, 0x61, 0x76,
+	0x69, 0x6f, 0x72, 0x52, 0x0c, 0x6e, 0x75, 0x6c, 0x6c, 0x42, 0x65, 0x68, 0x61, 0x76, 0x69, 0x6f,
+	0x72, 0x22, 0xeb, 0x3e, 0x0a, 0x0f, 0x55, 0x70, 0x64, 0x61, 0x74, 0x65, 0x42, 0x79, 0x52, 0x65,
 	0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x46, 0x0a, 0x09, 0x72, 0x65, 0x73, 0x75, 0x6c, 0x74, 0x5f,
 	0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x29, 0x2e, 0x69, 0x6f, 0x2e, 0x64, 0x65,
 	0x65, 0x70, 0x68, 0x61, 0x76, 0x65, 0x6e, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x62, 0x61,
 	0x63, 0x6b, 0x70, 0x6c, 0x61, 0x6e, 0x65, 0x2e, 0x67, 0x72, 0x70, 0x63, 0x2e, 0x54, 0x69, 0x63,
-	0x6b, 0x65, 0x74, 0x52, 0x08, 0x72, 0x65, 0x73, 0x75, 0x6c, 0x74, 0x49, 0x64, 0x12, 0x16, 0x0a,
-	0x04, 0x73, 0x69, 0x7a, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x12, 0x42, 0x02, 0x30, 0x01, 0x52,
-	0x04, 0x73, 0x69, 0x7a, 0x65, 0x22, 0xc1, 0x02, 0x0a, 0x10, 0x54, 0x69, 0x6d, 0x65, 0x54, 0x61,
-	0x62, 0x6c, 0x65, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x46, 0x0a, 0x09, 0x72, 0x65,
-	0x73, 0x75, 0x6c, 0x74, 0x5f, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x29, 0x2e,
+	0x6b, 0x65, 0x74, 0x52, 0x08, 0x72, 0x65, 0x73, 0x75, 0x6c, 0x74, 0x49, 0x64, 0x12, 0x4e, 0x0a,
+	0x09, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x5f, 0x69, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b,
+	0x32, 0x31, 0x2e, 0x69, 0x6f, 0x2e, 0x64, 0x65, 0x65, 0x70, 0x68, 0x61, 0x76, 0x65, 0x6e, 0x2e,
+	0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x62, 0x61, 0x63, 0x6b, 0x70, 0x6c, 0x61, 0x6e, 0x65, 0x2e,
+	0x67, 0x72, 0x70, 0x63, 0x2e, 0x54, 0x61, 0x62, 0x6c, 0x65, 0x52, 0x65, 0x66, 0x65, 0x72, 0x65,
+	0x6e, 0x63, 0x65, 0x52, 0x08, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x49, 0x64, 0x12, 0x5c, 0x0a,
+	0x07, 0x6f, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x18, 0x03, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x42,
+	0x2e, 0x69, 0x6f, 0x2e, 0x64, 0x65, 0x65, 0x70, 0x68, 0x61, 0x76, 0x65, 0x6e, 0x2e, 0x70, 0x72,
+	0x6f, 0x74, 0x6f, 0x2e, 0x62, 0x61, 0x63, 0x6b, 0x70, 0x6c, 0x61, 0x6e, 0x65, 0x2e, 0x67, 0x72,
+	0x70, 0x63, 0x2e, 0x55, 0x70, 0x64, 0x61, 0x74, 0x65, 0x42, 0x79, 0x52, 0x65, 0x71, 0x75, 0x65,
+	0x73, 0x74, 0x2e, 0x55, 0x70, 0x64, 0x61, 0x74, 0x65, 0x42, 0x79, 0x4f, 0x70, 0x74, 0x69, 0x6f,
+	0x6e, 0x73, 0x52, 0x07, 0x6f, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x12, 0x64, 0x0a, 0x0a, 0x6f,
+	0x70, 0x65, 0x72, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x18, 0x04, 0x20, 0x03, 0x28, 0x0b, 0x32,
+	0x44, 0x2e, 0x69, 0x6f, 0x2e, 0x64, 0x65, 0x65, 0x70, 0x68, 0x61, 0x76, 0x65, 0x6e, 0x2e, 0x70,
+	0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x62, 0x61, 0x63, 0x6b, 0x70, 0x6c, 0x61, 0x6e, 0x65, 0x2e, 0x67,
+	0x72, 0x70, 0x63, 0x2e, 0x55, 0x70, 0x64, 0x61, 0x74, 0x65, 0x42, 0x79, 0x52, 0x65, 0x71, 0x75,
+	0x65, 0x73, 0x74, 0x2e, 0x55, 0x70, 0x64, 0x61, 0x74, 0x65, 0x42, 0x79, 0x4f, 0x70, 0x65, 0x72,
+	0x61, 0x74, 0x69, 0x6f, 0x6e, 0x52, 0x0a, 0x6f, 0x70, 0x65, 0x72, 0x61, 0x74, 0x69, 0x6f, 0x6e,
+	0x73, 0x12, 0x28, 0x0a, 0x10, 0x67, 0x72, 0x6f, 0x75, 0x70, 0x5f, 0x62, 0x79, 0x5f, 0x63, 0x6f,
+	0x6c, 0x75, 0x6d, 0x6e, 0x73, 0x18, 0x05, 0x20, 0x03, 0x28, 0x09, 0x52, 0x0e, 0x67, 0x72, 0x6f,
+	0x75, 0x70, 0x42, 0x79, 0x43, 0x6f, 0x6c, 0x75, 0x6d, 0x6e, 0x73, 0x1a, 0xc9, 0x04, 0x0a, 0x0f,
+	0x55, 0x70, 0x64, 0x61, 0x74, 0x65, 0x42, 0x79, 0x4f, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x12,
+	0x2c, 0x0a, 0x0f, 0x75, 0x73, 0x65, 0x5f, 0x72, 0x65, 0x64, 0x69, 0x72, 0x65, 0x63, 0x74, 0x69,
+	0x6f, 0x6e, 0x18, 0x01, 0x20, 0x01, 0x28, 0x08, 0x48, 0x00, 0x52, 0x0e, 0x75, 0x73, 0x65, 0x52,
+	0x65, 0x64, 0x69, 0x72, 0x65, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x88, 0x01, 0x01, 0x12, 0x2a, 0x0a,
+	0x0e, 0x63, 0x68, 0x75, 0x6e, 0x6b, 0x5f, 0x63, 0x61, 0x70, 0x61, 0x63, 0x69, 0x74, 0x79, 0x18,
+	0x02, 0x20, 0x01, 0x28, 0x05, 0x48, 0x01, 0x52, 0x0d, 0x63, 0x68, 0x75, 0x6e, 0x6b, 0x43, 0x61,
+	0x70, 0x61, 0x63, 0x69, 0x74, 0x79, 0x88, 0x01, 0x01, 0x12, 0x4d, 0x0a, 0x21, 0x6d, 0x61, 0x78,
+	0x5f, 0x73, 0x74, 0x61, 0x74, 0x69, 0x63, 0x5f, 0x73, 0x70, 0x61, 0x72, 0x73, 0x65, 0x5f, 0x6d,
+	0x65, 0x6d, 0x6f, 0x72, 0x79, 0x5f, 0x6f, 0x76, 0x65, 0x72, 0x68, 0x65, 0x61, 0x64, 0x18, 0x03,
+	0x20, 0x01, 0x28, 0x01, 0x48, 0x02, 0x52, 0x1d, 0x6d, 0x61, 0x78, 0x53, 0x74, 0x61, 0x74, 0x69,
+	0x63, 0x53, 0x70, 0x61, 0x72, 0x73, 0x65, 0x4d, 0x65, 0x6d, 0x6f, 0x72, 0x79, 0x4f, 0x76, 0x65,
+	0x72, 0x68, 0x65, 0x61, 0x64, 0x88, 0x01, 0x01, 0x12, 0x3a, 0x0a, 0x17, 0x69, 0x6e, 0x69, 0x74,
+	0x69, 0x61, 0x6c, 0x5f, 0x68, 0x61, 0x73, 0x68, 0x5f, 0x74, 0x61, 0x62, 0x6c, 0x65, 0x5f, 0x73,
+	0x69, 0x7a, 0x65, 0x18, 0x04, 0x20, 0x01, 0x28, 0x05, 0x48, 0x03, 0x52, 0x14, 0x69, 0x6e, 0x69,
+	0x74, 0x69, 0x61, 0x6c, 0x48, 0x61, 0x73, 0x68, 0x54, 0x61, 0x62, 0x6c, 0x65, 0x53, 0x69, 0x7a,
+	0x65, 0x88, 0x01, 0x01, 0x12, 0x33, 0x0a, 0x13, 0x6d, 0x61, 0x78, 0x69, 0x6d, 0x75, 0x6d, 0x5f,
+	0x6c, 0x6f, 0x61, 0x64, 0x5f, 0x66, 0x61, 0x63, 0x74, 0x6f, 0x72, 0x18, 0x05, 0x20, 0x01, 0x28,
+	0x01, 0x48, 0x04, 0x52, 0x11, 0x6d, 0x61, 0x78, 0x69, 0x6d, 0x75, 0x6d, 0x4c, 0x6f, 0x61, 0x64,
+	0x46, 0x61, 0x63, 0x74, 0x6f, 0x72, 0x88, 0x01, 0x01, 0x12, 0x31, 0x0a, 0x12, 0x74, 0x61, 0x72,
+	0x67, 0x65, 0x74, 0x5f, 0x6c, 0x6f, 0x61, 0x64, 0x5f, 0x66, 0x61, 0x63, 0x74, 0x6f, 0x72, 0x18,
+	0x06, 0x20, 0x01, 0x28, 0x01, 0x48, 0x05, 0x52, 0x10, 0x74, 0x61, 0x72, 0x67, 0x65, 0x74, 0x4c,
+	0x6f, 0x61, 0x64, 0x46, 0x61, 0x63, 0x74, 0x6f, 0x72, 0x88, 0x01, 0x01, 0x12, 0x51, 0x0a, 0x0c,
+	0x6d, 0x61, 0x74, 0x68, 0x5f, 0x63, 0x6f, 0x6e, 0x74, 0x65, 0x78, 0x74, 0x18, 0x07, 0x20, 0x01,
+	0x28, 0x0b, 0x32, 0x2e, 0x2e, 0x69, 0x6f, 0x2e, 0x64, 0x65, 0x65, 0x70, 0x68, 0x61, 0x76, 0x65,
+	0x6e, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x62, 0x61, 0x63, 0x6b, 0x70, 0x6c, 0x61, 0x6e,
+	0x65, 0x2e, 0x67, 0x72, 0x70, 0x63, 0x2e, 0x4d, 0x61, 0x74, 0x68, 0x43, 0x6f, 0x6e, 0x74, 0x65,
+	0x78, 0x74, 0x52, 0x0b, 0x6d, 0x61, 0x74, 0x68, 0x43, 0x6f, 0x6e, 0x74, 0x65, 0x78, 0x74, 0x42,
+	0x12, 0x0a, 0x10, 0x5f, 0x75, 0x73, 0x65, 0x5f, 0x72, 0x65, 0x64, 0x69, 0x72, 0x65, 0x63, 0x74,
+	0x69, 0x6f, 0x6e, 0x42, 0x11, 0x0a, 0x0f, 0x5f, 0x63, 0x68, 0x75, 0x6e, 0x6b, 0x5f, 0x63, 0x61,
+	0x70, 0x61, 0x63, 0x69, 0x74, 0x79, 0x42, 0x24, 0x0a, 0x22, 0x5f, 0x6d, 0x61, 0x78, 0x5f, 0x73,
+	0x74, 0x61, 0x74, 0x69, 0x63, 0x5f, 0x73, 0x70, 0x61, 0x72, 0x73, 0x65, 0x5f, 0x6d, 0x65, 0x6d,
+	0x6f, 0x72, 0x79, 0x5f, 0x6f, 0x76, 0x65, 0x72, 0x68, 0x65, 0x61, 0x64, 0x42, 0x1a, 0x0a, 0x18,
+	0x5f, 0x69, 0x6e, 0x69, 0x74, 0x69, 0x61, 0x6c, 0x5f, 0x68, 0x61, 0x73, 0x68, 0x5f, 0x74, 0x61,
+	0x62, 0x6c, 0x65, 0x5f, 0x73, 0x69, 0x7a, 0x65, 0x42, 0x16, 0x0a, 0x14, 0x5f, 0x6d, 0x61, 0x78,
+	0x69, 0x6d, 0x75, 0x6d, 0x5f, 0x6c, 0x6f, 0x61, 0x64, 0x5f, 0x66, 0x61, 0x63, 0x74, 0x6f, 0x72,
+	0x42, 0x15, 0x0a, 0x13, 0x5f, 0x74, 0x61, 0x72, 0x67, 0x65, 0x74, 0x5f, 0x6c, 0x6f, 0x61, 0x64,
+	0x5f, 0x66, 0x61, 0x63, 0x74, 0x6f, 0x72, 0x1a, 0x85, 0x37, 0x0a, 0x11, 0x55, 0x70, 0x64, 0x61,
+	0x74, 0x65, 0x42, 0x79, 0x4f, 0x70, 0x65, 0x72, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x12, 0x6d, 0x0a,
+	0x06, 0x63, 0x6f, 0x6c, 0x75, 0x6d, 0x6e, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x53, 0x2e,
 	0x69, 0x6f, 0x2e, 0x64, 0x65, 0x65, 0x70, 0x68, 0x61, 0x76, 0x65, 0x6e, 0x2e, 0x70, 0x72, 0x6f,
 	0x74, 0x6f, 0x2e, 0x62, 0x61, 0x63, 0x6b, 0x70, 0x6c, 0x61, 0x6e, 0x65, 0x2e, 0x67, 0x72, 0x70,
-	0x63, 0x2e, 0x54, 0x69, 0x63, 0x6b, 0x65, 0x74, 0x52, 0x08, 0x72, 0x65, 0x73, 0x75, 0x6c, 0x74,
-	0x49, 0x64, 0x12, 0x2e, 0x0a, 0x10, 0x73, 0x74, 0x61, 0x72, 0x74, 0x5f, 0x74, 0x69, 0x6d, 0x65,
-	0x5f, 0x6e, 0x61, 0x6e, 0x6f, 0x73, 0x18, 0x02, 0x20, 0x01, 0x28, 0x12, 0x42, 0x02, 0x30, 0x01,
-	0x48, 0x00, 0x52, 0x0e, 0x73, 0x74, 0x61, 0x72, 0x74, 0x54, 0x69, 0x6d, 0x65, 0x4e, 0x61, 0x6e,
-	0x6f, 0x73, 0x12, 0x2c, 0x0a, 0x11, 0x73, 0x74, 0x61, 0x72, 0x74, 0x5f, 0x74, 0x69, 0x6d, 0x65,
-	0x5f, 0x73, 0x74, 0x72, 0x69, 0x6e, 0x67, 0x18, 0x05, 0x20, 0x01, 0x28, 0x09, 0x48, 0x00, 0x52,
-	0x0f, 0x73, 0x74, 0x61, 0x72, 0x74, 0x54, 0x69, 0x6d, 0x65, 0x53, 0x74, 0x72, 0x69, 0x6e, 0x67,
-	0x12, 0x27, 0x0a, 0x0c, 0x70, 0x65, 0x72, 0x69, 0x6f, 0x64, 0x5f, 0x6e, 0x61, 0x6e, 0x6f, 0x73,
-	0x18, 0x03, 0x20, 0x01, 0x28, 0x12, 0x42, 0x02, 0x30, 0x01, 0x48, 0x01, 0x52, 0x0b, 0x70, 0x65,
-	0x72, 0x69, 0x6f, 0x64, 0x4e, 0x61, 0x6e, 0x6f, 0x73, 0x12, 0x25, 0x0a, 0x0d, 0x70, 0x65, 0x72,
-	0x69, 0x6f, 0x64, 0x5f, 0x73, 0x74, 0x72, 0x69, 0x6e, 0x67, 0x18, 0x06, 0x20, 0x01, 0x28, 0x09,
-	0x48, 0x01, 0x52, 0x0c, 0x70, 0x65, 0x72, 0x69, 0x6f, 0x64, 0x53, 0x74, 0x72, 0x69, 0x6e, 0x67,
-	0x12, 0x1f, 0x0a, 0x0b, 0x62, 0x6c, 0x69, 0x6e, 0x6b, 0x5f, 0x74, 0x61, 0x62, 0x6c, 0x65, 0x18,
-	0x04, 0x20, 0x01, 0x28, 0x08, 0x52, 0x0a, 0x62, 0x6c, 0x69, 0x6e, 0x6b, 0x54, 0x61, 0x62, 0x6c,
-	0x65, 0x42, 0x0c, 0x0a, 0x0a, 0x73, 0x74, 0x61, 0x72, 0x74, 0x5f, 0x74, 0x69, 0x6d, 0x65, 0x42,
-	0x08, 0x0a, 0x06, 0x70, 0x65, 0x72, 0x69, 0x6f, 0x64, 0x22, 0xd2, 0x01, 0x0a, 0x15, 0x53, 0x65,
-	0x6c, 0x65, 0x63, 0x74, 0x4f, 0x72, 0x55, 0x70, 0x64, 0x61, 0x74, 0x65, 0x52, 0x65, 0x71, 0x75,
-	0x65, 0x73, 0x74, 0x12, 0x46, 0x0a, 0x09, 0x72, 0x65, 0x73, 0x75, 0x6c, 0x74, 0x5f, 0x69, 0x64,
-	0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x29, 0x2e, 0x69, 0x6f, 0x2e, 0x64, 0x65, 0x65, 0x70,
-	0x68, 0x61, 0x76, 0x65, 0x6e, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x62, 0x61, 0x63, 0x6b,
-	0x70, 0x6c, 0x61, 0x6e, 0x65, 0x2e, 0x67, 0x72, 0x70, 0x63, 0x2e, 0x54, 0x69, 0x63, 0x6b, 0x65,
-	0x74, 0x52, 0x08, 0x72, 0x65, 0x73, 0x75, 0x6c, 0x74, 0x49, 0x64, 0x12, 0x4e, 0x0a, 0x09, 0x73,
-	0x6f, 0x75, 0x72, 0x63, 0x65, 0x5f, 0x69, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x31,
-	0x2e, 0x69, 0x6f, 0x2e, 0x64, 0x65, 0x65, 0x70, 0x68, 0x61, 0x76, 0x65, 0x6e, 0x2e, 0x70, 0x72,
-	0x6f, 0x74, 0x6f, 0x2e, 0x62, 0x61, 0x63, 0x6b, 0x70, 0x6c, 0x61, 0x6e, 0x65, 0x2e, 0x67, 0x72,
-	0x70, 0x63, 0x2e, 0x54, 0x61, 0x62, 0x6c, 0x65, 0x52, 0x65, 0x66, 0x65, 0x72, 0x65, 0x6e, 0x63,
-	0x65, 0x52, 0x08, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x49, 0x64, 0x12, 0x21, 0x0a, 0x0c, 0x63,
-	0x6f, 0x6c, 0x75, 0x6d, 0x6e, 0x5f, 0x73, 0x70, 0x65, 0x63, 0x73, 0x18, 0x03, 0x20, 0x03, 0x28,
-	0x09, 0x52, 0x0b, 0x63, 0x6f, 0x6c, 0x75, 0x6d, 0x6e, 0x53, 0x70, 0x65, 0x63, 0x73, 0x22, 0xa5,
-	0x02, 0x0a, 0x0b, 0x4d, 0x61, 0x74, 0x68, 0x43, 0x6f, 0x6e, 0x74, 0x65, 0x78, 0x74, 0x12, 0x1c,
-	0x0a, 0x09, 0x70, 0x72, 0x65, 0x63, 0x69, 0x73, 0x69, 0x6f, 0x6e, 0x18, 0x01, 0x20, 0x01, 0x28,
-	0x11, 0x52, 0x09, 0x70, 0x72, 0x65, 0x63, 0x69, 0x73, 0x69, 0x6f, 0x6e, 0x12, 0x60, 0x0a, 0x0d,
-	0x72, 0x6f, 0x75, 0x6e, 0x64, 0x69, 0x6e, 0x67, 0x5f, 0x6d, 0x6f, 0x64, 0x65, 0x18, 0x02, 0x20,
-	0x01, 0x28, 0x0e, 0x32, 0x3b, 0x2e, 0x69, 0x6f, 0x2e, 0x64, 0x65, 0x65, 0x70, 0x68, 0x61, 0x76,
-	0x65, 0x6e, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x62, 0x61, 0x63, 0x6b, 0x70, 0x6c, 0x61,
-	0x6e, 0x65, 0x2e, 0x67, 0x72, 0x70, 0x63, 0x2e, 0x4d, 0x61, 0x74, 0x68, 0x43, 0x6f, 0x6e, 0x74,
-	0x65, 0x78, 0x74, 0x2e, 0x52, 0x6f, 0x75, 0x6e, 0x64, 0x69, 0x6e, 0x67, 0x4d, 0x6f, 0x64, 0x65,
-	0x52, 0x0c, 0x72, 0x6f, 0x75, 0x6e, 0x64, 0x69, 0x6e, 0x67, 0x4d, 0x6f, 0x64, 0x65, 0x22, 0x95,
-	0x01, 0x0a, 0x0c, 0x52, 0x6f, 0x75, 0x6e, 0x64, 0x69, 0x6e, 0x67, 0x4d, 0x6f, 0x64, 0x65, 0x12,
-	0x1f, 0x0a, 0x1b, 0x52, 0x4f, 0x55, 0x4e, 0x44, 0x49, 0x4e, 0x47, 0x5f, 0x4d, 0x4f, 0x44, 0x45,
-	0x5f, 0x4e, 0x4f, 0x54, 0x5f, 0x53, 0x50, 0x45, 0x43, 0x49, 0x46, 0x49, 0x45, 0x44, 0x10, 0x00,
-	0x12, 0x06, 0x0a, 0x02, 0x55, 0x50, 0x10, 0x01, 0x12, 0x08, 0x0a, 0x04, 0x44, 0x4f, 0x57, 0x4e,
-	0x10, 0x02, 0x12, 0x0b, 0x0a, 0x07, 0x43, 0x45, 0x49, 0x4c, 0x49, 0x4e, 0x47, 0x10, 0x03, 0x12,
-	0x09, 0x0a, 0x05, 0x46, 0x4c, 0x4f, 0x4f, 0x52, 0x10, 0x04, 0x12, 0x0b, 0x0a, 0x07, 0x48, 0x41,
-	0x4c, 0x46, 0x5f, 0x55, 0x50, 0x10, 0x05, 0x12, 0x0d, 0x0a, 0x09, 0x48, 0x41, 0x4c, 0x46, 0x5f,
-	0x44, 0x4f, 0x57, 0x4e, 0x10, 0x06, 0x12, 0x0d, 0x0a, 0x09, 0x48, 0x41, 0x4c, 0x46, 0x5f, 0x45,
-	0x56, 0x45, 0x4e, 0x10, 0x07, 0x12, 0x0f, 0x0a, 0x0b, 0x55, 0x4e, 0x4e, 0x45, 0x43, 0x45, 0x53,
-	0x53, 0x41, 0x52, 0x59, 0x10, 0x08, 0x22, 0x8e, 0x03, 0x0a, 0x13, 0x55, 0x70, 0x64, 0x61, 0x74,
-	0x65, 0x42, 0x79, 0x57, 0x69, 0x6e, 0x64, 0x6f, 0x77, 0x53, 0x63, 0x61, 0x6c, 0x65, 0x12, 0x62,
-	0x0a, 0x05, 0x74, 0x69, 0x63, 0x6b, 0x73, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x4a, 0x2e,
+	0x63, 0x2e, 0x55, 0x70, 0x64, 0x61, 0x74, 0x65, 0x42, 0x79, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73,
+	0x74, 0x2e, 0x55, 0x70, 0x64, 0x61, 0x74, 0x65, 0x42, 0x79, 0x4f, 0x70, 0x65, 0x72, 0x61, 0x74,
+	0x69, 0x6f, 0x6e, 0x2e, 0x55, 0x70, 0x64, 0x61, 0x74, 0x65, 0x42, 0x79, 0x43, 0x6f, 0x6c, 0x75,
+	0x6d, 0x6e, 0x48, 0x00, 0x52, 0x06, 0x63, 0x6f, 0x6c, 0x75, 0x6d, 0x6e, 0x1a, 0xf8, 0x35, 0x0a,
+	0x0e, 0x55, 0x70, 0x64, 0x61, 0x74, 0x65, 0x42, 0x79, 0x43, 0x6f, 0x6c, 0x75, 0x6d, 0x6e, 0x12,
+	0x74, 0x0a, 0x04, 0x73, 0x70, 0x65, 0x63, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x60, 0x2e,
 	0x69, 0x6f, 0x2e, 0x64, 0x65, 0x65, 0x70, 0x68, 0x61, 0x76, 0x65, 0x6e, 0x2e, 0x70, 0x72, 0x6f,
 	0x74, 0x6f, 0x2e, 0x62, 0x61, 0x63, 0x6b, 0x70, 0x6c, 0x61, 0x6e, 0x65, 0x2e, 0x67, 0x72, 0x70,
-	0x63, 0x2e, 0x55, 0x70, 0x64, 0x61, 0x74, 0x65, 0x42, 0x79, 0x57, 0x69, 0x6e, 0x64, 0x6f, 0x77,
-	0x53, 0x63, 0x61, 0x6c, 0x65, 0x2e, 0x55, 0x70, 0x64, 0x61, 0x74, 0x65, 0x42, 0x79, 0x57, 0x69,
-	0x6e, 0x64, 0x6f, 0x77, 0x54, 0x69, 0x63, 0x6b, 0x73, 0x48, 0x00, 0x52, 0x05, 0x74, 0x69, 0x63,
-	0x6b, 0x73, 0x12, 0x5f, 0x0a, 0x04, 0x74, 0x69, 0x6d, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b,
-	0x32, 0x49, 0x2e, 0x69, 0x6f, 0x2e, 0x64, 0x65, 0x65, 0x70, 0x68, 0x61, 0x76, 0x65, 0x6e, 0x2e,
+	0x63, 0x2e, 0x55, 0x70, 0x64, 0x61, 0x74, 0x65, 0x42, 0x79, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73,
+	0x74, 0x2e, 0x55, 0x70, 0x64, 0x61, 0x74, 0x65, 0x42, 0x79, 0x4f, 0x70, 0x65, 0x72, 0x61, 0x74,
+	0x69, 0x6f, 0x6e, 0x2e, 0x55, 0x70, 0x64, 0x61, 0x74, 0x65, 0x42, 0x79, 0x43, 0x6f, 0x6c, 0x75,
+	0x6d, 0x6e, 0x2e, 0x55, 0x70, 0x64, 0x61, 0x74, 0x65, 0x42, 0x79, 0x53, 0x70, 0x65, 0x63, 0x52,
+	0x04, 0x73, 0x70, 0x65, 0x63, 0x12, 0x1f, 0x0a, 0x0b, 0x6d, 0x61, 0x74, 0x63, 0x68, 0x5f, 0x70,
+	0x61, 0x69, 0x72, 0x73, 0x18, 0x02, 0x20, 0x03, 0x28, 0x09, 0x52, 0x0a, 0x6d, 0x61, 0x74, 0x63,
+	0x68, 0x50, 0x61, 0x69, 0x72, 0x73, 0x1a, 0xce, 0x34, 0x0a, 0x0c, 0x55, 0x70, 0x64, 0x61, 0x74,
+	0x65, 0x42, 0x79, 0x53, 0x70, 0x65, 0x63, 0x12, 0x8a, 0x01, 0x0a, 0x03, 0x73, 0x75, 0x6d, 0x18,
+	0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x76, 0x2e, 0x69, 0x6f, 0x2e, 0x64, 0x65, 0x65, 0x70, 0x68,
+	0x61, 0x76, 0x65, 0x6e, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x62, 0x61, 0x63, 0x6b, 0x70,
+	0x6c, 0x61, 0x6e, 0x65, 0x2e, 0x67, 0x72, 0x70, 0x63, 0x2e, 0x55, 0x70, 0x64, 0x61, 0x74, 0x65,
+	0x42, 0x79, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x2e, 0x55, 0x70, 0x64, 0x61, 0x74, 0x65,
+	0x42, 0x79, 0x4f, 0x70, 0x65, 0x72, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x2e, 0x55, 0x70, 0x64, 0x61,
+	0x74, 0x65, 0x42, 0x79, 0x43, 0x6f, 0x6c, 0x75, 0x6d, 0x6e, 0x2e, 0x55, 0x70, 0x64, 0x61, 0x74,
+	0x65, 0x42, 0x79, 0x53, 0x70, 0x65, 0x63, 0x2e, 0x55, 0x70, 0x64, 0x61, 0x74, 0x65, 0x42, 0x79,
+	0x43, 0x75, 0x6d, 0x75, 0x6c, 0x61, 0x74, 0x69, 0x76, 0x65, 0x53, 0x75, 0x6d, 0x48, 0x00, 0x52,
+	0x03, 0x73, 0x75, 0x6d, 0x12, 0x8a, 0x01, 0x0a, 0x03, 0x6d, 0x69, 0x6e, 0x18, 0x02, 0x20, 0x01,
+	0x28, 0x0b, 0x32, 0x76, 0x2e, 0x69, 0x6f, 0x2e, 0x64, 0x65, 0x65, 0x70, 0x68, 0x61, 0x76, 0x65,
+	0x6e, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x62, 0x61, 0x63, 0x6b, 0x70, 0x6c, 0x61, 0x6e,
+	0x65, 0x2e, 0x67, 0x72, 0x70, 0x63, 0x2e, 0x55, 0x70, 0x64, 0x61, 0x74, 0x65, 0x42, 0x79, 0x52,
+	0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x2e, 0x55, 0x70, 0x64, 0x61, 0x74, 0x65, 0x42, 0x79, 0x4f,
+	0x70, 0x65, 0x72, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x2e, 0x55, 0x70, 0x64, 0x61, 0x74, 0x65, 0x42,
+	0x79, 0x43, 0x6f, 0x6c, 0x75, 0x6d, 0x6e, 0x2e, 0x55, 0x70, 0x64, 0x61, 0x74, 0x65, 0x42, 0x79,
+	0x53, 0x70, 0x65, 0x63, 0x2e, 0x55, 0x70, 0x64, 0x61, 0x74, 0x65, 0x42, 0x79, 0x43, 0x75, 0x6d,
+	0x75, 0x6c, 0x61, 0x74, 0x69, 0x76, 0x65, 0x4d, 0x69, 0x6e, 0x48, 0x00, 0x52, 0x03, 0x6d, 0x69,
+	0x6e, 0x12, 0x8a, 0x01, 0x0a, 0x03, 0x6d, 0x61, 0x78, 0x18, 0x03, 0x20, 0x01, 0x28, 0x0b, 0x32,
+	0x76, 0x2e, 0x69, 0x6f, 0x2e, 0x64, 0x65, 0x65, 0x70, 0x68, 0x61, 0x76, 0x65, 0x6e, 0x2e, 0x70,
+	0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x62, 0x61, 0x63, 0x6b, 0x70, 0x6c, 0x61, 0x6e, 0x65, 0x2e, 0x67,
+	0x72, 0x70, 0x63, 0x2e, 0x55, 0x70, 0x64, 0x61, 0x74, 0x65, 0x42, 0x79, 0x52, 0x65, 0x71, 0x75,
+	0x65, 0x73, 0x74, 0x2e, 0x55, 0x70, 0x64, 0x61, 0x74, 0x65, 0x42, 0x79, 0x4f, 0x70, 0x65, 0x72,
+	0x61, 0x74, 0x69, 0x6f, 0x6e, 0x2e, 0x55, 0x70, 0x64, 0x61, 0x74, 0x65, 0x42, 0x79, 0x43, 0x6f,
+	0x6c, 0x75, 0x6d, 0x6e, 0x2e, 0x55, 0x70, 0x64, 0x61, 0x74, 0x65, 0x42, 0x79, 0x53, 0x70, 0x65,
+	0x63, 0x2e, 0x55, 0x70, 0x64, 0x61, 0x74, 0x65, 0x42, 0x79, 0x43, 0x75, 0x6d, 0x75, 0x6c, 0x61,
+	0x74, 0x69, 0x76, 0x65, 0x4d, 0x61, 0x78, 0x48, 0x00, 0x52, 0x03, 0x6d, 0x61, 0x78, 0x12, 0x96,
+	0x01, 0x0a, 0x07, 0x70, 0x72, 0x6f, 0x64, 0x75, 0x63, 0x74, 0x18, 0x04, 0x20, 0x01, 0x28, 0x0b,
+	0x32, 0x7a, 0x2e, 0x69, 0x6f, 0x2e, 0x64, 0x65, 0x65, 0x70, 0x68, 0x61, 0x76, 0x65, 0x6e, 0x2e,
 	0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x62, 0x61, 0x63, 0x6b, 0x70, 0x6c, 0x61, 0x6e, 0x65, 0x2e,
-	0x67, 0x72, 0x70, 0x63, 0x2e, 0x55, 0x70, 0x64, 0x61, 0x74, 0x65, 0x42, 0x79, 0x57, 0x69, 0x6e,
-	0x64, 0x6f, 0x77, 0x53, 0x63, 0x61, 0x6c, 0x65, 0x2e, 0x55, 0x70, 0x64, 0x61, 0x74, 0x65, 0x42,
-	0x79, 0x57, 0x69, 0x6e, 0x64, 0x6f, 0x77, 0x54, 0x69, 0x6d, 0x65, 0x48, 0x00, 0x52, 0x04, 0x74,
-	0x69, 0x6d, 0x65, 0x1a, 0x2b, 0x0a, 0x13, 0x55, 0x70, 0x64, 0x61, 0x74, 0x65, 0x42, 0x79, 0x57,
-	0x69, 0x6e, 0x64, 0x6f, 0x77, 0x54, 0x69, 0x63, 0x6b, 0x73, 0x12, 0x14, 0x0a, 0x05, 0x74, 0x69,
-	0x63, 0x6b, 0x73, 0x18, 0x01, 0x20, 0x01, 0x28, 0x01, 0x52, 0x05, 0x74, 0x69, 0x63, 0x6b, 0x73,
-	0x1a, 0x7d, 0x0a, 0x12, 0x55, 0x70, 0x64, 0x61, 0x74, 0x65, 0x42, 0x79, 0x57, 0x69, 0x6e, 0x64,
-	0x6f, 0x77, 0x54, 0x69, 0x6d, 0x65, 0x12, 0x16, 0x0a, 0x06, 0x63, 0x6f, 0x6c, 0x75, 0x6d, 0x6e,
-	0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06, 0x63, 0x6f, 0x6c, 0x75, 0x6d, 0x6e, 0x12, 0x1a,
-	0x0a, 0x05, 0x6e, 0x61, 0x6e, 0x6f, 0x73, 0x18, 0x02, 0x20, 0x01, 0x28, 0x12, 0x42, 0x02, 0x30,
-	0x01, 0x48, 0x00, 0x52, 0x05, 0x6e, 0x61, 0x6e, 0x6f, 0x73, 0x12, 0x29, 0x0a, 0x0f, 0x64, 0x75,
-	0x72, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x5f, 0x73, 0x74, 0x72, 0x69, 0x6e, 0x67, 0x18, 0x03, 0x20,
-	0x01, 0x28, 0x09, 0x48, 0x00, 0x52, 0x0e, 0x64, 0x75, 0x72, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x53,
-	0x74, 0x72, 0x69, 0x6e, 0x67, 0x42, 0x08, 0x0a, 0x06, 0x77, 0x69, 0x6e, 0x64, 0x6f, 0x77, 0x42,
-	0x06, 0x0a, 0x04, 0x74, 0x79, 0x70, 0x65, 0x22, 0xbd, 0x04, 0x0a, 0x11, 0x55, 0x70, 0x64, 0x61,
-	0x74, 0x65, 0x42, 0x79, 0x45, 0x6d, 0x4f, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x12, 0x56, 0x0a,
-	0x0d, 0x6f, 0x6e, 0x5f, 0x6e, 0x75, 0x6c, 0x6c, 0x5f, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x01,
-	0x20, 0x01, 0x28, 0x0e, 0x32, 0x32, 0x2e, 0x69, 0x6f, 0x2e, 0x64, 0x65, 0x65, 0x70, 0x68, 0x61,
-	0x76, 0x65, 0x6e, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x62, 0x61, 0x63, 0x6b, 0x70, 0x6c,
-	0x61, 0x6e, 0x65, 0x2e, 0x67, 0x72, 0x70, 0x63, 0x2e, 0x42, 0x61, 0x64, 0x44, 0x61, 0x74, 0x61,
-	0x42, 0x65, 0x68, 0x61, 0x76, 0x69, 0x6f, 0x72, 0x52, 0x0b, 0x6f, 0x6e, 0x4e, 0x75, 0x6c, 0x6c,
-	0x56, 0x61, 0x6c, 0x75, 0x65, 0x12, 0x54, 0x0a, 0x0c, 0x6f, 0x6e, 0x5f, 0x6e, 0x61, 0x6e, 0x5f,
-	0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0e, 0x32, 0x32, 0x2e, 0x69, 0x6f,
-	0x2e, 0x64, 0x65, 0x65, 0x70, 0x68, 0x61, 0x76, 0x65, 0x6e, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f,
-	0x2e, 0x62, 0x61, 0x63, 0x6b, 0x70, 0x6c, 0x61, 0x6e, 0x65, 0x2e, 0x67, 0x72, 0x70, 0x63, 0x2e,
-	0x42, 0x61, 0x64, 0x44, 0x61, 0x74, 0x61, 0x42, 0x65, 0x68, 0x61, 0x76, 0x69, 0x6f, 0x72, 0x52,
-	0x0a, 0x6f, 0x6e, 0x4e, 0x61, 0x6e, 0x56, 0x61, 0x6c, 0x75, 0x65, 0x12, 0x54, 0x0a, 0x0c, 0x6f,
-	0x6e, 0x5f, 0x6e, 0x75, 0x6c, 0x6c, 0x5f, 0x74, 0x69, 0x6d, 0x65, 0x18, 0x03, 0x20, 0x01, 0x28,
-	0x0e, 0x32, 0x32, 0x2e, 0x69, 0x6f, 0x2e, 0x64, 0x65, 0x65, 0x70, 0x68, 0x61, 0x76, 0x65, 0x6e,
-	0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x62, 0x61, 0x63, 0x6b, 0x70, 0x6c, 0x61, 0x6e, 0x65,
-	0x2e, 0x67, 0x72, 0x70, 0x63, 0x2e, 0x42, 0x61, 0x64, 0x44, 0x61, 0x74, 0x61, 0x42, 0x65, 0x68,
-	0x61, 0x76, 0x69, 0x6f, 0x72, 0x52, 0x0a, 0x6f, 0x6e, 0x4e, 0x75, 0x6c, 0x6c, 0x54, 0x69, 0x6d,
-	0x65, 0x12, 0x67, 0x0a, 0x16, 0x6f, 0x6e, 0x5f, 0x6e, 0x65, 0x67, 0x61, 0x74, 0x69, 0x76, 0x65,
-	0x5f, 0x64, 0x65, 0x6c, 0x74, 0x61, 0x5f, 0x74, 0x69, 0x6d, 0x65, 0x18, 0x04, 0x20, 0x01, 0x28,
-	0x0e, 0x32, 0x32, 0x2e, 0x69, 0x6f, 0x2e, 0x64, 0x65, 0x65, 0x70, 0x68, 0x61, 0x76, 0x65, 0x6e,
-	0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x62, 0x61, 0x63, 0x6b, 0x70, 0x6c, 0x61, 0x6e, 0x65,
-	0x2e, 0x67, 0x72, 0x70, 0x63, 0x2e, 0x42, 0x61, 0x64, 0x44, 0x61, 0x74, 0x61, 0x42, 0x65, 0x68,
-	0x61, 0x76, 0x69, 0x6f, 0x72, 0x52, 0x13, 0x6f, 0x6e, 0x4e, 0x65, 0x67, 0x61, 0x74, 0x69, 0x76,
-	0x65, 0x44, 0x65, 0x6c, 0x74, 0x61, 0x54, 0x69, 0x6d, 0x65, 0x12, 0x5f, 0x0a, 0x12, 0x6f, 0x6e,
-	0x5f, 0x7a, 0x65, 0x72, 0x6f, 0x5f, 0x64, 0x65, 0x6c, 0x74, 0x61, 0x5f, 0x74, 0x69, 0x6d, 0x65,
-	0x18, 0x05, 0x20, 0x01, 0x28, 0x0e, 0x32, 0x32, 0x2e, 0x69, 0x6f, 0x2e, 0x64, 0x65, 0x65, 0x70,
-	0x68, 0x61, 0x76, 0x65, 0x6e, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x62, 0x61, 0x63, 0x6b,
-	0x70, 0x6c, 0x61, 0x6e, 0x65, 0x2e, 0x67, 0x72, 0x70, 0x63, 0x2e, 0x42, 0x61, 0x64, 0x44, 0x61,
-	0x74, 0x61, 0x42, 0x65, 0x68, 0x61, 0x76, 0x69, 0x6f, 0x72, 0x52, 0x0f, 0x6f, 0x6e, 0x5a, 0x65,
-	0x72, 0x6f, 0x44, 0x65, 0x6c, 0x74, 0x61, 0x54, 0x69, 0x6d, 0x65, 0x12, 0x5a, 0x0a, 0x11, 0x62,
-	0x69, 0x67, 0x5f, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x5f, 0x63, 0x6f, 0x6e, 0x74, 0x65, 0x78, 0x74,
-	0x18, 0x06, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x2e, 0x2e, 0x69, 0x6f, 0x2e, 0x64, 0x65, 0x65, 0x70,
-	0x68, 0x61, 0x76, 0x65, 0x6e, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x62, 0x61, 0x63, 0x6b,
-	0x70, 0x6c, 0x61, 0x6e, 0x65, 0x2e, 0x67, 0x72, 0x70, 0x63, 0x2e, 0x4d, 0x61, 0x74, 0x68, 0x43,
-	0x6f, 0x6e, 0x74, 0x65, 0x78, 0x74, 0x52, 0x0f, 0x62, 0x69, 0x67, 0x56, 0x61, 0x6c, 0x75, 0x65,
-	0x43, 0x6f, 0x6e, 0x74, 0x65, 0x78, 0x74, 0x22, 0x74, 0x0a, 0x14, 0x55, 0x70, 0x64, 0x61, 0x74,
-	0x65, 0x42, 0x79, 0x44, 0x65, 0x6c, 0x74, 0x61, 0x4f, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x12,
-	0x5c, 0x0a, 0x0d, 0x6e, 0x75, 0x6c, 0x6c, 0x5f, 0x62, 0x65, 0x68, 0x61, 0x76, 0x69, 0x6f, 0x72,
-	0x18, 0x01, 0x20, 0x01, 0x28, 0x0e, 0x32, 0x37, 0x2e, 0x69, 0x6f, 0x2e, 0x64, 0x65, 0x65, 0x70,
+	0x67, 0x72, 0x70, 0x63, 0x2e, 0x55, 0x70, 0x64, 0x61, 0x74, 0x65, 0x42, 0x79, 0x52, 0x65, 0x71,
+	0x75, 0x65, 0x73, 0x74, 0x2e, 0x55, 0x70, 0x64, 0x61, 0x74, 0x65, 0x42, 0x79, 0x4f, 0x70, 0x65,
+	0x72, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x2e, 0x55, 0x70, 0x64, 0x61, 0x74, 0x65, 0x42, 0x79, 0x43,
+	0x6f, 0x6c, 0x75, 0x6d, 0x6e, 0x2e, 0x55, 0x70, 0x64, 0x61, 0x74, 0x65, 0x42, 0x79, 0x53, 0x70,
+	0x65, 0x63, 0x2e, 0x55, 0x70, 0x64, 0x61, 0x74, 0x65, 0x42, 0x79, 0x43, 0x75, 0x6d, 0x75, 0x6c,
+	0x61, 0x74, 0x69, 0x76, 0x65, 0x50, 0x72, 0x6f, 0x64, 0x75, 0x63, 0x74, 0x48, 0x00, 0x52, 0x07,
+	0x70, 0x72, 0x6f, 0x64, 0x75, 0x63, 0x74, 0x12, 0x83, 0x01, 0x0a, 0x04, 0x66, 0x69, 0x6c, 0x6c,
+	0x18, 0x05, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x6d, 0x2e, 0x69, 0x6f, 0x2e, 0x64, 0x65, 0x65, 0x70,
 	0x68, 0x61, 0x76, 0x65, 0x6e, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x62, 0x61, 0x63, 0x6b,
 	0x70, 0x6c, 0x61, 0x6e, 0x65, 0x2e, 0x67, 0x72, 0x70, 0x63, 0x2e, 0x55, 0x70, 0x64, 0x61, 0x74,
-	0x65, 0x42, 0x79, 0x4e, 0x75, 0x6c, 0x6c, 0x42, 0x65, 0x68, 0x61, 0x76, 0x69, 0x6f, 0x72, 0x52,
-	0x0c, 0x6e, 0x75, 0x6c, 0x6c, 0x42, 0x65, 0x68, 0x61, 0x76, 0x69, 0x6f, 0x72, 0x22, 0xeb, 0x3e,
-	0x0a, 0x0f, 0x55, 0x70, 0x64, 0x61, 0x74, 0x65, 0x42, 0x79, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73,
-	0x74, 0x12, 0x46, 0x0a, 0x09, 0x72, 0x65, 0x73, 0x75, 0x6c, 0x74, 0x5f, 0x69, 0x64, 0x18, 0x01,
-	0x20, 0x01, 0x28, 0x0b, 0x32, 0x29, 0x2e, 0x69, 0x6f, 0x2e, 0x64, 0x65, 0x65, 0x70, 0x68, 0x61,
-	0x76, 0x65, 0x6e, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x62, 0x61, 0x63, 0x6b, 0x70, 0x6c,
-	0x61, 0x6e, 0x65, 0x2e, 0x67, 0x72, 0x70, 0x63, 0x2e, 0x54, 0x69, 0x63, 0x6b, 0x65, 0x74, 0x52,
-	0x08, 0x72, 0x65, 0x73, 0x75, 0x6c, 0x74, 0x49, 0x64, 0x12, 0x4e, 0x0a, 0x09, 0x73, 0x6f, 0x75,
-	0x72, 0x63, 0x65, 0x5f, 0x69, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x31, 0x2e, 0x69,
-	0x6f, 0x2e, 0x64, 0x65, 0x65, 0x70, 0x68, 0x61, 0x76, 0x65, 0x6e, 0x2e, 0x70, 0x72, 0x6f, 0x74,
-	0x6f, 0x2e, 0x62, 0x61, 0x63, 0x6b, 0x70, 0x6c, 0x61, 0x6e, 0x65, 0x2e, 0x67, 0x72, 0x70, 0x63,
-	0x2e, 0x54, 0x61, 0x62, 0x6c, 0x65, 0x52, 0x65, 0x66, 0x65, 0x72, 0x65, 0x6e, 0x63, 0x65, 0x52,
-	0x08, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x49, 0x64, 0x12, 0x5c, 0x0a, 0x07, 0x6f, 0x70, 0x74,
-	0x69, 0x6f, 0x6e, 0x73, 0x18, 0x03, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x42, 0x2e, 0x69, 0x6f, 0x2e,
-	0x64, 0x65, 0x65, 0x70, 0x68, 0x61, 0x76, 0x65, 0x6e, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e,
-	0x62, 0x61, 0x63, 0x6b, 0x70, 0x6c, 0x61, 0x6e, 0x65, 0x2e, 0x67, 0x72, 0x70, 0x63, 0x2e, 0x55,
-	0x70, 0x64, 0x61, 0x74, 0x65, 0x42, 0x79, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x2e, 0x55,
-	0x70, 0x64, 0x61, 0x74, 0x65, 0x42, 0x79, 0x4f, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x52, 0x07,
-	0x6f, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x12, 0x64, 0x0a, 0x0a, 0x6f, 0x70, 0x65, 0x72, 0x61,
-	0x74, 0x69, 0x6f, 0x6e, 0x73, 0x18, 0x04, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x44, 0x2e, 0x69, 0x6f,
+	0x65, 0x42, 0x79, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x2e, 0x55, 0x70, 0x64, 0x61, 0x74,
+	0x65, 0x42, 0x79, 0x4f, 0x70, 0x65, 0x72, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x2e, 0x55, 0x70, 0x64,
+	0x61, 0x74, 0x65, 0x42, 0x79, 0x43, 0x6f, 0x6c, 0x75, 0x6d, 0x6e, 0x2e, 0x55, 0x70, 0x64, 0x61,
+	0x74, 0x65, 0x42, 0x79, 0x53, 0x70, 0x65, 0x63, 0x2e, 0x55, 0x70, 0x64, 0x61, 0x74, 0x65, 0x42,
+	0x79, 0x46, 0x69, 0x6c, 0x6c, 0x48, 0x00, 0x52, 0x04, 0x66, 0x69, 0x6c, 0x6c, 0x12, 0x80, 0x01,
+	0x0a, 0x03, 0x65, 0x6d, 0x61, 0x18, 0x06, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x6c, 0x2e, 0x69, 0x6f,
 	0x2e, 0x64, 0x65, 0x65, 0x70, 0x68, 0x61, 0x76, 0x65, 0x6e, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f,
 	0x2e, 0x62, 0x61, 0x63, 0x6b, 0x70, 0x6c, 0x61, 0x6e, 0x65, 0x2e, 0x67, 0x72, 0x70, 0x63, 0x2e,
 	0x55, 0x70, 0x64, 0x61, 0x74, 0x65, 0x42, 0x79, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x2e,
 	0x55, 0x70, 0x64, 0x61, 0x74, 0x65, 0x42, 0x79, 0x4f, 0x70, 0x65, 0x72, 0x61, 0x74, 0x69, 0x6f,
-	0x6e, 0x52, 0x0a, 0x6f, 0x70, 0x65, 0x72, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x12, 0x28, 0x0a,
-	0x10, 0x67, 0x72, 0x6f, 0x75, 0x70, 0x5f, 0x62, 0x79, 0x5f, 0x63, 0x6f, 0x6c, 0x75, 0x6d, 0x6e,
-	0x73, 0x18, 0x05, 0x20, 0x03, 0x28, 0x09, 0x52, 0x0e, 0x67, 0x72, 0x6f, 0x75, 0x70, 0x42, 0x79,
-	0x43, 0x6f, 0x6c, 0x75, 0x6d, 0x6e, 0x73, 0x1a, 0xc9, 0x04, 0x0a, 0x0f, 0x55, 0x70, 0x64, 0x61,
-	0x74, 0x65, 0x42, 0x79, 0x4f, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x12, 0x2c, 0x0a, 0x0f, 0x75,
-	0x73, 0x65, 0x5f, 0x72, 0x65, 0x64, 0x69, 0x72, 0x65, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x18, 0x01,
-	0x20, 0x01, 0x28, 0x08, 0x48, 0x00, 0x52, 0x0e, 0x75, 0x73, 0x65, 0x52, 0x65, 0x64, 0x69, 0x72,
-	0x65, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x88, 0x01, 0x01, 0x12, 0x2a, 0x0a, 0x0e, 0x63, 0x68, 0x75,
-	0x6e, 0x6b, 0x5f, 0x63, 0x61, 0x70, 0x61, 0x63, 0x69, 0x74, 0x79, 0x18, 0x02, 0x20, 0x01, 0x28,
-	0x05, 0x48, 0x01, 0x52, 0x0d, 0x63, 0x68, 0x75, 0x6e, 0x6b, 0x43, 0x61, 0x70, 0x61, 0x63, 0x69,
-	0x74, 0x79, 0x88, 0x01, 0x01, 0x12, 0x4d, 0x0a, 0x21, 0x6d, 0x61, 0x78, 0x5f, 0x73, 0x74, 0x61,
-	0x74, 0x69, 0x63, 0x5f, 0x73, 0x70, 0x61, 0x72, 0x73, 0x65, 0x5f, 0x6d, 0x65, 0x6d, 0x6f, 0x72,
-	0x79, 0x5f, 0x6f, 0x76, 0x65, 0x72, 0x68, 0x65, 0x61, 0x64, 0x18, 0x03, 0x20, 0x01, 0x28, 0x01,
-	0x48, 0x02, 0x52, 0x1d, 0x6d, 0x61, 0x78, 0x53, 0x74, 0x61, 0x74, 0x69, 0x63, 0x53, 0x70, 0x61,
-	0x72, 0x73, 0x65, 0x4d, 0x65, 0x6d, 0x6f, 0x72, 0x79, 0x4f, 0x76, 0x65, 0x72, 0x68, 0x65, 0x61,
-	0x64, 0x88, 0x01, 0x01, 0x12, 0x3a, 0x0a, 0x17, 0x69, 0x6e, 0x69, 0x74, 0x69, 0x61, 0x6c, 0x5f,
-	0x68, 0x61, 0x73, 0x68, 0x5f, 0x74, 0x61, 0x62, 0x6c, 0x65, 0x5f, 0x73, 0x69, 0x7a, 0x65, 0x18,
-	0x04, 0x20, 0x01, 0x28, 0x05, 0x48, 0x03, 0x52, 0x14, 0x69, 0x6e, 0x69, 0x74, 0x69, 0x61, 0x6c,
-	0x48, 0x61, 0x73, 0x68, 0x54, 0x61, 0x62, 0x6c, 0x65, 0x53, 0x69, 0x7a, 0x65, 0x88, 0x01, 0x01,
-	0x12, 0x33, 0x0a, 0x13, 0x6d, 0x61, 0x78, 0x69, 0x6d, 0x75, 0x6d, 0x5f, 0x6c, 0x6f, 0x61, 0x64,
-	0x5f, 0x66, 0x61, 0x63, 0x74, 0x6f, 0x72, 0x18, 0x05, 0x20, 0x01, 0x28, 0x01, 0x48, 0x04, 0x52,
-	0x11, 0x6d, 0x61, 0x78, 0x69, 0x6d, 0x75, 0x6d, 0x4c, 0x6f, 0x61, 0x64, 0x46, 0x61, 0x63, 0x74,
-	0x6f, 0x72, 0x88, 0x01, 0x01, 0x12, 0x31, 0x0a, 0x12, 0x74, 0x61, 0x72, 0x67, 0x65, 0x74, 0x5f,
-	0x6c, 0x6f, 0x61, 0x64, 0x5f, 0x66, 0x61, 0x63, 0x74, 0x6f, 0x72, 0x18, 0x06, 0x20, 0x01, 0x28,
-	0x01, 0x48, 0x05, 0x52, 0x10, 0x74, 0x61, 0x72, 0x67, 0x65, 0x74, 0x4c, 0x6f, 0x61, 0x64, 0x46,
-	0x61, 0x63, 0x74, 0x6f, 0x72, 0x88, 0x01, 0x01, 0x12, 0x51, 0x0a, 0x0c, 0x6d, 0x61, 0x74, 0x68,
-	0x5f, 0x63, 0x6f, 0x6e, 0x74, 0x65, 0x78, 0x74, 0x18, 0x07, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x2e,
-	0x2e, 0x69, 0x6f, 0x2e, 0x64, 0x65, 0x65, 0x70, 0x68, 0x61, 0x76, 0x65, 0x6e, 0x2e, 0x70, 0x72,
-	0x6f, 0x74, 0x6f, 0x2e, 0x62, 0x61, 0x63, 0x6b, 0x70, 0x6c, 0x61, 0x6e, 0x65, 0x2e, 0x67, 0x72,
-	0x70, 0x63, 0x2e, 0x4d, 0x61, 0x74, 0x68, 0x43, 0x6f, 0x6e, 0x74, 0x65, 0x78, 0x74, 0x52, 0x0b,
-	0x6d, 0x61, 0x74, 0x68, 0x43, 0x6f, 0x6e, 0x74, 0x65, 0x78, 0x74, 0x42, 0x12, 0x0a, 0x10, 0x5f,
-	0x75, 0x73, 0x65, 0x5f, 0x72, 0x65, 0x64, 0x69, 0x72, 0x65, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x42,
-	0x11, 0x0a, 0x0f, 0x5f, 0x63, 0x68, 0x75, 0x6e, 0x6b, 0x5f, 0x63, 0x61, 0x70, 0x61, 0x63, 0x69,
-	0x74, 0x79, 0x42, 0x24, 0x0a, 0x22, 0x5f, 0x6d, 0x61, 0x78, 0x5f, 0x73, 0x74, 0x61, 0x74, 0x69,
-	0x63, 0x5f, 0x73, 0x70, 0x61, 0x72, 0x73, 0x65, 0x5f, 0x6d, 0x65, 0x6d, 0x6f, 0x72, 0x79, 0x5f,
-	0x6f, 0x76, 0x65, 0x72, 0x68, 0x65, 0x61, 0x64, 0x42, 0x1a, 0x0a, 0x18, 0x5f, 0x69, 0x6e, 0x69,
-	0x74, 0x69, 0x61, 0x6c, 0x5f, 0x68, 0x61, 0x73, 0x68, 0x5f, 0x74, 0x61, 0x62, 0x6c, 0x65, 0x5f,
-	0x73, 0x69, 0x7a, 0x65, 0x42, 0x16, 0x0a, 0x14, 0x5f, 0x6d, 0x61, 0x78, 0x69, 0x6d, 0x75, 0x6d,
-	0x5f, 0x6c, 0x6f, 0x61, 0x64, 0x5f, 0x66, 0x61, 0x63, 0x74, 0x6f, 0x72, 0x42, 0x15, 0x0a, 0x13,
-	0x5f, 0x74, 0x61, 0x72, 0x67, 0x65, 0x74, 0x5f, 0x6c, 0x6f, 0x61, 0x64, 0x5f, 0x66, 0x61, 0x63,
-	0x74, 0x6f, 0x72, 0x1a, 0x85, 0x37, 0x0a, 0x11, 0x55, 0x70, 0x64, 0x61, 0x74, 0x65, 0x42, 0x79,
-	0x4f, 0x70, 0x65, 0x72, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x12, 0x6d, 0x0a, 0x06, 0x63, 0x6f, 0x6c,
-	0x75, 0x6d, 0x6e, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x53, 0x2e, 0x69, 0x6f, 0x2e, 0x64,
-	0x65, 0x65, 0x70, 0x68, 0x61, 0x76, 0x65, 0x6e, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x62,
-	0x61, 0x63, 0x6b, 0x70, 0x6c, 0x61, 0x6e, 0x65, 0x2e, 0x67, 0x72, 0x70, 0x63, 0x2e, 0x55, 0x70,
-	0x64, 0x61, 0x74, 0x65, 0x42, 0x79, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x2e, 0x55, 0x70,
-	0x64, 0x61, 0x74, 0x65, 0x42, 0x79, 0x4f, 0x70, 0x65, 0x72, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x2e,
-	0x55, 0x70, 0x64, 0x61, 0x74, 0x65, 0x42, 0x79, 0x43, 0x6f, 0x6c, 0x75, 0x6d, 0x6e, 0x48, 0x00,
-	0x52, 0x06, 0x63, 0x6f, 0x6c, 0x75, 0x6d, 0x6e, 0x1a, 0xf8, 0x35, 0x0a, 0x0e, 0x55, 0x70, 0x64,
-	0x61, 0x74, 0x65, 0x42, 0x79, 0x43, 0x6f, 0x6c, 0x75, 0x6d, 0x6e, 0x12, 0x74, 0x0a, 0x04, 0x73,
-	0x70, 0x65, 0x63, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x60, 0x2e, 0x69, 0x6f, 0x2e, 0x64,
-	0x65, 0x65, 0x70, 0x68, 0x61, 0x76, 0x65, 0x6e, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x62,
-	0x61, 0x63, 0x6b, 0x70, 0x6c, 0x61, 0x6e, 0x65, 0x2e, 0x67, 0x72, 0x70, 0x63, 0x2e, 0x55, 0x70,
-	0x64, 0x61, 0x74, 0x65, 0x42, 0x79, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x2e, 0x55, 0x70,
-	0x64, 0x61, 0x74, 0x65, 0x42, 0x79, 0x4f, 0x70, 0x65, 0x72, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x2e,
-	0x55, 0x70, 0x64, 0x61, 0x74, 0x65, 0x42, 0x79, 0x43, 0x6f, 0x6c, 0x75, 0x6d, 0x6e, 0x2e, 0x55,
-	0x70, 0x64, 0x61, 0x74, 0x65, 0x42, 0x79, 0x53, 0x70, 0x65, 0x63, 0x52, 0x04, 0x73, 0x70, 0x65,
-	0x63, 0x12, 0x1f, 0x0a, 0x0b, 0x6d, 0x61, 0x74, 0x63, 0x68, 0x5f, 0x70, 0x61, 0x69, 0x72, 0x73,
-	0x18, 0x02, 0x20, 0x03, 0x28, 0x09, 0x52, 0x0a, 0x6d, 0x61, 0x74, 0x63, 0x68, 0x50, 0x61, 0x69,
-	0x72, 0x73, 0x1a, 0xce, 0x34, 0x0a, 0x0c, 0x55, 0x70, 0x64, 0x61, 0x74, 0x65, 0x42, 0x79, 0x53,
-	0x70, 0x65, 0x63, 0x12, 0x8a, 0x01, 0x0a, 0x03, 0x73, 0x75, 0x6d, 0x18, 0x01, 0x20, 0x01, 0x28,
-	0x0b, 0x32, 0x76, 0x2e, 0x69, 0x6f, 0x2e, 0x64, 0x65, 0x65, 0x70, 0x68, 0x61, 0x76, 0x65, 0x6e,
+	0x6e, 0x2e, 0x55, 0x70, 0x64, 0x61, 0x74, 0x65, 0x42, 0x79, 0x43, 0x6f, 0x6c, 0x75, 0x6d, 0x6e,
+	0x2e, 0x55, 0x70, 0x64, 0x61, 0x74, 0x65, 0x42, 0x79, 0x53, 0x70, 0x65, 0x63, 0x2e, 0x55, 0x70,
+	0x64, 0x61, 0x74, 0x65, 0x42, 0x79, 0x45, 0x6d, 0x61, 0x48, 0x00, 0x52, 0x03, 0x65, 0x6d, 0x61,
+	0x12, 0x96, 0x01, 0x0a, 0x0b, 0x72, 0x6f, 0x6c, 0x6c, 0x69, 0x6e, 0x67, 0x5f, 0x73, 0x75, 0x6d,
+	0x18, 0x07, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x73, 0x2e, 0x69, 0x6f, 0x2e, 0x64, 0x65, 0x65, 0x70,
+	0x68, 0x61, 0x76, 0x65, 0x6e, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x62, 0x61, 0x63, 0x6b,
+	0x70, 0x6c, 0x61, 0x6e, 0x65, 0x2e, 0x67, 0x72, 0x70, 0x63, 0x2e, 0x55, 0x70, 0x64, 0x61, 0x74,
+	0x65, 0x42, 0x79, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x2e, 0x55, 0x70, 0x64, 0x61, 0x74,
+	0x65, 0x42, 0x79, 0x4f, 0x70, 0x65, 0x72, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x2e, 0x55, 0x70, 0x64,
+	0x61, 0x74, 0x65, 0x42, 0x79, 0x43, 0x6f, 0x6c, 0x75, 0x6d, 0x6e, 0x2e, 0x55, 0x70, 0x64, 0x61,
+	0x74, 0x65, 0x42, 0x79, 0x53, 0x70, 0x65, 0x63, 0x2e, 0x55, 0x70, 0x64, 0x61, 0x74, 0x65, 0x42,
+	0x79, 0x52, 0x6f, 0x6c, 0x6c, 0x69, 0x6e, 0x67, 0x53, 0x75, 0x6d, 0x48, 0x00, 0x52, 0x0a, 0x72,
+	0x6f, 0x6c, 0x6c, 0x69, 0x6e, 0x67, 0x53, 0x75, 0x6d, 0x12, 0x9c, 0x01, 0x0a, 0x0d, 0x72, 0x6f,
+	0x6c, 0x6c, 0x69, 0x6e, 0x67, 0x5f, 0x67, 0x72, 0x6f, 0x75, 0x70, 0x18, 0x08, 0x20, 0x01, 0x28,
+	0x0b, 0x32, 0x75, 0x2e, 0x69, 0x6f, 0x2e, 0x64, 0x65, 0x65, 0x70, 0x68, 0x61, 0x76, 0x65, 0x6e,
 	0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x62, 0x61, 0x63, 0x6b, 0x70, 0x6c, 0x61, 0x6e, 0x65,
 	0x2e, 0x67, 0x72, 0x70, 0x63, 0x2e, 0x55, 0x70, 0x64, 0x61, 0x74, 0x65, 0x42, 0x79, 0x52, 0x65,
 	0x71, 0x75, 0x65, 0x73, 0x74, 0x2e, 0x55, 0x70, 0x64, 0x61, 0x74, 0x65, 0x42, 0x79, 0x4f, 0x70,
 	0x65, 0x72, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x2e, 0x55, 0x70, 0x64, 0x61, 0x74, 0x65, 0x42, 0x79,
 	0x43, 0x6f, 0x6c, 0x75, 0x6d, 0x6e, 0x2e, 0x55, 0x70, 0x64, 0x61, 0x74, 0x65, 0x42, 0x79, 0x53,
-	0x70, 0x65, 0x63, 0x2e, 0x55, 0x70, 0x64, 0x61, 0x74, 0x65, 0x42, 0x79, 0x43, 0x75, 0x6d, 0x75,
-	0x6c, 0x61, 0x74, 0x69, 0x76, 0x65, 0x53, 0x75, 0x6d, 0x48, 0x00, 0x52, 0x03, 0x73, 0x75, 0x6d,
-	0x12, 0x8a, 0x01, 0x0a, 0x03, 0x6d, 0x69, 0x6e, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x76,
+	0x70, 0x65, 0x63, 0x2e, 0x55, 0x70, 0x64, 0x61, 0x74, 0x65, 0x42, 0x79, 0x52, 0x6f, 0x6c, 0x6c,
+	0x69, 0x6e, 0x67, 0x47, 0x72, 0x6f, 0x75, 0x70, 0x48, 0x00, 0x52, 0x0c, 0x72, 0x6f, 0x6c, 0x6c,
+	0x69, 0x6e, 0x67, 0x47, 0x72, 0x6f, 0x75, 0x70, 0x12, 0x96, 0x01, 0x0a, 0x0b, 0x72, 0x6f, 0x6c,
+	0x6c, 0x69, 0x6e, 0x67, 0x5f, 0x61, 0x76, 0x67, 0x18, 0x09, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x73,
 	0x2e, 0x69, 0x6f, 0x2e, 0x64, 0x65, 0x65, 0x70, 0x68, 0x61, 0x76, 0x65, 0x6e, 0x2e, 0x70, 0x72,
 	0x6f, 0x74, 0x6f, 0x2e, 0x62, 0x61, 0x63, 0x6b, 0x70, 0x6c, 0x61, 0x6e, 0x65, 0x2e, 0x67, 0x72,
 	0x70, 0x63, 0x2e, 0x55, 0x70, 0x64, 0x61, 0x74, 0x65, 0x42, 0x79, 0x52, 0x65, 0x71, 0x75, 0x65,
 	0x73, 0x74, 0x2e, 0x55, 0x70, 0x64, 0x61, 0x74, 0x65, 0x42, 0x79, 0x4f, 0x70, 0x65, 0x72, 0x61,
 	0x74, 0x69, 0x6f, 0x6e, 0x2e, 0x55, 0x70, 0x64, 0x61, 0x74, 0x65, 0x42, 0x79, 0x43, 0x6f, 0x6c,
 	0x75, 0x6d, 0x6e, 0x2e, 0x55, 0x70, 0x64, 0x61, 0x74, 0x65, 0x42, 0x79, 0x53, 0x70, 0x65, 0x63,
-	0x2e, 0x55, 0x70, 0x64, 0x61, 0x74, 0x65, 0x42, 0x79, 0x43, 0x75, 0x6d, 0x75, 0x6c, 0x61, 0x74,
-	0x69, 0x76, 0x65, 0x4d, 0x69, 0x6e, 0x48, 0x00, 0x52, 0x03, 0x6d, 0x69, 0x6e, 0x12, 0x8a, 0x01,
-	0x0a, 0x03, 0x6d, 0x61, 0x78, 0x18, 0x03, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x76, 0x2e, 0x69, 0x6f,
-	0x2e, 0x64, 0x65, 0x65, 0x70, 0x68, 0x61, 0x76, 0x65, 0x6e, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f,
-	0x2e, 0x62, 0x61, 0x63, 0x6b, 0x70, 0x6c, 0x61, 0x6e, 0x65, 0x2e, 0x67, 0x72, 0x70, 0x63, 0x2e,
-	0x55, 0x70, 0x64, 0x61, 0x74, 0x65, 0x42, 0x79, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x2e,
-	0x55, 0x70, 0x64, 0x61, 0x74, 0x65, 0x42, 0x79, 0x4f, 0x70, 0x65, 0x72, 0x61, 0x74, 0x69, 0x6f,
-	0x6e, 0x2e, 0x55, 0x70, 0x64, 0x61, 0x74, 0x65, 0x42, 0x79, 0x43, 0x6f, 0x6c, 0x75, 0x6d, 0x6e,
-	0x2e, 0x55, 0x70, 0x64, 0x61, 0x74, 0x65, 0x42, 0x79, 0x53, 0x70, 0x65, 0x63, 0x2e, 0x55, 0x70,
-	0x64, 0x61, 0x74, 0x65, 0x42, 0x79, 0x43, 0x75, 0x6d, 0x75, 0x6c, 0x61, 0x74, 0x69, 0x76, 0x65,
-	0x4d, 0x61, 0x78, 0x48, 0x00, 0x52, 0x03, 0x6d, 0x61, 0x78, 0x12, 0x96, 0x01, 0x0a, 0x07, 0x70,
-	0x72, 0x6f, 0x64, 0x75, 0x63, 0x74, 0x18, 0x04, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x7a, 0x2e, 0x69,
-	0x6f, 0x2e, 0x64, 0x65, 0x65, 0x70, 0x68, 0x61, 0x76, 0x65, 0x6e, 0x2e, 0x70, 0x72, 0x6f, 0x74,
-	0x6f, 0x2e, 0x62, 0x61, 0x63, 0x6b, 0x70, 0x6c, 0x61, 0x6e, 0x65, 0x2e, 0x67, 0x72, 0x70, 0x63,
-	0x2e, 0x55, 0x70, 0x64, 0x61, 0x74, 0x65, 0x42, 0x79, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74,
-	0x2e, 0x55, 0x70, 0x64, 0x61, 0x74, 0x65, 0x42, 0x79, 0x4f, 0x70, 0x65, 0x72, 0x61, 0x74, 0x69,
-	0x6f, 0x6e, 0x2e, 0x55, 0x70, 0x64, 0x61, 0x74, 0x65, 0x42, 0x79, 0x43, 0x6f, 0x6c, 0x75, 0x6d,
-	0x6e, 0x2e, 0x55, 0x70, 0x64, 0x61, 0x74, 0x65, 0x42, 0x79, 0x53, 0x70, 0x65, 0x63, 0x2e, 0x55,
-	0x70, 0x64, 0x61, 0x74, 0x65, 0x42, 0x79, 0x43, 0x75, 0x6d, 0x75, 0x6c, 0x61, 0x74, 0x69, 0x76,
-	0x65, 0x50, 0x72, 0x6f, 0x64, 0x75, 0x63, 0x74, 0x48, 0x00, 0x52, 0x07, 0x70, 0x72, 0x6f, 0x64,
-	0x75, 0x63, 0x74, 0x12, 0x83, 0x01, 0x0a, 0x04, 0x66, 0x69, 0x6c, 0x6c, 0x18, 0x05, 0x20, 0x01,
-	0x28, 0x0b, 0x32, 0x6d, 0x2e, 0x69, 0x6f, 0x2e, 0x64, 0x65, 0x65, 0x70, 0x68, 0x61, 0x76, 0x65,
-	0x6e, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x62, 0x61, 0x63, 0x6b, 0x70, 0x6c, 0x61, 0x6e,
-	0x65, 0x2e, 0x67, 0x72, 0x70, 0x63, 0x2e, 0x55, 0x70, 0x64, 0x61, 0x74, 0x65, 0x42, 0x79, 0x52,
-	0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x2e, 0x55, 0x70, 0x64, 0x61, 0x74, 0x65, 0x42, 0x79, 0x4f,
-	0x70, 0x65, 0x72, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x2e, 0x55, 0x70, 0x64, 0x61, 0x74, 0x65, 0x42,
-	0x79, 0x43, 0x6f, 0x6c, 0x75, 0x6d, 0x6e, 0x2e, 0x55, 0x70, 0x64, 0x61, 0x74, 0x65, 0x42, 0x79,
-	0x53, 0x70, 0x65, 0x63, 0x2e, 0x55, 0x70, 0x64, 0x61, 0x74, 0x65, 0x42, 0x79, 0x46, 0x69, 0x6c,
-	0x6c, 0x48, 0x00, 0x52, 0x04, 0x66, 0x69, 0x6c, 0x6c, 0x12, 0x80, 0x01, 0x0a, 0x03, 0x65, 0x6d,
-	0x61, 0x18, 0x06, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x6c, 0x2e, 0x69, 0x6f, 0x2e, 0x64, 0x65, 0x65,
+	0x2e, 0x55, 0x70, 0x64, 0x61, 0x74, 0x65, 0x42, 0x79, 0x52, 0x6f, 0x6c, 0x6c, 0x69, 0x6e, 0x67,
+	0x41, 0x76, 0x67, 0x48, 0x00, 0x52, 0x0a, 0x72, 0x6f, 0x6c, 0x6c, 0x69, 0x6e, 0x67, 0x41, 0x76,
+	0x67, 0x12, 0x96, 0x01, 0x0a, 0x0b, 0x72, 0x6f, 0x6c, 0x6c, 0x69, 0x6e, 0x67, 0x5f, 0x6d, 0x69,
+	0x6e, 0x18, 0x0a, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x73, 0x2e, 0x69, 0x6f, 0x2e, 0x64, 0x65, 0x65,
 	0x70, 0x68, 0x61, 0x76, 0x65, 0x6e, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x62, 0x61, 0x63,
 	0x6b, 0x70, 0x6c, 0x61, 0x6e, 0x65, 0x2e, 0x67, 0x72, 0x70, 0x63, 0x2e, 0x55, 0x70, 0x64, 0x61,
 	0x74, 0x65, 0x42, 0x79, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x2e, 0x55, 0x70, 0x64, 0x61,
 	0x74, 0x65, 0x42, 0x79, 0x4f, 0x70, 0x65, 0x72, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x2e, 0x55, 0x70,
 	0x64, 0x61, 0x74, 0x65, 0x42, 0x79, 0x43, 0x6f, 0x6c, 0x75, 0x6d, 0x6e, 0x2e, 0x55, 0x70, 0x64,
 	0x61, 0x74, 0x65, 0x42, 0x79, 0x53, 0x70, 0x65, 0x63, 0x2e, 0x55, 0x70, 0x64, 0x61, 0x74, 0x65,
-	0x42, 0x79, 0x45, 0x6d, 0x61, 0x48, 0x00, 0x52, 0x03, 0x65, 0x6d, 0x61, 0x12, 0x96, 0x01, 0x0a,
-	0x0b, 0x72, 0x6f, 0x6c, 0x6c, 0x69, 0x6e, 0x67, 0x5f, 0x73, 0x75, 0x6d, 0x18, 0x07, 0x20, 0x01,
-	0x28, 0x0b, 0x32, 0x73, 0x2e, 0x69, 0x6f, 0x2e, 0x64, 0x65, 0x65, 0x70, 0x68, 0x61, 0x76, 0x65,
-	0x6e, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x62, 0x61, 0x63, 0x6b, 0x70, 0x6c, 0x61, 0x6e,
-	0x65, 0x2e, 0x67, 0x72, 0x70, 0x63, 0x2e, 0x55, 0x70, 0x64, 0x61, 0x74, 0x65, 0x42, 0x79, 0x52,
-	0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x2e, 0x55, 0x70, 0x64, 0x61, 0x74, 0x65, 0x42, 0x79, 0x4f,
-	0x70, 0x65, 0x72, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x2e, 0x55, 0x70, 0x64, 0x61, 0x74, 0x65, 0x42,
-	0x79, 0x43, 0x6f, 0x6c, 0x75, 0x6d, 0x6e, 0x2e, 0x55, 0x70, 0x64, 0x61, 0x74, 0x65, 0x42, 0x79,
-	0x53, 0x70, 0x65, 0x63, 0x2e, 0x55, 0x70, 0x64, 0x61, 0x74, 0x65, 0x42, 0x79, 0x52, 0x6f, 0x6c,
-	0x6c, 0x69, 0x6e, 0x67, 0x53, 0x75, 0x6d, 0x48, 0x00, 0x52, 0x0a, 0x72, 0x6f, 0x6c, 0x6c, 0x69,
-	0x6e, 0x67, 0x53, 0x75, 0x6d, 0x12, 0x9c, 0x01, 0x0a, 0x0d, 0x72, 0x6f, 0x6c, 0x6c, 0x69, 0x6e,
-	0x67, 0x5f, 0x67, 0x72, 0x6f, 0x75, 0x70, 0x18, 0x08, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x75, 0x2e,
+	0x42, 0x79, 0x52, 0x6f, 0x6c, 0x6c, 0x69, 0x6e, 0x67, 0x4d, 0x69, 0x6e, 0x48, 0x00, 0x52, 0x0a,
+	0x72, 0x6f, 0x6c, 0x6c, 0x69, 0x6e, 0x67, 0x4d, 0x69, 0x6e, 0x12, 0x96, 0x01, 0x0a, 0x0b, 0x72,
+	0x6f, 0x6c, 0x6c, 0x69, 0x6e, 0x67, 0x5f, 0x6d, 0x61, 0x78, 0x18, 0x0b, 0x20, 0x01, 0x28, 0x0b,
+	0x32, 0x73, 0x2e, 0x69, 0x6f, 0x2e, 0x64, 0x65, 0x65, 0x70, 0x68, 0x61, 0x76, 0x65, 0x6e, 0x2e,
+	0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x62, 0x61, 0x63, 0x6b, 0x70, 0x6c, 0x61, 0x6e, 0x65, 0x2e,
+	0x67, 0x72, 0x70, 0x63, 0x2e, 0x55, 0x70, 0x64, 0x61, 0x74, 0x65, 0x42, 0x79, 0x52, 0x65, 0x71,
+	0x75, 0x65, 0x73, 0x74, 0x2e, 0x55, 0x70, 0x64, 0x61, 0x74, 0x65, 0x42, 0x79, 0x4f, 0x70, 0x65,
+	0x72, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x2e, 0x55, 0x70, 0x64, 0x61, 0x74, 0x65, 0x42, 0x79, 0x43,
+	0x6f, 0x6c, 0x75, 0x6d, 0x6e, 0x2e, 0x55, 0x70, 0x64, 0x61, 0x74, 0x65, 0x42, 0x79, 0x53, 0x70,
+	0x65, 0x63, 0x2e, 0x55, 0x70, 0x64, 0x61, 0x74, 0x65, 0x42, 0x79, 0x52, 0x6f, 0x6c, 0x6c, 0x69,
+	0x6e, 0x67, 0x4d, 0x61, 0x78, 0x48, 0x00, 0x52, 0x0a, 0x72, 0x6f, 0x6c, 0x6c, 0x69, 0x6e, 0x67,
+	0x4d, 0x61, 0x78, 0x12, 0xa2, 0x01, 0x0a, 0x0f, 0x72, 0x6f, 0x6c, 0x6c, 0x69, 0x6e, 0x67, 0x5f,
+	0x70, 0x72, 0x6f, 0x64, 0x75, 0x63, 0x74, 0x18, 0x0c, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x77, 0x2e,
 	0x69, 0x6f, 0x2e, 0x64, 0x65, 0x65, 0x70, 0x68, 0x61, 0x76, 0x65, 0x6e, 0x2e, 0x70, 0x72, 0x6f,
 	0x74, 0x6f, 0x2e, 0x62, 0x61, 0x63, 0x6b, 0x70, 0x6c, 0x61, 0x6e, 0x65, 0x2e, 0x67, 0x72, 0x70,
 	0x63, 0x2e, 0x55, 0x70, 0x64, 0x61, 0x74, 0x65, 0x42, 0x79, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73,
 	0x74, 0x2e, 0x55, 0x70, 0x64, 0x61, 0x74, 0x65, 0x42, 0x79, 0x4f, 0x70, 0x65, 0x72, 0x61, 0x74,
 	0x69, 0x6f, 0x6e, 0x2e, 0x55, 0x70, 0x64, 0x61, 0x74, 0x65, 0x42, 0x79, 0x43, 0x6f, 0x6c, 0x75,
 	0x6d, 0x6e, 0x2e, 0x55, 0x70, 0x64, 0x61, 0x74, 0x65, 0x42, 0x79, 0x53, 0x70, 0x65, 0x63, 0x2e,
-	0x55, 0x70, 0x64, 0x61, 0x74, 0x65, 0x42, 0x79, 0x52, 0x6f, 0x6c, 0x6c, 0x69, 0x6e, 0x67, 0x47,
-	0x72, 0x6f, 0x75, 0x70, 0x48, 0x00, 0x52, 0x0c, 0x72, 0x6f, 0x6c, 0x6c, 0x69, 0x6e, 0x67, 0x47,
-	0x72, 0x6f, 0x75, 0x70, 0x12, 0x96, 0x01, 0x0a, 0x0b, 0x72, 0x6f, 0x6c, 0x6c, 0x69, 0x6e, 0x67,
-	0x5f, 0x61, 0x76, 0x67, 0x18, 0x09, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x73, 0x2e, 0x69, 0x6f, 0x2e,
-	0x64, 0x65, 0x65, 0x70, 0x68, 0x61, 0x76, 0x65, 0x6e, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e,
-	0x62, 0x61, 0x63, 0x6b, 0x70, 0x6c, 0x61, 0x6e, 0x65, 0x2e, 0x67, 0x72, 0x70, 0x63, 0x2e, 0x55,
-	0x70, 0x64, 0x61, 0x74, 0x65, 0x42, 0x79, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x2e, 0x55,
-	0x70, 0x64, 0x61, 0x74, 0x65, 0x42, 0x79, 0x4f, 0x70, 0x65, 0x72, 0x61, 0x74, 0x69, 0x6f, 0x6e,
-	0x2e, 0x55, 0x70, 0x64, 0x61, 0x74, 0x65, 0x42, 0x79, 0x43, 0x6f, 0x6c, 0x75, 0x6d, 0x6e, 0x2e,
-	0x55, 0x70, 0x64, 0x61, 0x74, 0x65, 0x42, 0x79, 0x53, 0x70, 0x65, 0x63, 0x2e, 0x55, 0x70, 0x64,
-	0x61, 0x74, 0x65, 0x42, 0x79, 0x52, 0x6f, 0x6c, 0x6c, 0x69, 0x6e, 0x67, 0x41, 0x76, 0x67, 0x48,
-	0x00, 0x52, 0x0a, 0x72, 0x6f, 0x6c, 0x6c, 0x69, 0x6e, 0x67, 0x41, 0x76, 0x67, 0x12, 0x96, 0x01,
-	0x0a, 0x0b, 0x72, 0x6f, 0x6c, 0x6c, 0x69, 0x6e, 0x67, 0x5f, 0x6d, 0x69, 0x6e, 0x18, 0x0a, 0x20,
-	0x01, 0x28, 0x0b, 0x32, 0x73, 0x2e, 0x69, 0x6f, 0x2e, 0x64, 0x65, 0x65, 0x70, 0x68, 0x61, 0x76,
-	0x65, 0x6e, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x62, 0x61, 0x63, 0x6b, 0x70, 0x6c, 0x61,
-	0x6e, 0x65, 0x2e, 0x67, 0x72, 0x70, 0x63, 0x2e, 0x55, 0x70, 0x64, 0x61, 0x74, 0x65, 0x42, 0x79,
-	0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x2e, 0x55, 0x70, 0x64, 0x61, 0x74, 0x65, 0x42, 0x79,
-	0x4f, 0x70, 0x65, 0x72, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x2e, 0x55, 0x70, 0x64, 0x61, 0x74, 0x65,
-	0x42, 0x79, 0x43, 0x6f, 0x6c, 0x75, 0x6d, 0x6e, 0x2e, 0x55, 0x70, 0x64, 0x61, 0x74, 0x65, 0x42,
-	0x79, 0x53, 0x70, 0x65, 0x63, 0x2e, 0x55, 0x70, 0x64, 0x61, 0x74, 0x65, 0x42, 0x79, 0x52, 0x6f,
-	0x6c, 0x6c, 0x69, 0x6e, 0x67, 0x4d, 0x69, 0x6e, 0x48, 0x00, 0x52, 0x0a, 0x72, 0x6f, 0x6c, 0x6c,
-	0x69, 0x6e, 0x67, 0x4d, 0x69, 0x6e, 0x12, 0x96, 0x01, 0x0a, 0x0b, 0x72, 0x6f, 0x6c, 0x6c, 0x69,
-	0x6e, 0x67, 0x5f, 0x6d, 0x61, 0x78, 0x18, 0x0b, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x73, 0x2e, 0x69,
-	0x6f, 0x2e, 0x64, 0x65, 0x65, 0x70, 0x68, 0x61, 0x76, 0x65, 0x6e, 0x2e, 0x70, 0x72, 0x6f, 0x74,
-	0x6f, 0x2e, 0x62, 0x61, 0x63, 0x6b, 0x70, 0x6c, 0x61, 0x6e, 0x65, 0x2e, 0x67, 0x72, 0x70, 0x63,
-	0x2e, 0x55, 0x70, 0x64, 0x61, 0x74, 0x65, 0x42, 0x79, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74,
-	0x2e, 0x55, 0x70, 0x64, 0x61, 0x74, 0x65, 0x42, 0x79, 0x4f, 0x70, 0x65, 0x72, 0x61, 0x74, 0x69,
-	0x6f, 0x6e, 0x2e, 0x55, 0x70, 0x64, 0x61, 0x74, 0x65, 0x42, 0x79, 0x43, 0x6f, 0x6c, 0x75, 0x6d,
-	0x6e, 0x2e, 0x55, 0x70, 0x64, 0x61, 0x74, 0x65, 0x42, 0x79, 0x53, 0x70, 0x65, 0x63, 0x2e, 0x55,
-	0x70, 0x64, 0x61, 0x74, 0x65, 0x42, 0x79, 0x52, 0x6f, 0x6c, 0x6c, 0x69, 0x6e, 0x67, 0x4d, 0x61,
-	0x78, 0x48, 0x00, 0x52, 0x0a, 0x72, 0x6f, 0x6c, 0x6c, 0x69, 0x6e, 0x67, 0x4d, 0x61, 0x78, 0x12,
-	0xa2, 0x01, 0x0a, 0x0f, 0x72, 0x6f, 0x6c, 0x6c, 0x69, 0x6e, 0x67, 0x5f, 0x70, 0x72, 0x6f, 0x64,
-	0x75, 0x63, 0x74, 0x18, 0x0c, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x77, 0x2e, 0x69, 0x6f, 0x2e, 0x64,
+	0x55, 0x70, 0x64, 0x61, 0x74, 0x65, 0x42, 0x79, 0x52, 0x6f, 0x6c, 0x6c, 0x69, 0x6e, 0x67, 0x50,
+	0x72, 0x6f, 0x64, 0x75, 0x63, 0x74, 0x48, 0x00, 0x52, 0x0e, 0x72, 0x6f, 0x6c, 0x6c, 0x69, 0x6e,
+	0x67, 0x50, 0x72, 0x6f, 0x64, 0x75, 0x63, 0x74, 0x12, 0x86, 0x01, 0x0a, 0x05, 0x64, 0x65, 0x6c,
+	0x74, 0x61, 0x18, 0x0d, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x6e, 0x2e, 0x69, 0x6f, 0x2e, 0x64, 0x65,
+	0x65, 0x70, 0x68, 0x61, 0x76, 0x65, 0x6e, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x62, 0x61,
+	0x63, 0x6b, 0x70, 0x6c, 0x61, 0x6e, 0x65, 0x2e, 0x67, 0x72, 0x70, 0x63, 0x2e, 0x55, 0x70, 0x64,
+	0x61, 0x74, 0x65, 0x42, 0x79, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x2e, 0x55, 0x70, 0x64,
+	0x61, 0x74, 0x65, 0x42, 0x79, 0x4f, 0x70, 0x65, 0x72, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x2e, 0x55,
+	0x70, 0x64, 0x61, 0x74, 0x65, 0x42, 0x79, 0x43, 0x6f, 0x6c, 0x75, 0x6d, 0x6e, 0x2e, 0x55, 0x70,
+	0x64, 0x61, 0x74, 0x65, 0x42, 0x79, 0x53, 0x70, 0x65, 0x63, 0x2e, 0x55, 0x70, 0x64, 0x61, 0x74,
+	0x65, 0x42, 0x79, 0x44, 0x65, 0x6c, 0x74, 0x61, 0x48, 0x00, 0x52, 0x05, 0x64, 0x65, 0x6c, 0x74,
+	0x61, 0x12, 0x80, 0x01, 0x0a, 0x03, 0x65, 0x6d, 0x73, 0x18, 0x0e, 0x20, 0x01, 0x28, 0x0b, 0x32,
+	0x6c, 0x2e, 0x69, 0x6f, 0x2e, 0x64, 0x65, 0x65, 0x70, 0x68, 0x61, 0x76, 0x65, 0x6e, 0x2e, 0x70,
+	0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x62, 0x61, 0x63, 0x6b, 0x70, 0x6c, 0x61, 0x6e, 0x65, 0x2e, 0x67,
+	0x72, 0x70, 0x63, 0x2e, 0x55, 0x70, 0x64, 0x61, 0x74, 0x65, 0x42, 0x79, 0x52, 0x65, 0x71, 0x75,
+	0x65, 0x73, 0x74, 0x2e, 0x55, 0x70, 0x64, 0x61, 0x74, 0x65, 0x42, 0x79, 0x4f, 0x70, 0x65, 0x72,
+	0x61, 0x74, 0x69, 0x6f, 0x6e, 0x2e, 0x55, 0x70, 0x64, 0x61, 0x74, 0x65, 0x42, 0x79, 0x43, 0x6f,
+	0x6c, 0x75, 0x6d, 0x6e, 0x2e, 0x55, 0x70, 0x64, 0x61, 0x74, 0x65, 0x42, 0x79, 0x53, 0x70, 0x65,
+	0x63, 0x2e, 0x55, 0x70, 0x64, 0x61, 0x74, 0x65, 0x42, 0x79, 0x45, 0x6d, 0x73, 0x48, 0x00, 0x52,
+	0x03, 0x65, 0x6d, 0x73, 0x12, 0x87, 0x01, 0x0a, 0x06, 0x65, 0x6d, 0x5f, 0x6d, 0x69, 0x6e, 0x18,
+	0x0f, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x6e, 0x2e, 0x69, 0x6f, 0x2e, 0x64, 0x65, 0x65, 0x70, 0x68,
+	0x61, 0x76, 0x65, 0x6e, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x62, 0x61, 0x63, 0x6b, 0x70,
+	0x6c, 0x61, 0x6e, 0x65, 0x2e, 0x67, 0x72, 0x70, 0x63, 0x2e, 0x55, 0x70, 0x64, 0x61, 0x74, 0x65,
+	0x42, 0x79, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x2e, 0x55, 0x70, 0x64, 0x61, 0x74, 0x65,
+	0x42, 0x79, 0x4f, 0x70, 0x65, 0x72, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x2e, 0x55, 0x70, 0x64, 0x61,
+	0x74, 0x65, 0x42, 0x79, 0x43, 0x6f, 0x6c, 0x75, 0x6d, 0x6e, 0x2e, 0x55, 0x70, 0x64, 0x61, 0x74,
+	0x65, 0x42, 0x79, 0x53, 0x70, 0x65, 0x63, 0x2e, 0x55, 0x70, 0x64, 0x61, 0x74, 0x65, 0x42, 0x79,
+	0x45, 0x6d, 0x4d, 0x69, 0x6e, 0x48, 0x00, 0x52, 0x05, 0x65, 0x6d, 0x4d, 0x69, 0x6e, 0x12, 0x87,
+	0x01, 0x0a, 0x06, 0x65, 0x6d, 0x5f, 0x6d, 0x61, 0x78, 0x18, 0x10, 0x20, 0x01, 0x28, 0x0b, 0x32,
+	0x6e, 0x2e, 0x69, 0x6f, 0x2e, 0x64, 0x65, 0x65, 0x70, 0x68, 0x61, 0x76, 0x65, 0x6e, 0x2e, 0x70,
+	0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x62, 0x61, 0x63, 0x6b, 0x70, 0x6c, 0x61, 0x6e, 0x65, 0x2e, 0x67,
+	0x72, 0x70, 0x63, 0x2e, 0x55, 0x70, 0x64, 0x61, 0x74, 0x65, 0x42, 0x79, 0x52, 0x65, 0x71, 0x75,
+	0x65, 0x73, 0x74, 0x2e, 0x55, 0x70, 0x64, 0x61, 0x74, 0x65, 0x42, 0x79, 0x4f, 0x70, 0x65, 0x72,
+	0x61, 0x74, 0x69, 0x6f, 0x6e, 0x2e, 0x55, 0x70, 0x64, 0x61, 0x74, 0x65, 0x42, 0x79, 0x43, 0x6f,
+	0x6c, 0x75, 0x6d, 0x6e, 0x2e, 0x55, 0x70, 0x64, 0x61, 0x74, 0x65, 0x42, 0x79, 0x53, 0x70, 0x65,
+	0x63, 0x2e, 0x55, 0x70, 0x64, 0x61, 0x74, 0x65, 0x42, 0x79, 0x45, 0x6d, 0x4d, 0x61, 0x78, 0x48,
+	0x00, 0x52, 0x05, 0x65, 0x6d, 0x4d, 0x61, 0x78, 0x12, 0x87, 0x01, 0x0a, 0x06, 0x65, 0x6d, 0x5f,
+	0x73, 0x74, 0x64, 0x18, 0x11, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x6e, 0x2e, 0x69, 0x6f, 0x2e, 0x64,
 	0x65, 0x65, 0x70, 0x68, 0x61, 0x76, 0x65, 0x6e, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x62,
 	0x61, 0x63, 0x6b, 0x70, 0x6c, 0x61, 0x6e, 0x65, 0x2e, 0x67, 0x72, 0x70, 0x63, 0x2e, 0x55, 0x70,
 	0x64, 0x61, 0x74, 0x65, 0x42, 0x79, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x2e, 0x55, 0x70,
 	0x64, 0x61, 0x74, 0x65, 0x42, 0x79, 0x4f, 0x70, 0x65, 0x72, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x2e,
 	0x55, 0x70, 0x64, 0x61, 0x74, 0x65, 0x42, 0x79, 0x43, 0x6f, 0x6c, 0x75, 0x6d, 0x6e, 0x2e, 0x55,
 	0x70, 0x64, 0x61, 0x74, 0x65, 0x42, 0x79, 0x53, 0x70, 0x65, 0x63, 0x2e, 0x55, 0x70, 0x64, 0x61,
-	0x74, 0x65, 0x42, 0x79, 0x52, 0x6f, 0x6c, 0x6c, 0x69, 0x6e, 0x67, 0x50, 0x72, 0x6f, 0x64, 0x75,
-	0x63, 0x74, 0x48, 0x00, 0x52, 0x0e, 0x72, 0x6f, 0x6c, 0x6c, 0x69, 0x6e, 0x67, 0x50, 0x72, 0x6f,
-	0x64, 0x75, 0x63, 0x74, 0x12, 0x86, 0x01, 0x0a, 0x05, 0x64, 0x65, 0x6c, 0x74, 0x61, 0x18, 0x0d,
-	0x20, 0x01, 0x28, 0x0b, 0x32, 0x6e, 0x2e, 0x69, 0x6f, 0x2e, 0x64, 0x65, 0x65, 0x70, 0x68, 0x61,
-	0x76, 0x65, 0x6e, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x62, 0x61, 0x63, 0x6b, 0x70, 0x6c,
-	0x61, 0x6e, 0x65, 0x2e, 0x67, 0x72, 0x70, 0x63, 0x2e, 0x55, 0x70, 0x64, 0x61, 0x74, 0x65, 0x42,
-	0x79, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x2e, 0x55, 0x70, 0x64, 0x61, 0x74, 0x65, 0x42,
-	0x79, 0x4f, 0x70, 0x65, 0x72, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x2e, 0x55, 0x70, 0x64, 0x61, 0x74,
-	0x65, 0x42, 0x79, 0x43, 0x6f, 0x6c, 0x75, 0x6d, 0x6e, 0x2e, 0x55, 0x70, 0x64, 0x61, 0x74, 0x65,
-	0x42, 0x79, 0x53, 0x70, 0x65, 0x63, 0x2e, 0x55, 0x70, 0x64, 0x61, 0x74, 0x65, 0x42, 0x79, 0x44,
-	0x65, 0x6c, 0x74, 0x61, 0x48, 0x00, 0x52, 0x05, 0x64, 0x65, 0x6c, 0x74, 0x61, 0x12, 0x80, 0x01,
-	0x0a, 0x03, 0x65, 0x6d, 0x73, 0x18, 0x0e, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x6c, 0x2e, 0x69, 0x6f,
-	0x2e, 0x64, 0x65, 0x65, 0x70, 0x68, 0x61, 0x76, 0x65, 0x6e, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f,
-	0x2e, 0x62, 0x61, 0x63, 0x6b, 0x70, 0x6c, 0x61, 0x6e, 0x65, 0x2e, 0x67, 0x72, 0x70, 0x63, 0x2e,
-	0x55, 0x70, 0x64, 0x61, 0x74, 0x65, 0x42, 0x79, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x2e,
-	0x55, 0x70, 0x64, 0x61, 0x74, 0x65, 0x42, 0x79, 0x4f, 0x70, 0x65, 0x72, 0x61, 0x74, 0x69, 0x6f,
-	0x6e, 0x2e, 0x55, 0x70, 0x64, 0x61, 0x74, 0x65, 0x42, 0x79, 0x43, 0x6f, 0x6c, 0x75, 0x6d, 0x6e,
-	0x2e, 0x55, 0x70, 0x64, 0x61, 0x74, 0x65, 0x42, 0x79, 0x53, 0x70, 0x65, 0x63, 0x2e, 0x55, 0x70,
-	0x64, 0x61, 0x74, 0x65, 0x42, 0x79, 0x45, 0x6d, 0x73, 0x48, 0x00, 0x52, 0x03, 0x65, 0x6d, 0x73,
-	0x12, 0x87, 0x01, 0x0a, 0x06, 0x65, 0x6d, 0x5f, 0x6d, 0x69, 0x6e, 0x18, 0x0f, 0x20, 0x01, 0x28,
-	0x0b, 0x32, 0x6e, 0x2e, 0x69, 0x6f, 0x2e, 0x64, 0x65, 0x65, 0x70, 0x68, 0x61, 0x76, 0x65, 0x6e,
+	0x74, 0x65, 0x42, 0x79, 0x45, 0x6d, 0x53, 0x74, 0x64, 0x48, 0x00, 0x52, 0x05, 0x65, 0x6d, 0x53,
+	0x74, 0x64, 0x12, 0x9c, 0x01, 0x0a, 0x0d, 0x72, 0x6f, 0x6c, 0x6c, 0x69, 0x6e, 0x67, 0x5f, 0x63,
+	0x6f, 0x75, 0x6e, 0x74, 0x18, 0x12, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x75, 0x2e, 0x69, 0x6f, 0x2e,
+	0x64, 0x65, 0x65, 0x70, 0x68, 0x61, 0x76, 0x65, 0x6e, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e,
+	0x62, 0x61, 0x63, 0x6b, 0x70, 0x6c, 0x61, 0x6e, 0x65, 0x2e, 0x67, 0x72, 0x70, 0x63, 0x2e, 0x55,
+	0x70, 0x64, 0x61, 0x74, 0x65, 0x42, 0x79, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x2e, 0x55,
+	0x70, 0x64, 0x61, 0x74, 0x65, 0x42, 0x79, 0x4f, 0x70, 0x65, 0x72, 0x61, 0x74, 0x69, 0x6f, 0x6e,
+	0x2e, 0x55, 0x70, 0x64, 0x61, 0x74, 0x65, 0x42, 0x79, 0x43, 0x6f, 0x6c, 0x75, 0x6d, 0x6e, 0x2e,
+	0x55, 0x70, 0x64, 0x61, 0x74, 0x65, 0x42, 0x79, 0x53, 0x70, 0x65, 0x63, 0x2e, 0x55, 0x70, 0x64,
+	0x61, 0x74, 0x65, 0x42, 0x79, 0x52, 0x6f, 0x6c, 0x6c, 0x69, 0x6e, 0x67, 0x43, 0x6f, 0x75, 0x6e,
+	0x74, 0x48, 0x00, 0x52, 0x0c, 0x72, 0x6f, 0x6c, 0x6c, 0x69, 0x6e, 0x67, 0x43, 0x6f, 0x75, 0x6e,
+	0x74, 0x12, 0x96, 0x01, 0x0a, 0x0b, 0x72, 0x6f, 0x6c, 0x6c, 0x69, 0x6e, 0x67, 0x5f, 0x73, 0x74,
+	0x64, 0x18, 0x13, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x73, 0x2e, 0x69, 0x6f, 0x2e, 0x64, 0x65, 0x65,
+	0x70, 0x68, 0x61, 0x76, 0x65, 0x6e, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x62, 0x61, 0x63,
+	0x6b, 0x70, 0x6c, 0x61, 0x6e, 0x65, 0x2e, 0x67, 0x72, 0x70, 0x63, 0x2e, 0x55, 0x70, 0x64, 0x61,
+	0x74, 0x65, 0x42, 0x79, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x2e, 0x55, 0x70, 0x64, 0x61,
+	0x74, 0x65, 0x42, 0x79, 0x4f, 0x70, 0x65, 0x72, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x2e, 0x55, 0x70,
+	0x64, 0x61, 0x74, 0x65, 0x42, 0x79, 0x43, 0x6f, 0x6c, 0x75, 0x6d, 0x6e, 0x2e, 0x55, 0x70, 0x64,
+	0x61, 0x74, 0x65, 0x42, 0x79, 0x53, 0x70, 0x65, 0x63, 0x2e, 0x55, 0x70, 0x64, 0x61, 0x74, 0x65,
+	0x42, 0x79, 0x52, 0x6f, 0x6c, 0x6c, 0x69, 0x6e, 0x67, 0x53, 0x74, 0x64, 0x48, 0x00, 0x52, 0x0a,
+	0x72, 0x6f, 0x6c, 0x6c, 0x69, 0x6e, 0x67, 0x53, 0x74, 0x64, 0x12, 0x99, 0x01, 0x0a, 0x0c, 0x72,
+	0x6f, 0x6c, 0x6c, 0x69, 0x6e, 0x67, 0x5f, 0x77, 0x61, 0x76, 0x67, 0x18, 0x14, 0x20, 0x01, 0x28,
+	0x0b, 0x32, 0x74, 0x2e, 0x69, 0x6f, 0x2e, 0x64, 0x65, 0x65, 0x70, 0x68, 0x61, 0x76, 0x65, 0x6e,
 	0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x62, 0x61, 0x63, 0x6b, 0x70, 0x6c, 0x61, 0x6e, 0x65,
 	0x2e, 0x67, 0x72, 0x70, 0x63, 0x2e, 0x55, 0x70, 0x64, 0x61, 0x74, 0x65, 0x42, 0x79, 0x52, 0x65,
 	0x71, 0x75, 0x65, 0x73, 0x74, 0x2e, 0x55, 0x70, 0x64, 0x61, 0x74, 0x65, 0x42, 0x79, 0x4f, 0x70,
 	0x65, 0x72, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x2e, 0x55, 0x70, 0x64, 0x61, 0x74, 0x65, 0x42, 0x79,
 	0x43, 0x6f, 0x6c, 0x75, 0x6d, 0x6e, 0x2e, 0x55, 0x70, 0x64, 0x61, 0x74, 0x65, 0x42, 0x79, 0x53,
-	0x70, 0x65, 0x63, 0x2e, 0x55, 0x70, 0x64, 0x61, 0x74, 0x65, 0x42, 0x79, 0x45, 0x6d, 0x4d, 0x69,
-	0x6e, 0x48, 0x00, 0x52, 0x05, 0x65, 0x6d, 0x4d, 0x69, 0x6e, 0x12, 0x87, 0x01, 0x0a, 0x06, 0x65,
-	0x6d, 0x5f, 0x6d, 0x61, 0x78, 0x18, 0x10, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x6e, 0x2e, 0x69, 0x6f,
-	0x2e, 0x64, 0x65, 0x65, 0x70, 0x68, 0x61, 0x76, 0x65, 0x6e, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f,
-	0x2e, 0x62, 0x61, 0x63, 0x6b, 0x70, 0x6c, 0x61, 0x6e, 0x65, 0x2e, 0x67, 0x72, 0x70, 0x63, 0x2e,
-	0x55, 0x70, 0x64, 0x61, 0x74, 0x65, 0x42, 0x79, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x2e,
-	0x55, 0x70, 0x64, 0x61, 0x74, 0x65, 0x42, 0x79, 0x4f, 0x70, 0x65, 0x72, 0x61, 0x74, 0x69, 0x6f,
-	0x6e, 0x2e, 0x55, 0x70, 0x64, 0x61, 0x74, 0x65, 0x42, 0x79, 0x43, 0x6f, 0x6c, 0x75, 0x6d, 0x6e,
-	0x2e, 0x55, 0x70, 0x64, 0x61, 0x74, 0x65, 0x42, 0x79, 0x53, 0x70, 0x65, 0x63, 0x2e, 0x55, 0x70,
-	0x64, 0x61, 0x74, 0x65, 0x42, 0x79, 0x45, 0x6d, 0x4d, 0x61, 0x78, 0x48, 0x00, 0x52, 0x05, 0x65,
-	0x6d, 0x4d, 0x61, 0x78, 0x12, 0x87, 0x01, 0x0a, 0x06, 0x65, 0x6d, 0x5f, 0x73, 0x74, 0x64, 0x18,
-	0x11, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x6e, 0x2e, 0x69, 0x6f, 0x2e, 0x64, 0x65, 0x65, 0x70, 0x68,
-	0x61, 0x76, 0x65, 0x6e, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x62, 0x61, 0x63, 0x6b, 0x70,
-	0x6c, 0x61, 0x6e, 0x65, 0x2e, 0x67, 0x72, 0x70, 0x63, 0x2e, 0x55, 0x70, 0x64, 0x61, 0x74, 0x65,
-	0x42, 0x79, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x2e, 0x55, 0x70, 0x64, 0x61, 0x74, 0x65,
-	0x42, 0x79, 0x4f, 0x70, 0x65, 0x72, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x2e, 0x55, 0x70, 0x64, 0x61,
-	0x74, 0x65, 0x42, 0x79, 0x43, 0x6f, 0x6c, 0x75, 0x6d, 0x6e, 0x2e, 0x55, 0x70, 0x64, 0x61, 0x74,
-	0x65, 0x42, 0x79, 0x53, 0x70, 0x65, 0x63, 0x2e, 0x55, 0x70, 0x64, 0x61, 0x74, 0x65, 0x42, 0x79,
-	0x45, 0x6d, 0x53, 0x74, 0x64, 0x48, 0x00, 0x52, 0x05, 0x65, 0x6d, 0x53, 0x74, 0x64, 0x12, 0x9c,
-	0x01, 0x0a, 0x0d, 0x72, 0x6f, 0x6c, 0x6c, 0x69, 0x6e, 0x67, 0x5f, 0x63, 0x6f, 0x75, 0x6e, 0x74,
-	0x18, 0x12, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x75, 0x2e, 0x69, 0x6f, 0x2e, 0x64, 0x65, 0x65, 0x70,
-	0x68, 0x61, 0x76, 0x65, 0x6e, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x62, 0x61, 0x63, 0x6b,
-	0x70, 0x6c, 0x61, 0x6e, 0x65, 0x2e, 0x67, 0x72, 0x70, 0x63, 0x2e, 0x55, 0x70, 0x64, 0x61, 0x74,
-	0x65, 0x42, 0x79, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x2e, 0x55, 0x70, 0x64, 0x61, 0x74,
-	0x65, 0x42, 0x79, 0x4f, 0x70, 0x65, 0x72, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x2e, 0x55, 0x70, 0x64,
-	0x61, 0x74, 0x65, 0x42, 0x79, 0x43, 0x6f, 0x6c, 0x75, 0x6d, 0x6e, 0x2e, 0x55, 0x70, 0x64, 0x61,
-	0x74, 0x65, 0x42, 0x79, 0x53, 0x70, 0x65, 0x63, 0x2e, 0x55, 0x70, 0x64, 0x61, 0x74, 0x65, 0x42,
-	0x79, 0x52, 0x6f, 0x6c, 0x6c, 0x69, 0x6e, 0x67, 0x43, 0x6f, 0x75, 0x6e, 0x74, 0x48, 0x00, 0x52,
-	0x0c, 0x72, 0x6f, 0x6c, 0x6c, 0x69, 0x6e, 0x67, 0x43, 0x6f, 0x75, 0x6e, 0x74, 0x12, 0x96, 0x01,
-	0x0a, 0x0b, 0x72, 0x6f, 0x6c, 0x6c, 0x69, 0x6e, 0x67, 0x5f, 0x73, 0x74, 0x64, 0x18, 0x13, 0x20,
-	0x01, 0x28, 0x0b, 0x32, 0x73, 0x2e, 0x69, 0x6f, 0x2e, 0x64, 0x65, 0x65, 0x70, 0x68, 0x61, 0x76,
-	0x65, 0x6e, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x62, 0x61, 0x63, 0x6b, 0x70, 0x6c, 0x61,
-	0x6e, 0x65, 0x2e, 0x67, 0x72, 0x70, 0x63, 0x2e, 0x55, 0x70, 0x64, 0x61, 0x74, 0x65, 0x42, 0x79,
-	0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x2e, 0x55, 0x70, 0x64, 0x61, 0x74, 0x65, 0x42, 0x79,
-	0x4f, 0x70, 0x65, 0x72, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x2e, 0x55, 0x70, 0x64, 0x61, 0x74, 0x65,
-	0x42, 0x79, 0x43, 0x6f, 0x6c, 0x75, 0x6d, 0x6e, 0x2e, 0x55, 0x70, 0x64, 0x61, 0x74, 0x65, 0x42,
-	0x79, 0x53, 0x70, 0x65, 0x63, 0x2e, 0x55, 0x70, 0x64, 0x61, 0x74, 0x65, 0x42, 0x79, 0x52, 0x6f,
-	0x6c, 0x6c, 0x69, 0x6e, 0x67, 0x53, 0x74, 0x64, 0x48, 0x00, 0x52, 0x0a, 0x72, 0x6f, 0x6c, 0x6c,
-	0x69, 0x6e, 0x67, 0x53, 0x74, 0x64, 0x12, 0x99, 0x01, 0x0a, 0x0c, 0x72, 0x6f, 0x6c, 0x6c, 0x69,
-	0x6e, 0x67, 0x5f, 0x77, 0x61, 0x76, 0x67, 0x18, 0x14, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x74, 0x2e,
-	0x69, 0x6f, 0x2e, 0x64, 0x65, 0x65, 0x70, 0x68, 0x61, 0x76, 0x65, 0x6e, 0x2e, 0x70, 0x72, 0x6f,
-	0x74, 0x6f, 0x2e, 0x62, 0x61, 0x63, 0x6b, 0x70, 0x6c, 0x61, 0x6e, 0x65, 0x2e, 0x67, 0x72, 0x70,
-	0x63, 0x2e, 0x55, 0x70, 0x64, 0x61, 0x74, 0x65, 0x42, 0x79, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73,
-	0x74, 0x2e, 0x55, 0x70, 0x64, 0x61, 0x74, 0x65, 0x42, 0x79, 0x4f, 0x70, 0x65, 0x72, 0x61, 0x74,
-	0x69, 0x6f, 0x6e, 0x2e, 0x55, 0x70, 0x64, 0x61, 0x74, 0x65, 0x42, 0x79, 0x43, 0x6f, 0x6c, 0x75,
-	0x6d, 0x6e, 0x2e, 0x55, 0x70, 0x64, 0x61, 0x74, 0x65, 0x42, 0x79, 0x53, 0x70, 0x65, 0x63, 0x2e,
-	0x55, 0x70, 0x64, 0x61, 0x74, 0x65, 0x42, 0x79, 0x52, 0x6f, 0x6c, 0x6c, 0x69, 0x6e, 0x67, 0x57,
-	0x41, 0x76, 0x67, 0x48, 0x00, 0x52, 0x0b, 0x72, 0x6f, 0x6c, 0x6c, 0x69, 0x6e, 0x67, 0x57, 0x61,
-	0x76, 0x67, 0x12, 0xa2, 0x01, 0x0a, 0x0f, 0x72, 0x6f, 0x6c, 0x6c, 0x69, 0x6e, 0x67, 0x5f, 0x66,
-	0x6f, 0x72, 0x6d, 0x75, 0x6c, 0x61, 0x18, 0x15, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x77, 0x2e, 0x69,
+	0x70, 0x65, 0x63, 0x2e, 0x55, 0x70, 0x64, 0x61, 0x74, 0x65, 0x42, 0x79, 0x52, 0x6f, 0x6c, 0x6c,
+	0x69, 0x6e, 0x67, 0x57, 0x41, 0x76, 0x67, 0x48, 0x00, 0x52, 0x0b, 0x72, 0x6f, 0x6c, 0x6c, 0x69,
+	0x6e, 0x67, 0x57, 0x61, 0x76, 0x67, 0x12, 0xa2, 0x01, 0x0a, 0x0f, 0x72, 0x6f, 0x6c, 0x6c, 0x69,
+	0x6e, 0x67, 0x5f, 0x66, 0x6f, 0x72, 0x6d, 0x75, 0x6c, 0x61, 0x18, 0x15, 0x20, 0x01, 0x28, 0x0b,
+	0x32, 0x77, 0x2e, 0x69, 0x6f, 0x2e, 0x64, 0x65, 0x65, 0x70, 0x68, 0x61, 0x76, 0x65, 0x6e, 0x2e,
+	0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x62, 0x61, 0x63, 0x6b, 0x70, 0x6c, 0x61, 0x6e, 0x65, 0x2e,
+	0x67, 0x72, 0x70, 0x63, 0x2e, 0x55, 0x70, 0x64, 0x61, 0x74, 0x65, 0x42, 0x79, 0x52, 0x65, 0x71,
+	0x75, 0x65, 0x73, 0x74, 0x2e, 0x55, 0x70, 0x64, 0x61, 0x74, 0x65, 0x42, 0x79, 0x4f, 0x70, 0x65,
+	0x72, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x2e, 0x55, 0x70, 0x64, 0x61, 0x74, 0x65, 0x42, 0x79, 0x43,
+	0x6f, 0x6c, 0x75, 0x6d, 0x6e, 0x2e, 0x55, 0x70, 0x64, 0x61, 0x74, 0x65, 0x42, 0x79, 0x53, 0x70,
+	0x65, 0x63, 0x2e, 0x55, 0x70, 0x64, 0x61, 0x74, 0x65, 0x42, 0x79, 0x52, 0x6f, 0x6c, 0x6c, 0x69,
+	0x6e, 0x67, 0x46, 0x6f, 0x72, 0x6d, 0x75, 0x6c, 0x61, 0x48, 0x00, 0x52, 0x0e, 0x72, 0x6f, 0x6c,
+	0x6c, 0x69, 0x6e, 0x67, 0x46, 0x6f, 0x72, 0x6d, 0x75, 0x6c, 0x61, 0x1a, 0x17, 0x0a, 0x15, 0x55,
+	0x70, 0x64, 0x61, 0x74, 0x65, 0x42, 0x79, 0x43, 0x75, 0x6d, 0x75, 0x6c, 0x61, 0x74, 0x69, 0x76,
+	0x65, 0x53, 0x75, 0x6d, 0x1a, 0x17, 0x0a, 0x15, 0x55, 0x70, 0x64, 0x61, 0x74, 0x65, 0x42, 0x79,
+	0x43, 0x75, 0x6d, 0x75, 0x6c, 0x61, 0x74, 0x69, 0x76, 0x65, 0x4d, 0x69, 0x6e, 0x1a, 0x17, 0x0a,
+	0x15, 0x55, 0x70, 0x64, 0x61, 0x74, 0x65, 0x42, 0x79, 0x43, 0x75, 0x6d, 0x75, 0x6c, 0x61, 0x74,
+	0x69, 0x76, 0x65, 0x4d, 0x61, 0x78, 0x1a, 0x1b, 0x0a, 0x19, 0x55, 0x70, 0x64, 0x61, 0x74, 0x65,
+	0x42, 0x79, 0x43, 0x75, 0x6d, 0x75, 0x6c, 0x61, 0x74, 0x69, 0x76, 0x65, 0x50, 0x72, 0x6f, 0x64,
+	0x75, 0x63, 0x74, 0x1a, 0x0e, 0x0a, 0x0c, 0x55, 0x70, 0x64, 0x61, 0x74, 0x65, 0x42, 0x79, 0x46,
+	0x69, 0x6c, 0x6c, 0x1a, 0xb8, 0x01, 0x0a, 0x0b, 0x55, 0x70, 0x64, 0x61, 0x74, 0x65, 0x42, 0x79,
+	0x45, 0x6d, 0x61, 0x12, 0x4e, 0x0a, 0x07, 0x6f, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x18, 0x01,
+	0x20, 0x01, 0x28, 0x0b, 0x32, 0x34, 0x2e, 0x69, 0x6f, 0x2e, 0x64, 0x65, 0x65, 0x70, 0x68, 0x61,
+	0x76, 0x65, 0x6e, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x62, 0x61, 0x63, 0x6b, 0x70, 0x6c,
+	0x61, 0x6e, 0x65, 0x2e, 0x67, 0x72, 0x70, 0x63, 0x2e, 0x55, 0x70, 0x64, 0x61, 0x74, 0x65, 0x42,
+	0x79, 0x45, 0x6d, 0x4f, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x52, 0x07, 0x6f, 0x70, 0x74, 0x69,
+	0x6f, 0x6e, 0x73, 0x12, 0x59, 0x0a, 0x0c, 0x77, 0x69, 0x6e, 0x64, 0x6f, 0x77, 0x5f, 0x73, 0x63,
+	0x61, 0x6c, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x36, 0x2e, 0x69, 0x6f, 0x2e, 0x64,
+	0x65, 0x65, 0x70, 0x68, 0x61, 0x76, 0x65, 0x6e, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x62,
+	0x61, 0x63, 0x6b, 0x70, 0x6c, 0x61, 0x6e, 0x65, 0x2e, 0x67, 0x72, 0x70, 0x63, 0x2e, 0x55, 0x70,
+	0x64, 0x61, 0x74, 0x65, 0x42, 0x79, 0x57, 0x69, 0x6e, 0x64, 0x6f, 0x77, 0x53, 0x63, 0x61, 0x6c,
+	0x65, 0x52, 0x0b, 0x77, 0x69, 0x6e, 0x64, 0x6f, 0x77, 0x53, 0x63, 0x61, 0x6c, 0x65, 0x1a, 0xb8,
+	0x01, 0x0a, 0x0b, 0x55, 0x70, 0x64, 0x61, 0x74, 0x65, 0x42, 0x79, 0x45, 0x6d, 0x73, 0x12, 0x4e,
+	0x0a, 0x07, 0x6f, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32,
+	0x34, 0x2e, 0x69, 0x6f, 0x2e, 0x64, 0x65, 0x65, 0x70, 0x68, 0x61, 0x76, 0x65, 0x6e, 0x2e, 0x70,
+	0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x62, 0x61, 0x63, 0x6b, 0x70, 0x6c, 0x61, 0x6e, 0x65, 0x2e, 0x67,
+	0x72, 0x70, 0x63, 0x2e, 0x55, 0x70, 0x64, 0x61, 0x74, 0x65, 0x42, 0x79, 0x45, 0x6d, 0x4f, 0x70,
+	0x74, 0x69, 0x6f, 0x6e, 0x73, 0x52, 0x07, 0x6f, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x12, 0x59,
+	0x0a, 0x0c, 0x77, 0x69, 0x6e, 0x64, 0x6f, 0x77, 0x5f, 0x73, 0x63, 0x61, 0x6c, 0x65, 0x18, 0x02,
+	0x20, 0x01, 0x28, 0x0b, 0x32, 0x36, 0x2e, 0x69, 0x6f, 0x2e, 0x64, 0x65, 0x65, 0x70, 0x68, 0x61,
+	0x76, 0x65, 0x6e, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x62, 0x61, 0x63, 0x6b, 0x70, 0x6c,
+	0x61, 0x6e, 0x65, 0x2e, 0x67, 0x72, 0x70, 0x63, 0x2e, 0x55, 0x70, 0x64, 0x61, 0x74, 0x65, 0x42,
+	0x79, 0x57, 0x69, 0x6e, 0x64, 0x6f, 0x77, 0x53, 0x63, 0x61, 0x6c, 0x65, 0x52, 0x0b, 0x77, 0x69,
+	0x6e, 0x64, 0x6f, 0x77, 0x53, 0x63, 0x61, 0x6c, 0x65, 0x1a, 0xba, 0x01, 0x0a, 0x0d, 0x55, 0x70,
+	0x64, 0x61, 0x74, 0x65, 0x42, 0x79, 0x45, 0x6d, 0x4d, 0x69, 0x6e, 0x12, 0x4e, 0x0a, 0x07, 0x6f,
+	0x70, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x34, 0x2e, 0x69,
 	0x6f, 0x2e, 0x64, 0x65, 0x65, 0x70, 0x68, 0x61, 0x76, 0x65, 0x6e, 0x2e, 0x70, 0x72, 0x6f, 0x74,
 	0x6f, 0x2e, 0x62, 0x61, 0x63, 0x6b, 0x70, 0x6c, 0x61, 0x6e, 0x65, 0x2e, 0x67, 0x72, 0x70, 0x63,
-	0x2e, 0x55, 0x70, 0x64, 0x61, 0x74, 0x65, 0x42, 0x79, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74,
-	0x2e, 0x55, 0x70, 0x64, 0x61, 0x74, 0x65, 0x42, 0x79, 0x4f, 0x70, 0x65, 0x72, 0x61, 0x74, 0x69,
-	0x6f, 0x6e, 0x2e, 0x55, 0x70, 0x64, 0x61, 0x74, 0x65, 0x42, 0x79, 0x43, 0x6f, 0x6c, 0x75, 0x6d,
-	0x6e, 0x2e, 0x55, 0x70, 0x64, 0x61, 0x74, 0x65, 0x42, 0x79, 0x53, 0x70, 0x65, 0x63, 0x2e, 0x55,
-	0x70, 0x64, 0x61, 0x74, 0x65, 0x42, 0x79, 0x52, 0x6f, 0x6c, 0x6c, 0x69, 0x6e, 0x67, 0x46, 0x6f,
-	0x72, 0x6d, 0x75, 0x6c, 0x61, 0x48, 0x00, 0x52, 0x0e, 0x72, 0x6f, 0x6c, 0x6c, 0x69, 0x6e, 0x67,
-	0x46, 0x6f, 0x72, 0x6d, 0x75, 0x6c, 0x61, 0x1a, 0x17, 0x0a, 0x15, 0x55, 0x70, 0x64, 0x61, 0x74,
-	0x65, 0x42, 0x79, 0x43, 0x75, 0x6d, 0x75, 0x6c, 0x61, 0x74, 0x69, 0x76, 0x65, 0x53, 0x75, 0x6d,
-	0x1a, 0x17, 0x0a, 0x15, 0x55, 0x70, 0x64, 0x61, 0x74, 0x65, 0x42, 0x79, 0x43, 0x75, 0x6d, 0x75,
-	0x6c, 0x61, 0x74, 0x69, 0x76, 0x65, 0x4d, 0x69, 0x6e, 0x1a, 0x17, 0x0a, 0x15, 0x55, 0x70, 0x64,
-	0x61, 0x74, 0x65, 0x42, 0x79, 0x43, 0x75, 0x6d, 0x75, 0x6c, 0x61, 0x74, 0x69, 0x76, 0x65, 0x4d,
-	0x61, 0x78, 0x1a, 0x1b, 0x0a, 0x19, 0x55, 0x70, 0x64, 0x61, 0x74, 0x65, 0x42, 0x79, 0x43, 0x75,
-	0x6d, 0x75, 0x6c, 0x61, 0x74, 0x69, 0x76, 0x65, 0x50, 0x72, 0x6f, 0x64, 0x75, 0x63, 0x74, 0x1a,
-	0x0e, 0x0a, 0x0c, 0x55, 0x70, 0x64, 0x61, 0x74, 0x65, 0x42, 0x79, 0x46, 0x69, 0x6c, 0x6c, 0x1a,
-	0xb8, 0x01, 0x0a, 0x0b, 0x55, 0x70, 0x64, 0x61, 0x74, 0x65, 0x42, 0x79, 0x45, 0x6d, 0x61, 0x12,
-	0x4e, 0x0a, 0x07, 0x6f, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b,
-	0x32, 0x34, 0x2e, 0x69, 0x6f, 0x2e, 0x64, 0x65, 0x65, 0x70, 0x68, 0x61, 0x76, 0x65, 0x6e, 0x2e,
-	0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x62, 0x61, 0x63, 0x6b, 0x70, 0x6c, 0x61, 0x6e, 0x65, 0x2e,
-	0x67, 0x72, 0x70, 0x63, 0x2e, 0x55, 0x70, 0x64, 0x61, 0x74, 0x65, 0x42, 0x79, 0x45, 0x6d, 0x4f,
-	0x70, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x52, 0x07, 0x6f, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x12,
-	0x59, 0x0a, 0x0c, 0x77, 0x69, 0x6e, 0x64, 0x6f, 0x77, 0x5f, 0x73, 0x63, 0x61, 0x6c, 0x65, 0x18,
-	0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x36, 0x2e, 0x69, 0x6f, 0x2e, 0x64, 0x65, 0x65, 0x70, 0x68,
-	0x61, 0x76, 0x65, 0x6e, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x62, 0x61, 0x63, 0x6b, 0x70,
-	0x6c, 0x61, 0x6e, 0x65, 0x2e, 0x67, 0x72, 0x70, 0x63, 0x2e, 0x55, 0x70, 0x64, 0x61, 0x74, 0x65,
-	0x42, 0x79, 0x57, 0x69, 0x6e, 0x64, 0x6f, 0x77, 0x53, 0x63, 0x61, 0x6c, 0x65, 0x52, 0x0b, 0x77,
-	0x69, 0x6e, 0x64, 0x6f, 0x77, 0x53, 0x63, 0x61, 0x6c, 0x65, 0x1a, 0xb8, 0x01, 0x0a, 0x0b, 0x55,
-	0x70, 0x64, 0x61, 0x74, 0x65, 0x42, 0x79, 0x45, 0x6d, 0x73, 0x12, 0x4e, 0x0a, 0x07, 0x6f, 0x70,
-	0x74, 0x69, 0x6f, 0x6e, 0x73, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x34, 0x2e, 0x69, 0x6f,
+	0x2e, 0x55, 0x70, 0x64, 0x61, 0x74, 0x65, 0x42, 0x79, 0x45, 0x6d, 0x4f, 0x70, 0x74, 0x69, 0x6f,
+	0x6e, 0x73, 0x52, 0x07, 0x6f, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x12, 0x59, 0x0a, 0x0c, 0x77,
+	0x69, 0x6e, 0x64, 0x6f, 0x77, 0x5f, 0x73, 0x63, 0x61, 0x6c, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28,
+	0x0b, 0x32, 0x36, 0x2e, 0x69, 0x6f, 0x2e, 0x64, 0x65, 0x65, 0x70, 0x68, 0x61, 0x76, 0x65, 0x6e,
+	0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x62, 0x61, 0x63, 0x6b, 0x70, 0x6c, 0x61, 0x6e, 0x65,
+	0x2e, 0x67, 0x72, 0x70, 0x63, 0x2e, 0x55, 0x70, 0x64, 0x61, 0x74, 0x65, 0x42, 0x79, 0x57, 0x69,
+	0x6e, 0x64, 0x6f, 0x77, 0x53, 0x63, 0x61, 0x6c, 0x65, 0x52, 0x0b, 0x77, 0x69, 0x6e, 0x64, 0x6f,
+	0x77, 0x53, 0x63, 0x61, 0x6c, 0x65, 0x1a, 0xba, 0x01, 0x0a, 0x0d, 0x55, 0x70, 0x64, 0x61, 0x74,
+	0x65, 0x42, 0x79, 0x45, 0x6d, 0x4d, 0x61, 0x78, 0x12, 0x4e, 0x0a, 0x07, 0x6f, 0x70, 0x74, 0x69,
+	0x6f, 0x6e, 0x73, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x34, 0x2e, 0x69, 0x6f, 0x2e, 0x64,
+	0x65, 0x65, 0x70, 0x68, 0x61, 0x76, 0x65, 0x6e, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x62,
+	0x61, 0x63, 0x6b, 0x70, 0x6c, 0x61, 0x6e, 0x65, 0x2e, 0x67, 0x72, 0x70, 0x63, 0x2e, 0x55, 0x70,
+	0x64, 0x61, 0x74, 0x65, 0x42, 0x79, 0x45, 0x6d, 0x4f, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x52,
+	0x07, 0x6f, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x12, 0x59, 0x0a, 0x0c, 0x77, 0x69, 0x6e, 0x64,
+	0x6f, 0x77, 0x5f, 0x73, 0x63, 0x61, 0x6c, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x36,
+	0x2e, 0x69, 0x6f, 0x2e, 0x64, 0x65, 0x65, 0x70, 0x68, 0x61, 0x76, 0x65, 0x6e, 0x2e, 0x70, 0x72,
+	0x6f, 0x74, 0x6f, 0x2e, 0x62, 0x61, 0x63, 0x6b, 0x70, 0x6c, 0x61, 0x6e, 0x65, 0x2e, 0x67, 0x72,
+	0x70, 0x63, 0x2e, 0x55, 0x70, 0x64, 0x61, 0x74, 0x65, 0x42, 0x79, 0x57, 0x69, 0x6e, 0x64, 0x6f,
+	0x77, 0x53, 0x63, 0x61, 0x6c, 0x65, 0x52, 0x0b, 0x77, 0x69, 0x6e, 0x64, 0x6f, 0x77, 0x53, 0x63,
+	0x61, 0x6c, 0x65, 0x1a, 0xba, 0x01, 0x0a, 0x0d, 0x55, 0x70, 0x64, 0x61, 0x74, 0x65, 0x42, 0x79,
+	0x45, 0x6d, 0x53, 0x74, 0x64, 0x12, 0x4e, 0x0a, 0x07, 0x6f, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x73,
+	0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x34, 0x2e, 0x69, 0x6f, 0x2e, 0x64, 0x65, 0x65, 0x70,
+	0x68, 0x61, 0x76, 0x65, 0x6e, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x62, 0x61, 0x63, 0x6b,
+	0x70, 0x6c, 0x61, 0x6e, 0x65, 0x2e, 0x67, 0x72, 0x70, 0x63, 0x2e, 0x55, 0x70, 0x64, 0x61, 0x74,
+	0x65, 0x42, 0x79, 0x45, 0x6d, 0x4f, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x52, 0x07, 0x6f, 0x70,
+	0x74, 0x69, 0x6f, 0x6e, 0x73, 0x12, 0x59, 0x0a, 0x0c, 0x77, 0x69, 0x6e, 0x64, 0x6f, 0x77, 0x5f,
+	0x73, 0x63, 0x61, 0x6c, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x36, 0x2e, 0x69, 0x6f,
 	0x2e, 0x64, 0x65, 0x65, 0x70, 0x68, 0x61, 0x76, 0x65, 0x6e, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f,
 	0x2e, 0x62, 0x61, 0x63, 0x6b, 0x70, 0x6c, 0x61, 0x6e, 0x65, 0x2e, 0x67, 0x72, 0x70, 0x63, 0x2e,
-	0x55, 0x70, 0x64, 0x61, 0x74, 0x65, 0x42, 0x79, 0x45, 0x6d, 0x4f, 0x70, 0x74, 0x69, 0x6f, 0x6e,
-	0x73, 0x52, 0x07, 0x6f, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x12, 0x59, 0x0a, 0x0c, 0x77, 0x69,
+	0x55, 0x70, 0x64, 0x61, 0x74, 0x65, 0x42, 0x79, 0x57, 0x69, 0x6e, 0x64, 0x6f, 0x77, 0x53, 0x63,
+	0x61, 0x6c, 0x65, 0x52, 0x0b, 0x77, 0x69, 0x6e, 0x64, 0x6f, 0x77, 0x53, 0x63, 0x61, 0x6c, 0x65,
+	0x1a, 0x62, 0x0a, 0x0d, 0x55, 0x70, 0x64, 0x61, 0x74, 0x65, 0x42, 0x79, 0x44, 0x65, 0x6c, 0x74,
+	0x61, 0x12, 0x51, 0x0a, 0x07, 0x6f, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x18, 0x01, 0x20, 0x01,
+	0x28, 0x0b, 0x32, 0x37, 0x2e, 0x69, 0x6f, 0x2e, 0x64, 0x65, 0x65, 0x70, 0x68, 0x61, 0x76, 0x65,
+	0x6e, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x62, 0x61, 0x63, 0x6b, 0x70, 0x6c, 0x61, 0x6e,
+	0x65, 0x2e, 0x67, 0x72, 0x70, 0x63, 0x2e, 0x55, 0x70, 0x64, 0x61, 0x74, 0x65, 0x42, 0x79, 0x44,
+	0x65, 0x6c, 0x74, 0x61, 0x4f, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x52, 0x07, 0x6f, 0x70, 0x74,
+	0x69, 0x6f, 0x6e, 0x73, 0x1a, 0xe8, 0x01, 0x0a, 0x12, 0x55, 0x70, 0x64, 0x61, 0x74, 0x65, 0x42,
+	0x79, 0x52, 0x6f, 0x6c, 0x6c, 0x69, 0x6e, 0x67, 0x53, 0x75, 0x6d, 0x12, 0x68, 0x0a, 0x14, 0x72,
+	0x65, 0x76, 0x65, 0x72, 0x73, 0x65, 0x5f, 0x77, 0x69, 0x6e, 0x64, 0x6f, 0x77, 0x5f, 0x73, 0x63,
+	0x61, 0x6c, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x36, 0x2e, 0x69, 0x6f, 0x2e, 0x64,
+	0x65, 0x65, 0x70, 0x68, 0x61, 0x76, 0x65, 0x6e, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x62,
+	0x61, 0x63, 0x6b, 0x70, 0x6c, 0x61, 0x6e, 0x65, 0x2e, 0x67, 0x72, 0x70, 0x63, 0x2e, 0x55, 0x70,
+	0x64, 0x61, 0x74, 0x65, 0x42, 0x79, 0x57, 0x69, 0x6e, 0x64, 0x6f, 0x77, 0x53, 0x63, 0x61, 0x6c,
+	0x65, 0x52, 0x12, 0x72, 0x65, 0x76, 0x65, 0x72, 0x73, 0x65, 0x57, 0x69, 0x6e, 0x64, 0x6f, 0x77,
+	0x53, 0x63, 0x61, 0x6c, 0x65, 0x12, 0x68, 0x0a, 0x14, 0x66, 0x6f, 0x72, 0x77, 0x61, 0x72, 0x64,
+	0x5f, 0x77, 0x69, 0x6e, 0x64, 0x6f, 0x77, 0x5f, 0x73, 0x63, 0x61, 0x6c, 0x65, 0x18, 0x02, 0x20,
+	0x01, 0x28, 0x0b, 0x32, 0x36, 0x2e, 0x69, 0x6f, 0x2e, 0x64, 0x65, 0x65, 0x70, 0x68, 0x61, 0x76,
+	0x65, 0x6e, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x62, 0x61, 0x63, 0x6b, 0x70, 0x6c, 0x61,
+	0x6e, 0x65, 0x2e, 0x67, 0x72, 0x70, 0x63, 0x2e, 0x55, 0x70, 0x64, 0x61, 0x74, 0x65, 0x42, 0x79,
+	0x57, 0x69, 0x6e, 0x64, 0x6f, 0x77, 0x53, 0x63, 0x61, 0x6c, 0x65, 0x52, 0x12, 0x66, 0x6f, 0x72,
+	0x77, 0x61, 0x72, 0x64, 0x57, 0x69, 0x6e, 0x64, 0x6f, 0x77, 0x53, 0x63, 0x61, 0x6c, 0x65, 0x1a,
+	0xea, 0x01, 0x0a, 0x14, 0x55, 0x70, 0x64, 0x61, 0x74, 0x65, 0x42, 0x79, 0x52, 0x6f, 0x6c, 0x6c,
+	0x69, 0x6e, 0x67, 0x47, 0x72, 0x6f, 0x75, 0x70, 0x12, 0x68, 0x0a, 0x14, 0x72, 0x65, 0x76, 0x65,
+	0x72, 0x73, 0x65, 0x5f, 0x77, 0x69, 0x6e, 0x64, 0x6f, 0x77, 0x5f, 0x73, 0x63, 0x61, 0x6c, 0x65,
+	0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x36, 0x2e, 0x69, 0x6f, 0x2e, 0x64, 0x65, 0x65, 0x70,
+	0x68, 0x61, 0x76, 0x65, 0x6e, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x62, 0x61, 0x63, 0x6b,
+	0x70, 0x6c, 0x61, 0x6e, 0x65, 0x2e, 0x67, 0x72, 0x70, 0x63, 0x2e, 0x55, 0x70, 0x64, 0x61, 0x74,
+	0x65, 0x42, 0x79, 0x57, 0x69, 0x6e, 0x64, 0x6f, 0x77, 0x53, 0x63, 0x61, 0x6c, 0x65, 0x52, 0x12,
+	0x72, 0x65, 0x76, 0x65, 0x72, 0x73, 0x65, 0x57, 0x69, 0x6e, 0x64, 0x6f, 0x77, 0x53, 0x63, 0x61,
+	0x6c, 0x65, 0x12, 0x68, 0x0a, 0x14, 0x66, 0x6f, 0x72, 0x77, 0x61, 0x72, 0x64, 0x5f, 0x77, 0x69,
 	0x6e, 0x64, 0x6f, 0x77, 0x5f, 0x73, 0x63, 0x61, 0x6c, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b,
 	0x32, 0x36, 0x2e, 0x69, 0x6f, 0x2e, 0x64, 0x65, 0x65, 0x70, 0x68, 0x61, 0x76, 0x65, 0x6e, 0x2e,
 	0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x62, 0x61, 0x63, 0x6b, 0x70, 0x6c, 0x61, 0x6e, 0x65, 0x2e,
 	0x67, 0x72, 0x70, 0x63, 0x2e, 0x55, 0x70, 0x64, 0x61, 0x74, 0x65, 0x42, 0x79, 0x57, 0x69, 0x6e,
-	0x64, 0x6f, 0x77, 0x53, 0x63, 0x61, 0x6c, 0x65, 0x52, 0x0b, 0x77, 0x69, 0x6e, 0x64, 0x6f, 0x77,
-	0x53, 0x63, 0x61, 0x6c, 0x65, 0x1a, 0xba, 0x01, 0x0a, 0x0d, 0x55, 0x70, 0x64, 0x61, 0x74, 0x65,
-	0x42, 0x79, 0x45, 0x6d, 0x4d, 0x69, 0x6e, 0x12, 0x4e, 0x0a, 0x07, 0x6f, 0x70, 0x74, 0x69, 0x6f,
-	0x6e, 0x73, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x34, 0x2e, 0x69, 0x6f, 0x2e, 0x64, 0x65,
-	0x65, 0x70, 0x68, 0x61, 0x76, 0x65, 0x6e, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x62, 0x61,
-	0x63, 0x6b, 0x70, 0x6c, 0x61, 0x6e, 0x65, 0x2e, 0x67, 0x72, 0x70, 0x63, 0x2e, 0x55, 0x70, 0x64,
-	0x61, 0x74, 0x65, 0x42, 0x79, 0x45, 0x6d, 0x4f, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x52, 0x07,
-	0x6f, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x12, 0x59, 0x0a, 0x0c, 0x77, 0x69, 0x6e, 0x64, 0x6f,
-	0x77, 0x5f, 0x73, 0x63, 0x61, 0x6c, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x36, 0x2e,
-	0x69, 0x6f, 0x2e, 0x64, 0x65, 0x65, 0x70, 0x68, 0x61, 0x76, 0x65, 0x6e, 0x2e, 0x70, 0x72, 0x6f,
-	0x74, 0x6f, 0x2e, 0x62, 0x61, 0x63, 0x6b, 0x70, 0x6c, 0x61, 0x6e, 0x65, 0x2e, 0x67, 0x72, 0x70,
-	0x63, 0x2e, 0x55, 0x70, 0x64, 0x61, 0x74, 0x65, 0x42, 0x79, 0x57, 0x69, 0x6e, 0x64, 0x6f, 0x77,
-	0x53, 0x63, 0x61, 0x6c, 0x65, 0x52, 0x0b, 0x77, 0x69, 0x6e, 0x64, 0x6f, 0x77, 0x53, 0x63, 0x61,
-	0x6c, 0x65, 0x1a, 0xba, 0x01, 0x0a, 0x0d, 0x55, 0x70, 0x64, 0x61, 0x74, 0x65, 0x42, 0x79, 0x45,
-	0x6d, 0x4d, 0x61, 0x78, 0x12, 0x4e, 0x0a, 0x07, 0x6f, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x18,
-	0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x34, 0x2e, 0x69, 0x6f, 0x2e, 0x64, 0x65, 0x65, 0x70, 0x68,
-	0x61, 0x76, 0x65, 0x6e, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x62, 0x61, 0x63, 0x6b, 0x70,
-	0x6c, 0x61, 0x6e, 0x65, 0x2e, 0x67, 0x72, 0x70, 0x63, 0x2e, 0x55, 0x70, 0x64, 0x61, 0x74, 0x65,
-	0x42, 0x79, 0x45, 0x6d, 0x4f, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x52, 0x07, 0x6f, 0x70, 0x74,
-	0x69, 0x6f, 0x6e, 0x73, 0x12, 0x59, 0x0a, 0x0c, 0x77, 0x69, 0x6e, 0x64, 0x6f, 0x77, 0x5f, 0x73,
-	0x63, 0x61, 0x6c, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x36, 0x2e, 0x69, 0x6f, 0x2e,
-	0x64, 0x65, 0x65, 0x70, 0x68, 0x61, 0x76, 0x65, 0x6e, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e,
-	0x62, 0x61, 0x63, 0x6b, 0x70, 0x6c, 0x61, 0x6e, 0x65, 0x2e, 0x67, 0x72, 0x70, 0x63, 0x2e, 0x55,
-	0x70, 0x64, 0x61, 0x74, 0x65, 0x42, 0x79, 0x57, 0x69, 0x6e, 0x64, 0x6f, 0x77, 0x53, 0x63, 0x61,
-	0x6c, 0x65, 0x52, 0x0b, 0x77, 0x69, 0x6e, 0x64, 0x6f, 0x77, 0x53, 0x63, 0x61, 0x6c, 0x65, 0x1a,
-	0xba, 0x01, 0x0a, 0x0d, 0x55, 0x70, 0x64, 0x61, 0x74, 0x65, 0x42, 0x79, 0x45, 0x6d, 0x53, 0x74,
-	0x64, 0x12, 0x4e, 0x0a, 0x07, 0x6f, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x18, 0x01, 0x20, 0x01,
-	0x28, 0x0b, 0x32, 0x34, 0x2e, 0x69, 0x6f, 0x2e, 0x64, 0x65, 0x65, 0x70, 0x68, 0x61, 0x76, 0x65,
-	0x6e, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x62, 0x61, 0x63, 0x6b, 0x70, 0x6c, 0x61, 0x6e,
-	0x65, 0x2e, 0x67, 0x72, 0x70, 0x63, 0x2e, 0x55, 0x70, 0x64, 0x61, 0x74, 0x65, 0x42, 0x79, 0x45,
-	0x6d, 0x4f, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x52, 0x07, 0x6f, 0x70, 0x74, 0x69, 0x6f, 0x6e,
-	0x73, 0x12, 0x59, 0x0a, 0x0c, 0x77, 0x69, 0x6e, 0x64, 0x6f, 0x77, 0x5f, 0x73, 0x63, 0x61, 0x6c,
-	0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x36, 0x2e, 0x69, 0x6f, 0x2e, 0x64, 0x65, 0x65,
-	0x70, 0x68, 0x61, 0x76, 0x65, 0x6e, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x62, 0x61, 0x63,
-	0x6b, 0x70, 0x6c, 0x61, 0x6e, 0x65, 0x2e, 0x67, 0x72, 0x70, 0x63, 0x2e, 0x55, 0x70, 0x64, 0x61,
-	0x74, 0x65, 0x42, 0x79, 0x57, 0x69, 0x6e, 0x64, 0x6f, 0x77, 0x53, 0x63, 0x61, 0x6c, 0x65, 0x52,
-	0x0b, 0x77, 0x69, 0x6e, 0x64, 0x6f, 0x77, 0x53, 0x63, 0x61, 0x6c, 0x65, 0x1a, 0x62, 0x0a, 0x0d,
-	0x55, 0x70, 0x64, 0x61, 0x74, 0x65, 0x42, 0x79, 0x44, 0x65, 0x6c, 0x74, 0x61, 0x12, 0x51, 0x0a,
-	0x07, 0x6f, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x37,
-	0x2e, 0x69, 0x6f, 0x2e, 0x64, 0x65, 0x65, 0x70, 0x68, 0x61, 0x76, 0x65, 0x6e, 0x2e, 0x70, 0x72,
-	0x6f, 0x74, 0x6f, 0x2e, 0x62, 0x61, 0x63, 0x6b, 0x70, 0x6c, 0x61, 0x6e, 0x65, 0x2e, 0x67, 0x72,
-	0x70, 0x63, 0x2e, 0x55, 0x70, 0x64, 0x61, 0x74, 0x65, 0x42, 0x79, 0x44, 0x65, 0x6c, 0x74, 0x61,
-	0x4f, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x52, 0x07, 0x6f, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x73,
-	0x1a, 0xe8, 0x01, 0x0a, 0x12, 0x55, 0x70, 0x64, 0x61, 0x74, 0x65, 0x42, 0x79, 0x52, 0x6f, 0x6c,
-	0x6c, 0x69, 0x6e, 0x67, 0x53, 0x75, 0x6d, 0x12, 0x68, 0x0a, 0x14, 0x72, 0x65, 0x76, 0x65, 0x72,
-	0x73, 0x65, 0x5f, 0x77, 0x69, 0x6e, 0x64, 0x6f, 0x77, 0x5f, 0x73, 0x63, 0x61, 0x6c, 0x65, 0x18,
-	0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x36, 0x2e, 0x69, 0x6f, 0x2e, 0x64, 0x65, 0x65, 0x70, 0x68,
-	0x61, 0x76, 0x65, 0x6e, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x62, 0x61, 0x63, 0x6b, 0x70,
-	0x6c, 0x61, 0x6e, 0x65, 0x2e, 0x67, 0x72, 0x70, 0x63, 0x2e, 0x55, 0x70, 0x64, 0x61, 0x74, 0x65,
-	0x42, 0x79, 0x57, 0x69, 0x6e, 0x64, 0x6f, 0x77, 0x53, 0x63, 0x61, 0x6c, 0x65, 0x52, 0x12, 0x72,
-	0x65, 0x76, 0x65, 0x72, 0x73, 0x65, 0x57, 0x69, 0x6e, 0x64, 0x6f, 0x77, 0x53, 0x63, 0x61, 0x6c,
-	0x65, 0x12, 0x68, 0x0a, 0x14, 0x66, 0x6f, 0x72, 0x77, 0x61, 0x72, 0x64, 0x5f, 0x77, 0x69, 0x6e,
-	0x64, 0x6f, 0x77, 0x5f, 0x73, 0x63, 0x61, 0x6c, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32,
-	0x36, 0x2e, 0x69, 0x6f, 0x2e, 0x64, 0x65, 0x65, 0x70, 0x68, 0x61, 0x76, 0x65, 0x6e, 0x2e, 0x70,
-	0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x62, 0x61, 0x63, 0x6b, 0x70, 0x6c, 0x61, 0x6e, 0x65, 0x2e, 0x67,
-	0x72, 0x70, 0x63, 0x2e, 0x55, 0x70, 0x64, 0x61, 0x74, 0x65, 0x42, 0x79, 0x57, 0x69, 0x6e, 0x64,
-	0x6f, 0x77, 0x53, 0x63, 0x61, 0x6c, 0x65, 0x52, 0x12, 0x66, 0x6f, 0x72, 0x77, 0x61, 0x72, 0x64,
-	0x57, 0x69, 0x6e, 0x64, 0x6f, 0x77, 0x53, 0x63, 0x61, 0x6c, 0x65, 0x1a, 0xea, 0x01, 0x0a, 0x14,
-	0x55, 0x70, 0x64, 0x61, 0x74, 0x65, 0x42, 0x79, 0x52, 0x6f, 0x6c, 0x6c, 0x69, 0x6e, 0x67, 0x47,
-	0x72, 0x6f, 0x75, 0x70, 0x12, 0x68, 0x0a, 0x14, 0x72, 0x65, 0x76, 0x65, 0x72, 0x73, 0x65, 0x5f,
-	0x77, 0x69, 0x6e, 0x64, 0x6f, 0x77, 0x5f, 0x73, 0x63, 0x61, 0x6c, 0x65, 0x18, 0x01, 0x20, 0x01,
-	0x28, 0x0b, 0x32, 0x36, 0x2e, 0x69, 0x6f, 0x2e, 0x64, 0x65, 0x65, 0x70, 0x68, 0x61, 0x76, 0x65,
-	0x6e, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x62, 0x61, 0x63, 0x6b, 0x70, 0x6c, 0x61, 0x6e,
-	0x65, 0x2e, 0x67, 0x72, 0x70, 0x63, 0x2e, 0x55, 0x70, 0x64, 0x61, 0x74, 0x65, 0x42, 0x79, 0x57,
-	0x69, 0x6e, 0x64, 0x6f, 0x77, 0x53, 0x63, 0x61, 0x6c, 0x65, 0x52, 0x12, 0x72, 0x65, 0x76, 0x65,
-	0x72, 0x73, 0x65, 0x57, 0x69, 0x6e, 0x64, 0x6f, 0x77, 0x53, 0x63, 0x61, 0x6c, 0x65, 0x12, 0x68,
-	0x0a, 0x14, 0x66, 0x6f, 0x72, 0x77, 0x61, 0x72, 0x64, 0x5f, 0x77, 0x69, 0x6e, 0x64, 0x6f, 0x77,
-	0x5f, 0x73, 0x63, 0x61, 0x6c, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x36, 0x2e, 0x69,
+	0x64, 0x6f, 0x77, 0x53, 0x63, 0x61, 0x6c, 0x65, 0x52, 0x12, 0x66, 0x6f, 0x72, 0x77, 0x61, 0x72,
+	0x64, 0x57, 0x69, 0x6e, 0x64, 0x6f, 0x77, 0x53, 0x63, 0x61, 0x6c, 0x65, 0x1a, 0xe8, 0x01, 0x0a,
+	0x12, 0x55, 0x70, 0x64, 0x61, 0x74, 0x65, 0x42, 0x79, 0x52, 0x6f, 0x6c, 0x6c, 0x69, 0x6e, 0x67,
+	0x41, 0x76, 0x67, 0x12, 0x68, 0x0a, 0x14, 0x72, 0x65, 0x76, 0x65, 0x72, 0x73, 0x65, 0x5f, 0x77,
+	0x69, 0x6e, 0x64, 0x6f, 0x77, 0x5f, 0x73, 0x63, 0x61, 0x6c, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28,
+	0x0b, 0x32, 0x36, 0x2e, 0x69, 0x6f, 0x2e, 0x64, 0x65, 0x65, 0x70, 0x68, 0x61, 0x76, 0x65, 0x6e,
+	0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x62, 0x61, 0x63, 0x6b, 0x70, 0x6c, 0x61, 0x6e, 0x65,
+	0x2e, 0x67, 0x72, 0x70, 0x63, 0x2e, 0x55, 0x70, 0x64, 0x61, 0x74, 0x65, 0x42, 0x79, 0x57, 0x69,
+	0x6e, 0x64, 0x6f, 0x77, 0x53, 0x63, 0x61, 0x6c, 0x65, 0x52, 0x12, 0x72, 0x65, 0x76, 0x65, 0x72,
+	0x73, 0x65, 0x57, 0x69, 0x6e, 0x64, 0x6f, 0x77, 0x53, 0x63, 0x61, 0x6c, 0x65, 0x12, 0x68, 0x0a,
+	0x14, 0x66, 0x6f, 0x72, 0x77, 0x61, 0x72, 0x64, 0x5f, 0x77, 0x69, 0x6e, 0x64, 0x6f, 0x77, 0x5f,
+	0x73, 0x63, 0x61, 0x6c, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x36, 0x2e, 0x69, 0x6f,
+	0x2e, 0x64, 0x65, 0x65, 0x70, 0x68, 0x61, 0x76, 0x65, 0x6e, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f,
+	0x2e, 0x62, 0x61, 0x63, 0x6b, 0x70, 0x6c, 0x61, 0x6e, 0x65, 0x2e, 0x67, 0x72, 0x70, 0x63, 0x2e,
+	0x55, 0x70, 0x64, 0x61, 0x74, 0x65, 0x42, 0x79, 0x57, 0x69, 0x6e, 0x64, 0x6f, 0x77, 0x53, 0x63,
+	0x61, 0x6c, 0x65, 0x52, 0x12, 0x66, 0x6f, 0x72, 0x77, 0x61, 0x72, 0x64, 0x57, 0x69, 0x6e, 0x64,
+	0x6f, 0x77, 0x53, 0x63, 0x61, 0x6c, 0x65, 0x1a, 0xe8, 0x01, 0x0a, 0x12, 0x55, 0x70, 0x64, 0x61,
+	0x74, 0x65, 0x42, 0x79, 0x52, 0x6f, 0x6c, 0x6c, 0x69, 0x6e, 0x67, 0x4d, 0x69, 0x6e, 0x12, 0x68,
+	0x0a, 0x14, 0x72, 0x65, 0x76, 0x65, 0x72, 0x73, 0x65, 0x5f, 0x77, 0x69, 0x6e, 0x64, 0x6f, 0x77,
+	0x5f, 0x73, 0x63, 0x61, 0x6c, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x36, 0x2e, 0x69,
 	0x6f, 0x2e, 0x64, 0x65, 0x65, 0x70, 0x68, 0x61, 0x76, 0x65, 0x6e, 0x2e, 0x70, 0x72, 0x6f, 0x74,
 	0x6f, 0x2e, 0x62, 0x61, 0x63, 0x6b, 0x70, 0x6c, 0x61, 0x6e, 0x65, 0x2e, 0x67, 0x72, 0x70, 0x63,
 	0x2e, 0x55, 0x70, 0x64, 0x61, 0x74, 0x65, 0x42, 0x79, 0x57, 0x69, 0x6e, 0x64, 0x6f, 0x77, 0x53,
-	0x63, 0x61, 0x6c, 0x65, 0x52, 0x12, 0x66, 0x6f, 0x72, 0x77, 0x61, 0x72, 0x64, 0x57, 0x69, 0x6e,
-	0x64, 0x6f, 0x77, 0x53, 0x63, 0x61, 0x6c, 0x65, 0x1a, 0xe8, 0x01, 0x0a, 0x12, 0x55, 0x70, 0x64,
-	0x61, 0x74, 0x65, 0x42, 0x79, 0x52, 0x6f, 0x6c, 0x6c, 0x69, 0x6e, 0x67, 0x41, 0x76, 0x67, 0x12,
-	0x68, 0x0a, 0x14, 0x72, 0x65, 0x76, 0x65, 0x72, 0x73, 0x65, 0x5f, 0x77, 0x69, 0x6e, 0x64, 0x6f,
-	0x77, 0x5f, 0x73, 0x63, 0x61, 0x6c, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x36, 0x2e,
-	0x69, 0x6f, 0x2e, 0x64, 0x65, 0x65, 0x70, 0x68, 0x61, 0x76, 0x65, 0x6e, 0x2e, 0x70, 0x72, 0x6f,
-	0x74, 0x6f, 0x2e, 0x62, 0x61, 0x63, 0x6b, 0x70, 0x6c, 0x61, 0x6e, 0x65, 0x2e, 0x67, 0x72, 0x70,
-	0x63, 0x2e, 0x55, 0x70, 0x64, 0x61, 0x74, 0x65, 0x42, 0x79, 0x57, 0x69, 0x6e, 0x64, 0x6f, 0x77,
-	0x53, 0x63, 0x61, 0x6c, 0x65, 0x52, 0x12, 0x72, 0x65, 0x76, 0x65, 0x72, 0x73, 0x65, 0x57, 0x69,
-	0x6e, 0x64, 0x6f, 0x77, 0x53, 0x63, 0x61, 0x6c, 0x65, 0x12, 0x68, 0x0a, 0x14, 0x66, 0x6f, 0x72,
-	0x77, 0x61, 0x72, 0x64, 0x5f, 0x77, 0x69, 0x6e, 0x64, 0x6f, 0x77, 0x5f, 0x73, 0x63, 0x61, 0x6c,
-	0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x36, 0x2e, 0x69, 0x6f, 0x2e, 0x64, 0x65, 0x65,
+	0x63, 0x61, 0x6c, 0x65, 0x52, 0x12, 0x72, 0x65, 0x76, 0x65, 0x72, 0x73, 0x65, 0x57, 0x69, 0x6e,
+	0x64, 0x6f, 0x77, 0x53, 0x63, 0x61, 0x6c, 0x65, 0x12, 0x68, 0x0a, 0x14, 0x66, 0x6f, 0x72, 0x77,
+	0x61, 0x72, 0x64, 0x5f, 0x77, 0x69, 0x6e, 0x64, 0x6f, 0x77, 0x5f, 0x73, 0x63, 0x61, 0x6c, 0x65,
+	0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x36, 0x2e, 0x69, 0x6f, 0x2e, 0x64, 0x65, 0x65, 0x70,
+	0x68, 0x61, 0x76, 0x65, 0x6e, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x62, 0x61, 0x63, 0x6b,
+	0x70, 0x6c, 0x61, 0x6e, 0x65, 0x2e, 0x67, 0x72, 0x70, 0x63, 0x2e, 0x55, 0x70, 0x64, 0x61, 0x74,
+	0x65, 0x42, 0x79, 0x57, 0x69, 0x6e, 0x64, 0x6f, 0x77, 0x53, 0x63, 0x61, 0x6c, 0x65, 0x52, 0x12,
+	0x66, 0x6f, 0x72, 0x77, 0x61, 0x72, 0x64, 0x57, 0x69, 0x6e, 0x64, 0x6f, 0x77, 0x53, 0x63, 0x61,
+	0x6c, 0x65, 0x1a, 0xe8, 0x01, 0x0a, 0x12, 0x55, 0x70, 0x64, 0x61, 0x74, 0x65, 0x42, 0x79, 0x52,
+	0x6f, 0x6c, 0x6c, 0x69, 0x6e, 0x67, 0x4d, 0x61, 0x78, 0x12, 0x68, 0x0a, 0x14, 0x72, 0x65, 0x76,
+	0x65, 0x72, 0x73, 0x65, 0x5f, 0x77, 0x69, 0x6e, 0x64, 0x6f, 0x77, 0x5f, 0x73, 0x63, 0x61, 0x6c,
+	0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x36, 0x2e, 0x69, 0x6f, 0x2e, 0x64, 0x65, 0x65,
 	0x70, 0x68, 0x61, 0x76, 0x65, 0x6e, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x62, 0x61, 0x63,
 	0x6b, 0x70, 0x6c, 0x61, 0x6e, 0x65, 0x2e, 0x67, 0x72, 0x70, 0x63, 0x2e, 0x55, 0x70, 0x64, 0x61,
 	0x74, 0x65, 0x42, 0x79, 0x57, 0x69, 0x6e, 0x64, 0x6f, 0x77, 0x53, 0x63, 0x61, 0x6c, 0x65, 0x52,
-	0x12, 0x66, 0x6f, 0x72, 0x77, 0x61, 0x72, 0x64, 0x57, 0x69, 0x6e, 0x64, 0x6f, 0x77, 0x53, 0x63,
-	0x61, 0x6c, 0x65, 0x1a, 0xe8, 0x01, 0x0a, 0x12, 0x55, 0x70, 0x64, 0x61, 0x74, 0x65, 0x42, 0x79,
-	0x52, 0x6f, 0x6c, 0x6c, 0x69, 0x6e, 0x67, 0x4d, 0x69, 0x6e, 0x12, 0x68, 0x0a, 0x14, 0x72, 0x65,
-	0x76, 0x65, 0x72, 0x73, 0x65, 0x5f, 0x77, 0x69, 0x6e, 0x64, 0x6f, 0x77, 0x5f, 0x73, 0x63, 0x61,
-	0x6c, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x36, 0x2e, 0x69, 0x6f, 0x2e, 0x64, 0x65,
-	0x65, 0x70, 0x68, 0x61, 0x76, 0x65, 0x6e, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x62, 0x61,
-	0x63, 0x6b, 0x70, 0x6c, 0x61, 0x6e, 0x65, 0x2e, 0x67, 0x72, 0x70, 0x63, 0x2e, 0x55, 0x70, 0x64,
-	0x61, 0x74, 0x65, 0x42, 0x79, 0x57, 0x69, 0x6e, 0x64, 0x6f, 0x77, 0x53, 0x63, 0x61, 0x6c, 0x65,
-	0x52, 0x12, 0x72, 0x65, 0x76, 0x65, 0x72, 0x73, 0x65, 0x57, 0x69, 0x6e, 0x64, 0x6f, 0x77, 0x53,
-	0x63, 0x61, 0x6c, 0x65, 0x12, 0x68, 0x0a, 0x14, 0x66, 0x6f, 0x72, 0x77, 0x61, 0x72, 0x64, 0x5f,
-	0x77, 0x69, 0x6e, 0x64, 0x6f, 0x77, 0x5f, 0x73, 0x63, 0x61, 0x6c, 0x65, 0x18, 0x02, 0x20, 0x01,
-	0x28, 0x0b, 0x32, 0x36, 0x2e, 0x69, 0x6f, 0x2e, 0x64, 0x65, 0x65, 0x70, 0x68, 0x61, 0x76, 0x65,
-	0x6e, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x62, 0x61, 0x63, 0x6b, 0x70, 0x6c, 0x61, 0x6e,
-	0x65, 0x2e, 0x67, 0x72, 0x70, 0x63, 0x2e, 0x55, 0x70, 0x64, 0x61, 0x74, 0x65, 0x42, 0x79, 0x57,
-	0x69, 0x6e, 0x64, 0x6f, 0x77, 0x53, 0x63, 0x61, 0x6c, 0x65, 0x52, 0x12, 0x66, 0x6f, 0x72, 0x77,
-	0x61, 0x72, 0x64, 0x57, 0x69, 0x6e, 0x64, 0x6f, 0x77, 0x53, 0x63, 0x61, 0x6c, 0x65, 0x1a, 0xe8,
-	0x01, 0x0a, 0x12, 0x55, 0x70, 0x64, 0x61, 0x74, 0x65, 0x42, 0x79, 0x52, 0x6f, 0x6c, 0x6c, 0x69,
-	0x6e, 0x67, 0x4d, 0x61, 0x78, 0x12, 0x68, 0x0a, 0x14, 0x72, 0x65, 0x76, 0x65, 0x72, 0x73, 0x65,
+	0x12, 0x72, 0x65, 0x76, 0x65, 0x72, 0x73, 0x65, 0x57, 0x69, 0x6e, 0x64, 0x6f, 0x77, 0x53, 0x63,
+	0x61, 0x6c, 0x65, 0x12, 0x68, 0x0a, 0x14, 0x66, 0x6f, 0x72, 0x77, 0x61, 0x72, 0x64, 0x5f, 0x77,
+	0x69, 0x6e, 0x64, 0x6f, 0x77, 0x5f, 0x73, 0x63, 0x61, 0x6c, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28,
+	0x0b, 0x32, 0x36, 0x2e, 0x69, 0x6f, 0x2e, 0x64, 0x65, 0x65, 0x70, 0x68, 0x61, 0x76, 0x65, 0x6e,
+	0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x62, 0x61, 0x63, 0x6b, 0x70, 0x6c, 0x61, 0x6e, 0x65,
+	0x2e, 0x67, 0x72, 0x70, 0x63, 0x2e, 0x55, 0x70, 0x64, 0x61, 0x74, 0x65, 0x42, 0x79, 0x57, 0x69,
+	0x6e, 0x64, 0x6f, 0x77, 0x53, 0x63, 0x61, 0x6c, 0x65, 0x52, 0x12, 0x66, 0x6f, 0x72, 0x77, 0x61,
+	0x72, 0x64, 0x57, 0x69, 0x6e, 0x64, 0x6f, 0x77, 0x53, 0x63, 0x61, 0x6c, 0x65, 0x1a, 0xec, 0x01,
+	0x0a, 0x16, 0x55, 0x70, 0x64, 0x61, 0x74, 0x65, 0x42, 0x79, 0x52, 0x6f, 0x6c, 0x6c, 0x69, 0x6e,
+	0x67, 0x50, 0x72, 0x6f, 0x64, 0x75, 0x63, 0x74, 0x12, 0x68, 0x0a, 0x14, 0x72, 0x65, 0x76, 0x65,
+	0x72, 0x73, 0x65, 0x5f, 0x77, 0x69, 0x6e, 0x64, 0x6f, 0x77, 0x5f, 0x73, 0x63, 0x61, 0x6c, 0x65,
+	0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x36, 0x2e, 0x69, 0x6f, 0x2e, 0x64, 0x65, 0x65, 0x70,
+	0x68, 0x61, 0x76, 0x65, 0x6e, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x62, 0x61, 0x63, 0x6b,
+	0x70, 0x6c, 0x61, 0x6e, 0x65, 0x2e, 0x67, 0x72, 0x70, 0x63, 0x2e, 0x55, 0x70, 0x64, 0x61, 0x74,
+	0x65, 0x42, 0x79, 0x57, 0x69, 0x6e, 0x64, 0x6f, 0x77, 0x53, 0x63, 0x61, 0x6c, 0x65, 0x52, 0x12,
+	0x72, 0x65, 0x76, 0x65, 0x72, 0x73, 0x65, 0x57, 0x69, 0x6e, 0x64, 0x6f, 0x77, 0x53, 0x63, 0x61,
+	0x6c, 0x65, 0x12, 0x68, 0x0a, 0x14, 0x66, 0x6f, 0x72, 0x77, 0x61, 0x72, 0x64, 0x5f, 0x77, 0x69,
+	0x6e, 0x64, 0x6f, 0x77, 0x5f, 0x73, 0x63, 0x61, 0x6c, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b,
+	0x32, 0x36, 0x2e, 0x69, 0x6f, 0x2e, 0x64, 0x65, 0x65, 0x70, 0x68, 0x61, 0x76, 0x65, 0x6e, 0x2e,
+	0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x62, 0x61, 0x63, 0x6b, 0x70, 0x6c, 0x61, 0x6e, 0x65, 0x2e,
+	0x67, 0x72, 0x70, 0x63, 0x2e, 0x55, 0x70, 0x64, 0x61, 0x74, 0x65, 0x42, 0x79, 0x57, 0x69, 0x6e,
+	0x64, 0x6f, 0x77, 0x53, 0x63, 0x61, 0x6c, 0x65, 0x52, 0x12, 0x66, 0x6f, 0x72, 0x77, 0x61, 0x72,
+	0x64, 0x57, 0x69, 0x6e, 0x64, 0x6f, 0x77, 0x53, 0x63, 0x61, 0x6c, 0x65, 0x1a, 0xea, 0x01, 0x0a,
+	0x14, 0x55, 0x70, 0x64, 0x61, 0x74, 0x65, 0x42, 0x79, 0x52, 0x6f, 0x6c, 0x6c, 0x69, 0x6e, 0x67,
+	0x43, 0x6f, 0x75, 0x6e, 0x74, 0x12, 0x68, 0x0a, 0x14, 0x72, 0x65, 0x76, 0x65, 0x72, 0x73, 0x65,
 	0x5f, 0x77, 0x69, 0x6e, 0x64, 0x6f, 0x77, 0x5f, 0x73, 0x63, 0x61, 0x6c, 0x65, 0x18, 0x01, 0x20,
 	0x01, 0x28, 0x0b, 0x32, 0x36, 0x2e, 0x69, 0x6f, 0x2e, 0x64, 0x65, 0x65, 0x70, 0x68, 0x61, 0x76,
 	0x65, 0x6e, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x62, 0x61, 0x63, 0x6b, 0x70, 0x6c, 0x61,
@@ -10492,38 +10815,23 @@ var file_deephaven_proto_table_proto_rawDesc = []byte{
 	0x74, 0x6f, 0x2e, 0x62, 0x61, 0x63, 0x6b, 0x70, 0x6c, 0x61, 0x6e, 0x65, 0x2e, 0x67, 0x72, 0x70,
 	0x63, 0x2e, 0x55, 0x70, 0x64, 0x61, 0x74, 0x65, 0x42, 0x79, 0x57, 0x69, 0x6e, 0x64, 0x6f, 0x77,
 	0x53, 0x63, 0x61, 0x6c, 0x65, 0x52, 0x12, 0x66, 0x6f, 0x72, 0x77, 0x61, 0x72, 0x64, 0x57, 0x69,
-	0x6e, 0x64, 0x6f, 0x77, 0x53, 0x63, 0x61, 0x6c, 0x65, 0x1a, 0xec, 0x01, 0x0a, 0x16, 0x55, 0x70,
-	0x64, 0x61, 0x74, 0x65, 0x42, 0x79, 0x52, 0x6f, 0x6c, 0x6c, 0x69, 0x6e, 0x67, 0x50, 0x72, 0x6f,
-	0x64, 0x75, 0x63, 0x74, 0x12, 0x68, 0x0a, 0x14, 0x72, 0x65, 0x76, 0x65, 0x72, 0x73, 0x65, 0x5f,
-	0x77, 0x69, 0x6e, 0x64, 0x6f, 0x77, 0x5f, 0x73, 0x63, 0x61, 0x6c, 0x65, 0x18, 0x01, 0x20, 0x01,
-	0x28, 0x0b, 0x32, 0x36, 0x2e, 0x69, 0x6f, 0x2e, 0x64, 0x65, 0x65, 0x70, 0x68, 0x61, 0x76, 0x65,
-	0x6e, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x62, 0x61, 0x63, 0x6b, 0x70, 0x6c, 0x61, 0x6e,
-	0x65, 0x2e, 0x67, 0x72, 0x70, 0x63, 0x2e, 0x55, 0x70, 0x64, 0x61, 0x74, 0x65, 0x42, 0x79, 0x57,
-	0x69, 0x6e, 0x64, 0x6f, 0x77, 0x53, 0x63, 0x61, 0x6c, 0x65, 0x52, 0x12, 0x72, 0x65, 0x76, 0x65,
-	0x72, 0x73, 0x65, 0x57, 0x69, 0x6e, 0x64, 0x6f, 0x77, 0x53, 0x63, 0x61, 0x6c, 0x65, 0x12, 0x68,
-	0x0a, 0x14, 0x66, 0x6f, 0x72, 0x77, 0x61, 0x72, 0x64, 0x5f, 0x77, 0x69, 0x6e, 0x64, 0x6f, 0x77,
-	0x5f, 0x73, 0x63, 0x61, 0x6c, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x36, 0x2e, 0x69,
-	0x6f, 0x2e, 0x64, 0x65, 0x65, 0x70, 0x68, 0x61, 0x76, 0x65, 0x6e, 0x2e, 0x70, 0x72, 0x6f, 0x74,
-	0x6f, 0x2e, 0x62, 0x61, 0x63, 0x6b, 0x70, 0x6c, 0x61, 0x6e, 0x65, 0x2e, 0x67, 0x72, 0x70, 0x63,
-	0x2e, 0x55, 0x70, 0x64, 0x61, 0x74, 0x65, 0x42, 0x79, 0x57, 0x69, 0x6e, 0x64, 0x6f, 0x77, 0x53,
-	0x63, 0x61, 0x6c, 0x65, 0x52, 0x12, 0x66, 0x6f, 0x72, 0x77, 0x61, 0x72, 0x64, 0x57, 0x69, 0x6e,
-	0x64, 0x6f, 0x77, 0x53, 0x63, 0x61, 0x6c, 0x65, 0x1a, 0xea, 0x01, 0x0a, 0x14, 0x55, 0x70, 0x64,
-	0x61, 0x74, 0x65, 0x42, 0x79, 0x52, 0x6f, 0x6c, 0x6c, 0x69, 0x6e, 0x67, 0x43, 0x6f, 0x75, 0x6e,
-	0x74, 0x12, 0x68, 0x0a, 0x14, 0x72, 0x65, 0x76, 0x65, 0x72, 0x73, 0x65, 0x5f, 0x77, 0x69, 0x6e,
-	0x64, 0x6f, 0x77, 0x5f, 0x73, 0x63, 0x61, 0x6c, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32,
-	0x36, 0x2e, 0x69, 0x6f, 0x2e, 0x64, 0x65, 0x65, 0x70, 0x68, 0x61, 0x76, 0x65, 0x6e, 0x2e, 0x70,
-	0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x62, 0x61, 0x63, 0x6b, 0x70, 0x6c, 0x61, 0x6e, 0x65, 0x2e, 0x67,
-	0x72, 0x70, 0x63, 0x2e, 0x55, 0x70, 0x64, 0x61, 0x74, 0x65, 0x42, 0x79, 0x57, 0x69, 0x6e, 0x64,
-	0x6f, 0x77, 0x53, 0x63, 0x61, 0x6c, 0x65, 0x52, 0x12, 0x72, 0x65, 0x76, 0x65, 0x72, 0x73, 0x65,
-	0x57, 0x69, 0x6e, 0x64, 0x6f, 0x77, 0x53, 0x63, 0x61, 0x6c, 0x65, 0x12, 0x68, 0x0a, 0x14, 0x66,
-	0x6f, 0x72, 0x77, 0x61, 0x72, 0x64, 0x5f, 0x77, 0x69, 0x6e, 0x64, 0x6f, 0x77, 0x5f, 0x73, 0x63,
-	0x61, 0x6c, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x36, 0x2e, 0x69, 0x6f, 0x2e, 0x64,
-	0x65, 0x65, 0x70, 0x68, 0x61, 0x76, 0x65, 0x6e, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x62,
-	0x61, 0x63, 0x6b, 0x70, 0x6c, 0x61, 0x6e, 0x65, 0x2e, 0x67, 0x72, 0x70, 0x63, 0x2e, 0x55, 0x70,
-	0x64, 0x61, 0x74, 0x65, 0x42, 0x79, 0x57, 0x69, 0x6e, 0x64, 0x6f, 0x77, 0x53, 0x63, 0x61, 0x6c,
-	0x65, 0x52, 0x12, 0x66, 0x6f, 0x72, 0x77, 0x61, 0x72, 0x64, 0x57, 0x69, 0x6e, 0x64, 0x6f, 0x77,
-	0x53, 0x63, 0x61, 0x6c, 0x65, 0x1a, 0xe8, 0x01, 0x0a, 0x12, 0x55, 0x70, 0x64, 0x61, 0x74, 0x65,
-	0x42, 0x79, 0x52, 0x6f, 0x6c, 0x6c, 0x69, 0x6e, 0x67, 0x53, 0x74, 0x64, 0x12, 0x68, 0x0a, 0x14,
+	0x6e, 0x64, 0x6f, 0x77, 0x53, 0x63, 0x61, 0x6c, 0x65, 0x1a, 0xe8, 0x01, 0x0a, 0x12, 0x55, 0x70,
+	0x64, 0x61, 0x74, 0x65, 0x42, 0x79, 0x52, 0x6f, 0x6c, 0x6c, 0x69, 0x6e, 0x67, 0x53, 0x74, 0x64,
+	0x12, 0x68, 0x0a, 0x14, 0x72, 0x65, 0x76, 0x65, 0x72, 0x73, 0x65, 0x5f, 0x77, 0x69, 0x6e, 0x64,
+	0x6f, 0x77, 0x5f, 0x73, 0x63, 0x61, 0x6c, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x36,
+	0x2e, 0x69, 0x6f, 0x2e, 0x64, 0x65, 0x65, 0x70, 0x68, 0x61, 0x76, 0x65, 0x6e, 0x2e, 0x70, 0x72,
+	0x6f, 0x74, 0x6f, 0x2e, 0x62, 0x61, 0x63, 0x6b, 0x70, 0x6c, 0x61, 0x6e, 0x65, 0x2e, 0x67, 0x72,
+	0x70, 0x63, 0x2e, 0x55, 0x70, 0x64, 0x61, 0x74, 0x65, 0x42, 0x79, 0x57, 0x69, 0x6e, 0x64, 0x6f,
+	0x77, 0x53, 0x63, 0x61, 0x6c, 0x65, 0x52, 0x12, 0x72, 0x65, 0x76, 0x65, 0x72, 0x73, 0x65, 0x57,
+	0x69, 0x6e, 0x64, 0x6f, 0x77, 0x53, 0x63, 0x61, 0x6c, 0x65, 0x12, 0x68, 0x0a, 0x14, 0x66, 0x6f,
+	0x72, 0x77, 0x61, 0x72, 0x64, 0x5f, 0x77, 0x69, 0x6e, 0x64, 0x6f, 0x77, 0x5f, 0x73, 0x63, 0x61,
+	0x6c, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x36, 0x2e, 0x69, 0x6f, 0x2e, 0x64, 0x65,
+	0x65, 0x70, 0x68, 0x61, 0x76, 0x65, 0x6e, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x62, 0x61,
+	0x63, 0x6b, 0x70, 0x6c, 0x61, 0x6e, 0x65, 0x2e, 0x67, 0x72, 0x70, 0x63, 0x2e, 0x55, 0x70, 0x64,
+	0x61, 0x74, 0x65, 0x42, 0x79, 0x57, 0x69, 0x6e, 0x64, 0x6f, 0x77, 0x53, 0x63, 0x61, 0x6c, 0x65,
+	0x52, 0x12, 0x66, 0x6f, 0x72, 0x77, 0x61, 0x72, 0x64, 0x57, 0x69, 0x6e, 0x64, 0x6f, 0x77, 0x53,
+	0x63, 0x61, 0x6c, 0x65, 0x1a, 0x8e, 0x02, 0x0a, 0x13, 0x55, 0x70, 0x64, 0x61, 0x74, 0x65, 0x42,
+	0x79, 0x52, 0x6f, 0x6c, 0x6c, 0x69, 0x6e, 0x67, 0x57, 0x41, 0x76, 0x67, 0x12, 0x68, 0x0a, 0x14,
 	0x72, 0x65, 0x76, 0x65, 0x72, 0x73, 0x65, 0x5f, 0x77, 0x69, 0x6e, 0x64, 0x6f, 0x77, 0x5f, 0x73,
 	0x63, 0x61, 0x6c, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x36, 0x2e, 0x69, 0x6f, 0x2e,
 	0x64, 0x65, 0x65, 0x70, 0x68, 0x61, 0x76, 0x65, 0x6e, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e,
@@ -10537,84 +10845,98 @@ var file_deephaven_proto_table_proto_rawDesc = []byte{
 	0x61, 0x6e, 0x65, 0x2e, 0x67, 0x72, 0x70, 0x63, 0x2e, 0x55, 0x70, 0x64, 0x61, 0x74, 0x65, 0x42,
 	0x79, 0x57, 0x69, 0x6e, 0x64, 0x6f, 0x77, 0x53, 0x63, 0x61, 0x6c, 0x65, 0x52, 0x12, 0x66, 0x6f,
 	0x72, 0x77, 0x61, 0x72, 0x64, 0x57, 0x69, 0x6e, 0x64, 0x6f, 0x77, 0x53, 0x63, 0x61, 0x6c, 0x65,
-	0x1a, 0x8e, 0x02, 0x0a, 0x13, 0x55, 0x70, 0x64, 0x61, 0x74, 0x65, 0x42, 0x79, 0x52, 0x6f, 0x6c,
-	0x6c, 0x69, 0x6e, 0x67, 0x57, 0x41, 0x76, 0x67, 0x12, 0x68, 0x0a, 0x14, 0x72, 0x65, 0x76, 0x65,
-	0x72, 0x73, 0x65, 0x5f, 0x77, 0x69, 0x6e, 0x64, 0x6f, 0x77, 0x5f, 0x73, 0x63, 0x61, 0x6c, 0x65,
-	0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x36, 0x2e, 0x69, 0x6f, 0x2e, 0x64, 0x65, 0x65, 0x70,
+	0x12, 0x23, 0x0a, 0x0d, 0x77, 0x65, 0x69, 0x67, 0x68, 0x74, 0x5f, 0x63, 0x6f, 0x6c, 0x75, 0x6d,
+	0x6e, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0c, 0x77, 0x65, 0x69, 0x67, 0x68, 0x74, 0x43,
+	0x6f, 0x6c, 0x75, 0x6d, 0x6e, 0x1a, 0xa7, 0x02, 0x0a, 0x16, 0x55, 0x70, 0x64, 0x61, 0x74, 0x65,
+	0x42, 0x79, 0x52, 0x6f, 0x6c, 0x6c, 0x69, 0x6e, 0x67, 0x46, 0x6f, 0x72, 0x6d, 0x75, 0x6c, 0x61,
+	0x12, 0x68, 0x0a, 0x14, 0x72, 0x65, 0x76, 0x65, 0x72, 0x73, 0x65, 0x5f, 0x77, 0x69, 0x6e, 0x64,
+	0x6f, 0x77, 0x5f, 0x73, 0x63, 0x61, 0x6c, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x36,
+	0x2e, 0x69, 0x6f, 0x2e, 0x64, 0x65, 0x65, 0x70, 0x68, 0x61, 0x76, 0x65, 0x6e, 0x2e, 0x70, 0x72,
+	0x6f, 0x74, 0x6f, 0x2e, 0x62, 0x61, 0x63, 0x6b, 0x70, 0x6c, 0x61, 0x6e, 0x65, 0x2e, 0x67, 0x72,
+	0x70, 0x63, 0x2e, 0x55, 0x70, 0x64, 0x61, 0x74, 0x65, 0x42, 0x79, 0x57, 0x69, 0x6e, 0x64, 0x6f,
+	0x77, 0x53, 0x63, 0x61, 0x6c, 0x65, 0x52, 0x12, 0x72, 0x65, 0x76, 0x65, 0x72, 0x73, 0x65, 0x57,
+	0x69, 0x6e, 0x64, 0x6f, 0x77, 0x53, 0x63, 0x61, 0x6c, 0x65, 0x12, 0x68, 0x0a, 0x14, 0x66, 0x6f,
+	0x72, 0x77, 0x61, 0x72, 0x64, 0x5f, 0x77, 0x69, 0x6e, 0x64, 0x6f, 0x77, 0x5f, 0x73, 0x63, 0x61,
+	0x6c, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x36, 0x2e, 0x69, 0x6f, 0x2e, 0x64, 0x65,
+	0x65, 0x70, 0x68, 0x61, 0x76, 0x65, 0x6e, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x62, 0x61,
+	0x63, 0x6b, 0x70, 0x6c, 0x61, 0x6e, 0x65, 0x2e, 0x67, 0x72, 0x70, 0x63, 0x2e, 0x55, 0x70, 0x64,
+	0x61, 0x74, 0x65, 0x42, 0x79, 0x57, 0x69, 0x6e, 0x64, 0x6f, 0x77, 0x53, 0x63, 0x61, 0x6c, 0x65,
+	0x52, 0x12, 0x66, 0x6f, 0x72, 0x77, 0x61, 0x72, 0x64, 0x57, 0x69, 0x6e, 0x64, 0x6f, 0x77, 0x53,
+	0x63, 0x61, 0x6c, 0x65, 0x12, 0x18, 0x0a, 0x07, 0x66, 0x6f, 0x72, 0x6d, 0x75, 0x6c, 0x61, 0x18,
+	0x03, 0x20, 0x01, 0x28, 0x09, 0x52, 0x07, 0x66, 0x6f, 0x72, 0x6d, 0x75, 0x6c, 0x61, 0x12, 0x1f,
+	0x0a, 0x0b, 0x70, 0x61, 0x72, 0x61, 0x6d, 0x5f, 0x74, 0x6f, 0x6b, 0x65, 0x6e, 0x18, 0x04, 0x20,
+	0x01, 0x28, 0x09, 0x52, 0x0a, 0x70, 0x61, 0x72, 0x61, 0x6d, 0x54, 0x6f, 0x6b, 0x65, 0x6e, 0x42,
+	0x06, 0x0a, 0x04, 0x74, 0x79, 0x70, 0x65, 0x42, 0x06, 0x0a, 0x04, 0x74, 0x79, 0x70, 0x65, 0x22,
+	0xd2, 0x01, 0x0a, 0x15, 0x53, 0x65, 0x6c, 0x65, 0x63, 0x74, 0x44, 0x69, 0x73, 0x74, 0x69, 0x6e,
+	0x63, 0x74, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x46, 0x0a, 0x09, 0x72, 0x65, 0x73,
+	0x75, 0x6c, 0x74, 0x5f, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x29, 0x2e, 0x69,
+	0x6f, 0x2e, 0x64, 0x65, 0x65, 0x70, 0x68, 0x61, 0x76, 0x65, 0x6e, 0x2e, 0x70, 0x72, 0x6f, 0x74,
+	0x6f, 0x2e, 0x62, 0x61, 0x63, 0x6b, 0x70, 0x6c, 0x61, 0x6e, 0x65, 0x2e, 0x67, 0x72, 0x70, 0x63,
+	0x2e, 0x54, 0x69, 0x63, 0x6b, 0x65, 0x74, 0x52, 0x08, 0x72, 0x65, 0x73, 0x75, 0x6c, 0x74, 0x49,
+	0x64, 0x12, 0x4e, 0x0a, 0x09, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x5f, 0x69, 0x64, 0x18, 0x02,
+	0x20, 0x01, 0x28, 0x0b, 0x32, 0x31, 0x2e, 0x69, 0x6f, 0x2e, 0x64, 0x65, 0x65, 0x70, 0x68, 0x61,
+	0x76, 0x65, 0x6e, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x62, 0x61, 0x63, 0x6b, 0x70, 0x6c,
+	0x61, 0x6e, 0x65, 0x2e, 0x67, 0x72, 0x70, 0x63, 0x2e, 0x54, 0x61, 0x62, 0x6c, 0x65, 0x52, 0x65,
+	0x66, 0x65, 0x72, 0x65, 0x6e, 0x63, 0x65, 0x52, 0x08, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x49,
+	0x64, 0x12, 0x21, 0x0a, 0x0c, 0x63, 0x6f, 0x6c, 0x75, 0x6d, 0x6e, 0x5f, 0x6e, 0x61, 0x6d, 0x65,
+	0x73, 0x18, 0x03, 0x20, 0x03, 0x28, 0x09, 0x52, 0x0b, 0x63, 0x6f, 0x6c, 0x75, 0x6d, 0x6e, 0x4e,
+	0x61, 0x6d, 0x65, 0x73, 0x22, 0xcf, 0x01, 0x0a, 0x12, 0x44, 0x72, 0x6f, 0x70, 0x43, 0x6f, 0x6c,
+	0x75, 0x6d, 0x6e, 0x73, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x46, 0x0a, 0x09, 0x72,
+	0x65, 0x73, 0x75, 0x6c, 0x74, 0x5f, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x29,
+	0x2e, 0x69, 0x6f, 0x2e, 0x64, 0x65, 0x65, 0x70, 0x68, 0x61, 0x76, 0x65, 0x6e, 0x2e, 0x70, 0x72,
+	0x6f, 0x74, 0x6f, 0x2e, 0x62, 0x61, 0x63, 0x6b, 0x70, 0x6c, 0x61, 0x6e, 0x65, 0x2e, 0x67, 0x72,
+	0x70, 0x63, 0x2e, 0x54, 0x69, 0x63, 0x6b, 0x65, 0x74, 0x52, 0x08, 0x72, 0x65, 0x73, 0x75, 0x6c,
+	0x74, 0x49, 0x64, 0x12, 0x4e, 0x0a, 0x09, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x5f, 0x69, 0x64,
+	0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x31, 0x2e, 0x69, 0x6f, 0x2e, 0x64, 0x65, 0x65, 0x70,
 	0x68, 0x61, 0x76, 0x65, 0x6e, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x62, 0x61, 0x63, 0x6b,
-	0x70, 0x6c, 0x61, 0x6e, 0x65, 0x2e, 0x67, 0x72, 0x70, 0x63, 0x2e, 0x55, 0x70, 0x64, 0x61, 0x74,
-	0x65, 0x42, 0x79, 0x57, 0x69, 0x6e, 0x64, 0x6f, 0x77, 0x53, 0x63, 0x61, 0x6c, 0x65, 0x52, 0x12,
-	0x72, 0x65, 0x76, 0x65, 0x72, 0x73, 0x65, 0x57, 0x69, 0x6e, 0x64, 0x6f, 0x77, 0x53, 0x63, 0x61,
-	0x6c, 0x65, 0x12, 0x68, 0x0a, 0x14, 0x66, 0x6f, 0x72, 0x77, 0x61, 0x72, 0x64, 0x5f, 0x77, 0x69,
-	0x6e, 0x64, 0x6f, 0x77, 0x5f, 0x73, 0x63, 0x61, 0x6c, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b,
-	0x32, 0x36, 0x2e, 0x69, 0x6f, 0x2e, 0x64, 0x65, 0x65, 0x70, 0x68, 0x61, 0x76, 0x65, 0x6e, 0x2e,
-	0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x62, 0x61, 0x63, 0x6b, 0x70, 0x6c, 0x61, 0x6e, 0x65, 0x2e,
-	0x67, 0x72, 0x70, 0x63, 0x2e, 0x55, 0x70, 0x64, 0x61, 0x74, 0x65, 0x42, 0x79, 0x57, 0x69, 0x6e,
-	0x64, 0x6f, 0x77, 0x53, 0x63, 0x61, 0x6c, 0x65, 0x52, 0x12, 0x66, 0x6f, 0x72, 0x77, 0x61, 0x72,
-	0x64, 0x57, 0x69, 0x6e, 0x64, 0x6f, 0x77, 0x53, 0x63, 0x61, 0x6c, 0x65, 0x12, 0x23, 0x0a, 0x0d,
-	0x77, 0x65, 0x69, 0x67, 0x68, 0x74, 0x5f, 0x63, 0x6f, 0x6c, 0x75, 0x6d, 0x6e, 0x18, 0x03, 0x20,
-	0x01, 0x28, 0x09, 0x52, 0x0c, 0x77, 0x65, 0x69, 0x67, 0x68, 0x74, 0x43, 0x6f, 0x6c, 0x75, 0x6d,
-	0x6e, 0x1a, 0xa7, 0x02, 0x0a, 0x16, 0x55, 0x70, 0x64, 0x61, 0x74, 0x65, 0x42, 0x79, 0x52, 0x6f,
-	0x6c, 0x6c, 0x69, 0x6e, 0x67, 0x46, 0x6f, 0x72, 0x6d, 0x75, 0x6c, 0x61, 0x12, 0x68, 0x0a, 0x14,
-	0x72, 0x65, 0x76, 0x65, 0x72, 0x73, 0x65, 0x5f, 0x77, 0x69, 0x6e, 0x64, 0x6f, 0x77, 0x5f, 0x73,
-	0x63, 0x61, 0x6c, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x36, 0x2e, 0x69, 0x6f, 0x2e,
-	0x64, 0x65, 0x65, 0x70, 0x68, 0x61, 0x76, 0x65, 0x6e, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e,
-	0x62, 0x61, 0x63, 0x6b, 0x70, 0x6c, 0x61, 0x6e, 0x65, 0x2e, 0x67, 0x72, 0x70, 0x63, 0x2e, 0x55,
-	0x70, 0x64, 0x61, 0x74, 0x65, 0x42, 0x79, 0x57, 0x69, 0x6e, 0x64, 0x6f, 0x77, 0x53, 0x63, 0x61,
-	0x6c, 0x65, 0x52, 0x12, 0x72, 0x65, 0x76, 0x65, 0x72, 0x73, 0x65, 0x57, 0x69, 0x6e, 0x64, 0x6f,
-	0x77, 0x53, 0x63, 0x61, 0x6c, 0x65, 0x12, 0x68, 0x0a, 0x14, 0x66, 0x6f, 0x72, 0x77, 0x61, 0x72,
-	0x64, 0x5f, 0x77, 0x69, 0x6e, 0x64, 0x6f, 0x77, 0x5f, 0x73, 0x63, 0x61, 0x6c, 0x65, 0x18, 0x02,
-	0x20, 0x01, 0x28, 0x0b, 0x32, 0x36, 0x2e, 0x69, 0x6f, 0x2e, 0x64, 0x65, 0x65, 0x70, 0x68, 0x61,
+	0x70, 0x6c, 0x61, 0x6e, 0x65, 0x2e, 0x67, 0x72, 0x70, 0x63, 0x2e, 0x54, 0x61, 0x62, 0x6c, 0x65,
+	0x52, 0x65, 0x66, 0x65, 0x72, 0x65, 0x6e, 0x63, 0x65, 0x52, 0x08, 0x73, 0x6f, 0x75, 0x72, 0x63,
+	0x65, 0x49, 0x64, 0x12, 0x21, 0x0a, 0x0c, 0x63, 0x6f, 0x6c, 0x75, 0x6d, 0x6e, 0x5f, 0x6e, 0x61,
+	0x6d, 0x65, 0x73, 0x18, 0x03, 0x20, 0x03, 0x28, 0x09, 0x52, 0x0b, 0x63, 0x6f, 0x6c, 0x75, 0x6d,
+	0x6e, 0x4e, 0x61, 0x6d, 0x65, 0x73, 0x22, 0xd2, 0x01, 0x0a, 0x1e, 0x55, 0x6e, 0x73, 0x74, 0x72,
+	0x75, 0x63, 0x74, 0x75, 0x72, 0x65, 0x64, 0x46, 0x69, 0x6c, 0x74, 0x65, 0x72, 0x54, 0x61, 0x62,
+	0x6c, 0x65, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x46, 0x0a, 0x09, 0x72, 0x65, 0x73,
+	0x75, 0x6c, 0x74, 0x5f, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x29, 0x2e, 0x69,
+	0x6f, 0x2e, 0x64, 0x65, 0x65, 0x70, 0x68, 0x61, 0x76, 0x65, 0x6e, 0x2e, 0x70, 0x72, 0x6f, 0x74,
+	0x6f, 0x2e, 0x62, 0x61, 0x63, 0x6b, 0x70, 0x6c, 0x61, 0x6e, 0x65, 0x2e, 0x67, 0x72, 0x70, 0x63,
+	0x2e, 0x54, 0x69, 0x63, 0x6b, 0x65, 0x74, 0x52, 0x08, 0x72, 0x65, 0x73, 0x75, 0x6c, 0x74, 0x49,
+	0x64, 0x12, 0x4e, 0x0a, 0x09, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x5f, 0x69, 0x64, 0x18, 0x02,
+	0x20, 0x01, 0x28, 0x0b, 0x32, 0x31, 0x2e, 0x69, 0x6f, 0x2e, 0x64, 0x65, 0x65, 0x70, 0x68, 0x61,
 	0x76, 0x65, 0x6e, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x62, 0x61, 0x63, 0x6b, 0x70, 0x6c,
-	0x61, 0x6e, 0x65, 0x2e, 0x67, 0x72, 0x70, 0x63, 0x2e, 0x55, 0x70, 0x64, 0x61, 0x74, 0x65, 0x42,
-	0x79, 0x57, 0x69, 0x6e, 0x64, 0x6f, 0x77, 0x53, 0x63, 0x61, 0x6c, 0x65, 0x52, 0x12, 0x66, 0x6f,
-	0x72, 0x77, 0x61, 0x72, 0x64, 0x57, 0x69, 0x6e, 0x64, 0x6f, 0x77, 0x53, 0x63, 0x61, 0x6c, 0x65,
-	0x12, 0x18, 0x0a, 0x07, 0x66, 0x6f, 0x72, 0x6d, 0x75, 0x6c, 0x61, 0x18, 0x03, 0x20, 0x01, 0x28,
-	0x09, 0x52, 0x07, 0x66, 0x6f, 0x72, 0x6d, 0x75, 0x6c, 0x61, 0x12, 0x1f, 0x0a, 0x0b, 0x70, 0x61,
-	0x72, 0x61, 0x6d, 0x5f, 0x74, 0x6f, 0x6b, 0x65, 0x6e, 0x18, 0x04, 0x20, 0x01, 0x28, 0x09, 0x52,
-	0x0a, 0x70, 0x61, 0x72, 0x61, 0x6d, 0x54, 0x6f, 0x6b, 0x65, 0x6e, 0x42, 0x06, 0x0a, 0x04, 0x74,
-	0x79, 0x70, 0x65, 0x42, 0x06, 0x0a, 0x04, 0x74, 0x79, 0x70, 0x65, 0x22, 0xd2, 0x01, 0x0a, 0x15,
-	0x53, 0x65, 0x6c, 0x65, 0x63, 0x74, 0x44, 0x69, 0x73, 0x74, 0x69, 0x6e, 0x63, 0x74, 0x52, 0x65,
-	0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x46, 0x0a, 0x09, 0x72, 0x65, 0x73, 0x75, 0x6c, 0x74, 0x5f,
-	0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x29, 0x2e, 0x69, 0x6f, 0x2e, 0x64, 0x65,
-	0x65, 0x70, 0x68, 0x61, 0x76, 0x65, 0x6e, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x62, 0x61,
-	0x63, 0x6b, 0x70, 0x6c, 0x61, 0x6e, 0x65, 0x2e, 0x67, 0x72, 0x70, 0x63, 0x2e, 0x54, 0x69, 0x63,
-	0x6b, 0x65, 0x74, 0x52, 0x08, 0x72, 0x65, 0x73, 0x75, 0x6c, 0x74, 0x49, 0x64, 0x12, 0x4e, 0x0a,
-	0x09, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x5f, 0x69, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b,
-	0x32, 0x31, 0x2e, 0x69, 0x6f, 0x2e, 0x64, 0x65, 0x65, 0x70, 0x68, 0x61, 0x76, 0x65, 0x6e, 0x2e,
-	0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x62, 0x61, 0x63, 0x6b, 0x70, 0x6c, 0x61, 0x6e, 0x65, 0x2e,
-	0x67, 0x72, 0x70, 0x63, 0x2e, 0x54, 0x61, 0x62, 0x6c, 0x65, 0x52, 0x65, 0x66, 0x65, 0x72, 0x65,
-	0x6e, 0x63, 0x65, 0x52, 0x08, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x49, 0x64, 0x12, 0x21, 0x0a,
-	0x0c, 0x63, 0x6f, 0x6c, 0x75, 0x6d, 0x6e, 0x5f, 0x6e, 0x61, 0x6d, 0x65, 0x73, 0x18, 0x03, 0x20,
-	0x03, 0x28, 0x09, 0x52, 0x0b, 0x63, 0x6f, 0x6c, 0x75, 0x6d, 0x6e, 0x4e, 0x61, 0x6d, 0x65, 0x73,
-	0x22, 0xcf, 0x01, 0x0a, 0x12, 0x44, 0x72, 0x6f, 0x70, 0x43, 0x6f, 0x6c, 0x75, 0x6d, 0x6e, 0x73,
-	0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x46, 0x0a, 0x09, 0x72, 0x65, 0x73, 0x75, 0x6c,
-	0x74, 0x5f, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x29, 0x2e, 0x69, 0x6f, 0x2e,
-	0x64, 0x65, 0x65, 0x70, 0x68, 0x61, 0x76, 0x65, 0x6e, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e,
-	0x62, 0x61, 0x63, 0x6b, 0x70, 0x6c, 0x61, 0x6e, 0x65, 0x2e, 0x67, 0x72, 0x70, 0x63, 0x2e, 0x54,
-	0x69, 0x63, 0x6b, 0x65, 0x74, 0x52, 0x08, 0x72, 0x65, 0x73, 0x75, 0x6c, 0x74, 0x49, 0x64, 0x12,
-	0x4e, 0x0a, 0x09, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x5f, 0x69, 0x64, 0x18, 0x02, 0x20, 0x01,
-	0x28, 0x0b, 0x32, 0x31, 0x2e, 0x69, 0x6f, 0x2e, 0x64, 0x65, 0x65, 0x70, 0x68, 0x61, 0x76, 0x65,
-	0x6e, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x62, 0x61, 0x63, 0x6b, 0x70, 0x6c, 0x61, 0x6e,
-	0x65, 0x2e, 0x67, 0x72, 0x70, 0x63, 0x2e, 0x54, 0x61, 0x62, 0x6c, 0x65, 0x52, 0x65, 0x66, 0x65,
-	0x72, 0x65, 0x6e, 0x63, 0x65, 0x52, 0x08, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x49, 0x64, 0x12,
-	0x21, 0x0a, 0x0c, 0x63, 0x6f, 0x6c, 0x75, 0x6d, 0x6e, 0x5f, 0x6e, 0x61, 0x6d, 0x65, 0x73, 0x18,
-	0x03, 0x20, 0x03, 0x28, 0x09, 0x52, 0x0b, 0x63, 0x6f, 0x6c, 0x75, 0x6d, 0x6e, 0x4e, 0x61, 0x6d,
-	0x65, 0x73, 0x22, 0xd2, 0x01, 0x0a, 0x1e, 0x55, 0x6e, 0x73, 0x74, 0x72, 0x75, 0x63, 0x74, 0x75,
-	0x72, 0x65, 0x64, 0x46, 0x69, 0x6c, 0x74, 0x65, 0x72, 0x54, 0x61, 0x62, 0x6c, 0x65, 0x52, 0x65,
-	0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x46, 0x0a, 0x09, 0x72, 0x65, 0x73, 0x75, 0x6c, 0x74, 0x5f,
-	0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x29, 0x2e, 0x69, 0x6f, 0x2e, 0x64, 0x65,
-	0x65, 0x70, 0x68, 0x61, 0x76, 0x65, 0x6e, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x62, 0x61,
-	0x63, 0x6b, 0x70, 0x6c, 0x61, 0x6e, 0x65, 0x2e, 0x67, 0x72, 0x70, 0x63, 0x2e, 0x54, 0x69, 0x63,
-	0x6b, 0x65, 0x74, 0x52, 0x08, 0x72, 0x65, 0x73, 0x75, 0x6c, 0x74, 0x49, 0x64, 0x12, 0x4e, 0x0a,
-	0x09, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x5f, 0x69, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b,
-	0x32, 0x31, 0x2e, 0x69, 0x6f, 0x2e, 0x64, 0x65, 0x65, 0x70, 0x68, 0x61, 0x76, 0x65, 0x6e, 0x2e,
-	0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x62, 0x61, 0x63, 0x6b, 0x70, 0x6c, 0x61, 0x6e, 0x65, 0x2e,
-	0x67, 0x72, 0x70, 0x63, 0x2e, 0x54, 0x61, 0x62, 0x6c, 0x65, 0x52, 0x65, 0x66, 0x65, 0x72, 0x65,
-	0x6e, 0x63, 0x65, 0x52, 0x08, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x49, 0x64, 0x12, 0x18, 0x0a,
-	0x07, 0x66, 0x69, 0x6c, 0x74, 0x65, 0x72, 0x73, 0x18, 0x03, 0x20, 0x03, 0x28, 0x09, 0x52, 0x07,
-	0x66, 0x69, 0x6c, 0x74, 0x65, 0x72, 0x73, 0x22, 0xca, 0x01, 0x0a, 0x11, 0x48, 0x65, 0x61, 0x64,
-	0x4f, 0x72, 0x54, 0x61, 0x69, 0x6c, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x46, 0x0a,
+	0x61, 0x6e, 0x65, 0x2e, 0x67, 0x72, 0x70, 0x63, 0x2e, 0x54, 0x61, 0x62, 0x6c, 0x65, 0x52, 0x65,
+	0x66, 0x65, 0x72, 0x65, 0x6e, 0x63, 0x65, 0x52, 0x08, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x49,
+	0x64, 0x12, 0x18, 0x0a, 0x07, 0x66, 0x69, 0x6c, 0x74, 0x65, 0x72, 0x73, 0x18, 0x03, 0x20, 0x03,
+	0x28, 0x09, 0x52, 0x07, 0x66, 0x69, 0x6c, 0x74, 0x65, 0x72, 0x73, 0x22, 0xca, 0x01, 0x0a, 0x11,
+	0x48, 0x65, 0x61, 0x64, 0x4f, 0x72, 0x54, 0x61, 0x69, 0x6c, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73,
+	0x74, 0x12, 0x46, 0x0a, 0x09, 0x72, 0x65, 0x73, 0x75, 0x6c, 0x74, 0x5f, 0x69, 0x64, 0x18, 0x01,
+	0x20, 0x01, 0x28, 0x0b, 0x32, 0x29, 0x2e, 0x69, 0x6f, 0x2e, 0x64, 0x65, 0x65, 0x70, 0x68, 0x61,
+	0x76, 0x65, 0x6e, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x62, 0x61, 0x63, 0x6b, 0x70, 0x6c,
+	0x61, 0x6e, 0x65, 0x2e, 0x67, 0x72, 0x70, 0x63, 0x2e, 0x54, 0x69, 0x63, 0x6b, 0x65, 0x74, 0x52,
+	0x08, 0x72, 0x65, 0x73, 0x75, 0x6c, 0x74, 0x49, 0x64, 0x12, 0x4e, 0x0a, 0x09, 0x73, 0x6f, 0x75,
+	0x72, 0x63, 0x65, 0x5f, 0x69, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x31, 0x2e, 0x69,
+	0x6f, 0x2e, 0x64, 0x65, 0x65, 0x70, 0x68, 0x61, 0x76, 0x65, 0x6e, 0x2e, 0x70, 0x72, 0x6f, 0x74,
+	0x6f, 0x2e, 0x62, 0x61, 0x63, 0x6b, 0x70, 0x6c, 0x61, 0x6e, 0x65, 0x2e, 0x67, 0x72, 0x70, 0x63,
+	0x2e, 0x54, 0x61, 0x62, 0x6c, 0x65, 0x52, 0x65, 0x66, 0x65, 0x72, 0x65, 0x6e, 0x63, 0x65, 0x52,
+	0x08, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x49, 0x64, 0x12, 0x1d, 0x0a, 0x08, 0x6e, 0x75, 0x6d,
+	0x5f, 0x72, 0x6f, 0x77, 0x73, 0x18, 0x03, 0x20, 0x01, 0x28, 0x12, 0x42, 0x02, 0x30, 0x01, 0x52,
+	0x07, 0x6e, 0x75, 0x6d, 0x52, 0x6f, 0x77, 0x73, 0x22, 0xff, 0x01, 0x0a, 0x13, 0x48, 0x65, 0x61,
+	0x64, 0x4f, 0x72, 0x54, 0x61, 0x69, 0x6c, 0x42, 0x79, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74,
+	0x12, 0x46, 0x0a, 0x09, 0x72, 0x65, 0x73, 0x75, 0x6c, 0x74, 0x5f, 0x69, 0x64, 0x18, 0x01, 0x20,
+	0x01, 0x28, 0x0b, 0x32, 0x29, 0x2e, 0x69, 0x6f, 0x2e, 0x64, 0x65, 0x65, 0x70, 0x68, 0x61, 0x76,
+	0x65, 0x6e, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x62, 0x61, 0x63, 0x6b, 0x70, 0x6c, 0x61,
+	0x6e, 0x65, 0x2e, 0x67, 0x72, 0x70, 0x63, 0x2e, 0x54, 0x69, 0x63, 0x6b, 0x65, 0x74, 0x52, 0x08,
+	0x72, 0x65, 0x73, 0x75, 0x6c, 0x74, 0x49, 0x64, 0x12, 0x4e, 0x0a, 0x09, 0x73, 0x6f, 0x75, 0x72,
+	0x63, 0x65, 0x5f, 0x69, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x31, 0x2e, 0x69, 0x6f,
+	0x2e, 0x64, 0x65, 0x65, 0x70, 0x68, 0x61, 0x76, 0x65, 0x6e, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f,
+	0x2e, 0x62, 0x61, 0x63, 0x6b, 0x70, 0x6c, 0x61, 0x6e, 0x65, 0x2e, 0x67, 0x72, 0x70, 0x63, 0x2e,
+	0x54, 0x61, 0x62, 0x6c, 0x65, 0x52, 0x65, 0x66, 0x65, 0x72, 0x65, 0x6e, 0x63, 0x65, 0x52, 0x08,
+	0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x49, 0x64, 0x12, 0x1d, 0x0a, 0x08, 0x6e, 0x75, 0x6d, 0x5f,
+	0x72, 0x6f, 0x77, 0x73, 0x18, 0x03, 0x20, 0x01, 0x28, 0x12, 0x42, 0x02, 0x30, 0x01, 0x52, 0x07,
+	0x6e, 0x75, 0x6d, 0x52, 0x6f, 0x77, 0x73, 0x12, 0x31, 0x0a, 0x15, 0x67, 0x72, 0x6f, 0x75, 0x70,
+	0x5f, 0x62, 0x79, 0x5f, 0x63, 0x6f, 0x6c, 0x75, 0x6d, 0x6e, 0x5f, 0x73, 0x70, 0x65, 0x63, 0x73,
+	0x18, 0x04, 0x20, 0x03, 0x28, 0x09, 0x52, 0x12, 0x67, 0x72, 0x6f, 0x75, 0x70, 0x42, 0x79, 0x43,
+	0x6f, 0x6c, 0x75, 0x6d, 0x6e, 0x53, 0x70, 0x65, 0x63, 0x73, 0x22, 0xf3, 0x01, 0x0a, 0x0e, 0x55,
+	0x6e, 0x67, 0x72, 0x6f, 0x75, 0x70, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x46, 0x0a,
 	0x09, 0x72, 0x65, 0x73, 0x75, 0x6c, 0x74, 0x5f, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b,
 	0x32, 0x29, 0x2e, 0x69, 0x6f, 0x2e, 0x64, 0x65, 0x65, 0x70, 0x68, 0x61, 0x76, 0x65, 0x6e, 0x2e,
 	0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x62, 0x61, 0x63, 0x6b, 0x70, 0x6c, 0x61, 0x6e, 0x65, 0x2e,
@@ -10624,26 +10946,26 @@ var file_deephaven_proto_table_proto_rawDesc = []byte{
 	0x65, 0x70, 0x68, 0x61, 0x76, 0x65, 0x6e, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x62, 0x61,
 	0x63, 0x6b, 0x70, 0x6c, 0x61, 0x6e, 0x65, 0x2e, 0x67, 0x72, 0x70, 0x63, 0x2e, 0x54, 0x61, 0x62,
 	0x6c, 0x65, 0x52, 0x65, 0x66, 0x65, 0x72, 0x65, 0x6e, 0x63, 0x65, 0x52, 0x08, 0x73, 0x6f, 0x75,
-	0x72, 0x63, 0x65, 0x49, 0x64, 0x12, 0x1d, 0x0a, 0x08, 0x6e, 0x75, 0x6d, 0x5f, 0x72, 0x6f, 0x77,
-	0x73, 0x18, 0x03, 0x20, 0x01, 0x28, 0x12, 0x42, 0x02, 0x30, 0x01, 0x52, 0x07, 0x6e, 0x75, 0x6d,
-	0x52, 0x6f, 0x77, 0x73, 0x22, 0xff, 0x01, 0x0a, 0x13, 0x48, 0x65, 0x61, 0x64, 0x4f, 0x72, 0x54,
-	0x61, 0x69, 0x6c, 0x42, 0x79, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x46, 0x0a, 0x09,
-	0x72, 0x65, 0x73, 0x75, 0x6c, 0x74, 0x5f, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32,
-	0x29, 0x2e, 0x69, 0x6f, 0x2e, 0x64, 0x65, 0x65, 0x70, 0x68, 0x61, 0x76, 0x65, 0x6e, 0x2e, 0x70,
-	0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x62, 0x61, 0x63, 0x6b, 0x70, 0x6c, 0x61, 0x6e, 0x65, 0x2e, 0x67,
-	0x72, 0x70, 0x63, 0x2e, 0x54, 0x69, 0x63, 0x6b, 0x65, 0x74, 0x52, 0x08, 0x72, 0x65, 0x73, 0x75,
-	0x6c, 0x74, 0x49, 0x64, 0x12, 0x4e, 0x0a, 0x09, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x5f, 0x69,
-	0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x31, 0x2e, 0x69, 0x6f, 0x2e, 0x64, 0x65, 0x65,
-	0x70, 0x68, 0x61, 0x76, 0x65, 0x6e, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x62, 0x61, 0x63,
-	0x6b, 0x70, 0x6c, 0x61, 0x6e, 0x65, 0x2e, 0x67, 0x72, 0x70, 0x63, 0x2e, 0x54, 0x61, 0x62, 0x6c,
-	0x65, 0x52, 0x65, 0x66, 0x65, 0x72, 0x65, 0x6e, 0x63, 0x65, 0x52, 0x08, 0x73, 0x6f, 0x75, 0x72,
-	0x63, 0x65, 0x49, 0x64, 0x12, 0x1d, 0x0a, 0x08, 0x6e, 0x75, 0x6d, 0x5f, 0x72, 0x6f, 0x77, 0x73,
-	0x18, 0x03, 0x20, 0x01, 0x28, 0x12, 0x42, 0x02, 0x30, 0x01, 0x52, 0x07, 0x6e, 0x75, 0x6d, 0x52,
-	0x6f, 0x77, 0x73, 0x12, 0x31, 0x0a, 0x15, 0x67, 0x72, 0x6f, 0x75, 0x70, 0x5f, 0x62, 0x79, 0x5f,
-	0x63, 0x6f, 0x6c, 0x75, 0x6d, 0x6e, 0x5f, 0x73, 0x70, 0x65, 0x63, 0x73, 0x18, 0x04, 0x20, 0x03,
-	0x28, 0x09, 0x52, 0x12, 0x67, 0x72, 0x6f, 0x75, 0x70, 0x42, 0x79, 0x43, 0x6f, 0x6c, 0x75, 0x6d,
-	0x6e, 0x53, 0x70, 0x65, 0x63, 0x73, 0x22, 0xf3, 0x01, 0x0a, 0x0e, 0x55, 0x6e, 0x67, 0x72, 0x6f,
-	0x75, 0x70, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x46, 0x0a, 0x09, 0x72, 0x65, 0x73,
+	0x72, 0x63, 0x65, 0x49, 0x64, 0x12, 0x1b, 0x0a, 0x09, 0x6e, 0x75, 0x6c, 0x6c, 0x5f, 0x66, 0x69,
+	0x6c, 0x6c, 0x18, 0x03, 0x20, 0x01, 0x28, 0x08, 0x52, 0x08, 0x6e, 0x75, 0x6c, 0x6c, 0x46, 0x69,
+	0x6c, 0x6c, 0x12, 0x2c, 0x0a, 0x12, 0x63, 0x6f, 0x6c, 0x75, 0x6d, 0x6e, 0x73, 0x5f, 0x74, 0x6f,
+	0x5f, 0x75, 0x6e, 0x67, 0x72, 0x6f, 0x75, 0x70, 0x18, 0x04, 0x20, 0x03, 0x28, 0x09, 0x52, 0x10,
+	0x63, 0x6f, 0x6c, 0x75, 0x6d, 0x6e, 0x73, 0x54, 0x6f, 0x55, 0x6e, 0x67, 0x72, 0x6f, 0x75, 0x70,
+	0x22, 0xcd, 0x01, 0x0a, 0x12, 0x4d, 0x65, 0x72, 0x67, 0x65, 0x54, 0x61, 0x62, 0x6c, 0x65, 0x73,
+	0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x46, 0x0a, 0x09, 0x72, 0x65, 0x73, 0x75, 0x6c,
+	0x74, 0x5f, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x29, 0x2e, 0x69, 0x6f, 0x2e,
+	0x64, 0x65, 0x65, 0x70, 0x68, 0x61, 0x76, 0x65, 0x6e, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e,
+	0x62, 0x61, 0x63, 0x6b, 0x70, 0x6c, 0x61, 0x6e, 0x65, 0x2e, 0x67, 0x72, 0x70, 0x63, 0x2e, 0x54,
+	0x69, 0x63, 0x6b, 0x65, 0x74, 0x52, 0x08, 0x72, 0x65, 0x73, 0x75, 0x6c, 0x74, 0x49, 0x64, 0x12,
+	0x50, 0x0a, 0x0a, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x5f, 0x69, 0x64, 0x73, 0x18, 0x02, 0x20,
+	0x03, 0x28, 0x0b, 0x32, 0x31, 0x2e, 0x69, 0x6f, 0x2e, 0x64, 0x65, 0x65, 0x70, 0x68, 0x61, 0x76,
+	0x65, 0x6e, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x62, 0x61, 0x63, 0x6b, 0x70, 0x6c, 0x61,
+	0x6e, 0x65, 0x2e, 0x67, 0x72, 0x70, 0x63, 0x2e, 0x54, 0x61, 0x62, 0x6c, 0x65, 0x52, 0x65, 0x66,
+	0x65, 0x72, 0x65, 0x6e, 0x63, 0x65, 0x52, 0x09, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x49, 0x64,
+	0x73, 0x12, 0x1d, 0x0a, 0x0a, 0x6b, 0x65, 0x79, 0x5f, 0x63, 0x6f, 0x6c, 0x75, 0x6d, 0x6e, 0x18,
+	0x03, 0x20, 0x01, 0x28, 0x09, 0x52, 0x09, 0x6b, 0x65, 0x79, 0x43, 0x6f, 0x6c, 0x75, 0x6d, 0x6e,
+	0x22, 0xae, 0x01, 0x0a, 0x14, 0x53, 0x6e, 0x61, 0x70, 0x73, 0x68, 0x6f, 0x74, 0x54, 0x61, 0x62,
+	0x6c, 0x65, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x46, 0x0a, 0x09, 0x72, 0x65, 0x73,
 	0x75, 0x6c, 0x74, 0x5f, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x29, 0x2e, 0x69,
 	0x6f, 0x2e, 0x64, 0x65, 0x65, 0x70, 0x68, 0x61, 0x76, 0x65, 0x6e, 0x2e, 0x70, 0x72, 0x6f, 0x74,
 	0x6f, 0x2e, 0x62, 0x61, 0x63, 0x6b, 0x70, 0x6c, 0x61, 0x6e, 0x65, 0x2e, 0x67, 0x72, 0x70, 0x63,
@@ -10653,104 +10975,96 @@ var file_deephaven_proto_table_proto_rawDesc = []byte{
 	0x76, 0x65, 0x6e, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x62, 0x61, 0x63, 0x6b, 0x70, 0x6c,
 	0x61, 0x6e, 0x65, 0x2e, 0x67, 0x72, 0x70, 0x63, 0x2e, 0x54, 0x61, 0x62, 0x6c, 0x65, 0x52, 0x65,
 	0x66, 0x65, 0x72, 0x65, 0x6e, 0x63, 0x65, 0x52, 0x08, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x49,
-	0x64, 0x12, 0x1b, 0x0a, 0x09, 0x6e, 0x75, 0x6c, 0x6c, 0x5f, 0x66, 0x69, 0x6c, 0x6c, 0x18, 0x03,
-	0x20, 0x01, 0x28, 0x08, 0x52, 0x08, 0x6e, 0x75, 0x6c, 0x6c, 0x46, 0x69, 0x6c, 0x6c, 0x12, 0x2c,
-	0x0a, 0x12, 0x63, 0x6f, 0x6c, 0x75, 0x6d, 0x6e, 0x73, 0x5f, 0x74, 0x6f, 0x5f, 0x75, 0x6e, 0x67,
-	0x72, 0x6f, 0x75, 0x70, 0x18, 0x04, 0x20, 0x03, 0x28, 0x09, 0x52, 0x10, 0x63, 0x6f, 0x6c, 0x75,
-	0x6d, 0x6e, 0x73, 0x54, 0x6f, 0x55, 0x6e, 0x67, 0x72, 0x6f, 0x75, 0x70, 0x22, 0xcd, 0x01, 0x0a,
-	0x12, 0x4d, 0x65, 0x72, 0x67, 0x65, 0x54, 0x61, 0x62, 0x6c, 0x65, 0x73, 0x52, 0x65, 0x71, 0x75,
-	0x65, 0x73, 0x74, 0x12, 0x46, 0x0a, 0x09, 0x72, 0x65, 0x73, 0x75, 0x6c, 0x74, 0x5f, 0x69, 0x64,
-	0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x29, 0x2e, 0x69, 0x6f, 0x2e, 0x64, 0x65, 0x65, 0x70,
+	0x64, 0x22, 0xfb, 0x02, 0x0a, 0x18, 0x53, 0x6e, 0x61, 0x70, 0x73, 0x68, 0x6f, 0x74, 0x57, 0x68,
+	0x65, 0x6e, 0x54, 0x61, 0x62, 0x6c, 0x65, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x46,
+	0x0a, 0x09, 0x72, 0x65, 0x73, 0x75, 0x6c, 0x74, 0x5f, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28,
+	0x0b, 0x32, 0x29, 0x2e, 0x69, 0x6f, 0x2e, 0x64, 0x65, 0x65, 0x70, 0x68, 0x61, 0x76, 0x65, 0x6e,
+	0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x62, 0x61, 0x63, 0x6b, 0x70, 0x6c, 0x61, 0x6e, 0x65,
+	0x2e, 0x67, 0x72, 0x70, 0x63, 0x2e, 0x54, 0x69, 0x63, 0x6b, 0x65, 0x74, 0x52, 0x08, 0x72, 0x65,
+	0x73, 0x75, 0x6c, 0x74, 0x49, 0x64, 0x12, 0x4a, 0x0a, 0x07, 0x62, 0x61, 0x73, 0x65, 0x5f, 0x69,
+	0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x31, 0x2e, 0x69, 0x6f, 0x2e, 0x64, 0x65, 0x65,
+	0x70, 0x68, 0x61, 0x76, 0x65, 0x6e, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x62, 0x61, 0x63,
+	0x6b, 0x70, 0x6c, 0x61, 0x6e, 0x65, 0x2e, 0x67, 0x72, 0x70, 0x63, 0x2e, 0x54, 0x61, 0x62, 0x6c,
+	0x65, 0x52, 0x65, 0x66, 0x65, 0x72, 0x65, 0x6e, 0x63, 0x65, 0x52, 0x06, 0x62, 0x61, 0x73, 0x65,
+	0x49, 0x64, 0x12, 0x50, 0x0a, 0x0a, 0x74, 0x72, 0x69, 0x67, 0x67, 0x65, 0x72, 0x5f, 0x69, 0x64,
+	0x18, 0x03, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x31, 0x2e, 0x69, 0x6f, 0x2e, 0x64, 0x65, 0x65, 0x70,
 	0x68, 0x61, 0x76, 0x65, 0x6e, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x62, 0x61, 0x63, 0x6b,
-	0x70, 0x6c, 0x61, 0x6e, 0x65, 0x2e, 0x67, 0x72, 0x70, 0x63, 0x2e, 0x54, 0x69, 0x63, 0x6b, 0x65,
-	0x74, 0x52, 0x08, 0x72, 0x65, 0x73, 0x75, 0x6c, 0x74, 0x49, 0x64, 0x12, 0x50, 0x0a, 0x0a, 0x73,
-	0x6f, 0x75, 0x72, 0x63, 0x65, 0x5f, 0x69, 0x64, 0x73, 0x18, 0x02, 0x20, 0x03, 0x28, 0x0b, 0x32,
-	0x31, 0x2e, 0x69, 0x6f, 0x2e, 0x64, 0x65, 0x65, 0x70, 0x68, 0x61, 0x76, 0x65, 0x6e, 0x2e, 0x70,
-	0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x62, 0x61, 0x63, 0x6b, 0x70, 0x6c, 0x61, 0x6e, 0x65, 0x2e, 0x67,
-	0x72, 0x70, 0x63, 0x2e, 0x54, 0x61, 0x62, 0x6c, 0x65, 0x52, 0x65, 0x66, 0x65, 0x72, 0x65, 0x6e,
-	0x63, 0x65, 0x52, 0x09, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x49, 0x64, 0x73, 0x12, 0x1d, 0x0a,
-	0x0a, 0x6b, 0x65, 0x79, 0x5f, 0x63, 0x6f, 0x6c, 0x75, 0x6d, 0x6e, 0x18, 0x03, 0x20, 0x01, 0x28,
-	0x09, 0x52, 0x09, 0x6b, 0x65, 0x79, 0x43, 0x6f, 0x6c, 0x75, 0x6d, 0x6e, 0x22, 0xae, 0x01, 0x0a,
-	0x14, 0x53, 0x6e, 0x61, 0x70, 0x73, 0x68, 0x6f, 0x74, 0x54, 0x61, 0x62, 0x6c, 0x65, 0x52, 0x65,
-	0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x46, 0x0a, 0x09, 0x72, 0x65, 0x73, 0x75, 0x6c, 0x74, 0x5f,
-	0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x29, 0x2e, 0x69, 0x6f, 0x2e, 0x64, 0x65,
-	0x65, 0x70, 0x68, 0x61, 0x76, 0x65, 0x6e, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x62, 0x61,
-	0x63, 0x6b, 0x70, 0x6c, 0x61, 0x6e, 0x65, 0x2e, 0x67, 0x72, 0x70, 0x63, 0x2e, 0x54, 0x69, 0x63,
-	0x6b, 0x65, 0x74, 0x52, 0x08, 0x72, 0x65, 0x73, 0x75, 0x6c, 0x74, 0x49, 0x64, 0x12, 0x4e, 0x0a,
-	0x09, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x5f, 0x69, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b,
-	0x32, 0x31, 0x2e, 0x69, 0x6f, 0x2e, 0x64, 0x65, 0x65, 0x70, 0x68, 0x61, 0x76, 0x65, 0x6e, 0x2e,
-	0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x62, 0x61, 0x63, 0x6b, 0x70, 0x6c, 0x61, 0x6e, 0x65, 0x2e,
-	0x67, 0x72, 0x70, 0x63, 0x2e, 0x54, 0x61, 0x62, 0x6c, 0x65, 0x52, 0x65, 0x66, 0x65, 0x72, 0x65,
-	0x6e, 0x63, 0x65, 0x52, 0x08, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x49, 0x64, 0x22, 0xfb, 0x02,
-	0x0a, 0x18, 0x53, 0x6e, 0x61, 0x70, 0x73, 0x68, 0x6f, 0x74, 0x57, 0x68, 0x65, 0x6e, 0x54, 0x61,
-	0x62, 0x6c, 0x65, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x46, 0x0a, 0x09, 0x72, 0x65,
+	0x70, 0x6c, 0x61, 0x6e, 0x65, 0x2e, 0x67, 0x72, 0x70, 0x63, 0x2e, 0x54, 0x61, 0x62, 0x6c, 0x65,
+	0x52, 0x65, 0x66, 0x65, 0x72, 0x65, 0x6e, 0x63, 0x65, 0x52, 0x09, 0x74, 0x72, 0x69, 0x67, 0x67,
+	0x65, 0x72, 0x49, 0x64, 0x12, 0x18, 0x0a, 0x07, 0x69, 0x6e, 0x69, 0x74, 0x69, 0x61, 0x6c, 0x18,
+	0x04, 0x20, 0x01, 0x28, 0x08, 0x52, 0x07, 0x69, 0x6e, 0x69, 0x74, 0x69, 0x61, 0x6c, 0x12, 0x20,
+	0x0a, 0x0b, 0x69, 0x6e, 0x63, 0x72, 0x65, 0x6d, 0x65, 0x6e, 0x74, 0x61, 0x6c, 0x18, 0x05, 0x20,
+	0x01, 0x28, 0x08, 0x52, 0x0b, 0x69, 0x6e, 0x63, 0x72, 0x65, 0x6d, 0x65, 0x6e, 0x74, 0x61, 0x6c,
+	0x12, 0x18, 0x0a, 0x07, 0x68, 0x69, 0x73, 0x74, 0x6f, 0x72, 0x79, 0x18, 0x06, 0x20, 0x01, 0x28,
+	0x08, 0x52, 0x07, 0x68, 0x69, 0x73, 0x74, 0x6f, 0x72, 0x79, 0x12, 0x23, 0x0a, 0x0d, 0x73, 0x74,
+	0x61, 0x6d, 0x70, 0x5f, 0x63, 0x6f, 0x6c, 0x75, 0x6d, 0x6e, 0x73, 0x18, 0x07, 0x20, 0x03, 0x28,
+	0x09, 0x52, 0x0c, 0x73, 0x74, 0x61, 0x6d, 0x70, 0x43, 0x6f, 0x6c, 0x75, 0x6d, 0x6e, 0x73, 0x22,
+	0xed, 0x02, 0x0a, 0x16, 0x43, 0x72, 0x6f, 0x73, 0x73, 0x4a, 0x6f, 0x69, 0x6e, 0x54, 0x61, 0x62,
+	0x6c, 0x65, 0x73, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x46, 0x0a, 0x09, 0x72, 0x65,
 	0x73, 0x75, 0x6c, 0x74, 0x5f, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x29, 0x2e,
 	0x69, 0x6f, 0x2e, 0x64, 0x65, 0x65, 0x70, 0x68, 0x61, 0x76, 0x65, 0x6e, 0x2e, 0x70, 0x72, 0x6f,
 	0x74, 0x6f, 0x2e, 0x62, 0x61, 0x63, 0x6b, 0x70, 0x6c, 0x61, 0x6e, 0x65, 0x2e, 0x67, 0x72, 0x70,
 	0x63, 0x2e, 0x54, 0x69, 0x63, 0x6b, 0x65, 0x74, 0x52, 0x08, 0x72, 0x65, 0x73, 0x75, 0x6c, 0x74,
-	0x49, 0x64, 0x12, 0x4a, 0x0a, 0x07, 0x62, 0x61, 0x73, 0x65, 0x5f, 0x69, 0x64, 0x18, 0x02, 0x20,
+	0x49, 0x64, 0x12, 0x4a, 0x0a, 0x07, 0x6c, 0x65, 0x66, 0x74, 0x5f, 0x69, 0x64, 0x18, 0x02, 0x20,
 	0x01, 0x28, 0x0b, 0x32, 0x31, 0x2e, 0x69, 0x6f, 0x2e, 0x64, 0x65, 0x65, 0x70, 0x68, 0x61, 0x76,
 	0x65, 0x6e, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x62, 0x61, 0x63, 0x6b, 0x70, 0x6c, 0x61,
 	0x6e, 0x65, 0x2e, 0x67, 0x72, 0x70, 0x63, 0x2e, 0x54, 0x61, 0x62, 0x6c, 0x65, 0x52, 0x65, 0x66,
-	0x65, 0x72, 0x65, 0x6e, 0x63, 0x65, 0x52, 0x06, 0x62, 0x61, 0x73, 0x65, 0x49, 0x64, 0x12, 0x50,
-	0x0a, 0x0a, 0x74, 0x72, 0x69, 0x67, 0x67, 0x65, 0x72, 0x5f, 0x69, 0x64, 0x18, 0x03, 0x20, 0x01,
+	0x65, 0x72, 0x65, 0x6e, 0x63, 0x65, 0x52, 0x06, 0x6c, 0x65, 0x66, 0x74, 0x49, 0x64, 0x12, 0x4c,
+	0x0a, 0x08, 0x72, 0x69, 0x67, 0x68, 0x74, 0x5f, 0x69, 0x64, 0x18, 0x03, 0x20, 0x01, 0x28, 0x0b,
+	0x32, 0x31, 0x2e, 0x69, 0x6f, 0x2e, 0x64, 0x65, 0x65, 0x70, 0x68, 0x61, 0x76, 0x65, 0x6e, 0x2e,
+	0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x62, 0x61, 0x63, 0x6b, 0x70, 0x6c, 0x61, 0x6e, 0x65, 0x2e,
+	0x67, 0x72, 0x70, 0x63, 0x2e, 0x54, 0x61, 0x62, 0x6c, 0x65, 0x52, 0x65, 0x66, 0x65, 0x72, 0x65,
+	0x6e, 0x63, 0x65, 0x52, 0x07, 0x72, 0x69, 0x67, 0x68, 0x74, 0x49, 0x64, 0x12, 0x28, 0x0a, 0x10,
+	0x63, 0x6f, 0x6c, 0x75, 0x6d, 0x6e, 0x73, 0x5f, 0x74, 0x6f, 0x5f, 0x6d, 0x61, 0x74, 0x63, 0x68,
+	0x18, 0x04, 0x20, 0x03, 0x28, 0x09, 0x52, 0x0e, 0x63, 0x6f, 0x6c, 0x75, 0x6d, 0x6e, 0x73, 0x54,
+	0x6f, 0x4d, 0x61, 0x74, 0x63, 0x68, 0x12, 0x24, 0x0a, 0x0e, 0x63, 0x6f, 0x6c, 0x75, 0x6d, 0x6e,
+	0x73, 0x5f, 0x74, 0x6f, 0x5f, 0x61, 0x64, 0x64, 0x18, 0x05, 0x20, 0x03, 0x28, 0x09, 0x52, 0x0c,
+	0x63, 0x6f, 0x6c, 0x75, 0x6d, 0x6e, 0x73, 0x54, 0x6f, 0x41, 0x64, 0x64, 0x12, 0x21, 0x0a, 0x0c,
+	0x72, 0x65, 0x73, 0x65, 0x72, 0x76, 0x65, 0x5f, 0x62, 0x69, 0x74, 0x73, 0x18, 0x06, 0x20, 0x01,
+	0x28, 0x05, 0x52, 0x0b, 0x72, 0x65, 0x73, 0x65, 0x72, 0x76, 0x65, 0x42, 0x69, 0x74, 0x73, 0x22,
+	0xcc, 0x02, 0x0a, 0x18, 0x4e, 0x61, 0x74, 0x75, 0x72, 0x61, 0x6c, 0x4a, 0x6f, 0x69, 0x6e, 0x54,
+	0x61, 0x62, 0x6c, 0x65, 0x73, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x46, 0x0a, 0x09,
+	0x72, 0x65, 0x73, 0x75, 0x6c, 0x74, 0x5f, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32,
+	0x29, 0x2e, 0x69, 0x6f, 0x2e, 0x64, 0x65, 0x65, 0x70, 0x68, 0x61, 0x76, 0x65, 0x6e, 0x2e, 0x70,
+	0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x62, 0x61, 0x63, 0x6b, 0x70, 0x6c, 0x61, 0x6e, 0x65, 0x2e, 0x67,
+	0x72, 0x70, 0x63, 0x2e, 0x54, 0x69, 0x63, 0x6b, 0x65, 0x74, 0x52, 0x08, 0x72, 0x65, 0x73, 0x75,
+	0x6c, 0x74, 0x49, 0x64, 0x12, 0x4a, 0x0a, 0x07, 0x6c, 0x65, 0x66, 0x74, 0x5f, 0x69, 0x64, 0x18,
+	0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x31, 0x2e, 0x69, 0x6f, 0x2e, 0x64, 0x65, 0x65, 0x70, 0x68,
+	0x61, 0x76, 0x65, 0x6e, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x62, 0x61, 0x63, 0x6b, 0x70,
+	0x6c, 0x61, 0x6e, 0x65, 0x2e, 0x67, 0x72, 0x70, 0x63, 0x2e, 0x54, 0x61, 0x62, 0x6c, 0x65, 0x52,
+	0x65, 0x66, 0x65, 0x72, 0x65, 0x6e, 0x63, 0x65, 0x52, 0x06, 0x6c, 0x65, 0x66, 0x74, 0x49, 0x64,
+	0x12, 0x4c, 0x0a, 0x08, 0x72, 0x69, 0x67, 0x68, 0x74, 0x5f, 0x69, 0x64, 0x18, 0x03, 0x20, 0x01,
 	0x28, 0x0b, 0x32, 0x31, 0x2e, 0x69, 0x6f, 0x2e, 0x64, 0x65, 0x65, 0x70, 0x68, 0x61, 0x76, 0x65,
 	0x6e, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x62, 0x61, 0x63, 0x6b, 0x70, 0x6c, 0x61, 0x6e,
 	0x65, 0x2e, 0x67, 0x72, 0x70, 0x63, 0x2e, 0x54, 0x61, 0x62, 0x6c, 0x65, 0x52, 0x65, 0x66, 0x65,
-	0x72, 0x65, 0x6e, 0x63, 0x65, 0x52, 0x09, 0x74, 0x72, 0x69, 0x67, 0x67, 0x65, 0x72, 0x49, 0x64,
-	0x12, 0x18, 0x0a, 0x07, 0x69, 0x6e, 0x69, 0x74, 0x69, 0x61, 0x6c, 0x18, 0x04, 0x20, 0x01, 0x28,
-	0x08, 0x52, 0x07, 0x69, 0x6e, 0x69, 0x74, 0x69, 0x61, 0x6c, 0x12, 0x20, 0x0a, 0x0b, 0x69, 0x6e,
-	0x63, 0x72, 0x65, 0x6d, 0x65, 0x6e, 0x74, 0x61, 0x6c, 0x18, 0x05, 0x20, 0x01, 0x28, 0x08, 0x52,
-	0x0b, 0x69, 0x6e, 0x63, 0x72, 0x65, 0x6d, 0x65, 0x6e, 0x74, 0x61, 0x6c, 0x12, 0x18, 0x0a, 0x07,
-	0x68, 0x69, 0x73, 0x74, 0x6f, 0x72, 0x79, 0x18, 0x06, 0x20, 0x01, 0x28, 0x08, 0x52, 0x07, 0x68,
-	0x69, 0x73, 0x74, 0x6f, 0x72, 0x79, 0x12, 0x23, 0x0a, 0x0d, 0x73, 0x74, 0x61, 0x6d, 0x70, 0x5f,
-	0x63, 0x6f, 0x6c, 0x75, 0x6d, 0x6e, 0x73, 0x18, 0x07, 0x20, 0x03, 0x28, 0x09, 0x52, 0x0c, 0x73,
-	0x74, 0x61, 0x6d, 0x70, 0x43, 0x6f, 0x6c, 0x75, 0x6d, 0x6e, 0x73, 0x22, 0xed, 0x02, 0x0a, 0x16,
-	0x43, 0x72, 0x6f, 0x73, 0x73, 0x4a, 0x6f, 0x69, 0x6e, 0x54, 0x61, 0x62, 0x6c, 0x65, 0x73, 0x52,
-	0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x46, 0x0a, 0x09, 0x72, 0x65, 0x73, 0x75, 0x6c, 0x74,
-	0x5f, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x29, 0x2e, 0x69, 0x6f, 0x2e, 0x64,
-	0x65, 0x65, 0x70, 0x68, 0x61, 0x76, 0x65, 0x6e, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x62,
-	0x61, 0x63, 0x6b, 0x70, 0x6c, 0x61, 0x6e, 0x65, 0x2e, 0x67, 0x72, 0x70, 0x63, 0x2e, 0x54, 0x69,
-	0x63, 0x6b, 0x65, 0x74, 0x52, 0x08, 0x72, 0x65, 0x73, 0x75, 0x6c, 0x74, 0x49, 0x64, 0x12, 0x4a,
-	0x0a, 0x07, 0x6c, 0x65, 0x66, 0x74, 0x5f, 0x69, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32,
+	0x72, 0x65, 0x6e, 0x63, 0x65, 0x52, 0x07, 0x72, 0x69, 0x67, 0x68, 0x74, 0x49, 0x64, 0x12, 0x28,
+	0x0a, 0x10, 0x63, 0x6f, 0x6c, 0x75, 0x6d, 0x6e, 0x73, 0x5f, 0x74, 0x6f, 0x5f, 0x6d, 0x61, 0x74,
+	0x63, 0x68, 0x18, 0x04, 0x20, 0x03, 0x28, 0x09, 0x52, 0x0e, 0x63, 0x6f, 0x6c, 0x75, 0x6d, 0x6e,
+	0x73, 0x54, 0x6f, 0x4d, 0x61, 0x74, 0x63, 0x68, 0x12, 0x24, 0x0a, 0x0e, 0x63, 0x6f, 0x6c, 0x75,
+	0x6d, 0x6e, 0x73, 0x5f, 0x74, 0x6f, 0x5f, 0x61, 0x64, 0x64, 0x18, 0x05, 0x20, 0x03, 0x28, 0x09,
+	0x52, 0x0c, 0x63, 0x6f, 0x6c, 0x75, 0x6d, 0x6e, 0x73, 0x54, 0x6f, 0x41, 0x64, 0x64, 0x22, 0xca,
+	0x02, 0x0a, 0x16, 0x45, 0x78, 0x61, 0x63, 0x74, 0x4a, 0x6f, 0x69, 0x6e, 0x54, 0x61, 0x62, 0x6c,
+	0x65, 0x73, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x46, 0x0a, 0x09, 0x72, 0x65, 0x73,
+	0x75, 0x6c, 0x74, 0x5f, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x29, 0x2e, 0x69,
+	0x6f, 0x2e, 0x64, 0x65, 0x65, 0x70, 0x68, 0x61, 0x76, 0x65, 0x6e, 0x2e, 0x70, 0x72, 0x6f, 0x74,
+	0x6f, 0x2e, 0x62, 0x61, 0x63, 0x6b, 0x70, 0x6c, 0x61, 0x6e, 0x65, 0x2e, 0x67, 0x72, 0x70, 0x63,
+	0x2e, 0x54, 0x69, 0x63, 0x6b, 0x65, 0x74, 0x52, 0x08, 0x72, 0x65, 0x73, 0x75, 0x6c, 0x74, 0x49,
+	0x64, 0x12, 0x4a, 0x0a, 0x07, 0x6c, 0x65, 0x66, 0x74, 0x5f, 0x69, 0x64, 0x18, 0x02, 0x20, 0x01,
+	0x28, 0x0b, 0x32, 0x31, 0x2e, 0x69, 0x6f, 0x2e, 0x64, 0x65, 0x65, 0x70, 0x68, 0x61, 0x76, 0x65,
+	0x6e, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x62, 0x61, 0x63, 0x6b, 0x70, 0x6c, 0x61, 0x6e,
+	0x65, 0x2e, 0x67, 0x72, 0x70, 0x63, 0x2e, 0x54, 0x61, 0x62, 0x6c, 0x65, 0x52, 0x65, 0x66, 0x65,
+	0x72, 0x65, 0x6e, 0x63, 0x65, 0x52, 0x06, 0x6c, 0x65, 0x66, 0x74, 0x49, 0x64, 0x12, 0x4c, 0x0a,
+	0x08, 0x72, 0x69, 0x67, 0x68, 0x74, 0x5f, 0x69, 0x64, 0x18, 0x03, 0x20, 0x01, 0x28, 0x0b, 0x32,
 	0x31, 0x2e, 0x69, 0x6f, 0x2e, 0x64, 0x65, 0x65, 0x70, 0x68, 0x61, 0x76, 0x65, 0x6e, 0x2e, 0x70,
 	0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x62, 0x61, 0x63, 0x6b, 0x70, 0x6c, 0x61, 0x6e, 0x65, 0x2e, 0x67,
 	0x72, 0x70, 0x63, 0x2e, 0x54, 0x61, 0x62, 0x6c, 0x65, 0x52, 0x65, 0x66, 0x65, 0x72, 0x65, 0x6e,
-	0x63, 0x65, 0x52, 0x06, 0x6c, 0x65, 0x66, 0x74, 0x49, 0x64, 0x12, 0x4c, 0x0a, 0x08, 0x72, 0x69,
-	0x67, 0x68, 0x74, 0x5f, 0x69, 0x64, 0x18, 0x03, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x31, 0x2e, 0x69,
-	0x6f, 0x2e, 0x64, 0x65, 0x65, 0x70, 0x68, 0x61, 0x76, 0x65, 0x6e, 0x2e, 0x70, 0x72, 0x6f, 0x74,
-	0x6f, 0x2e, 0x62, 0x61, 0x63, 0x6b, 0x70, 0x6c, 0x61, 0x6e, 0x65, 0x2e, 0x67, 0x72, 0x70, 0x63,
-	0x2e, 0x54, 0x61, 0x62, 0x6c, 0x65, 0x52, 0x65, 0x66, 0x65, 0x72, 0x65, 0x6e, 0x63, 0x65, 0x52,
-	0x07, 0x72, 0x69, 0x67, 0x68, 0x74, 0x49, 0x64, 0x12, 0x28, 0x0a, 0x10, 0x63, 0x6f, 0x6c, 0x75,
-	0x6d, 0x6e, 0x73, 0x5f, 0x74, 0x6f, 0x5f, 0x6d, 0x61, 0x74, 0x63, 0x68, 0x18, 0x04, 0x20, 0x03,
-	0x28, 0x09, 0x52, 0x0e, 0x63, 0x6f, 0x6c, 0x75, 0x6d, 0x6e, 0x73, 0x54, 0x6f, 0x4d, 0x61, 0x74,
-	0x63, 0x68, 0x12, 0x24, 0x0a, 0x0e, 0x63, 0x6f, 0x6c, 0x75, 0x6d, 0x6e, 0x73, 0x5f, 0x74, 0x6f,
-	0x5f, 0x61, 0x64, 0x64, 0x18, 0x05, 0x20, 0x03, 0x28, 0x09, 0x52, 0x0c, 0x63, 0x6f, 0x6c, 0x75,
-	0x6d, 0x6e, 0x73, 0x54, 0x6f, 0x41, 0x64, 0x64, 0x12, 0x21, 0x0a, 0x0c, 0x72, 0x65, 0x73, 0x65,
-	0x72, 0x76, 0x65, 0x5f, 0x62, 0x69, 0x74, 0x73, 0x18, 0x06, 0x20, 0x01, 0x28, 0x05, 0x52, 0x0b,
-	0x72, 0x65, 0x73, 0x65, 0x72, 0x76, 0x65, 0x42, 0x69, 0x74, 0x73, 0x22, 0xcc, 0x02, 0x0a, 0x18,
-	0x4e, 0x61, 0x74, 0x75, 0x72, 0x61, 0x6c, 0x4a, 0x6f, 0x69, 0x6e, 0x54, 0x61, 0x62, 0x6c, 0x65,
-	0x73, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x46, 0x0a, 0x09, 0x72, 0x65, 0x73, 0x75,
-	0x6c, 0x74, 0x5f, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x29, 0x2e, 0x69, 0x6f,
-	0x2e, 0x64, 0x65, 0x65, 0x70, 0x68, 0x61, 0x76, 0x65, 0x6e, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f,
-	0x2e, 0x62, 0x61, 0x63, 0x6b, 0x70, 0x6c, 0x61, 0x6e, 0x65, 0x2e, 0x67, 0x72, 0x70, 0x63, 0x2e,
-	0x54, 0x69, 0x63, 0x6b, 0x65, 0x74, 0x52, 0x08, 0x72, 0x65, 0x73, 0x75, 0x6c, 0x74, 0x49, 0x64,
-	0x12, 0x4a, 0x0a, 0x07, 0x6c, 0x65, 0x66, 0x74, 0x5f, 0x69, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28,
-	0x0b, 0x32, 0x31, 0x2e, 0x69, 0x6f, 0x2e, 0x64, 0x65, 0x65, 0x70, 0x68, 0x61, 0x76, 0x65, 0x6e,
-	0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x62, 0x61, 0x63, 0x6b, 0x70, 0x6c, 0x61, 0x6e, 0x65,
-	0x2e, 0x67, 0x72, 0x70, 0x63, 0x2e, 0x54, 0x61, 0x62, 0x6c, 0x65, 0x52, 0x65, 0x66, 0x65, 0x72,
-	0x65, 0x6e, 0x63, 0x65, 0x52, 0x06, 0x6c, 0x65, 0x66, 0x74, 0x49, 0x64, 0x12, 0x4c, 0x0a, 0x08,
-	0x72, 0x69, 0x67, 0x68, 0x74, 0x5f, 0x69, 0x64, 0x18, 0x03, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x31,
-	0x2e, 0x69, 0x6f, 0x2e, 0x64, 0x65, 0x65, 0x70, 0x68, 0x61, 0x76, 0x65, 0x6e, 0x2e, 0x70, 0x72,
-	0x6f, 0x74, 0x6f, 0x2e, 0x62, 0x61, 0x63, 0x6b, 0x70, 0x6c, 0x61, 0x6e, 0x65, 0x2e, 0x67, 0x72,
-	0x70, 0x63, 0x2e, 0x54, 0x61, 0x62, 0x6c, 0x65, 0x52, 0x65, 0x66, 0x65, 0x72, 0x65, 0x6e, 0x63,
-	0x65, 0x52, 0x07, 0x72, 0x69, 0x67, 0x68, 0x74, 0x49, 0x64, 0x12, 0x28, 0x0a, 0x10, 0x63, 0x6f,
-	0x6c, 0x75, 0x6d, 0x6e, 0x73, 0x5f, 0x74, 0x6f, 0x5f, 0x6d, 0x61, 0x74, 0x63, 0x68, 0x18, 0x04,
-	0x20, 0x03, 0x28, 0x09, 0x52, 0x0e, 0x63, 0x6f, 0x6c, 0x75, 0x6d, 0x6e, 0x73, 0x54, 0x6f, 0x4d,
-	0x61, 0x74, 0x63, 0x68, 0x12, 0x24, 0x0a, 0x0e, 0x63, 0x6f, 0x6c, 0x75, 0x6d, 0x6e, 0x73, 0x5f,
-	0x74, 0x6f, 0x5f, 0x61, 0x64, 0x64, 0x18, 0x05, 0x20, 0x03, 0x28, 0x09, 0x52, 0x0c, 0x63, 0x6f,
-	0x6c, 0x75, 0x6d, 0x6e, 0x73, 0x54, 0x6f, 0x41, 0x64, 0x64, 0x22, 0xca, 0x02, 0x0a, 0x16, 0x45,
-	0x78, 0x61, 0x63, 0x74, 0x4a, 0x6f, 0x69, 0x6e, 0x54, 0x61, 0x62, 0x6c, 0x65, 0x73, 0x52, 0x65,
+	0x63, 0x65, 0x52, 0x07, 0x72, 0x69, 0x67, 0x68, 0x74, 0x49, 0x64, 0x12, 0x28, 0x0a, 0x10, 0x63,
+	0x6f, 0x6c, 0x75, 0x6d, 0x6e, 0x73, 0x5f, 0x74, 0x6f, 0x5f, 0x6d, 0x61, 0x74, 0x63, 0x68, 0x18,
+	0x04, 0x20, 0x03, 0x28, 0x09, 0x52, 0x0e, 0x63, 0x6f, 0x6c, 0x75, 0x6d, 0x6e, 0x73, 0x54, 0x6f,
+	0x4d, 0x61, 0x74, 0x63, 0x68, 0x12, 0x24, 0x0a, 0x0e, 0x63, 0x6f, 0x6c, 0x75, 0x6d, 0x6e, 0x73,
+	0x5f, 0x74, 0x6f, 0x5f, 0x61, 0x64, 0x64, 0x18, 0x05, 0x20, 0x03, 0x28, 0x09, 0x52, 0x0c, 0x63,
+	0x6f, 0x6c, 0x75, 0x6d, 0x6e, 0x73, 0x54, 0x6f, 0x41, 0x64, 0x64, 0x22, 0xc9, 0x02, 0x0a, 0x15,
+	0x4c, 0x65, 0x66, 0x74, 0x4a, 0x6f, 0x69, 0x6e, 0x54, 0x61, 0x62, 0x6c, 0x65, 0x73, 0x52, 0x65,
 	0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x46, 0x0a, 0x09, 0x72, 0x65, 0x73, 0x75, 0x6c, 0x74, 0x5f,
 	0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x29, 0x2e, 0x69, 0x6f, 0x2e, 0x64, 0x65,
 	0x65, 0x70, 0x68, 0x61, 0x76, 0x65, 0x6e, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x62, 0x61,
@@ -10770,7 +11084,7 @@ var file_deephaven_proto_table_proto_rawDesc = []byte{
 	0x09, 0x52, 0x0e, 0x63, 0x6f, 0x6c, 0x75, 0x6d, 0x6e, 0x73, 0x54, 0x6f, 0x4d, 0x61, 0x74, 0x63,
 	0x68, 0x12, 0x24, 0x0a, 0x0e, 0x63, 0x6f, 0x6c, 0x75, 0x6d, 0x6e, 0x73, 0x5f, 0x74, 0x6f, 0x5f,
 	0x61, 0x64, 0x64, 0x18, 0x05, 0x20, 0x03, 0x28, 0x09, 0x52, 0x0c, 0x63, 0x6f, 0x6c, 0x75, 0x6d,
-	0x6e, 0x73, 0x54, 0x6f, 0x41, 0x64, 0x64, 0x22, 0xc9, 0x02, 0x0a, 0x15, 0x4c, 0x65, 0x66, 0x74,
+	0x6e, 0x73, 0x54, 0x6f, 0x41, 0x64, 0x64, 0x22, 0x99, 0x04, 0x0a, 0x15, 0x41, 0x73, 0x4f, 0x66,
 	0x4a, 0x6f, 0x69, 0x6e, 0x54, 0x61, 0x62, 0x6c, 0x65, 0x73, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73,
 	0x74, 0x12, 0x46, 0x0a, 0x09, 0x72, 0x65, 0x73, 0x75, 0x6c, 0x74, 0x5f, 0x69, 0x64, 0x18, 0x01,
 	0x20, 0x01, 0x28, 0x0b, 0x32, 0x29, 0x2e, 0x69, 0x6f, 0x2e, 0x64, 0x65, 0x65, 0x70, 0x68, 0x61,
@@ -10791,508 +11105,505 @@ var file_deephaven_proto_table_proto_rawDesc = []byte{
 	0x6f, 0x6c, 0x75, 0x6d, 0x6e, 0x73, 0x54, 0x6f, 0x4d, 0x61, 0x74, 0x63, 0x68, 0x12, 0x24, 0x0a,
 	0x0e, 0x63, 0x6f, 0x6c, 0x75, 0x6d, 0x6e, 0x73, 0x5f, 0x74, 0x6f, 0x5f, 0x61, 0x64, 0x64, 0x18,
 	0x05, 0x20, 0x03, 0x28, 0x09, 0x52, 0x0c, 0x63, 0x6f, 0x6c, 0x75, 0x6d, 0x6e, 0x73, 0x54, 0x6f,
-	0x41, 0x64, 0x64, 0x22, 0x99, 0x04, 0x0a, 0x15, 0x41, 0x73, 0x4f, 0x66, 0x4a, 0x6f, 0x69, 0x6e,
-	0x54, 0x61, 0x62, 0x6c, 0x65, 0x73, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x46, 0x0a,
-	0x09, 0x72, 0x65, 0x73, 0x75, 0x6c, 0x74, 0x5f, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b,
-	0x32, 0x29, 0x2e, 0x69, 0x6f, 0x2e, 0x64, 0x65, 0x65, 0x70, 0x68, 0x61, 0x76, 0x65, 0x6e, 0x2e,
-	0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x62, 0x61, 0x63, 0x6b, 0x70, 0x6c, 0x61, 0x6e, 0x65, 0x2e,
-	0x67, 0x72, 0x70, 0x63, 0x2e, 0x54, 0x69, 0x63, 0x6b, 0x65, 0x74, 0x52, 0x08, 0x72, 0x65, 0x73,
-	0x75, 0x6c, 0x74, 0x49, 0x64, 0x12, 0x4a, 0x0a, 0x07, 0x6c, 0x65, 0x66, 0x74, 0x5f, 0x69, 0x64,
-	0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x31, 0x2e, 0x69, 0x6f, 0x2e, 0x64, 0x65, 0x65, 0x70,
-	0x68, 0x61, 0x76, 0x65, 0x6e, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x62, 0x61, 0x63, 0x6b,
-	0x70, 0x6c, 0x61, 0x6e, 0x65, 0x2e, 0x67, 0x72, 0x70, 0x63, 0x2e, 0x54, 0x61, 0x62, 0x6c, 0x65,
-	0x52, 0x65, 0x66, 0x65, 0x72, 0x65, 0x6e, 0x63, 0x65, 0x52, 0x06, 0x6c, 0x65, 0x66, 0x74, 0x49,
-	0x64, 0x12, 0x4c, 0x0a, 0x08, 0x72, 0x69, 0x67, 0x68, 0x74, 0x5f, 0x69, 0x64, 0x18, 0x03, 0x20,
+	0x41, 0x64, 0x64, 0x12, 0x6b, 0x0a, 0x10, 0x61, 0x73, 0x5f, 0x6f, 0x66, 0x5f, 0x6d, 0x61, 0x74,
+	0x63, 0x68, 0x5f, 0x72, 0x75, 0x6c, 0x65, 0x18, 0x07, 0x20, 0x01, 0x28, 0x0e, 0x32, 0x42, 0x2e,
+	0x69, 0x6f, 0x2e, 0x64, 0x65, 0x65, 0x70, 0x68, 0x61, 0x76, 0x65, 0x6e, 0x2e, 0x70, 0x72, 0x6f,
+	0x74, 0x6f, 0x2e, 0x62, 0x61, 0x63, 0x6b, 0x70, 0x6c, 0x61, 0x6e, 0x65, 0x2e, 0x67, 0x72, 0x70,
+	0x63, 0x2e, 0x41, 0x73, 0x4f, 0x66, 0x4a, 0x6f, 0x69, 0x6e, 0x54, 0x61, 0x62, 0x6c, 0x65, 0x73,
+	0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x2e, 0x4d, 0x61, 0x74, 0x63, 0x68, 0x52, 0x75, 0x6c,
+	0x65, 0x52, 0x0d, 0x61, 0x73, 0x4f, 0x66, 0x4d, 0x61, 0x74, 0x63, 0x68, 0x52, 0x75, 0x6c, 0x65,
+	0x22, 0x5d, 0x0a, 0x09, 0x4d, 0x61, 0x74, 0x63, 0x68, 0x52, 0x75, 0x6c, 0x65, 0x12, 0x13, 0x0a,
+	0x0f, 0x4c, 0x45, 0x53, 0x53, 0x5f, 0x54, 0x48, 0x41, 0x4e, 0x5f, 0x45, 0x51, 0x55, 0x41, 0x4c,
+	0x10, 0x00, 0x12, 0x0d, 0x0a, 0x09, 0x4c, 0x45, 0x53, 0x53, 0x5f, 0x54, 0x48, 0x41, 0x4e, 0x10,
+	0x01, 0x12, 0x16, 0x0a, 0x12, 0x47, 0x52, 0x45, 0x41, 0x54, 0x45, 0x52, 0x5f, 0x54, 0x48, 0x41,
+	0x4e, 0x5f, 0x45, 0x51, 0x55, 0x41, 0x4c, 0x10, 0x02, 0x12, 0x10, 0x0a, 0x0c, 0x47, 0x52, 0x45,
+	0x41, 0x54, 0x45, 0x52, 0x5f, 0x54, 0x48, 0x41, 0x4e, 0x10, 0x03, 0x1a, 0x02, 0x18, 0x01, 0x3a,
+	0x02, 0x18, 0x01, 0x22, 0xee, 0x02, 0x0a, 0x12, 0x41, 0x6a, 0x52, 0x61, 0x6a, 0x54, 0x61, 0x62,
+	0x6c, 0x65, 0x73, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x46, 0x0a, 0x09, 0x72, 0x65,
+	0x73, 0x75, 0x6c, 0x74, 0x5f, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x29, 0x2e,
+	0x69, 0x6f, 0x2e, 0x64, 0x65, 0x65, 0x70, 0x68, 0x61, 0x76, 0x65, 0x6e, 0x2e, 0x70, 0x72, 0x6f,
+	0x74, 0x6f, 0x2e, 0x62, 0x61, 0x63, 0x6b, 0x70, 0x6c, 0x61, 0x6e, 0x65, 0x2e, 0x67, 0x72, 0x70,
+	0x63, 0x2e, 0x54, 0x69, 0x63, 0x6b, 0x65, 0x74, 0x52, 0x08, 0x72, 0x65, 0x73, 0x75, 0x6c, 0x74,
+	0x49, 0x64, 0x12, 0x4a, 0x0a, 0x07, 0x6c, 0x65, 0x66, 0x74, 0x5f, 0x69, 0x64, 0x18, 0x02, 0x20,
 	0x01, 0x28, 0x0b, 0x32, 0x31, 0x2e, 0x69, 0x6f, 0x2e, 0x64, 0x65, 0x65, 0x70, 0x68, 0x61, 0x76,
 	0x65, 0x6e, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x62, 0x61, 0x63, 0x6b, 0x70, 0x6c, 0x61,
 	0x6e, 0x65, 0x2e, 0x67, 0x72, 0x70, 0x63, 0x2e, 0x54, 0x61, 0x62, 0x6c, 0x65, 0x52, 0x65, 0x66,
-	0x65, 0x72, 0x65, 0x6e, 0x63, 0x65, 0x52, 0x07, 0x72, 0x69, 0x67, 0x68, 0x74, 0x49, 0x64, 0x12,
-	0x28, 0x0a, 0x10, 0x63, 0x6f, 0x6c, 0x75, 0x6d, 0x6e, 0x73, 0x5f, 0x74, 0x6f, 0x5f, 0x6d, 0x61,
-	0x74, 0x63, 0x68, 0x18, 0x04, 0x20, 0x03, 0x28, 0x09, 0x52, 0x0e, 0x63, 0x6f, 0x6c, 0x75, 0x6d,
-	0x6e, 0x73, 0x54, 0x6f, 0x4d, 0x61, 0x74, 0x63, 0x68, 0x12, 0x24, 0x0a, 0x0e, 0x63, 0x6f, 0x6c,
-	0x75, 0x6d, 0x6e, 0x73, 0x5f, 0x74, 0x6f, 0x5f, 0x61, 0x64, 0x64, 0x18, 0x05, 0x20, 0x03, 0x28,
-	0x09, 0x52, 0x0c, 0x63, 0x6f, 0x6c, 0x75, 0x6d, 0x6e, 0x73, 0x54, 0x6f, 0x41, 0x64, 0x64, 0x12,
-	0x6b, 0x0a, 0x10, 0x61, 0x73, 0x5f, 0x6f, 0x66, 0x5f, 0x6d, 0x61, 0x74, 0x63, 0x68, 0x5f, 0x72,
-	0x75, 0x6c, 0x65, 0x18, 0x07, 0x20, 0x01, 0x28, 0x0e, 0x32, 0x42, 0x2e, 0x69, 0x6f, 0x2e, 0x64,
-	0x65, 0x65, 0x70, 0x68, 0x61, 0x76, 0x65, 0x6e, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x62,
-	0x61, 0x63, 0x6b, 0x70, 0x6c, 0x61, 0x6e, 0x65, 0x2e, 0x67, 0x72, 0x70, 0x63, 0x2e, 0x41, 0x73,
-	0x4f, 0x66, 0x4a, 0x6f, 0x69, 0x6e, 0x54, 0x61, 0x62, 0x6c, 0x65, 0x73, 0x52, 0x65, 0x71, 0x75,
-	0x65, 0x73, 0x74, 0x2e, 0x4d, 0x61, 0x74, 0x63, 0x68, 0x52, 0x75, 0x6c, 0x65, 0x52, 0x0d, 0x61,
-	0x73, 0x4f, 0x66, 0x4d, 0x61, 0x74, 0x63, 0x68, 0x52, 0x75, 0x6c, 0x65, 0x22, 0x5d, 0x0a, 0x09,
-	0x4d, 0x61, 0x74, 0x63, 0x68, 0x52, 0x75, 0x6c, 0x65, 0x12, 0x13, 0x0a, 0x0f, 0x4c, 0x45, 0x53,
-	0x53, 0x5f, 0x54, 0x48, 0x41, 0x4e, 0x5f, 0x45, 0x51, 0x55, 0x41, 0x4c, 0x10, 0x00, 0x12, 0x0d,
-	0x0a, 0x09, 0x4c, 0x45, 0x53, 0x53, 0x5f, 0x54, 0x48, 0x41, 0x4e, 0x10, 0x01, 0x12, 0x16, 0x0a,
-	0x12, 0x47, 0x52, 0x45, 0x41, 0x54, 0x45, 0x52, 0x5f, 0x54, 0x48, 0x41, 0x4e, 0x5f, 0x45, 0x51,
-	0x55, 0x41, 0x4c, 0x10, 0x02, 0x12, 0x10, 0x0a, 0x0c, 0x47, 0x52, 0x45, 0x41, 0x54, 0x45, 0x52,
-	0x5f, 0x54, 0x48, 0x41, 0x4e, 0x10, 0x03, 0x1a, 0x02, 0x18, 0x01, 0x3a, 0x02, 0x18, 0x01, 0x22,
-	0xee, 0x02, 0x0a, 0x12, 0x41, 0x6a, 0x52, 0x61, 0x6a, 0x54, 0x61, 0x62, 0x6c, 0x65, 0x73, 0x52,
-	0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x46, 0x0a, 0x09, 0x72, 0x65, 0x73, 0x75, 0x6c, 0x74,
-	0x5f, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x29, 0x2e, 0x69, 0x6f, 0x2e, 0x64,
-	0x65, 0x65, 0x70, 0x68, 0x61, 0x76, 0x65, 0x6e, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x62,
-	0x61, 0x63, 0x6b, 0x70, 0x6c, 0x61, 0x6e, 0x65, 0x2e, 0x67, 0x72, 0x70, 0x63, 0x2e, 0x54, 0x69,
-	0x63, 0x6b, 0x65, 0x74, 0x52, 0x08, 0x72, 0x65, 0x73, 0x75, 0x6c, 0x74, 0x49, 0x64, 0x12, 0x4a,
-	0x0a, 0x07, 0x6c, 0x65, 0x66, 0x74, 0x5f, 0x69, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32,
-	0x31, 0x2e, 0x69, 0x6f, 0x2e, 0x64, 0x65, 0x65, 0x70, 0x68, 0x61, 0x76, 0x65, 0x6e, 0x2e, 0x70,
-	0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x62, 0x61, 0x63, 0x6b, 0x70, 0x6c, 0x61, 0x6e, 0x65, 0x2e, 0x67,
-	0x72, 0x70, 0x63, 0x2e, 0x54, 0x61, 0x62, 0x6c, 0x65, 0x52, 0x65, 0x66, 0x65, 0x72, 0x65, 0x6e,
-	0x63, 0x65, 0x52, 0x06, 0x6c, 0x65, 0x66, 0x74, 0x49, 0x64, 0x12, 0x4c, 0x0a, 0x08, 0x72, 0x69,
-	0x67, 0x68, 0x74, 0x5f, 0x69, 0x64, 0x18, 0x03, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x31, 0x2e, 0x69,
+	0x65, 0x72, 0x65, 0x6e, 0x63, 0x65, 0x52, 0x06, 0x6c, 0x65, 0x66, 0x74, 0x49, 0x64, 0x12, 0x4c,
+	0x0a, 0x08, 0x72, 0x69, 0x67, 0x68, 0x74, 0x5f, 0x69, 0x64, 0x18, 0x03, 0x20, 0x01, 0x28, 0x0b,
+	0x32, 0x31, 0x2e, 0x69, 0x6f, 0x2e, 0x64, 0x65, 0x65, 0x70, 0x68, 0x61, 0x76, 0x65, 0x6e, 0x2e,
+	0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x62, 0x61, 0x63, 0x6b, 0x70, 0x6c, 0x61, 0x6e, 0x65, 0x2e,
+	0x67, 0x72, 0x70, 0x63, 0x2e, 0x54, 0x61, 0x62, 0x6c, 0x65, 0x52, 0x65, 0x66, 0x65, 0x72, 0x65,
+	0x6e, 0x63, 0x65, 0x52, 0x07, 0x72, 0x69, 0x67, 0x68, 0x74, 0x49, 0x64, 0x12, 0x2e, 0x0a, 0x13,
+	0x65, 0x78, 0x61, 0x63, 0x74, 0x5f, 0x6d, 0x61, 0x74, 0x63, 0x68, 0x5f, 0x63, 0x6f, 0x6c, 0x75,
+	0x6d, 0x6e, 0x73, 0x18, 0x04, 0x20, 0x03, 0x28, 0x09, 0x52, 0x11, 0x65, 0x78, 0x61, 0x63, 0x74,
+	0x4d, 0x61, 0x74, 0x63, 0x68, 0x43, 0x6f, 0x6c, 0x75, 0x6d, 0x6e, 0x73, 0x12, 0x20, 0x0a, 0x0c,
+	0x61, 0x73, 0x5f, 0x6f, 0x66, 0x5f, 0x63, 0x6f, 0x6c, 0x75, 0x6d, 0x6e, 0x18, 0x05, 0x20, 0x01,
+	0x28, 0x09, 0x52, 0x0a, 0x61, 0x73, 0x4f, 0x66, 0x43, 0x6f, 0x6c, 0x75, 0x6d, 0x6e, 0x12, 0x24,
+	0x0a, 0x0e, 0x63, 0x6f, 0x6c, 0x75, 0x6d, 0x6e, 0x73, 0x5f, 0x74, 0x6f, 0x5f, 0x61, 0x64, 0x64,
+	0x18, 0x06, 0x20, 0x03, 0x28, 0x09, 0x52, 0x0c, 0x63, 0x6f, 0x6c, 0x75, 0x6d, 0x6e, 0x73, 0x54,
+	0x6f, 0x41, 0x64, 0x64, 0x22, 0xb0, 0x01, 0x0a, 0x0e, 0x4d, 0x75, 0x6c, 0x74, 0x69, 0x4a, 0x6f,
+	0x69, 0x6e, 0x49, 0x6e, 0x70, 0x75, 0x74, 0x12, 0x4e, 0x0a, 0x09, 0x73, 0x6f, 0x75, 0x72, 0x63,
+	0x65, 0x5f, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x31, 0x2e, 0x69, 0x6f, 0x2e,
+	0x64, 0x65, 0x65, 0x70, 0x68, 0x61, 0x76, 0x65, 0x6e, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e,
+	0x62, 0x61, 0x63, 0x6b, 0x70, 0x6c, 0x61, 0x6e, 0x65, 0x2e, 0x67, 0x72, 0x70, 0x63, 0x2e, 0x54,
+	0x61, 0x62, 0x6c, 0x65, 0x52, 0x65, 0x66, 0x65, 0x72, 0x65, 0x6e, 0x63, 0x65, 0x52, 0x08, 0x73,
+	0x6f, 0x75, 0x72, 0x63, 0x65, 0x49, 0x64, 0x12, 0x28, 0x0a, 0x10, 0x63, 0x6f, 0x6c, 0x75, 0x6d,
+	0x6e, 0x73, 0x5f, 0x74, 0x6f, 0x5f, 0x6d, 0x61, 0x74, 0x63, 0x68, 0x18, 0x02, 0x20, 0x03, 0x28,
+	0x09, 0x52, 0x0e, 0x63, 0x6f, 0x6c, 0x75, 0x6d, 0x6e, 0x73, 0x54, 0x6f, 0x4d, 0x61, 0x74, 0x63,
+	0x68, 0x12, 0x24, 0x0a, 0x0e, 0x63, 0x6f, 0x6c, 0x75, 0x6d, 0x6e, 0x73, 0x5f, 0x74, 0x6f, 0x5f,
+	0x61, 0x64, 0x64, 0x18, 0x03, 0x20, 0x03, 0x28, 0x09, 0x52, 0x0c, 0x63, 0x6f, 0x6c, 0x75, 0x6d,
+	0x6e, 0x73, 0x54, 0x6f, 0x41, 0x64, 0x64, 0x22, 0xbf, 0x01, 0x0a, 0x16, 0x4d, 0x75, 0x6c, 0x74,
+	0x69, 0x4a, 0x6f, 0x69, 0x6e, 0x54, 0x61, 0x62, 0x6c, 0x65, 0x73, 0x52, 0x65, 0x71, 0x75, 0x65,
+	0x73, 0x74, 0x12, 0x46, 0x0a, 0x09, 0x72, 0x65, 0x73, 0x75, 0x6c, 0x74, 0x5f, 0x69, 0x64, 0x18,
+	0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x29, 0x2e, 0x69, 0x6f, 0x2e, 0x64, 0x65, 0x65, 0x70, 0x68,
+	0x61, 0x76, 0x65, 0x6e, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x62, 0x61, 0x63, 0x6b, 0x70,
+	0x6c, 0x61, 0x6e, 0x65, 0x2e, 0x67, 0x72, 0x70, 0x63, 0x2e, 0x54, 0x69, 0x63, 0x6b, 0x65, 0x74,
+	0x52, 0x08, 0x72, 0x65, 0x73, 0x75, 0x6c, 0x74, 0x49, 0x64, 0x12, 0x5d, 0x0a, 0x11, 0x6d, 0x75,
+	0x6c, 0x74, 0x69, 0x5f, 0x6a, 0x6f, 0x69, 0x6e, 0x5f, 0x69, 0x6e, 0x70, 0x75, 0x74, 0x73, 0x18,
+	0x02, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x31, 0x2e, 0x69, 0x6f, 0x2e, 0x64, 0x65, 0x65, 0x70, 0x68,
+	0x61, 0x76, 0x65, 0x6e, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x62, 0x61, 0x63, 0x6b, 0x70,
+	0x6c, 0x61, 0x6e, 0x65, 0x2e, 0x67, 0x72, 0x70, 0x63, 0x2e, 0x4d, 0x75, 0x6c, 0x74, 0x69, 0x4a,
+	0x6f, 0x69, 0x6e, 0x49, 0x6e, 0x70, 0x75, 0x74, 0x52, 0x0f, 0x6d, 0x75, 0x6c, 0x74, 0x69, 0x4a,
+	0x6f, 0x69, 0x6e, 0x49, 0x6e, 0x70, 0x75, 0x74, 0x73, 0x22, 0xf8, 0x07, 0x0a, 0x16, 0x52, 0x61,
+	0x6e, 0x67, 0x65, 0x4a, 0x6f, 0x69, 0x6e, 0x54, 0x61, 0x62, 0x6c, 0x65, 0x73, 0x52, 0x65, 0x71,
+	0x75, 0x65, 0x73, 0x74, 0x12, 0x46, 0x0a, 0x09, 0x72, 0x65, 0x73, 0x75, 0x6c, 0x74, 0x5f, 0x69,
+	0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x29, 0x2e, 0x69, 0x6f, 0x2e, 0x64, 0x65, 0x65,
+	0x70, 0x68, 0x61, 0x76, 0x65, 0x6e, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x62, 0x61, 0x63,
+	0x6b, 0x70, 0x6c, 0x61, 0x6e, 0x65, 0x2e, 0x67, 0x72, 0x70, 0x63, 0x2e, 0x54, 0x69, 0x63, 0x6b,
+	0x65, 0x74, 0x52, 0x08, 0x72, 0x65, 0x73, 0x75, 0x6c, 0x74, 0x49, 0x64, 0x12, 0x4a, 0x0a, 0x07,
+	0x6c, 0x65, 0x66, 0x74, 0x5f, 0x69, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x31, 0x2e,
+	0x69, 0x6f, 0x2e, 0x64, 0x65, 0x65, 0x70, 0x68, 0x61, 0x76, 0x65, 0x6e, 0x2e, 0x70, 0x72, 0x6f,
+	0x74, 0x6f, 0x2e, 0x62, 0x61, 0x63, 0x6b, 0x70, 0x6c, 0x61, 0x6e, 0x65, 0x2e, 0x67, 0x72, 0x70,
+	0x63, 0x2e, 0x54, 0x61, 0x62, 0x6c, 0x65, 0x52, 0x65, 0x66, 0x65, 0x72, 0x65, 0x6e, 0x63, 0x65,
+	0x52, 0x06, 0x6c, 0x65, 0x66, 0x74, 0x49, 0x64, 0x12, 0x4c, 0x0a, 0x08, 0x72, 0x69, 0x67, 0x68,
+	0x74, 0x5f, 0x69, 0x64, 0x18, 0x03, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x31, 0x2e, 0x69, 0x6f, 0x2e,
+	0x64, 0x65, 0x65, 0x70, 0x68, 0x61, 0x76, 0x65, 0x6e, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e,
+	0x62, 0x61, 0x63, 0x6b, 0x70, 0x6c, 0x61, 0x6e, 0x65, 0x2e, 0x67, 0x72, 0x70, 0x63, 0x2e, 0x54,
+	0x61, 0x62, 0x6c, 0x65, 0x52, 0x65, 0x66, 0x65, 0x72, 0x65, 0x6e, 0x63, 0x65, 0x52, 0x07, 0x72,
+	0x69, 0x67, 0x68, 0x74, 0x49, 0x64, 0x12, 0x2e, 0x0a, 0x13, 0x65, 0x78, 0x61, 0x63, 0x74, 0x5f,
+	0x6d, 0x61, 0x74, 0x63, 0x68, 0x5f, 0x63, 0x6f, 0x6c, 0x75, 0x6d, 0x6e, 0x73, 0x18, 0x04, 0x20,
+	0x03, 0x28, 0x09, 0x52, 0x11, 0x65, 0x78, 0x61, 0x63, 0x74, 0x4d, 0x61, 0x74, 0x63, 0x68, 0x43,
+	0x6f, 0x6c, 0x75, 0x6d, 0x6e, 0x73, 0x12, 0x2a, 0x0a, 0x11, 0x6c, 0x65, 0x66, 0x74, 0x5f, 0x73,
+	0x74, 0x61, 0x72, 0x74, 0x5f, 0x63, 0x6f, 0x6c, 0x75, 0x6d, 0x6e, 0x18, 0x05, 0x20, 0x01, 0x28,
+	0x09, 0x52, 0x0f, 0x6c, 0x65, 0x66, 0x74, 0x53, 0x74, 0x61, 0x72, 0x74, 0x43, 0x6f, 0x6c, 0x75,
+	0x6d, 0x6e, 0x12, 0x72, 0x0a, 0x10, 0x72, 0x61, 0x6e, 0x67, 0x65, 0x5f, 0x73, 0x74, 0x61, 0x72,
+	0x74, 0x5f, 0x72, 0x75, 0x6c, 0x65, 0x18, 0x06, 0x20, 0x01, 0x28, 0x0e, 0x32, 0x48, 0x2e, 0x69,
 	0x6f, 0x2e, 0x64, 0x65, 0x65, 0x70, 0x68, 0x61, 0x76, 0x65, 0x6e, 0x2e, 0x70, 0x72, 0x6f, 0x74,
 	0x6f, 0x2e, 0x62, 0x61, 0x63, 0x6b, 0x70, 0x6c, 0x61, 0x6e, 0x65, 0x2e, 0x67, 0x72, 0x70, 0x63,
-	0x2e, 0x54, 0x61, 0x62, 0x6c, 0x65, 0x52, 0x65, 0x66, 0x65, 0x72, 0x65, 0x6e, 0x63, 0x65, 0x52,
-	0x07, 0x72, 0x69, 0x67, 0x68, 0x74, 0x49, 0x64, 0x12, 0x2e, 0x0a, 0x13, 0x65, 0x78, 0x61, 0x63,
-	0x74, 0x5f, 0x6d, 0x61, 0x74, 0x63, 0x68, 0x5f, 0x63, 0x6f, 0x6c, 0x75, 0x6d, 0x6e, 0x73, 0x18,
-	0x04, 0x20, 0x03, 0x28, 0x09, 0x52, 0x11, 0x65, 0x78, 0x61, 0x63, 0x74, 0x4d, 0x61, 0x74, 0x63,
-	0x68, 0x43, 0x6f, 0x6c, 0x75, 0x6d, 0x6e, 0x73, 0x12, 0x20, 0x0a, 0x0c, 0x61, 0x73, 0x5f, 0x6f,
-	0x66, 0x5f, 0x63, 0x6f, 0x6c, 0x75, 0x6d, 0x6e, 0x18, 0x05, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0a,
-	0x61, 0x73, 0x4f, 0x66, 0x43, 0x6f, 0x6c, 0x75, 0x6d, 0x6e, 0x12, 0x24, 0x0a, 0x0e, 0x63, 0x6f,
-	0x6c, 0x75, 0x6d, 0x6e, 0x73, 0x5f, 0x74, 0x6f, 0x5f, 0x61, 0x64, 0x64, 0x18, 0x06, 0x20, 0x03,
-	0x28, 0x09, 0x52, 0x0c, 0x63, 0x6f, 0x6c, 0x75, 0x6d, 0x6e, 0x73, 0x54, 0x6f, 0x41, 0x64, 0x64,
-	0x22, 0xb0, 0x01, 0x0a, 0x0e, 0x4d, 0x75, 0x6c, 0x74, 0x69, 0x4a, 0x6f, 0x69, 0x6e, 0x49, 0x6e,
-	0x70, 0x75, 0x74, 0x12, 0x4e, 0x0a, 0x09, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x5f, 0x69, 0x64,
-	0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x31, 0x2e, 0x69, 0x6f, 0x2e, 0x64, 0x65, 0x65, 0x70,
-	0x68, 0x61, 0x76, 0x65, 0x6e, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x62, 0x61, 0x63, 0x6b,
-	0x70, 0x6c, 0x61, 0x6e, 0x65, 0x2e, 0x67, 0x72, 0x70, 0x63, 0x2e, 0x54, 0x61, 0x62, 0x6c, 0x65,
-	0x52, 0x65, 0x66, 0x65, 0x72, 0x65, 0x6e, 0x63, 0x65, 0x52, 0x08, 0x73, 0x6f, 0x75, 0x72, 0x63,
-	0x65, 0x49, 0x64, 0x12, 0x28, 0x0a, 0x10, 0x63, 0x6f, 0x6c, 0x75, 0x6d, 0x6e, 0x73, 0x5f, 0x74,
-	0x6f, 0x5f, 0x6d, 0x61, 0x74, 0x63, 0x68, 0x18, 0x02, 0x20, 0x03, 0x28, 0x09, 0x52, 0x0e, 0x63,
-	0x6f, 0x6c, 0x75, 0x6d, 0x6e, 0x73, 0x54, 0x6f, 0x4d, 0x61, 0x74, 0x63, 0x68, 0x12, 0x24, 0x0a,
-	0x0e, 0x63, 0x6f, 0x6c, 0x75, 0x6d, 0x6e, 0x73, 0x5f, 0x74, 0x6f, 0x5f, 0x61, 0x64, 0x64, 0x18,
-	0x03, 0x20, 0x03, 0x28, 0x09, 0x52, 0x0c, 0x63, 0x6f, 0x6c, 0x75, 0x6d, 0x6e, 0x73, 0x54, 0x6f,
-	0x41, 0x64, 0x64, 0x22, 0xbf, 0x01, 0x0a, 0x16, 0x4d, 0x75, 0x6c, 0x74, 0x69, 0x4a, 0x6f, 0x69,
-	0x6e, 0x54, 0x61, 0x62, 0x6c, 0x65, 0x73, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x46,
+	0x2e, 0x52, 0x61, 0x6e, 0x67, 0x65, 0x4a, 0x6f, 0x69, 0x6e, 0x54, 0x61, 0x62, 0x6c, 0x65, 0x73,
+	0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x2e, 0x52, 0x61, 0x6e, 0x67, 0x65, 0x53, 0x74, 0x61,
+	0x72, 0x74, 0x52, 0x75, 0x6c, 0x65, 0x52, 0x0e, 0x72, 0x61, 0x6e, 0x67, 0x65, 0x53, 0x74, 0x61,
+	0x72, 0x74, 0x52, 0x75, 0x6c, 0x65, 0x12, 0x2c, 0x0a, 0x12, 0x72, 0x69, 0x67, 0x68, 0x74, 0x5f,
+	0x72, 0x61, 0x6e, 0x67, 0x65, 0x5f, 0x63, 0x6f, 0x6c, 0x75, 0x6d, 0x6e, 0x18, 0x07, 0x20, 0x01,
+	0x28, 0x09, 0x52, 0x10, 0x72, 0x69, 0x67, 0x68, 0x74, 0x52, 0x61, 0x6e, 0x67, 0x65, 0x43, 0x6f,
+	0x6c, 0x75, 0x6d, 0x6e, 0x12, 0x6c, 0x0a, 0x0e, 0x72, 0x61, 0x6e, 0x67, 0x65, 0x5f, 0x65, 0x6e,
+	0x64, 0x5f, 0x72, 0x75, 0x6c, 0x65, 0x18, 0x08, 0x20, 0x01, 0x28, 0x0e, 0x32, 0x46, 0x2e, 0x69,
+	0x6f, 0x2e, 0x64, 0x65, 0x65, 0x70, 0x68, 0x61, 0x76, 0x65, 0x6e, 0x2e, 0x70, 0x72, 0x6f, 0x74,
+	0x6f, 0x2e, 0x62, 0x61, 0x63, 0x6b, 0x70, 0x6c, 0x61, 0x6e, 0x65, 0x2e, 0x67, 0x72, 0x70, 0x63,
+	0x2e, 0x52, 0x61, 0x6e, 0x67, 0x65, 0x4a, 0x6f, 0x69, 0x6e, 0x54, 0x61, 0x62, 0x6c, 0x65, 0x73,
+	0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x2e, 0x52, 0x61, 0x6e, 0x67, 0x65, 0x45, 0x6e, 0x64,
+	0x52, 0x75, 0x6c, 0x65, 0x52, 0x0c, 0x72, 0x61, 0x6e, 0x67, 0x65, 0x45, 0x6e, 0x64, 0x52, 0x75,
+	0x6c, 0x65, 0x12, 0x26, 0x0a, 0x0f, 0x6c, 0x65, 0x66, 0x74, 0x5f, 0x65, 0x6e, 0x64, 0x5f, 0x63,
+	0x6f, 0x6c, 0x75, 0x6d, 0x6e, 0x18, 0x09, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0d, 0x6c, 0x65, 0x66,
+	0x74, 0x45, 0x6e, 0x64, 0x43, 0x6f, 0x6c, 0x75, 0x6d, 0x6e, 0x12, 0x52, 0x0a, 0x0c, 0x61, 0x67,
+	0x67, 0x72, 0x65, 0x67, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x18, 0x0a, 0x20, 0x03, 0x28, 0x0b,
+	0x32, 0x2e, 0x2e, 0x69, 0x6f, 0x2e, 0x64, 0x65, 0x65, 0x70, 0x68, 0x61, 0x76, 0x65, 0x6e, 0x2e,
+	0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x62, 0x61, 0x63, 0x6b, 0x70, 0x6c, 0x61, 0x6e, 0x65, 0x2e,
+	0x67, 0x72, 0x70, 0x63, 0x2e, 0x41, 0x67, 0x67, 0x72, 0x65, 0x67, 0x61, 0x74, 0x69, 0x6f, 0x6e,
+	0x52, 0x0c, 0x61, 0x67, 0x67, 0x72, 0x65, 0x67, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x12, 0x1f,
+	0x0a, 0x0b, 0x72, 0x61, 0x6e, 0x67, 0x65, 0x5f, 0x6d, 0x61, 0x74, 0x63, 0x68, 0x18, 0x0b, 0x20,
+	0x01, 0x28, 0x09, 0x52, 0x0a, 0x72, 0x61, 0x6e, 0x67, 0x65, 0x4d, 0x61, 0x74, 0x63, 0x68, 0x22,
+	0x76, 0x0a, 0x0e, 0x52, 0x61, 0x6e, 0x67, 0x65, 0x53, 0x74, 0x61, 0x72, 0x74, 0x52, 0x75, 0x6c,
+	0x65, 0x12, 0x15, 0x0a, 0x11, 0x53, 0x54, 0x41, 0x52, 0x54, 0x5f, 0x55, 0x4e, 0x53, 0x50, 0x45,
+	0x43, 0x49, 0x46, 0x49, 0x45, 0x44, 0x10, 0x00, 0x12, 0x0d, 0x0a, 0x09, 0x4c, 0x45, 0x53, 0x53,
+	0x5f, 0x54, 0x48, 0x41, 0x4e, 0x10, 0x01, 0x12, 0x16, 0x0a, 0x12, 0x4c, 0x45, 0x53, 0x53, 0x5f,
+	0x54, 0x48, 0x41, 0x4e, 0x5f, 0x4f, 0x52, 0x5f, 0x45, 0x51, 0x55, 0x41, 0x4c, 0x10, 0x02, 0x12,
+	0x26, 0x0a, 0x22, 0x4c, 0x45, 0x53, 0x53, 0x5f, 0x54, 0x48, 0x41, 0x4e, 0x5f, 0x4f, 0x52, 0x5f,
+	0x45, 0x51, 0x55, 0x41, 0x4c, 0x5f, 0x41, 0x4c, 0x4c, 0x4f, 0x57, 0x5f, 0x50, 0x52, 0x45, 0x43,
+	0x45, 0x44, 0x49, 0x4e, 0x47, 0x10, 0x03, 0x22, 0x7b, 0x0a, 0x0c, 0x52, 0x61, 0x6e, 0x67, 0x65,
+	0x45, 0x6e, 0x64, 0x52, 0x75, 0x6c, 0x65, 0x12, 0x13, 0x0a, 0x0f, 0x45, 0x4e, 0x44, 0x5f, 0x55,
+	0x4e, 0x53, 0x50, 0x45, 0x43, 0x49, 0x46, 0x49, 0x45, 0x44, 0x10, 0x00, 0x12, 0x10, 0x0a, 0x0c,
+	0x47, 0x52, 0x45, 0x41, 0x54, 0x45, 0x52, 0x5f, 0x54, 0x48, 0x41, 0x4e, 0x10, 0x01, 0x12, 0x19,
+	0x0a, 0x15, 0x47, 0x52, 0x45, 0x41, 0x54, 0x45, 0x52, 0x5f, 0x54, 0x48, 0x41, 0x4e, 0x5f, 0x4f,
+	0x52, 0x5f, 0x45, 0x51, 0x55, 0x41, 0x4c, 0x10, 0x02, 0x12, 0x29, 0x0a, 0x25, 0x47, 0x52, 0x45,
+	0x41, 0x54, 0x45, 0x52, 0x5f, 0x54, 0x48, 0x41, 0x4e, 0x5f, 0x4f, 0x52, 0x5f, 0x45, 0x51, 0x55,
+	0x41, 0x4c, 0x5f, 0x41, 0x4c, 0x4c, 0x4f, 0x57, 0x5f, 0x46, 0x4f, 0x4c, 0x4c, 0x4f, 0x57, 0x49,
+	0x4e, 0x47, 0x10, 0x03, 0x22, 0xef, 0x05, 0x0a, 0x15, 0x43, 0x6f, 0x6d, 0x62, 0x6f, 0x41, 0x67,
+	0x67, 0x72, 0x65, 0x67, 0x61, 0x74, 0x65, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x46,
 	0x0a, 0x09, 0x72, 0x65, 0x73, 0x75, 0x6c, 0x74, 0x5f, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28,
 	0x0b, 0x32, 0x29, 0x2e, 0x69, 0x6f, 0x2e, 0x64, 0x65, 0x65, 0x70, 0x68, 0x61, 0x76, 0x65, 0x6e,
 	0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x62, 0x61, 0x63, 0x6b, 0x70, 0x6c, 0x61, 0x6e, 0x65,
 	0x2e, 0x67, 0x72, 0x70, 0x63, 0x2e, 0x54, 0x69, 0x63, 0x6b, 0x65, 0x74, 0x52, 0x08, 0x72, 0x65,
-	0x73, 0x75, 0x6c, 0x74, 0x49, 0x64, 0x12, 0x5d, 0x0a, 0x11, 0x6d, 0x75, 0x6c, 0x74, 0x69, 0x5f,
-	0x6a, 0x6f, 0x69, 0x6e, 0x5f, 0x69, 0x6e, 0x70, 0x75, 0x74, 0x73, 0x18, 0x02, 0x20, 0x03, 0x28,
-	0x0b, 0x32, 0x31, 0x2e, 0x69, 0x6f, 0x2e, 0x64, 0x65, 0x65, 0x70, 0x68, 0x61, 0x76, 0x65, 0x6e,
+	0x73, 0x75, 0x6c, 0x74, 0x49, 0x64, 0x12, 0x4e, 0x0a, 0x09, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65,
+	0x5f, 0x69, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x31, 0x2e, 0x69, 0x6f, 0x2e, 0x64,
+	0x65, 0x65, 0x70, 0x68, 0x61, 0x76, 0x65, 0x6e, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x62,
+	0x61, 0x63, 0x6b, 0x70, 0x6c, 0x61, 0x6e, 0x65, 0x2e, 0x67, 0x72, 0x70, 0x63, 0x2e, 0x54, 0x61,
+	0x62, 0x6c, 0x65, 0x52, 0x65, 0x66, 0x65, 0x72, 0x65, 0x6e, 0x63, 0x65, 0x52, 0x08, 0x73, 0x6f,
+	0x75, 0x72, 0x63, 0x65, 0x49, 0x64, 0x12, 0x62, 0x0a, 0x0a, 0x61, 0x67, 0x67, 0x72, 0x65, 0x67,
+	0x61, 0x74, 0x65, 0x73, 0x18, 0x03, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x42, 0x2e, 0x69, 0x6f, 0x2e,
+	0x64, 0x65, 0x65, 0x70, 0x68, 0x61, 0x76, 0x65, 0x6e, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e,
+	0x62, 0x61, 0x63, 0x6b, 0x70, 0x6c, 0x61, 0x6e, 0x65, 0x2e, 0x67, 0x72, 0x70, 0x63, 0x2e, 0x43,
+	0x6f, 0x6d, 0x62, 0x6f, 0x41, 0x67, 0x67, 0x72, 0x65, 0x67, 0x61, 0x74, 0x65, 0x52, 0x65, 0x71,
+	0x75, 0x65, 0x73, 0x74, 0x2e, 0x41, 0x67, 0x67, 0x72, 0x65, 0x67, 0x61, 0x74, 0x65, 0x52, 0x0a,
+	0x61, 0x67, 0x67, 0x72, 0x65, 0x67, 0x61, 0x74, 0x65, 0x73, 0x12, 0x28, 0x0a, 0x10, 0x67, 0x72,
+	0x6f, 0x75, 0x70, 0x5f, 0x62, 0x79, 0x5f, 0x63, 0x6f, 0x6c, 0x75, 0x6d, 0x6e, 0x73, 0x18, 0x04,
+	0x20, 0x03, 0x28, 0x09, 0x52, 0x0e, 0x67, 0x72, 0x6f, 0x75, 0x70, 0x42, 0x79, 0x43, 0x6f, 0x6c,
+	0x75, 0x6d, 0x6e, 0x73, 0x12, 0x1f, 0x0a, 0x0b, 0x66, 0x6f, 0x72, 0x63, 0x65, 0x5f, 0x63, 0x6f,
+	0x6d, 0x62, 0x6f, 0x18, 0x05, 0x20, 0x01, 0x28, 0x08, 0x52, 0x0a, 0x66, 0x6f, 0x72, 0x63, 0x65,
+	0x43, 0x6f, 0x6d, 0x62, 0x6f, 0x1a, 0xe2, 0x01, 0x0a, 0x09, 0x41, 0x67, 0x67, 0x72, 0x65, 0x67,
+	0x61, 0x74, 0x65, 0x12, 0x54, 0x0a, 0x04, 0x74, 0x79, 0x70, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28,
+	0x0e, 0x32, 0x40, 0x2e, 0x69, 0x6f, 0x2e, 0x64, 0x65, 0x65, 0x70, 0x68, 0x61, 0x76, 0x65, 0x6e,
 	0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x62, 0x61, 0x63, 0x6b, 0x70, 0x6c, 0x61, 0x6e, 0x65,
-	0x2e, 0x67, 0x72, 0x70, 0x63, 0x2e, 0x4d, 0x75, 0x6c, 0x74, 0x69, 0x4a, 0x6f, 0x69, 0x6e, 0x49,
-	0x6e, 0x70, 0x75, 0x74, 0x52, 0x0f, 0x6d, 0x75, 0x6c, 0x74, 0x69, 0x4a, 0x6f, 0x69, 0x6e, 0x49,
-	0x6e, 0x70, 0x75, 0x74, 0x73, 0x22, 0xf8, 0x07, 0x0a, 0x16, 0x52, 0x61, 0x6e, 0x67, 0x65, 0x4a,
-	0x6f, 0x69, 0x6e, 0x54, 0x61, 0x62, 0x6c, 0x65, 0x73, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74,
-	0x12, 0x46, 0x0a, 0x09, 0x72, 0x65, 0x73, 0x75, 0x6c, 0x74, 0x5f, 0x69, 0x64, 0x18, 0x01, 0x20,
-	0x01, 0x28, 0x0b, 0x32, 0x29, 0x2e, 0x69, 0x6f, 0x2e, 0x64, 0x65, 0x65, 0x70, 0x68, 0x61, 0x76,
-	0x65, 0x6e, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x62, 0x61, 0x63, 0x6b, 0x70, 0x6c, 0x61,
-	0x6e, 0x65, 0x2e, 0x67, 0x72, 0x70, 0x63, 0x2e, 0x54, 0x69, 0x63, 0x6b, 0x65, 0x74, 0x52, 0x08,
-	0x72, 0x65, 0x73, 0x75, 0x6c, 0x74, 0x49, 0x64, 0x12, 0x4a, 0x0a, 0x07, 0x6c, 0x65, 0x66, 0x74,
+	0x2e, 0x67, 0x72, 0x70, 0x63, 0x2e, 0x43, 0x6f, 0x6d, 0x62, 0x6f, 0x41, 0x67, 0x67, 0x72, 0x65,
+	0x67, 0x61, 0x74, 0x65, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x2e, 0x41, 0x67, 0x67, 0x54,
+	0x79, 0x70, 0x65, 0x52, 0x04, 0x74, 0x79, 0x70, 0x65, 0x12, 0x1f, 0x0a, 0x0b, 0x6d, 0x61, 0x74,
+	0x63, 0x68, 0x5f, 0x70, 0x61, 0x69, 0x72, 0x73, 0x18, 0x02, 0x20, 0x03, 0x28, 0x09, 0x52, 0x0a,
+	0x6d, 0x61, 0x74, 0x63, 0x68, 0x50, 0x61, 0x69, 0x72, 0x73, 0x12, 0x1f, 0x0a, 0x0b, 0x63, 0x6f,
+	0x6c, 0x75, 0x6d, 0x6e, 0x5f, 0x6e, 0x61, 0x6d, 0x65, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x52,
+	0x0a, 0x63, 0x6f, 0x6c, 0x75, 0x6d, 0x6e, 0x4e, 0x61, 0x6d, 0x65, 0x12, 0x1e, 0x0a, 0x0a, 0x70,
+	0x65, 0x72, 0x63, 0x65, 0x6e, 0x74, 0x69, 0x6c, 0x65, 0x18, 0x04, 0x20, 0x01, 0x28, 0x01, 0x52,
+	0x0a, 0x70, 0x65, 0x72, 0x63, 0x65, 0x6e, 0x74, 0x69, 0x6c, 0x65, 0x12, 0x1d, 0x0a, 0x0a, 0x61,
+	0x76, 0x67, 0x5f, 0x6d, 0x65, 0x64, 0x69, 0x61, 0x6e, 0x18, 0x05, 0x20, 0x01, 0x28, 0x08, 0x52,
+	0x09, 0x61, 0x76, 0x67, 0x4d, 0x65, 0x64, 0x69, 0x61, 0x6e, 0x22, 0xa5, 0x01, 0x0a, 0x07, 0x41,
+	0x67, 0x67, 0x54, 0x79, 0x70, 0x65, 0x12, 0x07, 0x0a, 0x03, 0x53, 0x55, 0x4d, 0x10, 0x00, 0x12,
+	0x0b, 0x0a, 0x07, 0x41, 0x42, 0x53, 0x5f, 0x53, 0x55, 0x4d, 0x10, 0x01, 0x12, 0x09, 0x0a, 0x05,
+	0x47, 0x52, 0x4f, 0x55, 0x50, 0x10, 0x02, 0x12, 0x07, 0x0a, 0x03, 0x41, 0x56, 0x47, 0x10, 0x03,
+	0x12, 0x09, 0x0a, 0x05, 0x43, 0x4f, 0x55, 0x4e, 0x54, 0x10, 0x04, 0x12, 0x09, 0x0a, 0x05, 0x46,
+	0x49, 0x52, 0x53, 0x54, 0x10, 0x05, 0x12, 0x08, 0x0a, 0x04, 0x4c, 0x41, 0x53, 0x54, 0x10, 0x06,
+	0x12, 0x07, 0x0a, 0x03, 0x4d, 0x49, 0x4e, 0x10, 0x07, 0x12, 0x07, 0x0a, 0x03, 0x4d, 0x41, 0x58,
+	0x10, 0x08, 0x12, 0x0a, 0x0a, 0x06, 0x4d, 0x45, 0x44, 0x49, 0x41, 0x4e, 0x10, 0x09, 0x12, 0x0e,
+	0x0a, 0x0a, 0x50, 0x45, 0x52, 0x43, 0x45, 0x4e, 0x54, 0x49, 0x4c, 0x45, 0x10, 0x0a, 0x12, 0x07,
+	0x0a, 0x03, 0x53, 0x54, 0x44, 0x10, 0x0b, 0x12, 0x07, 0x0a, 0x03, 0x56, 0x41, 0x52, 0x10, 0x0c,
+	0x12, 0x10, 0x0a, 0x0c, 0x57, 0x45, 0x49, 0x47, 0x48, 0x54, 0x45, 0x44, 0x5f, 0x41, 0x56, 0x47,
+	0x10, 0x0d, 0x3a, 0x02, 0x18, 0x01, 0x22, 0x97, 0x02, 0x0a, 0x13, 0x41, 0x67, 0x67, 0x72, 0x65,
+	0x67, 0x61, 0x74, 0x65, 0x41, 0x6c, 0x6c, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x46,
+	0x0a, 0x09, 0x72, 0x65, 0x73, 0x75, 0x6c, 0x74, 0x5f, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28,
+	0x0b, 0x32, 0x29, 0x2e, 0x69, 0x6f, 0x2e, 0x64, 0x65, 0x65, 0x70, 0x68, 0x61, 0x76, 0x65, 0x6e,
+	0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x62, 0x61, 0x63, 0x6b, 0x70, 0x6c, 0x61, 0x6e, 0x65,
+	0x2e, 0x67, 0x72, 0x70, 0x63, 0x2e, 0x54, 0x69, 0x63, 0x6b, 0x65, 0x74, 0x52, 0x08, 0x72, 0x65,
+	0x73, 0x75, 0x6c, 0x74, 0x49, 0x64, 0x12, 0x4e, 0x0a, 0x09, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65,
 	0x5f, 0x69, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x31, 0x2e, 0x69, 0x6f, 0x2e, 0x64,
 	0x65, 0x65, 0x70, 0x68, 0x61, 0x76, 0x65, 0x6e, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x62,
 	0x61, 0x63, 0x6b, 0x70, 0x6c, 0x61, 0x6e, 0x65, 0x2e, 0x67, 0x72, 0x70, 0x63, 0x2e, 0x54, 0x61,
-	0x62, 0x6c, 0x65, 0x52, 0x65, 0x66, 0x65, 0x72, 0x65, 0x6e, 0x63, 0x65, 0x52, 0x06, 0x6c, 0x65,
-	0x66, 0x74, 0x49, 0x64, 0x12, 0x4c, 0x0a, 0x08, 0x72, 0x69, 0x67, 0x68, 0x74, 0x5f, 0x69, 0x64,
-	0x18, 0x03, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x31, 0x2e, 0x69, 0x6f, 0x2e, 0x64, 0x65, 0x65, 0x70,
-	0x68, 0x61, 0x76, 0x65, 0x6e, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x62, 0x61, 0x63, 0x6b,
-	0x70, 0x6c, 0x61, 0x6e, 0x65, 0x2e, 0x67, 0x72, 0x70, 0x63, 0x2e, 0x54, 0x61, 0x62, 0x6c, 0x65,
-	0x52, 0x65, 0x66, 0x65, 0x72, 0x65, 0x6e, 0x63, 0x65, 0x52, 0x07, 0x72, 0x69, 0x67, 0x68, 0x74,
-	0x49, 0x64, 0x12, 0x2e, 0x0a, 0x13, 0x65, 0x78, 0x61, 0x63, 0x74, 0x5f, 0x6d, 0x61, 0x74, 0x63,
-	0x68, 0x5f, 0x63, 0x6f, 0x6c, 0x75, 0x6d, 0x6e, 0x73, 0x18, 0x04, 0x20, 0x03, 0x28, 0x09, 0x52,
-	0x11, 0x65, 0x78, 0x61, 0x63, 0x74, 0x4d, 0x61, 0x74, 0x63, 0x68, 0x43, 0x6f, 0x6c, 0x75, 0x6d,
-	0x6e, 0x73, 0x12, 0x2a, 0x0a, 0x11, 0x6c, 0x65, 0x66, 0x74, 0x5f, 0x73, 0x74, 0x61, 0x72, 0x74,
-	0x5f, 0x63, 0x6f, 0x6c, 0x75, 0x6d, 0x6e, 0x18, 0x05, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0f, 0x6c,
-	0x65, 0x66, 0x74, 0x53, 0x74, 0x61, 0x72, 0x74, 0x43, 0x6f, 0x6c, 0x75, 0x6d, 0x6e, 0x12, 0x72,
-	0x0a, 0x10, 0x72, 0x61, 0x6e, 0x67, 0x65, 0x5f, 0x73, 0x74, 0x61, 0x72, 0x74, 0x5f, 0x72, 0x75,
-	0x6c, 0x65, 0x18, 0x06, 0x20, 0x01, 0x28, 0x0e, 0x32, 0x48, 0x2e, 0x69, 0x6f, 0x2e, 0x64, 0x65,
-	0x65, 0x70, 0x68, 0x61, 0x76, 0x65, 0x6e, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x62, 0x61,
-	0x63, 0x6b, 0x70, 0x6c, 0x61, 0x6e, 0x65, 0x2e, 0x67, 0x72, 0x70, 0x63, 0x2e, 0x52, 0x61, 0x6e,
-	0x67, 0x65, 0x4a, 0x6f, 0x69, 0x6e, 0x54, 0x61, 0x62, 0x6c, 0x65, 0x73, 0x52, 0x65, 0x71, 0x75,
-	0x65, 0x73, 0x74, 0x2e, 0x52, 0x61, 0x6e, 0x67, 0x65, 0x53, 0x74, 0x61, 0x72, 0x74, 0x52, 0x75,
-	0x6c, 0x65, 0x52, 0x0e, 0x72, 0x61, 0x6e, 0x67, 0x65, 0x53, 0x74, 0x61, 0x72, 0x74, 0x52, 0x75,
-	0x6c, 0x65, 0x12, 0x2c, 0x0a, 0x12, 0x72, 0x69, 0x67, 0x68, 0x74, 0x5f, 0x72, 0x61, 0x6e, 0x67,
-	0x65, 0x5f, 0x63, 0x6f, 0x6c, 0x75, 0x6d, 0x6e, 0x18, 0x07, 0x20, 0x01, 0x28, 0x09, 0x52, 0x10,
-	0x72, 0x69, 0x67, 0x68, 0x74, 0x52, 0x61, 0x6e, 0x67, 0x65, 0x43, 0x6f, 0x6c, 0x75, 0x6d, 0x6e,
-	0x12, 0x6c, 0x0a, 0x0e, 0x72, 0x61, 0x6e, 0x67, 0x65, 0x5f, 0x65, 0x6e, 0x64, 0x5f, 0x72, 0x75,
-	0x6c, 0x65, 0x18, 0x08, 0x20, 0x01, 0x28, 0x0e, 0x32, 0x46, 0x2e, 0x69, 0x6f, 0x2e, 0x64, 0x65,
-	0x65, 0x70, 0x68, 0x61, 0x76, 0x65, 0x6e, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x62, 0x61,
-	0x63, 0x6b, 0x70, 0x6c, 0x61, 0x6e, 0x65, 0x2e, 0x67, 0x72, 0x70, 0x63, 0x2e, 0x52, 0x61, 0x6e,
-	0x67, 0x65, 0x4a, 0x6f, 0x69, 0x6e, 0x54, 0x61, 0x62, 0x6c, 0x65, 0x73, 0x52, 0x65, 0x71, 0x75,
-	0x65, 0x73, 0x74, 0x2e, 0x52, 0x61, 0x6e, 0x67, 0x65, 0x45, 0x6e, 0x64, 0x52, 0x75, 0x6c, 0x65,
-	0x52, 0x0c, 0x72, 0x61, 0x6e, 0x67, 0x65, 0x45, 0x6e, 0x64, 0x52, 0x75, 0x6c, 0x65, 0x12, 0x26,
-	0x0a, 0x0f, 0x6c, 0x65, 0x66, 0x74, 0x5f, 0x65, 0x6e, 0x64, 0x5f, 0x63, 0x6f, 0x6c, 0x75, 0x6d,
-	0x6e, 0x18, 0x09, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0d, 0x6c, 0x65, 0x66, 0x74, 0x45, 0x6e, 0x64,
-	0x43, 0x6f, 0x6c, 0x75, 0x6d, 0x6e, 0x12, 0x52, 0x0a, 0x0c, 0x61, 0x67, 0x67, 0x72, 0x65, 0x67,
-	0x61, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x18, 0x0a, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x2e, 0x2e, 0x69,
-	0x6f, 0x2e, 0x64, 0x65, 0x65, 0x70, 0x68, 0x61, 0x76, 0x65, 0x6e, 0x2e, 0x70, 0x72, 0x6f, 0x74,
-	0x6f, 0x2e, 0x62, 0x61, 0x63, 0x6b, 0x70, 0x6c, 0x61, 0x6e, 0x65, 0x2e, 0x67, 0x72, 0x70, 0x63,
-	0x2e, 0x41, 0x67, 0x67, 0x72, 0x65, 0x67, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x52, 0x0c, 0x61, 0x67,
-	0x67, 0x72, 0x65, 0x67, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x12, 0x1f, 0x0a, 0x0b, 0x72, 0x61,
-	0x6e, 0x67, 0x65, 0x5f, 0x6d, 0x61, 0x74, 0x63, 0x68, 0x18, 0x0b, 0x20, 0x01, 0x28, 0x09, 0x52,
-	0x0a, 0x72, 0x61, 0x6e, 0x67, 0x65, 0x4d, 0x61, 0x74, 0x63, 0x68, 0x22, 0x76, 0x0a, 0x0e, 0x52,
-	0x61, 0x6e, 0x67, 0x65, 0x53, 0x74, 0x61, 0x72, 0x74, 0x52, 0x75, 0x6c, 0x65, 0x12, 0x15, 0x0a,
-	0x11, 0x53, 0x54, 0x41, 0x52, 0x54, 0x5f, 0x55, 0x4e, 0x53, 0x50, 0x45, 0x43, 0x49, 0x46, 0x49,
-	0x45, 0x44, 0x10, 0x00, 0x12, 0x0d, 0x0a, 0x09, 0x4c, 0x45, 0x53, 0x53, 0x5f, 0x54, 0x48, 0x41,
-	0x4e, 0x10, 0x01, 0x12, 0x16, 0x0a, 0x12, 0x4c, 0x45, 0x53, 0x53, 0x5f, 0x54, 0x48, 0x41, 0x4e,
-	0x5f, 0x4f, 0x52, 0x5f, 0x45, 0x51, 0x55, 0x41, 0x4c, 0x10, 0x02, 0x12, 0x26, 0x0a, 0x22, 0x4c,
-	0x45, 0x53, 0x53, 0x5f, 0x54, 0x48, 0x41, 0x4e, 0x5f, 0x4f, 0x52, 0x5f, 0x45, 0x51, 0x55, 0x41,
-	0x4c, 0x5f, 0x41, 0x4c, 0x4c, 0x4f, 0x57, 0x5f, 0x50, 0x52, 0x45, 0x43, 0x45, 0x44, 0x49, 0x4e,
-	0x47, 0x10, 0x03, 0x22, 0x7b, 0x0a, 0x0c, 0x52, 0x61, 0x6e, 0x67, 0x65, 0x45, 0x6e, 0x64, 0x52,
-	0x75, 0x6c, 0x65, 0x12, 0x13, 0x0a, 0x0f, 0x45, 0x4e, 0x44, 0x5f, 0x55, 0x4e, 0x53, 0x50, 0x45,
-	0x43, 0x49, 0x46, 0x49, 0x45, 0x44, 0x10, 0x00, 0x12, 0x10, 0x0a, 0x0c, 0x47, 0x52, 0x45, 0x41,
-	0x54, 0x45, 0x52, 0x5f, 0x54, 0x48, 0x41, 0x4e, 0x10, 0x01, 0x12, 0x19, 0x0a, 0x15, 0x47, 0x52,
-	0x45, 0x41, 0x54, 0x45, 0x52, 0x5f, 0x54, 0x48, 0x41, 0x4e, 0x5f, 0x4f, 0x52, 0x5f, 0x45, 0x51,
-	0x55, 0x41, 0x4c, 0x10, 0x02, 0x12, 0x29, 0x0a, 0x25, 0x47, 0x52, 0x45, 0x41, 0x54, 0x45, 0x52,
-	0x5f, 0x54, 0x48, 0x41, 0x4e, 0x5f, 0x4f, 0x52, 0x5f, 0x45, 0x51, 0x55, 0x41, 0x4c, 0x5f, 0x41,
-	0x4c, 0x4c, 0x4f, 0x57, 0x5f, 0x46, 0x4f, 0x4c, 0x4c, 0x4f, 0x57, 0x49, 0x4e, 0x47, 0x10, 0x03,
-	0x22, 0xef, 0x05, 0x0a, 0x15, 0x43, 0x6f, 0x6d, 0x62, 0x6f, 0x41, 0x67, 0x67, 0x72, 0x65, 0x67,
-	0x61, 0x74, 0x65, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x46, 0x0a, 0x09, 0x72, 0x65,
-	0x73, 0x75, 0x6c, 0x74, 0x5f, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x29, 0x2e,
-	0x69, 0x6f, 0x2e, 0x64, 0x65, 0x65, 0x70, 0x68, 0x61, 0x76, 0x65, 0x6e, 0x2e, 0x70, 0x72, 0x6f,
-	0x74, 0x6f, 0x2e, 0x62, 0x61, 0x63, 0x6b, 0x70, 0x6c, 0x61, 0x6e, 0x65, 0x2e, 0x67, 0x72, 0x70,
-	0x63, 0x2e, 0x54, 0x69, 0x63, 0x6b, 0x65, 0x74, 0x52, 0x08, 0x72, 0x65, 0x73, 0x75, 0x6c, 0x74,
-	0x49, 0x64, 0x12, 0x4e, 0x0a, 0x09, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x5f, 0x69, 0x64, 0x18,
-	0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x31, 0x2e, 0x69, 0x6f, 0x2e, 0x64, 0x65, 0x65, 0x70, 0x68,
-	0x61, 0x76, 0x65, 0x6e, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x62, 0x61, 0x63, 0x6b, 0x70,
-	0x6c, 0x61, 0x6e, 0x65, 0x2e, 0x67, 0x72, 0x70, 0x63, 0x2e, 0x54, 0x61, 0x62, 0x6c, 0x65, 0x52,
-	0x65, 0x66, 0x65, 0x72, 0x65, 0x6e, 0x63, 0x65, 0x52, 0x08, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65,
-	0x49, 0x64, 0x12, 0x62, 0x0a, 0x0a, 0x61, 0x67, 0x67, 0x72, 0x65, 0x67, 0x61, 0x74, 0x65, 0x73,
-	0x18, 0x03, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x42, 0x2e, 0x69, 0x6f, 0x2e, 0x64, 0x65, 0x65, 0x70,
-	0x68, 0x61, 0x76, 0x65, 0x6e, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x62, 0x61, 0x63, 0x6b,
-	0x70, 0x6c, 0x61, 0x6e, 0x65, 0x2e, 0x67, 0x72, 0x70, 0x63, 0x2e, 0x43, 0x6f, 0x6d, 0x62, 0x6f,
-	0x41, 0x67, 0x67, 0x72, 0x65, 0x67, 0x61, 0x74, 0x65, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74,
-	0x2e, 0x41, 0x67, 0x67, 0x72, 0x65, 0x67, 0x61, 0x74, 0x65, 0x52, 0x0a, 0x61, 0x67, 0x67, 0x72,
-	0x65, 0x67, 0x61, 0x74, 0x65, 0x73, 0x12, 0x28, 0x0a, 0x10, 0x67, 0x72, 0x6f, 0x75, 0x70, 0x5f,
+	0x62, 0x6c, 0x65, 0x52, 0x65, 0x66, 0x65, 0x72, 0x65, 0x6e, 0x63, 0x65, 0x52, 0x08, 0x73, 0x6f,
+	0x75, 0x72, 0x63, 0x65, 0x49, 0x64, 0x12, 0x3e, 0x0a, 0x04, 0x73, 0x70, 0x65, 0x63, 0x18, 0x03,
+	0x20, 0x01, 0x28, 0x0b, 0x32, 0x2a, 0x2e, 0x69, 0x6f, 0x2e, 0x64, 0x65, 0x65, 0x70, 0x68, 0x61,
+	0x76, 0x65, 0x6e, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x62, 0x61, 0x63, 0x6b, 0x70, 0x6c,
+	0x61, 0x6e, 0x65, 0x2e, 0x67, 0x72, 0x70, 0x63, 0x2e, 0x41, 0x67, 0x67, 0x53, 0x70, 0x65, 0x63,
+	0x52, 0x04, 0x73, 0x70, 0x65, 0x63, 0x12, 0x28, 0x0a, 0x10, 0x67, 0x72, 0x6f, 0x75, 0x70, 0x5f,
 	0x62, 0x79, 0x5f, 0x63, 0x6f, 0x6c, 0x75, 0x6d, 0x6e, 0x73, 0x18, 0x04, 0x20, 0x03, 0x28, 0x09,
 	0x52, 0x0e, 0x67, 0x72, 0x6f, 0x75, 0x70, 0x42, 0x79, 0x43, 0x6f, 0x6c, 0x75, 0x6d, 0x6e, 0x73,
-	0x12, 0x1f, 0x0a, 0x0b, 0x66, 0x6f, 0x72, 0x63, 0x65, 0x5f, 0x63, 0x6f, 0x6d, 0x62, 0x6f, 0x18,
-	0x05, 0x20, 0x01, 0x28, 0x08, 0x52, 0x0a, 0x66, 0x6f, 0x72, 0x63, 0x65, 0x43, 0x6f, 0x6d, 0x62,
-	0x6f, 0x1a, 0xe2, 0x01, 0x0a, 0x09, 0x41, 0x67, 0x67, 0x72, 0x65, 0x67, 0x61, 0x74, 0x65, 0x12,
-	0x54, 0x0a, 0x04, 0x74, 0x79, 0x70, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0e, 0x32, 0x40, 0x2e,
-	0x69, 0x6f, 0x2e, 0x64, 0x65, 0x65, 0x70, 0x68, 0x61, 0x76, 0x65, 0x6e, 0x2e, 0x70, 0x72, 0x6f,
-	0x74, 0x6f, 0x2e, 0x62, 0x61, 0x63, 0x6b, 0x70, 0x6c, 0x61, 0x6e, 0x65, 0x2e, 0x67, 0x72, 0x70,
-	0x63, 0x2e, 0x43, 0x6f, 0x6d, 0x62, 0x6f, 0x41, 0x67, 0x67, 0x72, 0x65, 0x67, 0x61, 0x74, 0x65,
-	0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x2e, 0x41, 0x67, 0x67, 0x54, 0x79, 0x70, 0x65, 0x52,
-	0x04, 0x74, 0x79, 0x70, 0x65, 0x12, 0x1f, 0x0a, 0x0b, 0x6d, 0x61, 0x74, 0x63, 0x68, 0x5f, 0x70,
-	0x61, 0x69, 0x72, 0x73, 0x18, 0x02, 0x20, 0x03, 0x28, 0x09, 0x52, 0x0a, 0x6d, 0x61, 0x74, 0x63,
-	0x68, 0x50, 0x61, 0x69, 0x72, 0x73, 0x12, 0x1f, 0x0a, 0x0b, 0x63, 0x6f, 0x6c, 0x75, 0x6d, 0x6e,
-	0x5f, 0x6e, 0x61, 0x6d, 0x65, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0a, 0x63, 0x6f, 0x6c,
-	0x75, 0x6d, 0x6e, 0x4e, 0x61, 0x6d, 0x65, 0x12, 0x1e, 0x0a, 0x0a, 0x70, 0x65, 0x72, 0x63, 0x65,
-	0x6e, 0x74, 0x69, 0x6c, 0x65, 0x18, 0x04, 0x20, 0x01, 0x28, 0x01, 0x52, 0x0a, 0x70, 0x65, 0x72,
-	0x63, 0x65, 0x6e, 0x74, 0x69, 0x6c, 0x65, 0x12, 0x1d, 0x0a, 0x0a, 0x61, 0x76, 0x67, 0x5f, 0x6d,
-	0x65, 0x64, 0x69, 0x61, 0x6e, 0x18, 0x05, 0x20, 0x01, 0x28, 0x08, 0x52, 0x09, 0x61, 0x76, 0x67,
-	0x4d, 0x65, 0x64, 0x69, 0x61, 0x6e, 0x22, 0xa5, 0x01, 0x0a, 0x07, 0x41, 0x67, 0x67, 0x54, 0x79,
-	0x70, 0x65, 0x12, 0x07, 0x0a, 0x03, 0x53, 0x55, 0x4d, 0x10, 0x00, 0x12, 0x0b, 0x0a, 0x07, 0x41,
-	0x42, 0x53, 0x5f, 0x53, 0x55, 0x4d, 0x10, 0x01, 0x12, 0x09, 0x0a, 0x05, 0x47, 0x52, 0x4f, 0x55,
-	0x50, 0x10, 0x02, 0x12, 0x07, 0x0a, 0x03, 0x41, 0x56, 0x47, 0x10, 0x03, 0x12, 0x09, 0x0a, 0x05,
-	0x43, 0x4f, 0x55, 0x4e, 0x54, 0x10, 0x04, 0x12, 0x09, 0x0a, 0x05, 0x46, 0x49, 0x52, 0x53, 0x54,
-	0x10, 0x05, 0x12, 0x08, 0x0a, 0x04, 0x4c, 0x41, 0x53, 0x54, 0x10, 0x06, 0x12, 0x07, 0x0a, 0x03,
-	0x4d, 0x49, 0x4e, 0x10, 0x07, 0x12, 0x07, 0x0a, 0x03, 0x4d, 0x41, 0x58, 0x10, 0x08, 0x12, 0x0a,
-	0x0a, 0x06, 0x4d, 0x45, 0x44, 0x49, 0x41, 0x4e, 0x10, 0x09, 0x12, 0x0e, 0x0a, 0x0a, 0x50, 0x45,
-	0x52, 0x43, 0x45, 0x4e, 0x54, 0x49, 0x4c, 0x45, 0x10, 0x0a, 0x12, 0x07, 0x0a, 0x03, 0x53, 0x54,
-	0x44, 0x10, 0x0b, 0x12, 0x07, 0x0a, 0x03, 0x56, 0x41, 0x52, 0x10, 0x0c, 0x12, 0x10, 0x0a, 0x0c,
-	0x57, 0x45, 0x49, 0x47, 0x48, 0x54, 0x45, 0x44, 0x5f, 0x41, 0x56, 0x47, 0x10, 0x0d, 0x3a, 0x02,
-	0x18, 0x01, 0x22, 0x97, 0x02, 0x0a, 0x13, 0x41, 0x67, 0x67, 0x72, 0x65, 0x67, 0x61, 0x74, 0x65,
-	0x41, 0x6c, 0x6c, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x46, 0x0a, 0x09, 0x72, 0x65,
-	0x73, 0x75, 0x6c, 0x74, 0x5f, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x29, 0x2e,
-	0x69, 0x6f, 0x2e, 0x64, 0x65, 0x65, 0x70, 0x68, 0x61, 0x76, 0x65, 0x6e, 0x2e, 0x70, 0x72, 0x6f,
-	0x74, 0x6f, 0x2e, 0x62, 0x61, 0x63, 0x6b, 0x70, 0x6c, 0x61, 0x6e, 0x65, 0x2e, 0x67, 0x72, 0x70,
-	0x63, 0x2e, 0x54, 0x69, 0x63, 0x6b, 0x65, 0x74, 0x52, 0x08, 0x72, 0x65, 0x73, 0x75, 0x6c, 0x74,
-	0x49, 0x64, 0x12, 0x4e, 0x0a, 0x09, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x5f, 0x69, 0x64, 0x18,
-	0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x31, 0x2e, 0x69, 0x6f, 0x2e, 0x64, 0x65, 0x65, 0x70, 0x68,
-	0x61, 0x76, 0x65, 0x6e, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x62, 0x61, 0x63, 0x6b, 0x70,
-	0x6c, 0x61, 0x6e, 0x65, 0x2e, 0x67, 0x72, 0x70, 0x63, 0x2e, 0x54, 0x61, 0x62, 0x6c, 0x65, 0x52,
-	0x65, 0x66, 0x65, 0x72, 0x65, 0x6e, 0x63, 0x65, 0x52, 0x08, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65,
-	0x49, 0x64, 0x12, 0x3e, 0x0a, 0x04, 0x73, 0x70, 0x65, 0x63, 0x18, 0x03, 0x20, 0x01, 0x28, 0x0b,
-	0x32, 0x2a, 0x2e, 0x69, 0x6f, 0x2e, 0x64, 0x65, 0x65, 0x70, 0x68, 0x61, 0x76, 0x65, 0x6e, 0x2e,
-	0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x62, 0x61, 0x63, 0x6b, 0x70, 0x6c, 0x61, 0x6e, 0x65, 0x2e,
-	0x67, 0x72, 0x70, 0x63, 0x2e, 0x41, 0x67, 0x67, 0x53, 0x70, 0x65, 0x63, 0x52, 0x04, 0x73, 0x70,
-	0x65, 0x63, 0x12, 0x28, 0x0a, 0x10, 0x67, 0x72, 0x6f, 0x75, 0x70, 0x5f, 0x62, 0x79, 0x5f, 0x63,
-	0x6f, 0x6c, 0x75, 0x6d, 0x6e, 0x73, 0x18, 0x04, 0x20, 0x03, 0x28, 0x09, 0x52, 0x0e, 0x67, 0x72,
-	0x6f, 0x75, 0x70, 0x42, 0x79, 0x43, 0x6f, 0x6c, 0x75, 0x6d, 0x6e, 0x73, 0x22, 0xef, 0x1b, 0x0a,
-	0x07, 0x41, 0x67, 0x67, 0x53, 0x70, 0x65, 0x63, 0x12, 0x53, 0x0a, 0x07, 0x61, 0x62, 0x73, 0x5f,
-	0x73, 0x75, 0x6d, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x38, 0x2e, 0x69, 0x6f, 0x2e, 0x64,
-	0x65, 0x65, 0x70, 0x68, 0x61, 0x76, 0x65, 0x6e, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x62,
-	0x61, 0x63, 0x6b, 0x70, 0x6c, 0x61, 0x6e, 0x65, 0x2e, 0x67, 0x72, 0x70, 0x63, 0x2e, 0x41, 0x67,
-	0x67, 0x53, 0x70, 0x65, 0x63, 0x2e, 0x41, 0x67, 0x67, 0x53, 0x70, 0x65, 0x63, 0x41, 0x62, 0x73,
-	0x53, 0x75, 0x6d, 0x48, 0x00, 0x52, 0x06, 0x61, 0x62, 0x73, 0x53, 0x75, 0x6d, 0x12, 0x80, 0x01,
-	0x0a, 0x16, 0x61, 0x70, 0x70, 0x72, 0x6f, 0x78, 0x69, 0x6d, 0x61, 0x74, 0x65, 0x5f, 0x70, 0x65,
-	0x72, 0x63, 0x65, 0x6e, 0x74, 0x69, 0x6c, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x47,
-	0x2e, 0x69, 0x6f, 0x2e, 0x64, 0x65, 0x65, 0x70, 0x68, 0x61, 0x76, 0x65, 0x6e, 0x2e, 0x70, 0x72,
-	0x6f, 0x74, 0x6f, 0x2e, 0x62, 0x61, 0x63, 0x6b, 0x70, 0x6c, 0x61, 0x6e, 0x65, 0x2e, 0x67, 0x72,
-	0x70, 0x63, 0x2e, 0x41, 0x67, 0x67, 0x53, 0x70, 0x65, 0x63, 0x2e, 0x41, 0x67, 0x67, 0x53, 0x70,
-	0x65, 0x63, 0x41, 0x70, 0x70, 0x72, 0x6f, 0x78, 0x69, 0x6d, 0x61, 0x74, 0x65, 0x50, 0x65, 0x72,
-	0x63, 0x65, 0x6e, 0x74, 0x69, 0x6c, 0x65, 0x48, 0x00, 0x52, 0x15, 0x61, 0x70, 0x70, 0x72, 0x6f,
-	0x78, 0x69, 0x6d, 0x61, 0x74, 0x65, 0x50, 0x65, 0x72, 0x63, 0x65, 0x6e, 0x74, 0x69, 0x6c, 0x65,
-	0x12, 0x49, 0x0a, 0x03, 0x61, 0x76, 0x67, 0x18, 0x03, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x35, 0x2e,
+	0x22, 0xef, 0x1b, 0x0a, 0x07, 0x41, 0x67, 0x67, 0x53, 0x70, 0x65, 0x63, 0x12, 0x53, 0x0a, 0x07,
+	0x61, 0x62, 0x73, 0x5f, 0x73, 0x75, 0x6d, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x38, 0x2e,
 	0x69, 0x6f, 0x2e, 0x64, 0x65, 0x65, 0x70, 0x68, 0x61, 0x76, 0x65, 0x6e, 0x2e, 0x70, 0x72, 0x6f,
 	0x74, 0x6f, 0x2e, 0x62, 0x61, 0x63, 0x6b, 0x70, 0x6c, 0x61, 0x6e, 0x65, 0x2e, 0x67, 0x72, 0x70,
 	0x63, 0x2e, 0x41, 0x67, 0x67, 0x53, 0x70, 0x65, 0x63, 0x2e, 0x41, 0x67, 0x67, 0x53, 0x70, 0x65,
-	0x63, 0x41, 0x76, 0x67, 0x48, 0x00, 0x52, 0x03, 0x61, 0x76, 0x67, 0x12, 0x68, 0x0a, 0x0e, 0x63,
-	0x6f, 0x75, 0x6e, 0x74, 0x5f, 0x64, 0x69, 0x73, 0x74, 0x69, 0x6e, 0x63, 0x74, 0x18, 0x04, 0x20,
-	0x01, 0x28, 0x0b, 0x32, 0x3f, 0x2e, 0x69, 0x6f, 0x2e, 0x64, 0x65, 0x65, 0x70, 0x68, 0x61, 0x76,
-	0x65, 0x6e, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x62, 0x61, 0x63, 0x6b, 0x70, 0x6c, 0x61,
-	0x6e, 0x65, 0x2e, 0x67, 0x72, 0x70, 0x63, 0x2e, 0x41, 0x67, 0x67, 0x53, 0x70, 0x65, 0x63, 0x2e,
-	0x41, 0x67, 0x67, 0x53, 0x70, 0x65, 0x63, 0x43, 0x6f, 0x75, 0x6e, 0x74, 0x44, 0x69, 0x73, 0x74,
-	0x69, 0x6e, 0x63, 0x74, 0x48, 0x00, 0x52, 0x0d, 0x63, 0x6f, 0x75, 0x6e, 0x74, 0x44, 0x69, 0x73,
-	0x74, 0x69, 0x6e, 0x63, 0x74, 0x12, 0x58, 0x0a, 0x08, 0x64, 0x69, 0x73, 0x74, 0x69, 0x6e, 0x63,
-	0x74, 0x18, 0x05, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x3a, 0x2e, 0x69, 0x6f, 0x2e, 0x64, 0x65, 0x65,
-	0x70, 0x68, 0x61, 0x76, 0x65, 0x6e, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x62, 0x61, 0x63,
-	0x6b, 0x70, 0x6c, 0x61, 0x6e, 0x65, 0x2e, 0x67, 0x72, 0x70, 0x63, 0x2e, 0x41, 0x67, 0x67, 0x53,
-	0x70, 0x65, 0x63, 0x2e, 0x41, 0x67, 0x67, 0x53, 0x70, 0x65, 0x63, 0x44, 0x69, 0x73, 0x74, 0x69,
-	0x6e, 0x63, 0x74, 0x48, 0x00, 0x52, 0x08, 0x64, 0x69, 0x73, 0x74, 0x69, 0x6e, 0x63, 0x74, 0x12,
-	0x4f, 0x0a, 0x05, 0x66, 0x69, 0x72, 0x73, 0x74, 0x18, 0x06, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x37,
-	0x2e, 0x69, 0x6f, 0x2e, 0x64, 0x65, 0x65, 0x70, 0x68, 0x61, 0x76, 0x65, 0x6e, 0x2e, 0x70, 0x72,
-	0x6f, 0x74, 0x6f, 0x2e, 0x62, 0x61, 0x63, 0x6b, 0x70, 0x6c, 0x61, 0x6e, 0x65, 0x2e, 0x67, 0x72,
-	0x70, 0x63, 0x2e, 0x41, 0x67, 0x67, 0x53, 0x70, 0x65, 0x63, 0x2e, 0x41, 0x67, 0x67, 0x53, 0x70,
-	0x65, 0x63, 0x46, 0x69, 0x72, 0x73, 0x74, 0x48, 0x00, 0x52, 0x05, 0x66, 0x69, 0x72, 0x73, 0x74,
-	0x12, 0x55, 0x0a, 0x07, 0x66, 0x6f, 0x72, 0x6d, 0x75, 0x6c, 0x61, 0x18, 0x07, 0x20, 0x01, 0x28,
-	0x0b, 0x32, 0x39, 0x2e, 0x69, 0x6f, 0x2e, 0x64, 0x65, 0x65, 0x70, 0x68, 0x61, 0x76, 0x65, 0x6e,
+	0x63, 0x41, 0x62, 0x73, 0x53, 0x75, 0x6d, 0x48, 0x00, 0x52, 0x06, 0x61, 0x62, 0x73, 0x53, 0x75,
+	0x6d, 0x12, 0x80, 0x01, 0x0a, 0x16, 0x61, 0x70, 0x70, 0x72, 0x6f, 0x78, 0x69, 0x6d, 0x61, 0x74,
+	0x65, 0x5f, 0x70, 0x65, 0x72, 0x63, 0x65, 0x6e, 0x74, 0x69, 0x6c, 0x65, 0x18, 0x02, 0x20, 0x01,
+	0x28, 0x0b, 0x32, 0x47, 0x2e, 0x69, 0x6f, 0x2e, 0x64, 0x65, 0x65, 0x70, 0x68, 0x61, 0x76, 0x65,
+	0x6e, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x62, 0x61, 0x63, 0x6b, 0x70, 0x6c, 0x61, 0x6e,
+	0x65, 0x2e, 0x67, 0x72, 0x70, 0x63, 0x2e, 0x41, 0x67, 0x67, 0x53, 0x70, 0x65, 0x63, 0x2e, 0x41,
+	0x67, 0x67, 0x53, 0x70, 0x65, 0x63, 0x41, 0x70, 0x70, 0x72, 0x6f, 0x78, 0x69, 0x6d, 0x61, 0x74,
+	0x65, 0x50, 0x65, 0x72, 0x63, 0x65, 0x6e, 0x74, 0x69, 0x6c, 0x65, 0x48, 0x00, 0x52, 0x15, 0x61,
+	0x70, 0x70, 0x72, 0x6f, 0x78, 0x69, 0x6d, 0x61, 0x74, 0x65, 0x50, 0x65, 0x72, 0x63, 0x65, 0x6e,
+	0x74, 0x69, 0x6c, 0x65, 0x12, 0x49, 0x0a, 0x03, 0x61, 0x76, 0x67, 0x18, 0x03, 0x20, 0x01, 0x28,
+	0x0b, 0x32, 0x35, 0x2e, 0x69, 0x6f, 0x2e, 0x64, 0x65, 0x65, 0x70, 0x68, 0x61, 0x76, 0x65, 0x6e,
 	0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x62, 0x61, 0x63, 0x6b, 0x70, 0x6c, 0x61, 0x6e, 0x65,
 	0x2e, 0x67, 0x72, 0x70, 0x63, 0x2e, 0x41, 0x67, 0x67, 0x53, 0x70, 0x65, 0x63, 0x2e, 0x41, 0x67,
-	0x67, 0x53, 0x70, 0x65, 0x63, 0x46, 0x6f, 0x72, 0x6d, 0x75, 0x6c, 0x61, 0x48, 0x00, 0x52, 0x07,
-	0x66, 0x6f, 0x72, 0x6d, 0x75, 0x6c, 0x61, 0x12, 0x52, 0x0a, 0x06, 0x66, 0x72, 0x65, 0x65, 0x7a,
-	0x65, 0x18, 0x08, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x38, 0x2e, 0x69, 0x6f, 0x2e, 0x64, 0x65, 0x65,
-	0x70, 0x68, 0x61, 0x76, 0x65, 0x6e, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x62, 0x61, 0x63,
-	0x6b, 0x70, 0x6c, 0x61, 0x6e, 0x65, 0x2e, 0x67, 0x72, 0x70, 0x63, 0x2e, 0x41, 0x67, 0x67, 0x53,
-	0x70, 0x65, 0x63, 0x2e, 0x41, 0x67, 0x67, 0x53, 0x70, 0x65, 0x63, 0x46, 0x72, 0x65, 0x65, 0x7a,
-	0x65, 0x48, 0x00, 0x52, 0x06, 0x66, 0x72, 0x65, 0x65, 0x7a, 0x65, 0x12, 0x4f, 0x0a, 0x05, 0x67,
-	0x72, 0x6f, 0x75, 0x70, 0x18, 0x09, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x37, 0x2e, 0x69, 0x6f, 0x2e,
-	0x64, 0x65, 0x65, 0x70, 0x68, 0x61, 0x76, 0x65, 0x6e, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e,
-	0x62, 0x61, 0x63, 0x6b, 0x70, 0x6c, 0x61, 0x6e, 0x65, 0x2e, 0x67, 0x72, 0x70, 0x63, 0x2e, 0x41,
-	0x67, 0x67, 0x53, 0x70, 0x65, 0x63, 0x2e, 0x41, 0x67, 0x67, 0x53, 0x70, 0x65, 0x63, 0x47, 0x72,
-	0x6f, 0x75, 0x70, 0x48, 0x00, 0x52, 0x05, 0x67, 0x72, 0x6f, 0x75, 0x70, 0x12, 0x4c, 0x0a, 0x04,
-	0x6c, 0x61, 0x73, 0x74, 0x18, 0x0a, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x36, 0x2e, 0x69, 0x6f, 0x2e,
-	0x64, 0x65, 0x65, 0x70, 0x68, 0x61, 0x76, 0x65, 0x6e, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e,
-	0x62, 0x61, 0x63, 0x6b, 0x70, 0x6c, 0x61, 0x6e, 0x65, 0x2e, 0x67, 0x72, 0x70, 0x63, 0x2e, 0x41,
-	0x67, 0x67, 0x53, 0x70, 0x65, 0x63, 0x2e, 0x41, 0x67, 0x67, 0x53, 0x70, 0x65, 0x63, 0x4c, 0x61,
-	0x73, 0x74, 0x48, 0x00, 0x52, 0x04, 0x6c, 0x61, 0x73, 0x74, 0x12, 0x49, 0x0a, 0x03, 0x6d, 0x61,
-	0x78, 0x18, 0x0b, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x35, 0x2e, 0x69, 0x6f, 0x2e, 0x64, 0x65, 0x65,
+	0x67, 0x53, 0x70, 0x65, 0x63, 0x41, 0x76, 0x67, 0x48, 0x00, 0x52, 0x03, 0x61, 0x76, 0x67, 0x12,
+	0x68, 0x0a, 0x0e, 0x63, 0x6f, 0x75, 0x6e, 0x74, 0x5f, 0x64, 0x69, 0x73, 0x74, 0x69, 0x6e, 0x63,
+	0x74, 0x18, 0x04, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x3f, 0x2e, 0x69, 0x6f, 0x2e, 0x64, 0x65, 0x65,
 	0x70, 0x68, 0x61, 0x76, 0x65, 0x6e, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x62, 0x61, 0x63,
 	0x6b, 0x70, 0x6c, 0x61, 0x6e, 0x65, 0x2e, 0x67, 0x72, 0x70, 0x63, 0x2e, 0x41, 0x67, 0x67, 0x53,
-	0x70, 0x65, 0x63, 0x2e, 0x41, 0x67, 0x67, 0x53, 0x70, 0x65, 0x63, 0x4d, 0x61, 0x78, 0x48, 0x00,
-	0x52, 0x03, 0x6d, 0x61, 0x78, 0x12, 0x52, 0x0a, 0x06, 0x6d, 0x65, 0x64, 0x69, 0x61, 0x6e, 0x18,
-	0x0c, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x38, 0x2e, 0x69, 0x6f, 0x2e, 0x64, 0x65, 0x65, 0x70, 0x68,
+	0x70, 0x65, 0x63, 0x2e, 0x41, 0x67, 0x67, 0x53, 0x70, 0x65, 0x63, 0x43, 0x6f, 0x75, 0x6e, 0x74,
+	0x44, 0x69, 0x73, 0x74, 0x69, 0x6e, 0x63, 0x74, 0x48, 0x00, 0x52, 0x0d, 0x63, 0x6f, 0x75, 0x6e,
+	0x74, 0x44, 0x69, 0x73, 0x74, 0x69, 0x6e, 0x63, 0x74, 0x12, 0x58, 0x0a, 0x08, 0x64, 0x69, 0x73,
+	0x74, 0x69, 0x6e, 0x63, 0x74, 0x18, 0x05, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x3a, 0x2e, 0x69, 0x6f,
+	0x2e, 0x64, 0x65, 0x65, 0x70, 0x68, 0x61, 0x76, 0x65, 0x6e, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f,
+	0x2e, 0x62, 0x61, 0x63, 0x6b, 0x70, 0x6c, 0x61, 0x6e, 0x65, 0x2e, 0x67, 0x72, 0x70, 0x63, 0x2e,
+	0x41, 0x67, 0x67, 0x53, 0x70, 0x65, 0x63, 0x2e, 0x41, 0x67, 0x67, 0x53, 0x70, 0x65, 0x63, 0x44,
+	0x69, 0x73, 0x74, 0x69, 0x6e, 0x63, 0x74, 0x48, 0x00, 0x52, 0x08, 0x64, 0x69, 0x73, 0x74, 0x69,
+	0x6e, 0x63, 0x74, 0x12, 0x4f, 0x0a, 0x05, 0x66, 0x69, 0x72, 0x73, 0x74, 0x18, 0x06, 0x20, 0x01,
+	0x28, 0x0b, 0x32, 0x37, 0x2e, 0x69, 0x6f, 0x2e, 0x64, 0x65, 0x65, 0x70, 0x68, 0x61, 0x76, 0x65,
+	0x6e, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x62, 0x61, 0x63, 0x6b, 0x70, 0x6c, 0x61, 0x6e,
+	0x65, 0x2e, 0x67, 0x72, 0x70, 0x63, 0x2e, 0x41, 0x67, 0x67, 0x53, 0x70, 0x65, 0x63, 0x2e, 0x41,
+	0x67, 0x67, 0x53, 0x70, 0x65, 0x63, 0x46, 0x69, 0x72, 0x73, 0x74, 0x48, 0x00, 0x52, 0x05, 0x66,
+	0x69, 0x72, 0x73, 0x74, 0x12, 0x55, 0x0a, 0x07, 0x66, 0x6f, 0x72, 0x6d, 0x75, 0x6c, 0x61, 0x18,
+	0x07, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x39, 0x2e, 0x69, 0x6f, 0x2e, 0x64, 0x65, 0x65, 0x70, 0x68,
 	0x61, 0x76, 0x65, 0x6e, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x62, 0x61, 0x63, 0x6b, 0x70,
 	0x6c, 0x61, 0x6e, 0x65, 0x2e, 0x67, 0x72, 0x70, 0x63, 0x2e, 0x41, 0x67, 0x67, 0x53, 0x70, 0x65,
-	0x63, 0x2e, 0x41, 0x67, 0x67, 0x53, 0x70, 0x65, 0x63, 0x4d, 0x65, 0x64, 0x69, 0x61, 0x6e, 0x48,
-	0x00, 0x52, 0x06, 0x6d, 0x65, 0x64, 0x69, 0x61, 0x6e, 0x12, 0x49, 0x0a, 0x03, 0x6d, 0x69, 0x6e,
-	0x18, 0x0d, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x35, 0x2e, 0x69, 0x6f, 0x2e, 0x64, 0x65, 0x65, 0x70,
-	0x68, 0x61, 0x76, 0x65, 0x6e, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x62, 0x61, 0x63, 0x6b,
-	0x70, 0x6c, 0x61, 0x6e, 0x65, 0x2e, 0x67, 0x72, 0x70, 0x63, 0x2e, 0x41, 0x67, 0x67, 0x53, 0x70,
-	0x65, 0x63, 0x2e, 0x41, 0x67, 0x67, 0x53, 0x70, 0x65, 0x63, 0x4d, 0x69, 0x6e, 0x48, 0x00, 0x52,
-	0x03, 0x6d, 0x69, 0x6e, 0x12, 0x5e, 0x0a, 0x0a, 0x70, 0x65, 0x72, 0x63, 0x65, 0x6e, 0x74, 0x69,
-	0x6c, 0x65, 0x18, 0x0e, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x3c, 0x2e, 0x69, 0x6f, 0x2e, 0x64, 0x65,
-	0x65, 0x70, 0x68, 0x61, 0x76, 0x65, 0x6e, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x62, 0x61,
-	0x63, 0x6b, 0x70, 0x6c, 0x61, 0x6e, 0x65, 0x2e, 0x67, 0x72, 0x70, 0x63, 0x2e, 0x41, 0x67, 0x67,
-	0x53, 0x70, 0x65, 0x63, 0x2e, 0x41, 0x67, 0x67, 0x53, 0x70, 0x65, 0x63, 0x50, 0x65, 0x72, 0x63,
-	0x65, 0x6e, 0x74, 0x69, 0x6c, 0x65, 0x48, 0x00, 0x52, 0x0a, 0x70, 0x65, 0x72, 0x63, 0x65, 0x6e,
-	0x74, 0x69, 0x6c, 0x65, 0x12, 0x5d, 0x0a, 0x0c, 0x73, 0x6f, 0x72, 0x74, 0x65, 0x64, 0x5f, 0x66,
-	0x69, 0x72, 0x73, 0x74, 0x18, 0x0f, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x38, 0x2e, 0x69, 0x6f, 0x2e,
-	0x64, 0x65, 0x65, 0x70, 0x68, 0x61, 0x76, 0x65, 0x6e, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e,
-	0x62, 0x61, 0x63, 0x6b, 0x70, 0x6c, 0x61, 0x6e, 0x65, 0x2e, 0x67, 0x72, 0x70, 0x63, 0x2e, 0x41,
-	0x67, 0x67, 0x53, 0x70, 0x65, 0x63, 0x2e, 0x41, 0x67, 0x67, 0x53, 0x70, 0x65, 0x63, 0x53, 0x6f,
-	0x72, 0x74, 0x65, 0x64, 0x48, 0x00, 0x52, 0x0b, 0x73, 0x6f, 0x72, 0x74, 0x65, 0x64, 0x46, 0x69,
-	0x72, 0x73, 0x74, 0x12, 0x5b, 0x0a, 0x0b, 0x73, 0x6f, 0x72, 0x74, 0x65, 0x64, 0x5f, 0x6c, 0x61,
-	0x73, 0x74, 0x18, 0x10, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x38, 0x2e, 0x69, 0x6f, 0x2e, 0x64, 0x65,
-	0x65, 0x70, 0x68, 0x61, 0x76, 0x65, 0x6e, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x62, 0x61,
-	0x63, 0x6b, 0x70, 0x6c, 0x61, 0x6e, 0x65, 0x2e, 0x67, 0x72, 0x70, 0x63, 0x2e, 0x41, 0x67, 0x67,
-	0x53, 0x70, 0x65, 0x63, 0x2e, 0x41, 0x67, 0x67, 0x53, 0x70, 0x65, 0x63, 0x53, 0x6f, 0x72, 0x74,
-	0x65, 0x64, 0x48, 0x00, 0x52, 0x0a, 0x73, 0x6f, 0x72, 0x74, 0x65, 0x64, 0x4c, 0x61, 0x73, 0x74,
-	0x12, 0x49, 0x0a, 0x03, 0x73, 0x74, 0x64, 0x18, 0x11, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x35, 0x2e,
-	0x69, 0x6f, 0x2e, 0x64, 0x65, 0x65, 0x70, 0x68, 0x61, 0x76, 0x65, 0x6e, 0x2e, 0x70, 0x72, 0x6f,
-	0x74, 0x6f, 0x2e, 0x62, 0x61, 0x63, 0x6b, 0x70, 0x6c, 0x61, 0x6e, 0x65, 0x2e, 0x67, 0x72, 0x70,
-	0x63, 0x2e, 0x41, 0x67, 0x67, 0x53, 0x70, 0x65, 0x63, 0x2e, 0x41, 0x67, 0x67, 0x53, 0x70, 0x65,
-	0x63, 0x53, 0x74, 0x64, 0x48, 0x00, 0x52, 0x03, 0x73, 0x74, 0x64, 0x12, 0x49, 0x0a, 0x03, 0x73,
-	0x75, 0x6d, 0x18, 0x12, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x35, 0x2e, 0x69, 0x6f, 0x2e, 0x64, 0x65,
-	0x65, 0x70, 0x68, 0x61, 0x76, 0x65, 0x6e, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x62, 0x61,
-	0x63, 0x6b, 0x70, 0x6c, 0x61, 0x6e, 0x65, 0x2e, 0x67, 0x72, 0x70, 0x63, 0x2e, 0x41, 0x67, 0x67,
-	0x53, 0x70, 0x65, 0x63, 0x2e, 0x41, 0x67, 0x67, 0x53, 0x70, 0x65, 0x63, 0x53, 0x75, 0x6d, 0x48,
-	0x00, 0x52, 0x03, 0x73, 0x75, 0x6d, 0x12, 0x56, 0x0a, 0x08, 0x74, 0x5f, 0x64, 0x69, 0x67, 0x65,
-	0x73, 0x74, 0x18, 0x13, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x39, 0x2e, 0x69, 0x6f, 0x2e, 0x64, 0x65,
-	0x65, 0x70, 0x68, 0x61, 0x76, 0x65, 0x6e, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x62, 0x61,
-	0x63, 0x6b, 0x70, 0x6c, 0x61, 0x6e, 0x65, 0x2e, 0x67, 0x72, 0x70, 0x63, 0x2e, 0x41, 0x67, 0x67,
-	0x53, 0x70, 0x65, 0x63, 0x2e, 0x41, 0x67, 0x67, 0x53, 0x70, 0x65, 0x63, 0x54, 0x44, 0x69, 0x67,
-	0x65, 0x73, 0x74, 0x48, 0x00, 0x52, 0x07, 0x74, 0x44, 0x69, 0x67, 0x65, 0x73, 0x74, 0x12, 0x52,
-	0x0a, 0x06, 0x75, 0x6e, 0x69, 0x71, 0x75, 0x65, 0x18, 0x14, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x38,
+	0x63, 0x2e, 0x41, 0x67, 0x67, 0x53, 0x70, 0x65, 0x63, 0x46, 0x6f, 0x72, 0x6d, 0x75, 0x6c, 0x61,
+	0x48, 0x00, 0x52, 0x07, 0x66, 0x6f, 0x72, 0x6d, 0x75, 0x6c, 0x61, 0x12, 0x52, 0x0a, 0x06, 0x66,
+	0x72, 0x65, 0x65, 0x7a, 0x65, 0x18, 0x08, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x38, 0x2e, 0x69, 0x6f,
+	0x2e, 0x64, 0x65, 0x65, 0x70, 0x68, 0x61, 0x76, 0x65, 0x6e, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f,
+	0x2e, 0x62, 0x61, 0x63, 0x6b, 0x70, 0x6c, 0x61, 0x6e, 0x65, 0x2e, 0x67, 0x72, 0x70, 0x63, 0x2e,
+	0x41, 0x67, 0x67, 0x53, 0x70, 0x65, 0x63, 0x2e, 0x41, 0x67, 0x67, 0x53, 0x70, 0x65, 0x63, 0x46,
+	0x72, 0x65, 0x65, 0x7a, 0x65, 0x48, 0x00, 0x52, 0x06, 0x66, 0x72, 0x65, 0x65, 0x7a, 0x65, 0x12,
+	0x4f, 0x0a, 0x05, 0x67, 0x72, 0x6f, 0x75, 0x70, 0x18, 0x09, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x37,
 	0x2e, 0x69, 0x6f, 0x2e, 0x64, 0x65, 0x65, 0x70, 0x68, 0x61, 0x76, 0x65, 0x6e, 0x2e, 0x70, 0x72,
 	0x6f, 0x74, 0x6f, 0x2e, 0x62, 0x61, 0x63, 0x6b, 0x70, 0x6c, 0x61, 0x6e, 0x65, 0x2e, 0x67, 0x72,
 	0x70, 0x63, 0x2e, 0x41, 0x67, 0x67, 0x53, 0x70, 0x65, 0x63, 0x2e, 0x41, 0x67, 0x67, 0x53, 0x70,
-	0x65, 0x63, 0x55, 0x6e, 0x69, 0x71, 0x75, 0x65, 0x48, 0x00, 0x52, 0x06, 0x75, 0x6e, 0x69, 0x71,
-	0x75, 0x65, 0x12, 0x5f, 0x0a, 0x0c, 0x77, 0x65, 0x69, 0x67, 0x68, 0x74, 0x65, 0x64, 0x5f, 0x61,
-	0x76, 0x67, 0x18, 0x15, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x3a, 0x2e, 0x69, 0x6f, 0x2e, 0x64, 0x65,
-	0x65, 0x70, 0x68, 0x61, 0x76, 0x65, 0x6e, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x62, 0x61,
-	0x63, 0x6b, 0x70, 0x6c, 0x61, 0x6e, 0x65, 0x2e, 0x67, 0x72, 0x70, 0x63, 0x2e, 0x41, 0x67, 0x67,
-	0x53, 0x70, 0x65, 0x63, 0x2e, 0x41, 0x67, 0x67, 0x53, 0x70, 0x65, 0x63, 0x57, 0x65, 0x69, 0x67,
-	0x68, 0x74, 0x65, 0x64, 0x48, 0x00, 0x52, 0x0b, 0x77, 0x65, 0x69, 0x67, 0x68, 0x74, 0x65, 0x64,
-	0x41, 0x76, 0x67, 0x12, 0x5f, 0x0a, 0x0c, 0x77, 0x65, 0x69, 0x67, 0x68, 0x74, 0x65, 0x64, 0x5f,
-	0x73, 0x75, 0x6d, 0x18, 0x16, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x3a, 0x2e, 0x69, 0x6f, 0x2e, 0x64,
+	0x65, 0x63, 0x47, 0x72, 0x6f, 0x75, 0x70, 0x48, 0x00, 0x52, 0x05, 0x67, 0x72, 0x6f, 0x75, 0x70,
+	0x12, 0x4c, 0x0a, 0x04, 0x6c, 0x61, 0x73, 0x74, 0x18, 0x0a, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x36,
+	0x2e, 0x69, 0x6f, 0x2e, 0x64, 0x65, 0x65, 0x70, 0x68, 0x61, 0x76, 0x65, 0x6e, 0x2e, 0x70, 0x72,
+	0x6f, 0x74, 0x6f, 0x2e, 0x62, 0x61, 0x63, 0x6b, 0x70, 0x6c, 0x61, 0x6e, 0x65, 0x2e, 0x67, 0x72,
+	0x70, 0x63, 0x2e, 0x41, 0x67, 0x67, 0x53, 0x70, 0x65, 0x63, 0x2e, 0x41, 0x67, 0x67, 0x53, 0x70,
+	0x65, 0x63, 0x4c, 0x61, 0x73, 0x74, 0x48, 0x00, 0x52, 0x04, 0x6c, 0x61, 0x73, 0x74, 0x12, 0x49,
+	0x0a, 0x03, 0x6d, 0x61, 0x78, 0x18, 0x0b, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x35, 0x2e, 0x69, 0x6f,
+	0x2e, 0x64, 0x65, 0x65, 0x70, 0x68, 0x61, 0x76, 0x65, 0x6e, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f,
+	0x2e, 0x62, 0x61, 0x63, 0x6b, 0x70, 0x6c, 0x61, 0x6e, 0x65, 0x2e, 0x67, 0x72, 0x70, 0x63, 0x2e,
+	0x41, 0x67, 0x67, 0x53, 0x70, 0x65, 0x63, 0x2e, 0x41, 0x67, 0x67, 0x53, 0x70, 0x65, 0x63, 0x4d,
+	0x61, 0x78, 0x48, 0x00, 0x52, 0x03, 0x6d, 0x61, 0x78, 0x12, 0x52, 0x0a, 0x06, 0x6d, 0x65, 0x64,
+	0x69, 0x61, 0x6e, 0x18, 0x0c, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x38, 0x2e, 0x69, 0x6f, 0x2e, 0x64,
 	0x65, 0x65, 0x70, 0x68, 0x61, 0x76, 0x65, 0x6e, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x62,
 	0x61, 0x63, 0x6b, 0x70, 0x6c, 0x61, 0x6e, 0x65, 0x2e, 0x67, 0x72, 0x70, 0x63, 0x2e, 0x41, 0x67,
-	0x67, 0x53, 0x70, 0x65, 0x63, 0x2e, 0x41, 0x67, 0x67, 0x53, 0x70, 0x65, 0x63, 0x57, 0x65, 0x69,
-	0x67, 0x68, 0x74, 0x65, 0x64, 0x48, 0x00, 0x52, 0x0b, 0x77, 0x65, 0x69, 0x67, 0x68, 0x74, 0x65,
-	0x64, 0x53, 0x75, 0x6d, 0x12, 0x49, 0x0a, 0x03, 0x76, 0x61, 0x72, 0x18, 0x17, 0x20, 0x01, 0x28,
+	0x67, 0x53, 0x70, 0x65, 0x63, 0x2e, 0x41, 0x67, 0x67, 0x53, 0x70, 0x65, 0x63, 0x4d, 0x65, 0x64,
+	0x69, 0x61, 0x6e, 0x48, 0x00, 0x52, 0x06, 0x6d, 0x65, 0x64, 0x69, 0x61, 0x6e, 0x12, 0x49, 0x0a,
+	0x03, 0x6d, 0x69, 0x6e, 0x18, 0x0d, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x35, 0x2e, 0x69, 0x6f, 0x2e,
+	0x64, 0x65, 0x65, 0x70, 0x68, 0x61, 0x76, 0x65, 0x6e, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e,
+	0x62, 0x61, 0x63, 0x6b, 0x70, 0x6c, 0x61, 0x6e, 0x65, 0x2e, 0x67, 0x72, 0x70, 0x63, 0x2e, 0x41,
+	0x67, 0x67, 0x53, 0x70, 0x65, 0x63, 0x2e, 0x41, 0x67, 0x67, 0x53, 0x70, 0x65, 0x63, 0x4d, 0x69,
+	0x6e, 0x48, 0x00, 0x52, 0x03, 0x6d, 0x69, 0x6e, 0x12, 0x5e, 0x0a, 0x0a, 0x70, 0x65, 0x72, 0x63,
+	0x65, 0x6e, 0x74, 0x69, 0x6c, 0x65, 0x18, 0x0e, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x3c, 0x2e, 0x69,
+	0x6f, 0x2e, 0x64, 0x65, 0x65, 0x70, 0x68, 0x61, 0x76, 0x65, 0x6e, 0x2e, 0x70, 0x72, 0x6f, 0x74,
+	0x6f, 0x2e, 0x62, 0x61, 0x63, 0x6b, 0x70, 0x6c, 0x61, 0x6e, 0x65, 0x2e, 0x67, 0x72, 0x70, 0x63,
+	0x2e, 0x41, 0x67, 0x67, 0x53, 0x70, 0x65, 0x63, 0x2e, 0x41, 0x67, 0x67, 0x53, 0x70, 0x65, 0x63,
+	0x50, 0x65, 0x72, 0x63, 0x65, 0x6e, 0x74, 0x69, 0x6c, 0x65, 0x48, 0x00, 0x52, 0x0a, 0x70, 0x65,
+	0x72, 0x63, 0x65, 0x6e, 0x74, 0x69, 0x6c, 0x65, 0x12, 0x5d, 0x0a, 0x0c, 0x73, 0x6f, 0x72, 0x74,
+	0x65, 0x64, 0x5f, 0x66, 0x69, 0x72, 0x73, 0x74, 0x18, 0x0f, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x38,
+	0x2e, 0x69, 0x6f, 0x2e, 0x64, 0x65, 0x65, 0x70, 0x68, 0x61, 0x76, 0x65, 0x6e, 0x2e, 0x70, 0x72,
+	0x6f, 0x74, 0x6f, 0x2e, 0x62, 0x61, 0x63, 0x6b, 0x70, 0x6c, 0x61, 0x6e, 0x65, 0x2e, 0x67, 0x72,
+	0x70, 0x63, 0x2e, 0x41, 0x67, 0x67, 0x53, 0x70, 0x65, 0x63, 0x2e, 0x41, 0x67, 0x67, 0x53, 0x70,
+	0x65, 0x63, 0x53, 0x6f, 0x72, 0x74, 0x65, 0x64, 0x48, 0x00, 0x52, 0x0b, 0x73, 0x6f, 0x72, 0x74,
+	0x65, 0x64, 0x46, 0x69, 0x72, 0x73, 0x74, 0x12, 0x5b, 0x0a, 0x0b, 0x73, 0x6f, 0x72, 0x74, 0x65,
+	0x64, 0x5f, 0x6c, 0x61, 0x73, 0x74, 0x18, 0x10, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x38, 0x2e, 0x69,
+	0x6f, 0x2e, 0x64, 0x65, 0x65, 0x70, 0x68, 0x61, 0x76, 0x65, 0x6e, 0x2e, 0x70, 0x72, 0x6f, 0x74,
+	0x6f, 0x2e, 0x62, 0x61, 0x63, 0x6b, 0x70, 0x6c, 0x61, 0x6e, 0x65, 0x2e, 0x67, 0x72, 0x70, 0x63,
+	0x2e, 0x41, 0x67, 0x67, 0x53, 0x70, 0x65, 0x63, 0x2e, 0x41, 0x67, 0x67, 0x53, 0x70, 0x65, 0x63,
+	0x53, 0x6f, 0x72, 0x74, 0x65, 0x64, 0x48, 0x00, 0x52, 0x0a, 0x73, 0x6f, 0x72, 0x74, 0x65, 0x64,
+	0x4c, 0x61, 0x73, 0x74, 0x12, 0x49, 0x0a, 0x03, 0x73, 0x74, 0x64, 0x18, 0x11, 0x20, 0x01, 0x28,
 	0x0b, 0x32, 0x35, 0x2e, 0x69, 0x6f, 0x2e, 0x64, 0x65, 0x65, 0x70, 0x68, 0x61, 0x76, 0x65, 0x6e,
 	0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x62, 0x61, 0x63, 0x6b, 0x70, 0x6c, 0x61, 0x6e, 0x65,
 	0x2e, 0x67, 0x72, 0x70, 0x63, 0x2e, 0x41, 0x67, 0x67, 0x53, 0x70, 0x65, 0x63, 0x2e, 0x41, 0x67,
-	0x67, 0x53, 0x70, 0x65, 0x63, 0x56, 0x61, 0x72, 0x48, 0x00, 0x52, 0x03, 0x76, 0x61, 0x72, 0x1a,
-	0x75, 0x0a, 0x1c, 0x41, 0x67, 0x67, 0x53, 0x70, 0x65, 0x63, 0x41, 0x70, 0x70, 0x72, 0x6f, 0x78,
-	0x69, 0x6d, 0x61, 0x74, 0x65, 0x50, 0x65, 0x72, 0x63, 0x65, 0x6e, 0x74, 0x69, 0x6c, 0x65, 0x12,
-	0x1e, 0x0a, 0x0a, 0x70, 0x65, 0x72, 0x63, 0x65, 0x6e, 0x74, 0x69, 0x6c, 0x65, 0x18, 0x01, 0x20,
-	0x01, 0x28, 0x01, 0x52, 0x0a, 0x70, 0x65, 0x72, 0x63, 0x65, 0x6e, 0x74, 0x69, 0x6c, 0x65, 0x12,
-	0x25, 0x0a, 0x0b, 0x63, 0x6f, 0x6d, 0x70, 0x72, 0x65, 0x73, 0x73, 0x69, 0x6f, 0x6e, 0x18, 0x02,
-	0x20, 0x01, 0x28, 0x01, 0x48, 0x00, 0x52, 0x0b, 0x63, 0x6f, 0x6d, 0x70, 0x72, 0x65, 0x73, 0x73,
-	0x69, 0x6f, 0x6e, 0x88, 0x01, 0x01, 0x42, 0x0e, 0x0a, 0x0c, 0x5f, 0x63, 0x6f, 0x6d, 0x70, 0x72,
-	0x65, 0x73, 0x73, 0x69, 0x6f, 0x6e, 0x1a, 0x37, 0x0a, 0x14, 0x41, 0x67, 0x67, 0x53, 0x70, 0x65,
-	0x63, 0x43, 0x6f, 0x75, 0x6e, 0x74, 0x44, 0x69, 0x73, 0x74, 0x69, 0x6e, 0x63, 0x74, 0x12, 0x1f,
-	0x0a, 0x0b, 0x63, 0x6f, 0x75, 0x6e, 0x74, 0x5f, 0x6e, 0x75, 0x6c, 0x6c, 0x73, 0x18, 0x01, 0x20,
-	0x01, 0x28, 0x08, 0x52, 0x0a, 0x63, 0x6f, 0x75, 0x6e, 0x74, 0x4e, 0x75, 0x6c, 0x6c, 0x73, 0x1a,
-	0x36, 0x0a, 0x0f, 0x41, 0x67, 0x67, 0x53, 0x70, 0x65, 0x63, 0x44, 0x69, 0x73, 0x74, 0x69, 0x6e,
-	0x63, 0x74, 0x12, 0x23, 0x0a, 0x0d, 0x69, 0x6e, 0x63, 0x6c, 0x75, 0x64, 0x65, 0x5f, 0x6e, 0x75,
-	0x6c, 0x6c, 0x73, 0x18, 0x01, 0x20, 0x01, 0x28, 0x08, 0x52, 0x0c, 0x69, 0x6e, 0x63, 0x6c, 0x75,
-	0x64, 0x65, 0x4e, 0x75, 0x6c, 0x6c, 0x73, 0x1a, 0x4b, 0x0a, 0x0e, 0x41, 0x67, 0x67, 0x53, 0x70,
-	0x65, 0x63, 0x46, 0x6f, 0x72, 0x6d, 0x75, 0x6c, 0x61, 0x12, 0x18, 0x0a, 0x07, 0x66, 0x6f, 0x72,
-	0x6d, 0x75, 0x6c, 0x61, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x07, 0x66, 0x6f, 0x72, 0x6d,
-	0x75, 0x6c, 0x61, 0x12, 0x1f, 0x0a, 0x0b, 0x70, 0x61, 0x72, 0x61, 0x6d, 0x5f, 0x74, 0x6f, 0x6b,
-	0x65, 0x6e, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0a, 0x70, 0x61, 0x72, 0x61, 0x6d, 0x54,
-	0x6f, 0x6b, 0x65, 0x6e, 0x1a, 0x45, 0x0a, 0x0d, 0x41, 0x67, 0x67, 0x53, 0x70, 0x65, 0x63, 0x4d,
-	0x65, 0x64, 0x69, 0x61, 0x6e, 0x12, 0x34, 0x0a, 0x16, 0x61, 0x76, 0x65, 0x72, 0x61, 0x67, 0x65,
-	0x5f, 0x65, 0x76, 0x65, 0x6e, 0x6c, 0x79, 0x5f, 0x64, 0x69, 0x76, 0x69, 0x64, 0x65, 0x64, 0x18,
-	0x01, 0x20, 0x01, 0x28, 0x08, 0x52, 0x14, 0x61, 0x76, 0x65, 0x72, 0x61, 0x67, 0x65, 0x45, 0x76,
-	0x65, 0x6e, 0x6c, 0x79, 0x44, 0x69, 0x76, 0x69, 0x64, 0x65, 0x64, 0x1a, 0x69, 0x0a, 0x11, 0x41,
-	0x67, 0x67, 0x53, 0x70, 0x65, 0x63, 0x50, 0x65, 0x72, 0x63, 0x65, 0x6e, 0x74, 0x69, 0x6c, 0x65,
-	0x12, 0x1e, 0x0a, 0x0a, 0x70, 0x65, 0x72, 0x63, 0x65, 0x6e, 0x74, 0x69, 0x6c, 0x65, 0x18, 0x01,
-	0x20, 0x01, 0x28, 0x01, 0x52, 0x0a, 0x70, 0x65, 0x72, 0x63, 0x65, 0x6e, 0x74, 0x69, 0x6c, 0x65,
-	0x12, 0x34, 0x0a, 0x16, 0x61, 0x76, 0x65, 0x72, 0x61, 0x67, 0x65, 0x5f, 0x65, 0x76, 0x65, 0x6e,
-	0x6c, 0x79, 0x5f, 0x64, 0x69, 0x76, 0x69, 0x64, 0x65, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x08,
-	0x52, 0x14, 0x61, 0x76, 0x65, 0x72, 0x61, 0x67, 0x65, 0x45, 0x76, 0x65, 0x6e, 0x6c, 0x79, 0x44,
-	0x69, 0x76, 0x69, 0x64, 0x65, 0x64, 0x1a, 0x69, 0x0a, 0x0d, 0x41, 0x67, 0x67, 0x53, 0x70, 0x65,
-	0x63, 0x53, 0x6f, 0x72, 0x74, 0x65, 0x64, 0x12, 0x58, 0x0a, 0x07, 0x63, 0x6f, 0x6c, 0x75, 0x6d,
-	0x6e, 0x73, 0x18, 0x01, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x3e, 0x2e, 0x69, 0x6f, 0x2e, 0x64, 0x65,
-	0x65, 0x70, 0x68, 0x61, 0x76, 0x65, 0x6e, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x62, 0x61,
-	0x63, 0x6b, 0x70, 0x6c, 0x61, 0x6e, 0x65, 0x2e, 0x67, 0x72, 0x70, 0x63, 0x2e, 0x41, 0x67, 0x67,
-	0x53, 0x70, 0x65, 0x63, 0x2e, 0x41, 0x67, 0x67, 0x53, 0x70, 0x65, 0x63, 0x53, 0x6f, 0x72, 0x74,
-	0x65, 0x64, 0x43, 0x6f, 0x6c, 0x75, 0x6d, 0x6e, 0x52, 0x07, 0x63, 0x6f, 0x6c, 0x75, 0x6d, 0x6e,
-	0x73, 0x1a, 0x36, 0x0a, 0x13, 0x41, 0x67, 0x67, 0x53, 0x70, 0x65, 0x63, 0x53, 0x6f, 0x72, 0x74,
-	0x65, 0x64, 0x43, 0x6f, 0x6c, 0x75, 0x6d, 0x6e, 0x12, 0x1f, 0x0a, 0x0b, 0x63, 0x6f, 0x6c, 0x75,
-	0x6d, 0x6e, 0x5f, 0x6e, 0x61, 0x6d, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0a, 0x63,
-	0x6f, 0x6c, 0x75, 0x6d, 0x6e, 0x4e, 0x61, 0x6d, 0x65, 0x1a, 0x47, 0x0a, 0x0e, 0x41, 0x67, 0x67,
-	0x53, 0x70, 0x65, 0x63, 0x54, 0x44, 0x69, 0x67, 0x65, 0x73, 0x74, 0x12, 0x25, 0x0a, 0x0b, 0x63,
-	0x6f, 0x6d, 0x70, 0x72, 0x65, 0x73, 0x73, 0x69, 0x6f, 0x6e, 0x18, 0x01, 0x20, 0x01, 0x28, 0x01,
-	0x48, 0x00, 0x52, 0x0b, 0x63, 0x6f, 0x6d, 0x70, 0x72, 0x65, 0x73, 0x73, 0x69, 0x6f, 0x6e, 0x88,
-	0x01, 0x01, 0x42, 0x0e, 0x0a, 0x0c, 0x5f, 0x63, 0x6f, 0x6d, 0x70, 0x72, 0x65, 0x73, 0x73, 0x69,
-	0x6f, 0x6e, 0x1a, 0xa9, 0x01, 0x0a, 0x0d, 0x41, 0x67, 0x67, 0x53, 0x70, 0x65, 0x63, 0x55, 0x6e,
-	0x69, 0x71, 0x75, 0x65, 0x12, 0x23, 0x0a, 0x0d, 0x69, 0x6e, 0x63, 0x6c, 0x75, 0x64, 0x65, 0x5f,
-	0x6e, 0x75, 0x6c, 0x6c, 0x73, 0x18, 0x01, 0x20, 0x01, 0x28, 0x08, 0x52, 0x0c, 0x69, 0x6e, 0x63,
-	0x6c, 0x75, 0x64, 0x65, 0x4e, 0x75, 0x6c, 0x6c, 0x73, 0x12, 0x73, 0x0a, 0x13, 0x6e, 0x6f, 0x6e,
-	0x5f, 0x75, 0x6e, 0x69, 0x71, 0x75, 0x65, 0x5f, 0x73, 0x65, 0x6e, 0x74, 0x69, 0x6e, 0x65, 0x6c,
-	0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x43, 0x2e, 0x69, 0x6f, 0x2e, 0x64, 0x65, 0x65, 0x70,
-	0x68, 0x61, 0x76, 0x65, 0x6e, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x62, 0x61, 0x63, 0x6b,
-	0x70, 0x6c, 0x61, 0x6e, 0x65, 0x2e, 0x67, 0x72, 0x70, 0x63, 0x2e, 0x41, 0x67, 0x67, 0x53, 0x70,
-	0x65, 0x63, 0x2e, 0x41, 0x67, 0x67, 0x53, 0x70, 0x65, 0x63, 0x4e, 0x6f, 0x6e, 0x55, 0x6e, 0x69,
-	0x71, 0x75, 0x65, 0x53, 0x65, 0x6e, 0x74, 0x69, 0x6e, 0x65, 0x6c, 0x52, 0x11, 0x6e, 0x6f, 0x6e,
-	0x55, 0x6e, 0x69, 0x71, 0x75, 0x65, 0x53, 0x65, 0x6e, 0x74, 0x69, 0x6e, 0x65, 0x6c, 0x1a, 0xa8,
-	0x03, 0x0a, 0x18, 0x41, 0x67, 0x67, 0x53, 0x70, 0x65, 0x63, 0x4e, 0x6f, 0x6e, 0x55, 0x6e, 0x69,
-	0x71, 0x75, 0x65, 0x53, 0x65, 0x6e, 0x74, 0x69, 0x6e, 0x65, 0x6c, 0x12, 0x4d, 0x0a, 0x0a, 0x6e,
-	0x75, 0x6c, 0x6c, 0x5f, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0e, 0x32,
-	0x2c, 0x2e, 0x69, 0x6f, 0x2e, 0x64, 0x65, 0x65, 0x70, 0x68, 0x61, 0x76, 0x65, 0x6e, 0x2e, 0x70,
-	0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x62, 0x61, 0x63, 0x6b, 0x70, 0x6c, 0x61, 0x6e, 0x65, 0x2e, 0x67,
-	0x72, 0x70, 0x63, 0x2e, 0x4e, 0x75, 0x6c, 0x6c, 0x56, 0x61, 0x6c, 0x75, 0x65, 0x48, 0x00, 0x52,
-	0x09, 0x6e, 0x75, 0x6c, 0x6c, 0x56, 0x61, 0x6c, 0x75, 0x65, 0x12, 0x23, 0x0a, 0x0c, 0x73, 0x74,
-	0x72, 0x69, 0x6e, 0x67, 0x5f, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09,
-	0x48, 0x00, 0x52, 0x0b, 0x73, 0x74, 0x72, 0x69, 0x6e, 0x67, 0x56, 0x61, 0x6c, 0x75, 0x65, 0x12,
-	0x1d, 0x0a, 0x09, 0x69, 0x6e, 0x74, 0x5f, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x03, 0x20, 0x01,
-	0x28, 0x11, 0x48, 0x00, 0x52, 0x08, 0x69, 0x6e, 0x74, 0x56, 0x61, 0x6c, 0x75, 0x65, 0x12, 0x23,
-	0x0a, 0x0a, 0x6c, 0x6f, 0x6e, 0x67, 0x5f, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x04, 0x20, 0x01,
-	0x28, 0x12, 0x42, 0x02, 0x30, 0x01, 0x48, 0x00, 0x52, 0x09, 0x6c, 0x6f, 0x6e, 0x67, 0x56, 0x61,
-	0x6c, 0x75, 0x65, 0x12, 0x21, 0x0a, 0x0b, 0x66, 0x6c, 0x6f, 0x61, 0x74, 0x5f, 0x76, 0x61, 0x6c,
-	0x75, 0x65, 0x18, 0x05, 0x20, 0x01, 0x28, 0x02, 0x48, 0x00, 0x52, 0x0a, 0x66, 0x6c, 0x6f, 0x61,
-	0x74, 0x56, 0x61, 0x6c, 0x75, 0x65, 0x12, 0x23, 0x0a, 0x0c, 0x64, 0x6f, 0x75, 0x62, 0x6c, 0x65,
-	0x5f, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x06, 0x20, 0x01, 0x28, 0x01, 0x48, 0x00, 0x52, 0x0b,
-	0x64, 0x6f, 0x75, 0x62, 0x6c, 0x65, 0x56, 0x61, 0x6c, 0x75, 0x65, 0x12, 0x1f, 0x0a, 0x0a, 0x62,
-	0x6f, 0x6f, 0x6c, 0x5f, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x07, 0x20, 0x01, 0x28, 0x08, 0x48,
-	0x00, 0x52, 0x09, 0x62, 0x6f, 0x6f, 0x6c, 0x56, 0x61, 0x6c, 0x75, 0x65, 0x12, 0x1f, 0x0a, 0x0a,
-	0x62, 0x79, 0x74, 0x65, 0x5f, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x08, 0x20, 0x01, 0x28, 0x11,
-	0x48, 0x00, 0x52, 0x09, 0x62, 0x79, 0x74, 0x65, 0x56, 0x61, 0x6c, 0x75, 0x65, 0x12, 0x21, 0x0a,
-	0x0b, 0x73, 0x68, 0x6f, 0x72, 0x74, 0x5f, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x09, 0x20, 0x01,
-	0x28, 0x11, 0x48, 0x00, 0x52, 0x0a, 0x73, 0x68, 0x6f, 0x72, 0x74, 0x56, 0x61, 0x6c, 0x75, 0x65,
-	0x12, 0x1f, 0x0a, 0x0a, 0x63, 0x68, 0x61, 0x72, 0x5f, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x0a,
-	0x20, 0x01, 0x28, 0x11, 0x48, 0x00, 0x52, 0x09, 0x63, 0x68, 0x61, 0x72, 0x56, 0x61, 0x6c, 0x75,
-	0x65, 0x42, 0x06, 0x0a, 0x04, 0x74, 0x79, 0x70, 0x65, 0x1a, 0x36, 0x0a, 0x0f, 0x41, 0x67, 0x67,
-	0x53, 0x70, 0x65, 0x63, 0x57, 0x65, 0x69, 0x67, 0x68, 0x74, 0x65, 0x64, 0x12, 0x23, 0x0a, 0x0d,
-	0x77, 0x65, 0x69, 0x67, 0x68, 0x74, 0x5f, 0x63, 0x6f, 0x6c, 0x75, 0x6d, 0x6e, 0x18, 0x01, 0x20,
-	0x01, 0x28, 0x09, 0x52, 0x0c, 0x77, 0x65, 0x69, 0x67, 0x68, 0x74, 0x43, 0x6f, 0x6c, 0x75, 0x6d,
-	0x6e, 0x1a, 0x0f, 0x0a, 0x0d, 0x41, 0x67, 0x67, 0x53, 0x70, 0x65, 0x63, 0x41, 0x62, 0x73, 0x53,
-	0x75, 0x6d, 0x1a, 0x0c, 0x0a, 0x0a, 0x41, 0x67, 0x67, 0x53, 0x70, 0x65, 0x63, 0x41, 0x76, 0x67,
-	0x1a, 0x0e, 0x0a, 0x0c, 0x41, 0x67, 0x67, 0x53, 0x70, 0x65, 0x63, 0x46, 0x69, 0x72, 0x73, 0x74,
-	0x1a, 0x0f, 0x0a, 0x0d, 0x41, 0x67, 0x67, 0x53, 0x70, 0x65, 0x63, 0x46, 0x72, 0x65, 0x65, 0x7a,
-	0x65, 0x1a, 0x0e, 0x0a, 0x0c, 0x41, 0x67, 0x67, 0x53, 0x70, 0x65, 0x63, 0x47, 0x72, 0x6f, 0x75,
-	0x70, 0x1a, 0x0d, 0x0a, 0x0b, 0x41, 0x67, 0x67, 0x53, 0x70, 0x65, 0x63, 0x4c, 0x61, 0x73, 0x74,
-	0x1a, 0x0c, 0x0a, 0x0a, 0x41, 0x67, 0x67, 0x53, 0x70, 0x65, 0x63, 0x4d, 0x61, 0x78, 0x1a, 0x0c,
-	0x0a, 0x0a, 0x41, 0x67, 0x67, 0x53, 0x70, 0x65, 0x63, 0x4d, 0x69, 0x6e, 0x1a, 0x0c, 0x0a, 0x0a,
-	0x41, 0x67, 0x67, 0x53, 0x70, 0x65, 0x63, 0x53, 0x74, 0x64, 0x1a, 0x0c, 0x0a, 0x0a, 0x41, 0x67,
-	0x67, 0x53, 0x70, 0x65, 0x63, 0x53, 0x75, 0x6d, 0x1a, 0x0c, 0x0a, 0x0a, 0x41, 0x67, 0x67, 0x53,
-	0x70, 0x65, 0x63, 0x56, 0x61, 0x72, 0x42, 0x06, 0x0a, 0x04, 0x74, 0x79, 0x70, 0x65, 0x22, 0xae,
-	0x03, 0x0a, 0x10, 0x41, 0x67, 0x67, 0x72, 0x65, 0x67, 0x61, 0x74, 0x65, 0x52, 0x65, 0x71, 0x75,
-	0x65, 0x73, 0x74, 0x12, 0x46, 0x0a, 0x09, 0x72, 0x65, 0x73, 0x75, 0x6c, 0x74, 0x5f, 0x69, 0x64,
-	0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x29, 0x2e, 0x69, 0x6f, 0x2e, 0x64, 0x65, 0x65, 0x70,
-	0x68, 0x61, 0x76, 0x65, 0x6e, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x62, 0x61, 0x63, 0x6b,
-	0x70, 0x6c, 0x61, 0x6e, 0x65, 0x2e, 0x67, 0x72, 0x70, 0x63, 0x2e, 0x54, 0x69, 0x63, 0x6b, 0x65,
-	0x74, 0x52, 0x08, 0x72, 0x65, 0x73, 0x75, 0x6c, 0x74, 0x49, 0x64, 0x12, 0x4e, 0x0a, 0x09, 0x73,
-	0x6f, 0x75, 0x72, 0x63, 0x65, 0x5f, 0x69, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x31,
-	0x2e, 0x69, 0x6f, 0x2e, 0x64, 0x65, 0x65, 0x70, 0x68, 0x61, 0x76, 0x65, 0x6e, 0x2e, 0x70, 0x72,
-	0x6f, 0x74, 0x6f, 0x2e, 0x62, 0x61, 0x63, 0x6b, 0x70, 0x6c, 0x61, 0x6e, 0x65, 0x2e, 0x67, 0x72,
-	0x70, 0x63, 0x2e, 0x54, 0x61, 0x62, 0x6c, 0x65, 0x52, 0x65, 0x66, 0x65, 0x72, 0x65, 0x6e, 0x63,
-	0x65, 0x52, 0x08, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x49, 0x64, 0x12, 0x5d, 0x0a, 0x11, 0x69,
-	0x6e, 0x69, 0x74, 0x69, 0x61, 0x6c, 0x5f, 0x67, 0x72, 0x6f, 0x75, 0x70, 0x73, 0x5f, 0x69, 0x64,
-	0x18, 0x03, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x31, 0x2e, 0x69, 0x6f, 0x2e, 0x64, 0x65, 0x65, 0x70,
-	0x68, 0x61, 0x76, 0x65, 0x6e, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x62, 0x61, 0x63, 0x6b,
-	0x70, 0x6c, 0x61, 0x6e, 0x65, 0x2e, 0x67, 0x72, 0x70, 0x63, 0x2e, 0x54, 0x61, 0x62, 0x6c, 0x65,
-	0x52, 0x65, 0x66, 0x65, 0x72, 0x65, 0x6e, 0x63, 0x65, 0x52, 0x0f, 0x69, 0x6e, 0x69, 0x74, 0x69,
-	0x61, 0x6c, 0x47, 0x72, 0x6f, 0x75, 0x70, 0x73, 0x49, 0x64, 0x12, 0x25, 0x0a, 0x0e, 0x70, 0x72,
-	0x65, 0x73, 0x65, 0x72, 0x76, 0x65, 0x5f, 0x65, 0x6d, 0x70, 0x74, 0x79, 0x18, 0x04, 0x20, 0x01,
-	0x28, 0x08, 0x52, 0x0d, 0x70, 0x72, 0x65, 0x73, 0x65, 0x72, 0x76, 0x65, 0x45, 0x6d, 0x70, 0x74,
-	0x79, 0x12, 0x52, 0x0a, 0x0c, 0x61, 0x67, 0x67, 0x72, 0x65, 0x67, 0x61, 0x74, 0x69, 0x6f, 0x6e,
-	0x73, 0x18, 0x05, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x2e, 0x2e, 0x69, 0x6f, 0x2e, 0x64, 0x65, 0x65,
-	0x70, 0x68, 0x61, 0x76, 0x65, 0x6e, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x62, 0x61, 0x63,
-	0x6b, 0x70, 0x6c, 0x61, 0x6e, 0x65, 0x2e, 0x67, 0x72, 0x70, 0x63, 0x2e, 0x41, 0x67, 0x67, 0x72,
-	0x65, 0x67, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x52, 0x0c, 0x61, 0x67, 0x67, 0x72, 0x65, 0x67, 0x61,
-	0x74, 0x69, 0x6f, 0x6e, 0x73, 0x12, 0x28, 0x0a, 0x10, 0x67, 0x72, 0x6f, 0x75, 0x70, 0x5f, 0x62,
-	0x79, 0x5f, 0x63, 0x6f, 0x6c, 0x75, 0x6d, 0x6e, 0x73, 0x18, 0x06, 0x20, 0x03, 0x28, 0x09, 0x52,
-	0x0e, 0x67, 0x72, 0x6f, 0x75, 0x70, 0x42, 0x79, 0x43, 0x6f, 0x6c, 0x75, 0x6d, 0x6e, 0x73, 0x22,
-	0xd4, 0x06, 0x0a, 0x0b, 0x41, 0x67, 0x67, 0x72, 0x65, 0x67, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x12,
-	0x5d, 0x0a, 0x07, 0x63, 0x6f, 0x6c, 0x75, 0x6d, 0x6e, 0x73, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b,
-	0x32, 0x41, 0x2e, 0x69, 0x6f, 0x2e, 0x64, 0x65, 0x65, 0x70, 0x68, 0x61, 0x76, 0x65, 0x6e, 0x2e,
-	0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x62, 0x61, 0x63, 0x6b, 0x70, 0x6c, 0x61, 0x6e, 0x65, 0x2e,
-	0x67, 0x72, 0x70, 0x63, 0x2e, 0x41, 0x67, 0x67, 0x72, 0x65, 0x67, 0x61, 0x74, 0x69, 0x6f, 0x6e,
-	0x2e, 0x41, 0x67, 0x67, 0x72, 0x65, 0x67, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x43, 0x6f, 0x6c, 0x75,
-	0x6d, 0x6e, 0x73, 0x48, 0x00, 0x52, 0x07, 0x63, 0x6f, 0x6c, 0x75, 0x6d, 0x6e, 0x73, 0x12, 0x57,
-	0x0a, 0x05, 0x63, 0x6f, 0x75, 0x6e, 0x74, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x3f, 0x2e,
+	0x67, 0x53, 0x70, 0x65, 0x63, 0x53, 0x74, 0x64, 0x48, 0x00, 0x52, 0x03, 0x73, 0x74, 0x64, 0x12,
+	0x49, 0x0a, 0x03, 0x73, 0x75, 0x6d, 0x18, 0x12, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x35, 0x2e, 0x69,
+	0x6f, 0x2e, 0x64, 0x65, 0x65, 0x70, 0x68, 0x61, 0x76, 0x65, 0x6e, 0x2e, 0x70, 0x72, 0x6f, 0x74,
+	0x6f, 0x2e, 0x62, 0x61, 0x63, 0x6b, 0x70, 0x6c, 0x61, 0x6e, 0x65, 0x2e, 0x67, 0x72, 0x70, 0x63,
+	0x2e, 0x41, 0x67, 0x67, 0x53, 0x70, 0x65, 0x63, 0x2e, 0x41, 0x67, 0x67, 0x53, 0x70, 0x65, 0x63,
+	0x53, 0x75, 0x6d, 0x48, 0x00, 0x52, 0x03, 0x73, 0x75, 0x6d, 0x12, 0x56, 0x0a, 0x08, 0x74, 0x5f,
+	0x64, 0x69, 0x67, 0x65, 0x73, 0x74, 0x18, 0x13, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x39, 0x2e, 0x69,
+	0x6f, 0x2e, 0x64, 0x65, 0x65, 0x70, 0x68, 0x61, 0x76, 0x65, 0x6e, 0x2e, 0x70, 0x72, 0x6f, 0x74,
+	0x6f, 0x2e, 0x62, 0x61, 0x63, 0x6b, 0x70, 0x6c, 0x61, 0x6e, 0x65, 0x2e, 0x67, 0x72, 0x70, 0x63,
+	0x2e, 0x41, 0x67, 0x67, 0x53, 0x70, 0x65, 0x63, 0x2e, 0x41, 0x67, 0x67, 0x53, 0x70, 0x65, 0x63,
+	0x54, 0x44, 0x69, 0x67, 0x65, 0x73, 0x74, 0x48, 0x00, 0x52, 0x07, 0x74, 0x44, 0x69, 0x67, 0x65,
+	0x73, 0x74, 0x12, 0x52, 0x0a, 0x06, 0x75, 0x6e, 0x69, 0x71, 0x75, 0x65, 0x18, 0x14, 0x20, 0x01,
+	0x28, 0x0b, 0x32, 0x38, 0x2e, 0x69, 0x6f, 0x2e, 0x64, 0x65, 0x65, 0x70, 0x68, 0x61, 0x76, 0x65,
+	0x6e, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x62, 0x61, 0x63, 0x6b, 0x70, 0x6c, 0x61, 0x6e,
+	0x65, 0x2e, 0x67, 0x72, 0x70, 0x63, 0x2e, 0x41, 0x67, 0x67, 0x53, 0x70, 0x65, 0x63, 0x2e, 0x41,
+	0x67, 0x67, 0x53, 0x70, 0x65, 0x63, 0x55, 0x6e, 0x69, 0x71, 0x75, 0x65, 0x48, 0x00, 0x52, 0x06,
+	0x75, 0x6e, 0x69, 0x71, 0x75, 0x65, 0x12, 0x5f, 0x0a, 0x0c, 0x77, 0x65, 0x69, 0x67, 0x68, 0x74,
+	0x65, 0x64, 0x5f, 0x61, 0x76, 0x67, 0x18, 0x15, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x3a, 0x2e, 0x69,
+	0x6f, 0x2e, 0x64, 0x65, 0x65, 0x70, 0x68, 0x61, 0x76, 0x65, 0x6e, 0x2e, 0x70, 0x72, 0x6f, 0x74,
+	0x6f, 0x2e, 0x62, 0x61, 0x63, 0x6b, 0x70, 0x6c, 0x61, 0x6e, 0x65, 0x2e, 0x67, 0x72, 0x70, 0x63,
+	0x2e, 0x41, 0x67, 0x67, 0x53, 0x70, 0x65, 0x63, 0x2e, 0x41, 0x67, 0x67, 0x53, 0x70, 0x65, 0x63,
+	0x57, 0x65, 0x69, 0x67, 0x68, 0x74, 0x65, 0x64, 0x48, 0x00, 0x52, 0x0b, 0x77, 0x65, 0x69, 0x67,
+	0x68, 0x74, 0x65, 0x64, 0x41, 0x76, 0x67, 0x12, 0x5f, 0x0a, 0x0c, 0x77, 0x65, 0x69, 0x67, 0x68,
+	0x74, 0x65, 0x64, 0x5f, 0x73, 0x75, 0x6d, 0x18, 0x16, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x3a, 0x2e,
 	0x69, 0x6f, 0x2e, 0x64, 0x65, 0x65, 0x70, 0x68, 0x61, 0x76, 0x65, 0x6e, 0x2e, 0x70, 0x72, 0x6f,
 	0x74, 0x6f, 0x2e, 0x62, 0x61, 0x63, 0x6b, 0x70, 0x6c, 0x61, 0x6e, 0x65, 0x2e, 0x67, 0x72, 0x70,
-	0x63, 0x2e, 0x41, 0x67, 0x67, 0x72, 0x65, 0x67, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x2e, 0x41, 0x67,
-	0x67, 0x72, 0x65, 0x67, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x43, 0x6f, 0x75, 0x6e, 0x74, 0x48, 0x00,
-	0x52, 0x05, 0x63, 0x6f, 0x75, 0x6e, 0x74, 0x12, 0x66, 0x0a, 0x0d, 0x66, 0x69, 0x72, 0x73, 0x74,
-	0x5f, 0x72, 0x6f, 0x77, 0x5f, 0x6b, 0x65, 0x79, 0x18, 0x03, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x40,
-	0x2e, 0x69, 0x6f, 0x2e, 0x64, 0x65, 0x65, 0x70, 0x68, 0x61, 0x76, 0x65, 0x6e, 0x2e, 0x70, 0x72,
-	0x6f, 0x74, 0x6f, 0x2e, 0x62, 0x61, 0x63, 0x6b, 0x70, 0x6c, 0x61, 0x6e, 0x65, 0x2e, 0x67, 0x72,
-	0x70, 0x63, 0x2e, 0x41, 0x67, 0x67, 0x72, 0x65, 0x67, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x2e, 0x41,
-	0x67, 0x67, 0x72, 0x65, 0x67, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x52, 0x6f, 0x77, 0x4b, 0x65, 0x79,
-	0x48, 0x00, 0x52, 0x0b, 0x66, 0x69, 0x72, 0x73, 0x74, 0x52, 0x6f, 0x77, 0x4b, 0x65, 0x79, 0x12,
-	0x64, 0x0a, 0x0c, 0x6c, 0x61, 0x73, 0x74, 0x5f, 0x72, 0x6f, 0x77, 0x5f, 0x6b, 0x65, 0x79, 0x18,
-	0x04, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x40, 0x2e, 0x69, 0x6f, 0x2e, 0x64, 0x65, 0x65, 0x70, 0x68,
+	0x63, 0x2e, 0x41, 0x67, 0x67, 0x53, 0x70, 0x65, 0x63, 0x2e, 0x41, 0x67, 0x67, 0x53, 0x70, 0x65,
+	0x63, 0x57, 0x65, 0x69, 0x67, 0x68, 0x74, 0x65, 0x64, 0x48, 0x00, 0x52, 0x0b, 0x77, 0x65, 0x69,
+	0x67, 0x68, 0x74, 0x65, 0x64, 0x53, 0x75, 0x6d, 0x12, 0x49, 0x0a, 0x03, 0x76, 0x61, 0x72, 0x18,
+	0x17, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x35, 0x2e, 0x69, 0x6f, 0x2e, 0x64, 0x65, 0x65, 0x70, 0x68,
 	0x61, 0x76, 0x65, 0x6e, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x62, 0x61, 0x63, 0x6b, 0x70,
-	0x6c, 0x61, 0x6e, 0x65, 0x2e, 0x67, 0x72, 0x70, 0x63, 0x2e, 0x41, 0x67, 0x67, 0x72, 0x65, 0x67,
-	0x61, 0x74, 0x69, 0x6f, 0x6e, 0x2e, 0x41, 0x67, 0x67, 0x72, 0x65, 0x67, 0x61, 0x74, 0x69, 0x6f,
-	0x6e, 0x52, 0x6f, 0x77, 0x4b, 0x65, 0x79, 0x48, 0x00, 0x52, 0x0a, 0x6c, 0x61, 0x73, 0x74, 0x52,
-	0x6f, 0x77, 0x4b, 0x65, 0x79, 0x12, 0x63, 0x0a, 0x09, 0x70, 0x61, 0x72, 0x74, 0x69, 0x74, 0x69,
-	0x6f, 0x6e, 0x18, 0x05, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x43, 0x2e, 0x69, 0x6f, 0x2e, 0x64, 0x65,
-	0x65, 0x70, 0x68, 0x61, 0x76, 0x65, 0x6e, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x62, 0x61,
-	0x63, 0x6b, 0x70, 0x6c, 0x61, 0x6e, 0x65, 0x2e, 0x67, 0x72, 0x70, 0x63, 0x2e, 0x41, 0x67, 0x67,
-	0x72, 0x65, 0x67, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x2e, 0x41, 0x67, 0x67, 0x72, 0x65, 0x67, 0x61,
-	0x74, 0x69, 0x6f, 0x6e, 0x50, 0x61, 0x72, 0x74, 0x69, 0x74, 0x69, 0x6f, 0x6e, 0x48, 0x00, 0x52,
-	0x09, 0x70, 0x61, 0x72, 0x74, 0x69, 0x74, 0x69, 0x6f, 0x6e, 0x1a, 0x75, 0x0a, 0x12, 0x41, 0x67,
-	0x67, 0x72, 0x65, 0x67, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x43, 0x6f, 0x6c, 0x75, 0x6d, 0x6e, 0x73,
-	0x12, 0x3e, 0x0a, 0x04, 0x73, 0x70, 0x65, 0x63, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x2a,
-	0x2e, 0x69, 0x6f, 0x2e, 0x64, 0x65, 0x65, 0x70, 0x68, 0x61, 0x76, 0x65, 0x6e, 0x2e, 0x70, 0x72,
-	0x6f, 0x74, 0x6f, 0x2e, 0x62, 0x61, 0x63, 0x6b, 0x70, 0x6c, 0x61, 0x6e, 0x65, 0x2e, 0x67, 0x72,
-	0x70, 0x63, 0x2e, 0x41, 0x67, 0x67, 0x53, 0x70, 0x65, 0x63, 0x52, 0x04, 0x73, 0x70, 0x65, 0x63,
-	0x12, 0x1f, 0x0a, 0x0b, 0x6d, 0x61, 0x74, 0x63, 0x68, 0x5f, 0x70, 0x61, 0x69, 0x72, 0x73, 0x18,
-	0x02, 0x20, 0x03, 0x28, 0x09, 0x52, 0x0a, 0x6d, 0x61, 0x74, 0x63, 0x68, 0x50, 0x61, 0x69, 0x72,
-	0x73, 0x1a, 0x33, 0x0a, 0x10, 0x41, 0x67, 0x67, 0x72, 0x65, 0x67, 0x61, 0x74, 0x69, 0x6f, 0x6e,
-	0x43, 0x6f, 0x75, 0x6e, 0x74, 0x12, 0x1f, 0x0a, 0x0b, 0x63, 0x6f, 0x6c, 0x75, 0x6d, 0x6e, 0x5f,
-	0x6e, 0x61, 0x6d, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0a, 0x63, 0x6f, 0x6c, 0x75,
-	0x6d, 0x6e, 0x4e, 0x61, 0x6d, 0x65, 0x1a, 0x34, 0x0a, 0x11, 0x41, 0x67, 0x67, 0x72, 0x65, 0x67,
+	0x6c, 0x61, 0x6e, 0x65, 0x2e, 0x67, 0x72, 0x70, 0x63, 0x2e, 0x41, 0x67, 0x67, 0x53, 0x70, 0x65,
+	0x63, 0x2e, 0x41, 0x67, 0x67, 0x53, 0x70, 0x65, 0x63, 0x56, 0x61, 0x72, 0x48, 0x00, 0x52, 0x03,
+	0x76, 0x61, 0x72, 0x1a, 0x75, 0x0a, 0x1c, 0x41, 0x67, 0x67, 0x53, 0x70, 0x65, 0x63, 0x41, 0x70,
+	0x70, 0x72, 0x6f, 0x78, 0x69, 0x6d, 0x61, 0x74, 0x65, 0x50, 0x65, 0x72, 0x63, 0x65, 0x6e, 0x74,
+	0x69, 0x6c, 0x65, 0x12, 0x1e, 0x0a, 0x0a, 0x70, 0x65, 0x72, 0x63, 0x65, 0x6e, 0x74, 0x69, 0x6c,
+	0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x01, 0x52, 0x0a, 0x70, 0x65, 0x72, 0x63, 0x65, 0x6e, 0x74,
+	0x69, 0x6c, 0x65, 0x12, 0x25, 0x0a, 0x0b, 0x63, 0x6f, 0x6d, 0x70, 0x72, 0x65, 0x73, 0x73, 0x69,
+	0x6f, 0x6e, 0x18, 0x02, 0x20, 0x01, 0x28, 0x01, 0x48, 0x00, 0x52, 0x0b, 0x63, 0x6f, 0x6d, 0x70,
+	0x72, 0x65, 0x73, 0x73, 0x69, 0x6f, 0x6e, 0x88, 0x01, 0x01, 0x42, 0x0e, 0x0a, 0x0c, 0x5f, 0x63,
+	0x6f, 0x6d, 0x70, 0x72, 0x65, 0x73, 0x73, 0x69, 0x6f, 0x6e, 0x1a, 0x37, 0x0a, 0x14, 0x41, 0x67,
+	0x67, 0x53, 0x70, 0x65, 0x63, 0x43, 0x6f, 0x75, 0x6e, 0x74, 0x44, 0x69, 0x73, 0x74, 0x69, 0x6e,
+	0x63, 0x74, 0x12, 0x1f, 0x0a, 0x0b, 0x63, 0x6f, 0x75, 0x6e, 0x74, 0x5f, 0x6e, 0x75, 0x6c, 0x6c,
+	0x73, 0x18, 0x01, 0x20, 0x01, 0x28, 0x08, 0x52, 0x0a, 0x63, 0x6f, 0x75, 0x6e, 0x74, 0x4e, 0x75,
+	0x6c, 0x6c, 0x73, 0x1a, 0x36, 0x0a, 0x0f, 0x41, 0x67, 0x67, 0x53, 0x70, 0x65, 0x63, 0x44, 0x69,
+	0x73, 0x74, 0x69, 0x6e, 0x63, 0x74, 0x12, 0x23, 0x0a, 0x0d, 0x69, 0x6e, 0x63, 0x6c, 0x75, 0x64,
+	0x65, 0x5f, 0x6e, 0x75, 0x6c, 0x6c, 0x73, 0x18, 0x01, 0x20, 0x01, 0x28, 0x08, 0x52, 0x0c, 0x69,
+	0x6e, 0x63, 0x6c, 0x75, 0x64, 0x65, 0x4e, 0x75, 0x6c, 0x6c, 0x73, 0x1a, 0x4b, 0x0a, 0x0e, 0x41,
+	0x67, 0x67, 0x53, 0x70, 0x65, 0x63, 0x46, 0x6f, 0x72, 0x6d, 0x75, 0x6c, 0x61, 0x12, 0x18, 0x0a,
+	0x07, 0x66, 0x6f, 0x72, 0x6d, 0x75, 0x6c, 0x61, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x07,
+	0x66, 0x6f, 0x72, 0x6d, 0x75, 0x6c, 0x61, 0x12, 0x1f, 0x0a, 0x0b, 0x70, 0x61, 0x72, 0x61, 0x6d,
+	0x5f, 0x74, 0x6f, 0x6b, 0x65, 0x6e, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0a, 0x70, 0x61,
+	0x72, 0x61, 0x6d, 0x54, 0x6f, 0x6b, 0x65, 0x6e, 0x1a, 0x45, 0x0a, 0x0d, 0x41, 0x67, 0x67, 0x53,
+	0x70, 0x65, 0x63, 0x4d, 0x65, 0x64, 0x69, 0x61, 0x6e, 0x12, 0x34, 0x0a, 0x16, 0x61, 0x76, 0x65,
+	0x72, 0x61, 0x67, 0x65, 0x5f, 0x65, 0x76, 0x65, 0x6e, 0x6c, 0x79, 0x5f, 0x64, 0x69, 0x76, 0x69,
+	0x64, 0x65, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x08, 0x52, 0x14, 0x61, 0x76, 0x65, 0x72, 0x61,
+	0x67, 0x65, 0x45, 0x76, 0x65, 0x6e, 0x6c, 0x79, 0x44, 0x69, 0x76, 0x69, 0x64, 0x65, 0x64, 0x1a,
+	0x69, 0x0a, 0x11, 0x41, 0x67, 0x67, 0x53, 0x70, 0x65, 0x63, 0x50, 0x65, 0x72, 0x63, 0x65, 0x6e,
+	0x74, 0x69, 0x6c, 0x65, 0x12, 0x1e, 0x0a, 0x0a, 0x70, 0x65, 0x72, 0x63, 0x65, 0x6e, 0x74, 0x69,
+	0x6c, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x01, 0x52, 0x0a, 0x70, 0x65, 0x72, 0x63, 0x65, 0x6e,
+	0x74, 0x69, 0x6c, 0x65, 0x12, 0x34, 0x0a, 0x16, 0x61, 0x76, 0x65, 0x72, 0x61, 0x67, 0x65, 0x5f,
+	0x65, 0x76, 0x65, 0x6e, 0x6c, 0x79, 0x5f, 0x64, 0x69, 0x76, 0x69, 0x64, 0x65, 0x64, 0x18, 0x02,
+	0x20, 0x01, 0x28, 0x08, 0x52, 0x14, 0x61, 0x76, 0x65, 0x72, 0x61, 0x67, 0x65, 0x45, 0x76, 0x65,
+	0x6e, 0x6c, 0x79, 0x44, 0x69, 0x76, 0x69, 0x64, 0x65, 0x64, 0x1a, 0x69, 0x0a, 0x0d, 0x41, 0x67,
+	0x67, 0x53, 0x70, 0x65, 0x63, 0x53, 0x6f, 0x72, 0x74, 0x65, 0x64, 0x12, 0x58, 0x0a, 0x07, 0x63,
+	0x6f, 0x6c, 0x75, 0x6d, 0x6e, 0x73, 0x18, 0x01, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x3e, 0x2e, 0x69,
+	0x6f, 0x2e, 0x64, 0x65, 0x65, 0x70, 0x68, 0x61, 0x76, 0x65, 0x6e, 0x2e, 0x70, 0x72, 0x6f, 0x74,
+	0x6f, 0x2e, 0x62, 0x61, 0x63, 0x6b, 0x70, 0x6c, 0x61, 0x6e, 0x65, 0x2e, 0x67, 0x72, 0x70, 0x63,
+	0x2e, 0x41, 0x67, 0x67, 0x53, 0x70, 0x65, 0x63, 0x2e, 0x41, 0x67, 0x67, 0x53, 0x70, 0x65, 0x63,
+	0x53, 0x6f, 0x72, 0x74, 0x65, 0x64, 0x43, 0x6f, 0x6c, 0x75, 0x6d, 0x6e, 0x52, 0x07, 0x63, 0x6f,
+	0x6c, 0x75, 0x6d, 0x6e, 0x73, 0x1a, 0x36, 0x0a, 0x13, 0x41, 0x67, 0x67, 0x53, 0x70, 0x65, 0x63,
+	0x53, 0x6f, 0x72, 0x74, 0x65, 0x64, 0x43, 0x6f, 0x6c, 0x75, 0x6d, 0x6e, 0x12, 0x1f, 0x0a, 0x0b,
+	0x63, 0x6f, 0x6c, 0x75, 0x6d, 0x6e, 0x5f, 0x6e, 0x61, 0x6d, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28,
+	0x09, 0x52, 0x0a, 0x63, 0x6f, 0x6c, 0x75, 0x6d, 0x6e, 0x4e, 0x61, 0x6d, 0x65, 0x1a, 0x47, 0x0a,
+	0x0e, 0x41, 0x67, 0x67, 0x53, 0x70, 0x65, 0x63, 0x54, 0x44, 0x69, 0x67, 0x65, 0x73, 0x74, 0x12,
+	0x25, 0x0a, 0x0b, 0x63, 0x6f, 0x6d, 0x70, 0x72, 0x65, 0x73, 0x73, 0x69, 0x6f, 0x6e, 0x18, 0x01,
+	0x20, 0x01, 0x28, 0x01, 0x48, 0x00, 0x52, 0x0b, 0x63, 0x6f, 0x6d, 0x70, 0x72, 0x65, 0x73, 0x73,
+	0x69, 0x6f, 0x6e, 0x88, 0x01, 0x01, 0x42, 0x0e, 0x0a, 0x0c, 0x5f, 0x63, 0x6f, 0x6d, 0x70, 0x72,
+	0x65, 0x73, 0x73, 0x69, 0x6f, 0x6e, 0x1a, 0xa9, 0x01, 0x0a, 0x0d, 0x41, 0x67, 0x67, 0x53, 0x70,
+	0x65, 0x63, 0x55, 0x6e, 0x69, 0x71, 0x75, 0x65, 0x12, 0x23, 0x0a, 0x0d, 0x69, 0x6e, 0x63, 0x6c,
+	0x75, 0x64, 0x65, 0x5f, 0x6e, 0x75, 0x6c, 0x6c, 0x73, 0x18, 0x01, 0x20, 0x01, 0x28, 0x08, 0x52,
+	0x0c, 0x69, 0x6e, 0x63, 0x6c, 0x75, 0x64, 0x65, 0x4e, 0x75, 0x6c, 0x6c, 0x73, 0x12, 0x73, 0x0a,
+	0x13, 0x6e, 0x6f, 0x6e, 0x5f, 0x75, 0x6e, 0x69, 0x71, 0x75, 0x65, 0x5f, 0x73, 0x65, 0x6e, 0x74,
+	0x69, 0x6e, 0x65, 0x6c, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x43, 0x2e, 0x69, 0x6f, 0x2e,
+	0x64, 0x65, 0x65, 0x70, 0x68, 0x61, 0x76, 0x65, 0x6e, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e,
+	0x62, 0x61, 0x63, 0x6b, 0x70, 0x6c, 0x61, 0x6e, 0x65, 0x2e, 0x67, 0x72, 0x70, 0x63, 0x2e, 0x41,
+	0x67, 0x67, 0x53, 0x70, 0x65, 0x63, 0x2e, 0x41, 0x67, 0x67, 0x53, 0x70, 0x65, 0x63, 0x4e, 0x6f,
+	0x6e, 0x55, 0x6e, 0x69, 0x71, 0x75, 0x65, 0x53, 0x65, 0x6e, 0x74, 0x69, 0x6e, 0x65, 0x6c, 0x52,
+	0x11, 0x6e, 0x6f, 0x6e, 0x55, 0x6e, 0x69, 0x71, 0x75, 0x65, 0x53, 0x65, 0x6e, 0x74, 0x69, 0x6e,
+	0x65, 0x6c, 0x1a, 0xa8, 0x03, 0x0a, 0x18, 0x41, 0x67, 0x67, 0x53, 0x70, 0x65, 0x63, 0x4e, 0x6f,
+	0x6e, 0x55, 0x6e, 0x69, 0x71, 0x75, 0x65, 0x53, 0x65, 0x6e, 0x74, 0x69, 0x6e, 0x65, 0x6c, 0x12,
+	0x4d, 0x0a, 0x0a, 0x6e, 0x75, 0x6c, 0x6c, 0x5f, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x01, 0x20,
+	0x01, 0x28, 0x0e, 0x32, 0x2c, 0x2e, 0x69, 0x6f, 0x2e, 0x64, 0x65, 0x65, 0x70, 0x68, 0x61, 0x76,
+	0x65, 0x6e, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x62, 0x61, 0x63, 0x6b, 0x70, 0x6c, 0x61,
+	0x6e, 0x65, 0x2e, 0x67, 0x72, 0x70, 0x63, 0x2e, 0x4e, 0x75, 0x6c, 0x6c, 0x56, 0x61, 0x6c, 0x75,
+	0x65, 0x48, 0x00, 0x52, 0x09, 0x6e, 0x75, 0x6c, 0x6c, 0x56, 0x61, 0x6c, 0x75, 0x65, 0x12, 0x23,
+	0x0a, 0x0c, 0x73, 0x74, 0x72, 0x69, 0x6e, 0x67, 0x5f, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02,
+	0x20, 0x01, 0x28, 0x09, 0x48, 0x00, 0x52, 0x0b, 0x73, 0x74, 0x72, 0x69, 0x6e, 0x67, 0x56, 0x61,
+	0x6c, 0x75, 0x65, 0x12, 0x1d, 0x0a, 0x09, 0x69, 0x6e, 0x74, 0x5f, 0x76, 0x61, 0x6c, 0x75, 0x65,
+	0x18, 0x03, 0x20, 0x01, 0x28, 0x11, 0x48, 0x00, 0x52, 0x08, 0x69, 0x6e, 0x74, 0x56, 0x61, 0x6c,
+	0x75, 0x65, 0x12, 0x23, 0x0a, 0x0a, 0x6c, 0x6f, 0x6e, 0x67, 0x5f, 0x76, 0x61, 0x6c, 0x75, 0x65,
+	0x18, 0x04, 0x20, 0x01, 0x28, 0x12, 0x42, 0x02, 0x30, 0x01, 0x48, 0x00, 0x52, 0x09, 0x6c, 0x6f,
+	0x6e, 0x67, 0x56, 0x61, 0x6c, 0x75, 0x65, 0x12, 0x21, 0x0a, 0x0b, 0x66, 0x6c, 0x6f, 0x61, 0x74,
+	0x5f, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x05, 0x20, 0x01, 0x28, 0x02, 0x48, 0x00, 0x52, 0x0a,
+	0x66, 0x6c, 0x6f, 0x61, 0x74, 0x56, 0x61, 0x6c, 0x75, 0x65, 0x12, 0x23, 0x0a, 0x0c, 0x64, 0x6f,
+	0x75, 0x62, 0x6c, 0x65, 0x5f, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x06, 0x20, 0x01, 0x28, 0x01,
+	0x48, 0x00, 0x52, 0x0b, 0x64, 0x6f, 0x75, 0x62, 0x6c, 0x65, 0x56, 0x61, 0x6c, 0x75, 0x65, 0x12,
+	0x1f, 0x0a, 0x0a, 0x62, 0x6f, 0x6f, 0x6c, 0x5f, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x07, 0x20,
+	0x01, 0x28, 0x08, 0x48, 0x00, 0x52, 0x09, 0x62, 0x6f, 0x6f, 0x6c, 0x56, 0x61, 0x6c, 0x75, 0x65,
+	0x12, 0x1f, 0x0a, 0x0a, 0x62, 0x79, 0x74, 0x65, 0x5f, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x08,
+	0x20, 0x01, 0x28, 0x11, 0x48, 0x00, 0x52, 0x09, 0x62, 0x79, 0x74, 0x65, 0x56, 0x61, 0x6c, 0x75,
+	0x65, 0x12, 0x21, 0x0a, 0x0b, 0x73, 0x68, 0x6f, 0x72, 0x74, 0x5f, 0x76, 0x61, 0x6c, 0x75, 0x65,
+	0x18, 0x09, 0x20, 0x01, 0x28, 0x11, 0x48, 0x00, 0x52, 0x0a, 0x73, 0x68, 0x6f, 0x72, 0x74, 0x56,
+	0x61, 0x6c, 0x75, 0x65, 0x12, 0x1f, 0x0a, 0x0a, 0x63, 0x68, 0x61, 0x72, 0x5f, 0x76, 0x61, 0x6c,
+	0x75, 0x65, 0x18, 0x0a, 0x20, 0x01, 0x28, 0x11, 0x48, 0x00, 0x52, 0x09, 0x63, 0x68, 0x61, 0x72,
+	0x56, 0x61, 0x6c, 0x75, 0x65, 0x42, 0x06, 0x0a, 0x04, 0x74, 0x79, 0x70, 0x65, 0x1a, 0x36, 0x0a,
+	0x0f, 0x41, 0x67, 0x67, 0x53, 0x70, 0x65, 0x63, 0x57, 0x65, 0x69, 0x67, 0x68, 0x74, 0x65, 0x64,
+	0x12, 0x23, 0x0a, 0x0d, 0x77, 0x65, 0x69, 0x67, 0x68, 0x74, 0x5f, 0x63, 0x6f, 0x6c, 0x75, 0x6d,
+	0x6e, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0c, 0x77, 0x65, 0x69, 0x67, 0x68, 0x74, 0x43,
+	0x6f, 0x6c, 0x75, 0x6d, 0x6e, 0x1a, 0x0f, 0x0a, 0x0d, 0x41, 0x67, 0x67, 0x53, 0x70, 0x65, 0x63,
+	0x41, 0x62, 0x73, 0x53, 0x75, 0x6d, 0x1a, 0x0c, 0x0a, 0x0a, 0x41, 0x67, 0x67, 0x53, 0x70, 0x65,
+	0x63, 0x41, 0x76, 0x67, 0x1a, 0x0e, 0x0a, 0x0c, 0x41, 0x67, 0x67, 0x53, 0x70, 0x65, 0x63, 0x46,
+	0x69, 0x72, 0x73, 0x74, 0x1a, 0x0f, 0x0a, 0x0d, 0x41, 0x67, 0x67, 0x53, 0x70, 0x65, 0x63, 0x46,
+	0x72, 0x65, 0x65, 0x7a, 0x65, 0x1a, 0x0e, 0x0a, 0x0c, 0x41, 0x67, 0x67, 0x53, 0x70, 0x65, 0x63,
+	0x47, 0x72, 0x6f, 0x75, 0x70, 0x1a, 0x0d, 0x0a, 0x0b, 0x41, 0x67, 0x67, 0x53, 0x70, 0x65, 0x63,
+	0x4c, 0x61, 0x73, 0x74, 0x1a, 0x0c, 0x0a, 0x0a, 0x41, 0x67, 0x67, 0x53, 0x70, 0x65, 0x63, 0x4d,
+	0x61, 0x78, 0x1a, 0x0c, 0x0a, 0x0a, 0x41, 0x67, 0x67, 0x53, 0x70, 0x65, 0x63, 0x4d, 0x69, 0x6e,
+	0x1a, 0x0c, 0x0a, 0x0a, 0x41, 0x67, 0x67, 0x53, 0x70, 0x65, 0x63, 0x53, 0x74, 0x64, 0x1a, 0x0c,
+	0x0a, 0x0a, 0x41, 0x67, 0x67, 0x53, 0x70, 0x65, 0x63, 0x53, 0x75, 0x6d, 0x1a, 0x0c, 0x0a, 0x0a,
+	0x41, 0x67, 0x67, 0x53, 0x70, 0x65, 0x63, 0x56, 0x61, 0x72, 0x42, 0x06, 0x0a, 0x04, 0x74, 0x79,
+	0x70, 0x65, 0x22, 0xae, 0x03, 0x0a, 0x10, 0x41, 0x67, 0x67, 0x72, 0x65, 0x67, 0x61, 0x74, 0x65,
+	0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x46, 0x0a, 0x09, 0x72, 0x65, 0x73, 0x75, 0x6c,
+	0x74, 0x5f, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x29, 0x2e, 0x69, 0x6f, 0x2e,
+	0x64, 0x65, 0x65, 0x70, 0x68, 0x61, 0x76, 0x65, 0x6e, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e,
+	0x62, 0x61, 0x63, 0x6b, 0x70, 0x6c, 0x61, 0x6e, 0x65, 0x2e, 0x67, 0x72, 0x70, 0x63, 0x2e, 0x54,
+	0x69, 0x63, 0x6b, 0x65, 0x74, 0x52, 0x08, 0x72, 0x65, 0x73, 0x75, 0x6c, 0x74, 0x49, 0x64, 0x12,
+	0x4e, 0x0a, 0x09, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x5f, 0x69, 0x64, 0x18, 0x02, 0x20, 0x01,
+	0x28, 0x0b, 0x32, 0x31, 0x2e, 0x69, 0x6f, 0x2e, 0x64, 0x65, 0x65, 0x70, 0x68, 0x61, 0x76, 0x65,
+	0x6e, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x62, 0x61, 0x63, 0x6b, 0x70, 0x6c, 0x61, 0x6e,
+	0x65, 0x2e, 0x67, 0x72, 0x70, 0x63, 0x2e, 0x54, 0x61, 0x62, 0x6c, 0x65, 0x52, 0x65, 0x66, 0x65,
+	0x72, 0x65, 0x6e, 0x63, 0x65, 0x52, 0x08, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x49, 0x64, 0x12,
+	0x5d, 0x0a, 0x11, 0x69, 0x6e, 0x69, 0x74, 0x69, 0x61, 0x6c, 0x5f, 0x67, 0x72, 0x6f, 0x75, 0x70,
+	0x73, 0x5f, 0x69, 0x64, 0x18, 0x03, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x31, 0x2e, 0x69, 0x6f, 0x2e,
+	0x64, 0x65, 0x65, 0x70, 0x68, 0x61, 0x76, 0x65, 0x6e, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e,
+	0x62, 0x61, 0x63, 0x6b, 0x70, 0x6c, 0x61, 0x6e, 0x65, 0x2e, 0x67, 0x72, 0x70, 0x63, 0x2e, 0x54,
+	0x61, 0x62, 0x6c, 0x65, 0x52, 0x65, 0x66, 0x65, 0x72, 0x65, 0x6e, 0x63, 0x65, 0x52, 0x0f, 0x69,
+	0x6e, 0x69, 0x74, 0x69, 0x61, 0x6c, 0x47, 0x72, 0x6f, 0x75, 0x70, 0x73, 0x49, 0x64, 0x12, 0x25,
+	0x0a, 0x0e, 0x70, 0x72, 0x65, 0x73, 0x65, 0x72, 0x76, 0x65, 0x5f, 0x65, 0x6d, 0x70, 0x74, 0x79,
+	0x18, 0x04, 0x20, 0x01, 0x28, 0x08, 0x52, 0x0d, 0x70, 0x72, 0x65, 0x73, 0x65, 0x72, 0x76, 0x65,
+	0x45, 0x6d, 0x70, 0x74, 0x79, 0x12, 0x52, 0x0a, 0x0c, 0x61, 0x67, 0x67, 0x72, 0x65, 0x67, 0x61,
+	0x74, 0x69, 0x6f, 0x6e, 0x73, 0x18, 0x05, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x2e, 0x2e, 0x69, 0x6f,
+	0x2e, 0x64, 0x65, 0x65, 0x70, 0x68, 0x61, 0x76, 0x65, 0x6e, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f,
+	0x2e, 0x62, 0x61, 0x63, 0x6b, 0x70, 0x6c, 0x61, 0x6e, 0x65, 0x2e, 0x67, 0x72, 0x70, 0x63, 0x2e,
+	0x41, 0x67, 0x67, 0x72, 0x65, 0x67, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x52, 0x0c, 0x61, 0x67, 0x67,
+	0x72, 0x65, 0x67, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x12, 0x28, 0x0a, 0x10, 0x67, 0x72, 0x6f,
+	0x75, 0x70, 0x5f, 0x62, 0x79, 0x5f, 0x63, 0x6f, 0x6c, 0x75, 0x6d, 0x6e, 0x73, 0x18, 0x06, 0x20,
+	0x03, 0x28, 0x09, 0x52, 0x0e, 0x67, 0x72, 0x6f, 0x75, 0x70, 0x42, 0x79, 0x43, 0x6f, 0x6c, 0x75,
+	0x6d, 0x6e, 0x73, 0x22, 0xd5, 0x09, 0x0a, 0x0b, 0x41, 0x67, 0x67, 0x72, 0x65, 0x67, 0x61, 0x74,
+	0x69, 0x6f, 0x6e, 0x12, 0x5d, 0x0a, 0x07, 0x63, 0x6f, 0x6c, 0x75, 0x6d, 0x6e, 0x73, 0x18, 0x01,
+	0x20, 0x01, 0x28, 0x0b, 0x32, 0x41, 0x2e, 0x69, 0x6f, 0x2e, 0x64, 0x65, 0x65, 0x70, 0x68, 0x61,
+	0x76, 0x65, 0x6e, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x62, 0x61, 0x63, 0x6b, 0x70, 0x6c,
+	0x61, 0x6e, 0x65, 0x2e, 0x67, 0x72, 0x70, 0x63, 0x2e, 0x41, 0x67, 0x67, 0x72, 0x65, 0x67, 0x61,
+	0x74, 0x69, 0x6f, 0x6e, 0x2e, 0x41, 0x67, 0x67, 0x72, 0x65, 0x67, 0x61, 0x74, 0x69, 0x6f, 0x6e,
+	0x43, 0x6f, 0x6c, 0x75, 0x6d, 0x6e, 0x73, 0x48, 0x00, 0x52, 0x07, 0x63, 0x6f, 0x6c, 0x75, 0x6d,
+	0x6e, 0x73, 0x12, 0x57, 0x0a, 0x05, 0x63, 0x6f, 0x75, 0x6e, 0x74, 0x18, 0x02, 0x20, 0x01, 0x28,
+	0x0b, 0x32, 0x3f, 0x2e, 0x69, 0x6f, 0x2e, 0x64, 0x65, 0x65, 0x70, 0x68, 0x61, 0x76, 0x65, 0x6e,
+	0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x62, 0x61, 0x63, 0x6b, 0x70, 0x6c, 0x61, 0x6e, 0x65,
+	0x2e, 0x67, 0x72, 0x70, 0x63, 0x2e, 0x41, 0x67, 0x67, 0x72, 0x65, 0x67, 0x61, 0x74, 0x69, 0x6f,
+	0x6e, 0x2e, 0x41, 0x67, 0x67, 0x72, 0x65, 0x67, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x43, 0x6f, 0x75,
+	0x6e, 0x74, 0x48, 0x00, 0x52, 0x05, 0x63, 0x6f, 0x75, 0x6e, 0x74, 0x12, 0x66, 0x0a, 0x0d, 0x66,
+	0x69, 0x72, 0x73, 0x74, 0x5f, 0x72, 0x6f, 0x77, 0x5f, 0x6b, 0x65, 0x79, 0x18, 0x03, 0x20, 0x01,
+	0x28, 0x0b, 0x32, 0x40, 0x2e, 0x69, 0x6f, 0x2e, 0x64, 0x65, 0x65, 0x70, 0x68, 0x61, 0x76, 0x65,
+	0x6e, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x62, 0x61, 0x63, 0x6b, 0x70, 0x6c, 0x61, 0x6e,
+	0x65, 0x2e, 0x67, 0x72, 0x70, 0x63, 0x2e, 0x41, 0x67, 0x67, 0x72, 0x65, 0x67, 0x61, 0x74, 0x69,
+	0x6f, 0x6e, 0x2e, 0x41, 0x67, 0x67, 0x72, 0x65, 0x67, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x52, 0x6f,
+	0x77, 0x4b, 0x65, 0x79, 0x48, 0x00, 0x52, 0x0b, 0x66, 0x69, 0x72, 0x73, 0x74, 0x52, 0x6f, 0x77,
+	0x4b, 0x65, 0x79, 0x12, 0x64, 0x0a, 0x0c, 0x6c, 0x61, 0x73, 0x74, 0x5f, 0x72, 0x6f, 0x77, 0x5f,
+	0x6b, 0x65, 0x79, 0x18, 0x04, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x40, 0x2e, 0x69, 0x6f, 0x2e, 0x64,
+	0x65, 0x65, 0x70, 0x68, 0x61, 0x76, 0x65, 0x6e, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x62,
+	0x61, 0x63, 0x6b, 0x70, 0x6c, 0x61, 0x6e, 0x65, 0x2e, 0x67, 0x72, 0x70, 0x63, 0x2e, 0x41, 0x67,
+	0x67, 0x72, 0x65, 0x67, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x2e, 0x41, 0x67, 0x67, 0x72, 0x65, 0x67,
+	0x61, 0x74, 0x69, 0x6f, 0x6e, 0x52, 0x6f, 0x77, 0x4b, 0x65, 0x79, 0x48, 0x00, 0x52, 0x0a, 0x6c,
+	0x61, 0x73, 0x74, 0x52, 0x6f, 0x77, 0x4b, 0x65, 0x79, 0x12, 0x63, 0x0a, 0x09, 0x70, 0x61, 0x72,
+	0x74, 0x69, 0x74, 0x69, 0x6f, 0x6e, 0x18, 0x05, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x43, 0x2e, 0x69,
+	0x6f, 0x2e, 0x64, 0x65, 0x65, 0x70, 0x68, 0x61, 0x76, 0x65, 0x6e, 0x2e, 0x70, 0x72, 0x6f, 0x74,
+	0x6f, 0x2e, 0x62, 0x61, 0x63, 0x6b, 0x70, 0x6c, 0x61, 0x6e, 0x65, 0x2e, 0x67, 0x72, 0x70, 0x63,
+	0x2e, 0x41, 0x67, 0x67, 0x72, 0x65, 0x67, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x2e, 0x41, 0x67, 0x67,
+	0x72, 0x65, 0x67, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x50, 0x61, 0x72, 0x74, 0x69, 0x74, 0x69, 0x6f,
+	0x6e, 0x48, 0x00, 0x52, 0x09, 0x70, 0x61, 0x72, 0x74, 0x69, 0x74, 0x69, 0x6f, 0x6e, 0x12, 0x5d,
+	0x0a, 0x07, 0x66, 0x6f, 0x72, 0x6d, 0x75, 0x6c, 0x61, 0x18, 0x06, 0x20, 0x01, 0x28, 0x0b, 0x32,
+	0x41, 0x2e, 0x69, 0x6f, 0x2e, 0x64, 0x65, 0x65, 0x70, 0x68, 0x61, 0x76, 0x65, 0x6e, 0x2e, 0x70,
+	0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x62, 0x61, 0x63, 0x6b, 0x70, 0x6c, 0x61, 0x6e, 0x65, 0x2e, 0x67,
+	0x72, 0x70, 0x63, 0x2e, 0x41, 0x67, 0x67, 0x72, 0x65, 0x67, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x2e,
+	0x41, 0x67, 0x67, 0x72, 0x65, 0x67, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x46, 0x6f, 0x72, 0x6d, 0x75,
+	0x6c, 0x61, 0x48, 0x00, 0x52, 0x07, 0x66, 0x6f, 0x72, 0x6d, 0x75, 0x6c, 0x61, 0x12, 0x67, 0x0a,
+	0x0b, 0x63, 0x6f, 0x75, 0x6e, 0x74, 0x5f, 0x77, 0x68, 0x65, 0x72, 0x65, 0x18, 0x07, 0x20, 0x01,
+	0x28, 0x0b, 0x32, 0x44, 0x2e, 0x69, 0x6f, 0x2e, 0x64, 0x65, 0x65, 0x70, 0x68, 0x61, 0x76, 0x65,
+	0x6e, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x62, 0x61, 0x63, 0x6b, 0x70, 0x6c, 0x61, 0x6e,
+	0x65, 0x2e, 0x67, 0x72, 0x70, 0x63, 0x2e, 0x41, 0x67, 0x67, 0x72, 0x65, 0x67, 0x61, 0x74, 0x69,
+	0x6f, 0x6e, 0x2e, 0x41, 0x67, 0x67, 0x72, 0x65, 0x67, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x43, 0x6f,
+	0x75, 0x6e, 0x74, 0x57, 0x68, 0x65, 0x72, 0x65, 0x48, 0x00, 0x52, 0x0a, 0x63, 0x6f, 0x75, 0x6e,
+	0x74, 0x57, 0x68, 0x65, 0x72, 0x65, 0x1a, 0x75, 0x0a, 0x12, 0x41, 0x67, 0x67, 0x72, 0x65, 0x67,
+	0x61, 0x74, 0x69, 0x6f, 0x6e, 0x43, 0x6f, 0x6c, 0x75, 0x6d, 0x6e, 0x73, 0x12, 0x3e, 0x0a, 0x04,
+	0x73, 0x70, 0x65, 0x63, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x2a, 0x2e, 0x69, 0x6f, 0x2e,
+	0x64, 0x65, 0x65, 0x70, 0x68, 0x61, 0x76, 0x65, 0x6e, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e,
+	0x62, 0x61, 0x63, 0x6b, 0x70, 0x6c, 0x61, 0x6e, 0x65, 0x2e, 0x67, 0x72, 0x70, 0x63, 0x2e, 0x41,
+	0x67, 0x67, 0x53, 0x70, 0x65, 0x63, 0x52, 0x04, 0x73, 0x70, 0x65, 0x63, 0x12, 0x1f, 0x0a, 0x0b,
+	0x6d, 0x61, 0x74, 0x63, 0x68, 0x5f, 0x70, 0x61, 0x69, 0x72, 0x73, 0x18, 0x02, 0x20, 0x03, 0x28,
+	0x09, 0x52, 0x0a, 0x6d, 0x61, 0x74, 0x63, 0x68, 0x50, 0x61, 0x69, 0x72, 0x73, 0x1a, 0x33, 0x0a,
+	0x10, 0x41, 0x67, 0x67, 0x72, 0x65, 0x67, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x43, 0x6f, 0x75, 0x6e,
+	0x74, 0x12, 0x1f, 0x0a, 0x0b, 0x63, 0x6f, 0x6c, 0x75, 0x6d, 0x6e, 0x5f, 0x6e, 0x61, 0x6d, 0x65,
+	0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0a, 0x63, 0x6f, 0x6c, 0x75, 0x6d, 0x6e, 0x4e, 0x61,
+	0x6d, 0x65, 0x1a, 0x52, 0x0a, 0x15, 0x41, 0x67, 0x67, 0x72, 0x65, 0x67, 0x61, 0x74, 0x69, 0x6f,
+	0x6e, 0x43, 0x6f, 0x75, 0x6e, 0x74, 0x57, 0x68, 0x65, 0x72, 0x65, 0x12, 0x1f, 0x0a, 0x0b, 0x63,
+	0x6f, 0x6c, 0x75, 0x6d, 0x6e, 0x5f, 0x6e, 0x61, 0x6d, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09,
+	0x52, 0x0a, 0x63, 0x6f, 0x6c, 0x75, 0x6d, 0x6e, 0x4e, 0x61, 0x6d, 0x65, 0x12, 0x18, 0x0a, 0x07,
+	0x66, 0x69, 0x6c, 0x74, 0x65, 0x72, 0x73, 0x18, 0x02, 0x20, 0x03, 0x28, 0x09, 0x52, 0x07, 0x66,
+	0x69, 0x6c, 0x74, 0x65, 0x72, 0x73, 0x1a, 0x34, 0x0a, 0x11, 0x41, 0x67, 0x67, 0x72, 0x65, 0x67,
 	0x61, 0x74, 0x69, 0x6f, 0x6e, 0x52, 0x6f, 0x77, 0x4b, 0x65, 0x79, 0x12, 0x1f, 0x0a, 0x0b, 0x63,
 	0x6f, 0x6c, 0x75, 0x6d, 0x6e, 0x5f, 0x6e, 0x61, 0x6d, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09,
 	0x52, 0x0a, 0x63, 0x6f, 0x6c, 0x75, 0x6d, 0x6e, 0x4e, 0x61, 0x6d, 0x65, 0x1a, 0x70, 0x0a, 0x14,
@@ -11302,210 +11613,271 @@ var file_deephaven_proto_table_proto_rawDesc = []byte{
 	0x6e, 0x4e, 0x61, 0x6d, 0x65, 0x12, 0x37, 0x0a, 0x18, 0x69, 0x6e, 0x63, 0x6c, 0x75, 0x64, 0x65,
 	0x5f, 0x67, 0x72, 0x6f, 0x75, 0x70, 0x5f, 0x62, 0x79, 0x5f, 0x63, 0x6f, 0x6c, 0x75, 0x6d, 0x6e,
 	0x73, 0x18, 0x02, 0x20, 0x01, 0x28, 0x08, 0x52, 0x15, 0x69, 0x6e, 0x63, 0x6c, 0x75, 0x64, 0x65,
-	0x47, 0x72, 0x6f, 0x75, 0x70, 0x42, 0x79, 0x43, 0x6f, 0x6c, 0x75, 0x6d, 0x6e, 0x73, 0x42, 0x06,
-	0x0a, 0x04, 0x74, 0x79, 0x70, 0x65, 0x22, 0x84, 0x02, 0x0a, 0x0e, 0x53, 0x6f, 0x72, 0x74, 0x44,
-	0x65, 0x73, 0x63, 0x72, 0x69, 0x70, 0x74, 0x6f, 0x72, 0x12, 0x1f, 0x0a, 0x0b, 0x63, 0x6f, 0x6c,
-	0x75, 0x6d, 0x6e, 0x5f, 0x6e, 0x61, 0x6d, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0a,
-	0x63, 0x6f, 0x6c, 0x75, 0x6d, 0x6e, 0x4e, 0x61, 0x6d, 0x65, 0x12, 0x1f, 0x0a, 0x0b, 0x69, 0x73,
-	0x5f, 0x61, 0x62, 0x73, 0x6f, 0x6c, 0x75, 0x74, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x08, 0x52,
-	0x0a, 0x69, 0x73, 0x41, 0x62, 0x73, 0x6f, 0x6c, 0x75, 0x74, 0x65, 0x12, 0x5d, 0x0a, 0x09, 0x64,
-	0x69, 0x72, 0x65, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x18, 0x03, 0x20, 0x01, 0x28, 0x0e, 0x32, 0x3f,
+	0x47, 0x72, 0x6f, 0x75, 0x70, 0x42, 0x79, 0x43, 0x6f, 0x6c, 0x75, 0x6d, 0x6e, 0x73, 0x1a, 0x63,
+	0x0a, 0x12, 0x41, 0x67, 0x67, 0x72, 0x65, 0x67, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x46, 0x6f, 0x72,
+	0x6d, 0x75, 0x6c, 0x61, 0x12, 0x4d, 0x0a, 0x0a, 0x73, 0x65, 0x6c, 0x65, 0x63, 0x74, 0x61, 0x62,
+	0x6c, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x2d, 0x2e, 0x69, 0x6f, 0x2e, 0x64, 0x65,
+	0x65, 0x70, 0x68, 0x61, 0x76, 0x65, 0x6e, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x62, 0x61,
+	0x63, 0x6b, 0x70, 0x6c, 0x61, 0x6e, 0x65, 0x2e, 0x67, 0x72, 0x70, 0x63, 0x2e, 0x53, 0x65, 0x6c,
+	0x65, 0x63, 0x74, 0x61, 0x62, 0x6c, 0x65, 0x52, 0x0a, 0x73, 0x65, 0x6c, 0x65, 0x63, 0x74, 0x61,
+	0x62, 0x6c, 0x65, 0x42, 0x06, 0x0a, 0x04, 0x74, 0x79, 0x70, 0x65, 0x22, 0x84, 0x02, 0x0a, 0x0e,
+	0x53, 0x6f, 0x72, 0x74, 0x44, 0x65, 0x73, 0x63, 0x72, 0x69, 0x70, 0x74, 0x6f, 0x72, 0x12, 0x1f,
+	0x0a, 0x0b, 0x63, 0x6f, 0x6c, 0x75, 0x6d, 0x6e, 0x5f, 0x6e, 0x61, 0x6d, 0x65, 0x18, 0x01, 0x20,
+	0x01, 0x28, 0x09, 0x52, 0x0a, 0x63, 0x6f, 0x6c, 0x75, 0x6d, 0x6e, 0x4e, 0x61, 0x6d, 0x65, 0x12,
+	0x1f, 0x0a, 0x0b, 0x69, 0x73, 0x5f, 0x61, 0x62, 0x73, 0x6f, 0x6c, 0x75, 0x74, 0x65, 0x18, 0x02,
+	0x20, 0x01, 0x28, 0x08, 0x52, 0x0a, 0x69, 0x73, 0x41, 0x62, 0x73, 0x6f, 0x6c, 0x75, 0x74, 0x65,
+	0x12, 0x5d, 0x0a, 0x09, 0x64, 0x69, 0x72, 0x65, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x18, 0x03, 0x20,
+	0x01, 0x28, 0x0e, 0x32, 0x3f, 0x2e, 0x69, 0x6f, 0x2e, 0x64, 0x65, 0x65, 0x70, 0x68, 0x61, 0x76,
+	0x65, 0x6e, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x62, 0x61, 0x63, 0x6b, 0x70, 0x6c, 0x61,
+	0x6e, 0x65, 0x2e, 0x67, 0x72, 0x70, 0x63, 0x2e, 0x53, 0x6f, 0x72, 0x74, 0x44, 0x65, 0x73, 0x63,
+	0x72, 0x69, 0x70, 0x74, 0x6f, 0x72, 0x2e, 0x53, 0x6f, 0x72, 0x74, 0x44, 0x69, 0x72, 0x65, 0x63,
+	0x74, 0x69, 0x6f, 0x6e, 0x52, 0x09, 0x64, 0x69, 0x72, 0x65, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x22,
+	0x51, 0x0a, 0x0d, 0x53, 0x6f, 0x72, 0x74, 0x44, 0x69, 0x72, 0x65, 0x63, 0x74, 0x69, 0x6f, 0x6e,
+	0x12, 0x0b, 0x0a, 0x07, 0x55, 0x4e, 0x4b, 0x4e, 0x4f, 0x57, 0x4e, 0x10, 0x00, 0x12, 0x17, 0x0a,
+	0x0a, 0x44, 0x45, 0x53, 0x43, 0x45, 0x4e, 0x44, 0x49, 0x4e, 0x47, 0x10, 0xff, 0xff, 0xff, 0xff,
+	0xff, 0xff, 0xff, 0xff, 0xff, 0x01, 0x12, 0x0d, 0x0a, 0x09, 0x41, 0x53, 0x43, 0x45, 0x4e, 0x44,
+	0x49, 0x4e, 0x47, 0x10, 0x01, 0x12, 0x0b, 0x0a, 0x07, 0x52, 0x45, 0x56, 0x45, 0x52, 0x53, 0x45,
+	0x10, 0x02, 0x22, 0xf3, 0x01, 0x0a, 0x10, 0x53, 0x6f, 0x72, 0x74, 0x54, 0x61, 0x62, 0x6c, 0x65,
+	0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x46, 0x0a, 0x09, 0x72, 0x65, 0x73, 0x75, 0x6c,
+	0x74, 0x5f, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x29, 0x2e, 0x69, 0x6f, 0x2e,
+	0x64, 0x65, 0x65, 0x70, 0x68, 0x61, 0x76, 0x65, 0x6e, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e,
+	0x62, 0x61, 0x63, 0x6b, 0x70, 0x6c, 0x61, 0x6e, 0x65, 0x2e, 0x67, 0x72, 0x70, 0x63, 0x2e, 0x54,
+	0x69, 0x63, 0x6b, 0x65, 0x74, 0x52, 0x08, 0x72, 0x65, 0x73, 0x75, 0x6c, 0x74, 0x49, 0x64, 0x12,
+	0x4e, 0x0a, 0x09, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x5f, 0x69, 0x64, 0x18, 0x02, 0x20, 0x01,
+	0x28, 0x0b, 0x32, 0x31, 0x2e, 0x69, 0x6f, 0x2e, 0x64, 0x65, 0x65, 0x70, 0x68, 0x61, 0x76, 0x65,
+	0x6e, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x62, 0x61, 0x63, 0x6b, 0x70, 0x6c, 0x61, 0x6e,
+	0x65, 0x2e, 0x67, 0x72, 0x70, 0x63, 0x2e, 0x54, 0x61, 0x62, 0x6c, 0x65, 0x52, 0x65, 0x66, 0x65,
+	0x72, 0x65, 0x6e, 0x63, 0x65, 0x52, 0x08, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x49, 0x64, 0x12,
+	0x47, 0x0a, 0x05, 0x73, 0x6f, 0x72, 0x74, 0x73, 0x18, 0x03, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x31,
 	0x2e, 0x69, 0x6f, 0x2e, 0x64, 0x65, 0x65, 0x70, 0x68, 0x61, 0x76, 0x65, 0x6e, 0x2e, 0x70, 0x72,
 	0x6f, 0x74, 0x6f, 0x2e, 0x62, 0x61, 0x63, 0x6b, 0x70, 0x6c, 0x61, 0x6e, 0x65, 0x2e, 0x67, 0x72,
 	0x70, 0x63, 0x2e, 0x53, 0x6f, 0x72, 0x74, 0x44, 0x65, 0x73, 0x63, 0x72, 0x69, 0x70, 0x74, 0x6f,
-	0x72, 0x2e, 0x53, 0x6f, 0x72, 0x74, 0x44, 0x69, 0x72, 0x65, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x52,
-	0x09, 0x64, 0x69, 0x72, 0x65, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x22, 0x51, 0x0a, 0x0d, 0x53, 0x6f,
-	0x72, 0x74, 0x44, 0x69, 0x72, 0x65, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x12, 0x0b, 0x0a, 0x07, 0x55,
-	0x4e, 0x4b, 0x4e, 0x4f, 0x57, 0x4e, 0x10, 0x00, 0x12, 0x17, 0x0a, 0x0a, 0x44, 0x45, 0x53, 0x43,
-	0x45, 0x4e, 0x44, 0x49, 0x4e, 0x47, 0x10, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
-	0x01, 0x12, 0x0d, 0x0a, 0x09, 0x41, 0x53, 0x43, 0x45, 0x4e, 0x44, 0x49, 0x4e, 0x47, 0x10, 0x01,
-	0x12, 0x0b, 0x0a, 0x07, 0x52, 0x45, 0x56, 0x45, 0x52, 0x53, 0x45, 0x10, 0x02, 0x22, 0xf3, 0x01,
-	0x0a, 0x10, 0x53, 0x6f, 0x72, 0x74, 0x54, 0x61, 0x62, 0x6c, 0x65, 0x52, 0x65, 0x71, 0x75, 0x65,
-	0x73, 0x74, 0x12, 0x46, 0x0a, 0x09, 0x72, 0x65, 0x73, 0x75, 0x6c, 0x74, 0x5f, 0x69, 0x64, 0x18,
+	0x72, 0x52, 0x05, 0x73, 0x6f, 0x72, 0x74, 0x73, 0x22, 0xf4, 0x01, 0x0a, 0x12, 0x46, 0x69, 0x6c,
+	0x74, 0x65, 0x72, 0x54, 0x61, 0x62, 0x6c, 0x65, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12,
+	0x46, 0x0a, 0x09, 0x72, 0x65, 0x73, 0x75, 0x6c, 0x74, 0x5f, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01,
+	0x28, 0x0b, 0x32, 0x29, 0x2e, 0x69, 0x6f, 0x2e, 0x64, 0x65, 0x65, 0x70, 0x68, 0x61, 0x76, 0x65,
+	0x6e, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x62, 0x61, 0x63, 0x6b, 0x70, 0x6c, 0x61, 0x6e,
+	0x65, 0x2e, 0x67, 0x72, 0x70, 0x63, 0x2e, 0x54, 0x69, 0x63, 0x6b, 0x65, 0x74, 0x52, 0x08, 0x72,
+	0x65, 0x73, 0x75, 0x6c, 0x74, 0x49, 0x64, 0x12, 0x4e, 0x0a, 0x09, 0x73, 0x6f, 0x75, 0x72, 0x63,
+	0x65, 0x5f, 0x69, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x31, 0x2e, 0x69, 0x6f, 0x2e,
+	0x64, 0x65, 0x65, 0x70, 0x68, 0x61, 0x76, 0x65, 0x6e, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e,
+	0x62, 0x61, 0x63, 0x6b, 0x70, 0x6c, 0x61, 0x6e, 0x65, 0x2e, 0x67, 0x72, 0x70, 0x63, 0x2e, 0x54,
+	0x61, 0x62, 0x6c, 0x65, 0x52, 0x65, 0x66, 0x65, 0x72, 0x65, 0x6e, 0x63, 0x65, 0x52, 0x08, 0x73,
+	0x6f, 0x75, 0x72, 0x63, 0x65, 0x49, 0x64, 0x12, 0x46, 0x0a, 0x07, 0x66, 0x69, 0x6c, 0x74, 0x65,
+	0x72, 0x73, 0x18, 0x03, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x2c, 0x2e, 0x69, 0x6f, 0x2e, 0x64, 0x65,
+	0x65, 0x70, 0x68, 0x61, 0x76, 0x65, 0x6e, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x62, 0x61,
+	0x63, 0x6b, 0x70, 0x6c, 0x61, 0x6e, 0x65, 0x2e, 0x67, 0x72, 0x70, 0x63, 0x2e, 0x43, 0x6f, 0x6e,
+	0x64, 0x69, 0x74, 0x69, 0x6f, 0x6e, 0x52, 0x07, 0x66, 0x69, 0x6c, 0x74, 0x65, 0x72, 0x73, 0x22,
+	0xca, 0x02, 0x0a, 0x0e, 0x53, 0x65, 0x65, 0x6b, 0x52, 0x6f, 0x77, 0x52, 0x65, 0x71, 0x75, 0x65,
+	0x73, 0x74, 0x12, 0x46, 0x0a, 0x09, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x5f, 0x69, 0x64, 0x18,
 	0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x29, 0x2e, 0x69, 0x6f, 0x2e, 0x64, 0x65, 0x65, 0x70, 0x68,
 	0x61, 0x76, 0x65, 0x6e, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x62, 0x61, 0x63, 0x6b, 0x70,
 	0x6c, 0x61, 0x6e, 0x65, 0x2e, 0x67, 0x72, 0x70, 0x63, 0x2e, 0x54, 0x69, 0x63, 0x6b, 0x65, 0x74,
-	0x52, 0x08, 0x72, 0x65, 0x73, 0x75, 0x6c, 0x74, 0x49, 0x64, 0x12, 0x4e, 0x0a, 0x09, 0x73, 0x6f,
-	0x75, 0x72, 0x63, 0x65, 0x5f, 0x69, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x31, 0x2e,
-	0x69, 0x6f, 0x2e, 0x64, 0x65, 0x65, 0x70, 0x68, 0x61, 0x76, 0x65, 0x6e, 0x2e, 0x70, 0x72, 0x6f,
-	0x74, 0x6f, 0x2e, 0x62, 0x61, 0x63, 0x6b, 0x70, 0x6c, 0x61, 0x6e, 0x65, 0x2e, 0x67, 0x72, 0x70,
-	0x63, 0x2e, 0x54, 0x61, 0x62, 0x6c, 0x65, 0x52, 0x65, 0x66, 0x65, 0x72, 0x65, 0x6e, 0x63, 0x65,
-	0x52, 0x08, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x49, 0x64, 0x12, 0x47, 0x0a, 0x05, 0x73, 0x6f,
-	0x72, 0x74, 0x73, 0x18, 0x03, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x31, 0x2e, 0x69, 0x6f, 0x2e, 0x64,
-	0x65, 0x65, 0x70, 0x68, 0x61, 0x76, 0x65, 0x6e, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x62,
-	0x61, 0x63, 0x6b, 0x70, 0x6c, 0x61, 0x6e, 0x65, 0x2e, 0x67, 0x72, 0x70, 0x63, 0x2e, 0x53, 0x6f,
-	0x72, 0x74, 0x44, 0x65, 0x73, 0x63, 0x72, 0x69, 0x70, 0x74, 0x6f, 0x72, 0x52, 0x05, 0x73, 0x6f,
-	0x72, 0x74, 0x73, 0x22, 0xf4, 0x01, 0x0a, 0x12, 0x46, 0x69, 0x6c, 0x74, 0x65, 0x72, 0x54, 0x61,
-	0x62, 0x6c, 0x65, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x46, 0x0a, 0x09, 0x72, 0x65,
-	0x73, 0x75, 0x6c, 0x74, 0x5f, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x29, 0x2e,
+	0x52, 0x08, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x49, 0x64, 0x12, 0x25, 0x0a, 0x0c, 0x73, 0x74,
+	0x61, 0x72, 0x74, 0x69, 0x6e, 0x67, 0x5f, 0x72, 0x6f, 0x77, 0x18, 0x02, 0x20, 0x01, 0x28, 0x12,
+	0x42, 0x02, 0x30, 0x01, 0x52, 0x0b, 0x73, 0x74, 0x61, 0x72, 0x74, 0x69, 0x6e, 0x67, 0x52, 0x6f,
+	0x77, 0x12, 0x1f, 0x0a, 0x0b, 0x63, 0x6f, 0x6c, 0x75, 0x6d, 0x6e, 0x5f, 0x6e, 0x61, 0x6d, 0x65,
+	0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0a, 0x63, 0x6f, 0x6c, 0x75, 0x6d, 0x6e, 0x4e, 0x61,
+	0x6d, 0x65, 0x12, 0x49, 0x0a, 0x0a, 0x73, 0x65, 0x65, 0x6b, 0x5f, 0x76, 0x61, 0x6c, 0x75, 0x65,
+	0x18, 0x04, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x2a, 0x2e, 0x69, 0x6f, 0x2e, 0x64, 0x65, 0x65, 0x70,
+	0x68, 0x61, 0x76, 0x65, 0x6e, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x62, 0x61, 0x63, 0x6b,
+	0x70, 0x6c, 0x61, 0x6e, 0x65, 0x2e, 0x67, 0x72, 0x70, 0x63, 0x2e, 0x4c, 0x69, 0x74, 0x65, 0x72,
+	0x61, 0x6c, 0x52, 0x09, 0x73, 0x65, 0x65, 0x6b, 0x56, 0x61, 0x6c, 0x75, 0x65, 0x12, 0x20, 0x0a,
+	0x0b, 0x69, 0x6e, 0x73, 0x65, 0x6e, 0x73, 0x69, 0x74, 0x69, 0x76, 0x65, 0x18, 0x05, 0x20, 0x01,
+	0x28, 0x08, 0x52, 0x0b, 0x69, 0x6e, 0x73, 0x65, 0x6e, 0x73, 0x69, 0x74, 0x69, 0x76, 0x65, 0x12,
+	0x1a, 0x0a, 0x08, 0x63, 0x6f, 0x6e, 0x74, 0x61, 0x69, 0x6e, 0x73, 0x18, 0x06, 0x20, 0x01, 0x28,
+	0x08, 0x52, 0x08, 0x63, 0x6f, 0x6e, 0x74, 0x61, 0x69, 0x6e, 0x73, 0x12, 0x1f, 0x0a, 0x0b, 0x69,
+	0x73, 0x5f, 0x62, 0x61, 0x63, 0x6b, 0x77, 0x61, 0x72, 0x64, 0x18, 0x07, 0x20, 0x01, 0x28, 0x08,
+	0x52, 0x0a, 0x69, 0x73, 0x42, 0x61, 0x63, 0x6b, 0x77, 0x61, 0x72, 0x64, 0x22, 0x34, 0x0a, 0x0f,
+	0x53, 0x65, 0x65, 0x6b, 0x52, 0x6f, 0x77, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12,
+	0x21, 0x0a, 0x0a, 0x72, 0x65, 0x73, 0x75, 0x6c, 0x74, 0x5f, 0x72, 0x6f, 0x77, 0x18, 0x01, 0x20,
+	0x01, 0x28, 0x12, 0x42, 0x02, 0x30, 0x01, 0x52, 0x09, 0x72, 0x65, 0x73, 0x75, 0x6c, 0x74, 0x52,
+	0x6f, 0x77, 0x22, 0x2c, 0x0a, 0x09, 0x52, 0x65, 0x66, 0x65, 0x72, 0x65, 0x6e, 0x63, 0x65, 0x12,
+	0x1f, 0x0a, 0x0b, 0x63, 0x6f, 0x6c, 0x75, 0x6d, 0x6e, 0x5f, 0x6e, 0x61, 0x6d, 0x65, 0x18, 0x01,
+	0x20, 0x01, 0x28, 0x09, 0x52, 0x0a, 0x63, 0x6f, 0x6c, 0x75, 0x6d, 0x6e, 0x4e, 0x61, 0x6d, 0x65,
+	0x22, 0xd0, 0x01, 0x0a, 0x07, 0x4c, 0x69, 0x74, 0x65, 0x72, 0x61, 0x6c, 0x12, 0x23, 0x0a, 0x0c,
+	0x73, 0x74, 0x72, 0x69, 0x6e, 0x67, 0x5f, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x01, 0x20, 0x01,
+	0x28, 0x09, 0x48, 0x00, 0x52, 0x0b, 0x73, 0x74, 0x72, 0x69, 0x6e, 0x67, 0x56, 0x61, 0x6c, 0x75,
+	0x65, 0x12, 0x23, 0x0a, 0x0c, 0x64, 0x6f, 0x75, 0x62, 0x6c, 0x65, 0x5f, 0x76, 0x61, 0x6c, 0x75,
+	0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x01, 0x48, 0x00, 0x52, 0x0b, 0x64, 0x6f, 0x75, 0x62, 0x6c,
+	0x65, 0x56, 0x61, 0x6c, 0x75, 0x65, 0x12, 0x1f, 0x0a, 0x0a, 0x62, 0x6f, 0x6f, 0x6c, 0x5f, 0x76,
+	0x61, 0x6c, 0x75, 0x65, 0x18, 0x03, 0x20, 0x01, 0x28, 0x08, 0x48, 0x00, 0x52, 0x09, 0x62, 0x6f,
+	0x6f, 0x6c, 0x56, 0x61, 0x6c, 0x75, 0x65, 0x12, 0x23, 0x0a, 0x0a, 0x6c, 0x6f, 0x6e, 0x67, 0x5f,
+	0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x04, 0x20, 0x01, 0x28, 0x12, 0x42, 0x02, 0x30, 0x01, 0x48,
+	0x00, 0x52, 0x09, 0x6c, 0x6f, 0x6e, 0x67, 0x56, 0x61, 0x6c, 0x75, 0x65, 0x12, 0x2c, 0x0a, 0x0f,
+	0x6e, 0x61, 0x6e, 0x6f, 0x5f, 0x74, 0x69, 0x6d, 0x65, 0x5f, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18,
+	0x05, 0x20, 0x01, 0x28, 0x12, 0x42, 0x02, 0x30, 0x01, 0x48, 0x00, 0x52, 0x0d, 0x6e, 0x61, 0x6e,
+	0x6f, 0x54, 0x69, 0x6d, 0x65, 0x56, 0x61, 0x6c, 0x75, 0x65, 0x42, 0x07, 0x0a, 0x05, 0x76, 0x61,
+	0x6c, 0x75, 0x65, 0x22, 0xa5, 0x01, 0x0a, 0x05, 0x56, 0x61, 0x6c, 0x75, 0x65, 0x12, 0x4c, 0x0a,
+	0x09, 0x72, 0x65, 0x66, 0x65, 0x72, 0x65, 0x6e, 0x63, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b,
+	0x32, 0x2c, 0x2e, 0x69, 0x6f, 0x2e, 0x64, 0x65, 0x65, 0x70, 0x68, 0x61, 0x76, 0x65, 0x6e, 0x2e,
+	0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x62, 0x61, 0x63, 0x6b, 0x70, 0x6c, 0x61, 0x6e, 0x65, 0x2e,
+	0x67, 0x72, 0x70, 0x63, 0x2e, 0x52, 0x65, 0x66, 0x65, 0x72, 0x65, 0x6e, 0x63, 0x65, 0x48, 0x00,
+	0x52, 0x09, 0x72, 0x65, 0x66, 0x65, 0x72, 0x65, 0x6e, 0x63, 0x65, 0x12, 0x46, 0x0a, 0x07, 0x6c,
+	0x69, 0x74, 0x65, 0x72, 0x61, 0x6c, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x2a, 0x2e, 0x69,
+	0x6f, 0x2e, 0x64, 0x65, 0x65, 0x70, 0x68, 0x61, 0x76, 0x65, 0x6e, 0x2e, 0x70, 0x72, 0x6f, 0x74,
+	0x6f, 0x2e, 0x62, 0x61, 0x63, 0x6b, 0x70, 0x6c, 0x61, 0x6e, 0x65, 0x2e, 0x67, 0x72, 0x70, 0x63,
+	0x2e, 0x4c, 0x69, 0x74, 0x65, 0x72, 0x61, 0x6c, 0x48, 0x00, 0x52, 0x07, 0x6c, 0x69, 0x74, 0x65,
+	0x72, 0x61, 0x6c, 0x42, 0x06, 0x0a, 0x04, 0x64, 0x61, 0x74, 0x61, 0x22, 0x82, 0x06, 0x0a, 0x09,
+	0x43, 0x6f, 0x6e, 0x64, 0x69, 0x74, 0x69, 0x6f, 0x6e, 0x12, 0x43, 0x0a, 0x03, 0x61, 0x6e, 0x64,
+	0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x2f, 0x2e, 0x69, 0x6f, 0x2e, 0x64, 0x65, 0x65, 0x70,
+	0x68, 0x61, 0x76, 0x65, 0x6e, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x62, 0x61, 0x63, 0x6b,
+	0x70, 0x6c, 0x61, 0x6e, 0x65, 0x2e, 0x67, 0x72, 0x70, 0x63, 0x2e, 0x41, 0x6e, 0x64, 0x43, 0x6f,
+	0x6e, 0x64, 0x69, 0x74, 0x69, 0x6f, 0x6e, 0x48, 0x00, 0x52, 0x03, 0x61, 0x6e, 0x64, 0x12, 0x40,
+	0x0a, 0x02, 0x6f, 0x72, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x2e, 0x2e, 0x69, 0x6f, 0x2e,
+	0x64, 0x65, 0x65, 0x70, 0x68, 0x61, 0x76, 0x65, 0x6e, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e,
+	0x62, 0x61, 0x63, 0x6b, 0x70, 0x6c, 0x61, 0x6e, 0x65, 0x2e, 0x67, 0x72, 0x70, 0x63, 0x2e, 0x4f,
+	0x72, 0x43, 0x6f, 0x6e, 0x64, 0x69, 0x74, 0x69, 0x6f, 0x6e, 0x48, 0x00, 0x52, 0x02, 0x6f, 0x72,
+	0x12, 0x43, 0x0a, 0x03, 0x6e, 0x6f, 0x74, 0x18, 0x03, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x2f, 0x2e,
 	0x69, 0x6f, 0x2e, 0x64, 0x65, 0x65, 0x70, 0x68, 0x61, 0x76, 0x65, 0x6e, 0x2e, 0x70, 0x72, 0x6f,
 	0x74, 0x6f, 0x2e, 0x62, 0x61, 0x63, 0x6b, 0x70, 0x6c, 0x61, 0x6e, 0x65, 0x2e, 0x67, 0x72, 0x70,
-	0x63, 0x2e, 0x54, 0x69, 0x63, 0x6b, 0x65, 0x74, 0x52, 0x08, 0x72, 0x65, 0x73, 0x75, 0x6c, 0x74,
-	0x49, 0x64, 0x12, 0x4e, 0x0a, 0x09, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x5f, 0x69, 0x64, 0x18,
-	0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x31, 0x2e, 0x69, 0x6f, 0x2e, 0x64, 0x65, 0x65, 0x70, 0x68,
-	0x61, 0x76, 0x65, 0x6e, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x62, 0x61, 0x63, 0x6b, 0x70,
-	0x6c, 0x61, 0x6e, 0x65, 0x2e, 0x67, 0x72, 0x70, 0x63, 0x2e, 0x54, 0x61, 0x62, 0x6c, 0x65, 0x52,
-	0x65, 0x66, 0x65, 0x72, 0x65, 0x6e, 0x63, 0x65, 0x52, 0x08, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65,
-	0x49, 0x64, 0x12, 0x46, 0x0a, 0x07, 0x66, 0x69, 0x6c, 0x74, 0x65, 0x72, 0x73, 0x18, 0x03, 0x20,
-	0x03, 0x28, 0x0b, 0x32, 0x2c, 0x2e, 0x69, 0x6f, 0x2e, 0x64, 0x65, 0x65, 0x70, 0x68, 0x61, 0x76,
-	0x65, 0x6e, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x62, 0x61, 0x63, 0x6b, 0x70, 0x6c, 0x61,
-	0x6e, 0x65, 0x2e, 0x67, 0x72, 0x70, 0x63, 0x2e, 0x43, 0x6f, 0x6e, 0x64, 0x69, 0x74, 0x69, 0x6f,
-	0x6e, 0x52, 0x07, 0x66, 0x69, 0x6c, 0x74, 0x65, 0x72, 0x73, 0x22, 0xca, 0x02, 0x0a, 0x0e, 0x53,
-	0x65, 0x65, 0x6b, 0x52, 0x6f, 0x77, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x46, 0x0a,
-	0x09, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x5f, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b,
-	0x32, 0x29, 0x2e, 0x69, 0x6f, 0x2e, 0x64, 0x65, 0x65, 0x70, 0x68, 0x61, 0x76, 0x65, 0x6e, 0x2e,
-	0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x62, 0x61, 0x63, 0x6b, 0x70, 0x6c, 0x61, 0x6e, 0x65, 0x2e,
-	0x67, 0x72, 0x70, 0x63, 0x2e, 0x54, 0x69, 0x63, 0x6b, 0x65, 0x74, 0x52, 0x08, 0x73, 0x6f, 0x75,
-	0x72, 0x63, 0x65, 0x49, 0x64, 0x12, 0x25, 0x0a, 0x0c, 0x73, 0x74, 0x61, 0x72, 0x74, 0x69, 0x6e,
-	0x67, 0x5f, 0x72, 0x6f, 0x77, 0x18, 0x02, 0x20, 0x01, 0x28, 0x12, 0x42, 0x02, 0x30, 0x01, 0x52,
-	0x0b, 0x73, 0x74, 0x61, 0x72, 0x74, 0x69, 0x6e, 0x67, 0x52, 0x6f, 0x77, 0x12, 0x1f, 0x0a, 0x0b,
-	0x63, 0x6f, 0x6c, 0x75, 0x6d, 0x6e, 0x5f, 0x6e, 0x61, 0x6d, 0x65, 0x18, 0x03, 0x20, 0x01, 0x28,
-	0x09, 0x52, 0x0a, 0x63, 0x6f, 0x6c, 0x75, 0x6d, 0x6e, 0x4e, 0x61, 0x6d, 0x65, 0x12, 0x49, 0x0a,
-	0x0a, 0x73, 0x65, 0x65, 0x6b, 0x5f, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x04, 0x20, 0x01, 0x28,
-	0x0b, 0x32, 0x2a, 0x2e, 0x69, 0x6f, 0x2e, 0x64, 0x65, 0x65, 0x70, 0x68, 0x61, 0x76, 0x65, 0x6e,
-	0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x62, 0x61, 0x63, 0x6b, 0x70, 0x6c, 0x61, 0x6e, 0x65,
-	0x2e, 0x67, 0x72, 0x70, 0x63, 0x2e, 0x4c, 0x69, 0x74, 0x65, 0x72, 0x61, 0x6c, 0x52, 0x09, 0x73,
-	0x65, 0x65, 0x6b, 0x56, 0x61, 0x6c, 0x75, 0x65, 0x12, 0x20, 0x0a, 0x0b, 0x69, 0x6e, 0x73, 0x65,
-	0x6e, 0x73, 0x69, 0x74, 0x69, 0x76, 0x65, 0x18, 0x05, 0x20, 0x01, 0x28, 0x08, 0x52, 0x0b, 0x69,
-	0x6e, 0x73, 0x65, 0x6e, 0x73, 0x69, 0x74, 0x69, 0x76, 0x65, 0x12, 0x1a, 0x0a, 0x08, 0x63, 0x6f,
-	0x6e, 0x74, 0x61, 0x69, 0x6e, 0x73, 0x18, 0x06, 0x20, 0x01, 0x28, 0x08, 0x52, 0x08, 0x63, 0x6f,
-	0x6e, 0x74, 0x61, 0x69, 0x6e, 0x73, 0x12, 0x1f, 0x0a, 0x0b, 0x69, 0x73, 0x5f, 0x62, 0x61, 0x63,
-	0x6b, 0x77, 0x61, 0x72, 0x64, 0x18, 0x07, 0x20, 0x01, 0x28, 0x08, 0x52, 0x0a, 0x69, 0x73, 0x42,
-	0x61, 0x63, 0x6b, 0x77, 0x61, 0x72, 0x64, 0x22, 0x34, 0x0a, 0x0f, 0x53, 0x65, 0x65, 0x6b, 0x52,
-	0x6f, 0x77, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x21, 0x0a, 0x0a, 0x72, 0x65,
-	0x73, 0x75, 0x6c, 0x74, 0x5f, 0x72, 0x6f, 0x77, 0x18, 0x01, 0x20, 0x01, 0x28, 0x12, 0x42, 0x02,
-	0x30, 0x01, 0x52, 0x09, 0x72, 0x65, 0x73, 0x75, 0x6c, 0x74, 0x52, 0x6f, 0x77, 0x22, 0x2c, 0x0a,
-	0x09, 0x52, 0x65, 0x66, 0x65, 0x72, 0x65, 0x6e, 0x63, 0x65, 0x12, 0x1f, 0x0a, 0x0b, 0x63, 0x6f,
-	0x6c, 0x75, 0x6d, 0x6e, 0x5f, 0x6e, 0x61, 0x6d, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52,
-	0x0a, 0x63, 0x6f, 0x6c, 0x75, 0x6d, 0x6e, 0x4e, 0x61, 0x6d, 0x65, 0x22, 0xd0, 0x01, 0x0a, 0x07,
-	0x4c, 0x69, 0x74, 0x65, 0x72, 0x61, 0x6c, 0x12, 0x23, 0x0a, 0x0c, 0x73, 0x74, 0x72, 0x69, 0x6e,
-	0x67, 0x5f, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x48, 0x00, 0x52,
-	0x0b, 0x73, 0x74, 0x72, 0x69, 0x6e, 0x67, 0x56, 0x61, 0x6c, 0x75, 0x65, 0x12, 0x23, 0x0a, 0x0c,
-	0x64, 0x6f, 0x75, 0x62, 0x6c, 0x65, 0x5f, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, 0x01,
-	0x28, 0x01, 0x48, 0x00, 0x52, 0x0b, 0x64, 0x6f, 0x75, 0x62, 0x6c, 0x65, 0x56, 0x61, 0x6c, 0x75,
-	0x65, 0x12, 0x1f, 0x0a, 0x0a, 0x62, 0x6f, 0x6f, 0x6c, 0x5f, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18,
-	0x03, 0x20, 0x01, 0x28, 0x08, 0x48, 0x00, 0x52, 0x09, 0x62, 0x6f, 0x6f, 0x6c, 0x56, 0x61, 0x6c,
-	0x75, 0x65, 0x12, 0x23, 0x0a, 0x0a, 0x6c, 0x6f, 0x6e, 0x67, 0x5f, 0x76, 0x61, 0x6c, 0x75, 0x65,
-	0x18, 0x04, 0x20, 0x01, 0x28, 0x12, 0x42, 0x02, 0x30, 0x01, 0x48, 0x00, 0x52, 0x09, 0x6c, 0x6f,
-	0x6e, 0x67, 0x56, 0x61, 0x6c, 0x75, 0x65, 0x12, 0x2c, 0x0a, 0x0f, 0x6e, 0x61, 0x6e, 0x6f, 0x5f,
-	0x74, 0x69, 0x6d, 0x65, 0x5f, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x05, 0x20, 0x01, 0x28, 0x12,
-	0x42, 0x02, 0x30, 0x01, 0x48, 0x00, 0x52, 0x0d, 0x6e, 0x61, 0x6e, 0x6f, 0x54, 0x69, 0x6d, 0x65,
-	0x56, 0x61, 0x6c, 0x75, 0x65, 0x42, 0x07, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x22, 0xa5,
-	0x01, 0x0a, 0x05, 0x56, 0x61, 0x6c, 0x75, 0x65, 0x12, 0x4c, 0x0a, 0x09, 0x72, 0x65, 0x66, 0x65,
-	0x72, 0x65, 0x6e, 0x63, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x2c, 0x2e, 0x69, 0x6f,
-	0x2e, 0x64, 0x65, 0x65, 0x70, 0x68, 0x61, 0x76, 0x65, 0x6e, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f,
-	0x2e, 0x62, 0x61, 0x63, 0x6b, 0x70, 0x6c, 0x61, 0x6e, 0x65, 0x2e, 0x67, 0x72, 0x70, 0x63, 0x2e,
-	0x52, 0x65, 0x66, 0x65, 0x72, 0x65, 0x6e, 0x63, 0x65, 0x48, 0x00, 0x52, 0x09, 0x72, 0x65, 0x66,
-	0x65, 0x72, 0x65, 0x6e, 0x63, 0x65, 0x12, 0x46, 0x0a, 0x07, 0x6c, 0x69, 0x74, 0x65, 0x72, 0x61,
-	0x6c, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x2a, 0x2e, 0x69, 0x6f, 0x2e, 0x64, 0x65, 0x65,
+	0x63, 0x2e, 0x4e, 0x6f, 0x74, 0x43, 0x6f, 0x6e, 0x64, 0x69, 0x74, 0x69, 0x6f, 0x6e, 0x48, 0x00,
+	0x52, 0x03, 0x6e, 0x6f, 0x74, 0x12, 0x4f, 0x0a, 0x07, 0x63, 0x6f, 0x6d, 0x70, 0x61, 0x72, 0x65,
+	0x18, 0x04, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x33, 0x2e, 0x69, 0x6f, 0x2e, 0x64, 0x65, 0x65, 0x70,
+	0x68, 0x61, 0x76, 0x65, 0x6e, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x62, 0x61, 0x63, 0x6b,
+	0x70, 0x6c, 0x61, 0x6e, 0x65, 0x2e, 0x67, 0x72, 0x70, 0x63, 0x2e, 0x43, 0x6f, 0x6d, 0x70, 0x61,
+	0x72, 0x65, 0x43, 0x6f, 0x6e, 0x64, 0x69, 0x74, 0x69, 0x6f, 0x6e, 0x48, 0x00, 0x52, 0x07, 0x63,
+	0x6f, 0x6d, 0x70, 0x61, 0x72, 0x65, 0x12, 0x40, 0x0a, 0x02, 0x69, 0x6e, 0x18, 0x05, 0x20, 0x01,
+	0x28, 0x0b, 0x32, 0x2e, 0x2e, 0x69, 0x6f, 0x2e, 0x64, 0x65, 0x65, 0x70, 0x68, 0x61, 0x76, 0x65,
+	0x6e, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x62, 0x61, 0x63, 0x6b, 0x70, 0x6c, 0x61, 0x6e,
+	0x65, 0x2e, 0x67, 0x72, 0x70, 0x63, 0x2e, 0x49, 0x6e, 0x43, 0x6f, 0x6e, 0x64, 0x69, 0x74, 0x69,
+	0x6f, 0x6e, 0x48, 0x00, 0x52, 0x02, 0x69, 0x6e, 0x12, 0x4c, 0x0a, 0x06, 0x69, 0x6e, 0x76, 0x6f,
+	0x6b, 0x65, 0x18, 0x06, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x32, 0x2e, 0x69, 0x6f, 0x2e, 0x64, 0x65,
+	0x65, 0x70, 0x68, 0x61, 0x76, 0x65, 0x6e, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x62, 0x61,
+	0x63, 0x6b, 0x70, 0x6c, 0x61, 0x6e, 0x65, 0x2e, 0x67, 0x72, 0x70, 0x63, 0x2e, 0x49, 0x6e, 0x76,
+	0x6f, 0x6b, 0x65, 0x43, 0x6f, 0x6e, 0x64, 0x69, 0x74, 0x69, 0x6f, 0x6e, 0x48, 0x00, 0x52, 0x06,
+	0x69, 0x6e, 0x76, 0x6f, 0x6b, 0x65, 0x12, 0x4d, 0x0a, 0x07, 0x69, 0x73, 0x5f, 0x6e, 0x75, 0x6c,
+	0x6c, 0x18, 0x07, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x32, 0x2e, 0x69, 0x6f, 0x2e, 0x64, 0x65, 0x65,
 	0x70, 0x68, 0x61, 0x76, 0x65, 0x6e, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x62, 0x61, 0x63,
-	0x6b, 0x70, 0x6c, 0x61, 0x6e, 0x65, 0x2e, 0x67, 0x72, 0x70, 0x63, 0x2e, 0x4c, 0x69, 0x74, 0x65,
-	0x72, 0x61, 0x6c, 0x48, 0x00, 0x52, 0x07, 0x6c, 0x69, 0x74, 0x65, 0x72, 0x61, 0x6c, 0x42, 0x06,
-	0x0a, 0x04, 0x64, 0x61, 0x74, 0x61, 0x22, 0x82, 0x06, 0x0a, 0x09, 0x43, 0x6f, 0x6e, 0x64, 0x69,
-	0x74, 0x69, 0x6f, 0x6e, 0x12, 0x43, 0x0a, 0x03, 0x61, 0x6e, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28,
-	0x0b, 0x32, 0x2f, 0x2e, 0x69, 0x6f, 0x2e, 0x64, 0x65, 0x65, 0x70, 0x68, 0x61, 0x76, 0x65, 0x6e,
-	0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x62, 0x61, 0x63, 0x6b, 0x70, 0x6c, 0x61, 0x6e, 0x65,
-	0x2e, 0x67, 0x72, 0x70, 0x63, 0x2e, 0x41, 0x6e, 0x64, 0x43, 0x6f, 0x6e, 0x64, 0x69, 0x74, 0x69,
-	0x6f, 0x6e, 0x48, 0x00, 0x52, 0x03, 0x61, 0x6e, 0x64, 0x12, 0x40, 0x0a, 0x02, 0x6f, 0x72, 0x18,
-	0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x2e, 0x2e, 0x69, 0x6f, 0x2e, 0x64, 0x65, 0x65, 0x70, 0x68,
-	0x61, 0x76, 0x65, 0x6e, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x62, 0x61, 0x63, 0x6b, 0x70,
-	0x6c, 0x61, 0x6e, 0x65, 0x2e, 0x67, 0x72, 0x70, 0x63, 0x2e, 0x4f, 0x72, 0x43, 0x6f, 0x6e, 0x64,
-	0x69, 0x74, 0x69, 0x6f, 0x6e, 0x48, 0x00, 0x52, 0x02, 0x6f, 0x72, 0x12, 0x43, 0x0a, 0x03, 0x6e,
-	0x6f, 0x74, 0x18, 0x03, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x2f, 0x2e, 0x69, 0x6f, 0x2e, 0x64, 0x65,
+	0x6b, 0x70, 0x6c, 0x61, 0x6e, 0x65, 0x2e, 0x67, 0x72, 0x70, 0x63, 0x2e, 0x49, 0x73, 0x4e, 0x75,
+	0x6c, 0x6c, 0x43, 0x6f, 0x6e, 0x64, 0x69, 0x74, 0x69, 0x6f, 0x6e, 0x48, 0x00, 0x52, 0x06, 0x69,
+	0x73, 0x4e, 0x75, 0x6c, 0x6c, 0x12, 0x4f, 0x0a, 0x07, 0x6d, 0x61, 0x74, 0x63, 0x68, 0x65, 0x73,
+	0x18, 0x08, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x33, 0x2e, 0x69, 0x6f, 0x2e, 0x64, 0x65, 0x65, 0x70,
+	0x68, 0x61, 0x76, 0x65, 0x6e, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x62, 0x61, 0x63, 0x6b,
+	0x70, 0x6c, 0x61, 0x6e, 0x65, 0x2e, 0x67, 0x72, 0x70, 0x63, 0x2e, 0x4d, 0x61, 0x74, 0x63, 0x68,
+	0x65, 0x73, 0x43, 0x6f, 0x6e, 0x64, 0x69, 0x74, 0x69, 0x6f, 0x6e, 0x48, 0x00, 0x52, 0x07, 0x6d,
+	0x61, 0x74, 0x63, 0x68, 0x65, 0x73, 0x12, 0x52, 0x0a, 0x08, 0x63, 0x6f, 0x6e, 0x74, 0x61, 0x69,
+	0x6e, 0x73, 0x18, 0x09, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x34, 0x2e, 0x69, 0x6f, 0x2e, 0x64, 0x65,
 	0x65, 0x70, 0x68, 0x61, 0x76, 0x65, 0x6e, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x62, 0x61,
-	0x63, 0x6b, 0x70, 0x6c, 0x61, 0x6e, 0x65, 0x2e, 0x67, 0x72, 0x70, 0x63, 0x2e, 0x4e, 0x6f, 0x74,
-	0x43, 0x6f, 0x6e, 0x64, 0x69, 0x74, 0x69, 0x6f, 0x6e, 0x48, 0x00, 0x52, 0x03, 0x6e, 0x6f, 0x74,
-	0x12, 0x4f, 0x0a, 0x07, 0x63, 0x6f, 0x6d, 0x70, 0x61, 0x72, 0x65, 0x18, 0x04, 0x20, 0x01, 0x28,
-	0x0b, 0x32, 0x33, 0x2e, 0x69, 0x6f, 0x2e, 0x64, 0x65, 0x65, 0x70, 0x68, 0x61, 0x76, 0x65, 0x6e,
+	0x63, 0x6b, 0x70, 0x6c, 0x61, 0x6e, 0x65, 0x2e, 0x67, 0x72, 0x70, 0x63, 0x2e, 0x43, 0x6f, 0x6e,
+	0x74, 0x61, 0x69, 0x6e, 0x73, 0x43, 0x6f, 0x6e, 0x64, 0x69, 0x74, 0x69, 0x6f, 0x6e, 0x48, 0x00,
+	0x52, 0x08, 0x63, 0x6f, 0x6e, 0x74, 0x61, 0x69, 0x6e, 0x73, 0x12, 0x4c, 0x0a, 0x06, 0x73, 0x65,
+	0x61, 0x72, 0x63, 0x68, 0x18, 0x0a, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x32, 0x2e, 0x69, 0x6f, 0x2e,
+	0x64, 0x65, 0x65, 0x70, 0x68, 0x61, 0x76, 0x65, 0x6e, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e,
+	0x62, 0x61, 0x63, 0x6b, 0x70, 0x6c, 0x61, 0x6e, 0x65, 0x2e, 0x67, 0x72, 0x70, 0x63, 0x2e, 0x53,
+	0x65, 0x61, 0x72, 0x63, 0x68, 0x43, 0x6f, 0x6e, 0x64, 0x69, 0x74, 0x69, 0x6f, 0x6e, 0x48, 0x00,
+	0x52, 0x06, 0x73, 0x65, 0x61, 0x72, 0x63, 0x68, 0x42, 0x06, 0x0a, 0x04, 0x64, 0x61, 0x74, 0x61,
+	0x22, 0x56, 0x0a, 0x0c, 0x41, 0x6e, 0x64, 0x43, 0x6f, 0x6e, 0x64, 0x69, 0x74, 0x69, 0x6f, 0x6e,
+	0x12, 0x46, 0x0a, 0x07, 0x66, 0x69, 0x6c, 0x74, 0x65, 0x72, 0x73, 0x18, 0x01, 0x20, 0x03, 0x28,
+	0x0b, 0x32, 0x2c, 0x2e, 0x69, 0x6f, 0x2e, 0x64, 0x65, 0x65, 0x70, 0x68, 0x61, 0x76, 0x65, 0x6e,
 	0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x62, 0x61, 0x63, 0x6b, 0x70, 0x6c, 0x61, 0x6e, 0x65,
-	0x2e, 0x67, 0x72, 0x70, 0x63, 0x2e, 0x43, 0x6f, 0x6d, 0x70, 0x61, 0x72, 0x65, 0x43, 0x6f, 0x6e,
-	0x64, 0x69, 0x74, 0x69, 0x6f, 0x6e, 0x48, 0x00, 0x52, 0x07, 0x63, 0x6f, 0x6d, 0x70, 0x61, 0x72,
-	0x65, 0x12, 0x40, 0x0a, 0x02, 0x69, 0x6e, 0x18, 0x05, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x2e, 0x2e,
+	0x2e, 0x67, 0x72, 0x70, 0x63, 0x2e, 0x43, 0x6f, 0x6e, 0x64, 0x69, 0x74, 0x69, 0x6f, 0x6e, 0x52,
+	0x07, 0x66, 0x69, 0x6c, 0x74, 0x65, 0x72, 0x73, 0x22, 0x55, 0x0a, 0x0b, 0x4f, 0x72, 0x43, 0x6f,
+	0x6e, 0x64, 0x69, 0x74, 0x69, 0x6f, 0x6e, 0x12, 0x46, 0x0a, 0x07, 0x66, 0x69, 0x6c, 0x74, 0x65,
+	0x72, 0x73, 0x18, 0x01, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x2c, 0x2e, 0x69, 0x6f, 0x2e, 0x64, 0x65,
+	0x65, 0x70, 0x68, 0x61, 0x76, 0x65, 0x6e, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x62, 0x61,
+	0x63, 0x6b, 0x70, 0x6c, 0x61, 0x6e, 0x65, 0x2e, 0x67, 0x72, 0x70, 0x63, 0x2e, 0x43, 0x6f, 0x6e,
+	0x64, 0x69, 0x74, 0x69, 0x6f, 0x6e, 0x52, 0x07, 0x66, 0x69, 0x6c, 0x74, 0x65, 0x72, 0x73, 0x22,
+	0x54, 0x0a, 0x0c, 0x4e, 0x6f, 0x74, 0x43, 0x6f, 0x6e, 0x64, 0x69, 0x74, 0x69, 0x6f, 0x6e, 0x12,
+	0x44, 0x0a, 0x06, 0x66, 0x69, 0x6c, 0x74, 0x65, 0x72, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32,
+	0x2c, 0x2e, 0x69, 0x6f, 0x2e, 0x64, 0x65, 0x65, 0x70, 0x68, 0x61, 0x76, 0x65, 0x6e, 0x2e, 0x70,
+	0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x62, 0x61, 0x63, 0x6b, 0x70, 0x6c, 0x61, 0x6e, 0x65, 0x2e, 0x67,
+	0x72, 0x70, 0x63, 0x2e, 0x43, 0x6f, 0x6e, 0x64, 0x69, 0x74, 0x69, 0x6f, 0x6e, 0x52, 0x06, 0x66,
+	0x69, 0x6c, 0x74, 0x65, 0x72, 0x22, 0xd2, 0x03, 0x0a, 0x10, 0x43, 0x6f, 0x6d, 0x70, 0x61, 0x72,
+	0x65, 0x43, 0x6f, 0x6e, 0x64, 0x69, 0x74, 0x69, 0x6f, 0x6e, 0x12, 0x62, 0x0a, 0x09, 0x6f, 0x70,
+	0x65, 0x72, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0e, 0x32, 0x44, 0x2e,
 	0x69, 0x6f, 0x2e, 0x64, 0x65, 0x65, 0x70, 0x68, 0x61, 0x76, 0x65, 0x6e, 0x2e, 0x70, 0x72, 0x6f,
 	0x74, 0x6f, 0x2e, 0x62, 0x61, 0x63, 0x6b, 0x70, 0x6c, 0x61, 0x6e, 0x65, 0x2e, 0x67, 0x72, 0x70,
-	0x63, 0x2e, 0x49, 0x6e, 0x43, 0x6f, 0x6e, 0x64, 0x69, 0x74, 0x69, 0x6f, 0x6e, 0x48, 0x00, 0x52,
-	0x02, 0x69, 0x6e, 0x12, 0x4c, 0x0a, 0x06, 0x69, 0x6e, 0x76, 0x6f, 0x6b, 0x65, 0x18, 0x06, 0x20,
-	0x01, 0x28, 0x0b, 0x32, 0x32, 0x2e, 0x69, 0x6f, 0x2e, 0x64, 0x65, 0x65, 0x70, 0x68, 0x61, 0x76,
-	0x65, 0x6e, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x62, 0x61, 0x63, 0x6b, 0x70, 0x6c, 0x61,
-	0x6e, 0x65, 0x2e, 0x67, 0x72, 0x70, 0x63, 0x2e, 0x49, 0x6e, 0x76, 0x6f, 0x6b, 0x65, 0x43, 0x6f,
-	0x6e, 0x64, 0x69, 0x74, 0x69, 0x6f, 0x6e, 0x48, 0x00, 0x52, 0x06, 0x69, 0x6e, 0x76, 0x6f, 0x6b,
-	0x65, 0x12, 0x4d, 0x0a, 0x07, 0x69, 0x73, 0x5f, 0x6e, 0x75, 0x6c, 0x6c, 0x18, 0x07, 0x20, 0x01,
-	0x28, 0x0b, 0x32, 0x32, 0x2e, 0x69, 0x6f, 0x2e, 0x64, 0x65, 0x65, 0x70, 0x68, 0x61, 0x76, 0x65,
-	0x6e, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x62, 0x61, 0x63, 0x6b, 0x70, 0x6c, 0x61, 0x6e,
-	0x65, 0x2e, 0x67, 0x72, 0x70, 0x63, 0x2e, 0x49, 0x73, 0x4e, 0x75, 0x6c, 0x6c, 0x43, 0x6f, 0x6e,
-	0x64, 0x69, 0x74, 0x69, 0x6f, 0x6e, 0x48, 0x00, 0x52, 0x06, 0x69, 0x73, 0x4e, 0x75, 0x6c, 0x6c,
-	0x12, 0x4f, 0x0a, 0x07, 0x6d, 0x61, 0x74, 0x63, 0x68, 0x65, 0x73, 0x18, 0x08, 0x20, 0x01, 0x28,
-	0x0b, 0x32, 0x33, 0x2e, 0x69, 0x6f, 0x2e, 0x64, 0x65, 0x65, 0x70, 0x68, 0x61, 0x76, 0x65, 0x6e,
-	0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x62, 0x61, 0x63, 0x6b, 0x70, 0x6c, 0x61, 0x6e, 0x65,
-	0x2e, 0x67, 0x72, 0x70, 0x63, 0x2e, 0x4d, 0x61, 0x74, 0x63, 0x68, 0x65, 0x73, 0x43, 0x6f, 0x6e,
-	0x64, 0x69, 0x74, 0x69, 0x6f, 0x6e, 0x48, 0x00, 0x52, 0x07, 0x6d, 0x61, 0x74, 0x63, 0x68, 0x65,
-	0x73, 0x12, 0x52, 0x0a, 0x08, 0x63, 0x6f, 0x6e, 0x74, 0x61, 0x69, 0x6e, 0x73, 0x18, 0x09, 0x20,
-	0x01, 0x28, 0x0b, 0x32, 0x34, 0x2e, 0x69, 0x6f, 0x2e, 0x64, 0x65, 0x65, 0x70, 0x68, 0x61, 0x76,
-	0x65, 0x6e, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x62, 0x61, 0x63, 0x6b, 0x70, 0x6c, 0x61,
-	0x6e, 0x65, 0x2e, 0x67, 0x72, 0x70, 0x63, 0x2e, 0x43, 0x6f, 0x6e, 0x74, 0x61, 0x69, 0x6e, 0x73,
-	0x43, 0x6f, 0x6e, 0x64, 0x69, 0x74, 0x69, 0x6f, 0x6e, 0x48, 0x00, 0x52, 0x08, 0x63, 0x6f, 0x6e,
-	0x74, 0x61, 0x69, 0x6e, 0x73, 0x12, 0x4c, 0x0a, 0x06, 0x73, 0x65, 0x61, 0x72, 0x63, 0x68, 0x18,
-	0x0a, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x32, 0x2e, 0x69, 0x6f, 0x2e, 0x64, 0x65, 0x65, 0x70, 0x68,
-	0x61, 0x76, 0x65, 0x6e, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x62, 0x61, 0x63, 0x6b, 0x70,
-	0x6c, 0x61, 0x6e, 0x65, 0x2e, 0x67, 0x72, 0x70, 0x63, 0x2e, 0x53, 0x65, 0x61, 0x72, 0x63, 0x68,
-	0x43, 0x6f, 0x6e, 0x64, 0x69, 0x74, 0x69, 0x6f, 0x6e, 0x48, 0x00, 0x52, 0x06, 0x73, 0x65, 0x61,
-	0x72, 0x63, 0x68, 0x42, 0x06, 0x0a, 0x04, 0x64, 0x61, 0x74, 0x61, 0x22, 0x56, 0x0a, 0x0c, 0x41,
-	0x6e, 0x64, 0x43, 0x6f, 0x6e, 0x64, 0x69, 0x74, 0x69, 0x6f, 0x6e, 0x12, 0x46, 0x0a, 0x07, 0x66,
-	0x69, 0x6c, 0x74, 0x65, 0x72, 0x73, 0x18, 0x01, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x2c, 0x2e, 0x69,
-	0x6f, 0x2e, 0x64, 0x65, 0x65, 0x70, 0x68, 0x61, 0x76, 0x65, 0x6e, 0x2e, 0x70, 0x72, 0x6f, 0x74,
-	0x6f, 0x2e, 0x62, 0x61, 0x63, 0x6b, 0x70, 0x6c, 0x61, 0x6e, 0x65, 0x2e, 0x67, 0x72, 0x70, 0x63,
-	0x2e, 0x43, 0x6f, 0x6e, 0x64, 0x69, 0x74, 0x69, 0x6f, 0x6e, 0x52, 0x07, 0x66, 0x69, 0x6c, 0x74,
-	0x65, 0x72, 0x73, 0x22, 0x55, 0x0a, 0x0b, 0x4f, 0x72, 0x43, 0x6f, 0x6e, 0x64, 0x69, 0x74, 0x69,
-	0x6f, 0x6e, 0x12, 0x46, 0x0a, 0x07, 0x66, 0x69, 0x6c, 0x74, 0x65, 0x72, 0x73, 0x18, 0x01, 0x20,
-	0x03, 0x28, 0x0b, 0x32, 0x2c, 0x2e, 0x69, 0x6f, 0x2e, 0x64, 0x65, 0x65, 0x70, 0x68, 0x61, 0x76,
-	0x65, 0x6e, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x62, 0x61, 0x63, 0x6b, 0x70, 0x6c, 0x61,
-	0x6e, 0x65, 0x2e, 0x67, 0x72, 0x70, 0x63, 0x2e, 0x43, 0x6f, 0x6e, 0x64, 0x69, 0x74, 0x69, 0x6f,
-	0x6e, 0x52, 0x07, 0x66, 0x69, 0x6c, 0x74, 0x65, 0x72, 0x73, 0x22, 0x54, 0x0a, 0x0c, 0x4e, 0x6f,
-	0x74, 0x43, 0x6f, 0x6e, 0x64, 0x69, 0x74, 0x69, 0x6f, 0x6e, 0x12, 0x44, 0x0a, 0x06, 0x66, 0x69,
-	0x6c, 0x74, 0x65, 0x72, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x2c, 0x2e, 0x69, 0x6f, 0x2e,
-	0x64, 0x65, 0x65, 0x70, 0x68, 0x61, 0x76, 0x65, 0x6e, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e,
-	0x62, 0x61, 0x63, 0x6b, 0x70, 0x6c, 0x61, 0x6e, 0x65, 0x2e, 0x67, 0x72, 0x70, 0x63, 0x2e, 0x43,
-	0x6f, 0x6e, 0x64, 0x69, 0x74, 0x69, 0x6f, 0x6e, 0x52, 0x06, 0x66, 0x69, 0x6c, 0x74, 0x65, 0x72,
-	0x22, 0xd2, 0x03, 0x0a, 0x10, 0x43, 0x6f, 0x6d, 0x70, 0x61, 0x72, 0x65, 0x43, 0x6f, 0x6e, 0x64,
-	0x69, 0x74, 0x69, 0x6f, 0x6e, 0x12, 0x62, 0x0a, 0x09, 0x6f, 0x70, 0x65, 0x72, 0x61, 0x74, 0x69,
-	0x6f, 0x6e, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0e, 0x32, 0x44, 0x2e, 0x69, 0x6f, 0x2e, 0x64, 0x65,
+	0x63, 0x2e, 0x43, 0x6f, 0x6d, 0x70, 0x61, 0x72, 0x65, 0x43, 0x6f, 0x6e, 0x64, 0x69, 0x74, 0x69,
+	0x6f, 0x6e, 0x2e, 0x43, 0x6f, 0x6d, 0x70, 0x61, 0x72, 0x65, 0x4f, 0x70, 0x65, 0x72, 0x61, 0x74,
+	0x69, 0x6f, 0x6e, 0x52, 0x09, 0x6f, 0x70, 0x65, 0x72, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x12, 0x5d,
+	0x0a, 0x10, 0x63, 0x61, 0x73, 0x65, 0x5f, 0x73, 0x65, 0x6e, 0x73, 0x69, 0x74, 0x69, 0x76, 0x69,
+	0x74, 0x79, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0e, 0x32, 0x32, 0x2e, 0x69, 0x6f, 0x2e, 0x64, 0x65,
 	0x65, 0x70, 0x68, 0x61, 0x76, 0x65, 0x6e, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x62, 0x61,
-	0x63, 0x6b, 0x70, 0x6c, 0x61, 0x6e, 0x65, 0x2e, 0x67, 0x72, 0x70, 0x63, 0x2e, 0x43, 0x6f, 0x6d,
-	0x70, 0x61, 0x72, 0x65, 0x43, 0x6f, 0x6e, 0x64, 0x69, 0x74, 0x69, 0x6f, 0x6e, 0x2e, 0x43, 0x6f,
-	0x6d, 0x70, 0x61, 0x72, 0x65, 0x4f, 0x70, 0x65, 0x72, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x52, 0x09,
-	0x6f, 0x70, 0x65, 0x72, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x12, 0x5d, 0x0a, 0x10, 0x63, 0x61, 0x73,
-	0x65, 0x5f, 0x73, 0x65, 0x6e, 0x73, 0x69, 0x74, 0x69, 0x76, 0x69, 0x74, 0x79, 0x18, 0x02, 0x20,
-	0x01, 0x28, 0x0e, 0x32, 0x32, 0x2e, 0x69, 0x6f, 0x2e, 0x64, 0x65, 0x65, 0x70, 0x68, 0x61, 0x76,
+	0x63, 0x6b, 0x70, 0x6c, 0x61, 0x6e, 0x65, 0x2e, 0x67, 0x72, 0x70, 0x63, 0x2e, 0x43, 0x61, 0x73,
+	0x65, 0x53, 0x65, 0x6e, 0x73, 0x69, 0x74, 0x69, 0x76, 0x69, 0x74, 0x79, 0x52, 0x0f, 0x63, 0x61,
+	0x73, 0x65, 0x53, 0x65, 0x6e, 0x73, 0x69, 0x74, 0x69, 0x76, 0x69, 0x74, 0x79, 0x12, 0x3a, 0x0a,
+	0x03, 0x6c, 0x68, 0x73, 0x18, 0x03, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x28, 0x2e, 0x69, 0x6f, 0x2e,
+	0x64, 0x65, 0x65, 0x70, 0x68, 0x61, 0x76, 0x65, 0x6e, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e,
+	0x62, 0x61, 0x63, 0x6b, 0x70, 0x6c, 0x61, 0x6e, 0x65, 0x2e, 0x67, 0x72, 0x70, 0x63, 0x2e, 0x56,
+	0x61, 0x6c, 0x75, 0x65, 0x52, 0x03, 0x6c, 0x68, 0x73, 0x12, 0x3a, 0x0a, 0x03, 0x72, 0x68, 0x73,
+	0x18, 0x04, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x28, 0x2e, 0x69, 0x6f, 0x2e, 0x64, 0x65, 0x65, 0x70,
+	0x68, 0x61, 0x76, 0x65, 0x6e, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x62, 0x61, 0x63, 0x6b,
+	0x70, 0x6c, 0x61, 0x6e, 0x65, 0x2e, 0x67, 0x72, 0x70, 0x63, 0x2e, 0x56, 0x61, 0x6c, 0x75, 0x65,
+	0x52, 0x03, 0x72, 0x68, 0x73, 0x22, 0x82, 0x01, 0x0a, 0x10, 0x43, 0x6f, 0x6d, 0x70, 0x61, 0x72,
+	0x65, 0x4f, 0x70, 0x65, 0x72, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x12, 0x0d, 0x0a, 0x09, 0x4c, 0x45,
+	0x53, 0x53, 0x5f, 0x54, 0x48, 0x41, 0x4e, 0x10, 0x00, 0x12, 0x16, 0x0a, 0x12, 0x4c, 0x45, 0x53,
+	0x53, 0x5f, 0x54, 0x48, 0x41, 0x4e, 0x5f, 0x4f, 0x52, 0x5f, 0x45, 0x51, 0x55, 0x41, 0x4c, 0x10,
+	0x01, 0x12, 0x10, 0x0a, 0x0c, 0x47, 0x52, 0x45, 0x41, 0x54, 0x45, 0x52, 0x5f, 0x54, 0x48, 0x41,
+	0x4e, 0x10, 0x02, 0x12, 0x19, 0x0a, 0x15, 0x47, 0x52, 0x45, 0x41, 0x54, 0x45, 0x52, 0x5f, 0x54,
+	0x48, 0x41, 0x4e, 0x5f, 0x4f, 0x52, 0x5f, 0x45, 0x51, 0x55, 0x41, 0x4c, 0x10, 0x03, 0x12, 0x0a,
+	0x0a, 0x06, 0x45, 0x51, 0x55, 0x41, 0x4c, 0x53, 0x10, 0x04, 0x12, 0x0e, 0x0a, 0x0a, 0x4e, 0x4f,
+	0x54, 0x5f, 0x45, 0x51, 0x55, 0x41, 0x4c, 0x53, 0x10, 0x05, 0x22, 0xc5, 0x02, 0x0a, 0x0b, 0x49,
+	0x6e, 0x43, 0x6f, 0x6e, 0x64, 0x69, 0x74, 0x69, 0x6f, 0x6e, 0x12, 0x40, 0x0a, 0x06, 0x74, 0x61,
+	0x72, 0x67, 0x65, 0x74, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x28, 0x2e, 0x69, 0x6f, 0x2e,
+	0x64, 0x65, 0x65, 0x70, 0x68, 0x61, 0x76, 0x65, 0x6e, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e,
+	0x62, 0x61, 0x63, 0x6b, 0x70, 0x6c, 0x61, 0x6e, 0x65, 0x2e, 0x67, 0x72, 0x70, 0x63, 0x2e, 0x56,
+	0x61, 0x6c, 0x75, 0x65, 0x52, 0x06, 0x74, 0x61, 0x72, 0x67, 0x65, 0x74, 0x12, 0x48, 0x0a, 0x0a,
+	0x63, 0x61, 0x6e, 0x64, 0x69, 0x64, 0x61, 0x74, 0x65, 0x73, 0x18, 0x02, 0x20, 0x03, 0x28, 0x0b,
+	0x32, 0x28, 0x2e, 0x69, 0x6f, 0x2e, 0x64, 0x65, 0x65, 0x70, 0x68, 0x61, 0x76, 0x65, 0x6e, 0x2e,
+	0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x62, 0x61, 0x63, 0x6b, 0x70, 0x6c, 0x61, 0x6e, 0x65, 0x2e,
+	0x67, 0x72, 0x70, 0x63, 0x2e, 0x56, 0x61, 0x6c, 0x75, 0x65, 0x52, 0x0a, 0x63, 0x61, 0x6e, 0x64,
+	0x69, 0x64, 0x61, 0x74, 0x65, 0x73, 0x12, 0x5d, 0x0a, 0x10, 0x63, 0x61, 0x73, 0x65, 0x5f, 0x73,
+	0x65, 0x6e, 0x73, 0x69, 0x74, 0x69, 0x76, 0x69, 0x74, 0x79, 0x18, 0x03, 0x20, 0x01, 0x28, 0x0e,
+	0x32, 0x32, 0x2e, 0x69, 0x6f, 0x2e, 0x64, 0x65, 0x65, 0x70, 0x68, 0x61, 0x76, 0x65, 0x6e, 0x2e,
+	0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x62, 0x61, 0x63, 0x6b, 0x70, 0x6c, 0x61, 0x6e, 0x65, 0x2e,
+	0x67, 0x72, 0x70, 0x63, 0x2e, 0x43, 0x61, 0x73, 0x65, 0x53, 0x65, 0x6e, 0x73, 0x69, 0x74, 0x69,
+	0x76, 0x69, 0x74, 0x79, 0x52, 0x0f, 0x63, 0x61, 0x73, 0x65, 0x53, 0x65, 0x6e, 0x73, 0x69, 0x74,
+	0x69, 0x76, 0x69, 0x74, 0x79, 0x12, 0x4b, 0x0a, 0x0a, 0x6d, 0x61, 0x74, 0x63, 0x68, 0x5f, 0x74,
+	0x79, 0x70, 0x65, 0x18, 0x04, 0x20, 0x01, 0x28, 0x0e, 0x32, 0x2c, 0x2e, 0x69, 0x6f, 0x2e, 0x64,
+	0x65, 0x65, 0x70, 0x68, 0x61, 0x76, 0x65, 0x6e, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x62,
+	0x61, 0x63, 0x6b, 0x70, 0x6c, 0x61, 0x6e, 0x65, 0x2e, 0x67, 0x72, 0x70, 0x63, 0x2e, 0x4d, 0x61,
+	0x74, 0x63, 0x68, 0x54, 0x79, 0x70, 0x65, 0x52, 0x09, 0x6d, 0x61, 0x74, 0x63, 0x68, 0x54, 0x79,
+	0x70, 0x65, 0x22, 0xb3, 0x01, 0x0a, 0x0f, 0x49, 0x6e, 0x76, 0x6f, 0x6b, 0x65, 0x43, 0x6f, 0x6e,
+	0x64, 0x69, 0x74, 0x69, 0x6f, 0x6e, 0x12, 0x16, 0x0a, 0x06, 0x6d, 0x65, 0x74, 0x68, 0x6f, 0x64,
+	0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06, 0x6d, 0x65, 0x74, 0x68, 0x6f, 0x64, 0x12, 0x40,
+	0x0a, 0x06, 0x74, 0x61, 0x72, 0x67, 0x65, 0x74, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x28,
+	0x2e, 0x69, 0x6f, 0x2e, 0x64, 0x65, 0x65, 0x70, 0x68, 0x61, 0x76, 0x65, 0x6e, 0x2e, 0x70, 0x72,
+	0x6f, 0x74, 0x6f, 0x2e, 0x62, 0x61, 0x63, 0x6b, 0x70, 0x6c, 0x61, 0x6e, 0x65, 0x2e, 0x67, 0x72,
+	0x70, 0x63, 0x2e, 0x56, 0x61, 0x6c, 0x75, 0x65, 0x52, 0x06, 0x74, 0x61, 0x72, 0x67, 0x65, 0x74,
+	0x12, 0x46, 0x0a, 0x09, 0x61, 0x72, 0x67, 0x75, 0x6d, 0x65, 0x6e, 0x74, 0x73, 0x18, 0x03, 0x20,
+	0x03, 0x28, 0x0b, 0x32, 0x28, 0x2e, 0x69, 0x6f, 0x2e, 0x64, 0x65, 0x65, 0x70, 0x68, 0x61, 0x76,
 	0x65, 0x6e, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x62, 0x61, 0x63, 0x6b, 0x70, 0x6c, 0x61,
-	0x6e, 0x65, 0x2e, 0x67, 0x72, 0x70, 0x63, 0x2e, 0x43, 0x61, 0x73, 0x65, 0x53, 0x65, 0x6e, 0x73,
-	0x69, 0x74, 0x69, 0x76, 0x69, 0x74, 0x79, 0x52, 0x0f, 0x63, 0x61, 0x73, 0x65, 0x53, 0x65, 0x6e,
-	0x73, 0x69, 0x74, 0x69, 0x76, 0x69, 0x74, 0x79, 0x12, 0x3a, 0x0a, 0x03, 0x6c, 0x68, 0x73, 0x18,
-	0x03, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x28, 0x2e, 0x69, 0x6f, 0x2e, 0x64, 0x65, 0x65, 0x70, 0x68,
-	0x61, 0x76, 0x65, 0x6e, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x62, 0x61, 0x63, 0x6b, 0x70,
-	0x6c, 0x61, 0x6e, 0x65, 0x2e, 0x67, 0x72, 0x70, 0x63, 0x2e, 0x56, 0x61, 0x6c, 0x75, 0x65, 0x52,
-	0x03, 0x6c, 0x68, 0x73, 0x12, 0x3a, 0x0a, 0x03, 0x72, 0x68, 0x73, 0x18, 0x04, 0x20, 0x01, 0x28,
-	0x0b, 0x32, 0x28, 0x2e, 0x69, 0x6f, 0x2e, 0x64, 0x65, 0x65, 0x70, 0x68, 0x61, 0x76, 0x65, 0x6e,
+	0x6e, 0x65, 0x2e, 0x67, 0x72, 0x70, 0x63, 0x2e, 0x56, 0x61, 0x6c, 0x75, 0x65, 0x52, 0x09, 0x61,
+	0x72, 0x67, 0x75, 0x6d, 0x65, 0x6e, 0x74, 0x73, 0x22, 0x5d, 0x0a, 0x0f, 0x49, 0x73, 0x4e, 0x75,
+	0x6c, 0x6c, 0x43, 0x6f, 0x6e, 0x64, 0x69, 0x74, 0x69, 0x6f, 0x6e, 0x12, 0x4a, 0x0a, 0x09, 0x72,
+	0x65, 0x66, 0x65, 0x72, 0x65, 0x6e, 0x63, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x2c,
+	0x2e, 0x69, 0x6f, 0x2e, 0x64, 0x65, 0x65, 0x70, 0x68, 0x61, 0x76, 0x65, 0x6e, 0x2e, 0x70, 0x72,
+	0x6f, 0x74, 0x6f, 0x2e, 0x62, 0x61, 0x63, 0x6b, 0x70, 0x6c, 0x61, 0x6e, 0x65, 0x2e, 0x67, 0x72,
+	0x70, 0x63, 0x2e, 0x52, 0x65, 0x66, 0x65, 0x72, 0x65, 0x6e, 0x63, 0x65, 0x52, 0x09, 0x72, 0x65,
+	0x66, 0x65, 0x72, 0x65, 0x6e, 0x63, 0x65, 0x22, 0xa0, 0x02, 0x0a, 0x10, 0x4d, 0x61, 0x74, 0x63,
+	0x68, 0x65, 0x73, 0x43, 0x6f, 0x6e, 0x64, 0x69, 0x74, 0x69, 0x6f, 0x6e, 0x12, 0x4a, 0x0a, 0x09,
+	0x72, 0x65, 0x66, 0x65, 0x72, 0x65, 0x6e, 0x63, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32,
+	0x2c, 0x2e, 0x69, 0x6f, 0x2e, 0x64, 0x65, 0x65, 0x70, 0x68, 0x61, 0x76, 0x65, 0x6e, 0x2e, 0x70,
+	0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x62, 0x61, 0x63, 0x6b, 0x70, 0x6c, 0x61, 0x6e, 0x65, 0x2e, 0x67,
+	0x72, 0x70, 0x63, 0x2e, 0x52, 0x65, 0x66, 0x65, 0x72, 0x65, 0x6e, 0x63, 0x65, 0x52, 0x09, 0x72,
+	0x65, 0x66, 0x65, 0x72, 0x65, 0x6e, 0x63, 0x65, 0x12, 0x14, 0x0a, 0x05, 0x72, 0x65, 0x67, 0x65,
+	0x78, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x05, 0x72, 0x65, 0x67, 0x65, 0x78, 0x12, 0x5d,
+	0x0a, 0x10, 0x63, 0x61, 0x73, 0x65, 0x5f, 0x73, 0x65, 0x6e, 0x73, 0x69, 0x74, 0x69, 0x76, 0x69,
+	0x74, 0x79, 0x18, 0x03, 0x20, 0x01, 0x28, 0x0e, 0x32, 0x32, 0x2e, 0x69, 0x6f, 0x2e, 0x64, 0x65,
+	0x65, 0x70, 0x68, 0x61, 0x76, 0x65, 0x6e, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x62, 0x61,
+	0x63, 0x6b, 0x70, 0x6c, 0x61, 0x6e, 0x65, 0x2e, 0x67, 0x72, 0x70, 0x63, 0x2e, 0x43, 0x61, 0x73,
+	0x65, 0x53, 0x65, 0x6e, 0x73, 0x69, 0x74, 0x69, 0x76, 0x69, 0x74, 0x79, 0x52, 0x0f, 0x63, 0x61,
+	0x73, 0x65, 0x53, 0x65, 0x6e, 0x73, 0x69, 0x74, 0x69, 0x76, 0x69, 0x74, 0x79, 0x12, 0x4b, 0x0a,
+	0x0a, 0x6d, 0x61, 0x74, 0x63, 0x68, 0x5f, 0x74, 0x79, 0x70, 0x65, 0x18, 0x04, 0x20, 0x01, 0x28,
+	0x0e, 0x32, 0x2c, 0x2e, 0x69, 0x6f, 0x2e, 0x64, 0x65, 0x65, 0x70, 0x68, 0x61, 0x76, 0x65, 0x6e,
 	0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x62, 0x61, 0x63, 0x6b, 0x70, 0x6c, 0x61, 0x6e, 0x65,
-	0x2e, 0x67, 0x72, 0x70, 0x63, 0x2e, 0x56, 0x61, 0x6c, 0x75, 0x65, 0x52, 0x03, 0x72, 0x68, 0x73,
-	0x22, 0x82, 0x01, 0x0a, 0x10, 0x43, 0x6f, 0x6d, 0x70, 0x61, 0x72, 0x65, 0x4f, 0x70, 0x65, 0x72,
-	0x61, 0x74, 0x69, 0x6f, 0x6e, 0x12, 0x0d, 0x0a, 0x09, 0x4c, 0x45, 0x53, 0x53, 0x5f, 0x54, 0x48,
-	0x41, 0x4e, 0x10, 0x00, 0x12, 0x16, 0x0a, 0x12, 0x4c, 0x45, 0x53, 0x53, 0x5f, 0x54, 0x48, 0x41,
-	0x4e, 0x5f, 0x4f, 0x52, 0x5f, 0x45, 0x51, 0x55, 0x41, 0x4c, 0x10, 0x01, 0x12, 0x10, 0x0a, 0x0c,
-	0x47, 0x52, 0x45, 0x41, 0x54, 0x45, 0x52, 0x5f, 0x54, 0x48, 0x41, 0x4e, 0x10, 0x02, 0x12, 0x19,
-	0x0a, 0x15, 0x47, 0x52, 0x45, 0x41, 0x54, 0x45, 0x52, 0x5f, 0x54, 0x48, 0x41, 0x4e, 0x5f, 0x4f,
-	0x52, 0x5f, 0x45, 0x51, 0x55, 0x41, 0x4c, 0x10, 0x03, 0x12, 0x0a, 0x0a, 0x06, 0x45, 0x51, 0x55,
-	0x41, 0x4c, 0x53, 0x10, 0x04, 0x12, 0x0e, 0x0a, 0x0a, 0x4e, 0x4f, 0x54, 0x5f, 0x45, 0x51, 0x55,
-	0x41, 0x4c, 0x53, 0x10, 0x05, 0x22, 0xc5, 0x02, 0x0a, 0x0b, 0x49, 0x6e, 0x43, 0x6f, 0x6e, 0x64,
-	0x69, 0x74, 0x69, 0x6f, 0x6e, 0x12, 0x40, 0x0a, 0x06, 0x74, 0x61, 0x72, 0x67, 0x65, 0x74, 0x18,
-	0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x28, 0x2e, 0x69, 0x6f, 0x2e, 0x64, 0x65, 0x65, 0x70, 0x68,
-	0x61, 0x76, 0x65, 0x6e, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x62, 0x61, 0x63, 0x6b, 0x70,
-	0x6c, 0x61, 0x6e, 0x65, 0x2e, 0x67, 0x72, 0x70, 0x63, 0x2e, 0x56, 0x61, 0x6c, 0x75, 0x65, 0x52,
-	0x06, 0x74, 0x61, 0x72, 0x67, 0x65, 0x74, 0x12, 0x48, 0x0a, 0x0a, 0x63, 0x61, 0x6e, 0x64, 0x69,
-	0x64, 0x61, 0x74, 0x65, 0x73, 0x18, 0x02, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x28, 0x2e, 0x69, 0x6f,
-	0x2e, 0x64, 0x65, 0x65, 0x70, 0x68, 0x61, 0x76, 0x65, 0x6e, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f,
-	0x2e, 0x62, 0x61, 0x63, 0x6b, 0x70, 0x6c, 0x61, 0x6e, 0x65, 0x2e, 0x67, 0x72, 0x70, 0x63, 0x2e,
-	0x56, 0x61, 0x6c, 0x75, 0x65, 0x52, 0x0a, 0x63, 0x61, 0x6e, 0x64, 0x69, 0x64, 0x61, 0x74, 0x65,
-	0x73, 0x12, 0x5d, 0x0a, 0x10, 0x63, 0x61, 0x73, 0x65, 0x5f, 0x73, 0x65, 0x6e, 0x73, 0x69, 0x74,
+	0x2e, 0x67, 0x72, 0x70, 0x63, 0x2e, 0x4d, 0x61, 0x74, 0x63, 0x68, 0x54, 0x79, 0x70, 0x65, 0x52,
+	0x09, 0x6d, 0x61, 0x74, 0x63, 0x68, 0x54, 0x79, 0x70, 0x65, 0x22, 0xb0, 0x02, 0x0a, 0x11, 0x43,
+	0x6f, 0x6e, 0x74, 0x61, 0x69, 0x6e, 0x73, 0x43, 0x6f, 0x6e, 0x64, 0x69, 0x74, 0x69, 0x6f, 0x6e,
+	0x12, 0x4a, 0x0a, 0x09, 0x72, 0x65, 0x66, 0x65, 0x72, 0x65, 0x6e, 0x63, 0x65, 0x18, 0x01, 0x20,
+	0x01, 0x28, 0x0b, 0x32, 0x2c, 0x2e, 0x69, 0x6f, 0x2e, 0x64, 0x65, 0x65, 0x70, 0x68, 0x61, 0x76,
+	0x65, 0x6e, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x62, 0x61, 0x63, 0x6b, 0x70, 0x6c, 0x61,
+	0x6e, 0x65, 0x2e, 0x67, 0x72, 0x70, 0x63, 0x2e, 0x52, 0x65, 0x66, 0x65, 0x72, 0x65, 0x6e, 0x63,
+	0x65, 0x52, 0x09, 0x72, 0x65, 0x66, 0x65, 0x72, 0x65, 0x6e, 0x63, 0x65, 0x12, 0x23, 0x0a, 0x0d,
+	0x73, 0x65, 0x61, 0x72, 0x63, 0x68, 0x5f, 0x73, 0x74, 0x72, 0x69, 0x6e, 0x67, 0x18, 0x02, 0x20,
+	0x01, 0x28, 0x09, 0x52, 0x0c, 0x73, 0x65, 0x61, 0x72, 0x63, 0x68, 0x53, 0x74, 0x72, 0x69, 0x6e,
+	0x67, 0x12, 0x5d, 0x0a, 0x10, 0x63, 0x61, 0x73, 0x65, 0x5f, 0x73, 0x65, 0x6e, 0x73, 0x69, 0x74,
 	0x69, 0x76, 0x69, 0x74, 0x79, 0x18, 0x03, 0x20, 0x01, 0x28, 0x0e, 0x32, 0x32, 0x2e, 0x69, 0x6f,
 	0x2e, 0x64, 0x65, 0x65, 0x70, 0x68, 0x61, 0x76, 0x65, 0x6e, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f,
 	0x2e, 0x62, 0x61, 0x63, 0x6b, 0x70, 0x6c, 0x61, 0x6e, 0x65, 0x2e, 0x67, 0x72, 0x70, 0x63, 0x2e,
@@ -11515,894 +11887,870 @@ var file_deephaven_proto_table_proto_rawDesc = []byte{
 	0x20, 0x01, 0x28, 0x0e, 0x32, 0x2c, 0x2e, 0x69, 0x6f, 0x2e, 0x64, 0x65, 0x65, 0x70, 0x68, 0x61,
 	0x76, 0x65, 0x6e, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x62, 0x61, 0x63, 0x6b, 0x70, 0x6c,
 	0x61, 0x6e, 0x65, 0x2e, 0x67, 0x72, 0x70, 0x63, 0x2e, 0x4d, 0x61, 0x74, 0x63, 0x68, 0x54, 0x79,
-	0x70, 0x65, 0x52, 0x09, 0x6d, 0x61, 0x74, 0x63, 0x68, 0x54, 0x79, 0x70, 0x65, 0x22, 0xb3, 0x01,
-	0x0a, 0x0f, 0x49, 0x6e, 0x76, 0x6f, 0x6b, 0x65, 0x43, 0x6f, 0x6e, 0x64, 0x69, 0x74, 0x69, 0x6f,
-	0x6e, 0x12, 0x16, 0x0a, 0x06, 0x6d, 0x65, 0x74, 0x68, 0x6f, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28,
-	0x09, 0x52, 0x06, 0x6d, 0x65, 0x74, 0x68, 0x6f, 0x64, 0x12, 0x40, 0x0a, 0x06, 0x74, 0x61, 0x72,
-	0x67, 0x65, 0x74, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x28, 0x2e, 0x69, 0x6f, 0x2e, 0x64,
-	0x65, 0x65, 0x70, 0x68, 0x61, 0x76, 0x65, 0x6e, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x62,
-	0x61, 0x63, 0x6b, 0x70, 0x6c, 0x61, 0x6e, 0x65, 0x2e, 0x67, 0x72, 0x70, 0x63, 0x2e, 0x56, 0x61,
-	0x6c, 0x75, 0x65, 0x52, 0x06, 0x74, 0x61, 0x72, 0x67, 0x65, 0x74, 0x12, 0x46, 0x0a, 0x09, 0x61,
-	0x72, 0x67, 0x75, 0x6d, 0x65, 0x6e, 0x74, 0x73, 0x18, 0x03, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x28,
-	0x2e, 0x69, 0x6f, 0x2e, 0x64, 0x65, 0x65, 0x70, 0x68, 0x61, 0x76, 0x65, 0x6e, 0x2e, 0x70, 0x72,
-	0x6f, 0x74, 0x6f, 0x2e, 0x62, 0x61, 0x63, 0x6b, 0x70, 0x6c, 0x61, 0x6e, 0x65, 0x2e, 0x67, 0x72,
-	0x70, 0x63, 0x2e, 0x56, 0x61, 0x6c, 0x75, 0x65, 0x52, 0x09, 0x61, 0x72, 0x67, 0x75, 0x6d, 0x65,
-	0x6e, 0x74, 0x73, 0x22, 0x5d, 0x0a, 0x0f, 0x49, 0x73, 0x4e, 0x75, 0x6c, 0x6c, 0x43, 0x6f, 0x6e,
-	0x64, 0x69, 0x74, 0x69, 0x6f, 0x6e, 0x12, 0x4a, 0x0a, 0x09, 0x72, 0x65, 0x66, 0x65, 0x72, 0x65,
-	0x6e, 0x63, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x2c, 0x2e, 0x69, 0x6f, 0x2e, 0x64,
-	0x65, 0x65, 0x70, 0x68, 0x61, 0x76, 0x65, 0x6e, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x62,
-	0x61, 0x63, 0x6b, 0x70, 0x6c, 0x61, 0x6e, 0x65, 0x2e, 0x67, 0x72, 0x70, 0x63, 0x2e, 0x52, 0x65,
-	0x66, 0x65, 0x72, 0x65, 0x6e, 0x63, 0x65, 0x52, 0x09, 0x72, 0x65, 0x66, 0x65, 0x72, 0x65, 0x6e,
-	0x63, 0x65, 0x22, 0xa0, 0x02, 0x0a, 0x10, 0x4d, 0x61, 0x74, 0x63, 0x68, 0x65, 0x73, 0x43, 0x6f,
-	0x6e, 0x64, 0x69, 0x74, 0x69, 0x6f, 0x6e, 0x12, 0x4a, 0x0a, 0x09, 0x72, 0x65, 0x66, 0x65, 0x72,
-	0x65, 0x6e, 0x63, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x2c, 0x2e, 0x69, 0x6f, 0x2e,
-	0x64, 0x65, 0x65, 0x70, 0x68, 0x61, 0x76, 0x65, 0x6e, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e,
-	0x62, 0x61, 0x63, 0x6b, 0x70, 0x6c, 0x61, 0x6e, 0x65, 0x2e, 0x67, 0x72, 0x70, 0x63, 0x2e, 0x52,
-	0x65, 0x66, 0x65, 0x72, 0x65, 0x6e, 0x63, 0x65, 0x52, 0x09, 0x72, 0x65, 0x66, 0x65, 0x72, 0x65,
-	0x6e, 0x63, 0x65, 0x12, 0x14, 0x0a, 0x05, 0x72, 0x65, 0x67, 0x65, 0x78, 0x18, 0x02, 0x20, 0x01,
-	0x28, 0x09, 0x52, 0x05, 0x72, 0x65, 0x67, 0x65, 0x78, 0x12, 0x5d, 0x0a, 0x10, 0x63, 0x61, 0x73,
-	0x65, 0x5f, 0x73, 0x65, 0x6e, 0x73, 0x69, 0x74, 0x69, 0x76, 0x69, 0x74, 0x79, 0x18, 0x03, 0x20,
-	0x01, 0x28, 0x0e, 0x32, 0x32, 0x2e, 0x69, 0x6f, 0x2e, 0x64, 0x65, 0x65, 0x70, 0x68, 0x61, 0x76,
+	0x70, 0x65, 0x52, 0x09, 0x6d, 0x61, 0x74, 0x63, 0x68, 0x54, 0x79, 0x70, 0x65, 0x22, 0x95, 0x01,
+	0x0a, 0x0f, 0x53, 0x65, 0x61, 0x72, 0x63, 0x68, 0x43, 0x6f, 0x6e, 0x64, 0x69, 0x74, 0x69, 0x6f,
+	0x6e, 0x12, 0x23, 0x0a, 0x0d, 0x73, 0x65, 0x61, 0x72, 0x63, 0x68, 0x5f, 0x73, 0x74, 0x72, 0x69,
+	0x6e, 0x67, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0c, 0x73, 0x65, 0x61, 0x72, 0x63, 0x68,
+	0x53, 0x74, 0x72, 0x69, 0x6e, 0x67, 0x12, 0x5d, 0x0a, 0x13, 0x6f, 0x70, 0x74, 0x69, 0x6f, 0x6e,
+	0x61, 0x6c, 0x5f, 0x72, 0x65, 0x66, 0x65, 0x72, 0x65, 0x6e, 0x63, 0x65, 0x73, 0x18, 0x02, 0x20,
+	0x03, 0x28, 0x0b, 0x32, 0x2c, 0x2e, 0x69, 0x6f, 0x2e, 0x64, 0x65, 0x65, 0x70, 0x68, 0x61, 0x76,
 	0x65, 0x6e, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x62, 0x61, 0x63, 0x6b, 0x70, 0x6c, 0x61,
-	0x6e, 0x65, 0x2e, 0x67, 0x72, 0x70, 0x63, 0x2e, 0x43, 0x61, 0x73, 0x65, 0x53, 0x65, 0x6e, 0x73,
-	0x69, 0x74, 0x69, 0x76, 0x69, 0x74, 0x79, 0x52, 0x0f, 0x63, 0x61, 0x73, 0x65, 0x53, 0x65, 0x6e,
-	0x73, 0x69, 0x74, 0x69, 0x76, 0x69, 0x74, 0x79, 0x12, 0x4b, 0x0a, 0x0a, 0x6d, 0x61, 0x74, 0x63,
-	0x68, 0x5f, 0x74, 0x79, 0x70, 0x65, 0x18, 0x04, 0x20, 0x01, 0x28, 0x0e, 0x32, 0x2c, 0x2e, 0x69,
-	0x6f, 0x2e, 0x64, 0x65, 0x65, 0x70, 0x68, 0x61, 0x76, 0x65, 0x6e, 0x2e, 0x70, 0x72, 0x6f, 0x74,
-	0x6f, 0x2e, 0x62, 0x61, 0x63, 0x6b, 0x70, 0x6c, 0x61, 0x6e, 0x65, 0x2e, 0x67, 0x72, 0x70, 0x63,
-	0x2e, 0x4d, 0x61, 0x74, 0x63, 0x68, 0x54, 0x79, 0x70, 0x65, 0x52, 0x09, 0x6d, 0x61, 0x74, 0x63,
-	0x68, 0x54, 0x79, 0x70, 0x65, 0x22, 0xb0, 0x02, 0x0a, 0x11, 0x43, 0x6f, 0x6e, 0x74, 0x61, 0x69,
-	0x6e, 0x73, 0x43, 0x6f, 0x6e, 0x64, 0x69, 0x74, 0x69, 0x6f, 0x6e, 0x12, 0x4a, 0x0a, 0x09, 0x72,
-	0x65, 0x66, 0x65, 0x72, 0x65, 0x6e, 0x63, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x2c,
+	0x6e, 0x65, 0x2e, 0x67, 0x72, 0x70, 0x63, 0x2e, 0x52, 0x65, 0x66, 0x65, 0x72, 0x65, 0x6e, 0x63,
+	0x65, 0x52, 0x12, 0x6f, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x61, 0x6c, 0x52, 0x65, 0x66, 0x65, 0x72,
+	0x65, 0x6e, 0x63, 0x65, 0x73, 0x22, 0xa8, 0x01, 0x0a, 0x0e, 0x46, 0x6c, 0x61, 0x74, 0x74, 0x65,
+	0x6e, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x46, 0x0a, 0x09, 0x72, 0x65, 0x73, 0x75,
+	0x6c, 0x74, 0x5f, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x29, 0x2e, 0x69, 0x6f,
+	0x2e, 0x64, 0x65, 0x65, 0x70, 0x68, 0x61, 0x76, 0x65, 0x6e, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f,
+	0x2e, 0x62, 0x61, 0x63, 0x6b, 0x70, 0x6c, 0x61, 0x6e, 0x65, 0x2e, 0x67, 0x72, 0x70, 0x63, 0x2e,
+	0x54, 0x69, 0x63, 0x6b, 0x65, 0x74, 0x52, 0x08, 0x72, 0x65, 0x73, 0x75, 0x6c, 0x74, 0x49, 0x64,
+	0x12, 0x4e, 0x0a, 0x09, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x5f, 0x69, 0x64, 0x18, 0x02, 0x20,
+	0x01, 0x28, 0x0b, 0x32, 0x31, 0x2e, 0x69, 0x6f, 0x2e, 0x64, 0x65, 0x65, 0x70, 0x68, 0x61, 0x76,
+	0x65, 0x6e, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x62, 0x61, 0x63, 0x6b, 0x70, 0x6c, 0x61,
+	0x6e, 0x65, 0x2e, 0x67, 0x72, 0x70, 0x63, 0x2e, 0x54, 0x61, 0x62, 0x6c, 0x65, 0x52, 0x65, 0x66,
+	0x65, 0x72, 0x65, 0x6e, 0x63, 0x65, 0x52, 0x08, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x49, 0x64,
+	0x22, 0xaa, 0x01, 0x0a, 0x10, 0x4d, 0x65, 0x74, 0x61, 0x54, 0x61, 0x62, 0x6c, 0x65, 0x52, 0x65,
+	0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x46, 0x0a, 0x09, 0x72, 0x65, 0x73, 0x75, 0x6c, 0x74, 0x5f,
+	0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x29, 0x2e, 0x69, 0x6f, 0x2e, 0x64, 0x65,
+	0x65, 0x70, 0x68, 0x61, 0x76, 0x65, 0x6e, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x62, 0x61,
+	0x63, 0x6b, 0x70, 0x6c, 0x61, 0x6e, 0x65, 0x2e, 0x67, 0x72, 0x70, 0x63, 0x2e, 0x54, 0x69, 0x63,
+	0x6b, 0x65, 0x74, 0x52, 0x08, 0x72, 0x65, 0x73, 0x75, 0x6c, 0x74, 0x49, 0x64, 0x12, 0x4e, 0x0a,
+	0x09, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x5f, 0x69, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b,
+	0x32, 0x31, 0x2e, 0x69, 0x6f, 0x2e, 0x64, 0x65, 0x65, 0x70, 0x68, 0x61, 0x76, 0x65, 0x6e, 0x2e,
+	0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x62, 0x61, 0x63, 0x6b, 0x70, 0x6c, 0x61, 0x6e, 0x65, 0x2e,
+	0x67, 0x72, 0x70, 0x63, 0x2e, 0x54, 0x61, 0x62, 0x6c, 0x65, 0x52, 0x65, 0x66, 0x65, 0x72, 0x65,
+	0x6e, 0x63, 0x65, 0x52, 0x08, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x49, 0x64, 0x22, 0x97, 0x04,
+	0x0a, 0x19, 0x52, 0x75, 0x6e, 0x43, 0x68, 0x61, 0x72, 0x74, 0x44, 0x6f, 0x77, 0x6e, 0x73, 0x61,
+	0x6d, 0x70, 0x6c, 0x65, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x46, 0x0a, 0x09, 0x72,
+	0x65, 0x73, 0x75, 0x6c, 0x74, 0x5f, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x29,
 	0x2e, 0x69, 0x6f, 0x2e, 0x64, 0x65, 0x65, 0x70, 0x68, 0x61, 0x76, 0x65, 0x6e, 0x2e, 0x70, 0x72,
 	0x6f, 0x74, 0x6f, 0x2e, 0x62, 0x61, 0x63, 0x6b, 0x70, 0x6c, 0x61, 0x6e, 0x65, 0x2e, 0x67, 0x72,
-	0x70, 0x63, 0x2e, 0x52, 0x65, 0x66, 0x65, 0x72, 0x65, 0x6e, 0x63, 0x65, 0x52, 0x09, 0x72, 0x65,
-	0x66, 0x65, 0x72, 0x65, 0x6e, 0x63, 0x65, 0x12, 0x23, 0x0a, 0x0d, 0x73, 0x65, 0x61, 0x72, 0x63,
-	0x68, 0x5f, 0x73, 0x74, 0x72, 0x69, 0x6e, 0x67, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0c,
-	0x73, 0x65, 0x61, 0x72, 0x63, 0x68, 0x53, 0x74, 0x72, 0x69, 0x6e, 0x67, 0x12, 0x5d, 0x0a, 0x10,
-	0x63, 0x61, 0x73, 0x65, 0x5f, 0x73, 0x65, 0x6e, 0x73, 0x69, 0x74, 0x69, 0x76, 0x69, 0x74, 0x79,
-	0x18, 0x03, 0x20, 0x01, 0x28, 0x0e, 0x32, 0x32, 0x2e, 0x69, 0x6f, 0x2e, 0x64, 0x65, 0x65, 0x70,
+	0x70, 0x63, 0x2e, 0x54, 0x69, 0x63, 0x6b, 0x65, 0x74, 0x52, 0x08, 0x72, 0x65, 0x73, 0x75, 0x6c,
+	0x74, 0x49, 0x64, 0x12, 0x4e, 0x0a, 0x09, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x5f, 0x69, 0x64,
+	0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x31, 0x2e, 0x69, 0x6f, 0x2e, 0x64, 0x65, 0x65, 0x70,
 	0x68, 0x61, 0x76, 0x65, 0x6e, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x62, 0x61, 0x63, 0x6b,
-	0x70, 0x6c, 0x61, 0x6e, 0x65, 0x2e, 0x67, 0x72, 0x70, 0x63, 0x2e, 0x43, 0x61, 0x73, 0x65, 0x53,
-	0x65, 0x6e, 0x73, 0x69, 0x74, 0x69, 0x76, 0x69, 0x74, 0x79, 0x52, 0x0f, 0x63, 0x61, 0x73, 0x65,
-	0x53, 0x65, 0x6e, 0x73, 0x69, 0x74, 0x69, 0x76, 0x69, 0x74, 0x79, 0x12, 0x4b, 0x0a, 0x0a, 0x6d,
-	0x61, 0x74, 0x63, 0x68, 0x5f, 0x74, 0x79, 0x70, 0x65, 0x18, 0x04, 0x20, 0x01, 0x28, 0x0e, 0x32,
-	0x2c, 0x2e, 0x69, 0x6f, 0x2e, 0x64, 0x65, 0x65, 0x70, 0x68, 0x61, 0x76, 0x65, 0x6e, 0x2e, 0x70,
-	0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x62, 0x61, 0x63, 0x6b, 0x70, 0x6c, 0x61, 0x6e, 0x65, 0x2e, 0x67,
-	0x72, 0x70, 0x63, 0x2e, 0x4d, 0x61, 0x74, 0x63, 0x68, 0x54, 0x79, 0x70, 0x65, 0x52, 0x09, 0x6d,
-	0x61, 0x74, 0x63, 0x68, 0x54, 0x79, 0x70, 0x65, 0x22, 0x95, 0x01, 0x0a, 0x0f, 0x53, 0x65, 0x61,
-	0x72, 0x63, 0x68, 0x43, 0x6f, 0x6e, 0x64, 0x69, 0x74, 0x69, 0x6f, 0x6e, 0x12, 0x23, 0x0a, 0x0d,
-	0x73, 0x65, 0x61, 0x72, 0x63, 0x68, 0x5f, 0x73, 0x74, 0x72, 0x69, 0x6e, 0x67, 0x18, 0x01, 0x20,
-	0x01, 0x28, 0x09, 0x52, 0x0c, 0x73, 0x65, 0x61, 0x72, 0x63, 0x68, 0x53, 0x74, 0x72, 0x69, 0x6e,
-	0x67, 0x12, 0x5d, 0x0a, 0x13, 0x6f, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x61, 0x6c, 0x5f, 0x72, 0x65,
-	0x66, 0x65, 0x72, 0x65, 0x6e, 0x63, 0x65, 0x73, 0x18, 0x02, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x2c,
-	0x2e, 0x69, 0x6f, 0x2e, 0x64, 0x65, 0x65, 0x70, 0x68, 0x61, 0x76, 0x65, 0x6e, 0x2e, 0x70, 0x72,
-	0x6f, 0x74, 0x6f, 0x2e, 0x62, 0x61, 0x63, 0x6b, 0x70, 0x6c, 0x61, 0x6e, 0x65, 0x2e, 0x67, 0x72,
-	0x70, 0x63, 0x2e, 0x52, 0x65, 0x66, 0x65, 0x72, 0x65, 0x6e, 0x63, 0x65, 0x52, 0x12, 0x6f, 0x70,
-	0x74, 0x69, 0x6f, 0x6e, 0x61, 0x6c, 0x52, 0x65, 0x66, 0x65, 0x72, 0x65, 0x6e, 0x63, 0x65, 0x73,
-	0x22, 0xa8, 0x01, 0x0a, 0x0e, 0x46, 0x6c, 0x61, 0x74, 0x74, 0x65, 0x6e, 0x52, 0x65, 0x71, 0x75,
+	0x70, 0x6c, 0x61, 0x6e, 0x65, 0x2e, 0x67, 0x72, 0x70, 0x63, 0x2e, 0x54, 0x61, 0x62, 0x6c, 0x65,
+	0x52, 0x65, 0x66, 0x65, 0x72, 0x65, 0x6e, 0x63, 0x65, 0x52, 0x08, 0x73, 0x6f, 0x75, 0x72, 0x63,
+	0x65, 0x49, 0x64, 0x12, 0x1f, 0x0a, 0x0b, 0x70, 0x69, 0x78, 0x65, 0x6c, 0x5f, 0x63, 0x6f, 0x75,
+	0x6e, 0x74, 0x18, 0x03, 0x20, 0x01, 0x28, 0x05, 0x52, 0x0a, 0x70, 0x69, 0x78, 0x65, 0x6c, 0x43,
+	0x6f, 0x75, 0x6e, 0x74, 0x12, 0x65, 0x0a, 0x0a, 0x7a, 0x6f, 0x6f, 0x6d, 0x5f, 0x72, 0x61, 0x6e,
+	0x67, 0x65, 0x18, 0x04, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x46, 0x2e, 0x69, 0x6f, 0x2e, 0x64, 0x65,
+	0x65, 0x70, 0x68, 0x61, 0x76, 0x65, 0x6e, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x62, 0x61,
+	0x63, 0x6b, 0x70, 0x6c, 0x61, 0x6e, 0x65, 0x2e, 0x67, 0x72, 0x70, 0x63, 0x2e, 0x52, 0x75, 0x6e,
+	0x43, 0x68, 0x61, 0x72, 0x74, 0x44, 0x6f, 0x77, 0x6e, 0x73, 0x61, 0x6d, 0x70, 0x6c, 0x65, 0x52,
+	0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x2e, 0x5a, 0x6f, 0x6f, 0x6d, 0x52, 0x61, 0x6e, 0x67, 0x65,
+	0x52, 0x09, 0x7a, 0x6f, 0x6f, 0x6d, 0x52, 0x61, 0x6e, 0x67, 0x65, 0x12, 0x22, 0x0a, 0x0d, 0x78,
+	0x5f, 0x63, 0x6f, 0x6c, 0x75, 0x6d, 0x6e, 0x5f, 0x6e, 0x61, 0x6d, 0x65, 0x18, 0x05, 0x20, 0x01,
+	0x28, 0x09, 0x52, 0x0b, 0x78, 0x43, 0x6f, 0x6c, 0x75, 0x6d, 0x6e, 0x4e, 0x61, 0x6d, 0x65, 0x12,
+	0x24, 0x0a, 0x0e, 0x79, 0x5f, 0x63, 0x6f, 0x6c, 0x75, 0x6d, 0x6e, 0x5f, 0x6e, 0x61, 0x6d, 0x65,
+	0x73, 0x18, 0x06, 0x20, 0x03, 0x28, 0x09, 0x52, 0x0c, 0x79, 0x43, 0x6f, 0x6c, 0x75, 0x6d, 0x6e,
+	0x4e, 0x61, 0x6d, 0x65, 0x73, 0x1a, 0x8f, 0x01, 0x0a, 0x09, 0x5a, 0x6f, 0x6f, 0x6d, 0x52, 0x61,
+	0x6e, 0x67, 0x65, 0x12, 0x2d, 0x0a, 0x0e, 0x6d, 0x69, 0x6e, 0x5f, 0x64, 0x61, 0x74, 0x65, 0x5f,
+	0x6e, 0x61, 0x6e, 0x6f, 0x73, 0x18, 0x01, 0x20, 0x01, 0x28, 0x03, 0x42, 0x02, 0x30, 0x01, 0x48,
+	0x00, 0x52, 0x0c, 0x6d, 0x69, 0x6e, 0x44, 0x61, 0x74, 0x65, 0x4e, 0x61, 0x6e, 0x6f, 0x73, 0x88,
+	0x01, 0x01, 0x12, 0x2d, 0x0a, 0x0e, 0x6d, 0x61, 0x78, 0x5f, 0x64, 0x61, 0x74, 0x65, 0x5f, 0x6e,
+	0x61, 0x6e, 0x6f, 0x73, 0x18, 0x02, 0x20, 0x01, 0x28, 0x03, 0x42, 0x02, 0x30, 0x01, 0x48, 0x01,
+	0x52, 0x0c, 0x6d, 0x61, 0x78, 0x44, 0x61, 0x74, 0x65, 0x4e, 0x61, 0x6e, 0x6f, 0x73, 0x88, 0x01,
+	0x01, 0x42, 0x11, 0x0a, 0x0f, 0x5f, 0x6d, 0x69, 0x6e, 0x5f, 0x64, 0x61, 0x74, 0x65, 0x5f, 0x6e,
+	0x61, 0x6e, 0x6f, 0x73, 0x42, 0x11, 0x0a, 0x0f, 0x5f, 0x6d, 0x61, 0x78, 0x5f, 0x64, 0x61, 0x74,
+	0x65, 0x5f, 0x6e, 0x61, 0x6e, 0x6f, 0x73, 0x22, 0xc3, 0x06, 0x0a, 0x17, 0x43, 0x72, 0x65, 0x61,
+	0x74, 0x65, 0x49, 0x6e, 0x70, 0x75, 0x74, 0x54, 0x61, 0x62, 0x6c, 0x65, 0x52, 0x65, 0x71, 0x75,
 	0x65, 0x73, 0x74, 0x12, 0x46, 0x0a, 0x09, 0x72, 0x65, 0x73, 0x75, 0x6c, 0x74, 0x5f, 0x69, 0x64,
 	0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x29, 0x2e, 0x69, 0x6f, 0x2e, 0x64, 0x65, 0x65, 0x70,
 	0x68, 0x61, 0x76, 0x65, 0x6e, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x62, 0x61, 0x63, 0x6b,
 	0x70, 0x6c, 0x61, 0x6e, 0x65, 0x2e, 0x67, 0x72, 0x70, 0x63, 0x2e, 0x54, 0x69, 0x63, 0x6b, 0x65,
-	0x74, 0x52, 0x08, 0x72, 0x65, 0x73, 0x75, 0x6c, 0x74, 0x49, 0x64, 0x12, 0x4e, 0x0a, 0x09, 0x73,
-	0x6f, 0x75, 0x72, 0x63, 0x65, 0x5f, 0x69, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x31,
-	0x2e, 0x69, 0x6f, 0x2e, 0x64, 0x65, 0x65, 0x70, 0x68, 0x61, 0x76, 0x65, 0x6e, 0x2e, 0x70, 0x72,
-	0x6f, 0x74, 0x6f, 0x2e, 0x62, 0x61, 0x63, 0x6b, 0x70, 0x6c, 0x61, 0x6e, 0x65, 0x2e, 0x67, 0x72,
-	0x70, 0x63, 0x2e, 0x54, 0x61, 0x62, 0x6c, 0x65, 0x52, 0x65, 0x66, 0x65, 0x72, 0x65, 0x6e, 0x63,
-	0x65, 0x52, 0x08, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x49, 0x64, 0x22, 0xaa, 0x01, 0x0a, 0x10,
-	0x4d, 0x65, 0x74, 0x61, 0x54, 0x61, 0x62, 0x6c, 0x65, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74,
+	0x74, 0x52, 0x08, 0x72, 0x65, 0x73, 0x75, 0x6c, 0x74, 0x49, 0x64, 0x12, 0x5b, 0x0a, 0x0f, 0x73,
+	0x6f, 0x75, 0x72, 0x63, 0x65, 0x5f, 0x74, 0x61, 0x62, 0x6c, 0x65, 0x5f, 0x69, 0x64, 0x18, 0x02,
+	0x20, 0x01, 0x28, 0x0b, 0x32, 0x31, 0x2e, 0x69, 0x6f, 0x2e, 0x64, 0x65, 0x65, 0x70, 0x68, 0x61,
+	0x76, 0x65, 0x6e, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x62, 0x61, 0x63, 0x6b, 0x70, 0x6c,
+	0x61, 0x6e, 0x65, 0x2e, 0x67, 0x72, 0x70, 0x63, 0x2e, 0x54, 0x61, 0x62, 0x6c, 0x65, 0x52, 0x65,
+	0x66, 0x65, 0x72, 0x65, 0x6e, 0x63, 0x65, 0x48, 0x00, 0x52, 0x0d, 0x73, 0x6f, 0x75, 0x72, 0x63,
+	0x65, 0x54, 0x61, 0x62, 0x6c, 0x65, 0x49, 0x64, 0x12, 0x18, 0x0a, 0x06, 0x73, 0x63, 0x68, 0x65,
+	0x6d, 0x61, 0x18, 0x03, 0x20, 0x01, 0x28, 0x0c, 0x48, 0x00, 0x52, 0x06, 0x73, 0x63, 0x68, 0x65,
+	0x6d, 0x61, 0x12, 0x5d, 0x0a, 0x04, 0x6b, 0x69, 0x6e, 0x64, 0x18, 0x04, 0x20, 0x01, 0x28, 0x0b,
+	0x32, 0x49, 0x2e, 0x69, 0x6f, 0x2e, 0x64, 0x65, 0x65, 0x70, 0x68, 0x61, 0x76, 0x65, 0x6e, 0x2e,
+	0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x62, 0x61, 0x63, 0x6b, 0x70, 0x6c, 0x61, 0x6e, 0x65, 0x2e,
+	0x67, 0x72, 0x70, 0x63, 0x2e, 0x43, 0x72, 0x65, 0x61, 0x74, 0x65, 0x49, 0x6e, 0x70, 0x75, 0x74,
+	0x54, 0x61, 0x62, 0x6c, 0x65, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x2e, 0x49, 0x6e, 0x70,
+	0x75, 0x74, 0x54, 0x61, 0x62, 0x6c, 0x65, 0x4b, 0x69, 0x6e, 0x64, 0x52, 0x04, 0x6b, 0x69, 0x6e,
+	0x64, 0x1a, 0xfb, 0x03, 0x0a, 0x0e, 0x49, 0x6e, 0x70, 0x75, 0x74, 0x54, 0x61, 0x62, 0x6c, 0x65,
+	0x4b, 0x69, 0x6e, 0x64, 0x12, 0x91, 0x01, 0x0a, 0x15, 0x69, 0x6e, 0x5f, 0x6d, 0x65, 0x6d, 0x6f,
+	0x72, 0x79, 0x5f, 0x61, 0x70, 0x70, 0x65, 0x6e, 0x64, 0x5f, 0x6f, 0x6e, 0x6c, 0x79, 0x18, 0x01,
+	0x20, 0x01, 0x28, 0x0b, 0x32, 0x5c, 0x2e, 0x69, 0x6f, 0x2e, 0x64, 0x65, 0x65, 0x70, 0x68, 0x61,
+	0x76, 0x65, 0x6e, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x62, 0x61, 0x63, 0x6b, 0x70, 0x6c,
+	0x61, 0x6e, 0x65, 0x2e, 0x67, 0x72, 0x70, 0x63, 0x2e, 0x43, 0x72, 0x65, 0x61, 0x74, 0x65, 0x49,
+	0x6e, 0x70, 0x75, 0x74, 0x54, 0x61, 0x62, 0x6c, 0x65, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74,
+	0x2e, 0x49, 0x6e, 0x70, 0x75, 0x74, 0x54, 0x61, 0x62, 0x6c, 0x65, 0x4b, 0x69, 0x6e, 0x64, 0x2e,
+	0x49, 0x6e, 0x4d, 0x65, 0x6d, 0x6f, 0x72, 0x79, 0x41, 0x70, 0x70, 0x65, 0x6e, 0x64, 0x4f, 0x6e,
+	0x6c, 0x79, 0x48, 0x00, 0x52, 0x12, 0x69, 0x6e, 0x4d, 0x65, 0x6d, 0x6f, 0x72, 0x79, 0x41, 0x70,
+	0x70, 0x65, 0x6e, 0x64, 0x4f, 0x6e, 0x6c, 0x79, 0x12, 0x8e, 0x01, 0x0a, 0x14, 0x69, 0x6e, 0x5f,
+	0x6d, 0x65, 0x6d, 0x6f, 0x72, 0x79, 0x5f, 0x6b, 0x65, 0x79, 0x5f, 0x62, 0x61, 0x63, 0x6b, 0x65,
+	0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x5b, 0x2e, 0x69, 0x6f, 0x2e, 0x64, 0x65, 0x65,
+	0x70, 0x68, 0x61, 0x76, 0x65, 0x6e, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x62, 0x61, 0x63,
+	0x6b, 0x70, 0x6c, 0x61, 0x6e, 0x65, 0x2e, 0x67, 0x72, 0x70, 0x63, 0x2e, 0x43, 0x72, 0x65, 0x61,
+	0x74, 0x65, 0x49, 0x6e, 0x70, 0x75, 0x74, 0x54, 0x61, 0x62, 0x6c, 0x65, 0x52, 0x65, 0x71, 0x75,
+	0x65, 0x73, 0x74, 0x2e, 0x49, 0x6e, 0x70, 0x75, 0x74, 0x54, 0x61, 0x62, 0x6c, 0x65, 0x4b, 0x69,
+	0x6e, 0x64, 0x2e, 0x49, 0x6e, 0x4d, 0x65, 0x6d, 0x6f, 0x72, 0x79, 0x4b, 0x65, 0x79, 0x42, 0x61,
+	0x63, 0x6b, 0x65, 0x64, 0x48, 0x00, 0x52, 0x11, 0x69, 0x6e, 0x4d, 0x65, 0x6d, 0x6f, 0x72, 0x79,
+	0x4b, 0x65, 0x79, 0x42, 0x61, 0x63, 0x6b, 0x65, 0x64, 0x12, 0x67, 0x0a, 0x05, 0x62, 0x6c, 0x69,
+	0x6e, 0x6b, 0x18, 0x03, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x4f, 0x2e, 0x69, 0x6f, 0x2e, 0x64, 0x65,
+	0x65, 0x70, 0x68, 0x61, 0x76, 0x65, 0x6e, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x62, 0x61,
+	0x63, 0x6b, 0x70, 0x6c, 0x61, 0x6e, 0x65, 0x2e, 0x67, 0x72, 0x70, 0x63, 0x2e, 0x43, 0x72, 0x65,
+	0x61, 0x74, 0x65, 0x49, 0x6e, 0x70, 0x75, 0x74, 0x54, 0x61, 0x62, 0x6c, 0x65, 0x52, 0x65, 0x71,
+	0x75, 0x65, 0x73, 0x74, 0x2e, 0x49, 0x6e, 0x70, 0x75, 0x74, 0x54, 0x61, 0x62, 0x6c, 0x65, 0x4b,
+	0x69, 0x6e, 0x64, 0x2e, 0x42, 0x6c, 0x69, 0x6e, 0x6b, 0x48, 0x00, 0x52, 0x05, 0x62, 0x6c, 0x69,
+	0x6e, 0x6b, 0x1a, 0x14, 0x0a, 0x12, 0x49, 0x6e, 0x4d, 0x65, 0x6d, 0x6f, 0x72, 0x79, 0x41, 0x70,
+	0x70, 0x65, 0x6e, 0x64, 0x4f, 0x6e, 0x6c, 0x79, 0x1a, 0x34, 0x0a, 0x11, 0x49, 0x6e, 0x4d, 0x65,
+	0x6d, 0x6f, 0x72, 0x79, 0x4b, 0x65, 0x79, 0x42, 0x61, 0x63, 0x6b, 0x65, 0x64, 0x12, 0x1f, 0x0a,
+	0x0b, 0x6b, 0x65, 0x79, 0x5f, 0x63, 0x6f, 0x6c, 0x75, 0x6d, 0x6e, 0x73, 0x18, 0x01, 0x20, 0x03,
+	0x28, 0x09, 0x52, 0x0a, 0x6b, 0x65, 0x79, 0x43, 0x6f, 0x6c, 0x75, 0x6d, 0x6e, 0x73, 0x1a, 0x07,
+	0x0a, 0x05, 0x42, 0x6c, 0x69, 0x6e, 0x6b, 0x42, 0x06, 0x0a, 0x04, 0x6b, 0x69, 0x6e, 0x64, 0x42,
+	0x0c, 0x0a, 0x0a, 0x64, 0x65, 0x66, 0x69, 0x6e, 0x69, 0x74, 0x69, 0x6f, 0x6e, 0x22, 0xb8, 0x02,
+	0x0a, 0x0e, 0x57, 0x68, 0x65, 0x72, 0x65, 0x49, 0x6e, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74,
 	0x12, 0x46, 0x0a, 0x09, 0x72, 0x65, 0x73, 0x75, 0x6c, 0x74, 0x5f, 0x69, 0x64, 0x18, 0x01, 0x20,
 	0x01, 0x28, 0x0b, 0x32, 0x29, 0x2e, 0x69, 0x6f, 0x2e, 0x64, 0x65, 0x65, 0x70, 0x68, 0x61, 0x76,
 	0x65, 0x6e, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x62, 0x61, 0x63, 0x6b, 0x70, 0x6c, 0x61,
 	0x6e, 0x65, 0x2e, 0x67, 0x72, 0x70, 0x63, 0x2e, 0x54, 0x69, 0x63, 0x6b, 0x65, 0x74, 0x52, 0x08,
-	0x72, 0x65, 0x73, 0x75, 0x6c, 0x74, 0x49, 0x64, 0x12, 0x4e, 0x0a, 0x09, 0x73, 0x6f, 0x75, 0x72,
-	0x63, 0x65, 0x5f, 0x69, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x31, 0x2e, 0x69, 0x6f,
-	0x2e, 0x64, 0x65, 0x65, 0x70, 0x68, 0x61, 0x76, 0x65, 0x6e, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f,
-	0x2e, 0x62, 0x61, 0x63, 0x6b, 0x70, 0x6c, 0x61, 0x6e, 0x65, 0x2e, 0x67, 0x72, 0x70, 0x63, 0x2e,
-	0x54, 0x61, 0x62, 0x6c, 0x65, 0x52, 0x65, 0x66, 0x65, 0x72, 0x65, 0x6e, 0x63, 0x65, 0x52, 0x08,
-	0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x49, 0x64, 0x22, 0x97, 0x04, 0x0a, 0x19, 0x52, 0x75, 0x6e,
-	0x43, 0x68, 0x61, 0x72, 0x74, 0x44, 0x6f, 0x77, 0x6e, 0x73, 0x61, 0x6d, 0x70, 0x6c, 0x65, 0x52,
-	0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x46, 0x0a, 0x09, 0x72, 0x65, 0x73, 0x75, 0x6c, 0x74,
-	0x5f, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x29, 0x2e, 0x69, 0x6f, 0x2e, 0x64,
+	0x72, 0x65, 0x73, 0x75, 0x6c, 0x74, 0x49, 0x64, 0x12, 0x4a, 0x0a, 0x07, 0x6c, 0x65, 0x66, 0x74,
+	0x5f, 0x69, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x31, 0x2e, 0x69, 0x6f, 0x2e, 0x64,
 	0x65, 0x65, 0x70, 0x68, 0x61, 0x76, 0x65, 0x6e, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x62,
-	0x61, 0x63, 0x6b, 0x70, 0x6c, 0x61, 0x6e, 0x65, 0x2e, 0x67, 0x72, 0x70, 0x63, 0x2e, 0x54, 0x69,
-	0x63, 0x6b, 0x65, 0x74, 0x52, 0x08, 0x72, 0x65, 0x73, 0x75, 0x6c, 0x74, 0x49, 0x64, 0x12, 0x4e,
-	0x0a, 0x09, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x5f, 0x69, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28,
-	0x0b, 0x32, 0x31, 0x2e, 0x69, 0x6f, 0x2e, 0x64, 0x65, 0x65, 0x70, 0x68, 0x61, 0x76, 0x65, 0x6e,
-	0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x62, 0x61, 0x63, 0x6b, 0x70, 0x6c, 0x61, 0x6e, 0x65,
-	0x2e, 0x67, 0x72, 0x70, 0x63, 0x2e, 0x54, 0x61, 0x62, 0x6c, 0x65, 0x52, 0x65, 0x66, 0x65, 0x72,
-	0x65, 0x6e, 0x63, 0x65, 0x52, 0x08, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x49, 0x64, 0x12, 0x1f,
-	0x0a, 0x0b, 0x70, 0x69, 0x78, 0x65, 0x6c, 0x5f, 0x63, 0x6f, 0x75, 0x6e, 0x74, 0x18, 0x03, 0x20,
-	0x01, 0x28, 0x05, 0x52, 0x0a, 0x70, 0x69, 0x78, 0x65, 0x6c, 0x43, 0x6f, 0x75, 0x6e, 0x74, 0x12,
-	0x65, 0x0a, 0x0a, 0x7a, 0x6f, 0x6f, 0x6d, 0x5f, 0x72, 0x61, 0x6e, 0x67, 0x65, 0x18, 0x04, 0x20,
-	0x01, 0x28, 0x0b, 0x32, 0x46, 0x2e, 0x69, 0x6f, 0x2e, 0x64, 0x65, 0x65, 0x70, 0x68, 0x61, 0x76,
-	0x65, 0x6e, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x62, 0x61, 0x63, 0x6b, 0x70, 0x6c, 0x61,
-	0x6e, 0x65, 0x2e, 0x67, 0x72, 0x70, 0x63, 0x2e, 0x52, 0x75, 0x6e, 0x43, 0x68, 0x61, 0x72, 0x74,
-	0x44, 0x6f, 0x77, 0x6e, 0x73, 0x61, 0x6d, 0x70, 0x6c, 0x65, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73,
-	0x74, 0x2e, 0x5a, 0x6f, 0x6f, 0x6d, 0x52, 0x61, 0x6e, 0x67, 0x65, 0x52, 0x09, 0x7a, 0x6f, 0x6f,
-	0x6d, 0x52, 0x61, 0x6e, 0x67, 0x65, 0x12, 0x22, 0x0a, 0x0d, 0x78, 0x5f, 0x63, 0x6f, 0x6c, 0x75,
-	0x6d, 0x6e, 0x5f, 0x6e, 0x61, 0x6d, 0x65, 0x18, 0x05, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0b, 0x78,
-	0x43, 0x6f, 0x6c, 0x75, 0x6d, 0x6e, 0x4e, 0x61, 0x6d, 0x65, 0x12, 0x24, 0x0a, 0x0e, 0x79, 0x5f,
-	0x63, 0x6f, 0x6c, 0x75, 0x6d, 0x6e, 0x5f, 0x6e, 0x61, 0x6d, 0x65, 0x73, 0x18, 0x06, 0x20, 0x03,
-	0x28, 0x09, 0x52, 0x0c, 0x79, 0x43, 0x6f, 0x6c, 0x75, 0x6d, 0x6e, 0x4e, 0x61, 0x6d, 0x65, 0x73,
-	0x1a, 0x8f, 0x01, 0x0a, 0x09, 0x5a, 0x6f, 0x6f, 0x6d, 0x52, 0x61, 0x6e, 0x67, 0x65, 0x12, 0x2d,
-	0x0a, 0x0e, 0x6d, 0x69, 0x6e, 0x5f, 0x64, 0x61, 0x74, 0x65, 0x5f, 0x6e, 0x61, 0x6e, 0x6f, 0x73,
-	0x18, 0x01, 0x20, 0x01, 0x28, 0x03, 0x42, 0x02, 0x30, 0x01, 0x48, 0x00, 0x52, 0x0c, 0x6d, 0x69,
-	0x6e, 0x44, 0x61, 0x74, 0x65, 0x4e, 0x61, 0x6e, 0x6f, 0x73, 0x88, 0x01, 0x01, 0x12, 0x2d, 0x0a,
-	0x0e, 0x6d, 0x61, 0x78, 0x5f, 0x64, 0x61, 0x74, 0x65, 0x5f, 0x6e, 0x61, 0x6e, 0x6f, 0x73, 0x18,
-	0x02, 0x20, 0x01, 0x28, 0x03, 0x42, 0x02, 0x30, 0x01, 0x48, 0x01, 0x52, 0x0c, 0x6d, 0x61, 0x78,
-	0x44, 0x61, 0x74, 0x65, 0x4e, 0x61, 0x6e, 0x6f, 0x73, 0x88, 0x01, 0x01, 0x42, 0x11, 0x0a, 0x0f,
-	0x5f, 0x6d, 0x69, 0x6e, 0x5f, 0x64, 0x61, 0x74, 0x65, 0x5f, 0x6e, 0x61, 0x6e, 0x6f, 0x73, 0x42,
-	0x11, 0x0a, 0x0f, 0x5f, 0x6d, 0x61, 0x78, 0x5f, 0x64, 0x61, 0x74, 0x65, 0x5f, 0x6e, 0x61, 0x6e,
-	0x6f, 0x73, 0x22, 0xc3, 0x06, 0x0a, 0x17, 0x43, 0x72, 0x65, 0x61, 0x74, 0x65, 0x49, 0x6e, 0x70,
-	0x75, 0x74, 0x54, 0x61, 0x62, 0x6c, 0x65, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x46,
-	0x0a, 0x09, 0x72, 0x65, 0x73, 0x75, 0x6c, 0x74, 0x5f, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28,
-	0x0b, 0x32, 0x29, 0x2e, 0x69, 0x6f, 0x2e, 0x64, 0x65, 0x65, 0x70, 0x68, 0x61, 0x76, 0x65, 0x6e,
-	0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x62, 0x61, 0x63, 0x6b, 0x70, 0x6c, 0x61, 0x6e, 0x65,
-	0x2e, 0x67, 0x72, 0x70, 0x63, 0x2e, 0x54, 0x69, 0x63, 0x6b, 0x65, 0x74, 0x52, 0x08, 0x72, 0x65,
-	0x73, 0x75, 0x6c, 0x74, 0x49, 0x64, 0x12, 0x5b, 0x0a, 0x0f, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65,
-	0x5f, 0x74, 0x61, 0x62, 0x6c, 0x65, 0x5f, 0x69, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32,
+	0x61, 0x63, 0x6b, 0x70, 0x6c, 0x61, 0x6e, 0x65, 0x2e, 0x67, 0x72, 0x70, 0x63, 0x2e, 0x54, 0x61,
+	0x62, 0x6c, 0x65, 0x52, 0x65, 0x66, 0x65, 0x72, 0x65, 0x6e, 0x63, 0x65, 0x52, 0x06, 0x6c, 0x65,
+	0x66, 0x74, 0x49, 0x64, 0x12, 0x4c, 0x0a, 0x08, 0x72, 0x69, 0x67, 0x68, 0x74, 0x5f, 0x69, 0x64,
+	0x18, 0x03, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x31, 0x2e, 0x69, 0x6f, 0x2e, 0x64, 0x65, 0x65, 0x70,
+	0x68, 0x61, 0x76, 0x65, 0x6e, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x62, 0x61, 0x63, 0x6b,
+	0x70, 0x6c, 0x61, 0x6e, 0x65, 0x2e, 0x67, 0x72, 0x70, 0x63, 0x2e, 0x54, 0x61, 0x62, 0x6c, 0x65,
+	0x52, 0x65, 0x66, 0x65, 0x72, 0x65, 0x6e, 0x63, 0x65, 0x52, 0x07, 0x72, 0x69, 0x67, 0x68, 0x74,
+	0x49, 0x64, 0x12, 0x1a, 0x0a, 0x08, 0x69, 0x6e, 0x76, 0x65, 0x72, 0x74, 0x65, 0x64, 0x18, 0x04,
+	0x20, 0x01, 0x28, 0x08, 0x52, 0x08, 0x69, 0x6e, 0x76, 0x65, 0x72, 0x74, 0x65, 0x64, 0x12, 0x28,
+	0x0a, 0x10, 0x63, 0x6f, 0x6c, 0x75, 0x6d, 0x6e, 0x73, 0x5f, 0x74, 0x6f, 0x5f, 0x6d, 0x61, 0x74,
+	0x63, 0x68, 0x18, 0x05, 0x20, 0x03, 0x28, 0x09, 0x52, 0x0e, 0x63, 0x6f, 0x6c, 0x75, 0x6d, 0x6e,
+	0x73, 0x54, 0x6f, 0x4d, 0x61, 0x74, 0x63, 0x68, 0x22, 0x9c, 0x02, 0x0a, 0x17, 0x43, 0x6f, 0x6c,
+	0x75, 0x6d, 0x6e, 0x53, 0x74, 0x61, 0x74, 0x69, 0x73, 0x74, 0x69, 0x63, 0x73, 0x52, 0x65, 0x71,
+	0x75, 0x65, 0x73, 0x74, 0x12, 0x46, 0x0a, 0x09, 0x72, 0x65, 0x73, 0x75, 0x6c, 0x74, 0x5f, 0x69,
+	0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x29, 0x2e, 0x69, 0x6f, 0x2e, 0x64, 0x65, 0x65,
+	0x70, 0x68, 0x61, 0x76, 0x65, 0x6e, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x62, 0x61, 0x63,
+	0x6b, 0x70, 0x6c, 0x61, 0x6e, 0x65, 0x2e, 0x67, 0x72, 0x70, 0x63, 0x2e, 0x54, 0x69, 0x63, 0x6b,
+	0x65, 0x74, 0x52, 0x08, 0x72, 0x65, 0x73, 0x75, 0x6c, 0x74, 0x49, 0x64, 0x12, 0x4e, 0x0a, 0x09,
+	0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x5f, 0x69, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32,
 	0x31, 0x2e, 0x69, 0x6f, 0x2e, 0x64, 0x65, 0x65, 0x70, 0x68, 0x61, 0x76, 0x65, 0x6e, 0x2e, 0x70,
 	0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x62, 0x61, 0x63, 0x6b, 0x70, 0x6c, 0x61, 0x6e, 0x65, 0x2e, 0x67,
 	0x72, 0x70, 0x63, 0x2e, 0x54, 0x61, 0x62, 0x6c, 0x65, 0x52, 0x65, 0x66, 0x65, 0x72, 0x65, 0x6e,
-	0x63, 0x65, 0x48, 0x00, 0x52, 0x0d, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x54, 0x61, 0x62, 0x6c,
-	0x65, 0x49, 0x64, 0x12, 0x18, 0x0a, 0x06, 0x73, 0x63, 0x68, 0x65, 0x6d, 0x61, 0x18, 0x03, 0x20,
-	0x01, 0x28, 0x0c, 0x48, 0x00, 0x52, 0x06, 0x73, 0x63, 0x68, 0x65, 0x6d, 0x61, 0x12, 0x5d, 0x0a,
-	0x04, 0x6b, 0x69, 0x6e, 0x64, 0x18, 0x04, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x49, 0x2e, 0x69, 0x6f,
+	0x63, 0x65, 0x52, 0x08, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x49, 0x64, 0x12, 0x1f, 0x0a, 0x0b,
+	0x63, 0x6f, 0x6c, 0x75, 0x6d, 0x6e, 0x5f, 0x6e, 0x61, 0x6d, 0x65, 0x18, 0x03, 0x20, 0x01, 0x28,
+	0x09, 0x52, 0x0a, 0x63, 0x6f, 0x6c, 0x75, 0x6d, 0x6e, 0x4e, 0x61, 0x6d, 0x65, 0x12, 0x31, 0x0a,
+	0x12, 0x75, 0x6e, 0x69, 0x71, 0x75, 0x65, 0x5f, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x5f, 0x6c, 0x69,
+	0x6d, 0x69, 0x74, 0x18, 0x04, 0x20, 0x01, 0x28, 0x05, 0x48, 0x00, 0x52, 0x10, 0x75, 0x6e, 0x69,
+	0x71, 0x75, 0x65, 0x56, 0x61, 0x6c, 0x75, 0x65, 0x4c, 0x69, 0x6d, 0x69, 0x74, 0x88, 0x01, 0x01,
+	0x42, 0x15, 0x0a, 0x13, 0x5f, 0x75, 0x6e, 0x69, 0x71, 0x75, 0x65, 0x5f, 0x76, 0x61, 0x6c, 0x75,
+	0x65, 0x5f, 0x6c, 0x69, 0x6d, 0x69, 0x74, 0x22, 0xa0, 0x02, 0x0a, 0x0c, 0x53, 0x6c, 0x69, 0x63,
+	0x65, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x46, 0x0a, 0x09, 0x72, 0x65, 0x73, 0x75,
+	0x6c, 0x74, 0x5f, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x29, 0x2e, 0x69, 0x6f,
 	0x2e, 0x64, 0x65, 0x65, 0x70, 0x68, 0x61, 0x76, 0x65, 0x6e, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f,
 	0x2e, 0x62, 0x61, 0x63, 0x6b, 0x70, 0x6c, 0x61, 0x6e, 0x65, 0x2e, 0x67, 0x72, 0x70, 0x63, 0x2e,
-	0x43, 0x72, 0x65, 0x61, 0x74, 0x65, 0x49, 0x6e, 0x70, 0x75, 0x74, 0x54, 0x61, 0x62, 0x6c, 0x65,
-	0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x2e, 0x49, 0x6e, 0x70, 0x75, 0x74, 0x54, 0x61, 0x62,
-	0x6c, 0x65, 0x4b, 0x69, 0x6e, 0x64, 0x52, 0x04, 0x6b, 0x69, 0x6e, 0x64, 0x1a, 0xfb, 0x03, 0x0a,
-	0x0e, 0x49, 0x6e, 0x70, 0x75, 0x74, 0x54, 0x61, 0x62, 0x6c, 0x65, 0x4b, 0x69, 0x6e, 0x64, 0x12,
-	0x91, 0x01, 0x0a, 0x15, 0x69, 0x6e, 0x5f, 0x6d, 0x65, 0x6d, 0x6f, 0x72, 0x79, 0x5f, 0x61, 0x70,
-	0x70, 0x65, 0x6e, 0x64, 0x5f, 0x6f, 0x6e, 0x6c, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32,
-	0x5c, 0x2e, 0x69, 0x6f, 0x2e, 0x64, 0x65, 0x65, 0x70, 0x68, 0x61, 0x76, 0x65, 0x6e, 0x2e, 0x70,
-	0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x62, 0x61, 0x63, 0x6b, 0x70, 0x6c, 0x61, 0x6e, 0x65, 0x2e, 0x67,
-	0x72, 0x70, 0x63, 0x2e, 0x43, 0x72, 0x65, 0x61, 0x74, 0x65, 0x49, 0x6e, 0x70, 0x75, 0x74, 0x54,
-	0x61, 0x62, 0x6c, 0x65, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x2e, 0x49, 0x6e, 0x70, 0x75,
-	0x74, 0x54, 0x61, 0x62, 0x6c, 0x65, 0x4b, 0x69, 0x6e, 0x64, 0x2e, 0x49, 0x6e, 0x4d, 0x65, 0x6d,
-	0x6f, 0x72, 0x79, 0x41, 0x70, 0x70, 0x65, 0x6e, 0x64, 0x4f, 0x6e, 0x6c, 0x79, 0x48, 0x00, 0x52,
-	0x12, 0x69, 0x6e, 0x4d, 0x65, 0x6d, 0x6f, 0x72, 0x79, 0x41, 0x70, 0x70, 0x65, 0x6e, 0x64, 0x4f,
-	0x6e, 0x6c, 0x79, 0x12, 0x8e, 0x01, 0x0a, 0x14, 0x69, 0x6e, 0x5f, 0x6d, 0x65, 0x6d, 0x6f, 0x72,
-	0x79, 0x5f, 0x6b, 0x65, 0x79, 0x5f, 0x62, 0x61, 0x63, 0x6b, 0x65, 0x64, 0x18, 0x02, 0x20, 0x01,
-	0x28, 0x0b, 0x32, 0x5b, 0x2e, 0x69, 0x6f, 0x2e, 0x64, 0x65, 0x65, 0x70, 0x68, 0x61, 0x76, 0x65,
-	0x6e, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x62, 0x61, 0x63, 0x6b, 0x70, 0x6c, 0x61, 0x6e,
-	0x65, 0x2e, 0x67, 0x72, 0x70, 0x63, 0x2e, 0x43, 0x72, 0x65, 0x61, 0x74, 0x65, 0x49, 0x6e, 0x70,
-	0x75, 0x74, 0x54, 0x61, 0x62, 0x6c, 0x65, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x2e, 0x49,
-	0x6e, 0x70, 0x75, 0x74, 0x54, 0x61, 0x62, 0x6c, 0x65, 0x4b, 0x69, 0x6e, 0x64, 0x2e, 0x49, 0x6e,
-	0x4d, 0x65, 0x6d, 0x6f, 0x72, 0x79, 0x4b, 0x65, 0x79, 0x42, 0x61, 0x63, 0x6b, 0x65, 0x64, 0x48,
-	0x00, 0x52, 0x11, 0x69, 0x6e, 0x4d, 0x65, 0x6d, 0x6f, 0x72, 0x79, 0x4b, 0x65, 0x79, 0x42, 0x61,
-	0x63, 0x6b, 0x65, 0x64, 0x12, 0x67, 0x0a, 0x05, 0x62, 0x6c, 0x69, 0x6e, 0x6b, 0x18, 0x03, 0x20,
-	0x01, 0x28, 0x0b, 0x32, 0x4f, 0x2e, 0x69, 0x6f, 0x2e, 0x64, 0x65, 0x65, 0x70, 0x68, 0x61, 0x76,
+	0x54, 0x69, 0x63, 0x6b, 0x65, 0x74, 0x52, 0x08, 0x72, 0x65, 0x73, 0x75, 0x6c, 0x74, 0x49, 0x64,
+	0x12, 0x4e, 0x0a, 0x09, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x5f, 0x69, 0x64, 0x18, 0x02, 0x20,
+	0x01, 0x28, 0x0b, 0x32, 0x31, 0x2e, 0x69, 0x6f, 0x2e, 0x64, 0x65, 0x65, 0x70, 0x68, 0x61, 0x76,
 	0x65, 0x6e, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x62, 0x61, 0x63, 0x6b, 0x70, 0x6c, 0x61,
-	0x6e, 0x65, 0x2e, 0x67, 0x72, 0x70, 0x63, 0x2e, 0x43, 0x72, 0x65, 0x61, 0x74, 0x65, 0x49, 0x6e,
-	0x70, 0x75, 0x74, 0x54, 0x61, 0x62, 0x6c, 0x65, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x2e,
-	0x49, 0x6e, 0x70, 0x75, 0x74, 0x54, 0x61, 0x62, 0x6c, 0x65, 0x4b, 0x69, 0x6e, 0x64, 0x2e, 0x42,
-	0x6c, 0x69, 0x6e, 0x6b, 0x48, 0x00, 0x52, 0x05, 0x62, 0x6c, 0x69, 0x6e, 0x6b, 0x1a, 0x14, 0x0a,
-	0x12, 0x49, 0x6e, 0x4d, 0x65, 0x6d, 0x6f, 0x72, 0x79, 0x41, 0x70, 0x70, 0x65, 0x6e, 0x64, 0x4f,
-	0x6e, 0x6c, 0x79, 0x1a, 0x34, 0x0a, 0x11, 0x49, 0x6e, 0x4d, 0x65, 0x6d, 0x6f, 0x72, 0x79, 0x4b,
-	0x65, 0x79, 0x42, 0x61, 0x63, 0x6b, 0x65, 0x64, 0x12, 0x1f, 0x0a, 0x0b, 0x6b, 0x65, 0x79, 0x5f,
-	0x63, 0x6f, 0x6c, 0x75, 0x6d, 0x6e, 0x73, 0x18, 0x01, 0x20, 0x03, 0x28, 0x09, 0x52, 0x0a, 0x6b,
-	0x65, 0x79, 0x43, 0x6f, 0x6c, 0x75, 0x6d, 0x6e, 0x73, 0x1a, 0x07, 0x0a, 0x05, 0x42, 0x6c, 0x69,
-	0x6e, 0x6b, 0x42, 0x06, 0x0a, 0x04, 0x6b, 0x69, 0x6e, 0x64, 0x42, 0x0c, 0x0a, 0x0a, 0x64, 0x65,
-	0x66, 0x69, 0x6e, 0x69, 0x74, 0x69, 0x6f, 0x6e, 0x22, 0xb8, 0x02, 0x0a, 0x0e, 0x57, 0x68, 0x65,
-	0x72, 0x65, 0x49, 0x6e, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x46, 0x0a, 0x09, 0x72,
-	0x65, 0x73, 0x75, 0x6c, 0x74, 0x5f, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x29,
-	0x2e, 0x69, 0x6f, 0x2e, 0x64, 0x65, 0x65, 0x70, 0x68, 0x61, 0x76, 0x65, 0x6e, 0x2e, 0x70, 0x72,
-	0x6f, 0x74, 0x6f, 0x2e, 0x62, 0x61, 0x63, 0x6b, 0x70, 0x6c, 0x61, 0x6e, 0x65, 0x2e, 0x67, 0x72,
-	0x70, 0x63, 0x2e, 0x54, 0x69, 0x63, 0x6b, 0x65, 0x74, 0x52, 0x08, 0x72, 0x65, 0x73, 0x75, 0x6c,
-	0x74, 0x49, 0x64, 0x12, 0x4a, 0x0a, 0x07, 0x6c, 0x65, 0x66, 0x74, 0x5f, 0x69, 0x64, 0x18, 0x02,
-	0x20, 0x01, 0x28, 0x0b, 0x32, 0x31, 0x2e, 0x69, 0x6f, 0x2e, 0x64, 0x65, 0x65, 0x70, 0x68, 0x61,
-	0x76, 0x65, 0x6e, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x62, 0x61, 0x63, 0x6b, 0x70, 0x6c,
-	0x61, 0x6e, 0x65, 0x2e, 0x67, 0x72, 0x70, 0x63, 0x2e, 0x54, 0x61, 0x62, 0x6c, 0x65, 0x52, 0x65,
-	0x66, 0x65, 0x72, 0x65, 0x6e, 0x63, 0x65, 0x52, 0x06, 0x6c, 0x65, 0x66, 0x74, 0x49, 0x64, 0x12,
-	0x4c, 0x0a, 0x08, 0x72, 0x69, 0x67, 0x68, 0x74, 0x5f, 0x69, 0x64, 0x18, 0x03, 0x20, 0x01, 0x28,
-	0x0b, 0x32, 0x31, 0x2e, 0x69, 0x6f, 0x2e, 0x64, 0x65, 0x65, 0x70, 0x68, 0x61, 0x76, 0x65, 0x6e,
-	0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x62, 0x61, 0x63, 0x6b, 0x70, 0x6c, 0x61, 0x6e, 0x65,
-	0x2e, 0x67, 0x72, 0x70, 0x63, 0x2e, 0x54, 0x61, 0x62, 0x6c, 0x65, 0x52, 0x65, 0x66, 0x65, 0x72,
-	0x65, 0x6e, 0x63, 0x65, 0x52, 0x07, 0x72, 0x69, 0x67, 0x68, 0x74, 0x49, 0x64, 0x12, 0x1a, 0x0a,
-	0x08, 0x69, 0x6e, 0x76, 0x65, 0x72, 0x74, 0x65, 0x64, 0x18, 0x04, 0x20, 0x01, 0x28, 0x08, 0x52,
-	0x08, 0x69, 0x6e, 0x76, 0x65, 0x72, 0x74, 0x65, 0x64, 0x12, 0x28, 0x0a, 0x10, 0x63, 0x6f, 0x6c,
-	0x75, 0x6d, 0x6e, 0x73, 0x5f, 0x74, 0x6f, 0x5f, 0x6d, 0x61, 0x74, 0x63, 0x68, 0x18, 0x05, 0x20,
-	0x03, 0x28, 0x09, 0x52, 0x0e, 0x63, 0x6f, 0x6c, 0x75, 0x6d, 0x6e, 0x73, 0x54, 0x6f, 0x4d, 0x61,
-	0x74, 0x63, 0x68, 0x22, 0x9c, 0x02, 0x0a, 0x17, 0x43, 0x6f, 0x6c, 0x75, 0x6d, 0x6e, 0x53, 0x74,
-	0x61, 0x74, 0x69, 0x73, 0x74, 0x69, 0x63, 0x73, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12,
-	0x46, 0x0a, 0x09, 0x72, 0x65, 0x73, 0x75, 0x6c, 0x74, 0x5f, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01,
-	0x28, 0x0b, 0x32, 0x29, 0x2e, 0x69, 0x6f, 0x2e, 0x64, 0x65, 0x65, 0x70, 0x68, 0x61, 0x76, 0x65,
-	0x6e, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x62, 0x61, 0x63, 0x6b, 0x70, 0x6c, 0x61, 0x6e,
-	0x65, 0x2e, 0x67, 0x72, 0x70, 0x63, 0x2e, 0x54, 0x69, 0x63, 0x6b, 0x65, 0x74, 0x52, 0x08, 0x72,
-	0x65, 0x73, 0x75, 0x6c, 0x74, 0x49, 0x64, 0x12, 0x4e, 0x0a, 0x09, 0x73, 0x6f, 0x75, 0x72, 0x63,
-	0x65, 0x5f, 0x69, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x31, 0x2e, 0x69, 0x6f, 0x2e,
-	0x64, 0x65, 0x65, 0x70, 0x68, 0x61, 0x76, 0x65, 0x6e, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e,
-	0x62, 0x61, 0x63, 0x6b, 0x70, 0x6c, 0x61, 0x6e, 0x65, 0x2e, 0x67, 0x72, 0x70, 0x63, 0x2e, 0x54,
-	0x61, 0x62, 0x6c, 0x65, 0x52, 0x65, 0x66, 0x65, 0x72, 0x65, 0x6e, 0x63, 0x65, 0x52, 0x08, 0x73,
-	0x6f, 0x75, 0x72, 0x63, 0x65, 0x49, 0x64, 0x12, 0x1f, 0x0a, 0x0b, 0x63, 0x6f, 0x6c, 0x75, 0x6d,
-	0x6e, 0x5f, 0x6e, 0x61, 0x6d, 0x65, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0a, 0x63, 0x6f,
-	0x6c, 0x75, 0x6d, 0x6e, 0x4e, 0x61, 0x6d, 0x65, 0x12, 0x31, 0x0a, 0x12, 0x75, 0x6e, 0x69, 0x71,
-	0x75, 0x65, 0x5f, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x5f, 0x6c, 0x69, 0x6d, 0x69, 0x74, 0x18, 0x04,
-	0x20, 0x01, 0x28, 0x05, 0x48, 0x00, 0x52, 0x10, 0x75, 0x6e, 0x69, 0x71, 0x75, 0x65, 0x56, 0x61,
-	0x6c, 0x75, 0x65, 0x4c, 0x69, 0x6d, 0x69, 0x74, 0x88, 0x01, 0x01, 0x42, 0x15, 0x0a, 0x13, 0x5f,
-	0x75, 0x6e, 0x69, 0x71, 0x75, 0x65, 0x5f, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x5f, 0x6c, 0x69, 0x6d,
-	0x69, 0x74, 0x22, 0xe5, 0x1d, 0x0a, 0x11, 0x42, 0x61, 0x74, 0x63, 0x68, 0x54, 0x61, 0x62, 0x6c,
-	0x65, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x50, 0x0a, 0x03, 0x6f, 0x70, 0x73, 0x18,
-	0x01, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x3e, 0x2e, 0x69, 0x6f, 0x2e, 0x64, 0x65, 0x65, 0x70, 0x68,
-	0x61, 0x76, 0x65, 0x6e, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x62, 0x61, 0x63, 0x6b, 0x70,
-	0x6c, 0x61, 0x6e, 0x65, 0x2e, 0x67, 0x72, 0x70, 0x63, 0x2e, 0x42, 0x61, 0x74, 0x63, 0x68, 0x54,
-	0x61, 0x62, 0x6c, 0x65, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x2e, 0x4f, 0x70, 0x65, 0x72,
-	0x61, 0x74, 0x69, 0x6f, 0x6e, 0x52, 0x03, 0x6f, 0x70, 0x73, 0x1a, 0xfd, 0x1c, 0x0a, 0x09, 0x4f,
-	0x70, 0x65, 0x72, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x12, 0x57, 0x0a, 0x0b, 0x65, 0x6d, 0x70, 0x74,
-	0x79, 0x5f, 0x74, 0x61, 0x62, 0x6c, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x34, 0x2e,
+	0x6e, 0x65, 0x2e, 0x67, 0x72, 0x70, 0x63, 0x2e, 0x54, 0x61, 0x62, 0x6c, 0x65, 0x52, 0x65, 0x66,
+	0x65, 0x72, 0x65, 0x6e, 0x63, 0x65, 0x52, 0x08, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x49, 0x64,
+	0x12, 0x3c, 0x0a, 0x18, 0x66, 0x69, 0x72, 0x73, 0x74, 0x5f, 0x70, 0x6f, 0x73, 0x69, 0x74, 0x69,
+	0x6f, 0x6e, 0x5f, 0x69, 0x6e, 0x63, 0x6c, 0x75, 0x73, 0x69, 0x76, 0x65, 0x18, 0x03, 0x20, 0x01,
+	0x28, 0x12, 0x42, 0x02, 0x30, 0x01, 0x52, 0x16, 0x66, 0x69, 0x72, 0x73, 0x74, 0x50, 0x6f, 0x73,
+	0x69, 0x74, 0x69, 0x6f, 0x6e, 0x49, 0x6e, 0x63, 0x6c, 0x75, 0x73, 0x69, 0x76, 0x65, 0x12, 0x3a,
+	0x0a, 0x17, 0x6c, 0x61, 0x73, 0x74, 0x5f, 0x70, 0x6f, 0x73, 0x69, 0x74, 0x69, 0x6f, 0x6e, 0x5f,
+	0x65, 0x78, 0x63, 0x6c, 0x75, 0x73, 0x69, 0x76, 0x65, 0x18, 0x04, 0x20, 0x01, 0x28, 0x12, 0x42,
+	0x02, 0x30, 0x01, 0x52, 0x15, 0x6c, 0x61, 0x73, 0x74, 0x50, 0x6f, 0x73, 0x69, 0x74, 0x69, 0x6f,
+	0x6e, 0x45, 0x78, 0x63, 0x6c, 0x75, 0x73, 0x69, 0x76, 0x65, 0x22, 0xae, 0x1e, 0x0a, 0x11, 0x42,
+	0x61, 0x74, 0x63, 0x68, 0x54, 0x61, 0x62, 0x6c, 0x65, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74,
+	0x12, 0x50, 0x0a, 0x03, 0x6f, 0x70, 0x73, 0x18, 0x01, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x3e, 0x2e,
 	0x69, 0x6f, 0x2e, 0x64, 0x65, 0x65, 0x70, 0x68, 0x61, 0x76, 0x65, 0x6e, 0x2e, 0x70, 0x72, 0x6f,
 	0x74, 0x6f, 0x2e, 0x62, 0x61, 0x63, 0x6b, 0x70, 0x6c, 0x61, 0x6e, 0x65, 0x2e, 0x67, 0x72, 0x70,
-	0x63, 0x2e, 0x45, 0x6d, 0x70, 0x74, 0x79, 0x54, 0x61, 0x62, 0x6c, 0x65, 0x52, 0x65, 0x71, 0x75,
-	0x65, 0x73, 0x74, 0x48, 0x00, 0x52, 0x0a, 0x65, 0x6d, 0x70, 0x74, 0x79, 0x54, 0x61, 0x62, 0x6c,
-	0x65, 0x12, 0x54, 0x0a, 0x0a, 0x74, 0x69, 0x6d, 0x65, 0x5f, 0x74, 0x61, 0x62, 0x6c, 0x65, 0x18,
-	0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x33, 0x2e, 0x69, 0x6f, 0x2e, 0x64, 0x65, 0x65, 0x70, 0x68,
+	0x63, 0x2e, 0x42, 0x61, 0x74, 0x63, 0x68, 0x54, 0x61, 0x62, 0x6c, 0x65, 0x52, 0x65, 0x71, 0x75,
+	0x65, 0x73, 0x74, 0x2e, 0x4f, 0x70, 0x65, 0x72, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x52, 0x03, 0x6f,
+	0x70, 0x73, 0x1a, 0xc6, 0x1d, 0x0a, 0x09, 0x4f, 0x70, 0x65, 0x72, 0x61, 0x74, 0x69, 0x6f, 0x6e,
+	0x12, 0x57, 0x0a, 0x0b, 0x65, 0x6d, 0x70, 0x74, 0x79, 0x5f, 0x74, 0x61, 0x62, 0x6c, 0x65, 0x18,
+	0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x34, 0x2e, 0x69, 0x6f, 0x2e, 0x64, 0x65, 0x65, 0x70, 0x68,
 	0x61, 0x76, 0x65, 0x6e, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x62, 0x61, 0x63, 0x6b, 0x70,
-	0x6c, 0x61, 0x6e, 0x65, 0x2e, 0x67, 0x72, 0x70, 0x63, 0x2e, 0x54, 0x69, 0x6d, 0x65, 0x54, 0x61,
-	0x62, 0x6c, 0x65, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x48, 0x00, 0x52, 0x09, 0x74, 0x69,
-	0x6d, 0x65, 0x54, 0x61, 0x62, 0x6c, 0x65, 0x12, 0x5a, 0x0a, 0x0c, 0x64, 0x72, 0x6f, 0x70, 0x5f,
-	0x63, 0x6f, 0x6c, 0x75, 0x6d, 0x6e, 0x73, 0x18, 0x03, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x35, 0x2e,
+	0x6c, 0x61, 0x6e, 0x65, 0x2e, 0x67, 0x72, 0x70, 0x63, 0x2e, 0x45, 0x6d, 0x70, 0x74, 0x79, 0x54,
+	0x61, 0x62, 0x6c, 0x65, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x48, 0x00, 0x52, 0x0a, 0x65,
+	0x6d, 0x70, 0x74, 0x79, 0x54, 0x61, 0x62, 0x6c, 0x65, 0x12, 0x54, 0x0a, 0x0a, 0x74, 0x69, 0x6d,
+	0x65, 0x5f, 0x74, 0x61, 0x62, 0x6c, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x33, 0x2e,
 	0x69, 0x6f, 0x2e, 0x64, 0x65, 0x65, 0x70, 0x68, 0x61, 0x76, 0x65, 0x6e, 0x2e, 0x70, 0x72, 0x6f,
 	0x74, 0x6f, 0x2e, 0x62, 0x61, 0x63, 0x6b, 0x70, 0x6c, 0x61, 0x6e, 0x65, 0x2e, 0x67, 0x72, 0x70,
-	0x63, 0x2e, 0x44, 0x72, 0x6f, 0x70, 0x43, 0x6f, 0x6c, 0x75, 0x6d, 0x6e, 0x73, 0x52, 0x65, 0x71,
-	0x75, 0x65, 0x73, 0x74, 0x48, 0x00, 0x52, 0x0b, 0x64, 0x72, 0x6f, 0x70, 0x43, 0x6f, 0x6c, 0x75,
-	0x6d, 0x6e, 0x73, 0x12, 0x52, 0x0a, 0x06, 0x75, 0x70, 0x64, 0x61, 0x74, 0x65, 0x18, 0x04, 0x20,
-	0x01, 0x28, 0x0b, 0x32, 0x38, 0x2e, 0x69, 0x6f, 0x2e, 0x64, 0x65, 0x65, 0x70, 0x68, 0x61, 0x76,
-	0x65, 0x6e, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x62, 0x61, 0x63, 0x6b, 0x70, 0x6c, 0x61,
-	0x6e, 0x65, 0x2e, 0x67, 0x72, 0x70, 0x63, 0x2e, 0x53, 0x65, 0x6c, 0x65, 0x63, 0x74, 0x4f, 0x72,
-	0x55, 0x70, 0x64, 0x61, 0x74, 0x65, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x48, 0x00, 0x52,
-	0x06, 0x75, 0x70, 0x64, 0x61, 0x74, 0x65, 0x12, 0x5b, 0x0a, 0x0b, 0x6c, 0x61, 0x7a, 0x79, 0x5f,
-	0x75, 0x70, 0x64, 0x61, 0x74, 0x65, 0x18, 0x05, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x38, 0x2e, 0x69,
-	0x6f, 0x2e, 0x64, 0x65, 0x65, 0x70, 0x68, 0x61, 0x76, 0x65, 0x6e, 0x2e, 0x70, 0x72, 0x6f, 0x74,
-	0x6f, 0x2e, 0x62, 0x61, 0x63, 0x6b, 0x70, 0x6c, 0x61, 0x6e, 0x65, 0x2e, 0x67, 0x72, 0x70, 0x63,
-	0x2e, 0x53, 0x65, 0x6c, 0x65, 0x63, 0x74, 0x4f, 0x72, 0x55, 0x70, 0x64, 0x61, 0x74, 0x65, 0x52,
-	0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x48, 0x00, 0x52, 0x0a, 0x6c, 0x61, 0x7a, 0x79, 0x55, 0x70,
-	0x64, 0x61, 0x74, 0x65, 0x12, 0x4e, 0x0a, 0x04, 0x76, 0x69, 0x65, 0x77, 0x18, 0x06, 0x20, 0x01,
-	0x28, 0x0b, 0x32, 0x38, 0x2e, 0x69, 0x6f, 0x2e, 0x64, 0x65, 0x65, 0x70, 0x68, 0x61, 0x76, 0x65,
-	0x6e, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x62, 0x61, 0x63, 0x6b, 0x70, 0x6c, 0x61, 0x6e,
-	0x65, 0x2e, 0x67, 0x72, 0x70, 0x63, 0x2e, 0x53, 0x65, 0x6c, 0x65, 0x63, 0x74, 0x4f, 0x72, 0x55,
-	0x70, 0x64, 0x61, 0x74, 0x65, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x48, 0x00, 0x52, 0x04,
-	0x76, 0x69, 0x65, 0x77, 0x12, 0x5b, 0x0a, 0x0b, 0x75, 0x70, 0x64, 0x61, 0x74, 0x65, 0x5f, 0x76,
-	0x69, 0x65, 0x77, 0x18, 0x07, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x38, 0x2e, 0x69, 0x6f, 0x2e, 0x64,
-	0x65, 0x65, 0x70, 0x68, 0x61, 0x76, 0x65, 0x6e, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x62,
-	0x61, 0x63, 0x6b, 0x70, 0x6c, 0x61, 0x6e, 0x65, 0x2e, 0x67, 0x72, 0x70, 0x63, 0x2e, 0x53, 0x65,
-	0x6c, 0x65, 0x63, 0x74, 0x4f, 0x72, 0x55, 0x70, 0x64, 0x61, 0x74, 0x65, 0x52, 0x65, 0x71, 0x75,
-	0x65, 0x73, 0x74, 0x48, 0x00, 0x52, 0x0a, 0x75, 0x70, 0x64, 0x61, 0x74, 0x65, 0x56, 0x69, 0x65,
-	0x77, 0x12, 0x52, 0x0a, 0x06, 0x73, 0x65, 0x6c, 0x65, 0x63, 0x74, 0x18, 0x08, 0x20, 0x01, 0x28,
+	0x63, 0x2e, 0x54, 0x69, 0x6d, 0x65, 0x54, 0x61, 0x62, 0x6c, 0x65, 0x52, 0x65, 0x71, 0x75, 0x65,
+	0x73, 0x74, 0x48, 0x00, 0x52, 0x09, 0x74, 0x69, 0x6d, 0x65, 0x54, 0x61, 0x62, 0x6c, 0x65, 0x12,
+	0x5a, 0x0a, 0x0c, 0x64, 0x72, 0x6f, 0x70, 0x5f, 0x63, 0x6f, 0x6c, 0x75, 0x6d, 0x6e, 0x73, 0x18,
+	0x03, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x35, 0x2e, 0x69, 0x6f, 0x2e, 0x64, 0x65, 0x65, 0x70, 0x68,
+	0x61, 0x76, 0x65, 0x6e, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x62, 0x61, 0x63, 0x6b, 0x70,
+	0x6c, 0x61, 0x6e, 0x65, 0x2e, 0x67, 0x72, 0x70, 0x63, 0x2e, 0x44, 0x72, 0x6f, 0x70, 0x43, 0x6f,
+	0x6c, 0x75, 0x6d, 0x6e, 0x73, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x48, 0x00, 0x52, 0x0b,
+	0x64, 0x72, 0x6f, 0x70, 0x43, 0x6f, 0x6c, 0x75, 0x6d, 0x6e, 0x73, 0x12, 0x52, 0x0a, 0x06, 0x75,
+	0x70, 0x64, 0x61, 0x74, 0x65, 0x18, 0x04, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x38, 0x2e, 0x69, 0x6f,
+	0x2e, 0x64, 0x65, 0x65, 0x70, 0x68, 0x61, 0x76, 0x65, 0x6e, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f,
+	0x2e, 0x62, 0x61, 0x63, 0x6b, 0x70, 0x6c, 0x61, 0x6e, 0x65, 0x2e, 0x67, 0x72, 0x70, 0x63, 0x2e,
+	0x53, 0x65, 0x6c, 0x65, 0x63, 0x74, 0x4f, 0x72, 0x55, 0x70, 0x64, 0x61, 0x74, 0x65, 0x52, 0x65,
+	0x71, 0x75, 0x65, 0x73, 0x74, 0x48, 0x00, 0x52, 0x06, 0x75, 0x70, 0x64, 0x61, 0x74, 0x65, 0x12,
+	0x5b, 0x0a, 0x0b, 0x6c, 0x61, 0x7a, 0x79, 0x5f, 0x75, 0x70, 0x64, 0x61, 0x74, 0x65, 0x18, 0x05,
+	0x20, 0x01, 0x28, 0x0b, 0x32, 0x38, 0x2e, 0x69, 0x6f, 0x2e, 0x64, 0x65, 0x65, 0x70, 0x68, 0x61,
+	0x76, 0x65, 0x6e, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x62, 0x61, 0x63, 0x6b, 0x70, 0x6c,
+	0x61, 0x6e, 0x65, 0x2e, 0x67, 0x72, 0x70, 0x63, 0x2e, 0x53, 0x65, 0x6c, 0x65, 0x63, 0x74, 0x4f,
+	0x72, 0x55, 0x70, 0x64, 0x61, 0x74, 0x65, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x48, 0x00,
+	0x52, 0x0a, 0x6c, 0x61, 0x7a, 0x79, 0x55, 0x70, 0x64, 0x61, 0x74, 0x65, 0x12, 0x4e, 0x0a, 0x04,
+	0x76, 0x69, 0x65, 0x77, 0x18, 0x06, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x38, 0x2e, 0x69, 0x6f, 0x2e,
+	0x64, 0x65, 0x65, 0x70, 0x68, 0x61, 0x76, 0x65, 0x6e, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e,
+	0x62, 0x61, 0x63, 0x6b, 0x70, 0x6c, 0x61, 0x6e, 0x65, 0x2e, 0x67, 0x72, 0x70, 0x63, 0x2e, 0x53,
+	0x65, 0x6c, 0x65, 0x63, 0x74, 0x4f, 0x72, 0x55, 0x70, 0x64, 0x61, 0x74, 0x65, 0x52, 0x65, 0x71,
+	0x75, 0x65, 0x73, 0x74, 0x48, 0x00, 0x52, 0x04, 0x76, 0x69, 0x65, 0x77, 0x12, 0x5b, 0x0a, 0x0b,
+	0x75, 0x70, 0x64, 0x61, 0x74, 0x65, 0x5f, 0x76, 0x69, 0x65, 0x77, 0x18, 0x07, 0x20, 0x01, 0x28,
 	0x0b, 0x32, 0x38, 0x2e, 0x69, 0x6f, 0x2e, 0x64, 0x65, 0x65, 0x70, 0x68, 0x61, 0x76, 0x65, 0x6e,
 	0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x62, 0x61, 0x63, 0x6b, 0x70, 0x6c, 0x61, 0x6e, 0x65,
 	0x2e, 0x67, 0x72, 0x70, 0x63, 0x2e, 0x53, 0x65, 0x6c, 0x65, 0x63, 0x74, 0x4f, 0x72, 0x55, 0x70,
-	0x64, 0x61, 0x74, 0x65, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x48, 0x00, 0x52, 0x06, 0x73,
-	0x65, 0x6c, 0x65, 0x63, 0x74, 0x12, 0x63, 0x0a, 0x0f, 0x73, 0x65, 0x6c, 0x65, 0x63, 0x74, 0x5f,
-	0x64, 0x69, 0x73, 0x74, 0x69, 0x6e, 0x63, 0x74, 0x18, 0x09, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x38,
+	0x64, 0x61, 0x74, 0x65, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x48, 0x00, 0x52, 0x0a, 0x75,
+	0x70, 0x64, 0x61, 0x74, 0x65, 0x56, 0x69, 0x65, 0x77, 0x12, 0x52, 0x0a, 0x06, 0x73, 0x65, 0x6c,
+	0x65, 0x63, 0x74, 0x18, 0x08, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x38, 0x2e, 0x69, 0x6f, 0x2e, 0x64,
+	0x65, 0x65, 0x70, 0x68, 0x61, 0x76, 0x65, 0x6e, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x62,
+	0x61, 0x63, 0x6b, 0x70, 0x6c, 0x61, 0x6e, 0x65, 0x2e, 0x67, 0x72, 0x70, 0x63, 0x2e, 0x53, 0x65,
+	0x6c, 0x65, 0x63, 0x74, 0x4f, 0x72, 0x55, 0x70, 0x64, 0x61, 0x74, 0x65, 0x52, 0x65, 0x71, 0x75,
+	0x65, 0x73, 0x74, 0x48, 0x00, 0x52, 0x06, 0x73, 0x65, 0x6c, 0x65, 0x63, 0x74, 0x12, 0x63, 0x0a,
+	0x0f, 0x73, 0x65, 0x6c, 0x65, 0x63, 0x74, 0x5f, 0x64, 0x69, 0x73, 0x74, 0x69, 0x6e, 0x63, 0x74,
+	0x18, 0x09, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x38, 0x2e, 0x69, 0x6f, 0x2e, 0x64, 0x65, 0x65, 0x70,
+	0x68, 0x61, 0x76, 0x65, 0x6e, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x62, 0x61, 0x63, 0x6b,
+	0x70, 0x6c, 0x61, 0x6e, 0x65, 0x2e, 0x67, 0x72, 0x70, 0x63, 0x2e, 0x53, 0x65, 0x6c, 0x65, 0x63,
+	0x74, 0x44, 0x69, 0x73, 0x74, 0x69, 0x6e, 0x63, 0x74, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74,
+	0x48, 0x00, 0x52, 0x0e, 0x73, 0x65, 0x6c, 0x65, 0x63, 0x74, 0x44, 0x69, 0x73, 0x74, 0x69, 0x6e,
+	0x63, 0x74, 0x12, 0x4f, 0x0a, 0x06, 0x66, 0x69, 0x6c, 0x74, 0x65, 0x72, 0x18, 0x0a, 0x20, 0x01,
+	0x28, 0x0b, 0x32, 0x35, 0x2e, 0x69, 0x6f, 0x2e, 0x64, 0x65, 0x65, 0x70, 0x68, 0x61, 0x76, 0x65,
+	0x6e, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x62, 0x61, 0x63, 0x6b, 0x70, 0x6c, 0x61, 0x6e,
+	0x65, 0x2e, 0x67, 0x72, 0x70, 0x63, 0x2e, 0x46, 0x69, 0x6c, 0x74, 0x65, 0x72, 0x54, 0x61, 0x62,
+	0x6c, 0x65, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x48, 0x00, 0x52, 0x06, 0x66, 0x69, 0x6c,
+	0x74, 0x65, 0x72, 0x12, 0x74, 0x0a, 0x13, 0x75, 0x6e, 0x73, 0x74, 0x72, 0x75, 0x63, 0x74, 0x75,
+	0x72, 0x65, 0x64, 0x5f, 0x66, 0x69, 0x6c, 0x74, 0x65, 0x72, 0x18, 0x0b, 0x20, 0x01, 0x28, 0x0b,
+	0x32, 0x41, 0x2e, 0x69, 0x6f, 0x2e, 0x64, 0x65, 0x65, 0x70, 0x68, 0x61, 0x76, 0x65, 0x6e, 0x2e,
+	0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x62, 0x61, 0x63, 0x6b, 0x70, 0x6c, 0x61, 0x6e, 0x65, 0x2e,
+	0x67, 0x72, 0x70, 0x63, 0x2e, 0x55, 0x6e, 0x73, 0x74, 0x72, 0x75, 0x63, 0x74, 0x75, 0x72, 0x65,
+	0x64, 0x46, 0x69, 0x6c, 0x74, 0x65, 0x72, 0x54, 0x61, 0x62, 0x6c, 0x65, 0x52, 0x65, 0x71, 0x75,
+	0x65, 0x73, 0x74, 0x48, 0x00, 0x52, 0x12, 0x75, 0x6e, 0x73, 0x74, 0x72, 0x75, 0x63, 0x74, 0x75,
+	0x72, 0x65, 0x64, 0x46, 0x69, 0x6c, 0x74, 0x65, 0x72, 0x12, 0x49, 0x0a, 0x04, 0x73, 0x6f, 0x72,
+	0x74, 0x18, 0x0c, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x33, 0x2e, 0x69, 0x6f, 0x2e, 0x64, 0x65, 0x65,
+	0x70, 0x68, 0x61, 0x76, 0x65, 0x6e, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x62, 0x61, 0x63,
+	0x6b, 0x70, 0x6c, 0x61, 0x6e, 0x65, 0x2e, 0x67, 0x72, 0x70, 0x63, 0x2e, 0x53, 0x6f, 0x72, 0x74,
+	0x54, 0x61, 0x62, 0x6c, 0x65, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x48, 0x00, 0x52, 0x04,
+	0x73, 0x6f, 0x72, 0x74, 0x12, 0x4a, 0x0a, 0x04, 0x68, 0x65, 0x61, 0x64, 0x18, 0x0d, 0x20, 0x01,
+	0x28, 0x0b, 0x32, 0x34, 0x2e, 0x69, 0x6f, 0x2e, 0x64, 0x65, 0x65, 0x70, 0x68, 0x61, 0x76, 0x65,
+	0x6e, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x62, 0x61, 0x63, 0x6b, 0x70, 0x6c, 0x61, 0x6e,
+	0x65, 0x2e, 0x67, 0x72, 0x70, 0x63, 0x2e, 0x48, 0x65, 0x61, 0x64, 0x4f, 0x72, 0x54, 0x61, 0x69,
+	0x6c, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x48, 0x00, 0x52, 0x04, 0x68, 0x65, 0x61, 0x64,
+	0x12, 0x4a, 0x0a, 0x04, 0x74, 0x61, 0x69, 0x6c, 0x18, 0x0e, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x34,
 	0x2e, 0x69, 0x6f, 0x2e, 0x64, 0x65, 0x65, 0x70, 0x68, 0x61, 0x76, 0x65, 0x6e, 0x2e, 0x70, 0x72,
 	0x6f, 0x74, 0x6f, 0x2e, 0x62, 0x61, 0x63, 0x6b, 0x70, 0x6c, 0x61, 0x6e, 0x65, 0x2e, 0x67, 0x72,
-	0x70, 0x63, 0x2e, 0x53, 0x65, 0x6c, 0x65, 0x63, 0x74, 0x44, 0x69, 0x73, 0x74, 0x69, 0x6e, 0x63,
-	0x74, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x48, 0x00, 0x52, 0x0e, 0x73, 0x65, 0x6c, 0x65,
-	0x63, 0x74, 0x44, 0x69, 0x73, 0x74, 0x69, 0x6e, 0x63, 0x74, 0x12, 0x4f, 0x0a, 0x06, 0x66, 0x69,
-	0x6c, 0x74, 0x65, 0x72, 0x18, 0x0a, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x35, 0x2e, 0x69, 0x6f, 0x2e,
+	0x70, 0x63, 0x2e, 0x48, 0x65, 0x61, 0x64, 0x4f, 0x72, 0x54, 0x61, 0x69, 0x6c, 0x52, 0x65, 0x71,
+	0x75, 0x65, 0x73, 0x74, 0x48, 0x00, 0x52, 0x04, 0x74, 0x61, 0x69, 0x6c, 0x12, 0x51, 0x0a, 0x07,
+	0x68, 0x65, 0x61, 0x64, 0x5f, 0x62, 0x79, 0x18, 0x0f, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x36, 0x2e,
+	0x69, 0x6f, 0x2e, 0x64, 0x65, 0x65, 0x70, 0x68, 0x61, 0x76, 0x65, 0x6e, 0x2e, 0x70, 0x72, 0x6f,
+	0x74, 0x6f, 0x2e, 0x62, 0x61, 0x63, 0x6b, 0x70, 0x6c, 0x61, 0x6e, 0x65, 0x2e, 0x67, 0x72, 0x70,
+	0x63, 0x2e, 0x48, 0x65, 0x61, 0x64, 0x4f, 0x72, 0x54, 0x61, 0x69, 0x6c, 0x42, 0x79, 0x52, 0x65,
+	0x71, 0x75, 0x65, 0x73, 0x74, 0x48, 0x00, 0x52, 0x06, 0x68, 0x65, 0x61, 0x64, 0x42, 0x79, 0x12,
+	0x51, 0x0a, 0x07, 0x74, 0x61, 0x69, 0x6c, 0x5f, 0x62, 0x79, 0x18, 0x10, 0x20, 0x01, 0x28, 0x0b,
+	0x32, 0x36, 0x2e, 0x69, 0x6f, 0x2e, 0x64, 0x65, 0x65, 0x70, 0x68, 0x61, 0x76, 0x65, 0x6e, 0x2e,
+	0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x62, 0x61, 0x63, 0x6b, 0x70, 0x6c, 0x61, 0x6e, 0x65, 0x2e,
+	0x67, 0x72, 0x70, 0x63, 0x2e, 0x48, 0x65, 0x61, 0x64, 0x4f, 0x72, 0x54, 0x61, 0x69, 0x6c, 0x42,
+	0x79, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x48, 0x00, 0x52, 0x06, 0x74, 0x61, 0x69, 0x6c,
+	0x42, 0x79, 0x12, 0x4d, 0x0a, 0x07, 0x75, 0x6e, 0x67, 0x72, 0x6f, 0x75, 0x70, 0x18, 0x11, 0x20,
+	0x01, 0x28, 0x0b, 0x32, 0x31, 0x2e, 0x69, 0x6f, 0x2e, 0x64, 0x65, 0x65, 0x70, 0x68, 0x61, 0x76,
+	0x65, 0x6e, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x62, 0x61, 0x63, 0x6b, 0x70, 0x6c, 0x61,
+	0x6e, 0x65, 0x2e, 0x67, 0x72, 0x70, 0x63, 0x2e, 0x55, 0x6e, 0x67, 0x72, 0x6f, 0x75, 0x70, 0x52,
+	0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x48, 0x00, 0x52, 0x07, 0x75, 0x6e, 0x67, 0x72, 0x6f, 0x75,
+	0x70, 0x12, 0x4d, 0x0a, 0x05, 0x6d, 0x65, 0x72, 0x67, 0x65, 0x18, 0x12, 0x20, 0x01, 0x28, 0x0b,
+	0x32, 0x35, 0x2e, 0x69, 0x6f, 0x2e, 0x64, 0x65, 0x65, 0x70, 0x68, 0x61, 0x76, 0x65, 0x6e, 0x2e,
+	0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x62, 0x61, 0x63, 0x6b, 0x70, 0x6c, 0x61, 0x6e, 0x65, 0x2e,
+	0x67, 0x72, 0x70, 0x63, 0x2e, 0x4d, 0x65, 0x72, 0x67, 0x65, 0x54, 0x61, 0x62, 0x6c, 0x65, 0x73,
+	0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x48, 0x00, 0x52, 0x05, 0x6d, 0x65, 0x72, 0x67, 0x65,
+	0x12, 0x63, 0x0a, 0x0f, 0x63, 0x6f, 0x6d, 0x62, 0x6f, 0x5f, 0x61, 0x67, 0x67, 0x72, 0x65, 0x67,
+	0x61, 0x74, 0x65, 0x18, 0x13, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x38, 0x2e, 0x69, 0x6f, 0x2e, 0x64,
+	0x65, 0x65, 0x70, 0x68, 0x61, 0x76, 0x65, 0x6e, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x62,
+	0x61, 0x63, 0x6b, 0x70, 0x6c, 0x61, 0x6e, 0x65, 0x2e, 0x67, 0x72, 0x70, 0x63, 0x2e, 0x43, 0x6f,
+	0x6d, 0x62, 0x6f, 0x41, 0x67, 0x67, 0x72, 0x65, 0x67, 0x61, 0x74, 0x65, 0x52, 0x65, 0x71, 0x75,
+	0x65, 0x73, 0x74, 0x48, 0x00, 0x52, 0x0e, 0x63, 0x6f, 0x6d, 0x62, 0x6f, 0x41, 0x67, 0x67, 0x72,
+	0x65, 0x67, 0x61, 0x74, 0x65, 0x12, 0x4d, 0x0a, 0x07, 0x66, 0x6c, 0x61, 0x74, 0x74, 0x65, 0x6e,
+	0x18, 0x15, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x31, 0x2e, 0x69, 0x6f, 0x2e, 0x64, 0x65, 0x65, 0x70,
+	0x68, 0x61, 0x76, 0x65, 0x6e, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x62, 0x61, 0x63, 0x6b,
+	0x70, 0x6c, 0x61, 0x6e, 0x65, 0x2e, 0x67, 0x72, 0x70, 0x63, 0x2e, 0x46, 0x6c, 0x61, 0x74, 0x74,
+	0x65, 0x6e, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x48, 0x00, 0x52, 0x07, 0x66, 0x6c, 0x61,
+	0x74, 0x74, 0x65, 0x6e, 0x12, 0x70, 0x0a, 0x14, 0x72, 0x75, 0x6e, 0x5f, 0x63, 0x68, 0x61, 0x72,
+	0x74, 0x5f, 0x64, 0x6f, 0x77, 0x6e, 0x73, 0x61, 0x6d, 0x70, 0x6c, 0x65, 0x18, 0x16, 0x20, 0x01,
+	0x28, 0x0b, 0x32, 0x3c, 0x2e, 0x69, 0x6f, 0x2e, 0x64, 0x65, 0x65, 0x70, 0x68, 0x61, 0x76, 0x65,
+	0x6e, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x62, 0x61, 0x63, 0x6b, 0x70, 0x6c, 0x61, 0x6e,
+	0x65, 0x2e, 0x67, 0x72, 0x70, 0x63, 0x2e, 0x52, 0x75, 0x6e, 0x43, 0x68, 0x61, 0x72, 0x74, 0x44,
+	0x6f, 0x77, 0x6e, 0x73, 0x61, 0x6d, 0x70, 0x6c, 0x65, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74,
+	0x48, 0x00, 0x52, 0x12, 0x72, 0x75, 0x6e, 0x43, 0x68, 0x61, 0x72, 0x74, 0x44, 0x6f, 0x77, 0x6e,
+	0x73, 0x61, 0x6d, 0x70, 0x6c, 0x65, 0x12, 0x5a, 0x0a, 0x0a, 0x63, 0x72, 0x6f, 0x73, 0x73, 0x5f,
+	0x6a, 0x6f, 0x69, 0x6e, 0x18, 0x17, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x39, 0x2e, 0x69, 0x6f, 0x2e,
 	0x64, 0x65, 0x65, 0x70, 0x68, 0x61, 0x76, 0x65, 0x6e, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e,
-	0x62, 0x61, 0x63, 0x6b, 0x70, 0x6c, 0x61, 0x6e, 0x65, 0x2e, 0x67, 0x72, 0x70, 0x63, 0x2e, 0x46,
-	0x69, 0x6c, 0x74, 0x65, 0x72, 0x54, 0x61, 0x62, 0x6c, 0x65, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73,
-	0x74, 0x48, 0x00, 0x52, 0x06, 0x66, 0x69, 0x6c, 0x74, 0x65, 0x72, 0x12, 0x74, 0x0a, 0x13, 0x75,
-	0x6e, 0x73, 0x74, 0x72, 0x75, 0x63, 0x74, 0x75, 0x72, 0x65, 0x64, 0x5f, 0x66, 0x69, 0x6c, 0x74,
-	0x65, 0x72, 0x18, 0x0b, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x41, 0x2e, 0x69, 0x6f, 0x2e, 0x64, 0x65,
+	0x62, 0x61, 0x63, 0x6b, 0x70, 0x6c, 0x61, 0x6e, 0x65, 0x2e, 0x67, 0x72, 0x70, 0x63, 0x2e, 0x43,
+	0x72, 0x6f, 0x73, 0x73, 0x4a, 0x6f, 0x69, 0x6e, 0x54, 0x61, 0x62, 0x6c, 0x65, 0x73, 0x52, 0x65,
+	0x71, 0x75, 0x65, 0x73, 0x74, 0x48, 0x00, 0x52, 0x09, 0x63, 0x72, 0x6f, 0x73, 0x73, 0x4a, 0x6f,
+	0x69, 0x6e, 0x12, 0x60, 0x0a, 0x0c, 0x6e, 0x61, 0x74, 0x75, 0x72, 0x61, 0x6c, 0x5f, 0x6a, 0x6f,
+	0x69, 0x6e, 0x18, 0x18, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x3b, 0x2e, 0x69, 0x6f, 0x2e, 0x64, 0x65,
 	0x65, 0x70, 0x68, 0x61, 0x76, 0x65, 0x6e, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x62, 0x61,
-	0x63, 0x6b, 0x70, 0x6c, 0x61, 0x6e, 0x65, 0x2e, 0x67, 0x72, 0x70, 0x63, 0x2e, 0x55, 0x6e, 0x73,
-	0x74, 0x72, 0x75, 0x63, 0x74, 0x75, 0x72, 0x65, 0x64, 0x46, 0x69, 0x6c, 0x74, 0x65, 0x72, 0x54,
-	0x61, 0x62, 0x6c, 0x65, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x48, 0x00, 0x52, 0x12, 0x75,
-	0x6e, 0x73, 0x74, 0x72, 0x75, 0x63, 0x74, 0x75, 0x72, 0x65, 0x64, 0x46, 0x69, 0x6c, 0x74, 0x65,
-	0x72, 0x12, 0x49, 0x0a, 0x04, 0x73, 0x6f, 0x72, 0x74, 0x18, 0x0c, 0x20, 0x01, 0x28, 0x0b, 0x32,
-	0x33, 0x2e, 0x69, 0x6f, 0x2e, 0x64, 0x65, 0x65, 0x70, 0x68, 0x61, 0x76, 0x65, 0x6e, 0x2e, 0x70,
+	0x63, 0x6b, 0x70, 0x6c, 0x61, 0x6e, 0x65, 0x2e, 0x67, 0x72, 0x70, 0x63, 0x2e, 0x4e, 0x61, 0x74,
+	0x75, 0x72, 0x61, 0x6c, 0x4a, 0x6f, 0x69, 0x6e, 0x54, 0x61, 0x62, 0x6c, 0x65, 0x73, 0x52, 0x65,
+	0x71, 0x75, 0x65, 0x73, 0x74, 0x48, 0x00, 0x52, 0x0b, 0x6e, 0x61, 0x74, 0x75, 0x72, 0x61, 0x6c,
+	0x4a, 0x6f, 0x69, 0x6e, 0x12, 0x5a, 0x0a, 0x0a, 0x65, 0x78, 0x61, 0x63, 0x74, 0x5f, 0x6a, 0x6f,
+	0x69, 0x6e, 0x18, 0x19, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x39, 0x2e, 0x69, 0x6f, 0x2e, 0x64, 0x65,
+	0x65, 0x70, 0x68, 0x61, 0x76, 0x65, 0x6e, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x62, 0x61,
+	0x63, 0x6b, 0x70, 0x6c, 0x61, 0x6e, 0x65, 0x2e, 0x67, 0x72, 0x70, 0x63, 0x2e, 0x45, 0x78, 0x61,
+	0x63, 0x74, 0x4a, 0x6f, 0x69, 0x6e, 0x54, 0x61, 0x62, 0x6c, 0x65, 0x73, 0x52, 0x65, 0x71, 0x75,
+	0x65, 0x73, 0x74, 0x48, 0x00, 0x52, 0x09, 0x65, 0x78, 0x61, 0x63, 0x74, 0x4a, 0x6f, 0x69, 0x6e,
+	0x12, 0x57, 0x0a, 0x09, 0x6c, 0x65, 0x66, 0x74, 0x5f, 0x6a, 0x6f, 0x69, 0x6e, 0x18, 0x1a, 0x20,
+	0x01, 0x28, 0x0b, 0x32, 0x38, 0x2e, 0x69, 0x6f, 0x2e, 0x64, 0x65, 0x65, 0x70, 0x68, 0x61, 0x76,
+	0x65, 0x6e, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x62, 0x61, 0x63, 0x6b, 0x70, 0x6c, 0x61,
+	0x6e, 0x65, 0x2e, 0x67, 0x72, 0x70, 0x63, 0x2e, 0x4c, 0x65, 0x66, 0x74, 0x4a, 0x6f, 0x69, 0x6e,
+	0x54, 0x61, 0x62, 0x6c, 0x65, 0x73, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x48, 0x00, 0x52,
+	0x08, 0x6c, 0x65, 0x66, 0x74, 0x4a, 0x6f, 0x69, 0x6e, 0x12, 0x5c, 0x0a, 0x0a, 0x61, 0x73, 0x5f,
+	0x6f, 0x66, 0x5f, 0x6a, 0x6f, 0x69, 0x6e, 0x18, 0x1b, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x38, 0x2e,
+	0x69, 0x6f, 0x2e, 0x64, 0x65, 0x65, 0x70, 0x68, 0x61, 0x76, 0x65, 0x6e, 0x2e, 0x70, 0x72, 0x6f,
+	0x74, 0x6f, 0x2e, 0x62, 0x61, 0x63, 0x6b, 0x70, 0x6c, 0x61, 0x6e, 0x65, 0x2e, 0x67, 0x72, 0x70,
+	0x63, 0x2e, 0x41, 0x73, 0x4f, 0x66, 0x4a, 0x6f, 0x69, 0x6e, 0x54, 0x61, 0x62, 0x6c, 0x65, 0x73,
+	0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x42, 0x02, 0x18, 0x01, 0x48, 0x00, 0x52, 0x08, 0x61,
+	0x73, 0x4f, 0x66, 0x4a, 0x6f, 0x69, 0x6e, 0x12, 0x57, 0x0a, 0x0b, 0x66, 0x65, 0x74, 0x63, 0x68,
+	0x5f, 0x74, 0x61, 0x62, 0x6c, 0x65, 0x18, 0x1c, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x34, 0x2e, 0x69,
+	0x6f, 0x2e, 0x64, 0x65, 0x65, 0x70, 0x68, 0x61, 0x76, 0x65, 0x6e, 0x2e, 0x70, 0x72, 0x6f, 0x74,
+	0x6f, 0x2e, 0x62, 0x61, 0x63, 0x6b, 0x70, 0x6c, 0x61, 0x6e, 0x65, 0x2e, 0x67, 0x72, 0x70, 0x63,
+	0x2e, 0x46, 0x65, 0x74, 0x63, 0x68, 0x54, 0x61, 0x62, 0x6c, 0x65, 0x52, 0x65, 0x71, 0x75, 0x65,
+	0x73, 0x74, 0x48, 0x00, 0x52, 0x0a, 0x66, 0x65, 0x74, 0x63, 0x68, 0x54, 0x61, 0x62, 0x6c, 0x65,
+	0x12, 0x73, 0x0a, 0x15, 0x61, 0x70, 0x70, 0x6c, 0x79, 0x5f, 0x70, 0x72, 0x65, 0x76, 0x69, 0x65,
+	0x77, 0x5f, 0x63, 0x6f, 0x6c, 0x75, 0x6d, 0x6e, 0x73, 0x18, 0x1e, 0x20, 0x01, 0x28, 0x0b, 0x32,
+	0x3d, 0x2e, 0x69, 0x6f, 0x2e, 0x64, 0x65, 0x65, 0x70, 0x68, 0x61, 0x76, 0x65, 0x6e, 0x2e, 0x70,
 	0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x62, 0x61, 0x63, 0x6b, 0x70, 0x6c, 0x61, 0x6e, 0x65, 0x2e, 0x67,
-	0x72, 0x70, 0x63, 0x2e, 0x53, 0x6f, 0x72, 0x74, 0x54, 0x61, 0x62, 0x6c, 0x65, 0x52, 0x65, 0x71,
-	0x75, 0x65, 0x73, 0x74, 0x48, 0x00, 0x52, 0x04, 0x73, 0x6f, 0x72, 0x74, 0x12, 0x4a, 0x0a, 0x04,
-	0x68, 0x65, 0x61, 0x64, 0x18, 0x0d, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x34, 0x2e, 0x69, 0x6f, 0x2e,
-	0x64, 0x65, 0x65, 0x70, 0x68, 0x61, 0x76, 0x65, 0x6e, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e,
-	0x62, 0x61, 0x63, 0x6b, 0x70, 0x6c, 0x61, 0x6e, 0x65, 0x2e, 0x67, 0x72, 0x70, 0x63, 0x2e, 0x48,
-	0x65, 0x61, 0x64, 0x4f, 0x72, 0x54, 0x61, 0x69, 0x6c, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74,
-	0x48, 0x00, 0x52, 0x04, 0x68, 0x65, 0x61, 0x64, 0x12, 0x4a, 0x0a, 0x04, 0x74, 0x61, 0x69, 0x6c,
-	0x18, 0x0e, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x34, 0x2e, 0x69, 0x6f, 0x2e, 0x64, 0x65, 0x65, 0x70,
+	0x72, 0x70, 0x63, 0x2e, 0x41, 0x70, 0x70, 0x6c, 0x79, 0x50, 0x72, 0x65, 0x76, 0x69, 0x65, 0x77,
+	0x43, 0x6f, 0x6c, 0x75, 0x6d, 0x6e, 0x73, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x48, 0x00,
+	0x52, 0x13, 0x61, 0x70, 0x70, 0x6c, 0x79, 0x50, 0x72, 0x65, 0x76, 0x69, 0x65, 0x77, 0x43, 0x6f,
+	0x6c, 0x75, 0x6d, 0x6e, 0x73, 0x12, 0x6a, 0x0a, 0x12, 0x63, 0x72, 0x65, 0x61, 0x74, 0x65, 0x5f,
+	0x69, 0x6e, 0x70, 0x75, 0x74, 0x5f, 0x74, 0x61, 0x62, 0x6c, 0x65, 0x18, 0x1f, 0x20, 0x01, 0x28,
+	0x0b, 0x32, 0x3a, 0x2e, 0x69, 0x6f, 0x2e, 0x64, 0x65, 0x65, 0x70, 0x68, 0x61, 0x76, 0x65, 0x6e,
+	0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x62, 0x61, 0x63, 0x6b, 0x70, 0x6c, 0x61, 0x6e, 0x65,
+	0x2e, 0x67, 0x72, 0x70, 0x63, 0x2e, 0x43, 0x72, 0x65, 0x61, 0x74, 0x65, 0x49, 0x6e, 0x70, 0x75,
+	0x74, 0x54, 0x61, 0x62, 0x6c, 0x65, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x48, 0x00, 0x52,
+	0x10, 0x63, 0x72, 0x65, 0x61, 0x74, 0x65, 0x49, 0x6e, 0x70, 0x75, 0x74, 0x54, 0x61, 0x62, 0x6c,
+	0x65, 0x12, 0x51, 0x0a, 0x09, 0x75, 0x70, 0x64, 0x61, 0x74, 0x65, 0x5f, 0x62, 0x79, 0x18, 0x20,
+	0x20, 0x01, 0x28, 0x0b, 0x32, 0x32, 0x2e, 0x69, 0x6f, 0x2e, 0x64, 0x65, 0x65, 0x70, 0x68, 0x61,
+	0x76, 0x65, 0x6e, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x62, 0x61, 0x63, 0x6b, 0x70, 0x6c,
+	0x61, 0x6e, 0x65, 0x2e, 0x67, 0x72, 0x70, 0x63, 0x2e, 0x55, 0x70, 0x64, 0x61, 0x74, 0x65, 0x42,
+	0x79, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x48, 0x00, 0x52, 0x08, 0x75, 0x70, 0x64, 0x61,
+	0x74, 0x65, 0x42, 0x79, 0x12, 0x4e, 0x0a, 0x08, 0x77, 0x68, 0x65, 0x72, 0x65, 0x5f, 0x69, 0x6e,
+	0x18, 0x21, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x31, 0x2e, 0x69, 0x6f, 0x2e, 0x64, 0x65, 0x65, 0x70,
 	0x68, 0x61, 0x76, 0x65, 0x6e, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x62, 0x61, 0x63, 0x6b,
-	0x70, 0x6c, 0x61, 0x6e, 0x65, 0x2e, 0x67, 0x72, 0x70, 0x63, 0x2e, 0x48, 0x65, 0x61, 0x64, 0x4f,
-	0x72, 0x54, 0x61, 0x69, 0x6c, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x48, 0x00, 0x52, 0x04,
-	0x74, 0x61, 0x69, 0x6c, 0x12, 0x51, 0x0a, 0x07, 0x68, 0x65, 0x61, 0x64, 0x5f, 0x62, 0x79, 0x18,
-	0x0f, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x36, 0x2e, 0x69, 0x6f, 0x2e, 0x64, 0x65, 0x65, 0x70, 0x68,
-	0x61, 0x76, 0x65, 0x6e, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x62, 0x61, 0x63, 0x6b, 0x70,
-	0x6c, 0x61, 0x6e, 0x65, 0x2e, 0x67, 0x72, 0x70, 0x63, 0x2e, 0x48, 0x65, 0x61, 0x64, 0x4f, 0x72,
-	0x54, 0x61, 0x69, 0x6c, 0x42, 0x79, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x48, 0x00, 0x52,
-	0x06, 0x68, 0x65, 0x61, 0x64, 0x42, 0x79, 0x12, 0x51, 0x0a, 0x07, 0x74, 0x61, 0x69, 0x6c, 0x5f,
-	0x62, 0x79, 0x18, 0x10, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x36, 0x2e, 0x69, 0x6f, 0x2e, 0x64, 0x65,
-	0x65, 0x70, 0x68, 0x61, 0x76, 0x65, 0x6e, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x62, 0x61,
-	0x63, 0x6b, 0x70, 0x6c, 0x61, 0x6e, 0x65, 0x2e, 0x67, 0x72, 0x70, 0x63, 0x2e, 0x48, 0x65, 0x61,
-	0x64, 0x4f, 0x72, 0x54, 0x61, 0x69, 0x6c, 0x42, 0x79, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74,
-	0x48, 0x00, 0x52, 0x06, 0x74, 0x61, 0x69, 0x6c, 0x42, 0x79, 0x12, 0x4d, 0x0a, 0x07, 0x75, 0x6e,
-	0x67, 0x72, 0x6f, 0x75, 0x70, 0x18, 0x11, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x31, 0x2e, 0x69, 0x6f,
+	0x70, 0x6c, 0x61, 0x6e, 0x65, 0x2e, 0x67, 0x72, 0x70, 0x63, 0x2e, 0x57, 0x68, 0x65, 0x72, 0x65,
+	0x49, 0x6e, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x48, 0x00, 0x52, 0x07, 0x77, 0x68, 0x65,
+	0x72, 0x65, 0x49, 0x6e, 0x12, 0x5d, 0x0a, 0x0d, 0x61, 0x67, 0x67, 0x72, 0x65, 0x67, 0x61, 0x74,
+	0x65, 0x5f, 0x61, 0x6c, 0x6c, 0x18, 0x22, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x36, 0x2e, 0x69, 0x6f,
 	0x2e, 0x64, 0x65, 0x65, 0x70, 0x68, 0x61, 0x76, 0x65, 0x6e, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f,
 	0x2e, 0x62, 0x61, 0x63, 0x6b, 0x70, 0x6c, 0x61, 0x6e, 0x65, 0x2e, 0x67, 0x72, 0x70, 0x63, 0x2e,
-	0x55, 0x6e, 0x67, 0x72, 0x6f, 0x75, 0x70, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x48, 0x00,
-	0x52, 0x07, 0x75, 0x6e, 0x67, 0x72, 0x6f, 0x75, 0x70, 0x12, 0x4d, 0x0a, 0x05, 0x6d, 0x65, 0x72,
-	0x67, 0x65, 0x18, 0x12, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x35, 0x2e, 0x69, 0x6f, 0x2e, 0x64, 0x65,
-	0x65, 0x70, 0x68, 0x61, 0x76, 0x65, 0x6e, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x62, 0x61,
-	0x63, 0x6b, 0x70, 0x6c, 0x61, 0x6e, 0x65, 0x2e, 0x67, 0x72, 0x70, 0x63, 0x2e, 0x4d, 0x65, 0x72,
-	0x67, 0x65, 0x54, 0x61, 0x62, 0x6c, 0x65, 0x73, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x48,
-	0x00, 0x52, 0x05, 0x6d, 0x65, 0x72, 0x67, 0x65, 0x12, 0x63, 0x0a, 0x0f, 0x63, 0x6f, 0x6d, 0x62,
-	0x6f, 0x5f, 0x61, 0x67, 0x67, 0x72, 0x65, 0x67, 0x61, 0x74, 0x65, 0x18, 0x13, 0x20, 0x01, 0x28,
-	0x0b, 0x32, 0x38, 0x2e, 0x69, 0x6f, 0x2e, 0x64, 0x65, 0x65, 0x70, 0x68, 0x61, 0x76, 0x65, 0x6e,
-	0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x62, 0x61, 0x63, 0x6b, 0x70, 0x6c, 0x61, 0x6e, 0x65,
-	0x2e, 0x67, 0x72, 0x70, 0x63, 0x2e, 0x43, 0x6f, 0x6d, 0x62, 0x6f, 0x41, 0x67, 0x67, 0x72, 0x65,
-	0x67, 0x61, 0x74, 0x65, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x48, 0x00, 0x52, 0x0e, 0x63,
-	0x6f, 0x6d, 0x62, 0x6f, 0x41, 0x67, 0x67, 0x72, 0x65, 0x67, 0x61, 0x74, 0x65, 0x12, 0x4d, 0x0a,
-	0x07, 0x66, 0x6c, 0x61, 0x74, 0x74, 0x65, 0x6e, 0x18, 0x15, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x31,
-	0x2e, 0x69, 0x6f, 0x2e, 0x64, 0x65, 0x65, 0x70, 0x68, 0x61, 0x76, 0x65, 0x6e, 0x2e, 0x70, 0x72,
-	0x6f, 0x74, 0x6f, 0x2e, 0x62, 0x61, 0x63, 0x6b, 0x70, 0x6c, 0x61, 0x6e, 0x65, 0x2e, 0x67, 0x72,
-	0x70, 0x63, 0x2e, 0x46, 0x6c, 0x61, 0x74, 0x74, 0x65, 0x6e, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73,
-	0x74, 0x48, 0x00, 0x52, 0x07, 0x66, 0x6c, 0x61, 0x74, 0x74, 0x65, 0x6e, 0x12, 0x70, 0x0a, 0x14,
-	0x72, 0x75, 0x6e, 0x5f, 0x63, 0x68, 0x61, 0x72, 0x74, 0x5f, 0x64, 0x6f, 0x77, 0x6e, 0x73, 0x61,
-	0x6d, 0x70, 0x6c, 0x65, 0x18, 0x16, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x3c, 0x2e, 0x69, 0x6f, 0x2e,
+	0x41, 0x67, 0x67, 0x72, 0x65, 0x67, 0x61, 0x74, 0x65, 0x41, 0x6c, 0x6c, 0x52, 0x65, 0x71, 0x75,
+	0x65, 0x73, 0x74, 0x48, 0x00, 0x52, 0x0c, 0x61, 0x67, 0x67, 0x72, 0x65, 0x67, 0x61, 0x74, 0x65,
+	0x41, 0x6c, 0x6c, 0x12, 0x53, 0x0a, 0x09, 0x61, 0x67, 0x67, 0x72, 0x65, 0x67, 0x61, 0x74, 0x65,
+	0x18, 0x23, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x33, 0x2e, 0x69, 0x6f, 0x2e, 0x64, 0x65, 0x65, 0x70,
+	0x68, 0x61, 0x76, 0x65, 0x6e, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x62, 0x61, 0x63, 0x6b,
+	0x70, 0x6c, 0x61, 0x6e, 0x65, 0x2e, 0x67, 0x72, 0x70, 0x63, 0x2e, 0x41, 0x67, 0x67, 0x72, 0x65,
+	0x67, 0x61, 0x74, 0x65, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x48, 0x00, 0x52, 0x09, 0x61,
+	0x67, 0x67, 0x72, 0x65, 0x67, 0x61, 0x74, 0x65, 0x12, 0x55, 0x0a, 0x08, 0x73, 0x6e, 0x61, 0x70,
+	0x73, 0x68, 0x6f, 0x74, 0x18, 0x24, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x37, 0x2e, 0x69, 0x6f, 0x2e,
 	0x64, 0x65, 0x65, 0x70, 0x68, 0x61, 0x76, 0x65, 0x6e, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e,
-	0x62, 0x61, 0x63, 0x6b, 0x70, 0x6c, 0x61, 0x6e, 0x65, 0x2e, 0x67, 0x72, 0x70, 0x63, 0x2e, 0x52,
-	0x75, 0x6e, 0x43, 0x68, 0x61, 0x72, 0x74, 0x44, 0x6f, 0x77, 0x6e, 0x73, 0x61, 0x6d, 0x70, 0x6c,
-	0x65, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x48, 0x00, 0x52, 0x12, 0x72, 0x75, 0x6e, 0x43,
-	0x68, 0x61, 0x72, 0x74, 0x44, 0x6f, 0x77, 0x6e, 0x73, 0x61, 0x6d, 0x70, 0x6c, 0x65, 0x12, 0x5a,
-	0x0a, 0x0a, 0x63, 0x72, 0x6f, 0x73, 0x73, 0x5f, 0x6a, 0x6f, 0x69, 0x6e, 0x18, 0x17, 0x20, 0x01,
-	0x28, 0x0b, 0x32, 0x39, 0x2e, 0x69, 0x6f, 0x2e, 0x64, 0x65, 0x65, 0x70, 0x68, 0x61, 0x76, 0x65,
-	0x6e, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x62, 0x61, 0x63, 0x6b, 0x70, 0x6c, 0x61, 0x6e,
-	0x65, 0x2e, 0x67, 0x72, 0x70, 0x63, 0x2e, 0x43, 0x72, 0x6f, 0x73, 0x73, 0x4a, 0x6f, 0x69, 0x6e,
-	0x54, 0x61, 0x62, 0x6c, 0x65, 0x73, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x48, 0x00, 0x52,
-	0x09, 0x63, 0x72, 0x6f, 0x73, 0x73, 0x4a, 0x6f, 0x69, 0x6e, 0x12, 0x60, 0x0a, 0x0c, 0x6e, 0x61,
-	0x74, 0x75, 0x72, 0x61, 0x6c, 0x5f, 0x6a, 0x6f, 0x69, 0x6e, 0x18, 0x18, 0x20, 0x01, 0x28, 0x0b,
-	0x32, 0x3b, 0x2e, 0x69, 0x6f, 0x2e, 0x64, 0x65, 0x65, 0x70, 0x68, 0x61, 0x76, 0x65, 0x6e, 0x2e,
-	0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x62, 0x61, 0x63, 0x6b, 0x70, 0x6c, 0x61, 0x6e, 0x65, 0x2e,
-	0x67, 0x72, 0x70, 0x63, 0x2e, 0x4e, 0x61, 0x74, 0x75, 0x72, 0x61, 0x6c, 0x4a, 0x6f, 0x69, 0x6e,
-	0x54, 0x61, 0x62, 0x6c, 0x65, 0x73, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x48, 0x00, 0x52,
-	0x0b, 0x6e, 0x61, 0x74, 0x75, 0x72, 0x61, 0x6c, 0x4a, 0x6f, 0x69, 0x6e, 0x12, 0x5a, 0x0a, 0x0a,
-	0x65, 0x78, 0x61, 0x63, 0x74, 0x5f, 0x6a, 0x6f, 0x69, 0x6e, 0x18, 0x19, 0x20, 0x01, 0x28, 0x0b,
-	0x32, 0x39, 0x2e, 0x69, 0x6f, 0x2e, 0x64, 0x65, 0x65, 0x70, 0x68, 0x61, 0x76, 0x65, 0x6e, 0x2e,
-	0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x62, 0x61, 0x63, 0x6b, 0x70, 0x6c, 0x61, 0x6e, 0x65, 0x2e,
-	0x67, 0x72, 0x70, 0x63, 0x2e, 0x45, 0x78, 0x61, 0x63, 0x74, 0x4a, 0x6f, 0x69, 0x6e, 0x54, 0x61,
-	0x62, 0x6c, 0x65, 0x73, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x48, 0x00, 0x52, 0x09, 0x65,
-	0x78, 0x61, 0x63, 0x74, 0x4a, 0x6f, 0x69, 0x6e, 0x12, 0x57, 0x0a, 0x09, 0x6c, 0x65, 0x66, 0x74,
-	0x5f, 0x6a, 0x6f, 0x69, 0x6e, 0x18, 0x1a, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x38, 0x2e, 0x69, 0x6f,
+	0x62, 0x61, 0x63, 0x6b, 0x70, 0x6c, 0x61, 0x6e, 0x65, 0x2e, 0x67, 0x72, 0x70, 0x63, 0x2e, 0x53,
+	0x6e, 0x61, 0x70, 0x73, 0x68, 0x6f, 0x74, 0x54, 0x61, 0x62, 0x6c, 0x65, 0x52, 0x65, 0x71, 0x75,
+	0x65, 0x73, 0x74, 0x48, 0x00, 0x52, 0x08, 0x73, 0x6e, 0x61, 0x70, 0x73, 0x68, 0x6f, 0x74, 0x12,
+	0x62, 0x0a, 0x0d, 0x73, 0x6e, 0x61, 0x70, 0x73, 0x68, 0x6f, 0x74, 0x5f, 0x77, 0x68, 0x65, 0x6e,
+	0x18, 0x25, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x3b, 0x2e, 0x69, 0x6f, 0x2e, 0x64, 0x65, 0x65, 0x70,
+	0x68, 0x61, 0x76, 0x65, 0x6e, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x62, 0x61, 0x63, 0x6b,
+	0x70, 0x6c, 0x61, 0x6e, 0x65, 0x2e, 0x67, 0x72, 0x70, 0x63, 0x2e, 0x53, 0x6e, 0x61, 0x70, 0x73,
+	0x68, 0x6f, 0x74, 0x57, 0x68, 0x65, 0x6e, 0x54, 0x61, 0x62, 0x6c, 0x65, 0x52, 0x65, 0x71, 0x75,
+	0x65, 0x73, 0x74, 0x48, 0x00, 0x52, 0x0c, 0x73, 0x6e, 0x61, 0x70, 0x73, 0x68, 0x6f, 0x74, 0x57,
+	0x68, 0x65, 0x6e, 0x12, 0x54, 0x0a, 0x0a, 0x6d, 0x65, 0x74, 0x61, 0x5f, 0x74, 0x61, 0x62, 0x6c,
+	0x65, 0x18, 0x26, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x33, 0x2e, 0x69, 0x6f, 0x2e, 0x64, 0x65, 0x65,
+	0x70, 0x68, 0x61, 0x76, 0x65, 0x6e, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x62, 0x61, 0x63,
+	0x6b, 0x70, 0x6c, 0x61, 0x6e, 0x65, 0x2e, 0x67, 0x72, 0x70, 0x63, 0x2e, 0x4d, 0x65, 0x74, 0x61,
+	0x54, 0x61, 0x62, 0x6c, 0x65, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x48, 0x00, 0x52, 0x09,
+	0x6d, 0x65, 0x74, 0x61, 0x54, 0x61, 0x62, 0x6c, 0x65, 0x12, 0x5a, 0x0a, 0x0a, 0x72, 0x61, 0x6e,
+	0x67, 0x65, 0x5f, 0x6a, 0x6f, 0x69, 0x6e, 0x18, 0x27, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x39, 0x2e,
+	0x69, 0x6f, 0x2e, 0x64, 0x65, 0x65, 0x70, 0x68, 0x61, 0x76, 0x65, 0x6e, 0x2e, 0x70, 0x72, 0x6f,
+	0x74, 0x6f, 0x2e, 0x62, 0x61, 0x63, 0x6b, 0x70, 0x6c, 0x61, 0x6e, 0x65, 0x2e, 0x67, 0x72, 0x70,
+	0x63, 0x2e, 0x52, 0x61, 0x6e, 0x67, 0x65, 0x4a, 0x6f, 0x69, 0x6e, 0x54, 0x61, 0x62, 0x6c, 0x65,
+	0x73, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x48, 0x00, 0x52, 0x09, 0x72, 0x61, 0x6e, 0x67,
+	0x65, 0x4a, 0x6f, 0x69, 0x6e, 0x12, 0x47, 0x0a, 0x02, 0x61, 0x6a, 0x18, 0x28, 0x20, 0x01, 0x28,
+	0x0b, 0x32, 0x35, 0x2e, 0x69, 0x6f, 0x2e, 0x64, 0x65, 0x65, 0x70, 0x68, 0x61, 0x76, 0x65, 0x6e,
+	0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x62, 0x61, 0x63, 0x6b, 0x70, 0x6c, 0x61, 0x6e, 0x65,
+	0x2e, 0x67, 0x72, 0x70, 0x63, 0x2e, 0x41, 0x6a, 0x52, 0x61, 0x6a, 0x54, 0x61, 0x62, 0x6c, 0x65,
+	0x73, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x48, 0x00, 0x52, 0x02, 0x61, 0x6a, 0x12, 0x49,
+	0x0a, 0x03, 0x72, 0x61, 0x6a, 0x18, 0x29, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x35, 0x2e, 0x69, 0x6f,
 	0x2e, 0x64, 0x65, 0x65, 0x70, 0x68, 0x61, 0x76, 0x65, 0x6e, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f,
 	0x2e, 0x62, 0x61, 0x63, 0x6b, 0x70, 0x6c, 0x61, 0x6e, 0x65, 0x2e, 0x67, 0x72, 0x70, 0x63, 0x2e,
-	0x4c, 0x65, 0x66, 0x74, 0x4a, 0x6f, 0x69, 0x6e, 0x54, 0x61, 0x62, 0x6c, 0x65, 0x73, 0x52, 0x65,
-	0x71, 0x75, 0x65, 0x73, 0x74, 0x48, 0x00, 0x52, 0x08, 0x6c, 0x65, 0x66, 0x74, 0x4a, 0x6f, 0x69,
-	0x6e, 0x12, 0x5c, 0x0a, 0x0a, 0x61, 0x73, 0x5f, 0x6f, 0x66, 0x5f, 0x6a, 0x6f, 0x69, 0x6e, 0x18,
-	0x1b, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x38, 0x2e, 0x69, 0x6f, 0x2e, 0x64, 0x65, 0x65, 0x70, 0x68,
-	0x61, 0x76, 0x65, 0x6e, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x62, 0x61, 0x63, 0x6b, 0x70,
-	0x6c, 0x61, 0x6e, 0x65, 0x2e, 0x67, 0x72, 0x70, 0x63, 0x2e, 0x41, 0x73, 0x4f, 0x66, 0x4a, 0x6f,
-	0x69, 0x6e, 0x54, 0x61, 0x62, 0x6c, 0x65, 0x73, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x42,
-	0x02, 0x18, 0x01, 0x48, 0x00, 0x52, 0x08, 0x61, 0x73, 0x4f, 0x66, 0x4a, 0x6f, 0x69, 0x6e, 0x12,
-	0x57, 0x0a, 0x0b, 0x66, 0x65, 0x74, 0x63, 0x68, 0x5f, 0x74, 0x61, 0x62, 0x6c, 0x65, 0x18, 0x1c,
-	0x20, 0x01, 0x28, 0x0b, 0x32, 0x34, 0x2e, 0x69, 0x6f, 0x2e, 0x64, 0x65, 0x65, 0x70, 0x68, 0x61,
+	0x41, 0x6a, 0x52, 0x61, 0x6a, 0x54, 0x61, 0x62, 0x6c, 0x65, 0x73, 0x52, 0x65, 0x71, 0x75, 0x65,
+	0x73, 0x74, 0x48, 0x00, 0x52, 0x03, 0x72, 0x61, 0x6a, 0x12, 0x69, 0x0a, 0x11, 0x63, 0x6f, 0x6c,
+	0x75, 0x6d, 0x6e, 0x5f, 0x73, 0x74, 0x61, 0x74, 0x69, 0x73, 0x74, 0x69, 0x63, 0x73, 0x18, 0x2a,
+	0x20, 0x01, 0x28, 0x0b, 0x32, 0x3a, 0x2e, 0x69, 0x6f, 0x2e, 0x64, 0x65, 0x65, 0x70, 0x68, 0x61,
 	0x76, 0x65, 0x6e, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x62, 0x61, 0x63, 0x6b, 0x70, 0x6c,
-	0x61, 0x6e, 0x65, 0x2e, 0x67, 0x72, 0x70, 0x63, 0x2e, 0x46, 0x65, 0x74, 0x63, 0x68, 0x54, 0x61,
-	0x62, 0x6c, 0x65, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x48, 0x00, 0x52, 0x0a, 0x66, 0x65,
-	0x74, 0x63, 0x68, 0x54, 0x61, 0x62, 0x6c, 0x65, 0x12, 0x73, 0x0a, 0x15, 0x61, 0x70, 0x70, 0x6c,
-	0x79, 0x5f, 0x70, 0x72, 0x65, 0x76, 0x69, 0x65, 0x77, 0x5f, 0x63, 0x6f, 0x6c, 0x75, 0x6d, 0x6e,
-	0x73, 0x18, 0x1e, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x3d, 0x2e, 0x69, 0x6f, 0x2e, 0x64, 0x65, 0x65,
-	0x70, 0x68, 0x61, 0x76, 0x65, 0x6e, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x62, 0x61, 0x63,
-	0x6b, 0x70, 0x6c, 0x61, 0x6e, 0x65, 0x2e, 0x67, 0x72, 0x70, 0x63, 0x2e, 0x41, 0x70, 0x70, 0x6c,
-	0x79, 0x50, 0x72, 0x65, 0x76, 0x69, 0x65, 0x77, 0x43, 0x6f, 0x6c, 0x75, 0x6d, 0x6e, 0x73, 0x52,
-	0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x48, 0x00, 0x52, 0x13, 0x61, 0x70, 0x70, 0x6c, 0x79, 0x50,
-	0x72, 0x65, 0x76, 0x69, 0x65, 0x77, 0x43, 0x6f, 0x6c, 0x75, 0x6d, 0x6e, 0x73, 0x12, 0x6a, 0x0a,
-	0x12, 0x63, 0x72, 0x65, 0x61, 0x74, 0x65, 0x5f, 0x69, 0x6e, 0x70, 0x75, 0x74, 0x5f, 0x74, 0x61,
-	0x62, 0x6c, 0x65, 0x18, 0x1f, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x3a, 0x2e, 0x69, 0x6f, 0x2e, 0x64,
-	0x65, 0x65, 0x70, 0x68, 0x61, 0x76, 0x65, 0x6e, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x62,
-	0x61, 0x63, 0x6b, 0x70, 0x6c, 0x61, 0x6e, 0x65, 0x2e, 0x67, 0x72, 0x70, 0x63, 0x2e, 0x43, 0x72,
-	0x65, 0x61, 0x74, 0x65, 0x49, 0x6e, 0x70, 0x75, 0x74, 0x54, 0x61, 0x62, 0x6c, 0x65, 0x52, 0x65,
-	0x71, 0x75, 0x65, 0x73, 0x74, 0x48, 0x00, 0x52, 0x10, 0x63, 0x72, 0x65, 0x61, 0x74, 0x65, 0x49,
-	0x6e, 0x70, 0x75, 0x74, 0x54, 0x61, 0x62, 0x6c, 0x65, 0x12, 0x51, 0x0a, 0x09, 0x75, 0x70, 0x64,
-	0x61, 0x74, 0x65, 0x5f, 0x62, 0x79, 0x18, 0x20, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x32, 0x2e, 0x69,
-	0x6f, 0x2e, 0x64, 0x65, 0x65, 0x70, 0x68, 0x61, 0x76, 0x65, 0x6e, 0x2e, 0x70, 0x72, 0x6f, 0x74,
-	0x6f, 0x2e, 0x62, 0x61, 0x63, 0x6b, 0x70, 0x6c, 0x61, 0x6e, 0x65, 0x2e, 0x67, 0x72, 0x70, 0x63,
-	0x2e, 0x55, 0x70, 0x64, 0x61, 0x74, 0x65, 0x42, 0x79, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74,
-	0x48, 0x00, 0x52, 0x08, 0x75, 0x70, 0x64, 0x61, 0x74, 0x65, 0x42, 0x79, 0x12, 0x4e, 0x0a, 0x08,
-	0x77, 0x68, 0x65, 0x72, 0x65, 0x5f, 0x69, 0x6e, 0x18, 0x21, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x31,
-	0x2e, 0x69, 0x6f, 0x2e, 0x64, 0x65, 0x65, 0x70, 0x68, 0x61, 0x76, 0x65, 0x6e, 0x2e, 0x70, 0x72,
-	0x6f, 0x74, 0x6f, 0x2e, 0x62, 0x61, 0x63, 0x6b, 0x70, 0x6c, 0x61, 0x6e, 0x65, 0x2e, 0x67, 0x72,
-	0x70, 0x63, 0x2e, 0x57, 0x68, 0x65, 0x72, 0x65, 0x49, 0x6e, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73,
-	0x74, 0x48, 0x00, 0x52, 0x07, 0x77, 0x68, 0x65, 0x72, 0x65, 0x49, 0x6e, 0x12, 0x5d, 0x0a, 0x0d,
-	0x61, 0x67, 0x67, 0x72, 0x65, 0x67, 0x61, 0x74, 0x65, 0x5f, 0x61, 0x6c, 0x6c, 0x18, 0x22, 0x20,
-	0x01, 0x28, 0x0b, 0x32, 0x36, 0x2e, 0x69, 0x6f, 0x2e, 0x64, 0x65, 0x65, 0x70, 0x68, 0x61, 0x76,
-	0x65, 0x6e, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x62, 0x61, 0x63, 0x6b, 0x70, 0x6c, 0x61,
-	0x6e, 0x65, 0x2e, 0x67, 0x72, 0x70, 0x63, 0x2e, 0x41, 0x67, 0x67, 0x72, 0x65, 0x67, 0x61, 0x74,
-	0x65, 0x41, 0x6c, 0x6c, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x48, 0x00, 0x52, 0x0c, 0x61,
-	0x67, 0x67, 0x72, 0x65, 0x67, 0x61, 0x74, 0x65, 0x41, 0x6c, 0x6c, 0x12, 0x53, 0x0a, 0x09, 0x61,
-	0x67, 0x67, 0x72, 0x65, 0x67, 0x61, 0x74, 0x65, 0x18, 0x23, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x33,
-	0x2e, 0x69, 0x6f, 0x2e, 0x64, 0x65, 0x65, 0x70, 0x68, 0x61, 0x76, 0x65, 0x6e, 0x2e, 0x70, 0x72,
-	0x6f, 0x74, 0x6f, 0x2e, 0x62, 0x61, 0x63, 0x6b, 0x70, 0x6c, 0x61, 0x6e, 0x65, 0x2e, 0x67, 0x72,
-	0x70, 0x63, 0x2e, 0x41, 0x67, 0x67, 0x72, 0x65, 0x67, 0x61, 0x74, 0x65, 0x52, 0x65, 0x71, 0x75,
-	0x65, 0x73, 0x74, 0x48, 0x00, 0x52, 0x09, 0x61, 0x67, 0x67, 0x72, 0x65, 0x67, 0x61, 0x74, 0x65,
-	0x12, 0x55, 0x0a, 0x08, 0x73, 0x6e, 0x61, 0x70, 0x73, 0x68, 0x6f, 0x74, 0x18, 0x24, 0x20, 0x01,
-	0x28, 0x0b, 0x32, 0x37, 0x2e, 0x69, 0x6f, 0x2e, 0x64, 0x65, 0x65, 0x70, 0x68, 0x61, 0x76, 0x65,
-	0x6e, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x62, 0x61, 0x63, 0x6b, 0x70, 0x6c, 0x61, 0x6e,
-	0x65, 0x2e, 0x67, 0x72, 0x70, 0x63, 0x2e, 0x53, 0x6e, 0x61, 0x70, 0x73, 0x68, 0x6f, 0x74, 0x54,
-	0x61, 0x62, 0x6c, 0x65, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x48, 0x00, 0x52, 0x08, 0x73,
-	0x6e, 0x61, 0x70, 0x73, 0x68, 0x6f, 0x74, 0x12, 0x62, 0x0a, 0x0d, 0x73, 0x6e, 0x61, 0x70, 0x73,
-	0x68, 0x6f, 0x74, 0x5f, 0x77, 0x68, 0x65, 0x6e, 0x18, 0x25, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x3b,
-	0x2e, 0x69, 0x6f, 0x2e, 0x64, 0x65, 0x65, 0x70, 0x68, 0x61, 0x76, 0x65, 0x6e, 0x2e, 0x70, 0x72,
-	0x6f, 0x74, 0x6f, 0x2e, 0x62, 0x61, 0x63, 0x6b, 0x70, 0x6c, 0x61, 0x6e, 0x65, 0x2e, 0x67, 0x72,
-	0x70, 0x63, 0x2e, 0x53, 0x6e, 0x61, 0x70, 0x73, 0x68, 0x6f, 0x74, 0x57, 0x68, 0x65, 0x6e, 0x54,
-	0x61, 0x62, 0x6c, 0x65, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x48, 0x00, 0x52, 0x0c, 0x73,
-	0x6e, 0x61, 0x70, 0x73, 0x68, 0x6f, 0x74, 0x57, 0x68, 0x65, 0x6e, 0x12, 0x54, 0x0a, 0x0a, 0x6d,
-	0x65, 0x74, 0x61, 0x5f, 0x74, 0x61, 0x62, 0x6c, 0x65, 0x18, 0x26, 0x20, 0x01, 0x28, 0x0b, 0x32,
-	0x33, 0x2e, 0x69, 0x6f, 0x2e, 0x64, 0x65, 0x65, 0x70, 0x68, 0x61, 0x76, 0x65, 0x6e, 0x2e, 0x70,
+	0x61, 0x6e, 0x65, 0x2e, 0x67, 0x72, 0x70, 0x63, 0x2e, 0x43, 0x6f, 0x6c, 0x75, 0x6d, 0x6e, 0x53,
+	0x74, 0x61, 0x74, 0x69, 0x73, 0x74, 0x69, 0x63, 0x73, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74,
+	0x48, 0x00, 0x52, 0x10, 0x63, 0x6f, 0x6c, 0x75, 0x6d, 0x6e, 0x53, 0x74, 0x61, 0x74, 0x69, 0x73,
+	0x74, 0x69, 0x63, 0x73, 0x12, 0x5a, 0x0a, 0x0a, 0x6d, 0x75, 0x6c, 0x74, 0x69, 0x5f, 0x6a, 0x6f,
+	0x69, 0x6e, 0x18, 0x2b, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x39, 0x2e, 0x69, 0x6f, 0x2e, 0x64, 0x65,
+	0x65, 0x70, 0x68, 0x61, 0x76, 0x65, 0x6e, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x62, 0x61,
+	0x63, 0x6b, 0x70, 0x6c, 0x61, 0x6e, 0x65, 0x2e, 0x67, 0x72, 0x70, 0x63, 0x2e, 0x4d, 0x75, 0x6c,
+	0x74, 0x69, 0x4a, 0x6f, 0x69, 0x6e, 0x54, 0x61, 0x62, 0x6c, 0x65, 0x73, 0x52, 0x65, 0x71, 0x75,
+	0x65, 0x73, 0x74, 0x48, 0x00, 0x52, 0x09, 0x6d, 0x75, 0x6c, 0x74, 0x69, 0x4a, 0x6f, 0x69, 0x6e,
+	0x12, 0x47, 0x0a, 0x05, 0x73, 0x6c, 0x69, 0x63, 0x65, 0x18, 0x2c, 0x20, 0x01, 0x28, 0x0b, 0x32,
+	0x2f, 0x2e, 0x69, 0x6f, 0x2e, 0x64, 0x65, 0x65, 0x70, 0x68, 0x61, 0x76, 0x65, 0x6e, 0x2e, 0x70,
 	0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x62, 0x61, 0x63, 0x6b, 0x70, 0x6c, 0x61, 0x6e, 0x65, 0x2e, 0x67,
-	0x72, 0x70, 0x63, 0x2e, 0x4d, 0x65, 0x74, 0x61, 0x54, 0x61, 0x62, 0x6c, 0x65, 0x52, 0x65, 0x71,
-	0x75, 0x65, 0x73, 0x74, 0x48, 0x00, 0x52, 0x09, 0x6d, 0x65, 0x74, 0x61, 0x54, 0x61, 0x62, 0x6c,
-	0x65, 0x12, 0x5a, 0x0a, 0x0a, 0x72, 0x61, 0x6e, 0x67, 0x65, 0x5f, 0x6a, 0x6f, 0x69, 0x6e, 0x18,
-	0x27, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x39, 0x2e, 0x69, 0x6f, 0x2e, 0x64, 0x65, 0x65, 0x70, 0x68,
-	0x61, 0x76, 0x65, 0x6e, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x62, 0x61, 0x63, 0x6b, 0x70,
-	0x6c, 0x61, 0x6e, 0x65, 0x2e, 0x67, 0x72, 0x70, 0x63, 0x2e, 0x52, 0x61, 0x6e, 0x67, 0x65, 0x4a,
-	0x6f, 0x69, 0x6e, 0x54, 0x61, 0x62, 0x6c, 0x65, 0x73, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74,
-	0x48, 0x00, 0x52, 0x09, 0x72, 0x61, 0x6e, 0x67, 0x65, 0x4a, 0x6f, 0x69, 0x6e, 0x12, 0x47, 0x0a,
-	0x02, 0x61, 0x6a, 0x18, 0x28, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x35, 0x2e, 0x69, 0x6f, 0x2e, 0x64,
-	0x65, 0x65, 0x70, 0x68, 0x61, 0x76, 0x65, 0x6e, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x62,
-	0x61, 0x63, 0x6b, 0x70, 0x6c, 0x61, 0x6e, 0x65, 0x2e, 0x67, 0x72, 0x70, 0x63, 0x2e, 0x41, 0x6a,
-	0x52, 0x61, 0x6a, 0x54, 0x61, 0x62, 0x6c, 0x65, 0x73, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74,
-	0x48, 0x00, 0x52, 0x02, 0x61, 0x6a, 0x12, 0x49, 0x0a, 0x03, 0x72, 0x61, 0x6a, 0x18, 0x29, 0x20,
-	0x01, 0x28, 0x0b, 0x32, 0x35, 0x2e, 0x69, 0x6f, 0x2e, 0x64, 0x65, 0x65, 0x70, 0x68, 0x61, 0x76,
+	0x72, 0x70, 0x63, 0x2e, 0x53, 0x6c, 0x69, 0x63, 0x65, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74,
+	0x48, 0x00, 0x52, 0x05, 0x73, 0x6c, 0x69, 0x63, 0x65, 0x42, 0x04, 0x0a, 0x02, 0x6f, 0x70, 0x4a,
+	0x04, 0x08, 0x14, 0x10, 0x15, 0x4a, 0x04, 0x08, 0x1d, 0x10, 0x1e, 0x2a, 0x62, 0x0a, 0x0f, 0x42,
+	0x61, 0x64, 0x44, 0x61, 0x74, 0x61, 0x42, 0x65, 0x68, 0x61, 0x76, 0x69, 0x6f, 0x72, 0x12, 0x23,
+	0x0a, 0x1f, 0x42, 0x41, 0x44, 0x5f, 0x44, 0x41, 0x54, 0x41, 0x5f, 0x42, 0x45, 0x48, 0x41, 0x56,
+	0x49, 0x4f, 0x52, 0x5f, 0x4e, 0x4f, 0x54, 0x5f, 0x53, 0x50, 0x45, 0x43, 0x49, 0x46, 0x49, 0x45,
+	0x44, 0x10, 0x00, 0x12, 0x09, 0x0a, 0x05, 0x54, 0x48, 0x52, 0x4f, 0x57, 0x10, 0x01, 0x12, 0x09,
+	0x0a, 0x05, 0x52, 0x45, 0x53, 0x45, 0x54, 0x10, 0x02, 0x12, 0x08, 0x0a, 0x04, 0x53, 0x4b, 0x49,
+	0x50, 0x10, 0x03, 0x12, 0x0a, 0x0a, 0x06, 0x50, 0x4f, 0x49, 0x53, 0x4f, 0x4e, 0x10, 0x04, 0x2a,
+	0x74, 0x0a, 0x14, 0x55, 0x70, 0x64, 0x61, 0x74, 0x65, 0x42, 0x79, 0x4e, 0x75, 0x6c, 0x6c, 0x42,
+	0x65, 0x68, 0x61, 0x76, 0x69, 0x6f, 0x72, 0x12, 0x1f, 0x0a, 0x1b, 0x4e, 0x55, 0x4c, 0x4c, 0x5f,
+	0x42, 0x45, 0x48, 0x41, 0x56, 0x49, 0x4f, 0x52, 0x5f, 0x4e, 0x4f, 0x54, 0x5f, 0x53, 0x50, 0x45,
+	0x43, 0x49, 0x46, 0x49, 0x45, 0x44, 0x10, 0x00, 0x12, 0x12, 0x0a, 0x0e, 0x4e, 0x55, 0x4c, 0x4c,
+	0x5f, 0x44, 0x4f, 0x4d, 0x49, 0x4e, 0x41, 0x54, 0x45, 0x53, 0x10, 0x01, 0x12, 0x13, 0x0a, 0x0f,
+	0x56, 0x41, 0x4c, 0x55, 0x45, 0x5f, 0x44, 0x4f, 0x4d, 0x49, 0x4e, 0x41, 0x54, 0x45, 0x53, 0x10,
+	0x02, 0x12, 0x12, 0x0a, 0x0e, 0x5a, 0x45, 0x52, 0x4f, 0x5f, 0x44, 0x4f, 0x4d, 0x49, 0x4e, 0x41,
+	0x54, 0x45, 0x53, 0x10, 0x03, 0x2a, 0x1b, 0x0a, 0x09, 0x4e, 0x75, 0x6c, 0x6c, 0x56, 0x61, 0x6c,
+	0x75, 0x65, 0x12, 0x0e, 0x0a, 0x0a, 0x4e, 0x55, 0x4c, 0x4c, 0x5f, 0x56, 0x41, 0x4c, 0x55, 0x45,
+	0x10, 0x00, 0x2a, 0x32, 0x0a, 0x0f, 0x43, 0x61, 0x73, 0x65, 0x53, 0x65, 0x6e, 0x73, 0x69, 0x74,
+	0x69, 0x76, 0x69, 0x74, 0x79, 0x12, 0x0e, 0x0a, 0x0a, 0x4d, 0x41, 0x54, 0x43, 0x48, 0x5f, 0x43,
+	0x41, 0x53, 0x45, 0x10, 0x00, 0x12, 0x0f, 0x0a, 0x0b, 0x49, 0x47, 0x4e, 0x4f, 0x52, 0x45, 0x5f,
+	0x43, 0x41, 0x53, 0x45, 0x10, 0x01, 0x2a, 0x26, 0x0a, 0x09, 0x4d, 0x61, 0x74, 0x63, 0x68, 0x54,
+	0x79, 0x70, 0x65, 0x12, 0x0b, 0x0a, 0x07, 0x52, 0x45, 0x47, 0x55, 0x4c, 0x41, 0x52, 0x10, 0x00,
+	0x12, 0x0c, 0x0a, 0x08, 0x49, 0x4e, 0x56, 0x45, 0x52, 0x54, 0x45, 0x44, 0x10, 0x01, 0x32, 0xb9,
+	0x32, 0x0a, 0x0c, 0x54, 0x61, 0x62, 0x6c, 0x65, 0x53, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x12,
+	0x91, 0x01, 0x0a, 0x20, 0x47, 0x65, 0x74, 0x45, 0x78, 0x70, 0x6f, 0x72, 0x74, 0x65, 0x64, 0x54,
+	0x61, 0x62, 0x6c, 0x65, 0x43, 0x72, 0x65, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x52, 0x65, 0x73, 0x70,
+	0x6f, 0x6e, 0x73, 0x65, 0x12, 0x29, 0x2e, 0x69, 0x6f, 0x2e, 0x64, 0x65, 0x65, 0x70, 0x68, 0x61,
+	0x76, 0x65, 0x6e, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x62, 0x61, 0x63, 0x6b, 0x70, 0x6c,
+	0x61, 0x6e, 0x65, 0x2e, 0x67, 0x72, 0x70, 0x63, 0x2e, 0x54, 0x69, 0x63, 0x6b, 0x65, 0x74, 0x1a,
+	0x40, 0x2e, 0x69, 0x6f, 0x2e, 0x64, 0x65, 0x65, 0x70, 0x68, 0x61, 0x76, 0x65, 0x6e, 0x2e, 0x70,
+	0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x62, 0x61, 0x63, 0x6b, 0x70, 0x6c, 0x61, 0x6e, 0x65, 0x2e, 0x67,
+	0x72, 0x70, 0x63, 0x2e, 0x45, 0x78, 0x70, 0x6f, 0x72, 0x74, 0x65, 0x64, 0x54, 0x61, 0x62, 0x6c,
+	0x65, 0x43, 0x72, 0x65, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73,
+	0x65, 0x22, 0x00, 0x12, 0x86, 0x01, 0x0a, 0x0a, 0x46, 0x65, 0x74, 0x63, 0x68, 0x54, 0x61, 0x62,
+	0x6c, 0x65, 0x12, 0x34, 0x2e, 0x69, 0x6f, 0x2e, 0x64, 0x65, 0x65, 0x70, 0x68, 0x61, 0x76, 0x65,
+	0x6e, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x62, 0x61, 0x63, 0x6b, 0x70, 0x6c, 0x61, 0x6e,
+	0x65, 0x2e, 0x67, 0x72, 0x70, 0x63, 0x2e, 0x46, 0x65, 0x74, 0x63, 0x68, 0x54, 0x61, 0x62, 0x6c,
+	0x65, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x40, 0x2e, 0x69, 0x6f, 0x2e, 0x64, 0x65,
+	0x65, 0x70, 0x68, 0x61, 0x76, 0x65, 0x6e, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x62, 0x61,
+	0x63, 0x6b, 0x70, 0x6c, 0x61, 0x6e, 0x65, 0x2e, 0x67, 0x72, 0x70, 0x63, 0x2e, 0x45, 0x78, 0x70,
+	0x6f, 0x72, 0x74, 0x65, 0x64, 0x54, 0x61, 0x62, 0x6c, 0x65, 0x43, 0x72, 0x65, 0x61, 0x74, 0x69,
+	0x6f, 0x6e, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x00, 0x12, 0x98, 0x01, 0x0a,
+	0x13, 0x41, 0x70, 0x70, 0x6c, 0x79, 0x50, 0x72, 0x65, 0x76, 0x69, 0x65, 0x77, 0x43, 0x6f, 0x6c,
+	0x75, 0x6d, 0x6e, 0x73, 0x12, 0x3d, 0x2e, 0x69, 0x6f, 0x2e, 0x64, 0x65, 0x65, 0x70, 0x68, 0x61,
+	0x76, 0x65, 0x6e, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x62, 0x61, 0x63, 0x6b, 0x70, 0x6c,
+	0x61, 0x6e, 0x65, 0x2e, 0x67, 0x72, 0x70, 0x63, 0x2e, 0x41, 0x70, 0x70, 0x6c, 0x79, 0x50, 0x72,
+	0x65, 0x76, 0x69, 0x65, 0x77, 0x43, 0x6f, 0x6c, 0x75, 0x6d, 0x6e, 0x73, 0x52, 0x65, 0x71, 0x75,
+	0x65, 0x73, 0x74, 0x1a, 0x40, 0x2e, 0x69, 0x6f, 0x2e, 0x64, 0x65, 0x65, 0x70, 0x68, 0x61, 0x76,
 	0x65, 0x6e, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x62, 0x61, 0x63, 0x6b, 0x70, 0x6c, 0x61,
-	0x6e, 0x65, 0x2e, 0x67, 0x72, 0x70, 0x63, 0x2e, 0x41, 0x6a, 0x52, 0x61, 0x6a, 0x54, 0x61, 0x62,
-	0x6c, 0x65, 0x73, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x48, 0x00, 0x52, 0x03, 0x72, 0x61,
-	0x6a, 0x12, 0x69, 0x0a, 0x11, 0x63, 0x6f, 0x6c, 0x75, 0x6d, 0x6e, 0x5f, 0x73, 0x74, 0x61, 0x74,
-	0x69, 0x73, 0x74, 0x69, 0x63, 0x73, 0x18, 0x2a, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x3a, 0x2e, 0x69,
+	0x6e, 0x65, 0x2e, 0x67, 0x72, 0x70, 0x63, 0x2e, 0x45, 0x78, 0x70, 0x6f, 0x72, 0x74, 0x65, 0x64,
+	0x54, 0x61, 0x62, 0x6c, 0x65, 0x43, 0x72, 0x65, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x52, 0x65, 0x73,
+	0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x00, 0x12, 0x86, 0x01, 0x0a, 0x0a, 0x45, 0x6d, 0x70, 0x74,
+	0x79, 0x54, 0x61, 0x62, 0x6c, 0x65, 0x12, 0x34, 0x2e, 0x69, 0x6f, 0x2e, 0x64, 0x65, 0x65, 0x70,
+	0x68, 0x61, 0x76, 0x65, 0x6e, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x62, 0x61, 0x63, 0x6b,
+	0x70, 0x6c, 0x61, 0x6e, 0x65, 0x2e, 0x67, 0x72, 0x70, 0x63, 0x2e, 0x45, 0x6d, 0x70, 0x74, 0x79,
+	0x54, 0x61, 0x62, 0x6c, 0x65, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x40, 0x2e, 0x69,
 	0x6f, 0x2e, 0x64, 0x65, 0x65, 0x70, 0x68, 0x61, 0x76, 0x65, 0x6e, 0x2e, 0x70, 0x72, 0x6f, 0x74,
 	0x6f, 0x2e, 0x62, 0x61, 0x63, 0x6b, 0x70, 0x6c, 0x61, 0x6e, 0x65, 0x2e, 0x67, 0x72, 0x70, 0x63,
-	0x2e, 0x43, 0x6f, 0x6c, 0x75, 0x6d, 0x6e, 0x53, 0x74, 0x61, 0x74, 0x69, 0x73, 0x74, 0x69, 0x63,
-	0x73, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x48, 0x00, 0x52, 0x10, 0x63, 0x6f, 0x6c, 0x75,
-	0x6d, 0x6e, 0x53, 0x74, 0x61, 0x74, 0x69, 0x73, 0x74, 0x69, 0x63, 0x73, 0x12, 0x5a, 0x0a, 0x0a,
-	0x6d, 0x75, 0x6c, 0x74, 0x69, 0x5f, 0x6a, 0x6f, 0x69, 0x6e, 0x18, 0x2b, 0x20, 0x01, 0x28, 0x0b,
-	0x32, 0x39, 0x2e, 0x69, 0x6f, 0x2e, 0x64, 0x65, 0x65, 0x70, 0x68, 0x61, 0x76, 0x65, 0x6e, 0x2e,
-	0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x62, 0x61, 0x63, 0x6b, 0x70, 0x6c, 0x61, 0x6e, 0x65, 0x2e,
-	0x67, 0x72, 0x70, 0x63, 0x2e, 0x4d, 0x75, 0x6c, 0x74, 0x69, 0x4a, 0x6f, 0x69, 0x6e, 0x54, 0x61,
-	0x62, 0x6c, 0x65, 0x73, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x48, 0x00, 0x52, 0x09, 0x6d,
-	0x75, 0x6c, 0x74, 0x69, 0x4a, 0x6f, 0x69, 0x6e, 0x42, 0x04, 0x0a, 0x02, 0x6f, 0x70, 0x4a, 0x04,
-	0x08, 0x14, 0x10, 0x15, 0x4a, 0x04, 0x08, 0x1d, 0x10, 0x1e, 0x2a, 0x62, 0x0a, 0x0f, 0x42, 0x61,
-	0x64, 0x44, 0x61, 0x74, 0x61, 0x42, 0x65, 0x68, 0x61, 0x76, 0x69, 0x6f, 0x72, 0x12, 0x23, 0x0a,
-	0x1f, 0x42, 0x41, 0x44, 0x5f, 0x44, 0x41, 0x54, 0x41, 0x5f, 0x42, 0x45, 0x48, 0x41, 0x56, 0x49,
-	0x4f, 0x52, 0x5f, 0x4e, 0x4f, 0x54, 0x5f, 0x53, 0x50, 0x45, 0x43, 0x49, 0x46, 0x49, 0x45, 0x44,
-	0x10, 0x00, 0x12, 0x09, 0x0a, 0x05, 0x54, 0x48, 0x52, 0x4f, 0x57, 0x10, 0x01, 0x12, 0x09, 0x0a,
-	0x05, 0x52, 0x45, 0x53, 0x45, 0x54, 0x10, 0x02, 0x12, 0x08, 0x0a, 0x04, 0x53, 0x4b, 0x49, 0x50,
-	0x10, 0x03, 0x12, 0x0a, 0x0a, 0x06, 0x50, 0x4f, 0x49, 0x53, 0x4f, 0x4e, 0x10, 0x04, 0x2a, 0x74,
-	0x0a, 0x14, 0x55, 0x70, 0x64, 0x61, 0x74, 0x65, 0x42, 0x79, 0x4e, 0x75, 0x6c, 0x6c, 0x42, 0x65,
-	0x68, 0x61, 0x76, 0x69, 0x6f, 0x72, 0x12, 0x1f, 0x0a, 0x1b, 0x4e, 0x55, 0x4c, 0x4c, 0x5f, 0x42,
-	0x45, 0x48, 0x41, 0x56, 0x49, 0x4f, 0x52, 0x5f, 0x4e, 0x4f, 0x54, 0x5f, 0x53, 0x50, 0x45, 0x43,
-	0x49, 0x46, 0x49, 0x45, 0x44, 0x10, 0x00, 0x12, 0x12, 0x0a, 0x0e, 0x4e, 0x55, 0x4c, 0x4c, 0x5f,
-	0x44, 0x4f, 0x4d, 0x49, 0x4e, 0x41, 0x54, 0x45, 0x53, 0x10, 0x01, 0x12, 0x13, 0x0a, 0x0f, 0x56,
-	0x41, 0x4c, 0x55, 0x45, 0x5f, 0x44, 0x4f, 0x4d, 0x49, 0x4e, 0x41, 0x54, 0x45, 0x53, 0x10, 0x02,
-	0x12, 0x12, 0x0a, 0x0e, 0x5a, 0x45, 0x52, 0x4f, 0x5f, 0x44, 0x4f, 0x4d, 0x49, 0x4e, 0x41, 0x54,
-	0x45, 0x53, 0x10, 0x03, 0x2a, 0x1b, 0x0a, 0x09, 0x4e, 0x75, 0x6c, 0x6c, 0x56, 0x61, 0x6c, 0x75,
-	0x65, 0x12, 0x0e, 0x0a, 0x0a, 0x4e, 0x55, 0x4c, 0x4c, 0x5f, 0x56, 0x41, 0x4c, 0x55, 0x45, 0x10,
-	0x00, 0x2a, 0x32, 0x0a, 0x0f, 0x43, 0x61, 0x73, 0x65, 0x53, 0x65, 0x6e, 0x73, 0x69, 0x74, 0x69,
-	0x76, 0x69, 0x74, 0x79, 0x12, 0x0e, 0x0a, 0x0a, 0x4d, 0x41, 0x54, 0x43, 0x48, 0x5f, 0x43, 0x41,
-	0x53, 0x45, 0x10, 0x00, 0x12, 0x0f, 0x0a, 0x0b, 0x49, 0x47, 0x4e, 0x4f, 0x52, 0x45, 0x5f, 0x43,
-	0x41, 0x53, 0x45, 0x10, 0x01, 0x2a, 0x26, 0x0a, 0x09, 0x4d, 0x61, 0x74, 0x63, 0x68, 0x54, 0x79,
-	0x70, 0x65, 0x12, 0x0b, 0x0a, 0x07, 0x52, 0x45, 0x47, 0x55, 0x4c, 0x41, 0x52, 0x10, 0x00, 0x12,
-	0x0c, 0x0a, 0x08, 0x49, 0x4e, 0x56, 0x45, 0x52, 0x54, 0x45, 0x44, 0x10, 0x01, 0x32, 0xbb, 0x31,
-	0x0a, 0x0c, 0x54, 0x61, 0x62, 0x6c, 0x65, 0x53, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x12, 0x91,
-	0x01, 0x0a, 0x20, 0x47, 0x65, 0x74, 0x45, 0x78, 0x70, 0x6f, 0x72, 0x74, 0x65, 0x64, 0x54, 0x61,
-	0x62, 0x6c, 0x65, 0x43, 0x72, 0x65, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x52, 0x65, 0x73, 0x70, 0x6f,
-	0x6e, 0x73, 0x65, 0x12, 0x29, 0x2e, 0x69, 0x6f, 0x2e, 0x64, 0x65, 0x65, 0x70, 0x68, 0x61, 0x76,
+	0x2e, 0x45, 0x78, 0x70, 0x6f, 0x72, 0x74, 0x65, 0x64, 0x54, 0x61, 0x62, 0x6c, 0x65, 0x43, 0x72,
+	0x65, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x00,
+	0x12, 0x84, 0x01, 0x0a, 0x09, 0x54, 0x69, 0x6d, 0x65, 0x54, 0x61, 0x62, 0x6c, 0x65, 0x12, 0x33,
+	0x2e, 0x69, 0x6f, 0x2e, 0x64, 0x65, 0x65, 0x70, 0x68, 0x61, 0x76, 0x65, 0x6e, 0x2e, 0x70, 0x72,
+	0x6f, 0x74, 0x6f, 0x2e, 0x62, 0x61, 0x63, 0x6b, 0x70, 0x6c, 0x61, 0x6e, 0x65, 0x2e, 0x67, 0x72,
+	0x70, 0x63, 0x2e, 0x54, 0x69, 0x6d, 0x65, 0x54, 0x61, 0x62, 0x6c, 0x65, 0x52, 0x65, 0x71, 0x75,
+	0x65, 0x73, 0x74, 0x1a, 0x40, 0x2e, 0x69, 0x6f, 0x2e, 0x64, 0x65, 0x65, 0x70, 0x68, 0x61, 0x76,
 	0x65, 0x6e, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x62, 0x61, 0x63, 0x6b, 0x70, 0x6c, 0x61,
-	0x6e, 0x65, 0x2e, 0x67, 0x72, 0x70, 0x63, 0x2e, 0x54, 0x69, 0x63, 0x6b, 0x65, 0x74, 0x1a, 0x40,
+	0x6e, 0x65, 0x2e, 0x67, 0x72, 0x70, 0x63, 0x2e, 0x45, 0x78, 0x70, 0x6f, 0x72, 0x74, 0x65, 0x64,
+	0x54, 0x61, 0x62, 0x6c, 0x65, 0x43, 0x72, 0x65, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x52, 0x65, 0x73,
+	0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x00, 0x12, 0x88, 0x01, 0x0a, 0x0b, 0x44, 0x72, 0x6f, 0x70,
+	0x43, 0x6f, 0x6c, 0x75, 0x6d, 0x6e, 0x73, 0x12, 0x35, 0x2e, 0x69, 0x6f, 0x2e, 0x64, 0x65, 0x65,
+	0x70, 0x68, 0x61, 0x76, 0x65, 0x6e, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x62, 0x61, 0x63,
+	0x6b, 0x70, 0x6c, 0x61, 0x6e, 0x65, 0x2e, 0x67, 0x72, 0x70, 0x63, 0x2e, 0x44, 0x72, 0x6f, 0x70,
+	0x43, 0x6f, 0x6c, 0x75, 0x6d, 0x6e, 0x73, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x40,
 	0x2e, 0x69, 0x6f, 0x2e, 0x64, 0x65, 0x65, 0x70, 0x68, 0x61, 0x76, 0x65, 0x6e, 0x2e, 0x70, 0x72,
 	0x6f, 0x74, 0x6f, 0x2e, 0x62, 0x61, 0x63, 0x6b, 0x70, 0x6c, 0x61, 0x6e, 0x65, 0x2e, 0x67, 0x72,
 	0x70, 0x63, 0x2e, 0x45, 0x78, 0x70, 0x6f, 0x72, 0x74, 0x65, 0x64, 0x54, 0x61, 0x62, 0x6c, 0x65,
 	0x43, 0x72, 0x65, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65,
-	0x22, 0x00, 0x12, 0x86, 0x01, 0x0a, 0x0a, 0x46, 0x65, 0x74, 0x63, 0x68, 0x54, 0x61, 0x62, 0x6c,
-	0x65, 0x12, 0x34, 0x2e, 0x69, 0x6f, 0x2e, 0x64, 0x65, 0x65, 0x70, 0x68, 0x61, 0x76, 0x65, 0x6e,
-	0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x62, 0x61, 0x63, 0x6b, 0x70, 0x6c, 0x61, 0x6e, 0x65,
-	0x2e, 0x67, 0x72, 0x70, 0x63, 0x2e, 0x46, 0x65, 0x74, 0x63, 0x68, 0x54, 0x61, 0x62, 0x6c, 0x65,
+	0x22, 0x00, 0x12, 0x86, 0x01, 0x0a, 0x06, 0x55, 0x70, 0x64, 0x61, 0x74, 0x65, 0x12, 0x38, 0x2e,
+	0x69, 0x6f, 0x2e, 0x64, 0x65, 0x65, 0x70, 0x68, 0x61, 0x76, 0x65, 0x6e, 0x2e, 0x70, 0x72, 0x6f,
+	0x74, 0x6f, 0x2e, 0x62, 0x61, 0x63, 0x6b, 0x70, 0x6c, 0x61, 0x6e, 0x65, 0x2e, 0x67, 0x72, 0x70,
+	0x63, 0x2e, 0x53, 0x65, 0x6c, 0x65, 0x63, 0x74, 0x4f, 0x72, 0x55, 0x70, 0x64, 0x61, 0x74, 0x65,
 	0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x40, 0x2e, 0x69, 0x6f, 0x2e, 0x64, 0x65, 0x65,
 	0x70, 0x68, 0x61, 0x76, 0x65, 0x6e, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x62, 0x61, 0x63,
 	0x6b, 0x70, 0x6c, 0x61, 0x6e, 0x65, 0x2e, 0x67, 0x72, 0x70, 0x63, 0x2e, 0x45, 0x78, 0x70, 0x6f,
 	0x72, 0x74, 0x65, 0x64, 0x54, 0x61, 0x62, 0x6c, 0x65, 0x43, 0x72, 0x65, 0x61, 0x74, 0x69, 0x6f,
-	0x6e, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x00, 0x12, 0x98, 0x01, 0x0a, 0x13,
-	0x41, 0x70, 0x70, 0x6c, 0x79, 0x50, 0x72, 0x65, 0x76, 0x69, 0x65, 0x77, 0x43, 0x6f, 0x6c, 0x75,
-	0x6d, 0x6e, 0x73, 0x12, 0x3d, 0x2e, 0x69, 0x6f, 0x2e, 0x64, 0x65, 0x65, 0x70, 0x68, 0x61, 0x76,
-	0x65, 0x6e, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x62, 0x61, 0x63, 0x6b, 0x70, 0x6c, 0x61,
-	0x6e, 0x65, 0x2e, 0x67, 0x72, 0x70, 0x63, 0x2e, 0x41, 0x70, 0x70, 0x6c, 0x79, 0x50, 0x72, 0x65,
-	0x76, 0x69, 0x65, 0x77, 0x43, 0x6f, 0x6c, 0x75, 0x6d, 0x6e, 0x73, 0x52, 0x65, 0x71, 0x75, 0x65,
-	0x73, 0x74, 0x1a, 0x40, 0x2e, 0x69, 0x6f, 0x2e, 0x64, 0x65, 0x65, 0x70, 0x68, 0x61, 0x76, 0x65,
-	0x6e, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x62, 0x61, 0x63, 0x6b, 0x70, 0x6c, 0x61, 0x6e,
-	0x65, 0x2e, 0x67, 0x72, 0x70, 0x63, 0x2e, 0x45, 0x78, 0x70, 0x6f, 0x72, 0x74, 0x65, 0x64, 0x54,
-	0x61, 0x62, 0x6c, 0x65, 0x43, 0x72, 0x65, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x52, 0x65, 0x73, 0x70,
-	0x6f, 0x6e, 0x73, 0x65, 0x22, 0x00, 0x12, 0x86, 0x01, 0x0a, 0x0a, 0x45, 0x6d, 0x70, 0x74, 0x79,
-	0x54, 0x61, 0x62, 0x6c, 0x65, 0x12, 0x34, 0x2e, 0x69, 0x6f, 0x2e, 0x64, 0x65, 0x65, 0x70, 0x68,
-	0x61, 0x76, 0x65, 0x6e, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x62, 0x61, 0x63, 0x6b, 0x70,
-	0x6c, 0x61, 0x6e, 0x65, 0x2e, 0x67, 0x72, 0x70, 0x63, 0x2e, 0x45, 0x6d, 0x70, 0x74, 0x79, 0x54,
-	0x61, 0x62, 0x6c, 0x65, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x40, 0x2e, 0x69, 0x6f,
+	0x6e, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x00, 0x12, 0x8a, 0x01, 0x0a, 0x0a,
+	0x4c, 0x61, 0x7a, 0x79, 0x55, 0x70, 0x64, 0x61, 0x74, 0x65, 0x12, 0x38, 0x2e, 0x69, 0x6f, 0x2e,
+	0x64, 0x65, 0x65, 0x70, 0x68, 0x61, 0x76, 0x65, 0x6e, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e,
+	0x62, 0x61, 0x63, 0x6b, 0x70, 0x6c, 0x61, 0x6e, 0x65, 0x2e, 0x67, 0x72, 0x70, 0x63, 0x2e, 0x53,
+	0x65, 0x6c, 0x65, 0x63, 0x74, 0x4f, 0x72, 0x55, 0x70, 0x64, 0x61, 0x74, 0x65, 0x52, 0x65, 0x71,
+	0x75, 0x65, 0x73, 0x74, 0x1a, 0x40, 0x2e, 0x69, 0x6f, 0x2e, 0x64, 0x65, 0x65, 0x70, 0x68, 0x61,
+	0x76, 0x65, 0x6e, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x62, 0x61, 0x63, 0x6b, 0x70, 0x6c,
+	0x61, 0x6e, 0x65, 0x2e, 0x67, 0x72, 0x70, 0x63, 0x2e, 0x45, 0x78, 0x70, 0x6f, 0x72, 0x74, 0x65,
+	0x64, 0x54, 0x61, 0x62, 0x6c, 0x65, 0x43, 0x72, 0x65, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x52, 0x65,
+	0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x00, 0x12, 0x84, 0x01, 0x0a, 0x04, 0x56, 0x69, 0x65,
+	0x77, 0x12, 0x38, 0x2e, 0x69, 0x6f, 0x2e, 0x64, 0x65, 0x65, 0x70, 0x68, 0x61, 0x76, 0x65, 0x6e,
+	0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x62, 0x61, 0x63, 0x6b, 0x70, 0x6c, 0x61, 0x6e, 0x65,
+	0x2e, 0x67, 0x72, 0x70, 0x63, 0x2e, 0x53, 0x65, 0x6c, 0x65, 0x63, 0x74, 0x4f, 0x72, 0x55, 0x70,
+	0x64, 0x61, 0x74, 0x65, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x40, 0x2e, 0x69, 0x6f,
 	0x2e, 0x64, 0x65, 0x65, 0x70, 0x68, 0x61, 0x76, 0x65, 0x6e, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f,
 	0x2e, 0x62, 0x61, 0x63, 0x6b, 0x70, 0x6c, 0x61, 0x6e, 0x65, 0x2e, 0x67, 0x72, 0x70, 0x63, 0x2e,
 	0x45, 0x78, 0x70, 0x6f, 0x72, 0x74, 0x65, 0x64, 0x54, 0x61, 0x62, 0x6c, 0x65, 0x43, 0x72, 0x65,
 	0x61, 0x74, 0x69, 0x6f, 0x6e, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x00, 0x12,
-	0x84, 0x01, 0x0a, 0x09, 0x54, 0x69, 0x6d, 0x65, 0x54, 0x61, 0x62, 0x6c, 0x65, 0x12, 0x33, 0x2e,
-	0x69, 0x6f, 0x2e, 0x64, 0x65, 0x65, 0x70, 0x68, 0x61, 0x76, 0x65, 0x6e, 0x2e, 0x70, 0x72, 0x6f,
-	0x74, 0x6f, 0x2e, 0x62, 0x61, 0x63, 0x6b, 0x70, 0x6c, 0x61, 0x6e, 0x65, 0x2e, 0x67, 0x72, 0x70,
-	0x63, 0x2e, 0x54, 0x69, 0x6d, 0x65, 0x54, 0x61, 0x62, 0x6c, 0x65, 0x52, 0x65, 0x71, 0x75, 0x65,
-	0x73, 0x74, 0x1a, 0x40, 0x2e, 0x69, 0x6f, 0x2e, 0x64, 0x65, 0x65, 0x70, 0x68, 0x61, 0x76, 0x65,
+	0x8a, 0x01, 0x0a, 0x0a, 0x55, 0x70, 0x64, 0x61, 0x74, 0x65, 0x56, 0x69, 0x65, 0x77, 0x12, 0x38,
+	0x2e, 0x69, 0x6f, 0x2e, 0x64, 0x65, 0x65, 0x70, 0x68, 0x61, 0x76, 0x65, 0x6e, 0x2e, 0x70, 0x72,
+	0x6f, 0x74, 0x6f, 0x2e, 0x62, 0x61, 0x63, 0x6b, 0x70, 0x6c, 0x61, 0x6e, 0x65, 0x2e, 0x67, 0x72,
+	0x70, 0x63, 0x2e, 0x53, 0x65, 0x6c, 0x65, 0x63, 0x74, 0x4f, 0x72, 0x55, 0x70, 0x64, 0x61, 0x74,
+	0x65, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x40, 0x2e, 0x69, 0x6f, 0x2e, 0x64, 0x65,
+	0x65, 0x70, 0x68, 0x61, 0x76, 0x65, 0x6e, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x62, 0x61,
+	0x63, 0x6b, 0x70, 0x6c, 0x61, 0x6e, 0x65, 0x2e, 0x67, 0x72, 0x70, 0x63, 0x2e, 0x45, 0x78, 0x70,
+	0x6f, 0x72, 0x74, 0x65, 0x64, 0x54, 0x61, 0x62, 0x6c, 0x65, 0x43, 0x72, 0x65, 0x61, 0x74, 0x69,
+	0x6f, 0x6e, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x00, 0x12, 0x86, 0x01, 0x0a,
+	0x06, 0x53, 0x65, 0x6c, 0x65, 0x63, 0x74, 0x12, 0x38, 0x2e, 0x69, 0x6f, 0x2e, 0x64, 0x65, 0x65,
+	0x70, 0x68, 0x61, 0x76, 0x65, 0x6e, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x62, 0x61, 0x63,
+	0x6b, 0x70, 0x6c, 0x61, 0x6e, 0x65, 0x2e, 0x67, 0x72, 0x70, 0x63, 0x2e, 0x53, 0x65, 0x6c, 0x65,
+	0x63, 0x74, 0x4f, 0x72, 0x55, 0x70, 0x64, 0x61, 0x74, 0x65, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73,
+	0x74, 0x1a, 0x40, 0x2e, 0x69, 0x6f, 0x2e, 0x64, 0x65, 0x65, 0x70, 0x68, 0x61, 0x76, 0x65, 0x6e,
+	0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x62, 0x61, 0x63, 0x6b, 0x70, 0x6c, 0x61, 0x6e, 0x65,
+	0x2e, 0x67, 0x72, 0x70, 0x63, 0x2e, 0x45, 0x78, 0x70, 0x6f, 0x72, 0x74, 0x65, 0x64, 0x54, 0x61,
+	0x62, 0x6c, 0x65, 0x43, 0x72, 0x65, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x52, 0x65, 0x73, 0x70, 0x6f,
+	0x6e, 0x73, 0x65, 0x22, 0x00, 0x12, 0x82, 0x01, 0x0a, 0x08, 0x55, 0x70, 0x64, 0x61, 0x74, 0x65,
+	0x42, 0x79, 0x12, 0x32, 0x2e, 0x69, 0x6f, 0x2e, 0x64, 0x65, 0x65, 0x70, 0x68, 0x61, 0x76, 0x65,
 	0x6e, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x62, 0x61, 0x63, 0x6b, 0x70, 0x6c, 0x61, 0x6e,
-	0x65, 0x2e, 0x67, 0x72, 0x70, 0x63, 0x2e, 0x45, 0x78, 0x70, 0x6f, 0x72, 0x74, 0x65, 0x64, 0x54,
-	0x61, 0x62, 0x6c, 0x65, 0x43, 0x72, 0x65, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x52, 0x65, 0x73, 0x70,
-	0x6f, 0x6e, 0x73, 0x65, 0x22, 0x00, 0x12, 0x88, 0x01, 0x0a, 0x0b, 0x44, 0x72, 0x6f, 0x70, 0x43,
-	0x6f, 0x6c, 0x75, 0x6d, 0x6e, 0x73, 0x12, 0x35, 0x2e, 0x69, 0x6f, 0x2e, 0x64, 0x65, 0x65, 0x70,
-	0x68, 0x61, 0x76, 0x65, 0x6e, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x62, 0x61, 0x63, 0x6b,
-	0x70, 0x6c, 0x61, 0x6e, 0x65, 0x2e, 0x67, 0x72, 0x70, 0x63, 0x2e, 0x44, 0x72, 0x6f, 0x70, 0x43,
-	0x6f, 0x6c, 0x75, 0x6d, 0x6e, 0x73, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x40, 0x2e,
-	0x69, 0x6f, 0x2e, 0x64, 0x65, 0x65, 0x70, 0x68, 0x61, 0x76, 0x65, 0x6e, 0x2e, 0x70, 0x72, 0x6f,
-	0x74, 0x6f, 0x2e, 0x62, 0x61, 0x63, 0x6b, 0x70, 0x6c, 0x61, 0x6e, 0x65, 0x2e, 0x67, 0x72, 0x70,
-	0x63, 0x2e, 0x45, 0x78, 0x70, 0x6f, 0x72, 0x74, 0x65, 0x64, 0x54, 0x61, 0x62, 0x6c, 0x65, 0x43,
-	0x72, 0x65, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22,
-	0x00, 0x12, 0x86, 0x01, 0x0a, 0x06, 0x55, 0x70, 0x64, 0x61, 0x74, 0x65, 0x12, 0x38, 0x2e, 0x69,
-	0x6f, 0x2e, 0x64, 0x65, 0x65, 0x70, 0x68, 0x61, 0x76, 0x65, 0x6e, 0x2e, 0x70, 0x72, 0x6f, 0x74,
-	0x6f, 0x2e, 0x62, 0x61, 0x63, 0x6b, 0x70, 0x6c, 0x61, 0x6e, 0x65, 0x2e, 0x67, 0x72, 0x70, 0x63,
-	0x2e, 0x53, 0x65, 0x6c, 0x65, 0x63, 0x74, 0x4f, 0x72, 0x55, 0x70, 0x64, 0x61, 0x74, 0x65, 0x52,
+	0x65, 0x2e, 0x67, 0x72, 0x70, 0x63, 0x2e, 0x55, 0x70, 0x64, 0x61, 0x74, 0x65, 0x42, 0x79, 0x52,
 	0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x40, 0x2e, 0x69, 0x6f, 0x2e, 0x64, 0x65, 0x65, 0x70,
 	0x68, 0x61, 0x76, 0x65, 0x6e, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x62, 0x61, 0x63, 0x6b,
 	0x70, 0x6c, 0x61, 0x6e, 0x65, 0x2e, 0x67, 0x72, 0x70, 0x63, 0x2e, 0x45, 0x78, 0x70, 0x6f, 0x72,
 	0x74, 0x65, 0x64, 0x54, 0x61, 0x62, 0x6c, 0x65, 0x43, 0x72, 0x65, 0x61, 0x74, 0x69, 0x6f, 0x6e,
-	0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x00, 0x12, 0x8a, 0x01, 0x0a, 0x0a, 0x4c,
-	0x61, 0x7a, 0x79, 0x55, 0x70, 0x64, 0x61, 0x74, 0x65, 0x12, 0x38, 0x2e, 0x69, 0x6f, 0x2e, 0x64,
-	0x65, 0x65, 0x70, 0x68, 0x61, 0x76, 0x65, 0x6e, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x62,
-	0x61, 0x63, 0x6b, 0x70, 0x6c, 0x61, 0x6e, 0x65, 0x2e, 0x67, 0x72, 0x70, 0x63, 0x2e, 0x53, 0x65,
-	0x6c, 0x65, 0x63, 0x74, 0x4f, 0x72, 0x55, 0x70, 0x64, 0x61, 0x74, 0x65, 0x52, 0x65, 0x71, 0x75,
-	0x65, 0x73, 0x74, 0x1a, 0x40, 0x2e, 0x69, 0x6f, 0x2e, 0x64, 0x65, 0x65, 0x70, 0x68, 0x61, 0x76,
-	0x65, 0x6e, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x62, 0x61, 0x63, 0x6b, 0x70, 0x6c, 0x61,
-	0x6e, 0x65, 0x2e, 0x67, 0x72, 0x70, 0x63, 0x2e, 0x45, 0x78, 0x70, 0x6f, 0x72, 0x74, 0x65, 0x64,
-	0x54, 0x61, 0x62, 0x6c, 0x65, 0x43, 0x72, 0x65, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x52, 0x65, 0x73,
-	0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x00, 0x12, 0x84, 0x01, 0x0a, 0x04, 0x56, 0x69, 0x65, 0x77,
-	0x12, 0x38, 0x2e, 0x69, 0x6f, 0x2e, 0x64, 0x65, 0x65, 0x70, 0x68, 0x61, 0x76, 0x65, 0x6e, 0x2e,
-	0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x62, 0x61, 0x63, 0x6b, 0x70, 0x6c, 0x61, 0x6e, 0x65, 0x2e,
-	0x67, 0x72, 0x70, 0x63, 0x2e, 0x53, 0x65, 0x6c, 0x65, 0x63, 0x74, 0x4f, 0x72, 0x55, 0x70, 0x64,
-	0x61, 0x74, 0x65, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x40, 0x2e, 0x69, 0x6f, 0x2e,
-	0x64, 0x65, 0x65, 0x70, 0x68, 0x61, 0x76, 0x65, 0x6e, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e,
-	0x62, 0x61, 0x63, 0x6b, 0x70, 0x6c, 0x61, 0x6e, 0x65, 0x2e, 0x67, 0x72, 0x70, 0x63, 0x2e, 0x45,
-	0x78, 0x70, 0x6f, 0x72, 0x74, 0x65, 0x64, 0x54, 0x61, 0x62, 0x6c, 0x65, 0x43, 0x72, 0x65, 0x61,
-	0x74, 0x69, 0x6f, 0x6e, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x00, 0x12, 0x8a,
-	0x01, 0x0a, 0x0a, 0x55, 0x70, 0x64, 0x61, 0x74, 0x65, 0x56, 0x69, 0x65, 0x77, 0x12, 0x38, 0x2e,
+	0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x00, 0x12, 0x8e, 0x01, 0x0a, 0x0e, 0x53,
+	0x65, 0x6c, 0x65, 0x63, 0x74, 0x44, 0x69, 0x73, 0x74, 0x69, 0x6e, 0x63, 0x74, 0x12, 0x38, 0x2e,
 	0x69, 0x6f, 0x2e, 0x64, 0x65, 0x65, 0x70, 0x68, 0x61, 0x76, 0x65, 0x6e, 0x2e, 0x70, 0x72, 0x6f,
 	0x74, 0x6f, 0x2e, 0x62, 0x61, 0x63, 0x6b, 0x70, 0x6c, 0x61, 0x6e, 0x65, 0x2e, 0x67, 0x72, 0x70,
-	0x63, 0x2e, 0x53, 0x65, 0x6c, 0x65, 0x63, 0x74, 0x4f, 0x72, 0x55, 0x70, 0x64, 0x61, 0x74, 0x65,
+	0x63, 0x2e, 0x53, 0x65, 0x6c, 0x65, 0x63, 0x74, 0x44, 0x69, 0x73, 0x74, 0x69, 0x6e, 0x63, 0x74,
 	0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x40, 0x2e, 0x69, 0x6f, 0x2e, 0x64, 0x65, 0x65,
 	0x70, 0x68, 0x61, 0x76, 0x65, 0x6e, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x62, 0x61, 0x63,
 	0x6b, 0x70, 0x6c, 0x61, 0x6e, 0x65, 0x2e, 0x67, 0x72, 0x70, 0x63, 0x2e, 0x45, 0x78, 0x70, 0x6f,
 	0x72, 0x74, 0x65, 0x64, 0x54, 0x61, 0x62, 0x6c, 0x65, 0x43, 0x72, 0x65, 0x61, 0x74, 0x69, 0x6f,
-	0x6e, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x00, 0x12, 0x86, 0x01, 0x0a, 0x06,
-	0x53, 0x65, 0x6c, 0x65, 0x63, 0x74, 0x12, 0x38, 0x2e, 0x69, 0x6f, 0x2e, 0x64, 0x65, 0x65, 0x70,
-	0x68, 0x61, 0x76, 0x65, 0x6e, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x62, 0x61, 0x63, 0x6b,
-	0x70, 0x6c, 0x61, 0x6e, 0x65, 0x2e, 0x67, 0x72, 0x70, 0x63, 0x2e, 0x53, 0x65, 0x6c, 0x65, 0x63,
-	0x74, 0x4f, 0x72, 0x55, 0x70, 0x64, 0x61, 0x74, 0x65, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74,
-	0x1a, 0x40, 0x2e, 0x69, 0x6f, 0x2e, 0x64, 0x65, 0x65, 0x70, 0x68, 0x61, 0x76, 0x65, 0x6e, 0x2e,
-	0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x62, 0x61, 0x63, 0x6b, 0x70, 0x6c, 0x61, 0x6e, 0x65, 0x2e,
-	0x67, 0x72, 0x70, 0x63, 0x2e, 0x45, 0x78, 0x70, 0x6f, 0x72, 0x74, 0x65, 0x64, 0x54, 0x61, 0x62,
-	0x6c, 0x65, 0x43, 0x72, 0x65, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e,
-	0x73, 0x65, 0x22, 0x00, 0x12, 0x82, 0x01, 0x0a, 0x08, 0x55, 0x70, 0x64, 0x61, 0x74, 0x65, 0x42,
-	0x79, 0x12, 0x32, 0x2e, 0x69, 0x6f, 0x2e, 0x64, 0x65, 0x65, 0x70, 0x68, 0x61, 0x76, 0x65, 0x6e,
-	0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x62, 0x61, 0x63, 0x6b, 0x70, 0x6c, 0x61, 0x6e, 0x65,
-	0x2e, 0x67, 0x72, 0x70, 0x63, 0x2e, 0x55, 0x70, 0x64, 0x61, 0x74, 0x65, 0x42, 0x79, 0x52, 0x65,
-	0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x40, 0x2e, 0x69, 0x6f, 0x2e, 0x64, 0x65, 0x65, 0x70, 0x68,
-	0x61, 0x76, 0x65, 0x6e, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x62, 0x61, 0x63, 0x6b, 0x70,
-	0x6c, 0x61, 0x6e, 0x65, 0x2e, 0x67, 0x72, 0x70, 0x63, 0x2e, 0x45, 0x78, 0x70, 0x6f, 0x72, 0x74,
-	0x65, 0x64, 0x54, 0x61, 0x62, 0x6c, 0x65, 0x43, 0x72, 0x65, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x52,
-	0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x00, 0x12, 0x8e, 0x01, 0x0a, 0x0e, 0x53, 0x65,
-	0x6c, 0x65, 0x63, 0x74, 0x44, 0x69, 0x73, 0x74, 0x69, 0x6e, 0x63, 0x74, 0x12, 0x38, 0x2e, 0x69,
-	0x6f, 0x2e, 0x64, 0x65, 0x65, 0x70, 0x68, 0x61, 0x76, 0x65, 0x6e, 0x2e, 0x70, 0x72, 0x6f, 0x74,
-	0x6f, 0x2e, 0x62, 0x61, 0x63, 0x6b, 0x70, 0x6c, 0x61, 0x6e, 0x65, 0x2e, 0x67, 0x72, 0x70, 0x63,
-	0x2e, 0x53, 0x65, 0x6c, 0x65, 0x63, 0x74, 0x44, 0x69, 0x73, 0x74, 0x69, 0x6e, 0x63, 0x74, 0x52,
-	0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x40, 0x2e, 0x69, 0x6f, 0x2e, 0x64, 0x65, 0x65, 0x70,
-	0x68, 0x61, 0x76, 0x65, 0x6e, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x62, 0x61, 0x63, 0x6b,
-	0x70, 0x6c, 0x61, 0x6e, 0x65, 0x2e, 0x67, 0x72, 0x70, 0x63, 0x2e, 0x45, 0x78, 0x70, 0x6f, 0x72,
-	0x74, 0x65, 0x64, 0x54, 0x61, 0x62, 0x6c, 0x65, 0x43, 0x72, 0x65, 0x61, 0x74, 0x69, 0x6f, 0x6e,
-	0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x00, 0x12, 0x83, 0x01, 0x0a, 0x06, 0x46,
-	0x69, 0x6c, 0x74, 0x65, 0x72, 0x12, 0x35, 0x2e, 0x69, 0x6f, 0x2e, 0x64, 0x65, 0x65, 0x70, 0x68,
-	0x61, 0x76, 0x65, 0x6e, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x62, 0x61, 0x63, 0x6b, 0x70,
-	0x6c, 0x61, 0x6e, 0x65, 0x2e, 0x67, 0x72, 0x70, 0x63, 0x2e, 0x46, 0x69, 0x6c, 0x74, 0x65, 0x72,
-	0x54, 0x61, 0x62, 0x6c, 0x65, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x40, 0x2e, 0x69,
-	0x6f, 0x2e, 0x64, 0x65, 0x65, 0x70, 0x68, 0x61, 0x76, 0x65, 0x6e, 0x2e, 0x70, 0x72, 0x6f, 0x74,
-	0x6f, 0x2e, 0x62, 0x61, 0x63, 0x6b, 0x70, 0x6c, 0x61, 0x6e, 0x65, 0x2e, 0x67, 0x72, 0x70, 0x63,
-	0x2e, 0x45, 0x78, 0x70, 0x6f, 0x72, 0x74, 0x65, 0x64, 0x54, 0x61, 0x62, 0x6c, 0x65, 0x43, 0x72,
-	0x65, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x00,
-	0x12, 0x9b, 0x01, 0x0a, 0x12, 0x55, 0x6e, 0x73, 0x74, 0x72, 0x75, 0x63, 0x74, 0x75, 0x72, 0x65,
-	0x64, 0x46, 0x69, 0x6c, 0x74, 0x65, 0x72, 0x12, 0x41, 0x2e, 0x69, 0x6f, 0x2e, 0x64, 0x65, 0x65,
-	0x70, 0x68, 0x61, 0x76, 0x65, 0x6e, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x62, 0x61, 0x63,
-	0x6b, 0x70, 0x6c, 0x61, 0x6e, 0x65, 0x2e, 0x67, 0x72, 0x70, 0x63, 0x2e, 0x55, 0x6e, 0x73, 0x74,
-	0x72, 0x75, 0x63, 0x74, 0x75, 0x72, 0x65, 0x64, 0x46, 0x69, 0x6c, 0x74, 0x65, 0x72, 0x54, 0x61,
-	0x62, 0x6c, 0x65, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x40, 0x2e, 0x69, 0x6f, 0x2e,
-	0x64, 0x65, 0x65, 0x70, 0x68, 0x61, 0x76, 0x65, 0x6e, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e,
-	0x62, 0x61, 0x63, 0x6b, 0x70, 0x6c, 0x61, 0x6e, 0x65, 0x2e, 0x67, 0x72, 0x70, 0x63, 0x2e, 0x45,
-	0x78, 0x70, 0x6f, 0x72, 0x74, 0x65, 0x64, 0x54, 0x61, 0x62, 0x6c, 0x65, 0x43, 0x72, 0x65, 0x61,
-	0x74, 0x69, 0x6f, 0x6e, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x00, 0x12, 0x7f,
-	0x0a, 0x04, 0x53, 0x6f, 0x72, 0x74, 0x12, 0x33, 0x2e, 0x69, 0x6f, 0x2e, 0x64, 0x65, 0x65, 0x70,
+	0x6e, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x00, 0x12, 0x83, 0x01, 0x0a, 0x06,
+	0x46, 0x69, 0x6c, 0x74, 0x65, 0x72, 0x12, 0x35, 0x2e, 0x69, 0x6f, 0x2e, 0x64, 0x65, 0x65, 0x70,
 	0x68, 0x61, 0x76, 0x65, 0x6e, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x62, 0x61, 0x63, 0x6b,
-	0x70, 0x6c, 0x61, 0x6e, 0x65, 0x2e, 0x67, 0x72, 0x70, 0x63, 0x2e, 0x53, 0x6f, 0x72, 0x74, 0x54,
+	0x70, 0x6c, 0x61, 0x6e, 0x65, 0x2e, 0x67, 0x72, 0x70, 0x63, 0x2e, 0x46, 0x69, 0x6c, 0x74, 0x65,
+	0x72, 0x54, 0x61, 0x62, 0x6c, 0x65, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x40, 0x2e,
+	0x69, 0x6f, 0x2e, 0x64, 0x65, 0x65, 0x70, 0x68, 0x61, 0x76, 0x65, 0x6e, 0x2e, 0x70, 0x72, 0x6f,
+	0x74, 0x6f, 0x2e, 0x62, 0x61, 0x63, 0x6b, 0x70, 0x6c, 0x61, 0x6e, 0x65, 0x2e, 0x67, 0x72, 0x70,
+	0x63, 0x2e, 0x45, 0x78, 0x70, 0x6f, 0x72, 0x74, 0x65, 0x64, 0x54, 0x61, 0x62, 0x6c, 0x65, 0x43,
+	0x72, 0x65, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22,
+	0x00, 0x12, 0x9b, 0x01, 0x0a, 0x12, 0x55, 0x6e, 0x73, 0x74, 0x72, 0x75, 0x63, 0x74, 0x75, 0x72,
+	0x65, 0x64, 0x46, 0x69, 0x6c, 0x74, 0x65, 0x72, 0x12, 0x41, 0x2e, 0x69, 0x6f, 0x2e, 0x64, 0x65,
+	0x65, 0x70, 0x68, 0x61, 0x76, 0x65, 0x6e, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x62, 0x61,
+	0x63, 0x6b, 0x70, 0x6c, 0x61, 0x6e, 0x65, 0x2e, 0x67, 0x72, 0x70, 0x63, 0x2e, 0x55, 0x6e, 0x73,
+	0x74, 0x72, 0x75, 0x63, 0x74, 0x75, 0x72, 0x65, 0x64, 0x46, 0x69, 0x6c, 0x74, 0x65, 0x72, 0x54,
 	0x61, 0x62, 0x6c, 0x65, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x40, 0x2e, 0x69, 0x6f,
 	0x2e, 0x64, 0x65, 0x65, 0x70, 0x68, 0x61, 0x76, 0x65, 0x6e, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f,
 	0x2e, 0x62, 0x61, 0x63, 0x6b, 0x70, 0x6c, 0x61, 0x6e, 0x65, 0x2e, 0x67, 0x72, 0x70, 0x63, 0x2e,
 	0x45, 0x78, 0x70, 0x6f, 0x72, 0x74, 0x65, 0x64, 0x54, 0x61, 0x62, 0x6c, 0x65, 0x43, 0x72, 0x65,
 	0x61, 0x74, 0x69, 0x6f, 0x6e, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x00, 0x12,
-	0x80, 0x01, 0x0a, 0x04, 0x48, 0x65, 0x61, 0x64, 0x12, 0x34, 0x2e, 0x69, 0x6f, 0x2e, 0x64, 0x65,
-	0x65, 0x70, 0x68, 0x61, 0x76, 0x65, 0x6e, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x62, 0x61,
-	0x63, 0x6b, 0x70, 0x6c, 0x61, 0x6e, 0x65, 0x2e, 0x67, 0x72, 0x70, 0x63, 0x2e, 0x48, 0x65, 0x61,
-	0x64, 0x4f, 0x72, 0x54, 0x61, 0x69, 0x6c, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x40,
-	0x2e, 0x69, 0x6f, 0x2e, 0x64, 0x65, 0x65, 0x70, 0x68, 0x61, 0x76, 0x65, 0x6e, 0x2e, 0x70, 0x72,
-	0x6f, 0x74, 0x6f, 0x2e, 0x62, 0x61, 0x63, 0x6b, 0x70, 0x6c, 0x61, 0x6e, 0x65, 0x2e, 0x67, 0x72,
-	0x70, 0x63, 0x2e, 0x45, 0x78, 0x70, 0x6f, 0x72, 0x74, 0x65, 0x64, 0x54, 0x61, 0x62, 0x6c, 0x65,
-	0x43, 0x72, 0x65, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65,
-	0x22, 0x00, 0x12, 0x80, 0x01, 0x0a, 0x04, 0x54, 0x61, 0x69, 0x6c, 0x12, 0x34, 0x2e, 0x69, 0x6f,
-	0x2e, 0x64, 0x65, 0x65, 0x70, 0x68, 0x61, 0x76, 0x65, 0x6e, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f,
-	0x2e, 0x62, 0x61, 0x63, 0x6b, 0x70, 0x6c, 0x61, 0x6e, 0x65, 0x2e, 0x67, 0x72, 0x70, 0x63, 0x2e,
-	0x48, 0x65, 0x61, 0x64, 0x4f, 0x72, 0x54, 0x61, 0x69, 0x6c, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73,
-	0x74, 0x1a, 0x40, 0x2e, 0x69, 0x6f, 0x2e, 0x64, 0x65, 0x65, 0x70, 0x68, 0x61, 0x76, 0x65, 0x6e,
-	0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x62, 0x61, 0x63, 0x6b, 0x70, 0x6c, 0x61, 0x6e, 0x65,
-	0x2e, 0x67, 0x72, 0x70, 0x63, 0x2e, 0x45, 0x78, 0x70, 0x6f, 0x72, 0x74, 0x65, 0x64, 0x54, 0x61,
-	0x62, 0x6c, 0x65, 0x43, 0x72, 0x65, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x52, 0x65, 0x73, 0x70, 0x6f,
-	0x6e, 0x73, 0x65, 0x22, 0x00, 0x12, 0x84, 0x01, 0x0a, 0x06, 0x48, 0x65, 0x61, 0x64, 0x42, 0x79,
-	0x12, 0x36, 0x2e, 0x69, 0x6f, 0x2e, 0x64, 0x65, 0x65, 0x70, 0x68, 0x61, 0x76, 0x65, 0x6e, 0x2e,
-	0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x62, 0x61, 0x63, 0x6b, 0x70, 0x6c, 0x61, 0x6e, 0x65, 0x2e,
-	0x67, 0x72, 0x70, 0x63, 0x2e, 0x48, 0x65, 0x61, 0x64, 0x4f, 0x72, 0x54, 0x61, 0x69, 0x6c, 0x42,
-	0x79, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x40, 0x2e, 0x69, 0x6f, 0x2e, 0x64, 0x65,
-	0x65, 0x70, 0x68, 0x61, 0x76, 0x65, 0x6e, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x62, 0x61,
-	0x63, 0x6b, 0x70, 0x6c, 0x61, 0x6e, 0x65, 0x2e, 0x67, 0x72, 0x70, 0x63, 0x2e, 0x45, 0x78, 0x70,
-	0x6f, 0x72, 0x74, 0x65, 0x64, 0x54, 0x61, 0x62, 0x6c, 0x65, 0x43, 0x72, 0x65, 0x61, 0x74, 0x69,
-	0x6f, 0x6e, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x00, 0x12, 0x84, 0x01, 0x0a,
-	0x06, 0x54, 0x61, 0x69, 0x6c, 0x42, 0x79, 0x12, 0x36, 0x2e, 0x69, 0x6f, 0x2e, 0x64, 0x65, 0x65,
+	0x7f, 0x0a, 0x04, 0x53, 0x6f, 0x72, 0x74, 0x12, 0x33, 0x2e, 0x69, 0x6f, 0x2e, 0x64, 0x65, 0x65,
 	0x70, 0x68, 0x61, 0x76, 0x65, 0x6e, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x62, 0x61, 0x63,
-	0x6b, 0x70, 0x6c, 0x61, 0x6e, 0x65, 0x2e, 0x67, 0x72, 0x70, 0x63, 0x2e, 0x48, 0x65, 0x61, 0x64,
-	0x4f, 0x72, 0x54, 0x61, 0x69, 0x6c, 0x42, 0x79, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a,
+	0x6b, 0x70, 0x6c, 0x61, 0x6e, 0x65, 0x2e, 0x67, 0x72, 0x70, 0x63, 0x2e, 0x53, 0x6f, 0x72, 0x74,
+	0x54, 0x61, 0x62, 0x6c, 0x65, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x40, 0x2e, 0x69,
+	0x6f, 0x2e, 0x64, 0x65, 0x65, 0x70, 0x68, 0x61, 0x76, 0x65, 0x6e, 0x2e, 0x70, 0x72, 0x6f, 0x74,
+	0x6f, 0x2e, 0x62, 0x61, 0x63, 0x6b, 0x70, 0x6c, 0x61, 0x6e, 0x65, 0x2e, 0x67, 0x72, 0x70, 0x63,
+	0x2e, 0x45, 0x78, 0x70, 0x6f, 0x72, 0x74, 0x65, 0x64, 0x54, 0x61, 0x62, 0x6c, 0x65, 0x43, 0x72,
+	0x65, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x00,
+	0x12, 0x80, 0x01, 0x0a, 0x04, 0x48, 0x65, 0x61, 0x64, 0x12, 0x34, 0x2e, 0x69, 0x6f, 0x2e, 0x64,
+	0x65, 0x65, 0x70, 0x68, 0x61, 0x76, 0x65, 0x6e, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x62,
+	0x61, 0x63, 0x6b, 0x70, 0x6c, 0x61, 0x6e, 0x65, 0x2e, 0x67, 0x72, 0x70, 0x63, 0x2e, 0x48, 0x65,
+	0x61, 0x64, 0x4f, 0x72, 0x54, 0x61, 0x69, 0x6c, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a,
 	0x40, 0x2e, 0x69, 0x6f, 0x2e, 0x64, 0x65, 0x65, 0x70, 0x68, 0x61, 0x76, 0x65, 0x6e, 0x2e, 0x70,
 	0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x62, 0x61, 0x63, 0x6b, 0x70, 0x6c, 0x61, 0x6e, 0x65, 0x2e, 0x67,
 	0x72, 0x70, 0x63, 0x2e, 0x45, 0x78, 0x70, 0x6f, 0x72, 0x74, 0x65, 0x64, 0x54, 0x61, 0x62, 0x6c,
 	0x65, 0x43, 0x72, 0x65, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73,
-	0x65, 0x22, 0x00, 0x12, 0x80, 0x01, 0x0a, 0x07, 0x55, 0x6e, 0x67, 0x72, 0x6f, 0x75, 0x70, 0x12,
-	0x31, 0x2e, 0x69, 0x6f, 0x2e, 0x64, 0x65, 0x65, 0x70, 0x68, 0x61, 0x76, 0x65, 0x6e, 0x2e, 0x70,
-	0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x62, 0x61, 0x63, 0x6b, 0x70, 0x6c, 0x61, 0x6e, 0x65, 0x2e, 0x67,
-	0x72, 0x70, 0x63, 0x2e, 0x55, 0x6e, 0x67, 0x72, 0x6f, 0x75, 0x70, 0x52, 0x65, 0x71, 0x75, 0x65,
+	0x65, 0x22, 0x00, 0x12, 0x80, 0x01, 0x0a, 0x04, 0x54, 0x61, 0x69, 0x6c, 0x12, 0x34, 0x2e, 0x69,
+	0x6f, 0x2e, 0x64, 0x65, 0x65, 0x70, 0x68, 0x61, 0x76, 0x65, 0x6e, 0x2e, 0x70, 0x72, 0x6f, 0x74,
+	0x6f, 0x2e, 0x62, 0x61, 0x63, 0x6b, 0x70, 0x6c, 0x61, 0x6e, 0x65, 0x2e, 0x67, 0x72, 0x70, 0x63,
+	0x2e, 0x48, 0x65, 0x61, 0x64, 0x4f, 0x72, 0x54, 0x61, 0x69, 0x6c, 0x52, 0x65, 0x71, 0x75, 0x65,
 	0x73, 0x74, 0x1a, 0x40, 0x2e, 0x69, 0x6f, 0x2e, 0x64, 0x65, 0x65, 0x70, 0x68, 0x61, 0x76, 0x65,
 	0x6e, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x62, 0x61, 0x63, 0x6b, 0x70, 0x6c, 0x61, 0x6e,
 	0x65, 0x2e, 0x67, 0x72, 0x70, 0x63, 0x2e, 0x45, 0x78, 0x70, 0x6f, 0x72, 0x74, 0x65, 0x64, 0x54,
 	0x61, 0x62, 0x6c, 0x65, 0x43, 0x72, 0x65, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x52, 0x65, 0x73, 0x70,
-	0x6f, 0x6e, 0x73, 0x65, 0x22, 0x00, 0x12, 0x88, 0x01, 0x0a, 0x0b, 0x4d, 0x65, 0x72, 0x67, 0x65,
-	0x54, 0x61, 0x62, 0x6c, 0x65, 0x73, 0x12, 0x35, 0x2e, 0x69, 0x6f, 0x2e, 0x64, 0x65, 0x65, 0x70,
-	0x68, 0x61, 0x76, 0x65, 0x6e, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x62, 0x61, 0x63, 0x6b,
-	0x70, 0x6c, 0x61, 0x6e, 0x65, 0x2e, 0x67, 0x72, 0x70, 0x63, 0x2e, 0x4d, 0x65, 0x72, 0x67, 0x65,
-	0x54, 0x61, 0x62, 0x6c, 0x65, 0x73, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x40, 0x2e,
-	0x69, 0x6f, 0x2e, 0x64, 0x65, 0x65, 0x70, 0x68, 0x61, 0x76, 0x65, 0x6e, 0x2e, 0x70, 0x72, 0x6f,
-	0x74, 0x6f, 0x2e, 0x62, 0x61, 0x63, 0x6b, 0x70, 0x6c, 0x61, 0x6e, 0x65, 0x2e, 0x67, 0x72, 0x70,
-	0x63, 0x2e, 0x45, 0x78, 0x70, 0x6f, 0x72, 0x74, 0x65, 0x64, 0x54, 0x61, 0x62, 0x6c, 0x65, 0x43,
-	0x72, 0x65, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22,
-	0x00, 0x12, 0x90, 0x01, 0x0a, 0x0f, 0x43, 0x72, 0x6f, 0x73, 0x73, 0x4a, 0x6f, 0x69, 0x6e, 0x54,
-	0x61, 0x62, 0x6c, 0x65, 0x73, 0x12, 0x39, 0x2e, 0x69, 0x6f, 0x2e, 0x64, 0x65, 0x65, 0x70, 0x68,
-	0x61, 0x76, 0x65, 0x6e, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x62, 0x61, 0x63, 0x6b, 0x70,
-	0x6c, 0x61, 0x6e, 0x65, 0x2e, 0x67, 0x72, 0x70, 0x63, 0x2e, 0x43, 0x72, 0x6f, 0x73, 0x73, 0x4a,
-	0x6f, 0x69, 0x6e, 0x54, 0x61, 0x62, 0x6c, 0x65, 0x73, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74,
+	0x6f, 0x6e, 0x73, 0x65, 0x22, 0x00, 0x12, 0x84, 0x01, 0x0a, 0x06, 0x48, 0x65, 0x61, 0x64, 0x42,
+	0x79, 0x12, 0x36, 0x2e, 0x69, 0x6f, 0x2e, 0x64, 0x65, 0x65, 0x70, 0x68, 0x61, 0x76, 0x65, 0x6e,
+	0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x62, 0x61, 0x63, 0x6b, 0x70, 0x6c, 0x61, 0x6e, 0x65,
+	0x2e, 0x67, 0x72, 0x70, 0x63, 0x2e, 0x48, 0x65, 0x61, 0x64, 0x4f, 0x72, 0x54, 0x61, 0x69, 0x6c,
+	0x42, 0x79, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x40, 0x2e, 0x69, 0x6f, 0x2e, 0x64,
+	0x65, 0x65, 0x70, 0x68, 0x61, 0x76, 0x65, 0x6e, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x62,
+	0x61, 0x63, 0x6b, 0x70, 0x6c, 0x61, 0x6e, 0x65, 0x2e, 0x67, 0x72, 0x70, 0x63, 0x2e, 0x45, 0x78,
+	0x70, 0x6f, 0x72, 0x74, 0x65, 0x64, 0x54, 0x61, 0x62, 0x6c, 0x65, 0x43, 0x72, 0x65, 0x61, 0x74,
+	0x69, 0x6f, 0x6e, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x00, 0x12, 0x84, 0x01,
+	0x0a, 0x06, 0x54, 0x61, 0x69, 0x6c, 0x42, 0x79, 0x12, 0x36, 0x2e, 0x69, 0x6f, 0x2e, 0x64, 0x65,
+	0x65, 0x70, 0x68, 0x61, 0x76, 0x65, 0x6e, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x62, 0x61,
+	0x63, 0x6b, 0x70, 0x6c, 0x61, 0x6e, 0x65, 0x2e, 0x67, 0x72, 0x70, 0x63, 0x2e, 0x48, 0x65, 0x61,
+	0x64, 0x4f, 0x72, 0x54, 0x61, 0x69, 0x6c, 0x42, 0x79, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74,
 	0x1a, 0x40, 0x2e, 0x69, 0x6f, 0x2e, 0x64, 0x65, 0x65, 0x70, 0x68, 0x61, 0x76, 0x65, 0x6e, 0x2e,
 	0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x62, 0x61, 0x63, 0x6b, 0x70, 0x6c, 0x61, 0x6e, 0x65, 0x2e,
 	0x67, 0x72, 0x70, 0x63, 0x2e, 0x45, 0x78, 0x70, 0x6f, 0x72, 0x74, 0x65, 0x64, 0x54, 0x61, 0x62,
 	0x6c, 0x65, 0x43, 0x72, 0x65, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e,
-	0x73, 0x65, 0x22, 0x00, 0x12, 0x94, 0x01, 0x0a, 0x11, 0x4e, 0x61, 0x74, 0x75, 0x72, 0x61, 0x6c,
-	0x4a, 0x6f, 0x69, 0x6e, 0x54, 0x61, 0x62, 0x6c, 0x65, 0x73, 0x12, 0x3b, 0x2e, 0x69, 0x6f, 0x2e,
-	0x64, 0x65, 0x65, 0x70, 0x68, 0x61, 0x76, 0x65, 0x6e, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e,
-	0x62, 0x61, 0x63, 0x6b, 0x70, 0x6c, 0x61, 0x6e, 0x65, 0x2e, 0x67, 0x72, 0x70, 0x63, 0x2e, 0x4e,
-	0x61, 0x74, 0x75, 0x72, 0x61, 0x6c, 0x4a, 0x6f, 0x69, 0x6e, 0x54, 0x61, 0x62, 0x6c, 0x65, 0x73,
-	0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x40, 0x2e, 0x69, 0x6f, 0x2e, 0x64, 0x65, 0x65,
+	0x73, 0x65, 0x22, 0x00, 0x12, 0x80, 0x01, 0x0a, 0x07, 0x55, 0x6e, 0x67, 0x72, 0x6f, 0x75, 0x70,
+	0x12, 0x31, 0x2e, 0x69, 0x6f, 0x2e, 0x64, 0x65, 0x65, 0x70, 0x68, 0x61, 0x76, 0x65, 0x6e, 0x2e,
+	0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x62, 0x61, 0x63, 0x6b, 0x70, 0x6c, 0x61, 0x6e, 0x65, 0x2e,
+	0x67, 0x72, 0x70, 0x63, 0x2e, 0x55, 0x6e, 0x67, 0x72, 0x6f, 0x75, 0x70, 0x52, 0x65, 0x71, 0x75,
+	0x65, 0x73, 0x74, 0x1a, 0x40, 0x2e, 0x69, 0x6f, 0x2e, 0x64, 0x65, 0x65, 0x70, 0x68, 0x61, 0x76,
+	0x65, 0x6e, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x62, 0x61, 0x63, 0x6b, 0x70, 0x6c, 0x61,
+	0x6e, 0x65, 0x2e, 0x67, 0x72, 0x70, 0x63, 0x2e, 0x45, 0x78, 0x70, 0x6f, 0x72, 0x74, 0x65, 0x64,
+	0x54, 0x61, 0x62, 0x6c, 0x65, 0x43, 0x72, 0x65, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x52, 0x65, 0x73,
+	0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x00, 0x12, 0x88, 0x01, 0x0a, 0x0b, 0x4d, 0x65, 0x72, 0x67,
+	0x65, 0x54, 0x61, 0x62, 0x6c, 0x65, 0x73, 0x12, 0x35, 0x2e, 0x69, 0x6f, 0x2e, 0x64, 0x65, 0x65,
 	0x70, 0x68, 0x61, 0x76, 0x65, 0x6e, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x62, 0x61, 0x63,
-	0x6b, 0x70, 0x6c, 0x61, 0x6e, 0x65, 0x2e, 0x67, 0x72, 0x70, 0x63, 0x2e, 0x45, 0x78, 0x70, 0x6f,
-	0x72, 0x74, 0x65, 0x64, 0x54, 0x61, 0x62, 0x6c, 0x65, 0x43, 0x72, 0x65, 0x61, 0x74, 0x69, 0x6f,
-	0x6e, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x00, 0x12, 0x90, 0x01, 0x0a, 0x0f,
-	0x45, 0x78, 0x61, 0x63, 0x74, 0x4a, 0x6f, 0x69, 0x6e, 0x54, 0x61, 0x62, 0x6c, 0x65, 0x73, 0x12,
-	0x39, 0x2e, 0x69, 0x6f, 0x2e, 0x64, 0x65, 0x65, 0x70, 0x68, 0x61, 0x76, 0x65, 0x6e, 0x2e, 0x70,
-	0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x62, 0x61, 0x63, 0x6b, 0x70, 0x6c, 0x61, 0x6e, 0x65, 0x2e, 0x67,
-	0x72, 0x70, 0x63, 0x2e, 0x45, 0x78, 0x61, 0x63, 0x74, 0x4a, 0x6f, 0x69, 0x6e, 0x54, 0x61, 0x62,
-	0x6c, 0x65, 0x73, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x40, 0x2e, 0x69, 0x6f, 0x2e,
-	0x64, 0x65, 0x65, 0x70, 0x68, 0x61, 0x76, 0x65, 0x6e, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e,
-	0x62, 0x61, 0x63, 0x6b, 0x70, 0x6c, 0x61, 0x6e, 0x65, 0x2e, 0x67, 0x72, 0x70, 0x63, 0x2e, 0x45,
-	0x78, 0x70, 0x6f, 0x72, 0x74, 0x65, 0x64, 0x54, 0x61, 0x62, 0x6c, 0x65, 0x43, 0x72, 0x65, 0x61,
-	0x74, 0x69, 0x6f, 0x6e, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x00, 0x12, 0x8e,
-	0x01, 0x0a, 0x0e, 0x4c, 0x65, 0x66, 0x74, 0x4a, 0x6f, 0x69, 0x6e, 0x54, 0x61, 0x62, 0x6c, 0x65,
-	0x73, 0x12, 0x38, 0x2e, 0x69, 0x6f, 0x2e, 0x64, 0x65, 0x65, 0x70, 0x68, 0x61, 0x76, 0x65, 0x6e,
+	0x6b, 0x70, 0x6c, 0x61, 0x6e, 0x65, 0x2e, 0x67, 0x72, 0x70, 0x63, 0x2e, 0x4d, 0x65, 0x72, 0x67,
+	0x65, 0x54, 0x61, 0x62, 0x6c, 0x65, 0x73, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x40,
+	0x2e, 0x69, 0x6f, 0x2e, 0x64, 0x65, 0x65, 0x70, 0x68, 0x61, 0x76, 0x65, 0x6e, 0x2e, 0x70, 0x72,
+	0x6f, 0x74, 0x6f, 0x2e, 0x62, 0x61, 0x63, 0x6b, 0x70, 0x6c, 0x61, 0x6e, 0x65, 0x2e, 0x67, 0x72,
+	0x70, 0x63, 0x2e, 0x45, 0x78, 0x70, 0x6f, 0x72, 0x74, 0x65, 0x64, 0x54, 0x61, 0x62, 0x6c, 0x65,
+	0x43, 0x72, 0x65, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65,
+	0x22, 0x00, 0x12, 0x90, 0x01, 0x0a, 0x0f, 0x43, 0x72, 0x6f, 0x73, 0x73, 0x4a, 0x6f, 0x69, 0x6e,
+	0x54, 0x61, 0x62, 0x6c, 0x65, 0x73, 0x12, 0x39, 0x2e, 0x69, 0x6f, 0x2e, 0x64, 0x65, 0x65, 0x70,
+	0x68, 0x61, 0x76, 0x65, 0x6e, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x62, 0x61, 0x63, 0x6b,
+	0x70, 0x6c, 0x61, 0x6e, 0x65, 0x2e, 0x67, 0x72, 0x70, 0x63, 0x2e, 0x43, 0x72, 0x6f, 0x73, 0x73,
+	0x4a, 0x6f, 0x69, 0x6e, 0x54, 0x61, 0x62, 0x6c, 0x65, 0x73, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73,
+	0x74, 0x1a, 0x40, 0x2e, 0x69, 0x6f, 0x2e, 0x64, 0x65, 0x65, 0x70, 0x68, 0x61, 0x76, 0x65, 0x6e,
 	0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x62, 0x61, 0x63, 0x6b, 0x70, 0x6c, 0x61, 0x6e, 0x65,
-	0x2e, 0x67, 0x72, 0x70, 0x63, 0x2e, 0x4c, 0x65, 0x66, 0x74, 0x4a, 0x6f, 0x69, 0x6e, 0x54, 0x61,
+	0x2e, 0x67, 0x72, 0x70, 0x63, 0x2e, 0x45, 0x78, 0x70, 0x6f, 0x72, 0x74, 0x65, 0x64, 0x54, 0x61,
+	0x62, 0x6c, 0x65, 0x43, 0x72, 0x65, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x52, 0x65, 0x73, 0x70, 0x6f,
+	0x6e, 0x73, 0x65, 0x22, 0x00, 0x12, 0x94, 0x01, 0x0a, 0x11, 0x4e, 0x61, 0x74, 0x75, 0x72, 0x61,
+	0x6c, 0x4a, 0x6f, 0x69, 0x6e, 0x54, 0x61, 0x62, 0x6c, 0x65, 0x73, 0x12, 0x3b, 0x2e, 0x69, 0x6f,
+	0x2e, 0x64, 0x65, 0x65, 0x70, 0x68, 0x61, 0x76, 0x65, 0x6e, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f,
+	0x2e, 0x62, 0x61, 0x63, 0x6b, 0x70, 0x6c, 0x61, 0x6e, 0x65, 0x2e, 0x67, 0x72, 0x70, 0x63, 0x2e,
+	0x4e, 0x61, 0x74, 0x75, 0x72, 0x61, 0x6c, 0x4a, 0x6f, 0x69, 0x6e, 0x54, 0x61, 0x62, 0x6c, 0x65,
+	0x73, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x40, 0x2e, 0x69, 0x6f, 0x2e, 0x64, 0x65,
+	0x65, 0x70, 0x68, 0x61, 0x76, 0x65, 0x6e, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x62, 0x61,
+	0x63, 0x6b, 0x70, 0x6c, 0x61, 0x6e, 0x65, 0x2e, 0x67, 0x72, 0x70, 0x63, 0x2e, 0x45, 0x78, 0x70,
+	0x6f, 0x72, 0x74, 0x65, 0x64, 0x54, 0x61, 0x62, 0x6c, 0x65, 0x43, 0x72, 0x65, 0x61, 0x74, 0x69,
+	0x6f, 0x6e, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x00, 0x12, 0x90, 0x01, 0x0a,
+	0x0f, 0x45, 0x78, 0x61, 0x63, 0x74, 0x4a, 0x6f, 0x69, 0x6e, 0x54, 0x61, 0x62, 0x6c, 0x65, 0x73,
+	0x12, 0x39, 0x2e, 0x69, 0x6f, 0x2e, 0x64, 0x65, 0x65, 0x70, 0x68, 0x61, 0x76, 0x65, 0x6e, 0x2e,
+	0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x62, 0x61, 0x63, 0x6b, 0x70, 0x6c, 0x61, 0x6e, 0x65, 0x2e,
+	0x67, 0x72, 0x70, 0x63, 0x2e, 0x45, 0x78, 0x61, 0x63, 0x74, 0x4a, 0x6f, 0x69, 0x6e, 0x54, 0x61,
 	0x62, 0x6c, 0x65, 0x73, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x40, 0x2e, 0x69, 0x6f,
 	0x2e, 0x64, 0x65, 0x65, 0x70, 0x68, 0x61, 0x76, 0x65, 0x6e, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f,
 	0x2e, 0x62, 0x61, 0x63, 0x6b, 0x70, 0x6c, 0x61, 0x6e, 0x65, 0x2e, 0x67, 0x72, 0x70, 0x63, 0x2e,
 	0x45, 0x78, 0x70, 0x6f, 0x72, 0x74, 0x65, 0x64, 0x54, 0x61, 0x62, 0x6c, 0x65, 0x43, 0x72, 0x65,
 	0x61, 0x74, 0x69, 0x6f, 0x6e, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x00, 0x12,
-	0x91, 0x01, 0x0a, 0x0e, 0x41, 0x73, 0x4f, 0x66, 0x4a, 0x6f, 0x69, 0x6e, 0x54, 0x61, 0x62, 0x6c,
+	0x8e, 0x01, 0x0a, 0x0e, 0x4c, 0x65, 0x66, 0x74, 0x4a, 0x6f, 0x69, 0x6e, 0x54, 0x61, 0x62, 0x6c,
 	0x65, 0x73, 0x12, 0x38, 0x2e, 0x69, 0x6f, 0x2e, 0x64, 0x65, 0x65, 0x70, 0x68, 0x61, 0x76, 0x65,
 	0x6e, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x62, 0x61, 0x63, 0x6b, 0x70, 0x6c, 0x61, 0x6e,
-	0x65, 0x2e, 0x67, 0x72, 0x70, 0x63, 0x2e, 0x41, 0x73, 0x4f, 0x66, 0x4a, 0x6f, 0x69, 0x6e, 0x54,
+	0x65, 0x2e, 0x67, 0x72, 0x70, 0x63, 0x2e, 0x4c, 0x65, 0x66, 0x74, 0x4a, 0x6f, 0x69, 0x6e, 0x54,
 	0x61, 0x62, 0x6c, 0x65, 0x73, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x40, 0x2e, 0x69,
 	0x6f, 0x2e, 0x64, 0x65, 0x65, 0x70, 0x68, 0x61, 0x76, 0x65, 0x6e, 0x2e, 0x70, 0x72, 0x6f, 0x74,
 	0x6f, 0x2e, 0x62, 0x61, 0x63, 0x6b, 0x70, 0x6c, 0x61, 0x6e, 0x65, 0x2e, 0x67, 0x72, 0x70, 0x63,
 	0x2e, 0x45, 0x78, 0x70, 0x6f, 0x72, 0x74, 0x65, 0x64, 0x54, 0x61, 0x62, 0x6c, 0x65, 0x43, 0x72,
-	0x65, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x03,
-	0x88, 0x02, 0x01, 0x12, 0x85, 0x01, 0x0a, 0x08, 0x41, 0x6a, 0x54, 0x61, 0x62, 0x6c, 0x65, 0x73,
-	0x12, 0x35, 0x2e, 0x69, 0x6f, 0x2e, 0x64, 0x65, 0x65, 0x70, 0x68, 0x61, 0x76, 0x65, 0x6e, 0x2e,
-	0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x62, 0x61, 0x63, 0x6b, 0x70, 0x6c, 0x61, 0x6e, 0x65, 0x2e,
-	0x67, 0x72, 0x70, 0x63, 0x2e, 0x41, 0x6a, 0x52, 0x61, 0x6a, 0x54, 0x61, 0x62, 0x6c, 0x65, 0x73,
-	0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x40, 0x2e, 0x69, 0x6f, 0x2e, 0x64, 0x65, 0x65,
-	0x70, 0x68, 0x61, 0x76, 0x65, 0x6e, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x62, 0x61, 0x63,
-	0x6b, 0x70, 0x6c, 0x61, 0x6e, 0x65, 0x2e, 0x67, 0x72, 0x70, 0x63, 0x2e, 0x45, 0x78, 0x70, 0x6f,
-	0x72, 0x74, 0x65, 0x64, 0x54, 0x61, 0x62, 0x6c, 0x65, 0x43, 0x72, 0x65, 0x61, 0x74, 0x69, 0x6f,
-	0x6e, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x00, 0x12, 0x86, 0x01, 0x0a, 0x09,
-	0x52, 0x61, 0x6a, 0x54, 0x61, 0x62, 0x6c, 0x65, 0x73, 0x12, 0x35, 0x2e, 0x69, 0x6f, 0x2e, 0x64,
-	0x65, 0x65, 0x70, 0x68, 0x61, 0x76, 0x65, 0x6e, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x62,
-	0x61, 0x63, 0x6b, 0x70, 0x6c, 0x61, 0x6e, 0x65, 0x2e, 0x67, 0x72, 0x70, 0x63, 0x2e, 0x41, 0x6a,
-	0x52, 0x61, 0x6a, 0x54, 0x61, 0x62, 0x6c, 0x65, 0x73, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74,
-	0x1a, 0x40, 0x2e, 0x69, 0x6f, 0x2e, 0x64, 0x65, 0x65, 0x70, 0x68, 0x61, 0x76, 0x65, 0x6e, 0x2e,
-	0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x62, 0x61, 0x63, 0x6b, 0x70, 0x6c, 0x61, 0x6e, 0x65, 0x2e,
-	0x67, 0x72, 0x70, 0x63, 0x2e, 0x45, 0x78, 0x70, 0x6f, 0x72, 0x74, 0x65, 0x64, 0x54, 0x61, 0x62,
-	0x6c, 0x65, 0x43, 0x72, 0x65, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e,
-	0x73, 0x65, 0x22, 0x00, 0x12, 0x90, 0x01, 0x0a, 0x0f, 0x4d, 0x75, 0x6c, 0x74, 0x69, 0x4a, 0x6f,
-	0x69, 0x6e, 0x54, 0x61, 0x62, 0x6c, 0x65, 0x73, 0x12, 0x39, 0x2e, 0x69, 0x6f, 0x2e, 0x64, 0x65,
-	0x65, 0x70, 0x68, 0x61, 0x76, 0x65, 0x6e, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x62, 0x61,
-	0x63, 0x6b, 0x70, 0x6c, 0x61, 0x6e, 0x65, 0x2e, 0x67, 0x72, 0x70, 0x63, 0x2e, 0x4d, 0x75, 0x6c,
-	0x74, 0x69, 0x4a, 0x6f, 0x69, 0x6e, 0x54, 0x61, 0x62, 0x6c, 0x65, 0x73, 0x52, 0x65, 0x71, 0x75,
-	0x65, 0x73, 0x74, 0x1a, 0x40, 0x2e, 0x69, 0x6f, 0x2e, 0x64, 0x65, 0x65, 0x70, 0x68, 0x61, 0x76,
+	0x65, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x00,
+	0x12, 0x91, 0x01, 0x0a, 0x0e, 0x41, 0x73, 0x4f, 0x66, 0x4a, 0x6f, 0x69, 0x6e, 0x54, 0x61, 0x62,
+	0x6c, 0x65, 0x73, 0x12, 0x38, 0x2e, 0x69, 0x6f, 0x2e, 0x64, 0x65, 0x65, 0x70, 0x68, 0x61, 0x76,
 	0x65, 0x6e, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x62, 0x61, 0x63, 0x6b, 0x70, 0x6c, 0x61,
-	0x6e, 0x65, 0x2e, 0x67, 0x72, 0x70, 0x63, 0x2e, 0x45, 0x78, 0x70, 0x6f, 0x72, 0x74, 0x65, 0x64,
-	0x54, 0x61, 0x62, 0x6c, 0x65, 0x43, 0x72, 0x65, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x52, 0x65, 0x73,
-	0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x00, 0x12, 0x90, 0x01, 0x0a, 0x0f, 0x52, 0x61, 0x6e, 0x67,
-	0x65, 0x4a, 0x6f, 0x69, 0x6e, 0x54, 0x61, 0x62, 0x6c, 0x65, 0x73, 0x12, 0x39, 0x2e, 0x69, 0x6f,
-	0x2e, 0x64, 0x65, 0x65, 0x70, 0x68, 0x61, 0x76, 0x65, 0x6e, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f,
-	0x2e, 0x62, 0x61, 0x63, 0x6b, 0x70, 0x6c, 0x61, 0x6e, 0x65, 0x2e, 0x67, 0x72, 0x70, 0x63, 0x2e,
-	0x52, 0x61, 0x6e, 0x67, 0x65, 0x4a, 0x6f, 0x69, 0x6e, 0x54, 0x61, 0x62, 0x6c, 0x65, 0x73, 0x52,
-	0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x40, 0x2e, 0x69, 0x6f, 0x2e, 0x64, 0x65, 0x65, 0x70,
-	0x68, 0x61, 0x76, 0x65, 0x6e, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x62, 0x61, 0x63, 0x6b,
-	0x70, 0x6c, 0x61, 0x6e, 0x65, 0x2e, 0x67, 0x72, 0x70, 0x63, 0x2e, 0x45, 0x78, 0x70, 0x6f, 0x72,
-	0x74, 0x65, 0x64, 0x54, 0x61, 0x62, 0x6c, 0x65, 0x43, 0x72, 0x65, 0x61, 0x74, 0x69, 0x6f, 0x6e,
-	0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x00, 0x12, 0x91, 0x01, 0x0a, 0x0e, 0x43,
-	0x6f, 0x6d, 0x62, 0x6f, 0x41, 0x67, 0x67, 0x72, 0x65, 0x67, 0x61, 0x74, 0x65, 0x12, 0x38, 0x2e,
+	0x6e, 0x65, 0x2e, 0x67, 0x72, 0x70, 0x63, 0x2e, 0x41, 0x73, 0x4f, 0x66, 0x4a, 0x6f, 0x69, 0x6e,
+	0x54, 0x61, 0x62, 0x6c, 0x65, 0x73, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x40, 0x2e,
 	0x69, 0x6f, 0x2e, 0x64, 0x65, 0x65, 0x70, 0x68, 0x61, 0x76, 0x65, 0x6e, 0x2e, 0x70, 0x72, 0x6f,
 	0x74, 0x6f, 0x2e, 0x62, 0x61, 0x63, 0x6b, 0x70, 0x6c, 0x61, 0x6e, 0x65, 0x2e, 0x67, 0x72, 0x70,
-	0x63, 0x2e, 0x43, 0x6f, 0x6d, 0x62, 0x6f, 0x41, 0x67, 0x67, 0x72, 0x65, 0x67, 0x61, 0x74, 0x65,
-	0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x40, 0x2e, 0x69, 0x6f, 0x2e, 0x64, 0x65, 0x65,
-	0x70, 0x68, 0x61, 0x76, 0x65, 0x6e, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x62, 0x61, 0x63,
-	0x6b, 0x70, 0x6c, 0x61, 0x6e, 0x65, 0x2e, 0x67, 0x72, 0x70, 0x63, 0x2e, 0x45, 0x78, 0x70, 0x6f,
-	0x72, 0x74, 0x65, 0x64, 0x54, 0x61, 0x62, 0x6c, 0x65, 0x43, 0x72, 0x65, 0x61, 0x74, 0x69, 0x6f,
-	0x6e, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x03, 0x88, 0x02, 0x01, 0x12, 0x8a,
-	0x01, 0x0a, 0x0c, 0x41, 0x67, 0x67, 0x72, 0x65, 0x67, 0x61, 0x74, 0x65, 0x41, 0x6c, 0x6c, 0x12,
-	0x36, 0x2e, 0x69, 0x6f, 0x2e, 0x64, 0x65, 0x65, 0x70, 0x68, 0x61, 0x76, 0x65, 0x6e, 0x2e, 0x70,
-	0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x62, 0x61, 0x63, 0x6b, 0x70, 0x6c, 0x61, 0x6e, 0x65, 0x2e, 0x67,
-	0x72, 0x70, 0x63, 0x2e, 0x41, 0x67, 0x67, 0x72, 0x65, 0x67, 0x61, 0x74, 0x65, 0x41, 0x6c, 0x6c,
+	0x63, 0x2e, 0x45, 0x78, 0x70, 0x6f, 0x72, 0x74, 0x65, 0x64, 0x54, 0x61, 0x62, 0x6c, 0x65, 0x43,
+	0x72, 0x65, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22,
+	0x03, 0x88, 0x02, 0x01, 0x12, 0x85, 0x01, 0x0a, 0x08, 0x41, 0x6a, 0x54, 0x61, 0x62, 0x6c, 0x65,
+	0x73, 0x12, 0x35, 0x2e, 0x69, 0x6f, 0x2e, 0x64, 0x65, 0x65, 0x70, 0x68, 0x61, 0x76, 0x65, 0x6e,
+	0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x62, 0x61, 0x63, 0x6b, 0x70, 0x6c, 0x61, 0x6e, 0x65,
+	0x2e, 0x67, 0x72, 0x70, 0x63, 0x2e, 0x41, 0x6a, 0x52, 0x61, 0x6a, 0x54, 0x61, 0x62, 0x6c, 0x65,
+	0x73, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x40, 0x2e, 0x69, 0x6f, 0x2e, 0x64, 0x65,
+	0x65, 0x70, 0x68, 0x61, 0x76, 0x65, 0x6e, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x62, 0x61,
+	0x63, 0x6b, 0x70, 0x6c, 0x61, 0x6e, 0x65, 0x2e, 0x67, 0x72, 0x70, 0x63, 0x2e, 0x45, 0x78, 0x70,
+	0x6f, 0x72, 0x74, 0x65, 0x64, 0x54, 0x61, 0x62, 0x6c, 0x65, 0x43, 0x72, 0x65, 0x61, 0x74, 0x69,
+	0x6f, 0x6e, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x00, 0x12, 0x86, 0x01, 0x0a,
+	0x09, 0x52, 0x61, 0x6a, 0x54, 0x61, 0x62, 0x6c, 0x65, 0x73, 0x12, 0x35, 0x2e, 0x69, 0x6f, 0x2e,
+	0x64, 0x65, 0x65, 0x70, 0x68, 0x61, 0x76, 0x65, 0x6e, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e,
+	0x62, 0x61, 0x63, 0x6b, 0x70, 0x6c, 0x61, 0x6e, 0x65, 0x2e, 0x67, 0x72, 0x70, 0x63, 0x2e, 0x41,
+	0x6a, 0x52, 0x61, 0x6a, 0x54, 0x61, 0x62, 0x6c, 0x65, 0x73, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73,
+	0x74, 0x1a, 0x40, 0x2e, 0x69, 0x6f, 0x2e, 0x64, 0x65, 0x65, 0x70, 0x68, 0x61, 0x76, 0x65, 0x6e,
+	0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x62, 0x61, 0x63, 0x6b, 0x70, 0x6c, 0x61, 0x6e, 0x65,
+	0x2e, 0x67, 0x72, 0x70, 0x63, 0x2e, 0x45, 0x78, 0x70, 0x6f, 0x72, 0x74, 0x65, 0x64, 0x54, 0x61,
+	0x62, 0x6c, 0x65, 0x43, 0x72, 0x65, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x52, 0x65, 0x73, 0x70, 0x6f,
+	0x6e, 0x73, 0x65, 0x22, 0x00, 0x12, 0x90, 0x01, 0x0a, 0x0f, 0x4d, 0x75, 0x6c, 0x74, 0x69, 0x4a,
+	0x6f, 0x69, 0x6e, 0x54, 0x61, 0x62, 0x6c, 0x65, 0x73, 0x12, 0x39, 0x2e, 0x69, 0x6f, 0x2e, 0x64,
+	0x65, 0x65, 0x70, 0x68, 0x61, 0x76, 0x65, 0x6e, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x62,
+	0x61, 0x63, 0x6b, 0x70, 0x6c, 0x61, 0x6e, 0x65, 0x2e, 0x67, 0x72, 0x70, 0x63, 0x2e, 0x4d, 0x75,
+	0x6c, 0x74, 0x69, 0x4a, 0x6f, 0x69, 0x6e, 0x54, 0x61, 0x62, 0x6c, 0x65, 0x73, 0x52, 0x65, 0x71,
+	0x75, 0x65, 0x73, 0x74, 0x1a, 0x40, 0x2e, 0x69, 0x6f, 0x2e, 0x64, 0x65, 0x65, 0x70, 0x68, 0x61,
+	0x76, 0x65, 0x6e, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x62, 0x61, 0x63, 0x6b, 0x70, 0x6c,
+	0x61, 0x6e, 0x65, 0x2e, 0x67, 0x72, 0x70, 0x63, 0x2e, 0x45, 0x78, 0x70, 0x6f, 0x72, 0x74, 0x65,
+	0x64, 0x54, 0x61, 0x62, 0x6c, 0x65, 0x43, 0x72, 0x65, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x52, 0x65,
+	0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x00, 0x12, 0x90, 0x01, 0x0a, 0x0f, 0x52, 0x61, 0x6e,
+	0x67, 0x65, 0x4a, 0x6f, 0x69, 0x6e, 0x54, 0x61, 0x62, 0x6c, 0x65, 0x73, 0x12, 0x39, 0x2e, 0x69,
+	0x6f, 0x2e, 0x64, 0x65, 0x65, 0x70, 0x68, 0x61, 0x76, 0x65, 0x6e, 0x2e, 0x70, 0x72, 0x6f, 0x74,
+	0x6f, 0x2e, 0x62, 0x61, 0x63, 0x6b, 0x70, 0x6c, 0x61, 0x6e, 0x65, 0x2e, 0x67, 0x72, 0x70, 0x63,
+	0x2e, 0x52, 0x61, 0x6e, 0x67, 0x65, 0x4a, 0x6f, 0x69, 0x6e, 0x54, 0x61, 0x62, 0x6c, 0x65, 0x73,
 	0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x40, 0x2e, 0x69, 0x6f, 0x2e, 0x64, 0x65, 0x65,
 	0x70, 0x68, 0x61, 0x76, 0x65, 0x6e, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x62, 0x61, 0x63,
 	0x6b, 0x70, 0x6c, 0x61, 0x6e, 0x65, 0x2e, 0x67, 0x72, 0x70, 0x63, 0x2e, 0x45, 0x78, 0x70, 0x6f,
 	0x72, 0x74, 0x65, 0x64, 0x54, 0x61, 0x62, 0x6c, 0x65, 0x43, 0x72, 0x65, 0x61, 0x74, 0x69, 0x6f,
-	0x6e, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x00, 0x12, 0x84, 0x01, 0x0a, 0x09,
-	0x41, 0x67, 0x67, 0x72, 0x65, 0x67, 0x61, 0x74, 0x65, 0x12, 0x33, 0x2e, 0x69, 0x6f, 0x2e, 0x64,
-	0x65, 0x65, 0x70, 0x68, 0x61, 0x76, 0x65, 0x6e, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x62,
-	0x61, 0x63, 0x6b, 0x70, 0x6c, 0x61, 0x6e, 0x65, 0x2e, 0x67, 0x72, 0x70, 0x63, 0x2e, 0x41, 0x67,
-	0x67, 0x72, 0x65, 0x67, 0x61, 0x74, 0x65, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x40,
+	0x6e, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x00, 0x12, 0x91, 0x01, 0x0a, 0x0e,
+	0x43, 0x6f, 0x6d, 0x62, 0x6f, 0x41, 0x67, 0x67, 0x72, 0x65, 0x67, 0x61, 0x74, 0x65, 0x12, 0x38,
 	0x2e, 0x69, 0x6f, 0x2e, 0x64, 0x65, 0x65, 0x70, 0x68, 0x61, 0x76, 0x65, 0x6e, 0x2e, 0x70, 0x72,
 	0x6f, 0x74, 0x6f, 0x2e, 0x62, 0x61, 0x63, 0x6b, 0x70, 0x6c, 0x61, 0x6e, 0x65, 0x2e, 0x67, 0x72,
-	0x70, 0x63, 0x2e, 0x45, 0x78, 0x70, 0x6f, 0x72, 0x74, 0x65, 0x64, 0x54, 0x61, 0x62, 0x6c, 0x65,
-	0x43, 0x72, 0x65, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65,
-	0x22, 0x00, 0x12, 0x87, 0x01, 0x0a, 0x08, 0x53, 0x6e, 0x61, 0x70, 0x73, 0x68, 0x6f, 0x74, 0x12,
-	0x37, 0x2e, 0x69, 0x6f, 0x2e, 0x64, 0x65, 0x65, 0x70, 0x68, 0x61, 0x76, 0x65, 0x6e, 0x2e, 0x70,
-	0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x62, 0x61, 0x63, 0x6b, 0x70, 0x6c, 0x61, 0x6e, 0x65, 0x2e, 0x67,
-	0x72, 0x70, 0x63, 0x2e, 0x53, 0x6e, 0x61, 0x70, 0x73, 0x68, 0x6f, 0x74, 0x54, 0x61, 0x62, 0x6c,
+	0x70, 0x63, 0x2e, 0x43, 0x6f, 0x6d, 0x62, 0x6f, 0x41, 0x67, 0x67, 0x72, 0x65, 0x67, 0x61, 0x74,
 	0x65, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x40, 0x2e, 0x69, 0x6f, 0x2e, 0x64, 0x65,
 	0x65, 0x70, 0x68, 0x61, 0x76, 0x65, 0x6e, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x62, 0x61,
 	0x63, 0x6b, 0x70, 0x6c, 0x61, 0x6e, 0x65, 0x2e, 0x67, 0x72, 0x70, 0x63, 0x2e, 0x45, 0x78, 0x70,
 	0x6f, 0x72, 0x74, 0x65, 0x64, 0x54, 0x61, 0x62, 0x6c, 0x65, 0x43, 0x72, 0x65, 0x61, 0x74, 0x69,
-	0x6f, 0x6e, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x00, 0x12, 0x8f, 0x01, 0x0a,
-	0x0c, 0x53, 0x6e, 0x61, 0x70, 0x73, 0x68, 0x6f, 0x74, 0x57, 0x68, 0x65, 0x6e, 0x12, 0x3b, 0x2e,
-	0x69, 0x6f, 0x2e, 0x64, 0x65, 0x65, 0x70, 0x68, 0x61, 0x76, 0x65, 0x6e, 0x2e, 0x70, 0x72, 0x6f,
-	0x74, 0x6f, 0x2e, 0x62, 0x61, 0x63, 0x6b, 0x70, 0x6c, 0x61, 0x6e, 0x65, 0x2e, 0x67, 0x72, 0x70,
-	0x63, 0x2e, 0x53, 0x6e, 0x61, 0x70, 0x73, 0x68, 0x6f, 0x74, 0x57, 0x68, 0x65, 0x6e, 0x54, 0x61,
-	0x62, 0x6c, 0x65, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x40, 0x2e, 0x69, 0x6f, 0x2e,
-	0x64, 0x65, 0x65, 0x70, 0x68, 0x61, 0x76, 0x65, 0x6e, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e,
-	0x62, 0x61, 0x63, 0x6b, 0x70, 0x6c, 0x61, 0x6e, 0x65, 0x2e, 0x67, 0x72, 0x70, 0x63, 0x2e, 0x45,
-	0x78, 0x70, 0x6f, 0x72, 0x74, 0x65, 0x64, 0x54, 0x61, 0x62, 0x6c, 0x65, 0x43, 0x72, 0x65, 0x61,
-	0x74, 0x69, 0x6f, 0x6e, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x00, 0x12, 0x80,
-	0x01, 0x0a, 0x07, 0x46, 0x6c, 0x61, 0x74, 0x74, 0x65, 0x6e, 0x12, 0x31, 0x2e, 0x69, 0x6f, 0x2e,
-	0x64, 0x65, 0x65, 0x70, 0x68, 0x61, 0x76, 0x65, 0x6e, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e,
-	0x62, 0x61, 0x63, 0x6b, 0x70, 0x6c, 0x61, 0x6e, 0x65, 0x2e, 0x67, 0x72, 0x70, 0x63, 0x2e, 0x46,
-	0x6c, 0x61, 0x74, 0x74, 0x65, 0x6e, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x40, 0x2e,
-	0x69, 0x6f, 0x2e, 0x64, 0x65, 0x65, 0x70, 0x68, 0x61, 0x76, 0x65, 0x6e, 0x2e, 0x70, 0x72, 0x6f,
-	0x74, 0x6f, 0x2e, 0x62, 0x61, 0x63, 0x6b, 0x70, 0x6c, 0x61, 0x6e, 0x65, 0x2e, 0x67, 0x72, 0x70,
-	0x63, 0x2e, 0x45, 0x78, 0x70, 0x6f, 0x72, 0x74, 0x65, 0x64, 0x54, 0x61, 0x62, 0x6c, 0x65, 0x43,
-	0x72, 0x65, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22,
-	0x00, 0x12, 0x96, 0x01, 0x0a, 0x12, 0x52, 0x75, 0x6e, 0x43, 0x68, 0x61, 0x72, 0x74, 0x44, 0x6f,
-	0x77, 0x6e, 0x73, 0x61, 0x6d, 0x70, 0x6c, 0x65, 0x12, 0x3c, 0x2e, 0x69, 0x6f, 0x2e, 0x64, 0x65,
+	0x6f, 0x6e, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x03, 0x88, 0x02, 0x01, 0x12,
+	0x8a, 0x01, 0x0a, 0x0c, 0x41, 0x67, 0x67, 0x72, 0x65, 0x67, 0x61, 0x74, 0x65, 0x41, 0x6c, 0x6c,
+	0x12, 0x36, 0x2e, 0x69, 0x6f, 0x2e, 0x64, 0x65, 0x65, 0x70, 0x68, 0x61, 0x76, 0x65, 0x6e, 0x2e,
+	0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x62, 0x61, 0x63, 0x6b, 0x70, 0x6c, 0x61, 0x6e, 0x65, 0x2e,
+	0x67, 0x72, 0x70, 0x63, 0x2e, 0x41, 0x67, 0x67, 0x72, 0x65, 0x67, 0x61, 0x74, 0x65, 0x41, 0x6c,
+	0x6c, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x40, 0x2e, 0x69, 0x6f, 0x2e, 0x64, 0x65,
 	0x65, 0x70, 0x68, 0x61, 0x76, 0x65, 0x6e, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x62, 0x61,
-	0x63, 0x6b, 0x70, 0x6c, 0x61, 0x6e, 0x65, 0x2e, 0x67, 0x72, 0x70, 0x63, 0x2e, 0x52, 0x75, 0x6e,
-	0x43, 0x68, 0x61, 0x72, 0x74, 0x44, 0x6f, 0x77, 0x6e, 0x73, 0x61, 0x6d, 0x70, 0x6c, 0x65, 0x52,
-	0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x40, 0x2e, 0x69, 0x6f, 0x2e, 0x64, 0x65, 0x65, 0x70,
-	0x68, 0x61, 0x76, 0x65, 0x6e, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x62, 0x61, 0x63, 0x6b,
-	0x70, 0x6c, 0x61, 0x6e, 0x65, 0x2e, 0x67, 0x72, 0x70, 0x63, 0x2e, 0x45, 0x78, 0x70, 0x6f, 0x72,
-	0x74, 0x65, 0x64, 0x54, 0x61, 0x62, 0x6c, 0x65, 0x43, 0x72, 0x65, 0x61, 0x74, 0x69, 0x6f, 0x6e,
-	0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x00, 0x12, 0x92, 0x01, 0x0a, 0x10, 0x43,
-	0x72, 0x65, 0x61, 0x74, 0x65, 0x49, 0x6e, 0x70, 0x75, 0x74, 0x54, 0x61, 0x62, 0x6c, 0x65, 0x12,
-	0x3a, 0x2e, 0x69, 0x6f, 0x2e, 0x64, 0x65, 0x65, 0x70, 0x68, 0x61, 0x76, 0x65, 0x6e, 0x2e, 0x70,
+	0x63, 0x6b, 0x70, 0x6c, 0x61, 0x6e, 0x65, 0x2e, 0x67, 0x72, 0x70, 0x63, 0x2e, 0x45, 0x78, 0x70,
+	0x6f, 0x72, 0x74, 0x65, 0x64, 0x54, 0x61, 0x62, 0x6c, 0x65, 0x43, 0x72, 0x65, 0x61, 0x74, 0x69,
+	0x6f, 0x6e, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x00, 0x12, 0x84, 0x01, 0x0a,
+	0x09, 0x41, 0x67, 0x67, 0x72, 0x65, 0x67, 0x61, 0x74, 0x65, 0x12, 0x33, 0x2e, 0x69, 0x6f, 0x2e,
+	0x64, 0x65, 0x65, 0x70, 0x68, 0x61, 0x76, 0x65, 0x6e, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e,
+	0x62, 0x61, 0x63, 0x6b, 0x70, 0x6c, 0x61, 0x6e, 0x65, 0x2e, 0x67, 0x72, 0x70, 0x63, 0x2e, 0x41,
+	0x67, 0x67, 0x72, 0x65, 0x67, 0x61, 0x74, 0x65, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a,
+	0x40, 0x2e, 0x69, 0x6f, 0x2e, 0x64, 0x65, 0x65, 0x70, 0x68, 0x61, 0x76, 0x65, 0x6e, 0x2e, 0x70,
 	0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x62, 0x61, 0x63, 0x6b, 0x70, 0x6c, 0x61, 0x6e, 0x65, 0x2e, 0x67,
-	0x72, 0x70, 0x63, 0x2e, 0x43, 0x72, 0x65, 0x61, 0x74, 0x65, 0x49, 0x6e, 0x70, 0x75, 0x74, 0x54,
+	0x72, 0x70, 0x63, 0x2e, 0x45, 0x78, 0x70, 0x6f, 0x72, 0x74, 0x65, 0x64, 0x54, 0x61, 0x62, 0x6c,
+	0x65, 0x43, 0x72, 0x65, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73,
+	0x65, 0x22, 0x00, 0x12, 0x87, 0x01, 0x0a, 0x08, 0x53, 0x6e, 0x61, 0x70, 0x73, 0x68, 0x6f, 0x74,
+	0x12, 0x37, 0x2e, 0x69, 0x6f, 0x2e, 0x64, 0x65, 0x65, 0x70, 0x68, 0x61, 0x76, 0x65, 0x6e, 0x2e,
+	0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x62, 0x61, 0x63, 0x6b, 0x70, 0x6c, 0x61, 0x6e, 0x65, 0x2e,
+	0x67, 0x72, 0x70, 0x63, 0x2e, 0x53, 0x6e, 0x61, 0x70, 0x73, 0x68, 0x6f, 0x74, 0x54, 0x61, 0x62,
+	0x6c, 0x65, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x40, 0x2e, 0x69, 0x6f, 0x2e, 0x64,
+	0x65, 0x65, 0x70, 0x68, 0x61, 0x76, 0x65, 0x6e, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x62,
+	0x61, 0x63, 0x6b, 0x70, 0x6c, 0x61, 0x6e, 0x65, 0x2e, 0x67, 0x72, 0x70, 0x63, 0x2e, 0x45, 0x78,
+	0x70, 0x6f, 0x72, 0x74, 0x65, 0x64, 0x54, 0x61, 0x62, 0x6c, 0x65, 0x43, 0x72, 0x65, 0x61, 0x74,
+	0x69, 0x6f, 0x6e, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x00, 0x12, 0x8f, 0x01,
+	0x0a, 0x0c, 0x53, 0x6e, 0x61, 0x70, 0x73, 0x68, 0x6f, 0x74, 0x57, 0x68, 0x65, 0x6e, 0x12, 0x3b,
+	0x2e, 0x69, 0x6f, 0x2e, 0x64, 0x65, 0x65, 0x70, 0x68, 0x61, 0x76, 0x65, 0x6e, 0x2e, 0x70, 0x72,
+	0x6f, 0x74, 0x6f, 0x2e, 0x62, 0x61, 0x63, 0x6b, 0x70, 0x6c, 0x61, 0x6e, 0x65, 0x2e, 0x67, 0x72,
+	0x70, 0x63, 0x2e, 0x53, 0x6e, 0x61, 0x70, 0x73, 0x68, 0x6f, 0x74, 0x57, 0x68, 0x65, 0x6e, 0x54,
 	0x61, 0x62, 0x6c, 0x65, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x40, 0x2e, 0x69, 0x6f,
 	0x2e, 0x64, 0x65, 0x65, 0x70, 0x68, 0x61, 0x76, 0x65, 0x6e, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f,
 	0x2e, 0x62, 0x61, 0x63, 0x6b, 0x70, 0x6c, 0x61, 0x6e, 0x65, 0x2e, 0x67, 0x72, 0x70, 0x63, 0x2e,
 	0x45, 0x78, 0x70, 0x6f, 0x72, 0x74, 0x65, 0x64, 0x54, 0x61, 0x62, 0x6c, 0x65, 0x43, 0x72, 0x65,
 	0x61, 0x74, 0x69, 0x6f, 0x6e, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x00, 0x12,
-	0x80, 0x01, 0x0a, 0x07, 0x57, 0x68, 0x65, 0x72, 0x65, 0x49, 0x6e, 0x12, 0x31, 0x2e, 0x69, 0x6f,
+	0x80, 0x01, 0x0a, 0x07, 0x46, 0x6c, 0x61, 0x74, 0x74, 0x65, 0x6e, 0x12, 0x31, 0x2e, 0x69, 0x6f,
 	0x2e, 0x64, 0x65, 0x65, 0x70, 0x68, 0x61, 0x76, 0x65, 0x6e, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f,
 	0x2e, 0x62, 0x61, 0x63, 0x6b, 0x70, 0x6c, 0x61, 0x6e, 0x65, 0x2e, 0x67, 0x72, 0x70, 0x63, 0x2e,
-	0x57, 0x68, 0x65, 0x72, 0x65, 0x49, 0x6e, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x40,
+	0x46, 0x6c, 0x61, 0x74, 0x74, 0x65, 0x6e, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x40,
 	0x2e, 0x69, 0x6f, 0x2e, 0x64, 0x65, 0x65, 0x70, 0x68, 0x61, 0x76, 0x65, 0x6e, 0x2e, 0x70, 0x72,
 	0x6f, 0x74, 0x6f, 0x2e, 0x62, 0x61, 0x63, 0x6b, 0x70, 0x6c, 0x61, 0x6e, 0x65, 0x2e, 0x67, 0x72,
 	0x70, 0x63, 0x2e, 0x45, 0x78, 0x70, 0x6f, 0x72, 0x74, 0x65, 0x64, 0x54, 0x61, 0x62, 0x6c, 0x65,
 	0x43, 0x72, 0x65, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65,
-	0x22, 0x00, 0x12, 0x83, 0x01, 0x0a, 0x05, 0x42, 0x61, 0x74, 0x63, 0x68, 0x12, 0x34, 0x2e, 0x69,
+	0x22, 0x00, 0x12, 0x96, 0x01, 0x0a, 0x12, 0x52, 0x75, 0x6e, 0x43, 0x68, 0x61, 0x72, 0x74, 0x44,
+	0x6f, 0x77, 0x6e, 0x73, 0x61, 0x6d, 0x70, 0x6c, 0x65, 0x12, 0x3c, 0x2e, 0x69, 0x6f, 0x2e, 0x64,
+	0x65, 0x65, 0x70, 0x68, 0x61, 0x76, 0x65, 0x6e, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x62,
+	0x61, 0x63, 0x6b, 0x70, 0x6c, 0x61, 0x6e, 0x65, 0x2e, 0x67, 0x72, 0x70, 0x63, 0x2e, 0x52, 0x75,
+	0x6e, 0x43, 0x68, 0x61, 0x72, 0x74, 0x44, 0x6f, 0x77, 0x6e, 0x73, 0x61, 0x6d, 0x70, 0x6c, 0x65,
+	0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x40, 0x2e, 0x69, 0x6f, 0x2e, 0x64, 0x65, 0x65,
+	0x70, 0x68, 0x61, 0x76, 0x65, 0x6e, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x62, 0x61, 0x63,
+	0x6b, 0x70, 0x6c, 0x61, 0x6e, 0x65, 0x2e, 0x67, 0x72, 0x70, 0x63, 0x2e, 0x45, 0x78, 0x70, 0x6f,
+	0x72, 0x74, 0x65, 0x64, 0x54, 0x61, 0x62, 0x6c, 0x65, 0x43, 0x72, 0x65, 0x61, 0x74, 0x69, 0x6f,
+	0x6e, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x00, 0x12, 0x92, 0x01, 0x0a, 0x10,
+	0x43, 0x72, 0x65, 0x61, 0x74, 0x65, 0x49, 0x6e, 0x70, 0x75, 0x74, 0x54, 0x61, 0x62, 0x6c, 0x65,
+	0x12, 0x3a, 0x2e, 0x69, 0x6f, 0x2e, 0x64, 0x65, 0x65, 0x70, 0x68, 0x61, 0x76, 0x65, 0x6e, 0x2e,
+	0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x62, 0x61, 0x63, 0x6b, 0x70, 0x6c, 0x61, 0x6e, 0x65, 0x2e,
+	0x67, 0x72, 0x70, 0x63, 0x2e, 0x43, 0x72, 0x65, 0x61, 0x74, 0x65, 0x49, 0x6e, 0x70, 0x75, 0x74,
+	0x54, 0x61, 0x62, 0x6c, 0x65, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x40, 0x2e, 0x69,
 	0x6f, 0x2e, 0x64, 0x65, 0x65, 0x70, 0x68, 0x61, 0x76, 0x65, 0x6e, 0x2e, 0x70, 0x72, 0x6f, 0x74,
 	0x6f, 0x2e, 0x62, 0x61, 0x63, 0x6b, 0x70, 0x6c, 0x61, 0x6e, 0x65, 0x2e, 0x67, 0x72, 0x70, 0x63,
-	0x2e, 0x42, 0x61, 0x74, 0x63, 0x68, 0x54, 0x61, 0x62, 0x6c, 0x65, 0x52, 0x65, 0x71, 0x75, 0x65,
-	0x73, 0x74, 0x1a, 0x40, 0x2e, 0x69, 0x6f, 0x2e, 0x64, 0x65, 0x65, 0x70, 0x68, 0x61, 0x76, 0x65,
+	0x2e, 0x45, 0x78, 0x70, 0x6f, 0x72, 0x74, 0x65, 0x64, 0x54, 0x61, 0x62, 0x6c, 0x65, 0x43, 0x72,
+	0x65, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x00,
+	0x12, 0x80, 0x01, 0x0a, 0x07, 0x57, 0x68, 0x65, 0x72, 0x65, 0x49, 0x6e, 0x12, 0x31, 0x2e, 0x69,
+	0x6f, 0x2e, 0x64, 0x65, 0x65, 0x70, 0x68, 0x61, 0x76, 0x65, 0x6e, 0x2e, 0x70, 0x72, 0x6f, 0x74,
+	0x6f, 0x2e, 0x62, 0x61, 0x63, 0x6b, 0x70, 0x6c, 0x61, 0x6e, 0x65, 0x2e, 0x67, 0x72, 0x70, 0x63,
+	0x2e, 0x57, 0x68, 0x65, 0x72, 0x65, 0x49, 0x6e, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a,
+	0x40, 0x2e, 0x69, 0x6f, 0x2e, 0x64, 0x65, 0x65, 0x70, 0x68, 0x61, 0x76, 0x65, 0x6e, 0x2e, 0x70,
+	0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x62, 0x61, 0x63, 0x6b, 0x70, 0x6c, 0x61, 0x6e, 0x65, 0x2e, 0x67,
+	0x72, 0x70, 0x63, 0x2e, 0x45, 0x78, 0x70, 0x6f, 0x72, 0x74, 0x65, 0x64, 0x54, 0x61, 0x62, 0x6c,
+	0x65, 0x43, 0x72, 0x65, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73,
+	0x65, 0x22, 0x00, 0x12, 0x83, 0x01, 0x0a, 0x05, 0x42, 0x61, 0x74, 0x63, 0x68, 0x12, 0x34, 0x2e,
+	0x69, 0x6f, 0x2e, 0x64, 0x65, 0x65, 0x70, 0x68, 0x61, 0x76, 0x65, 0x6e, 0x2e, 0x70, 0x72, 0x6f,
+	0x74, 0x6f, 0x2e, 0x62, 0x61, 0x63, 0x6b, 0x70, 0x6c, 0x61, 0x6e, 0x65, 0x2e, 0x67, 0x72, 0x70,
+	0x63, 0x2e, 0x42, 0x61, 0x74, 0x63, 0x68, 0x54, 0x61, 0x62, 0x6c, 0x65, 0x52, 0x65, 0x71, 0x75,
+	0x65, 0x73, 0x74, 0x1a, 0x40, 0x2e, 0x69, 0x6f, 0x2e, 0x64, 0x65, 0x65, 0x70, 0x68, 0x61, 0x76,
+	0x65, 0x6e, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x62, 0x61, 0x63, 0x6b, 0x70, 0x6c, 0x61,
+	0x6e, 0x65, 0x2e, 0x67, 0x72, 0x70, 0x63, 0x2e, 0x45, 0x78, 0x70, 0x6f, 0x72, 0x74, 0x65, 0x64,
+	0x54, 0x61, 0x62, 0x6c, 0x65, 0x43, 0x72, 0x65, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x52, 0x65, 0x73,
+	0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x00, 0x30, 0x01, 0x12, 0x99, 0x01, 0x0a, 0x14, 0x45, 0x78,
+	0x70, 0x6f, 0x72, 0x74, 0x65, 0x64, 0x54, 0x61, 0x62, 0x6c, 0x65, 0x55, 0x70, 0x64, 0x61, 0x74,
+	0x65, 0x73, 0x12, 0x3e, 0x2e, 0x69, 0x6f, 0x2e, 0x64, 0x65, 0x65, 0x70, 0x68, 0x61, 0x76, 0x65,
 	0x6e, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x62, 0x61, 0x63, 0x6b, 0x70, 0x6c, 0x61, 0x6e,
 	0x65, 0x2e, 0x67, 0x72, 0x70, 0x63, 0x2e, 0x45, 0x78, 0x70, 0x6f, 0x72, 0x74, 0x65, 0x64, 0x54,
-	0x61, 0x62, 0x6c, 0x65, 0x43, 0x72, 0x65, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x52, 0x65, 0x73, 0x70,
-	0x6f, 0x6e, 0x73, 0x65, 0x22, 0x00, 0x30, 0x01, 0x12, 0x99, 0x01, 0x0a, 0x14, 0x45, 0x78, 0x70,
-	0x6f, 0x72, 0x74, 0x65, 0x64, 0x54, 0x61, 0x62, 0x6c, 0x65, 0x55, 0x70, 0x64, 0x61, 0x74, 0x65,
-	0x73, 0x12, 0x3e, 0x2e, 0x69, 0x6f, 0x2e, 0x64, 0x65, 0x65, 0x70, 0x68, 0x61, 0x76, 0x65, 0x6e,
-	0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x62, 0x61, 0x63, 0x6b, 0x70, 0x6c, 0x61, 0x6e, 0x65,
-	0x2e, 0x67, 0x72, 0x70, 0x63, 0x2e, 0x45, 0x78, 0x70, 0x6f, 0x72, 0x74, 0x65, 0x64, 0x54, 0x61,
-	0x62, 0x6c, 0x65, 0x55, 0x70, 0x64, 0x61, 0x74, 0x65, 0x73, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73,
-	0x74, 0x1a, 0x3d, 0x2e, 0x69, 0x6f, 0x2e, 0x64, 0x65, 0x65, 0x70, 0x68, 0x61, 0x76, 0x65, 0x6e,
-	0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x62, 0x61, 0x63, 0x6b, 0x70, 0x6c, 0x61, 0x6e, 0x65,
-	0x2e, 0x67, 0x72, 0x70, 0x63, 0x2e, 0x45, 0x78, 0x70, 0x6f, 0x72, 0x74, 0x65, 0x64, 0x54, 0x61,
-	0x62, 0x6c, 0x65, 0x55, 0x70, 0x64, 0x61, 0x74, 0x65, 0x4d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65,
-	0x22, 0x00, 0x30, 0x01, 0x12, 0x72, 0x0a, 0x07, 0x53, 0x65, 0x65, 0x6b, 0x52, 0x6f, 0x77, 0x12,
-	0x31, 0x2e, 0x69, 0x6f, 0x2e, 0x64, 0x65, 0x65, 0x70, 0x68, 0x61, 0x76, 0x65, 0x6e, 0x2e, 0x70,
-	0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x62, 0x61, 0x63, 0x6b, 0x70, 0x6c, 0x61, 0x6e, 0x65, 0x2e, 0x67,
-	0x72, 0x70, 0x63, 0x2e, 0x53, 0x65, 0x65, 0x6b, 0x52, 0x6f, 0x77, 0x52, 0x65, 0x71, 0x75, 0x65,
-	0x73, 0x74, 0x1a, 0x32, 0x2e, 0x69, 0x6f, 0x2e, 0x64, 0x65, 0x65, 0x70, 0x68, 0x61, 0x76, 0x65,
+	0x61, 0x62, 0x6c, 0x65, 0x55, 0x70, 0x64, 0x61, 0x74, 0x65, 0x73, 0x52, 0x65, 0x71, 0x75, 0x65,
+	0x73, 0x74, 0x1a, 0x3d, 0x2e, 0x69, 0x6f, 0x2e, 0x64, 0x65, 0x65, 0x70, 0x68, 0x61, 0x76, 0x65,
 	0x6e, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x62, 0x61, 0x63, 0x6b, 0x70, 0x6c, 0x61, 0x6e,
-	0x65, 0x2e, 0x67, 0x72, 0x70, 0x63, 0x2e, 0x53, 0x65, 0x65, 0x6b, 0x52, 0x6f, 0x77, 0x52, 0x65,
-	0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x00, 0x12, 0x84, 0x01, 0x0a, 0x09, 0x4d, 0x65, 0x74,
-	0x61, 0x54, 0x61, 0x62, 0x6c, 0x65, 0x12, 0x33, 0x2e, 0x69, 0x6f, 0x2e, 0x64, 0x65, 0x65, 0x70,
-	0x68, 0x61, 0x76, 0x65, 0x6e, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x62, 0x61, 0x63, 0x6b,
-	0x70, 0x6c, 0x61, 0x6e, 0x65, 0x2e, 0x67, 0x72, 0x70, 0x63, 0x2e, 0x4d, 0x65, 0x74, 0x61, 0x54,
-	0x61, 0x62, 0x6c, 0x65, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x40, 0x2e, 0x69, 0x6f,
-	0x2e, 0x64, 0x65, 0x65, 0x70, 0x68, 0x61, 0x76, 0x65, 0x6e, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f,
-	0x2e, 0x62, 0x61, 0x63, 0x6b, 0x70, 0x6c, 0x61, 0x6e, 0x65, 0x2e, 0x67, 0x72, 0x70, 0x63, 0x2e,
-	0x45, 0x78, 0x70, 0x6f, 0x72, 0x74, 0x65, 0x64, 0x54, 0x61, 0x62, 0x6c, 0x65, 0x43, 0x72, 0x65,
-	0x61, 0x74, 0x69, 0x6f, 0x6e, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x00, 0x12,
-	0x99, 0x01, 0x0a, 0x17, 0x43, 0x6f, 0x6d, 0x70, 0x75, 0x74, 0x65, 0x43, 0x6f, 0x6c, 0x75, 0x6d,
-	0x6e, 0x53, 0x74, 0x61, 0x74, 0x69, 0x73, 0x74, 0x69, 0x63, 0x73, 0x12, 0x3a, 0x2e, 0x69, 0x6f,
-	0x2e, 0x64, 0x65, 0x65, 0x70, 0x68, 0x61, 0x76, 0x65, 0x6e, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f,
-	0x2e, 0x62, 0x61, 0x63, 0x6b, 0x70, 0x6c, 0x61, 0x6e, 0x65, 0x2e, 0x67, 0x72, 0x70, 0x63, 0x2e,
-	0x43, 0x6f, 0x6c, 0x75, 0x6d, 0x6e, 0x53, 0x74, 0x61, 0x74, 0x69, 0x73, 0x74, 0x69, 0x63, 0x73,
-	0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x40, 0x2e, 0x69, 0x6f, 0x2e, 0x64, 0x65, 0x65,
+	0x65, 0x2e, 0x67, 0x72, 0x70, 0x63, 0x2e, 0x45, 0x78, 0x70, 0x6f, 0x72, 0x74, 0x65, 0x64, 0x54,
+	0x61, 0x62, 0x6c, 0x65, 0x55, 0x70, 0x64, 0x61, 0x74, 0x65, 0x4d, 0x65, 0x73, 0x73, 0x61, 0x67,
+	0x65, 0x22, 0x00, 0x30, 0x01, 0x12, 0x72, 0x0a, 0x07, 0x53, 0x65, 0x65, 0x6b, 0x52, 0x6f, 0x77,
+	0x12, 0x31, 0x2e, 0x69, 0x6f, 0x2e, 0x64, 0x65, 0x65, 0x70, 0x68, 0x61, 0x76, 0x65, 0x6e, 0x2e,
+	0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x62, 0x61, 0x63, 0x6b, 0x70, 0x6c, 0x61, 0x6e, 0x65, 0x2e,
+	0x67, 0x72, 0x70, 0x63, 0x2e, 0x53, 0x65, 0x65, 0x6b, 0x52, 0x6f, 0x77, 0x52, 0x65, 0x71, 0x75,
+	0x65, 0x73, 0x74, 0x1a, 0x32, 0x2e, 0x69, 0x6f, 0x2e, 0x64, 0x65, 0x65, 0x70, 0x68, 0x61, 0x76,
+	0x65, 0x6e, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x62, 0x61, 0x63, 0x6b, 0x70, 0x6c, 0x61,
+	0x6e, 0x65, 0x2e, 0x67, 0x72, 0x70, 0x63, 0x2e, 0x53, 0x65, 0x65, 0x6b, 0x52, 0x6f, 0x77, 0x52,
+	0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x00, 0x12, 0x84, 0x01, 0x0a, 0x09, 0x4d, 0x65,
+	0x74, 0x61, 0x54, 0x61, 0x62, 0x6c, 0x65, 0x12, 0x33, 0x2e, 0x69, 0x6f, 0x2e, 0x64, 0x65, 0x65,
 	0x70, 0x68, 0x61, 0x76, 0x65, 0x6e, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x62, 0x61, 0x63,
-	0x6b, 0x70, 0x6c, 0x61, 0x6e, 0x65, 0x2e, 0x67, 0x72, 0x70, 0x63, 0x2e, 0x45, 0x78, 0x70, 0x6f,
-	0x72, 0x74, 0x65, 0x64, 0x54, 0x61, 0x62, 0x6c, 0x65, 0x43, 0x72, 0x65, 0x61, 0x74, 0x69, 0x6f,
-	0x6e, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x00, 0x42, 0x41, 0x48, 0x01, 0x50,
-	0x01, 0x5a, 0x3b, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x64, 0x65,
-	0x65, 0x70, 0x68, 0x61, 0x76, 0x65, 0x6e, 0x2f, 0x64, 0x65, 0x65, 0x70, 0x68, 0x61, 0x76, 0x65,
-	0x6e, 0x2d, 0x63, 0x6f, 0x72, 0x65, 0x2f, 0x67, 0x6f, 0x2f, 0x69, 0x6e, 0x74, 0x65, 0x72, 0x6e,
-	0x61, 0x6c, 0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2f, 0x74, 0x61, 0x62, 0x6c, 0x65, 0x62, 0x06,
-	0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
+	0x6b, 0x70, 0x6c, 0x61, 0x6e, 0x65, 0x2e, 0x67, 0x72, 0x70, 0x63, 0x2e, 0x4d, 0x65, 0x74, 0x61,
+	0x54, 0x61, 0x62, 0x6c, 0x65, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x40, 0x2e, 0x69,
+	0x6f, 0x2e, 0x64, 0x65, 0x65, 0x70, 0x68, 0x61, 0x76, 0x65, 0x6e, 0x2e, 0x70, 0x72, 0x6f, 0x74,
+	0x6f, 0x2e, 0x62, 0x61, 0x63, 0x6b, 0x70, 0x6c, 0x61, 0x6e, 0x65, 0x2e, 0x67, 0x72, 0x70, 0x63,
+	0x2e, 0x45, 0x78, 0x70, 0x6f, 0x72, 0x74, 0x65, 0x64, 0x54, 0x61, 0x62, 0x6c, 0x65, 0x43, 0x72,
+	0x65, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x00,
+	0x12, 0x99, 0x01, 0x0a, 0x17, 0x43, 0x6f, 0x6d, 0x70, 0x75, 0x74, 0x65, 0x43, 0x6f, 0x6c, 0x75,
+	0x6d, 0x6e, 0x53, 0x74, 0x61, 0x74, 0x69, 0x73, 0x74, 0x69, 0x63, 0x73, 0x12, 0x3a, 0x2e, 0x69,
+	0x6f, 0x2e, 0x64, 0x65, 0x65, 0x70, 0x68, 0x61, 0x76, 0x65, 0x6e, 0x2e, 0x70, 0x72, 0x6f, 0x74,
+	0x6f, 0x2e, 0x62, 0x61, 0x63, 0x6b, 0x70, 0x6c, 0x61, 0x6e, 0x65, 0x2e, 0x67, 0x72, 0x70, 0x63,
+	0x2e, 0x43, 0x6f, 0x6c, 0x75, 0x6d, 0x6e, 0x53, 0x74, 0x61, 0x74, 0x69, 0x73, 0x74, 0x69, 0x63,
+	0x73, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x40, 0x2e, 0x69, 0x6f, 0x2e, 0x64, 0x65,
+	0x65, 0x70, 0x68, 0x61, 0x76, 0x65, 0x6e, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x62, 0x61,
+	0x63, 0x6b, 0x70, 0x6c, 0x61, 0x6e, 0x65, 0x2e, 0x67, 0x72, 0x70, 0x63, 0x2e, 0x45, 0x78, 0x70,
+	0x6f, 0x72, 0x74, 0x65, 0x64, 0x54, 0x61, 0x62, 0x6c, 0x65, 0x43, 0x72, 0x65, 0x61, 0x74, 0x69,
+	0x6f, 0x6e, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x00, 0x12, 0x7c, 0x0a, 0x05,
+	0x53, 0x6c, 0x69, 0x63, 0x65, 0x12, 0x2f, 0x2e, 0x69, 0x6f, 0x2e, 0x64, 0x65, 0x65, 0x70, 0x68,
+	0x61, 0x76, 0x65, 0x6e, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x62, 0x61, 0x63, 0x6b, 0x70,
+	0x6c, 0x61, 0x6e, 0x65, 0x2e, 0x67, 0x72, 0x70, 0x63, 0x2e, 0x53, 0x6c, 0x69, 0x63, 0x65, 0x52,
+	0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x40, 0x2e, 0x69, 0x6f, 0x2e, 0x64, 0x65, 0x65, 0x70,
+	0x68, 0x61, 0x76, 0x65, 0x6e, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x62, 0x61, 0x63, 0x6b,
+	0x70, 0x6c, 0x61, 0x6e, 0x65, 0x2e, 0x67, 0x72, 0x70, 0x63, 0x2e, 0x45, 0x78, 0x70, 0x6f, 0x72,
+	0x74, 0x65, 0x64, 0x54, 0x61, 0x62, 0x6c, 0x65, 0x43, 0x72, 0x65, 0x61, 0x74, 0x69, 0x6f, 0x6e,
+	0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x00, 0x42, 0x41, 0x48, 0x01, 0x50, 0x01,
+	0x5a, 0x3b, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x64, 0x65, 0x65,
+	0x70, 0x68, 0x61, 0x76, 0x65, 0x6e, 0x2f, 0x64, 0x65, 0x65, 0x70, 0x68, 0x61, 0x76, 0x65, 0x6e,
+	0x2d, 0x63, 0x6f, 0x72, 0x65, 0x2f, 0x67, 0x6f, 0x2f, 0x69, 0x6e, 0x74, 0x65, 0x72, 0x6e, 0x61,
+	0x6c, 0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2f, 0x74, 0x61, 0x62, 0x6c, 0x65, 0x62, 0x06, 0x70,
+	0x72, 0x6f, 0x74, 0x6f, 0x33,
 }
 
 var (
-	file_deephaven_proto_table_proto_rawDescOnce sync.Once
-	file_deephaven_proto_table_proto_rawDescData = file_deephaven_proto_table_proto_rawDesc
+	file_deephaven_core_proto_table_proto_rawDescOnce sync.Once
+	file_deephaven_core_proto_table_proto_rawDescData = file_deephaven_core_proto_table_proto_rawDesc
 )
 
-func file_deephaven_proto_table_proto_rawDescGZIP() []byte {
-	file_deephaven_proto_table_proto_rawDescOnce.Do(func() {
-		file_deephaven_proto_table_proto_rawDescData = protoimpl.X.CompressGZIP(file_deephaven_proto_table_proto_rawDescData)
+func file_deephaven_core_proto_table_proto_rawDescGZIP() []byte {
+	file_deephaven_core_proto_table_proto_rawDescOnce.Do(func() {
+		file_deephaven_core_proto_table_proto_rawDescData = protoimpl.X.CompressGZIP(file_deephaven_core_proto_table_proto_rawDescData)
 	})
-	return file_deephaven_proto_table_proto_rawDescData
+	return file_deephaven_core_proto_table_proto_rawDescData
 }
 
-var file_deephaven_proto_table_proto_enumTypes = make([]protoimpl.EnumInfo, 12)
-var file_deephaven_proto_table_proto_msgTypes = make([]protoimpl.MessageInfo, 124)
-var file_deephaven_proto_table_proto_goTypes = []interface{}{
+var file_deephaven_core_proto_table_proto_enumTypes = make([]protoimpl.EnumInfo, 12)
+var file_deephaven_core_proto_table_proto_msgTypes = make([]protoimpl.MessageInfo, 128)
+var file_deephaven_core_proto_table_proto_goTypes = []interface{}{
 	(BadDataBehavior)(0),                                     // 0: io.deephaven.proto.backplane.grpc.BadDataBehavior
 	(UpdateByNullBehavior)(0),                                // 1: io.deephaven.proto.backplane.grpc.UpdateByNullBehavior
 	(NullValue)(0),                                           // 2: io.deephaven.proto.backplane.grpc.NullValue
@@ -12424,500 +12772,512 @@ var file_deephaven_proto_table_proto_goTypes = []interface{}{
 	(*EmptyTableRequest)(nil),                                // 18: io.deephaven.proto.backplane.grpc.EmptyTableRequest
 	(*TimeTableRequest)(nil),                                 // 19: io.deephaven.proto.backplane.grpc.TimeTableRequest
 	(*SelectOrUpdateRequest)(nil),                            // 20: io.deephaven.proto.backplane.grpc.SelectOrUpdateRequest
-	(*MathContext)(nil),                                      // 21: io.deephaven.proto.backplane.grpc.MathContext
-	(*UpdateByWindowScale)(nil),                              // 22: io.deephaven.proto.backplane.grpc.UpdateByWindowScale
-	(*UpdateByEmOptions)(nil),                                // 23: io.deephaven.proto.backplane.grpc.UpdateByEmOptions
-	(*UpdateByDeltaOptions)(nil),                             // 24: io.deephaven.proto.backplane.grpc.UpdateByDeltaOptions
-	(*UpdateByRequest)(nil),                                  // 25: io.deephaven.proto.backplane.grpc.UpdateByRequest
-	(*SelectDistinctRequest)(nil),                            // 26: io.deephaven.proto.backplane.grpc.SelectDistinctRequest
-	(*DropColumnsRequest)(nil),                               // 27: io.deephaven.proto.backplane.grpc.DropColumnsRequest
-	(*UnstructuredFilterTableRequest)(nil),                   // 28: io.deephaven.proto.backplane.grpc.UnstructuredFilterTableRequest
-	(*HeadOrTailRequest)(nil),                                // 29: io.deephaven.proto.backplane.grpc.HeadOrTailRequest
-	(*HeadOrTailByRequest)(nil),                              // 30: io.deephaven.proto.backplane.grpc.HeadOrTailByRequest
-	(*UngroupRequest)(nil),                                   // 31: io.deephaven.proto.backplane.grpc.UngroupRequest
-	(*MergeTablesRequest)(nil),                               // 32: io.deephaven.proto.backplane.grpc.MergeTablesRequest
-	(*SnapshotTableRequest)(nil),                             // 33: io.deephaven.proto.backplane.grpc.SnapshotTableRequest
-	(*SnapshotWhenTableRequest)(nil),                         // 34: io.deephaven.proto.backplane.grpc.SnapshotWhenTableRequest
-	(*CrossJoinTablesRequest)(nil),                           // 35: io.deephaven.proto.backplane.grpc.CrossJoinTablesRequest
-	(*NaturalJoinTablesRequest)(nil),                         // 36: io.deephaven.proto.backplane.grpc.NaturalJoinTablesRequest
-	(*ExactJoinTablesRequest)(nil),                           // 37: io.deephaven.proto.backplane.grpc.ExactJoinTablesRequest
-	(*LeftJoinTablesRequest)(nil),                            // 38: io.deephaven.proto.backplane.grpc.LeftJoinTablesRequest
-	(*AsOfJoinTablesRequest)(nil),                            // 39: io.deephaven.proto.backplane.grpc.AsOfJoinTablesRequest
-	(*AjRajTablesRequest)(nil),                               // 40: io.deephaven.proto.backplane.grpc.AjRajTablesRequest
-	(*MultiJoinInput)(nil),                                   // 41: io.deephaven.proto.backplane.grpc.MultiJoinInput
-	(*MultiJoinTablesRequest)(nil),                           // 42: io.deephaven.proto.backplane.grpc.MultiJoinTablesRequest
-	(*RangeJoinTablesRequest)(nil),                           // 43: io.deephaven.proto.backplane.grpc.RangeJoinTablesRequest
-	(*ComboAggregateRequest)(nil),                            // 44: io.deephaven.proto.backplane.grpc.ComboAggregateRequest
-	(*AggregateAllRequest)(nil),                              // 45: io.deephaven.proto.backplane.grpc.AggregateAllRequest
-	(*AggSpec)(nil),                                          // 46: io.deephaven.proto.backplane.grpc.AggSpec
-	(*AggregateRequest)(nil),                                 // 47: io.deephaven.proto.backplane.grpc.AggregateRequest
-	(*Aggregation)(nil),                                      // 48: io.deephaven.proto.backplane.grpc.Aggregation
-	(*SortDescriptor)(nil),                                   // 49: io.deephaven.proto.backplane.grpc.SortDescriptor
-	(*SortTableRequest)(nil),                                 // 50: io.deephaven.proto.backplane.grpc.SortTableRequest
-	(*FilterTableRequest)(nil),                               // 51: io.deephaven.proto.backplane.grpc.FilterTableRequest
-	(*SeekRowRequest)(nil),                                   // 52: io.deephaven.proto.backplane.grpc.SeekRowRequest
-	(*SeekRowResponse)(nil),                                  // 53: io.deephaven.proto.backplane.grpc.SeekRowResponse
-	(*Reference)(nil),                                        // 54: io.deephaven.proto.backplane.grpc.Reference
-	(*Literal)(nil),                                          // 55: io.deephaven.proto.backplane.grpc.Literal
-	(*Value)(nil),                                            // 56: io.deephaven.proto.backplane.grpc.Value
-	(*Condition)(nil),                                        // 57: io.deephaven.proto.backplane.grpc.Condition
-	(*AndCondition)(nil),                                     // 58: io.deephaven.proto.backplane.grpc.AndCondition
-	(*OrCondition)(nil),                                      // 59: io.deephaven.proto.backplane.grpc.OrCondition
-	(*NotCondition)(nil),                                     // 60: io.deephaven.proto.backplane.grpc.NotCondition
-	(*CompareCondition)(nil),                                 // 61: io.deephaven.proto.backplane.grpc.CompareCondition
-	(*InCondition)(nil),                                      // 62: io.deephaven.proto.backplane.grpc.InCondition
-	(*InvokeCondition)(nil),                                  // 63: io.deephaven.proto.backplane.grpc.InvokeCondition
-	(*IsNullCondition)(nil),                                  // 64: io.deephaven.proto.backplane.grpc.IsNullCondition
-	(*MatchesCondition)(nil),                                 // 65: io.deephaven.proto.backplane.grpc.MatchesCondition
-	(*ContainsCondition)(nil),                                // 66: io.deephaven.proto.backplane.grpc.ContainsCondition
-	(*SearchCondition)(nil),                                  // 67: io.deephaven.proto.backplane.grpc.SearchCondition
-	(*FlattenRequest)(nil),                                   // 68: io.deephaven.proto.backplane.grpc.FlattenRequest
-	(*MetaTableRequest)(nil),                                 // 69: io.deephaven.proto.backplane.grpc.MetaTableRequest
-	(*RunChartDownsampleRequest)(nil),                        // 70: io.deephaven.proto.backplane.grpc.RunChartDownsampleRequest
-	(*CreateInputTableRequest)(nil),                          // 71: io.deephaven.proto.backplane.grpc.CreateInputTableRequest
-	(*WhereInRequest)(nil),                                   // 72: io.deephaven.proto.backplane.grpc.WhereInRequest
-	(*ColumnStatisticsRequest)(nil),                          // 73: io.deephaven.proto.backplane.grpc.ColumnStatisticsRequest
-	(*BatchTableRequest)(nil),                                // 74: io.deephaven.proto.backplane.grpc.BatchTableRequest
-	(*UpdateByWindowScale_UpdateByWindowTicks)(nil),          // 75: io.deephaven.proto.backplane.grpc.UpdateByWindowScale.UpdateByWindowTicks
-	(*UpdateByWindowScale_UpdateByWindowTime)(nil),           // 76: io.deephaven.proto.backplane.grpc.UpdateByWindowScale.UpdateByWindowTime
-	(*UpdateByRequest_UpdateByOptions)(nil),                  // 77: io.deephaven.proto.backplane.grpc.UpdateByRequest.UpdateByOptions
-	(*UpdateByRequest_UpdateByOperation)(nil),                // 78: io.deephaven.proto.backplane.grpc.UpdateByRequest.UpdateByOperation
-	(*UpdateByRequest_UpdateByOperation_UpdateByColumn)(nil), // 79: io.deephaven.proto.backplane.grpc.UpdateByRequest.UpdateByOperation.UpdateByColumn
-	(*UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec)(nil),                           // 80: io.deephaven.proto.backplane.grpc.UpdateByRequest.UpdateByOperation.UpdateByColumn.UpdateBySpec
-	(*UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByCumulativeSum)(nil),     // 81: io.deephaven.proto.backplane.grpc.UpdateByRequest.UpdateByOperation.UpdateByColumn.UpdateBySpec.UpdateByCumulativeSum
-	(*UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByCumulativeMin)(nil),     // 82: io.deephaven.proto.backplane.grpc.UpdateByRequest.UpdateByOperation.UpdateByColumn.UpdateBySpec.UpdateByCumulativeMin
-	(*UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByCumulativeMax)(nil),     // 83: io.deephaven.proto.backplane.grpc.UpdateByRequest.UpdateByOperation.UpdateByColumn.UpdateBySpec.UpdateByCumulativeMax
-	(*UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByCumulativeProduct)(nil), // 84: io.deephaven.proto.backplane.grpc.UpdateByRequest.UpdateByOperation.UpdateByColumn.UpdateBySpec.UpdateByCumulativeProduct
-	(*UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByFill)(nil),              // 85: io.deephaven.proto.backplane.grpc.UpdateByRequest.UpdateByOperation.UpdateByColumn.UpdateBySpec.UpdateByFill
-	(*UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByEma)(nil),               // 86: io.deephaven.proto.backplane.grpc.UpdateByRequest.UpdateByOperation.UpdateByColumn.UpdateBySpec.UpdateByEma
-	(*UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByEms)(nil),               // 87: io.deephaven.proto.backplane.grpc.UpdateByRequest.UpdateByOperation.UpdateByColumn.UpdateBySpec.UpdateByEms
-	(*UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByEmMin)(nil),             // 88: io.deephaven.proto.backplane.grpc.UpdateByRequest.UpdateByOperation.UpdateByColumn.UpdateBySpec.UpdateByEmMin
-	(*UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByEmMax)(nil),             // 89: io.deephaven.proto.backplane.grpc.UpdateByRequest.UpdateByOperation.UpdateByColumn.UpdateBySpec.UpdateByEmMax
-	(*UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByEmStd)(nil),             // 90: io.deephaven.proto.backplane.grpc.UpdateByRequest.UpdateByOperation.UpdateByColumn.UpdateBySpec.UpdateByEmStd
-	(*UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByDelta)(nil),             // 91: io.deephaven.proto.backplane.grpc.UpdateByRequest.UpdateByOperation.UpdateByColumn.UpdateBySpec.UpdateByDelta
-	(*UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingSum)(nil),        // 92: io.deephaven.proto.backplane.grpc.UpdateByRequest.UpdateByOperation.UpdateByColumn.UpdateBySpec.UpdateByRollingSum
-	(*UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingGroup)(nil),      // 93: io.deephaven.proto.backplane.grpc.UpdateByRequest.UpdateByOperation.UpdateByColumn.UpdateBySpec.UpdateByRollingGroup
-	(*UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingAvg)(nil),        // 94: io.deephaven.proto.backplane.grpc.UpdateByRequest.UpdateByOperation.UpdateByColumn.UpdateBySpec.UpdateByRollingAvg
-	(*UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingMin)(nil),        // 95: io.deephaven.proto.backplane.grpc.UpdateByRequest.UpdateByOperation.UpdateByColumn.UpdateBySpec.UpdateByRollingMin
-	(*UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingMax)(nil),        // 96: io.deephaven.proto.backplane.grpc.UpdateByRequest.UpdateByOperation.UpdateByColumn.UpdateBySpec.UpdateByRollingMax
-	(*UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingProduct)(nil),    // 97: io.deephaven.proto.backplane.grpc.UpdateByRequest.UpdateByOperation.UpdateByColumn.UpdateBySpec.UpdateByRollingProduct
-	(*UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingCount)(nil),      // 98: io.deephaven.proto.backplane.grpc.UpdateByRequest.UpdateByOperation.UpdateByColumn.UpdateBySpec.UpdateByRollingCount
-	(*UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingStd)(nil),        // 99: io.deephaven.proto.backplane.grpc.UpdateByRequest.UpdateByOperation.UpdateByColumn.UpdateBySpec.UpdateByRollingStd
-	(*UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingWAvg)(nil),       // 100: io.deephaven.proto.backplane.grpc.UpdateByRequest.UpdateByOperation.UpdateByColumn.UpdateBySpec.UpdateByRollingWAvg
-	(*UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingFormula)(nil),    // 101: io.deephaven.proto.backplane.grpc.UpdateByRequest.UpdateByOperation.UpdateByColumn.UpdateBySpec.UpdateByRollingFormula
-	(*ComboAggregateRequest_Aggregate)(nil),                                                         // 102: io.deephaven.proto.backplane.grpc.ComboAggregateRequest.Aggregate
-	(*AggSpec_AggSpecApproximatePercentile)(nil),                                                    // 103: io.deephaven.proto.backplane.grpc.AggSpec.AggSpecApproximatePercentile
-	(*AggSpec_AggSpecCountDistinct)(nil),                                                            // 104: io.deephaven.proto.backplane.grpc.AggSpec.AggSpecCountDistinct
-	(*AggSpec_AggSpecDistinct)(nil),                                                                 // 105: io.deephaven.proto.backplane.grpc.AggSpec.AggSpecDistinct
-	(*AggSpec_AggSpecFormula)(nil),                                                                  // 106: io.deephaven.proto.backplane.grpc.AggSpec.AggSpecFormula
-	(*AggSpec_AggSpecMedian)(nil),                                                                   // 107: io.deephaven.proto.backplane.grpc.AggSpec.AggSpecMedian
-	(*AggSpec_AggSpecPercentile)(nil),                                                               // 108: io.deephaven.proto.backplane.grpc.AggSpec.AggSpecPercentile
-	(*AggSpec_AggSpecSorted)(nil),                                                                   // 109: io.deephaven.proto.backplane.grpc.AggSpec.AggSpecSorted
-	(*AggSpec_AggSpecSortedColumn)(nil),                                                             // 110: io.deephaven.proto.backplane.grpc.AggSpec.AggSpecSortedColumn
-	(*AggSpec_AggSpecTDigest)(nil),                                                                  // 111: io.deephaven.proto.backplane.grpc.AggSpec.AggSpecTDigest
-	(*AggSpec_AggSpecUnique)(nil),                                                                   // 112: io.deephaven.proto.backplane.grpc.AggSpec.AggSpecUnique
-	(*AggSpec_AggSpecNonUniqueSentinel)(nil),                                                        // 113: io.deephaven.proto.backplane.grpc.AggSpec.AggSpecNonUniqueSentinel
-	(*AggSpec_AggSpecWeighted)(nil),                                                                 // 114: io.deephaven.proto.backplane.grpc.AggSpec.AggSpecWeighted
-	(*AggSpec_AggSpecAbsSum)(nil),                                                                   // 115: io.deephaven.proto.backplane.grpc.AggSpec.AggSpecAbsSum
-	(*AggSpec_AggSpecAvg)(nil),                                                                      // 116: io.deephaven.proto.backplane.grpc.AggSpec.AggSpecAvg
-	(*AggSpec_AggSpecFirst)(nil),                                                                    // 117: io.deephaven.proto.backplane.grpc.AggSpec.AggSpecFirst
-	(*AggSpec_AggSpecFreeze)(nil),                                                                   // 118: io.deephaven.proto.backplane.grpc.AggSpec.AggSpecFreeze
-	(*AggSpec_AggSpecGroup)(nil),                                                                    // 119: io.deephaven.proto.backplane.grpc.AggSpec.AggSpecGroup
-	(*AggSpec_AggSpecLast)(nil),                                                                     // 120: io.deephaven.proto.backplane.grpc.AggSpec.AggSpecLast
-	(*AggSpec_AggSpecMax)(nil),                                                                      // 121: io.deephaven.proto.backplane.grpc.AggSpec.AggSpecMax
-	(*AggSpec_AggSpecMin)(nil),                                                                      // 122: io.deephaven.proto.backplane.grpc.AggSpec.AggSpecMin
-	(*AggSpec_AggSpecStd)(nil),                                                                      // 123: io.deephaven.proto.backplane.grpc.AggSpec.AggSpecStd
-	(*AggSpec_AggSpecSum)(nil),                                                                      // 124: io.deephaven.proto.backplane.grpc.AggSpec.AggSpecSum
-	(*AggSpec_AggSpecVar)(nil),                                                                      // 125: io.deephaven.proto.backplane.grpc.AggSpec.AggSpecVar
-	(*Aggregation_AggregationColumns)(nil),                                                          // 126: io.deephaven.proto.backplane.grpc.Aggregation.AggregationColumns
-	(*Aggregation_AggregationCount)(nil),                                                            // 127: io.deephaven.proto.backplane.grpc.Aggregation.AggregationCount
-	(*Aggregation_AggregationRowKey)(nil),                                                           // 128: io.deephaven.proto.backplane.grpc.Aggregation.AggregationRowKey
-	(*Aggregation_AggregationPartition)(nil),                                                        // 129: io.deephaven.proto.backplane.grpc.Aggregation.AggregationPartition
-	(*RunChartDownsampleRequest_ZoomRange)(nil),                                                     // 130: io.deephaven.proto.backplane.grpc.RunChartDownsampleRequest.ZoomRange
-	(*CreateInputTableRequest_InputTableKind)(nil),                                                  // 131: io.deephaven.proto.backplane.grpc.CreateInputTableRequest.InputTableKind
-	(*CreateInputTableRequest_InputTableKind_InMemoryAppendOnly)(nil),                               // 132: io.deephaven.proto.backplane.grpc.CreateInputTableRequest.InputTableKind.InMemoryAppendOnly
-	(*CreateInputTableRequest_InputTableKind_InMemoryKeyBacked)(nil),                                // 133: io.deephaven.proto.backplane.grpc.CreateInputTableRequest.InputTableKind.InMemoryKeyBacked
-	(*CreateInputTableRequest_InputTableKind_Blink)(nil),                                            // 134: io.deephaven.proto.backplane.grpc.CreateInputTableRequest.InputTableKind.Blink
-	(*BatchTableRequest_Operation)(nil),                                                             // 135: io.deephaven.proto.backplane.grpc.BatchTableRequest.Operation
-	(*ticket.Ticket)(nil),                                                                           // 136: io.deephaven.proto.backplane.grpc.Ticket
-}
-var file_deephaven_proto_table_proto_depIdxs = []int32{
-	136, // 0: io.deephaven.proto.backplane.grpc.TableReference.ticket:type_name -> io.deephaven.proto.backplane.grpc.Ticket
+	(*Selectable)(nil),                                       // 21: io.deephaven.proto.backplane.grpc.Selectable
+	(*MathContext)(nil),                                      // 22: io.deephaven.proto.backplane.grpc.MathContext
+	(*UpdateByWindowScale)(nil),                              // 23: io.deephaven.proto.backplane.grpc.UpdateByWindowScale
+	(*UpdateByEmOptions)(nil),                                // 24: io.deephaven.proto.backplane.grpc.UpdateByEmOptions
+	(*UpdateByDeltaOptions)(nil),                             // 25: io.deephaven.proto.backplane.grpc.UpdateByDeltaOptions
+	(*UpdateByRequest)(nil),                                  // 26: io.deephaven.proto.backplane.grpc.UpdateByRequest
+	(*SelectDistinctRequest)(nil),                            // 27: io.deephaven.proto.backplane.grpc.SelectDistinctRequest
+	(*DropColumnsRequest)(nil),                               // 28: io.deephaven.proto.backplane.grpc.DropColumnsRequest
+	(*UnstructuredFilterTableRequest)(nil),                   // 29: io.deephaven.proto.backplane.grpc.UnstructuredFilterTableRequest
+	(*HeadOrTailRequest)(nil),                                // 30: io.deephaven.proto.backplane.grpc.HeadOrTailRequest
+	(*HeadOrTailByRequest)(nil),                              // 31: io.deephaven.proto.backplane.grpc.HeadOrTailByRequest
+	(*UngroupRequest)(nil),                                   // 32: io.deephaven.proto.backplane.grpc.UngroupRequest
+	(*MergeTablesRequest)(nil),                               // 33: io.deephaven.proto.backplane.grpc.MergeTablesRequest
+	(*SnapshotTableRequest)(nil),                             // 34: io.deephaven.proto.backplane.grpc.SnapshotTableRequest
+	(*SnapshotWhenTableRequest)(nil),                         // 35: io.deephaven.proto.backplane.grpc.SnapshotWhenTableRequest
+	(*CrossJoinTablesRequest)(nil),                           // 36: io.deephaven.proto.backplane.grpc.CrossJoinTablesRequest
+	(*NaturalJoinTablesRequest)(nil),                         // 37: io.deephaven.proto.backplane.grpc.NaturalJoinTablesRequest
+	(*ExactJoinTablesRequest)(nil),                           // 38: io.deephaven.proto.backplane.grpc.ExactJoinTablesRequest
+	(*LeftJoinTablesRequest)(nil),                            // 39: io.deephaven.proto.backplane.grpc.LeftJoinTablesRequest
+	(*AsOfJoinTablesRequest)(nil),                            // 40: io.deephaven.proto.backplane.grpc.AsOfJoinTablesRequest
+	(*AjRajTablesRequest)(nil),                               // 41: io.deephaven.proto.backplane.grpc.AjRajTablesRequest
+	(*MultiJoinInput)(nil),                                   // 42: io.deephaven.proto.backplane.grpc.MultiJoinInput
+	(*MultiJoinTablesRequest)(nil),                           // 43: io.deephaven.proto.backplane.grpc.MultiJoinTablesRequest
+	(*RangeJoinTablesRequest)(nil),                           // 44: io.deephaven.proto.backplane.grpc.RangeJoinTablesRequest
+	(*ComboAggregateRequest)(nil),                            // 45: io.deephaven.proto.backplane.grpc.ComboAggregateRequest
+	(*AggregateAllRequest)(nil),                              // 46: io.deephaven.proto.backplane.grpc.AggregateAllRequest
+	(*AggSpec)(nil),                                          // 47: io.deephaven.proto.backplane.grpc.AggSpec
+	(*AggregateRequest)(nil),                                 // 48: io.deephaven.proto.backplane.grpc.AggregateRequest
+	(*Aggregation)(nil),                                      // 49: io.deephaven.proto.backplane.grpc.Aggregation
+	(*SortDescriptor)(nil),                                   // 50: io.deephaven.proto.backplane.grpc.SortDescriptor
+	(*SortTableRequest)(nil),                                 // 51: io.deephaven.proto.backplane.grpc.SortTableRequest
+	(*FilterTableRequest)(nil),                               // 52: io.deephaven.proto.backplane.grpc.FilterTableRequest
+	(*SeekRowRequest)(nil),                                   // 53: io.deephaven.proto.backplane.grpc.SeekRowRequest
+	(*SeekRowResponse)(nil),                                  // 54: io.deephaven.proto.backplane.grpc.SeekRowResponse
+	(*Reference)(nil),                                        // 55: io.deephaven.proto.backplane.grpc.Reference
+	(*Literal)(nil),                                          // 56: io.deephaven.proto.backplane.grpc.Literal
+	(*Value)(nil),                                            // 57: io.deephaven.proto.backplane.grpc.Value
+	(*Condition)(nil),                                        // 58: io.deephaven.proto.backplane.grpc.Condition
+	(*AndCondition)(nil),                                     // 59: io.deephaven.proto.backplane.grpc.AndCondition
+	(*OrCondition)(nil),                                      // 60: io.deephaven.proto.backplane.grpc.OrCondition
+	(*NotCondition)(nil),                                     // 61: io.deephaven.proto.backplane.grpc.NotCondition
+	(*CompareCondition)(nil),                                 // 62: io.deephaven.proto.backplane.grpc.CompareCondition
+	(*InCondition)(nil),                                      // 63: io.deephaven.proto.backplane.grpc.InCondition
+	(*InvokeCondition)(nil),                                  // 64: io.deephaven.proto.backplane.grpc.InvokeCondition
+	(*IsNullCondition)(nil),                                  // 65: io.deephaven.proto.backplane.grpc.IsNullCondition
+	(*MatchesCondition)(nil),                                 // 66: io.deephaven.proto.backplane.grpc.MatchesCondition
+	(*ContainsCondition)(nil),                                // 67: io.deephaven.proto.backplane.grpc.ContainsCondition
+	(*SearchCondition)(nil),                                  // 68: io.deephaven.proto.backplane.grpc.SearchCondition
+	(*FlattenRequest)(nil),                                   // 69: io.deephaven.proto.backplane.grpc.FlattenRequest
+	(*MetaTableRequest)(nil),                                 // 70: io.deephaven.proto.backplane.grpc.MetaTableRequest
+	(*RunChartDownsampleRequest)(nil),                        // 71: io.deephaven.proto.backplane.grpc.RunChartDownsampleRequest
+	(*CreateInputTableRequest)(nil),                          // 72: io.deephaven.proto.backplane.grpc.CreateInputTableRequest
+	(*WhereInRequest)(nil),                                   // 73: io.deephaven.proto.backplane.grpc.WhereInRequest
+	(*ColumnStatisticsRequest)(nil),                          // 74: io.deephaven.proto.backplane.grpc.ColumnStatisticsRequest
+	(*SliceRequest)(nil),                                     // 75: io.deephaven.proto.backplane.grpc.SliceRequest
+	(*BatchTableRequest)(nil),                                // 76: io.deephaven.proto.backplane.grpc.BatchTableRequest
+	(*UpdateByWindowScale_UpdateByWindowTicks)(nil),          // 77: io.deephaven.proto.backplane.grpc.UpdateByWindowScale.UpdateByWindowTicks
+	(*UpdateByWindowScale_UpdateByWindowTime)(nil),           // 78: io.deephaven.proto.backplane.grpc.UpdateByWindowScale.UpdateByWindowTime
+	(*UpdateByRequest_UpdateByOptions)(nil),                  // 79: io.deephaven.proto.backplane.grpc.UpdateByRequest.UpdateByOptions
+	(*UpdateByRequest_UpdateByOperation)(nil),                // 80: io.deephaven.proto.backplane.grpc.UpdateByRequest.UpdateByOperation
+	(*UpdateByRequest_UpdateByOperation_UpdateByColumn)(nil), // 81: io.deephaven.proto.backplane.grpc.UpdateByRequest.UpdateByOperation.UpdateByColumn
+	(*UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec)(nil),                           // 82: io.deephaven.proto.backplane.grpc.UpdateByRequest.UpdateByOperation.UpdateByColumn.UpdateBySpec
+	(*UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByCumulativeSum)(nil),     // 83: io.deephaven.proto.backplane.grpc.UpdateByRequest.UpdateByOperation.UpdateByColumn.UpdateBySpec.UpdateByCumulativeSum
+	(*UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByCumulativeMin)(nil),     // 84: io.deephaven.proto.backplane.grpc.UpdateByRequest.UpdateByOperation.UpdateByColumn.UpdateBySpec.UpdateByCumulativeMin
+	(*UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByCumulativeMax)(nil),     // 85: io.deephaven.proto.backplane.grpc.UpdateByRequest.UpdateByOperation.UpdateByColumn.UpdateBySpec.UpdateByCumulativeMax
+	(*UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByCumulativeProduct)(nil), // 86: io.deephaven.proto.backplane.grpc.UpdateByRequest.UpdateByOperation.UpdateByColumn.UpdateBySpec.UpdateByCumulativeProduct
+	(*UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByFill)(nil),              // 87: io.deephaven.proto.backplane.grpc.UpdateByRequest.UpdateByOperation.UpdateByColumn.UpdateBySpec.UpdateByFill
+	(*UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByEma)(nil),               // 88: io.deephaven.proto.backplane.grpc.UpdateByRequest.UpdateByOperation.UpdateByColumn.UpdateBySpec.UpdateByEma
+	(*UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByEms)(nil),               // 89: io.deephaven.proto.backplane.grpc.UpdateByRequest.UpdateByOperation.UpdateByColumn.UpdateBySpec.UpdateByEms
+	(*UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByEmMin)(nil),             // 90: io.deephaven.proto.backplane.grpc.UpdateByRequest.UpdateByOperation.UpdateByColumn.UpdateBySpec.UpdateByEmMin
+	(*UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByEmMax)(nil),             // 91: io.deephaven.proto.backplane.grpc.UpdateByRequest.UpdateByOperation.UpdateByColumn.UpdateBySpec.UpdateByEmMax
+	(*UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByEmStd)(nil),             // 92: io.deephaven.proto.backplane.grpc.UpdateByRequest.UpdateByOperation.UpdateByColumn.UpdateBySpec.UpdateByEmStd
+	(*UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByDelta)(nil),             // 93: io.deephaven.proto.backplane.grpc.UpdateByRequest.UpdateByOperation.UpdateByColumn.UpdateBySpec.UpdateByDelta
+	(*UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingSum)(nil),        // 94: io.deephaven.proto.backplane.grpc.UpdateByRequest.UpdateByOperation.UpdateByColumn.UpdateBySpec.UpdateByRollingSum
+	(*UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingGroup)(nil),      // 95: io.deephaven.proto.backplane.grpc.UpdateByRequest.UpdateByOperation.UpdateByColumn.UpdateBySpec.UpdateByRollingGroup
+	(*UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingAvg)(nil),        // 96: io.deephaven.proto.backplane.grpc.UpdateByRequest.UpdateByOperation.UpdateByColumn.UpdateBySpec.UpdateByRollingAvg
+	(*UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingMin)(nil),        // 97: io.deephaven.proto.backplane.grpc.UpdateByRequest.UpdateByOperation.UpdateByColumn.UpdateBySpec.UpdateByRollingMin
+	(*UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingMax)(nil),        // 98: io.deephaven.proto.backplane.grpc.UpdateByRequest.UpdateByOperation.UpdateByColumn.UpdateBySpec.UpdateByRollingMax
+	(*UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingProduct)(nil),    // 99: io.deephaven.proto.backplane.grpc.UpdateByRequest.UpdateByOperation.UpdateByColumn.UpdateBySpec.UpdateByRollingProduct
+	(*UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingCount)(nil),      // 100: io.deephaven.proto.backplane.grpc.UpdateByRequest.UpdateByOperation.UpdateByColumn.UpdateBySpec.UpdateByRollingCount
+	(*UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingStd)(nil),        // 101: io.deephaven.proto.backplane.grpc.UpdateByRequest.UpdateByOperation.UpdateByColumn.UpdateBySpec.UpdateByRollingStd
+	(*UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingWAvg)(nil),       // 102: io.deephaven.proto.backplane.grpc.UpdateByRequest.UpdateByOperation.UpdateByColumn.UpdateBySpec.UpdateByRollingWAvg
+	(*UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingFormula)(nil),    // 103: io.deephaven.proto.backplane.grpc.UpdateByRequest.UpdateByOperation.UpdateByColumn.UpdateBySpec.UpdateByRollingFormula
+	(*ComboAggregateRequest_Aggregate)(nil),                                                         // 104: io.deephaven.proto.backplane.grpc.ComboAggregateRequest.Aggregate
+	(*AggSpec_AggSpecApproximatePercentile)(nil),                                                    // 105: io.deephaven.proto.backplane.grpc.AggSpec.AggSpecApproximatePercentile
+	(*AggSpec_AggSpecCountDistinct)(nil),                                                            // 106: io.deephaven.proto.backplane.grpc.AggSpec.AggSpecCountDistinct
+	(*AggSpec_AggSpecDistinct)(nil),                                                                 // 107: io.deephaven.proto.backplane.grpc.AggSpec.AggSpecDistinct
+	(*AggSpec_AggSpecFormula)(nil),                                                                  // 108: io.deephaven.proto.backplane.grpc.AggSpec.AggSpecFormula
+	(*AggSpec_AggSpecMedian)(nil),                                                                   // 109: io.deephaven.proto.backplane.grpc.AggSpec.AggSpecMedian
+	(*AggSpec_AggSpecPercentile)(nil),                                                               // 110: io.deephaven.proto.backplane.grpc.AggSpec.AggSpecPercentile
+	(*AggSpec_AggSpecSorted)(nil),                                                                   // 111: io.deephaven.proto.backplane.grpc.AggSpec.AggSpecSorted
+	(*AggSpec_AggSpecSortedColumn)(nil),                                                             // 112: io.deephaven.proto.backplane.grpc.AggSpec.AggSpecSortedColumn
+	(*AggSpec_AggSpecTDigest)(nil),                                                                  // 113: io.deephaven.proto.backplane.grpc.AggSpec.AggSpecTDigest
+	(*AggSpec_AggSpecUnique)(nil),                                                                   // 114: io.deephaven.proto.backplane.grpc.AggSpec.AggSpecUnique
+	(*AggSpec_AggSpecNonUniqueSentinel)(nil),                                                        // 115: io.deephaven.proto.backplane.grpc.AggSpec.AggSpecNonUniqueSentinel
+	(*AggSpec_AggSpecWeighted)(nil),                                                                 // 116: io.deephaven.proto.backplane.grpc.AggSpec.AggSpecWeighted
+	(*AggSpec_AggSpecAbsSum)(nil),                                                                   // 117: io.deephaven.proto.backplane.grpc.AggSpec.AggSpecAbsSum
+	(*AggSpec_AggSpecAvg)(nil),                                                                      // 118: io.deephaven.proto.backplane.grpc.AggSpec.AggSpecAvg
+	(*AggSpec_AggSpecFirst)(nil),                                                                    // 119: io.deephaven.proto.backplane.grpc.AggSpec.AggSpecFirst
+	(*AggSpec_AggSpecFreeze)(nil),                                                                   // 120: io.deephaven.proto.backplane.grpc.AggSpec.AggSpecFreeze
+	(*AggSpec_AggSpecGroup)(nil),                                                                    // 121: io.deephaven.proto.backplane.grpc.AggSpec.AggSpecGroup
+	(*AggSpec_AggSpecLast)(nil),                                                                     // 122: io.deephaven.proto.backplane.grpc.AggSpec.AggSpecLast
+	(*AggSpec_AggSpecMax)(nil),                                                                      // 123: io.deephaven.proto.backplane.grpc.AggSpec.AggSpecMax
+	(*AggSpec_AggSpecMin)(nil),                                                                      // 124: io.deephaven.proto.backplane.grpc.AggSpec.AggSpecMin
+	(*AggSpec_AggSpecStd)(nil),                                                                      // 125: io.deephaven.proto.backplane.grpc.AggSpec.AggSpecStd
+	(*AggSpec_AggSpecSum)(nil),                                                                      // 126: io.deephaven.proto.backplane.grpc.AggSpec.AggSpecSum
+	(*AggSpec_AggSpecVar)(nil),                                                                      // 127: io.deephaven.proto.backplane.grpc.AggSpec.AggSpecVar
+	(*Aggregation_AggregationColumns)(nil),                                                          // 128: io.deephaven.proto.backplane.grpc.Aggregation.AggregationColumns
+	(*Aggregation_AggregationCount)(nil),                                                            // 129: io.deephaven.proto.backplane.grpc.Aggregation.AggregationCount
+	(*Aggregation_AggregationCountWhere)(nil),                                                       // 130: io.deephaven.proto.backplane.grpc.Aggregation.AggregationCountWhere
+	(*Aggregation_AggregationRowKey)(nil),                                                           // 131: io.deephaven.proto.backplane.grpc.Aggregation.AggregationRowKey
+	(*Aggregation_AggregationPartition)(nil),                                                        // 132: io.deephaven.proto.backplane.grpc.Aggregation.AggregationPartition
+	(*Aggregation_AggregationFormula)(nil),                                                          // 133: io.deephaven.proto.backplane.grpc.Aggregation.AggregationFormula
+	(*RunChartDownsampleRequest_ZoomRange)(nil),                                                     // 134: io.deephaven.proto.backplane.grpc.RunChartDownsampleRequest.ZoomRange
+	(*CreateInputTableRequest_InputTableKind)(nil),                                                  // 135: io.deephaven.proto.backplane.grpc.CreateInputTableRequest.InputTableKind
+	(*CreateInputTableRequest_InputTableKind_InMemoryAppendOnly)(nil),                               // 136: io.deephaven.proto.backplane.grpc.CreateInputTableRequest.InputTableKind.InMemoryAppendOnly
+	(*CreateInputTableRequest_InputTableKind_InMemoryKeyBacked)(nil),                                // 137: io.deephaven.proto.backplane.grpc.CreateInputTableRequest.InputTableKind.InMemoryKeyBacked
+	(*CreateInputTableRequest_InputTableKind_Blink)(nil),                                            // 138: io.deephaven.proto.backplane.grpc.CreateInputTableRequest.InputTableKind.Blink
+	(*BatchTableRequest_Operation)(nil),                                                             // 139: io.deephaven.proto.backplane.grpc.BatchTableRequest.Operation
+	(*ticket.Ticket)(nil),                                                                           // 140: io.deephaven.proto.backplane.grpc.Ticket
+}
+var file_deephaven_core_proto_table_proto_depIdxs = []int32{
+	140, // 0: io.deephaven.proto.backplane.grpc.TableReference.ticket:type_name -> io.deephaven.proto.backplane.grpc.Ticket
 	12,  // 1: io.deephaven.proto.backplane.grpc.ExportedTableCreationResponse.result_id:type_name -> io.deephaven.proto.backplane.grpc.TableReference
 	12,  // 2: io.deephaven.proto.backplane.grpc.FetchTableRequest.source_id:type_name -> io.deephaven.proto.backplane.grpc.TableReference
-	136, // 3: io.deephaven.proto.backplane.grpc.FetchTableRequest.result_id:type_name -> io.deephaven.proto.backplane.grpc.Ticket
+	140, // 3: io.deephaven.proto.backplane.grpc.FetchTableRequest.result_id:type_name -> io.deephaven.proto.backplane.grpc.Ticket
 	12,  // 4: io.deephaven.proto.backplane.grpc.ApplyPreviewColumnsRequest.source_id:type_name -> io.deephaven.proto.backplane.grpc.TableReference
-	136, // 5: io.deephaven.proto.backplane.grpc.ApplyPreviewColumnsRequest.result_id:type_name -> io.deephaven.proto.backplane.grpc.Ticket
-	136, // 6: io.deephaven.proto.backplane.grpc.ExportedTableUpdateMessage.export_id:type_name -> io.deephaven.proto.backplane.grpc.Ticket
-	136, // 7: io.deephaven.proto.backplane.grpc.EmptyTableRequest.result_id:type_name -> io.deephaven.proto.backplane.grpc.Ticket
-	136, // 8: io.deephaven.proto.backplane.grpc.TimeTableRequest.result_id:type_name -> io.deephaven.proto.backplane.grpc.Ticket
-	136, // 9: io.deephaven.proto.backplane.grpc.SelectOrUpdateRequest.result_id:type_name -> io.deephaven.proto.backplane.grpc.Ticket
+	140, // 5: io.deephaven.proto.backplane.grpc.ApplyPreviewColumnsRequest.result_id:type_name -> io.deephaven.proto.backplane.grpc.Ticket
+	140, // 6: io.deephaven.proto.backplane.grpc.ExportedTableUpdateMessage.export_id:type_name -> io.deephaven.proto.backplane.grpc.Ticket
+	140, // 7: io.deephaven.proto.backplane.grpc.EmptyTableRequest.result_id:type_name -> io.deephaven.proto.backplane.grpc.Ticket
+	140, // 8: io.deephaven.proto.backplane.grpc.TimeTableRequest.result_id:type_name -> io.deephaven.proto.backplane.grpc.Ticket
+	140, // 9: io.deephaven.proto.backplane.grpc.SelectOrUpdateRequest.result_id:type_name -> io.deephaven.proto.backplane.grpc.Ticket
 	12,  // 10: io.deephaven.proto.backplane.grpc.SelectOrUpdateRequest.source_id:type_name -> io.deephaven.proto.backplane.grpc.TableReference
 	5,   // 11: io.deephaven.proto.backplane.grpc.MathContext.rounding_mode:type_name -> io.deephaven.proto.backplane.grpc.MathContext.RoundingMode
-	75,  // 12: io.deephaven.proto.backplane.grpc.UpdateByWindowScale.ticks:type_name -> io.deephaven.proto.backplane.grpc.UpdateByWindowScale.UpdateByWindowTicks
-	76,  // 13: io.deephaven.proto.backplane.grpc.UpdateByWindowScale.time:type_name -> io.deephaven.proto.backplane.grpc.UpdateByWindowScale.UpdateByWindowTime
+	77,  // 12: io.deephaven.proto.backplane.grpc.UpdateByWindowScale.ticks:type_name -> io.deephaven.proto.backplane.grpc.UpdateByWindowScale.UpdateByWindowTicks
+	78,  // 13: io.deephaven.proto.backplane.grpc.UpdateByWindowScale.time:type_name -> io.deephaven.proto.backplane.grpc.UpdateByWindowScale.UpdateByWindowTime
 	0,   // 14: io.deephaven.proto.backplane.grpc.UpdateByEmOptions.on_null_value:type_name -> io.deephaven.proto.backplane.grpc.BadDataBehavior
 	0,   // 15: io.deephaven.proto.backplane.grpc.UpdateByEmOptions.on_nan_value:type_name -> io.deephaven.proto.backplane.grpc.BadDataBehavior
 	0,   // 16: io.deephaven.proto.backplane.grpc.UpdateByEmOptions.on_null_time:type_name -> io.deephaven.proto.backplane.grpc.BadDataBehavior
 	0,   // 17: io.deephaven.proto.backplane.grpc.UpdateByEmOptions.on_negative_delta_time:type_name -> io.deephaven.proto.backplane.grpc.BadDataBehavior
 	0,   // 18: io.deephaven.proto.backplane.grpc.UpdateByEmOptions.on_zero_delta_time:type_name -> io.deephaven.proto.backplane.grpc.BadDataBehavior
-	21,  // 19: io.deephaven.proto.backplane.grpc.UpdateByEmOptions.big_value_context:type_name -> io.deephaven.proto.backplane.grpc.MathContext
+	22,  // 19: io.deephaven.proto.backplane.grpc.UpdateByEmOptions.big_value_context:type_name -> io.deephaven.proto.backplane.grpc.MathContext
 	1,   // 20: io.deephaven.proto.backplane.grpc.UpdateByDeltaOptions.null_behavior:type_name -> io.deephaven.proto.backplane.grpc.UpdateByNullBehavior
-	136, // 21: io.deephaven.proto.backplane.grpc.UpdateByRequest.result_id:type_name -> io.deephaven.proto.backplane.grpc.Ticket
+	140, // 21: io.deephaven.proto.backplane.grpc.UpdateByRequest.result_id:type_name -> io.deephaven.proto.backplane.grpc.Ticket
 	12,  // 22: io.deephaven.proto.backplane.grpc.UpdateByRequest.source_id:type_name -> io.deephaven.proto.backplane.grpc.TableReference
-	77,  // 23: io.deephaven.proto.backplane.grpc.UpdateByRequest.options:type_name -> io.deephaven.proto.backplane.grpc.UpdateByRequest.UpdateByOptions
-	78,  // 24: io.deephaven.proto.backplane.grpc.UpdateByRequest.operations:type_name -> io.deephaven.proto.backplane.grpc.UpdateByRequest.UpdateByOperation
-	136, // 25: io.deephaven.proto.backplane.grpc.SelectDistinctRequest.result_id:type_name -> io.deephaven.proto.backplane.grpc.Ticket
+	79,  // 23: io.deephaven.proto.backplane.grpc.UpdateByRequest.options:type_name -> io.deephaven.proto.backplane.grpc.UpdateByRequest.UpdateByOptions
+	80,  // 24: io.deephaven.proto.backplane.grpc.UpdateByRequest.operations:type_name -> io.deephaven.proto.backplane.grpc.UpdateByRequest.UpdateByOperation
+	140, // 25: io.deephaven.proto.backplane.grpc.SelectDistinctRequest.result_id:type_name -> io.deephaven.proto.backplane.grpc.Ticket
 	12,  // 26: io.deephaven.proto.backplane.grpc.SelectDistinctRequest.source_id:type_name -> io.deephaven.proto.backplane.grpc.TableReference
-	136, // 27: io.deephaven.proto.backplane.grpc.DropColumnsRequest.result_id:type_name -> io.deephaven.proto.backplane.grpc.Ticket
+	140, // 27: io.deephaven.proto.backplane.grpc.DropColumnsRequest.result_id:type_name -> io.deephaven.proto.backplane.grpc.Ticket
 	12,  // 28: io.deephaven.proto.backplane.grpc.DropColumnsRequest.source_id:type_name -> io.deephaven.proto.backplane.grpc.TableReference
-	136, // 29: io.deephaven.proto.backplane.grpc.UnstructuredFilterTableRequest.result_id:type_name -> io.deephaven.proto.backplane.grpc.Ticket
+	140, // 29: io.deephaven.proto.backplane.grpc.UnstructuredFilterTableRequest.result_id:type_name -> io.deephaven.proto.backplane.grpc.Ticket
 	12,  // 30: io.deephaven.proto.backplane.grpc.UnstructuredFilterTableRequest.source_id:type_name -> io.deephaven.proto.backplane.grpc.TableReference
-	136, // 31: io.deephaven.proto.backplane.grpc.HeadOrTailRequest.result_id:type_name -> io.deephaven.proto.backplane.grpc.Ticket
+	140, // 31: io.deephaven.proto.backplane.grpc.HeadOrTailRequest.result_id:type_name -> io.deephaven.proto.backplane.grpc.Ticket
 	12,  // 32: io.deephaven.proto.backplane.grpc.HeadOrTailRequest.source_id:type_name -> io.deephaven.proto.backplane.grpc.TableReference
-	136, // 33: io.deephaven.proto.backplane.grpc.HeadOrTailByRequest.result_id:type_name -> io.deephaven.proto.backplane.grpc.Ticket
+	140, // 33: io.deephaven.proto.backplane.grpc.HeadOrTailByRequest.result_id:type_name -> io.deephaven.proto.backplane.grpc.Ticket
 	12,  // 34: io.deephaven.proto.backplane.grpc.HeadOrTailByRequest.source_id:type_name -> io.deephaven.proto.backplane.grpc.TableReference
-	136, // 35: io.deephaven.proto.backplane.grpc.UngroupRequest.result_id:type_name -> io.deephaven.proto.backplane.grpc.Ticket
+	140, // 35: io.deephaven.proto.backplane.grpc.UngroupRequest.result_id:type_name -> io.deephaven.proto.backplane.grpc.Ticket
 	12,  // 36: io.deephaven.proto.backplane.grpc.UngroupRequest.source_id:type_name -> io.deephaven.proto.backplane.grpc.TableReference
-	136, // 37: io.deephaven.proto.backplane.grpc.MergeTablesRequest.result_id:type_name -> io.deephaven.proto.backplane.grpc.Ticket
+	140, // 37: io.deephaven.proto.backplane.grpc.MergeTablesRequest.result_id:type_name -> io.deephaven.proto.backplane.grpc.Ticket
 	12,  // 38: io.deephaven.proto.backplane.grpc.MergeTablesRequest.source_ids:type_name -> io.deephaven.proto.backplane.grpc.TableReference
-	136, // 39: io.deephaven.proto.backplane.grpc.SnapshotTableRequest.result_id:type_name -> io.deephaven.proto.backplane.grpc.Ticket
+	140, // 39: io.deephaven.proto.backplane.grpc.SnapshotTableRequest.result_id:type_name -> io.deephaven.proto.backplane.grpc.Ticket
 	12,  // 40: io.deephaven.proto.backplane.grpc.SnapshotTableRequest.source_id:type_name -> io.deephaven.proto.backplane.grpc.TableReference
-	136, // 41: io.deephaven.proto.backplane.grpc.SnapshotWhenTableRequest.result_id:type_name -> io.deephaven.proto.backplane.grpc.Ticket
+	140, // 41: io.deephaven.proto.backplane.grpc.SnapshotWhenTableRequest.result_id:type_name -> io.deephaven.proto.backplane.grpc.Ticket
 	12,  // 42: io.deephaven.proto.backplane.grpc.SnapshotWhenTableRequest.base_id:type_name -> io.deephaven.proto.backplane.grpc.TableReference
 	12,  // 43: io.deephaven.proto.backplane.grpc.SnapshotWhenTableRequest.trigger_id:type_name -> io.deephaven.proto.backplane.grpc.TableReference
-	136, // 44: io.deephaven.proto.backplane.grpc.CrossJoinTablesRequest.result_id:type_name -> io.deephaven.proto.backplane.grpc.Ticket
+	140, // 44: io.deephaven.proto.backplane.grpc.CrossJoinTablesRequest.result_id:type_name -> io.deephaven.proto.backplane.grpc.Ticket
 	12,  // 45: io.deephaven.proto.backplane.grpc.CrossJoinTablesRequest.left_id:type_name -> io.deephaven.proto.backplane.grpc.TableReference
 	12,  // 46: io.deephaven.proto.backplane.grpc.CrossJoinTablesRequest.right_id:type_name -> io.deephaven.proto.backplane.grpc.TableReference
-	136, // 47: io.deephaven.proto.backplane.grpc.NaturalJoinTablesRequest.result_id:type_name -> io.deephaven.proto.backplane.grpc.Ticket
+	140, // 47: io.deephaven.proto.backplane.grpc.NaturalJoinTablesRequest.result_id:type_name -> io.deephaven.proto.backplane.grpc.Ticket
 	12,  // 48: io.deephaven.proto.backplane.grpc.NaturalJoinTablesRequest.left_id:type_name -> io.deephaven.proto.backplane.grpc.TableReference
 	12,  // 49: io.deephaven.proto.backplane.grpc.NaturalJoinTablesRequest.right_id:type_name -> io.deephaven.proto.backplane.grpc.TableReference
-	136, // 50: io.deephaven.proto.backplane.grpc.ExactJoinTablesRequest.result_id:type_name -> io.deephaven.proto.backplane.grpc.Ticket
+	140, // 50: io.deephaven.proto.backplane.grpc.ExactJoinTablesRequest.result_id:type_name -> io.deephaven.proto.backplane.grpc.Ticket
 	12,  // 51: io.deephaven.proto.backplane.grpc.ExactJoinTablesRequest.left_id:type_name -> io.deephaven.proto.backplane.grpc.TableReference
 	12,  // 52: io.deephaven.proto.backplane.grpc.ExactJoinTablesRequest.right_id:type_name -> io.deephaven.proto.backplane.grpc.TableReference
-	136, // 53: io.deephaven.proto.backplane.grpc.LeftJoinTablesRequest.result_id:type_name -> io.deephaven.proto.backplane.grpc.Ticket
+	140, // 53: io.deephaven.proto.backplane.grpc.LeftJoinTablesRequest.result_id:type_name -> io.deephaven.proto.backplane.grpc.Ticket
 	12,  // 54: io.deephaven.proto.backplane.grpc.LeftJoinTablesRequest.left_id:type_name -> io.deephaven.proto.backplane.grpc.TableReference
 	12,  // 55: io.deephaven.proto.backplane.grpc.LeftJoinTablesRequest.right_id:type_name -> io.deephaven.proto.backplane.grpc.TableReference
-	136, // 56: io.deephaven.proto.backplane.grpc.AsOfJoinTablesRequest.result_id:type_name -> io.deephaven.proto.backplane.grpc.Ticket
+	140, // 56: io.deephaven.proto.backplane.grpc.AsOfJoinTablesRequest.result_id:type_name -> io.deephaven.proto.backplane.grpc.Ticket
 	12,  // 57: io.deephaven.proto.backplane.grpc.AsOfJoinTablesRequest.left_id:type_name -> io.deephaven.proto.backplane.grpc.TableReference
 	12,  // 58: io.deephaven.proto.backplane.grpc.AsOfJoinTablesRequest.right_id:type_name -> io.deephaven.proto.backplane.grpc.TableReference
 	6,   // 59: io.deephaven.proto.backplane.grpc.AsOfJoinTablesRequest.as_of_match_rule:type_name -> io.deephaven.proto.backplane.grpc.AsOfJoinTablesRequest.MatchRule
-	136, // 60: io.deephaven.proto.backplane.grpc.AjRajTablesRequest.result_id:type_name -> io.deephaven.proto.backplane.grpc.Ticket
+	140, // 60: io.deephaven.proto.backplane.grpc.AjRajTablesRequest.result_id:type_name -> io.deephaven.proto.backplane.grpc.Ticket
 	12,  // 61: io.deephaven.proto.backplane.grpc.AjRajTablesRequest.left_id:type_name -> io.deephaven.proto.backplane.grpc.TableReference
 	12,  // 62: io.deephaven.proto.backplane.grpc.AjRajTablesRequest.right_id:type_name -> io.deephaven.proto.backplane.grpc.TableReference
 	12,  // 63: io.deephaven.proto.backplane.grpc.MultiJoinInput.source_id:type_name -> io.deephaven.proto.backplane.grpc.TableReference
-	136, // 64: io.deephaven.proto.backplane.grpc.MultiJoinTablesRequest.result_id:type_name -> io.deephaven.proto.backplane.grpc.Ticket
-	41,  // 65: io.deephaven.proto.backplane.grpc.MultiJoinTablesRequest.multi_join_inputs:type_name -> io.deephaven.proto.backplane.grpc.MultiJoinInput
-	136, // 66: io.deephaven.proto.backplane.grpc.RangeJoinTablesRequest.result_id:type_name -> io.deephaven.proto.backplane.grpc.Ticket
+	140, // 64: io.deephaven.proto.backplane.grpc.MultiJoinTablesRequest.result_id:type_name -> io.deephaven.proto.backplane.grpc.Ticket
+	42,  // 65: io.deephaven.proto.backplane.grpc.MultiJoinTablesRequest.multi_join_inputs:type_name -> io.deephaven.proto.backplane.grpc.MultiJoinInput
+	140, // 66: io.deephaven.proto.backplane.grpc.RangeJoinTablesRequest.result_id:type_name -> io.deephaven.proto.backplane.grpc.Ticket
 	12,  // 67: io.deephaven.proto.backplane.grpc.RangeJoinTablesRequest.left_id:type_name -> io.deephaven.proto.backplane.grpc.TableReference
 	12,  // 68: io.deephaven.proto.backplane.grpc.RangeJoinTablesRequest.right_id:type_name -> io.deephaven.proto.backplane.grpc.TableReference
 	7,   // 69: io.deephaven.proto.backplane.grpc.RangeJoinTablesRequest.range_start_rule:type_name -> io.deephaven.proto.backplane.grpc.RangeJoinTablesRequest.RangeStartRule
 	8,   // 70: io.deephaven.proto.backplane.grpc.RangeJoinTablesRequest.range_end_rule:type_name -> io.deephaven.proto.backplane.grpc.RangeJoinTablesRequest.RangeEndRule
-	48,  // 71: io.deephaven.proto.backplane.grpc.RangeJoinTablesRequest.aggregations:type_name -> io.deephaven.proto.backplane.grpc.Aggregation
-	136, // 72: io.deephaven.proto.backplane.grpc.ComboAggregateRequest.result_id:type_name -> io.deephaven.proto.backplane.grpc.Ticket
+	49,  // 71: io.deephaven.proto.backplane.grpc.RangeJoinTablesRequest.aggregations:type_name -> io.deephaven.proto.backplane.grpc.Aggregation
+	140, // 72: io.deephaven.proto.backplane.grpc.ComboAggregateRequest.result_id:type_name -> io.deephaven.proto.backplane.grpc.Ticket
 	12,  // 73: io.deephaven.proto.backplane.grpc.ComboAggregateRequest.source_id:type_name -> io.deephaven.proto.backplane.grpc.TableReference
-	102, // 74: io.deephaven.proto.backplane.grpc.ComboAggregateRequest.aggregates:type_name -> io.deephaven.proto.backplane.grpc.ComboAggregateRequest.Aggregate
-	136, // 75: io.deephaven.proto.backplane.grpc.AggregateAllRequest.result_id:type_name -> io.deephaven.proto.backplane.grpc.Ticket
+	104, // 74: io.deephaven.proto.backplane.grpc.ComboAggregateRequest.aggregates:type_name -> io.deephaven.proto.backplane.grpc.ComboAggregateRequest.Aggregate
+	140, // 75: io.deephaven.proto.backplane.grpc.AggregateAllRequest.result_id:type_name -> io.deephaven.proto.backplane.grpc.Ticket
 	12,  // 76: io.deephaven.proto.backplane.grpc.AggregateAllRequest.source_id:type_name -> io.deephaven.proto.backplane.grpc.TableReference
-	46,  // 77: io.deephaven.proto.backplane.grpc.AggregateAllRequest.spec:type_name -> io.deephaven.proto.backplane.grpc.AggSpec
-	115, // 78: io.deephaven.proto.backplane.grpc.AggSpec.abs_sum:type_name -> io.deephaven.proto.backplane.grpc.AggSpec.AggSpecAbsSum
-	103, // 79: io.deephaven.proto.backplane.grpc.AggSpec.approximate_percentile:type_name -> io.deephaven.proto.backplane.grpc.AggSpec.AggSpecApproximatePercentile
-	116, // 80: io.deephaven.proto.backplane.grpc.AggSpec.avg:type_name -> io.deephaven.proto.backplane.grpc.AggSpec.AggSpecAvg
-	104, // 81: io.deephaven.proto.backplane.grpc.AggSpec.count_distinct:type_name -> io.deephaven.proto.backplane.grpc.AggSpec.AggSpecCountDistinct
-	105, // 82: io.deephaven.proto.backplane.grpc.AggSpec.distinct:type_name -> io.deephaven.proto.backplane.grpc.AggSpec.AggSpecDistinct
-	117, // 83: io.deephaven.proto.backplane.grpc.AggSpec.first:type_name -> io.deephaven.proto.backplane.grpc.AggSpec.AggSpecFirst
-	106, // 84: io.deephaven.proto.backplane.grpc.AggSpec.formula:type_name -> io.deephaven.proto.backplane.grpc.AggSpec.AggSpecFormula
-	118, // 85: io.deephaven.proto.backplane.grpc.AggSpec.freeze:type_name -> io.deephaven.proto.backplane.grpc.AggSpec.AggSpecFreeze
-	119, // 86: io.deephaven.proto.backplane.grpc.AggSpec.group:type_name -> io.deephaven.proto.backplane.grpc.AggSpec.AggSpecGroup
-	120, // 87: io.deephaven.proto.backplane.grpc.AggSpec.last:type_name -> io.deephaven.proto.backplane.grpc.AggSpec.AggSpecLast
-	121, // 88: io.deephaven.proto.backplane.grpc.AggSpec.max:type_name -> io.deephaven.proto.backplane.grpc.AggSpec.AggSpecMax
-	107, // 89: io.deephaven.proto.backplane.grpc.AggSpec.median:type_name -> io.deephaven.proto.backplane.grpc.AggSpec.AggSpecMedian
-	122, // 90: io.deephaven.proto.backplane.grpc.AggSpec.min:type_name -> io.deephaven.proto.backplane.grpc.AggSpec.AggSpecMin
-	108, // 91: io.deephaven.proto.backplane.grpc.AggSpec.percentile:type_name -> io.deephaven.proto.backplane.grpc.AggSpec.AggSpecPercentile
-	109, // 92: io.deephaven.proto.backplane.grpc.AggSpec.sorted_first:type_name -> io.deephaven.proto.backplane.grpc.AggSpec.AggSpecSorted
-	109, // 93: io.deephaven.proto.backplane.grpc.AggSpec.sorted_last:type_name -> io.deephaven.proto.backplane.grpc.AggSpec.AggSpecSorted
-	123, // 94: io.deephaven.proto.backplane.grpc.AggSpec.std:type_name -> io.deephaven.proto.backplane.grpc.AggSpec.AggSpecStd
-	124, // 95: io.deephaven.proto.backplane.grpc.AggSpec.sum:type_name -> io.deephaven.proto.backplane.grpc.AggSpec.AggSpecSum
-	111, // 96: io.deephaven.proto.backplane.grpc.AggSpec.t_digest:type_name -> io.deephaven.proto.backplane.grpc.AggSpec.AggSpecTDigest
-	112, // 97: io.deephaven.proto.backplane.grpc.AggSpec.unique:type_name -> io.deephaven.proto.backplane.grpc.AggSpec.AggSpecUnique
-	114, // 98: io.deephaven.proto.backplane.grpc.AggSpec.weighted_avg:type_name -> io.deephaven.proto.backplane.grpc.AggSpec.AggSpecWeighted
-	114, // 99: io.deephaven.proto.backplane.grpc.AggSpec.weighted_sum:type_name -> io.deephaven.proto.backplane.grpc.AggSpec.AggSpecWeighted
-	125, // 100: io.deephaven.proto.backplane.grpc.AggSpec.var:type_name -> io.deephaven.proto.backplane.grpc.AggSpec.AggSpecVar
-	136, // 101: io.deephaven.proto.backplane.grpc.AggregateRequest.result_id:type_name -> io.deephaven.proto.backplane.grpc.Ticket
+	47,  // 77: io.deephaven.proto.backplane.grpc.AggregateAllRequest.spec:type_name -> io.deephaven.proto.backplane.grpc.AggSpec
+	117, // 78: io.deephaven.proto.backplane.grpc.AggSpec.abs_sum:type_name -> io.deephaven.proto.backplane.grpc.AggSpec.AggSpecAbsSum
+	105, // 79: io.deephaven.proto.backplane.grpc.AggSpec.approximate_percentile:type_name -> io.deephaven.proto.backplane.grpc.AggSpec.AggSpecApproximatePercentile
+	118, // 80: io.deephaven.proto.backplane.grpc.AggSpec.avg:type_name -> io.deephaven.proto.backplane.grpc.AggSpec.AggSpecAvg
+	106, // 81: io.deephaven.proto.backplane.grpc.AggSpec.count_distinct:type_name -> io.deephaven.proto.backplane.grpc.AggSpec.AggSpecCountDistinct
+	107, // 82: io.deephaven.proto.backplane.grpc.AggSpec.distinct:type_name -> io.deephaven.proto.backplane.grpc.AggSpec.AggSpecDistinct
+	119, // 83: io.deephaven.proto.backplane.grpc.AggSpec.first:type_name -> io.deephaven.proto.backplane.grpc.AggSpec.AggSpecFirst
+	108, // 84: io.deephaven.proto.backplane.grpc.AggSpec.formula:type_name -> io.deephaven.proto.backplane.grpc.AggSpec.AggSpecFormula
+	120, // 85: io.deephaven.proto.backplane.grpc.AggSpec.freeze:type_name -> io.deephaven.proto.backplane.grpc.AggSpec.AggSpecFreeze
+	121, // 86: io.deephaven.proto.backplane.grpc.AggSpec.group:type_name -> io.deephaven.proto.backplane.grpc.AggSpec.AggSpecGroup
+	122, // 87: io.deephaven.proto.backplane.grpc.AggSpec.last:type_name -> io.deephaven.proto.backplane.grpc.AggSpec.AggSpecLast
+	123, // 88: io.deephaven.proto.backplane.grpc.AggSpec.max:type_name -> io.deephaven.proto.backplane.grpc.AggSpec.AggSpecMax
+	109, // 89: io.deephaven.proto.backplane.grpc.AggSpec.median:type_name -> io.deephaven.proto.backplane.grpc.AggSpec.AggSpecMedian
+	124, // 90: io.deephaven.proto.backplane.grpc.AggSpec.min:type_name -> io.deephaven.proto.backplane.grpc.AggSpec.AggSpecMin
+	110, // 91: io.deephaven.proto.backplane.grpc.AggSpec.percentile:type_name -> io.deephaven.proto.backplane.grpc.AggSpec.AggSpecPercentile
+	111, // 92: io.deephaven.proto.backplane.grpc.AggSpec.sorted_first:type_name -> io.deephaven.proto.backplane.grpc.AggSpec.AggSpecSorted
+	111, // 93: io.deephaven.proto.backplane.grpc.AggSpec.sorted_last:type_name -> io.deephaven.proto.backplane.grpc.AggSpec.AggSpecSorted
+	125, // 94: io.deephaven.proto.backplane.grpc.AggSpec.std:type_name -> io.deephaven.proto.backplane.grpc.AggSpec.AggSpecStd
+	126, // 95: io.deephaven.proto.backplane.grpc.AggSpec.sum:type_name -> io.deephaven.proto.backplane.grpc.AggSpec.AggSpecSum
+	113, // 96: io.deephaven.proto.backplane.grpc.AggSpec.t_digest:type_name -> io.deephaven.proto.backplane.grpc.AggSpec.AggSpecTDigest
+	114, // 97: io.deephaven.proto.backplane.grpc.AggSpec.unique:type_name -> io.deephaven.proto.backplane.grpc.AggSpec.AggSpecUnique
+	116, // 98: io.deephaven.proto.backplane.grpc.AggSpec.weighted_avg:type_name -> io.deephaven.proto.backplane.grpc.AggSpec.AggSpecWeighted
+	116, // 99: io.deephaven.proto.backplane.grpc.AggSpec.weighted_sum:type_name -> io.deephaven.proto.backplane.grpc.AggSpec.AggSpecWeighted
+	127, // 100: io.deephaven.proto.backplane.grpc.AggSpec.var:type_name -> io.deephaven.proto.backplane.grpc.AggSpec.AggSpecVar
+	140, // 101: io.deephaven.proto.backplane.grpc.AggregateRequest.result_id:type_name -> io.deephaven.proto.backplane.grpc.Ticket
 	12,  // 102: io.deephaven.proto.backplane.grpc.AggregateRequest.source_id:type_name -> io.deephaven.proto.backplane.grpc.TableReference
 	12,  // 103: io.deephaven.proto.backplane.grpc.AggregateRequest.initial_groups_id:type_name -> io.deephaven.proto.backplane.grpc.TableReference
-	48,  // 104: io.deephaven.proto.backplane.grpc.AggregateRequest.aggregations:type_name -> io.deephaven.proto.backplane.grpc.Aggregation
-	126, // 105: io.deephaven.proto.backplane.grpc.Aggregation.columns:type_name -> io.deephaven.proto.backplane.grpc.Aggregation.AggregationColumns
-	127, // 106: io.deephaven.proto.backplane.grpc.Aggregation.count:type_name -> io.deephaven.proto.backplane.grpc.Aggregation.AggregationCount
-	128, // 107: io.deephaven.proto.backplane.grpc.Aggregation.first_row_key:type_name -> io.deephaven.proto.backplane.grpc.Aggregation.AggregationRowKey
-	128, // 108: io.deephaven.proto.backplane.grpc.Aggregation.last_row_key:type_name -> io.deephaven.proto.backplane.grpc.Aggregation.AggregationRowKey
-	129, // 109: io.deephaven.proto.backplane.grpc.Aggregation.partition:type_name -> io.deephaven.proto.backplane.grpc.Aggregation.AggregationPartition
-	10,  // 110: io.deephaven.proto.backplane.grpc.SortDescriptor.direction:type_name -> io.deephaven.proto.backplane.grpc.SortDescriptor.SortDirection
-	136, // 111: io.deephaven.proto.backplane.grpc.SortTableRequest.result_id:type_name -> io.deephaven.proto.backplane.grpc.Ticket
-	12,  // 112: io.deephaven.proto.backplane.grpc.SortTableRequest.source_id:type_name -> io.deephaven.proto.backplane.grpc.TableReference
-	49,  // 113: io.deephaven.proto.backplane.grpc.SortTableRequest.sorts:type_name -> io.deephaven.proto.backplane.grpc.SortDescriptor
-	136, // 114: io.deephaven.proto.backplane.grpc.FilterTableRequest.result_id:type_name -> io.deephaven.proto.backplane.grpc.Ticket
-	12,  // 115: io.deephaven.proto.backplane.grpc.FilterTableRequest.source_id:type_name -> io.deephaven.proto.backplane.grpc.TableReference
-	57,  // 116: io.deephaven.proto.backplane.grpc.FilterTableRequest.filters:type_name -> io.deephaven.proto.backplane.grpc.Condition
-	136, // 117: io.deephaven.proto.backplane.grpc.SeekRowRequest.source_id:type_name -> io.deephaven.proto.backplane.grpc.Ticket
-	55,  // 118: io.deephaven.proto.backplane.grpc.SeekRowRequest.seek_value:type_name -> io.deephaven.proto.backplane.grpc.Literal
-	54,  // 119: io.deephaven.proto.backplane.grpc.Value.reference:type_name -> io.deephaven.proto.backplane.grpc.Reference
-	55,  // 120: io.deephaven.proto.backplane.grpc.Value.literal:type_name -> io.deephaven.proto.backplane.grpc.Literal
-	58,  // 121: io.deephaven.proto.backplane.grpc.Condition.and:type_name -> io.deephaven.proto.backplane.grpc.AndCondition
-	59,  // 122: io.deephaven.proto.backplane.grpc.Condition.or:type_name -> io.deephaven.proto.backplane.grpc.OrCondition
-	60,  // 123: io.deephaven.proto.backplane.grpc.Condition.not:type_name -> io.deephaven.proto.backplane.grpc.NotCondition
-	61,  // 124: io.deephaven.proto.backplane.grpc.Condition.compare:type_name -> io.deephaven.proto.backplane.grpc.CompareCondition
-	62,  // 125: io.deephaven.proto.backplane.grpc.Condition.in:type_name -> io.deephaven.proto.backplane.grpc.InCondition
-	63,  // 126: io.deephaven.proto.backplane.grpc.Condition.invoke:type_name -> io.deephaven.proto.backplane.grpc.InvokeCondition
-	64,  // 127: io.deephaven.proto.backplane.grpc.Condition.is_null:type_name -> io.deephaven.proto.backplane.grpc.IsNullCondition
-	65,  // 128: io.deephaven.proto.backplane.grpc.Condition.matches:type_name -> io.deephaven.proto.backplane.grpc.MatchesCondition
-	66,  // 129: io.deephaven.proto.backplane.grpc.Condition.contains:type_name -> io.deephaven.proto.backplane.grpc.ContainsCondition
-	67,  // 130: io.deephaven.proto.backplane.grpc.Condition.search:type_name -> io.deephaven.proto.backplane.grpc.SearchCondition
-	57,  // 131: io.deephaven.proto.backplane.grpc.AndCondition.filters:type_name -> io.deephaven.proto.backplane.grpc.Condition
-	57,  // 132: io.deephaven.proto.backplane.grpc.OrCondition.filters:type_name -> io.deephaven.proto.backplane.grpc.Condition
-	57,  // 133: io.deephaven.proto.backplane.grpc.NotCondition.filter:type_name -> io.deephaven.proto.backplane.grpc.Condition
-	11,  // 134: io.deephaven.proto.backplane.grpc.CompareCondition.operation:type_name -> io.deephaven.proto.backplane.grpc.CompareCondition.CompareOperation
-	3,   // 135: io.deephaven.proto.backplane.grpc.CompareCondition.case_sensitivity:type_name -> io.deephaven.proto.backplane.grpc.CaseSensitivity
-	56,  // 136: io.deephaven.proto.backplane.grpc.CompareCondition.lhs:type_name -> io.deephaven.proto.backplane.grpc.Value
-	56,  // 137: io.deephaven.proto.backplane.grpc.CompareCondition.rhs:type_name -> io.deephaven.proto.backplane.grpc.Value
-	56,  // 138: io.deephaven.proto.backplane.grpc.InCondition.target:type_name -> io.deephaven.proto.backplane.grpc.Value
-	56,  // 139: io.deephaven.proto.backplane.grpc.InCondition.candidates:type_name -> io.deephaven.proto.backplane.grpc.Value
-	3,   // 140: io.deephaven.proto.backplane.grpc.InCondition.case_sensitivity:type_name -> io.deephaven.proto.backplane.grpc.CaseSensitivity
-	4,   // 141: io.deephaven.proto.backplane.grpc.InCondition.match_type:type_name -> io.deephaven.proto.backplane.grpc.MatchType
-	56,  // 142: io.deephaven.proto.backplane.grpc.InvokeCondition.target:type_name -> io.deephaven.proto.backplane.grpc.Value
-	56,  // 143: io.deephaven.proto.backplane.grpc.InvokeCondition.arguments:type_name -> io.deephaven.proto.backplane.grpc.Value
-	54,  // 144: io.deephaven.proto.backplane.grpc.IsNullCondition.reference:type_name -> io.deephaven.proto.backplane.grpc.Reference
-	54,  // 145: io.deephaven.proto.backplane.grpc.MatchesCondition.reference:type_name -> io.deephaven.proto.backplane.grpc.Reference
-	3,   // 146: io.deephaven.proto.backplane.grpc.MatchesCondition.case_sensitivity:type_name -> io.deephaven.proto.backplane.grpc.CaseSensitivity
-	4,   // 147: io.deephaven.proto.backplane.grpc.MatchesCondition.match_type:type_name -> io.deephaven.proto.backplane.grpc.MatchType
-	54,  // 148: io.deephaven.proto.backplane.grpc.ContainsCondition.reference:type_name -> io.deephaven.proto.backplane.grpc.Reference
-	3,   // 149: io.deephaven.proto.backplane.grpc.ContainsCondition.case_sensitivity:type_name -> io.deephaven.proto.backplane.grpc.CaseSensitivity
-	4,   // 150: io.deephaven.proto.backplane.grpc.ContainsCondition.match_type:type_name -> io.deephaven.proto.backplane.grpc.MatchType
-	54,  // 151: io.deephaven.proto.backplane.grpc.SearchCondition.optional_references:type_name -> io.deephaven.proto.backplane.grpc.Reference
-	136, // 152: io.deephaven.proto.backplane.grpc.FlattenRequest.result_id:type_name -> io.deephaven.proto.backplane.grpc.Ticket
-	12,  // 153: io.deephaven.proto.backplane.grpc.FlattenRequest.source_id:type_name -> io.deephaven.proto.backplane.grpc.TableReference
-	136, // 154: io.deephaven.proto.backplane.grpc.MetaTableRequest.result_id:type_name -> io.deephaven.proto.backplane.grpc.Ticket
-	12,  // 155: io.deephaven.proto.backplane.grpc.MetaTableRequest.source_id:type_name -> io.deephaven.proto.backplane.grpc.TableReference
-	136, // 156: io.deephaven.proto.backplane.grpc.RunChartDownsampleRequest.result_id:type_name -> io.deephaven.proto.backplane.grpc.Ticket
-	12,  // 157: io.deephaven.proto.backplane.grpc.RunChartDownsampleRequest.source_id:type_name -> io.deephaven.proto.backplane.grpc.TableReference
-	130, // 158: io.deephaven.proto.backplane.grpc.RunChartDownsampleRequest.zoom_range:type_name -> io.deephaven.proto.backplane.grpc.RunChartDownsampleRequest.ZoomRange
-	136, // 159: io.deephaven.proto.backplane.grpc.CreateInputTableRequest.result_id:type_name -> io.deephaven.proto.backplane.grpc.Ticket
-	12,  // 160: io.deephaven.proto.backplane.grpc.CreateInputTableRequest.source_table_id:type_name -> io.deephaven.proto.backplane.grpc.TableReference
-	131, // 161: io.deephaven.proto.backplane.grpc.CreateInputTableRequest.kind:type_name -> io.deephaven.proto.backplane.grpc.CreateInputTableRequest.InputTableKind
-	136, // 162: io.deephaven.proto.backplane.grpc.WhereInRequest.result_id:type_name -> io.deephaven.proto.backplane.grpc.Ticket
-	12,  // 163: io.deephaven.proto.backplane.grpc.WhereInRequest.left_id:type_name -> io.deephaven.proto.backplane.grpc.TableReference
-	12,  // 164: io.deephaven.proto.backplane.grpc.WhereInRequest.right_id:type_name -> io.deephaven.proto.backplane.grpc.TableReference
-	136, // 165: io.deephaven.proto.backplane.grpc.ColumnStatisticsRequest.result_id:type_name -> io.deephaven.proto.backplane.grpc.Ticket
-	12,  // 166: io.deephaven.proto.backplane.grpc.ColumnStatisticsRequest.source_id:type_name -> io.deephaven.proto.backplane.grpc.TableReference
-	135, // 167: io.deephaven.proto.backplane.grpc.BatchTableRequest.ops:type_name -> io.deephaven.proto.backplane.grpc.BatchTableRequest.Operation
-	21,  // 168: io.deephaven.proto.backplane.grpc.UpdateByRequest.UpdateByOptions.math_context:type_name -> io.deephaven.proto.backplane.grpc.MathContext
-	79,  // 169: io.deephaven.proto.backplane.grpc.UpdateByRequest.UpdateByOperation.column:type_name -> io.deephaven.proto.backplane.grpc.UpdateByRequest.UpdateByOperation.UpdateByColumn
-	80,  // 170: io.deephaven.proto.backplane.grpc.UpdateByRequest.UpdateByOperation.UpdateByColumn.spec:type_name -> io.deephaven.proto.backplane.grpc.UpdateByRequest.UpdateByOperation.UpdateByColumn.UpdateBySpec
-	81,  // 171: io.deephaven.proto.backplane.grpc.UpdateByRequest.UpdateByOperation.UpdateByColumn.UpdateBySpec.sum:type_name -> io.deephaven.proto.backplane.grpc.UpdateByRequest.UpdateByOperation.UpdateByColumn.UpdateBySpec.UpdateByCumulativeSum
-	82,  // 172: io.deephaven.proto.backplane.grpc.UpdateByRequest.UpdateByOperation.UpdateByColumn.UpdateBySpec.min:type_name -> io.deephaven.proto.backplane.grpc.UpdateByRequest.UpdateByOperation.UpdateByColumn.UpdateBySpec.UpdateByCumulativeMin
-	83,  // 173: io.deephaven.proto.backplane.grpc.UpdateByRequest.UpdateByOperation.UpdateByColumn.UpdateBySpec.max:type_name -> io.deephaven.proto.backplane.grpc.UpdateByRequest.UpdateByOperation.UpdateByColumn.UpdateBySpec.UpdateByCumulativeMax
-	84,  // 174: io.deephaven.proto.backplane.grpc.UpdateByRequest.UpdateByOperation.UpdateByColumn.UpdateBySpec.product:type_name -> io.deephaven.proto.backplane.grpc.UpdateByRequest.UpdateByOperation.UpdateByColumn.UpdateBySpec.UpdateByCumulativeProduct
-	85,  // 175: io.deephaven.proto.backplane.grpc.UpdateByRequest.UpdateByOperation.UpdateByColumn.UpdateBySpec.fill:type_name -> io.deephaven.proto.backplane.grpc.UpdateByRequest.UpdateByOperation.UpdateByColumn.UpdateBySpec.UpdateByFill
-	86,  // 176: io.deephaven.proto.backplane.grpc.UpdateByRequest.UpdateByOperation.UpdateByColumn.UpdateBySpec.ema:type_name -> io.deephaven.proto.backplane.grpc.UpdateByRequest.UpdateByOperation.UpdateByColumn.UpdateBySpec.UpdateByEma
-	92,  // 177: io.deephaven.proto.backplane.grpc.UpdateByRequest.UpdateByOperation.UpdateByColumn.UpdateBySpec.rolling_sum:type_name -> io.deephaven.proto.backplane.grpc.UpdateByRequest.UpdateByOperation.UpdateByColumn.UpdateBySpec.UpdateByRollingSum
-	93,  // 178: io.deephaven.proto.backplane.grpc.UpdateByRequest.UpdateByOperation.UpdateByColumn.UpdateBySpec.rolling_group:type_name -> io.deephaven.proto.backplane.grpc.UpdateByRequest.UpdateByOperation.UpdateByColumn.UpdateBySpec.UpdateByRollingGroup
-	94,  // 179: io.deephaven.proto.backplane.grpc.UpdateByRequest.UpdateByOperation.UpdateByColumn.UpdateBySpec.rolling_avg:type_name -> io.deephaven.proto.backplane.grpc.UpdateByRequest.UpdateByOperation.UpdateByColumn.UpdateBySpec.UpdateByRollingAvg
-	95,  // 180: io.deephaven.proto.backplane.grpc.UpdateByRequest.UpdateByOperation.UpdateByColumn.UpdateBySpec.rolling_min:type_name -> io.deephaven.proto.backplane.grpc.UpdateByRequest.UpdateByOperation.UpdateByColumn.UpdateBySpec.UpdateByRollingMin
-	96,  // 181: io.deephaven.proto.backplane.grpc.UpdateByRequest.UpdateByOperation.UpdateByColumn.UpdateBySpec.rolling_max:type_name -> io.deephaven.proto.backplane.grpc.UpdateByRequest.UpdateByOperation.UpdateByColumn.UpdateBySpec.UpdateByRollingMax
-	97,  // 182: io.deephaven.proto.backplane.grpc.UpdateByRequest.UpdateByOperation.UpdateByColumn.UpdateBySpec.rolling_product:type_name -> io.deephaven.proto.backplane.grpc.UpdateByRequest.UpdateByOperation.UpdateByColumn.UpdateBySpec.UpdateByRollingProduct
-	91,  // 183: io.deephaven.proto.backplane.grpc.UpdateByRequest.UpdateByOperation.UpdateByColumn.UpdateBySpec.delta:type_name -> io.deephaven.proto.backplane.grpc.UpdateByRequest.UpdateByOperation.UpdateByColumn.UpdateBySpec.UpdateByDelta
-	87,  // 184: io.deephaven.proto.backplane.grpc.UpdateByRequest.UpdateByOperation.UpdateByColumn.UpdateBySpec.ems:type_name -> io.deephaven.proto.backplane.grpc.UpdateByRequest.UpdateByOperation.UpdateByColumn.UpdateBySpec.UpdateByEms
-	88,  // 185: io.deephaven.proto.backplane.grpc.UpdateByRequest.UpdateByOperation.UpdateByColumn.UpdateBySpec.em_min:type_name -> io.deephaven.proto.backplane.grpc.UpdateByRequest.UpdateByOperation.UpdateByColumn.UpdateBySpec.UpdateByEmMin
-	89,  // 186: io.deephaven.proto.backplane.grpc.UpdateByRequest.UpdateByOperation.UpdateByColumn.UpdateBySpec.em_max:type_name -> io.deephaven.proto.backplane.grpc.UpdateByRequest.UpdateByOperation.UpdateByColumn.UpdateBySpec.UpdateByEmMax
-	90,  // 187: io.deephaven.proto.backplane.grpc.UpdateByRequest.UpdateByOperation.UpdateByColumn.UpdateBySpec.em_std:type_name -> io.deephaven.proto.backplane.grpc.UpdateByRequest.UpdateByOperation.UpdateByColumn.UpdateBySpec.UpdateByEmStd
-	98,  // 188: io.deephaven.proto.backplane.grpc.UpdateByRequest.UpdateByOperation.UpdateByColumn.UpdateBySpec.rolling_count:type_name -> io.deephaven.proto.backplane.grpc.UpdateByRequest.UpdateByOperation.UpdateByColumn.UpdateBySpec.UpdateByRollingCount
-	99,  // 189: io.deephaven.proto.backplane.grpc.UpdateByRequest.UpdateByOperation.UpdateByColumn.UpdateBySpec.rolling_std:type_name -> io.deephaven.proto.backplane.grpc.UpdateByRequest.UpdateByOperation.UpdateByColumn.UpdateBySpec.UpdateByRollingStd
-	100, // 190: io.deephaven.proto.backplane.grpc.UpdateByRequest.UpdateByOperation.UpdateByColumn.UpdateBySpec.rolling_wavg:type_name -> io.deephaven.proto.backplane.grpc.UpdateByRequest.UpdateByOperation.UpdateByColumn.UpdateBySpec.UpdateByRollingWAvg
-	101, // 191: io.deephaven.proto.backplane.grpc.UpdateByRequest.UpdateByOperation.UpdateByColumn.UpdateBySpec.rolling_formula:type_name -> io.deephaven.proto.backplane.grpc.UpdateByRequest.UpdateByOperation.UpdateByColumn.UpdateBySpec.UpdateByRollingFormula
-	23,  // 192: io.deephaven.proto.backplane.grpc.UpdateByRequest.UpdateByOperation.UpdateByColumn.UpdateBySpec.UpdateByEma.options:type_name -> io.deephaven.proto.backplane.grpc.UpdateByEmOptions
-	22,  // 193: io.deephaven.proto.backplane.grpc.UpdateByRequest.UpdateByOperation.UpdateByColumn.UpdateBySpec.UpdateByEma.window_scale:type_name -> io.deephaven.proto.backplane.grpc.UpdateByWindowScale
-	23,  // 194: io.deephaven.proto.backplane.grpc.UpdateByRequest.UpdateByOperation.UpdateByColumn.UpdateBySpec.UpdateByEms.options:type_name -> io.deephaven.proto.backplane.grpc.UpdateByEmOptions
-	22,  // 195: io.deephaven.proto.backplane.grpc.UpdateByRequest.UpdateByOperation.UpdateByColumn.UpdateBySpec.UpdateByEms.window_scale:type_name -> io.deephaven.proto.backplane.grpc.UpdateByWindowScale
-	23,  // 196: io.deephaven.proto.backplane.grpc.UpdateByRequest.UpdateByOperation.UpdateByColumn.UpdateBySpec.UpdateByEmMin.options:type_name -> io.deephaven.proto.backplane.grpc.UpdateByEmOptions
-	22,  // 197: io.deephaven.proto.backplane.grpc.UpdateByRequest.UpdateByOperation.UpdateByColumn.UpdateBySpec.UpdateByEmMin.window_scale:type_name -> io.deephaven.proto.backplane.grpc.UpdateByWindowScale
-	23,  // 198: io.deephaven.proto.backplane.grpc.UpdateByRequest.UpdateByOperation.UpdateByColumn.UpdateBySpec.UpdateByEmMax.options:type_name -> io.deephaven.proto.backplane.grpc.UpdateByEmOptions
-	22,  // 199: io.deephaven.proto.backplane.grpc.UpdateByRequest.UpdateByOperation.UpdateByColumn.UpdateBySpec.UpdateByEmMax.window_scale:type_name -> io.deephaven.proto.backplane.grpc.UpdateByWindowScale
-	23,  // 200: io.deephaven.proto.backplane.grpc.UpdateByRequest.UpdateByOperation.UpdateByColumn.UpdateBySpec.UpdateByEmStd.options:type_name -> io.deephaven.proto.backplane.grpc.UpdateByEmOptions
-	22,  // 201: io.deephaven.proto.backplane.grpc.UpdateByRequest.UpdateByOperation.UpdateByColumn.UpdateBySpec.UpdateByEmStd.window_scale:type_name -> io.deephaven.proto.backplane.grpc.UpdateByWindowScale
-	24,  // 202: io.deephaven.proto.backplane.grpc.UpdateByRequest.UpdateByOperation.UpdateByColumn.UpdateBySpec.UpdateByDelta.options:type_name -> io.deephaven.proto.backplane.grpc.UpdateByDeltaOptions
-	22,  // 203: io.deephaven.proto.backplane.grpc.UpdateByRequest.UpdateByOperation.UpdateByColumn.UpdateBySpec.UpdateByRollingSum.reverse_window_scale:type_name -> io.deephaven.proto.backplane.grpc.UpdateByWindowScale
-	22,  // 204: io.deephaven.proto.backplane.grpc.UpdateByRequest.UpdateByOperation.UpdateByColumn.UpdateBySpec.UpdateByRollingSum.forward_window_scale:type_name -> io.deephaven.proto.backplane.grpc.UpdateByWindowScale
-	22,  // 205: io.deephaven.proto.backplane.grpc.UpdateByRequest.UpdateByOperation.UpdateByColumn.UpdateBySpec.UpdateByRollingGroup.reverse_window_scale:type_name -> io.deephaven.proto.backplane.grpc.UpdateByWindowScale
-	22,  // 206: io.deephaven.proto.backplane.grpc.UpdateByRequest.UpdateByOperation.UpdateByColumn.UpdateBySpec.UpdateByRollingGroup.forward_window_scale:type_name -> io.deephaven.proto.backplane.grpc.UpdateByWindowScale
-	22,  // 207: io.deephaven.proto.backplane.grpc.UpdateByRequest.UpdateByOperation.UpdateByColumn.UpdateBySpec.UpdateByRollingAvg.reverse_window_scale:type_name -> io.deephaven.proto.backplane.grpc.UpdateByWindowScale
-	22,  // 208: io.deephaven.proto.backplane.grpc.UpdateByRequest.UpdateByOperation.UpdateByColumn.UpdateBySpec.UpdateByRollingAvg.forward_window_scale:type_name -> io.deephaven.proto.backplane.grpc.UpdateByWindowScale
-	22,  // 209: io.deephaven.proto.backplane.grpc.UpdateByRequest.UpdateByOperation.UpdateByColumn.UpdateBySpec.UpdateByRollingMin.reverse_window_scale:type_name -> io.deephaven.proto.backplane.grpc.UpdateByWindowScale
-	22,  // 210: io.deephaven.proto.backplane.grpc.UpdateByRequest.UpdateByOperation.UpdateByColumn.UpdateBySpec.UpdateByRollingMin.forward_window_scale:type_name -> io.deephaven.proto.backplane.grpc.UpdateByWindowScale
-	22,  // 211: io.deephaven.proto.backplane.grpc.UpdateByRequest.UpdateByOperation.UpdateByColumn.UpdateBySpec.UpdateByRollingMax.reverse_window_scale:type_name -> io.deephaven.proto.backplane.grpc.UpdateByWindowScale
-	22,  // 212: io.deephaven.proto.backplane.grpc.UpdateByRequest.UpdateByOperation.UpdateByColumn.UpdateBySpec.UpdateByRollingMax.forward_window_scale:type_name -> io.deephaven.proto.backplane.grpc.UpdateByWindowScale
-	22,  // 213: io.deephaven.proto.backplane.grpc.UpdateByRequest.UpdateByOperation.UpdateByColumn.UpdateBySpec.UpdateByRollingProduct.reverse_window_scale:type_name -> io.deephaven.proto.backplane.grpc.UpdateByWindowScale
-	22,  // 214: io.deephaven.proto.backplane.grpc.UpdateByRequest.UpdateByOperation.UpdateByColumn.UpdateBySpec.UpdateByRollingProduct.forward_window_scale:type_name -> io.deephaven.proto.backplane.grpc.UpdateByWindowScale
-	22,  // 215: io.deephaven.proto.backplane.grpc.UpdateByRequest.UpdateByOperation.UpdateByColumn.UpdateBySpec.UpdateByRollingCount.reverse_window_scale:type_name -> io.deephaven.proto.backplane.grpc.UpdateByWindowScale
-	22,  // 216: io.deephaven.proto.backplane.grpc.UpdateByRequest.UpdateByOperation.UpdateByColumn.UpdateBySpec.UpdateByRollingCount.forward_window_scale:type_name -> io.deephaven.proto.backplane.grpc.UpdateByWindowScale
-	22,  // 217: io.deephaven.proto.backplane.grpc.UpdateByRequest.UpdateByOperation.UpdateByColumn.UpdateBySpec.UpdateByRollingStd.reverse_window_scale:type_name -> io.deephaven.proto.backplane.grpc.UpdateByWindowScale
-	22,  // 218: io.deephaven.proto.backplane.grpc.UpdateByRequest.UpdateByOperation.UpdateByColumn.UpdateBySpec.UpdateByRollingStd.forward_window_scale:type_name -> io.deephaven.proto.backplane.grpc.UpdateByWindowScale
-	22,  // 219: io.deephaven.proto.backplane.grpc.UpdateByRequest.UpdateByOperation.UpdateByColumn.UpdateBySpec.UpdateByRollingWAvg.reverse_window_scale:type_name -> io.deephaven.proto.backplane.grpc.UpdateByWindowScale
-	22,  // 220: io.deephaven.proto.backplane.grpc.UpdateByRequest.UpdateByOperation.UpdateByColumn.UpdateBySpec.UpdateByRollingWAvg.forward_window_scale:type_name -> io.deephaven.proto.backplane.grpc.UpdateByWindowScale
-	22,  // 221: io.deephaven.proto.backplane.grpc.UpdateByRequest.UpdateByOperation.UpdateByColumn.UpdateBySpec.UpdateByRollingFormula.reverse_window_scale:type_name -> io.deephaven.proto.backplane.grpc.UpdateByWindowScale
-	22,  // 222: io.deephaven.proto.backplane.grpc.UpdateByRequest.UpdateByOperation.UpdateByColumn.UpdateBySpec.UpdateByRollingFormula.forward_window_scale:type_name -> io.deephaven.proto.backplane.grpc.UpdateByWindowScale
-	9,   // 223: io.deephaven.proto.backplane.grpc.ComboAggregateRequest.Aggregate.type:type_name -> io.deephaven.proto.backplane.grpc.ComboAggregateRequest.AggType
-	110, // 224: io.deephaven.proto.backplane.grpc.AggSpec.AggSpecSorted.columns:type_name -> io.deephaven.proto.backplane.grpc.AggSpec.AggSpecSortedColumn
-	113, // 225: io.deephaven.proto.backplane.grpc.AggSpec.AggSpecUnique.non_unique_sentinel:type_name -> io.deephaven.proto.backplane.grpc.AggSpec.AggSpecNonUniqueSentinel
-	2,   // 226: io.deephaven.proto.backplane.grpc.AggSpec.AggSpecNonUniqueSentinel.null_value:type_name -> io.deephaven.proto.backplane.grpc.NullValue
-	46,  // 227: io.deephaven.proto.backplane.grpc.Aggregation.AggregationColumns.spec:type_name -> io.deephaven.proto.backplane.grpc.AggSpec
-	132, // 228: io.deephaven.proto.backplane.grpc.CreateInputTableRequest.InputTableKind.in_memory_append_only:type_name -> io.deephaven.proto.backplane.grpc.CreateInputTableRequest.InputTableKind.InMemoryAppendOnly
-	133, // 229: io.deephaven.proto.backplane.grpc.CreateInputTableRequest.InputTableKind.in_memory_key_backed:type_name -> io.deephaven.proto.backplane.grpc.CreateInputTableRequest.InputTableKind.InMemoryKeyBacked
-	134, // 230: io.deephaven.proto.backplane.grpc.CreateInputTableRequest.InputTableKind.blink:type_name -> io.deephaven.proto.backplane.grpc.CreateInputTableRequest.InputTableKind.Blink
-	18,  // 231: io.deephaven.proto.backplane.grpc.BatchTableRequest.Operation.empty_table:type_name -> io.deephaven.proto.backplane.grpc.EmptyTableRequest
-	19,  // 232: io.deephaven.proto.backplane.grpc.BatchTableRequest.Operation.time_table:type_name -> io.deephaven.proto.backplane.grpc.TimeTableRequest
-	27,  // 233: io.deephaven.proto.backplane.grpc.BatchTableRequest.Operation.drop_columns:type_name -> io.deephaven.proto.backplane.grpc.DropColumnsRequest
-	20,  // 234: io.deephaven.proto.backplane.grpc.BatchTableRequest.Operation.update:type_name -> io.deephaven.proto.backplane.grpc.SelectOrUpdateRequest
-	20,  // 235: io.deephaven.proto.backplane.grpc.BatchTableRequest.Operation.lazy_update:type_name -> io.deephaven.proto.backplane.grpc.SelectOrUpdateRequest
-	20,  // 236: io.deephaven.proto.backplane.grpc.BatchTableRequest.Operation.view:type_name -> io.deephaven.proto.backplane.grpc.SelectOrUpdateRequest
-	20,  // 237: io.deephaven.proto.backplane.grpc.BatchTableRequest.Operation.update_view:type_name -> io.deephaven.proto.backplane.grpc.SelectOrUpdateRequest
-	20,  // 238: io.deephaven.proto.backplane.grpc.BatchTableRequest.Operation.select:type_name -> io.deephaven.proto.backplane.grpc.SelectOrUpdateRequest
-	26,  // 239: io.deephaven.proto.backplane.grpc.BatchTableRequest.Operation.select_distinct:type_name -> io.deephaven.proto.backplane.grpc.SelectDistinctRequest
-	51,  // 240: io.deephaven.proto.backplane.grpc.BatchTableRequest.Operation.filter:type_name -> io.deephaven.proto.backplane.grpc.FilterTableRequest
-	28,  // 241: io.deephaven.proto.backplane.grpc.BatchTableRequest.Operation.unstructured_filter:type_name -> io.deephaven.proto.backplane.grpc.UnstructuredFilterTableRequest
-	50,  // 242: io.deephaven.proto.backplane.grpc.BatchTableRequest.Operation.sort:type_name -> io.deephaven.proto.backplane.grpc.SortTableRequest
-	29,  // 243: io.deephaven.proto.backplane.grpc.BatchTableRequest.Operation.head:type_name -> io.deephaven.proto.backplane.grpc.HeadOrTailRequest
-	29,  // 244: io.deephaven.proto.backplane.grpc.BatchTableRequest.Operation.tail:type_name -> io.deephaven.proto.backplane.grpc.HeadOrTailRequest
-	30,  // 245: io.deephaven.proto.backplane.grpc.BatchTableRequest.Operation.head_by:type_name -> io.deephaven.proto.backplane.grpc.HeadOrTailByRequest
-	30,  // 246: io.deephaven.proto.backplane.grpc.BatchTableRequest.Operation.tail_by:type_name -> io.deephaven.proto.backplane.grpc.HeadOrTailByRequest
-	31,  // 247: io.deephaven.proto.backplane.grpc.BatchTableRequest.Operation.ungroup:type_name -> io.deephaven.proto.backplane.grpc.UngroupRequest
-	32,  // 248: io.deephaven.proto.backplane.grpc.BatchTableRequest.Operation.merge:type_name -> io.deephaven.proto.backplane.grpc.MergeTablesRequest
-	44,  // 249: io.deephaven.proto.backplane.grpc.BatchTableRequest.Operation.combo_aggregate:type_name -> io.deephaven.proto.backplane.grpc.ComboAggregateRequest
-	68,  // 250: io.deephaven.proto.backplane.grpc.BatchTableRequest.Operation.flatten:type_name -> io.deephaven.proto.backplane.grpc.FlattenRequest
-	70,  // 251: io.deephaven.proto.backplane.grpc.BatchTableRequest.Operation.run_chart_downsample:type_name -> io.deephaven.proto.backplane.grpc.RunChartDownsampleRequest
-	35,  // 252: io.deephaven.proto.backplane.grpc.BatchTableRequest.Operation.cross_join:type_name -> io.deephaven.proto.backplane.grpc.CrossJoinTablesRequest
-	36,  // 253: io.deephaven.proto.backplane.grpc.BatchTableRequest.Operation.natural_join:type_name -> io.deephaven.proto.backplane.grpc.NaturalJoinTablesRequest
-	37,  // 254: io.deephaven.proto.backplane.grpc.BatchTableRequest.Operation.exact_join:type_name -> io.deephaven.proto.backplane.grpc.ExactJoinTablesRequest
-	38,  // 255: io.deephaven.proto.backplane.grpc.BatchTableRequest.Operation.left_join:type_name -> io.deephaven.proto.backplane.grpc.LeftJoinTablesRequest
-	39,  // 256: io.deephaven.proto.backplane.grpc.BatchTableRequest.Operation.as_of_join:type_name -> io.deephaven.proto.backplane.grpc.AsOfJoinTablesRequest
-	14,  // 257: io.deephaven.proto.backplane.grpc.BatchTableRequest.Operation.fetch_table:type_name -> io.deephaven.proto.backplane.grpc.FetchTableRequest
-	15,  // 258: io.deephaven.proto.backplane.grpc.BatchTableRequest.Operation.apply_preview_columns:type_name -> io.deephaven.proto.backplane.grpc.ApplyPreviewColumnsRequest
-	71,  // 259: io.deephaven.proto.backplane.grpc.BatchTableRequest.Operation.create_input_table:type_name -> io.deephaven.proto.backplane.grpc.CreateInputTableRequest
-	25,  // 260: io.deephaven.proto.backplane.grpc.BatchTableRequest.Operation.update_by:type_name -> io.deephaven.proto.backplane.grpc.UpdateByRequest
-	72,  // 261: io.deephaven.proto.backplane.grpc.BatchTableRequest.Operation.where_in:type_name -> io.deephaven.proto.backplane.grpc.WhereInRequest
-	45,  // 262: io.deephaven.proto.backplane.grpc.BatchTableRequest.Operation.aggregate_all:type_name -> io.deephaven.proto.backplane.grpc.AggregateAllRequest
-	47,  // 263: io.deephaven.proto.backplane.grpc.BatchTableRequest.Operation.aggregate:type_name -> io.deephaven.proto.backplane.grpc.AggregateRequest
-	33,  // 264: io.deephaven.proto.backplane.grpc.BatchTableRequest.Operation.snapshot:type_name -> io.deephaven.proto.backplane.grpc.SnapshotTableRequest
-	34,  // 265: io.deephaven.proto.backplane.grpc.BatchTableRequest.Operation.snapshot_when:type_name -> io.deephaven.proto.backplane.grpc.SnapshotWhenTableRequest
-	69,  // 266: io.deephaven.proto.backplane.grpc.BatchTableRequest.Operation.meta_table:type_name -> io.deephaven.proto.backplane.grpc.MetaTableRequest
-	43,  // 267: io.deephaven.proto.backplane.grpc.BatchTableRequest.Operation.range_join:type_name -> io.deephaven.proto.backplane.grpc.RangeJoinTablesRequest
-	40,  // 268: io.deephaven.proto.backplane.grpc.BatchTableRequest.Operation.aj:type_name -> io.deephaven.proto.backplane.grpc.AjRajTablesRequest
-	40,  // 269: io.deephaven.proto.backplane.grpc.BatchTableRequest.Operation.raj:type_name -> io.deephaven.proto.backplane.grpc.AjRajTablesRequest
-	73,  // 270: io.deephaven.proto.backplane.grpc.BatchTableRequest.Operation.column_statistics:type_name -> io.deephaven.proto.backplane.grpc.ColumnStatisticsRequest
-	42,  // 271: io.deephaven.proto.backplane.grpc.BatchTableRequest.Operation.multi_join:type_name -> io.deephaven.proto.backplane.grpc.MultiJoinTablesRequest
-	136, // 272: io.deephaven.proto.backplane.grpc.TableService.GetExportedTableCreationResponse:input_type -> io.deephaven.proto.backplane.grpc.Ticket
-	14,  // 273: io.deephaven.proto.backplane.grpc.TableService.FetchTable:input_type -> io.deephaven.proto.backplane.grpc.FetchTableRequest
-	15,  // 274: io.deephaven.proto.backplane.grpc.TableService.ApplyPreviewColumns:input_type -> io.deephaven.proto.backplane.grpc.ApplyPreviewColumnsRequest
-	18,  // 275: io.deephaven.proto.backplane.grpc.TableService.EmptyTable:input_type -> io.deephaven.proto.backplane.grpc.EmptyTableRequest
-	19,  // 276: io.deephaven.proto.backplane.grpc.TableService.TimeTable:input_type -> io.deephaven.proto.backplane.grpc.TimeTableRequest
-	27,  // 277: io.deephaven.proto.backplane.grpc.TableService.DropColumns:input_type -> io.deephaven.proto.backplane.grpc.DropColumnsRequest
-	20,  // 278: io.deephaven.proto.backplane.grpc.TableService.Update:input_type -> io.deephaven.proto.backplane.grpc.SelectOrUpdateRequest
-	20,  // 279: io.deephaven.proto.backplane.grpc.TableService.LazyUpdate:input_type -> io.deephaven.proto.backplane.grpc.SelectOrUpdateRequest
-	20,  // 280: io.deephaven.proto.backplane.grpc.TableService.View:input_type -> io.deephaven.proto.backplane.grpc.SelectOrUpdateRequest
-	20,  // 281: io.deephaven.proto.backplane.grpc.TableService.UpdateView:input_type -> io.deephaven.proto.backplane.grpc.SelectOrUpdateRequest
-	20,  // 282: io.deephaven.proto.backplane.grpc.TableService.Select:input_type -> io.deephaven.proto.backplane.grpc.SelectOrUpdateRequest
-	25,  // 283: io.deephaven.proto.backplane.grpc.TableService.UpdateBy:input_type -> io.deephaven.proto.backplane.grpc.UpdateByRequest
-	26,  // 284: io.deephaven.proto.backplane.grpc.TableService.SelectDistinct:input_type -> io.deephaven.proto.backplane.grpc.SelectDistinctRequest
-	51,  // 285: io.deephaven.proto.backplane.grpc.TableService.Filter:input_type -> io.deephaven.proto.backplane.grpc.FilterTableRequest
-	28,  // 286: io.deephaven.proto.backplane.grpc.TableService.UnstructuredFilter:input_type -> io.deephaven.proto.backplane.grpc.UnstructuredFilterTableRequest
-	50,  // 287: io.deephaven.proto.backplane.grpc.TableService.Sort:input_type -> io.deephaven.proto.backplane.grpc.SortTableRequest
-	29,  // 288: io.deephaven.proto.backplane.grpc.TableService.Head:input_type -> io.deephaven.proto.backplane.grpc.HeadOrTailRequest
-	29,  // 289: io.deephaven.proto.backplane.grpc.TableService.Tail:input_type -> io.deephaven.proto.backplane.grpc.HeadOrTailRequest
-	30,  // 290: io.deephaven.proto.backplane.grpc.TableService.HeadBy:input_type -> io.deephaven.proto.backplane.grpc.HeadOrTailByRequest
-	30,  // 291: io.deephaven.proto.backplane.grpc.TableService.TailBy:input_type -> io.deephaven.proto.backplane.grpc.HeadOrTailByRequest
-	31,  // 292: io.deephaven.proto.backplane.grpc.TableService.Ungroup:input_type -> io.deephaven.proto.backplane.grpc.UngroupRequest
-	32,  // 293: io.deephaven.proto.backplane.grpc.TableService.MergeTables:input_type -> io.deephaven.proto.backplane.grpc.MergeTablesRequest
-	35,  // 294: io.deephaven.proto.backplane.grpc.TableService.CrossJoinTables:input_type -> io.deephaven.proto.backplane.grpc.CrossJoinTablesRequest
-	36,  // 295: io.deephaven.proto.backplane.grpc.TableService.NaturalJoinTables:input_type -> io.deephaven.proto.backplane.grpc.NaturalJoinTablesRequest
-	37,  // 296: io.deephaven.proto.backplane.grpc.TableService.ExactJoinTables:input_type -> io.deephaven.proto.backplane.grpc.ExactJoinTablesRequest
-	38,  // 297: io.deephaven.proto.backplane.grpc.TableService.LeftJoinTables:input_type -> io.deephaven.proto.backplane.grpc.LeftJoinTablesRequest
-	39,  // 298: io.deephaven.proto.backplane.grpc.TableService.AsOfJoinTables:input_type -> io.deephaven.proto.backplane.grpc.AsOfJoinTablesRequest
-	40,  // 299: io.deephaven.proto.backplane.grpc.TableService.AjTables:input_type -> io.deephaven.proto.backplane.grpc.AjRajTablesRequest
-	40,  // 300: io.deephaven.proto.backplane.grpc.TableService.RajTables:input_type -> io.deephaven.proto.backplane.grpc.AjRajTablesRequest
-	42,  // 301: io.deephaven.proto.backplane.grpc.TableService.MultiJoinTables:input_type -> io.deephaven.proto.backplane.grpc.MultiJoinTablesRequest
-	43,  // 302: io.deephaven.proto.backplane.grpc.TableService.RangeJoinTables:input_type -> io.deephaven.proto.backplane.grpc.RangeJoinTablesRequest
-	44,  // 303: io.deephaven.proto.backplane.grpc.TableService.ComboAggregate:input_type -> io.deephaven.proto.backplane.grpc.ComboAggregateRequest
-	45,  // 304: io.deephaven.proto.backplane.grpc.TableService.AggregateAll:input_type -> io.deephaven.proto.backplane.grpc.AggregateAllRequest
-	47,  // 305: io.deephaven.proto.backplane.grpc.TableService.Aggregate:input_type -> io.deephaven.proto.backplane.grpc.AggregateRequest
-	33,  // 306: io.deephaven.proto.backplane.grpc.TableService.Snapshot:input_type -> io.deephaven.proto.backplane.grpc.SnapshotTableRequest
-	34,  // 307: io.deephaven.proto.backplane.grpc.TableService.SnapshotWhen:input_type -> io.deephaven.proto.backplane.grpc.SnapshotWhenTableRequest
-	68,  // 308: io.deephaven.proto.backplane.grpc.TableService.Flatten:input_type -> io.deephaven.proto.backplane.grpc.FlattenRequest
-	70,  // 309: io.deephaven.proto.backplane.grpc.TableService.RunChartDownsample:input_type -> io.deephaven.proto.backplane.grpc.RunChartDownsampleRequest
-	71,  // 310: io.deephaven.proto.backplane.grpc.TableService.CreateInputTable:input_type -> io.deephaven.proto.backplane.grpc.CreateInputTableRequest
-	72,  // 311: io.deephaven.proto.backplane.grpc.TableService.WhereIn:input_type -> io.deephaven.proto.backplane.grpc.WhereInRequest
-	74,  // 312: io.deephaven.proto.backplane.grpc.TableService.Batch:input_type -> io.deephaven.proto.backplane.grpc.BatchTableRequest
-	16,  // 313: io.deephaven.proto.backplane.grpc.TableService.ExportedTableUpdates:input_type -> io.deephaven.proto.backplane.grpc.ExportedTableUpdatesRequest
-	52,  // 314: io.deephaven.proto.backplane.grpc.TableService.SeekRow:input_type -> io.deephaven.proto.backplane.grpc.SeekRowRequest
-	69,  // 315: io.deephaven.proto.backplane.grpc.TableService.MetaTable:input_type -> io.deephaven.proto.backplane.grpc.MetaTableRequest
-	73,  // 316: io.deephaven.proto.backplane.grpc.TableService.ComputeColumnStatistics:input_type -> io.deephaven.proto.backplane.grpc.ColumnStatisticsRequest
-	13,  // 317: io.deephaven.proto.backplane.grpc.TableService.GetExportedTableCreationResponse:output_type -> io.deephaven.proto.backplane.grpc.ExportedTableCreationResponse
-	13,  // 318: io.deephaven.proto.backplane.grpc.TableService.FetchTable:output_type -> io.deephaven.proto.backplane.grpc.ExportedTableCreationResponse
-	13,  // 319: io.deephaven.proto.backplane.grpc.TableService.ApplyPreviewColumns:output_type -> io.deephaven.proto.backplane.grpc.ExportedTableCreationResponse
-	13,  // 320: io.deephaven.proto.backplane.grpc.TableService.EmptyTable:output_type -> io.deephaven.proto.backplane.grpc.ExportedTableCreationResponse
-	13,  // 321: io.deephaven.proto.backplane.grpc.TableService.TimeTable:output_type -> io.deephaven.proto.backplane.grpc.ExportedTableCreationResponse
-	13,  // 322: io.deephaven.proto.backplane.grpc.TableService.DropColumns:output_type -> io.deephaven.proto.backplane.grpc.ExportedTableCreationResponse
-	13,  // 323: io.deephaven.proto.backplane.grpc.TableService.Update:output_type -> io.deephaven.proto.backplane.grpc.ExportedTableCreationResponse
-	13,  // 324: io.deephaven.proto.backplane.grpc.TableService.LazyUpdate:output_type -> io.deephaven.proto.backplane.grpc.ExportedTableCreationResponse
-	13,  // 325: io.deephaven.proto.backplane.grpc.TableService.View:output_type -> io.deephaven.proto.backplane.grpc.ExportedTableCreationResponse
-	13,  // 326: io.deephaven.proto.backplane.grpc.TableService.UpdateView:output_type -> io.deephaven.proto.backplane.grpc.ExportedTableCreationResponse
-	13,  // 327: io.deephaven.proto.backplane.grpc.TableService.Select:output_type -> io.deephaven.proto.backplane.grpc.ExportedTableCreationResponse
-	13,  // 328: io.deephaven.proto.backplane.grpc.TableService.UpdateBy:output_type -> io.deephaven.proto.backplane.grpc.ExportedTableCreationResponse
-	13,  // 329: io.deephaven.proto.backplane.grpc.TableService.SelectDistinct:output_type -> io.deephaven.proto.backplane.grpc.ExportedTableCreationResponse
-	13,  // 330: io.deephaven.proto.backplane.grpc.TableService.Filter:output_type -> io.deephaven.proto.backplane.grpc.ExportedTableCreationResponse
-	13,  // 331: io.deephaven.proto.backplane.grpc.TableService.UnstructuredFilter:output_type -> io.deephaven.proto.backplane.grpc.ExportedTableCreationResponse
-	13,  // 332: io.deephaven.proto.backplane.grpc.TableService.Sort:output_type -> io.deephaven.proto.backplane.grpc.ExportedTableCreationResponse
-	13,  // 333: io.deephaven.proto.backplane.grpc.TableService.Head:output_type -> io.deephaven.proto.backplane.grpc.ExportedTableCreationResponse
-	13,  // 334: io.deephaven.proto.backplane.grpc.TableService.Tail:output_type -> io.deephaven.proto.backplane.grpc.ExportedTableCreationResponse
-	13,  // 335: io.deephaven.proto.backplane.grpc.TableService.HeadBy:output_type -> io.deephaven.proto.backplane.grpc.ExportedTableCreationResponse
-	13,  // 336: io.deephaven.proto.backplane.grpc.TableService.TailBy:output_type -> io.deephaven.proto.backplane.grpc.ExportedTableCreationResponse
-	13,  // 337: io.deephaven.proto.backplane.grpc.TableService.Ungroup:output_type -> io.deephaven.proto.backplane.grpc.ExportedTableCreationResponse
-	13,  // 338: io.deephaven.proto.backplane.grpc.TableService.MergeTables:output_type -> io.deephaven.proto.backplane.grpc.ExportedTableCreationResponse
-	13,  // 339: io.deephaven.proto.backplane.grpc.TableService.CrossJoinTables:output_type -> io.deephaven.proto.backplane.grpc.ExportedTableCreationResponse
-	13,  // 340: io.deephaven.proto.backplane.grpc.TableService.NaturalJoinTables:output_type -> io.deephaven.proto.backplane.grpc.ExportedTableCreationResponse
-	13,  // 341: io.deephaven.proto.backplane.grpc.TableService.ExactJoinTables:output_type -> io.deephaven.proto.backplane.grpc.ExportedTableCreationResponse
-	13,  // 342: io.deephaven.proto.backplane.grpc.TableService.LeftJoinTables:output_type -> io.deephaven.proto.backplane.grpc.ExportedTableCreationResponse
-	13,  // 343: io.deephaven.proto.backplane.grpc.TableService.AsOfJoinTables:output_type -> io.deephaven.proto.backplane.grpc.ExportedTableCreationResponse
-	13,  // 344: io.deephaven.proto.backplane.grpc.TableService.AjTables:output_type -> io.deephaven.proto.backplane.grpc.ExportedTableCreationResponse
-	13,  // 345: io.deephaven.proto.backplane.grpc.TableService.RajTables:output_type -> io.deephaven.proto.backplane.grpc.ExportedTableCreationResponse
-	13,  // 346: io.deephaven.proto.backplane.grpc.TableService.MultiJoinTables:output_type -> io.deephaven.proto.backplane.grpc.ExportedTableCreationResponse
-	13,  // 347: io.deephaven.proto.backplane.grpc.TableService.RangeJoinTables:output_type -> io.deephaven.proto.backplane.grpc.ExportedTableCreationResponse
-	13,  // 348: io.deephaven.proto.backplane.grpc.TableService.ComboAggregate:output_type -> io.deephaven.proto.backplane.grpc.ExportedTableCreationResponse
-	13,  // 349: io.deephaven.proto.backplane.grpc.TableService.AggregateAll:output_type -> io.deephaven.proto.backplane.grpc.ExportedTableCreationResponse
-	13,  // 350: io.deephaven.proto.backplane.grpc.TableService.Aggregate:output_type -> io.deephaven.proto.backplane.grpc.ExportedTableCreationResponse
-	13,  // 351: io.deephaven.proto.backplane.grpc.TableService.Snapshot:output_type -> io.deephaven.proto.backplane.grpc.ExportedTableCreationResponse
-	13,  // 352: io.deephaven.proto.backplane.grpc.TableService.SnapshotWhen:output_type -> io.deephaven.proto.backplane.grpc.ExportedTableCreationResponse
-	13,  // 353: io.deephaven.proto.backplane.grpc.TableService.Flatten:output_type -> io.deephaven.proto.backplane.grpc.ExportedTableCreationResponse
-	13,  // 354: io.deephaven.proto.backplane.grpc.TableService.RunChartDownsample:output_type -> io.deephaven.proto.backplane.grpc.ExportedTableCreationResponse
-	13,  // 355: io.deephaven.proto.backplane.grpc.TableService.CreateInputTable:output_type -> io.deephaven.proto.backplane.grpc.ExportedTableCreationResponse
-	13,  // 356: io.deephaven.proto.backplane.grpc.TableService.WhereIn:output_type -> io.deephaven.proto.backplane.grpc.ExportedTableCreationResponse
-	13,  // 357: io.deephaven.proto.backplane.grpc.TableService.Batch:output_type -> io.deephaven.proto.backplane.grpc.ExportedTableCreationResponse
-	17,  // 358: io.deephaven.proto.backplane.grpc.TableService.ExportedTableUpdates:output_type -> io.deephaven.proto.backplane.grpc.ExportedTableUpdateMessage
-	53,  // 359: io.deephaven.proto.backplane.grpc.TableService.SeekRow:output_type -> io.deephaven.proto.backplane.grpc.SeekRowResponse
-	13,  // 360: io.deephaven.proto.backplane.grpc.TableService.MetaTable:output_type -> io.deephaven.proto.backplane.grpc.ExportedTableCreationResponse
-	13,  // 361: io.deephaven.proto.backplane.grpc.TableService.ComputeColumnStatistics:output_type -> io.deephaven.proto.backplane.grpc.ExportedTableCreationResponse
-	317, // [317:362] is the sub-list for method output_type
-	272, // [272:317] is the sub-list for method input_type
-	272, // [272:272] is the sub-list for extension type_name
-	272, // [272:272] is the sub-list for extension extendee
-	0,   // [0:272] is the sub-list for field type_name
-}
-
-func init() { file_deephaven_proto_table_proto_init() }
-func file_deephaven_proto_table_proto_init() {
-	if File_deephaven_proto_table_proto != nil {
+	49,  // 104: io.deephaven.proto.backplane.grpc.AggregateRequest.aggregations:type_name -> io.deephaven.proto.backplane.grpc.Aggregation
+	128, // 105: io.deephaven.proto.backplane.grpc.Aggregation.columns:type_name -> io.deephaven.proto.backplane.grpc.Aggregation.AggregationColumns
+	129, // 106: io.deephaven.proto.backplane.grpc.Aggregation.count:type_name -> io.deephaven.proto.backplane.grpc.Aggregation.AggregationCount
+	131, // 107: io.deephaven.proto.backplane.grpc.Aggregation.first_row_key:type_name -> io.deephaven.proto.backplane.grpc.Aggregation.AggregationRowKey
+	131, // 108: io.deephaven.proto.backplane.grpc.Aggregation.last_row_key:type_name -> io.deephaven.proto.backplane.grpc.Aggregation.AggregationRowKey
+	132, // 109: io.deephaven.proto.backplane.grpc.Aggregation.partition:type_name -> io.deephaven.proto.backplane.grpc.Aggregation.AggregationPartition
+	133, // 110: io.deephaven.proto.backplane.grpc.Aggregation.formula:type_name -> io.deephaven.proto.backplane.grpc.Aggregation.AggregationFormula
+	130, // 111: io.deephaven.proto.backplane.grpc.Aggregation.count_where:type_name -> io.deephaven.proto.backplane.grpc.Aggregation.AggregationCountWhere
+	10,  // 112: io.deephaven.proto.backplane.grpc.SortDescriptor.direction:type_name -> io.deephaven.proto.backplane.grpc.SortDescriptor.SortDirection
+	140, // 113: io.deephaven.proto.backplane.grpc.SortTableRequest.result_id:type_name -> io.deephaven.proto.backplane.grpc.Ticket
+	12,  // 114: io.deephaven.proto.backplane.grpc.SortTableRequest.source_id:type_name -> io.deephaven.proto.backplane.grpc.TableReference
+	50,  // 115: io.deephaven.proto.backplane.grpc.SortTableRequest.sorts:type_name -> io.deephaven.proto.backplane.grpc.SortDescriptor
+	140, // 116: io.deephaven.proto.backplane.grpc.FilterTableRequest.result_id:type_name -> io.deephaven.proto.backplane.grpc.Ticket
+	12,  // 117: io.deephaven.proto.backplane.grpc.FilterTableRequest.source_id:type_name -> io.deephaven.proto.backplane.grpc.TableReference
+	58,  // 118: io.deephaven.proto.backplane.grpc.FilterTableRequest.filters:type_name -> io.deephaven.proto.backplane.grpc.Condition
+	140, // 119: io.deephaven.proto.backplane.grpc.SeekRowRequest.source_id:type_name -> io.deephaven.proto.backplane.grpc.Ticket
+	56,  // 120: io.deephaven.proto.backplane.grpc.SeekRowRequest.seek_value:type_name -> io.deephaven.proto.backplane.grpc.Literal
+	55,  // 121: io.deephaven.proto.backplane.grpc.Value.reference:type_name -> io.deephaven.proto.backplane.grpc.Reference
+	56,  // 122: io.deephaven.proto.backplane.grpc.Value.literal:type_name -> io.deephaven.proto.backplane.grpc.Literal
+	59,  // 123: io.deephaven.proto.backplane.grpc.Condition.and:type_name -> io.deephaven.proto.backplane.grpc.AndCondition
+	60,  // 124: io.deephaven.proto.backplane.grpc.Condition.or:type_name -> io.deephaven.proto.backplane.grpc.OrCondition
+	61,  // 125: io.deephaven.proto.backplane.grpc.Condition.not:type_name -> io.deephaven.proto.backplane.grpc.NotCondition
+	62,  // 126: io.deephaven.proto.backplane.grpc.Condition.compare:type_name -> io.deephaven.proto.backplane.grpc.CompareCondition
+	63,  // 127: io.deephaven.proto.backplane.grpc.Condition.in:type_name -> io.deephaven.proto.backplane.grpc.InCondition
+	64,  // 128: io.deephaven.proto.backplane.grpc.Condition.invoke:type_name -> io.deephaven.proto.backplane.grpc.InvokeCondition
+	65,  // 129: io.deephaven.proto.backplane.grpc.Condition.is_null:type_name -> io.deephaven.proto.backplane.grpc.IsNullCondition
+	66,  // 130: io.deephaven.proto.backplane.grpc.Condition.matches:type_name -> io.deephaven.proto.backplane.grpc.MatchesCondition
+	67,  // 131: io.deephaven.proto.backplane.grpc.Condition.contains:type_name -> io.deephaven.proto.backplane.grpc.ContainsCondition
+	68,  // 132: io.deephaven.proto.backplane.grpc.Condition.search:type_name -> io.deephaven.proto.backplane.grpc.SearchCondition
+	58,  // 133: io.deephaven.proto.backplane.grpc.AndCondition.filters:type_name -> io.deephaven.proto.backplane.grpc.Condition
+	58,  // 134: io.deephaven.proto.backplane.grpc.OrCondition.filters:type_name -> io.deephaven.proto.backplane.grpc.Condition
+	58,  // 135: io.deephaven.proto.backplane.grpc.NotCondition.filter:type_name -> io.deephaven.proto.backplane.grpc.Condition
+	11,  // 136: io.deephaven.proto.backplane.grpc.CompareCondition.operation:type_name -> io.deephaven.proto.backplane.grpc.CompareCondition.CompareOperation
+	3,   // 137: io.deephaven.proto.backplane.grpc.CompareCondition.case_sensitivity:type_name -> io.deephaven.proto.backplane.grpc.CaseSensitivity
+	57,  // 138: io.deephaven.proto.backplane.grpc.CompareCondition.lhs:type_name -> io.deephaven.proto.backplane.grpc.Value
+	57,  // 139: io.deephaven.proto.backplane.grpc.CompareCondition.rhs:type_name -> io.deephaven.proto.backplane.grpc.Value
+	57,  // 140: io.deephaven.proto.backplane.grpc.InCondition.target:type_name -> io.deephaven.proto.backplane.grpc.Value
+	57,  // 141: io.deephaven.proto.backplane.grpc.InCondition.candidates:type_name -> io.deephaven.proto.backplane.grpc.Value
+	3,   // 142: io.deephaven.proto.backplane.grpc.InCondition.case_sensitivity:type_name -> io.deephaven.proto.backplane.grpc.CaseSensitivity
+	4,   // 143: io.deephaven.proto.backplane.grpc.InCondition.match_type:type_name -> io.deephaven.proto.backplane.grpc.MatchType
+	57,  // 144: io.deephaven.proto.backplane.grpc.InvokeCondition.target:type_name -> io.deephaven.proto.backplane.grpc.Value
+	57,  // 145: io.deephaven.proto.backplane.grpc.InvokeCondition.arguments:type_name -> io.deephaven.proto.backplane.grpc.Value
+	55,  // 146: io.deephaven.proto.backplane.grpc.IsNullCondition.reference:type_name -> io.deephaven.proto.backplane.grpc.Reference
+	55,  // 147: io.deephaven.proto.backplane.grpc.MatchesCondition.reference:type_name -> io.deephaven.proto.backplane.grpc.Reference
+	3,   // 148: io.deephaven.proto.backplane.grpc.MatchesCondition.case_sensitivity:type_name -> io.deephaven.proto.backplane.grpc.CaseSensitivity
+	4,   // 149: io.deephaven.proto.backplane.grpc.MatchesCondition.match_type:type_name -> io.deephaven.proto.backplane.grpc.MatchType
+	55,  // 150: io.deephaven.proto.backplane.grpc.ContainsCondition.reference:type_name -> io.deephaven.proto.backplane.grpc.Reference
+	3,   // 151: io.deephaven.proto.backplane.grpc.ContainsCondition.case_sensitivity:type_name -> io.deephaven.proto.backplane.grpc.CaseSensitivity
+	4,   // 152: io.deephaven.proto.backplane.grpc.ContainsCondition.match_type:type_name -> io.deephaven.proto.backplane.grpc.MatchType
+	55,  // 153: io.deephaven.proto.backplane.grpc.SearchCondition.optional_references:type_name -> io.deephaven.proto.backplane.grpc.Reference
+	140, // 154: io.deephaven.proto.backplane.grpc.FlattenRequest.result_id:type_name -> io.deephaven.proto.backplane.grpc.Ticket
+	12,  // 155: io.deephaven.proto.backplane.grpc.FlattenRequest.source_id:type_name -> io.deephaven.proto.backplane.grpc.TableReference
+	140, // 156: io.deephaven.proto.backplane.grpc.MetaTableRequest.result_id:type_name -> io.deephaven.proto.backplane.grpc.Ticket
+	12,  // 157: io.deephaven.proto.backplane.grpc.MetaTableRequest.source_id:type_name -> io.deephaven.proto.backplane.grpc.TableReference
+	140, // 158: io.deephaven.proto.backplane.grpc.RunChartDownsampleRequest.result_id:type_name -> io.deephaven.proto.backplane.grpc.Ticket
+	12,  // 159: io.deephaven.proto.backplane.grpc.RunChartDownsampleRequest.source_id:type_name -> io.deephaven.proto.backplane.grpc.TableReference
+	134, // 160: io.deephaven.proto.backplane.grpc.RunChartDownsampleRequest.zoom_range:type_name -> io.deephaven.proto.backplane.grpc.RunChartDownsampleRequest.ZoomRange
+	140, // 161: io.deephaven.proto.backplane.grpc.CreateInputTableRequest.result_id:type_name -> io.deephaven.proto.backplane.grpc.Ticket
+	12,  // 162: io.deephaven.proto.backplane.grpc.CreateInputTableRequest.source_table_id:type_name -> io.deephaven.proto.backplane.grpc.TableReference
+	135, // 163: io.deephaven.proto.backplane.grpc.CreateInputTableRequest.kind:type_name -> io.deephaven.proto.backplane.grpc.CreateInputTableRequest.InputTableKind
+	140, // 164: io.deephaven.proto.backplane.grpc.WhereInRequest.result_id:type_name -> io.deephaven.proto.backplane.grpc.Ticket
+	12,  // 165: io.deephaven.proto.backplane.grpc.WhereInRequest.left_id:type_name -> io.deephaven.proto.backplane.grpc.TableReference
+	12,  // 166: io.deephaven.proto.backplane.grpc.WhereInRequest.right_id:type_name -> io.deephaven.proto.backplane.grpc.TableReference
+	140, // 167: io.deephaven.proto.backplane.grpc.ColumnStatisticsRequest.result_id:type_name -> io.deephaven.proto.backplane.grpc.Ticket
+	12,  // 168: io.deephaven.proto.backplane.grpc.ColumnStatisticsRequest.source_id:type_name -> io.deephaven.proto.backplane.grpc.TableReference
+	140, // 169: io.deephaven.proto.backplane.grpc.SliceRequest.result_id:type_name -> io.deephaven.proto.backplane.grpc.Ticket
+	12,  // 170: io.deephaven.proto.backplane.grpc.SliceRequest.source_id:type_name -> io.deephaven.proto.backplane.grpc.TableReference
+	139, // 171: io.deephaven.proto.backplane.grpc.BatchTableRequest.ops:type_name -> io.deephaven.proto.backplane.grpc.BatchTableRequest.Operation
+	22,  // 172: io.deephaven.proto.backplane.grpc.UpdateByRequest.UpdateByOptions.math_context:type_name -> io.deephaven.proto.backplane.grpc.MathContext
+	81,  // 173: io.deephaven.proto.backplane.grpc.UpdateByRequest.UpdateByOperation.column:type_name -> io.deephaven.proto.backplane.grpc.UpdateByRequest.UpdateByOperation.UpdateByColumn
+	82,  // 174: io.deephaven.proto.backplane.grpc.UpdateByRequest.UpdateByOperation.UpdateByColumn.spec:type_name -> io.deephaven.proto.backplane.grpc.UpdateByRequest.UpdateByOperation.UpdateByColumn.UpdateBySpec
+	83,  // 175: io.deephaven.proto.backplane.grpc.UpdateByRequest.UpdateByOperation.UpdateByColumn.UpdateBySpec.sum:type_name -> io.deephaven.proto.backplane.grpc.UpdateByRequest.UpdateByOperation.UpdateByColumn.UpdateBySpec.UpdateByCumulativeSum
+	84,  // 176: io.deephaven.proto.backplane.grpc.UpdateByRequest.UpdateByOperation.UpdateByColumn.UpdateBySpec.min:type_name -> io.deephaven.proto.backplane.grpc.UpdateByRequest.UpdateByOperation.UpdateByColumn.UpdateBySpec.UpdateByCumulativeMin
+	85,  // 177: io.deephaven.proto.backplane.grpc.UpdateByRequest.UpdateByOperation.UpdateByColumn.UpdateBySpec.max:type_name -> io.deephaven.proto.backplane.grpc.UpdateByRequest.UpdateByOperation.UpdateByColumn.UpdateBySpec.UpdateByCumulativeMax
+	86,  // 178: io.deephaven.proto.backplane.grpc.UpdateByRequest.UpdateByOperation.UpdateByColumn.UpdateBySpec.product:type_name -> io.deephaven.proto.backplane.grpc.UpdateByRequest.UpdateByOperation.UpdateByColumn.UpdateBySpec.UpdateByCumulativeProduct
+	87,  // 179: io.deephaven.proto.backplane.grpc.UpdateByRequest.UpdateByOperation.UpdateByColumn.UpdateBySpec.fill:type_name -> io.deephaven.proto.backplane.grpc.UpdateByRequest.UpdateByOperation.UpdateByColumn.UpdateBySpec.UpdateByFill
+	88,  // 180: io.deephaven.proto.backplane.grpc.UpdateByRequest.UpdateByOperation.UpdateByColumn.UpdateBySpec.ema:type_name -> io.deephaven.proto.backplane.grpc.UpdateByRequest.UpdateByOperation.UpdateByColumn.UpdateBySpec.UpdateByEma
+	94,  // 181: io.deephaven.proto.backplane.grpc.UpdateByRequest.UpdateByOperation.UpdateByColumn.UpdateBySpec.rolling_sum:type_name -> io.deephaven.proto.backplane.grpc.UpdateByRequest.UpdateByOperation.UpdateByColumn.UpdateBySpec.UpdateByRollingSum
+	95,  // 182: io.deephaven.proto.backplane.grpc.UpdateByRequest.UpdateByOperation.UpdateByColumn.UpdateBySpec.rolling_group:type_name -> io.deephaven.proto.backplane.grpc.UpdateByRequest.UpdateByOperation.UpdateByColumn.UpdateBySpec.UpdateByRollingGroup
+	96,  // 183: io.deephaven.proto.backplane.grpc.UpdateByRequest.UpdateByOperation.UpdateByColumn.UpdateBySpec.rolling_avg:type_name -> io.deephaven.proto.backplane.grpc.UpdateByRequest.UpdateByOperation.UpdateByColumn.UpdateBySpec.UpdateByRollingAvg
+	97,  // 184: io.deephaven.proto.backplane.grpc.UpdateByRequest.UpdateByOperation.UpdateByColumn.UpdateBySpec.rolling_min:type_name -> io.deephaven.proto.backplane.grpc.UpdateByRequest.UpdateByOperation.UpdateByColumn.UpdateBySpec.UpdateByRollingMin
+	98,  // 185: io.deephaven.proto.backplane.grpc.UpdateByRequest.UpdateByOperation.UpdateByColumn.UpdateBySpec.rolling_max:type_name -> io.deephaven.proto.backplane.grpc.UpdateByRequest.UpdateByOperation.UpdateByColumn.UpdateBySpec.UpdateByRollingMax
+	99,  // 186: io.deephaven.proto.backplane.grpc.UpdateByRequest.UpdateByOperation.UpdateByColumn.UpdateBySpec.rolling_product:type_name -> io.deephaven.proto.backplane.grpc.UpdateByRequest.UpdateByOperation.UpdateByColumn.UpdateBySpec.UpdateByRollingProduct
+	93,  // 187: io.deephaven.proto.backplane.grpc.UpdateByRequest.UpdateByOperation.UpdateByColumn.UpdateBySpec.delta:type_name -> io.deephaven.proto.backplane.grpc.UpdateByRequest.UpdateByOperation.UpdateByColumn.UpdateBySpec.UpdateByDelta
+	89,  // 188: io.deephaven.proto.backplane.grpc.UpdateByRequest.UpdateByOperation.UpdateByColumn.UpdateBySpec.ems:type_name -> io.deephaven.proto.backplane.grpc.UpdateByRequest.UpdateByOperation.UpdateByColumn.UpdateBySpec.UpdateByEms
+	90,  // 189: io.deephaven.proto.backplane.grpc.UpdateByRequest.UpdateByOperation.UpdateByColumn.UpdateBySpec.em_min:type_name -> io.deephaven.proto.backplane.grpc.UpdateByRequest.UpdateByOperation.UpdateByColumn.UpdateBySpec.UpdateByEmMin
+	91,  // 190: io.deephaven.proto.backplane.grpc.UpdateByRequest.UpdateByOperation.UpdateByColumn.UpdateBySpec.em_max:type_name -> io.deephaven.proto.backplane.grpc.UpdateByRequest.UpdateByOperation.UpdateByColumn.UpdateBySpec.UpdateByEmMax
+	92,  // 191: io.deephaven.proto.backplane.grpc.UpdateByRequest.UpdateByOperation.UpdateByColumn.UpdateBySpec.em_std:type_name -> io.deephaven.proto.backplane.grpc.UpdateByRequest.UpdateByOperation.UpdateByColumn.UpdateBySpec.UpdateByEmStd
+	100, // 192: io.deephaven.proto.backplane.grpc.UpdateByRequest.UpdateByOperation.UpdateByColumn.UpdateBySpec.rolling_count:type_name -> io.deephaven.proto.backplane.grpc.UpdateByRequest.UpdateByOperation.UpdateByColumn.UpdateBySpec.UpdateByRollingCount
+	101, // 193: io.deephaven.proto.backplane.grpc.UpdateByRequest.UpdateByOperation.UpdateByColumn.UpdateBySpec.rolling_std:type_name -> io.deephaven.proto.backplane.grpc.UpdateByRequest.UpdateByOperation.UpdateByColumn.UpdateBySpec.UpdateByRollingStd
+	102, // 194: io.deephaven.proto.backplane.grpc.UpdateByRequest.UpdateByOperation.UpdateByColumn.UpdateBySpec.rolling_wavg:type_name -> io.deephaven.proto.backplane.grpc.UpdateByRequest.UpdateByOperation.UpdateByColumn.UpdateBySpec.UpdateByRollingWAvg
+	103, // 195: io.deephaven.proto.backplane.grpc.UpdateByRequest.UpdateByOperation.UpdateByColumn.UpdateBySpec.rolling_formula:type_name -> io.deephaven.proto.backplane.grpc.UpdateByRequest.UpdateByOperation.UpdateByColumn.UpdateBySpec.UpdateByRollingFormula
+	24,  // 196: io.deephaven.proto.backplane.grpc.UpdateByRequest.UpdateByOperation.UpdateByColumn.UpdateBySpec.UpdateByEma.options:type_name -> io.deephaven.proto.backplane.grpc.UpdateByEmOptions
+	23,  // 197: io.deephaven.proto.backplane.grpc.UpdateByRequest.UpdateByOperation.UpdateByColumn.UpdateBySpec.UpdateByEma.window_scale:type_name -> io.deephaven.proto.backplane.grpc.UpdateByWindowScale
+	24,  // 198: io.deephaven.proto.backplane.grpc.UpdateByRequest.UpdateByOperation.UpdateByColumn.UpdateBySpec.UpdateByEms.options:type_name -> io.deephaven.proto.backplane.grpc.UpdateByEmOptions
+	23,  // 199: io.deephaven.proto.backplane.grpc.UpdateByRequest.UpdateByOperation.UpdateByColumn.UpdateBySpec.UpdateByEms.window_scale:type_name -> io.deephaven.proto.backplane.grpc.UpdateByWindowScale
+	24,  // 200: io.deephaven.proto.backplane.grpc.UpdateByRequest.UpdateByOperation.UpdateByColumn.UpdateBySpec.UpdateByEmMin.options:type_name -> io.deephaven.proto.backplane.grpc.UpdateByEmOptions
+	23,  // 201: io.deephaven.proto.backplane.grpc.UpdateByRequest.UpdateByOperation.UpdateByColumn.UpdateBySpec.UpdateByEmMin.window_scale:type_name -> io.deephaven.proto.backplane.grpc.UpdateByWindowScale
+	24,  // 202: io.deephaven.proto.backplane.grpc.UpdateByRequest.UpdateByOperation.UpdateByColumn.UpdateBySpec.UpdateByEmMax.options:type_name -> io.deephaven.proto.backplane.grpc.UpdateByEmOptions
+	23,  // 203: io.deephaven.proto.backplane.grpc.UpdateByRequest.UpdateByOperation.UpdateByColumn.UpdateBySpec.UpdateByEmMax.window_scale:type_name -> io.deephaven.proto.backplane.grpc.UpdateByWindowScale
+	24,  // 204: io.deephaven.proto.backplane.grpc.UpdateByRequest.UpdateByOperation.UpdateByColumn.UpdateBySpec.UpdateByEmStd.options:type_name -> io.deephaven.proto.backplane.grpc.UpdateByEmOptions
+	23,  // 205: io.deephaven.proto.backplane.grpc.UpdateByRequest.UpdateByOperation.UpdateByColumn.UpdateBySpec.UpdateByEmStd.window_scale:type_name -> io.deephaven.proto.backplane.grpc.UpdateByWindowScale
+	25,  // 206: io.deephaven.proto.backplane.grpc.UpdateByRequest.UpdateByOperation.UpdateByColumn.UpdateBySpec.UpdateByDelta.options:type_name -> io.deephaven.proto.backplane.grpc.UpdateByDeltaOptions
+	23,  // 207: io.deephaven.proto.backplane.grpc.UpdateByRequest.UpdateByOperation.UpdateByColumn.UpdateBySpec.UpdateByRollingSum.reverse_window_scale:type_name -> io.deephaven.proto.backplane.grpc.UpdateByWindowScale
+	23,  // 208: io.deephaven.proto.backplane.grpc.UpdateByRequest.UpdateByOperation.UpdateByColumn.UpdateBySpec.UpdateByRollingSum.forward_window_scale:type_name -> io.deephaven.proto.backplane.grpc.UpdateByWindowScale
+	23,  // 209: io.deephaven.proto.backplane.grpc.UpdateByRequest.UpdateByOperation.UpdateByColumn.UpdateBySpec.UpdateByRollingGroup.reverse_window_scale:type_name -> io.deephaven.proto.backplane.grpc.UpdateByWindowScale
+	23,  // 210: io.deephaven.proto.backplane.grpc.UpdateByRequest.UpdateByOperation.UpdateByColumn.UpdateBySpec.UpdateByRollingGroup.forward_window_scale:type_name -> io.deephaven.proto.backplane.grpc.UpdateByWindowScale
+	23,  // 211: io.deephaven.proto.backplane.grpc.UpdateByRequest.UpdateByOperation.UpdateByColumn.UpdateBySpec.UpdateByRollingAvg.reverse_window_scale:type_name -> io.deephaven.proto.backplane.grpc.UpdateByWindowScale
+	23,  // 212: io.deephaven.proto.backplane.grpc.UpdateByRequest.UpdateByOperation.UpdateByColumn.UpdateBySpec.UpdateByRollingAvg.forward_window_scale:type_name -> io.deephaven.proto.backplane.grpc.UpdateByWindowScale
+	23,  // 213: io.deephaven.proto.backplane.grpc.UpdateByRequest.UpdateByOperation.UpdateByColumn.UpdateBySpec.UpdateByRollingMin.reverse_window_scale:type_name -> io.deephaven.proto.backplane.grpc.UpdateByWindowScale
+	23,  // 214: io.deephaven.proto.backplane.grpc.UpdateByRequest.UpdateByOperation.UpdateByColumn.UpdateBySpec.UpdateByRollingMin.forward_window_scale:type_name -> io.deephaven.proto.backplane.grpc.UpdateByWindowScale
+	23,  // 215: io.deephaven.proto.backplane.grpc.UpdateByRequest.UpdateByOperation.UpdateByColumn.UpdateBySpec.UpdateByRollingMax.reverse_window_scale:type_name -> io.deephaven.proto.backplane.grpc.UpdateByWindowScale
+	23,  // 216: io.deephaven.proto.backplane.grpc.UpdateByRequest.UpdateByOperation.UpdateByColumn.UpdateBySpec.UpdateByRollingMax.forward_window_scale:type_name -> io.deephaven.proto.backplane.grpc.UpdateByWindowScale
+	23,  // 217: io.deephaven.proto.backplane.grpc.UpdateByRequest.UpdateByOperation.UpdateByColumn.UpdateBySpec.UpdateByRollingProduct.reverse_window_scale:type_name -> io.deephaven.proto.backplane.grpc.UpdateByWindowScale
+	23,  // 218: io.deephaven.proto.backplane.grpc.UpdateByRequest.UpdateByOperation.UpdateByColumn.UpdateBySpec.UpdateByRollingProduct.forward_window_scale:type_name -> io.deephaven.proto.backplane.grpc.UpdateByWindowScale
+	23,  // 219: io.deephaven.proto.backplane.grpc.UpdateByRequest.UpdateByOperation.UpdateByColumn.UpdateBySpec.UpdateByRollingCount.reverse_window_scale:type_name -> io.deephaven.proto.backplane.grpc.UpdateByWindowScale
+	23,  // 220: io.deephaven.proto.backplane.grpc.UpdateByRequest.UpdateByOperation.UpdateByColumn.UpdateBySpec.UpdateByRollingCount.forward_window_scale:type_name -> io.deephaven.proto.backplane.grpc.UpdateByWindowScale
+	23,  // 221: io.deephaven.proto.backplane.grpc.UpdateByRequest.UpdateByOperation.UpdateByColumn.UpdateBySpec.UpdateByRollingStd.reverse_window_scale:type_name -> io.deephaven.proto.backplane.grpc.UpdateByWindowScale
+	23,  // 222: io.deephaven.proto.backplane.grpc.UpdateByRequest.UpdateByOperation.UpdateByColumn.UpdateBySpec.UpdateByRollingStd.forward_window_scale:type_name -> io.deephaven.proto.backplane.grpc.UpdateByWindowScale
+	23,  // 223: io.deephaven.proto.backplane.grpc.UpdateByRequest.UpdateByOperation.UpdateByColumn.UpdateBySpec.UpdateByRollingWAvg.reverse_window_scale:type_name -> io.deephaven.proto.backplane.grpc.UpdateByWindowScale
+	23,  // 224: io.deephaven.proto.backplane.grpc.UpdateByRequest.UpdateByOperation.UpdateByColumn.UpdateBySpec.UpdateByRollingWAvg.forward_window_scale:type_name -> io.deephaven.proto.backplane.grpc.UpdateByWindowScale
+	23,  // 225: io.deephaven.proto.backplane.grpc.UpdateByRequest.UpdateByOperation.UpdateByColumn.UpdateBySpec.UpdateByRollingFormula.reverse_window_scale:type_name -> io.deephaven.proto.backplane.grpc.UpdateByWindowScale
+	23,  // 226: io.deephaven.proto.backplane.grpc.UpdateByRequest.UpdateByOperation.UpdateByColumn.UpdateBySpec.UpdateByRollingFormula.forward_window_scale:type_name -> io.deephaven.proto.backplane.grpc.UpdateByWindowScale
+	9,   // 227: io.deephaven.proto.backplane.grpc.ComboAggregateRequest.Aggregate.type:type_name -> io.deephaven.proto.backplane.grpc.ComboAggregateRequest.AggType
+	112, // 228: io.deephaven.proto.backplane.grpc.AggSpec.AggSpecSorted.columns:type_name -> io.deephaven.proto.backplane.grpc.AggSpec.AggSpecSortedColumn
+	115, // 229: io.deephaven.proto.backplane.grpc.AggSpec.AggSpecUnique.non_unique_sentinel:type_name -> io.deephaven.proto.backplane.grpc.AggSpec.AggSpecNonUniqueSentinel
+	2,   // 230: io.deephaven.proto.backplane.grpc.AggSpec.AggSpecNonUniqueSentinel.null_value:type_name -> io.deephaven.proto.backplane.grpc.NullValue
+	47,  // 231: io.deephaven.proto.backplane.grpc.Aggregation.AggregationColumns.spec:type_name -> io.deephaven.proto.backplane.grpc.AggSpec
+	21,  // 232: io.deephaven.proto.backplane.grpc.Aggregation.AggregationFormula.selectable:type_name -> io.deephaven.proto.backplane.grpc.Selectable
+	136, // 233: io.deephaven.proto.backplane.grpc.CreateInputTableRequest.InputTableKind.in_memory_append_only:type_name -> io.deephaven.proto.backplane.grpc.CreateInputTableRequest.InputTableKind.InMemoryAppendOnly
+	137, // 234: io.deephaven.proto.backplane.grpc.CreateInputTableRequest.InputTableKind.in_memory_key_backed:type_name -> io.deephaven.proto.backplane.grpc.CreateInputTableRequest.InputTableKind.InMemoryKeyBacked
+	138, // 235: io.deephaven.proto.backplane.grpc.CreateInputTableRequest.InputTableKind.blink:type_name -> io.deephaven.proto.backplane.grpc.CreateInputTableRequest.InputTableKind.Blink
+	18,  // 236: io.deephaven.proto.backplane.grpc.BatchTableRequest.Operation.empty_table:type_name -> io.deephaven.proto.backplane.grpc.EmptyTableRequest
+	19,  // 237: io.deephaven.proto.backplane.grpc.BatchTableRequest.Operation.time_table:type_name -> io.deephaven.proto.backplane.grpc.TimeTableRequest
+	28,  // 238: io.deephaven.proto.backplane.grpc.BatchTableRequest.Operation.drop_columns:type_name -> io.deephaven.proto.backplane.grpc.DropColumnsRequest
+	20,  // 239: io.deephaven.proto.backplane.grpc.BatchTableRequest.Operation.update:type_name -> io.deephaven.proto.backplane.grpc.SelectOrUpdateRequest
+	20,  // 240: io.deephaven.proto.backplane.grpc.BatchTableRequest.Operation.lazy_update:type_name -> io.deephaven.proto.backplane.grpc.SelectOrUpdateRequest
+	20,  // 241: io.deephaven.proto.backplane.grpc.BatchTableRequest.Operation.view:type_name -> io.deephaven.proto.backplane.grpc.SelectOrUpdateRequest
+	20,  // 242: io.deephaven.proto.backplane.grpc.BatchTableRequest.Operation.update_view:type_name -> io.deephaven.proto.backplane.grpc.SelectOrUpdateRequest
+	20,  // 243: io.deephaven.proto.backplane.grpc.BatchTableRequest.Operation.select:type_name -> io.deephaven.proto.backplane.grpc.SelectOrUpdateRequest
+	27,  // 244: io.deephaven.proto.backplane.grpc.BatchTableRequest.Operation.select_distinct:type_name -> io.deephaven.proto.backplane.grpc.SelectDistinctRequest
+	52,  // 245: io.deephaven.proto.backplane.grpc.BatchTableRequest.Operation.filter:type_name -> io.deephaven.proto.backplane.grpc.FilterTableRequest
+	29,  // 246: io.deephaven.proto.backplane.grpc.BatchTableRequest.Operation.unstructured_filter:type_name -> io.deephaven.proto.backplane.grpc.UnstructuredFilterTableRequest
+	51,  // 247: io.deephaven.proto.backplane.grpc.BatchTableRequest.Operation.sort:type_name -> io.deephaven.proto.backplane.grpc.SortTableRequest
+	30,  // 248: io.deephaven.proto.backplane.grpc.BatchTableRequest.Operation.head:type_name -> io.deephaven.proto.backplane.grpc.HeadOrTailRequest
+	30,  // 249: io.deephaven.proto.backplane.grpc.BatchTableRequest.Operation.tail:type_name -> io.deephaven.proto.backplane.grpc.HeadOrTailRequest
+	31,  // 250: io.deephaven.proto.backplane.grpc.BatchTableRequest.Operation.head_by:type_name -> io.deephaven.proto.backplane.grpc.HeadOrTailByRequest
+	31,  // 251: io.deephaven.proto.backplane.grpc.BatchTableRequest.Operation.tail_by:type_name -> io.deephaven.proto.backplane.grpc.HeadOrTailByRequest
+	32,  // 252: io.deephaven.proto.backplane.grpc.BatchTableRequest.Operation.ungroup:type_name -> io.deephaven.proto.backplane.grpc.UngroupRequest
+	33,  // 253: io.deephaven.proto.backplane.grpc.BatchTableRequest.Operation.merge:type_name -> io.deephaven.proto.backplane.grpc.MergeTablesRequest
+	45,  // 254: io.deephaven.proto.backplane.grpc.BatchTableRequest.Operation.combo_aggregate:type_name -> io.deephaven.proto.backplane.grpc.ComboAggregateRequest
+	69,  // 255: io.deephaven.proto.backplane.grpc.BatchTableRequest.Operation.flatten:type_name -> io.deephaven.proto.backplane.grpc.FlattenRequest
+	71,  // 256: io.deephaven.proto.backplane.grpc.BatchTableRequest.Operation.run_chart_downsample:type_name -> io.deephaven.proto.backplane.grpc.RunChartDownsampleRequest
+	36,  // 257: io.deephaven.proto.backplane.grpc.BatchTableRequest.Operation.cross_join:type_name -> io.deephaven.proto.backplane.grpc.CrossJoinTablesRequest
+	37,  // 258: io.deephaven.proto.backplane.grpc.BatchTableRequest.Operation.natural_join:type_name -> io.deephaven.proto.backplane.grpc.NaturalJoinTablesRequest
+	38,  // 259: io.deephaven.proto.backplane.grpc.BatchTableRequest.Operation.exact_join:type_name -> io.deephaven.proto.backplane.grpc.ExactJoinTablesRequest
+	39,  // 260: io.deephaven.proto.backplane.grpc.BatchTableRequest.Operation.left_join:type_name -> io.deephaven.proto.backplane.grpc.LeftJoinTablesRequest
+	40,  // 261: io.deephaven.proto.backplane.grpc.BatchTableRequest.Operation.as_of_join:type_name -> io.deephaven.proto.backplane.grpc.AsOfJoinTablesRequest
+	14,  // 262: io.deephaven.proto.backplane.grpc.BatchTableRequest.Operation.fetch_table:type_name -> io.deephaven.proto.backplane.grpc.FetchTableRequest
+	15,  // 263: io.deephaven.proto.backplane.grpc.BatchTableRequest.Operation.apply_preview_columns:type_name -> io.deephaven.proto.backplane.grpc.ApplyPreviewColumnsRequest
+	72,  // 264: io.deephaven.proto.backplane.grpc.BatchTableRequest.Operation.create_input_table:type_name -> io.deephaven.proto.backplane.grpc.CreateInputTableRequest
+	26,  // 265: io.deephaven.proto.backplane.grpc.BatchTableRequest.Operation.update_by:type_name -> io.deephaven.proto.backplane.grpc.UpdateByRequest
+	73,  // 266: io.deephaven.proto.backplane.grpc.BatchTableRequest.Operation.where_in:type_name -> io.deephaven.proto.backplane.grpc.WhereInRequest
+	46,  // 267: io.deephaven.proto.backplane.grpc.BatchTableRequest.Operation.aggregate_all:type_name -> io.deephaven.proto.backplane.grpc.AggregateAllRequest
+	48,  // 268: io.deephaven.proto.backplane.grpc.BatchTableRequest.Operation.aggregate:type_name -> io.deephaven.proto.backplane.grpc.AggregateRequest
+	34,  // 269: io.deephaven.proto.backplane.grpc.BatchTableRequest.Operation.snapshot:type_name -> io.deephaven.proto.backplane.grpc.SnapshotTableRequest
+	35,  // 270: io.deephaven.proto.backplane.grpc.BatchTableRequest.Operation.snapshot_when:type_name -> io.deephaven.proto.backplane.grpc.SnapshotWhenTableRequest
+	70,  // 271: io.deephaven.proto.backplane.grpc.BatchTableRequest.Operation.meta_table:type_name -> io.deephaven.proto.backplane.grpc.MetaTableRequest
+	44,  // 272: io.deephaven.proto.backplane.grpc.BatchTableRequest.Operation.range_join:type_name -> io.deephaven.proto.backplane.grpc.RangeJoinTablesRequest
+	41,  // 273: io.deephaven.proto.backplane.grpc.BatchTableRequest.Operation.aj:type_name -> io.deephaven.proto.backplane.grpc.AjRajTablesRequest
+	41,  // 274: io.deephaven.proto.backplane.grpc.BatchTableRequest.Operation.raj:type_name -> io.deephaven.proto.backplane.grpc.AjRajTablesRequest
+	74,  // 275: io.deephaven.proto.backplane.grpc.BatchTableRequest.Operation.column_statistics:type_name -> io.deephaven.proto.backplane.grpc.ColumnStatisticsRequest
+	43,  // 276: io.deephaven.proto.backplane.grpc.BatchTableRequest.Operation.multi_join:type_name -> io.deephaven.proto.backplane.grpc.MultiJoinTablesRequest
+	75,  // 277: io.deephaven.proto.backplane.grpc.BatchTableRequest.Operation.slice:type_name -> io.deephaven.proto.backplane.grpc.SliceRequest
+	140, // 278: io.deephaven.proto.backplane.grpc.TableService.GetExportedTableCreationResponse:input_type -> io.deephaven.proto.backplane.grpc.Ticket
+	14,  // 279: io.deephaven.proto.backplane.grpc.TableService.FetchTable:input_type -> io.deephaven.proto.backplane.grpc.FetchTableRequest
+	15,  // 280: io.deephaven.proto.backplane.grpc.TableService.ApplyPreviewColumns:input_type -> io.deephaven.proto.backplane.grpc.ApplyPreviewColumnsRequest
+	18,  // 281: io.deephaven.proto.backplane.grpc.TableService.EmptyTable:input_type -> io.deephaven.proto.backplane.grpc.EmptyTableRequest
+	19,  // 282: io.deephaven.proto.backplane.grpc.TableService.TimeTable:input_type -> io.deephaven.proto.backplane.grpc.TimeTableRequest
+	28,  // 283: io.deephaven.proto.backplane.grpc.TableService.DropColumns:input_type -> io.deephaven.proto.backplane.grpc.DropColumnsRequest
+	20,  // 284: io.deephaven.proto.backplane.grpc.TableService.Update:input_type -> io.deephaven.proto.backplane.grpc.SelectOrUpdateRequest
+	20,  // 285: io.deephaven.proto.backplane.grpc.TableService.LazyUpdate:input_type -> io.deephaven.proto.backplane.grpc.SelectOrUpdateRequest
+	20,  // 286: io.deephaven.proto.backplane.grpc.TableService.View:input_type -> io.deephaven.proto.backplane.grpc.SelectOrUpdateRequest
+	20,  // 287: io.deephaven.proto.backplane.grpc.TableService.UpdateView:input_type -> io.deephaven.proto.backplane.grpc.SelectOrUpdateRequest
+	20,  // 288: io.deephaven.proto.backplane.grpc.TableService.Select:input_type -> io.deephaven.proto.backplane.grpc.SelectOrUpdateRequest
+	26,  // 289: io.deephaven.proto.backplane.grpc.TableService.UpdateBy:input_type -> io.deephaven.proto.backplane.grpc.UpdateByRequest
+	27,  // 290: io.deephaven.proto.backplane.grpc.TableService.SelectDistinct:input_type -> io.deephaven.proto.backplane.grpc.SelectDistinctRequest
+	52,  // 291: io.deephaven.proto.backplane.grpc.TableService.Filter:input_type -> io.deephaven.proto.backplane.grpc.FilterTableRequest
+	29,  // 292: io.deephaven.proto.backplane.grpc.TableService.UnstructuredFilter:input_type -> io.deephaven.proto.backplane.grpc.UnstructuredFilterTableRequest
+	51,  // 293: io.deephaven.proto.backplane.grpc.TableService.Sort:input_type -> io.deephaven.proto.backplane.grpc.SortTableRequest
+	30,  // 294: io.deephaven.proto.backplane.grpc.TableService.Head:input_type -> io.deephaven.proto.backplane.grpc.HeadOrTailRequest
+	30,  // 295: io.deephaven.proto.backplane.grpc.TableService.Tail:input_type -> io.deephaven.proto.backplane.grpc.HeadOrTailRequest
+	31,  // 296: io.deephaven.proto.backplane.grpc.TableService.HeadBy:input_type -> io.deephaven.proto.backplane.grpc.HeadOrTailByRequest
+	31,  // 297: io.deephaven.proto.backplane.grpc.TableService.TailBy:input_type -> io.deephaven.proto.backplane.grpc.HeadOrTailByRequest
+	32,  // 298: io.deephaven.proto.backplane.grpc.TableService.Ungroup:input_type -> io.deephaven.proto.backplane.grpc.UngroupRequest
+	33,  // 299: io.deephaven.proto.backplane.grpc.TableService.MergeTables:input_type -> io.deephaven.proto.backplane.grpc.MergeTablesRequest
+	36,  // 300: io.deephaven.proto.backplane.grpc.TableService.CrossJoinTables:input_type -> io.deephaven.proto.backplane.grpc.CrossJoinTablesRequest
+	37,  // 301: io.deephaven.proto.backplane.grpc.TableService.NaturalJoinTables:input_type -> io.deephaven.proto.backplane.grpc.NaturalJoinTablesRequest
+	38,  // 302: io.deephaven.proto.backplane.grpc.TableService.ExactJoinTables:input_type -> io.deephaven.proto.backplane.grpc.ExactJoinTablesRequest
+	39,  // 303: io.deephaven.proto.backplane.grpc.TableService.LeftJoinTables:input_type -> io.deephaven.proto.backplane.grpc.LeftJoinTablesRequest
+	40,  // 304: io.deephaven.proto.backplane.grpc.TableService.AsOfJoinTables:input_type -> io.deephaven.proto.backplane.grpc.AsOfJoinTablesRequest
+	41,  // 305: io.deephaven.proto.backplane.grpc.TableService.AjTables:input_type -> io.deephaven.proto.backplane.grpc.AjRajTablesRequest
+	41,  // 306: io.deephaven.proto.backplane.grpc.TableService.RajTables:input_type -> io.deephaven.proto.backplane.grpc.AjRajTablesRequest
+	43,  // 307: io.deephaven.proto.backplane.grpc.TableService.MultiJoinTables:input_type -> io.deephaven.proto.backplane.grpc.MultiJoinTablesRequest
+	44,  // 308: io.deephaven.proto.backplane.grpc.TableService.RangeJoinTables:input_type -> io.deephaven.proto.backplane.grpc.RangeJoinTablesRequest
+	45,  // 309: io.deephaven.proto.backplane.grpc.TableService.ComboAggregate:input_type -> io.deephaven.proto.backplane.grpc.ComboAggregateRequest
+	46,  // 310: io.deephaven.proto.backplane.grpc.TableService.AggregateAll:input_type -> io.deephaven.proto.backplane.grpc.AggregateAllRequest
+	48,  // 311: io.deephaven.proto.backplane.grpc.TableService.Aggregate:input_type -> io.deephaven.proto.backplane.grpc.AggregateRequest
+	34,  // 312: io.deephaven.proto.backplane.grpc.TableService.Snapshot:input_type -> io.deephaven.proto.backplane.grpc.SnapshotTableRequest
+	35,  // 313: io.deephaven.proto.backplane.grpc.TableService.SnapshotWhen:input_type -> io.deephaven.proto.backplane.grpc.SnapshotWhenTableRequest
+	69,  // 314: io.deephaven.proto.backplane.grpc.TableService.Flatten:input_type -> io.deephaven.proto.backplane.grpc.FlattenRequest
+	71,  // 315: io.deephaven.proto.backplane.grpc.TableService.RunChartDownsample:input_type -> io.deephaven.proto.backplane.grpc.RunChartDownsampleRequest
+	72,  // 316: io.deephaven.proto.backplane.grpc.TableService.CreateInputTable:input_type -> io.deephaven.proto.backplane.grpc.CreateInputTableRequest
+	73,  // 317: io.deephaven.proto.backplane.grpc.TableService.WhereIn:input_type -> io.deephaven.proto.backplane.grpc.WhereInRequest
+	76,  // 318: io.deephaven.proto.backplane.grpc.TableService.Batch:input_type -> io.deephaven.proto.backplane.grpc.BatchTableRequest
+	16,  // 319: io.deephaven.proto.backplane.grpc.TableService.ExportedTableUpdates:input_type -> io.deephaven.proto.backplane.grpc.ExportedTableUpdatesRequest
+	53,  // 320: io.deephaven.proto.backplane.grpc.TableService.SeekRow:input_type -> io.deephaven.proto.backplane.grpc.SeekRowRequest
+	70,  // 321: io.deephaven.proto.backplane.grpc.TableService.MetaTable:input_type -> io.deephaven.proto.backplane.grpc.MetaTableRequest
+	74,  // 322: io.deephaven.proto.backplane.grpc.TableService.ComputeColumnStatistics:input_type -> io.deephaven.proto.backplane.grpc.ColumnStatisticsRequest
+	75,  // 323: io.deephaven.proto.backplane.grpc.TableService.Slice:input_type -> io.deephaven.proto.backplane.grpc.SliceRequest
+	13,  // 324: io.deephaven.proto.backplane.grpc.TableService.GetExportedTableCreationResponse:output_type -> io.deephaven.proto.backplane.grpc.ExportedTableCreationResponse
+	13,  // 325: io.deephaven.proto.backplane.grpc.TableService.FetchTable:output_type -> io.deephaven.proto.backplane.grpc.ExportedTableCreationResponse
+	13,  // 326: io.deephaven.proto.backplane.grpc.TableService.ApplyPreviewColumns:output_type -> io.deephaven.proto.backplane.grpc.ExportedTableCreationResponse
+	13,  // 327: io.deephaven.proto.backplane.grpc.TableService.EmptyTable:output_type -> io.deephaven.proto.backplane.grpc.ExportedTableCreationResponse
+	13,  // 328: io.deephaven.proto.backplane.grpc.TableService.TimeTable:output_type -> io.deephaven.proto.backplane.grpc.ExportedTableCreationResponse
+	13,  // 329: io.deephaven.proto.backplane.grpc.TableService.DropColumns:output_type -> io.deephaven.proto.backplane.grpc.ExportedTableCreationResponse
+	13,  // 330: io.deephaven.proto.backplane.grpc.TableService.Update:output_type -> io.deephaven.proto.backplane.grpc.ExportedTableCreationResponse
+	13,  // 331: io.deephaven.proto.backplane.grpc.TableService.LazyUpdate:output_type -> io.deephaven.proto.backplane.grpc.ExportedTableCreationResponse
+	13,  // 332: io.deephaven.proto.backplane.grpc.TableService.View:output_type -> io.deephaven.proto.backplane.grpc.ExportedTableCreationResponse
+	13,  // 333: io.deephaven.proto.backplane.grpc.TableService.UpdateView:output_type -> io.deephaven.proto.backplane.grpc.ExportedTableCreationResponse
+	13,  // 334: io.deephaven.proto.backplane.grpc.TableService.Select:output_type -> io.deephaven.proto.backplane.grpc.ExportedTableCreationResponse
+	13,  // 335: io.deephaven.proto.backplane.grpc.TableService.UpdateBy:output_type -> io.deephaven.proto.backplane.grpc.ExportedTableCreationResponse
+	13,  // 336: io.deephaven.proto.backplane.grpc.TableService.SelectDistinct:output_type -> io.deephaven.proto.backplane.grpc.ExportedTableCreationResponse
+	13,  // 337: io.deephaven.proto.backplane.grpc.TableService.Filter:output_type -> io.deephaven.proto.backplane.grpc.ExportedTableCreationResponse
+	13,  // 338: io.deephaven.proto.backplane.grpc.TableService.UnstructuredFilter:output_type -> io.deephaven.proto.backplane.grpc.ExportedTableCreationResponse
+	13,  // 339: io.deephaven.proto.backplane.grpc.TableService.Sort:output_type -> io.deephaven.proto.backplane.grpc.ExportedTableCreationResponse
+	13,  // 340: io.deephaven.proto.backplane.grpc.TableService.Head:output_type -> io.deephaven.proto.backplane.grpc.ExportedTableCreationResponse
+	13,  // 341: io.deephaven.proto.backplane.grpc.TableService.Tail:output_type -> io.deephaven.proto.backplane.grpc.ExportedTableCreationResponse
+	13,  // 342: io.deephaven.proto.backplane.grpc.TableService.HeadBy:output_type -> io.deephaven.proto.backplane.grpc.ExportedTableCreationResponse
+	13,  // 343: io.deephaven.proto.backplane.grpc.TableService.TailBy:output_type -> io.deephaven.proto.backplane.grpc.ExportedTableCreationResponse
+	13,  // 344: io.deephaven.proto.backplane.grpc.TableService.Ungroup:output_type -> io.deephaven.proto.backplane.grpc.ExportedTableCreationResponse
+	13,  // 345: io.deephaven.proto.backplane.grpc.TableService.MergeTables:output_type -> io.deephaven.proto.backplane.grpc.ExportedTableCreationResponse
+	13,  // 346: io.deephaven.proto.backplane.grpc.TableService.CrossJoinTables:output_type -> io.deephaven.proto.backplane.grpc.ExportedTableCreationResponse
+	13,  // 347: io.deephaven.proto.backplane.grpc.TableService.NaturalJoinTables:output_type -> io.deephaven.proto.backplane.grpc.ExportedTableCreationResponse
+	13,  // 348: io.deephaven.proto.backplane.grpc.TableService.ExactJoinTables:output_type -> io.deephaven.proto.backplane.grpc.ExportedTableCreationResponse
+	13,  // 349: io.deephaven.proto.backplane.grpc.TableService.LeftJoinTables:output_type -> io.deephaven.proto.backplane.grpc.ExportedTableCreationResponse
+	13,  // 350: io.deephaven.proto.backplane.grpc.TableService.AsOfJoinTables:output_type -> io.deephaven.proto.backplane.grpc.ExportedTableCreationResponse
+	13,  // 351: io.deephaven.proto.backplane.grpc.TableService.AjTables:output_type -> io.deephaven.proto.backplane.grpc.ExportedTableCreationResponse
+	13,  // 352: io.deephaven.proto.backplane.grpc.TableService.RajTables:output_type -> io.deephaven.proto.backplane.grpc.ExportedTableCreationResponse
+	13,  // 353: io.deephaven.proto.backplane.grpc.TableService.MultiJoinTables:output_type -> io.deephaven.proto.backplane.grpc.ExportedTableCreationResponse
+	13,  // 354: io.deephaven.proto.backplane.grpc.TableService.RangeJoinTables:output_type -> io.deephaven.proto.backplane.grpc.ExportedTableCreationResponse
+	13,  // 355: io.deephaven.proto.backplane.grpc.TableService.ComboAggregate:output_type -> io.deephaven.proto.backplane.grpc.ExportedTableCreationResponse
+	13,  // 356: io.deephaven.proto.backplane.grpc.TableService.AggregateAll:output_type -> io.deephaven.proto.backplane.grpc.ExportedTableCreationResponse
+	13,  // 357: io.deephaven.proto.backplane.grpc.TableService.Aggregate:output_type -> io.deephaven.proto.backplane.grpc.ExportedTableCreationResponse
+	13,  // 358: io.deephaven.proto.backplane.grpc.TableService.Snapshot:output_type -> io.deephaven.proto.backplane.grpc.ExportedTableCreationResponse
+	13,  // 359: io.deephaven.proto.backplane.grpc.TableService.SnapshotWhen:output_type -> io.deephaven.proto.backplane.grpc.ExportedTableCreationResponse
+	13,  // 360: io.deephaven.proto.backplane.grpc.TableService.Flatten:output_type -> io.deephaven.proto.backplane.grpc.ExportedTableCreationResponse
+	13,  // 361: io.deephaven.proto.backplane.grpc.TableService.RunChartDownsample:output_type -> io.deephaven.proto.backplane.grpc.ExportedTableCreationResponse
+	13,  // 362: io.deephaven.proto.backplane.grpc.TableService.CreateInputTable:output_type -> io.deephaven.proto.backplane.grpc.ExportedTableCreationResponse
+	13,  // 363: io.deephaven.proto.backplane.grpc.TableService.WhereIn:output_type -> io.deephaven.proto.backplane.grpc.ExportedTableCreationResponse
+	13,  // 364: io.deephaven.proto.backplane.grpc.TableService.Batch:output_type -> io.deephaven.proto.backplane.grpc.ExportedTableCreationResponse
+	17,  // 365: io.deephaven.proto.backplane.grpc.TableService.ExportedTableUpdates:output_type -> io.deephaven.proto.backplane.grpc.ExportedTableUpdateMessage
+	54,  // 366: io.deephaven.proto.backplane.grpc.TableService.SeekRow:output_type -> io.deephaven.proto.backplane.grpc.SeekRowResponse
+	13,  // 367: io.deephaven.proto.backplane.grpc.TableService.MetaTable:output_type -> io.deephaven.proto.backplane.grpc.ExportedTableCreationResponse
+	13,  // 368: io.deephaven.proto.backplane.grpc.TableService.ComputeColumnStatistics:output_type -> io.deephaven.proto.backplane.grpc.ExportedTableCreationResponse
+	13,  // 369: io.deephaven.proto.backplane.grpc.TableService.Slice:output_type -> io.deephaven.proto.backplane.grpc.ExportedTableCreationResponse
+	324, // [324:370] is the sub-list for method output_type
+	278, // [278:324] is the sub-list for method input_type
+	278, // [278:278] is the sub-list for extension type_name
+	278, // [278:278] is the sub-list for extension extendee
+	0,   // [0:278] is the sub-list for field type_name
+}
+
+func init() { file_deephaven_core_proto_table_proto_init() }
+func file_deephaven_core_proto_table_proto_init() {
+	if File_deephaven_core_proto_table_proto != nil {
 		return
 	}
 	if !protoimpl.UnsafeEnabled {
-		file_deephaven_proto_table_proto_msgTypes[0].Exporter = func(v interface{}, i int) interface{} {
+		file_deephaven_core_proto_table_proto_msgTypes[0].Exporter = func(v interface{}, i int) interface{} {
 			switch v := v.(*TableReference); i {
 			case 0:
 				return &v.state
@@ -12929,7 +13289,7 @@ func file_deephaven_proto_table_proto_init() {
 				return nil
 			}
 		}
-		file_deephaven_proto_table_proto_msgTypes[1].Exporter = func(v interface{}, i int) interface{} {
+		file_deephaven_core_proto_table_proto_msgTypes[1].Exporter = func(v interface{}, i int) interface{} {
 			switch v := v.(*ExportedTableCreationResponse); i {
 			case 0:
 				return &v.state
@@ -12941,7 +13301,7 @@ func file_deephaven_proto_table_proto_init() {
 				return nil
 			}
 		}
-		file_deephaven_proto_table_proto_msgTypes[2].Exporter = func(v interface{}, i int) interface{} {
+		file_deephaven_core_proto_table_proto_msgTypes[2].Exporter = func(v interface{}, i int) interface{} {
 			switch v := v.(*FetchTableRequest); i {
 			case 0:
 				return &v.state
@@ -12953,7 +13313,7 @@ func file_deephaven_proto_table_proto_init() {
 				return nil
 			}
 		}
-		file_deephaven_proto_table_proto_msgTypes[3].Exporter = func(v interface{}, i int) interface{} {
+		file_deephaven_core_proto_table_proto_msgTypes[3].Exporter = func(v interface{}, i int) interface{} {
 			switch v := v.(*ApplyPreviewColumnsRequest); i {
 			case 0:
 				return &v.state
@@ -12965,7 +13325,7 @@ func file_deephaven_proto_table_proto_init() {
 				return nil
 			}
 		}
-		file_deephaven_proto_table_proto_msgTypes[4].Exporter = func(v interface{}, i int) interface{} {
+		file_deephaven_core_proto_table_proto_msgTypes[4].Exporter = func(v interface{}, i int) interface{} {
 			switch v := v.(*ExportedTableUpdatesRequest); i {
 			case 0:
 				return &v.state
@@ -12977,7 +13337,7 @@ func file_deephaven_proto_table_proto_init() {
 				return nil
 			}
 		}
-		file_deephaven_proto_table_proto_msgTypes[5].Exporter = func(v interface{}, i int) interface{} {
+		file_deephaven_core_proto_table_proto_msgTypes[5].Exporter = func(v interface{}, i int) interface{} {
 			switch v := v.(*ExportedTableUpdateMessage); i {
 			case 0:
 				return &v.state
@@ -12989,7 +13349,7 @@ func file_deephaven_proto_table_proto_init() {
 				return nil
 			}
 		}
-		file_deephaven_proto_table_proto_msgTypes[6].Exporter = func(v interface{}, i int) interface{} {
+		file_deephaven_core_proto_table_proto_msgTypes[6].Exporter = func(v interface{}, i int) interface{} {
 			switch v := v.(*EmptyTableRequest); i {
 			case 0:
 				return &v.state
@@ -13001,7 +13361,7 @@ func file_deephaven_proto_table_proto_init() {
 				return nil
 			}
 		}
-		file_deephaven_proto_table_proto_msgTypes[7].Exporter = func(v interface{}, i int) interface{} {
+		file_deephaven_core_proto_table_proto_msgTypes[7].Exporter = func(v interface{}, i int) interface{} {
 			switch v := v.(*TimeTableRequest); i {
 			case 0:
 				return &v.state
@@ -13013,7 +13373,7 @@ func file_deephaven_proto_table_proto_init() {
 				return nil
 			}
 		}
-		file_deephaven_proto_table_proto_msgTypes[8].Exporter = func(v interface{}, i int) interface{} {
+		file_deephaven_core_proto_table_proto_msgTypes[8].Exporter = func(v interface{}, i int) interface{} {
 			switch v := v.(*SelectOrUpdateRequest); i {
 			case 0:
 				return &v.state
@@ -13025,7 +13385,19 @@ func file_deephaven_proto_table_proto_init() {
 				return nil
 			}
 		}
-		file_deephaven_proto_table_proto_msgTypes[9].Exporter = func(v interface{}, i int) interface{} {
+		file_deephaven_core_proto_table_proto_msgTypes[9].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*Selectable); i {
+			case 0:
+				return &v.state
+			case 1:
+				return &v.sizeCache
+			case 2:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
+		file_deephaven_core_proto_table_proto_msgTypes[10].Exporter = func(v interface{}, i int) interface{} {
 			switch v := v.(*MathContext); i {
 			case 0:
 				return &v.state
@@ -13037,7 +13409,7 @@ func file_deephaven_proto_table_proto_init() {
 				return nil
 			}
 		}
-		file_deephaven_proto_table_proto_msgTypes[10].Exporter = func(v interface{}, i int) interface{} {
+		file_deephaven_core_proto_table_proto_msgTypes[11].Exporter = func(v interface{}, i int) interface{} {
 			switch v := v.(*UpdateByWindowScale); i {
 			case 0:
 				return &v.state
@@ -13049,7 +13421,7 @@ func file_deephaven_proto_table_proto_init() {
 				return nil
 			}
 		}
-		file_deephaven_proto_table_proto_msgTypes[11].Exporter = func(v interface{}, i int) interface{} {
+		file_deephaven_core_proto_table_proto_msgTypes[12].Exporter = func(v interface{}, i int) interface{} {
 			switch v := v.(*UpdateByEmOptions); i {
 			case 0:
 				return &v.state
@@ -13061,7 +13433,7 @@ func file_deephaven_proto_table_proto_init() {
 				return nil
 			}
 		}
-		file_deephaven_proto_table_proto_msgTypes[12].Exporter = func(v interface{}, i int) interface{} {
+		file_deephaven_core_proto_table_proto_msgTypes[13].Exporter = func(v interface{}, i int) interface{} {
 			switch v := v.(*UpdateByDeltaOptions); i {
 			case 0:
 				return &v.state
@@ -13073,7 +13445,7 @@ func file_deephaven_proto_table_proto_init() {
 				return nil
 			}
 		}
-		file_deephaven_proto_table_proto_msgTypes[13].Exporter = func(v interface{}, i int) interface{} {
+		file_deephaven_core_proto_table_proto_msgTypes[14].Exporter = func(v interface{}, i int) interface{} {
 			switch v := v.(*UpdateByRequest); i {
 			case 0:
 				return &v.state
@@ -13085,7 +13457,7 @@ func file_deephaven_proto_table_proto_init() {
 				return nil
 			}
 		}
-		file_deephaven_proto_table_proto_msgTypes[14].Exporter = func(v interface{}, i int) interface{} {
+		file_deephaven_core_proto_table_proto_msgTypes[15].Exporter = func(v interface{}, i int) interface{} {
 			switch v := v.(*SelectDistinctRequest); i {
 			case 0:
 				return &v.state
@@ -13097,7 +13469,7 @@ func file_deephaven_proto_table_proto_init() {
 				return nil
 			}
 		}
-		file_deephaven_proto_table_proto_msgTypes[15].Exporter = func(v interface{}, i int) interface{} {
+		file_deephaven_core_proto_table_proto_msgTypes[16].Exporter = func(v interface{}, i int) interface{} {
 			switch v := v.(*DropColumnsRequest); i {
 			case 0:
 				return &v.state
@@ -13109,7 +13481,7 @@ func file_deephaven_proto_table_proto_init() {
 				return nil
 			}
 		}
-		file_deephaven_proto_table_proto_msgTypes[16].Exporter = func(v interface{}, i int) interface{} {
+		file_deephaven_core_proto_table_proto_msgTypes[17].Exporter = func(v interface{}, i int) interface{} {
 			switch v := v.(*UnstructuredFilterTableRequest); i {
 			case 0:
 				return &v.state
@@ -13121,7 +13493,7 @@ func file_deephaven_proto_table_proto_init() {
 				return nil
 			}
 		}
-		file_deephaven_proto_table_proto_msgTypes[17].Exporter = func(v interface{}, i int) interface{} {
+		file_deephaven_core_proto_table_proto_msgTypes[18].Exporter = func(v interface{}, i int) interface{} {
 			switch v := v.(*HeadOrTailRequest); i {
 			case 0:
 				return &v.state
@@ -13133,7 +13505,7 @@ func file_deephaven_proto_table_proto_init() {
 				return nil
 			}
 		}
-		file_deephaven_proto_table_proto_msgTypes[18].Exporter = func(v interface{}, i int) interface{} {
+		file_deephaven_core_proto_table_proto_msgTypes[19].Exporter = func(v interface{}, i int) interface{} {
 			switch v := v.(*HeadOrTailByRequest); i {
 			case 0:
 				return &v.state
@@ -13145,7 +13517,7 @@ func file_deephaven_proto_table_proto_init() {
 				return nil
 			}
 		}
-		file_deephaven_proto_table_proto_msgTypes[19].Exporter = func(v interface{}, i int) interface{} {
+		file_deephaven_core_proto_table_proto_msgTypes[20].Exporter = func(v interface{}, i int) interface{} {
 			switch v := v.(*UngroupRequest); i {
 			case 0:
 				return &v.state
@@ -13157,7 +13529,7 @@ func file_deephaven_proto_table_proto_init() {
 				return nil
 			}
 		}
-		file_deephaven_proto_table_proto_msgTypes[20].Exporter = func(v interface{}, i int) interface{} {
+		file_deephaven_core_proto_table_proto_msgTypes[21].Exporter = func(v interface{}, i int) interface{} {
 			switch v := v.(*MergeTablesRequest); i {
 			case 0:
 				return &v.state
@@ -13169,7 +13541,7 @@ func file_deephaven_proto_table_proto_init() {
 				return nil
 			}
 		}
-		file_deephaven_proto_table_proto_msgTypes[21].Exporter = func(v interface{}, i int) interface{} {
+		file_deephaven_core_proto_table_proto_msgTypes[22].Exporter = func(v interface{}, i int) interface{} {
 			switch v := v.(*SnapshotTableRequest); i {
 			case 0:
 				return &v.state
@@ -13181,7 +13553,7 @@ func file_deephaven_proto_table_proto_init() {
 				return nil
 			}
 		}
-		file_deephaven_proto_table_proto_msgTypes[22].Exporter = func(v interface{}, i int) interface{} {
+		file_deephaven_core_proto_table_proto_msgTypes[23].Exporter = func(v interface{}, i int) interface{} {
 			switch v := v.(*SnapshotWhenTableRequest); i {
 			case 0:
 				return &v.state
@@ -13193,7 +13565,7 @@ func file_deephaven_proto_table_proto_init() {
 				return nil
 			}
 		}
-		file_deephaven_proto_table_proto_msgTypes[23].Exporter = func(v interface{}, i int) interface{} {
+		file_deephaven_core_proto_table_proto_msgTypes[24].Exporter = func(v interface{}, i int) interface{} {
 			switch v := v.(*CrossJoinTablesRequest); i {
 			case 0:
 				return &v.state
@@ -13205,7 +13577,7 @@ func file_deephaven_proto_table_proto_init() {
 				return nil
 			}
 		}
-		file_deephaven_proto_table_proto_msgTypes[24].Exporter = func(v interface{}, i int) interface{} {
+		file_deephaven_core_proto_table_proto_msgTypes[25].Exporter = func(v interface{}, i int) interface{} {
 			switch v := v.(*NaturalJoinTablesRequest); i {
 			case 0:
 				return &v.state
@@ -13217,7 +13589,7 @@ func file_deephaven_proto_table_proto_init() {
 				return nil
 			}
 		}
-		file_deephaven_proto_table_proto_msgTypes[25].Exporter = func(v interface{}, i int) interface{} {
+		file_deephaven_core_proto_table_proto_msgTypes[26].Exporter = func(v interface{}, i int) interface{} {
 			switch v := v.(*ExactJoinTablesRequest); i {
 			case 0:
 				return &v.state
@@ -13229,7 +13601,7 @@ func file_deephaven_proto_table_proto_init() {
 				return nil
 			}
 		}
-		file_deephaven_proto_table_proto_msgTypes[26].Exporter = func(v interface{}, i int) interface{} {
+		file_deephaven_core_proto_table_proto_msgTypes[27].Exporter = func(v interface{}, i int) interface{} {
 			switch v := v.(*LeftJoinTablesRequest); i {
 			case 0:
 				return &v.state
@@ -13241,7 +13613,7 @@ func file_deephaven_proto_table_proto_init() {
 				return nil
 			}
 		}
-		file_deephaven_proto_table_proto_msgTypes[27].Exporter = func(v interface{}, i int) interface{} {
+		file_deephaven_core_proto_table_proto_msgTypes[28].Exporter = func(v interface{}, i int) interface{} {
 			switch v := v.(*AsOfJoinTablesRequest); i {
 			case 0:
 				return &v.state
@@ -13253,7 +13625,7 @@ func file_deephaven_proto_table_proto_init() {
 				return nil
 			}
 		}
-		file_deephaven_proto_table_proto_msgTypes[28].Exporter = func(v interface{}, i int) interface{} {
+		file_deephaven_core_proto_table_proto_msgTypes[29].Exporter = func(v interface{}, i int) interface{} {
 			switch v := v.(*AjRajTablesRequest); i {
 			case 0:
 				return &v.state
@@ -13265,7 +13637,7 @@ func file_deephaven_proto_table_proto_init() {
 				return nil
 			}
 		}
-		file_deephaven_proto_table_proto_msgTypes[29].Exporter = func(v interface{}, i int) interface{} {
+		file_deephaven_core_proto_table_proto_msgTypes[30].Exporter = func(v interface{}, i int) interface{} {
 			switch v := v.(*MultiJoinInput); i {
 			case 0:
 				return &v.state
@@ -13277,7 +13649,7 @@ func file_deephaven_proto_table_proto_init() {
 				return nil
 			}
 		}
-		file_deephaven_proto_table_proto_msgTypes[30].Exporter = func(v interface{}, i int) interface{} {
+		file_deephaven_core_proto_table_proto_msgTypes[31].Exporter = func(v interface{}, i int) interface{} {
 			switch v := v.(*MultiJoinTablesRequest); i {
 			case 0:
 				return &v.state
@@ -13289,7 +13661,7 @@ func file_deephaven_proto_table_proto_init() {
 				return nil
 			}
 		}
-		file_deephaven_proto_table_proto_msgTypes[31].Exporter = func(v interface{}, i int) interface{} {
+		file_deephaven_core_proto_table_proto_msgTypes[32].Exporter = func(v interface{}, i int) interface{} {
 			switch v := v.(*RangeJoinTablesRequest); i {
 			case 0:
 				return &v.state
@@ -13301,7 +13673,7 @@ func file_deephaven_proto_table_proto_init() {
 				return nil
 			}
 		}
-		file_deephaven_proto_table_proto_msgTypes[32].Exporter = func(v interface{}, i int) interface{} {
+		file_deephaven_core_proto_table_proto_msgTypes[33].Exporter = func(v interface{}, i int) interface{} {
 			switch v := v.(*ComboAggregateRequest); i {
 			case 0:
 				return &v.state
@@ -13313,7 +13685,7 @@ func file_deephaven_proto_table_proto_init() {
 				return nil
 			}
 		}
-		file_deephaven_proto_table_proto_msgTypes[33].Exporter = func(v interface{}, i int) interface{} {
+		file_deephaven_core_proto_table_proto_msgTypes[34].Exporter = func(v interface{}, i int) interface{} {
 			switch v := v.(*AggregateAllRequest); i {
 			case 0:
 				return &v.state
@@ -13325,7 +13697,7 @@ func file_deephaven_proto_table_proto_init() {
 				return nil
 			}
 		}
-		file_deephaven_proto_table_proto_msgTypes[34].Exporter = func(v interface{}, i int) interface{} {
+		file_deephaven_core_proto_table_proto_msgTypes[35].Exporter = func(v interface{}, i int) interface{} {
 			switch v := v.(*AggSpec); i {
 			case 0:
 				return &v.state
@@ -13337,7 +13709,7 @@ func file_deephaven_proto_table_proto_init() {
 				return nil
 			}
 		}
-		file_deephaven_proto_table_proto_msgTypes[35].Exporter = func(v interface{}, i int) interface{} {
+		file_deephaven_core_proto_table_proto_msgTypes[36].Exporter = func(v interface{}, i int) interface{} {
 			switch v := v.(*AggregateRequest); i {
 			case 0:
 				return &v.state
@@ -13349,7 +13721,7 @@ func file_deephaven_proto_table_proto_init() {
 				return nil
 			}
 		}
-		file_deephaven_proto_table_proto_msgTypes[36].Exporter = func(v interface{}, i int) interface{} {
+		file_deephaven_core_proto_table_proto_msgTypes[37].Exporter = func(v interface{}, i int) interface{} {
 			switch v := v.(*Aggregation); i {
 			case 0:
 				return &v.state
@@ -13361,7 +13733,7 @@ func file_deephaven_proto_table_proto_init() {
 				return nil
 			}
 		}
-		file_deephaven_proto_table_proto_msgTypes[37].Exporter = func(v interface{}, i int) interface{} {
+		file_deephaven_core_proto_table_proto_msgTypes[38].Exporter = func(v interface{}, i int) interface{} {
 			switch v := v.(*SortDescriptor); i {
 			case 0:
 				return &v.state
@@ -13373,7 +13745,7 @@ func file_deephaven_proto_table_proto_init() {
 				return nil
 			}
 		}
-		file_deephaven_proto_table_proto_msgTypes[38].Exporter = func(v interface{}, i int) interface{} {
+		file_deephaven_core_proto_table_proto_msgTypes[39].Exporter = func(v interface{}, i int) interface{} {
 			switch v := v.(*SortTableRequest); i {
 			case 0:
 				return &v.state
@@ -13385,7 +13757,7 @@ func file_deephaven_proto_table_proto_init() {
 				return nil
 			}
 		}
-		file_deephaven_proto_table_proto_msgTypes[39].Exporter = func(v interface{}, i int) interface{} {
+		file_deephaven_core_proto_table_proto_msgTypes[40].Exporter = func(v interface{}, i int) interface{} {
 			switch v := v.(*FilterTableRequest); i {
 			case 0:
 				return &v.state
@@ -13397,7 +13769,7 @@ func file_deephaven_proto_table_proto_init() {
 				return nil
 			}
 		}
-		file_deephaven_proto_table_proto_msgTypes[40].Exporter = func(v interface{}, i int) interface{} {
+		file_deephaven_core_proto_table_proto_msgTypes[41].Exporter = func(v interface{}, i int) interface{} {
 			switch v := v.(*SeekRowRequest); i {
 			case 0:
 				return &v.state
@@ -13409,7 +13781,7 @@ func file_deephaven_proto_table_proto_init() {
 				return nil
 			}
 		}
-		file_deephaven_proto_table_proto_msgTypes[41].Exporter = func(v interface{}, i int) interface{} {
+		file_deephaven_core_proto_table_proto_msgTypes[42].Exporter = func(v interface{}, i int) interface{} {
 			switch v := v.(*SeekRowResponse); i {
 			case 0:
 				return &v.state
@@ -13421,7 +13793,7 @@ func file_deephaven_proto_table_proto_init() {
 				return nil
 			}
 		}
-		file_deephaven_proto_table_proto_msgTypes[42].Exporter = func(v interface{}, i int) interface{} {
+		file_deephaven_core_proto_table_proto_msgTypes[43].Exporter = func(v interface{}, i int) interface{} {
 			switch v := v.(*Reference); i {
 			case 0:
 				return &v.state
@@ -13433,7 +13805,7 @@ func file_deephaven_proto_table_proto_init() {
 				return nil
 			}
 		}
-		file_deephaven_proto_table_proto_msgTypes[43].Exporter = func(v interface{}, i int) interface{} {
+		file_deephaven_core_proto_table_proto_msgTypes[44].Exporter = func(v interface{}, i int) interface{} {
 			switch v := v.(*Literal); i {
 			case 0:
 				return &v.state
@@ -13445,7 +13817,7 @@ func file_deephaven_proto_table_proto_init() {
 				return nil
 			}
 		}
-		file_deephaven_proto_table_proto_msgTypes[44].Exporter = func(v interface{}, i int) interface{} {
+		file_deephaven_core_proto_table_proto_msgTypes[45].Exporter = func(v interface{}, i int) interface{} {
 			switch v := v.(*Value); i {
 			case 0:
 				return &v.state
@@ -13457,7 +13829,7 @@ func file_deephaven_proto_table_proto_init() {
 				return nil
 			}
 		}
-		file_deephaven_proto_table_proto_msgTypes[45].Exporter = func(v interface{}, i int) interface{} {
+		file_deephaven_core_proto_table_proto_msgTypes[46].Exporter = func(v interface{}, i int) interface{} {
 			switch v := v.(*Condition); i {
 			case 0:
 				return &v.state
@@ -13469,7 +13841,7 @@ func file_deephaven_proto_table_proto_init() {
 				return nil
 			}
 		}
-		file_deephaven_proto_table_proto_msgTypes[46].Exporter = func(v interface{}, i int) interface{} {
+		file_deephaven_core_proto_table_proto_msgTypes[47].Exporter = func(v interface{}, i int) interface{} {
 			switch v := v.(*AndCondition); i {
 			case 0:
 				return &v.state
@@ -13481,7 +13853,7 @@ func file_deephaven_proto_table_proto_init() {
 				return nil
 			}
 		}
-		file_deephaven_proto_table_proto_msgTypes[47].Exporter = func(v interface{}, i int) interface{} {
+		file_deephaven_core_proto_table_proto_msgTypes[48].Exporter = func(v interface{}, i int) interface{} {
 			switch v := v.(*OrCondition); i {
 			case 0:
 				return &v.state
@@ -13493,7 +13865,7 @@ func file_deephaven_proto_table_proto_init() {
 				return nil
 			}
 		}
-		file_deephaven_proto_table_proto_msgTypes[48].Exporter = func(v interface{}, i int) interface{} {
+		file_deephaven_core_proto_table_proto_msgTypes[49].Exporter = func(v interface{}, i int) interface{} {
 			switch v := v.(*NotCondition); i {
 			case 0:
 				return &v.state
@@ -13505,7 +13877,7 @@ func file_deephaven_proto_table_proto_init() {
 				return nil
 			}
 		}
-		file_deephaven_proto_table_proto_msgTypes[49].Exporter = func(v interface{}, i int) interface{} {
+		file_deephaven_core_proto_table_proto_msgTypes[50].Exporter = func(v interface{}, i int) interface{} {
 			switch v := v.(*CompareCondition); i {
 			case 0:
 				return &v.state
@@ -13517,7 +13889,7 @@ func file_deephaven_proto_table_proto_init() {
 				return nil
 			}
 		}
-		file_deephaven_proto_table_proto_msgTypes[50].Exporter = func(v interface{}, i int) interface{} {
+		file_deephaven_core_proto_table_proto_msgTypes[51].Exporter = func(v interface{}, i int) interface{} {
 			switch v := v.(*InCondition); i {
 			case 0:
 				return &v.state
@@ -13529,7 +13901,7 @@ func file_deephaven_proto_table_proto_init() {
 				return nil
 			}
 		}
-		file_deephaven_proto_table_proto_msgTypes[51].Exporter = func(v interface{}, i int) interface{} {
+		file_deephaven_core_proto_table_proto_msgTypes[52].Exporter = func(v interface{}, i int) interface{} {
 			switch v := v.(*InvokeCondition); i {
 			case 0:
 				return &v.state
@@ -13541,7 +13913,7 @@ func file_deephaven_proto_table_proto_init() {
 				return nil
 			}
 		}
-		file_deephaven_proto_table_proto_msgTypes[52].Exporter = func(v interface{}, i int) interface{} {
+		file_deephaven_core_proto_table_proto_msgTypes[53].Exporter = func(v interface{}, i int) interface{} {
 			switch v := v.(*IsNullCondition); i {
 			case 0:
 				return &v.state
@@ -13553,7 +13925,7 @@ func file_deephaven_proto_table_proto_init() {
 				return nil
 			}
 		}
-		file_deephaven_proto_table_proto_msgTypes[53].Exporter = func(v interface{}, i int) interface{} {
+		file_deephaven_core_proto_table_proto_msgTypes[54].Exporter = func(v interface{}, i int) interface{} {
 			switch v := v.(*MatchesCondition); i {
 			case 0:
 				return &v.state
@@ -13565,7 +13937,7 @@ func file_deephaven_proto_table_proto_init() {
 				return nil
 			}
 		}
-		file_deephaven_proto_table_proto_msgTypes[54].Exporter = func(v interface{}, i int) interface{} {
+		file_deephaven_core_proto_table_proto_msgTypes[55].Exporter = func(v interface{}, i int) interface{} {
 			switch v := v.(*ContainsCondition); i {
 			case 0:
 				return &v.state
@@ -13577,7 +13949,7 @@ func file_deephaven_proto_table_proto_init() {
 				return nil
 			}
 		}
-		file_deephaven_proto_table_proto_msgTypes[55].Exporter = func(v interface{}, i int) interface{} {
+		file_deephaven_core_proto_table_proto_msgTypes[56].Exporter = func(v interface{}, i int) interface{} {
 			switch v := v.(*SearchCondition); i {
 			case 0:
 				return &v.state
@@ -13589,7 +13961,7 @@ func file_deephaven_proto_table_proto_init() {
 				return nil
 			}
 		}
-		file_deephaven_proto_table_proto_msgTypes[56].Exporter = func(v interface{}, i int) interface{} {
+		file_deephaven_core_proto_table_proto_msgTypes[57].Exporter = func(v interface{}, i int) interface{} {
 			switch v := v.(*FlattenRequest); i {
 			case 0:
 				return &v.state
@@ -13601,7 +13973,7 @@ func file_deephaven_proto_table_proto_init() {
 				return nil
 			}
 		}
-		file_deephaven_proto_table_proto_msgTypes[57].Exporter = func(v interface{}, i int) interface{} {
+		file_deephaven_core_proto_table_proto_msgTypes[58].Exporter = func(v interface{}, i int) interface{} {
 			switch v := v.(*MetaTableRequest); i {
 			case 0:
 				return &v.state
@@ -13613,7 +13985,7 @@ func file_deephaven_proto_table_proto_init() {
 				return nil
 			}
 		}
-		file_deephaven_proto_table_proto_msgTypes[58].Exporter = func(v interface{}, i int) interface{} {
+		file_deephaven_core_proto_table_proto_msgTypes[59].Exporter = func(v interface{}, i int) interface{} {
 			switch v := v.(*RunChartDownsampleRequest); i {
 			case 0:
 				return &v.state
@@ -13625,7 +13997,7 @@ func file_deephaven_proto_table_proto_init() {
 				return nil
 			}
 		}
-		file_deephaven_proto_table_proto_msgTypes[59].Exporter = func(v interface{}, i int) interface{} {
+		file_deephaven_core_proto_table_proto_msgTypes[60].Exporter = func(v interface{}, i int) interface{} {
 			switch v := v.(*CreateInputTableRequest); i {
 			case 0:
 				return &v.state
@@ -13637,7 +14009,7 @@ func file_deephaven_proto_table_proto_init() {
 				return nil
 			}
 		}
-		file_deephaven_proto_table_proto_msgTypes[60].Exporter = func(v interface{}, i int) interface{} {
+		file_deephaven_core_proto_table_proto_msgTypes[61].Exporter = func(v interface{}, i int) interface{} {
 			switch v := v.(*WhereInRequest); i {
 			case 0:
 				return &v.state
@@ -13649,7 +14021,7 @@ func file_deephaven_proto_table_proto_init() {
 				return nil
 			}
 		}
-		file_deephaven_proto_table_proto_msgTypes[61].Exporter = func(v interface{}, i int) interface{} {
+		file_deephaven_core_proto_table_proto_msgTypes[62].Exporter = func(v interface{}, i int) interface{} {
 			switch v := v.(*ColumnStatisticsRequest); i {
 			case 0:
 				return &v.state
@@ -13661,7 +14033,19 @@ func file_deephaven_proto_table_proto_init() {
 				return nil
 			}
 		}
-		file_deephaven_proto_table_proto_msgTypes[62].Exporter = func(v interface{}, i int) interface{} {
+		file_deephaven_core_proto_table_proto_msgTypes[63].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*SliceRequest); i {
+			case 0:
+				return &v.state
+			case 1:
+				return &v.sizeCache
+			case 2:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
+		file_deephaven_core_proto_table_proto_msgTypes[64].Exporter = func(v interface{}, i int) interface{} {
 			switch v := v.(*BatchTableRequest); i {
 			case 0:
 				return &v.state
@@ -13673,7 +14057,7 @@ func file_deephaven_proto_table_proto_init() {
 				return nil
 			}
 		}
-		file_deephaven_proto_table_proto_msgTypes[63].Exporter = func(v interface{}, i int) interface{} {
+		file_deephaven_core_proto_table_proto_msgTypes[65].Exporter = func(v interface{}, i int) interface{} {
 			switch v := v.(*UpdateByWindowScale_UpdateByWindowTicks); i {
 			case 0:
 				return &v.state
@@ -13685,7 +14069,7 @@ func file_deephaven_proto_table_proto_init() {
 				return nil
 			}
 		}
-		file_deephaven_proto_table_proto_msgTypes[64].Exporter = func(v interface{}, i int) interface{} {
+		file_deephaven_core_proto_table_proto_msgTypes[66].Exporter = func(v interface{}, i int) interface{} {
 			switch v := v.(*UpdateByWindowScale_UpdateByWindowTime); i {
 			case 0:
 				return &v.state
@@ -13697,7 +14081,7 @@ func file_deephaven_proto_table_proto_init() {
 				return nil
 			}
 		}
-		file_deephaven_proto_table_proto_msgTypes[65].Exporter = func(v interface{}, i int) interface{} {
+		file_deephaven_core_proto_table_proto_msgTypes[67].Exporter = func(v interface{}, i int) interface{} {
 			switch v := v.(*UpdateByRequest_UpdateByOptions); i {
 			case 0:
 				return &v.state
@@ -13709,7 +14093,7 @@ func file_deephaven_proto_table_proto_init() {
 				return nil
 			}
 		}
-		file_deephaven_proto_table_proto_msgTypes[66].Exporter = func(v interface{}, i int) interface{} {
+		file_deephaven_core_proto_table_proto_msgTypes[68].Exporter = func(v interface{}, i int) interface{} {
 			switch v := v.(*UpdateByRequest_UpdateByOperation); i {
 			case 0:
 				return &v.state
@@ -13721,7 +14105,7 @@ func file_deephaven_proto_table_proto_init() {
 				return nil
 			}
 		}
-		file_deephaven_proto_table_proto_msgTypes[67].Exporter = func(v interface{}, i int) interface{} {
+		file_deephaven_core_proto_table_proto_msgTypes[69].Exporter = func(v interface{}, i int) interface{} {
 			switch v := v.(*UpdateByRequest_UpdateByOperation_UpdateByColumn); i {
 			case 0:
 				return &v.state
@@ -13733,7 +14117,7 @@ func file_deephaven_proto_table_proto_init() {
 				return nil
 			}
 		}
-		file_deephaven_proto_table_proto_msgTypes[68].Exporter = func(v interface{}, i int) interface{} {
+		file_deephaven_core_proto_table_proto_msgTypes[70].Exporter = func(v interface{}, i int) interface{} {
 			switch v := v.(*UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec); i {
 			case 0:
 				return &v.state
@@ -13745,7 +14129,7 @@ func file_deephaven_proto_table_proto_init() {
 				return nil
 			}
 		}
-		file_deephaven_proto_table_proto_msgTypes[69].Exporter = func(v interface{}, i int) interface{} {
+		file_deephaven_core_proto_table_proto_msgTypes[71].Exporter = func(v interface{}, i int) interface{} {
 			switch v := v.(*UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByCumulativeSum); i {
 			case 0:
 				return &v.state
@@ -13757,7 +14141,7 @@ func file_deephaven_proto_table_proto_init() {
 				return nil
 			}
 		}
-		file_deephaven_proto_table_proto_msgTypes[70].Exporter = func(v interface{}, i int) interface{} {
+		file_deephaven_core_proto_table_proto_msgTypes[72].Exporter = func(v interface{}, i int) interface{} {
 			switch v := v.(*UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByCumulativeMin); i {
 			case 0:
 				return &v.state
@@ -13769,7 +14153,7 @@ func file_deephaven_proto_table_proto_init() {
 				return nil
 			}
 		}
-		file_deephaven_proto_table_proto_msgTypes[71].Exporter = func(v interface{}, i int) interface{} {
+		file_deephaven_core_proto_table_proto_msgTypes[73].Exporter = func(v interface{}, i int) interface{} {
 			switch v := v.(*UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByCumulativeMax); i {
 			case 0:
 				return &v.state
@@ -13781,7 +14165,7 @@ func file_deephaven_proto_table_proto_init() {
 				return nil
 			}
 		}
-		file_deephaven_proto_table_proto_msgTypes[72].Exporter = func(v interface{}, i int) interface{} {
+		file_deephaven_core_proto_table_proto_msgTypes[74].Exporter = func(v interface{}, i int) interface{} {
 			switch v := v.(*UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByCumulativeProduct); i {
 			case 0:
 				return &v.state
@@ -13793,7 +14177,7 @@ func file_deephaven_proto_table_proto_init() {
 				return nil
 			}
 		}
-		file_deephaven_proto_table_proto_msgTypes[73].Exporter = func(v interface{}, i int) interface{} {
+		file_deephaven_core_proto_table_proto_msgTypes[75].Exporter = func(v interface{}, i int) interface{} {
 			switch v := v.(*UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByFill); i {
 			case 0:
 				return &v.state
@@ -13805,7 +14189,7 @@ func file_deephaven_proto_table_proto_init() {
 				return nil
 			}
 		}
-		file_deephaven_proto_table_proto_msgTypes[74].Exporter = func(v interface{}, i int) interface{} {
+		file_deephaven_core_proto_table_proto_msgTypes[76].Exporter = func(v interface{}, i int) interface{} {
 			switch v := v.(*UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByEma); i {
 			case 0:
 				return &v.state
@@ -13817,7 +14201,7 @@ func file_deephaven_proto_table_proto_init() {
 				return nil
 			}
 		}
-		file_deephaven_proto_table_proto_msgTypes[75].Exporter = func(v interface{}, i int) interface{} {
+		file_deephaven_core_proto_table_proto_msgTypes[77].Exporter = func(v interface{}, i int) interface{} {
 			switch v := v.(*UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByEms); i {
 			case 0:
 				return &v.state
@@ -13829,7 +14213,7 @@ func file_deephaven_proto_table_proto_init() {
 				return nil
 			}
 		}
-		file_deephaven_proto_table_proto_msgTypes[76].Exporter = func(v interface{}, i int) interface{} {
+		file_deephaven_core_proto_table_proto_msgTypes[78].Exporter = func(v interface{}, i int) interface{} {
 			switch v := v.(*UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByEmMin); i {
 			case 0:
 				return &v.state
@@ -13841,7 +14225,7 @@ func file_deephaven_proto_table_proto_init() {
 				return nil
 			}
 		}
-		file_deephaven_proto_table_proto_msgTypes[77].Exporter = func(v interface{}, i int) interface{} {
+		file_deephaven_core_proto_table_proto_msgTypes[79].Exporter = func(v interface{}, i int) interface{} {
 			switch v := v.(*UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByEmMax); i {
 			case 0:
 				return &v.state
@@ -13853,7 +14237,7 @@ func file_deephaven_proto_table_proto_init() {
 				return nil
 			}
 		}
-		file_deephaven_proto_table_proto_msgTypes[78].Exporter = func(v interface{}, i int) interface{} {
+		file_deephaven_core_proto_table_proto_msgTypes[80].Exporter = func(v interface{}, i int) interface{} {
 			switch v := v.(*UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByEmStd); i {
 			case 0:
 				return &v.state
@@ -13865,7 +14249,7 @@ func file_deephaven_proto_table_proto_init() {
 				return nil
 			}
 		}
-		file_deephaven_proto_table_proto_msgTypes[79].Exporter = func(v interface{}, i int) interface{} {
+		file_deephaven_core_proto_table_proto_msgTypes[81].Exporter = func(v interface{}, i int) interface{} {
 			switch v := v.(*UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByDelta); i {
 			case 0:
 				return &v.state
@@ -13877,7 +14261,7 @@ func file_deephaven_proto_table_proto_init() {
 				return nil
 			}
 		}
-		file_deephaven_proto_table_proto_msgTypes[80].Exporter = func(v interface{}, i int) interface{} {
+		file_deephaven_core_proto_table_proto_msgTypes[82].Exporter = func(v interface{}, i int) interface{} {
 			switch v := v.(*UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingSum); i {
 			case 0:
 				return &v.state
@@ -13889,7 +14273,7 @@ func file_deephaven_proto_table_proto_init() {
 				return nil
 			}
 		}
-		file_deephaven_proto_table_proto_msgTypes[81].Exporter = func(v interface{}, i int) interface{} {
+		file_deephaven_core_proto_table_proto_msgTypes[83].Exporter = func(v interface{}, i int) interface{} {
 			switch v := v.(*UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingGroup); i {
 			case 0:
 				return &v.state
@@ -13901,7 +14285,7 @@ func file_deephaven_proto_table_proto_init() {
 				return nil
 			}
 		}
-		file_deephaven_proto_table_proto_msgTypes[82].Exporter = func(v interface{}, i int) interface{} {
+		file_deephaven_core_proto_table_proto_msgTypes[84].Exporter = func(v interface{}, i int) interface{} {
 			switch v := v.(*UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingAvg); i {
 			case 0:
 				return &v.state
@@ -13913,7 +14297,7 @@ func file_deephaven_proto_table_proto_init() {
 				return nil
 			}
 		}
-		file_deephaven_proto_table_proto_msgTypes[83].Exporter = func(v interface{}, i int) interface{} {
+		file_deephaven_core_proto_table_proto_msgTypes[85].Exporter = func(v interface{}, i int) interface{} {
 			switch v := v.(*UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingMin); i {
 			case 0:
 				return &v.state
@@ -13925,7 +14309,7 @@ func file_deephaven_proto_table_proto_init() {
 				return nil
 			}
 		}
-		file_deephaven_proto_table_proto_msgTypes[84].Exporter = func(v interface{}, i int) interface{} {
+		file_deephaven_core_proto_table_proto_msgTypes[86].Exporter = func(v interface{}, i int) interface{} {
 			switch v := v.(*UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingMax); i {
 			case 0:
 				return &v.state
@@ -13937,7 +14321,7 @@ func file_deephaven_proto_table_proto_init() {
 				return nil
 			}
 		}
-		file_deephaven_proto_table_proto_msgTypes[85].Exporter = func(v interface{}, i int) interface{} {
+		file_deephaven_core_proto_table_proto_msgTypes[87].Exporter = func(v interface{}, i int) interface{} {
 			switch v := v.(*UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingProduct); i {
 			case 0:
 				return &v.state
@@ -13949,7 +14333,7 @@ func file_deephaven_proto_table_proto_init() {
 				return nil
 			}
 		}
-		file_deephaven_proto_table_proto_msgTypes[86].Exporter = func(v interface{}, i int) interface{} {
+		file_deephaven_core_proto_table_proto_msgTypes[88].Exporter = func(v interface{}, i int) interface{} {
 			switch v := v.(*UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingCount); i {
 			case 0:
 				return &v.state
@@ -13961,7 +14345,7 @@ func file_deephaven_proto_table_proto_init() {
 				return nil
 			}
 		}
-		file_deephaven_proto_table_proto_msgTypes[87].Exporter = func(v interface{}, i int) interface{} {
+		file_deephaven_core_proto_table_proto_msgTypes[89].Exporter = func(v interface{}, i int) interface{} {
 			switch v := v.(*UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingStd); i {
 			case 0:
 				return &v.state
@@ -13973,7 +14357,7 @@ func file_deephaven_proto_table_proto_init() {
 				return nil
 			}
 		}
-		file_deephaven_proto_table_proto_msgTypes[88].Exporter = func(v interface{}, i int) interface{} {
+		file_deephaven_core_proto_table_proto_msgTypes[90].Exporter = func(v interface{}, i int) interface{} {
 			switch v := v.(*UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingWAvg); i {
 			case 0:
 				return &v.state
@@ -13985,7 +14369,7 @@ func file_deephaven_proto_table_proto_init() {
 				return nil
 			}
 		}
-		file_deephaven_proto_table_proto_msgTypes[89].Exporter = func(v interface{}, i int) interface{} {
+		file_deephaven_core_proto_table_proto_msgTypes[91].Exporter = func(v interface{}, i int) interface{} {
 			switch v := v.(*UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_UpdateByRollingFormula); i {
 			case 0:
 				return &v.state
@@ -13997,7 +14381,7 @@ func file_deephaven_proto_table_proto_init() {
 				return nil
 			}
 		}
-		file_deephaven_proto_table_proto_msgTypes[90].Exporter = func(v interface{}, i int) interface{} {
+		file_deephaven_core_proto_table_proto_msgTypes[92].Exporter = func(v interface{}, i int) interface{} {
 			switch v := v.(*ComboAggregateRequest_Aggregate); i {
 			case 0:
 				return &v.state
@@ -14009,7 +14393,7 @@ func file_deephaven_proto_table_proto_init() {
 				return nil
 			}
 		}
-		file_deephaven_proto_table_proto_msgTypes[91].Exporter = func(v interface{}, i int) interface{} {
+		file_deephaven_core_proto_table_proto_msgTypes[93].Exporter = func(v interface{}, i int) interface{} {
 			switch v := v.(*AggSpec_AggSpecApproximatePercentile); i {
 			case 0:
 				return &v.state
@@ -14021,7 +14405,7 @@ func file_deephaven_proto_table_proto_init() {
 				return nil
 			}
 		}
-		file_deephaven_proto_table_proto_msgTypes[92].Exporter = func(v interface{}, i int) interface{} {
+		file_deephaven_core_proto_table_proto_msgTypes[94].Exporter = func(v interface{}, i int) interface{} {
 			switch v := v.(*AggSpec_AggSpecCountDistinct); i {
 			case 0:
 				return &v.state
@@ -14033,7 +14417,7 @@ func file_deephaven_proto_table_proto_init() {
 				return nil
 			}
 		}
-		file_deephaven_proto_table_proto_msgTypes[93].Exporter = func(v interface{}, i int) interface{} {
+		file_deephaven_core_proto_table_proto_msgTypes[95].Exporter = func(v interface{}, i int) interface{} {
 			switch v := v.(*AggSpec_AggSpecDistinct); i {
 			case 0:
 				return &v.state
@@ -14045,7 +14429,7 @@ func file_deephaven_proto_table_proto_init() {
 				return nil
 			}
 		}
-		file_deephaven_proto_table_proto_msgTypes[94].Exporter = func(v interface{}, i int) interface{} {
+		file_deephaven_core_proto_table_proto_msgTypes[96].Exporter = func(v interface{}, i int) interface{} {
 			switch v := v.(*AggSpec_AggSpecFormula); i {
 			case 0:
 				return &v.state
@@ -14057,7 +14441,7 @@ func file_deephaven_proto_table_proto_init() {
 				return nil
 			}
 		}
-		file_deephaven_proto_table_proto_msgTypes[95].Exporter = func(v interface{}, i int) interface{} {
+		file_deephaven_core_proto_table_proto_msgTypes[97].Exporter = func(v interface{}, i int) interface{} {
 			switch v := v.(*AggSpec_AggSpecMedian); i {
 			case 0:
 				return &v.state
@@ -14069,7 +14453,7 @@ func file_deephaven_proto_table_proto_init() {
 				return nil
 			}
 		}
-		file_deephaven_proto_table_proto_msgTypes[96].Exporter = func(v interface{}, i int) interface{} {
+		file_deephaven_core_proto_table_proto_msgTypes[98].Exporter = func(v interface{}, i int) interface{} {
 			switch v := v.(*AggSpec_AggSpecPercentile); i {
 			case 0:
 				return &v.state
@@ -14081,7 +14465,7 @@ func file_deephaven_proto_table_proto_init() {
 				return nil
 			}
 		}
-		file_deephaven_proto_table_proto_msgTypes[97].Exporter = func(v interface{}, i int) interface{} {
+		file_deephaven_core_proto_table_proto_msgTypes[99].Exporter = func(v interface{}, i int) interface{} {
 			switch v := v.(*AggSpec_AggSpecSorted); i {
 			case 0:
 				return &v.state
@@ -14093,7 +14477,7 @@ func file_deephaven_proto_table_proto_init() {
 				return nil
 			}
 		}
-		file_deephaven_proto_table_proto_msgTypes[98].Exporter = func(v interface{}, i int) interface{} {
+		file_deephaven_core_proto_table_proto_msgTypes[100].Exporter = func(v interface{}, i int) interface{} {
 			switch v := v.(*AggSpec_AggSpecSortedColumn); i {
 			case 0:
 				return &v.state
@@ -14105,7 +14489,7 @@ func file_deephaven_proto_table_proto_init() {
 				return nil
 			}
 		}
-		file_deephaven_proto_table_proto_msgTypes[99].Exporter = func(v interface{}, i int) interface{} {
+		file_deephaven_core_proto_table_proto_msgTypes[101].Exporter = func(v interface{}, i int) interface{} {
 			switch v := v.(*AggSpec_AggSpecTDigest); i {
 			case 0:
 				return &v.state
@@ -14117,7 +14501,7 @@ func file_deephaven_proto_table_proto_init() {
 				return nil
 			}
 		}
-		file_deephaven_proto_table_proto_msgTypes[100].Exporter = func(v interface{}, i int) interface{} {
+		file_deephaven_core_proto_table_proto_msgTypes[102].Exporter = func(v interface{}, i int) interface{} {
 			switch v := v.(*AggSpec_AggSpecUnique); i {
 			case 0:
 				return &v.state
@@ -14129,7 +14513,7 @@ func file_deephaven_proto_table_proto_init() {
 				return nil
 			}
 		}
-		file_deephaven_proto_table_proto_msgTypes[101].Exporter = func(v interface{}, i int) interface{} {
+		file_deephaven_core_proto_table_proto_msgTypes[103].Exporter = func(v interface{}, i int) interface{} {
 			switch v := v.(*AggSpec_AggSpecNonUniqueSentinel); i {
 			case 0:
 				return &v.state
@@ -14141,7 +14525,7 @@ func file_deephaven_proto_table_proto_init() {
 				return nil
 			}
 		}
-		file_deephaven_proto_table_proto_msgTypes[102].Exporter = func(v interface{}, i int) interface{} {
+		file_deephaven_core_proto_table_proto_msgTypes[104].Exporter = func(v interface{}, i int) interface{} {
 			switch v := v.(*AggSpec_AggSpecWeighted); i {
 			case 0:
 				return &v.state
@@ -14153,7 +14537,7 @@ func file_deephaven_proto_table_proto_init() {
 				return nil
 			}
 		}
-		file_deephaven_proto_table_proto_msgTypes[103].Exporter = func(v interface{}, i int) interface{} {
+		file_deephaven_core_proto_table_proto_msgTypes[105].Exporter = func(v interface{}, i int) interface{} {
 			switch v := v.(*AggSpec_AggSpecAbsSum); i {
 			case 0:
 				return &v.state
@@ -14165,7 +14549,7 @@ func file_deephaven_proto_table_proto_init() {
 				return nil
 			}
 		}
-		file_deephaven_proto_table_proto_msgTypes[104].Exporter = func(v interface{}, i int) interface{} {
+		file_deephaven_core_proto_table_proto_msgTypes[106].Exporter = func(v interface{}, i int) interface{} {
 			switch v := v.(*AggSpec_AggSpecAvg); i {
 			case 0:
 				return &v.state
@@ -14177,7 +14561,7 @@ func file_deephaven_proto_table_proto_init() {
 				return nil
 			}
 		}
-		file_deephaven_proto_table_proto_msgTypes[105].Exporter = func(v interface{}, i int) interface{} {
+		file_deephaven_core_proto_table_proto_msgTypes[107].Exporter = func(v interface{}, i int) interface{} {
 			switch v := v.(*AggSpec_AggSpecFirst); i {
 			case 0:
 				return &v.state
@@ -14189,7 +14573,7 @@ func file_deephaven_proto_table_proto_init() {
 				return nil
 			}
 		}
-		file_deephaven_proto_table_proto_msgTypes[106].Exporter = func(v interface{}, i int) interface{} {
+		file_deephaven_core_proto_table_proto_msgTypes[108].Exporter = func(v interface{}, i int) interface{} {
 			switch v := v.(*AggSpec_AggSpecFreeze); i {
 			case 0:
 				return &v.state
@@ -14201,7 +14585,7 @@ func file_deephaven_proto_table_proto_init() {
 				return nil
 			}
 		}
-		file_deephaven_proto_table_proto_msgTypes[107].Exporter = func(v interface{}, i int) interface{} {
+		file_deephaven_core_proto_table_proto_msgTypes[109].Exporter = func(v interface{}, i int) interface{} {
 			switch v := v.(*AggSpec_AggSpecGroup); i {
 			case 0:
 				return &v.state
@@ -14213,7 +14597,7 @@ func file_deephaven_proto_table_proto_init() {
 				return nil
 			}
 		}
-		file_deephaven_proto_table_proto_msgTypes[108].Exporter = func(v interface{}, i int) interface{} {
+		file_deephaven_core_proto_table_proto_msgTypes[110].Exporter = func(v interface{}, i int) interface{} {
 			switch v := v.(*AggSpec_AggSpecLast); i {
 			case 0:
 				return &v.state
@@ -14225,7 +14609,7 @@ func file_deephaven_proto_table_proto_init() {
 				return nil
 			}
 		}
-		file_deephaven_proto_table_proto_msgTypes[109].Exporter = func(v interface{}, i int) interface{} {
+		file_deephaven_core_proto_table_proto_msgTypes[111].Exporter = func(v interface{}, i int) interface{} {
 			switch v := v.(*AggSpec_AggSpecMax); i {
 			case 0:
 				return &v.state
@@ -14237,7 +14621,7 @@ func file_deephaven_proto_table_proto_init() {
 				return nil
 			}
 		}
-		file_deephaven_proto_table_proto_msgTypes[110].Exporter = func(v interface{}, i int) interface{} {
+		file_deephaven_core_proto_table_proto_msgTypes[112].Exporter = func(v interface{}, i int) interface{} {
 			switch v := v.(*AggSpec_AggSpecMin); i {
 			case 0:
 				return &v.state
@@ -14249,7 +14633,7 @@ func file_deephaven_proto_table_proto_init() {
 				return nil
 			}
 		}
-		file_deephaven_proto_table_proto_msgTypes[111].Exporter = func(v interface{}, i int) interface{} {
+		file_deephaven_core_proto_table_proto_msgTypes[113].Exporter = func(v interface{}, i int) interface{} {
 			switch v := v.(*AggSpec_AggSpecStd); i {
 			case 0:
 				return &v.state
@@ -14261,7 +14645,7 @@ func file_deephaven_proto_table_proto_init() {
 				return nil
 			}
 		}
-		file_deephaven_proto_table_proto_msgTypes[112].Exporter = func(v interface{}, i int) interface{} {
+		file_deephaven_core_proto_table_proto_msgTypes[114].Exporter = func(v interface{}, i int) interface{} {
 			switch v := v.(*AggSpec_AggSpecSum); i {
 			case 0:
 				return &v.state
@@ -14273,7 +14657,7 @@ func file_deephaven_proto_table_proto_init() {
 				return nil
 			}
 		}
-		file_deephaven_proto_table_proto_msgTypes[113].Exporter = func(v interface{}, i int) interface{} {
+		file_deephaven_core_proto_table_proto_msgTypes[115].Exporter = func(v interface{}, i int) interface{} {
 			switch v := v.(*AggSpec_AggSpecVar); i {
 			case 0:
 				return &v.state
@@ -14285,7 +14669,7 @@ func file_deephaven_proto_table_proto_init() {
 				return nil
 			}
 		}
-		file_deephaven_proto_table_proto_msgTypes[114].Exporter = func(v interface{}, i int) interface{} {
+		file_deephaven_core_proto_table_proto_msgTypes[116].Exporter = func(v interface{}, i int) interface{} {
 			switch v := v.(*Aggregation_AggregationColumns); i {
 			case 0:
 				return &v.state
@@ -14297,7 +14681,7 @@ func file_deephaven_proto_table_proto_init() {
 				return nil
 			}
 		}
-		file_deephaven_proto_table_proto_msgTypes[115].Exporter = func(v interface{}, i int) interface{} {
+		file_deephaven_core_proto_table_proto_msgTypes[117].Exporter = func(v interface{}, i int) interface{} {
 			switch v := v.(*Aggregation_AggregationCount); i {
 			case 0:
 				return &v.state
@@ -14309,7 +14693,19 @@ func file_deephaven_proto_table_proto_init() {
 				return nil
 			}
 		}
-		file_deephaven_proto_table_proto_msgTypes[116].Exporter = func(v interface{}, i int) interface{} {
+		file_deephaven_core_proto_table_proto_msgTypes[118].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*Aggregation_AggregationCountWhere); i {
+			case 0:
+				return &v.state
+			case 1:
+				return &v.sizeCache
+			case 2:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
+		file_deephaven_core_proto_table_proto_msgTypes[119].Exporter = func(v interface{}, i int) interface{} {
 			switch v := v.(*Aggregation_AggregationRowKey); i {
 			case 0:
 				return &v.state
@@ -14321,7 +14717,7 @@ func file_deephaven_proto_table_proto_init() {
 				return nil
 			}
 		}
-		file_deephaven_proto_table_proto_msgTypes[117].Exporter = func(v interface{}, i int) interface{} {
+		file_deephaven_core_proto_table_proto_msgTypes[120].Exporter = func(v interface{}, i int) interface{} {
 			switch v := v.(*Aggregation_AggregationPartition); i {
 			case 0:
 				return &v.state
@@ -14333,7 +14729,19 @@ func file_deephaven_proto_table_proto_init() {
 				return nil
 			}
 		}
-		file_deephaven_proto_table_proto_msgTypes[118].Exporter = func(v interface{}, i int) interface{} {
+		file_deephaven_core_proto_table_proto_msgTypes[121].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*Aggregation_AggregationFormula); i {
+			case 0:
+				return &v.state
+			case 1:
+				return &v.sizeCache
+			case 2:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
+		file_deephaven_core_proto_table_proto_msgTypes[122].Exporter = func(v interface{}, i int) interface{} {
 			switch v := v.(*RunChartDownsampleRequest_ZoomRange); i {
 			case 0:
 				return &v.state
@@ -14345,7 +14753,7 @@ func file_deephaven_proto_table_proto_init() {
 				return nil
 			}
 		}
-		file_deephaven_proto_table_proto_msgTypes[119].Exporter = func(v interface{}, i int) interface{} {
+		file_deephaven_core_proto_table_proto_msgTypes[123].Exporter = func(v interface{}, i int) interface{} {
 			switch v := v.(*CreateInputTableRequest_InputTableKind); i {
 			case 0:
 				return &v.state
@@ -14357,7 +14765,7 @@ func file_deephaven_proto_table_proto_init() {
 				return nil
 			}
 		}
-		file_deephaven_proto_table_proto_msgTypes[120].Exporter = func(v interface{}, i int) interface{} {
+		file_deephaven_core_proto_table_proto_msgTypes[124].Exporter = func(v interface{}, i int) interface{} {
 			switch v := v.(*CreateInputTableRequest_InputTableKind_InMemoryAppendOnly); i {
 			case 0:
 				return &v.state
@@ -14369,7 +14777,7 @@ func file_deephaven_proto_table_proto_init() {
 				return nil
 			}
 		}
-		file_deephaven_proto_table_proto_msgTypes[121].Exporter = func(v interface{}, i int) interface{} {
+		file_deephaven_core_proto_table_proto_msgTypes[125].Exporter = func(v interface{}, i int) interface{} {
 			switch v := v.(*CreateInputTableRequest_InputTableKind_InMemoryKeyBacked); i {
 			case 0:
 				return &v.state
@@ -14381,7 +14789,7 @@ func file_deephaven_proto_table_proto_init() {
 				return nil
 			}
 		}
-		file_deephaven_proto_table_proto_msgTypes[122].Exporter = func(v interface{}, i int) interface{} {
+		file_deephaven_core_proto_table_proto_msgTypes[126].Exporter = func(v interface{}, i int) interface{} {
 			switch v := v.(*CreateInputTableRequest_InputTableKind_Blink); i {
 			case 0:
 				return &v.state
@@ -14393,7 +14801,7 @@ func file_deephaven_proto_table_proto_init() {
 				return nil
 			}
 		}
-		file_deephaven_proto_table_proto_msgTypes[123].Exporter = func(v interface{}, i int) interface{} {
+		file_deephaven_core_proto_table_proto_msgTypes[127].Exporter = func(v interface{}, i int) interface{} {
 			switch v := v.(*BatchTableRequest_Operation); i {
 			case 0:
 				return &v.state
@@ -14406,21 +14814,24 @@ func file_deephaven_proto_table_proto_init() {
 			}
 		}
 	}
-	file_deephaven_proto_table_proto_msgTypes[0].OneofWrappers = []interface{}{
+	file_deephaven_core_proto_table_proto_msgTypes[0].OneofWrappers = []interface{}{
 		(*TableReference_Ticket)(nil),
 		(*TableReference_BatchOffset)(nil),
 	}
-	file_deephaven_proto_table_proto_msgTypes[7].OneofWrappers = []interface{}{
+	file_deephaven_core_proto_table_proto_msgTypes[7].OneofWrappers = []interface{}{
 		(*TimeTableRequest_StartTimeNanos)(nil),
 		(*TimeTableRequest_StartTimeString)(nil),
 		(*TimeTableRequest_PeriodNanos)(nil),
 		(*TimeTableRequest_PeriodString)(nil),
 	}
-	file_deephaven_proto_table_proto_msgTypes[10].OneofWrappers = []interface{}{
+	file_deephaven_core_proto_table_proto_msgTypes[9].OneofWrappers = []interface{}{
+		(*Selectable_Raw)(nil),
+	}
+	file_deephaven_core_proto_table_proto_msgTypes[11].OneofWrappers = []interface{}{
 		(*UpdateByWindowScale_Ticks)(nil),
 		(*UpdateByWindowScale_Time)(nil),
 	}
-	file_deephaven_proto_table_proto_msgTypes[34].OneofWrappers = []interface{}{
+	file_deephaven_core_proto_table_proto_msgTypes[35].OneofWrappers = []interface{}{
 		(*AggSpec_AbsSum)(nil),
 		(*AggSpec_ApproximatePercentile)(nil),
 		(*AggSpec_Avg)(nil),
@@ -14445,25 +14856,27 @@ func file_deephaven_proto_table_proto_init() {
 		(*AggSpec_WeightedSum)(nil),
 		(*AggSpec_Var)(nil),
 	}
-	file_deephaven_proto_table_proto_msgTypes[36].OneofWrappers = []interface{}{
+	file_deephaven_core_proto_table_proto_msgTypes[37].OneofWrappers = []interface{}{
 		(*Aggregation_Columns)(nil),
 		(*Aggregation_Count)(nil),
 		(*Aggregation_FirstRowKey)(nil),
 		(*Aggregation_LastRowKey)(nil),
 		(*Aggregation_Partition)(nil),
+		(*Aggregation_Formula)(nil),
+		(*Aggregation_CountWhere)(nil),
 	}
-	file_deephaven_proto_table_proto_msgTypes[43].OneofWrappers = []interface{}{
+	file_deephaven_core_proto_table_proto_msgTypes[44].OneofWrappers = []interface{}{
 		(*Literal_StringValue)(nil),
 		(*Literal_DoubleValue)(nil),
 		(*Literal_BoolValue)(nil),
 		(*Literal_LongValue)(nil),
 		(*Literal_NanoTimeValue)(nil),
 	}
-	file_deephaven_proto_table_proto_msgTypes[44].OneofWrappers = []interface{}{
+	file_deephaven_core_proto_table_proto_msgTypes[45].OneofWrappers = []interface{}{
 		(*Value_Reference)(nil),
 		(*Value_Literal)(nil),
 	}
-	file_deephaven_proto_table_proto_msgTypes[45].OneofWrappers = []interface{}{
+	file_deephaven_core_proto_table_proto_msgTypes[46].OneofWrappers = []interface{}{
 		(*Condition_And)(nil),
 		(*Condition_Or)(nil),
 		(*Condition_Not)(nil),
@@ -14475,20 +14888,20 @@ func file_deephaven_proto_table_proto_init() {
 		(*Condition_Contains)(nil),
 		(*Condition_Search)(nil),
 	}
-	file_deephaven_proto_table_proto_msgTypes[59].OneofWrappers = []interface{}{
+	file_deephaven_core_proto_table_proto_msgTypes[60].OneofWrappers = []interface{}{
 		(*CreateInputTableRequest_SourceTableId)(nil),
 		(*CreateInputTableRequest_Schema)(nil),
 	}
-	file_deephaven_proto_table_proto_msgTypes[61].OneofWrappers = []interface{}{}
-	file_deephaven_proto_table_proto_msgTypes[64].OneofWrappers = []interface{}{
+	file_deephaven_core_proto_table_proto_msgTypes[62].OneofWrappers = []interface{}{}
+	file_deephaven_core_proto_table_proto_msgTypes[66].OneofWrappers = []interface{}{
 		(*UpdateByWindowScale_UpdateByWindowTime_Nanos)(nil),
 		(*UpdateByWindowScale_UpdateByWindowTime_DurationString)(nil),
 	}
-	file_deephaven_proto_table_proto_msgTypes[65].OneofWrappers = []interface{}{}
-	file_deephaven_proto_table_proto_msgTypes[66].OneofWrappers = []interface{}{
+	file_deephaven_core_proto_table_proto_msgTypes[67].OneofWrappers = []interface{}{}
+	file_deephaven_core_proto_table_proto_msgTypes[68].OneofWrappers = []interface{}{
 		(*UpdateByRequest_UpdateByOperation_Column)(nil),
 	}
-	file_deephaven_proto_table_proto_msgTypes[68].OneofWrappers = []interface{}{
+	file_deephaven_core_proto_table_proto_msgTypes[70].OneofWrappers = []interface{}{
 		(*UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_Sum)(nil),
 		(*UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_Min)(nil),
 		(*UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_Max)(nil),
@@ -14511,9 +14924,9 @@ func file_deephaven_proto_table_proto_init() {
 		(*UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_RollingWavg)(nil),
 		(*UpdateByRequest_UpdateByOperation_UpdateByColumn_UpdateBySpec_RollingFormula)(nil),
 	}
-	file_deephaven_proto_table_proto_msgTypes[91].OneofWrappers = []interface{}{}
-	file_deephaven_proto_table_proto_msgTypes[99].OneofWrappers = []interface{}{}
-	file_deephaven_proto_table_proto_msgTypes[101].OneofWrappers = []interface{}{
+	file_deephaven_core_proto_table_proto_msgTypes[93].OneofWrappers = []interface{}{}
+	file_deephaven_core_proto_table_proto_msgTypes[101].OneofWrappers = []interface{}{}
+	file_deephaven_core_proto_table_proto_msgTypes[103].OneofWrappers = []interface{}{
 		(*AggSpec_AggSpecNonUniqueSentinel_NullValue)(nil),
 		(*AggSpec_AggSpecNonUniqueSentinel_StringValue)(nil),
 		(*AggSpec_AggSpecNonUniqueSentinel_IntValue)(nil),
@@ -14525,13 +14938,13 @@ func file_deephaven_proto_table_proto_init() {
 		(*AggSpec_AggSpecNonUniqueSentinel_ShortValue)(nil),
 		(*AggSpec_AggSpecNonUniqueSentinel_CharValue)(nil),
 	}
-	file_deephaven_proto_table_proto_msgTypes[118].OneofWrappers = []interface{}{}
-	file_deephaven_proto_table_proto_msgTypes[119].OneofWrappers = []interface{}{
+	file_deephaven_core_proto_table_proto_msgTypes[122].OneofWrappers = []interface{}{}
+	file_deephaven_core_proto_table_proto_msgTypes[123].OneofWrappers = []interface{}{
 		(*CreateInputTableRequest_InputTableKind_InMemoryAppendOnly_)(nil),
 		(*CreateInputTableRequest_InputTableKind_InMemoryKeyBacked_)(nil),
 		(*CreateInputTableRequest_InputTableKind_Blink_)(nil),
 	}
-	file_deephaven_proto_table_proto_msgTypes[123].OneofWrappers = []interface{}{
+	file_deephaven_core_proto_table_proto_msgTypes[127].OneofWrappers = []interface{}{
 		(*BatchTableRequest_Operation_EmptyTable)(nil),
 		(*BatchTableRequest_Operation_TimeTable)(nil),
 		(*BatchTableRequest_Operation_DropColumns)(nil),
@@ -14573,24 +14986,25 @@ func file_deephaven_proto_table_proto_init() {
 		(*BatchTableRequest_Operation_Raj)(nil),
 		(*BatchTableRequest_Operation_ColumnStatistics)(nil),
 		(*BatchTableRequest_Operation_MultiJoin)(nil),
+		(*BatchTableRequest_Operation_Slice)(nil),
 	}
 	type x struct{}
 	out := protoimpl.TypeBuilder{
 		File: protoimpl.DescBuilder{
 			GoPackagePath: reflect.TypeOf(x{}).PkgPath(),
-			RawDescriptor: file_deephaven_proto_table_proto_rawDesc,
+			RawDescriptor: file_deephaven_core_proto_table_proto_rawDesc,
 			NumEnums:      12,
-			NumMessages:   124,
+			NumMessages:   128,
 			NumExtensions: 0,
 			NumServices:   1,
 		},
-		GoTypes:           file_deephaven_proto_table_proto_goTypes,
-		DependencyIndexes: file_deephaven_proto_table_proto_depIdxs,
-		EnumInfos:         file_deephaven_proto_table_proto_enumTypes,
-		MessageInfos:      file_deephaven_proto_table_proto_msgTypes,
+		GoTypes:           file_deephaven_core_proto_table_proto_goTypes,
+		DependencyIndexes: file_deephaven_core_proto_table_proto_depIdxs,
+		EnumInfos:         file_deephaven_core_proto_table_proto_enumTypes,
+		MessageInfos:      file_deephaven_core_proto_table_proto_msgTypes,
 	}.Build()
-	File_deephaven_proto_table_proto = out.File
-	file_deephaven_proto_table_proto_rawDesc = nil
-	file_deephaven_proto_table_proto_goTypes = nil
-	file_deephaven_proto_table_proto_depIdxs = nil
+	File_deephaven_core_proto_table_proto = out.File
+	file_deephaven_core_proto_table_proto_rawDesc = nil
+	file_deephaven_core_proto_table_proto_goTypes = nil
+	file_deephaven_core_proto_table_proto_depIdxs = nil
 }
diff --git a/go/internal/proto/table/table_grpc.pb.go b/go/internal/proto/table/table_grpc.pb.go
index 48f5d5a7d49..d09da6129a0 100644
--- a/go/internal/proto/table/table_grpc.pb.go
+++ b/go/internal/proto/table/table_grpc.pb.go
@@ -2,7 +2,7 @@
 // versions:
 // - protoc-gen-go-grpc v1.2.0
 // - protoc             v4.25.3
-// source: deephaven/proto/table.proto
+// source: deephaven_core/proto/table.proto
 
 package table
 
@@ -185,6 +185,11 @@ type TableServiceClient interface {
 	// result table will be static - use Aggregation() instead for updating results. Presently, the
 	// primary use case for this is the Deephaven Web UI.
 	ComputeColumnStatistics(ctx context.Context, in *ColumnStatisticsRequest, opts ...grpc.CallOption) (*ExportedTableCreationResponse, error)
+	//*
+	// Returns a new table representing a sliced subset of the original table. The start position is inclusive
+	// and the end position is exclusive. If a negative value is given, then the position is counted from the end of
+	// the table.
+	Slice(ctx context.Context, in *SliceRequest, opts ...grpc.CallOption) (*ExportedTableCreationResponse, error)
 }
 
 type tableServiceClient struct {
@@ -648,6 +653,15 @@ func (c *tableServiceClient) ComputeColumnStatistics(ctx context.Context, in *Co
 	return out, nil
 }
 
+func (c *tableServiceClient) Slice(ctx context.Context, in *SliceRequest, opts ...grpc.CallOption) (*ExportedTableCreationResponse, error) {
+	out := new(ExportedTableCreationResponse)
+	err := c.cc.Invoke(ctx, "/io.deephaven.proto.backplane.grpc.TableService/Slice", in, out, opts...)
+	if err != nil {
+		return nil, err
+	}
+	return out, nil
+}
+
 // TableServiceServer is the server API for TableService service.
 // All implementations must embed UnimplementedTableServiceServer
 // for forward compatibility
@@ -814,6 +828,11 @@ type TableServiceServer interface {
 	// result table will be static - use Aggregation() instead for updating results. Presently, the
 	// primary use case for this is the Deephaven Web UI.
 	ComputeColumnStatistics(context.Context, *ColumnStatisticsRequest) (*ExportedTableCreationResponse, error)
+	//*
+	// Returns a new table representing a sliced subset of the original table. The start position is inclusive
+	// and the end position is exclusive. If a negative value is given, then the position is counted from the end of
+	// the table.
+	Slice(context.Context, *SliceRequest) (*ExportedTableCreationResponse, error)
 	mustEmbedUnimplementedTableServiceServer()
 }
 
@@ -956,6 +975,9 @@ func (UnimplementedTableServiceServer) MetaTable(context.Context, *MetaTableRequ
 func (UnimplementedTableServiceServer) ComputeColumnStatistics(context.Context, *ColumnStatisticsRequest) (*ExportedTableCreationResponse, error) {
 	return nil, status.Errorf(codes.Unimplemented, "method ComputeColumnStatistics not implemented")
 }
+func (UnimplementedTableServiceServer) Slice(context.Context, *SliceRequest) (*ExportedTableCreationResponse, error) {
+	return nil, status.Errorf(codes.Unimplemented, "method Slice not implemented")
+}
 func (UnimplementedTableServiceServer) mustEmbedUnimplementedTableServiceServer() {}
 
 // UnsafeTableServiceServer may be embedded to opt out of forward compatibility for this service.
@@ -1785,6 +1807,24 @@ func _TableService_ComputeColumnStatistics_Handler(srv interface{}, ctx context.
 	return interceptor(ctx, in, info, handler)
 }
 
+func _TableService_Slice_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
+	in := new(SliceRequest)
+	if err := dec(in); err != nil {
+		return nil, err
+	}
+	if interceptor == nil {
+		return srv.(TableServiceServer).Slice(ctx, in)
+	}
+	info := &grpc.UnaryServerInfo{
+		Server:     srv,
+		FullMethod: "/io.deephaven.proto.backplane.grpc.TableService/Slice",
+	}
+	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
+		return srv.(TableServiceServer).Slice(ctx, req.(*SliceRequest))
+	}
+	return interceptor(ctx, in, info, handler)
+}
+
 // TableService_ServiceDesc is the grpc.ServiceDesc for TableService service.
 // It's only intended for direct use with grpc.RegisterService,
 // and not to be introspected or modified (even as a copy)
@@ -1964,6 +2004,10 @@ var TableService_ServiceDesc = grpc.ServiceDesc{
 			MethodName: "ComputeColumnStatistics",
 			Handler:    _TableService_ComputeColumnStatistics_Handler,
 		},
+		{
+			MethodName: "Slice",
+			Handler:    _TableService_Slice_Handler,
+		},
 	},
 	Streams: []grpc.StreamDesc{
 		{
@@ -1977,5 +2021,5 @@ var TableService_ServiceDesc = grpc.ServiceDesc{
 			ServerStreams: true,
 		},
 	},
-	Metadata: "deephaven/proto/table.proto",
+	Metadata: "deephaven_core/proto/table.proto",
 }
diff --git a/go/internal/proto/ticket/ticket.pb.go b/go/internal/proto/ticket/ticket.pb.go
index 10e2dc5d452..818dd4169d6 100644
--- a/go/internal/proto/ticket/ticket.pb.go
+++ b/go/internal/proto/ticket/ticket.pb.go
@@ -5,7 +5,7 @@
 // versions:
 // 	protoc-gen-go v1.28.1
 // 	protoc        v4.25.3
-// source: deephaven/proto/ticket.proto
+// source: deephaven_core/proto/ticket.proto
 
 package ticket
 
@@ -37,7 +37,7 @@ type Ticket struct {
 func (x *Ticket) Reset() {
 	*x = Ticket{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_deephaven_proto_ticket_proto_msgTypes[0]
+		mi := &file_deephaven_core_proto_ticket_proto_msgTypes[0]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -50,7 +50,7 @@ func (x *Ticket) String() string {
 func (*Ticket) ProtoMessage() {}
 
 func (x *Ticket) ProtoReflect() protoreflect.Message {
-	mi := &file_deephaven_proto_ticket_proto_msgTypes[0]
+	mi := &file_deephaven_core_proto_ticket_proto_msgTypes[0]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -63,7 +63,7 @@ func (x *Ticket) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use Ticket.ProtoReflect.Descriptor instead.
 func (*Ticket) Descriptor() ([]byte, []int) {
-	return file_deephaven_proto_ticket_proto_rawDescGZIP(), []int{0}
+	return file_deephaven_core_proto_ticket_proto_rawDescGZIP(), []int{0}
 }
 
 func (x *Ticket) GetTicket() []byte {
@@ -87,7 +87,7 @@ type TypedTicket struct {
 func (x *TypedTicket) Reset() {
 	*x = TypedTicket{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_deephaven_proto_ticket_proto_msgTypes[1]
+		mi := &file_deephaven_core_proto_ticket_proto_msgTypes[1]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -100,7 +100,7 @@ func (x *TypedTicket) String() string {
 func (*TypedTicket) ProtoMessage() {}
 
 func (x *TypedTicket) ProtoReflect() protoreflect.Message {
-	mi := &file_deephaven_proto_ticket_proto_msgTypes[1]
+	mi := &file_deephaven_core_proto_ticket_proto_msgTypes[1]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -113,7 +113,7 @@ func (x *TypedTicket) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use TypedTicket.ProtoReflect.Descriptor instead.
 func (*TypedTicket) Descriptor() ([]byte, []int) {
-	return file_deephaven_proto_ticket_proto_rawDescGZIP(), []int{1}
+	return file_deephaven_core_proto_ticket_proto_rawDescGZIP(), []int{1}
 }
 
 func (x *TypedTicket) GetTicket() *Ticket {
@@ -130,47 +130,47 @@ func (x *TypedTicket) GetType() string {
 	return ""
 }
 
-var File_deephaven_proto_ticket_proto protoreflect.FileDescriptor
+var File_deephaven_core_proto_ticket_proto protoreflect.FileDescriptor
 
-var file_deephaven_proto_ticket_proto_rawDesc = []byte{
-	0x0a, 0x1c, 0x64, 0x65, 0x65, 0x70, 0x68, 0x61, 0x76, 0x65, 0x6e, 0x2f, 0x70, 0x72, 0x6f, 0x74,
-	0x6f, 0x2f, 0x74, 0x69, 0x63, 0x6b, 0x65, 0x74, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x12, 0x21,
-	0x69, 0x6f, 0x2e, 0x64, 0x65, 0x65, 0x70, 0x68, 0x61, 0x76, 0x65, 0x6e, 0x2e, 0x70, 0x72, 0x6f,
-	0x74, 0x6f, 0x2e, 0x62, 0x61, 0x63, 0x6b, 0x70, 0x6c, 0x61, 0x6e, 0x65, 0x2e, 0x67, 0x72, 0x70,
-	0x63, 0x22, 0x20, 0x0a, 0x06, 0x54, 0x69, 0x63, 0x6b, 0x65, 0x74, 0x12, 0x16, 0x0a, 0x06, 0x74,
-	0x69, 0x63, 0x6b, 0x65, 0x74, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0c, 0x52, 0x06, 0x74, 0x69, 0x63,
-	0x6b, 0x65, 0x74, 0x22, 0x64, 0x0a, 0x0b, 0x54, 0x79, 0x70, 0x65, 0x64, 0x54, 0x69, 0x63, 0x6b,
-	0x65, 0x74, 0x12, 0x41, 0x0a, 0x06, 0x74, 0x69, 0x63, 0x6b, 0x65, 0x74, 0x18, 0x01, 0x20, 0x01,
-	0x28, 0x0b, 0x32, 0x29, 0x2e, 0x69, 0x6f, 0x2e, 0x64, 0x65, 0x65, 0x70, 0x68, 0x61, 0x76, 0x65,
+var file_deephaven_core_proto_ticket_proto_rawDesc = []byte{
+	0x0a, 0x21, 0x64, 0x65, 0x65, 0x70, 0x68, 0x61, 0x76, 0x65, 0x6e, 0x5f, 0x63, 0x6f, 0x72, 0x65,
+	0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2f, 0x74, 0x69, 0x63, 0x6b, 0x65, 0x74, 0x2e, 0x70, 0x72,
+	0x6f, 0x74, 0x6f, 0x12, 0x21, 0x69, 0x6f, 0x2e, 0x64, 0x65, 0x65, 0x70, 0x68, 0x61, 0x76, 0x65,
 	0x6e, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x62, 0x61, 0x63, 0x6b, 0x70, 0x6c, 0x61, 0x6e,
-	0x65, 0x2e, 0x67, 0x72, 0x70, 0x63, 0x2e, 0x54, 0x69, 0x63, 0x6b, 0x65, 0x74, 0x52, 0x06, 0x74,
-	0x69, 0x63, 0x6b, 0x65, 0x74, 0x12, 0x12, 0x0a, 0x04, 0x74, 0x79, 0x70, 0x65, 0x18, 0x02, 0x20,
-	0x01, 0x28, 0x09, 0x52, 0x04, 0x74, 0x79, 0x70, 0x65, 0x42, 0x42, 0x48, 0x01, 0x50, 0x01, 0x5a,
-	0x3c, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x64, 0x65, 0x65, 0x70,
-	0x68, 0x61, 0x76, 0x65, 0x6e, 0x2f, 0x64, 0x65, 0x65, 0x70, 0x68, 0x61, 0x76, 0x65, 0x6e, 0x2d,
-	0x63, 0x6f, 0x72, 0x65, 0x2f, 0x67, 0x6f, 0x2f, 0x69, 0x6e, 0x74, 0x65, 0x72, 0x6e, 0x61, 0x6c,
-	0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2f, 0x74, 0x69, 0x63, 0x6b, 0x65, 0x74, 0x62, 0x06, 0x70,
-	0x72, 0x6f, 0x74, 0x6f, 0x33,
+	0x65, 0x2e, 0x67, 0x72, 0x70, 0x63, 0x22, 0x20, 0x0a, 0x06, 0x54, 0x69, 0x63, 0x6b, 0x65, 0x74,
+	0x12, 0x16, 0x0a, 0x06, 0x74, 0x69, 0x63, 0x6b, 0x65, 0x74, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0c,
+	0x52, 0x06, 0x74, 0x69, 0x63, 0x6b, 0x65, 0x74, 0x22, 0x64, 0x0a, 0x0b, 0x54, 0x79, 0x70, 0x65,
+	0x64, 0x54, 0x69, 0x63, 0x6b, 0x65, 0x74, 0x12, 0x41, 0x0a, 0x06, 0x74, 0x69, 0x63, 0x6b, 0x65,
+	0x74, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x29, 0x2e, 0x69, 0x6f, 0x2e, 0x64, 0x65, 0x65,
+	0x70, 0x68, 0x61, 0x76, 0x65, 0x6e, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x62, 0x61, 0x63,
+	0x6b, 0x70, 0x6c, 0x61, 0x6e, 0x65, 0x2e, 0x67, 0x72, 0x70, 0x63, 0x2e, 0x54, 0x69, 0x63, 0x6b,
+	0x65, 0x74, 0x52, 0x06, 0x74, 0x69, 0x63, 0x6b, 0x65, 0x74, 0x12, 0x12, 0x0a, 0x04, 0x74, 0x79,
+	0x70, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x74, 0x79, 0x70, 0x65, 0x42, 0x42,
+	0x48, 0x01, 0x50, 0x01, 0x5a, 0x3c, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d,
+	0x2f, 0x64, 0x65, 0x65, 0x70, 0x68, 0x61, 0x76, 0x65, 0x6e, 0x2f, 0x64, 0x65, 0x65, 0x70, 0x68,
+	0x61, 0x76, 0x65, 0x6e, 0x2d, 0x63, 0x6f, 0x72, 0x65, 0x2f, 0x67, 0x6f, 0x2f, 0x69, 0x6e, 0x74,
+	0x65, 0x72, 0x6e, 0x61, 0x6c, 0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2f, 0x74, 0x69, 0x63, 0x6b,
+	0x65, 0x74, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
 }
 
 var (
-	file_deephaven_proto_ticket_proto_rawDescOnce sync.Once
-	file_deephaven_proto_ticket_proto_rawDescData = file_deephaven_proto_ticket_proto_rawDesc
+	file_deephaven_core_proto_ticket_proto_rawDescOnce sync.Once
+	file_deephaven_core_proto_ticket_proto_rawDescData = file_deephaven_core_proto_ticket_proto_rawDesc
 )
 
-func file_deephaven_proto_ticket_proto_rawDescGZIP() []byte {
-	file_deephaven_proto_ticket_proto_rawDescOnce.Do(func() {
-		file_deephaven_proto_ticket_proto_rawDescData = protoimpl.X.CompressGZIP(file_deephaven_proto_ticket_proto_rawDescData)
+func file_deephaven_core_proto_ticket_proto_rawDescGZIP() []byte {
+	file_deephaven_core_proto_ticket_proto_rawDescOnce.Do(func() {
+		file_deephaven_core_proto_ticket_proto_rawDescData = protoimpl.X.CompressGZIP(file_deephaven_core_proto_ticket_proto_rawDescData)
 	})
-	return file_deephaven_proto_ticket_proto_rawDescData
+	return file_deephaven_core_proto_ticket_proto_rawDescData
 }
 
-var file_deephaven_proto_ticket_proto_msgTypes = make([]protoimpl.MessageInfo, 2)
-var file_deephaven_proto_ticket_proto_goTypes = []interface{}{
+var file_deephaven_core_proto_ticket_proto_msgTypes = make([]protoimpl.MessageInfo, 2)
+var file_deephaven_core_proto_ticket_proto_goTypes = []interface{}{
 	(*Ticket)(nil),      // 0: io.deephaven.proto.backplane.grpc.Ticket
 	(*TypedTicket)(nil), // 1: io.deephaven.proto.backplane.grpc.TypedTicket
 }
-var file_deephaven_proto_ticket_proto_depIdxs = []int32{
+var file_deephaven_core_proto_ticket_proto_depIdxs = []int32{
 	0, // 0: io.deephaven.proto.backplane.grpc.TypedTicket.ticket:type_name -> io.deephaven.proto.backplane.grpc.Ticket
 	1, // [1:1] is the sub-list for method output_type
 	1, // [1:1] is the sub-list for method input_type
@@ -179,13 +179,13 @@ var file_deephaven_proto_ticket_proto_depIdxs = []int32{
 	0, // [0:1] is the sub-list for field type_name
 }
 
-func init() { file_deephaven_proto_ticket_proto_init() }
-func file_deephaven_proto_ticket_proto_init() {
-	if File_deephaven_proto_ticket_proto != nil {
+func init() { file_deephaven_core_proto_ticket_proto_init() }
+func file_deephaven_core_proto_ticket_proto_init() {
+	if File_deephaven_core_proto_ticket_proto != nil {
 		return
 	}
 	if !protoimpl.UnsafeEnabled {
-		file_deephaven_proto_ticket_proto_msgTypes[0].Exporter = func(v interface{}, i int) interface{} {
+		file_deephaven_core_proto_ticket_proto_msgTypes[0].Exporter = func(v interface{}, i int) interface{} {
 			switch v := v.(*Ticket); i {
 			case 0:
 				return &v.state
@@ -197,7 +197,7 @@ func file_deephaven_proto_ticket_proto_init() {
 				return nil
 			}
 		}
-		file_deephaven_proto_ticket_proto_msgTypes[1].Exporter = func(v interface{}, i int) interface{} {
+		file_deephaven_core_proto_ticket_proto_msgTypes[1].Exporter = func(v interface{}, i int) interface{} {
 			switch v := v.(*TypedTicket); i {
 			case 0:
 				return &v.state
@@ -214,18 +214,18 @@ func file_deephaven_proto_ticket_proto_init() {
 	out := protoimpl.TypeBuilder{
 		File: protoimpl.DescBuilder{
 			GoPackagePath: reflect.TypeOf(x{}).PkgPath(),
-			RawDescriptor: file_deephaven_proto_ticket_proto_rawDesc,
+			RawDescriptor: file_deephaven_core_proto_ticket_proto_rawDesc,
 			NumEnums:      0,
 			NumMessages:   2,
 			NumExtensions: 0,
 			NumServices:   0,
 		},
-		GoTypes:           file_deephaven_proto_ticket_proto_goTypes,
-		DependencyIndexes: file_deephaven_proto_ticket_proto_depIdxs,
-		MessageInfos:      file_deephaven_proto_ticket_proto_msgTypes,
+		GoTypes:           file_deephaven_core_proto_ticket_proto_goTypes,
+		DependencyIndexes: file_deephaven_core_proto_ticket_proto_depIdxs,
+		MessageInfos:      file_deephaven_core_proto_ticket_proto_msgTypes,
 	}.Build()
-	File_deephaven_proto_ticket_proto = out.File
-	file_deephaven_proto_ticket_proto_rawDesc = nil
-	file_deephaven_proto_ticket_proto_goTypes = nil
-	file_deephaven_proto_ticket_proto_depIdxs = nil
+	File_deephaven_core_proto_ticket_proto = out.File
+	file_deephaven_core_proto_ticket_proto_rawDesc = nil
+	file_deephaven_core_proto_ticket_proto_goTypes = nil
+	file_deephaven_core_proto_ticket_proto_depIdxs = nil
 }
diff --git a/go/pkg/client/tokens.go b/go/pkg/client/tokens.go
index e00d481c10c..8594e06cbb0 100644
--- a/go/pkg/client/tokens.go
+++ b/go/pkg/client/tokens.go
@@ -7,7 +7,9 @@ import (
 	"fmt"
 	"github.com/apache/arrow/go/v8/arrow/flight"
 	configpb2 "github.com/deephaven/deephaven-core/go/internal/proto/config"
+	sessionpb2 "github.com/deephaven/deephaven-core/go/internal/proto/session"
 	"google.golang.org/grpc/metadata"
+	"google.golang.org/protobuf/proto"
 	"log"
 	"strconv"
 	"sync"
@@ -36,8 +38,19 @@ func withAuthToken(ctx context.Context, token []byte) context.Context {
 }
 
 // requestToken requests a new token from flight.
-func requestToken(handshakeClient flight.FlightService_HandshakeClient, handshakeReq *flight.HandshakeRequest) ([]byte, error) {
-	err := handshakeClient.Send(handshakeReq)
+func requestToken(handshakeClient flight.FlightService_HandshakeClient, authType string, authToken []byte) ([]byte, error) {
+
+	war := sessionpb2.WrappedAuthenticationRequest{
+		Type:    authType,
+		Payload: authToken,
+	}
+	payload, err := proto.Marshal(&war)
+	if err != nil {
+		return nil, err
+	}
+	handshakeReq := flight.HandshakeRequest{Payload: []byte(payload)}
+
+	err = handshakeClient.Send(&handshakeReq)
 
 	if err != nil {
 		return nil, err
@@ -122,15 +135,13 @@ func (tr *tokenManager) Close() error {
 // "user:password"; when auth_type is DefaultAuth, it will be ignored; when auth_type is a custom-built
 // authenticator, it must conform to the specific requirement of the authenticator.
 func newTokenManager(ctx context.Context, fs *flightStub, cfg configpb2.ConfigServiceClient, authType string, authToken string) (*tokenManager, error) {
-	authString := makeAuthString(authType, authToken)
-
-	handshakeClient, err := fs.handshake(withAuth(ctx, authString))
+	handshakeClient, err := fs.handshake(ctx)
 
 	if err != nil {
 		return nil, err
 	}
 
-	tkn, err := requestToken(handshakeClient, &flight.HandshakeRequest{Payload: []byte(authString)})
+	tkn, err := requestToken(handshakeClient, authType, []byte(authToken))
 
 	if err != nil {
 		return nil, err
@@ -174,10 +185,10 @@ func newTokenManager(ctx context.Context, fs *flightStub, cfg configpb2.ConfigSe
 				var tkn []byte
 
 				if err == nil {
-					tkn, err = requestToken(handshakeClient, &flight.HandshakeRequest{Payload: oldToken})
+					tkn, err = requestToken(handshakeClient, "Bearer", oldToken)
 				} else {
 					log.Println("Old token has an error during token update.  Attempting to acquire a fresh token.  err=", err)
-					tkn, err = requestToken(handshakeClient, &flight.HandshakeRequest{Payload: []byte(authString)})
+					tkn, err = requestToken(handshakeClient, authType, []byte(authToken))
 				}
 
 				if err != nil {
diff --git a/gradle.properties b/gradle.properties
index 409740b95c4..3171dbc9ea4 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -9,7 +9,7 @@
 # Re-builders who want to inherit the base version, but have their own qualifier can set -PdeephavenBaseQualifier="customQualifier": "X.Y.Z-customQualifier".
 #
 # Re-builders who want a fully custom version can set -PdeephavenBaseVersion="customVersion" -PdeephavenBaseQualifier="": "customVersion".
-deephavenBaseVersion=0.35.0
+deephavenBaseVersion=0.38.0
 deephavenBaseQualifier=SNAPSHOT
 
 #org.gradle.debug
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
new file mode 100644
index 00000000000..6645516cd4c
--- /dev/null
+++ b/gradle/libs.versions.toml
@@ -0,0 +1,326 @@
+[versions]
+airlift = "2.0.2"
+arrow = "18.0.0"
+autoservice = "1.1.1"
+avro = "1.12.0"
+awssdk = "2.29.20"
+# See dependency matrix for particular gRPC versions at https://github.com/grpc/grpc-java/blob/master/SECURITY.md#netty
+boringssl = "2.0.61.Final"
+calcite = "1.38.0"
+classgraph = "4.8.177"
+commons-compress = "1.27.1"
+commons-io = "2.18.0"
+commons-lang3 = "3.17.0"
+commons-math3 = "3.6.1"
+commons-text = "1.13.0"
+# confluent and confluent-kafak-clients should be kept in-sync
+confluent = "7.6.0"
+confluent-kafka-clients = "7.6.0-ccs"
+dagger = "2.54"
+deephaven-barrage = "0.7.2"
+deephaven-csv = "0.15.0"
+deephaven-hash = "0.1.0"
+deephaven-suan-shu = "0.1.1"
+dev-dirs = "26"
+dsi = "8.5.15"
+elemental = "1.2.3"
+f4b6a3 = "6.0.0"
+flatbuffers = "24.3.25"
+freemarker = "2.3.33"
+google-findbugs = "3.0.2"
+google-java-allocation-instrumenter = "3.3.4"
+groovy = "3.0.23"
+# Only bump this in concert with boringssl
+grpc = "1.65.1"
+guava = "33.4.0-jre"
+gwt = "2.12.1"
+# used by GwtTools
+gwtJetty = "9.4.44.v20210927"
+hadoop = "3.4.1"
+hdrhistogram = "2.2.2"
+iceberg = "1.7.1"
+immutables = "2.10.1"
+jackson = "2.18.2"
+jakarta-servlet = "5.0.0"
+jakarta-websocket = "2.0.0"
+jama = "1.1.1"
+javaparser = "3.26.2"
+javax-annotation = "1.3.2"
+javax-inject = "1"
+javax-validation = "2.0.1.Final"
+jdom2 = "2.0.6.1"
+jetbrains = "26.0.1"
+jetty = "11.0.20"
+jpy = "1.0.0"
+jsinterop = "2.0.2"
+# google is annoying, and have different versions released for the same groupId
+jsinterop-base = "1.0.3"
+logback = "1.5.16"
+lz4 = "1.8.0"
+mindrot = "0.4"
+nidi = "0.18.1"
+oshi = "5.8.3"
+pac4j = "5.7.0"
+parquet = "1.14.3"
+picocli = "4.7.6"
+postgresql = "42.7.4"
+protobuf = "3.25.4"
+randelshofer = "2.0.1"
+rdblue = "0.1.1"
+selenium = "4.27.0"
+slf4j = "2.0.16"
+snappy = "1.1.10.7"
+squareup = "1.13.0"
+sslcontext = "8.3.7"
+tdunning = "3.3"
+trove = "3.0.3"
+undercouch = "2.15.1"
+univocity = "2.9.1"
+vertispan-nio = "1.0-alpha-2"
+vertispan-flatbuffers-gwt = "24.3.25-1"
+vertispan-ts-defs = "1.0.0-RC4"
+xerial = "3.47.2.0"
+
+# test versions
+assertj = "3.27.2"
+h2database = "2.3.232"
+jmock = "2.13.1"
+junit = "5.11.4"
+junit4 = "4.13.2"
+testcontainers = "1.20.4"
+jmh = "1.37"
+spockframework = "2.3-groovy-3.0"
+
+[libraries]
+airlift-aircompressor = { module = "io.airlift:aircompressor", version.ref = "airlift"}
+
+arrow-compression = { module = "org.apache.arrow:arrow-compression", version.ref = "arrow" }
+arrow-format = { module = "org.apache.arrow:arrow-format", version.ref = "arrow" }
+arrow-vector = { module = "org.apache.arrow:arrow-vector", version.ref = "arrow" }
+arrow-flight-core = { module = "org.apache.arrow:flight-core", version.ref = "arrow" }
+arrow-flight-sql = { module = "org.apache.arrow:flight-sql", version.ref = "arrow" }
+arrow-flight-sql-jdbc = { module = "org.apache.arrow:flight-sql-jdbc-driver", version.ref = "arrow" }
+
+autoservice = { module = "com.google.auto.service:auto-service-annotations", version.ref = "autoservice" }
+autoservice-compiler = { module = "com.google.auto.service:auto-service", version.ref = "autoservice" }
+
+avro = { module = "org.apache.avro:avro", version.ref = "avro" }
+
+awssdk-bom = { module = "software.amazon.awssdk:bom", version.ref = "awssdk"}
+awssdk-crt-client = { module = "software.amazon.awssdk:aws-crt-client" }
+awssdk-glue = { module = "software.amazon.awssdk:glue" }
+awssdk-s3 = { module = "software.amazon.awssdk:s3" }
+awssdk-s3-transfer-manager = { module = "software.amazon.awssdk:s3-transfer-manager" }
+awssdk-sts = { module = "software.amazon.awssdk:sts" }
+awssdk-dynamodb = { module = "software.amazon.awssdk:dynamodb" }
+awssdk-kms = { module = "software.amazon.awssdk:kms" }
+
+boringssl = { module = "io.netty:netty-tcnative-boringssl-static", version.ref = "boringssl" }
+
+calcite-core = { module = "org.apache.calcite:calcite-core", version.ref = "calcite" }
+
+classgraph = { module = "io.github.classgraph:classgraph", version.ref = "classgraph" }
+
+commons-compress = { module = "org.apache.commons:commons-compress", version.ref = "commons-compress" }
+
+commons-io = { module = "commons-io:commons-io", version.ref = "commons-io" }
+
+commons-lang3 = { module = "org.apache.commons:commons-lang3", version.ref = "commons-lang3" }
+
+commons-math3 = { module = "org.apache.commons:commons-math3", version.ref = "commons-math3" }
+
+commons-text = { module = "org.apache.commons:commons-text", version.ref = "commons-text" }
+
+confluent-avro-serializer = { module = "io.confluent:kafka-avro-serializer", version.ref = "confluent" }
+confluent-protobuf-serializer = { module = "io.confluent:kafka-protobuf-serializer", version.ref = "confluent" }
+
+confluent-kafka-clients = { module = "org.apache.kafka:kafka-clients", version.ref = "confluent-kafka-clients" }
+
+dagger = { module = "com.google.dagger:dagger", version.ref = "dagger" }
+dagger-compiler = { module = "com.google.dagger:dagger-compiler", version.ref = "dagger" }
+
+deephaven-barrage-core = { module = "io.deephaven.barrage:barrage-core", version.ref = "deephaven-barrage" }
+deephaven-barrage-format = { module = "io.deephaven.barrage:barrage-format", version.ref = "deephaven-barrage" }
+
+deephaven-csv = { module = "io.deephaven:deephaven-csv", version.ref = "deephaven-csv" }
+deephaven-csv-fast-double-parser = { module = "io.deephaven:deephaven-csv-fast-double-parser", version.ref = "deephaven-csv" }
+
+deephaven-hash = { module = "io.deephaven:hash", version.ref = "deephaven-hash" }
+
+deephaven-suan-shu = { module = "io.deephaven:SuanShu", version.ref = "deephaven-suan-shu" }
+
+dev-dirs-directories = { module = "dev.dirs:directories", version.ref = "dev-dirs" }
+
+dsi-fastutil = { module = "it.unimi.dsi:fastutil", version.ref = "dsi" }
+
+elemental-core = { module = "com.google.elemental2:elemental2-core", version.ref = "elemental" }
+
+f4b6a3-uuid-creator = { module = "com.github.f4b6a3:uuid-creator", version.ref = "f4b6a3" }
+
+flatbuffers-java = { module = "com.google.flatbuffers:flatbuffers-java", version.ref = "flatbuffers" }
+
+freemarker = { module = "org.freemarker:freemarker", version.ref = "freemarker" }
+
+google-findbugs-jsr305 = { module = "com.google.code.findbugs:jsr305", version.ref = "google-findbugs" }
+
+google-java-allocation-instrumenter = { module = "com.google.code.java-allocation-instrumenter:java-allocation-instrumenter", version.ref = "google-java-allocation-instrumenter"}
+
+groovy = { module = "org.codehaus.groovy:groovy", version.ref = "groovy" }
+groovy-json = { module = "org.codehaus.groovy:groovy-json", version.ref = "groovy" }
+groovy-templates = { module = "org.codehaus.groovy:groovy-templates", version.ref = "groovy" }
+
+grpc-api = { module = "io.grpc:grpc-api" }
+grpc-bom = { module = "io.grpc:grpc-bom", version.ref = "grpc"}
+grpc-core = { module = "io.grpc:grpc-core" }
+grpc-netty = { module = "io.grpc:grpc-netty" }
+grpc-protobuf = { module = "io.grpc:grpc-protobuf" }
+grpc-services = { module = "io.grpc:grpc-services" }
+grpc-stub = { module = "io.grpc:grpc-services" }
+grpc-testing = { module = "io.grpc:grpc-testing" }
+grpc-inprocess = { module = "io.grpc:grpc-inprocess" }
+grpc-util = { module = "io.grpc:grpc-util" }
+
+guava = { module = "com.google.guava:guava", version.ref = "guava" }
+
+gwt-user = { module = "org.gwtproject:gwt-user", version.ref = "gwt" }
+
+hadoop-common = { module = "org.apache.hadoop:hadoop-common", version.ref = "hadoop" }
+# These are transitive, inlined versions; see io.deephaven.hadoop-common-dependencies
+woodstox-core = { module = "com.fasterxml.woodstox:woodstox-core", version = "6.6.2" }
+hadoop-shaded-guava = { module = "org.apache.hadoop.thirdparty:hadoop-shaded-guava", version = "1.3.0" }
+commons-collections = { module = "commons-collections:commons-collections", version = "3.2.2" }
+
+hdrhistogram = { module = "org.hdrhistogram:HdrHistogram", version.ref = "hdrhistogram" }
+
+iceberg-api = { module = "org.apache.iceberg:iceberg-api" }
+iceberg-aws = { module = "org.apache.iceberg:iceberg-aws" }
+iceberg-bom = { module = "org.apache.iceberg:iceberg-bom", version.ref = "iceberg" }
+iceberg-bundled-guava = { module = "org.apache.iceberg:iceberg-bundled-guava" }
+iceberg-core = { module = "org.apache.iceberg:iceberg-core" }
+
+immutables-value = { module = "org.immutables:value", version.ref = "immutables" }
+immutables-value-annotations = { module = "org.immutables:value-annotations", version.ref = "immutables" }
+
+elemental-dom = { module = "com.google.elemental2:elemental2-dom", version.ref = "elemental" }
+elemental-promise = { module = "com.google.elemental2:elemental2-promise", version.ref = "elemental" }
+
+jackson-annotations = { module = "com.fasterxml.jackson.core:jackson-annotations" }
+jackson-bom = { module = "com.fasterxml.jackson:jackson-bom", version.ref = "jackson" }
+jackson-core = { module = "com.fasterxml.jackson.core:jackson-core" }
+jackson-databind = { module = "com.fasterxml.jackson.core:jackson-databind" }
+jackson-dataformat-yaml = { module = "com.fasterxml.jackson.dataformat:jackson-dataformat-yaml" }
+jackson-datatype-jdk8 = { module = "com.fasterxml.jackson.datatype:jackson-datatype-jdk8" }
+
+jakarata-servlet-api = { module = "jakarta.servlet:jakarta.servlet-api", version.ref = "jakarta-servlet" }
+
+jakarta-websocket-api = { module = "jakarta.websocket:jakarta.websocket-api", version.ref = "jakarta-websocket" }
+
+jama = { module = "gov.nist.math.jama:gov.nist.math.jama", version.ref = "jama" }
+
+javaparser-core = { module = "com.github.javaparser:javaparser-core", version.ref = "javaparser" }
+
+javax-annotation-api = { module = "javax.annotation:javax.annotation-api", version.ref = "javax-annotation" }
+
+javax-inject = { module = "javax.inject:javax.inject", version.ref = "javax-inject" }
+
+javax-validation-api = { module = "javax.validation:validation-api", version.ref = "javax-validation" }
+
+jdom2 = { module = "org.jdom:jdom2", version.ref = "jdom2" }
+
+jetbrains-annotations = { module = "org.jetbrains:annotations", version.ref = "jetbrains" }
+
+jetty-alpn-java-server = { module = "org.eclipse.jetty:jetty-alpn-java-server" }
+jetty-alpn-server = { module = "org.eclipse.jetty:jetty-alpn-server" }
+jetty-bom = { module = "org.eclipse.jetty:jetty-bom", version.ref = "jetty" }
+jetty-http2-server = { module = "org.eclipse.jetty.http2:http2-server" }
+jetty-servlet = { module = "org.eclipse.jetty:jetty-servlet" }
+jetty-servlets = { module = "org.eclipse.jetty:jetty-servlets" }
+jetty-webapp = { module = "org.eclipse.jetty:jetty-webapp" }
+jetty-websocket-jakarta-server = { module = "org.eclipse.jetty.websocket:websocket-jakarta-server" }
+
+jpy = { module = "org.jpyconsortium:jpy", version.ref = "jpy" }
+
+jsinterop-annotations = { module = "com.google.jsinterop:jsinterop-annotations", version.ref = "jsinterop" }
+jsinterop-base = { module = "com.google.jsinterop:base", version.ref = "jsinterop-base" }
+
+logback-classic = { module = "ch.qos.logback:logback-classic", version.ref = "logback" }
+
+lz4-java = { module = "org.lz4:lz4-java", version.ref = "lz4" }
+
+mindrot-jbcrypt = { module = "org.mindrot:jbcrypt", version.ref = "mindrot" }
+
+nidi-graphviz-java = { module = "guru.nidi:graphviz-java", version.ref = "nidi" }
+
+oshi-core = { module = "com.github.oshi:oshi-core", version.ref = "oshi" }
+
+pac4j-http = { module = "org.pac4j:pac4j-http", version.ref = "pac4j" }
+pac4j-oidc = { module = "org.pac4j:pac4j-oidc", version.ref = "pac4j" }
+
+parquet-hadoop = { module = "org.apache.parquet:parquet-hadoop", version.ref = "parquet" }
+
+picocli = { module = "info.picocli:picocli", version.ref = "picocli" }
+
+postgresql = { module = "org.postgresql:postgresql", version.ref = "postgresql" }
+
+protobuf-java = { module = "com.google.protobuf:protobuf-java", version.ref = "protobuf" }
+
+randelshofer-fastdoubleparser = { module = "ch.randelshofer:fastdoubleparser", version.ref = "randelshofer" }
+
+rdblue-brotli-codec = { module = "com.github.rdblue:brotli-codec", version.ref = "rdblue" }
+
+selenium-remote-driver = { module = "org.seleniumhq.selenium:selenium-remote-driver", version.ref = "selenium" }
+
+slf4j-api = { module = "org.slf4j:slf4j-api", version.ref = "slf4j" }
+slf4j-jul-to-slf4j = { module = "org.slf4j:jul-to-slf4j", version.ref = "slf4j" }
+slf4j-simple = { module = "org.slf4j:slf4j-simple", version.ref = "slf4j" }
+
+snappy-java = { module = "org.xerial.snappy:snappy-java", version.ref = "snappy" }
+
+squareup-javapoet = { module = "com.squareup:javapoet", version.ref = "squareup" }
+
+sslcontext-kickstart = { module = "io.github.hakky54:sslcontext-kickstart", version.ref = "sslcontext" }
+sslcontext-kickstart-jetty = { module = "io.github.hakky54:sslcontext-kickstart-for-jetty", version.ref = "sslcontext" }
+sslcontext-kickstart-netty = { module = "io.github.hakky54:sslcontext-kickstart-for-netty", version.ref = "sslcontext" }
+
+tdunning-t-digest = { module = "com.tdunning:t-digest", version.ref = "tdunning" }
+
+trove = { module = "net.sf.trove4j:trove4j", version.ref = "trove" }
+
+undercouch-bson4jackson = { module = "de.undercouch:bson4jackson", version.ref = "undercouch" }
+
+univocity-parsers = { module = "com.univocity:univocity-parsers", version.ref = "univocity" }
+
+vertispan-nio-gwt = { module = "com.vertispan.nio:gwt-nio", version.ref = "vertispan-nio" }
+
+vertispan-flatbuffers-gwt = { module = "com.vertispan.flatbuffers:flatbuffers-gwt", version.ref = "vertispan-flatbuffers-gwt" }
+
+vertispan-ts-defs-annotations = { module = "com.vertispan.tsdefs:jsinterop-ts-defs-annotations", version.ref = "vertispan-ts-defs" }
+vertispan-ts-defs-doclet = { module = "com.vertispan.tsdefs:jsinterop-ts-defs-doclet", version.ref = "vertispan-ts-defs" }
+
+xerial-sqlite-jdbc = { module = "org.xerial:sqlite-jdbc", version.ref = "xerial" }
+
+# test libraries
+assertj = { module = "org.assertj:assertj-core", version.ref = "assertj" }
+
+h2database-h2 = { module = "com.h2database:h2", version.ref = "h2database" }
+
+jmh-core = { module = "org.openjdk.jmh:jmh-core", version.ref = "jmh" }
+jmh-generator-annprocess = { module = "org.openjdk.jmh:jmh-generator-annprocess", version.ref = "jmh" }
+
+jmock-imposters = { module = "org.jmock:jmock-imposters", version.ref = "jmock" }
+jmock-junit4 = { module = "org.jmock:jmock-junit4", version.ref = "jmock" }
+
+junit-bom = { module = "org.junit:junit-bom", version.ref = "junit" }
+junit-jupiter = { module = "org.junit.jupiter:junit-jupiter" }
+junit-jupiter-engine = { module = "org.junit.jupiter:junit-jupiter-engine" }
+junit-platform-launcher = { module = "org.junit.platform:junit-platform-launcher" }
+junit-vintage-engine = { module = "org.junit.vintage:junit-vintage-engine" }
+
+junit4 = { module = "junit:junit", version.ref = "junit4" }
+
+spockframework-core = { module = "org.spockframework:spock-core", version.ref = "spockframework" }
+
+testcontainers = { module = "org.testcontainers:testcontainers", version.ref = "testcontainers" }
+testcontainers-junit-jupiter = { module = "org.testcontainers:junit-jupiter", version.ref = "testcontainers" }
+testcontainers-localstack = { module = "org.testcontainers:localstack", version.ref = "testcontainers" }
+testcontainers-minio = { module = "org.testcontainers:minio", version.ref = "testcontainers" }
diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar
index e6441136f3d..a4b76b9530d 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 fcbbad6dd64..22286c90de3 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,7 +1,7 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionSha256Sum=194717442575a6f96e1c1befa2c30e9a4fc90f701d7aee33eb879b79e7ff05c0
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-all.zip
+distributionSha256Sum=89d4e70e4e84e2d2dfbb63e4daa53e21b25017cc70c37e4eea31ee51fb15098a
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.11.1-all.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME
diff --git a/gradlew b/gradlew
index 1aa94a42690..f5feea6d6b1 100755
--- a/gradlew
+++ b/gradlew
@@ -15,6 +15,8 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 #
+# SPDX-License-Identifier: Apache-2.0
+#
 
 ##############################################################################
 #
@@ -55,7 +57,7 @@
 #       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
+#       https://github.com/gradle/gradle/blob/HEAD/platforms/jvm/plugins-application/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
 #       within the Gradle project.
 #
 #       You can find Gradle at https://github.com/gradle/gradle/.
@@ -84,7 +86,8 @@ done
 # 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
+APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s
+' "$PWD" ) || exit
 
 # Use the maximum available, or set MAX_FD != -1 to use that value.
 MAX_FD=maximum
diff --git a/gradlew.bat b/gradlew.bat
index 7101f8e4676..9b42019c791 100644
--- a/gradlew.bat
+++ b/gradlew.bat
@@ -13,6 +13,8 @@
 @rem See the License for the specific language governing permissions and
 @rem limitations under the License.
 @rem
+@rem SPDX-License-Identifier: Apache-2.0
+@rem
 
 @if "%DEBUG%"=="" @echo off
 @rem ##########################################################################
diff --git a/grpc-java/grpc-mtls/build.gradle b/grpc-java/grpc-mtls/build.gradle
index 9272f0a9f6f..53383e59098 100644
--- a/grpc-java/grpc-mtls/build.gradle
+++ b/grpc-java/grpc-mtls/build.gradle
@@ -5,8 +5,8 @@ plugins {
 description = 'Utility project to make x509 client cert available in grpc calls on the server'
 
 dependencies {
-    Classpaths.inheritGrpcPlatform(project)
-    implementation 'io.grpc:grpc-core'
+    implementation platform(libs.grpc.bom)
+    implementation libs.grpc.core
 }
 
 spotless {
diff --git a/grpc-java/grpc-servlet-jakarta/build.gradle b/grpc-java/grpc-servlet-jakarta/build.gradle
index e65ab770bad..cae116e6b18 100644
--- a/grpc-java/grpc-servlet-jakarta/build.gradle
+++ b/grpc-java/grpc-servlet-jakarta/build.gradle
@@ -4,12 +4,11 @@ plugins {
 }
 
 dependencies {
-    Classpaths.inheritGrpcPlatform(project)
-    implementation 'io.grpc:grpc-core'
-    compileOnly 'jakarta.servlet:jakarta.servlet-api:5.0.0',
-            'org.apache.tomcat:annotations-api:6.0.53'
+    implementation platform(libs.grpc.bom)
+    implementation libs.grpc.core
+    compileOnly libs.jakarata.servlet.api
 
-    Classpaths.inheritGuava(project)
+    implementation libs.guava
 }
 
 spotless {
diff --git a/grpc-java/grpc-servlet-jakarta/src/main/java/io/grpc/servlet/jakarta/AsyncServletOutputStreamWriter.java b/grpc-java/grpc-servlet-jakarta/src/main/java/io/grpc/servlet/jakarta/AsyncServletOutputStreamWriter.java
index 9a819c2426e..9384be40faf 100644
--- a/grpc-java/grpc-servlet-jakarta/src/main/java/io/grpc/servlet/jakarta/AsyncServletOutputStreamWriter.java
+++ b/grpc-java/grpc-servlet-jakarta/src/main/java/io/grpc/servlet/jakarta/AsyncServletOutputStreamWriter.java
@@ -13,6 +13,7 @@
 
 package io.grpc.servlet.jakarta;
 
+import com.google.common.annotations.VisibleForTesting;
 import io.grpc.InternalLogId;
 import io.grpc.servlet.jakarta.ServletServerStream.ServletTransportState;
 import jakarta.servlet.AsyncContext;
@@ -26,6 +27,8 @@
 import java.util.concurrent.ConcurrentLinkedQueue;
 import java.util.concurrent.atomic.AtomicReference;
 import java.util.concurrent.locks.LockSupport;
+import java.util.function.BiFunction;
+import java.util.function.BooleanSupplier;
 import java.util.logging.Logger;
 
 import static com.google.common.base.Preconditions.checkState;
@@ -36,9 +39,6 @@
 /** Handles write actions from the container thread and the application thread. */
 final class AsyncServletOutputStreamWriter {
 
-    private static final Logger logger =
-            Logger.getLogger(AsyncServletOutputStreamWriter.class.getName());
-
     /**
      * Memory boundary for write actions.
      *
@@ -61,11 +61,11 @@ final class AsyncServletOutputStreamWriter {
      */
     private final AtomicReference<WriteState> writeState = new AtomicReference<>(WriteState.DEFAULT);
 
-    private final ServletOutputStream outputStream;
-    private final ServletTransportState transportState;
-    private final InternalLogId logId;
+    private final Log log;
+    private final BiFunction<byte[], Integer, ActionItem> writeAction;
     private final ActionItem flushAction;
     private final ActionItem completeAction;
+    private final BooleanSupplier isReady;
 
     /**
      * New write actions will be buffered into this queue if the servlet output stream is not ready or the queue is not
@@ -82,38 +82,81 @@ final class AsyncServletOutputStreamWriter {
             AsyncContext asyncContext,
             ServletTransportState transportState,
             InternalLogId logId) throws IOException {
-        this.outputStream = asyncContext.getResponse().getOutputStream();
-        this.transportState = transportState;
-        this.logId = logId;
+        Logger logger = Logger.getLogger(AsyncServletOutputStreamWriter.class.getName());
+        this.log = new Log() {
+            @Override
+            public void fine(String str, Object... params) {
+                if (logger.isLoggable(FINE)) {
+                    logger.log(FINE, "[" + logId + "]" + str, params);
+                }
+            }
+
+            @Override
+            public void finest(String str, Object... params) {
+                if (logger.isLoggable(FINEST)) {
+                    logger.log(FINEST, "[" + logId + "] " + str, params);
+                }
+            }
+
+            @Override
+            public boolean isFinestEnabled() {
+                return logger.isLoggable(FINEST);
+            }
+        };
+
+        ServletOutputStream outputStream = asyncContext.getResponse().getOutputStream();
+        this.writeAction = (byte[] bytes, Integer numBytes) -> () -> {
+            outputStream.write(bytes, 0, numBytes);
+            transportState.runOnTransportThread(() -> transportState.onSentBytes(numBytes));
+            if (log.isFinestEnabled()) {
+                log.finest("outbound data: length={0}, bytes={1}", numBytes, toHexString(bytes, numBytes));
+            }
+        };
         this.flushAction = () -> {
-            logger.log(FINEST, "[{0}] flushBuffer", logId);
+            log.finest("flushBuffer");
             asyncContext.getResponse().flushBuffer();
         };
         this.completeAction = () -> {
-            logger.log(FINE, "[{0}] call is completing", logId);
+            log.fine("call is completing");
             transportState.runOnTransportThread(
                     () -> {
                         transportState.complete();
-                        asyncContext.complete();
-                        logger.log(FINE, "[{0}] call completed", logId);
+                        // asyncContext.complete();
+                        log.fine("call completed");
                     });
+            // Jetty specific fix: When AsyncContext.complete() is called, Jetty sends a RST_STREAM with
+            // "cancel" error to the client, while other containers send "no error" in this case. Calling
+            // close() instead on the output stream still sends the RST_STREAM, but with "no error". Note
+            // that this does the opposite in at least Tomcat, so we're not going to upstream this change.
+            // See https://github.com/deephaven/deephaven-core/issues/6400
+            outputStream.close();
         };
+        this.isReady = () -> outputStream.isReady();
+    }
+
+    /**
+     * Constructor without java.util.logging and jakarta.servlet.* dependency, so that Lincheck can run.
+     *
+     * @param writeAction Provides an {@link ActionItem} to write given bytes with specified length.
+     * @param isReady Indicates whether the writer can write bytes at the moment (asynchronously).
+     */
+    @VisibleForTesting
+    AsyncServletOutputStreamWriter(
+            BiFunction<byte[], Integer, ActionItem> writeAction,
+            ActionItem flushAction,
+            ActionItem completeAction,
+            BooleanSupplier isReady,
+            Log log) {
+        this.writeAction = writeAction;
+        this.flushAction = flushAction;
+        this.completeAction = completeAction;
+        this.isReady = isReady;
+        this.log = log;
     }
 
     /** Called from application thread. */
     void writeBytes(byte[] bytes, int numBytes) throws IOException {
-        runOrBuffer(
-                // write bytes action
-                () -> {
-                    outputStream.write(bytes, 0, numBytes);
-                    transportState.runOnTransportThread(() -> transportState.onSentBytes(numBytes));
-                    if (logger.isLoggable(FINEST)) {
-                        logger.log(
-                                FINEST,
-                                "[{0}] outbound data: length = {1}, bytes = {2}",
-                                new Object[] {logId, numBytes, toHexString(bytes, numBytes)});
-                    }
-                });
+        runOrBuffer(writeAction.apply(bytes, numBytes));
     }
 
     /** Called from application thread. */
@@ -132,10 +175,9 @@ void complete() {
 
     /** Called from the container thread {@link jakarta.servlet.WriteListener#onWritePossible()}. */
     void onWritePossible() throws IOException {
-        logger.log(
-                FINEST, "[{0}] onWritePossible: ENTRY. The servlet output stream becomes ready", logId);
+        log.finest("onWritePossible: ENTRY. The servlet output stream becomes ready");
         assureReadyAndDrainedTurnsFalse();
-        while (outputStream.isReady()) {
+        while (isReady.getAsBoolean()) {
             WriteState curState = writeState.get();
 
             ActionItem actionItem = writeChain.poll();
@@ -146,18 +188,15 @@ void onWritePossible() throws IOException {
 
             if (writeState.compareAndSet(curState, curState.withReadyAndDrained(true))) {
                 // state has not changed since.
-                logger.log(
-                        FINEST,
-                        "[{0}] onWritePossible: EXIT. All data available now is sent out and the servlet output"
-                                + " stream is still ready",
-                        logId);
+                log.finest(
+                        "onWritePossible: EXIT. All data available now is sent out and the servlet output"
+                                + " stream is still ready");
                 return;
             }
             // else, state changed by another thread (runOrBuffer()), need to drain the writeChain
             // again
         }
-        logger.log(
-                FINEST, "[{0}] onWritePossible: EXIT. The servlet output stream becomes not ready", logId);
+        log.finest("onWritePossible: EXIT. The servlet output stream becomes not ready");
     }
 
     private void assureReadyAndDrainedTurnsFalse() {
@@ -166,6 +205,8 @@ private void assureReadyAndDrainedTurnsFalse() {
         // being set to false by runOrBuffer() concurrently.
         while (writeState.get().readyAndDrained) {
             parkingThread = Thread.currentThread();
+            // Try to sleep for an extremely long time to avoid writeState being changed at exactly
+            // the time when sleep time expires (in extreme scenario, such as #9917).
             LockSupport.parkNanos(Duration.ofHours(1).toNanos()); // should return immediately
         }
         parkingThread = null;
@@ -184,12 +225,12 @@ private void runOrBuffer(ActionItem actionItem) throws IOException {
             if (actionItem == completeAction) {
                 return;
             }
-            if (!outputStream.isReady()) {
+            if (!isReady.getAsBoolean()) {
                 boolean successful =
                         writeState.compareAndSet(curState, curState.withReadyAndDrained(false));
                 LockSupport.unpark(parkingThread);
                 checkState(successful, "Bug: curState is unexpectedly changed by another thread");
-                logger.log(FINEST, "[{0}] the servlet output stream becomes not ready", logId);
+                log.finest("the servlet output stream becomes not ready");
             }
         } else { // buffer to the writeChain
             writeChain.offer(actionItem);
@@ -208,10 +249,22 @@ private void runOrBuffer(ActionItem actionItem) throws IOException {
 
     /** Write actions, e.g. writeBytes, flush, complete. */
     @FunctionalInterface
-    private interface ActionItem {
+    @VisibleForTesting
+    interface ActionItem {
         void run() throws IOException;
     }
 
+    @VisibleForTesting // Lincheck test can not run with java.util.logging dependency.
+    interface Log {
+        default void fine(String str, Object...params) {}
+
+        default void finest(String str, Object...params) {}
+
+        default boolean isFinestEnabled() {
+            return false;
+        }
+    }
+
     private static final class WriteState {
 
         static final WriteState DEFAULT = new WriteState(false);
diff --git a/grpc-java/grpc-servlet-jakarta/src/main/java/io/grpc/servlet/jakarta/GrpcServlet.java b/grpc-java/grpc-servlet-jakarta/src/main/java/io/grpc/servlet/jakarta/GrpcServlet.java
index 89b518112a9..933c1dcf4b4 100644
--- a/grpc-java/grpc-servlet-jakarta/src/main/java/io/grpc/servlet/jakarta/GrpcServlet.java
+++ b/grpc-java/grpc-servlet-jakarta/src/main/java/io/grpc/servlet/jakarta/GrpcServlet.java
@@ -13,7 +13,6 @@
 
 package io.grpc.servlet.jakarta;
 
-import com.google.common.annotations.VisibleForTesting;
 import io.grpc.Attributes;
 import io.grpc.BindableService;
 import io.grpc.ExperimentalApi;
@@ -44,7 +43,6 @@ public class GrpcServlet extends HttpServlet {
 
     private final ServletAdapter servletAdapter;
 
-    @VisibleForTesting
     GrpcServlet(ServletAdapter servletAdapter) {
         this.servletAdapter = servletAdapter;
     }
diff --git a/grpc-java/grpc-servlet-jakarta/src/main/java/io/grpc/servlet/jakarta/ServletAdapter.java b/grpc-java/grpc-servlet-jakarta/src/main/java/io/grpc/servlet/jakarta/ServletAdapter.java
index 3fb2655b43b..379ee668a20 100644
--- a/grpc-java/grpc-servlet-jakarta/src/main/java/io/grpc/servlet/jakarta/ServletAdapter.java
+++ b/grpc-java/grpc-servlet-jakarta/src/main/java/io/grpc/servlet/jakarta/ServletAdapter.java
@@ -45,7 +45,6 @@
 import java.util.Enumeration;
 import java.util.List;
 import java.util.concurrent.TimeUnit;
-import java.util.concurrent.atomic.AtomicBoolean;
 import java.util.logging.Logger;
 
 import static com.google.common.base.Preconditions.checkArgument;
@@ -116,7 +115,7 @@ public <T> T otherAdapter(AdapterConstructor<T> constructor) {
      * {@code resp.setBufferSize()} before invocation is allowed.
      */
     public void doGet(HttpServletRequest req, HttpServletResponse resp) throws IOException {
-        // TODO(zdapeng)
+        resp.sendError(HttpServletResponse.SC_METHOD_NOT_ALLOWED, "GET method not supported");
     }
 
     /**
@@ -144,7 +143,10 @@ public void doPost(HttpServletRequest req, HttpServletResponse resp) throws IOEx
             logger.log(FINEST, "[{0}] headers: {1}", new Object[] {logId, headers});
         }
 
-        Long timeoutNanos = headers.get(TIMEOUT_KEY);
+        // Always ignore grpc-timeout at this time, as the servlet timeout isn't being reset
+        // when the output stream is closed. See https://github.com/deephaven/deephaven-core/issues/6400
+        // for more information.
+        Long timeoutNanos = null; // headers.get(TIMEOUT_KEY);
         if (timeoutNanos == null) {
             timeoutNanos = 0L;
         }
@@ -172,10 +174,8 @@ public void doPost(HttpServletRequest req, HttpServletResponse resp) throws IOEx
                 getAuthority(req),
                 logId);
 
-        stream.transportState().runOnTransportThread(() -> {
-            transportListener.streamCreated(stream, method, headers);
-            stream.transportState().onStreamAllocated();
-        });
+        transportListener.streamCreated(stream, method, headers);
+        stream.transportState().runOnTransportThread(stream.transportState()::onStreamAllocated);
 
         asyncCtx.getRequest().getInputStream()
                 .setReadListener(new GrpcReadListener(stream, asyncCtx, logId));
@@ -217,7 +217,7 @@ private static String getAuthority(HttpServletRequest req) {
         try {
             return new URI(req.getRequestURL().toString()).getAuthority();
         } catch (URISyntaxException e) {
-            logger.log(FINE, "Error getting authority from the request URL {0}" + req.getRequestURL());
+            logger.log(FINE, "Error getting authority from the request URL {0}", req.getRequestURL());
             return req.getServerName() + ":" + req.getServerPort();
         }
     }
@@ -282,7 +282,6 @@ private static final class GrpcReadListener implements ReadListener {
         final AsyncContext asyncCtx;
         final ServletInputStream input;
         final InternalLogId logId;
-        private final AtomicBoolean closed = new AtomicBoolean(false);
 
         GrpcReadListener(
                 ServletServerStream stream,
@@ -325,16 +324,8 @@ public void onDataAvailable() throws IOException {
         @Override
         public void onAllDataRead() {
             logger.log(FINE, "[{0}] onAllDataRead", logId);
-            if (!closed.compareAndSet(false, true)) {
-                // https://github.com/eclipse/jetty.project/issues/8405
-                // Note that while this can be mitigated by setting
-                // AbstractHTTP2ServerConnectionFactory.getStreamIdleTimeout to zero, we allow this to be customized, so
-                // this workaround is being left in place.
-                logger.log(FINE, "[{0}] onAllDataRead already called, skipping this one", logId);
-                return;
-            }
-            stream.transportState().runOnTransportThread(
-                    () -> stream.transportState().inboundDataReceived(ReadableBuffers.empty(), true));
+            stream.transportState().runOnTransportThread(() ->
+                    stream.transportState().inboundDataReceived(ReadableBuffers.empty(), true));
         }
 
         @Override
diff --git a/grpc-java/grpc-servlet-jakarta/src/main/java/io/grpc/servlet/jakarta/ServletServerBuilder.java b/grpc-java/grpc-servlet-jakarta/src/main/java/io/grpc/servlet/jakarta/ServletServerBuilder.java
index e149cb5eb56..25c7b40c498 100644
--- a/grpc-java/grpc-servlet-jakarta/src/main/java/io/grpc/servlet/jakarta/ServletServerBuilder.java
+++ b/grpc-java/grpc-servlet-jakarta/src/main/java/io/grpc/servlet/jakarta/ServletServerBuilder.java
@@ -15,12 +15,14 @@
 
 import com.google.common.annotations.VisibleForTesting;
 import com.google.common.util.concurrent.ListenableFuture;
+import io.grpc.Attributes;
 import io.grpc.ExperimentalApi;
 import io.grpc.ForwardingServerBuilder;
 import io.grpc.Internal;
 import io.grpc.InternalChannelz.SocketStats;
 import io.grpc.InternalInstrumented;
 import io.grpc.InternalLogId;
+import io.grpc.Metadata;
 import io.grpc.Server;
 import io.grpc.ServerBuilder;
 import io.grpc.ServerStreamTracer;
@@ -29,6 +31,7 @@
 import io.grpc.internal.InternalServer;
 import io.grpc.internal.ServerImplBuilder;
 import io.grpc.internal.ServerListener;
+import io.grpc.internal.ServerStream;
 import io.grpc.internal.ServerTransport;
 import io.grpc.internal.ServerTransportListener;
 import io.grpc.internal.SharedResourceHolder;
@@ -97,10 +100,18 @@ public ServletAdapter buildServletAdapter() {
         return new ServletAdapter(buildAndStart(), streamTracerFactories, maxInboundMessageSize);
     }
 
+    /**
+     * Creates a {@link GrpcServlet}.
+     */
+    public GrpcServlet buildServlet() {
+        return new GrpcServlet(buildServletAdapter());
+    }
+
     private ServerTransportListener buildAndStart() {
+        Server server;
         try {
             internalCaller = true;
-            build().start();
+            server = build().start();
         } catch (IOException e) {
             // actually this should never happen
             throw new RuntimeException(e);
@@ -115,9 +126,29 @@ private ServerTransportListener buildAndStart() {
         // Create only one "transport" for all requests because it has no knowledge of which request is
         // associated with which client socket. This "transport" does not do socket connection, the
         // container does.
-        ServerTransportImpl serverTransport =
-                new ServerTransportImpl(scheduler, usingCustomScheduler);
-        return internalServer.serverListener.transportCreated(serverTransport);
+        ServerTransportImpl serverTransport = new ServerTransportImpl(scheduler);
+        ServerTransportListener delegate =
+                internalServer.serverListener.transportCreated(serverTransport);
+        return new ServerTransportListener() {
+            @Override
+            public void streamCreated(ServerStream stream, String method, Metadata headers) {
+                delegate.streamCreated(stream, method, headers);
+            }
+
+            @Override
+            public Attributes transportReady(Attributes attributes) {
+                return delegate.transportReady(attributes);
+            }
+
+            @Override
+            public void transportTerminated() {
+                server.shutdown();
+                delegate.transportTerminated();
+                if (!usingCustomScheduler) {
+                    SharedResourceHolder.release(GrpcUtil.TIMER_SERVICE, scheduler);
+                }
+            }
+        };
     }
 
     @VisibleForTesting
@@ -211,24 +242,17 @@ static final class ServerTransportImpl implements ServerTransport {
 
         private final InternalLogId logId = InternalLogId.allocate(ServerTransportImpl.class, null);
         private final ScheduledExecutorService scheduler;
-        private final boolean usingCustomScheduler;
 
-        ServerTransportImpl(
-                ScheduledExecutorService scheduler, boolean usingCustomScheduler) {
+        ServerTransportImpl(ScheduledExecutorService scheduler) {
             this.scheduler = checkNotNull(scheduler, "scheduler");
-            this.usingCustomScheduler = usingCustomScheduler;
         }
 
         @Override
         public void shutdown() {
-            if (!usingCustomScheduler) {
-                SharedResourceHolder.release(GrpcUtil.TIMER_SERVICE, scheduler);
-            }
         }
 
         @Override
         public void shutdownNow(Status reason) {
-            shutdown();
         }
 
         @Override
diff --git a/grpc-java/grpc-servlet-jakarta/src/main/java/io/grpc/servlet/jakarta/ServletServerStream.java b/grpc-java/grpc-servlet-jakarta/src/main/java/io/grpc/servlet/jakarta/ServletServerStream.java
index cd04cf3b41e..2f3bce41f9a 100644
--- a/grpc-java/grpc-servlet-jakarta/src/main/java/io/grpc/servlet/jakarta/ServletServerStream.java
+++ b/grpc-java/grpc-servlet-jakarta/src/main/java/io/grpc/servlet/jakarta/ServletServerStream.java
@@ -152,8 +152,8 @@ public void bytesRead(int numBytes) {
 
         @Override
         public void deframeFailed(Throwable cause) {
-            if (logger.isLoggable(FINE)) {
-                logger.log(FINE, String.format("[{%s}] Exception processing message", logId), cause);
+            if (logger.isLoggable(WARNING)) {
+                logger.log(WARNING, String.format("[{%s}] Exception processing message", logId), cause);
             }
             cancel(Status.fromThrowable(cause));
         }
@@ -223,7 +223,7 @@ private final class Sink implements AbstractServerStream.Sink {
         final TrailerSupplier trailerSupplier = new TrailerSupplier();
 
         @Override
-        public void writeHeaders(Metadata headers) {
+        public void writeHeaders(Metadata headers, boolean flush) {
             writeHeadersToServletResponse(headers);
             try {
                 resp.setTrailerFields(trailerSupplier);
diff --git a/grpc-java/grpc-servlet-jakarta/src/main/java/io/grpc/servlet/jakarta/web/GrpcWebOutputStream.java b/grpc-java/grpc-servlet-jakarta/src/main/java/io/grpc/servlet/jakarta/web/GrpcWebOutputStream.java
index 8ea70c19022..a2f70b7ac47 100644
--- a/grpc-java/grpc-servlet-jakarta/src/main/java/io/grpc/servlet/jakarta/web/GrpcWebOutputStream.java
+++ b/grpc-java/grpc-servlet-jakarta/src/main/java/io/grpc/servlet/jakarta/web/GrpcWebOutputStream.java
@@ -17,6 +17,7 @@
 import jakarta.servlet.WriteListener;
 
 import java.io.IOException;
+import java.util.concurrent.atomic.AtomicReference;
 
 /**
  * Wraps the usual ServletOutputStream so as to allow downstream writers to use it according to the servlet spec, but
@@ -24,13 +25,15 @@
  */
 public class GrpcWebOutputStream extends ServletOutputStream implements WriteListener {
     private final ServletOutputStream wrapped;
+    private final GrpcWebServletResponse grpcWebServletResponse;
 
     // Access to these are guarded by synchronized
     private Runnable waiting;
     private WriteListener writeListener;
 
-    public GrpcWebOutputStream(ServletOutputStream wrapped) {
+    public GrpcWebOutputStream(ServletOutputStream wrapped, GrpcWebServletResponse grpcWebServletResponse) {
         this.wrapped = wrapped;
+        this.grpcWebServletResponse = grpcWebServletResponse;
     }
 
     @Override
@@ -97,7 +100,21 @@ public void flush() throws IOException {
 
     @Override
     public void close() throws IOException {
-        wrapped.close();
+        // Since we're a grpc-web response, we must write trailers on our way out as part of close - but trailers
+        // for grpc-web are a data frame, not HTTP trailers. Call up to the response to write the trailer frame,
+        // then close the underlying stream.
+        AtomicReference<IOException> exception = new AtomicReference<>();
+        grpcWebServletResponse.writeTrailers(() -> {
+            try {
+                wrapped.close();
+            } catch (IOException e) {
+                exception.set(e);
+            }
+        });
+        IOException ex = exception.get();
+        if (ex != null) {
+            throw ex;
+        }
     }
 
     @Override
diff --git a/grpc-java/grpc-servlet-jakarta/src/main/java/io/grpc/servlet/jakarta/web/GrpcWebServletRequest.java b/grpc-java/grpc-servlet-jakarta/src/main/java/io/grpc/servlet/jakarta/web/GrpcWebServletRequest.java
index 82dfde664ab..66a25d37a83 100644
--- a/grpc-java/grpc-servlet-jakarta/src/main/java/io/grpc/servlet/jakarta/web/GrpcWebServletRequest.java
+++ b/grpc-java/grpc-servlet-jakarta/src/main/java/io/grpc/servlet/jakarta/web/GrpcWebServletRequest.java
@@ -58,6 +58,8 @@ public AsyncContext startAsync() throws IllegalStateException {
     public AsyncContext startAsync(ServletRequest servletRequest, ServletResponse servletResponse)
             throws IllegalStateException {
         AsyncContext delegate = super.startAsync(servletRequest, servletResponse);
+        // Note that this anonymous class has no purpose while our workaround for
+        // https://github.com/deephaven/deephaven-core/issues/6400 is in place.
         return new DelegatingAsyncContext(delegate) {
             private void safelyComplete() {
                 try {
diff --git a/grpc-java/grpc-servlet-jakarta/src/main/java/io/grpc/servlet/jakarta/web/GrpcWebServletResponse.java b/grpc-java/grpc-servlet-jakarta/src/main/java/io/grpc/servlet/jakarta/web/GrpcWebServletResponse.java
index 2306e3e20f5..68affbeb319 100644
--- a/grpc-java/grpc-servlet-jakarta/src/main/java/io/grpc/servlet/jakarta/web/GrpcWebServletResponse.java
+++ b/grpc-java/grpc-servlet-jakarta/src/main/java/io/grpc/servlet/jakarta/web/GrpcWebServletResponse.java
@@ -60,7 +60,7 @@ public Supplier<Map<String, String>> getTrailerFields() {
     public synchronized GrpcWebOutputStream getOutputStream() throws IOException {
         if (outputStream == null) {
             // Provide our own output stream instance, so we can control/monitor the write listener
-            outputStream = new GrpcWebOutputStream(super.getOutputStream());
+            outputStream = new GrpcWebOutputStream(super.getOutputStream(), this);
         }
         return outputStream;
     }
diff --git a/grpc-java/grpc-servlet-websocket-jakarta/build.gradle b/grpc-java/grpc-servlet-websocket-jakarta/build.gradle
index bbe698ce8bd..08fd255e100 100644
--- a/grpc-java/grpc-servlet-websocket-jakarta/build.gradle
+++ b/grpc-java/grpc-servlet-websocket-jakarta/build.gradle
@@ -4,15 +4,15 @@ plugins {
 }
 
 dependencies {
-    Classpaths.inheritGrpcPlatform(project)
-    implementation 'io.grpc:grpc-core'
+    implementation platform(libs.grpc.bom)
+    implementation libs.grpc.core
 //    compileOnly 'javax.servlet:javax.servlet-api:4.0.1'
-    implementation 'jakarta.servlet:jakarta.servlet-api:5.0.0'
+    implementation libs.jakarata.servlet.api
 
 //    compileOnly 'javax.websocket:javax.websocket-api:1.1'
-    implementation 'jakarta.websocket:jakarta.websocket-api:2.0.0'
+    implementation libs.jakarta.websocket.api
 
-    Classpaths.inheritGuava(project)
+    implementation libs.guava
 }
 
 spotless {
diff --git a/grpc-java/grpc-servlet-websocket-jakarta/src/main/java/io/grpc/servlet/web/websocket/MultiplexedWebsocketStreamImpl.java b/grpc-java/grpc-servlet-websocket-jakarta/src/main/java/io/grpc/servlet/web/websocket/MultiplexedWebsocketStreamImpl.java
index e2aa3b59901..f8f58d19ae5 100644
--- a/grpc-java/grpc-servlet-websocket-jakarta/src/main/java/io/grpc/servlet/web/websocket/MultiplexedWebsocketStreamImpl.java
+++ b/grpc-java/grpc-servlet-websocket-jakarta/src/main/java/io/grpc/servlet/web/websocket/MultiplexedWebsocketStreamImpl.java
@@ -56,7 +56,7 @@ protected AbstractServerStream.Sink abstractServerStreamSink() {
     private final class Sink implements AbstractServerStream.Sink {
 
         @Override
-        public void writeHeaders(Metadata headers) {
+        public void writeHeaders(Metadata headers, boolean flush) {
             writeMetadataToStream(headers, false);
         }
 
diff --git a/grpc-java/grpc-servlet-websocket-jakarta/src/main/java/io/grpc/servlet/web/websocket/WebsocketStreamImpl.java b/grpc-java/grpc-servlet-websocket-jakarta/src/main/java/io/grpc/servlet/web/websocket/WebsocketStreamImpl.java
index 259e230c171..04d953eb877 100644
--- a/grpc-java/grpc-servlet-websocket-jakarta/src/main/java/io/grpc/servlet/web/websocket/WebsocketStreamImpl.java
+++ b/grpc-java/grpc-servlet-websocket-jakarta/src/main/java/io/grpc/servlet/web/websocket/WebsocketStreamImpl.java
@@ -49,7 +49,7 @@ protected Sink abstractServerStreamSink() {
     private final class Sink implements AbstractServerStream.Sink {
 
         @Override
-        public void writeHeaders(Metadata headers) {
+        public void writeHeaders(Metadata headers, boolean flush) {
             // headers/trailers are always sent as asci, colon-delimited pairs, with \r\n separating them. The
             // trailer response must be prefixed with 0x80 (0r 0x81 if compressed), followed by the length of the
             // message
diff --git a/hotspot-impl/build.gradle b/hotspot-impl/build.gradle
index 20570c9f77e..cc187124758 100644
--- a/hotspot-impl/build.gradle
+++ b/hotspot-impl/build.gradle
@@ -6,15 +6,36 @@ description 'Implementation for the HotSpot service to obtain JVM instrospection
 
 dependencies {
     implementation project(':hotspot')
-    Classpaths.inheritAutoService(project)
+    compileOnly libs.autoservice
+    annotationProcessor libs.autoservice.compiler
+
+    testImplementation libs.assertj
+    testImplementation platform(libs.junit.bom)
+    testImplementation libs.junit.jupiter
+    testRuntimeOnly libs.junit.platform.launcher
+}
+
+test {
+    useJUnitPlatform()
 }
 
+// TODO(deephaven-core#6345): Improve build process for jars that depend on JVM internals
+// In the meantime, we can be relatively confident this JAR works for the multiple versions of java since we do nightly
+// tests with a range of testRuntimeVersions.
+
 tasks.withType(JavaCompile).configureEach {
+    // TODO(deephaven-core#6345): Improve build process for jars that depend on JVM internals
     options.compilerArgs += ['--add-exports', 'java.management/sun.management=ALL-UNNAMED']
-    // Explicitly set the source compatibility so gradle will invoke javac with `-source 11` instead of `--release`
-    sourceCompatibility = 11
+    // Explicitly unset release so gradle will invoke javac with `-source <languageLevel> -target <languageLevel>`
+    // instead of `--release <languageLevel>`, which would otherwise produce
+    // > error: exporting a package from system module java.management is not allowed with --release
+    options.release.unset()
 }
 
 tasks.withType(Javadoc).configureEach {
     options.addStringOption('-add-exports', 'java.management/sun.management=ALL-UNNAMED')
 }
+
+tasks.withType(Test).configureEach {
+    jvmArgs += ['--add-exports', 'java.management/sun.management=ALL-UNNAMED']
+}
diff --git a/hotspot-impl/src/test/java/io/deephaven/hotspot/HotSpotTest.java b/hotspot-impl/src/test/java/io/deephaven/hotspot/HotSpotTest.java
new file mode 100644
index 00000000000..3fb3927c863
--- /dev/null
+++ b/hotspot-impl/src/test/java/io/deephaven/hotspot/HotSpotTest.java
@@ -0,0 +1,17 @@
+//
+// Copyright (c) 2016-2024 Deephaven Data Labs and Patent Pending
+//
+package io.deephaven.hotspot;
+
+import io.deephaven.hotspot.impl.HotSpotImpl;
+import org.junit.jupiter.api.Test;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+class HotSpotTest {
+
+    @Test
+    void loadImpl() {
+        assertThat(HotSpot.loadImpl()).get().isExactlyInstanceOf(HotSpotImpl.class);
+    }
+}
diff --git a/hotspot-impl/src/test/java/io/deephaven/hotspot/impl/HotSpotImplTest.java b/hotspot-impl/src/test/java/io/deephaven/hotspot/impl/HotSpotImplTest.java
new file mode 100644
index 00000000000..6166b17f64a
--- /dev/null
+++ b/hotspot-impl/src/test/java/io/deephaven/hotspot/impl/HotSpotImplTest.java
@@ -0,0 +1,34 @@
+//
+// Copyright (c) 2016-2024 Deephaven Data Labs and Patent Pending
+//
+package io.deephaven.hotspot.impl;
+
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+class HotSpotImplTest {
+
+    private HotSpotImpl SUT;
+
+    @BeforeEach
+    void setUp() {
+        SUT = new HotSpotImpl();
+    }
+
+    @Test
+    void getSafepointCount() {
+        assertThat(SUT.getSafepointCount()).isNotNegative();
+    }
+
+    @Test
+    void getTotalSafepointTimeMillis() {
+        assertThat(SUT.getTotalSafepointTimeMillis()).isNotNegative();
+    }
+
+    @Test
+    void getSafepointSyncTimeMillis() {
+        assertThat(SUT.getSafepointSyncTimeMillis()).isNotNegative();
+    }
+}
diff --git a/java-client/barrage-dagger/build.gradle b/java-client/barrage-dagger/build.gradle
index 78975677779..1c4db8b278c 100644
--- a/java-client/barrage-dagger/build.gradle
+++ b/java-client/barrage-dagger/build.gradle
@@ -10,12 +10,12 @@ dependencies {
     api project(':java-client-flight-dagger')
     api project(':uri')
 
-    Classpaths.inheritDagger(project)
-
-    Classpaths.inheritJUnitPlatform(project)
-    Classpaths.inheritAssertJ(project)
-    testImplementation 'org.junit.jupiter:junit-jupiter'
+    implementation libs.dagger
+    annotationProcessor libs.dagger.compiler
 
+    testImplementation libs.assertj
+    testImplementation platform(libs.junit.bom)
+    testImplementation libs.junit.jupiter
     testImplementation project(':log-to-slf4j')
 }
 
diff --git a/java-client/barrage-examples/build.gradle b/java-client/barrage-examples/build.gradle
index 3e51999f057..dc06d40631e 100644
--- a/java-client/barrage-examples/build.gradle
+++ b/java-client/barrage-examples/build.gradle
@@ -7,12 +7,12 @@ dependencies {
     implementation project(':java-client-barrage')
     implementation project(':java-client-example-utilities')
 
-    Classpaths.inheritJUnitPlatform(project)
-    Classpaths.inheritAssertJ(project)
-    testImplementation 'org.junit.jupiter:junit-jupiter'
+    testImplementation libs.assertj
+    testImplementation platform(libs.junit.bom)
+    testImplementation libs.junit.jupiter
 
     runtimeOnly project(':log-to-slf4j')
-    Classpaths.inheritLogbackClassic(project)
+    runtimeOnly libs.logback.classic
 }
 
 test {
diff --git a/java-client/barrage-examples/src/main/java/io/deephaven/client/examples/BarrageClientExampleBase.java b/java-client/barrage-examples/src/main/java/io/deephaven/client/examples/BarrageClientExampleBase.java
index 26dd4edf098..3902759b93f 100644
--- a/java-client/barrage-examples/src/main/java/io/deephaven/client/examples/BarrageClientExampleBase.java
+++ b/java-client/barrage-examples/src/main/java/io/deephaven/client/examples/BarrageClientExampleBase.java
@@ -6,6 +6,8 @@
 import io.deephaven.client.impl.BarrageSession;
 import io.deephaven.client.impl.BarrageSessionFactoryConfig;
 import io.deephaven.client.impl.BarrageSessionFactoryConfig.Factory;
+import io.deephaven.client.impl.ClientChannelFactory;
+import io.deephaven.client.impl.ClientChannelFactoryDefaulter;
 import io.deephaven.client.impl.SessionConfig;
 import io.deephaven.engine.context.ExecutionContext;
 import io.deephaven.engine.updategraph.impl.PeriodicUpdateGraph;
@@ -15,6 +17,7 @@
 import org.apache.arrow.memory.RootAllocator;
 import picocli.CommandLine.ArgGroup;
 
+import java.util.Collections;
 import java.util.concurrent.Callable;
 import java.util.concurrent.Executors;
 import java.util.concurrent.ScheduledExecutorService;
@@ -22,6 +25,10 @@
 
 abstract class BarrageClientExampleBase implements Callable<Void> {
 
+    private static final ClientChannelFactory CLIENT_CHANNEL_FACTORY = ClientChannelFactoryDefaulter.builder()
+            .userAgent(BarrageSessionFactoryConfig.userAgent(Collections.singletonList("deephaven-barrage-examples")))
+            .build();
+
     @ArgGroup(exclusive = false)
     ConnectOptions connectOptions;
 
@@ -36,6 +43,7 @@ public final Void call() throws Exception {
         final ScheduledExecutorService scheduler = Executors.newScheduledThreadPool(4);
         final Factory factory = BarrageSessionFactoryConfig.builder()
                 .clientConfig(ConnectOptions.options(connectOptions).config())
+                .clientChannelFactory(CLIENT_CHANNEL_FACTORY)
                 .allocator(bufferAllocator)
                 .scheduler(scheduler)
                 .build()
diff --git a/java-client/barrage-examples/src/main/java/io/deephaven/client/examples/SubscribeExampleBase.java b/java-client/barrage-examples/src/main/java/io/deephaven/client/examples/SubscribeExampleBase.java
index ca802d34111..d228fd41ca7 100644
--- a/java-client/barrage-examples/src/main/java/io/deephaven/client/examples/SubscribeExampleBase.java
+++ b/java-client/barrage-examples/src/main/java/io/deephaven/client/examples/SubscribeExampleBase.java
@@ -20,6 +20,7 @@
 import io.deephaven.util.annotations.ReferentialIntegrity;
 import picocli.CommandLine;
 
+import javax.annotation.OverridingMethodsMustInvokeSuper;
 import java.util.concurrent.CountDownLatch;
 
 abstract class SubscribeExampleBase extends BarrageClientExampleBase {
@@ -85,6 +86,7 @@ protected void execute(final BarrageSession client) throws Exception {
                     manage(tableRef);
                 }
 
+                @OverridingMethodsMustInvokeSuper
                 @Override
                 protected void destroy() {
                     super.destroy();
diff --git a/java-client/barrage/build.gradle b/java-client/barrage/build.gradle
index 4e9289efc00..429b139fcb2 100644
--- a/java-client/barrage/build.gradle
+++ b/java-client/barrage/build.gradle
@@ -3,11 +3,6 @@ plugins {
     id 'io.deephaven.project.register'
 }
 
-configurations {
-    implementation.extendsFrom irisDb
-    testImplementation.extendsFrom irisDbTest
-}
-
 description = 'The Deephaven Barrage Client'
 
 dependencies {
@@ -15,15 +10,16 @@ dependencies {
     api project(':extensions-barrage')
     implementation project(':log-factory')
 
-    compileOnly 'javax.inject:javax.inject:1'
+    compileOnly libs.javax.inject
 
-    Classpaths.inheritImmutables(project)
+    compileOnly project(':util-immutables')
+    annotationProcessor libs.immutables.value
 
-    Classpaths.inheritSlf4j(project, 'slf4j-api', 'implementation')
-    Classpaths.inheritSlf4j(project, 'slf4j-simple', 'testRuntimeOnly')
+    implementation libs.slf4j.api
+    testRuntimeOnly libs.slf4j.simple
     testRuntimeOnly project(':log-to-slf4j')
 
-    Classpaths.inheritJUnitPlatform(project)
-    Classpaths.inheritAssertJ(project)
-    testImplementation 'org.junit.jupiter:junit-jupiter'
+    testImplementation libs.assertj
+    testImplementation platform(libs.junit.bom)
+    testImplementation libs.junit.jupiter
 }
diff --git a/java-client/barrage/src/main/java/io/deephaven/client/impl/BarrageSessionFactoryConfig.java b/java-client/barrage/src/main/java/io/deephaven/client/impl/BarrageSessionFactoryConfig.java
index 502d2906f74..f825f9cff06 100644
--- a/java-client/barrage/src/main/java/io/deephaven/client/impl/BarrageSessionFactoryConfig.java
+++ b/java-client/barrage/src/main/java/io/deephaven/client/impl/BarrageSessionFactoryConfig.java
@@ -4,34 +4,68 @@
 package io.deephaven.client.impl;
 
 import io.deephaven.annotations.BuildableStyle;
+import io.deephaven.barrage.flatbuf.BarrageMessageWrapper;
+import io.deephaven.client.grpc.UserAgentUtility;
 import io.grpc.ManagedChannel;
 import org.apache.arrow.memory.BufferAllocator;
 import org.immutables.value.Value.Default;
 import org.immutables.value.Value.Immutable;
 
+import java.util.Collections;
+import java.util.List;
 import java.util.Objects;
 import java.util.concurrent.ScheduledExecutorService;
+import java.util.stream.Collectors;
+import java.util.stream.Stream;
 
 @Immutable
 @BuildableStyle
 public abstract class BarrageSessionFactoryConfig {
     private static final SessionConfig SESSION_CONFIG_EMPTY = SessionConfig.builder().build();
 
+    static final List<String> VERSION_PROPERTIES = Collections.unmodifiableList(Stream.concat(
+            FlightSessionFactoryConfig.VERSION_PROPERTIES.stream(),
+            Stream.of(UserAgentUtility.versionProperty("barrage", BarrageMessageWrapper.class)))
+            .collect(Collectors.toUnmodifiableList()));
+
+    private static final String DEEPHAVEN_JAVA_CLIENT_BARRAGE = "deephaven-java-client-barrage";
+
+    private static final ClientChannelFactory CLIENT_CHANNEL_FACTORY = ClientChannelFactoryDefaulter.builder()
+            .userAgent(userAgent(List.of(DEEPHAVEN_JAVA_CLIENT_BARRAGE)))
+            .build();
+
     public static Builder builder() {
         return ImmutableBarrageSessionFactoryConfig.builder();
     }
 
+    /**
+     * Constructs a <a href="https://github.com/grpc/grpc/blob/master/doc/PROTOCOL-HTTP2.md#user-agents">grpc
+     * user-agent</a> with {@code grpc-java}, {@code deephaven}, {@code flight}, and {@code barrage} versions, with the
+     * addition of {@code extraProperties}.
+     *
+     * @param extraProperties the extra properties
+     * @return the user-agent
+     * @see UserAgentUtility#userAgent(List)
+     */
+    public static String userAgent(List<String> extraProperties) {
+        return UserAgentUtility.userAgent(Stream.concat(
+                VERSION_PROPERTIES.stream(),
+                extraProperties.stream())
+                .collect(Collectors.toList()));
+    }
+
     /**
      * The client configuration.
      */
     public abstract ClientConfig clientConfig();
 
     /**
-     * The client channel factory. By default is {@link ClientChannelFactory#defaultInstance()}.
+     * The client channel factory. By default, is a factory that sets a user-agent which includes relevant versions (see
+     * {@link #userAgent(List)}) and the property {@value DEEPHAVEN_JAVA_CLIENT_BARRAGE}.
      */
     @Default
     public ClientChannelFactory clientChannelFactory() {
-        return ClientChannelFactory.defaultInstance();
+        return CLIENT_CHANNEL_FACTORY;
     }
 
     /**
diff --git a/java-client/barrage/src/main/java/io/deephaven/client/impl/BarrageSnapshotImpl.java b/java-client/barrage/src/main/java/io/deephaven/client/impl/BarrageSnapshotImpl.java
index 6310f2cab1f..1413216455d 100644
--- a/java-client/barrage/src/main/java/io/deephaven/client/impl/BarrageSnapshotImpl.java
+++ b/java-client/barrage/src/main/java/io/deephaven/client/impl/BarrageSnapshotImpl.java
@@ -5,6 +5,7 @@
 
 import com.google.flatbuffers.FlatBufferBuilder;
 import com.google.protobuf.ByteStringAccess;
+import com.google.rpc.Code;
 import io.deephaven.UncheckedDeephavenException;
 import io.deephaven.barrage.flatbuf.*;
 import io.deephaven.base.log.LogOutput;
@@ -14,7 +15,6 @@
 import io.deephaven.engine.rowset.RowSet;
 import io.deephaven.engine.rowset.RowSetFactory;
 import io.deephaven.engine.table.Table;
-import io.deephaven.engine.table.TableDefinition;
 import io.deephaven.engine.table.impl.locations.TableDataException;
 import io.deephaven.engine.table.impl.util.BarrageMessage;
 import io.deephaven.extensions.barrage.BarrageSnapshotOptions;
@@ -22,12 +22,12 @@
 import io.deephaven.extensions.barrage.util.*;
 import io.deephaven.internal.log.LoggerFactory;
 import io.deephaven.io.logger.Logger;
-import io.deephaven.qst.table.TableLabelVisitor;
-import io.deephaven.qst.table.TicketTable;
+import io.deephaven.proto.util.Exceptions;
 import io.grpc.CallOptions;
 import io.grpc.ClientCall;
 import io.grpc.Context;
 import io.grpc.MethodDescriptor;
+import io.grpc.StatusRuntimeException;
 import io.grpc.protobuf.ProtoUtils;
 import io.grpc.stub.ClientCallStreamObserver;
 import io.grpc.stub.ClientCalls;
@@ -37,6 +37,7 @@
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
+import javax.annotation.OverridingMethodsMustInvokeSuper;
 import java.io.InputStream;
 import java.nio.ByteBuffer;
 import java.util.BitSet;
@@ -56,15 +57,16 @@ public class BarrageSnapshotImpl extends ReferenceCountedLivenessNode implements
     private static final Logger log = LoggerFactory.getLogger(BarrageSnapshotImpl.class);
 
     private final String logName;
+    private final ScheduledExecutorService executorService;
     private final TableHandle tableHandle;
     private final BarrageSnapshotOptions options;
     private final ClientCallStreamObserver<FlightData> observer;
+    private final BarrageUtil.ConvertedArrowSchema schema;
+    private final BarrageStreamReader barrageStreamReader;
 
-    private final BarrageTable resultTable;
+    private volatile BarrageTable resultTable;
     private final CompletableFuture<Table> future;
 
-    private volatile BitSet expectedColumns;
-
     private volatile int connected = 1;
     private static final AtomicIntegerFieldUpdater<BarrageSnapshotImpl> CONNECTED_UPDATER =
             AtomicIntegerFieldUpdater.newUpdater(BarrageSnapshotImpl.class, "connected");
@@ -86,18 +88,17 @@ public class BarrageSnapshotImpl extends ReferenceCountedLivenessNode implements
         super(false);
 
         this.logName = tableHandle.exportId().toString();
+        this.executorService = executorService;
         this.options = options;
         this.tableHandle = tableHandle;
 
-        final BarrageUtil.ConvertedArrowSchema schema = BarrageUtil.convertArrowSchema(tableHandle.response());
-        final TableDefinition tableDefinition = schema.tableDef;
-        resultTable = BarrageTable.make(executorService, tableDefinition, schema.attributes, new CheckForCompletion());
+        schema = BarrageUtil.convertArrowSchema(tableHandle.response());
         future = new SnapshotCompletableFuture();
 
+        barrageStreamReader = new BarrageStreamReader();
         final MethodDescriptor<FlightData, BarrageMessage> snapshotDescriptor =
                 getClientDoExchangeDescriptor(options, schema.computeWireChunkTypes(), schema.computeWireTypes(),
-                        schema.computeWireComponentTypes(),
-                        new BarrageStreamReader(resultTable.getDeserializationTmConsumer()));
+                        schema.computeWireComponentTypes(), barrageStreamReader);
 
         // We need to ensure that the DoExchange RPC does not get attached to the server RPC when this is being called
         // from a Deephaven server RPC thread. If we need to generalize this in the future, we may wrap this logic in a
@@ -149,7 +150,17 @@ public void onNext(final BarrageMessage barrageMessage) {
 
                 rowsReceived += resultSize;
 
-                resultTable.handleBarrageMessage(barrageMessage);
+                final BarrageTable localResultTable = resultTable;
+                if (localResultTable == null) {
+                    log.error().append(BarrageSnapshotImpl.this)
+                            .append(": Received data before snapshot was requested").endl();
+                    final StatusRuntimeException sre = Exceptions.statusRuntimeException(
+                            Code.FAILED_PRECONDITION, "Received data before snapshot was requested");
+                    GrpcUtil.safelyError(observer, sre);
+                    future.completeExceptionally(sre);
+                    return;
+                }
+                localResultTable.handleBarrageMessage(barrageMessage);
             }
         }
 
@@ -163,15 +174,16 @@ public void onError(final Throwable t) {
                     .append(": Error detected in snapshot: ")
                     .append(t).endl();
 
-            final String label = tableHandle.export().table().walk(new TableLabelVisitor() {
-                @Override
-                public String visit(TicketTable ticketTable) {
-                    return BarrageSubscriptionImpl.nameForTableTicket(ticketTable);
-                }
-            });
-            // this error will always be propagated to our CheckForCompletion#onError callback
-            resultTable.handleBarrageError(new TableDataException(
-                    String.format("Barrage snapshot error for %s (%s)", logName, label), t));
+            final String label = TableSpecLabeler.of(tableHandle.export().table());
+            final TableDataException tde = new TableDataException(
+                    String.format("Barrage snapshot error for %s (%s)", logName, label), t);
+            final BarrageTable localResultTable = resultTable;
+            if (localResultTable != null) {
+                // this error will always be propagated to our CheckForCompletion#onError callback
+                localResultTable.handleBarrageError(tde);
+            } else {
+                future.completeExceptionally(tde);
+            }
             cleanup();
         }
 
@@ -181,7 +193,17 @@ public void onCompleted() {
                 return;
             }
 
-            future.complete(resultTable);
+            final BarrageTable localResultTable = resultTable;
+            if (localResultTable == null) {
+                log.error().append(BarrageSnapshotImpl.this)
+                        .append(": Received onComplete before snapshot was requested").endl();
+                final StatusRuntimeException sre = Exceptions.statusRuntimeException(
+                        Code.FAILED_PRECONDITION, "Received onComplete before snapshot was requested");
+                GrpcUtil.safelyError(observer, sre);
+                future.completeExceptionally(sre);
+                return;
+            }
+            future.complete(localResultTable);
             cleanup();
         }
     }
@@ -209,8 +231,11 @@ public Future<Table> partialTable(
             alreadyUsed = true;
         }
 
-        // store this for streamreader parser
-        expectedColumns = columns;
+        final boolean isFullSubscription = viewport == null;
+        final BarrageTable localResultTable = BarrageTable.make(
+                executorService, schema.tableDef, schema.attributes, isFullSubscription, new CheckForCompletion());
+        resultTable = localResultTable;
+        barrageStreamReader.setDeserializeTmConsumer(localResultTable.getDeserializationTmConsumer());
 
         // Send the snapshot request:
         observer.onNext(FlightData.newBuilder()
@@ -230,6 +255,7 @@ private boolean tryRecordDisconnect() {
         return CONNECTED_UPDATER.compareAndSet(this, 1, 0);
     }
 
+    @OverridingMethodsMustInvokeSuper
     @Override
     protected void destroy() {
         super.destroy();
@@ -327,7 +353,7 @@ public MethodDescriptor<FlightData, BarrageMessage> getClientDoExchangeDescripto
                 .build();
     }
 
-    private class BarrageDataMarshaller implements MethodDescriptor.Marshaller<BarrageMessage> {
+    private static class BarrageDataMarshaller implements MethodDescriptor.Marshaller<BarrageMessage> {
         private final BarrageSnapshotOptions options;
         private final ChunkType[] columnChunkTypes;
         private final Class<?>[] columnTypes;
@@ -355,8 +381,7 @@ public InputStream stream(final BarrageMessage value) {
 
         @Override
         public BarrageMessage parse(final InputStream stream) {
-            return streamReader.safelyParseFrom(options, expectedColumns, columnChunkTypes, columnTypes, componentTypes,
-                    stream);
+            return streamReader.safelyParseFrom(options, columnChunkTypes, columnTypes, componentTypes, stream);
         }
     }
 
@@ -372,7 +397,6 @@ public void onError(@NotNull final Throwable t) {
         }
     }
 
-
     /**
      * The Completable Future is used to encapsulate the concept that the table is filled with requested data.
      */
diff --git a/java-client/barrage/src/main/java/io/deephaven/client/impl/BarrageSubscriptionImpl.java b/java-client/barrage/src/main/java/io/deephaven/client/impl/BarrageSubscriptionImpl.java
index 28d844780c4..f53ea3f4763 100644
--- a/java-client/barrage/src/main/java/io/deephaven/client/impl/BarrageSubscriptionImpl.java
+++ b/java-client/barrage/src/main/java/io/deephaven/client/impl/BarrageSubscriptionImpl.java
@@ -5,6 +5,7 @@
 
 import com.google.flatbuffers.FlatBufferBuilder;
 import com.google.protobuf.ByteStringAccess;
+import com.google.rpc.Code;
 import io.deephaven.UncheckedDeephavenException;
 import io.deephaven.barrage.flatbuf.BarrageMessageType;
 import io.deephaven.barrage.flatbuf.BarrageMessageWrapper;
@@ -16,7 +17,6 @@
 import io.deephaven.engine.rowset.RowSet;
 import io.deephaven.engine.rowset.WritableRowSet;
 import io.deephaven.engine.table.Table;
-import io.deephaven.engine.table.TableDefinition;
 import io.deephaven.engine.table.impl.locations.TableDataException;
 import io.deephaven.engine.table.impl.util.BarrageMessage;
 import io.deephaven.engine.updategraph.DynamicNode;
@@ -27,28 +27,24 @@
 import io.deephaven.extensions.barrage.util.*;
 import io.deephaven.internal.log.LoggerFactory;
 import io.deephaven.io.logger.Logger;
-import io.deephaven.proto.util.ApplicationTicketHelper;
-import io.deephaven.proto.util.ExportTicketHelper;
-import io.deephaven.proto.util.ScopeTicketHelper;
-import io.deephaven.proto.util.SharedTicketHelper;
-import io.deephaven.qst.table.TableLabelVisitor;
-import io.deephaven.qst.table.TicketTable;
+import io.deephaven.proto.util.Exceptions;
 import io.deephaven.util.annotations.FinalDefault;
 import io.deephaven.util.annotations.VisibleForTesting;
 import io.grpc.CallOptions;
 import io.grpc.ClientCall;
 import io.grpc.Context;
 import io.grpc.MethodDescriptor;
+import io.grpc.StatusRuntimeException;
 import io.grpc.protobuf.ProtoUtils;
 import io.grpc.stub.ClientCallStreamObserver;
 import io.grpc.stub.ClientCalls;
 import io.grpc.stub.ClientResponseObserver;
 import org.apache.arrow.flight.impl.Flight.FlightData;
 import org.apache.arrow.flight.impl.FlightServiceGrpc;
-import org.apache.commons.codec.binary.Hex;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
+import javax.annotation.OverridingMethodsMustInvokeSuper;
 import java.io.InputStream;
 import java.nio.ByteBuffer;
 import java.util.BitSet;
@@ -70,7 +66,10 @@ public class BarrageSubscriptionImpl extends ReferenceCountedLivenessNode implem
     private final BarrageSubscriptionOptions options;
     private final ClientCallStreamObserver<FlightData> observer;
     private final CheckForCompletion checkForCompletion;
-    private final BarrageTable resultTable;
+    private final BarrageUtil.ConvertedArrowSchema schema;
+    private final ScheduledExecutorService executorService;
+    private final BarrageStreamReader barrageStreamReader;
+    private volatile BarrageTable resultTable;
 
     private LivenessScope constructionScope;
     private volatile FutureAdapter future;
@@ -101,17 +100,16 @@ public class BarrageSubscriptionImpl extends ReferenceCountedLivenessNode implem
         this.logName = tableHandle.exportId().toString();
         this.tableHandle = tableHandle;
         this.options = options;
+        this.executorService = executorService;
         this.constructionScope = constructionScope;
 
-        final BarrageUtil.ConvertedArrowSchema schema = BarrageUtil.convertArrowSchema(tableHandle.response());
-        final TableDefinition tableDefinition = schema.tableDef;
+        schema = BarrageUtil.convertArrowSchema(tableHandle.response());
         checkForCompletion = new CheckForCompletion();
-        resultTable = BarrageTable.make(executorService, tableDefinition, schema.attributes, checkForCompletion);
 
+        barrageStreamReader = new BarrageStreamReader();
         final MethodDescriptor<FlightData, BarrageMessage> subscribeDescriptor =
                 getClientDoExchangeDescriptor(options, schema.computeWireChunkTypes(), schema.computeWireTypes(),
-                        schema.computeWireComponentTypes(),
-                        new BarrageStreamReader(resultTable.getDeserializationTmConsumer()));
+                        schema.computeWireComponentTypes(), barrageStreamReader);
 
         // We need to ensure that the DoExchange RPC does not get attached to the server RPC when this is being called
         // from a Deephaven server RPC thread. If we need to generalize this in the future, we may wrap this logic in a
@@ -148,7 +146,17 @@ public void onNext(final BarrageMessage barrageMessage) {
                     return;
                 }
 
-                resultTable.handleBarrageMessage(barrageMessage);
+                final BarrageTable localResultTable = resultTable;
+                if (localResultTable == null) {
+                    log.error().append(BarrageSubscriptionImpl.this)
+                            .append(": Received data before subscription was requested").endl();
+                    final StatusRuntimeException sre = Exceptions.statusRuntimeException(
+                            Code.FAILED_PRECONDITION, "Received data before subscription was requested");
+                    GrpcUtil.safelyError(observer, sre);
+                    checkForCompletion.onError(sre);
+                    return;
+                }
+                localResultTable.handleBarrageMessage(barrageMessage);
             }
         }
 
@@ -162,14 +170,16 @@ public void onError(final Throwable t) {
                     .append(": Error detected in subscription: ")
                     .append(t).endl();
 
-            final String label = tableHandle.export().table().walk(new TableLabelVisitor() {
-                @Override
-                public String visit(TicketTable ticketTable) {
-                    return nameForTableTicket(ticketTable);
-                }
-            });
-            resultTable.handleBarrageError(new TableDataException(
-                    String.format("Barrage subscription error for %s (%s)", logName, label), t));
+            final String label = TableSpecLabeler.of(tableHandle.export().table());
+            final TableDataException tde = new TableDataException(
+                    String.format("Barrage subscription error for %s (%s)", logName, label), t);
+            final BarrageTable localResultTable = resultTable;
+            if (localResultTable != null) {
+                // this error will always be propagated to our CheckForCompletion#onError callback
+                localResultTable.handleBarrageError(tde);
+            } else {
+                checkForCompletion.onError(tde);
+            }
             cleanup();
         }
 
@@ -180,36 +190,16 @@ public void onCompleted() {
             }
 
             log.error().append(BarrageSubscriptionImpl.this).append(": unexpectedly closed by other host").endl();
-            resultTable.handleBarrageError(new RequestCancelledException("Barrage subscription closed by server"));
-            cleanup();
-        }
-    }
-
-    static String nameForTableTicket(TicketTable table) {
-        byte[] ticket = table.ticket();
-        if (ticket.length == 0) {
-            return "ticketTable(EMPTY)";
-        }
-
-        // We'll try our best to decode the ticket, but it's not guaranteed to be a well-known ticket route.
-        try {
-            switch (ticket[0]) {
-                case 'a':
-                    return ApplicationTicketHelper.toReadableString(ticket);
-                case 's':
-                    return ScopeTicketHelper.toReadableString(ticket);
-                case 'e':
-                    return ExportTicketHelper.toReadableString(ByteBuffer.wrap(ticket), "TicketTable");
-                case 'h':
-                    return SharedTicketHelper.toReadableString(ticket);
-                default:
-                    break;
+            final RequestCancelledException cancelErr =
+                    new RequestCancelledException("Barrage subscription closed by server");
+            final BarrageTable localResultTable = resultTable;
+            if (localResultTable != null) {
+                localResultTable.handleBarrageError(cancelErr);
+            } else {
+                checkForCompletion.onError(cancelErr);
             }
-        } catch (Exception err) {
-            // ignore - let's just return the hex representation
+            cleanup();
         }
-
-        return "ticketTable(0x" + Hex.encodeHexString(ticket) + ")";
     }
 
     @Override
@@ -247,11 +237,16 @@ public Future<Table> partialTable(RowSet viewport, BitSet columns, boolean rever
             subscribed = true;
         }
 
+        boolean isFullSubscription = viewport == null;
+        final BarrageTable localResultTable = BarrageTable.make(
+                executorService, schema.tableDef, schema.attributes, isFullSubscription, checkForCompletion);
+        resultTable = localResultTable;
+
         // we must create the future before checking `isConnected` to guarantee `future` visibility in `destroy`
         if (isSnapshot) {
             future = new CompletableFutureAdapter();
         } else {
-            future = new UpdateGraphAwareFutureAdapter(resultTable.getUpdateGraph());
+            future = new UpdateGraphAwareFutureAdapter(localResultTable.getUpdateGraph());
         }
 
         if (!isConnected()) {
@@ -264,9 +259,11 @@ public Future<Table> partialTable(RowSet viewport, BitSet columns, boolean rever
                 columns == null ? null : (BitSet) (columns.clone()),
                 reverseViewport);
 
+        barrageStreamReader.setDeserializeTmConsumer(localResultTable.getDeserializationTmConsumer());
+
         if (!isSnapshot) {
-            resultTable.addSourceToRegistrar();
-            resultTable.addParentReference(this);
+            localResultTable.addSourceToRegistrar();
+            localResultTable.addParentReference(this);
         }
 
         // Send the initial subscription:
@@ -293,6 +290,7 @@ private void onFutureComplete() {
         }
     }
 
+    @OverridingMethodsMustInvokeSuper
     @Override
     protected void destroy() {
         super.destroy();
@@ -308,9 +306,10 @@ private void cancel(final String reason) {
             return;
         }
 
-        if (!isSnapshot) {
+        final BarrageTable localResultTable = resultTable;
+        if (!isSnapshot && localResultTable != null) {
             // Stop our result table from processing any more data.
-            resultTable.forceReferenceCountToZero();
+            localResultTable.forceReferenceCountToZero();
         }
         GrpcUtil.safelyCancel(observer, "Barrage subscription is " + reason,
                 new RequestCancelledException("Barrage subscription is " + reason));
@@ -429,7 +428,7 @@ public InputStream stream(final BarrageMessage value) {
 
         @Override
         public BarrageMessage parse(final InputStream stream) {
-            return streamReader.safelyParseFrom(options, null, columnChunkTypes, columnTypes, componentTypes, stream);
+            return streamReader.safelyParseFrom(options, columnChunkTypes, columnTypes, componentTypes, stream);
         }
     }
 
@@ -453,11 +452,12 @@ public synchronized boolean viewportChanged(
                 return false;
             }
 
+            final BarrageTable localResultTable = resultTable;
             // @formatter:off
             final boolean correctColumns =
                     // all columns are expected
                     (expectedColumns == null
-                        && (serverColumns == null || serverColumns.cardinality() == resultTable.numColumns()))
+                        && (serverColumns == null || serverColumns.cardinality() == localResultTable.numColumns()))
                     // only specific set of columns are expected
                     || (expectedColumns != null && expectedColumns.equals(serverColumns));
 
@@ -466,7 +466,7 @@ public synchronized boolean viewportChanged(
                     (correctColumns && expectedViewport == null && serverViewport == null)
                     // Viewport subscription is completed
                     || (correctColumns && expectedViewport != null
-                        && expectedReverseViewport == resultTable.getServerReverseViewport()
+                        && expectedReverseViewport == localResultTable.getServerReverseViewport()
                         && expectedViewport.equals(serverViewport));
             // @formatter:on
 
@@ -474,14 +474,14 @@ public synchronized boolean viewportChanged(
                 // remove all unpopulated rows from viewport snapshots
                 if (isSnapshot && serverViewport != null) {
                     // noinspection resource
-                    WritableRowSet currentRowSet = resultTable.getRowSet().writableCast();
+                    final WritableRowSet currentRowSet = localResultTable.getRowSet().writableCast();
                     try (final RowSet populated =
                             currentRowSet.subSetForPositions(serverViewport, serverReverseViewport)) {
                         currentRowSet.retain(populated);
                     }
                 }
 
-                if (future.complete(resultTable)) {
+                if (future.complete(localResultTable)) {
                     onFutureComplete();
                 }
             }
diff --git a/java-client/barrage/src/main/java/io/deephaven/client/impl/TableSpecLabeler.java b/java-client/barrage/src/main/java/io/deephaven/client/impl/TableSpecLabeler.java
new file mode 100644
index 00000000000..4e2c119d89a
--- /dev/null
+++ b/java-client/barrage/src/main/java/io/deephaven/client/impl/TableSpecLabeler.java
@@ -0,0 +1,57 @@
+//
+// Copyright (c) 2016-2024 Deephaven Data Labs and Patent Pending
+//
+package io.deephaven.client.impl;
+
+import io.deephaven.proto.util.ApplicationTicketHelper;
+import io.deephaven.proto.util.ExportTicketHelper;
+import io.deephaven.proto.util.ScopeTicketHelper;
+import io.deephaven.proto.util.SharedTicketHelper;
+import io.deephaven.qst.table.TableLabelVisitor;
+import io.deephaven.qst.table.TableSpec;
+import io.deephaven.qst.table.TicketTable;
+import org.apache.commons.codec.binary.Hex;
+
+import java.nio.ByteBuffer;
+
+final class TableSpecLabeler extends TableLabelVisitor {
+    private static final TableSpecLabeler INSTANCE = new TableSpecLabeler();
+
+    public static String of(TableSpec tableSpec) {
+        return tableSpec.walk(INSTANCE);
+    }
+
+    private TableSpecLabeler() {}
+
+    static String nameForTableTicket(TicketTable table) {
+        byte[] ticket = table.ticket();
+        if (ticket.length == 0) {
+            return "ticketTable(EMPTY)";
+        }
+
+        // We'll try our best to decode the ticket, but it's not guaranteed to be a well-known ticket route.
+        try {
+            switch (ticket[0]) {
+                case 'a':
+                    return ApplicationTicketHelper.toReadableString(ticket);
+                case 's':
+                    return ScopeTicketHelper.toReadableString(ticket);
+                case 'e':
+                    return ExportTicketHelper.toReadableString(ByteBuffer.wrap(ticket), "TicketTable");
+                case 'h':
+                    return SharedTicketHelper.toReadableString(ticket);
+                default:
+                    break;
+            }
+        } catch (Exception err) {
+            // ignore - let's just return the hex representation
+        }
+
+        return "ticketTable(0x" + Hex.encodeHexString(ticket) + ")";
+    }
+
+    @Override
+    public String visit(TicketTable ticketTable) {
+        return nameForTableTicket(ticketTable);
+    }
+}
diff --git a/java-client/example-utilities/build.gradle b/java-client/example-utilities/build.gradle
index 9f1dba0d177..4ed0a1cab8c 100644
--- a/java-client/example-utilities/build.gradle
+++ b/java-client/example-utilities/build.gradle
@@ -4,9 +4,9 @@ plugins {
 }
 
 dependencies {
-    api 'info.picocli:picocli:4.6.1'
+    api libs.picocli
     api project(':java-client-session')
 
-    Classpaths.inheritGrpcPlatform(project, 'api')
-    api 'io.grpc:grpc-api'
+    api platform(libs.grpc.bom)
+    api libs.grpc.api
 }
diff --git a/java-client/flight-dagger/build.gradle b/java-client/flight-dagger/build.gradle
index dc2f030f9b7..bbf62bb5ba0 100644
--- a/java-client/flight-dagger/build.gradle
+++ b/java-client/flight-dagger/build.gradle
@@ -9,10 +9,11 @@ dependencies {
     api project(':java-client-flight')
     api project(':java-client-session-dagger')
 
-    Classpaths.inheritDagger(project)
+    implementation libs.dagger
+    annotationProcessor libs.dagger.compiler
 
-    Classpaths.inheritSlf4j(project, 'slf4j-api', 'implementation')
-    Classpaths.inheritSlf4j(project, 'slf4j-simple', 'testRuntimeOnly')
+    implementation libs.slf4j.api
+    testRuntimeOnly libs.slf4j.simple
 
     // Unable to use newer junit here because of test-libs/junit-wall-4.11.jar
     /*
@@ -23,7 +24,7 @@ dependencies {
     testImplementation 'junit:junit:4.13.2'
     */
 
-    Classpaths.inheritAssertJ(project)
+    testImplementation libs.assertj
 
     testImplementation project(':server')
     testImplementation project(':server-test-utils')
diff --git a/java-client/flight-dagger/gradle.properties b/java-client/flight-dagger/gradle.properties
index 9e8588f2620..c186bbfdde1 100644
--- a/java-client/flight-dagger/gradle.properties
+++ b/java-client/flight-dagger/gradle.properties
@@ -1,2 +1 @@
 io.deephaven.project.ProjectType=JAVA_PUBLIC
-languageLevel=8
diff --git a/java-client/flight-examples/build.gradle b/java-client/flight-examples/build.gradle
index bae95faa3ec..1f1436acd80 100644
--- a/java-client/flight-examples/build.gradle
+++ b/java-client/flight-examples/build.gradle
@@ -7,14 +7,14 @@ dependencies {
     implementation project(':java-client-flight')
     implementation project(':java-client-example-utilities')
 
-    implementation "io.deephaven.barrage:barrage-format:0.6.0"
+    implementation libs.deephaven.barrage.format
 
-    Classpaths.inheritJUnitPlatform(project)
-    Classpaths.inheritAssertJ(project)
-    testImplementation 'org.junit.jupiter:junit-jupiter'
+    testImplementation libs.assertj
+    testImplementation platform(libs.junit.bom)
+    testImplementation libs.junit.jupiter
 
-    Classpaths.inheritSlf4j(project, 'slf4j-api', 'implementation')
-    Classpaths.inheritLogbackClassic(project)
+    implementation libs.slf4j.api
+    runtimeOnly libs.logback.classic
 }
 
 test {
diff --git a/java-client/flight-examples/src/main/java/io/deephaven/client/examples/DoExchange.java b/java-client/flight-examples/src/main/java/io/deephaven/client/examples/DoExchange.java
index 61ff7d96b58..6a957222000 100644
--- a/java-client/flight-examples/src/main/java/io/deephaven/client/examples/DoExchange.java
+++ b/java-client/flight-examples/src/main/java/io/deephaven/client/examples/DoExchange.java
@@ -4,7 +4,6 @@
 package io.deephaven.client.examples;
 
 import com.google.flatbuffers.FlatBufferBuilder;
-import com.google.protobuf.ByteString;
 import io.deephaven.client.impl.FlightSession;
 import io.deephaven.proto.util.ScopeTicketHelper;
 import org.apache.arrow.flight.FlightClient;
@@ -44,9 +43,7 @@ protected void execute(FlightSession flight) throws Exception {
             final FlatBufferBuilder metadata = new FlatBufferBuilder();
 
             // you can use 0 for batch size and max message size to use server-side defaults
-            int optOffset =
-                    BarrageSnapshotOptions.createBarrageSnapshotOptions(metadata, ColumnConversionMode.Stringify,
-                            false, 0, 0);
+            int optOffset = BarrageSnapshotOptions.createBarrageSnapshotOptions(metadata, false, 0, 0, 0);
 
             final int ticOffset =
                     BarrageSnapshotRequest.createTicketVector(metadata,
diff --git a/java-client/flight-examples/src/main/java/io/deephaven/client/examples/DoPutSpray.java b/java-client/flight-examples/src/main/java/io/deephaven/client/examples/DoPutSpray.java
index 965bda06736..dfa33deb824 100644
--- a/java-client/flight-examples/src/main/java/io/deephaven/client/examples/DoPutSpray.java
+++ b/java-client/flight-examples/src/main/java/io/deephaven/client/examples/DoPutSpray.java
@@ -26,6 +26,8 @@
 import java.util.concurrent.TimeUnit;
 import java.util.concurrent.TimeoutException;
 
+import static io.deephaven.client.examples.FlightExampleBase.CLIENT_CHANNEL_FACTORY;
+
 @Command(name = "do-put-spray", mixinStandardHelpOptions = true,
         description = "Do Put Spray", version = "0.1.0")
 class DoPutSpray implements Callable<Void> {
@@ -48,6 +50,7 @@ public Void call() throws Exception {
 
         final Factory sourceFactory = FlightSessionFactoryConfig.builder()
                 .clientConfig(source.config())
+                .clientChannelFactory(CLIENT_CHANNEL_FACTORY)
                 .allocator(bufferAllocator)
                 .scheduler(scheduler)
                 .build()
@@ -62,6 +65,7 @@ public Void call() throws Exception {
                 for (ConnectOptions other : connects.subList(1, connects.size())) {
                     final Factory otherFactory = FlightSessionFactoryConfig.builder()
                             .clientConfig(other.config())
+                            .clientChannelFactory(CLIENT_CHANNEL_FACTORY)
                             .allocator(bufferAllocator)
                             .scheduler(scheduler)
                             .build()
diff --git a/java-client/flight-examples/src/main/java/io/deephaven/client/examples/FlightExampleBase.java b/java-client/flight-examples/src/main/java/io/deephaven/client/examples/FlightExampleBase.java
index b248e2bb5aa..b71805fe64e 100644
--- a/java-client/flight-examples/src/main/java/io/deephaven/client/examples/FlightExampleBase.java
+++ b/java-client/flight-examples/src/main/java/io/deephaven/client/examples/FlightExampleBase.java
@@ -3,6 +3,8 @@
 //
 package io.deephaven.client.examples;
 
+import io.deephaven.client.impl.ClientChannelFactory;
+import io.deephaven.client.impl.ClientChannelFactoryDefaulter;
 import io.deephaven.client.impl.FlightSession;
 import io.deephaven.client.impl.FlightSessionFactoryConfig;
 import io.deephaven.client.impl.FlightSessionFactoryConfig.Factory;
@@ -12,6 +14,7 @@
 import org.apache.arrow.memory.RootAllocator;
 import picocli.CommandLine.ArgGroup;
 
+import java.util.Collections;
 import java.util.concurrent.Callable;
 import java.util.concurrent.Executors;
 import java.util.concurrent.ScheduledExecutorService;
@@ -19,6 +22,10 @@
 
 abstract class FlightExampleBase implements Callable<Void> {
 
+    static final ClientChannelFactory CLIENT_CHANNEL_FACTORY = ClientChannelFactoryDefaulter.builder()
+            .userAgent(FlightSessionFactoryConfig.userAgent(Collections.singletonList("deephaven-flight-examples")))
+            .build();
+
     @ArgGroup(exclusive = false)
     ConnectOptions connectOptions;
 
@@ -34,6 +41,7 @@ public final Void call() throws Exception {
         ScheduledExecutorService scheduler = Executors.newScheduledThreadPool(4);
         final Factory factory = FlightSessionFactoryConfig.builder()
                 .clientConfig(ConnectOptions.options(connectOptions).config())
+                .clientChannelFactory(CLIENT_CHANNEL_FACTORY)
                 .allocator(bufferAllocator)
                 .scheduler(scheduler)
                 .build()
diff --git a/java-client/flight/build.gradle b/java-client/flight/build.gradle
index 93cc54e21a9..20f1a66aadd 100644
--- a/java-client/flight/build.gradle
+++ b/java-client/flight/build.gradle
@@ -9,16 +9,17 @@ dependencies {
     api project(':java-client-session')
     implementation project(':proto:proto-backplane-grpc-flight')
 
-    Classpaths.inheritArrow(project, 'flight-core', 'api')
-    Classpaths.inheritArrow(project, 'flight-grpc', 'implementation')
-    Classpaths.inheritArrow(project, 'arrow-vector', 'api')
-    Classpaths.inheritAutoService(project)
+    api libs.arrow.flight.core
+    api libs.arrow.vector
+    compileOnly libs.autoservice
+    annotationProcessor libs.autoservice.compiler
 
-    Classpaths.inheritImmutables(project)
+    compileOnly project(':util-immutables')
+    annotationProcessor libs.immutables.value
 
-    Classpaths.inheritJUnitPlatform(project)
-    Classpaths.inheritAssertJ(project)
-    testImplementation 'org.junit.jupiter:junit-jupiter'
+    testImplementation libs.assertj
+    testImplementation platform(libs.junit.bom)
+    testImplementation libs.junit.jupiter
 }
 
 test {
diff --git a/java-client/flight/gradle.properties b/java-client/flight/gradle.properties
index 9e8588f2620..c186bbfdde1 100644
--- a/java-client/flight/gradle.properties
+++ b/java-client/flight/gradle.properties
@@ -1,2 +1 @@
 io.deephaven.project.ProjectType=JAVA_PUBLIC
-languageLevel=8
diff --git a/java-client/flight/src/main/java/io/deephaven/client/impl/FlightSessionFactoryConfig.java b/java-client/flight/src/main/java/io/deephaven/client/impl/FlightSessionFactoryConfig.java
index b1b2d3411ee..da94737bc70 100644
--- a/java-client/flight/src/main/java/io/deephaven/client/impl/FlightSessionFactoryConfig.java
+++ b/java-client/flight/src/main/java/io/deephaven/client/impl/FlightSessionFactoryConfig.java
@@ -4,35 +4,68 @@
 package io.deephaven.client.impl;
 
 import io.deephaven.annotations.BuildableStyle;
+import io.deephaven.client.grpc.UserAgentUtility;
 import io.grpc.ManagedChannel;
+import org.apache.arrow.flight.impl.Flight;
 import org.apache.arrow.memory.BufferAllocator;
 import org.immutables.value.Value.Default;
 import org.immutables.value.Value.Immutable;
 
+import java.util.Collections;
+import java.util.List;
 import java.util.Objects;
 import java.util.concurrent.ScheduledExecutorService;
+import java.util.stream.Collectors;
+import java.util.stream.Stream;
 
 @Immutable
 @BuildableStyle
 public abstract class FlightSessionFactoryConfig {
     private static final SessionConfig SESSION_CONFIG_EMPTY = SessionConfig.builder().build();
-    private static final FlightSessionConfig FLIGHT_SESSION_CONFIG_EMPTY = FlightSessionConfig.builder().build();
+
+    static final List<String> VERSION_PROPERTIES = Collections.unmodifiableList(Stream.concat(
+            SessionFactoryConfig.VERSION_PROPERTIES.stream(),
+            Stream.of(UserAgentUtility.versionProperty("flight", Flight.class)))
+            .collect(Collectors.toList()));
+
+    private static final String DEEPHAVEN_JAVA_CLIENT_FLIGHT = "deephaven-java-client-flight";
+
+    private static final ClientChannelFactory CLIENT_CHANNEL_FACTORY = ClientChannelFactoryDefaulter.builder()
+            .userAgent(userAgent(Collections.singletonList(DEEPHAVEN_JAVA_CLIENT_FLIGHT)))
+            .build();
 
     public static Builder builder() {
         return ImmutableFlightSessionFactoryConfig.builder();
     }
 
+    /**
+     * Constructs a <a href="https://github.com/grpc/grpc/blob/master/doc/PROTOCOL-HTTP2.md#user-agents">grpc
+     * user-agent</a> with {@code grpc-java}, {@code deephaven}, and {@code flight} versions, with the addition of
+     * {@code extraProperties}.
+     *
+     * @param extraProperties the extra properties
+     * @return the user-agent
+     * @see UserAgentUtility#userAgent(List)
+     */
+    public static String userAgent(List<String> extraProperties) {
+        return UserAgentUtility.userAgent(Stream.concat(
+                VERSION_PROPERTIES.stream(),
+                extraProperties.stream())
+                .collect(Collectors.toList()));
+    }
+
     /**
      * The client configuration.
      */
     public abstract ClientConfig clientConfig();
 
     /**
-     * The client channel factory. By default is {@link ClientChannelFactory#defaultInstance()}.
+     * The client channel factory. By default, is a factory that sets a user-agent which includes relevant versions (see
+     * {@link #userAgent(List)}) and the property {@value DEEPHAVEN_JAVA_CLIENT_FLIGHT}.
      */
     @Default
     public ClientChannelFactory clientChannelFactory() {
-        return ClientChannelFactory.defaultInstance();
+        return CLIENT_CHANNEL_FACTORY;
     }
 
     /**
diff --git a/java-client/flight/src/main/java/org/apache/arrow/flight/ProtocolExposer.java b/java-client/flight/src/main/java/org/apache/arrow/flight/ProtocolExposer.java
new file mode 100644
index 00000000000..cf8b9308442
--- /dev/null
+++ b/java-client/flight/src/main/java/org/apache/arrow/flight/ProtocolExposer.java
@@ -0,0 +1,54 @@
+//
+// Copyright (c) 2016-2024 Deephaven Data Labs and Patent Pending
+//
+package org.apache.arrow.flight;
+
+import org.apache.arrow.flight.impl.Flight;
+
+
+public final class ProtocolExposer {
+
+    /**
+     * Workaround for <a href="https://github.com/apache/arrow/issues/44290">[Java][Flight] Add ActionType description
+     * getter</a>
+     */
+    public static Flight.ActionType toProtocol(ActionType actionType) {
+        return actionType.toProtocol();
+    }
+
+    public static ActionType fromProtocol(Flight.ActionType actionType) {
+        return new ActionType(actionType);
+    }
+
+    public static Flight.Action toProtocol(Action action) {
+        return action.toProtocol();
+    }
+
+    public static Action fromProtocol(Flight.Action action) {
+        return new Action(action);
+    }
+
+    public static Flight.Result toProtocol(Result action) {
+        return action.toProtocol();
+    }
+
+    public static Result fromProtocol(Flight.Result result) {
+        return new Result(result);
+    }
+
+    public static Flight.FlightDescriptor toProtocol(FlightDescriptor descriptor) {
+        return descriptor.toProtocol();
+    }
+
+    public static FlightDescriptor fromProtocol(Flight.FlightDescriptor descriptor) {
+        return new FlightDescriptor(descriptor);
+    }
+
+    public static Flight.Ticket toProtocol(Ticket ticket) {
+        return ticket.toProtocol();
+    }
+
+    public static Ticket fromProtocol(Flight.Ticket ticket) {
+        return new Ticket(ticket);
+    }
+}
diff --git a/java-client/session-dagger/build.gradle b/java-client/session-dagger/build.gradle
index ec5209bf0e4..38b325c47a1 100644
--- a/java-client/session-dagger/build.gradle
+++ b/java-client/session-dagger/build.gradle
@@ -8,13 +8,14 @@ description = 'The Deephaven client session dagger library'
 dependencies {
     api project(':java-client-session')
 
-    Classpaths.inheritGrpcPlatform(project, 'api')
-    api 'io.grpc:grpc-api'
+    api platform(libs.grpc.bom)
+    api libs.grpc.api
 
-    Classpaths.inheritDagger(project)
+    implementation libs.dagger
+    annotationProcessor libs.dagger.compiler
 
-    Classpaths.inheritSlf4j(project, 'slf4j-api', 'implementation')
-    Classpaths.inheritSlf4j(project, 'slf4j-simple', 'testRuntimeOnly')
+    implementation libs.slf4j.api
+    testRuntimeOnly libs.slf4j.simple
 
     // Unable to use newer junit here because of test-libs/junit-wall-4.11.jar
     /*
@@ -25,7 +26,7 @@ dependencies {
     testImplementation 'junit:junit:4.13.2'
     */
 
-    Classpaths.inheritAssertJ(project)
+    testImplementation libs.assertj
 
     testImplementation project(':server')
     testImplementation project(':server-test-utils')
@@ -36,7 +37,8 @@ dependencies {
     testImplementation project(':plugin-echo')
     testImplementation project(':plugin-figure')
     testImplementation project(':log-to-slf4j')
-    Classpaths.inheritAutoService(project, true)
+    testCompileOnly libs.autoservice
+    testAnnotationProcessor libs.autoservice.compiler
 }
 
 test {
diff --git a/java-client/session-dagger/gradle.properties b/java-client/session-dagger/gradle.properties
index 4dfadfbdcf2..c186bbfdde1 100644
--- a/java-client/session-dagger/gradle.properties
+++ b/java-client/session-dagger/gradle.properties
@@ -1,3 +1 @@
 io.deephaven.project.ProjectType=JAVA_PUBLIC
-
-languageLevel=8
diff --git a/java-client/session-dagger/src/main/java/io/deephaven/client/ClientDefaultsModule.java b/java-client/session-dagger/src/main/java/io/deephaven/client/ClientDefaultsModule.java
deleted file mode 100644
index 35d6d15b2d9..00000000000
--- a/java-client/session-dagger/src/main/java/io/deephaven/client/ClientDefaultsModule.java
+++ /dev/null
@@ -1,24 +0,0 @@
-//
-// Copyright (c) 2016-2024 Deephaven Data Labs and Patent Pending
-//
-package io.deephaven.client;
-
-import dagger.Module;
-import dagger.Provides;
-import io.deephaven.client.impl.ClientChannelFactory;
-
-/**
- * Provides {@link ClientChannelFactory}.
- */
-@Module
-public interface ClientDefaultsModule {
-
-
-    /**
-     * Equivalent to {@link ClientChannelFactory#defaultInstance()}.
-     */
-    @Provides
-    static ClientChannelFactory providesClientChannelFactory() {
-        return ClientChannelFactory.defaultInstance();
-    }
-}
diff --git a/java-client/session-dagger/src/test/java/io/deephaven/client/AggBySessionTest.java b/java-client/session-dagger/src/test/java/io/deephaven/client/AggBySessionTest.java
index 15b8a2adc9a..9a38a262079 100644
--- a/java-client/session-dagger/src/test/java/io/deephaven/client/AggBySessionTest.java
+++ b/java-client/session-dagger/src/test/java/io/deephaven/client/AggBySessionTest.java
@@ -4,15 +4,8 @@
 package io.deephaven.client;
 
 import io.deephaven.api.ColumnName;
-import io.deephaven.api.agg.Aggregation;
+import io.deephaven.api.agg.*;
 import io.deephaven.api.agg.Aggregation.Visitor;
-import io.deephaven.api.agg.Aggregations;
-import io.deephaven.api.agg.ColumnAggregation;
-import io.deephaven.api.agg.ColumnAggregations;
-import io.deephaven.api.agg.Count;
-import io.deephaven.api.agg.FirstRowKey;
-import io.deephaven.api.agg.LastRowKey;
-import io.deephaven.api.agg.Partition;
 import io.deephaven.api.object.UnionObject;
 import io.deephaven.qst.table.TableSpec;
 import io.deephaven.qst.table.TimeTable;
@@ -167,6 +160,11 @@ public void visit(Count count) {
             out.add(Count.of("MyCount"));
         }
 
+        @Override
+        public void visit(CountWhere countWhwere) {
+            out.add(CountWhere.of("CountWhere", "B > 0", "I <= 5"));
+        }
+
         @Override
         public void visit(FirstRowKey firstRowKey) {
             out.add(FirstRowKey.of("First"));
@@ -182,5 +180,14 @@ public void visit(Partition partition) {
             out.add(Partition.of("Output", false));
             out.add(Partition.of("Output", true));
         }
+
+        @Override
+        public void visit(Formula formula) {
+            out.add(Formula.of("Formula", "3.0 + 1"));
+            out.add(Formula.of("Formula", "sum(S)"));
+            out.add(Formula.of("Formula", "sum(S + I)"));
+            out.add(Formula.of("Formula", "sum(S + I + D)"));
+            out.add(Formula.of("Formula", "sum(S + I + D + L)"));
+        }
     }
 }
diff --git a/java-client/session-dagger/src/test/java/io/deephaven/client/DeephavenSessionTestBase.java b/java-client/session-dagger/src/test/java/io/deephaven/client/DeephavenSessionTestBase.java
index 08b7fe8673c..5875a99d816 100644
--- a/java-client/session-dagger/src/test/java/io/deephaven/client/DeephavenSessionTestBase.java
+++ b/java-client/session-dagger/src/test/java/io/deephaven/client/DeephavenSessionTestBase.java
@@ -6,8 +6,12 @@
 import io.deephaven.base.verify.Require;
 import io.deephaven.client.impl.Session;
 import io.deephaven.client.impl.SessionImpl;
+import io.deephaven.engine.table.Table;
+import io.deephaven.qst.table.TableSpec;
+import io.deephaven.qst.table.TicketTable;
 import io.deephaven.server.runner.DeephavenApiServerTestBase;
 import io.deephaven.server.session.SessionState;
+import io.deephaven.server.session.SessionState.ExportObject;
 import io.grpc.ManagedChannel;
 import org.junit.After;
 import org.junit.Before;
@@ -50,4 +54,9 @@ public void tearDown() throws Exception {
         }
         super.tearDown();
     }
+
+    public TicketTable ref(Table table) {
+        final ExportObject<Table> export = serverSessionState.newServerSideExport(table);
+        return TableSpec.ticket(export.getExportId().getTicket().toByteArray());
+    }
 }
diff --git a/java-client/session-dagger/src/test/java/io/deephaven/client/MultiJoinTest.java b/java-client/session-dagger/src/test/java/io/deephaven/client/MultiJoinTest.java
new file mode 100644
index 00000000000..6b2bb23897b
--- /dev/null
+++ b/java-client/session-dagger/src/test/java/io/deephaven/client/MultiJoinTest.java
@@ -0,0 +1,57 @@
+//
+// Copyright (c) 2016-2024 Deephaven Data Labs and Patent Pending
+//
+package io.deephaven.client;
+
+import io.deephaven.api.ColumnName;
+import io.deephaven.api.JoinMatch;
+import io.deephaven.client.impl.TableHandle;
+import io.deephaven.client.impl.TableHandle.TableHandleException;
+import io.deephaven.engine.table.Table;
+import io.deephaven.engine.util.TableTools;
+import io.deephaven.qst.table.MultiJoinInput;
+import io.deephaven.qst.table.MultiJoinTable;
+import io.deephaven.qst.table.TableSpec;
+import org.junit.Test;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+public class MultiJoinTest extends DeephavenSessionTestBase {
+
+    @Test
+    public void multiJoinTableExecute() throws TableHandleException, InterruptedException {
+        try (final TableHandle handle = session.batch().execute(prototype())) {
+            assertThat(handle.isSuccessful()).isTrue();
+        }
+    }
+
+    private MultiJoinTable prototype() {
+        final Table t1 = TableTools.newTable(
+                TableTools.longCol("Key", 0L),
+                TableTools.longCol("First", 0L));
+        final Table t2 = TableTools.newTable(
+                TableTools.longCol("Key", 0L),
+                TableTools.longCol("Second", 1L));
+        final Table t3 = TableTools.newTable(
+                TableTools.longCol("Key", 0L),
+                TableTools.longCol("Third", 2L));
+        return MultiJoinTable.builder()
+                .addInputs(MultiJoinInput.<TableSpec>builder()
+                        .table(ref(t1))
+                        .addMatches(JoinMatch.parse("OutputKey=Key"))
+                        .addAdditions(ColumnName.of("First"))
+                        .build())
+                .addInputs(MultiJoinInput.<TableSpec>builder()
+                        .table(ref(t2))
+                        .addMatches(JoinMatch.parse("OutputKey=Key"))
+                        .addAdditions(ColumnName.of("Second"))
+                        .build())
+                .addInputs(MultiJoinInput.<TableSpec>builder()
+                        .table(ref(t3))
+                        .addMatches(JoinMatch.parse("OutputKey=Key"))
+                        .addAdditions(ColumnName.of("Third"))
+                        .build())
+                .build();
+
+    }
+}
diff --git a/java-client/session-dagger/src/test/java/io/deephaven/client/SliceTest.java b/java-client/session-dagger/src/test/java/io/deephaven/client/SliceTest.java
new file mode 100644
index 00000000000..8521e2f89c9
--- /dev/null
+++ b/java-client/session-dagger/src/test/java/io/deephaven/client/SliceTest.java
@@ -0,0 +1,83 @@
+//
+// Copyright (c) 2016-2024 Deephaven Data Labs and Patent Pending
+//
+package io.deephaven.client;
+
+import io.deephaven.client.impl.TableHandle;
+import io.deephaven.client.impl.TableHandle.TableHandleException;
+import io.deephaven.qst.table.TableSpec;
+import io.deephaven.qst.table.TimeTable;
+import org.junit.Test;
+
+import java.time.Duration;
+
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.assertj.core.api.Assertions.failBecauseExceptionWasNotThrown;
+
+public class SliceTest extends DeephavenSessionTestBase {
+
+    private static final TableSpec STATIC_BASE = TableSpec.empty(100).view("I=ii");
+    private static final TableSpec TICKING_BASE = TimeTable.of(Duration.ofMillis(100)).view("I=ii");
+
+    @Test
+    public void bothNonNegativeStartBeforeEnd() throws InterruptedException, TableHandleException {
+        allow(0, 50);
+        allow(25, 75);
+    }
+
+    @Test
+    public void bothNonNegativeStartAfterEnd() throws IllegalArgumentException {
+        disallow(50, 0);
+    }
+
+    @Test
+    public void bothNegativeStartBeforeEnd() throws InterruptedException, TableHandleException {
+        allow(-50, -25);
+    }
+
+    @Test
+    public void bothNegativeStartAfterEnd() throws IllegalArgumentException {
+        disallow(-25, -50);
+    }
+
+    @Test
+    public void diffSignStartBeforeEnd() throws InterruptedException, TableHandleException {
+        allow(-25, 25);
+    }
+
+    @Test
+    public void diffSignStartAfterEnd() throws InterruptedException, TableHandleException {
+        allow(25, -25);
+    }
+
+    @Test
+    public void startZeroEndNegative() throws InterruptedException, TableHandleException {
+        allow(0, -25);
+    }
+
+    private void allow(long start, long end)
+            throws InterruptedException, TableHandleException {
+        try (final TableHandle handle = session.batch().execute(STATIC_BASE.slice(start, end))) {
+            assertThat(handle.isSuccessful()).isTrue();
+        }
+        try (final TableHandle handle = session.batch().execute(TICKING_BASE.slice(start, end))) {
+            assertThat(handle.isSuccessful()).isTrue();
+        }
+    }
+
+    private void disallow(long start, long end) throws IllegalArgumentException {
+        try {
+            STATIC_BASE.slice(start, end);
+            failBecauseExceptionWasNotThrown(TableHandle.TableHandleException.class);
+        } catch (IllegalArgumentException e) {
+            // expected
+        }
+        try {
+            TICKING_BASE.slice(start, end);
+            failBecauseExceptionWasNotThrown(TableHandle.TableHandleException.class);
+        } catch (IllegalArgumentException e) {
+            // expected
+        }
+    }
+
+}
diff --git a/java-client/session-examples/build.gradle b/java-client/session-examples/build.gradle
index 8efd6a02de8..f6467f1bdaf 100644
--- a/java-client/session-examples/build.gradle
+++ b/java-client/session-examples/build.gradle
@@ -7,14 +7,14 @@ dependencies {
     implementation project(':java-client-session')
     implementation project(':java-client-example-utilities')
 
-    Classpaths.inheritGrpcPlatform(project)
-    runtimeOnly 'io.grpc:grpc-netty'
+    implementation platform(libs.grpc.bom)
+    runtimeOnly libs.grpc.netty
 
-    Classpaths.inheritJUnitPlatform(project)
-    Classpaths.inheritAssertJ(project)
-    testImplementation 'org.junit.jupiter:junit-jupiter'
+    testImplementation libs.assertj
+    testImplementation platform(libs.junit.bom)
+    testImplementation libs.junit.jupiter
 
-    Classpaths.inheritLogbackClassic(project)
+    runtimeOnly libs.logback.classic
 }
 
 test {
@@ -49,6 +49,7 @@ application.applicationDistribution.into('bin') {
     from(createApplication('message-stream-send-receive', 'io.deephaven.client.examples.MessageStreamSendReceive'))
     from(createApplication('filter-table', 'io.deephaven.client.examples.FilterTable'))
     from(createApplication('create-shared-id', 'io.deephaven.client.examples.CreateSharedId'))
+    from(createApplication('print-configuration-constants', 'io.deephaven.client.examples.PrintConfigurationConstants'))
 
     fileMode = 0755
 }
diff --git a/java-client/session-examples/src/main/java/io/deephaven/client/examples/PrintConfigurationConstants.java b/java-client/session-examples/src/main/java/io/deephaven/client/examples/PrintConfigurationConstants.java
new file mode 100644
index 00000000000..8a2bf16ccc4
--- /dev/null
+++ b/java-client/session-examples/src/main/java/io/deephaven/client/examples/PrintConfigurationConstants.java
@@ -0,0 +1,28 @@
+//
+// Copyright (c) 2016-2024 Deephaven Data Labs and Patent Pending
+//
+package io.deephaven.client.examples;
+
+import io.deephaven.client.impl.Session;
+import io.deephaven.proto.backplane.grpc.ConfigValue;
+import picocli.CommandLine;
+import picocli.CommandLine.Command;
+
+import java.util.Map.Entry;
+
+@Command(name = "print-configuration-constants", mixinStandardHelpOptions = true,
+        description = "Print configuration constants", version = "0.1.0")
+class PrintConfigurationConstants extends SingleSessionExampleBase {
+
+    @Override
+    protected void execute(Session session) throws Exception {
+        for (Entry<String, ConfigValue> entry : session.getConfigurationConstants().get().entrySet()) {
+            System.out.println(entry.getKey() + "=" + entry.getValue().getStringValue());
+        }
+    }
+
+    public static void main(String[] args) {
+        int execute = new CommandLine(new PrintConfigurationConstants()).execute(args);
+        System.exit(execute);
+    }
+}
diff --git a/java-client/session-examples/src/main/java/io/deephaven/client/examples/SessionExampleBase.java b/java-client/session-examples/src/main/java/io/deephaven/client/examples/SessionExampleBase.java
index 26c63518af0..f3ccafd88b6 100644
--- a/java-client/session-examples/src/main/java/io/deephaven/client/examples/SessionExampleBase.java
+++ b/java-client/session-examples/src/main/java/io/deephaven/client/examples/SessionExampleBase.java
@@ -3,6 +3,8 @@
 //
 package io.deephaven.client.examples;
 
+import io.deephaven.client.impl.ClientChannelFactory;
+import io.deephaven.client.impl.ClientChannelFactoryDefaulter;
 import io.deephaven.client.impl.SessionConfig;
 import io.deephaven.client.impl.SessionConfig.Builder;
 import io.deephaven.client.impl.SessionFactory;
@@ -11,6 +13,7 @@
 import io.grpc.ManagedChannel;
 import picocli.CommandLine.ArgGroup;
 
+import java.util.Collections;
 import java.util.concurrent.Callable;
 import java.util.concurrent.Executors;
 import java.util.concurrent.ScheduledExecutorService;
@@ -18,6 +21,10 @@
 
 abstract class SessionExampleBase implements Callable<Void> {
 
+    private static final ClientChannelFactory CLIENT_CHANNEL_FACTORY = ClientChannelFactoryDefaulter.builder()
+            .userAgent(SessionFactoryConfig.userAgent(Collections.singletonList("deephaven-session-examples")))
+            .build();
+
     @ArgGroup(exclusive = false)
     ConnectOptions connectOptions;
 
@@ -30,7 +37,8 @@ abstract class SessionExampleBase implements Callable<Void> {
     public final Void call() throws Exception {
         ScheduledExecutorService scheduler = Executors.newScheduledThreadPool(4);
         final Factory factory = SessionFactoryConfig.builder()
-                .clientConfig(connectOptions.config())
+                .clientConfig(ConnectOptions.options(connectOptions).config())
+                .clientChannelFactory(CLIENT_CHANNEL_FACTORY)
                 .scheduler(scheduler)
                 .sessionConfig(sessionConfig())
                 .build()
diff --git a/java-client/session/build.gradle b/java-client/session/build.gradle
index 4f9dc333a90..b875569f9df 100644
--- a/java-client/session/build.gradle
+++ b/java-client/session/build.gradle
@@ -9,35 +9,39 @@ dependencies {
   api project(':qst')
   api project(':uri')
 
-  Classpaths.inheritGrpcPlatform(project, 'api')
-  api 'io.grpc:grpc-api'
-  implementation 'io.grpc:grpc-core'
-  implementation 'io.grpc:grpc-netty'
+  api platform(libs.grpc.bom)
+  api libs.grpc.api
+  implementation libs.grpc.core
+  implementation libs.grpc.netty
 
   // TODO(deephaven-core#1783): Make proto-backplane-grpc implementation dependency
   api project(':proto:proto-backplane-grpc')
 
   api project(':ssl-config')
   implementation project(':ssl-kickstart')
-  Classpaths.inheritSSLContext(project, 'sslcontext-kickstart-for-netty')
+  implementation libs.sslcontext.kickstart.netty
 
-  Classpaths.inheritImmutables(project)
-  Classpaths.inheritAutoService(project)
-  compileOnly 'javax.inject:javax.inject:1'
+  compileOnly project(':util-immutables')
+  annotationProcessor libs.immutables.value
 
-  Classpaths.inheritJUnitPlatform(project)
+  compileOnly libs.autoservice
+  annotationProcessor libs.autoservice.compiler
+  compileOnly libs.javax.inject
 
-  testImplementation 'org.junit.jupiter:junit-jupiter'
-  testRuntimeOnly 'org.junit.jupiter:junit-jupiter-engine'
-  testRuntimeOnly 'org.junit.vintage:junit-vintage-engine'
-  testRuntimeOnly 'org.junit.platform:junit-platform-launcher'
-  Classpaths.inheritJUnitClassic(project, 'testImplementation')
-  testImplementation 'io.grpc:grpc-testing'
+  testImplementation platform(libs.junit.bom)
+  testImplementation libs.junit.jupiter
+  testRuntimeOnly libs.junit.jupiter.engine
+  testRuntimeOnly libs.junit.vintage.engine
+  testRuntimeOnly libs.junit.platform.launcher
 
-  Classpaths.inheritAssertJ(project)
+  testImplementation libs.junit4
+  testImplementation libs.grpc.testing
+  testImplementation libs.grpc.inprocess
 
-  Classpaths.inheritSlf4j(project, 'slf4j-api', 'implementation')
-  Classpaths.inheritSlf4j(project, 'slf4j-simple', 'testRuntimeOnly')
+  testImplementation libs.assertj
+
+  implementation libs.slf4j.api
+  testRuntimeOnly libs.slf4j.simple
 }
 
 test {
diff --git a/java-client/session/gradle.properties b/java-client/session/gradle.properties
index 9e8588f2620..c186bbfdde1 100644
--- a/java-client/session/gradle.properties
+++ b/java-client/session/gradle.properties
@@ -1,2 +1 @@
 io.deephaven.project.ProjectType=JAVA_PUBLIC
-languageLevel=8
diff --git a/java-client/session/src/main/java/io/deephaven/client/grpc/UserAgentUtility.java b/java-client/session/src/main/java/io/deephaven/client/grpc/UserAgentUtility.java
new file mode 100644
index 00000000000..90af8cf7530
--- /dev/null
+++ b/java-client/session/src/main/java/io/deephaven/client/grpc/UserAgentUtility.java
@@ -0,0 +1,54 @@
+//
+// Copyright (c) 2016-2024 Deephaven Data Labs and Patent Pending
+//
+package io.deephaven.client.grpc;
+
+import io.grpc.Grpc;
+
+import java.util.List;
+
+public final class UserAgentUtility {
+
+    /**
+     * Constructs a <a href="https://github.com/grpc/grpc/blob/master/doc/PROTOCOL-HTTP2.md#user-agents">grpc
+     * user-agent</a> of the form {@code grpc-java/<grpc-java-version>} or
+     * {@code grpc-java/<grpc-java-version> (prop1; ...; propN)}.
+     *
+     * @param properties the properties
+     * @return the user-agent
+     * @see <a href="https://github.com/grpc/grpc/blob/master/doc/PROTOCOL-HTTP2.md#user-agents">grpc user-agents</a>
+     * @see #versionProperty(String, String)
+     * @see #versionProperty(String, Class)
+     */
+    public static String userAgent(List<String> properties) {
+        final String grpcJavaVersionProperty = versionProperty("grpc-java", Grpc.class);
+        return properties.isEmpty()
+                ? grpcJavaVersionProperty
+                : String.format("%s (%s)", grpcJavaVersionProperty, String.join("; ", properties));
+    }
+
+    /**
+     * Constructs a version property in the
+     * <a href="https://github.com/grpc/grpc/blob/master/doc/PROTOCOL-HTTP2.md#user-agents">grpc user-agent</a> style.
+     *
+     * @param name the name
+     * @param version the version
+     * @return the version property
+     */
+    public static String versionProperty(String name, String version) {
+        return name + "/" + version;
+    }
+
+    /**
+     * Constructs a version property in the
+     * <a href="https://github.com/grpc/grpc/blob/master/doc/PROTOCOL-HTTP2.md#user-agents">grpc user-agent</a> style.
+     * Uses {@code clazz.getPackage().getImplementationVersion()} as the version string.
+     *
+     * @param name the name
+     * @param clazz the class to take the version from
+     * @return the version property
+     */
+    public static String versionProperty(String name, Class<?> clazz) {
+        return versionProperty(name, clazz.getPackage().getImplementationVersion());
+    }
+}
diff --git a/java-client/session/src/main/java/io/deephaven/client/impl/AggregationBuilder.java b/java-client/session/src/main/java/io/deephaven/client/impl/AggregationBuilder.java
index e44adc6f33a..97701859397 100644
--- a/java-client/session/src/main/java/io/deephaven/client/impl/AggregationBuilder.java
+++ b/java-client/session/src/main/java/io/deephaven/client/impl/AggregationBuilder.java
@@ -4,20 +4,18 @@
 package io.deephaven.client.impl;
 
 import io.deephaven.api.Strings;
-import io.deephaven.api.agg.Aggregations;
-import io.deephaven.api.agg.ColumnAggregation;
-import io.deephaven.api.agg.ColumnAggregations;
-import io.deephaven.api.agg.Count;
-import io.deephaven.api.agg.FirstRowKey;
-import io.deephaven.api.agg.LastRowKey;
+import io.deephaven.api.agg.*;
 import io.deephaven.api.Pair;
-import io.deephaven.api.agg.Partition;
+import io.deephaven.api.filter.Filter;
 import io.deephaven.proto.backplane.grpc.Aggregation;
 import io.deephaven.proto.backplane.grpc.Aggregation.AggregationColumns;
 import io.deephaven.proto.backplane.grpc.Aggregation.AggregationCount;
+import io.deephaven.proto.backplane.grpc.Aggregation.AggregationCountWhere;
+import io.deephaven.proto.backplane.grpc.Aggregation.AggregationFormula;
 import io.deephaven.proto.backplane.grpc.Aggregation.AggregationPartition;
 import io.deephaven.proto.backplane.grpc.Aggregation.AggregationRowKey;
 import io.deephaven.proto.backplane.grpc.Aggregation.Builder;
+import io.deephaven.proto.backplane.grpc.Selectable;
 
 import java.util.Collection;
 import java.util.List;
@@ -76,6 +74,16 @@ public void visit(Count count) {
                 .setColumnName(count.column().name())));
     }
 
+    @Override
+    public void visit(CountWhere countWhere) {
+        final Collection<String> filters = Filter.extractAnds(countWhere.filter()).stream()
+                .map(Strings::of)
+                .collect(Collectors.toList());
+        out = singletonList(of(Builder::setCountWhere, AggregationCountWhere.newBuilder()
+                .setColumnName(countWhere.column().name())
+                .addAllFilters(filters)));
+    }
+
     @Override
     public void visit(FirstRowKey firstRowKey) {
         out = singletonList(of(Builder::setFirstRowKey, AggregationRowKey.newBuilder()
@@ -95,4 +103,11 @@ public void visit(Partition partition) {
                 .setColumnName(partition.column().name())
                 .setIncludeGroupByColumns(partition.includeGroupByColumns())));
     }
+
+    @Override
+    public void visit(Formula formula) {
+        final Selectable selectable = Selectable.newBuilder().setRaw(formula.formulaString()).build();
+        out = singletonList(of(Builder::setFormula, AggregationFormula.newBuilder()
+                .setSelectable(selectable)));
+    }
 }
diff --git a/java-client/session/src/main/java/io/deephaven/client/impl/BatchTableRequestBuilder.java b/java-client/session/src/main/java/io/deephaven/client/impl/BatchTableRequestBuilder.java
index ee3888560de..b1d2b1d74f1 100644
--- a/java-client/session/src/main/java/io/deephaven/client/impl/BatchTableRequestBuilder.java
+++ b/java-client/session/src/main/java/io/deephaven/client/impl/BatchTableRequestBuilder.java
@@ -53,6 +53,7 @@
 import io.deephaven.proto.backplane.grpc.InCondition;
 import io.deephaven.proto.backplane.grpc.IsNullCondition;
 import io.deephaven.proto.backplane.grpc.MergeTablesRequest;
+import io.deephaven.proto.backplane.grpc.MultiJoinTablesRequest;
 import io.deephaven.proto.backplane.grpc.NaturalJoinTablesRequest;
 import io.deephaven.proto.backplane.grpc.NotCondition;
 import io.deephaven.proto.backplane.grpc.OrCondition;
@@ -60,6 +61,7 @@
 import io.deephaven.proto.backplane.grpc.Reference;
 import io.deephaven.proto.backplane.grpc.SelectDistinctRequest;
 import io.deephaven.proto.backplane.grpc.SelectOrUpdateRequest;
+import io.deephaven.proto.backplane.grpc.SliceRequest;
 import io.deephaven.proto.backplane.grpc.SnapshotTableRequest;
 import io.deephaven.proto.backplane.grpc.SnapshotWhenTableRequest;
 import io.deephaven.proto.backplane.grpc.SortDescriptor;
@@ -90,6 +92,8 @@
 import io.deephaven.qst.table.JoinTable;
 import io.deephaven.qst.table.LazyUpdateTable;
 import io.deephaven.qst.table.MergeTable;
+import io.deephaven.qst.table.MultiJoinInput;
+import io.deephaven.qst.table.MultiJoinTable;
 import io.deephaven.qst.table.NaturalJoinTable;
 import io.deephaven.qst.table.NewTable;
 import io.deephaven.qst.table.RangeJoinTable;
@@ -97,6 +101,7 @@
 import io.deephaven.qst.table.SelectDistinctTable;
 import io.deephaven.qst.table.SelectTable;
 import io.deephaven.qst.table.SingleParentTable;
+import io.deephaven.qst.table.SliceTable;
 import io.deephaven.qst.table.SnapshotTable;
 import io.deephaven.qst.table.SnapshotWhenTable;
 import io.deephaven.qst.table.SortTable;
@@ -233,6 +238,15 @@ public Operation visit(TailTable tailTable) {
                     .setSourceId(ref(tailTable.parent())).setNumRows(tailTable.size()));
         }
 
+        @Override
+        public Operation visit(SliceTable sliceTable) {
+            return op(Builder::setSlice, SliceRequest.newBuilder().setResultId(ticket)
+                    .setSourceId(ref(sliceTable.parent()))
+                    .setFirstPositionInclusive(sliceTable.firstPositionInclusive())
+                    .setLastPositionExclusive(sliceTable.lastPositionExclusive())
+                    .build());
+        }
+
         @Override
         public Operation visit(ReverseTable reverseTable) {
             // a bit hacky at the proto level, but this is how to specify a reverse
@@ -583,6 +597,29 @@ public Operation visit(DropColumnsTable dropColumnsTable) {
             return op(Builder::setDropColumns, request);
         }
 
+        @Override
+        public Operation visit(MultiJoinTable multiJoinTable) {
+            final MultiJoinTablesRequest.Builder request = MultiJoinTablesRequest.newBuilder()
+                    .setResultId(ticket);
+            for (MultiJoinInput<TableSpec> input : multiJoinTable.inputs()) {
+                request.addMultiJoinInputs(adapt(input));
+            }
+            return op(Builder::setMultiJoin, request);
+        }
+
+        private io.deephaven.proto.backplane.grpc.MultiJoinInput adapt(MultiJoinInput<TableSpec> input) {
+            io.deephaven.proto.backplane.grpc.MultiJoinInput.Builder builder =
+                    io.deephaven.proto.backplane.grpc.MultiJoinInput.newBuilder()
+                            .setSourceId(ref(input.table()));
+            for (JoinMatch match : input.matches()) {
+                builder.addColumnsToMatch(Strings.of(match));
+            }
+            for (JoinAddition addition : input.additions()) {
+                builder.addColumnsToAdd(Strings.of(addition));
+            }
+            return builder.build();
+        }
+
         private SelectOrUpdateRequest selectOrUpdate(SingleParentTable x,
                 Collection<Selectable> columns) {
             SelectOrUpdateRequest.Builder builder =
diff --git a/java-client/session/src/main/java/io/deephaven/client/impl/ClientChannelFactoryDefaulter.java b/java-client/session/src/main/java/io/deephaven/client/impl/ClientChannelFactoryDefaulter.java
new file mode 100644
index 00000000000..56d1b545c6c
--- /dev/null
+++ b/java-client/session/src/main/java/io/deephaven/client/impl/ClientChannelFactoryDefaulter.java
@@ -0,0 +1,87 @@
+//
+// Copyright (c) 2016-2024 Deephaven Data Labs and Patent Pending
+//
+package io.deephaven.client.impl;
+
+import io.deephaven.annotations.BuildableStyle;
+import io.deephaven.ssl.config.SSLConfig;
+import io.deephaven.uri.DeephavenTarget;
+import io.grpc.ManagedChannel;
+import org.immutables.value.Value.Default;
+import org.immutables.value.Value.Immutable;
+
+import java.util.Optional;
+
+/**
+ * A client channel factory that may update {@link ClientConfig} values before handing off to a {@link #delegate()}.
+ */
+@Immutable
+@BuildableStyle
+public abstract class ClientChannelFactoryDefaulter implements ClientChannelFactory {
+
+    public static Builder builder() {
+        return ImmutableClientChannelFactoryDefaulter.builder();
+    }
+
+    /**
+     * The delegated client channel factory. By default, is {@link ClientChannelFactory#defaultInstance()}.
+     */
+    @Default
+    public ClientChannelFactory delegate() {
+        return ClientChannelFactory.defaultInstance();
+    }
+
+    /**
+     * The ssl config. This will set {@link ClientConfig#ssl() ssl} for the {@code config} in
+     * {@link #create(ClientConfig)} if it has not already been set and the {@link ClientConfig#target() target} is
+     * {@link DeephavenTarget#isSecure() secure}.
+     */
+    public abstract Optional<SSLConfig> ssl();
+
+    /**
+     * The user-agent. This will set {@link ClientConfig#userAgent()} for the {@code config} in
+     * {@link #create(ClientConfig)} if it has not already been set.
+     */
+    public abstract Optional<String> userAgent();
+
+    /**
+     * Creates a managed channel. Will update {@code config} with the defaults as specified by {@link #ssl()} and
+     * {@link #userAgent()} before delegating to {@link #delegate()}.
+     */
+    @Override
+    public final ManagedChannel create(ClientConfig config) {
+        if (ssl().isPresent() && !config.ssl().isPresent() && config.target().isSecure()) {
+            config = config.withSsl(ssl().get());
+        }
+        if (userAgent().isPresent() && !config.userAgent().isPresent()) {
+            config = config.withUserAgent(userAgent().get());
+        }
+        return delegate().create(config);
+    }
+
+    public interface Builder {
+
+        /**
+         * Initializes the value for the {@link ClientChannelFactoryDefaulter#delegate() delegate} attribute.
+         * <p>
+         * If not set, this attribute will have a default value as returned by the initializer of
+         * {@link ClientChannelFactoryDefaulter#delegate()}.
+         */
+        Builder delegate(ClientChannelFactory delegate);
+
+        /**
+         * Initializes the optional value {@link ClientChannelFactoryDefaulter#ssl() ssl} to ssl.
+         */
+        Builder ssl(SSLConfig ssl);
+
+        /**
+         * Initializes the optional value {@link ClientChannelFactoryDefaulter#userAgent() userAgent} to userAgent.
+         */
+        Builder userAgent(String userAgent);
+
+        /**
+         * Builds a new {@link ClientChannelFactoryDefaulter}.
+         */
+        ClientChannelFactoryDefaulter build();
+    }
+}
diff --git a/java-client/session/src/main/java/io/deephaven/client/impl/ClientConfig.java b/java-client/session/src/main/java/io/deephaven/client/impl/ClientConfig.java
index 0cddda3cc2d..a52a7faa8b3 100644
--- a/java-client/session/src/main/java/io/deephaven/client/impl/ClientConfig.java
+++ b/java-client/session/src/main/java/io/deephaven/client/impl/ClientConfig.java
@@ -36,7 +36,9 @@ public static Builder builder() {
     public abstract Optional<SSLConfig> ssl();
 
     /**
-     * The user agent.
+     * The user-agent.
+     *
+     * @see <a href="https://github.com/grpc/grpc/blob/master/doc/PROTOCOL-HTTP2.md#user-agents">grpc user-agents</a>
      */
     public abstract Optional<String> userAgent();
 
@@ -63,6 +65,11 @@ public int maxInboundMessageSize() {
      */
     public abstract ClientConfig withSsl(SSLConfig ssl);
 
+    /**
+     * Returns or creates a client config with {@link #userAgent()} as {@code userAgent}.
+     */
+    public abstract ClientConfig withUserAgent(String userAgent);
+
     public interface Builder {
 
         Builder target(DeephavenTarget target);
diff --git a/java-client/session/src/main/java/io/deephaven/client/impl/SessionFactoryConfig.java b/java-client/session/src/main/java/io/deephaven/client/impl/SessionFactoryConfig.java
index 948e621f1b4..265e95086df 100644
--- a/java-client/session/src/main/java/io/deephaven/client/impl/SessionFactoryConfig.java
+++ b/java-client/session/src/main/java/io/deephaven/client/impl/SessionFactoryConfig.java
@@ -4,12 +4,17 @@
 package io.deephaven.client.impl;
 
 import io.deephaven.annotations.BuildableStyle;
+import io.deephaven.client.grpc.UserAgentUtility;
 import io.grpc.ManagedChannel;
 import org.immutables.value.Value.Default;
 import org.immutables.value.Value.Immutable;
 
+import java.util.Collections;
+import java.util.List;
 import java.util.Objects;
 import java.util.concurrent.ScheduledExecutorService;
+import java.util.stream.Collectors;
+import java.util.stream.Stream;
 
 @Immutable
 @BuildableStyle
@@ -17,21 +22,47 @@ public abstract class SessionFactoryConfig {
 
     private static final SessionConfig SESSION_CONFIG_EMPTY = SessionConfig.builder().build();
 
+    static final List<String> VERSION_PROPERTIES =
+            Collections.singletonList(UserAgentUtility.versionProperty("deephaven", SessionFactoryConfig.class));
+
+    private static final String DEEPHAVEN_JAVA_CLIENT_SESSION = "deephaven-java-client-session";
+
+    private static final ClientChannelFactory CLIENT_CHANNEL_FACTORY = ClientChannelFactoryDefaulter.builder()
+            .userAgent(userAgent(Collections.singletonList(DEEPHAVEN_JAVA_CLIENT_SESSION)))
+            .build();
+
     public static Builder builder() {
         return ImmutableSessionFactoryConfig.builder();
     }
 
+    /**
+     * Constructs a <a href="https://github.com/grpc/grpc/blob/master/doc/PROTOCOL-HTTP2.md#user-agents">grpc
+     * user-agent</a> with {@code grpc-java} and {@code deephaven} versions, with the addition of
+     * {@code extraProperties}.
+     *
+     * @param extraProperties the extra properties
+     * @return the user-agent
+     * @see UserAgentUtility#userAgent(List)
+     */
+    public static String userAgent(List<String> extraProperties) {
+        return UserAgentUtility.userAgent(Stream.concat(
+                VERSION_PROPERTIES.stream(),
+                extraProperties.stream())
+                .collect(Collectors.toList()));
+    }
+
     /**
      * The client configuration.
      */
     public abstract ClientConfig clientConfig();
 
     /**
-     * The client channel factory. By default is {@link ClientChannelFactory#defaultInstance()}.
+     * The client channel factory. By default, is a factory that sets a user-agent which includes relevant versions (see
+     * {@link #userAgent(List)}) and the property {@value DEEPHAVEN_JAVA_CLIENT_SESSION}.
      */
     @Default
     public ClientChannelFactory clientChannelFactory() {
-        return ClientChannelFactory.defaultInstance();
+        return CLIENT_CHANNEL_FACTORY;
     }
 
     /**
diff --git a/java-client/session/src/main/java/io/deephaven/client/impl/TableHandleManagerBase.java b/java-client/session/src/main/java/io/deephaven/client/impl/TableHandleManagerBase.java
index eb07aade9c2..a813f108864 100644
--- a/java-client/session/src/main/java/io/deephaven/client/impl/TableHandleManagerBase.java
+++ b/java-client/session/src/main/java/io/deephaven/client/impl/TableHandleManagerBase.java
@@ -9,11 +9,15 @@
 import io.deephaven.qst.table.InputTable;
 import io.deephaven.qst.table.LabeledTables;
 import io.deephaven.qst.table.MergeTable;
+import io.deephaven.qst.table.MultiJoinInput;
+import io.deephaven.qst.table.MultiJoinTable;
 import io.deephaven.qst.table.NewTable;
 import io.deephaven.qst.table.TableSpec;
 import io.deephaven.qst.table.TicketTable;
 import io.deephaven.qst.table.TimeTable;
 
+import java.util.List;
+
 abstract class TableHandleManagerBase implements TableHandleManager {
 
     protected abstract TableHandle handle(TableSpec table);
@@ -49,6 +53,20 @@ public final TableHandle of(InputTable inputTable) {
         return handle(inputTable);
     }
 
+    @Override
+    public final TableHandle multiJoin(List<MultiJoinInput<TableHandle>> multiJoinInputs) {
+        MultiJoinTable.Builder builder = MultiJoinTable.builder();
+        for (MultiJoinInput<TableHandle> input : multiJoinInputs) {
+            // noinspection resource We're not making new TableHandles here
+            builder.addInputs(MultiJoinInput.<TableSpec>builder()
+                    .table(input.table().table())
+                    .addAllMatches(input.matches())
+                    .addAllAdditions(input.additions())
+                    .build());
+        }
+        return handle(builder.build());
+    }
+
     @Override
     public final TableHandle merge(Iterable<TableHandle> tableProxies) {
         MergeTable.Builder builder = MergeTable.builder();
diff --git a/java-client/session/src/main/java/io/deephaven/client/impl/TableHandleManagerDelegate.java b/java-client/session/src/main/java/io/deephaven/client/impl/TableHandleManagerDelegate.java
index 4bb73bef7c1..3cad339e159 100644
--- a/java-client/session/src/main/java/io/deephaven/client/impl/TableHandleManagerDelegate.java
+++ b/java-client/session/src/main/java/io/deephaven/client/impl/TableHandleManagerDelegate.java
@@ -13,6 +13,7 @@
 import io.deephaven.qst.table.EmptyTable;
 import io.deephaven.qst.table.InputTable;
 import io.deephaven.qst.table.LabeledTables;
+import io.deephaven.qst.table.MultiJoinInput;
 import io.deephaven.qst.table.NewTable;
 import io.deephaven.qst.table.TableSpec;
 import io.deephaven.qst.table.TicketTable;
@@ -100,6 +101,11 @@ public final TableHandle of(InputTable inputTable) {
         return delegate().of(inputTable);
     }
 
+    @Override
+    public final TableHandle multiJoin(List<MultiJoinInput<TableHandle>> multiJoinInputs) {
+        return delegate().multiJoin(multiJoinInputs);
+    }
+
     @Override
     public final TableHandle merge(Iterable<TableHandle> tableHandles) {
         return delegate().merge(tableHandles);
diff --git a/java-client/session/src/main/java/io/deephaven/client/impl/UpdateByBuilder.java b/java-client/session/src/main/java/io/deephaven/client/impl/UpdateByBuilder.java
index f41161b048b..b0ddd59a18a 100644
--- a/java-client/session/src/main/java/io/deephaven/client/impl/UpdateByBuilder.java
+++ b/java-client/session/src/main/java/io/deephaven/client/impl/UpdateByBuilder.java
@@ -312,7 +312,7 @@ public UpdateByColumn.UpdateBySpec visit(RollingFormulaSpec rs) {
                             .setReverseWindowScale(adapt(rs.revWindowScale()))
                             .setForwardWindowScale(adapt(rs.fwdWindowScale()))
                             .setFormula(rs.formula())
-                            .setParamToken(rs.paramToken());
+                            .setParamToken(rs.paramToken().orElse(null));
             return UpdateByColumn.UpdateBySpec.newBuilder()
                     .setRollingFormula(builder.build())
                     .build();
diff --git a/java-client/uri/build.gradle b/java-client/uri/build.gradle
index a41c229676d..884ec0cae4c 100644
--- a/java-client/uri/build.gradle
+++ b/java-client/uri/build.gradle
@@ -6,14 +6,15 @@ plugins {
 description = 'The Deephaven URI library'
 
 dependencies {
-    Classpaths.inheritImmutables(project)
+    compileOnly project(':util-immutables')
+    annotationProcessor libs.immutables.value
 
-    Classpaths.inheritJUnitPlatform(project)
-    testImplementation 'org.junit.jupiter:junit-jupiter'
-    testRuntimeOnly 'org.junit.jupiter:junit-jupiter-engine'
-    testRuntimeOnly 'org.junit.platform:junit-platform-launcher'
+    testImplementation platform(libs.junit.bom)
+    testImplementation libs.junit.jupiter
+    testRuntimeOnly libs.junit.jupiter.engine
+    testRuntimeOnly libs.junit.platform.launcher
 
-    Classpaths.inheritAssertJ(project)
+    testImplementation libs.assertj
 }
 
 test {
diff --git a/licenses/DCL-notice-template.md b/licenses/DCL-notice-template.md
index e7bed3b2654..a321b469fdd 100644
--- a/licenses/DCL-notice-template.md
+++ b/licenses/DCL-notice-template.md
@@ -2,10 +2,10 @@ Deephaven ${projectName}
 Copyright ${copyrightYear} Deephaven Data Lab
 
 Licensed under the Deephaven Community License Agreement 1.0 (the "License");
-You may obtain a copy of the License at [LICENSE](LICENSE).
+You may obtain a copy of the License at [LICENSE](../LICENSE.md).
 
 Unless required by applicable law or agreed to in writing, software
 distributed under the License is distributed on an "AS IS" BASIS,
 WITHOUT 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
+limitations under the License.
diff --git a/log-factory/build.gradle b/log-factory/build.gradle
index 9a3cdb9d750..175b7694c51 100644
--- a/log-factory/build.gradle
+++ b/log-factory/build.gradle
@@ -3,9 +3,7 @@ plugins {
   id 'io.deephaven.project.register'
 }
 
-configurations {
-  api.extendsFrom fishIo
-}
-
 dependencies {
+  api project(':Base')
+  api project(':IO')
 }
diff --git a/log-factory/examples/example-base/build.gradle b/log-factory/examples/example-base/build.gradle
index 85c4b6892cd..568a6c497de 100644
--- a/log-factory/examples/example-base/build.gradle
+++ b/log-factory/examples/example-base/build.gradle
@@ -5,5 +5,5 @@ plugins {
 
 dependencies {
 	implementation project(':log-factory')
-	Classpaths.inheritSlf4j(project, 'slf4j-api', 'implementation')
+	implementation libs.slf4j.api
 }
diff --git a/log-factory/examples/example-logback/build.gradle b/log-factory/examples/example-logback/build.gradle
index f8fbb0de60b..971c4cee9c9 100644
--- a/log-factory/examples/example-logback/build.gradle
+++ b/log-factory/examples/example-logback/build.gradle
@@ -7,7 +7,7 @@ dependencies {
 	implementation project(':log-example-base')
 
 	runtimeOnly project(':log-to-slf4j')
-	Classpaths.inheritLogbackClassic(project)
+	runtimeOnly libs.logback.classic
 }
 
 application {
diff --git a/log-factory/examples/example-slf4j/build.gradle b/log-factory/examples/example-slf4j/build.gradle
index 9c25032ccc5..8cb0a4ab1e7 100644
--- a/log-factory/examples/example-slf4j/build.gradle
+++ b/log-factory/examples/example-slf4j/build.gradle
@@ -7,7 +7,7 @@ dependencies {
 	implementation project(':log-example-base')
 
 	runtimeOnly project(':log-to-slf4j')
-	Classpaths.inheritSlf4j(project, 'slf4j-simple', 'runtimeOnly')
+	runtimeOnly libs.slf4j.simple
 }
 
 application {
diff --git a/log-factory/gradle.properties b/log-factory/gradle.properties
index c186bbfdde1..9e8588f2620 100644
--- a/log-factory/gradle.properties
+++ b/log-factory/gradle.properties
@@ -1 +1,2 @@
 io.deephaven.project.ProjectType=JAVA_PUBLIC
+languageLevel=8
diff --git a/log-factory/sinks/log-to-file/build.gradle b/log-factory/sinks/log-to-file/build.gradle
index 8c4f15930bb..2ddc42f2273 100644
--- a/log-factory/sinks/log-to-file/build.gradle
+++ b/log-factory/sinks/log-to-file/build.gradle
@@ -9,5 +9,6 @@ dependencies {
 	// access to the internal logger.
 	implementation project(':log-factory')
 
-	Classpaths.inheritAutoService(project)
+	compileOnly libs.autoservice
+	annotationProcessor libs.autoservice.compiler
 }
diff --git a/log-factory/sinks/log-to-logbuffer/build.gradle b/log-factory/sinks/log-to-logbuffer/build.gradle
index 1e719a8e997..81eaf423e40 100644
--- a/log-factory/sinks/log-to-logbuffer/build.gradle
+++ b/log-factory/sinks/log-to-logbuffer/build.gradle
@@ -3,12 +3,10 @@ plugins {
   id 'io.deephaven.project.register'
 }
 
-configurations {
-  compileOnly.extendsFrom fishIo
-}
-
 dependencies {
+  compileOnly project(':Base')
   compileOnly project(':log-factory')
 
-  Classpaths.inheritAutoService(project)
+  compileOnly libs.autoservice
+  annotationProcessor libs.autoservice.compiler
 }
diff --git a/log-factory/sinks/log-to-slf4j/build.gradle b/log-factory/sinks/log-to-slf4j/build.gradle
index 02dd0ccc440..1a683f88228 100644
--- a/log-factory/sinks/log-to-slf4j/build.gradle
+++ b/log-factory/sinks/log-to-slf4j/build.gradle
@@ -8,7 +8,8 @@ dependencies {
 	// internal logger, that is in service of the ServiceLoader - and if consumers should not need
 	// access to the internal logger.
 	implementation project(':log-factory')
-	Classpaths.inheritSlf4j(project, 'slf4j-api', 'compileOnly') // users must provide their own impl and slf4j config
-	Classpaths.inheritLogbackClassic(project, 'compileOnly') // so we can attach an interceptor, if supported
-	Classpaths.inheritAutoService(project)
+	compileOnly libs.slf4j.api // users must provide their own impl and slf4j config
+	compileOnly libs.logback.classic // so we can attach an interceptor, if supported
+	compileOnly libs.autoservice
+	annotationProcessor libs.autoservice.compiler
 }
diff --git a/log-factory/sinks/log-to-stream/build.gradle b/log-factory/sinks/log-to-stream/build.gradle
index 338f00f9092..4070feefce3 100644
--- a/log-factory/sinks/log-to-stream/build.gradle
+++ b/log-factory/sinks/log-to-stream/build.gradle
@@ -8,5 +8,6 @@ dependencies {
 	// internal logger, that is in service of the ServiceLoader - and if consumers should not need
 	// access to the internal logger.
 	implementation project(':log-factory')
-	Classpaths.inheritAutoService(project)
+	compileOnly libs.autoservice
+	annotationProcessor libs.autoservice.compiler
 }
diff --git a/log-factory/sinks/logback-logbuffer/build.gradle b/log-factory/sinks/logback-logbuffer/build.gradle
index 208d15e28c9..b5c78ad3cd3 100644
--- a/log-factory/sinks/logback-logbuffer/build.gradle
+++ b/log-factory/sinks/logback-logbuffer/build.gradle
@@ -3,11 +3,9 @@ plugins {
   id 'io.deephaven.project.register'
 }
 
-configurations {
-  compileOnly.extendsFrom fishIo
-}
-
 dependencies {
+  compileOnly project(':Base')
+  compileOnly project(':IO')
   // consumer still needs to provide dependency
-  Classpaths.inheritLogbackClassic(project, 'compileOnly')
+  compileOnly libs.logback.classic
 }
diff --git a/log-factory/sinks/logback-print-stream-globals/build.gradle b/log-factory/sinks/logback-print-stream-globals/build.gradle
index 738f072066e..ca09edcb778 100644
--- a/log-factory/sinks/logback-print-stream-globals/build.gradle
+++ b/log-factory/sinks/logback-print-stream-globals/build.gradle
@@ -3,11 +3,8 @@ plugins {
   id 'io.deephaven.project.register'
 }
 
-configurations {
-  compileOnly.extendsFrom fishBase
-}
-
 dependencies {
+  compileOnly project(':Base')
   // consumer still needs to provide dependency
-  Classpaths.inheritLogbackClassic(project, 'compileOnly')
+  compileOnly libs.logback.classic
 }
diff --git a/log-factory/sources/slf4j-to-log/build.gradle b/log-factory/sources/slf4j-to-log/build.gradle
index 0e8de1b650c..b4f8f5738ab 100644
--- a/log-factory/sources/slf4j-to-log/build.gradle
+++ b/log-factory/sources/slf4j-to-log/build.gradle
@@ -5,6 +5,7 @@ plugins {
 
 dependencies {
 	implementation project(':log-factory')
-	Classpaths.inheritSlf4j(project, 'slf4j-api', 'compileOnly') // users must provide their own api hooks
-	Classpaths.inheritAutoService(project)
+	compileOnly libs.slf4j.api // users must provide their own api hooks
+	compileOnly libs.autoservice
+	annotationProcessor libs.autoservice.compiler
 }
diff --git a/log-factory/src/main/java/io/deephaven/internal/log/Bootstrap.java b/log-factory/src/main/java/io/deephaven/internal/log/Bootstrap.java
index 9c2f1ecc6c2..f68fe755911 100644
--- a/log-factory/src/main/java/io/deephaven/internal/log/Bootstrap.java
+++ b/log-factory/src/main/java/io/deephaven/internal/log/Bootstrap.java
@@ -8,9 +8,11 @@
 public final class Bootstrap {
 
     public static boolean isQuiet() {
-        return viaProperty()
-                .or(Bootstrap::viaEnvironment)
-                .map(Boolean::parseBoolean)
+        Optional<String> optional = viaProperty();
+        if (!optional.isPresent()) {
+            optional = viaEnvironment();
+        }
+        return optional.map(Boolean::parseBoolean)
                 .orElse(false);
     }
 
diff --git a/open-api/lang-parser/lang-parser.gradle b/open-api/lang-parser/lang-parser.gradle
index dc1b7bf805f..fdd2bfa5ad5 100644
--- a/open-api/lang-parser/lang-parser.gradle
+++ b/open-api/lang-parser/lang-parser.gradle
@@ -12,8 +12,8 @@ dependencies {
     api project(':open-api-shared-fu')
     implementation project(':log-factory')
     api project(':proto:proto-backplane-grpc')
+    implementation libs.javaparser.core
 }
-Classpaths.inheritJavaParser(project, 'implementation')
 
 // All javacc plugin configuration disabled to avoid weird IntelliJ breakage
 // when we try to manually patch the plugin.  Will reinstate once upstream
diff --git a/open-api/lang-tools/lang-tools.gradle b/open-api/lang-tools/lang-tools.gradle
index b91c8029f48..4b948ea16b7 100644
--- a/open-api/lang-tools/lang-tools.gradle
+++ b/open-api/lang-tools/lang-tools.gradle
@@ -4,8 +4,8 @@ plugins {
     id 'java-library'
 }
 
-Classpaths.inheritCommonsText(project, 'implementation')
 dependencies {
+    implementation libs.commons.text
 
     implementation project(':open-api-lang-parser')
     implementation project(':engine-table')
@@ -13,13 +13,13 @@ dependencies {
     implementation project(':IO')
     implementation project(':log-factory')
 
-    testImplementation 'org.spockframework:spock-core:2.0-groovy-3.0'
+    testImplementation libs.spockframework.core
 
-    Classpaths.inheritJUnitPlatform(project)
-    testImplementation 'org.junit.jupiter:junit-jupiter'
+    testImplementation platform(libs.junit.bom)
+    testImplementation libs.junit.jupiter
 
-    Classpaths.inheritGroovy(project, 'groovy', 'testImplementation')
-    Classpaths.inheritGroovy(project, 'groovy-templates', 'testImplementation')
+    testImplementation libs.groovy
+    testImplementation libs.groovy.templates
 
     testImplementation project(':engine-test-utils')
     testRuntimeOnly project(':configs')
@@ -30,7 +30,7 @@ dependencies {
     testRuntimeOnly files('build/resources/main')
 
     testRuntimeOnly project(':log-to-slf4j')
-    Classpaths.inheritSlf4j(project, 'slf4j-simple', 'testRuntimeOnly')
+    testRuntimeOnly libs.slf4j.simple
 }
 
 test {
diff --git a/plugin/build.gradle b/plugin/build.gradle
index 8edf2eb2438..8300d781252 100644
--- a/plugin/build.gradle
+++ b/plugin/build.gradle
@@ -5,4 +5,7 @@ plugins {
 
 description = 'The Deephaven plugin interface'
 
-Classpaths.inheritImmutables(project)
+dependencies {
+    compileOnly project(':util-immutables')
+    annotationProcessor libs.immutables.value
+}
diff --git a/plugin/dagger/build.gradle b/plugin/dagger/build.gradle
index cca2c8e6dfd..4b3db99c9b2 100644
--- a/plugin/dagger/build.gradle
+++ b/plugin/dagger/build.gradle
@@ -7,14 +7,19 @@ description = 'Dagger for Deephaven plugins'
 
 dependencies {
     api project(':plugin')
-    Classpaths.inheritDagger(project)
 
-    Classpaths.inheritDagger(project, true) // test
-    Classpaths.inheritAutoService(project, true) // test
-    Classpaths.inheritJUnitPlatform(project)
-    Classpaths.inheritAssertJ(project)
-    testImplementation 'org.junit.jupiter:junit-jupiter'
-    testRuntimeOnly 'org.junit.platform:junit-platform-launcher'
+    implementation libs.dagger
+    annotationProcessor libs.dagger.compiler
+
+    testImplementation libs.dagger
+    testAnnotationProcessor libs.dagger.compiler
+
+    testCompileOnly libs.autoservice
+    testAnnotationProcessor libs.autoservice.compiler
+    testImplementation libs.assertj
+    testImplementation platform(libs.junit.bom)
+    testImplementation libs.junit.jupiter
+    testRuntimeOnly libs.junit.platform.launcher
 }
 
 test {
diff --git a/plugin/echo/build.gradle b/plugin/echo/build.gradle
index 240a370bd66..688f9db6758 100644
--- a/plugin/echo/build.gradle
+++ b/plugin/echo/build.gradle
@@ -5,5 +5,6 @@ plugins {
 
 dependencies {
     api project(':plugin')
-    Classpaths.inheritAutoService(project)
+    compileOnly libs.autoservice
+    annotationProcessor libs.autoservice.compiler
 }
diff --git a/plugin/figure/build.gradle b/plugin/figure/build.gradle
index a79919ed4b8..c42ac3a597e 100644
--- a/plugin/figure/build.gradle
+++ b/plugin/figure/build.gradle
@@ -9,5 +9,6 @@ dependencies {
     implementation project(':Plot')
     implementation project(':extensions-barrage')
 
-    Classpaths.inheritAutoService(project)
+    compileOnly libs.autoservice
+    annotationProcessor libs.autoservice.compiler
 }
diff --git a/plugin/hierarchicaltable/build.gradle b/plugin/hierarchicaltable/build.gradle
index 721953224d7..72589c8cf6f 100644
--- a/plugin/hierarchicaltable/build.gradle
+++ b/plugin/hierarchicaltable/build.gradle
@@ -9,5 +9,6 @@ dependencies {
 
     implementation project(':extensions-barrage')
 
-    Classpaths.inheritAutoService(project)
+    compileOnly libs.autoservice
+    annotationProcessor libs.autoservice.compiler
 }
diff --git a/plugin/partitionedtable/build.gradle b/plugin/partitionedtable/build.gradle
index 721953224d7..72589c8cf6f 100644
--- a/plugin/partitionedtable/build.gradle
+++ b/plugin/partitionedtable/build.gradle
@@ -9,5 +9,6 @@ dependencies {
 
     implementation project(':extensions-barrage')
 
-    Classpaths.inheritAutoService(project)
+    compileOnly libs.autoservice
+    annotationProcessor libs.autoservice.compiler
 }
diff --git a/props/configs/src/main/resources/calendar/UTC.calendar b/props/configs/src/main/resources/calendar/UTC.calendar
index 5b1f6c25fda..f3b1a8430d6 100644
--- a/props/configs/src/main/resources/calendar/UTC.calendar
+++ b/props/configs/src/main/resources/calendar/UTC.calendar
@@ -9,6 +9,6 @@
     <firstValidDate>1900-01-01</firstValidDate>
     <lastValidDate>2100-12-31</lastValidDate>
     <default>
-        <businessTime><open>00:00</open><close>23:59:59.999999999</close></businessTime>
+        <businessTime><open>00:00</open><close>23:59:59.999999999</close><includeClose>true</includeClose></businessTime>
     </default>
 </calendar>
\ No newline at end of file
diff --git a/props/configs/src/main/resources/dh-defaults.prop b/props/configs/src/main/resources/dh-defaults.prop
index 3b97d130368..d3e0c6d2ede 100644
--- a/props/configs/src/main/resources/dh-defaults.prop
+++ b/props/configs/src/main/resources/dh-defaults.prop
@@ -53,13 +53,21 @@ authentication.anonymous.warn=true
 web.storage.layout.directory=/layouts
 web.storage.notebook.directory=/notebooks
 
+# Enable WebGL support in the web interface, or forcibly disable it and prevent users from enabling it.
+web.webgl=true
+web.webgl.editable=true
+
+# Default to not flattening web viewports, but allow it as an option
+web.flattenViewports=false
+
 # List of configuration properties to provide to unauthenticated clients, so that they can decide how best to prove their
 # identity to the server.
 authentication.client.configuration.list=AuthHandlers
 
 # List of configuration properties to provide to authenticated clients, so they can interact with the server.
-client.configuration.list=java.version,deephaven.version,barrage.version,http.session.durationMs,file.separator,web.storage.layout.directory,web.storage.notebook.directory
+client.configuration.list=java.version,deephaven.version,barrage.version,groovy.version,python.version,http.session.durationMs,file.separator,web.storage.layout.directory,web.storage.notebook.directory,web.webgl,web.webgl.editable,web.flattenViewports
+
 # Version list to add to the configuration property list. Each `=`-delimited pair denotes a short name for a versioned
 # jar, and a class that is found in that jar. Any such keys will be made available to the client.configuration.list
 # as <key>.version.
-client.version.list=deephaven=io.deephaven.engine.table.Table,barrage=io.deephaven.barrage.flatbuf.BarrageMessageWrapper
+client.version.list=deephaven=io.deephaven.engine.table.Table,barrage=io.deephaven.barrage.flatbuf.BarrageMessageWrapper,groovy=groovy.lang.GroovyShell
diff --git a/props/test-configs/build.gradle b/props/test-configs/build.gradle
index c10561e87c7..a8700e7ac46 100644
--- a/props/test-configs/build.gradle
+++ b/props/test-configs/build.gradle
@@ -2,10 +2,9 @@ plugins {
     id 'io.deephaven.project.register'
 }
 
-configurations {
-    implementation.extendsFrom fishConfig
-}
-
 dependencies {
-    Classpaths.inheritAutoService(project)
+    compileOnly libs.autoservice
+    annotationProcessor libs.autoservice.compiler
+
+    implementation project(':Configuration')
 }
diff --git a/proto/proto-backplane-grpc-flight/build.gradle b/proto/proto-backplane-grpc-flight/build.gradle
index 56323e01b50..79437d364b8 100644
--- a/proto/proto-backplane-grpc-flight/build.gradle
+++ b/proto/proto-backplane-grpc-flight/build.gradle
@@ -7,5 +7,5 @@ description = 'The Deephaven proto-backplane-grpc-flight'
 
 dependencies {
     api project(':proto:proto-backplane-grpc')
-    Classpaths.inheritArrow(project, 'flight-core', 'api')
+    api libs.arrow.flight.core
 }
diff --git a/proto/proto-backplane-grpc-flight/gradle.properties b/proto/proto-backplane-grpc-flight/gradle.properties
index 9e8588f2620..c186bbfdde1 100644
--- a/proto/proto-backplane-grpc-flight/gradle.properties
+++ b/proto/proto-backplane-grpc-flight/gradle.properties
@@ -1,2 +1 @@
 io.deephaven.project.ProjectType=JAVA_PUBLIC
-languageLevel=8
diff --git a/proto/proto-backplane-grpc/Dockerfile b/proto/proto-backplane-grpc/Dockerfile
index 1fcbd80b8f8..80fceb27785 100644
--- a/proto/proto-backplane-grpc/Dockerfile
+++ b/proto/proto-backplane-grpc/Dockerfile
@@ -11,6 +11,10 @@ RUN set -eux; \
   mkdir -p /generated/go; \
   mkdir -p /generated/python; \
   mkdir -p /generated/cpp; \
+  mkdir -p /generated/proto-doc/single-html; \
+  mkdir -p /generated/proto-doc/single-md; \
+  mkdir -p /generated/proto-doc/multi-html; \
+  mkdir -p /generated/proto-doc/multi-md; \
   /opt/protoc/bin/protoc \
     --plugin=protoc-gen-grpc=/opt/java/bin/protoc-gen-grpc-java \
     --java_out=/generated/java \
@@ -18,17 +22,17 @@ RUN set -eux; \
     -I/dependencies \
     -I/includes \
     /dependencies/BrowserFlight.proto \
-    /includes/deephaven/proto/ticket.proto \
-    /includes/deephaven/proto/console.proto \
-    /includes/deephaven/proto/object.proto \
-    /includes/deephaven/proto/session.proto \
-    /includes/deephaven/proto/table.proto \
-    /includes/deephaven/proto/application.proto \
-    /includes/deephaven/proto/inputtable.proto \
-    /includes/deephaven/proto/partitionedtable.proto \
-    /includes/deephaven/proto/config.proto \
-    /includes/deephaven/proto/hierarchicaltable.proto \
-    /includes/deephaven/proto/storage.proto; \
+    /includes/deephaven_core/proto/ticket.proto \
+    /includes/deephaven_core/proto/console.proto \
+    /includes/deephaven_core/proto/object.proto \
+    /includes/deephaven_core/proto/session.proto \
+    /includes/deephaven_core/proto/table.proto \
+    /includes/deephaven_core/proto/application.proto \
+    /includes/deephaven_core/proto/inputtable.proto \
+    /includes/deephaven_core/proto/partitionedtable.proto \
+    /includes/deephaven_core/proto/config.proto \
+    /includes/deephaven_core/proto/hierarchicaltable.proto \
+    /includes/deephaven_core/proto/storage.proto; \
   /opt/protoc/bin/protoc \
     --plugin=protoc-gen-ts=/usr/src/app/node_modules/.bin/protoc-gen-ts \
     --js_out=import_style=commonjs_strict:/generated/js \
@@ -37,32 +41,32 @@ RUN set -eux; \
     -I/includes \
     /dependencies/BrowserFlight.proto \
     /dependencies/Flight.proto \
-    /includes/deephaven/proto/ticket.proto \
-    /includes/deephaven/proto/console.proto \
-    /includes/deephaven/proto/object.proto \
-    /includes/deephaven/proto/session.proto \
-    /includes/deephaven/proto/table.proto \
-    /includes/deephaven/proto/application.proto \
-    /includes/deephaven/proto/inputtable.proto \
-    /includes/deephaven/proto/partitionedtable.proto \
-    /includes/deephaven/proto/config.proto \
-    /includes/deephaven/proto/hierarchicaltable.proto \
-    /includes/deephaven/proto/storage.proto; \
+    /includes/deephaven_core/proto/ticket.proto \
+    /includes/deephaven_core/proto/console.proto \
+    /includes/deephaven_core/proto/object.proto \
+    /includes/deephaven_core/proto/session.proto \
+    /includes/deephaven_core/proto/table.proto \
+    /includes/deephaven_core/proto/application.proto \
+    /includes/deephaven_core/proto/inputtable.proto \
+    /includes/deephaven_core/proto/partitionedtable.proto \
+    /includes/deephaven_core/proto/config.proto \
+    /includes/deephaven_core/proto/hierarchicaltable.proto \
+    /includes/deephaven_core/proto/storage.proto; \
   python3 -m grpc_tools.protoc \
     --grpc_python_out=/generated/python \
     --python_out=/generated/python \
     -I/includes \
-    /includes/deephaven/proto/ticket.proto \
-    /includes/deephaven/proto/console.proto \
-    /includes/deephaven/proto/object.proto \
-    /includes/deephaven/proto/session.proto \
-    /includes/deephaven/proto/table.proto \
-    /includes/deephaven/proto/application.proto \
-    /includes/deephaven/proto/inputtable.proto \
-    /includes/deephaven/proto/partitionedtable.proto \
-    /includes/deephaven/proto/config.proto \
-    /includes/deephaven/proto/hierarchicaltable.proto \
-    /includes/deephaven/proto/storage.proto; \
+    /includes/deephaven_core/proto/ticket.proto \
+    /includes/deephaven_core/proto/console.proto \
+    /includes/deephaven_core/proto/object.proto \
+    /includes/deephaven_core/proto/session.proto \
+    /includes/deephaven_core/proto/table.proto \
+    /includes/deephaven_core/proto/application.proto \
+    /includes/deephaven_core/proto/inputtable.proto \
+    /includes/deephaven_core/proto/partitionedtable.proto \
+    /includes/deephaven_core/proto/config.proto \
+    /includes/deephaven_core/proto/hierarchicaltable.proto \
+    /includes/deephaven_core/proto/storage.proto; \
   /opt/protoc/bin/protoc \
     --plugin=protoc-gen-go=/opt/go/bin/protoc-gen-go \
     --plugin=protoc-gen-go-grpc=/opt/go/bin/protoc-gen-go-grpc \
@@ -74,14 +78,164 @@ RUN set -eux; \
     --cpp_out=generated/cpp \
     --cpp_grpc_out=generated/cpp \
     -I/includes \
-    /includes/deephaven/proto/ticket.proto \
-    /includes/deephaven/proto/console.proto \
-    /includes/deephaven/proto/object.proto \
-    /includes/deephaven/proto/session.proto \
-    /includes/deephaven/proto/table.proto \
-    /includes/deephaven/proto/application.proto \
-    /includes/deephaven/proto/inputtable.proto \
-    /includes/deephaven/proto/partitionedtable.proto \
-    /includes/deephaven/proto/config.proto \
-    /includes/deephaven/proto/hierarchicaltable.proto \
-    /includes/deephaven/proto/storage.proto;
+    /includes/deephaven_core/proto/ticket.proto \
+    /includes/deephaven_core/proto/console.proto \
+    /includes/deephaven_core/proto/object.proto \
+    /includes/deephaven_core/proto/session.proto \
+    /includes/deephaven_core/proto/table.proto \
+    /includes/deephaven_core/proto/application.proto \
+    /includes/deephaven_core/proto/inputtable.proto \
+    /includes/deephaven_core/proto/partitionedtable.proto \
+    /includes/deephaven_core/proto/config.proto \
+    /includes/deephaven_core/proto/hierarchicaltable.proto \
+    /includes/deephaven_core/proto/storage.proto; \
+  # proto-doc-gen does not support writing multiple proto files to multiple docs, must break up command \
+  # we are going to generate 4 sets of docs - single html, multi html, single markdown, multi markdown \
+  # first, single html \
+  /opt/protoc/bin/protoc \
+    --plugin=protoc-gen-doc=/usr/local/bin/protoc-gen-doc \
+    --doc_out=generated/proto-doc/single-html \
+    --doc_opt=html,index.html \
+    -I/includes \
+    /includes/deephaven_core/proto/*.proto; \
+  # next, single markdown \
+  /opt/protoc/bin/protoc \
+    --plugin=protoc-gen-doc=/usr/local/bin/protoc-gen-doc \
+    --doc_out=generated/proto-doc/single-md \
+    --doc_opt=markdown,index.md \
+    -I/includes \
+    /includes/deephaven_core/proto/*.proto; \
+  # then, multi html \
+  /opt/protoc/bin/protoc \
+    --plugin=protoc-gen-doc=/usr/local/bin/protoc-gen-doc \
+    --doc_out=generated/proto-doc/multi-html \
+    --doc_opt=html,ticket.html \
+    -I/includes \
+    /includes/deephaven_core/proto/ticket.proto; \
+  /opt/protoc/bin/protoc \
+    --plugin=protoc-gen-doc=/usr/local/bin/protoc-gen-doc \
+    --doc_out=generated/proto-doc/multi-html \
+    --doc_opt=html,console.html \
+    -I/includes \
+    /includes/deephaven_core/proto/console.proto; \
+  /opt/protoc/bin/protoc \
+    --plugin=protoc-gen-doc=/usr/local/bin/protoc-gen-doc \
+    --doc_out=generated/proto-doc/multi-html \
+    --doc_opt=html,object.html \
+    -I/includes \
+    /includes/deephaven_core/proto/object.proto; \
+  /opt/protoc/bin/protoc \
+    --plugin=protoc-gen-doc=/usr/local/bin/protoc-gen-doc \
+    --doc_out=generated/proto-doc/multi-html \
+    --doc_opt=html,session.html \
+    -I/includes \
+    /includes/deephaven_core/proto/session.proto; \
+  /opt/protoc/bin/protoc \
+    --plugin=protoc-gen-doc=/usr/local/bin/protoc-gen-doc \
+    --doc_out=generated/proto-doc/multi-html \
+    --doc_opt=html,table.html \
+    -I/includes \
+    /includes/deephaven_core/proto/table.proto; \
+  /opt/protoc/bin/protoc \
+    --plugin=protoc-gen-doc=/usr/local/bin/protoc-gen-doc \
+    --doc_out=generated/proto-doc/multi-html \
+    --doc_opt=html,application.html \
+    -I/includes \
+    /includes/deephaven_core/proto/application.proto; \
+  /opt/protoc/bin/protoc \
+    --plugin=protoc-gen-doc=/usr/local/bin/protoc-gen-doc \
+    --doc_out=generated/proto-doc/multi-html \
+    --doc_opt=html,inputtable.html \
+    -I/includes \
+    /includes/deephaven_core/proto/inputtable.proto; \
+  /opt/protoc/bin/protoc \
+    --plugin=protoc-gen-doc=/usr/local/bin/protoc-gen-doc \
+    --doc_out=generated/proto-doc/multi-html \
+    --doc_opt=html,partitionedtable.html \
+    -I/includes \
+    /includes/deephaven_core/proto/partitionedtable.proto; \
+  /opt/protoc/bin/protoc \
+    --plugin=protoc-gen-doc=/usr/local/bin/protoc-gen-doc \
+    --doc_out=generated/proto-doc/multi-html \
+    --doc_opt=html,config.html \
+    -I/includes \
+    /includes/deephaven_core/proto/config.proto; \
+  /opt/protoc/bin/protoc \
+    --plugin=protoc-gen-doc=/usr/local/bin/protoc-gen-doc \
+    --doc_out=generated/proto-doc/multi-html \
+    --doc_opt=html,hierarchicaltable.html \
+    -I/includes \
+    /includes/deephaven_core/proto/hierarchicaltable.proto; \
+  /opt/protoc/bin/protoc \
+    --plugin=protoc-gen-doc=/usr/local/bin/protoc-gen-doc \
+    --doc_out=generated/proto-doc/multi-html \
+    --doc_opt=html,storage.html \
+    -I/includes \
+    /includes/deephaven_core/proto/storage.proto; \
+  # finally, multi md \
+  /opt/protoc/bin/protoc \
+    --plugin=protoc-gen-doc=/usr/local/bin/protoc-gen-doc \
+    --doc_out=generated/proto-doc/multi-md \
+    --doc_opt=markdown,ticket.md \
+    -I/includes \
+    /includes/deephaven_core/proto/ticket.proto; \
+  /opt/protoc/bin/protoc \
+    --plugin=protoc-gen-doc=/usr/local/bin/protoc-gen-doc \
+    --doc_out=generated/proto-doc/multi-md \
+    --doc_opt=markdown,console.md \
+    -I/includes \
+    /includes/deephaven_core/proto/console.proto; \
+  /opt/protoc/bin/protoc \
+    --plugin=protoc-gen-doc=/usr/local/bin/protoc-gen-doc \
+    --doc_out=generated/proto-doc/multi-md \
+    --doc_opt=markdown,object.md \
+    -I/includes \
+    /includes/deephaven_core/proto/object.proto; \
+  /opt/protoc/bin/protoc \
+    --plugin=protoc-gen-doc=/usr/local/bin/protoc-gen-doc \
+    --doc_out=generated/proto-doc/multi-md \
+    --doc_opt=markdown,session.md \
+    -I/includes \
+    /includes/deephaven_core/proto/session.proto; \
+  /opt/protoc/bin/protoc \
+    --plugin=protoc-gen-doc=/usr/local/bin/protoc-gen-doc \
+    --doc_out=generated/proto-doc/multi-md \
+    --doc_opt=markdown,table.md \
+    -I/includes \
+    /includes/deephaven_core/proto/table.proto; \
+  /opt/protoc/bin/protoc \
+    --plugin=protoc-gen-doc=/usr/local/bin/protoc-gen-doc \
+    --doc_out=generated/proto-doc/multi-md \
+    --doc_opt=markdown,application.md \
+    -I/includes \
+    /includes/deephaven_core/proto/application.proto; \
+  /opt/protoc/bin/protoc \
+    --plugin=protoc-gen-doc=/usr/local/bin/protoc-gen-doc \
+    --doc_out=generated/proto-doc/multi-md \
+    --doc_opt=markdown,inputtable.md \
+    -I/includes \
+    /includes/deephaven_core/proto/inputtable.proto; \
+  /opt/protoc/bin/protoc \
+    --plugin=protoc-gen-doc=/usr/local/bin/protoc-gen-doc \
+    --doc_out=generated/proto-doc/multi-md \
+    --doc_opt=markdown,partitionedtable.md \
+    -I/includes \
+    /includes/deephaven_core/proto/partitionedtable.proto; \
+  /opt/protoc/bin/protoc \
+    --plugin=protoc-gen-doc=/usr/local/bin/protoc-gen-doc \
+    --doc_out=generated/proto-doc/multi-md \
+    --doc_opt=markdown,config.md \
+    -I/includes \
+    /includes/deephaven_core/proto/config.proto; \
+  /opt/protoc/bin/protoc \
+    --plugin=protoc-gen-doc=/usr/local/bin/protoc-gen-doc \
+    --doc_out=generated/proto-doc/multi-md \
+    --doc_opt=markdown,hierarchicaltable.md \
+    -I/includes \
+    /includes/deephaven_core/proto/hierarchicaltable.proto; \
+  /opt/protoc/bin/protoc \
+    --plugin=protoc-gen-doc=/usr/local/bin/protoc-gen-doc \
+    --doc_out=generated/proto-doc/multi-md \
+    --doc_opt=markdown,storage.md \
+    -I/includes \
+    /includes/deephaven_core/proto/storage.proto; \
diff --git a/proto/proto-backplane-grpc/build.gradle b/proto/proto-backplane-grpc/build.gradle
index f911de50fdc..d605f4548da 100644
--- a/proto/proto-backplane-grpc/build.gradle
+++ b/proto/proto-backplane-grpc/build.gradle
@@ -14,38 +14,37 @@ configurations {
     transitive = false
   }
 
-  // automatically pick up the standard junit version
-  testImplementation.extendsFrom junit
-
   js {}
   python {}
   go {}
-  cpp {}
+  protoDocs {}
 }
 
 dependencies {
   // This should be implementation, if listed at all, at least once we have own own version management
-  Classpaths.inheritProtobuf(project, 'api')
+  api libs.protobuf.java
 
-  Classpaths.inheritGrpcPlatform(project, 'api')
-  api 'io.grpc:grpc-protobuf'
-  api 'io.grpc:grpc-api'
-  api 'io.grpc:grpc-stub'
+  api platform(libs.grpc.bom)
+  api libs.grpc.protobuf
+  api libs.grpc.api
+  api libs.grpc.stub
 
-  Classpaths.inheritBoringSsl(project)
+  runtimeOnly libs.boringssl
 
   // This is excessive, and brings in every grpc jar, making it compile-only limits what it pulls in to
   // downstream classpaths
-  Classpaths.inheritArrow(project, 'flight-core', 'compileOnly')
+  compileOnly libs.arrow.flight.core
 
-  compileOnly 'javax.inject:javax.inject:1'
-  compileOnly "javax.annotation:javax.annotation-api:1.3.1"
+  compileOnly libs.javax.inject
+  compileOnly libs.javax.annotation.api
 
   // technically we should have a runtime dependency on barrage-core, but instead we are regenerating
   // the same output that it contains, and we have declared the correct dependencies as necessary
   //  compile 'io.deephaven.barrage:barrage-core:0.5.0'
-  download 'io.deephaven.barrage:barrage-core:0.6.0'
-  Classpaths.inheritArrow(project, 'flight-core', 'download')
+  download libs.deephaven.barrage.core
+  download libs.arrow.flight.core
+
+  testImplementation libs.junit4
 }
 
 TaskProvider<Task> generateProtobuf = Docker.registerDockerTask(project, 'generateProtobuf') {
@@ -86,7 +85,7 @@ artifacts {
   go(layout.buildDirectory.dir('generated/source/proto/main/go')) {
     builtBy generateProtobuf
   }
-  cpp(layout.buildDirectory.dir('generated/source/proto/main/cpp')) {
+  protoDocs(layout.buildDirectory.dir('generated/source/proto/main/proto-doc')) {
     builtBy generateProtobuf
   }
 }
@@ -100,7 +99,7 @@ sourceSets {
       srcDir(generateProtobuf).include("**/*.java")
     }
     resources {
-      srcDir 'src/main/proto/deephaven/proto'
+      srcDir 'src/main/proto'
     }
   }
 }
diff --git a/proto/proto-backplane-grpc/gradle.properties b/proto/proto-backplane-grpc/gradle.properties
index 9e8588f2620..c186bbfdde1 100644
--- a/proto/proto-backplane-grpc/gradle.properties
+++ b/proto/proto-backplane-grpc/gradle.properties
@@ -1,2 +1 @@
 io.deephaven.project.ProjectType=JAVA_PUBLIC
-languageLevel=8
diff --git a/proto/proto-backplane-grpc/src/main/java/io/deephaven/proto/util/ByteHelper.java b/proto/proto-backplane-grpc/src/main/java/io/deephaven/proto/util/ByteHelper.java
index 8136cb31801..a995990534b 100644
--- a/proto/proto-backplane-grpc/src/main/java/io/deephaven/proto/util/ByteHelper.java
+++ b/proto/proto-backplane-grpc/src/main/java/io/deephaven/proto/util/ByteHelper.java
@@ -6,10 +6,10 @@
 import java.nio.ByteBuffer;
 
 public class ByteHelper {
-    public static String byteBufToHex(final ByteBuffer ticket) {
+    public static String byteBufToHex(final ByteBuffer buffer) {
         StringBuilder sb = new StringBuilder();
-        for (int i = ticket.position(); i < ticket.limit(); ++i) {
-            sb.append(String.format("%02x", ticket.get(i)));
+        for (int i = buffer.position(); i < buffer.limit(); ++i) {
+            sb.append(String.format("%02x", buffer.get(i)));
         }
         return sb.toString();
     }
diff --git a/proto/proto-backplane-grpc/src/main/java/io/deephaven/proto/util/Exceptions.java b/proto/proto-backplane-grpc/src/main/java/io/deephaven/proto/util/Exceptions.java
index 3a1d98610b9..cdeaa94ce08 100644
--- a/proto/proto-backplane-grpc/src/main/java/io/deephaven/proto/util/Exceptions.java
+++ b/proto/proto-backplane-grpc/src/main/java/io/deephaven/proto/util/Exceptions.java
@@ -14,4 +14,19 @@ public static StatusRuntimeException statusRuntimeException(final Code statusCod
         return StatusProto.toStatusRuntimeException(
                 Status.newBuilder().setCode(statusCode.getNumber()).setMessage(details).build());
     }
+
+    static StatusRuntimeException error(io.grpc.Status.Code code, String message) {
+        return code
+                .toStatus()
+                .withDescription("Flight SQL: " + message)
+                .asRuntimeException();
+    }
+
+    static StatusRuntimeException error(io.grpc.Status.Code code, String message, Throwable cause) {
+        return code
+                .toStatus()
+                .withDescription("Flight SQL: " + message)
+                .withCause(cause)
+                .asRuntimeException();
+    }
 }
diff --git a/proto/proto-backplane-grpc/src/main/java/io/deephaven/proto/util/OperationHelper.java b/proto/proto-backplane-grpc/src/main/java/io/deephaven/proto/util/OperationHelper.java
index 25b82cdf97a..d7929aa9237 100644
--- a/proto/proto-backplane-grpc/src/main/java/io/deephaven/proto/util/OperationHelper.java
+++ b/proto/proto-backplane-grpc/src/main/java/io/deephaven/proto/util/OperationHelper.java
@@ -103,6 +103,8 @@ public static Stream<TableReference> getSourceIds(Operation op) {
                 return Stream.of(op.getColumnStatistics().getSourceId());
             case MULTI_JOIN:
                 return op.getMultiJoin().getMultiJoinInputsList().stream().map(MultiJoinInput::getSourceId);
+            case SLICE:
+                return Stream.of(op.getSlice().getSourceId());
             case OP_NOT_SET:
                 throw new IllegalStateException("Operation id not set");
             default:
diff --git a/proto/proto-backplane-grpc/src/main/proto/build-cpp-protos.sh b/proto/proto-backplane-grpc/src/main/proto/build-cpp-protos.sh
deleted file mode 100755
index c24b0109a50..00000000000
--- a/proto/proto-backplane-grpc/src/main/proto/build-cpp-protos.sh
+++ /dev/null
@@ -1,20 +0,0 @@
-#!/bin/bash
-
-set -euxo pipefail
-
-if [ -z ${PROTOC_BIN:+x} ] && [ -z ${DHCPP:+x} ]; then
-    echo "$0: At least one of the environment variables 'PROTOC_BIN' and 'DHCPP' must be defined, aborting." 1>&2
-    exit 1
-fi
-
-: ${PROTOC_BIN:=$DHCPP/bin}
-: ${CPP_PROTO_BUILD_DIR:=build}
-
-mkdir -p "${CPP_PROTO_BUILD_DIR}"
-$DHCPP/bin/protoc \
-    $(find . -name '*.proto') \
-    --cpp_out=${CPP_PROTO_BUILD_DIR} \
-    --grpc_out=${CPP_PROTO_BUILD_DIR} \
-    --plugin=protoc-gen-grpc=${PROTOC_BIN}/grpc_cpp_plugin
-mv -f ${CPP_PROTO_BUILD_DIR}/deephaven/proto/*.{h,cc} \
-   ../../../../../cpp-client/deephaven/dhclient/proto/deephaven/proto
diff --git a/proto/proto-backplane-grpc/src/main/proto/deephaven/proto/application.proto b/proto/proto-backplane-grpc/src/main/proto/deephaven_core/proto/application.proto
similarity index 97%
rename from proto/proto-backplane-grpc/src/main/proto/deephaven/proto/application.proto
rename to proto/proto-backplane-grpc/src/main/proto/deephaven_core/proto/application.proto
index 4386fc870c2..41dc98803c4 100644
--- a/proto/proto-backplane-grpc/src/main/proto/deephaven/proto/application.proto
+++ b/proto/proto-backplane-grpc/src/main/proto/deephaven_core/proto/application.proto
@@ -9,7 +9,7 @@ option java_multiple_files = true;
 option optimize_for = SPEED;
 option go_package = "github.com/deephaven/deephaven-core/go/internal/proto/application";
 
-import "deephaven/proto/ticket.proto";
+import "deephaven_core/proto/ticket.proto";
 
 /*
  * Allows clients to list fields that are accessible to them.
diff --git a/proto/proto-backplane-grpc/src/main/proto/deephaven/proto/config.proto b/proto/proto-backplane-grpc/src/main/proto/deephaven_core/proto/config.proto
similarity index 100%
rename from proto/proto-backplane-grpc/src/main/proto/deephaven/proto/config.proto
rename to proto/proto-backplane-grpc/src/main/proto/deephaven_core/proto/config.proto
diff --git a/proto/proto-backplane-grpc/src/main/proto/deephaven/proto/console.proto b/proto/proto-backplane-grpc/src/main/proto/deephaven_core/proto/console.proto
similarity index 99%
rename from proto/proto-backplane-grpc/src/main/proto/deephaven/proto/console.proto
rename to proto/proto-backplane-grpc/src/main/proto/deephaven_core/proto/console.proto
index fcf59bbbd66..3e6bc479dea 100644
--- a/proto/proto-backplane-grpc/src/main/proto/deephaven/proto/console.proto
+++ b/proto/proto-backplane-grpc/src/main/proto/deephaven_core/proto/console.proto
@@ -9,8 +9,8 @@ option java_multiple_files = true;
 option optimize_for = SPEED;
 option go_package = "github.com/deephaven/deephaven-core/go/internal/proto/console";
 
-import "deephaven/proto/ticket.proto";
-import "deephaven/proto/application.proto";
+import "deephaven_core/proto/ticket.proto";
+import "deephaven_core/proto/application.proto";
 
 /*
  * Console interaction service
diff --git a/proto/proto-backplane-grpc/src/main/proto/deephaven/proto/hierarchicaltable.proto b/proto/proto-backplane-grpc/src/main/proto/deephaven_core/proto/hierarchicaltable.proto
similarity index 99%
rename from proto/proto-backplane-grpc/src/main/proto/deephaven/proto/hierarchicaltable.proto
rename to proto/proto-backplane-grpc/src/main/proto/deephaven_core/proto/hierarchicaltable.proto
index e94686876f7..1f9a216e32d 100644
--- a/proto/proto-backplane-grpc/src/main/proto/deephaven/proto/hierarchicaltable.proto
+++ b/proto/proto-backplane-grpc/src/main/proto/deephaven_core/proto/hierarchicaltable.proto
@@ -10,8 +10,8 @@ option java_multiple_files = true;
 option optimize_for = SPEED;
 option go_package = "github.com/deephaven/deephaven-core/go/internal/proto/hierarchicaltable";
 
-import "deephaven/proto/table.proto";
-import "deephaven/proto/ticket.proto";
+import "deephaven_core/proto/table.proto";
+import "deephaven_core/proto/ticket.proto";
 
 // This service provides tools to create and view hierarchical tables (rollups and trees).
 service HierarchicalTableService {
diff --git a/proto/proto-backplane-grpc/src/main/proto/deephaven/proto/inputtable.proto b/proto/proto-backplane-grpc/src/main/proto/deephaven_core/proto/inputtable.proto
similarity index 96%
rename from proto/proto-backplane-grpc/src/main/proto/deephaven/proto/inputtable.proto
rename to proto/proto-backplane-grpc/src/main/proto/deephaven_core/proto/inputtable.proto
index 8abd2b39820..16ba436d9cd 100644
--- a/proto/proto-backplane-grpc/src/main/proto/deephaven/proto/inputtable.proto
+++ b/proto/proto-backplane-grpc/src/main/proto/deephaven_core/proto/inputtable.proto
@@ -9,7 +9,7 @@ option java_multiple_files = true;
 option optimize_for = SPEED;
 option go_package = "github.com/deephaven/deephaven-core/go/internal/proto/inputtable";
 
-import "deephaven/proto/ticket.proto";
+import "deephaven_core/proto/ticket.proto";
 
 /*
  * This service offers methods to manipulate the contents of input tables.
diff --git a/proto/proto-backplane-grpc/src/main/proto/deephaven/proto/object.proto b/proto/proto-backplane-grpc/src/main/proto/deephaven_core/proto/object.proto
similarity index 99%
rename from proto/proto-backplane-grpc/src/main/proto/deephaven/proto/object.proto
rename to proto/proto-backplane-grpc/src/main/proto/deephaven_core/proto/object.proto
index 4686c78256b..d3a5285453b 100644
--- a/proto/proto-backplane-grpc/src/main/proto/deephaven/proto/object.proto
+++ b/proto/proto-backplane-grpc/src/main/proto/deephaven_core/proto/object.proto
@@ -9,7 +9,7 @@ option java_multiple_files = true;
 option optimize_for = SPEED;
 option go_package = "github.com/deephaven/deephaven-core/go/internal/proto/object";
 
-import "deephaven/proto/ticket.proto";
+import "deephaven_core/proto/ticket.proto";
 
 service ObjectService {
 
diff --git a/proto/proto-backplane-grpc/src/main/proto/deephaven/proto/partitionedtable.proto b/proto/proto-backplane-grpc/src/main/proto/deephaven_core/proto/partitionedtable.proto
similarity index 97%
rename from proto/proto-backplane-grpc/src/main/proto/deephaven/proto/partitionedtable.proto
rename to proto/proto-backplane-grpc/src/main/proto/deephaven_core/proto/partitionedtable.proto
index ab1ad973528..0f248082eeb 100644
--- a/proto/proto-backplane-grpc/src/main/proto/deephaven/proto/partitionedtable.proto
+++ b/proto/proto-backplane-grpc/src/main/proto/deephaven_core/proto/partitionedtable.proto
@@ -10,8 +10,8 @@ option java_multiple_files = true;
 option optimize_for = SPEED;
 option go_package = "github.com/deephaven/deephaven-core/go/internal/proto/partitionedtable";
 
-import "deephaven/proto/table.proto";
-import "deephaven/proto/ticket.proto";
+import "deephaven_core/proto/table.proto";
+import "deephaven_core/proto/ticket.proto";
 
 /*
  * This service provides tools to create and query partitioned tables.
diff --git a/proto/proto-backplane-grpc/src/main/proto/deephaven/proto/session.proto b/proto/proto-backplane-grpc/src/main/proto/deephaven_core/proto/session.proto
similarity index 99%
rename from proto/proto-backplane-grpc/src/main/proto/deephaven/proto/session.proto
rename to proto/proto-backplane-grpc/src/main/proto/deephaven_core/proto/session.proto
index d31ee230825..33f26b9228f 100644
--- a/proto/proto-backplane-grpc/src/main/proto/deephaven/proto/session.proto
+++ b/proto/proto-backplane-grpc/src/main/proto/deephaven_core/proto/session.proto
@@ -5,7 +5,7 @@ syntax = "proto3";
 
 package io.deephaven.proto.backplane.grpc;
 
-import "deephaven/proto/ticket.proto";
+import "deephaven_core/proto/ticket.proto";
 
 option java_multiple_files = true;
 option optimize_for = SPEED;
diff --git a/proto/proto-backplane-grpc/src/main/proto/deephaven/proto/storage.proto b/proto/proto-backplane-grpc/src/main/proto/deephaven_core/proto/storage.proto
similarity index 100%
rename from proto/proto-backplane-grpc/src/main/proto/deephaven/proto/storage.proto
rename to proto/proto-backplane-grpc/src/main/proto/deephaven_core/proto/storage.proto
diff --git a/proto/proto-backplane-grpc/src/main/proto/deephaven/proto/table.proto b/proto/proto-backplane-grpc/src/main/proto/deephaven_core/proto/table.proto
similarity index 96%
rename from proto/proto-backplane-grpc/src/main/proto/deephaven/proto/table.proto
rename to proto/proto-backplane-grpc/src/main/proto/deephaven_core/proto/table.proto
index cc7122371fe..7e89adf84bd 100644
--- a/proto/proto-backplane-grpc/src/main/proto/deephaven/proto/table.proto
+++ b/proto/proto-backplane-grpc/src/main/proto/deephaven_core/proto/table.proto
@@ -9,7 +9,7 @@ option java_multiple_files = true;
 option optimize_for = SPEED;
 option go_package = "github.com/deephaven/deephaven-core/go/internal/proto/table";
 
-import "deephaven/proto/ticket.proto";
+import "deephaven_core/proto/ticket.proto";
 
 service TableService {
   /*
@@ -265,13 +265,24 @@ service TableService {
    * primary use case for this is the Deephaven Web UI.
    */
   rpc ComputeColumnStatistics(ColumnStatisticsRequest) returns (ExportedTableCreationResponse) {}
+
+  /**
+   * Returns a new table representing a sliced subset of the original table. The start position is inclusive
+   * and the end position is exclusive. If a negative value is given, then the position is counted from the end of
+   * the table.
+   */
+  rpc Slice(SliceRequest) returns (ExportedTableCreationResponse) {}
 }
 
 message TableReference {
   oneof ref {
-    // an exported ticket
+    // A ticket to resolve to get the table. It's preferable to use export tickets in order to avoid races that are
+    // possible with tickets controlled by the server, but any ticket type will suffice as long as it resolves to a
+    // table.
     Ticket ticket = 1;
-    // an offset into a BatchRequest -- used to reference a result that will not be exported
+
+    // An offset into a BatchRequest's ops field, used to reference an intermediate operation which may not have been
+    // exported. Only valid to set when used in the context of a BatchRequest.
     sint32 batch_offset = 2;
   }
 }
@@ -295,8 +306,6 @@ message ExportedTableCreationResponse {
   // size isn't known without scanning partitions. Typically, the client should filter the data by the
   // partitioning columns first.
   sint64 size = 6 [jstype=JS_STRING];
-
-  // TODO: attributes
 }
 
 message FetchTableRequest {
@@ -343,6 +352,17 @@ message SelectOrUpdateRequest {
   repeated string column_specs = 3;
 }
 
+message Selectable {
+  // message ColumnExpression {
+  //  string column_name = 1;
+  //  Expression expression = 2;
+  // }
+  oneof type {
+    string raw = 1;
+    // ColumnExpression column_expression = 2;
+  }
+}
+
 message MathContext {
   enum RoundingMode {
     ROUNDING_MODE_NOT_SPECIFIED = 0;
@@ -1035,6 +1055,13 @@ message Aggregation {
     string column_name = 1;
   }
 
+  message AggregationCountWhere {
+    // The output column name
+    string column_name = 1;
+
+    repeated string filters = 2;
+  }
+
   message AggregationRowKey {
     string column_name = 1;
   }
@@ -1044,12 +1071,18 @@ message Aggregation {
     bool include_group_by_columns = 2;
   }
 
+  message AggregationFormula {
+    Selectable selectable = 1;
+  }
+
   oneof type {
     AggregationColumns columns = 1;
     AggregationCount count = 2;
     AggregationRowKey first_row_key = 3;
     AggregationRowKey last_row_key = 4;
     AggregationPartition partition = 5;
+    AggregationFormula formula = 6;
+    AggregationCountWhere count_where = 7;
   }
 }
 
@@ -1284,6 +1317,13 @@ message ColumnStatisticsRequest {
   optional int32 unique_value_limit = 4;
 }
 
+message SliceRequest {
+  Ticket result_id = 1;
+  TableReference source_id = 2;
+  sint64 first_position_inclusive = 3 [jstype=JS_STRING];
+  sint64 last_position_exclusive = 4 [jstype=JS_STRING];
+}
+
 message BatchTableRequest {
   repeated Operation ops = 1;
 
@@ -1333,6 +1373,7 @@ message BatchTableRequest {
       AjRajTablesRequest raj = 41;
       ColumnStatisticsRequest column_statistics = 42;
       MultiJoinTablesRequest multi_join = 43;
+      SliceRequest slice = 44;
     }
   }
 }
diff --git a/proto/proto-backplane-grpc/src/main/proto/deephaven/proto/ticket.proto b/proto/proto-backplane-grpc/src/main/proto/deephaven_core/proto/ticket.proto
similarity index 100%
rename from proto/proto-backplane-grpc/src/main/proto/deephaven/proto/ticket.proto
rename to proto/proto-backplane-grpc/src/main/proto/deephaven_core/proto/ticket.proto
diff --git a/proto/raw-js-openapi/flight_format/Message.fbs b/proto/raw-js-openapi/flight_format/Message.fbs
deleted file mode 100644
index b93c9e991e9..00000000000
--- a/proto/raw-js-openapi/flight_format/Message.fbs
+++ /dev/null
@@ -1,138 +0,0 @@
-// Licensed to the Apache Software Foundation (ASF) under one
-// or more contributor license agreements.  See the NOTICE file
-// distributed with this work for additional information
-// regarding copyright ownership.  The ASF licenses this file
-// to you under the Apache License, Version 2.0 (the
-// "License"); you may not use this file except in compliance
-// with the License.  You may obtain a copy of the License at
-//
-//   http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing,
-// software distributed under the License is distributed on an
-// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied.  See the License for the
-// specific language governing permissions and limitations
-// under the License.
-
-include "Schema.fbs";
-
-namespace org.apache.arrow.flatbuf;
-
-/// ----------------------------------------------------------------------
-/// Data structures for describing a table row batch (a collection of
-/// equal-length Arrow arrays)
-
-/// Metadata about a field at some level of a nested type tree (but not
-/// its children).
-///
-/// For example, a List<Int16> with values `[[1, 2, 3], null, [4], [5, 6], null]`
-/// would have {length: 5, null_count: 2} for its List node, and {length: 6,
-/// null_count: 0} for its Int16 node, as separate FieldNode structs
-struct FieldNode {
-  /// The number of value slots in the Arrow array at this level of a nested
-  /// tree
-  length: long;
-
-  /// The number of observed nulls. Fields with null_count == 0 may choose not
-  /// to write their physical validity bitmap out as a materialized buffer,
-  /// instead setting the length of the bitmap buffer to 0.
-  null_count: long;
-}
-
-enum CompressionType:byte {
-  // LZ4 frame format, for portability, as provided by lz4frame.h or wrappers
-  // thereof. Not to be confused with "raw" (also called "block") format
-  // provided by lz4.h
-  LZ4_FRAME,
-
-  // Zstandard
-  ZSTD
-}
-
-/// Provided for forward compatibility in case we need to support different
-/// strategies for compressing the IPC message body (like whole-body
-/// compression rather than buffer-level) in the future
-enum BodyCompressionMethod:byte {
-  /// Each constituent buffer is first compressed with the indicated
-  /// compressor, and then written with the uncompressed length in the first 8
-  /// bytes as a 64-bit little-endian signed integer followed by the compressed
-  /// buffer bytes (and then padding as required by the protocol). The
-  /// uncompressed length may be set to -1 to indicate that the data that
-  /// follows is not compressed, which can be useful for cases where
-  /// compression does not yield appreciable savings.
-  BUFFER
-}
-
-/// Optional compression for the memory buffers constituting IPC message
-/// bodies. Intended for use with RecordBatch but could be used for other
-/// message types
-table BodyCompression {
-  /// Compressor library
-  codec: CompressionType = LZ4_FRAME;
-
-  /// Indicates the way the record batch body was compressed
-  method: BodyCompressionMethod = BUFFER;
-}
-
-/// A data header describing the shared memory layout of a "record" or "row"
-/// batch. Some systems call this a "row batch" internally and others a "record
-/// batch".
-table RecordBatch {
-  /// number of records / rows. The arrays in the batch should all have this
-  /// length
-  length: long;
-
-  /// Nodes correspond to the pre-ordered flattened logical schema
-  nodes: [FieldNode];
-
-  /// Buffers correspond to the pre-ordered flattened buffer tree
-  ///
-  /// The number of buffers appended to this list depends on the schema. For
-  /// example, most primitive arrays will have 2 buffers, 1 for the validity
-  /// bitmap and 1 for the values. For struct arrays, there will only be a
-  /// single buffer for the validity (nulls) bitmap
-  buffers: [Buffer];
-
-  /// Optional compression of the message body
-  compression: BodyCompression;
-}
-
-/// For sending dictionary encoding information. Any Field can be
-/// dictionary-encoded, but in this case none of its children may be
-/// dictionary-encoded.
-/// There is one vector / column per dictionary, but that vector / column
-/// may be spread across multiple dictionary batches by using the isDelta
-/// flag
-
-table DictionaryBatch {
-  id: long;
-  data: RecordBatch;
-
-  /// If isDelta is true the values in the dictionary are to be appended to a
-  /// dictionary with the indicated id. If isDelta is false this dictionary
-  /// should replace the existing dictionary.
-  isDelta: bool = false;
-}
-
-/// ----------------------------------------------------------------------
-/// The root Message type
-
-/// This union enables us to easily send different message types without
-/// redundant storage, and in the future we can easily add new message types.
-///
-/// Arrow implementations do not need to implement all of the message types,
-/// which may include experimental metadata types. For maximum compatibility,
-/// it is best to send data using RecordBatch
-union MessageHeader {
-  Schema, DictionaryBatch, RecordBatch
-}
-
-table Message {
-  version: org.apache.arrow.flatbuf.MetadataVersion;
-  header: MessageHeader;
-  bodyLength: long;
-  custom_metadata: [ KeyValue ];
-}
-
-root_type Message;
diff --git a/proto/raw-js-openapi/flight_format/README.md b/proto/raw-js-openapi/flight_format/README.md
deleted file mode 100644
index 52d45ad2b7e..00000000000
--- a/proto/raw-js-openapi/flight_format/README.md
+++ /dev/null
@@ -1,3 +0,0 @@
-Currently we are generating flatbuffer files manually. See [deephaven-core/#1052](https://github.com/deephaven/deephaven-core/issues/1052) to track the work to automate this.
-
-${FLATC}  --ts --no-fb-import --no-ts-reexport -o src/arrow/flight/flatbuf/ flight_format/\*.fbs
diff --git a/proto/raw-js-openapi/flight_format/Schema.fbs b/proto/raw-js-openapi/flight_format/Schema.fbs
deleted file mode 100644
index 2d447d30791..00000000000
--- a/proto/raw-js-openapi/flight_format/Schema.fbs
+++ /dev/null
@@ -1,430 +0,0 @@
-// Licensed to the Apache Software Foundation (ASF) under one
-// or more contributor license agreements.  See the NOTICE file
-// distributed with this work for additional information
-// regarding copyright ownership.  The ASF licenses this file
-// to you under the Apache License, Version 2.0 (the
-// "License"); you may not use this file except in compliance
-// with the License.  You may obtain a copy of the License at
-//
-//   http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing,
-// software distributed under the License is distributed on an
-// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied.  See the License for the
-// specific language governing permissions and limitations
-// under the License.
-
-/// Logical types, vector layouts, and schemas
-
-namespace org.apache.arrow.flatbuf;
-
-enum MetadataVersion:short {
-  /// 0.1.0 (October 2016).
-  V1,
-
-  /// 0.2.0 (February 2017). Non-backwards compatible with V1.
-  V2,
-
-  /// 0.3.0 -> 0.7.1 (May - December 2017). Non-backwards compatible with V2.
-  V3,
-
-  /// >= 0.8.0 (December 2017). Non-backwards compatible with V3.
-  V4,
-
-  /// >= 1.0.0 (July 2020. Backwards compatible with V4 (V5 readers can read V4
-  /// metadata and IPC messages). Implementations are recommended to provide a
-  /// V4 compatibility mode with V5 format changes disabled.
-  ///
-  /// Incompatible changes between V4 and V5:
-  /// - Union buffer layout has changed. In V5, Unions don't have a validity
-  ///   bitmap buffer.
-  V5,
-}
-
-/// Represents Arrow Features that might not have full support
-/// within implementations. This is intended to be used in
-/// two scenarios:
-///  1.  A mechanism for readers of Arrow Streams
-///      and files to understand that the stream or file makes
-///      use of a feature that isn't supported or unknown to
-///      the implementation (and therefore can meet the Arrow
-///      forward compatibility guarantees).
-///  2.  A means of negotiating between a client and server
-///      what features a stream is allowed to use. The enums
-///      values here are intented to represent higher level
-///      features, additional details maybe negotiated
-///      with key-value pairs specific to the protocol.
-///
-/// Enums added to this list should be assigned power-of-two values
-/// to facilitate exchanging and comparing bitmaps for supported
-/// features.
-enum Feature : long {
-  /// Needed to make flatbuffers happy.
-  UNUSED = 0,
-  /// The stream makes use of multiple full dictionaries with the
-  /// same ID and assumes clients implement dictionary replacement
-  /// correctly.
-  DICTIONARY_REPLACEMENT = 1,
-  /// The stream makes use of compressed bodies as described
-  /// in Message.fbs.
-  COMPRESSED_BODY = 2
-}
-
-/// These are stored in the flatbuffer in the Type union below
-
-table Null {
-}
-
-/// A Struct_ in the flatbuffer metadata is the same as an Arrow Struct
-/// (according to the physical memory layout). We used Struct_ here as
-/// Struct is a reserved word in Flatbuffers
-table Struct_ {
-}
-
-table List {
-}
-
-/// Same as List, but with 64-bit offsets, allowing to represent
-/// extremely large data values.
-table LargeList {
-}
-
-table FixedSizeList {
-  /// Number of list items per value
-  listSize: int;
-}
-
-/// A Map is a logical nested type that is represented as
-///
-/// List<entries: Struct<key: K, value: V>>
-///
-/// In this layout, the keys and values are each respectively contiguous. We do
-/// not constrain the key and value types, so the application is responsible
-/// for ensuring that the keys are hashable and unique. Whether the keys are sorted
-/// may be set in the metadata for this field.
-///
-/// In a field with Map type, the field has a child Struct field, which then
-/// has two children: key type and the second the value type. The names of the
-/// child fields may be respectively "entries", "key", and "value", but this is
-/// not enforced.
-///
-/// Map
-/// ```text
-///   - child[0] entries: Struct
-///     - child[0] key: K
-///     - child[1] value: V
-/// ```
-/// Neither the "entries" field nor the "key" field may be nullable.
-///
-/// The metadata is structured so that Arrow systems without special handling
-/// for Map can make Map an alias for List. The "layout" attribute for the Map
-/// field must have the same contents as a List.
-table Map {
-  /// Set to true if the keys within each value are sorted
-  keysSorted: bool;
-}
-
-enum UnionMode:short { Sparse, Dense }
-
-/// A union is a complex type with children in Field
-/// By default ids in the type vector refer to the offsets in the children
-/// optionally typeIds provides an indirection between the child offset and the type id
-/// for each child `typeIds[offset]` is the id used in the type vector
-table Union {
-  mode: UnionMode;
-  typeIds: [ int ]; // optional, describes typeid of each child.
-}
-
-table Int {
-  bitWidth: int; // restricted to 8, 16, 32, and 64 in v1
-  is_signed: bool;
-}
-
-enum Precision:short {HALF, SINGLE, DOUBLE}
-
-table FloatingPoint {
-  precision: Precision;
-}
-
-/// Unicode with UTF-8 encoding
-table Utf8 {
-}
-
-/// Opaque binary data
-table Binary {
-}
-
-/// Same as Utf8, but with 64-bit offsets, allowing to represent
-/// extremely large data values.
-table LargeUtf8 {
-}
-
-/// Same as Binary, but with 64-bit offsets, allowing to represent
-/// extremely large data values.
-table LargeBinary {
-}
-
-table FixedSizeBinary {
-  /// Number of bytes per value
-  byteWidth: int;
-}
-
-table Bool {
-}
-
-/// Exact decimal value represented as an integer value in two's
-/// complement. Currently only 128-bit (16-byte) and 256-bit (32-byte) integers
-/// are used. The representation uses the endianness indicated
-/// in the Schema.
-table Decimal {
-  /// Total number of decimal digits
-  precision: int;
-
-  /// Number of digits after the decimal point "."
-  scale: int;
-
-  /// Number of bits per value. The only accepted widths are 128 and 256.
-  /// We use bitWidth for consistency with Int::bitWidth.
-  bitWidth: int = 128;
-}
-
-enum DateUnit: short {
-  DAY,
-  MILLISECOND
-}
-
-/// Date is either a 32-bit or 64-bit type representing elapsed time since UNIX
-/// epoch (1970-01-01), stored in either of two units:
-///
-/// * Milliseconds (64 bits) indicating UNIX time elapsed since the epoch (no
-///   leap seconds), where the values are evenly divisible by 86400000
-/// * Days (32 bits) since the UNIX epoch
-table Date {
-  unit: DateUnit = MILLISECOND;
-}
-
-enum TimeUnit: short { SECOND, MILLISECOND, MICROSECOND, NANOSECOND }
-
-/// Time type. The physical storage type depends on the unit
-/// - SECOND and MILLISECOND: 32 bits
-/// - MICROSECOND and NANOSECOND: 64 bits
-table Time {
-  unit: TimeUnit = MILLISECOND;
-  bitWidth: int = 32;
-}
-
-/// Time elapsed from the Unix epoch, 00:00:00.000 on 1 January 1970, excluding
-/// leap seconds, as a 64-bit integer. Note that UNIX time does not include
-/// leap seconds.
-///
-/// Date & time libraries often have multiple different data types for temporal
-/// data.  In order to ease interoperability between different implementations the
-/// Arrow project has some recommendations for encoding these types into a Timestamp
-/// column.
-///
-/// An "instant" represents a single moment in time that has no meaningful time zone
-/// or the time zone is unknown.  A column of instants can also contain values from
-/// multiple time zones.  To encode an instant set the timezone string to "UTC".
-///
-/// A "zoned date-time" represents a single moment in time that has a meaningful
-/// reference time zone.  To encode a zoned date-time as a Timestamp set the timezone
-/// string to the name of the timezone.  There is some ambiguity between an instant
-/// and a zoned date-time with the UTC time zone.  Both of these are stored the same.
-/// Typically, this distinction does not matter.  If it does, then an application should
-/// use custom metadata or an extension type to distinguish between the two cases.
-///
-/// An "offset date-time" represents a single moment in time combined with a meaningful
-/// offset from UTC.  To encode an offset date-time as a Timestamp set the timezone string
-/// to the numeric time zone offset string (e.g. "+03:00").
-///
-/// A "local date-time" does not represent a single moment in time.  It represents a wall
-/// clock time combined with a date.  Because of daylight savings time there may multiple
-/// instants that correspond to a single local date-time in any given time zone.  A
-/// local date-time is often stored as a struct or a Date32/Time64 pair.  However, it can
-/// also be encoded into a Timestamp column.  To do so the value should be the the time
-/// elapsed from the Unix epoch so that a wall clock in UTC would display the desired time.
-/// The timezone string should be set to null or the empty string.
-table Timestamp {
-  unit: TimeUnit;
-
-  /// The time zone is a string indicating the name of a time zone, one of:
-  ///
-  /// * As used in the Olson time zone database (the "tz database" or
-  ///   "tzdata"), such as "America/New_York"
-  /// * An absolute time zone offset of the form +XX:XX or -XX:XX, such as +07:30
-  ///
-  /// Whether a timezone string is present indicates different semantics about
-  /// the data:
-  ///
-  /// * If the time zone is null or an empty string, the data is a local date-time
-  ///   and does not represent a single moment in time.  Instead it represents a wall clock
-  ///   time and care should be taken to avoid interpreting it semantically as an instant.
-  ///
-  /// * If the time zone is set to a valid value, values can be displayed as
-  ///   "localized" to that time zone, even though the underlying 64-bit
-  ///   integers are identical to the same data stored in UTC. Converting
-  ///   between time zones is a metadata-only operation and does not change the
-  ///   underlying values
-  timezone: string;
-}
-
-enum IntervalUnit: short { YEAR_MONTH, DAY_TIME}
-// A "calendar" interval which models types that don't necessarily
-// have a precise duration without the context of a base timestamp (e.g.
-// days can differ in length during day light savings time transitions).
-// YEAR_MONTH - Indicates the number of elapsed whole months, stored as
-//   4-byte integers.
-// DAY_TIME - Indicates the number of elapsed days and milliseconds,
-//   stored as 2 contiguous 32-bit integers (8-bytes in total).  Support
-//   of this IntervalUnit is not required for full arrow compatibility.
-table Interval {
-  unit: IntervalUnit;
-}
-
-// An absolute length of time unrelated to any calendar artifacts.
-//
-// For the purposes of Arrow Implementations, adding this value to a Timestamp
-// ("t1") naively (i.e. simply summing the two number) is acceptable even
-// though in some cases the resulting Timestamp (t2) would not account for
-// leap-seconds during the elapsed time between "t1" and "t2".  Similarly,
-// representing the difference between two Unix timestamp is acceptable, but
-// would yield a value that is possibly a few seconds off from the true elapsed
-// time.
-//
-//  The resolution defaults to millisecond, but can be any of the other
-//  supported TimeUnit values as with Timestamp and Time types.  This type is
-//  always represented as an 8-byte integer.
-table Duration {
-  unit: TimeUnit = MILLISECOND;
-}
-
-/// ----------------------------------------------------------------------
-/// Top-level Type value, enabling extensible type-specific metadata. We can
-/// add new logical types to Type without breaking backwards compatibility
-
-union Type {
-  Null,
-  Int,
-  FloatingPoint,
-  Binary,
-  Utf8,
-  Bool,
-  Decimal,
-  Date,
-  Time,
-  Timestamp,
-  Interval,
-  List,
-  Struct_,
-  Union,
-  FixedSizeBinary,
-  FixedSizeList,
-  Map,
-  Duration,
-  LargeBinary,
-  LargeUtf8,
-  LargeList,
-}
-
-/// ----------------------------------------------------------------------
-/// user defined key value pairs to add custom metadata to arrow
-/// key namespacing is the responsibility of the user
-
-table KeyValue {
-  key: string;
-  value: string;
-}
-
-/// ----------------------------------------------------------------------
-/// Dictionary encoding metadata
-/// Maintained for forwards compatibility, in the future
-/// Dictionaries might be explicit maps between integers and values
-/// allowing for non-contiguous index values
-enum DictionaryKind : short { DenseArray }
-table DictionaryEncoding {
-  /// The known dictionary id in the application where this data is used. In
-  /// the file or streaming formats, the dictionary ids are found in the
-  /// DictionaryBatch messages
-  id: long;
-
-  /// The dictionary indices are constrained to be non-negative integers. If
-  /// this field is null, the indices must be signed int32. To maximize
-  /// cross-language compatibility and performance, implementations are
-  /// recommended to prefer signed integer types over unsigned integer types
-  /// and to avoid uint64 indices unless they are required by an application.
-  indexType: Int;
-
-  /// By default, dictionaries are not ordered, or the order does not have
-  /// semantic meaning. In some statistical, applications, dictionary-encoding
-  /// is used to represent ordered categorical data, and we provide a way to
-  /// preserve that metadata here
-  isOrdered: bool;
-
-  dictionaryKind: DictionaryKind;
-}
-
-/// ----------------------------------------------------------------------
-/// A field represents a named column in a record / row batch or child of a
-/// nested type.
-
-table Field {
-  /// Name is not required, in i.e. a List
-  name: string;
-
-  /// Whether or not this field can contain nulls. Should be true in general.
-  nullable: bool;
-
-  /// This is the type of the decoded value if the field is dictionary encoded.
-  type: Type;
-
-  /// Present only if the field is dictionary encoded.
-  dictionary: DictionaryEncoding;
-
-  /// children apply only to nested data types like Struct, List and Union. For
-  /// primitive types children will have length 0.
-  children: [ Field ];
-
-  /// User-defined metadata
-  custom_metadata: [ KeyValue ];
-}
-
-/// ----------------------------------------------------------------------
-/// Endianness of the platform producing the data
-
-enum Endianness:short { Little, Big }
-
-/// ----------------------------------------------------------------------
-/// A Buffer represents a single contiguous memory segment
-struct Buffer {
-  /// The relative offset into the shared memory page where the bytes for this
-  /// buffer starts
-  offset: long;
-
-  /// The absolute length (in bytes) of the memory buffer. The memory is found
-  /// from offset (inclusive) to offset + length (non-inclusive). When building
-  /// messages using the encapsulated IPC message, padding bytes may be written
-  /// after a buffer, but such padding bytes do not need to be accounted for in
-  /// the size here.
-  length: long;
-}
-
-/// ----------------------------------------------------------------------
-/// A Schema describes the columns in a row batch
-
-table Schema {
-
-  /// endianness of the buffer
-  /// it is Little Endian by default
-  /// if endianness doesn't match the underlying system then the vectors need to be converted
-  endianness: Endianness=Little;
-
-  fields: [Field];
-  // User-defined metadata
-  custom_metadata: [ KeyValue ];
-
-  /// Features used in the stream/file.
-  features : [ Feature ];
-}
-
-root_type Schema;
diff --git a/proto/raw-js-openapi/package.json b/proto/raw-js-openapi/package.json
index 455c3d67837..fdb83f4ec86 100644
--- a/proto/raw-js-openapi/package.json
+++ b/proto/raw-js-openapi/package.json
@@ -1,9 +1,6 @@
 {
   "dependencies": {
-    "@deephaven/barrage": "0.5.0",
     "@improbable-eng/grpc-web": "^0.14.0",
-    "apache-arrow": "7.0.0",
-    "flatbuffers": "1.12.0",
     "google-protobuf": "^3.20.1"
   },
   "devDependencies": {
diff --git a/proto/raw-js-openapi/src/arrow/flight/flatbuf/Message_generated.ts b/proto/raw-js-openapi/src/arrow/flight/flatbuf/Message_generated.ts
deleted file mode 100644
index 8d86b6aa04f..00000000000
--- a/proto/raw-js-openapi/src/arrow/flight/flatbuf/Message_generated.ts
+++ /dev/null
@@ -1,741 +0,0 @@
-// automatically generated by the FlatBuffers compiler, do not modify
-
-import * as NS17716817176095924048 from "./Schema_generated";
-/**
- * @enum {number}
- */
-export namespace org.apache.arrow.flatbuf{
-export enum CompressionType{
-  LZ4_FRAME= 0,
-  ZSTD= 1
-};
-}
-
-/**
- * Provided for forward compatibility in case we need to support different
- * strategies for compressing the IPC message body (like whole-body
- * compression rather than buffer-level) in the future
- *
- * @enum {number}
- */
-export namespace org.apache.arrow.flatbuf{
-export enum BodyCompressionMethod{
-  /**
-   * Each constituent buffer is first compressed with the indicated
-   * compressor, and then written with the uncompressed length in the first 8
-   * bytes as a 64-bit little-endian signed integer followed by the compressed
-   * buffer bytes (and then padding as required by the protocol). The
-   * uncompressed length may be set to -1 to indicate that the data that
-   * follows is not compressed, which can be useful for cases where
-   * compression does not yield appreciable savings.
-   */
-  BUFFER= 0
-};
-}
-
-/**
- * ----------------------------------------------------------------------
- * The root Message type
- * This union enables us to easily send different message types without
- * redundant storage, and in the future we can easily add new message types.
- *
- * Arrow implementations do not need to implement all of the message types,
- * which may include experimental metadata types. For maximum compatibility,
- * it is best to send data using RecordBatch
- *
- * @enum {number}
- */
-export namespace org.apache.arrow.flatbuf{
-export enum MessageHeader{
-  NONE= 0,
-  Schema= 1,
-  DictionaryBatch= 2,
-  RecordBatch= 3
-};
-
-export function unionToMessageHeader(
-  type: MessageHeader,
-  accessor: (obj:NS17716817176095924048.org.apache.arrow.flatbuf.Schema|org.apache.arrow.flatbuf.DictionaryBatch|org.apache.arrow.flatbuf.RecordBatch) => NS17716817176095924048.org.apache.arrow.flatbuf.Schema|org.apache.arrow.flatbuf.DictionaryBatch|org.apache.arrow.flatbuf.RecordBatch|null
-): NS17716817176095924048.org.apache.arrow.flatbuf.Schema|org.apache.arrow.flatbuf.DictionaryBatch|org.apache.arrow.flatbuf.RecordBatch|null {
-  switch(org.apache.arrow.flatbuf.MessageHeader[type]) {
-    case 'NONE': return null; 
-    case 'Schema': return accessor(new NS17716817176095924048.org.apache.arrow.flatbuf.Schema())! as NS17716817176095924048.org.apache.arrow.flatbuf.Schema;
-    case 'DictionaryBatch': return accessor(new org.apache.arrow.flatbuf.DictionaryBatch())! as org.apache.arrow.flatbuf.DictionaryBatch;
-    case 'RecordBatch': return accessor(new org.apache.arrow.flatbuf.RecordBatch())! as org.apache.arrow.flatbuf.RecordBatch;
-    default: return null;
-  }
-}
-
-export function unionListToMessageHeader(
-  type: MessageHeader, 
-  accessor: (index: number, obj:NS17716817176095924048.org.apache.arrow.flatbuf.Schema|org.apache.arrow.flatbuf.DictionaryBatch|org.apache.arrow.flatbuf.RecordBatch) => NS17716817176095924048.org.apache.arrow.flatbuf.Schema|org.apache.arrow.flatbuf.DictionaryBatch|org.apache.arrow.flatbuf.RecordBatch|null,
-  index: number
-): NS17716817176095924048.org.apache.arrow.flatbuf.Schema|org.apache.arrow.flatbuf.DictionaryBatch|org.apache.arrow.flatbuf.RecordBatch|null {
-  switch(org.apache.arrow.flatbuf.MessageHeader[type]) {
-    case 'NONE': return null; 
-    case 'Schema': return accessor(index, new NS17716817176095924048.org.apache.arrow.flatbuf.Schema())! as NS17716817176095924048.org.apache.arrow.flatbuf.Schema;
-    case 'DictionaryBatch': return accessor(index, new org.apache.arrow.flatbuf.DictionaryBatch())! as org.apache.arrow.flatbuf.DictionaryBatch;
-    case 'RecordBatch': return accessor(index, new org.apache.arrow.flatbuf.RecordBatch())! as org.apache.arrow.flatbuf.RecordBatch;
-    default: return null;
-  }
-}
-}
-
-/**
- * ----------------------------------------------------------------------
- * Data structures for describing a table row batch (a collection of
- * equal-length Arrow arrays)
- * Metadata about a field at some level of a nested type tree (but not
- * its children).
- *
- * For example, a List<Int16> with values `[[1, 2, 3], null, [4], [5, 6], null]`
- * would have {length: 5, null_count: 2} for its List node, and {length: 6,
- * null_count: 0} for its Int16 node, as separate FieldNode structs
- *
- * @constructor
- */
-export namespace org.apache.arrow.flatbuf{
-export class FieldNode {
-  bb: flatbuffers.ByteBuffer|null = null;
-
-  bb_pos:number = 0;
-/**
- * @param number i
- * @param flatbuffers.ByteBuffer bb
- * @returns FieldNode
- */
-__init(i:number, bb:flatbuffers.ByteBuffer):FieldNode {
-  this.bb_pos = i;
-  this.bb = bb;
-  return this;
-};
-
-/**
- * The number of value slots in the Arrow array at this level of a nested
- * tree
- *
- * @returns flatbuffers.Long
- */
-length():flatbuffers.Long {
-  return this.bb!.readInt64(this.bb_pos);
-};
-
-/**
- * The number of observed nulls. Fields with null_count == 0 may choose not
- * to write their physical validity bitmap out as a materialized buffer,
- * instead setting the length of the bitmap buffer to 0.
- *
- * @returns flatbuffers.Long
- */
-nullCount():flatbuffers.Long {
-  return this.bb!.readInt64(this.bb_pos + 8);
-};
-
-/**
- * @returns number
- */
-static sizeOf():number {
-  return 16;
-}
-
-/**
- * @param flatbuffers.Builder builder
- * @param flatbuffers.Long length
- * @param flatbuffers.Long null_count
- * @returns flatbuffers.Offset
- */
-static createFieldNode(builder:flatbuffers.Builder, length: flatbuffers.Long, null_count: flatbuffers.Long):flatbuffers.Offset {
-  builder.prep(8, 16);
-  builder.writeInt64(null_count);
-  builder.writeInt64(length);
-  return builder.offset();
-};
-
-}
-}
-/**
- * Optional compression for the memory buffers constituting IPC message
- * bodies. Intended for use with RecordBatch but could be used for other
- * message types
- *
- * @constructor
- */
-export namespace org.apache.arrow.flatbuf{
-export class BodyCompression {
-  bb: flatbuffers.ByteBuffer|null = null;
-
-  bb_pos:number = 0;
-/**
- * @param number i
- * @param flatbuffers.ByteBuffer bb
- * @returns BodyCompression
- */
-__init(i:number, bb:flatbuffers.ByteBuffer):BodyCompression {
-  this.bb_pos = i;
-  this.bb = bb;
-  return this;
-};
-
-/**
- * @param flatbuffers.ByteBuffer bb
- * @param BodyCompression= obj
- * @returns BodyCompression
- */
-static getRootAsBodyCompression(bb:flatbuffers.ByteBuffer, obj?:BodyCompression):BodyCompression {
-  return (obj || new BodyCompression()).__init(bb.readInt32(bb.position()) + bb.position(), bb);
-};
-
-/**
- * @param flatbuffers.ByteBuffer bb
- * @param BodyCompression= obj
- * @returns BodyCompression
- */
-static getSizePrefixedRootAsBodyCompression(bb:flatbuffers.ByteBuffer, obj?:BodyCompression):BodyCompression {
-  bb.setPosition(bb.position() + flatbuffers.SIZE_PREFIX_LENGTH);
-  return (obj || new BodyCompression()).__init(bb.readInt32(bb.position()) + bb.position(), bb);
-};
-
-/**
- * Compressor library
- *
- * @returns org.apache.arrow.flatbuf.CompressionType
- */
-codec():org.apache.arrow.flatbuf.CompressionType {
-  var offset = this.bb!.__offset(this.bb_pos, 4);
-  return offset ? /**  */ (this.bb!.readInt8(this.bb_pos + offset)) : org.apache.arrow.flatbuf.CompressionType.LZ4_FRAME;
-};
-
-/**
- * Indicates the way the record batch body was compressed
- *
- * @returns org.apache.arrow.flatbuf.BodyCompressionMethod
- */
-method():org.apache.arrow.flatbuf.BodyCompressionMethod {
-  var offset = this.bb!.__offset(this.bb_pos, 6);
-  return offset ? /**  */ (this.bb!.readInt8(this.bb_pos + offset)) : org.apache.arrow.flatbuf.BodyCompressionMethod.BUFFER;
-};
-
-/**
- * @param flatbuffers.Builder builder
- */
-static startBodyCompression(builder:flatbuffers.Builder) {
-  builder.startObject(2);
-};
-
-/**
- * @param flatbuffers.Builder builder
- * @param org.apache.arrow.flatbuf.CompressionType codec
- */
-static addCodec(builder:flatbuffers.Builder, codec:org.apache.arrow.flatbuf.CompressionType) {
-  builder.addFieldInt8(0, codec, org.apache.arrow.flatbuf.CompressionType.LZ4_FRAME);
-};
-
-/**
- * @param flatbuffers.Builder builder
- * @param org.apache.arrow.flatbuf.BodyCompressionMethod method
- */
-static addMethod(builder:flatbuffers.Builder, method:org.apache.arrow.flatbuf.BodyCompressionMethod) {
-  builder.addFieldInt8(1, method, org.apache.arrow.flatbuf.BodyCompressionMethod.BUFFER);
-};
-
-/**
- * @param flatbuffers.Builder builder
- * @returns flatbuffers.Offset
- */
-static endBodyCompression(builder:flatbuffers.Builder):flatbuffers.Offset {
-  var offset = builder.endObject();
-  return offset;
-};
-
-static createBodyCompression(builder:flatbuffers.Builder, codec:org.apache.arrow.flatbuf.CompressionType, method:org.apache.arrow.flatbuf.BodyCompressionMethod):flatbuffers.Offset {
-  BodyCompression.startBodyCompression(builder);
-  BodyCompression.addCodec(builder, codec);
-  BodyCompression.addMethod(builder, method);
-  return BodyCompression.endBodyCompression(builder);
-}
-}
-}
-/**
- * A data header describing the shared memory layout of a "record" or "row"
- * batch. Some systems call this a "row batch" internally and others a "record
- * batch".
- *
- * @constructor
- */
-export namespace org.apache.arrow.flatbuf{
-export class RecordBatch {
-  bb: flatbuffers.ByteBuffer|null = null;
-
-  bb_pos:number = 0;
-/**
- * @param number i
- * @param flatbuffers.ByteBuffer bb
- * @returns RecordBatch
- */
-__init(i:number, bb:flatbuffers.ByteBuffer):RecordBatch {
-  this.bb_pos = i;
-  this.bb = bb;
-  return this;
-};
-
-/**
- * @param flatbuffers.ByteBuffer bb
- * @param RecordBatch= obj
- * @returns RecordBatch
- */
-static getRootAsRecordBatch(bb:flatbuffers.ByteBuffer, obj?:RecordBatch):RecordBatch {
-  return (obj || new RecordBatch()).__init(bb.readInt32(bb.position()) + bb.position(), bb);
-};
-
-/**
- * @param flatbuffers.ByteBuffer bb
- * @param RecordBatch= obj
- * @returns RecordBatch
- */
-static getSizePrefixedRootAsRecordBatch(bb:flatbuffers.ByteBuffer, obj?:RecordBatch):RecordBatch {
-  bb.setPosition(bb.position() + flatbuffers.SIZE_PREFIX_LENGTH);
-  return (obj || new RecordBatch()).__init(bb.readInt32(bb.position()) + bb.position(), bb);
-};
-
-/**
- * number of records / rows. The arrays in the batch should all have this
- * length
- *
- * @returns flatbuffers.Long
- */
-length():flatbuffers.Long {
-  var offset = this.bb!.__offset(this.bb_pos, 4);
-  return offset ? this.bb!.readInt64(this.bb_pos + offset) : this.bb!.createLong(0, 0);
-};
-
-/**
- * Nodes correspond to the pre-ordered flattened logical schema
- *
- * @param number index
- * @param org.apache.arrow.flatbuf.FieldNode= obj
- * @returns org.apache.arrow.flatbuf.FieldNode
- */
-nodes(index: number, obj?:org.apache.arrow.flatbuf.FieldNode):org.apache.arrow.flatbuf.FieldNode|null {
-  var offset = this.bb!.__offset(this.bb_pos, 6);
-  return offset ? (obj || new org.apache.arrow.flatbuf.FieldNode()).__init(this.bb!.__vector(this.bb_pos + offset) + index * 16, this.bb!) : null;
-};
-
-/**
- * @returns number
- */
-nodesLength():number {
-  var offset = this.bb!.__offset(this.bb_pos, 6);
-  return offset ? this.bb!.__vector_len(this.bb_pos + offset) : 0;
-};
-
-/**
- * Buffers correspond to the pre-ordered flattened buffer tree
- *
- * The number of buffers appended to this list depends on the schema. For
- * example, most primitive arrays will have 2 buffers, 1 for the validity
- * bitmap and 1 for the values. For struct arrays, there will only be a
- * single buffer for the validity (nulls) bitmap
- *
- * @param number index
- * @param org.apache.arrow.flatbuf.Buffer= obj
- * @returns org.apache.arrow.flatbuf.Buffer
- */
-buffers(index: number, obj?:NS17716817176095924048.org.apache.arrow.flatbuf.Buffer):NS17716817176095924048.org.apache.arrow.flatbuf.Buffer|null {
-  var offset = this.bb!.__offset(this.bb_pos, 8);
-  return offset ? (obj || new NS17716817176095924048.org.apache.arrow.flatbuf.Buffer()).__init(this.bb!.__vector(this.bb_pos + offset) + index * 16, this.bb!) : null;
-};
-
-/**
- * @returns number
- */
-buffersLength():number {
-  var offset = this.bb!.__offset(this.bb_pos, 8);
-  return offset ? this.bb!.__vector_len(this.bb_pos + offset) : 0;
-};
-
-/**
- * Optional compression of the message body
- *
- * @param org.apache.arrow.flatbuf.BodyCompression= obj
- * @returns org.apache.arrow.flatbuf.BodyCompression|null
- */
-compression(obj?:org.apache.arrow.flatbuf.BodyCompression):org.apache.arrow.flatbuf.BodyCompression|null {
-  var offset = this.bb!.__offset(this.bb_pos, 10);
-  return offset ? (obj || new org.apache.arrow.flatbuf.BodyCompression()).__init(this.bb!.__indirect(this.bb_pos + offset), this.bb!) : null;
-};
-
-/**
- * @param flatbuffers.Builder builder
- */
-static startRecordBatch(builder:flatbuffers.Builder) {
-  builder.startObject(4);
-};
-
-/**
- * @param flatbuffers.Builder builder
- * @param flatbuffers.Long length
- */
-static addLength(builder:flatbuffers.Builder, length:flatbuffers.Long) {
-  builder.addFieldInt64(0, length, builder.createLong(0, 0));
-};
-
-/**
- * @param flatbuffers.Builder builder
- * @param flatbuffers.Offset nodesOffset
- */
-static addNodes(builder:flatbuffers.Builder, nodesOffset:flatbuffers.Offset) {
-  builder.addFieldOffset(1, nodesOffset, 0);
-};
-
-/**
- * @param flatbuffers.Builder builder
- * @param number numElems
- */
-static startNodesVector(builder:flatbuffers.Builder, numElems:number) {
-  builder.startVector(16, numElems, 8);
-};
-
-/**
- * @param flatbuffers.Builder builder
- * @param flatbuffers.Offset buffersOffset
- */
-static addBuffers(builder:flatbuffers.Builder, buffersOffset:flatbuffers.Offset) {
-  builder.addFieldOffset(2, buffersOffset, 0);
-};
-
-/**
- * @param flatbuffers.Builder builder
- * @param number numElems
- */
-static startBuffersVector(builder:flatbuffers.Builder, numElems:number) {
-  builder.startVector(16, numElems, 8);
-};
-
-/**
- * @param flatbuffers.Builder builder
- * @param flatbuffers.Offset compressionOffset
- */
-static addCompression(builder:flatbuffers.Builder, compressionOffset:flatbuffers.Offset) {
-  builder.addFieldOffset(3, compressionOffset, 0);
-};
-
-/**
- * @param flatbuffers.Builder builder
- * @returns flatbuffers.Offset
- */
-static endRecordBatch(builder:flatbuffers.Builder):flatbuffers.Offset {
-  var offset = builder.endObject();
-  return offset;
-};
-
-}
-}
-/**
- * For sending dictionary encoding information. Any Field can be
- * dictionary-encoded, but in this case none of its children may be
- * dictionary-encoded.
- * There is one vector / column per dictionary, but that vector / column
- * may be spread across multiple dictionary batches by using the isDelta
- * flag
- *
- * @constructor
- */
-export namespace org.apache.arrow.flatbuf{
-export class DictionaryBatch {
-  bb: flatbuffers.ByteBuffer|null = null;
-
-  bb_pos:number = 0;
-/**
- * @param number i
- * @param flatbuffers.ByteBuffer bb
- * @returns DictionaryBatch
- */
-__init(i:number, bb:flatbuffers.ByteBuffer):DictionaryBatch {
-  this.bb_pos = i;
-  this.bb = bb;
-  return this;
-};
-
-/**
- * @param flatbuffers.ByteBuffer bb
- * @param DictionaryBatch= obj
- * @returns DictionaryBatch
- */
-static getRootAsDictionaryBatch(bb:flatbuffers.ByteBuffer, obj?:DictionaryBatch):DictionaryBatch {
-  return (obj || new DictionaryBatch()).__init(bb.readInt32(bb.position()) + bb.position(), bb);
-};
-
-/**
- * @param flatbuffers.ByteBuffer bb
- * @param DictionaryBatch= obj
- * @returns DictionaryBatch
- */
-static getSizePrefixedRootAsDictionaryBatch(bb:flatbuffers.ByteBuffer, obj?:DictionaryBatch):DictionaryBatch {
-  bb.setPosition(bb.position() + flatbuffers.SIZE_PREFIX_LENGTH);
-  return (obj || new DictionaryBatch()).__init(bb.readInt32(bb.position()) + bb.position(), bb);
-};
-
-/**
- * @returns flatbuffers.Long
- */
-id():flatbuffers.Long {
-  var offset = this.bb!.__offset(this.bb_pos, 4);
-  return offset ? this.bb!.readInt64(this.bb_pos + offset) : this.bb!.createLong(0, 0);
-};
-
-/**
- * @param org.apache.arrow.flatbuf.RecordBatch= obj
- * @returns org.apache.arrow.flatbuf.RecordBatch|null
- */
-data(obj?:org.apache.arrow.flatbuf.RecordBatch):org.apache.arrow.flatbuf.RecordBatch|null {
-  var offset = this.bb!.__offset(this.bb_pos, 6);
-  return offset ? (obj || new org.apache.arrow.flatbuf.RecordBatch()).__init(this.bb!.__indirect(this.bb_pos + offset), this.bb!) : null;
-};
-
-/**
- * If isDelta is true the values in the dictionary are to be appended to a
- * dictionary with the indicated id. If isDelta is false this dictionary
- * should replace the existing dictionary.
- *
- * @returns boolean
- */
-isDelta():boolean {
-  var offset = this.bb!.__offset(this.bb_pos, 8);
-  return offset ? !!this.bb!.readInt8(this.bb_pos + offset) : false;
-};
-
-/**
- * @param flatbuffers.Builder builder
- */
-static startDictionaryBatch(builder:flatbuffers.Builder) {
-  builder.startObject(3);
-};
-
-/**
- * @param flatbuffers.Builder builder
- * @param flatbuffers.Long id
- */
-static addId(builder:flatbuffers.Builder, id:flatbuffers.Long) {
-  builder.addFieldInt64(0, id, builder.createLong(0, 0));
-};
-
-/**
- * @param flatbuffers.Builder builder
- * @param flatbuffers.Offset dataOffset
- */
-static addData(builder:flatbuffers.Builder, dataOffset:flatbuffers.Offset) {
-  builder.addFieldOffset(1, dataOffset, 0);
-};
-
-/**
- * @param flatbuffers.Builder builder
- * @param boolean isDelta
- */
-static addIsDelta(builder:flatbuffers.Builder, isDelta:boolean) {
-  builder.addFieldInt8(2, +isDelta, +false);
-};
-
-/**
- * @param flatbuffers.Builder builder
- * @returns flatbuffers.Offset
- */
-static endDictionaryBatch(builder:flatbuffers.Builder):flatbuffers.Offset {
-  var offset = builder.endObject();
-  return offset;
-};
-
-}
-}
-/**
- * @constructor
- */
-export namespace org.apache.arrow.flatbuf{
-export class Message {
-  bb: flatbuffers.ByteBuffer|null = null;
-
-  bb_pos:number = 0;
-/**
- * @param number i
- * @param flatbuffers.ByteBuffer bb
- * @returns Message
- */
-__init(i:number, bb:flatbuffers.ByteBuffer):Message {
-  this.bb_pos = i;
-  this.bb = bb;
-  return this;
-};
-
-/**
- * @param flatbuffers.ByteBuffer bb
- * @param Message= obj
- * @returns Message
- */
-static getRootAsMessage(bb:flatbuffers.ByteBuffer, obj?:Message):Message {
-  return (obj || new Message()).__init(bb.readInt32(bb.position()) + bb.position(), bb);
-};
-
-/**
- * @param flatbuffers.ByteBuffer bb
- * @param Message= obj
- * @returns Message
- */
-static getSizePrefixedRootAsMessage(bb:flatbuffers.ByteBuffer, obj?:Message):Message {
-  bb.setPosition(bb.position() + flatbuffers.SIZE_PREFIX_LENGTH);
-  return (obj || new Message()).__init(bb.readInt32(bb.position()) + bb.position(), bb);
-};
-
-/**
- * @returns org.apache.arrow.flatbuf.MetadataVersion
- */
-version():NS17716817176095924048.org.apache.arrow.flatbuf.MetadataVersion {
-  var offset = this.bb!.__offset(this.bb_pos, 4);
-  return offset ? /**  */ (this.bb!.readInt16(this.bb_pos + offset)) : NS17716817176095924048.org.apache.arrow.flatbuf.MetadataVersion.V1;
-};
-
-/**
- * @returns org.apache.arrow.flatbuf.MessageHeader
- */
-headerType():org.apache.arrow.flatbuf.MessageHeader {
-  var offset = this.bb!.__offset(this.bb_pos, 6);
-  return offset ? /**  */ (this.bb!.readUint8(this.bb_pos + offset)) : org.apache.arrow.flatbuf.MessageHeader.NONE;
-};
-
-/**
- * @param flatbuffers.Table obj
- * @returns ?flatbuffers.Table
- */
-header<T extends flatbuffers.Table>(obj:T):T|null {
-  var offset = this.bb!.__offset(this.bb_pos, 8);
-  return offset ? this.bb!.__union(obj, this.bb_pos + offset) : null;
-};
-
-/**
- * @returns flatbuffers.Long
- */
-bodyLength():flatbuffers.Long {
-  var offset = this.bb!.__offset(this.bb_pos, 10);
-  return offset ? this.bb!.readInt64(this.bb_pos + offset) : this.bb!.createLong(0, 0);
-};
-
-/**
- * @param number index
- * @param org.apache.arrow.flatbuf.KeyValue= obj
- * @returns org.apache.arrow.flatbuf.KeyValue
- */
-customMetadata(index: number, obj?:NS17716817176095924048.org.apache.arrow.flatbuf.KeyValue):NS17716817176095924048.org.apache.arrow.flatbuf.KeyValue|null {
-  var offset = this.bb!.__offset(this.bb_pos, 12);
-  return offset ? (obj || new NS17716817176095924048.org.apache.arrow.flatbuf.KeyValue()).__init(this.bb!.__indirect(this.bb!.__vector(this.bb_pos + offset) + index * 4), this.bb!) : null;
-};
-
-/**
- * @returns number
- */
-customMetadataLength():number {
-  var offset = this.bb!.__offset(this.bb_pos, 12);
-  return offset ? this.bb!.__vector_len(this.bb_pos + offset) : 0;
-};
-
-/**
- * @param flatbuffers.Builder builder
- */
-static startMessage(builder:flatbuffers.Builder) {
-  builder.startObject(5);
-};
-
-/**
- * @param flatbuffers.Builder builder
- * @param org.apache.arrow.flatbuf.MetadataVersion version
- */
-static addVersion(builder:flatbuffers.Builder, version:NS17716817176095924048.org.apache.arrow.flatbuf.MetadataVersion) {
-  builder.addFieldInt16(0, version, NS17716817176095924048.org.apache.arrow.flatbuf.MetadataVersion.V1);
-};
-
-/**
- * @param flatbuffers.Builder builder
- * @param org.apache.arrow.flatbuf.MessageHeader headerType
- */
-static addHeaderType(builder:flatbuffers.Builder, headerType:org.apache.arrow.flatbuf.MessageHeader) {
-  builder.addFieldInt8(1, headerType, org.apache.arrow.flatbuf.MessageHeader.NONE);
-};
-
-/**
- * @param flatbuffers.Builder builder
- * @param flatbuffers.Offset headerOffset
- */
-static addHeader(builder:flatbuffers.Builder, headerOffset:flatbuffers.Offset) {
-  builder.addFieldOffset(2, headerOffset, 0);
-};
-
-/**
- * @param flatbuffers.Builder builder
- * @param flatbuffers.Long bodyLength
- */
-static addBodyLength(builder:flatbuffers.Builder, bodyLength:flatbuffers.Long) {
-  builder.addFieldInt64(3, bodyLength, builder.createLong(0, 0));
-};
-
-/**
- * @param flatbuffers.Builder builder
- * @param flatbuffers.Offset customMetadataOffset
- */
-static addCustomMetadata(builder:flatbuffers.Builder, customMetadataOffset:flatbuffers.Offset) {
-  builder.addFieldOffset(4, customMetadataOffset, 0);
-};
-
-/**
- * @param flatbuffers.Builder builder
- * @param Array.<flatbuffers.Offset> data
- * @returns flatbuffers.Offset
- */
-static createCustomMetadataVector(builder:flatbuffers.Builder, data:flatbuffers.Offset[]):flatbuffers.Offset {
-  builder.startVector(4, data.length, 4);
-  for (var i = data.length - 1; i >= 0; i--) {
-    builder.addOffset(data[i]);
-  }
-  return builder.endVector();
-};
-
-/**
- * @param flatbuffers.Builder builder
- * @param number numElems
- */
-static startCustomMetadataVector(builder:flatbuffers.Builder, numElems:number) {
-  builder.startVector(4, numElems, 4);
-};
-
-/**
- * @param flatbuffers.Builder builder
- * @returns flatbuffers.Offset
- */
-static endMessage(builder:flatbuffers.Builder):flatbuffers.Offset {
-  var offset = builder.endObject();
-  return offset;
-};
-
-/**
- * @param flatbuffers.Builder builder
- * @param flatbuffers.Offset offset
- */
-static finishMessageBuffer(builder:flatbuffers.Builder, offset:flatbuffers.Offset) {
-  builder.finish(offset);
-};
-
-/**
- * @param flatbuffers.Builder builder
- * @param flatbuffers.Offset offset
- */
-static finishSizePrefixedMessageBuffer(builder:flatbuffers.Builder, offset:flatbuffers.Offset) {
-  builder.finish(offset, undefined, true);
-};
-
-static createMessage(builder:flatbuffers.Builder, version:NS17716817176095924048.org.apache.arrow.flatbuf.MetadataVersion, headerType:org.apache.arrow.flatbuf.MessageHeader, headerOffset:flatbuffers.Offset, bodyLength:flatbuffers.Long, customMetadataOffset:flatbuffers.Offset):flatbuffers.Offset {
-  Message.startMessage(builder);
-  Message.addVersion(builder, version);
-  Message.addHeaderType(builder, headerType);
-  Message.addHeader(builder, headerOffset);
-  Message.addBodyLength(builder, bodyLength);
-  Message.addCustomMetadata(builder, customMetadataOffset);
-  return Message.endMessage(builder);
-}
-}
-}
diff --git a/proto/raw-js-openapi/src/arrow/flight/flatbuf/Schema_generated.ts b/proto/raw-js-openapi/src/arrow/flight/flatbuf/Schema_generated.ts
deleted file mode 100644
index 1c485ed3b78..00000000000
--- a/proto/raw-js-openapi/src/arrow/flight/flatbuf/Schema_generated.ts
+++ /dev/null
@@ -1,2807 +0,0 @@
-// automatically generated by the FlatBuffers compiler, do not modify
-
-/**
- * @enum {number}
- */
-export namespace org.apache.arrow.flatbuf{
-export enum MetadataVersion{
-  /**
-   * 0.1.0 (October 2016).
-   */
-  V1= 0,
-
-  /**
-   * 0.2.0 (February 2017). Non-backwards compatible with V1.
-   */
-  V2= 1,
-
-  /**
-   * 0.3.0 -> 0.7.1 (May - December 2017). Non-backwards compatible with V2.
-   */
-  V3= 2,
-
-  /**
-   * >= 0.8.0 (December 2017). Non-backwards compatible with V3.
-   */
-  V4= 3,
-
-  /**
-   * >= 1.0.0 (July 2020. Backwards compatible with V4 (V5 readers can read V4
-   * metadata and IPC messages). Implementations are recommended to provide a
-   * V4 compatibility mode with V5 format changes disabled.
-   *
-   * Incompatible changes between V4 and V5:
-   * - Union buffer layout has changed. In V5, Unions don't have a validity
-   *   bitmap buffer.
-   */
-  V5= 4
-};
-}
-
-/**
- * Represents Arrow Features that might not have full support
- * within implementations. This is intended to be used in
- * two scenarios:
- *  1.  A mechanism for readers of Arrow Streams
- *      and files to understand that the stream or file makes
- *      use of a feature that isn't supported or unknown to
- *      the implementation (and therefore can meet the Arrow
- *      forward compatibility guarantees).
- *  2.  A means of negotiating between a client and server
- *      what features a stream is allowed to use. The enums
- *      values here are intented to represent higher level
- *      features, additional details maybe negotiated
- *      with key-value pairs specific to the protocol.
- *
- * Enums added to this list should be assigned power-of-two values
- * to facilitate exchanging and comparing bitmaps for supported
- * features.
- *
- * @enum {number}
- */
-export namespace org.apache.arrow.flatbuf{
-export enum Feature{
-  /**
-   * Needed to make flatbuffers happy.
-   */
-  UNUSED= 0,
-
-  /**
-   * The stream makes use of multiple full dictionaries with the
-   * same ID and assumes clients implement dictionary replacement
-   * correctly.
-   */
-  DICTIONARY_REPLACEMENT= 1,
-
-  /**
-   * The stream makes use of compressed bodies as described
-   * in Message.fbs.
-   */
-  COMPRESSED_BODY= 2
-};
-}
-
-/**
- * @enum {number}
- */
-export namespace org.apache.arrow.flatbuf{
-export enum UnionMode{
-  Sparse= 0,
-  Dense= 1
-};
-}
-
-/**
- * @enum {number}
- */
-export namespace org.apache.arrow.flatbuf{
-export enum Precision{
-  HALF= 0,
-  SINGLE= 1,
-  DOUBLE= 2
-};
-}
-
-/**
- * @enum {number}
- */
-export namespace org.apache.arrow.flatbuf{
-export enum DateUnit{
-  DAY= 0,
-  MILLISECOND= 1
-};
-}
-
-/**
- * @enum {number}
- */
-export namespace org.apache.arrow.flatbuf{
-export enum TimeUnit{
-  SECOND= 0,
-  MILLISECOND= 1,
-  MICROSECOND= 2,
-  NANOSECOND= 3
-};
-}
-
-/**
- * @enum {number}
- */
-export namespace org.apache.arrow.flatbuf{
-export enum IntervalUnit{
-  YEAR_MONTH= 0,
-  DAY_TIME= 1
-};
-}
-
-/**
- * ----------------------------------------------------------------------
- * Top-level Type value, enabling extensible type-specific metadata. We can
- * add new logical types to Type without breaking backwards compatibility
- *
- * @enum {number}
- */
-export namespace org.apache.arrow.flatbuf{
-export enum Type{
-  NONE= 0,
-  Null= 1,
-  Int= 2,
-  FloatingPoint= 3,
-  Binary= 4,
-  Utf8= 5,
-  Bool= 6,
-  Decimal= 7,
-  Date= 8,
-  Time= 9,
-  Timestamp= 10,
-  Interval= 11,
-  List= 12,
-  Struct_= 13,
-  Union= 14,
-  FixedSizeBinary= 15,
-  FixedSizeList= 16,
-  Map= 17,
-  Duration= 18,
-  LargeBinary= 19,
-  LargeUtf8= 20,
-  LargeList= 21
-};
-
-export function unionToType(
-  type: Type,
-  accessor: (obj:org.apache.arrow.flatbuf.Binary|org.apache.arrow.flatbuf.Bool|org.apache.arrow.flatbuf.Date|org.apache.arrow.flatbuf.Decimal|org.apache.arrow.flatbuf.Duration|org.apache.arrow.flatbuf.FixedSizeBinary|org.apache.arrow.flatbuf.FixedSizeList|org.apache.arrow.flatbuf.FloatingPoint|org.apache.arrow.flatbuf.Int|org.apache.arrow.flatbuf.Interval|org.apache.arrow.flatbuf.LargeBinary|org.apache.arrow.flatbuf.LargeList|org.apache.arrow.flatbuf.LargeUtf8|org.apache.arrow.flatbuf.List|org.apache.arrow.flatbuf.Map|org.apache.arrow.flatbuf.Null|org.apache.arrow.flatbuf.Struct_|org.apache.arrow.flatbuf.Time|org.apache.arrow.flatbuf.Timestamp|org.apache.arrow.flatbuf.Union|org.apache.arrow.flatbuf.Utf8) => org.apache.arrow.flatbuf.Binary|org.apache.arrow.flatbuf.Bool|org.apache.arrow.flatbuf.Date|org.apache.arrow.flatbuf.Decimal|org.apache.arrow.flatbuf.Duration|org.apache.arrow.flatbuf.FixedSizeBinary|org.apache.arrow.flatbuf.FixedSizeList|org.apache.arrow.flatbuf.FloatingPoint|org.apache.arrow.flatbuf.Int|org.apache.arrow.flatbuf.Interval|org.apache.arrow.flatbuf.LargeBinary|org.apache.arrow.flatbuf.LargeList|org.apache.arrow.flatbuf.LargeUtf8|org.apache.arrow.flatbuf.List|org.apache.arrow.flatbuf.Map|org.apache.arrow.flatbuf.Null|org.apache.arrow.flatbuf.Struct_|org.apache.arrow.flatbuf.Time|org.apache.arrow.flatbuf.Timestamp|org.apache.arrow.flatbuf.Union|org.apache.arrow.flatbuf.Utf8|null
-): org.apache.arrow.flatbuf.Binary|org.apache.arrow.flatbuf.Bool|org.apache.arrow.flatbuf.Date|org.apache.arrow.flatbuf.Decimal|org.apache.arrow.flatbuf.Duration|org.apache.arrow.flatbuf.FixedSizeBinary|org.apache.arrow.flatbuf.FixedSizeList|org.apache.arrow.flatbuf.FloatingPoint|org.apache.arrow.flatbuf.Int|org.apache.arrow.flatbuf.Interval|org.apache.arrow.flatbuf.LargeBinary|org.apache.arrow.flatbuf.LargeList|org.apache.arrow.flatbuf.LargeUtf8|org.apache.arrow.flatbuf.List|org.apache.arrow.flatbuf.Map|org.apache.arrow.flatbuf.Null|org.apache.arrow.flatbuf.Struct_|org.apache.arrow.flatbuf.Time|org.apache.arrow.flatbuf.Timestamp|org.apache.arrow.flatbuf.Union|org.apache.arrow.flatbuf.Utf8|null {
-  switch(org.apache.arrow.flatbuf.Type[type]) {
-    case 'NONE': return null; 
-    case 'Null': return accessor(new org.apache.arrow.flatbuf.Null())! as org.apache.arrow.flatbuf.Null;
-    case 'Int': return accessor(new org.apache.arrow.flatbuf.Int())! as org.apache.arrow.flatbuf.Int;
-    case 'FloatingPoint': return accessor(new org.apache.arrow.flatbuf.FloatingPoint())! as org.apache.arrow.flatbuf.FloatingPoint;
-    case 'Binary': return accessor(new org.apache.arrow.flatbuf.Binary())! as org.apache.arrow.flatbuf.Binary;
-    case 'Utf8': return accessor(new org.apache.arrow.flatbuf.Utf8())! as org.apache.arrow.flatbuf.Utf8;
-    case 'Bool': return accessor(new org.apache.arrow.flatbuf.Bool())! as org.apache.arrow.flatbuf.Bool;
-    case 'Decimal': return accessor(new org.apache.arrow.flatbuf.Decimal())! as org.apache.arrow.flatbuf.Decimal;
-    case 'Date': return accessor(new org.apache.arrow.flatbuf.Date())! as org.apache.arrow.flatbuf.Date;
-    case 'Time': return accessor(new org.apache.arrow.flatbuf.Time())! as org.apache.arrow.flatbuf.Time;
-    case 'Timestamp': return accessor(new org.apache.arrow.flatbuf.Timestamp())! as org.apache.arrow.flatbuf.Timestamp;
-    case 'Interval': return accessor(new org.apache.arrow.flatbuf.Interval())! as org.apache.arrow.flatbuf.Interval;
-    case 'List': return accessor(new org.apache.arrow.flatbuf.List())! as org.apache.arrow.flatbuf.List;
-    case 'Struct_': return accessor(new org.apache.arrow.flatbuf.Struct_())! as org.apache.arrow.flatbuf.Struct_;
-    case 'Union': return accessor(new org.apache.arrow.flatbuf.Union())! as org.apache.arrow.flatbuf.Union;
-    case 'FixedSizeBinary': return accessor(new org.apache.arrow.flatbuf.FixedSizeBinary())! as org.apache.arrow.flatbuf.FixedSizeBinary;
-    case 'FixedSizeList': return accessor(new org.apache.arrow.flatbuf.FixedSizeList())! as org.apache.arrow.flatbuf.FixedSizeList;
-    case 'Map': return accessor(new org.apache.arrow.flatbuf.Map())! as org.apache.arrow.flatbuf.Map;
-    case 'Duration': return accessor(new org.apache.arrow.flatbuf.Duration())! as org.apache.arrow.flatbuf.Duration;
-    case 'LargeBinary': return accessor(new org.apache.arrow.flatbuf.LargeBinary())! as org.apache.arrow.flatbuf.LargeBinary;
-    case 'LargeUtf8': return accessor(new org.apache.arrow.flatbuf.LargeUtf8())! as org.apache.arrow.flatbuf.LargeUtf8;
-    case 'LargeList': return accessor(new org.apache.arrow.flatbuf.LargeList())! as org.apache.arrow.flatbuf.LargeList;
-    default: return null;
-  }
-}
-
-export function unionListToType(
-  type: Type, 
-  accessor: (index: number, obj:org.apache.arrow.flatbuf.Binary|org.apache.arrow.flatbuf.Bool|org.apache.arrow.flatbuf.Date|org.apache.arrow.flatbuf.Decimal|org.apache.arrow.flatbuf.Duration|org.apache.arrow.flatbuf.FixedSizeBinary|org.apache.arrow.flatbuf.FixedSizeList|org.apache.arrow.flatbuf.FloatingPoint|org.apache.arrow.flatbuf.Int|org.apache.arrow.flatbuf.Interval|org.apache.arrow.flatbuf.LargeBinary|org.apache.arrow.flatbuf.LargeList|org.apache.arrow.flatbuf.LargeUtf8|org.apache.arrow.flatbuf.List|org.apache.arrow.flatbuf.Map|org.apache.arrow.flatbuf.Null|org.apache.arrow.flatbuf.Struct_|org.apache.arrow.flatbuf.Time|org.apache.arrow.flatbuf.Timestamp|org.apache.arrow.flatbuf.Union|org.apache.arrow.flatbuf.Utf8) => org.apache.arrow.flatbuf.Binary|org.apache.arrow.flatbuf.Bool|org.apache.arrow.flatbuf.Date|org.apache.arrow.flatbuf.Decimal|org.apache.arrow.flatbuf.Duration|org.apache.arrow.flatbuf.FixedSizeBinary|org.apache.arrow.flatbuf.FixedSizeList|org.apache.arrow.flatbuf.FloatingPoint|org.apache.arrow.flatbuf.Int|org.apache.arrow.flatbuf.Interval|org.apache.arrow.flatbuf.LargeBinary|org.apache.arrow.flatbuf.LargeList|org.apache.arrow.flatbuf.LargeUtf8|org.apache.arrow.flatbuf.List|org.apache.arrow.flatbuf.Map|org.apache.arrow.flatbuf.Null|org.apache.arrow.flatbuf.Struct_|org.apache.arrow.flatbuf.Time|org.apache.arrow.flatbuf.Timestamp|org.apache.arrow.flatbuf.Union|org.apache.arrow.flatbuf.Utf8|null,
-  index: number
-): org.apache.arrow.flatbuf.Binary|org.apache.arrow.flatbuf.Bool|org.apache.arrow.flatbuf.Date|org.apache.arrow.flatbuf.Decimal|org.apache.arrow.flatbuf.Duration|org.apache.arrow.flatbuf.FixedSizeBinary|org.apache.arrow.flatbuf.FixedSizeList|org.apache.arrow.flatbuf.FloatingPoint|org.apache.arrow.flatbuf.Int|org.apache.arrow.flatbuf.Interval|org.apache.arrow.flatbuf.LargeBinary|org.apache.arrow.flatbuf.LargeList|org.apache.arrow.flatbuf.LargeUtf8|org.apache.arrow.flatbuf.List|org.apache.arrow.flatbuf.Map|org.apache.arrow.flatbuf.Null|org.apache.arrow.flatbuf.Struct_|org.apache.arrow.flatbuf.Time|org.apache.arrow.flatbuf.Timestamp|org.apache.arrow.flatbuf.Union|org.apache.arrow.flatbuf.Utf8|null {
-  switch(org.apache.arrow.flatbuf.Type[type]) {
-    case 'NONE': return null; 
-    case 'Null': return accessor(index, new org.apache.arrow.flatbuf.Null())! as org.apache.arrow.flatbuf.Null;
-    case 'Int': return accessor(index, new org.apache.arrow.flatbuf.Int())! as org.apache.arrow.flatbuf.Int;
-    case 'FloatingPoint': return accessor(index, new org.apache.arrow.flatbuf.FloatingPoint())! as org.apache.arrow.flatbuf.FloatingPoint;
-    case 'Binary': return accessor(index, new org.apache.arrow.flatbuf.Binary())! as org.apache.arrow.flatbuf.Binary;
-    case 'Utf8': return accessor(index, new org.apache.arrow.flatbuf.Utf8())! as org.apache.arrow.flatbuf.Utf8;
-    case 'Bool': return accessor(index, new org.apache.arrow.flatbuf.Bool())! as org.apache.arrow.flatbuf.Bool;
-    case 'Decimal': return accessor(index, new org.apache.arrow.flatbuf.Decimal())! as org.apache.arrow.flatbuf.Decimal;
-    case 'Date': return accessor(index, new org.apache.arrow.flatbuf.Date())! as org.apache.arrow.flatbuf.Date;
-    case 'Time': return accessor(index, new org.apache.arrow.flatbuf.Time())! as org.apache.arrow.flatbuf.Time;
-    case 'Timestamp': return accessor(index, new org.apache.arrow.flatbuf.Timestamp())! as org.apache.arrow.flatbuf.Timestamp;
-    case 'Interval': return accessor(index, new org.apache.arrow.flatbuf.Interval())! as org.apache.arrow.flatbuf.Interval;
-    case 'List': return accessor(index, new org.apache.arrow.flatbuf.List())! as org.apache.arrow.flatbuf.List;
-    case 'Struct_': return accessor(index, new org.apache.arrow.flatbuf.Struct_())! as org.apache.arrow.flatbuf.Struct_;
-    case 'Union': return accessor(index, new org.apache.arrow.flatbuf.Union())! as org.apache.arrow.flatbuf.Union;
-    case 'FixedSizeBinary': return accessor(index, new org.apache.arrow.flatbuf.FixedSizeBinary())! as org.apache.arrow.flatbuf.FixedSizeBinary;
-    case 'FixedSizeList': return accessor(index, new org.apache.arrow.flatbuf.FixedSizeList())! as org.apache.arrow.flatbuf.FixedSizeList;
-    case 'Map': return accessor(index, new org.apache.arrow.flatbuf.Map())! as org.apache.arrow.flatbuf.Map;
-    case 'Duration': return accessor(index, new org.apache.arrow.flatbuf.Duration())! as org.apache.arrow.flatbuf.Duration;
-    case 'LargeBinary': return accessor(index, new org.apache.arrow.flatbuf.LargeBinary())! as org.apache.arrow.flatbuf.LargeBinary;
-    case 'LargeUtf8': return accessor(index, new org.apache.arrow.flatbuf.LargeUtf8())! as org.apache.arrow.flatbuf.LargeUtf8;
-    case 'LargeList': return accessor(index, new org.apache.arrow.flatbuf.LargeList())! as org.apache.arrow.flatbuf.LargeList;
-    default: return null;
-  }
-}
-}
-
-/**
- * ----------------------------------------------------------------------
- * Dictionary encoding metadata
- * Maintained for forwards compatibility, in the future
- * Dictionaries might be explicit maps between integers and values
- * allowing for non-contiguous index values
- *
- * @enum {number}
- */
-export namespace org.apache.arrow.flatbuf{
-export enum DictionaryKind{
-  DenseArray= 0
-};
-}
-
-/**
- * ----------------------------------------------------------------------
- * Endianness of the platform producing the data
- *
- * @enum {number}
- */
-export namespace org.apache.arrow.flatbuf{
-export enum Endianness{
-  Little= 0,
-  Big= 1
-};
-}
-
-/**
- * These are stored in the flatbuffer in the Type union below
- *
- * @constructor
- */
-export namespace org.apache.arrow.flatbuf{
-export class Null {
-  bb: flatbuffers.ByteBuffer|null = null;
-
-  bb_pos:number = 0;
-/**
- * @param number i
- * @param flatbuffers.ByteBuffer bb
- * @returns Null
- */
-__init(i:number, bb:flatbuffers.ByteBuffer):Null {
-  this.bb_pos = i;
-  this.bb = bb;
-  return this;
-};
-
-/**
- * @param flatbuffers.ByteBuffer bb
- * @param Null= obj
- * @returns Null
- */
-static getRootAsNull(bb:flatbuffers.ByteBuffer, obj?:Null):Null {
-  return (obj || new Null()).__init(bb.readInt32(bb.position()) + bb.position(), bb);
-};
-
-/**
- * @param flatbuffers.ByteBuffer bb
- * @param Null= obj
- * @returns Null
- */
-static getSizePrefixedRootAsNull(bb:flatbuffers.ByteBuffer, obj?:Null):Null {
-  bb.setPosition(bb.position() + flatbuffers.SIZE_PREFIX_LENGTH);
-  return (obj || new Null()).__init(bb.readInt32(bb.position()) + bb.position(), bb);
-};
-
-/**
- * @param flatbuffers.Builder builder
- */
-static startNull(builder:flatbuffers.Builder) {
-  builder.startObject(0);
-};
-
-/**
- * @param flatbuffers.Builder builder
- * @returns flatbuffers.Offset
- */
-static endNull(builder:flatbuffers.Builder):flatbuffers.Offset {
-  var offset = builder.endObject();
-  return offset;
-};
-
-static createNull(builder:flatbuffers.Builder):flatbuffers.Offset {
-  Null.startNull(builder);
-  return Null.endNull(builder);
-}
-}
-}
-/**
- * A Struct_ in the flatbuffer metadata is the same as an Arrow Struct
- * (according to the physical memory layout). We used Struct_ here as
- * Struct is a reserved word in Flatbuffers
- *
- * @constructor
- */
-export namespace org.apache.arrow.flatbuf{
-export class Struct_ {
-  bb: flatbuffers.ByteBuffer|null = null;
-
-  bb_pos:number = 0;
-/**
- * @param number i
- * @param flatbuffers.ByteBuffer bb
- * @returns Struct_
- */
-__init(i:number, bb:flatbuffers.ByteBuffer):Struct_ {
-  this.bb_pos = i;
-  this.bb = bb;
-  return this;
-};
-
-/**
- * @param flatbuffers.ByteBuffer bb
- * @param Struct_= obj
- * @returns Struct_
- */
-static getRootAsStruct_(bb:flatbuffers.ByteBuffer, obj?:Struct_):Struct_ {
-  return (obj || new Struct_()).__init(bb.readInt32(bb.position()) + bb.position(), bb);
-};
-
-/**
- * @param flatbuffers.ByteBuffer bb
- * @param Struct_= obj
- * @returns Struct_
- */
-static getSizePrefixedRootAsStruct_(bb:flatbuffers.ByteBuffer, obj?:Struct_):Struct_ {
-  bb.setPosition(bb.position() + flatbuffers.SIZE_PREFIX_LENGTH);
-  return (obj || new Struct_()).__init(bb.readInt32(bb.position()) + bb.position(), bb);
-};
-
-/**
- * @param flatbuffers.Builder builder
- */
-static startStruct_(builder:flatbuffers.Builder) {
-  builder.startObject(0);
-};
-
-/**
- * @param flatbuffers.Builder builder
- * @returns flatbuffers.Offset
- */
-static endStruct_(builder:flatbuffers.Builder):flatbuffers.Offset {
-  var offset = builder.endObject();
-  return offset;
-};
-
-static createStruct_(builder:flatbuffers.Builder):flatbuffers.Offset {
-  Struct_.startStruct_(builder);
-  return Struct_.endStruct_(builder);
-}
-}
-}
-/**
- * @constructor
- */
-export namespace org.apache.arrow.flatbuf{
-export class List {
-  bb: flatbuffers.ByteBuffer|null = null;
-
-  bb_pos:number = 0;
-/**
- * @param number i
- * @param flatbuffers.ByteBuffer bb
- * @returns List
- */
-__init(i:number, bb:flatbuffers.ByteBuffer):List {
-  this.bb_pos = i;
-  this.bb = bb;
-  return this;
-};
-
-/**
- * @param flatbuffers.ByteBuffer bb
- * @param List= obj
- * @returns List
- */
-static getRootAsList(bb:flatbuffers.ByteBuffer, obj?:List):List {
-  return (obj || new List()).__init(bb.readInt32(bb.position()) + bb.position(), bb);
-};
-
-/**
- * @param flatbuffers.ByteBuffer bb
- * @param List= obj
- * @returns List
- */
-static getSizePrefixedRootAsList(bb:flatbuffers.ByteBuffer, obj?:List):List {
-  bb.setPosition(bb.position() + flatbuffers.SIZE_PREFIX_LENGTH);
-  return (obj || new List()).__init(bb.readInt32(bb.position()) + bb.position(), bb);
-};
-
-/**
- * @param flatbuffers.Builder builder
- */
-static startList(builder:flatbuffers.Builder) {
-  builder.startObject(0);
-};
-
-/**
- * @param flatbuffers.Builder builder
- * @returns flatbuffers.Offset
- */
-static endList(builder:flatbuffers.Builder):flatbuffers.Offset {
-  var offset = builder.endObject();
-  return offset;
-};
-
-static createList(builder:flatbuffers.Builder):flatbuffers.Offset {
-  List.startList(builder);
-  return List.endList(builder);
-}
-}
-}
-/**
- * Same as List, but with 64-bit offsets, allowing to represent
- * extremely large data values.
- *
- * @constructor
- */
-export namespace org.apache.arrow.flatbuf{
-export class LargeList {
-  bb: flatbuffers.ByteBuffer|null = null;
-
-  bb_pos:number = 0;
-/**
- * @param number i
- * @param flatbuffers.ByteBuffer bb
- * @returns LargeList
- */
-__init(i:number, bb:flatbuffers.ByteBuffer):LargeList {
-  this.bb_pos = i;
-  this.bb = bb;
-  return this;
-};
-
-/**
- * @param flatbuffers.ByteBuffer bb
- * @param LargeList= obj
- * @returns LargeList
- */
-static getRootAsLargeList(bb:flatbuffers.ByteBuffer, obj?:LargeList):LargeList {
-  return (obj || new LargeList()).__init(bb.readInt32(bb.position()) + bb.position(), bb);
-};
-
-/**
- * @param flatbuffers.ByteBuffer bb
- * @param LargeList= obj
- * @returns LargeList
- */
-static getSizePrefixedRootAsLargeList(bb:flatbuffers.ByteBuffer, obj?:LargeList):LargeList {
-  bb.setPosition(bb.position() + flatbuffers.SIZE_PREFIX_LENGTH);
-  return (obj || new LargeList()).__init(bb.readInt32(bb.position()) + bb.position(), bb);
-};
-
-/**
- * @param flatbuffers.Builder builder
- */
-static startLargeList(builder:flatbuffers.Builder) {
-  builder.startObject(0);
-};
-
-/**
- * @param flatbuffers.Builder builder
- * @returns flatbuffers.Offset
- */
-static endLargeList(builder:flatbuffers.Builder):flatbuffers.Offset {
-  var offset = builder.endObject();
-  return offset;
-};
-
-static createLargeList(builder:flatbuffers.Builder):flatbuffers.Offset {
-  LargeList.startLargeList(builder);
-  return LargeList.endLargeList(builder);
-}
-}
-}
-/**
- * @constructor
- */
-export namespace org.apache.arrow.flatbuf{
-export class FixedSizeList {
-  bb: flatbuffers.ByteBuffer|null = null;
-
-  bb_pos:number = 0;
-/**
- * @param number i
- * @param flatbuffers.ByteBuffer bb
- * @returns FixedSizeList
- */
-__init(i:number, bb:flatbuffers.ByteBuffer):FixedSizeList {
-  this.bb_pos = i;
-  this.bb = bb;
-  return this;
-};
-
-/**
- * @param flatbuffers.ByteBuffer bb
- * @param FixedSizeList= obj
- * @returns FixedSizeList
- */
-static getRootAsFixedSizeList(bb:flatbuffers.ByteBuffer, obj?:FixedSizeList):FixedSizeList {
-  return (obj || new FixedSizeList()).__init(bb.readInt32(bb.position()) + bb.position(), bb);
-};
-
-/**
- * @param flatbuffers.ByteBuffer bb
- * @param FixedSizeList= obj
- * @returns FixedSizeList
- */
-static getSizePrefixedRootAsFixedSizeList(bb:flatbuffers.ByteBuffer, obj?:FixedSizeList):FixedSizeList {
-  bb.setPosition(bb.position() + flatbuffers.SIZE_PREFIX_LENGTH);
-  return (obj || new FixedSizeList()).__init(bb.readInt32(bb.position()) + bb.position(), bb);
-};
-
-/**
- * Number of list items per value
- *
- * @returns number
- */
-listSize():number {
-  var offset = this.bb!.__offset(this.bb_pos, 4);
-  return offset ? this.bb!.readInt32(this.bb_pos + offset) : 0;
-};
-
-/**
- * @param flatbuffers.Builder builder
- */
-static startFixedSizeList(builder:flatbuffers.Builder) {
-  builder.startObject(1);
-};
-
-/**
- * @param flatbuffers.Builder builder
- * @param number listSize
- */
-static addListSize(builder:flatbuffers.Builder, listSize:number) {
-  builder.addFieldInt32(0, listSize, 0);
-};
-
-/**
- * @param flatbuffers.Builder builder
- * @returns flatbuffers.Offset
- */
-static endFixedSizeList(builder:flatbuffers.Builder):flatbuffers.Offset {
-  var offset = builder.endObject();
-  return offset;
-};
-
-static createFixedSizeList(builder:flatbuffers.Builder, listSize:number):flatbuffers.Offset {
-  FixedSizeList.startFixedSizeList(builder);
-  FixedSizeList.addListSize(builder, listSize);
-  return FixedSizeList.endFixedSizeList(builder);
-}
-}
-}
-/**
- * A Map is a logical nested type that is represented as
- *
- * List<entries: Struct<key: K, value: V>>
- *
- * In this layout, the keys and values are each respectively contiguous. We do
- * not constrain the key and value types, so the application is responsible
- * for ensuring that the keys are hashable and unique. Whether the keys are sorted
- * may be set in the metadata for this field.
- *
- * In a field with Map type, the field has a child Struct field, which then
- * has two children: key type and the second the value type. The names of the
- * child fields may be respectively "entries", "key", and "value", but this is
- * not enforced.
- *
- * Map
- * ```text
- *   - child[0] entries: Struct
- *     - child[0] key: K
- *     - child[1] value: V
- * ```
- * Neither the "entries" field nor the "key" field may be nullable.
- *
- * The metadata is structured so that Arrow systems without special handling
- * for Map can make Map an alias for List. The "layout" attribute for the Map
- * field must have the same contents as a List.
- *
- * @constructor
- */
-export namespace org.apache.arrow.flatbuf{
-export class Map {
-  bb: flatbuffers.ByteBuffer|null = null;
-
-  bb_pos:number = 0;
-/**
- * @param number i
- * @param flatbuffers.ByteBuffer bb
- * @returns Map
- */
-__init(i:number, bb:flatbuffers.ByteBuffer):Map {
-  this.bb_pos = i;
-  this.bb = bb;
-  return this;
-};
-
-/**
- * @param flatbuffers.ByteBuffer bb
- * @param Map= obj
- * @returns Map
- */
-static getRootAsMap(bb:flatbuffers.ByteBuffer, obj?:Map):Map {
-  return (obj || new Map()).__init(bb.readInt32(bb.position()) + bb.position(), bb);
-};
-
-/**
- * @param flatbuffers.ByteBuffer bb
- * @param Map= obj
- * @returns Map
- */
-static getSizePrefixedRootAsMap(bb:flatbuffers.ByteBuffer, obj?:Map):Map {
-  bb.setPosition(bb.position() + flatbuffers.SIZE_PREFIX_LENGTH);
-  return (obj || new Map()).__init(bb.readInt32(bb.position()) + bb.position(), bb);
-};
-
-/**
- * Set to true if the keys within each value are sorted
- *
- * @returns boolean
- */
-keysSorted():boolean {
-  var offset = this.bb!.__offset(this.bb_pos, 4);
-  return offset ? !!this.bb!.readInt8(this.bb_pos + offset) : false;
-};
-
-/**
- * @param flatbuffers.Builder builder
- */
-static startMap(builder:flatbuffers.Builder) {
-  builder.startObject(1);
-};
-
-/**
- * @param flatbuffers.Builder builder
- * @param boolean keysSorted
- */
-static addKeysSorted(builder:flatbuffers.Builder, keysSorted:boolean) {
-  builder.addFieldInt8(0, +keysSorted, +false);
-};
-
-/**
- * @param flatbuffers.Builder builder
- * @returns flatbuffers.Offset
- */
-static endMap(builder:flatbuffers.Builder):flatbuffers.Offset {
-  var offset = builder.endObject();
-  return offset;
-};
-
-static createMap(builder:flatbuffers.Builder, keysSorted:boolean):flatbuffers.Offset {
-  Map.startMap(builder);
-  Map.addKeysSorted(builder, keysSorted);
-  return Map.endMap(builder);
-}
-}
-}
-/**
- * A union is a complex type with children in Field
- * By default ids in the type vector refer to the offsets in the children
- * optionally typeIds provides an indirection between the child offset and the type id
- * for each child `typeIds[offset]` is the id used in the type vector
- *
- * @constructor
- */
-export namespace org.apache.arrow.flatbuf{
-export class Union {
-  bb: flatbuffers.ByteBuffer|null = null;
-
-  bb_pos:number = 0;
-/**
- * @param number i
- * @param flatbuffers.ByteBuffer bb
- * @returns Union
- */
-__init(i:number, bb:flatbuffers.ByteBuffer):Union {
-  this.bb_pos = i;
-  this.bb = bb;
-  return this;
-};
-
-/**
- * @param flatbuffers.ByteBuffer bb
- * @param Union= obj
- * @returns Union
- */
-static getRootAsUnion(bb:flatbuffers.ByteBuffer, obj?:Union):Union {
-  return (obj || new Union()).__init(bb.readInt32(bb.position()) + bb.position(), bb);
-};
-
-/**
- * @param flatbuffers.ByteBuffer bb
- * @param Union= obj
- * @returns Union
- */
-static getSizePrefixedRootAsUnion(bb:flatbuffers.ByteBuffer, obj?:Union):Union {
-  bb.setPosition(bb.position() + flatbuffers.SIZE_PREFIX_LENGTH);
-  return (obj || new Union()).__init(bb.readInt32(bb.position()) + bb.position(), bb);
-};
-
-/**
- * @returns org.apache.arrow.flatbuf.UnionMode
- */
-mode():org.apache.arrow.flatbuf.UnionMode {
-  var offset = this.bb!.__offset(this.bb_pos, 4);
-  return offset ? /**  */ (this.bb!.readInt16(this.bb_pos + offset)) : org.apache.arrow.flatbuf.UnionMode.Sparse;
-};
-
-/**
- * @param number index
- * @returns number
- */
-typeIds(index: number):number|null {
-  var offset = this.bb!.__offset(this.bb_pos, 6);
-  return offset ? this.bb!.readInt32(this.bb!.__vector(this.bb_pos + offset) + index * 4) : 0;
-};
-
-/**
- * @returns number
- */
-typeIdsLength():number {
-  var offset = this.bb!.__offset(this.bb_pos, 6);
-  return offset ? this.bb!.__vector_len(this.bb_pos + offset) : 0;
-};
-
-/**
- * @returns Int32Array
- */
-typeIdsArray():Int32Array|null {
-  var offset = this.bb!.__offset(this.bb_pos, 6);
-  return offset ? new Int32Array(this.bb!.bytes().buffer, this.bb!.bytes().byteOffset + this.bb!.__vector(this.bb_pos + offset), this.bb!.__vector_len(this.bb_pos + offset)) : null;
-};
-
-/**
- * @param flatbuffers.Builder builder
- */
-static startUnion(builder:flatbuffers.Builder) {
-  builder.startObject(2);
-};
-
-/**
- * @param flatbuffers.Builder builder
- * @param org.apache.arrow.flatbuf.UnionMode mode
- */
-static addMode(builder:flatbuffers.Builder, mode:org.apache.arrow.flatbuf.UnionMode) {
-  builder.addFieldInt16(0, mode, org.apache.arrow.flatbuf.UnionMode.Sparse);
-};
-
-/**
- * @param flatbuffers.Builder builder
- * @param flatbuffers.Offset typeIdsOffset
- */
-static addTypeIds(builder:flatbuffers.Builder, typeIdsOffset:flatbuffers.Offset) {
-  builder.addFieldOffset(1, typeIdsOffset, 0);
-};
-
-/**
- * @param flatbuffers.Builder builder
- * @param Array.<number> data
- * @returns flatbuffers.Offset
- */
-static createTypeIdsVector(builder:flatbuffers.Builder, data:number[]|Int32Array):flatbuffers.Offset;
-/**
- * @deprecated This Uint8Array overload will be removed in the future.
- */
-static createTypeIdsVector(builder:flatbuffers.Builder, data:number[]|Uint8Array):flatbuffers.Offset;
-static createTypeIdsVector(builder:flatbuffers.Builder, data:number[]|Int32Array|Uint8Array):flatbuffers.Offset {
-  builder.startVector(4, data.length, 4);
-  for (var i = data.length - 1; i >= 0; i--) {
-    builder.addInt32(data[i]);
-  }
-  return builder.endVector();
-};
-
-/**
- * @param flatbuffers.Builder builder
- * @param number numElems
- */
-static startTypeIdsVector(builder:flatbuffers.Builder, numElems:number) {
-  builder.startVector(4, numElems, 4);
-};
-
-/**
- * @param flatbuffers.Builder builder
- * @returns flatbuffers.Offset
- */
-static endUnion(builder:flatbuffers.Builder):flatbuffers.Offset {
-  var offset = builder.endObject();
-  return offset;
-};
-
-static createUnion(builder:flatbuffers.Builder, mode:org.apache.arrow.flatbuf.UnionMode, typeIdsOffset:flatbuffers.Offset):flatbuffers.Offset {
-  Union.startUnion(builder);
-  Union.addMode(builder, mode);
-  Union.addTypeIds(builder, typeIdsOffset);
-  return Union.endUnion(builder);
-}
-}
-}
-/**
- * @constructor
- */
-export namespace org.apache.arrow.flatbuf{
-export class Int {
-  bb: flatbuffers.ByteBuffer|null = null;
-
-  bb_pos:number = 0;
-/**
- * @param number i
- * @param flatbuffers.ByteBuffer bb
- * @returns Int
- */
-__init(i:number, bb:flatbuffers.ByteBuffer):Int {
-  this.bb_pos = i;
-  this.bb = bb;
-  return this;
-};
-
-/**
- * @param flatbuffers.ByteBuffer bb
- * @param Int= obj
- * @returns Int
- */
-static getRootAsInt(bb:flatbuffers.ByteBuffer, obj?:Int):Int {
-  return (obj || new Int()).__init(bb.readInt32(bb.position()) + bb.position(), bb);
-};
-
-/**
- * @param flatbuffers.ByteBuffer bb
- * @param Int= obj
- * @returns Int
- */
-static getSizePrefixedRootAsInt(bb:flatbuffers.ByteBuffer, obj?:Int):Int {
-  bb.setPosition(bb.position() + flatbuffers.SIZE_PREFIX_LENGTH);
-  return (obj || new Int()).__init(bb.readInt32(bb.position()) + bb.position(), bb);
-};
-
-/**
- * @returns number
- */
-bitWidth():number {
-  var offset = this.bb!.__offset(this.bb_pos, 4);
-  return offset ? this.bb!.readInt32(this.bb_pos + offset) : 0;
-};
-
-/**
- * @returns boolean
- */
-isSigned():boolean {
-  var offset = this.bb!.__offset(this.bb_pos, 6);
-  return offset ? !!this.bb!.readInt8(this.bb_pos + offset) : false;
-};
-
-/**
- * @param flatbuffers.Builder builder
- */
-static startInt(builder:flatbuffers.Builder) {
-  builder.startObject(2);
-};
-
-/**
- * @param flatbuffers.Builder builder
- * @param number bitWidth
- */
-static addBitWidth(builder:flatbuffers.Builder, bitWidth:number) {
-  builder.addFieldInt32(0, bitWidth, 0);
-};
-
-/**
- * @param flatbuffers.Builder builder
- * @param boolean isSigned
- */
-static addIsSigned(builder:flatbuffers.Builder, isSigned:boolean) {
-  builder.addFieldInt8(1, +isSigned, +false);
-};
-
-/**
- * @param flatbuffers.Builder builder
- * @returns flatbuffers.Offset
- */
-static endInt(builder:flatbuffers.Builder):flatbuffers.Offset {
-  var offset = builder.endObject();
-  return offset;
-};
-
-static createInt(builder:flatbuffers.Builder, bitWidth:number, isSigned:boolean):flatbuffers.Offset {
-  Int.startInt(builder);
-  Int.addBitWidth(builder, bitWidth);
-  Int.addIsSigned(builder, isSigned);
-  return Int.endInt(builder);
-}
-}
-}
-/**
- * @constructor
- */
-export namespace org.apache.arrow.flatbuf{
-export class FloatingPoint {
-  bb: flatbuffers.ByteBuffer|null = null;
-
-  bb_pos:number = 0;
-/**
- * @param number i
- * @param flatbuffers.ByteBuffer bb
- * @returns FloatingPoint
- */
-__init(i:number, bb:flatbuffers.ByteBuffer):FloatingPoint {
-  this.bb_pos = i;
-  this.bb = bb;
-  return this;
-};
-
-/**
- * @param flatbuffers.ByteBuffer bb
- * @param FloatingPoint= obj
- * @returns FloatingPoint
- */
-static getRootAsFloatingPoint(bb:flatbuffers.ByteBuffer, obj?:FloatingPoint):FloatingPoint {
-  return (obj || new FloatingPoint()).__init(bb.readInt32(bb.position()) + bb.position(), bb);
-};
-
-/**
- * @param flatbuffers.ByteBuffer bb
- * @param FloatingPoint= obj
- * @returns FloatingPoint
- */
-static getSizePrefixedRootAsFloatingPoint(bb:flatbuffers.ByteBuffer, obj?:FloatingPoint):FloatingPoint {
-  bb.setPosition(bb.position() + flatbuffers.SIZE_PREFIX_LENGTH);
-  return (obj || new FloatingPoint()).__init(bb.readInt32(bb.position()) + bb.position(), bb);
-};
-
-/**
- * @returns org.apache.arrow.flatbuf.Precision
- */
-precision():org.apache.arrow.flatbuf.Precision {
-  var offset = this.bb!.__offset(this.bb_pos, 4);
-  return offset ? /**  */ (this.bb!.readInt16(this.bb_pos + offset)) : org.apache.arrow.flatbuf.Precision.HALF;
-};
-
-/**
- * @param flatbuffers.Builder builder
- */
-static startFloatingPoint(builder:flatbuffers.Builder) {
-  builder.startObject(1);
-};
-
-/**
- * @param flatbuffers.Builder builder
- * @param org.apache.arrow.flatbuf.Precision precision
- */
-static addPrecision(builder:flatbuffers.Builder, precision:org.apache.arrow.flatbuf.Precision) {
-  builder.addFieldInt16(0, precision, org.apache.arrow.flatbuf.Precision.HALF);
-};
-
-/**
- * @param flatbuffers.Builder builder
- * @returns flatbuffers.Offset
- */
-static endFloatingPoint(builder:flatbuffers.Builder):flatbuffers.Offset {
-  var offset = builder.endObject();
-  return offset;
-};
-
-static createFloatingPoint(builder:flatbuffers.Builder, precision:org.apache.arrow.flatbuf.Precision):flatbuffers.Offset {
-  FloatingPoint.startFloatingPoint(builder);
-  FloatingPoint.addPrecision(builder, precision);
-  return FloatingPoint.endFloatingPoint(builder);
-}
-}
-}
-/**
- * Unicode with UTF-8 encoding
- *
- * @constructor
- */
-export namespace org.apache.arrow.flatbuf{
-export class Utf8 {
-  bb: flatbuffers.ByteBuffer|null = null;
-
-  bb_pos:number = 0;
-/**
- * @param number i
- * @param flatbuffers.ByteBuffer bb
- * @returns Utf8
- */
-__init(i:number, bb:flatbuffers.ByteBuffer):Utf8 {
-  this.bb_pos = i;
-  this.bb = bb;
-  return this;
-};
-
-/**
- * @param flatbuffers.ByteBuffer bb
- * @param Utf8= obj
- * @returns Utf8
- */
-static getRootAsUtf8(bb:flatbuffers.ByteBuffer, obj?:Utf8):Utf8 {
-  return (obj || new Utf8()).__init(bb.readInt32(bb.position()) + bb.position(), bb);
-};
-
-/**
- * @param flatbuffers.ByteBuffer bb
- * @param Utf8= obj
- * @returns Utf8
- */
-static getSizePrefixedRootAsUtf8(bb:flatbuffers.ByteBuffer, obj?:Utf8):Utf8 {
-  bb.setPosition(bb.position() + flatbuffers.SIZE_PREFIX_LENGTH);
-  return (obj || new Utf8()).__init(bb.readInt32(bb.position()) + bb.position(), bb);
-};
-
-/**
- * @param flatbuffers.Builder builder
- */
-static startUtf8(builder:flatbuffers.Builder) {
-  builder.startObject(0);
-};
-
-/**
- * @param flatbuffers.Builder builder
- * @returns flatbuffers.Offset
- */
-static endUtf8(builder:flatbuffers.Builder):flatbuffers.Offset {
-  var offset = builder.endObject();
-  return offset;
-};
-
-static createUtf8(builder:flatbuffers.Builder):flatbuffers.Offset {
-  Utf8.startUtf8(builder);
-  return Utf8.endUtf8(builder);
-}
-}
-}
-/**
- * Opaque binary data
- *
- * @constructor
- */
-export namespace org.apache.arrow.flatbuf{
-export class Binary {
-  bb: flatbuffers.ByteBuffer|null = null;
-
-  bb_pos:number = 0;
-/**
- * @param number i
- * @param flatbuffers.ByteBuffer bb
- * @returns Binary
- */
-__init(i:number, bb:flatbuffers.ByteBuffer):Binary {
-  this.bb_pos = i;
-  this.bb = bb;
-  return this;
-};
-
-/**
- * @param flatbuffers.ByteBuffer bb
- * @param Binary= obj
- * @returns Binary
- */
-static getRootAsBinary(bb:flatbuffers.ByteBuffer, obj?:Binary):Binary {
-  return (obj || new Binary()).__init(bb.readInt32(bb.position()) + bb.position(), bb);
-};
-
-/**
- * @param flatbuffers.ByteBuffer bb
- * @param Binary= obj
- * @returns Binary
- */
-static getSizePrefixedRootAsBinary(bb:flatbuffers.ByteBuffer, obj?:Binary):Binary {
-  bb.setPosition(bb.position() + flatbuffers.SIZE_PREFIX_LENGTH);
-  return (obj || new Binary()).__init(bb.readInt32(bb.position()) + bb.position(), bb);
-};
-
-/**
- * @param flatbuffers.Builder builder
- */
-static startBinary(builder:flatbuffers.Builder) {
-  builder.startObject(0);
-};
-
-/**
- * @param flatbuffers.Builder builder
- * @returns flatbuffers.Offset
- */
-static endBinary(builder:flatbuffers.Builder):flatbuffers.Offset {
-  var offset = builder.endObject();
-  return offset;
-};
-
-static createBinary(builder:flatbuffers.Builder):flatbuffers.Offset {
-  Binary.startBinary(builder);
-  return Binary.endBinary(builder);
-}
-}
-}
-/**
- * Same as Utf8, but with 64-bit offsets, allowing to represent
- * extremely large data values.
- *
- * @constructor
- */
-export namespace org.apache.arrow.flatbuf{
-export class LargeUtf8 {
-  bb: flatbuffers.ByteBuffer|null = null;
-
-  bb_pos:number = 0;
-/**
- * @param number i
- * @param flatbuffers.ByteBuffer bb
- * @returns LargeUtf8
- */
-__init(i:number, bb:flatbuffers.ByteBuffer):LargeUtf8 {
-  this.bb_pos = i;
-  this.bb = bb;
-  return this;
-};
-
-/**
- * @param flatbuffers.ByteBuffer bb
- * @param LargeUtf8= obj
- * @returns LargeUtf8
- */
-static getRootAsLargeUtf8(bb:flatbuffers.ByteBuffer, obj?:LargeUtf8):LargeUtf8 {
-  return (obj || new LargeUtf8()).__init(bb.readInt32(bb.position()) + bb.position(), bb);
-};
-
-/**
- * @param flatbuffers.ByteBuffer bb
- * @param LargeUtf8= obj
- * @returns LargeUtf8
- */
-static getSizePrefixedRootAsLargeUtf8(bb:flatbuffers.ByteBuffer, obj?:LargeUtf8):LargeUtf8 {
-  bb.setPosition(bb.position() + flatbuffers.SIZE_PREFIX_LENGTH);
-  return (obj || new LargeUtf8()).__init(bb.readInt32(bb.position()) + bb.position(), bb);
-};
-
-/**
- * @param flatbuffers.Builder builder
- */
-static startLargeUtf8(builder:flatbuffers.Builder) {
-  builder.startObject(0);
-};
-
-/**
- * @param flatbuffers.Builder builder
- * @returns flatbuffers.Offset
- */
-static endLargeUtf8(builder:flatbuffers.Builder):flatbuffers.Offset {
-  var offset = builder.endObject();
-  return offset;
-};
-
-static createLargeUtf8(builder:flatbuffers.Builder):flatbuffers.Offset {
-  LargeUtf8.startLargeUtf8(builder);
-  return LargeUtf8.endLargeUtf8(builder);
-}
-}
-}
-/**
- * Same as Binary, but with 64-bit offsets, allowing to represent
- * extremely large data values.
- *
- * @constructor
- */
-export namespace org.apache.arrow.flatbuf{
-export class LargeBinary {
-  bb: flatbuffers.ByteBuffer|null = null;
-
-  bb_pos:number = 0;
-/**
- * @param number i
- * @param flatbuffers.ByteBuffer bb
- * @returns LargeBinary
- */
-__init(i:number, bb:flatbuffers.ByteBuffer):LargeBinary {
-  this.bb_pos = i;
-  this.bb = bb;
-  return this;
-};
-
-/**
- * @param flatbuffers.ByteBuffer bb
- * @param LargeBinary= obj
- * @returns LargeBinary
- */
-static getRootAsLargeBinary(bb:flatbuffers.ByteBuffer, obj?:LargeBinary):LargeBinary {
-  return (obj || new LargeBinary()).__init(bb.readInt32(bb.position()) + bb.position(), bb);
-};
-
-/**
- * @param flatbuffers.ByteBuffer bb
- * @param LargeBinary= obj
- * @returns LargeBinary
- */
-static getSizePrefixedRootAsLargeBinary(bb:flatbuffers.ByteBuffer, obj?:LargeBinary):LargeBinary {
-  bb.setPosition(bb.position() + flatbuffers.SIZE_PREFIX_LENGTH);
-  return (obj || new LargeBinary()).__init(bb.readInt32(bb.position()) + bb.position(), bb);
-};
-
-/**
- * @param flatbuffers.Builder builder
- */
-static startLargeBinary(builder:flatbuffers.Builder) {
-  builder.startObject(0);
-};
-
-/**
- * @param flatbuffers.Builder builder
- * @returns flatbuffers.Offset
- */
-static endLargeBinary(builder:flatbuffers.Builder):flatbuffers.Offset {
-  var offset = builder.endObject();
-  return offset;
-};
-
-static createLargeBinary(builder:flatbuffers.Builder):flatbuffers.Offset {
-  LargeBinary.startLargeBinary(builder);
-  return LargeBinary.endLargeBinary(builder);
-}
-}
-}
-/**
- * @constructor
- */
-export namespace org.apache.arrow.flatbuf{
-export class FixedSizeBinary {
-  bb: flatbuffers.ByteBuffer|null = null;
-
-  bb_pos:number = 0;
-/**
- * @param number i
- * @param flatbuffers.ByteBuffer bb
- * @returns FixedSizeBinary
- */
-__init(i:number, bb:flatbuffers.ByteBuffer):FixedSizeBinary {
-  this.bb_pos = i;
-  this.bb = bb;
-  return this;
-};
-
-/**
- * @param flatbuffers.ByteBuffer bb
- * @param FixedSizeBinary= obj
- * @returns FixedSizeBinary
- */
-static getRootAsFixedSizeBinary(bb:flatbuffers.ByteBuffer, obj?:FixedSizeBinary):FixedSizeBinary {
-  return (obj || new FixedSizeBinary()).__init(bb.readInt32(bb.position()) + bb.position(), bb);
-};
-
-/**
- * @param flatbuffers.ByteBuffer bb
- * @param FixedSizeBinary= obj
- * @returns FixedSizeBinary
- */
-static getSizePrefixedRootAsFixedSizeBinary(bb:flatbuffers.ByteBuffer, obj?:FixedSizeBinary):FixedSizeBinary {
-  bb.setPosition(bb.position() + flatbuffers.SIZE_PREFIX_LENGTH);
-  return (obj || new FixedSizeBinary()).__init(bb.readInt32(bb.position()) + bb.position(), bb);
-};
-
-/**
- * Number of bytes per value
- *
- * @returns number
- */
-byteWidth():number {
-  var offset = this.bb!.__offset(this.bb_pos, 4);
-  return offset ? this.bb!.readInt32(this.bb_pos + offset) : 0;
-};
-
-/**
- * @param flatbuffers.Builder builder
- */
-static startFixedSizeBinary(builder:flatbuffers.Builder) {
-  builder.startObject(1);
-};
-
-/**
- * @param flatbuffers.Builder builder
- * @param number byteWidth
- */
-static addByteWidth(builder:flatbuffers.Builder, byteWidth:number) {
-  builder.addFieldInt32(0, byteWidth, 0);
-};
-
-/**
- * @param flatbuffers.Builder builder
- * @returns flatbuffers.Offset
- */
-static endFixedSizeBinary(builder:flatbuffers.Builder):flatbuffers.Offset {
-  var offset = builder.endObject();
-  return offset;
-};
-
-static createFixedSizeBinary(builder:flatbuffers.Builder, byteWidth:number):flatbuffers.Offset {
-  FixedSizeBinary.startFixedSizeBinary(builder);
-  FixedSizeBinary.addByteWidth(builder, byteWidth);
-  return FixedSizeBinary.endFixedSizeBinary(builder);
-}
-}
-}
-/**
- * @constructor
- */
-export namespace org.apache.arrow.flatbuf{
-export class Bool {
-  bb: flatbuffers.ByteBuffer|null = null;
-
-  bb_pos:number = 0;
-/**
- * @param number i
- * @param flatbuffers.ByteBuffer bb
- * @returns Bool
- */
-__init(i:number, bb:flatbuffers.ByteBuffer):Bool {
-  this.bb_pos = i;
-  this.bb = bb;
-  return this;
-};
-
-/**
- * @param flatbuffers.ByteBuffer bb
- * @param Bool= obj
- * @returns Bool
- */
-static getRootAsBool(bb:flatbuffers.ByteBuffer, obj?:Bool):Bool {
-  return (obj || new Bool()).__init(bb.readInt32(bb.position()) + bb.position(), bb);
-};
-
-/**
- * @param flatbuffers.ByteBuffer bb
- * @param Bool= obj
- * @returns Bool
- */
-static getSizePrefixedRootAsBool(bb:flatbuffers.ByteBuffer, obj?:Bool):Bool {
-  bb.setPosition(bb.position() + flatbuffers.SIZE_PREFIX_LENGTH);
-  return (obj || new Bool()).__init(bb.readInt32(bb.position()) + bb.position(), bb);
-};
-
-/**
- * @param flatbuffers.Builder builder
- */
-static startBool(builder:flatbuffers.Builder) {
-  builder.startObject(0);
-};
-
-/**
- * @param flatbuffers.Builder builder
- * @returns flatbuffers.Offset
- */
-static endBool(builder:flatbuffers.Builder):flatbuffers.Offset {
-  var offset = builder.endObject();
-  return offset;
-};
-
-static createBool(builder:flatbuffers.Builder):flatbuffers.Offset {
-  Bool.startBool(builder);
-  return Bool.endBool(builder);
-}
-}
-}
-/**
- * Exact decimal value represented as an integer value in two's
- * complement. Currently only 128-bit (16-byte) and 256-bit (32-byte) integers
- * are used. The representation uses the endianness indicated
- * in the Schema.
- *
- * @constructor
- */
-export namespace org.apache.arrow.flatbuf{
-export class Decimal {
-  bb: flatbuffers.ByteBuffer|null = null;
-
-  bb_pos:number = 0;
-/**
- * @param number i
- * @param flatbuffers.ByteBuffer bb
- * @returns Decimal
- */
-__init(i:number, bb:flatbuffers.ByteBuffer):Decimal {
-  this.bb_pos = i;
-  this.bb = bb;
-  return this;
-};
-
-/**
- * @param flatbuffers.ByteBuffer bb
- * @param Decimal= obj
- * @returns Decimal
- */
-static getRootAsDecimal(bb:flatbuffers.ByteBuffer, obj?:Decimal):Decimal {
-  return (obj || new Decimal()).__init(bb.readInt32(bb.position()) + bb.position(), bb);
-};
-
-/**
- * @param flatbuffers.ByteBuffer bb
- * @param Decimal= obj
- * @returns Decimal
- */
-static getSizePrefixedRootAsDecimal(bb:flatbuffers.ByteBuffer, obj?:Decimal):Decimal {
-  bb.setPosition(bb.position() + flatbuffers.SIZE_PREFIX_LENGTH);
-  return (obj || new Decimal()).__init(bb.readInt32(bb.position()) + bb.position(), bb);
-};
-
-/**
- * Total number of decimal digits
- *
- * @returns number
- */
-precision():number {
-  var offset = this.bb!.__offset(this.bb_pos, 4);
-  return offset ? this.bb!.readInt32(this.bb_pos + offset) : 0;
-};
-
-/**
- * Number of digits after the decimal point "."
- *
- * @returns number
- */
-scale():number {
-  var offset = this.bb!.__offset(this.bb_pos, 6);
-  return offset ? this.bb!.readInt32(this.bb_pos + offset) : 0;
-};
-
-/**
- * Number of bits per value. The only accepted widths are 128 and 256.
- * We use bitWidth for consistency with Int::bitWidth.
- *
- * @returns number
- */
-bitWidth():number {
-  var offset = this.bb!.__offset(this.bb_pos, 8);
-  return offset ? this.bb!.readInt32(this.bb_pos + offset) : 128;
-};
-
-/**
- * @param flatbuffers.Builder builder
- */
-static startDecimal(builder:flatbuffers.Builder) {
-  builder.startObject(3);
-};
-
-/**
- * @param flatbuffers.Builder builder
- * @param number precision
- */
-static addPrecision(builder:flatbuffers.Builder, precision:number) {
-  builder.addFieldInt32(0, precision, 0);
-};
-
-/**
- * @param flatbuffers.Builder builder
- * @param number scale
- */
-static addScale(builder:flatbuffers.Builder, scale:number) {
-  builder.addFieldInt32(1, scale, 0);
-};
-
-/**
- * @param flatbuffers.Builder builder
- * @param number bitWidth
- */
-static addBitWidth(builder:flatbuffers.Builder, bitWidth:number) {
-  builder.addFieldInt32(2, bitWidth, 128);
-};
-
-/**
- * @param flatbuffers.Builder builder
- * @returns flatbuffers.Offset
- */
-static endDecimal(builder:flatbuffers.Builder):flatbuffers.Offset {
-  var offset = builder.endObject();
-  return offset;
-};
-
-static createDecimal(builder:flatbuffers.Builder, precision:number, scale:number, bitWidth:number):flatbuffers.Offset {
-  Decimal.startDecimal(builder);
-  Decimal.addPrecision(builder, precision);
-  Decimal.addScale(builder, scale);
-  Decimal.addBitWidth(builder, bitWidth);
-  return Decimal.endDecimal(builder);
-}
-}
-}
-/**
- * Date is either a 32-bit or 64-bit type representing elapsed time since UNIX
- * epoch (1970-01-01), stored in either of two units:
- *
- * * Milliseconds (64 bits) indicating UNIX time elapsed since the epoch (no
- *   leap seconds), where the values are evenly divisible by 86400000
- * * Days (32 bits) since the UNIX epoch
- *
- * @constructor
- */
-export namespace org.apache.arrow.flatbuf{
-export class Date {
-  bb: flatbuffers.ByteBuffer|null = null;
-
-  bb_pos:number = 0;
-/**
- * @param number i
- * @param flatbuffers.ByteBuffer bb
- * @returns Date
- */
-__init(i:number, bb:flatbuffers.ByteBuffer):Date {
-  this.bb_pos = i;
-  this.bb = bb;
-  return this;
-};
-
-/**
- * @param flatbuffers.ByteBuffer bb
- * @param Date= obj
- * @returns Date
- */
-static getRootAsDate(bb:flatbuffers.ByteBuffer, obj?:Date):Date {
-  return (obj || new Date()).__init(bb.readInt32(bb.position()) + bb.position(), bb);
-};
-
-/**
- * @param flatbuffers.ByteBuffer bb
- * @param Date= obj
- * @returns Date
- */
-static getSizePrefixedRootAsDate(bb:flatbuffers.ByteBuffer, obj?:Date):Date {
-  bb.setPosition(bb.position() + flatbuffers.SIZE_PREFIX_LENGTH);
-  return (obj || new Date()).__init(bb.readInt32(bb.position()) + bb.position(), bb);
-};
-
-/**
- * @returns org.apache.arrow.flatbuf.DateUnit
- */
-unit():org.apache.arrow.flatbuf.DateUnit {
-  var offset = this.bb!.__offset(this.bb_pos, 4);
-  return offset ? /**  */ (this.bb!.readInt16(this.bb_pos + offset)) : org.apache.arrow.flatbuf.DateUnit.MILLISECOND;
-};
-
-/**
- * @param flatbuffers.Builder builder
- */
-static startDate(builder:flatbuffers.Builder) {
-  builder.startObject(1);
-};
-
-/**
- * @param flatbuffers.Builder builder
- * @param org.apache.arrow.flatbuf.DateUnit unit
- */
-static addUnit(builder:flatbuffers.Builder, unit:org.apache.arrow.flatbuf.DateUnit) {
-  builder.addFieldInt16(0, unit, org.apache.arrow.flatbuf.DateUnit.MILLISECOND);
-};
-
-/**
- * @param flatbuffers.Builder builder
- * @returns flatbuffers.Offset
- */
-static endDate(builder:flatbuffers.Builder):flatbuffers.Offset {
-  var offset = builder.endObject();
-  return offset;
-};
-
-static createDate(builder:flatbuffers.Builder, unit:org.apache.arrow.flatbuf.DateUnit):flatbuffers.Offset {
-  Date.startDate(builder);
-  Date.addUnit(builder, unit);
-  return Date.endDate(builder);
-}
-}
-}
-/**
- * Time type. The physical storage type depends on the unit
- * - SECOND and MILLISECOND: 32 bits
- * - MICROSECOND and NANOSECOND: 64 bits
- *
- * @constructor
- */
-export namespace org.apache.arrow.flatbuf{
-export class Time {
-  bb: flatbuffers.ByteBuffer|null = null;
-
-  bb_pos:number = 0;
-/**
- * @param number i
- * @param flatbuffers.ByteBuffer bb
- * @returns Time
- */
-__init(i:number, bb:flatbuffers.ByteBuffer):Time {
-  this.bb_pos = i;
-  this.bb = bb;
-  return this;
-};
-
-/**
- * @param flatbuffers.ByteBuffer bb
- * @param Time= obj
- * @returns Time
- */
-static getRootAsTime(bb:flatbuffers.ByteBuffer, obj?:Time):Time {
-  return (obj || new Time()).__init(bb.readInt32(bb.position()) + bb.position(), bb);
-};
-
-/**
- * @param flatbuffers.ByteBuffer bb
- * @param Time= obj
- * @returns Time
- */
-static getSizePrefixedRootAsTime(bb:flatbuffers.ByteBuffer, obj?:Time):Time {
-  bb.setPosition(bb.position() + flatbuffers.SIZE_PREFIX_LENGTH);
-  return (obj || new Time()).__init(bb.readInt32(bb.position()) + bb.position(), bb);
-};
-
-/**
- * @returns org.apache.arrow.flatbuf.TimeUnit
- */
-unit():org.apache.arrow.flatbuf.TimeUnit {
-  var offset = this.bb!.__offset(this.bb_pos, 4);
-  return offset ? /**  */ (this.bb!.readInt16(this.bb_pos + offset)) : org.apache.arrow.flatbuf.TimeUnit.MILLISECOND;
-};
-
-/**
- * @returns number
- */
-bitWidth():number {
-  var offset = this.bb!.__offset(this.bb_pos, 6);
-  return offset ? this.bb!.readInt32(this.bb_pos + offset) : 32;
-};
-
-/**
- * @param flatbuffers.Builder builder
- */
-static startTime(builder:flatbuffers.Builder) {
-  builder.startObject(2);
-};
-
-/**
- * @param flatbuffers.Builder builder
- * @param org.apache.arrow.flatbuf.TimeUnit unit
- */
-static addUnit(builder:flatbuffers.Builder, unit:org.apache.arrow.flatbuf.TimeUnit) {
-  builder.addFieldInt16(0, unit, org.apache.arrow.flatbuf.TimeUnit.MILLISECOND);
-};
-
-/**
- * @param flatbuffers.Builder builder
- * @param number bitWidth
- */
-static addBitWidth(builder:flatbuffers.Builder, bitWidth:number) {
-  builder.addFieldInt32(1, bitWidth, 32);
-};
-
-/**
- * @param flatbuffers.Builder builder
- * @returns flatbuffers.Offset
- */
-static endTime(builder:flatbuffers.Builder):flatbuffers.Offset {
-  var offset = builder.endObject();
-  return offset;
-};
-
-static createTime(builder:flatbuffers.Builder, unit:org.apache.arrow.flatbuf.TimeUnit, bitWidth:number):flatbuffers.Offset {
-  Time.startTime(builder);
-  Time.addUnit(builder, unit);
-  Time.addBitWidth(builder, bitWidth);
-  return Time.endTime(builder);
-}
-}
-}
-/**
- * Time elapsed from the Unix epoch, 00:00:00.000 on 1 January 1970, excluding
- * leap seconds, as a 64-bit integer. Note that UNIX time does not include
- * leap seconds.
- *
- * Date & time libraries often have multiple different data types for temporal
- * data.  In order to ease interoperability between different implementations the
- * Arrow project has some recommendations for encoding these types into a Timestamp
- * column.
- *
- * An "instant" represents a single moment in time that has no meaningful time zone
- * or the time zone is unknown.  A column of instants can also contain values from
- * multiple time zones.  To encode an instant set the timezone string to "UTC".
- *
- * A "zoned date-time" represents a single moment in time that has a meaningful
- * reference time zone.  To encode a zoned date-time as a Timestamp set the timezone
- * string to the name of the timezone.  There is some ambiguity between an instant
- * and a zoned date-time with the UTC time zone.  Both of these are stored the same.
- * Typically, this distinction does not matter.  If it does, then an application should
- * use custom metadata or an extension type to distinguish between the two cases.
- *
- * An "offset date-time" represents a single moment in time combined with a meaningful
- * offset from UTC.  To encode an offset date-time as a Timestamp set the timezone string
- * to the numeric time zone offset string (e.g. "+03:00").
- *
- * A "local date-time" does not represent a single moment in time.  It represents a wall
- * clock time combined with a date.  Because of daylight savings time there may multiple
- * instants that correspond to a single local date-time in any given time zone.  A
- * local date-time is often stored as a struct or a Date32/Time64 pair.  However, it can
- * also be encoded into a Timestamp column.  To do so the value should be the the time
- * elapsed from the Unix epoch so that a wall clock in UTC would display the desired time.
- * The timezone string should be set to null or the empty string.
- *
- * @constructor
- */
-export namespace org.apache.arrow.flatbuf{
-export class Timestamp {
-  bb: flatbuffers.ByteBuffer|null = null;
-
-  bb_pos:number = 0;
-/**
- * @param number i
- * @param flatbuffers.ByteBuffer bb
- * @returns Timestamp
- */
-__init(i:number, bb:flatbuffers.ByteBuffer):Timestamp {
-  this.bb_pos = i;
-  this.bb = bb;
-  return this;
-};
-
-/**
- * @param flatbuffers.ByteBuffer bb
- * @param Timestamp= obj
- * @returns Timestamp
- */
-static getRootAsTimestamp(bb:flatbuffers.ByteBuffer, obj?:Timestamp):Timestamp {
-  return (obj || new Timestamp()).__init(bb.readInt32(bb.position()) + bb.position(), bb);
-};
-
-/**
- * @param flatbuffers.ByteBuffer bb
- * @param Timestamp= obj
- * @returns Timestamp
- */
-static getSizePrefixedRootAsTimestamp(bb:flatbuffers.ByteBuffer, obj?:Timestamp):Timestamp {
-  bb.setPosition(bb.position() + flatbuffers.SIZE_PREFIX_LENGTH);
-  return (obj || new Timestamp()).__init(bb.readInt32(bb.position()) + bb.position(), bb);
-};
-
-/**
- * @returns org.apache.arrow.flatbuf.TimeUnit
- */
-unit():org.apache.arrow.flatbuf.TimeUnit {
-  var offset = this.bb!.__offset(this.bb_pos, 4);
-  return offset ? /**  */ (this.bb!.readInt16(this.bb_pos + offset)) : org.apache.arrow.flatbuf.TimeUnit.SECOND;
-};
-
-/**
- * The time zone is a string indicating the name of a time zone, one of:
- *
- * * As used in the Olson time zone database (the "tz database" or
- *   "tzdata"), such as "America/New_York"
- * * An absolute time zone offset of the form +XX:XX or -XX:XX, such as +07:30
- *
- * Whether a timezone string is present indicates different semantics about
- * the data:
- *
- * * If the time zone is null or an empty string, the data is a local date-time
- *   and does not represent a single moment in time.  Instead it represents a wall clock
- *   time and care should be taken to avoid interpreting it semantically as an instant.
- *
- * * If the time zone is set to a valid value, values can be displayed as
- *   "localized" to that time zone, even though the underlying 64-bit
- *   integers are identical to the same data stored in UTC. Converting
- *   between time zones is a metadata-only operation and does not change the
- *   underlying values
- *
- * @param flatbuffers.Encoding= optionalEncoding
- * @returns string|Uint8Array|null
- */
-timezone():string|null
-timezone(optionalEncoding:flatbuffers.Encoding):string|Uint8Array|null
-timezone(optionalEncoding?:any):string|Uint8Array|null {
-  var offset = this.bb!.__offset(this.bb_pos, 6);
-  return offset ? this.bb!.__string(this.bb_pos + offset, optionalEncoding) : null;
-};
-
-/**
- * @param flatbuffers.Builder builder
- */
-static startTimestamp(builder:flatbuffers.Builder) {
-  builder.startObject(2);
-};
-
-/**
- * @param flatbuffers.Builder builder
- * @param org.apache.arrow.flatbuf.TimeUnit unit
- */
-static addUnit(builder:flatbuffers.Builder, unit:org.apache.arrow.flatbuf.TimeUnit) {
-  builder.addFieldInt16(0, unit, org.apache.arrow.flatbuf.TimeUnit.SECOND);
-};
-
-/**
- * @param flatbuffers.Builder builder
- * @param flatbuffers.Offset timezoneOffset
- */
-static addTimezone(builder:flatbuffers.Builder, timezoneOffset:flatbuffers.Offset) {
-  builder.addFieldOffset(1, timezoneOffset, 0);
-};
-
-/**
- * @param flatbuffers.Builder builder
- * @returns flatbuffers.Offset
- */
-static endTimestamp(builder:flatbuffers.Builder):flatbuffers.Offset {
-  var offset = builder.endObject();
-  return offset;
-};
-
-static createTimestamp(builder:flatbuffers.Builder, unit:org.apache.arrow.flatbuf.TimeUnit, timezoneOffset:flatbuffers.Offset):flatbuffers.Offset {
-  Timestamp.startTimestamp(builder);
-  Timestamp.addUnit(builder, unit);
-  Timestamp.addTimezone(builder, timezoneOffset);
-  return Timestamp.endTimestamp(builder);
-}
-}
-}
-/**
- * @constructor
- */
-export namespace org.apache.arrow.flatbuf{
-export class Interval {
-  bb: flatbuffers.ByteBuffer|null = null;
-
-  bb_pos:number = 0;
-/**
- * @param number i
- * @param flatbuffers.ByteBuffer bb
- * @returns Interval
- */
-__init(i:number, bb:flatbuffers.ByteBuffer):Interval {
-  this.bb_pos = i;
-  this.bb = bb;
-  return this;
-};
-
-/**
- * @param flatbuffers.ByteBuffer bb
- * @param Interval= obj
- * @returns Interval
- */
-static getRootAsInterval(bb:flatbuffers.ByteBuffer, obj?:Interval):Interval {
-  return (obj || new Interval()).__init(bb.readInt32(bb.position()) + bb.position(), bb);
-};
-
-/**
- * @param flatbuffers.ByteBuffer bb
- * @param Interval= obj
- * @returns Interval
- */
-static getSizePrefixedRootAsInterval(bb:flatbuffers.ByteBuffer, obj?:Interval):Interval {
-  bb.setPosition(bb.position() + flatbuffers.SIZE_PREFIX_LENGTH);
-  return (obj || new Interval()).__init(bb.readInt32(bb.position()) + bb.position(), bb);
-};
-
-/**
- * @returns org.apache.arrow.flatbuf.IntervalUnit
- */
-unit():org.apache.arrow.flatbuf.IntervalUnit {
-  var offset = this.bb!.__offset(this.bb_pos, 4);
-  return offset ? /**  */ (this.bb!.readInt16(this.bb_pos + offset)) : org.apache.arrow.flatbuf.IntervalUnit.YEAR_MONTH;
-};
-
-/**
- * @param flatbuffers.Builder builder
- */
-static startInterval(builder:flatbuffers.Builder) {
-  builder.startObject(1);
-};
-
-/**
- * @param flatbuffers.Builder builder
- * @param org.apache.arrow.flatbuf.IntervalUnit unit
- */
-static addUnit(builder:flatbuffers.Builder, unit:org.apache.arrow.flatbuf.IntervalUnit) {
-  builder.addFieldInt16(0, unit, org.apache.arrow.flatbuf.IntervalUnit.YEAR_MONTH);
-};
-
-/**
- * @param flatbuffers.Builder builder
- * @returns flatbuffers.Offset
- */
-static endInterval(builder:flatbuffers.Builder):flatbuffers.Offset {
-  var offset = builder.endObject();
-  return offset;
-};
-
-static createInterval(builder:flatbuffers.Builder, unit:org.apache.arrow.flatbuf.IntervalUnit):flatbuffers.Offset {
-  Interval.startInterval(builder);
-  Interval.addUnit(builder, unit);
-  return Interval.endInterval(builder);
-}
-}
-}
-/**
- * @constructor
- */
-export namespace org.apache.arrow.flatbuf{
-export class Duration {
-  bb: flatbuffers.ByteBuffer|null = null;
-
-  bb_pos:number = 0;
-/**
- * @param number i
- * @param flatbuffers.ByteBuffer bb
- * @returns Duration
- */
-__init(i:number, bb:flatbuffers.ByteBuffer):Duration {
-  this.bb_pos = i;
-  this.bb = bb;
-  return this;
-};
-
-/**
- * @param flatbuffers.ByteBuffer bb
- * @param Duration= obj
- * @returns Duration
- */
-static getRootAsDuration(bb:flatbuffers.ByteBuffer, obj?:Duration):Duration {
-  return (obj || new Duration()).__init(bb.readInt32(bb.position()) + bb.position(), bb);
-};
-
-/**
- * @param flatbuffers.ByteBuffer bb
- * @param Duration= obj
- * @returns Duration
- */
-static getSizePrefixedRootAsDuration(bb:flatbuffers.ByteBuffer, obj?:Duration):Duration {
-  bb.setPosition(bb.position() + flatbuffers.SIZE_PREFIX_LENGTH);
-  return (obj || new Duration()).__init(bb.readInt32(bb.position()) + bb.position(), bb);
-};
-
-/**
- * @returns org.apache.arrow.flatbuf.TimeUnit
- */
-unit():org.apache.arrow.flatbuf.TimeUnit {
-  var offset = this.bb!.__offset(this.bb_pos, 4);
-  return offset ? /**  */ (this.bb!.readInt16(this.bb_pos + offset)) : org.apache.arrow.flatbuf.TimeUnit.MILLISECOND;
-};
-
-/**
- * @param flatbuffers.Builder builder
- */
-static startDuration(builder:flatbuffers.Builder) {
-  builder.startObject(1);
-};
-
-/**
- * @param flatbuffers.Builder builder
- * @param org.apache.arrow.flatbuf.TimeUnit unit
- */
-static addUnit(builder:flatbuffers.Builder, unit:org.apache.arrow.flatbuf.TimeUnit) {
-  builder.addFieldInt16(0, unit, org.apache.arrow.flatbuf.TimeUnit.MILLISECOND);
-};
-
-/**
- * @param flatbuffers.Builder builder
- * @returns flatbuffers.Offset
- */
-static endDuration(builder:flatbuffers.Builder):flatbuffers.Offset {
-  var offset = builder.endObject();
-  return offset;
-};
-
-static createDuration(builder:flatbuffers.Builder, unit:org.apache.arrow.flatbuf.TimeUnit):flatbuffers.Offset {
-  Duration.startDuration(builder);
-  Duration.addUnit(builder, unit);
-  return Duration.endDuration(builder);
-}
-}
-}
-/**
- * ----------------------------------------------------------------------
- * user defined key value pairs to add custom metadata to arrow
- * key namespacing is the responsibility of the user
- *
- * @constructor
- */
-export namespace org.apache.arrow.flatbuf{
-export class KeyValue {
-  bb: flatbuffers.ByteBuffer|null = null;
-
-  bb_pos:number = 0;
-/**
- * @param number i
- * @param flatbuffers.ByteBuffer bb
- * @returns KeyValue
- */
-__init(i:number, bb:flatbuffers.ByteBuffer):KeyValue {
-  this.bb_pos = i;
-  this.bb = bb;
-  return this;
-};
-
-/**
- * @param flatbuffers.ByteBuffer bb
- * @param KeyValue= obj
- * @returns KeyValue
- */
-static getRootAsKeyValue(bb:flatbuffers.ByteBuffer, obj?:KeyValue):KeyValue {
-  return (obj || new KeyValue()).__init(bb.readInt32(bb.position()) + bb.position(), bb);
-};
-
-/**
- * @param flatbuffers.ByteBuffer bb
- * @param KeyValue= obj
- * @returns KeyValue
- */
-static getSizePrefixedRootAsKeyValue(bb:flatbuffers.ByteBuffer, obj?:KeyValue):KeyValue {
-  bb.setPosition(bb.position() + flatbuffers.SIZE_PREFIX_LENGTH);
-  return (obj || new KeyValue()).__init(bb.readInt32(bb.position()) + bb.position(), bb);
-};
-
-/**
- * @param flatbuffers.Encoding= optionalEncoding
- * @returns string|Uint8Array|null
- */
-key():string|null
-key(optionalEncoding:flatbuffers.Encoding):string|Uint8Array|null
-key(optionalEncoding?:any):string|Uint8Array|null {
-  var offset = this.bb!.__offset(this.bb_pos, 4);
-  return offset ? this.bb!.__string(this.bb_pos + offset, optionalEncoding) : null;
-};
-
-/**
- * @param flatbuffers.Encoding= optionalEncoding
- * @returns string|Uint8Array|null
- */
-value():string|null
-value(optionalEncoding:flatbuffers.Encoding):string|Uint8Array|null
-value(optionalEncoding?:any):string|Uint8Array|null {
-  var offset = this.bb!.__offset(this.bb_pos, 6);
-  return offset ? this.bb!.__string(this.bb_pos + offset, optionalEncoding) : null;
-};
-
-/**
- * @param flatbuffers.Builder builder
- */
-static startKeyValue(builder:flatbuffers.Builder) {
-  builder.startObject(2);
-};
-
-/**
- * @param flatbuffers.Builder builder
- * @param flatbuffers.Offset keyOffset
- */
-static addKey(builder:flatbuffers.Builder, keyOffset:flatbuffers.Offset) {
-  builder.addFieldOffset(0, keyOffset, 0);
-};
-
-/**
- * @param flatbuffers.Builder builder
- * @param flatbuffers.Offset valueOffset
- */
-static addValue(builder:flatbuffers.Builder, valueOffset:flatbuffers.Offset) {
-  builder.addFieldOffset(1, valueOffset, 0);
-};
-
-/**
- * @param flatbuffers.Builder builder
- * @returns flatbuffers.Offset
- */
-static endKeyValue(builder:flatbuffers.Builder):flatbuffers.Offset {
-  var offset = builder.endObject();
-  return offset;
-};
-
-static createKeyValue(builder:flatbuffers.Builder, keyOffset:flatbuffers.Offset, valueOffset:flatbuffers.Offset):flatbuffers.Offset {
-  KeyValue.startKeyValue(builder);
-  KeyValue.addKey(builder, keyOffset);
-  KeyValue.addValue(builder, valueOffset);
-  return KeyValue.endKeyValue(builder);
-}
-}
-}
-/**
- * @constructor
- */
-export namespace org.apache.arrow.flatbuf{
-export class DictionaryEncoding {
-  bb: flatbuffers.ByteBuffer|null = null;
-
-  bb_pos:number = 0;
-/**
- * @param number i
- * @param flatbuffers.ByteBuffer bb
- * @returns DictionaryEncoding
- */
-__init(i:number, bb:flatbuffers.ByteBuffer):DictionaryEncoding {
-  this.bb_pos = i;
-  this.bb = bb;
-  return this;
-};
-
-/**
- * @param flatbuffers.ByteBuffer bb
- * @param DictionaryEncoding= obj
- * @returns DictionaryEncoding
- */
-static getRootAsDictionaryEncoding(bb:flatbuffers.ByteBuffer, obj?:DictionaryEncoding):DictionaryEncoding {
-  return (obj || new DictionaryEncoding()).__init(bb.readInt32(bb.position()) + bb.position(), bb);
-};
-
-/**
- * @param flatbuffers.ByteBuffer bb
- * @param DictionaryEncoding= obj
- * @returns DictionaryEncoding
- */
-static getSizePrefixedRootAsDictionaryEncoding(bb:flatbuffers.ByteBuffer, obj?:DictionaryEncoding):DictionaryEncoding {
-  bb.setPosition(bb.position() + flatbuffers.SIZE_PREFIX_LENGTH);
-  return (obj || new DictionaryEncoding()).__init(bb.readInt32(bb.position()) + bb.position(), bb);
-};
-
-/**
- * The known dictionary id in the application where this data is used. In
- * the file or streaming formats, the dictionary ids are found in the
- * DictionaryBatch messages
- *
- * @returns flatbuffers.Long
- */
-id():flatbuffers.Long {
-  var offset = this.bb!.__offset(this.bb_pos, 4);
-  return offset ? this.bb!.readInt64(this.bb_pos + offset) : this.bb!.createLong(0, 0);
-};
-
-/**
- * The dictionary indices are constrained to be non-negative integers. If
- * this field is null, the indices must be signed int32. To maximize
- * cross-language compatibility and performance, implementations are
- * recommended to prefer signed integer types over unsigned integer types
- * and to avoid uint64 indices unless they are required by an application.
- *
- * @param org.apache.arrow.flatbuf.Int= obj
- * @returns org.apache.arrow.flatbuf.Int|null
- */
-indexType(obj?:org.apache.arrow.flatbuf.Int):org.apache.arrow.flatbuf.Int|null {
-  var offset = this.bb!.__offset(this.bb_pos, 6);
-  return offset ? (obj || new org.apache.arrow.flatbuf.Int()).__init(this.bb!.__indirect(this.bb_pos + offset), this.bb!) : null;
-};
-
-/**
- * By default, dictionaries are not ordered, or the order does not have
- * semantic meaning. In some statistical, applications, dictionary-encoding
- * is used to represent ordered categorical data, and we provide a way to
- * preserve that metadata here
- *
- * @returns boolean
- */
-isOrdered():boolean {
-  var offset = this.bb!.__offset(this.bb_pos, 8);
-  return offset ? !!this.bb!.readInt8(this.bb_pos + offset) : false;
-};
-
-/**
- * @returns org.apache.arrow.flatbuf.DictionaryKind
- */
-dictionaryKind():org.apache.arrow.flatbuf.DictionaryKind {
-  var offset = this.bb!.__offset(this.bb_pos, 10);
-  return offset ? /**  */ (this.bb!.readInt16(this.bb_pos + offset)) : org.apache.arrow.flatbuf.DictionaryKind.DenseArray;
-};
-
-/**
- * @param flatbuffers.Builder builder
- */
-static startDictionaryEncoding(builder:flatbuffers.Builder) {
-  builder.startObject(4);
-};
-
-/**
- * @param flatbuffers.Builder builder
- * @param flatbuffers.Long id
- */
-static addId(builder:flatbuffers.Builder, id:flatbuffers.Long) {
-  builder.addFieldInt64(0, id, builder.createLong(0, 0));
-};
-
-/**
- * @param flatbuffers.Builder builder
- * @param flatbuffers.Offset indexTypeOffset
- */
-static addIndexType(builder:flatbuffers.Builder, indexTypeOffset:flatbuffers.Offset) {
-  builder.addFieldOffset(1, indexTypeOffset, 0);
-};
-
-/**
- * @param flatbuffers.Builder builder
- * @param boolean isOrdered
- */
-static addIsOrdered(builder:flatbuffers.Builder, isOrdered:boolean) {
-  builder.addFieldInt8(2, +isOrdered, +false);
-};
-
-/**
- * @param flatbuffers.Builder builder
- * @param org.apache.arrow.flatbuf.DictionaryKind dictionaryKind
- */
-static addDictionaryKind(builder:flatbuffers.Builder, dictionaryKind:org.apache.arrow.flatbuf.DictionaryKind) {
-  builder.addFieldInt16(3, dictionaryKind, org.apache.arrow.flatbuf.DictionaryKind.DenseArray);
-};
-
-/**
- * @param flatbuffers.Builder builder
- * @returns flatbuffers.Offset
- */
-static endDictionaryEncoding(builder:flatbuffers.Builder):flatbuffers.Offset {
-  var offset = builder.endObject();
-  return offset;
-};
-
-}
-}
-/**
- * ----------------------------------------------------------------------
- * A field represents a named column in a record / row batch or child of a
- * nested type.
- *
- * @constructor
- */
-export namespace org.apache.arrow.flatbuf{
-export class Field {
-  bb: flatbuffers.ByteBuffer|null = null;
-
-  bb_pos:number = 0;
-/**
- * @param number i
- * @param flatbuffers.ByteBuffer bb
- * @returns Field
- */
-__init(i:number, bb:flatbuffers.ByteBuffer):Field {
-  this.bb_pos = i;
-  this.bb = bb;
-  return this;
-};
-
-/**
- * @param flatbuffers.ByteBuffer bb
- * @param Field= obj
- * @returns Field
- */
-static getRootAsField(bb:flatbuffers.ByteBuffer, obj?:Field):Field {
-  return (obj || new Field()).__init(bb.readInt32(bb.position()) + bb.position(), bb);
-};
-
-/**
- * @param flatbuffers.ByteBuffer bb
- * @param Field= obj
- * @returns Field
- */
-static getSizePrefixedRootAsField(bb:flatbuffers.ByteBuffer, obj?:Field):Field {
-  bb.setPosition(bb.position() + flatbuffers.SIZE_PREFIX_LENGTH);
-  return (obj || new Field()).__init(bb.readInt32(bb.position()) + bb.position(), bb);
-};
-
-/**
- * Name is not required, in i.e. a List
- *
- * @param flatbuffers.Encoding= optionalEncoding
- * @returns string|Uint8Array|null
- */
-name():string|null
-name(optionalEncoding:flatbuffers.Encoding):string|Uint8Array|null
-name(optionalEncoding?:any):string|Uint8Array|null {
-  var offset = this.bb!.__offset(this.bb_pos, 4);
-  return offset ? this.bb!.__string(this.bb_pos + offset, optionalEncoding) : null;
-};
-
-/**
- * Whether or not this field can contain nulls. Should be true in general.
- *
- * @returns boolean
- */
-nullable():boolean {
-  var offset = this.bb!.__offset(this.bb_pos, 6);
-  return offset ? !!this.bb!.readInt8(this.bb_pos + offset) : false;
-};
-
-/**
- * @returns org.apache.arrow.flatbuf.Type
- */
-typeType():org.apache.arrow.flatbuf.Type {
-  var offset = this.bb!.__offset(this.bb_pos, 8);
-  return offset ? /**  */ (this.bb!.readUint8(this.bb_pos + offset)) : org.apache.arrow.flatbuf.Type.NONE;
-};
-
-/**
- * This is the type of the decoded value if the field is dictionary encoded.
- *
- * @param flatbuffers.Table obj
- * @returns ?flatbuffers.Table
- */
-type<T extends flatbuffers.Table>(obj:T):T|null {
-  var offset = this.bb!.__offset(this.bb_pos, 10);
-  return offset ? this.bb!.__union(obj, this.bb_pos + offset) : null;
-};
-
-/**
- * Present only if the field is dictionary encoded.
- *
- * @param org.apache.arrow.flatbuf.DictionaryEncoding= obj
- * @returns org.apache.arrow.flatbuf.DictionaryEncoding|null
- */
-dictionary(obj?:org.apache.arrow.flatbuf.DictionaryEncoding):org.apache.arrow.flatbuf.DictionaryEncoding|null {
-  var offset = this.bb!.__offset(this.bb_pos, 12);
-  return offset ? (obj || new org.apache.arrow.flatbuf.DictionaryEncoding()).__init(this.bb!.__indirect(this.bb_pos + offset), this.bb!) : null;
-};
-
-/**
- * children apply only to nested data types like Struct, List and Union. For
- * primitive types children will have length 0.
- *
- * @param number index
- * @param org.apache.arrow.flatbuf.Field= obj
- * @returns org.apache.arrow.flatbuf.Field
- */
-children(index: number, obj?:org.apache.arrow.flatbuf.Field):org.apache.arrow.flatbuf.Field|null {
-  var offset = this.bb!.__offset(this.bb_pos, 14);
-  return offset ? (obj || new org.apache.arrow.flatbuf.Field()).__init(this.bb!.__indirect(this.bb!.__vector(this.bb_pos + offset) + index * 4), this.bb!) : null;
-};
-
-/**
- * @returns number
- */
-childrenLength():number {
-  var offset = this.bb!.__offset(this.bb_pos, 14);
-  return offset ? this.bb!.__vector_len(this.bb_pos + offset) : 0;
-};
-
-/**
- * User-defined metadata
- *
- * @param number index
- * @param org.apache.arrow.flatbuf.KeyValue= obj
- * @returns org.apache.arrow.flatbuf.KeyValue
- */
-customMetadata(index: number, obj?:org.apache.arrow.flatbuf.KeyValue):org.apache.arrow.flatbuf.KeyValue|null {
-  var offset = this.bb!.__offset(this.bb_pos, 16);
-  return offset ? (obj || new org.apache.arrow.flatbuf.KeyValue()).__init(this.bb!.__indirect(this.bb!.__vector(this.bb_pos + offset) + index * 4), this.bb!) : null;
-};
-
-/**
- * @returns number
- */
-customMetadataLength():number {
-  var offset = this.bb!.__offset(this.bb_pos, 16);
-  return offset ? this.bb!.__vector_len(this.bb_pos + offset) : 0;
-};
-
-/**
- * @param flatbuffers.Builder builder
- */
-static startField(builder:flatbuffers.Builder) {
-  builder.startObject(7);
-};
-
-/**
- * @param flatbuffers.Builder builder
- * @param flatbuffers.Offset nameOffset
- */
-static addName(builder:flatbuffers.Builder, nameOffset:flatbuffers.Offset) {
-  builder.addFieldOffset(0, nameOffset, 0);
-};
-
-/**
- * @param flatbuffers.Builder builder
- * @param boolean nullable
- */
-static addNullable(builder:flatbuffers.Builder, nullable:boolean) {
-  builder.addFieldInt8(1, +nullable, +false);
-};
-
-/**
- * @param flatbuffers.Builder builder
- * @param org.apache.arrow.flatbuf.Type typeType
- */
-static addTypeType(builder:flatbuffers.Builder, typeType:org.apache.arrow.flatbuf.Type) {
-  builder.addFieldInt8(2, typeType, org.apache.arrow.flatbuf.Type.NONE);
-};
-
-/**
- * @param flatbuffers.Builder builder
- * @param flatbuffers.Offset typeOffset
- */
-static addType(builder:flatbuffers.Builder, typeOffset:flatbuffers.Offset) {
-  builder.addFieldOffset(3, typeOffset, 0);
-};
-
-/**
- * @param flatbuffers.Builder builder
- * @param flatbuffers.Offset dictionaryOffset
- */
-static addDictionary(builder:flatbuffers.Builder, dictionaryOffset:flatbuffers.Offset) {
-  builder.addFieldOffset(4, dictionaryOffset, 0);
-};
-
-/**
- * @param flatbuffers.Builder builder
- * @param flatbuffers.Offset childrenOffset
- */
-static addChildren(builder:flatbuffers.Builder, childrenOffset:flatbuffers.Offset) {
-  builder.addFieldOffset(5, childrenOffset, 0);
-};
-
-/**
- * @param flatbuffers.Builder builder
- * @param Array.<flatbuffers.Offset> data
- * @returns flatbuffers.Offset
- */
-static createChildrenVector(builder:flatbuffers.Builder, data:flatbuffers.Offset[]):flatbuffers.Offset {
-  builder.startVector(4, data.length, 4);
-  for (var i = data.length - 1; i >= 0; i--) {
-    builder.addOffset(data[i]);
-  }
-  return builder.endVector();
-};
-
-/**
- * @param flatbuffers.Builder builder
- * @param number numElems
- */
-static startChildrenVector(builder:flatbuffers.Builder, numElems:number) {
-  builder.startVector(4, numElems, 4);
-};
-
-/**
- * @param flatbuffers.Builder builder
- * @param flatbuffers.Offset customMetadataOffset
- */
-static addCustomMetadata(builder:flatbuffers.Builder, customMetadataOffset:flatbuffers.Offset) {
-  builder.addFieldOffset(6, customMetadataOffset, 0);
-};
-
-/**
- * @param flatbuffers.Builder builder
- * @param Array.<flatbuffers.Offset> data
- * @returns flatbuffers.Offset
- */
-static createCustomMetadataVector(builder:flatbuffers.Builder, data:flatbuffers.Offset[]):flatbuffers.Offset {
-  builder.startVector(4, data.length, 4);
-  for (var i = data.length - 1; i >= 0; i--) {
-    builder.addOffset(data[i]);
-  }
-  return builder.endVector();
-};
-
-/**
- * @param flatbuffers.Builder builder
- * @param number numElems
- */
-static startCustomMetadataVector(builder:flatbuffers.Builder, numElems:number) {
-  builder.startVector(4, numElems, 4);
-};
-
-/**
- * @param flatbuffers.Builder builder
- * @returns flatbuffers.Offset
- */
-static endField(builder:flatbuffers.Builder):flatbuffers.Offset {
-  var offset = builder.endObject();
-  return offset;
-};
-
-}
-}
-/**
- * ----------------------------------------------------------------------
- * A Buffer represents a single contiguous memory segment
- *
- * @constructor
- */
-export namespace org.apache.arrow.flatbuf{
-export class Buffer {
-  bb: flatbuffers.ByteBuffer|null = null;
-
-  bb_pos:number = 0;
-/**
- * @param number i
- * @param flatbuffers.ByteBuffer bb
- * @returns Buffer
- */
-__init(i:number, bb:flatbuffers.ByteBuffer):Buffer {
-  this.bb_pos = i;
-  this.bb = bb;
-  return this;
-};
-
-/**
- * The relative offset into the shared memory page where the bytes for this
- * buffer starts
- *
- * @returns flatbuffers.Long
- */
-offset():flatbuffers.Long {
-  return this.bb!.readInt64(this.bb_pos);
-};
-
-/**
- * The absolute length (in bytes) of the memory buffer. The memory is found
- * from offset (inclusive) to offset + length (non-inclusive). When building
- * messages using the encapsulated IPC message, padding bytes may be written
- * after a buffer, but such padding bytes do not need to be accounted for in
- * the size here.
- *
- * @returns flatbuffers.Long
- */
-length():flatbuffers.Long {
-  return this.bb!.readInt64(this.bb_pos + 8);
-};
-
-/**
- * @returns number
- */
-static sizeOf():number {
-  return 16;
-}
-
-/**
- * @param flatbuffers.Builder builder
- * @param flatbuffers.Long offset
- * @param flatbuffers.Long length
- * @returns flatbuffers.Offset
- */
-static createBuffer(builder:flatbuffers.Builder, offset: flatbuffers.Long, length: flatbuffers.Long):flatbuffers.Offset {
-  builder.prep(8, 16);
-  builder.writeInt64(length);
-  builder.writeInt64(offset);
-  return builder.offset();
-};
-
-}
-}
-/**
- * ----------------------------------------------------------------------
- * A Schema describes the columns in a row batch
- *
- * @constructor
- */
-export namespace org.apache.arrow.flatbuf{
-export class Schema {
-  bb: flatbuffers.ByteBuffer|null = null;
-
-  bb_pos:number = 0;
-/**
- * @param number i
- * @param flatbuffers.ByteBuffer bb
- * @returns Schema
- */
-__init(i:number, bb:flatbuffers.ByteBuffer):Schema {
-  this.bb_pos = i;
-  this.bb = bb;
-  return this;
-};
-
-/**
- * @param flatbuffers.ByteBuffer bb
- * @param Schema= obj
- * @returns Schema
- */
-static getRootAsSchema(bb:flatbuffers.ByteBuffer, obj?:Schema):Schema {
-  return (obj || new Schema()).__init(bb.readInt32(bb.position()) + bb.position(), bb);
-};
-
-/**
- * @param flatbuffers.ByteBuffer bb
- * @param Schema= obj
- * @returns Schema
- */
-static getSizePrefixedRootAsSchema(bb:flatbuffers.ByteBuffer, obj?:Schema):Schema {
-  bb.setPosition(bb.position() + flatbuffers.SIZE_PREFIX_LENGTH);
-  return (obj || new Schema()).__init(bb.readInt32(bb.position()) + bb.position(), bb);
-};
-
-/**
- * endianness of the buffer
- * it is Little Endian by default
- * if endianness doesn't match the underlying system then the vectors need to be converted
- *
- * @returns org.apache.arrow.flatbuf.Endianness
- */
-endianness():org.apache.arrow.flatbuf.Endianness {
-  var offset = this.bb!.__offset(this.bb_pos, 4);
-  return offset ? /**  */ (this.bb!.readInt16(this.bb_pos + offset)) : org.apache.arrow.flatbuf.Endianness.Little;
-};
-
-/**
- * @param number index
- * @param org.apache.arrow.flatbuf.Field= obj
- * @returns org.apache.arrow.flatbuf.Field
- */
-fields(index: number, obj?:org.apache.arrow.flatbuf.Field):org.apache.arrow.flatbuf.Field|null {
-  var offset = this.bb!.__offset(this.bb_pos, 6);
-  return offset ? (obj || new org.apache.arrow.flatbuf.Field()).__init(this.bb!.__indirect(this.bb!.__vector(this.bb_pos + offset) + index * 4), this.bb!) : null;
-};
-
-/**
- * @returns number
- */
-fieldsLength():number {
-  var offset = this.bb!.__offset(this.bb_pos, 6);
-  return offset ? this.bb!.__vector_len(this.bb_pos + offset) : 0;
-};
-
-/**
- * @param number index
- * @param org.apache.arrow.flatbuf.KeyValue= obj
- * @returns org.apache.arrow.flatbuf.KeyValue
- */
-customMetadata(index: number, obj?:org.apache.arrow.flatbuf.KeyValue):org.apache.arrow.flatbuf.KeyValue|null {
-  var offset = this.bb!.__offset(this.bb_pos, 8);
-  return offset ? (obj || new org.apache.arrow.flatbuf.KeyValue()).__init(this.bb!.__indirect(this.bb!.__vector(this.bb_pos + offset) + index * 4), this.bb!) : null;
-};
-
-/**
- * @returns number
- */
-customMetadataLength():number {
-  var offset = this.bb!.__offset(this.bb_pos, 8);
-  return offset ? this.bb!.__vector_len(this.bb_pos + offset) : 0;
-};
-
-/**
- * Features used in the stream/file.
- *
- * @param number index
- * @returns flatbuffers.Long
- */
-features(index: number):flatbuffers.Long|null {
-  var offset = this.bb!.__offset(this.bb_pos, 10);
-  return offset ? /**  */ (this.bb!.readInt64(this.bb!.__vector(this.bb_pos + offset) + index * 8)) : this.bb!.createLong(0, 0);
-};
-
-/**
- * @returns number
- */
-featuresLength():number {
-  var offset = this.bb!.__offset(this.bb_pos, 10);
-  return offset ? this.bb!.__vector_len(this.bb_pos + offset) : 0;
-};
-
-/**
- * @param flatbuffers.Builder builder
- */
-static startSchema(builder:flatbuffers.Builder) {
-  builder.startObject(4);
-};
-
-/**
- * @param flatbuffers.Builder builder
- * @param org.apache.arrow.flatbuf.Endianness endianness
- */
-static addEndianness(builder:flatbuffers.Builder, endianness:org.apache.arrow.flatbuf.Endianness) {
-  builder.addFieldInt16(0, endianness, org.apache.arrow.flatbuf.Endianness.Little);
-};
-
-/**
- * @param flatbuffers.Builder builder
- * @param flatbuffers.Offset fieldsOffset
- */
-static addFields(builder:flatbuffers.Builder, fieldsOffset:flatbuffers.Offset) {
-  builder.addFieldOffset(1, fieldsOffset, 0);
-};
-
-/**
- * @param flatbuffers.Builder builder
- * @param Array.<flatbuffers.Offset> data
- * @returns flatbuffers.Offset
- */
-static createFieldsVector(builder:flatbuffers.Builder, data:flatbuffers.Offset[]):flatbuffers.Offset {
-  builder.startVector(4, data.length, 4);
-  for (var i = data.length - 1; i >= 0; i--) {
-    builder.addOffset(data[i]);
-  }
-  return builder.endVector();
-};
-
-/**
- * @param flatbuffers.Builder builder
- * @param number numElems
- */
-static startFieldsVector(builder:flatbuffers.Builder, numElems:number) {
-  builder.startVector(4, numElems, 4);
-};
-
-/**
- * @param flatbuffers.Builder builder
- * @param flatbuffers.Offset customMetadataOffset
- */
-static addCustomMetadata(builder:flatbuffers.Builder, customMetadataOffset:flatbuffers.Offset) {
-  builder.addFieldOffset(2, customMetadataOffset, 0);
-};
-
-/**
- * @param flatbuffers.Builder builder
- * @param Array.<flatbuffers.Offset> data
- * @returns flatbuffers.Offset
- */
-static createCustomMetadataVector(builder:flatbuffers.Builder, data:flatbuffers.Offset[]):flatbuffers.Offset {
-  builder.startVector(4, data.length, 4);
-  for (var i = data.length - 1; i >= 0; i--) {
-    builder.addOffset(data[i]);
-  }
-  return builder.endVector();
-};
-
-/**
- * @param flatbuffers.Builder builder
- * @param number numElems
- */
-static startCustomMetadataVector(builder:flatbuffers.Builder, numElems:number) {
-  builder.startVector(4, numElems, 4);
-};
-
-/**
- * @param flatbuffers.Builder builder
- * @param flatbuffers.Offset featuresOffset
- */
-static addFeatures(builder:flatbuffers.Builder, featuresOffset:flatbuffers.Offset) {
-  builder.addFieldOffset(3, featuresOffset, 0);
-};
-
-/**
- * @param flatbuffers.Builder builder
- * @param Array.<flatbuffers.Long> data
- * @returns flatbuffers.Offset
- */
-static createFeaturesVector(builder:flatbuffers.Builder, data:flatbuffers.Long[]):flatbuffers.Offset {
-  builder.startVector(8, data.length, 8);
-  for (var i = data.length - 1; i >= 0; i--) {
-    builder.addInt64(data[i]);
-  }
-  return builder.endVector();
-};
-
-/**
- * @param flatbuffers.Builder builder
- * @param number numElems
- */
-static startFeaturesVector(builder:flatbuffers.Builder, numElems:number) {
-  builder.startVector(8, numElems, 8);
-};
-
-/**
- * @param flatbuffers.Builder builder
- * @returns flatbuffers.Offset
- */
-static endSchema(builder:flatbuffers.Builder):flatbuffers.Offset {
-  var offset = builder.endObject();
-  return offset;
-};
-
-/**
- * @param flatbuffers.Builder builder
- * @param flatbuffers.Offset offset
- */
-static finishSchemaBuffer(builder:flatbuffers.Builder, offset:flatbuffers.Offset) {
-  builder.finish(offset);
-};
-
-/**
- * @param flatbuffers.Builder builder
- * @param flatbuffers.Offset offset
- */
-static finishSizePrefixedSchemaBuffer(builder:flatbuffers.Builder, offset:flatbuffers.Offset) {
-  builder.finish(offset, undefined, true);
-};
-
-static createSchema(builder:flatbuffers.Builder, endianness:org.apache.arrow.flatbuf.Endianness, fieldsOffset:flatbuffers.Offset, customMetadataOffset:flatbuffers.Offset, featuresOffset:flatbuffers.Offset):flatbuffers.Offset {
-  Schema.startSchema(builder);
-  Schema.addEndianness(builder, endianness);
-  Schema.addFields(builder, fieldsOffset);
-  Schema.addCustomMetadata(builder, customMetadataOffset);
-  Schema.addFeatures(builder, featuresOffset);
-  return Schema.endSchema(builder);
-}
-}
-}
diff --git a/proto/raw-js-openapi/src/index.js b/proto/raw-js-openapi/src/index.js
index 1e9c688f910..ca79fde7bf5 100644
--- a/proto/raw-js-openapi/src/index.js
+++ b/proto/raw-js-openapi/src/index.js
@@ -1,26 +1,26 @@
-var session_pb = require("deephaven/proto/session_pb");
-var table_pb = require("deephaven/proto/table_pb");
-var console_pb = require("deephaven/proto/console_pb");
-var ticket_pb = require("deephaven/proto/ticket_pb");
-var application_pb = require("deephaven/proto/application_pb");
-var inputtable_pb = require("deephaven/proto/inputtable_pb");
-var object_pb = require("deephaven/proto/object_pb");
-var partitionedtable_pb = require("deephaven/proto/partitionedtable_pb");
-var storage_pb = require("deephaven/proto/storage_pb");
-var config_pb = require("deephaven/proto/config_pb");
-var hierarchicaltable_pb = require("deephaven/proto/hierarchicaltable_pb");
+var session_pb = require("deephaven_core/proto/session_pb");
+var table_pb = require("deephaven_core/proto/table_pb");
+var console_pb = require("deephaven_core/proto/console_pb");
+var ticket_pb = require("deephaven_core/proto/ticket_pb");
+var application_pb = require("deephaven_core/proto/application_pb");
+var inputtable_pb = require("deephaven_core/proto/inputtable_pb");
+var object_pb = require("deephaven_core/proto/object_pb");
+var partitionedtable_pb = require("deephaven_core/proto/partitionedtable_pb");
+var storage_pb = require("deephaven_core/proto/storage_pb");
+var config_pb = require("deephaven_core/proto/config_pb");
+var hierarchicaltable_pb = require("deephaven_core/proto/hierarchicaltable_pb");
 var Flight_pb = require("Flight_pb")
 var BrowserFlight_pb = require("BrowserFlight_pb")
-var session_pb_service = require("deephaven/proto/session_pb_service");
-var table_pb_service = require("deephaven/proto/table_pb_service");
-var console_pb_service = require("deephaven/proto/console_pb_service");
-var application_pb_service = require("deephaven/proto/application_pb_service");
-var inputtable_pb_service = require("deephaven/proto/inputtable_pb_service");
-var object_pb_service = require("deephaven/proto/object_pb_service");
-var partitionedtable_pb_service = require("deephaven/proto/partitionedtable_pb_service");
-var storage_pb_service = require("deephaven/proto/storage_pb_service");
-var config_pb_service = require("deephaven/proto/config_pb_service");
-var hierarchicaltable_pb_service = require("deephaven/proto/hierarchicaltable_pb_service");
+var session_pb_service = require("deephaven_core/proto/session_pb_service");
+var table_pb_service = require("deephaven_core/proto/table_pb_service");
+var console_pb_service = require("deephaven_core/proto/console_pb_service");
+var application_pb_service = require("deephaven_core/proto/application_pb_service");
+var inputtable_pb_service = require("deephaven_core/proto/inputtable_pb_service");
+var object_pb_service = require("deephaven_core/proto/object_pb_service");
+var partitionedtable_pb_service = require("deephaven_core/proto/partitionedtable_pb_service");
+var storage_pb_service = require("deephaven_core/proto/storage_pb_service");
+var config_pb_service = require("deephaven_core/proto/config_pb_service");
+var hierarchicaltable_pb_service = require("deephaven_core/proto/hierarchicaltable_pb_service");
 var BrowserFlight_pb_service = require("BrowserFlight_pb_service");
 var Flight_pb_service = require("Flight_pb_service");
 
@@ -28,11 +28,6 @@ var browserHeaders = require("browser-headers");
 
 var grpcWeb = require("@improbable-eng/grpc-web");//usually .grpc
 var jspb = require("google-protobuf");
-var flatbuffers = require("flatbuffers").flatbuffers;
-var barrage = require("@deephaven/barrage");
-
-var message = require('./arrow/flight/flatbuf/Message_generated');
-var schema = require('./arrow/flight/flatbuf/Schema_generated');
 
 var io = { deephaven: {
     proto: {
@@ -58,17 +53,8 @@ var io = { deephaven: {
             hierarchicaltable_pb,
             hierarchicaltable_pb_service
         },
-        barrage: {
-            "flatbuf": {
-                "Barrage_generated": barrage,
-            }
-        }
 }};
 var arrow = { flight: {
-    flatbuf: {
-        Message_generated: message,
-        Schema_generated: schema,
-    },
     protocol: {
         Flight_pb,
         Flight_pb_service,
@@ -80,7 +66,6 @@ var dhinternal = {
     browserHeaders,
     jspb,
     grpcWeb,//TODO need to expand this to the specific things we need
-    flatbuffers,
     io,
     arrow
 };
diff --git a/proto/raw-js-openapi/webpack.config.js b/proto/raw-js-openapi/webpack.config.js
index 77f8ec61307..f0e47f9cbee 100644
--- a/proto/raw-js-openapi/webpack.config.js
+++ b/proto/raw-js-openapi/webpack.config.js
@@ -5,16 +5,16 @@ const path = require('path');
 const aliases = {};
 for (const proto of ['application', 'config', 'console', 'hierarchicaltable', 'inputtable', 'object', 'partitionedtable', 'session', 'storage', 'table', 'ticket']) {
     // Allows a reference to the real proto files, to be made from the shim
-    aliases[`real/${proto}_pb`] =  `${__dirname}/build/js-src/deephaven/proto/${proto}_pb`;
+    aliases[`real/${proto}_pb`] =  `${__dirname}/build/js-src/deephaven_core/proto/${proto}_pb`;
 
     const shimPath = `${__dirname}/src/shim/${proto}_pb`;
     // Three aliases which would normally point at the real proto file, now directed to the shim:
     // * First, an unsuffixed, relative reference from any service files
-    aliases[`../../deephaven/proto/${proto}_pb`] = shimPath;
+    aliases[`../../deephaven_core/proto/${proto}_pb`] = shimPath;
     // * Next, a ".js"-suffixed, relative reference from other proto files (see https://github.com/protocolbuffers/protobuf-javascript/issues/40)
-    aliases[`../../deephaven/proto/${proto}_pb.js`] = shimPath;
+    aliases[`../../deephaven_core/proto/${proto}_pb.js`] = shimPath;
     // * Last, an absolute reference from the index.js
-    aliases[`deephaven/proto/${proto}_pb`] = shimPath;
+    aliases[`deephaven_core/proto/${proto}_pb`] = shimPath;
 }
 for (const proto of ['Flight', 'BrowserFlight']) {
     // Allows a reference to the real proto files, to be made from the shim
diff --git a/py/client-ticking/README.md b/py/client-ticking/README.md
index 6a7ece5be63..3739e23f565 100644
--- a/py/client-ticking/README.md
+++ b/py/client-ticking/README.md
@@ -17,7 +17,7 @@ Windows support is expected to be made available in the future.
 
 ## `pip`
 
-A Linux operating system on x86_64 architecture is required to install via `pip`.
+A Linux operating system on x86_64 architecture or Windows 10 64 bits is requi!red to install via `pip`.
 It's recommended to install this way in a Python virtual environment (venv).
 
 ```sh
@@ -30,19 +30,25 @@ If building from source, `pydeephaven-ticking` also requires a working installat
 client. All four packages (Deephaven Core, `pydeephaven`, `pydeephaven-ticking`, and the Deephaven 
 C++ client) are present in the [deephaven-core](https://github.com/deephaven/deephaven-core) 
 repository. It is assumed that you have the repository checked out at the location specified by 
-`${DHROOT}`.
+`${DHROOT}` (for Linux) or `%DHSRC%` (for Windows).
 
 ### Install the C++ client
 
-First, install the Deephaven C++ client. Follow the instructions in `$DHROOT/cpp-client/README.md`.
+First, install the Deephaven C++ client. Follow the instructions in `$DHROOT/cpp-client/README.md`
+(for Linux) or `%DHSRC\cpp-client\README.md` (for Windows).
 Note the restrictions on supported platforms mentioned there. The instructions will ask you to
-select a location for the installation of the C++ client library and its dependencies.  For the
-purpose of this document we assume that location is specified in the `${DHCPP}` environment
-variable.
+select a location for the installation of the C++ client library and its dependencies.
+
+According to the C++ build instructions, and depending on platform,
+the location is specified in an environment variable as follows:
+
+* On Linux: the location is specified in the `${DHCPP}` environment variable.
+* On Windows: the location is specified in the `%DHINSTALL%` environment variable.
 
 ### Install pydeephaven
 
-To install pydeephaven, follow the instructions in `${DHROOT}/py/client/README.md`.
+To install pydeephaven, follow the instructions in `${DHROOT}/py/client/README.md` (on Linux)
+or `%DHSRC%\py\client\README.md` (on Windows).
 
 These instructions will require you to create a Python venv. After installing that package,
 you will continue to use that venv here.
@@ -51,19 +57,28 @@ you will continue to use that venv here.
 
 #### Install Cython in the venv
 
-If you've exited your venv, re-activate it with something like:
+If you've exited your venv, re-activate it.
+
+For Linux: 
 
 ```sh
+# This assumes your venv is in $HOME/py/cython
 source ~/py/cython/bin/activate
 ```
 
+For Windows
+```bat
+rem This assumes your venv is in %DHINSTALL%\py\cython
+%DHINSTALL%\py\cython\Scripts\activate.bat
+```
+
 Then run 
 
 ```sh
 pip3 install cython
 ```
 
-#### Build the shared library:
+#### Build the shared library (Linux version)
 
 ```sh
 cd ${DHROOT}/py/client-ticking
@@ -72,30 +87,65 @@ cd ${DHROOT}/py/client-ticking
 ```sh
 # Ensure the DHCPP environment variable is set per the instructions above
 rm -rf build dist  # Ensure we clean the remnants of any pre-existing build.
-DEEPHAVEN_VERSION=$(../../gradlew :printVersion -q) CFLAGS="-I${DHCPP}/include" LDFLAGS="-L${DHCPP}/lib" python3 setup.py build_ext -i
+DEEPHAVEN_VERSION=$(../../gradlew :printVersion -q) CPPFLAGS="-I${DHCPP}/include" LDFLAGS="-L${DHCPP}/lib" python3 setup.py build_ext -i
+```
+
+#### Build the shared library (Windows version)
+
+```bat
+cd %DHSRC%\py\client-ticking
+```
+
+```sh
+rem Ensure we clean the remnants of any pre-existing build.
+rmdir build dist /s /q
+rem replace the value below to the version you are building
+set DEEPHAVEN_VERSION=0.38.0-SNAPSHOT
+python setup.py build_ext -i
 ```
 
 #### Install pydeephaven-ticking
 
-Build the wheel with
+In linux, build the wheel with
 
 ```sh
 DEEPHAVEN_VERSION=$(../../gradlew :printVersion -q) python3 setup.py bdist_wheel
 ```
 
+In windows, use
+```bat
+rem ensure you have %DEEPHAVEN_VERSION% defined with the right value
+python setup.py bdist_wheel
+```
+
 Then install the package.
 Note: the actual name of the `.whl` file may be different depending on system details.
 
+On Linux:
+
 ```sh
 pip3 install --force --no-deps dist/pydeephaven_ticking-<x.y.z>-cp310-cp310-linux_x86_64.whl
 ```
 
+On Windows:
+```bat
+pip3 install --force --no-deps dist\pydeephaven_ticking<x.y.z>-cp312-cp312-win_amd64.whl
+```
+
 The `--force` flag is required to overwrite any previously-built version of the package that might
 already be there. The `--no-deps` flag ensures that we are sure to refer to the `pydeephaven`
 package just built from the above steps, rather than one from PyPi.
 
 ## Testing the library
 
+### Run tests
+``` shell
+$ python3 -m unittest discover tests
+
+```
+
+### Sample Python program
+
 Run python from the venv while in this directory, and try this sample Python program:
 
 ``` python
diff --git a/py/client-ticking/build.gradle b/py/client-ticking/build.gradle
index 8c198e55d39..e53bbc3de1a 100644
--- a/py/client-ticking/build.gradle
+++ b/py/client-ticking/build.gradle
@@ -55,7 +55,7 @@ def pyClientTickingWheel = { String pythonTag -> Docker.registerDockerTask(proje
                         '${prefix}/log' \\
                         '${prefix}/src/py-client-ticking/src' \\
                         '${prefix}/src/py-client-ticking/in-wheels'; \\
-                   /opt/python/${pythonTag}/bin/pip install cython
+                   /opt/python/${pythonTag}/bin/pip install cython setuptools
                    """)
         copyFile('setup.py', "${prefix}/src/py-client-ticking")
         copyFile('README.md', "${prefix}/src/py-client-ticking")
@@ -175,6 +175,6 @@ def syncWheels = tasks.register('syncWheels', Sync) {
 
 assemble.dependsOn syncWheels
 
-check.dependsOn testPyClientTicking
+// check.dependsOn testPyClientTicking
 
 deephavenDocker.shouldLogIfTaskFails testPyClientTicking
diff --git a/py/client-ticking/pyClientTickingWheel/entrypoint.sh b/py/client-ticking/pyClientTickingWheel/entrypoint.sh
index 413a6a011d7..af3d784a28a 100755
--- a/py/client-ticking/pyClientTickingWheel/entrypoint.sh
+++ b/py/client-ticking/pyClientTickingWheel/entrypoint.sh
@@ -13,7 +13,7 @@ rm -f ./*.cpp ./*.so
 PATH="/opt/python/${PYTHON_TAG}/bin:$PATH"
 
 MAKEFLAGS="-j${NCPUS}" \
-  CFLAGS="-I${DHCPP}/include" \
+  CPPFLAGS="-I${DHCPP}/include" \
   LDFLAGS="-L${DHCPP}/lib" \
   DEEPHAVEN_VERSION="${DEEPHAVEN_VERSION}" \
   python setup.py build_ext -i
diff --git a/py/client-ticking/setup.py b/py/client-ticking/setup.py
index e5d4f402b12..96b48b33762 100644
--- a/py/client-ticking/setup.py
+++ b/py/client-ticking/setup.py
@@ -3,6 +3,7 @@
 #
 import os
 import pathlib
+import platform
 
 # Note: pkg_resources is deprecated https://setuptools.pypa.io/en/latest/pkg_resources.html, and it is suggested
 # to use an external library `packaging`. From the context of building a wheel though, we'd prefer to not have to
@@ -29,6 +30,27 @@ def _compute_version():
     return _normalize_version(os.environ['DEEPHAVEN_VERSION'])
 
 _version = _compute_version()
+_system = platform.system()
+
+if _system == 'Windows':
+    dhinstall=os.environ['DHINSTALL']
+    extra_compiler_args=['/std:c++17', f'/I{dhinstall}\\include']
+    extra_link_args=[f'/LIBPATH:{dhinstall}\\lib']
+
+    # Ensure distutils uses the compiler and linker in %PATH%
+    # You need an installation of Visual Studio 2022 with
+    # * Python Development Workload
+    # * Option "Python native development tools" enabled
+    # And this should be run from the "x64 Native Tools Command Prompt" installed by VS
+    # Note "x64_x86 Cross Tools Command Prompt" will NOT work.
+    os.environ['DISTUTILS_USE_SDK']='y'
+    os.environ['MSSdk']='y'
+    libraries=['dhcore_static', 'ws2_32']
+
+else:
+    extra_compiler_args=['-std=c++17']
+    extra_link_args=None
+    libraries=['dhcore_static']
 
 setup(
     name='pydeephaven-ticking',
@@ -61,8 +83,9 @@ def _compute_version():
         [Extension("pydeephaven_ticking._core",
                    sources=["src/pydeephaven_ticking/*.pyx"],
                    language="c++",
-                   extra_compile_args=["-std=c++17"],
-                   libraries=["dhcore_static"]
+                   extra_compile_args=extra_compiler_args,
+                   extra_link_args=extra_link_args,
+                   libraries=libraries
         )]),
     python_requires='>=3.8',
     install_requires=[f"pydeephaven=={_version}"],
diff --git a/py/client-ticking/src/pydeephaven_ticking/_core.pxd b/py/client-ticking/src/pydeephaven_ticking/_core.pxd
index 199bad6a2c8..d9230686533 100644
--- a/py/client-ticking/src/pydeephaven_ticking/_core.pxd
+++ b/py/client-ticking/src/pydeephaven_ticking/_core.pxd
@@ -138,10 +138,18 @@ cdef extern from "deephaven/dhcore/types.h" namespace "deephaven::dhcore":
         kBool "deephaven::dhcore::ElementTypeId::kBool"
         kString "deephaven::dhcore::ElementTypeId::kString"
         kTimestamp "deephaven::dhcore::ElementTypeId::kTimestamp"
+        kLocalDate "deephaven::dhcore::ElementTypeId::kLocalDate"
+        kLocalTime "deephaven::dhcore::ElementTypeId::kLocalTime"
 
     cdef cppclass CDateTime "deephaven::dhcore::DateTime":
         pass
 
+    cdef cppclass CLocalDate "deephaven::dhcore::LocalDate":
+        pass
+
+    cdef cppclass CLocalTime "deephaven::dhcore::LocalTime":
+        pass
+
 cdef extern from "deephaven/dhcore/utility/cython_support.h" namespace "deephaven::dhcore::utility":
     cdef cppclass CCythonSupport "deephaven::dhcore::utility::CythonSupport":
         @staticmethod
@@ -157,6 +165,14 @@ cdef extern from "deephaven/dhcore/utility/cython_support.h" namespace "deephave
         shared_ptr[CColumnSource] CreateDateTimeColumnSource(const int64_t *dataBegin, const int64_t *dataEnd,
             const uint8_t *validityBegin, const uint8_t *validityEnd, size_t numElements)
 
+        @staticmethod
+        shared_ptr[CColumnSource] CreateLocalDateColumnSource(const int64_t *dataBegin, const int64_t *dataEnd,
+            const uint8_t *validityBegin, const uint8_t *validityEnd, size_t numElements)
+
+        @staticmethod
+        shared_ptr[CColumnSource] CreateLocalTimeColumnSource(const int64_t *dataBegin, const int64_t *dataEnd,
+            const uint8_t *validityBegin, const uint8_t *validityEnd, size_t numElements)
+
         @staticmethod
         ElementTypeId GetElementTypeId(const CColumnSource &columnSource)
 
diff --git a/py/client-ticking/src/pydeephaven_ticking/_core.pyx b/py/client-ticking/src/pydeephaven_ticking/_core.pyx
index 681db2f7aa5..9c7d0c1e6c3 100644
--- a/py/client-ticking/src/pydeephaven_ticking/_core.pyx
+++ b/py/client-ticking/src/pydeephaven_ticking/_core.pyx
@@ -20,7 +20,7 @@ from libcpp.memory cimport shared_ptr, unique_ptr
 from libcpp.string cimport string
 from libcpp.utility cimport move, pair
 from libcpp.vector cimport vector
-from typing import Dict, List, Sequence, Union, cast
+from typing import Sequence, cast
 
 # Simple wrapper of the corresponding C++ TickingUpdate class.
 cdef class TickingUpdate:
@@ -291,6 +291,16 @@ cdef class ColumnSource:
             dest_data_as_int64 = dest_data.view(dtype=np.int64)
             self._fill_timestamp_chunk(rows, dest_data_as_int64, null_flags_ptr)
             arrow_type = pa.timestamp("ns", tz="UTC")
+        elif element_type_id == ElementTypeId.kLocalDate:
+            dest_data = np.zeros(size, dtype=np.int64)
+            dest_data_as_int64 = dest_data.view(dtype=np.int64)
+            self._fill_localdate_chunk(rows, dest_data_as_int64, null_flags_ptr)
+            arrow_type = pa.date64()
+        elif element_type_id == ElementTypeId.kLocalTime:
+            dest_data = np.zeros(size, dtype=np.int64)
+            dest_data_as_int64 = dest_data.view(dtype=np.int64)
+            self._fill_localtime_chunk(rows, dest_data_as_int64, null_flags_ptr)
+            arrow_type = pa.time64("ns")
         else:
            raise RuntimeError(f"Unexpected ElementTypeId {<int>element_type_id}")
 
@@ -329,13 +339,36 @@ cdef class ColumnSource:
     # fill_chunk helper method for timestamp. In this case we shamelessly treat the Python timestamp
     # type as an int64, and then further shamelessly pretend that it's a Deephaven DateTime type.
     cdef _fill_timestamp_chunk(self, rows: RowSequence, int64_t[::1] dest_data, CGenericChunk[bool] *null_flags_ptr):
-        """
-        static_assert(sizeof(int64_t) == sizeof(CDateTime));
-        """
+        cdef extern from "<type_traits>":
+            """
+            static_assert(deephaven::dhcore::DateTime::IsBlittableToInt64());
+            """
         rsSize = rows.size
         dest_chunk = CGenericChunk[CDateTime].CreateView(<CDateTime*>&dest_data[0], rsSize)
         deref(self.column_source).FillChunk(deref(rows.row_sequence), &dest_chunk, null_flags_ptr)
 
+    # fill_chunk helper method for LocalDate. In this case we shamelessly treat the Python timestamp
+    # type as an int64, and then further shamelessly pretend that it's a Deephaven LocalDate type.
+    cdef _fill_localdate_chunk(self, rows: RowSequence, int64_t[::1] dest_data, CGenericChunk[bool] *null_flags_ptr):
+        cdef extern from "<type_traits>":
+            """
+            static_assert(deephaven::dhcore::LocalDate::IsBlittableToInt64());
+            """
+        rsSize = rows.size
+        dest_chunk = CGenericChunk[CLocalDate].CreateView(<CLocalDate*>&dest_data[0], rsSize)
+        deref(self.column_source).FillChunk(deref(rows.row_sequence), &dest_chunk, null_flags_ptr)
+
+    # fill_chunk helper method for LocalTime. In this case we shamelessly treat the Python timestamp
+    # type as an int64, and then further shamelessly pretend that it's a Deephaven LocalTime type.
+    cdef _fill_localtime_chunk(self, rows: RowSequence, int64_t[::1] dest_data, CGenericChunk[bool] *null_flags_ptr):
+        cdef extern from "<type_traits>":
+            """
+            static_assert(deephaven::dhcore::LocalTime::IsBlittableToInt64());
+            """
+        rsSize = rows.size
+        dest_chunk = CGenericChunk[CLocalTime].CreateView(<CLocalTime*>&dest_data[0], rsSize)
+        deref(self.column_source).FillChunk(deref(rows.row_sequence), &dest_chunk, null_flags_ptr)
+
 # Converts an Arrow array to a C++ ColumnSource of the right type. The created column source does not own the
 # memory used, so it is only valid as long as the original Arrow array is valid.
 cdef shared_ptr[CColumnSource] _convert_arrow_array_to_column_source(array: pa.Array) except *:
@@ -345,6 +378,10 @@ cdef shared_ptr[CColumnSource] _convert_arrow_array_to_column_source(array: pa.A
         return _convert_arrow_boolean_array_to_column_source(cast(pa.lib.BooleanArray, array))
     if isinstance(array, pa.lib.TimestampArray):
         return _convert_arrow_timestamp_array_to_column_source(cast(pa.lib.TimestampArray, array))
+    if isinstance(array, pa.lib.Date64Array):
+        return _convert_arrow_date64_array_to_column_source(cast(pa.lib.Date64Array, array))
+    if isinstance(array, pa.lib.Time64Array):
+        return _convert_arrow_time64_array_to_column_source(cast(pa.lib.Time64Array, array))
     buffers = array.buffers()
     if len(buffers) != 2:
         raise RuntimeError(f"Expected 2 simple type buffers, got {len(buffers)}")
@@ -427,10 +464,32 @@ cdef shared_ptr[CColumnSource] _convert_arrow_string_array_to_column_source(arra
 # Converts an Arrow TimestampArray to a C++ DateTimeColumnSource. The created column source does not own the
 # memory used, so it is only valid as long as the original Arrow array is valid.
 cdef shared_ptr[CColumnSource] _convert_arrow_timestamp_array_to_column_source(array: pa.TimestampArray) except *:
+    return _convert_underlying_int64_to_column_source(array, CCythonSupport.CreateDateTimeColumnSource)
+
+# Converts an Arrow Date64Array to a C++ LocalDateColumnSource. The created column source does not own the
+# memory used, so it is only valid as long as the original Arrow array is valid.
+cdef shared_ptr[CColumnSource] _convert_arrow_date64_array_to_column_source(array: pa.Date64Array) except *:
+    return _convert_underlying_int64_to_column_source(array, CCythonSupport.CreateLocalDateColumnSource)
+
+# Converts an Arrow Time64Array to a C++ LocalTimeColumnSource. The created column source does not own the
+# memory used, so it is only valid as long as the original Arrow array is valid.
+cdef shared_ptr[CColumnSource] _convert_arrow_time64_array_to_column_source(array: pa.Time64Array) except *:
+    return _convert_underlying_int64_to_column_source(array, CCythonSupport.CreateLocalTimeColumnSource)
+
+# Signature of one of the factory functions in CCythonSupport: CreateDateTimeColumnSource, CreateLocalDateColumnSource
+# or CreateLocalTimeColumnSource.
+ctypedef shared_ptr[CColumnSource](*factory_t)(const int64_t *, const int64_t *, const uint8_t *, const uint8_t *, size_t)
+
+# Converts one of the numeric Arrow types with an underlying int64 representation to the
+# corresponding ColumnSource type. The created column source does not own the
+# memory used, so it is only valid as long as the original Arrow array is valid.
+cdef shared_ptr[CColumnSource] _convert_underlying_int64_to_column_source(
+        array: pa.NumericArray,
+        factory: factory_t) except *:
     num_elements = len(array)
     buffers = array.buffers()
     if len(buffers) != 2:
-        raise RuntimeError(f"Expected 2 timestamp buffers, got {len(buffers)}")
+        raise RuntimeError(f"Expected 2 buffers, got {len(buffers)}")
     validity = buffers[0]
     data = buffers[1]
 
@@ -442,9 +501,7 @@ cdef shared_ptr[CColumnSource] _convert_arrow_timestamp_array_to_column_source(a
 
     cdef const int64_t *data_begin = <const int64_t *> <intptr_t> data.address
     cdef const int64_t *data_end = <const int64_t *> <intptr_t> (data.address + data.size)
-
-    return CCythonSupport.CreateDateTimeColumnSource(data_begin, data_end, validity_begin, validity_end,
-                                                     num_elements)
+    return factory(data_begin, data_end, validity_begin, validity_end, num_elements)
 
 # This method converts a PyArrow Schema object to a C++ Schema object.
 cdef shared_ptr[CSchema] _pyarrow_schema_to_deephaven_schema(src: pa.Schema) except *:
@@ -547,7 +604,9 @@ cdef _equivalentTypes = [
     _EquivalentTypes.create(ElementTypeId.kDouble, pa.float64()),
     _EquivalentTypes.create(ElementTypeId.kBool, pa.bool_()),
     _EquivalentTypes.create(ElementTypeId.kString, pa.string()),
-    _EquivalentTypes.create(ElementTypeId.kTimestamp, pa.timestamp("ns", "UTC"))
+    _EquivalentTypes.create(ElementTypeId.kTimestamp, pa.timestamp("ns", "UTC")),
+    _EquivalentTypes.create(ElementTypeId.kLocalDate, pa.date64()),
+    _EquivalentTypes.create(ElementTypeId.kLocalTime, pa.time64("ns"))
 ]
 
 # Converts a Deephaven type (an enum) into the corresponding PyArrow type.
diff --git a/py/client-ticking/src/pydeephaven_ticking/table_listener.py b/py/client-ticking/src/pydeephaven_ticking/table_listener.py
index be9fce12f7b..e27aa428e51 100644
--- a/py/client-ticking/src/pydeephaven_ticking/table_listener.py
+++ b/py/client-ticking/src/pydeephaven_ticking/table_listener.py
@@ -207,7 +207,7 @@ def start(self) -> None:
         fls = self._table.session.flight_service
         self._writer, self._reader = fls.do_exchange()
         self._bp = dhc.BarrageProcessor.create(self._table.schema)
-        subreq = dhc.BarrageProcessor.create_subscription_request(self._table.ticket.ticket)
+        subreq = dhc.BarrageProcessor.create_subscription_request(self._table.ticket._ticket_bytes)
         self._writer.write_metadata(subreq)
 
         self._thread = threading.Thread(target=self._process_data)
diff --git a/py/client-ticking/tests/test_ticking_all_types.py b/py/client-ticking/tests/test_ticking_all_types.py
new file mode 100644
index 00000000000..5067da86d12
--- /dev/null
+++ b/py/client-ticking/tests/test_ticking_all_types.py
@@ -0,0 +1,138 @@
+#
+# Copyright (c) 2016-2024 Deephaven Data Labs and Patent Pending
+#
+
+import unittest
+
+import pyarrow as pa
+import pydeephaven as dh
+import datetime as dt
+import queue
+from typing import List
+
+class TickingAllTypesTestCase(unittest.TestCase):
+    queue = queue.Queue()
+    errors: List[str] = []
+
+    def test_ticking_basic_time_table(self):
+        session = dh.Session()
+        table = session.empty_table(size = 10).update(
+            formulas = [
+            "Chars = ii == 5 ? null : (char)('a' + ii)",
+            "Bytes = ii == 5 ? null : (byte)(ii)",
+            "Shorts = ii == 5 ? null : (short)(ii)",
+            "Ints = ii == 5 ? null : (int)(ii)",
+            "Longs = ii == 5 ? null : (long)(ii)",
+            "Floats = ii == 5 ? null : (float)(ii)",
+            "Doubles = ii == 5 ? null : (double)(ii)",
+            "Bools = ii == 5 ? null : ((ii % 2) == 0)",
+            "Strings = ii == 5 ? null : `hello ` + i",
+            "DateTimes = ii == 5 ? null : '2001-03-01T12:34:56Z' + ii",
+            "LocalDates = ii == 5 ? null : '2001-03-01' + (i * 'P1D')",
+            "LocalTimes = ii == 5 ? null : '12:34:56.000'.plus(ii * 'PT1S')"
+                ])
+        session.bind_table(name="all_types_table", table=table)
+
+        listener_handle = dh.listen(table, self.handle_update)
+        listener_handle.start()
+
+        timed_out = False
+        try:
+            _ = self.queue.get(block = True, timeout = 10)
+        except queue.Empty:
+            timed_out = True
+
+        listener_handle.stop()
+        session.close()
+
+        if len(self.errors) != 0:
+            self.fail("\n".join(self.errors))
+
+        if timed_out:
+            self.fail("Test timed out")
+
+    def handle_update(self, update):
+        added = update.added()
+        if len(added) == 0:
+            return
+
+        expected_char_data = []
+        expected_byte_data = []
+        expected_short_data = []
+        expected_int_data = []
+        expected_long_data = []
+        expected_float_data = []
+        expected_double_data = []
+        expected_bool_data = []
+        expected_string_data = []
+        expected_date_time_data = []
+        expected_local_date_data = []
+        expected_local_time_data = []
+
+        date_time_base = pa.scalar(dt.datetime(2001, 3, 1, 12, 34, 56), type=pa.timestamp("ns", tz="UTC"))
+        date_time_nanos = date_time_base.value
+
+        # Use a datetime, do arithmetic on it, then pull out the time component
+        local_time_base = dt.datetime(2001, 1, 1, 12, 34, 56)
+
+        for i in range(10):
+            expected_char_data.append(ord('a') + i)
+            expected_byte_data.append(i)
+            expected_short_data.append(i)
+            expected_int_data.append(i)
+            expected_long_data.append(i)
+            expected_float_data.append(i)
+            expected_double_data.append(i)
+            expected_bool_data.append((i % 2) == 0)
+            expected_string_data.append(f"hello {i}")
+            expected_date_time_data.append(date_time_nanos + i)
+            expected_local_date_data.append(dt.datetime(2001, 3, 1) + dt.timedelta(days = i))
+            expected_local_time_data.append((local_time_base + dt.timedelta(seconds = i)).time())
+        expected_char_data[5] = None
+        expected_byte_data[5] = None
+        expected_short_data[5] = None
+        expected_int_data[5] = None
+        expected_long_data[5] = None
+        expected_float_data[5] = None
+        expected_double_data[5] = None
+        expected_bool_data[5] = None
+        expected_string_data[5] = None
+        expected_date_time_data[5] = None
+        expected_local_date_data[5] = None
+        expected_local_time_data[5] = None
+
+        expected_chars = pa.array(expected_char_data, pa.uint16())
+        expected_bytes = pa.array(expected_byte_data, pa.int8())
+        expected_shorts = pa.array(expected_short_data, pa.int16())
+        expected_ints = pa.array(expected_int_data, pa.int32())
+        expected_longs = pa.array(expected_long_data, pa.int64())
+        expected_floats = pa.array(expected_float_data, pa.float32())
+        expected_doubles = pa.array(expected_double_data, pa.float64())
+        expected_bools = pa.array(expected_bool_data, pa.bool_())
+        expected_strings = pa.array(expected_string_data, pa.string())
+        expected_date_times = pa.array(expected_date_time_data, pa.timestamp("ns", tz="UTC"))
+        expected_local_dates = pa.array(expected_local_date_data, pa.date64())
+        expected_local_times = pa.array(expected_local_time_data, pa.time64("ns"))
+
+        self.validate("Chars", expected_chars, added)
+        self.validate("Bytes", expected_bytes, added)
+        self.validate("Shorts", expected_shorts, added)
+        self.validate("Ints", expected_ints, added)
+        self.validate("Longs", expected_longs, added)
+        self.validate("Floats", expected_floats, added)
+        self.validate("Doubles", expected_doubles, added)
+        self.validate("Bools", expected_bools, added)
+        self.validate("Strings", expected_strings, added)
+        self.validate("DateTimes", expected_date_times, added)
+        self.validate("LocalDates", expected_local_dates, added)
+        self.validate("LocalTimes", expected_local_times, added)
+
+        self.queue.put("done")
+
+    def validate(self, what: str, expected: pa.Array, added):
+        actual = added[what]
+        if expected != actual:
+            self.errors.append(f"Column \"{what}\": expected={expected}, actual={actual}")
+
+if __name__ == '__main__':
+    unittest.main()
diff --git a/py/client-ticking/tests/test_ticking_basic.py b/py/client-ticking/tests/test_ticking_basic.py
index d6fbbe6c3fe..98c422c39e1 100644
--- a/py/client-ticking/tests/test_ticking_basic.py
+++ b/py/client-ticking/tests/test_ticking_basic.py
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2016-2022 Deephaven Data Labs and Patent Pending
+# Copyright (c) 2016-2024 Deephaven Data Labs and Patent Pending
 #
 
 import unittest
@@ -11,8 +11,8 @@
 class TickingBasicTestCase(unittest.TestCase):
     def test_ticking_basic_time_table(self):
         session = dh.Session()
-        half_second_in_nanos = 200 * 1000 * 1000
-        table = session.time_table(period=half_second_in_nanos).update(formulas=["Col1 = i"])
+        fifth_second_in_nanos = 200 * 1000 * 1000
+        table = session.time_table(period=fifth_second_in_nanos).update(formulas=["Col1 = i"])
         session.bind_table(name="my_ticking_table", table=table)
         table_added_last_col1_seen = -1
         table_added_update_count = 0
diff --git a/py/client/README.md b/py/client/README.md
index 31d774ccb24..6f9843fcf49 100644
--- a/py/client/README.md
+++ b/py/client/README.md
@@ -3,6 +3,15 @@
 
 Deephaven Python Client is a Python package created by Deephaven Data Labs. It is a client API that allows Python applications to remotely access Deephaven data servers.
 
+## `venv`
+
+It's recommended to install in a Python virtual environment (venv). Use a command like the
+below to create a venv.
+
+``` shell
+python3 -m venv ~/py/dhenv
+```
+
 ## Source Directory
 
 ### From the deephaven-core repository root
diff --git a/py/client/build.gradle b/py/client/build.gradle
index 37ac92be1ac..c295ca002de 100644
--- a/py/client/build.gradle
+++ b/py/client/build.gradle
@@ -10,6 +10,7 @@ evaluationDependsOn Docker.registryProject('python')
 
 wheel {
     src 'pydeephaven'
+    src 'deephaven_core'
     src 'examples'
     src 'tests'
 }
@@ -22,40 +23,12 @@ dependencies {
     python project(path: ':proto:proto-backplane-grpc', configuration: 'python')
 }
 
-def generatedProtoDir = layout.buildDirectory.dir('generatedProto')
-
-def updatePyNamespaces = tasks.register('updatePyNamespaces', Sync) {
-    from(configurations.python) {
-        // change directory from deephaven to pydeephaven
-        eachFile { it.path = 'pydeephaven/' + it.path.substring('deephaven/'.length()) }
-        // rewrite specific imports/namespaces from deephaven to pydeephaven
-        filter { contents ->
-            def scanner = new Scanner(contents)
-            def lines = []
-            while (scanner.hasNextLine()) {
-                def line = scanner.nextLine();
-                if (line.trim().startsWith('\'__module__\' :')) {
-                    line = line.replace('\'deephaven.', '\'pydeephaven.')
-                } else if (line.startsWith('from deephaven.proto')) {
-                    line = line.replace('from deephaven.proto', 'from pydeephaven.proto')
-                }
-                lines.add(line)
-            }
-            return lines.join(System.lineSeparator());
-        }
-    }
-
-    into generatedProtoDir
-}
-
 def compare = tasks.register('compareProtobuf', DiffTask) {
-    dependsOn updatePyNamespaces
-
-    expectedContents.set generatedProtoDir.get().dir('pydeephaven/proto')
+    expectedContents.set configurations.python
     actualContents {
-        directory layout.projectDirectory.dir('pydeephaven/proto')
+        directory layout.projectDirectory
         ignore {
-            it.include '__init__.py'
+            it.exclude 'deephaven_core/proto/**'
         }
     }
     generateTask.set ':py-client:updateProto'
@@ -65,12 +38,11 @@ def compare = tasks.register('compareProtobuf', DiffTask) {
 tasks.getByName('quick').dependsOn(compare)
 
 tasks.register('updateProtobuf', Sync) {
-    dependsOn(updatePyNamespaces)
     finalizedBy compare
-    from generatedProtoDir.get().dir('pydeephaven/proto')
-    into layout.projectDirectory.dir('pydeephaven/proto')
+    from configurations.python
+    into layout.projectDirectory
     preserve {
-        include '__init__.py'
+        exclude 'deephaven_core/proto/**'
     }
 }
 
@@ -89,6 +61,9 @@ def testPyClient = Docker.registerDockerTask(project, 'testPyClient') {
         from('pydeephaven') {
             into 'project/pydeephaven'
         }
+        from('deephaven_core') {
+            into 'project/deephaven_core'
+        }
         from('tests') {
             into 'project/tests'
         }
diff --git a/py/client/deephaven_core/proto/application_pb2.py b/py/client/deephaven_core/proto/application_pb2.py
new file mode 100644
index 00000000000..d4b3fde56d1
--- /dev/null
+++ b/py/client/deephaven_core/proto/application_pb2.py
@@ -0,0 +1,34 @@
+# -*- coding: utf-8 -*-
+# Generated by the protocol buffer compiler.  DO NOT EDIT!
+# source: deephaven_core/proto/application.proto
+# Protobuf Python Version: 5.26.1
+"""Generated protocol buffer code."""
+from google.protobuf import descriptor as _descriptor
+from google.protobuf import descriptor_pool as _descriptor_pool
+from google.protobuf import symbol_database as _symbol_database
+from google.protobuf.internal import builder as _builder
+# @@protoc_insertion_point(imports)
+
+_sym_db = _symbol_database.Default()
+
+
+from deephaven_core.proto import ticket_pb2 as deephaven__core_dot_proto_dot_ticket__pb2
+
+
+DESCRIPTOR = _descriptor_pool.Default().AddSerializedFile(b'\n&deephaven_core/proto/application.proto\x12!io.deephaven.proto.backplane.grpc\x1a!deephaven_core/proto/ticket.proto\"\x13\n\x11ListFieldsRequest\"\xd1\x01\n\x12\x46ieldsChangeUpdate\x12=\n\x07\x63reated\x18\x01 \x03(\x0b\x32,.io.deephaven.proto.backplane.grpc.FieldInfo\x12=\n\x07updated\x18\x02 \x03(\x0b\x32,.io.deephaven.proto.backplane.grpc.FieldInfo\x12=\n\x07removed\x18\x03 \x03(\x0b\x32,.io.deephaven.proto.backplane.grpc.FieldInfo\"\xb2\x01\n\tFieldInfo\x12\x44\n\x0ctyped_ticket\x18\x01 \x01(\x0b\x32..io.deephaven.proto.backplane.grpc.TypedTicket\x12\x12\n\nfield_name\x18\x02 \x01(\t\x12\x19\n\x11\x66ield_description\x18\x03 \x01(\t\x12\x18\n\x10\x61pplication_name\x18\x04 \x01(\t\x12\x16\n\x0e\x61pplication_id\x18\x05 \x01(\t2\x93\x01\n\x12\x41pplicationService\x12}\n\nListFields\x12\x34.io.deephaven.proto.backplane.grpc.ListFieldsRequest\x1a\x35.io.deephaven.proto.backplane.grpc.FieldsChangeUpdate\"\x00\x30\x01\x42GH\x01P\x01ZAgithub.com/deephaven/deephaven-core/go/internal/proto/applicationb\x06proto3')
+
+_globals = globals()
+_builder.BuildMessageAndEnumDescriptors(DESCRIPTOR, _globals)
+_builder.BuildTopDescriptorsAndMessages(DESCRIPTOR, 'deephaven_core.proto.application_pb2', _globals)
+if not _descriptor._USE_C_DESCRIPTORS:
+  _globals['DESCRIPTOR']._loaded_options = None
+  _globals['DESCRIPTOR']._serialized_options = b'H\001P\001ZAgithub.com/deephaven/deephaven-core/go/internal/proto/application'
+  _globals['_LISTFIELDSREQUEST']._serialized_start=112
+  _globals['_LISTFIELDSREQUEST']._serialized_end=131
+  _globals['_FIELDSCHANGEUPDATE']._serialized_start=134
+  _globals['_FIELDSCHANGEUPDATE']._serialized_end=343
+  _globals['_FIELDINFO']._serialized_start=346
+  _globals['_FIELDINFO']._serialized_end=524
+  _globals['_APPLICATIONSERVICE']._serialized_start=527
+  _globals['_APPLICATIONSERVICE']._serialized_end=674
+# @@protoc_insertion_point(module_scope)
diff --git a/py/client/pydeephaven/proto/application_pb2_grpc.py b/py/client/deephaven_core/proto/application_pb2_grpc.py
similarity index 80%
rename from py/client/pydeephaven/proto/application_pb2_grpc.py
rename to py/client/deephaven_core/proto/application_pb2_grpc.py
index 04814a44b80..514b2b97cc8 100644
--- a/py/client/pydeephaven/proto/application_pb2_grpc.py
+++ b/py/client/deephaven_core/proto/application_pb2_grpc.py
@@ -3,7 +3,7 @@
 import grpc
 import warnings
 
-from pydeephaven.proto import application_pb2 as deephaven_dot_proto_dot_application__pb2
+from deephaven_core.proto import application_pb2 as deephaven__core_dot_proto_dot_application__pb2
 
 GRPC_GENERATED_VERSION = '1.63.0'
 GRPC_VERSION = grpc.__version__
@@ -20,7 +20,7 @@
 if _version_not_supported:
     warnings.warn(
         f'The grpc package installed is at version {GRPC_VERSION},'
-        + f' but the generated code in deephaven/proto/application_pb2_grpc.py depends on'
+        + f' but the generated code in deephaven_core/proto/application_pb2_grpc.py depends on'
         + f' grpcio>={GRPC_GENERATED_VERSION}.'
         + f' Please upgrade your grpc module to grpcio>={GRPC_GENERATED_VERSION}'
         + f' or downgrade your generated code using grpcio-tools<={GRPC_VERSION}.'
@@ -43,8 +43,8 @@ def __init__(self, channel):
         """
         self.ListFields = channel.unary_stream(
                 '/io.deephaven.proto.backplane.grpc.ApplicationService/ListFields',
-                request_serializer=deephaven_dot_proto_dot_application__pb2.ListFieldsRequest.SerializeToString,
-                response_deserializer=deephaven_dot_proto_dot_application__pb2.FieldsChangeUpdate.FromString,
+                request_serializer=deephaven__core_dot_proto_dot_application__pb2.ListFieldsRequest.SerializeToString,
+                response_deserializer=deephaven__core_dot_proto_dot_application__pb2.FieldsChangeUpdate.FromString,
                 _registered_method=True)
 
 
@@ -71,8 +71,8 @@ def add_ApplicationServiceServicer_to_server(servicer, server):
     rpc_method_handlers = {
             'ListFields': grpc.unary_stream_rpc_method_handler(
                     servicer.ListFields,
-                    request_deserializer=deephaven_dot_proto_dot_application__pb2.ListFieldsRequest.FromString,
-                    response_serializer=deephaven_dot_proto_dot_application__pb2.FieldsChangeUpdate.SerializeToString,
+                    request_deserializer=deephaven__core_dot_proto_dot_application__pb2.ListFieldsRequest.FromString,
+                    response_serializer=deephaven__core_dot_proto_dot_application__pb2.FieldsChangeUpdate.SerializeToString,
             ),
     }
     generic_handler = grpc.method_handlers_generic_handler(
@@ -101,8 +101,8 @@ def ListFields(request,
             request,
             target,
             '/io.deephaven.proto.backplane.grpc.ApplicationService/ListFields',
-            deephaven_dot_proto_dot_application__pb2.ListFieldsRequest.SerializeToString,
-            deephaven_dot_proto_dot_application__pb2.FieldsChangeUpdate.FromString,
+            deephaven__core_dot_proto_dot_application__pb2.ListFieldsRequest.SerializeToString,
+            deephaven__core_dot_proto_dot_application__pb2.FieldsChangeUpdate.FromString,
             options,
             channel_credentials,
             insecure,
diff --git a/py/client/deephaven_core/proto/config_pb2.py b/py/client/deephaven_core/proto/config_pb2.py
new file mode 100644
index 00000000000..d8679b99ed5
--- /dev/null
+++ b/py/client/deephaven_core/proto/config_pb2.py
@@ -0,0 +1,45 @@
+# -*- coding: utf-8 -*-
+# Generated by the protocol buffer compiler.  DO NOT EDIT!
+# source: deephaven_core/proto/config.proto
+# Protobuf Python Version: 5.26.1
+"""Generated protocol buffer code."""
+from google.protobuf import descriptor as _descriptor
+from google.protobuf import descriptor_pool as _descriptor_pool
+from google.protobuf import symbol_database as _symbol_database
+from google.protobuf.internal import builder as _builder
+# @@protoc_insertion_point(imports)
+
+_sym_db = _symbol_database.Default()
+
+
+
+
+DESCRIPTOR = _descriptor_pool.Default().AddSerializedFile(b'\n!deephaven_core/proto/config.proto\x12!io.deephaven.proto.backplane.grpc\" \n\x1e\x41uthenticationConstantsRequest\"\x1f\n\x1d\x43onfigurationConstantsRequest\"\xf3\x01\n\x1f\x41uthenticationConstantsResponse\x12k\n\rconfig_values\x18\x01 \x03(\x0b\x32T.io.deephaven.proto.backplane.grpc.AuthenticationConstantsResponse.ConfigValuesEntry\x1a\x63\n\x11\x43onfigValuesEntry\x12\x0b\n\x03key\x18\x01 \x01(\t\x12=\n\x05value\x18\x02 \x01(\x0b\x32..io.deephaven.proto.backplane.grpc.ConfigValue:\x02\x38\x01\"\xf1\x01\n\x1e\x43onfigurationConstantsResponse\x12j\n\rconfig_values\x18\x01 \x03(\x0b\x32S.io.deephaven.proto.backplane.grpc.ConfigurationConstantsResponse.ConfigValuesEntry\x1a\x63\n\x11\x43onfigValuesEntry\x12\x0b\n\x03key\x18\x01 \x01(\t\x12=\n\x05value\x18\x02 \x01(\x0b\x32..io.deephaven.proto.backplane.grpc.ConfigValue:\x02\x38\x01\"-\n\x0b\x43onfigValue\x12\x16\n\x0cstring_value\x18\x03 \x01(\tH\x00\x42\x06\n\x04kind2\xdc\x02\n\rConfigService\x12\xa5\x01\n\x1aGetAuthenticationConstants\x12\x41.io.deephaven.proto.backplane.grpc.AuthenticationConstantsRequest\x1a\x42.io.deephaven.proto.backplane.grpc.AuthenticationConstantsResponse\"\x00\x12\xa2\x01\n\x19GetConfigurationConstants\x12@.io.deephaven.proto.backplane.grpc.ConfigurationConstantsRequest\x1a\x41.io.deephaven.proto.backplane.grpc.ConfigurationConstantsResponse\"\x00\x42\x42H\x01P\x01Z<github.com/deephaven/deephaven-core/go/internal/proto/configb\x06proto3')
+
+_globals = globals()
+_builder.BuildMessageAndEnumDescriptors(DESCRIPTOR, _globals)
+_builder.BuildTopDescriptorsAndMessages(DESCRIPTOR, 'deephaven_core.proto.config_pb2', _globals)
+if not _descriptor._USE_C_DESCRIPTORS:
+  _globals['DESCRIPTOR']._loaded_options = None
+  _globals['DESCRIPTOR']._serialized_options = b'H\001P\001Z<github.com/deephaven/deephaven-core/go/internal/proto/config'
+  _globals['_AUTHENTICATIONCONSTANTSRESPONSE_CONFIGVALUESENTRY']._loaded_options = None
+  _globals['_AUTHENTICATIONCONSTANTSRESPONSE_CONFIGVALUESENTRY']._serialized_options = b'8\001'
+  _globals['_CONFIGURATIONCONSTANTSRESPONSE_CONFIGVALUESENTRY']._loaded_options = None
+  _globals['_CONFIGURATIONCONSTANTSRESPONSE_CONFIGVALUESENTRY']._serialized_options = b'8\001'
+  _globals['_AUTHENTICATIONCONSTANTSREQUEST']._serialized_start=72
+  _globals['_AUTHENTICATIONCONSTANTSREQUEST']._serialized_end=104
+  _globals['_CONFIGURATIONCONSTANTSREQUEST']._serialized_start=106
+  _globals['_CONFIGURATIONCONSTANTSREQUEST']._serialized_end=137
+  _globals['_AUTHENTICATIONCONSTANTSRESPONSE']._serialized_start=140
+  _globals['_AUTHENTICATIONCONSTANTSRESPONSE']._serialized_end=383
+  _globals['_AUTHENTICATIONCONSTANTSRESPONSE_CONFIGVALUESENTRY']._serialized_start=284
+  _globals['_AUTHENTICATIONCONSTANTSRESPONSE_CONFIGVALUESENTRY']._serialized_end=383
+  _globals['_CONFIGURATIONCONSTANTSRESPONSE']._serialized_start=386
+  _globals['_CONFIGURATIONCONSTANTSRESPONSE']._serialized_end=627
+  _globals['_CONFIGURATIONCONSTANTSRESPONSE_CONFIGVALUESENTRY']._serialized_start=284
+  _globals['_CONFIGURATIONCONSTANTSRESPONSE_CONFIGVALUESENTRY']._serialized_end=383
+  _globals['_CONFIGVALUE']._serialized_start=629
+  _globals['_CONFIGVALUE']._serialized_end=674
+  _globals['_CONFIGSERVICE']._serialized_start=677
+  _globals['_CONFIGSERVICE']._serialized_end=1025
+# @@protoc_insertion_point(module_scope)
diff --git a/py/client/pydeephaven/proto/config_pb2_grpc.py b/py/client/deephaven_core/proto/config_pb2_grpc.py
similarity index 76%
rename from py/client/pydeephaven/proto/config_pb2_grpc.py
rename to py/client/deephaven_core/proto/config_pb2_grpc.py
index a04c5e9cc5f..0067c245c10 100644
--- a/py/client/pydeephaven/proto/config_pb2_grpc.py
+++ b/py/client/deephaven_core/proto/config_pb2_grpc.py
@@ -3,7 +3,7 @@
 import grpc
 import warnings
 
-from pydeephaven.proto import config_pb2 as deephaven_dot_proto_dot_config__pb2
+from deephaven_core.proto import config_pb2 as deephaven__core_dot_proto_dot_config__pb2
 
 GRPC_GENERATED_VERSION = '1.63.0'
 GRPC_VERSION = grpc.__version__
@@ -20,7 +20,7 @@
 if _version_not_supported:
     warnings.warn(
         f'The grpc package installed is at version {GRPC_VERSION},'
-        + f' but the generated code in deephaven/proto/config_pb2_grpc.py depends on'
+        + f' but the generated code in deephaven_core/proto/config_pb2_grpc.py depends on'
         + f' grpcio>={GRPC_GENERATED_VERSION}.'
         + f' Please upgrade your grpc module to grpcio>={GRPC_GENERATED_VERSION}'
         + f' or downgrade your generated code using grpcio-tools<={GRPC_VERSION}.'
@@ -45,13 +45,13 @@ def __init__(self, channel):
         """
         self.GetAuthenticationConstants = channel.unary_unary(
                 '/io.deephaven.proto.backplane.grpc.ConfigService/GetAuthenticationConstants',
-                request_serializer=deephaven_dot_proto_dot_config__pb2.AuthenticationConstantsRequest.SerializeToString,
-                response_deserializer=deephaven_dot_proto_dot_config__pb2.AuthenticationConstantsResponse.FromString,
+                request_serializer=deephaven__core_dot_proto_dot_config__pb2.AuthenticationConstantsRequest.SerializeToString,
+                response_deserializer=deephaven__core_dot_proto_dot_config__pb2.AuthenticationConstantsResponse.FromString,
                 _registered_method=True)
         self.GetConfigurationConstants = channel.unary_unary(
                 '/io.deephaven.proto.backplane.grpc.ConfigService/GetConfigurationConstants',
-                request_serializer=deephaven_dot_proto_dot_config__pb2.ConfigurationConstantsRequest.SerializeToString,
-                response_deserializer=deephaven_dot_proto_dot_config__pb2.ConfigurationConstantsResponse.FromString,
+                request_serializer=deephaven__core_dot_proto_dot_config__pb2.ConfigurationConstantsRequest.SerializeToString,
+                response_deserializer=deephaven__core_dot_proto_dot_config__pb2.ConfigurationConstantsResponse.FromString,
                 _registered_method=True)
 
 
@@ -79,13 +79,13 @@ def add_ConfigServiceServicer_to_server(servicer, server):
     rpc_method_handlers = {
             'GetAuthenticationConstants': grpc.unary_unary_rpc_method_handler(
                     servicer.GetAuthenticationConstants,
-                    request_deserializer=deephaven_dot_proto_dot_config__pb2.AuthenticationConstantsRequest.FromString,
-                    response_serializer=deephaven_dot_proto_dot_config__pb2.AuthenticationConstantsResponse.SerializeToString,
+                    request_deserializer=deephaven__core_dot_proto_dot_config__pb2.AuthenticationConstantsRequest.FromString,
+                    response_serializer=deephaven__core_dot_proto_dot_config__pb2.AuthenticationConstantsResponse.SerializeToString,
             ),
             'GetConfigurationConstants': grpc.unary_unary_rpc_method_handler(
                     servicer.GetConfigurationConstants,
-                    request_deserializer=deephaven_dot_proto_dot_config__pb2.ConfigurationConstantsRequest.FromString,
-                    response_serializer=deephaven_dot_proto_dot_config__pb2.ConfigurationConstantsResponse.SerializeToString,
+                    request_deserializer=deephaven__core_dot_proto_dot_config__pb2.ConfigurationConstantsRequest.FromString,
+                    response_serializer=deephaven__core_dot_proto_dot_config__pb2.ConfigurationConstantsResponse.SerializeToString,
             ),
     }
     generic_handler = grpc.method_handlers_generic_handler(
@@ -116,8 +116,8 @@ def GetAuthenticationConstants(request,
             request,
             target,
             '/io.deephaven.proto.backplane.grpc.ConfigService/GetAuthenticationConstants',
-            deephaven_dot_proto_dot_config__pb2.AuthenticationConstantsRequest.SerializeToString,
-            deephaven_dot_proto_dot_config__pb2.AuthenticationConstantsResponse.FromString,
+            deephaven__core_dot_proto_dot_config__pb2.AuthenticationConstantsRequest.SerializeToString,
+            deephaven__core_dot_proto_dot_config__pb2.AuthenticationConstantsResponse.FromString,
             options,
             channel_credentials,
             insecure,
@@ -143,8 +143,8 @@ def GetConfigurationConstants(request,
             request,
             target,
             '/io.deephaven.proto.backplane.grpc.ConfigService/GetConfigurationConstants',
-            deephaven_dot_proto_dot_config__pb2.ConfigurationConstantsRequest.SerializeToString,
-            deephaven_dot_proto_dot_config__pb2.ConfigurationConstantsResponse.FromString,
+            deephaven__core_dot_proto_dot_config__pb2.ConfigurationConstantsRequest.SerializeToString,
+            deephaven__core_dot_proto_dot_config__pb2.ConfigurationConstantsResponse.FromString,
             options,
             channel_credentials,
             insecure,
diff --git a/py/client/deephaven_core/proto/console_pb2.py b/py/client/deephaven_core/proto/console_pb2.py
new file mode 100644
index 00000000000..83ace62055f
--- /dev/null
+++ b/py/client/deephaven_core/proto/console_pb2.py
@@ -0,0 +1,195 @@
+# -*- coding: utf-8 -*-
+# Generated by the protocol buffer compiler.  DO NOT EDIT!
+# source: deephaven_core/proto/console.proto
+# Protobuf Python Version: 5.26.1
+"""Generated protocol buffer code."""
+from google.protobuf import descriptor as _descriptor
+from google.protobuf import descriptor_pool as _descriptor_pool
+from google.protobuf import symbol_database as _symbol_database
+from google.protobuf.internal import builder as _builder
+# @@protoc_insertion_point(imports)
+
+_sym_db = _symbol_database.Default()
+
+
+from deephaven_core.proto import ticket_pb2 as deephaven__core_dot_proto_dot_ticket__pb2
+from deephaven_core.proto import application_pb2 as deephaven__core_dot_proto_dot_application__pb2
+
+
+DESCRIPTOR = _descriptor_pool.Default().AddSerializedFile(b'\n\"deephaven_core/proto/console.proto\x12(io.deephaven.proto.backplane.script.grpc\x1a!deephaven_core/proto/ticket.proto\x1a&deephaven_core/proto/application.proto\"\x18\n\x16GetConsoleTypesRequest\"0\n\x17GetConsoleTypesResponse\x12\x15\n\rconsole_types\x18\x01 \x03(\t\"i\n\x13StartConsoleRequest\x12<\n\tresult_id\x18\x01 \x01(\x0b\x32).io.deephaven.proto.backplane.grpc.Ticket\x12\x14\n\x0csession_type\x18\x02 \x01(\t\"T\n\x14StartConsoleResponse\x12<\n\tresult_id\x18\x01 \x01(\x0b\x32).io.deephaven.proto.backplane.grpc.Ticket\"\x14\n\x12GetHeapInfoRequest\"`\n\x13GetHeapInfoResponse\x12\x16\n\nmax_memory\x18\x01 \x01(\x03\x42\x02\x30\x01\x12\x18\n\x0ctotal_memory\x18\x02 \x01(\x03\x42\x02\x30\x01\x12\x17\n\x0b\x66ree_memory\x18\x03 \x01(\x03\x42\x02\x30\x01\"M\n\x16LogSubscriptionRequest\x12#\n\x17last_seen_log_timestamp\x18\x01 \x01(\x03\x42\x02\x30\x01\x12\x0e\n\x06levels\x18\x02 \x03(\t\"S\n\x13LogSubscriptionData\x12\x12\n\x06micros\x18\x01 \x01(\x03\x42\x02\x30\x01\x12\x11\n\tlog_level\x18\x02 \x01(\t\x12\x0f\n\x07message\x18\x03 \x01(\tJ\x04\x08\x04\x10\x05\"j\n\x15\x45xecuteCommandRequest\x12=\n\nconsole_id\x18\x01 \x01(\x0b\x32).io.deephaven.proto.backplane.grpc.Ticket\x12\x0c\n\x04\x63ode\x18\x03 \x01(\tJ\x04\x08\x02\x10\x03\"w\n\x16\x45xecuteCommandResponse\x12\x15\n\rerror_message\x18\x01 \x01(\t\x12\x46\n\x07\x63hanges\x18\x02 \x01(\x0b\x32\x35.io.deephaven.proto.backplane.grpc.FieldsChangeUpdate\"\xb5\x01\n\x1a\x42indTableToVariableRequest\x12=\n\nconsole_id\x18\x01 \x01(\x0b\x32).io.deephaven.proto.backplane.grpc.Ticket\x12\x15\n\rvariable_name\x18\x03 \x01(\t\x12;\n\x08table_id\x18\x04 \x01(\x0b\x32).io.deephaven.proto.backplane.grpc.TicketJ\x04\x08\x02\x10\x03\"\x1d\n\x1b\x42indTableToVariableResponse\"\x94\x01\n\x14\x43\x61ncelCommandRequest\x12=\n\nconsole_id\x18\x01 \x01(\x0b\x32).io.deephaven.proto.backplane.grpc.Ticket\x12=\n\ncommand_id\x18\x02 \x01(\x0b\x32).io.deephaven.proto.backplane.grpc.Ticket\"\x17\n\x15\x43\x61ncelCommandResponse\"n\n\x19\x43\x61ncelAutoCompleteRequest\x12=\n\nconsole_id\x18\x01 \x01(\x0b\x32).io.deephaven.proto.backplane.grpc.Ticket\x12\x12\n\nrequest_id\x18\x02 \x01(\x05\"\x1c\n\x1a\x43\x61ncelAutoCompleteResponse\"\xf1\x05\n\x13\x41utoCompleteRequest\x12=\n\nconsole_id\x18\x05 \x01(\x0b\x32).io.deephaven.proto.backplane.grpc.Ticket\x12\x12\n\nrequest_id\x18\x06 \x01(\x05\x12V\n\ropen_document\x18\x01 \x01(\x0b\x32=.io.deephaven.proto.backplane.script.grpc.OpenDocumentRequestH\x00\x12Z\n\x0f\x63hange_document\x18\x02 \x01(\x0b\x32?.io.deephaven.proto.backplane.script.grpc.ChangeDocumentRequestH\x00\x12\x63\n\x14get_completion_items\x18\x03 \x01(\x0b\x32\x43.io.deephaven.proto.backplane.script.grpc.GetCompletionItemsRequestH\x00\x12_\n\x12get_signature_help\x18\x07 \x01(\x0b\x32\x41.io.deephaven.proto.backplane.script.grpc.GetSignatureHelpRequestH\x00\x12N\n\tget_hover\x18\x08 \x01(\x0b\x32\x39.io.deephaven.proto.backplane.script.grpc.GetHoverRequestH\x00\x12X\n\x0eget_diagnostic\x18\t \x01(\x0b\x32>.io.deephaven.proto.backplane.script.grpc.GetDiagnosticRequestH\x00\x12X\n\x0e\x63lose_document\x18\x04 \x01(\x0b\x32>.io.deephaven.proto.backplane.script.grpc.CloseDocumentRequestH\x00\x42\t\n\x07request\"\x91\x04\n\x14\x41utoCompleteResponse\x12\x12\n\nrequest_id\x18\x02 \x01(\x05\x12\x0f\n\x07success\x18\x03 \x01(\x08\x12`\n\x10\x63ompletion_items\x18\x01 \x01(\x0b\x32\x44.io.deephaven.proto.backplane.script.grpc.GetCompletionItemsResponseH\x00\x12X\n\nsignatures\x18\x04 \x01(\x0b\x32\x42.io.deephaven.proto.backplane.script.grpc.GetSignatureHelpResponseH\x00\x12K\n\x05hover\x18\x05 \x01(\x0b\x32:.io.deephaven.proto.backplane.script.grpc.GetHoverResponseH\x00\x12Y\n\ndiagnostic\x18\x06 \x01(\x0b\x32\x43.io.deephaven.proto.backplane.script.grpc.GetPullDiagnosticResponseH\x00\x12\x64\n\x12\x64iagnostic_publish\x18\x07 \x01(\x0b\x32\x46.io.deephaven.proto.backplane.script.grpc.GetPublishDiagnosticResponseH\x00\x42\n\n\x08response\"\x15\n\x13\x42rowserNextResponse\"\xab\x01\n\x13OpenDocumentRequest\x12\x41\n\nconsole_id\x18\x01 \x01(\x0b\x32).io.deephaven.proto.backplane.grpc.TicketB\x02\x18\x01\x12Q\n\rtext_document\x18\x02 \x01(\x0b\x32:.io.deephaven.proto.backplane.script.grpc.TextDocumentItem\"S\n\x10TextDocumentItem\x12\x0b\n\x03uri\x18\x01 \x01(\t\x12\x13\n\x0blanguage_id\x18\x02 \x01(\t\x12\x0f\n\x07version\x18\x03 \x01(\x05\x12\x0c\n\x04text\x18\x04 \x01(\t\"\xbb\x01\n\x14\x43loseDocumentRequest\x12\x41\n\nconsole_id\x18\x01 \x01(\x0b\x32).io.deephaven.proto.backplane.grpc.TicketB\x02\x18\x01\x12`\n\rtext_document\x18\x02 \x01(\x0b\x32I.io.deephaven.proto.backplane.script.grpc.VersionedTextDocumentIdentifier\"\xc4\x03\n\x15\x43hangeDocumentRequest\x12\x41\n\nconsole_id\x18\x01 \x01(\x0b\x32).io.deephaven.proto.backplane.grpc.TicketB\x02\x18\x01\x12`\n\rtext_document\x18\x02 \x01(\x0b\x32I.io.deephaven.proto.backplane.script.grpc.VersionedTextDocumentIdentifier\x12w\n\x0f\x63ontent_changes\x18\x03 \x03(\x0b\x32^.io.deephaven.proto.backplane.script.grpc.ChangeDocumentRequest.TextDocumentContentChangeEvent\x1a\x8c\x01\n\x1eTextDocumentContentChangeEvent\x12\x46\n\x05range\x18\x01 \x01(\x0b\x32\x37.io.deephaven.proto.backplane.script.grpc.DocumentRange\x12\x14\n\x0crange_length\x18\x02 \x01(\x05\x12\x0c\n\x04text\x18\x03 \x01(\t\"\x93\x01\n\rDocumentRange\x12\x41\n\x05start\x18\x01 \x01(\x0b\x32\x32.io.deephaven.proto.backplane.script.grpc.Position\x12?\n\x03\x65nd\x18\x02 \x01(\x0b\x32\x32.io.deephaven.proto.backplane.script.grpc.Position\"?\n\x1fVersionedTextDocumentIdentifier\x12\x0b\n\x03uri\x18\x01 \x01(\t\x12\x0f\n\x07version\x18\x02 \x01(\x05\"+\n\x08Position\x12\x0c\n\x04line\x18\x01 \x01(\x05\x12\x11\n\tcharacter\x18\x02 \x01(\x05\",\n\rMarkupContent\x12\x0c\n\x04kind\x18\x01 \x01(\t\x12\r\n\x05value\x18\x02 \x01(\t\"\xec\x02\n\x19GetCompletionItemsRequest\x12\x41\n\nconsole_id\x18\x01 \x01(\x0b\x32).io.deephaven.proto.backplane.grpc.TicketB\x02\x18\x01\x12L\n\x07\x63ontext\x18\x02 \x01(\x0b\x32;.io.deephaven.proto.backplane.script.grpc.CompletionContext\x12`\n\rtext_document\x18\x03 \x01(\x0b\x32I.io.deephaven.proto.backplane.script.grpc.VersionedTextDocumentIdentifier\x12\x44\n\x08position\x18\x04 \x01(\x0b\x32\x32.io.deephaven.proto.backplane.script.grpc.Position\x12\x16\n\nrequest_id\x18\x05 \x01(\x05\x42\x02\x18\x01\"D\n\x11\x43ompletionContext\x12\x14\n\x0ctrigger_kind\x18\x01 \x01(\x05\x12\x19\n\x11trigger_character\x18\x02 \x01(\t\"\x92\x01\n\x1aGetCompletionItemsResponse\x12G\n\x05items\x18\x01 \x03(\x0b\x32\x38.io.deephaven.proto.backplane.script.grpc.CompletionItem\x12\x16\n\nrequest_id\x18\x02 \x01(\x05\x42\x02\x18\x01\x12\x13\n\x07success\x18\x03 \x01(\x08\x42\x02\x18\x01\"\xd2\x03\n\x0e\x43ompletionItem\x12\r\n\x05start\x18\x01 \x01(\x05\x12\x0e\n\x06length\x18\x02 \x01(\x05\x12\r\n\x05label\x18\x03 \x01(\t\x12\x0c\n\x04kind\x18\x04 \x01(\x05\x12\x0e\n\x06\x64\x65tail\x18\x05 \x01(\t\x12\x12\n\ndeprecated\x18\x07 \x01(\x08\x12\x11\n\tpreselect\x18\x08 \x01(\x08\x12\x45\n\ttext_edit\x18\t \x01(\x0b\x32\x32.io.deephaven.proto.backplane.script.grpc.TextEdit\x12\x11\n\tsort_text\x18\n \x01(\t\x12\x13\n\x0b\x66ilter_text\x18\x0b \x01(\t\x12\x1a\n\x12insert_text_format\x18\x0c \x01(\x05\x12Q\n\x15\x61\x64\x64itional_text_edits\x18\r \x03(\x0b\x32\x32.io.deephaven.proto.backplane.script.grpc.TextEdit\x12\x19\n\x11\x63ommit_characters\x18\x0e \x03(\t\x12N\n\rdocumentation\x18\x0f \x01(\x0b\x32\x37.io.deephaven.proto.backplane.script.grpc.MarkupContentJ\x04\x08\x06\x10\x07\"`\n\x08TextEdit\x12\x46\n\x05range\x18\x01 \x01(\x0b\x32\x37.io.deephaven.proto.backplane.script.grpc.DocumentRange\x12\x0c\n\x04text\x18\x02 \x01(\t\"\x92\x02\n\x17GetSignatureHelpRequest\x12O\n\x07\x63ontext\x18\x01 \x01(\x0b\x32>.io.deephaven.proto.backplane.script.grpc.SignatureHelpContext\x12`\n\rtext_document\x18\x02 \x01(\x0b\x32I.io.deephaven.proto.backplane.script.grpc.VersionedTextDocumentIdentifier\x12\x44\n\x08position\x18\x03 \x01(\x0b\x32\x32.io.deephaven.proto.backplane.script.grpc.Position\"\xdb\x01\n\x14SignatureHelpContext\x12\x14\n\x0ctrigger_kind\x18\x01 \x01(\x05\x12\x1e\n\x11trigger_character\x18\x02 \x01(\tH\x00\x88\x01\x01\x12\x14\n\x0cis_retrigger\x18\x03 \x01(\x08\x12\x61\n\x15\x61\x63tive_signature_help\x18\x04 \x01(\x0b\x32\x42.io.deephaven.proto.backplane.script.grpc.GetSignatureHelpResponseB\x14\n\x12_trigger_character\"\xd6\x01\n\x18GetSignatureHelpResponse\x12R\n\nsignatures\x18\x01 \x03(\x0b\x32>.io.deephaven.proto.backplane.script.grpc.SignatureInformation\x12\x1d\n\x10\x61\x63tive_signature\x18\x02 \x01(\x05H\x00\x88\x01\x01\x12\x1d\n\x10\x61\x63tive_parameter\x18\x03 \x01(\x05H\x01\x88\x01\x01\x42\x13\n\x11_active_signatureB\x13\n\x11_active_parameter\"\xfd\x01\n\x14SignatureInformation\x12\r\n\x05label\x18\x01 \x01(\t\x12N\n\rdocumentation\x18\x02 \x01(\x0b\x32\x37.io.deephaven.proto.backplane.script.grpc.MarkupContent\x12R\n\nparameters\x18\x03 \x03(\x0b\x32>.io.deephaven.proto.backplane.script.grpc.ParameterInformation\x12\x1d\n\x10\x61\x63tive_parameter\x18\x04 \x01(\x05H\x00\x88\x01\x01\x42\x13\n\x11_active_parameter\"u\n\x14ParameterInformation\x12\r\n\x05label\x18\x01 \x01(\t\x12N\n\rdocumentation\x18\x02 \x01(\x0b\x32\x37.io.deephaven.proto.backplane.script.grpc.MarkupContent\"\xb9\x01\n\x0fGetHoverRequest\x12`\n\rtext_document\x18\x01 \x01(\x0b\x32I.io.deephaven.proto.backplane.script.grpc.VersionedTextDocumentIdentifier\x12\x44\n\x08position\x18\x02 \x01(\x0b\x32\x32.io.deephaven.proto.backplane.script.grpc.Position\"\xa5\x01\n\x10GetHoverResponse\x12I\n\x08\x63ontents\x18\x01 \x01(\x0b\x32\x37.io.deephaven.proto.backplane.script.grpc.MarkupContent\x12\x46\n\x05range\x18\x02 \x01(\x0b\x32\x37.io.deephaven.proto.backplane.script.grpc.DocumentRange\"\xd8\x01\n\x14GetDiagnosticRequest\x12`\n\rtext_document\x18\x01 \x01(\x0b\x32I.io.deephaven.proto.backplane.script.grpc.VersionedTextDocumentIdentifier\x12\x17\n\nidentifier\x18\x02 \x01(\tH\x00\x88\x01\x01\x12\x1f\n\x12previous_result_id\x18\x03 \x01(\tH\x01\x88\x01\x01\x42\r\n\x0b_identifierB\x15\n\x13_previous_result_id\"\x94\x01\n\x19GetPullDiagnosticResponse\x12\x0c\n\x04kind\x18\x01 \x01(\t\x12\x16\n\tresult_id\x18\x02 \x01(\tH\x00\x88\x01\x01\x12\x43\n\x05items\x18\x03 \x03(\x0b\x32\x34.io.deephaven.proto.backplane.script.grpc.DiagnosticB\x0c\n\n_result_id\"\x98\x01\n\x1cGetPublishDiagnosticResponse\x12\x0b\n\x03uri\x18\x01 \x01(\t\x12\x14\n\x07version\x18\x02 \x01(\x05H\x00\x88\x01\x01\x12I\n\x0b\x64iagnostics\x18\x03 \x03(\x0b\x32\x34.io.deephaven.proto.backplane.script.grpc.DiagnosticB\n\n\x08_version\"\xa7\x05\n\nDiagnostic\x12\x46\n\x05range\x18\x01 \x01(\x0b\x32\x37.io.deephaven.proto.backplane.script.grpc.DocumentRange\x12Y\n\x08severity\x18\x02 \x01(\x0e\x32G.io.deephaven.proto.backplane.script.grpc.Diagnostic.DiagnosticSeverity\x12\x11\n\x04\x63ode\x18\x03 \x01(\tH\x00\x88\x01\x01\x12\x63\n\x10\x63ode_description\x18\x04 \x01(\x0b\x32\x44.io.deephaven.proto.backplane.script.grpc.Diagnostic.CodeDescriptionH\x01\x88\x01\x01\x12\x13\n\x06source\x18\x05 \x01(\tH\x02\x88\x01\x01\x12\x0f\n\x07message\x18\x06 \x01(\t\x12P\n\x04tags\x18\x07 \x03(\x0e\x32\x42.io.deephaven.proto.backplane.script.grpc.Diagnostic.DiagnosticTag\x12\x11\n\x04\x64\x61ta\x18\t \x01(\x0cH\x03\x88\x01\x01\x1a\x1f\n\x0f\x43odeDescription\x12\x0c\n\x04href\x18\x01 \x01(\t\"]\n\x12\x44iagnosticSeverity\x12\x14\n\x10NOT_SET_SEVERITY\x10\x00\x12\t\n\x05\x45RROR\x10\x01\x12\x0b\n\x07WARNING\x10\x02\x12\x0f\n\x0bINFORMATION\x10\x03\x12\x08\n\x04HINT\x10\x04\"A\n\rDiagnosticTag\x12\x0f\n\x0bNOT_SET_TAG\x10\x00\x12\x0f\n\x0bUNNECESSARY\x10\x01\x12\x0e\n\nDEPRECATED\x10\x02\x42\x07\n\x05_codeB\x13\n\x11_code_descriptionB\t\n\x07_sourceB\x07\n\x05_data\"\xe6\x30\n\x10\x46igureDescriptor\x12\x12\n\x05title\x18\x01 \x01(\tH\x00\x88\x01\x01\x12\x12\n\ntitle_font\x18\x02 \x01(\t\x12\x13\n\x0btitle_color\x18\x03 \x01(\t\x12\x1b\n\x0fupdate_interval\x18\x07 \x01(\x03\x42\x02\x30\x01\x12\x0c\n\x04\x63ols\x18\x08 \x01(\x05\x12\x0c\n\x04rows\x18\t \x01(\x05\x12Z\n\x06\x63harts\x18\n \x03(\x0b\x32J.io.deephaven.proto.backplane.script.grpc.FigureDescriptor.ChartDescriptor\x12\x0e\n\x06\x65rrors\x18\r \x03(\t\x1a\xce\x05\n\x0f\x43hartDescriptor\x12\x0f\n\x07\x63olspan\x18\x01 \x01(\x05\x12\x0f\n\x07rowspan\x18\x02 \x01(\x05\x12[\n\x06series\x18\x03 \x03(\x0b\x32K.io.deephaven.proto.backplane.script.grpc.FigureDescriptor.SeriesDescriptor\x12\x66\n\x0cmulti_series\x18\x04 \x03(\x0b\x32P.io.deephaven.proto.backplane.script.grpc.FigureDescriptor.MultiSeriesDescriptor\x12W\n\x04\x61xes\x18\x05 \x03(\x0b\x32I.io.deephaven.proto.backplane.script.grpc.FigureDescriptor.AxisDescriptor\x12h\n\nchart_type\x18\x06 \x01(\x0e\x32T.io.deephaven.proto.backplane.script.grpc.FigureDescriptor.ChartDescriptor.ChartType\x12\x12\n\x05title\x18\x07 \x01(\tH\x00\x88\x01\x01\x12\x12\n\ntitle_font\x18\x08 \x01(\t\x12\x13\n\x0btitle_color\x18\t \x01(\t\x12\x13\n\x0bshow_legend\x18\n \x01(\x08\x12\x13\n\x0blegend_font\x18\x0b \x01(\t\x12\x14\n\x0clegend_color\x18\x0c \x01(\t\x12\x0c\n\x04is3d\x18\r \x01(\x08\x12\x0e\n\x06\x63olumn\x18\x0e \x01(\x05\x12\x0b\n\x03row\x18\x0f \x01(\x05\"_\n\tChartType\x12\x06\n\x02XY\x10\x00\x12\x07\n\x03PIE\x10\x01\x12\x0c\n\x04OHLC\x10\x02\x1a\x02\x08\x01\x12\x0c\n\x08\x43\x41TEGORY\x10\x03\x12\x07\n\x03XYZ\x10\x04\x12\x0f\n\x0b\x43\x41TEGORY_3D\x10\x05\x12\x0b\n\x07TREEMAP\x10\x06\x42\x08\n\x06_title\x1a\xfe\x04\n\x10SeriesDescriptor\x12^\n\nplot_style\x18\x01 \x01(\x0e\x32J.io.deephaven.proto.backplane.script.grpc.FigureDescriptor.SeriesPlotStyle\x12\x0c\n\x04name\x18\x02 \x01(\t\x12\x1a\n\rlines_visible\x18\x03 \x01(\x08H\x00\x88\x01\x01\x12\x1b\n\x0eshapes_visible\x18\x04 \x01(\x08H\x01\x88\x01\x01\x12\x18\n\x10gradient_visible\x18\x05 \x01(\x08\x12\x12\n\nline_color\x18\x06 \x01(\t\x12\x1f\n\x12point_label_format\x18\x08 \x01(\tH\x02\x88\x01\x01\x12\x1f\n\x12x_tool_tip_pattern\x18\t \x01(\tH\x03\x88\x01\x01\x12\x1f\n\x12y_tool_tip_pattern\x18\n \x01(\tH\x04\x88\x01\x01\x12\x13\n\x0bshape_label\x18\x0b \x01(\t\x12\x17\n\nshape_size\x18\x0c \x01(\x01H\x05\x88\x01\x01\x12\x13\n\x0bshape_color\x18\r \x01(\t\x12\r\n\x05shape\x18\x0e \x01(\t\x12\x61\n\x0c\x64\x61ta_sources\x18\x0f \x03(\x0b\x32K.io.deephaven.proto.backplane.script.grpc.FigureDescriptor.SourceDescriptorB\x10\n\x0e_lines_visibleB\x11\n\x0f_shapes_visibleB\x15\n\x13_point_label_formatB\x15\n\x13_x_tool_tip_patternB\x15\n\x13_y_tool_tip_patternB\r\n\x0b_shape_sizeJ\x04\x08\x07\x10\x08\x1a\xec\n\n\x15MultiSeriesDescriptor\x12^\n\nplot_style\x18\x01 \x01(\x0e\x32J.io.deephaven.proto.backplane.script.grpc.FigureDescriptor.SeriesPlotStyle\x12\x0c\n\x04name\x18\x02 \x01(\t\x12\x63\n\nline_color\x18\x03 \x01(\x0b\x32O.io.deephaven.proto.backplane.script.grpc.FigureDescriptor.StringMapWithDefault\x12\x64\n\x0bpoint_color\x18\x04 \x01(\x0b\x32O.io.deephaven.proto.backplane.script.grpc.FigureDescriptor.StringMapWithDefault\x12\x64\n\rlines_visible\x18\x05 \x01(\x0b\x32M.io.deephaven.proto.backplane.script.grpc.FigureDescriptor.BoolMapWithDefault\x12\x65\n\x0epoints_visible\x18\x06 \x01(\x0b\x32M.io.deephaven.proto.backplane.script.grpc.FigureDescriptor.BoolMapWithDefault\x12g\n\x10gradient_visible\x18\x07 \x01(\x0b\x32M.io.deephaven.proto.backplane.script.grpc.FigureDescriptor.BoolMapWithDefault\x12k\n\x12point_label_format\x18\x08 \x01(\x0b\x32O.io.deephaven.proto.backplane.script.grpc.FigureDescriptor.StringMapWithDefault\x12k\n\x12x_tool_tip_pattern\x18\t \x01(\x0b\x32O.io.deephaven.proto.backplane.script.grpc.FigureDescriptor.StringMapWithDefault\x12k\n\x12y_tool_tip_pattern\x18\n \x01(\x0b\x32O.io.deephaven.proto.backplane.script.grpc.FigureDescriptor.StringMapWithDefault\x12\x64\n\x0bpoint_label\x18\x0b \x01(\x0b\x32O.io.deephaven.proto.backplane.script.grpc.FigureDescriptor.StringMapWithDefault\x12\x63\n\npoint_size\x18\x0c \x01(\x0b\x32O.io.deephaven.proto.backplane.script.grpc.FigureDescriptor.DoubleMapWithDefault\x12\x64\n\x0bpoint_shape\x18\r \x01(\x0b\x32O.io.deephaven.proto.backplane.script.grpc.FigureDescriptor.StringMapWithDefault\x12l\n\x0c\x64\x61ta_sources\x18\x0e \x03(\x0b\x32V.io.deephaven.proto.backplane.script.grpc.FigureDescriptor.MultiSeriesSourceDescriptor\x1a\x64\n\x14StringMapWithDefault\x12\x1b\n\x0e\x64\x65\x66\x61ult_string\x18\x01 \x01(\tH\x00\x88\x01\x01\x12\x0c\n\x04keys\x18\x02 \x03(\t\x12\x0e\n\x06values\x18\x03 \x03(\tB\x11\n\x0f_default_string\x1a\x64\n\x14\x44oubleMapWithDefault\x12\x1b\n\x0e\x64\x65\x66\x61ult_double\x18\x01 \x01(\x01H\x00\x88\x01\x01\x12\x0c\n\x04keys\x18\x02 \x03(\t\x12\x0e\n\x06values\x18\x03 \x03(\x01\x42\x11\n\x0f_default_double\x1a^\n\x12\x42oolMapWithDefault\x12\x19\n\x0c\x64\x65\x66\x61ult_bool\x18\x01 \x01(\x08H\x00\x88\x01\x01\x12\x0c\n\x04keys\x18\x02 \x03(\t\x12\x0e\n\x06values\x18\x03 \x03(\x08\x42\x0f\n\r_default_bool\x1a\xa6\x08\n\x0e\x41xisDescriptor\x12\n\n\x02id\x18\x01 \x01(\t\x12m\n\x0b\x66ormat_type\x18\x02 \x01(\x0e\x32X.io.deephaven.proto.backplane.script.grpc.FigureDescriptor.AxisDescriptor.AxisFormatType\x12`\n\x04type\x18\x03 \x01(\x0e\x32R.io.deephaven.proto.backplane.script.grpc.FigureDescriptor.AxisDescriptor.AxisType\x12h\n\x08position\x18\x04 \x01(\x0e\x32V.io.deephaven.proto.backplane.script.grpc.FigureDescriptor.AxisDescriptor.AxisPosition\x12\x0b\n\x03log\x18\x05 \x01(\x08\x12\r\n\x05label\x18\x06 \x01(\t\x12\x12\n\nlabel_font\x18\x07 \x01(\t\x12\x12\n\nticks_font\x18\x08 \x01(\t\x12\x1b\n\x0e\x66ormat_pattern\x18\t \x01(\tH\x00\x88\x01\x01\x12\r\n\x05\x63olor\x18\n \x01(\t\x12\x11\n\tmin_range\x18\x0b \x01(\x01\x12\x11\n\tmax_range\x18\x0c \x01(\x01\x12\x1b\n\x13minor_ticks_visible\x18\r \x01(\x08\x12\x1b\n\x13major_ticks_visible\x18\x0e \x01(\x08\x12\x18\n\x10minor_tick_count\x18\x0f \x01(\x05\x12$\n\x17gap_between_major_ticks\x18\x10 \x01(\x01H\x01\x88\x01\x01\x12\x1c\n\x14major_tick_locations\x18\x11 \x03(\x01\x12\x18\n\x10tick_label_angle\x18\x12 \x01(\x01\x12\x0e\n\x06invert\x18\x13 \x01(\x08\x12\x14\n\x0cis_time_axis\x18\x14 \x01(\x08\x12{\n\x1c\x62usiness_calendar_descriptor\x18\x15 \x01(\x0b\x32U.io.deephaven.proto.backplane.script.grpc.FigureDescriptor.BusinessCalendarDescriptor\"*\n\x0e\x41xisFormatType\x12\x0c\n\x08\x43\x41TEGORY\x10\x00\x12\n\n\x06NUMBER\x10\x01\"C\n\x08\x41xisType\x12\x05\n\x01X\x10\x00\x12\x05\n\x01Y\x10\x01\x12\t\n\x05SHAPE\x10\x02\x12\x08\n\x04SIZE\x10\x03\x12\t\n\x05LABEL\x10\x04\x12\t\n\x05\x43OLOR\x10\x05\"B\n\x0c\x41xisPosition\x12\x07\n\x03TOP\x10\x00\x12\n\n\x06\x42OTTOM\x10\x01\x12\x08\n\x04LEFT\x10\x02\x12\t\n\x05RIGHT\x10\x03\x12\x08\n\x04NONE\x10\x04\x42\x11\n\x0f_format_patternB\x1a\n\x18_gap_between_major_ticks\x1a\xf0\x06\n\x1a\x42usinessCalendarDescriptor\x12\x0c\n\x04name\x18\x01 \x01(\t\x12\x11\n\ttime_zone\x18\x02 \x01(\t\x12v\n\rbusiness_days\x18\x03 \x03(\x0e\x32_.io.deephaven.proto.backplane.script.grpc.FigureDescriptor.BusinessCalendarDescriptor.DayOfWeek\x12~\n\x10\x62usiness_periods\x18\x04 \x03(\x0b\x32\x64.io.deephaven.proto.backplane.script.grpc.FigureDescriptor.BusinessCalendarDescriptor.BusinessPeriod\x12o\n\x08holidays\x18\x05 \x03(\x0b\x32].io.deephaven.proto.backplane.script.grpc.FigureDescriptor.BusinessCalendarDescriptor.Holiday\x1a-\n\x0e\x42usinessPeriod\x12\x0c\n\x04open\x18\x01 \x01(\t\x12\r\n\x05\x63lose\x18\x02 \x01(\t\x1a\xf8\x01\n\x07Holiday\x12m\n\x04\x64\x61te\x18\x01 \x01(\x0b\x32_.io.deephaven.proto.backplane.script.grpc.FigureDescriptor.BusinessCalendarDescriptor.LocalDate\x12~\n\x10\x62usiness_periods\x18\x02 \x03(\x0b\x32\x64.io.deephaven.proto.backplane.script.grpc.FigureDescriptor.BusinessCalendarDescriptor.BusinessPeriod\x1a\x35\n\tLocalDate\x12\x0c\n\x04year\x18\x01 \x01(\x05\x12\r\n\x05month\x18\x02 \x01(\x05\x12\x0b\n\x03\x64\x61y\x18\x03 \x01(\x05\"g\n\tDayOfWeek\x12\n\n\x06SUNDAY\x10\x00\x12\n\n\x06MONDAY\x10\x01\x12\x0b\n\x07TUESDAY\x10\x02\x12\r\n\tWEDNESDAY\x10\x03\x12\x0c\n\x08THURSDAY\x10\x04\x12\n\n\x06\x46RIDAY\x10\x05\x12\x0c\n\x08SATURDAY\x10\x06\x1a\xb6\x01\n\x1bMultiSeriesSourceDescriptor\x12\x0f\n\x07\x61xis_id\x18\x01 \x01(\t\x12S\n\x04type\x18\x02 \x01(\x0e\x32\x45.io.deephaven.proto.backplane.script.grpc.FigureDescriptor.SourceType\x12\x1c\n\x14partitioned_table_id\x18\x03 \x01(\x05\x12\x13\n\x0b\x63olumn_name\x18\x04 \x01(\t\x1a\xb4\x02\n\x10SourceDescriptor\x12\x0f\n\x07\x61xis_id\x18\x01 \x01(\t\x12S\n\x04type\x18\x02 \x01(\x0e\x32\x45.io.deephaven.proto.backplane.script.grpc.FigureDescriptor.SourceType\x12\x10\n\x08table_id\x18\x03 \x01(\x05\x12\x1c\n\x14partitioned_table_id\x18\x04 \x01(\x05\x12\x13\n\x0b\x63olumn_name\x18\x05 \x01(\t\x12\x13\n\x0b\x63olumn_type\x18\x06 \x01(\t\x12`\n\tone_click\x18\x07 \x01(\x0b\x32M.io.deephaven.proto.backplane.script.grpc.FigureDescriptor.OneClickDescriptor\x1a\x63\n\x12OneClickDescriptor\x12\x0f\n\x07\x63olumns\x18\x01 \x03(\t\x12\x14\n\x0c\x63olumn_types\x18\x02 \x03(\t\x12&\n\x1erequire_all_filters_to_display\x18\x03 \x01(\x08\"\xa6\x01\n\x0fSeriesPlotStyle\x12\x07\n\x03\x42\x41R\x10\x00\x12\x0f\n\x0bSTACKED_BAR\x10\x01\x12\x08\n\x04LINE\x10\x02\x12\x08\n\x04\x41REA\x10\x03\x12\x10\n\x0cSTACKED_AREA\x10\x04\x12\x07\n\x03PIE\x10\x05\x12\r\n\tHISTOGRAM\x10\x06\x12\x08\n\x04OHLC\x10\x07\x12\x0b\n\x07SCATTER\x10\x08\x12\x08\n\x04STEP\x10\t\x12\r\n\tERROR_BAR\x10\n\x12\x0b\n\x07TREEMAP\x10\x0b\"\xd2\x01\n\nSourceType\x12\x05\n\x01X\x10\x00\x12\x05\n\x01Y\x10\x01\x12\x05\n\x01Z\x10\x02\x12\t\n\x05X_LOW\x10\x03\x12\n\n\x06X_HIGH\x10\x04\x12\t\n\x05Y_LOW\x10\x05\x12\n\n\x06Y_HIGH\x10\x06\x12\x08\n\x04TIME\x10\x07\x12\x08\n\x04OPEN\x10\x08\x12\x08\n\x04HIGH\x10\t\x12\x07\n\x03LOW\x10\n\x12\t\n\x05\x43LOSE\x10\x0b\x12\t\n\x05SHAPE\x10\x0c\x12\x08\n\x04SIZE\x10\r\x12\t\n\x05LABEL\x10\x0e\x12\t\n\x05\x43OLOR\x10\x0f\x12\n\n\x06PARENT\x10\x10\x12\x0e\n\nHOVER_TEXT\x10\x11\x12\x08\n\x04TEXT\x10\x12\x42\x08\n\x06_titleJ\x04\x08\x0b\x10\x0cJ\x04\x08\x0c\x10\r2\xb2\r\n\x0e\x43onsoleService\x12\x98\x01\n\x0fGetConsoleTypes\x12@.io.deephaven.proto.backplane.script.grpc.GetConsoleTypesRequest\x1a\x41.io.deephaven.proto.backplane.script.grpc.GetConsoleTypesResponse\"\x00\x12\x8f\x01\n\x0cStartConsole\x12=.io.deephaven.proto.backplane.script.grpc.StartConsoleRequest\x1a>.io.deephaven.proto.backplane.script.grpc.StartConsoleResponse\"\x00\x12\x8c\x01\n\x0bGetHeapInfo\x12<.io.deephaven.proto.backplane.script.grpc.GetHeapInfoRequest\x1a=.io.deephaven.proto.backplane.script.grpc.GetHeapInfoResponse\"\x00\x12\x96\x01\n\x0fSubscribeToLogs\x12@.io.deephaven.proto.backplane.script.grpc.LogSubscriptionRequest\x1a=.io.deephaven.proto.backplane.script.grpc.LogSubscriptionData\"\x00\x30\x01\x12\x95\x01\n\x0e\x45xecuteCommand\x12?.io.deephaven.proto.backplane.script.grpc.ExecuteCommandRequest\x1a@.io.deephaven.proto.backplane.script.grpc.ExecuteCommandResponse\"\x00\x12\x92\x01\n\rCancelCommand\x12>.io.deephaven.proto.backplane.script.grpc.CancelCommandRequest\x1a?.io.deephaven.proto.backplane.script.grpc.CancelCommandResponse\"\x00\x12\xa4\x01\n\x13\x42indTableToVariable\x12\x44.io.deephaven.proto.backplane.script.grpc.BindTableToVariableRequest\x1a\x45.io.deephaven.proto.backplane.script.grpc.BindTableToVariableResponse\"\x00\x12\x99\x01\n\x12\x41utoCompleteStream\x12=.io.deephaven.proto.backplane.script.grpc.AutoCompleteRequest\x1a>.io.deephaven.proto.backplane.script.grpc.AutoCompleteResponse\"\x00(\x01\x30\x01\x12\xa1\x01\n\x12\x43\x61ncelAutoComplete\x12\x43.io.deephaven.proto.backplane.script.grpc.CancelAutoCompleteRequest\x1a\x44.io.deephaven.proto.backplane.script.grpc.CancelAutoCompleteResponse\"\x00\x12\x9b\x01\n\x16OpenAutoCompleteStream\x12=.io.deephaven.proto.backplane.script.grpc.AutoCompleteRequest\x1a>.io.deephaven.proto.backplane.script.grpc.AutoCompleteResponse\"\x00\x30\x01\x12\x98\x01\n\x16NextAutoCompleteStream\x12=.io.deephaven.proto.backplane.script.grpc.AutoCompleteRequest\x1a=.io.deephaven.proto.backplane.script.grpc.BrowserNextResponse\"\x00\x42\x43H\x01P\x01Z=github.com/deephaven/deephaven-core/go/internal/proto/consoleb\x06proto3')
+
+_globals = globals()
+_builder.BuildMessageAndEnumDescriptors(DESCRIPTOR, _globals)
+_builder.BuildTopDescriptorsAndMessages(DESCRIPTOR, 'deephaven_core.proto.console_pb2', _globals)
+if not _descriptor._USE_C_DESCRIPTORS:
+  _globals['DESCRIPTOR']._loaded_options = None
+  _globals['DESCRIPTOR']._serialized_options = b'H\001P\001Z=github.com/deephaven/deephaven-core/go/internal/proto/console'
+  _globals['_GETHEAPINFORESPONSE'].fields_by_name['max_memory']._loaded_options = None
+  _globals['_GETHEAPINFORESPONSE'].fields_by_name['max_memory']._serialized_options = b'0\001'
+  _globals['_GETHEAPINFORESPONSE'].fields_by_name['total_memory']._loaded_options = None
+  _globals['_GETHEAPINFORESPONSE'].fields_by_name['total_memory']._serialized_options = b'0\001'
+  _globals['_GETHEAPINFORESPONSE'].fields_by_name['free_memory']._loaded_options = None
+  _globals['_GETHEAPINFORESPONSE'].fields_by_name['free_memory']._serialized_options = b'0\001'
+  _globals['_LOGSUBSCRIPTIONREQUEST'].fields_by_name['last_seen_log_timestamp']._loaded_options = None
+  _globals['_LOGSUBSCRIPTIONREQUEST'].fields_by_name['last_seen_log_timestamp']._serialized_options = b'0\001'
+  _globals['_LOGSUBSCRIPTIONDATA'].fields_by_name['micros']._loaded_options = None
+  _globals['_LOGSUBSCRIPTIONDATA'].fields_by_name['micros']._serialized_options = b'0\001'
+  _globals['_OPENDOCUMENTREQUEST'].fields_by_name['console_id']._loaded_options = None
+  _globals['_OPENDOCUMENTREQUEST'].fields_by_name['console_id']._serialized_options = b'\030\001'
+  _globals['_CLOSEDOCUMENTREQUEST'].fields_by_name['console_id']._loaded_options = None
+  _globals['_CLOSEDOCUMENTREQUEST'].fields_by_name['console_id']._serialized_options = b'\030\001'
+  _globals['_CHANGEDOCUMENTREQUEST'].fields_by_name['console_id']._loaded_options = None
+  _globals['_CHANGEDOCUMENTREQUEST'].fields_by_name['console_id']._serialized_options = b'\030\001'
+  _globals['_GETCOMPLETIONITEMSREQUEST'].fields_by_name['console_id']._loaded_options = None
+  _globals['_GETCOMPLETIONITEMSREQUEST'].fields_by_name['console_id']._serialized_options = b'\030\001'
+  _globals['_GETCOMPLETIONITEMSREQUEST'].fields_by_name['request_id']._loaded_options = None
+  _globals['_GETCOMPLETIONITEMSREQUEST'].fields_by_name['request_id']._serialized_options = b'\030\001'
+  _globals['_GETCOMPLETIONITEMSRESPONSE'].fields_by_name['request_id']._loaded_options = None
+  _globals['_GETCOMPLETIONITEMSRESPONSE'].fields_by_name['request_id']._serialized_options = b'\030\001'
+  _globals['_GETCOMPLETIONITEMSRESPONSE'].fields_by_name['success']._loaded_options = None
+  _globals['_GETCOMPLETIONITEMSRESPONSE'].fields_by_name['success']._serialized_options = b'\030\001'
+  _globals['_FIGUREDESCRIPTOR_CHARTDESCRIPTOR_CHARTTYPE'].values_by_name["OHLC"]._loaded_options = None
+  _globals['_FIGUREDESCRIPTOR_CHARTDESCRIPTOR_CHARTTYPE'].values_by_name["OHLC"]._serialized_options = b'\010\001'
+  _globals['_FIGUREDESCRIPTOR'].fields_by_name['update_interval']._loaded_options = None
+  _globals['_FIGUREDESCRIPTOR'].fields_by_name['update_interval']._serialized_options = b'0\001'
+  _globals['_GETCONSOLETYPESREQUEST']._serialized_start=155
+  _globals['_GETCONSOLETYPESREQUEST']._serialized_end=179
+  _globals['_GETCONSOLETYPESRESPONSE']._serialized_start=181
+  _globals['_GETCONSOLETYPESRESPONSE']._serialized_end=229
+  _globals['_STARTCONSOLEREQUEST']._serialized_start=231
+  _globals['_STARTCONSOLEREQUEST']._serialized_end=336
+  _globals['_STARTCONSOLERESPONSE']._serialized_start=338
+  _globals['_STARTCONSOLERESPONSE']._serialized_end=422
+  _globals['_GETHEAPINFOREQUEST']._serialized_start=424
+  _globals['_GETHEAPINFOREQUEST']._serialized_end=444
+  _globals['_GETHEAPINFORESPONSE']._serialized_start=446
+  _globals['_GETHEAPINFORESPONSE']._serialized_end=542
+  _globals['_LOGSUBSCRIPTIONREQUEST']._serialized_start=544
+  _globals['_LOGSUBSCRIPTIONREQUEST']._serialized_end=621
+  _globals['_LOGSUBSCRIPTIONDATA']._serialized_start=623
+  _globals['_LOGSUBSCRIPTIONDATA']._serialized_end=706
+  _globals['_EXECUTECOMMANDREQUEST']._serialized_start=708
+  _globals['_EXECUTECOMMANDREQUEST']._serialized_end=814
+  _globals['_EXECUTECOMMANDRESPONSE']._serialized_start=816
+  _globals['_EXECUTECOMMANDRESPONSE']._serialized_end=935
+  _globals['_BINDTABLETOVARIABLEREQUEST']._serialized_start=938
+  _globals['_BINDTABLETOVARIABLEREQUEST']._serialized_end=1119
+  _globals['_BINDTABLETOVARIABLERESPONSE']._serialized_start=1121
+  _globals['_BINDTABLETOVARIABLERESPONSE']._serialized_end=1150
+  _globals['_CANCELCOMMANDREQUEST']._serialized_start=1153
+  _globals['_CANCELCOMMANDREQUEST']._serialized_end=1301
+  _globals['_CANCELCOMMANDRESPONSE']._serialized_start=1303
+  _globals['_CANCELCOMMANDRESPONSE']._serialized_end=1326
+  _globals['_CANCELAUTOCOMPLETEREQUEST']._serialized_start=1328
+  _globals['_CANCELAUTOCOMPLETEREQUEST']._serialized_end=1438
+  _globals['_CANCELAUTOCOMPLETERESPONSE']._serialized_start=1440
+  _globals['_CANCELAUTOCOMPLETERESPONSE']._serialized_end=1468
+  _globals['_AUTOCOMPLETEREQUEST']._serialized_start=1471
+  _globals['_AUTOCOMPLETEREQUEST']._serialized_end=2224
+  _globals['_AUTOCOMPLETERESPONSE']._serialized_start=2227
+  _globals['_AUTOCOMPLETERESPONSE']._serialized_end=2756
+  _globals['_BROWSERNEXTRESPONSE']._serialized_start=2758
+  _globals['_BROWSERNEXTRESPONSE']._serialized_end=2779
+  _globals['_OPENDOCUMENTREQUEST']._serialized_start=2782
+  _globals['_OPENDOCUMENTREQUEST']._serialized_end=2953
+  _globals['_TEXTDOCUMENTITEM']._serialized_start=2955
+  _globals['_TEXTDOCUMENTITEM']._serialized_end=3038
+  _globals['_CLOSEDOCUMENTREQUEST']._serialized_start=3041
+  _globals['_CLOSEDOCUMENTREQUEST']._serialized_end=3228
+  _globals['_CHANGEDOCUMENTREQUEST']._serialized_start=3231
+  _globals['_CHANGEDOCUMENTREQUEST']._serialized_end=3683
+  _globals['_CHANGEDOCUMENTREQUEST_TEXTDOCUMENTCONTENTCHANGEEVENT']._serialized_start=3543
+  _globals['_CHANGEDOCUMENTREQUEST_TEXTDOCUMENTCONTENTCHANGEEVENT']._serialized_end=3683
+  _globals['_DOCUMENTRANGE']._serialized_start=3686
+  _globals['_DOCUMENTRANGE']._serialized_end=3833
+  _globals['_VERSIONEDTEXTDOCUMENTIDENTIFIER']._serialized_start=3835
+  _globals['_VERSIONEDTEXTDOCUMENTIDENTIFIER']._serialized_end=3898
+  _globals['_POSITION']._serialized_start=3900
+  _globals['_POSITION']._serialized_end=3943
+  _globals['_MARKUPCONTENT']._serialized_start=3945
+  _globals['_MARKUPCONTENT']._serialized_end=3989
+  _globals['_GETCOMPLETIONITEMSREQUEST']._serialized_start=3992
+  _globals['_GETCOMPLETIONITEMSREQUEST']._serialized_end=4356
+  _globals['_COMPLETIONCONTEXT']._serialized_start=4358
+  _globals['_COMPLETIONCONTEXT']._serialized_end=4426
+  _globals['_GETCOMPLETIONITEMSRESPONSE']._serialized_start=4429
+  _globals['_GETCOMPLETIONITEMSRESPONSE']._serialized_end=4575
+  _globals['_COMPLETIONITEM']._serialized_start=4578
+  _globals['_COMPLETIONITEM']._serialized_end=5044
+  _globals['_TEXTEDIT']._serialized_start=5046
+  _globals['_TEXTEDIT']._serialized_end=5142
+  _globals['_GETSIGNATUREHELPREQUEST']._serialized_start=5145
+  _globals['_GETSIGNATUREHELPREQUEST']._serialized_end=5419
+  _globals['_SIGNATUREHELPCONTEXT']._serialized_start=5422
+  _globals['_SIGNATUREHELPCONTEXT']._serialized_end=5641
+  _globals['_GETSIGNATUREHELPRESPONSE']._serialized_start=5644
+  _globals['_GETSIGNATUREHELPRESPONSE']._serialized_end=5858
+  _globals['_SIGNATUREINFORMATION']._serialized_start=5861
+  _globals['_SIGNATUREINFORMATION']._serialized_end=6114
+  _globals['_PARAMETERINFORMATION']._serialized_start=6116
+  _globals['_PARAMETERINFORMATION']._serialized_end=6233
+  _globals['_GETHOVERREQUEST']._serialized_start=6236
+  _globals['_GETHOVERREQUEST']._serialized_end=6421
+  _globals['_GETHOVERRESPONSE']._serialized_start=6424
+  _globals['_GETHOVERRESPONSE']._serialized_end=6589
+  _globals['_GETDIAGNOSTICREQUEST']._serialized_start=6592
+  _globals['_GETDIAGNOSTICREQUEST']._serialized_end=6808
+  _globals['_GETPULLDIAGNOSTICRESPONSE']._serialized_start=6811
+  _globals['_GETPULLDIAGNOSTICRESPONSE']._serialized_end=6959
+  _globals['_GETPUBLISHDIAGNOSTICRESPONSE']._serialized_start=6962
+  _globals['_GETPUBLISHDIAGNOSTICRESPONSE']._serialized_end=7114
+  _globals['_DIAGNOSTIC']._serialized_start=7117
+  _globals['_DIAGNOSTIC']._serialized_end=7796
+  _globals['_DIAGNOSTIC_CODEDESCRIPTION']._serialized_start=7553
+  _globals['_DIAGNOSTIC_CODEDESCRIPTION']._serialized_end=7584
+  _globals['_DIAGNOSTIC_DIAGNOSTICSEVERITY']._serialized_start=7586
+  _globals['_DIAGNOSTIC_DIAGNOSTICSEVERITY']._serialized_end=7679
+  _globals['_DIAGNOSTIC_DIAGNOSTICTAG']._serialized_start=7681
+  _globals['_DIAGNOSTIC_DIAGNOSTICTAG']._serialized_end=7746
+  _globals['_FIGUREDESCRIPTOR']._serialized_start=7799
+  _globals['_FIGUREDESCRIPTOR']._serialized_end=14045
+  _globals['_FIGUREDESCRIPTOR_CHARTDESCRIPTOR']._serialized_start=8046
+  _globals['_FIGUREDESCRIPTOR_CHARTDESCRIPTOR']._serialized_end=8764
+  _globals['_FIGUREDESCRIPTOR_CHARTDESCRIPTOR_CHARTTYPE']._serialized_start=8659
+  _globals['_FIGUREDESCRIPTOR_CHARTDESCRIPTOR_CHARTTYPE']._serialized_end=8754
+  _globals['_FIGUREDESCRIPTOR_SERIESDESCRIPTOR']._serialized_start=8767
+  _globals['_FIGUREDESCRIPTOR_SERIESDESCRIPTOR']._serialized_end=9405
+  _globals['_FIGUREDESCRIPTOR_MULTISERIESDESCRIPTOR']._serialized_start=9408
+  _globals['_FIGUREDESCRIPTOR_MULTISERIESDESCRIPTOR']._serialized_end=10796
+  _globals['_FIGUREDESCRIPTOR_STRINGMAPWITHDEFAULT']._serialized_start=10798
+  _globals['_FIGUREDESCRIPTOR_STRINGMAPWITHDEFAULT']._serialized_end=10898
+  _globals['_FIGUREDESCRIPTOR_DOUBLEMAPWITHDEFAULT']._serialized_start=10900
+  _globals['_FIGUREDESCRIPTOR_DOUBLEMAPWITHDEFAULT']._serialized_end=11000
+  _globals['_FIGUREDESCRIPTOR_BOOLMAPWITHDEFAULT']._serialized_start=11002
+  _globals['_FIGUREDESCRIPTOR_BOOLMAPWITHDEFAULT']._serialized_end=11096
+  _globals['_FIGUREDESCRIPTOR_AXISDESCRIPTOR']._serialized_start=11099
+  _globals['_FIGUREDESCRIPTOR_AXISDESCRIPTOR']._serialized_end=12161
+  _globals['_FIGUREDESCRIPTOR_AXISDESCRIPTOR_AXISFORMATTYPE']._serialized_start=11935
+  _globals['_FIGUREDESCRIPTOR_AXISDESCRIPTOR_AXISFORMATTYPE']._serialized_end=11977
+  _globals['_FIGUREDESCRIPTOR_AXISDESCRIPTOR_AXISTYPE']._serialized_start=11979
+  _globals['_FIGUREDESCRIPTOR_AXISDESCRIPTOR_AXISTYPE']._serialized_end=12046
+  _globals['_FIGUREDESCRIPTOR_AXISDESCRIPTOR_AXISPOSITION']._serialized_start=12048
+  _globals['_FIGUREDESCRIPTOR_AXISDESCRIPTOR_AXISPOSITION']._serialized_end=12114
+  _globals['_FIGUREDESCRIPTOR_BUSINESSCALENDARDESCRIPTOR']._serialized_start=12164
+  _globals['_FIGUREDESCRIPTOR_BUSINESSCALENDARDESCRIPTOR']._serialized_end=13044
+  _globals['_FIGUREDESCRIPTOR_BUSINESSCALENDARDESCRIPTOR_BUSINESSPERIOD']._serialized_start=12588
+  _globals['_FIGUREDESCRIPTOR_BUSINESSCALENDARDESCRIPTOR_BUSINESSPERIOD']._serialized_end=12633
+  _globals['_FIGUREDESCRIPTOR_BUSINESSCALENDARDESCRIPTOR_HOLIDAY']._serialized_start=12636
+  _globals['_FIGUREDESCRIPTOR_BUSINESSCALENDARDESCRIPTOR_HOLIDAY']._serialized_end=12884
+  _globals['_FIGUREDESCRIPTOR_BUSINESSCALENDARDESCRIPTOR_LOCALDATE']._serialized_start=12886
+  _globals['_FIGUREDESCRIPTOR_BUSINESSCALENDARDESCRIPTOR_LOCALDATE']._serialized_end=12939
+  _globals['_FIGUREDESCRIPTOR_BUSINESSCALENDARDESCRIPTOR_DAYOFWEEK']._serialized_start=12941
+  _globals['_FIGUREDESCRIPTOR_BUSINESSCALENDARDESCRIPTOR_DAYOFWEEK']._serialized_end=13044
+  _globals['_FIGUREDESCRIPTOR_MULTISERIESSOURCEDESCRIPTOR']._serialized_start=13047
+  _globals['_FIGUREDESCRIPTOR_MULTISERIESSOURCEDESCRIPTOR']._serialized_end=13229
+  _globals['_FIGUREDESCRIPTOR_SOURCEDESCRIPTOR']._serialized_start=13232
+  _globals['_FIGUREDESCRIPTOR_SOURCEDESCRIPTOR']._serialized_end=13540
+  _globals['_FIGUREDESCRIPTOR_ONECLICKDESCRIPTOR']._serialized_start=13542
+  _globals['_FIGUREDESCRIPTOR_ONECLICKDESCRIPTOR']._serialized_end=13641
+  _globals['_FIGUREDESCRIPTOR_SERIESPLOTSTYLE']._serialized_start=13644
+  _globals['_FIGUREDESCRIPTOR_SERIESPLOTSTYLE']._serialized_end=13810
+  _globals['_FIGUREDESCRIPTOR_SOURCETYPE']._serialized_start=13813
+  _globals['_FIGUREDESCRIPTOR_SOURCETYPE']._serialized_end=14023
+  _globals['_CONSOLESERVICE']._serialized_start=14048
+  _globals['_CONSOLESERVICE']._serialized_end=15762
+# @@protoc_insertion_point(module_scope)
diff --git a/py/client/deephaven_core/proto/console_pb2_grpc.py b/py/client/deephaven_core/proto/console_pb2_grpc.py
new file mode 100644
index 00000000000..287abe9f826
--- /dev/null
+++ b/py/client/deephaven_core/proto/console_pb2_grpc.py
@@ -0,0 +1,547 @@
+# Generated by the gRPC Python protocol compiler plugin. DO NOT EDIT!
+"""Client and server classes corresponding to protobuf-defined services."""
+import grpc
+import warnings
+
+from deephaven_core.proto import console_pb2 as deephaven__core_dot_proto_dot_console__pb2
+
+GRPC_GENERATED_VERSION = '1.63.0'
+GRPC_VERSION = grpc.__version__
+EXPECTED_ERROR_RELEASE = '1.65.0'
+SCHEDULED_RELEASE_DATE = 'June 25, 2024'
+_version_not_supported = False
+
+try:
+    from grpc._utilities import first_version_is_lower
+    _version_not_supported = first_version_is_lower(GRPC_VERSION, GRPC_GENERATED_VERSION)
+except ImportError:
+    _version_not_supported = True
+
+if _version_not_supported:
+    warnings.warn(
+        f'The grpc package installed is at version {GRPC_VERSION},'
+        + f' but the generated code in deephaven_core/proto/console_pb2_grpc.py depends on'
+        + f' grpcio>={GRPC_GENERATED_VERSION}.'
+        + f' Please upgrade your grpc module to grpcio>={GRPC_GENERATED_VERSION}'
+        + f' or downgrade your generated code using grpcio-tools<={GRPC_VERSION}.'
+        + f' This warning will become an error in {EXPECTED_ERROR_RELEASE},'
+        + f' scheduled for release on {SCHEDULED_RELEASE_DATE}.',
+        RuntimeWarning
+    )
+
+
+class ConsoleServiceStub(object):
+    """
+    Console interaction service
+    """
+
+    def __init__(self, channel):
+        """Constructor.
+
+        Args:
+            channel: A grpc.Channel.
+        """
+        self.GetConsoleTypes = channel.unary_unary(
+                '/io.deephaven.proto.backplane.script.grpc.ConsoleService/GetConsoleTypes',
+                request_serializer=deephaven__core_dot_proto_dot_console__pb2.GetConsoleTypesRequest.SerializeToString,
+                response_deserializer=deephaven__core_dot_proto_dot_console__pb2.GetConsoleTypesResponse.FromString,
+                _registered_method=True)
+        self.StartConsole = channel.unary_unary(
+                '/io.deephaven.proto.backplane.script.grpc.ConsoleService/StartConsole',
+                request_serializer=deephaven__core_dot_proto_dot_console__pb2.StartConsoleRequest.SerializeToString,
+                response_deserializer=deephaven__core_dot_proto_dot_console__pb2.StartConsoleResponse.FromString,
+                _registered_method=True)
+        self.GetHeapInfo = channel.unary_unary(
+                '/io.deephaven.proto.backplane.script.grpc.ConsoleService/GetHeapInfo',
+                request_serializer=deephaven__core_dot_proto_dot_console__pb2.GetHeapInfoRequest.SerializeToString,
+                response_deserializer=deephaven__core_dot_proto_dot_console__pb2.GetHeapInfoResponse.FromString,
+                _registered_method=True)
+        self.SubscribeToLogs = channel.unary_stream(
+                '/io.deephaven.proto.backplane.script.grpc.ConsoleService/SubscribeToLogs',
+                request_serializer=deephaven__core_dot_proto_dot_console__pb2.LogSubscriptionRequest.SerializeToString,
+                response_deserializer=deephaven__core_dot_proto_dot_console__pb2.LogSubscriptionData.FromString,
+                _registered_method=True)
+        self.ExecuteCommand = channel.unary_unary(
+                '/io.deephaven.proto.backplane.script.grpc.ConsoleService/ExecuteCommand',
+                request_serializer=deephaven__core_dot_proto_dot_console__pb2.ExecuteCommandRequest.SerializeToString,
+                response_deserializer=deephaven__core_dot_proto_dot_console__pb2.ExecuteCommandResponse.FromString,
+                _registered_method=True)
+        self.CancelCommand = channel.unary_unary(
+                '/io.deephaven.proto.backplane.script.grpc.ConsoleService/CancelCommand',
+                request_serializer=deephaven__core_dot_proto_dot_console__pb2.CancelCommandRequest.SerializeToString,
+                response_deserializer=deephaven__core_dot_proto_dot_console__pb2.CancelCommandResponse.FromString,
+                _registered_method=True)
+        self.BindTableToVariable = channel.unary_unary(
+                '/io.deephaven.proto.backplane.script.grpc.ConsoleService/BindTableToVariable',
+                request_serializer=deephaven__core_dot_proto_dot_console__pb2.BindTableToVariableRequest.SerializeToString,
+                response_deserializer=deephaven__core_dot_proto_dot_console__pb2.BindTableToVariableResponse.FromString,
+                _registered_method=True)
+        self.AutoCompleteStream = channel.stream_stream(
+                '/io.deephaven.proto.backplane.script.grpc.ConsoleService/AutoCompleteStream',
+                request_serializer=deephaven__core_dot_proto_dot_console__pb2.AutoCompleteRequest.SerializeToString,
+                response_deserializer=deephaven__core_dot_proto_dot_console__pb2.AutoCompleteResponse.FromString,
+                _registered_method=True)
+        self.CancelAutoComplete = channel.unary_unary(
+                '/io.deephaven.proto.backplane.script.grpc.ConsoleService/CancelAutoComplete',
+                request_serializer=deephaven__core_dot_proto_dot_console__pb2.CancelAutoCompleteRequest.SerializeToString,
+                response_deserializer=deephaven__core_dot_proto_dot_console__pb2.CancelAutoCompleteResponse.FromString,
+                _registered_method=True)
+        self.OpenAutoCompleteStream = channel.unary_stream(
+                '/io.deephaven.proto.backplane.script.grpc.ConsoleService/OpenAutoCompleteStream',
+                request_serializer=deephaven__core_dot_proto_dot_console__pb2.AutoCompleteRequest.SerializeToString,
+                response_deserializer=deephaven__core_dot_proto_dot_console__pb2.AutoCompleteResponse.FromString,
+                _registered_method=True)
+        self.NextAutoCompleteStream = channel.unary_unary(
+                '/io.deephaven.proto.backplane.script.grpc.ConsoleService/NextAutoCompleteStream',
+                request_serializer=deephaven__core_dot_proto_dot_console__pb2.AutoCompleteRequest.SerializeToString,
+                response_deserializer=deephaven__core_dot_proto_dot_console__pb2.BrowserNextResponse.FromString,
+                _registered_method=True)
+
+
+class ConsoleServiceServicer(object):
+    """
+    Console interaction service
+    """
+
+    def GetConsoleTypes(self, request, context):
+        """Missing associated documentation comment in .proto file."""
+        context.set_code(grpc.StatusCode.UNIMPLEMENTED)
+        context.set_details('Method not implemented!')
+        raise NotImplementedError('Method not implemented!')
+
+    def StartConsole(self, request, context):
+        """Missing associated documentation comment in .proto file."""
+        context.set_code(grpc.StatusCode.UNIMPLEMENTED)
+        context.set_details('Method not implemented!')
+        raise NotImplementedError('Method not implemented!')
+
+    def GetHeapInfo(self, request, context):
+        """Missing associated documentation comment in .proto file."""
+        context.set_code(grpc.StatusCode.UNIMPLEMENTED)
+        context.set_details('Method not implemented!')
+        raise NotImplementedError('Method not implemented!')
+
+    def SubscribeToLogs(self, request, context):
+        """Missing associated documentation comment in .proto file."""
+        context.set_code(grpc.StatusCode.UNIMPLEMENTED)
+        context.set_details('Method not implemented!')
+        raise NotImplementedError('Method not implemented!')
+
+    def ExecuteCommand(self, request, context):
+        """Missing associated documentation comment in .proto file."""
+        context.set_code(grpc.StatusCode.UNIMPLEMENTED)
+        context.set_details('Method not implemented!')
+        raise NotImplementedError('Method not implemented!')
+
+    def CancelCommand(self, request, context):
+        """Missing associated documentation comment in .proto file."""
+        context.set_code(grpc.StatusCode.UNIMPLEMENTED)
+        context.set_details('Method not implemented!')
+        raise NotImplementedError('Method not implemented!')
+
+    def BindTableToVariable(self, request, context):
+        """Missing associated documentation comment in .proto file."""
+        context.set_code(grpc.StatusCode.UNIMPLEMENTED)
+        context.set_details('Method not implemented!')
+        raise NotImplementedError('Method not implemented!')
+
+    def AutoCompleteStream(self, request_iterator, context):
+        """
+        Starts a stream for autocomplete on the current session. More than one console,
+        more than one document can be edited at a time using this, and they can separately
+        be closed as well. A given document should only be edited within one stream at a
+        time.
+        """
+        context.set_code(grpc.StatusCode.UNIMPLEMENTED)
+        context.set_details('Method not implemented!')
+        raise NotImplementedError('Method not implemented!')
+
+    def CancelAutoComplete(self, request, context):
+        """Missing associated documentation comment in .proto file."""
+        context.set_code(grpc.StatusCode.UNIMPLEMENTED)
+        context.set_details('Method not implemented!')
+        raise NotImplementedError('Method not implemented!')
+
+    def OpenAutoCompleteStream(self, request, context):
+        """
+        Half of the browser-based (browser's can't do bidirectional streams without websockets)
+        implementation for AutoCompleteStream.
+        """
+        context.set_code(grpc.StatusCode.UNIMPLEMENTED)
+        context.set_details('Method not implemented!')
+        raise NotImplementedError('Method not implemented!')
+
+    def NextAutoCompleteStream(self, request, context):
+        """
+        Other half of the browser-based implementation for AutoCompleteStream.
+        """
+        context.set_code(grpc.StatusCode.UNIMPLEMENTED)
+        context.set_details('Method not implemented!')
+        raise NotImplementedError('Method not implemented!')
+
+
+def add_ConsoleServiceServicer_to_server(servicer, server):
+    rpc_method_handlers = {
+            'GetConsoleTypes': grpc.unary_unary_rpc_method_handler(
+                    servicer.GetConsoleTypes,
+                    request_deserializer=deephaven__core_dot_proto_dot_console__pb2.GetConsoleTypesRequest.FromString,
+                    response_serializer=deephaven__core_dot_proto_dot_console__pb2.GetConsoleTypesResponse.SerializeToString,
+            ),
+            'StartConsole': grpc.unary_unary_rpc_method_handler(
+                    servicer.StartConsole,
+                    request_deserializer=deephaven__core_dot_proto_dot_console__pb2.StartConsoleRequest.FromString,
+                    response_serializer=deephaven__core_dot_proto_dot_console__pb2.StartConsoleResponse.SerializeToString,
+            ),
+            'GetHeapInfo': grpc.unary_unary_rpc_method_handler(
+                    servicer.GetHeapInfo,
+                    request_deserializer=deephaven__core_dot_proto_dot_console__pb2.GetHeapInfoRequest.FromString,
+                    response_serializer=deephaven__core_dot_proto_dot_console__pb2.GetHeapInfoResponse.SerializeToString,
+            ),
+            'SubscribeToLogs': grpc.unary_stream_rpc_method_handler(
+                    servicer.SubscribeToLogs,
+                    request_deserializer=deephaven__core_dot_proto_dot_console__pb2.LogSubscriptionRequest.FromString,
+                    response_serializer=deephaven__core_dot_proto_dot_console__pb2.LogSubscriptionData.SerializeToString,
+            ),
+            'ExecuteCommand': grpc.unary_unary_rpc_method_handler(
+                    servicer.ExecuteCommand,
+                    request_deserializer=deephaven__core_dot_proto_dot_console__pb2.ExecuteCommandRequest.FromString,
+                    response_serializer=deephaven__core_dot_proto_dot_console__pb2.ExecuteCommandResponse.SerializeToString,
+            ),
+            'CancelCommand': grpc.unary_unary_rpc_method_handler(
+                    servicer.CancelCommand,
+                    request_deserializer=deephaven__core_dot_proto_dot_console__pb2.CancelCommandRequest.FromString,
+                    response_serializer=deephaven__core_dot_proto_dot_console__pb2.CancelCommandResponse.SerializeToString,
+            ),
+            'BindTableToVariable': grpc.unary_unary_rpc_method_handler(
+                    servicer.BindTableToVariable,
+                    request_deserializer=deephaven__core_dot_proto_dot_console__pb2.BindTableToVariableRequest.FromString,
+                    response_serializer=deephaven__core_dot_proto_dot_console__pb2.BindTableToVariableResponse.SerializeToString,
+            ),
+            'AutoCompleteStream': grpc.stream_stream_rpc_method_handler(
+                    servicer.AutoCompleteStream,
+                    request_deserializer=deephaven__core_dot_proto_dot_console__pb2.AutoCompleteRequest.FromString,
+                    response_serializer=deephaven__core_dot_proto_dot_console__pb2.AutoCompleteResponse.SerializeToString,
+            ),
+            'CancelAutoComplete': grpc.unary_unary_rpc_method_handler(
+                    servicer.CancelAutoComplete,
+                    request_deserializer=deephaven__core_dot_proto_dot_console__pb2.CancelAutoCompleteRequest.FromString,
+                    response_serializer=deephaven__core_dot_proto_dot_console__pb2.CancelAutoCompleteResponse.SerializeToString,
+            ),
+            'OpenAutoCompleteStream': grpc.unary_stream_rpc_method_handler(
+                    servicer.OpenAutoCompleteStream,
+                    request_deserializer=deephaven__core_dot_proto_dot_console__pb2.AutoCompleteRequest.FromString,
+                    response_serializer=deephaven__core_dot_proto_dot_console__pb2.AutoCompleteResponse.SerializeToString,
+            ),
+            'NextAutoCompleteStream': grpc.unary_unary_rpc_method_handler(
+                    servicer.NextAutoCompleteStream,
+                    request_deserializer=deephaven__core_dot_proto_dot_console__pb2.AutoCompleteRequest.FromString,
+                    response_serializer=deephaven__core_dot_proto_dot_console__pb2.BrowserNextResponse.SerializeToString,
+            ),
+    }
+    generic_handler = grpc.method_handlers_generic_handler(
+            'io.deephaven.proto.backplane.script.grpc.ConsoleService', rpc_method_handlers)
+    server.add_generic_rpc_handlers((generic_handler,))
+
+
+ # This class is part of an EXPERIMENTAL API.
+class ConsoleService(object):
+    """
+    Console interaction service
+    """
+
+    @staticmethod
+    def GetConsoleTypes(request,
+            target,
+            options=(),
+            channel_credentials=None,
+            call_credentials=None,
+            insecure=False,
+            compression=None,
+            wait_for_ready=None,
+            timeout=None,
+            metadata=None):
+        return grpc.experimental.unary_unary(
+            request,
+            target,
+            '/io.deephaven.proto.backplane.script.grpc.ConsoleService/GetConsoleTypes',
+            deephaven__core_dot_proto_dot_console__pb2.GetConsoleTypesRequest.SerializeToString,
+            deephaven__core_dot_proto_dot_console__pb2.GetConsoleTypesResponse.FromString,
+            options,
+            channel_credentials,
+            insecure,
+            call_credentials,
+            compression,
+            wait_for_ready,
+            timeout,
+            metadata,
+            _registered_method=True)
+
+    @staticmethod
+    def StartConsole(request,
+            target,
+            options=(),
+            channel_credentials=None,
+            call_credentials=None,
+            insecure=False,
+            compression=None,
+            wait_for_ready=None,
+            timeout=None,
+            metadata=None):
+        return grpc.experimental.unary_unary(
+            request,
+            target,
+            '/io.deephaven.proto.backplane.script.grpc.ConsoleService/StartConsole',
+            deephaven__core_dot_proto_dot_console__pb2.StartConsoleRequest.SerializeToString,
+            deephaven__core_dot_proto_dot_console__pb2.StartConsoleResponse.FromString,
+            options,
+            channel_credentials,
+            insecure,
+            call_credentials,
+            compression,
+            wait_for_ready,
+            timeout,
+            metadata,
+            _registered_method=True)
+
+    @staticmethod
+    def GetHeapInfo(request,
+            target,
+            options=(),
+            channel_credentials=None,
+            call_credentials=None,
+            insecure=False,
+            compression=None,
+            wait_for_ready=None,
+            timeout=None,
+            metadata=None):
+        return grpc.experimental.unary_unary(
+            request,
+            target,
+            '/io.deephaven.proto.backplane.script.grpc.ConsoleService/GetHeapInfo',
+            deephaven__core_dot_proto_dot_console__pb2.GetHeapInfoRequest.SerializeToString,
+            deephaven__core_dot_proto_dot_console__pb2.GetHeapInfoResponse.FromString,
+            options,
+            channel_credentials,
+            insecure,
+            call_credentials,
+            compression,
+            wait_for_ready,
+            timeout,
+            metadata,
+            _registered_method=True)
+
+    @staticmethod
+    def SubscribeToLogs(request,
+            target,
+            options=(),
+            channel_credentials=None,
+            call_credentials=None,
+            insecure=False,
+            compression=None,
+            wait_for_ready=None,
+            timeout=None,
+            metadata=None):
+        return grpc.experimental.unary_stream(
+            request,
+            target,
+            '/io.deephaven.proto.backplane.script.grpc.ConsoleService/SubscribeToLogs',
+            deephaven__core_dot_proto_dot_console__pb2.LogSubscriptionRequest.SerializeToString,
+            deephaven__core_dot_proto_dot_console__pb2.LogSubscriptionData.FromString,
+            options,
+            channel_credentials,
+            insecure,
+            call_credentials,
+            compression,
+            wait_for_ready,
+            timeout,
+            metadata,
+            _registered_method=True)
+
+    @staticmethod
+    def ExecuteCommand(request,
+            target,
+            options=(),
+            channel_credentials=None,
+            call_credentials=None,
+            insecure=False,
+            compression=None,
+            wait_for_ready=None,
+            timeout=None,
+            metadata=None):
+        return grpc.experimental.unary_unary(
+            request,
+            target,
+            '/io.deephaven.proto.backplane.script.grpc.ConsoleService/ExecuteCommand',
+            deephaven__core_dot_proto_dot_console__pb2.ExecuteCommandRequest.SerializeToString,
+            deephaven__core_dot_proto_dot_console__pb2.ExecuteCommandResponse.FromString,
+            options,
+            channel_credentials,
+            insecure,
+            call_credentials,
+            compression,
+            wait_for_ready,
+            timeout,
+            metadata,
+            _registered_method=True)
+
+    @staticmethod
+    def CancelCommand(request,
+            target,
+            options=(),
+            channel_credentials=None,
+            call_credentials=None,
+            insecure=False,
+            compression=None,
+            wait_for_ready=None,
+            timeout=None,
+            metadata=None):
+        return grpc.experimental.unary_unary(
+            request,
+            target,
+            '/io.deephaven.proto.backplane.script.grpc.ConsoleService/CancelCommand',
+            deephaven__core_dot_proto_dot_console__pb2.CancelCommandRequest.SerializeToString,
+            deephaven__core_dot_proto_dot_console__pb2.CancelCommandResponse.FromString,
+            options,
+            channel_credentials,
+            insecure,
+            call_credentials,
+            compression,
+            wait_for_ready,
+            timeout,
+            metadata,
+            _registered_method=True)
+
+    @staticmethod
+    def BindTableToVariable(request,
+            target,
+            options=(),
+            channel_credentials=None,
+            call_credentials=None,
+            insecure=False,
+            compression=None,
+            wait_for_ready=None,
+            timeout=None,
+            metadata=None):
+        return grpc.experimental.unary_unary(
+            request,
+            target,
+            '/io.deephaven.proto.backplane.script.grpc.ConsoleService/BindTableToVariable',
+            deephaven__core_dot_proto_dot_console__pb2.BindTableToVariableRequest.SerializeToString,
+            deephaven__core_dot_proto_dot_console__pb2.BindTableToVariableResponse.FromString,
+            options,
+            channel_credentials,
+            insecure,
+            call_credentials,
+            compression,
+            wait_for_ready,
+            timeout,
+            metadata,
+            _registered_method=True)
+
+    @staticmethod
+    def AutoCompleteStream(request_iterator,
+            target,
+            options=(),
+            channel_credentials=None,
+            call_credentials=None,
+            insecure=False,
+            compression=None,
+            wait_for_ready=None,
+            timeout=None,
+            metadata=None):
+        return grpc.experimental.stream_stream(
+            request_iterator,
+            target,
+            '/io.deephaven.proto.backplane.script.grpc.ConsoleService/AutoCompleteStream',
+            deephaven__core_dot_proto_dot_console__pb2.AutoCompleteRequest.SerializeToString,
+            deephaven__core_dot_proto_dot_console__pb2.AutoCompleteResponse.FromString,
+            options,
+            channel_credentials,
+            insecure,
+            call_credentials,
+            compression,
+            wait_for_ready,
+            timeout,
+            metadata,
+            _registered_method=True)
+
+    @staticmethod
+    def CancelAutoComplete(request,
+            target,
+            options=(),
+            channel_credentials=None,
+            call_credentials=None,
+            insecure=False,
+            compression=None,
+            wait_for_ready=None,
+            timeout=None,
+            metadata=None):
+        return grpc.experimental.unary_unary(
+            request,
+            target,
+            '/io.deephaven.proto.backplane.script.grpc.ConsoleService/CancelAutoComplete',
+            deephaven__core_dot_proto_dot_console__pb2.CancelAutoCompleteRequest.SerializeToString,
+            deephaven__core_dot_proto_dot_console__pb2.CancelAutoCompleteResponse.FromString,
+            options,
+            channel_credentials,
+            insecure,
+            call_credentials,
+            compression,
+            wait_for_ready,
+            timeout,
+            metadata,
+            _registered_method=True)
+
+    @staticmethod
+    def OpenAutoCompleteStream(request,
+            target,
+            options=(),
+            channel_credentials=None,
+            call_credentials=None,
+            insecure=False,
+            compression=None,
+            wait_for_ready=None,
+            timeout=None,
+            metadata=None):
+        return grpc.experimental.unary_stream(
+            request,
+            target,
+            '/io.deephaven.proto.backplane.script.grpc.ConsoleService/OpenAutoCompleteStream',
+            deephaven__core_dot_proto_dot_console__pb2.AutoCompleteRequest.SerializeToString,
+            deephaven__core_dot_proto_dot_console__pb2.AutoCompleteResponse.FromString,
+            options,
+            channel_credentials,
+            insecure,
+            call_credentials,
+            compression,
+            wait_for_ready,
+            timeout,
+            metadata,
+            _registered_method=True)
+
+    @staticmethod
+    def NextAutoCompleteStream(request,
+            target,
+            options=(),
+            channel_credentials=None,
+            call_credentials=None,
+            insecure=False,
+            compression=None,
+            wait_for_ready=None,
+            timeout=None,
+            metadata=None):
+        return grpc.experimental.unary_unary(
+            request,
+            target,
+            '/io.deephaven.proto.backplane.script.grpc.ConsoleService/NextAutoCompleteStream',
+            deephaven__core_dot_proto_dot_console__pb2.AutoCompleteRequest.SerializeToString,
+            deephaven__core_dot_proto_dot_console__pb2.BrowserNextResponse.FromString,
+            options,
+            channel_credentials,
+            insecure,
+            call_credentials,
+            compression,
+            wait_for_ready,
+            timeout,
+            metadata,
+            _registered_method=True)
diff --git a/py/client/deephaven_core/proto/hierarchicaltable_pb2.py b/py/client/deephaven_core/proto/hierarchicaltable_pb2.py
new file mode 100644
index 00000000000..4ffc606e8a7
--- /dev/null
+++ b/py/client/deephaven_core/proto/hierarchicaltable_pb2.py
@@ -0,0 +1,51 @@
+# -*- coding: utf-8 -*-
+# Generated by the protocol buffer compiler.  DO NOT EDIT!
+# source: deephaven_core/proto/hierarchicaltable.proto
+# Protobuf Python Version: 5.26.1
+"""Generated protocol buffer code."""
+from google.protobuf import descriptor as _descriptor
+from google.protobuf import descriptor_pool as _descriptor_pool
+from google.protobuf import symbol_database as _symbol_database
+from google.protobuf.internal import builder as _builder
+# @@protoc_insertion_point(imports)
+
+_sym_db = _symbol_database.Default()
+
+
+from deephaven_core.proto import table_pb2 as deephaven__core_dot_proto_dot_table__pb2
+from deephaven_core.proto import ticket_pb2 as deephaven__core_dot_proto_dot_ticket__pb2
+
+
+DESCRIPTOR = _descriptor_pool.Default().AddSerializedFile(b'\n,deephaven_core/proto/hierarchicaltable.proto\x12!io.deephaven.proto.backplane.grpc\x1a deephaven_core/proto/table.proto\x1a!deephaven_core/proto/ticket.proto\"\x9c\x02\n\rRollupRequest\x12I\n\x16result_rollup_table_id\x18\x01 \x01(\x0b\x32).io.deephaven.proto.backplane.grpc.Ticket\x12\x42\n\x0fsource_table_id\x18\x02 \x01(\x0b\x32).io.deephaven.proto.backplane.grpc.Ticket\x12\x44\n\x0c\x61ggregations\x18\x03 \x03(\x0b\x32..io.deephaven.proto.backplane.grpc.Aggregation\x12\x1c\n\x14include_constituents\x18\x04 \x01(\x08\x12\x18\n\x10group_by_columns\x18\x05 \x03(\t\"\x10\n\x0eRollupResponse\"\xf0\x01\n\x0bTreeRequest\x12G\n\x14result_tree_table_id\x18\x01 \x01(\x0b\x32).io.deephaven.proto.backplane.grpc.Ticket\x12\x42\n\x0fsource_table_id\x18\x02 \x01(\x0b\x32).io.deephaven.proto.backplane.grpc.Ticket\x12\x19\n\x11identifier_column\x18\x03 \x01(\t\x12 \n\x18parent_identifier_column\x18\x04 \x01(\t\x12\x17\n\x0fpromote_orphans\x18\x05 \x01(\x08\"\x0e\n\x0cTreeResponse\"\xc1\x02\n\x1dHierarchicalTableApplyRequest\x12O\n\x1cresult_hierarchical_table_id\x18\x01 \x01(\x0b\x32).io.deephaven.proto.backplane.grpc.Ticket\x12N\n\x1binput_hierarchical_table_id\x18\x02 \x01(\x0b\x32).io.deephaven.proto.backplane.grpc.Ticket\x12=\n\x07\x66ilters\x18\x03 \x03(\x0b\x32,.io.deephaven.proto.backplane.grpc.Condition\x12@\n\x05sorts\x18\x04 \x03(\x0b\x32\x31.io.deephaven.proto.backplane.grpc.SortDescriptor\" \n\x1eHierarchicalTableApplyResponse\"I\n\x1bHierarchicalTableDescriptor\x12\x17\n\x0fsnapshot_schema\x18\x01 \x01(\x0c\x12\x11\n\tis_static\x18\x02 \x01(\x08\"\xde\x02\n\x1cHierarchicalTableViewRequest\x12\x41\n\x0eresult_view_id\x18\x01 \x01(\x0b\x32).io.deephaven.proto.backplane.grpc.Ticket\x12J\n\x15hierarchical_table_id\x18\x02 \x01(\x0b\x32).io.deephaven.proto.backplane.grpc.TicketH\x00\x12\x45\n\x10\x65xisting_view_id\x18\x03 \x01(\x0b\x32).io.deephaven.proto.backplane.grpc.TicketH\x00\x12^\n\nexpansions\x18\x04 \x01(\x0b\x32J.io.deephaven.proto.backplane.grpc.HierarchicalTableViewKeyTableDescriptorB\x08\n\x06target\"\xac\x01\n\'HierarchicalTableViewKeyTableDescriptor\x12?\n\x0ckey_table_id\x18\x01 \x01(\x0b\x32).io.deephaven.proto.backplane.grpc.Ticket\x12$\n\x17key_table_action_column\x18\x02 \x01(\tH\x00\x88\x01\x01\x42\x1a\n\x18_key_table_action_column\"\x1f\n\x1dHierarchicalTableViewResponse\"\xb4\x01\n$HierarchicalTableSourceExportRequest\x12\x42\n\x0fresult_table_id\x18\x01 \x01(\x0b\x32).io.deephaven.proto.backplane.grpc.Ticket\x12H\n\x15hierarchical_table_id\x18\x02 \x01(\x0b\x32).io.deephaven.proto.backplane.grpc.Ticket2\xa9\x05\n\x18HierarchicalTableService\x12m\n\x06Rollup\x12\x30.io.deephaven.proto.backplane.grpc.RollupRequest\x1a\x31.io.deephaven.proto.backplane.grpc.RollupResponse\x12g\n\x04Tree\x12..io.deephaven.proto.backplane.grpc.TreeRequest\x1a/.io.deephaven.proto.backplane.grpc.TreeResponse\x12\x8c\x01\n\x05\x41pply\x12@.io.deephaven.proto.backplane.grpc.HierarchicalTableApplyRequest\x1a\x41.io.deephaven.proto.backplane.grpc.HierarchicalTableApplyResponse\x12\x89\x01\n\x04View\x12?.io.deephaven.proto.backplane.grpc.HierarchicalTableViewRequest\x1a@.io.deephaven.proto.backplane.grpc.HierarchicalTableViewResponse\x12\x99\x01\n\x0c\x45xportSource\x12G.io.deephaven.proto.backplane.grpc.HierarchicalTableSourceExportRequest\x1a@.io.deephaven.proto.backplane.grpc.ExportedTableCreationResponseBMH\x01P\x01ZGgithub.com/deephaven/deephaven-core/go/internal/proto/hierarchicaltableb\x06proto3')
+
+_globals = globals()
+_builder.BuildMessageAndEnumDescriptors(DESCRIPTOR, _globals)
+_builder.BuildTopDescriptorsAndMessages(DESCRIPTOR, 'deephaven_core.proto.hierarchicaltable_pb2', _globals)
+if not _descriptor._USE_C_DESCRIPTORS:
+  _globals['DESCRIPTOR']._loaded_options = None
+  _globals['DESCRIPTOR']._serialized_options = b'H\001P\001ZGgithub.com/deephaven/deephaven-core/go/internal/proto/hierarchicaltable'
+  _globals['_ROLLUPREQUEST']._serialized_start=153
+  _globals['_ROLLUPREQUEST']._serialized_end=437
+  _globals['_ROLLUPRESPONSE']._serialized_start=439
+  _globals['_ROLLUPRESPONSE']._serialized_end=455
+  _globals['_TREEREQUEST']._serialized_start=458
+  _globals['_TREEREQUEST']._serialized_end=698
+  _globals['_TREERESPONSE']._serialized_start=700
+  _globals['_TREERESPONSE']._serialized_end=714
+  _globals['_HIERARCHICALTABLEAPPLYREQUEST']._serialized_start=717
+  _globals['_HIERARCHICALTABLEAPPLYREQUEST']._serialized_end=1038
+  _globals['_HIERARCHICALTABLEAPPLYRESPONSE']._serialized_start=1040
+  _globals['_HIERARCHICALTABLEAPPLYRESPONSE']._serialized_end=1072
+  _globals['_HIERARCHICALTABLEDESCRIPTOR']._serialized_start=1074
+  _globals['_HIERARCHICALTABLEDESCRIPTOR']._serialized_end=1147
+  _globals['_HIERARCHICALTABLEVIEWREQUEST']._serialized_start=1150
+  _globals['_HIERARCHICALTABLEVIEWREQUEST']._serialized_end=1500
+  _globals['_HIERARCHICALTABLEVIEWKEYTABLEDESCRIPTOR']._serialized_start=1503
+  _globals['_HIERARCHICALTABLEVIEWKEYTABLEDESCRIPTOR']._serialized_end=1675
+  _globals['_HIERARCHICALTABLEVIEWRESPONSE']._serialized_start=1677
+  _globals['_HIERARCHICALTABLEVIEWRESPONSE']._serialized_end=1708
+  _globals['_HIERARCHICALTABLESOURCEEXPORTREQUEST']._serialized_start=1711
+  _globals['_HIERARCHICALTABLESOURCEEXPORTREQUEST']._serialized_end=1891
+  _globals['_HIERARCHICALTABLESERVICE']._serialized_start=1894
+  _globals['_HIERARCHICALTABLESERVICE']._serialized_end=2575
+# @@protoc_insertion_point(module_scope)
diff --git a/py/client/deephaven_core/proto/hierarchicaltable_pb2_grpc.py b/py/client/deephaven_core/proto/hierarchicaltable_pb2_grpc.py
new file mode 100644
index 00000000000..ea608630da1
--- /dev/null
+++ b/py/client/deephaven_core/proto/hierarchicaltable_pb2_grpc.py
@@ -0,0 +1,284 @@
+# Generated by the gRPC Python protocol compiler plugin. DO NOT EDIT!
+"""Client and server classes corresponding to protobuf-defined services."""
+import grpc
+import warnings
+
+from deephaven_core.proto import hierarchicaltable_pb2 as deephaven__core_dot_proto_dot_hierarchicaltable__pb2
+from deephaven_core.proto import table_pb2 as deephaven__core_dot_proto_dot_table__pb2
+
+GRPC_GENERATED_VERSION = '1.63.0'
+GRPC_VERSION = grpc.__version__
+EXPECTED_ERROR_RELEASE = '1.65.0'
+SCHEDULED_RELEASE_DATE = 'June 25, 2024'
+_version_not_supported = False
+
+try:
+    from grpc._utilities import first_version_is_lower
+    _version_not_supported = first_version_is_lower(GRPC_VERSION, GRPC_GENERATED_VERSION)
+except ImportError:
+    _version_not_supported = True
+
+if _version_not_supported:
+    warnings.warn(
+        f'The grpc package installed is at version {GRPC_VERSION},'
+        + f' but the generated code in deephaven_core/proto/hierarchicaltable_pb2_grpc.py depends on'
+        + f' grpcio>={GRPC_GENERATED_VERSION}.'
+        + f' Please upgrade your grpc module to grpcio>={GRPC_GENERATED_VERSION}'
+        + f' or downgrade your generated code using grpcio-tools<={GRPC_VERSION}.'
+        + f' This warning will become an error in {EXPECTED_ERROR_RELEASE},'
+        + f' scheduled for release on {SCHEDULED_RELEASE_DATE}.',
+        RuntimeWarning
+    )
+
+
+class HierarchicalTableServiceStub(object):
+    """This service provides tools to create and view hierarchical tables (rollups and trees).
+    """
+
+    def __init__(self, channel):
+        """Constructor.
+
+        Args:
+            channel: A grpc.Channel.
+        """
+        self.Rollup = channel.unary_unary(
+                '/io.deephaven.proto.backplane.grpc.HierarchicalTableService/Rollup',
+                request_serializer=deephaven__core_dot_proto_dot_hierarchicaltable__pb2.RollupRequest.SerializeToString,
+                response_deserializer=deephaven__core_dot_proto_dot_hierarchicaltable__pb2.RollupResponse.FromString,
+                _registered_method=True)
+        self.Tree = channel.unary_unary(
+                '/io.deephaven.proto.backplane.grpc.HierarchicalTableService/Tree',
+                request_serializer=deephaven__core_dot_proto_dot_hierarchicaltable__pb2.TreeRequest.SerializeToString,
+                response_deserializer=deephaven__core_dot_proto_dot_hierarchicaltable__pb2.TreeResponse.FromString,
+                _registered_method=True)
+        self.Apply = channel.unary_unary(
+                '/io.deephaven.proto.backplane.grpc.HierarchicalTableService/Apply',
+                request_serializer=deephaven__core_dot_proto_dot_hierarchicaltable__pb2.HierarchicalTableApplyRequest.SerializeToString,
+                response_deserializer=deephaven__core_dot_proto_dot_hierarchicaltable__pb2.HierarchicalTableApplyResponse.FromString,
+                _registered_method=True)
+        self.View = channel.unary_unary(
+                '/io.deephaven.proto.backplane.grpc.HierarchicalTableService/View',
+                request_serializer=deephaven__core_dot_proto_dot_hierarchicaltable__pb2.HierarchicalTableViewRequest.SerializeToString,
+                response_deserializer=deephaven__core_dot_proto_dot_hierarchicaltable__pb2.HierarchicalTableViewResponse.FromString,
+                _registered_method=True)
+        self.ExportSource = channel.unary_unary(
+                '/io.deephaven.proto.backplane.grpc.HierarchicalTableService/ExportSource',
+                request_serializer=deephaven__core_dot_proto_dot_hierarchicaltable__pb2.HierarchicalTableSourceExportRequest.SerializeToString,
+                response_deserializer=deephaven__core_dot_proto_dot_table__pb2.ExportedTableCreationResponse.FromString,
+                _registered_method=True)
+
+
+class HierarchicalTableServiceServicer(object):
+    """This service provides tools to create and view hierarchical tables (rollups and trees).
+    """
+
+    def Rollup(self, request, context):
+        """Applies a rollup operation to a Table and exports the resulting RollupTable
+        """
+        context.set_code(grpc.StatusCode.UNIMPLEMENTED)
+        context.set_details('Method not implemented!')
+        raise NotImplementedError('Method not implemented!')
+
+    def Tree(self, request, context):
+        """Applies a tree operation to a Table and exports the resulting TreeTable
+        """
+        context.set_code(grpc.StatusCode.UNIMPLEMENTED)
+        context.set_details('Method not implemented!')
+        raise NotImplementedError('Method not implemented!')
+
+    def Apply(self, request, context):
+        """Applies operations to an existing HierarchicalTable (RollupTable or TreeTable) and exports the resulting
+        HierarchicalTable
+        """
+        context.set_code(grpc.StatusCode.UNIMPLEMENTED)
+        context.set_details('Method not implemented!')
+        raise NotImplementedError('Method not implemented!')
+
+    def View(self, request, context):
+        """Creates a view associating a Table of expansion keys and actions with an existing HierarchicalTable and exports
+        the resulting HierarchicalTableView for subsequent snapshot or subscription requests
+        """
+        context.set_code(grpc.StatusCode.UNIMPLEMENTED)
+        context.set_details('Method not implemented!')
+        raise NotImplementedError('Method not implemented!')
+
+    def ExportSource(self, request, context):
+        """Exports the source Table for a HierarchicalTable (Rollup or TreeTable)
+        """
+        context.set_code(grpc.StatusCode.UNIMPLEMENTED)
+        context.set_details('Method not implemented!')
+        raise NotImplementedError('Method not implemented!')
+
+
+def add_HierarchicalTableServiceServicer_to_server(servicer, server):
+    rpc_method_handlers = {
+            'Rollup': grpc.unary_unary_rpc_method_handler(
+                    servicer.Rollup,
+                    request_deserializer=deephaven__core_dot_proto_dot_hierarchicaltable__pb2.RollupRequest.FromString,
+                    response_serializer=deephaven__core_dot_proto_dot_hierarchicaltable__pb2.RollupResponse.SerializeToString,
+            ),
+            'Tree': grpc.unary_unary_rpc_method_handler(
+                    servicer.Tree,
+                    request_deserializer=deephaven__core_dot_proto_dot_hierarchicaltable__pb2.TreeRequest.FromString,
+                    response_serializer=deephaven__core_dot_proto_dot_hierarchicaltable__pb2.TreeResponse.SerializeToString,
+            ),
+            'Apply': grpc.unary_unary_rpc_method_handler(
+                    servicer.Apply,
+                    request_deserializer=deephaven__core_dot_proto_dot_hierarchicaltable__pb2.HierarchicalTableApplyRequest.FromString,
+                    response_serializer=deephaven__core_dot_proto_dot_hierarchicaltable__pb2.HierarchicalTableApplyResponse.SerializeToString,
+            ),
+            'View': grpc.unary_unary_rpc_method_handler(
+                    servicer.View,
+                    request_deserializer=deephaven__core_dot_proto_dot_hierarchicaltable__pb2.HierarchicalTableViewRequest.FromString,
+                    response_serializer=deephaven__core_dot_proto_dot_hierarchicaltable__pb2.HierarchicalTableViewResponse.SerializeToString,
+            ),
+            'ExportSource': grpc.unary_unary_rpc_method_handler(
+                    servicer.ExportSource,
+                    request_deserializer=deephaven__core_dot_proto_dot_hierarchicaltable__pb2.HierarchicalTableSourceExportRequest.FromString,
+                    response_serializer=deephaven__core_dot_proto_dot_table__pb2.ExportedTableCreationResponse.SerializeToString,
+            ),
+    }
+    generic_handler = grpc.method_handlers_generic_handler(
+            'io.deephaven.proto.backplane.grpc.HierarchicalTableService', rpc_method_handlers)
+    server.add_generic_rpc_handlers((generic_handler,))
+
+
+ # This class is part of an EXPERIMENTAL API.
+class HierarchicalTableService(object):
+    """This service provides tools to create and view hierarchical tables (rollups and trees).
+    """
+
+    @staticmethod
+    def Rollup(request,
+            target,
+            options=(),
+            channel_credentials=None,
+            call_credentials=None,
+            insecure=False,
+            compression=None,
+            wait_for_ready=None,
+            timeout=None,
+            metadata=None):
+        return grpc.experimental.unary_unary(
+            request,
+            target,
+            '/io.deephaven.proto.backplane.grpc.HierarchicalTableService/Rollup',
+            deephaven__core_dot_proto_dot_hierarchicaltable__pb2.RollupRequest.SerializeToString,
+            deephaven__core_dot_proto_dot_hierarchicaltable__pb2.RollupResponse.FromString,
+            options,
+            channel_credentials,
+            insecure,
+            call_credentials,
+            compression,
+            wait_for_ready,
+            timeout,
+            metadata,
+            _registered_method=True)
+
+    @staticmethod
+    def Tree(request,
+            target,
+            options=(),
+            channel_credentials=None,
+            call_credentials=None,
+            insecure=False,
+            compression=None,
+            wait_for_ready=None,
+            timeout=None,
+            metadata=None):
+        return grpc.experimental.unary_unary(
+            request,
+            target,
+            '/io.deephaven.proto.backplane.grpc.HierarchicalTableService/Tree',
+            deephaven__core_dot_proto_dot_hierarchicaltable__pb2.TreeRequest.SerializeToString,
+            deephaven__core_dot_proto_dot_hierarchicaltable__pb2.TreeResponse.FromString,
+            options,
+            channel_credentials,
+            insecure,
+            call_credentials,
+            compression,
+            wait_for_ready,
+            timeout,
+            metadata,
+            _registered_method=True)
+
+    @staticmethod
+    def Apply(request,
+            target,
+            options=(),
+            channel_credentials=None,
+            call_credentials=None,
+            insecure=False,
+            compression=None,
+            wait_for_ready=None,
+            timeout=None,
+            metadata=None):
+        return grpc.experimental.unary_unary(
+            request,
+            target,
+            '/io.deephaven.proto.backplane.grpc.HierarchicalTableService/Apply',
+            deephaven__core_dot_proto_dot_hierarchicaltable__pb2.HierarchicalTableApplyRequest.SerializeToString,
+            deephaven__core_dot_proto_dot_hierarchicaltable__pb2.HierarchicalTableApplyResponse.FromString,
+            options,
+            channel_credentials,
+            insecure,
+            call_credentials,
+            compression,
+            wait_for_ready,
+            timeout,
+            metadata,
+            _registered_method=True)
+
+    @staticmethod
+    def View(request,
+            target,
+            options=(),
+            channel_credentials=None,
+            call_credentials=None,
+            insecure=False,
+            compression=None,
+            wait_for_ready=None,
+            timeout=None,
+            metadata=None):
+        return grpc.experimental.unary_unary(
+            request,
+            target,
+            '/io.deephaven.proto.backplane.grpc.HierarchicalTableService/View',
+            deephaven__core_dot_proto_dot_hierarchicaltable__pb2.HierarchicalTableViewRequest.SerializeToString,
+            deephaven__core_dot_proto_dot_hierarchicaltable__pb2.HierarchicalTableViewResponse.FromString,
+            options,
+            channel_credentials,
+            insecure,
+            call_credentials,
+            compression,
+            wait_for_ready,
+            timeout,
+            metadata,
+            _registered_method=True)
+
+    @staticmethod
+    def ExportSource(request,
+            target,
+            options=(),
+            channel_credentials=None,
+            call_credentials=None,
+            insecure=False,
+            compression=None,
+            wait_for_ready=None,
+            timeout=None,
+            metadata=None):
+        return grpc.experimental.unary_unary(
+            request,
+            target,
+            '/io.deephaven.proto.backplane.grpc.HierarchicalTableService/ExportSource',
+            deephaven__core_dot_proto_dot_hierarchicaltable__pb2.HierarchicalTableSourceExportRequest.SerializeToString,
+            deephaven__core_dot_proto_dot_table__pb2.ExportedTableCreationResponse.FromString,
+            options,
+            channel_credentials,
+            insecure,
+            call_credentials,
+            compression,
+            wait_for_ready,
+            timeout,
+            metadata,
+            _registered_method=True)
diff --git a/py/client/deephaven_core/proto/inputtable_pb2.py b/py/client/deephaven_core/proto/inputtable_pb2.py
new file mode 100644
index 00000000000..8b9cfad86b5
--- /dev/null
+++ b/py/client/deephaven_core/proto/inputtable_pb2.py
@@ -0,0 +1,36 @@
+# -*- coding: utf-8 -*-
+# Generated by the protocol buffer compiler.  DO NOT EDIT!
+# source: deephaven_core/proto/inputtable.proto
+# Protobuf Python Version: 5.26.1
+"""Generated protocol buffer code."""
+from google.protobuf import descriptor as _descriptor
+from google.protobuf import descriptor_pool as _descriptor_pool
+from google.protobuf import symbol_database as _symbol_database
+from google.protobuf.internal import builder as _builder
+# @@protoc_insertion_point(imports)
+
+_sym_db = _symbol_database.Default()
+
+
+from deephaven_core.proto import ticket_pb2 as deephaven__core_dot_proto_dot_ticket__pb2
+
+
+DESCRIPTOR = _descriptor_pool.Default().AddSerializedFile(b'\n%deephaven_core/proto/inputtable.proto\x12!io.deephaven.proto.backplane.grpc\x1a!deephaven_core/proto/ticket.proto\"\x92\x01\n\x0f\x41\x64\x64TableRequest\x12>\n\x0binput_table\x18\x01 \x01(\x0b\x32).io.deephaven.proto.backplane.grpc.Ticket\x12?\n\x0ctable_to_add\x18\x02 \x01(\x0b\x32).io.deephaven.proto.backplane.grpc.Ticket\"\x12\n\x10\x41\x64\x64TableResponse\"\x98\x01\n\x12\x44\x65leteTableRequest\x12>\n\x0binput_table\x18\x01 \x01(\x0b\x32).io.deephaven.proto.backplane.grpc.Ticket\x12\x42\n\x0ftable_to_remove\x18\x02 \x01(\x0b\x32).io.deephaven.proto.backplane.grpc.Ticket\"\x15\n\x13\x44\x65leteTableResponse2\xa6\x02\n\x11InputTableService\x12\x81\x01\n\x14\x41\x64\x64TableToInputTable\x12\x32.io.deephaven.proto.backplane.grpc.AddTableRequest\x1a\x33.io.deephaven.proto.backplane.grpc.AddTableResponse\"\x00\x12\x8c\x01\n\x19\x44\x65leteTableFromInputTable\x12\x35.io.deephaven.proto.backplane.grpc.DeleteTableRequest\x1a\x36.io.deephaven.proto.backplane.grpc.DeleteTableResponse\"\x00\x42\x46H\x01P\x01Z@github.com/deephaven/deephaven-core/go/internal/proto/inputtableb\x06proto3')
+
+_globals = globals()
+_builder.BuildMessageAndEnumDescriptors(DESCRIPTOR, _globals)
+_builder.BuildTopDescriptorsAndMessages(DESCRIPTOR, 'deephaven_core.proto.inputtable_pb2', _globals)
+if not _descriptor._USE_C_DESCRIPTORS:
+  _globals['DESCRIPTOR']._loaded_options = None
+  _globals['DESCRIPTOR']._serialized_options = b'H\001P\001Z@github.com/deephaven/deephaven-core/go/internal/proto/inputtable'
+  _globals['_ADDTABLEREQUEST']._serialized_start=112
+  _globals['_ADDTABLEREQUEST']._serialized_end=258
+  _globals['_ADDTABLERESPONSE']._serialized_start=260
+  _globals['_ADDTABLERESPONSE']._serialized_end=278
+  _globals['_DELETETABLEREQUEST']._serialized_start=281
+  _globals['_DELETETABLEREQUEST']._serialized_end=433
+  _globals['_DELETETABLERESPONSE']._serialized_start=435
+  _globals['_DELETETABLERESPONSE']._serialized_end=456
+  _globals['_INPUTTABLESERVICE']._serialized_start=459
+  _globals['_INPUTTABLESERVICE']._serialized_end=753
+# @@protoc_insertion_point(module_scope)
diff --git a/py/client/pydeephaven/proto/inputtable_pb2_grpc.py b/py/client/deephaven_core/proto/inputtable_pb2_grpc.py
similarity index 76%
rename from py/client/pydeephaven/proto/inputtable_pb2_grpc.py
rename to py/client/deephaven_core/proto/inputtable_pb2_grpc.py
index 89b44957591..99b8d6724e2 100644
--- a/py/client/pydeephaven/proto/inputtable_pb2_grpc.py
+++ b/py/client/deephaven_core/proto/inputtable_pb2_grpc.py
@@ -3,7 +3,7 @@
 import grpc
 import warnings
 
-from pydeephaven.proto import inputtable_pb2 as deephaven_dot_proto_dot_inputtable__pb2
+from deephaven_core.proto import inputtable_pb2 as deephaven__core_dot_proto_dot_inputtable__pb2
 
 GRPC_GENERATED_VERSION = '1.63.0'
 GRPC_VERSION = grpc.__version__
@@ -20,7 +20,7 @@
 if _version_not_supported:
     warnings.warn(
         f'The grpc package installed is at version {GRPC_VERSION},'
-        + f' but the generated code in deephaven/proto/inputtable_pb2_grpc.py depends on'
+        + f' but the generated code in deephaven_core/proto/inputtable_pb2_grpc.py depends on'
         + f' grpcio>={GRPC_GENERATED_VERSION}.'
         + f' Please upgrade your grpc module to grpcio>={GRPC_GENERATED_VERSION}'
         + f' or downgrade your generated code using grpcio-tools<={GRPC_VERSION}.'
@@ -43,13 +43,13 @@ def __init__(self, channel):
         """
         self.AddTableToInputTable = channel.unary_unary(
                 '/io.deephaven.proto.backplane.grpc.InputTableService/AddTableToInputTable',
-                request_serializer=deephaven_dot_proto_dot_inputtable__pb2.AddTableRequest.SerializeToString,
-                response_deserializer=deephaven_dot_proto_dot_inputtable__pb2.AddTableResponse.FromString,
+                request_serializer=deephaven__core_dot_proto_dot_inputtable__pb2.AddTableRequest.SerializeToString,
+                response_deserializer=deephaven__core_dot_proto_dot_inputtable__pb2.AddTableResponse.FromString,
                 _registered_method=True)
         self.DeleteTableFromInputTable = channel.unary_unary(
                 '/io.deephaven.proto.backplane.grpc.InputTableService/DeleteTableFromInputTable',
-                request_serializer=deephaven_dot_proto_dot_inputtable__pb2.DeleteTableRequest.SerializeToString,
-                response_deserializer=deephaven_dot_proto_dot_inputtable__pb2.DeleteTableResponse.FromString,
+                request_serializer=deephaven__core_dot_proto_dot_inputtable__pb2.DeleteTableRequest.SerializeToString,
+                response_deserializer=deephaven__core_dot_proto_dot_inputtable__pb2.DeleteTableResponse.FromString,
                 _registered_method=True)
 
 
@@ -81,13 +81,13 @@ def add_InputTableServiceServicer_to_server(servicer, server):
     rpc_method_handlers = {
             'AddTableToInputTable': grpc.unary_unary_rpc_method_handler(
                     servicer.AddTableToInputTable,
-                    request_deserializer=deephaven_dot_proto_dot_inputtable__pb2.AddTableRequest.FromString,
-                    response_serializer=deephaven_dot_proto_dot_inputtable__pb2.AddTableResponse.SerializeToString,
+                    request_deserializer=deephaven__core_dot_proto_dot_inputtable__pb2.AddTableRequest.FromString,
+                    response_serializer=deephaven__core_dot_proto_dot_inputtable__pb2.AddTableResponse.SerializeToString,
             ),
             'DeleteTableFromInputTable': grpc.unary_unary_rpc_method_handler(
                     servicer.DeleteTableFromInputTable,
-                    request_deserializer=deephaven_dot_proto_dot_inputtable__pb2.DeleteTableRequest.FromString,
-                    response_serializer=deephaven_dot_proto_dot_inputtable__pb2.DeleteTableResponse.SerializeToString,
+                    request_deserializer=deephaven__core_dot_proto_dot_inputtable__pb2.DeleteTableRequest.FromString,
+                    response_serializer=deephaven__core_dot_proto_dot_inputtable__pb2.DeleteTableResponse.SerializeToString,
             ),
     }
     generic_handler = grpc.method_handlers_generic_handler(
@@ -116,8 +116,8 @@ def AddTableToInputTable(request,
             request,
             target,
             '/io.deephaven.proto.backplane.grpc.InputTableService/AddTableToInputTable',
-            deephaven_dot_proto_dot_inputtable__pb2.AddTableRequest.SerializeToString,
-            deephaven_dot_proto_dot_inputtable__pb2.AddTableResponse.FromString,
+            deephaven__core_dot_proto_dot_inputtable__pb2.AddTableRequest.SerializeToString,
+            deephaven__core_dot_proto_dot_inputtable__pb2.AddTableResponse.FromString,
             options,
             channel_credentials,
             insecure,
@@ -143,8 +143,8 @@ def DeleteTableFromInputTable(request,
             request,
             target,
             '/io.deephaven.proto.backplane.grpc.InputTableService/DeleteTableFromInputTable',
-            deephaven_dot_proto_dot_inputtable__pb2.DeleteTableRequest.SerializeToString,
-            deephaven_dot_proto_dot_inputtable__pb2.DeleteTableResponse.FromString,
+            deephaven__core_dot_proto_dot_inputtable__pb2.DeleteTableRequest.SerializeToString,
+            deephaven__core_dot_proto_dot_inputtable__pb2.DeleteTableResponse.FromString,
             options,
             channel_credentials,
             insecure,
diff --git a/py/client/deephaven_core/proto/object_pb2.py b/py/client/deephaven_core/proto/object_pb2.py
new file mode 100644
index 00000000000..c21af8df635
--- /dev/null
+++ b/py/client/deephaven_core/proto/object_pb2.py
@@ -0,0 +1,46 @@
+# -*- coding: utf-8 -*-
+# Generated by the protocol buffer compiler.  DO NOT EDIT!
+# source: deephaven_core/proto/object.proto
+# Protobuf Python Version: 5.26.1
+"""Generated protocol buffer code."""
+from google.protobuf import descriptor as _descriptor
+from google.protobuf import descriptor_pool as _descriptor_pool
+from google.protobuf import symbol_database as _symbol_database
+from google.protobuf.internal import builder as _builder
+# @@protoc_insertion_point(imports)
+
+_sym_db = _symbol_database.Default()
+
+
+from deephaven_core.proto import ticket_pb2 as deephaven__core_dot_proto_dot_ticket__pb2
+
+
+DESCRIPTOR = _descriptor_pool.Default().AddSerializedFile(b'\n!deephaven_core/proto/object.proto\x12!io.deephaven.proto.backplane.grpc\x1a!deephaven_core/proto/ticket.proto\"W\n\x12\x46\x65tchObjectRequest\x12\x41\n\tsource_id\x18\x01 \x01(\x0b\x32..io.deephaven.proto.backplane.grpc.TypedTicket\"{\n\x13\x46\x65tchObjectResponse\x12\x0c\n\x04type\x18\x01 \x01(\t\x12\x0c\n\x04\x64\x61ta\x18\x02 \x01(\x0c\x12H\n\x10typed_export_ids\x18\x03 \x03(\x0b\x32..io.deephaven.proto.backplane.grpc.TypedTicket\"S\n\x0e\x43onnectRequest\x12\x41\n\tsource_id\x18\x01 \x01(\x0b\x32..io.deephaven.proto.backplane.grpc.TypedTicket\"a\n\nClientData\x12\x0f\n\x07payload\x18\x01 \x01(\x0c\x12\x42\n\nreferences\x18\x02 \x03(\x0b\x32..io.deephaven.proto.backplane.grpc.TypedTicket\"j\n\nServerData\x12\x0f\n\x07payload\x18\x01 \x01(\x0c\x12K\n\x13\x65xported_references\x18\x02 \x03(\x0b\x32..io.deephaven.proto.backplane.grpc.TypedTicket\"\x9f\x01\n\rStreamRequest\x12\x44\n\x07\x63onnect\x18\x01 \x01(\x0b\x32\x31.io.deephaven.proto.backplane.grpc.ConnectRequestH\x00\x12=\n\x04\x64\x61ta\x18\x02 \x01(\x0b\x32-.io.deephaven.proto.backplane.grpc.ClientDataH\x00\x42\t\n\x07message\"Z\n\x0eStreamResponse\x12=\n\x04\x64\x61ta\x18\x01 \x01(\x0b\x32-.io.deephaven.proto.backplane.grpc.ServerDataH\x00\x42\t\n\x07message\"\x15\n\x13\x42rowserNextResponse2\x8e\x04\n\rObjectService\x12\x81\x01\n\x0b\x46\x65tchObject\x12\x35.io.deephaven.proto.backplane.grpc.FetchObjectRequest\x1a\x36.io.deephaven.proto.backplane.grpc.FetchObjectResponse\"\x03\x88\x02\x01\x12z\n\rMessageStream\x12\x30.io.deephaven.proto.backplane.grpc.StreamRequest\x1a\x31.io.deephaven.proto.backplane.grpc.StreamResponse\"\x00(\x01\x30\x01\x12|\n\x11OpenMessageStream\x12\x30.io.deephaven.proto.backplane.grpc.StreamRequest\x1a\x31.io.deephaven.proto.backplane.grpc.StreamResponse\"\x00\x30\x01\x12\x7f\n\x11NextMessageStream\x12\x30.io.deephaven.proto.backplane.grpc.StreamRequest\x1a\x36.io.deephaven.proto.backplane.grpc.BrowserNextResponse\"\x00\x42\x42H\x01P\x01Z<github.com/deephaven/deephaven-core/go/internal/proto/objectb\x06proto3')
+
+_globals = globals()
+_builder.BuildMessageAndEnumDescriptors(DESCRIPTOR, _globals)
+_builder.BuildTopDescriptorsAndMessages(DESCRIPTOR, 'deephaven_core.proto.object_pb2', _globals)
+if not _descriptor._USE_C_DESCRIPTORS:
+  _globals['DESCRIPTOR']._loaded_options = None
+  _globals['DESCRIPTOR']._serialized_options = b'H\001P\001Z<github.com/deephaven/deephaven-core/go/internal/proto/object'
+  _globals['_OBJECTSERVICE'].methods_by_name['FetchObject']._loaded_options = None
+  _globals['_OBJECTSERVICE'].methods_by_name['FetchObject']._serialized_options = b'\210\002\001'
+  _globals['_FETCHOBJECTREQUEST']._serialized_start=107
+  _globals['_FETCHOBJECTREQUEST']._serialized_end=194
+  _globals['_FETCHOBJECTRESPONSE']._serialized_start=196
+  _globals['_FETCHOBJECTRESPONSE']._serialized_end=319
+  _globals['_CONNECTREQUEST']._serialized_start=321
+  _globals['_CONNECTREQUEST']._serialized_end=404
+  _globals['_CLIENTDATA']._serialized_start=406
+  _globals['_CLIENTDATA']._serialized_end=503
+  _globals['_SERVERDATA']._serialized_start=505
+  _globals['_SERVERDATA']._serialized_end=611
+  _globals['_STREAMREQUEST']._serialized_start=614
+  _globals['_STREAMREQUEST']._serialized_end=773
+  _globals['_STREAMRESPONSE']._serialized_start=775
+  _globals['_STREAMRESPONSE']._serialized_end=865
+  _globals['_BROWSERNEXTRESPONSE']._serialized_start=867
+  _globals['_BROWSERNEXTRESPONSE']._serialized_end=888
+  _globals['_OBJECTSERVICE']._serialized_start=891
+  _globals['_OBJECTSERVICE']._serialized_end=1417
+# @@protoc_insertion_point(module_scope)
diff --git a/py/client/pydeephaven/proto/object_pb2_grpc.py b/py/client/deephaven_core/proto/object_pb2_grpc.py
similarity index 79%
rename from py/client/pydeephaven/proto/object_pb2_grpc.py
rename to py/client/deephaven_core/proto/object_pb2_grpc.py
index a5614603d0b..d8fbcaef17c 100644
--- a/py/client/pydeephaven/proto/object_pb2_grpc.py
+++ b/py/client/deephaven_core/proto/object_pb2_grpc.py
@@ -3,7 +3,7 @@
 import grpc
 import warnings
 
-from pydeephaven.proto import object_pb2 as deephaven_dot_proto_dot_object__pb2
+from deephaven_core.proto import object_pb2 as deephaven__core_dot_proto_dot_object__pb2
 
 GRPC_GENERATED_VERSION = '1.63.0'
 GRPC_VERSION = grpc.__version__
@@ -20,7 +20,7 @@
 if _version_not_supported:
     warnings.warn(
         f'The grpc package installed is at version {GRPC_VERSION},'
-        + f' but the generated code in deephaven/proto/object_pb2_grpc.py depends on'
+        + f' but the generated code in deephaven_core/proto/object_pb2_grpc.py depends on'
         + f' grpcio>={GRPC_GENERATED_VERSION}.'
         + f' Please upgrade your grpc module to grpcio>={GRPC_GENERATED_VERSION}'
         + f' or downgrade your generated code using grpcio-tools<={GRPC_VERSION}.'
@@ -41,23 +41,23 @@ def __init__(self, channel):
         """
         self.FetchObject = channel.unary_unary(
                 '/io.deephaven.proto.backplane.grpc.ObjectService/FetchObject',
-                request_serializer=deephaven_dot_proto_dot_object__pb2.FetchObjectRequest.SerializeToString,
-                response_deserializer=deephaven_dot_proto_dot_object__pb2.FetchObjectResponse.FromString,
+                request_serializer=deephaven__core_dot_proto_dot_object__pb2.FetchObjectRequest.SerializeToString,
+                response_deserializer=deephaven__core_dot_proto_dot_object__pb2.FetchObjectResponse.FromString,
                 _registered_method=True)
         self.MessageStream = channel.stream_stream(
                 '/io.deephaven.proto.backplane.grpc.ObjectService/MessageStream',
-                request_serializer=deephaven_dot_proto_dot_object__pb2.StreamRequest.SerializeToString,
-                response_deserializer=deephaven_dot_proto_dot_object__pb2.StreamResponse.FromString,
+                request_serializer=deephaven__core_dot_proto_dot_object__pb2.StreamRequest.SerializeToString,
+                response_deserializer=deephaven__core_dot_proto_dot_object__pb2.StreamResponse.FromString,
                 _registered_method=True)
         self.OpenMessageStream = channel.unary_stream(
                 '/io.deephaven.proto.backplane.grpc.ObjectService/OpenMessageStream',
-                request_serializer=deephaven_dot_proto_dot_object__pb2.StreamRequest.SerializeToString,
-                response_deserializer=deephaven_dot_proto_dot_object__pb2.StreamResponse.FromString,
+                request_serializer=deephaven__core_dot_proto_dot_object__pb2.StreamRequest.SerializeToString,
+                response_deserializer=deephaven__core_dot_proto_dot_object__pb2.StreamResponse.FromString,
                 _registered_method=True)
         self.NextMessageStream = channel.unary_unary(
                 '/io.deephaven.proto.backplane.grpc.ObjectService/NextMessageStream',
-                request_serializer=deephaven_dot_proto_dot_object__pb2.StreamRequest.SerializeToString,
-                response_deserializer=deephaven_dot_proto_dot_object__pb2.BrowserNextResponse.FromString,
+                request_serializer=deephaven__core_dot_proto_dot_object__pb2.StreamRequest.SerializeToString,
+                response_deserializer=deephaven__core_dot_proto_dot_object__pb2.BrowserNextResponse.FromString,
                 _registered_method=True)
 
 
@@ -144,23 +144,23 @@ def add_ObjectServiceServicer_to_server(servicer, server):
     rpc_method_handlers = {
             'FetchObject': grpc.unary_unary_rpc_method_handler(
                     servicer.FetchObject,
-                    request_deserializer=deephaven_dot_proto_dot_object__pb2.FetchObjectRequest.FromString,
-                    response_serializer=deephaven_dot_proto_dot_object__pb2.FetchObjectResponse.SerializeToString,
+                    request_deserializer=deephaven__core_dot_proto_dot_object__pb2.FetchObjectRequest.FromString,
+                    response_serializer=deephaven__core_dot_proto_dot_object__pb2.FetchObjectResponse.SerializeToString,
             ),
             'MessageStream': grpc.stream_stream_rpc_method_handler(
                     servicer.MessageStream,
-                    request_deserializer=deephaven_dot_proto_dot_object__pb2.StreamRequest.FromString,
-                    response_serializer=deephaven_dot_proto_dot_object__pb2.StreamResponse.SerializeToString,
+                    request_deserializer=deephaven__core_dot_proto_dot_object__pb2.StreamRequest.FromString,
+                    response_serializer=deephaven__core_dot_proto_dot_object__pb2.StreamResponse.SerializeToString,
             ),
             'OpenMessageStream': grpc.unary_stream_rpc_method_handler(
                     servicer.OpenMessageStream,
-                    request_deserializer=deephaven_dot_proto_dot_object__pb2.StreamRequest.FromString,
-                    response_serializer=deephaven_dot_proto_dot_object__pb2.StreamResponse.SerializeToString,
+                    request_deserializer=deephaven__core_dot_proto_dot_object__pb2.StreamRequest.FromString,
+                    response_serializer=deephaven__core_dot_proto_dot_object__pb2.StreamResponse.SerializeToString,
             ),
             'NextMessageStream': grpc.unary_unary_rpc_method_handler(
                     servicer.NextMessageStream,
-                    request_deserializer=deephaven_dot_proto_dot_object__pb2.StreamRequest.FromString,
-                    response_serializer=deephaven_dot_proto_dot_object__pb2.BrowserNextResponse.SerializeToString,
+                    request_deserializer=deephaven__core_dot_proto_dot_object__pb2.StreamRequest.FromString,
+                    response_serializer=deephaven__core_dot_proto_dot_object__pb2.BrowserNextResponse.SerializeToString,
             ),
     }
     generic_handler = grpc.method_handlers_generic_handler(
@@ -187,8 +187,8 @@ def FetchObject(request,
             request,
             target,
             '/io.deephaven.proto.backplane.grpc.ObjectService/FetchObject',
-            deephaven_dot_proto_dot_object__pb2.FetchObjectRequest.SerializeToString,
-            deephaven_dot_proto_dot_object__pb2.FetchObjectResponse.FromString,
+            deephaven__core_dot_proto_dot_object__pb2.FetchObjectRequest.SerializeToString,
+            deephaven__core_dot_proto_dot_object__pb2.FetchObjectResponse.FromString,
             options,
             channel_credentials,
             insecure,
@@ -214,8 +214,8 @@ def MessageStream(request_iterator,
             request_iterator,
             target,
             '/io.deephaven.proto.backplane.grpc.ObjectService/MessageStream',
-            deephaven_dot_proto_dot_object__pb2.StreamRequest.SerializeToString,
-            deephaven_dot_proto_dot_object__pb2.StreamResponse.FromString,
+            deephaven__core_dot_proto_dot_object__pb2.StreamRequest.SerializeToString,
+            deephaven__core_dot_proto_dot_object__pb2.StreamResponse.FromString,
             options,
             channel_credentials,
             insecure,
@@ -241,8 +241,8 @@ def OpenMessageStream(request,
             request,
             target,
             '/io.deephaven.proto.backplane.grpc.ObjectService/OpenMessageStream',
-            deephaven_dot_proto_dot_object__pb2.StreamRequest.SerializeToString,
-            deephaven_dot_proto_dot_object__pb2.StreamResponse.FromString,
+            deephaven__core_dot_proto_dot_object__pb2.StreamRequest.SerializeToString,
+            deephaven__core_dot_proto_dot_object__pb2.StreamResponse.FromString,
             options,
             channel_credentials,
             insecure,
@@ -268,8 +268,8 @@ def NextMessageStream(request,
             request,
             target,
             '/io.deephaven.proto.backplane.grpc.ObjectService/NextMessageStream',
-            deephaven_dot_proto_dot_object__pb2.StreamRequest.SerializeToString,
-            deephaven_dot_proto_dot_object__pb2.BrowserNextResponse.FromString,
+            deephaven__core_dot_proto_dot_object__pb2.StreamRequest.SerializeToString,
+            deephaven__core_dot_proto_dot_object__pb2.BrowserNextResponse.FromString,
             options,
             channel_credentials,
             insecure,
diff --git a/py/client/deephaven_core/proto/partitionedtable_pb2.py b/py/client/deephaven_core/proto/partitionedtable_pb2.py
new file mode 100644
index 00000000000..3d6cbe595e3
--- /dev/null
+++ b/py/client/deephaven_core/proto/partitionedtable_pb2.py
@@ -0,0 +1,39 @@
+# -*- coding: utf-8 -*-
+# Generated by the protocol buffer compiler.  DO NOT EDIT!
+# source: deephaven_core/proto/partitionedtable.proto
+# Protobuf Python Version: 5.26.1
+"""Generated protocol buffer code."""
+from google.protobuf import descriptor as _descriptor
+from google.protobuf import descriptor_pool as _descriptor_pool
+from google.protobuf import symbol_database as _symbol_database
+from google.protobuf.internal import builder as _builder
+# @@protoc_insertion_point(imports)
+
+_sym_db = _symbol_database.Default()
+
+
+from deephaven_core.proto import table_pb2 as deephaven__core_dot_proto_dot_table__pb2
+from deephaven_core.proto import ticket_pb2 as deephaven__core_dot_proto_dot_ticket__pb2
+
+
+DESCRIPTOR = _descriptor_pool.Default().AddSerializedFile(b'\n+deephaven_core/proto/partitionedtable.proto\x12!io.deephaven.proto.backplane.grpc\x1a deephaven_core/proto/table.proto\x1a!deephaven_core/proto/ticket.proto\"\xbc\x01\n\x12PartitionByRequest\x12;\n\x08table_id\x18\x01 \x01(\x0b\x32).io.deephaven.proto.backplane.grpc.Ticket\x12<\n\tresult_id\x18\x02 \x01(\x0b\x32).io.deephaven.proto.backplane.grpc.Ticket\x12\x18\n\x10key_column_names\x18\x03 \x03(\t\x12\x11\n\tdrop_keys\x18\x04 \x01(\x08\"\x15\n\x13PartitionByResponse\"\x92\x01\n\x0cMergeRequest\x12\x44\n\x11partitioned_table\x18\x01 \x01(\x0b\x32).io.deephaven.proto.backplane.grpc.Ticket\x12<\n\tresult_id\x18\x02 \x01(\x0b\x32).io.deephaven.proto.backplane.grpc.Ticket\"\xda\x01\n\x0fGetTableRequest\x12\x44\n\x11partitioned_table\x18\x01 \x01(\x0b\x32).io.deephaven.proto.backplane.grpc.Ticket\x12\x43\n\x10key_table_ticket\x18\x02 \x01(\x0b\x32).io.deephaven.proto.backplane.grpc.Ticket\x12<\n\tresult_id\x18\x04 \x01(\x0b\x32).io.deephaven.proto.backplane.grpc.Ticket\"\xba\x01\n\x1aPartitionedTableDescriptor\x12\x18\n\x10key_column_names\x18\x01 \x03(\t\x12\x1f\n\x17\x63onstituent_column_name\x18\x04 \x01(\t\x12\x13\n\x0bunique_keys\x18\x02 \x01(\x08\x12%\n\x1d\x63onstituent_definition_schema\x18\x03 \x01(\x0c\x12%\n\x1d\x63onstituent_changes_permitted\x18\x05 \x01(\x08\x32\x96\x03\n\x17PartitionedTableService\x12|\n\x0bPartitionBy\x12\x35.io.deephaven.proto.backplane.grpc.PartitionByRequest\x1a\x36.io.deephaven.proto.backplane.grpc.PartitionByResponse\x12z\n\x05Merge\x12/.io.deephaven.proto.backplane.grpc.MergeRequest\x1a@.io.deephaven.proto.backplane.grpc.ExportedTableCreationResponse\x12\x80\x01\n\x08GetTable\x12\x32.io.deephaven.proto.backplane.grpc.GetTableRequest\x1a@.io.deephaven.proto.backplane.grpc.ExportedTableCreationResponseBLH\x01P\x01ZFgithub.com/deephaven/deephaven-core/go/internal/proto/partitionedtableb\x06proto3')
+
+_globals = globals()
+_builder.BuildMessageAndEnumDescriptors(DESCRIPTOR, _globals)
+_builder.BuildTopDescriptorsAndMessages(DESCRIPTOR, 'deephaven_core.proto.partitionedtable_pb2', _globals)
+if not _descriptor._USE_C_DESCRIPTORS:
+  _globals['DESCRIPTOR']._loaded_options = None
+  _globals['DESCRIPTOR']._serialized_options = b'H\001P\001ZFgithub.com/deephaven/deephaven-core/go/internal/proto/partitionedtable'
+  _globals['_PARTITIONBYREQUEST']._serialized_start=152
+  _globals['_PARTITIONBYREQUEST']._serialized_end=340
+  _globals['_PARTITIONBYRESPONSE']._serialized_start=342
+  _globals['_PARTITIONBYRESPONSE']._serialized_end=363
+  _globals['_MERGEREQUEST']._serialized_start=366
+  _globals['_MERGEREQUEST']._serialized_end=512
+  _globals['_GETTABLEREQUEST']._serialized_start=515
+  _globals['_GETTABLEREQUEST']._serialized_end=733
+  _globals['_PARTITIONEDTABLEDESCRIPTOR']._serialized_start=736
+  _globals['_PARTITIONEDTABLEDESCRIPTOR']._serialized_end=922
+  _globals['_PARTITIONEDTABLESERVICE']._serialized_start=925
+  _globals['_PARTITIONEDTABLESERVICE']._serialized_end=1331
+# @@protoc_insertion_point(module_scope)
diff --git a/py/client/deephaven_core/proto/partitionedtable_pb2_grpc.py b/py/client/deephaven_core/proto/partitionedtable_pb2_grpc.py
new file mode 100644
index 00000000000..352ee72fbcc
--- /dev/null
+++ b/py/client/deephaven_core/proto/partitionedtable_pb2_grpc.py
@@ -0,0 +1,212 @@
+# Generated by the gRPC Python protocol compiler plugin. DO NOT EDIT!
+"""Client and server classes corresponding to protobuf-defined services."""
+import grpc
+import warnings
+
+from deephaven_core.proto import partitionedtable_pb2 as deephaven__core_dot_proto_dot_partitionedtable__pb2
+from deephaven_core.proto import table_pb2 as deephaven__core_dot_proto_dot_table__pb2
+
+GRPC_GENERATED_VERSION = '1.63.0'
+GRPC_VERSION = grpc.__version__
+EXPECTED_ERROR_RELEASE = '1.65.0'
+SCHEDULED_RELEASE_DATE = 'June 25, 2024'
+_version_not_supported = False
+
+try:
+    from grpc._utilities import first_version_is_lower
+    _version_not_supported = first_version_is_lower(GRPC_VERSION, GRPC_GENERATED_VERSION)
+except ImportError:
+    _version_not_supported = True
+
+if _version_not_supported:
+    warnings.warn(
+        f'The grpc package installed is at version {GRPC_VERSION},'
+        + f' but the generated code in deephaven_core/proto/partitionedtable_pb2_grpc.py depends on'
+        + f' grpcio>={GRPC_GENERATED_VERSION}.'
+        + f' Please upgrade your grpc module to grpcio>={GRPC_GENERATED_VERSION}'
+        + f' or downgrade your generated code using grpcio-tools<={GRPC_VERSION}.'
+        + f' This warning will become an error in {EXPECTED_ERROR_RELEASE},'
+        + f' scheduled for release on {SCHEDULED_RELEASE_DATE}.',
+        RuntimeWarning
+    )
+
+
+class PartitionedTableServiceStub(object):
+    """
+    This service provides tools to create and query partitioned tables.
+    """
+
+    def __init__(self, channel):
+        """Constructor.
+
+        Args:
+            channel: A grpc.Channel.
+        """
+        self.PartitionBy = channel.unary_unary(
+                '/io.deephaven.proto.backplane.grpc.PartitionedTableService/PartitionBy',
+                request_serializer=deephaven__core_dot_proto_dot_partitionedtable__pb2.PartitionByRequest.SerializeToString,
+                response_deserializer=deephaven__core_dot_proto_dot_partitionedtable__pb2.PartitionByResponse.FromString,
+                _registered_method=True)
+        self.Merge = channel.unary_unary(
+                '/io.deephaven.proto.backplane.grpc.PartitionedTableService/Merge',
+                request_serializer=deephaven__core_dot_proto_dot_partitionedtable__pb2.MergeRequest.SerializeToString,
+                response_deserializer=deephaven__core_dot_proto_dot_table__pb2.ExportedTableCreationResponse.FromString,
+                _registered_method=True)
+        self.GetTable = channel.unary_unary(
+                '/io.deephaven.proto.backplane.grpc.PartitionedTableService/GetTable',
+                request_serializer=deephaven__core_dot_proto_dot_partitionedtable__pb2.GetTableRequest.SerializeToString,
+                response_deserializer=deephaven__core_dot_proto_dot_table__pb2.ExportedTableCreationResponse.FromString,
+                _registered_method=True)
+
+
+class PartitionedTableServiceServicer(object):
+    """
+    This service provides tools to create and query partitioned tables.
+    """
+
+    def PartitionBy(self, request, context):
+        """
+        Transforms a table into a partitioned table, consisting of many separate tables, each individually
+        addressable. The result will be a FetchObjectResponse populated with a PartitionedTable.
+        """
+        context.set_code(grpc.StatusCode.UNIMPLEMENTED)
+        context.set_details('Method not implemented!')
+        raise NotImplementedError('Method not implemented!')
+
+    def Merge(self, request, context):
+        """
+        Given a partitioned table, returns a table with the contents of all of the constituent tables.
+        """
+        context.set_code(grpc.StatusCode.UNIMPLEMENTED)
+        context.set_details('Method not implemented!')
+        raise NotImplementedError('Method not implemented!')
+
+    def GetTable(self, request, context):
+        """
+        Given a partitioned table and a row described by another table's contents, returns a table
+        that matched that row, if any. If none is present, NOT_FOUND will be sent in response. If
+        more than one is present, FAILED_PRECONDITION will be sent in response.
+
+        If the provided key table has any number of rows other than one, INVALID_ARGUMENT will be
+        sent in response.
+
+        The simplest way to generally use this is to subscribe to the key columns of the underlying
+        table of a given PartitionedTable, then use /FlightService/DoPut to create a table with the
+        desired keys, and pass that ticket to this service. After that request is sent (note that it
+        is not required to wait for it to complete), that new table ticket can be used to make this
+        GetTable request.
+        """
+        context.set_code(grpc.StatusCode.UNIMPLEMENTED)
+        context.set_details('Method not implemented!')
+        raise NotImplementedError('Method not implemented!')
+
+
+def add_PartitionedTableServiceServicer_to_server(servicer, server):
+    rpc_method_handlers = {
+            'PartitionBy': grpc.unary_unary_rpc_method_handler(
+                    servicer.PartitionBy,
+                    request_deserializer=deephaven__core_dot_proto_dot_partitionedtable__pb2.PartitionByRequest.FromString,
+                    response_serializer=deephaven__core_dot_proto_dot_partitionedtable__pb2.PartitionByResponse.SerializeToString,
+            ),
+            'Merge': grpc.unary_unary_rpc_method_handler(
+                    servicer.Merge,
+                    request_deserializer=deephaven__core_dot_proto_dot_partitionedtable__pb2.MergeRequest.FromString,
+                    response_serializer=deephaven__core_dot_proto_dot_table__pb2.ExportedTableCreationResponse.SerializeToString,
+            ),
+            'GetTable': grpc.unary_unary_rpc_method_handler(
+                    servicer.GetTable,
+                    request_deserializer=deephaven__core_dot_proto_dot_partitionedtable__pb2.GetTableRequest.FromString,
+                    response_serializer=deephaven__core_dot_proto_dot_table__pb2.ExportedTableCreationResponse.SerializeToString,
+            ),
+    }
+    generic_handler = grpc.method_handlers_generic_handler(
+            'io.deephaven.proto.backplane.grpc.PartitionedTableService', rpc_method_handlers)
+    server.add_generic_rpc_handlers((generic_handler,))
+
+
+ # This class is part of an EXPERIMENTAL API.
+class PartitionedTableService(object):
+    """
+    This service provides tools to create and query partitioned tables.
+    """
+
+    @staticmethod
+    def PartitionBy(request,
+            target,
+            options=(),
+            channel_credentials=None,
+            call_credentials=None,
+            insecure=False,
+            compression=None,
+            wait_for_ready=None,
+            timeout=None,
+            metadata=None):
+        return grpc.experimental.unary_unary(
+            request,
+            target,
+            '/io.deephaven.proto.backplane.grpc.PartitionedTableService/PartitionBy',
+            deephaven__core_dot_proto_dot_partitionedtable__pb2.PartitionByRequest.SerializeToString,
+            deephaven__core_dot_proto_dot_partitionedtable__pb2.PartitionByResponse.FromString,
+            options,
+            channel_credentials,
+            insecure,
+            call_credentials,
+            compression,
+            wait_for_ready,
+            timeout,
+            metadata,
+            _registered_method=True)
+
+    @staticmethod
+    def Merge(request,
+            target,
+            options=(),
+            channel_credentials=None,
+            call_credentials=None,
+            insecure=False,
+            compression=None,
+            wait_for_ready=None,
+            timeout=None,
+            metadata=None):
+        return grpc.experimental.unary_unary(
+            request,
+            target,
+            '/io.deephaven.proto.backplane.grpc.PartitionedTableService/Merge',
+            deephaven__core_dot_proto_dot_partitionedtable__pb2.MergeRequest.SerializeToString,
+            deephaven__core_dot_proto_dot_table__pb2.ExportedTableCreationResponse.FromString,
+            options,
+            channel_credentials,
+            insecure,
+            call_credentials,
+            compression,
+            wait_for_ready,
+            timeout,
+            metadata,
+            _registered_method=True)
+
+    @staticmethod
+    def GetTable(request,
+            target,
+            options=(),
+            channel_credentials=None,
+            call_credentials=None,
+            insecure=False,
+            compression=None,
+            wait_for_ready=None,
+            timeout=None,
+            metadata=None):
+        return grpc.experimental.unary_unary(
+            request,
+            target,
+            '/io.deephaven.proto.backplane.grpc.PartitionedTableService/GetTable',
+            deephaven__core_dot_proto_dot_partitionedtable__pb2.GetTableRequest.SerializeToString,
+            deephaven__core_dot_proto_dot_table__pb2.ExportedTableCreationResponse.FromString,
+            options,
+            channel_credentials,
+            insecure,
+            call_credentials,
+            compression,
+            wait_for_ready,
+            timeout,
+            metadata,
+            _registered_method=True)
diff --git a/py/client/deephaven_core/proto/session_pb2.py b/py/client/deephaven_core/proto/session_pb2.py
new file mode 100644
index 00000000000..77f87063318
--- /dev/null
+++ b/py/client/deephaven_core/proto/session_pb2.py
@@ -0,0 +1,76 @@
+# -*- coding: utf-8 -*-
+# Generated by the protocol buffer compiler.  DO NOT EDIT!
+# source: deephaven_core/proto/session.proto
+# Protobuf Python Version: 5.26.1
+"""Generated protocol buffer code."""
+from google.protobuf import descriptor as _descriptor
+from google.protobuf import descriptor_pool as _descriptor_pool
+from google.protobuf import symbol_database as _symbol_database
+from google.protobuf.internal import builder as _builder
+# @@protoc_insertion_point(imports)
+
+_sym_db = _symbol_database.Default()
+
+
+from deephaven_core.proto import ticket_pb2 as deephaven__core_dot_proto_dot_ticket__pb2
+
+
+DESCRIPTOR = _descriptor_pool.Default().AddSerializedFile(b'\n\"deephaven_core/proto/session.proto\x12!io.deephaven.proto.backplane.grpc\x1a!deephaven_core/proto/ticket.proto\"I\n\x1cWrappedAuthenticationRequest\x12\x0c\n\x04type\x18\x04 \x01(\t\x12\x0f\n\x07payload\x18\x05 \x01(\x0cJ\x04\x08\x02\x10\x03J\x04\x08\x03\x10\x04\"B\n\x10HandshakeRequest\x12\x19\n\rauth_protocol\x18\x01 \x01(\x11\x42\x02\x18\x01\x12\x13\n\x07payload\x18\x02 \x01(\x0c\x42\x02\x18\x01\"\xa2\x01\n\x11HandshakeResponse\x12\x1b\n\x0fmetadata_header\x18\x01 \x01(\x0c\x42\x02\x18\x01\x12\x19\n\rsession_token\x18\x02 \x01(\x0c\x42\x02\x18\x01\x12(\n\x1atoken_deadline_time_millis\x18\x03 \x01(\x12\x42\x04\x18\x01\x30\x01\x12+\n\x1dtoken_expiration_delay_millis\x18\x04 \x01(\x12\x42\x04\x18\x01\x30\x01\"\x16\n\x14\x43loseSessionResponse\"G\n\x0eReleaseRequest\x12\x35\n\x02id\x18\x01 \x01(\x0b\x32).io.deephaven.proto.backplane.grpc.Ticket\"\x11\n\x0fReleaseResponse\"\x8b\x01\n\rExportRequest\x12<\n\tsource_id\x18\x01 \x01(\x0b\x32).io.deephaven.proto.backplane.grpc.Ticket\x12<\n\tresult_id\x18\x02 \x01(\x0b\x32).io.deephaven.proto.backplane.grpc.Ticket\"\x10\n\x0e\x45xportResponse\"\x8c\x01\n\x0ePublishRequest\x12<\n\tsource_id\x18\x01 \x01(\x0b\x32).io.deephaven.proto.backplane.grpc.Ticket\x12<\n\tresult_id\x18\x02 \x01(\x0b\x32).io.deephaven.proto.backplane.grpc.Ticket\"\x11\n\x0fPublishResponse\"\x1b\n\x19\x45xportNotificationRequest\"\xb7\x03\n\x12\x45xportNotification\x12\x39\n\x06ticket\x18\x01 \x01(\x0b\x32).io.deephaven.proto.backplane.grpc.Ticket\x12Q\n\x0c\x65xport_state\x18\x02 \x01(\x0e\x32;.io.deephaven.proto.backplane.grpc.ExportNotification.State\x12\x0f\n\x07\x63ontext\x18\x03 \x01(\t\x12\x18\n\x10\x64\x65pendent_handle\x18\x04 \x01(\t\"\xe7\x01\n\x05State\x12\x0b\n\x07UNKNOWN\x10\x00\x12\x0b\n\x07PENDING\x10\x01\x12\x0e\n\nPUBLISHING\x10\x02\x12\n\n\x06QUEUED\x10\x03\x12\x0b\n\x07RUNNING\x10\x04\x12\x0c\n\x08\x45XPORTED\x10\x05\x12\x0c\n\x08RELEASED\x10\x06\x12\r\n\tCANCELLED\x10\x07\x12\n\n\x06\x46\x41ILED\x10\x08\x12\x15\n\x11\x44\x45PENDENCY_FAILED\x10\t\x12\x1a\n\x16\x44\x45PENDENCY_NEVER_FOUND\x10\n\x12\x18\n\x14\x44\x45PENDENCY_CANCELLED\x10\x0b\x12\x17\n\x13\x44\x45PENDENCY_RELEASED\x10\x0c\" \n\x1eTerminationNotificationRequest\"\x97\x02\n\x1fTerminationNotificationResponse\x12\x1c\n\x14\x61\x62normal_termination\x18\x01 \x01(\x08\x12\x0e\n\x06reason\x18\x02 \x01(\t\x12\"\n\x1ais_from_uncaught_exception\x18\x03 \x01(\x08\x12\x63\n\x0cstack_traces\x18\x04 \x03(\x0b\x32M.io.deephaven.proto.backplane.grpc.TerminationNotificationResponse.StackTrace\x1a=\n\nStackTrace\x12\x0c\n\x04type\x18\x01 \x01(\t\x12\x0f\n\x07message\x18\x02 \x01(\t\x12\x10\n\x08\x65lements\x18\x03 \x03(\t2\xb9\x08\n\x0eSessionService\x12|\n\nNewSession\x12\x33.io.deephaven.proto.backplane.grpc.HandshakeRequest\x1a\x34.io.deephaven.proto.backplane.grpc.HandshakeResponse\"\x03\x88\x02\x01\x12\x85\x01\n\x13RefreshSessionToken\x12\x33.io.deephaven.proto.backplane.grpc.HandshakeRequest\x1a\x34.io.deephaven.proto.backplane.grpc.HandshakeResponse\"\x03\x88\x02\x01\x12~\n\x0c\x43loseSession\x12\x33.io.deephaven.proto.backplane.grpc.HandshakeRequest\x1a\x37.io.deephaven.proto.backplane.grpc.CloseSessionResponse\"\x00\x12r\n\x07Release\x12\x31.io.deephaven.proto.backplane.grpc.ReleaseRequest\x1a\x32.io.deephaven.proto.backplane.grpc.ReleaseResponse\"\x00\x12y\n\x10\x45xportFromTicket\x12\x30.io.deephaven.proto.backplane.grpc.ExportRequest\x1a\x31.io.deephaven.proto.backplane.grpc.ExportResponse\"\x00\x12|\n\x11PublishFromTicket\x12\x31.io.deephaven.proto.backplane.grpc.PublishRequest\x1a\x32.io.deephaven.proto.backplane.grpc.PublishResponse\"\x00\x12\x8e\x01\n\x13\x45xportNotifications\x12<.io.deephaven.proto.backplane.grpc.ExportNotificationRequest\x1a\x35.io.deephaven.proto.backplane.grpc.ExportNotification\"\x00\x30\x01\x12\xa2\x01\n\x17TerminationNotification\x12\x41.io.deephaven.proto.backplane.grpc.TerminationNotificationRequest\x1a\x42.io.deephaven.proto.backplane.grpc.TerminationNotificationResponse\"\x00\x42\x43H\x01P\x01Z=github.com/deephaven/deephaven-core/go/internal/proto/sessionb\x06proto3')
+
+_globals = globals()
+_builder.BuildMessageAndEnumDescriptors(DESCRIPTOR, _globals)
+_builder.BuildTopDescriptorsAndMessages(DESCRIPTOR, 'deephaven_core.proto.session_pb2', _globals)
+if not _descriptor._USE_C_DESCRIPTORS:
+  _globals['DESCRIPTOR']._loaded_options = None
+  _globals['DESCRIPTOR']._serialized_options = b'H\001P\001Z=github.com/deephaven/deephaven-core/go/internal/proto/session'
+  _globals['_HANDSHAKEREQUEST'].fields_by_name['auth_protocol']._loaded_options = None
+  _globals['_HANDSHAKEREQUEST'].fields_by_name['auth_protocol']._serialized_options = b'\030\001'
+  _globals['_HANDSHAKEREQUEST'].fields_by_name['payload']._loaded_options = None
+  _globals['_HANDSHAKEREQUEST'].fields_by_name['payload']._serialized_options = b'\030\001'
+  _globals['_HANDSHAKERESPONSE'].fields_by_name['metadata_header']._loaded_options = None
+  _globals['_HANDSHAKERESPONSE'].fields_by_name['metadata_header']._serialized_options = b'\030\001'
+  _globals['_HANDSHAKERESPONSE'].fields_by_name['session_token']._loaded_options = None
+  _globals['_HANDSHAKERESPONSE'].fields_by_name['session_token']._serialized_options = b'\030\001'
+  _globals['_HANDSHAKERESPONSE'].fields_by_name['token_deadline_time_millis']._loaded_options = None
+  _globals['_HANDSHAKERESPONSE'].fields_by_name['token_deadline_time_millis']._serialized_options = b'\030\0010\001'
+  _globals['_HANDSHAKERESPONSE'].fields_by_name['token_expiration_delay_millis']._loaded_options = None
+  _globals['_HANDSHAKERESPONSE'].fields_by_name['token_expiration_delay_millis']._serialized_options = b'\030\0010\001'
+  _globals['_SESSIONSERVICE'].methods_by_name['NewSession']._loaded_options = None
+  _globals['_SESSIONSERVICE'].methods_by_name['NewSession']._serialized_options = b'\210\002\001'
+  _globals['_SESSIONSERVICE'].methods_by_name['RefreshSessionToken']._loaded_options = None
+  _globals['_SESSIONSERVICE'].methods_by_name['RefreshSessionToken']._serialized_options = b'\210\002\001'
+  _globals['_WRAPPEDAUTHENTICATIONREQUEST']._serialized_start=108
+  _globals['_WRAPPEDAUTHENTICATIONREQUEST']._serialized_end=181
+  _globals['_HANDSHAKEREQUEST']._serialized_start=183
+  _globals['_HANDSHAKEREQUEST']._serialized_end=249
+  _globals['_HANDSHAKERESPONSE']._serialized_start=252
+  _globals['_HANDSHAKERESPONSE']._serialized_end=414
+  _globals['_CLOSESESSIONRESPONSE']._serialized_start=416
+  _globals['_CLOSESESSIONRESPONSE']._serialized_end=438
+  _globals['_RELEASEREQUEST']._serialized_start=440
+  _globals['_RELEASEREQUEST']._serialized_end=511
+  _globals['_RELEASERESPONSE']._serialized_start=513
+  _globals['_RELEASERESPONSE']._serialized_end=530
+  _globals['_EXPORTREQUEST']._serialized_start=533
+  _globals['_EXPORTREQUEST']._serialized_end=672
+  _globals['_EXPORTRESPONSE']._serialized_start=674
+  _globals['_EXPORTRESPONSE']._serialized_end=690
+  _globals['_PUBLISHREQUEST']._serialized_start=693
+  _globals['_PUBLISHREQUEST']._serialized_end=833
+  _globals['_PUBLISHRESPONSE']._serialized_start=835
+  _globals['_PUBLISHRESPONSE']._serialized_end=852
+  _globals['_EXPORTNOTIFICATIONREQUEST']._serialized_start=854
+  _globals['_EXPORTNOTIFICATIONREQUEST']._serialized_end=881
+  _globals['_EXPORTNOTIFICATION']._serialized_start=884
+  _globals['_EXPORTNOTIFICATION']._serialized_end=1323
+  _globals['_EXPORTNOTIFICATION_STATE']._serialized_start=1092
+  _globals['_EXPORTNOTIFICATION_STATE']._serialized_end=1323
+  _globals['_TERMINATIONNOTIFICATIONREQUEST']._serialized_start=1325
+  _globals['_TERMINATIONNOTIFICATIONREQUEST']._serialized_end=1357
+  _globals['_TERMINATIONNOTIFICATIONRESPONSE']._serialized_start=1360
+  _globals['_TERMINATIONNOTIFICATIONRESPONSE']._serialized_end=1639
+  _globals['_TERMINATIONNOTIFICATIONRESPONSE_STACKTRACE']._serialized_start=1578
+  _globals['_TERMINATIONNOTIFICATIONRESPONSE_STACKTRACE']._serialized_end=1639
+  _globals['_SESSIONSERVICE']._serialized_start=1642
+  _globals['_SESSIONSERVICE']._serialized_end=2723
+# @@protoc_insertion_point(module_scope)
diff --git a/py/client/pydeephaven/proto/session_pb2_grpc.py b/py/client/deephaven_core/proto/session_pb2_grpc.py
similarity index 76%
rename from py/client/pydeephaven/proto/session_pb2_grpc.py
rename to py/client/deephaven_core/proto/session_pb2_grpc.py
index 17bb6941a69..ef2966fb2d8 100644
--- a/py/client/pydeephaven/proto/session_pb2_grpc.py
+++ b/py/client/deephaven_core/proto/session_pb2_grpc.py
@@ -3,7 +3,7 @@
 import grpc
 import warnings
 
-from pydeephaven.proto import session_pb2 as deephaven_dot_proto_dot_session__pb2
+from deephaven_core.proto import session_pb2 as deephaven__core_dot_proto_dot_session__pb2
 
 GRPC_GENERATED_VERSION = '1.63.0'
 GRPC_VERSION = grpc.__version__
@@ -20,7 +20,7 @@
 if _version_not_supported:
     warnings.warn(
         f'The grpc package installed is at version {GRPC_VERSION},'
-        + f' but the generated code in deephaven/proto/session_pb2_grpc.py depends on'
+        + f' but the generated code in deephaven_core/proto/session_pb2_grpc.py depends on'
         + f' grpcio>={GRPC_GENERATED_VERSION}.'
         + f' Please upgrade your grpc module to grpcio>={GRPC_GENERATED_VERSION}'
         + f' or downgrade your generated code using grpcio-tools<={GRPC_VERSION}.'
@@ -55,43 +55,43 @@ def __init__(self, channel):
         """
         self.NewSession = channel.unary_unary(
                 '/io.deephaven.proto.backplane.grpc.SessionService/NewSession',
-                request_serializer=deephaven_dot_proto_dot_session__pb2.HandshakeRequest.SerializeToString,
-                response_deserializer=deephaven_dot_proto_dot_session__pb2.HandshakeResponse.FromString,
+                request_serializer=deephaven__core_dot_proto_dot_session__pb2.HandshakeRequest.SerializeToString,
+                response_deserializer=deephaven__core_dot_proto_dot_session__pb2.HandshakeResponse.FromString,
                 _registered_method=True)
         self.RefreshSessionToken = channel.unary_unary(
                 '/io.deephaven.proto.backplane.grpc.SessionService/RefreshSessionToken',
-                request_serializer=deephaven_dot_proto_dot_session__pb2.HandshakeRequest.SerializeToString,
-                response_deserializer=deephaven_dot_proto_dot_session__pb2.HandshakeResponse.FromString,
+                request_serializer=deephaven__core_dot_proto_dot_session__pb2.HandshakeRequest.SerializeToString,
+                response_deserializer=deephaven__core_dot_proto_dot_session__pb2.HandshakeResponse.FromString,
                 _registered_method=True)
         self.CloseSession = channel.unary_unary(
                 '/io.deephaven.proto.backplane.grpc.SessionService/CloseSession',
-                request_serializer=deephaven_dot_proto_dot_session__pb2.HandshakeRequest.SerializeToString,
-                response_deserializer=deephaven_dot_proto_dot_session__pb2.CloseSessionResponse.FromString,
+                request_serializer=deephaven__core_dot_proto_dot_session__pb2.HandshakeRequest.SerializeToString,
+                response_deserializer=deephaven__core_dot_proto_dot_session__pb2.CloseSessionResponse.FromString,
                 _registered_method=True)
         self.Release = channel.unary_unary(
                 '/io.deephaven.proto.backplane.grpc.SessionService/Release',
-                request_serializer=deephaven_dot_proto_dot_session__pb2.ReleaseRequest.SerializeToString,
-                response_deserializer=deephaven_dot_proto_dot_session__pb2.ReleaseResponse.FromString,
+                request_serializer=deephaven__core_dot_proto_dot_session__pb2.ReleaseRequest.SerializeToString,
+                response_deserializer=deephaven__core_dot_proto_dot_session__pb2.ReleaseResponse.FromString,
                 _registered_method=True)
         self.ExportFromTicket = channel.unary_unary(
                 '/io.deephaven.proto.backplane.grpc.SessionService/ExportFromTicket',
-                request_serializer=deephaven_dot_proto_dot_session__pb2.ExportRequest.SerializeToString,
-                response_deserializer=deephaven_dot_proto_dot_session__pb2.ExportResponse.FromString,
+                request_serializer=deephaven__core_dot_proto_dot_session__pb2.ExportRequest.SerializeToString,
+                response_deserializer=deephaven__core_dot_proto_dot_session__pb2.ExportResponse.FromString,
                 _registered_method=True)
         self.PublishFromTicket = channel.unary_unary(
                 '/io.deephaven.proto.backplane.grpc.SessionService/PublishFromTicket',
-                request_serializer=deephaven_dot_proto_dot_session__pb2.PublishRequest.SerializeToString,
-                response_deserializer=deephaven_dot_proto_dot_session__pb2.PublishResponse.FromString,
+                request_serializer=deephaven__core_dot_proto_dot_session__pb2.PublishRequest.SerializeToString,
+                response_deserializer=deephaven__core_dot_proto_dot_session__pb2.PublishResponse.FromString,
                 _registered_method=True)
         self.ExportNotifications = channel.unary_stream(
                 '/io.deephaven.proto.backplane.grpc.SessionService/ExportNotifications',
-                request_serializer=deephaven_dot_proto_dot_session__pb2.ExportNotificationRequest.SerializeToString,
-                response_deserializer=deephaven_dot_proto_dot_session__pb2.ExportNotification.FromString,
+                request_serializer=deephaven__core_dot_proto_dot_session__pb2.ExportNotificationRequest.SerializeToString,
+                response_deserializer=deephaven__core_dot_proto_dot_session__pb2.ExportNotification.FromString,
                 _registered_method=True)
         self.TerminationNotification = channel.unary_unary(
                 '/io.deephaven.proto.backplane.grpc.SessionService/TerminationNotification',
-                request_serializer=deephaven_dot_proto_dot_session__pb2.TerminationNotificationRequest.SerializeToString,
-                response_deserializer=deephaven_dot_proto_dot_session__pb2.TerminationNotificationResponse.FromString,
+                request_serializer=deephaven__core_dot_proto_dot_session__pb2.TerminationNotificationRequest.SerializeToString,
+                response_deserializer=deephaven__core_dot_proto_dot_session__pb2.TerminationNotificationResponse.FromString,
                 _registered_method=True)
 
 
@@ -198,43 +198,43 @@ def add_SessionServiceServicer_to_server(servicer, server):
     rpc_method_handlers = {
             'NewSession': grpc.unary_unary_rpc_method_handler(
                     servicer.NewSession,
-                    request_deserializer=deephaven_dot_proto_dot_session__pb2.HandshakeRequest.FromString,
-                    response_serializer=deephaven_dot_proto_dot_session__pb2.HandshakeResponse.SerializeToString,
+                    request_deserializer=deephaven__core_dot_proto_dot_session__pb2.HandshakeRequest.FromString,
+                    response_serializer=deephaven__core_dot_proto_dot_session__pb2.HandshakeResponse.SerializeToString,
             ),
             'RefreshSessionToken': grpc.unary_unary_rpc_method_handler(
                     servicer.RefreshSessionToken,
-                    request_deserializer=deephaven_dot_proto_dot_session__pb2.HandshakeRequest.FromString,
-                    response_serializer=deephaven_dot_proto_dot_session__pb2.HandshakeResponse.SerializeToString,
+                    request_deserializer=deephaven__core_dot_proto_dot_session__pb2.HandshakeRequest.FromString,
+                    response_serializer=deephaven__core_dot_proto_dot_session__pb2.HandshakeResponse.SerializeToString,
             ),
             'CloseSession': grpc.unary_unary_rpc_method_handler(
                     servicer.CloseSession,
-                    request_deserializer=deephaven_dot_proto_dot_session__pb2.HandshakeRequest.FromString,
-                    response_serializer=deephaven_dot_proto_dot_session__pb2.CloseSessionResponse.SerializeToString,
+                    request_deserializer=deephaven__core_dot_proto_dot_session__pb2.HandshakeRequest.FromString,
+                    response_serializer=deephaven__core_dot_proto_dot_session__pb2.CloseSessionResponse.SerializeToString,
             ),
             'Release': grpc.unary_unary_rpc_method_handler(
                     servicer.Release,
-                    request_deserializer=deephaven_dot_proto_dot_session__pb2.ReleaseRequest.FromString,
-                    response_serializer=deephaven_dot_proto_dot_session__pb2.ReleaseResponse.SerializeToString,
+                    request_deserializer=deephaven__core_dot_proto_dot_session__pb2.ReleaseRequest.FromString,
+                    response_serializer=deephaven__core_dot_proto_dot_session__pb2.ReleaseResponse.SerializeToString,
             ),
             'ExportFromTicket': grpc.unary_unary_rpc_method_handler(
                     servicer.ExportFromTicket,
-                    request_deserializer=deephaven_dot_proto_dot_session__pb2.ExportRequest.FromString,
-                    response_serializer=deephaven_dot_proto_dot_session__pb2.ExportResponse.SerializeToString,
+                    request_deserializer=deephaven__core_dot_proto_dot_session__pb2.ExportRequest.FromString,
+                    response_serializer=deephaven__core_dot_proto_dot_session__pb2.ExportResponse.SerializeToString,
             ),
             'PublishFromTicket': grpc.unary_unary_rpc_method_handler(
                     servicer.PublishFromTicket,
-                    request_deserializer=deephaven_dot_proto_dot_session__pb2.PublishRequest.FromString,
-                    response_serializer=deephaven_dot_proto_dot_session__pb2.PublishResponse.SerializeToString,
+                    request_deserializer=deephaven__core_dot_proto_dot_session__pb2.PublishRequest.FromString,
+                    response_serializer=deephaven__core_dot_proto_dot_session__pb2.PublishResponse.SerializeToString,
             ),
             'ExportNotifications': grpc.unary_stream_rpc_method_handler(
                     servicer.ExportNotifications,
-                    request_deserializer=deephaven_dot_proto_dot_session__pb2.ExportNotificationRequest.FromString,
-                    response_serializer=deephaven_dot_proto_dot_session__pb2.ExportNotification.SerializeToString,
+                    request_deserializer=deephaven__core_dot_proto_dot_session__pb2.ExportNotificationRequest.FromString,
+                    response_serializer=deephaven__core_dot_proto_dot_session__pb2.ExportNotification.SerializeToString,
             ),
             'TerminationNotification': grpc.unary_unary_rpc_method_handler(
                     servicer.TerminationNotification,
-                    request_deserializer=deephaven_dot_proto_dot_session__pb2.TerminationNotificationRequest.FromString,
-                    response_serializer=deephaven_dot_proto_dot_session__pb2.TerminationNotificationResponse.SerializeToString,
+                    request_deserializer=deephaven__core_dot_proto_dot_session__pb2.TerminationNotificationRequest.FromString,
+                    response_serializer=deephaven__core_dot_proto_dot_session__pb2.TerminationNotificationResponse.SerializeToString,
             ),
     }
     generic_handler = grpc.method_handlers_generic_handler(
@@ -275,8 +275,8 @@ def NewSession(request,
             request,
             target,
             '/io.deephaven.proto.backplane.grpc.SessionService/NewSession',
-            deephaven_dot_proto_dot_session__pb2.HandshakeRequest.SerializeToString,
-            deephaven_dot_proto_dot_session__pb2.HandshakeResponse.FromString,
+            deephaven__core_dot_proto_dot_session__pb2.HandshakeRequest.SerializeToString,
+            deephaven__core_dot_proto_dot_session__pb2.HandshakeResponse.FromString,
             options,
             channel_credentials,
             insecure,
@@ -302,8 +302,8 @@ def RefreshSessionToken(request,
             request,
             target,
             '/io.deephaven.proto.backplane.grpc.SessionService/RefreshSessionToken',
-            deephaven_dot_proto_dot_session__pb2.HandshakeRequest.SerializeToString,
-            deephaven_dot_proto_dot_session__pb2.HandshakeResponse.FromString,
+            deephaven__core_dot_proto_dot_session__pb2.HandshakeRequest.SerializeToString,
+            deephaven__core_dot_proto_dot_session__pb2.HandshakeResponse.FromString,
             options,
             channel_credentials,
             insecure,
@@ -329,8 +329,8 @@ def CloseSession(request,
             request,
             target,
             '/io.deephaven.proto.backplane.grpc.SessionService/CloseSession',
-            deephaven_dot_proto_dot_session__pb2.HandshakeRequest.SerializeToString,
-            deephaven_dot_proto_dot_session__pb2.CloseSessionResponse.FromString,
+            deephaven__core_dot_proto_dot_session__pb2.HandshakeRequest.SerializeToString,
+            deephaven__core_dot_proto_dot_session__pb2.CloseSessionResponse.FromString,
             options,
             channel_credentials,
             insecure,
@@ -356,8 +356,8 @@ def Release(request,
             request,
             target,
             '/io.deephaven.proto.backplane.grpc.SessionService/Release',
-            deephaven_dot_proto_dot_session__pb2.ReleaseRequest.SerializeToString,
-            deephaven_dot_proto_dot_session__pb2.ReleaseResponse.FromString,
+            deephaven__core_dot_proto_dot_session__pb2.ReleaseRequest.SerializeToString,
+            deephaven__core_dot_proto_dot_session__pb2.ReleaseResponse.FromString,
             options,
             channel_credentials,
             insecure,
@@ -383,8 +383,8 @@ def ExportFromTicket(request,
             request,
             target,
             '/io.deephaven.proto.backplane.grpc.SessionService/ExportFromTicket',
-            deephaven_dot_proto_dot_session__pb2.ExportRequest.SerializeToString,
-            deephaven_dot_proto_dot_session__pb2.ExportResponse.FromString,
+            deephaven__core_dot_proto_dot_session__pb2.ExportRequest.SerializeToString,
+            deephaven__core_dot_proto_dot_session__pb2.ExportResponse.FromString,
             options,
             channel_credentials,
             insecure,
@@ -410,8 +410,8 @@ def PublishFromTicket(request,
             request,
             target,
             '/io.deephaven.proto.backplane.grpc.SessionService/PublishFromTicket',
-            deephaven_dot_proto_dot_session__pb2.PublishRequest.SerializeToString,
-            deephaven_dot_proto_dot_session__pb2.PublishResponse.FromString,
+            deephaven__core_dot_proto_dot_session__pb2.PublishRequest.SerializeToString,
+            deephaven__core_dot_proto_dot_session__pb2.PublishResponse.FromString,
             options,
             channel_credentials,
             insecure,
@@ -437,8 +437,8 @@ def ExportNotifications(request,
             request,
             target,
             '/io.deephaven.proto.backplane.grpc.SessionService/ExportNotifications',
-            deephaven_dot_proto_dot_session__pb2.ExportNotificationRequest.SerializeToString,
-            deephaven_dot_proto_dot_session__pb2.ExportNotification.FromString,
+            deephaven__core_dot_proto_dot_session__pb2.ExportNotificationRequest.SerializeToString,
+            deephaven__core_dot_proto_dot_session__pb2.ExportNotification.FromString,
             options,
             channel_credentials,
             insecure,
@@ -464,8 +464,8 @@ def TerminationNotification(request,
             request,
             target,
             '/io.deephaven.proto.backplane.grpc.SessionService/TerminationNotification',
-            deephaven_dot_proto_dot_session__pb2.TerminationNotificationRequest.SerializeToString,
-            deephaven_dot_proto_dot_session__pb2.TerminationNotificationResponse.FromString,
+            deephaven__core_dot_proto_dot_session__pb2.TerminationNotificationRequest.SerializeToString,
+            deephaven__core_dot_proto_dot_session__pb2.TerminationNotificationResponse.FromString,
             options,
             channel_credentials,
             insecure,
diff --git a/py/client/deephaven_core/proto/storage_pb2.py b/py/client/deephaven_core/proto/storage_pb2.py
new file mode 100644
index 00000000000..024d92ab9a3
--- /dev/null
+++ b/py/client/deephaven_core/proto/storage_pb2.py
@@ -0,0 +1,57 @@
+# -*- coding: utf-8 -*-
+# Generated by the protocol buffer compiler.  DO NOT EDIT!
+# source: deephaven_core/proto/storage.proto
+# Protobuf Python Version: 5.26.1
+"""Generated protocol buffer code."""
+from google.protobuf import descriptor as _descriptor
+from google.protobuf import descriptor_pool as _descriptor_pool
+from google.protobuf import symbol_database as _symbol_database
+from google.protobuf.internal import builder as _builder
+# @@protoc_insertion_point(imports)
+
+_sym_db = _symbol_database.Default()
+
+
+
+
+DESCRIPTOR = _descriptor_pool.Default().AddSerializedFile(b'\n\"deephaven_core/proto/storage.proto\x12!io.deephaven.proto.backplane.grpc\"J\n\x10ListItemsRequest\x12\x0c\n\x04path\x18\x01 \x01(\t\x12\x18\n\x0b\x66ilter_glob\x18\x04 \x01(\tH\x00\x88\x01\x01\x42\x0e\n\x0c_filter_glob\"\x81\x01\n\x08ItemInfo\x12\x0c\n\x04path\x18\x01 \x01(\t\x12\x39\n\x04type\x18\x02 \x01(\x0e\x32+.io.deephaven.proto.backplane.grpc.ItemType\x12\x10\n\x04size\x18\x03 \x01(\x12\x42\x02\x30\x01\x12\x11\n\x04\x65tag\x18\x04 \x01(\tH\x00\x88\x01\x01\x42\x07\n\x05_etag\"g\n\x11ListItemsResponse\x12:\n\x05items\x18\x01 \x03(\x0b\x32+.io.deephaven.proto.backplane.grpc.ItemInfo\x12\x16\n\x0e\x63\x61nonical_path\x18\x02 \x01(\t\"<\n\x10\x46\x65tchFileRequest\x12\x0c\n\x04path\x18\x01 \x01(\t\x12\x11\n\x04\x65tag\x18\x02 \x01(\tH\x00\x88\x01\x01\x42\x07\n\x05_etag\"A\n\x11\x46\x65tchFileResponse\x12\x10\n\x08\x63ontents\x18\x01 \x01(\x0c\x12\x11\n\x04\x65tag\x18\x02 \x01(\tH\x00\x88\x01\x01\x42\x07\n\x05_etag\"J\n\x0fSaveFileRequest\x12\x17\n\x0f\x61llow_overwrite\x18\x01 \x01(\x08\x12\x0c\n\x04path\x18\x02 \x01(\t\x12\x10\n\x08\x63ontents\x18\x03 \x01(\x0c\".\n\x10SaveFileResponse\x12\x11\n\x04\x65tag\x18\x01 \x01(\tH\x00\x88\x01\x01\x42\x07\n\x05_etag\"N\n\x0fMoveItemRequest\x12\x10\n\x08old_path\x18\x01 \x01(\t\x12\x10\n\x08new_path\x18\x02 \x01(\t\x12\x17\n\x0f\x61llow_overwrite\x18\x03 \x01(\x08\"\x12\n\x10MoveItemResponse\"&\n\x16\x43reateDirectoryRequest\x12\x0c\n\x04path\x18\x01 \x01(\t\"\x19\n\x17\x43reateDirectoryResponse\"!\n\x11\x44\x65leteItemRequest\x12\x0c\n\x04path\x18\x01 \x01(\t\"\x14\n\x12\x44\x65leteItemResponse*0\n\x08ItemType\x12\x0b\n\x07UNKNOWN\x10\x00\x12\r\n\tDIRECTORY\x10\x01\x12\x08\n\x04\x46ILE\x10\x02\x32\xfc\x05\n\x0eStorageService\x12x\n\tListItems\x12\x33.io.deephaven.proto.backplane.grpc.ListItemsRequest\x1a\x34.io.deephaven.proto.backplane.grpc.ListItemsResponse\"\x00\x12x\n\tFetchFile\x12\x33.io.deephaven.proto.backplane.grpc.FetchFileRequest\x1a\x34.io.deephaven.proto.backplane.grpc.FetchFileResponse\"\x00\x12u\n\x08SaveFile\x12\x32.io.deephaven.proto.backplane.grpc.SaveFileRequest\x1a\x33.io.deephaven.proto.backplane.grpc.SaveFileResponse\"\x00\x12u\n\x08MoveItem\x12\x32.io.deephaven.proto.backplane.grpc.MoveItemRequest\x1a\x33.io.deephaven.proto.backplane.grpc.MoveItemResponse\"\x00\x12\x8a\x01\n\x0f\x43reateDirectory\x12\x39.io.deephaven.proto.backplane.grpc.CreateDirectoryRequest\x1a:.io.deephaven.proto.backplane.grpc.CreateDirectoryResponse\"\x00\x12{\n\nDeleteItem\x12\x34.io.deephaven.proto.backplane.grpc.DeleteItemRequest\x1a\x35.io.deephaven.proto.backplane.grpc.DeleteItemResponse\"\x00\x42\x43H\x01P\x01Z=github.com/deephaven/deephaven-core/go/internal/proto/storageb\x06proto3')
+
+_globals = globals()
+_builder.BuildMessageAndEnumDescriptors(DESCRIPTOR, _globals)
+_builder.BuildTopDescriptorsAndMessages(DESCRIPTOR, 'deephaven_core.proto.storage_pb2', _globals)
+if not _descriptor._USE_C_DESCRIPTORS:
+  _globals['DESCRIPTOR']._loaded_options = None
+  _globals['DESCRIPTOR']._serialized_options = b'H\001P\001Z=github.com/deephaven/deephaven-core/go/internal/proto/storage'
+  _globals['_ITEMINFO'].fields_by_name['size']._loaded_options = None
+  _globals['_ITEMINFO'].fields_by_name['size']._serialized_options = b'0\001'
+  _globals['_ITEMTYPE']._serialized_start=863
+  _globals['_ITEMTYPE']._serialized_end=911
+  _globals['_LISTITEMSREQUEST']._serialized_start=73
+  _globals['_LISTITEMSREQUEST']._serialized_end=147
+  _globals['_ITEMINFO']._serialized_start=150
+  _globals['_ITEMINFO']._serialized_end=279
+  _globals['_LISTITEMSRESPONSE']._serialized_start=281
+  _globals['_LISTITEMSRESPONSE']._serialized_end=384
+  _globals['_FETCHFILEREQUEST']._serialized_start=386
+  _globals['_FETCHFILEREQUEST']._serialized_end=446
+  _globals['_FETCHFILERESPONSE']._serialized_start=448
+  _globals['_FETCHFILERESPONSE']._serialized_end=513
+  _globals['_SAVEFILEREQUEST']._serialized_start=515
+  _globals['_SAVEFILEREQUEST']._serialized_end=589
+  _globals['_SAVEFILERESPONSE']._serialized_start=591
+  _globals['_SAVEFILERESPONSE']._serialized_end=637
+  _globals['_MOVEITEMREQUEST']._serialized_start=639
+  _globals['_MOVEITEMREQUEST']._serialized_end=717
+  _globals['_MOVEITEMRESPONSE']._serialized_start=719
+  _globals['_MOVEITEMRESPONSE']._serialized_end=737
+  _globals['_CREATEDIRECTORYREQUEST']._serialized_start=739
+  _globals['_CREATEDIRECTORYREQUEST']._serialized_end=777
+  _globals['_CREATEDIRECTORYRESPONSE']._serialized_start=779
+  _globals['_CREATEDIRECTORYRESPONSE']._serialized_end=804
+  _globals['_DELETEITEMREQUEST']._serialized_start=806
+  _globals['_DELETEITEMREQUEST']._serialized_end=839
+  _globals['_DELETEITEMRESPONSE']._serialized_start=841
+  _globals['_DELETEITEMRESPONSE']._serialized_end=861
+  _globals['_STORAGESERVICE']._serialized_start=914
+  _globals['_STORAGESERVICE']._serialized_end=1678
+# @@protoc_insertion_point(module_scope)
diff --git a/py/client/deephaven_core/proto/storage_pb2_grpc.py b/py/client/deephaven_core/proto/storage_pb2_grpc.py
new file mode 100644
index 00000000000..69baa9972ce
--- /dev/null
+++ b/py/client/deephaven_core/proto/storage_pb2_grpc.py
@@ -0,0 +1,341 @@
+# Generated by the gRPC Python protocol compiler plugin. DO NOT EDIT!
+"""Client and server classes corresponding to protobuf-defined services."""
+import grpc
+import warnings
+
+from deephaven_core.proto import storage_pb2 as deephaven__core_dot_proto_dot_storage__pb2
+
+GRPC_GENERATED_VERSION = '1.63.0'
+GRPC_VERSION = grpc.__version__
+EXPECTED_ERROR_RELEASE = '1.65.0'
+SCHEDULED_RELEASE_DATE = 'June 25, 2024'
+_version_not_supported = False
+
+try:
+    from grpc._utilities import first_version_is_lower
+    _version_not_supported = first_version_is_lower(GRPC_VERSION, GRPC_GENERATED_VERSION)
+except ImportError:
+    _version_not_supported = True
+
+if _version_not_supported:
+    warnings.warn(
+        f'The grpc package installed is at version {GRPC_VERSION},'
+        + f' but the generated code in deephaven_core/proto/storage_pb2_grpc.py depends on'
+        + f' grpcio>={GRPC_GENERATED_VERSION}.'
+        + f' Please upgrade your grpc module to grpcio>={GRPC_GENERATED_VERSION}'
+        + f' or downgrade your generated code using grpcio-tools<={GRPC_VERSION}.'
+        + f' This warning will become an error in {EXPECTED_ERROR_RELEASE},'
+        + f' scheduled for release on {SCHEDULED_RELEASE_DATE}.',
+        RuntimeWarning
+    )
+
+
+class StorageServiceStub(object):
+    """
+    Shared storage management service.
+
+    Operations may fail (or omit data) if the current session does not have permission to read or write that resource.
+
+    Paths will be "/" delimited and must start with a leading slash.
+    """
+
+    def __init__(self, channel):
+        """Constructor.
+
+        Args:
+            channel: A grpc.Channel.
+        """
+        self.ListItems = channel.unary_unary(
+                '/io.deephaven.proto.backplane.grpc.StorageService/ListItems',
+                request_serializer=deephaven__core_dot_proto_dot_storage__pb2.ListItemsRequest.SerializeToString,
+                response_deserializer=deephaven__core_dot_proto_dot_storage__pb2.ListItemsResponse.FromString,
+                _registered_method=True)
+        self.FetchFile = channel.unary_unary(
+                '/io.deephaven.proto.backplane.grpc.StorageService/FetchFile',
+                request_serializer=deephaven__core_dot_proto_dot_storage__pb2.FetchFileRequest.SerializeToString,
+                response_deserializer=deephaven__core_dot_proto_dot_storage__pb2.FetchFileResponse.FromString,
+                _registered_method=True)
+        self.SaveFile = channel.unary_unary(
+                '/io.deephaven.proto.backplane.grpc.StorageService/SaveFile',
+                request_serializer=deephaven__core_dot_proto_dot_storage__pb2.SaveFileRequest.SerializeToString,
+                response_deserializer=deephaven__core_dot_proto_dot_storage__pb2.SaveFileResponse.FromString,
+                _registered_method=True)
+        self.MoveItem = channel.unary_unary(
+                '/io.deephaven.proto.backplane.grpc.StorageService/MoveItem',
+                request_serializer=deephaven__core_dot_proto_dot_storage__pb2.MoveItemRequest.SerializeToString,
+                response_deserializer=deephaven__core_dot_proto_dot_storage__pb2.MoveItemResponse.FromString,
+                _registered_method=True)
+        self.CreateDirectory = channel.unary_unary(
+                '/io.deephaven.proto.backplane.grpc.StorageService/CreateDirectory',
+                request_serializer=deephaven__core_dot_proto_dot_storage__pb2.CreateDirectoryRequest.SerializeToString,
+                response_deserializer=deephaven__core_dot_proto_dot_storage__pb2.CreateDirectoryResponse.FromString,
+                _registered_method=True)
+        self.DeleteItem = channel.unary_unary(
+                '/io.deephaven.proto.backplane.grpc.StorageService/DeleteItem',
+                request_serializer=deephaven__core_dot_proto_dot_storage__pb2.DeleteItemRequest.SerializeToString,
+                response_deserializer=deephaven__core_dot_proto_dot_storage__pb2.DeleteItemResponse.FromString,
+                _registered_method=True)
+
+
+class StorageServiceServicer(object):
+    """
+    Shared storage management service.
+
+    Operations may fail (or omit data) if the current session does not have permission to read or write that resource.
+
+    Paths will be "/" delimited and must start with a leading slash.
+    """
+
+    def ListItems(self, request, context):
+        """Lists the files and directories present in a given directory. Will return an error
+        """
+        context.set_code(grpc.StatusCode.UNIMPLEMENTED)
+        context.set_details('Method not implemented!')
+        raise NotImplementedError('Method not implemented!')
+
+    def FetchFile(self, request, context):
+        """Reads the file at the given path. Client can optionally specify an etag, asking the server
+        not to send the file if it hasn't changed.
+        """
+        context.set_code(grpc.StatusCode.UNIMPLEMENTED)
+        context.set_details('Method not implemented!')
+        raise NotImplementedError('Method not implemented!')
+
+    def SaveFile(self, request, context):
+        """Can create new files or modify existing with client provided contents.
+        """
+        context.set_code(grpc.StatusCode.UNIMPLEMENTED)
+        context.set_details('Method not implemented!')
+        raise NotImplementedError('Method not implemented!')
+
+    def MoveItem(self, request, context):
+        """Moves a file from one path to another.
+        """
+        context.set_code(grpc.StatusCode.UNIMPLEMENTED)
+        context.set_details('Method not implemented!')
+        raise NotImplementedError('Method not implemented!')
+
+    def CreateDirectory(self, request, context):
+        """Creates a directory at the given path.
+        """
+        context.set_code(grpc.StatusCode.UNIMPLEMENTED)
+        context.set_details('Method not implemented!')
+        raise NotImplementedError('Method not implemented!')
+
+    def DeleteItem(self, request, context):
+        """Deletes the file or directory at the given path. Directories must be empty to be deleted.
+        """
+        context.set_code(grpc.StatusCode.UNIMPLEMENTED)
+        context.set_details('Method not implemented!')
+        raise NotImplementedError('Method not implemented!')
+
+
+def add_StorageServiceServicer_to_server(servicer, server):
+    rpc_method_handlers = {
+            'ListItems': grpc.unary_unary_rpc_method_handler(
+                    servicer.ListItems,
+                    request_deserializer=deephaven__core_dot_proto_dot_storage__pb2.ListItemsRequest.FromString,
+                    response_serializer=deephaven__core_dot_proto_dot_storage__pb2.ListItemsResponse.SerializeToString,
+            ),
+            'FetchFile': grpc.unary_unary_rpc_method_handler(
+                    servicer.FetchFile,
+                    request_deserializer=deephaven__core_dot_proto_dot_storage__pb2.FetchFileRequest.FromString,
+                    response_serializer=deephaven__core_dot_proto_dot_storage__pb2.FetchFileResponse.SerializeToString,
+            ),
+            'SaveFile': grpc.unary_unary_rpc_method_handler(
+                    servicer.SaveFile,
+                    request_deserializer=deephaven__core_dot_proto_dot_storage__pb2.SaveFileRequest.FromString,
+                    response_serializer=deephaven__core_dot_proto_dot_storage__pb2.SaveFileResponse.SerializeToString,
+            ),
+            'MoveItem': grpc.unary_unary_rpc_method_handler(
+                    servicer.MoveItem,
+                    request_deserializer=deephaven__core_dot_proto_dot_storage__pb2.MoveItemRequest.FromString,
+                    response_serializer=deephaven__core_dot_proto_dot_storage__pb2.MoveItemResponse.SerializeToString,
+            ),
+            'CreateDirectory': grpc.unary_unary_rpc_method_handler(
+                    servicer.CreateDirectory,
+                    request_deserializer=deephaven__core_dot_proto_dot_storage__pb2.CreateDirectoryRequest.FromString,
+                    response_serializer=deephaven__core_dot_proto_dot_storage__pb2.CreateDirectoryResponse.SerializeToString,
+            ),
+            'DeleteItem': grpc.unary_unary_rpc_method_handler(
+                    servicer.DeleteItem,
+                    request_deserializer=deephaven__core_dot_proto_dot_storage__pb2.DeleteItemRequest.FromString,
+                    response_serializer=deephaven__core_dot_proto_dot_storage__pb2.DeleteItemResponse.SerializeToString,
+            ),
+    }
+    generic_handler = grpc.method_handlers_generic_handler(
+            'io.deephaven.proto.backplane.grpc.StorageService', rpc_method_handlers)
+    server.add_generic_rpc_handlers((generic_handler,))
+
+
+ # This class is part of an EXPERIMENTAL API.
+class StorageService(object):
+    """
+    Shared storage management service.
+
+    Operations may fail (or omit data) if the current session does not have permission to read or write that resource.
+
+    Paths will be "/" delimited and must start with a leading slash.
+    """
+
+    @staticmethod
+    def ListItems(request,
+            target,
+            options=(),
+            channel_credentials=None,
+            call_credentials=None,
+            insecure=False,
+            compression=None,
+            wait_for_ready=None,
+            timeout=None,
+            metadata=None):
+        return grpc.experimental.unary_unary(
+            request,
+            target,
+            '/io.deephaven.proto.backplane.grpc.StorageService/ListItems',
+            deephaven__core_dot_proto_dot_storage__pb2.ListItemsRequest.SerializeToString,
+            deephaven__core_dot_proto_dot_storage__pb2.ListItemsResponse.FromString,
+            options,
+            channel_credentials,
+            insecure,
+            call_credentials,
+            compression,
+            wait_for_ready,
+            timeout,
+            metadata,
+            _registered_method=True)
+
+    @staticmethod
+    def FetchFile(request,
+            target,
+            options=(),
+            channel_credentials=None,
+            call_credentials=None,
+            insecure=False,
+            compression=None,
+            wait_for_ready=None,
+            timeout=None,
+            metadata=None):
+        return grpc.experimental.unary_unary(
+            request,
+            target,
+            '/io.deephaven.proto.backplane.grpc.StorageService/FetchFile',
+            deephaven__core_dot_proto_dot_storage__pb2.FetchFileRequest.SerializeToString,
+            deephaven__core_dot_proto_dot_storage__pb2.FetchFileResponse.FromString,
+            options,
+            channel_credentials,
+            insecure,
+            call_credentials,
+            compression,
+            wait_for_ready,
+            timeout,
+            metadata,
+            _registered_method=True)
+
+    @staticmethod
+    def SaveFile(request,
+            target,
+            options=(),
+            channel_credentials=None,
+            call_credentials=None,
+            insecure=False,
+            compression=None,
+            wait_for_ready=None,
+            timeout=None,
+            metadata=None):
+        return grpc.experimental.unary_unary(
+            request,
+            target,
+            '/io.deephaven.proto.backplane.grpc.StorageService/SaveFile',
+            deephaven__core_dot_proto_dot_storage__pb2.SaveFileRequest.SerializeToString,
+            deephaven__core_dot_proto_dot_storage__pb2.SaveFileResponse.FromString,
+            options,
+            channel_credentials,
+            insecure,
+            call_credentials,
+            compression,
+            wait_for_ready,
+            timeout,
+            metadata,
+            _registered_method=True)
+
+    @staticmethod
+    def MoveItem(request,
+            target,
+            options=(),
+            channel_credentials=None,
+            call_credentials=None,
+            insecure=False,
+            compression=None,
+            wait_for_ready=None,
+            timeout=None,
+            metadata=None):
+        return grpc.experimental.unary_unary(
+            request,
+            target,
+            '/io.deephaven.proto.backplane.grpc.StorageService/MoveItem',
+            deephaven__core_dot_proto_dot_storage__pb2.MoveItemRequest.SerializeToString,
+            deephaven__core_dot_proto_dot_storage__pb2.MoveItemResponse.FromString,
+            options,
+            channel_credentials,
+            insecure,
+            call_credentials,
+            compression,
+            wait_for_ready,
+            timeout,
+            metadata,
+            _registered_method=True)
+
+    @staticmethod
+    def CreateDirectory(request,
+            target,
+            options=(),
+            channel_credentials=None,
+            call_credentials=None,
+            insecure=False,
+            compression=None,
+            wait_for_ready=None,
+            timeout=None,
+            metadata=None):
+        return grpc.experimental.unary_unary(
+            request,
+            target,
+            '/io.deephaven.proto.backplane.grpc.StorageService/CreateDirectory',
+            deephaven__core_dot_proto_dot_storage__pb2.CreateDirectoryRequest.SerializeToString,
+            deephaven__core_dot_proto_dot_storage__pb2.CreateDirectoryResponse.FromString,
+            options,
+            channel_credentials,
+            insecure,
+            call_credentials,
+            compression,
+            wait_for_ready,
+            timeout,
+            metadata,
+            _registered_method=True)
+
+    @staticmethod
+    def DeleteItem(request,
+            target,
+            options=(),
+            channel_credentials=None,
+            call_credentials=None,
+            insecure=False,
+            compression=None,
+            wait_for_ready=None,
+            timeout=None,
+            metadata=None):
+        return grpc.experimental.unary_unary(
+            request,
+            target,
+            '/io.deephaven.proto.backplane.grpc.StorageService/DeleteItem',
+            deephaven__core_dot_proto_dot_storage__pb2.DeleteItemRequest.SerializeToString,
+            deephaven__core_dot_proto_dot_storage__pb2.DeleteItemResponse.FromString,
+            options,
+            channel_credentials,
+            insecure,
+            call_credentials,
+            compression,
+            wait_for_ready,
+            timeout,
+            metadata,
+            _registered_method=True)
diff --git a/py/client/deephaven_core/proto/table_pb2.py b/py/client/deephaven_core/proto/table_pb2.py
new file mode 100644
index 00000000000..1442f9932a8
--- /dev/null
+++ b/py/client/deephaven_core/proto/table_pb2.py
@@ -0,0 +1,354 @@
+# -*- coding: utf-8 -*-
+# Generated by the protocol buffer compiler.  DO NOT EDIT!
+# source: deephaven_core/proto/table.proto
+# Protobuf Python Version: 5.26.1
+"""Generated protocol buffer code."""
+from google.protobuf import descriptor as _descriptor
+from google.protobuf import descriptor_pool as _descriptor_pool
+from google.protobuf import symbol_database as _symbol_database
+from google.protobuf.internal import builder as _builder
+# @@protoc_insertion_point(imports)
+
+_sym_db = _symbol_database.Default()
+
+
+from deephaven_core.proto import ticket_pb2 as deephaven__core_dot_proto_dot_ticket__pb2
+
+
+DESCRIPTOR = _descriptor_pool.Default().AddSerializedFile(b'\n deephaven_core/proto/table.proto\x12!io.deephaven.proto.backplane.grpc\x1a!deephaven_core/proto/ticket.proto\"l\n\x0eTableReference\x12;\n\x06ticket\x18\x01 \x01(\x0b\x32).io.deephaven.proto.backplane.grpc.TicketH\x00\x12\x16\n\x0c\x62\x61tch_offset\x18\x02 \x01(\x11H\x00\x42\x05\n\x03ref\"\xc6\x01\n\x1d\x45xportedTableCreationResponse\x12\x44\n\tresult_id\x18\x01 \x01(\x0b\x32\x31.io.deephaven.proto.backplane.grpc.TableReference\x12\x0f\n\x07success\x18\x02 \x01(\x08\x12\x12\n\nerror_info\x18\x03 \x01(\t\x12\x15\n\rschema_header\x18\x04 \x01(\x0c\x12\x11\n\tis_static\x18\x05 \x01(\x08\x12\x10\n\x04size\x18\x06 \x01(\x12\x42\x02\x30\x01\"\x97\x01\n\x11\x46\x65tchTableRequest\x12\x44\n\tsource_id\x18\x01 \x01(\x0b\x32\x31.io.deephaven.proto.backplane.grpc.TableReference\x12<\n\tresult_id\x18\x02 \x01(\x0b\x32).io.deephaven.proto.backplane.grpc.Ticket\"\xa0\x01\n\x1a\x41pplyPreviewColumnsRequest\x12\x44\n\tsource_id\x18\x01 \x01(\x0b\x32\x31.io.deephaven.proto.backplane.grpc.TableReference\x12<\n\tresult_id\x18\x02 \x01(\x0b\x32).io.deephaven.proto.backplane.grpc.Ticket\"\x1d\n\x1b\x45xportedTableUpdatesRequest\"\x8c\x01\n\x1a\x45xportedTableUpdateMessage\x12<\n\texport_id\x18\x01 \x01(\x0b\x32).io.deephaven.proto.backplane.grpc.Ticket\x12\x10\n\x04size\x18\x02 \x01(\x12\x42\x02\x30\x01\x12\x1e\n\x16update_failure_message\x18\x03 \x01(\t\"c\n\x11\x45mptyTableRequest\x12<\n\tresult_id\x18\x01 \x01(\x0b\x32).io.deephaven.proto.backplane.grpc.Ticket\x12\x10\n\x04size\x18\x02 \x01(\x12\x42\x02\x30\x01\"\xef\x01\n\x10TimeTableRequest\x12<\n\tresult_id\x18\x01 \x01(\x0b\x32).io.deephaven.proto.backplane.grpc.Ticket\x12\x1e\n\x10start_time_nanos\x18\x02 \x01(\x12\x42\x02\x30\x01H\x00\x12\x1b\n\x11start_time_string\x18\x05 \x01(\tH\x00\x12\x1a\n\x0cperiod_nanos\x18\x03 \x01(\x12\x42\x02\x30\x01H\x01\x12\x17\n\rperiod_string\x18\x06 \x01(\tH\x01\x12\x13\n\x0b\x62link_table\x18\x04 \x01(\x08\x42\x0c\n\nstart_timeB\x08\n\x06period\"\xb1\x01\n\x15SelectOrUpdateRequest\x12<\n\tresult_id\x18\x01 \x01(\x0b\x32).io.deephaven.proto.backplane.grpc.Ticket\x12\x44\n\tsource_id\x18\x02 \x01(\x0b\x32\x31.io.deephaven.proto.backplane.grpc.TableReference\x12\x14\n\x0c\x63olumn_specs\x18\x03 \x03(\t\"#\n\nSelectable\x12\r\n\x03raw\x18\x01 \x01(\tH\x00\x42\x06\n\x04type\"\x8c\x02\n\x0bMathContext\x12\x11\n\tprecision\x18\x01 \x01(\x11\x12R\n\rrounding_mode\x18\x02 \x01(\x0e\x32;.io.deephaven.proto.backplane.grpc.MathContext.RoundingMode\"\x95\x01\n\x0cRoundingMode\x12\x1f\n\x1bROUNDING_MODE_NOT_SPECIFIED\x10\x00\x12\x06\n\x02UP\x10\x01\x12\x08\n\x04\x44OWN\x10\x02\x12\x0b\n\x07\x43\x45ILING\x10\x03\x12\t\n\x05\x46LOOR\x10\x04\x12\x0b\n\x07HALF_UP\x10\x05\x12\r\n\tHALF_DOWN\x10\x06\x12\r\n\tHALF_EVEN\x10\x07\x12\x0f\n\x0bUNNECESSARY\x10\x08\"\xdb\x02\n\x13UpdateByWindowScale\x12[\n\x05ticks\x18\x01 \x01(\x0b\x32J.io.deephaven.proto.backplane.grpc.UpdateByWindowScale.UpdateByWindowTicksH\x00\x12Y\n\x04time\x18\x02 \x01(\x0b\x32I.io.deephaven.proto.backplane.grpc.UpdateByWindowScale.UpdateByWindowTimeH\x00\x1a$\n\x13UpdateByWindowTicks\x12\r\n\x05ticks\x18\x01 \x01(\x01\x1a^\n\x12UpdateByWindowTime\x12\x0e\n\x06\x63olumn\x18\x01 \x01(\t\x12\x13\n\x05nanos\x18\x02 \x01(\x12\x42\x02\x30\x01H\x00\x12\x19\n\x0f\x64uration_string\x18\x03 \x01(\tH\x00\x42\x08\n\x06windowB\x06\n\x04type\"\xe1\x03\n\x11UpdateByEmOptions\x12I\n\ron_null_value\x18\x01 \x01(\x0e\x32\x32.io.deephaven.proto.backplane.grpc.BadDataBehavior\x12H\n\x0con_nan_value\x18\x02 \x01(\x0e\x32\x32.io.deephaven.proto.backplane.grpc.BadDataBehavior\x12H\n\x0con_null_time\x18\x03 \x01(\x0e\x32\x32.io.deephaven.proto.backplane.grpc.BadDataBehavior\x12R\n\x16on_negative_delta_time\x18\x04 \x01(\x0e\x32\x32.io.deephaven.proto.backplane.grpc.BadDataBehavior\x12N\n\x12on_zero_delta_time\x18\x05 \x01(\x0e\x32\x32.io.deephaven.proto.backplane.grpc.BadDataBehavior\x12I\n\x11\x62ig_value_context\x18\x06 \x01(\x0b\x32..io.deephaven.proto.backplane.grpc.MathContext\"f\n\x14UpdateByDeltaOptions\x12N\n\rnull_behavior\x18\x01 \x01(\x0e\x32\x37.io.deephaven.proto.backplane.grpc.UpdateByNullBehavior\"\x9b\x37\n\x0fUpdateByRequest\x12<\n\tresult_id\x18\x01 \x01(\x0b\x32).io.deephaven.proto.backplane.grpc.Ticket\x12\x44\n\tsource_id\x18\x02 \x01(\x0b\x32\x31.io.deephaven.proto.backplane.grpc.TableReference\x12S\n\x07options\x18\x03 \x01(\x0b\x32\x42.io.deephaven.proto.backplane.grpc.UpdateByRequest.UpdateByOptions\x12X\n\noperations\x18\x04 \x03(\x0b\x32\x44.io.deephaven.proto.backplane.grpc.UpdateByRequest.UpdateByOperation\x12\x18\n\x10group_by_columns\x18\x05 \x03(\t\x1a\xc3\x03\n\x0fUpdateByOptions\x12\x1c\n\x0fuse_redirection\x18\x01 \x01(\x08H\x00\x88\x01\x01\x12\x1b\n\x0e\x63hunk_capacity\x18\x02 \x01(\x05H\x01\x88\x01\x01\x12.\n!max_static_sparse_memory_overhead\x18\x03 \x01(\x01H\x02\x88\x01\x01\x12$\n\x17initial_hash_table_size\x18\x04 \x01(\x05H\x03\x88\x01\x01\x12 \n\x13maximum_load_factor\x18\x05 \x01(\x01H\x04\x88\x01\x01\x12\x1f\n\x12target_load_factor\x18\x06 \x01(\x01H\x05\x88\x01\x01\x12\x44\n\x0cmath_context\x18\x07 \x01(\x0b\x32..io.deephaven.proto.backplane.grpc.MathContextB\x12\n\x10_use_redirectionB\x11\n\x0f_chunk_capacityB$\n\"_max_static_sparse_memory_overheadB\x1a\n\x18_initial_hash_table_sizeB\x16\n\x14_maximum_load_factorB\x15\n\x13_target_load_factor\x1a\xf4\x30\n\x11UpdateByOperation\x12\x65\n\x06\x63olumn\x18\x01 \x01(\x0b\x32S.io.deephaven.proto.backplane.grpc.UpdateByRequest.UpdateByOperation.UpdateByColumnH\x00\x1a\xef/\n\x0eUpdateByColumn\x12n\n\x04spec\x18\x01 \x01(\x0b\x32`.io.deephaven.proto.backplane.grpc.UpdateByRequest.UpdateByOperation.UpdateByColumn.UpdateBySpec\x12\x13\n\x0bmatch_pairs\x18\x02 \x03(\t\x1a\xd7.\n\x0cUpdateBySpec\x12\x85\x01\n\x03sum\x18\x01 \x01(\x0b\x32v.io.deephaven.proto.backplane.grpc.UpdateByRequest.UpdateByOperation.UpdateByColumn.UpdateBySpec.UpdateByCumulativeSumH\x00\x12\x85\x01\n\x03min\x18\x02 \x01(\x0b\x32v.io.deephaven.proto.backplane.grpc.UpdateByRequest.UpdateByOperation.UpdateByColumn.UpdateBySpec.UpdateByCumulativeMinH\x00\x12\x85\x01\n\x03max\x18\x03 \x01(\x0b\x32v.io.deephaven.proto.backplane.grpc.UpdateByRequest.UpdateByOperation.UpdateByColumn.UpdateBySpec.UpdateByCumulativeMaxH\x00\x12\x8d\x01\n\x07product\x18\x04 \x01(\x0b\x32z.io.deephaven.proto.backplane.grpc.UpdateByRequest.UpdateByOperation.UpdateByColumn.UpdateBySpec.UpdateByCumulativeProductH\x00\x12}\n\x04\x66ill\x18\x05 \x01(\x0b\x32m.io.deephaven.proto.backplane.grpc.UpdateByRequest.UpdateByOperation.UpdateByColumn.UpdateBySpec.UpdateByFillH\x00\x12{\n\x03\x65ma\x18\x06 \x01(\x0b\x32l.io.deephaven.proto.backplane.grpc.UpdateByRequest.UpdateByOperation.UpdateByColumn.UpdateBySpec.UpdateByEmaH\x00\x12\x8a\x01\n\x0brolling_sum\x18\x07 \x01(\x0b\x32s.io.deephaven.proto.backplane.grpc.UpdateByRequest.UpdateByOperation.UpdateByColumn.UpdateBySpec.UpdateByRollingSumH\x00\x12\x8e\x01\n\rrolling_group\x18\x08 \x01(\x0b\x32u.io.deephaven.proto.backplane.grpc.UpdateByRequest.UpdateByOperation.UpdateByColumn.UpdateBySpec.UpdateByRollingGroupH\x00\x12\x8a\x01\n\x0brolling_avg\x18\t \x01(\x0b\x32s.io.deephaven.proto.backplane.grpc.UpdateByRequest.UpdateByOperation.UpdateByColumn.UpdateBySpec.UpdateByRollingAvgH\x00\x12\x8a\x01\n\x0brolling_min\x18\n \x01(\x0b\x32s.io.deephaven.proto.backplane.grpc.UpdateByRequest.UpdateByOperation.UpdateByColumn.UpdateBySpec.UpdateByRollingMinH\x00\x12\x8a\x01\n\x0brolling_max\x18\x0b \x01(\x0b\x32s.io.deephaven.proto.backplane.grpc.UpdateByRequest.UpdateByOperation.UpdateByColumn.UpdateBySpec.UpdateByRollingMaxH\x00\x12\x92\x01\n\x0frolling_product\x18\x0c \x01(\x0b\x32w.io.deephaven.proto.backplane.grpc.UpdateByRequest.UpdateByOperation.UpdateByColumn.UpdateBySpec.UpdateByRollingProductH\x00\x12\x7f\n\x05\x64\x65lta\x18\r \x01(\x0b\x32n.io.deephaven.proto.backplane.grpc.UpdateByRequest.UpdateByOperation.UpdateByColumn.UpdateBySpec.UpdateByDeltaH\x00\x12{\n\x03\x65ms\x18\x0e \x01(\x0b\x32l.io.deephaven.proto.backplane.grpc.UpdateByRequest.UpdateByOperation.UpdateByColumn.UpdateBySpec.UpdateByEmsH\x00\x12\x80\x01\n\x06\x65m_min\x18\x0f \x01(\x0b\x32n.io.deephaven.proto.backplane.grpc.UpdateByRequest.UpdateByOperation.UpdateByColumn.UpdateBySpec.UpdateByEmMinH\x00\x12\x80\x01\n\x06\x65m_max\x18\x10 \x01(\x0b\x32n.io.deephaven.proto.backplane.grpc.UpdateByRequest.UpdateByOperation.UpdateByColumn.UpdateBySpec.UpdateByEmMaxH\x00\x12\x80\x01\n\x06\x65m_std\x18\x11 \x01(\x0b\x32n.io.deephaven.proto.backplane.grpc.UpdateByRequest.UpdateByOperation.UpdateByColumn.UpdateBySpec.UpdateByEmStdH\x00\x12\x8e\x01\n\rrolling_count\x18\x12 \x01(\x0b\x32u.io.deephaven.proto.backplane.grpc.UpdateByRequest.UpdateByOperation.UpdateByColumn.UpdateBySpec.UpdateByRollingCountH\x00\x12\x8a\x01\n\x0brolling_std\x18\x13 \x01(\x0b\x32s.io.deephaven.proto.backplane.grpc.UpdateByRequest.UpdateByOperation.UpdateByColumn.UpdateBySpec.UpdateByRollingStdH\x00\x12\x8c\x01\n\x0crolling_wavg\x18\x14 \x01(\x0b\x32t.io.deephaven.proto.backplane.grpc.UpdateByRequest.UpdateByOperation.UpdateByColumn.UpdateBySpec.UpdateByRollingWAvgH\x00\x12\x92\x01\n\x0frolling_formula\x18\x15 \x01(\x0b\x32w.io.deephaven.proto.backplane.grpc.UpdateByRequest.UpdateByOperation.UpdateByColumn.UpdateBySpec.UpdateByRollingFormulaH\x00\x1a\x17\n\x15UpdateByCumulativeSum\x1a\x17\n\x15UpdateByCumulativeMin\x1a\x17\n\x15UpdateByCumulativeMax\x1a\x1b\n\x19UpdateByCumulativeProduct\x1a\x0e\n\x0cUpdateByFill\x1a\xa2\x01\n\x0bUpdateByEma\x12\x45\n\x07options\x18\x01 \x01(\x0b\x32\x34.io.deephaven.proto.backplane.grpc.UpdateByEmOptions\x12L\n\x0cwindow_scale\x18\x02 \x01(\x0b\x32\x36.io.deephaven.proto.backplane.grpc.UpdateByWindowScale\x1a\xa2\x01\n\x0bUpdateByEms\x12\x45\n\x07options\x18\x01 \x01(\x0b\x32\x34.io.deephaven.proto.backplane.grpc.UpdateByEmOptions\x12L\n\x0cwindow_scale\x18\x02 \x01(\x0b\x32\x36.io.deephaven.proto.backplane.grpc.UpdateByWindowScale\x1a\xa4\x01\n\rUpdateByEmMin\x12\x45\n\x07options\x18\x01 \x01(\x0b\x32\x34.io.deephaven.proto.backplane.grpc.UpdateByEmOptions\x12L\n\x0cwindow_scale\x18\x02 \x01(\x0b\x32\x36.io.deephaven.proto.backplane.grpc.UpdateByWindowScale\x1a\xa4\x01\n\rUpdateByEmMax\x12\x45\n\x07options\x18\x01 \x01(\x0b\x32\x34.io.deephaven.proto.backplane.grpc.UpdateByEmOptions\x12L\n\x0cwindow_scale\x18\x02 \x01(\x0b\x32\x36.io.deephaven.proto.backplane.grpc.UpdateByWindowScale\x1a\xa4\x01\n\rUpdateByEmStd\x12\x45\n\x07options\x18\x01 \x01(\x0b\x32\x34.io.deephaven.proto.backplane.grpc.UpdateByEmOptions\x12L\n\x0cwindow_scale\x18\x02 \x01(\x0b\x32\x36.io.deephaven.proto.backplane.grpc.UpdateByWindowScale\x1aY\n\rUpdateByDelta\x12H\n\x07options\x18\x01 \x01(\x0b\x32\x37.io.deephaven.proto.backplane.grpc.UpdateByDeltaOptions\x1a\xc0\x01\n\x12UpdateByRollingSum\x12T\n\x14reverse_window_scale\x18\x01 \x01(\x0b\x32\x36.io.deephaven.proto.backplane.grpc.UpdateByWindowScale\x12T\n\x14\x66orward_window_scale\x18\x02 \x01(\x0b\x32\x36.io.deephaven.proto.backplane.grpc.UpdateByWindowScale\x1a\xc2\x01\n\x14UpdateByRollingGroup\x12T\n\x14reverse_window_scale\x18\x01 \x01(\x0b\x32\x36.io.deephaven.proto.backplane.grpc.UpdateByWindowScale\x12T\n\x14\x66orward_window_scale\x18\x02 \x01(\x0b\x32\x36.io.deephaven.proto.backplane.grpc.UpdateByWindowScale\x1a\xc0\x01\n\x12UpdateByRollingAvg\x12T\n\x14reverse_window_scale\x18\x01 \x01(\x0b\x32\x36.io.deephaven.proto.backplane.grpc.UpdateByWindowScale\x12T\n\x14\x66orward_window_scale\x18\x02 \x01(\x0b\x32\x36.io.deephaven.proto.backplane.grpc.UpdateByWindowScale\x1a\xc0\x01\n\x12UpdateByRollingMin\x12T\n\x14reverse_window_scale\x18\x01 \x01(\x0b\x32\x36.io.deephaven.proto.backplane.grpc.UpdateByWindowScale\x12T\n\x14\x66orward_window_scale\x18\x02 \x01(\x0b\x32\x36.io.deephaven.proto.backplane.grpc.UpdateByWindowScale\x1a\xc0\x01\n\x12UpdateByRollingMax\x12T\n\x14reverse_window_scale\x18\x01 \x01(\x0b\x32\x36.io.deephaven.proto.backplane.grpc.UpdateByWindowScale\x12T\n\x14\x66orward_window_scale\x18\x02 \x01(\x0b\x32\x36.io.deephaven.proto.backplane.grpc.UpdateByWindowScale\x1a\xc4\x01\n\x16UpdateByRollingProduct\x12T\n\x14reverse_window_scale\x18\x01 \x01(\x0b\x32\x36.io.deephaven.proto.backplane.grpc.UpdateByWindowScale\x12T\n\x14\x66orward_window_scale\x18\x02 \x01(\x0b\x32\x36.io.deephaven.proto.backplane.grpc.UpdateByWindowScale\x1a\xc2\x01\n\x14UpdateByRollingCount\x12T\n\x14reverse_window_scale\x18\x01 \x01(\x0b\x32\x36.io.deephaven.proto.backplane.grpc.UpdateByWindowScale\x12T\n\x14\x66orward_window_scale\x18\x02 \x01(\x0b\x32\x36.io.deephaven.proto.backplane.grpc.UpdateByWindowScale\x1a\xc0\x01\n\x12UpdateByRollingStd\x12T\n\x14reverse_window_scale\x18\x01 \x01(\x0b\x32\x36.io.deephaven.proto.backplane.grpc.UpdateByWindowScale\x12T\n\x14\x66orward_window_scale\x18\x02 \x01(\x0b\x32\x36.io.deephaven.proto.backplane.grpc.UpdateByWindowScale\x1a\xd8\x01\n\x13UpdateByRollingWAvg\x12T\n\x14reverse_window_scale\x18\x01 \x01(\x0b\x32\x36.io.deephaven.proto.backplane.grpc.UpdateByWindowScale\x12T\n\x14\x66orward_window_scale\x18\x02 \x01(\x0b\x32\x36.io.deephaven.proto.backplane.grpc.UpdateByWindowScale\x12\x15\n\rweight_column\x18\x03 \x01(\t\x1a\xea\x01\n\x16UpdateByRollingFormula\x12T\n\x14reverse_window_scale\x18\x01 \x01(\x0b\x32\x36.io.deephaven.proto.backplane.grpc.UpdateByWindowScale\x12T\n\x14\x66orward_window_scale\x18\x02 \x01(\x0b\x32\x36.io.deephaven.proto.backplane.grpc.UpdateByWindowScale\x12\x0f\n\x07\x66ormula\x18\x03 \x01(\t\x12\x13\n\x0bparam_token\x18\x04 \x01(\tB\x06\n\x04typeB\x06\n\x04type\"\xb1\x01\n\x15SelectDistinctRequest\x12<\n\tresult_id\x18\x01 \x01(\x0b\x32).io.deephaven.proto.backplane.grpc.Ticket\x12\x44\n\tsource_id\x18\x02 \x01(\x0b\x32\x31.io.deephaven.proto.backplane.grpc.TableReference\x12\x14\n\x0c\x63olumn_names\x18\x03 \x03(\t\"\xae\x01\n\x12\x44ropColumnsRequest\x12<\n\tresult_id\x18\x01 \x01(\x0b\x32).io.deephaven.proto.backplane.grpc.Ticket\x12\x44\n\tsource_id\x18\x02 \x01(\x0b\x32\x31.io.deephaven.proto.backplane.grpc.TableReference\x12\x14\n\x0c\x63olumn_names\x18\x03 \x03(\t\"\xb5\x01\n\x1eUnstructuredFilterTableRequest\x12<\n\tresult_id\x18\x01 \x01(\x0b\x32).io.deephaven.proto.backplane.grpc.Ticket\x12\x44\n\tsource_id\x18\x02 \x01(\x0b\x32\x31.io.deephaven.proto.backplane.grpc.TableReference\x12\x0f\n\x07\x66ilters\x18\x03 \x03(\t\"\xad\x01\n\x11HeadOrTailRequest\x12<\n\tresult_id\x18\x01 \x01(\x0b\x32).io.deephaven.proto.backplane.grpc.Ticket\x12\x44\n\tsource_id\x18\x02 \x01(\x0b\x32\x31.io.deephaven.proto.backplane.grpc.TableReference\x12\x14\n\x08num_rows\x18\x03 \x01(\x12\x42\x02\x30\x01\"\xce\x01\n\x13HeadOrTailByRequest\x12<\n\tresult_id\x18\x01 \x01(\x0b\x32).io.deephaven.proto.backplane.grpc.Ticket\x12\x44\n\tsource_id\x18\x02 \x01(\x0b\x32\x31.io.deephaven.proto.backplane.grpc.TableReference\x12\x14\n\x08num_rows\x18\x03 \x01(\x12\x42\x02\x30\x01\x12\x1d\n\x15group_by_column_specs\x18\x04 \x03(\t\"\xc3\x01\n\x0eUngroupRequest\x12<\n\tresult_id\x18\x01 \x01(\x0b\x32).io.deephaven.proto.backplane.grpc.Ticket\x12\x44\n\tsource_id\x18\x02 \x01(\x0b\x32\x31.io.deephaven.proto.backplane.grpc.TableReference\x12\x11\n\tnull_fill\x18\x03 \x01(\x08\x12\x1a\n\x12\x63olumns_to_ungroup\x18\x04 \x03(\t\"\xad\x01\n\x12MergeTablesRequest\x12<\n\tresult_id\x18\x01 \x01(\x0b\x32).io.deephaven.proto.backplane.grpc.Ticket\x12\x45\n\nsource_ids\x18\x02 \x03(\x0b\x32\x31.io.deephaven.proto.backplane.grpc.TableReference\x12\x12\n\nkey_column\x18\x03 \x01(\t\"\x9a\x01\n\x14SnapshotTableRequest\x12<\n\tresult_id\x18\x01 \x01(\x0b\x32).io.deephaven.proto.backplane.grpc.Ticket\x12\x44\n\tsource_id\x18\x02 \x01(\x0b\x32\x31.io.deephaven.proto.backplane.grpc.TableReference\"\xb1\x02\n\x18SnapshotWhenTableRequest\x12<\n\tresult_id\x18\x01 \x01(\x0b\x32).io.deephaven.proto.backplane.grpc.Ticket\x12\x42\n\x07\x62\x61se_id\x18\x02 \x01(\x0b\x32\x31.io.deephaven.proto.backplane.grpc.TableReference\x12\x45\n\ntrigger_id\x18\x03 \x01(\x0b\x32\x31.io.deephaven.proto.backplane.grpc.TableReference\x12\x0f\n\x07initial\x18\x04 \x01(\x08\x12\x13\n\x0bincremental\x18\x05 \x01(\x08\x12\x0f\n\x07history\x18\x06 \x01(\x08\x12\x15\n\rstamp_columns\x18\x07 \x03(\t\"\xa7\x02\n\x16\x43rossJoinTablesRequest\x12<\n\tresult_id\x18\x01 \x01(\x0b\x32).io.deephaven.proto.backplane.grpc.Ticket\x12\x42\n\x07left_id\x18\x02 \x01(\x0b\x32\x31.io.deephaven.proto.backplane.grpc.TableReference\x12\x43\n\x08right_id\x18\x03 \x01(\x0b\x32\x31.io.deephaven.proto.backplane.grpc.TableReference\x12\x18\n\x10\x63olumns_to_match\x18\x04 \x03(\t\x12\x16\n\x0e\x63olumns_to_add\x18\x05 \x03(\t\x12\x14\n\x0creserve_bits\x18\x06 \x01(\x05\"\x93\x02\n\x18NaturalJoinTablesRequest\x12<\n\tresult_id\x18\x01 \x01(\x0b\x32).io.deephaven.proto.backplane.grpc.Ticket\x12\x42\n\x07left_id\x18\x02 \x01(\x0b\x32\x31.io.deephaven.proto.backplane.grpc.TableReference\x12\x43\n\x08right_id\x18\x03 \x01(\x0b\x32\x31.io.deephaven.proto.backplane.grpc.TableReference\x12\x18\n\x10\x63olumns_to_match\x18\x04 \x03(\t\x12\x16\n\x0e\x63olumns_to_add\x18\x05 \x03(\t\"\x91\x02\n\x16\x45xactJoinTablesRequest\x12<\n\tresult_id\x18\x01 \x01(\x0b\x32).io.deephaven.proto.backplane.grpc.Ticket\x12\x42\n\x07left_id\x18\x02 \x01(\x0b\x32\x31.io.deephaven.proto.backplane.grpc.TableReference\x12\x43\n\x08right_id\x18\x03 \x01(\x0b\x32\x31.io.deephaven.proto.backplane.grpc.TableReference\x12\x18\n\x10\x63olumns_to_match\x18\x04 \x03(\t\x12\x16\n\x0e\x63olumns_to_add\x18\x05 \x03(\t\"\x90\x02\n\x15LeftJoinTablesRequest\x12<\n\tresult_id\x18\x01 \x01(\x0b\x32).io.deephaven.proto.backplane.grpc.Ticket\x12\x42\n\x07left_id\x18\x02 \x01(\x0b\x32\x31.io.deephaven.proto.backplane.grpc.TableReference\x12\x43\n\x08right_id\x18\x03 \x01(\x0b\x32\x31.io.deephaven.proto.backplane.grpc.TableReference\x12\x18\n\x10\x63olumns_to_match\x18\x04 \x03(\t\x12\x16\n\x0e\x63olumns_to_add\x18\x05 \x03(\t\"\xd1\x03\n\x15\x41sOfJoinTablesRequest\x12<\n\tresult_id\x18\x01 \x01(\x0b\x32).io.deephaven.proto.backplane.grpc.Ticket\x12\x42\n\x07left_id\x18\x02 \x01(\x0b\x32\x31.io.deephaven.proto.backplane.grpc.TableReference\x12\x43\n\x08right_id\x18\x03 \x01(\x0b\x32\x31.io.deephaven.proto.backplane.grpc.TableReference\x12\x18\n\x10\x63olumns_to_match\x18\x04 \x03(\t\x12\x16\n\x0e\x63olumns_to_add\x18\x05 \x03(\t\x12\\\n\x10\x61s_of_match_rule\x18\x07 \x01(\x0e\x32\x42.io.deephaven.proto.backplane.grpc.AsOfJoinTablesRequest.MatchRule\"]\n\tMatchRule\x12\x13\n\x0fLESS_THAN_EQUAL\x10\x00\x12\r\n\tLESS_THAN\x10\x01\x12\x16\n\x12GREATER_THAN_EQUAL\x10\x02\x12\x10\n\x0cGREATER_THAN\x10\x03\x1a\x02\x18\x01:\x02\x18\x01\"\xa6\x02\n\x12\x41jRajTablesRequest\x12<\n\tresult_id\x18\x01 \x01(\x0b\x32).io.deephaven.proto.backplane.grpc.Ticket\x12\x42\n\x07left_id\x18\x02 \x01(\x0b\x32\x31.io.deephaven.proto.backplane.grpc.TableReference\x12\x43\n\x08right_id\x18\x03 \x01(\x0b\x32\x31.io.deephaven.proto.backplane.grpc.TableReference\x12\x1b\n\x13\x65xact_match_columns\x18\x04 \x03(\t\x12\x14\n\x0c\x61s_of_column\x18\x05 \x01(\t\x12\x16\n\x0e\x63olumns_to_add\x18\x06 \x03(\t\"\x88\x01\n\x0eMultiJoinInput\x12\x44\n\tsource_id\x18\x01 \x01(\x0b\x32\x31.io.deephaven.proto.backplane.grpc.TableReference\x12\x18\n\x10\x63olumns_to_match\x18\x02 \x03(\t\x12\x16\n\x0e\x63olumns_to_add\x18\x03 \x03(\t\"\xa4\x01\n\x16MultiJoinTablesRequest\x12<\n\tresult_id\x18\x01 \x01(\x0b\x32).io.deephaven.proto.backplane.grpc.Ticket\x12L\n\x11multi_join_inputs\x18\x02 \x03(\x0b\x32\x31.io.deephaven.proto.backplane.grpc.MultiJoinInput\"\xe0\x06\n\x16RangeJoinTablesRequest\x12<\n\tresult_id\x18\x01 \x01(\x0b\x32).io.deephaven.proto.backplane.grpc.Ticket\x12\x42\n\x07left_id\x18\x02 \x01(\x0b\x32\x31.io.deephaven.proto.backplane.grpc.TableReference\x12\x43\n\x08right_id\x18\x03 \x01(\x0b\x32\x31.io.deephaven.proto.backplane.grpc.TableReference\x12\x1b\n\x13\x65xact_match_columns\x18\x04 \x03(\t\x12\x19\n\x11left_start_column\x18\x05 \x01(\t\x12\x62\n\x10range_start_rule\x18\x06 \x01(\x0e\x32H.io.deephaven.proto.backplane.grpc.RangeJoinTablesRequest.RangeStartRule\x12\x1a\n\x12right_range_column\x18\x07 \x01(\t\x12^\n\x0erange_end_rule\x18\x08 \x01(\x0e\x32\x46.io.deephaven.proto.backplane.grpc.RangeJoinTablesRequest.RangeEndRule\x12\x17\n\x0fleft_end_column\x18\t \x01(\t\x12\x44\n\x0c\x61ggregations\x18\n \x03(\x0b\x32..io.deephaven.proto.backplane.grpc.Aggregation\x12\x13\n\x0brange_match\x18\x0b \x01(\t\"v\n\x0eRangeStartRule\x12\x15\n\x11START_UNSPECIFIED\x10\x00\x12\r\n\tLESS_THAN\x10\x01\x12\x16\n\x12LESS_THAN_OR_EQUAL\x10\x02\x12&\n\"LESS_THAN_OR_EQUAL_ALLOW_PRECEDING\x10\x03\"{\n\x0cRangeEndRule\x12\x13\n\x0f\x45ND_UNSPECIFIED\x10\x00\x12\x10\n\x0cGREATER_THAN\x10\x01\x12\x19\n\x15GREATER_THAN_OR_EQUAL\x10\x02\x12)\n%GREATER_THAN_OR_EQUAL_ALLOW_FOLLOWING\x10\x03\"\xfe\x04\n\x15\x43omboAggregateRequest\x12<\n\tresult_id\x18\x01 \x01(\x0b\x32).io.deephaven.proto.backplane.grpc.Ticket\x12\x44\n\tsource_id\x18\x02 \x01(\x0b\x32\x31.io.deephaven.proto.backplane.grpc.TableReference\x12V\n\naggregates\x18\x03 \x03(\x0b\x32\x42.io.deephaven.proto.backplane.grpc.ComboAggregateRequest.Aggregate\x12\x18\n\x10group_by_columns\x18\x04 \x03(\t\x12\x13\n\x0b\x66orce_combo\x18\x05 \x01(\x08\x1a\xad\x01\n\tAggregate\x12N\n\x04type\x18\x01 \x01(\x0e\x32@.io.deephaven.proto.backplane.grpc.ComboAggregateRequest.AggType\x12\x13\n\x0bmatch_pairs\x18\x02 \x03(\t\x12\x13\n\x0b\x63olumn_name\x18\x03 \x01(\t\x12\x12\n\npercentile\x18\x04 \x01(\x01\x12\x12\n\navg_median\x18\x05 \x01(\x08\"\xa5\x01\n\x07\x41ggType\x12\x07\n\x03SUM\x10\x00\x12\x0b\n\x07\x41\x42S_SUM\x10\x01\x12\t\n\x05GROUP\x10\x02\x12\x07\n\x03\x41VG\x10\x03\x12\t\n\x05\x43OUNT\x10\x04\x12\t\n\x05\x46IRST\x10\x05\x12\x08\n\x04LAST\x10\x06\x12\x07\n\x03MIN\x10\x07\x12\x07\n\x03MAX\x10\x08\x12\n\n\x06MEDIAN\x10\t\x12\x0e\n\nPERCENTILE\x10\n\x12\x07\n\x03STD\x10\x0b\x12\x07\n\x03VAR\x10\x0c\x12\x10\n\x0cWEIGHTED_AVG\x10\r:\x02\x18\x01\"\xed\x01\n\x13\x41ggregateAllRequest\x12<\n\tresult_id\x18\x01 \x01(\x0b\x32).io.deephaven.proto.backplane.grpc.Ticket\x12\x44\n\tsource_id\x18\x02 \x01(\x0b\x32\x31.io.deephaven.proto.backplane.grpc.TableReference\x12\x38\n\x04spec\x18\x03 \x01(\x0b\x32*.io.deephaven.proto.backplane.grpc.AggSpec\x12\x18\n\x10group_by_columns\x18\x04 \x03(\t\"\xd7\x17\n\x07\x41ggSpec\x12K\n\x07\x61\x62s_sum\x18\x01 \x01(\x0b\x32\x38.io.deephaven.proto.backplane.grpc.AggSpec.AggSpecAbsSumH\x00\x12i\n\x16\x61pproximate_percentile\x18\x02 \x01(\x0b\x32G.io.deephaven.proto.backplane.grpc.AggSpec.AggSpecApproximatePercentileH\x00\x12\x44\n\x03\x61vg\x18\x03 \x01(\x0b\x32\x35.io.deephaven.proto.backplane.grpc.AggSpec.AggSpecAvgH\x00\x12Y\n\x0e\x63ount_distinct\x18\x04 \x01(\x0b\x32?.io.deephaven.proto.backplane.grpc.AggSpec.AggSpecCountDistinctH\x00\x12N\n\x08\x64istinct\x18\x05 \x01(\x0b\x32:.io.deephaven.proto.backplane.grpc.AggSpec.AggSpecDistinctH\x00\x12H\n\x05\x66irst\x18\x06 \x01(\x0b\x32\x37.io.deephaven.proto.backplane.grpc.AggSpec.AggSpecFirstH\x00\x12L\n\x07\x66ormula\x18\x07 \x01(\x0b\x32\x39.io.deephaven.proto.backplane.grpc.AggSpec.AggSpecFormulaH\x00\x12J\n\x06\x66reeze\x18\x08 \x01(\x0b\x32\x38.io.deephaven.proto.backplane.grpc.AggSpec.AggSpecFreezeH\x00\x12H\n\x05group\x18\t \x01(\x0b\x32\x37.io.deephaven.proto.backplane.grpc.AggSpec.AggSpecGroupH\x00\x12\x46\n\x04last\x18\n \x01(\x0b\x32\x36.io.deephaven.proto.backplane.grpc.AggSpec.AggSpecLastH\x00\x12\x44\n\x03max\x18\x0b \x01(\x0b\x32\x35.io.deephaven.proto.backplane.grpc.AggSpec.AggSpecMaxH\x00\x12J\n\x06median\x18\x0c \x01(\x0b\x32\x38.io.deephaven.proto.backplane.grpc.AggSpec.AggSpecMedianH\x00\x12\x44\n\x03min\x18\r \x01(\x0b\x32\x35.io.deephaven.proto.backplane.grpc.AggSpec.AggSpecMinH\x00\x12R\n\npercentile\x18\x0e \x01(\x0b\x32<.io.deephaven.proto.backplane.grpc.AggSpec.AggSpecPercentileH\x00\x12P\n\x0csorted_first\x18\x0f \x01(\x0b\x32\x38.io.deephaven.proto.backplane.grpc.AggSpec.AggSpecSortedH\x00\x12O\n\x0bsorted_last\x18\x10 \x01(\x0b\x32\x38.io.deephaven.proto.backplane.grpc.AggSpec.AggSpecSortedH\x00\x12\x44\n\x03std\x18\x11 \x01(\x0b\x32\x35.io.deephaven.proto.backplane.grpc.AggSpec.AggSpecStdH\x00\x12\x44\n\x03sum\x18\x12 \x01(\x0b\x32\x35.io.deephaven.proto.backplane.grpc.AggSpec.AggSpecSumH\x00\x12M\n\x08t_digest\x18\x13 \x01(\x0b\x32\x39.io.deephaven.proto.backplane.grpc.AggSpec.AggSpecTDigestH\x00\x12J\n\x06unique\x18\x14 \x01(\x0b\x32\x38.io.deephaven.proto.backplane.grpc.AggSpec.AggSpecUniqueH\x00\x12R\n\x0cweighted_avg\x18\x15 \x01(\x0b\x32:.io.deephaven.proto.backplane.grpc.AggSpec.AggSpecWeightedH\x00\x12R\n\x0cweighted_sum\x18\x16 \x01(\x0b\x32:.io.deephaven.proto.backplane.grpc.AggSpec.AggSpecWeightedH\x00\x12\x44\n\x03var\x18\x17 \x01(\x0b\x32\x35.io.deephaven.proto.backplane.grpc.AggSpec.AggSpecVarH\x00\x1a\\\n\x1c\x41ggSpecApproximatePercentile\x12\x12\n\npercentile\x18\x01 \x01(\x01\x12\x18\n\x0b\x63ompression\x18\x02 \x01(\x01H\x00\x88\x01\x01\x42\x0e\n\x0c_compression\x1a+\n\x14\x41ggSpecCountDistinct\x12\x13\n\x0b\x63ount_nulls\x18\x01 \x01(\x08\x1a(\n\x0f\x41ggSpecDistinct\x12\x15\n\rinclude_nulls\x18\x01 \x01(\x08\x1a\x36\n\x0e\x41ggSpecFormula\x12\x0f\n\x07\x66ormula\x18\x01 \x01(\t\x12\x13\n\x0bparam_token\x18\x02 \x01(\t\x1a/\n\rAggSpecMedian\x12\x1e\n\x16\x61verage_evenly_divided\x18\x01 \x01(\x08\x1aG\n\x11\x41ggSpecPercentile\x12\x12\n\npercentile\x18\x01 \x01(\x01\x12\x1e\n\x16\x61verage_evenly_divided\x18\x02 \x01(\x08\x1a`\n\rAggSpecSorted\x12O\n\x07\x63olumns\x18\x01 \x03(\x0b\x32>.io.deephaven.proto.backplane.grpc.AggSpec.AggSpecSortedColumn\x1a*\n\x13\x41ggSpecSortedColumn\x12\x13\n\x0b\x63olumn_name\x18\x01 \x01(\t\x1a:\n\x0e\x41ggSpecTDigest\x12\x18\n\x0b\x63ompression\x18\x01 \x01(\x01H\x00\x88\x01\x01\x42\x0e\n\x0c_compression\x1a\x88\x01\n\rAggSpecUnique\x12\x15\n\rinclude_nulls\x18\x01 \x01(\x08\x12`\n\x13non_unique_sentinel\x18\x02 \x01(\x0b\x32\x43.io.deephaven.proto.backplane.grpc.AggSpec.AggSpecNonUniqueSentinel\x1a\xb5\x02\n\x18\x41ggSpecNonUniqueSentinel\x12\x42\n\nnull_value\x18\x01 \x01(\x0e\x32,.io.deephaven.proto.backplane.grpc.NullValueH\x00\x12\x16\n\x0cstring_value\x18\x02 \x01(\tH\x00\x12\x13\n\tint_value\x18\x03 \x01(\x11H\x00\x12\x18\n\nlong_value\x18\x04 \x01(\x12\x42\x02\x30\x01H\x00\x12\x15\n\x0b\x66loat_value\x18\x05 \x01(\x02H\x00\x12\x16\n\x0c\x64ouble_value\x18\x06 \x01(\x01H\x00\x12\x14\n\nbool_value\x18\x07 \x01(\x08H\x00\x12\x14\n\nbyte_value\x18\x08 \x01(\x11H\x00\x12\x15\n\x0bshort_value\x18\t \x01(\x11H\x00\x12\x14\n\nchar_value\x18\n \x01(\x11H\x00\x42\x06\n\x04type\x1a(\n\x0f\x41ggSpecWeighted\x12\x15\n\rweight_column\x18\x01 \x01(\t\x1a\x0f\n\rAggSpecAbsSum\x1a\x0c\n\nAggSpecAvg\x1a\x0e\n\x0c\x41ggSpecFirst\x1a\x0f\n\rAggSpecFreeze\x1a\x0e\n\x0c\x41ggSpecGroup\x1a\r\n\x0b\x41ggSpecLast\x1a\x0c\n\nAggSpecMax\x1a\x0c\n\nAggSpecMin\x1a\x0c\n\nAggSpecStd\x1a\x0c\n\nAggSpecSum\x1a\x0c\n\nAggSpecVarB\x06\n\x04type\"\xdc\x02\n\x10\x41ggregateRequest\x12<\n\tresult_id\x18\x01 \x01(\x0b\x32).io.deephaven.proto.backplane.grpc.Ticket\x12\x44\n\tsource_id\x18\x02 \x01(\x0b\x32\x31.io.deephaven.proto.backplane.grpc.TableReference\x12L\n\x11initial_groups_id\x18\x03 \x01(\x0b\x32\x31.io.deephaven.proto.backplane.grpc.TableReference\x12\x16\n\x0epreserve_empty\x18\x04 \x01(\x08\x12\x44\n\x0c\x61ggregations\x18\x05 \x03(\x0b\x32..io.deephaven.proto.backplane.grpc.Aggregation\x12\x18\n\x10group_by_columns\x18\x06 \x03(\t\"\x9e\x08\n\x0b\x41ggregation\x12T\n\x07\x63olumns\x18\x01 \x01(\x0b\x32\x41.io.deephaven.proto.backplane.grpc.Aggregation.AggregationColumnsH\x00\x12P\n\x05\x63ount\x18\x02 \x01(\x0b\x32?.io.deephaven.proto.backplane.grpc.Aggregation.AggregationCountH\x00\x12Y\n\rfirst_row_key\x18\x03 \x01(\x0b\x32@.io.deephaven.proto.backplane.grpc.Aggregation.AggregationRowKeyH\x00\x12X\n\x0clast_row_key\x18\x04 \x01(\x0b\x32@.io.deephaven.proto.backplane.grpc.Aggregation.AggregationRowKeyH\x00\x12X\n\tpartition\x18\x05 \x01(\x0b\x32\x43.io.deephaven.proto.backplane.grpc.Aggregation.AggregationPartitionH\x00\x12T\n\x07\x66ormula\x18\x06 \x01(\x0b\x32\x41.io.deephaven.proto.backplane.grpc.Aggregation.AggregationFormulaH\x00\x12[\n\x0b\x63ount_where\x18\x07 \x01(\x0b\x32\x44.io.deephaven.proto.backplane.grpc.Aggregation.AggregationCountWhereH\x00\x1a\x63\n\x12\x41ggregationColumns\x12\x38\n\x04spec\x18\x01 \x01(\x0b\x32*.io.deephaven.proto.backplane.grpc.AggSpec\x12\x13\n\x0bmatch_pairs\x18\x02 \x03(\t\x1a\'\n\x10\x41ggregationCount\x12\x13\n\x0b\x63olumn_name\x18\x01 \x01(\t\x1a=\n\x15\x41ggregationCountWhere\x12\x13\n\x0b\x63olumn_name\x18\x01 \x01(\t\x12\x0f\n\x07\x66ilters\x18\x02 \x03(\t\x1a(\n\x11\x41ggregationRowKey\x12\x13\n\x0b\x63olumn_name\x18\x01 \x01(\t\x1aM\n\x14\x41ggregationPartition\x12\x13\n\x0b\x63olumn_name\x18\x01 \x01(\t\x12 \n\x18include_group_by_columns\x18\x02 \x01(\x08\x1aW\n\x12\x41ggregationFormula\x12\x41\n\nselectable\x18\x01 \x01(\x0b\x32-.io.deephaven.proto.backplane.grpc.SelectableB\x06\n\x04type\"\xe1\x01\n\x0eSortDescriptor\x12\x13\n\x0b\x63olumn_name\x18\x01 \x01(\t\x12\x13\n\x0bis_absolute\x18\x02 \x01(\x08\x12R\n\tdirection\x18\x03 \x01(\x0e\x32?.io.deephaven.proto.backplane.grpc.SortDescriptor.SortDirection\"Q\n\rSortDirection\x12\x0b\n\x07UNKNOWN\x10\x00\x12\x17\n\nDESCENDING\x10\xff\xff\xff\xff\xff\xff\xff\xff\xff\x01\x12\r\n\tASCENDING\x10\x01\x12\x0b\n\x07REVERSE\x10\x02\"\xd8\x01\n\x10SortTableRequest\x12<\n\tresult_id\x18\x01 \x01(\x0b\x32).io.deephaven.proto.backplane.grpc.Ticket\x12\x44\n\tsource_id\x18\x02 \x01(\x0b\x32\x31.io.deephaven.proto.backplane.grpc.TableReference\x12@\n\x05sorts\x18\x03 \x03(\x0b\x32\x31.io.deephaven.proto.backplane.grpc.SortDescriptor\"\xd7\x01\n\x12\x46ilterTableRequest\x12<\n\tresult_id\x18\x01 \x01(\x0b\x32).io.deephaven.proto.backplane.grpc.Ticket\x12\x44\n\tsource_id\x18\x02 \x01(\x0b\x32\x31.io.deephaven.proto.backplane.grpc.TableReference\x12=\n\x07\x66ilters\x18\x03 \x03(\x0b\x32,.io.deephaven.proto.backplane.grpc.Condition\"\xf9\x01\n\x0eSeekRowRequest\x12<\n\tsource_id\x18\x01 \x01(\x0b\x32).io.deephaven.proto.backplane.grpc.Ticket\x12\x18\n\x0cstarting_row\x18\x02 \x01(\x12\x42\x02\x30\x01\x12\x13\n\x0b\x63olumn_name\x18\x03 \x01(\t\x12>\n\nseek_value\x18\x04 \x01(\x0b\x32*.io.deephaven.proto.backplane.grpc.Literal\x12\x13\n\x0binsensitive\x18\x05 \x01(\x08\x12\x10\n\x08\x63ontains\x18\x06 \x01(\x08\x12\x13\n\x0bis_backward\x18\x07 \x01(\x08\")\n\x0fSeekRowResponse\x12\x16\n\nresult_row\x18\x01 \x01(\x12\x42\x02\x30\x01\" \n\tReference\x12\x13\n\x0b\x63olumn_name\x18\x01 \x01(\t\"\x91\x01\n\x07Literal\x12\x16\n\x0cstring_value\x18\x01 \x01(\tH\x00\x12\x16\n\x0c\x64ouble_value\x18\x02 \x01(\x01H\x00\x12\x14\n\nbool_value\x18\x03 \x01(\x08H\x00\x12\x18\n\nlong_value\x18\x04 \x01(\x12\x42\x02\x30\x01H\x00\x12\x1d\n\x0fnano_time_value\x18\x05 \x01(\x12\x42\x02\x30\x01H\x00\x42\x07\n\x05value\"\x91\x01\n\x05Value\x12\x41\n\treference\x18\x01 \x01(\x0b\x32,.io.deephaven.proto.backplane.grpc.ReferenceH\x00\x12=\n\x07literal\x18\x02 \x01(\x0b\x32*.io.deephaven.proto.backplane.grpc.LiteralH\x00\x42\x06\n\x04\x64\x61ta\"\xbc\x05\n\tCondition\x12>\n\x03\x61nd\x18\x01 \x01(\x0b\x32/.io.deephaven.proto.backplane.grpc.AndConditionH\x00\x12<\n\x02or\x18\x02 \x01(\x0b\x32..io.deephaven.proto.backplane.grpc.OrConditionH\x00\x12>\n\x03not\x18\x03 \x01(\x0b\x32/.io.deephaven.proto.backplane.grpc.NotConditionH\x00\x12\x46\n\x07\x63ompare\x18\x04 \x01(\x0b\x32\x33.io.deephaven.proto.backplane.grpc.CompareConditionH\x00\x12<\n\x02in\x18\x05 \x01(\x0b\x32..io.deephaven.proto.backplane.grpc.InConditionH\x00\x12\x44\n\x06invoke\x18\x06 \x01(\x0b\x32\x32.io.deephaven.proto.backplane.grpc.InvokeConditionH\x00\x12\x45\n\x07is_null\x18\x07 \x01(\x0b\x32\x32.io.deephaven.proto.backplane.grpc.IsNullConditionH\x00\x12\x46\n\x07matches\x18\x08 \x01(\x0b\x32\x33.io.deephaven.proto.backplane.grpc.MatchesConditionH\x00\x12H\n\x08\x63ontains\x18\t \x01(\x0b\x32\x34.io.deephaven.proto.backplane.grpc.ContainsConditionH\x00\x12\x44\n\x06search\x18\n \x01(\x0b\x32\x32.io.deephaven.proto.backplane.grpc.SearchConditionH\x00\x42\x06\n\x04\x64\x61ta\"M\n\x0c\x41ndCondition\x12=\n\x07\x66ilters\x18\x01 \x03(\x0b\x32,.io.deephaven.proto.backplane.grpc.Condition\"L\n\x0bOrCondition\x12=\n\x07\x66ilters\x18\x01 \x03(\x0b\x32,.io.deephaven.proto.backplane.grpc.Condition\"L\n\x0cNotCondition\x12<\n\x06\x66ilter\x18\x01 \x01(\x0b\x32,.io.deephaven.proto.backplane.grpc.Condition\"\xac\x03\n\x10\x43ompareCondition\x12W\n\toperation\x18\x01 \x01(\x0e\x32\x44.io.deephaven.proto.backplane.grpc.CompareCondition.CompareOperation\x12L\n\x10\x63\x61se_sensitivity\x18\x02 \x01(\x0e\x32\x32.io.deephaven.proto.backplane.grpc.CaseSensitivity\x12\x35\n\x03lhs\x18\x03 \x01(\x0b\x32(.io.deephaven.proto.backplane.grpc.Value\x12\x35\n\x03rhs\x18\x04 \x01(\x0b\x32(.io.deephaven.proto.backplane.grpc.Value\"\x82\x01\n\x10\x43ompareOperation\x12\r\n\tLESS_THAN\x10\x00\x12\x16\n\x12LESS_THAN_OR_EQUAL\x10\x01\x12\x10\n\x0cGREATER_THAN\x10\x02\x12\x19\n\x15GREATER_THAN_OR_EQUAL\x10\x03\x12\n\n\x06\x45QUALS\x10\x04\x12\x0e\n\nNOT_EQUALS\x10\x05\"\x95\x02\n\x0bInCondition\x12\x38\n\x06target\x18\x01 \x01(\x0b\x32(.io.deephaven.proto.backplane.grpc.Value\x12<\n\ncandidates\x18\x02 \x03(\x0b\x32(.io.deephaven.proto.backplane.grpc.Value\x12L\n\x10\x63\x61se_sensitivity\x18\x03 \x01(\x0e\x32\x32.io.deephaven.proto.backplane.grpc.CaseSensitivity\x12@\n\nmatch_type\x18\x04 \x01(\x0e\x32,.io.deephaven.proto.backplane.grpc.MatchType\"\x98\x01\n\x0fInvokeCondition\x12\x0e\n\x06method\x18\x01 \x01(\t\x12\x38\n\x06target\x18\x02 \x01(\x0b\x32(.io.deephaven.proto.backplane.grpc.Value\x12;\n\targuments\x18\x03 \x03(\x0b\x32(.io.deephaven.proto.backplane.grpc.Value\"R\n\x0fIsNullCondition\x12?\n\treference\x18\x01 \x01(\x0b\x32,.io.deephaven.proto.backplane.grpc.Reference\"\xf2\x01\n\x10MatchesCondition\x12?\n\treference\x18\x01 \x01(\x0b\x32,.io.deephaven.proto.backplane.grpc.Reference\x12\r\n\x05regex\x18\x02 \x01(\t\x12L\n\x10\x63\x61se_sensitivity\x18\x03 \x01(\x0e\x32\x32.io.deephaven.proto.backplane.grpc.CaseSensitivity\x12@\n\nmatch_type\x18\x04 \x01(\x0e\x32,.io.deephaven.proto.backplane.grpc.MatchType\"\xfb\x01\n\x11\x43ontainsCondition\x12?\n\treference\x18\x01 \x01(\x0b\x32,.io.deephaven.proto.backplane.grpc.Reference\x12\x15\n\rsearch_string\x18\x02 \x01(\t\x12L\n\x10\x63\x61se_sensitivity\x18\x03 \x01(\x0e\x32\x32.io.deephaven.proto.backplane.grpc.CaseSensitivity\x12@\n\nmatch_type\x18\x04 \x01(\x0e\x32,.io.deephaven.proto.backplane.grpc.MatchType\"s\n\x0fSearchCondition\x12\x15\n\rsearch_string\x18\x01 \x01(\t\x12I\n\x13optional_references\x18\x02 \x03(\x0b\x32,.io.deephaven.proto.backplane.grpc.Reference\"\x94\x01\n\x0e\x46lattenRequest\x12<\n\tresult_id\x18\x01 \x01(\x0b\x32).io.deephaven.proto.backplane.grpc.Ticket\x12\x44\n\tsource_id\x18\x02 \x01(\x0b\x32\x31.io.deephaven.proto.backplane.grpc.TableReference\"\x96\x01\n\x10MetaTableRequest\x12<\n\tresult_id\x18\x01 \x01(\x0b\x32).io.deephaven.proto.backplane.grpc.Ticket\x12\x44\n\tsource_id\x18\x02 \x01(\x0b\x32\x31.io.deephaven.proto.backplane.grpc.TableReference\"\xb4\x03\n\x19RunChartDownsampleRequest\x12<\n\tresult_id\x18\x01 \x01(\x0b\x32).io.deephaven.proto.backplane.grpc.Ticket\x12\x44\n\tsource_id\x18\x02 \x01(\x0b\x32\x31.io.deephaven.proto.backplane.grpc.TableReference\x12\x13\n\x0bpixel_count\x18\x03 \x01(\x05\x12Z\n\nzoom_range\x18\x04 \x01(\x0b\x32\x46.io.deephaven.proto.backplane.grpc.RunChartDownsampleRequest.ZoomRange\x12\x15\n\rx_column_name\x18\x05 \x01(\t\x12\x16\n\x0ey_column_names\x18\x06 \x03(\t\x1as\n\tZoomRange\x12\x1f\n\x0emin_date_nanos\x18\x01 \x01(\x03\x42\x02\x30\x01H\x00\x88\x01\x01\x12\x1f\n\x0emax_date_nanos\x18\x02 \x01(\x03\x42\x02\x30\x01H\x01\x88\x01\x01\x42\x11\n\x0f_min_date_nanosB\x11\n\x0f_max_date_nanos\"\xe0\x05\n\x17\x43reateInputTableRequest\x12<\n\tresult_id\x18\x01 \x01(\x0b\x32).io.deephaven.proto.backplane.grpc.Ticket\x12L\n\x0fsource_table_id\x18\x02 \x01(\x0b\x32\x31.io.deephaven.proto.backplane.grpc.TableReferenceH\x00\x12\x10\n\x06schema\x18\x03 \x01(\x0cH\x00\x12W\n\x04kind\x18\x04 \x01(\x0b\x32I.io.deephaven.proto.backplane.grpc.CreateInputTableRequest.InputTableKind\x1a\xbf\x03\n\x0eInputTableKind\x12}\n\x15in_memory_append_only\x18\x01 \x01(\x0b\x32\\.io.deephaven.proto.backplane.grpc.CreateInputTableRequest.InputTableKind.InMemoryAppendOnlyH\x00\x12{\n\x14in_memory_key_backed\x18\x02 \x01(\x0b\x32[.io.deephaven.proto.backplane.grpc.CreateInputTableRequest.InputTableKind.InMemoryKeyBackedH\x00\x12`\n\x05\x62link\x18\x03 \x01(\x0b\x32O.io.deephaven.proto.backplane.grpc.CreateInputTableRequest.InputTableKind.BlinkH\x00\x1a\x14\n\x12InMemoryAppendOnly\x1a(\n\x11InMemoryKeyBacked\x12\x13\n\x0bkey_columns\x18\x01 \x03(\t\x1a\x07\n\x05\x42linkB\x06\n\x04kindB\x0c\n\ndefinition\"\x83\x02\n\x0eWhereInRequest\x12<\n\tresult_id\x18\x01 \x01(\x0b\x32).io.deephaven.proto.backplane.grpc.Ticket\x12\x42\n\x07left_id\x18\x02 \x01(\x0b\x32\x31.io.deephaven.proto.backplane.grpc.TableReference\x12\x43\n\x08right_id\x18\x03 \x01(\x0b\x32\x31.io.deephaven.proto.backplane.grpc.TableReference\x12\x10\n\x08inverted\x18\x04 \x01(\x08\x12\x18\n\x10\x63olumns_to_match\x18\x05 \x03(\t\"\xea\x01\n\x17\x43olumnStatisticsRequest\x12<\n\tresult_id\x18\x01 \x01(\x0b\x32).io.deephaven.proto.backplane.grpc.Ticket\x12\x44\n\tsource_id\x18\x02 \x01(\x0b\x32\x31.io.deephaven.proto.backplane.grpc.TableReference\x12\x13\n\x0b\x63olumn_name\x18\x03 \x01(\t\x12\x1f\n\x12unique_value_limit\x18\x04 \x01(\x05H\x00\x88\x01\x01\x42\x15\n\x13_unique_value_limit\"\xdd\x01\n\x0cSliceRequest\x12<\n\tresult_id\x18\x01 \x01(\x0b\x32).io.deephaven.proto.backplane.grpc.Ticket\x12\x44\n\tsource_id\x18\x02 \x01(\x0b\x32\x31.io.deephaven.proto.backplane.grpc.TableReference\x12$\n\x18\x66irst_position_inclusive\x18\x03 \x01(\x12\x42\x02\x30\x01\x12#\n\x17last_position_exclusive\x18\x04 \x01(\x12\x42\x02\x30\x01\"\xdb\x1a\n\x11\x42\x61tchTableRequest\x12K\n\x03ops\x18\x01 \x03(\x0b\x32>.io.deephaven.proto.backplane.grpc.BatchTableRequest.Operation\x1a\xf8\x19\n\tOperation\x12K\n\x0b\x65mpty_table\x18\x01 \x01(\x0b\x32\x34.io.deephaven.proto.backplane.grpc.EmptyTableRequestH\x00\x12I\n\ntime_table\x18\x02 \x01(\x0b\x32\x33.io.deephaven.proto.backplane.grpc.TimeTableRequestH\x00\x12M\n\x0c\x64rop_columns\x18\x03 \x01(\x0b\x32\x35.io.deephaven.proto.backplane.grpc.DropColumnsRequestH\x00\x12J\n\x06update\x18\x04 \x01(\x0b\x32\x38.io.deephaven.proto.backplane.grpc.SelectOrUpdateRequestH\x00\x12O\n\x0blazy_update\x18\x05 \x01(\x0b\x32\x38.io.deephaven.proto.backplane.grpc.SelectOrUpdateRequestH\x00\x12H\n\x04view\x18\x06 \x01(\x0b\x32\x38.io.deephaven.proto.backplane.grpc.SelectOrUpdateRequestH\x00\x12O\n\x0bupdate_view\x18\x07 \x01(\x0b\x32\x38.io.deephaven.proto.backplane.grpc.SelectOrUpdateRequestH\x00\x12J\n\x06select\x18\x08 \x01(\x0b\x32\x38.io.deephaven.proto.backplane.grpc.SelectOrUpdateRequestH\x00\x12S\n\x0fselect_distinct\x18\t \x01(\x0b\x32\x38.io.deephaven.proto.backplane.grpc.SelectDistinctRequestH\x00\x12G\n\x06\x66ilter\x18\n \x01(\x0b\x32\x35.io.deephaven.proto.backplane.grpc.FilterTableRequestH\x00\x12`\n\x13unstructured_filter\x18\x0b \x01(\x0b\x32\x41.io.deephaven.proto.backplane.grpc.UnstructuredFilterTableRequestH\x00\x12\x43\n\x04sort\x18\x0c \x01(\x0b\x32\x33.io.deephaven.proto.backplane.grpc.SortTableRequestH\x00\x12\x44\n\x04head\x18\r \x01(\x0b\x32\x34.io.deephaven.proto.backplane.grpc.HeadOrTailRequestH\x00\x12\x44\n\x04tail\x18\x0e \x01(\x0b\x32\x34.io.deephaven.proto.backplane.grpc.HeadOrTailRequestH\x00\x12I\n\x07head_by\x18\x0f \x01(\x0b\x32\x36.io.deephaven.proto.backplane.grpc.HeadOrTailByRequestH\x00\x12I\n\x07tail_by\x18\x10 \x01(\x0b\x32\x36.io.deephaven.proto.backplane.grpc.HeadOrTailByRequestH\x00\x12\x44\n\x07ungroup\x18\x11 \x01(\x0b\x32\x31.io.deephaven.proto.backplane.grpc.UngroupRequestH\x00\x12\x46\n\x05merge\x18\x12 \x01(\x0b\x32\x35.io.deephaven.proto.backplane.grpc.MergeTablesRequestH\x00\x12S\n\x0f\x63ombo_aggregate\x18\x13 \x01(\x0b\x32\x38.io.deephaven.proto.backplane.grpc.ComboAggregateRequestH\x00\x12\x44\n\x07\x66latten\x18\x15 \x01(\x0b\x32\x31.io.deephaven.proto.backplane.grpc.FlattenRequestH\x00\x12\\\n\x14run_chart_downsample\x18\x16 \x01(\x0b\x32<.io.deephaven.proto.backplane.grpc.RunChartDownsampleRequestH\x00\x12O\n\ncross_join\x18\x17 \x01(\x0b\x32\x39.io.deephaven.proto.backplane.grpc.CrossJoinTablesRequestH\x00\x12S\n\x0cnatural_join\x18\x18 \x01(\x0b\x32;.io.deephaven.proto.backplane.grpc.NaturalJoinTablesRequestH\x00\x12O\n\nexact_join\x18\x19 \x01(\x0b\x32\x39.io.deephaven.proto.backplane.grpc.ExactJoinTablesRequestH\x00\x12M\n\tleft_join\x18\x1a \x01(\x0b\x32\x38.io.deephaven.proto.backplane.grpc.LeftJoinTablesRequestH\x00\x12R\n\nas_of_join\x18\x1b \x01(\x0b\x32\x38.io.deephaven.proto.backplane.grpc.AsOfJoinTablesRequestB\x02\x18\x01H\x00\x12K\n\x0b\x66\x65tch_table\x18\x1c \x01(\x0b\x32\x34.io.deephaven.proto.backplane.grpc.FetchTableRequestH\x00\x12^\n\x15\x61pply_preview_columns\x18\x1e \x01(\x0b\x32=.io.deephaven.proto.backplane.grpc.ApplyPreviewColumnsRequestH\x00\x12X\n\x12\x63reate_input_table\x18\x1f \x01(\x0b\x32:.io.deephaven.proto.backplane.grpc.CreateInputTableRequestH\x00\x12G\n\tupdate_by\x18  \x01(\x0b\x32\x32.io.deephaven.proto.backplane.grpc.UpdateByRequestH\x00\x12\x45\n\x08where_in\x18! \x01(\x0b\x32\x31.io.deephaven.proto.backplane.grpc.WhereInRequestH\x00\x12O\n\raggregate_all\x18\" \x01(\x0b\x32\x36.io.deephaven.proto.backplane.grpc.AggregateAllRequestH\x00\x12H\n\taggregate\x18# \x01(\x0b\x32\x33.io.deephaven.proto.backplane.grpc.AggregateRequestH\x00\x12K\n\x08snapshot\x18$ \x01(\x0b\x32\x37.io.deephaven.proto.backplane.grpc.SnapshotTableRequestH\x00\x12T\n\rsnapshot_when\x18% \x01(\x0b\x32;.io.deephaven.proto.backplane.grpc.SnapshotWhenTableRequestH\x00\x12I\n\nmeta_table\x18& \x01(\x0b\x32\x33.io.deephaven.proto.backplane.grpc.MetaTableRequestH\x00\x12O\n\nrange_join\x18\' \x01(\x0b\x32\x39.io.deephaven.proto.backplane.grpc.RangeJoinTablesRequestH\x00\x12\x43\n\x02\x61j\x18( \x01(\x0b\x32\x35.io.deephaven.proto.backplane.grpc.AjRajTablesRequestH\x00\x12\x44\n\x03raj\x18) \x01(\x0b\x32\x35.io.deephaven.proto.backplane.grpc.AjRajTablesRequestH\x00\x12W\n\x11\x63olumn_statistics\x18* \x01(\x0b\x32:.io.deephaven.proto.backplane.grpc.ColumnStatisticsRequestH\x00\x12O\n\nmulti_join\x18+ \x01(\x0b\x32\x39.io.deephaven.proto.backplane.grpc.MultiJoinTablesRequestH\x00\x12@\n\x05slice\x18, \x01(\x0b\x32/.io.deephaven.proto.backplane.grpc.SliceRequestH\x00\x42\x04\n\x02opJ\x04\x08\x14\x10\x15J\x04\x08\x1d\x10\x1e*b\n\x0f\x42\x61\x64\x44\x61taBehavior\x12#\n\x1f\x42\x41\x44_DATA_BEHAVIOR_NOT_SPECIFIED\x10\x00\x12\t\n\x05THROW\x10\x01\x12\t\n\x05RESET\x10\x02\x12\x08\n\x04SKIP\x10\x03\x12\n\n\x06POISON\x10\x04*t\n\x14UpdateByNullBehavior\x12\x1f\n\x1bNULL_BEHAVIOR_NOT_SPECIFIED\x10\x00\x12\x12\n\x0eNULL_DOMINATES\x10\x01\x12\x13\n\x0fVALUE_DOMINATES\x10\x02\x12\x12\n\x0eZERO_DOMINATES\x10\x03*\x1b\n\tNullValue\x12\x0e\n\nNULL_VALUE\x10\x00*2\n\x0f\x43\x61seSensitivity\x12\x0e\n\nMATCH_CASE\x10\x00\x12\x0f\n\x0bIGNORE_CASE\x10\x01*&\n\tMatchType\x12\x0b\n\x07REGULAR\x10\x00\x12\x0c\n\x08INVERTED\x10\x01\x32\xb9\x32\n\x0cTableService\x12\x91\x01\n GetExportedTableCreationResponse\x12).io.deephaven.proto.backplane.grpc.Ticket\x1a@.io.deephaven.proto.backplane.grpc.ExportedTableCreationResponse\"\x00\x12\x86\x01\n\nFetchTable\x12\x34.io.deephaven.proto.backplane.grpc.FetchTableRequest\x1a@.io.deephaven.proto.backplane.grpc.ExportedTableCreationResponse\"\x00\x12\x98\x01\n\x13\x41pplyPreviewColumns\x12=.io.deephaven.proto.backplane.grpc.ApplyPreviewColumnsRequest\x1a@.io.deephaven.proto.backplane.grpc.ExportedTableCreationResponse\"\x00\x12\x86\x01\n\nEmptyTable\x12\x34.io.deephaven.proto.backplane.grpc.EmptyTableRequest\x1a@.io.deephaven.proto.backplane.grpc.ExportedTableCreationResponse\"\x00\x12\x84\x01\n\tTimeTable\x12\x33.io.deephaven.proto.backplane.grpc.TimeTableRequest\x1a@.io.deephaven.proto.backplane.grpc.ExportedTableCreationResponse\"\x00\x12\x88\x01\n\x0b\x44ropColumns\x12\x35.io.deephaven.proto.backplane.grpc.DropColumnsRequest\x1a@.io.deephaven.proto.backplane.grpc.ExportedTableCreationResponse\"\x00\x12\x86\x01\n\x06Update\x12\x38.io.deephaven.proto.backplane.grpc.SelectOrUpdateRequest\x1a@.io.deephaven.proto.backplane.grpc.ExportedTableCreationResponse\"\x00\x12\x8a\x01\n\nLazyUpdate\x12\x38.io.deephaven.proto.backplane.grpc.SelectOrUpdateRequest\x1a@.io.deephaven.proto.backplane.grpc.ExportedTableCreationResponse\"\x00\x12\x84\x01\n\x04View\x12\x38.io.deephaven.proto.backplane.grpc.SelectOrUpdateRequest\x1a@.io.deephaven.proto.backplane.grpc.ExportedTableCreationResponse\"\x00\x12\x8a\x01\n\nUpdateView\x12\x38.io.deephaven.proto.backplane.grpc.SelectOrUpdateRequest\x1a@.io.deephaven.proto.backplane.grpc.ExportedTableCreationResponse\"\x00\x12\x86\x01\n\x06Select\x12\x38.io.deephaven.proto.backplane.grpc.SelectOrUpdateRequest\x1a@.io.deephaven.proto.backplane.grpc.ExportedTableCreationResponse\"\x00\x12\x82\x01\n\x08UpdateBy\x12\x32.io.deephaven.proto.backplane.grpc.UpdateByRequest\x1a@.io.deephaven.proto.backplane.grpc.ExportedTableCreationResponse\"\x00\x12\x8e\x01\n\x0eSelectDistinct\x12\x38.io.deephaven.proto.backplane.grpc.SelectDistinctRequest\x1a@.io.deephaven.proto.backplane.grpc.ExportedTableCreationResponse\"\x00\x12\x83\x01\n\x06\x46ilter\x12\x35.io.deephaven.proto.backplane.grpc.FilterTableRequest\x1a@.io.deephaven.proto.backplane.grpc.ExportedTableCreationResponse\"\x00\x12\x9b\x01\n\x12UnstructuredFilter\x12\x41.io.deephaven.proto.backplane.grpc.UnstructuredFilterTableRequest\x1a@.io.deephaven.proto.backplane.grpc.ExportedTableCreationResponse\"\x00\x12\x7f\n\x04Sort\x12\x33.io.deephaven.proto.backplane.grpc.SortTableRequest\x1a@.io.deephaven.proto.backplane.grpc.ExportedTableCreationResponse\"\x00\x12\x80\x01\n\x04Head\x12\x34.io.deephaven.proto.backplane.grpc.HeadOrTailRequest\x1a@.io.deephaven.proto.backplane.grpc.ExportedTableCreationResponse\"\x00\x12\x80\x01\n\x04Tail\x12\x34.io.deephaven.proto.backplane.grpc.HeadOrTailRequest\x1a@.io.deephaven.proto.backplane.grpc.ExportedTableCreationResponse\"\x00\x12\x84\x01\n\x06HeadBy\x12\x36.io.deephaven.proto.backplane.grpc.HeadOrTailByRequest\x1a@.io.deephaven.proto.backplane.grpc.ExportedTableCreationResponse\"\x00\x12\x84\x01\n\x06TailBy\x12\x36.io.deephaven.proto.backplane.grpc.HeadOrTailByRequest\x1a@.io.deephaven.proto.backplane.grpc.ExportedTableCreationResponse\"\x00\x12\x80\x01\n\x07Ungroup\x12\x31.io.deephaven.proto.backplane.grpc.UngroupRequest\x1a@.io.deephaven.proto.backplane.grpc.ExportedTableCreationResponse\"\x00\x12\x88\x01\n\x0bMergeTables\x12\x35.io.deephaven.proto.backplane.grpc.MergeTablesRequest\x1a@.io.deephaven.proto.backplane.grpc.ExportedTableCreationResponse\"\x00\x12\x90\x01\n\x0f\x43rossJoinTables\x12\x39.io.deephaven.proto.backplane.grpc.CrossJoinTablesRequest\x1a@.io.deephaven.proto.backplane.grpc.ExportedTableCreationResponse\"\x00\x12\x94\x01\n\x11NaturalJoinTables\x12;.io.deephaven.proto.backplane.grpc.NaturalJoinTablesRequest\x1a@.io.deephaven.proto.backplane.grpc.ExportedTableCreationResponse\"\x00\x12\x90\x01\n\x0f\x45xactJoinTables\x12\x39.io.deephaven.proto.backplane.grpc.ExactJoinTablesRequest\x1a@.io.deephaven.proto.backplane.grpc.ExportedTableCreationResponse\"\x00\x12\x8e\x01\n\x0eLeftJoinTables\x12\x38.io.deephaven.proto.backplane.grpc.LeftJoinTablesRequest\x1a@.io.deephaven.proto.backplane.grpc.ExportedTableCreationResponse\"\x00\x12\x91\x01\n\x0e\x41sOfJoinTables\x12\x38.io.deephaven.proto.backplane.grpc.AsOfJoinTablesRequest\x1a@.io.deephaven.proto.backplane.grpc.ExportedTableCreationResponse\"\x03\x88\x02\x01\x12\x85\x01\n\x08\x41jTables\x12\x35.io.deephaven.proto.backplane.grpc.AjRajTablesRequest\x1a@.io.deephaven.proto.backplane.grpc.ExportedTableCreationResponse\"\x00\x12\x86\x01\n\tRajTables\x12\x35.io.deephaven.proto.backplane.grpc.AjRajTablesRequest\x1a@.io.deephaven.proto.backplane.grpc.ExportedTableCreationResponse\"\x00\x12\x90\x01\n\x0fMultiJoinTables\x12\x39.io.deephaven.proto.backplane.grpc.MultiJoinTablesRequest\x1a@.io.deephaven.proto.backplane.grpc.ExportedTableCreationResponse\"\x00\x12\x90\x01\n\x0fRangeJoinTables\x12\x39.io.deephaven.proto.backplane.grpc.RangeJoinTablesRequest\x1a@.io.deephaven.proto.backplane.grpc.ExportedTableCreationResponse\"\x00\x12\x91\x01\n\x0e\x43omboAggregate\x12\x38.io.deephaven.proto.backplane.grpc.ComboAggregateRequest\x1a@.io.deephaven.proto.backplane.grpc.ExportedTableCreationResponse\"\x03\x88\x02\x01\x12\x8a\x01\n\x0c\x41ggregateAll\x12\x36.io.deephaven.proto.backplane.grpc.AggregateAllRequest\x1a@.io.deephaven.proto.backplane.grpc.ExportedTableCreationResponse\"\x00\x12\x84\x01\n\tAggregate\x12\x33.io.deephaven.proto.backplane.grpc.AggregateRequest\x1a@.io.deephaven.proto.backplane.grpc.ExportedTableCreationResponse\"\x00\x12\x87\x01\n\x08Snapshot\x12\x37.io.deephaven.proto.backplane.grpc.SnapshotTableRequest\x1a@.io.deephaven.proto.backplane.grpc.ExportedTableCreationResponse\"\x00\x12\x8f\x01\n\x0cSnapshotWhen\x12;.io.deephaven.proto.backplane.grpc.SnapshotWhenTableRequest\x1a@.io.deephaven.proto.backplane.grpc.ExportedTableCreationResponse\"\x00\x12\x80\x01\n\x07\x46latten\x12\x31.io.deephaven.proto.backplane.grpc.FlattenRequest\x1a@.io.deephaven.proto.backplane.grpc.ExportedTableCreationResponse\"\x00\x12\x96\x01\n\x12RunChartDownsample\x12<.io.deephaven.proto.backplane.grpc.RunChartDownsampleRequest\x1a@.io.deephaven.proto.backplane.grpc.ExportedTableCreationResponse\"\x00\x12\x92\x01\n\x10\x43reateInputTable\x12:.io.deephaven.proto.backplane.grpc.CreateInputTableRequest\x1a@.io.deephaven.proto.backplane.grpc.ExportedTableCreationResponse\"\x00\x12\x80\x01\n\x07WhereIn\x12\x31.io.deephaven.proto.backplane.grpc.WhereInRequest\x1a@.io.deephaven.proto.backplane.grpc.ExportedTableCreationResponse\"\x00\x12\x83\x01\n\x05\x42\x61tch\x12\x34.io.deephaven.proto.backplane.grpc.BatchTableRequest\x1a@.io.deephaven.proto.backplane.grpc.ExportedTableCreationResponse\"\x00\x30\x01\x12\x99\x01\n\x14\x45xportedTableUpdates\x12>.io.deephaven.proto.backplane.grpc.ExportedTableUpdatesRequest\x1a=.io.deephaven.proto.backplane.grpc.ExportedTableUpdateMessage\"\x00\x30\x01\x12r\n\x07SeekRow\x12\x31.io.deephaven.proto.backplane.grpc.SeekRowRequest\x1a\x32.io.deephaven.proto.backplane.grpc.SeekRowResponse\"\x00\x12\x84\x01\n\tMetaTable\x12\x33.io.deephaven.proto.backplane.grpc.MetaTableRequest\x1a@.io.deephaven.proto.backplane.grpc.ExportedTableCreationResponse\"\x00\x12\x99\x01\n\x17\x43omputeColumnStatistics\x12:.io.deephaven.proto.backplane.grpc.ColumnStatisticsRequest\x1a@.io.deephaven.proto.backplane.grpc.ExportedTableCreationResponse\"\x00\x12|\n\x05Slice\x12/.io.deephaven.proto.backplane.grpc.SliceRequest\x1a@.io.deephaven.proto.backplane.grpc.ExportedTableCreationResponse\"\x00\x42\x41H\x01P\x01Z;github.com/deephaven/deephaven-core/go/internal/proto/tableb\x06proto3')
+
+_globals = globals()
+_builder.BuildMessageAndEnumDescriptors(DESCRIPTOR, _globals)
+_builder.BuildTopDescriptorsAndMessages(DESCRIPTOR, 'deephaven_core.proto.table_pb2', _globals)
+if not _descriptor._USE_C_DESCRIPTORS:
+  _globals['DESCRIPTOR']._loaded_options = None
+  _globals['DESCRIPTOR']._serialized_options = b'H\001P\001Z;github.com/deephaven/deephaven-core/go/internal/proto/table'
+  _globals['_EXPORTEDTABLECREATIONRESPONSE'].fields_by_name['size']._loaded_options = None
+  _globals['_EXPORTEDTABLECREATIONRESPONSE'].fields_by_name['size']._serialized_options = b'0\001'
+  _globals['_EXPORTEDTABLEUPDATEMESSAGE'].fields_by_name['size']._loaded_options = None
+  _globals['_EXPORTEDTABLEUPDATEMESSAGE'].fields_by_name['size']._serialized_options = b'0\001'
+  _globals['_EMPTYTABLEREQUEST'].fields_by_name['size']._loaded_options = None
+  _globals['_EMPTYTABLEREQUEST'].fields_by_name['size']._serialized_options = b'0\001'
+  _globals['_TIMETABLEREQUEST'].fields_by_name['start_time_nanos']._loaded_options = None
+  _globals['_TIMETABLEREQUEST'].fields_by_name['start_time_nanos']._serialized_options = b'0\001'
+  _globals['_TIMETABLEREQUEST'].fields_by_name['period_nanos']._loaded_options = None
+  _globals['_TIMETABLEREQUEST'].fields_by_name['period_nanos']._serialized_options = b'0\001'
+  _globals['_UPDATEBYWINDOWSCALE_UPDATEBYWINDOWTIME'].fields_by_name['nanos']._loaded_options = None
+  _globals['_UPDATEBYWINDOWSCALE_UPDATEBYWINDOWTIME'].fields_by_name['nanos']._serialized_options = b'0\001'
+  _globals['_HEADORTAILREQUEST'].fields_by_name['num_rows']._loaded_options = None
+  _globals['_HEADORTAILREQUEST'].fields_by_name['num_rows']._serialized_options = b'0\001'
+  _globals['_HEADORTAILBYREQUEST'].fields_by_name['num_rows']._loaded_options = None
+  _globals['_HEADORTAILBYREQUEST'].fields_by_name['num_rows']._serialized_options = b'0\001'
+  _globals['_ASOFJOINTABLESREQUEST_MATCHRULE']._loaded_options = None
+  _globals['_ASOFJOINTABLESREQUEST_MATCHRULE']._serialized_options = b'\030\001'
+  _globals['_ASOFJOINTABLESREQUEST']._loaded_options = None
+  _globals['_ASOFJOINTABLESREQUEST']._serialized_options = b'\030\001'
+  _globals['_COMBOAGGREGATEREQUEST']._loaded_options = None
+  _globals['_COMBOAGGREGATEREQUEST']._serialized_options = b'\030\001'
+  _globals['_AGGSPEC_AGGSPECNONUNIQUESENTINEL'].fields_by_name['long_value']._loaded_options = None
+  _globals['_AGGSPEC_AGGSPECNONUNIQUESENTINEL'].fields_by_name['long_value']._serialized_options = b'0\001'
+  _globals['_SEEKROWREQUEST'].fields_by_name['starting_row']._loaded_options = None
+  _globals['_SEEKROWREQUEST'].fields_by_name['starting_row']._serialized_options = b'0\001'
+  _globals['_SEEKROWRESPONSE'].fields_by_name['result_row']._loaded_options = None
+  _globals['_SEEKROWRESPONSE'].fields_by_name['result_row']._serialized_options = b'0\001'
+  _globals['_LITERAL'].fields_by_name['long_value']._loaded_options = None
+  _globals['_LITERAL'].fields_by_name['long_value']._serialized_options = b'0\001'
+  _globals['_LITERAL'].fields_by_name['nano_time_value']._loaded_options = None
+  _globals['_LITERAL'].fields_by_name['nano_time_value']._serialized_options = b'0\001'
+  _globals['_RUNCHARTDOWNSAMPLEREQUEST_ZOOMRANGE'].fields_by_name['min_date_nanos']._loaded_options = None
+  _globals['_RUNCHARTDOWNSAMPLEREQUEST_ZOOMRANGE'].fields_by_name['min_date_nanos']._serialized_options = b'0\001'
+  _globals['_RUNCHARTDOWNSAMPLEREQUEST_ZOOMRANGE'].fields_by_name['max_date_nanos']._loaded_options = None
+  _globals['_RUNCHARTDOWNSAMPLEREQUEST_ZOOMRANGE'].fields_by_name['max_date_nanos']._serialized_options = b'0\001'
+  _globals['_SLICEREQUEST'].fields_by_name['first_position_inclusive']._loaded_options = None
+  _globals['_SLICEREQUEST'].fields_by_name['first_position_inclusive']._serialized_options = b'0\001'
+  _globals['_SLICEREQUEST'].fields_by_name['last_position_exclusive']._loaded_options = None
+  _globals['_SLICEREQUEST'].fields_by_name['last_position_exclusive']._serialized_options = b'0\001'
+  _globals['_BATCHTABLEREQUEST_OPERATION'].fields_by_name['as_of_join']._loaded_options = None
+  _globals['_BATCHTABLEREQUEST_OPERATION'].fields_by_name['as_of_join']._serialized_options = b'\030\001'
+  _globals['_TABLESERVICE'].methods_by_name['AsOfJoinTables']._loaded_options = None
+  _globals['_TABLESERVICE'].methods_by_name['AsOfJoinTables']._serialized_options = b'\210\002\001'
+  _globals['_TABLESERVICE'].methods_by_name['ComboAggregate']._loaded_options = None
+  _globals['_TABLESERVICE'].methods_by_name['ComboAggregate']._serialized_options = b'\210\002\001'
+  _globals['_BADDATABEHAVIOR']._serialized_start=29321
+  _globals['_BADDATABEHAVIOR']._serialized_end=29419
+  _globals['_UPDATEBYNULLBEHAVIOR']._serialized_start=29421
+  _globals['_UPDATEBYNULLBEHAVIOR']._serialized_end=29537
+  _globals['_NULLVALUE']._serialized_start=29539
+  _globals['_NULLVALUE']._serialized_end=29566
+  _globals['_CASESENSITIVITY']._serialized_start=29568
+  _globals['_CASESENSITIVITY']._serialized_end=29618
+  _globals['_MATCHTYPE']._serialized_start=29620
+  _globals['_MATCHTYPE']._serialized_end=29658
+  _globals['_TABLEREFERENCE']._serialized_start=106
+  _globals['_TABLEREFERENCE']._serialized_end=214
+  _globals['_EXPORTEDTABLECREATIONRESPONSE']._serialized_start=217
+  _globals['_EXPORTEDTABLECREATIONRESPONSE']._serialized_end=415
+  _globals['_FETCHTABLEREQUEST']._serialized_start=418
+  _globals['_FETCHTABLEREQUEST']._serialized_end=569
+  _globals['_APPLYPREVIEWCOLUMNSREQUEST']._serialized_start=572
+  _globals['_APPLYPREVIEWCOLUMNSREQUEST']._serialized_end=732
+  _globals['_EXPORTEDTABLEUPDATESREQUEST']._serialized_start=734
+  _globals['_EXPORTEDTABLEUPDATESREQUEST']._serialized_end=763
+  _globals['_EXPORTEDTABLEUPDATEMESSAGE']._serialized_start=766
+  _globals['_EXPORTEDTABLEUPDATEMESSAGE']._serialized_end=906
+  _globals['_EMPTYTABLEREQUEST']._serialized_start=908
+  _globals['_EMPTYTABLEREQUEST']._serialized_end=1007
+  _globals['_TIMETABLEREQUEST']._serialized_start=1010
+  _globals['_TIMETABLEREQUEST']._serialized_end=1249
+  _globals['_SELECTORUPDATEREQUEST']._serialized_start=1252
+  _globals['_SELECTORUPDATEREQUEST']._serialized_end=1429
+  _globals['_SELECTABLE']._serialized_start=1431
+  _globals['_SELECTABLE']._serialized_end=1466
+  _globals['_MATHCONTEXT']._serialized_start=1469
+  _globals['_MATHCONTEXT']._serialized_end=1737
+  _globals['_MATHCONTEXT_ROUNDINGMODE']._serialized_start=1588
+  _globals['_MATHCONTEXT_ROUNDINGMODE']._serialized_end=1737
+  _globals['_UPDATEBYWINDOWSCALE']._serialized_start=1740
+  _globals['_UPDATEBYWINDOWSCALE']._serialized_end=2087
+  _globals['_UPDATEBYWINDOWSCALE_UPDATEBYWINDOWTICKS']._serialized_start=1947
+  _globals['_UPDATEBYWINDOWSCALE_UPDATEBYWINDOWTICKS']._serialized_end=1983
+  _globals['_UPDATEBYWINDOWSCALE_UPDATEBYWINDOWTIME']._serialized_start=1985
+  _globals['_UPDATEBYWINDOWSCALE_UPDATEBYWINDOWTIME']._serialized_end=2079
+  _globals['_UPDATEBYEMOPTIONS']._serialized_start=2090
+  _globals['_UPDATEBYEMOPTIONS']._serialized_end=2571
+  _globals['_UPDATEBYDELTAOPTIONS']._serialized_start=2573
+  _globals['_UPDATEBYDELTAOPTIONS']._serialized_end=2675
+  _globals['_UPDATEBYREQUEST']._serialized_start=2678
+  _globals['_UPDATEBYREQUEST']._serialized_end=9745
+  _globals['_UPDATEBYREQUEST_UPDATEBYOPTIONS']._serialized_start=3031
+  _globals['_UPDATEBYREQUEST_UPDATEBYOPTIONS']._serialized_end=3482
+  _globals['_UPDATEBYREQUEST_UPDATEBYOPERATION']._serialized_start=3485
+  _globals['_UPDATEBYREQUEST_UPDATEBYOPERATION']._serialized_end=9745
+  _globals['_UPDATEBYREQUEST_UPDATEBYOPERATION_UPDATEBYCOLUMN']._serialized_start=3610
+  _globals['_UPDATEBYREQUEST_UPDATEBYOPERATION_UPDATEBYCOLUMN']._serialized_end=9737
+  _globals['_UPDATEBYREQUEST_UPDATEBYOPERATION_UPDATEBYCOLUMN_UPDATEBYSPEC']._serialized_start=3762
+  _globals['_UPDATEBYREQUEST_UPDATEBYOPERATION_UPDATEBYCOLUMN_UPDATEBYSPEC']._serialized_end=9737
+  _globals['_UPDATEBYREQUEST_UPDATEBYOPERATION_UPDATEBYCOLUMN_UPDATEBYSPEC_UPDATEBYCUMULATIVESUM']._serialized_start=6665
+  _globals['_UPDATEBYREQUEST_UPDATEBYOPERATION_UPDATEBYCOLUMN_UPDATEBYSPEC_UPDATEBYCUMULATIVESUM']._serialized_end=6688
+  _globals['_UPDATEBYREQUEST_UPDATEBYOPERATION_UPDATEBYCOLUMN_UPDATEBYSPEC_UPDATEBYCUMULATIVEMIN']._serialized_start=6690
+  _globals['_UPDATEBYREQUEST_UPDATEBYOPERATION_UPDATEBYCOLUMN_UPDATEBYSPEC_UPDATEBYCUMULATIVEMIN']._serialized_end=6713
+  _globals['_UPDATEBYREQUEST_UPDATEBYOPERATION_UPDATEBYCOLUMN_UPDATEBYSPEC_UPDATEBYCUMULATIVEMAX']._serialized_start=6715
+  _globals['_UPDATEBYREQUEST_UPDATEBYOPERATION_UPDATEBYCOLUMN_UPDATEBYSPEC_UPDATEBYCUMULATIVEMAX']._serialized_end=6738
+  _globals['_UPDATEBYREQUEST_UPDATEBYOPERATION_UPDATEBYCOLUMN_UPDATEBYSPEC_UPDATEBYCUMULATIVEPRODUCT']._serialized_start=6740
+  _globals['_UPDATEBYREQUEST_UPDATEBYOPERATION_UPDATEBYCOLUMN_UPDATEBYSPEC_UPDATEBYCUMULATIVEPRODUCT']._serialized_end=6767
+  _globals['_UPDATEBYREQUEST_UPDATEBYOPERATION_UPDATEBYCOLUMN_UPDATEBYSPEC_UPDATEBYFILL']._serialized_start=6769
+  _globals['_UPDATEBYREQUEST_UPDATEBYOPERATION_UPDATEBYCOLUMN_UPDATEBYSPEC_UPDATEBYFILL']._serialized_end=6783
+  _globals['_UPDATEBYREQUEST_UPDATEBYOPERATION_UPDATEBYCOLUMN_UPDATEBYSPEC_UPDATEBYEMA']._serialized_start=6786
+  _globals['_UPDATEBYREQUEST_UPDATEBYOPERATION_UPDATEBYCOLUMN_UPDATEBYSPEC_UPDATEBYEMA']._serialized_end=6948
+  _globals['_UPDATEBYREQUEST_UPDATEBYOPERATION_UPDATEBYCOLUMN_UPDATEBYSPEC_UPDATEBYEMS']._serialized_start=6951
+  _globals['_UPDATEBYREQUEST_UPDATEBYOPERATION_UPDATEBYCOLUMN_UPDATEBYSPEC_UPDATEBYEMS']._serialized_end=7113
+  _globals['_UPDATEBYREQUEST_UPDATEBYOPERATION_UPDATEBYCOLUMN_UPDATEBYSPEC_UPDATEBYEMMIN']._serialized_start=7116
+  _globals['_UPDATEBYREQUEST_UPDATEBYOPERATION_UPDATEBYCOLUMN_UPDATEBYSPEC_UPDATEBYEMMIN']._serialized_end=7280
+  _globals['_UPDATEBYREQUEST_UPDATEBYOPERATION_UPDATEBYCOLUMN_UPDATEBYSPEC_UPDATEBYEMMAX']._serialized_start=7283
+  _globals['_UPDATEBYREQUEST_UPDATEBYOPERATION_UPDATEBYCOLUMN_UPDATEBYSPEC_UPDATEBYEMMAX']._serialized_end=7447
+  _globals['_UPDATEBYREQUEST_UPDATEBYOPERATION_UPDATEBYCOLUMN_UPDATEBYSPEC_UPDATEBYEMSTD']._serialized_start=7450
+  _globals['_UPDATEBYREQUEST_UPDATEBYOPERATION_UPDATEBYCOLUMN_UPDATEBYSPEC_UPDATEBYEMSTD']._serialized_end=7614
+  _globals['_UPDATEBYREQUEST_UPDATEBYOPERATION_UPDATEBYCOLUMN_UPDATEBYSPEC_UPDATEBYDELTA']._serialized_start=7616
+  _globals['_UPDATEBYREQUEST_UPDATEBYOPERATION_UPDATEBYCOLUMN_UPDATEBYSPEC_UPDATEBYDELTA']._serialized_end=7705
+  _globals['_UPDATEBYREQUEST_UPDATEBYOPERATION_UPDATEBYCOLUMN_UPDATEBYSPEC_UPDATEBYROLLINGSUM']._serialized_start=7708
+  _globals['_UPDATEBYREQUEST_UPDATEBYOPERATION_UPDATEBYCOLUMN_UPDATEBYSPEC_UPDATEBYROLLINGSUM']._serialized_end=7900
+  _globals['_UPDATEBYREQUEST_UPDATEBYOPERATION_UPDATEBYCOLUMN_UPDATEBYSPEC_UPDATEBYROLLINGGROUP']._serialized_start=7903
+  _globals['_UPDATEBYREQUEST_UPDATEBYOPERATION_UPDATEBYCOLUMN_UPDATEBYSPEC_UPDATEBYROLLINGGROUP']._serialized_end=8097
+  _globals['_UPDATEBYREQUEST_UPDATEBYOPERATION_UPDATEBYCOLUMN_UPDATEBYSPEC_UPDATEBYROLLINGAVG']._serialized_start=8100
+  _globals['_UPDATEBYREQUEST_UPDATEBYOPERATION_UPDATEBYCOLUMN_UPDATEBYSPEC_UPDATEBYROLLINGAVG']._serialized_end=8292
+  _globals['_UPDATEBYREQUEST_UPDATEBYOPERATION_UPDATEBYCOLUMN_UPDATEBYSPEC_UPDATEBYROLLINGMIN']._serialized_start=8295
+  _globals['_UPDATEBYREQUEST_UPDATEBYOPERATION_UPDATEBYCOLUMN_UPDATEBYSPEC_UPDATEBYROLLINGMIN']._serialized_end=8487
+  _globals['_UPDATEBYREQUEST_UPDATEBYOPERATION_UPDATEBYCOLUMN_UPDATEBYSPEC_UPDATEBYROLLINGMAX']._serialized_start=8490
+  _globals['_UPDATEBYREQUEST_UPDATEBYOPERATION_UPDATEBYCOLUMN_UPDATEBYSPEC_UPDATEBYROLLINGMAX']._serialized_end=8682
+  _globals['_UPDATEBYREQUEST_UPDATEBYOPERATION_UPDATEBYCOLUMN_UPDATEBYSPEC_UPDATEBYROLLINGPRODUCT']._serialized_start=8685
+  _globals['_UPDATEBYREQUEST_UPDATEBYOPERATION_UPDATEBYCOLUMN_UPDATEBYSPEC_UPDATEBYROLLINGPRODUCT']._serialized_end=8881
+  _globals['_UPDATEBYREQUEST_UPDATEBYOPERATION_UPDATEBYCOLUMN_UPDATEBYSPEC_UPDATEBYROLLINGCOUNT']._serialized_start=8884
+  _globals['_UPDATEBYREQUEST_UPDATEBYOPERATION_UPDATEBYCOLUMN_UPDATEBYSPEC_UPDATEBYROLLINGCOUNT']._serialized_end=9078
+  _globals['_UPDATEBYREQUEST_UPDATEBYOPERATION_UPDATEBYCOLUMN_UPDATEBYSPEC_UPDATEBYROLLINGSTD']._serialized_start=9081
+  _globals['_UPDATEBYREQUEST_UPDATEBYOPERATION_UPDATEBYCOLUMN_UPDATEBYSPEC_UPDATEBYROLLINGSTD']._serialized_end=9273
+  _globals['_UPDATEBYREQUEST_UPDATEBYOPERATION_UPDATEBYCOLUMN_UPDATEBYSPEC_UPDATEBYROLLINGWAVG']._serialized_start=9276
+  _globals['_UPDATEBYREQUEST_UPDATEBYOPERATION_UPDATEBYCOLUMN_UPDATEBYSPEC_UPDATEBYROLLINGWAVG']._serialized_end=9492
+  _globals['_UPDATEBYREQUEST_UPDATEBYOPERATION_UPDATEBYCOLUMN_UPDATEBYSPEC_UPDATEBYROLLINGFORMULA']._serialized_start=9495
+  _globals['_UPDATEBYREQUEST_UPDATEBYOPERATION_UPDATEBYCOLUMN_UPDATEBYSPEC_UPDATEBYROLLINGFORMULA']._serialized_end=9729
+  _globals['_SELECTDISTINCTREQUEST']._serialized_start=9748
+  _globals['_SELECTDISTINCTREQUEST']._serialized_end=9925
+  _globals['_DROPCOLUMNSREQUEST']._serialized_start=9928
+  _globals['_DROPCOLUMNSREQUEST']._serialized_end=10102
+  _globals['_UNSTRUCTUREDFILTERTABLEREQUEST']._serialized_start=10105
+  _globals['_UNSTRUCTUREDFILTERTABLEREQUEST']._serialized_end=10286
+  _globals['_HEADORTAILREQUEST']._serialized_start=10289
+  _globals['_HEADORTAILREQUEST']._serialized_end=10462
+  _globals['_HEADORTAILBYREQUEST']._serialized_start=10465
+  _globals['_HEADORTAILBYREQUEST']._serialized_end=10671
+  _globals['_UNGROUPREQUEST']._serialized_start=10674
+  _globals['_UNGROUPREQUEST']._serialized_end=10869
+  _globals['_MERGETABLESREQUEST']._serialized_start=10872
+  _globals['_MERGETABLESREQUEST']._serialized_end=11045
+  _globals['_SNAPSHOTTABLEREQUEST']._serialized_start=11048
+  _globals['_SNAPSHOTTABLEREQUEST']._serialized_end=11202
+  _globals['_SNAPSHOTWHENTABLEREQUEST']._serialized_start=11205
+  _globals['_SNAPSHOTWHENTABLEREQUEST']._serialized_end=11510
+  _globals['_CROSSJOINTABLESREQUEST']._serialized_start=11513
+  _globals['_CROSSJOINTABLESREQUEST']._serialized_end=11808
+  _globals['_NATURALJOINTABLESREQUEST']._serialized_start=11811
+  _globals['_NATURALJOINTABLESREQUEST']._serialized_end=12086
+  _globals['_EXACTJOINTABLESREQUEST']._serialized_start=12089
+  _globals['_EXACTJOINTABLESREQUEST']._serialized_end=12362
+  _globals['_LEFTJOINTABLESREQUEST']._serialized_start=12365
+  _globals['_LEFTJOINTABLESREQUEST']._serialized_end=12637
+  _globals['_ASOFJOINTABLESREQUEST']._serialized_start=12640
+  _globals['_ASOFJOINTABLESREQUEST']._serialized_end=13105
+  _globals['_ASOFJOINTABLESREQUEST_MATCHRULE']._serialized_start=13008
+  _globals['_ASOFJOINTABLESREQUEST_MATCHRULE']._serialized_end=13101
+  _globals['_AJRAJTABLESREQUEST']._serialized_start=13108
+  _globals['_AJRAJTABLESREQUEST']._serialized_end=13402
+  _globals['_MULTIJOININPUT']._serialized_start=13405
+  _globals['_MULTIJOININPUT']._serialized_end=13541
+  _globals['_MULTIJOINTABLESREQUEST']._serialized_start=13544
+  _globals['_MULTIJOINTABLESREQUEST']._serialized_end=13708
+  _globals['_RANGEJOINTABLESREQUEST']._serialized_start=13711
+  _globals['_RANGEJOINTABLESREQUEST']._serialized_end=14575
+  _globals['_RANGEJOINTABLESREQUEST_RANGESTARTRULE']._serialized_start=14332
+  _globals['_RANGEJOINTABLESREQUEST_RANGESTARTRULE']._serialized_end=14450
+  _globals['_RANGEJOINTABLESREQUEST_RANGEENDRULE']._serialized_start=14452
+  _globals['_RANGEJOINTABLESREQUEST_RANGEENDRULE']._serialized_end=14575
+  _globals['_COMBOAGGREGATEREQUEST']._serialized_start=14578
+  _globals['_COMBOAGGREGATEREQUEST']._serialized_end=15216
+  _globals['_COMBOAGGREGATEREQUEST_AGGREGATE']._serialized_start=14871
+  _globals['_COMBOAGGREGATEREQUEST_AGGREGATE']._serialized_end=15044
+  _globals['_COMBOAGGREGATEREQUEST_AGGTYPE']._serialized_start=15047
+  _globals['_COMBOAGGREGATEREQUEST_AGGTYPE']._serialized_end=15212
+  _globals['_AGGREGATEALLREQUEST']._serialized_start=15219
+  _globals['_AGGREGATEALLREQUEST']._serialized_end=15456
+  _globals['_AGGSPEC']._serialized_start=15459
+  _globals['_AGGSPEC']._serialized_end=18490
+  _globals['_AGGSPEC_AGGSPECAPPROXIMATEPERCENTILE']._serialized_start=17265
+  _globals['_AGGSPEC_AGGSPECAPPROXIMATEPERCENTILE']._serialized_end=17357
+  _globals['_AGGSPEC_AGGSPECCOUNTDISTINCT']._serialized_start=17359
+  _globals['_AGGSPEC_AGGSPECCOUNTDISTINCT']._serialized_end=17402
+  _globals['_AGGSPEC_AGGSPECDISTINCT']._serialized_start=17404
+  _globals['_AGGSPEC_AGGSPECDISTINCT']._serialized_end=17444
+  _globals['_AGGSPEC_AGGSPECFORMULA']._serialized_start=17446
+  _globals['_AGGSPEC_AGGSPECFORMULA']._serialized_end=17500
+  _globals['_AGGSPEC_AGGSPECMEDIAN']._serialized_start=17502
+  _globals['_AGGSPEC_AGGSPECMEDIAN']._serialized_end=17549
+  _globals['_AGGSPEC_AGGSPECPERCENTILE']._serialized_start=17551
+  _globals['_AGGSPEC_AGGSPECPERCENTILE']._serialized_end=17622
+  _globals['_AGGSPEC_AGGSPECSORTED']._serialized_start=17624
+  _globals['_AGGSPEC_AGGSPECSORTED']._serialized_end=17720
+  _globals['_AGGSPEC_AGGSPECSORTEDCOLUMN']._serialized_start=17722
+  _globals['_AGGSPEC_AGGSPECSORTEDCOLUMN']._serialized_end=17764
+  _globals['_AGGSPEC_AGGSPECTDIGEST']._serialized_start=17766
+  _globals['_AGGSPEC_AGGSPECTDIGEST']._serialized_end=17824
+  _globals['_AGGSPEC_AGGSPECUNIQUE']._serialized_start=17827
+  _globals['_AGGSPEC_AGGSPECUNIQUE']._serialized_end=17963
+  _globals['_AGGSPEC_AGGSPECNONUNIQUESENTINEL']._serialized_start=17966
+  _globals['_AGGSPEC_AGGSPECNONUNIQUESENTINEL']._serialized_end=18275
+  _globals['_AGGSPEC_AGGSPECWEIGHTED']._serialized_start=18277
+  _globals['_AGGSPEC_AGGSPECWEIGHTED']._serialized_end=18317
+  _globals['_AGGSPEC_AGGSPECABSSUM']._serialized_start=18319
+  _globals['_AGGSPEC_AGGSPECABSSUM']._serialized_end=18334
+  _globals['_AGGSPEC_AGGSPECAVG']._serialized_start=18336
+  _globals['_AGGSPEC_AGGSPECAVG']._serialized_end=18348
+  _globals['_AGGSPEC_AGGSPECFIRST']._serialized_start=18350
+  _globals['_AGGSPEC_AGGSPECFIRST']._serialized_end=18364
+  _globals['_AGGSPEC_AGGSPECFREEZE']._serialized_start=18366
+  _globals['_AGGSPEC_AGGSPECFREEZE']._serialized_end=18381
+  _globals['_AGGSPEC_AGGSPECGROUP']._serialized_start=18383
+  _globals['_AGGSPEC_AGGSPECGROUP']._serialized_end=18397
+  _globals['_AGGSPEC_AGGSPECLAST']._serialized_start=18399
+  _globals['_AGGSPEC_AGGSPECLAST']._serialized_end=18412
+  _globals['_AGGSPEC_AGGSPECMAX']._serialized_start=18414
+  _globals['_AGGSPEC_AGGSPECMAX']._serialized_end=18426
+  _globals['_AGGSPEC_AGGSPECMIN']._serialized_start=18428
+  _globals['_AGGSPEC_AGGSPECMIN']._serialized_end=18440
+  _globals['_AGGSPEC_AGGSPECSTD']._serialized_start=18442
+  _globals['_AGGSPEC_AGGSPECSTD']._serialized_end=18454
+  _globals['_AGGSPEC_AGGSPECSUM']._serialized_start=18456
+  _globals['_AGGSPEC_AGGSPECSUM']._serialized_end=18468
+  _globals['_AGGSPEC_AGGSPECVAR']._serialized_start=18470
+  _globals['_AGGSPEC_AGGSPECVAR']._serialized_end=18482
+  _globals['_AGGREGATEREQUEST']._serialized_start=18493
+  _globals['_AGGREGATEREQUEST']._serialized_end=18841
+  _globals['_AGGREGATION']._serialized_start=18844
+  _globals['_AGGREGATION']._serialized_end=19898
+  _globals['_AGGREGATION_AGGREGATIONCOLUMNS']._serialized_start=19477
+  _globals['_AGGREGATION_AGGREGATIONCOLUMNS']._serialized_end=19576
+  _globals['_AGGREGATION_AGGREGATIONCOUNT']._serialized_start=19578
+  _globals['_AGGREGATION_AGGREGATIONCOUNT']._serialized_end=19617
+  _globals['_AGGREGATION_AGGREGATIONCOUNTWHERE']._serialized_start=19619
+  _globals['_AGGREGATION_AGGREGATIONCOUNTWHERE']._serialized_end=19680
+  _globals['_AGGREGATION_AGGREGATIONROWKEY']._serialized_start=19682
+  _globals['_AGGREGATION_AGGREGATIONROWKEY']._serialized_end=19722
+  _globals['_AGGREGATION_AGGREGATIONPARTITION']._serialized_start=19724
+  _globals['_AGGREGATION_AGGREGATIONPARTITION']._serialized_end=19801
+  _globals['_AGGREGATION_AGGREGATIONFORMULA']._serialized_start=19803
+  _globals['_AGGREGATION_AGGREGATIONFORMULA']._serialized_end=19890
+  _globals['_SORTDESCRIPTOR']._serialized_start=19901
+  _globals['_SORTDESCRIPTOR']._serialized_end=20126
+  _globals['_SORTDESCRIPTOR_SORTDIRECTION']._serialized_start=20045
+  _globals['_SORTDESCRIPTOR_SORTDIRECTION']._serialized_end=20126
+  _globals['_SORTTABLEREQUEST']._serialized_start=20129
+  _globals['_SORTTABLEREQUEST']._serialized_end=20345
+  _globals['_FILTERTABLEREQUEST']._serialized_start=20348
+  _globals['_FILTERTABLEREQUEST']._serialized_end=20563
+  _globals['_SEEKROWREQUEST']._serialized_start=20566
+  _globals['_SEEKROWREQUEST']._serialized_end=20815
+  _globals['_SEEKROWRESPONSE']._serialized_start=20817
+  _globals['_SEEKROWRESPONSE']._serialized_end=20858
+  _globals['_REFERENCE']._serialized_start=20860
+  _globals['_REFERENCE']._serialized_end=20892
+  _globals['_LITERAL']._serialized_start=20895
+  _globals['_LITERAL']._serialized_end=21040
+  _globals['_VALUE']._serialized_start=21043
+  _globals['_VALUE']._serialized_end=21188
+  _globals['_CONDITION']._serialized_start=21191
+  _globals['_CONDITION']._serialized_end=21891
+  _globals['_ANDCONDITION']._serialized_start=21893
+  _globals['_ANDCONDITION']._serialized_end=21970
+  _globals['_ORCONDITION']._serialized_start=21972
+  _globals['_ORCONDITION']._serialized_end=22048
+  _globals['_NOTCONDITION']._serialized_start=22050
+  _globals['_NOTCONDITION']._serialized_end=22126
+  _globals['_COMPARECONDITION']._serialized_start=22129
+  _globals['_COMPARECONDITION']._serialized_end=22557
+  _globals['_COMPARECONDITION_COMPAREOPERATION']._serialized_start=22427
+  _globals['_COMPARECONDITION_COMPAREOPERATION']._serialized_end=22557
+  _globals['_INCONDITION']._serialized_start=22560
+  _globals['_INCONDITION']._serialized_end=22837
+  _globals['_INVOKECONDITION']._serialized_start=22840
+  _globals['_INVOKECONDITION']._serialized_end=22992
+  _globals['_ISNULLCONDITION']._serialized_start=22994
+  _globals['_ISNULLCONDITION']._serialized_end=23076
+  _globals['_MATCHESCONDITION']._serialized_start=23079
+  _globals['_MATCHESCONDITION']._serialized_end=23321
+  _globals['_CONTAINSCONDITION']._serialized_start=23324
+  _globals['_CONTAINSCONDITION']._serialized_end=23575
+  _globals['_SEARCHCONDITION']._serialized_start=23577
+  _globals['_SEARCHCONDITION']._serialized_end=23692
+  _globals['_FLATTENREQUEST']._serialized_start=23695
+  _globals['_FLATTENREQUEST']._serialized_end=23843
+  _globals['_METATABLEREQUEST']._serialized_start=23846
+  _globals['_METATABLEREQUEST']._serialized_end=23996
+  _globals['_RUNCHARTDOWNSAMPLEREQUEST']._serialized_start=23999
+  _globals['_RUNCHARTDOWNSAMPLEREQUEST']._serialized_end=24435
+  _globals['_RUNCHARTDOWNSAMPLEREQUEST_ZOOMRANGE']._serialized_start=24320
+  _globals['_RUNCHARTDOWNSAMPLEREQUEST_ZOOMRANGE']._serialized_end=24435
+  _globals['_CREATEINPUTTABLEREQUEST']._serialized_start=24438
+  _globals['_CREATEINPUTTABLEREQUEST']._serialized_end=25174
+  _globals['_CREATEINPUTTABLEREQUEST_INPUTTABLEKIND']._serialized_start=24713
+  _globals['_CREATEINPUTTABLEREQUEST_INPUTTABLEKIND']._serialized_end=25160
+  _globals['_CREATEINPUTTABLEREQUEST_INPUTTABLEKIND_INMEMORYAPPENDONLY']._serialized_start=25081
+  _globals['_CREATEINPUTTABLEREQUEST_INPUTTABLEKIND_INMEMORYAPPENDONLY']._serialized_end=25101
+  _globals['_CREATEINPUTTABLEREQUEST_INPUTTABLEKIND_INMEMORYKEYBACKED']._serialized_start=25103
+  _globals['_CREATEINPUTTABLEREQUEST_INPUTTABLEKIND_INMEMORYKEYBACKED']._serialized_end=25143
+  _globals['_CREATEINPUTTABLEREQUEST_INPUTTABLEKIND_BLINK']._serialized_start=25145
+  _globals['_CREATEINPUTTABLEREQUEST_INPUTTABLEKIND_BLINK']._serialized_end=25152
+  _globals['_WHEREINREQUEST']._serialized_start=25177
+  _globals['_WHEREINREQUEST']._serialized_end=25436
+  _globals['_COLUMNSTATISTICSREQUEST']._serialized_start=25439
+  _globals['_COLUMNSTATISTICSREQUEST']._serialized_end=25673
+  _globals['_SLICEREQUEST']._serialized_start=25676
+  _globals['_SLICEREQUEST']._serialized_end=25897
+  _globals['_BATCHTABLEREQUEST']._serialized_start=25900
+  _globals['_BATCHTABLEREQUEST']._serialized_end=29319
+  _globals['_BATCHTABLEREQUEST_OPERATION']._serialized_start=25999
+  _globals['_BATCHTABLEREQUEST_OPERATION']._serialized_end=29319
+  _globals['_TABLESERVICE']._serialized_start=29661
+  _globals['_TABLESERVICE']._serialized_end=36118
+# @@protoc_insertion_point(module_scope)
diff --git a/py/client/deephaven_core/proto/table_pb2_grpc.py b/py/client/deephaven_core/proto/table_pb2_grpc.py
new file mode 100644
index 00000000000..2059cbc1737
--- /dev/null
+++ b/py/client/deephaven_core/proto/table_pb2_grpc.py
@@ -0,0 +1,2156 @@
+# Generated by the gRPC Python protocol compiler plugin. DO NOT EDIT!
+"""Client and server classes corresponding to protobuf-defined services."""
+import grpc
+import warnings
+
+from deephaven_core.proto import table_pb2 as deephaven__core_dot_proto_dot_table__pb2
+from deephaven_core.proto import ticket_pb2 as deephaven__core_dot_proto_dot_ticket__pb2
+
+GRPC_GENERATED_VERSION = '1.63.0'
+GRPC_VERSION = grpc.__version__
+EXPECTED_ERROR_RELEASE = '1.65.0'
+SCHEDULED_RELEASE_DATE = 'June 25, 2024'
+_version_not_supported = False
+
+try:
+    from grpc._utilities import first_version_is_lower
+    _version_not_supported = first_version_is_lower(GRPC_VERSION, GRPC_GENERATED_VERSION)
+except ImportError:
+    _version_not_supported = True
+
+if _version_not_supported:
+    warnings.warn(
+        f'The grpc package installed is at version {GRPC_VERSION},'
+        + f' but the generated code in deephaven_core/proto/table_pb2_grpc.py depends on'
+        + f' grpcio>={GRPC_GENERATED_VERSION}.'
+        + f' Please upgrade your grpc module to grpcio>={GRPC_GENERATED_VERSION}'
+        + f' or downgrade your generated code using grpcio-tools<={GRPC_VERSION}.'
+        + f' This warning will become an error in {EXPECTED_ERROR_RELEASE},'
+        + f' scheduled for release on {SCHEDULED_RELEASE_DATE}.',
+        RuntimeWarning
+    )
+
+
+class TableServiceStub(object):
+    """Missing associated documentation comment in .proto file."""
+
+    def __init__(self, channel):
+        """Constructor.
+
+        Args:
+            channel: A grpc.Channel.
+        """
+        self.GetExportedTableCreationResponse = channel.unary_unary(
+                '/io.deephaven.proto.backplane.grpc.TableService/GetExportedTableCreationResponse',
+                request_serializer=deephaven__core_dot_proto_dot_ticket__pb2.Ticket.SerializeToString,
+                response_deserializer=deephaven__core_dot_proto_dot_table__pb2.ExportedTableCreationResponse.FromString,
+                _registered_method=True)
+        self.FetchTable = channel.unary_unary(
+                '/io.deephaven.proto.backplane.grpc.TableService/FetchTable',
+                request_serializer=deephaven__core_dot_proto_dot_table__pb2.FetchTableRequest.SerializeToString,
+                response_deserializer=deephaven__core_dot_proto_dot_table__pb2.ExportedTableCreationResponse.FromString,
+                _registered_method=True)
+        self.ApplyPreviewColumns = channel.unary_unary(
+                '/io.deephaven.proto.backplane.grpc.TableService/ApplyPreviewColumns',
+                request_serializer=deephaven__core_dot_proto_dot_table__pb2.ApplyPreviewColumnsRequest.SerializeToString,
+                response_deserializer=deephaven__core_dot_proto_dot_table__pb2.ExportedTableCreationResponse.FromString,
+                _registered_method=True)
+        self.EmptyTable = channel.unary_unary(
+                '/io.deephaven.proto.backplane.grpc.TableService/EmptyTable',
+                request_serializer=deephaven__core_dot_proto_dot_table__pb2.EmptyTableRequest.SerializeToString,
+                response_deserializer=deephaven__core_dot_proto_dot_table__pb2.ExportedTableCreationResponse.FromString,
+                _registered_method=True)
+        self.TimeTable = channel.unary_unary(
+                '/io.deephaven.proto.backplane.grpc.TableService/TimeTable',
+                request_serializer=deephaven__core_dot_proto_dot_table__pb2.TimeTableRequest.SerializeToString,
+                response_deserializer=deephaven__core_dot_proto_dot_table__pb2.ExportedTableCreationResponse.FromString,
+                _registered_method=True)
+        self.DropColumns = channel.unary_unary(
+                '/io.deephaven.proto.backplane.grpc.TableService/DropColumns',
+                request_serializer=deephaven__core_dot_proto_dot_table__pb2.DropColumnsRequest.SerializeToString,
+                response_deserializer=deephaven__core_dot_proto_dot_table__pb2.ExportedTableCreationResponse.FromString,
+                _registered_method=True)
+        self.Update = channel.unary_unary(
+                '/io.deephaven.proto.backplane.grpc.TableService/Update',
+                request_serializer=deephaven__core_dot_proto_dot_table__pb2.SelectOrUpdateRequest.SerializeToString,
+                response_deserializer=deephaven__core_dot_proto_dot_table__pb2.ExportedTableCreationResponse.FromString,
+                _registered_method=True)
+        self.LazyUpdate = channel.unary_unary(
+                '/io.deephaven.proto.backplane.grpc.TableService/LazyUpdate',
+                request_serializer=deephaven__core_dot_proto_dot_table__pb2.SelectOrUpdateRequest.SerializeToString,
+                response_deserializer=deephaven__core_dot_proto_dot_table__pb2.ExportedTableCreationResponse.FromString,
+                _registered_method=True)
+        self.View = channel.unary_unary(
+                '/io.deephaven.proto.backplane.grpc.TableService/View',
+                request_serializer=deephaven__core_dot_proto_dot_table__pb2.SelectOrUpdateRequest.SerializeToString,
+                response_deserializer=deephaven__core_dot_proto_dot_table__pb2.ExportedTableCreationResponse.FromString,
+                _registered_method=True)
+        self.UpdateView = channel.unary_unary(
+                '/io.deephaven.proto.backplane.grpc.TableService/UpdateView',
+                request_serializer=deephaven__core_dot_proto_dot_table__pb2.SelectOrUpdateRequest.SerializeToString,
+                response_deserializer=deephaven__core_dot_proto_dot_table__pb2.ExportedTableCreationResponse.FromString,
+                _registered_method=True)
+        self.Select = channel.unary_unary(
+                '/io.deephaven.proto.backplane.grpc.TableService/Select',
+                request_serializer=deephaven__core_dot_proto_dot_table__pb2.SelectOrUpdateRequest.SerializeToString,
+                response_deserializer=deephaven__core_dot_proto_dot_table__pb2.ExportedTableCreationResponse.FromString,
+                _registered_method=True)
+        self.UpdateBy = channel.unary_unary(
+                '/io.deephaven.proto.backplane.grpc.TableService/UpdateBy',
+                request_serializer=deephaven__core_dot_proto_dot_table__pb2.UpdateByRequest.SerializeToString,
+                response_deserializer=deephaven__core_dot_proto_dot_table__pb2.ExportedTableCreationResponse.FromString,
+                _registered_method=True)
+        self.SelectDistinct = channel.unary_unary(
+                '/io.deephaven.proto.backplane.grpc.TableService/SelectDistinct',
+                request_serializer=deephaven__core_dot_proto_dot_table__pb2.SelectDistinctRequest.SerializeToString,
+                response_deserializer=deephaven__core_dot_proto_dot_table__pb2.ExportedTableCreationResponse.FromString,
+                _registered_method=True)
+        self.Filter = channel.unary_unary(
+                '/io.deephaven.proto.backplane.grpc.TableService/Filter',
+                request_serializer=deephaven__core_dot_proto_dot_table__pb2.FilterTableRequest.SerializeToString,
+                response_deserializer=deephaven__core_dot_proto_dot_table__pb2.ExportedTableCreationResponse.FromString,
+                _registered_method=True)
+        self.UnstructuredFilter = channel.unary_unary(
+                '/io.deephaven.proto.backplane.grpc.TableService/UnstructuredFilter',
+                request_serializer=deephaven__core_dot_proto_dot_table__pb2.UnstructuredFilterTableRequest.SerializeToString,
+                response_deserializer=deephaven__core_dot_proto_dot_table__pb2.ExportedTableCreationResponse.FromString,
+                _registered_method=True)
+        self.Sort = channel.unary_unary(
+                '/io.deephaven.proto.backplane.grpc.TableService/Sort',
+                request_serializer=deephaven__core_dot_proto_dot_table__pb2.SortTableRequest.SerializeToString,
+                response_deserializer=deephaven__core_dot_proto_dot_table__pb2.ExportedTableCreationResponse.FromString,
+                _registered_method=True)
+        self.Head = channel.unary_unary(
+                '/io.deephaven.proto.backplane.grpc.TableService/Head',
+                request_serializer=deephaven__core_dot_proto_dot_table__pb2.HeadOrTailRequest.SerializeToString,
+                response_deserializer=deephaven__core_dot_proto_dot_table__pb2.ExportedTableCreationResponse.FromString,
+                _registered_method=True)
+        self.Tail = channel.unary_unary(
+                '/io.deephaven.proto.backplane.grpc.TableService/Tail',
+                request_serializer=deephaven__core_dot_proto_dot_table__pb2.HeadOrTailRequest.SerializeToString,
+                response_deserializer=deephaven__core_dot_proto_dot_table__pb2.ExportedTableCreationResponse.FromString,
+                _registered_method=True)
+        self.HeadBy = channel.unary_unary(
+                '/io.deephaven.proto.backplane.grpc.TableService/HeadBy',
+                request_serializer=deephaven__core_dot_proto_dot_table__pb2.HeadOrTailByRequest.SerializeToString,
+                response_deserializer=deephaven__core_dot_proto_dot_table__pb2.ExportedTableCreationResponse.FromString,
+                _registered_method=True)
+        self.TailBy = channel.unary_unary(
+                '/io.deephaven.proto.backplane.grpc.TableService/TailBy',
+                request_serializer=deephaven__core_dot_proto_dot_table__pb2.HeadOrTailByRequest.SerializeToString,
+                response_deserializer=deephaven__core_dot_proto_dot_table__pb2.ExportedTableCreationResponse.FromString,
+                _registered_method=True)
+        self.Ungroup = channel.unary_unary(
+                '/io.deephaven.proto.backplane.grpc.TableService/Ungroup',
+                request_serializer=deephaven__core_dot_proto_dot_table__pb2.UngroupRequest.SerializeToString,
+                response_deserializer=deephaven__core_dot_proto_dot_table__pb2.ExportedTableCreationResponse.FromString,
+                _registered_method=True)
+        self.MergeTables = channel.unary_unary(
+                '/io.deephaven.proto.backplane.grpc.TableService/MergeTables',
+                request_serializer=deephaven__core_dot_proto_dot_table__pb2.MergeTablesRequest.SerializeToString,
+                response_deserializer=deephaven__core_dot_proto_dot_table__pb2.ExportedTableCreationResponse.FromString,
+                _registered_method=True)
+        self.CrossJoinTables = channel.unary_unary(
+                '/io.deephaven.proto.backplane.grpc.TableService/CrossJoinTables',
+                request_serializer=deephaven__core_dot_proto_dot_table__pb2.CrossJoinTablesRequest.SerializeToString,
+                response_deserializer=deephaven__core_dot_proto_dot_table__pb2.ExportedTableCreationResponse.FromString,
+                _registered_method=True)
+        self.NaturalJoinTables = channel.unary_unary(
+                '/io.deephaven.proto.backplane.grpc.TableService/NaturalJoinTables',
+                request_serializer=deephaven__core_dot_proto_dot_table__pb2.NaturalJoinTablesRequest.SerializeToString,
+                response_deserializer=deephaven__core_dot_proto_dot_table__pb2.ExportedTableCreationResponse.FromString,
+                _registered_method=True)
+        self.ExactJoinTables = channel.unary_unary(
+                '/io.deephaven.proto.backplane.grpc.TableService/ExactJoinTables',
+                request_serializer=deephaven__core_dot_proto_dot_table__pb2.ExactJoinTablesRequest.SerializeToString,
+                response_deserializer=deephaven__core_dot_proto_dot_table__pb2.ExportedTableCreationResponse.FromString,
+                _registered_method=True)
+        self.LeftJoinTables = channel.unary_unary(
+                '/io.deephaven.proto.backplane.grpc.TableService/LeftJoinTables',
+                request_serializer=deephaven__core_dot_proto_dot_table__pb2.LeftJoinTablesRequest.SerializeToString,
+                response_deserializer=deephaven__core_dot_proto_dot_table__pb2.ExportedTableCreationResponse.FromString,
+                _registered_method=True)
+        self.AsOfJoinTables = channel.unary_unary(
+                '/io.deephaven.proto.backplane.grpc.TableService/AsOfJoinTables',
+                request_serializer=deephaven__core_dot_proto_dot_table__pb2.AsOfJoinTablesRequest.SerializeToString,
+                response_deserializer=deephaven__core_dot_proto_dot_table__pb2.ExportedTableCreationResponse.FromString,
+                _registered_method=True)
+        self.AjTables = channel.unary_unary(
+                '/io.deephaven.proto.backplane.grpc.TableService/AjTables',
+                request_serializer=deephaven__core_dot_proto_dot_table__pb2.AjRajTablesRequest.SerializeToString,
+                response_deserializer=deephaven__core_dot_proto_dot_table__pb2.ExportedTableCreationResponse.FromString,
+                _registered_method=True)
+        self.RajTables = channel.unary_unary(
+                '/io.deephaven.proto.backplane.grpc.TableService/RajTables',
+                request_serializer=deephaven__core_dot_proto_dot_table__pb2.AjRajTablesRequest.SerializeToString,
+                response_deserializer=deephaven__core_dot_proto_dot_table__pb2.ExportedTableCreationResponse.FromString,
+                _registered_method=True)
+        self.MultiJoinTables = channel.unary_unary(
+                '/io.deephaven.proto.backplane.grpc.TableService/MultiJoinTables',
+                request_serializer=deephaven__core_dot_proto_dot_table__pb2.MultiJoinTablesRequest.SerializeToString,
+                response_deserializer=deephaven__core_dot_proto_dot_table__pb2.ExportedTableCreationResponse.FromString,
+                _registered_method=True)
+        self.RangeJoinTables = channel.unary_unary(
+                '/io.deephaven.proto.backplane.grpc.TableService/RangeJoinTables',
+                request_serializer=deephaven__core_dot_proto_dot_table__pb2.RangeJoinTablesRequest.SerializeToString,
+                response_deserializer=deephaven__core_dot_proto_dot_table__pb2.ExportedTableCreationResponse.FromString,
+                _registered_method=True)
+        self.ComboAggregate = channel.unary_unary(
+                '/io.deephaven.proto.backplane.grpc.TableService/ComboAggregate',
+                request_serializer=deephaven__core_dot_proto_dot_table__pb2.ComboAggregateRequest.SerializeToString,
+                response_deserializer=deephaven__core_dot_proto_dot_table__pb2.ExportedTableCreationResponse.FromString,
+                _registered_method=True)
+        self.AggregateAll = channel.unary_unary(
+                '/io.deephaven.proto.backplane.grpc.TableService/AggregateAll',
+                request_serializer=deephaven__core_dot_proto_dot_table__pb2.AggregateAllRequest.SerializeToString,
+                response_deserializer=deephaven__core_dot_proto_dot_table__pb2.ExportedTableCreationResponse.FromString,
+                _registered_method=True)
+        self.Aggregate = channel.unary_unary(
+                '/io.deephaven.proto.backplane.grpc.TableService/Aggregate',
+                request_serializer=deephaven__core_dot_proto_dot_table__pb2.AggregateRequest.SerializeToString,
+                response_deserializer=deephaven__core_dot_proto_dot_table__pb2.ExportedTableCreationResponse.FromString,
+                _registered_method=True)
+        self.Snapshot = channel.unary_unary(
+                '/io.deephaven.proto.backplane.grpc.TableService/Snapshot',
+                request_serializer=deephaven__core_dot_proto_dot_table__pb2.SnapshotTableRequest.SerializeToString,
+                response_deserializer=deephaven__core_dot_proto_dot_table__pb2.ExportedTableCreationResponse.FromString,
+                _registered_method=True)
+        self.SnapshotWhen = channel.unary_unary(
+                '/io.deephaven.proto.backplane.grpc.TableService/SnapshotWhen',
+                request_serializer=deephaven__core_dot_proto_dot_table__pb2.SnapshotWhenTableRequest.SerializeToString,
+                response_deserializer=deephaven__core_dot_proto_dot_table__pb2.ExportedTableCreationResponse.FromString,
+                _registered_method=True)
+        self.Flatten = channel.unary_unary(
+                '/io.deephaven.proto.backplane.grpc.TableService/Flatten',
+                request_serializer=deephaven__core_dot_proto_dot_table__pb2.FlattenRequest.SerializeToString,
+                response_deserializer=deephaven__core_dot_proto_dot_table__pb2.ExportedTableCreationResponse.FromString,
+                _registered_method=True)
+        self.RunChartDownsample = channel.unary_unary(
+                '/io.deephaven.proto.backplane.grpc.TableService/RunChartDownsample',
+                request_serializer=deephaven__core_dot_proto_dot_table__pb2.RunChartDownsampleRequest.SerializeToString,
+                response_deserializer=deephaven__core_dot_proto_dot_table__pb2.ExportedTableCreationResponse.FromString,
+                _registered_method=True)
+        self.CreateInputTable = channel.unary_unary(
+                '/io.deephaven.proto.backplane.grpc.TableService/CreateInputTable',
+                request_serializer=deephaven__core_dot_proto_dot_table__pb2.CreateInputTableRequest.SerializeToString,
+                response_deserializer=deephaven__core_dot_proto_dot_table__pb2.ExportedTableCreationResponse.FromString,
+                _registered_method=True)
+        self.WhereIn = channel.unary_unary(
+                '/io.deephaven.proto.backplane.grpc.TableService/WhereIn',
+                request_serializer=deephaven__core_dot_proto_dot_table__pb2.WhereInRequest.SerializeToString,
+                response_deserializer=deephaven__core_dot_proto_dot_table__pb2.ExportedTableCreationResponse.FromString,
+                _registered_method=True)
+        self.Batch = channel.unary_stream(
+                '/io.deephaven.proto.backplane.grpc.TableService/Batch',
+                request_serializer=deephaven__core_dot_proto_dot_table__pb2.BatchTableRequest.SerializeToString,
+                response_deserializer=deephaven__core_dot_proto_dot_table__pb2.ExportedTableCreationResponse.FromString,
+                _registered_method=True)
+        self.ExportedTableUpdates = channel.unary_stream(
+                '/io.deephaven.proto.backplane.grpc.TableService/ExportedTableUpdates',
+                request_serializer=deephaven__core_dot_proto_dot_table__pb2.ExportedTableUpdatesRequest.SerializeToString,
+                response_deserializer=deephaven__core_dot_proto_dot_table__pb2.ExportedTableUpdateMessage.FromString,
+                _registered_method=True)
+        self.SeekRow = channel.unary_unary(
+                '/io.deephaven.proto.backplane.grpc.TableService/SeekRow',
+                request_serializer=deephaven__core_dot_proto_dot_table__pb2.SeekRowRequest.SerializeToString,
+                response_deserializer=deephaven__core_dot_proto_dot_table__pb2.SeekRowResponse.FromString,
+                _registered_method=True)
+        self.MetaTable = channel.unary_unary(
+                '/io.deephaven.proto.backplane.grpc.TableService/MetaTable',
+                request_serializer=deephaven__core_dot_proto_dot_table__pb2.MetaTableRequest.SerializeToString,
+                response_deserializer=deephaven__core_dot_proto_dot_table__pb2.ExportedTableCreationResponse.FromString,
+                _registered_method=True)
+        self.ComputeColumnStatistics = channel.unary_unary(
+                '/io.deephaven.proto.backplane.grpc.TableService/ComputeColumnStatistics',
+                request_serializer=deephaven__core_dot_proto_dot_table__pb2.ColumnStatisticsRequest.SerializeToString,
+                response_deserializer=deephaven__core_dot_proto_dot_table__pb2.ExportedTableCreationResponse.FromString,
+                _registered_method=True)
+        self.Slice = channel.unary_unary(
+                '/io.deephaven.proto.backplane.grpc.TableService/Slice',
+                request_serializer=deephaven__core_dot_proto_dot_table__pb2.SliceRequest.SerializeToString,
+                response_deserializer=deephaven__core_dot_proto_dot_table__pb2.ExportedTableCreationResponse.FromString,
+                _registered_method=True)
+
+
+class TableServiceServicer(object):
+    """Missing associated documentation comment in .proto file."""
+
+    def GetExportedTableCreationResponse(self, request, context):
+        """
+        Request an ETCR for this ticket. Ticket must reference a Table.
+        """
+        context.set_code(grpc.StatusCode.UNIMPLEMENTED)
+        context.set_details('Method not implemented!')
+        raise NotImplementedError('Method not implemented!')
+
+    def FetchTable(self, request, context):
+        """
+        Fetches a Table from an existing source ticket and exports it to the local session result ticket.
+        """
+        context.set_code(grpc.StatusCode.UNIMPLEMENTED)
+        context.set_details('Method not implemented!')
+        raise NotImplementedError('Method not implemented!')
+
+    def ApplyPreviewColumns(self, request, context):
+        """
+        Create a table that has preview columns applied to an existing source table.
+        """
+        context.set_code(grpc.StatusCode.UNIMPLEMENTED)
+        context.set_details('Method not implemented!')
+        raise NotImplementedError('Method not implemented!')
+
+    def EmptyTable(self, request, context):
+        """
+        Create an empty table with the given column names and types.
+        """
+        context.set_code(grpc.StatusCode.UNIMPLEMENTED)
+        context.set_details('Method not implemented!')
+        raise NotImplementedError('Method not implemented!')
+
+    def TimeTable(self, request, context):
+        """
+        Create a time table with the given start time and period.
+        """
+        context.set_code(grpc.StatusCode.UNIMPLEMENTED)
+        context.set_details('Method not implemented!')
+        raise NotImplementedError('Method not implemented!')
+
+    def DropColumns(self, request, context):
+        """
+        Drop columns from the parent table.
+        """
+        context.set_code(grpc.StatusCode.UNIMPLEMENTED)
+        context.set_details('Method not implemented!')
+        raise NotImplementedError('Method not implemented!')
+
+    def Update(self, request, context):
+        """
+        Add columns to the given table using the given column specifications and the update table operation.
+        """
+        context.set_code(grpc.StatusCode.UNIMPLEMENTED)
+        context.set_details('Method not implemented!')
+        raise NotImplementedError('Method not implemented!')
+
+    def LazyUpdate(self, request, context):
+        """
+        Add columns to the given table using the given column specifications and the lazyUpdate table operation.
+        """
+        context.set_code(grpc.StatusCode.UNIMPLEMENTED)
+        context.set_details('Method not implemented!')
+        raise NotImplementedError('Method not implemented!')
+
+    def View(self, request, context):
+        """
+        Add columns to the given table using the given column specifications and the view table operation.
+        """
+        context.set_code(grpc.StatusCode.UNIMPLEMENTED)
+        context.set_details('Method not implemented!')
+        raise NotImplementedError('Method not implemented!')
+
+    def UpdateView(self, request, context):
+        """
+        Add columns to the given table using the given column specifications and the updateView table operation.
+        """
+        context.set_code(grpc.StatusCode.UNIMPLEMENTED)
+        context.set_details('Method not implemented!')
+        raise NotImplementedError('Method not implemented!')
+
+    def Select(self, request, context):
+        """
+        Select the given columns from the given table.
+        """
+        context.set_code(grpc.StatusCode.UNIMPLEMENTED)
+        context.set_details('Method not implemented!')
+        raise NotImplementedError('Method not implemented!')
+
+    def UpdateBy(self, request, context):
+        """
+        Returns the result of an updateBy table operation.
+        """
+        context.set_code(grpc.StatusCode.UNIMPLEMENTED)
+        context.set_details('Method not implemented!')
+        raise NotImplementedError('Method not implemented!')
+
+    def SelectDistinct(self, request, context):
+        """
+        Returns a new table definition with the unique tuples of the specified columns
+        """
+        context.set_code(grpc.StatusCode.UNIMPLEMENTED)
+        context.set_details('Method not implemented!')
+        raise NotImplementedError('Method not implemented!')
+
+    def Filter(self, request, context):
+        """
+        Filter parent table with structured filters.
+        """
+        context.set_code(grpc.StatusCode.UNIMPLEMENTED)
+        context.set_details('Method not implemented!')
+        raise NotImplementedError('Method not implemented!')
+
+    def UnstructuredFilter(self, request, context):
+        """
+        Filter parent table with unstructured filters.
+        """
+        context.set_code(grpc.StatusCode.UNIMPLEMENTED)
+        context.set_details('Method not implemented!')
+        raise NotImplementedError('Method not implemented!')
+
+    def Sort(self, request, context):
+        """
+        Sort parent table via the provide sort descriptors.
+        """
+        context.set_code(grpc.StatusCode.UNIMPLEMENTED)
+        context.set_details('Method not implemented!')
+        raise NotImplementedError('Method not implemented!')
+
+    def Head(self, request, context):
+        """
+        Extract rows from the head of the parent table.
+        """
+        context.set_code(grpc.StatusCode.UNIMPLEMENTED)
+        context.set_details('Method not implemented!')
+        raise NotImplementedError('Method not implemented!')
+
+    def Tail(self, request, context):
+        """
+        Extract rows from the tail of the parent table.
+        """
+        context.set_code(grpc.StatusCode.UNIMPLEMENTED)
+        context.set_details('Method not implemented!')
+        raise NotImplementedError('Method not implemented!')
+
+    def HeadBy(self, request, context):
+        """
+        Run the headBy table operation for the given group by columns on the given table.
+        """
+        context.set_code(grpc.StatusCode.UNIMPLEMENTED)
+        context.set_details('Method not implemented!')
+        raise NotImplementedError('Method not implemented!')
+
+    def TailBy(self, request, context):
+        """
+        Run the tailBy operation for the given group by columns on the given table.
+        """
+        context.set_code(grpc.StatusCode.UNIMPLEMENTED)
+        context.set_details('Method not implemented!')
+        raise NotImplementedError('Method not implemented!')
+
+    def Ungroup(self, request, context):
+        """
+        Ungroup the given columns (all columns will be ungrouped if columnsToUngroup is empty or unspecified).
+        """
+        context.set_code(grpc.StatusCode.UNIMPLEMENTED)
+        context.set_details('Method not implemented!')
+        raise NotImplementedError('Method not implemented!')
+
+    def MergeTables(self, request, context):
+        """
+        Create a merged table from the given input tables. If a key column is provided (not null), a sorted
+        merged will be performed using that column.
+        """
+        context.set_code(grpc.StatusCode.UNIMPLEMENTED)
+        context.set_details('Method not implemented!')
+        raise NotImplementedError('Method not implemented!')
+
+    def CrossJoinTables(self, request, context):
+        """
+        Returns the result of a cross join operation. Also known as the cartesian product.
+        """
+        context.set_code(grpc.StatusCode.UNIMPLEMENTED)
+        context.set_details('Method not implemented!')
+        raise NotImplementedError('Method not implemented!')
+
+    def NaturalJoinTables(self, request, context):
+        """
+        Returns the result of a natural join operation.
+        """
+        context.set_code(grpc.StatusCode.UNIMPLEMENTED)
+        context.set_details('Method not implemented!')
+        raise NotImplementedError('Method not implemented!')
+
+    def ExactJoinTables(self, request, context):
+        """
+        Returns the result of an exact join operation.
+        """
+        context.set_code(grpc.StatusCode.UNIMPLEMENTED)
+        context.set_details('Method not implemented!')
+        raise NotImplementedError('Method not implemented!')
+
+    def LeftJoinTables(self, request, context):
+        """
+        Returns the result of a left join operation.
+        """
+        context.set_code(grpc.StatusCode.UNIMPLEMENTED)
+        context.set_details('Method not implemented!')
+        raise NotImplementedError('Method not implemented!')
+
+    def AsOfJoinTables(self, request, context):
+        """
+        Returns the result of an as of join operation.
+
+        Deprecated: Please use AjTables or RajTables.
+        """
+        context.set_code(grpc.StatusCode.UNIMPLEMENTED)
+        context.set_details('Method not implemented!')
+        raise NotImplementedError('Method not implemented!')
+
+    def AjTables(self, request, context):
+        """
+        Returns the result of an aj operation.
+        """
+        context.set_code(grpc.StatusCode.UNIMPLEMENTED)
+        context.set_details('Method not implemented!')
+        raise NotImplementedError('Method not implemented!')
+
+    def RajTables(self, request, context):
+        """
+        Returns the result of an raj operation.
+        """
+        context.set_code(grpc.StatusCode.UNIMPLEMENTED)
+        context.set_details('Method not implemented!')
+        raise NotImplementedError('Method not implemented!')
+
+    def MultiJoinTables(self, request, context):
+        """
+        Returns the result of a multi-join operation.
+        """
+        context.set_code(grpc.StatusCode.UNIMPLEMENTED)
+        context.set_details('Method not implemented!')
+        raise NotImplementedError('Method not implemented!')
+
+    def RangeJoinTables(self, request, context):
+        """
+        Returns the result of a range join operation.
+        """
+        context.set_code(grpc.StatusCode.UNIMPLEMENTED)
+        context.set_details('Method not implemented!')
+        raise NotImplementedError('Method not implemented!')
+
+    def ComboAggregate(self, request, context):
+        """
+        Returns the result of an aggregate table operation.
+
+        Deprecated: Please use AggregateAll or Aggregate instead
+        """
+        context.set_code(grpc.StatusCode.UNIMPLEMENTED)
+        context.set_details('Method not implemented!')
+        raise NotImplementedError('Method not implemented!')
+
+    def AggregateAll(self, request, context):
+        """
+        Aggregates all non-grouping columns against a single aggregation specification.
+        """
+        context.set_code(grpc.StatusCode.UNIMPLEMENTED)
+        context.set_details('Method not implemented!')
+        raise NotImplementedError('Method not implemented!')
+
+    def Aggregate(self, request, context):
+        """
+        Produce an aggregated result by grouping the source_id table according to the group_by_columns and applying
+        aggregations to each resulting group of rows. The result table will have one row per group, ordered by
+        the encounter order within the source_id table, thereby ensuring that the row key for a given group never
+        changes.
+        """
+        context.set_code(grpc.StatusCode.UNIMPLEMENTED)
+        context.set_details('Method not implemented!')
+        raise NotImplementedError('Method not implemented!')
+
+    def Snapshot(self, request, context):
+        """
+        Takes a single snapshot of the source_id table.
+        """
+        context.set_code(grpc.StatusCode.UNIMPLEMENTED)
+        context.set_details('Method not implemented!')
+        raise NotImplementedError('Method not implemented!')
+
+    def SnapshotWhen(self, request, context):
+        """
+        Snapshot base_id, triggered by trigger_id, and export the resulting new table.
+        The trigger_id table's change events cause a new snapshot to be taken. The result table includes a
+        "snapshot key" which is a subset (possibly all) of the base_id table's columns. The
+        remaining columns in the result table come from base_id table, the table being snapshotted.
+        """
+        context.set_code(grpc.StatusCode.UNIMPLEMENTED)
+        context.set_details('Method not implemented!')
+        raise NotImplementedError('Method not implemented!')
+
+    def Flatten(self, request, context):
+        """
+        Returns a new table with a flattened row set.
+        """
+        context.set_code(grpc.StatusCode.UNIMPLEMENTED)
+        context.set_details('Method not implemented!')
+        raise NotImplementedError('Method not implemented!')
+
+    def RunChartDownsample(self, request, context):
+        """*
+        Downsamples a table assume its contents will be rendered in a run chart, with each subsequent row holding a later
+        X value (i.e., sorted on that column). Multiple Y columns can be specified, as can a range of values for the X
+        column to support zooming in.
+        """
+        context.set_code(grpc.StatusCode.UNIMPLEMENTED)
+        context.set_details('Method not implemented!')
+        raise NotImplementedError('Method not implemented!')
+
+    def CreateInputTable(self, request, context):
+        """*
+        Creates a new Table based on the provided configuration. This can be used as a regular table from the other methods
+        in this interface, or can be interacted with via the InputTableService to modify its contents.
+        """
+        context.set_code(grpc.StatusCode.UNIMPLEMENTED)
+        context.set_details('Method not implemented!')
+        raise NotImplementedError('Method not implemented!')
+
+    def WhereIn(self, request, context):
+        """*
+        Filters the left table based on the set of values in the right table.
+
+        Note that when the right table ticks, all of the rows in the left table are going to be re-evaluated,
+        thus the intention is that the right table is fairly slow moving compared with the left table.
+        """
+        context.set_code(grpc.StatusCode.UNIMPLEMENTED)
+        context.set_details('Method not implemented!')
+        raise NotImplementedError('Method not implemented!')
+
+    def Batch(self, request, context):
+        """
+        Batch a series of requests and send them all at once. This enables the user to create intermediate tables without
+        requiring them to be exported and managed by the client. The server will automatically release any tables when they
+        are no longer depended upon.
+        """
+        context.set_code(grpc.StatusCode.UNIMPLEMENTED)
+        context.set_details('Method not implemented!')
+        raise NotImplementedError('Method not implemented!')
+
+    def ExportedTableUpdates(self, request, context):
+        """
+        Establish a stream of table updates for cheap notifications of table size updates.
+
+        New streams will flush updates for all existing table exports. An export id of zero will be sent to indicate all
+        exports have sent their refresh update. Table updates may be intermingled with initial refresh updates after their
+        initial update had been sent.
+        """
+        context.set_code(grpc.StatusCode.UNIMPLEMENTED)
+        context.set_details('Method not implemented!')
+        raise NotImplementedError('Method not implemented!')
+
+    def SeekRow(self, request, context):
+        """
+        Seek a row number within a table.
+        """
+        context.set_code(grpc.StatusCode.UNIMPLEMENTED)
+        context.set_details('Method not implemented!')
+        raise NotImplementedError('Method not implemented!')
+
+    def MetaTable(self, request, context):
+        """
+        Returns the meta table of a table.
+        """
+        context.set_code(grpc.StatusCode.UNIMPLEMENTED)
+        context.set_details('Method not implemented!')
+        raise NotImplementedError('Method not implemented!')
+
+    def ComputeColumnStatistics(self, request, context):
+        """*
+        Returns a new table representing statistics about a single column of the provided table. This
+        result table will be static - use Aggregation() instead for updating results. Presently, the
+        primary use case for this is the Deephaven Web UI.
+        """
+        context.set_code(grpc.StatusCode.UNIMPLEMENTED)
+        context.set_details('Method not implemented!')
+        raise NotImplementedError('Method not implemented!')
+
+    def Slice(self, request, context):
+        """*
+        Returns a new table representing a sliced subset of the original table. The start position is inclusive
+        and the end position is exclusive. If a negative value is given, then the position is counted from the end of
+        the table.
+        """
+        context.set_code(grpc.StatusCode.UNIMPLEMENTED)
+        context.set_details('Method not implemented!')
+        raise NotImplementedError('Method not implemented!')
+
+
+def add_TableServiceServicer_to_server(servicer, server):
+    rpc_method_handlers = {
+            'GetExportedTableCreationResponse': grpc.unary_unary_rpc_method_handler(
+                    servicer.GetExportedTableCreationResponse,
+                    request_deserializer=deephaven__core_dot_proto_dot_ticket__pb2.Ticket.FromString,
+                    response_serializer=deephaven__core_dot_proto_dot_table__pb2.ExportedTableCreationResponse.SerializeToString,
+            ),
+            'FetchTable': grpc.unary_unary_rpc_method_handler(
+                    servicer.FetchTable,
+                    request_deserializer=deephaven__core_dot_proto_dot_table__pb2.FetchTableRequest.FromString,
+                    response_serializer=deephaven__core_dot_proto_dot_table__pb2.ExportedTableCreationResponse.SerializeToString,
+            ),
+            'ApplyPreviewColumns': grpc.unary_unary_rpc_method_handler(
+                    servicer.ApplyPreviewColumns,
+                    request_deserializer=deephaven__core_dot_proto_dot_table__pb2.ApplyPreviewColumnsRequest.FromString,
+                    response_serializer=deephaven__core_dot_proto_dot_table__pb2.ExportedTableCreationResponse.SerializeToString,
+            ),
+            'EmptyTable': grpc.unary_unary_rpc_method_handler(
+                    servicer.EmptyTable,
+                    request_deserializer=deephaven__core_dot_proto_dot_table__pb2.EmptyTableRequest.FromString,
+                    response_serializer=deephaven__core_dot_proto_dot_table__pb2.ExportedTableCreationResponse.SerializeToString,
+            ),
+            'TimeTable': grpc.unary_unary_rpc_method_handler(
+                    servicer.TimeTable,
+                    request_deserializer=deephaven__core_dot_proto_dot_table__pb2.TimeTableRequest.FromString,
+                    response_serializer=deephaven__core_dot_proto_dot_table__pb2.ExportedTableCreationResponse.SerializeToString,
+            ),
+            'DropColumns': grpc.unary_unary_rpc_method_handler(
+                    servicer.DropColumns,
+                    request_deserializer=deephaven__core_dot_proto_dot_table__pb2.DropColumnsRequest.FromString,
+                    response_serializer=deephaven__core_dot_proto_dot_table__pb2.ExportedTableCreationResponse.SerializeToString,
+            ),
+            'Update': grpc.unary_unary_rpc_method_handler(
+                    servicer.Update,
+                    request_deserializer=deephaven__core_dot_proto_dot_table__pb2.SelectOrUpdateRequest.FromString,
+                    response_serializer=deephaven__core_dot_proto_dot_table__pb2.ExportedTableCreationResponse.SerializeToString,
+            ),
+            'LazyUpdate': grpc.unary_unary_rpc_method_handler(
+                    servicer.LazyUpdate,
+                    request_deserializer=deephaven__core_dot_proto_dot_table__pb2.SelectOrUpdateRequest.FromString,
+                    response_serializer=deephaven__core_dot_proto_dot_table__pb2.ExportedTableCreationResponse.SerializeToString,
+            ),
+            'View': grpc.unary_unary_rpc_method_handler(
+                    servicer.View,
+                    request_deserializer=deephaven__core_dot_proto_dot_table__pb2.SelectOrUpdateRequest.FromString,
+                    response_serializer=deephaven__core_dot_proto_dot_table__pb2.ExportedTableCreationResponse.SerializeToString,
+            ),
+            'UpdateView': grpc.unary_unary_rpc_method_handler(
+                    servicer.UpdateView,
+                    request_deserializer=deephaven__core_dot_proto_dot_table__pb2.SelectOrUpdateRequest.FromString,
+                    response_serializer=deephaven__core_dot_proto_dot_table__pb2.ExportedTableCreationResponse.SerializeToString,
+            ),
+            'Select': grpc.unary_unary_rpc_method_handler(
+                    servicer.Select,
+                    request_deserializer=deephaven__core_dot_proto_dot_table__pb2.SelectOrUpdateRequest.FromString,
+                    response_serializer=deephaven__core_dot_proto_dot_table__pb2.ExportedTableCreationResponse.SerializeToString,
+            ),
+            'UpdateBy': grpc.unary_unary_rpc_method_handler(
+                    servicer.UpdateBy,
+                    request_deserializer=deephaven__core_dot_proto_dot_table__pb2.UpdateByRequest.FromString,
+                    response_serializer=deephaven__core_dot_proto_dot_table__pb2.ExportedTableCreationResponse.SerializeToString,
+            ),
+            'SelectDistinct': grpc.unary_unary_rpc_method_handler(
+                    servicer.SelectDistinct,
+                    request_deserializer=deephaven__core_dot_proto_dot_table__pb2.SelectDistinctRequest.FromString,
+                    response_serializer=deephaven__core_dot_proto_dot_table__pb2.ExportedTableCreationResponse.SerializeToString,
+            ),
+            'Filter': grpc.unary_unary_rpc_method_handler(
+                    servicer.Filter,
+                    request_deserializer=deephaven__core_dot_proto_dot_table__pb2.FilterTableRequest.FromString,
+                    response_serializer=deephaven__core_dot_proto_dot_table__pb2.ExportedTableCreationResponse.SerializeToString,
+            ),
+            'UnstructuredFilter': grpc.unary_unary_rpc_method_handler(
+                    servicer.UnstructuredFilter,
+                    request_deserializer=deephaven__core_dot_proto_dot_table__pb2.UnstructuredFilterTableRequest.FromString,
+                    response_serializer=deephaven__core_dot_proto_dot_table__pb2.ExportedTableCreationResponse.SerializeToString,
+            ),
+            'Sort': grpc.unary_unary_rpc_method_handler(
+                    servicer.Sort,
+                    request_deserializer=deephaven__core_dot_proto_dot_table__pb2.SortTableRequest.FromString,
+                    response_serializer=deephaven__core_dot_proto_dot_table__pb2.ExportedTableCreationResponse.SerializeToString,
+            ),
+            'Head': grpc.unary_unary_rpc_method_handler(
+                    servicer.Head,
+                    request_deserializer=deephaven__core_dot_proto_dot_table__pb2.HeadOrTailRequest.FromString,
+                    response_serializer=deephaven__core_dot_proto_dot_table__pb2.ExportedTableCreationResponse.SerializeToString,
+            ),
+            'Tail': grpc.unary_unary_rpc_method_handler(
+                    servicer.Tail,
+                    request_deserializer=deephaven__core_dot_proto_dot_table__pb2.HeadOrTailRequest.FromString,
+                    response_serializer=deephaven__core_dot_proto_dot_table__pb2.ExportedTableCreationResponse.SerializeToString,
+            ),
+            'HeadBy': grpc.unary_unary_rpc_method_handler(
+                    servicer.HeadBy,
+                    request_deserializer=deephaven__core_dot_proto_dot_table__pb2.HeadOrTailByRequest.FromString,
+                    response_serializer=deephaven__core_dot_proto_dot_table__pb2.ExportedTableCreationResponse.SerializeToString,
+            ),
+            'TailBy': grpc.unary_unary_rpc_method_handler(
+                    servicer.TailBy,
+                    request_deserializer=deephaven__core_dot_proto_dot_table__pb2.HeadOrTailByRequest.FromString,
+                    response_serializer=deephaven__core_dot_proto_dot_table__pb2.ExportedTableCreationResponse.SerializeToString,
+            ),
+            'Ungroup': grpc.unary_unary_rpc_method_handler(
+                    servicer.Ungroup,
+                    request_deserializer=deephaven__core_dot_proto_dot_table__pb2.UngroupRequest.FromString,
+                    response_serializer=deephaven__core_dot_proto_dot_table__pb2.ExportedTableCreationResponse.SerializeToString,
+            ),
+            'MergeTables': grpc.unary_unary_rpc_method_handler(
+                    servicer.MergeTables,
+                    request_deserializer=deephaven__core_dot_proto_dot_table__pb2.MergeTablesRequest.FromString,
+                    response_serializer=deephaven__core_dot_proto_dot_table__pb2.ExportedTableCreationResponse.SerializeToString,
+            ),
+            'CrossJoinTables': grpc.unary_unary_rpc_method_handler(
+                    servicer.CrossJoinTables,
+                    request_deserializer=deephaven__core_dot_proto_dot_table__pb2.CrossJoinTablesRequest.FromString,
+                    response_serializer=deephaven__core_dot_proto_dot_table__pb2.ExportedTableCreationResponse.SerializeToString,
+            ),
+            'NaturalJoinTables': grpc.unary_unary_rpc_method_handler(
+                    servicer.NaturalJoinTables,
+                    request_deserializer=deephaven__core_dot_proto_dot_table__pb2.NaturalJoinTablesRequest.FromString,
+                    response_serializer=deephaven__core_dot_proto_dot_table__pb2.ExportedTableCreationResponse.SerializeToString,
+            ),
+            'ExactJoinTables': grpc.unary_unary_rpc_method_handler(
+                    servicer.ExactJoinTables,
+                    request_deserializer=deephaven__core_dot_proto_dot_table__pb2.ExactJoinTablesRequest.FromString,
+                    response_serializer=deephaven__core_dot_proto_dot_table__pb2.ExportedTableCreationResponse.SerializeToString,
+            ),
+            'LeftJoinTables': grpc.unary_unary_rpc_method_handler(
+                    servicer.LeftJoinTables,
+                    request_deserializer=deephaven__core_dot_proto_dot_table__pb2.LeftJoinTablesRequest.FromString,
+                    response_serializer=deephaven__core_dot_proto_dot_table__pb2.ExportedTableCreationResponse.SerializeToString,
+            ),
+            'AsOfJoinTables': grpc.unary_unary_rpc_method_handler(
+                    servicer.AsOfJoinTables,
+                    request_deserializer=deephaven__core_dot_proto_dot_table__pb2.AsOfJoinTablesRequest.FromString,
+                    response_serializer=deephaven__core_dot_proto_dot_table__pb2.ExportedTableCreationResponse.SerializeToString,
+            ),
+            'AjTables': grpc.unary_unary_rpc_method_handler(
+                    servicer.AjTables,
+                    request_deserializer=deephaven__core_dot_proto_dot_table__pb2.AjRajTablesRequest.FromString,
+                    response_serializer=deephaven__core_dot_proto_dot_table__pb2.ExportedTableCreationResponse.SerializeToString,
+            ),
+            'RajTables': grpc.unary_unary_rpc_method_handler(
+                    servicer.RajTables,
+                    request_deserializer=deephaven__core_dot_proto_dot_table__pb2.AjRajTablesRequest.FromString,
+                    response_serializer=deephaven__core_dot_proto_dot_table__pb2.ExportedTableCreationResponse.SerializeToString,
+            ),
+            'MultiJoinTables': grpc.unary_unary_rpc_method_handler(
+                    servicer.MultiJoinTables,
+                    request_deserializer=deephaven__core_dot_proto_dot_table__pb2.MultiJoinTablesRequest.FromString,
+                    response_serializer=deephaven__core_dot_proto_dot_table__pb2.ExportedTableCreationResponse.SerializeToString,
+            ),
+            'RangeJoinTables': grpc.unary_unary_rpc_method_handler(
+                    servicer.RangeJoinTables,
+                    request_deserializer=deephaven__core_dot_proto_dot_table__pb2.RangeJoinTablesRequest.FromString,
+                    response_serializer=deephaven__core_dot_proto_dot_table__pb2.ExportedTableCreationResponse.SerializeToString,
+            ),
+            'ComboAggregate': grpc.unary_unary_rpc_method_handler(
+                    servicer.ComboAggregate,
+                    request_deserializer=deephaven__core_dot_proto_dot_table__pb2.ComboAggregateRequest.FromString,
+                    response_serializer=deephaven__core_dot_proto_dot_table__pb2.ExportedTableCreationResponse.SerializeToString,
+            ),
+            'AggregateAll': grpc.unary_unary_rpc_method_handler(
+                    servicer.AggregateAll,
+                    request_deserializer=deephaven__core_dot_proto_dot_table__pb2.AggregateAllRequest.FromString,
+                    response_serializer=deephaven__core_dot_proto_dot_table__pb2.ExportedTableCreationResponse.SerializeToString,
+            ),
+            'Aggregate': grpc.unary_unary_rpc_method_handler(
+                    servicer.Aggregate,
+                    request_deserializer=deephaven__core_dot_proto_dot_table__pb2.AggregateRequest.FromString,
+                    response_serializer=deephaven__core_dot_proto_dot_table__pb2.ExportedTableCreationResponse.SerializeToString,
+            ),
+            'Snapshot': grpc.unary_unary_rpc_method_handler(
+                    servicer.Snapshot,
+                    request_deserializer=deephaven__core_dot_proto_dot_table__pb2.SnapshotTableRequest.FromString,
+                    response_serializer=deephaven__core_dot_proto_dot_table__pb2.ExportedTableCreationResponse.SerializeToString,
+            ),
+            'SnapshotWhen': grpc.unary_unary_rpc_method_handler(
+                    servicer.SnapshotWhen,
+                    request_deserializer=deephaven__core_dot_proto_dot_table__pb2.SnapshotWhenTableRequest.FromString,
+                    response_serializer=deephaven__core_dot_proto_dot_table__pb2.ExportedTableCreationResponse.SerializeToString,
+            ),
+            'Flatten': grpc.unary_unary_rpc_method_handler(
+                    servicer.Flatten,
+                    request_deserializer=deephaven__core_dot_proto_dot_table__pb2.FlattenRequest.FromString,
+                    response_serializer=deephaven__core_dot_proto_dot_table__pb2.ExportedTableCreationResponse.SerializeToString,
+            ),
+            'RunChartDownsample': grpc.unary_unary_rpc_method_handler(
+                    servicer.RunChartDownsample,
+                    request_deserializer=deephaven__core_dot_proto_dot_table__pb2.RunChartDownsampleRequest.FromString,
+                    response_serializer=deephaven__core_dot_proto_dot_table__pb2.ExportedTableCreationResponse.SerializeToString,
+            ),
+            'CreateInputTable': grpc.unary_unary_rpc_method_handler(
+                    servicer.CreateInputTable,
+                    request_deserializer=deephaven__core_dot_proto_dot_table__pb2.CreateInputTableRequest.FromString,
+                    response_serializer=deephaven__core_dot_proto_dot_table__pb2.ExportedTableCreationResponse.SerializeToString,
+            ),
+            'WhereIn': grpc.unary_unary_rpc_method_handler(
+                    servicer.WhereIn,
+                    request_deserializer=deephaven__core_dot_proto_dot_table__pb2.WhereInRequest.FromString,
+                    response_serializer=deephaven__core_dot_proto_dot_table__pb2.ExportedTableCreationResponse.SerializeToString,
+            ),
+            'Batch': grpc.unary_stream_rpc_method_handler(
+                    servicer.Batch,
+                    request_deserializer=deephaven__core_dot_proto_dot_table__pb2.BatchTableRequest.FromString,
+                    response_serializer=deephaven__core_dot_proto_dot_table__pb2.ExportedTableCreationResponse.SerializeToString,
+            ),
+            'ExportedTableUpdates': grpc.unary_stream_rpc_method_handler(
+                    servicer.ExportedTableUpdates,
+                    request_deserializer=deephaven__core_dot_proto_dot_table__pb2.ExportedTableUpdatesRequest.FromString,
+                    response_serializer=deephaven__core_dot_proto_dot_table__pb2.ExportedTableUpdateMessage.SerializeToString,
+            ),
+            'SeekRow': grpc.unary_unary_rpc_method_handler(
+                    servicer.SeekRow,
+                    request_deserializer=deephaven__core_dot_proto_dot_table__pb2.SeekRowRequest.FromString,
+                    response_serializer=deephaven__core_dot_proto_dot_table__pb2.SeekRowResponse.SerializeToString,
+            ),
+            'MetaTable': grpc.unary_unary_rpc_method_handler(
+                    servicer.MetaTable,
+                    request_deserializer=deephaven__core_dot_proto_dot_table__pb2.MetaTableRequest.FromString,
+                    response_serializer=deephaven__core_dot_proto_dot_table__pb2.ExportedTableCreationResponse.SerializeToString,
+            ),
+            'ComputeColumnStatistics': grpc.unary_unary_rpc_method_handler(
+                    servicer.ComputeColumnStatistics,
+                    request_deserializer=deephaven__core_dot_proto_dot_table__pb2.ColumnStatisticsRequest.FromString,
+                    response_serializer=deephaven__core_dot_proto_dot_table__pb2.ExportedTableCreationResponse.SerializeToString,
+            ),
+            'Slice': grpc.unary_unary_rpc_method_handler(
+                    servicer.Slice,
+                    request_deserializer=deephaven__core_dot_proto_dot_table__pb2.SliceRequest.FromString,
+                    response_serializer=deephaven__core_dot_proto_dot_table__pb2.ExportedTableCreationResponse.SerializeToString,
+            ),
+    }
+    generic_handler = grpc.method_handlers_generic_handler(
+            'io.deephaven.proto.backplane.grpc.TableService', rpc_method_handlers)
+    server.add_generic_rpc_handlers((generic_handler,))
+
+
+ # This class is part of an EXPERIMENTAL API.
+class TableService(object):
+    """Missing associated documentation comment in .proto file."""
+
+    @staticmethod
+    def GetExportedTableCreationResponse(request,
+            target,
+            options=(),
+            channel_credentials=None,
+            call_credentials=None,
+            insecure=False,
+            compression=None,
+            wait_for_ready=None,
+            timeout=None,
+            metadata=None):
+        return grpc.experimental.unary_unary(
+            request,
+            target,
+            '/io.deephaven.proto.backplane.grpc.TableService/GetExportedTableCreationResponse',
+            deephaven__core_dot_proto_dot_ticket__pb2.Ticket.SerializeToString,
+            deephaven__core_dot_proto_dot_table__pb2.ExportedTableCreationResponse.FromString,
+            options,
+            channel_credentials,
+            insecure,
+            call_credentials,
+            compression,
+            wait_for_ready,
+            timeout,
+            metadata,
+            _registered_method=True)
+
+    @staticmethod
+    def FetchTable(request,
+            target,
+            options=(),
+            channel_credentials=None,
+            call_credentials=None,
+            insecure=False,
+            compression=None,
+            wait_for_ready=None,
+            timeout=None,
+            metadata=None):
+        return grpc.experimental.unary_unary(
+            request,
+            target,
+            '/io.deephaven.proto.backplane.grpc.TableService/FetchTable',
+            deephaven__core_dot_proto_dot_table__pb2.FetchTableRequest.SerializeToString,
+            deephaven__core_dot_proto_dot_table__pb2.ExportedTableCreationResponse.FromString,
+            options,
+            channel_credentials,
+            insecure,
+            call_credentials,
+            compression,
+            wait_for_ready,
+            timeout,
+            metadata,
+            _registered_method=True)
+
+    @staticmethod
+    def ApplyPreviewColumns(request,
+            target,
+            options=(),
+            channel_credentials=None,
+            call_credentials=None,
+            insecure=False,
+            compression=None,
+            wait_for_ready=None,
+            timeout=None,
+            metadata=None):
+        return grpc.experimental.unary_unary(
+            request,
+            target,
+            '/io.deephaven.proto.backplane.grpc.TableService/ApplyPreviewColumns',
+            deephaven__core_dot_proto_dot_table__pb2.ApplyPreviewColumnsRequest.SerializeToString,
+            deephaven__core_dot_proto_dot_table__pb2.ExportedTableCreationResponse.FromString,
+            options,
+            channel_credentials,
+            insecure,
+            call_credentials,
+            compression,
+            wait_for_ready,
+            timeout,
+            metadata,
+            _registered_method=True)
+
+    @staticmethod
+    def EmptyTable(request,
+            target,
+            options=(),
+            channel_credentials=None,
+            call_credentials=None,
+            insecure=False,
+            compression=None,
+            wait_for_ready=None,
+            timeout=None,
+            metadata=None):
+        return grpc.experimental.unary_unary(
+            request,
+            target,
+            '/io.deephaven.proto.backplane.grpc.TableService/EmptyTable',
+            deephaven__core_dot_proto_dot_table__pb2.EmptyTableRequest.SerializeToString,
+            deephaven__core_dot_proto_dot_table__pb2.ExportedTableCreationResponse.FromString,
+            options,
+            channel_credentials,
+            insecure,
+            call_credentials,
+            compression,
+            wait_for_ready,
+            timeout,
+            metadata,
+            _registered_method=True)
+
+    @staticmethod
+    def TimeTable(request,
+            target,
+            options=(),
+            channel_credentials=None,
+            call_credentials=None,
+            insecure=False,
+            compression=None,
+            wait_for_ready=None,
+            timeout=None,
+            metadata=None):
+        return grpc.experimental.unary_unary(
+            request,
+            target,
+            '/io.deephaven.proto.backplane.grpc.TableService/TimeTable',
+            deephaven__core_dot_proto_dot_table__pb2.TimeTableRequest.SerializeToString,
+            deephaven__core_dot_proto_dot_table__pb2.ExportedTableCreationResponse.FromString,
+            options,
+            channel_credentials,
+            insecure,
+            call_credentials,
+            compression,
+            wait_for_ready,
+            timeout,
+            metadata,
+            _registered_method=True)
+
+    @staticmethod
+    def DropColumns(request,
+            target,
+            options=(),
+            channel_credentials=None,
+            call_credentials=None,
+            insecure=False,
+            compression=None,
+            wait_for_ready=None,
+            timeout=None,
+            metadata=None):
+        return grpc.experimental.unary_unary(
+            request,
+            target,
+            '/io.deephaven.proto.backplane.grpc.TableService/DropColumns',
+            deephaven__core_dot_proto_dot_table__pb2.DropColumnsRequest.SerializeToString,
+            deephaven__core_dot_proto_dot_table__pb2.ExportedTableCreationResponse.FromString,
+            options,
+            channel_credentials,
+            insecure,
+            call_credentials,
+            compression,
+            wait_for_ready,
+            timeout,
+            metadata,
+            _registered_method=True)
+
+    @staticmethod
+    def Update(request,
+            target,
+            options=(),
+            channel_credentials=None,
+            call_credentials=None,
+            insecure=False,
+            compression=None,
+            wait_for_ready=None,
+            timeout=None,
+            metadata=None):
+        return grpc.experimental.unary_unary(
+            request,
+            target,
+            '/io.deephaven.proto.backplane.grpc.TableService/Update',
+            deephaven__core_dot_proto_dot_table__pb2.SelectOrUpdateRequest.SerializeToString,
+            deephaven__core_dot_proto_dot_table__pb2.ExportedTableCreationResponse.FromString,
+            options,
+            channel_credentials,
+            insecure,
+            call_credentials,
+            compression,
+            wait_for_ready,
+            timeout,
+            metadata,
+            _registered_method=True)
+
+    @staticmethod
+    def LazyUpdate(request,
+            target,
+            options=(),
+            channel_credentials=None,
+            call_credentials=None,
+            insecure=False,
+            compression=None,
+            wait_for_ready=None,
+            timeout=None,
+            metadata=None):
+        return grpc.experimental.unary_unary(
+            request,
+            target,
+            '/io.deephaven.proto.backplane.grpc.TableService/LazyUpdate',
+            deephaven__core_dot_proto_dot_table__pb2.SelectOrUpdateRequest.SerializeToString,
+            deephaven__core_dot_proto_dot_table__pb2.ExportedTableCreationResponse.FromString,
+            options,
+            channel_credentials,
+            insecure,
+            call_credentials,
+            compression,
+            wait_for_ready,
+            timeout,
+            metadata,
+            _registered_method=True)
+
+    @staticmethod
+    def View(request,
+            target,
+            options=(),
+            channel_credentials=None,
+            call_credentials=None,
+            insecure=False,
+            compression=None,
+            wait_for_ready=None,
+            timeout=None,
+            metadata=None):
+        return grpc.experimental.unary_unary(
+            request,
+            target,
+            '/io.deephaven.proto.backplane.grpc.TableService/View',
+            deephaven__core_dot_proto_dot_table__pb2.SelectOrUpdateRequest.SerializeToString,
+            deephaven__core_dot_proto_dot_table__pb2.ExportedTableCreationResponse.FromString,
+            options,
+            channel_credentials,
+            insecure,
+            call_credentials,
+            compression,
+            wait_for_ready,
+            timeout,
+            metadata,
+            _registered_method=True)
+
+    @staticmethod
+    def UpdateView(request,
+            target,
+            options=(),
+            channel_credentials=None,
+            call_credentials=None,
+            insecure=False,
+            compression=None,
+            wait_for_ready=None,
+            timeout=None,
+            metadata=None):
+        return grpc.experimental.unary_unary(
+            request,
+            target,
+            '/io.deephaven.proto.backplane.grpc.TableService/UpdateView',
+            deephaven__core_dot_proto_dot_table__pb2.SelectOrUpdateRequest.SerializeToString,
+            deephaven__core_dot_proto_dot_table__pb2.ExportedTableCreationResponse.FromString,
+            options,
+            channel_credentials,
+            insecure,
+            call_credentials,
+            compression,
+            wait_for_ready,
+            timeout,
+            metadata,
+            _registered_method=True)
+
+    @staticmethod
+    def Select(request,
+            target,
+            options=(),
+            channel_credentials=None,
+            call_credentials=None,
+            insecure=False,
+            compression=None,
+            wait_for_ready=None,
+            timeout=None,
+            metadata=None):
+        return grpc.experimental.unary_unary(
+            request,
+            target,
+            '/io.deephaven.proto.backplane.grpc.TableService/Select',
+            deephaven__core_dot_proto_dot_table__pb2.SelectOrUpdateRequest.SerializeToString,
+            deephaven__core_dot_proto_dot_table__pb2.ExportedTableCreationResponse.FromString,
+            options,
+            channel_credentials,
+            insecure,
+            call_credentials,
+            compression,
+            wait_for_ready,
+            timeout,
+            metadata,
+            _registered_method=True)
+
+    @staticmethod
+    def UpdateBy(request,
+            target,
+            options=(),
+            channel_credentials=None,
+            call_credentials=None,
+            insecure=False,
+            compression=None,
+            wait_for_ready=None,
+            timeout=None,
+            metadata=None):
+        return grpc.experimental.unary_unary(
+            request,
+            target,
+            '/io.deephaven.proto.backplane.grpc.TableService/UpdateBy',
+            deephaven__core_dot_proto_dot_table__pb2.UpdateByRequest.SerializeToString,
+            deephaven__core_dot_proto_dot_table__pb2.ExportedTableCreationResponse.FromString,
+            options,
+            channel_credentials,
+            insecure,
+            call_credentials,
+            compression,
+            wait_for_ready,
+            timeout,
+            metadata,
+            _registered_method=True)
+
+    @staticmethod
+    def SelectDistinct(request,
+            target,
+            options=(),
+            channel_credentials=None,
+            call_credentials=None,
+            insecure=False,
+            compression=None,
+            wait_for_ready=None,
+            timeout=None,
+            metadata=None):
+        return grpc.experimental.unary_unary(
+            request,
+            target,
+            '/io.deephaven.proto.backplane.grpc.TableService/SelectDistinct',
+            deephaven__core_dot_proto_dot_table__pb2.SelectDistinctRequest.SerializeToString,
+            deephaven__core_dot_proto_dot_table__pb2.ExportedTableCreationResponse.FromString,
+            options,
+            channel_credentials,
+            insecure,
+            call_credentials,
+            compression,
+            wait_for_ready,
+            timeout,
+            metadata,
+            _registered_method=True)
+
+    @staticmethod
+    def Filter(request,
+            target,
+            options=(),
+            channel_credentials=None,
+            call_credentials=None,
+            insecure=False,
+            compression=None,
+            wait_for_ready=None,
+            timeout=None,
+            metadata=None):
+        return grpc.experimental.unary_unary(
+            request,
+            target,
+            '/io.deephaven.proto.backplane.grpc.TableService/Filter',
+            deephaven__core_dot_proto_dot_table__pb2.FilterTableRequest.SerializeToString,
+            deephaven__core_dot_proto_dot_table__pb2.ExportedTableCreationResponse.FromString,
+            options,
+            channel_credentials,
+            insecure,
+            call_credentials,
+            compression,
+            wait_for_ready,
+            timeout,
+            metadata,
+            _registered_method=True)
+
+    @staticmethod
+    def UnstructuredFilter(request,
+            target,
+            options=(),
+            channel_credentials=None,
+            call_credentials=None,
+            insecure=False,
+            compression=None,
+            wait_for_ready=None,
+            timeout=None,
+            metadata=None):
+        return grpc.experimental.unary_unary(
+            request,
+            target,
+            '/io.deephaven.proto.backplane.grpc.TableService/UnstructuredFilter',
+            deephaven__core_dot_proto_dot_table__pb2.UnstructuredFilterTableRequest.SerializeToString,
+            deephaven__core_dot_proto_dot_table__pb2.ExportedTableCreationResponse.FromString,
+            options,
+            channel_credentials,
+            insecure,
+            call_credentials,
+            compression,
+            wait_for_ready,
+            timeout,
+            metadata,
+            _registered_method=True)
+
+    @staticmethod
+    def Sort(request,
+            target,
+            options=(),
+            channel_credentials=None,
+            call_credentials=None,
+            insecure=False,
+            compression=None,
+            wait_for_ready=None,
+            timeout=None,
+            metadata=None):
+        return grpc.experimental.unary_unary(
+            request,
+            target,
+            '/io.deephaven.proto.backplane.grpc.TableService/Sort',
+            deephaven__core_dot_proto_dot_table__pb2.SortTableRequest.SerializeToString,
+            deephaven__core_dot_proto_dot_table__pb2.ExportedTableCreationResponse.FromString,
+            options,
+            channel_credentials,
+            insecure,
+            call_credentials,
+            compression,
+            wait_for_ready,
+            timeout,
+            metadata,
+            _registered_method=True)
+
+    @staticmethod
+    def Head(request,
+            target,
+            options=(),
+            channel_credentials=None,
+            call_credentials=None,
+            insecure=False,
+            compression=None,
+            wait_for_ready=None,
+            timeout=None,
+            metadata=None):
+        return grpc.experimental.unary_unary(
+            request,
+            target,
+            '/io.deephaven.proto.backplane.grpc.TableService/Head',
+            deephaven__core_dot_proto_dot_table__pb2.HeadOrTailRequest.SerializeToString,
+            deephaven__core_dot_proto_dot_table__pb2.ExportedTableCreationResponse.FromString,
+            options,
+            channel_credentials,
+            insecure,
+            call_credentials,
+            compression,
+            wait_for_ready,
+            timeout,
+            metadata,
+            _registered_method=True)
+
+    @staticmethod
+    def Tail(request,
+            target,
+            options=(),
+            channel_credentials=None,
+            call_credentials=None,
+            insecure=False,
+            compression=None,
+            wait_for_ready=None,
+            timeout=None,
+            metadata=None):
+        return grpc.experimental.unary_unary(
+            request,
+            target,
+            '/io.deephaven.proto.backplane.grpc.TableService/Tail',
+            deephaven__core_dot_proto_dot_table__pb2.HeadOrTailRequest.SerializeToString,
+            deephaven__core_dot_proto_dot_table__pb2.ExportedTableCreationResponse.FromString,
+            options,
+            channel_credentials,
+            insecure,
+            call_credentials,
+            compression,
+            wait_for_ready,
+            timeout,
+            metadata,
+            _registered_method=True)
+
+    @staticmethod
+    def HeadBy(request,
+            target,
+            options=(),
+            channel_credentials=None,
+            call_credentials=None,
+            insecure=False,
+            compression=None,
+            wait_for_ready=None,
+            timeout=None,
+            metadata=None):
+        return grpc.experimental.unary_unary(
+            request,
+            target,
+            '/io.deephaven.proto.backplane.grpc.TableService/HeadBy',
+            deephaven__core_dot_proto_dot_table__pb2.HeadOrTailByRequest.SerializeToString,
+            deephaven__core_dot_proto_dot_table__pb2.ExportedTableCreationResponse.FromString,
+            options,
+            channel_credentials,
+            insecure,
+            call_credentials,
+            compression,
+            wait_for_ready,
+            timeout,
+            metadata,
+            _registered_method=True)
+
+    @staticmethod
+    def TailBy(request,
+            target,
+            options=(),
+            channel_credentials=None,
+            call_credentials=None,
+            insecure=False,
+            compression=None,
+            wait_for_ready=None,
+            timeout=None,
+            metadata=None):
+        return grpc.experimental.unary_unary(
+            request,
+            target,
+            '/io.deephaven.proto.backplane.grpc.TableService/TailBy',
+            deephaven__core_dot_proto_dot_table__pb2.HeadOrTailByRequest.SerializeToString,
+            deephaven__core_dot_proto_dot_table__pb2.ExportedTableCreationResponse.FromString,
+            options,
+            channel_credentials,
+            insecure,
+            call_credentials,
+            compression,
+            wait_for_ready,
+            timeout,
+            metadata,
+            _registered_method=True)
+
+    @staticmethod
+    def Ungroup(request,
+            target,
+            options=(),
+            channel_credentials=None,
+            call_credentials=None,
+            insecure=False,
+            compression=None,
+            wait_for_ready=None,
+            timeout=None,
+            metadata=None):
+        return grpc.experimental.unary_unary(
+            request,
+            target,
+            '/io.deephaven.proto.backplane.grpc.TableService/Ungroup',
+            deephaven__core_dot_proto_dot_table__pb2.UngroupRequest.SerializeToString,
+            deephaven__core_dot_proto_dot_table__pb2.ExportedTableCreationResponse.FromString,
+            options,
+            channel_credentials,
+            insecure,
+            call_credentials,
+            compression,
+            wait_for_ready,
+            timeout,
+            metadata,
+            _registered_method=True)
+
+    @staticmethod
+    def MergeTables(request,
+            target,
+            options=(),
+            channel_credentials=None,
+            call_credentials=None,
+            insecure=False,
+            compression=None,
+            wait_for_ready=None,
+            timeout=None,
+            metadata=None):
+        return grpc.experimental.unary_unary(
+            request,
+            target,
+            '/io.deephaven.proto.backplane.grpc.TableService/MergeTables',
+            deephaven__core_dot_proto_dot_table__pb2.MergeTablesRequest.SerializeToString,
+            deephaven__core_dot_proto_dot_table__pb2.ExportedTableCreationResponse.FromString,
+            options,
+            channel_credentials,
+            insecure,
+            call_credentials,
+            compression,
+            wait_for_ready,
+            timeout,
+            metadata,
+            _registered_method=True)
+
+    @staticmethod
+    def CrossJoinTables(request,
+            target,
+            options=(),
+            channel_credentials=None,
+            call_credentials=None,
+            insecure=False,
+            compression=None,
+            wait_for_ready=None,
+            timeout=None,
+            metadata=None):
+        return grpc.experimental.unary_unary(
+            request,
+            target,
+            '/io.deephaven.proto.backplane.grpc.TableService/CrossJoinTables',
+            deephaven__core_dot_proto_dot_table__pb2.CrossJoinTablesRequest.SerializeToString,
+            deephaven__core_dot_proto_dot_table__pb2.ExportedTableCreationResponse.FromString,
+            options,
+            channel_credentials,
+            insecure,
+            call_credentials,
+            compression,
+            wait_for_ready,
+            timeout,
+            metadata,
+            _registered_method=True)
+
+    @staticmethod
+    def NaturalJoinTables(request,
+            target,
+            options=(),
+            channel_credentials=None,
+            call_credentials=None,
+            insecure=False,
+            compression=None,
+            wait_for_ready=None,
+            timeout=None,
+            metadata=None):
+        return grpc.experimental.unary_unary(
+            request,
+            target,
+            '/io.deephaven.proto.backplane.grpc.TableService/NaturalJoinTables',
+            deephaven__core_dot_proto_dot_table__pb2.NaturalJoinTablesRequest.SerializeToString,
+            deephaven__core_dot_proto_dot_table__pb2.ExportedTableCreationResponse.FromString,
+            options,
+            channel_credentials,
+            insecure,
+            call_credentials,
+            compression,
+            wait_for_ready,
+            timeout,
+            metadata,
+            _registered_method=True)
+
+    @staticmethod
+    def ExactJoinTables(request,
+            target,
+            options=(),
+            channel_credentials=None,
+            call_credentials=None,
+            insecure=False,
+            compression=None,
+            wait_for_ready=None,
+            timeout=None,
+            metadata=None):
+        return grpc.experimental.unary_unary(
+            request,
+            target,
+            '/io.deephaven.proto.backplane.grpc.TableService/ExactJoinTables',
+            deephaven__core_dot_proto_dot_table__pb2.ExactJoinTablesRequest.SerializeToString,
+            deephaven__core_dot_proto_dot_table__pb2.ExportedTableCreationResponse.FromString,
+            options,
+            channel_credentials,
+            insecure,
+            call_credentials,
+            compression,
+            wait_for_ready,
+            timeout,
+            metadata,
+            _registered_method=True)
+
+    @staticmethod
+    def LeftJoinTables(request,
+            target,
+            options=(),
+            channel_credentials=None,
+            call_credentials=None,
+            insecure=False,
+            compression=None,
+            wait_for_ready=None,
+            timeout=None,
+            metadata=None):
+        return grpc.experimental.unary_unary(
+            request,
+            target,
+            '/io.deephaven.proto.backplane.grpc.TableService/LeftJoinTables',
+            deephaven__core_dot_proto_dot_table__pb2.LeftJoinTablesRequest.SerializeToString,
+            deephaven__core_dot_proto_dot_table__pb2.ExportedTableCreationResponse.FromString,
+            options,
+            channel_credentials,
+            insecure,
+            call_credentials,
+            compression,
+            wait_for_ready,
+            timeout,
+            metadata,
+            _registered_method=True)
+
+    @staticmethod
+    def AsOfJoinTables(request,
+            target,
+            options=(),
+            channel_credentials=None,
+            call_credentials=None,
+            insecure=False,
+            compression=None,
+            wait_for_ready=None,
+            timeout=None,
+            metadata=None):
+        return grpc.experimental.unary_unary(
+            request,
+            target,
+            '/io.deephaven.proto.backplane.grpc.TableService/AsOfJoinTables',
+            deephaven__core_dot_proto_dot_table__pb2.AsOfJoinTablesRequest.SerializeToString,
+            deephaven__core_dot_proto_dot_table__pb2.ExportedTableCreationResponse.FromString,
+            options,
+            channel_credentials,
+            insecure,
+            call_credentials,
+            compression,
+            wait_for_ready,
+            timeout,
+            metadata,
+            _registered_method=True)
+
+    @staticmethod
+    def AjTables(request,
+            target,
+            options=(),
+            channel_credentials=None,
+            call_credentials=None,
+            insecure=False,
+            compression=None,
+            wait_for_ready=None,
+            timeout=None,
+            metadata=None):
+        return grpc.experimental.unary_unary(
+            request,
+            target,
+            '/io.deephaven.proto.backplane.grpc.TableService/AjTables',
+            deephaven__core_dot_proto_dot_table__pb2.AjRajTablesRequest.SerializeToString,
+            deephaven__core_dot_proto_dot_table__pb2.ExportedTableCreationResponse.FromString,
+            options,
+            channel_credentials,
+            insecure,
+            call_credentials,
+            compression,
+            wait_for_ready,
+            timeout,
+            metadata,
+            _registered_method=True)
+
+    @staticmethod
+    def RajTables(request,
+            target,
+            options=(),
+            channel_credentials=None,
+            call_credentials=None,
+            insecure=False,
+            compression=None,
+            wait_for_ready=None,
+            timeout=None,
+            metadata=None):
+        return grpc.experimental.unary_unary(
+            request,
+            target,
+            '/io.deephaven.proto.backplane.grpc.TableService/RajTables',
+            deephaven__core_dot_proto_dot_table__pb2.AjRajTablesRequest.SerializeToString,
+            deephaven__core_dot_proto_dot_table__pb2.ExportedTableCreationResponse.FromString,
+            options,
+            channel_credentials,
+            insecure,
+            call_credentials,
+            compression,
+            wait_for_ready,
+            timeout,
+            metadata,
+            _registered_method=True)
+
+    @staticmethod
+    def MultiJoinTables(request,
+            target,
+            options=(),
+            channel_credentials=None,
+            call_credentials=None,
+            insecure=False,
+            compression=None,
+            wait_for_ready=None,
+            timeout=None,
+            metadata=None):
+        return grpc.experimental.unary_unary(
+            request,
+            target,
+            '/io.deephaven.proto.backplane.grpc.TableService/MultiJoinTables',
+            deephaven__core_dot_proto_dot_table__pb2.MultiJoinTablesRequest.SerializeToString,
+            deephaven__core_dot_proto_dot_table__pb2.ExportedTableCreationResponse.FromString,
+            options,
+            channel_credentials,
+            insecure,
+            call_credentials,
+            compression,
+            wait_for_ready,
+            timeout,
+            metadata,
+            _registered_method=True)
+
+    @staticmethod
+    def RangeJoinTables(request,
+            target,
+            options=(),
+            channel_credentials=None,
+            call_credentials=None,
+            insecure=False,
+            compression=None,
+            wait_for_ready=None,
+            timeout=None,
+            metadata=None):
+        return grpc.experimental.unary_unary(
+            request,
+            target,
+            '/io.deephaven.proto.backplane.grpc.TableService/RangeJoinTables',
+            deephaven__core_dot_proto_dot_table__pb2.RangeJoinTablesRequest.SerializeToString,
+            deephaven__core_dot_proto_dot_table__pb2.ExportedTableCreationResponse.FromString,
+            options,
+            channel_credentials,
+            insecure,
+            call_credentials,
+            compression,
+            wait_for_ready,
+            timeout,
+            metadata,
+            _registered_method=True)
+
+    @staticmethod
+    def ComboAggregate(request,
+            target,
+            options=(),
+            channel_credentials=None,
+            call_credentials=None,
+            insecure=False,
+            compression=None,
+            wait_for_ready=None,
+            timeout=None,
+            metadata=None):
+        return grpc.experimental.unary_unary(
+            request,
+            target,
+            '/io.deephaven.proto.backplane.grpc.TableService/ComboAggregate',
+            deephaven__core_dot_proto_dot_table__pb2.ComboAggregateRequest.SerializeToString,
+            deephaven__core_dot_proto_dot_table__pb2.ExportedTableCreationResponse.FromString,
+            options,
+            channel_credentials,
+            insecure,
+            call_credentials,
+            compression,
+            wait_for_ready,
+            timeout,
+            metadata,
+            _registered_method=True)
+
+    @staticmethod
+    def AggregateAll(request,
+            target,
+            options=(),
+            channel_credentials=None,
+            call_credentials=None,
+            insecure=False,
+            compression=None,
+            wait_for_ready=None,
+            timeout=None,
+            metadata=None):
+        return grpc.experimental.unary_unary(
+            request,
+            target,
+            '/io.deephaven.proto.backplane.grpc.TableService/AggregateAll',
+            deephaven__core_dot_proto_dot_table__pb2.AggregateAllRequest.SerializeToString,
+            deephaven__core_dot_proto_dot_table__pb2.ExportedTableCreationResponse.FromString,
+            options,
+            channel_credentials,
+            insecure,
+            call_credentials,
+            compression,
+            wait_for_ready,
+            timeout,
+            metadata,
+            _registered_method=True)
+
+    @staticmethod
+    def Aggregate(request,
+            target,
+            options=(),
+            channel_credentials=None,
+            call_credentials=None,
+            insecure=False,
+            compression=None,
+            wait_for_ready=None,
+            timeout=None,
+            metadata=None):
+        return grpc.experimental.unary_unary(
+            request,
+            target,
+            '/io.deephaven.proto.backplane.grpc.TableService/Aggregate',
+            deephaven__core_dot_proto_dot_table__pb2.AggregateRequest.SerializeToString,
+            deephaven__core_dot_proto_dot_table__pb2.ExportedTableCreationResponse.FromString,
+            options,
+            channel_credentials,
+            insecure,
+            call_credentials,
+            compression,
+            wait_for_ready,
+            timeout,
+            metadata,
+            _registered_method=True)
+
+    @staticmethod
+    def Snapshot(request,
+            target,
+            options=(),
+            channel_credentials=None,
+            call_credentials=None,
+            insecure=False,
+            compression=None,
+            wait_for_ready=None,
+            timeout=None,
+            metadata=None):
+        return grpc.experimental.unary_unary(
+            request,
+            target,
+            '/io.deephaven.proto.backplane.grpc.TableService/Snapshot',
+            deephaven__core_dot_proto_dot_table__pb2.SnapshotTableRequest.SerializeToString,
+            deephaven__core_dot_proto_dot_table__pb2.ExportedTableCreationResponse.FromString,
+            options,
+            channel_credentials,
+            insecure,
+            call_credentials,
+            compression,
+            wait_for_ready,
+            timeout,
+            metadata,
+            _registered_method=True)
+
+    @staticmethod
+    def SnapshotWhen(request,
+            target,
+            options=(),
+            channel_credentials=None,
+            call_credentials=None,
+            insecure=False,
+            compression=None,
+            wait_for_ready=None,
+            timeout=None,
+            metadata=None):
+        return grpc.experimental.unary_unary(
+            request,
+            target,
+            '/io.deephaven.proto.backplane.grpc.TableService/SnapshotWhen',
+            deephaven__core_dot_proto_dot_table__pb2.SnapshotWhenTableRequest.SerializeToString,
+            deephaven__core_dot_proto_dot_table__pb2.ExportedTableCreationResponse.FromString,
+            options,
+            channel_credentials,
+            insecure,
+            call_credentials,
+            compression,
+            wait_for_ready,
+            timeout,
+            metadata,
+            _registered_method=True)
+
+    @staticmethod
+    def Flatten(request,
+            target,
+            options=(),
+            channel_credentials=None,
+            call_credentials=None,
+            insecure=False,
+            compression=None,
+            wait_for_ready=None,
+            timeout=None,
+            metadata=None):
+        return grpc.experimental.unary_unary(
+            request,
+            target,
+            '/io.deephaven.proto.backplane.grpc.TableService/Flatten',
+            deephaven__core_dot_proto_dot_table__pb2.FlattenRequest.SerializeToString,
+            deephaven__core_dot_proto_dot_table__pb2.ExportedTableCreationResponse.FromString,
+            options,
+            channel_credentials,
+            insecure,
+            call_credentials,
+            compression,
+            wait_for_ready,
+            timeout,
+            metadata,
+            _registered_method=True)
+
+    @staticmethod
+    def RunChartDownsample(request,
+            target,
+            options=(),
+            channel_credentials=None,
+            call_credentials=None,
+            insecure=False,
+            compression=None,
+            wait_for_ready=None,
+            timeout=None,
+            metadata=None):
+        return grpc.experimental.unary_unary(
+            request,
+            target,
+            '/io.deephaven.proto.backplane.grpc.TableService/RunChartDownsample',
+            deephaven__core_dot_proto_dot_table__pb2.RunChartDownsampleRequest.SerializeToString,
+            deephaven__core_dot_proto_dot_table__pb2.ExportedTableCreationResponse.FromString,
+            options,
+            channel_credentials,
+            insecure,
+            call_credentials,
+            compression,
+            wait_for_ready,
+            timeout,
+            metadata,
+            _registered_method=True)
+
+    @staticmethod
+    def CreateInputTable(request,
+            target,
+            options=(),
+            channel_credentials=None,
+            call_credentials=None,
+            insecure=False,
+            compression=None,
+            wait_for_ready=None,
+            timeout=None,
+            metadata=None):
+        return grpc.experimental.unary_unary(
+            request,
+            target,
+            '/io.deephaven.proto.backplane.grpc.TableService/CreateInputTable',
+            deephaven__core_dot_proto_dot_table__pb2.CreateInputTableRequest.SerializeToString,
+            deephaven__core_dot_proto_dot_table__pb2.ExportedTableCreationResponse.FromString,
+            options,
+            channel_credentials,
+            insecure,
+            call_credentials,
+            compression,
+            wait_for_ready,
+            timeout,
+            metadata,
+            _registered_method=True)
+
+    @staticmethod
+    def WhereIn(request,
+            target,
+            options=(),
+            channel_credentials=None,
+            call_credentials=None,
+            insecure=False,
+            compression=None,
+            wait_for_ready=None,
+            timeout=None,
+            metadata=None):
+        return grpc.experimental.unary_unary(
+            request,
+            target,
+            '/io.deephaven.proto.backplane.grpc.TableService/WhereIn',
+            deephaven__core_dot_proto_dot_table__pb2.WhereInRequest.SerializeToString,
+            deephaven__core_dot_proto_dot_table__pb2.ExportedTableCreationResponse.FromString,
+            options,
+            channel_credentials,
+            insecure,
+            call_credentials,
+            compression,
+            wait_for_ready,
+            timeout,
+            metadata,
+            _registered_method=True)
+
+    @staticmethod
+    def Batch(request,
+            target,
+            options=(),
+            channel_credentials=None,
+            call_credentials=None,
+            insecure=False,
+            compression=None,
+            wait_for_ready=None,
+            timeout=None,
+            metadata=None):
+        return grpc.experimental.unary_stream(
+            request,
+            target,
+            '/io.deephaven.proto.backplane.grpc.TableService/Batch',
+            deephaven__core_dot_proto_dot_table__pb2.BatchTableRequest.SerializeToString,
+            deephaven__core_dot_proto_dot_table__pb2.ExportedTableCreationResponse.FromString,
+            options,
+            channel_credentials,
+            insecure,
+            call_credentials,
+            compression,
+            wait_for_ready,
+            timeout,
+            metadata,
+            _registered_method=True)
+
+    @staticmethod
+    def ExportedTableUpdates(request,
+            target,
+            options=(),
+            channel_credentials=None,
+            call_credentials=None,
+            insecure=False,
+            compression=None,
+            wait_for_ready=None,
+            timeout=None,
+            metadata=None):
+        return grpc.experimental.unary_stream(
+            request,
+            target,
+            '/io.deephaven.proto.backplane.grpc.TableService/ExportedTableUpdates',
+            deephaven__core_dot_proto_dot_table__pb2.ExportedTableUpdatesRequest.SerializeToString,
+            deephaven__core_dot_proto_dot_table__pb2.ExportedTableUpdateMessage.FromString,
+            options,
+            channel_credentials,
+            insecure,
+            call_credentials,
+            compression,
+            wait_for_ready,
+            timeout,
+            metadata,
+            _registered_method=True)
+
+    @staticmethod
+    def SeekRow(request,
+            target,
+            options=(),
+            channel_credentials=None,
+            call_credentials=None,
+            insecure=False,
+            compression=None,
+            wait_for_ready=None,
+            timeout=None,
+            metadata=None):
+        return grpc.experimental.unary_unary(
+            request,
+            target,
+            '/io.deephaven.proto.backplane.grpc.TableService/SeekRow',
+            deephaven__core_dot_proto_dot_table__pb2.SeekRowRequest.SerializeToString,
+            deephaven__core_dot_proto_dot_table__pb2.SeekRowResponse.FromString,
+            options,
+            channel_credentials,
+            insecure,
+            call_credentials,
+            compression,
+            wait_for_ready,
+            timeout,
+            metadata,
+            _registered_method=True)
+
+    @staticmethod
+    def MetaTable(request,
+            target,
+            options=(),
+            channel_credentials=None,
+            call_credentials=None,
+            insecure=False,
+            compression=None,
+            wait_for_ready=None,
+            timeout=None,
+            metadata=None):
+        return grpc.experimental.unary_unary(
+            request,
+            target,
+            '/io.deephaven.proto.backplane.grpc.TableService/MetaTable',
+            deephaven__core_dot_proto_dot_table__pb2.MetaTableRequest.SerializeToString,
+            deephaven__core_dot_proto_dot_table__pb2.ExportedTableCreationResponse.FromString,
+            options,
+            channel_credentials,
+            insecure,
+            call_credentials,
+            compression,
+            wait_for_ready,
+            timeout,
+            metadata,
+            _registered_method=True)
+
+    @staticmethod
+    def ComputeColumnStatistics(request,
+            target,
+            options=(),
+            channel_credentials=None,
+            call_credentials=None,
+            insecure=False,
+            compression=None,
+            wait_for_ready=None,
+            timeout=None,
+            metadata=None):
+        return grpc.experimental.unary_unary(
+            request,
+            target,
+            '/io.deephaven.proto.backplane.grpc.TableService/ComputeColumnStatistics',
+            deephaven__core_dot_proto_dot_table__pb2.ColumnStatisticsRequest.SerializeToString,
+            deephaven__core_dot_proto_dot_table__pb2.ExportedTableCreationResponse.FromString,
+            options,
+            channel_credentials,
+            insecure,
+            call_credentials,
+            compression,
+            wait_for_ready,
+            timeout,
+            metadata,
+            _registered_method=True)
+
+    @staticmethod
+    def Slice(request,
+            target,
+            options=(),
+            channel_credentials=None,
+            call_credentials=None,
+            insecure=False,
+            compression=None,
+            wait_for_ready=None,
+            timeout=None,
+            metadata=None):
+        return grpc.experimental.unary_unary(
+            request,
+            target,
+            '/io.deephaven.proto.backplane.grpc.TableService/Slice',
+            deephaven__core_dot_proto_dot_table__pb2.SliceRequest.SerializeToString,
+            deephaven__core_dot_proto_dot_table__pb2.ExportedTableCreationResponse.FromString,
+            options,
+            channel_credentials,
+            insecure,
+            call_credentials,
+            compression,
+            wait_for_ready,
+            timeout,
+            metadata,
+            _registered_method=True)
diff --git a/py/client/deephaven_core/proto/ticket_pb2.py b/py/client/deephaven_core/proto/ticket_pb2.py
new file mode 100644
index 00000000000..da0b1603832
--- /dev/null
+++ b/py/client/deephaven_core/proto/ticket_pb2.py
@@ -0,0 +1,29 @@
+# -*- coding: utf-8 -*-
+# Generated by the protocol buffer compiler.  DO NOT EDIT!
+# source: deephaven_core/proto/ticket.proto
+# Protobuf Python Version: 5.26.1
+"""Generated protocol buffer code."""
+from google.protobuf import descriptor as _descriptor
+from google.protobuf import descriptor_pool as _descriptor_pool
+from google.protobuf import symbol_database as _symbol_database
+from google.protobuf.internal import builder as _builder
+# @@protoc_insertion_point(imports)
+
+_sym_db = _symbol_database.Default()
+
+
+
+
+DESCRIPTOR = _descriptor_pool.Default().AddSerializedFile(b'\n!deephaven_core/proto/ticket.proto\x12!io.deephaven.proto.backplane.grpc\"\x18\n\x06Ticket\x12\x0e\n\x06ticket\x18\x01 \x01(\x0c\"V\n\x0bTypedTicket\x12\x39\n\x06ticket\x18\x01 \x01(\x0b\x32).io.deephaven.proto.backplane.grpc.Ticket\x12\x0c\n\x04type\x18\x02 \x01(\tBBH\x01P\x01Z<github.com/deephaven/deephaven-core/go/internal/proto/ticketb\x06proto3')
+
+_globals = globals()
+_builder.BuildMessageAndEnumDescriptors(DESCRIPTOR, _globals)
+_builder.BuildTopDescriptorsAndMessages(DESCRIPTOR, 'deephaven_core.proto.ticket_pb2', _globals)
+if not _descriptor._USE_C_DESCRIPTORS:
+  _globals['DESCRIPTOR']._loaded_options = None
+  _globals['DESCRIPTOR']._serialized_options = b'H\001P\001Z<github.com/deephaven/deephaven-core/go/internal/proto/ticket'
+  _globals['_TICKET']._serialized_start=72
+  _globals['_TICKET']._serialized_end=96
+  _globals['_TYPEDTICKET']._serialized_start=98
+  _globals['_TYPEDTICKET']._serialized_end=184
+# @@protoc_insertion_point(module_scope)
diff --git a/py/client/pydeephaven/proto/ticket_pb2_grpc.py b/py/client/deephaven_core/proto/ticket_pb2_grpc.py
similarity index 92%
rename from py/client/pydeephaven/proto/ticket_pb2_grpc.py
rename to py/client/deephaven_core/proto/ticket_pb2_grpc.py
index 90a04f1946c..65025680957 100644
--- a/py/client/pydeephaven/proto/ticket_pb2_grpc.py
+++ b/py/client/deephaven_core/proto/ticket_pb2_grpc.py
@@ -19,7 +19,7 @@
 if _version_not_supported:
     warnings.warn(
         f'The grpc package installed is at version {GRPC_VERSION},'
-        + f' but the generated code in deephaven/proto/ticket_pb2_grpc.py depends on'
+        + f' but the generated code in deephaven_core/proto/ticket_pb2_grpc.py depends on'
         + f' grpcio>={GRPC_GENERATED_VERSION}.'
         + f' Please upgrade your grpc module to grpcio>={GRPC_GENERATED_VERSION}'
         + f' or downgrade your generated code using grpcio-tools<={GRPC_VERSION}.'
diff --git a/py/client/pydeephaven/_app_service.py b/py/client/pydeephaven/_app_service.py
index 53889d8e5fd..d18cd65fe4b 100644
--- a/py/client/pydeephaven/_app_service.py
+++ b/py/client/pydeephaven/_app_service.py
@@ -4,7 +4,7 @@
 from typing import Any
 
 from pydeephaven.dherror import DHError
-from pydeephaven.proto import application_pb2_grpc, application_pb2
+from deephaven_core.proto import application_pb2_grpc, application_pb2
 
 
 class AppService:
diff --git a/py/client/pydeephaven/_arrow.py b/py/client/pydeephaven/_arrow.py
index 62e9f40f716..86c8eaf67e4 100644
--- a/py/client/pydeephaven/_arrow.py
+++ b/py/client/pydeephaven/_arrow.py
@@ -23,13 +23,13 @@
     pa.time32('s'): '',
     pa.time32('ms'): '',
     pa.time64('us'): '',
-    pa.time64('ns'): '',
+    pa.time64('ns'): 'java.time.LocalTime',
     pa.timestamp('s'): '',
     pa.timestamp('ms'): '',
     pa.timestamp('us'): '',
     pa.timestamp('ns'): 'java.time.Instant',
     pa.date32(): '',
-    pa.date64(): '',
+    pa.date64(): 'java.time.LocalDate',
     pa.duration('s'): '',
     pa.duration('ms'): '',
     pa.duration('us'): '',
diff --git a/py/client/pydeephaven/_arrow_flight_service.py b/py/client/pydeephaven/_arrow_flight_service.py
index a6f345efc7b..55875fac59e 100644
--- a/py/client/pydeephaven/_arrow_flight_service.py
+++ b/py/client/pydeephaven/_arrow_flight_service.py
@@ -21,7 +21,7 @@ def import_table(self, data: pa.Table) -> Table:
         try:
             if not isinstance(data, (pa.Table, pa.RecordBatch)):
                 raise DHError("source data must be either a pa table or RecordBatch.")
-            ticket = self.session.get_ticket()
+            ticket = self.session.next_export_ticket_number()
             dh_fields = []
             for f in data.schema:
                 dh_fields.append(pa.field(name=f.name, type=f.type, metadata=map_arrow_type(f.type)))
@@ -36,7 +36,7 @@ def import_table(self, data: pa.Table) -> Table:
             # it is possible that by the time the request arrives at the server that it no longer
             # knows what it is for and sends a RST_STREAM causing a failure.
             _ = reader.read()
-            flight_ticket = self.session.make_ticket(ticket)
+            flight_ticket = self.session.make_export_ticket(ticket)
             return Table(self.session, ticket=flight_ticket, size=data.num_rows, schema=dh_schema)
         except Exception as e:
             raise DHError("failed to create a Deephaven table from Arrow data.") from e
@@ -44,7 +44,7 @@ def import_table(self, data: pa.Table) -> Table:
     def do_get_table(self, table: Table) -> pa.Table:
         """Gets a snapshot of a Table via Flight do_get."""
         try:
-            flight_ticket = paflight.Ticket(table.ticket.ticket)
+            flight_ticket = paflight.Ticket(table.ticket.bytes)
             reader = self._flight_client.do_get(
                 flight_ticket,
                 FlightCallOptions(headers=self.session.grpc_metadata))
diff --git a/py/client/pydeephaven/_batch_assembler.py b/py/client/pydeephaven/_batch_assembler.py
index 5192c62c237..16ba26842d1 100644
--- a/py/client/pydeephaven/_batch_assembler.py
+++ b/py/client/pydeephaven/_batch_assembler.py
@@ -18,7 +18,7 @@ def batch(self) -> List[Any]:
 
     def build_batch(self) -> List[Any]:
         """Transforms the table ops into valid chained batch compatible ops."""
-        self._curr_source = table_pb2.TableReference(ticket=self.table_ops[0].table.ticket)
+        self._curr_source = table_pb2.TableReference(ticket=self.table_ops[0].table.pb_ticket)
 
         for table_op in self.table_ops[1:-1]:
             result_id = None
@@ -27,8 +27,8 @@ def build_batch(self) -> List[Any]:
             self._curr_source = table_pb2.TableReference(batch_offset=len(self.grpc_table_ops) - 1)
 
         # the last op in the batch needs a result_id to reference the result
-        result_id = self.session.make_ticket()
+        export_ticket = self.session.make_export_ticket()
         self.grpc_table_ops.append(
-            self.table_ops[-1].make_grpc_request_for_batch(result_id=result_id, source_id=self._curr_source))
+            self.table_ops[-1].make_grpc_request_for_batch(result_id=export_ticket.pb_ticket, source_id=self._curr_source))
 
         return self.grpc_table_ops
diff --git a/py/client/pydeephaven/_config_service.py b/py/client/pydeephaven/_config_service.py
index 63baad3dc5b..19234b88f60 100644
--- a/py/client/pydeephaven/_config_service.py
+++ b/py/client/pydeephaven/_config_service.py
@@ -4,7 +4,7 @@
 from typing import Any, Dict
 
 from pydeephaven.dherror import DHError
-from pydeephaven.proto import config_pb2, config_pb2_grpc
+from deephaven_core.proto import config_pb2, config_pb2_grpc
 
 
 class ConfigService:
diff --git a/py/client/pydeephaven/_console_service.py b/py/client/pydeephaven/_console_service.py
index eb02b6e2db3..ce601945cc3 100644
--- a/py/client/pydeephaven/_console_service.py
+++ b/py/client/pydeephaven/_console_service.py
@@ -4,7 +4,7 @@
 from typing import Any
 
 from pydeephaven.dherror import DHError
-from pydeephaven.proto import console_pb2_grpc, console_pb2
+from deephaven_core.proto import console_pb2_grpc, console_pb2
 from pydeephaven.table import Table
 
 
@@ -22,7 +22,7 @@ def start_console(self):
         with self.session._r_lock:
             if not self.console_id:
                 try:
-                    result_id = self.session.make_ticket()
+                    result_id = self.session.make_export_ticket().pb_ticket
                     response = self.session.wrap_rpc(
                         self._grpc_console_stub.StartConsole,
                         console_pb2.StartConsoleRequest(
@@ -55,7 +55,7 @@ def bind_table(self, table: Table, variable_name: str):
                 self._grpc_console_stub.BindTableToVariable,
                 console_pb2.BindTableToVariableRequest(
                     console_id=self.console_id,
-                    table_id=table.ticket,
+                    table_id=table.pb_ticket,
                     variable_name=variable_name))
         except Exception as e:
             raise DHError("failed to bind a table to a variable on the server.") from e
diff --git a/py/client/pydeephaven/_input_table_service.py b/py/client/pydeephaven/_input_table_service.py
index dbd791075d9..45cfa39133c 100644
--- a/py/client/pydeephaven/_input_table_service.py
+++ b/py/client/pydeephaven/_input_table_service.py
@@ -3,7 +3,7 @@
 #
 from pydeephaven.table import Table
 from pydeephaven.dherror import DHError
-from pydeephaven.proto import inputtable_pb2, inputtable_pb2_grpc
+from deephaven_core.proto import inputtable_pb2, inputtable_pb2_grpc
 from pydeephaven.table import InputTable
 
 
@@ -17,8 +17,8 @@ def add(self, input_table: InputTable, table: Table):
         try:
             self.session.wrap_rpc(
                 self._grpc_input_table_stub.AddTableToInputTable,
-                inputtable_pb2.AddTableRequest(input_table=input_table.ticket,
-                                               table_to_add=table.ticket))
+                inputtable_pb2.AddTableRequest(input_table=input_table.pb_ticket,
+                                               table_to_add=table.pb_ticket))
         except Exception as e:
             raise DHError("failed to add to InputTable") from e
 
@@ -28,7 +28,7 @@ def delete(self, input_table: InputTable, table: Table):
             self.session.wrap_rpc(
                 self._grpc_input_table_stub.DeleteTableFromInputTable,
                 inputtable_pb2.DeleteTableRequest(
-                    input_table=input_table.ticket,
-                    table_to_remove=table.ticket))
+                    input_table=input_table.pb_ticket,
+                    table_to_remove=table.pb_ticket))
         except Exception as e:
             raise DHError("failed to delete from InputTable") from e
diff --git a/py/client/pydeephaven/_plugin_obj_service.py b/py/client/pydeephaven/_plugin_obj_service.py
index b9e1bfc2c5c..a6cb07b1b4a 100644
--- a/py/client/pydeephaven/_plugin_obj_service.py
+++ b/py/client/pydeephaven/_plugin_obj_service.py
@@ -5,7 +5,7 @@
 from typing import Any
 
 from pydeephaven.dherror import DHError
-from pydeephaven.proto import object_pb2_grpc
+from deephaven_core.proto import object_pb2_grpc
 from pydeephaven.experimental.plugin_client import PluginRequestStream
 
 
diff --git a/py/client/pydeephaven/_session_service.py b/py/client/pydeephaven/_session_service.py
index a21b2b74991..eef0ae71ac5 100644
--- a/py/client/pydeephaven/_session_service.py
+++ b/py/client/pydeephaven/_session_service.py
@@ -5,7 +5,8 @@
 import grpc
 
 from pydeephaven.dherror import DHError
-from pydeephaven.proto import session_pb2_grpc, session_pb2, ticket_pb2
+from deephaven_core.proto import session_pb2_grpc, session_pb2, ticket_pb2
+from pydeephaven.ticket import Ticket, ExportTicket
 
 
 class SessionService:
@@ -21,7 +22,7 @@ def connect(self) -> grpc.Channel:
                 root_certificates=self.session._tls_root_certs,
                 private_key=self.session._client_private_key,
                 certificate_chain=self.session._client_cert_chain)
-            grpc_channel = grpc.secure_channel(target, credentials, self.session._client_opts) 
+            grpc_channel = grpc.secure_channel(target, credentials, self.session._client_opts)
         else:
             grpc_channel = grpc.insecure_channel(target, self.session._client_opts)
         self._grpc_session_stub = session_pb2_grpc.SessionServiceStub(grpc_channel)
@@ -38,28 +39,48 @@ def close(self):
         except Exception as e:
             raise DHError("failed to close the session.") from e
 
-    def release(self, ticket):
-        """Releases an exported ticket."""
+    def release(self, ticket: ExportTicket) -> None:
+        """Releases an export ticket."""
         try:
             self.session.wrap_rpc(
                 self._grpc_session_stub.Release,
-                session_pb2.ReleaseRequest(id=ticket))
+                session_pb2.ReleaseRequest(id=ticket.pb_ticket))
         except Exception as e:
             raise DHError("failed to release a ticket.") from e
 
-
-    def publish(self, source_ticket: ticket_pb2.Ticket, result_ticket: ticket_pb2.Ticket) -> None:
+    def publish(self, source_ticket: Ticket, result_ticket: Ticket) -> None:
         """Makes a copy from the source ticket and publishes it to the result ticket.
 
         Args:
-            source_ticket: The source ticket to publish from.
-            result_ticket: The result ticket to publish to.
+            source_ticket (Ticket): The source ticket to publish from.
+            result_ticket (Ticket): The result ticket to publish to.
+
+        Raises:
+            DHError: If the operation fails.
         """
         try:
             self.session.wrap_rpc(
                 self._grpc_session_stub.PublishFromTicket,
                 session_pb2.PublishRequest(
-                    source_id=source_ticket,
-                    result_id=result_ticket))
+                    source_id=source_ticket.pb_ticket,
+                    result_id=result_ticket.pb_ticket))
         except Exception as e:
             raise DHError("failed to publish a ticket.") from e
+
+    def fetch(self, ticket: Ticket) -> ExportTicket:
+        """Fetches a typed ticket from a ticket.
+
+        Args:
+            ticket: The ticket to fetch from.
+
+        Returns:
+            The typed ticket.
+        """
+        try:
+            result_id = self.session.make_export_ticket()
+            self.session.wrap_rpc(
+                self._grpc_session_stub.ExportFromTicket,
+                session_pb2.ExportRequest(source_id=ticket.pb_ticket, result_id=result_id.pb_ticket))
+            return result_id
+        except Exception as e:
+            raise DHError("failed to fetch a ticket.") from e
\ No newline at end of file
diff --git a/py/client/pydeephaven/_table_interface.py b/py/client/pydeephaven/_table_interface.py
index cc11eecf872..4b3655a66b9 100644
--- a/py/client/pydeephaven/_table_interface.py
+++ b/py/client/pydeephaven/_table_interface.py
@@ -15,7 +15,7 @@
 from pydeephaven._table_ops import UpdateOp, LazyUpdateOp, ViewOp, UpdateViewOp, SelectOp, DropColumnsOp, \
     SelectDistinctOp, SortOp, UnstructuredFilterOp, HeadOp, TailOp, HeadByOp, TailByOp, UngroupOp, NaturalJoinOp, \
     ExactJoinOp, CrossJoinOp, AjOp, RajOp, UpdateByOp, SnapshotTableOp, SnapshotWhenTableOp, WhereInTableOp, \
-    AggregateAllOp, AggregateOp, SortDirection
+    SliceOp, AggregateAllOp, AggregateOp, SortDirection
 from pydeephaven._utils import to_list
 from pydeephaven.agg import Aggregation, _AggregationColumns
 from pydeephaven.dherror import DHError
@@ -716,3 +716,43 @@ def where_not_in(self, filter_table: Table, cols: Union[str, List[str]]) -> Unio
         """
         table_op = WhereInTableOp(filter_table=filter_table, cols=to_list(cols), inverted=True)
         return self.table_op_handler(table_op)
+    
+    def slice(self, start: int, stop: int) -> Union[Table, Query]:
+        """Extracts a subset of a table by row positions into a new Table.
+
+        If both the start and the stop are positive, then both are counted from the beginning of the table.
+        The start is inclusive, and the stop is exclusive. slice(0, N) is equivalent to :meth:`~Table.head` (N)
+        The start must be less than or equal to the stop.
+
+        If the start is positive and the stop is negative, then the start is counted from the beginning of the
+        table, inclusively. The stop is counted from the end of the table. For example, slice(1, -1) includes all
+        rows but the first and last. If the stop is before the start, the result is an empty table.
+
+        If the start is negative, and the stop is zero, then the start is counted from the end of the table,
+        and the end of the slice is the size of the table. slice(-N, 0) is equivalent to :meth:`~Table.tail` (N).
+
+        If the start is negative and the stop is negative, they are both counted from the end of the
+        table. For example, slice(-2, -1) returns the second to last row of the table.
+
+        Args:
+            start (int): the first row position to include in the result
+            stop (int): the last row position to include in the result
+
+        Returns:
+            a new Table
+
+        Raises:
+            DHError
+
+        Examples:
+            >>> table.slice(0, 5)    # first 5 rows
+            >>> table.slice(-5, 0)   # last 5 rows
+            >>> table.slice(2, 6)    # rows from index 2 to 5
+            >>> table.slice(6, 2)    # ERROR: cannot slice start after end
+            >>> table.slice(-6, -2)  # rows from 6th last to 2nd last (exclusive)
+            >>> table.slice(-2, -6)  # ERROR: cannot slice start after end
+            >>> table.slice(2, -3)   # all rows except the first 2 and the last 3
+            >>> table.slice(-6, 8)   # rows from 6th last to index 8 (exclusive)
+        """
+        table_op = SliceOp(first_position_inclusive=start, last_position_exclusive=stop)
+        return self.table_op_handler(table_op)
diff --git a/py/client/pydeephaven/_table_ops.py b/py/client/pydeephaven/_table_ops.py
index cbb7830c546..8d077d2126d 100644
--- a/py/client/pydeephaven/_table_ops.py
+++ b/py/client/pydeephaven/_table_ops.py
@@ -9,7 +9,7 @@
 
 from pydeephaven._arrow import map_arrow_type
 from pydeephaven.agg import Aggregation
-from pydeephaven.proto import table_pb2, table_pb2_grpc
+from deephaven_core.proto import table_pb2, table_pb2_grpc
 from pydeephaven.updateby import UpdateByOperation
 
 
@@ -345,7 +345,7 @@ def get_stub_func(cls, table_service_stub: table_pb2_grpc.TableServiceStub) -> A
     def make_grpc_request(self, result_id, source_id) -> Any:
         table_references = []
         for tbl in self.tables:
-            table_references.append(table_pb2.TableReference(ticket=tbl.ticket))
+            table_references.append(table_pb2.TableReference(ticket=tbl.pb_ticket))
 
         return table_pb2.MergeTablesRequest(result_id=result_id,
                                             source_ids=table_references,
@@ -368,7 +368,7 @@ def get_stub_func(cls, table_service_stub: table_pb2_grpc.TableServiceStub) -> A
 
     def make_grpc_request(self, result_id, source_id) -> Any:
         left_id = source_id
-        right_id = table_pb2.TableReference(ticket=self.table.ticket)
+        right_id = table_pb2.TableReference(ticket=self.table.pb_ticket)
         return table_pb2.NaturalJoinTablesRequest(result_id=result_id,
                                                   left_id=left_id,
                                                   right_id=right_id,
@@ -392,7 +392,7 @@ def get_stub_func(cls, table_service_stub: table_pb2_grpc.TableServiceStub) -> A
 
     def make_grpc_request(self, result_id, source_id) -> Any:
         left_id = source_id
-        right_id = table_pb2.TableReference(ticket=self.table.ticket)
+        right_id = table_pb2.TableReference(ticket=self.table.pb_ticket)
         return table_pb2.ExactJoinTablesRequest(result_id=result_id,
                                                 left_id=left_id,
                                                 right_id=right_id,
@@ -417,7 +417,7 @@ def get_stub_func(cls, table_service_stub: table_pb2_grpc.TableServiceStub) -> A
 
     def make_grpc_request(self, result_id, source_id) -> Any:
         left_id = source_id
-        right_id = table_pb2.TableReference(ticket=self.table.ticket)
+        right_id = table_pb2.TableReference(ticket=self.table.pb_ticket)
         return table_pb2.CrossJoinTablesRequest(result_id=result_id,
                                                 left_id=left_id,
                                                 right_id=right_id,
@@ -442,7 +442,7 @@ def get_stub_func(cls, table_service_stub: table_pb2_grpc.TableServiceStub) -> A
 
     def make_grpc_request(self, result_id, source_id) -> Any:
         left_id = source_id
-        right_id = table_pb2.TableReference(ticket=self.table.ticket)
+        right_id = table_pb2.TableReference(ticket=self.table.pb_ticket)
         return table_pb2.AjRajTablesRequest(result_id=result_id,
                                             left_id=left_id,
                                             right_id=right_id,
@@ -467,7 +467,7 @@ def get_stub_func(cls, table_service_stub: table_pb2_grpc.TableServiceStub) -> A
 
     def make_grpc_request(self, result_id, source_id) -> Any:
         left_id = source_id
-        right_id = table_pb2.TableReference(ticket=self.table.ticket)
+        right_id = table_pb2.TableReference(ticket=self.table.pb_ticket)
         return table_pb2.AjRajTablesRequest(result_id=result_id,
                                             left_id=left_id,
                                             right_id=right_id,
@@ -554,7 +554,7 @@ def get_stub_func(cls, table_service_stub: table_pb2_grpc.TableServiceStub) -> A
 
     def make_grpc_request(self, result_id, source_id) -> Any:
         base_id = source_id
-        trigger_id = table_pb2.TableReference(ticket=self.trigger_table.ticket)
+        trigger_id = table_pb2.TableReference(ticket=self.trigger_table.pb_ticket)
         return table_pb2.SnapshotWhenTableRequest(result_id=result_id,
                                                   base_id=base_id,
                                                   trigger_id=trigger_id,
@@ -642,7 +642,7 @@ def make_grpc_request(self, result_id, source_id) -> Any:
                                                      schema=schema,
                                                      kind=input_table_kind)
         else:
-            source_table_id = table_pb2.TableReference(ticket=self.init_table.ticket)
+            source_table_id = table_pb2.TableReference(ticket=self.init_table.pb_ticket)
             return table_pb2.CreateInputTableRequest(result_id=result_id,
                                                      source_table_id=source_table_id,
                                                      kind=input_table_kind)
@@ -664,7 +664,7 @@ def get_stub_func(cls, table_service_stub: table_pb2_grpc.TableServiceStub) -> A
         return table_service_stub.WhereIn
 
     def make_grpc_request(self, result_id, source_id) -> Any:
-        right_id = table_pb2.TableReference(ticket=self.filter_table.ticket)
+        right_id = table_pb2.TableReference(ticket=self.filter_table.pb_ticket)
         return table_pb2.WhereInRequest(result_id=result_id,
                                         left_id=source_id,
                                         right_id=right_id,
@@ -676,6 +676,25 @@ def make_grpc_request_for_batch(self, result_id, source_id) -> Any:
             where_in=self.make_grpc_request(result_id=result_id, source_id=source_id))
 
 
+class SliceOp(TableOp):
+    def __init__(self, first_position_inclusive: int, last_position_exclusive: int):
+        self.first_position_inclusive = first_position_inclusive
+        self.last_position_exclusive = last_position_exclusive
+    
+    @classmethod
+    def get_stub_func(cls, table_service_stub: table_pb2_grpc.TableServiceStub) -> Any:
+        return table_service_stub.Slice
+    
+    def make_grpc_request(self, result_id, source_id) -> Any:
+        return table_pb2.SliceRequest(result_id=result_id, source_id=source_id,
+                                      first_position_inclusive=self.first_position_inclusive,
+                                      last_position_exclusive=self.last_position_exclusive)
+    
+    def make_grpc_request_for_batch(self, result_id, source_id) -> Any:
+        return table_pb2.BatchTableRequest.Operation(
+            slice=self.make_grpc_request(result_id=result_id, source_id=source_id))
+
+
 class MetaTableOp(TableOp):
     @classmethod
     def get_stub_func(cls, table_service_stub: table_pb2_grpc.TableServiceStub) -> Any:
@@ -687,3 +706,26 @@ def make_grpc_request(self, result_id, source_id) -> Any:
     def make_grpc_request_for_batch(self, result_id, source_id) -> Any:
         return table_pb2.BatchTableRequest.Operation(
             meta_table=self.make_grpc_request(result_id=result_id, source_id=source_id))
+
+
+class MultijoinTablesOp(TableOp):
+    def __init__(self, multi_join_inputs: List["MultiJoinInput"]):
+        self.multi_join_inputs = multi_join_inputs
+
+    @classmethod
+    def get_stub_func(cls, table_service_stub: table_pb2_grpc.TableServiceStub) -> Any:
+        return table_service_stub.MultiJoinTables
+
+    def make_grpc_request(self, result_id, source_id) -> Any:
+        pb_inputs = []
+        for mji in self.multi_join_inputs:
+            source_id = table_pb2.TableReference(ticket=mji.table.ticket.pb_ticket)
+            columns_to_match = mji.on
+            columns_to_add = mji.joins
+            pb_inputs.append(table_pb2.MultiJoinInput(source_id=source_id, columns_to_match=columns_to_match,
+                                                   columns_to_add=columns_to_add))
+        return table_pb2.MultiJoinTablesRequest(result_id=result_id, multi_join_inputs=pb_inputs)
+
+    def make_grpc_request_for_batch(self, result_id, source_id) -> Any:
+        return table_pb2.BatchTableRequest.Operation(
+            multi_join=self.make_grpc_request(result_id=result_id, source_id=source_id))
\ No newline at end of file
diff --git a/py/client/pydeephaven/_table_service.py b/py/client/pydeephaven/_table_service.py
index 749f43f5a0f..c23107c9c81 100644
--- a/py/client/pydeephaven/_table_service.py
+++ b/py/client/pydeephaven/_table_service.py
@@ -1,13 +1,14 @@
 #
 # Copyright (c) 2016-2024 Deephaven Data Labs and Patent Pending
 #
-from typing import Union, List
+from typing import Union, List, Optional
 
 from pydeephaven._batch_assembler import BatchOpAssembler
 from pydeephaven._table_ops import TableOp
 from pydeephaven.dherror import DHError
-from pydeephaven.proto import table_pb2_grpc, table_pb2
+from deephaven_core.proto import table_pb2_grpc, table_pb2
 from pydeephaven.table import Table, InputTable
+from pydeephaven.ticket import ExportTicket, Ticket, _ticket_from_proto
 
 
 class TableService:
@@ -29,7 +30,7 @@ def batch(self, ops: List[TableOp]) -> Table:
                 if not exported.success:
                     raise DHError(exported.error_info)
                 if exported.result_id.WhichOneof("ref") == "ticket":
-                    exported_tables.append(Table(self.session, ticket=exported.result_id.ticket,
+                    exported_tables.append(Table(self.session, ticket=ExportTicket(ticket_bytes=exported.result_id.ticket.ticket),
                                                  schema_header=exported.schema_header,
                                                  size=exported.size,
                                                  is_static=exported.is_static))
@@ -37,22 +38,22 @@ def batch(self, ops: List[TableOp]) -> Table:
         except Exception as e:
             raise DHError("failed to finish the table batch operation.") from e
 
-    def grpc_table_op(self, table: Table, op: TableOp, table_class: type = Table) -> Union[Table, InputTable]:
+    def grpc_table_op(self, table: Optional[Table], op: TableOp, table_class: type = Table) -> Union[Table, InputTable]:
         """Makes a single gRPC Table operation call and returns a new Table."""
         try:
-            result_id = self.session.make_ticket()
+            export_ticket = self.session.make_export_ticket()
             if table:
-                table_reference = table_pb2.TableReference(ticket=table.ticket)
+                table_reference = table_pb2.TableReference(ticket=table.pb_ticket)
             else:
                 table_reference = None
             stub_func = op.__class__.get_stub_func(self._grpc_table_stub)
             response = self.session.wrap_rpc(
                 stub_func,
                 op.make_grpc_request(
-                    result_id=result_id,
+                    result_id=export_ticket.pb_ticket,
                     source_id=table_reference))
             if response.success:
-                return table_class(self.session, ticket=response.result_id.ticket,
+                return table_class(self.session, ticket=ExportTicket(response.result_id.ticket.ticket),
                                    schema_header=response.schema_header,
                                    size=response.size,
                                    is_static=response.is_static)
@@ -66,8 +67,10 @@ def fetch_etcr(self, ticket) -> Table:
         response = self.session.wrap_rpc(
             self._grpc_table_stub.GetExportedTableCreationResponse,
             ticket)
+
+        ticket = _ticket_from_proto(response.result_id.ticket)
         if response.success:
-            return Table(self.session, ticket=response.result_id.ticket,
+            return Table(self.session, ticket=ticket,
                          schema_header=response.schema_header,
                          size=response.size,
                          is_static=response.is_static)
diff --git a/py/client/pydeephaven/agg.py b/py/client/pydeephaven/agg.py
index 5d95004231b..de937e4be80 100644
--- a/py/client/pydeephaven/agg.py
+++ b/py/client/pydeephaven/agg.py
@@ -5,16 +5,19 @@
 
 from abc import ABC, abstractmethod
 from dataclasses import dataclass
-from typing import List, Union, Any
+from typing import List, Union, Any, Optional
 
 import numpy as np
 
 from pydeephaven._utils import to_list
-from pydeephaven.proto import table_pb2
+from deephaven_core.proto import table_pb2
 
+_GrpcSelectable = table_pb2.Selectable
 _GrpcAggregation = table_pb2.Aggregation
 _GrpcAggregationColumns = _GrpcAggregation.AggregationColumns
 _GrpcAggregationCount = _GrpcAggregation.AggregationCount
+_GrpcAggregationCountWhere = _GrpcAggregation.AggregationCountWhere
+_GrpcAggregationFormula = _GrpcAggregation.AggregationFormula
 _GrpcAggregationPartition = _GrpcAggregation.AggregationPartition
 _GrpcAggSpec = table_pb2.AggSpec
 _GrpcNullValue = table_pb2.NullValue
@@ -50,6 +53,25 @@ def make_grpc_message(self) -> _GrpcAggregation:
         return _GrpcAggregation(count=agg_count)
 
 
+@dataclass
+class _AggregationCountWhere(Aggregation):
+    col: str
+    filters: Union[str, List[str]]
+
+    def make_grpc_message(self) -> _GrpcAggregation:
+        agg_count_where = _GrpcAggregationCountWhere(column_name=self.col, filters=to_list(self.filters))
+        return _GrpcAggregation(count_where=agg_count_where)
+
+
+@dataclass
+class _AggregationFormula(Aggregation):
+    selectable: _GrpcSelectable
+
+    def make_grpc_message(self) -> _GrpcAggregation:
+        agg_formula = _GrpcAggregationFormula(selectable=self.selectable)
+        return _GrpcAggregation(formula=agg_formula)
+
+
 @dataclass
 class _AggregationPartition(Aggregation):
     col: str
@@ -64,7 +86,7 @@ def sum_(cols: Union[str, List[str]] = None) -> Aggregation:
     """Creates a Sum aggregation.
 
     Args:
-        cols (Union[str, List[str]]): the column(s) to aggregate on, can be renaming expressions, i.e. "new_col = col";
+        cols (Union[str, List[str]]): the column(s) to aggregate, can be renaming expressions, i.e. "new_col = col";
             default is None, only valid when used in Table agg_all_by operation
 
     Returns:
@@ -78,7 +100,7 @@ def abs_sum(cols: Union[str, List[str]] = None) -> Aggregation:
     """Creates an Absolute-sum aggregation.
 
     Args:
-        cols (Union[str, List[str]]): the column(s) to aggregate on, can be renaming expressions, i.e. "new_col = col";
+        cols (Union[str, List[str]]): the column(s) to aggregate, can be renaming expressions, i.e. "new_col = col";
             default is None, only valid when used in Table agg_all_by operation
 
     Returns:
@@ -92,7 +114,7 @@ def group(cols: Union[str, List[str]] = None) -> Aggregation:
     """Creates a Group aggregation.
 
     Args:
-        cols (Union[str, List[str]]): the column(s) to aggregate on, can be renaming expressions, i.e. "new_col = col";
+        cols (Union[str, List[str]]): the column(s) to aggregate, can be renaming expressions, i.e. "new_col = col";
             default is None, only valid when used in Table agg_all_by operation
 
     Returns:
@@ -106,7 +128,7 @@ def avg(cols: Union[str, List[str]] = None) -> Aggregation:
     """Creates an Average aggregation.
 
     Args:
-        cols (Union[str, List[str]]): the column(s) to aggregate on, can be renaming expressions, i.e. "new_col = col";
+        cols (Union[str, List[str]]): the column(s) to aggregate, can be renaming expressions, i.e. "new_col = col";
             default is None, only valid when used in Table agg_all_by operation
 
     Returns:
@@ -128,6 +150,18 @@ def count_(col: str) -> Aggregation:
     return _AggregationCount(col=col)
 
 
+def count_where(col: str, filters: Union[str, List[str]]) -> Aggregation:
+    """Creates a Count aggregation. This is not supported in 'Table.agg_all_by'.
+
+    Args:
+        col (str): the column to hold the counts of each distinct group
+
+    Returns:
+        an aggregation
+    """
+    return _AggregationCountWhere(col=col, filters=to_list(filters))
+
+
 def partition(col: str, include_by_columns: bool = True) -> Aggregation:
     """Creates a Partition aggregation. This is not supported in 'Table.agg_all_by'.
 
@@ -146,7 +180,7 @@ def count_distinct(cols: Union[str, List[str]] = None, count_nulls: bool = False
     each of the given columns.
 
     Args:
-        cols (Union[str, List[str]]): the column(s) to aggregate on, can be renaming expressions, i.e. "new_col = col";
+        cols (Union[str, List[str]]): the column(s) to aggregate, can be renaming expressions, i.e. "new_col = col";
             default is None, only valid when used in Table agg_all_by operation
         count_nulls (bool): whether null values should be counted, default is False
 
@@ -161,7 +195,7 @@ def first(cols: Union[str, List[str]] = None) -> Aggregation:
     """Creates a First aggregation.
 
     Args:
-        cols (Union[str, List[str]]): the column(s) to aggregate on, can be renaming expressions, i.e. "new_col = col";
+        cols (Union[str, List[str]]): the column(s) to aggregate, can be renaming expressions, i.e. "new_col = col";
             default is None, only valid when used in Table agg_all_by operation
 
     Returns:
@@ -171,31 +205,48 @@ def first(cols: Union[str, List[str]] = None) -> Aggregation:
     return _AggregationColumns(agg_spec=agg_spec, cols=to_list(cols))
 
 
-def formula(formula: str, formula_param: str, cols: Union[str, List[str]] = None) -> Aggregation:
+def formula(formula: str, formula_param: Optional[str] = None, cols: Optional[Union[str, List[str]]] = None) -> Aggregation:
     """Creates a user defined formula aggregation. This formula can contain a combination of any of the following:
         |  Built-in functions such as `min`, `max`, etc.
         |  Mathematical arithmetic such as `*`, `+`, `/`, etc.
         |  User-defined functions
 
+    There are two variants of this call. The preferred variant requires the formula to provide the output column name
+    and specific input column names in the following format:
+        |  formula('output_col=(input_col1 + input_col2) * input_col3')
+    This form does not accept `formula_param` or `cols` arguments because the input and output columns are explicitly
+    set within the formula string.
+
+    The second (deprecated) variant allows the user to apply a formula expression to one input column, producing one
+    output column. In this call the `formula_param` is used as a placeholder for the input column name and the `cols`
+    argument is used to identify the output column name and the input source column when applying the formula. If
+    multiple input/output pairs are specified in the `cols` argument, the formula will be applied to each column in the
+    list.
+
     Args:
-        formula (str): the user defined formula to apply to each group.
-        formula_param (str): the parameter name for the input column's vector within the formula. If formula is
-            `max(each)`, then `each` is the formula_param.
-        cols (Union[str, List[str]]): the column(s) to aggregate on, can be renaming expressions, i.e. "new_col = col";
-            default is None, only valid when used in Table agg_all_by operation
+        formula (str): the user defined formula to apply
+        formula_param (Optional[str]): If provided, supplies the parameter name for the input column's vector within the
+            formula. If formula is `max(each)`, then `each` should be the formula_param. This must be set to None (the
+            default when omitted) when the `formula`argument specifies the input and output columns.
+        cols (Optional[Union[str, List[str]]]): If provided, supplies the column(s) to aggregate, can be renaming
+            expressions, i.e. "new_col = col". This must be set to None (the default when omitted) when the `formula`
+            argument specifies the input and output columns.
 
     Returns:
         an aggregation
     """
-    agg_spec = _GrpcAggSpec(formula=_GrpcAggSpec.AggSpecFormula(formula=formula, param_token=formula_param))
-    return _AggregationColumns(agg_spec=agg_spec, cols=to_list(cols))
+    if formula_param:
+        agg_spec = _GrpcAggSpec(formula=_GrpcAggSpec.AggSpecFormula(formula=formula, param_token=formula_param))
+        return _AggregationColumns(agg_spec=agg_spec, cols=to_list(cols))
+    selectable = _GrpcSelectable(raw=formula)
+    return _AggregationFormula(selectable=selectable)
 
 
 def last(cols: Union[str, List[str]] = None) -> Aggregation:
     """Creates a Last aggregation.
 
     Args:
-        cols (Union[str, List[str]]): the column(s) to aggregate on, can be renaming expressions, i.e. "new_col = col";
+        cols (Union[str, List[str]]): the column(s) to aggregate, can be renaming expressions, i.e. "new_col = col";
             default is None, only valid when used in Table agg_all_by operation
 
     Returns:
@@ -209,7 +260,7 @@ def min_(cols: Union[str, List[str]] = None) -> Aggregation:
     """Creates a Min aggregation.
 
     Args:
-        cols (Union[str, List[str]]): the column(s) to aggregate on, can be renaming expressions, i.e. "new_col = col";
+        cols (Union[str, List[str]]): the column(s) to aggregate, can be renaming expressions, i.e. "new_col = col";
             default is None, only valid when used in Table agg_all_by operation
 
     Returns:
@@ -223,7 +274,7 @@ def max_(cols: Union[str, List[str]] = None) -> Aggregation:
     """Creates a Max aggregation.
 
     Args:
-        cols (Union[str, List[str]]): the column(s) to aggregate on, can be renaming expressions, i.e. "new_col = col";
+        cols (Union[str, List[str]]): the column(s) to aggregate, can be renaming expressions, i.e. "new_col = col";
             default is None, only valid when used in Table agg_all_by operation
 
     Returns:
@@ -238,7 +289,7 @@ def median(cols: Union[str, List[str]] = None, average_evenly_divided: bool = Tr
     given columns.
 
     Args:
-        cols (Union[str, List[str]]): the column(s) to aggregate on, can be renaming expressions, i.e. "new_col = col";
+        cols (Union[str, List[str]]): the column(s) to aggregate, can be renaming expressions, i.e. "new_col = col";
             default is None, only valid when used in Table agg_all_by operation
         average_evenly_divided (bool): when the group size is an even number, whether to average the two middle values
             for the output value. When set to True, average the two middle values. When set to False, use the smaller
@@ -257,7 +308,7 @@ def pct(percentile: float, cols: Union[str, List[str]] = None, average_evenly_di
 
     Args:
         percentile (float): the percentile used for calculation
-        cols (Union[str, List[str]]): the column(s) to aggregate on, can be renaming expressions, i.e. "new_col = col";
+        cols (Union[str, List[str]]): the column(s) to aggregate, can be renaming expressions, i.e. "new_col = col";
             default is None, only valid when used in Table agg_all_by operation
         average_evenly_divided (bool): when the percentile splits the group into two halves, whether to average the two
             middle values for the output value. When set to True, average the two middle values. When set to False, use
@@ -276,7 +327,7 @@ def sorted_first(order_by: str, cols: Union[str, List[str]] = None) -> Aggregati
 
     Args:
         order_by (str): the column to sort by
-        cols (Union[str, List[str]]): the column(s) to aggregate on, can be renaming expressions, i.e. "new_col = col";
+        cols (Union[str, List[str]]): the column(s) to aggregate, can be renaming expressions, i.e. "new_col = col";
             default is None, only valid when used in Table agg_all_by operation
 
     Returns:
@@ -292,7 +343,7 @@ def sorted_last(order_by: str, cols: Union[str, List[str]] = None) -> Aggregatio
 
     Args:
         order_by (str): the column to sort by
-        cols (Union[str, List[str]]): the column(s) to aggregate on, can be renaming expressions, i.e. "new_col = col";
+        cols (Union[str, List[str]]): the column(s) to aggregate, can be renaming expressions, i.e. "new_col = col";
             default is None, only valid when used in Table agg_all_by operation
 
     Returns:
@@ -310,7 +361,7 @@ def std(cols: Union[str, List[str]] = None) -> Aggregation:
     which ensures that the sample variance will be an unbiased estimator of population variance.
 
     Args:
-        cols (Union[str, List[str]]): the column(s) to aggregate on, can be renaming expressions, i.e. "new_col = col";
+        cols (Union[str, List[str]]): the column(s) to aggregate, can be renaming expressions, i.e. "new_col = col";
             default is None, only valid when used in Table agg_all_by operation
 
     Returns:
@@ -327,7 +378,7 @@ def unique(cols: Union[str, List[str]] = None, include_nulls: bool = False,
     result is the specified non_unique_sentinel value (defaults to null).
 
     Args:
-        cols (Union[str, List[str]]): the column(s) to aggregate on, can be renaming expressions, i.e. "new_col = col";
+        cols (Union[str, List[str]]): the column(s) to aggregate, can be renaming expressions, i.e. "new_col = col";
             default is None, only valid when used in Table agg_all_by operation
         include_nulls (bool): whether null is treated as a value for the purpose of determining if the values in the
             aggregation group are unique, default is False.
@@ -379,7 +430,7 @@ def var(cols: Union[str, List[str]] = None) -> Aggregation:
     which ensures that the sample variance will be an unbiased estimator of population variance.
 
     Args:
-        cols (Union[str, List[str]]): the column(s) to aggregate on, can be renaming expressions, i.e. "new_col = col";
+        cols (Union[str, List[str]]): the column(s) to aggregate, can be renaming expressions, i.e. "new_col = col";
             default is None, only valid when used in Table agg_all_by operation
 
     Returns:
@@ -394,7 +445,7 @@ def weighted_avg(wcol: str, cols: Union[str, List[str]] = None) -> Aggregation:
 
     Args:
         wcol (str): the name of the weight column
-        cols (Union[str, List[str]]): the column(s) to aggregate on, can be renaming expressions, i.e. "new_col = col";
+        cols (Union[str, List[str]]): the column(s) to aggregate, can be renaming expressions, i.e. "new_col = col";
             default is None, only valid when used in Table agg_all_by operation
 
     Returns:
@@ -409,7 +460,7 @@ def weighted_sum(wcol: str, cols: Union[str, List[str]] = None) -> Aggregation:
 
     Args:
         wcol (str): the name of the weight column
-        cols (Union[str, List[str]]): the column(s) to aggregate on, can be renaming expressions, i.e. "new_col = col";
+        cols (Union[str, List[str]]): the column(s) to aggregate, can be renaming expressions, i.e. "new_col = col";
             default is None, only valid when used in Table agg_all_by operation
 
     Returns:
@@ -424,7 +475,7 @@ def distinct(cols: Union[str, List[str]] = None, include_nulls: bool = False) ->
     given columns and stores them as vectors.
 
     Args:
-        cols (Union[str, List[str]]): the column(s) to aggregate on, can be renaming expressions, i.e. "new_col = col";
+        cols (Union[str, List[str]]): the column(s) to aggregate, can be renaming expressions, i.e. "new_col = col";
             default is None, only valid when used in Table agg_all_by operation
         include_nulls (bool): whether nulls should be included as distinct values, default is False
 
diff --git a/py/client/pydeephaven/experimental/plugin_client.py b/py/client/pydeephaven/experimental/plugin_client.py
index 84d3221bc7a..b42a736c5c4 100644
--- a/py/client/pydeephaven/experimental/plugin_client.py
+++ b/py/client/pydeephaven/experimental/plugin_client.py
@@ -7,13 +7,13 @@
 """
 import threading
 from queue import SimpleQueue
-from typing import Any, List, Union
+from typing import Any, List, Union, Tuple
 
-from pydeephaven.proto import object_pb2
-from pydeephaven.proto import ticket_pb2
-from .server_object import ServerObject
+from deephaven_core.proto import object_pb2
+from deephaven_core.proto import ticket_pb2
 from pydeephaven.dherror import DHError
 from pydeephaven.table import Table
+from pydeephaven.ticket import ExportTicket, ServerObject
 
 
 class PluginClient(ServerObject):
@@ -22,18 +22,26 @@ class PluginClient(ServerObject):
     Use resp_stream to read messages that the server has sent, and req_stream to send messages back to the server, if
     supported.
     """
-
-    def __init__(self, session: 'pydeephaven.session.Session', exportable_obj: ticket_pb2.Ticket):
-        super().__init__(type_=exportable_obj.type, ticket=exportable_obj.ticket)
+    def __init__(self, session: 'pydeephaven.session.Session', server_obj: ServerObject):
+        self.export_ticket = None
+        # make sure we have an ExportTicket on the server object so that it will remain alive for
+        # the lifespan of this PluginClient
+        if not isinstance(server_obj.ticket, ExportTicket):
+            self.export_ticket = session.fetch(server_obj.ticket)
+            self.server_obj = ServerObject(type=server_obj.type, ticket=self.export_ticket)
+        else:
+            self.server_obj = server_obj
         self.session = session
-        self.exportable_obj = exportable_obj
-        self.req_stream = PluginRequestStream(SimpleQueue(), self.exportable_obj)
+        self.req_stream = PluginRequestStream(SimpleQueue(), self.server_obj.pb_typed_ticket)
         self.resp_stream = PluginResponseStream(self._open(), self.session)
+        super().__init__(type=self.server_obj.type, ticket=self.server_obj.ticket)
 
     def _open(self) -> Any:
         return self.session.plugin_object_service.message_stream(self.req_stream)
 
     def close(self) -> None:
+        if self.export_ticket:
+            self.session.release(self.export_ticket)
         self.req_stream.close()
         self.resp_stream.close()
 
@@ -44,9 +52,9 @@ class Fetchable(ServerObject):
     """
 
     def __init__(self, session, typed_ticket: ticket_pb2.TypedTicket):
-        super().__init__(type_=typed_ticket.type, ticket=typed_ticket.ticket)
+        export_ticket = ExportTicket(typed_ticket.ticket.ticket)
+        super().__init__(type=typed_ticket.type, ticket=export_ticket)
         self.session = session
-        self.typed_ticket = typed_ticket
 
     def fetch(self) -> Union[Table, PluginClient]:
         """
@@ -56,15 +64,15 @@ def fetch(self) -> Union[Table, PluginClient]:
         this method will also close the other, take care when signaling that it is safe to release this object on
         the server.
         """
-        if self.typed_ticket.type is None:
+        if self.pb_typed_ticket.type is None:
             raise DHError("Cannot fetch an object with no type, the server has no ObjectType plugin registered to "
                           "support it.")
-        if self.typed_ticket.type == 'Table':
-            return self.session.table_service.fetch_etcr(self.typed_ticket.ticket)
-        return PluginClient(self.session, self.typed_ticket)
+        if self.pb_typed_ticket.type == 'Table':
+            return self.session.table_service.fetch_etcr(self.pb_typed_ticket.ticket)
+        return PluginClient(self.session, self)
 
     def close(self) -> None:
-        self.session.release(self.typed_ticket)
+        self.session.release(self.pb_typed_ticket)
 
 
 class PluginRequestStream:
@@ -73,7 +81,7 @@ class PluginRequestStream:
     in the order they are sent.
     """
 
-    def __init__(self, req_queue: SimpleQueue, source_ticket):
+    def __init__(self, req_queue: SimpleQueue, source_ticket: ticket_pb2.TypedTicket):
         self.req_queue = req_queue
         connect_req = object_pb2.ConnectRequest(source_id=source_ticket)
         stream_req = object_pb2.StreamRequest(connect=connect_req)
@@ -84,7 +92,7 @@ def write(self, payload: bytes, references: List[ServerObject]) -> None:
         """
         Sends a message to the server, consisting of a payload of bytes and a list of objects that exist on the server.
         """
-        data_message = object_pb2.ClientData(payload=payload, references=[obj.typed_ticket() for obj in references])
+        data_message = object_pb2.ClientData(payload=payload, references=[obj.pb_typed_ticket() for obj in references])
         stream_req = object_pb2.StreamRequest(data=data_message)
         self.req_queue.put(stream_req)
 
@@ -112,7 +120,7 @@ def __init__(self, stream_resp, session: 'pydeephaven.session.Session'):
         self.session = session
         self._rlock = threading.RLock()
 
-    def __next__(self):
+    def __next__(self) -> Tuple[bytes, List[Fetchable]]:
         with self._rlock:
             if not self.stream_resp:
                 raise RuntimeError("the response stream is closed.")
diff --git a/py/client/pydeephaven/experimental/server_object.py b/py/client/pydeephaven/experimental/server_object.py
deleted file mode 100644
index 337d73916e0..00000000000
--- a/py/client/pydeephaven/experimental/server_object.py
+++ /dev/null
@@ -1,35 +0,0 @@
-#
-# Copyright (c) 2016-2024 Deephaven Data Labs and Patent Pending
-#
-
-import dataclasses
-from pydeephaven.proto import ticket_pb2
-from typing import Optional
-
-
-"""
-A simple supertype to use when defining objects that exist on the server which can be referenced by the client.
-"""
-
-
-@dataclasses.dataclass
-class ServerObject:
-    """
-    Implementations of this type are client-side representations of objects that actually exist on the Deephaven server.
-    Presently used to enable the client API users to send and receive references to server-side plugins.
-
-    Marked as "experimental" for now, as we work to improve the client plugin experience.
-    """
-
-    type_: Optional[str]
-    """The type of the object. May be None, indicating that the instance cannot be connected to or otherwise directly
-    used from the client."""
-
-    ticket: ticket_pb2.Ticket
-    """The ticket that points to the object on the server."""
-
-    def typed_ticket(self) -> ticket_pb2.TypedTicket:
-        """
-        Returns a typed ticket, suitable for use in communicating with an ObjectType plugin on the server.
-        """
-        return ticket_pb2.TypedTicket(type=self.type_, ticket=self.ticket)
diff --git a/py/client/pydeephaven/proto/__init__.py b/py/client/pydeephaven/proto/__init__.py
index 1cfb81b0580..ab842cc6670 100644
--- a/py/client/pydeephaven/proto/__init__.py
+++ b/py/client/pydeephaven/proto/__init__.py
@@ -2,3 +2,20 @@
 # Copyright (c) 2016-2024 Deephaven Data Labs and Patent Pending
 #
 
+# Re-export the generated protobuf and gRPC modules in their old locations
+from deephaven_core.proto import application_pb2, application_pb2_grpc
+from deephaven_core.proto import config_pb2, config_pb2_grpc
+from deephaven_core.proto import console_pb2, console_pb2_grpc
+from deephaven_core.proto import hierarchicaltable_pb2, hierarchicaltable_pb2_grpc
+from deephaven_core.proto import inputtable_pb2, inputtable_pb2_grpc
+from deephaven_core.proto import object_pb2, object_pb2_grpc
+from deephaven_core.proto import partitionedtable_pb2, partitionedtable_pb2_grpc
+from deephaven_core.proto import session_pb2, session_pb2_grpc
+from deephaven_core.proto import storage_pb2, storage_pb2_grpc
+from deephaven_core.proto import table_pb2, table_pb2_grpc
+from deephaven_core.proto import ticket_pb2
+
+# Log a warning that users should update imports
+from warnings import warn
+
+warn('The pydeephaven.proto namespace is deprecated, please use deephaven_core.proto instead. Deprecated in 0.37.0. Will be removed in 0.39.0', FutureWarning, stacklevel=2)
diff --git a/py/client/pydeephaven/proto/application_pb2.py b/py/client/pydeephaven/proto/application_pb2.py
deleted file mode 100644
index a532e5f1b70..00000000000
--- a/py/client/pydeephaven/proto/application_pb2.py
+++ /dev/null
@@ -1,34 +0,0 @@
-# -*- coding: utf-8 -*-
-# Generated by the protocol buffer compiler.  DO NOT EDIT!
-# source: deephaven/proto/application.proto
-# Protobuf Python Version: 5.26.1
-"""Generated protocol buffer code."""
-from google.protobuf import descriptor as _descriptor
-from google.protobuf import descriptor_pool as _descriptor_pool
-from google.protobuf import symbol_database as _symbol_database
-from google.protobuf.internal import builder as _builder
-# @@protoc_insertion_point(imports)
-
-_sym_db = _symbol_database.Default()
-
-
-from pydeephaven.proto import ticket_pb2 as deephaven_dot_proto_dot_ticket__pb2
-
-
-DESCRIPTOR = _descriptor_pool.Default().AddSerializedFile(b'\n!deephaven/proto/application.proto\x12!io.deephaven.proto.backplane.grpc\x1a\x1c\x64\x65\x65phaven/proto/ticket.proto\"\x13\n\x11ListFieldsRequest\"\xd1\x01\n\x12\x46ieldsChangeUpdate\x12=\n\x07\x63reated\x18\x01 \x03(\x0b\x32,.io.deephaven.proto.backplane.grpc.FieldInfo\x12=\n\x07updated\x18\x02 \x03(\x0b\x32,.io.deephaven.proto.backplane.grpc.FieldInfo\x12=\n\x07removed\x18\x03 \x03(\x0b\x32,.io.deephaven.proto.backplane.grpc.FieldInfo\"\xb2\x01\n\tFieldInfo\x12\x44\n\x0ctyped_ticket\x18\x01 \x01(\x0b\x32..io.deephaven.proto.backplane.grpc.TypedTicket\x12\x12\n\nfield_name\x18\x02 \x01(\t\x12\x19\n\x11\x66ield_description\x18\x03 \x01(\t\x12\x18\n\x10\x61pplication_name\x18\x04 \x01(\t\x12\x16\n\x0e\x61pplication_id\x18\x05 \x01(\t2\x93\x01\n\x12\x41pplicationService\x12}\n\nListFields\x12\x34.io.deephaven.proto.backplane.grpc.ListFieldsRequest\x1a\x35.io.deephaven.proto.backplane.grpc.FieldsChangeUpdate\"\x00\x30\x01\x42GH\x01P\x01ZAgithub.com/deephaven/deephaven-core/go/internal/proto/applicationb\x06proto3')
-
-_globals = globals()
-_builder.BuildMessageAndEnumDescriptors(DESCRIPTOR, _globals)
-_builder.BuildTopDescriptorsAndMessages(DESCRIPTOR, 'deephaven.proto.application_pb2', _globals)
-if not _descriptor._USE_C_DESCRIPTORS:
-  _globals['DESCRIPTOR']._loaded_options = None
-  _globals['DESCRIPTOR']._serialized_options = b'H\001P\001ZAgithub.com/deephaven/deephaven-core/go/internal/proto/application'
-  _globals['_LISTFIELDSREQUEST']._serialized_start=102
-  _globals['_LISTFIELDSREQUEST']._serialized_end=121
-  _globals['_FIELDSCHANGEUPDATE']._serialized_start=124
-  _globals['_FIELDSCHANGEUPDATE']._serialized_end=333
-  _globals['_FIELDINFO']._serialized_start=336
-  _globals['_FIELDINFO']._serialized_end=514
-  _globals['_APPLICATIONSERVICE']._serialized_start=517
-  _globals['_APPLICATIONSERVICE']._serialized_end=664
-# @@protoc_insertion_point(module_scope)
diff --git a/py/client/pydeephaven/proto/config_pb2.py b/py/client/pydeephaven/proto/config_pb2.py
deleted file mode 100644
index a0275a453f8..00000000000
--- a/py/client/pydeephaven/proto/config_pb2.py
+++ /dev/null
@@ -1,45 +0,0 @@
-# -*- coding: utf-8 -*-
-# Generated by the protocol buffer compiler.  DO NOT EDIT!
-# source: deephaven/proto/config.proto
-# Protobuf Python Version: 5.26.1
-"""Generated protocol buffer code."""
-from google.protobuf import descriptor as _descriptor
-from google.protobuf import descriptor_pool as _descriptor_pool
-from google.protobuf import symbol_database as _symbol_database
-from google.protobuf.internal import builder as _builder
-# @@protoc_insertion_point(imports)
-
-_sym_db = _symbol_database.Default()
-
-
-
-
-DESCRIPTOR = _descriptor_pool.Default().AddSerializedFile(b'\n\x1c\x64\x65\x65phaven/proto/config.proto\x12!io.deephaven.proto.backplane.grpc\" \n\x1e\x41uthenticationConstantsRequest\"\x1f\n\x1d\x43onfigurationConstantsRequest\"\xf3\x01\n\x1f\x41uthenticationConstantsResponse\x12k\n\rconfig_values\x18\x01 \x03(\x0b\x32T.io.deephaven.proto.backplane.grpc.AuthenticationConstantsResponse.ConfigValuesEntry\x1a\x63\n\x11\x43onfigValuesEntry\x12\x0b\n\x03key\x18\x01 \x01(\t\x12=\n\x05value\x18\x02 \x01(\x0b\x32..io.deephaven.proto.backplane.grpc.ConfigValue:\x02\x38\x01\"\xf1\x01\n\x1e\x43onfigurationConstantsResponse\x12j\n\rconfig_values\x18\x01 \x03(\x0b\x32S.io.deephaven.proto.backplane.grpc.ConfigurationConstantsResponse.ConfigValuesEntry\x1a\x63\n\x11\x43onfigValuesEntry\x12\x0b\n\x03key\x18\x01 \x01(\t\x12=\n\x05value\x18\x02 \x01(\x0b\x32..io.deephaven.proto.backplane.grpc.ConfigValue:\x02\x38\x01\"-\n\x0b\x43onfigValue\x12\x16\n\x0cstring_value\x18\x03 \x01(\tH\x00\x42\x06\n\x04kind2\xdc\x02\n\rConfigService\x12\xa5\x01\n\x1aGetAuthenticationConstants\x12\x41.io.deephaven.proto.backplane.grpc.AuthenticationConstantsRequest\x1a\x42.io.deephaven.proto.backplane.grpc.AuthenticationConstantsResponse\"\x00\x12\xa2\x01\n\x19GetConfigurationConstants\x12@.io.deephaven.proto.backplane.grpc.ConfigurationConstantsRequest\x1a\x41.io.deephaven.proto.backplane.grpc.ConfigurationConstantsResponse\"\x00\x42\x42H\x01P\x01Z<github.com/deephaven/deephaven-core/go/internal/proto/configb\x06proto3')
-
-_globals = globals()
-_builder.BuildMessageAndEnumDescriptors(DESCRIPTOR, _globals)
-_builder.BuildTopDescriptorsAndMessages(DESCRIPTOR, 'deephaven.proto.config_pb2', _globals)
-if not _descriptor._USE_C_DESCRIPTORS:
-  _globals['DESCRIPTOR']._loaded_options = None
-  _globals['DESCRIPTOR']._serialized_options = b'H\001P\001Z<github.com/deephaven/deephaven-core/go/internal/proto/config'
-  _globals['_AUTHENTICATIONCONSTANTSRESPONSE_CONFIGVALUESENTRY']._loaded_options = None
-  _globals['_AUTHENTICATIONCONSTANTSRESPONSE_CONFIGVALUESENTRY']._serialized_options = b'8\001'
-  _globals['_CONFIGURATIONCONSTANTSRESPONSE_CONFIGVALUESENTRY']._loaded_options = None
-  _globals['_CONFIGURATIONCONSTANTSRESPONSE_CONFIGVALUESENTRY']._serialized_options = b'8\001'
-  _globals['_AUTHENTICATIONCONSTANTSREQUEST']._serialized_start=67
-  _globals['_AUTHENTICATIONCONSTANTSREQUEST']._serialized_end=99
-  _globals['_CONFIGURATIONCONSTANTSREQUEST']._serialized_start=101
-  _globals['_CONFIGURATIONCONSTANTSREQUEST']._serialized_end=132
-  _globals['_AUTHENTICATIONCONSTANTSRESPONSE']._serialized_start=135
-  _globals['_AUTHENTICATIONCONSTANTSRESPONSE']._serialized_end=378
-  _globals['_AUTHENTICATIONCONSTANTSRESPONSE_CONFIGVALUESENTRY']._serialized_start=279
-  _globals['_AUTHENTICATIONCONSTANTSRESPONSE_CONFIGVALUESENTRY']._serialized_end=378
-  _globals['_CONFIGURATIONCONSTANTSRESPONSE']._serialized_start=381
-  _globals['_CONFIGURATIONCONSTANTSRESPONSE']._serialized_end=622
-  _globals['_CONFIGURATIONCONSTANTSRESPONSE_CONFIGVALUESENTRY']._serialized_start=279
-  _globals['_CONFIGURATIONCONSTANTSRESPONSE_CONFIGVALUESENTRY']._serialized_end=378
-  _globals['_CONFIGVALUE']._serialized_start=624
-  _globals['_CONFIGVALUE']._serialized_end=669
-  _globals['_CONFIGSERVICE']._serialized_start=672
-  _globals['_CONFIGSERVICE']._serialized_end=1020
-# @@protoc_insertion_point(module_scope)
diff --git a/py/client/pydeephaven/proto/console_pb2.py b/py/client/pydeephaven/proto/console_pb2.py
deleted file mode 100644
index c83354840f9..00000000000
--- a/py/client/pydeephaven/proto/console_pb2.py
+++ /dev/null
@@ -1,195 +0,0 @@
-# -*- coding: utf-8 -*-
-# Generated by the protocol buffer compiler.  DO NOT EDIT!
-# source: deephaven/proto/console.proto
-# Protobuf Python Version: 5.26.1
-"""Generated protocol buffer code."""
-from google.protobuf import descriptor as _descriptor
-from google.protobuf import descriptor_pool as _descriptor_pool
-from google.protobuf import symbol_database as _symbol_database
-from google.protobuf.internal import builder as _builder
-# @@protoc_insertion_point(imports)
-
-_sym_db = _symbol_database.Default()
-
-
-from pydeephaven.proto import ticket_pb2 as deephaven_dot_proto_dot_ticket__pb2
-from pydeephaven.proto import application_pb2 as deephaven_dot_proto_dot_application__pb2
-
-
-DESCRIPTOR = _descriptor_pool.Default().AddSerializedFile(b'\n\x1d\x64\x65\x65phaven/proto/console.proto\x12(io.deephaven.proto.backplane.script.grpc\x1a\x1c\x64\x65\x65phaven/proto/ticket.proto\x1a!deephaven/proto/application.proto\"\x18\n\x16GetConsoleTypesRequest\"0\n\x17GetConsoleTypesResponse\x12\x15\n\rconsole_types\x18\x01 \x03(\t\"i\n\x13StartConsoleRequest\x12<\n\tresult_id\x18\x01 \x01(\x0b\x32).io.deephaven.proto.backplane.grpc.Ticket\x12\x14\n\x0csession_type\x18\x02 \x01(\t\"T\n\x14StartConsoleResponse\x12<\n\tresult_id\x18\x01 \x01(\x0b\x32).io.deephaven.proto.backplane.grpc.Ticket\"\x14\n\x12GetHeapInfoRequest\"`\n\x13GetHeapInfoResponse\x12\x16\n\nmax_memory\x18\x01 \x01(\x03\x42\x02\x30\x01\x12\x18\n\x0ctotal_memory\x18\x02 \x01(\x03\x42\x02\x30\x01\x12\x17\n\x0b\x66ree_memory\x18\x03 \x01(\x03\x42\x02\x30\x01\"M\n\x16LogSubscriptionRequest\x12#\n\x17last_seen_log_timestamp\x18\x01 \x01(\x03\x42\x02\x30\x01\x12\x0e\n\x06levels\x18\x02 \x03(\t\"S\n\x13LogSubscriptionData\x12\x12\n\x06micros\x18\x01 \x01(\x03\x42\x02\x30\x01\x12\x11\n\tlog_level\x18\x02 \x01(\t\x12\x0f\n\x07message\x18\x03 \x01(\tJ\x04\x08\x04\x10\x05\"j\n\x15\x45xecuteCommandRequest\x12=\n\nconsole_id\x18\x01 \x01(\x0b\x32).io.deephaven.proto.backplane.grpc.Ticket\x12\x0c\n\x04\x63ode\x18\x03 \x01(\tJ\x04\x08\x02\x10\x03\"w\n\x16\x45xecuteCommandResponse\x12\x15\n\rerror_message\x18\x01 \x01(\t\x12\x46\n\x07\x63hanges\x18\x02 \x01(\x0b\x32\x35.io.deephaven.proto.backplane.grpc.FieldsChangeUpdate\"\xb5\x01\n\x1a\x42indTableToVariableRequest\x12=\n\nconsole_id\x18\x01 \x01(\x0b\x32).io.deephaven.proto.backplane.grpc.Ticket\x12\x15\n\rvariable_name\x18\x03 \x01(\t\x12;\n\x08table_id\x18\x04 \x01(\x0b\x32).io.deephaven.proto.backplane.grpc.TicketJ\x04\x08\x02\x10\x03\"\x1d\n\x1b\x42indTableToVariableResponse\"\x94\x01\n\x14\x43\x61ncelCommandRequest\x12=\n\nconsole_id\x18\x01 \x01(\x0b\x32).io.deephaven.proto.backplane.grpc.Ticket\x12=\n\ncommand_id\x18\x02 \x01(\x0b\x32).io.deephaven.proto.backplane.grpc.Ticket\"\x17\n\x15\x43\x61ncelCommandResponse\"n\n\x19\x43\x61ncelAutoCompleteRequest\x12=\n\nconsole_id\x18\x01 \x01(\x0b\x32).io.deephaven.proto.backplane.grpc.Ticket\x12\x12\n\nrequest_id\x18\x02 \x01(\x05\"\x1c\n\x1a\x43\x61ncelAutoCompleteResponse\"\xf1\x05\n\x13\x41utoCompleteRequest\x12=\n\nconsole_id\x18\x05 \x01(\x0b\x32).io.deephaven.proto.backplane.grpc.Ticket\x12\x12\n\nrequest_id\x18\x06 \x01(\x05\x12V\n\ropen_document\x18\x01 \x01(\x0b\x32=.io.deephaven.proto.backplane.script.grpc.OpenDocumentRequestH\x00\x12Z\n\x0f\x63hange_document\x18\x02 \x01(\x0b\x32?.io.deephaven.proto.backplane.script.grpc.ChangeDocumentRequestH\x00\x12\x63\n\x14get_completion_items\x18\x03 \x01(\x0b\x32\x43.io.deephaven.proto.backplane.script.grpc.GetCompletionItemsRequestH\x00\x12_\n\x12get_signature_help\x18\x07 \x01(\x0b\x32\x41.io.deephaven.proto.backplane.script.grpc.GetSignatureHelpRequestH\x00\x12N\n\tget_hover\x18\x08 \x01(\x0b\x32\x39.io.deephaven.proto.backplane.script.grpc.GetHoverRequestH\x00\x12X\n\x0eget_diagnostic\x18\t \x01(\x0b\x32>.io.deephaven.proto.backplane.script.grpc.GetDiagnosticRequestH\x00\x12X\n\x0e\x63lose_document\x18\x04 \x01(\x0b\x32>.io.deephaven.proto.backplane.script.grpc.CloseDocumentRequestH\x00\x42\t\n\x07request\"\x91\x04\n\x14\x41utoCompleteResponse\x12\x12\n\nrequest_id\x18\x02 \x01(\x05\x12\x0f\n\x07success\x18\x03 \x01(\x08\x12`\n\x10\x63ompletion_items\x18\x01 \x01(\x0b\x32\x44.io.deephaven.proto.backplane.script.grpc.GetCompletionItemsResponseH\x00\x12X\n\nsignatures\x18\x04 \x01(\x0b\x32\x42.io.deephaven.proto.backplane.script.grpc.GetSignatureHelpResponseH\x00\x12K\n\x05hover\x18\x05 \x01(\x0b\x32:.io.deephaven.proto.backplane.script.grpc.GetHoverResponseH\x00\x12Y\n\ndiagnostic\x18\x06 \x01(\x0b\x32\x43.io.deephaven.proto.backplane.script.grpc.GetPullDiagnosticResponseH\x00\x12\x64\n\x12\x64iagnostic_publish\x18\x07 \x01(\x0b\x32\x46.io.deephaven.proto.backplane.script.grpc.GetPublishDiagnosticResponseH\x00\x42\n\n\x08response\"\x15\n\x13\x42rowserNextResponse\"\xab\x01\n\x13OpenDocumentRequest\x12\x41\n\nconsole_id\x18\x01 \x01(\x0b\x32).io.deephaven.proto.backplane.grpc.TicketB\x02\x18\x01\x12Q\n\rtext_document\x18\x02 \x01(\x0b\x32:.io.deephaven.proto.backplane.script.grpc.TextDocumentItem\"S\n\x10TextDocumentItem\x12\x0b\n\x03uri\x18\x01 \x01(\t\x12\x13\n\x0blanguage_id\x18\x02 \x01(\t\x12\x0f\n\x07version\x18\x03 \x01(\x05\x12\x0c\n\x04text\x18\x04 \x01(\t\"\xbb\x01\n\x14\x43loseDocumentRequest\x12\x41\n\nconsole_id\x18\x01 \x01(\x0b\x32).io.deephaven.proto.backplane.grpc.TicketB\x02\x18\x01\x12`\n\rtext_document\x18\x02 \x01(\x0b\x32I.io.deephaven.proto.backplane.script.grpc.VersionedTextDocumentIdentifier\"\xc4\x03\n\x15\x43hangeDocumentRequest\x12\x41\n\nconsole_id\x18\x01 \x01(\x0b\x32).io.deephaven.proto.backplane.grpc.TicketB\x02\x18\x01\x12`\n\rtext_document\x18\x02 \x01(\x0b\x32I.io.deephaven.proto.backplane.script.grpc.VersionedTextDocumentIdentifier\x12w\n\x0f\x63ontent_changes\x18\x03 \x03(\x0b\x32^.io.deephaven.proto.backplane.script.grpc.ChangeDocumentRequest.TextDocumentContentChangeEvent\x1a\x8c\x01\n\x1eTextDocumentContentChangeEvent\x12\x46\n\x05range\x18\x01 \x01(\x0b\x32\x37.io.deephaven.proto.backplane.script.grpc.DocumentRange\x12\x14\n\x0crange_length\x18\x02 \x01(\x05\x12\x0c\n\x04text\x18\x03 \x01(\t\"\x93\x01\n\rDocumentRange\x12\x41\n\x05start\x18\x01 \x01(\x0b\x32\x32.io.deephaven.proto.backplane.script.grpc.Position\x12?\n\x03\x65nd\x18\x02 \x01(\x0b\x32\x32.io.deephaven.proto.backplane.script.grpc.Position\"?\n\x1fVersionedTextDocumentIdentifier\x12\x0b\n\x03uri\x18\x01 \x01(\t\x12\x0f\n\x07version\x18\x02 \x01(\x05\"+\n\x08Position\x12\x0c\n\x04line\x18\x01 \x01(\x05\x12\x11\n\tcharacter\x18\x02 \x01(\x05\",\n\rMarkupContent\x12\x0c\n\x04kind\x18\x01 \x01(\t\x12\r\n\x05value\x18\x02 \x01(\t\"\xec\x02\n\x19GetCompletionItemsRequest\x12\x41\n\nconsole_id\x18\x01 \x01(\x0b\x32).io.deephaven.proto.backplane.grpc.TicketB\x02\x18\x01\x12L\n\x07\x63ontext\x18\x02 \x01(\x0b\x32;.io.deephaven.proto.backplane.script.grpc.CompletionContext\x12`\n\rtext_document\x18\x03 \x01(\x0b\x32I.io.deephaven.proto.backplane.script.grpc.VersionedTextDocumentIdentifier\x12\x44\n\x08position\x18\x04 \x01(\x0b\x32\x32.io.deephaven.proto.backplane.script.grpc.Position\x12\x16\n\nrequest_id\x18\x05 \x01(\x05\x42\x02\x18\x01\"D\n\x11\x43ompletionContext\x12\x14\n\x0ctrigger_kind\x18\x01 \x01(\x05\x12\x19\n\x11trigger_character\x18\x02 \x01(\t\"\x92\x01\n\x1aGetCompletionItemsResponse\x12G\n\x05items\x18\x01 \x03(\x0b\x32\x38.io.deephaven.proto.backplane.script.grpc.CompletionItem\x12\x16\n\nrequest_id\x18\x02 \x01(\x05\x42\x02\x18\x01\x12\x13\n\x07success\x18\x03 \x01(\x08\x42\x02\x18\x01\"\xd2\x03\n\x0e\x43ompletionItem\x12\r\n\x05start\x18\x01 \x01(\x05\x12\x0e\n\x06length\x18\x02 \x01(\x05\x12\r\n\x05label\x18\x03 \x01(\t\x12\x0c\n\x04kind\x18\x04 \x01(\x05\x12\x0e\n\x06\x64\x65tail\x18\x05 \x01(\t\x12\x12\n\ndeprecated\x18\x07 \x01(\x08\x12\x11\n\tpreselect\x18\x08 \x01(\x08\x12\x45\n\ttext_edit\x18\t \x01(\x0b\x32\x32.io.deephaven.proto.backplane.script.grpc.TextEdit\x12\x11\n\tsort_text\x18\n \x01(\t\x12\x13\n\x0b\x66ilter_text\x18\x0b \x01(\t\x12\x1a\n\x12insert_text_format\x18\x0c \x01(\x05\x12Q\n\x15\x61\x64\x64itional_text_edits\x18\r \x03(\x0b\x32\x32.io.deephaven.proto.backplane.script.grpc.TextEdit\x12\x19\n\x11\x63ommit_characters\x18\x0e \x03(\t\x12N\n\rdocumentation\x18\x0f \x01(\x0b\x32\x37.io.deephaven.proto.backplane.script.grpc.MarkupContentJ\x04\x08\x06\x10\x07\"`\n\x08TextEdit\x12\x46\n\x05range\x18\x01 \x01(\x0b\x32\x37.io.deephaven.proto.backplane.script.grpc.DocumentRange\x12\x0c\n\x04text\x18\x02 \x01(\t\"\x92\x02\n\x17GetSignatureHelpRequest\x12O\n\x07\x63ontext\x18\x01 \x01(\x0b\x32>.io.deephaven.proto.backplane.script.grpc.SignatureHelpContext\x12`\n\rtext_document\x18\x02 \x01(\x0b\x32I.io.deephaven.proto.backplane.script.grpc.VersionedTextDocumentIdentifier\x12\x44\n\x08position\x18\x03 \x01(\x0b\x32\x32.io.deephaven.proto.backplane.script.grpc.Position\"\xdb\x01\n\x14SignatureHelpContext\x12\x14\n\x0ctrigger_kind\x18\x01 \x01(\x05\x12\x1e\n\x11trigger_character\x18\x02 \x01(\tH\x00\x88\x01\x01\x12\x14\n\x0cis_retrigger\x18\x03 \x01(\x08\x12\x61\n\x15\x61\x63tive_signature_help\x18\x04 \x01(\x0b\x32\x42.io.deephaven.proto.backplane.script.grpc.GetSignatureHelpResponseB\x14\n\x12_trigger_character\"\xd6\x01\n\x18GetSignatureHelpResponse\x12R\n\nsignatures\x18\x01 \x03(\x0b\x32>.io.deephaven.proto.backplane.script.grpc.SignatureInformation\x12\x1d\n\x10\x61\x63tive_signature\x18\x02 \x01(\x05H\x00\x88\x01\x01\x12\x1d\n\x10\x61\x63tive_parameter\x18\x03 \x01(\x05H\x01\x88\x01\x01\x42\x13\n\x11_active_signatureB\x13\n\x11_active_parameter\"\xfd\x01\n\x14SignatureInformation\x12\r\n\x05label\x18\x01 \x01(\t\x12N\n\rdocumentation\x18\x02 \x01(\x0b\x32\x37.io.deephaven.proto.backplane.script.grpc.MarkupContent\x12R\n\nparameters\x18\x03 \x03(\x0b\x32>.io.deephaven.proto.backplane.script.grpc.ParameterInformation\x12\x1d\n\x10\x61\x63tive_parameter\x18\x04 \x01(\x05H\x00\x88\x01\x01\x42\x13\n\x11_active_parameter\"u\n\x14ParameterInformation\x12\r\n\x05label\x18\x01 \x01(\t\x12N\n\rdocumentation\x18\x02 \x01(\x0b\x32\x37.io.deephaven.proto.backplane.script.grpc.MarkupContent\"\xb9\x01\n\x0fGetHoverRequest\x12`\n\rtext_document\x18\x01 \x01(\x0b\x32I.io.deephaven.proto.backplane.script.grpc.VersionedTextDocumentIdentifier\x12\x44\n\x08position\x18\x02 \x01(\x0b\x32\x32.io.deephaven.proto.backplane.script.grpc.Position\"\xa5\x01\n\x10GetHoverResponse\x12I\n\x08\x63ontents\x18\x01 \x01(\x0b\x32\x37.io.deephaven.proto.backplane.script.grpc.MarkupContent\x12\x46\n\x05range\x18\x02 \x01(\x0b\x32\x37.io.deephaven.proto.backplane.script.grpc.DocumentRange\"\xd8\x01\n\x14GetDiagnosticRequest\x12`\n\rtext_document\x18\x01 \x01(\x0b\x32I.io.deephaven.proto.backplane.script.grpc.VersionedTextDocumentIdentifier\x12\x17\n\nidentifier\x18\x02 \x01(\tH\x00\x88\x01\x01\x12\x1f\n\x12previous_result_id\x18\x03 \x01(\tH\x01\x88\x01\x01\x42\r\n\x0b_identifierB\x15\n\x13_previous_result_id\"\x94\x01\n\x19GetPullDiagnosticResponse\x12\x0c\n\x04kind\x18\x01 \x01(\t\x12\x16\n\tresult_id\x18\x02 \x01(\tH\x00\x88\x01\x01\x12\x43\n\x05items\x18\x03 \x03(\x0b\x32\x34.io.deephaven.proto.backplane.script.grpc.DiagnosticB\x0c\n\n_result_id\"\x98\x01\n\x1cGetPublishDiagnosticResponse\x12\x0b\n\x03uri\x18\x01 \x01(\t\x12\x14\n\x07version\x18\x02 \x01(\x05H\x00\x88\x01\x01\x12I\n\x0b\x64iagnostics\x18\x03 \x03(\x0b\x32\x34.io.deephaven.proto.backplane.script.grpc.DiagnosticB\n\n\x08_version\"\xa7\x05\n\nDiagnostic\x12\x46\n\x05range\x18\x01 \x01(\x0b\x32\x37.io.deephaven.proto.backplane.script.grpc.DocumentRange\x12Y\n\x08severity\x18\x02 \x01(\x0e\x32G.io.deephaven.proto.backplane.script.grpc.Diagnostic.DiagnosticSeverity\x12\x11\n\x04\x63ode\x18\x03 \x01(\tH\x00\x88\x01\x01\x12\x63\n\x10\x63ode_description\x18\x04 \x01(\x0b\x32\x44.io.deephaven.proto.backplane.script.grpc.Diagnostic.CodeDescriptionH\x01\x88\x01\x01\x12\x13\n\x06source\x18\x05 \x01(\tH\x02\x88\x01\x01\x12\x0f\n\x07message\x18\x06 \x01(\t\x12P\n\x04tags\x18\x07 \x03(\x0e\x32\x42.io.deephaven.proto.backplane.script.grpc.Diagnostic.DiagnosticTag\x12\x11\n\x04\x64\x61ta\x18\t \x01(\x0cH\x03\x88\x01\x01\x1a\x1f\n\x0f\x43odeDescription\x12\x0c\n\x04href\x18\x01 \x01(\t\"]\n\x12\x44iagnosticSeverity\x12\x14\n\x10NOT_SET_SEVERITY\x10\x00\x12\t\n\x05\x45RROR\x10\x01\x12\x0b\n\x07WARNING\x10\x02\x12\x0f\n\x0bINFORMATION\x10\x03\x12\x08\n\x04HINT\x10\x04\"A\n\rDiagnosticTag\x12\x0f\n\x0bNOT_SET_TAG\x10\x00\x12\x0f\n\x0bUNNECESSARY\x10\x01\x12\x0e\n\nDEPRECATED\x10\x02\x42\x07\n\x05_codeB\x13\n\x11_code_descriptionB\t\n\x07_sourceB\x07\n\x05_data\"\xe6\x30\n\x10\x46igureDescriptor\x12\x12\n\x05title\x18\x01 \x01(\tH\x00\x88\x01\x01\x12\x12\n\ntitle_font\x18\x02 \x01(\t\x12\x13\n\x0btitle_color\x18\x03 \x01(\t\x12\x1b\n\x0fupdate_interval\x18\x07 \x01(\x03\x42\x02\x30\x01\x12\x0c\n\x04\x63ols\x18\x08 \x01(\x05\x12\x0c\n\x04rows\x18\t \x01(\x05\x12Z\n\x06\x63harts\x18\n \x03(\x0b\x32J.io.deephaven.proto.backplane.script.grpc.FigureDescriptor.ChartDescriptor\x12\x0e\n\x06\x65rrors\x18\r \x03(\t\x1a\xce\x05\n\x0f\x43hartDescriptor\x12\x0f\n\x07\x63olspan\x18\x01 \x01(\x05\x12\x0f\n\x07rowspan\x18\x02 \x01(\x05\x12[\n\x06series\x18\x03 \x03(\x0b\x32K.io.deephaven.proto.backplane.script.grpc.FigureDescriptor.SeriesDescriptor\x12\x66\n\x0cmulti_series\x18\x04 \x03(\x0b\x32P.io.deephaven.proto.backplane.script.grpc.FigureDescriptor.MultiSeriesDescriptor\x12W\n\x04\x61xes\x18\x05 \x03(\x0b\x32I.io.deephaven.proto.backplane.script.grpc.FigureDescriptor.AxisDescriptor\x12h\n\nchart_type\x18\x06 \x01(\x0e\x32T.io.deephaven.proto.backplane.script.grpc.FigureDescriptor.ChartDescriptor.ChartType\x12\x12\n\x05title\x18\x07 \x01(\tH\x00\x88\x01\x01\x12\x12\n\ntitle_font\x18\x08 \x01(\t\x12\x13\n\x0btitle_color\x18\t \x01(\t\x12\x13\n\x0bshow_legend\x18\n \x01(\x08\x12\x13\n\x0blegend_font\x18\x0b \x01(\t\x12\x14\n\x0clegend_color\x18\x0c \x01(\t\x12\x0c\n\x04is3d\x18\r \x01(\x08\x12\x0e\n\x06\x63olumn\x18\x0e \x01(\x05\x12\x0b\n\x03row\x18\x0f \x01(\x05\"_\n\tChartType\x12\x06\n\x02XY\x10\x00\x12\x07\n\x03PIE\x10\x01\x12\x0c\n\x04OHLC\x10\x02\x1a\x02\x08\x01\x12\x0c\n\x08\x43\x41TEGORY\x10\x03\x12\x07\n\x03XYZ\x10\x04\x12\x0f\n\x0b\x43\x41TEGORY_3D\x10\x05\x12\x0b\n\x07TREEMAP\x10\x06\x42\x08\n\x06_title\x1a\xfe\x04\n\x10SeriesDescriptor\x12^\n\nplot_style\x18\x01 \x01(\x0e\x32J.io.deephaven.proto.backplane.script.grpc.FigureDescriptor.SeriesPlotStyle\x12\x0c\n\x04name\x18\x02 \x01(\t\x12\x1a\n\rlines_visible\x18\x03 \x01(\x08H\x00\x88\x01\x01\x12\x1b\n\x0eshapes_visible\x18\x04 \x01(\x08H\x01\x88\x01\x01\x12\x18\n\x10gradient_visible\x18\x05 \x01(\x08\x12\x12\n\nline_color\x18\x06 \x01(\t\x12\x1f\n\x12point_label_format\x18\x08 \x01(\tH\x02\x88\x01\x01\x12\x1f\n\x12x_tool_tip_pattern\x18\t \x01(\tH\x03\x88\x01\x01\x12\x1f\n\x12y_tool_tip_pattern\x18\n \x01(\tH\x04\x88\x01\x01\x12\x13\n\x0bshape_label\x18\x0b \x01(\t\x12\x17\n\nshape_size\x18\x0c \x01(\x01H\x05\x88\x01\x01\x12\x13\n\x0bshape_color\x18\r \x01(\t\x12\r\n\x05shape\x18\x0e \x01(\t\x12\x61\n\x0c\x64\x61ta_sources\x18\x0f \x03(\x0b\x32K.io.deephaven.proto.backplane.script.grpc.FigureDescriptor.SourceDescriptorB\x10\n\x0e_lines_visibleB\x11\n\x0f_shapes_visibleB\x15\n\x13_point_label_formatB\x15\n\x13_x_tool_tip_patternB\x15\n\x13_y_tool_tip_patternB\r\n\x0b_shape_sizeJ\x04\x08\x07\x10\x08\x1a\xec\n\n\x15MultiSeriesDescriptor\x12^\n\nplot_style\x18\x01 \x01(\x0e\x32J.io.deephaven.proto.backplane.script.grpc.FigureDescriptor.SeriesPlotStyle\x12\x0c\n\x04name\x18\x02 \x01(\t\x12\x63\n\nline_color\x18\x03 \x01(\x0b\x32O.io.deephaven.proto.backplane.script.grpc.FigureDescriptor.StringMapWithDefault\x12\x64\n\x0bpoint_color\x18\x04 \x01(\x0b\x32O.io.deephaven.proto.backplane.script.grpc.FigureDescriptor.StringMapWithDefault\x12\x64\n\rlines_visible\x18\x05 \x01(\x0b\x32M.io.deephaven.proto.backplane.script.grpc.FigureDescriptor.BoolMapWithDefault\x12\x65\n\x0epoints_visible\x18\x06 \x01(\x0b\x32M.io.deephaven.proto.backplane.script.grpc.FigureDescriptor.BoolMapWithDefault\x12g\n\x10gradient_visible\x18\x07 \x01(\x0b\x32M.io.deephaven.proto.backplane.script.grpc.FigureDescriptor.BoolMapWithDefault\x12k\n\x12point_label_format\x18\x08 \x01(\x0b\x32O.io.deephaven.proto.backplane.script.grpc.FigureDescriptor.StringMapWithDefault\x12k\n\x12x_tool_tip_pattern\x18\t \x01(\x0b\x32O.io.deephaven.proto.backplane.script.grpc.FigureDescriptor.StringMapWithDefault\x12k\n\x12y_tool_tip_pattern\x18\n \x01(\x0b\x32O.io.deephaven.proto.backplane.script.grpc.FigureDescriptor.StringMapWithDefault\x12\x64\n\x0bpoint_label\x18\x0b \x01(\x0b\x32O.io.deephaven.proto.backplane.script.grpc.FigureDescriptor.StringMapWithDefault\x12\x63\n\npoint_size\x18\x0c \x01(\x0b\x32O.io.deephaven.proto.backplane.script.grpc.FigureDescriptor.DoubleMapWithDefault\x12\x64\n\x0bpoint_shape\x18\r \x01(\x0b\x32O.io.deephaven.proto.backplane.script.grpc.FigureDescriptor.StringMapWithDefault\x12l\n\x0c\x64\x61ta_sources\x18\x0e \x03(\x0b\x32V.io.deephaven.proto.backplane.script.grpc.FigureDescriptor.MultiSeriesSourceDescriptor\x1a\x64\n\x14StringMapWithDefault\x12\x1b\n\x0e\x64\x65\x66\x61ult_string\x18\x01 \x01(\tH\x00\x88\x01\x01\x12\x0c\n\x04keys\x18\x02 \x03(\t\x12\x0e\n\x06values\x18\x03 \x03(\tB\x11\n\x0f_default_string\x1a\x64\n\x14\x44oubleMapWithDefault\x12\x1b\n\x0e\x64\x65\x66\x61ult_double\x18\x01 \x01(\x01H\x00\x88\x01\x01\x12\x0c\n\x04keys\x18\x02 \x03(\t\x12\x0e\n\x06values\x18\x03 \x03(\x01\x42\x11\n\x0f_default_double\x1a^\n\x12\x42oolMapWithDefault\x12\x19\n\x0c\x64\x65\x66\x61ult_bool\x18\x01 \x01(\x08H\x00\x88\x01\x01\x12\x0c\n\x04keys\x18\x02 \x03(\t\x12\x0e\n\x06values\x18\x03 \x03(\x08\x42\x0f\n\r_default_bool\x1a\xa6\x08\n\x0e\x41xisDescriptor\x12\n\n\x02id\x18\x01 \x01(\t\x12m\n\x0b\x66ormat_type\x18\x02 \x01(\x0e\x32X.io.deephaven.proto.backplane.script.grpc.FigureDescriptor.AxisDescriptor.AxisFormatType\x12`\n\x04type\x18\x03 \x01(\x0e\x32R.io.deephaven.proto.backplane.script.grpc.FigureDescriptor.AxisDescriptor.AxisType\x12h\n\x08position\x18\x04 \x01(\x0e\x32V.io.deephaven.proto.backplane.script.grpc.FigureDescriptor.AxisDescriptor.AxisPosition\x12\x0b\n\x03log\x18\x05 \x01(\x08\x12\r\n\x05label\x18\x06 \x01(\t\x12\x12\n\nlabel_font\x18\x07 \x01(\t\x12\x12\n\nticks_font\x18\x08 \x01(\t\x12\x1b\n\x0e\x66ormat_pattern\x18\t \x01(\tH\x00\x88\x01\x01\x12\r\n\x05\x63olor\x18\n \x01(\t\x12\x11\n\tmin_range\x18\x0b \x01(\x01\x12\x11\n\tmax_range\x18\x0c \x01(\x01\x12\x1b\n\x13minor_ticks_visible\x18\r \x01(\x08\x12\x1b\n\x13major_ticks_visible\x18\x0e \x01(\x08\x12\x18\n\x10minor_tick_count\x18\x0f \x01(\x05\x12$\n\x17gap_between_major_ticks\x18\x10 \x01(\x01H\x01\x88\x01\x01\x12\x1c\n\x14major_tick_locations\x18\x11 \x03(\x01\x12\x18\n\x10tick_label_angle\x18\x12 \x01(\x01\x12\x0e\n\x06invert\x18\x13 \x01(\x08\x12\x14\n\x0cis_time_axis\x18\x14 \x01(\x08\x12{\n\x1c\x62usiness_calendar_descriptor\x18\x15 \x01(\x0b\x32U.io.deephaven.proto.backplane.script.grpc.FigureDescriptor.BusinessCalendarDescriptor\"*\n\x0e\x41xisFormatType\x12\x0c\n\x08\x43\x41TEGORY\x10\x00\x12\n\n\x06NUMBER\x10\x01\"C\n\x08\x41xisType\x12\x05\n\x01X\x10\x00\x12\x05\n\x01Y\x10\x01\x12\t\n\x05SHAPE\x10\x02\x12\x08\n\x04SIZE\x10\x03\x12\t\n\x05LABEL\x10\x04\x12\t\n\x05\x43OLOR\x10\x05\"B\n\x0c\x41xisPosition\x12\x07\n\x03TOP\x10\x00\x12\n\n\x06\x42OTTOM\x10\x01\x12\x08\n\x04LEFT\x10\x02\x12\t\n\x05RIGHT\x10\x03\x12\x08\n\x04NONE\x10\x04\x42\x11\n\x0f_format_patternB\x1a\n\x18_gap_between_major_ticks\x1a\xf0\x06\n\x1a\x42usinessCalendarDescriptor\x12\x0c\n\x04name\x18\x01 \x01(\t\x12\x11\n\ttime_zone\x18\x02 \x01(\t\x12v\n\rbusiness_days\x18\x03 \x03(\x0e\x32_.io.deephaven.proto.backplane.script.grpc.FigureDescriptor.BusinessCalendarDescriptor.DayOfWeek\x12~\n\x10\x62usiness_periods\x18\x04 \x03(\x0b\x32\x64.io.deephaven.proto.backplane.script.grpc.FigureDescriptor.BusinessCalendarDescriptor.BusinessPeriod\x12o\n\x08holidays\x18\x05 \x03(\x0b\x32].io.deephaven.proto.backplane.script.grpc.FigureDescriptor.BusinessCalendarDescriptor.Holiday\x1a-\n\x0e\x42usinessPeriod\x12\x0c\n\x04open\x18\x01 \x01(\t\x12\r\n\x05\x63lose\x18\x02 \x01(\t\x1a\xf8\x01\n\x07Holiday\x12m\n\x04\x64\x61te\x18\x01 \x01(\x0b\x32_.io.deephaven.proto.backplane.script.grpc.FigureDescriptor.BusinessCalendarDescriptor.LocalDate\x12~\n\x10\x62usiness_periods\x18\x02 \x03(\x0b\x32\x64.io.deephaven.proto.backplane.script.grpc.FigureDescriptor.BusinessCalendarDescriptor.BusinessPeriod\x1a\x35\n\tLocalDate\x12\x0c\n\x04year\x18\x01 \x01(\x05\x12\r\n\x05month\x18\x02 \x01(\x05\x12\x0b\n\x03\x64\x61y\x18\x03 \x01(\x05\"g\n\tDayOfWeek\x12\n\n\x06SUNDAY\x10\x00\x12\n\n\x06MONDAY\x10\x01\x12\x0b\n\x07TUESDAY\x10\x02\x12\r\n\tWEDNESDAY\x10\x03\x12\x0c\n\x08THURSDAY\x10\x04\x12\n\n\x06\x46RIDAY\x10\x05\x12\x0c\n\x08SATURDAY\x10\x06\x1a\xb6\x01\n\x1bMultiSeriesSourceDescriptor\x12\x0f\n\x07\x61xis_id\x18\x01 \x01(\t\x12S\n\x04type\x18\x02 \x01(\x0e\x32\x45.io.deephaven.proto.backplane.script.grpc.FigureDescriptor.SourceType\x12\x1c\n\x14partitioned_table_id\x18\x03 \x01(\x05\x12\x13\n\x0b\x63olumn_name\x18\x04 \x01(\t\x1a\xb4\x02\n\x10SourceDescriptor\x12\x0f\n\x07\x61xis_id\x18\x01 \x01(\t\x12S\n\x04type\x18\x02 \x01(\x0e\x32\x45.io.deephaven.proto.backplane.script.grpc.FigureDescriptor.SourceType\x12\x10\n\x08table_id\x18\x03 \x01(\x05\x12\x1c\n\x14partitioned_table_id\x18\x04 \x01(\x05\x12\x13\n\x0b\x63olumn_name\x18\x05 \x01(\t\x12\x13\n\x0b\x63olumn_type\x18\x06 \x01(\t\x12`\n\tone_click\x18\x07 \x01(\x0b\x32M.io.deephaven.proto.backplane.script.grpc.FigureDescriptor.OneClickDescriptor\x1a\x63\n\x12OneClickDescriptor\x12\x0f\n\x07\x63olumns\x18\x01 \x03(\t\x12\x14\n\x0c\x63olumn_types\x18\x02 \x03(\t\x12&\n\x1erequire_all_filters_to_display\x18\x03 \x01(\x08\"\xa6\x01\n\x0fSeriesPlotStyle\x12\x07\n\x03\x42\x41R\x10\x00\x12\x0f\n\x0bSTACKED_BAR\x10\x01\x12\x08\n\x04LINE\x10\x02\x12\x08\n\x04\x41REA\x10\x03\x12\x10\n\x0cSTACKED_AREA\x10\x04\x12\x07\n\x03PIE\x10\x05\x12\r\n\tHISTOGRAM\x10\x06\x12\x08\n\x04OHLC\x10\x07\x12\x0b\n\x07SCATTER\x10\x08\x12\x08\n\x04STEP\x10\t\x12\r\n\tERROR_BAR\x10\n\x12\x0b\n\x07TREEMAP\x10\x0b\"\xd2\x01\n\nSourceType\x12\x05\n\x01X\x10\x00\x12\x05\n\x01Y\x10\x01\x12\x05\n\x01Z\x10\x02\x12\t\n\x05X_LOW\x10\x03\x12\n\n\x06X_HIGH\x10\x04\x12\t\n\x05Y_LOW\x10\x05\x12\n\n\x06Y_HIGH\x10\x06\x12\x08\n\x04TIME\x10\x07\x12\x08\n\x04OPEN\x10\x08\x12\x08\n\x04HIGH\x10\t\x12\x07\n\x03LOW\x10\n\x12\t\n\x05\x43LOSE\x10\x0b\x12\t\n\x05SHAPE\x10\x0c\x12\x08\n\x04SIZE\x10\r\x12\t\n\x05LABEL\x10\x0e\x12\t\n\x05\x43OLOR\x10\x0f\x12\n\n\x06PARENT\x10\x10\x12\x0e\n\nHOVER_TEXT\x10\x11\x12\x08\n\x04TEXT\x10\x12\x42\x08\n\x06_titleJ\x04\x08\x0b\x10\x0cJ\x04\x08\x0c\x10\r2\xb2\r\n\x0e\x43onsoleService\x12\x98\x01\n\x0fGetConsoleTypes\x12@.io.deephaven.proto.backplane.script.grpc.GetConsoleTypesRequest\x1a\x41.io.deephaven.proto.backplane.script.grpc.GetConsoleTypesResponse\"\x00\x12\x8f\x01\n\x0cStartConsole\x12=.io.deephaven.proto.backplane.script.grpc.StartConsoleRequest\x1a>.io.deephaven.proto.backplane.script.grpc.StartConsoleResponse\"\x00\x12\x8c\x01\n\x0bGetHeapInfo\x12<.io.deephaven.proto.backplane.script.grpc.GetHeapInfoRequest\x1a=.io.deephaven.proto.backplane.script.grpc.GetHeapInfoResponse\"\x00\x12\x96\x01\n\x0fSubscribeToLogs\x12@.io.deephaven.proto.backplane.script.grpc.LogSubscriptionRequest\x1a=.io.deephaven.proto.backplane.script.grpc.LogSubscriptionData\"\x00\x30\x01\x12\x95\x01\n\x0e\x45xecuteCommand\x12?.io.deephaven.proto.backplane.script.grpc.ExecuteCommandRequest\x1a@.io.deephaven.proto.backplane.script.grpc.ExecuteCommandResponse\"\x00\x12\x92\x01\n\rCancelCommand\x12>.io.deephaven.proto.backplane.script.grpc.CancelCommandRequest\x1a?.io.deephaven.proto.backplane.script.grpc.CancelCommandResponse\"\x00\x12\xa4\x01\n\x13\x42indTableToVariable\x12\x44.io.deephaven.proto.backplane.script.grpc.BindTableToVariableRequest\x1a\x45.io.deephaven.proto.backplane.script.grpc.BindTableToVariableResponse\"\x00\x12\x99\x01\n\x12\x41utoCompleteStream\x12=.io.deephaven.proto.backplane.script.grpc.AutoCompleteRequest\x1a>.io.deephaven.proto.backplane.script.grpc.AutoCompleteResponse\"\x00(\x01\x30\x01\x12\xa1\x01\n\x12\x43\x61ncelAutoComplete\x12\x43.io.deephaven.proto.backplane.script.grpc.CancelAutoCompleteRequest\x1a\x44.io.deephaven.proto.backplane.script.grpc.CancelAutoCompleteResponse\"\x00\x12\x9b\x01\n\x16OpenAutoCompleteStream\x12=.io.deephaven.proto.backplane.script.grpc.AutoCompleteRequest\x1a>.io.deephaven.proto.backplane.script.grpc.AutoCompleteResponse\"\x00\x30\x01\x12\x98\x01\n\x16NextAutoCompleteStream\x12=.io.deephaven.proto.backplane.script.grpc.AutoCompleteRequest\x1a=.io.deephaven.proto.backplane.script.grpc.BrowserNextResponse\"\x00\x42\x43H\x01P\x01Z=github.com/deephaven/deephaven-core/go/internal/proto/consoleb\x06proto3')
-
-_globals = globals()
-_builder.BuildMessageAndEnumDescriptors(DESCRIPTOR, _globals)
-_builder.BuildTopDescriptorsAndMessages(DESCRIPTOR, 'deephaven.proto.console_pb2', _globals)
-if not _descriptor._USE_C_DESCRIPTORS:
-  _globals['DESCRIPTOR']._loaded_options = None
-  _globals['DESCRIPTOR']._serialized_options = b'H\001P\001Z=github.com/deephaven/deephaven-core/go/internal/proto/console'
-  _globals['_GETHEAPINFORESPONSE'].fields_by_name['max_memory']._loaded_options = None
-  _globals['_GETHEAPINFORESPONSE'].fields_by_name['max_memory']._serialized_options = b'0\001'
-  _globals['_GETHEAPINFORESPONSE'].fields_by_name['total_memory']._loaded_options = None
-  _globals['_GETHEAPINFORESPONSE'].fields_by_name['total_memory']._serialized_options = b'0\001'
-  _globals['_GETHEAPINFORESPONSE'].fields_by_name['free_memory']._loaded_options = None
-  _globals['_GETHEAPINFORESPONSE'].fields_by_name['free_memory']._serialized_options = b'0\001'
-  _globals['_LOGSUBSCRIPTIONREQUEST'].fields_by_name['last_seen_log_timestamp']._loaded_options = None
-  _globals['_LOGSUBSCRIPTIONREQUEST'].fields_by_name['last_seen_log_timestamp']._serialized_options = b'0\001'
-  _globals['_LOGSUBSCRIPTIONDATA'].fields_by_name['micros']._loaded_options = None
-  _globals['_LOGSUBSCRIPTIONDATA'].fields_by_name['micros']._serialized_options = b'0\001'
-  _globals['_OPENDOCUMENTREQUEST'].fields_by_name['console_id']._loaded_options = None
-  _globals['_OPENDOCUMENTREQUEST'].fields_by_name['console_id']._serialized_options = b'\030\001'
-  _globals['_CLOSEDOCUMENTREQUEST'].fields_by_name['console_id']._loaded_options = None
-  _globals['_CLOSEDOCUMENTREQUEST'].fields_by_name['console_id']._serialized_options = b'\030\001'
-  _globals['_CHANGEDOCUMENTREQUEST'].fields_by_name['console_id']._loaded_options = None
-  _globals['_CHANGEDOCUMENTREQUEST'].fields_by_name['console_id']._serialized_options = b'\030\001'
-  _globals['_GETCOMPLETIONITEMSREQUEST'].fields_by_name['console_id']._loaded_options = None
-  _globals['_GETCOMPLETIONITEMSREQUEST'].fields_by_name['console_id']._serialized_options = b'\030\001'
-  _globals['_GETCOMPLETIONITEMSREQUEST'].fields_by_name['request_id']._loaded_options = None
-  _globals['_GETCOMPLETIONITEMSREQUEST'].fields_by_name['request_id']._serialized_options = b'\030\001'
-  _globals['_GETCOMPLETIONITEMSRESPONSE'].fields_by_name['request_id']._loaded_options = None
-  _globals['_GETCOMPLETIONITEMSRESPONSE'].fields_by_name['request_id']._serialized_options = b'\030\001'
-  _globals['_GETCOMPLETIONITEMSRESPONSE'].fields_by_name['success']._loaded_options = None
-  _globals['_GETCOMPLETIONITEMSRESPONSE'].fields_by_name['success']._serialized_options = b'\030\001'
-  _globals['_FIGUREDESCRIPTOR_CHARTDESCRIPTOR_CHARTTYPE'].values_by_name["OHLC"]._loaded_options = None
-  _globals['_FIGUREDESCRIPTOR_CHARTDESCRIPTOR_CHARTTYPE'].values_by_name["OHLC"]._serialized_options = b'\010\001'
-  _globals['_FIGUREDESCRIPTOR'].fields_by_name['update_interval']._loaded_options = None
-  _globals['_FIGUREDESCRIPTOR'].fields_by_name['update_interval']._serialized_options = b'0\001'
-  _globals['_GETCONSOLETYPESREQUEST']._serialized_start=140
-  _globals['_GETCONSOLETYPESREQUEST']._serialized_end=164
-  _globals['_GETCONSOLETYPESRESPONSE']._serialized_start=166
-  _globals['_GETCONSOLETYPESRESPONSE']._serialized_end=214
-  _globals['_STARTCONSOLEREQUEST']._serialized_start=216
-  _globals['_STARTCONSOLEREQUEST']._serialized_end=321
-  _globals['_STARTCONSOLERESPONSE']._serialized_start=323
-  _globals['_STARTCONSOLERESPONSE']._serialized_end=407
-  _globals['_GETHEAPINFOREQUEST']._serialized_start=409
-  _globals['_GETHEAPINFOREQUEST']._serialized_end=429
-  _globals['_GETHEAPINFORESPONSE']._serialized_start=431
-  _globals['_GETHEAPINFORESPONSE']._serialized_end=527
-  _globals['_LOGSUBSCRIPTIONREQUEST']._serialized_start=529
-  _globals['_LOGSUBSCRIPTIONREQUEST']._serialized_end=606
-  _globals['_LOGSUBSCRIPTIONDATA']._serialized_start=608
-  _globals['_LOGSUBSCRIPTIONDATA']._serialized_end=691
-  _globals['_EXECUTECOMMANDREQUEST']._serialized_start=693
-  _globals['_EXECUTECOMMANDREQUEST']._serialized_end=799
-  _globals['_EXECUTECOMMANDRESPONSE']._serialized_start=801
-  _globals['_EXECUTECOMMANDRESPONSE']._serialized_end=920
-  _globals['_BINDTABLETOVARIABLEREQUEST']._serialized_start=923
-  _globals['_BINDTABLETOVARIABLEREQUEST']._serialized_end=1104
-  _globals['_BINDTABLETOVARIABLERESPONSE']._serialized_start=1106
-  _globals['_BINDTABLETOVARIABLERESPONSE']._serialized_end=1135
-  _globals['_CANCELCOMMANDREQUEST']._serialized_start=1138
-  _globals['_CANCELCOMMANDREQUEST']._serialized_end=1286
-  _globals['_CANCELCOMMANDRESPONSE']._serialized_start=1288
-  _globals['_CANCELCOMMANDRESPONSE']._serialized_end=1311
-  _globals['_CANCELAUTOCOMPLETEREQUEST']._serialized_start=1313
-  _globals['_CANCELAUTOCOMPLETEREQUEST']._serialized_end=1423
-  _globals['_CANCELAUTOCOMPLETERESPONSE']._serialized_start=1425
-  _globals['_CANCELAUTOCOMPLETERESPONSE']._serialized_end=1453
-  _globals['_AUTOCOMPLETEREQUEST']._serialized_start=1456
-  _globals['_AUTOCOMPLETEREQUEST']._serialized_end=2209
-  _globals['_AUTOCOMPLETERESPONSE']._serialized_start=2212
-  _globals['_AUTOCOMPLETERESPONSE']._serialized_end=2741
-  _globals['_BROWSERNEXTRESPONSE']._serialized_start=2743
-  _globals['_BROWSERNEXTRESPONSE']._serialized_end=2764
-  _globals['_OPENDOCUMENTREQUEST']._serialized_start=2767
-  _globals['_OPENDOCUMENTREQUEST']._serialized_end=2938
-  _globals['_TEXTDOCUMENTITEM']._serialized_start=2940
-  _globals['_TEXTDOCUMENTITEM']._serialized_end=3023
-  _globals['_CLOSEDOCUMENTREQUEST']._serialized_start=3026
-  _globals['_CLOSEDOCUMENTREQUEST']._serialized_end=3213
-  _globals['_CHANGEDOCUMENTREQUEST']._serialized_start=3216
-  _globals['_CHANGEDOCUMENTREQUEST']._serialized_end=3668
-  _globals['_CHANGEDOCUMENTREQUEST_TEXTDOCUMENTCONTENTCHANGEEVENT']._serialized_start=3528
-  _globals['_CHANGEDOCUMENTREQUEST_TEXTDOCUMENTCONTENTCHANGEEVENT']._serialized_end=3668
-  _globals['_DOCUMENTRANGE']._serialized_start=3671
-  _globals['_DOCUMENTRANGE']._serialized_end=3818
-  _globals['_VERSIONEDTEXTDOCUMENTIDENTIFIER']._serialized_start=3820
-  _globals['_VERSIONEDTEXTDOCUMENTIDENTIFIER']._serialized_end=3883
-  _globals['_POSITION']._serialized_start=3885
-  _globals['_POSITION']._serialized_end=3928
-  _globals['_MARKUPCONTENT']._serialized_start=3930
-  _globals['_MARKUPCONTENT']._serialized_end=3974
-  _globals['_GETCOMPLETIONITEMSREQUEST']._serialized_start=3977
-  _globals['_GETCOMPLETIONITEMSREQUEST']._serialized_end=4341
-  _globals['_COMPLETIONCONTEXT']._serialized_start=4343
-  _globals['_COMPLETIONCONTEXT']._serialized_end=4411
-  _globals['_GETCOMPLETIONITEMSRESPONSE']._serialized_start=4414
-  _globals['_GETCOMPLETIONITEMSRESPONSE']._serialized_end=4560
-  _globals['_COMPLETIONITEM']._serialized_start=4563
-  _globals['_COMPLETIONITEM']._serialized_end=5029
-  _globals['_TEXTEDIT']._serialized_start=5031
-  _globals['_TEXTEDIT']._serialized_end=5127
-  _globals['_GETSIGNATUREHELPREQUEST']._serialized_start=5130
-  _globals['_GETSIGNATUREHELPREQUEST']._serialized_end=5404
-  _globals['_SIGNATUREHELPCONTEXT']._serialized_start=5407
-  _globals['_SIGNATUREHELPCONTEXT']._serialized_end=5626
-  _globals['_GETSIGNATUREHELPRESPONSE']._serialized_start=5629
-  _globals['_GETSIGNATUREHELPRESPONSE']._serialized_end=5843
-  _globals['_SIGNATUREINFORMATION']._serialized_start=5846
-  _globals['_SIGNATUREINFORMATION']._serialized_end=6099
-  _globals['_PARAMETERINFORMATION']._serialized_start=6101
-  _globals['_PARAMETERINFORMATION']._serialized_end=6218
-  _globals['_GETHOVERREQUEST']._serialized_start=6221
-  _globals['_GETHOVERREQUEST']._serialized_end=6406
-  _globals['_GETHOVERRESPONSE']._serialized_start=6409
-  _globals['_GETHOVERRESPONSE']._serialized_end=6574
-  _globals['_GETDIAGNOSTICREQUEST']._serialized_start=6577
-  _globals['_GETDIAGNOSTICREQUEST']._serialized_end=6793
-  _globals['_GETPULLDIAGNOSTICRESPONSE']._serialized_start=6796
-  _globals['_GETPULLDIAGNOSTICRESPONSE']._serialized_end=6944
-  _globals['_GETPUBLISHDIAGNOSTICRESPONSE']._serialized_start=6947
-  _globals['_GETPUBLISHDIAGNOSTICRESPONSE']._serialized_end=7099
-  _globals['_DIAGNOSTIC']._serialized_start=7102
-  _globals['_DIAGNOSTIC']._serialized_end=7781
-  _globals['_DIAGNOSTIC_CODEDESCRIPTION']._serialized_start=7538
-  _globals['_DIAGNOSTIC_CODEDESCRIPTION']._serialized_end=7569
-  _globals['_DIAGNOSTIC_DIAGNOSTICSEVERITY']._serialized_start=7571
-  _globals['_DIAGNOSTIC_DIAGNOSTICSEVERITY']._serialized_end=7664
-  _globals['_DIAGNOSTIC_DIAGNOSTICTAG']._serialized_start=7666
-  _globals['_DIAGNOSTIC_DIAGNOSTICTAG']._serialized_end=7731
-  _globals['_FIGUREDESCRIPTOR']._serialized_start=7784
-  _globals['_FIGUREDESCRIPTOR']._serialized_end=14030
-  _globals['_FIGUREDESCRIPTOR_CHARTDESCRIPTOR']._serialized_start=8031
-  _globals['_FIGUREDESCRIPTOR_CHARTDESCRIPTOR']._serialized_end=8749
-  _globals['_FIGUREDESCRIPTOR_CHARTDESCRIPTOR_CHARTTYPE']._serialized_start=8644
-  _globals['_FIGUREDESCRIPTOR_CHARTDESCRIPTOR_CHARTTYPE']._serialized_end=8739
-  _globals['_FIGUREDESCRIPTOR_SERIESDESCRIPTOR']._serialized_start=8752
-  _globals['_FIGUREDESCRIPTOR_SERIESDESCRIPTOR']._serialized_end=9390
-  _globals['_FIGUREDESCRIPTOR_MULTISERIESDESCRIPTOR']._serialized_start=9393
-  _globals['_FIGUREDESCRIPTOR_MULTISERIESDESCRIPTOR']._serialized_end=10781
-  _globals['_FIGUREDESCRIPTOR_STRINGMAPWITHDEFAULT']._serialized_start=10783
-  _globals['_FIGUREDESCRIPTOR_STRINGMAPWITHDEFAULT']._serialized_end=10883
-  _globals['_FIGUREDESCRIPTOR_DOUBLEMAPWITHDEFAULT']._serialized_start=10885
-  _globals['_FIGUREDESCRIPTOR_DOUBLEMAPWITHDEFAULT']._serialized_end=10985
-  _globals['_FIGUREDESCRIPTOR_BOOLMAPWITHDEFAULT']._serialized_start=10987
-  _globals['_FIGUREDESCRIPTOR_BOOLMAPWITHDEFAULT']._serialized_end=11081
-  _globals['_FIGUREDESCRIPTOR_AXISDESCRIPTOR']._serialized_start=11084
-  _globals['_FIGUREDESCRIPTOR_AXISDESCRIPTOR']._serialized_end=12146
-  _globals['_FIGUREDESCRIPTOR_AXISDESCRIPTOR_AXISFORMATTYPE']._serialized_start=11920
-  _globals['_FIGUREDESCRIPTOR_AXISDESCRIPTOR_AXISFORMATTYPE']._serialized_end=11962
-  _globals['_FIGUREDESCRIPTOR_AXISDESCRIPTOR_AXISTYPE']._serialized_start=11964
-  _globals['_FIGUREDESCRIPTOR_AXISDESCRIPTOR_AXISTYPE']._serialized_end=12031
-  _globals['_FIGUREDESCRIPTOR_AXISDESCRIPTOR_AXISPOSITION']._serialized_start=12033
-  _globals['_FIGUREDESCRIPTOR_AXISDESCRIPTOR_AXISPOSITION']._serialized_end=12099
-  _globals['_FIGUREDESCRIPTOR_BUSINESSCALENDARDESCRIPTOR']._serialized_start=12149
-  _globals['_FIGUREDESCRIPTOR_BUSINESSCALENDARDESCRIPTOR']._serialized_end=13029
-  _globals['_FIGUREDESCRIPTOR_BUSINESSCALENDARDESCRIPTOR_BUSINESSPERIOD']._serialized_start=12573
-  _globals['_FIGUREDESCRIPTOR_BUSINESSCALENDARDESCRIPTOR_BUSINESSPERIOD']._serialized_end=12618
-  _globals['_FIGUREDESCRIPTOR_BUSINESSCALENDARDESCRIPTOR_HOLIDAY']._serialized_start=12621
-  _globals['_FIGUREDESCRIPTOR_BUSINESSCALENDARDESCRIPTOR_HOLIDAY']._serialized_end=12869
-  _globals['_FIGUREDESCRIPTOR_BUSINESSCALENDARDESCRIPTOR_LOCALDATE']._serialized_start=12871
-  _globals['_FIGUREDESCRIPTOR_BUSINESSCALENDARDESCRIPTOR_LOCALDATE']._serialized_end=12924
-  _globals['_FIGUREDESCRIPTOR_BUSINESSCALENDARDESCRIPTOR_DAYOFWEEK']._serialized_start=12926
-  _globals['_FIGUREDESCRIPTOR_BUSINESSCALENDARDESCRIPTOR_DAYOFWEEK']._serialized_end=13029
-  _globals['_FIGUREDESCRIPTOR_MULTISERIESSOURCEDESCRIPTOR']._serialized_start=13032
-  _globals['_FIGUREDESCRIPTOR_MULTISERIESSOURCEDESCRIPTOR']._serialized_end=13214
-  _globals['_FIGUREDESCRIPTOR_SOURCEDESCRIPTOR']._serialized_start=13217
-  _globals['_FIGUREDESCRIPTOR_SOURCEDESCRIPTOR']._serialized_end=13525
-  _globals['_FIGUREDESCRIPTOR_ONECLICKDESCRIPTOR']._serialized_start=13527
-  _globals['_FIGUREDESCRIPTOR_ONECLICKDESCRIPTOR']._serialized_end=13626
-  _globals['_FIGUREDESCRIPTOR_SERIESPLOTSTYLE']._serialized_start=13629
-  _globals['_FIGUREDESCRIPTOR_SERIESPLOTSTYLE']._serialized_end=13795
-  _globals['_FIGUREDESCRIPTOR_SOURCETYPE']._serialized_start=13798
-  _globals['_FIGUREDESCRIPTOR_SOURCETYPE']._serialized_end=14008
-  _globals['_CONSOLESERVICE']._serialized_start=14033
-  _globals['_CONSOLESERVICE']._serialized_end=15747
-# @@protoc_insertion_point(module_scope)
diff --git a/py/client/pydeephaven/proto/console_pb2_grpc.py b/py/client/pydeephaven/proto/console_pb2_grpc.py
deleted file mode 100644
index e29bb6ad66f..00000000000
--- a/py/client/pydeephaven/proto/console_pb2_grpc.py
+++ /dev/null
@@ -1,547 +0,0 @@
-# Generated by the gRPC Python protocol compiler plugin. DO NOT EDIT!
-"""Client and server classes corresponding to protobuf-defined services."""
-import grpc
-import warnings
-
-from pydeephaven.proto import console_pb2 as deephaven_dot_proto_dot_console__pb2
-
-GRPC_GENERATED_VERSION = '1.63.0'
-GRPC_VERSION = grpc.__version__
-EXPECTED_ERROR_RELEASE = '1.65.0'
-SCHEDULED_RELEASE_DATE = 'June 25, 2024'
-_version_not_supported = False
-
-try:
-    from grpc._utilities import first_version_is_lower
-    _version_not_supported = first_version_is_lower(GRPC_VERSION, GRPC_GENERATED_VERSION)
-except ImportError:
-    _version_not_supported = True
-
-if _version_not_supported:
-    warnings.warn(
-        f'The grpc package installed is at version {GRPC_VERSION},'
-        + f' but the generated code in deephaven/proto/console_pb2_grpc.py depends on'
-        + f' grpcio>={GRPC_GENERATED_VERSION}.'
-        + f' Please upgrade your grpc module to grpcio>={GRPC_GENERATED_VERSION}'
-        + f' or downgrade your generated code using grpcio-tools<={GRPC_VERSION}.'
-        + f' This warning will become an error in {EXPECTED_ERROR_RELEASE},'
-        + f' scheduled for release on {SCHEDULED_RELEASE_DATE}.',
-        RuntimeWarning
-    )
-
-
-class ConsoleServiceStub(object):
-    """
-    Console interaction service
-    """
-
-    def __init__(self, channel):
-        """Constructor.
-
-        Args:
-            channel: A grpc.Channel.
-        """
-        self.GetConsoleTypes = channel.unary_unary(
-                '/io.deephaven.proto.backplane.script.grpc.ConsoleService/GetConsoleTypes',
-                request_serializer=deephaven_dot_proto_dot_console__pb2.GetConsoleTypesRequest.SerializeToString,
-                response_deserializer=deephaven_dot_proto_dot_console__pb2.GetConsoleTypesResponse.FromString,
-                _registered_method=True)
-        self.StartConsole = channel.unary_unary(
-                '/io.deephaven.proto.backplane.script.grpc.ConsoleService/StartConsole',
-                request_serializer=deephaven_dot_proto_dot_console__pb2.StartConsoleRequest.SerializeToString,
-                response_deserializer=deephaven_dot_proto_dot_console__pb2.StartConsoleResponse.FromString,
-                _registered_method=True)
-        self.GetHeapInfo = channel.unary_unary(
-                '/io.deephaven.proto.backplane.script.grpc.ConsoleService/GetHeapInfo',
-                request_serializer=deephaven_dot_proto_dot_console__pb2.GetHeapInfoRequest.SerializeToString,
-                response_deserializer=deephaven_dot_proto_dot_console__pb2.GetHeapInfoResponse.FromString,
-                _registered_method=True)
-        self.SubscribeToLogs = channel.unary_stream(
-                '/io.deephaven.proto.backplane.script.grpc.ConsoleService/SubscribeToLogs',
-                request_serializer=deephaven_dot_proto_dot_console__pb2.LogSubscriptionRequest.SerializeToString,
-                response_deserializer=deephaven_dot_proto_dot_console__pb2.LogSubscriptionData.FromString,
-                _registered_method=True)
-        self.ExecuteCommand = channel.unary_unary(
-                '/io.deephaven.proto.backplane.script.grpc.ConsoleService/ExecuteCommand',
-                request_serializer=deephaven_dot_proto_dot_console__pb2.ExecuteCommandRequest.SerializeToString,
-                response_deserializer=deephaven_dot_proto_dot_console__pb2.ExecuteCommandResponse.FromString,
-                _registered_method=True)
-        self.CancelCommand = channel.unary_unary(
-                '/io.deephaven.proto.backplane.script.grpc.ConsoleService/CancelCommand',
-                request_serializer=deephaven_dot_proto_dot_console__pb2.CancelCommandRequest.SerializeToString,
-                response_deserializer=deephaven_dot_proto_dot_console__pb2.CancelCommandResponse.FromString,
-                _registered_method=True)
-        self.BindTableToVariable = channel.unary_unary(
-                '/io.deephaven.proto.backplane.script.grpc.ConsoleService/BindTableToVariable',
-                request_serializer=deephaven_dot_proto_dot_console__pb2.BindTableToVariableRequest.SerializeToString,
-                response_deserializer=deephaven_dot_proto_dot_console__pb2.BindTableToVariableResponse.FromString,
-                _registered_method=True)
-        self.AutoCompleteStream = channel.stream_stream(
-                '/io.deephaven.proto.backplane.script.grpc.ConsoleService/AutoCompleteStream',
-                request_serializer=deephaven_dot_proto_dot_console__pb2.AutoCompleteRequest.SerializeToString,
-                response_deserializer=deephaven_dot_proto_dot_console__pb2.AutoCompleteResponse.FromString,
-                _registered_method=True)
-        self.CancelAutoComplete = channel.unary_unary(
-                '/io.deephaven.proto.backplane.script.grpc.ConsoleService/CancelAutoComplete',
-                request_serializer=deephaven_dot_proto_dot_console__pb2.CancelAutoCompleteRequest.SerializeToString,
-                response_deserializer=deephaven_dot_proto_dot_console__pb2.CancelAutoCompleteResponse.FromString,
-                _registered_method=True)
-        self.OpenAutoCompleteStream = channel.unary_stream(
-                '/io.deephaven.proto.backplane.script.grpc.ConsoleService/OpenAutoCompleteStream',
-                request_serializer=deephaven_dot_proto_dot_console__pb2.AutoCompleteRequest.SerializeToString,
-                response_deserializer=deephaven_dot_proto_dot_console__pb2.AutoCompleteResponse.FromString,
-                _registered_method=True)
-        self.NextAutoCompleteStream = channel.unary_unary(
-                '/io.deephaven.proto.backplane.script.grpc.ConsoleService/NextAutoCompleteStream',
-                request_serializer=deephaven_dot_proto_dot_console__pb2.AutoCompleteRequest.SerializeToString,
-                response_deserializer=deephaven_dot_proto_dot_console__pb2.BrowserNextResponse.FromString,
-                _registered_method=True)
-
-
-class ConsoleServiceServicer(object):
-    """
-    Console interaction service
-    """
-
-    def GetConsoleTypes(self, request, context):
-        """Missing associated documentation comment in .proto file."""
-        context.set_code(grpc.StatusCode.UNIMPLEMENTED)
-        context.set_details('Method not implemented!')
-        raise NotImplementedError('Method not implemented!')
-
-    def StartConsole(self, request, context):
-        """Missing associated documentation comment in .proto file."""
-        context.set_code(grpc.StatusCode.UNIMPLEMENTED)
-        context.set_details('Method not implemented!')
-        raise NotImplementedError('Method not implemented!')
-
-    def GetHeapInfo(self, request, context):
-        """Missing associated documentation comment in .proto file."""
-        context.set_code(grpc.StatusCode.UNIMPLEMENTED)
-        context.set_details('Method not implemented!')
-        raise NotImplementedError('Method not implemented!')
-
-    def SubscribeToLogs(self, request, context):
-        """Missing associated documentation comment in .proto file."""
-        context.set_code(grpc.StatusCode.UNIMPLEMENTED)
-        context.set_details('Method not implemented!')
-        raise NotImplementedError('Method not implemented!')
-
-    def ExecuteCommand(self, request, context):
-        """Missing associated documentation comment in .proto file."""
-        context.set_code(grpc.StatusCode.UNIMPLEMENTED)
-        context.set_details('Method not implemented!')
-        raise NotImplementedError('Method not implemented!')
-
-    def CancelCommand(self, request, context):
-        """Missing associated documentation comment in .proto file."""
-        context.set_code(grpc.StatusCode.UNIMPLEMENTED)
-        context.set_details('Method not implemented!')
-        raise NotImplementedError('Method not implemented!')
-
-    def BindTableToVariable(self, request, context):
-        """Missing associated documentation comment in .proto file."""
-        context.set_code(grpc.StatusCode.UNIMPLEMENTED)
-        context.set_details('Method not implemented!')
-        raise NotImplementedError('Method not implemented!')
-
-    def AutoCompleteStream(self, request_iterator, context):
-        """
-        Starts a stream for autocomplete on the current session. More than one console,
-        more than one document can be edited at a time using this, and they can separately
-        be closed as well. A given document should only be edited within one stream at a
-        time.
-        """
-        context.set_code(grpc.StatusCode.UNIMPLEMENTED)
-        context.set_details('Method not implemented!')
-        raise NotImplementedError('Method not implemented!')
-
-    def CancelAutoComplete(self, request, context):
-        """Missing associated documentation comment in .proto file."""
-        context.set_code(grpc.StatusCode.UNIMPLEMENTED)
-        context.set_details('Method not implemented!')
-        raise NotImplementedError('Method not implemented!')
-
-    def OpenAutoCompleteStream(self, request, context):
-        """
-        Half of the browser-based (browser's can't do bidirectional streams without websockets)
-        implementation for AutoCompleteStream.
-        """
-        context.set_code(grpc.StatusCode.UNIMPLEMENTED)
-        context.set_details('Method not implemented!')
-        raise NotImplementedError('Method not implemented!')
-
-    def NextAutoCompleteStream(self, request, context):
-        """
-        Other half of the browser-based implementation for AutoCompleteStream.
-        """
-        context.set_code(grpc.StatusCode.UNIMPLEMENTED)
-        context.set_details('Method not implemented!')
-        raise NotImplementedError('Method not implemented!')
-
-
-def add_ConsoleServiceServicer_to_server(servicer, server):
-    rpc_method_handlers = {
-            'GetConsoleTypes': grpc.unary_unary_rpc_method_handler(
-                    servicer.GetConsoleTypes,
-                    request_deserializer=deephaven_dot_proto_dot_console__pb2.GetConsoleTypesRequest.FromString,
-                    response_serializer=deephaven_dot_proto_dot_console__pb2.GetConsoleTypesResponse.SerializeToString,
-            ),
-            'StartConsole': grpc.unary_unary_rpc_method_handler(
-                    servicer.StartConsole,
-                    request_deserializer=deephaven_dot_proto_dot_console__pb2.StartConsoleRequest.FromString,
-                    response_serializer=deephaven_dot_proto_dot_console__pb2.StartConsoleResponse.SerializeToString,
-            ),
-            'GetHeapInfo': grpc.unary_unary_rpc_method_handler(
-                    servicer.GetHeapInfo,
-                    request_deserializer=deephaven_dot_proto_dot_console__pb2.GetHeapInfoRequest.FromString,
-                    response_serializer=deephaven_dot_proto_dot_console__pb2.GetHeapInfoResponse.SerializeToString,
-            ),
-            'SubscribeToLogs': grpc.unary_stream_rpc_method_handler(
-                    servicer.SubscribeToLogs,
-                    request_deserializer=deephaven_dot_proto_dot_console__pb2.LogSubscriptionRequest.FromString,
-                    response_serializer=deephaven_dot_proto_dot_console__pb2.LogSubscriptionData.SerializeToString,
-            ),
-            'ExecuteCommand': grpc.unary_unary_rpc_method_handler(
-                    servicer.ExecuteCommand,
-                    request_deserializer=deephaven_dot_proto_dot_console__pb2.ExecuteCommandRequest.FromString,
-                    response_serializer=deephaven_dot_proto_dot_console__pb2.ExecuteCommandResponse.SerializeToString,
-            ),
-            'CancelCommand': grpc.unary_unary_rpc_method_handler(
-                    servicer.CancelCommand,
-                    request_deserializer=deephaven_dot_proto_dot_console__pb2.CancelCommandRequest.FromString,
-                    response_serializer=deephaven_dot_proto_dot_console__pb2.CancelCommandResponse.SerializeToString,
-            ),
-            'BindTableToVariable': grpc.unary_unary_rpc_method_handler(
-                    servicer.BindTableToVariable,
-                    request_deserializer=deephaven_dot_proto_dot_console__pb2.BindTableToVariableRequest.FromString,
-                    response_serializer=deephaven_dot_proto_dot_console__pb2.BindTableToVariableResponse.SerializeToString,
-            ),
-            'AutoCompleteStream': grpc.stream_stream_rpc_method_handler(
-                    servicer.AutoCompleteStream,
-                    request_deserializer=deephaven_dot_proto_dot_console__pb2.AutoCompleteRequest.FromString,
-                    response_serializer=deephaven_dot_proto_dot_console__pb2.AutoCompleteResponse.SerializeToString,
-            ),
-            'CancelAutoComplete': grpc.unary_unary_rpc_method_handler(
-                    servicer.CancelAutoComplete,
-                    request_deserializer=deephaven_dot_proto_dot_console__pb2.CancelAutoCompleteRequest.FromString,
-                    response_serializer=deephaven_dot_proto_dot_console__pb2.CancelAutoCompleteResponse.SerializeToString,
-            ),
-            'OpenAutoCompleteStream': grpc.unary_stream_rpc_method_handler(
-                    servicer.OpenAutoCompleteStream,
-                    request_deserializer=deephaven_dot_proto_dot_console__pb2.AutoCompleteRequest.FromString,
-                    response_serializer=deephaven_dot_proto_dot_console__pb2.AutoCompleteResponse.SerializeToString,
-            ),
-            'NextAutoCompleteStream': grpc.unary_unary_rpc_method_handler(
-                    servicer.NextAutoCompleteStream,
-                    request_deserializer=deephaven_dot_proto_dot_console__pb2.AutoCompleteRequest.FromString,
-                    response_serializer=deephaven_dot_proto_dot_console__pb2.BrowserNextResponse.SerializeToString,
-            ),
-    }
-    generic_handler = grpc.method_handlers_generic_handler(
-            'io.deephaven.proto.backplane.script.grpc.ConsoleService', rpc_method_handlers)
-    server.add_generic_rpc_handlers((generic_handler,))
-
-
- # This class is part of an EXPERIMENTAL API.
-class ConsoleService(object):
-    """
-    Console interaction service
-    """
-
-    @staticmethod
-    def GetConsoleTypes(request,
-            target,
-            options=(),
-            channel_credentials=None,
-            call_credentials=None,
-            insecure=False,
-            compression=None,
-            wait_for_ready=None,
-            timeout=None,
-            metadata=None):
-        return grpc.experimental.unary_unary(
-            request,
-            target,
-            '/io.deephaven.proto.backplane.script.grpc.ConsoleService/GetConsoleTypes',
-            deephaven_dot_proto_dot_console__pb2.GetConsoleTypesRequest.SerializeToString,
-            deephaven_dot_proto_dot_console__pb2.GetConsoleTypesResponse.FromString,
-            options,
-            channel_credentials,
-            insecure,
-            call_credentials,
-            compression,
-            wait_for_ready,
-            timeout,
-            metadata,
-            _registered_method=True)
-
-    @staticmethod
-    def StartConsole(request,
-            target,
-            options=(),
-            channel_credentials=None,
-            call_credentials=None,
-            insecure=False,
-            compression=None,
-            wait_for_ready=None,
-            timeout=None,
-            metadata=None):
-        return grpc.experimental.unary_unary(
-            request,
-            target,
-            '/io.deephaven.proto.backplane.script.grpc.ConsoleService/StartConsole',
-            deephaven_dot_proto_dot_console__pb2.StartConsoleRequest.SerializeToString,
-            deephaven_dot_proto_dot_console__pb2.StartConsoleResponse.FromString,
-            options,
-            channel_credentials,
-            insecure,
-            call_credentials,
-            compression,
-            wait_for_ready,
-            timeout,
-            metadata,
-            _registered_method=True)
-
-    @staticmethod
-    def GetHeapInfo(request,
-            target,
-            options=(),
-            channel_credentials=None,
-            call_credentials=None,
-            insecure=False,
-            compression=None,
-            wait_for_ready=None,
-            timeout=None,
-            metadata=None):
-        return grpc.experimental.unary_unary(
-            request,
-            target,
-            '/io.deephaven.proto.backplane.script.grpc.ConsoleService/GetHeapInfo',
-            deephaven_dot_proto_dot_console__pb2.GetHeapInfoRequest.SerializeToString,
-            deephaven_dot_proto_dot_console__pb2.GetHeapInfoResponse.FromString,
-            options,
-            channel_credentials,
-            insecure,
-            call_credentials,
-            compression,
-            wait_for_ready,
-            timeout,
-            metadata,
-            _registered_method=True)
-
-    @staticmethod
-    def SubscribeToLogs(request,
-            target,
-            options=(),
-            channel_credentials=None,
-            call_credentials=None,
-            insecure=False,
-            compression=None,
-            wait_for_ready=None,
-            timeout=None,
-            metadata=None):
-        return grpc.experimental.unary_stream(
-            request,
-            target,
-            '/io.deephaven.proto.backplane.script.grpc.ConsoleService/SubscribeToLogs',
-            deephaven_dot_proto_dot_console__pb2.LogSubscriptionRequest.SerializeToString,
-            deephaven_dot_proto_dot_console__pb2.LogSubscriptionData.FromString,
-            options,
-            channel_credentials,
-            insecure,
-            call_credentials,
-            compression,
-            wait_for_ready,
-            timeout,
-            metadata,
-            _registered_method=True)
-
-    @staticmethod
-    def ExecuteCommand(request,
-            target,
-            options=(),
-            channel_credentials=None,
-            call_credentials=None,
-            insecure=False,
-            compression=None,
-            wait_for_ready=None,
-            timeout=None,
-            metadata=None):
-        return grpc.experimental.unary_unary(
-            request,
-            target,
-            '/io.deephaven.proto.backplane.script.grpc.ConsoleService/ExecuteCommand',
-            deephaven_dot_proto_dot_console__pb2.ExecuteCommandRequest.SerializeToString,
-            deephaven_dot_proto_dot_console__pb2.ExecuteCommandResponse.FromString,
-            options,
-            channel_credentials,
-            insecure,
-            call_credentials,
-            compression,
-            wait_for_ready,
-            timeout,
-            metadata,
-            _registered_method=True)
-
-    @staticmethod
-    def CancelCommand(request,
-            target,
-            options=(),
-            channel_credentials=None,
-            call_credentials=None,
-            insecure=False,
-            compression=None,
-            wait_for_ready=None,
-            timeout=None,
-            metadata=None):
-        return grpc.experimental.unary_unary(
-            request,
-            target,
-            '/io.deephaven.proto.backplane.script.grpc.ConsoleService/CancelCommand',
-            deephaven_dot_proto_dot_console__pb2.CancelCommandRequest.SerializeToString,
-            deephaven_dot_proto_dot_console__pb2.CancelCommandResponse.FromString,
-            options,
-            channel_credentials,
-            insecure,
-            call_credentials,
-            compression,
-            wait_for_ready,
-            timeout,
-            metadata,
-            _registered_method=True)
-
-    @staticmethod
-    def BindTableToVariable(request,
-            target,
-            options=(),
-            channel_credentials=None,
-            call_credentials=None,
-            insecure=False,
-            compression=None,
-            wait_for_ready=None,
-            timeout=None,
-            metadata=None):
-        return grpc.experimental.unary_unary(
-            request,
-            target,
-            '/io.deephaven.proto.backplane.script.grpc.ConsoleService/BindTableToVariable',
-            deephaven_dot_proto_dot_console__pb2.BindTableToVariableRequest.SerializeToString,
-            deephaven_dot_proto_dot_console__pb2.BindTableToVariableResponse.FromString,
-            options,
-            channel_credentials,
-            insecure,
-            call_credentials,
-            compression,
-            wait_for_ready,
-            timeout,
-            metadata,
-            _registered_method=True)
-
-    @staticmethod
-    def AutoCompleteStream(request_iterator,
-            target,
-            options=(),
-            channel_credentials=None,
-            call_credentials=None,
-            insecure=False,
-            compression=None,
-            wait_for_ready=None,
-            timeout=None,
-            metadata=None):
-        return grpc.experimental.stream_stream(
-            request_iterator,
-            target,
-            '/io.deephaven.proto.backplane.script.grpc.ConsoleService/AutoCompleteStream',
-            deephaven_dot_proto_dot_console__pb2.AutoCompleteRequest.SerializeToString,
-            deephaven_dot_proto_dot_console__pb2.AutoCompleteResponse.FromString,
-            options,
-            channel_credentials,
-            insecure,
-            call_credentials,
-            compression,
-            wait_for_ready,
-            timeout,
-            metadata,
-            _registered_method=True)
-
-    @staticmethod
-    def CancelAutoComplete(request,
-            target,
-            options=(),
-            channel_credentials=None,
-            call_credentials=None,
-            insecure=False,
-            compression=None,
-            wait_for_ready=None,
-            timeout=None,
-            metadata=None):
-        return grpc.experimental.unary_unary(
-            request,
-            target,
-            '/io.deephaven.proto.backplane.script.grpc.ConsoleService/CancelAutoComplete',
-            deephaven_dot_proto_dot_console__pb2.CancelAutoCompleteRequest.SerializeToString,
-            deephaven_dot_proto_dot_console__pb2.CancelAutoCompleteResponse.FromString,
-            options,
-            channel_credentials,
-            insecure,
-            call_credentials,
-            compression,
-            wait_for_ready,
-            timeout,
-            metadata,
-            _registered_method=True)
-
-    @staticmethod
-    def OpenAutoCompleteStream(request,
-            target,
-            options=(),
-            channel_credentials=None,
-            call_credentials=None,
-            insecure=False,
-            compression=None,
-            wait_for_ready=None,
-            timeout=None,
-            metadata=None):
-        return grpc.experimental.unary_stream(
-            request,
-            target,
-            '/io.deephaven.proto.backplane.script.grpc.ConsoleService/OpenAutoCompleteStream',
-            deephaven_dot_proto_dot_console__pb2.AutoCompleteRequest.SerializeToString,
-            deephaven_dot_proto_dot_console__pb2.AutoCompleteResponse.FromString,
-            options,
-            channel_credentials,
-            insecure,
-            call_credentials,
-            compression,
-            wait_for_ready,
-            timeout,
-            metadata,
-            _registered_method=True)
-
-    @staticmethod
-    def NextAutoCompleteStream(request,
-            target,
-            options=(),
-            channel_credentials=None,
-            call_credentials=None,
-            insecure=False,
-            compression=None,
-            wait_for_ready=None,
-            timeout=None,
-            metadata=None):
-        return grpc.experimental.unary_unary(
-            request,
-            target,
-            '/io.deephaven.proto.backplane.script.grpc.ConsoleService/NextAutoCompleteStream',
-            deephaven_dot_proto_dot_console__pb2.AutoCompleteRequest.SerializeToString,
-            deephaven_dot_proto_dot_console__pb2.BrowserNextResponse.FromString,
-            options,
-            channel_credentials,
-            insecure,
-            call_credentials,
-            compression,
-            wait_for_ready,
-            timeout,
-            metadata,
-            _registered_method=True)
diff --git a/py/client/pydeephaven/proto/hierarchicaltable_pb2.py b/py/client/pydeephaven/proto/hierarchicaltable_pb2.py
deleted file mode 100644
index ddb71c06a04..00000000000
--- a/py/client/pydeephaven/proto/hierarchicaltable_pb2.py
+++ /dev/null
@@ -1,51 +0,0 @@
-# -*- coding: utf-8 -*-
-# Generated by the protocol buffer compiler.  DO NOT EDIT!
-# source: deephaven/proto/hierarchicaltable.proto
-# Protobuf Python Version: 5.26.1
-"""Generated protocol buffer code."""
-from google.protobuf import descriptor as _descriptor
-from google.protobuf import descriptor_pool as _descriptor_pool
-from google.protobuf import symbol_database as _symbol_database
-from google.protobuf.internal import builder as _builder
-# @@protoc_insertion_point(imports)
-
-_sym_db = _symbol_database.Default()
-
-
-from pydeephaven.proto import table_pb2 as deephaven_dot_proto_dot_table__pb2
-from pydeephaven.proto import ticket_pb2 as deephaven_dot_proto_dot_ticket__pb2
-
-
-DESCRIPTOR = _descriptor_pool.Default().AddSerializedFile(b'\n\'deephaven/proto/hierarchicaltable.proto\x12!io.deephaven.proto.backplane.grpc\x1a\x1b\x64\x65\x65phaven/proto/table.proto\x1a\x1c\x64\x65\x65phaven/proto/ticket.proto\"\x9c\x02\n\rRollupRequest\x12I\n\x16result_rollup_table_id\x18\x01 \x01(\x0b\x32).io.deephaven.proto.backplane.grpc.Ticket\x12\x42\n\x0fsource_table_id\x18\x02 \x01(\x0b\x32).io.deephaven.proto.backplane.grpc.Ticket\x12\x44\n\x0c\x61ggregations\x18\x03 \x03(\x0b\x32..io.deephaven.proto.backplane.grpc.Aggregation\x12\x1c\n\x14include_constituents\x18\x04 \x01(\x08\x12\x18\n\x10group_by_columns\x18\x05 \x03(\t\"\x10\n\x0eRollupResponse\"\xf0\x01\n\x0bTreeRequest\x12G\n\x14result_tree_table_id\x18\x01 \x01(\x0b\x32).io.deephaven.proto.backplane.grpc.Ticket\x12\x42\n\x0fsource_table_id\x18\x02 \x01(\x0b\x32).io.deephaven.proto.backplane.grpc.Ticket\x12\x19\n\x11identifier_column\x18\x03 \x01(\t\x12 \n\x18parent_identifier_column\x18\x04 \x01(\t\x12\x17\n\x0fpromote_orphans\x18\x05 \x01(\x08\"\x0e\n\x0cTreeResponse\"\xc1\x02\n\x1dHierarchicalTableApplyRequest\x12O\n\x1cresult_hierarchical_table_id\x18\x01 \x01(\x0b\x32).io.deephaven.proto.backplane.grpc.Ticket\x12N\n\x1binput_hierarchical_table_id\x18\x02 \x01(\x0b\x32).io.deephaven.proto.backplane.grpc.Ticket\x12=\n\x07\x66ilters\x18\x03 \x03(\x0b\x32,.io.deephaven.proto.backplane.grpc.Condition\x12@\n\x05sorts\x18\x04 \x03(\x0b\x32\x31.io.deephaven.proto.backplane.grpc.SortDescriptor\" \n\x1eHierarchicalTableApplyResponse\"I\n\x1bHierarchicalTableDescriptor\x12\x17\n\x0fsnapshot_schema\x18\x01 \x01(\x0c\x12\x11\n\tis_static\x18\x02 \x01(\x08\"\xde\x02\n\x1cHierarchicalTableViewRequest\x12\x41\n\x0eresult_view_id\x18\x01 \x01(\x0b\x32).io.deephaven.proto.backplane.grpc.Ticket\x12J\n\x15hierarchical_table_id\x18\x02 \x01(\x0b\x32).io.deephaven.proto.backplane.grpc.TicketH\x00\x12\x45\n\x10\x65xisting_view_id\x18\x03 \x01(\x0b\x32).io.deephaven.proto.backplane.grpc.TicketH\x00\x12^\n\nexpansions\x18\x04 \x01(\x0b\x32J.io.deephaven.proto.backplane.grpc.HierarchicalTableViewKeyTableDescriptorB\x08\n\x06target\"\xac\x01\n\'HierarchicalTableViewKeyTableDescriptor\x12?\n\x0ckey_table_id\x18\x01 \x01(\x0b\x32).io.deephaven.proto.backplane.grpc.Ticket\x12$\n\x17key_table_action_column\x18\x02 \x01(\tH\x00\x88\x01\x01\x42\x1a\n\x18_key_table_action_column\"\x1f\n\x1dHierarchicalTableViewResponse\"\xb4\x01\n$HierarchicalTableSourceExportRequest\x12\x42\n\x0fresult_table_id\x18\x01 \x01(\x0b\x32).io.deephaven.proto.backplane.grpc.Ticket\x12H\n\x15hierarchical_table_id\x18\x02 \x01(\x0b\x32).io.deephaven.proto.backplane.grpc.Ticket2\xa9\x05\n\x18HierarchicalTableService\x12m\n\x06Rollup\x12\x30.io.deephaven.proto.backplane.grpc.RollupRequest\x1a\x31.io.deephaven.proto.backplane.grpc.RollupResponse\x12g\n\x04Tree\x12..io.deephaven.proto.backplane.grpc.TreeRequest\x1a/.io.deephaven.proto.backplane.grpc.TreeResponse\x12\x8c\x01\n\x05\x41pply\x12@.io.deephaven.proto.backplane.grpc.HierarchicalTableApplyRequest\x1a\x41.io.deephaven.proto.backplane.grpc.HierarchicalTableApplyResponse\x12\x89\x01\n\x04View\x12?.io.deephaven.proto.backplane.grpc.HierarchicalTableViewRequest\x1a@.io.deephaven.proto.backplane.grpc.HierarchicalTableViewResponse\x12\x99\x01\n\x0c\x45xportSource\x12G.io.deephaven.proto.backplane.grpc.HierarchicalTableSourceExportRequest\x1a@.io.deephaven.proto.backplane.grpc.ExportedTableCreationResponseBMH\x01P\x01ZGgithub.com/deephaven/deephaven-core/go/internal/proto/hierarchicaltableb\x06proto3')
-
-_globals = globals()
-_builder.BuildMessageAndEnumDescriptors(DESCRIPTOR, _globals)
-_builder.BuildTopDescriptorsAndMessages(DESCRIPTOR, 'deephaven.proto.hierarchicaltable_pb2', _globals)
-if not _descriptor._USE_C_DESCRIPTORS:
-  _globals['DESCRIPTOR']._loaded_options = None
-  _globals['DESCRIPTOR']._serialized_options = b'H\001P\001ZGgithub.com/deephaven/deephaven-core/go/internal/proto/hierarchicaltable'
-  _globals['_ROLLUPREQUEST']._serialized_start=138
-  _globals['_ROLLUPREQUEST']._serialized_end=422
-  _globals['_ROLLUPRESPONSE']._serialized_start=424
-  _globals['_ROLLUPRESPONSE']._serialized_end=440
-  _globals['_TREEREQUEST']._serialized_start=443
-  _globals['_TREEREQUEST']._serialized_end=683
-  _globals['_TREERESPONSE']._serialized_start=685
-  _globals['_TREERESPONSE']._serialized_end=699
-  _globals['_HIERARCHICALTABLEAPPLYREQUEST']._serialized_start=702
-  _globals['_HIERARCHICALTABLEAPPLYREQUEST']._serialized_end=1023
-  _globals['_HIERARCHICALTABLEAPPLYRESPONSE']._serialized_start=1025
-  _globals['_HIERARCHICALTABLEAPPLYRESPONSE']._serialized_end=1057
-  _globals['_HIERARCHICALTABLEDESCRIPTOR']._serialized_start=1059
-  _globals['_HIERARCHICALTABLEDESCRIPTOR']._serialized_end=1132
-  _globals['_HIERARCHICALTABLEVIEWREQUEST']._serialized_start=1135
-  _globals['_HIERARCHICALTABLEVIEWREQUEST']._serialized_end=1485
-  _globals['_HIERARCHICALTABLEVIEWKEYTABLEDESCRIPTOR']._serialized_start=1488
-  _globals['_HIERARCHICALTABLEVIEWKEYTABLEDESCRIPTOR']._serialized_end=1660
-  _globals['_HIERARCHICALTABLEVIEWRESPONSE']._serialized_start=1662
-  _globals['_HIERARCHICALTABLEVIEWRESPONSE']._serialized_end=1693
-  _globals['_HIERARCHICALTABLESOURCEEXPORTREQUEST']._serialized_start=1696
-  _globals['_HIERARCHICALTABLESOURCEEXPORTREQUEST']._serialized_end=1876
-  _globals['_HIERARCHICALTABLESERVICE']._serialized_start=1879
-  _globals['_HIERARCHICALTABLESERVICE']._serialized_end=2560
-# @@protoc_insertion_point(module_scope)
diff --git a/py/client/pydeephaven/proto/hierarchicaltable_pb2_grpc.py b/py/client/pydeephaven/proto/hierarchicaltable_pb2_grpc.py
deleted file mode 100644
index a1c0346ed63..00000000000
--- a/py/client/pydeephaven/proto/hierarchicaltable_pb2_grpc.py
+++ /dev/null
@@ -1,284 +0,0 @@
-# Generated by the gRPC Python protocol compiler plugin. DO NOT EDIT!
-"""Client and server classes corresponding to protobuf-defined services."""
-import grpc
-import warnings
-
-from pydeephaven.proto import hierarchicaltable_pb2 as deephaven_dot_proto_dot_hierarchicaltable__pb2
-from pydeephaven.proto import table_pb2 as deephaven_dot_proto_dot_table__pb2
-
-GRPC_GENERATED_VERSION = '1.63.0'
-GRPC_VERSION = grpc.__version__
-EXPECTED_ERROR_RELEASE = '1.65.0'
-SCHEDULED_RELEASE_DATE = 'June 25, 2024'
-_version_not_supported = False
-
-try:
-    from grpc._utilities import first_version_is_lower
-    _version_not_supported = first_version_is_lower(GRPC_VERSION, GRPC_GENERATED_VERSION)
-except ImportError:
-    _version_not_supported = True
-
-if _version_not_supported:
-    warnings.warn(
-        f'The grpc package installed is at version {GRPC_VERSION},'
-        + f' but the generated code in deephaven/proto/hierarchicaltable_pb2_grpc.py depends on'
-        + f' grpcio>={GRPC_GENERATED_VERSION}.'
-        + f' Please upgrade your grpc module to grpcio>={GRPC_GENERATED_VERSION}'
-        + f' or downgrade your generated code using grpcio-tools<={GRPC_VERSION}.'
-        + f' This warning will become an error in {EXPECTED_ERROR_RELEASE},'
-        + f' scheduled for release on {SCHEDULED_RELEASE_DATE}.',
-        RuntimeWarning
-    )
-
-
-class HierarchicalTableServiceStub(object):
-    """This service provides tools to create and view hierarchical tables (rollups and trees).
-    """
-
-    def __init__(self, channel):
-        """Constructor.
-
-        Args:
-            channel: A grpc.Channel.
-        """
-        self.Rollup = channel.unary_unary(
-                '/io.deephaven.proto.backplane.grpc.HierarchicalTableService/Rollup',
-                request_serializer=deephaven_dot_proto_dot_hierarchicaltable__pb2.RollupRequest.SerializeToString,
-                response_deserializer=deephaven_dot_proto_dot_hierarchicaltable__pb2.RollupResponse.FromString,
-                _registered_method=True)
-        self.Tree = channel.unary_unary(
-                '/io.deephaven.proto.backplane.grpc.HierarchicalTableService/Tree',
-                request_serializer=deephaven_dot_proto_dot_hierarchicaltable__pb2.TreeRequest.SerializeToString,
-                response_deserializer=deephaven_dot_proto_dot_hierarchicaltable__pb2.TreeResponse.FromString,
-                _registered_method=True)
-        self.Apply = channel.unary_unary(
-                '/io.deephaven.proto.backplane.grpc.HierarchicalTableService/Apply',
-                request_serializer=deephaven_dot_proto_dot_hierarchicaltable__pb2.HierarchicalTableApplyRequest.SerializeToString,
-                response_deserializer=deephaven_dot_proto_dot_hierarchicaltable__pb2.HierarchicalTableApplyResponse.FromString,
-                _registered_method=True)
-        self.View = channel.unary_unary(
-                '/io.deephaven.proto.backplane.grpc.HierarchicalTableService/View',
-                request_serializer=deephaven_dot_proto_dot_hierarchicaltable__pb2.HierarchicalTableViewRequest.SerializeToString,
-                response_deserializer=deephaven_dot_proto_dot_hierarchicaltable__pb2.HierarchicalTableViewResponse.FromString,
-                _registered_method=True)
-        self.ExportSource = channel.unary_unary(
-                '/io.deephaven.proto.backplane.grpc.HierarchicalTableService/ExportSource',
-                request_serializer=deephaven_dot_proto_dot_hierarchicaltable__pb2.HierarchicalTableSourceExportRequest.SerializeToString,
-                response_deserializer=deephaven_dot_proto_dot_table__pb2.ExportedTableCreationResponse.FromString,
-                _registered_method=True)
-
-
-class HierarchicalTableServiceServicer(object):
-    """This service provides tools to create and view hierarchical tables (rollups and trees).
-    """
-
-    def Rollup(self, request, context):
-        """Applies a rollup operation to a Table and exports the resulting RollupTable
-        """
-        context.set_code(grpc.StatusCode.UNIMPLEMENTED)
-        context.set_details('Method not implemented!')
-        raise NotImplementedError('Method not implemented!')
-
-    def Tree(self, request, context):
-        """Applies a tree operation to a Table and exports the resulting TreeTable
-        """
-        context.set_code(grpc.StatusCode.UNIMPLEMENTED)
-        context.set_details('Method not implemented!')
-        raise NotImplementedError('Method not implemented!')
-
-    def Apply(self, request, context):
-        """Applies operations to an existing HierarchicalTable (RollupTable or TreeTable) and exports the resulting
-        HierarchicalTable
-        """
-        context.set_code(grpc.StatusCode.UNIMPLEMENTED)
-        context.set_details('Method not implemented!')
-        raise NotImplementedError('Method not implemented!')
-
-    def View(self, request, context):
-        """Creates a view associating a Table of expansion keys and actions with an existing HierarchicalTable and exports
-        the resulting HierarchicalTableView for subsequent snapshot or subscription requests
-        """
-        context.set_code(grpc.StatusCode.UNIMPLEMENTED)
-        context.set_details('Method not implemented!')
-        raise NotImplementedError('Method not implemented!')
-
-    def ExportSource(self, request, context):
-        """Exports the source Table for a HierarchicalTable (Rollup or TreeTable)
-        """
-        context.set_code(grpc.StatusCode.UNIMPLEMENTED)
-        context.set_details('Method not implemented!')
-        raise NotImplementedError('Method not implemented!')
-
-
-def add_HierarchicalTableServiceServicer_to_server(servicer, server):
-    rpc_method_handlers = {
-            'Rollup': grpc.unary_unary_rpc_method_handler(
-                    servicer.Rollup,
-                    request_deserializer=deephaven_dot_proto_dot_hierarchicaltable__pb2.RollupRequest.FromString,
-                    response_serializer=deephaven_dot_proto_dot_hierarchicaltable__pb2.RollupResponse.SerializeToString,
-            ),
-            'Tree': grpc.unary_unary_rpc_method_handler(
-                    servicer.Tree,
-                    request_deserializer=deephaven_dot_proto_dot_hierarchicaltable__pb2.TreeRequest.FromString,
-                    response_serializer=deephaven_dot_proto_dot_hierarchicaltable__pb2.TreeResponse.SerializeToString,
-            ),
-            'Apply': grpc.unary_unary_rpc_method_handler(
-                    servicer.Apply,
-                    request_deserializer=deephaven_dot_proto_dot_hierarchicaltable__pb2.HierarchicalTableApplyRequest.FromString,
-                    response_serializer=deephaven_dot_proto_dot_hierarchicaltable__pb2.HierarchicalTableApplyResponse.SerializeToString,
-            ),
-            'View': grpc.unary_unary_rpc_method_handler(
-                    servicer.View,
-                    request_deserializer=deephaven_dot_proto_dot_hierarchicaltable__pb2.HierarchicalTableViewRequest.FromString,
-                    response_serializer=deephaven_dot_proto_dot_hierarchicaltable__pb2.HierarchicalTableViewResponse.SerializeToString,
-            ),
-            'ExportSource': grpc.unary_unary_rpc_method_handler(
-                    servicer.ExportSource,
-                    request_deserializer=deephaven_dot_proto_dot_hierarchicaltable__pb2.HierarchicalTableSourceExportRequest.FromString,
-                    response_serializer=deephaven_dot_proto_dot_table__pb2.ExportedTableCreationResponse.SerializeToString,
-            ),
-    }
-    generic_handler = grpc.method_handlers_generic_handler(
-            'io.deephaven.proto.backplane.grpc.HierarchicalTableService', rpc_method_handlers)
-    server.add_generic_rpc_handlers((generic_handler,))
-
-
- # This class is part of an EXPERIMENTAL API.
-class HierarchicalTableService(object):
-    """This service provides tools to create and view hierarchical tables (rollups and trees).
-    """
-
-    @staticmethod
-    def Rollup(request,
-            target,
-            options=(),
-            channel_credentials=None,
-            call_credentials=None,
-            insecure=False,
-            compression=None,
-            wait_for_ready=None,
-            timeout=None,
-            metadata=None):
-        return grpc.experimental.unary_unary(
-            request,
-            target,
-            '/io.deephaven.proto.backplane.grpc.HierarchicalTableService/Rollup',
-            deephaven_dot_proto_dot_hierarchicaltable__pb2.RollupRequest.SerializeToString,
-            deephaven_dot_proto_dot_hierarchicaltable__pb2.RollupResponse.FromString,
-            options,
-            channel_credentials,
-            insecure,
-            call_credentials,
-            compression,
-            wait_for_ready,
-            timeout,
-            metadata,
-            _registered_method=True)
-
-    @staticmethod
-    def Tree(request,
-            target,
-            options=(),
-            channel_credentials=None,
-            call_credentials=None,
-            insecure=False,
-            compression=None,
-            wait_for_ready=None,
-            timeout=None,
-            metadata=None):
-        return grpc.experimental.unary_unary(
-            request,
-            target,
-            '/io.deephaven.proto.backplane.grpc.HierarchicalTableService/Tree',
-            deephaven_dot_proto_dot_hierarchicaltable__pb2.TreeRequest.SerializeToString,
-            deephaven_dot_proto_dot_hierarchicaltable__pb2.TreeResponse.FromString,
-            options,
-            channel_credentials,
-            insecure,
-            call_credentials,
-            compression,
-            wait_for_ready,
-            timeout,
-            metadata,
-            _registered_method=True)
-
-    @staticmethod
-    def Apply(request,
-            target,
-            options=(),
-            channel_credentials=None,
-            call_credentials=None,
-            insecure=False,
-            compression=None,
-            wait_for_ready=None,
-            timeout=None,
-            metadata=None):
-        return grpc.experimental.unary_unary(
-            request,
-            target,
-            '/io.deephaven.proto.backplane.grpc.HierarchicalTableService/Apply',
-            deephaven_dot_proto_dot_hierarchicaltable__pb2.HierarchicalTableApplyRequest.SerializeToString,
-            deephaven_dot_proto_dot_hierarchicaltable__pb2.HierarchicalTableApplyResponse.FromString,
-            options,
-            channel_credentials,
-            insecure,
-            call_credentials,
-            compression,
-            wait_for_ready,
-            timeout,
-            metadata,
-            _registered_method=True)
-
-    @staticmethod
-    def View(request,
-            target,
-            options=(),
-            channel_credentials=None,
-            call_credentials=None,
-            insecure=False,
-            compression=None,
-            wait_for_ready=None,
-            timeout=None,
-            metadata=None):
-        return grpc.experimental.unary_unary(
-            request,
-            target,
-            '/io.deephaven.proto.backplane.grpc.HierarchicalTableService/View',
-            deephaven_dot_proto_dot_hierarchicaltable__pb2.HierarchicalTableViewRequest.SerializeToString,
-            deephaven_dot_proto_dot_hierarchicaltable__pb2.HierarchicalTableViewResponse.FromString,
-            options,
-            channel_credentials,
-            insecure,
-            call_credentials,
-            compression,
-            wait_for_ready,
-            timeout,
-            metadata,
-            _registered_method=True)
-
-    @staticmethod
-    def ExportSource(request,
-            target,
-            options=(),
-            channel_credentials=None,
-            call_credentials=None,
-            insecure=False,
-            compression=None,
-            wait_for_ready=None,
-            timeout=None,
-            metadata=None):
-        return grpc.experimental.unary_unary(
-            request,
-            target,
-            '/io.deephaven.proto.backplane.grpc.HierarchicalTableService/ExportSource',
-            deephaven_dot_proto_dot_hierarchicaltable__pb2.HierarchicalTableSourceExportRequest.SerializeToString,
-            deephaven_dot_proto_dot_table__pb2.ExportedTableCreationResponse.FromString,
-            options,
-            channel_credentials,
-            insecure,
-            call_credentials,
-            compression,
-            wait_for_ready,
-            timeout,
-            metadata,
-            _registered_method=True)
diff --git a/py/client/pydeephaven/proto/inputtable_pb2.py b/py/client/pydeephaven/proto/inputtable_pb2.py
deleted file mode 100644
index dcc07bb5411..00000000000
--- a/py/client/pydeephaven/proto/inputtable_pb2.py
+++ /dev/null
@@ -1,36 +0,0 @@
-# -*- coding: utf-8 -*-
-# Generated by the protocol buffer compiler.  DO NOT EDIT!
-# source: deephaven/proto/inputtable.proto
-# Protobuf Python Version: 5.26.1
-"""Generated protocol buffer code."""
-from google.protobuf import descriptor as _descriptor
-from google.protobuf import descriptor_pool as _descriptor_pool
-from google.protobuf import symbol_database as _symbol_database
-from google.protobuf.internal import builder as _builder
-# @@protoc_insertion_point(imports)
-
-_sym_db = _symbol_database.Default()
-
-
-from pydeephaven.proto import ticket_pb2 as deephaven_dot_proto_dot_ticket__pb2
-
-
-DESCRIPTOR = _descriptor_pool.Default().AddSerializedFile(b'\n deephaven/proto/inputtable.proto\x12!io.deephaven.proto.backplane.grpc\x1a\x1c\x64\x65\x65phaven/proto/ticket.proto\"\x92\x01\n\x0f\x41\x64\x64TableRequest\x12>\n\x0binput_table\x18\x01 \x01(\x0b\x32).io.deephaven.proto.backplane.grpc.Ticket\x12?\n\x0ctable_to_add\x18\x02 \x01(\x0b\x32).io.deephaven.proto.backplane.grpc.Ticket\"\x12\n\x10\x41\x64\x64TableResponse\"\x98\x01\n\x12\x44\x65leteTableRequest\x12>\n\x0binput_table\x18\x01 \x01(\x0b\x32).io.deephaven.proto.backplane.grpc.Ticket\x12\x42\n\x0ftable_to_remove\x18\x02 \x01(\x0b\x32).io.deephaven.proto.backplane.grpc.Ticket\"\x15\n\x13\x44\x65leteTableResponse2\xa6\x02\n\x11InputTableService\x12\x81\x01\n\x14\x41\x64\x64TableToInputTable\x12\x32.io.deephaven.proto.backplane.grpc.AddTableRequest\x1a\x33.io.deephaven.proto.backplane.grpc.AddTableResponse\"\x00\x12\x8c\x01\n\x19\x44\x65leteTableFromInputTable\x12\x35.io.deephaven.proto.backplane.grpc.DeleteTableRequest\x1a\x36.io.deephaven.proto.backplane.grpc.DeleteTableResponse\"\x00\x42\x46H\x01P\x01Z@github.com/deephaven/deephaven-core/go/internal/proto/inputtableb\x06proto3')
-
-_globals = globals()
-_builder.BuildMessageAndEnumDescriptors(DESCRIPTOR, _globals)
-_builder.BuildTopDescriptorsAndMessages(DESCRIPTOR, 'deephaven.proto.inputtable_pb2', _globals)
-if not _descriptor._USE_C_DESCRIPTORS:
-  _globals['DESCRIPTOR']._loaded_options = None
-  _globals['DESCRIPTOR']._serialized_options = b'H\001P\001Z@github.com/deephaven/deephaven-core/go/internal/proto/inputtable'
-  _globals['_ADDTABLEREQUEST']._serialized_start=102
-  _globals['_ADDTABLEREQUEST']._serialized_end=248
-  _globals['_ADDTABLERESPONSE']._serialized_start=250
-  _globals['_ADDTABLERESPONSE']._serialized_end=268
-  _globals['_DELETETABLEREQUEST']._serialized_start=271
-  _globals['_DELETETABLEREQUEST']._serialized_end=423
-  _globals['_DELETETABLERESPONSE']._serialized_start=425
-  _globals['_DELETETABLERESPONSE']._serialized_end=446
-  _globals['_INPUTTABLESERVICE']._serialized_start=449
-  _globals['_INPUTTABLESERVICE']._serialized_end=743
-# @@protoc_insertion_point(module_scope)
diff --git a/py/client/pydeephaven/proto/object_pb2.py b/py/client/pydeephaven/proto/object_pb2.py
deleted file mode 100644
index ab35bb5deb5..00000000000
--- a/py/client/pydeephaven/proto/object_pb2.py
+++ /dev/null
@@ -1,46 +0,0 @@
-# -*- coding: utf-8 -*-
-# Generated by the protocol buffer compiler.  DO NOT EDIT!
-# source: deephaven/proto/object.proto
-# Protobuf Python Version: 5.26.1
-"""Generated protocol buffer code."""
-from google.protobuf import descriptor as _descriptor
-from google.protobuf import descriptor_pool as _descriptor_pool
-from google.protobuf import symbol_database as _symbol_database
-from google.protobuf.internal import builder as _builder
-# @@protoc_insertion_point(imports)
-
-_sym_db = _symbol_database.Default()
-
-
-from pydeephaven.proto import ticket_pb2 as deephaven_dot_proto_dot_ticket__pb2
-
-
-DESCRIPTOR = _descriptor_pool.Default().AddSerializedFile(b'\n\x1c\x64\x65\x65phaven/proto/object.proto\x12!io.deephaven.proto.backplane.grpc\x1a\x1c\x64\x65\x65phaven/proto/ticket.proto\"W\n\x12\x46\x65tchObjectRequest\x12\x41\n\tsource_id\x18\x01 \x01(\x0b\x32..io.deephaven.proto.backplane.grpc.TypedTicket\"{\n\x13\x46\x65tchObjectResponse\x12\x0c\n\x04type\x18\x01 \x01(\t\x12\x0c\n\x04\x64\x61ta\x18\x02 \x01(\x0c\x12H\n\x10typed_export_ids\x18\x03 \x03(\x0b\x32..io.deephaven.proto.backplane.grpc.TypedTicket\"S\n\x0e\x43onnectRequest\x12\x41\n\tsource_id\x18\x01 \x01(\x0b\x32..io.deephaven.proto.backplane.grpc.TypedTicket\"a\n\nClientData\x12\x0f\n\x07payload\x18\x01 \x01(\x0c\x12\x42\n\nreferences\x18\x02 \x03(\x0b\x32..io.deephaven.proto.backplane.grpc.TypedTicket\"j\n\nServerData\x12\x0f\n\x07payload\x18\x01 \x01(\x0c\x12K\n\x13\x65xported_references\x18\x02 \x03(\x0b\x32..io.deephaven.proto.backplane.grpc.TypedTicket\"\x9f\x01\n\rStreamRequest\x12\x44\n\x07\x63onnect\x18\x01 \x01(\x0b\x32\x31.io.deephaven.proto.backplane.grpc.ConnectRequestH\x00\x12=\n\x04\x64\x61ta\x18\x02 \x01(\x0b\x32-.io.deephaven.proto.backplane.grpc.ClientDataH\x00\x42\t\n\x07message\"Z\n\x0eStreamResponse\x12=\n\x04\x64\x61ta\x18\x01 \x01(\x0b\x32-.io.deephaven.proto.backplane.grpc.ServerDataH\x00\x42\t\n\x07message\"\x15\n\x13\x42rowserNextResponse2\x8e\x04\n\rObjectService\x12\x81\x01\n\x0b\x46\x65tchObject\x12\x35.io.deephaven.proto.backplane.grpc.FetchObjectRequest\x1a\x36.io.deephaven.proto.backplane.grpc.FetchObjectResponse\"\x03\x88\x02\x01\x12z\n\rMessageStream\x12\x30.io.deephaven.proto.backplane.grpc.StreamRequest\x1a\x31.io.deephaven.proto.backplane.grpc.StreamResponse\"\x00(\x01\x30\x01\x12|\n\x11OpenMessageStream\x12\x30.io.deephaven.proto.backplane.grpc.StreamRequest\x1a\x31.io.deephaven.proto.backplane.grpc.StreamResponse\"\x00\x30\x01\x12\x7f\n\x11NextMessageStream\x12\x30.io.deephaven.proto.backplane.grpc.StreamRequest\x1a\x36.io.deephaven.proto.backplane.grpc.BrowserNextResponse\"\x00\x42\x42H\x01P\x01Z<github.com/deephaven/deephaven-core/go/internal/proto/objectb\x06proto3')
-
-_globals = globals()
-_builder.BuildMessageAndEnumDescriptors(DESCRIPTOR, _globals)
-_builder.BuildTopDescriptorsAndMessages(DESCRIPTOR, 'deephaven.proto.object_pb2', _globals)
-if not _descriptor._USE_C_DESCRIPTORS:
-  _globals['DESCRIPTOR']._loaded_options = None
-  _globals['DESCRIPTOR']._serialized_options = b'H\001P\001Z<github.com/deephaven/deephaven-core/go/internal/proto/object'
-  _globals['_OBJECTSERVICE'].methods_by_name['FetchObject']._loaded_options = None
-  _globals['_OBJECTSERVICE'].methods_by_name['FetchObject']._serialized_options = b'\210\002\001'
-  _globals['_FETCHOBJECTREQUEST']._serialized_start=97
-  _globals['_FETCHOBJECTREQUEST']._serialized_end=184
-  _globals['_FETCHOBJECTRESPONSE']._serialized_start=186
-  _globals['_FETCHOBJECTRESPONSE']._serialized_end=309
-  _globals['_CONNECTREQUEST']._serialized_start=311
-  _globals['_CONNECTREQUEST']._serialized_end=394
-  _globals['_CLIENTDATA']._serialized_start=396
-  _globals['_CLIENTDATA']._serialized_end=493
-  _globals['_SERVERDATA']._serialized_start=495
-  _globals['_SERVERDATA']._serialized_end=601
-  _globals['_STREAMREQUEST']._serialized_start=604
-  _globals['_STREAMREQUEST']._serialized_end=763
-  _globals['_STREAMRESPONSE']._serialized_start=765
-  _globals['_STREAMRESPONSE']._serialized_end=855
-  _globals['_BROWSERNEXTRESPONSE']._serialized_start=857
-  _globals['_BROWSERNEXTRESPONSE']._serialized_end=878
-  _globals['_OBJECTSERVICE']._serialized_start=881
-  _globals['_OBJECTSERVICE']._serialized_end=1407
-# @@protoc_insertion_point(module_scope)
diff --git a/py/client/pydeephaven/proto/partitionedtable_pb2.py b/py/client/pydeephaven/proto/partitionedtable_pb2.py
deleted file mode 100644
index f06f84d5f19..00000000000
--- a/py/client/pydeephaven/proto/partitionedtable_pb2.py
+++ /dev/null
@@ -1,39 +0,0 @@
-# -*- coding: utf-8 -*-
-# Generated by the protocol buffer compiler.  DO NOT EDIT!
-# source: deephaven/proto/partitionedtable.proto
-# Protobuf Python Version: 5.26.1
-"""Generated protocol buffer code."""
-from google.protobuf import descriptor as _descriptor
-from google.protobuf import descriptor_pool as _descriptor_pool
-from google.protobuf import symbol_database as _symbol_database
-from google.protobuf.internal import builder as _builder
-# @@protoc_insertion_point(imports)
-
-_sym_db = _symbol_database.Default()
-
-
-from pydeephaven.proto import table_pb2 as deephaven_dot_proto_dot_table__pb2
-from pydeephaven.proto import ticket_pb2 as deephaven_dot_proto_dot_ticket__pb2
-
-
-DESCRIPTOR = _descriptor_pool.Default().AddSerializedFile(b'\n&deephaven/proto/partitionedtable.proto\x12!io.deephaven.proto.backplane.grpc\x1a\x1b\x64\x65\x65phaven/proto/table.proto\x1a\x1c\x64\x65\x65phaven/proto/ticket.proto\"\xbc\x01\n\x12PartitionByRequest\x12;\n\x08table_id\x18\x01 \x01(\x0b\x32).io.deephaven.proto.backplane.grpc.Ticket\x12<\n\tresult_id\x18\x02 \x01(\x0b\x32).io.deephaven.proto.backplane.grpc.Ticket\x12\x18\n\x10key_column_names\x18\x03 \x03(\t\x12\x11\n\tdrop_keys\x18\x04 \x01(\x08\"\x15\n\x13PartitionByResponse\"\x92\x01\n\x0cMergeRequest\x12\x44\n\x11partitioned_table\x18\x01 \x01(\x0b\x32).io.deephaven.proto.backplane.grpc.Ticket\x12<\n\tresult_id\x18\x02 \x01(\x0b\x32).io.deephaven.proto.backplane.grpc.Ticket\"\xda\x01\n\x0fGetTableRequest\x12\x44\n\x11partitioned_table\x18\x01 \x01(\x0b\x32).io.deephaven.proto.backplane.grpc.Ticket\x12\x43\n\x10key_table_ticket\x18\x02 \x01(\x0b\x32).io.deephaven.proto.backplane.grpc.Ticket\x12<\n\tresult_id\x18\x04 \x01(\x0b\x32).io.deephaven.proto.backplane.grpc.Ticket\"\xba\x01\n\x1aPartitionedTableDescriptor\x12\x18\n\x10key_column_names\x18\x01 \x03(\t\x12\x1f\n\x17\x63onstituent_column_name\x18\x04 \x01(\t\x12\x13\n\x0bunique_keys\x18\x02 \x01(\x08\x12%\n\x1d\x63onstituent_definition_schema\x18\x03 \x01(\x0c\x12%\n\x1d\x63onstituent_changes_permitted\x18\x05 \x01(\x08\x32\x96\x03\n\x17PartitionedTableService\x12|\n\x0bPartitionBy\x12\x35.io.deephaven.proto.backplane.grpc.PartitionByRequest\x1a\x36.io.deephaven.proto.backplane.grpc.PartitionByResponse\x12z\n\x05Merge\x12/.io.deephaven.proto.backplane.grpc.MergeRequest\x1a@.io.deephaven.proto.backplane.grpc.ExportedTableCreationResponse\x12\x80\x01\n\x08GetTable\x12\x32.io.deephaven.proto.backplane.grpc.GetTableRequest\x1a@.io.deephaven.proto.backplane.grpc.ExportedTableCreationResponseBLH\x01P\x01ZFgithub.com/deephaven/deephaven-core/go/internal/proto/partitionedtableb\x06proto3')
-
-_globals = globals()
-_builder.BuildMessageAndEnumDescriptors(DESCRIPTOR, _globals)
-_builder.BuildTopDescriptorsAndMessages(DESCRIPTOR, 'deephaven.proto.partitionedtable_pb2', _globals)
-if not _descriptor._USE_C_DESCRIPTORS:
-  _globals['DESCRIPTOR']._loaded_options = None
-  _globals['DESCRIPTOR']._serialized_options = b'H\001P\001ZFgithub.com/deephaven/deephaven-core/go/internal/proto/partitionedtable'
-  _globals['_PARTITIONBYREQUEST']._serialized_start=137
-  _globals['_PARTITIONBYREQUEST']._serialized_end=325
-  _globals['_PARTITIONBYRESPONSE']._serialized_start=327
-  _globals['_PARTITIONBYRESPONSE']._serialized_end=348
-  _globals['_MERGEREQUEST']._serialized_start=351
-  _globals['_MERGEREQUEST']._serialized_end=497
-  _globals['_GETTABLEREQUEST']._serialized_start=500
-  _globals['_GETTABLEREQUEST']._serialized_end=718
-  _globals['_PARTITIONEDTABLEDESCRIPTOR']._serialized_start=721
-  _globals['_PARTITIONEDTABLEDESCRIPTOR']._serialized_end=907
-  _globals['_PARTITIONEDTABLESERVICE']._serialized_start=910
-  _globals['_PARTITIONEDTABLESERVICE']._serialized_end=1316
-# @@protoc_insertion_point(module_scope)
diff --git a/py/client/pydeephaven/proto/partitionedtable_pb2_grpc.py b/py/client/pydeephaven/proto/partitionedtable_pb2_grpc.py
deleted file mode 100644
index e5250e4cd26..00000000000
--- a/py/client/pydeephaven/proto/partitionedtable_pb2_grpc.py
+++ /dev/null
@@ -1,212 +0,0 @@
-# Generated by the gRPC Python protocol compiler plugin. DO NOT EDIT!
-"""Client and server classes corresponding to protobuf-defined services."""
-import grpc
-import warnings
-
-from pydeephaven.proto import partitionedtable_pb2 as deephaven_dot_proto_dot_partitionedtable__pb2
-from pydeephaven.proto import table_pb2 as deephaven_dot_proto_dot_table__pb2
-
-GRPC_GENERATED_VERSION = '1.63.0'
-GRPC_VERSION = grpc.__version__
-EXPECTED_ERROR_RELEASE = '1.65.0'
-SCHEDULED_RELEASE_DATE = 'June 25, 2024'
-_version_not_supported = False
-
-try:
-    from grpc._utilities import first_version_is_lower
-    _version_not_supported = first_version_is_lower(GRPC_VERSION, GRPC_GENERATED_VERSION)
-except ImportError:
-    _version_not_supported = True
-
-if _version_not_supported:
-    warnings.warn(
-        f'The grpc package installed is at version {GRPC_VERSION},'
-        + f' but the generated code in deephaven/proto/partitionedtable_pb2_grpc.py depends on'
-        + f' grpcio>={GRPC_GENERATED_VERSION}.'
-        + f' Please upgrade your grpc module to grpcio>={GRPC_GENERATED_VERSION}'
-        + f' or downgrade your generated code using grpcio-tools<={GRPC_VERSION}.'
-        + f' This warning will become an error in {EXPECTED_ERROR_RELEASE},'
-        + f' scheduled for release on {SCHEDULED_RELEASE_DATE}.',
-        RuntimeWarning
-    )
-
-
-class PartitionedTableServiceStub(object):
-    """
-    This service provides tools to create and query partitioned tables.
-    """
-
-    def __init__(self, channel):
-        """Constructor.
-
-        Args:
-            channel: A grpc.Channel.
-        """
-        self.PartitionBy = channel.unary_unary(
-                '/io.deephaven.proto.backplane.grpc.PartitionedTableService/PartitionBy',
-                request_serializer=deephaven_dot_proto_dot_partitionedtable__pb2.PartitionByRequest.SerializeToString,
-                response_deserializer=deephaven_dot_proto_dot_partitionedtable__pb2.PartitionByResponse.FromString,
-                _registered_method=True)
-        self.Merge = channel.unary_unary(
-                '/io.deephaven.proto.backplane.grpc.PartitionedTableService/Merge',
-                request_serializer=deephaven_dot_proto_dot_partitionedtable__pb2.MergeRequest.SerializeToString,
-                response_deserializer=deephaven_dot_proto_dot_table__pb2.ExportedTableCreationResponse.FromString,
-                _registered_method=True)
-        self.GetTable = channel.unary_unary(
-                '/io.deephaven.proto.backplane.grpc.PartitionedTableService/GetTable',
-                request_serializer=deephaven_dot_proto_dot_partitionedtable__pb2.GetTableRequest.SerializeToString,
-                response_deserializer=deephaven_dot_proto_dot_table__pb2.ExportedTableCreationResponse.FromString,
-                _registered_method=True)
-
-
-class PartitionedTableServiceServicer(object):
-    """
-    This service provides tools to create and query partitioned tables.
-    """
-
-    def PartitionBy(self, request, context):
-        """
-        Transforms a table into a partitioned table, consisting of many separate tables, each individually
-        addressable. The result will be a FetchObjectResponse populated with a PartitionedTable.
-        """
-        context.set_code(grpc.StatusCode.UNIMPLEMENTED)
-        context.set_details('Method not implemented!')
-        raise NotImplementedError('Method not implemented!')
-
-    def Merge(self, request, context):
-        """
-        Given a partitioned table, returns a table with the contents of all of the constituent tables.
-        """
-        context.set_code(grpc.StatusCode.UNIMPLEMENTED)
-        context.set_details('Method not implemented!')
-        raise NotImplementedError('Method not implemented!')
-
-    def GetTable(self, request, context):
-        """
-        Given a partitioned table and a row described by another table's contents, returns a table
-        that matched that row, if any. If none is present, NOT_FOUND will be sent in response. If
-        more than one is present, FAILED_PRECONDITION will be sent in response.
-
-        If the provided key table has any number of rows other than one, INVALID_ARGUMENT will be
-        sent in response.
-
-        The simplest way to generally use this is to subscribe to the key columns of the underlying
-        table of a given PartitionedTable, then use /FlightService/DoPut to create a table with the
-        desired keys, and pass that ticket to this service. After that request is sent (note that it
-        is not required to wait for it to complete), that new table ticket can be used to make this
-        GetTable request.
-        """
-        context.set_code(grpc.StatusCode.UNIMPLEMENTED)
-        context.set_details('Method not implemented!')
-        raise NotImplementedError('Method not implemented!')
-
-
-def add_PartitionedTableServiceServicer_to_server(servicer, server):
-    rpc_method_handlers = {
-            'PartitionBy': grpc.unary_unary_rpc_method_handler(
-                    servicer.PartitionBy,
-                    request_deserializer=deephaven_dot_proto_dot_partitionedtable__pb2.PartitionByRequest.FromString,
-                    response_serializer=deephaven_dot_proto_dot_partitionedtable__pb2.PartitionByResponse.SerializeToString,
-            ),
-            'Merge': grpc.unary_unary_rpc_method_handler(
-                    servicer.Merge,
-                    request_deserializer=deephaven_dot_proto_dot_partitionedtable__pb2.MergeRequest.FromString,
-                    response_serializer=deephaven_dot_proto_dot_table__pb2.ExportedTableCreationResponse.SerializeToString,
-            ),
-            'GetTable': grpc.unary_unary_rpc_method_handler(
-                    servicer.GetTable,
-                    request_deserializer=deephaven_dot_proto_dot_partitionedtable__pb2.GetTableRequest.FromString,
-                    response_serializer=deephaven_dot_proto_dot_table__pb2.ExportedTableCreationResponse.SerializeToString,
-            ),
-    }
-    generic_handler = grpc.method_handlers_generic_handler(
-            'io.deephaven.proto.backplane.grpc.PartitionedTableService', rpc_method_handlers)
-    server.add_generic_rpc_handlers((generic_handler,))
-
-
- # This class is part of an EXPERIMENTAL API.
-class PartitionedTableService(object):
-    """
-    This service provides tools to create and query partitioned tables.
-    """
-
-    @staticmethod
-    def PartitionBy(request,
-            target,
-            options=(),
-            channel_credentials=None,
-            call_credentials=None,
-            insecure=False,
-            compression=None,
-            wait_for_ready=None,
-            timeout=None,
-            metadata=None):
-        return grpc.experimental.unary_unary(
-            request,
-            target,
-            '/io.deephaven.proto.backplane.grpc.PartitionedTableService/PartitionBy',
-            deephaven_dot_proto_dot_partitionedtable__pb2.PartitionByRequest.SerializeToString,
-            deephaven_dot_proto_dot_partitionedtable__pb2.PartitionByResponse.FromString,
-            options,
-            channel_credentials,
-            insecure,
-            call_credentials,
-            compression,
-            wait_for_ready,
-            timeout,
-            metadata,
-            _registered_method=True)
-
-    @staticmethod
-    def Merge(request,
-            target,
-            options=(),
-            channel_credentials=None,
-            call_credentials=None,
-            insecure=False,
-            compression=None,
-            wait_for_ready=None,
-            timeout=None,
-            metadata=None):
-        return grpc.experimental.unary_unary(
-            request,
-            target,
-            '/io.deephaven.proto.backplane.grpc.PartitionedTableService/Merge',
-            deephaven_dot_proto_dot_partitionedtable__pb2.MergeRequest.SerializeToString,
-            deephaven_dot_proto_dot_table__pb2.ExportedTableCreationResponse.FromString,
-            options,
-            channel_credentials,
-            insecure,
-            call_credentials,
-            compression,
-            wait_for_ready,
-            timeout,
-            metadata,
-            _registered_method=True)
-
-    @staticmethod
-    def GetTable(request,
-            target,
-            options=(),
-            channel_credentials=None,
-            call_credentials=None,
-            insecure=False,
-            compression=None,
-            wait_for_ready=None,
-            timeout=None,
-            metadata=None):
-        return grpc.experimental.unary_unary(
-            request,
-            target,
-            '/io.deephaven.proto.backplane.grpc.PartitionedTableService/GetTable',
-            deephaven_dot_proto_dot_partitionedtable__pb2.GetTableRequest.SerializeToString,
-            deephaven_dot_proto_dot_table__pb2.ExportedTableCreationResponse.FromString,
-            options,
-            channel_credentials,
-            insecure,
-            call_credentials,
-            compression,
-            wait_for_ready,
-            timeout,
-            metadata,
-            _registered_method=True)
diff --git a/py/client/pydeephaven/proto/session_pb2.py b/py/client/pydeephaven/proto/session_pb2.py
deleted file mode 100644
index 92d1a1a945d..00000000000
--- a/py/client/pydeephaven/proto/session_pb2.py
+++ /dev/null
@@ -1,76 +0,0 @@
-# -*- coding: utf-8 -*-
-# Generated by the protocol buffer compiler.  DO NOT EDIT!
-# source: deephaven/proto/session.proto
-# Protobuf Python Version: 5.26.1
-"""Generated protocol buffer code."""
-from google.protobuf import descriptor as _descriptor
-from google.protobuf import descriptor_pool as _descriptor_pool
-from google.protobuf import symbol_database as _symbol_database
-from google.protobuf.internal import builder as _builder
-# @@protoc_insertion_point(imports)
-
-_sym_db = _symbol_database.Default()
-
-
-from pydeephaven.proto import ticket_pb2 as deephaven_dot_proto_dot_ticket__pb2
-
-
-DESCRIPTOR = _descriptor_pool.Default().AddSerializedFile(b'\n\x1d\x64\x65\x65phaven/proto/session.proto\x12!io.deephaven.proto.backplane.grpc\x1a\x1c\x64\x65\x65phaven/proto/ticket.proto\"I\n\x1cWrappedAuthenticationRequest\x12\x0c\n\x04type\x18\x04 \x01(\t\x12\x0f\n\x07payload\x18\x05 \x01(\x0cJ\x04\x08\x02\x10\x03J\x04\x08\x03\x10\x04\"B\n\x10HandshakeRequest\x12\x19\n\rauth_protocol\x18\x01 \x01(\x11\x42\x02\x18\x01\x12\x13\n\x07payload\x18\x02 \x01(\x0c\x42\x02\x18\x01\"\xa2\x01\n\x11HandshakeResponse\x12\x1b\n\x0fmetadata_header\x18\x01 \x01(\x0c\x42\x02\x18\x01\x12\x19\n\rsession_token\x18\x02 \x01(\x0c\x42\x02\x18\x01\x12(\n\x1atoken_deadline_time_millis\x18\x03 \x01(\x12\x42\x04\x18\x01\x30\x01\x12+\n\x1dtoken_expiration_delay_millis\x18\x04 \x01(\x12\x42\x04\x18\x01\x30\x01\"\x16\n\x14\x43loseSessionResponse\"G\n\x0eReleaseRequest\x12\x35\n\x02id\x18\x01 \x01(\x0b\x32).io.deephaven.proto.backplane.grpc.Ticket\"\x11\n\x0fReleaseResponse\"\x8b\x01\n\rExportRequest\x12<\n\tsource_id\x18\x01 \x01(\x0b\x32).io.deephaven.proto.backplane.grpc.Ticket\x12<\n\tresult_id\x18\x02 \x01(\x0b\x32).io.deephaven.proto.backplane.grpc.Ticket\"\x10\n\x0e\x45xportResponse\"\x8c\x01\n\x0ePublishRequest\x12<\n\tsource_id\x18\x01 \x01(\x0b\x32).io.deephaven.proto.backplane.grpc.Ticket\x12<\n\tresult_id\x18\x02 \x01(\x0b\x32).io.deephaven.proto.backplane.grpc.Ticket\"\x11\n\x0fPublishResponse\"\x1b\n\x19\x45xportNotificationRequest\"\xb7\x03\n\x12\x45xportNotification\x12\x39\n\x06ticket\x18\x01 \x01(\x0b\x32).io.deephaven.proto.backplane.grpc.Ticket\x12Q\n\x0c\x65xport_state\x18\x02 \x01(\x0e\x32;.io.deephaven.proto.backplane.grpc.ExportNotification.State\x12\x0f\n\x07\x63ontext\x18\x03 \x01(\t\x12\x18\n\x10\x64\x65pendent_handle\x18\x04 \x01(\t\"\xe7\x01\n\x05State\x12\x0b\n\x07UNKNOWN\x10\x00\x12\x0b\n\x07PENDING\x10\x01\x12\x0e\n\nPUBLISHING\x10\x02\x12\n\n\x06QUEUED\x10\x03\x12\x0b\n\x07RUNNING\x10\x04\x12\x0c\n\x08\x45XPORTED\x10\x05\x12\x0c\n\x08RELEASED\x10\x06\x12\r\n\tCANCELLED\x10\x07\x12\n\n\x06\x46\x41ILED\x10\x08\x12\x15\n\x11\x44\x45PENDENCY_FAILED\x10\t\x12\x1a\n\x16\x44\x45PENDENCY_NEVER_FOUND\x10\n\x12\x18\n\x14\x44\x45PENDENCY_CANCELLED\x10\x0b\x12\x17\n\x13\x44\x45PENDENCY_RELEASED\x10\x0c\" \n\x1eTerminationNotificationRequest\"\x97\x02\n\x1fTerminationNotificationResponse\x12\x1c\n\x14\x61\x62normal_termination\x18\x01 \x01(\x08\x12\x0e\n\x06reason\x18\x02 \x01(\t\x12\"\n\x1ais_from_uncaught_exception\x18\x03 \x01(\x08\x12\x63\n\x0cstack_traces\x18\x04 \x03(\x0b\x32M.io.deephaven.proto.backplane.grpc.TerminationNotificationResponse.StackTrace\x1a=\n\nStackTrace\x12\x0c\n\x04type\x18\x01 \x01(\t\x12\x0f\n\x07message\x18\x02 \x01(\t\x12\x10\n\x08\x65lements\x18\x03 \x03(\t2\xb9\x08\n\x0eSessionService\x12|\n\nNewSession\x12\x33.io.deephaven.proto.backplane.grpc.HandshakeRequest\x1a\x34.io.deephaven.proto.backplane.grpc.HandshakeResponse\"\x03\x88\x02\x01\x12\x85\x01\n\x13RefreshSessionToken\x12\x33.io.deephaven.proto.backplane.grpc.HandshakeRequest\x1a\x34.io.deephaven.proto.backplane.grpc.HandshakeResponse\"\x03\x88\x02\x01\x12~\n\x0c\x43loseSession\x12\x33.io.deephaven.proto.backplane.grpc.HandshakeRequest\x1a\x37.io.deephaven.proto.backplane.grpc.CloseSessionResponse\"\x00\x12r\n\x07Release\x12\x31.io.deephaven.proto.backplane.grpc.ReleaseRequest\x1a\x32.io.deephaven.proto.backplane.grpc.ReleaseResponse\"\x00\x12y\n\x10\x45xportFromTicket\x12\x30.io.deephaven.proto.backplane.grpc.ExportRequest\x1a\x31.io.deephaven.proto.backplane.grpc.ExportResponse\"\x00\x12|\n\x11PublishFromTicket\x12\x31.io.deephaven.proto.backplane.grpc.PublishRequest\x1a\x32.io.deephaven.proto.backplane.grpc.PublishResponse\"\x00\x12\x8e\x01\n\x13\x45xportNotifications\x12<.io.deephaven.proto.backplane.grpc.ExportNotificationRequest\x1a\x35.io.deephaven.proto.backplane.grpc.ExportNotification\"\x00\x30\x01\x12\xa2\x01\n\x17TerminationNotification\x12\x41.io.deephaven.proto.backplane.grpc.TerminationNotificationRequest\x1a\x42.io.deephaven.proto.backplane.grpc.TerminationNotificationResponse\"\x00\x42\x43H\x01P\x01Z=github.com/deephaven/deephaven-core/go/internal/proto/sessionb\x06proto3')
-
-_globals = globals()
-_builder.BuildMessageAndEnumDescriptors(DESCRIPTOR, _globals)
-_builder.BuildTopDescriptorsAndMessages(DESCRIPTOR, 'deephaven.proto.session_pb2', _globals)
-if not _descriptor._USE_C_DESCRIPTORS:
-  _globals['DESCRIPTOR']._loaded_options = None
-  _globals['DESCRIPTOR']._serialized_options = b'H\001P\001Z=github.com/deephaven/deephaven-core/go/internal/proto/session'
-  _globals['_HANDSHAKEREQUEST'].fields_by_name['auth_protocol']._loaded_options = None
-  _globals['_HANDSHAKEREQUEST'].fields_by_name['auth_protocol']._serialized_options = b'\030\001'
-  _globals['_HANDSHAKEREQUEST'].fields_by_name['payload']._loaded_options = None
-  _globals['_HANDSHAKEREQUEST'].fields_by_name['payload']._serialized_options = b'\030\001'
-  _globals['_HANDSHAKERESPONSE'].fields_by_name['metadata_header']._loaded_options = None
-  _globals['_HANDSHAKERESPONSE'].fields_by_name['metadata_header']._serialized_options = b'\030\001'
-  _globals['_HANDSHAKERESPONSE'].fields_by_name['session_token']._loaded_options = None
-  _globals['_HANDSHAKERESPONSE'].fields_by_name['session_token']._serialized_options = b'\030\001'
-  _globals['_HANDSHAKERESPONSE'].fields_by_name['token_deadline_time_millis']._loaded_options = None
-  _globals['_HANDSHAKERESPONSE'].fields_by_name['token_deadline_time_millis']._serialized_options = b'\030\0010\001'
-  _globals['_HANDSHAKERESPONSE'].fields_by_name['token_expiration_delay_millis']._loaded_options = None
-  _globals['_HANDSHAKERESPONSE'].fields_by_name['token_expiration_delay_millis']._serialized_options = b'\030\0010\001'
-  _globals['_SESSIONSERVICE'].methods_by_name['NewSession']._loaded_options = None
-  _globals['_SESSIONSERVICE'].methods_by_name['NewSession']._serialized_options = b'\210\002\001'
-  _globals['_SESSIONSERVICE'].methods_by_name['RefreshSessionToken']._loaded_options = None
-  _globals['_SESSIONSERVICE'].methods_by_name['RefreshSessionToken']._serialized_options = b'\210\002\001'
-  _globals['_WRAPPEDAUTHENTICATIONREQUEST']._serialized_start=98
-  _globals['_WRAPPEDAUTHENTICATIONREQUEST']._serialized_end=171
-  _globals['_HANDSHAKEREQUEST']._serialized_start=173
-  _globals['_HANDSHAKEREQUEST']._serialized_end=239
-  _globals['_HANDSHAKERESPONSE']._serialized_start=242
-  _globals['_HANDSHAKERESPONSE']._serialized_end=404
-  _globals['_CLOSESESSIONRESPONSE']._serialized_start=406
-  _globals['_CLOSESESSIONRESPONSE']._serialized_end=428
-  _globals['_RELEASEREQUEST']._serialized_start=430
-  _globals['_RELEASEREQUEST']._serialized_end=501
-  _globals['_RELEASERESPONSE']._serialized_start=503
-  _globals['_RELEASERESPONSE']._serialized_end=520
-  _globals['_EXPORTREQUEST']._serialized_start=523
-  _globals['_EXPORTREQUEST']._serialized_end=662
-  _globals['_EXPORTRESPONSE']._serialized_start=664
-  _globals['_EXPORTRESPONSE']._serialized_end=680
-  _globals['_PUBLISHREQUEST']._serialized_start=683
-  _globals['_PUBLISHREQUEST']._serialized_end=823
-  _globals['_PUBLISHRESPONSE']._serialized_start=825
-  _globals['_PUBLISHRESPONSE']._serialized_end=842
-  _globals['_EXPORTNOTIFICATIONREQUEST']._serialized_start=844
-  _globals['_EXPORTNOTIFICATIONREQUEST']._serialized_end=871
-  _globals['_EXPORTNOTIFICATION']._serialized_start=874
-  _globals['_EXPORTNOTIFICATION']._serialized_end=1313
-  _globals['_EXPORTNOTIFICATION_STATE']._serialized_start=1082
-  _globals['_EXPORTNOTIFICATION_STATE']._serialized_end=1313
-  _globals['_TERMINATIONNOTIFICATIONREQUEST']._serialized_start=1315
-  _globals['_TERMINATIONNOTIFICATIONREQUEST']._serialized_end=1347
-  _globals['_TERMINATIONNOTIFICATIONRESPONSE']._serialized_start=1350
-  _globals['_TERMINATIONNOTIFICATIONRESPONSE']._serialized_end=1629
-  _globals['_TERMINATIONNOTIFICATIONRESPONSE_STACKTRACE']._serialized_start=1568
-  _globals['_TERMINATIONNOTIFICATIONRESPONSE_STACKTRACE']._serialized_end=1629
-  _globals['_SESSIONSERVICE']._serialized_start=1632
-  _globals['_SESSIONSERVICE']._serialized_end=2713
-# @@protoc_insertion_point(module_scope)
diff --git a/py/client/pydeephaven/proto/storage_pb2.py b/py/client/pydeephaven/proto/storage_pb2.py
deleted file mode 100644
index 279758a8f9b..00000000000
--- a/py/client/pydeephaven/proto/storage_pb2.py
+++ /dev/null
@@ -1,57 +0,0 @@
-# -*- coding: utf-8 -*-
-# Generated by the protocol buffer compiler.  DO NOT EDIT!
-# source: deephaven/proto/storage.proto
-# Protobuf Python Version: 5.26.1
-"""Generated protocol buffer code."""
-from google.protobuf import descriptor as _descriptor
-from google.protobuf import descriptor_pool as _descriptor_pool
-from google.protobuf import symbol_database as _symbol_database
-from google.protobuf.internal import builder as _builder
-# @@protoc_insertion_point(imports)
-
-_sym_db = _symbol_database.Default()
-
-
-
-
-DESCRIPTOR = _descriptor_pool.Default().AddSerializedFile(b'\n\x1d\x64\x65\x65phaven/proto/storage.proto\x12!io.deephaven.proto.backplane.grpc\"J\n\x10ListItemsRequest\x12\x0c\n\x04path\x18\x01 \x01(\t\x12\x18\n\x0b\x66ilter_glob\x18\x04 \x01(\tH\x00\x88\x01\x01\x42\x0e\n\x0c_filter_glob\"\x81\x01\n\x08ItemInfo\x12\x0c\n\x04path\x18\x01 \x01(\t\x12\x39\n\x04type\x18\x02 \x01(\x0e\x32+.io.deephaven.proto.backplane.grpc.ItemType\x12\x10\n\x04size\x18\x03 \x01(\x12\x42\x02\x30\x01\x12\x11\n\x04\x65tag\x18\x04 \x01(\tH\x00\x88\x01\x01\x42\x07\n\x05_etag\"g\n\x11ListItemsResponse\x12:\n\x05items\x18\x01 \x03(\x0b\x32+.io.deephaven.proto.backplane.grpc.ItemInfo\x12\x16\n\x0e\x63\x61nonical_path\x18\x02 \x01(\t\"<\n\x10\x46\x65tchFileRequest\x12\x0c\n\x04path\x18\x01 \x01(\t\x12\x11\n\x04\x65tag\x18\x02 \x01(\tH\x00\x88\x01\x01\x42\x07\n\x05_etag\"A\n\x11\x46\x65tchFileResponse\x12\x10\n\x08\x63ontents\x18\x01 \x01(\x0c\x12\x11\n\x04\x65tag\x18\x02 \x01(\tH\x00\x88\x01\x01\x42\x07\n\x05_etag\"J\n\x0fSaveFileRequest\x12\x17\n\x0f\x61llow_overwrite\x18\x01 \x01(\x08\x12\x0c\n\x04path\x18\x02 \x01(\t\x12\x10\n\x08\x63ontents\x18\x03 \x01(\x0c\".\n\x10SaveFileResponse\x12\x11\n\x04\x65tag\x18\x01 \x01(\tH\x00\x88\x01\x01\x42\x07\n\x05_etag\"N\n\x0fMoveItemRequest\x12\x10\n\x08old_path\x18\x01 \x01(\t\x12\x10\n\x08new_path\x18\x02 \x01(\t\x12\x17\n\x0f\x61llow_overwrite\x18\x03 \x01(\x08\"\x12\n\x10MoveItemResponse\"&\n\x16\x43reateDirectoryRequest\x12\x0c\n\x04path\x18\x01 \x01(\t\"\x19\n\x17\x43reateDirectoryResponse\"!\n\x11\x44\x65leteItemRequest\x12\x0c\n\x04path\x18\x01 \x01(\t\"\x14\n\x12\x44\x65leteItemResponse*0\n\x08ItemType\x12\x0b\n\x07UNKNOWN\x10\x00\x12\r\n\tDIRECTORY\x10\x01\x12\x08\n\x04\x46ILE\x10\x02\x32\xfc\x05\n\x0eStorageService\x12x\n\tListItems\x12\x33.io.deephaven.proto.backplane.grpc.ListItemsRequest\x1a\x34.io.deephaven.proto.backplane.grpc.ListItemsResponse\"\x00\x12x\n\tFetchFile\x12\x33.io.deephaven.proto.backplane.grpc.FetchFileRequest\x1a\x34.io.deephaven.proto.backplane.grpc.FetchFileResponse\"\x00\x12u\n\x08SaveFile\x12\x32.io.deephaven.proto.backplane.grpc.SaveFileRequest\x1a\x33.io.deephaven.proto.backplane.grpc.SaveFileResponse\"\x00\x12u\n\x08MoveItem\x12\x32.io.deephaven.proto.backplane.grpc.MoveItemRequest\x1a\x33.io.deephaven.proto.backplane.grpc.MoveItemResponse\"\x00\x12\x8a\x01\n\x0f\x43reateDirectory\x12\x39.io.deephaven.proto.backplane.grpc.CreateDirectoryRequest\x1a:.io.deephaven.proto.backplane.grpc.CreateDirectoryResponse\"\x00\x12{\n\nDeleteItem\x12\x34.io.deephaven.proto.backplane.grpc.DeleteItemRequest\x1a\x35.io.deephaven.proto.backplane.grpc.DeleteItemResponse\"\x00\x42\x43H\x01P\x01Z=github.com/deephaven/deephaven-core/go/internal/proto/storageb\x06proto3')
-
-_globals = globals()
-_builder.BuildMessageAndEnumDescriptors(DESCRIPTOR, _globals)
-_builder.BuildTopDescriptorsAndMessages(DESCRIPTOR, 'deephaven.proto.storage_pb2', _globals)
-if not _descriptor._USE_C_DESCRIPTORS:
-  _globals['DESCRIPTOR']._loaded_options = None
-  _globals['DESCRIPTOR']._serialized_options = b'H\001P\001Z=github.com/deephaven/deephaven-core/go/internal/proto/storage'
-  _globals['_ITEMINFO'].fields_by_name['size']._loaded_options = None
-  _globals['_ITEMINFO'].fields_by_name['size']._serialized_options = b'0\001'
-  _globals['_ITEMTYPE']._serialized_start=858
-  _globals['_ITEMTYPE']._serialized_end=906
-  _globals['_LISTITEMSREQUEST']._serialized_start=68
-  _globals['_LISTITEMSREQUEST']._serialized_end=142
-  _globals['_ITEMINFO']._serialized_start=145
-  _globals['_ITEMINFO']._serialized_end=274
-  _globals['_LISTITEMSRESPONSE']._serialized_start=276
-  _globals['_LISTITEMSRESPONSE']._serialized_end=379
-  _globals['_FETCHFILEREQUEST']._serialized_start=381
-  _globals['_FETCHFILEREQUEST']._serialized_end=441
-  _globals['_FETCHFILERESPONSE']._serialized_start=443
-  _globals['_FETCHFILERESPONSE']._serialized_end=508
-  _globals['_SAVEFILEREQUEST']._serialized_start=510
-  _globals['_SAVEFILEREQUEST']._serialized_end=584
-  _globals['_SAVEFILERESPONSE']._serialized_start=586
-  _globals['_SAVEFILERESPONSE']._serialized_end=632
-  _globals['_MOVEITEMREQUEST']._serialized_start=634
-  _globals['_MOVEITEMREQUEST']._serialized_end=712
-  _globals['_MOVEITEMRESPONSE']._serialized_start=714
-  _globals['_MOVEITEMRESPONSE']._serialized_end=732
-  _globals['_CREATEDIRECTORYREQUEST']._serialized_start=734
-  _globals['_CREATEDIRECTORYREQUEST']._serialized_end=772
-  _globals['_CREATEDIRECTORYRESPONSE']._serialized_start=774
-  _globals['_CREATEDIRECTORYRESPONSE']._serialized_end=799
-  _globals['_DELETEITEMREQUEST']._serialized_start=801
-  _globals['_DELETEITEMREQUEST']._serialized_end=834
-  _globals['_DELETEITEMRESPONSE']._serialized_start=836
-  _globals['_DELETEITEMRESPONSE']._serialized_end=856
-  _globals['_STORAGESERVICE']._serialized_start=909
-  _globals['_STORAGESERVICE']._serialized_end=1673
-# @@protoc_insertion_point(module_scope)
diff --git a/py/client/pydeephaven/proto/storage_pb2_grpc.py b/py/client/pydeephaven/proto/storage_pb2_grpc.py
deleted file mode 100644
index d9987e5e31c..00000000000
--- a/py/client/pydeephaven/proto/storage_pb2_grpc.py
+++ /dev/null
@@ -1,341 +0,0 @@
-# Generated by the gRPC Python protocol compiler plugin. DO NOT EDIT!
-"""Client and server classes corresponding to protobuf-defined services."""
-import grpc
-import warnings
-
-from pydeephaven.proto import storage_pb2 as deephaven_dot_proto_dot_storage__pb2
-
-GRPC_GENERATED_VERSION = '1.63.0'
-GRPC_VERSION = grpc.__version__
-EXPECTED_ERROR_RELEASE = '1.65.0'
-SCHEDULED_RELEASE_DATE = 'June 25, 2024'
-_version_not_supported = False
-
-try:
-    from grpc._utilities import first_version_is_lower
-    _version_not_supported = first_version_is_lower(GRPC_VERSION, GRPC_GENERATED_VERSION)
-except ImportError:
-    _version_not_supported = True
-
-if _version_not_supported:
-    warnings.warn(
-        f'The grpc package installed is at version {GRPC_VERSION},'
-        + f' but the generated code in deephaven/proto/storage_pb2_grpc.py depends on'
-        + f' grpcio>={GRPC_GENERATED_VERSION}.'
-        + f' Please upgrade your grpc module to grpcio>={GRPC_GENERATED_VERSION}'
-        + f' or downgrade your generated code using grpcio-tools<={GRPC_VERSION}.'
-        + f' This warning will become an error in {EXPECTED_ERROR_RELEASE},'
-        + f' scheduled for release on {SCHEDULED_RELEASE_DATE}.',
-        RuntimeWarning
-    )
-
-
-class StorageServiceStub(object):
-    """
-    Shared storage management service.
-
-    Operations may fail (or omit data) if the current session does not have permission to read or write that resource.
-
-    Paths will be "/" delimited and must start with a leading slash.
-    """
-
-    def __init__(self, channel):
-        """Constructor.
-
-        Args:
-            channel: A grpc.Channel.
-        """
-        self.ListItems = channel.unary_unary(
-                '/io.deephaven.proto.backplane.grpc.StorageService/ListItems',
-                request_serializer=deephaven_dot_proto_dot_storage__pb2.ListItemsRequest.SerializeToString,
-                response_deserializer=deephaven_dot_proto_dot_storage__pb2.ListItemsResponse.FromString,
-                _registered_method=True)
-        self.FetchFile = channel.unary_unary(
-                '/io.deephaven.proto.backplane.grpc.StorageService/FetchFile',
-                request_serializer=deephaven_dot_proto_dot_storage__pb2.FetchFileRequest.SerializeToString,
-                response_deserializer=deephaven_dot_proto_dot_storage__pb2.FetchFileResponse.FromString,
-                _registered_method=True)
-        self.SaveFile = channel.unary_unary(
-                '/io.deephaven.proto.backplane.grpc.StorageService/SaveFile',
-                request_serializer=deephaven_dot_proto_dot_storage__pb2.SaveFileRequest.SerializeToString,
-                response_deserializer=deephaven_dot_proto_dot_storage__pb2.SaveFileResponse.FromString,
-                _registered_method=True)
-        self.MoveItem = channel.unary_unary(
-                '/io.deephaven.proto.backplane.grpc.StorageService/MoveItem',
-                request_serializer=deephaven_dot_proto_dot_storage__pb2.MoveItemRequest.SerializeToString,
-                response_deserializer=deephaven_dot_proto_dot_storage__pb2.MoveItemResponse.FromString,
-                _registered_method=True)
-        self.CreateDirectory = channel.unary_unary(
-                '/io.deephaven.proto.backplane.grpc.StorageService/CreateDirectory',
-                request_serializer=deephaven_dot_proto_dot_storage__pb2.CreateDirectoryRequest.SerializeToString,
-                response_deserializer=deephaven_dot_proto_dot_storage__pb2.CreateDirectoryResponse.FromString,
-                _registered_method=True)
-        self.DeleteItem = channel.unary_unary(
-                '/io.deephaven.proto.backplane.grpc.StorageService/DeleteItem',
-                request_serializer=deephaven_dot_proto_dot_storage__pb2.DeleteItemRequest.SerializeToString,
-                response_deserializer=deephaven_dot_proto_dot_storage__pb2.DeleteItemResponse.FromString,
-                _registered_method=True)
-
-
-class StorageServiceServicer(object):
-    """
-    Shared storage management service.
-
-    Operations may fail (or omit data) if the current session does not have permission to read or write that resource.
-
-    Paths will be "/" delimited and must start with a leading slash.
-    """
-
-    def ListItems(self, request, context):
-        """Lists the files and directories present in a given directory. Will return an error
-        """
-        context.set_code(grpc.StatusCode.UNIMPLEMENTED)
-        context.set_details('Method not implemented!')
-        raise NotImplementedError('Method not implemented!')
-
-    def FetchFile(self, request, context):
-        """Reads the file at the given path. Client can optionally specify an etag, asking the server
-        not to send the file if it hasn't changed.
-        """
-        context.set_code(grpc.StatusCode.UNIMPLEMENTED)
-        context.set_details('Method not implemented!')
-        raise NotImplementedError('Method not implemented!')
-
-    def SaveFile(self, request, context):
-        """Can create new files or modify existing with client provided contents.
-        """
-        context.set_code(grpc.StatusCode.UNIMPLEMENTED)
-        context.set_details('Method not implemented!')
-        raise NotImplementedError('Method not implemented!')
-
-    def MoveItem(self, request, context):
-        """Moves a file from one path to another.
-        """
-        context.set_code(grpc.StatusCode.UNIMPLEMENTED)
-        context.set_details('Method not implemented!')
-        raise NotImplementedError('Method not implemented!')
-
-    def CreateDirectory(self, request, context):
-        """Creates a directory at the given path.
-        """
-        context.set_code(grpc.StatusCode.UNIMPLEMENTED)
-        context.set_details('Method not implemented!')
-        raise NotImplementedError('Method not implemented!')
-
-    def DeleteItem(self, request, context):
-        """Deletes the file or directory at the given path. Directories must be empty to be deleted.
-        """
-        context.set_code(grpc.StatusCode.UNIMPLEMENTED)
-        context.set_details('Method not implemented!')
-        raise NotImplementedError('Method not implemented!')
-
-
-def add_StorageServiceServicer_to_server(servicer, server):
-    rpc_method_handlers = {
-            'ListItems': grpc.unary_unary_rpc_method_handler(
-                    servicer.ListItems,
-                    request_deserializer=deephaven_dot_proto_dot_storage__pb2.ListItemsRequest.FromString,
-                    response_serializer=deephaven_dot_proto_dot_storage__pb2.ListItemsResponse.SerializeToString,
-            ),
-            'FetchFile': grpc.unary_unary_rpc_method_handler(
-                    servicer.FetchFile,
-                    request_deserializer=deephaven_dot_proto_dot_storage__pb2.FetchFileRequest.FromString,
-                    response_serializer=deephaven_dot_proto_dot_storage__pb2.FetchFileResponse.SerializeToString,
-            ),
-            'SaveFile': grpc.unary_unary_rpc_method_handler(
-                    servicer.SaveFile,
-                    request_deserializer=deephaven_dot_proto_dot_storage__pb2.SaveFileRequest.FromString,
-                    response_serializer=deephaven_dot_proto_dot_storage__pb2.SaveFileResponse.SerializeToString,
-            ),
-            'MoveItem': grpc.unary_unary_rpc_method_handler(
-                    servicer.MoveItem,
-                    request_deserializer=deephaven_dot_proto_dot_storage__pb2.MoveItemRequest.FromString,
-                    response_serializer=deephaven_dot_proto_dot_storage__pb2.MoveItemResponse.SerializeToString,
-            ),
-            'CreateDirectory': grpc.unary_unary_rpc_method_handler(
-                    servicer.CreateDirectory,
-                    request_deserializer=deephaven_dot_proto_dot_storage__pb2.CreateDirectoryRequest.FromString,
-                    response_serializer=deephaven_dot_proto_dot_storage__pb2.CreateDirectoryResponse.SerializeToString,
-            ),
-            'DeleteItem': grpc.unary_unary_rpc_method_handler(
-                    servicer.DeleteItem,
-                    request_deserializer=deephaven_dot_proto_dot_storage__pb2.DeleteItemRequest.FromString,
-                    response_serializer=deephaven_dot_proto_dot_storage__pb2.DeleteItemResponse.SerializeToString,
-            ),
-    }
-    generic_handler = grpc.method_handlers_generic_handler(
-            'io.deephaven.proto.backplane.grpc.StorageService', rpc_method_handlers)
-    server.add_generic_rpc_handlers((generic_handler,))
-
-
- # This class is part of an EXPERIMENTAL API.
-class StorageService(object):
-    """
-    Shared storage management service.
-
-    Operations may fail (or omit data) if the current session does not have permission to read or write that resource.
-
-    Paths will be "/" delimited and must start with a leading slash.
-    """
-
-    @staticmethod
-    def ListItems(request,
-            target,
-            options=(),
-            channel_credentials=None,
-            call_credentials=None,
-            insecure=False,
-            compression=None,
-            wait_for_ready=None,
-            timeout=None,
-            metadata=None):
-        return grpc.experimental.unary_unary(
-            request,
-            target,
-            '/io.deephaven.proto.backplane.grpc.StorageService/ListItems',
-            deephaven_dot_proto_dot_storage__pb2.ListItemsRequest.SerializeToString,
-            deephaven_dot_proto_dot_storage__pb2.ListItemsResponse.FromString,
-            options,
-            channel_credentials,
-            insecure,
-            call_credentials,
-            compression,
-            wait_for_ready,
-            timeout,
-            metadata,
-            _registered_method=True)
-
-    @staticmethod
-    def FetchFile(request,
-            target,
-            options=(),
-            channel_credentials=None,
-            call_credentials=None,
-            insecure=False,
-            compression=None,
-            wait_for_ready=None,
-            timeout=None,
-            metadata=None):
-        return grpc.experimental.unary_unary(
-            request,
-            target,
-            '/io.deephaven.proto.backplane.grpc.StorageService/FetchFile',
-            deephaven_dot_proto_dot_storage__pb2.FetchFileRequest.SerializeToString,
-            deephaven_dot_proto_dot_storage__pb2.FetchFileResponse.FromString,
-            options,
-            channel_credentials,
-            insecure,
-            call_credentials,
-            compression,
-            wait_for_ready,
-            timeout,
-            metadata,
-            _registered_method=True)
-
-    @staticmethod
-    def SaveFile(request,
-            target,
-            options=(),
-            channel_credentials=None,
-            call_credentials=None,
-            insecure=False,
-            compression=None,
-            wait_for_ready=None,
-            timeout=None,
-            metadata=None):
-        return grpc.experimental.unary_unary(
-            request,
-            target,
-            '/io.deephaven.proto.backplane.grpc.StorageService/SaveFile',
-            deephaven_dot_proto_dot_storage__pb2.SaveFileRequest.SerializeToString,
-            deephaven_dot_proto_dot_storage__pb2.SaveFileResponse.FromString,
-            options,
-            channel_credentials,
-            insecure,
-            call_credentials,
-            compression,
-            wait_for_ready,
-            timeout,
-            metadata,
-            _registered_method=True)
-
-    @staticmethod
-    def MoveItem(request,
-            target,
-            options=(),
-            channel_credentials=None,
-            call_credentials=None,
-            insecure=False,
-            compression=None,
-            wait_for_ready=None,
-            timeout=None,
-            metadata=None):
-        return grpc.experimental.unary_unary(
-            request,
-            target,
-            '/io.deephaven.proto.backplane.grpc.StorageService/MoveItem',
-            deephaven_dot_proto_dot_storage__pb2.MoveItemRequest.SerializeToString,
-            deephaven_dot_proto_dot_storage__pb2.MoveItemResponse.FromString,
-            options,
-            channel_credentials,
-            insecure,
-            call_credentials,
-            compression,
-            wait_for_ready,
-            timeout,
-            metadata,
-            _registered_method=True)
-
-    @staticmethod
-    def CreateDirectory(request,
-            target,
-            options=(),
-            channel_credentials=None,
-            call_credentials=None,
-            insecure=False,
-            compression=None,
-            wait_for_ready=None,
-            timeout=None,
-            metadata=None):
-        return grpc.experimental.unary_unary(
-            request,
-            target,
-            '/io.deephaven.proto.backplane.grpc.StorageService/CreateDirectory',
-            deephaven_dot_proto_dot_storage__pb2.CreateDirectoryRequest.SerializeToString,
-            deephaven_dot_proto_dot_storage__pb2.CreateDirectoryResponse.FromString,
-            options,
-            channel_credentials,
-            insecure,
-            call_credentials,
-            compression,
-            wait_for_ready,
-            timeout,
-            metadata,
-            _registered_method=True)
-
-    @staticmethod
-    def DeleteItem(request,
-            target,
-            options=(),
-            channel_credentials=None,
-            call_credentials=None,
-            insecure=False,
-            compression=None,
-            wait_for_ready=None,
-            timeout=None,
-            metadata=None):
-        return grpc.experimental.unary_unary(
-            request,
-            target,
-            '/io.deephaven.proto.backplane.grpc.StorageService/DeleteItem',
-            deephaven_dot_proto_dot_storage__pb2.DeleteItemRequest.SerializeToString,
-            deephaven_dot_proto_dot_storage__pb2.DeleteItemResponse.FromString,
-            options,
-            channel_credentials,
-            insecure,
-            call_credentials,
-            compression,
-            wait_for_ready,
-            timeout,
-            metadata,
-            _registered_method=True)
diff --git a/py/client/pydeephaven/proto/table_pb2.py b/py/client/pydeephaven/proto/table_pb2.py
deleted file mode 100644
index b9f5ed4f8d1..00000000000
--- a/py/client/pydeephaven/proto/table_pb2.py
+++ /dev/null
@@ -1,342 +0,0 @@
-# -*- coding: utf-8 -*-
-# Generated by the protocol buffer compiler.  DO NOT EDIT!
-# source: deephaven/proto/table.proto
-# Protobuf Python Version: 5.26.1
-"""Generated protocol buffer code."""
-from google.protobuf import descriptor as _descriptor
-from google.protobuf import descriptor_pool as _descriptor_pool
-from google.protobuf import symbol_database as _symbol_database
-from google.protobuf.internal import builder as _builder
-# @@protoc_insertion_point(imports)
-
-_sym_db = _symbol_database.Default()
-
-
-from pydeephaven.proto import ticket_pb2 as deephaven_dot_proto_dot_ticket__pb2
-
-
-DESCRIPTOR = _descriptor_pool.Default().AddSerializedFile(b'\n\x1b\x64\x65\x65phaven/proto/table.proto\x12!io.deephaven.proto.backplane.grpc\x1a\x1c\x64\x65\x65phaven/proto/ticket.proto\"l\n\x0eTableReference\x12;\n\x06ticket\x18\x01 \x01(\x0b\x32).io.deephaven.proto.backplane.grpc.TicketH\x00\x12\x16\n\x0c\x62\x61tch_offset\x18\x02 \x01(\x11H\x00\x42\x05\n\x03ref\"\xc6\x01\n\x1d\x45xportedTableCreationResponse\x12\x44\n\tresult_id\x18\x01 \x01(\x0b\x32\x31.io.deephaven.proto.backplane.grpc.TableReference\x12\x0f\n\x07success\x18\x02 \x01(\x08\x12\x12\n\nerror_info\x18\x03 \x01(\t\x12\x15\n\rschema_header\x18\x04 \x01(\x0c\x12\x11\n\tis_static\x18\x05 \x01(\x08\x12\x10\n\x04size\x18\x06 \x01(\x12\x42\x02\x30\x01\"\x97\x01\n\x11\x46\x65tchTableRequest\x12\x44\n\tsource_id\x18\x01 \x01(\x0b\x32\x31.io.deephaven.proto.backplane.grpc.TableReference\x12<\n\tresult_id\x18\x02 \x01(\x0b\x32).io.deephaven.proto.backplane.grpc.Ticket\"\xa0\x01\n\x1a\x41pplyPreviewColumnsRequest\x12\x44\n\tsource_id\x18\x01 \x01(\x0b\x32\x31.io.deephaven.proto.backplane.grpc.TableReference\x12<\n\tresult_id\x18\x02 \x01(\x0b\x32).io.deephaven.proto.backplane.grpc.Ticket\"\x1d\n\x1b\x45xportedTableUpdatesRequest\"\x8c\x01\n\x1a\x45xportedTableUpdateMessage\x12<\n\texport_id\x18\x01 \x01(\x0b\x32).io.deephaven.proto.backplane.grpc.Ticket\x12\x10\n\x04size\x18\x02 \x01(\x12\x42\x02\x30\x01\x12\x1e\n\x16update_failure_message\x18\x03 \x01(\t\"c\n\x11\x45mptyTableRequest\x12<\n\tresult_id\x18\x01 \x01(\x0b\x32).io.deephaven.proto.backplane.grpc.Ticket\x12\x10\n\x04size\x18\x02 \x01(\x12\x42\x02\x30\x01\"\xef\x01\n\x10TimeTableRequest\x12<\n\tresult_id\x18\x01 \x01(\x0b\x32).io.deephaven.proto.backplane.grpc.Ticket\x12\x1e\n\x10start_time_nanos\x18\x02 \x01(\x12\x42\x02\x30\x01H\x00\x12\x1b\n\x11start_time_string\x18\x05 \x01(\tH\x00\x12\x1a\n\x0cperiod_nanos\x18\x03 \x01(\x12\x42\x02\x30\x01H\x01\x12\x17\n\rperiod_string\x18\x06 \x01(\tH\x01\x12\x13\n\x0b\x62link_table\x18\x04 \x01(\x08\x42\x0c\n\nstart_timeB\x08\n\x06period\"\xb1\x01\n\x15SelectOrUpdateRequest\x12<\n\tresult_id\x18\x01 \x01(\x0b\x32).io.deephaven.proto.backplane.grpc.Ticket\x12\x44\n\tsource_id\x18\x02 \x01(\x0b\x32\x31.io.deephaven.proto.backplane.grpc.TableReference\x12\x14\n\x0c\x63olumn_specs\x18\x03 \x03(\t\"\x8c\x02\n\x0bMathContext\x12\x11\n\tprecision\x18\x01 \x01(\x11\x12R\n\rrounding_mode\x18\x02 \x01(\x0e\x32;.io.deephaven.proto.backplane.grpc.MathContext.RoundingMode\"\x95\x01\n\x0cRoundingMode\x12\x1f\n\x1bROUNDING_MODE_NOT_SPECIFIED\x10\x00\x12\x06\n\x02UP\x10\x01\x12\x08\n\x04\x44OWN\x10\x02\x12\x0b\n\x07\x43\x45ILING\x10\x03\x12\t\n\x05\x46LOOR\x10\x04\x12\x0b\n\x07HALF_UP\x10\x05\x12\r\n\tHALF_DOWN\x10\x06\x12\r\n\tHALF_EVEN\x10\x07\x12\x0f\n\x0bUNNECESSARY\x10\x08\"\xdb\x02\n\x13UpdateByWindowScale\x12[\n\x05ticks\x18\x01 \x01(\x0b\x32J.io.deephaven.proto.backplane.grpc.UpdateByWindowScale.UpdateByWindowTicksH\x00\x12Y\n\x04time\x18\x02 \x01(\x0b\x32I.io.deephaven.proto.backplane.grpc.UpdateByWindowScale.UpdateByWindowTimeH\x00\x1a$\n\x13UpdateByWindowTicks\x12\r\n\x05ticks\x18\x01 \x01(\x01\x1a^\n\x12UpdateByWindowTime\x12\x0e\n\x06\x63olumn\x18\x01 \x01(\t\x12\x13\n\x05nanos\x18\x02 \x01(\x12\x42\x02\x30\x01H\x00\x12\x19\n\x0f\x64uration_string\x18\x03 \x01(\tH\x00\x42\x08\n\x06windowB\x06\n\x04type\"\xe1\x03\n\x11UpdateByEmOptions\x12I\n\ron_null_value\x18\x01 \x01(\x0e\x32\x32.io.deephaven.proto.backplane.grpc.BadDataBehavior\x12H\n\x0con_nan_value\x18\x02 \x01(\x0e\x32\x32.io.deephaven.proto.backplane.grpc.BadDataBehavior\x12H\n\x0con_null_time\x18\x03 \x01(\x0e\x32\x32.io.deephaven.proto.backplane.grpc.BadDataBehavior\x12R\n\x16on_negative_delta_time\x18\x04 \x01(\x0e\x32\x32.io.deephaven.proto.backplane.grpc.BadDataBehavior\x12N\n\x12on_zero_delta_time\x18\x05 \x01(\x0e\x32\x32.io.deephaven.proto.backplane.grpc.BadDataBehavior\x12I\n\x11\x62ig_value_context\x18\x06 \x01(\x0b\x32..io.deephaven.proto.backplane.grpc.MathContext\"f\n\x14UpdateByDeltaOptions\x12N\n\rnull_behavior\x18\x01 \x01(\x0e\x32\x37.io.deephaven.proto.backplane.grpc.UpdateByNullBehavior\"\x9b\x37\n\x0fUpdateByRequest\x12<\n\tresult_id\x18\x01 \x01(\x0b\x32).io.deephaven.proto.backplane.grpc.Ticket\x12\x44\n\tsource_id\x18\x02 \x01(\x0b\x32\x31.io.deephaven.proto.backplane.grpc.TableReference\x12S\n\x07options\x18\x03 \x01(\x0b\x32\x42.io.deephaven.proto.backplane.grpc.UpdateByRequest.UpdateByOptions\x12X\n\noperations\x18\x04 \x03(\x0b\x32\x44.io.deephaven.proto.backplane.grpc.UpdateByRequest.UpdateByOperation\x12\x18\n\x10group_by_columns\x18\x05 \x03(\t\x1a\xc3\x03\n\x0fUpdateByOptions\x12\x1c\n\x0fuse_redirection\x18\x01 \x01(\x08H\x00\x88\x01\x01\x12\x1b\n\x0e\x63hunk_capacity\x18\x02 \x01(\x05H\x01\x88\x01\x01\x12.\n!max_static_sparse_memory_overhead\x18\x03 \x01(\x01H\x02\x88\x01\x01\x12$\n\x17initial_hash_table_size\x18\x04 \x01(\x05H\x03\x88\x01\x01\x12 \n\x13maximum_load_factor\x18\x05 \x01(\x01H\x04\x88\x01\x01\x12\x1f\n\x12target_load_factor\x18\x06 \x01(\x01H\x05\x88\x01\x01\x12\x44\n\x0cmath_context\x18\x07 \x01(\x0b\x32..io.deephaven.proto.backplane.grpc.MathContextB\x12\n\x10_use_redirectionB\x11\n\x0f_chunk_capacityB$\n\"_max_static_sparse_memory_overheadB\x1a\n\x18_initial_hash_table_sizeB\x16\n\x14_maximum_load_factorB\x15\n\x13_target_load_factor\x1a\xf4\x30\n\x11UpdateByOperation\x12\x65\n\x06\x63olumn\x18\x01 \x01(\x0b\x32S.io.deephaven.proto.backplane.grpc.UpdateByRequest.UpdateByOperation.UpdateByColumnH\x00\x1a\xef/\n\x0eUpdateByColumn\x12n\n\x04spec\x18\x01 \x01(\x0b\x32`.io.deephaven.proto.backplane.grpc.UpdateByRequest.UpdateByOperation.UpdateByColumn.UpdateBySpec\x12\x13\n\x0bmatch_pairs\x18\x02 \x03(\t\x1a\xd7.\n\x0cUpdateBySpec\x12\x85\x01\n\x03sum\x18\x01 \x01(\x0b\x32v.io.deephaven.proto.backplane.grpc.UpdateByRequest.UpdateByOperation.UpdateByColumn.UpdateBySpec.UpdateByCumulativeSumH\x00\x12\x85\x01\n\x03min\x18\x02 \x01(\x0b\x32v.io.deephaven.proto.backplane.grpc.UpdateByRequest.UpdateByOperation.UpdateByColumn.UpdateBySpec.UpdateByCumulativeMinH\x00\x12\x85\x01\n\x03max\x18\x03 \x01(\x0b\x32v.io.deephaven.proto.backplane.grpc.UpdateByRequest.UpdateByOperation.UpdateByColumn.UpdateBySpec.UpdateByCumulativeMaxH\x00\x12\x8d\x01\n\x07product\x18\x04 \x01(\x0b\x32z.io.deephaven.proto.backplane.grpc.UpdateByRequest.UpdateByOperation.UpdateByColumn.UpdateBySpec.UpdateByCumulativeProductH\x00\x12}\n\x04\x66ill\x18\x05 \x01(\x0b\x32m.io.deephaven.proto.backplane.grpc.UpdateByRequest.UpdateByOperation.UpdateByColumn.UpdateBySpec.UpdateByFillH\x00\x12{\n\x03\x65ma\x18\x06 \x01(\x0b\x32l.io.deephaven.proto.backplane.grpc.UpdateByRequest.UpdateByOperation.UpdateByColumn.UpdateBySpec.UpdateByEmaH\x00\x12\x8a\x01\n\x0brolling_sum\x18\x07 \x01(\x0b\x32s.io.deephaven.proto.backplane.grpc.UpdateByRequest.UpdateByOperation.UpdateByColumn.UpdateBySpec.UpdateByRollingSumH\x00\x12\x8e\x01\n\rrolling_group\x18\x08 \x01(\x0b\x32u.io.deephaven.proto.backplane.grpc.UpdateByRequest.UpdateByOperation.UpdateByColumn.UpdateBySpec.UpdateByRollingGroupH\x00\x12\x8a\x01\n\x0brolling_avg\x18\t \x01(\x0b\x32s.io.deephaven.proto.backplane.grpc.UpdateByRequest.UpdateByOperation.UpdateByColumn.UpdateBySpec.UpdateByRollingAvgH\x00\x12\x8a\x01\n\x0brolling_min\x18\n \x01(\x0b\x32s.io.deephaven.proto.backplane.grpc.UpdateByRequest.UpdateByOperation.UpdateByColumn.UpdateBySpec.UpdateByRollingMinH\x00\x12\x8a\x01\n\x0brolling_max\x18\x0b \x01(\x0b\x32s.io.deephaven.proto.backplane.grpc.UpdateByRequest.UpdateByOperation.UpdateByColumn.UpdateBySpec.UpdateByRollingMaxH\x00\x12\x92\x01\n\x0frolling_product\x18\x0c \x01(\x0b\x32w.io.deephaven.proto.backplane.grpc.UpdateByRequest.UpdateByOperation.UpdateByColumn.UpdateBySpec.UpdateByRollingProductH\x00\x12\x7f\n\x05\x64\x65lta\x18\r \x01(\x0b\x32n.io.deephaven.proto.backplane.grpc.UpdateByRequest.UpdateByOperation.UpdateByColumn.UpdateBySpec.UpdateByDeltaH\x00\x12{\n\x03\x65ms\x18\x0e \x01(\x0b\x32l.io.deephaven.proto.backplane.grpc.UpdateByRequest.UpdateByOperation.UpdateByColumn.UpdateBySpec.UpdateByEmsH\x00\x12\x80\x01\n\x06\x65m_min\x18\x0f \x01(\x0b\x32n.io.deephaven.proto.backplane.grpc.UpdateByRequest.UpdateByOperation.UpdateByColumn.UpdateBySpec.UpdateByEmMinH\x00\x12\x80\x01\n\x06\x65m_max\x18\x10 \x01(\x0b\x32n.io.deephaven.proto.backplane.grpc.UpdateByRequest.UpdateByOperation.UpdateByColumn.UpdateBySpec.UpdateByEmMaxH\x00\x12\x80\x01\n\x06\x65m_std\x18\x11 \x01(\x0b\x32n.io.deephaven.proto.backplane.grpc.UpdateByRequest.UpdateByOperation.UpdateByColumn.UpdateBySpec.UpdateByEmStdH\x00\x12\x8e\x01\n\rrolling_count\x18\x12 \x01(\x0b\x32u.io.deephaven.proto.backplane.grpc.UpdateByRequest.UpdateByOperation.UpdateByColumn.UpdateBySpec.UpdateByRollingCountH\x00\x12\x8a\x01\n\x0brolling_std\x18\x13 \x01(\x0b\x32s.io.deephaven.proto.backplane.grpc.UpdateByRequest.UpdateByOperation.UpdateByColumn.UpdateBySpec.UpdateByRollingStdH\x00\x12\x8c\x01\n\x0crolling_wavg\x18\x14 \x01(\x0b\x32t.io.deephaven.proto.backplane.grpc.UpdateByRequest.UpdateByOperation.UpdateByColumn.UpdateBySpec.UpdateByRollingWAvgH\x00\x12\x92\x01\n\x0frolling_formula\x18\x15 \x01(\x0b\x32w.io.deephaven.proto.backplane.grpc.UpdateByRequest.UpdateByOperation.UpdateByColumn.UpdateBySpec.UpdateByRollingFormulaH\x00\x1a\x17\n\x15UpdateByCumulativeSum\x1a\x17\n\x15UpdateByCumulativeMin\x1a\x17\n\x15UpdateByCumulativeMax\x1a\x1b\n\x19UpdateByCumulativeProduct\x1a\x0e\n\x0cUpdateByFill\x1a\xa2\x01\n\x0bUpdateByEma\x12\x45\n\x07options\x18\x01 \x01(\x0b\x32\x34.io.deephaven.proto.backplane.grpc.UpdateByEmOptions\x12L\n\x0cwindow_scale\x18\x02 \x01(\x0b\x32\x36.io.deephaven.proto.backplane.grpc.UpdateByWindowScale\x1a\xa2\x01\n\x0bUpdateByEms\x12\x45\n\x07options\x18\x01 \x01(\x0b\x32\x34.io.deephaven.proto.backplane.grpc.UpdateByEmOptions\x12L\n\x0cwindow_scale\x18\x02 \x01(\x0b\x32\x36.io.deephaven.proto.backplane.grpc.UpdateByWindowScale\x1a\xa4\x01\n\rUpdateByEmMin\x12\x45\n\x07options\x18\x01 \x01(\x0b\x32\x34.io.deephaven.proto.backplane.grpc.UpdateByEmOptions\x12L\n\x0cwindow_scale\x18\x02 \x01(\x0b\x32\x36.io.deephaven.proto.backplane.grpc.UpdateByWindowScale\x1a\xa4\x01\n\rUpdateByEmMax\x12\x45\n\x07options\x18\x01 \x01(\x0b\x32\x34.io.deephaven.proto.backplane.grpc.UpdateByEmOptions\x12L\n\x0cwindow_scale\x18\x02 \x01(\x0b\x32\x36.io.deephaven.proto.backplane.grpc.UpdateByWindowScale\x1a\xa4\x01\n\rUpdateByEmStd\x12\x45\n\x07options\x18\x01 \x01(\x0b\x32\x34.io.deephaven.proto.backplane.grpc.UpdateByEmOptions\x12L\n\x0cwindow_scale\x18\x02 \x01(\x0b\x32\x36.io.deephaven.proto.backplane.grpc.UpdateByWindowScale\x1aY\n\rUpdateByDelta\x12H\n\x07options\x18\x01 \x01(\x0b\x32\x37.io.deephaven.proto.backplane.grpc.UpdateByDeltaOptions\x1a\xc0\x01\n\x12UpdateByRollingSum\x12T\n\x14reverse_window_scale\x18\x01 \x01(\x0b\x32\x36.io.deephaven.proto.backplane.grpc.UpdateByWindowScale\x12T\n\x14\x66orward_window_scale\x18\x02 \x01(\x0b\x32\x36.io.deephaven.proto.backplane.grpc.UpdateByWindowScale\x1a\xc2\x01\n\x14UpdateByRollingGroup\x12T\n\x14reverse_window_scale\x18\x01 \x01(\x0b\x32\x36.io.deephaven.proto.backplane.grpc.UpdateByWindowScale\x12T\n\x14\x66orward_window_scale\x18\x02 \x01(\x0b\x32\x36.io.deephaven.proto.backplane.grpc.UpdateByWindowScale\x1a\xc0\x01\n\x12UpdateByRollingAvg\x12T\n\x14reverse_window_scale\x18\x01 \x01(\x0b\x32\x36.io.deephaven.proto.backplane.grpc.UpdateByWindowScale\x12T\n\x14\x66orward_window_scale\x18\x02 \x01(\x0b\x32\x36.io.deephaven.proto.backplane.grpc.UpdateByWindowScale\x1a\xc0\x01\n\x12UpdateByRollingMin\x12T\n\x14reverse_window_scale\x18\x01 \x01(\x0b\x32\x36.io.deephaven.proto.backplane.grpc.UpdateByWindowScale\x12T\n\x14\x66orward_window_scale\x18\x02 \x01(\x0b\x32\x36.io.deephaven.proto.backplane.grpc.UpdateByWindowScale\x1a\xc0\x01\n\x12UpdateByRollingMax\x12T\n\x14reverse_window_scale\x18\x01 \x01(\x0b\x32\x36.io.deephaven.proto.backplane.grpc.UpdateByWindowScale\x12T\n\x14\x66orward_window_scale\x18\x02 \x01(\x0b\x32\x36.io.deephaven.proto.backplane.grpc.UpdateByWindowScale\x1a\xc4\x01\n\x16UpdateByRollingProduct\x12T\n\x14reverse_window_scale\x18\x01 \x01(\x0b\x32\x36.io.deephaven.proto.backplane.grpc.UpdateByWindowScale\x12T\n\x14\x66orward_window_scale\x18\x02 \x01(\x0b\x32\x36.io.deephaven.proto.backplane.grpc.UpdateByWindowScale\x1a\xc2\x01\n\x14UpdateByRollingCount\x12T\n\x14reverse_window_scale\x18\x01 \x01(\x0b\x32\x36.io.deephaven.proto.backplane.grpc.UpdateByWindowScale\x12T\n\x14\x66orward_window_scale\x18\x02 \x01(\x0b\x32\x36.io.deephaven.proto.backplane.grpc.UpdateByWindowScale\x1a\xc0\x01\n\x12UpdateByRollingStd\x12T\n\x14reverse_window_scale\x18\x01 \x01(\x0b\x32\x36.io.deephaven.proto.backplane.grpc.UpdateByWindowScale\x12T\n\x14\x66orward_window_scale\x18\x02 \x01(\x0b\x32\x36.io.deephaven.proto.backplane.grpc.UpdateByWindowScale\x1a\xd8\x01\n\x13UpdateByRollingWAvg\x12T\n\x14reverse_window_scale\x18\x01 \x01(\x0b\x32\x36.io.deephaven.proto.backplane.grpc.UpdateByWindowScale\x12T\n\x14\x66orward_window_scale\x18\x02 \x01(\x0b\x32\x36.io.deephaven.proto.backplane.grpc.UpdateByWindowScale\x12\x15\n\rweight_column\x18\x03 \x01(\t\x1a\xea\x01\n\x16UpdateByRollingFormula\x12T\n\x14reverse_window_scale\x18\x01 \x01(\x0b\x32\x36.io.deephaven.proto.backplane.grpc.UpdateByWindowScale\x12T\n\x14\x66orward_window_scale\x18\x02 \x01(\x0b\x32\x36.io.deephaven.proto.backplane.grpc.UpdateByWindowScale\x12\x0f\n\x07\x66ormula\x18\x03 \x01(\t\x12\x13\n\x0bparam_token\x18\x04 \x01(\tB\x06\n\x04typeB\x06\n\x04type\"\xb1\x01\n\x15SelectDistinctRequest\x12<\n\tresult_id\x18\x01 \x01(\x0b\x32).io.deephaven.proto.backplane.grpc.Ticket\x12\x44\n\tsource_id\x18\x02 \x01(\x0b\x32\x31.io.deephaven.proto.backplane.grpc.TableReference\x12\x14\n\x0c\x63olumn_names\x18\x03 \x03(\t\"\xae\x01\n\x12\x44ropColumnsRequest\x12<\n\tresult_id\x18\x01 \x01(\x0b\x32).io.deephaven.proto.backplane.grpc.Ticket\x12\x44\n\tsource_id\x18\x02 \x01(\x0b\x32\x31.io.deephaven.proto.backplane.grpc.TableReference\x12\x14\n\x0c\x63olumn_names\x18\x03 \x03(\t\"\xb5\x01\n\x1eUnstructuredFilterTableRequest\x12<\n\tresult_id\x18\x01 \x01(\x0b\x32).io.deephaven.proto.backplane.grpc.Ticket\x12\x44\n\tsource_id\x18\x02 \x01(\x0b\x32\x31.io.deephaven.proto.backplane.grpc.TableReference\x12\x0f\n\x07\x66ilters\x18\x03 \x03(\t\"\xad\x01\n\x11HeadOrTailRequest\x12<\n\tresult_id\x18\x01 \x01(\x0b\x32).io.deephaven.proto.backplane.grpc.Ticket\x12\x44\n\tsource_id\x18\x02 \x01(\x0b\x32\x31.io.deephaven.proto.backplane.grpc.TableReference\x12\x14\n\x08num_rows\x18\x03 \x01(\x12\x42\x02\x30\x01\"\xce\x01\n\x13HeadOrTailByRequest\x12<\n\tresult_id\x18\x01 \x01(\x0b\x32).io.deephaven.proto.backplane.grpc.Ticket\x12\x44\n\tsource_id\x18\x02 \x01(\x0b\x32\x31.io.deephaven.proto.backplane.grpc.TableReference\x12\x14\n\x08num_rows\x18\x03 \x01(\x12\x42\x02\x30\x01\x12\x1d\n\x15group_by_column_specs\x18\x04 \x03(\t\"\xc3\x01\n\x0eUngroupRequest\x12<\n\tresult_id\x18\x01 \x01(\x0b\x32).io.deephaven.proto.backplane.grpc.Ticket\x12\x44\n\tsource_id\x18\x02 \x01(\x0b\x32\x31.io.deephaven.proto.backplane.grpc.TableReference\x12\x11\n\tnull_fill\x18\x03 \x01(\x08\x12\x1a\n\x12\x63olumns_to_ungroup\x18\x04 \x03(\t\"\xad\x01\n\x12MergeTablesRequest\x12<\n\tresult_id\x18\x01 \x01(\x0b\x32).io.deephaven.proto.backplane.grpc.Ticket\x12\x45\n\nsource_ids\x18\x02 \x03(\x0b\x32\x31.io.deephaven.proto.backplane.grpc.TableReference\x12\x12\n\nkey_column\x18\x03 \x01(\t\"\x9a\x01\n\x14SnapshotTableRequest\x12<\n\tresult_id\x18\x01 \x01(\x0b\x32).io.deephaven.proto.backplane.grpc.Ticket\x12\x44\n\tsource_id\x18\x02 \x01(\x0b\x32\x31.io.deephaven.proto.backplane.grpc.TableReference\"\xb1\x02\n\x18SnapshotWhenTableRequest\x12<\n\tresult_id\x18\x01 \x01(\x0b\x32).io.deephaven.proto.backplane.grpc.Ticket\x12\x42\n\x07\x62\x61se_id\x18\x02 \x01(\x0b\x32\x31.io.deephaven.proto.backplane.grpc.TableReference\x12\x45\n\ntrigger_id\x18\x03 \x01(\x0b\x32\x31.io.deephaven.proto.backplane.grpc.TableReference\x12\x0f\n\x07initial\x18\x04 \x01(\x08\x12\x13\n\x0bincremental\x18\x05 \x01(\x08\x12\x0f\n\x07history\x18\x06 \x01(\x08\x12\x15\n\rstamp_columns\x18\x07 \x03(\t\"\xa7\x02\n\x16\x43rossJoinTablesRequest\x12<\n\tresult_id\x18\x01 \x01(\x0b\x32).io.deephaven.proto.backplane.grpc.Ticket\x12\x42\n\x07left_id\x18\x02 \x01(\x0b\x32\x31.io.deephaven.proto.backplane.grpc.TableReference\x12\x43\n\x08right_id\x18\x03 \x01(\x0b\x32\x31.io.deephaven.proto.backplane.grpc.TableReference\x12\x18\n\x10\x63olumns_to_match\x18\x04 \x03(\t\x12\x16\n\x0e\x63olumns_to_add\x18\x05 \x03(\t\x12\x14\n\x0creserve_bits\x18\x06 \x01(\x05\"\x93\x02\n\x18NaturalJoinTablesRequest\x12<\n\tresult_id\x18\x01 \x01(\x0b\x32).io.deephaven.proto.backplane.grpc.Ticket\x12\x42\n\x07left_id\x18\x02 \x01(\x0b\x32\x31.io.deephaven.proto.backplane.grpc.TableReference\x12\x43\n\x08right_id\x18\x03 \x01(\x0b\x32\x31.io.deephaven.proto.backplane.grpc.TableReference\x12\x18\n\x10\x63olumns_to_match\x18\x04 \x03(\t\x12\x16\n\x0e\x63olumns_to_add\x18\x05 \x03(\t\"\x91\x02\n\x16\x45xactJoinTablesRequest\x12<\n\tresult_id\x18\x01 \x01(\x0b\x32).io.deephaven.proto.backplane.grpc.Ticket\x12\x42\n\x07left_id\x18\x02 \x01(\x0b\x32\x31.io.deephaven.proto.backplane.grpc.TableReference\x12\x43\n\x08right_id\x18\x03 \x01(\x0b\x32\x31.io.deephaven.proto.backplane.grpc.TableReference\x12\x18\n\x10\x63olumns_to_match\x18\x04 \x03(\t\x12\x16\n\x0e\x63olumns_to_add\x18\x05 \x03(\t\"\x90\x02\n\x15LeftJoinTablesRequest\x12<\n\tresult_id\x18\x01 \x01(\x0b\x32).io.deephaven.proto.backplane.grpc.Ticket\x12\x42\n\x07left_id\x18\x02 \x01(\x0b\x32\x31.io.deephaven.proto.backplane.grpc.TableReference\x12\x43\n\x08right_id\x18\x03 \x01(\x0b\x32\x31.io.deephaven.proto.backplane.grpc.TableReference\x12\x18\n\x10\x63olumns_to_match\x18\x04 \x03(\t\x12\x16\n\x0e\x63olumns_to_add\x18\x05 \x03(\t\"\xd1\x03\n\x15\x41sOfJoinTablesRequest\x12<\n\tresult_id\x18\x01 \x01(\x0b\x32).io.deephaven.proto.backplane.grpc.Ticket\x12\x42\n\x07left_id\x18\x02 \x01(\x0b\x32\x31.io.deephaven.proto.backplane.grpc.TableReference\x12\x43\n\x08right_id\x18\x03 \x01(\x0b\x32\x31.io.deephaven.proto.backplane.grpc.TableReference\x12\x18\n\x10\x63olumns_to_match\x18\x04 \x03(\t\x12\x16\n\x0e\x63olumns_to_add\x18\x05 \x03(\t\x12\\\n\x10\x61s_of_match_rule\x18\x07 \x01(\x0e\x32\x42.io.deephaven.proto.backplane.grpc.AsOfJoinTablesRequest.MatchRule\"]\n\tMatchRule\x12\x13\n\x0fLESS_THAN_EQUAL\x10\x00\x12\r\n\tLESS_THAN\x10\x01\x12\x16\n\x12GREATER_THAN_EQUAL\x10\x02\x12\x10\n\x0cGREATER_THAN\x10\x03\x1a\x02\x18\x01:\x02\x18\x01\"\xa6\x02\n\x12\x41jRajTablesRequest\x12<\n\tresult_id\x18\x01 \x01(\x0b\x32).io.deephaven.proto.backplane.grpc.Ticket\x12\x42\n\x07left_id\x18\x02 \x01(\x0b\x32\x31.io.deephaven.proto.backplane.grpc.TableReference\x12\x43\n\x08right_id\x18\x03 \x01(\x0b\x32\x31.io.deephaven.proto.backplane.grpc.TableReference\x12\x1b\n\x13\x65xact_match_columns\x18\x04 \x03(\t\x12\x14\n\x0c\x61s_of_column\x18\x05 \x01(\t\x12\x16\n\x0e\x63olumns_to_add\x18\x06 \x03(\t\"\x88\x01\n\x0eMultiJoinInput\x12\x44\n\tsource_id\x18\x01 \x01(\x0b\x32\x31.io.deephaven.proto.backplane.grpc.TableReference\x12\x18\n\x10\x63olumns_to_match\x18\x02 \x03(\t\x12\x16\n\x0e\x63olumns_to_add\x18\x03 \x03(\t\"\xa4\x01\n\x16MultiJoinTablesRequest\x12<\n\tresult_id\x18\x01 \x01(\x0b\x32).io.deephaven.proto.backplane.grpc.Ticket\x12L\n\x11multi_join_inputs\x18\x02 \x03(\x0b\x32\x31.io.deephaven.proto.backplane.grpc.MultiJoinInput\"\xe0\x06\n\x16RangeJoinTablesRequest\x12<\n\tresult_id\x18\x01 \x01(\x0b\x32).io.deephaven.proto.backplane.grpc.Ticket\x12\x42\n\x07left_id\x18\x02 \x01(\x0b\x32\x31.io.deephaven.proto.backplane.grpc.TableReference\x12\x43\n\x08right_id\x18\x03 \x01(\x0b\x32\x31.io.deephaven.proto.backplane.grpc.TableReference\x12\x1b\n\x13\x65xact_match_columns\x18\x04 \x03(\t\x12\x19\n\x11left_start_column\x18\x05 \x01(\t\x12\x62\n\x10range_start_rule\x18\x06 \x01(\x0e\x32H.io.deephaven.proto.backplane.grpc.RangeJoinTablesRequest.RangeStartRule\x12\x1a\n\x12right_range_column\x18\x07 \x01(\t\x12^\n\x0erange_end_rule\x18\x08 \x01(\x0e\x32\x46.io.deephaven.proto.backplane.grpc.RangeJoinTablesRequest.RangeEndRule\x12\x17\n\x0fleft_end_column\x18\t \x01(\t\x12\x44\n\x0c\x61ggregations\x18\n \x03(\x0b\x32..io.deephaven.proto.backplane.grpc.Aggregation\x12\x13\n\x0brange_match\x18\x0b \x01(\t\"v\n\x0eRangeStartRule\x12\x15\n\x11START_UNSPECIFIED\x10\x00\x12\r\n\tLESS_THAN\x10\x01\x12\x16\n\x12LESS_THAN_OR_EQUAL\x10\x02\x12&\n\"LESS_THAN_OR_EQUAL_ALLOW_PRECEDING\x10\x03\"{\n\x0cRangeEndRule\x12\x13\n\x0f\x45ND_UNSPECIFIED\x10\x00\x12\x10\n\x0cGREATER_THAN\x10\x01\x12\x19\n\x15GREATER_THAN_OR_EQUAL\x10\x02\x12)\n%GREATER_THAN_OR_EQUAL_ALLOW_FOLLOWING\x10\x03\"\xfe\x04\n\x15\x43omboAggregateRequest\x12<\n\tresult_id\x18\x01 \x01(\x0b\x32).io.deephaven.proto.backplane.grpc.Ticket\x12\x44\n\tsource_id\x18\x02 \x01(\x0b\x32\x31.io.deephaven.proto.backplane.grpc.TableReference\x12V\n\naggregates\x18\x03 \x03(\x0b\x32\x42.io.deephaven.proto.backplane.grpc.ComboAggregateRequest.Aggregate\x12\x18\n\x10group_by_columns\x18\x04 \x03(\t\x12\x13\n\x0b\x66orce_combo\x18\x05 \x01(\x08\x1a\xad\x01\n\tAggregate\x12N\n\x04type\x18\x01 \x01(\x0e\x32@.io.deephaven.proto.backplane.grpc.ComboAggregateRequest.AggType\x12\x13\n\x0bmatch_pairs\x18\x02 \x03(\t\x12\x13\n\x0b\x63olumn_name\x18\x03 \x01(\t\x12\x12\n\npercentile\x18\x04 \x01(\x01\x12\x12\n\navg_median\x18\x05 \x01(\x08\"\xa5\x01\n\x07\x41ggType\x12\x07\n\x03SUM\x10\x00\x12\x0b\n\x07\x41\x42S_SUM\x10\x01\x12\t\n\x05GROUP\x10\x02\x12\x07\n\x03\x41VG\x10\x03\x12\t\n\x05\x43OUNT\x10\x04\x12\t\n\x05\x46IRST\x10\x05\x12\x08\n\x04LAST\x10\x06\x12\x07\n\x03MIN\x10\x07\x12\x07\n\x03MAX\x10\x08\x12\n\n\x06MEDIAN\x10\t\x12\x0e\n\nPERCENTILE\x10\n\x12\x07\n\x03STD\x10\x0b\x12\x07\n\x03VAR\x10\x0c\x12\x10\n\x0cWEIGHTED_AVG\x10\r:\x02\x18\x01\"\xed\x01\n\x13\x41ggregateAllRequest\x12<\n\tresult_id\x18\x01 \x01(\x0b\x32).io.deephaven.proto.backplane.grpc.Ticket\x12\x44\n\tsource_id\x18\x02 \x01(\x0b\x32\x31.io.deephaven.proto.backplane.grpc.TableReference\x12\x38\n\x04spec\x18\x03 \x01(\x0b\x32*.io.deephaven.proto.backplane.grpc.AggSpec\x12\x18\n\x10group_by_columns\x18\x04 \x03(\t\"\xd7\x17\n\x07\x41ggSpec\x12K\n\x07\x61\x62s_sum\x18\x01 \x01(\x0b\x32\x38.io.deephaven.proto.backplane.grpc.AggSpec.AggSpecAbsSumH\x00\x12i\n\x16\x61pproximate_percentile\x18\x02 \x01(\x0b\x32G.io.deephaven.proto.backplane.grpc.AggSpec.AggSpecApproximatePercentileH\x00\x12\x44\n\x03\x61vg\x18\x03 \x01(\x0b\x32\x35.io.deephaven.proto.backplane.grpc.AggSpec.AggSpecAvgH\x00\x12Y\n\x0e\x63ount_distinct\x18\x04 \x01(\x0b\x32?.io.deephaven.proto.backplane.grpc.AggSpec.AggSpecCountDistinctH\x00\x12N\n\x08\x64istinct\x18\x05 \x01(\x0b\x32:.io.deephaven.proto.backplane.grpc.AggSpec.AggSpecDistinctH\x00\x12H\n\x05\x66irst\x18\x06 \x01(\x0b\x32\x37.io.deephaven.proto.backplane.grpc.AggSpec.AggSpecFirstH\x00\x12L\n\x07\x66ormula\x18\x07 \x01(\x0b\x32\x39.io.deephaven.proto.backplane.grpc.AggSpec.AggSpecFormulaH\x00\x12J\n\x06\x66reeze\x18\x08 \x01(\x0b\x32\x38.io.deephaven.proto.backplane.grpc.AggSpec.AggSpecFreezeH\x00\x12H\n\x05group\x18\t \x01(\x0b\x32\x37.io.deephaven.proto.backplane.grpc.AggSpec.AggSpecGroupH\x00\x12\x46\n\x04last\x18\n \x01(\x0b\x32\x36.io.deephaven.proto.backplane.grpc.AggSpec.AggSpecLastH\x00\x12\x44\n\x03max\x18\x0b \x01(\x0b\x32\x35.io.deephaven.proto.backplane.grpc.AggSpec.AggSpecMaxH\x00\x12J\n\x06median\x18\x0c \x01(\x0b\x32\x38.io.deephaven.proto.backplane.grpc.AggSpec.AggSpecMedianH\x00\x12\x44\n\x03min\x18\r \x01(\x0b\x32\x35.io.deephaven.proto.backplane.grpc.AggSpec.AggSpecMinH\x00\x12R\n\npercentile\x18\x0e \x01(\x0b\x32<.io.deephaven.proto.backplane.grpc.AggSpec.AggSpecPercentileH\x00\x12P\n\x0csorted_first\x18\x0f \x01(\x0b\x32\x38.io.deephaven.proto.backplane.grpc.AggSpec.AggSpecSortedH\x00\x12O\n\x0bsorted_last\x18\x10 \x01(\x0b\x32\x38.io.deephaven.proto.backplane.grpc.AggSpec.AggSpecSortedH\x00\x12\x44\n\x03std\x18\x11 \x01(\x0b\x32\x35.io.deephaven.proto.backplane.grpc.AggSpec.AggSpecStdH\x00\x12\x44\n\x03sum\x18\x12 \x01(\x0b\x32\x35.io.deephaven.proto.backplane.grpc.AggSpec.AggSpecSumH\x00\x12M\n\x08t_digest\x18\x13 \x01(\x0b\x32\x39.io.deephaven.proto.backplane.grpc.AggSpec.AggSpecTDigestH\x00\x12J\n\x06unique\x18\x14 \x01(\x0b\x32\x38.io.deephaven.proto.backplane.grpc.AggSpec.AggSpecUniqueH\x00\x12R\n\x0cweighted_avg\x18\x15 \x01(\x0b\x32:.io.deephaven.proto.backplane.grpc.AggSpec.AggSpecWeightedH\x00\x12R\n\x0cweighted_sum\x18\x16 \x01(\x0b\x32:.io.deephaven.proto.backplane.grpc.AggSpec.AggSpecWeightedH\x00\x12\x44\n\x03var\x18\x17 \x01(\x0b\x32\x35.io.deephaven.proto.backplane.grpc.AggSpec.AggSpecVarH\x00\x1a\\\n\x1c\x41ggSpecApproximatePercentile\x12\x12\n\npercentile\x18\x01 \x01(\x01\x12\x18\n\x0b\x63ompression\x18\x02 \x01(\x01H\x00\x88\x01\x01\x42\x0e\n\x0c_compression\x1a+\n\x14\x41ggSpecCountDistinct\x12\x13\n\x0b\x63ount_nulls\x18\x01 \x01(\x08\x1a(\n\x0f\x41ggSpecDistinct\x12\x15\n\rinclude_nulls\x18\x01 \x01(\x08\x1a\x36\n\x0e\x41ggSpecFormula\x12\x0f\n\x07\x66ormula\x18\x01 \x01(\t\x12\x13\n\x0bparam_token\x18\x02 \x01(\t\x1a/\n\rAggSpecMedian\x12\x1e\n\x16\x61verage_evenly_divided\x18\x01 \x01(\x08\x1aG\n\x11\x41ggSpecPercentile\x12\x12\n\npercentile\x18\x01 \x01(\x01\x12\x1e\n\x16\x61verage_evenly_divided\x18\x02 \x01(\x08\x1a`\n\rAggSpecSorted\x12O\n\x07\x63olumns\x18\x01 \x03(\x0b\x32>.io.deephaven.proto.backplane.grpc.AggSpec.AggSpecSortedColumn\x1a*\n\x13\x41ggSpecSortedColumn\x12\x13\n\x0b\x63olumn_name\x18\x01 \x01(\t\x1a:\n\x0e\x41ggSpecTDigest\x12\x18\n\x0b\x63ompression\x18\x01 \x01(\x01H\x00\x88\x01\x01\x42\x0e\n\x0c_compression\x1a\x88\x01\n\rAggSpecUnique\x12\x15\n\rinclude_nulls\x18\x01 \x01(\x08\x12`\n\x13non_unique_sentinel\x18\x02 \x01(\x0b\x32\x43.io.deephaven.proto.backplane.grpc.AggSpec.AggSpecNonUniqueSentinel\x1a\xb5\x02\n\x18\x41ggSpecNonUniqueSentinel\x12\x42\n\nnull_value\x18\x01 \x01(\x0e\x32,.io.deephaven.proto.backplane.grpc.NullValueH\x00\x12\x16\n\x0cstring_value\x18\x02 \x01(\tH\x00\x12\x13\n\tint_value\x18\x03 \x01(\x11H\x00\x12\x18\n\nlong_value\x18\x04 \x01(\x12\x42\x02\x30\x01H\x00\x12\x15\n\x0b\x66loat_value\x18\x05 \x01(\x02H\x00\x12\x16\n\x0c\x64ouble_value\x18\x06 \x01(\x01H\x00\x12\x14\n\nbool_value\x18\x07 \x01(\x08H\x00\x12\x14\n\nbyte_value\x18\x08 \x01(\x11H\x00\x12\x15\n\x0bshort_value\x18\t \x01(\x11H\x00\x12\x14\n\nchar_value\x18\n \x01(\x11H\x00\x42\x06\n\x04type\x1a(\n\x0f\x41ggSpecWeighted\x12\x15\n\rweight_column\x18\x01 \x01(\t\x1a\x0f\n\rAggSpecAbsSum\x1a\x0c\n\nAggSpecAvg\x1a\x0e\n\x0c\x41ggSpecFirst\x1a\x0f\n\rAggSpecFreeze\x1a\x0e\n\x0c\x41ggSpecGroup\x1a\r\n\x0b\x41ggSpecLast\x1a\x0c\n\nAggSpecMax\x1a\x0c\n\nAggSpecMin\x1a\x0c\n\nAggSpecStd\x1a\x0c\n\nAggSpecSum\x1a\x0c\n\nAggSpecVarB\x06\n\x04type\"\xdc\x02\n\x10\x41ggregateRequest\x12<\n\tresult_id\x18\x01 \x01(\x0b\x32).io.deephaven.proto.backplane.grpc.Ticket\x12\x44\n\tsource_id\x18\x02 \x01(\x0b\x32\x31.io.deephaven.proto.backplane.grpc.TableReference\x12L\n\x11initial_groups_id\x18\x03 \x01(\x0b\x32\x31.io.deephaven.proto.backplane.grpc.TableReference\x12\x16\n\x0epreserve_empty\x18\x04 \x01(\x08\x12\x44\n\x0c\x61ggregations\x18\x05 \x03(\x0b\x32..io.deephaven.proto.backplane.grpc.Aggregation\x12\x18\n\x10group_by_columns\x18\x06 \x03(\t\"\xd3\x05\n\x0b\x41ggregation\x12T\n\x07\x63olumns\x18\x01 \x01(\x0b\x32\x41.io.deephaven.proto.backplane.grpc.Aggregation.AggregationColumnsH\x00\x12P\n\x05\x63ount\x18\x02 \x01(\x0b\x32?.io.deephaven.proto.backplane.grpc.Aggregation.AggregationCountH\x00\x12Y\n\rfirst_row_key\x18\x03 \x01(\x0b\x32@.io.deephaven.proto.backplane.grpc.Aggregation.AggregationRowKeyH\x00\x12X\n\x0clast_row_key\x18\x04 \x01(\x0b\x32@.io.deephaven.proto.backplane.grpc.Aggregation.AggregationRowKeyH\x00\x12X\n\tpartition\x18\x05 \x01(\x0b\x32\x43.io.deephaven.proto.backplane.grpc.Aggregation.AggregationPartitionH\x00\x1a\x63\n\x12\x41ggregationColumns\x12\x38\n\x04spec\x18\x01 \x01(\x0b\x32*.io.deephaven.proto.backplane.grpc.AggSpec\x12\x13\n\x0bmatch_pairs\x18\x02 \x03(\t\x1a\'\n\x10\x41ggregationCount\x12\x13\n\x0b\x63olumn_name\x18\x01 \x01(\t\x1a(\n\x11\x41ggregationRowKey\x12\x13\n\x0b\x63olumn_name\x18\x01 \x01(\t\x1aM\n\x14\x41ggregationPartition\x12\x13\n\x0b\x63olumn_name\x18\x01 \x01(\t\x12 \n\x18include_group_by_columns\x18\x02 \x01(\x08\x42\x06\n\x04type\"\xe1\x01\n\x0eSortDescriptor\x12\x13\n\x0b\x63olumn_name\x18\x01 \x01(\t\x12\x13\n\x0bis_absolute\x18\x02 \x01(\x08\x12R\n\tdirection\x18\x03 \x01(\x0e\x32?.io.deephaven.proto.backplane.grpc.SortDescriptor.SortDirection\"Q\n\rSortDirection\x12\x0b\n\x07UNKNOWN\x10\x00\x12\x17\n\nDESCENDING\x10\xff\xff\xff\xff\xff\xff\xff\xff\xff\x01\x12\r\n\tASCENDING\x10\x01\x12\x0b\n\x07REVERSE\x10\x02\"\xd8\x01\n\x10SortTableRequest\x12<\n\tresult_id\x18\x01 \x01(\x0b\x32).io.deephaven.proto.backplane.grpc.Ticket\x12\x44\n\tsource_id\x18\x02 \x01(\x0b\x32\x31.io.deephaven.proto.backplane.grpc.TableReference\x12@\n\x05sorts\x18\x03 \x03(\x0b\x32\x31.io.deephaven.proto.backplane.grpc.SortDescriptor\"\xd7\x01\n\x12\x46ilterTableRequest\x12<\n\tresult_id\x18\x01 \x01(\x0b\x32).io.deephaven.proto.backplane.grpc.Ticket\x12\x44\n\tsource_id\x18\x02 \x01(\x0b\x32\x31.io.deephaven.proto.backplane.grpc.TableReference\x12=\n\x07\x66ilters\x18\x03 \x03(\x0b\x32,.io.deephaven.proto.backplane.grpc.Condition\"\xf9\x01\n\x0eSeekRowRequest\x12<\n\tsource_id\x18\x01 \x01(\x0b\x32).io.deephaven.proto.backplane.grpc.Ticket\x12\x18\n\x0cstarting_row\x18\x02 \x01(\x12\x42\x02\x30\x01\x12\x13\n\x0b\x63olumn_name\x18\x03 \x01(\t\x12>\n\nseek_value\x18\x04 \x01(\x0b\x32*.io.deephaven.proto.backplane.grpc.Literal\x12\x13\n\x0binsensitive\x18\x05 \x01(\x08\x12\x10\n\x08\x63ontains\x18\x06 \x01(\x08\x12\x13\n\x0bis_backward\x18\x07 \x01(\x08\")\n\x0fSeekRowResponse\x12\x16\n\nresult_row\x18\x01 \x01(\x12\x42\x02\x30\x01\" \n\tReference\x12\x13\n\x0b\x63olumn_name\x18\x01 \x01(\t\"\x91\x01\n\x07Literal\x12\x16\n\x0cstring_value\x18\x01 \x01(\tH\x00\x12\x16\n\x0c\x64ouble_value\x18\x02 \x01(\x01H\x00\x12\x14\n\nbool_value\x18\x03 \x01(\x08H\x00\x12\x18\n\nlong_value\x18\x04 \x01(\x12\x42\x02\x30\x01H\x00\x12\x1d\n\x0fnano_time_value\x18\x05 \x01(\x12\x42\x02\x30\x01H\x00\x42\x07\n\x05value\"\x91\x01\n\x05Value\x12\x41\n\treference\x18\x01 \x01(\x0b\x32,.io.deephaven.proto.backplane.grpc.ReferenceH\x00\x12=\n\x07literal\x18\x02 \x01(\x0b\x32*.io.deephaven.proto.backplane.grpc.LiteralH\x00\x42\x06\n\x04\x64\x61ta\"\xbc\x05\n\tCondition\x12>\n\x03\x61nd\x18\x01 \x01(\x0b\x32/.io.deephaven.proto.backplane.grpc.AndConditionH\x00\x12<\n\x02or\x18\x02 \x01(\x0b\x32..io.deephaven.proto.backplane.grpc.OrConditionH\x00\x12>\n\x03not\x18\x03 \x01(\x0b\x32/.io.deephaven.proto.backplane.grpc.NotConditionH\x00\x12\x46\n\x07\x63ompare\x18\x04 \x01(\x0b\x32\x33.io.deephaven.proto.backplane.grpc.CompareConditionH\x00\x12<\n\x02in\x18\x05 \x01(\x0b\x32..io.deephaven.proto.backplane.grpc.InConditionH\x00\x12\x44\n\x06invoke\x18\x06 \x01(\x0b\x32\x32.io.deephaven.proto.backplane.grpc.InvokeConditionH\x00\x12\x45\n\x07is_null\x18\x07 \x01(\x0b\x32\x32.io.deephaven.proto.backplane.grpc.IsNullConditionH\x00\x12\x46\n\x07matches\x18\x08 \x01(\x0b\x32\x33.io.deephaven.proto.backplane.grpc.MatchesConditionH\x00\x12H\n\x08\x63ontains\x18\t \x01(\x0b\x32\x34.io.deephaven.proto.backplane.grpc.ContainsConditionH\x00\x12\x44\n\x06search\x18\n \x01(\x0b\x32\x32.io.deephaven.proto.backplane.grpc.SearchConditionH\x00\x42\x06\n\x04\x64\x61ta\"M\n\x0c\x41ndCondition\x12=\n\x07\x66ilters\x18\x01 \x03(\x0b\x32,.io.deephaven.proto.backplane.grpc.Condition\"L\n\x0bOrCondition\x12=\n\x07\x66ilters\x18\x01 \x03(\x0b\x32,.io.deephaven.proto.backplane.grpc.Condition\"L\n\x0cNotCondition\x12<\n\x06\x66ilter\x18\x01 \x01(\x0b\x32,.io.deephaven.proto.backplane.grpc.Condition\"\xac\x03\n\x10\x43ompareCondition\x12W\n\toperation\x18\x01 \x01(\x0e\x32\x44.io.deephaven.proto.backplane.grpc.CompareCondition.CompareOperation\x12L\n\x10\x63\x61se_sensitivity\x18\x02 \x01(\x0e\x32\x32.io.deephaven.proto.backplane.grpc.CaseSensitivity\x12\x35\n\x03lhs\x18\x03 \x01(\x0b\x32(.io.deephaven.proto.backplane.grpc.Value\x12\x35\n\x03rhs\x18\x04 \x01(\x0b\x32(.io.deephaven.proto.backplane.grpc.Value\"\x82\x01\n\x10\x43ompareOperation\x12\r\n\tLESS_THAN\x10\x00\x12\x16\n\x12LESS_THAN_OR_EQUAL\x10\x01\x12\x10\n\x0cGREATER_THAN\x10\x02\x12\x19\n\x15GREATER_THAN_OR_EQUAL\x10\x03\x12\n\n\x06\x45QUALS\x10\x04\x12\x0e\n\nNOT_EQUALS\x10\x05\"\x95\x02\n\x0bInCondition\x12\x38\n\x06target\x18\x01 \x01(\x0b\x32(.io.deephaven.proto.backplane.grpc.Value\x12<\n\ncandidates\x18\x02 \x03(\x0b\x32(.io.deephaven.proto.backplane.grpc.Value\x12L\n\x10\x63\x61se_sensitivity\x18\x03 \x01(\x0e\x32\x32.io.deephaven.proto.backplane.grpc.CaseSensitivity\x12@\n\nmatch_type\x18\x04 \x01(\x0e\x32,.io.deephaven.proto.backplane.grpc.MatchType\"\x98\x01\n\x0fInvokeCondition\x12\x0e\n\x06method\x18\x01 \x01(\t\x12\x38\n\x06target\x18\x02 \x01(\x0b\x32(.io.deephaven.proto.backplane.grpc.Value\x12;\n\targuments\x18\x03 \x03(\x0b\x32(.io.deephaven.proto.backplane.grpc.Value\"R\n\x0fIsNullCondition\x12?\n\treference\x18\x01 \x01(\x0b\x32,.io.deephaven.proto.backplane.grpc.Reference\"\xf2\x01\n\x10MatchesCondition\x12?\n\treference\x18\x01 \x01(\x0b\x32,.io.deephaven.proto.backplane.grpc.Reference\x12\r\n\x05regex\x18\x02 \x01(\t\x12L\n\x10\x63\x61se_sensitivity\x18\x03 \x01(\x0e\x32\x32.io.deephaven.proto.backplane.grpc.CaseSensitivity\x12@\n\nmatch_type\x18\x04 \x01(\x0e\x32,.io.deephaven.proto.backplane.grpc.MatchType\"\xfb\x01\n\x11\x43ontainsCondition\x12?\n\treference\x18\x01 \x01(\x0b\x32,.io.deephaven.proto.backplane.grpc.Reference\x12\x15\n\rsearch_string\x18\x02 \x01(\t\x12L\n\x10\x63\x61se_sensitivity\x18\x03 \x01(\x0e\x32\x32.io.deephaven.proto.backplane.grpc.CaseSensitivity\x12@\n\nmatch_type\x18\x04 \x01(\x0e\x32,.io.deephaven.proto.backplane.grpc.MatchType\"s\n\x0fSearchCondition\x12\x15\n\rsearch_string\x18\x01 \x01(\t\x12I\n\x13optional_references\x18\x02 \x03(\x0b\x32,.io.deephaven.proto.backplane.grpc.Reference\"\x94\x01\n\x0e\x46lattenRequest\x12<\n\tresult_id\x18\x01 \x01(\x0b\x32).io.deephaven.proto.backplane.grpc.Ticket\x12\x44\n\tsource_id\x18\x02 \x01(\x0b\x32\x31.io.deephaven.proto.backplane.grpc.TableReference\"\x96\x01\n\x10MetaTableRequest\x12<\n\tresult_id\x18\x01 \x01(\x0b\x32).io.deephaven.proto.backplane.grpc.Ticket\x12\x44\n\tsource_id\x18\x02 \x01(\x0b\x32\x31.io.deephaven.proto.backplane.grpc.TableReference\"\xb4\x03\n\x19RunChartDownsampleRequest\x12<\n\tresult_id\x18\x01 \x01(\x0b\x32).io.deephaven.proto.backplane.grpc.Ticket\x12\x44\n\tsource_id\x18\x02 \x01(\x0b\x32\x31.io.deephaven.proto.backplane.grpc.TableReference\x12\x13\n\x0bpixel_count\x18\x03 \x01(\x05\x12Z\n\nzoom_range\x18\x04 \x01(\x0b\x32\x46.io.deephaven.proto.backplane.grpc.RunChartDownsampleRequest.ZoomRange\x12\x15\n\rx_column_name\x18\x05 \x01(\t\x12\x16\n\x0ey_column_names\x18\x06 \x03(\t\x1as\n\tZoomRange\x12\x1f\n\x0emin_date_nanos\x18\x01 \x01(\x03\x42\x02\x30\x01H\x00\x88\x01\x01\x12\x1f\n\x0emax_date_nanos\x18\x02 \x01(\x03\x42\x02\x30\x01H\x01\x88\x01\x01\x42\x11\n\x0f_min_date_nanosB\x11\n\x0f_max_date_nanos\"\xe0\x05\n\x17\x43reateInputTableRequest\x12<\n\tresult_id\x18\x01 \x01(\x0b\x32).io.deephaven.proto.backplane.grpc.Ticket\x12L\n\x0fsource_table_id\x18\x02 \x01(\x0b\x32\x31.io.deephaven.proto.backplane.grpc.TableReferenceH\x00\x12\x10\n\x06schema\x18\x03 \x01(\x0cH\x00\x12W\n\x04kind\x18\x04 \x01(\x0b\x32I.io.deephaven.proto.backplane.grpc.CreateInputTableRequest.InputTableKind\x1a\xbf\x03\n\x0eInputTableKind\x12}\n\x15in_memory_append_only\x18\x01 \x01(\x0b\x32\\.io.deephaven.proto.backplane.grpc.CreateInputTableRequest.InputTableKind.InMemoryAppendOnlyH\x00\x12{\n\x14in_memory_key_backed\x18\x02 \x01(\x0b\x32[.io.deephaven.proto.backplane.grpc.CreateInputTableRequest.InputTableKind.InMemoryKeyBackedH\x00\x12`\n\x05\x62link\x18\x03 \x01(\x0b\x32O.io.deephaven.proto.backplane.grpc.CreateInputTableRequest.InputTableKind.BlinkH\x00\x1a\x14\n\x12InMemoryAppendOnly\x1a(\n\x11InMemoryKeyBacked\x12\x13\n\x0bkey_columns\x18\x01 \x03(\t\x1a\x07\n\x05\x42linkB\x06\n\x04kindB\x0c\n\ndefinition\"\x83\x02\n\x0eWhereInRequest\x12<\n\tresult_id\x18\x01 \x01(\x0b\x32).io.deephaven.proto.backplane.grpc.Ticket\x12\x42\n\x07left_id\x18\x02 \x01(\x0b\x32\x31.io.deephaven.proto.backplane.grpc.TableReference\x12\x43\n\x08right_id\x18\x03 \x01(\x0b\x32\x31.io.deephaven.proto.backplane.grpc.TableReference\x12\x10\n\x08inverted\x18\x04 \x01(\x08\x12\x18\n\x10\x63olumns_to_match\x18\x05 \x03(\t\"\xea\x01\n\x17\x43olumnStatisticsRequest\x12<\n\tresult_id\x18\x01 \x01(\x0b\x32).io.deephaven.proto.backplane.grpc.Ticket\x12\x44\n\tsource_id\x18\x02 \x01(\x0b\x32\x31.io.deephaven.proto.backplane.grpc.TableReference\x12\x13\n\x0b\x63olumn_name\x18\x03 \x01(\t\x12\x1f\n\x12unique_value_limit\x18\x04 \x01(\x05H\x00\x88\x01\x01\x42\x15\n\x13_unique_value_limit\"\x99\x1a\n\x11\x42\x61tchTableRequest\x12K\n\x03ops\x18\x01 \x03(\x0b\x32>.io.deephaven.proto.backplane.grpc.BatchTableRequest.Operation\x1a\xb6\x19\n\tOperation\x12K\n\x0b\x65mpty_table\x18\x01 \x01(\x0b\x32\x34.io.deephaven.proto.backplane.grpc.EmptyTableRequestH\x00\x12I\n\ntime_table\x18\x02 \x01(\x0b\x32\x33.io.deephaven.proto.backplane.grpc.TimeTableRequestH\x00\x12M\n\x0c\x64rop_columns\x18\x03 \x01(\x0b\x32\x35.io.deephaven.proto.backplane.grpc.DropColumnsRequestH\x00\x12J\n\x06update\x18\x04 \x01(\x0b\x32\x38.io.deephaven.proto.backplane.grpc.SelectOrUpdateRequestH\x00\x12O\n\x0blazy_update\x18\x05 \x01(\x0b\x32\x38.io.deephaven.proto.backplane.grpc.SelectOrUpdateRequestH\x00\x12H\n\x04view\x18\x06 \x01(\x0b\x32\x38.io.deephaven.proto.backplane.grpc.SelectOrUpdateRequestH\x00\x12O\n\x0bupdate_view\x18\x07 \x01(\x0b\x32\x38.io.deephaven.proto.backplane.grpc.SelectOrUpdateRequestH\x00\x12J\n\x06select\x18\x08 \x01(\x0b\x32\x38.io.deephaven.proto.backplane.grpc.SelectOrUpdateRequestH\x00\x12S\n\x0fselect_distinct\x18\t \x01(\x0b\x32\x38.io.deephaven.proto.backplane.grpc.SelectDistinctRequestH\x00\x12G\n\x06\x66ilter\x18\n \x01(\x0b\x32\x35.io.deephaven.proto.backplane.grpc.FilterTableRequestH\x00\x12`\n\x13unstructured_filter\x18\x0b \x01(\x0b\x32\x41.io.deephaven.proto.backplane.grpc.UnstructuredFilterTableRequestH\x00\x12\x43\n\x04sort\x18\x0c \x01(\x0b\x32\x33.io.deephaven.proto.backplane.grpc.SortTableRequestH\x00\x12\x44\n\x04head\x18\r \x01(\x0b\x32\x34.io.deephaven.proto.backplane.grpc.HeadOrTailRequestH\x00\x12\x44\n\x04tail\x18\x0e \x01(\x0b\x32\x34.io.deephaven.proto.backplane.grpc.HeadOrTailRequestH\x00\x12I\n\x07head_by\x18\x0f \x01(\x0b\x32\x36.io.deephaven.proto.backplane.grpc.HeadOrTailByRequestH\x00\x12I\n\x07tail_by\x18\x10 \x01(\x0b\x32\x36.io.deephaven.proto.backplane.grpc.HeadOrTailByRequestH\x00\x12\x44\n\x07ungroup\x18\x11 \x01(\x0b\x32\x31.io.deephaven.proto.backplane.grpc.UngroupRequestH\x00\x12\x46\n\x05merge\x18\x12 \x01(\x0b\x32\x35.io.deephaven.proto.backplane.grpc.MergeTablesRequestH\x00\x12S\n\x0f\x63ombo_aggregate\x18\x13 \x01(\x0b\x32\x38.io.deephaven.proto.backplane.grpc.ComboAggregateRequestH\x00\x12\x44\n\x07\x66latten\x18\x15 \x01(\x0b\x32\x31.io.deephaven.proto.backplane.grpc.FlattenRequestH\x00\x12\\\n\x14run_chart_downsample\x18\x16 \x01(\x0b\x32<.io.deephaven.proto.backplane.grpc.RunChartDownsampleRequestH\x00\x12O\n\ncross_join\x18\x17 \x01(\x0b\x32\x39.io.deephaven.proto.backplane.grpc.CrossJoinTablesRequestH\x00\x12S\n\x0cnatural_join\x18\x18 \x01(\x0b\x32;.io.deephaven.proto.backplane.grpc.NaturalJoinTablesRequestH\x00\x12O\n\nexact_join\x18\x19 \x01(\x0b\x32\x39.io.deephaven.proto.backplane.grpc.ExactJoinTablesRequestH\x00\x12M\n\tleft_join\x18\x1a \x01(\x0b\x32\x38.io.deephaven.proto.backplane.grpc.LeftJoinTablesRequestH\x00\x12R\n\nas_of_join\x18\x1b \x01(\x0b\x32\x38.io.deephaven.proto.backplane.grpc.AsOfJoinTablesRequestB\x02\x18\x01H\x00\x12K\n\x0b\x66\x65tch_table\x18\x1c \x01(\x0b\x32\x34.io.deephaven.proto.backplane.grpc.FetchTableRequestH\x00\x12^\n\x15\x61pply_preview_columns\x18\x1e \x01(\x0b\x32=.io.deephaven.proto.backplane.grpc.ApplyPreviewColumnsRequestH\x00\x12X\n\x12\x63reate_input_table\x18\x1f \x01(\x0b\x32:.io.deephaven.proto.backplane.grpc.CreateInputTableRequestH\x00\x12G\n\tupdate_by\x18  \x01(\x0b\x32\x32.io.deephaven.proto.backplane.grpc.UpdateByRequestH\x00\x12\x45\n\x08where_in\x18! \x01(\x0b\x32\x31.io.deephaven.proto.backplane.grpc.WhereInRequestH\x00\x12O\n\raggregate_all\x18\" \x01(\x0b\x32\x36.io.deephaven.proto.backplane.grpc.AggregateAllRequestH\x00\x12H\n\taggregate\x18# \x01(\x0b\x32\x33.io.deephaven.proto.backplane.grpc.AggregateRequestH\x00\x12K\n\x08snapshot\x18$ \x01(\x0b\x32\x37.io.deephaven.proto.backplane.grpc.SnapshotTableRequestH\x00\x12T\n\rsnapshot_when\x18% \x01(\x0b\x32;.io.deephaven.proto.backplane.grpc.SnapshotWhenTableRequestH\x00\x12I\n\nmeta_table\x18& \x01(\x0b\x32\x33.io.deephaven.proto.backplane.grpc.MetaTableRequestH\x00\x12O\n\nrange_join\x18\' \x01(\x0b\x32\x39.io.deephaven.proto.backplane.grpc.RangeJoinTablesRequestH\x00\x12\x43\n\x02\x61j\x18( \x01(\x0b\x32\x35.io.deephaven.proto.backplane.grpc.AjRajTablesRequestH\x00\x12\x44\n\x03raj\x18) \x01(\x0b\x32\x35.io.deephaven.proto.backplane.grpc.AjRajTablesRequestH\x00\x12W\n\x11\x63olumn_statistics\x18* \x01(\x0b\x32:.io.deephaven.proto.backplane.grpc.ColumnStatisticsRequestH\x00\x12O\n\nmulti_join\x18+ \x01(\x0b\x32\x39.io.deephaven.proto.backplane.grpc.MultiJoinTablesRequestH\x00\x42\x04\n\x02opJ\x04\x08\x14\x10\x15J\x04\x08\x1d\x10\x1e*b\n\x0f\x42\x61\x64\x44\x61taBehavior\x12#\n\x1f\x42\x41\x44_DATA_BEHAVIOR_NOT_SPECIFIED\x10\x00\x12\t\n\x05THROW\x10\x01\x12\t\n\x05RESET\x10\x02\x12\x08\n\x04SKIP\x10\x03\x12\n\n\x06POISON\x10\x04*t\n\x14UpdateByNullBehavior\x12\x1f\n\x1bNULL_BEHAVIOR_NOT_SPECIFIED\x10\x00\x12\x12\n\x0eNULL_DOMINATES\x10\x01\x12\x13\n\x0fVALUE_DOMINATES\x10\x02\x12\x12\n\x0eZERO_DOMINATES\x10\x03*\x1b\n\tNullValue\x12\x0e\n\nNULL_VALUE\x10\x00*2\n\x0f\x43\x61seSensitivity\x12\x0e\n\nMATCH_CASE\x10\x00\x12\x0f\n\x0bIGNORE_CASE\x10\x01*&\n\tMatchType\x12\x0b\n\x07REGULAR\x10\x00\x12\x0c\n\x08INVERTED\x10\x01\x32\xbb\x31\n\x0cTableService\x12\x91\x01\n GetExportedTableCreationResponse\x12).io.deephaven.proto.backplane.grpc.Ticket\x1a@.io.deephaven.proto.backplane.grpc.ExportedTableCreationResponse\"\x00\x12\x86\x01\n\nFetchTable\x12\x34.io.deephaven.proto.backplane.grpc.FetchTableRequest\x1a@.io.deephaven.proto.backplane.grpc.ExportedTableCreationResponse\"\x00\x12\x98\x01\n\x13\x41pplyPreviewColumns\x12=.io.deephaven.proto.backplane.grpc.ApplyPreviewColumnsRequest\x1a@.io.deephaven.proto.backplane.grpc.ExportedTableCreationResponse\"\x00\x12\x86\x01\n\nEmptyTable\x12\x34.io.deephaven.proto.backplane.grpc.EmptyTableRequest\x1a@.io.deephaven.proto.backplane.grpc.ExportedTableCreationResponse\"\x00\x12\x84\x01\n\tTimeTable\x12\x33.io.deephaven.proto.backplane.grpc.TimeTableRequest\x1a@.io.deephaven.proto.backplane.grpc.ExportedTableCreationResponse\"\x00\x12\x88\x01\n\x0b\x44ropColumns\x12\x35.io.deephaven.proto.backplane.grpc.DropColumnsRequest\x1a@.io.deephaven.proto.backplane.grpc.ExportedTableCreationResponse\"\x00\x12\x86\x01\n\x06Update\x12\x38.io.deephaven.proto.backplane.grpc.SelectOrUpdateRequest\x1a@.io.deephaven.proto.backplane.grpc.ExportedTableCreationResponse\"\x00\x12\x8a\x01\n\nLazyUpdate\x12\x38.io.deephaven.proto.backplane.grpc.SelectOrUpdateRequest\x1a@.io.deephaven.proto.backplane.grpc.ExportedTableCreationResponse\"\x00\x12\x84\x01\n\x04View\x12\x38.io.deephaven.proto.backplane.grpc.SelectOrUpdateRequest\x1a@.io.deephaven.proto.backplane.grpc.ExportedTableCreationResponse\"\x00\x12\x8a\x01\n\nUpdateView\x12\x38.io.deephaven.proto.backplane.grpc.SelectOrUpdateRequest\x1a@.io.deephaven.proto.backplane.grpc.ExportedTableCreationResponse\"\x00\x12\x86\x01\n\x06Select\x12\x38.io.deephaven.proto.backplane.grpc.SelectOrUpdateRequest\x1a@.io.deephaven.proto.backplane.grpc.ExportedTableCreationResponse\"\x00\x12\x82\x01\n\x08UpdateBy\x12\x32.io.deephaven.proto.backplane.grpc.UpdateByRequest\x1a@.io.deephaven.proto.backplane.grpc.ExportedTableCreationResponse\"\x00\x12\x8e\x01\n\x0eSelectDistinct\x12\x38.io.deephaven.proto.backplane.grpc.SelectDistinctRequest\x1a@.io.deephaven.proto.backplane.grpc.ExportedTableCreationResponse\"\x00\x12\x83\x01\n\x06\x46ilter\x12\x35.io.deephaven.proto.backplane.grpc.FilterTableRequest\x1a@.io.deephaven.proto.backplane.grpc.ExportedTableCreationResponse\"\x00\x12\x9b\x01\n\x12UnstructuredFilter\x12\x41.io.deephaven.proto.backplane.grpc.UnstructuredFilterTableRequest\x1a@.io.deephaven.proto.backplane.grpc.ExportedTableCreationResponse\"\x00\x12\x7f\n\x04Sort\x12\x33.io.deephaven.proto.backplane.grpc.SortTableRequest\x1a@.io.deephaven.proto.backplane.grpc.ExportedTableCreationResponse\"\x00\x12\x80\x01\n\x04Head\x12\x34.io.deephaven.proto.backplane.grpc.HeadOrTailRequest\x1a@.io.deephaven.proto.backplane.grpc.ExportedTableCreationResponse\"\x00\x12\x80\x01\n\x04Tail\x12\x34.io.deephaven.proto.backplane.grpc.HeadOrTailRequest\x1a@.io.deephaven.proto.backplane.grpc.ExportedTableCreationResponse\"\x00\x12\x84\x01\n\x06HeadBy\x12\x36.io.deephaven.proto.backplane.grpc.HeadOrTailByRequest\x1a@.io.deephaven.proto.backplane.grpc.ExportedTableCreationResponse\"\x00\x12\x84\x01\n\x06TailBy\x12\x36.io.deephaven.proto.backplane.grpc.HeadOrTailByRequest\x1a@.io.deephaven.proto.backplane.grpc.ExportedTableCreationResponse\"\x00\x12\x80\x01\n\x07Ungroup\x12\x31.io.deephaven.proto.backplane.grpc.UngroupRequest\x1a@.io.deephaven.proto.backplane.grpc.ExportedTableCreationResponse\"\x00\x12\x88\x01\n\x0bMergeTables\x12\x35.io.deephaven.proto.backplane.grpc.MergeTablesRequest\x1a@.io.deephaven.proto.backplane.grpc.ExportedTableCreationResponse\"\x00\x12\x90\x01\n\x0f\x43rossJoinTables\x12\x39.io.deephaven.proto.backplane.grpc.CrossJoinTablesRequest\x1a@.io.deephaven.proto.backplane.grpc.ExportedTableCreationResponse\"\x00\x12\x94\x01\n\x11NaturalJoinTables\x12;.io.deephaven.proto.backplane.grpc.NaturalJoinTablesRequest\x1a@.io.deephaven.proto.backplane.grpc.ExportedTableCreationResponse\"\x00\x12\x90\x01\n\x0f\x45xactJoinTables\x12\x39.io.deephaven.proto.backplane.grpc.ExactJoinTablesRequest\x1a@.io.deephaven.proto.backplane.grpc.ExportedTableCreationResponse\"\x00\x12\x8e\x01\n\x0eLeftJoinTables\x12\x38.io.deephaven.proto.backplane.grpc.LeftJoinTablesRequest\x1a@.io.deephaven.proto.backplane.grpc.ExportedTableCreationResponse\"\x00\x12\x91\x01\n\x0e\x41sOfJoinTables\x12\x38.io.deephaven.proto.backplane.grpc.AsOfJoinTablesRequest\x1a@.io.deephaven.proto.backplane.grpc.ExportedTableCreationResponse\"\x03\x88\x02\x01\x12\x85\x01\n\x08\x41jTables\x12\x35.io.deephaven.proto.backplane.grpc.AjRajTablesRequest\x1a@.io.deephaven.proto.backplane.grpc.ExportedTableCreationResponse\"\x00\x12\x86\x01\n\tRajTables\x12\x35.io.deephaven.proto.backplane.grpc.AjRajTablesRequest\x1a@.io.deephaven.proto.backplane.grpc.ExportedTableCreationResponse\"\x00\x12\x90\x01\n\x0fMultiJoinTables\x12\x39.io.deephaven.proto.backplane.grpc.MultiJoinTablesRequest\x1a@.io.deephaven.proto.backplane.grpc.ExportedTableCreationResponse\"\x00\x12\x90\x01\n\x0fRangeJoinTables\x12\x39.io.deephaven.proto.backplane.grpc.RangeJoinTablesRequest\x1a@.io.deephaven.proto.backplane.grpc.ExportedTableCreationResponse\"\x00\x12\x91\x01\n\x0e\x43omboAggregate\x12\x38.io.deephaven.proto.backplane.grpc.ComboAggregateRequest\x1a@.io.deephaven.proto.backplane.grpc.ExportedTableCreationResponse\"\x03\x88\x02\x01\x12\x8a\x01\n\x0c\x41ggregateAll\x12\x36.io.deephaven.proto.backplane.grpc.AggregateAllRequest\x1a@.io.deephaven.proto.backplane.grpc.ExportedTableCreationResponse\"\x00\x12\x84\x01\n\tAggregate\x12\x33.io.deephaven.proto.backplane.grpc.AggregateRequest\x1a@.io.deephaven.proto.backplane.grpc.ExportedTableCreationResponse\"\x00\x12\x87\x01\n\x08Snapshot\x12\x37.io.deephaven.proto.backplane.grpc.SnapshotTableRequest\x1a@.io.deephaven.proto.backplane.grpc.ExportedTableCreationResponse\"\x00\x12\x8f\x01\n\x0cSnapshotWhen\x12;.io.deephaven.proto.backplane.grpc.SnapshotWhenTableRequest\x1a@.io.deephaven.proto.backplane.grpc.ExportedTableCreationResponse\"\x00\x12\x80\x01\n\x07\x46latten\x12\x31.io.deephaven.proto.backplane.grpc.FlattenRequest\x1a@.io.deephaven.proto.backplane.grpc.ExportedTableCreationResponse\"\x00\x12\x96\x01\n\x12RunChartDownsample\x12<.io.deephaven.proto.backplane.grpc.RunChartDownsampleRequest\x1a@.io.deephaven.proto.backplane.grpc.ExportedTableCreationResponse\"\x00\x12\x92\x01\n\x10\x43reateInputTable\x12:.io.deephaven.proto.backplane.grpc.CreateInputTableRequest\x1a@.io.deephaven.proto.backplane.grpc.ExportedTableCreationResponse\"\x00\x12\x80\x01\n\x07WhereIn\x12\x31.io.deephaven.proto.backplane.grpc.WhereInRequest\x1a@.io.deephaven.proto.backplane.grpc.ExportedTableCreationResponse\"\x00\x12\x83\x01\n\x05\x42\x61tch\x12\x34.io.deephaven.proto.backplane.grpc.BatchTableRequest\x1a@.io.deephaven.proto.backplane.grpc.ExportedTableCreationResponse\"\x00\x30\x01\x12\x99\x01\n\x14\x45xportedTableUpdates\x12>.io.deephaven.proto.backplane.grpc.ExportedTableUpdatesRequest\x1a=.io.deephaven.proto.backplane.grpc.ExportedTableUpdateMessage\"\x00\x30\x01\x12r\n\x07SeekRow\x12\x31.io.deephaven.proto.backplane.grpc.SeekRowRequest\x1a\x32.io.deephaven.proto.backplane.grpc.SeekRowResponse\"\x00\x12\x84\x01\n\tMetaTable\x12\x33.io.deephaven.proto.backplane.grpc.MetaTableRequest\x1a@.io.deephaven.proto.backplane.grpc.ExportedTableCreationResponse\"\x00\x12\x99\x01\n\x17\x43omputeColumnStatistics\x12:.io.deephaven.proto.backplane.grpc.ColumnStatisticsRequest\x1a@.io.deephaven.proto.backplane.grpc.ExportedTableCreationResponse\"\x00\x42\x41H\x01P\x01Z;github.com/deephaven/deephaven-core/go/internal/proto/tableb\x06proto3')
-
-_globals = globals()
-_builder.BuildMessageAndEnumDescriptors(DESCRIPTOR, _globals)
-_builder.BuildTopDescriptorsAndMessages(DESCRIPTOR, 'deephaven.proto.table_pb2', _globals)
-if not _descriptor._USE_C_DESCRIPTORS:
-  _globals['DESCRIPTOR']._loaded_options = None
-  _globals['DESCRIPTOR']._serialized_options = b'H\001P\001Z;github.com/deephaven/deephaven-core/go/internal/proto/table'
-  _globals['_EXPORTEDTABLECREATIONRESPONSE'].fields_by_name['size']._loaded_options = None
-  _globals['_EXPORTEDTABLECREATIONRESPONSE'].fields_by_name['size']._serialized_options = b'0\001'
-  _globals['_EXPORTEDTABLEUPDATEMESSAGE'].fields_by_name['size']._loaded_options = None
-  _globals['_EXPORTEDTABLEUPDATEMESSAGE'].fields_by_name['size']._serialized_options = b'0\001'
-  _globals['_EMPTYTABLEREQUEST'].fields_by_name['size']._loaded_options = None
-  _globals['_EMPTYTABLEREQUEST'].fields_by_name['size']._serialized_options = b'0\001'
-  _globals['_TIMETABLEREQUEST'].fields_by_name['start_time_nanos']._loaded_options = None
-  _globals['_TIMETABLEREQUEST'].fields_by_name['start_time_nanos']._serialized_options = b'0\001'
-  _globals['_TIMETABLEREQUEST'].fields_by_name['period_nanos']._loaded_options = None
-  _globals['_TIMETABLEREQUEST'].fields_by_name['period_nanos']._serialized_options = b'0\001'
-  _globals['_UPDATEBYWINDOWSCALE_UPDATEBYWINDOWTIME'].fields_by_name['nanos']._loaded_options = None
-  _globals['_UPDATEBYWINDOWSCALE_UPDATEBYWINDOWTIME'].fields_by_name['nanos']._serialized_options = b'0\001'
-  _globals['_HEADORTAILREQUEST'].fields_by_name['num_rows']._loaded_options = None
-  _globals['_HEADORTAILREQUEST'].fields_by_name['num_rows']._serialized_options = b'0\001'
-  _globals['_HEADORTAILBYREQUEST'].fields_by_name['num_rows']._loaded_options = None
-  _globals['_HEADORTAILBYREQUEST'].fields_by_name['num_rows']._serialized_options = b'0\001'
-  _globals['_ASOFJOINTABLESREQUEST_MATCHRULE']._loaded_options = None
-  _globals['_ASOFJOINTABLESREQUEST_MATCHRULE']._serialized_options = b'\030\001'
-  _globals['_ASOFJOINTABLESREQUEST']._loaded_options = None
-  _globals['_ASOFJOINTABLESREQUEST']._serialized_options = b'\030\001'
-  _globals['_COMBOAGGREGATEREQUEST']._loaded_options = None
-  _globals['_COMBOAGGREGATEREQUEST']._serialized_options = b'\030\001'
-  _globals['_AGGSPEC_AGGSPECNONUNIQUESENTINEL'].fields_by_name['long_value']._loaded_options = None
-  _globals['_AGGSPEC_AGGSPECNONUNIQUESENTINEL'].fields_by_name['long_value']._serialized_options = b'0\001'
-  _globals['_SEEKROWREQUEST'].fields_by_name['starting_row']._loaded_options = None
-  _globals['_SEEKROWREQUEST'].fields_by_name['starting_row']._serialized_options = b'0\001'
-  _globals['_SEEKROWRESPONSE'].fields_by_name['result_row']._loaded_options = None
-  _globals['_SEEKROWRESPONSE'].fields_by_name['result_row']._serialized_options = b'0\001'
-  _globals['_LITERAL'].fields_by_name['long_value']._loaded_options = None
-  _globals['_LITERAL'].fields_by_name['long_value']._serialized_options = b'0\001'
-  _globals['_LITERAL'].fields_by_name['nano_time_value']._loaded_options = None
-  _globals['_LITERAL'].fields_by_name['nano_time_value']._serialized_options = b'0\001'
-  _globals['_RUNCHARTDOWNSAMPLEREQUEST_ZOOMRANGE'].fields_by_name['min_date_nanos']._loaded_options = None
-  _globals['_RUNCHARTDOWNSAMPLEREQUEST_ZOOMRANGE'].fields_by_name['min_date_nanos']._serialized_options = b'0\001'
-  _globals['_RUNCHARTDOWNSAMPLEREQUEST_ZOOMRANGE'].fields_by_name['max_date_nanos']._loaded_options = None
-  _globals['_RUNCHARTDOWNSAMPLEREQUEST_ZOOMRANGE'].fields_by_name['max_date_nanos']._serialized_options = b'0\001'
-  _globals['_BATCHTABLEREQUEST_OPERATION'].fields_by_name['as_of_join']._loaded_options = None
-  _globals['_BATCHTABLEREQUEST_OPERATION'].fields_by_name['as_of_join']._serialized_options = b'\030\001'
-  _globals['_TABLESERVICE'].methods_by_name['AsOfJoinTables']._loaded_options = None
-  _globals['_TABLESERVICE'].methods_by_name['AsOfJoinTables']._serialized_options = b'\210\002\001'
-  _globals['_TABLESERVICE'].methods_by_name['ComboAggregate']._loaded_options = None
-  _globals['_TABLESERVICE'].methods_by_name['ComboAggregate']._serialized_options = b'\210\002\001'
-  _globals['_BADDATABEHAVIOR']._serialized_start=28653
-  _globals['_BADDATABEHAVIOR']._serialized_end=28751
-  _globals['_UPDATEBYNULLBEHAVIOR']._serialized_start=28753
-  _globals['_UPDATEBYNULLBEHAVIOR']._serialized_end=28869
-  _globals['_NULLVALUE']._serialized_start=28871
-  _globals['_NULLVALUE']._serialized_end=28898
-  _globals['_CASESENSITIVITY']._serialized_start=28900
-  _globals['_CASESENSITIVITY']._serialized_end=28950
-  _globals['_MATCHTYPE']._serialized_start=28952
-  _globals['_MATCHTYPE']._serialized_end=28990
-  _globals['_TABLEREFERENCE']._serialized_start=96
-  _globals['_TABLEREFERENCE']._serialized_end=204
-  _globals['_EXPORTEDTABLECREATIONRESPONSE']._serialized_start=207
-  _globals['_EXPORTEDTABLECREATIONRESPONSE']._serialized_end=405
-  _globals['_FETCHTABLEREQUEST']._serialized_start=408
-  _globals['_FETCHTABLEREQUEST']._serialized_end=559
-  _globals['_APPLYPREVIEWCOLUMNSREQUEST']._serialized_start=562
-  _globals['_APPLYPREVIEWCOLUMNSREQUEST']._serialized_end=722
-  _globals['_EXPORTEDTABLEUPDATESREQUEST']._serialized_start=724
-  _globals['_EXPORTEDTABLEUPDATESREQUEST']._serialized_end=753
-  _globals['_EXPORTEDTABLEUPDATEMESSAGE']._serialized_start=756
-  _globals['_EXPORTEDTABLEUPDATEMESSAGE']._serialized_end=896
-  _globals['_EMPTYTABLEREQUEST']._serialized_start=898
-  _globals['_EMPTYTABLEREQUEST']._serialized_end=997
-  _globals['_TIMETABLEREQUEST']._serialized_start=1000
-  _globals['_TIMETABLEREQUEST']._serialized_end=1239
-  _globals['_SELECTORUPDATEREQUEST']._serialized_start=1242
-  _globals['_SELECTORUPDATEREQUEST']._serialized_end=1419
-  _globals['_MATHCONTEXT']._serialized_start=1422
-  _globals['_MATHCONTEXT']._serialized_end=1690
-  _globals['_MATHCONTEXT_ROUNDINGMODE']._serialized_start=1541
-  _globals['_MATHCONTEXT_ROUNDINGMODE']._serialized_end=1690
-  _globals['_UPDATEBYWINDOWSCALE']._serialized_start=1693
-  _globals['_UPDATEBYWINDOWSCALE']._serialized_end=2040
-  _globals['_UPDATEBYWINDOWSCALE_UPDATEBYWINDOWTICKS']._serialized_start=1900
-  _globals['_UPDATEBYWINDOWSCALE_UPDATEBYWINDOWTICKS']._serialized_end=1936
-  _globals['_UPDATEBYWINDOWSCALE_UPDATEBYWINDOWTIME']._serialized_start=1938
-  _globals['_UPDATEBYWINDOWSCALE_UPDATEBYWINDOWTIME']._serialized_end=2032
-  _globals['_UPDATEBYEMOPTIONS']._serialized_start=2043
-  _globals['_UPDATEBYEMOPTIONS']._serialized_end=2524
-  _globals['_UPDATEBYDELTAOPTIONS']._serialized_start=2526
-  _globals['_UPDATEBYDELTAOPTIONS']._serialized_end=2628
-  _globals['_UPDATEBYREQUEST']._serialized_start=2631
-  _globals['_UPDATEBYREQUEST']._serialized_end=9698
-  _globals['_UPDATEBYREQUEST_UPDATEBYOPTIONS']._serialized_start=2984
-  _globals['_UPDATEBYREQUEST_UPDATEBYOPTIONS']._serialized_end=3435
-  _globals['_UPDATEBYREQUEST_UPDATEBYOPERATION']._serialized_start=3438
-  _globals['_UPDATEBYREQUEST_UPDATEBYOPERATION']._serialized_end=9698
-  _globals['_UPDATEBYREQUEST_UPDATEBYOPERATION_UPDATEBYCOLUMN']._serialized_start=3563
-  _globals['_UPDATEBYREQUEST_UPDATEBYOPERATION_UPDATEBYCOLUMN']._serialized_end=9690
-  _globals['_UPDATEBYREQUEST_UPDATEBYOPERATION_UPDATEBYCOLUMN_UPDATEBYSPEC']._serialized_start=3715
-  _globals['_UPDATEBYREQUEST_UPDATEBYOPERATION_UPDATEBYCOLUMN_UPDATEBYSPEC']._serialized_end=9690
-  _globals['_UPDATEBYREQUEST_UPDATEBYOPERATION_UPDATEBYCOLUMN_UPDATEBYSPEC_UPDATEBYCUMULATIVESUM']._serialized_start=6618
-  _globals['_UPDATEBYREQUEST_UPDATEBYOPERATION_UPDATEBYCOLUMN_UPDATEBYSPEC_UPDATEBYCUMULATIVESUM']._serialized_end=6641
-  _globals['_UPDATEBYREQUEST_UPDATEBYOPERATION_UPDATEBYCOLUMN_UPDATEBYSPEC_UPDATEBYCUMULATIVEMIN']._serialized_start=6643
-  _globals['_UPDATEBYREQUEST_UPDATEBYOPERATION_UPDATEBYCOLUMN_UPDATEBYSPEC_UPDATEBYCUMULATIVEMIN']._serialized_end=6666
-  _globals['_UPDATEBYREQUEST_UPDATEBYOPERATION_UPDATEBYCOLUMN_UPDATEBYSPEC_UPDATEBYCUMULATIVEMAX']._serialized_start=6668
-  _globals['_UPDATEBYREQUEST_UPDATEBYOPERATION_UPDATEBYCOLUMN_UPDATEBYSPEC_UPDATEBYCUMULATIVEMAX']._serialized_end=6691
-  _globals['_UPDATEBYREQUEST_UPDATEBYOPERATION_UPDATEBYCOLUMN_UPDATEBYSPEC_UPDATEBYCUMULATIVEPRODUCT']._serialized_start=6693
-  _globals['_UPDATEBYREQUEST_UPDATEBYOPERATION_UPDATEBYCOLUMN_UPDATEBYSPEC_UPDATEBYCUMULATIVEPRODUCT']._serialized_end=6720
-  _globals['_UPDATEBYREQUEST_UPDATEBYOPERATION_UPDATEBYCOLUMN_UPDATEBYSPEC_UPDATEBYFILL']._serialized_start=6722
-  _globals['_UPDATEBYREQUEST_UPDATEBYOPERATION_UPDATEBYCOLUMN_UPDATEBYSPEC_UPDATEBYFILL']._serialized_end=6736
-  _globals['_UPDATEBYREQUEST_UPDATEBYOPERATION_UPDATEBYCOLUMN_UPDATEBYSPEC_UPDATEBYEMA']._serialized_start=6739
-  _globals['_UPDATEBYREQUEST_UPDATEBYOPERATION_UPDATEBYCOLUMN_UPDATEBYSPEC_UPDATEBYEMA']._serialized_end=6901
-  _globals['_UPDATEBYREQUEST_UPDATEBYOPERATION_UPDATEBYCOLUMN_UPDATEBYSPEC_UPDATEBYEMS']._serialized_start=6904
-  _globals['_UPDATEBYREQUEST_UPDATEBYOPERATION_UPDATEBYCOLUMN_UPDATEBYSPEC_UPDATEBYEMS']._serialized_end=7066
-  _globals['_UPDATEBYREQUEST_UPDATEBYOPERATION_UPDATEBYCOLUMN_UPDATEBYSPEC_UPDATEBYEMMIN']._serialized_start=7069
-  _globals['_UPDATEBYREQUEST_UPDATEBYOPERATION_UPDATEBYCOLUMN_UPDATEBYSPEC_UPDATEBYEMMIN']._serialized_end=7233
-  _globals['_UPDATEBYREQUEST_UPDATEBYOPERATION_UPDATEBYCOLUMN_UPDATEBYSPEC_UPDATEBYEMMAX']._serialized_start=7236
-  _globals['_UPDATEBYREQUEST_UPDATEBYOPERATION_UPDATEBYCOLUMN_UPDATEBYSPEC_UPDATEBYEMMAX']._serialized_end=7400
-  _globals['_UPDATEBYREQUEST_UPDATEBYOPERATION_UPDATEBYCOLUMN_UPDATEBYSPEC_UPDATEBYEMSTD']._serialized_start=7403
-  _globals['_UPDATEBYREQUEST_UPDATEBYOPERATION_UPDATEBYCOLUMN_UPDATEBYSPEC_UPDATEBYEMSTD']._serialized_end=7567
-  _globals['_UPDATEBYREQUEST_UPDATEBYOPERATION_UPDATEBYCOLUMN_UPDATEBYSPEC_UPDATEBYDELTA']._serialized_start=7569
-  _globals['_UPDATEBYREQUEST_UPDATEBYOPERATION_UPDATEBYCOLUMN_UPDATEBYSPEC_UPDATEBYDELTA']._serialized_end=7658
-  _globals['_UPDATEBYREQUEST_UPDATEBYOPERATION_UPDATEBYCOLUMN_UPDATEBYSPEC_UPDATEBYROLLINGSUM']._serialized_start=7661
-  _globals['_UPDATEBYREQUEST_UPDATEBYOPERATION_UPDATEBYCOLUMN_UPDATEBYSPEC_UPDATEBYROLLINGSUM']._serialized_end=7853
-  _globals['_UPDATEBYREQUEST_UPDATEBYOPERATION_UPDATEBYCOLUMN_UPDATEBYSPEC_UPDATEBYROLLINGGROUP']._serialized_start=7856
-  _globals['_UPDATEBYREQUEST_UPDATEBYOPERATION_UPDATEBYCOLUMN_UPDATEBYSPEC_UPDATEBYROLLINGGROUP']._serialized_end=8050
-  _globals['_UPDATEBYREQUEST_UPDATEBYOPERATION_UPDATEBYCOLUMN_UPDATEBYSPEC_UPDATEBYROLLINGAVG']._serialized_start=8053
-  _globals['_UPDATEBYREQUEST_UPDATEBYOPERATION_UPDATEBYCOLUMN_UPDATEBYSPEC_UPDATEBYROLLINGAVG']._serialized_end=8245
-  _globals['_UPDATEBYREQUEST_UPDATEBYOPERATION_UPDATEBYCOLUMN_UPDATEBYSPEC_UPDATEBYROLLINGMIN']._serialized_start=8248
-  _globals['_UPDATEBYREQUEST_UPDATEBYOPERATION_UPDATEBYCOLUMN_UPDATEBYSPEC_UPDATEBYROLLINGMIN']._serialized_end=8440
-  _globals['_UPDATEBYREQUEST_UPDATEBYOPERATION_UPDATEBYCOLUMN_UPDATEBYSPEC_UPDATEBYROLLINGMAX']._serialized_start=8443
-  _globals['_UPDATEBYREQUEST_UPDATEBYOPERATION_UPDATEBYCOLUMN_UPDATEBYSPEC_UPDATEBYROLLINGMAX']._serialized_end=8635
-  _globals['_UPDATEBYREQUEST_UPDATEBYOPERATION_UPDATEBYCOLUMN_UPDATEBYSPEC_UPDATEBYROLLINGPRODUCT']._serialized_start=8638
-  _globals['_UPDATEBYREQUEST_UPDATEBYOPERATION_UPDATEBYCOLUMN_UPDATEBYSPEC_UPDATEBYROLLINGPRODUCT']._serialized_end=8834
-  _globals['_UPDATEBYREQUEST_UPDATEBYOPERATION_UPDATEBYCOLUMN_UPDATEBYSPEC_UPDATEBYROLLINGCOUNT']._serialized_start=8837
-  _globals['_UPDATEBYREQUEST_UPDATEBYOPERATION_UPDATEBYCOLUMN_UPDATEBYSPEC_UPDATEBYROLLINGCOUNT']._serialized_end=9031
-  _globals['_UPDATEBYREQUEST_UPDATEBYOPERATION_UPDATEBYCOLUMN_UPDATEBYSPEC_UPDATEBYROLLINGSTD']._serialized_start=9034
-  _globals['_UPDATEBYREQUEST_UPDATEBYOPERATION_UPDATEBYCOLUMN_UPDATEBYSPEC_UPDATEBYROLLINGSTD']._serialized_end=9226
-  _globals['_UPDATEBYREQUEST_UPDATEBYOPERATION_UPDATEBYCOLUMN_UPDATEBYSPEC_UPDATEBYROLLINGWAVG']._serialized_start=9229
-  _globals['_UPDATEBYREQUEST_UPDATEBYOPERATION_UPDATEBYCOLUMN_UPDATEBYSPEC_UPDATEBYROLLINGWAVG']._serialized_end=9445
-  _globals['_UPDATEBYREQUEST_UPDATEBYOPERATION_UPDATEBYCOLUMN_UPDATEBYSPEC_UPDATEBYROLLINGFORMULA']._serialized_start=9448
-  _globals['_UPDATEBYREQUEST_UPDATEBYOPERATION_UPDATEBYCOLUMN_UPDATEBYSPEC_UPDATEBYROLLINGFORMULA']._serialized_end=9682
-  _globals['_SELECTDISTINCTREQUEST']._serialized_start=9701
-  _globals['_SELECTDISTINCTREQUEST']._serialized_end=9878
-  _globals['_DROPCOLUMNSREQUEST']._serialized_start=9881
-  _globals['_DROPCOLUMNSREQUEST']._serialized_end=10055
-  _globals['_UNSTRUCTUREDFILTERTABLEREQUEST']._serialized_start=10058
-  _globals['_UNSTRUCTUREDFILTERTABLEREQUEST']._serialized_end=10239
-  _globals['_HEADORTAILREQUEST']._serialized_start=10242
-  _globals['_HEADORTAILREQUEST']._serialized_end=10415
-  _globals['_HEADORTAILBYREQUEST']._serialized_start=10418
-  _globals['_HEADORTAILBYREQUEST']._serialized_end=10624
-  _globals['_UNGROUPREQUEST']._serialized_start=10627
-  _globals['_UNGROUPREQUEST']._serialized_end=10822
-  _globals['_MERGETABLESREQUEST']._serialized_start=10825
-  _globals['_MERGETABLESREQUEST']._serialized_end=10998
-  _globals['_SNAPSHOTTABLEREQUEST']._serialized_start=11001
-  _globals['_SNAPSHOTTABLEREQUEST']._serialized_end=11155
-  _globals['_SNAPSHOTWHENTABLEREQUEST']._serialized_start=11158
-  _globals['_SNAPSHOTWHENTABLEREQUEST']._serialized_end=11463
-  _globals['_CROSSJOINTABLESREQUEST']._serialized_start=11466
-  _globals['_CROSSJOINTABLESREQUEST']._serialized_end=11761
-  _globals['_NATURALJOINTABLESREQUEST']._serialized_start=11764
-  _globals['_NATURALJOINTABLESREQUEST']._serialized_end=12039
-  _globals['_EXACTJOINTABLESREQUEST']._serialized_start=12042
-  _globals['_EXACTJOINTABLESREQUEST']._serialized_end=12315
-  _globals['_LEFTJOINTABLESREQUEST']._serialized_start=12318
-  _globals['_LEFTJOINTABLESREQUEST']._serialized_end=12590
-  _globals['_ASOFJOINTABLESREQUEST']._serialized_start=12593
-  _globals['_ASOFJOINTABLESREQUEST']._serialized_end=13058
-  _globals['_ASOFJOINTABLESREQUEST_MATCHRULE']._serialized_start=12961
-  _globals['_ASOFJOINTABLESREQUEST_MATCHRULE']._serialized_end=13054
-  _globals['_AJRAJTABLESREQUEST']._serialized_start=13061
-  _globals['_AJRAJTABLESREQUEST']._serialized_end=13355
-  _globals['_MULTIJOININPUT']._serialized_start=13358
-  _globals['_MULTIJOININPUT']._serialized_end=13494
-  _globals['_MULTIJOINTABLESREQUEST']._serialized_start=13497
-  _globals['_MULTIJOINTABLESREQUEST']._serialized_end=13661
-  _globals['_RANGEJOINTABLESREQUEST']._serialized_start=13664
-  _globals['_RANGEJOINTABLESREQUEST']._serialized_end=14528
-  _globals['_RANGEJOINTABLESREQUEST_RANGESTARTRULE']._serialized_start=14285
-  _globals['_RANGEJOINTABLESREQUEST_RANGESTARTRULE']._serialized_end=14403
-  _globals['_RANGEJOINTABLESREQUEST_RANGEENDRULE']._serialized_start=14405
-  _globals['_RANGEJOINTABLESREQUEST_RANGEENDRULE']._serialized_end=14528
-  _globals['_COMBOAGGREGATEREQUEST']._serialized_start=14531
-  _globals['_COMBOAGGREGATEREQUEST']._serialized_end=15169
-  _globals['_COMBOAGGREGATEREQUEST_AGGREGATE']._serialized_start=14824
-  _globals['_COMBOAGGREGATEREQUEST_AGGREGATE']._serialized_end=14997
-  _globals['_COMBOAGGREGATEREQUEST_AGGTYPE']._serialized_start=15000
-  _globals['_COMBOAGGREGATEREQUEST_AGGTYPE']._serialized_end=15165
-  _globals['_AGGREGATEALLREQUEST']._serialized_start=15172
-  _globals['_AGGREGATEALLREQUEST']._serialized_end=15409
-  _globals['_AGGSPEC']._serialized_start=15412
-  _globals['_AGGSPEC']._serialized_end=18443
-  _globals['_AGGSPEC_AGGSPECAPPROXIMATEPERCENTILE']._serialized_start=17218
-  _globals['_AGGSPEC_AGGSPECAPPROXIMATEPERCENTILE']._serialized_end=17310
-  _globals['_AGGSPEC_AGGSPECCOUNTDISTINCT']._serialized_start=17312
-  _globals['_AGGSPEC_AGGSPECCOUNTDISTINCT']._serialized_end=17355
-  _globals['_AGGSPEC_AGGSPECDISTINCT']._serialized_start=17357
-  _globals['_AGGSPEC_AGGSPECDISTINCT']._serialized_end=17397
-  _globals['_AGGSPEC_AGGSPECFORMULA']._serialized_start=17399
-  _globals['_AGGSPEC_AGGSPECFORMULA']._serialized_end=17453
-  _globals['_AGGSPEC_AGGSPECMEDIAN']._serialized_start=17455
-  _globals['_AGGSPEC_AGGSPECMEDIAN']._serialized_end=17502
-  _globals['_AGGSPEC_AGGSPECPERCENTILE']._serialized_start=17504
-  _globals['_AGGSPEC_AGGSPECPERCENTILE']._serialized_end=17575
-  _globals['_AGGSPEC_AGGSPECSORTED']._serialized_start=17577
-  _globals['_AGGSPEC_AGGSPECSORTED']._serialized_end=17673
-  _globals['_AGGSPEC_AGGSPECSORTEDCOLUMN']._serialized_start=17675
-  _globals['_AGGSPEC_AGGSPECSORTEDCOLUMN']._serialized_end=17717
-  _globals['_AGGSPEC_AGGSPECTDIGEST']._serialized_start=17719
-  _globals['_AGGSPEC_AGGSPECTDIGEST']._serialized_end=17777
-  _globals['_AGGSPEC_AGGSPECUNIQUE']._serialized_start=17780
-  _globals['_AGGSPEC_AGGSPECUNIQUE']._serialized_end=17916
-  _globals['_AGGSPEC_AGGSPECNONUNIQUESENTINEL']._serialized_start=17919
-  _globals['_AGGSPEC_AGGSPECNONUNIQUESENTINEL']._serialized_end=18228
-  _globals['_AGGSPEC_AGGSPECWEIGHTED']._serialized_start=18230
-  _globals['_AGGSPEC_AGGSPECWEIGHTED']._serialized_end=18270
-  _globals['_AGGSPEC_AGGSPECABSSUM']._serialized_start=18272
-  _globals['_AGGSPEC_AGGSPECABSSUM']._serialized_end=18287
-  _globals['_AGGSPEC_AGGSPECAVG']._serialized_start=18289
-  _globals['_AGGSPEC_AGGSPECAVG']._serialized_end=18301
-  _globals['_AGGSPEC_AGGSPECFIRST']._serialized_start=18303
-  _globals['_AGGSPEC_AGGSPECFIRST']._serialized_end=18317
-  _globals['_AGGSPEC_AGGSPECFREEZE']._serialized_start=18319
-  _globals['_AGGSPEC_AGGSPECFREEZE']._serialized_end=18334
-  _globals['_AGGSPEC_AGGSPECGROUP']._serialized_start=18336
-  _globals['_AGGSPEC_AGGSPECGROUP']._serialized_end=18350
-  _globals['_AGGSPEC_AGGSPECLAST']._serialized_start=18352
-  _globals['_AGGSPEC_AGGSPECLAST']._serialized_end=18365
-  _globals['_AGGSPEC_AGGSPECMAX']._serialized_start=18367
-  _globals['_AGGSPEC_AGGSPECMAX']._serialized_end=18379
-  _globals['_AGGSPEC_AGGSPECMIN']._serialized_start=18381
-  _globals['_AGGSPEC_AGGSPECMIN']._serialized_end=18393
-  _globals['_AGGSPEC_AGGSPECSTD']._serialized_start=18395
-  _globals['_AGGSPEC_AGGSPECSTD']._serialized_end=18407
-  _globals['_AGGSPEC_AGGSPECSUM']._serialized_start=18409
-  _globals['_AGGSPEC_AGGSPECSUM']._serialized_end=18421
-  _globals['_AGGSPEC_AGGSPECVAR']._serialized_start=18423
-  _globals['_AGGSPEC_AGGSPECVAR']._serialized_end=18435
-  _globals['_AGGREGATEREQUEST']._serialized_start=18446
-  _globals['_AGGREGATEREQUEST']._serialized_end=18794
-  _globals['_AGGREGATION']._serialized_start=18797
-  _globals['_AGGREGATION']._serialized_end=19520
-  _globals['_AGGREGATION_AGGREGATIONCOLUMNS']._serialized_start=19251
-  _globals['_AGGREGATION_AGGREGATIONCOLUMNS']._serialized_end=19350
-  _globals['_AGGREGATION_AGGREGATIONCOUNT']._serialized_start=19352
-  _globals['_AGGREGATION_AGGREGATIONCOUNT']._serialized_end=19391
-  _globals['_AGGREGATION_AGGREGATIONROWKEY']._serialized_start=19393
-  _globals['_AGGREGATION_AGGREGATIONROWKEY']._serialized_end=19433
-  _globals['_AGGREGATION_AGGREGATIONPARTITION']._serialized_start=19435
-  _globals['_AGGREGATION_AGGREGATIONPARTITION']._serialized_end=19512
-  _globals['_SORTDESCRIPTOR']._serialized_start=19523
-  _globals['_SORTDESCRIPTOR']._serialized_end=19748
-  _globals['_SORTDESCRIPTOR_SORTDIRECTION']._serialized_start=19667
-  _globals['_SORTDESCRIPTOR_SORTDIRECTION']._serialized_end=19748
-  _globals['_SORTTABLEREQUEST']._serialized_start=19751
-  _globals['_SORTTABLEREQUEST']._serialized_end=19967
-  _globals['_FILTERTABLEREQUEST']._serialized_start=19970
-  _globals['_FILTERTABLEREQUEST']._serialized_end=20185
-  _globals['_SEEKROWREQUEST']._serialized_start=20188
-  _globals['_SEEKROWREQUEST']._serialized_end=20437
-  _globals['_SEEKROWRESPONSE']._serialized_start=20439
-  _globals['_SEEKROWRESPONSE']._serialized_end=20480
-  _globals['_REFERENCE']._serialized_start=20482
-  _globals['_REFERENCE']._serialized_end=20514
-  _globals['_LITERAL']._serialized_start=20517
-  _globals['_LITERAL']._serialized_end=20662
-  _globals['_VALUE']._serialized_start=20665
-  _globals['_VALUE']._serialized_end=20810
-  _globals['_CONDITION']._serialized_start=20813
-  _globals['_CONDITION']._serialized_end=21513
-  _globals['_ANDCONDITION']._serialized_start=21515
-  _globals['_ANDCONDITION']._serialized_end=21592
-  _globals['_ORCONDITION']._serialized_start=21594
-  _globals['_ORCONDITION']._serialized_end=21670
-  _globals['_NOTCONDITION']._serialized_start=21672
-  _globals['_NOTCONDITION']._serialized_end=21748
-  _globals['_COMPARECONDITION']._serialized_start=21751
-  _globals['_COMPARECONDITION']._serialized_end=22179
-  _globals['_COMPARECONDITION_COMPAREOPERATION']._serialized_start=22049
-  _globals['_COMPARECONDITION_COMPAREOPERATION']._serialized_end=22179
-  _globals['_INCONDITION']._serialized_start=22182
-  _globals['_INCONDITION']._serialized_end=22459
-  _globals['_INVOKECONDITION']._serialized_start=22462
-  _globals['_INVOKECONDITION']._serialized_end=22614
-  _globals['_ISNULLCONDITION']._serialized_start=22616
-  _globals['_ISNULLCONDITION']._serialized_end=22698
-  _globals['_MATCHESCONDITION']._serialized_start=22701
-  _globals['_MATCHESCONDITION']._serialized_end=22943
-  _globals['_CONTAINSCONDITION']._serialized_start=22946
-  _globals['_CONTAINSCONDITION']._serialized_end=23197
-  _globals['_SEARCHCONDITION']._serialized_start=23199
-  _globals['_SEARCHCONDITION']._serialized_end=23314
-  _globals['_FLATTENREQUEST']._serialized_start=23317
-  _globals['_FLATTENREQUEST']._serialized_end=23465
-  _globals['_METATABLEREQUEST']._serialized_start=23468
-  _globals['_METATABLEREQUEST']._serialized_end=23618
-  _globals['_RUNCHARTDOWNSAMPLEREQUEST']._serialized_start=23621
-  _globals['_RUNCHARTDOWNSAMPLEREQUEST']._serialized_end=24057
-  _globals['_RUNCHARTDOWNSAMPLEREQUEST_ZOOMRANGE']._serialized_start=23942
-  _globals['_RUNCHARTDOWNSAMPLEREQUEST_ZOOMRANGE']._serialized_end=24057
-  _globals['_CREATEINPUTTABLEREQUEST']._serialized_start=24060
-  _globals['_CREATEINPUTTABLEREQUEST']._serialized_end=24796
-  _globals['_CREATEINPUTTABLEREQUEST_INPUTTABLEKIND']._serialized_start=24335
-  _globals['_CREATEINPUTTABLEREQUEST_INPUTTABLEKIND']._serialized_end=24782
-  _globals['_CREATEINPUTTABLEREQUEST_INPUTTABLEKIND_INMEMORYAPPENDONLY']._serialized_start=24703
-  _globals['_CREATEINPUTTABLEREQUEST_INPUTTABLEKIND_INMEMORYAPPENDONLY']._serialized_end=24723
-  _globals['_CREATEINPUTTABLEREQUEST_INPUTTABLEKIND_INMEMORYKEYBACKED']._serialized_start=24725
-  _globals['_CREATEINPUTTABLEREQUEST_INPUTTABLEKIND_INMEMORYKEYBACKED']._serialized_end=24765
-  _globals['_CREATEINPUTTABLEREQUEST_INPUTTABLEKIND_BLINK']._serialized_start=24767
-  _globals['_CREATEINPUTTABLEREQUEST_INPUTTABLEKIND_BLINK']._serialized_end=24774
-  _globals['_WHEREINREQUEST']._serialized_start=24799
-  _globals['_WHEREINREQUEST']._serialized_end=25058
-  _globals['_COLUMNSTATISTICSREQUEST']._serialized_start=25061
-  _globals['_COLUMNSTATISTICSREQUEST']._serialized_end=25295
-  _globals['_BATCHTABLEREQUEST']._serialized_start=25298
-  _globals['_BATCHTABLEREQUEST']._serialized_end=28651
-  _globals['_BATCHTABLEREQUEST_OPERATION']._serialized_start=25397
-  _globals['_BATCHTABLEREQUEST_OPERATION']._serialized_end=28651
-  _globals['_TABLESERVICE']._serialized_start=28993
-  _globals['_TABLESERVICE']._serialized_end=35324
-# @@protoc_insertion_point(module_scope)
diff --git a/py/client/pydeephaven/proto/table_pb2_grpc.py b/py/client/pydeephaven/proto/table_pb2_grpc.py
deleted file mode 100644
index 15ce49130a3..00000000000
--- a/py/client/pydeephaven/proto/table_pb2_grpc.py
+++ /dev/null
@@ -1,2109 +0,0 @@
-# Generated by the gRPC Python protocol compiler plugin. DO NOT EDIT!
-"""Client and server classes corresponding to protobuf-defined services."""
-import grpc
-import warnings
-
-from pydeephaven.proto import table_pb2 as deephaven_dot_proto_dot_table__pb2
-from pydeephaven.proto import ticket_pb2 as deephaven_dot_proto_dot_ticket__pb2
-
-GRPC_GENERATED_VERSION = '1.63.0'
-GRPC_VERSION = grpc.__version__
-EXPECTED_ERROR_RELEASE = '1.65.0'
-SCHEDULED_RELEASE_DATE = 'June 25, 2024'
-_version_not_supported = False
-
-try:
-    from grpc._utilities import first_version_is_lower
-    _version_not_supported = first_version_is_lower(GRPC_VERSION, GRPC_GENERATED_VERSION)
-except ImportError:
-    _version_not_supported = True
-
-if _version_not_supported:
-    warnings.warn(
-        f'The grpc package installed is at version {GRPC_VERSION},'
-        + f' but the generated code in deephaven/proto/table_pb2_grpc.py depends on'
-        + f' grpcio>={GRPC_GENERATED_VERSION}.'
-        + f' Please upgrade your grpc module to grpcio>={GRPC_GENERATED_VERSION}'
-        + f' or downgrade your generated code using grpcio-tools<={GRPC_VERSION}.'
-        + f' This warning will become an error in {EXPECTED_ERROR_RELEASE},'
-        + f' scheduled for release on {SCHEDULED_RELEASE_DATE}.',
-        RuntimeWarning
-    )
-
-
-class TableServiceStub(object):
-    """Missing associated documentation comment in .proto file."""
-
-    def __init__(self, channel):
-        """Constructor.
-
-        Args:
-            channel: A grpc.Channel.
-        """
-        self.GetExportedTableCreationResponse = channel.unary_unary(
-                '/io.deephaven.proto.backplane.grpc.TableService/GetExportedTableCreationResponse',
-                request_serializer=deephaven_dot_proto_dot_ticket__pb2.Ticket.SerializeToString,
-                response_deserializer=deephaven_dot_proto_dot_table__pb2.ExportedTableCreationResponse.FromString,
-                _registered_method=True)
-        self.FetchTable = channel.unary_unary(
-                '/io.deephaven.proto.backplane.grpc.TableService/FetchTable',
-                request_serializer=deephaven_dot_proto_dot_table__pb2.FetchTableRequest.SerializeToString,
-                response_deserializer=deephaven_dot_proto_dot_table__pb2.ExportedTableCreationResponse.FromString,
-                _registered_method=True)
-        self.ApplyPreviewColumns = channel.unary_unary(
-                '/io.deephaven.proto.backplane.grpc.TableService/ApplyPreviewColumns',
-                request_serializer=deephaven_dot_proto_dot_table__pb2.ApplyPreviewColumnsRequest.SerializeToString,
-                response_deserializer=deephaven_dot_proto_dot_table__pb2.ExportedTableCreationResponse.FromString,
-                _registered_method=True)
-        self.EmptyTable = channel.unary_unary(
-                '/io.deephaven.proto.backplane.grpc.TableService/EmptyTable',
-                request_serializer=deephaven_dot_proto_dot_table__pb2.EmptyTableRequest.SerializeToString,
-                response_deserializer=deephaven_dot_proto_dot_table__pb2.ExportedTableCreationResponse.FromString,
-                _registered_method=True)
-        self.TimeTable = channel.unary_unary(
-                '/io.deephaven.proto.backplane.grpc.TableService/TimeTable',
-                request_serializer=deephaven_dot_proto_dot_table__pb2.TimeTableRequest.SerializeToString,
-                response_deserializer=deephaven_dot_proto_dot_table__pb2.ExportedTableCreationResponse.FromString,
-                _registered_method=True)
-        self.DropColumns = channel.unary_unary(
-                '/io.deephaven.proto.backplane.grpc.TableService/DropColumns',
-                request_serializer=deephaven_dot_proto_dot_table__pb2.DropColumnsRequest.SerializeToString,
-                response_deserializer=deephaven_dot_proto_dot_table__pb2.ExportedTableCreationResponse.FromString,
-                _registered_method=True)
-        self.Update = channel.unary_unary(
-                '/io.deephaven.proto.backplane.grpc.TableService/Update',
-                request_serializer=deephaven_dot_proto_dot_table__pb2.SelectOrUpdateRequest.SerializeToString,
-                response_deserializer=deephaven_dot_proto_dot_table__pb2.ExportedTableCreationResponse.FromString,
-                _registered_method=True)
-        self.LazyUpdate = channel.unary_unary(
-                '/io.deephaven.proto.backplane.grpc.TableService/LazyUpdate',
-                request_serializer=deephaven_dot_proto_dot_table__pb2.SelectOrUpdateRequest.SerializeToString,
-                response_deserializer=deephaven_dot_proto_dot_table__pb2.ExportedTableCreationResponse.FromString,
-                _registered_method=True)
-        self.View = channel.unary_unary(
-                '/io.deephaven.proto.backplane.grpc.TableService/View',
-                request_serializer=deephaven_dot_proto_dot_table__pb2.SelectOrUpdateRequest.SerializeToString,
-                response_deserializer=deephaven_dot_proto_dot_table__pb2.ExportedTableCreationResponse.FromString,
-                _registered_method=True)
-        self.UpdateView = channel.unary_unary(
-                '/io.deephaven.proto.backplane.grpc.TableService/UpdateView',
-                request_serializer=deephaven_dot_proto_dot_table__pb2.SelectOrUpdateRequest.SerializeToString,
-                response_deserializer=deephaven_dot_proto_dot_table__pb2.ExportedTableCreationResponse.FromString,
-                _registered_method=True)
-        self.Select = channel.unary_unary(
-                '/io.deephaven.proto.backplane.grpc.TableService/Select',
-                request_serializer=deephaven_dot_proto_dot_table__pb2.SelectOrUpdateRequest.SerializeToString,
-                response_deserializer=deephaven_dot_proto_dot_table__pb2.ExportedTableCreationResponse.FromString,
-                _registered_method=True)
-        self.UpdateBy = channel.unary_unary(
-                '/io.deephaven.proto.backplane.grpc.TableService/UpdateBy',
-                request_serializer=deephaven_dot_proto_dot_table__pb2.UpdateByRequest.SerializeToString,
-                response_deserializer=deephaven_dot_proto_dot_table__pb2.ExportedTableCreationResponse.FromString,
-                _registered_method=True)
-        self.SelectDistinct = channel.unary_unary(
-                '/io.deephaven.proto.backplane.grpc.TableService/SelectDistinct',
-                request_serializer=deephaven_dot_proto_dot_table__pb2.SelectDistinctRequest.SerializeToString,
-                response_deserializer=deephaven_dot_proto_dot_table__pb2.ExportedTableCreationResponse.FromString,
-                _registered_method=True)
-        self.Filter = channel.unary_unary(
-                '/io.deephaven.proto.backplane.grpc.TableService/Filter',
-                request_serializer=deephaven_dot_proto_dot_table__pb2.FilterTableRequest.SerializeToString,
-                response_deserializer=deephaven_dot_proto_dot_table__pb2.ExportedTableCreationResponse.FromString,
-                _registered_method=True)
-        self.UnstructuredFilter = channel.unary_unary(
-                '/io.deephaven.proto.backplane.grpc.TableService/UnstructuredFilter',
-                request_serializer=deephaven_dot_proto_dot_table__pb2.UnstructuredFilterTableRequest.SerializeToString,
-                response_deserializer=deephaven_dot_proto_dot_table__pb2.ExportedTableCreationResponse.FromString,
-                _registered_method=True)
-        self.Sort = channel.unary_unary(
-                '/io.deephaven.proto.backplane.grpc.TableService/Sort',
-                request_serializer=deephaven_dot_proto_dot_table__pb2.SortTableRequest.SerializeToString,
-                response_deserializer=deephaven_dot_proto_dot_table__pb2.ExportedTableCreationResponse.FromString,
-                _registered_method=True)
-        self.Head = channel.unary_unary(
-                '/io.deephaven.proto.backplane.grpc.TableService/Head',
-                request_serializer=deephaven_dot_proto_dot_table__pb2.HeadOrTailRequest.SerializeToString,
-                response_deserializer=deephaven_dot_proto_dot_table__pb2.ExportedTableCreationResponse.FromString,
-                _registered_method=True)
-        self.Tail = channel.unary_unary(
-                '/io.deephaven.proto.backplane.grpc.TableService/Tail',
-                request_serializer=deephaven_dot_proto_dot_table__pb2.HeadOrTailRequest.SerializeToString,
-                response_deserializer=deephaven_dot_proto_dot_table__pb2.ExportedTableCreationResponse.FromString,
-                _registered_method=True)
-        self.HeadBy = channel.unary_unary(
-                '/io.deephaven.proto.backplane.grpc.TableService/HeadBy',
-                request_serializer=deephaven_dot_proto_dot_table__pb2.HeadOrTailByRequest.SerializeToString,
-                response_deserializer=deephaven_dot_proto_dot_table__pb2.ExportedTableCreationResponse.FromString,
-                _registered_method=True)
-        self.TailBy = channel.unary_unary(
-                '/io.deephaven.proto.backplane.grpc.TableService/TailBy',
-                request_serializer=deephaven_dot_proto_dot_table__pb2.HeadOrTailByRequest.SerializeToString,
-                response_deserializer=deephaven_dot_proto_dot_table__pb2.ExportedTableCreationResponse.FromString,
-                _registered_method=True)
-        self.Ungroup = channel.unary_unary(
-                '/io.deephaven.proto.backplane.grpc.TableService/Ungroup',
-                request_serializer=deephaven_dot_proto_dot_table__pb2.UngroupRequest.SerializeToString,
-                response_deserializer=deephaven_dot_proto_dot_table__pb2.ExportedTableCreationResponse.FromString,
-                _registered_method=True)
-        self.MergeTables = channel.unary_unary(
-                '/io.deephaven.proto.backplane.grpc.TableService/MergeTables',
-                request_serializer=deephaven_dot_proto_dot_table__pb2.MergeTablesRequest.SerializeToString,
-                response_deserializer=deephaven_dot_proto_dot_table__pb2.ExportedTableCreationResponse.FromString,
-                _registered_method=True)
-        self.CrossJoinTables = channel.unary_unary(
-                '/io.deephaven.proto.backplane.grpc.TableService/CrossJoinTables',
-                request_serializer=deephaven_dot_proto_dot_table__pb2.CrossJoinTablesRequest.SerializeToString,
-                response_deserializer=deephaven_dot_proto_dot_table__pb2.ExportedTableCreationResponse.FromString,
-                _registered_method=True)
-        self.NaturalJoinTables = channel.unary_unary(
-                '/io.deephaven.proto.backplane.grpc.TableService/NaturalJoinTables',
-                request_serializer=deephaven_dot_proto_dot_table__pb2.NaturalJoinTablesRequest.SerializeToString,
-                response_deserializer=deephaven_dot_proto_dot_table__pb2.ExportedTableCreationResponse.FromString,
-                _registered_method=True)
-        self.ExactJoinTables = channel.unary_unary(
-                '/io.deephaven.proto.backplane.grpc.TableService/ExactJoinTables',
-                request_serializer=deephaven_dot_proto_dot_table__pb2.ExactJoinTablesRequest.SerializeToString,
-                response_deserializer=deephaven_dot_proto_dot_table__pb2.ExportedTableCreationResponse.FromString,
-                _registered_method=True)
-        self.LeftJoinTables = channel.unary_unary(
-                '/io.deephaven.proto.backplane.grpc.TableService/LeftJoinTables',
-                request_serializer=deephaven_dot_proto_dot_table__pb2.LeftJoinTablesRequest.SerializeToString,
-                response_deserializer=deephaven_dot_proto_dot_table__pb2.ExportedTableCreationResponse.FromString,
-                _registered_method=True)
-        self.AsOfJoinTables = channel.unary_unary(
-                '/io.deephaven.proto.backplane.grpc.TableService/AsOfJoinTables',
-                request_serializer=deephaven_dot_proto_dot_table__pb2.AsOfJoinTablesRequest.SerializeToString,
-                response_deserializer=deephaven_dot_proto_dot_table__pb2.ExportedTableCreationResponse.FromString,
-                _registered_method=True)
-        self.AjTables = channel.unary_unary(
-                '/io.deephaven.proto.backplane.grpc.TableService/AjTables',
-                request_serializer=deephaven_dot_proto_dot_table__pb2.AjRajTablesRequest.SerializeToString,
-                response_deserializer=deephaven_dot_proto_dot_table__pb2.ExportedTableCreationResponse.FromString,
-                _registered_method=True)
-        self.RajTables = channel.unary_unary(
-                '/io.deephaven.proto.backplane.grpc.TableService/RajTables',
-                request_serializer=deephaven_dot_proto_dot_table__pb2.AjRajTablesRequest.SerializeToString,
-                response_deserializer=deephaven_dot_proto_dot_table__pb2.ExportedTableCreationResponse.FromString,
-                _registered_method=True)
-        self.MultiJoinTables = channel.unary_unary(
-                '/io.deephaven.proto.backplane.grpc.TableService/MultiJoinTables',
-                request_serializer=deephaven_dot_proto_dot_table__pb2.MultiJoinTablesRequest.SerializeToString,
-                response_deserializer=deephaven_dot_proto_dot_table__pb2.ExportedTableCreationResponse.FromString,
-                _registered_method=True)
-        self.RangeJoinTables = channel.unary_unary(
-                '/io.deephaven.proto.backplane.grpc.TableService/RangeJoinTables',
-                request_serializer=deephaven_dot_proto_dot_table__pb2.RangeJoinTablesRequest.SerializeToString,
-                response_deserializer=deephaven_dot_proto_dot_table__pb2.ExportedTableCreationResponse.FromString,
-                _registered_method=True)
-        self.ComboAggregate = channel.unary_unary(
-                '/io.deephaven.proto.backplane.grpc.TableService/ComboAggregate',
-                request_serializer=deephaven_dot_proto_dot_table__pb2.ComboAggregateRequest.SerializeToString,
-                response_deserializer=deephaven_dot_proto_dot_table__pb2.ExportedTableCreationResponse.FromString,
-                _registered_method=True)
-        self.AggregateAll = channel.unary_unary(
-                '/io.deephaven.proto.backplane.grpc.TableService/AggregateAll',
-                request_serializer=deephaven_dot_proto_dot_table__pb2.AggregateAllRequest.SerializeToString,
-                response_deserializer=deephaven_dot_proto_dot_table__pb2.ExportedTableCreationResponse.FromString,
-                _registered_method=True)
-        self.Aggregate = channel.unary_unary(
-                '/io.deephaven.proto.backplane.grpc.TableService/Aggregate',
-                request_serializer=deephaven_dot_proto_dot_table__pb2.AggregateRequest.SerializeToString,
-                response_deserializer=deephaven_dot_proto_dot_table__pb2.ExportedTableCreationResponse.FromString,
-                _registered_method=True)
-        self.Snapshot = channel.unary_unary(
-                '/io.deephaven.proto.backplane.grpc.TableService/Snapshot',
-                request_serializer=deephaven_dot_proto_dot_table__pb2.SnapshotTableRequest.SerializeToString,
-                response_deserializer=deephaven_dot_proto_dot_table__pb2.ExportedTableCreationResponse.FromString,
-                _registered_method=True)
-        self.SnapshotWhen = channel.unary_unary(
-                '/io.deephaven.proto.backplane.grpc.TableService/SnapshotWhen',
-                request_serializer=deephaven_dot_proto_dot_table__pb2.SnapshotWhenTableRequest.SerializeToString,
-                response_deserializer=deephaven_dot_proto_dot_table__pb2.ExportedTableCreationResponse.FromString,
-                _registered_method=True)
-        self.Flatten = channel.unary_unary(
-                '/io.deephaven.proto.backplane.grpc.TableService/Flatten',
-                request_serializer=deephaven_dot_proto_dot_table__pb2.FlattenRequest.SerializeToString,
-                response_deserializer=deephaven_dot_proto_dot_table__pb2.ExportedTableCreationResponse.FromString,
-                _registered_method=True)
-        self.RunChartDownsample = channel.unary_unary(
-                '/io.deephaven.proto.backplane.grpc.TableService/RunChartDownsample',
-                request_serializer=deephaven_dot_proto_dot_table__pb2.RunChartDownsampleRequest.SerializeToString,
-                response_deserializer=deephaven_dot_proto_dot_table__pb2.ExportedTableCreationResponse.FromString,
-                _registered_method=True)
-        self.CreateInputTable = channel.unary_unary(
-                '/io.deephaven.proto.backplane.grpc.TableService/CreateInputTable',
-                request_serializer=deephaven_dot_proto_dot_table__pb2.CreateInputTableRequest.SerializeToString,
-                response_deserializer=deephaven_dot_proto_dot_table__pb2.ExportedTableCreationResponse.FromString,
-                _registered_method=True)
-        self.WhereIn = channel.unary_unary(
-                '/io.deephaven.proto.backplane.grpc.TableService/WhereIn',
-                request_serializer=deephaven_dot_proto_dot_table__pb2.WhereInRequest.SerializeToString,
-                response_deserializer=deephaven_dot_proto_dot_table__pb2.ExportedTableCreationResponse.FromString,
-                _registered_method=True)
-        self.Batch = channel.unary_stream(
-                '/io.deephaven.proto.backplane.grpc.TableService/Batch',
-                request_serializer=deephaven_dot_proto_dot_table__pb2.BatchTableRequest.SerializeToString,
-                response_deserializer=deephaven_dot_proto_dot_table__pb2.ExportedTableCreationResponse.FromString,
-                _registered_method=True)
-        self.ExportedTableUpdates = channel.unary_stream(
-                '/io.deephaven.proto.backplane.grpc.TableService/ExportedTableUpdates',
-                request_serializer=deephaven_dot_proto_dot_table__pb2.ExportedTableUpdatesRequest.SerializeToString,
-                response_deserializer=deephaven_dot_proto_dot_table__pb2.ExportedTableUpdateMessage.FromString,
-                _registered_method=True)
-        self.SeekRow = channel.unary_unary(
-                '/io.deephaven.proto.backplane.grpc.TableService/SeekRow',
-                request_serializer=deephaven_dot_proto_dot_table__pb2.SeekRowRequest.SerializeToString,
-                response_deserializer=deephaven_dot_proto_dot_table__pb2.SeekRowResponse.FromString,
-                _registered_method=True)
-        self.MetaTable = channel.unary_unary(
-                '/io.deephaven.proto.backplane.grpc.TableService/MetaTable',
-                request_serializer=deephaven_dot_proto_dot_table__pb2.MetaTableRequest.SerializeToString,
-                response_deserializer=deephaven_dot_proto_dot_table__pb2.ExportedTableCreationResponse.FromString,
-                _registered_method=True)
-        self.ComputeColumnStatistics = channel.unary_unary(
-                '/io.deephaven.proto.backplane.grpc.TableService/ComputeColumnStatistics',
-                request_serializer=deephaven_dot_proto_dot_table__pb2.ColumnStatisticsRequest.SerializeToString,
-                response_deserializer=deephaven_dot_proto_dot_table__pb2.ExportedTableCreationResponse.FromString,
-                _registered_method=True)
-
-
-class TableServiceServicer(object):
-    """Missing associated documentation comment in .proto file."""
-
-    def GetExportedTableCreationResponse(self, request, context):
-        """
-        Request an ETCR for this ticket. Ticket must reference a Table.
-        """
-        context.set_code(grpc.StatusCode.UNIMPLEMENTED)
-        context.set_details('Method not implemented!')
-        raise NotImplementedError('Method not implemented!')
-
-    def FetchTable(self, request, context):
-        """
-        Fetches a Table from an existing source ticket and exports it to the local session result ticket.
-        """
-        context.set_code(grpc.StatusCode.UNIMPLEMENTED)
-        context.set_details('Method not implemented!')
-        raise NotImplementedError('Method not implemented!')
-
-    def ApplyPreviewColumns(self, request, context):
-        """
-        Create a table that has preview columns applied to an existing source table.
-        """
-        context.set_code(grpc.StatusCode.UNIMPLEMENTED)
-        context.set_details('Method not implemented!')
-        raise NotImplementedError('Method not implemented!')
-
-    def EmptyTable(self, request, context):
-        """
-        Create an empty table with the given column names and types.
-        """
-        context.set_code(grpc.StatusCode.UNIMPLEMENTED)
-        context.set_details('Method not implemented!')
-        raise NotImplementedError('Method not implemented!')
-
-    def TimeTable(self, request, context):
-        """
-        Create a time table with the given start time and period.
-        """
-        context.set_code(grpc.StatusCode.UNIMPLEMENTED)
-        context.set_details('Method not implemented!')
-        raise NotImplementedError('Method not implemented!')
-
-    def DropColumns(self, request, context):
-        """
-        Drop columns from the parent table.
-        """
-        context.set_code(grpc.StatusCode.UNIMPLEMENTED)
-        context.set_details('Method not implemented!')
-        raise NotImplementedError('Method not implemented!')
-
-    def Update(self, request, context):
-        """
-        Add columns to the given table using the given column specifications and the update table operation.
-        """
-        context.set_code(grpc.StatusCode.UNIMPLEMENTED)
-        context.set_details('Method not implemented!')
-        raise NotImplementedError('Method not implemented!')
-
-    def LazyUpdate(self, request, context):
-        """
-        Add columns to the given table using the given column specifications and the lazyUpdate table operation.
-        """
-        context.set_code(grpc.StatusCode.UNIMPLEMENTED)
-        context.set_details('Method not implemented!')
-        raise NotImplementedError('Method not implemented!')
-
-    def View(self, request, context):
-        """
-        Add columns to the given table using the given column specifications and the view table operation.
-        """
-        context.set_code(grpc.StatusCode.UNIMPLEMENTED)
-        context.set_details('Method not implemented!')
-        raise NotImplementedError('Method not implemented!')
-
-    def UpdateView(self, request, context):
-        """
-        Add columns to the given table using the given column specifications and the updateView table operation.
-        """
-        context.set_code(grpc.StatusCode.UNIMPLEMENTED)
-        context.set_details('Method not implemented!')
-        raise NotImplementedError('Method not implemented!')
-
-    def Select(self, request, context):
-        """
-        Select the given columns from the given table.
-        """
-        context.set_code(grpc.StatusCode.UNIMPLEMENTED)
-        context.set_details('Method not implemented!')
-        raise NotImplementedError('Method not implemented!')
-
-    def UpdateBy(self, request, context):
-        """
-        Returns the result of an updateBy table operation.
-        """
-        context.set_code(grpc.StatusCode.UNIMPLEMENTED)
-        context.set_details('Method not implemented!')
-        raise NotImplementedError('Method not implemented!')
-
-    def SelectDistinct(self, request, context):
-        """
-        Returns a new table definition with the unique tuples of the specified columns
-        """
-        context.set_code(grpc.StatusCode.UNIMPLEMENTED)
-        context.set_details('Method not implemented!')
-        raise NotImplementedError('Method not implemented!')
-
-    def Filter(self, request, context):
-        """
-        Filter parent table with structured filters.
-        """
-        context.set_code(grpc.StatusCode.UNIMPLEMENTED)
-        context.set_details('Method not implemented!')
-        raise NotImplementedError('Method not implemented!')
-
-    def UnstructuredFilter(self, request, context):
-        """
-        Filter parent table with unstructured filters.
-        """
-        context.set_code(grpc.StatusCode.UNIMPLEMENTED)
-        context.set_details('Method not implemented!')
-        raise NotImplementedError('Method not implemented!')
-
-    def Sort(self, request, context):
-        """
-        Sort parent table via the provide sort descriptors.
-        """
-        context.set_code(grpc.StatusCode.UNIMPLEMENTED)
-        context.set_details('Method not implemented!')
-        raise NotImplementedError('Method not implemented!')
-
-    def Head(self, request, context):
-        """
-        Extract rows from the head of the parent table.
-        """
-        context.set_code(grpc.StatusCode.UNIMPLEMENTED)
-        context.set_details('Method not implemented!')
-        raise NotImplementedError('Method not implemented!')
-
-    def Tail(self, request, context):
-        """
-        Extract rows from the tail of the parent table.
-        """
-        context.set_code(grpc.StatusCode.UNIMPLEMENTED)
-        context.set_details('Method not implemented!')
-        raise NotImplementedError('Method not implemented!')
-
-    def HeadBy(self, request, context):
-        """
-        Run the headBy table operation for the given group by columns on the given table.
-        """
-        context.set_code(grpc.StatusCode.UNIMPLEMENTED)
-        context.set_details('Method not implemented!')
-        raise NotImplementedError('Method not implemented!')
-
-    def TailBy(self, request, context):
-        """
-        Run the tailBy operation for the given group by columns on the given table.
-        """
-        context.set_code(grpc.StatusCode.UNIMPLEMENTED)
-        context.set_details('Method not implemented!')
-        raise NotImplementedError('Method not implemented!')
-
-    def Ungroup(self, request, context):
-        """
-        Ungroup the given columns (all columns will be ungrouped if columnsToUngroup is empty or unspecified).
-        """
-        context.set_code(grpc.StatusCode.UNIMPLEMENTED)
-        context.set_details('Method not implemented!')
-        raise NotImplementedError('Method not implemented!')
-
-    def MergeTables(self, request, context):
-        """
-        Create a merged table from the given input tables. If a key column is provided (not null), a sorted
-        merged will be performed using that column.
-        """
-        context.set_code(grpc.StatusCode.UNIMPLEMENTED)
-        context.set_details('Method not implemented!')
-        raise NotImplementedError('Method not implemented!')
-
-    def CrossJoinTables(self, request, context):
-        """
-        Returns the result of a cross join operation. Also known as the cartesian product.
-        """
-        context.set_code(grpc.StatusCode.UNIMPLEMENTED)
-        context.set_details('Method not implemented!')
-        raise NotImplementedError('Method not implemented!')
-
-    def NaturalJoinTables(self, request, context):
-        """
-        Returns the result of a natural join operation.
-        """
-        context.set_code(grpc.StatusCode.UNIMPLEMENTED)
-        context.set_details('Method not implemented!')
-        raise NotImplementedError('Method not implemented!')
-
-    def ExactJoinTables(self, request, context):
-        """
-        Returns the result of an exact join operation.
-        """
-        context.set_code(grpc.StatusCode.UNIMPLEMENTED)
-        context.set_details('Method not implemented!')
-        raise NotImplementedError('Method not implemented!')
-
-    def LeftJoinTables(self, request, context):
-        """
-        Returns the result of a left join operation.
-        """
-        context.set_code(grpc.StatusCode.UNIMPLEMENTED)
-        context.set_details('Method not implemented!')
-        raise NotImplementedError('Method not implemented!')
-
-    def AsOfJoinTables(self, request, context):
-        """
-        Returns the result of an as of join operation.
-
-        Deprecated: Please use AjTables or RajTables.
-        """
-        context.set_code(grpc.StatusCode.UNIMPLEMENTED)
-        context.set_details('Method not implemented!')
-        raise NotImplementedError('Method not implemented!')
-
-    def AjTables(self, request, context):
-        """
-        Returns the result of an aj operation.
-        """
-        context.set_code(grpc.StatusCode.UNIMPLEMENTED)
-        context.set_details('Method not implemented!')
-        raise NotImplementedError('Method not implemented!')
-
-    def RajTables(self, request, context):
-        """
-        Returns the result of an raj operation.
-        """
-        context.set_code(grpc.StatusCode.UNIMPLEMENTED)
-        context.set_details('Method not implemented!')
-        raise NotImplementedError('Method not implemented!')
-
-    def MultiJoinTables(self, request, context):
-        """
-        Returns the result of a multi-join operation.
-        """
-        context.set_code(grpc.StatusCode.UNIMPLEMENTED)
-        context.set_details('Method not implemented!')
-        raise NotImplementedError('Method not implemented!')
-
-    def RangeJoinTables(self, request, context):
-        """
-        Returns the result of a range join operation.
-        """
-        context.set_code(grpc.StatusCode.UNIMPLEMENTED)
-        context.set_details('Method not implemented!')
-        raise NotImplementedError('Method not implemented!')
-
-    def ComboAggregate(self, request, context):
-        """
-        Returns the result of an aggregate table operation.
-
-        Deprecated: Please use AggregateAll or Aggregate instead
-        """
-        context.set_code(grpc.StatusCode.UNIMPLEMENTED)
-        context.set_details('Method not implemented!')
-        raise NotImplementedError('Method not implemented!')
-
-    def AggregateAll(self, request, context):
-        """
-        Aggregates all non-grouping columns against a single aggregation specification.
-        """
-        context.set_code(grpc.StatusCode.UNIMPLEMENTED)
-        context.set_details('Method not implemented!')
-        raise NotImplementedError('Method not implemented!')
-
-    def Aggregate(self, request, context):
-        """
-        Produce an aggregated result by grouping the source_id table according to the group_by_columns and applying
-        aggregations to each resulting group of rows. The result table will have one row per group, ordered by
-        the encounter order within the source_id table, thereby ensuring that the row key for a given group never
-        changes.
-        """
-        context.set_code(grpc.StatusCode.UNIMPLEMENTED)
-        context.set_details('Method not implemented!')
-        raise NotImplementedError('Method not implemented!')
-
-    def Snapshot(self, request, context):
-        """
-        Takes a single snapshot of the source_id table.
-        """
-        context.set_code(grpc.StatusCode.UNIMPLEMENTED)
-        context.set_details('Method not implemented!')
-        raise NotImplementedError('Method not implemented!')
-
-    def SnapshotWhen(self, request, context):
-        """
-        Snapshot base_id, triggered by trigger_id, and export the resulting new table.
-        The trigger_id table's change events cause a new snapshot to be taken. The result table includes a
-        "snapshot key" which is a subset (possibly all) of the base_id table's columns. The
-        remaining columns in the result table come from base_id table, the table being snapshotted.
-        """
-        context.set_code(grpc.StatusCode.UNIMPLEMENTED)
-        context.set_details('Method not implemented!')
-        raise NotImplementedError('Method not implemented!')
-
-    def Flatten(self, request, context):
-        """
-        Returns a new table with a flattened row set.
-        """
-        context.set_code(grpc.StatusCode.UNIMPLEMENTED)
-        context.set_details('Method not implemented!')
-        raise NotImplementedError('Method not implemented!')
-
-    def RunChartDownsample(self, request, context):
-        """*
-        Downsamples a table assume its contents will be rendered in a run chart, with each subsequent row holding a later
-        X value (i.e., sorted on that column). Multiple Y columns can be specified, as can a range of values for the X
-        column to support zooming in.
-        """
-        context.set_code(grpc.StatusCode.UNIMPLEMENTED)
-        context.set_details('Method not implemented!')
-        raise NotImplementedError('Method not implemented!')
-
-    def CreateInputTable(self, request, context):
-        """*
-        Creates a new Table based on the provided configuration. This can be used as a regular table from the other methods
-        in this interface, or can be interacted with via the InputTableService to modify its contents.
-        """
-        context.set_code(grpc.StatusCode.UNIMPLEMENTED)
-        context.set_details('Method not implemented!')
-        raise NotImplementedError('Method not implemented!')
-
-    def WhereIn(self, request, context):
-        """*
-        Filters the left table based on the set of values in the right table.
-
-        Note that when the right table ticks, all of the rows in the left table are going to be re-evaluated,
-        thus the intention is that the right table is fairly slow moving compared with the left table.
-        """
-        context.set_code(grpc.StatusCode.UNIMPLEMENTED)
-        context.set_details('Method not implemented!')
-        raise NotImplementedError('Method not implemented!')
-
-    def Batch(self, request, context):
-        """
-        Batch a series of requests and send them all at once. This enables the user to create intermediate tables without
-        requiring them to be exported and managed by the client. The server will automatically release any tables when they
-        are no longer depended upon.
-        """
-        context.set_code(grpc.StatusCode.UNIMPLEMENTED)
-        context.set_details('Method not implemented!')
-        raise NotImplementedError('Method not implemented!')
-
-    def ExportedTableUpdates(self, request, context):
-        """
-        Establish a stream of table updates for cheap notifications of table size updates.
-
-        New streams will flush updates for all existing table exports. An export id of zero will be sent to indicate all
-        exports have sent their refresh update. Table updates may be intermingled with initial refresh updates after their
-        initial update had been sent.
-        """
-        context.set_code(grpc.StatusCode.UNIMPLEMENTED)
-        context.set_details('Method not implemented!')
-        raise NotImplementedError('Method not implemented!')
-
-    def SeekRow(self, request, context):
-        """
-        Seek a row number within a table.
-        """
-        context.set_code(grpc.StatusCode.UNIMPLEMENTED)
-        context.set_details('Method not implemented!')
-        raise NotImplementedError('Method not implemented!')
-
-    def MetaTable(self, request, context):
-        """
-        Returns the meta table of a table.
-        """
-        context.set_code(grpc.StatusCode.UNIMPLEMENTED)
-        context.set_details('Method not implemented!')
-        raise NotImplementedError('Method not implemented!')
-
-    def ComputeColumnStatistics(self, request, context):
-        """*
-        Returns a new table representing statistics about a single column of the provided table. This
-        result table will be static - use Aggregation() instead for updating results. Presently, the
-        primary use case for this is the Deephaven Web UI.
-        """
-        context.set_code(grpc.StatusCode.UNIMPLEMENTED)
-        context.set_details('Method not implemented!')
-        raise NotImplementedError('Method not implemented!')
-
-
-def add_TableServiceServicer_to_server(servicer, server):
-    rpc_method_handlers = {
-            'GetExportedTableCreationResponse': grpc.unary_unary_rpc_method_handler(
-                    servicer.GetExportedTableCreationResponse,
-                    request_deserializer=deephaven_dot_proto_dot_ticket__pb2.Ticket.FromString,
-                    response_serializer=deephaven_dot_proto_dot_table__pb2.ExportedTableCreationResponse.SerializeToString,
-            ),
-            'FetchTable': grpc.unary_unary_rpc_method_handler(
-                    servicer.FetchTable,
-                    request_deserializer=deephaven_dot_proto_dot_table__pb2.FetchTableRequest.FromString,
-                    response_serializer=deephaven_dot_proto_dot_table__pb2.ExportedTableCreationResponse.SerializeToString,
-            ),
-            'ApplyPreviewColumns': grpc.unary_unary_rpc_method_handler(
-                    servicer.ApplyPreviewColumns,
-                    request_deserializer=deephaven_dot_proto_dot_table__pb2.ApplyPreviewColumnsRequest.FromString,
-                    response_serializer=deephaven_dot_proto_dot_table__pb2.ExportedTableCreationResponse.SerializeToString,
-            ),
-            'EmptyTable': grpc.unary_unary_rpc_method_handler(
-                    servicer.EmptyTable,
-                    request_deserializer=deephaven_dot_proto_dot_table__pb2.EmptyTableRequest.FromString,
-                    response_serializer=deephaven_dot_proto_dot_table__pb2.ExportedTableCreationResponse.SerializeToString,
-            ),
-            'TimeTable': grpc.unary_unary_rpc_method_handler(
-                    servicer.TimeTable,
-                    request_deserializer=deephaven_dot_proto_dot_table__pb2.TimeTableRequest.FromString,
-                    response_serializer=deephaven_dot_proto_dot_table__pb2.ExportedTableCreationResponse.SerializeToString,
-            ),
-            'DropColumns': grpc.unary_unary_rpc_method_handler(
-                    servicer.DropColumns,
-                    request_deserializer=deephaven_dot_proto_dot_table__pb2.DropColumnsRequest.FromString,
-                    response_serializer=deephaven_dot_proto_dot_table__pb2.ExportedTableCreationResponse.SerializeToString,
-            ),
-            'Update': grpc.unary_unary_rpc_method_handler(
-                    servicer.Update,
-                    request_deserializer=deephaven_dot_proto_dot_table__pb2.SelectOrUpdateRequest.FromString,
-                    response_serializer=deephaven_dot_proto_dot_table__pb2.ExportedTableCreationResponse.SerializeToString,
-            ),
-            'LazyUpdate': grpc.unary_unary_rpc_method_handler(
-                    servicer.LazyUpdate,
-                    request_deserializer=deephaven_dot_proto_dot_table__pb2.SelectOrUpdateRequest.FromString,
-                    response_serializer=deephaven_dot_proto_dot_table__pb2.ExportedTableCreationResponse.SerializeToString,
-            ),
-            'View': grpc.unary_unary_rpc_method_handler(
-                    servicer.View,
-                    request_deserializer=deephaven_dot_proto_dot_table__pb2.SelectOrUpdateRequest.FromString,
-                    response_serializer=deephaven_dot_proto_dot_table__pb2.ExportedTableCreationResponse.SerializeToString,
-            ),
-            'UpdateView': grpc.unary_unary_rpc_method_handler(
-                    servicer.UpdateView,
-                    request_deserializer=deephaven_dot_proto_dot_table__pb2.SelectOrUpdateRequest.FromString,
-                    response_serializer=deephaven_dot_proto_dot_table__pb2.ExportedTableCreationResponse.SerializeToString,
-            ),
-            'Select': grpc.unary_unary_rpc_method_handler(
-                    servicer.Select,
-                    request_deserializer=deephaven_dot_proto_dot_table__pb2.SelectOrUpdateRequest.FromString,
-                    response_serializer=deephaven_dot_proto_dot_table__pb2.ExportedTableCreationResponse.SerializeToString,
-            ),
-            'UpdateBy': grpc.unary_unary_rpc_method_handler(
-                    servicer.UpdateBy,
-                    request_deserializer=deephaven_dot_proto_dot_table__pb2.UpdateByRequest.FromString,
-                    response_serializer=deephaven_dot_proto_dot_table__pb2.ExportedTableCreationResponse.SerializeToString,
-            ),
-            'SelectDistinct': grpc.unary_unary_rpc_method_handler(
-                    servicer.SelectDistinct,
-                    request_deserializer=deephaven_dot_proto_dot_table__pb2.SelectDistinctRequest.FromString,
-                    response_serializer=deephaven_dot_proto_dot_table__pb2.ExportedTableCreationResponse.SerializeToString,
-            ),
-            'Filter': grpc.unary_unary_rpc_method_handler(
-                    servicer.Filter,
-                    request_deserializer=deephaven_dot_proto_dot_table__pb2.FilterTableRequest.FromString,
-                    response_serializer=deephaven_dot_proto_dot_table__pb2.ExportedTableCreationResponse.SerializeToString,
-            ),
-            'UnstructuredFilter': grpc.unary_unary_rpc_method_handler(
-                    servicer.UnstructuredFilter,
-                    request_deserializer=deephaven_dot_proto_dot_table__pb2.UnstructuredFilterTableRequest.FromString,
-                    response_serializer=deephaven_dot_proto_dot_table__pb2.ExportedTableCreationResponse.SerializeToString,
-            ),
-            'Sort': grpc.unary_unary_rpc_method_handler(
-                    servicer.Sort,
-                    request_deserializer=deephaven_dot_proto_dot_table__pb2.SortTableRequest.FromString,
-                    response_serializer=deephaven_dot_proto_dot_table__pb2.ExportedTableCreationResponse.SerializeToString,
-            ),
-            'Head': grpc.unary_unary_rpc_method_handler(
-                    servicer.Head,
-                    request_deserializer=deephaven_dot_proto_dot_table__pb2.HeadOrTailRequest.FromString,
-                    response_serializer=deephaven_dot_proto_dot_table__pb2.ExportedTableCreationResponse.SerializeToString,
-            ),
-            'Tail': grpc.unary_unary_rpc_method_handler(
-                    servicer.Tail,
-                    request_deserializer=deephaven_dot_proto_dot_table__pb2.HeadOrTailRequest.FromString,
-                    response_serializer=deephaven_dot_proto_dot_table__pb2.ExportedTableCreationResponse.SerializeToString,
-            ),
-            'HeadBy': grpc.unary_unary_rpc_method_handler(
-                    servicer.HeadBy,
-                    request_deserializer=deephaven_dot_proto_dot_table__pb2.HeadOrTailByRequest.FromString,
-                    response_serializer=deephaven_dot_proto_dot_table__pb2.ExportedTableCreationResponse.SerializeToString,
-            ),
-            'TailBy': grpc.unary_unary_rpc_method_handler(
-                    servicer.TailBy,
-                    request_deserializer=deephaven_dot_proto_dot_table__pb2.HeadOrTailByRequest.FromString,
-                    response_serializer=deephaven_dot_proto_dot_table__pb2.ExportedTableCreationResponse.SerializeToString,
-            ),
-            'Ungroup': grpc.unary_unary_rpc_method_handler(
-                    servicer.Ungroup,
-                    request_deserializer=deephaven_dot_proto_dot_table__pb2.UngroupRequest.FromString,
-                    response_serializer=deephaven_dot_proto_dot_table__pb2.ExportedTableCreationResponse.SerializeToString,
-            ),
-            'MergeTables': grpc.unary_unary_rpc_method_handler(
-                    servicer.MergeTables,
-                    request_deserializer=deephaven_dot_proto_dot_table__pb2.MergeTablesRequest.FromString,
-                    response_serializer=deephaven_dot_proto_dot_table__pb2.ExportedTableCreationResponse.SerializeToString,
-            ),
-            'CrossJoinTables': grpc.unary_unary_rpc_method_handler(
-                    servicer.CrossJoinTables,
-                    request_deserializer=deephaven_dot_proto_dot_table__pb2.CrossJoinTablesRequest.FromString,
-                    response_serializer=deephaven_dot_proto_dot_table__pb2.ExportedTableCreationResponse.SerializeToString,
-            ),
-            'NaturalJoinTables': grpc.unary_unary_rpc_method_handler(
-                    servicer.NaturalJoinTables,
-                    request_deserializer=deephaven_dot_proto_dot_table__pb2.NaturalJoinTablesRequest.FromString,
-                    response_serializer=deephaven_dot_proto_dot_table__pb2.ExportedTableCreationResponse.SerializeToString,
-            ),
-            'ExactJoinTables': grpc.unary_unary_rpc_method_handler(
-                    servicer.ExactJoinTables,
-                    request_deserializer=deephaven_dot_proto_dot_table__pb2.ExactJoinTablesRequest.FromString,
-                    response_serializer=deephaven_dot_proto_dot_table__pb2.ExportedTableCreationResponse.SerializeToString,
-            ),
-            'LeftJoinTables': grpc.unary_unary_rpc_method_handler(
-                    servicer.LeftJoinTables,
-                    request_deserializer=deephaven_dot_proto_dot_table__pb2.LeftJoinTablesRequest.FromString,
-                    response_serializer=deephaven_dot_proto_dot_table__pb2.ExportedTableCreationResponse.SerializeToString,
-            ),
-            'AsOfJoinTables': grpc.unary_unary_rpc_method_handler(
-                    servicer.AsOfJoinTables,
-                    request_deserializer=deephaven_dot_proto_dot_table__pb2.AsOfJoinTablesRequest.FromString,
-                    response_serializer=deephaven_dot_proto_dot_table__pb2.ExportedTableCreationResponse.SerializeToString,
-            ),
-            'AjTables': grpc.unary_unary_rpc_method_handler(
-                    servicer.AjTables,
-                    request_deserializer=deephaven_dot_proto_dot_table__pb2.AjRajTablesRequest.FromString,
-                    response_serializer=deephaven_dot_proto_dot_table__pb2.ExportedTableCreationResponse.SerializeToString,
-            ),
-            'RajTables': grpc.unary_unary_rpc_method_handler(
-                    servicer.RajTables,
-                    request_deserializer=deephaven_dot_proto_dot_table__pb2.AjRajTablesRequest.FromString,
-                    response_serializer=deephaven_dot_proto_dot_table__pb2.ExportedTableCreationResponse.SerializeToString,
-            ),
-            'MultiJoinTables': grpc.unary_unary_rpc_method_handler(
-                    servicer.MultiJoinTables,
-                    request_deserializer=deephaven_dot_proto_dot_table__pb2.MultiJoinTablesRequest.FromString,
-                    response_serializer=deephaven_dot_proto_dot_table__pb2.ExportedTableCreationResponse.SerializeToString,
-            ),
-            'RangeJoinTables': grpc.unary_unary_rpc_method_handler(
-                    servicer.RangeJoinTables,
-                    request_deserializer=deephaven_dot_proto_dot_table__pb2.RangeJoinTablesRequest.FromString,
-                    response_serializer=deephaven_dot_proto_dot_table__pb2.ExportedTableCreationResponse.SerializeToString,
-            ),
-            'ComboAggregate': grpc.unary_unary_rpc_method_handler(
-                    servicer.ComboAggregate,
-                    request_deserializer=deephaven_dot_proto_dot_table__pb2.ComboAggregateRequest.FromString,
-                    response_serializer=deephaven_dot_proto_dot_table__pb2.ExportedTableCreationResponse.SerializeToString,
-            ),
-            'AggregateAll': grpc.unary_unary_rpc_method_handler(
-                    servicer.AggregateAll,
-                    request_deserializer=deephaven_dot_proto_dot_table__pb2.AggregateAllRequest.FromString,
-                    response_serializer=deephaven_dot_proto_dot_table__pb2.ExportedTableCreationResponse.SerializeToString,
-            ),
-            'Aggregate': grpc.unary_unary_rpc_method_handler(
-                    servicer.Aggregate,
-                    request_deserializer=deephaven_dot_proto_dot_table__pb2.AggregateRequest.FromString,
-                    response_serializer=deephaven_dot_proto_dot_table__pb2.ExportedTableCreationResponse.SerializeToString,
-            ),
-            'Snapshot': grpc.unary_unary_rpc_method_handler(
-                    servicer.Snapshot,
-                    request_deserializer=deephaven_dot_proto_dot_table__pb2.SnapshotTableRequest.FromString,
-                    response_serializer=deephaven_dot_proto_dot_table__pb2.ExportedTableCreationResponse.SerializeToString,
-            ),
-            'SnapshotWhen': grpc.unary_unary_rpc_method_handler(
-                    servicer.SnapshotWhen,
-                    request_deserializer=deephaven_dot_proto_dot_table__pb2.SnapshotWhenTableRequest.FromString,
-                    response_serializer=deephaven_dot_proto_dot_table__pb2.ExportedTableCreationResponse.SerializeToString,
-            ),
-            'Flatten': grpc.unary_unary_rpc_method_handler(
-                    servicer.Flatten,
-                    request_deserializer=deephaven_dot_proto_dot_table__pb2.FlattenRequest.FromString,
-                    response_serializer=deephaven_dot_proto_dot_table__pb2.ExportedTableCreationResponse.SerializeToString,
-            ),
-            'RunChartDownsample': grpc.unary_unary_rpc_method_handler(
-                    servicer.RunChartDownsample,
-                    request_deserializer=deephaven_dot_proto_dot_table__pb2.RunChartDownsampleRequest.FromString,
-                    response_serializer=deephaven_dot_proto_dot_table__pb2.ExportedTableCreationResponse.SerializeToString,
-            ),
-            'CreateInputTable': grpc.unary_unary_rpc_method_handler(
-                    servicer.CreateInputTable,
-                    request_deserializer=deephaven_dot_proto_dot_table__pb2.CreateInputTableRequest.FromString,
-                    response_serializer=deephaven_dot_proto_dot_table__pb2.ExportedTableCreationResponse.SerializeToString,
-            ),
-            'WhereIn': grpc.unary_unary_rpc_method_handler(
-                    servicer.WhereIn,
-                    request_deserializer=deephaven_dot_proto_dot_table__pb2.WhereInRequest.FromString,
-                    response_serializer=deephaven_dot_proto_dot_table__pb2.ExportedTableCreationResponse.SerializeToString,
-            ),
-            'Batch': grpc.unary_stream_rpc_method_handler(
-                    servicer.Batch,
-                    request_deserializer=deephaven_dot_proto_dot_table__pb2.BatchTableRequest.FromString,
-                    response_serializer=deephaven_dot_proto_dot_table__pb2.ExportedTableCreationResponse.SerializeToString,
-            ),
-            'ExportedTableUpdates': grpc.unary_stream_rpc_method_handler(
-                    servicer.ExportedTableUpdates,
-                    request_deserializer=deephaven_dot_proto_dot_table__pb2.ExportedTableUpdatesRequest.FromString,
-                    response_serializer=deephaven_dot_proto_dot_table__pb2.ExportedTableUpdateMessage.SerializeToString,
-            ),
-            'SeekRow': grpc.unary_unary_rpc_method_handler(
-                    servicer.SeekRow,
-                    request_deserializer=deephaven_dot_proto_dot_table__pb2.SeekRowRequest.FromString,
-                    response_serializer=deephaven_dot_proto_dot_table__pb2.SeekRowResponse.SerializeToString,
-            ),
-            'MetaTable': grpc.unary_unary_rpc_method_handler(
-                    servicer.MetaTable,
-                    request_deserializer=deephaven_dot_proto_dot_table__pb2.MetaTableRequest.FromString,
-                    response_serializer=deephaven_dot_proto_dot_table__pb2.ExportedTableCreationResponse.SerializeToString,
-            ),
-            'ComputeColumnStatistics': grpc.unary_unary_rpc_method_handler(
-                    servicer.ComputeColumnStatistics,
-                    request_deserializer=deephaven_dot_proto_dot_table__pb2.ColumnStatisticsRequest.FromString,
-                    response_serializer=deephaven_dot_proto_dot_table__pb2.ExportedTableCreationResponse.SerializeToString,
-            ),
-    }
-    generic_handler = grpc.method_handlers_generic_handler(
-            'io.deephaven.proto.backplane.grpc.TableService', rpc_method_handlers)
-    server.add_generic_rpc_handlers((generic_handler,))
-
-
- # This class is part of an EXPERIMENTAL API.
-class TableService(object):
-    """Missing associated documentation comment in .proto file."""
-
-    @staticmethod
-    def GetExportedTableCreationResponse(request,
-            target,
-            options=(),
-            channel_credentials=None,
-            call_credentials=None,
-            insecure=False,
-            compression=None,
-            wait_for_ready=None,
-            timeout=None,
-            metadata=None):
-        return grpc.experimental.unary_unary(
-            request,
-            target,
-            '/io.deephaven.proto.backplane.grpc.TableService/GetExportedTableCreationResponse',
-            deephaven_dot_proto_dot_ticket__pb2.Ticket.SerializeToString,
-            deephaven_dot_proto_dot_table__pb2.ExportedTableCreationResponse.FromString,
-            options,
-            channel_credentials,
-            insecure,
-            call_credentials,
-            compression,
-            wait_for_ready,
-            timeout,
-            metadata,
-            _registered_method=True)
-
-    @staticmethod
-    def FetchTable(request,
-            target,
-            options=(),
-            channel_credentials=None,
-            call_credentials=None,
-            insecure=False,
-            compression=None,
-            wait_for_ready=None,
-            timeout=None,
-            metadata=None):
-        return grpc.experimental.unary_unary(
-            request,
-            target,
-            '/io.deephaven.proto.backplane.grpc.TableService/FetchTable',
-            deephaven_dot_proto_dot_table__pb2.FetchTableRequest.SerializeToString,
-            deephaven_dot_proto_dot_table__pb2.ExportedTableCreationResponse.FromString,
-            options,
-            channel_credentials,
-            insecure,
-            call_credentials,
-            compression,
-            wait_for_ready,
-            timeout,
-            metadata,
-            _registered_method=True)
-
-    @staticmethod
-    def ApplyPreviewColumns(request,
-            target,
-            options=(),
-            channel_credentials=None,
-            call_credentials=None,
-            insecure=False,
-            compression=None,
-            wait_for_ready=None,
-            timeout=None,
-            metadata=None):
-        return grpc.experimental.unary_unary(
-            request,
-            target,
-            '/io.deephaven.proto.backplane.grpc.TableService/ApplyPreviewColumns',
-            deephaven_dot_proto_dot_table__pb2.ApplyPreviewColumnsRequest.SerializeToString,
-            deephaven_dot_proto_dot_table__pb2.ExportedTableCreationResponse.FromString,
-            options,
-            channel_credentials,
-            insecure,
-            call_credentials,
-            compression,
-            wait_for_ready,
-            timeout,
-            metadata,
-            _registered_method=True)
-
-    @staticmethod
-    def EmptyTable(request,
-            target,
-            options=(),
-            channel_credentials=None,
-            call_credentials=None,
-            insecure=False,
-            compression=None,
-            wait_for_ready=None,
-            timeout=None,
-            metadata=None):
-        return grpc.experimental.unary_unary(
-            request,
-            target,
-            '/io.deephaven.proto.backplane.grpc.TableService/EmptyTable',
-            deephaven_dot_proto_dot_table__pb2.EmptyTableRequest.SerializeToString,
-            deephaven_dot_proto_dot_table__pb2.ExportedTableCreationResponse.FromString,
-            options,
-            channel_credentials,
-            insecure,
-            call_credentials,
-            compression,
-            wait_for_ready,
-            timeout,
-            metadata,
-            _registered_method=True)
-
-    @staticmethod
-    def TimeTable(request,
-            target,
-            options=(),
-            channel_credentials=None,
-            call_credentials=None,
-            insecure=False,
-            compression=None,
-            wait_for_ready=None,
-            timeout=None,
-            metadata=None):
-        return grpc.experimental.unary_unary(
-            request,
-            target,
-            '/io.deephaven.proto.backplane.grpc.TableService/TimeTable',
-            deephaven_dot_proto_dot_table__pb2.TimeTableRequest.SerializeToString,
-            deephaven_dot_proto_dot_table__pb2.ExportedTableCreationResponse.FromString,
-            options,
-            channel_credentials,
-            insecure,
-            call_credentials,
-            compression,
-            wait_for_ready,
-            timeout,
-            metadata,
-            _registered_method=True)
-
-    @staticmethod
-    def DropColumns(request,
-            target,
-            options=(),
-            channel_credentials=None,
-            call_credentials=None,
-            insecure=False,
-            compression=None,
-            wait_for_ready=None,
-            timeout=None,
-            metadata=None):
-        return grpc.experimental.unary_unary(
-            request,
-            target,
-            '/io.deephaven.proto.backplane.grpc.TableService/DropColumns',
-            deephaven_dot_proto_dot_table__pb2.DropColumnsRequest.SerializeToString,
-            deephaven_dot_proto_dot_table__pb2.ExportedTableCreationResponse.FromString,
-            options,
-            channel_credentials,
-            insecure,
-            call_credentials,
-            compression,
-            wait_for_ready,
-            timeout,
-            metadata,
-            _registered_method=True)
-
-    @staticmethod
-    def Update(request,
-            target,
-            options=(),
-            channel_credentials=None,
-            call_credentials=None,
-            insecure=False,
-            compression=None,
-            wait_for_ready=None,
-            timeout=None,
-            metadata=None):
-        return grpc.experimental.unary_unary(
-            request,
-            target,
-            '/io.deephaven.proto.backplane.grpc.TableService/Update',
-            deephaven_dot_proto_dot_table__pb2.SelectOrUpdateRequest.SerializeToString,
-            deephaven_dot_proto_dot_table__pb2.ExportedTableCreationResponse.FromString,
-            options,
-            channel_credentials,
-            insecure,
-            call_credentials,
-            compression,
-            wait_for_ready,
-            timeout,
-            metadata,
-            _registered_method=True)
-
-    @staticmethod
-    def LazyUpdate(request,
-            target,
-            options=(),
-            channel_credentials=None,
-            call_credentials=None,
-            insecure=False,
-            compression=None,
-            wait_for_ready=None,
-            timeout=None,
-            metadata=None):
-        return grpc.experimental.unary_unary(
-            request,
-            target,
-            '/io.deephaven.proto.backplane.grpc.TableService/LazyUpdate',
-            deephaven_dot_proto_dot_table__pb2.SelectOrUpdateRequest.SerializeToString,
-            deephaven_dot_proto_dot_table__pb2.ExportedTableCreationResponse.FromString,
-            options,
-            channel_credentials,
-            insecure,
-            call_credentials,
-            compression,
-            wait_for_ready,
-            timeout,
-            metadata,
-            _registered_method=True)
-
-    @staticmethod
-    def View(request,
-            target,
-            options=(),
-            channel_credentials=None,
-            call_credentials=None,
-            insecure=False,
-            compression=None,
-            wait_for_ready=None,
-            timeout=None,
-            metadata=None):
-        return grpc.experimental.unary_unary(
-            request,
-            target,
-            '/io.deephaven.proto.backplane.grpc.TableService/View',
-            deephaven_dot_proto_dot_table__pb2.SelectOrUpdateRequest.SerializeToString,
-            deephaven_dot_proto_dot_table__pb2.ExportedTableCreationResponse.FromString,
-            options,
-            channel_credentials,
-            insecure,
-            call_credentials,
-            compression,
-            wait_for_ready,
-            timeout,
-            metadata,
-            _registered_method=True)
-
-    @staticmethod
-    def UpdateView(request,
-            target,
-            options=(),
-            channel_credentials=None,
-            call_credentials=None,
-            insecure=False,
-            compression=None,
-            wait_for_ready=None,
-            timeout=None,
-            metadata=None):
-        return grpc.experimental.unary_unary(
-            request,
-            target,
-            '/io.deephaven.proto.backplane.grpc.TableService/UpdateView',
-            deephaven_dot_proto_dot_table__pb2.SelectOrUpdateRequest.SerializeToString,
-            deephaven_dot_proto_dot_table__pb2.ExportedTableCreationResponse.FromString,
-            options,
-            channel_credentials,
-            insecure,
-            call_credentials,
-            compression,
-            wait_for_ready,
-            timeout,
-            metadata,
-            _registered_method=True)
-
-    @staticmethod
-    def Select(request,
-            target,
-            options=(),
-            channel_credentials=None,
-            call_credentials=None,
-            insecure=False,
-            compression=None,
-            wait_for_ready=None,
-            timeout=None,
-            metadata=None):
-        return grpc.experimental.unary_unary(
-            request,
-            target,
-            '/io.deephaven.proto.backplane.grpc.TableService/Select',
-            deephaven_dot_proto_dot_table__pb2.SelectOrUpdateRequest.SerializeToString,
-            deephaven_dot_proto_dot_table__pb2.ExportedTableCreationResponse.FromString,
-            options,
-            channel_credentials,
-            insecure,
-            call_credentials,
-            compression,
-            wait_for_ready,
-            timeout,
-            metadata,
-            _registered_method=True)
-
-    @staticmethod
-    def UpdateBy(request,
-            target,
-            options=(),
-            channel_credentials=None,
-            call_credentials=None,
-            insecure=False,
-            compression=None,
-            wait_for_ready=None,
-            timeout=None,
-            metadata=None):
-        return grpc.experimental.unary_unary(
-            request,
-            target,
-            '/io.deephaven.proto.backplane.grpc.TableService/UpdateBy',
-            deephaven_dot_proto_dot_table__pb2.UpdateByRequest.SerializeToString,
-            deephaven_dot_proto_dot_table__pb2.ExportedTableCreationResponse.FromString,
-            options,
-            channel_credentials,
-            insecure,
-            call_credentials,
-            compression,
-            wait_for_ready,
-            timeout,
-            metadata,
-            _registered_method=True)
-
-    @staticmethod
-    def SelectDistinct(request,
-            target,
-            options=(),
-            channel_credentials=None,
-            call_credentials=None,
-            insecure=False,
-            compression=None,
-            wait_for_ready=None,
-            timeout=None,
-            metadata=None):
-        return grpc.experimental.unary_unary(
-            request,
-            target,
-            '/io.deephaven.proto.backplane.grpc.TableService/SelectDistinct',
-            deephaven_dot_proto_dot_table__pb2.SelectDistinctRequest.SerializeToString,
-            deephaven_dot_proto_dot_table__pb2.ExportedTableCreationResponse.FromString,
-            options,
-            channel_credentials,
-            insecure,
-            call_credentials,
-            compression,
-            wait_for_ready,
-            timeout,
-            metadata,
-            _registered_method=True)
-
-    @staticmethod
-    def Filter(request,
-            target,
-            options=(),
-            channel_credentials=None,
-            call_credentials=None,
-            insecure=False,
-            compression=None,
-            wait_for_ready=None,
-            timeout=None,
-            metadata=None):
-        return grpc.experimental.unary_unary(
-            request,
-            target,
-            '/io.deephaven.proto.backplane.grpc.TableService/Filter',
-            deephaven_dot_proto_dot_table__pb2.FilterTableRequest.SerializeToString,
-            deephaven_dot_proto_dot_table__pb2.ExportedTableCreationResponse.FromString,
-            options,
-            channel_credentials,
-            insecure,
-            call_credentials,
-            compression,
-            wait_for_ready,
-            timeout,
-            metadata,
-            _registered_method=True)
-
-    @staticmethod
-    def UnstructuredFilter(request,
-            target,
-            options=(),
-            channel_credentials=None,
-            call_credentials=None,
-            insecure=False,
-            compression=None,
-            wait_for_ready=None,
-            timeout=None,
-            metadata=None):
-        return grpc.experimental.unary_unary(
-            request,
-            target,
-            '/io.deephaven.proto.backplane.grpc.TableService/UnstructuredFilter',
-            deephaven_dot_proto_dot_table__pb2.UnstructuredFilterTableRequest.SerializeToString,
-            deephaven_dot_proto_dot_table__pb2.ExportedTableCreationResponse.FromString,
-            options,
-            channel_credentials,
-            insecure,
-            call_credentials,
-            compression,
-            wait_for_ready,
-            timeout,
-            metadata,
-            _registered_method=True)
-
-    @staticmethod
-    def Sort(request,
-            target,
-            options=(),
-            channel_credentials=None,
-            call_credentials=None,
-            insecure=False,
-            compression=None,
-            wait_for_ready=None,
-            timeout=None,
-            metadata=None):
-        return grpc.experimental.unary_unary(
-            request,
-            target,
-            '/io.deephaven.proto.backplane.grpc.TableService/Sort',
-            deephaven_dot_proto_dot_table__pb2.SortTableRequest.SerializeToString,
-            deephaven_dot_proto_dot_table__pb2.ExportedTableCreationResponse.FromString,
-            options,
-            channel_credentials,
-            insecure,
-            call_credentials,
-            compression,
-            wait_for_ready,
-            timeout,
-            metadata,
-            _registered_method=True)
-
-    @staticmethod
-    def Head(request,
-            target,
-            options=(),
-            channel_credentials=None,
-            call_credentials=None,
-            insecure=False,
-            compression=None,
-            wait_for_ready=None,
-            timeout=None,
-            metadata=None):
-        return grpc.experimental.unary_unary(
-            request,
-            target,
-            '/io.deephaven.proto.backplane.grpc.TableService/Head',
-            deephaven_dot_proto_dot_table__pb2.HeadOrTailRequest.SerializeToString,
-            deephaven_dot_proto_dot_table__pb2.ExportedTableCreationResponse.FromString,
-            options,
-            channel_credentials,
-            insecure,
-            call_credentials,
-            compression,
-            wait_for_ready,
-            timeout,
-            metadata,
-            _registered_method=True)
-
-    @staticmethod
-    def Tail(request,
-            target,
-            options=(),
-            channel_credentials=None,
-            call_credentials=None,
-            insecure=False,
-            compression=None,
-            wait_for_ready=None,
-            timeout=None,
-            metadata=None):
-        return grpc.experimental.unary_unary(
-            request,
-            target,
-            '/io.deephaven.proto.backplane.grpc.TableService/Tail',
-            deephaven_dot_proto_dot_table__pb2.HeadOrTailRequest.SerializeToString,
-            deephaven_dot_proto_dot_table__pb2.ExportedTableCreationResponse.FromString,
-            options,
-            channel_credentials,
-            insecure,
-            call_credentials,
-            compression,
-            wait_for_ready,
-            timeout,
-            metadata,
-            _registered_method=True)
-
-    @staticmethod
-    def HeadBy(request,
-            target,
-            options=(),
-            channel_credentials=None,
-            call_credentials=None,
-            insecure=False,
-            compression=None,
-            wait_for_ready=None,
-            timeout=None,
-            metadata=None):
-        return grpc.experimental.unary_unary(
-            request,
-            target,
-            '/io.deephaven.proto.backplane.grpc.TableService/HeadBy',
-            deephaven_dot_proto_dot_table__pb2.HeadOrTailByRequest.SerializeToString,
-            deephaven_dot_proto_dot_table__pb2.ExportedTableCreationResponse.FromString,
-            options,
-            channel_credentials,
-            insecure,
-            call_credentials,
-            compression,
-            wait_for_ready,
-            timeout,
-            metadata,
-            _registered_method=True)
-
-    @staticmethod
-    def TailBy(request,
-            target,
-            options=(),
-            channel_credentials=None,
-            call_credentials=None,
-            insecure=False,
-            compression=None,
-            wait_for_ready=None,
-            timeout=None,
-            metadata=None):
-        return grpc.experimental.unary_unary(
-            request,
-            target,
-            '/io.deephaven.proto.backplane.grpc.TableService/TailBy',
-            deephaven_dot_proto_dot_table__pb2.HeadOrTailByRequest.SerializeToString,
-            deephaven_dot_proto_dot_table__pb2.ExportedTableCreationResponse.FromString,
-            options,
-            channel_credentials,
-            insecure,
-            call_credentials,
-            compression,
-            wait_for_ready,
-            timeout,
-            metadata,
-            _registered_method=True)
-
-    @staticmethod
-    def Ungroup(request,
-            target,
-            options=(),
-            channel_credentials=None,
-            call_credentials=None,
-            insecure=False,
-            compression=None,
-            wait_for_ready=None,
-            timeout=None,
-            metadata=None):
-        return grpc.experimental.unary_unary(
-            request,
-            target,
-            '/io.deephaven.proto.backplane.grpc.TableService/Ungroup',
-            deephaven_dot_proto_dot_table__pb2.UngroupRequest.SerializeToString,
-            deephaven_dot_proto_dot_table__pb2.ExportedTableCreationResponse.FromString,
-            options,
-            channel_credentials,
-            insecure,
-            call_credentials,
-            compression,
-            wait_for_ready,
-            timeout,
-            metadata,
-            _registered_method=True)
-
-    @staticmethod
-    def MergeTables(request,
-            target,
-            options=(),
-            channel_credentials=None,
-            call_credentials=None,
-            insecure=False,
-            compression=None,
-            wait_for_ready=None,
-            timeout=None,
-            metadata=None):
-        return grpc.experimental.unary_unary(
-            request,
-            target,
-            '/io.deephaven.proto.backplane.grpc.TableService/MergeTables',
-            deephaven_dot_proto_dot_table__pb2.MergeTablesRequest.SerializeToString,
-            deephaven_dot_proto_dot_table__pb2.ExportedTableCreationResponse.FromString,
-            options,
-            channel_credentials,
-            insecure,
-            call_credentials,
-            compression,
-            wait_for_ready,
-            timeout,
-            metadata,
-            _registered_method=True)
-
-    @staticmethod
-    def CrossJoinTables(request,
-            target,
-            options=(),
-            channel_credentials=None,
-            call_credentials=None,
-            insecure=False,
-            compression=None,
-            wait_for_ready=None,
-            timeout=None,
-            metadata=None):
-        return grpc.experimental.unary_unary(
-            request,
-            target,
-            '/io.deephaven.proto.backplane.grpc.TableService/CrossJoinTables',
-            deephaven_dot_proto_dot_table__pb2.CrossJoinTablesRequest.SerializeToString,
-            deephaven_dot_proto_dot_table__pb2.ExportedTableCreationResponse.FromString,
-            options,
-            channel_credentials,
-            insecure,
-            call_credentials,
-            compression,
-            wait_for_ready,
-            timeout,
-            metadata,
-            _registered_method=True)
-
-    @staticmethod
-    def NaturalJoinTables(request,
-            target,
-            options=(),
-            channel_credentials=None,
-            call_credentials=None,
-            insecure=False,
-            compression=None,
-            wait_for_ready=None,
-            timeout=None,
-            metadata=None):
-        return grpc.experimental.unary_unary(
-            request,
-            target,
-            '/io.deephaven.proto.backplane.grpc.TableService/NaturalJoinTables',
-            deephaven_dot_proto_dot_table__pb2.NaturalJoinTablesRequest.SerializeToString,
-            deephaven_dot_proto_dot_table__pb2.ExportedTableCreationResponse.FromString,
-            options,
-            channel_credentials,
-            insecure,
-            call_credentials,
-            compression,
-            wait_for_ready,
-            timeout,
-            metadata,
-            _registered_method=True)
-
-    @staticmethod
-    def ExactJoinTables(request,
-            target,
-            options=(),
-            channel_credentials=None,
-            call_credentials=None,
-            insecure=False,
-            compression=None,
-            wait_for_ready=None,
-            timeout=None,
-            metadata=None):
-        return grpc.experimental.unary_unary(
-            request,
-            target,
-            '/io.deephaven.proto.backplane.grpc.TableService/ExactJoinTables',
-            deephaven_dot_proto_dot_table__pb2.ExactJoinTablesRequest.SerializeToString,
-            deephaven_dot_proto_dot_table__pb2.ExportedTableCreationResponse.FromString,
-            options,
-            channel_credentials,
-            insecure,
-            call_credentials,
-            compression,
-            wait_for_ready,
-            timeout,
-            metadata,
-            _registered_method=True)
-
-    @staticmethod
-    def LeftJoinTables(request,
-            target,
-            options=(),
-            channel_credentials=None,
-            call_credentials=None,
-            insecure=False,
-            compression=None,
-            wait_for_ready=None,
-            timeout=None,
-            metadata=None):
-        return grpc.experimental.unary_unary(
-            request,
-            target,
-            '/io.deephaven.proto.backplane.grpc.TableService/LeftJoinTables',
-            deephaven_dot_proto_dot_table__pb2.LeftJoinTablesRequest.SerializeToString,
-            deephaven_dot_proto_dot_table__pb2.ExportedTableCreationResponse.FromString,
-            options,
-            channel_credentials,
-            insecure,
-            call_credentials,
-            compression,
-            wait_for_ready,
-            timeout,
-            metadata,
-            _registered_method=True)
-
-    @staticmethod
-    def AsOfJoinTables(request,
-            target,
-            options=(),
-            channel_credentials=None,
-            call_credentials=None,
-            insecure=False,
-            compression=None,
-            wait_for_ready=None,
-            timeout=None,
-            metadata=None):
-        return grpc.experimental.unary_unary(
-            request,
-            target,
-            '/io.deephaven.proto.backplane.grpc.TableService/AsOfJoinTables',
-            deephaven_dot_proto_dot_table__pb2.AsOfJoinTablesRequest.SerializeToString,
-            deephaven_dot_proto_dot_table__pb2.ExportedTableCreationResponse.FromString,
-            options,
-            channel_credentials,
-            insecure,
-            call_credentials,
-            compression,
-            wait_for_ready,
-            timeout,
-            metadata,
-            _registered_method=True)
-
-    @staticmethod
-    def AjTables(request,
-            target,
-            options=(),
-            channel_credentials=None,
-            call_credentials=None,
-            insecure=False,
-            compression=None,
-            wait_for_ready=None,
-            timeout=None,
-            metadata=None):
-        return grpc.experimental.unary_unary(
-            request,
-            target,
-            '/io.deephaven.proto.backplane.grpc.TableService/AjTables',
-            deephaven_dot_proto_dot_table__pb2.AjRajTablesRequest.SerializeToString,
-            deephaven_dot_proto_dot_table__pb2.ExportedTableCreationResponse.FromString,
-            options,
-            channel_credentials,
-            insecure,
-            call_credentials,
-            compression,
-            wait_for_ready,
-            timeout,
-            metadata,
-            _registered_method=True)
-
-    @staticmethod
-    def RajTables(request,
-            target,
-            options=(),
-            channel_credentials=None,
-            call_credentials=None,
-            insecure=False,
-            compression=None,
-            wait_for_ready=None,
-            timeout=None,
-            metadata=None):
-        return grpc.experimental.unary_unary(
-            request,
-            target,
-            '/io.deephaven.proto.backplane.grpc.TableService/RajTables',
-            deephaven_dot_proto_dot_table__pb2.AjRajTablesRequest.SerializeToString,
-            deephaven_dot_proto_dot_table__pb2.ExportedTableCreationResponse.FromString,
-            options,
-            channel_credentials,
-            insecure,
-            call_credentials,
-            compression,
-            wait_for_ready,
-            timeout,
-            metadata,
-            _registered_method=True)
-
-    @staticmethod
-    def MultiJoinTables(request,
-            target,
-            options=(),
-            channel_credentials=None,
-            call_credentials=None,
-            insecure=False,
-            compression=None,
-            wait_for_ready=None,
-            timeout=None,
-            metadata=None):
-        return grpc.experimental.unary_unary(
-            request,
-            target,
-            '/io.deephaven.proto.backplane.grpc.TableService/MultiJoinTables',
-            deephaven_dot_proto_dot_table__pb2.MultiJoinTablesRequest.SerializeToString,
-            deephaven_dot_proto_dot_table__pb2.ExportedTableCreationResponse.FromString,
-            options,
-            channel_credentials,
-            insecure,
-            call_credentials,
-            compression,
-            wait_for_ready,
-            timeout,
-            metadata,
-            _registered_method=True)
-
-    @staticmethod
-    def RangeJoinTables(request,
-            target,
-            options=(),
-            channel_credentials=None,
-            call_credentials=None,
-            insecure=False,
-            compression=None,
-            wait_for_ready=None,
-            timeout=None,
-            metadata=None):
-        return grpc.experimental.unary_unary(
-            request,
-            target,
-            '/io.deephaven.proto.backplane.grpc.TableService/RangeJoinTables',
-            deephaven_dot_proto_dot_table__pb2.RangeJoinTablesRequest.SerializeToString,
-            deephaven_dot_proto_dot_table__pb2.ExportedTableCreationResponse.FromString,
-            options,
-            channel_credentials,
-            insecure,
-            call_credentials,
-            compression,
-            wait_for_ready,
-            timeout,
-            metadata,
-            _registered_method=True)
-
-    @staticmethod
-    def ComboAggregate(request,
-            target,
-            options=(),
-            channel_credentials=None,
-            call_credentials=None,
-            insecure=False,
-            compression=None,
-            wait_for_ready=None,
-            timeout=None,
-            metadata=None):
-        return grpc.experimental.unary_unary(
-            request,
-            target,
-            '/io.deephaven.proto.backplane.grpc.TableService/ComboAggregate',
-            deephaven_dot_proto_dot_table__pb2.ComboAggregateRequest.SerializeToString,
-            deephaven_dot_proto_dot_table__pb2.ExportedTableCreationResponse.FromString,
-            options,
-            channel_credentials,
-            insecure,
-            call_credentials,
-            compression,
-            wait_for_ready,
-            timeout,
-            metadata,
-            _registered_method=True)
-
-    @staticmethod
-    def AggregateAll(request,
-            target,
-            options=(),
-            channel_credentials=None,
-            call_credentials=None,
-            insecure=False,
-            compression=None,
-            wait_for_ready=None,
-            timeout=None,
-            metadata=None):
-        return grpc.experimental.unary_unary(
-            request,
-            target,
-            '/io.deephaven.proto.backplane.grpc.TableService/AggregateAll',
-            deephaven_dot_proto_dot_table__pb2.AggregateAllRequest.SerializeToString,
-            deephaven_dot_proto_dot_table__pb2.ExportedTableCreationResponse.FromString,
-            options,
-            channel_credentials,
-            insecure,
-            call_credentials,
-            compression,
-            wait_for_ready,
-            timeout,
-            metadata,
-            _registered_method=True)
-
-    @staticmethod
-    def Aggregate(request,
-            target,
-            options=(),
-            channel_credentials=None,
-            call_credentials=None,
-            insecure=False,
-            compression=None,
-            wait_for_ready=None,
-            timeout=None,
-            metadata=None):
-        return grpc.experimental.unary_unary(
-            request,
-            target,
-            '/io.deephaven.proto.backplane.grpc.TableService/Aggregate',
-            deephaven_dot_proto_dot_table__pb2.AggregateRequest.SerializeToString,
-            deephaven_dot_proto_dot_table__pb2.ExportedTableCreationResponse.FromString,
-            options,
-            channel_credentials,
-            insecure,
-            call_credentials,
-            compression,
-            wait_for_ready,
-            timeout,
-            metadata,
-            _registered_method=True)
-
-    @staticmethod
-    def Snapshot(request,
-            target,
-            options=(),
-            channel_credentials=None,
-            call_credentials=None,
-            insecure=False,
-            compression=None,
-            wait_for_ready=None,
-            timeout=None,
-            metadata=None):
-        return grpc.experimental.unary_unary(
-            request,
-            target,
-            '/io.deephaven.proto.backplane.grpc.TableService/Snapshot',
-            deephaven_dot_proto_dot_table__pb2.SnapshotTableRequest.SerializeToString,
-            deephaven_dot_proto_dot_table__pb2.ExportedTableCreationResponse.FromString,
-            options,
-            channel_credentials,
-            insecure,
-            call_credentials,
-            compression,
-            wait_for_ready,
-            timeout,
-            metadata,
-            _registered_method=True)
-
-    @staticmethod
-    def SnapshotWhen(request,
-            target,
-            options=(),
-            channel_credentials=None,
-            call_credentials=None,
-            insecure=False,
-            compression=None,
-            wait_for_ready=None,
-            timeout=None,
-            metadata=None):
-        return grpc.experimental.unary_unary(
-            request,
-            target,
-            '/io.deephaven.proto.backplane.grpc.TableService/SnapshotWhen',
-            deephaven_dot_proto_dot_table__pb2.SnapshotWhenTableRequest.SerializeToString,
-            deephaven_dot_proto_dot_table__pb2.ExportedTableCreationResponse.FromString,
-            options,
-            channel_credentials,
-            insecure,
-            call_credentials,
-            compression,
-            wait_for_ready,
-            timeout,
-            metadata,
-            _registered_method=True)
-
-    @staticmethod
-    def Flatten(request,
-            target,
-            options=(),
-            channel_credentials=None,
-            call_credentials=None,
-            insecure=False,
-            compression=None,
-            wait_for_ready=None,
-            timeout=None,
-            metadata=None):
-        return grpc.experimental.unary_unary(
-            request,
-            target,
-            '/io.deephaven.proto.backplane.grpc.TableService/Flatten',
-            deephaven_dot_proto_dot_table__pb2.FlattenRequest.SerializeToString,
-            deephaven_dot_proto_dot_table__pb2.ExportedTableCreationResponse.FromString,
-            options,
-            channel_credentials,
-            insecure,
-            call_credentials,
-            compression,
-            wait_for_ready,
-            timeout,
-            metadata,
-            _registered_method=True)
-
-    @staticmethod
-    def RunChartDownsample(request,
-            target,
-            options=(),
-            channel_credentials=None,
-            call_credentials=None,
-            insecure=False,
-            compression=None,
-            wait_for_ready=None,
-            timeout=None,
-            metadata=None):
-        return grpc.experimental.unary_unary(
-            request,
-            target,
-            '/io.deephaven.proto.backplane.grpc.TableService/RunChartDownsample',
-            deephaven_dot_proto_dot_table__pb2.RunChartDownsampleRequest.SerializeToString,
-            deephaven_dot_proto_dot_table__pb2.ExportedTableCreationResponse.FromString,
-            options,
-            channel_credentials,
-            insecure,
-            call_credentials,
-            compression,
-            wait_for_ready,
-            timeout,
-            metadata,
-            _registered_method=True)
-
-    @staticmethod
-    def CreateInputTable(request,
-            target,
-            options=(),
-            channel_credentials=None,
-            call_credentials=None,
-            insecure=False,
-            compression=None,
-            wait_for_ready=None,
-            timeout=None,
-            metadata=None):
-        return grpc.experimental.unary_unary(
-            request,
-            target,
-            '/io.deephaven.proto.backplane.grpc.TableService/CreateInputTable',
-            deephaven_dot_proto_dot_table__pb2.CreateInputTableRequest.SerializeToString,
-            deephaven_dot_proto_dot_table__pb2.ExportedTableCreationResponse.FromString,
-            options,
-            channel_credentials,
-            insecure,
-            call_credentials,
-            compression,
-            wait_for_ready,
-            timeout,
-            metadata,
-            _registered_method=True)
-
-    @staticmethod
-    def WhereIn(request,
-            target,
-            options=(),
-            channel_credentials=None,
-            call_credentials=None,
-            insecure=False,
-            compression=None,
-            wait_for_ready=None,
-            timeout=None,
-            metadata=None):
-        return grpc.experimental.unary_unary(
-            request,
-            target,
-            '/io.deephaven.proto.backplane.grpc.TableService/WhereIn',
-            deephaven_dot_proto_dot_table__pb2.WhereInRequest.SerializeToString,
-            deephaven_dot_proto_dot_table__pb2.ExportedTableCreationResponse.FromString,
-            options,
-            channel_credentials,
-            insecure,
-            call_credentials,
-            compression,
-            wait_for_ready,
-            timeout,
-            metadata,
-            _registered_method=True)
-
-    @staticmethod
-    def Batch(request,
-            target,
-            options=(),
-            channel_credentials=None,
-            call_credentials=None,
-            insecure=False,
-            compression=None,
-            wait_for_ready=None,
-            timeout=None,
-            metadata=None):
-        return grpc.experimental.unary_stream(
-            request,
-            target,
-            '/io.deephaven.proto.backplane.grpc.TableService/Batch',
-            deephaven_dot_proto_dot_table__pb2.BatchTableRequest.SerializeToString,
-            deephaven_dot_proto_dot_table__pb2.ExportedTableCreationResponse.FromString,
-            options,
-            channel_credentials,
-            insecure,
-            call_credentials,
-            compression,
-            wait_for_ready,
-            timeout,
-            metadata,
-            _registered_method=True)
-
-    @staticmethod
-    def ExportedTableUpdates(request,
-            target,
-            options=(),
-            channel_credentials=None,
-            call_credentials=None,
-            insecure=False,
-            compression=None,
-            wait_for_ready=None,
-            timeout=None,
-            metadata=None):
-        return grpc.experimental.unary_stream(
-            request,
-            target,
-            '/io.deephaven.proto.backplane.grpc.TableService/ExportedTableUpdates',
-            deephaven_dot_proto_dot_table__pb2.ExportedTableUpdatesRequest.SerializeToString,
-            deephaven_dot_proto_dot_table__pb2.ExportedTableUpdateMessage.FromString,
-            options,
-            channel_credentials,
-            insecure,
-            call_credentials,
-            compression,
-            wait_for_ready,
-            timeout,
-            metadata,
-            _registered_method=True)
-
-    @staticmethod
-    def SeekRow(request,
-            target,
-            options=(),
-            channel_credentials=None,
-            call_credentials=None,
-            insecure=False,
-            compression=None,
-            wait_for_ready=None,
-            timeout=None,
-            metadata=None):
-        return grpc.experimental.unary_unary(
-            request,
-            target,
-            '/io.deephaven.proto.backplane.grpc.TableService/SeekRow',
-            deephaven_dot_proto_dot_table__pb2.SeekRowRequest.SerializeToString,
-            deephaven_dot_proto_dot_table__pb2.SeekRowResponse.FromString,
-            options,
-            channel_credentials,
-            insecure,
-            call_credentials,
-            compression,
-            wait_for_ready,
-            timeout,
-            metadata,
-            _registered_method=True)
-
-    @staticmethod
-    def MetaTable(request,
-            target,
-            options=(),
-            channel_credentials=None,
-            call_credentials=None,
-            insecure=False,
-            compression=None,
-            wait_for_ready=None,
-            timeout=None,
-            metadata=None):
-        return grpc.experimental.unary_unary(
-            request,
-            target,
-            '/io.deephaven.proto.backplane.grpc.TableService/MetaTable',
-            deephaven_dot_proto_dot_table__pb2.MetaTableRequest.SerializeToString,
-            deephaven_dot_proto_dot_table__pb2.ExportedTableCreationResponse.FromString,
-            options,
-            channel_credentials,
-            insecure,
-            call_credentials,
-            compression,
-            wait_for_ready,
-            timeout,
-            metadata,
-            _registered_method=True)
-
-    @staticmethod
-    def ComputeColumnStatistics(request,
-            target,
-            options=(),
-            channel_credentials=None,
-            call_credentials=None,
-            insecure=False,
-            compression=None,
-            wait_for_ready=None,
-            timeout=None,
-            metadata=None):
-        return grpc.experimental.unary_unary(
-            request,
-            target,
-            '/io.deephaven.proto.backplane.grpc.TableService/ComputeColumnStatistics',
-            deephaven_dot_proto_dot_table__pb2.ColumnStatisticsRequest.SerializeToString,
-            deephaven_dot_proto_dot_table__pb2.ExportedTableCreationResponse.FromString,
-            options,
-            channel_credentials,
-            insecure,
-            call_credentials,
-            compression,
-            wait_for_ready,
-            timeout,
-            metadata,
-            _registered_method=True)
diff --git a/py/client/pydeephaven/proto/ticket_pb2.py b/py/client/pydeephaven/proto/ticket_pb2.py
deleted file mode 100644
index d9e46dd398d..00000000000
--- a/py/client/pydeephaven/proto/ticket_pb2.py
+++ /dev/null
@@ -1,29 +0,0 @@
-# -*- coding: utf-8 -*-
-# Generated by the protocol buffer compiler.  DO NOT EDIT!
-# source: deephaven/proto/ticket.proto
-# Protobuf Python Version: 5.26.1
-"""Generated protocol buffer code."""
-from google.protobuf import descriptor as _descriptor
-from google.protobuf import descriptor_pool as _descriptor_pool
-from google.protobuf import symbol_database as _symbol_database
-from google.protobuf.internal import builder as _builder
-# @@protoc_insertion_point(imports)
-
-_sym_db = _symbol_database.Default()
-
-
-
-
-DESCRIPTOR = _descriptor_pool.Default().AddSerializedFile(b'\n\x1c\x64\x65\x65phaven/proto/ticket.proto\x12!io.deephaven.proto.backplane.grpc\"\x18\n\x06Ticket\x12\x0e\n\x06ticket\x18\x01 \x01(\x0c\"V\n\x0bTypedTicket\x12\x39\n\x06ticket\x18\x01 \x01(\x0b\x32).io.deephaven.proto.backplane.grpc.Ticket\x12\x0c\n\x04type\x18\x02 \x01(\tBBH\x01P\x01Z<github.com/deephaven/deephaven-core/go/internal/proto/ticketb\x06proto3')
-
-_globals = globals()
-_builder.BuildMessageAndEnumDescriptors(DESCRIPTOR, _globals)
-_builder.BuildTopDescriptorsAndMessages(DESCRIPTOR, 'deephaven.proto.ticket_pb2', _globals)
-if not _descriptor._USE_C_DESCRIPTORS:
-  _globals['DESCRIPTOR']._loaded_options = None
-  _globals['DESCRIPTOR']._serialized_options = b'H\001P\001Z<github.com/deephaven/deephaven-core/go/internal/proto/ticket'
-  _globals['_TICKET']._serialized_start=67
-  _globals['_TICKET']._serialized_end=91
-  _globals['_TYPEDTICKET']._serialized_start=93
-  _globals['_TYPEDTICKET']._serialized_end=179
-# @@protoc_insertion_point(module_scope)
diff --git a/py/client/pydeephaven/session.py b/py/client/pydeephaven/session.py
index 6581306b167..abf9f062476 100644
--- a/py/client/pydeephaven/session.py
+++ b/py/client/pydeephaven/session.py
@@ -11,7 +11,6 @@
 from random import random
 import threading
 from typing import Any, Dict, Iterable, List, Union, Tuple, NewType
-from uuid import uuid4
 
 import grpc
 import pyarrow as pa
@@ -28,10 +27,10 @@
 from pydeephaven._session_service import SessionService
 from pydeephaven._table_ops import TimeTableOp, EmptyTableOp, MergeTablesOp, FetchTableOp, CreateInputTableOp
 from pydeephaven._table_service import TableService
+from pydeephaven.ticket import SharedTicket, ExportTicket, ScopeTicket, Ticket, ServerObject, _server_object_from_proto
 from pydeephaven._utils import to_list
 from pydeephaven.dherror import DHError
 from pydeephaven.experimental.plugin_client import PluginClient
-from pydeephaven.proto import ticket_pb2
 from pydeephaven.query import Query
 from pydeephaven.table import Table, InputTable
 
@@ -77,34 +76,6 @@ def _trace(who: str) -> None:
     logger.debug(f'TRACE: {who}')
 
 
-class SharedTicket:
-    """ A SharedTicket object represents a ticket that can be shared with other sessions. """
-
-    def __init__(self, ticket_bytes: bytes):
-        """Initializes a SharedTicket object
-
-        Args:
-            ticket_bytes (bytes): the raw bytes for the ticket
-        """
-        self._ticket_bytes = ticket_bytes
-        self.api_ticket = ticket_pb2.Ticket(ticket=self._ticket_bytes)
-
-    @property
-    def bytes(self) -> bytes:
-        """ The raw bytes for the ticket."""
-        return self._ticket_bytes
-
-    @classmethod
-    def random_ticket(cls) -> SharedTicket:
-        """Generates a random shared ticket. To minimize the probability of collision, the ticket is made from a
-        generated UUID.
-
-        Returns:
-            a SharedTicket object
-        """
-        bytes_ = uuid4().int.to_bytes(16, byteorder='little', signed=False)
-        return cls(ticket_bytes=b'h' + bytes_)
-
 _BidiRpc = NewType("_BidiRpc", grpc.StreamStreamMultiCallable)
 
 _NotBidiRpc = NewType(
@@ -114,8 +85,9 @@ def random_ticket(cls) -> SharedTicket:
         grpc.UnaryStreamMultiCallable,
         grpc.StreamUnaryMultiCallable])
 
+
 class Session:
-    """A Session object represents a connection to the Deephaven data server. It contains a number of convenience
+    """A Session represents a connection to the Deephaven data server. It contains a number of convenience
     methods for asking the server to create tables, import Arrow data into tables, merge tables, run Python scripts, and
     execute queries.
 
@@ -176,7 +148,7 @@ def __init__(self, host: str = None,
         _trace('Session.__init__')
         self._r_lock = threading.RLock()  # for thread-safety when accessing/changing session global state
         self._services_lock = threading.Lock()  # for lazy initialization of services
-        self._last_ticket = 0
+        self._last_export_ticket_number: int = 0
         self._ticket_bitarray = BitArray(1024)
 
         self.host = host
@@ -279,10 +251,10 @@ def tables(self):
                     field.application_id == 'scope' and field.typed_ticket.type == 'Table']
 
     @property
-    def exportable_objects(self) -> Dict[str, ticket_pb2.TypedTicket]:
+    def exportable_objects(self) -> Dict[str, ServerObject]:
         with self._r_lock:
             fields = self._fetch_fields()
-            return {field.field_name: field.typed_ticket for field in fields if field.application_id == 'scope'}
+            return {field.field_name: _server_object_from_proto(field.typed_ticket) for field in fields}
 
     @property
     def grpc_metadata(self):
@@ -360,19 +332,18 @@ def plugin_object_service(self) -> PluginObjService:
                     self._plugin_obj_service = PluginObjService(self)
         return self._plugin_obj_service
 
-    def make_ticket(self, ticket_no=None):
+    def make_export_ticket(self, ticket_no: int = None) -> ExportTicket:
         if not ticket_no:
-            ticket_no = self.get_ticket()
-        ticket_bytes = ticket_no.to_bytes(4, byteorder='little', signed=True)
-        return ticket_pb2.Ticket(ticket=b'e' + ticket_bytes)
+            ticket_no = self.next_export_ticket_number()
+        return ExportTicket.export_ticket(ticket_no)
 
-    def get_ticket(self):
+    def next_export_ticket_number(self) -> int:
         with self._r_lock:
-            self._last_ticket += 1
-            if self._last_ticket == 2 ** 31 - 1:
+            self._last_export_ticket_number += 1
+            if self._last_export_ticket_number == 2 ** 31 - 1:
                 raise DHError("fatal error: out of free internal ticket")
 
-            return self._last_ticket
+            return self._last_export_ticket_number
 
     def _fetch_fields(self):
         """Returns a list of available fields on the server.
@@ -426,7 +397,7 @@ def _connect(self):
             # started together don't align retries.
             skew = random()
             # Backoff schedule for retries after consecutive failures to refresh auth token
-            self._refresh_backoff = [ skew + 0.1, skew + 1, skew + 10 ]
+            self._refresh_backoff = [skew + 0.1, skew + 1, skew + 10]
 
             if self._refresh_backoff[0] > self._timeout_seconds:
                 raise DHError(f'server configuration http.session.durationMs={session_duration} is too small.')
@@ -511,10 +482,15 @@ def close(self) -> None:
             self.session_service.close()
             self.grpc_channel.close()
             self.is_connected = False
-            self._last_ticket = 0
+            self._last_export_ticket_number = 0
             self._flight_client.close()
 
-    def release(self, ticket):
+    def release(self, ticket: ExportTicket) -> None:
+        """Releases an export ticket.
+
+        Args:
+            ticket (Ticket): the ticket to release
+        """
         self.session_service.release(ticket)
 
     # convenience/factory methods
@@ -543,7 +519,7 @@ def open_table(self, name: str) -> Table:
         Raises:
             DHError
         """
-        ticket = ticket_pb2.Ticket(ticket=f's/{name}'.encode(encoding='ascii'))
+        ticket = ScopeTicket.scope_ticket(name)
 
         faketable = Table(session=self, ticket=ticket)
 
@@ -572,6 +548,42 @@ def bind_table(self, name: str, table: Table) -> None:
         """
         self.console_service.bind_table(table=table, variable_name=name)
 
+    def publish(self, source_ticket: Ticket, result_ticket: Ticket) -> None:
+        """ Publishes a source ticket to the result ticket.
+
+        This is low-level method that can be used to publish non-Table server objects that are previously
+        fetched from the server. The source ticket represents the previously fetched server object to be published, and
+        the result ticket, which should normally be a SharedTicket, is the ticket to publish to. The result ticket can
+        then be fetched by other sessions to access the object as long as the object is not released. This method is
+        used together with the :meth:`.fetch` method to share server objects between sessions.
+
+        Args:
+            source_ticket (Ticket): The source ticket to publish from.
+            result_ticket (Ticket): The result ticket to publish to.
+
+        Raises:
+            DHError: If the operation fails.
+        """
+        self._session_service.publish(source_ticket, result_ticket)
+
+    def fetch(self, ticket: Ticket) -> ExportTicket:
+        """Fetches a server object by ticket.
+
+        This is low-level method that can be used to fetch non-Table server objects. The ticket represents a
+        fetchable server object, e.g :class:`~.plugin_client.PluginClient`, :class:`~.plugin_client.Fetchable`.
+        This method is used together with the :meth:`.publish` method to share server objects between sessions.
+
+        Args:
+            ticket (Ticket): a ticket
+
+        Returns:
+            an ExportTicket object
+
+        Raises:
+            DHError
+        """
+        return self._session_service.fetch(ticket)
+
     def publish_table(self, ticket: SharedTicket, table: Table) -> None:
         """Publishes a table to the given shared ticket. The ticket can then be used by another session to fetch the
         table.
@@ -588,7 +600,7 @@ def publish_table(self, ticket: SharedTicket, table: Table) -> None:
         Raises:
             DHError
         """
-        self._session_service.publish(table.ticket, ticket.api_ticket)
+        self.publish(table.ticket, ticket)
 
     def fetch_table(self, ticket: SharedTicket) -> Table:
         """Fetches a table by ticket.
@@ -602,16 +614,10 @@ def fetch_table(self, ticket: SharedTicket) -> Table:
         Raises:
             DHError
         """
-        table = Table(session=self, ticket=ticket.api_ticket)
         try:
-            table_op = FetchTableOp()
-            return self.table_service.grpc_table_op(table, table_op)
+            return self.table_service.fetch_etcr(ticket.pb_ticket)
         except Exception as e:
             raise DHError("could not fetch table by ticket") from e
-        finally:
-            # Explicitly close the table without releasing it (because it isn't ours)
-            table.ticket = None
-            table.schema = None
 
     def time_table(self, period: Union[int, str], start_time: Union[int, str] = None,
                    blink_table: bool = False) -> Table:
@@ -726,11 +732,11 @@ def input_table(self, schema: pa.Schema = None, init_table: Table = None,
         input_table.key_cols = key_cols
         return input_table
 
-    def plugin_client(self, exportable_obj: ticket_pb2.TypedTicket) -> PluginClient:
+    def plugin_client(self, server_obj: ServerObject) -> PluginClient:
         """Wraps a ticket as a PluginClient. Capabilities here vary based on the server implementation of the ObjectType,
         but most will at least send a response payload to the client, possibly including references to other objects.
         In some cases, depending on the server implementation, the client will also be able to send the same sort of
         messages back to the server.
 
         Part of the experimental plugin API."""
-        return PluginClient(self, exportable_obj)
+        return PluginClient(self, server_obj)
diff --git a/py/client/pydeephaven/table.py b/py/client/pydeephaven/table.py
index 6339a7199c3..fb8d221fac5 100644
--- a/py/client/pydeephaven/table.py
+++ b/py/client/pydeephaven/table.py
@@ -6,19 +6,19 @@
 
 from __future__ import annotations
 
-from typing import List, Union
+from typing import List, Union, Sequence
 
 import pyarrow as pa
+
 from pydeephaven._utils import to_list
 
-from pydeephaven._table_ops import MetaTableOp, SortDirection
+from pydeephaven._table_ops import MetaTableOp, SortDirection, MultijoinTablesOp
 from pydeephaven.agg import Aggregation
 from pydeephaven.dherror import DHError
 from pydeephaven._table_interface import TableInterface
+from pydeephaven.ticket import Ticket, ServerObject
 from pydeephaven.updateby import UpdateByOperation
 
-from pydeephaven.experimental.server_object import ServerObject
-
 
 class Table(TableInterface, ServerObject):
     """A Table object represents a reference to a table on the server. It is the core data structure of
@@ -35,12 +35,11 @@ class Table(TableInterface, ServerObject):
     def table_op_handler(self, table_op):
         return self.session.table_service.grpc_table_op(self, table_op)
 
-    def __init__(self, session, ticket, schema_header=b'', size=None, is_static=None, schema=None):
-        ServerObject.__init__(self, type_="Table", ticket=ticket)
+    def __init__(self, session: 'Session', ticket: Ticket, schema_header: bytes = b'', size: int = None, is_static: bool = None, schema: pa.Schema = None):
+        ServerObject.__init__(self, type="Table", ticket=ticket)
         if not session or not session.is_alive:
             raise DHError("Must be associated with a active session")
         self.session = session
-        self.ticket = ticket
         self.schema = schema
         self.is_static = is_static
         self.size = size
@@ -74,7 +73,7 @@ def close(self) -> None:
         Raises:
             DHError
         """
-        self.session.release(self.ticket)
+        self.session.release(self)
         self.ticket = None
 
     def _parse_schema(self, schema_header):
@@ -757,6 +756,45 @@ def where_not_in(self, filter_table: Table, cols: Union[str, List[str]]) -> Tabl
             DHError
         """
         return super(Table, self).where_not_in(filter_table, cols)
+    
+    def slice(self, start: int, stop: int) -> Table:
+        """Extracts a subset of a table by row positions into a new Table.
+
+        If both the start and the stop are positive, then both are counted from the beginning of the table.
+        The start is inclusive, and the stop is exclusive. slice(0, N) is equivalent to :meth:`~Table.head` (N)
+        The start must be less than or equal to the stop.
+
+        If the start is positive and the stop is negative, then the start is counted from the beginning of the
+        table, inclusively. The stop is counted from the end of the table. For example, slice(1, -1) includes all
+        rows but the first and last. If the stop is before the start, the result is an empty table.
+
+        If the start is negative, and the stop is zero, then the start is counted from the end of the table,
+        and the end of the slice is the size of the table. slice(-N, 0) is equivalent to :meth:`~Table.tail` (N).
+
+        If the start is negative and the stop is negative, they are both counted from the end of the
+        table. For example, slice(-2, -1) returns the second to last row of the table.
+
+        Args:
+            start (int): the first row position to include in the result
+            stop (int): the last row position to include in the result
+
+        Returns:
+            a new Table
+
+        Raises:
+            DHError
+
+        Examples:
+            >>> table.slice(0, 5)    # first 5 rows
+            >>> table.slice(-5, 0)   # last 5 rows
+            >>> table.slice(2, 6)    # rows from index 2 to 5
+            >>> table.slice(6, 2)    # ERROR: cannot slice start after end
+            >>> table.slice(-6, -2)  # rows from 6th last to 2nd last (exclusive)
+            >>> table.slice(-2, -6)  # ERROR: cannot slice start after end
+            >>> table.slice(2, -3)   # all rows except the first 2 and the last 3
+            >>> table.slice(-6, 8)   # rows from 6th last to index 8 (exclusive)
+        """
+        return super(Table, self).slice(start, stop)
 
 
 class InputTable(Table):
@@ -805,3 +843,81 @@ def delete(self, table: Table) -> None:
             self.session.input_table_service.delete(self, table)
         except Exception as e:
             raise DHError("delete data in the InputTable failed.") from e
+
+
+class MultiJoinTable:
+    """A MultiJoinTable is an object that contains the result of a multi-table natural join. To retrieve the underlying
+    result Table, use the :attr:`.table` property. """
+
+    def __init__(self, table: Table):
+        self._table = table
+
+    @property
+    def table(self) -> Table:
+        """Returns the Table containing the multi-table natural join output. """
+        return self._table
+
+
+class MultiJoinInput:
+    """A MultiJoinInput represents the input tables, key columns and additional columns to be used in the multi-table
+    natural join.
+    """
+    table: Table
+    on: Union[str, Sequence[str]]
+    joins: Union[str, Sequence[str]] = None
+
+    def __init__(self, table: Table, on: Union[str, Sequence[str]], joins: Union[str, Sequence[str]] = None):
+        """Initializes a MultiJoinInput object.
+
+        Args:
+            table (Table): the right table to include in the join
+            on (Union[str, Sequence[str]]): the column(s) to match, can be a common name or an equality expression that
+                matches every input table, i.e. "col_a = col_b" to rename output column names.
+            joins (Union[str, Sequence[str]], optional): the column(s) to be added from the table to the result
+                table, can be renaming expressions, i.e. "new_col = col"; default is None
+        """
+        self.table = table
+        self.on = to_list(on)
+        self.joins = to_list(joins)
+
+
+def multi_join(input: Union[Table, Sequence[Table], MultiJoinInput, Sequence[MultiJoinInput]],
+               on: Union[str, Sequence[str]] = None) -> MultiJoinTable:
+    """ The multi_join method creates a new table by performing a multi-table natural join on the input tables. The
+    result consists of the set of distinct keys from the input tables natural joined to each input table. Input
+    tables need not have a matching row for each key, but they may not have multiple matching rows for a given key.
+
+    Args:
+        input (Union[Table, Sequence[Table], MultiJoinInput, Sequence[MultiJoinInput]]): the input objects specifying the
+            tables and columns to include in the join.
+        on (Union[str, Sequence[str]], optional): the column(s) to match, can be a common name or an equality expression
+            that matches every input table, i.e. "col_a = col_b" to rename output column names. Note: When
+            MultiJoinInput objects are supplied, this parameter must be omitted.
+
+    Returns:
+        MultiJoinTable: the result of the multi-table natural join operation.  To access the underlying Table, use the
+            :attr:`~MultiJoinTable.table` property.
+
+    Raises:
+        DHError
+    """
+    if isinstance(input, Table) or (isinstance(input, Sequence) and all(isinstance(t, Table) for t in input)):
+        tables = to_list(input)
+        session = tables[0].session
+        if not all([t.session == session for t in tables]):
+            raise DHError(message="all tables must be from the same session.")
+        multi_join_inputs = [MultiJoinInput(table=t, on=on) for t in tables]
+    elif isinstance(input, MultiJoinInput) or (
+            isinstance(input, Sequence) and all(isinstance(ji, MultiJoinInput) for ji in input)):
+        if on is not None:
+            raise DHError(message="on parameter is not permitted when MultiJoinInput objects are provided.")
+        multi_join_inputs = to_list(input)
+        session = multi_join_inputs[0].table.session
+        if not all([mji.table.session == session for mji in multi_join_inputs]):
+            raise DHError(message="all tables must be from the same session.")
+    else:
+        raise DHError(
+            message="input must be a Table, a sequence of Tables, a MultiJoinInput, or a sequence of MultiJoinInputs.")
+
+    table_op = MultijoinTablesOp(multi_join_inputs=multi_join_inputs)
+    return MultiJoinTable(table=session.table_service.grpc_table_op(None, table_op, table_class=Table))
diff --git a/py/client/pydeephaven/ticket.py b/py/client/pydeephaven/ticket.py
new file mode 100644
index 00000000000..7bd3fd4c101
--- /dev/null
+++ b/py/client/pydeephaven/ticket.py
@@ -0,0 +1,230 @@
+#
+# Copyright (c) 2016-2024 Deephaven Data Labs and Patent Pending
+#
+from __future__ import annotations
+
+from abc import ABC, abstractmethod
+from typing import Optional
+from uuid import uuid4
+
+from pydeephaven.dherror import DHError
+from deephaven_core.proto import ticket_pb2
+
+
+class Ticket(ABC):
+    """A Ticket references an object on the server. """
+    _ticket_bytes: bytes
+
+    @abstractmethod
+    def __init__(self, ticket_bytes: bytes):
+        self._ticket_bytes = ticket_bytes
+
+    @property
+    def bytes(self) -> bytes:
+        """ Returns the ticket as raw bytes. """
+        return self._ticket_bytes
+
+    @property
+    def pb_ticket(self) -> ticket_pb2.Ticket:
+        """ Returns the ticket as a gRPC protobuf ticket. """
+        return ticket_pb2.Ticket(ticket=self._ticket_bytes)
+
+
+class SharedTicket(Ticket):
+    """ A SharedTicket is a ticket that can be shared with other sessions. """
+
+    def __init__(self, ticket_bytes: bytes):
+        """Initializes a SharedTicket.
+
+        Args:
+            ticket_bytes (bytes): the raw bytes for the ticket
+        """
+        if not ticket_bytes:
+            raise DHError('SharedTicket: ticket_bytes is None')
+        elif not ticket_bytes.startswith(b'h'):
+            raise DHError(f'SharedTicket: ticket {ticket_bytes} is not a shared ticket')
+        super().__init__(ticket_bytes)
+
+    @classmethod
+    def random_ticket(cls) -> SharedTicket:
+        """Generates a random shared ticket. To minimize the probability of collision, the ticket is made from a
+        generated UUID.
+
+        Returns:
+            a SharedTicket
+        """
+        bytes_ = uuid4().int.to_bytes(16, byteorder='little', signed=False)
+        return cls(ticket_bytes=b'h' + bytes_)
+
+
+class ExportTicket(Ticket):
+    """An ExportTicket is a ticket that references an object exported from the server such as a table or a plugin widget.
+    An exported server object will remain available on the server until the ticket is released or the session is
+    closed. Many types of server objects are exportable and can be fetched to the client as an export ticket or as an
+    instance of wrapper class (such as :class:`~.table.Table`, :class:`~.plugin_client.PluginClient`, etc.) that wraps the
+    export ticket. An export ticket can be published to a :class:`.SharedTicket` so that the exported server object can
+    be shared with other sessions.
+
+    Note: Users should not create ExportTickets directly. They are managed by the Session and are automatically created
+    when exporting objects from the server via. :meth:`.Session.open_table`, :meth:`.Session.fetch`, and any operations
+    that return a Table.
+    """
+
+    def __init__(self, ticket_bytes: bytes):
+        """Initializes an ExportTicket.
+
+        Args:
+            ticket_bytes (bytes): the raw bytes for the ticket
+        """
+        if not ticket_bytes:
+            raise DHError('ExportTicket: ticket is None')
+        elif not ticket_bytes.startswith(b'e'):
+            raise DHError(f'ExportTicket: ticket {ticket_bytes} is not an export ticket')
+
+        super().__init__(ticket_bytes)
+
+    @classmethod
+    def export_ticket(cls, ticket_no: int) -> ExportTicket:
+        """Creates an export ticket from a ticket number.
+
+        Args:
+            ticket_no (int): the export ticket number
+
+        Returns:
+            an ExportTicket
+        """
+        ticket_bytes = ticket_no.to_bytes(4, byteorder='little', signed=True)
+        return cls(b'e' + ticket_bytes)
+
+
+class ScopeTicket(Ticket):
+    """A ScopeTicket is a ticket that references a scope variable on the server. Scope variables are variables in the global
+    scope of the server and are accessible to all sessions. Scope variables can be fetched to the client as an export
+    ticket or a Deephaven :class:`~.table.Table` that wraps the export ticket. """
+
+    def __init__(self, ticket_bytes: bytes):
+        """Initializes a ScopeTicket.
+
+        Args:
+            ticket_bytes (bytes): the raw bytes for the ticket
+        """
+        if not ticket_bytes:
+            raise DHError('ScopeTicket: ticket is None')
+        elif not ticket_bytes.startswith(b's/'):
+            raise DHError(f'ScopeTicket: ticket {ticket_bytes} is not a scope ticket')
+
+        super().__init__(ticket_bytes)
+
+    @classmethod
+    def scope_ticket(cls, name: str) -> ScopeTicket:
+        """Creates a scope ticket that references a scope variable by name.
+
+        Args:
+            name (str): the name of the scope variable
+
+        Returns:
+            a ScopeTicket
+        """
+        if not name:
+            raise DHError('scope_ticket: name must be a non-empty string')
+
+        return cls(ticket_bytes=f's/{name}'.encode(encoding='ascii'))
+
+
+class ApplicationTicket(Ticket):
+    """An ApplicationTicket is a ticket that references a field of an application on the server. Please refer to the
+    documentation on 'Application Mode' for detailed information on applications and their use cases."""
+
+    def __init__(self, ticket_bytes: bytes):
+        """Initializes an ApplicationTicket.
+
+        Args:
+            ticket_bytes (bytes): the raw bytes for the ticket
+        """
+        if not ticket_bytes:
+            raise DHError('ApplicationTicket: ticket is None')
+        elif not ticket_bytes.startswith(b'a/'):
+            raise DHError(f'ApplicationTicket: ticket {ticket_bytes} is not an application ticket')
+        elif len(ticket_bytes.split(b'/')) != 4:
+            raise DHError(f'ApplicationTicket: ticket {ticket_bytes} is not in the correct format')
+
+        self.app_id = ticket_bytes.split(b'/')[1].decode(encoding='ascii')
+        self.field = ticket_bytes.split(b'/')[3].decode(encoding='ascii')
+
+        super().__init__(ticket_bytes)
+
+    @classmethod
+    def app_ticket(cls, app_id: str, field: str) -> ApplicationTicket:
+        """Creates an application ticket that references a field of an application.
+
+        Args:
+            app_id (str): the application id
+            field (str): the name of the application field
+
+        Returns:
+            an ApplicationTicket
+        """
+        if not app_id:
+            raise DHError('app_ticket: app_id must be a non-empty string')
+        if not field:
+            raise DHError('app_ticket: field must be a non-empty string')
+
+        return cls(ticket_bytes=f'a/{app_id}/f/{field}'.encode(encoding='ascii'))
+
+
+def _ticket_from_proto(ticket: ticket_pb2.Ticket) -> Ticket:
+    """Creates a Ticket from a gRPC protobuf ticket.
+
+    Args:
+        ticket (ticket_pb2.Ticket): the gRPC protobuf ticket
+
+    Returns:
+        a Ticket
+
+    Raises:
+        DHError: if the ticket type is unknown
+    """
+    ticket_bytes = ticket.ticket
+    if ticket_bytes.startswith(b'h'):
+        return SharedTicket(ticket_bytes)
+    elif ticket_bytes.startswith(b'e'):
+        return ExportTicket(ticket_bytes)
+    elif ticket_bytes.startswith(b's/'):
+        return ScopeTicket(ticket_bytes)
+    elif ticket_bytes.startswith(b'a/'):
+        return ApplicationTicket(ticket_bytes)
+    else:
+        raise DHError(f'Unknown ticket type: {ticket_bytes}')
+
+
+class ServerObject:
+    """ A ServerObject is a typed ticket that represents objects existing on the server that can be referenced by the
+    client. It is presently used to enable client API users to send and receive references to server-side plugins.
+    """
+    type: Optional[str]
+    """The type of the object. May be None, indicating that the instance cannot be connected to or otherwise directly
+    used from the client."""
+
+    ticket: Ticket
+    """The ticket that points to the object on the server."""
+
+    def __init__(self, type: Optional[str], ticket: Ticket):
+        self.type = type
+        self.ticket = ticket
+
+    @property
+    def pb_ticket(self) -> ticket_pb2.Ticket:
+        """Returns the ticket as a gRPC protobuf ticket object."""
+        return self.ticket.pb_ticket
+
+    @property
+    def pb_typed_ticket(self) -> ticket_pb2.TypedTicket:
+        """Returns a protobuf typed ticket, suitable for use in communicating with an ObjectType plugin on the server.
+        """
+        return ticket_pb2.TypedTicket(type=self.type, ticket=self.pb_ticket)
+
+
+def _server_object_from_proto(typed_ticket: ticket_pb2.TypedTicket) -> ServerObject:
+    """ Creates a ServerObject from a gRPC protobuf typed ticket object.
+    """
+    return ServerObject(type=typed_ticket.type, ticket=_ticket_from_proto(typed_ticket.ticket))
diff --git a/py/client/pydeephaven/updateby.py b/py/client/pydeephaven/updateby.py
index 1e5f8db1563..3b65cbb94eb 100644
--- a/py/client/pydeephaven/updateby.py
+++ b/py/client/pydeephaven/updateby.py
@@ -10,7 +10,7 @@
 
 from ._utils import to_list
 from .dherror import DHError
-from pydeephaven.proto import table_pb2
+from deephaven_core.proto import table_pb2
 
 _GrpcUpdateByOperation = table_pb2.UpdateByRequest.UpdateByOperation
 _GrpcUpdateByColumn = _GrpcUpdateByOperation.UpdateByColumn
diff --git a/py/client/requirements-dev.txt b/py/client/requirements-dev.txt
index 5d9603fd665..ffe87409595 100644
--- a/py/client/requirements-dev.txt
+++ b/py/client/requirements-dev.txt
@@ -7,4 +7,3 @@ wheel
 sphinx
 bitstring
 unittest-xml-reporting
-timeout-decorator
diff --git a/py/client/setup.py b/py/client/setup.py
index c4719d404ad..2f8181684d1 100644
--- a/py/client/setup.py
+++ b/py/client/setup.py
@@ -9,13 +9,15 @@
 # install extra dependencies, at least until we can more properly manage the build environment (pyproject.toml).
 # TODO(deephaven-core#2233): upgrade setup.py to pyproject.toml
 from pkg_resources import parse_version
-from setuptools import find_packages, setup
+from setuptools import setup, find_namespace_packages
+
 
 def _get_readme() -> str:
     # The directory containing this file
-    HERE = pathlib.Path(__file__).parent
+    here = pathlib.Path(__file__).parent
     # The text of the README file
-    return (HERE / "README.md").read_text(encoding="utf-8")
+    return (here / "README.md").read_text(encoding="utf-8")
+
 
 def _normalize_version(java_version):
     partitions = java_version.partition("-")
@@ -24,16 +26,18 @@ def _normalize_version(java_version):
     python_version = f"{regular_version}+{local_segment}" if local_segment else regular_version
     return str(parse_version(python_version))
 
+
 def _compute_version():
     return _normalize_version(os.environ['DEEPHAVEN_VERSION'])
 
+
 setup(
     name='pydeephaven',
     version=_compute_version(),
     description='The Deephaven Python Client',
     long_description=_get_readme(),
     long_description_content_type="text/markdown",
-    packages=find_packages(exclude=("tests",)),
+    packages=find_namespace_packages(exclude=("tests", "examples", "docs.source", "build")),
     url='https://deephaven.io/',
     license='Deephaven Community License Agreement Version 1.0',
     author='Deephaven Data Labs',
@@ -54,6 +58,7 @@ def _compute_version():
     install_requires=['pyarrow',
                       'bitstring',
                       'grpcio',
-                      'protobuf'],
+                      'protobuf',
+                      'numpy'],
     package_data={'pydeephaven': ['py.typed']}
 )
diff --git a/py/client/tests/test_console.py b/py/client/tests/test_console.py
index 51f98fb331e..31176d1f393 100644
--- a/py/client/tests/test_console.py
+++ b/py/client/tests/test_console.py
@@ -48,7 +48,7 @@ def vectorized_func(x, y):
         self.assertIn('demo_table', self.session.tables)
         pa_table = self.session.open_table('demo_table').to_arrow()
         df = pa_table.to_pandas()
-        self.assertEquals(1000, len(df.index))
+        self.assertEqual(1000, len(df.index))
 
     def test_open_invalid_table(self):
         with self.assertRaises(DHError):
diff --git a/py/client/tests/test_multi_session.py b/py/client/tests/test_multi_session.py
index a89407ce644..ab6dfbc8d85 100644
--- a/py/client/tests/test_multi_session.py
+++ b/py/client/tests/test_multi_session.py
@@ -3,12 +3,11 @@
 #
 import unittest
 
-import timeout_decorator
+import time
 
 from pydeephaven import Session
 from tests.testbase import BaseTestCase
 
-
 class MultiSessionTestCase(BaseTestCase):
     def test_persistent_tables(self):
         with Session() as session1:
@@ -28,16 +27,14 @@ def test_shared_tables(self):
         t = session2.empty_table(10)
         session2.bind_table('t', t)
 
-        @timeout_decorator.timeout(seconds=1)
-        def wait_for_table():
-            while 't' not in session1.tables:
-                pass
-
-        try:
-            wait_for_table()
-        except timeout_decorator.TimeoutError:
-            self.fail('table did not get synced to session1')
-
+        t0 = time.time()
+        deadline_seconds = 1.2
+        while 't' not in session1.tables:
+            t1 = time.time()
+            if t1 - t0 > deadline_seconds:
+                self.fail('table did not get synced to session1')
+                return
+            time.sleep(0.1)
 
 if __name__ == '__main__':
-    unittest.main()
\ No newline at end of file
+    unittest.main()
diff --git a/py/client/tests/test_multijoin.py b/py/client/tests/test_multijoin.py
new file mode 100644
index 00000000000..a8ca376d169
--- /dev/null
+++ b/py/client/tests/test_multijoin.py
@@ -0,0 +1,127 @@
+#
+# Copyright (c) 2016-2024 Deephaven Data Labs and Patent Pending
+#
+import unittest
+
+from pyarrow import csv
+
+from pydeephaven import DHError, Session
+from pydeephaven.table import MultiJoinInput, multi_join
+from tests.testbase import BaseTestCase
+
+
+class MultiJoinTestCase(BaseTestCase):
+    def setUp(self):
+        super().setUp()
+        pa_table = csv.read_csv(self.csv_file)
+        self.static_tableA = self.session.import_table(pa_table).select(["a", "b", "c1=c", "d1=d", "e1=e"])
+        self.static_tableB = self.static_tableA.update(["c2=c1+1", "d2=d1+2", "e2=e1+3"]).drop_columns(
+            ["c1", "d1", "e1"])
+        self.ticking_tableA = self.session.time_table("PT00:00:00.001").update(
+            ["a = i", "b = i*i % 13", "c1 = i * 13 % 23", "d1 = a + b", "e1 = a - b"]).drop_columns(["Timestamp"])
+        self.ticking_tableB = self.ticking_tableA.update(["c2=c1+1", "d2=d1+2", "e2=e1+3"]).drop_columns(
+            ["c1", "d1", "e1"])
+
+    def tearDown(self) -> None:
+        self.static_tableA = None
+        self.static_tableB = None
+        self.ticking_tableA = None
+        self.ticking_tableB = None
+        super().tearDown()
+
+    def test_static_simple(self):
+        # Test with multiple input tables
+        mj_table = multi_join(input=[self.static_tableA, self.static_tableB], on=["a", "b"])
+
+        # Output table is static
+        self.assertFalse(mj_table.table.is_refreshing)
+        # Output table has same # rows as sources
+        self.assertEqual(mj_table.table.size, self.static_tableA.size)
+        self.assertEqual(mj_table.table.size, self.static_tableB.size)
+
+        # Test with a single input table
+        mj_table = multi_join(self.static_tableA, ["a", "b"])
+
+        # Output table is static
+        self.assertFalse(mj_table.table.is_refreshing)
+        # Output table has same # rows as sources
+        self.assertEqual(mj_table.table.size, self.static_tableA.size)
+
+    def test_ticking_simple(self):
+        # Test with multiple input tables
+        mj_table = multi_join(input=[self.ticking_tableA, self.ticking_tableB], on=["a", "b"])
+
+        # Output table is refreshing
+        self.assertTrue(mj_table.table.is_refreshing)
+
+        # Test with a single input table
+        mj_table = multi_join(input=self.ticking_tableA, on=["a", "b"])
+
+        # Output table is refreshing
+        self.assertTrue(mj_table.table.is_refreshing)
+
+    def test_static(self):
+        # Test with multiple input
+        mj_input = [
+            MultiJoinInput(table=self.static_tableA, on=["key1=a", "key2=b"], joins=["c1", "e1"]),
+            MultiJoinInput(table=self.static_tableB, on=["key1=a", "key2=b"], joins=["d2"])
+        ]
+        mj_table = multi_join(mj_input)
+
+        # Output table is static
+        self.assertFalse(mj_table.table.is_refreshing)
+        # Output table has same # rows as sources
+        self.assertEqual(mj_table.table.size, self.static_tableA.size)
+        self.assertEqual(mj_table.table.size, self.static_tableB.size)
+
+        # Test with a single input
+        mj_table = multi_join(MultiJoinInput(table=self.static_tableA, on=["key1=a", "key2=b"], joins="c1"))
+
+        # Output table is static
+        self.assertFalse(mj_table.table.is_refreshing)
+        # Output table has same # rows as sources
+        self.assertEqual(mj_table.table.size, self.static_tableA.size)
+
+    def test_ticking(self):
+        # Test with multiple input
+        mj_input = [
+            MultiJoinInput(table=self.ticking_tableA, on=["key1=a", "key2=b"], joins=["c1", "e1"]),
+            MultiJoinInput(table=self.ticking_tableB, on=["key1=a", "key2=b"], joins=["d2"])
+        ]
+        mj_table = multi_join(mj_input)
+
+        # Output table is refreshing
+        self.assertTrue(mj_table.table.is_refreshing)
+
+        # Test with a single input
+        mj_table = multi_join(input=MultiJoinInput(table=self.ticking_tableA, on=["key1=a", "key2=b"], joins="c1"))
+
+        # Output table is refreshing
+        self.assertTrue(mj_table.table.is_refreshing)
+
+    def test_errors(self):
+        # Assert the exception is raised when providing MultiJoinInput and the on parameter is not None (omitted).
+        mj_input = [
+            MultiJoinInput(table=self.ticking_tableA, on=["key1=a", "key2=b"], joins=["c1", "e1"]),
+            MultiJoinInput(table=self.ticking_tableB, on=["key1=a", "key2=b"], joins=["d2"])
+        ]
+        with self.assertRaises(DHError) as cm:
+            mj_table = multi_join(mj_input, on=["key1=a", "key2=b"])
+        self.assertIn("on parameter is not permitted", str(cm.exception))
+
+        session = Session()
+        t = session.time_table("PT00:00:00.001").update(
+            ["a = i", "b = i*i % 13", "c1 = i * 13 % 23", "d1 = a + b", "e1 = a - b"]).drop_columns(["Timestamp"])
+
+        # Assert the exception is raised when to-be-joined tables are not from the same session.
+        mj_input = [
+            MultiJoinInput(table=self.ticking_tableA, on=["key1=a", "key2=b"], joins=["c1", "e1"]),
+            MultiJoinInput(table=t, on=["key1=a", "key2=b"], joins=["d2"])
+        ]
+        with self.assertRaises(DHError) as cm:
+            mj_table = multi_join(mj_input)
+        self.assertIn("all tables must be from the same session", str(cm.exception))
+
+
+if __name__ == '__main__':
+    unittest.main()
diff --git a/py/client/tests/test_plugin_client.py b/py/client/tests/test_plugin_client.py
index a34d1f18a16..ad990c26988 100644
--- a/py/client/tests/test_plugin_client.py
+++ b/py/client/tests/test_plugin_client.py
@@ -3,6 +3,8 @@
 #
 import unittest
 
+from pydeephaven.session import Session
+from pydeephaven.ticket import SharedTicket, ServerObject, ScopeTicket
 from tests.testbase import BaseTestCase
 
 
@@ -12,14 +14,20 @@ def setUp(self) -> None:
         server_script = '''
 from deephaven.plot.figure import Figure
 from deephaven import empty_table
+import deephaven.pandas as dhpd
 
 source = empty_table(20).update(["Letter = (i % 2 == 0) ? `A` : `B`", "X = 0.1 * i", "Y = randomDouble(0.0, 5.0)"])
 
+df = dhpd.to_pandas(source)
+
 plot = Figure().plot_xy(series_name="Random numbers", t=source, x="X", y="Y").show()
 
 source2 = empty_table(20).update(["Letter = (i % 2 == 0) ? `A` : `B`", "X = 0.1 * i", "Y = randomDouble(0.0, 5.0)"])
 
 plot2 = Figure().plot_xy(series_name="Random numbers", t=source2, x="X", y="Y", by=["Letter"]).show()
+
+plot3 = Figure().plot_xy(series_name="Random numbers", t=empty_table(30).update(["Letter = (i % 2 == 0) ? `A` : `B`", "X = 0.1 * i", "Y = randomDouble(0.0, 5.0)"]), x="X", y="Y").show()
+
     '''
         self.session.run_script(server_script)
 
@@ -30,7 +38,112 @@ def test_create(self):
         self.assertGreater(len(payload), 0)
         self.assertGreater(len(refs), 0)
         ref = refs[0]
-        self.assertEqual(ref.type_, "Table")
+        self.assertEqual(ref.type, "Table")
+        plugin_client.close()
+
+    @unittest.skip("need to wait for https://github.com/deephaven/deephaven-core/issues/5996")
+    def test_publish_fetch_figure(self):
+        plugin_client = self.session.plugin_client(self.session.exportable_objects["plot3"])
+        self.assertIsNotNone(plugin_client)
+
+        with self.subTest("Fetchable in the Plugin object"):
+            payload, refs = next(plugin_client.resp_stream)
+            self.assertGreater(len(payload), 0)
+            self.assertGreater(len(refs), 0)
+            ref = refs[0]
+            self.assertEqual(ref.type, "Table")
+            fetched = ref.fetch()
+            self.assertIsNotNone(fetched)
+            self.assertEqual(fetched.size, 30)
+
+            # Publish the fetchable
+            tbl_shared_ticket = SharedTicket.random_ticket()
+            self.session.publish(ref, tbl_shared_ticket)
+
+            # Another session to use the shared fetchable
+            sub_session = Session()
+            sub_table = sub_session.fetch_table(tbl_shared_ticket)
+            self.assertIsNotNone(sub_table)
+            self.assertEqual(sub_table.size, 30)
+            sub_session.close()
+
+        with self.subTest("Plugin object"):
+            # First fetch the Plugin object, then publish it
+            export_plugin_client = self.session.fetch(plugin_client)
+            shared_ticket = SharedTicket.random_ticket()
+            self.session.publish(export_plugin_client, shared_ticket)
+
+            # Another session to use the shared Plugin object
+            sub_session = Session()
+            server_obj = ServerObject(type="Figure", ticket=shared_ticket)
+            sub_plugin_client = sub_session.plugin_client(server_obj)
+            payload, refs = next(sub_plugin_client.resp_stream)
+            self.assertGreater(len(payload), 0)
+            self.assertGreater(len(refs), 0)
+            ref = refs[0]
+            self.assertEqual(ref.type, "Table")
+            fetched = ref.fetch()
+            self.assertIsNotNone(fetched)
+            self.assertEqual(fetched.size, 30)
+            sub_plugin_client.close()
+            sub_session.close()
+
+        with self.subTest("released Plugin object"):
+            sub_session = Session()
+            # close top-level session's export to disable the shared ticket
+            self.session.release(export_plugin_client)
+            server_obj = ServerObject(type="Figure", ticket=shared_ticket)
+            with self.assertRaises(Exception):
+                sub_plugin_client = sub_session.plugin_client(server_obj)
+            sub_session.close()
+
+        plugin_client.close()
+
+    @unittest.skip("need to wait for https://github.com/deephaven/deephaven-core/issues/5996")
+    def test_publish_fetch_pandas(self):
+        plugin_client = self.session.plugin_client(self.session.exportable_objects["df"])
+        self.assertIsNotNone(plugin_client)
+
+        # First fetch the Plugin object, then publish it
+        export_plugin_client = self.session.fetch(plugin_client)
+        shared_ticket = SharedTicket.random_ticket()
+        self.session.publish(export_plugin_client, shared_ticket)
+
+        # Another session to use the shared Plugin object
+        sub_session = Session()
+        server_obj = ServerObject(type="pandas.DataFrame", ticket=shared_ticket)
+        sub_plugin_client = sub_session.plugin_client(server_obj)
+        payload, refs = next(sub_plugin_client.resp_stream)
+        self.assertEqual(len(payload), 0)
+        self.assertEqual(len(refs), 1)
+        ref = refs[0]
+        self.assertEqual(ref.type, "Table")
+        fetched = ref.fetch()
+        self.assertIsNotNone(fetched)
+        self.assertEqual(fetched.size, 20)
+        sub_plugin_client.close()
+        sub_session.close()
+
+        # continue with source plugin client
+        payload, refs = next(plugin_client.resp_stream)
+        self.assertEqual(len(payload), 0)
+        self.assertEqual(len(refs), 1)
+        ref = refs[0]
+        self.assertEqual(ref.type, "Table")
+        fetched = ref.fetch()
+        self.assertIsNotNone(fetched)
+        self.assertEqual(fetched.size, 20)
+        plugin_client.close()
+
+    def test_publish_fetch_table(self):
+        export_ticket = self.session.fetch(ScopeTicket.scope_ticket("source"))
+        shared_ticket = SharedTicket.random_ticket()
+        self.session.publish(export_ticket, shared_ticket)
+
+        sub_session = Session()
+        sub_export_ticket = sub_session.fetch(shared_ticket)
+        sub_table = sub_session.table_service.fetch_etcr(sub_export_ticket.pb_ticket)
+        self.assertEqual(sub_table.size, 20)
 
 
 if __name__ == "__main__":
diff --git a/py/client/tests/test_session.py b/py/client/tests/test_session.py
index afdccd53aff..0007379fdc4 100644
--- a/py/client/tests/test_session.py
+++ b/py/client/tests/test_session.py
@@ -10,7 +10,7 @@
 
 from pydeephaven import DHError
 from pydeephaven import Session
-from pydeephaven.session import SharedTicket
+from pydeephaven.ticket import SharedTicket
 from tests.testbase import BaseTestCase
 
 
@@ -109,9 +109,8 @@ def test_import_table_long_csv(self):
         pa_table2 = new_table.to_arrow()
         self.assertEqual(pa_table2, pa_table)
         df = pa_table2.to_pandas()
-        self.assertEquals(1000, len(df.index))
+        self.assertEqual(1000, len(df.index))
 
-    @unittest.skip("GH ticket filed #941.")
     def test_import_table_time64(self):
         pa_array = pa.array([1, 2], type=pa.time64('ns'))
         pa_record_batch = pa.RecordBatch.from_arrays([pa_array], names=['f1'])
@@ -187,8 +186,8 @@ def test_import_table_strings(self):
         self.assertEqual(0, len(exception_list))
 
     @unittest.skip("GH ticket filed #941.")
-    def test_import_table_dates(self):
-        types = [pa.date32(), pa.date64()]
+    def test_import_table_date32(self):
+        types = [pa.date32()]
         exception_list = []
         for t in types:
             pa_array = pa.array([1245, 123456], type=t)
@@ -203,6 +202,18 @@ def test_import_table_dates(self):
 
         self.assertEqual(0, len(exception_list))
 
+    def test_import_table_date64(self):
+        from datetime import datetime
+        pa_date1 = pa.scalar(datetime(2012, 1, 1), type=pa.date64())
+        pa_date2 = pa.scalar(datetime(2022, 11, 11), type=pa.date64())
+        pa_array = pa.array([pa_date1, pa_date2], type=pa.date64())
+
+        pa_record_batch = pa.RecordBatch.from_arrays([pa_array], names=['f1'])
+        pa_table = pa.Table.from_batches([pa_record_batch])
+        new_table = self.session.import_table(pa_table)
+        pa_table2 = new_table.to_arrow()
+        self.assertEqual(pa_table, pa_table2)
+
     def test_input_table(self):
         pa_types = [
             pa.bool_(),
@@ -339,7 +350,6 @@ def test_blink_input_table(self):
                 with self.assertRaises(PermissionError):
                     blink_input_table.delete(dh_table.select(["f1"]))
 
-
     def test_publish_table(self):
         pub_session = Session()
         t = pub_session.empty_table(1000).update(["X = i", "Y = 2*i"])
@@ -363,6 +373,7 @@ def test_publish_table(self):
             pub_session.close()
             with self.assertRaises(DHError):
                  sub_session2.fetch_table(shared_ticket)
+            sub_session2.close()
 
     # Note no 'test_' prefix; we don't want this to be picked up
     # on every run; you can still ask the test runner to run it by manually asking
diff --git a/py/client/tests/test_table.py b/py/client/tests/test_table.py
index 984c690a93a..e5db7717ba9 100644
--- a/py/client/tests/test_table.py
+++ b/py/client/tests/test_table.py
@@ -10,7 +10,7 @@
 
 from pydeephaven import DHError
 from pydeephaven import SortDirection
-from pydeephaven.agg import sum_, avg, pct, weighted_avg, count_, partition, median, unique, count_distinct, distinct
+from pydeephaven.agg import sum_, avg, pct, weighted_avg, count_, count_where, partition, median, unique, count_distinct, distinct, formula
 from pydeephaven.table import Table
 from tests.testbase import BaseTestCase
 
@@ -55,8 +55,8 @@ def test_create_data_table_then_update(self):
         new_table = self.session.import_table(pa_table).update(formulas=['Sum = a + b + c + d'])
         pa_table2 = new_table.to_arrow()
         df = pa_table2.to_pandas()
-        self.assertEquals(df.shape[1], 6)
-        self.assertEquals(1000, len(df.index))
+        self.assertEqual(df.shape[1], 6)
+        self.assertEqual(1000, len(df.index))
 
     def test_drop_columns(self):
         pa_table = csv.read_csv(self.csv_file)
@@ -65,7 +65,7 @@ def test_drop_columns(self):
         for f in table1.schema:
             column_names.append(f.name)
         table2 = table1.drop_columns(cols=column_names[:-1])
-        self.assertEquals(1, len(table2.schema))
+        self.assertEqual(1, len(table2.schema))
 
     def test_usv(self):
         ops = [
@@ -235,6 +235,7 @@ def test_snapshot_when(self):
         with self.assertRaises(DHError):
             result_table = source_table.snapshot_when(trigger_table=trigger_table, stamp_cols=["Timestamp"],
                                                       initial=True, incremental=False, history=True)
+        source_table = trigger_table = result_table = None
 
     def test_agg_by(self):
         pa_table = csv.read_csv(self.csv_file)
@@ -246,7 +247,17 @@ def test_agg_by(self):
                 pct(percentile=0.5, cols=["PctC = c"]),
                 weighted_avg(wcol="d", cols=["WavGD = d"]),
                 count_(col="ca"),
+                count_where(col="count_where1", filters="a > 5"),
+                count_where("agg_count_where_1", "a > 100"),
+                count_where("agg_count_where_2", ["a > 100", "b < 250"]),
+                count_where("agg_count_where_3", "a <= 100 || b >= 250"),
                 partition(col="aggPartition"),
+                formula(formula="min(x)", formula_param="x", cols=["min_a=a", "min_b=b"]),
+                formula(formula="avg(x)", formula_param="x", cols=["avg_c=c", "avg_d=d"]),
+                formula(formula="f_const=5.0 + 3"),
+                formula(formula="f_min=min(a)"),
+                formula(formula="f_sum=sum(a) + sum(b)"),
+                formula(formula="f_sum_3col=sum(a) + sum(b) + max(c)"),
                 ]
 
         result_table = test_table.agg_by(aggs=aggs, by=["a"])
@@ -294,6 +305,26 @@ def test_agg_all_by(self):
             with self.assertRaises(DHError) as cm:
                 test_table.agg_all_by(agg=count_(col="ca"), by=["a"])
 
+    def test_agg_count_where_output(self):
+        """
+        Test and validation of the agg_count_where feature
+        """
+        test_table = self.session.empty_table(100).update(["a=ii", "b=ii%2"])
+        count_aggs = [
+            count_where("count1", "a >= 25"),
+            count_where("count2", "a % 3 == 0")
+        ]
+        result_table = test_table.agg_by(aggs=count_aggs, by="b")
+        self.assertEqual(result_table.size, 2)
+
+        # get the table as a local pandas dataframe
+        df = result_table.to_arrow().to_pandas()
+        # assert the values meet expectations
+        self.assertEqual(df.loc[0, "count1"], 37)
+        self.assertEqual(df.loc[1, "count1"], 38)
+        self.assertEqual(df.loc[0, "count2"], 17)
+        self.assertEqual(df.loc[1, "count2"], 17)
+
     def test_where_in(self):
         pa_table = csv.read_csv(self.csv_file)
         test_table = self.session.import_table(pa_table)
@@ -350,6 +381,31 @@ def test_agg_with_options(self):
                 pa_table2 = rt_default.to_arrow()
                 self.assertNotEqual(pa_table2, pa_table1)
 
+    def test_slice(self):
+        pa_table = csv.read_csv(self.csv_file)
+        test_table = self.session.import_table(pa_table)
+
+        with self.subTest("0, positive"):
+            result_table = test_table.slice(0, 50)
+            self.assertEqual(result_table.size, 50)
+        
+        with self.subTest("negative, 0"):
+            result_table = test_table.slice(-50, 0)
+            self.assertEqual(result_table.size, 50)
+
+        with self.subTest("positive, negative"):
+            result_table = test_table.slice(50, -50)
+            self.assertEqual(result_table.size, test_table.size - 100)
+
+        with self.subTest("positive, negative"):
+            result_table = test_table.slice(-1 * (test_table.size - 50), test_table.size - 50)
+            self.assertEqual(result_table.size, test_table.size - 100)
+
+        with self.subTest("negative, positive - empty"):
+            result_table = test_table.slice(-1, 1)
+            self.assertEqual(result_table.size, 0)
+
+
 
 if __name__ == '__main__':
     unittest.main()
diff --git a/py/embedded-server/build.gradle b/py/embedded-server/build.gradle
index d61f6f780ba..4e6c2f5d48e 100644
--- a/py/embedded-server/build.gradle
+++ b/py/embedded-server/build.gradle
@@ -3,6 +3,8 @@ plugins {
     id 'java-library'
 }
 
+evaluationDependsOn ':docker-server-jetty'
+
 configurations {
     classpath
 }
@@ -23,4 +25,43 @@ dependencies {
     api(project(':Integrations')) {
         because 'downstream dagger compile'
     }
+
+    implementation project(":util-processenvironment")
 }
+
+def testEmbeddedServer = Docker.registerDockerTask(project, 'testEmbeddedServer') {
+    copyIn {
+        from('tests') {
+            into 'project/tests'
+        }
+        from(tasks.getByName('buildWheel')) {
+            into 'wheels'
+        }
+        from(configurations.pythonWheel) {
+            into 'wheels'
+        }
+        from ('requirements-dev.txt') {
+            into 'project/'
+        }
+    }
+    dockerfile {
+        // Start from the image that built our wheel, so it is already ready to go
+        from(Docker.localImageName('server-jetty'))
+        copyFile('project', '/project')
+        copyFile('wheels', '/wheels')
+
+        workingDir('/project')
+        runCommand '''set -eux; \\
+                      mkdir -p /out/report; \\
+                      pip install --upgrade pip; \\
+                      pip3 install -r requirements-dev.txt; \\
+                      pip3 install /wheels/*'''
+    }
+    parentContainers = [ project(':docker-server-jetty').tasks.findByName('buildDocker-server-jetty') ]
+    entrypoint = ['python', '-m', 'xmlrunner', 'discover', 'tests', '-v', '-o', '/out/report']
+    copyOut {
+        into layout.buildDirectory.dir('test-results')
+    }
+}
+
+tasks.getByName('check').dependsOn(testEmbeddedServer)
diff --git a/py/embedded-server/deephaven_server/cli.py b/py/embedded-server/deephaven_server/cli.py
index f4e057c38e9..04b499d5d0b 100644
--- a/py/embedded-server/deephaven_server/cli.py
+++ b/py/embedded-server/deephaven_server/cli.py
@@ -23,7 +23,8 @@ def cli():
 @click.option("--jvm-args", default=None, help="The JVM arguments to use.")
 @click.option("--extra-classpath", default=None, help="The extra classpath to use.")
 @click.option("--default-jvm-args", default=None, help="The advanced JVM arguments to use in place of the default ones that Deephaven recommends.")
-def server(host, port, jvm_args, extra_classpath, default_jvm_args):
+@click.option('--browser/--no-browser', default=True, help="Whether to open the browser when the server starts.")
+def server(host, port, jvm_args, extra_classpath, default_jvm_args, browser):
     """
     Start the Deephaven server.
     """
@@ -46,7 +47,8 @@ def server(host, port, jvm_args, extra_classpath, default_jvm_args):
             authentication_url = authentication_urls[0]
             break
 
-    webbrowser.open(authentication_url)
+    if browser:
+        webbrowser.open(authentication_url)
 
     click.echo(
         f"Deephaven is running at {authentication_url} with authentication type {authentication_type}"
diff --git a/py/embedded-server/deephaven_server/server.py b/py/embedded-server/deephaven_server/server.py
index 6bae0ef5ee6..f888dad73d2 100644
--- a/py/embedded-server/deephaven_server/server.py
+++ b/py/embedded-server/deephaven_server/server.py
@@ -5,6 +5,7 @@
 
 from typing import List, Optional
 import sys
+import atexit
 
 from .start_jvm import start_jvm
 
@@ -167,6 +168,9 @@ def __init__(
         # Keep a reference to the server so we know it is running
         Server.instance = self
 
+        # On halt, prevent the JVM from writing to sys.out and sys.err
+        atexit.register(self.j_server.prepareForShutdown)
+
     def start(self):
         """
         Starts the server. Presently once the server is started, it cannot be stopped until the
diff --git a/py/embedded-server/java-runtime/build.gradle b/py/embedded-server/java-runtime/build.gradle
index b3e43690825..04db6fa4ac1 100644
--- a/py/embedded-server/java-runtime/build.gradle
+++ b/py/embedded-server/java-runtime/build.gradle
@@ -1,6 +1,7 @@
 plugins {
     id 'java-library'
     id 'io.deephaven.project.register'
+    id 'io.deephaven.optional-server-dependencies'
 }
 
 configurations {
@@ -9,10 +10,15 @@ configurations {
 
 dependencies {
     implementation project(':server-jetty')
+    implementation project(":util-processenvironment")
+    implementation project(":util-thread")
 
-    Classpaths.inheritDagger(project)
+    implementation project(':extensions-flight-sql')
 
-    Classpaths.inheritGrpcPlatform(project)
+    implementation libs.dagger
+    annotationProcessor libs.dagger.compiler
+
+    implementation platform(libs.grpc.bom)
 
     implementation project(':grpc-java:grpc-servlet-jakarta')
     implementation project(':grpc-java:grpc-servlet-websocket-jakarta')
@@ -20,20 +26,9 @@ dependencies {
     runtimeOnly project(':log-to-slf4j')
     runtimeOnly project(':logback-print-stream-globals')
     runtimeOnly project(':logback-logbuffer')
-    Classpaths.inheritLogbackClassic(project)
-
-    if (!hasProperty('excludeHotspotImpl')) {
-        runtimeOnly project(':hotspot-impl')
-    }
-
-    if (!hasProperty('excludeSql')) {
-        runtimeOnly project(':engine-sql')
-    }
+    runtimeOnly libs.logback.classic
 
-    if (!hasProperty('excludeS3')) {
-        runtimeOnly project(':extensions-s3')
-        runtimeOnly project(':extensions-iceberg-s3')
-    }
+    // Note: add optional server dependencies to io.deephaven.optional-server-dependencies plugin in buildSrc
 }
 
 // making a dir here isn't optimal, but without it we need to make py-embedded-server be a java and a python
diff --git a/py/embedded-server/java-runtime/src/main/java/io/deephaven/python/server/EmbeddedServer.java b/py/embedded-server/java-runtime/src/main/java/io/deephaven/python/server/EmbeddedServer.java
index a27e33120d6..3c7133d347e 100644
--- a/py/embedded-server/java-runtime/src/main/java/io/deephaven/python/server/EmbeddedServer.java
+++ b/py/embedded-server/java-runtime/src/main/java/io/deephaven/python/server/EmbeddedServer.java
@@ -4,8 +4,10 @@
 package io.deephaven.python.server;
 
 import dagger.Component;
+import dagger.Module;
+import dagger.Provides;
 import io.deephaven.auth.AuthenticationRequestHandler;
-import io.deephaven.client.ClientDefaultsModule;
+import io.deephaven.client.impl.BarrageSessionFactoryConfig;
 import io.deephaven.configuration.Configuration;
 import io.deephaven.engine.util.ScriptSession;
 import io.deephaven.integrations.python.PyLogOutputStream;
@@ -15,11 +17,11 @@
 import io.deephaven.io.logger.LogBufferOutputStream;
 import io.deephaven.server.auth.CommunityAuthorizationModule;
 import io.deephaven.server.config.ServerConfig;
-import io.deephaven.time.calendar.CalendarsFromConfigurationModule;
 import io.deephaven.server.console.ExecutionContextModule;
 import io.deephaven.server.console.groovy.GroovyConsoleSessionModule;
 import io.deephaven.server.console.python.PythonConsoleSessionModule;
 import io.deephaven.server.console.python.PythonGlobalScopeModule;
+import io.deephaven.server.flightsql.FlightSqlModule;
 import io.deephaven.server.healthcheck.HealthCheckModule;
 import io.deephaven.server.jetty.JettyConfig;
 import io.deephaven.server.jetty.JettyConfig.Builder;
@@ -30,7 +32,12 @@
 import io.deephaven.server.runner.DeephavenApiServer;
 import io.deephaven.server.runner.DeephavenApiServerModule;
 import io.deephaven.server.runner.MainHelper;
+import io.deephaven.server.session.ClientChannelFactoryModule;
+import io.deephaven.server.session.ClientChannelFactoryModule.UserAgent;
 import io.deephaven.server.session.ObfuscatingErrorTransformerModule;
+import io.deephaven.server.session.SslConfigModule;
+import io.deephaven.time.calendar.CalendarsFromConfigurationModule;
+import io.deephaven.util.process.ProcessEnvironment;
 import org.jpy.PyModule;
 import org.jpy.PyObject;
 
@@ -41,12 +48,25 @@
 import java.io.OutputStream;
 import java.io.PrintStream;
 import java.util.Collection;
+import java.util.List;
 import java.util.Map;
 
 public class EmbeddedServer {
 
-    @Singleton
-    @Component(modules = {
+    @Module(includes = {
+            ClientChannelFactoryModule.class,
+            SslConfigModule.class
+    })
+    public interface EmbeddedPythonClientChannelFactoryModule {
+
+        @Provides
+        @UserAgent
+        static String providesUserAgent() {
+            return BarrageSessionFactoryConfig.userAgent(List.of("deephaven-server-embedded"));
+        }
+    }
+
+    @Module(includes = {
             DeephavenApiServerModule.class,
             EmbeddedPyLogModule.class,
             DeephavenApiConfigModule.class,
@@ -54,15 +74,21 @@ public class EmbeddedServer {
             HealthCheckModule.class,
             PythonPluginsRegistration.Module.class,
             JettyServerModule.class,
+            FlightSqlModule.class,
             HealthCheckModule.class,
             PythonConsoleSessionModule.class,
             GroovyConsoleSessionModule.class,
             ExecutionContextModule.class,
             CommunityAuthorizationModule.class,
-            ClientDefaultsModule.class,
             ObfuscatingErrorTransformerModule.class,
             CalendarsFromConfigurationModule.class,
+            EmbeddedPythonClientChannelFactoryModule.class,
     })
+    public interface PythonServerModule {
+    }
+
+    @Singleton
+    @Component(modules = PythonServerModule.class)
     public interface PythonServerComponent extends JettyServerComponent {
         @Component.Builder
         interface Builder extends JettyServerComponent.Builder<Builder, PythonServerComponent> {
@@ -144,6 +170,15 @@ public void start() throws Exception {
         Bootstrap.printf("Server started on port %d%n", getPort());
     }
 
+    public void prepareForShutdown() {
+        // Stop any DH-started threads and work
+        ProcessEnvironment.getGlobalShutdownManager().maybeInvokeTasks();
+
+        // Shut down our wrapped stdout/stderr instances
+        System.out.close();
+        System.err.close();
+    }
+
     public int getPort() {
         return server.server().getPort();
     }
diff --git a/py/embedded-server/requirements-dev.txt b/py/embedded-server/requirements-dev.txt
new file mode 100644
index 00000000000..5d9603fd665
--- /dev/null
+++ b/py/embedded-server/requirements-dev.txt
@@ -0,0 +1,10 @@
+pandas
+pyarrow
+grpcio
+setuptools
+protobuf
+wheel
+sphinx
+bitstring
+unittest-xml-reporting
+timeout-decorator
diff --git a/py/embedded-server/setup.py b/py/embedded-server/setup.py
index b4cdcdcf8a4..4063f11bc46 100644
--- a/py/embedded-server/setup.py
+++ b/py/embedded-server/setup.py
@@ -58,11 +58,13 @@ def _compute_version():
         'Programming Language :: Python :: 3.9',
         'Programming Language :: Python :: 3.10',
         'Programming Language :: Python :: 3.11',
+        'Programming Language :: Python :: 3.12',
+        'Programming Language :: Python :: 3.13',
     ],
     keywords='Deephaven Development',
     python_requires='>=3.8',
     install_requires=[
-        'jpy>=0.17.0',
+        'jpy>=1.0.0',
         'java-utilities',
         f"deephaven-core[autocomplete]=={_version}",
         'click>=8.1.7',
diff --git a/py/embedded-server/tests/test_load_app_modules.py b/py/embedded-server/tests/test_load_app_modules.py
new file mode 100644
index 00000000000..e101c9f24d2
--- /dev/null
+++ b/py/embedded-server/tests/test_load_app_modules.py
@@ -0,0 +1,27 @@
+#
+# Copyright (c) 2016-2024 Deephaven Data Labs and Patent Pending
+#
+
+import unittest
+import importlib
+import pkgutil
+import sys
+
+
+class LoadAllModules(unittest.TestCase):
+    def test_import_all_packages(self):
+        # First start the server that is defined in this package
+        from deephaven_server import Server
+        Server().start()
+
+        # Then iterate through all deephaven packages to make sure they all can be imported
+        # using the wheel that we distribute
+        pkg = importlib.import_module('deephaven')
+
+        mods = pkgutil.walk_packages(pkg.__path__, prefix='deephaven.')
+        for mod in mods:
+            if mod.name not in sys.modules:
+                try:
+                    importlib.import_module(mod.name)
+                except:
+                    ...
diff --git a/py/jpy-ext/build.gradle b/py/jpy-ext/build.gradle
index b72f627e6d0..a8f697b0945 100644
--- a/py/jpy-ext/build.gradle
+++ b/py/jpy-ext/build.gradle
@@ -16,6 +16,6 @@ plugins {
 }
 
 dependencies {
-  api 'org.jpyconsortium:jpy:0.17.0'
+  api libs.jpy
   api project(':deephaven-jpy-config')
 }
diff --git a/py/jpy-integration/build.gradle b/py/jpy-integration/build.gradle
index f0271aa83f8..bdeed8a0aeb 100644
--- a/py/jpy-integration/build.gradle
+++ b/py/jpy-integration/build.gradle
@@ -43,8 +43,6 @@ sourceSets {
 configurations {
   javaToPythonJar
 
-  testImplementation.extendsFrom junit
-
   javaToPythonImplementation.extendsFrom testImplementation
   pythonToJavaImplementation.extendsFrom testImplementation
 
@@ -57,6 +55,8 @@ dependencies {
   testImplementation project(':deephaven-jpy-ext')
   javaToPythonImplementation sourceSets.test.output
   pythonToJavaImplementation sourceSets.test.output
+
+  testImplementation libs.junit4
 }
 
 test {
diff --git a/py/server/deephaven/_table_reader.py b/py/server/deephaven/_table_reader.py
new file mode 100644
index 00000000000..49fa82c9772
--- /dev/null
+++ b/py/server/deephaven/_table_reader.py
@@ -0,0 +1,284 @@
+#
+# Copyright (c) 2016-2024 Deephaven Data Labs and Patent Pending
+#
+"""This module supports reading the data in a Deephaven table in a chunked manner."""
+from collections import namedtuple
+from typing import Union, Sequence, Generator, Dict, Optional, Any, Tuple, Callable, TypeVar, Iterable
+
+import jpy
+import numpy as np
+from deephaven import update_graph
+
+from deephaven.column import ColumnDefinition
+from deephaven.jcompat import to_sequence
+from deephaven.numpy import _column_to_numpy_array
+from deephaven.table import Table
+
+_JTableUpdateDataReader = jpy.get_type("io.deephaven.integrations.python.PythonTableDataReader")
+
+T = TypeVar('T')
+
+def _col_defs(table: Table, cols: Union[str, Sequence[str]]) -> Sequence[ColumnDefinition]:
+    if not cols:
+        col_defs = table.columns
+    else:
+        cols = to_sequence(cols)
+        col_defs = [col for col in table.columns if col.name in cols]
+        if len(col_defs) != len(cols):
+            raise ValueError(f"Invalid column names: {set(cols) - {col.name for col in col_defs} }")
+
+    return col_defs
+
+
+def _table_reader_all(table: Table, cols: Optional[Union[str, Sequence[str]]] = None, *,
+                     emitter: Callable[[Sequence[ColumnDefinition], jpy.JType], T], row_set: jpy.JType,
+                     prev: bool = False) -> T:
+    """ Reads all the rows in the given row set of a table. The emitter converts the Java data into a desired Python
+    object.
+
+    If the table is refreshing and no update graph locks are currently being held, the generator will try to acquire
+    the shared lock of the update graph before reading the table data. This provides a consistent view of the data.
+    The side effect of this is that the table will not be able to refresh while the table is being iterated on.
+    Additionally, the generator internally maintains a fill context. The auto acquired shared lock and the fill
+    context will be released after the generator is destroyed. That can happen implicitly when the generator
+    is used in a for-loop. When the generator is not used in a for-loop, to prevent resource leaks, it must be closed
+    after use by either (1) by setting it to None, (2) using the del statement, or (3) calling the close() method on it.
+
+    Args:
+        table (Table):  The table to read.
+        cols (Optional[Union[str, Sequence[str]]]): The columns to read. If None, all columns are read.
+        emitter (Callable[[Sequence[Column], jpy.JType], T): The function that takes the column definitions
+            and the column data in the form of Java arrays and returns a Python object, usually a collection, such as
+            dictionary, tuple.
+        row_set (jpy.JType): The row set to read.
+        prev (bool): If True, read the previous values. Default is False.
+
+    Returns:
+        A Python collection object, usually a dictionary or tuple.
+
+    Raises:
+        ValueError
+    """
+    col_defs = _col_defs(table, cols)
+
+    col_sources = [table.j_table.getColumnSource(col_def.name) for col_def in col_defs]
+    j_reader_context = _JTableUpdateDataReader.makeContext(row_set.size(), *col_sources)
+    with update_graph.auto_locking_ctx(table):
+        try:
+            j_array = _JTableUpdateDataReader.readChunkColumnMajor(j_reader_context, row_set, col_sources, prev)
+            return emitter(col_defs, j_array)
+        finally:
+            j_reader_context.close()
+
+
+def _table_reader_all_dict(table: Table, cols: Optional[Union[str, Sequence[str]]] = None, *, row_set: jpy.JType,
+                           prev: bool = False, to_numpy: bool = True) -> Dict[str, Union[np.ndarray, jpy.JType]]:
+    """ Reads all the rows in the given row set of a table into a dictionary. The dictionary is a map of column names
+    to numpy arrays or Java arrays.
+
+    If the table is refreshing and no update graph locks are currently being held, the generator will try to acquire
+    the shared lock of the update graph before reading the table data. This provides a consistent view of the data.
+    The side effect of this is that the table will not be able to refresh while the table is being iterated on.
+    Additionally, the generator internally maintains a fill context. The auto acquired shared lock and the fill
+    context will be released after the generator is destroyed. That can happen implicitly when the generator
+    is used in a for-loop. When the generator is not used in a for-loop, to prevent resource leaks, it must be closed
+    after use by either (1) by setting it to None, (2) using the del statement, or (3) calling the close() method on it.
+
+    Args:
+        table (Table):  The table to read.
+        cols (Optional[Union[str, Sequence[str]]]): The columns to read. If None, all columns are read.
+        row_set (jpy.JType): The row set to read.
+        prev (bool): If True, read the previous values. Default is False.
+        to_numpy (bool): If True, convert the column data to numpy arrays. Default is True.
+
+    Returns:
+        A dictionary of column names to numpy arrays or Java arrays.
+
+    Raises:
+        ValueError
+    """
+    _emitter = lambda col_defs, j_array: {col_def.name: _column_to_numpy_array(col_def, j_array[i]) if to_numpy else j_array[i]
+            for i, col_def in enumerate(col_defs)}
+    return _table_reader_all(table, cols, emitter=_emitter, row_set=row_set, prev=prev)
+
+
+def _table_reader_chunk(table: Table, cols: Optional[Union[str, Sequence[str]]] = None, *,
+                        emitter: Callable[[Sequence[ColumnDefinition], jpy.JType], Iterable[T]], row_set: jpy.JType,
+                        chunk_size: int = 2048, prev: bool = False) \
+        -> Generator[T, None, None]:
+    """ Returns a generator that reads one chunk of rows at a time from the table.  The emitter converts the Java chunk
+    into the generator output value.
+
+    If the table is refreshing and no update graph locks are currently being held, the generator will try to acquire
+    the shared lock of the update graph before reading the table data. This provides a consistent view of the data.
+    The side effect of this is that the table will not be able to refresh while the table is being iterated on.
+    Additionally, the generator internally maintains a fill context. The auto acquired shared lock and the fill
+    context will be released after the generator is destroyed. That can happen implicitly when the generator
+    is used in a for-loop. When the generator is not used in a for-loop, to prevent resource leaks, it must be closed
+    after use by either (1) by setting it to None, (2) using the del statement, or (3) calling the close() method on it.
+
+    Args:
+        table (Table):  The table to read.
+        cols (Optional[Union[str, Sequence[str]]]): The columns to read. If None, all columns are read.
+        emitter (Callable[[Sequence[Column], jpy.JType], Iterable[T]]): The function that takes the column definitions
+            and the column data in the form of Java arrays and returns an Iterable.
+        row_set (jpy.JType): The row set to read.
+        chunk_size (int): The number of rows to read at a time. Default is 2048.
+        prev (bool): If True, read the previous values. Default is False.
+
+    Returns:
+        A generator that yields the desired Python type of the emitter.
+
+    Raises:
+        ValueError
+    """
+    if chunk_size < 0:
+        raise ValueError("chunk_size must not be negative.")
+
+    col_defs = _col_defs(table, cols)
+
+    row_sequence_iterator = row_set.getRowSequenceIterator()
+    col_sources = [table.j_table.getColumnSource(col_def.name) for col_def in col_defs]
+    j_reader_context = _JTableUpdateDataReader.makeContext(chunk_size, *col_sources)
+    with update_graph.auto_locking_ctx(table):
+        try:
+            while row_sequence_iterator.hasMore():
+                chunk_row_set = row_sequence_iterator.getNextRowSequenceWithLength(chunk_size)
+                j_array = _JTableUpdateDataReader.readChunkColumnMajor(j_reader_context, chunk_row_set, col_sources,
+                                                                       prev)
+                yield from emitter(col_defs, j_array)
+        finally:
+            j_reader_context.close()
+            row_sequence_iterator.close()
+
+def _table_reader_chunk_dict(table: Table, cols: Optional[Union[str, Sequence[str]]] = None, *, row_set: jpy.JType,
+                                    chunk_size: int = 2048, prev: bool = False) \
+        -> Generator[Dict[str, np.ndarray], None, None]:
+    """ Returns a generator that reads one chunk of rows at a time from the table into a dictionary. The dictionary is
+    a map of column names to numpy arrays or Java arrays.
+
+    If the table is refreshing and no update graph locks are currently being held, the generator will try to acquire
+    the shared lock of the update graph before reading the table data. This provides a consistent view of the data.
+    The side effect of this is that the table will not be able to refresh while the table is being iterated on.
+    Additionally, the generator internally maintains a fill context. The auto acquired shared lock and the fill
+    context will be released after the generator is destroyed. That can happen implicitly when the generator
+    is used in a for-loop. When the generator is not used in a for-loop, to prevent resource leaks, it must be closed
+    after use by either (1) by setting it to None, (2) using the del statement, or (3) calling the close() method on it.
+
+    Args:
+        table (Table):  The table to read.
+        cols (Optional[Union[str, Sequence[str]]]): The columns to read. If None, all columns are read.
+        row_set (jpy.JType): The row set to read.
+        chunk_size (int): The number of rows to read at a time. Default is 2048.
+        prev (bool): If True, read the previous values. Default is False.
+
+    Returns:
+        A generator that yields a dictionary of column names to numpy arrays or Java arrays.
+
+    Raises:
+        ValueError
+    """
+    def _emitter(col_defs: Sequence[ColumnDefinition], j_array: jpy.JType) -> Generator[Dict[str, np.ndarray], None, None]:
+        yield {col_def.name: _column_to_numpy_array(col_def, j_array[i]) for i, col_def in enumerate(col_defs)}
+
+    return _table_reader_chunk(table, cols, emitter=_emitter, row_set=row_set, chunk_size=chunk_size, prev=prev)
+
+
+def _table_reader_chunk_tuple(table: Table, cols: Optional[Union[str, Sequence[str]]] = None, *,
+                tuple_name: str = 'Deephaven', chunk_size: int = 2048,) -> Generator[Tuple[np.ndarray, ...], None, None]:
+    """ Returns a generator that reads one chunk of rows at a time from the table into a named tuple. The named
+    tuple is made up of fields with their names being the column names and their values being numpy arrays of the
+    column data types.
+
+    If the table is refreshing and no update graph locks are currently being held, the generator will try to acquire
+    the shared lock of the update graph before reading the table data. This provides a consistent view of the data.
+    The side effect of this is that the table will not be able to refresh while the table is being iterated on.
+    Additionally, the generator internally maintains a fill context. The auto acquired shared lock and the fill
+    context will be released after the generator is destroyed. That can happen implicitly when the generator
+    is used in a for-loop. When the generator is not used in a for-loop, to prevent resource leaks, it must be closed
+    after use by either (1) by setting it to None, (2) using the del statement, or (3) calling the close() method on it.
+
+    Args:
+        table (Table): The table to read.
+        cols (Optional[Union[str, Sequence[str]]]): The columns to read. If None, all columns are read.
+        tuple_name (str): The name of the named tuple. Default is 'Deephaven'.
+        chunk_size (int): The number of rows to read at a time. Default is 2048.
+
+    Returns:
+        A generator that yields a named tuple for each row in the table.
+
+    Raises:
+        ValueError
+    """
+    named_tuple_class = namedtuple(tuple_name, cols or table.column_names, rename=False)
+
+    def _emitter(col_defs: Sequence[ColumnDefinition], j_array: jpy.JType) -> Generator[Tuple[np.ndarray], None, None]:
+        yield named_tuple_class._make([_column_to_numpy_array(col_def, j_array[i]) for i, col_def in enumerate(col_defs)])
+
+    return _table_reader_chunk(table, cols, emitter=_emitter, row_set=table.j_table.getRowSet(), chunk_size=chunk_size, prev=False)
+
+def _table_reader_row_dict(table: Table, cols: Optional[Union[str, Sequence[str]]] = None, chunk_size: int = 2048) \
+        -> Generator[Dict[str, Any], None, None]:
+    """ A generator that reads one row at a time from a table into a dictionary. The dictionary is a map of column names
+    to scalar values of the column data type.
+
+    If the table is refreshing and no update graph locks are currently being held, the generator will try to acquire
+    the shared lock of the update graph before reading the table data. This provides a consistent view of the data.
+    The side effect of this is that the table will not be able to refresh while the table is being iterated on.
+    Additionally, the generator internally maintains a fill context. The auto acquired shared lock and the fill
+    context will be released after the generator is destroyed. That can happen implicitly when the generator
+    is used in a for-loop. When the generator is not used in a for-loop, to prevent resource leaks, it must be closed
+    after use by either (1) by setting it to None, (2) using the del statement, or (3) calling the close() method on it.
+
+    Args:
+        table (Table): The table to read.
+        cols (Optional[Union[str, Sequence[str]]]): The columns to read. If None, all columns are read.
+        chunk_size (int): The number of rows to read at a time internally to reduce the number of Java/Python boundary
+            crossings. Default is 2048.
+
+    Returns:
+        A generator that yields a dictionary of column names to values.
+
+    Raises:
+        ValueError
+    """
+    def _emitter(col_defs: Sequence[ColumnDefinition], j_array: jpy.JType) -> Iterable[Dict[str, Any]]:
+        make_dict = lambda values: {col_def.name: value for col_def, value in zip(col_defs, values)}
+        mvs = [memoryview(j_array[i]) if col_def.data_type.is_primitive else j_array[i] for i, col_def in enumerate(col_defs)]
+        return map(make_dict, zip(*mvs))
+
+    return _table_reader_chunk(table, cols, emitter=_emitter, row_set=table.j_table.getRowSet(), chunk_size=chunk_size, prev=False)
+
+def _table_reader_row_tuple(table: Table, cols: Optional[Union[str, Sequence[str]]] = None, tuple_name: str = 'Deephaven',
+                            chunk_size: int = 2048) -> Generator[Tuple[Any, ...], None, None]:
+    """ Returns a generator that reads one row at a time from the table into a named tuple. The named tuple is made
+    up of fields with their names being the column names and their values being of the column data types.
+
+    If the table is refreshing and no update graph locks are currently being held, the generator will try to acquire
+    the shared lock of the update graph before reading the table data. This provides a consistent view of the data.
+    The side effect of this is that the table will not be able to refresh while the table is being iterated on.
+    Additionally, the generator internally maintains a fill context. The auto acquired shared lock and the fill
+    context will be released after the generator is destroyed. That can happen implicitly when the generator
+    is used in a for-loop. When the generator is not used in a for-loop, to prevent resource leaks, it must be closed
+    after use by either (1) by setting it to None, (2) using the del statement, or (3) calling the close() method on it.
+
+    Args:
+        table (Table): The table to read.
+        cols (Optional[Union[str, Sequence[str]]]): The columns to read. If None, all columns are read. Default is None.
+        tuple_name (str): The name of the named tuple. Default is 'Deephaven'.
+        chunk_size (int): The number of rows to read at a time internally to reduce the number of Java/Python boundary
+            crossings. Default is 2048.
+
+    Returns:
+        A generator that yields a named tuple for each row in the table
+
+    Raises:
+        ValueError
+    """
+    named_tuple_class = namedtuple(tuple_name, cols or table.column_names, rename=False)
+
+    def _emitter(col_defs: Sequence[ColumnDefinition], j_array: jpy.JType) -> Iterable[Tuple[Any, ...]]:
+        mvs = [memoryview(j_array[i]) if col_def.data_type.is_primitive else j_array[i] for i, col_def in enumerate(col_defs)]
+        return map(named_tuple_class._make, zip(*mvs))
+
+    return _table_reader_chunk(table, cols, emitter=_emitter, row_set=table.j_table.getRowSet(), chunk_size=chunk_size, prev=False)
diff --git a/py/server/deephaven/_udf.py b/py/server/deephaven/_udf.py
index dabe1cb2c0b..1140c8a08e6 100644
--- a/py/server/deephaven/_udf.py
+++ b/py/server/deephaven/_udf.py
@@ -202,7 +202,11 @@ def prepare_auto_arg_conv(self, encoded_arg_types: str) -> bool:
         parameters."""
         # numba and numpy ufuncs don't need auto argument conversion as they handle the conversion themselves and the
         # arg types are already verified by the query engine
-        if isinstance(self.fn, (numba.np.ufunc.gufunc.GUFunc, numba.np.ufunc.dufunc.DUFunc)) or isinstance(self.fn, numpy.ufunc):
+        if numba:
+            if isinstance(self.fn, (numba.np.ufunc.gufunc.GUFunc, numba.np.ufunc.dufunc.DUFunc)):
+                return False
+
+        if isinstance(self.fn, numpy.ufunc):
             return False
 
         if not self.params or not encoded_arg_types:
@@ -481,7 +485,7 @@ def _parse_np_ufunc_signature(fn: numpy.ufunc) -> _ParsedSignature:
     return p_sig
 
 
-def _parse_signature(fn: Callable) -> _ParsedSignature:
+def _parse_signature(fn: Callable) -> Optional[_ParsedSignature]:
     """ Parse the signature of a function """
 
     if numba:
@@ -492,10 +496,14 @@ def _parse_signature(fn: Callable) -> _ParsedSignature:
         return _parse_np_ufunc_signature(fn)
     else:
         p_sig = _ParsedSignature(fn=fn)
-        if sys.version_info >= (3, 10):
-            sig = inspect.signature(fn, eval_str=True)  # novermin
-        else:
-            sig = inspect.signature(fn)
+        try:
+            if sys.version_info >= (3, 10):
+                sig = inspect.signature(fn, eval_str=True)  # novermin
+            else:
+                sig = inspect.signature(fn)
+        except ValueError:
+            # some built-in functions don't have a signature, neither do some functions from C extensions
+            return None
 
         for n, p in sig.parameters.items():
             # when from __future__ import annotations is used, the annotation is a string, we need to eval it to get
@@ -509,7 +517,7 @@ def _parse_signature(fn: Callable) -> _ParsedSignature:
         p_sig.ret_annotation = _parse_return_annotation(t)
         return p_sig
 
-def _udf_parser(fn: Callable):
+def _udf_parser(fn: Callable) -> Optional[Callable]:
     """A decorator that acts as a transparent translator for Python UDFs used in Deephaven query formulas between
     Python and Java. This decorator is intended for internal use by the Deephaven query engine and should not be used by
     users.
@@ -527,6 +535,9 @@ def _udf_parser(fn: Callable):
         return fn
 
     p_sig = _parse_signature(fn)
+    if p_sig is None:
+        return None
+
     return_array = p_sig.ret_annotation.has_array
     ret_np_char = p_sig.ret_annotation.encoded_type[-1]
     ret_dtype = dtypes.from_np_dtype(np.dtype(ret_np_char if ret_np_char != "X" else "O"))
diff --git a/py/server/deephaven/agg.py b/py/server/deephaven/agg.py
index a8af429fc6a..45f7c4668ab 100644
--- a/py/server/deephaven/agg.py
+++ b/py/server/deephaven/agg.py
@@ -3,12 +3,13 @@
 #
 """This module implement various aggregations that can be used in deephaven table's aggregation operations."""
 
-from typing import List, Union, Any
+from typing import List, Union, Any, Optional, Sequence
 
 import jpy
 
 from deephaven import DHError
 from deephaven.jcompat import to_sequence
+from deephaven.filters import Filter, and_
 
 _JAggregation = jpy.get_type("io.deephaven.api.agg.Aggregation")
 _JAggSpec = jpy.get_type("io.deephaven.api.agg.spec.AggSpec")
@@ -52,7 +53,7 @@ def sum_(cols: Union[str, List[str]] = None) -> Aggregation:
     """Creates a Sum aggregation.
 
     Args:
-        cols (Union[str, List[str]]): the column(s) to aggregate on, can be renaming expressions, i.e. "new_col = col";
+        cols (Union[str, List[str]]): the column(s) to aggregate, can be renaming expressions, i.e. "new_col = col";
             default is None, only valid when used in Table agg_all_by operation
 
     Returns:
@@ -65,7 +66,7 @@ def abs_sum(cols: Union[str, List[str]] = None) -> Aggregation:
     """Creates an Absolute-sum aggregation.
 
     Args:
-        cols (Union[str, List[str]]): the column(s) to aggregate on, can be renaming expressions, i.e. "new_col = col";
+        cols (Union[str, List[str]]): the column(s) to aggregate, can be renaming expressions, i.e. "new_col = col";
             default is None, only valid when used in Table agg_all_by operation
 
     Returns:
@@ -78,7 +79,7 @@ def group(cols: Union[str, List[str]] = None) -> Aggregation:
     """Creates a Group aggregation.
 
     Args:
-        cols (Union[str, List[str]]): the column(s) to aggregate on, can be renaming expressions, i.e. "new_col = col";
+        cols (Union[str, List[str]]): the column(s) to aggregate, can be renaming expressions, i.e. "new_col = col";
             default is None, only valid when used in Table agg_all_by operation
 
     Returns:
@@ -91,7 +92,7 @@ def avg(cols: Union[str, List[str]] = None) -> Aggregation:
     """Creates an Average aggregation.
 
     Args:
-        cols (Union[str, List[str]]): the column(s) to aggregate on, can be renaming expressions, i.e. "new_col = col";
+        cols (Union[str, List[str]]): the column(s) to aggregate, can be renaming expressions, i.e. "new_col = col";
             default is None, only valid when used in Table agg_all_by operation
 
     Returns:
@@ -113,6 +114,22 @@ def count_(col: str) -> Aggregation:
         raise DHError(message="count_ aggregation requires a string value for the 'col' argument.")
     return Aggregation(j_aggregation=_JAggregation.AggCount(col))
 
+def count_where(col: str, filters: Union[str, Filter, Sequence[str], Sequence[Filter]]) -> Aggregation:
+    """Creates a CountWhere aggregation with the supplied output column name, counting values that pass the supplied
+    filters.
+
+    Args:
+        col (str): the column to hold the counts of each distinct group
+
+    Returns:
+        an aggregation
+    """
+    if not isinstance(col, str):
+        raise DHError(message="count_where aggregation requires a string value for the 'col' argument.")
+    filters = to_sequence(filters)
+
+    return Aggregation(j_aggregation=_JAggregation.AggCountWhere(col, and_(filters).j_filter))
+
 
 def partition(col: str, include_by_columns: bool = True) -> Aggregation:
     """Creates a Partition aggregation. This is not supported in 'Table.agg_all_by'.
@@ -134,7 +151,7 @@ def count_distinct(cols: Union[str, List[str]] = None, count_nulls: bool = False
     each of the given columns.
 
     Args:
-        cols (Union[str, List[str]]): the column(s) to aggregate on, can be renaming expressions, i.e. "new_col = col";
+        cols (Union[str, List[str]]): the column(s) to aggregate, can be renaming expressions, i.e. "new_col = col";
             default is None, only valid when used in Table agg_all_by operation
         count_nulls (bool): whether null values should be counted, default is False
 
@@ -148,7 +165,7 @@ def first(cols: Union[str, List[str]] = None) -> Aggregation:
     """Creates a First aggregation.
 
     Args:
-        cols (Union[str, List[str]]): the column(s) to aggregate on, can be renaming expressions, i.e. "new_col = col";
+        cols (Union[str, List[str]]): the column(s) to aggregate, can be renaming expressions, i.e. "new_col = col";
             default is None, only valid when used in Table agg_all_by operation
 
     Returns:
@@ -157,30 +174,48 @@ def first(cols: Union[str, List[str]] = None) -> Aggregation:
     return Aggregation(j_agg_spec=_JAggSpec.first(), cols=cols)
 
 
-def formula(formula: str, formula_param: str, cols: Union[str, List[str]] = None) -> Aggregation:
+def formula(formula: str, formula_param: Optional[str] = None, cols: Optional[Union[str, List[str]]] = None) -> Aggregation:
     """Creates a user defined formula aggregation. This formula can contain a combination of any of the following:
         |  Built-in functions such as `min`, `max`, etc.
         |  Mathematical arithmetic such as `*`, `+`, `/`, etc.
         |  User-defined functions
 
+    There are two variants of this call. The preferred variant requires the formula to provide the output column name
+    and specific input column names in the following format:
+        |  formula('output_col=(input_col1 + input_col2) * input_col3')
+    This form does not accept `formula_param` or `cols` arguments because the input and output columns are explicitly
+    set within the formula string.
+
+    The second (deprecated) variant allows the user to apply a formula expression to one input column, producing one
+    output column. In this call the `formula_param` is used as a placeholder for the input column name and the `cols`
+    argument is used to identify the output column name and the input source column when applying the formula. If
+    multiple input/output pairs are specified in the `cols` argument, the formula will be applied to each column in the
+    list.
+
     Args:
-        formula (str): the user defined formula to apply to each group.
-        formula_param (str): the parameter name for the input column's vector within the formula. If formula is
-            `max(each)`, then `each` is the formula_param.
-        cols (Union[str, List[str]]): the column(s) to aggregate on, can be renaming expressions, i.e. "new_col = col";
-            default is None, only valid when used in Table agg_all_by operation
+        formula (str): the user defined formula to apply
+        formula_param (Optional[str]): If provided, supplies the parameter name for the input column's vector within the
+            formula. If formula is `max(each)`, then `each` should be the formula_param. This must be set to None (the
+            default when omitted) when the `formula`argument specifies the input and output columns.
+        cols (Optional[Union[str, List[str]]]): If provided, supplies the column(s) to aggregate, can be renaming
+            expressions, i.e. "new_col = col". This must be set to None (the default when omitted) when the `formula`
+            argument specifies the input and output columns.
 
     Returns:
         an aggregation
     """
-    return Aggregation(j_agg_spec=_JAggSpec.formula(formula, formula_param), cols=cols)
+    if formula_param:
+        return Aggregation(j_agg_spec=_JAggSpec.formula(formula, formula_param), cols=cols)
+    if cols:
+        raise DHError(message="The 'cols' argument is only valid when 'formula_param' is provided.")
+    return Aggregation(j_aggregation=_JAggregation.AggFormula(formula))
 
 
 def last(cols: Union[str, List[str]] = None) -> Aggregation:
     """Creates Last aggregation.
 
     Args:
-        cols (Union[str, List[str]]): the column(s) to aggregate on, can be renaming expressions, i.e. "new_col = col";
+        cols (Union[str, List[str]]): the column(s) to aggregate, can be renaming expressions, i.e. "new_col = col";
             default is None, only valid when used in Table agg_all_by operation
 
     Returns:
@@ -193,7 +228,7 @@ def min_(cols: Union[str, List[str]] = None) -> Aggregation:
     """Creates a Min aggregation.
 
     Args:
-        cols (Union[str, List[str]]): the column(s) to aggregate on, can be renaming expressions, i.e. "new_col = col";
+        cols (Union[str, List[str]]): the column(s) to aggregate, can be renaming expressions, i.e. "new_col = col";
             default is None, only valid when used in Table agg_all_by operation
 
     Returns:
@@ -206,7 +241,7 @@ def max_(cols: Union[str, List[str]] = None) -> Aggregation:
     """Creates a Max aggregation to the ComboAggregation object.
 
     Args:
-        cols (Union[str, List[str]]): the column(s) to aggregate on, can be renaming expressions, i.e. "new_col = col";
+        cols (Union[str, List[str]]): the column(s) to aggregate, can be renaming expressions, i.e. "new_col = col";
             default is None, only valid when used in Table agg_all_by operation
 
     Returns:
@@ -220,7 +255,7 @@ def median(cols: Union[str, List[str]] = None, average_evenly_divided: bool = Tr
     given columns.
 
     Args:
-        cols (Union[str, List[str]]): the column(s) to aggregate on, can be renaming expressions, i.e. "new_col = col";
+        cols (Union[str, List[str]]): the column(s) to aggregate, can be renaming expressions, i.e. "new_col = col";
             default is None, only valid when used in Table agg_all_by operation
         average_evenly_divided (bool): when the group size is an even number, whether to average the two middle values
             for the output value. When set to True, average the two middle values. When set to False, use the smaller
@@ -238,7 +273,7 @@ def pct(percentile: float, cols: Union[str, List[str]] = None, average_evenly_di
 
     Args:
         percentile (float): the percentile used for calculation
-        cols (Union[str, List[str]]): the column(s) to aggregate on, can be renaming expressions, i.e. "new_col = col";
+        cols (Union[str, List[str]]): the column(s) to aggregate, can be renaming expressions, i.e. "new_col = col";
             default is None, only valid when used in Table agg_all_by operation
         average_evenly_divided (bool): when the percentile splits the group into two halves, whether to average the two
             middle values for the output value. When set to True, average the two middle values. When set to False, use
@@ -255,7 +290,7 @@ def sorted_first(order_by: str, cols: Union[str, List[str]] = None) -> Aggregati
 
     Args:
         order_by (str): the column to sort by
-        cols (Union[str, List[str]]): the column(s) to aggregate on, can be renaming expressions, i.e. "new_col = col";
+        cols (Union[str, List[str]]): the column(s) to aggregate, can be renaming expressions, i.e. "new_col = col";
             default is None, only valid when used in Table agg_all_by operation
 
     Returns:
@@ -269,7 +304,7 @@ def sorted_last(order_by: str, cols: Union[str, List[str]] = None) -> Aggregatio
 
     Args:
         order_by (str): the column to sort by
-        cols (Union[str, List[str]]): the column(s) to aggregate on, can be renaming expressions, i.e. "new_col = col";
+        cols (Union[str, List[str]]): the column(s) to aggregate, can be renaming expressions, i.e. "new_col = col";
             default is None, only valid when used in Table agg_all_by operation
 
     Returns:
@@ -286,7 +321,7 @@ def std(cols: Union[str, List[str]] = None) -> Aggregation:
 
 
     Args:
-        cols (Union[str, List[str]]): the column(s) to aggregate on, can be renaming expressions, i.e. "new_col = col";
+        cols (Union[str, List[str]]): the column(s) to aggregate, can be renaming expressions, i.e. "new_col = col";
             default is None, only valid when used in Table agg_all_by operation
 
     Returns:
@@ -301,7 +336,7 @@ def unique(cols: Union[str, List[str]] = None, include_nulls: bool = False, non_
     result is null or the specified non_unique_sentinel value.
 
     Args:
-        cols (Union[str, List[str]]): the column(s) to aggregate on, can be renaming expressions, i.e. "new_col = col";
+        cols (Union[str, List[str]]): the column(s) to aggregate, can be renaming expressions, i.e. "new_col = col";
             default is None, only valid when used in Table agg_all_by operation
         include_nulls (bool): whether null is treated as a value for the purpose of determining if the values in the
             aggregation group are unique, default is False.
@@ -330,7 +365,7 @@ def var(cols: Union[str, List[str]] = None) -> Aggregation:
 
 
     Args:
-        cols (Union[str, List[str]]): the column(s) to aggregate on, can be renaming expressions, i.e. "new_col = col";
+        cols (Union[str, List[str]]): the column(s) to aggregate, can be renaming expressions, i.e. "new_col = col";
             default is None, only valid when used in Table agg_all_by operation
 
     Returns:
@@ -344,7 +379,7 @@ def weighted_avg(wcol: str, cols: Union[str, List[str]] = None) -> Aggregation:
 
     Args:
         wcol (str): the name of the weight column
-        cols (Union[str, List[str]]): the column(s) to aggregate on, can be renaming expressions, i.e. "new_col = col";
+        cols (Union[str, List[str]]): the column(s) to aggregate, can be renaming expressions, i.e. "new_col = col";
             default is None, only valid when used in Table agg_all_by operation
 
     Returns:
@@ -358,7 +393,7 @@ def weighted_sum(wcol: str, cols: Union[str, List[str]] = None) -> Aggregation:
 
     Args:
         wcol (str): the name of the weight column
-        cols (Union[str, List[str]]): the column(s) to aggregate on, can be renaming expressions, i.e. "new_col = col";
+        cols (Union[str, List[str]]): the column(s) to aggregate, can be renaming expressions, i.e. "new_col = col";
             default is None, only valid when used in Table agg_all_by operation
 
     Returns:
@@ -372,7 +407,7 @@ def distinct(cols: Union[str, List[str]] = None, include_nulls: bool = False) ->
     given columns and stores them as vectors.
 
     Args:
-        cols (Union[str, List[str]]): the column(s) to aggregate on, can be renaming expressions, i.e. "new_col = col";
+        cols (Union[str, List[str]]): the column(s) to aggregate, can be renaming expressions, i.e. "new_col = col";
             default is None, only valid when used in Table agg_all_by operation
         include_nulls (bool): whether nulls should be included as distinct values, default is False
 
diff --git a/py/server/deephaven/column.py b/py/server/deephaven/column.py
index bbb5f5008b9..88839233ff0 100644
--- a/py/server/deephaven/column.py
+++ b/py/server/deephaven/column.py
@@ -4,16 +4,17 @@
 
 """ This module implements the Column class and functions that work with Columns. """
 
-from dataclasses import dataclass, field
 from enum import Enum
-from typing import Sequence, Any
+from functools import cached_property
+from typing import Sequence, Any, Optional
+from warnings import warn
 
 import jpy
 
 import deephaven.dtypes as dtypes
 from deephaven import DHError
-from deephaven.dtypes import DType
-from deephaven.dtypes import _instant_array
+from deephaven.dtypes import DType, _instant_array, from_jtype
+from deephaven._wrapper import JObjectWrapper
 
 _JColumnHeader = jpy.get_type("io.deephaven.qst.column.header.ColumnHeader")
 _JColumn = jpy.get_type("io.deephaven.qst.column.Column")
@@ -32,46 +33,151 @@ def __repr__(self):
         return self.name
 
 
-@dataclass
-class Column:
-    """ A Column object represents a column definition in a Deephaven Table. """
-    name: str
-    data_type: DType
-    component_type: DType = None
-    column_type: ColumnType = ColumnType.NORMAL
+class ColumnDefinition(JObjectWrapper):
+    """A Deephaven column definition."""
 
-    @property
-    def j_column_header(self):
-        return _JColumnHeader.of(self.name, self.data_type.qst_type)
+    j_object_type = _JColumnDefinition
+
+    def __init__(self, j_column_definition: jpy.JType):
+        self.j_column_definition = j_column_definition
 
     @property
-    def j_column_definition(self):
-        if hasattr(self.data_type.j_type, 'jclass'):
-            j_data_type = self.data_type.j_type.jclass
-        else:
-            j_data_type = self.data_type.qst_type.clazz()
-        j_component_type = self.component_type.qst_type.clazz() if self.component_type else None
-        j_column_type = self.column_type.value
-        return _JColumnDefinition.fromGenericType(self.name, j_data_type, j_component_type, j_column_type)
-
-
-@dataclass
-class InputColumn(Column):
-    """ An InputColumn represents a user defined column with some input data. """
-    input_data: Any = field(default=None)
-
-    def __post_init__(self):
+    def j_object(self) -> jpy.JType:
+        return self.j_column_definition
+
+    @cached_property
+    def name(self) -> str:
+        """The column name."""
+        return self.j_column_definition.getName()
+
+    @cached_property
+    def data_type(self) -> DType:
+        """The column data type."""
+        return from_jtype(self.j_column_definition.getDataType())
+
+    @cached_property
+    def component_type(self) -> Optional[DType]:
+        """The column component type."""
+        return from_jtype(self.j_column_definition.getComponentType())
+
+    @cached_property
+    def column_type(self) -> ColumnType:
+        """The column type."""
+        return ColumnType(self.j_column_definition.getColumnType())
+
+
+class Column(ColumnDefinition):
+    """A Column object represents a column definition in a Deephaven Table. Deprecated for removal next release, prefer col_def."""
+
+    def __init__(
+            self,
+            name: str,
+            data_type: DType,
+            component_type: DType = None,
+            column_type: ColumnType = ColumnType.NORMAL,
+    ):
+        """Deprecated for removal next release, prefer col_def."""
+        warn(
+            "Column is deprecated for removal next release, prefer col_def",
+            DeprecationWarning,
+            stacklevel=2,
+        )
+        super().__init__(
+            col_def(name, data_type, component_type, column_type).j_column_definition
+        )
+
+
+class InputColumn:
+    """An InputColumn represents a user defined column with some input data."""
+
+    def __init__(
+            self,
+            name: str = None,
+            data_type: DType = None,
+            component_type: DType = None,
+            column_type: ColumnType = ColumnType.NORMAL,
+            input_data: Any = None,
+    ):
+        """Creates an InputColumn.
+        Args:
+            name (str): the column name
+            data_type (DType): the column data type
+            component_type (Optional[DType]): the column component type, None by default
+            column_type (ColumnType): the column type, NORMAL by default
+            input_data: Any: the input data, by default is None
+
+        Returns:
+            a new InputColumn
+
+        Raises:
+            DHError
+        """
         try:
-            if self.input_data is None:
-                self.j_column = _JColumn.empty(self.j_column_header)
-            else:
-                if self.data_type.is_primitive:
-                    self.j_column = _JColumn.ofUnsafe(self.name, dtypes.array(self.data_type, self.input_data,
-                                                                              remap=dtypes.null_remap(self.data_type)))
-                else:
-                    self.j_column = _JColumn.of(self.j_column_header, dtypes.array(self.data_type, self.input_data))
+            self._column_definition = col_def(
+                name, data_type, component_type, column_type
+            )
+            self.j_column = self._to_j_column(input_data)
         except Exception as e:
-            raise DHError(e, f"failed to create an InputColumn ({self.name}).") from e
+            raise DHError(e, f"failed to create an InputColumn ({name}).") from e
+
+    def _to_j_column(self, input_data: Any = None) -> jpy.JType:
+        if input_data is None:
+            return _JColumn.empty(
+                _JColumnHeader.of(
+                    self._column_definition.name,
+                    self._column_definition.data_type.qst_type,
+                )
+            )
+        if self._column_definition.data_type.is_primitive:
+            return _JColumn.ofUnsafe(
+                self._column_definition.name,
+                dtypes.array(
+                    self._column_definition.data_type,
+                    input_data,
+                    remap=dtypes.null_remap(self._column_definition.data_type),
+                ),
+            )
+        return _JColumn.of(
+            _JColumnHeader.of(
+                self._column_definition.name, self._column_definition.data_type.qst_type
+            ),
+            dtypes.array(self._column_definition.data_type, input_data),
+        )
+
+
+def col_def(
+    name: str,
+    data_type: DType,
+    component_type: Optional[DType] = None,
+    column_type: ColumnType = ColumnType.NORMAL,
+) -> ColumnDefinition:
+    """Creates a ColumnDefinition.
+
+    Args:
+        name (str): the column name
+        data_type (DType): the column data type
+        component_type (Optional[DType]): the column component type, None by default
+        column_type (ColumnType): the column type, ColumnType.NORMAL by default
+
+    Returns:
+        a new ColumnDefinition
+
+    Raises:
+        DHError
+    """
+    try:
+        return ColumnDefinition(
+            _JColumnDefinition.fromGenericType(
+                name,
+                data_type.j_type.jclass
+                if hasattr(data_type.j_type, "jclass")
+                else data_type.qst_type.clazz(),
+                component_type.qst_type.clazz() if component_type else None,
+                column_type.value,
+            )
+        )
+    except Exception as e:
+        raise DHError(e, f"failed to create a ColumnDefinition ({name}).") from e
 
 
 def bool_col(name: str, data: Sequence) -> InputColumn:
diff --git a/py/server/deephaven/experimental/__init__.py b/py/server/deephaven/experimental/__init__.py
index 7c9b59c9cb6..1a8de8a6347 100644
--- a/py/server/deephaven/experimental/__init__.py
+++ b/py/server/deephaven/experimental/__init__.py
@@ -7,6 +7,7 @@
 import jpy
 from deephaven import DHError
 from deephaven.table import Table
+from deephaven.update_graph import auto_locking_ctx
 
 _JWindowCheck = jpy.get_type("io.deephaven.engine.util.WindowCheck")
 
@@ -31,6 +32,7 @@ def time_window(table: Table, ts_col: str, window: int, bool_col: str) -> Table:
         DHError
     """
     try:
-        return Table(j_table=_JWindowCheck.addTimeWindow(table.j_table, ts_col, window, bool_col))
+        with auto_locking_ctx(table):
+            return Table(j_table=_JWindowCheck.addTimeWindow(table.j_table, ts_col, window, bool_col))
     except Exception as e:
         raise DHError(e, "failed to create a time window table.") from e
diff --git a/py/server/deephaven/experimental/iceberg.py b/py/server/deephaven/experimental/iceberg.py
index 7506bc95a25..16e9d359256 100644
--- a/py/server/deephaven/experimental/iceberg.py
+++ b/py/server/deephaven/experimental/iceberg.py
@@ -2,22 +2,28 @@
 # Copyright (c) 2016-2024 Deephaven Data Labs and Patent Pending
 #
 """ This module adds Iceberg table support into Deephaven. """
-from typing import List, Optional, Union, Dict, Sequence
+from __future__ import annotations
+from typing import Optional, Dict, Union, Sequence
 
 import jpy
 
 from deephaven import DHError
 from deephaven._wrapper import JObjectWrapper
-from deephaven.column import Column
-from deephaven.dtypes import DType
 from deephaven.experimental import s3
+from deephaven.table import Table, TableDefinition, TableDefinitionLike
 
-from deephaven.jcompat import j_table_definition
+from deephaven.jcompat import j_hashmap
 
-from deephaven.table import Table
-
-_JIcebergInstructions = jpy.get_type("io.deephaven.iceberg.util.IcebergInstructions")
+_JIcebergUpdateMode = jpy.get_type("io.deephaven.iceberg.util.IcebergUpdateMode")
+_JIcebergReadInstructions = jpy.get_type("io.deephaven.iceberg.util.IcebergReadInstructions")
+_JIcebergWriteInstructions = jpy.get_type("io.deephaven.iceberg.util.IcebergWriteInstructions")
+_JSchemaProvider = jpy.get_type("io.deephaven.iceberg.util.SchemaProvider")
+_JTableParquetWriterOptions = jpy.get_type("io.deephaven.iceberg.util.TableParquetWriterOptions")
 _JIcebergCatalogAdapter = jpy.get_type("io.deephaven.iceberg.util.IcebergCatalogAdapter")
+_JIcebergTableAdapter = jpy.get_type("io.deephaven.iceberg.util.IcebergTableAdapter")
+_JIcebergTableWriter = jpy.get_type("io.deephaven.iceberg.util.IcebergTableWriter")
+_JIcebergTable = jpy.get_type("io.deephaven.iceberg.util.IcebergTable")
+_JIcebergTools = jpy.get_type("io.deephaven.iceberg.util.IcebergTools")
 
 # IcebergToolsS3 is an optional library
 try:
@@ -30,29 +36,83 @@
 _JSnapshot = jpy.get_type("org.apache.iceberg.Snapshot")
 
 
-class IcebergInstructions(JObjectWrapper):
+class IcebergUpdateMode(JObjectWrapper):
+    """
+    :class:`.IcebergUpdateMode` specifies the update mode for an Iceberg table to be loaded into Deephaven. The modes
+    are:
+
+    - :py:func:`static() <IcebergUpdateMode.static>`: The table is loaded once and does not change
+    - :py:func:`manual_refresh() <IcebergUpdateMode.manual_refresh>`: The table can be manually refreshed by the user.
+    - :py:func:`auto_refresh() <IcebergUpdateMode.auto_refresh>`: The table will be automatically refreshed at a
+            system-defined interval (also can call :py:func:`auto_refresh(auto_refresh_ms: int) <IcebergUpdateMode.auto_refresh>`
+            to specify an interval rather than use the system default of 60 seconds).
+    """
+    j_object_type = _JIcebergUpdateMode
+
+    def __init__(self, mode: _JIcebergUpdateMode):
+        self._j_object = mode
+
+    @classmethod
+    def static(cls) -> IcebergUpdateMode:
+        """
+        Creates an IcebergUpdateMode with no refreshing supported.
+        """
+        return IcebergUpdateMode(_JIcebergUpdateMode.staticMode())
+
+    @classmethod
+    def manual_refresh(cls) -> IcebergUpdateMode:
+        """
+        Creates an IcebergUpdateMode with manual refreshing enabled.
+        """
+        return IcebergUpdateMode(_JIcebergUpdateMode.manualRefreshingMode())
+
+    @classmethod
+    def auto_refresh(cls, auto_refresh_ms: Optional[int] = None) -> IcebergUpdateMode:
+        """
+        Creates an IcebergUpdateMode with auto-refreshing enabled.
+
+        Args:
+            auto_refresh_ms (int): the refresh interval in milliseconds; if omitted, the default of 60 seconds
+                is used.
+        """
+        if auto_refresh_ms is None:
+            return IcebergUpdateMode(_JIcebergUpdateMode.autoRefreshingMode())
+        return IcebergUpdateMode(_JIcebergUpdateMode.autoRefreshingMode(auto_refresh_ms))
+
+    @property
+    def j_object(self) -> jpy.JType:
+        return self._j_object
+
+
+class IcebergReadInstructions(JObjectWrapper):
     """
-    This class specifies the instructions for reading an Iceberg table into Deephaven. These include column rename
-    instructions and table definitions, as well as special data instructions for loading data files from the cloud.
+    :class:`.IcebergReadInstructions` specifies the instructions for reading an Iceberg table into Deephaven. These
+    include column rename instructions and table definitions, as well as special data instructions for loading data
+    files from the cloud.
     """
 
-    j_object_type = _JIcebergInstructions
+    j_object_type = _JIcebergReadInstructions
 
     def __init__(self,
-                 table_definition: Optional[Union[Dict[str, DType], List[Column]]] = None,
+                 table_definition: Optional[TableDefinitionLike] = None,
                  data_instructions: Optional[s3.S3Instructions] = None,
-                 column_renames: Optional[Dict[str, str]] = None):
+                 column_renames: Optional[Dict[str, str]] = None,
+                 update_mode: Optional[IcebergUpdateMode] = None,
+                 snapshot_id: Optional[int] = None):
         """
         Initializes the instructions using the provided parameters.
 
         Args:
-            table_definition (Optional[Union[Dict[str, DType], List[Column], None]]): the table definition; if omitted,
+            table_definition (Optional[TableDefinitionLike]): the table definition; if omitted,
                 the definition is inferred from the Iceberg schema. Setting a definition guarantees the returned table
                 will have that definition. This is useful for specifying a subset of the Iceberg schema columns.
             data_instructions (Optional[s3.S3Instructions]): Special instructions for reading data files, useful when
                 reading files from a non-local file system, like S3.
             column_renames (Optional[Dict[str, str]]): A dictionary of old to new column names that will be renamed in
                 the output table.
+            update_mode (Optional[IcebergUpdateMode]): The update mode for the table. If omitted, the default update
+                mode of :py:func:`IcebergUpdateMode.static() <IcebergUpdateMode.static>` is used.
+            snapshot_id (Optional[int]): the snapshot id to read; if omitted the most recent snapshot will be selected.
 
         Raises:
             DHError: If unable to build the instructions object.
@@ -61,16 +121,22 @@ def __init__(self,
         try:
             builder = self.j_object_type.builder()
 
-            if table_definition is not None:
-                builder.tableDefinition(j_table_definition(table_definition))
+            if table_definition:
+                builder.tableDefinition(TableDefinition(table_definition).j_table_definition)
 
-            if data_instructions is not None:
+            if data_instructions:
                 builder.dataInstructions(data_instructions.j_object)
 
-            if column_renames is not None:
+            if column_renames:
                 for old_name, new_name in column_renames.items():
                     builder.putColumnRenames(old_name, new_name)
 
+            if update_mode:
+                builder.updateMode(update_mode.j_object)
+
+            if snapshot_id:
+                builder.snapshotId(snapshot_id)
+
             self._j_object = builder.build()
         except Exception as e:
             raise DHError(e, "Failed to build Iceberg instructions") from e
@@ -80,10 +146,369 @@ def j_object(self) -> jpy.JType:
         return self._j_object
 
 
+class IcebergWriteInstructions(JObjectWrapper):
+    """
+    :class:`.IcebergWriteInstructions` provides instructions intended for writing deephaven tables as partitions to Iceberg
+    tables.
+    """
+
+    j_object_type = _JIcebergWriteInstructions
+
+    def __init__(self,
+                 tables: Union[Table, Sequence[Table]],
+                 partition_paths: Optional[Union[str, Sequence[str]]] = None):
+        """
+        Initializes the instructions using the provided parameters.
+
+        Args:
+            tables (Union[Table, Sequence[Table]]): The deephaven tables to write.
+            partition_paths (Optional[Union[str, Sequence[str]]]): The partition paths where each table will be written.
+                For example, if the iceberg table is partitioned by "year" and "month", a partition path could be
+                "year=2021/month=01".
+                If writing to a partitioned iceberg table, users must provide partition path for each table in tables
+                argument in the same order.
+                Else when writing to a non-partitioned table, users should not provide any partition paths.
+                Defaults to `None`, which means the deephaven tables will be written to the root data directory of the
+                iceberg table.
+
+        Raises:
+            DHError: If unable to build the instructions object.
+        """
+
+        try:
+            builder = self.j_object_type.builder()
+
+            if isinstance(tables, Table):
+                builder.addTables(tables.j_table)
+            elif isinstance(tables, Sequence):
+                for table in tables:
+                    builder.addTables(table.j_table)
+
+            if partition_paths:
+                if isinstance(partition_paths, str):
+                    builder.addPartitionPaths(partition_paths)
+                elif isinstance(partition_paths, Sequence):
+                    for partition_path in partition_paths:
+                        builder.addPartitionPaths(partition_path)
+
+            self._j_object = builder.build()
+
+        except Exception as e:
+            raise DHError(e, "Failed to build Iceberg write instructions") from e
+
+    @property
+    def j_object(self) -> jpy.JType:
+        return self._j_object
+
+
+class SchemaProvider(JObjectWrapper):
+    """
+    :class:`.SchemaProvider` is used to extract the schema from an Iceberg table. Users can specify multiple ways to do
+    so, for example, by schema ID, snapshot ID, current schema, etc. This can be useful for passing a schema when
+    writing to an Iceberg table.
+    """
+
+    j_object_type = _JSchemaProvider
+
+    def __init__(self, _j_object: jpy.JType):
+        """
+        Initializes the :class:`.SchemaProvider` object.
+
+        Args:
+            _j_object (SchemaProvider): the Java :class:`.SchemaProvider` object.
+        """
+        self._j_object = _j_object
+
+    @property
+    def j_object(self) -> jpy.JType:
+        return self._j_object
+
+    @classmethod
+    def from_current(cls) -> 'SchemaProvider':
+        """
+        Used for extracting the current schema from the table.
+
+        Returns:
+            the SchemaProvider object.
+        """
+        return cls(_JSchemaProvider.fromCurrent())
+
+    @classmethod
+    def from_schema_id(cls, schema_id: int) -> 'SchemaProvider':
+        """
+        Used for extracting the schema from the table using the specified schema id.
+
+        Args:
+            schema_id (int): the schema id to use.
+
+        Returns:
+            the :class:`.SchemaProvider` object.
+        """
+        return cls(_JSchemaProvider.fromSchemaId(schema_id))
+
+    @classmethod
+    def from_snapshot_id(cls, snapshot_id: int) -> 'SchemaProvider':
+        """
+        Used for extracting the schema from the table using the specified snapshot id.
+
+        Args:
+            snapshot_id (int): the snapshot id to use.
+
+        Returns:
+            the :class:`.SchemaProvider` object.
+        """
+        return cls(_JSchemaProvider.fromSnapshotId(snapshot_id))
+
+    @classmethod
+    def from_current_snapshot(cls) -> 'SchemaProvider':
+        """
+        Used for extracting the schema from the table using the current snapshot.
+
+        Returns:
+            the SchemaProvider object.
+        """
+        return cls(_JSchemaProvider.fromCurrentSnapshot())
+
+
+class TableParquetWriterOptions(JObjectWrapper):
+    """
+    :class:`.TableParquetWriterOptions` provides specialized instructions for configuring :class:`.IcebergTableWriter`
+    instances.
+    """
+
+    j_object_type = _JTableParquetWriterOptions
+
+    def __init__(self,
+                 table_definition: TableDefinitionLike,
+                 schema_provider: Optional[SchemaProvider] = None,
+                 field_id_to_column_name: Optional[Dict[int, str]] = None,
+                 compression_codec_name: Optional[str] = None,
+                 maximum_dictionary_keys: Optional[int] = None,
+                 maximum_dictionary_size: Optional[int] = None,
+                 target_page_size: Optional[int] = None,
+                 data_instructions: Optional[s3.S3Instructions] = None):
+        """
+        Initializes the instructions using the provided parameters.
+
+        Args:
+            table_definition: TableDefinitionLike: The table definition to use when writing Iceberg data files using
+                this writer instance. This definition can be used to skip some columns or add additional columns with
+                null values. The provided definition should have at least one column.
+            schema_provider: Optional[SchemaProvider]: Used to extract a Schema from a iceberg table. This schema will
+                be used in conjunction with the field_id_to_column_name to map Deephaven columns from table_definition
+                to Iceberg columns.
+                Users can specify how to extract the schema in multiple ways (by ID, snapshot ID, initial schema, etc.).
+                Defaults to `None`, which means use the current schema from the table.
+            field_id_to_column_name: Optional[Dict[int, str]]: A one-to-one map from Iceberg field IDs from the
+                schema_spec to Deephaven column names from the table_definition.
+                Defaults to `None`, which means map Iceberg columns to Deephaven columns using column names.
+            compression_codec_name (Optional[str]): The compression codec to use for writing the parquet file. Allowed
+                values include "UNCOMPRESSED", "SNAPPY", "GZIP", "LZO", "LZ4", "LZ4_RAW", "ZSTD", etc. Defaults to
+                `None`, which means use "SNAPPY".
+            maximum_dictionary_keys (Optional[int]): the maximum number of unique keys the Parquet writer should add to
+                a dictionary page before switching to non-dictionary encoding, never used for non-String columns.
+                Defaults to `None`, which means use 2^20 (1,048,576)
+            maximum_dictionary_size (Optional[int]): the maximum number of bytes the Parquet writer should add to the
+                dictionary before switching to non-dictionary encoding, never used for non-String columns. Defaults to
+                `None`, which means use 2^20 (1,048,576)
+            target_page_size (Optional[int]): the target Parquet file page size in bytes, if not specified. Defaults to
+                `None`, which means use 2^20 bytes (1 MiB)
+
+        Raises:
+            DHError: If unable to build the object.
+        """
+
+        try:
+            builder = self.j_object_type.builder()
+
+            builder.tableDefinition(TableDefinition(table_definition).j_table_definition)
+
+            if schema_provider:
+                builder.schemaProvider(schema_provider.j_object)
+
+            if field_id_to_column_name:
+                for field_id, column_name in field_id_to_column_name.items():
+                    builder.putFieldIdToColumnName(field_id, column_name)
+
+            if compression_codec_name:
+                builder.compressionCodecName(compression_codec_name)
+
+            if maximum_dictionary_keys:
+                builder.maximumDictionaryKeys(maximum_dictionary_keys)
+
+            if maximum_dictionary_size:
+                builder.maximumDictionarySize(maximum_dictionary_size)
+
+            if target_page_size:
+                builder.targetPageSize(target_page_size)
+
+            if data_instructions:
+                builder.dataInstructions(data_instructions.j_object)
+
+            self._j_object = builder.build()
+
+        except Exception as e:
+            raise DHError(e, "Failed to build Iceberg write instructions") from e
+
+    @property
+    def j_object(self) -> jpy.JType:
+        return self._j_object
+
+
+class IcebergTable(Table):
+    """
+    :class:`.IcebergTable` is a subclass of Table that allows users to dynamically update the table with new snapshots
+    from the Iceberg catalog.
+    """
+    j_object_type = _JIcebergTable
+
+    def __init__(self, j_table: jpy.JType):
+        super().__init__(j_table)
+
+    def update(self, snapshot_id: Optional[int] = None):
+        """
+        Updates the table to match the contents of the specified snapshot. This may result in row removes and additions
+        that will be propagated asynchronously via this IcebergTable's UpdateGraph. If no snapshot is provided, the
+        most recent snapshot is used.
+
+        NOTE: this method is only valid when the table is in `manual_refresh()` mode. Iceberg tables in `static()` or
+        `auto_refresh()` mode cannot be updated manually and will throw an exception if this method is called.
+
+        Args:
+            snapshot_id (Optional[int]): the snapshot id to update to; if omitted the most recent snapshot will be used.
+
+        Raises:
+            DHError: If unable to update the Iceberg table.
+
+        """
+        try:
+            if snapshot_id:
+                self.j_object.update(snapshot_id)
+                return
+            self.j_object.update()
+        except Exception as e:
+            raise DHError(e, "Failed to update Iceberg table") from e
+
+    @property
+    def j_object(self) -> jpy.JType:
+        return self.j_table
+
+
+class IcebergTableWriter(JObjectWrapper):
+    """
+    :class:`.IcebergTableWriter` is responsible for writing Deephaven tables to an Iceberg table. Each
+    :class:`.IcebergTableWriter` instance associated with a single :class:`.IcebergTableAdapter` and can be used to
+    write multiple Deephaven tables to this Iceberg table.
+    """
+    j_object_type = _JIcebergTableWriter or type(None)
+
+    def __init__(self, j_object: _JIcebergTableWriter):
+        self.j_table_writer = j_object
+
+    def append(self, instructions: IcebergWriteInstructions):
+        """
+        Append the provided Deephaven tables as new partitions to the existing Iceberg table in a single snapshot.
+        Users can provide the tables using the :attr:`.IcebergWriteInstructions.tables` parameter and optionally provide the
+        partition paths where each table will be written using the :attr:`.IcebergWriteInstructions.partition_paths`
+        parameter.
+        This method will not perform any compatibility checks between the existing schema and the provided Deephaven
+        tables. All such checks happen at the time of creation of the :class:`.IcebergTableWriter` instance.
+
+        Args:
+            instructions (IcebergWriteInstructions): the customization instructions for write.
+        """
+        self.j_object.append(instructions.j_object)
+
+    @property
+    def j_object(self) -> jpy.JType:
+        return self.j_table_writer
+
+
+class IcebergTableAdapter(JObjectWrapper):
+    """
+    :class:`.IcebergTableAdapter` provides an interface for interacting with Iceberg tables. It allows the user to list
+    snapshots, retrieve table definitions and reading Iceberg tables into Deephaven tables.
+    """
+    j_object_type = _JIcebergTableAdapter or type(None)
+
+    def __init__(self, j_object: _JIcebergTableAdapter):
+        self.j_table_adapter = j_object
+
+    def snapshots(self) -> Table:
+        """
+        Returns information on the snapshots of this table as a Deephaven table. The table contains the
+        following columns:
+        - `Id`: the snapshot identifier (can be used for updating the table or loading a specific snapshot).
+        - `TimestampMs`: the timestamp of the snapshot.
+        - `Operation`: the data operation that created this snapshot.
+        - `Summary`: additional information about this snapshot from the Iceberg metadata.
+        - `SnapshotObject`: a Java object containing the Iceberg API snapshot.
+
+        Returns:
+            a table containing the snapshot information.
+        """
+        return Table(self.j_object.snapshots())
+
+    def definition(self, instructions: Optional[IcebergReadInstructions] = None) -> Table:
+        """
+        Returns the Deephaven table definition as a Deephaven table.
+
+        Args:
+            instructions (Optional[IcebergReadInstructions]): the instructions for reading the table. These instructions
+                can include column renames, table definition, and specific data instructions for reading the data files
+                from the provider. If omitted, the table will be read with default instructions.
+
+        Returns:
+            a table containing the table definition.
+        """
+
+        if instructions:
+            return Table(self.j_object.definitionTable(instructions.j_object))
+        return Table(self.j_object.definitionTable())
+
+    def table(self, instructions: Optional[IcebergReadInstructions] = None) -> IcebergTable:
+        """
+        Reads the table using the provided instructions. Optionally, a snapshot id can be provided to read a specific
+        snapshot of the table.
+
+        Args:
+            instructions (Optional[IcebergReadInstructions]): the instructions for reading the table. These instructions
+                can include column renames, table definition, and specific data instructions for reading the data files
+                from the provider. If omitted, the table will be read in `static()` mode without column renames or data
+                instructions.
+
+        Returns:
+            the table read from the catalog.
+        """
+
+        if instructions:
+            return IcebergTable(self.j_object.table(instructions.j_object))
+        return IcebergTable(self.j_object.table())
+
+    def table_writer(self, writer_options: TableParquetWriterOptions) -> IcebergTableWriter:
+        """
+        Create a new :class:`.IcebergTableWriter` for this Iceberg table using the provided writer options.
+        This method will perform schema validation to ensure that the provided table definition from the writer options
+        is compatible with the Iceberg table schema. All further writes performed by the returned writer will not be
+        validated against the table's schema, and thus will be faster.
+
+        Args:
+            writer_options: The options to configure the table writer.
+
+        Returns:
+            the table writer object
+        """
+        return IcebergTableWriter(self.j_object.tableWriter(writer_options.j_object))
+
+    @property
+    def j_object(self) -> jpy.JType:
+        return self.j_table_adapter
+
+
 class IcebergCatalogAdapter(JObjectWrapper):
     """
-    This class provides an interface for interacting with Iceberg catalogs. It allows listing namespaces, tables and
-    snapshots, as well as reading Iceberg tables into Deephaven tables.
+    :class:`.IcebergCatalogAdapter` provides an interface for interacting with Iceberg catalogs. It allows listing
+    namespaces, tables and snapshots, as well as reading Iceberg tables into Deephaven tables.
     """
     j_object_type = _JIcebergCatalogAdapter or type(None)
 
@@ -103,9 +528,9 @@ def namespaces(self, namespace: Optional[str] = None) -> Table:
             a table containing the namespaces.
         """
 
-        if namespace is not None:
-            return Table(self.j_object.listNamespaces(namespace))
-        return Table(self.j_object.listNamespacesAsTable())
+        if namespace:
+            return Table(self.j_object.namespaces(namespace))
+        return Table(self.j_object.namespaces())
 
     def tables(self, namespace: str) -> Table:
         """
@@ -118,47 +543,36 @@ def tables(self, namespace: str) -> Table:
             a table containing the tables in the provided namespace.
         """
 
-        if namespace is not None:
-            return Table(self.j_object.listTablesAsTable(namespace))
-        return Table(self.j_object.listTablesAsTable())
+        return Table(self.j_object.tables(namespace))
 
-    def snapshots(self, table_identifier: str) -> Table:
+    def load_table(self, table_identifier: str) -> IcebergTableAdapter:
         """
-        Returns information on the snapshots of the specified table as a Deephaven table.
+        Load the table from the catalog.
 
         Args:
-            table_identifier (str): the table from which to list snapshots.
+            table_identifier (str): the table to read.
 
         Returns:
-            a table containing the snapshot information.
+            Table: the table read from the catalog.
         """
 
-        return self.j_object.listSnapshotsAsTable(table_identifier)
+        return IcebergTableAdapter(self.j_object.loadTable(table_identifier))
 
-    def read_table(self, table_identifier: str, instructions: Optional[IcebergInstructions] = None, snapshot_id: Optional[int] = None) -> Table:
+    def create_table(self, table_identifier: str, table_definition: TableDefinitionLike) -> IcebergTableAdapter:
         """
-        Reads the table from the catalog using the provided instructions. Optionally, a snapshot id can be provided to
-        read a specific snapshot of the table.
+        Create a new Iceberg table in the catalog with the given table identifier and definition.
+        All columns of partitioning type will be used to create the partition spec for the table.
 
         Args:
-            table_identifier (str): the table to read.
-            instructions (Optional[IcebergInstructions]): the instructions for reading the table. These instructions
-                can include column renames, table definition, and specific data instructions for reading the data files
-                from the provider. If omitted, the table will be read with default instructions.
-            snapshot_id (Optional[int]): the snapshot id to read; if omitted the most recent snapshot will be selected.
+            table_identifier (str): the identifier of the new table.
+            table_definition (TableDefinitionLike): the table definition of the new table.
 
         Returns:
-            Table: the table read from the catalog.
+            :class:`.IcebergTableAdapter`: the table adapter for the new Iceberg table.
         """
 
-        if instructions is not None:
-            instructions_object = instructions.j_object
-        else:
-            instructions_object = _JIcebergInstructions.DEFAULT
-
-        if snapshot_id is not None:
-            return Table(self.j_object.readTable(table_identifier, snapshot_id, instructions_object))
-        return Table(self.j_object.readTable(table_identifier, instructions_object))
+        return IcebergTableAdapter(self.j_object.createTable(table_identifier,
+                                                             TableDefinition(table_definition).j_table_definition))
 
     @property
     def j_object(self) -> jpy.JType:
@@ -194,7 +608,7 @@ def adapter_s3_rest(
             need to set this; it is most useful when connecting to non-AWS, S3-compatible APIs.
 
     Returns:
-        IcebergCatalogAdapter: the catalog adapter for the provided S3 REST catalog.
+        :class:`.IcebergCatalogAdapter`: the catalog adapter for the provided S3 REST catalog.
 
     Raises:
         DHError: If unable to build the catalog adapter.
@@ -232,7 +646,7 @@ def adapter_aws_glue(
             catalog URI.
 
     Returns:
-        IcebergCatalogAdapter: the catalog adapter for the provided AWS Glue catalog.
+        :class:`.IcebergCatalogAdapter`: the catalog adapter for the provided AWS Glue catalog.
 
     Raises:
         DHError: If unable to build the catalog adapter.
@@ -250,3 +664,113 @@ def adapter_aws_glue(
     except Exception as e:
         raise DHError(e, "Failed to build Iceberg Catalog Adapter") from e
 
+
+def adapter(
+        name: Optional[str] = None,
+        properties: Optional[Dict[str, str]] = None,
+        hadoop_config: Optional[Dict[str, str]] = None,
+        s3_instructions: Optional[s3.S3Instructions] = None
+) -> IcebergCatalogAdapter:
+    """
+    Create an Iceberg catalog adapter from configuration properties. These properties map to the Iceberg catalog Java
+    API properties and are used to select the catalog and file IO implementations.
+
+    The minimal set of properties required to create an Iceberg catalog are the following:
+    - `catalog-impl` or `type` - the Java catalog implementation to use. When providing `catalog-impl`, the
+            implementing Java class should be provided (e.g. `org.apache.iceberg.rest.RESTCatalog` or
+            `org.apache.iceberg.aws.glue.GlueCatalog`). Choices for `type` include `hive`, `hadoop`, `rest`, `glue`,
+            `nessie`, `jdbc`.
+
+    To ensure consistent behavior across Iceberg-managed and Deephaven-managed AWS clients, it's recommended to use the
+    `s3_instructions` parameter to specify AWS/S3 connectivity details. This approach offers a high degree of parity in
+    construction logic.
+
+    For complex use cases, consider using S3 Instruction profiles, which provide extensive configuration options. When
+    set, these instructions are automatically included in the :meth:`.IcebergInstructions.__init__` `data_instructions`.
+
+    If you prefer to use Iceberg's native AWS properties, Deephaven will attempt to infer the necessary construction
+    logic. However, in advanced scenarios, there might be discrepancies between the two clients, potentially leading to
+    limitations like being able to browse catalog metadata but not retrieve table data.
+
+    Other common properties include:
+    - `uri` - the URI of the catalog
+    - `warehouse` - the root path of the data warehouse.
+
+    Example usage #1 - REST catalog with an S3 backend:
+    ```
+    from deephaven.experimental import iceberg
+    from deephaven.experimental.s3 import S3Instructions, Credentials
+
+    adapter = iceberg.adapter(
+        name="MyCatalog",
+        properties={
+            "type": "rest",
+            "uri": "http://my-rest-catalog:8181/api",
+            # Note: Other properties may be needed depending on the REST Catalog implementation
+            # "warehouse": "catalog-id",
+            # "credential": "username:password"
+        },
+        s3_instructions=S3Instructions(
+            region_name="us-east-1",
+            credentials=Credentials.basic("my_access_key_id", "my_secret_access_key"),
+        ),
+    )
+    ```
+
+    Example usage #2 - AWS Glue catalog:
+    ```
+    from deephaven.experimental import iceberg
+    from deephaven.experimental.s3 import S3Instructions
+
+    # Note: region and credential information will be loaded from the specified profile
+    adapter = iceberg.adapter(
+        name="MyCatalog",
+        properties={
+            "type": "glue",
+            "uri": "s3://lab-warehouse/sales",
+        },
+        s3_instructions=S3Instructions(
+            profile_name="MyGlueProfile",
+        ),
+    )
+    ```
+
+    Args:
+        name (Optional[str]): a descriptive name of the catalog; if omitted the catalog name is inferred from the
+            catalog URI property.
+        properties (Optional[Dict[str, str]]): the properties of the catalog to load
+        hadoop_config (Optional[Dict[str, str]]): hadoop configuration properties for the catalog to load
+        s3_instructions (Optional[s3.S3Instructions]): the S3 instructions if applicable
+    Returns:
+        :class:`.IcebergCatalogAdapter`: the catalog adapter created from the provided properties
+
+    Raises:
+        DHError: If unable to build the catalog adapter
+    """
+    if s3_instructions:
+        if not _JIcebergToolsS3:
+            raise DHError(
+                message="`adapter` with s3_instructions requires the Iceberg-specific Deephaven S3 extensions to be installed"
+            )
+        try:
+            return IcebergCatalogAdapter(
+                _JIcebergToolsS3.createAdapter(
+                    name,
+                    j_hashmap(properties if properties else {}),
+                    j_hashmap(hadoop_config if hadoop_config else {}),
+                    s3_instructions.j_object,
+                )
+            )
+        except Exception as e:
+            raise DHError(e, "Failed to build Iceberg Catalog Adapter") from e
+
+    try:
+        return IcebergCatalogAdapter(
+            _JIcebergTools.createAdapter(
+                name,
+                j_hashmap(properties if properties else {}),
+                j_hashmap(hadoop_config if hadoop_config else {}),
+            )
+        )
+    except Exception as e:
+        raise DHError(e, "Failed to build Iceberg Catalog Adapter") from e
diff --git a/py/server/deephaven/experimental/s3.py b/py/server/deephaven/experimental/s3.py
index c19a381b4d0..afe2b463e88 100644
--- a/py/server/deephaven/experimental/s3.py
+++ b/py/server/deephaven/experimental/s3.py
@@ -1,16 +1,14 @@
 #
 # Copyright (c) 2016-2024 Deephaven Data Labs and Patent Pending
 #
-import datetime
 from typing import Optional, Union
+from warnings import warn
 
 import jpy
-import numpy as np
-import pandas as pd
 
-from deephaven import time, DHError
+from deephaven import DHError
 from deephaven._wrapper import JObjectWrapper
-from deephaven.dtypes import Duration
+from deephaven.time import DurationLike, to_j_duration
 
 # If we move S3 to a permanent module, we should remove this try/except block and just import the types directly.
 try:
@@ -21,61 +19,196 @@
     _JS3Instructions = None
 
 """
-    This module is useful for reading files stored in S3-compatible APIs.
+    This module is useful for reading from and writing to S3-compatible APIs.
     Importing this module requires the S3 specific deephaven extensions (artifact name deephaven-extensions-s3) to be
     included in the package. This is an opt-out functionality included by default. If not included, importing this
     module will fail to find the java types.
 """
+
+
+class Credentials(JObjectWrapper):
+    """
+    Credentials object for authenticating with an S3 server.
+    """
+    j_object_type = _JCredentials
+
+    def __init__(self, _j_object: jpy.JType):
+        """
+        Initializes the credentials object.
+
+        Args:
+            _j_object (Credentials): the Java credentials object.
+        """
+        self._j_object = _j_object
+
+    @property
+    def j_object(self) -> jpy.JType:
+        return self._j_object
+
+    @classmethod
+    def resolving(cls) -> 'Credentials':
+        """
+        Default credentials provider used by Deephaven which resolves credentials in the following order:
+
+        1. If a profile name, config file path, or credentials file path is provided via S3 Instructions, use the
+        profile_name for loading the credentials from the config and credentials file and fail if none is found.
+
+        2. Otherwise, use the default AWS SDK behavior that looks for credentials in this order: Java System Properties
+        (`aws.accessKeyId` and `aws.secretAccessKey`), Environment Variables (`AWS_ACCESS_KEY_ID` and
+        `AWS_SECRET_ACCESS_KEY`), Credential profiles file at the default location (~/.aws/credentials), or Instance
+        profile credentials delivered through the Amazon EC2  metadata service. If still none found, fall back to
+        anonymous credentials, which can only be used to read data with S3 policy set to allow anonymous access.
+
+        Returns:
+            Credentials: the credentials object.
+        """
+        return cls(_JCredentials.resolving())
+
+    @classmethod
+    def default(cls) -> 'Credentials':
+        """
+        Default credentials provider used by the AWS SDK that looks for credentials in this order:
+        Java System Properties (`aws.accessKeyId` and `aws.secretAccessKey`), Environment Variables (`AWS_ACCESS_KEY_ID`
+        and `AWS_SECRET_ACCESS_KEY`), Credential profiles file at the default location (~/.aws/credentials), and
+        Instance profile credentials delivered through the Amazon EC2 metadata service.
+
+        Returns:
+            Credentials: the credentials object.
+        """
+        return cls(_JCredentials.defaultCredentials())
+
+    @classmethod
+    def basic(cls, access_key_id: str, secret_access_key: str) -> 'Credentials':
+        """
+        Basic credentials provider with the specified access key id and secret access key.
+
+        Args:
+            access_key_id (str): the access key id, used to identify the user.
+            secret_access_key (str): the secret access key, used to authenticate the user.
+
+        Returns:
+            Credentials: the credentials object.
+        """
+        return cls(_JCredentials.basic(access_key_id, secret_access_key))
+
+    @classmethod
+    def anonymous(cls) -> 'Credentials':
+        """
+       Anonymous credentials provider, which can only be used to read data with S3 policy set to allow anonymous access.
+
+        Returns:
+            Credentials: the credentials object.
+        """
+        return cls(_JCredentials.anonymous())
+
+    @classmethod
+    def profile(cls) -> 'Credentials':
+        """
+        Use the profile name, config file path, or credentials file path from S3 Instructions for loading the
+        credentials and fail if none found.
+
+        Returns:
+            Credentials: the credentials object.
+        """
+        return cls(_JCredentials.profile())
+
+
 class S3Instructions(JObjectWrapper):
     """
-    S3Instructions provides specialized instructions for reading from S3-compatible APIs.
+    S3Instructions provides specialized instructions for reading from and writing to S3-compatible APIs.
     """
 
     j_object_type = _JS3Instructions or type(None)
 
     def __init__(self,
                  region_name: Optional[str] = None,
+                 credentials: Optional[Credentials] = None,
                  max_concurrent_requests: Optional[int] = None,
                  read_ahead_count: Optional[int] = None,
                  fragment_size: Optional[int] = None,
-                 connection_timeout: Union[
-                     Duration, int, str, datetime.timedelta, np.timedelta64, pd.Timedelta, None] = None,
-                 read_timeout: Union[
-                     Duration, int, str, datetime.timedelta, np.timedelta64, pd.Timedelta, None] = None,
+                 connection_timeout: Optional[DurationLike] = None,
+                 read_timeout: Optional[DurationLike] = None,
                  access_key_id: Optional[str] = None,
                  secret_access_key: Optional[str] = None,
                  anonymous_access: bool = False,
-                 endpoint_override: Optional[str] = None):
+                 endpoint_override: Optional[str] = None,
+                 write_part_size: Optional[int] = None,
+                 num_concurrent_write_parts: Optional[int] = None,
+                 profile_name: Optional[str] = None,
+                 config_file_path: Optional[str] = None,
+                 credentials_file_path: Optional[str] = None):
 
         """
         Initializes the instructions.
 
         Args:
             region_name (str): the region name for reading parquet files. If not provided, the default region will be
-            picked by the AWS SDK from 'aws.region' system property, "AWS_REGION" environment variable, the
-            {user.home}/.aws/credentials or {user.home}/.aws/config files, or from EC2 metadata service, if running in
-            EC2.
+                picked by the AWS SDK from 'aws.region' system property, "AWS_REGION" environment variable, the
+                {user.home}/.aws/credentials or {user.home}/.aws/config files, or from EC2 metadata service, if running
+                in EC2. If no region name is derived from the above chain or the derived region name is incorrect for
+                the bucket accessed, the correct region name will be derived internally, at the cost of one additional
+                request.
+            credentials (Credentials): the credentials object for authenticating to the S3 server, defaults to
+                Credentials.resolving().
             max_concurrent_requests (int): the maximum number of concurrent requests for reading files, default is 256.
-            read_ahead_count (int): the number of fragments to send asynchronous read requests for while reading the current
-                fragment. Defaults to 32, which means fetch the next 32 fragments in advance when reading the current fragment.
-            fragment_size (int): the maximum size of each fragment to read, defaults to 64 KiB. If there are fewer bytes
-                remaining in the file, the fetched fragment can be smaller.
-            connection_timeout (Union[Duration, int, str, datetime.timedelta, np.timedelta64, pd.Timedelta]):
-                the amount of time to wait when initially establishing a connection before giving up and timing out, can
-                be expressed as an integer in nanoseconds, a time interval string, e.g. "PT00:00:00.001" or "PT1s", or
-                other time duration types. Default to 2 seconds.
-            read_timeout (Union[Duration, int, str, datetime.timedelta, np.timedelta64, pd.Timedelta]):
-                the amount of time to wait when reading a fragment before giving up and timing out, can be expressed as
-                an integer in nanoseconds, a time interval string, e.g. "PT00:00:00.001" or "PT1s", or other time
-                duration types. Default to 2 seconds.
-            access_key_id (str): the access key for reading files. Both access key and secret access key must be provided
-                to use static credentials, else default credentials will be used.
-            secret_access_key (str): the secret access key for reading files. Both access key and secret key must be
-                provided to use static credentials, else default credentials will be used.
-            anonymous_access (bool): use anonymous credentials, this is useful when the S3 policy has been set to allow
-                anonymous access. Can't be combined with other credentials. By default, is False.
+            read_ahead_count (int): the number of fragments to send asynchronous read requests for while reading the
+                current fragment. Defaults to 32, which means fetch the next 32 fragments in advance when reading the
+                current fragment.
+            fragment_size (int): the maximum size of each fragment to read in bytes, defaults to 65536. If
+                there are fewer bytes remaining in the file, the fetched fragment can be smaller.
+            connection_timeout (DurationLike): the amount of time to wait when initially establishing a connection
+                before giving up and timing out. Can be expressed as an integer in nanoseconds, a time interval string,
+                e.g. "PT00:00:00.001" or "PT1s", or other time duration types. Default to 2 seconds.
+            read_timeout (DurationLike): the amount of time to wait when reading a fragment before giving up and timing
+                out. Can be expressed as an integer in nanoseconds, a time interval string, e.g. "PT00:00:00.001" or
+                "PT1s", or other time duration types. Default to 2 seconds.
+            access_key_id (str):  (Deprecated) the access key for reading files. Both access key and secret access key
+                must be provided to use static credentials. If you specify both access key and secret key, then you
+                cannot provide other credentials like setting anonymous_access or credentials argument.
+                This option is deprecated and should be replaced by setting credentials as
+                Credentials.basic(access_key_id, secret_access_key).
+            secret_access_key (str): (Deprecated) the secret access key for reading files. Both access key and secret
+                key must be provided to use static credentials.  If you specify both access key and secret key, then you
+                cannot provide other credentials like setting anonymous_access or credentials argument.
+                This option is deprecated and should be replaced by setting credentials as
+                Credentials.basic(access_key_id, secret_access_key).
+            anonymous_access (bool): (Deprecated) use anonymous credentials, this is useful when the S3 policy has been
+                set to allow anonymous access. By default, is False. If you set this to True, you cannot provide other
+                credentials like setting access_key_id or credentials argument.
+                This option is deprecated and should be replaced by setting credentials as Credentials.anonymous().
             endpoint_override (str): the endpoint to connect to. Callers connecting to AWS do not typically need to set
                 this; it is most useful when connecting to non-AWS, S3-compatible APIs.
+            write_part_size (int): The part or chunk size when writing to S3. The default is 10 MiB. The minimum allowed
+                part size is 5242880. Higher part size may increase throughput but also increase memory usage. Writing
+                a single file to S3 can be done in a maximum of 10,000 parts, so the maximum size of a single file that
+                can be written is about 98 GiB for the default part size.
+            num_concurrent_write_parts (int): the maximum number of parts or chunks that can be uploaded concurrently
+                when writing to S3 without blocking, defaults to 64. Setting a higher value may increase throughput, but
+                may also increase memory usage.
+            profile_name (str): the profile name used for configuring the default region, credentials, etc., when
+                reading or writing to S3. If not provided, the AWS SDK picks the profile name from the 'aws.profile'
+                system property, the "AWS_PROFILE" environment variable, or defaults to the string "default".
+                Setting a profile name assumes that the credentials are provided via this profile; if that is not the
+                case, you must explicitly set credentials using the access_key_id and secret_access_key.
+            config_file_path (str): the path to the configuration file to use for configuring the default region,
+                role_arn, output etc. when reading or writing to S3. If not provided, the AWS SDK picks the configuration
+                file from the 'aws.configFile' system property, the "AWS_CONFIG_FILE" environment variable, or defaults
+                to "{user.home}/.aws/config".
+                Setting a configuration file path assumes that the credentials are provided via the config and
+                credentials files; if that is not the case, you must explicitly set credentials using the access_key_id
+                and secret_access_key.
+                For reference on the configuration file format, check
+                https://docs.aws.amazon.com/cli/latest/userguide/cli-configure-files.html
+            credentials_file_path (str): the path to the credentials file to use for configuring the credentials,
+                region, etc. when reading or writing to S3. If not provided, the AWS SDK picks the credentials file from
+                the 'aws.credentialsFile' system property, the "AWS_CREDENTIALS_FILE" environment variable, or defaults
+                to "{user.home}/.aws/credentials".
+                Setting a credentials file path assumes that the credentials are provided via the config and
+                credentials files; if that is not the case, you must explicitly set credentials using the access_key_id
+                and secret_access_key.
+                The main difference between config_file_path and credentials_file_path is around the conventions used
+                in the files. For reference on the credentials file format, check
+                https://docs.aws.amazon.com/cli/latest/userguide/cli-configure-files.html
 
         Raises:
             DHError: If unable to build the instructions object.
@@ -101,25 +234,56 @@ def __init__(self,
                 builder.fragmentSize(fragment_size)
 
             if connection_timeout is not None:
-                builder.connectionTimeout(time.to_j_duration(connection_timeout))
+                builder.connectionTimeout(to_j_duration(connection_timeout))
 
             if read_timeout is not None:
-                builder.readTimeout(time.to_j_duration(read_timeout))
+                builder.readTimeout(to_j_duration(read_timeout))
 
             if ((access_key_id is not None and secret_access_key is None) or
                     (access_key_id is None and secret_access_key is not None)):
                 raise DHError("Either both access_key_id and secret_access_key must be provided or neither")
 
+            def throw_multiple_credentials_error(credentials1: str, credentials2: str):
+                raise DHError(f"Only one set of credentials can be set, but found {credentials1} and {credentials2}")
+
+            # Configure the credentials
             if access_key_id is not None:
+                warn('access_key_id is deprecated, prefer setting credentials as '
+                     'Credentials.basic(access_key_id, secret_access_key)', DeprecationWarning, stacklevel=2)
+                # TODO(deephaven-core#6165): Delete deprecated parameters
                 if anonymous_access:
-                    raise DHError("Only one set of credentials may be used, requested both key and anonymous")
+                    throw_multiple_credentials_error("access_key_id", "anonymous_access")
+                if credentials is not None:
+                    throw_multiple_credentials_error("access_key_id", "credentials")
                 builder.credentials(_JCredentials.basic(access_key_id, secret_access_key))
             elif anonymous_access:
+                warn("anonymous_access is deprecated, prefer setting credentials as Credentials.anonymous()",
+                     DeprecationWarning, stacklevel=2)
+                # TODO(deephaven-core#6165): Delete deprecated parameters
+                if credentials is not None:
+                    throw_multiple_credentials_error("anonymous_access", "credentials")
                 builder.credentials(_JCredentials.anonymous())
+            elif credentials is not None:
+                builder.credentials(credentials.j_object)
 
             if endpoint_override is not None:
                 builder.endpointOverride(endpoint_override)
 
+            if write_part_size is not None:
+                builder.writePartSize(write_part_size)
+
+            if num_concurrent_write_parts is not None:
+                builder.numConcurrentWriteParts(num_concurrent_write_parts)
+
+            if profile_name is not None:
+                builder.profileName(profile_name)
+
+            if config_file_path is not None:
+                builder.configFilePath(config_file_path)
+
+            if credentials_file_path is not None:
+                builder.credentialsFilePath(credentials_file_path)
+
             self._j_object = builder.build()
         except Exception as e:
             raise DHError(e, "Failed to build S3 instructions") from e
diff --git a/py/server/deephaven/experimental/table_data_service.py b/py/server/deephaven/experimental/table_data_service.py
new file mode 100644
index 00000000000..1a2cc6a5295
--- /dev/null
+++ b/py/server/deephaven/experimental/table_data_service.py
@@ -0,0 +1,455 @@
+#
+# Copyright (c) 2016-2024 Deephaven Data Labs and Patent Pending
+#
+"""This module defines a table service backend interface TableDataServiceBackend that users can implement to provide
+external data in the format of  pyarrow Table to Deephaven tables. The backend service implementation should be passed
+to the TableDataService constructor to create a new TableDataService instance. The TableDataService instance can then
+be used to create Deephaven tables backed by the backend service."""
+import traceback
+from abc import ABC, abstractmethod
+from typing import Optional, Callable
+
+import jpy
+
+import pyarrow as pa
+
+from deephaven.dherror import DHError
+from deephaven._wrapper import JObjectWrapper
+from deephaven.table import Table
+
+_JPythonTableDataService = jpy.get_type("io.deephaven.extensions.barrage.util.PythonTableDataService")
+_JTableKeyImpl = jpy.get_type("io.deephaven.extensions.barrage.util.PythonTableDataService$TableKeyImpl")
+_JTableLocationKeyImpl = jpy.get_type("io.deephaven.extensions.barrage.util.PythonTableDataService$TableLocationKeyImpl")
+
+
+class TableKey(ABC):
+    """A key that identifies a table. The key should be unique for each table. The key can be any Python object and
+    should include sufficient information to uniquely identify the table for the backend service. The __hash__ method
+    must be implemented to ensure that the key is hashable.
+    """
+
+    @abstractmethod
+    def __hash__(self):
+        pass
+
+
+class TableLocationKey(ABC):
+    """A key that identifies a specific location of a table. The key should be unique for each table location of the
+    table. The key can be any Python object and should include sufficient information to uniquely identify the location
+    for the backend service to fetch the data values and data size. The __hash__ method must be implemented to ensure
+    that the key is hashable.
+    """
+
+    @abstractmethod
+    def __hash__(self):
+        pass
+
+
+class TableDataServiceBackend(ABC):
+    """An interface for a backend service that provides access to table data."""
+
+    @abstractmethod
+    def table_schema(self, table_key: TableKey,
+                     schema_cb: Callable[[pa.Schema, Optional[pa.Schema]], None],
+                     failure_cb: Callable[[Exception], None]) -> None:
+        """ Provides the table data schema and the partitioning column schema for the table with the given table key via
+        the schema_cb callback. The table data schema is not required to include the partitioning columns defined in
+        the partitioning column schema.
+
+        The failure callback should be invoked when a failure to provide the schemas occurs.
+
+        The table_schema caller will block until one of the schema or failure callbacks is called.
+
+        Note that asynchronous calls to any callback may block until this method has returned.
+
+        Args:
+            table_key (TableKey): the table key
+            schema_cb (Callable[[pa.Schema, Optional[pa.Schema]], None]): the callback function with two arguments: the
+                table data schema and the optional partitioning column schema
+            failure_cb (Callable[[Exception], None]): the failure callback function
+        """
+        pass
+
+    @abstractmethod
+    def table_locations(self, table_key: TableKey,
+                        location_cb: Callable[[TableLocationKey, Optional[pa.Table]], None],
+                        success_cb: Callable[[], None],
+                        failure_cb: Callable[[Exception], None]) -> None:
+        """ Provides the existing table locations for the table with the given table via the location_cb callback.
+
+        The location callback should be called with the table location key and an optional pyarrow.Table that contains
+        the partitioning values for the location. The schema of the table must match the optional partitioning column
+        schema returned by :meth:`table_schema` for the table_key. The table must have a single row for the particular
+        table location key provided in the 1st argument, with values for each partitioning column in the row.
+
+        The success callback should be called when all existing table locations have been delivered to the table
+        location callback.
+
+        The failure callback should be invoked when failure to provide existing table locations occurs.
+
+        The table_locations caller will block until one of the success or failure callbacks is called.
+
+        This is called for tables created when :meth:`TableDataService.make_table` is called with refreshing=False
+
+        Note that asynchronous calls to any callback may block until this method has returned.
+
+        Args:
+            table_key (TableKey): the table key
+            location_cb (Callable[[TableLocationKey, Optional[pa.Table]], None]): the callback function
+            success_cb (Callable[[], None]): the success callback function
+            failure_cb (Callable[[Exception], None]): the failure callback function
+        """
+        pass
+
+    @abstractmethod
+    def subscribe_to_table_locations(self, table_key: TableKey,
+                                     location_cb: Callable[[TableLocationKey, Optional[pa.Table]], None],
+                                     success_cb: Callable[[], None],
+                                     failure_cb: Callable[[Exception], None]) -> Callable[[], None]:
+        """ Provides the table locations, existing and new, for the table with the given table key via the location_cb
+        callback.
+
+        The location callback should be called with the table location key and an optional pyarrow.Table that contains
+        the partitioning values for the location. The schema of the table must match the optional partitioning column
+        schema returned by :meth:`table_schema` for the table_key. The table must have a single row for the particular
+        table location key provided in the 1st argument, with values for each partitioning column in the row.
+
+        The success callback should be called when the subscription is established successfully and after all existing
+        table locations have been delivered to the table location callback.
+
+        The failure callback should be invoked at initial failure to establish a subscription, or on a permanent failure
+        to keep the subscription active (e.g. failure with no reconnection possible, or failure to reconnect/resubscribe
+        before a timeout).
+
+        This is called for tables created when :meth:`TableDataService.make_table` is called with refreshing=True.
+
+        Note that asynchronous calls to any callback will block until this method has returned.
+
+        Args:
+            table_key (TableKey): the table key
+            location_cb (Callable[[TableLocationKey, Optional[pa.Table]], None]): the table location callback function
+            success_cb (Callable[[], None]): the success callback function
+            failure_cb (Callable[[Exception], None]): the failure callback function
+
+
+        Returns:
+            Callable[[], None]: a function that can be called to unsubscribe from this subscription
+        """
+        pass
+
+    @abstractmethod
+    def table_location_size(self, table_key: TableKey, table_location_key: TableLocationKey,
+                            size_cb: Callable[[int], None],
+                            failure_cb: Callable[[Exception], None]) -> None:
+        """ Provides the size of the table location with the given table key and table location key via the size_cb
+        callback. The size is the number of rows in the table location.
+
+        The failure callback should be invoked when a failure to provide the table location size occurs.
+
+        The table_location_size caller will block until one of the size or failure callbacks is called.
+
+        This is called for tables created when :meth:`TableDataService.make_table` is called with refreshing=False.
+
+        Note that asynchronous calls to any callback may block until this method has returned.
+
+        Args:
+            table_key (TableKey): the table key
+            table_location_key (TableLocationKey): the table location key
+            size_cb (Callable[[int], None]): the callback function
+        """
+        pass
+
+    @abstractmethod
+    def subscribe_to_table_location_size(self, table_key: TableKey, table_location_key: TableLocationKey,
+                                         size_cb: Callable[[int], None],
+                                         success_cb: Callable[[], None],
+                                         failure_cb: Callable[[Exception], None]) -> Callable[[], None]:
+        """ Provides the current and future sizes of the table location with the given table key and table location
+        key via the size_cb callback. The size is the number of rows in the table location.
+
+        The success callback should be called when the subscription is established successfully and after the current
+        table location size has been delivered to the size callback.
+
+        The failure callback should be invoked at initial failure to establish a subscription, or on a permanent failure
+        to keep the subscription active (e.g. failure with no reconnection possible, or failure to reconnect/resubscribe
+        before a timeout).
+
+        This is called for tables created when :meth:``TableDataService.make_table` is called with refreshing=True
+
+        Note that asynchronous calls to any callback will block until this method has returned.
+
+        Args:
+            table_key (TableKey): the table key
+            table_location_key (TableLocationKey): the table location key
+            size_cb (Callable[[int], None]): the table location size callback function
+            success_cb (Callable[[], None]): the success callback function
+            failure_cb (Callable[[Exception], None]): the failure callback function
+
+        Returns:
+            Callable[[], None]: a function that can be called to unsubscribe from this subscription
+        """
+        pass
+
+    @abstractmethod
+    def column_values(self, table_key: TableKey, table_location_key: TableLocationKey, col: str, offset: int,
+                      min_rows: int, max_rows: int,
+                      values_cb: Callable[[pa.Table], None],
+                      failure_cb: Callable[[Exception], None]) -> None:
+        """ Provides the data values for the column with the given name for the table location with the given table key
+        and table location key via the values_cb callback. The column values are provided as a pyarrow.Table that
+        contains the data values for the column within the specified range requirement. The values_cb callback should be
+        called with a single column pyarrow.Table that contains the data values for the given column within the
+        specified range requirement.
+
+        The failure callback should be invoked when a failure to provide the column values occurs.
+
+        The column_values caller will block until one of the values or failure callbacks is called.
+
+        Note that asynchronous calls to any callback may block until this method has returned.
+
+        Args:
+            table_key (TableKey): the table key
+            table_location_key (TableLocationKey): the table location key
+            col (str): the column name
+            offset (int): the starting row index
+            min_rows (int): the minimum number of rows to return, min_rows is always <= page size
+            max_rows (int): the maximum number of rows to return
+            values_cb (Callable[[pa.Table], None]): the callback function with one argument: the pyarrow.Table that
+                contains the data values for the column within the specified range
+            failure_cb (Callable[[Exception], None]): the failure callback function
+        """
+        pass
+
+
+class TableDataService(JObjectWrapper):
+    """ A TableDataService serves as a wrapper around a tightly-coupled Deephaven TableDataService implementation
+    (Java class PythonTableDataService) that delegates to a Python TableDataServiceBackend for TableKey creation,
+    TableLocationKey discovery, and data subscription/retrieval operations. It supports the creation of Deephaven tables
+    from the Python backend service that provides table data and table data locations to the Deephaven tables.
+    """
+    j_object_type = _JPythonTableDataService
+    _backend: TableDataServiceBackend
+
+    def __init__(self, backend: TableDataServiceBackend, *, chunk_reader_factory: Optional[jpy.JType] = None,
+                 stream_reader_options: Optional[jpy.JType] = None, page_size: Optional[int] = None):
+        """ Creates a new TableDataService with the given user-implemented backend service.
+
+        Args:
+            backend (TableDataServiceBackend): the user-implemented backend service implementation
+            chunk_reader_factory (Optional[jpy.JType]): the Barrage chunk reader factory, default is None
+            stream_reader_options (Optional[jpy.JType]): the Barrage stream reader options, default is None
+            page_size (int): the page size for the table service, default is None, meaning to use the configurable
+                jvm property: PythonTableDataService.defaultPageSize which defaults to 64K.
+        """
+        self._backend = backend
+
+        if page_size is None:
+            page_size = 0
+        elif page_size < 0:
+            raise ValueError("The page size must be non-negative")
+
+        self._j_tbl_service = _JPythonTableDataService.create(
+            self, chunk_reader_factory, stream_reader_options, page_size)
+
+    @property
+    def j_object(self):
+        return self._j_tbl_service
+
+    def make_table(self, table_key: TableKey, *, refreshing: bool) -> Table:
+        """ Creates a Table backed by the backend service with the given table key.
+
+        Args:
+            table_key (TableKey): the table key
+            refreshing (bool): whether the table is live or static
+
+        Returns:
+            Table: a new table
+
+        Raises:
+            DHError
+        """
+        j_table_key = _JTableKeyImpl(table_key)
+        try:
+            return Table(self._j_tbl_service.makeTable(j_table_key, refreshing))
+        except Exception as e:
+            raise DHError(e, message=f"failed to make a table for the key {table_key}") from e
+
+    def _table_schema(self, table_key: TableKey, schema_cb: jpy.JType, failure_cb: jpy.JType) -> None:
+        """ Provides the table data schema and the partitioning values schema for the table with the given table key as
+        two serialized byte buffers to the PythonTableDataService (Java) via callbacks. Only called by the
+        PythonTableDataService.
+
+        Args:
+            table_key (TableKey): the table key
+            schema_cb (jpy.JType): the Java callback function with one argument: an array of byte buffers that contain
+                the serialized table data arrow and partitioning values schemas
+            failure_cb (jpy.JType): the failure Java callback function with one argument: an exception stringyy
+        """
+        def schema_cb_proxy(dt_schema: pa.Schema, pc_schema: Optional[pa.Schema] = None):
+            j_dt_schema_bb = jpy.byte_buffer(dt_schema.serialize())
+            pc_schema = pc_schema if pc_schema is not None else pa.schema([])
+            j_pc_schema_bb = jpy.byte_buffer(pc_schema.serialize())
+            schema_cb.accept(jpy.array("java.nio.ByteBuffer", [j_pc_schema_bb, j_dt_schema_bb]))
+
+        def failure_cb_proxy(error: Exception):
+            message = error.getMessage() if hasattr(error, "getMessage") else str(error)
+            tb_str = traceback.format_exc()
+            failure_cb.accept("\n".join([message, tb_str]))
+
+        self._backend.table_schema(table_key, schema_cb_proxy, failure_cb_proxy)
+
+    def _table_locations(self, table_key: TableKey, location_cb: jpy.JType, success_cb: jpy.JType,
+                         failure_cb: jpy.JType) -> None:
+        """ Provides the existing table locations for the table with the given table key to the PythonTableDataService
+        (Java) via callbacks. Only called by the PythonTableDataService.
+
+        Args:
+            table_key (TableKey): the table key
+            location_cb (jpy.JType): the Java callback function with two arguments: a table location key and an array of
+                byte buffers that contain the serialized arrow schema and a record batch of the partitioning values
+            success_cb (jpy.JType): the success Java callback function with no arguments
+            failure_cb (jpy.JType): the failure Java callback function with one argument: an exception string
+        """
+        def location_cb_proxy(pt_location_key: TableLocationKey, pt_table: Optional[pa.Table] = None):
+            j_tbl_location_key = _JTableLocationKeyImpl(pt_location_key)
+            if pt_table is None or pt_table.to_batches() is None:
+                location_cb.apply(j_tbl_location_key, jpy.array("java.nio.ByteBuffer", []))
+            else:
+                if pt_table.num_rows != 1:
+                    raise ValueError("The number of rows in the pyarrow table for partitioning values must be 1")
+                bb_list = [jpy.byte_buffer(rb.serialize()) for rb in pt_table.to_batches()]
+                bb_list.insert(0, jpy.byte_buffer(pt_table.schema.serialize()))
+                location_cb.accept(j_tbl_location_key, jpy.array("java.nio.ByteBuffer", bb_list))
+
+        def success_cb_proxy():
+            success_cb.run()
+
+        def failure_cb_proxy(error: Exception):
+            message = error.getMessage() if hasattr(error, "getMessage") else str(error)
+            tb_str = traceback.format_exc()
+            failure_cb.accept("\n".join([message, tb_str]))
+
+        self._backend.table_locations(table_key, location_cb_proxy, success_cb_proxy, failure_cb_proxy)
+
+    def _subscribe_to_table_locations(self, table_key: TableKey, location_cb: jpy.JType, success_cb: jpy.JType,
+                                      failure_cb: jpy.JType) -> Callable[[], None]:
+        """ Provides the table locations, existing and new, for the table with the given table key to the
+        PythonTableDataService (Java) via callbacks. Only called by the PythonTableDataService.
+
+        Args:
+            table_key (TableKey): the table key
+            location_cb (jpy.JType): the Java callback function with two arguments: a table location key of the new
+                location and an array of byte buffers that contain the partitioning arrow schema and the serialized
+                record batches of the partitioning values
+            success_cb (jpy.JType): the success Java callback function with no arguments
+            failure_cb (jpy.JType): the failure Java callback function with one argument: an exception string
+
+        Returns:
+            Callable[[], None]: a function that can be called to unsubscribe from this subscription
+        """
+        def location_cb_proxy(pt_location_key: TableLocationKey, pt_table: Optional[pa.Table] = None):
+            j_tbl_location_key = _JTableLocationKeyImpl(pt_location_key)
+            if pt_table is None:
+                location_cb.apply(j_tbl_location_key, jpy.array("java.nio.ByteBuffer", []))
+            else:
+                if pt_table.num_rows != 1:
+                    raise ValueError("The number of rows in the pyarrow table for partitioning column values must be 1")
+                bb_list = [jpy.byte_buffer(rb.serialize()) for rb in pt_table.to_batches()]
+                bb_list.insert(0, jpy.byte_buffer(pt_table.schema.serialize()))
+                location_cb.accept(j_tbl_location_key, jpy.array("java.nio.ByteBuffer", bb_list))
+
+        def success_cb_proxy():
+            success_cb.run()
+
+        def failure_cb_proxy(error: Exception):
+            message = error.getMessage() if hasattr(error, "getMessage") else str(error)
+            tb_str = traceback.format_exc()
+            failure_cb.accept("\n".join([message, tb_str]))
+
+        return self._backend.subscribe_to_table_locations(table_key, location_cb_proxy, success_cb_proxy,
+                                                          failure_cb_proxy)
+
+    def _table_location_size(self, table_key: TableKey, table_location_key: TableLocationKey, size_cb: jpy.JType,
+                             failure_cb: jpy.JType) -> None:
+        """ Provides the size of the table location with the given table key and table location key to the
+        PythonTableDataService (Java) via callbacks. Only called by the PythonTableDataService.
+
+        Args:
+            table_key (TableKey): the table key
+            table_location_key (TableLocationKey): the table location key
+            size_cb (jpy.JType): the Java callback function with one argument: the size of the table location in number
+                of rows
+            failure_cb (jpy.JType): the failure Java callback function with one argument: an exception string
+        """
+        def size_cb_proxy(size: int):
+            size_cb.accept(size)
+
+        def failure_cb_proxy(error: Exception):
+            message = error.getMessage() if hasattr(error, "getMessage") else str(error)
+            tb_str = traceback.format_exc()
+            failure_cb.accept("\n".join([message, tb_str]))
+
+        self._backend.table_location_size(table_key, table_location_key, size_cb_proxy, failure_cb_proxy)
+
+    def _subscribe_to_table_location_size(self, table_key: TableKey, table_location_key: TableLocationKey,
+                                          size_cb: jpy.JType, success_cb: jpy.JType, failure_cb: jpy.JType) -> Callable[[], None]:
+        """ Provides the current and future sizes of the table location with the given table key and table location key
+        to the PythonTableDataService (Java) via callbacks. Only called by the PythonTableDataService.
+
+        Args:
+            table_key (TableKey): the table key
+            table_location_key (TableLocationKey): the table location key
+            size_cb (jpy.JType): the Java callback function with one argument: the size of the location in number of
+                rows
+            success_cb (jpy.JType): the success Java callback function with no arguments
+            failure_cb (jpy.JType): the failure Java callback function with one argument: an exception string
+
+        Returns:
+            Callable[[], None]: a function that can be called to unsubscribe from this subscription
+        """
+        def size_cb_proxy(size: int):
+            size_cb.accept(size)
+
+        def success_cb_proxy():
+            success_cb.run()
+
+        def failure_cb_proxy(error: Exception):
+            message = error.getMessage() if hasattr(error, "getMessage") else str(error)
+            tb_str = traceback.format_exc()
+            failure_cb.accept("\n".join([message, tb_str]))
+
+        return self._backend.subscribe_to_table_location_size(table_key, table_location_key, size_cb_proxy,
+                                                              success_cb_proxy, failure_cb_proxy)
+
+    def _column_values(self, table_key: TableKey, table_location_key: TableLocationKey, col: str, offset: int,
+                       min_rows: int, max_rows: int, values_cb: jpy.JType, failure_cb: jpy.JType) -> None:
+        """ Provides the data values for the column with the given name for the table column with the given table key
+        and table location key to the PythonTableDataService (Java) via callbacks. Only called by the
+        PythonTableDataService.
+
+        Args:
+            table_key (TableKey): the table key
+            table_location_key (TableLocationKey): the table location key
+            col (str): the column name
+            offset (int): the starting row index
+            min_rows (int): the minimum number of rows to return, min_rows is always <= page size
+            max_rows (int): the maximum number of rows to return
+            values_cb (jpy.JType): the Java callback function with one argument: an array of byte buffers that contain
+                the arrow schema and the serialized record batches for the given column
+            failure_cb (jpy.JType): the failure Java callback function with one argument: an exception string
+        """
+        def values_cb_proxy(pt_table: pa.Table):
+            if len(pt_table) < min_rows or len(pt_table) > max_rows:
+                raise ValueError("The number of rows in the pyarrow table for column values must be in the range of "
+                                 f"{min_rows} to {max_rows}")
+            bb_list = [jpy.byte_buffer(rb.serialize()) for rb in pt_table.to_batches()]
+            bb_list.insert(0, jpy.byte_buffer(pt_table.schema.serialize()))
+            values_cb.accept(jpy.array("java.nio.ByteBuffer", bb_list))
+
+        def failure_cb_proxy(error: Exception):
+            message = error.getMessage() if hasattr(error, "getMessage") else str(error)
+            tb_str = traceback.format_exc()
+            failure_cb.accept("\n".join([message, tb_str]))
+
+        self._backend.column_values(table_key, table_location_key, col, offset, min_rows, max_rows, values_cb_proxy,
+                                    failure_cb_proxy)
diff --git a/py/server/deephaven/jcompat.py b/py/server/deephaven/jcompat.py
index d807cb472f3..98e6a04565e 100644
--- a/py/server/deephaven/jcompat.py
+++ b/py/server/deephaven/jcompat.py
@@ -5,7 +5,8 @@
 """ This module provides Java compatibility support including convenience functions to create some widely used Java
 data structures from corresponding Python ones in order to be able to call Java methods. """
 
-from typing import Any, Callable, Dict, Iterable, List, Sequence, Set, TypeVar, Union, Optional
+from typing import Any, Callable, Dict, Iterable, List, Sequence, Set, TypeVar, Union, Optional, Mapping
+from warnings import warn
 
 import jpy
 import numpy as np
@@ -14,7 +15,7 @@
 from deephaven import dtypes, DHError
 from deephaven._wrapper import unwrap, wrap_j_object, JObjectWrapper
 from deephaven.dtypes import DType, _PRIMITIVE_DTYPE_NULL_MAP
-from deephaven.column import Column
+from deephaven.column import ColumnDefinition
 
 _NULL_BOOLEAN_AS_BYTE = jpy.get_type("io.deephaven.util.BooleanUtils").NULL_BOOLEAN_AS_BYTE
 _JPrimitiveArrayConversionUtility = jpy.get_type("io.deephaven.integrations.common.PrimitiveArrayConversionUtility")
@@ -327,11 +328,20 @@ def _j_array_to_series(dtype: DType, j_array: jpy.JType, conv_null: bool) -> pd.
 
     return s
 
-def j_table_definition(table_definition: Union[Dict[str, DType], List[Column], None]) -> Optional[jpy.JType]:
-    """Produce a Deephaven TableDefinition from user input.
+# Note: unable to import TableDefinitionLike due to circular ref (table.py -> agg.py -> jcompat.py)
+def j_table_definition(
+        table_definition: Union[
+            "TableDefinition",
+            Mapping[str, dtypes.DType],
+            Iterable[ColumnDefinition],
+            jpy.JType,
+            None,
+        ],
+) -> Optional[jpy.JType]:
+    """Deprecated for removal next release, prefer TableDefinition. Produce a Deephaven TableDefinition from user input.
 
     Args:
-        table_definition (Union[Dict[str, DType], List[Column], None]): the table definition as a dictionary of column
+        table_definition (Optional[TableDefinitionLike]): the table definition as a dictionary of column
             names and their corresponding data types or a list of Column objects
 
     Returns:
@@ -340,22 +350,18 @@ def j_table_definition(table_definition: Union[Dict[str, DType], List[Column], N
     Raises:
         DHError
     """
-    if table_definition is None:
-        return None
-    elif isinstance(table_definition, Dict):
-        return _JTableDefinition.of(
-            [
-                Column(name=name, data_type=dtype).j_column_definition
-                for name, dtype in table_definition.items()
-            ]
-        )
-    elif isinstance(table_definition, List):
-        return _JTableDefinition.of(
-            [col.j_column_definition for col in table_definition]
-        )
-    else:
-        raise DHError(f"Unexpected table_definition type: {type(table_definition)}")
+    warn(
+        "j_table_definition is deprecated for removal next release, prefer TableDefinition",
+        DeprecationWarning,
+        stacklevel=2,
+    )
+    from deephaven.table import TableDefinition
 
+    return (
+        TableDefinition(table_definition).j_table_definition
+        if table_definition
+        else None
+    )
 
 class AutoCloseable(JObjectWrapper):
     """A context manager wrapper to allow Java AutoCloseable to be used in with statements.
diff --git a/py/server/deephaven/json/__init__.py b/py/server/deephaven/json/__init__.py
index 77957733df8..3cc9b986e33 100644
--- a/py/server/deephaven/json/__init__.py
+++ b/py/server/deephaven/json/__init__.py
@@ -7,38 +7,45 @@
 example, the JSON object
 
 .. code-block:: json
+
     { "name": "Foo", "age": 42, "location": { "lat": 45.018269, "lon": -93.473892 } }
 
 can be modelled with the dictionary
 
 .. code-block:: python
+
     { "name": str, "age": int, "location": { "lat": float, "lon": float } }
 
 Notice that this allows for the nested modelling of JSON values. Other common constructions involve the modelling of
 JSON arrays. For example, a variable-length JSON array where the elements are the same type
 
 .. code-block:: json
+
     [42, 31, ..., 12345]
 
 can be modelled with a single-element list containing the element type
 
 .. code-block:: python
+
     [ int ]
 
 If the JSON array is a fixed size and each elements' type is known, for example
 
 .. code-block:: json
+
     ["Foo", 42, [45.018269, -93.473892]]
 
 can be modelled with a tuple containing each type
 
 .. code-block:: python
+
     (str, int, (float, float))
 
 Notice again that this allows for the nested modelling of JSON values. Of course, these constructions can be all be used
 together. For example, the JSON object
 
 .. code-block:: json
+
     {
       "name": "Foo",
       "locations": [
@@ -51,6 +58,7 @@
 can be modelled as
 
 .. code-block:: python
+
     {"name": str, "locations": [(float, float)]}
 
 See the methods in this module more more details on modelling JSON values.
@@ -64,7 +72,7 @@
 
 from deephaven import dtypes
 from deephaven._wrapper import JObjectWrapper
-from deephaven.time import to_j_instant
+from deephaven.time import InstantLike, to_j_instant
 from deephaven._jpy import strict_cast
 
 
@@ -200,7 +208,9 @@ def json_val(json_value_type: JsonValueType) -> JsonValue:
 class RepeatedFieldBehavior(Enum):
     """
     The behavior to use when a repeated field is encountered in a JSON object. For example,
+
     .. code-block:: json
+
         {
           "foo": 42,
           "foo": 43
@@ -222,6 +232,7 @@ class ObjectField:
     simplify by just using the JsonValueType. For example,
 
     .. code-block:: python
+
         {
             "name": ObjectField(str),
             "age": ObjectField(int),
@@ -230,6 +241,7 @@ class ObjectField:
     could be simplified to
 
     .. code-block:: python
+
         {
             "name": str,
             "age": int,
@@ -294,22 +306,26 @@ def object_val(
     """Creates an object value. For example, the JSON object
 
     .. code-block:: json
+
         { "name": "foo", "age": 42 }
 
     might be modelled as the object type
 
     .. code-block:: python
+
         object_val({ "name": str, "age": int })
 
     In contexts where the user needs to create a JsonValueType and isn't changing any default values, the user can
     simplify by using a Dict[str, Union[JsonValueType, ObjectField]]. For example,
 
     .. code-block:: python
+
         some_method(object_val({ "name": str, "age": int }))
 
     could be simplified to
 
     .. code-block:: python
+
         some_method({ "name": str, "age": int })
 
     Args:
@@ -356,9 +372,11 @@ def typed_object_val(
     """Creates a type-discriminated object value. For example, the JSON objects
 
     .. code-block:: json
+
         { "type": "trade", "symbol": "FOO", "price": 70.03, "size": 42 }
 
     .. code-block:: json
+
         { "type": "quote", "symbol": "BAR", "bid": 10.01, "ask": 10.05 }
 
     might be modelled as a type-discriminated object with "type" as the type field, "symbol" as a shared field, with a
@@ -366,6 +384,7 @@ def typed_object_val(
     field:
 
     .. code-block:: python
+
         typed_object_val(
             "type",
             {"symbol": str},
@@ -432,22 +451,26 @@ def array_val(
     """Creates a "typed array", where all elements of the array have the same element type. For example, the JSON array
 
     .. code-block:: json
+
         [1, 42, 43, 13]
 
     might be modelled as an array of ints
 
     .. code-block:: python
+
         array_val(int)
 
     In contexts where the user needs to create a JsonValueType and isn't changing any default values, the user can
     simplify by using a list with a single element type. For example,
 
     .. code-block:: python
+
         some_method(array_val(element))
 
     could be simplified to
 
     .. code-block:: python
+
         some_method([element])
 
     Args:
@@ -474,6 +497,7 @@ def object_entries_val(
     variable and all the values types are the same. For example, the JSON object
 
     .. code-block:: json
+
         {
             "foo": 1,
             "bar": 42,
@@ -485,6 +509,7 @@ def object_entries_val(
     might be modelled as the object kv type
 
     .. code-block:: python
+
         object_entries_val(int)
 
     Args:
@@ -511,16 +536,19 @@ def tuple_val(
     """Creates a tuple value. For example, the JSON array
 
     .. code-block:: json
+
         ["foo", 42, 5.72]
 
     might be modelled as the tuple type
 
     .. code-block:: python
+
         tuple_val((str, int, float))
 
     To provide meaningful names, a dictionary can be used:
 
     .. code-block:: python
+
         tuple_val({"name": str, "age": int, "height": float})
 
     otherwise, default names based on the indexes of the values will be used.
@@ -529,11 +557,13 @@ def tuple_val(
     names, the user can simplify passing through a python tuple type. For example,
 
     .. code-block:: python
+
         some_method(tuple_val((tuple_type_1, tuple_type_2)))
 
     could be simplified to
 
     .. code-block:: python
+
         some_method((tuple_type_1, tuple_type_2))
 
     Args:
@@ -571,22 +601,26 @@ def bool_val(
     """Creates a bool value. For example, the JSON boolean
 
     .. code-block:: json
+
         True
 
     might be modelled as the bool type
 
     .. code-block:: python
+
         bool_val()
 
     In contexts where the user needs to create a JsonValueType and isn't changing any default values, the user can
     simplify by using the python built-in bool type. For example,
 
     .. code-block:: python
+
         some_method(bool_val())
 
     could be simplified to
 
     .. code-block:: python
+
         some_method(bool)
 
     Args:
@@ -623,11 +657,13 @@ def char_val(
     """Creates a char value. For example, the JSON string
 
     .. code-block:: json
+
         "F"
 
     might be modelled as the char type
 
     .. code-block:: python
+
         char_val()
 
     Args:
@@ -664,11 +700,13 @@ def byte_val(
     """Creates a byte (signed 8-bit) value. For example, the JSON integer
 
     .. code-block:: json
+
         42
 
     might be modelled as the byte type
 
     .. code-block:: python
+
         byte_val()
 
     Args:
@@ -709,11 +747,13 @@ def short_val(
     """Creates a short (signed 16-bit) value. For example, the JSON integer
 
     .. code-block:: json
+
         30000
 
     might be modelled as the short type
 
     .. code-block:: python
+
         short_val()
 
     Args:
@@ -754,11 +794,13 @@ def int_val(
     """Creates an int (signed 32-bit) value. For example, the JSON integer
 
     .. code-block:: json
+
         100000
 
     might be modelled as the int type
 
     .. code-block:: python
+
         int_val()
 
     Args:
@@ -799,22 +841,26 @@ def long_val(
     """Creates a long (signed 64-bit) value. For example, the JSON integer
 
     .. code-block:: json
+
         8000000000
 
     might be modelled as the long type
 
     .. code-block:: python
+
         long_val()
 
     In contexts where the user needs to create a JsonValueType and isn't changing any default values, the user can
     simplify by using the python built-in long type. For example,
 
     .. code-block:: python
+
         some_method(long_val())
 
     could be simplified to
 
     .. code-block:: python
+
         some_method(int)
 
     Args:
@@ -854,11 +900,13 @@ def float_val(
     """Creates a float (signed 32-bit) value. For example, the JSON decimal
 
     .. code-block:: json
+
         42.42
 
     might be modelled as the float type
 
     .. code-block:: python
+
         float_val()
 
     Args:
@@ -897,22 +945,26 @@ def double_val(
     """Creates a double (signed 64-bit) value. For example, the JSON decimal
 
     .. code-block:: json
+
         42.42424242
 
     might be modelled as the double type
 
     .. code-block:: python
+
         double_val()
 
     In contexts where the user needs to create a JsonValueType and isn't changing any default values, the user can
     simplify by using the python built-in float type. For example,
 
     .. code-block:: python
+
         some_method(double_val())
 
     could be simplified to
 
     .. code-block:: python
+
         some_method(float)
 
     Args:
@@ -953,22 +1005,26 @@ def string_val(
     """Creates a String value. For example, the JSON string
 
     .. code-block:: json
+
         "Hello, world!"
 
     might be modelled as the string type
 
     .. code-block:: python
+
         string_val()
 
     In contexts where the user needs to create a JsonValueType and isn't changing any default values, the user can
     simplify by using the python built-in str type. For example,
 
     .. code-block:: python
+
         some_method(string_val())
 
     could be simplified to
 
     .. code-block:: python
+
         some_method(str)
 
     Args:
@@ -1000,44 +1056,49 @@ def string_val(
     return JsonValue(builder.build())
 
 
-# TODO(deephaven-core#5269): Create deephaven.time time-type aliases
 def instant_val(
     allow_missing: bool = True,
     allow_null: bool = True,
     number_format: Literal[None, "s", "ms", "us", "ns"] = None,
     allow_decimal: bool = False,
-    on_missing: Optional[Any] = None,
-    on_null: Optional[Any] = None,
+    on_missing: Optional[InstantLike] = None,
+    on_null: Optional[InstantLike] = None,
 ) -> JsonValue:
     """Creates an Instant value. For example, the JSON string
 
     .. code-block:: json
+
         "2009-02-13T23:31:30.123456789Z"
 
     might be modelled as the Instant type
 
     .. code-block:: python
+
         instant_val()
 
     In another example, the JSON decimal
 
     .. code-block:: json
+
         1234567890.123456789
 
     might be modelled as the Instant type
 
     .. code-block:: python
+
         instant_val(number_format="s", allow_decimal=True)
 
     In contexts where the user needs to create a JsonValueType and isn't changing any default values, the user can
     simplify by using the python datetime.datetime type. For example,
 
     .. code-block:: python
+
         some_method(instant_val())
 
     could be simplified to
 
     .. code-block:: python
+
         some_method(datetime.datetime)
 
     Args:
@@ -1048,8 +1109,8 @@ def instant_val(
             the epoch. When not set, a JSON string in the ISO-8601 format is expected.
         allow_decimal (bool): if the Instant value is allowed to be a JSON decimal type, default is False. Only valid
             when number_format is specified.
-        on_missing (Optional[Any]): the value to use when the JSON value is missing and allow_missing is True, default is None.
-        on_null (Optional[Any]): the value to use when the JSON value is null and allow_null is True, default is None.
+        on_missing (Optional[InstantLike]): the value to use when the JSON value is missing and allow_missing is True, default is None.
+        on_null (Optional[InstantLike]): the value to use when the JSON value is null and allow_null is True, default is None.
 
     Returns:
         the Instant value
@@ -1106,11 +1167,13 @@ def big_integer_val(
     """Creates a BigInteger value. For example, the JSON integer
 
     .. code-block:: json
+
         123456789012345678901
 
     might be modelled as the BigInteger type
 
     .. code-block:: python
+
         big_integer_val()
 
     Args:
@@ -1150,11 +1213,13 @@ def big_decimal_val(
     """Creates a BigDecimal value. For example, the JSON decimal
 
     .. code-block:: json
+
         123456789012345678901.42
 
     might be modelled as the BigDecimal type
 
     .. code-block:: python
+
         big_decimal_val()
 
     Args:
@@ -1207,11 +1272,13 @@ def skip_val(
     This may be useful in combination with an object type where allow_unknown_fields=False. For example, the JSON object
 
     .. code-block:: json
+
         { "name": "foo", "age": 42 }
 
     might be modelled as the object type
 
     .. code-block:: python
+
         object_val({ "name": str, "age": skip_val() }, allow_unknown_fields=False)
 
     Args:
diff --git a/py/server/deephaven/learn/__init__.py b/py/server/deephaven/learn/__init__.py
index 54261ad1d21..45439cb6bf0 100644
--- a/py/server/deephaven/learn/__init__.py
+++ b/py/server/deephaven/learn/__init__.py
@@ -71,7 +71,7 @@ def _validate(inputs: Input, outputs: Output, table: Table):
     input_columns_list = [input_.input.getColNames()[i] for input_ in inputs for i in
                           range(len(input_.input.getColNames()))]
     input_columns = set(input_columns_list)
-    table_columns = {col.name for col in table.columns}
+    table_columns = set(table.definition.keys())
     if table_columns >= input_columns:
         if outputs is not None:
             output_columns_list = [output.output.getColName() for output in outputs]
@@ -99,7 +99,7 @@ def _create_non_conflicting_col_name(table: Table, base_col_name: str) -> str:
     Returns:
         column name that is not present in the table.
     """
-    table_col_names = set([col.name for col in table.columns])
+    table_col_names = set(table.definition.keys())
     if base_col_name not in table_col_names:
         return base_col_name
     else:
diff --git a/py/server/deephaven/numpy.py b/py/server/deephaven/numpy.py
index c87f24ea40c..33dcef3bc14 100644
--- a/py/server/deephaven/numpy.py
+++ b/py/server/deephaven/numpy.py
@@ -8,10 +8,10 @@
 
 import jpy
 import numpy as np
-from deephaven.dtypes import DType, BusinessCalendar
+from deephaven.dtypes import BusinessCalendar
 
 from deephaven import DHError, dtypes, new_table
-from deephaven.column import Column, InputColumn
+from deephaven.column import InputColumn, ColumnDefinition
 from deephaven.dtypes import DType
 from deephaven.jcompat import _j_array_to_numpy_array
 from deephaven.table import Table
@@ -27,11 +27,11 @@ def _to_column_name(name: str) -> str:
     return re.sub(r"\s+", "_", tmp_name)
 
 
-def _column_to_numpy_array(col_def: Column, j_array: jpy.JType) -> np.ndarray:
+def _column_to_numpy_array(col_def: ColumnDefinition, j_array: jpy.JType) -> np.ndarray:
     """ Produces a numpy array from the given Java array and the Table column definition.
 
     Args:
-        col_def (Column): the column definition
+        col_def (ColumnDefinition): the column definition
         j_array (jpy.JType): the Java array
 
     Returns:
@@ -48,7 +48,7 @@ def _column_to_numpy_array(col_def: Column, j_array: jpy.JType) -> np.ndarray:
         raise DHError(e, f"failed to create a numpy array for the column {col_def.name}") from e
 
 
-def _columns_to_2d_numpy_array(col_def: Column, j_arrays: List[jpy.JType]) -> np.ndarray:
+def _columns_to_2d_numpy_array(col_def: ColumnDefinition, j_arrays: List[jpy.JType]) -> np.ndarray:
     """ Produces a 2d numpy array from the given Java arrays of the same component type and the Table column
     definition """
     try:
@@ -95,15 +95,15 @@ def to_numpy(table: Table, cols: List[str] = None) -> np.ndarray:
         if table.is_refreshing:
             table = table.snapshot()
 
-        col_def_dict = {col.name: col for col in table.columns}
+        table_def = table.definition
         if not cols:
-            cols = list(col_def_dict.keys())
+            cols = list(table_def.keys())
         else:
-            diff_set = set(cols) - set(col_def_dict.keys())
+            diff_set = set(cols) - set(table_def.keys())
             if diff_set:
                 raise DHError(message=f"columns - {list(diff_set)} not found")
 
-        col_defs = [col_def_dict[col] for col in cols]
+        col_defs = [table_def[col] for col in cols]
         if len(set([col_def.data_type for col_def in col_defs])) != 1:
             raise DHError(message="columns must be of the same data type.")
 
diff --git a/py/server/deephaven/pandas.py b/py/server/deephaven/pandas.py
index d946de5e391..c937bc47b94 100644
--- a/py/server/deephaven/pandas.py
+++ b/py/server/deephaven/pandas.py
@@ -11,7 +11,7 @@
 import pyarrow as pa
 
 from deephaven import DHError, new_table, dtypes, arrow
-from deephaven.column import Column
+from deephaven.column import ColumnDefinition
 from deephaven.constants import NULL_BYTE, NULL_SHORT, NULL_INT, NULL_LONG, NULL_FLOAT, NULL_DOUBLE, NULL_CHAR
 from deephaven.jcompat import _j_array_to_series
 from deephaven.numpy import _make_input_column
@@ -22,12 +22,12 @@
 _is_dtype_backend_supported = pd.__version__ >= "2.0.0"
 
 
-def _column_to_series(table: Table, col_def: Column, conv_null: bool) -> pd.Series:
+def _column_to_series(table: Table, col_def: ColumnDefinition, conv_null: bool) -> pd.Series:
     """Produce a copy of the specified column as a pandas.Series object.
 
     Args:
         table (Table): the table
-        col_def (Column):  the column definition
+        col_def (ColumnDefinition): the column definition
         conv_null (bool): whether to check for Deephaven nulls in the data and automatically replace them with
             pd.NA.
 
@@ -133,17 +133,17 @@ def to_pandas(table: Table, cols: List[str] = None,
         if table.is_refreshing:
             table = table.snapshot()
 
-        col_def_dict = {col.name: col for col in table.columns}
+        table_def = table.definition
         if not cols:
-            cols = list(col_def_dict.keys())
+            cols = list(table_def.keys())
         else:
-            diff_set = set(cols) - set(col_def_dict.keys())
+            diff_set = set(cols) - set(table_def.keys())
             if diff_set:
                 raise DHError(message=f"columns - {list(diff_set)} not found")
 
         data = {}
         for col in cols:
-            series = _column_to_series(table, col_def_dict[col], conv_null)
+            series = _column_to_series(table, table_def[col], conv_null)
             data[col] = series
 
         return pd.DataFrame(data=data, columns=cols, copy=False)
@@ -201,12 +201,15 @@ def _map_na(array: [np.ndarray, pd.api.extensions.ExtensionArray]):
     return array
 
 
-def to_table(df: pd.DataFrame, cols: List[str] = None) -> Table:
+def to_table(df: pd.DataFrame, cols: List[str] = None, infer_objects: bool = True) -> Table:
     """Creates a new table from a pandas DataFrame.
 
     Args:
         df (DataFrame): the pandas DataFrame instance
         cols (List[str]): the dataframe column names, default is None which means including all columns in the DataFrame
+        infer_objects (bool): whether to infer the best possible types for columns of the generic 'object' type in the
+            DataFrame before creating the table, default is True. When True, pandas convert_dtypes() method is called to
+            perform the conversion. Note that any conversion will make a copy of the data.
 
     Returns:
         a Deephaven table
@@ -222,11 +225,19 @@ def to_table(df: pd.DataFrame, cols: List[str] = None) -> Table:
         if diff_set:
             raise DHError(message=f"columns - {list(diff_set)} not found")
 
+    # if infer_objects is True, convert object dtypes to the best possible types supporting pd.NA
+    converted_df = df
+    if infer_objects:
+        converted_df = df[cols]
+        for col in cols:
+            if df.dtypes[col] == object:
+                converted_df[col] = df[col].convert_dtypes()
+
     # if any arrow backed column is present, create a pyarrow table first, then upload to DH, if error occurs, fall
     # back to the numpy-array based approach
-    if _is_dtype_backend_supported and any(isinstance(df[col].dtype, pd.ArrowDtype) for col in cols):
+    if _is_dtype_backend_supported and any(isinstance(converted_df[col].dtype, pd.ArrowDtype) for col in cols):
         try:
-            pa_table = pa.Table.from_pandas(df=df, columns=cols)
+            pa_table = pa.Table.from_pandas(df=converted_df, columns=cols)
             dh_table = arrow.to_table(pa_table)
             return dh_table
         except:
@@ -235,9 +246,9 @@ def to_table(df: pd.DataFrame, cols: List[str] = None) -> Table:
     try:
         input_cols = []
         for col in cols:
-            np_array = df.get(col).values
-            if isinstance(df.dtypes[col], pd.CategoricalDtype):
-                dtype = df.dtypes[col].categories.dtype
+            np_array = converted_df.get(col).values
+            if isinstance(converted_df.dtypes[col], pd.CategoricalDtype):
+                dtype = converted_df.dtypes[col].categories.dtype
             else:
                 dtype = np_array.dtype
             dh_dtype = dtypes.from_np_dtype(dtype)
diff --git a/py/server/deephaven/parquet.py b/py/server/deephaven/parquet.py
index dc877660671..188a3be9bdb 100644
--- a/py/server/deephaven/parquet.py
+++ b/py/server/deephaven/parquet.py
@@ -11,10 +11,8 @@
 import jpy
 
 from deephaven import DHError
-from deephaven.column import Column
-from deephaven.dtypes import DType
-from deephaven.jcompat import j_array_list, j_table_definition
-from deephaven.table import Table, PartitionedTable
+from deephaven.jcompat import j_array_list
+from deephaven.table import Table, TableDefinition, TableDefinitionLike, PartitionedTable
 from deephaven.experimental import s3
 
 _JParquetTools = jpy.get_type("io.deephaven.parquet.table.ParquetTools")
@@ -69,7 +67,7 @@ def _build_parquet_instructions(
     generate_metadata_files: Optional[bool] = None,
     base_name: Optional[str] = None,
     file_layout: Optional[ParquetFileLayout] = None,
-    table_definition: Optional[Union[Dict[str, DType], List[Column]]] = None,
+    table_definition: Optional[TableDefinitionLike] = None,
     index_columns: Optional[Sequence[Sequence[str]]] = None,
     special_instructions: Optional[s3.S3Instructions] = None,
 ):
@@ -135,7 +133,7 @@ def _build_parquet_instructions(
         builder.setFileLayout(_j_file_layout(file_layout))
 
     if table_definition is not None:
-        builder.setTableDefinition(j_table_definition(table_definition))
+        builder.setTableDefinition(TableDefinition(table_definition).j_table_definition)
 
     if index_columns:
         builder.addAllIndexColumns(_j_list_of_list_of_string(index_columns))
@@ -166,7 +164,7 @@ def read(
     is_legacy_parquet: bool = False,
     is_refreshing: bool = False,
     file_layout: Optional[ParquetFileLayout] = None,
-    table_definition: Union[Dict[str, DType], List[Column], None] = None,
+    table_definition: Optional[TableDefinitionLike] = None,
     special_instructions: Optional[s3.S3Instructions] = None,
 ) -> Table:
     """ Reads in a table from a single parquet, metadata file, or directory with recognized layout.
@@ -179,7 +177,7 @@ def read(
         is_refreshing (bool): if the parquet data represents a refreshing source
         file_layout (Optional[ParquetFileLayout]): the parquet file layout, by default None. When None, the layout is
             inferred.
-        table_definition (Union[Dict[str, DType], List[Column], None]): the table definition, by default None. When None,
+        table_definition (Optional[TableDefinitionLike]): the table definition, by default None. When None,
             the definition is inferred from the parquet file(s). Setting a definition guarantees the returned table will
             have that definition. This is useful for bootstrapping purposes when the initially partitioned directory is
             empty and is_refreshing=True. It is also useful for specifying a subset of the parquet definition.
@@ -235,23 +233,24 @@ def delete(path: str) -> None:
 def write(
     table: Table,
     path: str,
-    table_definition: Optional[Union[Dict[str, DType], List[Column]]] = None,
+    table_definition: Optional[TableDefinitionLike] = None,
     col_instructions: Optional[List[ColumnInstruction]] = None,
     compression_codec_name: Optional[str] = None,
     max_dictionary_keys: Optional[int] = None,
     max_dictionary_size: Optional[int] = None,
     target_page_size: Optional[int] = None,
     generate_metadata_files: Optional[bool] = None,
-    index_columns: Optional[Sequence[Sequence[str]]] = None
+    index_columns: Optional[Sequence[Sequence[str]]] = None,
+    special_instructions: Optional[s3.S3Instructions] = None
 ) -> None:
     """ Write a table to a Parquet file.
 
     Args:
         table (Table): the source table
-        path (str): the destination file path; the file name should end in a ".parquet" extension. If the path
+        path (str): the destination file path or URI; the file name should end in a ".parquet" extension. If the path
             includes any non-existing directories, they are created. If there is an error, any intermediate directories
             previously created are removed; note this makes this method unsafe for concurrent use
-        table_definition (Optional[Union[Dict[str, DType], List[Column]]): the table definition to use for writing,
+        table_definition (Optional[TableDefinitionLike]): the table definition to use for writing,
             instead of the definitions implied by the table. Default is None, which means use the column definitions
             implied by the table. This definition can be used to skip some columns or add additional columns with
             null values.
@@ -275,6 +274,8 @@ def write(
             source table. This argument can be used to narrow the set of indexes to write, or to be explicit about the
             expected set of indexes present on all sources. Indexes that are specified but missing will be computed on
             demand.
+        special_instructions (Optional[s3.S3Instructions]): Special instructions for writing parquet files, useful when
+            writing files to a non-local file system, like S3. By default, None.
     Raises:
         DHError
     """
@@ -289,6 +290,7 @@ def write(
             generate_metadata_files=generate_metadata_files,
             table_definition=table_definition,
             index_columns=index_columns,
+            special_instructions=special_instructions,
         )
         _JParquetTools.writeTable(table.j_table, path, write_instructions)
     except Exception as e:
@@ -298,7 +300,7 @@ def write(
 def write_partitioned(
         table: Union[Table, PartitionedTable],
         destination_dir: str,
-        table_definition: Optional[Union[Dict[str, DType], List[Column]]] = None,
+        table_definition: Optional[TableDefinitionLike] = None,
         col_instructions: Optional[List[ColumnInstruction]] = None,
         compression_codec_name: Optional[str] = None,
         max_dictionary_keys: Optional[int] = None,
@@ -306,7 +308,8 @@ def write_partitioned(
         target_page_size: Optional[int] = None,
         base_name: Optional[str] = None,
         generate_metadata_files: Optional[bool] = None,
-        index_columns: Optional[Sequence[Sequence[str]]] = None
+        index_columns: Optional[Sequence[Sequence[str]]] = None,
+        special_instructions: Optional[s3.S3Instructions] = None
 ) -> None:
     """ Write table to disk in parquet format with the partitioning columns written as "key=value" format in a nested
     directory structure. For example, for a partitioned column "date", we will have a directory structure like
@@ -316,9 +319,10 @@ def write_partitioned(
 
     Args:
         table (Table): the source table or partitioned table
-        destination_dir (str): The path to destination root directory in which the partitioned parquet data will be stored
-            in a nested directory structure format. Non-existing directories in the provided path will be created.
-        table_definition (Optional[Union[Dict[str, DType], List[Column]]): the table definition to use for writing,
+        destination_dir (str): The path or URI to the destination root directory in which the partitioned parquet data
+            will be stored in a nested directory structure format. Non-existing directories in the provided path will be
+            created.
+        table_definition (Optional[TableDefinitionLike]): the table definition to use for writing,
             instead of the definitions implied by the table. Default is None, which means use the column definitions
             implied by the table. This definition can be used to skip some columns or add additional columns with
             null values.
@@ -354,6 +358,8 @@ def write_partitioned(
             source table. This argument can be used to narrow the set of indexes to write, or to be explicit about the
             expected set of indexes present on all sources. Indexes that are specified but missing will be computed on
             demand.
+        special_instructions (Optional[s3.S3Instructions]): Special instructions for writing parquet files, useful when
+            writing files to a non-local file system, like S3. By default, None.
 
     Raises:
         DHError
@@ -370,6 +376,7 @@ def write_partitioned(
             base_name=base_name,
             table_definition=table_definition,
             index_columns=index_columns,
+            special_instructions=special_instructions,
         )
         _JParquetTools.writeKeyValuePartitionedTable(table.j_object, destination_dir, write_instructions)
     except Exception as e:
@@ -379,14 +386,15 @@ def write_partitioned(
 def batch_write(
     tables: List[Table],
     paths: List[str],
-    table_definition: Optional[Union[Dict[str, DType], List[Column]]] = None,
+    table_definition: Optional[TableDefinitionLike] = None,
     col_instructions: Optional[List[ColumnInstruction]] = None,
     compression_codec_name: Optional[str] = None,
     max_dictionary_keys: Optional[int] = None,
     max_dictionary_size: Optional[int] = None,
     target_page_size: Optional[int] = None,
     generate_metadata_files: Optional[bool] = None,
-    index_columns: Optional[Sequence[Sequence[str]]] = None
+    index_columns: Optional[Sequence[Sequence[str]]] = None,
+    special_instructions: Optional[s3.S3Instructions] = None
 ):
     """ Writes tables to disk in parquet format to a supplied set of paths.
 
@@ -394,10 +402,10 @@ def batch_write(
 
     Args:
         tables (List[Table]): the source tables
-        paths (List[str]): the destination paths. Any non-existing directories in the paths provided are
+        paths (List[str]): the destination paths or URIs. Any non-existing directories in the paths provided are
             created. If there is an error, any intermediate directories previously created are removed; note this makes
             this method unsafe for concurrent use
-        table_definition (Optional[Union[Dict[str, DType], List[Column]]]): the table definition to use for writing.
+        table_definition (Optional[TableDefinitionLike]): the table definition to use for writing.
             This definition can be used to skip some columns or add additional columns with null values. Default is
             None, which means if all tables have the same definition, use the common table definition implied by the
             tables. Otherwise, this parameter must be specified.
@@ -420,6 +428,8 @@ def batch_write(
             source table. This argument can be used to narrow the set of indexes to write, or to be explicit about the
             expected set of indexes present on all sources. Indexes that are specified but missing will be computed on
             demand.
+        special_instructions (Optional[s3.S3Instructions]): Special instructions for writing parquet files, useful when
+            writing files to a non-local file system, like S3. By default, None.
 
     Raises:
         DHError
@@ -435,6 +445,7 @@ def batch_write(
             generate_metadata_files=generate_metadata_files,
             table_definition=table_definition,
             index_columns=index_columns,
+            special_instructions=special_instructions,
         )
         _JParquetTools.writeTables([t.j_table for t in tables], _j_string_array(paths), write_instructions)
     except Exception as e:
diff --git a/py/server/deephaven/plot/figure.py b/py/server/deephaven/plot/figure.py
index fdd0a422a69..0caf9017c84 100644
--- a/py/server/deephaven/plot/figure.py
+++ b/py/server/deephaven/plot/figure.py
@@ -2757,7 +2757,7 @@ def y_twin(
         self,
         name: str = None,
     ) -> Figure:
-        """Creates a new Axes which shares the y-Axis with the current Axes. For example, this is used for creating plots with a common x-axis but two different y-axes.
+        """Creates a new Axes which shares the y-Axis with the current Axes. For example, this is used for creating plots with a common y-axis but two different x-axes.
 
         Args:
             name (str): name
diff --git a/py/server/deephaven/replay.py b/py/server/deephaven/replay.py
index 78c8e018af1..b578c5e3d66 100644
--- a/py/server/deephaven/replay.py
+++ b/py/server/deephaven/replay.py
@@ -4,16 +4,12 @@
 
 """ This module provides support for replaying historical data. """
 
-from typing import Union
 import jpy
 
-import datetime
-import numpy as np
-import pandas as pd
-
-from deephaven import dtypes, DHError, time
+from deephaven import DHError, time
 from deephaven._wrapper import JObjectWrapper
 from deephaven.table import Table
+from deephaven.time import InstantLike
 
 _JReplayer = jpy.get_type("io.deephaven.engine.table.impl.replay.Replayer")
 
@@ -27,14 +23,13 @@ class TableReplayer(JObjectWrapper):
 
     j_object_type = _JReplayer
 
-    def __init__(self, start_time: Union[dtypes.Instant, int, str, datetime.datetime, np.datetime64, pd.Timestamp],
-                 end_time: Union[dtypes.Instant, int, str, datetime.datetime, np.datetime64, pd.Timestamp]):
+    def __init__(self, start_time: InstantLike, end_time: InstantLike):
         """Initializes the replayer.
 
         Args:
-             start_time (Union[dtypes.Instant, int, str, datetime.datetime, np.datetime64, pd.Timestamp]):
+             start_time (InstantLike):
                 replay start time.  Integer values are nanoseconds since the Epoch.
-             end_time (Union[dtypes.Instant, int, str, datetime.datetime, np.datetime64, pd.Timestamp]):
+             end_time (InstantLike):
                 replay end time.  Integer values are nanoseconds since the Epoch.
 
         Raises:
diff --git a/py/server/deephaven/stream/__init__.py b/py/server/deephaven/stream/__init__.py
index e0442a1831d..78266835fd3 100644
--- a/py/server/deephaven/stream/__init__.py
+++ b/py/server/deephaven/stream/__init__.py
@@ -11,6 +11,30 @@
 from deephaven.table import Table
 
 _JBlinkTableTools = jpy.get_type("io.deephaven.engine.table.impl.BlinkTableTools")
+_JAddOnlyToBlinkTableAdapter = jpy.get_type("io.deephaven.engine.table.impl.AddOnlyToBlinkTableAdapter")
+
+def add_only_to_blink(table: Table) -> Table:
+    """ Creates a blink table from the given add-only table.  The blink table contains the rows added in the latest
+    update cycle.
+
+    Note that the use of this function should be limited to add-only tables that are not fully in-memory, or when
+    blink table specific aggregation semantics are desired. If the table is fully in-memory, creating a downstream blink
+    table is not recommended because it doesn't achieve the main benefit of blink tables, which is to reduce memory usage
+    but instead increases memory usage.
+
+    Args:
+        table (Table): the source table
+
+    Returns:
+        a blink table
+
+    Raises:
+        DHError
+    """
+    try:
+        return Table(j_table=_JAddOnlyToBlinkTableAdapter.toBlink(table.j_table))
+    except Exception as e:
+        raise DHError(e, "failed to create a blink table.") from e
 
 def blink_to_append_only(table: Table) -> Table:
     """ Creates an 'append only' table from the blink table.
diff --git a/py/server/deephaven/stream/kafka/consumer.py b/py/server/deephaven/stream/kafka/consumer.py
index 01d33e7463b..abfe1a4f818 100644
--- a/py/server/deephaven/stream/kafka/consumer.py
+++ b/py/server/deephaven/stream/kafka/consumer.py
@@ -9,11 +9,11 @@
 
 from deephaven import dtypes
 from deephaven._wrapper import JObjectWrapper
-from deephaven.column import Column
+from deephaven.column import col_def
 from deephaven.dherror import DHError
 from deephaven.dtypes import DType
 from deephaven.jcompat import j_hashmap, j_properties, j_array_list
-from deephaven.table import Table, PartitionedTable
+from deephaven.table import Table, TableDefinition, TableDefinitionLike, PartitionedTable
 
 _JKafkaTools = jpy.get_type("io.deephaven.kafka.KafkaTools")
 _JKafkaTools_Consume = jpy.get_type("io.deephaven.kafka.KafkaTools$Consume")
@@ -427,13 +427,13 @@ def avro_spec(
         raise DHError(e, "failed to create a Kafka key/value spec") from e
 
 
-def json_spec(col_defs: Union[Dict[str, DType], List[Tuple[str, DType]]], mapping: Dict = None) -> KeyValueSpec:
+def json_spec(col_defs: Union[TableDefinitionLike, List[Tuple[str, DType]]], mapping: Dict = None) -> KeyValueSpec:
     """Creates a spec for how to use JSON data when consuming a Kafka stream to a Deephaven table.
 
     Args:
-        col_defs (Union[Dict[str, DType], List[Tuple[str, DType]]): the column definitions, either a map of column
-            names and Deephaven types, or a list of tuples with two elements, a string for column name and a Deephaven
-            type for column data type.
+        col_defs (Union[TableDefinitionLike, List[Tuple[str, DType]]): the table definition, preferably specified as
+            TableDefinitionLike. A list of tuples with two elements, a string for column name and a Deephaven type for
+            column data type also works, but is deprecated for removal.
         mapping (Dict): a dict mapping JSON fields to column names defined in the col_defs
             argument.  Fields starting with a '/' character are interpreted as a JSON Pointer (see RFC 6901,
             ISSN: 2070-1721 for details, essentially nested fields are represented like "/parent/nested").
@@ -448,10 +448,20 @@ def json_spec(col_defs: Union[Dict[str, DType], List[Tuple[str, DType]]], mappin
         DHError
     """
     try:
-        if isinstance(col_defs, dict):
-            col_defs = [Column(k, v).j_column_definition for k, v in col_defs.items()]
+        try:
+            table_def = TableDefinition(col_defs)
+        except DHError:
+            table_def = None
+
+        if table_def:
+            col_defs = [col.j_column_definition for col in table_def.values()]
         else:
-            col_defs = [Column(*t).j_column_definition for t in col_defs]
+            warn(
+                'json_spec col_defs for List[Tuple[str, DType]] is deprecated for removal, prefer TableDefinitionLike',
+                DeprecationWarning,
+                stacklevel=2,
+            )
+            col_defs = [col_def(*t).j_column_definition for t in col_defs]
 
         if mapping is None:
             return KeyValueSpec(j_spec=_JKafkaTools_Consume.jsonSpec(col_defs))
diff --git a/py/server/deephaven/stream/table_publisher.py b/py/server/deephaven/stream/table_publisher.py
index a6c65f47885..57ead700e79 100644
--- a/py/server/deephaven/stream/table_publisher.py
+++ b/py/server/deephaven/stream/table_publisher.py
@@ -8,11 +8,9 @@
 from typing import Callable, Dict, Optional, Tuple, Union, List
 
 from deephaven._wrapper import JObjectWrapper
-from deephaven.column import Column
-from deephaven.dtypes import DType
 from deephaven.execution_context import get_exec_ctx
-from deephaven.jcompat import j_lambda, j_runnable, j_table_definition
-from deephaven.table import Table
+from deephaven.jcompat import j_lambda, j_runnable
+from deephaven.table import Table, TableDefinition, TableDefinitionLike
 from deephaven.update_graph import UpdateGraph
 
 _JTableDefinition = jpy.get_type("io.deephaven.engine.table.TableDefinition")
@@ -75,7 +73,7 @@ def publish_failure(self, failure: Exception) -> None:
 
 def table_publisher(
     name: str,
-    col_defs: Union[Dict[str, DType], List[Column]],
+    col_defs: TableDefinitionLike,
     on_flush_callback: Optional[Callable[[TablePublisher], None]] = None,
     on_shutdown_callback: Optional[Callable[[], None]] = None,
     update_graph: Optional[UpdateGraph] = None,
@@ -85,7 +83,7 @@ def table_publisher(
 
     Args:
         name (str): the name, used for logging
-        col_defs (Dict[str, DType]): the column definitions for the resulting blink table
+        col_defs (TableDefinitionLike): the table definition for the resulting blink table
         on_flush_callback (Optional[Callable[[TablePublisher], None]]): the on-flush callback, if present, is called
             once at the beginning of each update graph cycle. This is a pattern that allows publishers to add any data
             they may have been batching. Do note though, this blocks the update cycle from proceeding, so
@@ -107,7 +105,7 @@ def adapt_callback(_table_publisher: jpy.JType):
 
     j_table_publisher = _JTablePublisher.of(
         name,
-        j_table_definition(col_defs),
+        TableDefinition(col_defs).j_table_definition,
         j_lambda(adapt_callback, _JConsumer, None) if on_flush_callback else None,
         j_runnable(on_shutdown_callback) if on_shutdown_callback else None,
         (update_graph or get_exec_ctx().update_graph).j_update_graph,
diff --git a/py/server/deephaven/table.py b/py/server/deephaven/table.py
index df6cc4b3e93..d5d1b69140b 100644
--- a/py/server/deephaven/table.py
+++ b/py/server/deephaven/table.py
@@ -11,10 +11,13 @@
 import inspect
 from enum import Enum
 from enum import auto
-from typing import Any, Optional, Callable, Dict
-from typing import Sequence, List, Union, Protocol
+from functools import cached_property
+from typing import Any, Optional, Callable, Dict, Generator, Tuple, Literal
+from typing import Sequence, List, Union, Protocol, Mapping, Iterable
 
 import jpy
+import numpy as np
+import sys
 
 from deephaven import DHError
 from deephaven import dtypes
@@ -22,7 +25,7 @@
 from deephaven._wrapper import JObjectWrapper
 from deephaven._wrapper import unwrap
 from deephaven.agg import Aggregation
-from deephaven.column import Column, ColumnType
+from deephaven.column import col_def, ColumnDefinition
 from deephaven.filters import Filter, and_, or_
 from deephaven.jcompat import j_unary_operator, j_binary_operator, j_map_to_dict, j_hashmap
 from deephaven.jcompat import to_sequence, j_array_list
@@ -42,6 +45,8 @@
 _JSearchDisplayMode = jpy.get_type("io.deephaven.engine.util.LayoutHintBuilder$SearchDisplayModes")
 _JSnapshotWhenOptions = jpy.get_type("io.deephaven.api.snapshot.SnapshotWhenOptions")
 _JBlinkTableTools = jpy.get_type("io.deephaven.engine.table.impl.BlinkTableTools")
+_JDiffItems = jpy.get_type("io.deephaven.engine.util.TableDiff$DiffItems")
+_JEnumSet = jpy.get_type("java.util.EnumSet")
 
 # PartitionedTable
 _JPartitionedTable = jpy.get_type("io.deephaven.engine.table.PartitionedTable")
@@ -404,19 +409,133 @@ def _sort_column(col, dir_):
         _JColumnName.of(col)))
 
 
-def _td_to_columns(table_definition):
-    cols = []
-    j_cols = table_definition.getColumnsArray()
-    for j_col in j_cols:
-        cols.append(
-            Column(
-                name=j_col.getName(),
-                data_type=dtypes.from_jtype(j_col.getDataType()),
-                component_type=dtypes.from_jtype(j_col.getComponentType()),
-                column_type=ColumnType(j_col.getColumnType()),
+if sys.version_info >= (3, 10):
+    from typing import TypeAlias # novermin
+
+    TableDefinitionLike: TypeAlias = Union[
+        "TableDefinition",
+        Mapping[str, dtypes.DType],
+        Iterable[ColumnDefinition],
+        jpy.JType,
+    ]
+    """A Union representing objects that can be coerced into a TableDefinition."""
+else:
+    TableDefinitionLike = Union[
+        "TableDefinition",
+        Mapping[str, dtypes.DType],
+        Iterable[ColumnDefinition],
+        jpy.JType,
+    ]
+    """A Union representing objects that can be coerced into a TableDefinition."""
+
+
+class TableDefinition(JObjectWrapper, Mapping):
+    """A Deephaven table definition, as a mapping from column name to ColumnDefinition."""
+
+    j_object_type = _JTableDefinition
+
+    @staticmethod
+    def _to_j_table_definition(table_definition: TableDefinitionLike) -> jpy.JType:
+        if isinstance(table_definition, TableDefinition):
+            return table_definition.j_table_definition
+        if isinstance(table_definition, _JTableDefinition):
+            return table_definition
+        if isinstance(table_definition, Mapping):
+            for name in table_definition.keys():
+                if not isinstance(name, str):
+                    raise DHError(
+                        f"Expected TableDefinitionLike Mapping to contain str keys, found type {type(name)}"
+                    )
+            for data_type in table_definition.values():
+                if not isinstance(data_type, dtypes.DType):
+                    raise DHError(
+                        f"Expected TableDefinitionLike Mapping to contain DType values, found type {type(data_type)}"
+                    )
+            column_definitions = [
+                col_def(name, data_type) for name, data_type in table_definition.items()
+            ]
+        elif isinstance(table_definition, Iterable):
+            for column_definition in table_definition:
+                if not isinstance(column_definition, ColumnDefinition):
+                    raise DHError(
+                        f"Expected TableDefinitionLike Iterable to contain ColumnDefinition values, found type {type(column_definition)}"
+                    )
+            column_definitions = table_definition
+        else:
+            raise DHError(
+                f"Unexpected TableDefinitionLike type: {type(table_definition)}"
             )
+        return _JTableDefinition.of(
+            [col.j_column_definition for col in column_definitions]
         )
-    return cols
+
+    def __init__(self, table_definition: TableDefinitionLike):
+        """Construct a TableDefinition.
+
+        Args:
+            table_definition (TableDefinitionLike): The table definition like object
+
+        Returns:
+            A new TableDefinition
+
+        Raises:
+            DHError
+        """
+        self.j_table_definition = TableDefinition._to_j_table_definition(
+            table_definition
+        )
+
+    @property
+    def j_object(self) -> jpy.JType:
+        return self.j_table_definition
+
+    @property
+    def table(self) -> Table:
+        """This table definition as a table."""
+        return Table(_JTableTools.metaTable(self.j_table_definition))
+
+    def keys(self):
+        """The column names as a dictview."""
+        return self._dict.keys()
+
+    def items(self):
+        """The column name, column definition tuples as a dictview."""
+        return self._dict.items()
+
+    def values(self):
+        """The column definitions as a dictview."""
+        return self._dict.values()
+
+    @cached_property
+    def _dict(self) -> Dict[str, ColumnDefinition]:
+        return {
+            col.name: col
+            for col in [
+                ColumnDefinition(j_col)
+                for j_col in self.j_table_definition.getColumnsArray()
+            ]
+        }
+
+    def __getitem__(self, key) -> ColumnDefinition:
+        return self._dict[key]
+
+    def __iter__(self):
+        return iter(self._dict)
+
+    def __len__(self):
+        return len(self._dict)
+
+    def __contains__(self, item):
+        return item in self._dict
+
+    def __eq__(self, other):
+        return JObjectWrapper.__eq__(self, other)
+
+    def __ne__(self, other):
+        return JObjectWrapper.__ne__(self, other)
+
+    def __hash__(self):
+        return JObjectWrapper.__hash__(self)
 
 
 class Table(JObjectWrapper):
@@ -432,11 +551,7 @@ def __init__(self, j_table: jpy.JType):
         self.j_table = jpy.cast(j_table, self.j_object_type)
         if self.j_table is None:
             raise DHError("j_table type is not io.deephaven.engine.table.Table")
-        self._definition = self.j_table.getDefinition()
-        self._schema = None
-        self._is_refreshing = None
-        self._update_graph = None
-        self._is_flat = None
+        self._definition = TableDefinition(self.j_table.getDefinition())
 
     def __repr__(self):
         default_repr = super().__repr__()
@@ -462,37 +577,37 @@ def size(self) -> int:
     @property
     def is_refreshing(self) -> bool:
         """Whether this table is refreshing."""
-        if self._is_refreshing is None:
-            self._is_refreshing = self.j_table.isRefreshing()
-        return self._is_refreshing
+        return self.j_table.isRefreshing()
 
     @property
     def is_blink(self) -> bool:
         """Whether this table is a blink table."""
         return _JBlinkTableTools.isBlink(self.j_table)
 
-    @property
+    @cached_property
     def update_graph(self) -> UpdateGraph:
         """The update graph of the table."""
-        if self._update_graph is None:
-            self._update_graph = UpdateGraph(self.j_table.getUpdateGraph())
-        return self._update_graph
+        return UpdateGraph(self.j_table.getUpdateGraph())
 
     @property
     def is_flat(self) -> bool:
         """Whether this table is guaranteed to be flat, i.e. its row set will be from 0 to number of rows - 1."""
-        if self._is_flat is None:
-            self._is_flat = self.j_table.isFlat()
-        return self._is_flat
+        return self.j_table.isFlat()
 
     @property
-    def columns(self) -> List[Column]:
-        """The column definitions of the table."""
-        if self._schema:
-            return self._schema
+    def definition(self) -> TableDefinition:
+        """The table definition."""
+        return self._definition
+
+    @property
+    def column_names(self) -> List[str]:
+        """The column names of the table."""
+        return list(self.definition.keys())
 
-        self._schema = _td_to_columns(self._definition)
-        return self._schema
+    @property
+    def columns(self) -> List[ColumnDefinition]:
+        """The column definitions of the table."""
+        return list(self.definition.values())
 
     @property
     def meta_table(self) -> Table:
@@ -503,6 +618,117 @@ def meta_table(self) -> Table:
     def j_object(self) -> jpy.JType:
         return self.j_table
 
+    def iter_dict(self, cols: Optional[Union[str, Sequence[str]]] = None, *, chunk_size: int = 2048) \
+            -> Generator[Dict[str, Any], None, None]:
+        """ Returns a generator that reads one row at a time from the table into a dictionary. The dictionary is a map
+        of column names to scalar values of the column data type.
+
+        If the table is refreshing and no update graph locks are currently being held, the generator will try to acquire
+        the shared lock of the update graph before reading the table data. This provides a consistent view of the data.
+        The side effect of this is that the table will not be able to refresh while the table is being iterated on.
+        Additionally, the generator internally maintains a fill context. The auto acquired shared lock and the fill
+        context will be released after the generator is destroyed. That can happen implicitly when the generator
+        is used in a for-loop. When the generator is not used in a for-loop, to prevent resource leaks, it must be closed
+        after use by either (1) setting it to None, (2) using the del statement, or (3) calling the close() method on it.
+
+        Args:
+            cols (Optional[Union[str, Sequence[str]]]): The columns to read. If None, all columns are read.
+            chunk_size (int): The number of rows to read at a time internally to reduce the number of Java/Python boundary
+                crossings. Default is 2048.
+
+        Returns:
+            A generator that yields a dictionary of column names to scalar values.
+
+        Raises:
+            ValueError
+        """
+        from deephaven._table_reader import _table_reader_row_dict # to prevent circular import
+        return _table_reader_row_dict(self, cols, chunk_size=chunk_size)
+
+    def iter_tuple(self, cols: Optional[Union[str, Sequence[str]]] = None, *, tuple_name: str = 'Deephaven',
+                   chunk_size: int = 2048) -> Generator[Tuple[Any, ...], None, None]:
+        """ Returns a generator that reads one row at a time from the table into a named tuple. The named tuple is made
+        up of fields with their names being the column names and their values being of the column data types.
+
+        If the table is refreshing and no update graph locks are currently being held, the generator will try to acquire
+        the shared lock of the update graph before reading the table data. This provides a consistent view of the data.
+        The side effect of this is that the table will not be able to refresh while the table is being iterated on.
+        Additionally, the generator internally maintains a fill context. The auto acquired shared lock and the fill
+        context will be released after the generator is destroyed. That can happen implicitly when the generator
+        is used in a for-loop. When the generator is not used in a for-loop, to prevent resource leaks, it must be closed
+        after use by either (1) setting it to None, (2) using the del statement, or (3) calling the close() method on it.
+
+        Args:
+            cols (Optional[Union[str, Sequence[str]]]): The columns to read. If None, all columns are read. Default is None.
+            tuple_name (str): The name of the named tuple. Default is 'Deephaven'.
+            chunk_size (int): The number of rows to read at a time internally to reduce the number of Java/Python boundary
+                crossings. Default is 2048.
+
+        Returns:
+            A generator that yields a named tuple for each row in the table
+
+        Raises:
+            ValueError
+        """
+        from deephaven._table_reader import _table_reader_row_tuple # to prevent circular import
+        return _table_reader_row_tuple(self, cols, tuple_name = tuple_name, chunk_size = chunk_size)
+
+    def iter_chunk_dict(self, cols: Optional[Union[str, Sequence[str]]] = None, chunk_size: int = 2048) \
+            -> Generator[Dict[str, np.ndarray], None, None]:
+        """ Returns a generator that reads one chunk of rows at a time from the table into a dictionary. The dictionary
+        is a map of column names to numpy arrays of the column data type.
+
+        If the table is refreshing and no update graph locks are currently being held, the generator will try to acquire
+        the shared lock of the update graph before reading the table data. This provides a consistent view of the data.
+        The side effect of this is that the table will not be able to refresh while the table is being iterated on.
+        Additionally, the generator internally maintains a fill context. The auto acquired shared lock and the fill
+        context will be released after the generator is destroyed. That can happen implicitly when the generator
+        is used in a for-loop. When the generator is not used in a for-loop, to prevent resource leaks, it must be closed
+        after use by either (1) setting it to None, (2) using the del statement, or (3) calling the close() method on it.
+
+        Args:
+            cols (Optional[Union[str, Sequence[str]]]): The columns to read. If None, all columns are read.
+            chunk_size (int): The number of rows to read at a time. Default is 2048.
+
+        Returns:
+            A generator that yields a dictionary of column names to numpy arrays.
+
+        Raises
+            ValueError
+        """
+        from deephaven._table_reader import _table_reader_chunk_dict  # to prevent circular import
+
+        return _table_reader_chunk_dict(self, cols=cols, row_set=self.j_table.getRowSet(), chunk_size=chunk_size,
+                                        prev=False)
+
+    def iter_chunk_tuple(self, cols: Optional[Union[str, Sequence[str]]] = None, tuple_name: str = 'Deephaven',
+                         chunk_size: int = 2048,)-> Generator[Tuple[np.ndarray, ...], None, None]:
+        """ Returns a generator that reads one chunk of rows at a time from the table into a named tuple. The named
+        tuple is made up of fields with their names being the column names and their values being numpy arrays of the
+        column data types.
+
+        If the table is refreshing and no update graph locks are currently being held, the generator will try to acquire
+        the shared lock of the update graph before reading the table data. This provides a consistent view of the data.
+        The side effect of this is that the table will not be able to refresh while the table is being iterated on.
+        Additionally, the generator internally maintains a fill context. The auto acquired shared lock and the fill
+        context will be released after the generator is destroyed. That can happen implicitly when the generator
+        is used in a for-loop. When the generator is not used in a for-loop, to prevent resource leaks, it must be closed
+        after use by either (1) setting it to None, (2) using the del statement, or (3) calling the close() method on it.
+
+        Args:
+            cols (Optional[Union[str, Sequence[str]]]): The columns to read. If None, all columns are read.
+            tuple_name (str): The name of the named tuple. Default is 'Deephaven'.
+            chunk_size (int): The number of rows to read at a time. Default is 2048.
+
+        Returns:
+            A generator that yields a named tuple for each row in the table.
+
+        Raises:
+            ValueError
+        """
+        from deephaven._table_reader import _table_reader_chunk_tuple  # to prevent circular import
+        return _table_reader_chunk_tuple(self, cols=cols, tuple_name=tuple_name, chunk_size=chunk_size)
+
     def has_columns(self, cols: Union[str, Sequence[str]]):
         """Whether this table contains a column for each of the provided names, return False if any of the columns is
         not in the table.
@@ -590,6 +816,10 @@ def flatten(self) -> Table:
         """Returns a new version of this table with a flat row set, i.e. from 0 to number of rows - 1."""
         return Table(j_table=self.j_table.flatten())
 
+    def remove_blink(self) -> Table:
+        """Returns a non-blink child table, or this table if it is not a blink table."""
+        return Table(j_table=self.j_table.removeBlink())
+
     def snapshot(self) -> Table:
         """Returns a static snapshot table.
 
@@ -613,6 +843,10 @@ def snapshot_when(self, trigger_table: Table, stamp_cols: Union[str, List[str]]
         table. The "stamp key" is the last row of the trigger_table, limited by the stamp_cols. If trigger_table is
         empty, the "stamp key" will be represented by NULL values.
 
+        Note: the trigger_table must be append-only when the history flag is set to True. If the trigger_table is not
+        append-only and has modified or removed rows in its updates, the result snapshot table will be put in a failure
+        state and become unusable.
+
         Args:
             trigger_table (Table): the trigger table
             stamp_cols (Union[str, Sequence[str]): The columns from trigger_table that form the "stamp key", may be
@@ -2070,6 +2304,16 @@ def slice(self, start: int, stop: int) -> Table:
 
         Raises:
             DHError
+
+        Examples:
+            >>> table.slice(0, 5)    # first 5 rows
+            >>> table.slice(-5, 0)   # last 5 rows
+            >>> table.slice(2, 6)    # rows from index 2 to 5
+            >>> table.slice(6, 2)    # ERROR: cannot slice start after end
+            >>> table.slice(-6, -2)  # rows from 6th last to 2nd last (exclusive)
+            >>> table.slice(-2, -6)  # ERROR: cannot slice start after end
+            >>> table.slice(2, -3)   # all rows except the first 2 and the last 3
+            >>> table.slice(-6, 8)   # rows from 6th last to index 8 (exclusive)
         """
         try:
             return Table(j_table=self.j_table.slice(start, stop))
@@ -2220,13 +2464,8 @@ def j_object(self) -> jpy.JType:
 
     def __init__(self, j_partitioned_table):
         self.j_partitioned_table = j_partitioned_table
-        self._schema = None
+        self._definition = None
         self._table = None
-        self._key_columns = None
-        self._unique_keys = None
-        self._constituent_column = None
-        self._constituent_changes_permitted = None
-        self._is_refreshing = None
 
     @classmethod
     def from_partitioned_table(cls,
@@ -2234,18 +2473,18 @@ def from_partitioned_table(cls,
                                key_cols: Union[str, List[str]] = None,
                                unique_keys: bool = None,
                                constituent_column: str = None,
-                               constituent_table_columns: List[Column] = None,
+                               constituent_table_columns: Optional[TableDefinitionLike] = None,
                                constituent_changes_permitted: bool = None) -> PartitionedTable:
         """Creates a PartitionedTable from the provided underlying partitioned Table.
 
-        Note: key_cols, unique_keys, constituent_column, constituent_table_columns,
+        Note: key_cols, unique_keys, constituent_column, constituent_table_definition,
         constituent_changes_permitted must either be all None or all have values. When they are None, their values will
         be inferred as follows:
 
         |    * key_cols: the names of all columns with a non-Table data type
         |    * unique_keys: False
         |    * constituent_column: the name of the first column with a Table data type
-        |    * constituent_table_columns: the column definitions of the first cell (constituent table) in the constituent
+        |    * constituent_table_definition: the table definitions of the first cell (constituent table) in the constituent
             column. Consequently, the constituent column can't be empty.
         |    * constituent_changes_permitted: the value of table.is_refreshing
 
@@ -2255,7 +2494,7 @@ def from_partitioned_table(cls,
             key_cols (Union[str, List[str]]): the key column name(s) of 'table'
             unique_keys (bool): whether the keys in 'table' are guaranteed to be unique
             constituent_column (str): the constituent column name in 'table'
-            constituent_table_columns (List[Column]): the column definitions of the constituent table
+            constituent_table_columns (Optional[TableDefinitionLike]): the table definitions of the constituent table
             constituent_changes_permitted (bool): whether the values of the constituent column can change
 
         Returns:
@@ -2272,7 +2511,7 @@ def from_partitioned_table(cls,
                 return PartitionedTable(j_partitioned_table=_JPartitionedTableFactory.of(table.j_table))
 
             if all([arg is not None for arg in none_args]):
-                table_def = _JTableDefinition.of([col.j_column_definition for col in constituent_table_columns])
+                table_def = TableDefinition(constituent_table_columns).j_table_definition
                 j_partitioned_table = _JPartitionedTableFactory.of(table.j_table,
                                                                    j_array_list(to_sequence(key_cols)),
                                                                    unique_keys,
@@ -2289,18 +2528,18 @@ def from_partitioned_table(cls,
     @classmethod
     def from_constituent_tables(cls,
                                 tables: List[Table],
-                                constituent_table_columns: List[Column] = None) -> PartitionedTable:
+                                constituent_table_columns: Optional[TableDefinitionLike] = None) -> PartitionedTable:
         """Creates a PartitionedTable with a single column named '__CONSTITUENT__' containing the provided constituent
         tables.
 
         The result PartitionedTable has no key columns, and both its unique_keys and constituent_changes_permitted
-        properties are set to False. When constituent_table_columns isn't provided, it will be set to the column
+        properties are set to False. When constituent_table_definition isn't provided, it will be set to the table
         definitions of the first table in the provided constituent tables.
 
         Args:
             tables (List[Table]): the constituent tables
-            constituent_table_columns (List[Column]): a list of column definitions compatible with all the constituent
-                tables, default is None
+            constituent_table_columns (Optional[TableDefinitionLike]): the table definition compatible with all the
+                constituent tables, default is None
 
         Returns:
             a PartitionedTable
@@ -2312,37 +2551,31 @@ def from_constituent_tables(cls,
             if not constituent_table_columns:
                 return PartitionedTable(j_partitioned_table=_JPartitionedTableFactory.ofTables(to_sequence(tables)))
             else:
-                table_def = _JTableDefinition.of([col.j_column_definition for col in constituent_table_columns])
+                table_def = TableDefinition(constituent_table_columns).j_table_definition
                 return PartitionedTable(j_partitioned_table=_JPartitionedTableFactory.ofTables(table_def,
                                                                                                to_sequence(tables)))
         except Exception as e:
             raise DHError(e, "failed to create a PartitionedTable from constituent tables.") from e
 
-    @property
+    @cached_property
     def table(self) -> Table:
         """The underlying partitioned table."""
-        if self._table is None:
-            self._table = Table(j_table=self.j_partitioned_table.table())
-        return self._table
+        return Table(j_table=self.j_partitioned_table.table())
 
     @property
     def update_graph(self) -> UpdateGraph:
         """The underlying partitioned table's update graph."""
         return self.table.update_graph
 
-    @property
+    @cached_property
     def is_refreshing(self) -> bool:
         """Whether the underlying partitioned table is refreshing."""
-        if self._is_refreshing is None:
-            self._is_refreshing = self.table.is_refreshing
-        return self._is_refreshing
+        return self.table.is_refreshing
 
-    @property
+    @cached_property
     def key_columns(self) -> List[str]:
         """The partition key column names."""
-        if self._key_columns is None:
-            self._key_columns = list(self.j_partitioned_table.keyColumnNames().toArray())
-        return self._key_columns
+        return list(self.j_partitioned_table.keyColumnNames().toArray())
 
     def keys(self) -> Table:
         """Returns a Table containing all the keys of the underlying partitioned table."""
@@ -2351,32 +2584,31 @@ def keys(self) -> Table:
         else:
             return self.table.select_distinct(self.key_columns)
 
-    @property
+    @cached_property
     def unique_keys(self) -> bool:
         """Whether the keys in the underlying table must always be unique. If keys must be unique, one can expect
         that self.table.select_distinct(self.key_columns) and self.table.view(self.key_columns) operations always
         produce equivalent tables."""
-        if self._unique_keys is None:
-            self._unique_keys = self.j_partitioned_table.uniqueKeys()
-        return self._unique_keys
+        return self.j_partitioned_table.uniqueKeys()
 
-    @property
+    @cached_property
     def constituent_column(self) -> str:
         """The name of the column containing constituent tables."""
-        if self._constituent_column is None:
-            self._constituent_column = self.j_partitioned_table.constituentColumnName()
-        return self._constituent_column
+        return self.j_partitioned_table.constituentColumnName()
+
+    @cached_property
+    def constituent_table_definition(self) -> TableDefinition:
+        """The table definitions for constituent tables. All constituent tables in a partitioned table have the
+        same table definitions."""
+        return TableDefinition(self.j_partitioned_table.constituentDefinition())
 
     @property
-    def constituent_table_columns(self) -> List[Column]:
+    def constituent_table_columns(self) -> List[ColumnDefinition]:
         """The column definitions for constituent tables. All constituent tables in a partitioned table have the
         same column definitions."""
-        if not self._schema:
-            self._schema = _td_to_columns(self.j_partitioned_table.constituentDefinition())
-
-        return self._schema
+        return list(self.constituent_table_definition.values())
 
-    @property
+    @cached_property
     def constituent_changes_permitted(self) -> bool:
         """Can the constituents of the underlying partitioned table change?  Specifically, can the values of the
         constituent column change?
@@ -2391,9 +2623,7 @@ def constituent_changes_permitted(self) -> bool:
         if the underlying partitioned table is refreshing. Also note that the underlying partitioned table must be
         refreshing if it contains any refreshing constituents.
         """
-        if self._constituent_changes_permitted is None:
-            self._constituent_changes_permitted = self.j_partitioned_table.constituentChangesPermitted()
-        return self._constituent_changes_permitted
+        return self.j_partitioned_table.constituentChangesPermitted()
 
     def merge(self) -> Table:
         """Makes a new Table that contains all the rows from all the constituent tables. In the merged result,
@@ -3566,7 +3796,7 @@ def __init__(self, table: Table, on: Union[str, Sequence[str]], joins: Union[str
             table (Table): the right table to include in the join
             on (Union[str, Sequence[str]]): the column(s) to match, can be a common name or an equal expression,
                 i.e. "col_a = col_b" for different column names
-            joins (Union[str, Sequence[str]], optional): the column(s) to be added from the this table to the result
+            joins (Union[str, Sequence[str]], optional): the column(s) to be added from the table to the result
                 table, can be renaming expressions, i.e. "new_col = col"; default is None
 
         Raises:
@@ -3583,13 +3813,14 @@ def __init__(self, table: Table, on: Union[str, Sequence[str]], joins: Union[str
 
 class MultiJoinTable(JObjectWrapper):
     """A MultiJoinTable is an object that contains the result of a multi-table natural join. To retrieve the underlying
-    result Table, use the table() method. """
+    result Table, use the :attr:`.table` property. """
     j_object_type = _JMultiJoinTable
 
     @property
     def j_object(self) -> jpy.JType:
         return self.j_multijointable
 
+    @property
     def table(self) -> Table:
         """Returns the Table containing the multi-table natural join output. """
         return Table(j_table=self.j_multijointable.table())
@@ -3646,6 +3877,70 @@ def multi_join(input: Union[Table, Sequence[Table], MultiJoinInput, Sequence[Mul
 
     Returns:
         MultiJoinTable: the result of the multi-table natural join operation. To access the underlying Table, use the
-            table() method.
+            :attr:`~MultiJoinTable.table` property.
     """
     return MultiJoinTable(input, on)
+
+
+# region utility functions
+
+def table_diff(t1: Table, t2: Table, max_diffs: int = 1, floating_comparison: Literal['exact', 'absolute', 'relative'] = 'exact',
+               ignore_column_order: bool = False) -> str:
+    """Returns the differences between this table and the provided table as a string. If the two tables are the same,
+    an empty string is returned. The differences are returned in a human-readable format.
+
+    This method starts by comparing the table sizes, and then the schema of the two tables, such as the number of
+    columns, column names, column types, column orders. If the schemas are different, the comparison stops and
+    the differences are returned. If the schemas are the same, the method proceeds to compare the data in the
+    tables. The method compares the data in the tables column by column (not row by row) and only records the first
+    difference found in each column.
+
+    Note, inexact comparison of floating numbers may sometimes be desirable due to their inherent imprecision.
+    When that is the case, the floating_comparison should be set to either 'absolute' or 'relative'. When it is set
+    to 'absolute', the absolute value of the difference between two floating numbers is used to compare against a
+    threshold. The threshold is set to 0.0001 for Doubles and 0.005 for Floats. Only differences that are greater
+    than the threshold are recorded. When floating_comparison is set to 'relative', the relative difference between
+    two floating numbers is used to compare against the threshold. The relative difference is calculated as the absolute
+    difference divided by the smaller absolute value between the two numbers.
+
+    Args:
+        t1 (Table): the table to compare
+        t2 (Table): the table to compare against
+        max_diffs (int): the maximum number of differences to return, default is 1
+        floating_comparison (Literal['exact', 'absolute', 'relative']): the type of comparison to use for floating numbers,
+            default is 'exact'
+        ignore_column_order (bool): whether columns that exist in both tables but in different orders are
+            treated as differences.  False indicates that column order matters (default), and True indicates that
+            column order does not matter.
+
+    Returns:
+        string
+
+    Raises:
+        DHError
+    """
+    try:
+        diff_items = []
+        if max_diffs < 1:
+            raise ValueError("max_diffs must be greater than 0.")
+
+        if floating_comparison not in ['exact', 'absolute', 'relative']:
+            raise ValueError("floating_comparison must be one of 'exact', 'absolute', or 'relative'.")
+
+        if floating_comparison != 'exact':
+            diff_items.append(_JDiffItems.DoublesExact)
+        if floating_comparison == 'relative':
+            diff_items.append(_JDiffItems.DoubleFraction)
+        if ignore_column_order:
+            diff_items.append(_JDiffItems.ColumnsOrder)
+
+        with auto_locking_ctx(t1, t2):
+            if diff_items:
+                j_diff_items = _JEnumSet.of(*diff_items)
+                return _JTableTools.diff(t1.j_table, t2.j_table, max_diffs, j_diff_items)
+            else:
+                return _JTableTools.diff(t1.j_table, t2.j_table, max_diffs)
+    except Exception as e:
+        raise DHError(e, "table diff failed") from e
+
+# endregion
diff --git a/py/server/deephaven/table_factory.py b/py/server/deephaven/table_factory.py
index 7efff4b534c..5c5a20d5420 100644
--- a/py/server/deephaven/table_factory.py
+++ b/py/server/deephaven/table_factory.py
@@ -1,23 +1,21 @@
 #
 # Copyright (c) 2016-2024 Deephaven Data Labs and Patent Pending
 #
-
 """ This module provides various ways to make a Deephaven table. """
-
-import datetime
-from typing import Callable, List, Dict, Any, Union, Sequence, Tuple, Mapping
+from functools import wraps
+from typing import Callable, List, Dict, Any, Union, Sequence, Tuple, Mapping, Optional
 
 import jpy
-import numpy as np
 import pandas as pd
 
-from deephaven import execution_context, DHError, time
+from deephaven import execution_context, DHError
 from deephaven._wrapper import JObjectWrapper
-from deephaven.column import InputColumn, Column
-from deephaven.dtypes import DType, Duration, Instant
+from deephaven.column import InputColumn
+from deephaven.dtypes import DType
 from deephaven.execution_context import ExecutionContext
 from deephaven.jcompat import j_lambda, j_list_to_list, to_sequence
-from deephaven.table import Table
+from deephaven.table import Table, TableDefinition, TableDefinitionLike
+from deephaven.time import DurationLike, InstantLike, to_j_duration, to_j_instant
 from deephaven.update_graph import auto_locking_ctx
 
 _JTableFactory = jpy.get_type("io.deephaven.engine.table.TableFactory")
@@ -33,6 +31,18 @@
 _JRingTableTools = jpy.get_type("io.deephaven.engine.table.impl.sources.ring.RingTableTools")
 _JSupplier = jpy.get_type('java.util.function.Supplier')
 _JFunctionGeneratedTableFactory = jpy.get_type("io.deephaven.engine.table.impl.util.FunctionGeneratedTableFactory")
+_JPythonInputTableStatusListenerAdapter = jpy.get_type(
+    "io.deephaven.integrations.python.PythonInputTableStatusListenerAdapter")
+
+_DEFAULT_INPUT_TABLE_ON_ERROR_CALLBACK = lambda e: print(f"An error occurred during InputTable async operation: {e}")
+
+
+def _error_callback_wrapper(callback: Callable[[Exception], None]):
+    @wraps(callback)
+    def wrapper(e):
+        callback(RuntimeError(e))
+
+    return wrapper
 
 
 def empty_table(size: int) -> Table:
@@ -53,16 +63,16 @@ def empty_table(size: int) -> Table:
         raise DHError(e, "failed to create an empty table.") from e
 
 
-def time_table(period: Union[Duration, int, str, datetime.timedelta, np.timedelta64, pd.Timedelta],
-               start_time: Union[None, Instant, int, str, datetime.datetime, np.datetime64, pd.Timestamp] = None,
+def time_table(period: DurationLike,
+               start_time: Optional[InstantLike] = None,
                blink_table: bool = False) -> Table:
     """Creates a table that adds a new row on a regular interval.
 
     Args:
-        period (Union[dtypes.Duration, int, str, datetime.timedelta, np.timedelta64, pd.Timedelta]):
+        period (DurationLike):
             time interval between new row additions, can be expressed as an integer in nanoseconds,
             a time interval string, e.g. "PT00:00:00.001" or "PT1s", or other time duration types.
-        start_time (Union[None, Instant, int, str, datetime.datetime, np.datetime64, pd.Timestamp], optional):
+        start_time (Optional[InstantLike]):
             start time for adding new rows, defaults to None which means use the current time
             as the start time.
         blink_table (bool, optional): if the time table should be a blink table, defaults to False
@@ -76,14 +86,13 @@ def time_table(period: Union[Duration, int, str, datetime.timedelta, np.timedelt
     try:
         builder = _JTableTools.timeTableBuilder()
 
-        if not isinstance(period, str) and not isinstance(period, int):
-            period = time.to_j_duration(period)
+        if period is None:
+            raise ValueError("period must be specified")
 
-        builder.period(period)
+        builder.period(to_j_duration(period))
 
         if start_time:
-            start_time = time.to_j_instant(start_time)
-            builder.startTime(start_time)
+            builder.startTime(to_j_instant(start_time))
 
         if blink_table:
             builder.blinkTable(blink_table)
@@ -245,8 +254,8 @@ def __init__(self, j_table: jpy.JType):
             raise DHError("the provided table's InputTable attribute type is not of InputTableUpdater type.")
 
     def add(self, table: Table) -> None:
-        """Synchronously writes rows from the provided table to this input table. If this is a keyed input table, added rows with keys
-        that match existing rows will replace those rows.
+        """Synchronously writes rows from the provided table to this input table. If this is a keyed input table,
+        added rows with keys that match existing rows will replace those rows.
 
         Args:
             table (Table): the table that provides the rows to write
@@ -260,8 +269,8 @@ def add(self, table: Table) -> None:
             raise DHError(e, "add to InputTable failed.") from e
 
     def delete(self, table: Table) -> None:
-        """Synchronously  deletes the keys contained in the provided table from this keyed input table. If this method is called on an
-        append-only input table, an error will be raised.
+        """Synchronously  deletes the keys contained in the provided table from this keyed input table. If this
+        method is called on an append-only input table, an error will be raised.
 
         Args:
             table (Table): the table with the keys to delete
@@ -274,6 +283,76 @@ def delete(self, table: Table) -> None:
         except Exception as e:
             raise DHError(e, "delete data in the InputTable failed.") from e
 
+    def add_async(self, table: Table, on_success: Callable[[], None] = None,
+                  on_error: Callable[[Exception], None] = None) -> None:
+        """Asynchronously writes rows from the provided table to this input table. If this is a keyed input table,
+        added rows with keys that match existing rows will replace those rows. This method returns immediately without
+        waiting for the operation to complete. If the operation succeeds, the optional on_success callback if provided
+        will be called. If the operation fails, the optional on_error callback if provided will be called. If on_error
+        is not provided, a default callback function will be called that simply prints out the received exception.
+
+        Note, multiple calls to this method on the same thread will be queued and processed in order. However, ordering
+        is not guaranteed across threads.
+
+        Args:
+            table (Table): the table that provides the rows to write
+            on_success (Callable[[], None]): the success callback function, default is None
+            on_error (Callable[[Exception], None]): the error callback function, default is None. When None, a default
+                callback function will be provided that simply prints out the received exception. If the callback
+                function itself raises an exception, the new exception will be logged in the Deephaven server log and
+                will not be further processed by the server.
+
+        Raises:
+            DHError
+        """
+        try:
+            if on_error:
+                on_error_callback = _error_callback_wrapper(on_error)
+            else:
+                on_error_callback = _error_callback_wrapper(_DEFAULT_INPUT_TABLE_ON_ERROR_CALLBACK)
+
+            j_input_table_status_listener = _JPythonInputTableStatusListenerAdapter.create(on_success,
+                                                                                           on_error_callback)
+            self.j_input_table.addAsync(table.j_table, j_input_table_status_listener)
+        except Exception as e:
+            raise DHError(e, "async add to InputTable failed.") from e
+
+    def delete_async(self, table: Table, on_success: Callable[[], None] = None,
+                     on_error: Callable[[Exception], None] = None) -> None:
+        """Asynchronously deletes the keys contained in the provided table from this keyed input table. If this
+        method is
+        called on an append-only input table, an error will be raised. This method returns immediately without
+        waiting for
+        the operation to complete. If the operation succeeds, the optional on_success callback if provided
+        will be called. If the operation fails, the optional on_error callback if provided will be called. If on_error
+        is not provided, a default callback function will be called that simply prints out the received exception.
+
+        Note, multiple calls to this method on the same thread will be queued and processed in order. However, ordering
+        is not guaranteed across threads.
+
+        Args:
+            table (Table): the table with the keys to delete
+            on_success (Callable[[], None]): the success callback function, default is None
+            on_error (Callable[[Exception], None]): the error callback function, default is None. When None, a default
+                callback function will be provided that simply prints out the received exception. If the callback
+                function itself raises an exception, the new exception will be logged in the Deephaven server log and
+                will not be further processed by the server.
+
+        Raises:
+            DHError
+        """
+        try:
+            if on_error:
+                on_error_callback = _error_callback_wrapper(on_error)
+            else:
+                on_error_callback = _error_callback_wrapper(_DEFAULT_INPUT_TABLE_ON_ERROR_CALLBACK)
+
+            j_input_table_status_listener = _JPythonInputTableStatusListenerAdapter.create(on_success,
+                                                                                           on_error_callback)
+            self.j_input_table.deleteAsync(table.j_table, j_input_table_status_listener)
+        except Exception as e:
+            raise DHError(e, "async delete data in the InputTable failed.") from e
+
     @property
     def key_names(self) -> List[str]:
         """The names of the key columns of the InputTable."""
@@ -285,7 +364,7 @@ def value_names(self) -> List[str]:
         return j_list_to_list(self.j_input_table.getValueNames())
 
 
-def input_table(col_defs: Dict[str, DType] = None, init_table: Table = None,
+def input_table(col_defs: Optional[TableDefinitionLike] = None, init_table: Table = None,
                 key_cols: Union[str, Sequence[str]] = None) -> InputTable:
     """Creates an in-memory InputTable from either column definitions or an initial table. When key columns are
     provided, the InputTable will be keyed, otherwise it will be append-only.
@@ -298,7 +377,7 @@ def input_table(col_defs: Dict[str, DType] = None, init_table: Table = None,
     The keyed input table has keys for each row and supports addition/deletion/modification of rows by the keys.
 
     Args:
-        col_defs (Dict[str, DType]): the column definitions
+        col_defs (Optional[TableDefinitionLike]): the table definition
         init_table (Table): the initial table
         key_cols (Union[str, Sequence[str]): the name(s) of the key column(s)
 
@@ -316,8 +395,7 @@ def input_table(col_defs: Dict[str, DType] = None, init_table: Table = None,
             raise ValueError("both column definitions and init table are provided.")
 
         if col_defs:
-            j_arg_1 = _JTableDefinition.of(
-                [Column(name=n, data_type=t).j_column_definition for n, t in col_defs.items()])
+            j_arg_1 = TableDefinition(col_defs).j_table_definition
         else:
             j_arg_1 = init_table.j_table
 
@@ -357,11 +435,11 @@ def ring_table(parent: Table, capacity: int, initialize: bool = True) -> Table:
 
 
 def function_generated_table(table_generator: Callable[..., Table],
-           source_tables: Union[Table, List[Table]] = None,
-           refresh_interval_ms: int = None,
-           exec_ctx: ExecutionContext = None,
-           args: Tuple = (),
-           kwargs: Dict = {}) -> Table:
+                             source_tables: Union[Table, List[Table]] = None,
+                             refresh_interval_ms: int = None,
+                             exec_ctx: ExecutionContext = None,
+                             args: Tuple = (),
+                             kwargs: Dict = {}) -> Table:
     """Creates an abstract table that is generated by running the table_generator() function. The function will first be
     run to generate the table when this method is called, then subsequently either (a) whenever one of the
     'source_tables' ticks or (b) after refresh_interval_ms have elapsed. Either 'refresh_interval_ms' or
@@ -371,13 +449,15 @@ def function_generated_table(table_generator: Callable[..., Table],
     function-generated tables can create tables that are produced by arbitrary Python logic (including using Pandas or
     numpy). They can also be used to retrieve data from external sources (such as files or websites).
 
-    The table definition must not change between invocations of the 'table_generator' function, or an exception will be raised.
+    The table definition must not change between invocations of the 'table_generator' function, or an exception will
+    be raised.
 
     Note that the 'table_generator' may access data in the sourceTables but should not perform further table operations
     on them without careful handling. Table operations may be memoized, and it is possible that a table operation will
     return a table created by a previous invocation of the same operation. Since that result will not have been included
     in the 'source_table', it's not automatically treated as a dependency for purposes of determining when it's safe to
-    invoke 'table_generator', allowing races to exist between accessing the operation result and that result's own update
+    invoke 'table_generator', allowing races to exist between accessing the operation result and that result's own
+    update
     processing. It's best to include all dependencies directly in 'source_table', or only compute on-demand inputs under
     a LivenessScope.
 
@@ -444,6 +524,6 @@ def table_generator_function():
             j_function_generated_table = _JFunctionGeneratedTableFactory.create(
                 table_generator_j_function,
                 source_j_tables
-        )
+            )
 
     return Table(j_function_generated_table)
diff --git a/py/server/deephaven/table_listener.py b/py/server/deephaven/table_listener.py
index d07162a07ad..8701cb5e9da 100644
--- a/py/server/deephaven/table_listener.py
+++ b/py/server/deephaven/table_listener.py
@@ -6,7 +6,7 @@
 from abc import ABC, abstractmethod
 from functools import wraps
 from inspect import signature
-from typing import Callable, Union, List, Generator, Dict, Optional, Literal, Sequence
+from typing import Callable, Union, List, Generator, Dict, Sequence, Optional
 
 import jpy
 import numpy
@@ -14,51 +14,17 @@
 from deephaven import DHError
 from deephaven import update_graph
 from deephaven._wrapper import JObjectWrapper
-from deephaven.column import Column
-from deephaven.jcompat import to_sequence
-from deephaven.numpy import _column_to_numpy_array
+from deephaven.jcompat import to_sequence, j_list_to_list
 from deephaven.table import Table
-from deephaven.update_graph import UpdateGraph
+from deephaven._table_reader import _table_reader_all_dict, _table_reader_chunk_dict
+from deephaven.table_factory import _error_callback_wrapper
 
 _JPythonReplayListenerAdapter = jpy.get_type("io.deephaven.integrations.python.PythonReplayListenerAdapter")
 _JTableUpdate = jpy.get_type("io.deephaven.engine.table.TableUpdate")
-_JTableUpdateDataReader = jpy.get_type("io.deephaven.integrations.python.PythonListenerTableUpdateDataReader")
-
-
-def _col_defs(table: Table, cols: Union[str, List[str]]) -> List[Column]:
-    if not cols:
-        col_defs = table.columns
-    else:
-        cols = to_sequence(cols)
-        col_defs = [col for col in table.columns if col.name in cols]
-
-    return col_defs
-
-
-def _changes_to_numpy(table: Table, cols: Union[str, List[str]], row_set, chunk_size: Optional[int],
-                      prev: bool = False) -> Generator[Dict[str, numpy.ndarray], None, None]:
-    col_defs = _col_defs(table, cols)
-
-    row_sequence_iterator = row_set.getRowSequenceIterator()
-    col_sources = [table.j_table.getColumnSource(col_def.name) for col_def in col_defs]
-    chunk_size = row_set.size() if not chunk_size else chunk_size
-    j_reader_context = _JTableUpdateDataReader.makeContext(chunk_size, *col_sources)
-    try:
-        while row_sequence_iterator.hasMore():
-            chunk_row_set = row_sequence_iterator.getNextRowSequenceWithLength(chunk_size)
-
-            j_array = _JTableUpdateDataReader.readChunkColumnMajor(j_reader_context, chunk_row_set, col_sources, prev)
-
-            col_dict = {}
-            for i, col_def in enumerate(col_defs):
-                np_array = _column_to_numpy_array(col_def, j_array[i])
-                col_dict[col_def.name] = np_array
-
-            yield col_dict
-    finally:
-        j_reader_context.close()
-        row_sequence_iterator.close()
+_JListenerRecorder = jpy.get_type("io.deephaven.engine.table.impl.ListenerRecorder")
+_JPythonMergedListenerAdapter = jpy.get_type("io.deephaven.integrations.python.PythonMergedListenerAdapter")
 
+_DEFAULT_ON_ERROR_CALLBACK = lambda e : print(f"An error occurred during table update processing: {e}")
 
 class TableUpdate(JObjectWrapper):
     """A TableUpdate object represents a table update event.  It contains the added, removed, and modified rows in the
@@ -68,6 +34,8 @@ class TableUpdate(JObjectWrapper):
     def __init__(self, table: Table, j_table_update: jpy.JType):
         self.table = table
         self.j_table_update = j_table_update
+        # make sure we always use the _JTableUpdate interface and not the implementations
+        self.j_table_update = jpy.cast(j_table_update, _JTableUpdate)
 
     @property
     def j_object(self) -> jpy.JType:
@@ -83,15 +51,11 @@ def added(self, cols: Union[str, List[str]] = None) -> Dict[str, numpy.ndarray]:
         Returns:
             a dict
         """
-        if not self.j_table_update.added:
+        if not (added := self.j_table_update.added()):
             return {}
 
-        try:
-            return next(
-                _changes_to_numpy(table=self.table, cols=cols, row_set=self.j_table_update.added.asRowSet(),
-                                  chunk_size=None))
-        except StopIteration:
-            return {}
+        return _table_reader_all_dict(table=self.table, cols=cols, row_set= added.asRowSet(),
+                                          prev=False, to_numpy=True)
 
     def added_chunks(self, chunk_size: int, cols: Union[str, List[str]] = None) -> Generator[
         Dict[str, numpy.ndarray], None, None]:
@@ -105,11 +69,11 @@ def added_chunks(self, chunk_size: int, cols: Union[str, List[str]] = None) -> G
         Returns:
             a generator
         """
-        if not self.j_table_update.added:
+        if not (added := self.j_table_update.added()):
             return (_ for _ in ())
 
-        return _changes_to_numpy(table=self.table, cols=cols, row_set=self.j_table_update.added.asRowSet(),
-                                 chunk_size=chunk_size)
+        return _table_reader_chunk_dict(table=self.table, cols=cols, row_set=added.asRowSet(),
+                                        chunk_size=chunk_size, prev=False)
 
     def removed(self, cols: Union[str, List[str]] = None) -> Dict[str, numpy.ndarray]:
         """Returns a dict with each key being a column name and each value being a NumPy array of
@@ -121,15 +85,11 @@ def removed(self, cols: Union[str, List[str]] = None) -> Dict[str, numpy.ndarray
         Returns:
             a dict
         """
-        if not self.j_table_update.removed:
+        if not (removed := self.j_table_update.removed()):
             return {}
 
-        try:
-            return next(
-                _changes_to_numpy(table=self.table, cols=cols, row_set=self.j_table_update.removed.asRowSet(),
-                                  chunk_size=None, prev=True))
-        except StopIteration:
-            return {}
+        return _table_reader_all_dict(table=self.table, cols=cols, row_set=removed.asRowSet(),
+                                      prev=True)
 
     def removed_chunks(self, chunk_size: int, cols: Union[str, List[str]] = None) -> Generator[
         Dict[str, numpy.ndarray], None, None]:
@@ -143,11 +103,11 @@ def removed_chunks(self, chunk_size: int, cols: Union[str, List[str]] = None) ->
         Returns:
             a generator
         """
-        if not self.j_table_update.removed:
+        if not (removed := self.j_table_update.removed()):
             return (_ for _ in ())
 
-        return _changes_to_numpy(table=self.table, cols=cols, row_set=self.j_table_update.removed.asRowSet(),
-                                 chunk_size=chunk_size, prev=True)
+        return _table_reader_chunk_dict(table=self.table, cols=cols, row_set=removed.asRowSet(),
+                                        chunk_size=chunk_size, prev=True)
 
     def modified(self, cols: Union[str, List[str]] = None) -> Dict[str, numpy.ndarray]:
         """Returns a dict with each key being a column name and each value being a NumPy array of the current values of
@@ -159,15 +119,11 @@ def modified(self, cols: Union[str, List[str]] = None) -> Dict[str, numpy.ndarra
         Returns:
             a dict
         """
-        if not self.j_table_update.modified:
+        if not (modified := self.j_table_update.modified()):
             return {}
 
-        try:
-            return next(
-                _changes_to_numpy(self.table, cols=cols, row_set=self.j_table_update.modified.asRowSet(),
-                                  chunk_size=None))
-        except StopIteration:
-            return {}
+        return _table_reader_all_dict(table=self.table, cols=cols, row_set=modified.asRowSet(),
+                                          prev=False, to_numpy=True)
 
     def modified_chunks(self, chunk_size: int, cols: Union[str, List[str]] = None) -> Generator[
         Dict[str, numpy.ndarray], None, None]:
@@ -181,11 +137,11 @@ def modified_chunks(self, chunk_size: int, cols: Union[str, List[str]] = None) -
         Returns:
             a generator
         """
-        if not self.j_table_update.modified:
+        if not (modified := self.j_table_update.modified()):
             return (_ for _ in ())
 
-        return _changes_to_numpy(self.table, cols=cols, row_set=self.j_table_update.modified.asRowSet(),
-                                 chunk_size=chunk_size)
+        return _table_reader_chunk_dict(self.table, cols=cols, row_set=modified.asRowSet(),
+                                        chunk_size=chunk_size, prev=False)
 
     def modified_prev(self, cols: Union[str, List[str]] = None) -> Dict[str, numpy.ndarray]:
         """Returns a dict with each key being a column name and each value being a NumPy array of the previous values of
@@ -197,15 +153,11 @@ def modified_prev(self, cols: Union[str, List[str]] = None) -> Dict[str, numpy.n
         Returns:
             a dict
         """
-        if not self.j_table_update.modified:
+        if not (modified := self.j_table_update.modified()):
             return {}
 
-        try:
-            return next(
-                _changes_to_numpy(self.table, cols=cols, row_set=self.j_table_update.modified.asRowSet(),
-                                  chunk_size=None, prev=True))
-        except StopIteration:
-            return {}
+        return _table_reader_all_dict(table=self.table, cols=cols, row_set=modified.asRowSet(),
+                                          prev=True, to_numpy=True)
 
     def modified_prev_chunks(self, chunk_size: int, cols: Union[str, List[str]] = None) -> Generator[
         Dict[str, numpy.ndarray], None, None]:
@@ -219,11 +171,11 @@ def modified_prev_chunks(self, chunk_size: int, cols: Union[str, List[str]] = No
         Returns:
             a generator
         """
-        if not self.j_table_update.modified:
+        if not (modified := self.j_table_update.modified()):
             return (_ for _ in ())
 
-        return _changes_to_numpy(self.table, cols=cols, row_set=self.j_table_update.modified.asRowSet(),
-                                 chunk_size=chunk_size, prev=True)
+        return _table_reader_chunk_dict(self.table, cols=cols, row_set=modified.asRowSet(),
+                                        chunk_size=chunk_size, prev=True)
 
     @property
     def shifted(self):
@@ -232,48 +184,28 @@ def shifted(self):
     @property
     def modified_columns(self) -> List[str]:
         """The list of modified columns in this update."""
-        cols = self.j_table_update.modifiedColumnSet.dirtyColumnNames()
+        cols = self.j_table_update.modifiedColumnSet().dirtyColumnNames()
 
         return list(cols) if cols else []
 
 
-def _do_locked(ug: Union[UpdateGraph, Table], f: Callable, lock_type: Literal["shared","exclusive"] = "shared") -> \
-        None:
-    """Executes a function while holding the UpdateGraph (UG) lock.  Holding the UG lock
-    ensures that the contents of a table will not change during a computation, but holding
-    the lock also prevents table updates from happening.  The lock should be held for as little
-    time as possible.
-
-    Args:
-        ug (Union[UpdateGraph, Table]): The Update Graph (UG) or a table-like object.
-        f (Callable): callable to execute while holding the UG lock, could be function or an object with an 'apply'
-            attribute which is callable
-        lock_type (str): UG lock type, valid values are "exclusive" and "shared".  "exclusive" allows only a single
-            reader or writer to hold the lock.  "shared" allows multiple readers or a single writer to hold the lock.
-    Raises:
-        ValueError
-    """
-    if isinstance(ug, Table):
-        ug = ug.update_graph
-
-    if lock_type == "exclusive":
-        with update_graph.exclusive_lock(ug):
-            f()
-    elif lock_type == "shared":
-        with update_graph.shared_lock(ug):
-            f()
-    else:
-        raise ValueError(f"Unsupported lock type: lock_type={lock_type}")
-
-
 class TableListener(ABC):
-    """An abstract table listener class that should be subclassed by any user table listener class."""
+    """An abstract table listener class that should be subclassed by any user table listener class. It provides a
+    default implementation for the on_error method that simply prints out the error."""
 
     @abstractmethod
     def on_update(self, update: TableUpdate, is_replay: bool) -> None:
         """The required method on a listener object that receives table updates."""
         ...
 
+    def on_error(self, e: Exception) -> None:
+        """The callback method on a listener object that handles the received error. The default implementation simply prints the error.
+
+        Args:
+            e (Exception): the exception that occurred during the listener's execution.
+        """
+        print(f"An error occurred during table update processing: {self}, {e}")
+
 
 def _listener_wrapper(table: Table):
     """A decorator to wrap a user listener function or on_update method to receive the numpy-converted Table updates.
@@ -282,7 +214,7 @@ def _listener_wrapper(table: Table):
         table (Table): the table to listen for updates.
     """
 
-    def decorator(listener: Callable):
+    def decorator(listener: Callable[[TableUpdate, bool], None]):
         @wraps(listener)
         def wrapper(update, *args):
             t_update = TableUpdate(table=table, j_table_update=update)
@@ -292,8 +224,7 @@ def wrapper(update, *args):
 
     return decorator
 
-
-def _wrap_listener_func(t: Table, listener: Callable):
+def _wrap_listener_func(t: Table, listener: Callable[[TableUpdate, bool], None]):
     n_params = len(signature(listener).parameters)
     if n_params != 2:
         raise ValueError("listener function must have 2 (update, is_replay) parameters.")
@@ -308,28 +239,30 @@ def _wrap_listener_obj(t: Table, listener: TableListener):
     return listener
 
 
-class TableListenerHandle:
+class TableListenerHandle(JObjectWrapper):
     """A handle to manage a table listener's lifecycle."""
+    j_object_type = _JPythonReplayListenerAdapter
 
-    def __init__(self, t: Table, listener: Union[Callable, TableListener], description: str = None,
-                 dependencies: Union[Table, Sequence[Table]] = None):
+    def __init__(self, t: Table, listener: Union[Callable[[TableUpdate, bool], None], TableListener], description: str = None,
+                 dependencies: Union[Table, Sequence[Table]] = None, on_error: Callable[[Exception], None] = None):
         """Creates a new table listener handle with dependencies.
 
         Table change events are processed by 'listener', which can be either
         (1) a callable (e.g. function) or
-        (2) an instance of TableListener type which provides an "on_update" method.
+        (2) an instance of a TableListener subclass that must override the abstract "on_update" method, and optionally
+        override the default "on_error" method.
 
         The callable or the on_update method must have the following signatures.
         * (update: TableUpdate, is_replay: bool): support replaying the initial table snapshot and normal table updates
         The 'update' parameter is an object that describes the table update;
-        The 'is_replay' parameter is used only by replay listeners, it is set to 'true' when replaying the initial
-        snapshot and 'false' during normal updates.
+        The 'is_replay' parameter is used only by replay listeners, it is set to 'True' when replaying the initial
+        snapshot and 'False' during normal updates.
 
         Note: Don't do table operations in the listener. Do them beforehand, and add the results as dependencies.
 
         Args:
             t (Table): table to listen to
-            listener (Union[Callable, TableListener]): listener for table changes
+            listener (Union[Callable[[TableUpdate, bool], None], TableListener]): listener for table changes
             description (str, optional): description for the UpdatePerformanceTracker to append to the listener's entry
                 description, default is None
             dependencies (Union[Table, Sequence[Table]]): tables that must be satisfied before the listener's execution.
@@ -343,33 +276,54 @@ def __init__(self, t: Table, listener: Union[Callable, TableListener], descripti
                 the listener is safe, it is not recommended because reading or operating on the result tables of those
                 operations may not be safe. It is best to perform the operations on the dependent tables beforehand,
                 and then add the result tables as dependencies to the listener so that they can be safely read in it.
+            on_error (Callable[[Exception], None]): a callback function to be invoked when an error occurs during the
+                listener's execution. It should only be set when the listener is a function, not when it is an instance
+                of TableListener. When the listener is a TableListener, TableListener.on_error will be used.
+                Defaults to None. When None, a default callback function will be provided that simply
+                prints out the received exception. If the callback function itself raises an exception, the new exception
+                will be logged in the Deephaven server log and will not be further processed by the server.
 
         Raises:
             DHError
         """
+        if not t.is_refreshing:
+            raise DHError(message="table must be a refreshing table.")
+
         self.t = t
         self.description = description
         self.dependencies = to_sequence(dependencies)
 
-        if callable(listener):
-            self.listener_wrapped = _wrap_listener_func(t, listener)
-        elif isinstance(listener, TableListener):
+        if isinstance(listener, TableListener):
+            if on_error:
+                raise DHError(message="Invalid on_error argument for listeners of TableListener type which already have an on_error method.")
             self.listener_wrapped = _wrap_listener_obj(t, listener)
+            on_error_callback = _error_callback_wrapper(listener.on_error)
+        elif callable(listener):
+            self.listener_wrapped = _wrap_listener_func(t, listener)
+            if on_error:
+                on_error_callback = _error_callback_wrapper(on_error)
+            else:
+                on_error_callback = _error_callback_wrapper(_DEFAULT_ON_ERROR_CALLBACK)
         else:
             raise DHError(message="listener is neither callable nor TableListener object")
 
         try:
-            self.listener = _JPythonReplayListenerAdapter.create(description, t.j_table, False, self.listener_wrapped, self.dependencies)
+            self.listener_adapter = _JPythonReplayListenerAdapter.create(description, t.j_table, False,
+                                                                         self.listener_wrapped, on_error_callback,
+                                                                         self.dependencies)
         except Exception as e:
             raise DHError(e, "failed to create a table listener.") from e
         self.started = False
 
-    def start(self, do_replay: bool = False, replay_lock: Literal["shared", "exclusive"] = "shared") -> None:
+    @property
+    def j_object(self) -> jpy.JType:
+        return self.listener_adapter
+
+    def start(self, do_replay: bool = False) -> None:
         """Start the listener by registering it with the table and listening for updates.
 
         Args:
             do_replay (bool): whether to replay the initial snapshot of the table, default is False
-            replay_lock (str): the lock type used during replay, default is 'shared', can also be 'exclusive'.
 
         Raises:
             DHError
@@ -378,18 +332,13 @@ def start(self, do_replay: bool = False, replay_lock: Literal["shared", "exclusi
             raise RuntimeError("Attempting to start an already started listener..")
 
         try:
-            def _start():
+            with update_graph.auto_locking_ctx(self.t):
                 if do_replay:
-                    self.listener.replay()
+                    self.listener_adapter.replay()
 
-                self.t.j_table.addUpdateListener(self.listener)
-
-            if do_replay:
-                _do_locked(self.t, _start, lock_type=replay_lock)
-            else:
-                _start()
+                self.t.j_table.addUpdateListener(self.listener_adapter)
         except Exception as e:
-            raise DHError(e, "failed to listen to the table changes.") from e
+           raise DHError(e, "failed to listen to the table changes.") from e
 
         self.started = True
 
@@ -398,13 +347,12 @@ def stop(self) -> None:
 
         if not self.started:
             return
-        self.t.j_table.removeUpdateListener(self.listener)
+        self.t.j_table.removeUpdateListener(self.listener_adapter)
         self.started = False
 
 
-def listen(t: Table, listener: Union[Callable, TableListener], description: str = None, do_replay: bool = False,
-           replay_lock: Literal["shared", "exclusive"] = "shared", dependencies: Union[Table, Sequence[Table]] = None)\
-        -> TableListenerHandle:
+def listen(t: Table, listener: Union[Callable[[TableUpdate, bool], None], TableListener], description: str = None, do_replay: bool = False,
+           dependencies: Union[Table, Sequence[Table]] = None, on_error: Callable[[Exception], None] = None) -> TableListenerHandle:
     """This is a convenience function that creates a TableListenerHandle object and immediately starts it to listen
     for table updates.
 
@@ -415,11 +363,10 @@ def listen(t: Table, listener: Union[Callable, TableListener], description: str
 
     Args:
         t (Table): table to listen to
-        listener (Union[Callable, TableListener]): listener for table changes
+        listener (Union[Callable[[TableUpdate, bool], None], TableListener]): listener for table changes
         description (str, optional): description for the UpdatePerformanceTracker to append to the listener's entry
             description, default is None
         do_replay (bool): whether to replay the initial snapshot of the table, default is False
-        replay_lock (str): the lock type used during replay, default is 'shared', can also be 'exclusive'
         dependencies (Union[Table, Sequence[Table]]): tables that must be satisfied before the listener's execution.
             A refreshing table is considered to be satisfied if all possible updates to the table have been processed
             in the current update graph cycle. A static table is always considered to be satisfied. If a specified
@@ -431,6 +378,12 @@ def listen(t: Table, listener: Union[Callable, TableListener], description: str
             the listener is safe, it is not recommended because reading or operating on the result tables of those
             operations may not be safe. It is best to perform the operations on the dependent tables beforehand,
             and then add the result tables as dependencies to the listener so that they can be safely read in it.
+        on_error (Callable[[Exception], None]): a callback function to be invoked when an error occurs during the
+            listener's execution. It should only be set when the listener is a function, not when it is an instance
+            of TableListener. When the listener is a TableListener, TableListener.on_error will be used.
+            Defaults to None. When None, a default callback function will be provided that simply
+            prints out the received exception. If the callback function itself raises an exception, the new exception
+            will be logged in the Deephaven server log and will not be further processed by the server.
 
     Returns:
         a TableListenerHandle
@@ -438,7 +391,236 @@ def listen(t: Table, listener: Union[Callable, TableListener], description: str
     Raises:
         DHError
     """
-    table_listener_handle = TableListenerHandle(t=t, dependencies=dependencies, listener=listener,
-                                                                    description=description)
-    table_listener_handle.start(do_replay=do_replay, replay_lock=replay_lock)
+    table_listener_handle = TableListenerHandle(t=t, listener=listener, description=description,
+                                                dependencies=dependencies,  on_error=on_error)
+    table_listener_handle.start(do_replay=do_replay)
     return table_listener_handle
+
+
+class _ListenerRecorder (JObjectWrapper):
+    """A ListenerRecorder object records the table updates and notifies the associated MergedListener that a change
+    has occurred."""
+
+    j_object_type = _JListenerRecorder
+
+    @property
+    def j_object(self) -> jpy.JType:
+        return self.j_listener_recorder
+
+    def __init__(self, table: Table):
+        if not table.is_refreshing:
+            raise DHError(message="table must be a refreshing table.")
+
+        self.j_listener_recorder = _JListenerRecorder("Python Wrapped Listener recorder", table.j_table, None)
+        self.table = table
+
+    def table_update(self) -> Optional[TableUpdate]:
+        """Gets the table update from the listener recorder. If there is no update in the current update graph cycle,
+        returns None.
+
+        Returns:
+            a TableUpdate or None
+        """
+        j_table_update = self.j_listener_recorder.getUpdate()
+        return TableUpdate(self.table, j_table_update) if j_table_update else None
+
+
+class MergedListener(ABC):
+    """An abstract multi-table listener class that should be subclassed by any user multi-table listener class. It
+    provides a default implementation for the on_error method that simply prints out the error."""
+
+    @abstractmethod
+    def on_update(self, updates: Dict[Table, TableUpdate], is_replay: bool) -> None:
+        """The required method on a listener object that receives table updates from the
+        tables that are listened to.
+        """
+        ...
+
+    def on_error(self, e: Exception) -> None:
+        """ The callback method on a listener object that handles the received error. The default implementation simply prints the error.
+
+        Args:
+            e (Exception): the exception that occurred during the listener's execution.
+        """
+        print(f"An error occurred during table update processing: {self}, {e}")
+
+
+class MergedListenerHandle(JObjectWrapper):
+    """A handle to manage a merged listener's lifecycle."""
+    j_object_type = _JPythonMergedListenerAdapter
+
+    @property
+    def j_object(self) -> jpy.JType:
+        return self.merged_listener_adapter
+
+    def __init__(self, tables: Sequence[Table], listener: Union[Callable[[Dict[Table, TableUpdate], bool], None], MergedListener],
+                 description: str = None, dependencies: Union[Table, Sequence[Table]] = None, on_error: Callable[[Exception], None] = None):
+        """Creates a new MergedListenerHandle with the provided listener recorders and dependencies.
+
+        Table change events are processed by 'listener', which can be either
+        (1) a callable (e.g. function) or
+        (2) an instance of a MergedListener subclass that must override the abstract "on_update" method, and optionally
+        override the default "on_error" method.
+
+        The callable or the on_update method must have the following signature.
+        *(updates: Dict[Table, TableUpdate], is_replay: bool): support replaying the initial table snapshots and normal table updates
+        The 'updates' parameter is a dictionary of Table to TableUpdate;
+        The 'is_replay' parameter is used only by replay listeners, it is set to 'True' when replaying the initial
+        snapshots and 'False' during normal updates.
+
+
+        Note: Don't do table operations in the listener. Do them beforehand, and add the results as dependencies.
+
+        Args:
+            tables (Sequence[Table]): tables to listen to
+            listener (Union[Callable[[Dict[Table, TableUpdate], bool], None], MergedListener]): listener to process table updates
+                from the tables.
+            description (str, optional): description for the UpdatePerformanceTracker to append to the listener's entry
+            dependencies (Union[Table, Sequence[Table]]): tables that must be satisfied before the listener's execution.
+                A refreshing table is considered to be satisfied if all possible updates to the table have been processed
+                in the current update graph cycle. A static table is always considered to be satisfied. If a specified
+                table is refreshing, it must belong to the same update graph as the table being listened to. Default is
+                None.
+
+                Dependencies ensure that the listener can safely access the dependent tables during its execution. This
+                mainly includes reading the data from the tables. While performing operations on the dependent tables in
+                the listener is safe, it is not recommended because reading or operating on the result tables of those
+                operations may not be safe. It is best to perform the operations on the dependent tables beforehand,
+                and then add the result tables as dependencies to the listener so that they can be safely read in it.
+            on_error (Callable[[Exception], None]): a callback function to be invoked when an error occurs during the
+                listener's execution. It should only be set when the listener is a function, not when it is an instance
+                of MergedListener. When the listener is a MergedListener, MergedListener.on_error will be used.
+                Defaults to None. When None, a default callback function will be provided that simply
+                prints out the received exception. If the callback function itself raises an exception, the new exception
+                will be logged in the Deephaven server log and will not be further processed by the server.
+
+        Raises:
+            DHError
+        """
+        if len(tables) < 2:
+            raise DHError(message="A merged listener must listen to at least 2 refreshing tables.")
+
+        self.tables = tables
+        self.listener_recorders = [_ListenerRecorder(t) for t in tables]
+
+        self.dependencies = dependencies
+
+        if isinstance(listener, MergedListener):
+            if on_error:
+                raise DHError(message="Invalid on_error argument for listeners of MergedListener type which already have an on_error method.")
+            self.listener = listener.on_update
+            on_error_callback = _error_callback_wrapper(listener.on_error)
+        elif callable(listener):
+            self.listener = listener
+            if on_error:
+                on_error_callback = _error_callback_wrapper(on_error)
+            else:
+                on_error_callback = _error_callback_wrapper(_DEFAULT_ON_ERROR_CALLBACK)
+        else:
+            raise DHError(message="listener is neither callable nor MergedListener object")
+
+        n_params = len(signature(self.listener).parameters)
+        if n_params != 2:
+            raise ValueError("merged listener function must have 2 parameters (updates, is_replay).")
+
+        try:
+            self.merged_listener_adapter = _JPythonMergedListenerAdapter.create(
+                        to_sequence(self.listener_recorders),
+                        to_sequence(self.dependencies),
+                        description,
+                        self,
+                        on_error_callback)
+            self.started = False
+        except Exception as e:
+            raise DHError(e, "failed to create a merged listener adapter.") from e
+
+    def _process(self) -> None:
+        """Process the table updates from the listener recorders. """
+        self.listener({lr.table: lr.table_update() for lr in self.listener_recorders}, False)
+
+    def start(self, do_replay: bool = False) -> None:
+        """Start the listener by registering it with the tables and listening for updates.
+
+        Args:
+            do_replay (bool): whether to replay the initial snapshots of the tables, default is False
+
+        Raises:
+            DHError
+        """
+        if self.started:
+            raise RuntimeError("Attempting to start an already started merged listener..")
+
+        try:
+            # self.tables[0] is guaranteed to be a refreshing table, the lock is needed to add all the listener recorders
+            # on the same update graph cycle and if replay is requested, the initial snapshots of the tables are all
+            # taken on the same update graph cycle as well.
+            with update_graph.auto_locking_ctx(self.tables[0]):
+                if do_replay:
+                    j_replay_updates = self.merged_listener_adapter.currentRowsAsUpdates()
+                    replay_updates = {t: TableUpdate(t, tu) for t, tu in zip(self.tables, j_list_to_list(j_replay_updates))}
+                    try:
+                        self.listener(replay_updates, True)
+                    finally:
+                        for replay_update in replay_updates.values():
+                            replay_update.j_object.release()
+
+                for lr in self.listener_recorders:
+                    lr.table.j_table.addUpdateListener(lr.j_listener_recorder)
+        except Exception as e:
+            raise DHError(e, "failed to listen to the table changes.") from e
+
+        self.started = True
+
+    def stop(self) -> None:
+        """Stop the listener."""
+        if not self.started:
+            return
+
+        # self.tables[0] is guaranteed to be a refreshing table, the lock is needed to remove all the listener recorders
+        # on the same update graph cycle
+        with update_graph.auto_locking_ctx(self.tables[0]):
+            for lr in self.listener_recorders:
+                lr.table.j_table.removeUpdateListener(lr.j_listener_recorder)
+            self.started = False
+
+
+def merged_listen(tables: Sequence[Table], listener: Union[Callable[[Dict[Table, TableUpdate]], None], MergedListener],
+                do_replay: bool = False, description: str = None, dependencies: Union[Table, Sequence[Table]] = None,
+                  on_error: Callable[[Exception], None] = None) -> MergedListenerHandle:
+    """This is a convenience function that creates a MergedListenerHandle object and immediately starts it to
+    listen for table updates.
+
+    The function returns the created MergedListenerHandle object whose 'stop' method can be called to stop
+    listening. If it goes out of scope and is garbage collected, the listener will stop receiving any table updates.
+
+    Note: Don't do table operations in the listener. Do them beforehand, and add the results as dependencies.
+
+    Args:
+        tables (Sequence[Table]): tables to listen to.
+        listener (Union[Callable[[Dict[Table, TableUpdate]], None], MergedListener]): listener to process table updates
+            from the tables.
+        description (str, optional): description for the UpdatePerformanceTracker to append to the listener's entry
+            description, default is None
+        do_replay (bool): whether to replay the initial snapshots of the tables, default is False
+        dependencies (Union[Table, Sequence[Table]]): tables that must be satisfied before the listener's execution.
+            A refreshing table is considered to be satisfied if all possible updates to the table have been processed
+            in the current update graph cycle. A static table is always considered to be satisfied. If a specified
+            table is refreshing, it must belong to the same update graph as the table being listened to. Default is
+            None.
+
+            Dependencies ensure that the listener can safely access the dependent tables during its execution. This
+            mainly includes reading the data from the tables. While performing operations on the dependent tables in
+            the listener is safe, it is not recommended because reading or operating on the result tables of those
+            operations may not be safe. It is best to perform the operations on the dependent tables beforehand,
+            and then add the result tables as dependencies to the listener so that they can be safely read in it.
+        on_error (Callable[[Exception], None]): a callback function to be invoked when an error occurs during the
+            listener's execution. It should only be set when the listener is a function, not when it is an instance
+            of MergedListener. When the listener is a MergedListener, MergedListener.on_error will be used.
+            Defaults to None. When None, a default callback function will be provided that simply
+            prints out the received exception. If the callback function itself raises an exception, the new exception
+            will be logged in the Deephaven server log and will not be further processed by the server.
+    """
+    merged_listener_handle = MergedListenerHandle(tables=tables, listener=listener,
+                                                  description=description, dependencies=dependencies, on_error=on_error)
+    merged_listener_handle.start(do_replay=do_replay)
+    return merged_listener_handle
diff --git a/py/server/deephaven/time.py b/py/server/deephaven/time.py
index 208dc25c383..5868392c0c8 100644
--- a/py/server/deephaven/time.py
+++ b/py/server/deephaven/time.py
@@ -29,6 +29,50 @@
 _NANOS_PER_SECOND = 1000000000
 _NANOS_PER_MICRO = 1000
 
+if sys.version_info >= (3, 10):
+    from typing import TypeAlias # novermin
+
+    TimeZoneLike : TypeAlias = Union[TimeZone, str, datetime.tzinfo, datetime.datetime, pandas.Timestamp]
+    """A Union representing objects that can be coerced into a TimeZone."""
+
+    LocalDateLike : TypeAlias = Union[LocalDate, str, datetime.date, datetime.datetime, numpy.datetime64, pandas.Timestamp]
+    """A Union representing objects that can be coerced into a LocalDate."""
+
+    LocalTimeLike : TypeAlias = Union[LocalTime, int, str, datetime.time, datetime.datetime, numpy.datetime64, pandas.Timestamp]
+    """A Union representing objects that can be coerced into a LocalTime."""
+
+    InstantLike : TypeAlias = Union[Instant, int, str, datetime.datetime, numpy.datetime64, pandas.Timestamp]
+    """A Union representing objects that can be coerced into an Instant."""
+
+    ZonedDateTimeLike : TypeAlias = Union[ZonedDateTime, str, datetime.datetime, numpy.datetime64, pandas.Timestamp]
+    """A Union representing objects that can be coerced into a ZonedDateTime."""
+
+    DurationLike : TypeAlias = Union[Duration, int, str, datetime.timedelta, numpy.timedelta64, pandas.Timedelta]
+    """A Union representing objects that can be coerced into a Duration."""
+
+    PeriodLike : TypeAlias = Union[Period, str, datetime.timedelta, numpy.timedelta64, pandas.Timedelta]
+    """A Union representing objects that can be coerced into a Period."""
+else:
+    TimeZoneLike = Union[TimeZone, str, datetime.tzinfo, datetime.datetime, pandas.Timestamp]
+    """A Union representing objects that can be coerced into a TimeZone."""
+
+    LocalDateLike = Union[LocalDate, str, datetime.date, datetime.datetime, numpy.datetime64, pandas.Timestamp]
+    """A Union representing objects that can be coerced into a LocalDate."""
+
+    LocalTimeLike = Union[LocalTime, int, str, datetime.time, datetime.datetime, numpy.datetime64, pandas.Timestamp]
+    """A Union representing objects that can be coerced into a LocalTime."""
+
+    InstantLike = Union[Instant, int, str, datetime.datetime, numpy.datetime64, pandas.Timestamp]
+    """A Union representing objects that can be coerced into an Instant."""
+
+    ZonedDateTimeLike = Union[ZonedDateTime, str, datetime.datetime, numpy.datetime64, pandas.Timestamp]
+    """A Union representing objects that can be coerced into a ZonedDateTime."""
+
+    DurationLike = Union[Duration, int, str, datetime.timedelta, numpy.timedelta64, pandas.Timedelta]
+    """A Union representing objects that can be coerced into a Duration."""
+
+    PeriodLike = Union[Period, str, datetime.timedelta, numpy.timedelta64, pandas.Timedelta]
+    """A Union representing objects that can be coerced into a Period."""
 
 # region Clock
 
@@ -223,15 +267,14 @@ def _tzinfo_to_j_time_zone(tzi: datetime.tzinfo) -> TimeZone:
     raise TypeError(f"Unsupported conversion: {str(type(tzi))} -> TimeZone\n\tDetails:\n\t{details}")
 
 
-def to_j_time_zone(tz: Union[None, TimeZone, str, datetime.tzinfo, datetime.datetime, pandas.Timestamp]) -> \
-        Optional[TimeZone]:
+def to_j_time_zone(tz: Optional[TimeZoneLike]) -> Optional[TimeZone]:
     """
     Converts a time zone value to a Java TimeZone.
     Time zone values can be None, a Java TimeZone, a string, a datetime.tzinfo, a datetime.datetime,
     or a pandas.Timestamp.
 
     Args:
-        tz (Union[None, TimeZone, str, datetime.tzinfo, datetime.datetime, pandas.Timestamp]): A time zone value.
+        tz (Optional[TimeZoneLike]): A time zone value.
             If None is provided, None is returned.
             If a string is provided, it is parsed as a time zone name.
 
@@ -266,8 +309,7 @@ def to_j_time_zone(tz: Union[None, TimeZone, str, datetime.tzinfo, datetime.date
         raise DHError(e) from e
 
 
-def to_j_local_date(dt: Union[None, LocalDate, str, datetime.date, datetime.datetime,
-                              numpy.datetime64, pandas.Timestamp]) -> Optional[LocalDate]:
+def to_j_local_date(dt: Optional[LocalDateLike]) -> Optional[LocalDate]:
     """
     Converts a date time value to a Java LocalDate.
     Date time values can be None, a Java LocalDate, a string, a datetime.date, a datetime.datetime,
@@ -276,8 +318,7 @@ def to_j_local_date(dt: Union[None, LocalDate, str, datetime.date, datetime.date
     Date strings can be formatted according to the ISO 8601 date time format as 'YYYY-MM-DD'.
 
     Args:
-        dt (Union[None, LocalDate, str, datetime.date, datetime.datetime, numpy.datetime64, pandas.Timestamp]): 
-            A date time value. If None is provided, None is returned.
+        dt (Optional[LocalDateLike]): A date time value. If None is provided, None is returned.
 
     Returns:
         LocalDate
@@ -305,8 +346,7 @@ def to_j_local_date(dt: Union[None, LocalDate, str, datetime.date, datetime.date
         raise DHError(e) from e
 
 
-def to_j_local_time(dt: Union[None, LocalTime, int, str, datetime.time, datetime.datetime,
-                              numpy.datetime64, pandas.Timestamp]) -> Optional[LocalTime]:
+def to_j_local_time(dt: Optional[LocalTimeLike]) -> Optional[LocalTime]:
     """
     Converts a date time value to a Java LocalTime.
     Date time values can be None, a Java LocalTime, an int, a string, a datetime.time, a datetime.datetime,
@@ -317,8 +357,7 @@ def to_j_local_time(dt: Union[None, LocalTime, int, str, datetime.time, datetime
     Time strings can be formatted as 'hh:mm:ss[.nnnnnnnnn]'.
 
     Args:
-        dt (Union[None, LocalTime, int, str, datetime.time, datetime.datetime, numpy.datetime64, pandas.Timestamp]):
-            A date time value.  If None is provided, None is returned.
+        dt (Optional[LocalTimeLike]): A date time value.  If None is provided, None is returned.
 
     Returns:
         LocalTime
@@ -351,8 +390,7 @@ def to_j_local_time(dt: Union[None, LocalTime, int, str, datetime.time, datetime
         raise DHError(e) from e
 
 
-def to_j_instant(dt: Union[None, Instant, int, str, datetime.datetime, numpy.datetime64, pandas.Timestamp]) -> \
-        Optional[Instant]:
+def to_j_instant(dt: Optional[InstantLike]) -> Optional[Instant]:
     """
     Converts a date time value to a Java Instant.
     Date time values can be None, a Java Instant, an int, a string, a datetime.datetime,
@@ -366,8 +404,7 @@ def to_j_instant(dt: Union[None, Instant, int, str, datetime.datetime, numpy.dat
     from the Epoch.  Expected date ranges are used to infer the units.
 
     Args:
-        dt (Union[None, Instant, int, str, datetime.datetime, numpy.datetime64, pandas.Timestamp]): A date time value.
-            If None is provided, None is returned.
+        dt (Optional[InstantLike]): A date time value. If None is provided, None is returned.
 
     Returns:
         Instant, TypeError
@@ -403,8 +440,7 @@ def to_j_instant(dt: Union[None, Instant, int, str, datetime.datetime, numpy.dat
         raise DHError(e) from e
 
 
-def to_j_zdt(dt: Union[None, ZonedDateTime, str, datetime.datetime, numpy.datetime64, pandas.Timestamp]) -> \
-        Optional[ZonedDateTime]:
+def to_j_zdt(dt: Optional[ZonedDateTimeLike]) -> Optional[ZonedDateTime]:
     """
     Converts a date time value to a Java ZonedDateTime.
     Date time values can be None, a Java ZonedDateTime, a string, a datetime.datetime,
@@ -419,8 +455,7 @@ def to_j_zdt(dt: Union[None, ZonedDateTime, str, datetime.datetime, numpy.dateti
     Converting a numpy.datetime64 to a ZonedDateTime will use the Deephaven default time zone.
 
     Args:
-        dt (Union[None, ZonedDateTime, str, datetime.datetime, numpy.datetime64, pandas.Timestamp]):
-            A date time value.  If None is provided, None is returned.
+        dt (Optional[ZonedDateTimeLike]): A date time value. If None is provided, None is returned.
 
     Returns:
         ZonedDateTime
@@ -455,8 +490,7 @@ def to_j_zdt(dt: Union[None, ZonedDateTime, str, datetime.datetime, numpy.dateti
         raise DHError(e) from e
 
 
-def to_j_duration(dt: Union[None, Duration, int, str, datetime.timedelta, numpy.timedelta64, pandas.Timedelta]) -> \
-        Optional[Duration]:
+def to_j_duration(dt: Optional[DurationLike]) -> Optional[Duration]:
     """
     Converts a time duration value to a Java Duration,
     which is a unit of time in terms of clock time (24-hour days, hours, minutes, seconds, and nanoseconds).
@@ -480,8 +514,7 @@ def to_j_duration(dt: Union[None, Duration, int, str, datetime.timedelta, numpy.
         |    "-PT-6H+3M"  -- parses as "+6 hours and -3 minutes"
 
     Args:
-        dt (Union[None, Duration, int, str, datetime.timedelta, numpy.timedelta64, pandas.Timedelta]):
-            A time duration value.  If None is provided, None is returned.
+        dt (Optional[DurationLike]): A time duration value. If None is provided, None is returned.
 
     Returns:
         Duration
@@ -515,8 +548,7 @@ def to_j_duration(dt: Union[None, Duration, int, str, datetime.timedelta, numpy.
         raise DHError(e) from e
 
 
-def to_j_period(dt: Union[None, Period, str, datetime.timedelta, numpy.timedelta64, pandas.Timedelta]) -> \
-        Optional[Period]:
+def to_j_period(dt: Optional[PeriodLike]) -> Optional[Period]:
     """
     Converts a time duration value to a Java Period,
     which is a unit of time in terms of calendar time (days, weeks, months, years, etc.).
@@ -537,8 +569,7 @@ def to_j_period(dt: Union[None, Period, str, datetime.timedelta, numpy.timedelta
         |    "-P1Y2M"          -- -1 Year, -2 Months
 
     Args:
-        dt (Union[None, Period, str, datetime.timedelta, numpy.timedelta64, pandas.Timedelta]):
-            A Python period or period string.  If None is provided, None is returned.
+        dt (Optional[PeriodLike]): A Python period or period string. If None is provided, None is returned.
 
     Returns:
         Period
diff --git a/py/server/deephaven/updateby.py b/py/server/deephaven/updateby.py
index ef2f04b32d4..8c68f5ffbe7 100644
--- a/py/server/deephaven/updateby.py
+++ b/py/server/deephaven/updateby.py
@@ -1361,13 +1361,27 @@ def rolling_wavg_time(ts_col: str, wcol: str, cols: Union[str, List[str]], rev_t
         raise DHError(e, "failed to create a rolling weighted average (time) UpdateByOperation.") from e
 
 
-def rolling_formula_tick(formula: str, formula_param: str, cols: Union[str, List[str]], rev_ticks: int, fwd_ticks: int = 0) -> UpdateByOperation:
+def rolling_formula_tick(formula: str, formula_param: str = None, cols: Union[str, List[str]] = None,
+                         rev_ticks: int = 0, fwd_ticks: int = 0) -> UpdateByOperation:
     """Creates a rolling formula UpdateByOperation for the supplied column names, using ticks as the windowing unit. Ticks
     are row counts, and you may specify the reverse and forward window in number of rows to include. The current row
     is considered to belong to the reverse window but not the forward window. Also, negative values are allowed and
     can be used to generate completely forward or completely reverse windows.
 
-    User-defined formula can contain a combination of any of the following:
+    There are two variants of this call. The preferred variant requires the formula to provide the output column name
+    and specific input column names in the following format:
+        |  rolling_formula_tick(formula='output_col=(input_col1 + input_col2) * input_col3', rev_ticks=10, fwd_ticks=0)
+    This form does not accept `formula_param` or `cols` arguments because the input and output columns are explicitly
+    set within the formula string.
+
+    The second (deprecated) variant allows the user to apply a formula expression to one input column, producing one
+    input column. In this call the `formula_param` is used as a placeholder for the input column name and the `cols`
+    argument is used to identify the output column name and the input source column when applying the formula. If
+    multiple input/output pairs are specified in the `cols` argument, the formula will be applied to each column in the
+    list. The format for this call is the following:
+        |  rolling_formula_tick(formula='min(x * x + 5)', formula_param='x', cols=['out1=inputCol1','out2=inputCol2'], rev_ticks=10, fwd_ticks=0)
+
+    User-defined formula can contain a combination of the following:
         |  Built-in functions such as `min`, `max`, etc.
         |  Mathematical arithmetic such as `*`, `+`, `/`, etc.
         |  User-defined functions
@@ -1386,10 +1400,12 @@ def rolling_formula_tick(formula: str, formula_param: str, cols: Union[str, List
 
     Args:
         formula (str): the user defined formula to apply to each group.
-        formula_param (str): the parameter name for the input column's vector within the formula. If formula is
-            `max(each)`, then `each` is the formula_param.
-        cols (Union[str, List[str]]): the column(s) to be operated on, can include expressions to rename the output,
-            i.e. "new_col = col"; when empty, update_by performs the rolling formula operation on all columns.
+        formula_param (str): If provided, supplies the parameter name for the input column's vector within the formula.
+            If formula is `max(each)`, then `each` is the formula_param. Default is None, implying the `formula`
+            argument specifies the input and output columns.
+        cols (Union[str, List[str]]): If provided, supplies the column(s) to operate on, can include expressions to
+            rename the output, i.e. "new_col = col". If omitted and the `formula_param` is provided, update_by performs
+            the rolling formula operation on all columns
         rev_ticks (int): the look-behind window size (in rows/ticks)
         fwd_ticks (int): the look-forward window size (int rows/ticks), default is 0
 
@@ -1400,20 +1416,36 @@ def rolling_formula_tick(formula: str, formula_param: str, cols: Union[str, List
         DHError
     """
     try:
+        if formula_param is None:
+            # Use the multi-column formula call
+            return UpdateByOperation(j_updateby_op=_JUpdateByOperation.RollingFormula(rev_ticks, fwd_ticks, formula))
         cols = to_sequence(cols)
         return UpdateByOperation(j_updateby_op=_JUpdateByOperation.RollingFormula(rev_ticks, fwd_ticks, formula, formula_param, *cols))
     except Exception as e:
         raise DHError(e, "failed to create a rolling formula (tick) UpdateByOperation.") from e
 
 
-def rolling_formula_time(ts_col: str, formula: str, formula_param: str, cols: Union[str, List[str]], rev_time: Union[int, str],
-                      fwd_time: Union[int, str] = 0) -> UpdateByOperation:
+def rolling_formula_time(ts_col: str, formula: str, formula_param: str = None, cols: Union[str, List[str]] = None,
+                         rev_time: Union[int, str] = 0, fwd_time: Union[int, str] = 0) -> UpdateByOperation:
     """Creates a rolling formula UpdateByOperation for the supplied column names, using time as the windowing unit. This
     function accepts nanoseconds or time strings as the reverse and forward window parameters. Negative values are
     allowed and can be used to generate completely forward or completely reverse windows. A row containing a null in
     the timestamp column belongs to no window and will not be considered in the windows of other rows; its output will
     be null.
 
+    There are two variants of this call. The preferred variant requires the formula to provide the output column name
+    and specific input column names in the following format:
+        |  rolling_formula_time(ts_col='tstamp', formula='output_col=(input_col1 + input_col2) * input_col3', rev_time='PT00:10:00', fwd_time='0'`)
+    This form does not accept `formula_param` or `cols` arguments because the input and output columns are explicitly
+    set within the formula string.
+
+    The second (deprecated) variant allows the user to apply a formula expression to one input column, producing one
+    input column. In this call the `formula_param` is used as a placeholder for the input column name and the `cols`
+    argument is used to identify the output column name and the input source column when applying the formula. If
+    multiple input/output pairs are specified in the `cols` argument, the formula will be applied to each column in the
+    list. The format for this call is the following:
+        |  rolling_formula_time(ts_col='tstamp', formula='min(x * x + 5)', formula_param='x', rev_time='PT00:10:00', fwd_time='0'`)
+
     User-defined formula can contain a combination of any of the following:
         |  Built-in functions such as `min`, `max`, etc.
         |  Mathematical arithmetic such as `*`, `+`, `/`, etc.
@@ -1435,10 +1467,12 @@ def rolling_formula_time(ts_col: str, formula: str, formula_param: str, cols: Un
     Args:
         ts_col (str): the timestamp column for determining the window
         formula (str): the user defined formula to apply to each group.
-        formula_param (str): the parameter name for the input column's vector within the formula. If formula is
-            `max(each)`, then `each` is the formula_param.
-        cols (Union[str, List[str]]): the column(s) to be operated on, can include expressions to rename the output,
-            i.e. "new_col = col"; when empty, update_by performs the rolling formula operation on all columns.
+        formula_param (str): If provided, supplies the parameter name for the input column's vector within the formula.
+            If formula is `max(each)`, then `each` is the formula_param. Default is None, implying the `formula`
+            argument specifies the input and output columns.
+        cols (Union[str, List[str]]): If provided, supplies the column(s) to operate on, can include expressions to
+            rename the output, i.e. "new_col = col". If omitted and the `formula_param` is provided, update_by performs
+            the rolling formula operation on all columns
         rev_time (int): the look-behind window size, can be expressed as an integer in nanoseconds or a time
             interval string, e.g. "PT00:00:00.001" or "PT5M"
         fwd_time (int): the look-ahead window size, can be expressed as an integer in nanoseconds or a time
@@ -1451,9 +1485,13 @@ def rolling_formula_time(ts_col: str, formula: str, formula_param: str, cols: Un
         DHError
     """
     try:
-        cols = to_sequence(cols)
         rev_time = _JDateTimeUtils.parseDurationNanos(rev_time) if isinstance(rev_time, str) else rev_time
         fwd_time = _JDateTimeUtils.parseDurationNanos(fwd_time) if isinstance(fwd_time, str) else fwd_time
+        if formula_param is None:
+            # Use the multi-column formula call
+            return UpdateByOperation(j_updateby_op=_JUpdateByOperation.RollingFormula(ts_col, rev_time, fwd_time, formula))
+
+        cols = to_sequence(cols)
         return UpdateByOperation(j_updateby_op=_JUpdateByOperation.RollingFormula(ts_col, rev_time, fwd_time, formula, formula_param, *cols))
     except Exception as e:
         raise DHError(e, "failed to create a rolling formula (time) UpdateByOperation.") from e
\ No newline at end of file
diff --git a/py/server/deephaven_internal/auto_completer/__init__.py b/py/server/deephaven_internal/auto_completer/__init__.py
index ffb6eea0888..8ba39520d27 100644
--- a/py/server/deephaven_internal/auto_completer/__init__.py
+++ b/py/server/deephaven_internal/auto_completer/__init__.py
@@ -19,7 +19,16 @@
 from ._completer import Completer, Mode
 from jedi import preload_module, Interpreter
 
+
 jedi_settings = Completer()
 # warm jedi up a little. We could probably off-thread this.
 preload_module("deephaven")
 Interpreter("", []).complete(1, 0)
+
+
+def set_max_recursion_limit(limit: int) -> None:
+    """
+    Utility method to raise/lower the limit that our autocompletion will impose on Python 3.9 and 3.10.
+    """
+    from . import _completer
+    _completer.MAX_RECURSION_LIMIT = limit
diff --git a/py/server/deephaven_internal/auto_completer/_completer.py b/py/server/deephaven_internal/auto_completer/_completer.py
index f87c3c0b56c..39ea08cc25a 100644
--- a/py/server/deephaven_internal/auto_completer/_completer.py
+++ b/py/server/deephaven_internal/auto_completer/_completer.py
@@ -6,6 +6,9 @@
 from typing import Any, Union, List
 from jedi import Interpreter, Script
 from jedi.api.classes import Completion, Signature
+from importlib.metadata import version
+import sys
+import warnings
 
 
 class Mode(Enum):
@@ -36,6 +39,13 @@ def __str__(self) -> str:
 }
 
 
+"""
+For Python 3.9 and 3.10, there is a bug in recursion which can result in a segfault. Lowering this
+limit to 2000 or less seems to mitigate it.
+"""
+MAX_RECURSION_LIMIT = 2000
+
+
 def wrap_python(txt: str) -> str:
     """ Wraps a string in a Python fenced codeblock for markdown
 
@@ -80,6 +90,8 @@ def __init__(self):
         except ImportError:
             self.__can_jedi = False
             self.mode = Mode.OFF
+        self.recursion_limit_already_warned = False
+        self.check_recursion_limit(True)
 
     @property
     def mode(self) -> Mode:
@@ -135,6 +147,7 @@ def do_completion(
         Modeled after Jedi language server
         https://github.com/pappasam/jedi-language-server/blob/main/jedi_language_server/server.py#L189
         """
+        self.check_recursion_limit()
         if not self._versions[uri] == version:
             # if you aren't the newest completion, you get nothing, quickly
             return []
@@ -253,3 +266,27 @@ def do_hover(
             hoverstring += '\n---\n' + wrap_plaintext(raw_docstring)
 
         return hoverstring.strip()
+
+    def check_recursion_limit(self, suppress_warning: bool = False) -> None:
+        """
+        Tests for python+jedi+numpy versions that are susceptible to a RecursionError/segfault issue, and lowers
+        the recursion limit, warning if the limit is raised externally.
+        """
+        if sys.version_info < (3, 9) or sys.version_info >= (3, 11):
+            return
+
+        if sys.getrecursionlimit() <= MAX_RECURSION_LIMIT:
+            return
+
+        sys.setrecursionlimit(MAX_RECURSION_LIMIT)
+
+        # Log a warning if the user (or some user code) seems to have tried to raise the limit again after we lowered it.
+        # This is not a fool-proof way to keep the limit down, and isn't meant to be, only to guard against the primary
+        # way we've seen to cause this issue.
+        if not suppress_warning and not self.recursion_limit_already_warned:
+            self.recursion_limit_already_warned = True
+            warnings.warn(f"""Recursion limit has been set to {MAX_RECURSION_LIMIT} to avoid a known segfault in Python 3.9 and 3.10
+related to RecursionErrors. This limit will be set to {MAX_RECURSION_LIMIT} whenever autocomplete takes place
+to avoid this, because the jedi library sets this to 3000, above the safe limit. Disabling autocomplete
+will prevent this check, as it will also prevent jedi from raising the limit.
+See https://github.com/deephaven/deephaven-core/issues/5878 for more information.""")
diff --git a/py/server/deephaven_internal/stream.py b/py/server/deephaven_internal/stream.py
index 846d5aeeaa9..afb6e1d4734 100644
--- a/py/server/deephaven_internal/stream.py
+++ b/py/server/deephaven_internal/stream.py
@@ -4,6 +4,22 @@
 import io
 
 
+def _get_encoding_or_utf8(stream) -> str:
+    """
+    Helper to read the encoding from a stream. The stream implementation may or may not have an
+    encoding property, and if it has one it might be None - if absent or None, use utf8, otherwise
+    return the actual encoding value.
+
+    Known cases:
+     - "no encoding attr' - jpy doesn't include this attr for its built-in stdout/stderr impls
+     - "encoding attr is None" - xmlrunner has an attribute, but it has a None value
+     - other cases seem to provide a real value.
+    :param stream: the stream to ask for its encoding
+    :return: the encoding to use
+    """
+    return getattr(stream, 'encoding', 'UTF-8') or 'UTF-8'
+
+
 class TeeStream(io.TextIOBase):
     """TextIOBase subclass that splits output between a delegate instance and a set of lambdas.
 
@@ -14,10 +30,7 @@ class TeeStream(io.TextIOBase):
 
     @classmethod
     def split(cls, py_stream, java_stream):
-        if hasattr(py_stream, "encoding"):
-            encoding = py_stream.encoding
-        else:
-            encoding = 'UTF-8'
+        encoding = _get_encoding_or_utf8(py_stream)
         return TeeStream(
             orig_stream=py_stream,
             should_write_to_orig_stream=True,
@@ -28,10 +41,7 @@ def split(cls, py_stream, java_stream):
 
     @classmethod
     def redirect(cls, py_stream, java_stream):
-        if hasattr(py_stream, "encoding"):
-            encoding = py_stream.encoding
-        else:
-            encoding = 'UTF-8'
+        encoding = _get_encoding_or_utf8(py_stream)
         return TeeStream(
             orig_stream=py_stream,
             should_write_to_orig_stream=False,
@@ -72,10 +82,7 @@ def fileno(self):
 
     @property
     def encoding(self):
-        if hasattr(self._stream, 'encoding') and self._stream.encoding is not None:
-            return self._stream.encoding
-        else:
-            return 'UTF-8'
+        return _get_encoding_or_utf8(self._stream)
 
     def write(self, string):
         self.write_func(string)
diff --git a/py/server/setup.py b/py/server/setup.py
index a3dad12b909..0ac1bcc9b08 100644
--- a/py/server/setup.py
+++ b/py/server/setup.py
@@ -52,11 +52,12 @@ def _compute_version():
         'Programming Language :: Python :: 3.10',
         'Programming Language :: Python :: 3.11',
         'Programming Language :: Python :: 3.12',
+        'Programming Language :: Python :: 3.13',
     ],
     keywords='Deephaven Development',
     python_requires='>=3.8',
     install_requires=[
-        'jpy>=0.17.0',
+        'jpy>=1.0.0',
         'deephaven-plugin>=0.6.0',
         'numpy',
         'pandas>=1.5.0',
@@ -68,7 +69,7 @@ def _compute_version():
         'numba; python_version < "3.13"',
     ],
     extras_require={
-        "autocomplete": ["jedi==0.18.2"],
+        "autocomplete": ["jedi==0.19.1"],
     },
     entry_points={
         'deephaven.plugin': ['registration_cls = deephaven.pandasplugin:PandasPluginRegistration']
diff --git a/py/server/tests/test_barrage.py b/py/server/tests/test_barrage.py
index 28c0a49b6aa..7049d2566ff 100644
--- a/py/server/tests/test_barrage.py
+++ b/py/server/tests/test_barrage.py
@@ -76,7 +76,7 @@ def test_subscribe(self):
         session = barrage_session(host="localhost", port=10000, auth_type="Anonymous")
         t = session.subscribe(ticket=self.shared_ticket.bytes)
         self.assertEqual(t.size, 1000)
-        self.assertEqual(len(t.columns), 2)
+        self.assertEqual(len(t.definition), 2)
         sp = t.snapshot()
         self.assertEqual(sp.size, 1000)
         t1 = t.update("Z = X + Y")
@@ -119,7 +119,7 @@ def test_snapshot(self):
         session = barrage_session(host="localhost", port=10000, auth_type="Anonymous")
         t = session.snapshot(self.shared_ticket.bytes)
         self.assertEqual(t.size, 1000)
-        self.assertEqual(len(t.columns), 2)
+        self.assertEqual(len(t.definition), 2)
         t1 = t.update("Z = X + Y")
         self.assertEqual(t1.size, 1000)
         t2 = session.snapshot(self.shared_ticket.bytes)
diff --git a/py/server/tests/test_column.py b/py/server/tests/test_column.py
index 57c94d53fc1..6531b6c3fa3 100644
--- a/py/server/tests/test_column.py
+++ b/py/server/tests/test_column.py
@@ -12,7 +12,7 @@
 from deephaven import DHError, dtypes, new_table, time as dhtime
 from deephaven import empty_table
 from deephaven.column import byte_col, char_col, short_col, bool_col, int_col, long_col, float_col, double_col, \
-    string_col, datetime_col, jobj_col, ColumnType
+    string_col, datetime_col, jobj_col, ColumnType, col_def
 from deephaven.constants import MAX_BYTE, MAX_SHORT, MAX_INT, MAX_LONG
 from deephaven.jcompat import j_array_list
 from tests.testbase import BaseTestCase
@@ -136,7 +136,8 @@ def test_datetime_col(self):
         inst = dhtime.to_j_instant(round(time.time()))
         dt = datetime.datetime.now()
         _ = datetime_col(name="Datetime", data=[inst, dt, None])
-        self.assertEqual(_.data_type, dtypes.Instant)
+        self.assertEqual(_._column_definition.name, "Datetime")
+        self.assertEqual(_._column_definition.data_type, dtypes.Instant)
 
         ts = pd.Timestamp(dt)
         np_dt = np.datetime64(dt)
@@ -144,17 +145,46 @@ def test_datetime_col(self):
         # test if we can convert to numpy datetime64 array
         np.array([pd.Timestamp(dt).to_numpy() for dt in data], dtype=np.datetime64)
         _ = datetime_col(name="Datetime", data=data)
-        self.assertEqual(_.data_type, dtypes.Instant)
+        self.assertEqual(_._column_definition.name, "Datetime")
+        self.assertEqual(_._column_definition.data_type, dtypes.Instant)
 
         data = np.array(['1970-01-01T00:00:00.000-07:00', '2020-01-01T01:00:00.000+07:00'])
         np.array([pd.Timestamp(str(dt)).to_numpy() for dt in data], dtype=np.datetime64)
         _ = datetime_col(name="Datetime", data=data)
-        self.assertEqual(_.data_type, dtypes.Instant)
+        self.assertEqual(_._column_definition.name, "Datetime")
+        self.assertEqual(_._column_definition.data_type, dtypes.Instant)
 
         data = np.array([1, -1])
         data = data.astype(np.int64)
         _ = datetime_col(name="Datetime", data=data)
-        self.assertEqual(_.data_type, dtypes.Instant)
+        self.assertEqual(_._column_definition.name, "Datetime")
+        self.assertEqual(_._column_definition.data_type, dtypes.Instant)
+
+    def test_col_def_simple(self):
+        foo_def = col_def("Foo", dtypes.int32)
+        self.assertEquals(foo_def.name, "Foo")
+        self.assertEquals(foo_def.data_type, dtypes.int32)
+        self.assertEquals(foo_def.component_type, None)
+        self.assertEquals(foo_def.column_type, ColumnType.NORMAL)
+
+    def test_col_def_array(self):
+        foo_def = col_def("Foo", dtypes.int32_array)
+        self.assertEquals(foo_def.name, "Foo")
+        self.assertEquals(foo_def.data_type, dtypes.int32_array)
+        self.assertEquals(foo_def.component_type, dtypes.int32)
+        self.assertEquals(foo_def.column_type, ColumnType.NORMAL)
+
+    def test_col_def_partitioning(self):
+        foo_def = col_def("Foo", dtypes.string, column_type=ColumnType.PARTITIONING)
+        self.assertEquals(foo_def.name, "Foo")
+        self.assertEquals(foo_def.data_type, dtypes.string)
+        self.assertEquals(foo_def.component_type, None)
+        self.assertEquals(foo_def.column_type, ColumnType.PARTITIONING)
+
+    def test_col_def_invalid_component_type(self):
+        with self.assertRaises(DHError):
+            col_def("Foo", dtypes.int32_array, component_type=dtypes.int64)
+
 
 @dataclass
 class CustomClass:
diff --git a/py/server/tests/test_csv.py b/py/server/tests/test_csv.py
index 3de09e9a570..88e291092cd 100644
--- a/py/server/tests/test_csv.py
+++ b/py/server/tests/test_csv.py
@@ -20,8 +20,7 @@ def test_read_header(self):
         col_types = [dtypes.string, dtypes.long, dtypes.float64]
         table_header = {k: v for k, v in zip(col_names, col_types)}
         t = read_csv('tests/data/test_csv.csv', header=table_header)
-        t_col_names = [col.name for col in t.columns]
-        self.assertEqual(col_names, t_col_names)
+        self.assertEqual(col_names, t.column_names)
 
     def test_read_error_col_type(self):
         col_names = ["Strings", "Longs", "Floats"]
@@ -44,9 +43,9 @@ def test_read_error_quote(self):
     def test_write(self):
         t = read_csv("tests/data/small_sample.csv")
         write_csv(t, "./test_write.csv")
-        t_cols = [col.name for col in t.columns]
+        t_cols = t.column_names
         t = read_csv("./test_write.csv")
-        self.assertEqual(t_cols, [col.name for col in t.columns])
+        self.assertEqual(t_cols, t.column_names)
 
         col_names = ["Strings", "Longs", "Floats"]
         col_types = [dtypes.string, dtypes.long, dtypes.float64]
@@ -54,7 +53,7 @@ def test_write(self):
         t = read_csv('tests/data/test_csv.csv', header=table_header)
         write_csv(t, "./test_write.csv", cols=col_names)
         t = read_csv('./test_write.csv')
-        self.assertEqual(col_names, [c.name for c in t.columns])
+        self.assertEqual(col_names, t.column_names)
 
         import os
         os.remove("./test_write.csv")
diff --git a/py/server/tests/test_data_index.py b/py/server/tests/test_data_index.py
index 5b3aad01391..14b21407f7c 100644
--- a/py/server/tests/test_data_index.py
+++ b/py/server/tests/test_data_index.py
@@ -47,7 +47,7 @@ def test_keys(self):
         self.assertEqual(["X", "Y"], self.data_index.keys)
 
     def test_backing_table(self):
-        self.assertEqual(3, len(self.data_index.table.columns))
+        self.assertEqual(3, len(self.data_index.table.definition))
         self.assertEqual(10, self.data_index.table.size)
         di = data_index(self.data_index.table, self.data_index.keys[0:1])
         self.assertEqual(1, len(di.keys))
diff --git a/py/server/tests/test_dbc.py b/py/server/tests/test_dbc.py
index 31868028e08..fd3cba4fbf2 100644
--- a/py/server/tests/test_dbc.py
+++ b/py/server/tests/test_dbc.py
@@ -50,7 +50,7 @@ def test_read_sql_connectorx(self):
         query = "SELECT t_ts, t_id, t_instrument, t_exchange, t_price, t_size FROM CRYPTO_TRADES LIMIT 10"
         postgres_url = "postgresql://test:test@postgres:5432/test"
         dh_table = read_sql(conn=postgres_url, query=query)
-        self.assertEqual(len(dh_table.columns), 6)
+        self.assertEqual(len(dh_table.definition), 6)
         self.assertEqual(dh_table.size, 10)
 
         with self.assertRaises(DHError) as cm:
@@ -63,13 +63,13 @@ def test_read_sql(self):
             with self.subTest("odbc"):
                 connection_string = 'Driver={PostgreSQL};Server=postgres;Port=5432;Database=test;Uid=test;Pwd=test;'
                 dh_table = read_sql(conn=connection_string, query=query, driver="odbc")
-                self.assertEqual(len(dh_table.columns), 6)
+                self.assertEqual(len(dh_table.definition), 6)
                 self.assertEqual(dh_table.size, 10)
 
         with self.subTest("adbc"):
             uri = "postgresql://postgres:5432/test?user=test&password=test"
             dh_table = read_sql(conn=uri, query=query, driver="adbc")
-            self.assertEqual(len(dh_table.columns), 6)
+            self.assertEqual(len(dh_table.definition), 6)
             self.assertEqual(dh_table.size, 10)
 
         if turbodbc_installed():
@@ -79,7 +79,7 @@ def test_read_sql(self):
                 connection_string = "Driver={PostgreSQL};Server=postgres;Port=5432;Database=test;Uid=test;Pwd=test;"
                 with turbodbc.connect(connection_string=connection_string) as conn:
                     dh_table = read_sql(conn=conn, query=query, driver="odbc")
-                    self.assertEqual(len(dh_table.columns), 6)
+                    self.assertEqual(len(dh_table.definition), 6)
                     self.assertEqual(dh_table.size, 10)
 
         with self.subTest("adbc-connection"):
@@ -87,7 +87,7 @@ def test_read_sql(self):
             uri = "postgresql://postgres:5432/test?user=test&password=test"
             with adbc_driver_postgresql.dbapi.connect(uri) as conn:
                 dh_table = read_sql(conn=conn, query=query, driver="adbc")
-                self.assertEqual(len(dh_table.columns), 6)
+                self.assertEqual(len(dh_table.definition), 6)
                 self.assertEqual(dh_table.size, 10)
 
         with self.assertRaises(DHError) as cm:
diff --git a/py/server/tests/test_experiments.py b/py/server/tests/test_experiments.py
index 6de28871a98..db492428104 100644
--- a/py/server/tests/test_experiments.py
+++ b/py/server/tests/test_experiments.py
@@ -31,13 +31,13 @@ def test_full_outer_join(self):
             rt = full_outer_join(t1, t2, on="a = c")
             self.assertTrue(rt.is_refreshing)
             self.wait_ticking_table_update(rt, row_count=100, timeout=5)
-            self.assertEqual(len(rt.columns), len(t1.columns) + len(t2.columns))
+            self.assertEqual(len(rt.definition), len(t1.definition) + len(t2.definition))
 
         with self.subTest("full outer join with no matching keys"):
             t1 = empty_table(2).update(["X = i", "a = i"])
             rt = full_outer_join(self.test_table, t1, joins=["Y = a"])
             self.assertEqual(rt.size, t1.size * self.test_table.size)
-            self.assertEqual(len(rt.columns), 1 + len(self.test_table.columns))
+            self.assertEqual(len(rt.definition), 1 + len(self.test_table.definition))
 
         with self.subTest("Conflicting column names"):
             with self.assertRaises(DHError) as cm:
@@ -52,13 +52,13 @@ def test_left_outer_join(self):
             rt = left_outer_join(t1, t2, on="a = c")
             self.assertTrue(rt.is_refreshing)
             self.wait_ticking_table_update(rt, row_count=100, timeout=5)
-            self.assertEqual(len(rt.columns), len(t1.columns) + len(t2.columns))
+            self.assertEqual(len(rt.definition), len(t1.definition) + len(t2.definition))
 
         with self.subTest("left outer join with no matching keys"):
             t1 = empty_table(2).update(["X = i", "a = i"])
             rt = left_outer_join(self.test_table, t1, joins=["Y = a"])
             self.assertEqual(rt.size, t1.size * self.test_table.size)
-            self.assertEqual(len(rt.columns), 1 + len(self.test_table.columns))
+            self.assertEqual(len(rt.definition), 1 + len(self.test_table.definition))
 
         with self.subTest("Conflicting column names"):
             with self.assertRaises(DHError) as cm:
@@ -66,15 +66,24 @@ def test_left_outer_join(self):
             self.assertRegex(str(cm.exception), r"Conflicting column names")
 
     def test_time_window(self):
-        with exclusive_lock(self.test_update_graph):
+        with self.subTest("user-explicit lock"):
+            with exclusive_lock(self.test_update_graph):
+                source_table = time_table("PT00:00:00.01").update(["TS=now()"])
+                t = time_window(source_table, ts_col="TS", window=10 ** 8, bool_col="InWindow")
+
+            self.assertEqual("InWindow", t.columns[-1].name)
+            self.wait_ticking_table_update(t, row_count=20, timeout=60)
+            self.assertIn("true", t.to_string(1000))
+            self.assertIn("false", t.to_string(1000))
+
+        with self.subTest("auto-lock"):
             source_table = time_table("PT00:00:00.01").update(["TS=now()"])
             t = time_window(source_table, ts_col="TS", window=10 ** 8, bool_col="InWindow")
 
-        self.assertEqual("InWindow", t.columns[-1].name)
-        self.wait_ticking_table_update(t, row_count=20, timeout=60)
-        self.assertIn("true", t.to_string(1000))
-        self.assertIn("false", t.to_string(1000))
-
+            self.assertEqual("InWindow", t.columns[-1].name)
+            self.wait_ticking_table_update(t, row_count=20, timeout=60)
+            self.assertIn("true", t.to_string(1000))
+            self.assertIn("false", t.to_string(1000))
 
 if __name__ == '__main__':
     unittest.main()
diff --git a/py/server/tests/test_iceberg.py b/py/server/tests/test_iceberg.py
index 62ba31e6636..28a2758c0d0 100644
--- a/py/server/tests/test_iceberg.py
+++ b/py/server/tests/test_iceberg.py
@@ -4,7 +4,7 @@
 import jpy
 
 from deephaven import dtypes
-from deephaven.column import Column, ColumnType
+from deephaven.column import col_def, ColumnType
 
 from tests.testbase import BaseTestCase
 from deephaven.experimental import s3, iceberg
@@ -13,6 +13,7 @@
 
 _JTableDefinition = jpy.get_type("io.deephaven.engine.table.TableDefinition")
 
+
 class IcebergTestCase(BaseTestCase):
     """ Test cases for the deephaven.iceberg module (performed locally) """
 
@@ -23,14 +24,14 @@ def tearDown(self):
         super().tearDown()
 
     def test_instruction_create_empty(self):
-        iceberg_instructions = iceberg.IcebergInstructions()
+        iceberg_read_instructions = iceberg.IcebergReadInstructions()
 
     def test_instruction_create_with_s3_instructions(self):
         s3_instructions = s3.S3Instructions(region_name="us-east-1",
                                             access_key_id="some_access_key_id",
                                             secret_access_key="som_secret_access_key"
                                             )
-        iceberg_instructions = iceberg.IcebergInstructions(data_instructions=s3_instructions)
+        iceberg_read_instructions = iceberg.IcebergReadInstructions(data_instructions=s3_instructions)
 
     def test_instruction_create_with_col_renames(self):
         renames = {
@@ -38,39 +39,103 @@ def test_instruction_create_with_col_renames(self):
             "old_name_b": "new_name_b",
             "old_name_c": "new_name_c"
         }
-        iceberg_instructions = iceberg.IcebergInstructions(column_renames=renames)
+        iceberg_read_instructions = iceberg.IcebergReadInstructions(column_renames=renames)
 
-        col_rename_dict = j_map_to_dict(iceberg_instructions.j_object.columnRenames())
+        col_rename_dict = j_map_to_dict(iceberg_read_instructions.j_object.columnRenames())
         self.assertTrue(col_rename_dict["old_name_a"] == "new_name_a")
         self.assertTrue(col_rename_dict["old_name_b"] == "new_name_b")
         self.assertTrue(col_rename_dict["old_name_c"] == "new_name_c")
 
     def test_instruction_create_with_table_definition_dict(self):
-        table_def={
+        table_def = {
             "x": dtypes.int32,
             "y": dtypes.double,
             "z": dtypes.double,
         }
 
-        iceberg_instructions = iceberg.IcebergInstructions(table_definition=table_def)
-        col_names = j_list_to_list(iceberg_instructions.j_object.tableDefinition().get().getColumnNames())
+        iceberg_read_instructions = iceberg.IcebergReadInstructions(table_definition=table_def)
+        col_names = j_list_to_list(iceberg_read_instructions.j_object.tableDefinition().get().getColumnNames())
         self.assertTrue(col_names[0] == "x")
         self.assertTrue(col_names[1] == "y")
         self.assertTrue(col_names[2] == "z")
 
     def test_instruction_create_with_table_definition_list(self):
-        table_def=[
-            Column(
-                "Partition", dtypes.int32, column_type=ColumnType.PARTITIONING
-            ),
-            Column("x", dtypes.int32),
-            Column("y", dtypes.double),
-            Column("z", dtypes.double),
+        table_def = [
+            col_def("Partition", dtypes.int32, column_type=ColumnType.PARTITIONING),
+            col_def("x", dtypes.int32),
+            col_def("y", dtypes.double),
+            col_def("z", dtypes.double),
+        ]
+
+        iceberg_read_instructions = iceberg.IcebergReadInstructions(table_definition=table_def)
+        col_names = j_list_to_list(iceberg_read_instructions.j_object.tableDefinition().get().getColumnNames())
+        self.assertTrue(col_names[0] == "Partition")
+        self.assertTrue(col_names[1] == "x")
+        self.assertTrue(col_names[2] == "y")
+        self.assertTrue(col_names[3] == "z")
+
+    def test_instruction_create_with_snapshot_id(self):
+        iceberg_read_instructions = iceberg.IcebergReadInstructions(snapshot_id=12345)
+        self.assertTrue(iceberg_read_instructions.j_object.snapshotId().getAsLong() == 12345)
+
+    def test_writer_options_create_default(self):
+        writer_options = iceberg.TableParquetWriterOptions(table_definition={"x": dtypes.int32})
+        self.assertEqual(writer_options.j_object.compressionCodecName(), "SNAPPY")
+        self.assertEqual(writer_options.j_object.maximumDictionaryKeys(), 1048576)
+        self.assertEqual(writer_options.j_object.maximumDictionarySize(), 1048576)
+        self.assertEqual(writer_options.j_object.targetPageSize(), 65536)
+
+    def test_writer_options_create_with_s3_instructions(self):
+        s3_instructions = s3.S3Instructions(region_name="us-east-1",
+                                            access_key_id="some_access_key_id",
+                                            secret_access_key="some_secret_access_key"
+                                            )
+        writer_options = iceberg.TableParquetWriterOptions(table_definition={"x": dtypes.int32},
+                                                           data_instructions=s3_instructions)
+
+    def test_writer_options_create_with_table_definition_dict(self):
+        table_def = {
+            "x": dtypes.int32,
+            "y": dtypes.double,
+            "z": dtypes.double,
+        }
+        writer_options = iceberg.TableParquetWriterOptions(table_def)
+        col_names = j_list_to_list(writer_options.j_object.tableDefinition().getColumnNames())
+        self.assertTrue(col_names[0] == "x")
+        self.assertTrue(col_names[1] == "y")
+        self.assertTrue(col_names[2] == "z")
+
+    def test_writer_options_create_with_table_definition_list(self):
+        table_def = [
+            col_def("Partition", dtypes.int32, column_type=ColumnType.PARTITIONING),
+            col_def("x", dtypes.int32),
+            col_def("y", dtypes.double),
+            col_def("z", dtypes.double),
         ]
 
-        iceberg_instructions = iceberg.IcebergInstructions(table_definition=table_def)
-        col_names = j_list_to_list(iceberg_instructions.j_object.tableDefinition().get().getColumnNames())
+        writer_options = iceberg.TableParquetWriterOptions(table_def)
+        col_names = j_list_to_list(writer_options.j_object.tableDefinition().getColumnNames())
         self.assertTrue(col_names[0] == "Partition")
         self.assertTrue(col_names[1] == "x")
         self.assertTrue(col_names[2] == "y")
         self.assertTrue(col_names[3] == "z")
+
+    def test_writer_options_create_with_compression_codec(self):
+        writer_options = iceberg.TableParquetWriterOptions(table_definition={"x": dtypes.int32},
+                                                           compression_codec_name="GZIP")
+        self.assertEqual(writer_options.j_object.compressionCodecName(), "GZIP")
+
+    def test_writer_options_create_with_max_dictionary_keys(self):
+        writer_options = iceberg.TableParquetWriterOptions(table_definition={"x": dtypes.int32},
+                                                           maximum_dictionary_keys=1024)
+        self.assertEqual(writer_options.j_object.maximumDictionaryKeys(), 1024)
+
+    def test_writer_options_create_with_max_dictionary_size(self):
+        writer_options = iceberg.TableParquetWriterOptions(table_definition={"x": dtypes.int32},
+                                                           maximum_dictionary_size=8192)
+        self.assertEqual(writer_options.j_object.maximumDictionarySize(), 8192)
+
+    def test_writer_options_create_with_target_page_size(self):
+        writer_options = iceberg.TableParquetWriterOptions(table_definition={"x": dtypes.int32},
+                                                           target_page_size=4096)
+        self.assertEqual(writer_options.j_object.targetPageSize(), 4096)
diff --git a/py/server/tests/test_multijoin.py b/py/server/tests/test_multijoin.py
index 28cf93bb505..67c5cb7a081 100644
--- a/py/server/tests/test_multijoin.py
+++ b/py/server/tests/test_multijoin.py
@@ -33,18 +33,18 @@ def test_static_simple(self):
         mj_table = multi_join(input=[self.static_tableA, self.static_tableB], on=["a","b"])
 
         # Output table is static
-        self.assertFalse(mj_table.table().is_refreshing)
+        self.assertFalse(mj_table.table.is_refreshing)
         # Output table has same # rows as sources
-        self.assertEqual(mj_table.table().size, self.static_tableA.size)
-        self.assertEqual(mj_table.table().size, self.static_tableB.size)
+        self.assertEqual(mj_table.table.size, self.static_tableA.size)
+        self.assertEqual(mj_table.table.size, self.static_tableB.size)
 
         # Test with a single input table
         mj_table = multi_join(self.static_tableA, ["a","b"])
 
         # Output table is static
-        self.assertFalse(mj_table.table().is_refreshing)
+        self.assertFalse(mj_table.table.is_refreshing)
         # Output table has same # rows as sources
-        self.assertEqual(mj_table.table().size, self.static_tableA.size)
+        self.assertEqual(mj_table.table.size, self.static_tableA.size)
 
 
     def test_ticking_simple(self):
@@ -52,20 +52,20 @@ def test_ticking_simple(self):
         mj_table = multi_join(input=[self.ticking_tableA, self.ticking_tableB], on=["a","b"])
 
         # Output table is refreshing
-        self.assertTrue(mj_table.table().is_refreshing)
+        self.assertTrue(mj_table.table.is_refreshing)
         # Output table has same # rows as sources
         with update_graph.exclusive_lock(self.test_update_graph):
-            self.assertEqual(mj_table.table().size, self.ticking_tableA.size)
-            self.assertEqual(mj_table.table().size, self.ticking_tableB.size)
+            self.assertEqual(mj_table.table.size, self.ticking_tableA.size)
+            self.assertEqual(mj_table.table.size, self.ticking_tableB.size)
 
         # Test with a single input table
         mj_table = multi_join(input=self.ticking_tableA, on=["a","b"])
 
         # Output table is refreshing
-        self.assertTrue(mj_table.table().is_refreshing)
+        self.assertTrue(mj_table.table.is_refreshing)
         # Output table has same # rows as sources
         with update_graph.exclusive_lock(self.test_update_graph):
-            self.assertEqual(mj_table.table().size, self.ticking_tableA.size)
+            self.assertEqual(mj_table.table.size, self.ticking_tableA.size)
 
 
     def test_static(self):
@@ -77,18 +77,18 @@ def test_static(self):
         mj_table = multi_join(mj_input)
 
         # Output table is static
-        self.assertFalse(mj_table.table().is_refreshing)
+        self.assertFalse(mj_table.table.is_refreshing)
         # Output table has same # rows as sources
-        self.assertEqual(mj_table.table().size, self.static_tableA.size)
-        self.assertEqual(mj_table.table().size, self.static_tableB.size)
+        self.assertEqual(mj_table.table.size, self.static_tableA.size)
+        self.assertEqual(mj_table.table.size, self.static_tableB.size)
 
         # Test with a single input
         mj_table = multi_join(MultiJoinInput(table=self.static_tableA, on=["key1=a","key2=b"], joins="c1"))
 
         # Output table is static
-        self.assertFalse(mj_table.table().is_refreshing)
+        self.assertFalse(mj_table.table.is_refreshing)
         # Output table has same # rows as sources
-        self.assertEqual(mj_table.table().size, self.static_tableA.size)
+        self.assertEqual(mj_table.table.size, self.static_tableA.size)
 
 
     def test_ticking(self):
@@ -100,20 +100,20 @@ def test_ticking(self):
         mj_table = multi_join(mj_input)
 
         # Output table is refreshing
-        self.assertTrue(mj_table.table().is_refreshing)
+        self.assertTrue(mj_table.table.is_refreshing)
         # Output table has same # rows as sources
         with update_graph.exclusive_lock(self.test_update_graph):
-            self.assertEqual(mj_table.table().size, self.ticking_tableA.size)
-            self.assertEqual(mj_table.table().size, self.ticking_tableB.size)
+            self.assertEqual(mj_table.table.size, self.ticking_tableA.size)
+            self.assertEqual(mj_table.table.size, self.ticking_tableB.size)
 
         # Test with a single input
         mj_table = multi_join(input=MultiJoinInput(table=self.ticking_tableA, on=["key1=a","key2=b"], joins="c1"))
 
         # Output table is refreshing
-        self.assertTrue(mj_table.table().is_refreshing)
+        self.assertTrue(mj_table.table.is_refreshing)
         # Output table has same # rows as sources
         with update_graph.exclusive_lock(self.test_update_graph):
-            self.assertEqual(mj_table.table().size, self.ticking_tableA.size)
+            self.assertEqual(mj_table.table.size, self.ticking_tableA.size)
 
     def test_errors(self):
         # Assert the exception is raised when providing MultiJoinInput and the on parameter is not None (omitted).
diff --git a/py/server/tests/test_numpy.py b/py/server/tests/test_numpy.py
index 725e69602f1..1c935ed04f7 100644
--- a/py/server/tests/test_numpy.py
+++ b/py/server/tests/test_numpy.py
@@ -71,14 +71,14 @@ def tearDown(self) -> None:
         super().tearDown()
 
     def test_to_numpy(self):
-        for col in self.test_table.columns:
-            with self.subTest(f"test single column to numpy- {col.name}"):
-                np_array = to_numpy(self.test_table, [col.name])
+        for col_name in self.test_table.definition:
+            with self.subTest(f"test single column to numpy- {col_name}"):
+                np_array = to_numpy(self.test_table, [col_name])
                 self.assertEqual((2, 1), np_array.shape)
-                np.array_equal(np_array, self.np_array_dict[col.name])
+                np.array_equal(np_array, self.np_array_dict[col_name])
 
         try:
-            to_numpy(self.test_table, [col.name for col in self.test_table.columns])
+            to_numpy(self.test_table, self.test_table.column_names)
         except DHError as e:
             self.assertIn("same data type", e.root_cause)
 
@@ -90,17 +90,17 @@ def test_to_numpy(self):
                 float_col(name="Float3", data=[1111.01111, -1111.01111]),
                 float_col(name="Float4", data=[11111.011111, -11111.011111])]
             tmp_table = new_table(cols=input_cols)
-            np_array = to_numpy(tmp_table, [col.name for col in tmp_table.columns])
+            np_array = to_numpy(tmp_table, tmp_table.column_names)
             self.assertEqual((2, 5), np_array.shape)
 
     def test_to_numpy_remap(self):
-        for col in self.test_table.columns:
-            with self.subTest(f"test single column to numpy - {col.name}"):
-                np_array = to_numpy(self.test_table, [col.name])
+        for col_name in self.test_table.definition:
+            with self.subTest(f"test single column to numpy - {col_name}"):
+                np_array = to_numpy(self.test_table, [col_name])
                 self.assertEqual((2, 1), np_array.shape)
 
         try:
-            to_numpy(self.test_table, [col.name for col in self.test_table.columns])
+            to_numpy(self.test_table, self.test_table.column_names)
         except DHError as e:
             self.assertIn("same data type", e.root_cause)
 
@@ -140,12 +140,12 @@ def test_to_table(self):
                 float_col(name="Float3", data=[1111.01111, -1111.01111]),
                 float_col(name="Float4", data=[11111.011111, -11111.011111])]
             tmp_table = new_table(cols=input_cols)
-            np_array = to_numpy(tmp_table, [col.name for col in tmp_table.columns])
-            tmp_table2 = to_table(np_array, [col.name for col in tmp_table.columns])
+            np_array = to_numpy(tmp_table, tmp_table.column_names)
+            tmp_table2 = to_table(np_array, tmp_table.column_names)
             self.assert_table_equals(tmp_table2, tmp_table)
 
             with self.assertRaises(DHError) as cm:
-                tmp_table3 = to_table(np_array[:, [0, 1, 3]], [col.name for col in tmp_table.columns])
+                tmp_table3 = to_table(np_array[:, [0, 1, 3]], tmp_table.column_names)
             self.assertIn("doesn't match", cm.exception.root_cause)
 
     def get_resource_path(self, resource_path) -> str:
diff --git a/py/server/tests/test_pandas.py b/py/server/tests/test_pandas.py
index d3f8312a3e8..04bbe942821 100644
--- a/py/server/tests/test_pandas.py
+++ b/py/server/tests/test_pandas.py
@@ -207,11 +207,11 @@ def test_to_table_nullable(self):
         self.assertIs(table.columns[6].data_type, dtypes.float32)
         self.assertIs(table.columns[7].data_type, dtypes.double)
         self.assertIs(table.columns[8].data_type, dtypes.string)
-        self.assertIs(table.columns[9].data_type, dtypes.PyObject)
+        self.assertIs(table.columns[9].data_type, dtypes.string)
 
         self.assertEqual(table.size, 3)
         table_string = table.to_string()
-        self.assertEqual(8, table_string.count("null"))
+        self.assertEqual(9, table_string.count("null"))
         self.assertEqual(2, table_string.count("NaN"))
 
     def test_arrow_backend(self):
@@ -343,6 +343,27 @@ def test_to_table_readonly(self):
         t = to_table(df)
         self.assert_table_equals(source, t)
 
+    def test_infer_objects(self):
+        df = pd.DataFrame({
+            "A": pd.Series([1, 2, 3], dtype=np.dtype("O")),
+            "B": pd.Series(["a", "b", "c"], dtype=np.dtype("O")),
+            "C": pd.Series([1.1, 2.2, 3.3], dtype=np.dtype("O")),
+            "D": pd.Series([True, False, True], dtype=np.dtype("O")),
+            "E": pd.Series( [pd.Timestamp("2021-01-01"), pd.Timestamp("2021-01-02"), pd.Timestamp("2021-01-03")], dtype=np.dtype("O")),
+            "F": pd.Series( [np.datetime64("2021-01-01"), np.datetime64("2021-01-02"), np.datetime64("2021-01-03")], dtype=np.dtype("O")),
+        })
+        self.assertTrue(all(df[col].dtype == object for col in list(df)))
+        t = to_table(df)
+        self.assertEqual(t.columns[0].data_type, dtypes.int64)
+        self.assertEqual(t.columns[1].data_type, dtypes.string)
+        self.assertEqual(t.columns[2].data_type, dtypes.double)
+        self.assertEqual(t.columns[3].data_type, dtypes.bool_)
+        self.assertEqual(t.columns[4].data_type, dtypes.Instant)
+        self.assertEqual(t.columns[5].data_type, dtypes.Instant)
+
+        t = to_table(df, infer_objects=False)
+        self.assertTrue(all([t.columns[i].data_type == dtypes.PyObject for i in range(6)]))
+
 
 if __name__ == '__main__':
     unittest.main()
diff --git a/py/server/tests/test_parquet.py b/py/server/tests/test_parquet.py
index 2d49f7c82cd..21dea3db552 100644
--- a/py/server/tests/test_parquet.py
+++ b/py/server/tests/test_parquet.py
@@ -14,7 +14,7 @@
 
 from deephaven import DHError, empty_table, dtypes, new_table
 from deephaven import arrow as dharrow
-from deephaven.column import InputColumn, Column, ColumnType, string_col, int_col, char_col, long_col
+from deephaven.column import InputColumn, ColumnType, col_def, string_col, int_col, char_col, long_col, short_col
 from deephaven.pandas import to_pandas, to_table
 from deephaven.parquet import (write, batch_write, read, delete, ColumnInstruction, ParquetFileLayout,
                                write_partitioned)
@@ -230,6 +230,8 @@ def get_table_with_array_data(self):
             "someCharArrayColumn = new char[] {i % 10 == 0 ? null : (char)i}",
             "someTimeArrayColumn = new Instant[] {i % 10 == 0 ? null : (Instant)DateTimeUtils.now() + i}",
             "someBiColumn = new java.math.BigInteger[] {i % 10 == 0 ? null : java.math.BigInteger.valueOf(i)}",
+            "someBdColumn = new java.math.BigDecimal[] {i % 10 == 0 ? null : " +
+                "java.math.BigDecimal.valueOf(ii).stripTrailingZeros()}",
             "nullStringArrayColumn = new String[] {(String)null}",
             "nullIntArrayColumn = new int[] {(int)null}",
             "nullLongArrayColumn = new long[] {(long)null}",
@@ -240,7 +242,8 @@ def get_table_with_array_data(self):
             "nullByteArrayColumn = new byte[] {(byte)null}",
             "nullCharArrayColumn = new char[] {(char)null}",
             "nullTimeArrayColumn = new Instant[] {(Instant)null}",
-            "nullBiColumn = new java.math.BigInteger[] {(java.math.BigInteger)null}"
+            "nullBiColumn = new java.math.BigInteger[] {(java.math.BigInteger)null}",
+            "nullBdColumn = new java.math.BigDecimal[] {(java.math.BigDecimal)null}"
         ])
         return dh_table
 
@@ -597,12 +600,10 @@ def test_read_kv_partitioned(self):
             actual = read(
                 kv_dir,
                 table_definition=[
-                    Column(
-                        "Partition", dtypes.int32, column_type=ColumnType.PARTITIONING
-                    ),
-                    Column("x", dtypes.int32),
-                    Column("y", dtypes.double),
-                    Column("z", dtypes.double),
+                    col_def("Partition", dtypes.int32, column_type=ColumnType.PARTITIONING),
+                    col_def("x", dtypes.int32),
+                    col_def("y", dtypes.double),
+                    col_def("z", dtypes.double),
                 ],
                 file_layout=ParquetFileLayout.KV_PARTITIONED,
             )
@@ -655,7 +656,7 @@ def test_write_partitioned_data(self):
             shutil.rmtree(root_dir)
 
         def verify_table_from_disk(table):
-            self.assertTrue(len(table.columns))
+            self.assertTrue(len(table.definition))
             self.assertTrue(table.columns[0].name == "X")
             self.assertTrue(table.columns[0].column_type == ColumnType.PARTITIONING)
             self.assert_table_equals(table.select().sort(["X", "Y"]), source.sort(["X", "Y"]))
@@ -696,9 +697,9 @@ def verify_file_names():
 
         shutil.rmtree(root_dir)
         table_definition = [
-            Column("X", dtypes.string, column_type=ColumnType.PARTITIONING),
-            Column("Y", dtypes.string),
-            Column("Number", dtypes.int32)
+            col_def("X", dtypes.string, column_type=ColumnType.PARTITIONING),
+            col_def("Y", dtypes.string),
+            col_def("Number", dtypes.int32)
         ]
         write_partitioned(source, table_definition=table_definition, destination_dir=root_dir,
                           base_name=base_name, max_dictionary_keys=max_dictionary_keys)
@@ -782,6 +783,32 @@ def test_unsigned_ints(self):
         ])
         self.assert_table_equals(table_from_disk, expected)
 
+    def test_unsigned_byte_cast(self):
+        data = {'uint8Col': [255, 2, 0]}
+        df = pandas.DataFrame(data)
+        df['uint8Col'] = df['uint8Col'].astype(np.uint8)
+        pyarrow.parquet.write_table(pyarrow.Table.from_pandas(df), 'data_from_pyarrow.parquet')
+
+        # UByte -> Char
+        table_from_disk = read("data_from_pyarrow.parquet", table_definition={"uint8Col": dtypes.char})
+        expected = new_table([char_col("uint8Col", [255, 2, 0])])
+        self.assert_table_equals(table_from_disk, expected)
+
+        # UByte -> Short
+        table_from_disk = read("data_from_pyarrow.parquet", table_definition={"uint8Col": dtypes.short})
+        expected = new_table([short_col("uint8Col", [255, 2, 0])])
+        self.assert_table_equals(table_from_disk, expected)
+
+        # UByte -> Int
+        table_from_disk = read("data_from_pyarrow.parquet", table_definition={"uint8Col": dtypes.int32})
+        expected = new_table([int_col("uint8Col", [255, 2, 0])])
+        self.assert_table_equals(table_from_disk, expected)
+
+        # UByte -> Long
+        table_from_disk = read("data_from_pyarrow.parquet", table_definition={"uint8Col": dtypes.long})
+        expected = new_table([long_col("uint8Col", [255, 2, 0])])
+        self.assert_table_equals(table_from_disk, expected)
+
     def test_v2_pages(self):
         def test_v2_pages_helper(dh_table):
             write(dh_table, "data_from_dh.parquet")
diff --git a/py/server/tests/test_partitioned_table.py b/py/server/tests/test_partitioned_table.py
index 8da63d726a8..3059a6c40fb 100644
--- a/py/server/tests/test_partitioned_table.py
+++ b/py/server/tests/test_partitioned_table.py
@@ -65,6 +65,9 @@ def test_constituent_change_permitted(self):
     def test_constituent_table_columns(self):
         self.assertEqual(self.test_table.columns, self.partitioned_table.constituent_table_columns)
 
+    def test_constituent_table_definition(self):
+        self.assertEqual(self.test_table.definition, self.partitioned_table.constituent_table_definition)
+
     def test_merge(self):
         t = self.partitioned_table.merge()
         self.assert_table_equals(t, self.test_table)
@@ -188,7 +191,7 @@ def test_from_partitioned_table(self):
             key_cols="Y",
             unique_keys=True,
             constituent_column="aggPartition",
-            constituent_table_columns=test_table.columns,
+            constituent_table_columns=test_table.definition,
             constituent_changes_permitted=True,
         )
         self.assertEqual(pt.key_columns, pt1.key_columns)
@@ -201,7 +204,7 @@ def test_from_partitioned_table(self):
                 key_cols="Y",
                 unique_keys=True,
                 constituent_column="Non-existing",
-                constituent_table_columns=test_table.columns,
+                constituent_table_columns=test_table.definition,
                 constituent_changes_permitted=True,
             )
         self.assertIn("no column named", str(cm.exception))
@@ -222,7 +225,7 @@ def test_from_constituent_tables(self):
             self.assertIn("IncompatibleTableDefinitionException", str(cm.exception))
 
         with self.subTest("Compatible table definition"):
-            pt = PartitionedTable.from_constituent_tables([test_table, test_table1, test_table3], test_table.columns)
+            pt = PartitionedTable.from_constituent_tables([test_table, test_table1, test_table3], test_table.definition)
 
     def test_keys(self):
         keys_table = self.partitioned_table.keys()
diff --git a/py/server/tests/test_pt_proxy.py b/py/server/tests/test_pt_proxy.py
index 982a582fa6f..5cbe973dc0c 100644
--- a/py/server/tests/test_pt_proxy.py
+++ b/py/server/tests/test_pt_proxy.py
@@ -127,7 +127,7 @@ def test_USV(self):
                 result_pt_proxy = op(
                     self.pt_proxy, formulas=["a", "c", "Sum = a + b + c + d"])
                 for rct, ct in zip(result_pt_proxy.target.constituent_tables, self.pt_proxy.target.constituent_tables):
-                    self.assertTrue(len(rct.columns) >= 3)
+                    self.assertTrue(len(rct.definition) >= 3)
                     self.assertLessEqual(rct.size, ct.size)
 
     def test_select_distinct(self):
@@ -144,7 +144,7 @@ def test_natural_join(self):
             right_table = self.test_table.drop_columns(["b", "c"]).head(5)
             joined_pt_proxy = pt_proxy.natural_join(right_table, on="a", joins=["d", "e"])
             for ct in joined_pt_proxy.target.constituent_tables:
-                self.assertEqual(len(ct.columns), 5)
+                self.assertEqual(len(ct.definition), 5)
 
         with self.subTest("Join with another Proxy"):
             with self.assertRaises(DHError) as cm:
@@ -163,7 +163,7 @@ def test_natural_join(self):
             right_proxy = self.test_table.drop_columns(["b", "d"]).partition_by("c").proxy()
             joined_pt_proxy = pt_proxy.natural_join(right_proxy, on="a", joins="e")
             for ct in joined_pt_proxy.target.constituent_tables:
-                self.assertEqual(len(ct.columns), 4)
+                self.assertEqual(len(ct.definition), 4)
 
     def test_exact_join(self):
         with self.subTest("Join with a Table"):
@@ -171,7 +171,7 @@ def test_exact_join(self):
             right_table = self.test_table.drop_columns(["b", "c"]).group_by('a')
             joined_pt_proxy = pt_proxy.exact_join(right_table, on="a", joins=["d", "e"])
             for ct, jct in zip(pt_proxy.target.constituent_tables, joined_pt_proxy.target.constituent_tables):
-                self.assertEqual(len(jct.columns), 5)
+                self.assertEqual(len(jct.definition), 5)
                 self.assertEqual(ct.size, jct.size)
                 self.assertLessEqual(jct.size, right_table.size)
 
@@ -180,7 +180,7 @@ def test_exact_join(self):
             right_proxy = self.test_table.drop_columns(["b", "d"]).partition_by("c").proxy()
             joined_pt_proxy = pt_proxy.exact_join(right_proxy, on="a", joins="e")
             for ct, jct in zip(pt_proxy.target.constituent_tables, joined_pt_proxy.target.constituent_tables):
-                self.assertEqual(len(jct.columns), 4)
+                self.assertEqual(len(jct.definition), 4)
                 self.assertEqual(ct.size, jct.size)
                 self.assertLessEqual(jct.size, right_table.size)
 
@@ -247,7 +247,7 @@ def test_count_by(self):
         agg_pt_proxy = self.pt_proxy.count_by(col="cnt", by=["a"])
         for gct, ct in zip(agg_pt_proxy.target.constituent_tables, self.pt_proxy.target.constituent_tables):
             self.assertLessEqual(gct.size, ct.size)
-            self.assertEqual(len(gct.columns), 2)
+            self.assertEqual(len(gct.definition), 2)
 
     def test_dedicated_agg(self):
         ops = [
@@ -268,7 +268,7 @@ def test_dedicated_agg(self):
                 agg_pt_proxy = op(self.pt_proxy, by=["a", "b"])
                 for gct, ct in zip(agg_pt_proxy.target.constituent_tables, self.pt_proxy.target.constituent_tables):
                     self.assertLessEqual(gct.size, ct.size)
-                    self.assertEqual(len(gct.columns), len(ct.columns))
+                    self.assertEqual(len(gct.definition), len(ct.definition))
 
         wops = [PartitionedTableProxy.weighted_avg_by,
                 PartitionedTableProxy.weighted_sum_by,
@@ -279,7 +279,7 @@ def test_dedicated_agg(self):
                 agg_pt_proxy = wop(self.pt_proxy, wcol="e", by=["a", "b"])
                 for gct, ct in zip(agg_pt_proxy.target.constituent_tables, self.pt_proxy.target.constituent_tables):
                     self.assertLessEqual(gct.size, ct.size)
-                    self.assertEqual(len(gct.columns), len(ct.columns) - 1)
+                    self.assertEqual(len(gct.definition), len(ct.definition) - 1)
 
     def test_agg_by(self):
         aggs = [
@@ -295,7 +295,7 @@ def test_agg_by(self):
         agg_pt_proxy = self.pt_proxy.agg_by(aggs=aggs, by=["a"])
         for gct, ct in zip(agg_pt_proxy.target.constituent_tables, self.pt_proxy.target.constituent_tables):
             self.assertLessEqual(gct.size, ct.size)
-            self.assertEqual(len(gct.columns), 8)
+            self.assertEqual(len(gct.definition), 8)
 
     def test_agg_all_by(self):
         aggs = [
diff --git a/py/server/tests/test_rollup_tree_table.py b/py/server/tests/test_rollup_tree_table.py
index 2f1d76bdafd..409a9319f30 100644
--- a/py/server/tests/test_rollup_tree_table.py
+++ b/py/server/tests/test_rollup_tree_table.py
@@ -4,7 +4,7 @@
 import unittest
 
 from deephaven import read_csv, empty_table
-from deephaven.agg import sum_, avg, count_, first, last, max_, min_, std, abs_sum, \
+from deephaven.agg import sum_, avg, count_, count_where, first, last, max_, min_, std, abs_sum, \
     var
 from deephaven.filters import Filter
 from deephaven.table import NodeType
@@ -18,6 +18,7 @@ def setUp(self):
         self.aggs_for_rollup = [
             avg(["aggAvg=var"]),
             count_("aggCount"),
+            count_where("aggCountWhere", "var > 0"),
             first(["aggFirst=var"]),
             last(["aggLast=var"]),
             max_(["aggMax=var"]),
diff --git a/py/server/tests/test_s3_instructions.py b/py/server/tests/test_s3_instructions.py
new file mode 100644
index 00000000000..ad169914117
--- /dev/null
+++ b/py/server/tests/test_s3_instructions.py
@@ -0,0 +1,120 @@
+#
+# Copyright (c) 2016-2024 Deephaven Data Labs and Patent Pending
+#
+import jpy
+import tempfile
+
+from tests.testbase import BaseTestCase
+from deephaven import DHError
+from deephaven.experimental import s3
+
+_JCredentials = jpy.get_type("io.deephaven.extensions.s3.Credentials")
+
+class S3InstructionTest(BaseTestCase):
+    """ Test cases for the s3 instructions """
+
+    def setUp(self):
+        super().setUp()
+
+    def tearDown(self):
+        super().tearDown()
+
+    def test_default(self):
+        s3_instructions = s3.S3Instructions()
+        self.assertTrue(s3_instructions.j_object is not None)
+        self.assertTrue(s3_instructions.j_object.regionName().isEmpty())
+        self.assertTrue(s3_instructions.j_object.credentials().getClass() == _JCredentials.resolving().getClass())
+        self.assertEqual(s3_instructions.j_object.maxConcurrentRequests(), 256)
+        self.assertEqual(s3_instructions.j_object.readAheadCount(), 32)
+        self.assertEqual(s3_instructions.j_object.fragmentSize(), 65536)
+        self.assertEqual(s3_instructions.j_object.connectionTimeout().toSeconds(), 2)
+        self.assertEqual(s3_instructions.j_object.readTimeout().toSeconds(), 2)
+        self.assertTrue(s3_instructions.j_object.endpointOverride().isEmpty())
+        self.assertEqual(s3_instructions.j_object.writePartSize(), 10485760)
+        self.assertEqual(s3_instructions.j_object.numConcurrentWriteParts(), 64)
+        self.assertTrue(s3_instructions.j_object.profileName().isEmpty())
+        self.assertTrue(s3_instructions.j_object.configFilePath().isEmpty())
+        self.assertTrue(s3_instructions.j_object.credentialsFilePath().isEmpty())
+
+    def test_set_region_name(self):
+        s3_instructions = s3.S3Instructions(region_name="us-west-2")
+        self.assertEqual(s3_instructions.j_object.regionName().get(), "us-west-2")
+
+    def test_set_max_concurrent_requests(self):
+        s3_instructions = s3.S3Instructions(max_concurrent_requests=512)
+        self.assertEqual(s3_instructions.j_object.maxConcurrentRequests(), 512)
+
+    def test_set_read_ahead_count(self):
+        s3_instructions = s3.S3Instructions(read_ahead_count=64)
+        self.assertEqual(s3_instructions.j_object.readAheadCount(), 64)
+
+    def test_set_fragment_size(self):
+        s3_instructions = s3.S3Instructions(fragment_size=131072)
+        self.assertEqual(s3_instructions.j_object.fragmentSize(), 131072)
+
+    def test_set_connection_timeout(self):
+        s3_instructions = s3.S3Instructions(connection_timeout="PT10s")
+        self.assertEqual(s3_instructions.j_object.connectionTimeout().toSeconds(), 10)
+
+    def test_set_read_timeout(self):
+        s3_instructions = s3.S3Instructions(read_timeout="PT5s")
+        self.assertEqual(s3_instructions.j_object.readTimeout().toSeconds(), 5)
+
+    def test_set_endpoint_override(self):
+        s3_instructions = s3.S3Instructions(endpoint_override="http://localhost:9000")
+        self.assertEqual(s3_instructions.j_object.endpointOverride().get().toString(), "http://localhost:9000")
+
+    def test_set_write_part_size(self):
+        s3_instructions = s3.S3Instructions(write_part_size=20971520)
+        self.assertEqual(s3_instructions.j_object.writePartSize(), 20971520)
+
+    def test_set_num_concurrent_write_parts(self):
+        s3_instructions = s3.S3Instructions(num_concurrent_write_parts=128)
+        self.assertEqual(s3_instructions.j_object.numConcurrentWriteParts(), 128)
+
+    def test_set_profile_name(self):
+        s3_instructions = s3.S3Instructions(profile_name="test-user")
+        self.assertEqual(s3_instructions.j_object.profileName().get(), "test-user")
+
+    def test_set_config_file_path(self):
+        with tempfile.NamedTemporaryFile() as temp_config_file:
+            s3_instructions = s3.S3Instructions(config_file_path=temp_config_file.name)
+            self.assertEqual(s3_instructions.j_object.configFilePath().get().toString(), temp_config_file.name)
+
+    def test_set_credentials_file_path(self):
+        with tempfile.NamedTemporaryFile() as temp_credentials_file:
+            s3_instructions = s3.S3Instructions(credentials_file_path=temp_credentials_file.name)
+            self.assertEqual(s3_instructions.j_object.credentialsFilePath().get().toString(), temp_credentials_file.name)
+
+    def test_set_resolving_credentials(self):
+        s3_instructions = s3.S3Instructions(credentials=s3.Credentials.resolving())
+        self.assertTrue(s3_instructions.j_object.credentials().getClass() == _JCredentials.resolving().getClass())
+
+    def test_set_anonymous_access(self):
+        s3_instructions = s3.S3Instructions(anonymous_access=True)
+        self.assertTrue(s3_instructions.j_object.credentials().getClass() == _JCredentials.anonymous().getClass())
+
+        s3_instructions = s3.S3Instructions(credentials=s3.Credentials.anonymous())
+        self.assertTrue(s3_instructions.j_object.credentials().getClass() == _JCredentials.anonymous().getClass())
+
+    def test_set_default_credentials(self):
+        s3_instructions = s3.S3Instructions(credentials=s3.Credentials.default())
+        self.assertTrue(s3_instructions.j_object.credentials().getClass() == _JCredentials.defaultCredentials().getClass())
+
+    def test_set_profile_credentials(self):
+        s3_instructions = s3.S3Instructions(credentials=s3.Credentials.profile())
+        self.assertTrue(s3_instructions.j_object.credentials().getClass() == _JCredentials.profile().getClass())
+
+    def test_set_multiple_credentials(self):
+        # Only one set of credentials can be set
+        with self.assertRaises(DHError):
+            s3.S3Instructions(anonymous_access=True, access_key_id="foo", secret_access_key="bar")
+            self.fail("Expected ValueError")
+
+        with self.assertRaises(DHError):
+            s3.S3Instructions(anonymous_access=True, credentials=s3.Credentials.resolving())
+            self.fail("Expected ValueError")
+
+        with self.assertRaises(DHError):
+            s3.S3Instructions(access_key_id="foo", secret_access_key="bar", credentials=s3.Credentials.resolving())
+            self.fail("Expected ValueError")
diff --git a/py/server/tests/test_table.py b/py/server/tests/test_table.py
index c9abe604a08..2315b6c842f 100644
--- a/py/server/tests/test_table.py
+++ b/py/server/tests/test_table.py
@@ -1,19 +1,21 @@
 #
 # Copyright (c) 2016-2024 Deephaven Data Labs and Patent Pending
 #
+import random
 import unittest
 from types import SimpleNamespace
 from typing import List, Any
 
 from deephaven import DHError, read_csv, empty_table, SortDirection, time_table, update_graph, new_table, dtypes
 from deephaven.agg import sum_, weighted_avg, avg, pct, group, count_, first, last, max_, median, min_, std, abs_sum, \
-    var, formula, partition, unique, count_distinct, distinct
+    var, formula, partition, unique, count_distinct, distinct, count_where
 from deephaven.column import datetime_col
 from deephaven.execution_context import make_user_exec_ctx, get_exec_ctx
 from deephaven.html import to_html
 from deephaven.jcompat import j_hashmap
 from deephaven.pandas import to_pandas
-from deephaven.table import Table, SearchDisplayMode
+from deephaven.table import Table, TableDefinition, SearchDisplayMode, table_diff
+from deephaven.filters import Filter, and_, or_
 from tests.testbase import BaseTestCase, table_equals
 
 
@@ -42,6 +44,9 @@ def setUp(self):
         self.aggs_for_rollup = [
             avg(["aggAvg=var"]),
             count_("aggCount"),
+            count_where("aggCountWhere1", "var > 100"),
+            count_where("aggCountWhere2", ["var > 100", "var < 250"]),
+            count_where("aggCountWhere3", or_(["var > 100", "var < 250"])),
             first(["aggFirst=var"]),
             last(["aggLast=var"]),
             max_(["aggMax=var"]),
@@ -83,9 +88,19 @@ def test_eq(self):
         t = self.test_table.where(["a > 500"])
         self.assertNotEqual(t, self.test_table)
 
+    def test_definition(self):
+        expected = TableDefinition({
+            "a": dtypes.int32,
+            "b": dtypes.int32,
+            "c": dtypes.int32,
+            "d": dtypes.int32,
+            "e": dtypes.int32
+        })
+        self.assertEquals(expected, self.test_table.definition)
+
     def test_meta_table(self):
         t = self.test_table.meta_table
-        self.assertEqual(len(self.test_table.columns), t.size)
+        self.assertEqual(len(self.test_table.definition), t.size)
 
     def test_coalesce(self):
         t = self.test_table.update_view(["A = a * b"])
@@ -99,45 +114,45 @@ def test_flatten(self):
         self.assertTrue(ct.is_flat)
 
     def test_drop_columns(self):
-        column_names = [f.name for f in self.test_table.columns]
+        column_names = self.test_table.column_names
         result_table = self.test_table.drop_columns(cols=column_names[:-1])
-        self.assertEqual(1, len(result_table.columns))
+        self.assertEqual(1, len(result_table.definition))
         result_table = self.test_table.drop_columns(cols=column_names[-1])
-        self.assertEqual(1, len(self.test_table.columns) - len(result_table.columns))
+        self.assertEqual(1, len(self.test_table.definition) - len(result_table.definition))
 
     def test_move_columns(self):
-        column_names = [f.name for f in self.test_table.columns]
+        column_names = self.test_table.column_names
         cols_to_move = column_names[::2]
 
         with self.subTest("move-columns"):
             result_table = self.test_table.move_columns(1, cols_to_move)
-            result_cols = [f.name for f in result_table.columns]
+            result_cols = result_table.column_names
             self.assertEqual(cols_to_move, result_cols[1: len(cols_to_move) + 1])
 
         with self.subTest("move-columns-up"):
             result_table = self.test_table.move_columns_up(cols_to_move)
-            result_cols = [f.name for f in result_table.columns]
+            result_cols = result_table.column_names
             self.assertEqual(cols_to_move, result_cols[: len(cols_to_move)])
 
         with self.subTest("move-columns-down"):
             result_table = self.test_table.move_columns_down(cols_to_move)
-            result_cols = [f.name for f in result_table.columns]
+            result_cols = result_table.column_names
             self.assertEqual(cols_to_move, result_cols[-len(cols_to_move):])
 
         cols_to_move = column_names[-1]
         with self.subTest("move-column"):
             result_table = self.test_table.move_columns(1, cols_to_move)
-            result_cols = [f.name for f in result_table.columns]
+            result_cols = result_table.column_names
             self.assertEqual([cols_to_move], result_cols[1: len(cols_to_move) + 1])
 
         with self.subTest("move-column-up"):
             result_table = self.test_table.move_columns_up(cols_to_move)
-            result_cols = [f.name for f in result_table.columns]
+            result_cols = result_table.column_names
             self.assertEqual([cols_to_move], result_cols[: len(cols_to_move)])
 
         with self.subTest("move-column-down"):
             result_table = self.test_table.move_columns_down(cols_to_move)
-            result_cols = [f.name for f in result_table.columns]
+            result_cols = result_table.column_names
             self.assertEqual([cols_to_move], result_cols[-len(cols_to_move):])
 
     def test_rename_columns(self):
@@ -146,10 +161,10 @@ def test_rename_columns(self):
         ]
         new_names = [cn.split("=")[0].strip() for cn in cols_to_rename]
         result_table = self.test_table.rename_columns(cols_to_rename)
-        result_cols = [f.name for f in result_table.columns]
+        result_cols = result_table.column_names
         self.assertEqual(new_names, result_cols[::2])
         result_table = self.test_table.rename_columns(cols_to_rename[0])
-        result_cols = [f.name for f in result_table.columns]
+        result_cols = result_table.column_names
         self.assertEqual(new_names[0], result_cols[::2][0])
 
     def test_update_error(self):
@@ -173,14 +188,14 @@ def test_USV(self):
                 result_table = op(
                     self.test_table, formulas=["a", "c", "Sum = a + b + c + d"])
                 self.assertIsNotNone(result_table)
-                self.assertTrue(len(result_table.columns) >= 3)
+                self.assertTrue(len(result_table.definition) >= 3)
                 self.assertLessEqual(result_table.size, self.test_table.size)
 
         for op in ops:
             with self.subTest(op=op):
                 result_table = op(self.test_table, formulas="Sum = a + b + c + d")
                 self.assertIsNotNone(result_table)
-                self.assertTrue(len(result_table.columns) >= 1)
+                self.assertTrue(len(result_table.definition) >= 1)
                 self.assertLessEqual(result_table.size, self.test_table.size)
 
     def test_select_distinct(self):
@@ -429,10 +444,10 @@ def test_dedicated_agg(self):
         for wop in wops:
             with self.subTest(wop):
                 result_table = wop(self.test_table, wcol='e', by=["a", "b"])
-                self.assertEqual(len(result_table.columns), len(self.test_table.columns) - 1)
+                self.assertEqual(len(result_table.definition), len(self.test_table.definition) - 1)
 
                 result_table = wop(self.test_table, wcol='e')
-                self.assertEqual(len(result_table.columns), len(self.test_table.columns) - 1)
+                self.assertEqual(len(result_table.definition), len(self.test_table.definition) - 1)
 
     def test_count_by(self):
         num_distinct_a = self.test_table.select_distinct(formulas=["a"]).size
@@ -450,6 +465,10 @@ def test_agg_by(self):
             formula(
                 formula="min(each)", formula_param="each", cols=["MinA=a", "MinD=d"]
             ),
+            formula(formula="f_const=5.0 + 3"),
+            formula(formula="f_min=min(a)"),
+            formula(formula="f_sum=sum(a) + sum(b)"),
+            formula(formula="f_sum_3_col=sum(a) + sum(b) + max(c)"),
         ]
 
         result_table = self.test_table.agg_by(aggs=aggs, by=["a"])
@@ -468,6 +487,26 @@ def test_agg_by_2(self):
             result_table = test_table.agg_by(agg, "grp_id")
             self.assertEqual(result_table.size, 2)
 
+    def test_agg_count_where_output(self):
+        """
+        Test and validation of the agg_count_where feature
+        """
+        test_table = empty_table(100).update(["a=ii", "b=ii%2"])
+        count_aggs = [
+            count_where("count1", "a >= 25"),
+            count_where("count2", "a % 3 == 0")
+        ]
+        result_table = test_table.agg_by(aggs=count_aggs, by="b")
+        self.assertEqual(result_table.size, 2)
+
+        # get the table as a local pandas dataframe
+        df = to_pandas(result_table)
+        # assert the values meet expectations
+        self.assertEqual(df.loc[0, "count1"], 37)
+        self.assertEqual(df.loc[1, "count1"], 38)
+        self.assertEqual(df.loc[0, "count2"], 17)
+        self.assertEqual(df.loc[1, "count2"], 17)
+
     def test_agg_by_initial_groups_preserve_empty(self):
         test_table = empty_table(10)
         test_table = test_table.update(
@@ -529,28 +568,38 @@ def test_snapshot_when(self):
             snapshot = self.test_table.snapshot_when(t)
             self.wait_ticking_table_update(snapshot, row_count=1, timeout=5)
             self.assertEqual(self.test_table.size, snapshot.size)
-            self.assertEqual(len(t.columns) + len(self.test_table.columns), len(snapshot.columns))
+            self.assertEqual(len(t.definition) + len(self.test_table.definition), len(snapshot.definition))
 
         with self.subTest("initial=True"):
             snapshot = self.test_table.snapshot_when(t, initial=True)
             self.assertEqual(self.test_table.size, snapshot.size)
-            self.assertEqual(len(t.columns) + len(self.test_table.columns), len(snapshot.columns))
+            self.assertEqual(len(t.definition) + len(self.test_table.definition), len(snapshot.definition))
 
         with self.subTest("stamp_cols=\"X\""):
             snapshot = self.test_table.snapshot_when(t, stamp_cols="X")
-            self.assertEqual(len(snapshot.columns), len(self.test_table.columns) + 1)
+            self.assertEqual(len(snapshot.definition), len(self.test_table.definition) + 1)
 
         with self.subTest("stamp_cols=[\"X\", \"Y\"]"):
             snapshot = self.test_table.snapshot_when(t, stamp_cols=["X", "Y"])
-            self.assertEqual(len(snapshot.columns), len(self.test_table.columns) + 2)
+            self.assertEqual(len(snapshot.definition), len(self.test_table.definition) + 2)
 
     def test_snapshot_when_with_history(self):
         t = time_table("PT00:00:01")
         snapshot_hist = self.test_table.snapshot_when(t, history=True)
         self.wait_ticking_table_update(snapshot_hist, row_count=1, timeout=5)
-        self.assertEqual(1 + len(self.test_table.columns), len(snapshot_hist.columns))
+        self.assertEqual(1 + len(self.test_table.definition), len(snapshot_hist.definition))
         self.assertEqual(self.test_table.size, snapshot_hist.size)
 
+        t = time_table("PT0.1S").update("X = i % 2 == 0 ? i : i - 1").sort("X").tail(10)
+        with update_graph.shared_lock(t):
+            snapshot_hist = self.test_table.snapshot_when(t, history=True)
+            self.assertFalse(snapshot_hist.j_table.isFailed())
+        self.wait_ticking_table_update(t, row_count=10, timeout=2)
+        # we have not waited for a whole cycle yet, wait for the shared lock to guarantee cycle is over
+        # to ensure snapshot_hist has had the opportunity to process the update we just saw
+        with update_graph.shared_lock(t):
+            self.assertTrue(snapshot_hist.j_table.isFailed())
+
     def test_agg_all_by(self):
         test_table = empty_table(10)
         test_table = test_table.update(
@@ -912,6 +961,12 @@ def test_attributes(self):
         self.assertEqual(len(attrs), len(rt_attrs) + 1)
         self.assertIn("BlinkTable", set(attrs.keys()) - set(rt_attrs.keys()))
 
+    def test_remove_blink(self):
+        t_blink = time_table("PT1s", blink_table=True)
+        t_no_blink = t_blink.remove_blink()
+        self.assertEqual(t_blink.is_blink, True)
+        self.assertEqual(t_no_blink.is_blink, False)
+
     def test_grouped_column_as_arg(self):
         t1 = empty_table(100).update(
             ["id = i % 10", "Person = random() > 0.5 ? true : random() > 0.5 ? false : true"]).sort(
@@ -1012,7 +1067,7 @@ def test_range_join(self):
         right_table = self.test_table.select_distinct().sort("b").drop_columns("e")
         result_table = left_table.range_join(right_table, on=["a = a", "c < b < e"], aggs=aggs)
         self.assertEqual(result_table.size, left_table.size)
-        self.assertEqual(len(result_table.columns), len(left_table.columns) + len(aggs))
+        self.assertEqual(len(result_table.definition), len(left_table.definition) + len(aggs))
 
         with self.assertRaises(DHError):
             time_table("PT00:00:00.001").update("a = i").range_join(right_table, on=["a = a", "a < b < c"], aggs=aggs)
@@ -1115,6 +1170,64 @@ def test_arg_validation(self):
             t.partition_by("A", "B")
         self.assertIn("drop_keys must be", str(cm.exception))
 
+    def test_table_diff(self):
+        with self.subTest("diff"):
+            t1 = empty_table(10).update(["A = i", "B = i", "C = i"])
+            t2 = empty_table(10).update(["A = i", "B = i % 2 == 0? i: i + 1", "C = i % 2 == 0? i + 1: i"])
+            d = table_diff(t1, t2, max_diffs=10).split("\n")
+            self.assertEqual(len(d), 3)
+            self.assertIn("row 1", d[0])
+            self.assertIn("row 0", d[1])
+
+            d = table_diff(t1, t2).split("\n")
+            self.assertEqual(len(d), 2)
+
+        with self.subTest("diff - ignore column order"):
+            t1 = empty_table(10).update(["A = i", "B = i + 1"])
+            t2 = empty_table(10).update(["B = i + 1", "A = i"])
+            d = table_diff(t1, t2, max_diffs=10).split("\n")
+            self.assertEqual(len(d), 3)
+
+            t1 = empty_table(10).update(["A = i", "B = i"])
+            t2 = empty_table(10).update(["B = i", "A = i"])
+            d = table_diff(t1, t2, max_diffs=10, ignore_column_order=True)
+            self.assertEqual(d, "")
+
+        with self.subTest("diff - floating_comparison = 'absolute'-double"):
+            t1 = empty_table(10).update(["A = i", "B = i + 1.0"])
+            t2 = empty_table(10).update(["A = i", "B = i + 1.00001"])
+            d = table_diff(t1, t2, max_diffs=10, floating_comparison='exact').split("\n")
+            self.assertEqual(len(d), 2)
+
+            t1 = empty_table(10).update(["A = i", "B = i + 1.0"])
+            t2 = empty_table(10).update(["A = i", "B = i + 1.00001"])
+            d = table_diff(t1, t2, max_diffs=10, floating_comparison='absolute')
+            self.assertEqual(d, "")
+
+        with self.subTest("diff - floating_comparison = 'absolute'-float"):
+            t1 = empty_table(10).update(["A = i", "B = (float)(i + 1.0)"])
+            t2 = empty_table(10).update(["A = i", "B = (float)(i + 1.005)"])
+            d = table_diff(t1, t2, max_diffs=10, floating_comparison='exact').split("\n")
+            self.assertEqual(len(d), 2)
+
+            t1 = empty_table(10).update(["A = i", "B = (float)(i + 1.0)"])
+            # 1.005 would cause the difference to be greater than 0.005, something like 0.00500001144
+            t2 = empty_table(10).update(["A = i", "B = (float)(i + 1.004999)"])
+            d = table_diff(t1, t2, max_diffs=10, floating_comparison='absolute')
+            self.assertEqual(d, "")
+
+        with self.subTest("diff - floating_comparison='relative'-double"):
+            t1 = empty_table(10).update(["A = i", "B = i + 1.0"])
+            t2 = empty_table(10).update(["A = i", "B = i + 1.00001"])
+            d = table_diff(t1, t2, max_diffs=10, floating_comparison='relative')
+            self.assertEqual(d, "")
+
+        with self.subTest("diff - floating_comparison='relative'-float"):
+            t1 = empty_table(10).update(["A = i", "B = (float)(i + 1.0)"])
+            t2 = empty_table(10).update(["A = i", "B = (float)(i + 1.005)"])
+            d = table_diff(t1, t2, max_diffs=10, floating_comparison='relative')
+            self.assertFalse(d)
+
 
 if __name__ == "__main__":
     unittest.main()
diff --git a/py/server/tests/test_table_data_service.py b/py/server/tests/test_table_data_service.py
new file mode 100644
index 00000000000..6c524edf263
--- /dev/null
+++ b/py/server/tests/test_table_data_service.py
@@ -0,0 +1,331 @@
+#
+# Copyright (c) 2016-2024 Deephaven Data Labs and Patent Pending
+#
+
+import threading
+import time
+import unittest
+from typing import Callable, Optional, Generator, Dict
+
+import numpy as np
+import pyarrow as pa
+import pyarrow.compute as pc
+
+from deephaven import new_table
+from deephaven.column import byte_col, char_col, short_col, int_col, long_col, float_col, double_col, string_col, \
+    datetime_col, bool_col, ColumnType
+from deephaven.execution_context import get_exec_ctx, ExecutionContext
+from deephaven.experimental.table_data_service import TableDataServiceBackend, TableKey, \
+    TableLocationKey, TableDataService
+import deephaven.arrow as dharrow
+from deephaven.liveness_scope import liveness_scope
+
+from tests.testbase import BaseTestCase
+
+
+class TableKeyImpl(TableKey):
+    def __init__(self, key: str):
+        self.key = key
+
+    def __hash__(self):
+        return hash(self.key)
+
+
+class TableLocationKeyImpl(TableLocationKey):
+    def __init__(self, key: str):
+        self.key = key
+
+    def __hash__(self):
+        return hash(self.key)
+
+
+class TestBackend(TableDataServiceBackend):
+    def __init__(self, gen_pa_table: Generator[pa.Table, None, None], pt_schema: pa.Schema,
+                 pc_schema: Optional[pa.Schema] = None):
+        self.pt_schema: pa.Schema = pt_schema
+        self.pc_schema: pa.Schema = pc_schema
+        self.gen_pa_table: Generator = gen_pa_table
+        self.subscriptions_enabled_for_test: bool = True
+        self.sub_new_partition_cancelled: bool = False
+        self.sub_new_partition_fail_test: bool = False
+        self.sub_partition_size_fail_test: bool = False
+        self.partitions: Dict[TableLocationKey, pa.Table] = {}
+        self.partitions_size_subscriptions: Dict[TableLocationKey, bool] = {}
+        self.existing_partitions_called: int = 0
+        self.partition_size_called: int = 0
+
+    def table_schema(self, table_key: TableKeyImpl,
+                     schema_cb: Callable[[pa.Schema, Optional[pa.Schema]], None],
+                     failure_cb: Callable[[str], None]) -> None:
+        if table_key.key == "test":
+            schema_cb(self.pt_schema, self.pc_schema)
+        else:
+            failure_cb("table key not found")
+
+    def table_locations(self, table_key: TableKeyImpl,
+                        location_cb: Callable[[TableLocationKeyImpl, Optional[pa.Table]], None],
+                        success_cb: Callable[[], None],
+                        failure_cb: Callable[[str], None]) -> None:
+        pa_table = next(self.gen_pa_table)
+        if table_key.key == "test":
+            ticker = str(pa_table.column("Ticker")[0])
+
+            partition_key = TableLocationKeyImpl(f"{ticker}/NYSE")
+            self.partitions[partition_key] = pa_table
+
+            expr = ((pc.field("Ticker") == f"{ticker}") & (pc.field("Exchange") == "NYSE"))
+            location_cb(partition_key, pa_table.filter(expr).select(["Ticker", "Exchange"]).slice(0, 1))
+            self.existing_partitions_called += 1
+
+            # indicate that we've finished notifying existing table locations
+            success_cb()
+        else:
+            failure_cb("table key not found")
+
+    def table_location_size(self, table_key: TableKeyImpl, table_location_key: TableLocationKeyImpl,
+                            size_cb: Callable[[int], None],
+                            failure_cb: Callable[[str], None]) -> None:
+        size_cb(self.partitions[table_location_key].num_rows)
+        self.partition_size_called += 1
+
+    def column_values(self, table_key: TableKeyImpl, table_location_key: TableLocationKeyImpl,
+                      col: str, offset: int, min_rows: int, max_rows: int,
+                      values_cb: Callable[[pa.Table], None],
+                      failure_cb: Callable[[str], None]) -> None:
+        if table_key.key == "test":
+            values_cb(self.partitions[table_location_key].select([col]).slice(offset, max_rows))
+        else:
+            failure_cb("table key not found")
+
+    def _th_new_partitions(self, table_key: TableKeyImpl, exec_ctx: ExecutionContext,
+                           location_cb: Callable[[TableLocationKeyImpl, Optional[pa.Table]], None],
+                           failure_cb: Callable[[Exception], None]) -> None:
+        if table_key.key != "test":
+            return
+
+        while not self.sub_new_partition_cancelled and self.subscriptions_enabled_for_test:
+            try:
+                with exec_ctx:
+                    pa_table = next(self.gen_pa_table)
+            except StopIteration:
+                break
+
+            ticker = str(pa_table.column("Ticker")[0])
+            partition_key = TableLocationKeyImpl(f"{ticker}/NYSE")
+            self.partitions[partition_key] = pa_table
+
+            expr = ((pc.field("Ticker") == f"{ticker}") & (pc.field("Exchange") == "NYSE"))
+            location_cb(partition_key, pa_table.filter(expr).select(["Ticker", "Exchange"]).slice(0, 1))
+            if self.sub_new_partition_fail_test:
+                failure_cb(Exception("table location subscription failure"))
+                return
+            time.sleep(0.1)
+
+    def subscribe_to_table_locations(self, table_key: TableKeyImpl,
+                                    location_cb: Callable[[TableLocationKeyImpl, Optional[pa.Table]], None],
+                                    success_cb: Callable[[], None], failure_cb: Callable[[str], None]) -> Callable[[], None]:
+        if table_key.key != "test":
+            return lambda: None
+
+        # simulate an existing partition
+        pa_table = next(self.gen_pa_table)
+        if table_key.key == "test":
+            ticker = str(pa_table.column("Ticker")[0])
+
+            partition_key = TableLocationKeyImpl(f"{ticker}/NYSE")
+            self.partitions[partition_key] = pa_table
+
+            expr = ((pc.field("Ticker") == f"{ticker}") & (pc.field("Exchange") == "NYSE"))
+            location_cb(partition_key, pa_table.filter(expr).select(["Ticker", "Exchange"]).slice(0, 1))
+
+        exec_ctx = get_exec_ctx()
+        th = threading.Thread(target=self._th_new_partitions, args=(table_key, exec_ctx, location_cb, failure_cb))
+        th.start()
+
+        def _cancellation_callback():
+            self.sub_new_partition_cancelled = True
+
+        success_cb()
+        return _cancellation_callback
+
+    def _th_partition_size_changes(self, table_key: TableKeyImpl, table_location_key: TableLocationKeyImpl,
+                                   size_cb: Callable[[int], None],
+                                   failure_cb: Callable[[Exception], None]
+                                   ) -> None:
+        if table_key.key != "test":
+            return
+
+        if table_location_key not in self.partitions_size_subscriptions:
+            return
+
+        while self.subscriptions_enabled_for_test and self.partitions_size_subscriptions[table_location_key]:
+            pa_table = self.partitions[table_location_key]
+            rbs = pa_table.to_batches()
+            rbs.append(pa_table.to_batches()[0])
+            new_pa_table = pa.Table.from_batches(rbs)
+            self.partitions[table_location_key] = new_pa_table
+            size_cb(new_pa_table.num_rows)
+            if self.sub_partition_size_fail_test:
+                failure_cb(Exception("table location size subscription failure"))
+                return
+            time.sleep(0.1)
+
+    def subscribe_to_table_location_size(self, table_key: TableKeyImpl,
+                                         table_location_key: TableLocationKeyImpl,
+                                         size_cb: Callable[[int], None],
+                                         success_cb: Callable[[], None], failure_cb: Callable[[str], None]
+                                         ) -> Callable[[], None]:
+        if table_key.key != "test":
+            return lambda: None
+
+        if table_location_key not in self.partitions:
+            return lambda: None
+
+        # need to initial size
+        size_cb(self.partitions[table_location_key].num_rows)
+
+        self.partitions_size_subscriptions[table_location_key] = True
+        th = threading.Thread(target=self._th_partition_size_changes, args=(table_key, table_location_key, size_cb,
+                                                                            failure_cb))
+        th.start()
+
+        def _cancellation_callback():
+            self.partitions_size_subscriptions[table_location_key] = False
+
+        success_cb()
+        return _cancellation_callback
+
+
+class TableDataServiceTestCase(BaseTestCase):
+    tickers = ["AAPL", "FB", "GOOG", "MSFT", "NVDA", "TMSC", "TSLA", "VZ", "WMT", "XOM"]
+
+    def gen_pa_table(self) -> Generator[pa.Table, None, None]:
+        for tikcer in self.tickers:
+            cols = [
+                string_col(name="Ticker", data=[tikcer, tikcer]),
+                string_col(name="Exchange", data=["NYSE", "NYSE"]),
+                bool_col(name="Boolean", data=[True, False]),
+                byte_col(name="Byte", data=(1, -1)),
+                char_col(name="Char", data='-1'),
+                short_col(name="Short", data=[1, -1]),
+                int_col(name="Int", data=[1, -1]),
+                long_col(name="Long", data=[1, -1]),
+                long_col(name="NPLong", data=np.array([1, -1], dtype=np.int8)),
+                float_col(name="Float", data=[1.01, -1.01]),
+                double_col(name="Double", data=[1.01, -1.01]),
+                string_col(name="String", data=["foo", "bar"]),
+                datetime_col(name="Datetime", data=[1, -1]),
+            ]
+            yield dharrow.to_arrow(new_table(cols=cols))
+
+    def setUp(self) -> None:
+        super().setUp()
+        self.pa_table = next(self.gen_pa_table())
+        self.test_table = dharrow.to_table(self.pa_table)
+
+    def test_make_table_without_partition_schema(self):
+        backend = TestBackend(self.gen_pa_table(), pt_schema=self.pa_table.schema)
+        data_service = TableDataService(backend)
+        table = data_service.make_table(TableKeyImpl("test"), refreshing=False)
+        self.assertIsNotNone(table)
+        self.assertEqual(table.columns, self.test_table.columns)
+
+    def test_make_static_table_with_partition_schema(self):
+        pc_schema = pa.schema(
+            [pa.field(name="Ticker", type=pa.string()), pa.field(name="Exchange", type=pa.string())])
+        backend = TestBackend(self.gen_pa_table(), pt_schema=self.pa_table.schema, pc_schema=pc_schema)
+        data_service = TableDataService(backend)
+        table = data_service.make_table(TableKeyImpl("test"), refreshing=False)
+        self.assertIsNotNone(table)
+        self.assertTrue(table.columns[0].column_type == ColumnType.PARTITIONING)
+        self.assertTrue(table.columns[1].column_type == ColumnType.PARTITIONING)
+        self.assertEqual(table.columns[2:], self.test_table.columns[2:])
+        self.assertEqual(table.size, 2)
+        self.assertEqual(backend.existing_partitions_called, 1)
+        self.assertEqual(backend.partition_size_called, 1)
+
+    def test_make_live_table_with_partition_schema(self):
+        pc_schema = pa.schema(
+            [pa.field(name="Ticker", type=pa.string()), pa.field(name="Exchange", type=pa.string())])
+        backend = TestBackend(self.gen_pa_table(), pt_schema=self.pa_table.schema, pc_schema=pc_schema)
+        data_service = TableDataService(backend)
+        table = data_service.make_table(TableKeyImpl("test"), refreshing=True)
+        self.assertIsNotNone(table)
+        self.assertTrue(table.columns[0].column_type == ColumnType.PARTITIONING)
+        self.assertTrue(table.columns[1].column_type == ColumnType.PARTITIONING)
+        self.assertEqual(table.columns[2:], self.test_table.columns[2:])
+
+        self.wait_ticking_table_update(table, 20, 5)
+
+        self.assertGreaterEqual(table.size, 20)
+        self.assertEqual(backend.existing_partitions_called, 0)
+        self.assertEqual(backend.partition_size_called, 0)
+
+    def test_make_live_table_with_partition_schema_ops(self):
+        pc_schema = pa.schema(
+            [pa.field(name="Ticker", type=pa.string()), pa.field(name="Exchange", type=pa.string())])
+        backend = TestBackend(self.gen_pa_table(), pt_schema=self.pa_table.schema, pc_schema=pc_schema)
+        data_service = TableDataService(backend)
+        table = data_service.make_table(TableKeyImpl("test"), refreshing=True)
+        self.assertIsNotNone(table)
+        self.assertTrue(table.columns[0].column_type == ColumnType.PARTITIONING)
+        self.assertTrue(table.columns[1].column_type == ColumnType.PARTITIONING)
+        self.assertEqual(table.columns[2:], self.test_table.columns[2:])
+        self.wait_ticking_table_update(table, 100, 5)
+        self.assertGreaterEqual(table.size, 100)
+
+        t = table.select_distinct([c.name for c in table.columns])
+        self.assertGreaterEqual(t.size, len(self.tickers))
+        # t doesn't have the partitioning columns
+        self.assertEqual(t.columns, self.test_table.columns)
+
+    def test_make_live_table_observe_subscription_cancellations(self):
+        pc_schema = pa.schema(
+            [pa.field(name="Ticker", type=pa.string()), pa.field(name="Exchange", type=pa.string())])
+        backend = TestBackend(self.gen_pa_table(), pt_schema=self.pa_table.schema, pc_schema=pc_schema)
+        data_service = TableDataService(backend)
+        with liveness_scope():
+            table = data_service.make_table(TableKeyImpl("test"), refreshing=True)
+            self.wait_ticking_table_update(table, 100, 5)
+        self.assertTrue(backend.sub_new_partition_cancelled)
+        self.assertFalse(all(backend.partitions_size_subscriptions.values()))
+
+    def test_make_live_table_ensure_initial_partitions_exist(self):
+        pc_schema = pa.schema(
+            [pa.field(name="Ticker", type=pa.string()), pa.field(name="Exchange", type=pa.string())])
+        backend = TestBackend(self.gen_pa_table(), pt_schema=self.pa_table.schema, pc_schema=pc_schema)
+        backend.subscriptions_enabled_for_test = False
+        data_service = TableDataService(backend)
+        table = data_service.make_table(TableKeyImpl("test"), refreshing=True)
+        table.coalesce()
+        # the initial partitions should be created
+        self.assertEqual(table.size, 2)
+
+    def test_partition_sub_failure(self):
+        pc_schema = pa.schema(
+            [pa.field(name="Ticker", type=pa.string()), pa.field(name="Exchange", type=pa.string())])
+        backend = TestBackend(self.gen_pa_table(), pt_schema=self.pa_table.schema, pc_schema=pc_schema)
+        data_service = TableDataService(backend)
+        backend.sub_new_partition_fail_test = True
+        table = data_service.make_table(TableKeyImpl("test"), refreshing=True)
+        with self.assertRaises(Exception) as cm:
+            # failure_cb will be called in the background thread after 2 PUG cycles
+            self.wait_ticking_table_update(table, 600, 2)
+        self.assertTrue(table.j_table.isFailed())
+
+    def test_partition_size_sub_failure(self):
+        pc_schema = pa.schema(
+            [pa.field(name="Ticker", type=pa.string()), pa.field(name="Exchange", type=pa.string())])
+        backend = TestBackend(self.gen_pa_table(), pt_schema=self.pa_table.schema, pc_schema=pc_schema)
+        data_service = TableDataService(backend)
+        backend.sub_partition_size_fail_test = True
+        table = data_service.make_table(TableKeyImpl("test"), refreshing=True)
+        with self.assertRaises(Exception) as cm:
+            # failure_cb will be called in the background thread after 2 PUG cycles
+            self.wait_ticking_table_update(table, 600, 2)
+
+        self.assertTrue(table.j_table.isFailed())
+
+
+if __name__ == '__main__':
+    unittest.main()
diff --git a/py/server/tests/test_table_definition.py b/py/server/tests/test_table_definition.py
new file mode 100644
index 00000000000..d4d2cd34f86
--- /dev/null
+++ b/py/server/tests/test_table_definition.py
@@ -0,0 +1,271 @@
+#
+# Copyright (c) 2016-2024 Deephaven Data Labs and Patent Pending
+#
+import unittest
+from typing import Mapping
+from deephaven import dtypes, new_table, DHError
+from deephaven.table import TableDefinition
+from deephaven.column import col_def, string_col, bool_col
+from tests.testbase import BaseTestCase
+
+
+class TableDefinitionTestCase(BaseTestCase):
+    def setUp(self):
+        super().setUp()
+        self.test_definition = TableDefinition(
+            {
+                "Bool": dtypes.bool_,
+                "Char": dtypes.char,
+                "Short": dtypes.short,
+                "Int": dtypes.int32,
+                "Long": dtypes.int64,
+                "Float": dtypes.float32,
+                "Double": dtypes.float64,
+                "String": dtypes.string,
+                "Instant": dtypes.Instant,
+            }
+        )
+
+    def tearDown(self) -> None:
+        self.test_definition = None
+        super().tearDown()
+
+    def test_is_mapping(self):
+        self.assertTrue(isinstance(self.test_definition, Mapping))
+
+    def test_length(self):
+        self.assertEquals(9, len(self.test_definition))
+
+    def test_contains(self):
+        self.assertTrue("Bool" in self.test_definition)
+        self.assertTrue("Char" in self.test_definition)
+        self.assertTrue("Short" in self.test_definition)
+        self.assertTrue("Int" in self.test_definition)
+        self.assertTrue("Long" in self.test_definition)
+        self.assertTrue("Float" in self.test_definition)
+        self.assertTrue("Double" in self.test_definition)
+        self.assertTrue("String" in self.test_definition)
+        self.assertTrue("Instant" in self.test_definition)
+        self.assertFalse("FooBarBaz" in self.test_definition)
+
+    def test_getitem(self):
+        self.assertEquals(col_def("Bool", dtypes.bool_), self.test_definition["Bool"])
+        self.assertEquals(col_def("Char", dtypes.char), self.test_definition["Char"])
+        self.assertEquals(col_def("Short", dtypes.short), self.test_definition["Short"])
+        self.assertEquals(col_def("Int", dtypes.int32), self.test_definition["Int"])
+        self.assertEquals(col_def("Long", dtypes.int64), self.test_definition["Long"])
+        self.assertEquals(
+            col_def("Float", dtypes.float32), self.test_definition["Float"]
+        )
+        self.assertEquals(
+            col_def("Double", dtypes.float64),
+            self.test_definition["Double"],
+        )
+        self.assertEquals(
+            col_def("String", dtypes.string), self.test_definition["String"]
+        )
+        self.assertEquals(
+            col_def("Instant", dtypes.Instant),
+            self.test_definition["Instant"],
+        )
+        with self.assertRaises(KeyError):
+            self.test_definition["FooBarBaz"]
+
+    def test_get(self):
+        self.assertEquals(
+            col_def("Bool", dtypes.bool_), self.test_definition.get("Bool")
+        )
+        self.assertEquals(
+            col_def("Char", dtypes.char), self.test_definition.get("Char")
+        )
+        self.assertEquals(
+            col_def("Short", dtypes.short),
+            self.test_definition.get("Short"),
+        )
+        self.assertEquals(col_def("Int", dtypes.int32), self.test_definition.get("Int"))
+        self.assertEquals(
+            col_def("Long", dtypes.int64), self.test_definition.get("Long")
+        )
+        self.assertEquals(
+            col_def("Float", dtypes.float32),
+            self.test_definition.get("Float"),
+        )
+        self.assertEquals(
+            col_def("Double", dtypes.float64),
+            self.test_definition.get("Double"),
+        )
+        self.assertEquals(
+            col_def("String", dtypes.string),
+            self.test_definition.get("String"),
+        )
+        self.assertEquals(
+            col_def("Instant", dtypes.Instant),
+            self.test_definition.get("Instant"),
+        )
+        self.assertEquals(None, self.test_definition.get("FooBarBaz"))
+
+    def test_iter(self):
+        self.assertEquals(
+            [
+                "Bool",
+                "Char",
+                "Short",
+                "Int",
+                "Long",
+                "Float",
+                "Double",
+                "String",
+                "Instant",
+            ],
+            list(iter(self.test_definition)),
+        )
+
+    def test_keys(self):
+        self.assertEquals(
+            [
+                "Bool",
+                "Char",
+                "Short",
+                "Int",
+                "Long",
+                "Float",
+                "Double",
+                "String",
+                "Instant",
+            ],
+            list(self.test_definition.keys()),
+        )
+
+    def test_values(self):
+        self.assertEquals(
+            [
+                col_def("Bool", dtypes.bool_),
+                col_def("Char", dtypes.char),
+                col_def("Short", dtypes.short),
+                col_def("Int", dtypes.int32),
+                col_def("Long", dtypes.int64),
+                col_def("Float", dtypes.float32),
+                col_def("Double", dtypes.float64),
+                col_def("String", dtypes.string),
+                col_def("Instant", dtypes.Instant),
+            ],
+            list(self.test_definition.values()),
+        )
+
+    def test_items(self):
+        self.assertEquals(
+            [
+                ("Bool", col_def("Bool", dtypes.bool_)),
+                ("Char", col_def("Char", dtypes.char)),
+                ("Short", col_def("Short", dtypes.short)),
+                ("Int", col_def("Int", dtypes.int32)),
+                ("Long", col_def("Long", dtypes.int64)),
+                ("Float", col_def("Float", dtypes.float32)),
+                ("Double", col_def("Double", dtypes.float64)),
+                ("String", col_def("String", dtypes.string)),
+                ("Instant", col_def("Instant", dtypes.Instant)),
+            ],
+            list(self.test_definition.items()),
+        )
+
+    def test_equals_hash_and_from_columns(self):
+        expected_hash = hash(self.test_definition)
+        for actual in [
+            # should be equal to the same exact object
+            self.test_definition,
+            # should be equal to a new python object, but same underlying java object
+            TableDefinition(self.test_definition),
+            # should be equal to a new python object and new underlying java object
+            TableDefinition(self.test_definition.values()),
+        ]:
+            self.assertEquals(actual, self.test_definition)
+            self.assertEquals(hash(actual), expected_hash)
+
+    def test_meta_table(self):
+        expected = new_table(
+            [
+                string_col(
+                    "Name",
+                    [
+                        "Bool",
+                        "Char",
+                        "Short",
+                        "Int",
+                        "Long",
+                        "Float",
+                        "Double",
+                        "String",
+                        "Instant",
+                    ],
+                ),
+                string_col(
+                    "DataType",
+                    [
+                        "java.lang.Boolean",
+                        "char",
+                        "short",
+                        "int",
+                        "long",
+                        "float",
+                        "double",
+                        "java.lang.String",
+                        "java.time.Instant",
+                    ],
+                ),
+                string_col("ColumnType", ["Normal"] * 9),
+                bool_col("IsPartitioning", [False] * 9),
+            ]
+        )
+
+        self.assert_table_equals(self.test_definition.table, expected)
+
+    def test_from_TableDefinition(self):
+        self.assertEquals(TableDefinition(self.test_definition), self.test_definition)
+
+    def test_from_JpyJType(self):
+        self.assertEquals(
+            TableDefinition(self.test_definition.j_table_definition),
+            self.test_definition,
+        )
+
+    def test_from_Mapping(self):
+        # This case is already tested, it's how self.test_definition is created
+        pass
+
+    def test_from_Iterable(self):
+        self.assertEquals(
+            TableDefinition(self.test_definition.values()), self.test_definition
+        )
+        self.assertEquals(
+            TableDefinition(list(self.test_definition.values())), self.test_definition
+        )
+
+    def test_from_unexpected_type(self):
+        with self.assertRaises(DHError):
+            TableDefinition(42)
+
+    def test_bad_Mapping_key(self):
+        with self.assertRaises(DHError):
+            TableDefinition(
+                {
+                    "Foo": dtypes.int32,
+                    42: dtypes.string,
+                }
+            )
+
+    def test_bad_Mapping_value(self):
+        with self.assertRaises(DHError):
+            TableDefinition(
+                {
+                    "Foo": dtypes.int32,
+                    "Bar": 42,
+                }
+            )
+
+    def test_bad_Iterable(self):
+        with self.assertRaises(DHError):
+            TableDefinition([col_def("Foo", dtypes.int32), 42])
+
+
+if __name__ == "__main__":
+    unittest.main()
diff --git a/py/server/tests/test_table_factory.py b/py/server/tests/test_table_factory.py
index 3b1cfe55062..3332aa06938 100644
--- a/py/server/tests/test_table_factory.py
+++ b/py/server/tests/test_table_factory.py
@@ -7,7 +7,7 @@
 
 import jpy
 import numpy as np
-
+from time import sleep
 from deephaven import DHError, read_csv, time_table, empty_table, merge, merge_sorted, dtypes, new_table, \
     input_table, time, _wrapper
 from deephaven.column import byte_col, char_col, short_col, bool_col, int_col, long_col, float_col, double_col, \
@@ -16,7 +16,7 @@
 from deephaven.table_factory import DynamicTableWriter, InputTable, ring_table
 from tests.testbase import BaseTestCase
 from deephaven.table import Table
-from deephaven.stream import blink_to_append_only, stream_to_append_only
+from deephaven.stream import blink_to_append_only, stream_to_append_only, add_only_to_blink
 
 JArrayList = jpy.get_type("java.util.ArrayList")
 _JBlinkTableTools = jpy.get_type("io.deephaven.engine.table.impl.BlinkTableTools")
@@ -41,7 +41,7 @@ def tearDown(self) -> None:
 
     def test_empty_table(self):
         t = empty_table(10)
-        self.assertEqual(0, len(t.columns))
+        self.assertEqual(0, len(t.definition))
 
     def test_empty_table_error(self):
         with self.assertRaises(DHError) as cm:
@@ -52,22 +52,22 @@ def test_empty_table_error(self):
 
     def test_time_table(self):
         t = time_table("PT00:00:01")
-        self.assertEqual(1, len(t.columns))
+        self.assertEqual(1, len(t.definition))
         self.assertTrue(t.is_refreshing)
 
         t = time_table("PT00:00:01", start_time="2021-11-06T13:21:00 ET")
-        self.assertEqual(1, len(t.columns))
+        self.assertEqual(1, len(t.definition))
         self.assertTrue(t.is_refreshing)
         self.assertEqual("2021-11-06T13:21:00.000000000 ET",
                          _JDateTimeUtils.formatDateTime(t.j_table.getColumnSource("Timestamp").get(0),
                                                         time.to_j_time_zone('ET')))
 
         t = time_table(1000_000_000)
-        self.assertEqual(1, len(t.columns))
+        self.assertEqual(1, len(t.definition))
         self.assertTrue(t.is_refreshing)
 
         t = time_table(1000_1000_1000, start_time="2021-11-06T13:21:00 ET")
-        self.assertEqual(1, len(t.columns))
+        self.assertEqual(1, len(t.definition))
         self.assertTrue(t.is_refreshing)
         self.assertEqual("2021-11-06T13:21:00.000000000 ET",
                          _JDateTimeUtils.formatDateTime(t.j_table.getColumnSource("Timestamp").get(0),
@@ -75,12 +75,12 @@ def test_time_table(self):
 
         p = time.to_timedelta(time.to_j_duration("PT1s"))
         t = time_table(p)
-        self.assertEqual(1, len(t.columns))
+        self.assertEqual(1, len(t.definition))
         self.assertTrue(t.is_refreshing)
 
         st = time.to_datetime(time.to_j_instant("2021-11-06T13:21:00 ET"))
         t = time_table(p, start_time=st)
-        self.assertEqual(1, len(t.columns))
+        self.assertEqual(1, len(t.definition))
         self.assertTrue(t.is_refreshing)
         self.assertEqual("2021-11-06T13:21:00.000000000 ET",
                          _JDateTimeUtils.formatDateTime(t.j_table.getColumnSource("Timestamp").get(0),
@@ -88,15 +88,18 @@ def test_time_table(self):
 
     def test_time_table_blink(self):
         t = time_table("PT1s", blink_table=True)
-        self.assertEqual(1, len(t.columns))
+        self.assertEqual(1, len(t.definition))
         self.assertTrue(t.is_blink)
 
     def test_time_table_error(self):
         with self.assertRaises(DHError) as cm:
-            t = time_table("PT00:0a:01")
+            time_table("PT00:0a:01")
 
         self.assertIn("DateTimeParseException", cm.exception.root_cause)
 
+        with self.assertRaises(DHError):
+            time_table(None)
+
     def test_merge(self):
         t1 = self.test_table.update(formulas=["Timestamp=epochNanosToInstant(0L)"])
         t2 = self.test_table.update(formulas=["Timestamp=nowSystem()"])
@@ -325,19 +328,18 @@ def test_input_table(self):
         ]
         t = new_table(cols=cols)
         self.assertEqual(t.size, 2)
-        col_defs = {c.name: c.data_type for c in t.columns}
         with self.subTest("from table definition"):
-            append_only_input_table = input_table(col_defs=col_defs)
+            append_only_input_table = input_table(col_defs=t.definition)
             self.assertEqual(append_only_input_table.key_names, [])
-            self.assertEqual(append_only_input_table.value_names, [col.name for col in cols])
+            self.assertEqual(append_only_input_table.value_names, [col._column_definition.name for col in cols])
             append_only_input_table.add(t)
             self.assertEqual(append_only_input_table.size, 2)
             append_only_input_table.add(t)
             self.assertEqual(append_only_input_table.size, 4)
 
-            keyed_input_table = input_table(col_defs=col_defs, key_cols="String")
+            keyed_input_table = input_table(col_defs=t.definition, key_cols="String")
             self.assertEqual(keyed_input_table.key_names, ["String"])
-            self.assertEqual(keyed_input_table.value_names, [col.name for col in cols if col.name != "String"])
+            self.assertEqual(keyed_input_table.value_names, [col._column_definition.name for col in cols if col._column_definition.name != "String"])
             keyed_input_table.add(t)
             self.assertEqual(keyed_input_table.size, 2)
             keyed_input_table.add(t)
@@ -346,14 +348,14 @@ def test_input_table(self):
         with self.subTest("from init table"):
             append_only_input_table = input_table(init_table=t)
             self.assertEqual(append_only_input_table.key_names, [])
-            self.assertEqual(append_only_input_table.value_names, [col.name for col in cols])
+            self.assertEqual(append_only_input_table.value_names, [col._column_definition.name for col in cols])
             self.assertEqual(append_only_input_table.size, 2)
             append_only_input_table.add(t)
             self.assertEqual(append_only_input_table.size, 4)
 
             keyed_input_table = input_table(init_table=t, key_cols="String")
             self.assertEqual(keyed_input_table.key_names, ["String"])
-            self.assertEqual(keyed_input_table.value_names, [col.name for col in cols if col.name != "String"])
+            self.assertEqual(keyed_input_table.value_names, [col._column_definition.name for col in cols if col._column_definition.name != "String"])
             self.assertEqual(keyed_input_table.size, 2)
             keyed_input_table.add(t)
             self.assertEqual(keyed_input_table.size, 2)
@@ -368,7 +370,7 @@ def test_input_table(self):
 
             keyed_input_table = input_table(init_table=t, key_cols=["String", "Double"])
             self.assertEqual(keyed_input_table.key_names, ["String", "Double"])
-            self.assertEqual(keyed_input_table.value_names, [col.name for col in cols if col.name != "String" and col.name != "Double"])
+            self.assertEqual(keyed_input_table.value_names, [col._column_definition.name for col in cols if col._column_definition.name != "String" and col._column_definition.name != "Double"])
             self.assertEqual(keyed_input_table.size, 2)
             keyed_input_table.delete(t.select(["String", "Double"]))
             self.assertEqual(keyed_input_table.size, 0)
@@ -407,6 +409,17 @@ def test_ring_table(self):
         self.assertTrue(ring_t.is_refreshing)
         self.wait_ticking_table_update(ring_t, 6, 5)
 
+    def test_add_only_to_blink(self):
+        t = time_table("PT00:00:01")
+        bt = add_only_to_blink(t)
+        self.assertTrue(bt.is_refreshing)
+        self.assertTrue(bt.is_blink)
+
+        t = empty_table(0).update("Timestamp=nowSystem()")
+        with self.assertRaises(DHError) as cm:
+            add_only_to_blink(t)
+        self.assertIn("failed to create a blink table", str(cm.exception))
+
     def test_blink_to_append_only(self):
         _JTimeTable = jpy.get_type("io.deephaven.engine.table.impl.TimeTable")
         _JBaseTable = jpy.get_type("io.deephaven.engine.table.impl.BaseTable")
@@ -428,10 +441,7 @@ def test_instant_array(self):
         from deephaven import dtypes as dht
         from deephaven import time as dhtu
 
-        col_defs_5 = \
-            { \
-                "InstantArray": dht.instant_array \
-                }
+        col_defs_5 = {"InstantArray": dht.instant_array}
 
         dtw5 = DynamicTableWriter(col_defs_5)
         t5 = dtw5.table
@@ -449,7 +459,7 @@ def test_input_table_empty_data(self):
 
         with cm:
             t = time_table("PT1s", blink_table=True)
-            it = input_table({c.name: c.data_type for c in t.columns}, key_cols="Timestamp")
+            it = input_table(t.definition, key_cols="Timestamp")
             it.add(t)
             self.assertEqual(it.size, 0)
             it.delete(t)
@@ -467,8 +477,7 @@ def test_j_input_wrapping(self):
             string_col(name="String", data=["foo", "bar"]),
         ]
         t = new_table(cols=cols)
-        col_defs = {c.name: c.data_type for c in t.columns}
-        append_only_input_table = input_table(col_defs=col_defs)
+        append_only_input_table = input_table(col_defs=t.definition)
 
         it = _wrapper.wrap_j_object(append_only_input_table.j_table)
         self.assertTrue(isinstance(it, InputTable))
@@ -477,6 +486,60 @@ def test_j_input_wrapping(self):
         self.assertFalse(isinstance(t, InputTable))
         self.assertTrue(isinstance(t, Table))
 
+    def test_input_table_async(self):
+        cols = [
+            bool_col(name="Boolean", data=[True, False]),
+            byte_col(name="Byte", data=(1, -1)),
+            char_col(name="Char", data='-1'),
+            short_col(name="Short", data=[1, -1]),
+            int_col(name="Int", data=[1, -1]),
+            long_col(name="Long", data=[1, -1]),
+            long_col(name="NPLong", data=np.array([1, -1], dtype=np.int8)),
+            float_col(name="Float", data=[1.01, -1.01]),
+            double_col(name="Double", data=[1.01, -1.01]),
+            string_col(name="String", data=["foo", "bar"]),
+        ]
+        t = new_table(cols=cols)
+
+        with self.subTest("async add"):
+            self.assertEqual(t.size, 2)
+            success_count = 0
+            def on_success():
+                nonlocal success_count
+                success_count += 1
+            append_only_input_table = input_table(col_defs=t.definition)
+            append_only_input_table.add_async(t, on_success=on_success)
+            append_only_input_table.add_async(t, on_success=on_success)
+            while success_count < 2:
+                sleep(0.1)
+            self.assertEqual(append_only_input_table.size, 4)
+
+            keyed_input_table = input_table(col_defs=t.definition, key_cols="String")
+            keyed_input_table.add_async(t, on_success=on_success)
+            keyed_input_table.add_async(t, on_success=on_success)
+            while success_count < 4:
+                sleep(0.1)
+            self.assertEqual(keyed_input_table.size, 2)
+
+        with self.subTest("async delete"):
+            keyed_input_table = input_table(init_table=t, key_cols=["String", "Double"])
+            keyed_input_table.delete_async(t.select(["String", "Double"]), on_success=on_success)
+            while success_count < 5:
+                sleep(0.1)
+            self.assertEqual(keyed_input_table.size, 0)
+            t1 = t.drop_columns("String")
+
+        with self.subTest("schema mismatch"):
+            error_count = 0
+            def on_error(e: Exception):
+                nonlocal error_count
+                error_count += 1
+
+            append_only_input_table = input_table(col_defs=t1.definition)
+            with self.assertRaises(DHError) as cm:
+                append_only_input_table.add_async(t, on_success=on_success, on_error=on_error)
+            self.assertEqual(error_count, 0)
+
 
 if __name__ == '__main__':
     unittest.main()
diff --git a/py/server/tests/test_table_iterator.py b/py/server/tests/test_table_iterator.py
new file mode 100644
index 00000000000..0bb617fa6f5
--- /dev/null
+++ b/py/server/tests/test_table_iterator.py
@@ -0,0 +1,379 @@
+#
+# Copyright (c) 2016-2024 Deephaven Data Labs and Patent Pending
+#
+import unittest
+from dataclasses import dataclass
+
+import numpy as np
+
+import deephaven.dtypes as dtypes
+from deephaven import read_csv, time_table, new_table
+from deephaven import update_graph as ug
+from deephaven.column import bool_col, byte_col, char_col, short_col, int_col, long_col, float_col, double_col, \
+    string_col, datetime_col, pyobj_col, jobj_col
+from deephaven.jcompat import j_array_list
+
+from tests.testbase import BaseTestCase
+
+
+class TableIteratorTestCase(BaseTestCase):
+    def test_iteration_in_chunks(self):
+        with self.subTest("Read chunks of rows in a static table"):
+            test_table = read_csv("tests/data/test_table.csv")
+            total_read_size = 0
+            for d in test_table.iter_chunk_dict(chunk_size=10):
+                self.assertEqual(len(d), len(test_table.definition))
+                for col in test_table.columns:
+                    self.assertIn(col.name, d)
+                    self.assertEqual(d[col.name].dtype, col.data_type.np_type)
+                    self.assertLessEqual(len(d[col.name]), 10)
+                    self.assertEqual(isinstance(d[col.name], np.ndarray), True)
+                total_read_size += len(d[col.name])
+            self.assertEqual(total_read_size, test_table.size)
+
+        with self.subTest("Read chunks of rows in a ticking table"):
+            test_table = time_table("PT00:00:00.001").update(["X=i%11"]).sort("X")
+            test_table.await_update()
+            total_read_size = 0
+            for d in test_table.iter_chunk_dict(chunk_size=100):
+                self.assertEqual(len(d), len(test_table.definition))
+                for col in test_table.columns:
+                    self.assertIn(col.name, d)
+                    self.assertEqual(d[col.name].dtype, col.data_type.np_type)
+                    self.assertLessEqual(len(d[col.name]), 100)
+                total_read_size += len(d[col.name])
+            self.assertEqual(total_read_size, test_table.size)
+            self.assertFalse(ug.has_shared_lock(test_table))
+
+        with self.subTest("Read chunks of rows on selected columns in a ticking table under shared lock"):
+            test_table = time_table("PT00:00:00.001").update(
+                ["X=i", "Y=(double)i*10", "Z= i%2 == 0? true : false"]).sort("X")
+            test_table.await_update()
+            with ug.shared_lock(test_table):
+                total_read_size = 0
+                cols = ["X", "Z"]
+                for d in test_table.iter_chunk_dict(cols=cols, chunk_size=100):
+                    self.assertEqual(len(d), len(cols))
+                    for col in cols:
+                        self.assertIn(col, d)
+                        self.assertLessEqual(len(d[col]), 100)
+                    total_read_size += len(d[col])
+                self.assertEqual(total_read_size, test_table.size)
+
+    def test_iteration_in_rows(self):
+        with self.subTest("Read in rows of a static table"):
+            test_table = read_csv("tests/data/test_table.csv")
+            total_read_size = 0
+            for d in test_table.iter_dict():
+                self.assertEqual(len(d), len(test_table.definition))
+                for col in test_table.columns:
+                    self.assertIn(col.name, d)
+                    self.assertTrue(np.can_cast(col.data_type.np_type, np.dtype(type(d[col.name]))))
+                total_read_size += 1
+            self.assertEqual(total_read_size, test_table.size)
+
+        with self.subTest("Read in rows of a ticking table"):
+            test_table = time_table("PT00:00:00.001").update(["X=i%11"]).sort("X")
+            test_table.await_update()
+            total_read_size = 0
+            for d in test_table.iter_dict():
+                self.assertEqual(len(d), len(test_table.definition))
+                for col in test_table.columns:
+                    self.assertIn(col.name, d)
+                    v_type = type(d[col.name])
+                    self.assertTrue(np.can_cast(col.data_type.np_type, np.dtype(v_type)) or
+                                    self.assertEqual(v_type, col.data_type.j_type))
+                total_read_size += 1
+            self.assertEqual(total_read_size, test_table.size)
+            self.assertFalse(ug.has_shared_lock(test_table))
+
+        with self.subTest("Read in rows on selected columns of a ticking table under shared lock"):
+            test_table = time_table("PT00:00:00.001").update(
+                ["X=i", "Y=(double)i*10", "Z= i%2 == 0? true : false"]).sort("X")
+            test_table.await_update()
+            with ug.shared_lock(test_table):
+                total_read_size = 0
+                cols = ["X", "Z"]
+                for d in test_table.iter_dict(cols=cols):
+                    self.assertEqual(len(d), len(cols))
+                    for col in cols:
+                        self.assertIn(col, d)
+                    total_read_size += 1
+                self.assertEqual(total_read_size, test_table.size)
+                self.assertTrue(ug.has_shared_lock(test_table))
+            self.assertFalse(ug.has_shared_lock(test_table))
+
+    def test_direct_call_chunks(self):
+        with self.subTest("direct call rows in a static table"):
+            test_table = read_csv("tests/data/test_table.csv")
+            t_iter = test_table.iter_chunk_dict(chunk_size=10)
+            for d in t_iter:
+                self.assertEqual(len(d), len(test_table.definition))
+                for col in test_table.columns:
+                    self.assertIn(col.name, d)
+                    self.assertEqual(d[col.name].dtype, col.data_type.np_type)
+
+            with self.assertRaises(StopIteration):
+                next(t_iter)
+
+        with self.subTest("direct call all rows in a ticking table"):
+            test_table = time_table("PT00:00:00.001").update(
+                ["X=i", "Y=(double)i*10", "Z= i%2 == 0? true : false"]).sort("X")
+            test_table.await_update()
+            total_read_size = 0
+            cols = ["X", "Z"]
+            t_iter = test_table.iter_chunk_dict(cols=cols, chunk_size=100)
+            while True:
+                try:
+                    d = next(t_iter)
+                    self.assertEqual(len(d), len(cols))
+                    for col in cols:
+                        self.assertIn(col, d)
+                    total_read_size += len(d[col])
+                except StopIteration:
+                    break
+            # the table can't refresh with the lock, so the total read size must be the same as the table size
+            self.assertEqual(total_read_size, test_table.size)
+            self.assertFalse(ug.has_shared_lock(test_table))
+
+        with self.subTest("direct call not all rows in a ticking table"):
+            test_table = time_table("PT00:00:00.001").update(
+                ["X=i", "Y=(double)i*10", "Z= i%2 == 0? true : false"]).sort("X")
+            test_table.await_update()
+            cols = ["X", "Z"]
+            t_iter = test_table.iter_chunk_dict(cols=cols, chunk_size=100)
+            while True:
+                d = next(t_iter)
+                self.assertEqual(len(d), len(cols))
+                for col in cols:
+                    self.assertIn(col, d)
+                    self.assertLessEqual(len(d[col]), 100)
+                total_read_size += len(d[col])
+                break
+            self.assertTrue(ug.has_shared_lock(test_table))
+            t_iter = None
+            self.assertFalse(ug.has_shared_lock(test_table))
+
+    def test_direct_call_rows(self):
+        with self.subTest("direct call rows in a static table"):
+            test_table = read_csv("tests/data/test_table.csv")
+            t_iter = test_table.iter_dict()
+            for d in t_iter:
+                self.assertEqual(len(d), len(test_table.definition))
+                for col in test_table.columns:
+                    self.assertIn(col.name, d)
+                    self.assertTrue(np.can_cast(col.data_type.np_type, np.dtype(type(d[col.name]))))
+
+            with self.assertRaises(StopIteration):
+                next(t_iter)
+
+        with self.subTest("direct call all rows in a ticking table"):
+            test_table = time_table("PT00:00:00.001").update(
+                ["X=i", "Y=(double)i*10", "Z= i%2 == 0? true : false"]).sort("X")
+            test_table.await_update()
+            total_read_size = 0
+            cols = ["X", "Z"]
+            t_iter = test_table.iter_dict(cols=cols)
+            while True:
+                try:
+                    d = next(t_iter)
+                    self.assertEqual(len(d), len(cols))
+                    for col in cols:
+                        self.assertIn(col, d)
+                    total_read_size += 1
+                except StopIteration:
+                    break
+            # the table can't refresh with the lock, so the total read size must be the same as the table size
+            self.assertEqual(total_read_size, test_table.size)
+            self.assertFalse(ug.has_shared_lock(test_table))
+
+        with self.subTest("direct call not all rows in a ticking table"):
+            test_table = time_table("PT00:00:00.001").update(
+                ["X=i", "Y=(double)i*10", "Z= i%2 == 0? true : false"]).sort("X")
+            test_table.await_update()
+            cols = ["X", "Z"]
+            t_iter = test_table.iter_chunk_dict(cols=cols)
+            while True:
+                d = next(t_iter)
+                self.assertEqual(len(d), len(cols))
+                for col in cols:
+                    self.assertIn(col, d)
+                total_read_size += 1
+                break
+            self.assertTrue(ug.has_shared_lock(test_table))
+            t_iter = None
+            self.assertFalse(ug.has_shared_lock(test_table))
+
+    def test_data_types(self):
+        @dataclass
+        class CustomClass:
+            f1: int
+            f2: str
+
+        j_array_list1 = j_array_list([1, -1])
+        j_array_list2 = j_array_list([2, -2])
+
+        input_cols = [
+            bool_col(name="Boolean", data=[True, False]),
+            byte_col(name="Byte", data=(1, -1)),
+            char_col(name="Char", data='-1'),
+            short_col(name="Short", data=[1, -1]),
+            int_col(name="Int", data=[1, -1]),
+            long_col(name="Long", data=[1, 2 ** 63 - 1]),
+            long_col(name="NPLong", data=np.array([1, -1], dtype=np.int8)),
+            float_col(name="Float", data=[1.01, -1.01]),
+            double_col(name="Double", data=[1.01, -1.01]),
+            string_col(name="String", data=["foo", "bar"]),
+            datetime_col(name="Datetime", data=[1, -1]),
+            pyobj_col(name="PyObj", data=[CustomClass(1, "1"), CustomClass(-1, "-1")]),
+            jobj_col(name="JObj", data=[j_array_list1, j_array_list2]),
+        ]
+        test_table = new_table(cols=input_cols)
+
+        with self.subTest("Chunks"):
+            for d in test_table.iter_chunk_dict(chunk_size=10):
+                self.assertEqual(len(d), len(test_table.definition))
+                for col in test_table.columns:
+                    self.assertIn(col.name, d)
+                    self.assertEqual(dtypes.from_np_dtype(d[col.name].dtype).np_type, col.data_type.np_type)
+                    self.assertEqual(isinstance(d[col.name], np.ndarray), True)
+
+        with self.subTest("Rows"):
+            for d in test_table.iter_dict():
+                self.assertEqual(len(d), len(test_table.definition))
+                for col in test_table.columns:
+                    self.assertIn(col.name, d)
+                    v_type = type(d[col.name])
+                    if np.dtype(v_type) == np.dtype(object):
+                        if col.data_type not in {dtypes.PyObject, dtypes.JObject}:
+                            self.assertEqual(v_type, col.data_type.j_type)
+                        else:
+                            import jpy
+                            self.assertTrue(v_type == CustomClass or v_type == jpy.get_type("java.util.ArrayList"))
+                    else:
+                        self.assertTrue(np.can_cast(col.data_type.np_type, np.dtype(v_type)))
+
+    def test_iteration_in_chunks_tuple(self):
+        with self.subTest("Read chunks of rows in a static table - tuple"):
+            test_table = read_csv("tests/data/test_table.csv")
+            total_read_size = 0
+            for d in test_table.iter_chunk_tuple(chunk_size=10):
+                self.assertEqual(len(d), len(test_table.definition))
+                for i, col in enumerate(test_table.columns):
+                    self.assertEqual(col.name, d._fields[i])
+                    self.assertEqual(d[i].dtype, col.data_type.np_type)
+                    self.assertLessEqual(len(d[i]), 10)
+                    self.assertEqual(isinstance(d[i], np.ndarray), True)
+                total_read_size += len(d[i])
+            self.assertEqual(total_read_size, test_table.size)
+
+        with self.subTest("Read chunks of rows in a ticking table - tuple"):
+            test_table = time_table("PT00:00:00.001").update(["X=i%11"]).sort("X")
+            test_table.await_update()
+            total_read_size = 0
+            for d in test_table.iter_chunk_tuple(chunk_size=100):
+                self.assertEqual(len(d), len(test_table.definition))
+                for i, col in enumerate(test_table.columns):
+                    self.assertEqual(col.name, d._fields[i])
+                    self.assertEqual(d[i].dtype, col.data_type.np_type)
+                    self.assertLessEqual(len(d[i]), 100)
+                total_read_size += len(d[i])
+            self.assertEqual(total_read_size, test_table.size)
+            self.assertFalse(ug.has_shared_lock(test_table))
+
+        with self.subTest("Read chunks of rows on selected columns in a ticking table under shared lock - tuple"):
+            test_table = time_table("PT00:00:00.001").update(
+                ["X=i", "Y=(double)i*10", "Z= i%2 == 0? true : false"]).sort("X")
+            test_table.await_update()
+            with ug.shared_lock(test_table):
+                total_read_size = 0
+                cols = ["X", "Z"]
+                for d in test_table.iter_chunk_tuple(cols=cols, chunk_size=100):
+                    self.assertEqual(len(d), len(cols))
+                    for i, col in enumerate(cols):
+                        self.assertEqual(col, d._fields[i])
+                        self.assertLessEqual(len(d[i]), 100)
+                    total_read_size += len(d[i])
+                self.assertEqual(total_read_size, test_table.size)
+
+    def test_iteration_in_rows_tuple(self):
+        with self.subTest("Read in rows of a static table - tuple"):
+            test_table = read_csv("tests/data/test_table.csv")
+            total_read_size = 0
+            for d in test_table.iter_tuple():
+                self.assertEqual(len(d), len(test_table.definition))
+                for i, col in enumerate(test_table.columns):
+                    self.assertEqual(col.name, d._fields[i])
+                    self.assertTrue(np.can_cast(col.data_type.np_type, np.dtype(type(d[i]))))
+                total_read_size += 1
+            self.assertEqual(total_read_size, test_table.size)
+
+        with self.subTest("Read in rows of a ticking table - tuple"):
+            test_table = time_table("PT00:00:00.001").update(["X=i%11"]).sort("X")
+            test_table.await_update()
+            total_read_size = 0
+            for d in test_table.iter_tuple():
+                self.assertEqual(len(d), len(test_table.definition))
+                for i, col in enumerate(test_table.columns):
+                    self.assertEqual(col.name, d._fields[i])
+                    v_type = type(d[i])
+                    self.assertTrue(np.can_cast(col.data_type.np_type, np.dtype(v_type)) or
+                                    self.assertEqual(v_type, col.data_type.j_type))
+                total_read_size += 1
+            self.assertEqual(total_read_size, test_table.size)
+            self.assertFalse(ug.has_shared_lock(test_table))
+
+        with self.subTest("Read in rows on selected columns of a ticking table under shared lock - tuple"):
+            test_table = time_table("PT00:00:00.001").update(
+                ["X=i", "Y=(double)i*10", "Z= i%2 == 0? true : false"]).sort("X")
+            test_table.await_update()
+            with ug.shared_lock(test_table):
+                total_read_size = 0
+                cols = ["X", "Z"]
+                for d in test_table.iter_tuple(cols=cols):
+                    self.assertEqual(len(d), len(cols))
+                    for i, col in enumerate(cols):
+                        self.assertEqual(col, d._fields[i])
+                    total_read_size += 1
+                self.assertEqual(total_read_size, test_table.size)
+                self.assertTrue(ug.has_shared_lock(test_table))
+            self.assertFalse(ug.has_shared_lock(test_table))
+
+    def test_iteration_tuple_unpack(self):
+        test_table = read_csv("tests/data/test_table.csv")
+        total_read_size = 0
+        for a, b, c, *_ in test_table.iter_tuple():
+            total_read_size += 1
+        self.assertEqual(total_read_size, test_table.size)
+
+        with self.subTest("Too few receiving variables"):
+            with self.assertRaises(ValueError):
+                test_table = read_csv("tests/data/test_table.csv")
+                for a, b, c, d in test_table.iter_tuple():
+                    ...
+
+        with self.subTest("Too many receiving variables"):
+            with self.assertRaises(ValueError):
+                test_table = read_csv("tests/data/test_table.csv")
+                for a, b, c, d, e, f in test_table.iter_tuple():
+                    ...
+
+    def test_iteration_errors(self):
+        test_table = time_table("PT00:00:00.001").update(["from = i%11"])
+        with self.assertRaises(ValueError) as cm:
+            for t in test_table.iter_tuple():
+                pass
+        self.assertIn("'from'", str(cm.exception))
+
+        with self.assertRaises(ValueError) as cm:
+            for t in test_table.iter_tuple(cols=["from_"]):
+                pass
+        self.assertIn("'from_'", str(cm.exception))
+
+        with self.assertRaises(ValueError) as cm:
+            for t in test_table.iter_chunk_tuple(chunk_size=-1):
+                pass
+
+
+if __name__ == '__main__':
+    unittest.main()
diff --git a/py/server/tests/test_table_listener.py b/py/server/tests/test_table_listener.py
index bded80c1786..e0e6cadb64e 100644
--- a/py/server/tests/test_table_listener.py
+++ b/py/server/tests/test_table_listener.py
@@ -4,25 +4,27 @@
 
 import time
 import unittest
-from typing import List, Union
+from typing import List, Union, Optional, Dict
 
 import numpy
 import jpy
 
-from deephaven import time_table, new_table, input_table, DHError
+from deephaven import time_table, new_table, input_table, DHError, empty_table
 from deephaven.column import bool_col, string_col
 from deephaven.experimental import time_window
 from deephaven.jcompat import to_sequence
 from deephaven.table import Table
-from deephaven.table_listener import listen, TableListener, TableListenerHandle
+from deephaven.table_listener import listen, TableListener, TableListenerHandle, MergedListener, TableUpdate, \
+    MergedListenerHandle, merged_listen
 from deephaven.execution_context import get_exec_ctx
 from deephaven.update_graph import exclusive_lock
 from tests.testbase import BaseTestCase
 
 _JColumnVectors = jpy.get_type("io.deephaven.engine.table.vectors.ColumnVectors")
 
+
 class TableUpdateRecorder:
-    def __init__(self, table: Table, chunk_size: int = None, cols: Union[str, List[str]] = None):
+    def __init__(self, table: Optional[Table] = None, chunk_size: int = None, cols: Union[str, List[str]] = None):
         self.table = table
         self.chunk_size = chunk_size
         self.cols = cols
@@ -34,7 +36,10 @@ def __init__(self, table: Table, chunk_size: int = None, cols: Union[str, List[s
         self.replays = []
         self.modified_columns_list = []
 
-    def record(self, update, is_replay):
+    def record(self, update: TableUpdate, is_replay: bool):
+        if not update:
+            return
+
         if self.chunk_size is None:
             self.added.append(update.added())
             self.removed.append(update.removed())
@@ -100,7 +105,7 @@ def verify_data_changes(self, changes, cols: Union[str, List[str]]):
         for change in changes:
             self.assertTrue(isinstance(change, dict))
             if not cols:
-                cols = [col.name for col in self.test_table.columns]
+                cols = self.test_table.column_names
             for col in cols:
                 self.assertIn(col, change.keys())
                 self.assertTrue(isinstance(change[col], numpy.ndarray))
@@ -262,6 +267,8 @@ def on_update(self, update, is_replay):
                                        has_added=True, has_removed=True, has_modified=False)
             self.assertTrue(all([len(ja) > 0 for ja in j_arrays]))
 
+        dep_table = dep_table_2 = None
+
 
     def test_listener_func_with_deps(self):
         cols = [
@@ -270,8 +277,7 @@ def test_listener_func_with_deps(self):
         ]
         t = new_table(cols=cols)
         self.assertEqual(t.size, 2)
-        col_defs = {c.name: c.data_type for c in t.columns}
-        dep_table = input_table(col_defs=col_defs)
+        dep_table = input_table(col_defs=t.definition)
 
         def listener_func(update, is_replay):
             table_update_recorder.record(update, is_replay)
@@ -293,14 +299,14 @@ def listener_func(update, is_replay):
 
         with self.subTest("do_replay=True, replay_lock='exclusive'"):
             table_update_recorder = TableUpdateRecorder(self.test_table)
-            table_listener_handle.start(do_replay=True, replay_lock="exclusive")
+            table_listener_handle.start(do_replay=True)
             ensure_ugp_cycles(table_update_recorder, cycles=3)
             table_listener_handle.stop()
             self.check_update_recorder(table_update_recorder, has_replay=True, has_added=True, has_removed=True, has_modified=False)
 
         with self.subTest("do_replay=True, replay_lock='shared'"):
             table_update_recorder = TableUpdateRecorder(self.test_table)
-            table_listener_handle.start(do_replay=True, replay_lock="shared") # noqa
+            table_listener_handle.start(do_replay=True) # noqa
             ensure_ugp_cycles(table_update_recorder, cycles=3)
             table_listener_handle.stop()
             self.check_update_recorder(table_update_recorder, has_replay=True, has_added=True, has_removed=True, has_modified=False)
@@ -327,6 +333,432 @@ def listener_func(update, is_replay):
         with self.assertRaises(DHError):
             table_listener_handle = TableListenerHandle(self.test_table, listener_func, dependencies=dep_table)
 
+    def test_merged_listener_obj(self):
+        t1 = time_table("PT1s").update(["X=i % 11"])
+        t2 = time_table("PT2s").update(["Y=i % 8"])
+        t3 = time_table("PT3s").update(["Z=i % 5"])
+
+        class TestMergedListener(MergedListener):
+            def on_update(self, updates: Dict[Table, TableUpdate], is_replay: bool) -> None:
+                for update in updates.values():
+                    tur.record(update, is_replay)
+
+        tml = TestMergedListener()
+        with self.subTest("Direct Handle"):
+            tur = TableUpdateRecorder()
+            mlh = MergedListenerHandle([t1, t2, t3], tml)
+            mlh.start()
+            ensure_ugp_cycles(tur, cycles=3)
+            mlh.stop()
+            mlh.start()
+            ensure_ugp_cycles(tur, cycles=6)
+            mlh.stop()
+            self.assertGreaterEqual(len(tur.replays), 6)
+
+        with self.subTest("Convenience function"):
+            tur = TableUpdateRecorder()
+            mlh = merged_listen([t1, t2, t3], tml)
+            ensure_ugp_cycles(tur, cycles=3)
+            mlh.stop()
+            mlh.start()
+            ensure_ugp_cycles(tur, cycles=6)
+            mlh.stop()
+            self.assertGreaterEqual(len(tur.replays), 6)
+
+        t1 = t2 = t3 = None
+
+    def test_merged_listener_func(self):
+        t1 = time_table("PT1s").update(["X=i % 11"])
+        t2 = time_table("PT2s").update(["Y=i % 8"])
+        t3 = time_table("PT3s").update(["Z=i % 5"])
+
+        def test_ml_func(updates: Dict[Table, TableUpdate], is_replay: bool) -> None:
+            if updates[t1] or updates[t3]:
+                tur.record(updates[t1], is_replay)
+
+        with self.subTest("Direct Handle"):
+            tur = TableUpdateRecorder()
+            mlh = MergedListenerHandle([t1, t2, t3], test_ml_func)
+            mlh.start()
+            ensure_ugp_cycles(tur, cycles=3)
+            mlh.stop()
+            mlh.start()
+            ensure_ugp_cycles(tur, cycles=6)
+            mlh.stop()
+            self.assertGreaterEqual(len(tur.replays), 6)
+
+        with self.subTest("Convenience function"):
+            tur = TableUpdateRecorder()
+            mlh = merged_listen([t1, t2, t3], test_ml_func)
+            ensure_ugp_cycles(tur, cycles=3)
+            mlh.stop()
+            mlh.start()
+            ensure_ugp_cycles(tur, cycles=6)
+            mlh.stop()
+            self.assertGreaterEqual(len(tur.replays), 6)
+
+        t1 = t2 = t3 = None
+
+    def test_merged_listener_with_deps(self):
+        t1 = time_table("PT1s").update(["X=i % 11"])
+        t2 = time_table("PT2s").update(["Y=i % 8"])
+        t3 = time_table("PT3s").update(["Z=i % 5"])
+
+        dep_table = time_table("PT00:00:05").update("X = i % 11")
+        ec = get_exec_ctx()
+
+        tur = TableUpdateRecorder()
+        j_arrays = []
+        class TestMergedListener(MergedListener):
+            def on_update(self, updates: Dict[Table, TableUpdate], is_replay: bool) -> None:
+                if updates[t1] and updates[t2]:
+                    tur.record(updates[t2], is_replay)
+
+                with ec:
+                    t = dep_table.view(["Y = i % 8"])
+                    j_arrays.append(_JColumnVectors.of(t.j_table, "Y").copyToArray())
+
+        tml = TestMergedListener()
+        mlh = MergedListenerHandle(tables=[t1, t2, t3], listener=tml, dependencies=dep_table)
+        mlh.start()
+        ensure_ugp_cycles(tur, cycles=3)
+        mlh.stop()
+        mlh.start()
+        ensure_ugp_cycles(tur, cycles=6)
+        mlh.stop()
+        self.assertGreaterEqual(len(tur.replays), 6)
+        self.assertTrue(len(j_arrays) > 0 and all([len(ja) > 0 for ja in j_arrays]))
+
+        t1 = t2 = t3 = None
+
+    def test_merged_listener_error(self):
+        t1 = time_table("PT1s").update(["X=i % 11"])
+
+        def test_ml_func(updates: Dict[Table, TableUpdate]) -> None:
+            pass
+
+        with self.assertRaises(DHError) as cm:
+            mlh = MergedListenerHandle([t1], test_ml_func)
+        self.assertIn("at least 2 refreshing tables", str(cm.exception))
+
+        et = empty_table(1)
+        with self.assertRaises(DHError) as cm:
+            mlh = merged_listen([t1, et], test_ml_func)
+        self.assertIn("must be a refreshing table", str(cm.exception))
+
+        t1 = et = None
+
+    def test_merged_listener_replay(self):
+        t1 = time_table("PT1s").update(["X=i % 11"])
+        t2 = time_table("PT2s").update(["Y=i % 8"])
+        t3 = time_table("PT3s").update(["Z=i % 5"])
+
+        class TestMergedListener(MergedListener):
+            def on_update(self, updates: Dict[Table, TableUpdate], is_replay: bool) -> None:
+                for update in updates.values():
+                    tur.record(update, is_replay)
+
+        tml = TestMergedListener()
+        t1.await_update()
+        t2.await_update()
+        t3.await_update()
+        with self.subTest("MergedListener - replay"):
+            tur = TableUpdateRecorder()
+            mlh = merged_listen([t1, t2, t3], tml, do_replay=True)
+            ensure_ugp_cycles(tur, cycles=3)
+            mlh.stop()
+            mlh.start(do_replay=True)
+            ensure_ugp_cycles(tur, cycles=6)
+            mlh.stop()
+            self.assertGreaterEqual(len(tur.replays), 6)
+            self.assertEqual(tur.replays.count(True), 2 * 3)
+
+        def test_ml_func(updates: Dict[Table, TableUpdate], is_replay: bool) -> None:
+            tur.record(updates[t3], is_replay)
+
+        with self.subTest("Direct Handle - replay"):
+            tur = TableUpdateRecorder()
+            mlh = MergedListenerHandle([t1, t2, t3], test_ml_func)
+            mlh.start(do_replay=True)
+            ensure_ugp_cycles(tur, cycles=3)
+            mlh.stop()
+            mlh.start(do_replay=True)
+            ensure_ugp_cycles(tur, cycles=6)
+            mlh.stop()
+            self.assertGreaterEqual(len(tur.replays), 6)
+            self.assertEqual(tur.replays.count(True), 2)
+
+        t1 = t2 = t3 = None
+
+    def test_on_error_listener_func(self):
+        t = time_table("PT1S").update("X = i")
+        with self.subTest("Bad Listener Good Error Callback"):
+            def bad_listner_func(table_udpate, is_replay: bool) -> None:
+                raise ValueError("invalid value")
+
+            def on_error(e: Exception) -> None:
+                nonlocal error_caught
+                error_caught = True
+                self.assertIn("invalid value", str(e))
+
+            error_caught = False
+            tlh = listen(t, bad_listner_func, on_error=on_error)
+            t.await_update()
+            self.assertTrue(error_caught)
+            self.assertTrue(tlh.j_object.isFailed())
+
+        with self.subTest("Good Listener Good Error Callback"):
+            def good_listner_func(table_udpate, is_replay: bool) -> None:
+                pass
+
+            error_caught = False
+            tlh = listen(t, good_listner_func, on_error=on_error)
+            t.await_update()
+            self.assertFalse(error_caught)
+            self.assertFalse(tlh.j_object.isFailed())
+
+        with self.subTest("Bad Listener Bad Error Callback"):
+            error_caught: bool = False
+
+            def bad_listner_func(table_udpate, is_replay: bool) -> None:
+                raise ValueError("invalid value")
+
+            def on_error(e: Exception) -> None:
+                nonlocal error_caught
+                error_caught = True
+                self.assertIn("invalid value", str(e))
+                raise ValueError("reraise the exception") from e
+
+            tlh = listen(t, bad_listner_func, on_error=on_error)
+            t.await_update()
+            self.assertTrue(error_caught)
+            self.assertTrue(tlh.j_object.isFailed())
+
+        t = None
+
+    def test_on_error_listener_obj(self):
+        test_self = self
+        t = time_table("PT1S").update("X = i")
+
+        with self.subTest("Bad Listener Good Error Callback"):
+            class BadListener(TableListener):
+                def on_update(self, update: TableUpdate, is_replay: bool) -> None:
+                    raise ValueError("invalid value")
+
+                def on_error(self, e: Exception) -> None:
+                    nonlocal error_caught
+                    error_caught = True
+                    test_self.assertIn("invalid value", str(e))
+
+            error_caught = False
+            bad_listener_obj = BadListener()
+            tlh = listen(t, bad_listener_obj)
+            t.await_update()
+            self.assertTrue(error_caught)
+            self.assertTrue(tlh.j_object.isFailed())
+
+            with self.assertRaises(DHError):
+                def on_error(e: Exception) -> None:
+                    ...
+                tlh = listen(t, bad_listener_obj, on_error=on_error)
+
+        with self.subTest("Good Listener Good Error Callback"):
+            class GoodListener(TableListener):
+                def on_update(self, update: TableUpdate, is_replay: bool) -> None:
+                    ...
+
+                def on_error(self, e: Exception) -> None:
+                    nonlocal error_caught
+                    error_caught = True
+                    test_self.assertIn("invalid value", str(e))
+
+            error_caught = False
+            good_listener_obj = GoodListener()
+            tlh = listen(t, good_listener_obj)
+            t.await_update()
+            self.assertFalse(error_caught)
+            self.assertFalse(tlh.j_object.isFailed())
+
+        with self.subTest("Bad Listener Bad Error Callback"):
+            class GoodListener(TableListener):
+                def on_update(self, update: TableUpdate, is_replay: bool) -> None:
+                    raise ValueError("invalid value")
+
+                def on_error(self, e: Exception) -> None:
+                    nonlocal error_caught
+                    error_caught = True
+                    test_self.assertIn("invalid value", str(e))
+                    raise ValueError("reraise the exception") from e
+
+            error_caught = False
+
+            good_listener_obj = GoodListener()
+            tlh = listen(t, good_listener_obj)
+            t.await_update()
+            self.assertTrue(error_caught)
+            self.assertTrue(tlh.j_object.isFailed())
+
+        t = None
+
+    def test_on_error_merged_listener_func(self):
+        t1 = time_table("PT1s").update(["X=i % 11"])
+        t2 = time_table("PT2s").update(["Y=i % 8"])
+        t3 = time_table("PT3s").update(["Z=i % 5"])
+
+        with self.subTest("Bad Listener Good Error Callback"):
+            def bad_listner_func(updates: Dict[Table, TableUpdate], is_replay: bool) -> None:
+                raise ValueError("invalid value")
+
+            def on_error(e: Exception) -> None:
+                nonlocal error_caught
+                error_caught = True
+                self.assertIn("invalid value", str(e))
+
+            error_caught = False
+            mlh = merged_listen([t1, t2, t3], bad_listner_func, on_error=on_error)
+            t1.await_update()
+            self.assertTrue(error_caught)
+            self.assertTrue(mlh.j_object.isFailed())
+
+        with self.subTest("Good Listener Good Error Callback"):
+            def good_listner_func(updates: Dict[Table, TableUpdate], is_replay: bool) -> None:
+                pass
+
+            error_caught = False
+            mlh = merged_listen([t1, t2, t3], good_listner_func, on_error=on_error)
+            t1.await_update()
+            self.assertFalse(error_caught)
+            self.assertFalse(mlh.j_object.isFailed())
+
+        with self.subTest("Bad Listener Bad Error Callback"):
+            def bad_listner_func(updates: Dict[Table, TableUpdate], is_replay: bool) -> None:
+                raise ValueError("invalid value")
+
+            def bad_on_error(e: Exception) -> None:
+                nonlocal error_caught
+                error_caught = True
+                self.assertIn("invalid value", str(e))
+                raise ValueError("reraise the exception") from e
+
+            error_caught = False
+            mlh = merged_listen([t1, t2, t3], bad_listner_func, on_error=bad_on_error)
+            t1.await_update()
+            self.assertTrue(error_caught)
+            self.assertTrue(mlh.j_object.isFailed())
+
+        t1 = t2 = t3 = None
+
+    def test_on_error_merged_listener_obj(self):
+        test_self = self
+        t1 = time_table("PT1s").update(["X=i % 11"])
+        t2 = time_table("PT2s").update(["Y=i % 8"])
+        t3 = time_table("PT3s").update(["Z=i % 5"])
+
+        with self.subTest("Bad Listener Good Error Callback"):
+            class BadListener(MergedListener):
+                def on_update(self, updates: Dict[Table, TableUpdate], is_replay: bool) -> None:
+                    raise ValueError("invalid value")
+
+                def on_error(self, e: Exception) -> None:
+                    nonlocal error_caught
+                    error_caught = True
+                    test_self.assertIn("invalid value", str(e))
+
+            error_caught = False
+            bad_listener_obj = BadListener()
+            mlh = merged_listen([t1, t2, t3], bad_listener_obj)
+            t1.await_update()
+            self.assertTrue(error_caught)
+            self.assertTrue(mlh.j_object.isFailed())
+
+            with self.assertRaises(DHError):
+                def on_error(e: Exception) -> None:
+                    ...
+                tlh = merged_listen([t1, t2, t3], bad_listener_obj, on_error=on_error)
+
+
+        with self.subTest("Good Listener Good Error Callback"):
+            class GoodListener(MergedListener):
+                def on_update(self, updates: Dict[Table, TableUpdate], is_replay: bool) -> None:
+                    ...
+
+                def on_error(self, e: Exception) -> None:
+                    nonlocal error_caught
+                    error_caught = True
+                    test_self.assertIn("invalid value", str(e))
+
+            error_caught = False
+            good_listener_obj = GoodListener()
+            mlh = merged_listen([t1, t2, t3], good_listener_obj)
+            t1.await_update()
+            self.assertFalse(error_caught)
+            self.assertFalse(mlh.j_object.isFailed())
+
+        with self.subTest("Bad Listener Bad Error Callback"):
+            class BadListener(MergedListener):
+                def on_update(self, updates: Dict[Table, TableUpdate], is_replay: bool) -> None:
+                    raise ValueError("invalid value")
+
+                def on_error(self, e: Exception) -> None:
+                    nonlocal error_caught
+                    error_caught = True
+                    test_self.assertIn("invalid value", str(e))
+                    raise ValueError("reraise the exception") from e
+
+            error_caught = False
+            bad_listener_obj = BadListener()
+            mlh = merged_listen([t1, t2, t3], bad_listener_obj)
+            t1.await_update()
+            self.assertTrue(error_caught)
+            self.assertTrue(mlh.j_object.isFailed())
+
+        t1 = t2 = t3 = None
+
+    def test_default_on_error(self):
+        t = time_table("PT1S").update("X = i")
+
+        def bad_listner_func(table_udpate, is_replay: bool) -> None:
+            raise ValueError("invalid value")
+
+        error_caught = False
+        tlh = listen(t, bad_listner_func)
+        t.await_update()
+        # the default on_error only logs the error
+        self.assertFalse(error_caught)
+        self.assertTrue(tlh.j_object.isFailed())
+
+        class BadListener(TableListener):
+            def on_update(self, update, is_replay):
+                raise ValueError("invalid value")
+
+        tlh = listen(t, BadListener())
+        t.await_update()
+        # the default on_error only logs the error
+        self.assertFalse(error_caught)
+        self.assertTrue(tlh.j_object.isFailed())
+
+        t2 = time_table("PT1S").update("X = i")
+        def bad_listner_func(updates: Dict[Table, TableUpdate], is_replay: bool) -> None:
+            raise ValueError("invalid value")
+
+        mlh = merged_listen([t, t2], bad_listner_func)
+        t.await_update()
+        # the default on_error only logs the error
+        self.assertFalse(error_caught)
+        self.assertTrue(mlh.j_object.isFailed())
+
+        class BadListener(MergedListener):
+            def on_update(self, updates: Dict[Table, TableUpdate], is_replay: bool) -> None:
+                raise ValueError("invalid value")
+
+        mlh = merged_listen([t, t2], BadListener())
+        t.await_update()
+        # the default on_error only logs the error
+        self.assertFalse(error_caught)
+        self.assertTrue(mlh.j_object.isFailed())
+
+        t = t2 = None
+
 
 if __name__ == "__main__":
     unittest.main()
diff --git a/py/server/tests/test_udf_scalar_args.py b/py/server/tests/test_udf_scalar_args.py
index 1eebdd914a2..8f360a364e8 100644
--- a/py/server/tests/test_udf_scalar_args.py
+++ b/py/server/tests/test_udf_scalar_args.py
@@ -609,9 +609,26 @@ def f(p1: float, p2: np.float64) -> bool:
         dv = 0.05
         with warnings.catch_warnings(record=True) as w:
             t = empty_table(10).update("X = f(dv, dv)")
-            self.assertEqual(w[-1].category, UserWarning)
-            self.assertRegex(str(w[-1].message), "numpy scalar type.*is used")
-            self.assertEqual(10, t.to_string().count("true"))
+        self.assertEqual(w[-1].category, UserWarning)
+        self.assertRegex(str(w[-1].message), "numpy scalar type.*is used")
+        self.assertEqual(10, t.to_string().count("true"))
+
+    def test_no_signature(self):
+        builtin_max = max
+        t = empty_table(10).update("X = (int) builtin_max(1, 2, 3)")
+        self.assertEqual(t.columns[0].data_type, dtypes.int32)
+        self.assertEqual(10, t.to_string().count("3"))
+
+    def test_no_name(self):
+        from functools import partial
+        def fn(i: int, z: int) -> int:
+            return i * 5 - z
+        local_fn = partial(fn, z=5)
+
+        t = empty_table(5).update("col=i*2")
+        t = t.update('col2=local_fn(col)')
+        self.assertEqual(t.columns[1].data_type, dtypes.int64)
+        self.assertEqual(5, t.size)
 
 
 if __name__ == "__main__":
diff --git a/py/server/tests/test_updateby.py b/py/server/tests/test_updateby.py
index e4ecbc2aae2..150d41d51e5 100644
--- a/py/server/tests/test_updateby.py
+++ b/py/server/tests/test_updateby.py
@@ -157,12 +157,20 @@ def setUpClass(cls) -> None:
             rolling_formula_tick(formula="sum(x)", formula_param="x", cols=["formula_a = a", "formula_d = d"], rev_ticks=10),
             rolling_formula_tick(formula="avg(x)", formula_param="x", cols=["formula_a = a", "formula_d = d"], rev_ticks=10, fwd_ticks=10),
             rolling_formula_time(formula="sum(x)", formula_param="x", ts_col="Timestamp", cols=["formula_b = b", "formula_e = e"], rev_time="PT00:00:10"),
-            rolling_formula_time(formula="avg(x)", formula_param="x", ts_col="Timestamp", cols=["formula_b = b", "formula_e = e"], rev_time=10_000_000_000,
-                             fwd_time=-10_000_000_00),
-            rolling_formula_time(formula="sum(x)", formula_param="x", ts_col="Timestamp", cols=["formula_b = b", "formula_e = e"], rev_time="PT30S",
-                             fwd_time="-PT00:00:20"),
+            rolling_formula_time(formula="avg(x)", formula_param="x", ts_col="Timestamp", cols=["formula_b = b", "formula_e = e"], rev_time=10_000_000_000, fwd_time=-10_000_000_00),
+            rolling_formula_time(formula="sum(x)", formula_param="x", ts_col="Timestamp", cols=["formula_b = b", "formula_e = e"], rev_time="PT30S", fwd_time="-PT00:00:20"),
         ]
 
+        # Rolling Operators list shared with test_rolling_ops / test_rolling_ops_proxy that produce a single output column
+        cls.rolling_ops_one_output = [
+            rolling_formula_tick(formula="formula_ad=sum(a) + sum(d)", rev_ticks=10),
+            rolling_formula_tick(formula="formula_ad=avg(a) + avg(b)", rev_ticks=10, fwd_ticks=10),
+            rolling_formula_time(formula="formula_be=sum(b) + sum(e)", ts_col="Timestamp", rev_time="PT00:00:10"),
+            rolling_formula_time(formula="formula_be=avg(b) + avg(e)", ts_col="Timestamp", rev_time=10_000_000_000, fwd_time=-10_000_000_00),
+            rolling_formula_time(formula="formula_be=sum(b) + sum(b)", ts_col="Timestamp", rev_time="PT30S", fwd_time="-PT00:00:20"),
+        ]
+
+
     @classmethod
     def tearDownClass(cls) -> None:
         del cls.em_op_ctrl
@@ -177,7 +185,7 @@ def test_em(self):
                 for t in (self.static_table, self.ticking_table):
                     rt = t.update_by(ops=op, by="b")
                     self.assertTrue(rt.is_refreshing is t.is_refreshing)
-                    self.assertEqual(len(rt.columns), 1 + len(t.columns))
+                    self.assertEqual(len(rt.definition), 1 + len(t.definition))
                     with update_graph.exclusive_lock(self.test_update_graph):
                         self.assertEqual(rt.size, t.size)
 
@@ -192,7 +200,7 @@ def test_em_proxy(self):
                     rt_proxy = pt_proxy.update_by(op, by="e")
                     for ct, rct in zip(pt_proxy.target.constituent_tables, rt_proxy.target.constituent_tables):
                         self.assertTrue(rct.is_refreshing is ct.is_refreshing)
-                        self.assertEqual(len(rct.columns), 1 + len(ct.columns))
+                        self.assertEqual(len(rct.definition), 1 + len(ct.definition))
                         with update_graph.exclusive_lock(self.test_update_graph):
                             self.assertEqual(ct.size, rct.size)                        
 
@@ -202,7 +210,7 @@ def test_simple_ops(self):
                 for t in (self.static_table, self.ticking_table):
                     rt = t.update_by(ops=op, by="e")
                     self.assertTrue(rt.is_refreshing is t.is_refreshing)
-                    self.assertEqual(len(rt.columns), 2 + len(t.columns))
+                    self.assertEqual(len(rt.definition), 2 + len(t.definition))
                     with update_graph.exclusive_lock(self.test_update_graph):
                         self.assertEqual(rt.size, t.size)
 
@@ -225,12 +233,22 @@ def test_simple_ops_proxy(self):
                             self.assertEqual(ct.size, rct.size)
 
     def test_rolling_ops(self):
+        # Test rolling operators that produce 2 output columns
         for op in self.rolling_ops:
             with self.subTest(op):
                 for t in (self.static_table, self.ticking_table):
                     rt = t.update_by(ops=op, by="c")
                     self.assertTrue(rt.is_refreshing is t.is_refreshing)
-                    self.assertEqual(len(rt.columns), 2 + len(t.columns))
+                    self.assertEqual(len(rt.definition), 2 + len(t.definition))
+                    with update_graph.exclusive_lock(self.test_update_graph):
+                        self.assertEqual(rt.size, t.size)
+        # Test rolling operators that produce a single output column
+        for op in self.rolling_ops_one_output:
+            with self.subTest(op):
+                for t in (self.static_table, self.ticking_table):
+                    rt = t.update_by(ops=op, by="c")
+                    self.assertTrue(rt.is_refreshing is t.is_refreshing)
+                    self.assertEqual(len(rt.definition), 1 + len(t.definition))
                     with update_graph.exclusive_lock(self.test_update_graph):
                         self.assertEqual(rt.size, t.size)
 
@@ -239,13 +257,24 @@ def test_rolling_ops_proxy(self):
                       self.ticking_table.partition_by("b").proxy(),
                       ]
 
+        # Test rolling operators that produce 2 output columns
         for op in self.rolling_ops:
             with self.subTest(op):
                 for pt_proxy in pt_proxies:
                     rt_proxy = pt_proxy.update_by(op, by="c")
                     for ct, rct in zip(pt_proxy.target.constituent_tables, rt_proxy.target.constituent_tables):
                         self.assertTrue(rct.is_refreshing is ct.is_refreshing)
-                        self.assertEqual(len(rct.columns), 2 + len(ct.columns))
+                        self.assertEqual(len(rct.definition), 2 + len(ct.definition))
+                        with update_graph.exclusive_lock(self.test_update_graph):
+                            self.assertEqual(ct.size, rct.size)
+        # Test rolling operators that produce a single output column
+        for op in self.rolling_ops_one_output:
+            with self.subTest(op):
+                for pt_proxy in pt_proxies:
+                    rt_proxy = pt_proxy.update_by(op, by="c")
+                    for ct, rct in zip(pt_proxy.target.constituent_tables, rt_proxy.target.constituent_tables):
+                        self.assertTrue(rct.is_refreshing is ct.is_refreshing)
+                        self.assertEqual(len(rct.definition), 1 + len(ct.definition))
                         with update_graph.exclusive_lock(self.test_update_graph):
                             self.assertEqual(ct.size, rct.size)
 
@@ -260,7 +289,7 @@ def test_multiple_ops(self):
         for t in (self.static_table, self.ticking_table):
             rt = t.update_by(ops=multiple_ops, by="c")
             self.assertTrue(rt.is_refreshing is t.is_refreshing)
-            self.assertEqual(len(rt.columns), 10 + len(t.columns))
+            self.assertEqual(len(rt.definition), 10 + len(t.definition))
             with update_graph.exclusive_lock(self.test_update_graph):
                 self.assertEqual(rt.size, t.size)
 
diff --git a/py/server/tests/test_vectorization.py b/py/server/tests/test_vectorization.py
index ebac32aff93..7039ebceb38 100644
--- a/py/server/tests/test_vectorization.py
+++ b/py/server/tests/test_vectorization.py
@@ -234,7 +234,7 @@ def my_sum(*args):
 
         source = new_table([int_col(c, [0, 1, 2, 3, 4, 5, 6]) for c in cols])
         result = source.update(f"X = my_sum({','.join(cols)})")
-        self.assertEqual(len(cols) + 1, len(result.columns))
+        self.assertEqual(len(cols) + 1, len(result.definition))
         self.assertEqual(_udf.vectorized_count, 0)
 
     def test_enclosed_by_parentheses(self):
@@ -342,5 +342,15 @@ def f3(p1: np.ndarray[np.bool_]) -> np.ndarray[np.bool_]:
             self.assertEqual(_udf.vectorized_count, 1)
             _udf.vectorized_count = 0
 
+    def test_no_signature_array(self):
+        builtin_max = max
+
+        t = empty_table(10).update(["X = i % 3", "Y = i % 2 == 0? `deephaven`: `rocks`"]).group_by("X").update("Y = Y.toArray()")
+        t1 = t.update(["X1 = builtin_max(Y)"])
+        self.assertEqual(t1.columns[2].data_type, dtypes.JObject)
+        self.assertEqual(_udf.vectorized_count, 0)
+        _udf.vectorized_count = 0
+
+
 if __name__ == "__main__":
     unittest.main()
diff --git a/py/server/tests/testbase.py b/py/server/tests/testbase.py
index 14049a62be5..3b26a0bc3b7 100644
--- a/py/server/tests/testbase.py
+++ b/py/server/tests/testbase.py
@@ -10,16 +10,13 @@
 from deephaven.liveness_scope import liveness_scope
 
 from deephaven.update_graph import exclusive_lock
-from deephaven.table import Table, PartitionedTableProxy
+from deephaven.table import Table, PartitionedTableProxy, table_diff
 
 from test_helper import py_dh_session
 
-_JTableTools = jpy.get_type("io.deephaven.engine.util.TableTools")
-
-
 def table_equals(table_a: Table, table_b: Table) -> bool:
     try:
-        return False if _JTableTools.diff(table_a.j_table, table_b.j_table, 1) else True
+        return False if table_diff(table_a, table_b, 1) else True
     except Exception as e:
         raise DHError(e, "table equality test failed.") from e
 
diff --git a/qst/build.gradle b/qst/build.gradle
index 823fc46d03e..83b2b504349 100644
--- a/qst/build.gradle
+++ b/qst/build.gradle
@@ -10,12 +10,13 @@ dependencies {
     api project(':table-api')
     implementation project(':engine-query-constants')
 
-    Classpaths.inheritImmutables(project)
+    compileOnly project(':util-immutables')
+    annotationProcessor libs.immutables.value
 
-    Classpaths.inheritJUnitPlatform(project)
-    Classpaths.inheritAssertJ(project)
-    testImplementation 'org.junit.jupiter:junit-jupiter'
-    testRuntimeOnly 'org.junit.platform:junit-platform-launcher'
+    testImplementation libs.assertj
+    testImplementation platform(libs.junit.bom)
+    testImplementation libs.junit.jupiter
+    testRuntimeOnly libs.junit.platform.launcher
 }
 
 test {
diff --git a/qst/graphviz/build.gradle b/qst/graphviz/build.gradle
index aa097620ffa..8ff3d3bd868 100644
--- a/qst/graphviz/build.gradle
+++ b/qst/graphviz/build.gradle
@@ -8,16 +8,16 @@ description = "Converts a list of QSTs into other formats."
 dependencies {
     implementation project(':qst')
 
-    implementation 'guru.nidi:graphviz-java:0.18.1'
+    implementation libs.nidi.graphviz.java
 
-    implementation 'info.picocli:picocli:4.6.1'
+    implementation libs.picocli
 
-    Classpaths.inheritJUnitPlatform(project)
-    Classpaths.inheritAssertJ(project)
-    testImplementation 'org.junit.jupiter:junit-jupiter'
-    testRuntimeOnly 'org.junit.platform:junit-platform-launcher'
+    testImplementation libs.assertj
+    testImplementation platform(libs.junit.bom)
+    testImplementation libs.junit.jupiter
+    testRuntimeOnly libs.junit.platform.launcher
 
-    Classpaths.inheritLogbackClassic(project, 'implementation')
+    implementation libs.logback.classic
 }
 
 test {
diff --git a/qst/src/main/java/io/deephaven/qst/TableAdapterImpl.java b/qst/src/main/java/io/deephaven/qst/TableAdapterImpl.java
index b065b14d69c..fa65aa036ff 100644
--- a/qst/src/main/java/io/deephaven/qst/TableAdapterImpl.java
+++ b/qst/src/main/java/io/deephaven/qst/TableAdapterImpl.java
@@ -7,8 +7,43 @@
 import io.deephaven.api.TableOperations;
 import io.deephaven.api.agg.spec.AggSpec;
 import io.deephaven.qst.TableAdapterResults.Output;
-import io.deephaven.qst.table.*;
+import io.deephaven.qst.table.AggregateAllTable;
+import io.deephaven.qst.table.AggregateTable;
+import io.deephaven.qst.table.AsOfJoinTable;
+import io.deephaven.qst.table.DropColumnsTable;
+import io.deephaven.qst.table.EmptyTable;
+import io.deephaven.qst.table.ExactJoinTable;
+import io.deephaven.qst.table.HeadTable;
+import io.deephaven.qst.table.InputTable;
+import io.deephaven.qst.table.JoinTable;
+import io.deephaven.qst.table.LazyUpdateTable;
+import io.deephaven.qst.table.MergeTable;
+import io.deephaven.qst.table.MultiJoinInput;
+import io.deephaven.qst.table.MultiJoinTable;
+import io.deephaven.qst.table.NaturalJoinTable;
+import io.deephaven.qst.table.NewTable;
+import io.deephaven.qst.table.ParentsVisitor;
+import io.deephaven.qst.table.RangeJoinTable;
+import io.deephaven.qst.table.ReverseTable;
+import io.deephaven.qst.table.SelectDistinctTable;
+import io.deephaven.qst.table.SelectTable;
+import io.deephaven.qst.table.SingleParentTable;
+import io.deephaven.qst.table.SliceTable;
+import io.deephaven.qst.table.SnapshotTable;
+import io.deephaven.qst.table.SnapshotWhenTable;
+import io.deephaven.qst.table.SortTable;
+import io.deephaven.qst.table.TableSpec;
 import io.deephaven.qst.table.TableSpec.Visitor;
+import io.deephaven.qst.table.TailTable;
+import io.deephaven.qst.table.TicketTable;
+import io.deephaven.qst.table.TimeTable;
+import io.deephaven.qst.table.UngroupTable;
+import io.deephaven.qst.table.UpdateByTable;
+import io.deephaven.qst.table.UpdateTable;
+import io.deephaven.qst.table.UpdateViewTable;
+import io.deephaven.qst.table.ViewTable;
+import io.deephaven.qst.table.WhereInTable;
+import io.deephaven.qst.table.WhereTable;
 
 import java.util.Collections;
 import java.util.LinkedHashMap;
@@ -98,6 +133,22 @@ public Void visit(TimeTable timeTable) {
         return null;
     }
 
+    @Override
+    public Void visit(MultiJoinTable multiJoinTable) {
+        final List<MultiJoinInput<TABLE>> inputs =
+                multiJoinTable.inputs().stream().map(this::adapt).collect(Collectors.toList());
+        addTable(multiJoinTable, tableCreation.multiJoin(inputs));
+        return null;
+    }
+
+    private MultiJoinInput<TABLE> adapt(MultiJoinInput<TableSpec> input) {
+        return MultiJoinInput.<TABLE>builder()
+                .table(table(input.table()))
+                .addAllMatches(input.matches())
+                .addAllAdditions(input.additions())
+                .build();
+    }
+
     @Override
     public Void visit(MergeTable mergeTable) {
         List<TABLE> tables =
@@ -118,6 +169,13 @@ public Void visit(TailTable tailTable) {
         return null;
     }
 
+    @Override
+    public Void visit(SliceTable sliceTable) {
+        addOp(sliceTable,
+                parentOps(sliceTable).slice(sliceTable.firstPositionInclusive(), sliceTable.lastPositionExclusive()));
+        return null;
+    }
+
     @Override
     public Void visit(ReverseTable reverseTable) {
         addOp(reverseTable, parentOps(reverseTable).reverse());
diff --git a/qst/src/main/java/io/deephaven/qst/TableCreator.java b/qst/src/main/java/io/deephaven/qst/TableCreator.java
index 30f5a6355f3..c5d8e61a795 100644
--- a/qst/src/main/java/io/deephaven/qst/TableCreator.java
+++ b/qst/src/main/java/io/deephaven/qst/TableCreator.java
@@ -7,6 +7,7 @@
 import io.deephaven.qst.column.Column;
 import io.deephaven.qst.table.EmptyTable;
 import io.deephaven.qst.table.InputTable;
+import io.deephaven.qst.table.MultiJoinInput;
 import io.deephaven.qst.table.NewTable;
 import io.deephaven.qst.table.TableSpec;
 import io.deephaven.qst.table.TicketTable;
@@ -16,6 +17,7 @@
 import java.time.Duration;
 import java.time.Instant;
 import java.util.Arrays;
+import java.util.List;
 import java.util.stream.Stream;
 
 /**
@@ -99,6 +101,14 @@ static <TOPS extends TableOperations<TOPS, TABLE>, TABLE> TableAdapterResults<TO
      */
     TABLE of(InputTable inputTable);
 
+    /**
+     * Creates a multi join table.
+     *
+     * @param inputs the inputs
+     * @return the multi join table
+     */
+    TABLE multiJoin(List<MultiJoinInput<TABLE>> inputs);
+
     /**
      * Merges the given {@code tables}.
      *
diff --git a/qst/src/main/java/io/deephaven/qst/TableCreatorDelegate.java b/qst/src/main/java/io/deephaven/qst/TableCreatorDelegate.java
new file mode 100644
index 00000000000..be0e59c9f2e
--- /dev/null
+++ b/qst/src/main/java/io/deephaven/qst/TableCreatorDelegate.java
@@ -0,0 +1,57 @@
+//
+// Copyright (c) 2016-2024 Deephaven Data Labs and Patent Pending
+//
+package io.deephaven.qst;
+
+import io.deephaven.qst.table.EmptyTable;
+import io.deephaven.qst.table.InputTable;
+import io.deephaven.qst.table.MultiJoinInput;
+import io.deephaven.qst.table.NewTable;
+import io.deephaven.qst.table.TicketTable;
+import io.deephaven.qst.table.TimeTable;
+
+import java.util.List;
+import java.util.Objects;
+
+public abstract class TableCreatorDelegate<TABLE> implements TableCreator<TABLE> {
+    private final TableCreator<TABLE> delegate;
+
+    public TableCreatorDelegate(TableCreator<TABLE> delegate) {
+        this.delegate = Objects.requireNonNull(delegate);
+    }
+
+    @Override
+    public TABLE of(NewTable newTable) {
+        return delegate.of(newTable);
+    }
+
+    @Override
+    public TABLE of(EmptyTable emptyTable) {
+        return delegate.of(emptyTable);
+    }
+
+    @Override
+    public TABLE of(TimeTable timeTable) {
+        return delegate.of(timeTable);
+    }
+
+    @Override
+    public TABLE of(TicketTable ticketTable) {
+        return delegate.of(ticketTable);
+    }
+
+    @Override
+    public TABLE of(InputTable inputTable) {
+        return delegate.of(inputTable);
+    }
+
+    @Override
+    public TABLE multiJoin(List<MultiJoinInput<TABLE>> multiJoinInputs) {
+        return delegate.multiJoin(multiJoinInputs);
+    }
+
+    @Override
+    public TABLE merge(Iterable<TABLE> tables) {
+        return delegate.merge(tables);
+    }
+}
diff --git a/qst/src/main/java/io/deephaven/qst/table/MultiJoinInput.java b/qst/src/main/java/io/deephaven/qst/table/MultiJoinInput.java
new file mode 100644
index 00000000000..61f9fc2bd85
--- /dev/null
+++ b/qst/src/main/java/io/deephaven/qst/table/MultiJoinInput.java
@@ -0,0 +1,67 @@
+//
+// Copyright (c) 2016-2024 Deephaven Data Labs and Patent Pending
+//
+package io.deephaven.qst.table;
+
+import io.deephaven.annotations.BuildableStyle;
+import io.deephaven.api.JoinAddition;
+import io.deephaven.api.JoinMatch;
+import org.immutables.value.Value.Check;
+import org.immutables.value.Value.Immutable;
+
+import java.util.List;
+
+@Immutable
+@BuildableStyle
+public abstract class MultiJoinInput<T> {
+
+    public static <T> Builder<T> builder() {
+        return ImmutableMultiJoinInput.builder();
+    }
+
+    public static <T> MultiJoinInput<T> of(T table, String columnsToMatch, String columnsToAdd) {
+        final Builder<T> builder = builder();
+        builder.table(table);
+        if (columnsToMatch != null) {
+            builder.addAllMatches(JoinMatch.from(columnsToMatch.split(",")));
+        }
+        if (columnsToAdd != null) {
+            builder.addAllAdditions(JoinAddition.from(columnsToAdd.split(",")));
+        }
+        return builder.build();
+    }
+
+    public abstract T table();
+
+    public abstract List<JoinMatch> matches();
+
+    public abstract List<JoinAddition> additions();
+
+    @Check
+    final void checkAdditions() {
+        if (additions().stream().map(JoinAddition::newColumn).distinct().count() != additions()
+                .size()) {
+            throw new IllegalArgumentException(
+                    "Invalid MultiJoinInput additions, must not use the same output column multiple times.");
+        }
+    }
+
+    public interface Builder<T> {
+
+        Builder<T> table(T table);
+
+        Builder<T> addMatches(JoinMatch element);
+
+        Builder<T> addMatches(JoinMatch... elements);
+
+        Builder<T> addAllMatches(Iterable<? extends JoinMatch> elements);
+
+        Builder<T> addAdditions(JoinAddition element);
+
+        Builder<T> addAdditions(JoinAddition... elements);
+
+        Builder<T> addAllAdditions(Iterable<? extends JoinAddition> elements);
+
+        MultiJoinInput<T> build();
+    }
+}
diff --git a/qst/src/main/java/io/deephaven/qst/table/MultiJoinTable.java b/qst/src/main/java/io/deephaven/qst/table/MultiJoinTable.java
new file mode 100644
index 00000000000..07c394ce7e5
--- /dev/null
+++ b/qst/src/main/java/io/deephaven/qst/table/MultiJoinTable.java
@@ -0,0 +1,89 @@
+//
+// Copyright (c) 2016-2024 Deephaven Data Labs and Patent Pending
+//
+package io.deephaven.qst.table;
+
+import io.deephaven.annotations.BuildableStyle;
+import io.deephaven.api.JoinAddition;
+import io.deephaven.api.JoinMatch;
+import org.immutables.value.Value.Check;
+import org.immutables.value.Value.Immutable;
+
+import java.util.Collection;
+import java.util.List;
+
+@BuildableStyle
+@Immutable
+public abstract class MultiJoinTable extends TableBase {
+
+    public static Builder builder() {
+        return ImmutableMultiJoinTable.builder();
+    }
+
+    public static MultiJoinTable of(MultiJoinInput<TableSpec>... elements) {
+        return builder().addInputs(elements).build();
+    }
+
+    public static MultiJoinTable of(Iterable<? extends MultiJoinInput<TableSpec>> elements) {
+        return builder().addAllInputs(elements).build();
+    }
+
+    public static MultiJoinTable from(String columnsToMatch, TableSpec... inputs) {
+        return of(inputs, JoinMatch.from(columnsToMatch.split(",")));
+    }
+
+    public static MultiJoinTable from(Collection<String> columnsToMatch, TableSpec... inputs) {
+        return of(inputs, JoinMatch.from(columnsToMatch));
+    }
+
+    public abstract List<MultiJoinInput<TableSpec>> inputs();
+
+    @Override
+    public final <T> T walk(Visitor<T> visitor) {
+        return visitor.visit(this);
+    }
+
+    public interface Builder {
+        Builder addInputs(MultiJoinInput<TableSpec> element);
+
+        Builder addInputs(MultiJoinInput<TableSpec>... elements);
+
+        Builder addAllInputs(Iterable<? extends MultiJoinInput<TableSpec>> elements);
+
+        MultiJoinTable build();
+    }
+
+    @Check
+    final void checkInputs() {
+        if (inputs().isEmpty()) {
+            throw new IllegalArgumentException("MultiJoin inputs must be non-empty");
+        }
+    }
+
+    @Check
+    final void checkAdditions() {
+        if (inputs().stream()
+                .map(MultiJoinInput::additions)
+                .flatMap(Collection::stream)
+                .map(JoinAddition::newColumn)
+                .distinct()
+                .count() != inputs().stream()
+                        .map(MultiJoinInput::additions)
+                        .mapToLong(Collection::size)
+                        .sum()) {
+            throw new IllegalArgumentException(
+                    "Invalid MultiJoin additions, must not use the same output column multiple times.");
+        }
+    }
+
+    private static MultiJoinTable of(TableSpec[] inputs, List<JoinMatch> matches) {
+        final Builder builder = builder();
+        for (TableSpec input : inputs) {
+            builder.addInputs(MultiJoinInput.<TableSpec>builder()
+                    .table(input)
+                    .addAllMatches(matches)
+                    .build());
+        }
+        return builder.build();
+    }
+}
diff --git a/qst/src/main/java/io/deephaven/qst/table/ParentsVisitor.java b/qst/src/main/java/io/deephaven/qst/table/ParentsVisitor.java
index e25f5b0873f..65d19bfe997 100644
--- a/qst/src/main/java/io/deephaven/qst/table/ParentsVisitor.java
+++ b/qst/src/main/java/io/deephaven/qst/table/ParentsVisitor.java
@@ -8,7 +8,6 @@
 import java.util.ArrayDeque;
 import java.util.ArrayList;
 import java.util.Comparator;
-import java.util.HashSet;
 import java.util.LinkedHashSet;
 import java.util.List;
 import java.util.Objects;
@@ -168,6 +167,11 @@ public Stream<TableSpec> visit(TailTable tailTable) {
         return single(tailTable);
     }
 
+    @Override
+    public Stream<TableSpec> visit(SliceTable sliceTable) {
+        return single(sliceTable);
+    }
+
     @Override
     public Stream<TableSpec> visit(ReverseTable reverseTable) {
         return single(reverseTable);
@@ -302,6 +306,11 @@ public Stream<TableSpec> visit(DropColumnsTable dropColumnsTable) {
         return single(dropColumnsTable);
     }
 
+    @Override
+    public Stream<TableSpec> visit(MultiJoinTable multiJoinTable) {
+        return multiJoinTable.inputs().stream().map(MultiJoinInput::table);
+    }
+
     private static class Search {
 
         private final Predicate<TableSpec> excludePaths;
diff --git a/qst/src/main/java/io/deephaven/qst/table/SliceTable.java b/qst/src/main/java/io/deephaven/qst/table/SliceTable.java
new file mode 100644
index 00000000000..eed7a54193f
--- /dev/null
+++ b/qst/src/main/java/io/deephaven/qst/table/SliceTable.java
@@ -0,0 +1,50 @@
+//
+// Copyright (c) 2016-2024 Deephaven Data Labs and Patent Pending
+//
+package io.deephaven.qst.table;
+
+import io.deephaven.annotations.NodeStyle;
+import org.immutables.value.Value.Check;
+import org.immutables.value.Value.Immutable;
+import org.immutables.value.Value.Parameter;
+
+@Immutable
+@NodeStyle
+public abstract class SliceTable extends TableBase implements SingleParentTable {
+
+    public static SliceTable of(TableSpec parent, long firstPositionInclusive, long lastPositionExclusive) {
+        return ImmutableSliceTable.of(parent, firstPositionInclusive, lastPositionExclusive);
+    }
+
+    @Parameter
+    public abstract TableSpec parent();
+
+    @Parameter
+    public abstract long firstPositionInclusive();
+
+    @Parameter
+    public abstract long lastPositionExclusive();
+
+    @Override
+    public final <T> T walk(Visitor<T> visitor) {
+        return visitor.visit(this);
+    }
+
+    @Check
+    final void checkPositions() {
+        if (firstPositionInclusive() >= 0 && lastPositionExclusive() >= 0
+                && lastPositionExclusive() < firstPositionInclusive()) {
+            throw new IllegalArgumentException(
+                    String.format(
+                            "Cannot slice with a non-negative start position (%d) that is after a non-negative end position (%d).",
+                            firstPositionInclusive(), lastPositionExclusive()));
+        }
+        if (firstPositionInclusive() < 0 && lastPositionExclusive() < 0
+                && lastPositionExclusive() < firstPositionInclusive()) {
+            throw new IllegalArgumentException(
+                    String.format(
+                            "Cannot slice with a negative start position (%d) that is after a negative end position (%d).",
+                            firstPositionInclusive(), lastPositionExclusive()));
+        }
+    }
+}
diff --git a/qst/src/main/java/io/deephaven/qst/table/StackTraceMixInCreator.java b/qst/src/main/java/io/deephaven/qst/table/StackTraceMixInCreator.java
index 3a7287fa1f5..3b460bcf0b6 100644
--- a/qst/src/main/java/io/deephaven/qst/table/StackTraceMixInCreator.java
+++ b/qst/src/main/java/io/deephaven/qst/table/StackTraceMixInCreator.java
@@ -8,9 +8,11 @@
 
 import java.util.Arrays;
 import java.util.HashMap;
+import java.util.List;
 import java.util.Map;
 import java.util.Objects;
 import java.util.Optional;
+import java.util.stream.Collectors;
 import java.util.stream.StreamSupport;
 
 public final class StackTraceMixInCreator<TOPS extends TableOperations<TOPS, TABLE>, TABLE>
@@ -77,6 +79,22 @@ public synchronized StackTraceMixIn<TOPS, TABLE> of(InputTable inputTable) {
         return map.computeIfAbsent(tops, this::mixin);
     }
 
+    @Override
+    public synchronized StackTraceMixIn<TOPS, TABLE> multiJoin(
+            List<MultiJoinInput<StackTraceMixIn<TOPS, TABLE>>> multiJoinInputs) {
+        final TABLE table = creator.multiJoin(multiJoinInputs.stream().map(this::adapt).collect(Collectors.toList()));
+        final TOPS tops = toOps.of(table);
+        return map.computeIfAbsent(tops, this::mixin);
+    }
+
+    private MultiJoinInput<TABLE> adapt(MultiJoinInput<StackTraceMixIn<TOPS, TABLE>> input) {
+        return MultiJoinInput.<TABLE>builder()
+                .table(input.table().table())
+                .addAllMatches(input.matches())
+                .addAllAdditions(input.additions())
+                .build();
+    }
+
     @Override
     public synchronized StackTraceMixIn<TOPS, TABLE> merge(
             Iterable<StackTraceMixIn<TOPS, TABLE>> stackTraceMixIns) {
diff --git a/qst/src/main/java/io/deephaven/qst/table/TableBase.java b/qst/src/main/java/io/deephaven/qst/table/TableBase.java
index 505c8fdb1e9..fbe2432345d 100644
--- a/qst/src/main/java/io/deephaven/qst/table/TableBase.java
+++ b/qst/src/main/java/io/deephaven/qst/table/TableBase.java
@@ -33,6 +33,11 @@ public final TableSpec tail(long size) {
         return TailTable.of(this, size);
     }
 
+    @Override
+    public final TableSpec slice(long firstPositionInclusive, long lastPositionExclusive) {
+        return SliceTable.of(this, firstPositionInclusive, lastPositionExclusive);
+    }
+
     @Override
     public final TableSpec reverse() {
         return ReverseTable.of(this);
diff --git a/qst/src/main/java/io/deephaven/qst/table/TableCreatorImpl.java b/qst/src/main/java/io/deephaven/qst/table/TableCreatorImpl.java
index b63628d5288..3d45ddcaa21 100644
--- a/qst/src/main/java/io/deephaven/qst/table/TableCreatorImpl.java
+++ b/qst/src/main/java/io/deephaven/qst/table/TableCreatorImpl.java
@@ -6,6 +6,8 @@
 import io.deephaven.api.TableOperations;
 import io.deephaven.qst.TableCreator;
 
+import java.util.List;
+
 /**
  * A "no-op" table creator impl, based on the QST structure itself. Mainly useful for testing the equivalence for the
  * {@link TableOperations} of {@link TableSpec}; but publicly available for functional completeness.
@@ -42,8 +44,13 @@ public final TableSpec of(InputTable inputTable) {
         return inputTable;
     }
 
+    @Override
+    public final MultiJoinTable multiJoin(List<MultiJoinInput<TableSpec>> multiJoinInputs) {
+        return MultiJoinTable.builder().addAllInputs(multiJoinInputs).build();
+    }
+
     @Override
     public final MergeTable merge(Iterable<TableSpec> tables) {
-        return ImmutableMergeTable.builder().addAllTables(tables).build();
+        return MergeTable.builder().addAllTables(tables).build();
     }
 }
diff --git a/qst/src/main/java/io/deephaven/qst/table/TableLabelVisitor.java b/qst/src/main/java/io/deephaven/qst/table/TableLabelVisitor.java
index 47b3bdec247..d336f589631 100644
--- a/qst/src/main/java/io/deephaven/qst/table/TableLabelVisitor.java
+++ b/qst/src/main/java/io/deephaven/qst/table/TableLabelVisitor.java
@@ -64,6 +64,11 @@ public String visit(TailTable tailTable) {
         return "tail(" + tailTable.size() + ")";
     }
 
+    @Override
+    public String visit(SliceTable sliceTable) {
+        return String.format("slice(%d,%d)", sliceTable.firstPositionInclusive(), sliceTable.lastPositionExclusive());
+    }
+
     @Override
     public String visit(NaturalJoinTable naturalJoinTable) {
         return join("naturalJoin", naturalJoinTable);
@@ -202,6 +207,11 @@ public String visit(SnapshotTable snapshotTable) {
         return "snapshot()";
     }
 
+    @Override
+    public String visit(MultiJoinTable multiJoinTable) {
+        return "multiJoin()";
+    }
+
     private String join(String name, Join j) {
         return String.format("%s([%s],[%s])",
                 name,
diff --git a/qst/src/main/java/io/deephaven/qst/table/TableSpec.java b/qst/src/main/java/io/deephaven/qst/table/TableSpec.java
index f926bb40d39..7d23b79a823 100644
--- a/qst/src/main/java/io/deephaven/qst/table/TableSpec.java
+++ b/qst/src/main/java/io/deephaven/qst/table/TableSpec.java
@@ -102,6 +102,8 @@ interface Visitor<T> {
 
         T visit(TailTable tailTable);
 
+        T visit(SliceTable sliceTable);
+
         T visit(ReverseTable reverseTable);
 
         T visit(SortTable sortTable);
@@ -149,5 +151,7 @@ interface Visitor<T> {
         T visit(UngroupTable ungroupTable);
 
         T visit(DropColumnsTable dropColumnsTable);
+
+        T visit(MultiJoinTable multiJoinTable);
     }
 }
diff --git a/qst/src/main/java/io/deephaven/qst/table/TableVisitorGeneric.java b/qst/src/main/java/io/deephaven/qst/table/TableVisitorGeneric.java
index cc02f4f46e0..0514fefa67f 100644
--- a/qst/src/main/java/io/deephaven/qst/table/TableVisitorGeneric.java
+++ b/qst/src/main/java/io/deephaven/qst/table/TableVisitorGeneric.java
@@ -37,6 +37,11 @@ public T visit(TailTable tailTable) {
         return accept(tailTable);
     }
 
+    @Override
+    public T visit(SliceTable sliceTable) {
+        return accept(sliceTable);
+    }
+
     @Override
     public T visit(ReverseTable reverseTable) {
         return accept(reverseTable);
@@ -156,4 +161,9 @@ public T visit(UngroupTable ungroupTable) {
     public T visit(DropColumnsTable dropColumnsTable) {
         return accept(dropColumnsTable);
     }
+
+    @Override
+    public T visit(MultiJoinTable multiJoinTable) {
+        return accept(multiJoinTable);
+    }
 }
diff --git a/qst/src/test/java/io/deephaven/qst/table/MultiJoinTableTest.java b/qst/src/test/java/io/deephaven/qst/table/MultiJoinTableTest.java
new file mode 100644
index 00000000000..a850bef1e01
--- /dev/null
+++ b/qst/src/test/java/io/deephaven/qst/table/MultiJoinTableTest.java
@@ -0,0 +1,131 @@
+//
+// Copyright (c) 2016-2024 Deephaven Data Labs and Patent Pending
+//
+package io.deephaven.qst.table;
+
+import io.deephaven.api.ColumnName;
+import io.deephaven.api.JoinAddition;
+import io.deephaven.api.JoinMatch;
+import org.junit.jupiter.api.Test;
+
+import java.util.Arrays;
+import java.util.List;
+import java.util.function.Supplier;
+
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.assertj.core.api.Assertions.failBecauseExceptionWasNotThrown;
+
+public class MultiJoinTableTest {
+
+    @Test
+    void inputMissingTable() {
+        try {
+            MultiJoinInput.<TableSpec>builder().build();
+            failBecauseExceptionWasNotThrown(IllegalStateException.class);
+        } catch (IllegalStateException e) {
+            assertThat(e).hasMessageContaining("not set [table]");
+        }
+    }
+
+    @Test
+    void inputOverlappingAdditions() {
+        try {
+            MultiJoinInput.<TableSpec>builder()
+                    .table(TableSpec.empty(1))
+                    .addAdditions(ColumnName.of("Foo"))
+                    .addAdditions(ColumnName.of("Foo"))
+                    .build();
+            failBecauseExceptionWasNotThrown(IllegalArgumentException.class);
+        } catch (IllegalArgumentException e) {
+            assertThat(e).hasMessageContaining("must not use the same output column multiple times");
+        }
+    }
+
+    @Test
+    void input() {
+        final MultiJoinInput<TableSpec> input = MultiJoinInput.of(
+                TableSpec.empty(1),
+                "Foo,Bar=Baz",
+                "Bap,Bom=Blip");
+        assertThat(input.table()).isEqualTo(TableSpec.empty(1));
+        assertThat(input.matches()).containsExactly(
+                ColumnName.of("Foo"),
+                JoinMatch.of(ColumnName.of("Bar"), ColumnName.of("Baz")));
+        assertThat(input.additions()).containsExactly(
+                ColumnName.of("Bap"),
+                JoinAddition.of(ColumnName.of("Bom"), ColumnName.of("Blip")));
+    }
+
+    @Test
+    void emptyInputs() {
+        for (Supplier<MultiJoinTable> supplier : Arrays.<Supplier<MultiJoinTable>>asList(
+                () -> MultiJoinTable.builder().build(),
+                MultiJoinTable::of,
+                () -> MultiJoinTable.from("Key"),
+                () -> MultiJoinTable.from(List.of("Key1", "Key2")))) {
+            try {
+                supplier.get();
+                failBecauseExceptionWasNotThrown(IllegalArgumentException.class);
+            } catch (IllegalArgumentException e) {
+                assertThat(e).hasMessageContaining("MultiJoin inputs must be non-empty");
+            }
+        }
+    }
+
+    @Test
+    void overlappingAdditions() {
+        try {
+            MultiJoinTable.of(
+                    MultiJoinInput.<TableSpec>builder()
+                            .table(TableSpec.empty(1))
+                            .addAdditions(ColumnName.of("Foo"))
+                            .build(),
+                    MultiJoinInput.<TableSpec>builder()
+                            .table(TableSpec.empty(1))
+                            .addAdditions(ColumnName.of("Foo"))
+                            .build());
+            failBecauseExceptionWasNotThrown(IllegalArgumentException.class);
+        } catch (IllegalArgumentException e) {
+            assertThat(e).hasMessageContaining("must not use the same output column multiple times");
+        }
+    }
+
+    @Test
+    void keyHelpers() {
+        for (MultiJoinTable multiJoinTable : Arrays.asList(
+                MultiJoinTable.from(
+                        "Key,Key2=Key3",
+                        TableSpec.empty(1),
+                        TableSpec.empty(2)),
+                MultiJoinTable.from(
+                        List.of("Key", "Key2=Key3"),
+                        TableSpec.empty(1),
+                        TableSpec.empty(2)))) {
+            assertThat(multiJoinTable.inputs()).containsExactly(
+                    MultiJoinInput.<TableSpec>builder()
+                            .table(TableSpec.empty(1))
+                            .addMatches(
+                                    ColumnName.of("Key"),
+                                    JoinMatch.of(ColumnName.of("Key2"), ColumnName.of("Key3")))
+                            .build(),
+                    MultiJoinInput.<TableSpec>builder()
+                            .table(TableSpec.empty(2))
+                            .addMatches(
+                                    ColumnName.of("Key"),
+                                    JoinMatch.of(ColumnName.of("Key2"), ColumnName.of("Key3")))
+                            .build());
+        }
+    }
+
+    @Test
+    void multiJoinTable() {
+        final MultiJoinInput<TableSpec> i1 = MultiJoinInput.of(TableSpec.empty(1), "Foo", "Bar");
+        final MultiJoinInput<TableSpec> i2 = MultiJoinInput.of(TableSpec.empty(2), "Baz", "Bap");
+        for (MultiJoinTable mjt : Arrays.asList(
+                MultiJoinTable.builder().addInputs(i1).addInputs(i2).build(),
+                MultiJoinTable.of(i1, i2),
+                MultiJoinTable.of(List.of(i1, i2)))) {
+            assertThat(mjt.inputs()).containsExactly(i1, i2);
+        }
+    }
+}
diff --git a/qst/type/build.gradle b/qst/type/build.gradle
index 18143433a0f..6a31a0322c0 100644
--- a/qst/type/build.gradle
+++ b/qst/type/build.gradle
@@ -6,11 +6,13 @@ plugins {
 description = 'The Deephaven QST Types'
 
 dependencies {
-    Classpaths.inheritImmutables(project)
-    Classpaths.inheritJUnitPlatform(project)
-    Classpaths.inheritAssertJ(project)
-    testImplementation 'org.junit.jupiter:junit-jupiter'
-    testRuntimeOnly 'org.junit.platform:junit-platform-launcher'
+    compileOnly project(':util-immutables')
+    annotationProcessor libs.immutables.value
+
+    testImplementation libs.assertj
+    testImplementation platform(libs.junit.bom)
+    testImplementation libs.junit.jupiter
+    testRuntimeOnly libs.junit.platform.launcher
 }
 
 test {
diff --git a/replication/reflective/build.gradle b/replication/reflective/build.gradle
index d028ff2b738..c8bcd42ddbe 100644
--- a/replication/reflective/build.gradle
+++ b/replication/reflective/build.gradle
@@ -8,17 +8,20 @@ description 'Reflective Replicators: Source code generators and replicators with
 dependencies {
     implementation project(':replication-util')
     implementation project(':engine-table')
-    implementation 'com.squareup:javapoet:1.13.0'
-    implementation depTrove3
-    implementation depCommonsIo
-    implementation depCommonsLang3
+    implementation libs.squareup.javapoet
+    implementation libs.trove
+    implementation libs.commons.io
+    implementation libs.commons.lang3
 
     runtimeOnly project(':log-to-slf4j')
     runtimeOnly project(path: ':configs')
     runtimeOnly project(path: ':test-configs')
-    Classpaths.inheritSlf4j(project, 'slf4j-simple', 'runtimeOnly')
+    runtimeOnly libs.slf4j.simple
 
-    Classpaths.inheritArrow(project, 'arrow-vector', 'implementation')
+    implementation libs.arrow.vector
+
+    // needed at compile + runtime due to our use of code-generation at runtime
+    implementation libs.jetbrains.annotations
 }
 
 task replicateAll {
diff --git a/replication/reflective/src/main/java/io/deephaven/replicators/ReplicateTypedHashers.java b/replication/reflective/src/main/java/io/deephaven/replicators/ReplicateTypedHashers.java
index dbffd8f3a81..bb1d11e8d28 100644
--- a/replication/reflective/src/main/java/io/deephaven/replicators/ReplicateTypedHashers.java
+++ b/replication/reflective/src/main/java/io/deephaven/replicators/ReplicateTypedHashers.java
@@ -15,9 +15,7 @@
 import io.deephaven.engine.table.impl.multijoin.StaticMultiJoinStateManagerTypedBase;
 import io.deephaven.engine.table.impl.naturaljoin.RightIncrementalNaturalJoinStateManagerTypedBase;
 import io.deephaven.engine.table.impl.by.IncrementalChunkedOperatorAggregationStateManagerOpenAddressedBase;
-import io.deephaven.engine.table.impl.by.IncrementalChunkedOperatorAggregationStateManagerTypedBase;
 import io.deephaven.engine.table.impl.by.StaticChunkedOperatorAggregationStateManagerOpenAddressedBase;
-import io.deephaven.engine.table.impl.by.StaticChunkedOperatorAggregationStateManagerTypedBase;
 import io.deephaven.engine.table.impl.by.typed.HasherConfig;
 import io.deephaven.engine.table.impl.by.typed.TypedHasherFactory;
 import io.deephaven.engine.table.impl.naturaljoin.IncrementalNaturalJoinStateManagerTypedBase;
@@ -32,9 +30,7 @@
 
 public class ReplicateTypedHashers {
     public static void main(String[] args) throws IOException {
-        generatePackage(StaticChunkedOperatorAggregationStateManagerTypedBase.class, true);
         generatePackage(StaticChunkedOperatorAggregationStateManagerOpenAddressedBase.class, true);
-        generatePackage(IncrementalChunkedOperatorAggregationStateManagerTypedBase.class, true);
         generatePackage(IncrementalChunkedOperatorAggregationStateManagerOpenAddressedBase.class, true);
         generatePackage(StaticNaturalJoinStateManagerTypedBase.class, false);
         generatePackage(RightIncrementalNaturalJoinStateManagerTypedBase.class, false);
diff --git a/replication/static/build.gradle b/replication/static/build.gradle
index 6382374ad23..57be19681e5 100644
--- a/replication/static/build.gradle
+++ b/replication/static/build.gradle
@@ -9,8 +9,8 @@ dependencies {
     implementation project(':Util')
     implementation project(':Base')
     implementation project(':replication-util')
-    implementation depTrove3
-    implementation depCommonsIo
+    implementation libs.trove
+    implementation libs.commons.io
 }
 
 // These replicators do not require any manual fix-up and may be run without supervision
diff --git a/replication/static/src/main/java/io/deephaven/replicators/ReplicateBarrageUtils.java b/replication/static/src/main/java/io/deephaven/replicators/ReplicateBarrageUtils.java
index 63670ad93d7..35dadff92d0 100644
--- a/replication/static/src/main/java/io/deephaven/replicators/ReplicateBarrageUtils.java
+++ b/replication/static/src/main/java/io/deephaven/replicators/ReplicateBarrageUtils.java
@@ -25,6 +25,9 @@ public static void main(final String[] args) throws IOException {
         fixupChunkInputStreamGen(CHUNK_PACKAGE + "/LongChunkInputStreamGenerator.java", "Long");
         fixupChunkInputStreamGen(CHUNK_PACKAGE + "/DoubleChunkInputStreamGenerator.java", "Double");
 
+        ReplicatePrimitiveCode.charToAllButBoolean("replicateBarrageUtils",
+                CHUNK_PACKAGE + "/CharChunkReader.java");
+
         ReplicatePrimitiveCode.charToAllButBoolean("replicateBarrageUtils",
                 CHUNK_PACKAGE + "/array/CharArrayExpansionKernel.java");
 
@@ -33,6 +36,9 @@ public static void main(final String[] args) throws IOException {
         fixupVectorExpansionKernel(CHUNK_PACKAGE + "/vector/IntVectorExpansionKernel.java", "Int");
         fixupVectorExpansionKernel(CHUNK_PACKAGE + "/vector/LongVectorExpansionKernel.java", "Long");
         fixupVectorExpansionKernel(CHUNK_PACKAGE + "/vector/DoubleVectorExpansionKernel.java", "Double");
+
+        ReplicatePrimitiveCode.charToAllButBoolean("replicateBarrageUtils",
+                "web/client-api/src/main/java/io/deephaven/web/client/api/barrage/data/WebCharColumnData.java");
     }
 
     private static void fixupVectorExpansionKernel(final @NotNull String path, final @NotNull String type)
diff --git a/replication/static/src/main/java/io/deephaven/replicators/ReplicateChunkFilters.java b/replication/static/src/main/java/io/deephaven/replicators/ReplicateChunkFilters.java
index 4c1c72974cd..3dc7c9dea24 100644
--- a/replication/static/src/main/java/io/deephaven/replicators/ReplicateChunkFilters.java
+++ b/replication/static/src/main/java/io/deephaven/replicators/ReplicateChunkFilters.java
@@ -12,11 +12,16 @@ public class ReplicateChunkFilters {
     private static final String TASK = "replicateChunkFilters";
 
     public static void main(String[] args) throws IOException {
+        charToAllButBoolean(TASK,
+                "engine/table/src/main/java/io/deephaven/engine/table/impl/chunkfilter/CharChunkFilter.java");
+
         charToShortAndByte(TASK,
                 "engine/table/src/main/java/io/deephaven/engine/table/impl/chunkfilter/CharRangeComparator.java");
         charToInteger(TASK,
                 "engine/table/src/main/java/io/deephaven/engine/table/impl/chunkfilter/CharRangeComparator.java",
                 Collections.emptyMap());
+        charToLong(TASK,
+                "engine/table/src/main/java/io/deephaven/engine/table/impl/chunkfilter/CharRangeComparator.java");
 
         charToShortAndByte(TASK,
                 "engine/table/src/main/java/io/deephaven/engine/table/impl/select/CharRangeFilter.java");
diff --git a/replication/static/src/main/java/io/deephaven/replicators/ReplicateHashing.java b/replication/static/src/main/java/io/deephaven/replicators/ReplicateHashing.java
index 5268c3c6697..1bcff5a4beb 100644
--- a/replication/static/src/main/java/io/deephaven/replicators/ReplicateHashing.java
+++ b/replication/static/src/main/java/io/deephaven/replicators/ReplicateHashing.java
@@ -34,15 +34,8 @@ public static void main(String[] args) throws IOException {
         charToIntegers(TASK,
                 "engine/chunk/src/main/java/io/deephaven/chunk/util/hashing/CharToLongCastWithOffset.java");
 
-        final List<String> paths = charToAll(TASK,
+        charToAll(TASK,
                 "engine/chunk/src/main/java/io/deephaven/chunk/util/hashing/CharChunkEquals.java");
-        final String floatPath =
-                paths.stream().filter(p -> p.contains("Float")).findFirst().orElseThrow(FileNotFoundException::new);
-        final String doublePath =
-                paths.stream().filter(p -> p.contains("Double")).findFirst().orElseThrow(FileNotFoundException::new);
-
-        fixupFloatChunkEquals(floatPath);
-        fixupDoubleChunkEquals(doublePath);
 
         final String objectIdentityEquals =
                 charToObject(TASK, "engine/chunk/src/main/java/io/deephaven/chunk/util/hashing/CharChunkEquals.java");
@@ -71,16 +64,15 @@ private static void fixupObjectChunkHasher(String objectPath) throws IOException
         final File objectFile = new File(objectPath);
         List<String> lines = FileUtils.readLines(objectFile, Charset.defaultCharset());
         lines = addImport(lines, Objects.class);
-        FileUtils.writeLines(objectFile, globalReplacements(fixupChunkAttributes(lines), "Object.hashCode",
-                "Objects.hashCode", "TypeUtils.unbox\\(\\(Object\\) value\\)", "value"));
+        FileUtils.writeLines(objectFile,
+                globalReplacements(fixupChunkAttributes(lines), "TypeUtils.unbox\\(\\(Object\\) value\\)", "value"));
     }
 
     private static void fixupObjectChunkEquals(String objectPath) throws IOException {
         final File objectFile = new File(objectPath);
         List<String> lines = FileUtils.readLines(objectFile, Charset.defaultCharset());
         lines = addImport(lines, Objects.class);
-        FileUtils.writeLines(objectFile, simpleFixup(fixupChunkAttributes(lines),
-                "eq", "lhs == rhs", "Objects.equals(lhs, rhs)"));
+        FileUtils.writeLines(objectFile, fixupChunkAttributes(lines));
     }
 
     private static void fixupBooleanCompact(String booleanPath) throws IOException {
@@ -145,44 +137,32 @@ private static void fixupObjectChunkIdentityEquals(String objectPath) throws IOE
         Assert.eqTrue(objectChunkEqualsFileName.renameTo(objectChunkIdentifyEqualsFileName),
                 "objectChunkEqualsFileName.renameTo(objectChunkIdentifyEqualsFileName)");
 
-        final List<String> lines = FileUtils.readLines(objectChunkIdentifyEqualsFileName, Charset.defaultCharset());
-        FileUtils.writeLines(objectChunkIdentifyEqualsFileName, simpleFixup(fixupChunkAttributes(lines),
-                "name", "ObjectChunkEquals", "ObjectChunkIdentityEquals"));
+        List<String> lines = FileUtils.readLines(objectChunkIdentifyEqualsFileName, Charset.defaultCharset());
+        lines = fixupChunkAttributes(lines);
+        lines = simpleFixup(lines,
+                "name", "ObjectChunkEquals", "ObjectChunkIdentityEquals");
+        lines = simpleFixup(lines,
+                "eq", "ObjectComparisons\\.eq\\(lhs, rhs\\)", "lhs == rhs");
+        FileUtils.writeLines(objectChunkIdentifyEqualsFileName, lines);
     }
 
     private static void fixupObjectChunkDeepEquals(String objectPath) throws IOException {
         final File objectChunkEqualsFileName = new File(objectPath);
-        final File objectChunkIdentifyEqualsFileName =
+        final File objectChunkDeepEqualsFileName =
                 new File(objectChunkEqualsFileName.getParent(), "ObjectChunkDeepEquals.java");
-        Assert.eqTrue(objectChunkEqualsFileName.renameTo(objectChunkIdentifyEqualsFileName),
-                "objectChunkEqualsFileName.renameTo(objectChunkIdentifyEqualsFileName)");
+        Assert.eqTrue(objectChunkEqualsFileName.renameTo(objectChunkDeepEqualsFileName),
+                "objectChunkEqualsFileName.renameTo(objectChunkDeepEqualsFileName)");
 
         {
-            List<String> lines = FileUtils.readLines(objectChunkIdentifyEqualsFileName, Charset.defaultCharset());
+            List<String> lines = FileUtils.readLines(objectChunkDeepEqualsFileName, Charset.defaultCharset());
             lines = addImport(lines, Objects.class);
-            FileUtils.writeLines(objectChunkIdentifyEqualsFileName, simpleFixup(fixupChunkAttributes(lines),
+            FileUtils.writeLines(objectChunkDeepEqualsFileName, simpleFixup(fixupChunkAttributes(lines),
                     "name", "ObjectChunkEquals", "ObjectChunkDeepEquals"));
         }
         {
-            final List<String> lines = FileUtils.readLines(objectChunkIdentifyEqualsFileName, Charset.defaultCharset());
-            FileUtils.writeLines(objectChunkIdentifyEqualsFileName, simpleFixup(lines,
-                    "eq", "lhs == rhs", "Objects.deepEquals(lhs, rhs)"));
+            final List<String> lines = FileUtils.readLines(objectChunkDeepEqualsFileName, Charset.defaultCharset());
+            FileUtils.writeLines(objectChunkDeepEqualsFileName, simpleFixup(lines,
+                    "eq", "ObjectComparisons\\.eq\\(lhs, rhs\\)", "Objects.deepEquals(lhs, rhs)"));
         }
-
-    }
-
-    private static void fixupDoubleChunkEquals(String doublePath) throws IOException {
-        final File objectFile = new File(doublePath);
-        final List<String> lines = FileUtils.readLines(objectFile, Charset.defaultCharset());
-        FileUtils.writeLines(objectFile,
-                simpleFixup(lines, "eq", "lhs == rhs", "((Double.isNaN(lhs) && Double.isNaN(rhs)) || lhs == rhs)"));
     }
-
-    private static void fixupFloatChunkEquals(String floatPath) throws IOException {
-        final File objectFile = new File(floatPath);
-        final List<String> lines = FileUtils.readLines(objectFile, Charset.defaultCharset());
-        FileUtils.writeLines(objectFile,
-                simpleFixup(lines, "eq", "lhs == rhs", "((Float.isNaN(lhs) && Float.isNaN(rhs)) || lhs == rhs)"));
-    }
-
 }
diff --git a/replication/static/src/main/java/io/deephaven/replicators/ReplicatePageMaterializers.java b/replication/static/src/main/java/io/deephaven/replicators/ReplicatePageMaterializers.java
index 13909dd32b3..e4e96e356d7 100644
--- a/replication/static/src/main/java/io/deephaven/replicators/ReplicatePageMaterializers.java
+++ b/replication/static/src/main/java/io/deephaven/replicators/ReplicatePageMaterializers.java
@@ -5,8 +5,7 @@
 
 import java.io.IOException;
 
-import static io.deephaven.replication.ReplicatePrimitiveCode.charToShortAndByte;
-import static io.deephaven.replication.ReplicatePrimitiveCode.floatToAllFloatingPoints;
+import static io.deephaven.replication.ReplicatePrimitiveCode.charToByte;
 import static io.deephaven.replication.ReplicatePrimitiveCode.replaceAll;
 
 /**
@@ -20,7 +19,14 @@ public class ReplicatePageMaterializers {
             "extensions/parquet/base/src/main/java/io/deephaven/parquet/base/materializers/";
 
     private static final String CHAR_MATERIALIZER_PATH = MATERIALIZER_DIR + "CharMaterializer.java";
-    private static final String FLOAT_MATERIALIZER_PATH = MATERIALIZER_DIR + "FloatMaterializer.java";
+    private static final String SHORT_MATERIALIZER_PATH = MATERIALIZER_DIR + "ShortMaterializer.java";
+    private static final String INT_MATERIALIZER_PATH = MATERIALIZER_DIR + "IntMaterializer.java";
+    private static final String LONG_MATERIALIZER_BASE_PATH = MATERIALIZER_DIR + "LongMaterializerBase.java";
+    private static final String LONG_MATERIALIZER_PATH = MATERIALIZER_DIR + "LongMaterializer.java";
+    private static final String LONG_FROM_INT_MATERIALIZER_PATH = MATERIALIZER_DIR + "LongFromIntMaterializer.java";
+    private static final String LONG_FROM_UNSIGNED_SHORT_MATERIALIZER_PATH =
+            MATERIALIZER_DIR + "LongFromUnsignedShortMaterializer.java";
+    private static final String DOUBLE_MATERIALIZER_PATH = MATERIALIZER_DIR + "DoubleMaterializer.java";
     private static final String LOCAL_TIME_FROM_MICROS_MATERIALIZER_PATH =
             MATERIALIZER_DIR + "LocalTimeFromMicrosMaterializer.java";
     private static final String LOCAL_DATE_TIME_FROM_MILLIS_MATERIALIZER_PATH =
@@ -34,18 +40,121 @@ public class ReplicatePageMaterializers {
     private static final String BIG_INTEGER_MATERIALIZER_PATH = MATERIALIZER_DIR + "BigIntegerMaterializer.java";
 
     public static void main(String... args) throws IOException {
-        charToShortAndByte(TASK, CHAR_MATERIALIZER_PATH, NO_EXCEPTIONS);
+        charToByte(TASK, CHAR_MATERIALIZER_PATH, NO_EXCEPTIONS);
 
-        // Float -> Double
-        floatToAllFloatingPoints(TASK, FLOAT_MATERIALIZER_PATH, NO_EXCEPTIONS);
-
-        // Float -> Int
+        // LongBase -> IntBase
         String[][] pairs = new String[][] {
-                {"readFloat", "readInteger"},
-                {"Float", "Int"},
-                {"float", "int"}
+                {"Long", "Int"},
+                {"long", "int"},
+        };
+        replaceAll(TASK, LONG_MATERIALIZER_BASE_PATH, null, NO_EXCEPTIONS, pairs);
+
+        // Long -> Int
+        pairs = new String[][] {
+                {"readLong", "readInteger"},
+                {"Long", "Int"},
+                {"long", "int"}
+        };
+        replaceAll(TASK, LONG_MATERIALIZER_PATH, null, NO_EXCEPTIONS, pairs);
+
+        // Int -> IntFromBoolean
+        pairs = new String[][] {
+                {"IntMaterializer", "IntFromBooleanMaterializer"},
+                {"readInteger\\(\\)", "readBoolean() ? 1 : 0"}
+        };
+        replaceAll(TASK, INT_MATERIALIZER_PATH, null, new String[] {"IntMaterializerBase"}, pairs);
+
+        // LongBase -> ShortBase
+        pairs = new String[][] {
+                {"Long", "Short"},
+                {"long", "short"},
+        };
+        replaceAll(TASK, LONG_MATERIALIZER_BASE_PATH, null, NO_EXCEPTIONS, pairs);
+
+        // Long -> Short
+        pairs = new String[][] {
+                {"dataReader.readLong", "(short) dataReader.readInteger"},
+                {"dataReader, 0, numValues", "dataReader, (short) 0, numValues"},
+                {"Long", "Short"},
+                {"long", "short"}
+        };
+        replaceAll(TASK, LONG_MATERIALIZER_PATH, null, NO_EXCEPTIONS, pairs);
+
+        // Long -> LongFromInt
+        pairs = new String[][] {
+                {"LongMaterializer", "LongFromIntMaterializer"},
+                {"readLong", "readInteger"},
+        };
+        replaceAll(TASK, LONG_MATERIALIZER_PATH, LONG_FROM_INT_MATERIALIZER_PATH, null,
+                new String[] {"LongMaterializerBase"}, pairs);
+
+        // Long -> LongFromBoolean
+        pairs = new String[][] {
+                {"LongMaterializer", "LongFromBooleanMaterializer"},
+                {"readLong\\(\\)", "readBoolean() ? 1 : 0"},
+        };
+        replaceAll(TASK, LONG_MATERIALIZER_PATH, null, new String[] {"LongMaterializerBase"}, pairs);
+
+        // LongFromUnsignedShort -> LongFromUnsignedByte
+        pairs = new String[][] {
+                {"Short", "Byte"},
+                {"short", "byte"}
+        };
+        replaceAll(TASK, LONG_FROM_UNSIGNED_SHORT_MATERIALIZER_PATH, null, NO_EXCEPTIONS, pairs);
+
+        // LongFromUnsignedShort -> LongFromUnsignedInt
+        pairs = new String[][] {
+                {"Short.toUnsignedLong", "Integer.toUnsignedLong"},
+                {"Short", "Int"},
+                {"short", "int"}
+        };
+        replaceAll(TASK, LONG_FROM_UNSIGNED_SHORT_MATERIALIZER_PATH, null, NO_EXCEPTIONS, pairs);
+
+        // LongFromUnsignedShort -> IntFromUnsignedShort
+        pairs = new String[][] {
+                {"LongFromUnsignedShort", "IntFromUnsignedShort"},
+                {"Long", "Int"},
+                {"long", "int"}
+        };
+        replaceAll(TASK, LONG_FROM_UNSIGNED_SHORT_MATERIALIZER_PATH, null, NO_EXCEPTIONS, pairs);
+
+        // LongFromUnsignedShort -> IntFromUnsignedByte
+        pairs = new String[][] {
+                {"Short", "Byte"},
+                {"short", "byte"},
+                {"Long", "Int"},
+                {"long", "int"}
+        };
+        replaceAll(TASK, LONG_FROM_UNSIGNED_SHORT_MATERIALIZER_PATH, null, NO_EXCEPTIONS, pairs);
+
+        // LongBase -> DoubleBase
+        pairs = new String[][] {
+                {"Long", "Double"},
+                {"long", "double"},
+        };
+        replaceAll(TASK, LONG_MATERIALIZER_BASE_PATH, null, NO_EXCEPTIONS, pairs);
+
+        // Long -> Double
+        pairs = new String[][] {
+                {"dataReader.readLong", "dataReader.readDouble"},
+                {"Long", "Double"},
+                {"long", "double"}
+        };
+        replaceAll(TASK, LONG_MATERIALIZER_PATH, null, NO_EXCEPTIONS, pairs);
+
+        // Double -> DoubleFromFloat
+        pairs = new String[][] {
+                {"DoubleMaterializer", "DoubleFromFloatMaterializer"},
+                {"Double", "Float"}
+        };
+        replaceAll(TASK, DOUBLE_MATERIALIZER_PATH, null, new String[] {"DoubleMaterializerBase"}, pairs);
+
+        // Short -> ShortFromBoolean
+        pairs = new String[][] {
+                {"ShortMaterializer", "ShortFromBooleanMaterializer"},
+                {"dataReader.readInteger\\(\\)", "(dataReader.readBoolean() ? 1 : 0)"}
         };
-        replaceAll(TASK, FLOAT_MATERIALIZER_PATH, null, NO_EXCEPTIONS, pairs);
+        replaceAll(TASK, SHORT_MATERIALIZER_PATH, null, new String[] {"ShortMaterializerBase"}, pairs);
 
         // LocalTimeFromMicros -> LocalTimeFromMillis
         // We change from Micros to Millis and not the other way since converting from Long to Integer has fewer
diff --git a/replication/static/src/main/java/io/deephaven/replicators/ReplicateRingBuffers.java b/replication/static/src/main/java/io/deephaven/replicators/ReplicateRingBuffers.java
index 71b96c5b254..b0af725f4a3 100644
--- a/replication/static/src/main/java/io/deephaven/replicators/ReplicateRingBuffers.java
+++ b/replication/static/src/main/java/io/deephaven/replicators/ReplicateRingBuffers.java
@@ -65,6 +65,19 @@ public static void main(String... args) throws IOException {
                                 "        System.arraycopy(storage, 0, result, firstCopyLen, secondCopyLen);\n" +
                                 "        Arrays.fill(storage, 0, secondCopyLen, null);" +
                                 "\n"));
+
+        lines = ReplicationUtils.replaceRegion(lines, "object-bulk-clear",
+                Collections.singletonList(
+                        "        final int storageHead = (int) (head & mask);\n" +
+                                "        final int size = size();\n" +
+                                "        // firstLen is either the size of the ring buffer or the distance from head to the end of the storage array.\n"
+                                +
+                                "        final int firstLen = Math.min(storage.length - storageHead, size);\n" +
+                                "        // secondLen is the number of elements remaining from the first clear.\n" +
+                                "        final int secondLen = size - firstLen;\n" +
+                                "        Arrays.fill(storage, storageHead, storageHead + firstLen, null);\n" +
+                                "        Arrays.fill(storage, 0, secondLen, null);"));
+
         FileUtils.writeLines(objectFile, lines);
 
         charToAllButBoolean(TASK,
@@ -103,17 +116,24 @@ public static void main(String... args) throws IOException {
 
 
         // replicate the tests
-        charToAllButBoolean(TASK, "Base/src/test/java/io/deephaven/base/ringbuffer/CharRingBufferTest.java");
+        charToAllButBoolean(TASK, "Base/src/test/java/io/deephaven/base/ringbuffer/TestCharRingBuffer.java");
         objectResult = ReplicatePrimitiveCode.charToObject(TASK,
-                "Base/src/test/java/io/deephaven/base/ringbuffer/CharRingBufferTest.java");
+                "Base/src/test/java/io/deephaven/base/ringbuffer/TestCharRingBuffer.java");
         objectFile = new File(objectResult);
         lines = FileUtils.readLines(objectFile, Charset.defaultCharset());
         lines = ReplicationUtils.globalReplacements(lines,
                 "Object.MIN_VALUE", "new Object()");
+
+        lines = ReplicationUtils.replaceRegion(lines, "empty-test",
+                Collections.singletonList(
+                        "        for (Object val : rb.getStorage()) {\n" +
+                                "            assertNull(val);\n" +
+                                "        }"));
+
         FileUtils.writeLines(objectFile, lines);
 
         List<String> files = charToAllButBoolean(TASK,
-                "Base/src/test/java/io/deephaven/base/ringbuffer/AggregatingCharRingBufferTest.java");
+                "Base/src/test/java/io/deephaven/base/ringbuffer/TestAggregatingCharRingBuffer.java");
         for (final String f : files) {
             if (f.contains("Byte")) {
                 objectFile = new File(f);
diff --git a/replication/static/src/main/java/io/deephaven/replicators/ReplicateSortCheck.java b/replication/static/src/main/java/io/deephaven/replicators/ReplicateSortCheck.java
index 8354ad38e10..799b4c299c6 100644
--- a/replication/static/src/main/java/io/deephaven/replicators/ReplicateSortCheck.java
+++ b/replication/static/src/main/java/io/deephaven/replicators/ReplicateSortCheck.java
@@ -44,11 +44,7 @@ private static void invertSense(String path, String descendingPath) throws IOExc
                 simpleFixup(ascendingNameToDescendingName(path, FileUtils.readLines(file, Charset.defaultCharset())),
                         "initialize last", "MIN_VALUE", "MAX_VALUE");
 
-        if (path.contains("Object")) {
-            lines = ReplicateSortKernel.fixupObjectComparisons(lines, false);
-        } else {
-            lines = ReplicateSortKernel.invertComparisons(lines);
-        }
+        lines = ReplicateSortKernel.invertComparisons(lines);
 
         FileUtils.writeLines(new File(descendingPath), lines);
     }
diff --git a/replication/static/src/main/java/io/deephaven/replicators/ReplicateSortKernel.java b/replication/static/src/main/java/io/deephaven/replicators/ReplicateSortKernel.java
index 96a032e20a4..2027c03f7d0 100644
--- a/replication/static/src/main/java/io/deephaven/replicators/ReplicateSortKernel.java
+++ b/replication/static/src/main/java/io/deephaven/replicators/ReplicateSortKernel.java
@@ -15,6 +15,7 @@
 import java.util.Arrays;
 import java.util.Collections;
 import java.util.List;
+import java.util.regex.Matcher;
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
 
@@ -46,9 +47,9 @@ public static void main(String[] args) throws IOException {
         fixupObjectRuns(objectRunPath);
 
         charToAllButBoolean(TASK,
-                "engine/table/src/main/java/io/deephaven/engine/table/impl/sort/partition/CharPartitionKernel.java");
+                "engine/table/src/test/java/io/deephaven/engine/table/impl/sort/partition/CharPartitionKernel.java");
         final String objectPartitionPath = charToObject(TASK,
-                "engine/table/src/main/java/io/deephaven/engine/table/impl/sort/partition/CharPartitionKernel.java");
+                "engine/table/src/test/java/io/deephaven/engine/table/impl/sort/partition/CharPartitionKernel.java");
         fixupObjectPartition(objectPartitionPath);
 
         charToAllButBoolean(TASK,
@@ -366,49 +367,47 @@ public static List<String> fixupObjectComparisons(List<String> lines) {
     }
 
     public static List<String> fixupObjectComparisons(List<String> lines, boolean ascending) {
-        final List<String> ascendingComparision = Arrays.asList(
+        final List<String> ascendingComparison = Arrays.asList(
                 "    // ascending comparison",
                 "    private static int doComparison(Object lhs, Object rhs) {",
-                "       if (lhs == rhs) {",
-                "            return 0;",
-                "        }",
-                "        if (lhs == null) {",
-                "            return -1;",
-                "        }",
-                "        if (rhs == null) {",
-                "            return 1;",
-                "        }",
-                "        //noinspection unchecked,rawtypes",
-                "        return ((Comparable)lhs).compareTo(rhs);",
-                "    }",
-                "");
-        final List<String> descendingComparision = Arrays.asList(
+                "        return ObjectComparisons.compare(lhs, rhs);",
+                "    }");
+        final List<String> descendingComparison = Arrays.asList(
                 "    // descending comparison",
                 "    private static int doComparison(Object lhs, Object rhs) {",
-                "        if (lhs == rhs) {",
-                "            return 0;",
-                "        }",
-                "        if (lhs == null) {",
-                "            return 1;",
-                "        }",
-                "        if (rhs == null) {",
-                "            return -1;",
-                "        }",
-                "        //noinspection unchecked,rawtypes",
-                "        return ((Comparable)rhs).compareTo(lhs);",
+                "        return ObjectComparisons.compare(rhs, lhs);",
                 "    }");
-
-        return addImport(simpleFixup(
-                replaceRegion(lines, "comparison functions", ascending ? ascendingComparision : descendingComparision),
-                "equality function", "lhs == rhs", "Objects.equals(lhs, rhs)"), "import java.util.Objects;");
+        lines = replaceRegion(lines, "comparison functions", ascending ? ascendingComparison : descendingComparison);
+        lines = simpleFixup(
+                lines,
+                "equality function", "lhs == rhs", "Objects.equals(lhs, rhs)");
+        return addImport(lines, "import java.util.Objects;", "import io.deephaven.util.compare.ObjectComparisons;");
     }
 
     public static List<String> invertComparisons(List<String> lines) {
         final List<String> descendingComment = Collections.singletonList(
                 "    // note that this is a descending kernel, thus the comparisons here are backwards (e.g., the lt function is in terms of the sort direction, so is implemented by gt)");
-        return insertRegion(
-                applyFixup(lines, "comparison functions", "(\\s+return )(.*compare.*;)",
-                        m -> Collections.singletonList(m.group(1) + "-1 * " + m.group(2))),
-                "comparison functions", descendingComment);
+        lines = applyFixup(lines, "comparison functions", "(\\s+return )(.*compare.*;)",
+                m -> Collections.singletonList(m.group(1) + "-1 * " + m.group(2)));
+        lines = applyFixup(lines, "comparison functions", "(\\s+return .*)(\\.gt\\(|\\.lt\\(|\\.geq\\(|\\.leq\\()(.*;)",
+                m -> Collections.singletonList(invertBooleanCompare(m)));
+        return insertRegion(lines, "comparison functions", descendingComment);
+    }
+
+    private static String invertBooleanCompare(Matcher matcher) {
+        // Note: we can't just return the boolean inverse; a compare inverse must handle three states, and those
+        // semantics must be preserved even though it's a boolean function.
+        switch (matcher.group(2)) {
+            case ".gt(":
+                return matcher.group(1) + ".lt(" + matcher.group(3);
+            case ".lt(":
+                return matcher.group(1) + ".gt(" + matcher.group(3);
+            case ".geq(":
+                return matcher.group(1) + ".leq(" + matcher.group(3);
+            case ".leq(":
+                return matcher.group(1) + ".geq(" + matcher.group(3);
+            default:
+                throw new IllegalStateException("Unexpected match: " + matcher.group(2));
+        }
     }
 }
diff --git a/replication/static/src/main/java/io/deephaven/replicators/ReplicateSourcesAndChunks.java b/replication/static/src/main/java/io/deephaven/replicators/ReplicateSourcesAndChunks.java
index e7c66cec5b7..467933b2654 100644
--- a/replication/static/src/main/java/io/deephaven/replicators/ReplicateSourcesAndChunks.java
+++ b/replication/static/src/main/java/io/deephaven/replicators/ReplicateSourcesAndChunks.java
@@ -397,8 +397,8 @@ private static void replicateObjectSingleValue() throws IOException {
                 "Object value", "T value");
         lines = ReplicationUtils.removeRegion(lines, "UnboxedSetter");
         lines = ReplicationUtils.replaceRegion(lines, "Constructor", Arrays.asList(
-                "    public ObjectSingleValueSource(Class<T> type) {",
-                "        super(type);",
+                "    public ObjectSingleValueSource(Class<T> type, Class<?> componentType) {",
+                "        super(type, componentType);",
                 "        current = null;",
                 "        prev = null;",
                 "    }"));
diff --git a/replication/static/src/main/java/io/deephaven/replicators/ReplicateToPage.java b/replication/static/src/main/java/io/deephaven/replicators/ReplicateToPage.java
index 991943678ab..42e4cf0f6cd 100644
--- a/replication/static/src/main/java/io/deephaven/replicators/ReplicateToPage.java
+++ b/replication/static/src/main/java/io/deephaven/replicators/ReplicateToPage.java
@@ -4,8 +4,10 @@
 package io.deephaven.replicators;
 
 import java.io.IOException;
+import java.util.Map;
 
-import static io.deephaven.replication.ReplicatePrimitiveCode.intToAllButBoolean;
+import static io.deephaven.replication.ReplicatePrimitiveCode.charToByte;
+import static io.deephaven.replication.ReplicatePrimitiveCode.charToFloat;
 import static io.deephaven.replication.ReplicatePrimitiveCode.replaceAll;
 
 /**
@@ -18,30 +20,24 @@ public class ReplicateToPage {
     private static final String TO_PAGE_DIR =
             "extensions/parquet/table/src/main/java/io/deephaven/parquet/table/pagestore/topage/";
 
-    private static final String TO_INT_PAGE_PATH = TO_PAGE_DIR + "ToIntPage.java";
-    private static final String TO_LOCAL_DATE_PAGE_PATH = TO_PAGE_DIR + "ToLocalDatePage.java";
+    private static final String TO_CHAR_PAGE_PATH = TO_PAGE_DIR + "ToCharPage.java";
+    private static final String TO_LOCAL_DATE_TIME_PAGE_PATH = TO_PAGE_DIR + "ToLocalDateTimePage.java";
     private static final String TO_BIG_INTEGER_PAGE_PATH = TO_PAGE_DIR + "ToBigIntegerPage.java";
 
     public static void main(String... args) throws IOException {
-        intToAllButBoolean(TASK, TO_INT_PAGE_PATH, "interface");
+        charToFloat(TASK, TO_CHAR_PAGE_PATH, null, "interface");
 
-        // LocalDate -> LocalDateTime
+        // LocalDateTime -> LocalTime
         String[][] pairs = new String[][] {
-                {"LocalDate", "LocalDateTime"}
+                {"LocalDateTime", "LocalTime"}
         };
-        replaceAll(TASK, TO_LOCAL_DATE_PAGE_PATH, null, NO_EXCEPTIONS, pairs);
-
-        // LocalDate -> LocalTime
-        pairs = new String[][] {
-                {"LocalDate", "LocalTime"}
-        };
-        replaceAll(TASK, TO_LOCAL_DATE_PAGE_PATH, null, NO_EXCEPTIONS, pairs);
+        replaceAll(TASK, TO_LOCAL_DATE_TIME_PAGE_PATH, null, NO_EXCEPTIONS, pairs);
 
         // BigInteger -> BigDecimal
         pairs = new String[][] {
+                {"BigIntegerMaterializer", "BigDecimalFromBytesMaterializer"},
                 {"BigInteger", "BigDecimal"}
         };
         replaceAll(TASK, TO_BIG_INTEGER_PAGE_PATH, null, NO_EXCEPTIONS, pairs);
-
     }
 }
diff --git a/replication/static/src/main/java/io/deephaven/replicators/ReplicateUpdateBy.java b/replication/static/src/main/java/io/deephaven/replicators/ReplicateUpdateBy.java
index 43d66fd3158..77a2730a5e6 100644
--- a/replication/static/src/main/java/io/deephaven/replicators/ReplicateUpdateBy.java
+++ b/replication/static/src/main/java/io/deephaven/replicators/ReplicateUpdateBy.java
@@ -242,6 +242,14 @@ public static void main(String[] args) throws IOException {
             }
         }
 
+        files = ReplicatePrimitiveCode.charToAllButBoolean(TASK,
+                "engine/table/src/main/java/io/deephaven/engine/table/impl/updateby/rollingformulamulticolumn/windowconsumer/CharRingBufferWindowConsumer.java");
+        for (final String f : files) {
+            if (f.contains("Int")) {
+                fixupInteger(f);
+            }
+        }
+
     }
 
     private static void replicateNumericOperator(@NotNull final String shortClass, @NotNull final String floatClass)
diff --git a/replication/util/build.gradle b/replication/util/build.gradle
index 9ee71496eae..8375f4ff869 100644
--- a/replication/util/build.gradle
+++ b/replication/util/build.gradle
@@ -7,7 +7,7 @@ description 'Replication Tools: Utilities for source code generation and replica
 
 dependencies {
     implementation project(':Base'),
-            'commons-io:commons-io:2.11.0'
+            libs.commons.io
 
-    compileOnly 'com.google.code.findbugs:jsr305:3.0.2'
+    compileOnly libs.google.findbugs.jsr305
 }
diff --git a/replication/util/src/main/java/io/deephaven/replication/ReplicatePrimitiveCode.java b/replication/util/src/main/java/io/deephaven/replication/ReplicatePrimitiveCode.java
index 921601649ad..2fecc1946ec 100644
--- a/replication/util/src/main/java/io/deephaven/replication/ReplicatePrimitiveCode.java
+++ b/replication/util/src/main/java/io/deephaven/replication/ReplicatePrimitiveCode.java
@@ -478,6 +478,22 @@ public static List<String> intToAllButBoolean(String gradleTask, String sourceCl
         return results;
     }
 
+    public static List<String> intToAllButBooleanAndLong(String gradleTask, String sourceClassJavaPath,
+            String... exemptions) throws IOException {
+        return intToAllButBooleanAndLong(gradleTask, sourceClassJavaPath, null, exemptions);
+    }
+
+    public static List<String> intToAllButBooleanAndLong(String gradleTask, String sourceClassJavaPath,
+            Map<String, Long> serialVersionUIDs, String... exemptions) throws IOException {
+        final List<String> results = new ArrayList<>();
+        results.add(intToChar(gradleTask, sourceClassJavaPath, serialVersionUIDs, exemptions));
+        results.add(intToByte(gradleTask, sourceClassJavaPath, serialVersionUIDs, exemptions));
+        results.add(intToShort(gradleTask, sourceClassJavaPath, serialVersionUIDs, exemptions));
+        results.add(intToDouble(gradleTask, sourceClassJavaPath, serialVersionUIDs, exemptions));
+        results.add(intToFloat(gradleTask, sourceClassJavaPath, serialVersionUIDs, exemptions));
+        return results;
+    }
+
     public static List<String> shortToAllIntegralTypes(String gradleTask, String sourceClass, String... exemptions)
             throws IOException {
         return shortToAllIntegralTypes(gradleTask, sourceClass, null, exemptions);
diff --git a/server/build.gradle b/server/build.gradle
index 27f6f18aa0a..e7ae21ab845 100644
--- a/server/build.gradle
+++ b/server/build.gradle
@@ -4,6 +4,8 @@ plugins {
 }
 
 dependencies {
+    implementation project(":util-thread")
+    implementation project(":util-processenvironment")
     implementation project(':authentication')
     implementation project(':authorization')
     implementation project(':engine-table')
@@ -14,17 +16,17 @@ dependencies {
     implementation project(':extensions-jdbc')
     implementation project(':Util');
     implementation project(':Integrations')
-    implementation depCommonsLang3
-    Classpaths.inheritCommonsText(project, 'implementation')
+    implementation libs.commons.lang3
+    implementation libs.commons.text
 
-    Classpaths.inheritJavaParser(project, 'implementation')
+    implementation libs.javaparser.core
     implementation project(':open-api-lang-parser')
 
     api(project(':java-client-barrage'))
     api(project(':java-client-session-dagger')) {
         because 'downstream dagger compile, see deephaven-core#1722'
     }
-    implementation 'org.hdrhistogram:HdrHistogram:2.1.12'
+    implementation libs.hdrhistogram
 
     implementation project(':proto:proto-backplane-grpc-flight')
     api(project(':open-api-lang-tools')) {
@@ -33,11 +35,11 @@ dependencies {
     api(project(':log-factory')) {
         because 'downstream dagger compile, see deephaven-core#1722'
     }
-    Classpaths.inheritSlf4j(project, 'jul-to-slf4j', 'implementation')
+    implementation libs.slf4j.jul.to.slf4j
     api(project(':application-mode')) {
         because 'downstream dagger compile, see deephaven-core#1722'
     }
-    implementation 'com.github.f4b6a3:uuid-creator:5.2.0'
+    implementation libs.f4b6a3.uuid.creator
 
     api(project(':Configuration')) {
         because 'jetty/netty implementations will access the configuration in their main()s'
@@ -45,15 +47,21 @@ dependencies {
 
     api project(':ssl-config')
 
-    Classpaths.inheritFlatbuffer(project, 'implementation')
+    implementation libs.flatbuffers.java
 
-    Classpaths.inheritDagger(project)
-    Classpaths.inheritDagger(project, /* test */ true)
+    implementation libs.dagger
+    annotationProcessor libs.dagger.compiler
 
-    Classpaths.inheritAutoService(project)
-    Classpaths.inheritAutoService(project, /* test */ true)
+    testImplementation libs.dagger
+    testAnnotationProcessor libs.dagger.compiler
 
-    Classpaths.inheritImmutables(project)
+    compileOnly libs.autoservice
+    annotationProcessor libs.autoservice.compiler
+    testCompileOnly libs.autoservice
+    testAnnotationProcessor libs.autoservice.compiler
+
+    compileOnly project(':util-immutables')
+    annotationProcessor libs.immutables.value
 
     implementation project(':Plot')
 
@@ -80,23 +88,23 @@ dependencies {
     runtimeOnly project(':plugin-hierarchicaltable')
     implementation project(':plugin-gc-app')
 
-    Classpaths.inheritGrpcPlatform(project, 'api')
+    api platform(libs.grpc.bom)
 
-    api('io.grpc:grpc-services') {
+    api(libs.grpc.services) {
         because 'downstream dagger compile, see deephaven-core#1722'
     }
 
     implementation project(':grpc-java:grpc-mtls')
 
-    implementation 'dev.dirs:directories:26'
+    implementation libs.dev.dirs.directories
 
     testImplementation project(':server-test-utils')
 
     runtimeOnly project(':Numerics'), project(':extensions-kafka')
-    Classpaths.inheritAssertJ(project)
+    testImplementation libs.assertj
 
     testRuntimeOnly project(':log-to-slf4j')
-    Classpaths.inheritSlf4j(project, 'slf4j-simple', 'testRuntimeOnly')
+    testRuntimeOnly libs.slf4j.simple
 
     runtimeOnly project(':authentication:example-providers:psk')
 }
diff --git a/server/jetty-app-custom/build.gradle b/server/jetty-app-custom/build.gradle
index 2224c4e3f90..1ef2bbe9a78 100644
--- a/server/jetty-app-custom/build.gradle
+++ b/server/jetty-app-custom/build.gradle
@@ -9,12 +9,14 @@ configurations {
 
 dependencies {
     implementation project(':server-jetty')
-    Classpaths.inheritDagger(project)
+    implementation project(":util-thread")
+    implementation libs.dagger
+    annotationProcessor libs.dagger.compiler
 
     runtimeOnly project(':log-to-slf4j')
     runtimeOnly project(':logback-print-stream-globals')
     runtimeOnly project(':logback-logbuffer')
-    Classpaths.inheritLogbackClassic(project)
+    runtimeOnly libs.logback.classic
 }
 
 distributions {
diff --git a/server/jetty-app-custom/src/main/java/io/deephaven/server/custom/CustomClientChannelFactoryModule.java b/server/jetty-app-custom/src/main/java/io/deephaven/server/custom/CustomClientChannelFactoryModule.java
new file mode 100644
index 00000000000..b0a01dfd554
--- /dev/null
+++ b/server/jetty-app-custom/src/main/java/io/deephaven/server/custom/CustomClientChannelFactoryModule.java
@@ -0,0 +1,26 @@
+//
+// Copyright (c) 2016-2024 Deephaven Data Labs and Patent Pending
+//
+package io.deephaven.server.custom;
+
+import dagger.Module;
+import dagger.Provides;
+import io.deephaven.client.impl.BarrageSessionFactoryConfig;
+import io.deephaven.server.session.ClientChannelFactoryModule;
+import io.deephaven.server.session.ClientChannelFactoryModule.UserAgent;
+import io.deephaven.server.session.SslConfigModule;
+
+import java.util.List;
+
+@Module(includes = {
+        ClientChannelFactoryModule.class,
+        SslConfigModule.class
+})
+public interface CustomClientChannelFactoryModule {
+
+    @Provides
+    @UserAgent
+    static String providesUserAgent() {
+        return BarrageSessionFactoryConfig.userAgent(List.of("deephaven-server-jetty-custom"));
+    }
+}
diff --git a/server/jetty-app-custom/src/main/java/io/deephaven/server/custom/CustomComponentFactory.java b/server/jetty-app-custom/src/main/java/io/deephaven/server/custom/CustomComponentFactory.java
index 543514b8fee..22cf12662b8 100644
--- a/server/jetty-app-custom/src/main/java/io/deephaven/server/custom/CustomComponentFactory.java
+++ b/server/jetty-app-custom/src/main/java/io/deephaven/server/custom/CustomComponentFactory.java
@@ -10,6 +10,7 @@
 import dagger.Provides;
 import dagger.multibindings.IntoSet;
 import io.deephaven.appmode.ApplicationState;
+import io.deephaven.client.impl.BarrageSessionFactoryConfig;
 import io.deephaven.configuration.Configuration;
 import io.deephaven.server.auth.AuthorizationProvider;
 import io.deephaven.server.custom.CustomComponentFactory.CustomComponent;
@@ -18,9 +19,11 @@
 import io.deephaven.server.jetty.JettyServerModule;
 import io.deephaven.server.runner.CommunityDefaultsModule;
 import io.deephaven.server.runner.ComponentFactoryBase;
+import io.deephaven.server.session.ClientChannelFactoryModule.UserAgent;
 
 import javax.inject.Singleton;
 import java.io.PrintStream;
+import java.util.List;
 
 /**
  * An example of a "custom integrator" component factory. This is not meant to be an exhaustive example of Deephaven
@@ -71,6 +74,7 @@ interface Builder extends JettyServerComponent.Builder<Builder, CustomComponent>
 
     @Module(includes = {
             JettyServerModule.class,
+            CustomClientChannelFactoryModule.class,
             CommunityDefaultsModule.class,
     })
     public interface CustomModule {
diff --git a/server/jetty-app/README.md b/server/jetty-app/README.md
index 5f4538c942c..c48de457f67 100644
--- a/server/jetty-app/README.md
+++ b/server/jetty-app/README.md
@@ -4,7 +4,7 @@ This README is oriented towards getting a server up for local development in a d
 
 If you wish to use Deephaven from a production environment, which is simpler but source code cannot be modified, see one of the following documents:
 
-- [Quickstart for Docker](https://deephaven.io/core/docs/tutorials/quickstart/)
+- [Quickstart for Docker](https://deephaven.io/core/docs/getting-started/quickstart/)
 - [How to configure the Deephaven native application](https://deephaven.io/core/docs/how-to-guides/configuration/native-application/)
 
 This README deals with general development for either the Python or Groovy server-side API. For Python-specific development instructions, see the [Python development README](../../py/README.md).
diff --git a/server/jetty-app/build.gradle b/server/jetty-app/build.gradle
index b2024d8b209..fae715c29fa 100644
--- a/server/jetty-app/build.gradle
+++ b/server/jetty-app/build.gradle
@@ -1,6 +1,7 @@
 plugins {
     id 'application'
     id 'io.deephaven.project.register'
+    id 'io.deephaven.optional-server-dependencies'
 }
 
 configurations {
@@ -10,10 +11,15 @@ configurations {
 dependencies {
     implementation project(':server-jetty')
 
+    implementation project(':extensions-flight-sql')
+
+    implementation libs.dagger
+    annotationProcessor libs.dagger.compiler
+
     runtimeOnly project(':log-to-slf4j')
     runtimeOnly project(':logback-print-stream-globals')
     runtimeOnly project(':logback-logbuffer')
-    Classpaths.inheritLogbackClassic(project)
+    runtimeOnly libs.logback.classic
 }
 
 distributions {
@@ -32,37 +38,14 @@ if (hasProperty('groovy')) {
 }
 
 if (!hasProperty('excludeHotspotImpl')) {
-    dependencies {
-        runtimeOnly project(':hotspot-impl')
-    }
-    extraJvmArgs += ['--add-exports', 'java.management/sun.management=ALL-UNNAMED']
+   extraJvmArgs += ['--add-exports', 'java.management/sun.management=ALL-UNNAMED']
 }
 
 if (!hasProperty('excludeClockImpl')) {
-    dependencies {
-        runtimeOnly project(':clock-impl')
-    }
     extraJvmArgs += ['--add-exports', 'java.base/jdk.internal.misc=ALL-UNNAMED']
 }
 
-if (!hasProperty('excludeSql')) {
-    dependencies {
-        runtimeOnly project(':engine-sql')
-    }
-}
-
-if (!hasProperty('excludeS3')) {
-    dependencies {
-        runtimeOnly project(':extensions-s3')
-        runtimeOnly project(':extensions-iceberg-s3')
-    }
-}
-
-if (!hasProperty('excludeJson')) {
-    dependencies {
-        runtimeOnly project(':extensions-json-jackson')
-    }
-}
+// Note: add optional server dependencies to io.deephaven.optional-server-dependencies plugin in buildSrc
 
 def authHandlers = []
 def authConfigs = ['AuthHandlers']
diff --git a/server/jetty/src/main/java/io/deephaven/server/jetty/CommunityComponentFactory.java b/server/jetty-app/src/main/java/io/deephaven/server/jetty/CommunityComponentFactory.java
similarity index 92%
rename from server/jetty/src/main/java/io/deephaven/server/jetty/CommunityComponentFactory.java
rename to server/jetty-app/src/main/java/io/deephaven/server/jetty/CommunityComponentFactory.java
index 9b91fd187ea..c67c03f0d19 100644
--- a/server/jetty/src/main/java/io/deephaven/server/jetty/CommunityComponentFactory.java
+++ b/server/jetty-app/src/main/java/io/deephaven/server/jetty/CommunityComponentFactory.java
@@ -7,6 +7,7 @@
 import dagger.Module;
 import io.deephaven.configuration.Configuration;
 import io.deephaven.server.auth.CommunityAuthorizationModule;
+import io.deephaven.server.flightsql.FlightSqlModule;
 import io.deephaven.server.runner.CommunityDefaultsModule;
 import io.deephaven.server.runner.ComponentFactoryBase;
 
@@ -64,11 +65,15 @@ interface Builder extends JettyServerComponent.Builder<Builder, CommunityCompone
      * The out-of-the-box community {@link Module}.
      *
      * @see JettyServerModule
+     * @see FlightSqlModule
+     * @see JettyClientChannelFactoryModule
      * @see CommunityAuthorizationModule
      * @see CommunityDefaultsModule
      */
     @Module(includes = {
             JettyServerModule.class,
+            FlightSqlModule.class,
+            JettyClientChannelFactoryModule.class,
             CommunityAuthorizationModule.class,
             CommunityDefaultsModule.class,
             // Implementation note: when / if modules are migrated out of CommunityDefaultsModule, they will need to be
diff --git a/server/jetty-app/src/main/java/io/deephaven/server/jetty/JettyClientChannelFactoryModule.java b/server/jetty-app/src/main/java/io/deephaven/server/jetty/JettyClientChannelFactoryModule.java
new file mode 100644
index 00000000000..64327b991a3
--- /dev/null
+++ b/server/jetty-app/src/main/java/io/deephaven/server/jetty/JettyClientChannelFactoryModule.java
@@ -0,0 +1,26 @@
+//
+// Copyright (c) 2016-2024 Deephaven Data Labs and Patent Pending
+//
+package io.deephaven.server.jetty;
+
+import dagger.Module;
+import dagger.Provides;
+import io.deephaven.client.impl.BarrageSessionFactoryConfig;
+import io.deephaven.server.session.ClientChannelFactoryModule;
+import io.deephaven.server.session.ClientChannelFactoryModule.UserAgent;
+import io.deephaven.server.session.SslConfigModule;
+
+import java.util.List;
+
+@Module(includes = {
+        ClientChannelFactoryModule.class,
+        SslConfigModule.class
+})
+public interface JettyClientChannelFactoryModule {
+
+    @Provides
+    @UserAgent
+    static String providesUserAgent() {
+        return BarrageSessionFactoryConfig.userAgent(List.of("deephaven-server-jetty-app"));
+    }
+}
diff --git a/server/jetty-app/src/main/resources/logback.xml b/server/jetty-app/src/main/resources/logback.xml
index 4ab572fd3f8..d9e92155c9a 100644
--- a/server/jetty-app/src/main/resources/logback.xml
+++ b/server/jetty-app/src/main/resources/logback.xml
@@ -22,8 +22,7 @@
   <!-- individual package levels can be change -->
   <!--<logger name="io.netty" level="INFO"/>-->
   <!--<logger name="io.deephaven" level="INFO"/>-->
-
-  <logger name="io.deephaven.sql.SqlAdapter" level="DEBUG"/>
+  <!--<logger name="io.grpc" level="TRACE"/>-->
 
   <!-- Increase the log level to WARN to avoid excessive logging when getting/returning compressors/decompressors -->
   <logger name="org.apache.hadoop.io.compress.CodecPool" level="WARN"/>
diff --git a/server/jetty/build.gradle b/server/jetty/build.gradle
index 44e91f47a43..419f4475e80 100644
--- a/server/jetty/build.gradle
+++ b/server/jetty/build.gradle
@@ -10,42 +10,53 @@ dependencies {
     api(project(':Integrations')) {
         because 'downstream dagger compile'
     }
+
+    implementation project(':util-thread')
+    compileOnlyApi(project(':util-thread')) {
+        because 'downstream dagger compile'
+    }
+
     runtimeOnly(project(':web'))
 
-    Classpaths.inheritDagger(project)
-    Classpaths.inheritDagger(project, /* test */ true)
+    implementation libs.dagger
+    annotationProcessor libs.dagger.compiler
+
+    testImplementation libs.dagger
+    testAnnotationProcessor libs.dagger.compiler
 
-    Classpaths.inheritGrpcPlatform(project)
-    Classpaths.inheritJetty11Platform(project)
+    implementation platform(libs.grpc.bom)
+    implementation platform(libs.jetty.bom)
 
-    api 'jakarta.servlet:jakarta.servlet-api:5.0.0'
-    implementation 'org.eclipse.jetty:jetty-servlet'
-    implementation 'org.eclipse.jetty:jetty-servlets'
-    implementation 'org.eclipse.jetty:jetty-webapp'
-    implementation 'org.eclipse.jetty.http2:http2-server'
-    implementation 'org.eclipse.jetty:jetty-alpn-server'
+    api libs.jakarata.servlet.api
+    implementation libs.jetty.servlet
+    implementation libs.jetty.servlets
+    implementation libs.jetty.webapp
+    implementation libs.jetty.http2.server
+    implementation libs.jetty.alpn.server
     // TODO(deephaven-core#2506): Support for alternative ALPN implementations
-    runtimeOnly 'org.eclipse.jetty:jetty-alpn-java-server'
+    runtimeOnly libs.jetty.alpn.java.server
 
 //    implementation 'io.grpc:grpc-servlet-jakarta'
     api(project(':grpc-java:grpc-servlet-jakarta')) {
         because 'downstream dagger compile'
     }
     implementation project(':grpc-java:grpc-servlet-websocket-jakarta')
-    implementation 'org.eclipse.jetty.websocket:websocket-jakarta-server'
+    implementation libs.jetty.websocket.jakarta.server
+
+    compileOnly project(':util-immutables')
+    annotationProcessor libs.immutables.value
 
-    Classpaths.inheritImmutables(project)
     implementation project(':ssl-kickstart')
-    Classpaths.inheritSSLContext(project, 'sslcontext-kickstart-for-jetty')
+    implementation libs.sslcontext.kickstart.jetty
 
     implementation project(':grpc-java:grpc-mtls')
 
     testImplementation project(':server-test-utils')
-    Classpaths.inheritJUnitClassic(project, 'testImplementation')
-    Classpaths.inheritAssertJ(project)
+    testImplementation libs.junit4
+    testImplementation libs.assertj
 
     testRuntimeOnly project(':log-to-slf4j')
-    Classpaths.inheritSlf4j(project, 'slf4j-simple', 'testRuntimeOnly')
+    testRuntimeOnly libs.slf4j.simple
 }
 
 test.systemProperty "PeriodicUpdateGraph.allowUnitTestMode", false
diff --git a/server/jetty/src/main/java/io/deephaven/server/jetty/JettyBackedGrpcServer.java b/server/jetty/src/main/java/io/deephaven/server/jetty/JettyBackedGrpcServer.java
index 6122b287bcc..05b74e53253 100644
--- a/server/jetty/src/main/java/io/deephaven/server/jetty/JettyBackedGrpcServer.java
+++ b/server/jetty/src/main/java/io/deephaven/server/jetty/JettyBackedGrpcServer.java
@@ -47,16 +47,17 @@
 import org.eclipse.jetty.servlet.DefaultServlet;
 import org.eclipse.jetty.servlet.ErrorPageErrorHandler;
 import org.eclipse.jetty.servlet.FilterHolder;
+import org.eclipse.jetty.servlet.ServletContextHandler;
 import org.eclipse.jetty.servlet.ServletHolder;
 import org.eclipse.jetty.servlets.CrossOriginFilter;
 import org.eclipse.jetty.util.MultiException;
 import org.eclipse.jetty.util.component.Graceful;
 import org.eclipse.jetty.util.resource.Resource;
 import org.eclipse.jetty.util.ssl.SslContextFactory;
-import org.eclipse.jetty.webapp.WebAppContext;
 import org.eclipse.jetty.websocket.jakarta.common.SessionTracker;
 import org.eclipse.jetty.websocket.jakarta.server.config.JakartaWebSocketServletContainerInitializer;
 import org.eclipse.jetty.websocket.jakarta.server.internal.JakartaWebSocketServerContainer;
+import org.jetbrains.annotations.Nullable;
 
 import javax.inject.Inject;
 import javax.inject.Singleton;
@@ -93,9 +94,11 @@ public JettyBackedGrpcServer(
         jetty = new Server();
         jetty.addConnector(createConnector(jetty, config));
 
-        final WebAppContext context =
-                new WebAppContext(null, "/", null, null, null, new ErrorPageErrorHandler(), NO_SESSIONS);
+        final ServletContextHandler context =
+                new ServletContextHandler(null, "/", null, null, null, new ErrorPageErrorHandler(), NO_SESSIONS);
         try {
+            // Build a URL to a known file on the classpath, so Jetty can load resources from that jar to serve as
+            // static content
             String knownFile = "/ide/index.html";
             URL ide = JettyBackedGrpcServer.class.getResource(knownFile);
             Resource jarContents = Resource.newResource(ide.toExternalForm().replace("!" + knownFile, "!/"));
@@ -103,7 +106,8 @@ public JettyBackedGrpcServer(
         } catch (IOException ioException) {
             throw new UncheckedIOException(ioException);
         }
-        context.setInitParameter(DefaultServlet.CONTEXT_INIT + "dirAllowed", "false");
+        // Register a DefaultServlet to serve our custom resources
+        context.addServlet(servletHolder("default", null), "/*");
 
         // Cache all of the appropriate assets folders
         for (String appRoot : List.of("/ide/", "/iframe/table/", "/iframe/chart/", "/iframe/widget/")) {
@@ -325,6 +329,7 @@ private static ServerConnector createConnector(Server server, JettyConfig config
             httpConfig.addCustomizer(new SecureRequestCustomizer(config.sniHostCheck()));
             final HTTP2ServerConnectionFactory h2 = new HTTP2ServerConnectionFactory(httpConfig);
             h2.setRateControlFactory(new RateControl.Factory() {});
+            config.maxConcurrentStreams().ifPresent(h2::setMaxConcurrentStreams);
 
             final ALPNServerConnectionFactory alpn = new ALPNServerConnectionFactory();
             alpn.setDefaultProtocol(http11 != null ? http11.getProtocol() : h2.getProtocol());
@@ -345,6 +350,8 @@ private static ServerConnector createConnector(Server server, JettyConfig config
         } else {
             final HTTP2CServerConnectionFactory h2c = new HTTP2CServerConnectionFactory(httpConfig);
             h2c.setRateControlFactory(new RateControl.Factory() {});
+            config.maxConcurrentStreams().ifPresent(h2c::setMaxConcurrentStreams);
+
             if (http11 != null) {
                 serverConnector = new ServerConnector(server, http11, h2c);
             } else {
@@ -353,6 +360,7 @@ private static ServerConnector createConnector(Server server, JettyConfig config
         }
         config.host().ifPresent(serverConnector::setHost);
         serverConnector.setPort(config.port());
+        config.maxHeaderRequestSize().ifPresent(httpConfig::setRequestHeaderSize);
 
         // Give connections extra time to shutdown, since we have an explicit server shutdown
         serverConnector.setShutdownIdleTimeout(serverConnector.getIdleTimeout());
@@ -376,12 +384,14 @@ public void onClosed(Connection connection) {
         return serverConnector;
     }
 
-    private static ServletHolder servletHolder(String name, URI filesystemUri) {
+    private static ServletHolder servletHolder(String name, @Nullable URI filesystemUri) {
         final ServletHolder jsPlugins = new ServletHolder(name, DefaultServlet.class);
-        // Note, the URI needs explicitly be parseable as a directory URL ending in "!/", a requirement of the jetty
-        // resource creation implementation, see
-        // org.eclipse.jetty.util.resource.Resource.newResource(java.lang.String, boolean)
-        jsPlugins.setInitParameter("resourceBase", filesystemUri.toString());
+        if (filesystemUri != null) {
+            // Note, the URI needs explicitly be parseable as a directory URL ending in "!/", a requirement of the jetty
+            // resource creation implementation, see
+            // org.eclipse.jetty.util.resource.Resource.newResource(java.lang.String, boolean)
+            jsPlugins.setInitParameter("resourceBase", filesystemUri.toString());
+        }
         jsPlugins.setInitParameter("pathInfoOnly", "true");
         jsPlugins.setInitParameter("dirAllowed", "false");
         jsPlugins.setAsyncSupported(true);
diff --git a/server/jetty/src/main/java/io/deephaven/server/jetty/JettyConfig.java b/server/jetty/src/main/java/io/deephaven/server/jetty/JettyConfig.java
index 109cd2371d3..5dc058c8e16 100644
--- a/server/jetty/src/main/java/io/deephaven/server/jetty/JettyConfig.java
+++ b/server/jetty/src/main/java/io/deephaven/server/jetty/JettyConfig.java
@@ -11,6 +11,8 @@
 import org.immutables.value.Value.Style;
 
 import javax.annotation.Nullable;
+import java.util.Optional;
+import java.util.OptionalInt;
 import java.util.OptionalLong;
 
 /**
@@ -29,6 +31,8 @@ public abstract class JettyConfig implements ServerConfig {
     public static final String HTTP_STREAM_TIMEOUT = "http2.stream.idleTimeoutMs";
     public static final String HTTP_COMPRESSION = "http.compression";
     public static final String SNI_HOST_CHECK = "https.sniHostCheck";
+    public static final String MAX_CONCURRENT_STREAMS = "http2.maxConcurrentStreams";
+    public static final String MAX_HEADER_REQUEST_SIZE = "http.maxHeaderRequestSize";
 
     /**
      * Values to indicate what kind of websocket support should be offered.
@@ -93,6 +97,8 @@ public static Builder buildFromConfig(Configuration config) {
         String httpCompression = config.getStringWithDefault(HTTP_COMPRESSION, null);
         String sniHostCheck = config.getStringWithDefault(SNI_HOST_CHECK, null);
         String h2StreamIdleTimeout = config.getStringWithDefault(HTTP_STREAM_TIMEOUT, null);
+        String h2MaxConcurrentStreams = config.getStringWithDefault(MAX_CONCURRENT_STREAMS, null);
+        String maxHeaderRequestSize = config.getStringWithDefault(MAX_HEADER_REQUEST_SIZE, null);
         if (httpWebsockets != null) {
             switch (httpWebsockets.toLowerCase()) {
                 case "true":// backwards compatible
@@ -122,6 +128,12 @@ public static Builder buildFromConfig(Configuration config) {
         if (sniHostCheck != null) {
             builder.sniHostCheck(Boolean.parseBoolean(sniHostCheck));
         }
+        if (h2MaxConcurrentStreams != null) {
+            builder.maxConcurrentStreams(Integer.parseInt(h2MaxConcurrentStreams));
+        }
+        if (maxHeaderRequestSize != null) {
+            builder.maxHeaderRequestSize(Integer.parseInt(maxHeaderRequestSize));
+        }
         return builder;
     }
 
@@ -212,6 +224,16 @@ public final boolean httpCompressionOrDefault() {
         return httpCompression == null || httpCompression;
     }
 
+    /**
+     * Value is in bytes. If unset, uses Jetty's default (presently 8192).
+     */
+    public abstract OptionalInt maxHeaderRequestSize();
+
+    /**
+     * If unset, uses Jetty's default (presently 128). Only applies to http2 connections.
+     */
+    public abstract OptionalInt maxConcurrentStreams();
+
     public interface Builder extends ServerConfig.Builder<JettyConfig, Builder> {
 
         Builder websockets(WebsocketsSupport websockets);
@@ -223,5 +245,9 @@ public interface Builder extends ServerConfig.Builder<JettyConfig, Builder> {
         Builder http2StreamIdleTimeout(long timeoutInMillis);
 
         Builder sniHostCheck(boolean sniHostCheck);
+
+        Builder maxHeaderRequestSize(int maxHeaderRequestSize);
+
+        Builder maxConcurrentStreams(int maxConcurrentStreams);
     }
 }
diff --git a/server/netty-app/build.gradle b/server/netty-app/build.gradle
index 95d9eeea483..e60911b6766 100644
--- a/server/netty-app/build.gradle
+++ b/server/netty-app/build.gradle
@@ -1,6 +1,7 @@
 plugins {
     id 'application'
     id 'io.deephaven.project.register'
+    id 'io.deephaven.optional-server-dependencies'
 }
 
 configurations {
@@ -13,7 +14,7 @@ dependencies {
     runtimeOnly project(':log-to-slf4j')
     runtimeOnly project(':logback-print-stream-globals')
     runtimeOnly project(':logback-logbuffer')
-    Classpaths.inheritLogbackClassic(project)
+    runtimeOnly libs.logback.classic
 }
 
 distributions {
@@ -32,31 +33,14 @@ if (hasProperty('groovy')) {
 }
 
 if (!hasProperty('excludeHotspotImpl')) {
-    dependencies {
-        runtimeOnly project(':hotspot-impl')
-    }
     extraJvmArgs += ['--add-exports', 'java.management/sun.management=ALL-UNNAMED']
 }
 
 if (!hasProperty('excludeClockImpl')) {
-    dependencies {
-        runtimeOnly project(':clock-impl')
-    }
     extraJvmArgs += ['--add-exports', 'java.base/jdk.internal.misc=ALL-UNNAMED']
 }
 
-if (!hasProperty('excludeSql')) {
-    dependencies {
-        runtimeOnly project(':engine-sql')
-    }
-}
-
-if (!hasProperty('excludeS3')) {
-    dependencies {
-        runtimeOnly project(':extensions-s3')
-        runtimeOnly project(':extensions-iceberg-s3')
-    }
-}
+// Note: add optional server dependencies to io.deephaven.optional-server-dependencies plugin in buildSrc
 
 def authHandlers = []
 def authConfigs = ['AuthHandlers']
diff --git a/server/netty/build.gradle b/server/netty/build.gradle
index 3eacfa0724a..e771ab1c075 100644
--- a/server/netty/build.gradle
+++ b/server/netty/build.gradle
@@ -11,24 +11,31 @@ dependencies {
         because 'downstream dagger compile'
     }
 
-    Classpaths.inheritDagger(project)
-    Classpaths.inheritDagger(project, /* test */ true)
+    implementation project(":util-thread")
 
-    Classpaths.inheritGrpcPlatform(project)
-    implementation 'io.grpc:grpc-netty'
+    implementation libs.dagger
+    annotationProcessor libs.dagger.compiler
+
+    testImplementation libs.dagger
+    testAnnotationProcessor libs.dagger.compiler
+
+    implementation platform(libs.grpc.bom)
+    implementation libs.grpc.netty
+
+    compileOnly project(':util-immutables')
+    annotationProcessor libs.immutables.value
 
-    Classpaths.inheritImmutables(project)
     implementation project(':ssl-kickstart')
-    Classpaths.inheritSSLContext(project, 'sslcontext-kickstart-for-netty')
+    implementation libs.sslcontext.kickstart.netty
 
     implementation project(':grpc-java:grpc-mtls')
 
     testImplementation project(':server-test-utils')
-    Classpaths.inheritJUnitClassic(project, 'testImplementation')
-    Classpaths.inheritAssertJ(project)
+    testImplementation libs.junit4
+    testImplementation libs.assertj
 
     testRuntimeOnly project(':log-to-slf4j')
-    Classpaths.inheritSlf4j(project, 'slf4j-simple', 'testRuntimeOnly')
+    testRuntimeOnly libs.slf4j.simple
 }
 
 test.systemProperty "PeriodicUpdateGraph.allowUnitTestMode", false
diff --git a/server/netty/src/main/java/io/deephaven/server/netty/DeprecatedCommunityComponentFactory.java b/server/netty/src/main/java/io/deephaven/server/netty/DeprecatedCommunityComponentFactory.java
index 6e22f799200..6c716989329 100644
--- a/server/netty/src/main/java/io/deephaven/server/netty/DeprecatedCommunityComponentFactory.java
+++ b/server/netty/src/main/java/io/deephaven/server/netty/DeprecatedCommunityComponentFactory.java
@@ -5,6 +5,7 @@
 
 import dagger.BindsInstance;
 import dagger.Component;
+import dagger.Module;
 import io.deephaven.configuration.Configuration;
 import io.deephaven.server.auth.CommunityAuthorizationModule;
 import io.deephaven.server.netty.DeprecatedCommunityComponentFactory.CommunityComponent;
@@ -34,11 +35,7 @@ public CommunityComponent build(Configuration configuration, PrintStream out, Pr
 
     @Deprecated
     @Singleton
-    @Component(modules = {
-            NettyServerModule.class,
-            CommunityAuthorizationModule.class,
-            CommunityDefaultsModule.class,
-    })
+    @Component(modules = CommunityModule.class)
     public interface CommunityComponent extends DeephavenApiServerComponent {
 
         @Component.Builder
@@ -47,4 +44,15 @@ interface Builder extends DeephavenApiServerComponent.Builder<Builder, Community
             Builder withNettyConfig(NettyConfig config);
         }
     }
+
+    @Deprecated
+    @Module(includes = {
+            NettyServerModule.class,
+            NettyClientChannelFactoryModule.class,
+            CommunityAuthorizationModule.class,
+            CommunityDefaultsModule.class,
+    })
+    public interface CommunityModule {
+
+    }
 }
diff --git a/server/netty/src/main/java/io/deephaven/server/netty/NettyClientChannelFactoryModule.java b/server/netty/src/main/java/io/deephaven/server/netty/NettyClientChannelFactoryModule.java
new file mode 100644
index 00000000000..961b1a74774
--- /dev/null
+++ b/server/netty/src/main/java/io/deephaven/server/netty/NettyClientChannelFactoryModule.java
@@ -0,0 +1,26 @@
+//
+// Copyright (c) 2016-2024 Deephaven Data Labs and Patent Pending
+//
+package io.deephaven.server.netty;
+
+import dagger.Module;
+import dagger.Provides;
+import io.deephaven.client.impl.BarrageSessionFactoryConfig;
+import io.deephaven.server.session.ClientChannelFactoryModule;
+import io.deephaven.server.session.ClientChannelFactoryModule.UserAgent;
+import io.deephaven.server.session.SslConfigModule;
+
+import java.util.List;
+
+@Module(includes = {
+        ClientChannelFactoryModule.class,
+        SslConfigModule.class
+})
+public interface NettyClientChannelFactoryModule {
+
+    @Provides
+    @UserAgent
+    static String providesUserAgent() {
+        return BarrageSessionFactoryConfig.userAgent(List.of("deephaven-server-netty"));
+    }
+}
diff --git a/server/src/main/java/io/deephaven/client/ClientDefaultsModule.java b/server/src/main/java/io/deephaven/client/ClientDefaultsModule.java
new file mode 100644
index 00000000000..208ee71bf3f
--- /dev/null
+++ b/server/src/main/java/io/deephaven/client/ClientDefaultsModule.java
@@ -0,0 +1,32 @@
+//
+// Copyright (c) 2016-2024 Deephaven Data Labs and Patent Pending
+//
+package io.deephaven.client;
+
+import dagger.Module;
+import dagger.Provides;
+import io.deephaven.client.impl.BarrageSessionFactoryConfig;
+import io.deephaven.client.impl.ClientChannelFactory;
+import io.deephaven.server.session.ClientChannelFactoryModule;
+import io.deephaven.server.session.ClientChannelFactoryModule.UserAgent;
+import io.deephaven.server.session.SslConfigModule;
+
+import java.util.List;
+
+/**
+ * @deprecated Integrators are encouraged to provide their own {@link ClientChannelFactory}, in particular with respect
+ *             to {@link BarrageSessionFactoryConfig#userAgent(List)}.
+ */
+@Module(includes = {
+        ClientChannelFactoryModule.class,
+        SslConfigModule.class,
+})
+@Deprecated(forRemoval = true)
+public interface ClientDefaultsModule {
+
+    @Provides
+    @UserAgent
+    static String providesUserAgent() {
+        return BarrageSessionFactoryConfig.userAgent(List.of("deephaven-server"));
+    }
+}
diff --git a/server/src/main/java/io/deephaven/server/arrow/ArrowFlightUtil.java b/server/src/main/java/io/deephaven/server/arrow/ArrowFlightUtil.java
index f25d5f3abb9..be2b5f63b52 100644
--- a/server/src/main/java/io/deephaven/server/arrow/ArrowFlightUtil.java
+++ b/server/src/main/java/io/deephaven/server/arrow/ArrowFlightUtil.java
@@ -47,7 +47,6 @@
 import io.grpc.stub.ServerCallStreamObserver;
 import io.grpc.stub.StreamObserver;
 import org.apache.arrow.flatbuf.MessageHeader;
-import org.apache.arrow.flatbuf.Schema;
 import org.apache.arrow.flight.impl.Flight;
 import org.jetbrains.annotations.NotNull;
 
@@ -121,6 +120,7 @@ public static void DoGetCustom(
                     .queryPerformanceRecorder(queryPerformanceRecorder)
                     .require(tableExport)
                     .onError(observer)
+                    .onSuccess(observer)
                     .submit(() -> {
                         metrics.queueNanos = System.nanoTime() - queueStartTm;
                         Object export = tableExport.get();
@@ -147,8 +147,6 @@ public static void DoGetCustom(
                         // shared code between `DoGet` and `BarrageSnapshotRequest`
                         BarrageUtil.createAndSendSnapshot(streamGeneratorFactory, table, null, null, false,
                                 DEFAULT_SNAPSHOT_DESER_OPTIONS, listener, metrics);
-
-                        listener.onCompleted();
                     });
         }
     }
@@ -217,7 +215,7 @@ public void onNext(final InputStream request) {
             }
 
             if (mi.header.headerType() == MessageHeader.Schema) {
-                parseSchema((Schema) mi.header.header(new Schema()));
+                configureWithSchema(parseArrowSchema(mi));
                 return;
             }
 
@@ -545,6 +543,27 @@ public void handleMessage(@NotNull final BarrageProtoUtil.MessageInfo message) {
                                 .queryPerformanceRecorder(queryPerformanceRecorder)
                                 .require(tableExport)
                                 .onError(listener)
+                                .onSuccess(() -> {
+                                    final HalfClosedState newState = halfClosedState.updateAndGet(current -> {
+                                        switch (current) {
+                                            case DONT_CLOSE:
+                                                // record that we have finished sending
+                                                return HalfClosedState.FINISHED_SENDING;
+                                            case CLIENT_HALF_CLOSED:
+                                                // since streaming has now finished, and client already half-closed,
+                                                // time to half close from server
+                                                return HalfClosedState.CLOSED;
+                                            case FINISHED_SENDING:
+                                            case CLOSED:
+                                                throw new IllegalStateException("Can't finish streaming twice");
+                                            default:
+                                                throw new IllegalStateException("Unknown state " + current);
+                                        }
+                                    });
+                                    if (newState == HalfClosedState.CLOSED) {
+                                        GrpcUtil.safelyComplete(listener);
+                                    }
+                                })
                                 .submit(() -> {
                                     metrics.queueNanos = System.nanoTime() - queueStartTm;
                                     Object export = tableExport.get();
@@ -587,25 +606,6 @@ public void handleMessage(@NotNull final BarrageProtoUtil.MessageInfo message) {
                                     BarrageUtil.createAndSendSnapshot(streamGeneratorFactory, table, columns, viewport,
                                             reverseViewport, snapshotOptAdapter.adapt(snapshotRequest), listener,
                                             metrics);
-                                    HalfClosedState newState = halfClosedState.updateAndGet(current -> {
-                                        switch (current) {
-                                            case DONT_CLOSE:
-                                                // record that we have finished sending
-                                                return HalfClosedState.FINISHED_SENDING;
-                                            case CLIENT_HALF_CLOSED:
-                                                // since streaming has now finished, and client already half-closed,
-                                                // time to half close from server
-                                                return HalfClosedState.CLOSED;
-                                            case FINISHED_SENDING:
-                                            case CLOSED:
-                                                throw new IllegalStateException("Can't finish streaming twice");
-                                            default:
-                                                throw new IllegalStateException("Unknown state " + current);
-                                        }
-                                    });
-                                    if (newState == HalfClosedState.CLOSED) {
-                                        listener.onCompleted();
-                                    }
                                 });
                     }
                 }
@@ -615,7 +615,7 @@ public void handleMessage(@NotNull final BarrageProtoUtil.MessageInfo message) {
             public void close() {
                 // no work to do for DoGetRequest close
                 // possibly safely complete if finished sending data
-                HalfClosedState newState = halfClosedState.updateAndGet(current -> {
+                final HalfClosedState newState = halfClosedState.updateAndGet(current -> {
                     switch (current) {
                         case DONT_CLOSE:
                             // record that we have half closed
@@ -631,7 +631,7 @@ public void close() {
                     }
                 });
                 if (newState == HalfClosedState.CLOSED) {
-                    listener.onCompleted();
+                    GrpcUtil.safelyComplete(listener);
                 }
             }
         }
diff --git a/server/src/main/java/io/deephaven/server/arrow/ArrowModule.java b/server/src/main/java/io/deephaven/server/arrow/ArrowModule.java
index 7f2b22aa464..13805733381 100644
--- a/server/src/main/java/io/deephaven/server/arrow/ArrowModule.java
+++ b/server/src/main/java/io/deephaven/server/arrow/ArrowModule.java
@@ -6,6 +6,7 @@
 import dagger.Binds;
 import dagger.Module;
 import dagger.Provides;
+import dagger.multibindings.ElementsIntoSet;
 import dagger.multibindings.IntoSet;
 import io.deephaven.barrage.flatbuf.BarrageSnapshotRequest;
 import io.deephaven.barrage.flatbuf.BarrageSubscriptionRequest;
@@ -14,9 +15,12 @@
 import io.deephaven.extensions.barrage.BarrageSubscriptionOptions;
 import io.deephaven.server.barrage.BarrageMessageProducer;
 import io.deephaven.extensions.barrage.BarrageStreamGeneratorImpl;
+import io.deephaven.server.session.ActionResolver;
+import io.deephaven.server.session.TicketResolver;
 import io.grpc.BindableService;
 
 import javax.inject.Singleton;
+import java.util.Set;
 
 @Module
 public abstract class ArrowModule {
@@ -43,4 +47,16 @@ static BarrageMessageProducer.Adapter<BarrageSubscriptionRequest, BarrageSubscri
     static BarrageMessageProducer.Adapter<BarrageSnapshotRequest, BarrageSnapshotOptions> snapshotOptAdapter() {
         return BarrageSnapshotOptions::of;
     }
+
+    @Provides
+    @ElementsIntoSet
+    static Set<TicketResolver> primesEmptyTicketResolvers() {
+        return Set.of();
+    }
+
+    @Provides
+    @ElementsIntoSet
+    static Set<ActionResolver> primesEmptyActionResolvers() {
+        return Set.of();
+    }
 }
diff --git a/server/src/main/java/io/deephaven/server/arrow/FlightServiceGrpcImpl.java b/server/src/main/java/io/deephaven/server/arrow/FlightServiceGrpcImpl.java
index f290dc75860..49925075e23 100644
--- a/server/src/main/java/io/deephaven/server/arrow/FlightServiceGrpcImpl.java
+++ b/server/src/main/java/io/deephaven/server/arrow/FlightServiceGrpcImpl.java
@@ -3,10 +3,13 @@
 //
 package io.deephaven.server.arrow;
 
+import com.github.f4b6a3.uuid.UuidCreator;
+import com.github.f4b6a3.uuid.exception.InvalidUuidException;
 import com.google.protobuf.ByteString;
 import com.google.protobuf.ByteStringAccess;
 import com.google.protobuf.InvalidProtocolBufferException;
 import com.google.rpc.Code;
+import io.deephaven.auth.AuthContext;
 import io.deephaven.auth.AuthenticationException;
 import io.deephaven.auth.AuthenticationRequestHandler;
 import io.deephaven.auth.BasicAuthMarshaller;
@@ -20,14 +23,19 @@
 import io.deephaven.proto.backplane.grpc.ExportNotification;
 import io.deephaven.proto.backplane.grpc.WrappedAuthenticationRequest;
 import io.deephaven.proto.util.Exceptions;
+import io.deephaven.server.session.ActionRouter;
 import io.deephaven.server.session.SessionService;
 import io.deephaven.server.session.SessionState;
 import io.deephaven.server.session.TicketRouter;
-import io.deephaven.auth.AuthContext;
 import io.deephaven.util.SafeCloseable;
 import io.grpc.StatusRuntimeException;
+import io.grpc.stub.ServerCallStreamObserver;
 import io.grpc.stub.StreamObserver;
+import org.apache.arrow.flight.ProtocolExposer;
+import org.apache.arrow.flight.auth2.Auth2Constants;
 import org.apache.arrow.flight.impl.Flight;
+import org.apache.arrow.flight.impl.Flight.ActionType;
+import org.apache.arrow.flight.impl.Flight.Empty;
 import org.apache.arrow.flight.impl.FlightServiceGrpc;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
@@ -35,9 +43,17 @@
 import javax.inject.Inject;
 import javax.inject.Singleton;
 import java.io.InputStream;
+import java.nio.charset.StandardCharsets;
 import java.util.Map;
 import java.util.Optional;
+import java.util.UUID;
 import java.util.concurrent.ScheduledExecutorService;
+import java.util.function.Consumer;
+import java.util.function.Function;
+
+import static io.deephaven.extensions.barrage.util.GrpcUtil.safelyComplete;
+import static io.deephaven.extensions.barrage.util.GrpcUtil.safelyError;
+import static io.deephaven.extensions.barrage.util.GrpcUtil.safelyOnNextAndComplete;
 
 @Singleton
 public class FlightServiceGrpcImpl extends FlightServiceGrpc.FlightServiceImplBase {
@@ -48,6 +64,7 @@ public class FlightServiceGrpcImpl extends FlightServiceGrpc.FlightServiceImplBa
     private final SessionService sessionService;
     private final SessionService.ErrorTransformer errorTransformer;
     private final TicketRouter ticketRouter;
+    private final ActionRouter actionRouter;
     private final ArrowFlightUtil.DoExchangeMarshaller.Factory doExchangeFactory;
 
     private final Map<String, AuthenticationRequestHandler> authRequestHandlers;
@@ -59,6 +76,7 @@ public FlightServiceGrpcImpl(
             final SessionService sessionService,
             final SessionService.ErrorTransformer errorTransformer,
             final TicketRouter ticketRouter,
+            final ActionRouter actionRouter,
             final ArrowFlightUtil.DoExchangeMarshaller.Factory doExchangeFactory,
             Map<String, AuthenticationRequestHandler> authRequestHandlers) {
         this.executorService = executorService;
@@ -66,6 +84,7 @@ public FlightServiceGrpcImpl(
         this.sessionService = sessionService;
         this.errorTransformer = errorTransformer;
         this.ticketRouter = ticketRouter;
+        this.actionRouter = actionRouter;
         this.doExchangeFactory = doExchangeFactory;
         this.authRequestHandlers = authRequestHandlers;
     }
@@ -73,6 +92,30 @@ public FlightServiceGrpcImpl(
     @Override
     public StreamObserver<Flight.HandshakeRequest> handshake(
             @NotNull final StreamObserver<Flight.HandshakeResponse> responseObserver) {
+        // handle the scenario where authentication headers initialized a session
+        SessionState session = sessionService.getOptionalSession();
+        if (session != null) {
+            // Do not reply over the stream, some clients will break if they receive a message here - but since the
+            // session was already created, our "200 OK" will include the Bearer response already. Do not close
+            // yet to avoid hitting https://github.com/envoyproxy/envoy/issues/30149.
+            return new StreamObserver<>() {
+                @Override
+                public void onNext(Flight.HandshakeRequest value) {
+                    // noop, already sent response
+                }
+
+                @Override
+                public void onError(Throwable t) {
+                    // ignore, already closed
+                }
+
+                @Override
+                public void onCompleted() {
+                    safelyComplete(responseObserver);
+                }
+            };
+        }
+
         return new HandshakeObserver(responseObserver);
     }
 
@@ -87,16 +130,9 @@ private HandshakeObserver(StreamObserver<Flight.HandshakeResponse> responseObser
 
         @Override
         public void onNext(final Flight.HandshakeRequest value) {
-            // handle the scenario where authentication headers initialized a session
-            SessionState session = sessionService.getOptionalSession();
-            if (session != null) {
-                respondWithAuthTokenBin(session);
-                return;
-            }
-
             final AuthenticationRequestHandler.HandshakeResponseListener handshakeResponseListener =
                     (protocol, response) -> {
-                        GrpcUtil.safelyComplete(responseObserver, Flight.HandshakeResponse.newBuilder()
+                        safelyOnNextAndComplete(responseObserver, Flight.HandshakeResponse.newBuilder()
                                 .setProtocolVersion(protocol)
                                 .setPayload(ByteStringAccess.wrap(response))
                                 .build());
@@ -109,6 +145,23 @@ public void onNext(final Flight.HandshakeRequest value) {
                 auth = login(BasicAuthMarshaller.AUTH_TYPE, protocolVersion, payload, handshakeResponseListener);
                 if (auth.isEmpty()) {
                     final WrappedAuthenticationRequest req = WrappedAuthenticationRequest.parseFrom(payload);
+                    // If the auth request is bearer, the v1 auth might be trying to renew an existing session
+                    if (req.getType().equals(Auth2Constants.BEARER_PREFIX.trim())) {
+                        try {
+                            UUID uuid = UuidCreator.fromString(req.getPayload().toString(StandardCharsets.US_ASCII));
+                            SessionState session = sessionService.getSessionForToken(uuid);
+                            if (session != null) {
+                                SessionService.TokenExpiration expiration = session.getExpiration();
+                                if (expiration != null) {
+                                    respondWithAuthTokenBin(expiration);
+                                }
+                            }
+                            return;
+                        } catch (IllegalArgumentException | InvalidUuidException ignored) {
+                        }
+                    }
+
+                    // Attempt to log in with the given type and token
                     auth = login(req.getType(), protocolVersion, req.getPayload(), handshakeResponseListener);
                 }
             } catch (final AuthenticationException | InvalidProtocolBufferException err) {
@@ -122,8 +175,8 @@ public void onNext(final Flight.HandshakeRequest value) {
                 return;
             }
 
-            session = sessionService.newSession(auth.get());
-            respondWithAuthTokenBin(session);
+            SessionState session = sessionService.newSession(auth.get());
+            respondWithAuthTokenBin(session.getExpiration());
         }
 
         private Optional<AuthContext> login(String type, long version, ByteString payload,
@@ -137,10 +190,10 @@ private Optional<AuthContext> login(String type, long version, ByteString payloa
         }
 
         /** send the bearer token as an AuthTokenBin, as headers might have already been sent */
-        private void respondWithAuthTokenBin(SessionState session) {
+        private void respondWithAuthTokenBin(SessionService.TokenExpiration expiration) {
             isComplete = true;
             responseObserver.onNext(Flight.HandshakeResponse.newBuilder()
-                    .setPayload(session.getExpiration().getTokenAsByteString())
+                    .setPayload(expiration.getTokenAsByteString())
                     .build());
             responseObserver.onCompleted();
         }
@@ -160,14 +213,35 @@ public void onCompleted() {
         }
     }
 
+    @Override
+    public void doAction(Flight.Action request, StreamObserver<Flight.Result> responseObserver) {
+        actionRouter.doAction(
+                sessionService.getOptionalSession(),
+                ProtocolExposer.fromProtocol(request),
+                new ServerCallStreamObserverAdapter<>(
+                        (ServerCallStreamObserver<Flight.Result>) responseObserver, ProtocolExposer::toProtocol));
+    }
+
     @Override
     public void listFlights(
             @NotNull final Flight.Criteria request,
             @NotNull final StreamObserver<Flight.FlightInfo> responseObserver) {
+        if (!request.getExpression().isEmpty()) {
+            responseObserver.onError(
+                    Exceptions.statusRuntimeException(Code.INVALID_ARGUMENT, "Criteria expressions are not supported"));
+            return;
+        }
         ticketRouter.visitFlightInfo(sessionService.getOptionalSession(), responseObserver::onNext);
         responseObserver.onCompleted();
     }
 
+    @Override
+    public void listActions(Empty request, StreamObserver<ActionType> responseObserver) {
+        actionRouter.listActions(sessionService.getOptionalSession(),
+                adapt(responseObserver::onNext, ProtocolExposer::toProtocol));
+        responseObserver.onCompleted();
+    }
+
     @Override
     public void getFlightInfo(
             @NotNull final Flight.FlightDescriptor request,
@@ -183,14 +257,13 @@ public void getFlightInfo(
                     ticketRouter.flightInfoFor(session, request, "request");
 
             if (session != null) {
-                session.nonExport()
+                session.<Flight.FlightInfo>nonExport()
                         .queryPerformanceRecorder(queryPerformanceRecorder)
                         .require(export)
                         .onError(responseObserver)
-                        .submit(() -> {
-                            responseObserver.onNext(export.get());
-                            responseObserver.onCompleted();
-                        });
+                        .onSuccess((final Flight.FlightInfo resultFlightInfo) -> safelyOnNextAndComplete(
+                                responseObserver, resultFlightInfo))
+                        .submit(export::get);
                 return;
             }
 
@@ -198,15 +271,14 @@ public void getFlightInfo(
             if (export.tryRetainReference()) {
                 try {
                     if (export.getState() == ExportNotification.State.EXPORTED) {
-                        GrpcUtil.safelyOnNext(responseObserver, export.get());
-                        GrpcUtil.safelyComplete(responseObserver);
+                        safelyOnNextAndComplete(responseObserver, export.get());
                     }
                 } finally {
                     export.dropReference();
                 }
             } else {
                 exception = Exceptions.statusRuntimeException(Code.FAILED_PRECONDITION, "Could not find flight info");
-                GrpcUtil.safelyError(responseObserver, exception);
+                safelyError(responseObserver, exception);
             }
 
             if (queryPerformanceRecorder.endQuery() || exception != null) {
@@ -230,16 +302,16 @@ public void getSchema(
                     ticketRouter.flightInfoFor(session, request, "request");
 
             if (session != null) {
-                session.nonExport()
+                session.<Flight.SchemaResult>nonExport()
                         .queryPerformanceRecorder(queryPerformanceRecorder)
                         .require(export)
                         .onError(responseObserver)
-                        .submit(() -> {
-                            responseObserver.onNext(Flight.SchemaResult.newBuilder()
-                                    .setSchema(export.get().getSchema())
-                                    .build());
-                            responseObserver.onCompleted();
-                        });
+                        .onSuccess((final Flight.SchemaResult resultSchema) -> safelyOnNextAndComplete(
+                                responseObserver,
+                                resultSchema))
+                        .submit(() -> Flight.SchemaResult.newBuilder()
+                                .setSchema(export.get().getSchema())
+                                .build());
                 return;
             }
 
@@ -247,10 +319,9 @@ public void getSchema(
             if (export.tryRetainReference()) {
                 try {
                     if (export.getState() == ExportNotification.State.EXPORTED) {
-                        GrpcUtil.safelyOnNext(responseObserver, Flight.SchemaResult.newBuilder()
+                        safelyOnNextAndComplete(responseObserver, Flight.SchemaResult.newBuilder()
                                 .setSchema(export.get().getSchema())
                                 .build());
-                        GrpcUtil.safelyComplete(responseObserver);
                     }
                 } finally {
                     export.dropReference();
@@ -293,4 +364,8 @@ public StreamObserver<InputStream> doPutCustom(final StreamObserver<Flight.PutRe
     public StreamObserver<InputStream> doExchangeCustom(final StreamObserver<InputStream> responseObserver) {
         return doExchangeFactory.openExchange(sessionService.getCurrentSession(), responseObserver);
     }
+
+    private static <T, R> Consumer<T> adapt(Consumer<R> consumer, Function<? super T, ? extends R> function) {
+        return t -> consumer.accept(function.apply(t));
+    }
 }
diff --git a/server/src/main/java/io/deephaven/server/arrow/ServerCallStreamObserverAdapter.java b/server/src/main/java/io/deephaven/server/arrow/ServerCallStreamObserverAdapter.java
new file mode 100644
index 00000000000..77f15c136d1
--- /dev/null
+++ b/server/src/main/java/io/deephaven/server/arrow/ServerCallStreamObserverAdapter.java
@@ -0,0 +1,75 @@
+//
+// Copyright (c) 2016-2024 Deephaven Data Labs and Patent Pending
+//
+package io.deephaven.server.arrow;
+
+import io.grpc.stub.ServerCallStreamObserver;
+
+import java.util.Objects;
+import java.util.function.Function;
+
+final class ServerCallStreamObserverAdapter<T, R> extends ServerCallStreamObserver<T> {
+
+    private final ServerCallStreamObserver<R> delegate;
+    private final Function<T, R> f;
+
+    ServerCallStreamObserverAdapter(ServerCallStreamObserver<R> delegate, Function<T, R> f) {
+        this.delegate = Objects.requireNonNull(delegate);
+        this.f = Objects.requireNonNull(f);
+    }
+
+    @Override
+    public void onNext(T value) {
+        delegate.onNext(f.apply(value));
+    }
+
+    @Override
+    public void onError(Throwable t) {
+        delegate.onError(t);
+    }
+
+    @Override
+    public void onCompleted() {
+        delegate.onCompleted();
+    }
+
+    @Override
+    public boolean isCancelled() {
+        return delegate.isCancelled();
+    }
+
+    @Override
+    public void setOnCancelHandler(Runnable onCancelHandler) {
+        delegate.setOnCancelHandler(onCancelHandler);
+    }
+
+    @Override
+    public void setCompression(String compression) {
+        delegate.setCompression(compression);
+    }
+
+    @Override
+    public boolean isReady() {
+        return delegate.isReady();
+    }
+
+    @Override
+    public void setOnReadyHandler(Runnable onReadyHandler) {
+        delegate.setOnReadyHandler(onReadyHandler);
+    }
+
+    @Override
+    public void request(int count) {
+        delegate.request(count);
+    }
+
+    @Override
+    public void setMessageCompression(boolean enable) {
+        delegate.setMessageCompression(enable);
+    }
+
+    @Override
+    public void disableAutoInboundFlowControl() {
+        delegate.disableAutoInboundFlowControl();
+    }
+}
diff --git a/server/src/main/java/io/deephaven/server/barrage/BarrageMessageProducer.java b/server/src/main/java/io/deephaven/server/barrage/BarrageMessageProducer.java
index ddc067f0a33..f44ff1a94c5 100644
--- a/server/src/main/java/io/deephaven/server/barrage/BarrageMessageProducer.java
+++ b/server/src/main/java/io/deephaven/server/barrage/BarrageMessageProducer.java
@@ -51,6 +51,7 @@
 import org.jetbrains.annotations.Nullable;
 import org.HdrHistogram.Histogram;
 
+import javax.annotation.OverridingMethodsMustInvokeSuper;
 import java.time.Instant;
 import java.util.*;
 import java.util.concurrent.atomic.AtomicBoolean;
@@ -410,37 +411,56 @@ public void setOnGetSnapshot(Runnable onGetSnapshot, boolean isPreSnap) {
      * job is run we clean up deleted subscriptions and rebuild any state that is used to filter recorded updates.</li>
      * </ol>
      */
-    private class Subscription {
-        final BarrageSubscriptionOptions options;
-        final StreamObserver<BarrageStreamGenerator.MessageView> listener;
-        final String logPrefix;
-
-        RowSet viewport; // active viewport
-        BitSet subscribedColumns; // active subscription columns
-        boolean reverseViewport; // is the active viewport reversed (indexed from end of table)
-
-        boolean isActive = false; // is this subscription in our active list?
-        boolean pendingDelete = false; // is this subscription deleted as far as the client is concerned?
-        boolean hasPendingUpdate = false; // is this subscription in our pending list?
-        boolean pendingInitialSnapshot = true; // do we need to send the initial snapshot?
-
-        RowSet pendingViewport; // if an update is pending this is our new viewport
-        boolean pendingReverseViewport; // is the pending viewport reversed (indexed from end of table)
-        BitSet pendingColumns; // if an update is pending this is our new column subscription set
-
-        WritableRowSet snapshotViewport = null; // promoted to `active` viewport by the snapshot process
-        BitSet snapshotColumns = null; // promoted to `active` columns by the snapshot process
-        boolean snapshotReverseViewport = false; // promoted to `active` viewport direction by the snapshot process
-
-        RowSet targetViewport = null; // the final viewport for a changed (new or updated) subscription
-        BitSet targetColumns; // the final set of columns for a changed subscription
-        boolean targetReverseViewport; // the final viewport direction for a changed subscription
-
-        boolean isGrowingViewport; // is this subscription actively growing
-        WritableRowSet growingRemainingViewport = null; // rows still needed to satisfy this subscription target
-                                                        // viewport
-        WritableRowSet growingIncrementalViewport = null; // rows to be sent to the client from the current snapshot
-        boolean isFirstSnapshot; // is this the first snapshot after a change to a subscriptions
+    private static class Subscription {
+        private final BarrageSubscriptionOptions options;
+        private final StreamObserver<BarrageStreamGenerator.MessageView> listener;
+        private final String logPrefix;
+
+        /** active viewport **/
+        private RowSet viewport;
+        /** active subscription columns */
+        private BitSet subscribedColumns;
+        /** is the active viewport reversed (indexed from end of table) */
+        private boolean reverseViewport;
+
+        /** is this subscription in our active list? */
+        private boolean isActive = false;
+        /** is this subscription deleted as far as the client is concerned? */
+        private boolean pendingDelete = false;
+        /** is this subscription in our pending list? */
+        private boolean hasPendingUpdate = false;
+        /** do we need to send the initial snapshot? */
+        private boolean pendingInitialSnapshot = true;
+
+        /** if an update is pending this is our new viewport */
+        private RowSet pendingViewport;
+        /** is the pending viewport reversed (indexed from end of table) */
+        private boolean pendingReverseViewport;
+        /** if an update is pending this is our new column subscription set */
+        private BitSet pendingColumns;
+
+        /** promoted to `active` viewport by the snapshot process */
+        private WritableRowSet snapshotViewport = null;
+        /** promoted to `active` columns by the snapshot process */
+        private BitSet snapshotColumns = null;
+        /** promoted to `active` viewport direction by the snapshot process */
+        private boolean snapshotReverseViewport = false;
+
+        /** the final viewport for a changed (new or updated) subscription */
+        private RowSet targetViewport = null;
+        /** the final set of columns for a changed subscription */
+        private BitSet targetColumns;
+        /** the final viewport direction for a changed subscription */
+        private boolean targetReverseViewport;
+
+        /** is this subscription actively growing */
+        private boolean isGrowingViewport;
+        /** rows still needed to satisfy this subscription target viewport */
+        private WritableRowSet growingRemainingViewport = null;
+        /** rows to be sent to the client from the current snapshot */
+        private WritableRowSet growingIncrementalViewport = null;
+        /** is this the first snapshot after a change to a subscriptions */
+        private boolean isFirstSnapshot;
 
         private Subscription(final StreamObserver<BarrageStreamGenerator.MessageView> listener,
                 final BarrageSubscriptionOptions options,
@@ -460,6 +480,12 @@ private Subscription(final StreamObserver<BarrageStreamGenerator.MessageView> li
         public boolean isViewport() {
             return viewport != null;
         }
+
+        public boolean isFullSubscription() {
+            return !isViewport()
+                    || (hasPendingUpdate && pendingViewport == null)
+                    || (isGrowingViewport && targetViewport == null);
+        }
     }
 
     /**
@@ -555,6 +581,14 @@ public boolean updateSubscription(
             @Nullable final BitSet columnsToSubscribe,
             final boolean newReverseViewport) {
         return findAndUpdateSubscription(listener, sub -> {
+            if (sub.isFullSubscription()) {
+                // never allow changes to a full subscription
+                GrpcUtil.safelyError(listener, Code.INVALID_ARGUMENT,
+                        "cannot change from full subscription to viewport or vice versa");
+                removeSubscription(listener);
+                return;
+            }
+
             if (sub.pendingViewport != null) {
                 sub.pendingViewport.close();
             }
@@ -657,6 +691,7 @@ protected void onFailureInternal(final Throwable originalException, Entry source
             }
         }
 
+        @OverridingMethodsMustInvokeSuper
         @Override
         public void destroy() {
             super.destroy();
@@ -695,7 +730,7 @@ public void close() {
     }
 
     private void enqueueUpdate(final TableUpdate upstream) {
-        Assert.holdsLock(this, "enqueueUpdate must hold lock!");
+        Assert.assertion(Thread.holdsLock(this), "enqueueUpdate must hold lock!");
 
         final WritableRowSet addsToRecord;
         final RowSet modsToRecord;
@@ -952,7 +987,7 @@ private void enqueueUpdate(final TableUpdate upstream) {
     }
 
     private void schedulePropagation() {
-        Assert.holdsLock(this, "schedulePropagation must hold lock!");
+        Assert.assertion(Thread.holdsLock(this), "schedulePropagation must hold lock!");
 
         // copy lastUpdateTime so we are not duped by the re-read
         final long localLastUpdateTime = lastUpdateTime;
@@ -1187,7 +1222,9 @@ private void updateSubscriptionsSnapshotAndPropagate() {
 
         BarrageMessage preSnapshot = null;
         BarrageMessage blinkTableFlushPreSnapshot = null;
+        RowSet preSnapRowSetPrev = null;
         RowSet preSnapRowSet = null;
+        RowSet postSnapRowSetPrev = null;
         BarrageMessage snapshot = null;
         BarrageMessage postSnapshot = null;
 
@@ -1344,6 +1381,7 @@ private void updateSubscriptionsSnapshotAndPropagate() {
                     if (!snapshot.rowsAdded.isEmpty()) {
                         snapshot.rowsAdded.close();
                         snapshot.rowsAdded = RowSetFactory.empty();
+                        snapshot.tableSize = 0;
                     }
                 }
                 long elapsed = System.nanoTime() - start;
@@ -1378,7 +1416,7 @@ private void updateSubscriptionsSnapshotAndPropagate() {
             }
 
             // prepare updates to propagate
-            final long maxStep = snapshot != null ? snapshot.step : Long.MAX_VALUE;
+            final long maxStep = snapshot != null ? snapshot.firstSeq : Long.MAX_VALUE;
 
             int deltaSplitIdx = pendingDeltas.size();
             for (; deltaSplitIdx > 0; --deltaSplitIdx) {
@@ -1394,6 +1432,7 @@ private void updateSubscriptionsSnapshotAndPropagate() {
 
             if (!firstSubscription && deltaSplitIdx > 0) {
                 final long startTm = System.nanoTime();
+                preSnapRowSetPrev = propagationRowSet.copy();
                 preSnapshot = aggregateUpdatesInRange(0, deltaSplitIdx);
                 recordMetric(stats -> stats.aggregate, System.nanoTime() - startTm);
                 preSnapRowSet = propagationRowSet.copy();
@@ -1419,6 +1458,7 @@ private void updateSubscriptionsSnapshotAndPropagate() {
 
             if (deltaSplitIdx < pendingDeltas.size()) {
                 final long startTm = System.nanoTime();
+                postSnapRowSetPrev = propagationRowSet.copy();
                 postSnapshot = aggregateUpdatesInRange(deltaSplitIdx, pendingDeltas.size());
                 recordMetric(stats -> stats.aggregate, System.nanoTime() - startTm);
             }
@@ -1442,8 +1482,9 @@ private void updateSubscriptionsSnapshotAndPropagate() {
         // now, propagate updates
         if (preSnapshot != null) {
             final long startTm = System.nanoTime();
-            propagateToSubscribers(preSnapshot, preSnapRowSet);
+            propagateToSubscribers(preSnapshot, preSnapRowSetPrev, preSnapRowSet);
             recordMetric(stats -> stats.propagate, System.nanoTime() - startTm);
+            preSnapRowSetPrev.close();
             preSnapRowSet.close();
         }
 
@@ -1451,7 +1492,7 @@ private void updateSubscriptionsSnapshotAndPropagate() {
             final long startTm = System.nanoTime();
             try (final RowSet fakeTableRowSet = RowSetFactory.empty()) {
                 // the method expects the post-update RowSet; which is empty after the flush
-                propagateToSubscribers(blinkTableFlushPreSnapshot, fakeTableRowSet);
+                propagateToSubscribers(blinkTableFlushPreSnapshot, fakeTableRowSet, fakeTableRowSet);
             }
             recordMetric(stats -> stats.propagate, System.nanoTime() - startTm);
         }
@@ -1477,8 +1518,9 @@ private void updateSubscriptionsSnapshotAndPropagate() {
 
         if (postSnapshot != null) {
             final long startTm = System.nanoTime();
-            propagateToSubscribers(postSnapshot, propagationRowSet);
+            propagateToSubscribers(postSnapshot, postSnapRowSetPrev, propagationRowSet);
             recordMetric(stats -> stats.propagate, System.nanoTime() - startTm);
+            postSnapRowSetPrev.close();
         }
 
         if (deletedSubscriptions != null) {
@@ -1513,8 +1555,11 @@ private void updateSubscriptionsSnapshotAndPropagate() {
         }
     }
 
-    private void propagateToSubscribers(final BarrageMessage message, final RowSet propRowSetForMessage) {
-        // message is released via transfer to stream generator (as it must live until all view's are closed)
+    private void propagateToSubscribers(
+            final BarrageMessage message,
+            final RowSet propRowSetForMessagePrev,
+            final RowSet propRowSetForMessage) {
+        // message is released via transfer to stream generator (as it must live until all views are closed)
         try (final BarrageStreamGenerator generator = streamGeneratorFactory.newGenerator(
                 message, this::recordWriteMetrics)) {
             for (final Subscription subscription : activeSubscriptions) {
@@ -1537,10 +1582,13 @@ private void propagateToSubscribers(final BarrageMessage message, final RowSet p
                 final boolean isReversed =
                         isPreSnapshot ? subscription.snapshotReverseViewport : subscription.reverseViewport;
 
-                try (final RowSet clientView =
-                        vp != null ? propRowSetForMessage.subSetForPositions(vp, isReversed) : null) {
+                try (final RowSet clientViewPrev =
+                        vp != null ? propRowSetForMessagePrev.subSetForPositions(vp, isReversed) : null;
+                        final RowSet clientView =
+                                vp != null ? propRowSetForMessage.subSetForPositions(vp, isReversed) : null) {
                     subscription.listener.onNext(generator.getSubView(
-                            subscription.options, false, vp, subscription.reverseViewport, clientView, cols));
+                            subscription.options, false, subscription.isFullSubscription(), vp,
+                            subscription.reverseViewport, clientViewPrev, clientView, cols));
                 } catch (final Exception e) {
                     try {
                         subscription.listener.onError(errorTransformer.transform(e));
@@ -1576,8 +1624,6 @@ private void propagateSnapshotForSubscription(final Subscription subscription,
         // the parent table listener needs to be recording data as if we've already sent the successful snapshot.
 
         if (subscription.snapshotViewport != null) {
-            subscription.snapshotViewport.close();
-            subscription.snapshotViewport = null;
             needsSnapshot = true;
         }
 
@@ -1594,8 +1640,17 @@ private void propagateSnapshotForSubscription(final Subscription subscription,
 
             // limit the rows included by this message to the subset of rows in this snapshot that this subscription
             // requested (exclude rows needed by other subscribers but not this one)
+            boolean fullSubscription = subscription.isFullSubscription();
             try (final RowSet keySpaceViewport = snapshotGenerator.getMessage().rowsAdded
-                    .subSetForPositions(subscription.growingIncrementalViewport, subscription.reverseViewport)) {
+                    .subSetForPositions(fullSubscription
+                            ? subscription.growingIncrementalViewport
+                            : subscription.viewport,
+                            subscription.reverseViewport);
+                    final RowSet keySpaceViewportPrev = fullSubscription
+                            ? null
+                            : snapshotGenerator.getMessage().rowsAdded
+                                    .subSetForPositions(subscription.snapshotViewport,
+                                            subscription.snapshotReverseViewport)) {
 
                 if (subscription.pendingInitialSnapshot) {
                     // Send schema metadata to this new client.
@@ -1607,8 +1662,8 @@ private void propagateSnapshotForSubscription(final Subscription subscription,
                 // some messages may be empty of rows, but we need to update the client viewport and column set
                 subscription.listener
                         .onNext(snapshotGenerator.getSubView(subscription.options, subscription.pendingInitialSnapshot,
-                                subscription.viewport, subscription.reverseViewport, keySpaceViewport,
-                                subscription.subscribedColumns));
+                                fullSubscription, subscription.viewport, subscription.reverseViewport,
+                                keySpaceViewportPrev, keySpaceViewport, subscription.subscribedColumns));
 
             } catch (final Exception e) {
                 GrpcUtil.safelyError(subscription.listener, errorTransformer.transform(e));
@@ -1616,6 +1671,11 @@ private void propagateSnapshotForSubscription(final Subscription subscription,
             }
         }
 
+        if (subscription.snapshotViewport != null) {
+            subscription.snapshotViewport.close();
+            subscription.snapshotViewport = null;
+        }
+
         if (subscription.growingIncrementalViewport != null) {
             subscription.growingIncrementalViewport.close();
             subscription.growingIncrementalViewport = null;
@@ -1625,7 +1685,7 @@ private void propagateSnapshotForSubscription(final Subscription subscription,
     }
 
     private BarrageMessage aggregateUpdatesInRange(final int startDelta, final int endDelta) {
-        Assert.holdsLock(this, "propagateUpdatesInRange must hold lock!");
+        Assert.assertion(Thread.holdsLock(this), "propagateUpdatesInRange must hold lock!");
 
         final boolean singleDelta = endDelta - startDelta == 1;
         final BarrageMessage downstream = new BarrageMessage();
@@ -1980,6 +2040,7 @@ final class ColumnInfo {
         propagationRowSet.remove(downstream.rowsRemoved);
         downstream.shifted.apply(propagationRowSet);
         propagationRowSet.insert(downstream.rowsAdded);
+        downstream.tableSize = propagationRowSet.size();
 
         return downstream;
     }
@@ -2110,7 +2171,7 @@ private void buildPostSnapshotViewports(boolean ignorePending) {
     }
 
     private void promoteSnapshotToActive() {
-        Assert.holdsLock(this, "promoteSnapshotToActive must hold lock!");
+        Assert.assertion(Thread.holdsLock(this), "promoteSnapshotToActive must hold lock!");
 
         if (activeViewport != null) {
             activeViewport.close();
@@ -2251,6 +2312,7 @@ BarrageMessage getSnapshot(
         return msg;
     }
 
+    @OverridingMethodsMustInvokeSuper
     @Override
     protected synchronized void destroy() {
         super.destroy();
diff --git a/server/src/main/java/io/deephaven/server/console/ConsoleServiceGrpcImpl.java b/server/src/main/java/io/deephaven/server/console/ConsoleServiceGrpcImpl.java
index 8ab6115ccb7..2197546a9f2 100644
--- a/server/src/main/java/io/deephaven/server/console/ConsoleServiceGrpcImpl.java
+++ b/server/src/main/java/io/deephaven/server/console/ConsoleServiceGrpcImpl.java
@@ -52,8 +52,7 @@
 import java.util.Set;
 import java.util.concurrent.atomic.AtomicBoolean;
 
-import static io.deephaven.extensions.barrage.util.GrpcUtil.safelyComplete;
-import static io.deephaven.extensions.barrage.util.GrpcUtil.safelyOnNext;
+import static io.deephaven.extensions.barrage.util.GrpcUtil.*;
 
 @Singleton
 public class ConsoleServiceGrpcImpl extends ConsoleServiceGrpc.ConsoleServiceImplBase {
@@ -139,11 +138,9 @@ public void startConsole(
                 .onError(responseObserver)
                 .submit(() -> {
                     final ScriptSession scriptSession = new DelegatingScriptSession(scriptSessionProvider.get());
-
-                    safelyComplete(responseObserver, StartConsoleResponse.newBuilder()
+                    safelyOnNextAndComplete(responseObserver, StartConsoleResponse.newBuilder()
                             .setResultId(request.getResultId())
                             .build());
-
                     return scriptSession;
                 });
     }
@@ -154,7 +151,7 @@ public void subscribeToLogs(
             @NotNull final StreamObserver<LogSubscriptionData> responseObserver) {
         sessionService.getCurrentSession();
         if (REMOTE_CONSOLE_DISABLED) {
-            GrpcUtil.safelyError(responseObserver, Code.FAILED_PRECONDITION, "Remote console disabled");
+            safelyError(responseObserver, Code.FAILED_PRECONDITION, "Remote console disabled");
             return;
         }
         // Session close logic implicitly handled in
@@ -183,16 +180,18 @@ public void executeCommand(
             final SessionState.ExportObject<ScriptSession> exportedConsole =
                     ticketRouter.resolve(session, consoleId, "consoleId");
 
-            session.nonExport()
+            session.<ExecuteCommandResponse>nonExport()
                     .queryPerformanceRecorder(queryPerformanceRecorder)
                     .requiresSerialQueue()
                     .require(exportedConsole)
                     .onError(responseObserver)
+                    .onSuccess((final ExecuteCommandResponse response) -> safelyOnNextAndComplete(responseObserver,
+                            response))
                     .submit(() -> {
-                        ScriptSession scriptSession = exportedConsole.get();
-                        ScriptSession.Changes changes = scriptSession.evaluateScript(request.getCode());
-                        ExecuteCommandResponse.Builder diff = ExecuteCommandResponse.newBuilder();
-                        FieldsChangeUpdate.Builder fieldChanges = FieldsChangeUpdate.newBuilder();
+                        final ScriptSession scriptSession = exportedConsole.get();
+                        final ScriptSession.Changes changes = scriptSession.evaluateScript(request.getCode());
+                        final ExecuteCommandResponse.Builder diff = ExecuteCommandResponse.newBuilder();
+                        final FieldsChangeUpdate.Builder fieldChanges = FieldsChangeUpdate.newBuilder();
                         changes.created.entrySet()
                                 .forEach(entry -> fieldChanges.addCreated(makeVariableDefinition(entry)));
                         changes.updated.entrySet()
@@ -203,7 +202,7 @@ public void executeCommand(
                             diff.setErrorMessage(Throwables.getStackTraceAsString(changes.error));
                             log.error().append("Error running script: ").append(changes.error).endl();
                         }
-                        safelyComplete(responseObserver, diff.setChanges(fieldChanges).build());
+                        return diff.setChanges(fieldChanges).build();
                     });
         }
     }
@@ -276,7 +275,9 @@ public void bindTableToVariable(
             ExportBuilder<?> exportBuilder = session.nonExport()
                     .queryPerformanceRecorder(queryPerformanceRecorder)
                     .requiresSerialQueue()
-                    .onError(responseObserver);
+                    .onError(responseObserver)
+                    .onSuccess(() -> safelyOnNextAndComplete(responseObserver,
+                            BindTableToVariableResponse.getDefaultInstance()));
 
             if (request.hasConsoleId()) {
                 exportedConsole = ticketRouter.resolve(session, request.getConsoleId(), "consoleId");
@@ -292,8 +293,6 @@ public void bindTableToVariable(
 
                 Table table = exportedTable.get();
                 queryScope.putParam(request.getVariableName(), table);
-                responseObserver.onNext(BindTableToVariableResponse.getDefaultInstance());
-                responseObserver.onCompleted();
             });
         }
     }
@@ -405,7 +404,7 @@ public void start() {
         }
 
         public void stop() {
-            GrpcUtil.safelyComplete(client);
+            safelyComplete(client);
         }
 
         // ------------------------------------------------------------------------------------------------------------
@@ -459,7 +458,7 @@ public void run() {
                             return;
                         }
                         if (tooSlow) {
-                            GrpcUtil.safelyError(client, Code.RESOURCE_EXHAUSTED, String.format(
+                            safelyError(client, Code.RESOURCE_EXHAUSTED, String.format(
                                     "Too slow: the client or network may be too slow to keep up with the logging rates, or there may be logging bursts that exceed the available buffer size. The buffer size can be configured through the server property '%s'.",
                                     SUBSCRIBE_TO_LOGS_BUFFER_SIZE_PROP));
                             return;
@@ -472,7 +471,7 @@ public void run() {
                             bufferIsKnownEmpty = true;
                             break;
                         }
-                        GrpcUtil.safelyOnNext(client, payload);
+                        safelyOnNext(client, payload);
                     }
                 } finally {
                     guard.set(false);
diff --git a/server/src/main/java/io/deephaven/server/console/ScopeTicketResolver.java b/server/src/main/java/io/deephaven/server/console/ScopeTicketResolver.java
index 2ee01446d39..42af427c4c0 100644
--- a/server/src/main/java/io/deephaven/server/console/ScopeTicketResolver.java
+++ b/server/src/main/java/io/deephaven/server/console/ScopeTicketResolver.java
@@ -74,6 +74,9 @@ public SessionState.ExportObject<Flight.FlightInfo> flightInfoFor(
 
     @Override
     public void forAllFlightInfo(@Nullable final SessionState session, final Consumer<Flight.FlightInfo> visitor) {
+        if (session == null) {
+            return;
+        }
         final QueryScope queryScope = ExecutionContext.getContext().getQueryScope();
         queryScope.toMap(queryScope::unwrapObject, (n, t) -> t instanceof Table).forEach((name, table) -> {
             final Table transformedTable = authorization.transform((Table) table);
diff --git a/server/src/main/java/io/deephaven/server/hierarchicaltable/HierarchicalTableServiceGrpcImpl.java b/server/src/main/java/io/deephaven/server/hierarchicaltable/HierarchicalTableServiceGrpcImpl.java
index 08e6e9eeba6..e6222880e66 100644
--- a/server/src/main/java/io/deephaven/server/hierarchicaltable/HierarchicalTableServiceGrpcImpl.java
+++ b/server/src/main/java/io/deephaven/server/hierarchicaltable/HierarchicalTableServiceGrpcImpl.java
@@ -22,6 +22,7 @@
 import io.deephaven.engine.table.impl.perf.QueryPerformanceRecorder;
 import io.deephaven.engine.table.impl.select.WhereFilter;
 import io.deephaven.extensions.barrage.util.ExportUtil;
+import io.deephaven.extensions.barrage.util.GrpcUtil;
 import io.deephaven.internal.log.LoggerFactory;
 import io.deephaven.io.logger.Logger;
 import io.deephaven.proto.backplane.grpc.*;
@@ -46,7 +47,6 @@
 import java.util.stream.Collectors;
 
 import static io.deephaven.engine.table.impl.AbsoluteSortColumnConventions.baseColumnNameToAbsoluteName;
-import static io.deephaven.extensions.barrage.util.GrpcUtil.safelyComplete;
 
 public class HierarchicalTableServiceGrpcImpl extends HierarchicalTableServiceGrpc.HierarchicalTableServiceImplBase {
 
@@ -85,10 +85,12 @@ public void rollup(
             final SessionState.ExportObject<Table> sourceTableExport =
                     ticketRouter.resolve(session, request.getSourceTableId(), "sourceTableId");
 
-            session.newExport(request.getResultRollupTableId(), "resultRollupTableId")
+            session.<RollupTable>newExport(request.getResultRollupTableId(), "resultRollupTableId")
                     .queryPerformanceRecorder(queryPerformanceRecorder)
                     .require(sourceTableExport)
                     .onError(responseObserver)
+                    .onSuccess((final RollupTable ignoredResult) -> GrpcUtil.safelyOnNextAndComplete(responseObserver,
+                            RollupResponse.getDefaultInstance()))
                     .submit(() -> {
                         final Table sourceTable = sourceTableExport.get();
 
@@ -109,7 +111,6 @@ public void rollup(
                             throw Exceptions.statusRuntimeException(
                                     Code.FAILED_PRECONDITION, "Not authorized to rollup hierarchical table");
                         }
-                        safelyComplete(responseObserver, RollupResponse.getDefaultInstance());
                         return transformedResult;
                     });
         }
@@ -141,10 +142,12 @@ public void tree(
             final SessionState.ExportObject<Table> sourceTableExport =
                     ticketRouter.resolve(session, request.getSourceTableId(), "sourceTableId");
 
-            session.newExport(request.getResultTreeTableId(), "resultTreeTableId")
+            session.<TreeTable>newExport(request.getResultTreeTableId(), "resultTreeTableId")
                     .queryPerformanceRecorder(queryPerformanceRecorder)
                     .require(sourceTableExport)
                     .onError(responseObserver)
+                    .onSuccess((final TreeTable ignoredResult) -> GrpcUtil.safelyOnNextAndComplete(responseObserver,
+                            TreeResponse.getDefaultInstance()))
                     .submit(() -> {
                         final Table sourceTable = sourceTableExport.get();
 
@@ -169,7 +172,6 @@ public void tree(
                             throw Exceptions.statusRuntimeException(
                                     Code.FAILED_PRECONDITION, "Not authorized to tree hierarchical table");
                         }
-                        safelyComplete(responseObserver, TreeResponse.getDefaultInstance());
                         return transformedResult;
                     });
         }
@@ -202,10 +204,13 @@ public void apply(
             final SessionState.ExportObject<HierarchicalTable<?>> inputHierarchicalTableExport =
                     ticketRouter.resolve(session, request.getInputHierarchicalTableId(), "inputHierarchicalTableId");
 
-            session.newExport(request.getResultHierarchicalTableId(), "resultHierarchicalTableId")
+            session.<HierarchicalTable<?>>newExport(request.getResultHierarchicalTableId(), "resultHierarchicalTableId")
                     .queryPerformanceRecorder(queryPerformanceRecorder)
                     .require(inputHierarchicalTableExport)
                     .onError(responseObserver)
+                    .onSuccess((final HierarchicalTable<?> ignoredResult) -> GrpcUtil.safelyOnNextAndComplete(
+                            responseObserver,
+                            HierarchicalTableApplyResponse.getDefaultInstance()))
                     .submit(() -> {
                         final HierarchicalTable<?> inputHierarchicalTable = inputHierarchicalTableExport.get();
 
@@ -274,7 +279,6 @@ public void apply(
                             throw Exceptions.statusRuntimeException(
                                     Code.FAILED_PRECONDITION, "Not authorized to apply to hierarchical table");
                         }
-                        safelyComplete(responseObserver, HierarchicalTableApplyResponse.getDefaultInstance());
                         return transformedResult;
                     });
         }
@@ -395,6 +399,9 @@ public void view(
             resultExportBuilder
                     .queryPerformanceRecorder(queryPerformanceRecorder)
                     .onError(responseObserver)
+                    .onSuccess((final HierarchicalTableView ignoredResult) -> GrpcUtil.safelyOnNextAndComplete(
+                            responseObserver,
+                            HierarchicalTableViewResponse.getDefaultInstance()))
                     .submit(() -> {
                         final Table keyTable = keyTableExport == null ? null : keyTableExport.get();
                         final Object target = targetExport.get();
@@ -439,7 +446,6 @@ public void view(
                             throw Exceptions.statusRuntimeException(
                                     Code.FAILED_PRECONDITION, "Not authorized to view hierarchical table");
                         }
-                        safelyComplete(responseObserver, HierarchicalTableViewResponse.getDefaultInstance());
                         return transformedResult;
                     });
         }
@@ -483,10 +489,12 @@ public void exportSource(
             final SessionState.ExportObject<HierarchicalTable<?>> hierarchicalTableExport =
                     ticketRouter.resolve(session, request.getHierarchicalTableId(), "hierarchicalTableId");
 
-            session.newExport(request.getResultTableId(), "resultTableId")
+            session.<Table>newExport(request.getResultTableId(), "resultTableId")
                     .queryPerformanceRecorder(queryPerformanceRecorder)
                     .require(hierarchicalTableExport)
                     .onError(responseObserver)
+                    .onSuccess((final Table transformedResult) -> GrpcUtil.safelyOnNextAndComplete(responseObserver,
+                            ExportUtil.buildTableCreationResponse(request.getResultTableId(), transformedResult)))
                     .submit(() -> {
                         final HierarchicalTable<?> hierarchicalTable = hierarchicalTableExport.get();
 
@@ -499,9 +507,6 @@ public void exportSource(
                                     Code.FAILED_PRECONDITION,
                                     "Not authorized to export source from hierarchical table");
                         }
-                        final ExportedTableCreationResponse response =
-                                ExportUtil.buildTableCreationResponse(request.getResultTableId(), transformedResult);
-                        safelyComplete(responseObserver, response);
                         return transformedResult;
                     });
         }
diff --git a/server/src/main/java/io/deephaven/server/hierarchicaltable/HierarchicalTableViewSubscription.java b/server/src/main/java/io/deephaven/server/hierarchicaltable/HierarchicalTableViewSubscription.java
index 4bf7f7e52b4..6ccd2ee48ea 100644
--- a/server/src/main/java/io/deephaven/server/hierarchicaltable/HierarchicalTableViewSubscription.java
+++ b/server/src/main/java/io/deephaven/server/hierarchicaltable/HierarchicalTableViewSubscription.java
@@ -14,6 +14,7 @@
 import io.deephaven.engine.rowset.RowSet;
 import io.deephaven.engine.rowset.RowSetFactory;
 import io.deephaven.engine.rowset.RowSetShiftData;
+import io.deephaven.engine.rowset.WritableRowSet;
 import io.deephaven.engine.table.ColumnDefinition;
 import io.deephaven.engine.table.TableUpdate;
 import io.deephaven.engine.table.TableUpdateListener;
@@ -34,6 +35,7 @@
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
+import javax.annotation.OverridingMethodsMustInvokeSuper;
 import java.time.Instant;
 import java.util.ArrayList;
 import java.util.BitSet;
@@ -59,8 +61,6 @@ HierarchicalTableViewSubscription create(
                 long intervalMillis);
     }
 
-    private static final Logger log = LoggerFactory.getLogger(HierarchicalTableViewSubscription.class);
-
     private final Scheduler scheduler;
     private final SessionService.ErrorTransformer errorTransformer;
     private final BarrageStreamGenerator.Factory streamGeneratorFactory;
@@ -92,7 +92,7 @@ HierarchicalTableViewSubscription create(
     // region Guarded by snapshot lock
     private BitSet columns;
     private RowSet rows;
-    private long lastExpandedSize;
+    private final WritableRowSet prevKeyspaceViewportRows = RowSetFactory.empty();
     // endregion Guarded by snapshot lock
 
     private enum State {
@@ -153,6 +153,7 @@ public HierarchicalTableViewSubscription(
                 fbb -> HierarchicalTableSchemaUtil.makeSchemaPayload(fbb, view.getHierarchicalTable())));
     }
 
+    @OverridingMethodsMustInvokeSuper
     @Override
     protected void destroy() {
         super.destroy();
@@ -282,8 +283,8 @@ private void process() {
                 return;
             }
             try {
-                lastExpandedSize = buildAndSendSnapshot(streamGeneratorFactory, listener, subscriptionOptions, view,
-                        this::recordSnapshotNanos, this::recordWriteMetrics, columns, rows, lastExpandedSize);
+                buildAndSendSnapshot(streamGeneratorFactory, listener, subscriptionOptions, view,
+                        this::recordSnapshotNanos, this::recordWriteMetrics, columns, rows, prevKeyspaceViewportRows);
             } catch (Exception e) {
                 GrpcUtil.safelyError(listener, errorTransformer.transform(e));
                 state = State.Done;
@@ -291,7 +292,7 @@ private void process() {
         }
     }
 
-    private static long buildAndSendSnapshot(
+    private static void buildAndSendSnapshot(
             @NotNull final BarrageStreamGenerator.Factory streamGeneratorFactory,
             @NotNull final StreamObserver<BarrageStreamGenerator.MessageView> listener,
             @NotNull final BarrageSubscriptionOptions subscriptionOptions,
@@ -300,7 +301,7 @@ private static long buildAndSendSnapshot(
             @NotNull final BarragePerformanceLog.WriteMetricsConsumer writeMetricsConsumer,
             @NotNull final BitSet columns,
             @NotNull final RowSet rows,
-            final long lastExpandedSize) {
+            @NotNull final WritableRowSet prevKeyspaceViewportRows) {
         // 1. Grab some schema and snapshot information
         final List<ColumnDefinition<?>> columnDefinitions =
                 view.getHierarchicalTable().getAvailableColumnDefinitions();
@@ -324,16 +325,19 @@ private static long buildAndSendSnapshot(
 
         // 4. Make and populate a BarrageMessage
         final BarrageMessage barrageMessage = new BarrageMessage();
-        barrageMessage.isSnapshot = true;
-        // We don't populate length, snapshotRowSet, snapshotRowSetIsReversed, or snapshotColumns; they are only set by
-        // the client.
-        // We don't populate step, firstSeq, or lastSeq debugging information; they are not relevant to this use case.
+        // We don't populate firstSeq or lastSeq debugging information; they are not relevant to this use case.
 
+        barrageMessage.isSnapshot = true;
         barrageMessage.rowsAdded = RowSetFactory.flat(expandedSize);
-        barrageMessage.rowsIncluded = RowSetFactory.fromRange(rows.firstRowKey(),
-                Math.min(barrageMessage.rowsAdded.lastRowKey(), rows.lastRowKey()));
-        barrageMessage.rowsRemoved = RowSetFactory.flat(lastExpandedSize);
+        if (rows.isEmpty() || expandedSize <= rows.firstRowKey()) {
+            barrageMessage.rowsIncluded = RowSetFactory.empty();
+        } else {
+            barrageMessage.rowsIncluded = RowSetFactory.fromRange(
+                    rows.firstRowKey(), Math.min(expandedSize - 1, rows.lastRowKey()));
+        }
+        barrageMessage.rowsRemoved = RowSetFactory.empty();
         barrageMessage.shifted = RowSetShiftData.EMPTY;
+        barrageMessage.tableSize = expandedSize;
 
         barrageMessage.addColumnData = new BarrageMessage.AddColumnData[numAvailableColumns];
         for (int ci = 0, di = 0; ci < numAvailableColumns; ++ci) {
@@ -355,16 +359,17 @@ private static long buildAndSendSnapshot(
         barrageMessage.modColumnData = BarrageMessage.ZERO_MOD_COLUMNS;
 
         // 5. Send the BarrageMessage
-        final BarrageStreamGenerator streamGenerator =
-                streamGeneratorFactory.newGenerator(barrageMessage, writeMetricsConsumer);
-        // Note that we're always specifying "isInitialSnapshot=true". This is to provoke the subscription view to
-        // send the added rows on every snapshot, since (1) our added rows are flat, and thus cheap to send, and
-        // (2) we're relying on added rows to signal the full expanded size to the client.
-        GrpcUtil.safelyOnNext(listener,
-                streamGenerator.getSubView(subscriptionOptions, true, rows, false, rows, columns));
-
-        // 6. Let the caller know what the expanded size was
-        return expandedSize;
+        try (final BarrageStreamGenerator streamGenerator =
+                streamGeneratorFactory.newGenerator(barrageMessage, writeMetricsConsumer)) {
+            // initialSnapshot flag is ignored for non-growing viewports
+            final boolean initialSnapshot = false;
+            final boolean isFullSubscription = false;
+            GrpcUtil.safelyOnNext(listener, streamGenerator.getSubView(
+                    subscriptionOptions, initialSnapshot, isFullSubscription, rows, false,
+                    prevKeyspaceViewportRows, barrageMessage.rowsIncluded, columns));
+
+            prevKeyspaceViewportRows.resetTo(barrageMessage.rowsIncluded);
+        }
     }
 
     public void setViewport(
@@ -422,7 +427,7 @@ public void setViewport(
     }
 
     private void scheduleImmediately(final long currentTimeNanos) {
-        Assert.holdsLock(schedulingLock, "schedulingLock");
+        Assert.assertion(Thread.holdsLock(schedulingLock), "Thread.holdsLock(schedulingLock)");
         if (!snapshotPending || currentTimeNanos < scheduledTimeNanos) {
             snapshotPending = true;
             scheduledTimeNanos = currentTimeNanos;
@@ -431,7 +436,7 @@ private void scheduleImmediately(final long currentTimeNanos) {
     }
 
     private void scheduleAtInterval(final long currentTimeNanos) {
-        Assert.holdsLock(schedulingLock, "schedulingLock");
+        Assert.assertion(Thread.holdsLock(schedulingLock), "Thread.holdsLock(schedulingLock)");
         final long targetTimeNanos = lastSnapshotTimeNanos + intervalDurationNanos;
         final long delayNanos = targetTimeNanos - currentTimeNanos;
         if (delayNanos < 0) {
diff --git a/server/src/main/java/io/deephaven/server/object/ObjectServiceGrpcImpl.java b/server/src/main/java/io/deephaven/server/object/ObjectServiceGrpcImpl.java
index f2901dee6ff..d48eb29ed66 100644
--- a/server/src/main/java/io/deephaven/server/object/ObjectServiceGrpcImpl.java
+++ b/server/src/main/java/io/deephaven/server/object/ObjectServiceGrpcImpl.java
@@ -66,6 +66,7 @@ public ObjectServiceGrpcImpl(SessionService sessionService, TicketRouter ticketR
     private enum EnqueuedState {
         WAITING, RUNNING, CLOSED
     }
+
     private final class SendMessageObserver implements StreamObserver<StreamRequest> {
         private final SessionState session;
         private final StreamObserver<StreamResponse> responseObserver;
@@ -78,36 +79,35 @@ private final class SendMessageObserver implements StreamObserver<StreamRequest>
 
         class EnqueuedStreamOperation {
             private final StreamOperation wrapped;
-            private final List<ExportObject<?>> requirements;
+            private final SessionState.ExportBuilder<Object> nonExport;
 
             EnqueuedStreamOperation(Collection<? extends ExportObject<?>> dependencies,
                     StreamOperation wrapped) {
                 this.wrapped = wrapped;
-                this.requirements = List.copyOf(dependencies);
+                this.nonExport = session.nonExport()
+                        .onErrorHandler(SendMessageObserver.this::onError)
+                        .require(List.copyOf(dependencies));
             }
 
             public void run() {
-                session.nonExport()
-                        .onErrorHandler(SendMessageObserver.this::onError)
-                        .require(requirements)
-                        .submit(() -> {
-                            if (runState.get() == EnqueuedState.CLOSED) {
-                                return;
-                            }
-                            // Run the specified work. Note that we're not concerned about exceptions, the stream will
-                            // be dead (via onError) and won't be used again.
-                            try {
-                                wrapped.run();
-                            } catch (ObjectCommunicationException e) {
-                                throw Exceptions.statusRuntimeException(Code.INVALID_ARGUMENT,
-                                        "Error performing MessageStream operation");
-                            }
+                nonExport.submit(() -> {
+                    if (runState.get() == EnqueuedState.CLOSED) {
+                        return;
+                    }
+                    // Run the specified work. Note that we're not concerned about exceptions, the stream will
+                    // be dead (via onError) and won't be used again.
+                    try {
+                        wrapped.run();
+                    } catch (ObjectCommunicationException e) {
+                        throw Exceptions.statusRuntimeException(Code.INVALID_ARGUMENT,
+                                "Error performing MessageStream operation");
+                    }
 
-                            // Set state to WAITING if it is RUNNING so that any new work can race being added
-                            if (runState.compareAndSet(EnqueuedState.RUNNING, EnqueuedState.WAITING)) {
-                                doWork();
-                            } // else the stream should be ended and no more work done
-                        });
+                    // Set state to WAITING if it is RUNNING so that any new work can race being added
+                    if (runState.compareAndSet(EnqueuedState.RUNNING, EnqueuedState.WAITING)) {
+                        doWork();
+                    } // else the stream should be ended and no more work done
+                });
             }
         }
 
@@ -269,10 +269,13 @@ public void fetchObject(
             final SessionState.ExportObject<Object> object =
                     ticketRouter.resolve(session, request.getSourceId().getTicket(), "sourceId");
 
-            session.nonExport()
+            session.<FetchObjectResponse>nonExport()
                     .queryPerformanceRecorder(queryPerformanceRecorder)
                     .require(object)
                     .onError(responseObserver)
+                    .onSuccess(
+                            (final FetchObjectResponse response) -> GrpcUtil.safelyOnNextAndComplete(responseObserver,
+                                    response))
                     .submit(() -> {
                         final Object o = object.get();
                         ObjectType objectTypeInstance = getObjectTypeInstance(type, o);
@@ -313,9 +316,7 @@ public void onCompleted() {
                             throw Exceptions.statusRuntimeException(Code.INVALID_ARGUMENT,
                                     "Plugin didn't close response, use MessageStream instead for this object");
                         }
-                        GrpcUtil.safelyComplete(responseObserver, message);
-
-                        return null;
+                        return message;
                     });
         }
     }
diff --git a/server/src/main/java/io/deephaven/server/partitionedtable/PartitionedTableServiceGrpcImpl.java b/server/src/main/java/io/deephaven/server/partitionedtable/PartitionedTableServiceGrpcImpl.java
index 7c45821873e..398b70bba48 100644
--- a/server/src/main/java/io/deephaven/server/partitionedtable/PartitionedTableServiceGrpcImpl.java
+++ b/server/src/main/java/io/deephaven/server/partitionedtable/PartitionedTableServiceGrpcImpl.java
@@ -30,7 +30,7 @@
 import java.util.List;
 
 import static io.deephaven.extensions.barrage.util.ExportUtil.buildTableCreationResponse;
-import static io.deephaven.extensions.barrage.util.GrpcUtil.safelyComplete;
+import static io.deephaven.extensions.barrage.util.GrpcUtil.safelyOnNextAndComplete;
 
 public class PartitionedTableServiceGrpcImpl extends PartitionedTableServiceGrpc.PartitionedTableServiceImplBase {
     private static final Logger log = LoggerFactory.getLogger(PartitionedTableServiceGrpcImpl.class);
@@ -67,16 +67,17 @@ public void partitionBy(
             final SessionState.ExportObject<Table> targetTable =
                     ticketRouter.resolve(session, request.getTableId(), "tableId");
 
-            session.newExport(request.getResultId(), "resultId")
+            session.<PartitionedTable>newExport(request.getResultId(), "resultId")
                     .queryPerformanceRecorder(queryPerformanceRecorder)
                     .require(targetTable)
                     .onError(responseObserver)
+                    .onSuccess((final PartitionedTable ignoredResult) -> safelyOnNextAndComplete(responseObserver,
+                            PartitionByResponse.getDefaultInstance()))
                     .submit(() -> {
                         authWiring.checkPermissionPartitionBy(session.getAuthContext(), request,
                                 Collections.singletonList(targetTable.get()));
                         PartitionedTable partitionedTable = targetTable.get().partitionBy(request.getDropKeys(),
                                 request.getKeyColumnNamesList().toArray(String[]::new));
-                        safelyComplete(responseObserver, PartitionByResponse.getDefaultInstance());
                         return partitionedTable;
                     });
         }
@@ -97,10 +98,12 @@ public void merge(
             final SessionState.ExportObject<PartitionedTable> partitionedTable =
                     ticketRouter.resolve(session, request.getPartitionedTable(), "partitionedTable");
 
-            session.newExport(request.getResultId(), "resultId")
+            session.<Table>newExport(request.getResultId(), "resultId")
                     .queryPerformanceRecorder(queryPerformanceRecorder)
                     .require(partitionedTable)
                     .onError(responseObserver)
+                    .onSuccess((final Table merged) -> safelyOnNextAndComplete(responseObserver,
+                            buildTableCreationResponse(request.getResultId(), merged)))
                     .submit(() -> {
                         final Table table = partitionedTable.get().table();
                         authWiring.checkPermissionMerge(session.getAuthContext(), request,
@@ -116,9 +119,6 @@ public void merge(
                             throw Exceptions.statusRuntimeException(
                                     Code.FAILED_PRECONDITION, "Not authorized to merge table.");
                         }
-                        final ExportedTableCreationResponse response =
-                                buildTableCreationResponse(request.getResultId(), merged);
-                        safelyComplete(responseObserver, response);
                         return merged;
                     });
         }
@@ -142,10 +142,12 @@ public void getTable(
             final SessionState.ExportObject<Table> keys =
                     ticketRouter.resolve(session, request.getKeyTableTicket(), "keyTable");
 
-            session.newExport(request.getResultId(), "resultId")
+            session.<Table>newExport(request.getResultId(), "resultId")
                     .queryPerformanceRecorder(queryPerformanceRecorder)
                     .require(partitionedTable, keys)
                     .onError(responseObserver)
+                    .onSuccess((final Table table) -> safelyOnNextAndComplete(responseObserver,
+                            buildTableCreationResponse(request.getResultId(), table)))
                     .submit(() -> {
                         Table table;
                         Table keyTable = keys.get();
@@ -189,13 +191,10 @@ public void getTable(
                             });
                         }
                         table = authorizationTransformation.transform(table);
-                        final ExportedTableCreationResponse response =
-                                buildTableCreationResponse(request.getResultId(), table);
                         if (table == null) {
                             throw Exceptions.statusRuntimeException(
                                     Code.FAILED_PRECONDITION, "Not authorized to get table.");
                         }
-                        safelyComplete(responseObserver, response);
                         return table;
                     });
         }
diff --git a/server/src/main/java/io/deephaven/server/plugin/python/LivePyObjectWrapper.java b/server/src/main/java/io/deephaven/server/plugin/python/LivePyObjectWrapper.java
index c06d2d19c90..c14a53f9a69 100644
--- a/server/src/main/java/io/deephaven/server/plugin/python/LivePyObjectWrapper.java
+++ b/server/src/main/java/io/deephaven/server/plugin/python/LivePyObjectWrapper.java
@@ -9,6 +9,8 @@
 import org.jetbrains.annotations.NotNull;
 import org.jpy.PyObject;
 
+import javax.annotation.OverridingMethodsMustInvokeSuper;
+
 /**
  * Provides a mapping between Python refcount and Deephaven's liveness mechanism, allowing liveness scopes to manage the
  * single <a href='https://docs.python.org/3/glossary.html#term-strong-reference'>strong reference</a> that the PyObject
@@ -33,6 +35,7 @@ public LivePyObjectWrapper(@NotNull PyObject pythonObject) {
         LivenessScopeStack.peek().manage(this);
     }
 
+    @OverridingMethodsMustInvokeSuper
     @Override
     protected void destroy() {
         super.destroy();
diff --git a/server/src/main/java/io/deephaven/server/runner/CommunityDefaultsModule.java b/server/src/main/java/io/deephaven/server/runner/CommunityDefaultsModule.java
index 72c9af07268..39780a0c1dc 100644
--- a/server/src/main/java/io/deephaven/server/runner/CommunityDefaultsModule.java
+++ b/server/src/main/java/io/deephaven/server/runner/CommunityDefaultsModule.java
@@ -4,7 +4,6 @@
 package io.deephaven.server.runner;
 
 import dagger.Module;
-import io.deephaven.client.ClientDefaultsModule;
 import io.deephaven.time.calendar.CalendarsFromConfigurationModule;
 import io.deephaven.server.console.ExecutionContextModule;
 import io.deephaven.server.console.groovy.GroovyConsoleSessionModule;
@@ -35,7 +34,6 @@
  * @see PythonConsoleSessionModule
  * @see GroovyConsoleSessionModule
  * @see ExecutionContextModule
- * @see ClientDefaultsModule
  * @see ObfuscatingErrorTransformerModule
  * @see CalendarsFromConfigurationModule
  */
@@ -49,7 +47,6 @@
         PythonConsoleSessionModule.class,
         GroovyConsoleSessionModule.class,
         ExecutionContextModule.class,
-        ClientDefaultsModule.class,
         ObfuscatingErrorTransformerModule.class,
         CalendarsFromConfigurationModule.class,
 })
diff --git a/server/src/main/java/io/deephaven/server/runner/DeephavenApiConfigModule.java b/server/src/main/java/io/deephaven/server/runner/DeephavenApiConfigModule.java
index 253ace99aa1..15c8130346e 100644
--- a/server/src/main/java/io/deephaven/server/runner/DeephavenApiConfigModule.java
+++ b/server/src/main/java/io/deephaven/server/runner/DeephavenApiConfigModule.java
@@ -6,9 +6,6 @@
 import dagger.Module;
 import dagger.Provides;
 import io.deephaven.server.config.ServerConfig;
-import io.deephaven.ssl.config.SSLConfig;
-import io.deephaven.ssl.config.Trust;
-import io.deephaven.ssl.config.TrustJdk;
 
 import javax.inject.Named;
 
@@ -38,19 +35,4 @@ public static long providesSessionTokenExpireTmMs(ServerConfig config) {
     public static int providesMaxInboundMessageSize(ServerConfig config) {
         return config.maxInboundMessageSize();
     }
-
-    /**
-     * The client SSL configuration is the first of {@link ServerConfig#outboundSsl()}, {@link ServerConfig#ssl()}, or
-     * {@link SSLConfig#empty()}. In addition, {@link TrustJdk} is mixed-in.
-     *
-     * @param config the server configuration
-     * @return the client SSL configuration
-     */
-    @Provides
-    @Named("client.sslConfig")
-    public static SSLConfig providesSSLConfigForClient(ServerConfig config) {
-        final SSLConfig clientSslConfig = config.outboundSsl().or(config::ssl).orElseGet(SSLConfig::empty);
-        final Trust trustPlusJdk = clientSslConfig.trust().orElse(TrustJdk.of()).or(TrustJdk.of());
-        return clientSslConfig.withTrust(trustPlusJdk);
-    }
 }
diff --git a/server/src/main/java/io/deephaven/server/runner/DeephavenApiServer.java b/server/src/main/java/io/deephaven/server/runner/DeephavenApiServer.java
index 06d874c8a91..39156d05d42 100644
--- a/server/src/main/java/io/deephaven/server/runner/DeephavenApiServer.java
+++ b/server/src/main/java/io/deephaven/server/runner/DeephavenApiServer.java
@@ -13,7 +13,6 @@
 import io.deephaven.engine.table.impl.util.ServerStateTracker;
 import io.deephaven.engine.updategraph.UpdateGraph;
 import io.deephaven.engine.updategraph.impl.PeriodicUpdateGraph;
-import io.deephaven.engine.util.AbstractScriptSession;
 import io.deephaven.engine.util.ScriptSession;
 import io.deephaven.internal.log.LoggerFactory;
 import io.deephaven.io.logger.Logger;
diff --git a/server/src/main/java/io/deephaven/server/session/ActionResolver.java b/server/src/main/java/io/deephaven/server/session/ActionResolver.java
new file mode 100644
index 00000000000..c99a2225a56
--- /dev/null
+++ b/server/src/main/java/io/deephaven/server/session/ActionResolver.java
@@ -0,0 +1,57 @@
+//
+// Copyright (c) 2016-2024 Deephaven Data Labs and Patent Pending
+//
+package io.deephaven.server.session;
+
+import io.grpc.stub.StreamObserver;
+import org.apache.arrow.flight.Action;
+import org.apache.arrow.flight.ActionType;
+import org.apache.arrow.flight.Result;
+import org.jetbrains.annotations.Nullable;
+
+import java.util.function.Consumer;
+
+public interface ActionResolver {
+
+    /**
+     * Invokes the {@code visitor} for the specific action types that this implementation supports for the given
+     * {@code session}; it should be the case that all consumed action types return {@code true} against
+     * {@link #handlesActionType(String)}. Unlike {@link #handlesActionType(String)}, the implementations should
+     * <b>not</b> invoke the visitor for action types in their domain that they do not implement.
+     *
+     * <p>
+     * This is called in the context of {@link ActionRouter#listActions(SessionState, Consumer)} to allow flight
+     * consumers to understand the capabilities of this flight service.
+     *
+     * @param session the session
+     * @param visitor the visitor
+     */
+    void listActions(@Nullable SessionState session, Consumer<ActionType> visitor);
+
+    /**
+     * Returns {@code true} if this resolver is responsible for handling the action {@code type}. Implementations should
+     * prefer to return {@code true} if they know the action type is in their domain even if they don't implement it;
+     * this allows them to provide a more specific error message for unimplemented action types.
+     *
+     * <p>
+     * This is used in support of routing in {@link ActionRouter#doAction(SessionState, Action, StreamObserver)} calls.
+     *
+     * @param type the action type
+     * @return {@code true} if this resolver handles the action type
+     */
+    boolean handlesActionType(String type);
+
+    /**
+     * Executes the given {@code action}. Should only be called if {@link #handlesActionType(String)} is {@code true}
+     * for the given {@code action}.
+     *
+     * <p>
+     * This is called in the context of {@link ActionRouter#doAction(SessionState, Action, StreamObserver)} to allow
+     * flight consumers to execute an action against this flight service.
+     *
+     * @param session the session
+     * @param action the action
+     * @param observer the observer
+     */
+    void doAction(@Nullable final SessionState session, final Action action, final StreamObserver<Result> observer);
+}
diff --git a/server/src/main/java/io/deephaven/server/session/ActionRouter.java b/server/src/main/java/io/deephaven/server/session/ActionRouter.java
new file mode 100644
index 00000000000..33ebcf901da
--- /dev/null
+++ b/server/src/main/java/io/deephaven/server/session/ActionRouter.java
@@ -0,0 +1,99 @@
+//
+// Copyright (c) 2016-2024 Deephaven Data Labs and Patent Pending
+//
+package io.deephaven.server.session;
+
+import com.google.rpc.Code;
+import io.deephaven.configuration.Configuration;
+import io.deephaven.engine.table.impl.perf.QueryPerformanceNugget;
+import io.deephaven.engine.table.impl.perf.QueryPerformanceRecorder;
+import io.deephaven.proto.util.Exceptions;
+import io.grpc.stub.StreamObserver;
+import org.apache.arrow.flight.Action;
+import org.apache.arrow.flight.ActionType;
+import org.apache.arrow.flight.Result;
+import org.jetbrains.annotations.Nullable;
+
+import javax.inject.Inject;
+import java.util.Set;
+import java.util.function.Consumer;
+import java.util.stream.Collectors;
+
+public final class ActionRouter {
+
+    private static boolean enabled(ActionResolver resolver) {
+        final String property =
+                ActionResolver.class.getSimpleName() + "." + resolver.getClass().getSimpleName() + ".enabled";
+        return Configuration.getInstance().getBooleanWithDefault(property, true);
+    }
+
+    private final Set<ActionResolver> resolvers;
+
+    @Inject
+    public ActionRouter(Set<ActionResolver> resolvers) {
+        this.resolvers = resolvers.stream()
+                .filter(ActionRouter::enabled)
+                .collect(Collectors.toSet());
+    }
+
+    /**
+     * Invokes {@code visitor} for all of the resolvers. Used as the basis for implementing FlightService ListActions.
+     *
+     * @param session the session
+     * @param visitor the visitor
+     */
+    public void listActions(@Nullable final SessionState session, final Consumer<ActionType> visitor) {
+        final QueryPerformanceRecorder qpr = QueryPerformanceRecorder.getInstance();
+        try (final QueryPerformanceNugget ignored = qpr.getNugget("listActions")) {
+            for (ActionResolver resolver : resolvers) {
+                resolver.listActions(session, visitor);
+            }
+        }
+    }
+
+    /**
+     * Routes {@code action} to the appropriate {@link ActionResolver}. Used as the basis for implementing FlightService
+     * DoAction.
+     *
+     * @param session the session
+     * @param action the action
+     * @param observer the observer
+     * @throws io.grpc.StatusRuntimeException if zero or more than one resolver is found
+     */
+    public void doAction(@Nullable final SessionState session, final Action action,
+            final StreamObserver<Result> observer) {
+        final QueryPerformanceRecorder qpr = QueryPerformanceRecorder.getInstance();
+        try (final QueryPerformanceNugget ignored = qpr.getNugget(String.format("doAction:%s", action.getType()))) {
+            getResolver(action.getType()).doAction(session, action, observer);
+        }
+    }
+
+    private ActionResolver getResolver(final String type) {
+        ActionResolver actionResolver = null;
+        // This is the most "naive" resolution logic; it scales linearly with the number of resolvers, but it is the
+        // most general and may be the best we can do for certain types of action protocols built on top of Flight. If
+        // we find the number of action resolvers scaling up, we could devise a more efficient strategy in some cases
+        // either based on a prefix model and/or a fixed set model (which could be communicated either through new
+        // method(s) on ActionResolver, or through subclasses).
+        // `
+        // Regardless, even with a moderate amount of action resolvers, the linear nature of this should not be a
+        // bottleneck.
+        for (ActionResolver resolver : resolvers) {
+            if (!resolver.handlesActionType(type)) {
+                continue;
+            }
+            if (actionResolver != null) {
+                throw Exceptions.statusRuntimeException(Code.INTERNAL,
+                        String.format("Found multiple doAction resolvers for action type '%s'", type));
+            }
+            actionResolver = resolver;
+        }
+        if (actionResolver == null) {
+            // Similar to the default unimplemented message from
+            // org.apache.arrow.flight.impl.FlightServiceGrpc.AsyncService.doAction
+            throw Exceptions.statusRuntimeException(Code.UNIMPLEMENTED,
+                    String.format("No action resolver found for action type '%s'", type));
+        }
+        return actionResolver;
+    }
+}
diff --git a/server/src/main/java/io/deephaven/server/session/AuthCookie.java b/server/src/main/java/io/deephaven/server/session/AuthCookie.java
new file mode 100644
index 00000000000..5e06973ac06
--- /dev/null
+++ b/server/src/main/java/io/deephaven/server/session/AuthCookie.java
@@ -0,0 +1,73 @@
+//
+// Copyright (c) 2016-2024 Deephaven Data Labs and Patent Pending
+//
+package io.deephaven.server.session;
+
+import com.github.f4b6a3.uuid.UuidCreator;
+import com.github.f4b6a3.uuid.exception.InvalidUuidException;
+import io.grpc.Context;
+import io.grpc.Contexts;
+import io.grpc.Metadata;
+import io.grpc.ServerCall;
+import io.grpc.ServerCall.Listener;
+import io.grpc.ServerCallHandler;
+import io.grpc.ServerInterceptor;
+
+import java.util.Optional;
+import java.util.UUID;
+
+/**
+ * This exists to work around how the Flight SQL JDBC driver works out-of-the-box.
+ */
+final class AuthCookie {
+
+    private static final String HEADER = "x-deephaven-auth-cookie-request";
+
+    private static final String DEEPHAVEN_AUTH_COOKIE = "deephaven-auth-cookie";
+
+    private static final Metadata.Key<String> REQUEST_AUTH_COOKIE_HEADER_KEY =
+            Metadata.Key.of(HEADER, Metadata.ASCII_STRING_MARSHALLER);
+
+    private static final Metadata.Key<String> SET_COOKIE =
+            Metadata.Key.of("set-cookie", Metadata.ASCII_STRING_MARSHALLER);
+
+    private static final Metadata.Key<String> COOKIE =
+            Metadata.Key.of("cookie", Metadata.ASCII_STRING_MARSHALLER);
+
+    /**
+     * Returns {@code true} if the metadata contains the header {@value HEADER} with value "true".
+     */
+    public static boolean hasDeephavenAuthCookieRequest(Metadata md) {
+        return Boolean.parseBoolean(md.get(REQUEST_AUTH_COOKIE_HEADER_KEY));
+    }
+
+    /**
+     * Sets the auth cookie {@value DEEPHAVEN_AUTH_COOKIE} to {@code token}.
+     */
+    public static void setDeephavenAuthCookie(Metadata md, UUID token) {
+        md.put(SET_COOKIE, DEEPHAVEN_AUTH_COOKIE + "=" + token.toString());
+    }
+
+    /**
+     * Parses the "cookie" header for the Deephaven auth cookie if it is of the form "deephaven-auth-cookie=<UUID>".
+     */
+    public static Optional<UUID> parseAuthCookie(Metadata md) {
+        final String cookie = md.get(COOKIE);
+        if (cookie == null) {
+            return Optional.empty();
+        }
+        // DH will only ever set one cookie of the form "deephaven-auth-cookie=<UUID>"; anything that doesn't match this
+        // is invalid.
+        final String[] split = cookie.split("=");
+        if (split.length != 2 || !DEEPHAVEN_AUTH_COOKIE.equals(split[0])) {
+            return Optional.empty();
+        }
+        final UUID uuid;
+        try {
+            uuid = UuidCreator.fromString(split[1]);
+        } catch (InvalidUuidException e) {
+            return Optional.empty();
+        }
+        return Optional.of(uuid);
+    }
+}
diff --git a/server/src/main/java/io/deephaven/server/session/ClientChannelFactoryModule.java b/server/src/main/java/io/deephaven/server/session/ClientChannelFactoryModule.java
new file mode 100644
index 00000000000..bd6aed032ff
--- /dev/null
+++ b/server/src/main/java/io/deephaven/server/session/ClientChannelFactoryModule.java
@@ -0,0 +1,39 @@
+//
+// Copyright (c) 2016-2024 Deephaven Data Labs and Patent Pending
+//
+package io.deephaven.server.session;
+
+import dagger.Module;
+import dagger.Provides;
+import io.deephaven.client.impl.ClientChannelFactory;
+import io.deephaven.client.impl.ClientChannelFactoryDefaulter;
+import io.deephaven.ssl.config.SSLConfig;
+
+import java.lang.annotation.Documented;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+
+@Module
+public interface ClientChannelFactoryModule {
+    @Documented
+    @Retention(RetentionPolicy.SOURCE)
+    @interface SslConfig {
+
+    }
+
+    @Documented
+    @Retention(RetentionPolicy.SOURCE)
+    @interface UserAgent {
+
+    }
+
+    @Provides
+    static ClientChannelFactory providesClientChannelFactory(
+            @SslConfig SSLConfig sslConfig,
+            @UserAgent String userAgent) {
+        return ClientChannelFactoryDefaulter.builder()
+                .ssl(sslConfig)
+                .userAgent(userAgent)
+                .build();
+    }
+}
diff --git a/server/src/main/java/io/deephaven/server/session/CommandResolver.java b/server/src/main/java/io/deephaven/server/session/CommandResolver.java
new file mode 100644
index 00000000000..1aa111c2dbf
--- /dev/null
+++ b/server/src/main/java/io/deephaven/server/session/CommandResolver.java
@@ -0,0 +1,43 @@
+//
+// Copyright (c) 2016-2024 Deephaven Data Labs and Patent Pending
+//
+package io.deephaven.server.session;
+
+
+import org.apache.arrow.flight.impl.Flight.FlightDescriptor;
+
+/**
+ * A specialization of {@link TicketResolver} that signifies this resolver supports Flight descriptor commands.
+ *
+ * <p>
+ * Unfortunately, there is no universal way to know whether a command belongs to a given Flight protocol or not; at
+ * best, we can assume (or mandate) that all the supportable command bytes are sufficiently unique such that there is no
+ * potential for overlap amongst the installed Flight protocols.
+ *
+ * <p>
+ * For example there could be command protocols built on top of Flight that simply use integer ordinals as their command
+ * serialization format. In such a case, only one such protocol could safely be installed; otherwise, there would be no
+ * reliable way of differentiating between them from the command bytes. (It's possible that other means of
+ * differentiating could be established, like header values.)
+ *
+ * <p>
+ * If Deephaven is in a position to create a protocol that uses Flight commands, or advise on their creation, it would
+ * probably be wise to use a command serialization format that has a "unique" magic value as its prefix.
+ *
+ * <p>
+ * The Flight SQL approach is to use the protobuf message Any to wrap up the respective protobuf Flight SQL command
+ * message. While this approach is very likely to produce a sufficiently unique selection criteria, it requires
+ * "non-trivial" parsing to determine whether the command is supported or not.
+ */
+public interface CommandResolver extends TicketResolver {
+
+    /**
+     * Returns {@code true} if this resolver is responsible for handling the {@code descriptor} command. Implementations
+     * should prefer to return {@code true} here if they know the command is in their domain even if they don't
+     * implement it; this allows them to provide a more specific error message for unsupported commands.
+     *
+     * @param descriptor the descriptor
+     * @return {@code true} if this resolver handles the descriptor command
+     */
+    boolean handlesCommand(FlightDescriptor descriptor);
+}
diff --git a/server/src/main/java/io/deephaven/server/session/PathResolver.java b/server/src/main/java/io/deephaven/server/session/PathResolver.java
new file mode 100644
index 00000000000..b844e346d62
--- /dev/null
+++ b/server/src/main/java/io/deephaven/server/session/PathResolver.java
@@ -0,0 +1,23 @@
+//
+// Copyright (c) 2016-2024 Deephaven Data Labs and Patent Pending
+//
+package io.deephaven.server.session;
+
+
+import org.apache.arrow.flight.impl.Flight.FlightDescriptor;
+
+/**
+ * A specialization of {@link TicketResolver} that signifies this resolver supports Flight descriptor paths.
+ */
+public interface PathResolver extends TicketResolver {
+
+    /**
+     * Returns {@code true} if this resolver is responsible for handling the {@code descriptor} path. Implementations
+     * should prefer to return {@code true} here if they know the path is in their domain even if they don't implement
+     * it; this allows them to provide a more specific error message for unsupported paths.
+     *
+     * @param descriptor the descriptor
+     * @return {@code true} if this resolver handles the descriptor path
+     */
+    boolean handlesPath(FlightDescriptor descriptor);
+}
diff --git a/server/src/main/java/io/deephaven/server/session/PathResolverPrefixedBase.java b/server/src/main/java/io/deephaven/server/session/PathResolverPrefixedBase.java
new file mode 100644
index 00000000000..f048781d6cb
--- /dev/null
+++ b/server/src/main/java/io/deephaven/server/session/PathResolverPrefixedBase.java
@@ -0,0 +1,48 @@
+//
+// Copyright (c) 2016-2024 Deephaven Data Labs and Patent Pending
+//
+package io.deephaven.server.session;
+
+import org.apache.arrow.flight.impl.Flight;
+
+import java.util.Objects;
+
+/**
+ * A specialization of {@link PathResolver} whose path {@link Flight.FlightDescriptor} resolution is based on the first
+ * path in the list.
+ */
+public abstract class PathResolverPrefixedBase implements PathResolver {
+
+    private final String flightDescriptorRoute;
+
+    public PathResolverPrefixedBase(String flightDescriptorRoute) {
+        this.flightDescriptorRoute = Objects.requireNonNull(flightDescriptorRoute);
+    }
+
+    /**
+     * The first path entry on a route indicates which resolver to use. The remaining path elements are used to resolve
+     * the descriptor.
+     *
+     * @return the string that will route from flight descriptor to this resolver
+     */
+    public final String flightDescriptorRoute() {
+        return flightDescriptorRoute;
+    }
+
+    /**
+     * Returns {@code true} if the first path in {@code descriptor} is equal to {@link #flightDescriptorRoute()}.
+     *
+     * @param descriptor the descriptor
+     * @return {@code true} if this resolver handles the descriptor path
+     */
+    @Override
+    public final boolean handlesPath(Flight.FlightDescriptor descriptor) {
+        if (descriptor.getType() != Flight.FlightDescriptor.DescriptorType.PATH) {
+            throw new IllegalStateException("descriptor is not a path");
+        }
+        if (descriptor.getPathCount() == 0) {
+            return false;
+        }
+        return flightDescriptorRoute.equals(descriptor.getPath(0));
+    }
+}
diff --git a/server/src/main/java/io/deephaven/server/session/SessionFactoryCreator.java b/server/src/main/java/io/deephaven/server/session/SessionFactoryCreator.java
index 69d1b37a148..270b26bb3d9 100644
--- a/server/src/main/java/io/deephaven/server/session/SessionFactoryCreator.java
+++ b/server/src/main/java/io/deephaven/server/session/SessionFactoryCreator.java
@@ -9,11 +9,9 @@
 import io.deephaven.client.impl.FlightSessionFactoryConfig;
 import io.deephaven.client.impl.SessionConfig;
 import io.deephaven.client.impl.SessionFactoryConfig;
-import io.deephaven.ssl.config.SSLConfig;
 import org.apache.arrow.memory.BufferAllocator;
 
 import javax.inject.Inject;
-import javax.inject.Named;
 import java.util.Objects;
 import java.util.concurrent.ScheduledExecutorService;
 
@@ -26,17 +24,14 @@ public final class SessionFactoryCreator {
     private final ScheduledExecutorService scheduler;
     private final BufferAllocator allocator;
     private final ClientChannelFactory clientChannelFactory;
-    private final SSLConfig defaultOutboundSslConfig;
 
     @Inject
     public SessionFactoryCreator(
             ScheduledExecutorService scheduler,
             BufferAllocator allocator,
-            @Named("client.sslConfig") SSLConfig defaultOutboundSslConfig,
             ClientChannelFactory clientChannelFactory) {
         this.scheduler = Objects.requireNonNull(scheduler);
         this.allocator = Objects.requireNonNull(allocator);
-        this.defaultOutboundSslConfig = Objects.requireNonNull(defaultOutboundSslConfig);
         this.clientChannelFactory = Objects.requireNonNull(clientChannelFactory);
     }
 
@@ -50,7 +45,7 @@ public SessionFactoryCreator(
      */
     public SessionFactoryConfig.Factory sessionFactory(ClientConfig clientConfig) {
         return SessionFactoryConfig.builder()
-                .clientConfig(clientConfigToUse(clientConfig))
+                .clientConfig(clientConfig)
                 .clientChannelFactory(clientChannelFactory)
                 .sessionConfig(SESSION_CONFIG_EMPTY)
                 .scheduler(scheduler)
@@ -68,7 +63,7 @@ public SessionFactoryConfig.Factory sessionFactory(ClientConfig clientConfig) {
      */
     public FlightSessionFactoryConfig.Factory flightFactory(ClientConfig clientConfig) {
         return FlightSessionFactoryConfig.builder()
-                .clientConfig(clientConfigToUse(clientConfig))
+                .clientConfig(clientConfig)
                 .clientChannelFactory(clientChannelFactory)
                 .sessionConfig(SESSION_CONFIG_EMPTY)
                 .allocator(allocator)
@@ -87,7 +82,7 @@ public FlightSessionFactoryConfig.Factory flightFactory(ClientConfig clientConfi
      */
     public BarrageSessionFactoryConfig.Factory barrageFactory(ClientConfig clientConfig) {
         return BarrageSessionFactoryConfig.builder()
-                .clientConfig(clientConfigToUse(clientConfig))
+                .clientConfig(clientConfig)
                 .clientChannelFactory(clientChannelFactory)
                 .sessionConfig(SESSION_CONFIG_EMPTY)
                 .allocator(allocator)
@@ -95,10 +90,4 @@ public BarrageSessionFactoryConfig.Factory barrageFactory(ClientConfig clientCon
                 .build()
                 .factory();
     }
-
-    private ClientConfig clientConfigToUse(ClientConfig config) {
-        return config.ssl().isEmpty() && config.target().isSecure()
-                ? config.withSsl(defaultOutboundSslConfig)
-                : config;
-    }
 }
diff --git a/server/src/main/java/io/deephaven/server/session/SessionService.java b/server/src/main/java/io/deephaven/server/session/SessionService.java
index 77bc332ae22..f04d8a9937f 100644
--- a/server/src/main/java/io/deephaven/server/session/SessionService.java
+++ b/server/src/main/java/io/deephaven/server/session/SessionService.java
@@ -4,6 +4,7 @@
 package io.deephaven.server.session;
 
 import com.github.f4b6a3.uuid.UuidCreator;
+import com.github.f4b6a3.uuid.exception.InvalidUuidException;
 import com.google.common.cache.Cache;
 import com.google.common.cache.CacheBuilder;
 import com.google.protobuf.ByteString;
@@ -35,6 +36,7 @@
 import java.util.List;
 import java.util.Map;
 import java.util.Objects;
+import java.util.Optional;
 import java.util.Set;
 import java.util.UUID;
 import java.util.concurrent.ConcurrentHashMap;
@@ -325,6 +327,9 @@ public long getExpirationDelayMs() {
      * @return the session or null if the session is invalid
      */
     public SessionState getSessionForAuthToken(final String token) throws AuthenticationException {
+        String bearerKey = null;
+        String bearerPayload = null;
+
         if (token.startsWith(Auth2Constants.BEARER_PREFIX)) {
             final String authToken = token.substring(Auth2Constants.BEARER_PREFIX.length());
             try {
@@ -333,21 +338,41 @@ public SessionState getSessionForAuthToken(final String token) throws Authentica
                 if (session != null) {
                     return session;
                 }
-            } catch (IllegalArgumentException ignored) {
+            } catch (InvalidUuidException ignored) {
             }
+
+            // In case we don't have another handler for Bearer, look for nested tokens to try later
+            int offset = authToken.indexOf(' ');
+            bearerKey = authToken.substring(0, offset < 0 ? authToken.length() : offset);
+            bearerPayload = offset < 0 ? "" : authToken.substring(offset + 1);
         }
 
         int offset = token.indexOf(' ');
         final String key = token.substring(0, offset < 0 ? token.length() : offset);
         final String payload = offset < 0 ? "" : token.substring(offset + 1);
+        // Use the auth type to look up a handler. If this happens to be Bearer, this gives a chance for an auth handler
+        // to claim that type
         AuthenticationRequestHandler handler = authRequestHandlers.get(key);
-        if (handler == null) {
-            log.info().append("No AuthenticationRequestHandler registered for type ").append(key).endl();
-            throw new AuthenticationException();
+        if (handler != null) {
+            Optional<AuthContext> s = handler.login(payload, SessionServiceGrpcImpl::insertCallHeader);
+            if (s.isPresent()) {
+                return newSession(s.get());
+            }
         }
-        return handler.login(payload, SessionServiceGrpcImpl::insertCallHeader)
-                .map(this::newSession)
-                .orElseThrow(AuthenticationException::new);
+        // If nothing succeeded or errored yet, and we found a key in the bearer value, try that next
+        if (bearerKey != null) {
+            handler = authRequestHandlers.get(bearerKey);
+            if (handler != null) {
+                Optional<AuthContext> s = handler.login(bearerPayload, SessionServiceGrpcImpl::insertCallHeader);
+                if (s.isPresent()) {
+                    return newSession(s.get());
+                }
+            }
+        }
+
+        // No more options, log an error and return
+        log.info().append("No AuthenticationRequestHandler registered for type ").append(key).endl();
+        throw new AuthenticationException();
     }
 
     /**
@@ -486,7 +511,7 @@ protected void onClose() {
         }
 
         void sendMessage(final TerminationNotificationResponse response) {
-            GrpcUtil.safelyComplete(responseObserver, response);
+            GrpcUtil.safelyOnNextAndComplete(responseObserver, response);
         }
     }
 }
diff --git a/server/src/main/java/io/deephaven/server/session/SessionServiceGrpcImpl.java b/server/src/main/java/io/deephaven/server/session/SessionServiceGrpcImpl.java
index f13bb33e55d..edeeadce006 100644
--- a/server/src/main/java/io/deephaven/server/session/SessionServiceGrpcImpl.java
+++ b/server/src/main/java/io/deephaven/server/session/SessionServiceGrpcImpl.java
@@ -3,6 +3,8 @@
 //
 package io.deephaven.server.session;
 
+import com.github.f4b6a3.uuid.UuidCreator;
+import com.github.f4b6a3.uuid.exception.InvalidUuidException;
 import com.google.protobuf.ByteString;
 import com.google.rpc.Code;
 import io.deephaven.auth.AuthContext;
@@ -38,8 +40,10 @@
 import javax.inject.Singleton;
 import java.io.Closeable;
 import java.lang.Object;
+import java.nio.charset.StandardCharsets;
 import java.util.LinkedHashMap;
 import java.util.Map;
+import java.util.Objects;
 import java.util.Set;
 import java.util.UUID;
 
@@ -51,6 +55,7 @@ public class SessionServiceGrpcImpl extends SessionServiceGrpc.SessionServiceImp
     public static final String DEEPHAVEN_SESSION_ID = Auth2Constants.AUTHORIZATION_HEADER;
     public static final Metadata.Key<String> SESSION_HEADER_KEY =
             Metadata.Key.of(Auth2Constants.AUTHORIZATION_HEADER, Metadata.ASCII_STRING_MARSHALLER);
+
     public static final Context.Key<SessionState> SESSION_CONTEXT_KEY =
             Context.key(Auth2Constants.AUTHORIZATION_HEADER);
 
@@ -182,11 +187,9 @@ public void exportFromTicket(
                     .queryPerformanceRecorder(queryPerformanceRecorder)
                     .require(source)
                     .onError(responseObserver)
-                    .submit(() -> {
-                        final Object o = source.get();
-                        GrpcUtil.safelyComplete(responseObserver, ExportResponse.getDefaultInstance());
-                        return o;
-                    });
+                    .onSuccess((final Object ignoredResult) -> GrpcUtil.safelyOnNextAndComplete(responseObserver,
+                            ExportResponse.getDefaultInstance()))
+                    .submit(source::get);
         }
     }
 
@@ -219,7 +222,7 @@ public void publishFromTicket(
             Ticket resultId = request.getResultId();
 
             ticketRouter.publish(session, resultId, "resultId",
-                    () -> GrpcUtil.safelyComplete(responseObserver, PublishResponse.getDefaultInstance()),
+                    () -> GrpcUtil.safelyOnNextAndComplete(responseObserver, PublishResponse.getDefaultInstance()),
                     SessionState.toErrorHandler(sre -> GrpcUtil.safelyError(responseObserver, sre)),
                     source);
         }
@@ -264,12 +267,17 @@ public static class InterceptedCall<ReqT, RespT> extends SimpleForwardingServerC
         private final SessionService service;
         private final SessionState session;
         private final Map<Metadata.Key<String>, String> extraHeaders = new LinkedHashMap<>();
+        private final boolean setDeephavenAuthCookie;
 
-        private InterceptedCall(final SessionService service, final ServerCall<ReqT, RespT> call,
-                @Nullable final SessionState session) {
-            super(call);
-            this.service = service;
+        private InterceptedCall(
+                final SessionService service,
+                final ServerCall<ReqT, RespT> call,
+                @Nullable final SessionState session,
+                boolean setDeephavenAuthCookie) {
+            super(Objects.requireNonNull(call));
+            this.service = Objects.requireNonNull(service);
             this.session = session;
+            this.setDeephavenAuthCookie = setDeephavenAuthCookie;
         }
 
         @Override
@@ -305,6 +313,9 @@ private void addHeaders(final Metadata md) {
                 final SessionService.TokenExpiration exp = service.refreshToken(session);
                 if (exp != null) {
                     md.put(SESSION_HEADER_KEY, Auth2Constants.BEARER_PREFIX + exp.token.toString());
+                    if (setDeephavenAuthCookie) {
+                        AuthCookie.setDeephavenAuthCookie(md, exp.token);
+                    }
                 }
             }
         }
@@ -330,8 +341,8 @@ public static class SessionServiceInterceptor implements ServerInterceptor {
         public SessionServiceInterceptor(
                 final SessionService service,
                 final SessionService.ErrorTransformer errorTransformer) {
-            this.service = service;
-            this.errorTransformer = errorTransformer;
+            this.service = Objects.requireNonNull(service);
+            this.errorTransformer = Objects.requireNonNull(errorTransformer);
         }
 
         @Override
@@ -344,25 +355,37 @@ public <ReqT, RespT> ServerCall.Listener<ReqT> interceptCall(final ServerCall<Re
             final byte[] altToken = metadata.get(AuthConstants.TOKEN_KEY);
             if (altToken != null) {
                 try {
-                    session = service.getSessionForToken(UUID.fromString(new String(altToken)));
-                } catch (IllegalArgumentException ignored) {
+                    session = service.getSessionForToken(
+                            UuidCreator.fromString(new String(altToken, StandardCharsets.US_ASCII)));
+                } catch (IllegalArgumentException | InvalidUuidException ignored) {
                 }
             }
 
-            // Lookup the session using Flight Auth 2.0 token.
-            final String token = metadata.get(SESSION_HEADER_KEY);
-            if (session == null && token != null) {
-                try {
-                    session = service.getSessionForAuthToken(token);
-                } catch (AuthenticationException e) {
-                    // As an interceptor, we can't throw, so ignoring this and just returning the no-op listener.
-                    safeClose(call, AUTHENTICATION_DETAILS_INVALID, new Metadata(), false);
-                    return new ServerCall.Listener<>() {};
+            if (session == null) {
+                // Lookup the session using the auth cookie
+                final UUID uuid = AuthCookie.parseAuthCookie(metadata).orElse(null);
+                if (uuid != null) {
+                    session = service.getSessionForToken(uuid);
+                }
+            }
+
+            if (session == null) {
+                // Lookup the session using Flight Auth 2.0 token.
+                final String token = metadata.get(SESSION_HEADER_KEY);
+                if (token != null) {
+                    try {
+                        session = service.getSessionForAuthToken(token);
+                    } catch (AuthenticationException e) {
+                        // As an interceptor, we can't throw, so ignoring this and just returning the no-op listener.
+                        safeClose(call, AUTHENTICATION_DETAILS_INVALID, new Metadata(), false);
+                        return new ServerCall.Listener<>() {};
+                    }
                 }
             }
 
             // On the outer half of the call we'll install the context that includes our session.
-            final InterceptedCall<ReqT, RespT> serverCall = new InterceptedCall<>(service, call, session);
+            final InterceptedCall<ReqT, RespT> serverCall = new InterceptedCall<>(service, call, session,
+                    AuthCookie.hasDeephavenAuthCookieRequest(metadata));
             final Context context = Context.current().withValues(
                     SESSION_CONTEXT_KEY, session, SESSION_CALL_KEY, serverCall);
 
@@ -485,9 +508,9 @@ private static <ReqT, RespT> void rpcWrapper(
                 // Indicates a very serious failure; debateable whether we should even try to send close.
                 safeClose(call, Status.INTERNAL, new Metadata(), false);
                 throw error;
-            } finally {
-                context.detach(previous);
             }
+        } finally {
+            context.detach(previous);
         }
     }
 
diff --git a/server/src/main/java/io/deephaven/server/session/SessionState.java b/server/src/main/java/io/deephaven/server/session/SessionState.java
index 74b5aafc304..581c7b4abc7 100644
--- a/server/src/main/java/io/deephaven/server/session/SessionState.java
+++ b/server/src/main/java/io/deephaven/server/session/SessionState.java
@@ -43,6 +43,7 @@
 import org.jetbrains.annotations.NotNull;
 
 import javax.annotation.Nullable;
+import javax.annotation.OverridingMethodsMustInvokeSuper;
 import javax.inject.Provider;
 import java.io.Closeable;
 import java.io.IOException;
@@ -417,7 +418,6 @@ public <T> ExportBuilder<T> nonExport() {
      * the close() method be idempotent, but when combined with {@link #removeOnCloseCallback(Closeable)}, close() will
      * only be called once from this class.
      * <p>
-     * </p>
      * If called after the session has expired, this will throw, and the close() method on the provided instance will
      * not be called.
      *
@@ -436,7 +436,7 @@ public void addOnCloseCallback(final Closeable onClose) {
 
     /**
      * Remove an on-close callback bound to the life of the session.
-     * <p />
+     * <p>
      * A common pattern to use this will be for an object to try to remove itself, and if it succeeds, to call its own
      * {@link Closeable#close()}. If it fails, it can expect to have close() be called automatically.
      *
@@ -525,7 +525,6 @@ public static boolean isExportStateTerminal(final ExportNotification.State state
      * Note: we reuse ExportObject for non-exporting tasks that have export dependencies.
      *
      * @param <T> Is context-sensitive depending on the export.
-     *
      * @apiNote ExportId may be 0, if this is a task that has exported dependencies, but does not export anything
      *          itself. Non-exports do not publish state changes.
      */
@@ -718,7 +717,7 @@ private synchronized void setWork(
                 return;
             }
 
-            this.exportMain = exportMain;
+            this.exportMain = Objects.requireNonNull(exportMain);
             this.errorHandler = errorHandler;
             this.successHandler = successHandler;
 
@@ -800,6 +799,13 @@ public Ticket getExportId() {
             return ExportTicketHelper.wrapExportIdInTicket(exportId);
         }
 
+        /**
+         * @return the export id for this export
+         */
+        public int getExportIdInt() {
+            return exportId;
+        }
+
         /**
          * Add dependency if object export has not yet completed.
          *
@@ -1133,6 +1139,7 @@ public synchronized void cancel() {
             }
         }
 
+        @OverridingMethodsMustInvokeSuper
         @Override
         protected synchronized void destroy() {
             super.destroy();
@@ -1313,6 +1320,7 @@ void onError(final ExportNotification.State resultState,
                 @Nullable final Exception cause,
                 @Nullable final String dependentExportId);
     }
+
     @FunctionalInterface
     public interface ExportErrorGrpcHandler {
         /**
@@ -1368,7 +1376,6 @@ public class ExportBuilder<T> {
 
         ExportBuilder(final int exportId) {
             this.exportId = exportId;
-
             if (exportId == NON_EXPORT_ID) {
                 this.export = new ExportObject<>(SessionState.this.errorTransformer, SessionState.this, NON_EXPORT_ID);
             } else {
@@ -1505,6 +1512,21 @@ public ExportBuilder<T> onSuccess(final Runnable successHandler) {
             return onSuccess(ignored -> successHandler.run());
         }
 
+        /**
+         * Invoke this method to set the {@link StreamObserver} to be
+         * {@link io.deephaven.extensions.barrage.util.GrpcUtil#safelyComplete(StreamObserver) safely completed} if this
+         * export succeeds. Only one success handler may be set. Exactly one of the onError and onSuccess handlers will
+         * be invoked.
+         * <p>
+         * Not synchronized, it is expected that the provided callback handles thread safety itself.
+         *
+         * @param streamObserver the streamObserver to be notified
+         * @return this builder
+         */
+        public ExportBuilder<T> onSuccess(final StreamObserver<?> streamObserver) {
+            return onSuccess(() -> safelyComplete(streamObserver));
+        }
+
         /**
          * This method is the final method for submitting an export to the session. The provided callable is enqueued on
          * the scheduler when all dependencies have been satisfied. Only the dependencies supplied to the builder are
@@ -1515,6 +1537,9 @@ public ExportBuilder<T> onSuccess(final Runnable successHandler) {
          *
          * @param exportMain the callable that generates the export
          * @return the submitted export object
+         * @apiNote For exports used in RPC handling, it is recommended to use {@link #onSuccess onSuccess} for result
+         *          message (unary) and completion (unary or streaming) delivery, rather than from {@code exportMain}.
+         *          This allows clients to observe performance results more predictably.
          */
         public ExportObject<T> submit(final Callable<T> exportMain) {
             export.setWork(exportMain, errorHandler, successHandler, requiresSerialQueue);
@@ -1531,6 +1556,9 @@ public ExportObject<T> submit(final Callable<T> exportMain) {
          *
          * @param exportMain the runnable to execute once dependencies have resolved
          * @return the submitted export object
+         * @apiNote For exports used in RPC handling, it is recommended to use {@link #onSuccess onSuccess} for result
+         *          message (unary) and completion (unary or streaming) delivery, rather than from {@code exportMain}.
+         *          This allows clients to observe performance results more predictably.
          */
         public ExportObject<T> submit(final Runnable exportMain) {
             return submit(() -> {
@@ -1555,7 +1583,7 @@ public int getExportId() {
     }
 
     private static final KeyedIntObjectKey<ExportObject<?>> EXPORT_OBJECT_ID_KEY =
-            new KeyedIntObjectKey.BasicStrict<ExportObject<?>>() {
+            new KeyedIntObjectKey.BasicStrict<>() {
                 @Override
                 public int getIntKey(final ExportObject<?> exportObject) {
                     return exportObject.exportId;
@@ -1563,7 +1591,7 @@ public int getIntKey(final ExportObject<?> exportObject) {
             };
 
     private final KeyedIntObjectHash.ValueFactory<ExportObject<?>> EXPORT_OBJECT_VALUE_FACTORY =
-            new KeyedIntObjectHash.ValueFactory.Strict<ExportObject<?>>() {
+            new KeyedIntObjectHash.ValueFactory.Strict<>() {
                 @Override
                 public ExportObject<?> newValue(final int key) {
                     if (isExpired()) {
diff --git a/server/src/main/java/io/deephaven/server/session/SslConfigModule.java b/server/src/main/java/io/deephaven/server/session/SslConfigModule.java
new file mode 100644
index 00000000000..b488cdd786a
--- /dev/null
+++ b/server/src/main/java/io/deephaven/server/session/SslConfigModule.java
@@ -0,0 +1,30 @@
+//
+// Copyright (c) 2016-2024 Deephaven Data Labs and Patent Pending
+//
+package io.deephaven.server.session;
+
+import dagger.Module;
+import dagger.Provides;
+import io.deephaven.server.config.ServerConfig;
+import io.deephaven.server.session.ClientChannelFactoryModule.SslConfig;
+import io.deephaven.ssl.config.SSLConfig;
+import io.deephaven.ssl.config.Trust;
+import io.deephaven.ssl.config.TrustJdk;
+
+@Module(includes = {ClientChannelFactoryModule.class})
+public interface SslConfigModule {
+    /**
+     * The client SSL configuration is the first of {@link ServerConfig#outboundSsl()}, {@link ServerConfig#ssl()}, or
+     * {@link SSLConfig#empty()}. In addition, {@link TrustJdk} is mixed-in.
+     *
+     * @param config the server configuration
+     * @return the client SSL configuration
+     */
+    @Provides
+    @SslConfig
+    static SSLConfig providesSSLConfigForClient(ServerConfig config) {
+        final SSLConfig clientSslConfig = config.outboundSsl().or(config::ssl).orElseGet(SSLConfig::empty);
+        final Trust trustPlusJdk = clientSslConfig.trust().orElse(TrustJdk.of()).or(TrustJdk.of());
+        return clientSslConfig.withTrust(trustPlusJdk);
+    }
+}
diff --git a/server/src/main/java/io/deephaven/server/session/TicketResolver.java b/server/src/main/java/io/deephaven/server/session/TicketResolver.java
index cb74ffcc49f..8a7555050b3 100644
--- a/server/src/main/java/io/deephaven/server/session/TicketResolver.java
+++ b/server/src/main/java/io/deephaven/server/session/TicketResolver.java
@@ -14,6 +14,23 @@
 
 public interface TicketResolver {
     interface Authorization {
+
+        /**
+         * Check if the caller is denied access to {@code source}; semantically equivalent to
+         * {@code transform(source) == null}. A {@code false} result does <b>not</b> mean that the caller may use
+         * {@code source} untransformed; they must still call {@link #transform(Object)} as needed.
+         *
+         * <p>
+         * The default implementation is equivalent to {@code transform(source) == null}. Implementations that perform
+         * expensive transformations may want to override this method to provide a more efficient check.
+         *
+         * @param source the source object
+         * @return if the transform of {@code source} will result in {@code null}.
+         */
+        default boolean isDeniedAccess(Object source) {
+            return transform(source) == null;
+        }
+
         /**
          * Implementations must type check the provided source as any type of object can be stored in an export.
          * <p>
@@ -61,14 +78,6 @@ interface Authorization {
      */
     byte ticketRoute();
 
-    /**
-     * The first path entry on a route indicates which resolver to use. The remaining path elements are used to resolve
-     * the descriptor.
-     *
-     * @return the string that will route from flight descriptor to this resolver
-     */
-    String flightDescriptorRoute();
-
     /**
      * Resolve a flight ticket to an export object future.
      *
@@ -175,4 +184,6 @@ SessionState.ExportObject<Flight.FlightInfo> flightInfoFor(@Nullable SessionStat
      * @param visitor the callback to invoke per descriptor path
      */
     void forAllFlightInfo(@Nullable SessionState session, Consumer<Flight.FlightInfo> visitor);
+
+    // TODO(deephaven-core#6295): Consider use of Flight POJOs instead of protobufs
 }
diff --git a/server/src/main/java/io/deephaven/server/session/TicketResolverBase.java b/server/src/main/java/io/deephaven/server/session/TicketResolverBase.java
index b206000f334..7d025ac2959 100644
--- a/server/src/main/java/io/deephaven/server/session/TicketResolverBase.java
+++ b/server/src/main/java/io/deephaven/server/session/TicketResolverBase.java
@@ -5,27 +5,24 @@
 
 import io.deephaven.server.auth.AuthorizationProvider;
 
-public abstract class TicketResolverBase implements TicketResolver {
+import java.util.Objects;
+
+public abstract class TicketResolverBase extends PathResolverPrefixedBase {
 
     protected final Authorization authorization;
     private final byte ticketPrefix;
-    private final String flightDescriptorRoute;
 
     public TicketResolverBase(
             final AuthorizationProvider authProvider,
-            final byte ticketPrefix, final String flightDescriptorRoute) {
-        this.authorization = authProvider.getTicketResolverAuthorization();
+            final byte ticketPrefix,
+            final String flightDescriptorRoute) {
+        super(flightDescriptorRoute);
+        this.authorization = Objects.requireNonNull(authProvider.getTicketResolverAuthorization());
         this.ticketPrefix = ticketPrefix;
-        this.flightDescriptorRoute = flightDescriptorRoute;
     }
 
     @Override
-    public byte ticketRoute() {
+    public final byte ticketRoute() {
         return ticketPrefix;
     }
-
-    @Override
-    public String flightDescriptorRoute() {
-        return flightDescriptorRoute;
-    }
 }
diff --git a/server/src/main/java/io/deephaven/server/session/TicketRouter.java b/server/src/main/java/io/deephaven/server/session/TicketRouter.java
index 400bb3cf4b8..e7ea4ec57f8 100644
--- a/server/src/main/java/io/deephaven/server/session/TicketRouter.java
+++ b/server/src/main/java/io/deephaven/server/session/TicketRouter.java
@@ -4,7 +4,9 @@
 package io.deephaven.server.session;
 
 import com.google.rpc.Code;
+import io.deephaven.configuration.Configuration;
 import io.deephaven.engine.table.Table;
+import io.deephaven.engine.table.impl.perf.QueryPerformanceNugget;
 import io.deephaven.engine.table.impl.perf.QueryPerformanceRecorder;
 import io.deephaven.extensions.barrage.util.BarrageUtil;
 import io.deephaven.hash.KeyedIntObjectHashMap;
@@ -16,38 +18,67 @@
 import io.deephaven.server.auth.AuthorizationProvider;
 import io.deephaven.util.SafeCloseable;
 import org.apache.arrow.flight.impl.Flight;
+import org.apache.arrow.flight.impl.Flight.FlightDescriptor;
+import org.apache.arrow.flight.impl.Flight.FlightDescriptor.DescriptorType;
 import org.jetbrains.annotations.Nullable;
 
 import javax.inject.Inject;
 import javax.inject.Singleton;
 import java.nio.ByteBuffer;
+import java.util.Objects;
+import java.util.Optional;
 import java.util.Set;
 import java.util.function.Consumer;
+import java.util.function.Predicate;
+import java.util.stream.Collectors;
 
 @Singleton
 public class TicketRouter {
+
+    private static boolean enabled(TicketResolver resolver) {
+        final String property =
+                TicketResolver.class.getSimpleName() + "." + resolver.getClass().getSimpleName() + ".enabled";
+        return Configuration.getInstance().getBooleanWithDefault(property, true);
+    }
+
     private final KeyedIntObjectHashMap<TicketResolver> byteResolverMap =
             new KeyedIntObjectHashMap<>(RESOLVER_OBJECT_TICKET_ID);
-    private final KeyedObjectHashMap<String, TicketResolver> descriptorResolverMap =
+    private final KeyedObjectHashMap<String, PathResolverPrefixedBase> prefixedPathResolverMap =
             new KeyedObjectHashMap<>(RESOLVER_OBJECT_DESCRIPTOR_ID);
 
     private final TicketResolver.Authorization authorization;
+    private final Set<CommandResolver> commandResolvers;
+    private final Set<PathResolver> genericPathResolvers;
 
     @Inject
     public TicketRouter(
             final AuthorizationProvider authorizationProvider,
-            final Set<TicketResolver> resolvers) {
+            Set<TicketResolver> resolvers) {
+        resolvers = resolvers.stream().filter(TicketRouter::enabled).collect(Collectors.toSet());
         this.authorization = authorizationProvider.getTicketResolverAuthorization();
-        resolvers.forEach(resolver -> {
+        this.commandResolvers = resolvers.stream()
+                .filter(CommandResolver.class::isInstance)
+                .map(CommandResolver.class::cast)
+                .collect(Collectors.toSet());
+        this.genericPathResolvers = resolvers.stream()
+                .filter(PathResolver.class::isInstance)
+                .filter(Predicate.not(PathResolverPrefixedBase.class::isInstance))
+                .map(PathResolver.class::cast)
+                .collect(Collectors.toSet());
+        for (TicketResolver resolver : resolvers) {
             if (!byteResolverMap.add(resolver)) {
                 throw new IllegalArgumentException("Duplicate ticket resolver for ticket route "
                         + resolver.ticketRoute());
             }
-            if (!descriptorResolverMap.add(resolver)) {
+            if (!(resolver instanceof PathResolverPrefixedBase)) {
+                continue;
+            }
+            final PathResolverPrefixedBase prefixedPathResolver = (PathResolverPrefixedBase) resolver;
+            if (!prefixedPathResolverMap.add(prefixedPathResolver)) {
                 throw new IllegalArgumentException("Duplicate ticket resolver for descriptor route "
-                        + resolver.flightDescriptorRoute());
+                        + prefixedPathResolver.flightDescriptorRoute());
             }
-        });
+        }
     }
 
     /**
@@ -71,6 +102,8 @@ public <T> SessionState.ExportObject<T> resolve(
         try (final SafeCloseable ignored = QueryPerformanceRecorder.getInstance().getNugget(
                 "resolveTicket:" + ticketName)) {
             return getResolver(ticket.get(ticket.position()), logId).resolve(session, ticket, logId);
+        } catch (RuntimeException e) {
+            return SessionState.wrapAsFailedExport(e);
         }
     }
 
@@ -122,6 +155,8 @@ public <T> SessionState.ExportObject<T> resolve(
         try (final SafeCloseable ignored = QueryPerformanceRecorder.getInstance().getNugget(
                 "resolveDescriptor:" + descriptor)) {
             return getResolver(descriptor, logId).resolve(session, descriptor, logId);
+        } catch (RuntimeException e) {
+            return SessionState.wrapAsFailedExport(e);
         }
     }
 
@@ -240,10 +275,14 @@ public <T> void publish(
             @Nullable final Runnable onPublish,
             final SessionState.ExportErrorHandler errorHandler,
             final SessionState.ExportObject<T> source) {
-        final ByteBuffer ticketBuffer = ticket.getTicket().asReadOnlyByteBuffer();
-        final TicketResolver resolver = getResolver(ticketBuffer.get(ticketBuffer.position()), logId);
-        authorization.authorizePublishRequest(resolver, ticketBuffer);
-        resolver.publish(session, ticketBuffer, logId, onPublish, errorHandler, source);
+        final String ticketName = getLogNameFor(ticket, logId);
+        try (final SafeCloseable ignored =
+                QueryPerformanceRecorder.getInstance().getNugget("publishTicket:" + ticketName)) {
+            final ByteBuffer ticketBuffer = ticket.getTicket().asReadOnlyByteBuffer();
+            final TicketResolver resolver = getResolver(ticketBuffer.get(ticketBuffer.position()), logId);
+            authorization.authorizePublishRequest(resolver, ticketBuffer);
+            resolver.publish(session, ticketBuffer, logId, onPublish, errorHandler, source);
+        }
     }
 
     /**
@@ -260,9 +299,17 @@ public SessionState.ExportObject<Flight.FlightInfo> flightInfoFor(
             @Nullable final SessionState session,
             final Flight.FlightDescriptor descriptor,
             final String logId) {
+        // noinspection CaughtExceptionImmediatelyRethrown
         try (final SafeCloseable ignored = QueryPerformanceRecorder.getInstance().getNugget(
                 "flightInfoForDescriptor:" + descriptor)) {
             return getResolver(descriptor, logId).flightInfoFor(session, descriptor, logId);
+        } catch (RuntimeException e) {
+            // io.deephaven.server.flightsql.FlightSqlUnauthenticatedTest RPC never finishes when this path is used
+            // return SessionState.wrapAsFailedExport(e);
+            // This is a partial workaround for
+            // TODO(deephaven-core#6374): FlightServiceGrpcImpl getFlightInfo / getSchema unauthenticated path
+            // misimplemented
+            throw e;
         }
     }
 
@@ -306,7 +353,10 @@ public String getLogNameFor(final ByteBuffer ticket, final String logId) {
      * @param visitor the callback to invoke per descriptor path
      */
     public void visitFlightInfo(@Nullable final SessionState session, final Consumer<Flight.FlightInfo> visitor) {
-        byteResolverMap.iterator().forEachRemaining(resolver -> resolver.forAllFlightInfo(session, visitor));
+        final QueryPerformanceRecorder qpr = QueryPerformanceRecorder.getInstance();
+        try (final QueryPerformanceNugget ignored = qpr.getNugget("visitFlightInfo")) {
+            byteResolverMap.iterator().forEachRemaining(resolver -> resolver.forAllFlightInfo(session, visitor));
+        }
     }
 
     public static Flight.FlightInfo getFlightInfo(final Table table,
@@ -333,37 +383,96 @@ private TicketResolver getResolver(final byte route, final String logId) {
     }
 
     private TicketResolver getResolver(final Flight.FlightDescriptor descriptor, final String logId) {
-        if (descriptor.getType() != Flight.FlightDescriptor.DescriptorType.PATH) {
-            throw Exceptions.statusRuntimeException(Code.FAILED_PRECONDITION,
-                    "Could not resolve '" + logId + "': flight descriptor is not a path");
+        if (descriptor.getType() == Flight.FlightDescriptor.DescriptorType.PATH) {
+            return getPathResolver(descriptor, logId);
+        }
+        if (descriptor.getType() == DescriptorType.CMD) {
+            return getCommandResolver(descriptor, logId);
+        }
+        throw Exceptions.statusRuntimeException(Code.FAILED_PRECONDITION,
+                "Could not resolve '" + logId + "': unexpected type");
+    }
+
+    private PathResolver getPathResolver(FlightDescriptor descriptor, String logId) {
+        if (descriptor.getType() != DescriptorType.PATH) {
+            throw new IllegalStateException("descriptor is not a path");
         }
         if (descriptor.getPathCount() <= 0) {
             throw Exceptions.statusRuntimeException(Code.FAILED_PRECONDITION,
                     "Could not resolve '" + logId + "': flight descriptor does not have route path");
         }
-
         final String route = descriptor.getPath(0);
-        final TicketResolver resolver = descriptorResolverMap.get(route);
-        if (resolver == null) {
+        final PathResolverPrefixedBase prefixedResolver = prefixedPathResolverMap.get(route);
+        final PathResolver genericResolver = getGenericPathResolver(descriptor, logId, route).orElse(null);
+        if (prefixedResolver == null && genericResolver == null) {
             throw Exceptions.statusRuntimeException(Code.FAILED_PRECONDITION,
-                    "Could not resolve '" + logId + "': no resolver for route '" + route + "'");
+                    "Could not resolve '" + logId + "': no resolver for path route '" + route + "'");
         }
+        if (prefixedResolver != null && genericResolver != null) {
+            throw Exceptions.statusRuntimeException(Code.INTERNAL,
+                    "Could not resolve '" + logId + "': multiple resolvers for path route '" + route + "'");
+        }
+        return prefixedResolver != null ? prefixedResolver : Objects.requireNonNull(genericResolver);
+    }
 
-        return resolver;
+    private Optional<PathResolver> getGenericPathResolver(FlightDescriptor descriptor, String logId, String route) {
+        PathResolver genericResolver = null;
+        for (PathResolver resolver : genericPathResolvers) {
+            if (!resolver.handlesPath(descriptor)) {
+                continue;
+            }
+            if (genericResolver != null) {
+                throw Exceptions.statusRuntimeException(Code.INTERNAL,
+                        "Could not resolve '" + logId + "': multiple resolvers for path route '" + route + "'");
+            }
+            genericResolver = resolver;
+        }
+        return Optional.ofNullable(genericResolver);
+    }
+
+    private CommandResolver getCommandResolver(FlightDescriptor descriptor, String logId) {
+        if (descriptor.getType() != DescriptorType.CMD) {
+            throw new IllegalStateException("descriptor is not a command");
+        }
+        // This is the most "naive" resolution logic; it scales linearly with the number of command resolvers, but it is
+        // the most general and may be the best we can do for certain types of command protocols built on top of Flight.
+        // If we find the number of command resolvers scaling up, we could devise a more efficient strategy in some
+        // cases either based on a prefix model and/or a fixed set model (which could be communicated either through new
+        // method(s) on CommandResolver, or through subclasses).
+        //
+        // Regardless, even with a moderate amount of command resolvers, the linear nature of this should not be a
+        // bottleneck.
+        CommandResolver commandResolver = null;
+        for (CommandResolver resolver : commandResolvers) {
+            if (!resolver.handlesCommand(descriptor)) {
+                continue;
+            }
+            if (commandResolver != null) {
+                // Is there any good way to give a friendly string for unknown command bytes? Probably not.
+                throw Exceptions.statusRuntimeException(Code.INTERNAL,
+                        "Could not resolve '" + logId + "': multiple resolvers for command");
+            }
+            commandResolver = resolver;
+        }
+        if (commandResolver == null) {
+            throw Exceptions.statusRuntimeException(Code.FAILED_PRECONDITION,
+                    "Could not resolve '" + logId + "': no resolver for command");
+        }
+        return commandResolver;
     }
 
     private static final KeyedIntObjectKey<TicketResolver> RESOLVER_OBJECT_TICKET_ID =
-            new KeyedIntObjectKey.BasicStrict<TicketResolver>() {
+            new KeyedIntObjectKey.BasicStrict<>() {
                 @Override
                 public int getIntKey(final TicketResolver ticketResolver) {
                     return ticketResolver.ticketRoute();
                 }
             };
 
-    private static final KeyedObjectKey<String, TicketResolver> RESOLVER_OBJECT_DESCRIPTOR_ID =
-            new KeyedObjectKey.Basic<String, TicketResolver>() {
+    private static final KeyedObjectKey<String, PathResolverPrefixedBase> RESOLVER_OBJECT_DESCRIPTOR_ID =
+            new KeyedObjectKey.Basic<>() {
                 @Override
-                public String getKey(TicketResolver ticketResolver) {
+                public String getKey(PathResolverPrefixedBase ticketResolver) {
                     return ticketResolver.flightDescriptorRoute();
                 }
             };
diff --git a/server/src/main/java/io/deephaven/server/table/ExportedTableUpdateListener.java b/server/src/main/java/io/deephaven/server/table/ExportedTableUpdateListener.java
index f52982c2b81..cff61cf74eb 100644
--- a/server/src/main/java/io/deephaven/server/table/ExportedTableUpdateListener.java
+++ b/server/src/main/java/io/deephaven/server/table/ExportedTableUpdateListener.java
@@ -35,6 +35,8 @@
 import io.grpc.stub.StreamObserver;
 import org.jetbrains.annotations.NotNull;
 
+import javax.annotation.OverridingMethodsMustInvokeSuper;
+
 import static io.deephaven.extensions.barrage.util.GrpcUtil.safelyComplete;
 
 /**
@@ -247,6 +249,7 @@ public void onFailureInternal(final Throwable error, final Entry sourceEntry) {
                     errorTransformer.transform(error));
         }
 
+        @OverridingMethodsMustInvokeSuper
         @Override
         public void destroy() {
             super.destroy();
diff --git a/server/src/main/java/io/deephaven/server/table/TableModule.java b/server/src/main/java/io/deephaven/server/table/TableModule.java
index 6d66e1a1560..6fbd0cb224c 100644
--- a/server/src/main/java/io/deephaven/server/table/TableModule.java
+++ b/server/src/main/java/io/deephaven/server/table/TableModule.java
@@ -239,4 +239,9 @@ static TableServiceContextualAuthWiring provideAuthWiring(AuthorizationProvider
     @BatchOpCode(BatchTableRequest.Operation.OpCase.META_TABLE)
     GrpcTableOperation<?> bindMeta(MetaTableGrpcImpl op);
 
+    @Binds
+    @IntoMap
+    @BatchOpCode(BatchTableRequest.Operation.OpCase.SLICE)
+    GrpcTableOperation<?> bindSlice(SliceGrpcImpl op);
+
 }
diff --git a/server/src/main/java/io/deephaven/server/table/inputtables/InputTableServiceGrpcImpl.java b/server/src/main/java/io/deephaven/server/table/inputtables/InputTableServiceGrpcImpl.java
index c7d56cde22d..43f7b168242 100644
--- a/server/src/main/java/io/deephaven/server/table/inputtables/InputTableServiceGrpcImpl.java
+++ b/server/src/main/java/io/deephaven/server/table/inputtables/InputTableServiceGrpcImpl.java
@@ -29,7 +29,6 @@
 import org.jetbrains.annotations.NotNull;
 
 import javax.inject.Inject;
-import java.io.IOException;
 import java.util.List;
 
 public class InputTableServiceGrpcImpl extends InputTableServiceGrpc.InputTableServiceImplBase {
@@ -99,7 +98,8 @@ public void addTableToInputTable(
                         inputTableUpdater.addAsync(tableToAdd, new InputTableStatusListener() {
                             @Override
                             public void onSuccess() {
-                                GrpcUtil.safelyComplete(responseObserver, AddTableResponse.getDefaultInstance());
+                                GrpcUtil.safelyOnNextAndComplete(responseObserver,
+                                        AddTableResponse.getDefaultInstance());
                             }
 
                             @Override
@@ -164,7 +164,8 @@ public void deleteTableFromInputTable(
                         inputTableUpdater.deleteAsync(tableToRemove, new InputTableStatusListener() {
                             @Override
                             public void onSuccess() {
-                                GrpcUtil.safelyComplete(responseObserver, DeleteTableResponse.getDefaultInstance());
+                                GrpcUtil.safelyOnNextAndComplete(responseObserver,
+                                        DeleteTableResponse.getDefaultInstance());
                             }
 
                             @Override
diff --git a/server/src/main/java/io/deephaven/server/table/ops/AggregationAdapter.java b/server/src/main/java/io/deephaven/server/table/ops/AggregationAdapter.java
index 31b77003cc1..32d1ed448a1 100644
--- a/server/src/main/java/io/deephaven/server/table/ops/AggregationAdapter.java
+++ b/server/src/main/java/io/deephaven/server/table/ops/AggregationAdapter.java
@@ -6,20 +6,16 @@
 import com.google.protobuf.Descriptors.FieldDescriptor;
 import com.google.protobuf.Message;
 import com.google.rpc.Code;
-import io.deephaven.api.agg.Aggregation;
-import io.deephaven.api.agg.Aggregations;
-import io.deephaven.api.agg.ColumnAggregation;
-import io.deephaven.api.agg.ColumnAggregations;
-import io.deephaven.api.agg.Count;
-import io.deephaven.api.agg.FirstRowKey;
-import io.deephaven.api.agg.LastRowKey;
-import io.deephaven.api.agg.Partition;
+import io.deephaven.api.agg.*;
 import io.deephaven.api.agg.spec.AggSpec;
 import io.deephaven.proto.backplane.grpc.Aggregation.AggregationColumns;
 import io.deephaven.proto.backplane.grpc.Aggregation.AggregationCount;
+import io.deephaven.proto.backplane.grpc.Aggregation.AggregationCountWhere;
+import io.deephaven.proto.backplane.grpc.Aggregation.AggregationFormula;
 import io.deephaven.proto.backplane.grpc.Aggregation.AggregationPartition;
 import io.deephaven.proto.backplane.grpc.Aggregation.AggregationRowKey;
 import io.deephaven.proto.backplane.grpc.Aggregation.TypeCase;
+import io.deephaven.proto.backplane.grpc.Selectable;
 import io.deephaven.proto.util.Exceptions;
 import io.deephaven.server.grpc.GrpcErrorHelper;
 
@@ -59,6 +55,16 @@ public static void validate(io.deephaven.proto.backplane.grpc.Aggregation aggreg
         Singleton.INSTANCE.adapters().validate(aggregation);
     }
 
+    private static io.deephaven.api.Selectable adapt(Selectable selectable) {
+        switch (selectable.getTypeCase()) {
+            case RAW:
+                return io.deephaven.api.Selectable.parse(selectable.getRaw());
+            default:
+                throw new IllegalArgumentException(String.format("Unsupported Selectable type (%s) in Aggregation.",
+                        selectable.getTypeCase()));
+        }
+    }
+
     public static Aggregation adapt(io.deephaven.proto.backplane.grpc.Aggregation aggregation) {
         return Singleton.INSTANCE.adapters().adapt(aggregation);
     }
@@ -79,6 +85,14 @@ public static Count adapt(AggregationCount count) {
         return Aggregation.AggCount(count.getColumnName());
     }
 
+    public static CountWhere adapt(AggregationCountWhere count) {
+        return Aggregation.AggCountWhere(count.getColumnName(), count.getFiltersList().toArray(String[]::new));
+    }
+
+    public static Formula adapt(AggregationFormula formula) {
+        return Formula.of(adapt(formula.getSelectable()));
+    }
+
     public static FirstRowKey adaptFirst(AggregationRowKey key) {
         return Aggregation.AggFirstRowKey(key.getColumnName());
     }
@@ -164,6 +178,15 @@ public void visit(Count count) {
                     AggregationAdapter::adapt);
         }
 
+        public void visit(CountWhere countWhere) {
+            add(
+                    TypeCase.COUNT_WHERE,
+                    AggregationCountWhere.class,
+                    CountWhere.class,
+                    GrpcErrorHelper::checkHasNoUnknownFieldsRecursive,
+                    AggregationAdapter::adapt);
+        }
+
         @Override
         public void visit(FirstRowKey firstRowKey) {
             add(
@@ -194,6 +217,16 @@ public void visit(Partition partition) {
                     AggregationAdapter::adapt);
         }
 
+        @Override
+        public void visit(Formula formula) {
+            add(
+                    TypeCase.FORMULA,
+                    AggregationFormula.class,
+                    Formula.class,
+                    GrpcErrorHelper::checkHasNoUnknownFieldsRecursive,
+                    AggregationAdapter::adapt);
+        }
+
         // New types _can_ be added as unimplemented.
         // If so, please create and link to a ticket.
         // @Override
diff --git a/server/src/main/java/io/deephaven/server/table/ops/ColumnStatisticsGrpcImpl.java b/server/src/main/java/io/deephaven/server/table/ops/ColumnStatisticsGrpcImpl.java
index 6418219308f..f74bae1614d 100644
--- a/server/src/main/java/io/deephaven/server/table/ops/ColumnStatisticsGrpcImpl.java
+++ b/server/src/main/java/io/deephaven/server/table/ops/ColumnStatisticsGrpcImpl.java
@@ -22,7 +22,7 @@
 import io.deephaven.server.table.stats.ChunkedStatsKernel;
 import io.deephaven.server.table.stats.DateTimeChunkedStats;
 import io.deephaven.server.table.stats.ObjectChunkedStats;
-import io.deephaven.util.type.TypeUtils;
+import io.deephaven.util.type.NumericTypeUtils;
 import org.apache.commons.lang3.mutable.Mutable;
 import org.apache.commons.lang3.mutable.MutableObject;
 
@@ -67,20 +67,13 @@ public Table create(ColumnStatisticsRequest request, List<SessionState.ExportObj
         // Based on the column type, make a stats function and get a column source
         final ChunkedStatsKernel statsFunc;
         final ColumnSource<?> columnSource;
-        if (TypeUtils.isDateTime(type)) {
-            // Instant/ZonedDateTime only look at max/min and count
+        if (type == Instant.class) {
             statsFunc = new DateTimeChunkedStats();
-
-            // Reinterpret the column to read only long values
-            if (Instant.class.isAssignableFrom(type)) {
-                columnSource = ReinterpretUtils.instantToLongSource(table.getColumnSource(columnName));
-            } else if (ZonedDateTime.class.isAssignableFrom(type)) {
-                columnSource = ReinterpretUtils.zonedDateTimeToLongSource(table.getColumnSource(columnName));
-            } else {
-                throw Exceptions.statusRuntimeException(Code.INVALID_ARGUMENT,
-                        "DateTime columns must be Instant or ZonedDateTime");
-            }
-        } else if (TypeUtils.isNumeric(type)) {
+            columnSource = ReinterpretUtils.instantToLongSource(table.getColumnSource(columnName));
+        } else if (type == ZonedDateTime.class) {
+            statsFunc = new DateTimeChunkedStats();
+            columnSource = ReinterpretUtils.zonedDateTimeToLongSource(table.getColumnSource(columnName));
+        } else if (NumericTypeUtils.isNumeric(type)) {
             // Numeric types have a variety of statistics recorded
             statsFunc = ChunkedNumericalStatsKernel.makeChunkedNumericalStats(type);
             columnSource = table.getColumnSource(columnName);
diff --git a/server/src/main/java/io/deephaven/server/table/ops/CreateInputTableGrpcImpl.java b/server/src/main/java/io/deephaven/server/table/ops/CreateInputTableGrpcImpl.java
index 79b960b2028..3b07467576c 100644
--- a/server/src/main/java/io/deephaven/server/table/ops/CreateInputTableGrpcImpl.java
+++ b/server/src/main/java/io/deephaven/server/table/ops/CreateInputTableGrpcImpl.java
@@ -5,7 +5,6 @@
 
 import com.google.rpc.Code;
 import io.deephaven.auth.codegen.impl.TableServiceContextualAuthWiring;
-import io.deephaven.datastructures.util.CollectionUtil;
 import io.deephaven.engine.table.Table;
 import io.deephaven.engine.table.TableDefinition;
 import io.deephaven.engine.table.impl.util.AppendOnlyArrayBackedInputTable;
@@ -89,7 +88,7 @@ private static Table create(CreateInputTableRequest request, TableDefinition tab
             case IN_MEMORY_KEY_BACKED:
                 return KeyedArrayBackedInputTable.make(tableDefinitionFromSchema,
                         request.getKind().getInMemoryKeyBacked().getKeyColumnsList()
-                                .toArray(CollectionUtil.ZERO_LENGTH_STRING_ARRAY));
+                                .toArray(String[]::new));
             case BLINK:
                 final String name =
                         CreateInputTableGrpcImpl.class.getSimpleName() + ".BLINK-" + blinkTableCount.getAndIncrement();
diff --git a/server/src/main/java/io/deephaven/server/table/ops/HeadOrTailByGrpcImpl.java b/server/src/main/java/io/deephaven/server/table/ops/HeadOrTailByGrpcImpl.java
index 3727bc460f0..31ee6ca6ab6 100644
--- a/server/src/main/java/io/deephaven/server/table/ops/HeadOrTailByGrpcImpl.java
+++ b/server/src/main/java/io/deephaven/server/table/ops/HeadOrTailByGrpcImpl.java
@@ -6,7 +6,6 @@
 import com.google.rpc.Code;
 import io.deephaven.auth.codegen.impl.TableServiceContextualAuthWiring;
 import io.deephaven.base.verify.Assert;
-import io.deephaven.datastructures.util.CollectionUtil;
 import io.deephaven.engine.table.Table;
 import io.deephaven.engine.table.impl.select.SelectColumn;
 import io.deephaven.engine.table.impl.select.SelectColumnFactory;
@@ -55,7 +54,7 @@ public Table create(final HeadOrTailByRequest request,
         Assert.eq(sourceTables.size(), "sourceTables.size()", 1);
         final Table parent = sourceTables.get(0).get();
         final String[] columnSpecs =
-                request.getGroupByColumnSpecsList().toArray(CollectionUtil.ZERO_LENGTH_STRING_ARRAY);
+                request.getGroupByColumnSpecsList().toArray(String[]::new);
         final SelectColumn[] expressions = SelectColumnFactory.getExpressions(columnSpecs);
 
         // note: we don't use the output from validateColumnExpressions because the headBy/tailBy
diff --git a/server/src/main/java/io/deephaven/server/table/ops/RunChartDownsampleGrpcImpl.java b/server/src/main/java/io/deephaven/server/table/ops/RunChartDownsampleGrpcImpl.java
index c17e367dcb2..2bea8667667 100644
--- a/server/src/main/java/io/deephaven/server/table/ops/RunChartDownsampleGrpcImpl.java
+++ b/server/src/main/java/io/deephaven/server/table/ops/RunChartDownsampleGrpcImpl.java
@@ -6,7 +6,6 @@
 import io.deephaven.auth.codegen.impl.TableServiceContextualAuthWiring;
 import io.deephaven.base.verify.Assert;
 import io.deephaven.clientsupport.plotdownsampling.RunChartDownsample;
-import io.deephaven.datastructures.util.CollectionUtil;
 import io.deephaven.engine.table.Table;
 import io.deephaven.proto.backplane.grpc.BatchTableRequest;
 import io.deephaven.proto.backplane.grpc.RunChartDownsampleRequest;
@@ -41,6 +40,6 @@ public Table create(final RunChartDownsampleRequest request,
                 request.getPixelCount(),
                 zoomRange,
                 request.getXColumnName(),
-                request.getYColumnNamesList().toArray(CollectionUtil.ZERO_LENGTH_STRING_ARRAY)));
+                request.getYColumnNamesList().toArray(String[]::new)));
     }
 }
diff --git a/server/src/main/java/io/deephaven/server/table/ops/SliceGrpcImpl.java b/server/src/main/java/io/deephaven/server/table/ops/SliceGrpcImpl.java
new file mode 100644
index 00000000000..a2a68fbf73f
--- /dev/null
+++ b/server/src/main/java/io/deephaven/server/table/ops/SliceGrpcImpl.java
@@ -0,0 +1,55 @@
+//
+// Copyright (c) 2016-2024 Deephaven Data Labs and Patent Pending
+//
+package io.deephaven.server.table.ops;
+
+import com.google.rpc.Code;
+import io.deephaven.auth.codegen.impl.TableServiceContextualAuthWiring;
+import io.deephaven.base.verify.Assert;
+import io.deephaven.engine.table.Table;
+import io.deephaven.proto.backplane.grpc.BatchTableRequest;
+import io.deephaven.proto.backplane.grpc.SliceRequest;
+import io.deephaven.proto.util.Exceptions;
+import io.deephaven.server.grpc.Common;
+import io.deephaven.server.grpc.GrpcErrorHelper;
+import io.deephaven.server.session.SessionState;
+import io.grpc.StatusRuntimeException;
+
+import javax.inject.Inject;
+import javax.inject.Singleton;
+import java.util.List;
+
+@Singleton
+public class SliceGrpcImpl extends GrpcTableOperation<SliceRequest> {
+
+    @Inject
+    public SliceGrpcImpl(final TableServiceContextualAuthWiring authWiring) {
+        super(authWiring::checkPermissionSlice, BatchTableRequest.Operation::getSlice,
+                SliceRequest::getResultId, SliceRequest::getSourceId);
+    }
+
+    @Override
+    public void validateRequest(SliceRequest request) throws StatusRuntimeException {
+        GrpcErrorHelper.checkHasField(request, SliceRequest.SOURCE_ID_FIELD_NUMBER);
+        GrpcErrorHelper.checkHasNoUnknownFields(request);
+        Common.validate(request.getSourceId());
+
+        if ((request.getFirstPositionInclusive() >= 0 && request.getLastPositionExclusive() >= 0
+                && request.getLastPositionExclusive() < request.getFirstPositionInclusive())) {
+            throw Exceptions.statusRuntimeException(Code.INVALID_ARGUMENT,
+                    "Cannot slice with a non-negative start position that is after a non-negative end position.");
+        }
+        if ((request.getFirstPositionInclusive() < 0 && request.getLastPositionExclusive() < 0
+                && request.getLastPositionExclusive() < request.getFirstPositionInclusive())) {
+            throw Exceptions.statusRuntimeException(Code.INVALID_ARGUMENT,
+                    "Cannot slice with a negative start position that is after a negative end position.");
+        }
+    }
+
+    @Override
+    public final Table create(final SliceRequest request, final List<SessionState.ExportObject<Table>> sourceTables) {
+        Assert.eq(sourceTables.size(), "sourceTables.size()", 1);
+        final Table sourceTable = sourceTables.get(0).get();
+        return sourceTable.slice(request.getFirstPositionInclusive(), request.getLastPositionExclusive());
+    }
+}
diff --git a/server/src/main/java/io/deephaven/server/table/ops/TableServiceGrpcImpl.java b/server/src/main/java/io/deephaven/server/table/ops/TableServiceGrpcImpl.java
index 59503081555..27299f57856 100644
--- a/server/src/main/java/io/deephaven/server/table/ops/TableServiceGrpcImpl.java
+++ b/server/src/main/java/io/deephaven/server/table/ops/TableServiceGrpcImpl.java
@@ -46,9 +46,7 @@
 import java.util.concurrent.atomic.AtomicReference;
 import java.util.stream.Collectors;
 
-import static io.deephaven.extensions.barrage.util.GrpcUtil.safelyComplete;
-import static io.deephaven.extensions.barrage.util.GrpcUtil.safelyError;
-import static io.deephaven.extensions.barrage.util.GrpcUtil.safelyOnNext;
+import static io.deephaven.extensions.barrage.util.GrpcUtil.*;
 
 public class TableServiceGrpcImpl extends TableServiceGrpc.TableServiceImplBase {
 
@@ -358,6 +356,13 @@ public void updateBy(
         oneShotOperationWrapper(BatchTableRequest.Operation.OpCase.UPDATE_BY, request, responseObserver);
     }
 
+    @Override
+    public void slice(
+            @NotNull final SliceRequest request,
+            @NotNull final StreamObserver<ExportedTableCreationResponse> responseObserver) {
+        oneShotOperationWrapper(BatchTableRequest.Operation.OpCase.SLICE, request, responseObserver);
+    }
+
     private Object getSeekValue(@NotNull final Literal literal, @NotNull final Class<?> dataType) {
         if (literal.hasStringValue()) {
             if (BigDecimal.class.isAssignableFrom(dataType)) {
@@ -448,10 +453,12 @@ public void seekRow(
             final SessionState.ExportObject<Table> exportedTable =
                     ticketRouter.resolve(session, sourceId, "sourceId");
 
-            session.nonExport()
+            session.<SeekRowResponse>nonExport()
                     .queryPerformanceRecorder(queryPerformanceRecorder)
                     .require(exportedTable)
                     .onError(responseObserver)
+                    .onSuccess((final SeekRowResponse response) -> safelyOnNextAndComplete(responseObserver,
+                            response))
                     .submit(() -> {
                         final Table table = exportedTable.get();
                         authWiring.checkPermissionSeekRow(session.getAuthContext(), request,
@@ -466,8 +473,7 @@ public void seekRow(
                                 request.getInsensitive(),
                                 request.getContains(),
                                 request.getIsBackward()).seek(table);
-                        SeekRowResponse.Builder rowResponse = SeekRowResponse.newBuilder();
-                        safelyComplete(responseObserver, rowResponse.setResultRow(result).build());
+                        return SeekRowResponse.newBuilder().setResultRow(result).build();
                     });
         }
     }
@@ -518,18 +524,17 @@ public void batch(
                 if (numRemaining > 0) {
                     return;
                 }
-
+                final StatusRuntimeException failure = firstFailure.get();
                 try (final SafeCloseable ignored2 = queryPerformanceRecorder.resumeQuery()) {
-                    final StatusRuntimeException failure = firstFailure.get();
-                    if (failure != null) {
-                        safelyError(responseObserver, failure);
-                    } else {
-                        safelyComplete(responseObserver);
-                    }
                     if (queryPerformanceRecorder.endQuery()) {
                         EngineMetrics.getInstance().logQueryProcessingResults(queryPerformanceRecorder, failure);
                     }
                 }
+                if (failure != null) {
+                    safelyError(responseObserver, failure);
+                } else {
+                    safelyComplete(responseObserver);
+                }
             };
 
             for (int i = 0; i < exportBuilders.size(); ++i) {
@@ -604,23 +609,21 @@ public void getExportedTableCreationResponse(
         try (final SafeCloseable ignored = queryPerformanceRecorder.startQuery()) {
             final SessionState.ExportObject<Object> export = ticketRouter.resolve(session, request, "request");
 
-            session.nonExport()
+            session.<ExportedTableCreationResponse>nonExport()
                     .queryPerformanceRecorder(queryPerformanceRecorder)
                     .require(export)
                     .onError(responseObserver)
+                    .onSuccess((final ExportedTableCreationResponse response) -> safelyOnNextAndComplete(
+                            responseObserver,
+                            response))
                     .submit(() -> {
                         final Object obj = export.get();
                         if (!(obj instanceof Table)) {
-                            responseObserver.onError(
-                                    Exceptions.statusRuntimeException(Code.FAILED_PRECONDITION,
-                                            "Ticket is not a table"));
-                            return;
+                            throw Exceptions.statusRuntimeException(Code.FAILED_PRECONDITION, "Ticket is not a table");
                         }
                         authWiring.checkPermissionGetExportedTableCreationResponse(
                                 session.getAuthContext(), request, Collections.singletonList((Table) obj));
-                        final ExportedTableCreationResponse response =
-                                ExportUtil.buildTableCreationResponse(request, (Table) obj);
-                        safelyComplete(responseObserver, response);
+                        return ExportUtil.buildTableCreationResponse(request, (Table) obj);
                     });
         }
     }
@@ -658,17 +661,15 @@ private <T> void oneShotOperationWrapper(
                     .map(ref -> resolveOneShotReference(session, ref))
                     .collect(Collectors.toList());
 
-            session.newExport(resultId, "resultId")
+            session.<Table>newExport(resultId, "resultId")
                     .require(dependencies)
-                    .onError(responseObserver)
                     .queryPerformanceRecorder(queryPerformanceRecorder)
+                    .onError(responseObserver)
+                    .onSuccess((final Table result) -> safelyOnNextAndComplete(responseObserver,
+                            ExportUtil.buildTableCreationResponse(resultId, result)))
                     .submit(() -> {
                         operation.checkPermission(request, dependencies);
-                        final Table result = operation.create(request, dependencies);
-                        final ExportedTableCreationResponse response =
-                                ExportUtil.buildTableCreationResponse(resultId, result);
-                        safelyComplete(responseObserver, response);
-                        return result;
+                        return operation.create(request, dependencies);
                     });
         }
     }
diff --git a/server/src/main/java/io/deephaven/server/table/ops/UnstructuredFilterTableGrpcImpl.java b/server/src/main/java/io/deephaven/server/table/ops/UnstructuredFilterTableGrpcImpl.java
index 2c19e3f1064..0c0a669f555 100644
--- a/server/src/main/java/io/deephaven/server/table/ops/UnstructuredFilterTableGrpcImpl.java
+++ b/server/src/main/java/io/deephaven/server/table/ops/UnstructuredFilterTableGrpcImpl.java
@@ -6,7 +6,6 @@
 import io.deephaven.api.filter.Filter;
 import io.deephaven.auth.codegen.impl.TableServiceContextualAuthWiring;
 import io.deephaven.base.verify.Assert;
-import io.deephaven.datastructures.util.CollectionUtil;
 import io.deephaven.engine.table.Table;
 import io.deephaven.engine.table.impl.select.WhereFilter;
 import io.deephaven.proto.backplane.grpc.BatchTableRequest;
@@ -33,7 +32,7 @@ public Table create(final UnstructuredFilterTableRequest request,
         Assert.eq(sourceTables.size(), "sourceTables.size()", 1);
 
         final Table parent = sourceTables.get(0).get();
-        final String[] filters = request.getFiltersList().toArray(CollectionUtil.ZERO_LENGTH_STRING_ARRAY);
+        final String[] filters = request.getFiltersList().toArray(String[]::new);
         final WhereFilter[] whereFilters = ColumnExpressionValidator.validateSelectFilters(filters, parent);
         return parent.where(Filter.and(whereFilters));
     }
diff --git a/server/src/main/java/io/deephaven/server/table/ops/UpdateOrSelectGrpcImpl.java b/server/src/main/java/io/deephaven/server/table/ops/UpdateOrSelectGrpcImpl.java
index 0388f4e6e91..e30ceb131e7 100644
--- a/server/src/main/java/io/deephaven/server/table/ops/UpdateOrSelectGrpcImpl.java
+++ b/server/src/main/java/io/deephaven/server/table/ops/UpdateOrSelectGrpcImpl.java
@@ -6,7 +6,6 @@
 import io.deephaven.api.Selectable;
 import io.deephaven.auth.codegen.impl.TableServiceContextualAuthWiring;
 import io.deephaven.base.verify.Assert;
-import io.deephaven.datastructures.util.CollectionUtil;
 import io.deephaven.engine.table.Table;
 import io.deephaven.engine.table.impl.select.SelectColumn;
 import io.deephaven.engine.table.impl.select.SelectColumnFactory;
@@ -48,7 +47,7 @@ public Table create(final SelectOrUpdateRequest request,
         Assert.eq(sourceTables.size(), "sourceTables.size()", 1);
 
         final Table parent = sourceTables.get(0).get();
-        final String[] columnSpecs = request.getColumnSpecsList().toArray(CollectionUtil.ZERO_LENGTH_STRING_ARRAY);
+        final String[] columnSpecs = request.getColumnSpecsList().toArray(String[]::new);
         final SelectColumn[] expressions = SelectColumnFactory.getExpressions(columnSpecs);
         ColumnExpressionValidator.validateColumnExpressions(expressions, columnSpecs, parent);
 
diff --git a/server/src/main/java/io/deephaven/server/table/ops/filter/FilterFactory.java b/server/src/main/java/io/deephaven/server/table/ops/filter/FilterFactory.java
index 4ad44c629ca..1f5d82724b0 100644
--- a/server/src/main/java/io/deephaven/server/table/ops/filter/FilterFactory.java
+++ b/server/src/main/java/io/deephaven/server/table/ops/filter/FilterFactory.java
@@ -25,7 +25,6 @@
 import io.deephaven.proto.backplane.grpc.NotCondition;
 import io.deephaven.proto.backplane.grpc.Reference;
 import io.deephaven.proto.backplane.grpc.Value;
-import io.deephaven.time.DateTimeUtils;
 import org.jetbrains.annotations.NotNull;
 
 import java.text.DecimalFormat;
@@ -139,7 +138,7 @@ private WhereFilter generateNumericConditionFilter(CompareCondition.CompareOpera
                 valueString = Long.toString(value.getLongValue());
                 break;
             case NANO_TIME_VALUE:
-                valueString = Long.toString(value.getNanoTimeValue());
+                valueString = String.format("'%d'", value.getNanoTimeValue());
                 break;
             case VALUE_NOT_SET:
             default:
@@ -184,8 +183,7 @@ public WhereFilter onIn(Value target, List<Value> candidatesList, CaseSensitivit
             Literal literal = d.getLiteral();
             // all other literals get created from a toString except DateTime
             if (literal.getValueCase() == Literal.ValueCase.NANO_TIME_VALUE) {
-                values[i] = "'" + DateTimeUtils.formatDateTime(
-                        DateTimeUtils.epochNanosToInstant(literal.getNanoTimeValue()), DateTimeUtils.timeZone()) + "'";
+                values[i] = String.format("'%d'", literal.getNanoTimeValue());
             } else {
                 values[i] = FilterPrinter.printNoEscape(literal);
             }
diff --git a/server/src/main/java/io/deephaven/server/table/ops/filter/FilterPrinter.java b/server/src/main/java/io/deephaven/server/table/ops/filter/FilterPrinter.java
index cd9efe07fc2..e3c3b1c37e6 100644
--- a/server/src/main/java/io/deephaven/server/table/ops/filter/FilterPrinter.java
+++ b/server/src/main/java/io/deephaven/server/table/ops/filter/FilterPrinter.java
@@ -278,7 +278,7 @@ private void onLiteral(Literal literal) {
                 sb.append(literal.getLongValue());
                 break;
             case NANO_TIME_VALUE:
-                sb.append("DateTimeUtils.epochNanosToInstant(").append(literal.getNanoTimeValue()).append(")");
+                sb.append("'").append(literal.getNanoTimeValue()).append("'");
                 break;
             case VALUE_NOT_SET:
             default:
diff --git a/server/src/main/java/io/deephaven/server/table/validation/ColumnExpressionValidator.java b/server/src/main/java/io/deephaven/server/table/validation/ColumnExpressionValidator.java
index fddccaa2370..0eb49024094 100644
--- a/server/src/main/java/io/deephaven/server/table/validation/ColumnExpressionValidator.java
+++ b/server/src/main/java/io/deephaven/server/table/validation/ColumnExpressionValidator.java
@@ -11,7 +11,6 @@
 import com.github.javaparser.ast.expr.ObjectCreationExpr;
 import com.github.javaparser.ast.visitor.VoidVisitorAdapter;
 import io.deephaven.base.verify.Assert;
-import io.deephaven.datastructures.util.CollectionUtil;
 import io.deephaven.engine.table.Table;
 import io.deephaven.engine.table.impl.QueryTable;
 import io.deephaven.engine.table.impl.lang.QueryLanguageFunctionUtils;
@@ -90,7 +89,7 @@ public static WhereFilter[] validateSelectFilters(final String[] conditionalExpr
             }
         }
         if (!dummyAssignments.isEmpty()) {
-            final String[] daArray = dummyAssignments.toArray(CollectionUtil.ZERO_LENGTH_STRING_ARRAY);
+            final String[] daArray = dummyAssignments.toArray(String[]::new);
             final SelectColumn[] selectColumns = SelectColumnFactory.getExpressions(daArray);
             validateColumnExpressions(selectColumns, daArray, table);
         }
diff --git a/server/src/main/java/io/deephaven/server/util/UnaryInputStreamMarshaller.java b/server/src/main/java/io/deephaven/server/util/UnaryInputStreamMarshaller.java
index 05e8258746d..0acc50ba180 100644
--- a/server/src/main/java/io/deephaven/server/util/UnaryInputStreamMarshaller.java
+++ b/server/src/main/java/io/deephaven/server/util/UnaryInputStreamMarshaller.java
@@ -3,7 +3,7 @@
 //
 package io.deephaven.server.util;
 
-import io.deephaven.extensions.barrage.util.BarrageProtoUtil;
+import io.deephaven.extensions.barrage.util.ExposedByteArrayOutputStream;
 import io.grpc.MethodDescriptor;
 
 import java.io.ByteArrayInputStream;
@@ -20,8 +20,7 @@ public InputStream stream(InputStream value) {
 
     @Override
     public InputStream parse(InputStream stream) {
-        try (final BarrageProtoUtil.ExposedByteArrayOutputStream baos =
-                new BarrageProtoUtil.ExposedByteArrayOutputStream()) {
+        try (final ExposedByteArrayOutputStream baos = new ExposedByteArrayOutputStream()) {
             final byte[] buffer = new byte[4096];
             while (stream.available() > 0) {
                 int len = stream.read(buffer);
diff --git a/server/src/test/java/io/deephaven/server/barrage/BarrageBlinkTableTest.java b/server/src/test/java/io/deephaven/server/barrage/BarrageBlinkTableTest.java
index dcb7445077e..703c6f6cc81 100644
--- a/server/src/test/java/io/deephaven/server/barrage/BarrageBlinkTableTest.java
+++ b/server/src/test/java/io/deephaven/server/barrage/BarrageBlinkTableTest.java
@@ -182,7 +182,7 @@ private class RemoteClient {
             final Schema flatbufSchema = SchemaHelper.flatbufSchema(schemaBytes.asReadOnlyByteBuffer());
             final BarrageUtil.ConvertedArrowSchema schema = BarrageUtil.convertArrowSchema(flatbufSchema);
             this.barrageTable = BarrageTable.make(updateSourceCombiner, ExecutionContext.getContext().getUpdateGraph(),
-                    null, schema.tableDef, schema.attributes, null);
+                    null, schema.tableDef, schema.attributes, viewport == null, null);
             this.barrageTable.addSourceToRegistrar();
 
             final BarrageSubscriptionOptions options = BarrageSubscriptionOptions.builder()
diff --git a/server/src/test/java/io/deephaven/server/barrage/BarrageMessageRoundTripTest.java b/server/src/test/java/io/deephaven/server/barrage/BarrageMessageRoundTripTest.java
index 314cd1db623..d5698c55221 100644
--- a/server/src/test/java/io/deephaven/server/barrage/BarrageMessageRoundTripTest.java
+++ b/server/src/test/java/io/deephaven/server/barrage/BarrageMessageRoundTripTest.java
@@ -29,9 +29,9 @@
 import io.deephaven.extensions.barrage.BarrageStreamGenerator;
 import io.deephaven.extensions.barrage.BarrageSubscriptionOptions;
 import io.deephaven.extensions.barrage.table.BarrageTable;
-import io.deephaven.extensions.barrage.util.BarrageProtoUtil;
 import io.deephaven.extensions.barrage.util.BarrageStreamReader;
 import io.deephaven.extensions.barrage.util.BarrageUtil;
+import io.deephaven.extensions.barrage.util.ExposedByteArrayOutputStream;
 import io.deephaven.server.arrow.ArrowModule;
 import io.deephaven.server.session.SessionService;
 import io.deephaven.server.util.Scheduler;
@@ -40,7 +40,6 @@
 import io.deephaven.time.DateTimeUtils;
 import io.deephaven.util.annotations.ReferentialIntegrity;
 import io.deephaven.util.mutable.MutableInt;
-import io.grpc.Drainable;
 import io.grpc.stub.StreamObserver;
 import junit.framework.TestCase;
 import org.apache.commons.lang3.mutable.MutableObject;
@@ -184,7 +183,7 @@ private class RemoteClient {
             }
             this.barrageTable = BarrageTable.make(updateSourceCombiner,
                     ExecutionContext.getContext().getUpdateGraph(),
-                    null, barrageMessageProducer.getTableDefinition(), attributes, null);
+                    null, barrageMessageProducer.getTableDefinition(), attributes, viewport == null, null);
             this.barrageTable.addSourceToRegistrar();
 
             final BarrageSubscriptionOptions options = BarrageSubscriptionOptions.builder()
@@ -233,8 +232,6 @@ public void validate(final String msg, QueryTable expected) {
             if (viewport != null) {
                 expected = expected
                         .getSubTable(expected.getRowSet().subSetForPositions(viewport, reverseViewport).toTracking());
-                toCheck = toCheck
-                        .getSubTable(toCheck.getRowSet().subSetForPositions(viewport, reverseViewport).toTracking());
             }
             if (subscribedColumns.cardinality() != expected.numColumns()) {
                 final List<Selectable> columns = new ArrayList<>();
@@ -247,10 +244,15 @@ public void validate(final String msg, QueryTable expected) {
 
             // Data should be identical and in-order.
             TstUtils.assertTableEquals(expected, toCheck);
-            // Since key-space needs to be kept the same, the RowSets should also be identical between producer and
-            // consumer (not the RowSets between expected and consumer; as the consumer maintains the entire RowSet).
-            Assert.equals(barrageMessageProducer.getRowSet(), "barrageMessageProducer.build()",
-                    barrageTable.getRowSet(), ".build()");
+            if (viewport == null) {
+                // Since key-space needs to be kept the same, the RowSets should also be identical between producer and
+                // consumer (not RowSets between expected and consumer; as the consumer maintains the entire RowSet).
+                Assert.equals(barrageMessageProducer.getRowSet(), "barrageMessageProducer.getRowSet()",
+                        barrageTable.getRowSet(), "barrageTable.getRowSet()");
+            } else {
+                // otherwise, the RowSet should represent a flattened view of the viewport
+                Assert.eqTrue(barrageTable.getRowSet().isFlat(), "barrageTable.getRowSet().isFlat()");
+            }
         }
 
         private void showResult(final String label, final Table table) {
@@ -488,15 +490,15 @@ private class OneProducerPerClient extends TestHelper {
         }
 
         void createNuggetsForTableMaker(final Supplier<Table> makeTable) {
-            nuggets.add(new RemoteNugget(makeTable));
             final BitSet subscribedColumns = new BitSet();
-            subscribedColumns.set(0, nuggets.get(nuggets.size() - 1).originalTable.numColumns());
+            subscribedColumns.set(0, makeTable.get().numColumns());
+
+            nuggets.add(new RemoteNugget(makeTable));
             nuggets.get(nuggets.size() - 1).newClient(null, subscribedColumns, "full");
 
             nuggets.add(new RemoteNugget(makeTable));
             nuggets.get(nuggets.size() - 1).newClient(RowSetFactory.fromRange(0, size / 10),
-                    subscribedColumns,
-                    "header");
+                    subscribedColumns, "header");
             nuggets.add(new RemoteNugget(makeTable));
             nuggets.get(nuggets.size() - 1).newClient(
                     RowSetFactory.fromRange(size / 2, size * 3L / 4),
@@ -535,17 +537,15 @@ private class SharedProducerForAllClients extends TestHelper {
         }
 
         void createNuggetsForTableMaker(final Supplier<Table> makeTable) {
-            final RemoteNugget nugget = new RemoteNugget(makeTable);
-            nuggets.add(nugget);
-
             final BitSet subscribedColumns = new BitSet();
-            subscribedColumns.set(0, nugget.originalTable.numColumns());
+            subscribedColumns.set(0, makeTable.get().numColumns());
 
+            final RemoteNugget nugget = new RemoteNugget(makeTable);
+            nuggets.add(nugget);
             nugget.newClient(null, subscribedColumns, "full");
 
             nugget.newClient(RowSetFactory.fromRange(0, size / 10), subscribedColumns, "header");
-            nugget.newClient(RowSetFactory.fromRange(size / 2, size * 3L / 4), subscribedColumns,
-                    "floating");
+            nugget.newClient(RowSetFactory.fromRange(size / 2, size * 3L / 4), subscribedColumns, "floating");
 
             nugget.newClient(RowSetFactory.fromRange(0, size / 10), subscribedColumns, true, "footer");
             nugget.newClient(RowSetFactory.fromRange(size / 2, size * 3L / 4), subscribedColumns, true,
@@ -1424,9 +1424,8 @@ public static class DummyObserver implements StreamObserver<BarrageStreamGenerat
         public void onNext(final BarrageStreamGenerator.MessageView messageView) {
             try {
                 messageView.forEachStream(inputStream -> {
-                    try (final BarrageProtoUtil.ExposedByteArrayOutputStream baos =
-                            new BarrageProtoUtil.ExposedByteArrayOutputStream()) {
-                        ((Drainable) inputStream).drainTo(baos);
+                    try (final ExposedByteArrayOutputStream baos = new ExposedByteArrayOutputStream()) {
+                        inputStream.drainTo(baos);
                         inputStream.close();
                         final BarrageMessage message =
                                 marshaller.parse(new ByteArrayInputStream(baos.peekBuffer(), 0, baos.size()));
diff --git a/server/src/test/java/io/deephaven/server/table/ops/SliceGrpcTest.java b/server/src/test/java/io/deephaven/server/table/ops/SliceGrpcTest.java
new file mode 100644
index 00000000000..49ecf9a4438
--- /dev/null
+++ b/server/src/test/java/io/deephaven/server/table/ops/SliceGrpcTest.java
@@ -0,0 +1,126 @@
+//
+// Copyright (c) 2016-2024 Deephaven Data Labs and Patent Pending
+//
+package io.deephaven.server.table.ops;
+
+import io.deephaven.engine.util.TableTools;
+import io.deephaven.proto.backplane.grpc.ExportedTableCreationResponse;
+import io.deephaven.proto.backplane.grpc.SliceRequest;
+import io.deephaven.proto.backplane.grpc.TableReference;
+import io.deephaven.proto.util.ExportTicketHelper;
+import io.grpc.Status.Code;
+import org.junit.Test;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+public class SliceGrpcTest extends GrpcTableOperationTestBase<SliceRequest> {
+
+    @Override
+    public ExportedTableCreationResponse send(SliceRequest request) {
+        return channel().tableBlocking().slice(request);
+    }
+
+    @Test
+    public void missingResultId() {
+        final SliceRequest request = SliceRequest.newBuilder()
+                .clearResultId()
+                .build();
+        assertError(request, Code.FAILED_PRECONDITION, "No result ticket supplied");
+    }
+
+    @Test
+    public void missingSourceId() {
+        final SliceRequest request = SliceRequest.newBuilder()
+                .setResultId(ExportTicketHelper.wrapExportIdInTicket(1))
+                .build();
+        assertError(request, Code.INVALID_ARGUMENT,
+                "io.deephaven.proto.backplane.grpc.SliceRequest must have field source_id (2)");
+    }
+
+    @Test
+    public void bothNonNegativeStartBeforeEnd() {
+        final TableReference emptyTable = ref(TableTools.emptyTable(5).view("Id=ii"));
+        final SliceRequest request = SliceRequest.newBuilder()
+                .setResultId(ExportTicketHelper.wrapExportIdInTicket(1))
+                .setSourceId(emptyTable)
+                .setFirstPositionInclusive(0)
+                .setLastPositionExclusive(2)
+                .build();
+        final ExportedTableCreationResponse response = send(request);
+        assertThat(response.getSuccess()).isTrue();
+        assertThat(response.getIsStatic()).isTrue();
+        assertThat(response.getSize()).isEqualTo(2);
+    }
+
+    @Test
+    public void bothNonNegativeStartAfterEnd() {
+        final TableReference emptyTable = ref(TableTools.emptyTable(5).view("Id=ii"));
+        final SliceRequest request = SliceRequest.newBuilder()
+                .setResultId(ExportTicketHelper.wrapExportIdInTicket(1))
+                .setSourceId(emptyTable)
+                .setFirstPositionInclusive(2)
+                .setLastPositionExclusive(0)
+                .build();
+        assertError(request, Code.INVALID_ARGUMENT,
+                "Cannot slice with a non-negative start position that is after a non-negative end position.");
+    }
+
+    @Test
+    public void bothNegativeStartBeforeEnd() {
+        final TableReference emptyTable = ref(TableTools.emptyTable(5).view("Id=ii"));
+        final SliceRequest request = SliceRequest.newBuilder()
+                .setResultId(ExportTicketHelper.wrapExportIdInTicket(1))
+                .setSourceId(emptyTable)
+                .setFirstPositionInclusive(-2)
+                .setLastPositionExclusive(-1)
+                .build();
+        final ExportedTableCreationResponse response = send(request);
+        assertThat(response.getSuccess()).isTrue();
+        assertThat(response.getIsStatic()).isTrue();
+        assertThat(response.getSize()).isEqualTo(1);
+    }
+
+    @Test
+    public void bothNegativeStartAfterEnd() {
+        final TableReference emptyTable = ref(TableTools.emptyTable(5).view("Id=ii"));
+        final SliceRequest request = SliceRequest.newBuilder()
+                .setResultId(ExportTicketHelper.wrapExportIdInTicket(1))
+                .setSourceId(emptyTable)
+                .setFirstPositionInclusive(-1)
+                .setLastPositionExclusive(-2)
+                .build();
+        assertError(request, Code.INVALID_ARGUMENT,
+                "Cannot slice with a negative start position that is after a negative end position.");
+    }
+
+    @Test
+    public void diffSignStartBeforeEnd() {
+        final TableReference emptyTable = ref(TableTools.emptyTable(5).view("Id=ii"));
+        final SliceRequest request = SliceRequest.newBuilder()
+                .setResultId(ExportTicketHelper.wrapExportIdInTicket(1))
+                .setSourceId(emptyTable)
+                .setFirstPositionInclusive(-2)
+                .setLastPositionExclusive(2)
+                .build();
+        final ExportedTableCreationResponse response = send(request);
+        assertThat(response.getSuccess()).isTrue();
+        assertThat(response.getIsStatic()).isTrue();
+        assertThat(response.getSize()).isEqualTo(0);
+    }
+
+    @Test
+    public void diffSignStartAfterEnd() {
+        final TableReference emptyTable = ref(TableTools.emptyTable(5).view("Id=ii"));
+        final SliceRequest request = SliceRequest.newBuilder()
+                .setResultId(ExportTicketHelper.wrapExportIdInTicket(1))
+                .setSourceId(emptyTable)
+                .setFirstPositionInclusive(2)
+                .setLastPositionExclusive(-2)
+                .build();
+        final ExportedTableCreationResponse response = send(request);
+        assertThat(response.getSuccess()).isTrue();
+        assertThat(response.getIsStatic()).isTrue();
+        assertThat(response.getSize()).isEqualTo(1);
+    }
+
+}
diff --git a/server/test-utils/build.gradle b/server/test-utils/build.gradle
index 6ff2af4b516..f3eab96e8d6 100644
--- a/server/test-utils/build.gradle
+++ b/server/test-utils/build.gradle
@@ -5,6 +5,11 @@ plugins {
 }
 
 dependencies {
+    implementation project(':util-thread')
+    compileOnlyApi(project(':util-thread')) {
+        because 'downstream dagger compile'
+    }
+
     implementation project(':Base')
     implementation project(':authentication')
     implementation project(':authorization')
@@ -13,17 +18,20 @@ dependencies {
     implementation project(':proto:proto-backplane-grpc-flight')
     implementation project(':extensions-barrage')
     implementation project(':test-configs')
-    implementation depCommonsLang3
+    implementation libs.commons.lang3
     api project(':engine-test-utils')
 
-    Classpaths.inheritGrpcPlatform(project, 'api')
-    api 'io.grpc:grpc-testing'
+    api platform(libs.grpc.bom)
+    api libs.grpc.testing
+    api libs.grpc.inprocess
 
-    Classpaths.inheritImmutables(project)
+    compileOnly project(':util-immutables')
+    annotationProcessor libs.immutables.value
 
-    Classpaths.inheritArrow(project, 'flight-core', 'implementation')
+    implementation libs.arrow.flight.core
 
-    Classpaths.inheritDagger(project)
+    implementation libs.dagger
+    annotationProcessor libs.dagger.compiler
 
-    Classpaths.inheritJUnitClassic(project, 'api')
+    api libs.junit4
 }
diff --git a/server/test-utils/src/main/java/io/deephaven/server/runner/DeephavenApiServerTestBase.java b/server/test-utils/src/main/java/io/deephaven/server/runner/DeephavenApiServerTestBase.java
index bc5af70f588..168a4330467 100644
--- a/server/test-utils/src/main/java/io/deephaven/server/runner/DeephavenApiServerTestBase.java
+++ b/server/test-utils/src/main/java/io/deephaven/server/runner/DeephavenApiServerTestBase.java
@@ -5,7 +5,9 @@
 
 import dagger.BindsInstance;
 import dagger.Component;
-import io.deephaven.client.ClientDefaultsModule;
+import dagger.Module;
+import dagger.Provides;
+import io.deephaven.client.impl.BarrageSessionFactoryConfig;
 import io.deephaven.engine.context.ExecutionContext;
 import io.deephaven.engine.liveness.LivenessScope;
 import io.deephaven.engine.liveness.LivenessScopeStack;
@@ -17,14 +19,17 @@
 import io.deephaven.proto.DeephavenChannelImpl;
 import io.deephaven.server.auth.AuthorizationProvider;
 import io.deephaven.server.auth.CommunityAuthorizationProvider;
-import io.deephaven.time.calendar.CalendarsFromConfigurationModule;
 import io.deephaven.server.config.ServerConfig;
 import io.deephaven.server.console.NoConsoleSessionModule;
 import io.deephaven.server.log.LogModule;
 import io.deephaven.server.plugin.js.JsPluginNoopConsumerModule;
 import io.deephaven.server.runner.scheduler.SchedulerDelegatingImplModule;
+import io.deephaven.server.session.ClientChannelFactoryModule;
+import io.deephaven.server.session.ClientChannelFactoryModule.UserAgent;
 import io.deephaven.server.session.ObfuscatingErrorTransformerModule;
+import io.deephaven.server.session.SslConfigModule;
 import io.deephaven.server.util.Scheduler;
+import io.deephaven.time.calendar.CalendarsFromConfigurationModule;
 import io.deephaven.util.SafeCloseable;
 import io.grpc.ManagedChannel;
 import io.grpc.ManagedChannelBuilder;
@@ -39,6 +44,7 @@
 import javax.inject.Singleton;
 import java.io.PrintStream;
 import java.time.Duration;
+import java.util.List;
 import java.util.Optional;
 
 /**
@@ -46,8 +52,20 @@
  */
 public abstract class DeephavenApiServerTestBase {
 
-    @Singleton
-    @Component(modules = {
+    @Module(includes = {
+            ClientChannelFactoryModule.class,
+            SslConfigModule.class,
+    })
+    public interface TestClientChannelFactoryModule {
+
+        @Provides
+        @UserAgent
+        static String providesUserAgent() {
+            return BarrageSessionFactoryConfig.userAgent(List.of("deephaven-server-test-utils"));
+        }
+    }
+
+    @Module(includes = {
             DeephavenApiServerModule.class,
             DeephavenApiConfigModule.class,
             LogModule.class,
@@ -55,12 +73,18 @@ public abstract class DeephavenApiServerTestBase {
             ServerBuilderInProcessModule.class,
             RpcServerStateInterceptor.Module.class,
             ExecutionContextUnitTestModule.class,
-            ClientDefaultsModule.class,
             ObfuscatingErrorTransformerModule.class,
             JsPluginNoopConsumerModule.class,
             SchedulerDelegatingImplModule.class,
-            CalendarsFromConfigurationModule.class
+            CalendarsFromConfigurationModule.class,
+            TestClientChannelFactoryModule.class
     })
+    public interface TestModule {
+
+    }
+
+    @Singleton
+    @Component(modules = TestModule.class)
     public interface TestComponent {
 
         void injectFields(DeephavenApiServerTestBase instance);
@@ -109,6 +133,10 @@ interface Builder {
     @Inject
     RpcServerStateInterceptor serverStateInterceptor;
 
+    protected DeephavenApiServerTestBase.TestComponent.Builder testComponentBuilder() {
+        return DaggerDeephavenApiServerTestBase_TestComponent.builder();
+    }
+
     @Before
     public void setUp() throws Exception {
         logBuffer = new LogBuffer(128);
@@ -125,7 +153,7 @@ public void setUp() throws Exception {
                 .port(-1)
                 .build();
 
-        DaggerDeephavenApiServerTestBase_TestComponent.builder()
+        testComponentBuilder()
                 .withServerConfig(config)
                 .withAuthorizationProvider(new CommunityAuthorizationProvider())
                 .withOut(System.out)
diff --git a/server/test-utils/src/main/java/io/deephaven/server/test/FlightMessageRoundTripTest.java b/server/test-utils/src/main/java/io/deephaven/server/test/FlightMessageRoundTripTest.java
index 95646536910..a4ad7bfd443 100644
--- a/server/test-utils/src/main/java/io/deephaven/server/test/FlightMessageRoundTripTest.java
+++ b/server/test-utils/src/main/java/io/deephaven/server/test/FlightMessageRoundTripTest.java
@@ -19,11 +19,6 @@
 import io.deephaven.barrage.flatbuf.ColumnConversionMode;
 import io.deephaven.base.clock.Clock;
 import io.deephaven.base.verify.Assert;
-import io.deephaven.chunk.ChunkType;
-import io.deephaven.chunk.LongChunk;
-import io.deephaven.chunk.ObjectChunk;
-import io.deephaven.chunk.WritableChunk;
-import io.deephaven.chunk.attributes.Values;
 import io.deephaven.client.impl.*;
 import io.deephaven.engine.context.ExecutionContext;
 import io.deephaven.engine.liveness.LivenessScopeStack;
@@ -38,7 +33,6 @@
 import io.deephaven.engine.util.TableDiff;
 import io.deephaven.engine.util.TableTools;
 import io.deephaven.extensions.barrage.BarrageSubscriptionOptions;
-import io.deephaven.extensions.barrage.util.BarrageChunkAppendingMarshaller;
 import io.deephaven.extensions.barrage.util.BarrageUtil;
 import io.deephaven.io.logger.LogBuffer;
 import io.deephaven.io.logger.LogBufferGlobal;
@@ -70,7 +64,6 @@
 import io.deephaven.vector.IntVector;
 import io.grpc.*;
 import io.grpc.CallOptions;
-import io.grpc.stub.ClientCalls;
 import org.apache.arrow.flight.*;
 import org.apache.arrow.flight.auth.ClientAuthHandler;
 import org.apache.arrow.flight.auth2.Auth2Constants;
@@ -773,9 +766,7 @@ public void testDoExchangeSnapshot() throws Exception {
             final FlatBufferBuilder metadata = new FlatBufferBuilder();
 
             // use 0 for batch size and max message size to use server-side defaults
-            int optOffset =
-                    BarrageSnapshotOptions.createBarrageSnapshotOptions(metadata, ColumnConversionMode.Stringify,
-                            false, 0, 0);
+            int optOffset = BarrageSnapshotOptions.createBarrageSnapshotOptions(metadata, false, 0, 0, 0);
 
             final int ticOffset =
                     BarrageSnapshotRequest.createTicketVector(metadata,
@@ -1065,53 +1056,6 @@ private void assertRoundTripDataEqual(Table deephavenTable, Consumer<VectorSchem
                 .diffPair(deephavenTable, uploadedTable, 0, EnumSet.noneOf(TableDiff.DiffItems.class)).getSecond());
     }
 
-
-    @Test
-    public void testBarrageMessageAppendingMarshaller() {
-        final int size = 100;
-        final Table source = TableTools.emptyTable(size).update("I = ii", "J = `str_` + i");
-        ExecutionContext.getContext().getQueryScope().putParam("test", source);
-
-        // fetch schema over flight
-        final SchemaResult schema = flightClient.getSchema(arrowFlightDescriptorForName("test"));
-        final BarrageUtil.ConvertedArrowSchema convertedSchema = BarrageUtil.convertArrowSchema(schema.getSchema());
-
-        // The wire chunk types are the chunk types that barrage will fill in.
-        final ChunkType[] wireChunkTypes = convertedSchema.computeWireChunkTypes();
-
-        // The wire types are the expected result types of each column.
-        final Class<?>[] wireTypes = convertedSchema.computeWireTypes();
-        final Class<?>[] wireComponentTypes = convertedSchema.computeWireComponentTypes();
-
-        // noinspection unchecked
-        final WritableChunk<Values>[] destChunks = Arrays.stream(wireChunkTypes)
-                .map(chunkType -> chunkType.makeWritableChunk(size)).toArray(WritableChunk[]::new);
-        // zero out the chunks as the marshaller will append to them.
-        Arrays.stream(destChunks).forEach(dest -> dest.setSize(0));
-
-        final MethodDescriptor<Flight.Ticket, Integer> methodDescriptor = BarrageChunkAppendingMarshaller
-                .getClientDoGetDescriptor(wireChunkTypes, wireTypes, wireComponentTypes, destChunks);
-
-        final Ticket ticket = new Ticket("s/test".getBytes(StandardCharsets.UTF_8));
-        final Iterator<Integer> msgIter = ClientCalls.blockingServerStreamingCall(
-                clientChannel, methodDescriptor, CallOptions.DEFAULT,
-                Flight.Ticket.newBuilder().setTicket(ByteString.copyFrom(ticket.getBytes())).build());
-
-        long totalRows = 0;
-        while (msgIter.hasNext()) {
-            totalRows += msgIter.next();
-        }
-        Assert.eq(totalRows, "totalRows", size, "size");
-        final LongChunk<Values> col_i = destChunks[0].asLongChunk();
-        final ObjectChunk<String, Values> col_j = destChunks[1].asObjectChunk();
-        Assert.eq(col_i.size(), "col_i.size()", size, "size");
-        Assert.eq(col_j.size(), "col_j.size()", size, "size");
-        for (int i = 0; i < size; ++i) {
-            Assert.eq(col_i.get(i), "col_i.get(i)", i, "i");
-            Assert.equals(col_j.get(i), "col_j.get(i)", "str_" + i, "str_" + i);
-        }
-    }
-
     @Test
     public void testColumnsAsListFeature() throws Exception {
         // bind the table in the session
diff --git a/server/test-utils/src/main/java/io/deephaven/server/test/TestAuthorizationProvider.java b/server/test-utils/src/main/java/io/deephaven/server/test/TestAuthorizationProvider.java
index c7877814673..07695a56d06 100644
--- a/server/test-utils/src/main/java/io/deephaven/server/test/TestAuthorizationProvider.java
+++ b/server/test-utils/src/main/java/io/deephaven/server/test/TestAuthorizationProvider.java
@@ -95,6 +95,14 @@ public HierarchicalTableServiceContextualAuthWiring.TestUseOnly getHierarchicalT
     @Override
     public TicketResolver.Authorization getTicketResolverAuthorization() {
         return new TicketResolver.Authorization() {
+            @Override
+            public boolean isDeniedAccess(Object source) {
+                if (delegateTicketTransformation != null) {
+                    return delegateTicketTransformation.isDeniedAccess(source);
+                }
+                return source == null;
+            }
+
             @Override
             public <T> T transform(final T source) {
                 if (delegateTicketTransformation != null) {
diff --git a/settings.gradle b/settings.gradle
index deef79359aa..e175c52b279 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -1,6 +1,6 @@
 plugins {
-    id 'com.gradle.enterprise' version '3.13.1'
-    id 'org.gradle.toolchains.foojay-resolver-convention' version '0.8.0'
+    id 'com.gradle.develocity' version '3.19'
+    id 'org.gradle.toolchains.foojay-resolver-convention' version '0.9.0'
 }
 
 gradle.ext.buildStartTime = new Date()
@@ -352,6 +352,15 @@ project(':util-function').projectDir = file('Util/function')
 include(':util-channel')
 project(':util-channel').projectDir = file('Util/channel')
 
+include(':util-processenvironment')
+project(':util-processenvironment').projectDir = file('Util/processenvironment')
+
+include(':util-thread')
+project(':util-thread').projectDir = file('Util/thread')
+
+include(':util-pool')
+project(':util-pool').projectDir = file('Util/pool')
+
 include(':deephaven-jpy-config')
 project(':deephaven-jpy-config').projectDir = file('py/jpy-config')
 
@@ -415,6 +424,16 @@ include ':clock-impl'
 
 include ':sql'
 
+include ':extensions-flight-sql'
+project(':extensions-flight-sql').projectDir = file('extensions/flight-sql')
+
+include(':codec-api')
+project(':codec-api').projectDir = file('codec/api')
+include(':codec-builtin')
+project(':codec-builtin').projectDir = file('codec/builtin')
+include(':codec-cache')
+project(':codec-cache').projectDir = file('codec/cache')
+
 file("${rootDir}/docker/registry").list().each { name ->
     if (file("${rootDir}/docker/registry/${name}/build.gradle").exists()) {
         include(":docker-${name}")
@@ -459,14 +478,14 @@ buildCache {
     }
 }
 
-def isCiServer = System.getenv('CI') == 'true'
-if (isCiServer) {
-    gradleEnterprise {
-        buildScan {
-            termsOfServiceUrl = 'https://gradle.com/terms-of-service'
-            termsOfServiceAgree = 'yes'
+develocity {
+    buildScan {
+        // buildScan will still publish when gradlew is explicitly invoked with `--scan`
+        publishing.onlyIf { false }
+        termsOfUseUrl = 'https://gradle.com/help/legal-terms-of-use'
+        termsOfUseAgree = 'yes'
+        if(System.getenv('CI') == 'true') {
             tag('CI')
         }
     }
 }
-
diff --git a/sql/build.gradle b/sql/build.gradle
index e3c5efe3573..acd6ceedc75 100644
--- a/sql/build.gradle
+++ b/sql/build.gradle
@@ -8,21 +8,15 @@ description = 'The Deephaven SQL parser'
 
 dependencies {
     api project(':qst')
-    implementation 'org.apache.calcite:calcite-core:1.36.0'
-    constraints {
-        // This constraint can be removed once calcite-core has next release and we can
-        // pick up the fixed dependency transitively.
-        implementation('com.jayway.jsonpath:json-path:2.9.0') {
-            because 'json-path Out-of-bounds Write vulnerability, CVE-2023-51074'
-        }
-    }
+    implementation libs.calcite.core
 
-    Classpaths.inheritImmutables(project)
+    compileOnly project(':util-immutables')
+    annotationProcessor libs.immutables.value
 
-    Classpaths.inheritJUnitPlatform(project)
-    Classpaths.inheritAssertJ(project)
-    testImplementation 'org.junit.jupiter:junit-jupiter'
-    testRuntimeOnly 'org.junit.platform:junit-platform-launcher'
+    testImplementation libs.assertj
+    testImplementation platform(libs.junit.bom)
+    testImplementation libs.junit.jupiter
+    testRuntimeOnly libs.junit.platform.launcher
 }
 
 test {
diff --git a/sql/src/main/java/io/deephaven/sql/RelNodeVisitorAdapter.java b/sql/src/main/java/io/deephaven/sql/RelNodeVisitorAdapter.java
index 100276c55d0..8cd01ba50c5 100644
--- a/sql/src/main/java/io/deephaven/sql/RelNodeVisitorAdapter.java
+++ b/sql/src/main/java/io/deephaven/sql/RelNodeVisitorAdapter.java
@@ -56,7 +56,7 @@ public RelNode visit(TableFunctionScan scan) {
         // SELECT * FROM time_table("00:00:01")
         //
         // Potentially related to design decisions around SQLTODO(catalog-reader-implementation)
-        throw new UnsupportedOperationException("SQLTODO(custom-sources)");
+        throw new UnsupportedSqlOperation("SQLTODO(custom-sources)", TableFunctionScan.class);
     }
 
     @Override
@@ -73,7 +73,7 @@ public RelNode visit(LogicalFilter filter) {
 
     @Override
     public RelNode visit(LogicalCalc calc) {
-        throw new UnsupportedOperationException();
+        throw new UnsupportedSqlOperation(LogicalCalc.class);
     }
 
     @Override
@@ -90,7 +90,7 @@ public RelNode visit(LogicalJoin join) {
 
     @Override
     public RelNode visit(LogicalCorrelate correlate) {
-        throw new UnsupportedOperationException();
+        throw new UnsupportedSqlOperation(LogicalCorrelate.class);
     }
 
     @Override
@@ -103,14 +103,14 @@ public RelNode visit(LogicalUnion union) {
     public RelNode visit(LogicalIntersect intersect) {
         // SQLTODO(logical-intersect)
         // table.whereIn
-        throw new UnsupportedOperationException("SQLTODO(logical-intersect)");
+        throw new UnsupportedSqlOperation("SQLTODO(logical-intersect)", LogicalIntersect.class);
     }
 
     @Override
     public RelNode visit(LogicalMinus minus) {
         // SQLTODO(logical-minus)
         // table.whereNotIn
-        throw new UnsupportedOperationException("SQLTODO(logical-minus)");
+        throw new UnsupportedSqlOperation("SQLTODO(logical-minus)", LogicalMatch.class);
     }
 
     @Override
@@ -121,7 +121,7 @@ public RelNode visit(LogicalAggregate aggregate) {
 
     @Override
     public RelNode visit(LogicalMatch match) {
-        throw new UnsupportedOperationException();
+        throw new UnsupportedSqlOperation(LogicalMatch.class);
     }
 
     @Override
@@ -132,16 +132,16 @@ public RelNode visit(LogicalSort sort) {
 
     @Override
     public RelNode visit(LogicalExchange exchange) {
-        throw new UnsupportedOperationException();
+        throw new UnsupportedSqlOperation(LogicalExchange.class);
     }
 
     @Override
     public RelNode visit(LogicalTableModify modify) {
-        throw new UnsupportedOperationException();
+        throw new UnsupportedSqlOperation(LogicalTableModify.class);
     }
 
     @Override
     public RelNode visit(RelNode other) {
-        throw new UnsupportedOperationException();
+        throw new UnsupportedSqlOperation(RelNode.class);
     }
 }
diff --git a/sql/src/main/java/io/deephaven/sql/RexVisitorBase.java b/sql/src/main/java/io/deephaven/sql/RexVisitorBase.java
index dab3dee61cb..a15f72ef833 100644
--- a/sql/src/main/java/io/deephaven/sql/RexVisitorBase.java
+++ b/sql/src/main/java/io/deephaven/sql/RexVisitorBase.java
@@ -8,6 +8,8 @@
 import org.apache.calcite.rex.RexDynamicParam;
 import org.apache.calcite.rex.RexFieldAccess;
 import org.apache.calcite.rex.RexInputRef;
+import org.apache.calcite.rex.RexLambda;
+import org.apache.calcite.rex.RexLambdaRef;
 import org.apache.calcite.rex.RexLiteral;
 import org.apache.calcite.rex.RexLocalRef;
 import org.apache.calcite.rex.RexNode;
@@ -21,65 +23,76 @@
 class RexVisitorBase<T> implements RexVisitor<T> {
     @Override
     public T visitInputRef(RexInputRef inputRef) {
-        throw unsupported(inputRef);
+        throw unsupported(inputRef, RexInputRef.class);
     }
 
     @Override
     public T visitLocalRef(RexLocalRef localRef) {
-        throw unsupported(localRef);
+        throw unsupported(localRef, RexLocalRef.class);
     }
 
     @Override
     public T visitLiteral(RexLiteral literal) {
-        throw unsupported(literal);
+        throw unsupported(literal, RexLiteral.class);
     }
 
     @Override
     public T visitCall(RexCall call) {
-        throw unsupported(call);
+        throw unsupported(call, RexCall.class);
     }
 
     @Override
     public T visitOver(RexOver over) {
-        throw unsupported(over);
+        throw unsupported(over, RexOver.class);
     }
 
     @Override
     public T visitCorrelVariable(RexCorrelVariable correlVariable) {
-        throw unsupported(correlVariable);
+        throw unsupported(correlVariable, RexCorrelVariable.class);
     }
 
     @Override
     public T visitDynamicParam(RexDynamicParam dynamicParam) {
-        throw unsupported(dynamicParam);
+        throw unsupported(dynamicParam, RexDynamicParam.class);
     }
 
     @Override
     public T visitRangeRef(RexRangeRef rangeRef) {
-        throw unsupported(rangeRef);
+        throw unsupported(rangeRef, RexRangeRef.class);
     }
 
     @Override
     public T visitFieldAccess(RexFieldAccess fieldAccess) {
-        throw unsupported(fieldAccess);
+        throw unsupported(fieldAccess, RexFieldAccess.class);
     }
 
     @Override
     public T visitSubQuery(RexSubQuery subQuery) {
-        throw unsupported(subQuery);
+        throw unsupported(subQuery, RexSubQuery.class);
     }
 
     @Override
     public T visitTableInputRef(RexTableInputRef fieldRef) {
-        throw unsupported(fieldRef);
+        throw unsupported(fieldRef, RexTableInputRef.class);
     }
 
     @Override
     public T visitPatternFieldRef(RexPatternFieldRef fieldRef) {
-        throw unsupported(fieldRef);
+        throw unsupported(fieldRef, RexPatternFieldRef.class);
     }
 
-    private UnsupportedOperationException unsupported(RexNode node) {
-        return new UnsupportedOperationException(String.format("%s: %s", getClass().getName(), node.toString()));
+    @Override
+    public T visitLambda(RexLambda fieldRef) {
+        throw unsupported(fieldRef, RexLambda.class);
+    }
+
+    @Override
+    public T visitLambdaRef(RexLambdaRef fieldRef) {
+        throw unsupported(fieldRef, RexLambdaRef.class);
+    }
+
+    private <T extends RexNode> UnsupportedSqlOperation unsupported(T node, Class<T> clazz) {
+        return new UnsupportedSqlOperation(
+                String.format("%s: %s %s", getClass().getName(), node.getClass().getName(), node.toString()), clazz);
     }
 }
diff --git a/sql/src/main/java/io/deephaven/sql/UnsupportedSqlOperation.java b/sql/src/main/java/io/deephaven/sql/UnsupportedSqlOperation.java
new file mode 100644
index 00000000000..d09bc8d974e
--- /dev/null
+++ b/sql/src/main/java/io/deephaven/sql/UnsupportedSqlOperation.java
@@ -0,0 +1,23 @@
+//
+// Copyright (c) 2016-2024 Deephaven Data Labs and Patent Pending
+//
+package io.deephaven.sql;
+
+import java.util.Objects;
+
+public class UnsupportedSqlOperation extends UnsupportedOperationException {
+    private final Class<?> clazz;
+
+    public UnsupportedSqlOperation(Class<?> clazz) {
+        this.clazz = Objects.requireNonNull(clazz);
+    }
+
+    public UnsupportedSqlOperation(String message, Class<?> clazz) {
+        super(message);
+        this.clazz = Objects.requireNonNull(clazz);
+    }
+
+    public Class<?> clazz() {
+        return clazz;
+    }
+}
diff --git a/ssl/config/build.gradle b/ssl/config/build.gradle
index 0c5cd252a30..eec8c4b54c7 100644
--- a/ssl/config/build.gradle
+++ b/ssl/config/build.gradle
@@ -6,21 +6,22 @@ plugins {
 description = 'The Deephaven SSL Configuration'
 
 dependencies {
-    Classpaths.inheritImmutables(project)
-    Classpaths.inheritJacksonPlatform(project, 'api')
-    Classpaths.inheritGrpcPlatform(project)
-    api 'com.fasterxml.jackson.core:jackson-annotations'
-    implementation 'com.fasterxml.jackson.core:jackson-databind'
-    runtimeOnly('com.fasterxml.jackson.datatype:jackson-datatype-jdk8') {
+    compileOnly project(':util-immutables')
+    annotationProcessor libs.immutables.value
+
+    implementation platform(libs.grpc.bom)
+    api platform(libs.jackson.bom)
+    api libs.jackson.annotations
+    implementation libs.jackson.databind
+    runtimeOnly(libs.jackson.datatype.jdk8) {
         because 'we need to parse optional types'
     }
 
-    Classpaths.inheritJUnitPlatform(project)
-    Classpaths.inheritAssertJ(project)
-
-    testImplementation 'org.junit.jupiter:junit-jupiter'
-    testRuntimeOnly 'org.junit.jupiter:junit-jupiter-engine'
-    testRuntimeOnly 'org.junit.platform:junit-platform-launcher'
+    testImplementation libs.assertj
+    testImplementation platform(libs.junit.bom)
+    testImplementation libs.junit.jupiter
+    testRuntimeOnly libs.junit.jupiter.engine
+    testRuntimeOnly libs.junit.platform.launcher
 }
 
 test {
diff --git a/ssl/kickstart/build.gradle b/ssl/kickstart/build.gradle
index 65a46a5e455..fd47f380235 100644
--- a/ssl/kickstart/build.gradle
+++ b/ssl/kickstart/build.gradle
@@ -8,10 +8,10 @@ description = 'The internal Deephaven ssl-kickstart integration'
 dependencies {
     api project(':ssl-config')
 
-    Classpaths.inheritSSLContext(project, 'sslcontext-kickstart', 'api')
+    api libs.sslcontext.kickstart
 
-    Classpaths.inheritGrpcPlatform(project)
-    compileOnly('io.grpc:grpc-util') {
+    implementation platform(libs.grpc.bom)
+    compileOnly(libs.grpc.util) {
         because 'we need access to CertificateUtils'
     }
 }
diff --git a/table-api/build.gradle b/table-api/build.gradle
index 4055fcf4eea..53e8e1a6cff 100644
--- a/table-api/build.gradle
+++ b/table-api/build.gradle
@@ -7,15 +7,17 @@ description = 'The Deephaven table operations API'
 
 dependencies {
   implementation project(':engine-query-constants')
-  Classpaths.inheritCommonsText(project, 'implementation')
-  Classpaths.inheritImmutables(project)
+  implementation libs.commons.text
 
-  compileOnly 'com.google.code.findbugs:jsr305:3.0.2'
+  compileOnly project(':util-immutables')
+  annotationProcessor libs.immutables.value
 
-  Classpaths.inheritJUnitPlatform(project)
-  Classpaths.inheritAssertJ(project)
-  testImplementation 'org.junit.jupiter:junit-jupiter'
-  testRuntimeOnly 'org.junit.platform:junit-platform-launcher'
+  compileOnly libs.google.findbugs.jsr305
+
+  testImplementation libs.assertj
+  testImplementation platform(libs.junit.bom)
+  testImplementation libs.junit.jupiter
+  testRuntimeOnly libs.junit.platform.launcher
 }
 
 test {
diff --git a/table-api/src/main/java/io/deephaven/api/TableOperations.java b/table-api/src/main/java/io/deephaven/api/TableOperations.java
index 2f681da7ce9..0c1d3ec2b3f 100644
--- a/table-api/src/main/java/io/deephaven/api/TableOperations.java
+++ b/table-api/src/main/java/io/deephaven/api/TableOperations.java
@@ -160,6 +160,35 @@ public interface TableOperations<TOPS extends TableOperations<TOPS, TABLE>, TABL
      */
     TOPS whereNotIn(TABLE rightTable, Collection<? extends JoinMatch> columnsToMatch);
 
+    /**
+     * Extracts a subset of a table by row position.
+     * <p>
+     * If both firstPosition and lastPosition are positive, then the rows are counted from the beginning of the table.
+     * The firstPosition is inclusive, and the lastPosition is exclusive. The {@link #head}(N) call is equivalent to
+     * slice(0, N). The firstPosition must be less than or equal to the lastPosition.
+     * <p>
+     * If firstPosition is positive and lastPosition is negative, then the firstRow is counted from the beginning of the
+     * table, inclusively. The lastPosition is counted from the end of the table. For example, slice(1, -1) includes all
+     * rows but the first and last. If the lastPosition would be before the firstRow, the result is an emptyTable.
+     * <p>
+     * If firstPosition is negative, and lastPosition is zero, then the firstRow is counted from the end of the table,
+     * and the end of the slice is the size of the table. slice(-N, 0) is equivalent to {@link #tail}(N).
+     * <p>
+     * If the firstPosition is negative and the lastPosition is negative, they are both counted from the end of the
+     * table. For example, slice(-2, -1) returns the second to last row of the table.
+     * <p>
+     * If firstPosition is negative and lastPosition is positive, then firstPosition is counted from the end of the
+     * table, inclusively. The lastPosition is counted from the beginning of the table, exclusively. For example,
+     * slice(-3, 5) returns all rows starting from the third-last row to the fifth row of the table. If there are no
+     * rows between these positions, the function will return an empty table.
+     *
+     * @param firstPositionInclusive the first position to include in the result
+     * @param lastPositionExclusive the last position to include in the result
+     * @return a new Table, which is the request subset of rows from the original table
+     */
+    @ConcurrentMethod
+    TOPS slice(long firstPositionInclusive, long lastPositionExclusive);
+
     // -------------------------------------------------------------------------------------------
 
     @ConcurrentMethod
diff --git a/table-api/src/main/java/io/deephaven/api/TableOperationsAdapter.java b/table-api/src/main/java/io/deephaven/api/TableOperationsAdapter.java
index 3364ddb9034..216c32e9562 100644
--- a/table-api/src/main/java/io/deephaven/api/TableOperationsAdapter.java
+++ b/table-api/src/main/java/io/deephaven/api/TableOperationsAdapter.java
@@ -41,6 +41,11 @@ public final TOPS_1 tail(long size) {
         return adapt(delegate.tail(size));
     }
 
+    @Override
+    public final TOPS_1 slice(long firstPositionInclusive, long lastPositionExclusive) {
+        return adapt(delegate.slice(firstPositionInclusive, lastPositionExclusive));
+    }
+
     @Override
     public final TOPS_1 reverse() {
         return adapt(delegate.reverse());
diff --git a/table-api/src/main/java/io/deephaven/api/agg/Aggregation.java b/table-api/src/main/java/io/deephaven/api/agg/Aggregation.java
index 3e5467c5c4c..b27f487aecf 100644
--- a/table-api/src/main/java/io/deephaven/api/agg/Aggregation.java
+++ b/table-api/src/main/java/io/deephaven/api/agg/Aggregation.java
@@ -17,6 +17,7 @@
 import io.deephaven.api.agg.spec.AggSpecWAvg;
 import io.deephaven.api.agg.spec.AggSpecWSum;
 import io.deephaven.api.agg.util.PercentileOutput;
+import io.deephaven.api.filter.Filter;
 import io.deephaven.api.object.UnionObject;
 
 import java.util.Arrays;
@@ -224,6 +225,28 @@ static Count AggCount(String resultColumn) {
         return Count.of(resultColumn);
     }
 
+    /**
+     * Create a {@link io.deephaven.api.agg.CountWhere count} aggregation with the supplied output column name, counting
+     * values that pass the supplied {@code filters}.
+     *
+     * @param resultColumn The {@link Count#column() output column} name
+     * @return The aggregation
+     */
+    static CountWhere AggCountWhere(String resultColumn, String... filters) {
+        return CountWhere.of(resultColumn, filters);
+    }
+
+    /**
+     * Create a {@link io.deephaven.api.agg.CountWhere count} aggregation with the supplied output column name, counting
+     * values that pass the supplied {@code filter}.
+     *
+     * @param resultColumn The {@link Count#column() output column} name
+     * @return The aggregation
+     */
+    static CountWhere AggCountWhere(String resultColumn, Filter filter) {
+        return CountWhere.of(resultColumn, filter);
+    }
+
     /**
      * Create a {@link io.deephaven.api.agg.spec.AggSpecCountDistinct count distinct} aggregation for the supplied
      * column name pairs. This will not count {@code null} values from the input column(s).
@@ -291,6 +314,40 @@ static FirstRowKey AggFirstRowKey(String resultColumn) {
         return FirstRowKey.of(resultColumn);
     }
 
+    /**
+     * <p>
+     * Create a {@link Formula formula} aggregation with the supplied {@code formula}. This variant requires the formula
+     * to provide the output column name and specific input column names in the following format:
+     * </p>
+     * {@code
+     * AggFormula("output_col=(input_col1 + input_col2) * input_col3")
+     * }
+     *
+     * @param formulaString The formula to use to produce the output column
+     * @return The aggregation
+     */
+    static Formula AggFormula(String formulaString) {
+        return Formula.parse(formulaString);
+    }
+
+    /**
+     * <p>
+     * Create a {@link Formula formula} aggregation with the supplied {@code columnName} and {@code expression}. This
+     * variant requires the formula to provide the output column name and the expression to evaluate in the following
+     * format:
+     * </p>
+     * {@code
+     * AggFormula("output_col", "(input_col1 + input_col2) * input_col3")
+     * }
+     *
+     * @param columnName The output column name
+     * @param expression The expression to use to produce the output column
+     * @return The aggregation
+     */
+    static Formula AggFormula(String columnName, String expression) {
+        return Formula.of(columnName, expression);
+    }
+
     /**
      * Create a {@link io.deephaven.api.agg.spec.AggSpecFormula formula} aggregation with the supplied {@code formula},
      * {@code paramToken}, and column name pairs.
@@ -302,6 +359,7 @@ static FirstRowKey AggFirstRowKey(String resultColumn) {
      * @param pairs The input/output column name pairs
      * @return The aggregation
      */
+    @Deprecated
     static Aggregation AggFormula(String formula, String paramToken, String... pairs) {
         return of(AggSpec.formula(formula, paramToken), pairs);
     }
@@ -524,7 +582,7 @@ static Aggregation AggSortedLast(Collection<? extends String> sortColumns, Strin
     /**
      * Create a {@link io.deephaven.api.agg.spec.AggSpecStd sample standard deviation} aggregation for the supplied
      * column name pairs.
-     *
+     * <p>
      * Sample standard deviation is computed using Bessel's correction
      * (https://en.wikipedia.org/wiki/Bessel%27s_correction), which ensures that the sample variance will be an unbiased
      * estimator of population variance.
@@ -614,7 +672,7 @@ static Aggregation AggUnique(boolean includeNulls, UnionObject nonUniqueSentinel
     /**
      * Create a {@link io.deephaven.api.agg.spec.AggSpecVar sample variance} aggregation for the supplied column name
      * pairs.
-     *
+     * <p>
      * Sample variance is computed using Bessel's correction (https://en.wikipedia.org/wiki/Bessel%27s_correction),
      * which ensures that the sample variance will be an unbiased estimator of population variance.
      *
@@ -675,9 +733,11 @@ static void visitAll(Visitor visitor) {
         visitor.visit((ColumnAggregation) null);
         visitor.visit((ColumnAggregations) null);
         visitor.visit((Count) null);
+        visitor.visit((CountWhere) null);
         visitor.visit((FirstRowKey) null);
         visitor.visit((LastRowKey) null);
         visitor.visit((Partition) null);
+        visitor.visit((Formula) null);
     }
 
     /**
@@ -722,6 +782,13 @@ interface Visitor {
          */
         void visit(Count count);
 
+        /**
+         * Visit a {@link CountWhere count aggregation}.
+         *
+         * @param countWhere The count aggregation
+         */
+        void visit(CountWhere countWhere);
+
         /**
          * Visit a {@link FirstRowKey first row key aggregation}.
          *
@@ -742,5 +809,12 @@ interface Visitor {
          * @param partition The partition aggregation
          */
         void visit(Partition partition);
+
+        /**
+         * Visit a {@link Formula formula aggregation}.
+         *
+         * @param formula The formula aggregation
+         */
+        void visit(Formula formula);
     }
 }
diff --git a/table-api/src/main/java/io/deephaven/api/agg/AggregationDescriptions.java b/table-api/src/main/java/io/deephaven/api/agg/AggregationDescriptions.java
index dd7b991a809..3a14a51c220 100644
--- a/table-api/src/main/java/io/deephaven/api/agg/AggregationDescriptions.java
+++ b/table-api/src/main/java/io/deephaven/api/agg/AggregationDescriptions.java
@@ -4,6 +4,7 @@
 package io.deephaven.api.agg;
 
 import io.deephaven.api.Pair;
+import io.deephaven.api.Strings;
 
 import java.util.Collection;
 import java.util.LinkedHashMap;
@@ -64,6 +65,11 @@ public void visit(Count count) {
         out.put(count.column().name(), "count");
     }
 
+    @Override
+    public void visit(CountWhere countWhere) {
+        out.put(countWhere.column().name(), "countWhere " + Strings.of(countWhere.filter()));
+    }
+
     @Override
     public void visit(FirstRowKey firstRowKey) {
         out.put(firstRowKey.column().name(), "first row key");
@@ -79,4 +85,9 @@ public void visit(Partition partition) {
         out.put(partition.column().name(), "partition sub-table"
                 + (partition.includeGroupByColumns() ? " (including group-by columns)" : ""));
     }
+
+    @Override
+    public void visit(Formula formula) {
+        out.put(formula.column().name(), "from formula `" + Strings.of(formula.expression()) + "`");
+    }
 }
diff --git a/table-api/src/main/java/io/deephaven/api/agg/AggregationOptimizer.java b/table-api/src/main/java/io/deephaven/api/agg/AggregationOptimizer.java
index 949bcb1724c..2c854541777 100644
--- a/table-api/src/main/java/io/deephaven/api/agg/AggregationOptimizer.java
+++ b/table-api/src/main/java/io/deephaven/api/agg/AggregationOptimizer.java
@@ -96,6 +96,12 @@ public void visit(Count count) {
         visitOrder.computeIfAbsent(COUNT_OBJ, k -> new ArrayList<>()).add(count.column());
     }
 
+    @Override
+    public void visit(CountWhere countWhere) {
+        // Supplying a `null` entry value indicates that the key is already an aggregation.
+        visitOrder.putIfAbsent(countWhere, null);
+    }
+
     @Override
     public void visit(FirstRowKey firstRowKey) {
         visitOrder.computeIfAbsent(FIRST_ROW_KEY_OBJ, k -> new ArrayList<>()).add(firstRowKey.column());
@@ -111,4 +117,10 @@ public void visit(Partition partition) {
         visitOrder.computeIfAbsent(partition.includeGroupByColumns() ? PARTITION_KEEPING_OBJ : PARTITION_DROPPING_OBJ,
                 k -> new ArrayList<>()).add(partition.column());
     }
+
+    @Override
+    public void visit(Formula formula) {
+        // Supplying a `null` entry value indicates that the key is already an aggregation.
+        visitOrder.putIfAbsent(formula, null);
+    }
 }
diff --git a/table-api/src/main/java/io/deephaven/api/agg/AggregationOutputs.java b/table-api/src/main/java/io/deephaven/api/agg/AggregationOutputs.java
index 2cd5d8990af..1715470fae9 100644
--- a/table-api/src/main/java/io/deephaven/api/agg/AggregationOutputs.java
+++ b/table-api/src/main/java/io/deephaven/api/agg/AggregationOutputs.java
@@ -49,6 +49,11 @@ public void visit(Count count) {
         out = Stream.of(count.column());
     }
 
+    @Override
+    public void visit(CountWhere countWhere) {
+        out = Stream.of(countWhere.column());
+    }
+
     @Override
     public void visit(FirstRowKey firstRowKey) {
         out = Stream.of(firstRowKey.column());
@@ -63,4 +68,10 @@ public void visit(LastRowKey lastRowKey) {
     public void visit(Partition partition) {
         out = Stream.of(partition.column());
     }
+
+
+    @Override
+    public void visit(Formula formula) {
+        out = Stream.of(formula.column());
+    }
 }
diff --git a/table-api/src/main/java/io/deephaven/api/agg/AggregationPairs.java b/table-api/src/main/java/io/deephaven/api/agg/AggregationPairs.java
index c3c67c716a4..269517037a4 100644
--- a/table-api/src/main/java/io/deephaven/api/agg/AggregationPairs.java
+++ b/table-api/src/main/java/io/deephaven/api/agg/AggregationPairs.java
@@ -49,6 +49,11 @@ public void visit(Count count) {
         out = Stream.empty();
     }
 
+    @Override
+    public void visit(CountWhere countWhere) {
+        out = Stream.empty();
+    }
+
     @Override
     public void visit(FirstRowKey firstRowKey) {
         out = Stream.empty();
@@ -63,4 +68,10 @@ public void visit(LastRowKey lastRowKey) {
     public void visit(Partition partition) {
         out = Stream.empty();
     }
+
+    @Override
+    public void visit(Formula formula) {
+        out = Stream.empty();
+    }
+
 }
diff --git a/table-api/src/main/java/io/deephaven/api/agg/CountWhere.java b/table-api/src/main/java/io/deephaven/api/agg/CountWhere.java
new file mode 100644
index 00000000000..9fe0f6b396e
--- /dev/null
+++ b/table-api/src/main/java/io/deephaven/api/agg/CountWhere.java
@@ -0,0 +1,45 @@
+//
+// Copyright (c) 2016-2024 Deephaven Data Labs and Patent Pending
+//
+package io.deephaven.api.agg;
+
+import io.deephaven.annotations.SimpleStyle;
+import io.deephaven.api.ColumnName;
+import io.deephaven.api.filter.Filter;
+import org.immutables.value.Value.Immutable;
+import org.immutables.value.Value.Parameter;
+
+/**
+ * An {@link Aggregation aggregation} that provides a single output column with the number of rows in each aggregation
+ * group.
+ *
+ * @see io.deephaven.api.TableOperations#countBy
+ */
+@Immutable
+@SimpleStyle
+public abstract class CountWhere implements Aggregation {
+
+    public static CountWhere of(String name, String... filters) {
+        return of(ColumnName.of(name), Filter.and(Filter.from(filters)));
+    }
+
+    public static CountWhere of(String name, Filter filter) {
+        return of(ColumnName.of(name), filter);
+    }
+
+    public static CountWhere of(ColumnName name, Filter filter) {
+        return ImmutableCountWhere.of(name, filter);
+    }
+
+    @Parameter
+    public abstract ColumnName column();
+
+    @Parameter
+    public abstract Filter filter();
+
+    @Override
+    public final <V extends Visitor> V walk(V visitor) {
+        visitor.visit(this);
+        return visitor;
+    }
+}
diff --git a/table-api/src/main/java/io/deephaven/api/agg/Formula.java b/table-api/src/main/java/io/deephaven/api/agg/Formula.java
new file mode 100644
index 00000000000..3b3bdf49385
--- /dev/null
+++ b/table-api/src/main/java/io/deephaven/api/agg/Formula.java
@@ -0,0 +1,62 @@
+//
+// Copyright (c) 2016-2024 Deephaven Data Labs and Patent Pending
+//
+package io.deephaven.api.agg;
+
+import io.deephaven.annotations.SimpleStyle;
+import io.deephaven.api.ColumnName;
+import io.deephaven.api.RawString;
+import io.deephaven.api.Selectable;
+import io.deephaven.api.Strings;
+import io.deephaven.api.expression.Expression;
+import org.immutables.value.Value.Immutable;
+import org.immutables.value.Value.Parameter;
+
+/**
+ * An {@link Aggregation aggregation} that provides a single output column that is computed by applying a formula to a
+ * set of input columns.
+ */
+@Immutable
+@SimpleStyle
+public abstract class Formula implements Aggregation {
+
+    public static Formula parse(String formulaString) {
+        return ImmutableFormula.of(Selectable.parse(formulaString));
+    }
+
+    public static Formula of(String name, String formula) {
+        return of(ColumnName.of(name), formula);
+    }
+
+    public static Formula of(ColumnName name, String formula) {
+        return of(Selectable.of(name, RawString.of(formula)));
+    }
+
+    public static Formula of(Selectable selectable) {
+        return ImmutableFormula.of(selectable);
+    }
+
+    @Parameter
+    public abstract Selectable selectable();
+
+    public ColumnName column() {
+        return selectable().newColumn();
+    }
+
+    public Expression expression() {
+        return selectable().expression();
+    }
+
+    /**
+     * Return this {@link Formula} as a string of the form {@code <newColumn>=<expression>}
+     */
+    public String formulaString() {
+        return Strings.of(selectable());
+    }
+
+    @Override
+    public final <V extends Visitor> V walk(V visitor) {
+        visitor.visit(this);
+        return visitor;
+    }
+}
diff --git a/table-api/src/main/java/io/deephaven/api/agg/spec/AggSpec.java b/table-api/src/main/java/io/deephaven/api/agg/spec/AggSpec.java
index 2a434927ee3..bb3609838a5 100644
--- a/table-api/src/main/java/io/deephaven/api/agg/spec/AggSpec.java
+++ b/table-api/src/main/java/io/deephaven/api/agg/spec/AggSpec.java
@@ -79,16 +79,10 @@ static AggSpecFirst first() {
         return AggSpecFirst.of();
     }
 
-    /**
-     * @return {@link AggSpecFormula#of(String)} for {@code formula}
-     */
-    static AggSpecFormula formula(String formula) {
-        return AggSpecFormula.of(formula);
-    }
-
     /**
      * @return {@link AggSpecFormula#of(String, String)} for {@code formula} and {@code paramToken}
      */
+    @Deprecated
     static AggSpecFormula formula(String formula, String paramToken) {
         return AggSpecFormula.of(formula, paramToken);
     }
diff --git a/table-api/src/main/java/io/deephaven/api/agg/spec/AggSpecFormula.java b/table-api/src/main/java/io/deephaven/api/agg/spec/AggSpecFormula.java
index de6662e6469..469e6b8f191 100644
--- a/table-api/src/main/java/io/deephaven/api/agg/spec/AggSpecFormula.java
+++ b/table-api/src/main/java/io/deephaven/api/agg/spec/AggSpecFormula.java
@@ -15,6 +15,7 @@
  */
 @Immutable
 @SimpleStyle
+@Deprecated
 public abstract class AggSpecFormula extends AggSpecBase {
 
     public static final String PARAM_TOKEN_DEFAULT = "each";
diff --git a/table-api/src/main/java/io/deephaven/api/snapshot/SnapshotWhenOptions.java b/table-api/src/main/java/io/deephaven/api/snapshot/SnapshotWhenOptions.java
index 7dcd27d7b5a..8a9f83c1228 100644
--- a/table-api/src/main/java/io/deephaven/api/snapshot/SnapshotWhenOptions.java
+++ b/table-api/src/main/java/io/deephaven/api/snapshot/SnapshotWhenOptions.java
@@ -39,7 +39,8 @@ public enum Flag {
         INCREMENTAL,
         /**
          * Whether the resulting table should keep history. A history table appends a full snapshot of {@code base} and
-         * the "stamp key" as opposed to updating existing rows.
+         * the "stamp key" as opposed to updating existing rows. When this flag is used, the trigger table must be
+         * append-only.
          *
          * <p>
          * Note: this flag is currently incompatible with {@link #INITIAL} and {@link #INCREMENTAL}.
diff --git a/table-api/src/main/java/io/deephaven/api/updateby/UpdateByOperation.java b/table-api/src/main/java/io/deephaven/api/updateby/UpdateByOperation.java
index 8977fe9608d..baab6690ce0 100644
--- a/table-api/src/main/java/io/deephaven/api/updateby/UpdateByOperation.java
+++ b/table-api/src/main/java/io/deephaven/api/updateby/UpdateByOperation.java
@@ -1661,9 +1661,9 @@ static UpdateByOperation RollingStd(long revTicks, String... pairs) {
      * following the current row (inclusive)</li>
      * </ul>
      *
-     * Sample standard deviation is computed using Bessel's correction
-     * (https://en.wikipedia.org/wiki/Bessel%27s_correction), which ensures that the sample variance will be an unbiased
-     * estimator of population variance.
+     * Sample standard deviation is computed using
+     * <a href="https://en.wikipedia.org/wiki/Bessel%27s_correction">Bessel's correction</a>, which ensures that the
+     * sample variance will be an unbiased estimator of population variance.
      *
      * @param revTicks the look-behind window size (in rows/ticks)
      * @param fwdTicks the look-ahead window size (in rows/ticks)
@@ -1686,9 +1686,9 @@ static UpdateByOperation RollingStd(long revTicks, long fwdTicks, String... pair
      * <li>{@code revDuration = 10m} - contains rows from 10m earlier through the current row timestamp (inclusive)</li>
      * </ul>
      *
-     * Sample standard deviation is computed using Bessel's correction
-     * (https://en.wikipedia.org/wiki/Bessel%27s_correction), which ensures that the sample variance will be an unbiased
-     * estimator of population variance.
+     * Sample standard deviation is computed using
+     * <a href="https://en.wikipedia.org/wiki/Bessel%27s_correction">Bessel's correction</a>, which ensures that the
+     * sample variance will be an unbiased estimator of population variance.
      *
      * @param timestampCol the name of the timestamp column
      * @param revDuration the look-behind window size (in Duration)
@@ -1910,9 +1910,8 @@ static UpdateByOperation RollingWAvg(String timestampCol, long revTime, long fwd
     }
 
 
-
     /**
-     * Create a {@link RollingFormulaSpec rolling forumla} for the supplied column name pairs, using ticks as the
+     * Create a {@link RollingFormulaSpec rolling formula} for the supplied column name pairs, using ticks as the
      * windowing unit. Ticks are row counts and you may specify the previous window in number of rows to include. The
      * current row is considered to belong to the reverse window, so calling this with {@code revTicks = 1} will simply
      * return the current row. Specifying {@code revTicks = 10} will include the previous 9 rows to this one and this
@@ -1936,7 +1935,7 @@ static UpdateByOperation RollingFormula(long revTicks, String formula, String pa
     }
 
     /**
-     * Create a {@link RollingFormulaSpec rolling forumla} for the supplied column name pairs, using ticks as the
+     * Create a {@link RollingFormulaSpec rolling formula} for the supplied column name pairs, using ticks as the
      * windowing unit. Ticks are row counts and you may specify the reverse and forward window in number of rows to
      * include. The current row is considered to belong to the reverse window but not the forward window. Also, negative
      * values are allowed and can be used to generate completely forward or completely reverse windows.
@@ -1976,7 +1975,7 @@ static UpdateByOperation RollingFormula(long revTicks, long fwdTicks, String for
     }
 
     /**
-     * Create a {@link RollingFormulaSpec rolling forumla} for the supplied column name pairs, using time as the
+     * Create a {@link RollingFormulaSpec rolling formula} for the supplied column name pairs, using time as the
      * windowing unit. This function accepts {@link Duration duration} as the reverse window parameter. A row containing
      * a {@code null} in the timestamp column belongs to no window and will not have a value computed or be considered
      * in the windows of other rows.
@@ -2007,7 +2006,7 @@ static UpdateByOperation RollingFormula(String timestampCol, Duration revDuratio
     }
 
     /**
-     * Create a {@link RollingFormulaSpec rolling forumla} for the supplied column name pairs, using time as the
+     * Create a {@link RollingFormulaSpec rolling formula} for the supplied column name pairs, using time as the
      * windowing unit. This function accepts {@link Duration durations} as the reverse and forward window parameters.
      * Negative values are allowed and can be used to generate completely forward or completely reverse windows. A row
      * containing a {@code null} in the timestamp column belongs to no window and will not have a value computed or be
@@ -2049,7 +2048,7 @@ static UpdateByOperation RollingFormula(String timestampCol, Duration revDuratio
     }
 
     /**
-     * Create a {@link RollingFormulaSpec rolling forumla} for the supplied column name pairs, using time as the
+     * Create a {@link RollingFormulaSpec rolling formula} for the supplied column name pairs, using time as the
      * windowing unit. This function accepts {@code nanoseconds} as the reverse window parameters. A row containing a
      * {@code null} in the timestamp column belongs to no window and will not have a value computed or be considered in
      * the windows of other rows.
@@ -2074,7 +2073,7 @@ static UpdateByOperation RollingFormula(String timestampCol, long revTime, Strin
     }
 
     /**
-     * Create a {@link RollingFormulaSpec rolling forumla} for the supplied column name pairs, using time as the
+     * Create a {@link RollingFormulaSpec rolling formula} for the supplied column name pairs, using time as the
      * windowing unit. This function accepts {@code nanoseconds} as the reverse and forward window parameters. Negative
      * values are allowed and can be used to generate completely forward or completely reverse windows. A row containing
      * a {@code null} in the timestamp column belongs to no window and will not have a value computed or be considered
@@ -2101,6 +2100,224 @@ static UpdateByOperation RollingFormula(String timestampCol, long revTime, long
         return RollingFormulaSpec.ofTime(timestampCol, revTime, fwdTime, formula, paramToken).clause(pairs);
     }
 
+    // New methods for the multi-column formula
+
+    /**
+     * Create a {@link RollingFormulaSpec rolling formula} using ticks as the windowing unit. Ticks are row counts and
+     * you may specify the previous window in number of rows to include. The current row is considered to belong to the
+     * reverse window, so calling this with {@code revTicks = 1} will simply return the current row. Specifying
+     * {@code revTicks = 10} will include the previous 9 rows to this one and this row for a total of 10 rows.
+     * <p>
+     * The provided {@code formula} should specify the output column name. Some examples of formula are:
+     *
+     * <pre>
+     * sum_AB = sum(col_A) + sum(col_B)
+     * max_AB = max(col_A) + max(col_B)
+     * values = col_A + col_B
+     * </pre>
+     *
+     * @param revTicks the look-behind window size (in rows/ticks)
+     * @param formula the user-defined formula to apply to each group. This formula includes the output column name and
+     *        can contain any combination of the following:
+     *        <ul>
+     *        <li>Built-in functions such as min, max, etc.</li>
+     *        <li>Mathematical arithmetic such as *, +, /, etc.</li>
+     *        <li>User-defined functions</li>
+     *        </ul>
+     *
+     * @return The aggregation
+     */
+    static UpdateByOperation RollingFormula(long revTicks, String formula) {
+        return RollingFormulaSpec.ofTicks(revTicks, formula).clause();
+    }
+
+    /**
+     * Create a {@link RollingFormulaSpec rolling formula} using ticks as the windowing unit. Ticks are row counts and
+     * you may specify the reverse and forward window in number of rows to include. The current row is considered to
+     * belong to the reverse window but not the forward window. Also, negative values are allowed and can be used to
+     * generate completely forward or completely reverse windows.
+     * <p>
+     * Here are some examples of window values:
+     * <ul>
+     * <li>{@code revTicks = 1, fwdTicks = 0} - contains only the current row</li>
+     * <li>{@code revTicks = 10, fwdTicks = 0} - contains 9 previous rows and the current row</li>
+     * <li>{@code revTicks = 0, fwdTicks = 10} - contains the following 10 rows, excludes the current row</li>
+     * <li>{@code revTicks = 10, fwdTicks = 10} - contains the previous 9 rows, the current row and the 10 rows
+     * following</li>
+     * <li>{@code revTicks = 10, fwdTicks = -5} - contains 5 rows, beginning at 9 rows before, ending at 5 rows before
+     * the current row (inclusive)</li>
+     * <li>{@code revTicks = 11, fwdTicks = -1} - contains 10 rows, beginning at 10 rows before, ending at 1 row before
+     * the current row (inclusive)</li>
+     * <li>{@code revTicks = -5, fwdTicks = 10} - contains 5 rows, beginning 5 rows following, ending at 10 rows
+     * following the current row (inclusive)</li>
+     * </ul>
+     *
+     * <p>
+     * The provided {@code formula} should specify the output column name. Some examples of formula are:
+     *
+     * <pre>
+     * sum_AB = sum(col_A) + sum(col_B)
+     * max_AB = max(col_A) + max(col_B)
+     * values = col_A + col_B
+     * </pre>
+     *
+     * @param revTicks the look-behind window size (in rows/ticks)
+     * @param fwdTicks the look-ahead window size (in rows/ticks)
+     * @param formula the user-defined formula to apply to each group. This formula can contain any combination of the
+     *        following:
+     *        <ul>
+     *        <li>Built-in functions such as min, max, etc.</li>
+     *        <li>Mathematical arithmetic such as *, +, /, etc.</li>
+     *        <li>User-defined functions</li>
+     *        </ul>
+     * @return The aggregation
+     */
+    static UpdateByOperation RollingFormula(long revTicks, long fwdTicks, String formula) {
+        return RollingFormulaSpec.ofTicks(revTicks, fwdTicks, formula).clause();
+    }
+
+    /**
+     * Create a {@link RollingFormulaSpec rolling formula} using time as the windowing unit. This function accepts
+     * {@link Duration duration} as the reverse window parameter. A row containing a {@code null} in the timestamp
+     * column belongs to no window and will not have a value computed or be considered in the windows of other rows.
+     * <p>
+     * Here are some examples of window values:
+     * <ul>
+     * <li>{@code revDuration = 0m} - contains rows that exactly match the current row timestamp</li>
+     * <li>{@code revDuration = 10m} - contains rows from 10m earlier through the current row timestamp (inclusive)</li>
+     * </ul>
+     *
+     * <p>
+     * The provided {@code formula} should specify the output column name. Some examples of formula are:
+     *
+     * <pre>
+     * sum_AB = sum(col_A) + sum(col_B)
+     * max_AB = max(col_A) + max(col_B)
+     * values = col_A + col_B
+     * </pre>
+     *
+     * @param timestampCol the name of the timestamp column
+     * @param revDuration the look-behind window size (in Duration)
+     * @param formula the user-defined {@link RollingFormulaSpec#formula() formula} to apply to each group. This formula
+     *        can contain any combination of the following:
+     *        <ul>
+     *        <li>Built-in functions such as min, max, etc.</li>
+     *        <li>Mathematical arithmetic such as *, +, /, etc.</li>
+     *        <li>User-defined functions</li>
+     *        </ul>
+     * @return The aggregation
+     */
+    static UpdateByOperation RollingFormula(String timestampCol, Duration revDuration, String formula) {
+        return RollingFormulaSpec.ofTime(timestampCol, revDuration, formula).clause();
+    }
+
+    /**
+     * Create a {@link RollingFormulaSpec rolling formula} using time as the windowing unit. This function accepts
+     * {@link Duration durations} as the reverse and forward window parameters. Negative values are allowed and can be
+     * used to generate completely forward or completely reverse windows. A row containing a {@code null} in the
+     * timestamp column belongs to no window and will not have a value computed or be considered in the windows of other
+     * rows.
+     * <p>
+     * Here are some examples of window values:
+     * <ul>
+     * <li>{@code revDuration = 0m, fwdDuration = 0m} - contains rows that exactly match the current row timestamp</li>
+     * <li>{@code revDuration = 10m, fwdDuration = 0m} - contains rows from 10m earlier through the current row
+     * timestamp (inclusive)</li>
+     * <li>{@code revDuration = 0m, fwdDuration = 10m} - contains rows from the current row through 10m following the
+     * current row timestamp (inclusive)</li>
+     * <li>{@code revDuration = 10m, fwdDuration = 10m} - contains rows from 10m earlier through 10m following the
+     * current row timestamp (inclusive)</li>
+     * <li>{@code revDuration = 10m, fwdDuration = -5m} - contains rows from 10m earlier through 5m before the current
+     * row timestamp (inclusive), this is a purely backwards looking window</li>
+     * <li>{@code revDuration = -5m, fwdDuration = 10m} - contains rows from 5m following through 10m following the
+     * current row timestamp (inclusive), this is a purely forwards looking window</li>
+     * </ul>
+     *
+     * <p>
+     * The provided {@code formula} should specify the output column name. Some examples of formula are:
+     *
+     * <pre>
+     * sum_AB = sum(col_A) + sum(col_B)
+     * max_AB = max(col_A) + max(col_B)
+     * values = col_A + col_B
+     * </pre>
+     *
+     * @param timestampCol the name of the timestamp column
+     * @param revDuration the look-behind window size (in Duration)
+     * @param fwdDuration the look-ahead window size (in Duration)
+     * @param formula the user-defined {@link RollingFormulaSpec#formula() formula} to apply to each group. This formula
+     *        can contain any combination of the following:
+     *        <ul>
+     *        <li>Built-in functions such as min, max, etc.</li>
+     *        <li>Mathematical arithmetic such as *, +, /, etc.</li>
+     *        <li>User-defined functions</li>
+     *        </ul>
+     * @return The aggregation
+     */
+    static UpdateByOperation RollingFormula(String timestampCol, Duration revDuration, Duration fwdDuration,
+            String formula) {
+        return RollingFormulaSpec.ofTime(timestampCol, revDuration, fwdDuration, formula).clause();
+    }
+
+    /**
+     * Create a {@link RollingFormulaSpec rolling formula} using time as the windowing unit. This function accepts
+     * {@code nanoseconds} as the reverse window parameters. A row containing a {@code null} in the timestamp column
+     * belongs to no window and will not have a value computed or be considered in the windows of other rows.
+     *
+     * <p>
+     * The provided {@code formula} should specify the output column name. Some examples of formula are:
+     *
+     * <pre>
+     * sum_AB = sum(col_A) + sum(col_B)
+     * max_AB = max(col_A) + max(col_B)
+     * values = col_A + col_B
+     * </pre>
+     *
+     * @param timestampCol the name of the timestamp column
+     * @param revTime the look-behind window size (in nanoseconds)
+     * @param formula the user-defined formula to apply to each group. This formula can contain any combination of the
+     *        following:
+     *        <ul>
+     *        <li>Built-in functions such as min, max, etc.</li>
+     *        <li>Mathematical arithmetic such as *, +, /, etc.</li>
+     *        <li>User-defined functions</li>
+     *        </ul>
+     * @return The aggregation
+     */
+    static UpdateByOperation RollingFormula(String timestampCol, long revTime, String formula) {
+        return RollingFormulaSpec.ofTime(timestampCol, revTime, formula).clause();
+    }
+
+    /**
+     * Create a {@link RollingFormulaSpec rolling formula} using time as the windowing unit. This function accepts
+     * {@code nanoseconds} as the reverse and forward window parameters. Negative values are allowed and can be used to
+     * generate completely forward or completely reverse windows. A row containing a {@code null} in the timestamp
+     * column belongs to no window and will not have a value computed or be considered in the windows of other rows.
+     *
+     * <p>
+     * The provided {@code formula} should specify the output column name. Some examples of formula are:
+     *
+     * <pre>
+     * sum_AB = sum(col_A) + sum(col_B)
+     * max_AB = max(col_A) + max(col_B)
+     * values = col_A + col_B
+     * </pre>
+     *
+     * @param timestampCol the name of the timestamp column
+     * @param revTime the look-behind window size (in nanoseconds)
+     * @param fwdTime the look-ahead window size (in nanoseconds)
+     * @param formula the user-defined formula to apply to each group. This formula can contain any combination of the
+     *        following:
+     *        <ul>
+     *        <li>Built-in functions such as min, max, etc.</li>
+     *        <li>Mathematical arithmetic such as *, +, /, etc.</li>
+     *        <li>User-defined functions</li>
+     *        </ul>
+     * @return The aggregation
+     */
+    static UpdateByOperation RollingFormula(String timestampCol, long revTime, long fwdTime, String formula) {
+        return RollingFormulaSpec.ofTime(timestampCol, revTime, fwdTime, formula).clause();
+    }
 
 
     <T> T walk(Visitor<T> visitor);
diff --git a/table-api/src/main/java/io/deephaven/api/updateby/spec/RollingFormulaSpec.java b/table-api/src/main/java/io/deephaven/api/updateby/spec/RollingFormulaSpec.java
index 55b57c48159..b4576d3eb51 100644
--- a/table-api/src/main/java/io/deephaven/api/updateby/spec/RollingFormulaSpec.java
+++ b/table-api/src/main/java/io/deephaven/api/updateby/spec/RollingFormulaSpec.java
@@ -4,10 +4,12 @@
 package io.deephaven.api.updateby.spec;
 
 import io.deephaven.annotations.BuildableStyle;
+import io.deephaven.api.Selectable;
 import org.immutables.value.Value;
 import org.immutables.value.Value.Immutable;
 
 import java.time.Duration;
+import java.util.Optional;
 
 /**
  * An {@link UpdateBySpec} for performing a windowed rolling formula operation.
@@ -15,10 +17,24 @@
 @Immutable
 @BuildableStyle
 public abstract class RollingFormulaSpec extends RollingOpSpec {
-
+    /**
+     * The formula to use to calculate output values. The formula is similar to
+     * {@link io.deephaven.api.TableOperations#update} and {@link io.deephaven.api.TableOperations#updateView} in
+     * specifying the output column name and the expression to compute in terms of the input columns. (e.g.
+     * {@code "outputCol = sum(inputColA + inputColB)"}).
+     * <p>
+     * The alternative (and deprecated) form for {@link #formula()} is active when {@link #paramToken()} is provided. In
+     * this case the formula should only contain the expression in terms of the token. (e.g. {@code sum(x)} where x is
+     * the {@link #paramToken()}). NOTE: This form is deprecated and will be removed in a future release.
+     */
     public abstract String formula();
 
-    public abstract String paramToken();
+    /**
+     * (Deprecated) The token to use in {@link #formula()} to represent the input column. If this parameter is provided,
+     * then only a single input column can be provided in the formula.
+     */
+    @Deprecated
+    public abstract Optional<String> paramToken();
 
     public static RollingFormulaSpec ofTicks(long revTicks, String formula, String paramToken) {
         return of(WindowScale.ofTicks(revTicks), formula, paramToken);
@@ -53,6 +69,41 @@ public static RollingFormulaSpec ofTime(final String timestampCol, long revDurat
                 formula, paramToken);
     }
 
+    // New methods for supporting the non-tokenized version (expects valid column names in the formula)
+
+    public static RollingFormulaSpec ofTicks(long revTicks, String formula) {
+        return of(WindowScale.ofTicks(revTicks), formula);
+    }
+
+    public static RollingFormulaSpec ofTicks(long revTicks, long fwdTicks, String formula) {
+        return of(WindowScale.ofTicks(revTicks), WindowScale.ofTicks(fwdTicks), formula);
+    }
+
+    public static RollingFormulaSpec ofTime(final String timestampCol, Duration revDuration, String formula) {
+        return of(WindowScale.ofTime(timestampCol, revDuration), formula);
+    }
+
+    public static RollingFormulaSpec ofTime(final String timestampCol, Duration revDuration, Duration fwdDuration,
+            String formula) {
+        return of(WindowScale.ofTime(timestampCol, revDuration),
+                WindowScale.ofTime(timestampCol, fwdDuration),
+                formula);
+    }
+
+    public static RollingFormulaSpec ofTime(final String timestampCol, long revDuration, String formula) {
+        return of(WindowScale.ofTime(timestampCol, revDuration),
+                formula);
+    }
+
+    public static RollingFormulaSpec ofTime(final String timestampCol, long revDuration, long fwdDuration,
+            String formula) {
+        return of(WindowScale.ofTime(timestampCol, revDuration),
+                WindowScale.ofTime(timestampCol, fwdDuration),
+                formula);
+    }
+
+    // Base methods for creating the RollingFormulaSpec
+
     public static RollingFormulaSpec of(WindowScale revWindowScale, String formula, String paramToken) {
         return ImmutableRollingFormulaSpec.builder()
                 .revWindowScale(revWindowScale)
@@ -71,6 +122,33 @@ public static RollingFormulaSpec of(WindowScale revWindowScale, WindowScale fwdW
                 .build();
     }
 
+    public static RollingFormulaSpec of(WindowScale revWindowScale, String formula) {
+        return ImmutableRollingFormulaSpec.builder()
+                .revWindowScale(revWindowScale)
+                .formula(formula)
+                .build();
+    }
+
+    public static RollingFormulaSpec of(WindowScale revWindowScale, WindowScale fwdWindowScale, String formula) {
+        return ImmutableRollingFormulaSpec.builder()
+                .revWindowScale(revWindowScale)
+                .fwdWindowScale(fwdWindowScale)
+                .formula(formula)
+                .build();
+    }
+
+    /**
+     * If {@link #paramToken()} is not supplied, this will contain a {@link Selectable} of the parsed
+     * {@link #formula()}.
+     */
+    @Value.Lazy
+    public Selectable selectable() {
+        if (paramToken().isPresent()) {
+            throw new UnsupportedOperationException("selectable() is not supported when paramToken() is present");
+        }
+        return Selectable.parse(formula());
+    }
+
     @Override
     public final boolean applicableTo(Class<?> inputType) {
         return true;
@@ -86,12 +164,9 @@ final void checkFormula() {
         if (formula().isEmpty()) {
             throw new IllegalArgumentException("formula must not be empty");
         }
-    }
-
-    @Value.Check
-    final void checkParamToken() {
-        if (paramToken().isEmpty()) {
-            throw new IllegalArgumentException("paramToken must not be empty");
+        if (!paramToken().isPresent()) {
+            // Call the selectable method to parse now and throw on invalid input.
+            selectable();
         }
     }
 }
diff --git a/table-api/src/main/java/io/deephaven/api/updateby/spec/RollingOpSpec.java b/table-api/src/main/java/io/deephaven/api/updateby/spec/RollingOpSpec.java
index c90bdc457f7..e6da6a2364f 100644
--- a/table-api/src/main/java/io/deephaven/api/updateby/spec/RollingOpSpec.java
+++ b/table-api/src/main/java/io/deephaven/api/updateby/spec/RollingOpSpec.java
@@ -10,24 +10,32 @@
  */
 
 public abstract class RollingOpSpec extends UpdateBySpecBase {
-    // We would like to use jdk.internal.util.ArraysSupport.MAX_ARRAY_LENGTH, but it is not exported
+    /**
+     * We would like to use jdk.internal.util.ArraysSupport.MAX_ARRAY_LENGTH, but it is not exported
+     */
     final static int MAX_ARRAY_SIZE = Integer.MAX_VALUE - 8;
 
-    // Provide a default reverse-looking timescale
+    /**
+     * Provide a default reverse-looking timescale
+     */
     @Value.Default
     public WindowScale revWindowScale() {
         return WindowScale.ofTicks(0);
     }
 
-    // Provide a default forward-looking timescale
+    /**
+     * Provide a default forward-looking timescale
+     */
     @Value.Default
     public WindowScale fwdWindowScale() {
         return WindowScale.ofTicks(0);
     }
 
+    /**
+     * Assert some rational constraints on window sizes (leq MAX_SIZE and geq 0)
+     */
     @Value.Check
     final void checkWindowSizes() {
-        // assert some rational constraints on window sizes (leq MAX_SIZE and geq 0)
         final double size =
                 revWindowScale().getFractionalTimeScaleUnits() + fwdWindowScale().getFractionalTimeScaleUnits();
         if (size < 0) {
@@ -37,4 +45,16 @@ final void checkWindowSizes() {
                     "UpdateBy rolling window size may not exceed MAX_ARRAY_SIZE (" + MAX_ARRAY_SIZE + ")");
         }
     }
+
+    /**
+     * Assert forward and reverse time columns match each other.
+     */
+    @Value.Check
+    final void checkCompatibleTimeColumns() {
+        if (revWindowScale().timestampCol() != null && fwdWindowScale().timestampCol() != null
+                && !revWindowScale().timestampCol().equals(fwdWindowScale().timestampCol())) {
+            throw new IllegalArgumentException(
+                    "UpdateBy rolling window forward and reverse timestamp columns must match");
+        }
+    }
 }
diff --git a/table-api/src/main/java/io/deephaven/api/updateby/spec/UpdateBySpec.java b/table-api/src/main/java/io/deephaven/api/updateby/spec/UpdateBySpec.java
index 0c8813edde3..1536c80f551 100644
--- a/table-api/src/main/java/io/deephaven/api/updateby/spec/UpdateBySpec.java
+++ b/table-api/src/main/java/io/deephaven/api/updateby/spec/UpdateBySpec.java
@@ -61,6 +61,13 @@ public interface UpdateBySpec {
      */
     ColumnUpdateOperation clause(Collection<? extends Pair> pairs);
 
+    /**
+     * Build a {@link ColumnUpdateOperation} clause for this UpdateBySpec with no input/output column name specified.
+     *
+     * @return The aggregation
+     */
+    ColumnUpdateOperation clause();
+
     // region Visitor
     <T> T walk(Visitor<T> visitor);
 
diff --git a/table-api/src/main/java/io/deephaven/api/updateby/spec/UpdateBySpecBase.java b/table-api/src/main/java/io/deephaven/api/updateby/spec/UpdateBySpecBase.java
index 366f792a568..efd9cacbb84 100644
--- a/table-api/src/main/java/io/deephaven/api/updateby/spec/UpdateBySpecBase.java
+++ b/table-api/src/main/java/io/deephaven/api/updateby/spec/UpdateBySpecBase.java
@@ -48,6 +48,13 @@ public final ColumnUpdateOperation clause(Collection<? extends Pair> pairs) {
                 .build();
     }
 
+    @Override
+    public final ColumnUpdateOperation clause() {
+        return ColumnUpdateOperation.builder()
+                .spec(this)
+                .build();
+    }
+
     /**
      * Returns {@code true} if the input class is a primitive or boxed numeric type
      * 
diff --git a/table-api/src/test/java/io/deephaven/api/agg/AggregationTest.java b/table-api/src/test/java/io/deephaven/api/agg/AggregationTest.java
index 963f59e367a..f8f04931fd0 100644
--- a/table-api/src/test/java/io/deephaven/api/agg/AggregationTest.java
+++ b/table-api/src/test/java/io/deephaven/api/agg/AggregationTest.java
@@ -56,6 +56,11 @@ public void visit(Count c) {
             ++count;
         }
 
+        @Override
+        public void visit(CountWhere countWhere) {
+            ++count;
+        }
+
         @Override
         public void visit(FirstRowKey firstRowKey) {
             ++count;
@@ -70,5 +75,10 @@ public void visit(LastRowKey lastRowKey) {
         public void visit(Partition partition) {
             ++count;
         }
+
+        @Override
+        public void visit(Formula formula) {
+            ++count;
+        }
     }
 }
diff --git a/web/WebDevelopersGuide.md b/web/WebDevelopersGuide.md
deleted file mode 100644
index 33a202e8dd3..00000000000
--- a/web/WebDevelopersGuide.md
+++ /dev/null
@@ -1,1636 +0,0 @@
-# Deephaven Servers and Concepts
-
-An installation of Deephaven consists of several servers:
- * One or more Authentication servers, handling authentication and authorization for the other servers.
- * One or more Query Configuration servers, keeping track of persistent queries.
- * One or more Remote Query Dispatcher servers, managing workers as needed.
- * Remote Query Processor (worker) servers, performing queries as requested by persistent queries or client consoles.
- * A Web server, providing the ability for a client to authenticate and gain access to a worker to make queries.
- 
-Authentication can take many forms, implemented per installation, and from the perspective of the client require a 
-username and some secret to connect, such as a SSO token/nonce or a password. Once connected and authenticated, the 
-user can request Auth Tokens to connect to another server, or a Reconnection Token to reconnect to the Authentication
-server in the event of a disconnect. The Reconnection Token must be periodically refreshed to allow reconnecting without
-storing credentials in the client. The Auth Token expires after one minute and can only be used once, so it should only be
-requested when the client wants to start a connection to a new server.
-
-The Web server can be connected to by a browser or other websocket client. After connecting, the client must 
-authenticate to obtain an Auth Token, and generally should keep that Auth Token up to date. This server will provide 
-access to available Query Configs, each detailing the worker on which they are running and the tables available within that 
-Query Config. In a later revision of the Deephaven Open API, the Remote Query Dispatcher will also be available, allowing for 
-direct console access to the Deephaven system.
-
-From a Query Config, the client will have the details required to initiate another websocket connection to that worker.
-There, they must register with their active Auth Token to gain access to the tables on that server. To 
-interact with a table, the client should first request the details about the table. With those details, the client may request the 
-the contents of the table and subscribe to any updates that occur. 
-
-When it comes to requesting data and updates, tables come in two basic forms: preemptive, and non-preemptive. A 
-preemptive table will always send all of its contents to the client, and does not support specific viewport 
-subscriptions, while a non-preemptive table will allow the client to specify that they only want to be informed about
-updates in a specific set of rows and columns.
-
-Once subscribed, the worker will first send a snapshot of results the client is interested in, and then will send 
-periodic updates as needed. If too many changes have taken place in a given timeframe to handle an update, a new 
-snapshot may be sent instead. The client can cancel their subscription to a table, and can also request a snapshot of
-the table without any update subscription.
-
-The configuration of a Deephaven table is immutable, but new tables can be easily created. Sorting, filtering, or adjusting
-the columns of a table are all performed by passing the original table back to the server with one of those operations,
-and a new table handle will be sent back informing the client that they can now subscribe to or request data for that 
-new table. The new table may or may not share a definition with the previous table - changes such as sorting and 
-filtering do not affect the definition. Subscriptions or references can be maintained to intermediate tables, to modify 
-sort or filter operations, or to see the previous results alongside the new ones.
-
-# Order of Operations on the Server
-
-Each operation changing what data is visible (sort, filter, setViewport) is understood to be performed
-serially - developers can still call other methods, and their work will be queued up but not performed
-until the previous operations' changes have been applied.
-
-Additionally, when changing the sort or filter of a table, the current viewport is removed, allowing 
-the API consumer to define the correct behavior for their application, either to move to the top of the
-new data, or to try to keep the same range of rows visible (as opposed to keeping the same rows visible,
-which may now be scattered and have other rows between them, or may not exist at all). 
-This means that a new viewport should be applied every time the sort and/or filter
-has been changed.
-
-In this example, a new sort is being applied, `rowCount` is the number of visible rows, and 
-`visibleColumns` is the list of columns to display:
-
-    // First, change the sort
-    table.applySort([nameColumn.sort().desc()]);
-    // Then, specify the viewport to be used after the sort is complete
-    table.setViewport(0, rowCount, visibleColumns);
-
-In contrast, here we are applying both a sort and a filter at the same time. The viewport should only be set after both the new sort and new filter has been applied because otherwise it would be cleared right away.
-
-    // Change the filter
-    table.applyFilter([nameColumn.filter().eqIgnoreCase("FOO").not()]);
-    
-    // table.setViewport <-- Do not change viewport yet, since we are about to make another change
-    
-    // Change the sort
-    table.applySort([nameColumn.sort().asc()]);
-    
-    // Finally, apply the viewport now that both changes are made
-    table.setViewport(0, rowCount, visibleColumns);
-    
-Operations performed will be queued on the server to avoid latency.
-
-# Deephaven Glossary 
- * **Auth Token** - An identifier created by the Deephaven Authentication server, allowing a client to connect to a server and 
- make requests to it.
- * **Open API** - Allows access to Deephaven data without using our own client.
- * **Persistent Query** - A scripted query set up to run on a worker, available to multiple users at a time, discoverable
- from the Query Configuration server.
- * **Query Config** - Describes a persistent query, the script running on it, and the tables it makes available to users.
- * **Reconnection Token** - A signed identifier created by the Deephaven Authentication server, allowing a client to reconnect
- without providing credentials again.
- * **Table Definition** - Metadata for a table on the Deephaven server, describing the columns in the table and their types.
- * **Web API** - A specialized version of Open API access, intended for use when building a web application.
-
-
-# Languages
-
-## Javascript
-
-### Overview
-
-In this section, we will give a high-level overview of how
-a JavaScript client might interact with a Deephaven installation.
-
-This will be done with pseudocode and simple explanations
-to give a complete picture of how the system can be used,
-and a brief introduction into Deephaven terminology.
-
-A more technical specification, complete with glossary and important 
-implementation details follows.
-
-#### Example 1: Logging In
-
-```
-class MyApp {
-    constructor() {
-        this.client = new Client('https://myserver/dh');
-
-        // the actual token here can be a password, or any other supported auth token
-        const credentials = { username: 'bob', token: '$₪£€₽$€₡₪₽€', type: 'password' };
-
-        this.client.onConnected()
-            .then(() => this.client.login(credentials))
-            .then(() => this.startApp(), console.error);
-   }
-   startApp() {
-     // now that the client is authenticated, all Deephaven functions, 
-     // such as opening persistent queries and opening tables, are available
-   }
-}
-new MyApp();
-```
-
-In Example 1 above, we are sending the username, the token, and the type of auth to use.
-You can configure your own auth handler to integrate with any external system,
-and Deephaven will simply check with your server to verify user identities.
-
-The underlying network transport mechanism is not yet available to clients as
-we will manage web socket connections and the auth token refreshes automatically;
-all the client needs to do is add callbacks to Promises as needed.
-
-#### Example 2: Discovering Database Tables
-
-```
-startApp() {
-    // Subscribe to updates on all persistent queries
-    this.client.addEventListener('queryadded', e => addQuery(e.detail));
-    this.client.addEventListener('queryremoved', (e) => removeQuery(e.detail));
-    this.client.addEventListener('queryupdated', (e) => updateQuery(e.detail));
-
-    // Fetch all known persistent queries (collections of tables)
-    this.client.getKnownConfigs().forEach(queryInfo => addQuery(queryInfo));
-}
-
-addQuery(queryInfo) {
-    console.log(`Loaded query ${queryInfo.name} [${queryInfo.serial}]`);
-    for ( name in queryInfo.tableNames) {
-        this.addTable(queryInfo, name);
-    }
-}
-removeQuery(queryInfo) { ... }
-updateQuery(queryInfo) { ... }
-addTable(queryInfo, name) {
-    // Render a list of queries and tables to choose from
-}
-```
-
-In Example 2 above, we are retrieving and subscribing to changes in Persistent Queries,
-which include collections of tables and the configuration for running those tables;
-you can read more about Persistent Query settings in the technical specification.
-
-#### Example 3: Selecting a Table
-
-```
-addTable(queryInfo, name) {
-    // Create an element to click to select table.
-    show(new TableSelector(queryInfo, name);
-}
-
-class TableSelector {
-  constructor(query, name) {
-      // Create a function that returns a promise to load the table.
-      // Connecting to a table to read information can be expensive, so we avoid doing it.
-      this._table = () => queryInfo.table(name);
-      this._name = name;
-      someElement.innerText = name;
-  }
-
-  onClick() {
-    this._table().then(table =>
-        show(new TableView(this._name, table))
-    );
-  }
-}
-
-class TableView {
-    constructor(name, table) {
-        this._table = table;
-        // Draw a placeholder
-        renderFrame(name, table);
-
-        // Subscribe to the updated event to get table data to render
-        // addEventListener returns a function to easily perform cleanup
-        this._cleanup = table.addEventListener('updated', e => this.renderTable(e));
-        // This remote call does not return data directly;
-        // instead, we use our subscription to the `updated` event, above.
-        table.setViewport(startRow, endRow, table.columns);
-    }
-
-    renderFrame(name, table) {
-        someHeader.innerText = name;
-    }
-
-    renderTable(event) {
-        this._viewport = event.detail;
-        drawViewport();
-    }
-
-    drawViewport() {
-        var cnt = this._viewport.offset;
-        this._viewport.rows.forEach(row => this.drawRow(cnt++, row));
-    }
-
-    drawRow(rowNum, row) {
-        // Render a row of data using this._table.columns for type information.
-        this._table._columns.forEach(column=> this.drawCell(rowNum, row, column) );
-    }
-
-    drawCell(rowNum, row, column) {
-        doHtmlThings(rowNum, row.get(column));
-    }
-    
-    dispose() {
-        // Stop subscribing to the events from this table
-        this._cleanup();
-        
-        // Additionally, it may make sense to close the Table entirely, if it is not to be used again
-        this._table.close();
-    }
-
-}
-```
-
-In Example 3 above, we are loading the actual table data for rendering;
-metadata such as table size, columns, sorts and filters will be kept
-up to date for you, but the actual table data will not load until
-you call table.setViewport(), and receive `updated` events to trigger drawing.
-
-This allows both the client and the server to decide to trigger a redraw,
-without burdening the client with extra state or callback management.
-
-#### Example 4: Sorting and Filtering
-
-```
-class TableView {
-
-    // Given a table with columns: type(String), index(Number), created(Date), modified(Date),
-    // setSort(columns.type.asc(), columns.created.desc())
-    setSort() {
-        // all arguments should be dh.Sort objects.
-        this._sorts = Array.prototype.slice.apply(arguments);
-        var promise = this._table.applySort(this._sorts);
-        return promise;
-    }
-
-    addSort(sort) {
-        this._sorts.push(sort);
-        return this._table.applySort(this._sorts);
-    }
-
-    // setFilter(
-    //       columns.type.eq(FilterValue.ofString('Awesome')), 
-    //       columns.modified.greaterThan(FilterValue.ofNumber(yesterday()))
-    // )
-    setFilter() {
-        this._filters = Array.prototype.slice.apply(arguments);
-        return this._table.applyFilter(this._filters);
-    }
-
-    addFilter(filter) {
-        this._filters.push(filter);
-        return this._table.applyFilter(this._filters);
-    }
-
-    // Use cloning when you want to create a new table to apply sorts and filters without modifying the existing table.
-    // Note that each the original and the clone will fire their own events, maintain their own viewport, and
-    // individual close() calls will need to be applied individually as appropriate.
-    clone(name) {
-        if (!name) {
-            name = `${this._name}Clone`;
-        }
-        return this._table.copy()
-            .then(newTable=>return new TableView(name, newTable));
-    }
-
-}
-```
-**NOTE TO COLIN**
-
->Examples 1-3 above are followed with a narrative.  
->Example 4 does not have one.  
->Was this intentional?
-
-### Web Development Glossary
- * **[Promise](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Guide/Using_promises)** - A fluent callback API in 
- modern browsers.
- * **[Web Socket](https://developer.mozilla.org/en-US/docs/Web/API/WebSockets_API)** - An outgoing TCP socket connection 
- with a few additional constraints (HTTP CONNECT handshake, XOR of frame contents) that can be created by JS code in 
- modern browsers.
- * **[Web Worker](https://developer.mozilla.org/en-US/docs/Web/API/Web_Workers_API/Using_web_workers)** - A distinct JS 
- process without access to the DOM, events, or other UI details, allowing for work to be done in the background of 
- modern browsers.
-
- 
-### JS API Design
-The Deephaven high-level Javascript API is written to handle the details discussed above, and give a web developer a familiar starting
-point when writing their application. This section will discuss the abstractions provided to the web developer to avoid
-the need to understand the comprehensive workings of the Deephaven platform. 
-
-The connection is established by specifying the URL of the Web server to the `Client` object and logging in. From there, 
-Auth Tokens are automatically maintained, and any call that requires connecting to another server will be done 
-automatically, including exchange of tokens.
-
-While client tables could still be used as if they were immutable by cloning before making any changes to sort, filter, 
-or columns, this API also allows their use as mutable objects, and internally tracks the server-side tables, creating
-new ones as is necessary. Additionally, the distinction is not made between table handles and table definitions - the 
-JS type `Table` will wrap all of the relevant details.
-
-Total table size is exposed through a method instead of requiring client code to keep track of changes to the size 
-across messages.
-
-Format info is not exposed as a distinct, hidden column, but as additional detail on each cell.
-
-Most operations will likely be handled "off-thread" through the use of a web worker to actually handle messages from the
-server, and to pass changes back to the server again, so processing sets of changes will not impede the UI from
-being responsive. Combined with the async nature of well-behaved JS communicating with the server, most methods that
-change the content to be rendered or ask for details not yet rendered will themselves be async, generally through the
-use of Promises or events.
-
-
-###JS API Docs
-
-#### The `dh` namespace
-The Deephaven Web API provides similar functionality as the client GUI. The following documentation details the available class types, methods, properties, and events. 
-"namespace" here refers to the fact that using any of these objects requires an "dh." prefix.
-
-##### Class `Table`
-Provides access to data in a table. Note that several methods present
-their response through Promises. This allows the client to both avoid actually connecting to the server until necessary,
-and also will permit some changes not to inform the UI right away that they have taken place.
-
-###### Properties
- * `Column[] columns` - Read-only. The columns that are present on this table.  This is always all possible columns.
- If you specify fewer columns in .setViewport(), you will get only those columns in your ViewportData.
- * `Number size` - Read-only. The total count of rows in the table. The size can and will change; see the `sizechanged` 
- event for details. Size will be negative in exceptional cases (eg. the table is uncoalesced, see the `isUncoalesced` property 
- for details). 
- * `Number totalSize` - Read-only. The total count of the rows in the table, excluding any filters. Unlike `size`, 
- changes to this value will not result in any event.
- * `Sort[] sort` - Read-only. An ordered list of Sorts to apply to the table.  To update, call applySort().  Note that
- this getter will return the new value immediately, even though it may take a little time to update on the server.
- You may listen for the `sortchanged` event to know when to update the UI.
- * `FilterCondition[] filter` - Read-only. An ordered list of Filters to apply to the table.  To update, call applyFilter().
- Note that this getter will return the new value immediately, even though it may take a little time to update on the
- server. You may listen for the `filterchanged` event to know when to update the UI.
- * `String[] customColumns` - Read-only. An ordered list of custom column formulas to add to the table, either adding
- new columns or replacing existing ones. To update, call `applyCustomColumns()`.
- * `boolean hasInputTable` - Read-only. True if this table represents a user Input Table (created by InputTable.newInputTable).
- When true, you may call .inputTable() to add or remove data from the underlying table.
- * `TotalsTableConfig totalsTableConfig` - The default configuration to be used when building a `TotalsTable` for this table.
- * `boolean isUncoalesced` - Read-only. True if this table is uncoalesced. Set a viewport or filter on the partition columns 
- to coalesce the table. Check the `isPartitionColumn` property on the table columns to retrieve the partition columns.
- Size will be unavailable until table is coalesced.
- * `boolean isClosed` - Read-only. True if this table has been closed.
-
-###### Methods
- * `applySort(Sort[]):Sort[]` - Replace the currently set sort on this table. Returns the previously set value. Note
- that the sort property will immediately return the new value, but you may receive update events using the old sort
- before the new sort is applied, and the `sortchanged` event fires. Reusing existing, applied sorts may enable
- this to perform better on the server.  The `updated` event will also fire, but `rowadded` and `rowremoved` will not.
- * `applyFilter(FilterCondition[]):FilterCondition[]` - Replace the currently set filters on the table. Returns the previously set value.
- Note that the filter property will immediately return the new value, but you may receive update events using the old
- filter before the new one is applied, and the `filterchanged` event fires. Reusing existing, applied filters may enable
- this to perform better on the server.  The `updated` event will also fire, but `rowadded` and `rowremoved` will not.
- * `applyCustomColumns(String[]):String[]` - Deprecated, use `applyCustomColumns(CustomColumn[])` instead - Replace the current custom columns with a new set. These columns can be
-  used when adding new filter and sort operations to the table, as long as they are present.
- * `applyCustomColumns(CustomColumn[]):CustomColumn[]` - Replace the current custom columns with a new set. These columns can be
-  used when adding new filter and sort operations to the table, as long as they are present.
- * `setViewport(Number firstRow, Number lastRow, Column[]= columns, Number= updateIntervalMs):TableViewportSubscription` - 
- If the columns parameter is not provided, all columns will be used. If the updateIntervalMs parameter is not provided, 
- a default of one second will be used. Until this is called, no data will be available. Invoking this will result in events
- to be fired once data becomes available, starting with an `updated` event and a `rowadded` event per row in that range.
- The returned object allows the viewport to be closed when no longer needed.
- * `subscribe(Column[] columns, Number= updateIntervalMs):TableSubscription` - Creates a subscription to the specified 
- columns, across all rows in the table. The optional parameter updateIntervalMs may be specified to indicate how often the
- server should send updates, defaulting to one second if omitted. Useful for charts or taking a snapshot of the table 
- atomically. The initial snapshot will arrive in a single event, but later changes will be sent as updates. However, this 
- may still be very expensive to run from a browser for very large tables. Each call to subscribe creates a new subscription,
- which must have `close()` called on it to stop it, and all events are fired from the TableSubscription instance.
- * `getViewportData():Promise<ViewportData>` - Gets the currently visible viewport. If the current set of operations
- has not yet resulted in data, it will not resolve until that data is ready.
- * `copy():Promise<Table>` - Creates a new copy of this table, so it can be sorted and filtered separately, and maintain
- a different viewport.
- * `addEventListener(String type, function listener):Function` - Listen for events on this table.
- Returns a cleanup function.
- * `removeEventListener(String type, function listener)`  - Removes an event listener added to this table.
- * `close()` - Indicates that this Table instance will no longer be used, and its connection to the server can be
- cleaned up.
- * `selectDistinct(Column[]):Promise<Table>` - Returns a new table containing the distinct tuples of values from the
- given columns that are present in the original table. This table can be manipulated as any other table. Sorting is
- often desired as the default sort is the order of appearance of values from the original table.
- * `findColumn(String named):Column` - Retrieve a column by the given name.  You should prefer to always retrieve
- a new Column instance instead of caching a returned value.
- * `findColumns(String[] named):Column[]` - Retrieve multiple columns specified by the given names.
- * `inputTable():Promise<InputTable>` - If .hasInputTable is true, you may call this method to gain access to an
- InputTable object which can be used to mutate the data within the table.  If the table is not an Input Table, the
- promise will be immediately rejected.
- * `getTotalsTable(TotalsTableConfig= config):Promise<TotalsTable>` - Returns a promise that will resolve to a Totals 
- Table of this table. This table will obey the configurations provided as a parameter, or will use the table's default 
- if no parameter is provided, and be updated once per second as necessary. Note that multiple calls to this method will
- each produce a new TotalsTable which must have close() called on it when not in use.
- * `getGrandTotalsTable(TotalsTableConfig= config):Promise<TotalsTable>` - Returns a promise that will resolve to a Totals Table
- of this table, ignoring any filters. See `getTotalsTable()` above for more specifics.
- * `getColumnStatistics(Column column):Promise<ColumnStatistics>` - Returns a promise that will resolve to ColumnStatistics for
- the column of this table.
- * `freeze():Promise<Table>` - Returns a "frozen" version of this table (a server-side snapshot of the entire source 
- table). Viewports on the frozen table will not update. This does not change the original table, and the new table will 
- not have any of the client side sorts/filters/columns. New client side sorts/filters/columns can be added to the frozen 
- copy.
- * `rollup(RollupConfig):Promise<TreeTable>` - Returns a promise that will resolve to a new roll-up `TreeTable` of this table. 
- Multiple calls to this method will each produce a new `TreeTable` which must have close() called on it when not in use.
- * `treeTable(TreeTableConfig):Promise<TreeTable>` - Returns a promise that will resolve to a new `TreeTable` of this table. 
- Multiple calls to this method will each produce a new `TreeTable` which must have close() called on it when not in use. 
- * `join(String joinType, Table rightTable, String[] columnsToMatch, String[]= columnsToAdd):Promise<Table>` - Returns
- a promise that will be resolved with a newly created table holding the results of the join operation. The last
- parameter is optional, and if not specified or empty, all columns from the right table will be added to the output.
- Callers are responsible for ensuring that there are no duplicates - a match pair can be passed instead of a name to
- specify the new name for the column. Supported `joinType` values (consult Deephaven's "Joining Data from Multiple Tables
- for more detail):
-   * "Join" <!-- provide a link to https://docs.deephaven.io/latest/Content/writeQueries/tableOperations/joins.htm#Joining_Data_from_Multiple_Tables ? -->
-   * "Natural"
-   * "AJ"
-   * "ReverseAJ"
-   * "ExactJoin"
-   * "LeftJoin"
- * `partitionBy(String[] keys, boolean= dropKeys):Promise<PartitionedTable>` - Creates a new PartitionedTable from the contents of the
- current table, partitioning data based on the specified keys.
-<!--
- * `getAttributes():String[]` - returns an array listing the attributes that are set on this table, minus some of those already
- available via other Table properties. Keys that represent an attribute that can be read in JS can be passed to 
- `getAttribute(key)`.
- * `getAttribute(String key):Any` - returns null if no property exists, a string if it is an easily serializable property,
- or a `Promise<Table>` that will either resolve with a table or error out if the object can't be passed to JS. 
--->
- 
-###### Static functions
- * `reverse():Sort` - Returns a Sort than can be used to reverse a table. This can be passed into n array in applySort.
- Note that Tree Tables do not support reverse.
-
-###### Events
- * `sizechanged` - The table size has updated, so live scrollbars and the like can be updated accordingly.
- * `updated` - event.detail is the currently visible window, the same as if getViewportData() was called and resolved. 
- Listening to this event removes the need to listen to the finer grained events below for data changes. In contrast, 
- using the finer grained events may enable only updating the specific rows which saw a change.
- * `rowadded` - Finer grained visibility into data being added, rather than just seeing the currently visible viewport.
- Provides the row being added, and the offset it will exist at.
- * `rowremoved` - Finer grained visibility into data being removed, rather than just seeing the currently visible viewport.
- Provides the row being removed, and the offset it used to exist at.
- * `rowupdated` - Finer grained visibility into data being updated, rather than just seeing the currently visible viewport.
- Provides the row being updated and the offset it exists at. 
- * `sortchanged` - Indicates that a sort has occurred, and that the UI should be replaced with the current viewport.
- * `filterchanged` - Indicates that a filter has occurred, and that the UI should be replaced with the current viewport.
- * `customcolumnschanged` - Indicates that columns for this table have changed, and column headers should be updated.
- * `requestfailed` - Indicates that an error occurred on this table on the server or while communicating with it. The 
- message will provide more insight, but recent operations were likely unsuccessful and may need to be reapplied.
-
-##### Class `Column`
-Describes the structure of the column, and if desired can be used to get access to the data to be rendered in this
-column.
-
-###### Static functions
- * `formatRowColor(String expression): CustomColumn` - Format entire rows colors using the expression specified. Returns a `CustomColumn` object to apply to a table using `applyCustomColumns` with the parameters specified.
- * `createCustomColumn(String name, String expression): CustomColumn` - Return a `CustomColumn` object to apply using `applyCustomColumns` with the expression specified.
-
-###### Methods
- * `get(Row):Any` - Returns the value for this column in the given row. Type will be consistent with the type of the
- Column.
- * `filter():FilterValue` - Creates a new value for use in filters based on this column. Used either as a parameter to
- another filter operation, or as a builder to create a filter operation.
- * `formatColor(String expression): CustomColumn` - Return a `CustomColumn` object to apply using `applyCustomColumns` with the expression specified.
- * `formatNumber(String expression): CustomColumn` - Return a `CustomColumn` object to apply using `applyCustomColumns` with the expression specified.
- * `formatDate(String expression): CustomColumn` - Return a `CustomColumn` object to apply using `applyCustomColumns` with the expression specified.
- * `sort():Sort` - Creates a sort builder object, to be used when sorting by this column.
-
-###### Properties
- * `Number index` - Deprecated, do not use. Internal index of the column in the table, to be used as a key on the Row.
- * `String type` - Type of the row data that can be found in this column.
- * `String name` - Label for this column.
- * `boolean isPartitionColumn` - True if this column is a partition column. Partition columns are used for filtering
- uncoalesced tables (see `isUncoalesced` property on `Table`) 
- * `String constituentType` - If this column is part of a roll-up tree table, represents the type of the row data that 
-   can be found in this column for leaf nodes if includeConstituents is enabled. Otherwise, it is `null`.
-
-##### Class `Sort`
-Describes a Sort present on the table. No visible constructor, created through the use of Column.sort(), will be tied to
-that particular column data. Sort instances are immutable, and use a builder pattern to make modifications. All methods
-return a new Sort instance. 
-
-###### Methods
- * `asc():Sort` - Builds a Sort instance to sort values in ascending order.
- * `desc():Sort` - Builds a Sort instance to sort values in descending order.
- * `abs():Sort` - Builds a Sort instance which takes the absolute value before applying order.
-
-###### Properties
- * `Column column` - The column which is sorted.
- * `String direction` - The direction of this sort, either `ASC`, `DESC`, or `REVERSE`.
- * `boolean isAbs` - True if the absolute value of the column should be used when sorting; defaults to false. 
-
-##### Class `CustomColumn`
-* `String name` - The name of the column to use.
-* `String type` - Type of custom column. One of `FORMAT_COLOR`, `FORMAT_NUMBER`, `FORMAT_DATE`, or `NEW`.
-* `String expression` - The expression to evaluate this custom column.
-
-##### Class `FilterValue`
-Describes data that can be filtered, either a column reference or a literal value. Used this way, the type of a value
-can be specified so that values which are ambiguous or not well supported in JS will not be confused with Strings or imprecise numbers (e.g., nanosecond-precision date values). Additionally, once wrapped in this way, methods can be
-called on these value literal instances. These instances are immutable - any method called on them returns a new
-instance.
-
-###### Static factory methods
- * `ofString(?):FilterValue` - Constructs a string for the filter API from the given parameter.
- * `ofNumber(?):FilterValue` - Constructs a number for the filter API from the given parameter. Can also be used on the 
- values returned from `Row.get` for DateTime values. To create a filter with a date, use `dh.DateWrapper.ofJsDate` or
- `dh.i18n.DateTimeFormat.parse`. To create a filter with a 64-bit long integer, use `dh.LongWrapper.ofString`.
- * `ofBoolean(?):FilterValue` - Constructs a boolean for the filter API from the given parameter.
- 
-###### Methods
- * `eq(FilterValue):FilterCondition` - Returns a filter condition checking if the current value is equal to the given 
- parameter.
- * `eqIgnoreCase(FilterValue):FilterCondition` - Returns a filter condition checking if the current value is equal to 
- the given parameter, ignoring differences of upper vs lower case.
- * `notEq(FilterValue):FilterCondition` - Returns a filter condition checking if the current value is not equal to the 
- given parameter.
- * `notEqIgnoreCase(FilterValue):FilterCondition` - Returns a filter condition checking if the current value is not 
- equal to the given parameter, ignoring differences of upper vs lower case.
- * `greaterThan(FilterValue):FilterCondition` - Returns a filter condition checking if the current value is greater 
- than the given parameter.
- * `lessThan(FilterValue):FilterCondition` - Returns a filter condition checking if the current value is less than the 
- given parameter.
- * `greaterThanOrEqualTo(FilterValue):FilterCondition` - Returns a filter condition checking if the current value is 
- greater than or equal to the given parameter.
- * `lessThanOrEqualTo(FilterValue):FilterCondition` - Returns a filter condition checking if the current value is less 
- than or equal to the given parameter.
- * `in(FilterValue[]):FilterCondition` - Returns a filter condition checking if the current value is in the given set 
- of values.
- * `inIgnoreCase(FilterValue[]):FilterCondition` - Returns a filter condition checking if the current value is in the 
- given set of values, ignoring differences of upper vs lower case.
- * `notIn(FilterValue[]):FilterCondition` - Returns a filter condition checking that the current value is not in the 
- given set of values.
- * `notInIgnoreCase(FilterValue[]):FilterCondition` - Returns a filter condition checking that the current value is not 
- in the given set of values, ignoring differences of upper vs lower case.
- * `contains(FilterValue):FilterCondition` - Returns a filter condition checking if the given value contains the given
- string value.
- * `containsIgnoreCase(FilterValue):FilterCondition` - Returns a filter condition checking if the given value contains
- the given string value, ignoring differences of upper vs lower case.
- * `matches(FilterValue):FilterCondition` - Returns a filter condition checking if the given value matches the provided
- regular expressions string. Regex patterns use Java regex syntax.
- * `matchesIgnoreCase(FilterValue):FilterCondition` - Returns a filter condition checking if the given value matches 
- the provided regular expressions string, ignoring differences of upper vs lower case. Regex patterns use Java regex
- syntax.
- * `isTrue():FilterCondition` - Returns a filter condition checking if the current value is a true boolean.
- * `isFalse():FilterCondition` - Returns a filter condition checking if the current value is a false boolean.
- * `isNull():FilterCondition` - Returns a filter condition checking if the current value is a null value.
- * `invoke(String, ...?):FilterCondition` - Returns a filter condition invoking the given method on the current value, 
- with the given parameters. Currently supported functions that can be invoked on a String:
-  
-     * `startsWith` - Returns true if the current string value starts with the supplied string argument.
-     * `endsWith` - Returns true if the current string value ends with the supplied string argument.
-     * `matches` - Returns true if the current string value matches the supplied string argument used as a Java regular 
-     expression.
-     * `contains` - Returns true if the current string value contains the supplied string argument. When invoking against
-     a constant, this should be avoided in favor of FilterValue.contains.
- 
-##### Class `FilterCondition`
-Describes a filter which can be applied to a table. Replacing these instances may be more expensive than reusing them.
-These instances are immutable - all operations that compose them to build bigger expressions return a new instance.
-
-###### Methods
- * `not():FilterCondition` - Returns the opposite of this condition.
- * `and(...FilterCondition):FilterCondition` - Returns a condition representing the current condition logically ANDed
- with the other parameters.
- * `or(...FilterCondition):FilterCondition` - Returns a condition representing the current condition logically ORed with
- the other parameters.
- * `toString():String` - Returns a string suitable for debugging showing the details of this condition.
-
-<!--
-###### Properties
- * `Column[] columns` - The columns tested in some way by this filter (not yet supported).
- -->
- 
-###### Static functions
- * `search(FilterValue, FilterValue[]=):FilterCondition` - Returns a filter condition which will check if the given
- value can be found in any supported column on whatever table this FilterCondition is passed to. This FilterCondition is
- somewhat unique in that it need not be given a column instance, but will adapt to any table. On numeric columns, with a
- value passed in which can be parsed as a number, the column will be filtered to numbers which equal, or can be
- "rounded" effectively to this number. On String columns, the given value will match any column which contains this
- string in a case-insensitive search. An optional second argument can be passed, an array of `FilterValue` from the 
- columns to limit this search to (see `Column.filter()`).
- * `invoke(String, ...FilterValue):FilterCondition` - Returns a filter condition invoking a static function with the 
- given parameters. Currently supported Deephaven static functions:
-     * `inRange` - Given three comparable values, returns true if the first is less than the second but greater than the 
-     third.
-     * `isInf` - Returns true if the given number is "infinity".
-     * `isNaN` - Returns true if the given number is "not a number".
-     * `isFinite` - Returns true if the given number is not null, is not infinity, and is not "not a number".
-     * `startsWith` - Returns true if the first string starts with the second string.
-     * `endsWith` - Returns true if the first string ends with the second string.
-     * `matches` - Returns true if the first string argument matches the second string used as a Java regular expression.
-     * `contains` - Returns true if the first string argument contains the second string as a substring.
-     * `in` - Returns true if the first string argument can be found in the second array argument. Note that the array
-     can only be specified as a column reference at this time - typically the `FilterValue.in` method should be used in
-     other cases.
-
-
-##### Class `ViewportData`
-Contains data in the current viewport. Also contains the offset to this data, so that the actual row number may be
-determined. Do not assume that the first row in `rows` is the first visible row, because extra rows may be provided for easier
-scrolling without going to the server.
-
-##### Properties
- * `Number offset` - The index of the first returned row.
- * `Row[] rows` - An array of rows of data.
- * `Column[] columns` - A list of columns describing the data types in each row.
-
-##### Class `Row`
-This object may be pooled internally or discarded and not updated. Do not retain references to it. Instead, request the 
-viewport again.
-
-###### Methods
- * `get(Column column):Any` - Returns the data for the given column's cell.
- * `getFormat(Column column):Format` - Returns the format object for the given columns' cell.
- 
-##### Class `Format`
-This object may be pooled internally or discarded and not updated. Do not retain references to it.
-
-###### Properties 
- * `String color` - Color to apply to the text, in `#rrggbb` format.
- * `String backgroundColor` - Color to apply to the cell's background, in `#rrggbb` format.
- * `String formatString` - The format string to apply to the value of this cell (see https://docs.deephaven.io/latest/Content/writeQueries/formatTables.htm#Formatting_Tables).
- * `String numberFormat` - DEPRECATED - use `formatString` instead. Number format string to apply to the value in this cell (see https://docs.deephaven.io/latest/Content/writeQueries/formatTables.htm#Formatting_Tables).
-
-##### Class `PartitionedTable`
-Represents a set of Tables each corresponding to some key. The keys are available locally, but a call must be made to 
-the server to get each Table. All tables will have the same structure.
-
-###### Methods
- * `getKeys():String[]` - The set of all currently known keys. This is kept up to date, so getting the list after adding
- an event listener for `keyadded` will ensure no keys are missed.
- * `size():Number` - The count of known keys.
- * `close()` - Indicates that this PartitionedTable will no longer be used, removing subcriptions to updated keys, etc. This
- will not affect tables in use.
- * `getTable(String):Promise<Table>` - Fetches the table with the given key.
-
-###### Events
- * `keyadded` - Indicates that a new key has been added to the array of keys, which can now be fetched with getTable.
- * `requestfailed` - Indicates that an error has occurred while communicating with the server.
-
-##### Class `InputTable`
-Represents a User Input Table, which can have data added to it from other sources.
-
-You may add rows using dictionaries of key-value tuples (representing columns by name), add tables containing all the key/value 
-columns to add, or delete tables containing the keys to delete. Each operation is atomic, and will either succeed completely 
-or fail completely. To guarantee order of operations, apply an operation and wait for the response before sending the next operation.
-
-Each table has one or more key columns, where each unique combination of keys will appear at most once in the table.
-
-To view the results of the Input Table, you should use standard table operations on the InputTable's source Table object.
-
-###### Properties
- * `String[] keys` - A list of the key columns, by name.
- * `Column[] keyColumns` - A list of the key Column objects.
- * `String[] values` - A list of the value columns, by name.
- * `Column[] valueColumns` - A list of the value Column objects.
- * `Table table` - The source table for this Input Table.
-
-###### Methods
- * `addRow(Object from):Promise<InputTable>` - Adds a single row to the table. For each key or value column name in the
-  Input Table, we retrieve that javascript property at that name and validate it can be put into the given column type.
- * `addRows(Object[] from):Promise<InputTable>` - Add multiple rows to a table. 
- * `addTable(Table from):Promise<InputTable>` - Add an entire table to this Input Table.  Only column names that match
- the definition of the input table will be copied, and all key columns must have values filled in.  This only copies
- the current state of the source table; future updates to the source table will not be reflected in the Input Table.
- The returned promise will be resolved to the same InputTable instance this method was called upon once the server returns.
- * `addTables(Table[] from):Promise<InputTable>` - Add multiple tables to this Input Table.
- * `deleteTable(Table from):Promise<InputTable>` - Deletes an entire table from this Input Table. Key columns must match
- the Input Table.
- * `deleteTables(Table[] from):Promise<InputTable>` - Delete multiple tables from this Input Table.
-
-##### Class `TotalsTable`
-A simplistic Table, providing access to aggregation of the table it is sourced from. This table is always automatically subscribed to its parent, and adopts changes automatically from it. 
-This class has limited methods found on Table. Instances of this type always have a size of one when no groupBy is set on the config, but may potentially contain as
-few as zero rows, or as many as the parent table if each row gets its own group.
-
-When using the `groupBy` feature, it may be desireable to also provide a row to the user with all values across all
-rows. To achieve this, request the same Totals Table again, but remove the `groupBy` setting.
-
-###### Properties
- * `TotalsTableConfig totalsTableConfig` - Read-only. The configuration used when creating this Totals Table. 
- * `Column[] columns` - Read-only. The columns present on this table. Note that this may not include all columns in the parent
- table, and in cases where a given column has more than one aggregation applied, the column name will have a suffix
- indicating the aggregation used. This suffixed name will be of the form `columnName + '__' + aggregationName`.
- * `Number size` - Read-only. The total number of rows in this table. This may change as the base table's configuration,
- filter, or contents change.
- * `Sort[] sort` - Read-only. An ordered list of Sorts to apply to the table.  To update, call applySort().  Note that
- this getter will return the new value immediately, even though it may take a little time to update on the server.
- You may listen for the `sortchanged` event to know when to update the UI.
- * `FilterCondition[] filter` - Read-only. An ordered list of Filters to apply to the table.  To update, call applyFilter().
- Note that this getter will return the new value immediately, even though it may take a little time to update on the
- server. You may listen for the `filterchanged` event to know when to update the UI.
- * `CustomColumn[] customColumns` - Read-only. An ordered list of custom column formulas to add to the table, either adding
- new columns or replacing existing ones. To update, call `applyCustomColumns()`.
-
-###### Methods
- * `getViewportData():Promise<ViewportData>` - Gets the currently visible viewport. If the current set of operations
- has not yet resulted in data, it will not resolve until that data is ready.
- * `setViewport(Number firstRow, Number lastRow, Column[]= columns)` - Specifies the range of items to pass to the 
- client and update as they change. If the columns parameter is not provided, all columns will be used. Until this is 
- called, no data will be available. Invoking this will result in events to be fired once data becomes available, 
- starting with an `updated` event and one `rowadded` event per row in that range.
- * `findColumn(String named):Column` - Retrieve a column by the given name.  You should prefer to always retrieve
- a new Column instance instead of caching a returned value.
- * `findColumns(String[] named):Column[]` - Retrieve multiple columns specified by the given names.
- * `close()` - Indicates that the table will no longer be used, and resources used to provide it can be freed up on the
- server.
- * `applySort(Sort[]):Sort[]` - Replace the currently set sort on this table. Returns the previously set value. Note
- that the sort property will immediately return the new value, but you may receive update events using the old sort
- before the new sort is applied, and the `sortchanged` event fires. Reusing existing, applied sorts may enable
- this to perform better on the server.  The `updated` event will also fire, but `rowadded` and `rowremoved` will not.
- * `applyFilter(FilterCondition[]):FilterCondition[]` - Replace the currently set filters on the table. Returns the previously set value.
- Note that the filter property will immediately return the new value, but you may receive update events using the old
- filter before the new one is applied, and the `filterchanged` event fires. Reusing existing, applied filters may enable
- this to perform better on the server.  The `updated` event will also fire, but `rowadded` and `rowremoved` will not.
- * `applyCustomColumns(String[]):String[]` - Deprecated, use `applyCustomColumns(CustomColumn[])` instead - Replace the current custom columns with a new set. These columns can be
- used when adding new filter and sort operations to the table, as long as they are present.
- * `applyCustomColumns(CustomColumn[]):CustomColumn[]` - Replace the current custom columns with a new set. These columns can be
-    used when adding new filter and sort operations to the table, as long as they are present.
- * `addEventListener(String type, function listener):Function` - Listen for events on the main connection.  Returns a
- convenience function to remove the event listener.
- * `removeEventListener(String type, function listener)` - Allow for manual "normal" event handler removal as well.
- 
-###### Events
-All events that can fire on a Table can also fire from a TotalsTable, and can be interacted with in the same way.
-
-##### Class `TreeTable`
-Similar to a table, a Tree Table provides access to subscribed viewport data on the current hierarchy. A different Row type is used
-within that viewport, showing the depth of that node within the tree and indicating details about whether or not it
-has children or is expanded. The Tree Table itself then provides the ability to change if a row is expanded or not.
-Methods used to control or check if a row should be expanded or not can be invoked on a TreeRow instance, or on the
-number of the row (thus allowing for expanding/collapsing rows which are not currently visible in the viewport).
-
-Events and viewports are somewhat different than tables, due to the expense of computing the expanded/collapsed rows
-and count of children at each level of the hierarchy, and differences in the data that is available.
-
- * There is no `totalSize` property.
- * The viewport is not un-set when changes are made to filter or sort, but changes will continue to be streamed in. It 
- is suggested that the viewport be changed to the desired position (usually the first N rows) after any filter/sort
- change is made. Likewise, `getViewportData()` will always return the most recent data, and will not wait if
- a new operation is pending.
- * Custom columns are not directly supported. If the `TreeTable` was created client-side, the original Table can have
- custom columns applied, and the `TreeTable` can be recreated.
- * The `totalsTableConfig` property is instead a method, and returns a promise so the config can be fetched 
- asynchronously.
- * Totals Tables for trees vary in behavior between hierarchical tables and roll-up tables. This behavior is based on
- the original flat table used to produce the Tree Table - for a hierarchical table (i.e. Table.treeTable in the query
- config), the totals will include non-leaf nodes (since they are themselves actual rows in the table), but in a roll-up
- table, the totals only include leaf nodes (as non-leaf nodes are generated through grouping the contents of the 
- original table). Roll-ups also have the `isIncludeConstituents` property, indicating that a `Column` in the tree may 
- have a `constituentType` property reflecting that the type of cells where `hasChildren` is false will be different from 
- usual.
-
-###### Properties
- * `Number size` - The current number of rows given the table's contents and the various expand/collapse states of each
- node. (No totalSize is provided at this time; its definition becomes unclear between roll-up and tree tables, especially
- when considering collapse/expand states).
- * `Sort[] sort` - The current sort configuration of this Tree Table.
- * `FilterCondition[] filter` - The current filter configuration of this Tree Table.
- * `Column[] columns` - The columns that can be shown in this Tree Table.
- * `boolean isIncludeConstituents` - True if this is a roll-up and will provide the original rows that make up each grouping.
-
-###### Methods
- * `expand(Number|TreeRow, boolean expandDescendants = false)` - Expands the given node, so that its children are visible when they are in the viewport. 
- The parameter can be the row index, or the row object itself. The second parameter is a boolean value, false by default, specifying if the row and all descendants should be fully expanded. Equivalent to `setExpanded(row, true)` with an optional third boolean parameter. 
- * `collapse(Number|TreeRow)` - Collapses the given node, so that its children and descendants are not visible in the
- size or the viewport. The parameter can be the row index, or the row object itself. Equivalent to 
- `setExpanded(row, false, false)`.
- * `setExpanded(Number|TreeRow, boolean, boolean)` - Specifies if the given node should be expanded or collapsed. If this node has
- children, and the value is changed, the size of the table will change. If node is to be expanded and the third parameter, `expandDescendants`, is true, then its children will also be expanded.
- * `isExpanded(Number|TreeRow):boolean` - Returns true if the given row is expanded, false otherwise. Equivalent to
- `TreeRow.isExpanded`, if an instance of the row is available.
- * `setViewport(Number firstRow, Number lastRow, Column[]= columns)`
- * `getViewportData():Promise<ViewportData>` -
- * `close()` - Indicates that the table will no longer be used, and server resources can be freed.
- * `applySort(Sort[]):Sort[]` - Applies the given sort to all levels of the tree. Returns the previous sort in use.
- * `applyFilter(FilterCondition[]):FilterCondition[]` - Applies the given filter to the contents of the tree in
- such a way that if any node is visible, then any parent node will be visible as well even if that parent node would not
- normally be visible due to the filter's condition. Returns the previous sort in use.
- * `findColumn(String):Column` - Returns a column with the given name, or throws an exception if it cannot be found.
- * `findColumns(String[]):Column[]` - Returns an array with all of the named columns in order, or throws an exception
- if one cannot be found.
- * `getTotalsTableConfig():Promise<TotalsTableConfig>` - Fetches the Totals config for the table that this Tree Table
- was based on, so that the content of the flat table can be aggregated. 
- * `getTotalsTable(TotalsTableConfig):Promise<TotalsTable>` - Constructs a new Totals Table from the given config, based
- on the current filter status of this Tree Table. If null or not provided, the default config (see 
- `getTotalsTableConfig()`) will be used.
- * `getGrandTotalsTable(TotalsTableConfig):Promise<TotalsTable>` - Constructs a new Totals Table from the given config,
- ignoring any filters set on this Tree Table. If null or not provided, the default config (see `getTotalsTableConfig()`)
- will be used.
- * `addEventListener(String type, function listener):Function` - Listen for events on this Tree Table.
- Returns a cleanup function.
- * `removeEventListener(String type, function listener)` - Removes an event listener from this Tree Table.
- * `copy():Promise<TreeTable>` - Creates a new copy of this treetable, so it can be sorted and filtered separately, and
- maintain a different viewport. Unlike Table, this will _not_ copy the filter or sort, since tree table viewport
- semantics differ, and without a viewport set, the treetable doesn't evaluate these settings, and they aren't readable
- on the properties. Expanded state is also not copied.
-
-###### Events
- * `updated` - event.detail is the currently visible viewport data based on the active viewport configuration.
-
-##### Class `TreeRow` extends `Row`
-Like `Row`, `TreeRow` represents visible rows in the table, but with additional properties to reflect the tree structure.
-
-###### Properties
- * `boolean isExpanded` - True if this node is currently expanded to show its children; false otherwise. Those children
- will be the rows below this one with a greater depth than this one.
- * `boolean hasChildren` - True if this node has children and can be expanded; false otherwise. Note that this value may
- change when the table updates, depending on the table's configuration.
- * `Number depth` - The number of levels above this node; zero for top level nodes. Generally used by the UI to indent
- the row and its expand/collapse icon.
- 
-##### Class `TableViewportSubscription`
-This object serves as a "handle" to a subscription, allowing it to be acted on directly or canceled outright. If you retain
-an instance of this, you have two choices - either only use it to call `close()` on it to stop the table's viewport without
-creating a new one, or listen directly to this object instead of the table for data events, and always call `close()` when
-finished. Calling any method on this object other than close() will result in it continuing to live on after `setViewport`
-is called on the original table, or after the table is modified.
-
-###### Methods
- * `close()` - Stops this viewport from running, stopping all events on itself and on the table that created it.
- * `setViewport(Number firstRow, Number lastRow, Column[]= columns)` - Changes the rows and columns set on this viewport.
- This cannot be used to change the update interval.
- * `getViewportData():Promise<ViewportData>` - Gets the data currently visible in this viewport.
- * `addEventListener(String type, function listener):Function` - Listens for events on this viewport subscription.
- Returns a cleanup function.
- * `removeEventListener(String type, function listener)` - Removes an event listener on this viewport subscription. 
-
-##### Class `TableSubscription`
-Represents a subscription to the table on the server. Changes made to the table will not be reflected here - the subscription
-must be closed and a new one optioned to see those changes. The event model is slightly different from viewports to make it 
-less expensive to compute for large tables.
-
-###### Properties
- * `Column[] columns` - The columns that were subscribed to when this subscription was created.
- 
-###### Methods
- * `close()` - Stops the subscription on the server.
- * `addEventListener(String type, function listener):Function` - Listens for events on this table subscription.
- Returns a cleanup function.
- * `removeEventListener(String type, function listener)` - Removes an event listener on this table subscription.
- 
-###### Events
- * `updated` - Indicates that some new data is available on the client, either an initial snapshot or a delta update.
- The `detail` field of the event will contain a TableSubscriptionEventData detailing what has changed, or allowing access
- to the entire range of items currently in the subscribed columns.
-
-##### Class `TableSubscriptionEventData`
-This class supports two ways of reading the table - checking the changes made since the last update, and reading all
-data currently in the table. While it is more expensive to always iterate over every single row in the table,
-it may in some cases actually be cheaper than maintaining state separately and updating only the changes, though both
-options should be considered.
-
-The RangeSet objects allow iterating over the LongWrapper indexes in the table. Note that these "indexes" are not necessarily 
-contiguous and may be negative, and represent some internal state on the server, allowing it to keep track of data efficiently.
-Those LongWrapper objects can be passed to the various methods on this instance to read specific rows or cells out of the table.
-
-###### Properties
- * `Row[] rows` - A lazily computed array of all rows in the entire table. 
- * `RangeSet added` - The ordered set of row indexes added since the last update.
- * `RangeSet removed` - The ordered set of row indexes removed since the last update.
- * `RangeSet updated` - The ordered set of row indexes updated since the last update.
-
-###### Methods
- * `get(LongWrapper index):Row` - Reads a row object from the table, from which any subscribed column can be read.
- * `getData(LongWrapper index, Column column):Object` - Reads a specific cell from the table, from the specified row and
- column.
- * `getFormat(LongWrapper index, Column column):Format` - Reads the Format to use for a cell from the specified row and
- column.
- 
-##### Class `RangeSet`
-This class allows iteration over non-contiguous indexes. In the future, this will support the EcmaScript 2015 Iteration
-protocol, but for now has one method which returns an iterator, and also supports querying the size. Additionally,
-we may add support for creating RangeSet objects to better serve some use cases.
-
-###### Properties
- * `Number size` - The total count of items contained in this collection. In some cases this can be expensive to compute,
- and generally should not be needed except for debugging purposes, or preallocating space (i.e., do not call this property
- each time through a loop).
- 
-###### Methods
- * `iterator():Iterator<LongWrapper>` - Returns a new iterator over all indexes in this collection. 
- 
-##### Protocol `Iterator<T>`
-This is part of EcmaScript 2015, documented here for completeness. It supports a single method, `next()`, which returns
-an object with a `boolean` named `done` (true if there are no more items to return; false otherwise), and optionally
-some `T` instance, `value`, if there was at least one remaining item.
-
-##### Class `ColumnStatistics`
-This class holds the results of a call to generate statistics on a table column.
-
-###### Methods
- * `getType(String name):String` - Gets the format type for a statistic. A null return value means that the column formatting should be used.
-
-###### Properties
- * `Map<String, Double> statisticsMap` - A map of each statistic's name to its value.
- * `Map<String, Double> uniqueValues` - A map of each unique value's name to the count of how many times it occurred in the column.  This map will be empty for tables containing more than 19 unique values.
-
-##### Class `TotalsTableConfig`
-Describes how a Totals Table will be generated from its parent table. Each table has a default (which may be null)
-indicating how that table was configured when it was declared, and each Totals Table has a similar property describing
-how it was created. Both the `Table.getTotalsTable` and `Table.getGrandTotalsTable` methods take this config as an
-optional parameter - without it, the table's default will be used, or if null, a default instance of `TotalsTableConfig`
-will be supplied.
-
-This class has a no-arg constructor, allowing an instance to be made with the default values provided. However, any JS
-object can be passed in to the methods which accept instances of this type, provided their values adhere to the expected
-formats.
-
-###### Properties
- * `boolean showTotalsByDefault` - Specifies if a Totals Table should be expanded by default in the UI. Defaults to 
- false.
- * `boolean showGrandTotalsByDefault` - Specifies if a Grand Totals Table should be expanded by default in the UI. 
- Defaults to false.
- * `String defaultOperation` - Specifies the default operation for columns that do not have a specific operation applied; defaults to "Sum".
- * `Object.<String[]> operationMap` - Mapping from each column name to the aggregation(s) that should be applied to that 
- column in the resulting Totals Table. If a column is omitted, the defaultOperation is used.
- * `String[] groupBy` - Groupings to use when generating the Totals Table. One row will exist for each unique set of
- values observed in these columns. See also `Table.selectDistinct`.
- 
-##### Class `RollupConfig`
-Describes a grouping and aggregations for a roll-up table. Pass to the `Table.rollup` function to create a roll-up table.
-
-###### Properties
- * `String[] groupingColumns` - Ordered list of columns to group by to form the hierarchy of the resulting roll-up table.
- * `Object.<String[]> aggregations` - Mapping from each aggregation name to the ordered list of columns it should be 
-   applied to in the resulting roll-up table.
- * `boolean includeConstituents` - Optional parameter indicating if an extra leaf node should be added at the bottom of 
- the hierarchy, showing the rows in the underlying table which make up that grouping. Since these values might be a different
- type from the rest of the column, any client code must check if TreeRow.hasChildren = false, and if so, interpret those
- values as if they were Column.constituentType instead of Column.type. Defaults to false.
- * `boolean includeDescriptions` - Optional parameter indicating if original column descriptions should be included. Defaults to true.
-
-##### Class `RollupTableConfig (deprecated)`
-`RollupTableConfig` has been deprecated. Use `RollupConfig` instead.
- 
-##### Class `TreeTableConfig`
-Like TotalsTableConfig, `TreeTableConfig` supports an operation map indicating how to aggregate the data, as well as an array of column names
-which will be the layers in the roll-up tree, grouped at each level. An additional optional value can be provided
-describing the strategy the engine should use when grouping the rows.
-
-###### Properties
- * `String idColumn` - The column representing the unique ID for each item 
- * `String parentColumn` - The column representing the parent ID for each item
- * `String strategy` - Optional parameter indicating how the grouping should be performed in the engine. See `ByStrategy` enum for permitted values.
-  If not set, `DEFAULT` will be used.
- * `boolean promoteOrphansToRoot` - Optional parameter indicating if items with an invalid parent ID should be promoted to root. Defaults to false.
-
-##### Enum `ByStrategy`
-The strategy for how a roll-up should be performed in the engine.
- * `DEFAULT` - Allow the query engine to heuristically determine what should be done
- * `LINEAR` - Read the key group by columns linearly, adding each key to the aggregation state factory one at a time
- * `LINEAR_GROUPS` - Read the key group by columns linearly, but create groups and add all indices to the state factory together
- * `USE_EXISTING_GROUPS` - If there is a group, use it; otherwise operate as LINEAR_GROUPS
- * `CREATE_GROUPS` - Create groups, and use them
- * `USE_EXISTING_GROUPS_LINEAR_REFRESH` - USE_EXISTING_GROUPS with LINEAR refresh
- * `CREATE_GROUPS_LINEAR_REFRESH` - CREATE_GROUPS with LINEAR refresh
- * `USE_EXISTING_GROUPS_LINEAR_GROUP_REFRESH` - USE_EXISTING_GROUPS with LINEAR_GROUPS refresh
- * `CREATE_GROUPS_LINEAR_GROUP_REFRESH` - CREATE_GROUPS with LINEAR_GROUPS refresh
-
-##### Enum `AggregationOperation`
-This enum describes the name of each supported operation/aggregation type when creating a `TreeTable`.
- * `COUNT` - The total number of values in the specified column. Can apply to any type. String value is "Count".
- * `MIN` - The minimum value in the specified column. Can apply to any column type which is Comparable in Java. String 
- value is "Min".
- * `MAX` - The maximum value in the specified column. Can apply to any column type which is Comparable in Java. String
- value is "Max".
- * `SUM` - The sum of all values in the specified column. Can only apply to numeric types. String value is "Sum".
- * `ABS_SUM` - The sum of all values, as their distance from zero, in the specified column. Can only apply to numeric types. String value is “AbsSum”.
- * `VAR` - The sample variance of all values in the specified column. Can only apply to numeric types. String value is "Var".
- * `AVG` - The average of all values in the specified column. Can only apply to numeric types. String value is "Avg".
- * `STD` - The sample standard deviation of all values in the specified column. Can only apply to numeric types. String value is
- "Std".
- * `FIRST` - The first value in the specified column. Can apply to any type. String value is "First".
- * `LAST` - The last value in the specified column. Can apply to any type. String value is "Last".
- * `COUNT_DISTINCT` - Return the number of unique values in each group. Can apply to any type. String value is "CountDistinct".
- * `DISTINCT` - Collect the distinct items from the column. Can apply to any type. String value is "Distinct".
- * `SKIP` - Indicates that this column should not be aggregated. String value is "Skip".
- 
- <!--
-##### Class `Ide`
-
-###### Constructor
- * `new dh.Ide(DeephavenClient client)` - creates a new instance, from which console connections can be made. 
-
-###### Methods
- * `createConsole(ConsoleConfig config):Promise<IdeConnection>` - creates a new worker
-
-###### Static functions
- * `getExistingSession(String websocketUrl, String authToken, String serviceId, String scriptLanguage):Promise<IdeSession>`
-
-##### Class `IdeConnection`
-
-###### Constructor
- * `new dh.IdeConnection(String websocketUrl, IdeConnectionOptions options)` - creates a new instance, from which console sessions can be made. `options` are optional.
-
-###### Methods
-
- * `addEventListener(String eventType, Function eventListener)`
- * `getConsoleTypes():String[]` - Retrieve the available console types for this worker.
- * `getHeapInfo():HeapInfo` - Retrieve the current heap info for this worker.
- * `removeEventListener(String eventType, Function eventListener)`
- * `onLogMessage(Function logHandler):Function`
- * `startSession(String scriptLanguage):Promise<IdeSession>`
- * `close()` closes the connection, releasing any resources on the server or client.
- 
-###### Properties
-
- * `String websocketUrl` - the url used when connecting to the server. Read-only.
- * `String serviceId` - The name of the service that should be authenticated to on the server. Read-only.
-
-##### Class `IdeConnectionOptions`
-###### Properties
- * `String authToken` - base 64 encoded auth token
- * `String serviceId` - The service ID to use for the connection
-
-##### Class `IdeSession`
-
-###### Methods
-
- * `getTable(String tableName):Promise<Table>` - Load the named table, with columns and size information
- already fully populated.
- * `getFigure(String figureName):Promise<Figure>` - Load the named Figure, including its tables and partitionedtables
-as needed.
- * `getTreeTable(String treeTableName):Promise<TreeTable>` - Loads the named tree table or roll-up table, with column
- data populated. All nodes are collapsed by default, and size is presently not available until the viewport is first
- set.
- * `getObject(VariableDefinition def):Promise<Object>` - Loads the given object from the server, following the correct
- semantics of providing that particular object.
- * `newTable(String[] columnNames, String[] columnTypes, String[][] data, String userTimeZone):Promise<Table>`
- * `mergeTables(Table[] tables):Promise<Table>`
- * `bindTableToVariable(Table table, String variableName):Promise<void>`
- * `runCode(String code):CommandResult`
- * `onLogMessage(function(LogItem) logHandler):function()`
- * `openDocument(DidOpenTextDocumentParams openDocParams)`
- * `changeDocument(DidChangeTextDocumentParams changeDocParams)`
- * `getCompletionItems(CompletionParams autoCompleteParams):Promise<CompletionItem[]>>`
- * `closeDocument(DidCloseTextDocumentParams closeDocumentParams)`
- * `intradayTable(String namespace, String name, String= internalPartition, boolean= live):Promise<Table>` - Creates
- and retrieves an intraday table from the given namespace and name. If provided, the "intradayPartition" parameter will
- specify which partition to read from on disk, defaults to null for "all". The "live" parameter defaults to true, and
- can be specified as false to avoid fetching a ticking table.
- * `intradayPartitions(String namespace, String name):Proise<Table>` - Get a table containing the possible intraday
- partition names for the `intradayTable` method.
- * `historicalTable(String namespace, String name):Promise<Table>` - Creates and retrieves a historical table. The
- resulting table is likely to be uncoalesced, so must be filtered at least once to have a size available. 
- * `emptyTable(Number size, Object<String, String>= columns):Promise<Table>` - Creates an empty table with the specified 
- number of rows. Optionally columns and types may be specified, but all values will be null.
- * `timeTable(Number periodNanos, DateWrapper= startTime` - Creates a new table that ticks automatically every 
- "periodNanos" nanoseconds. A start time may be provided, if so the table will be populated with the interval from the
- specified date until now.
- * close():void
- 
-##### Class `LogItem`
-###### Properties
- * `number micros`
- * `String logLevel`
- * `String message`
- 
-##### Class `ConsoleConfig`
-###### Properties
- * `String dispatcherHost`
- * `number dispatcherPort`
- * `String jvmProfile`
- * `String[] classpath`
- * `number maxHeapMb`
- * `String queryDescription`
- * `boolean debug`
- * `boolean detailedGCLogging`
- * `boolean omitDefaultGcParameters`
- * `String[] jvmArgs`
- * `String[][] envVars`
-
-#### The `dh.lsp` namespace:
-
-##### Class `DidChangeTextDocumentParams`
-
-###### Properties
- * `VersionedTextDocumentIdentifier textDocument`
-
-##### Class `TextDocumentIdentifier`
-
-###### Properties 
- * `String uri`
- 
-##### Class `VersionedTextDocumentIdentifier` extends `TextDocumentIdentifier`
-
-###### Properties 
- * `number version`
- * `String uri`
- 
-##### Class `DidCloseTextDocumentParams` 
-
-###### Properties
- * `TextDocumentIdentifier textDocument`
-
-##### Class `DidOpenTextDocumentParams`
-
-###### Properties
- * `TextDocumentItem textDocument`
- 
-##### Class `TextDocumentItem`
-
-###### Properties
- * `String uri`
- * `String languageId`
- * `number version`
- * `String text`
- 
-##### Class `CompletionParams`
-
-###### Properties
- * `CompletionContext context`
-
-##### Class `CompletionContext`
-
-###### Properties
- * `number triggerKind`
- * `String triggerCharacter`
-
-##### Class `TextDocumentContentChangeEvent`
-
-###### Properties
- * `DocumentRange range`
- * `number rangeLength`
- * `String text`
- 
-##### Class `DocumentRange`
-
-###### Properties
- * `Position start`
- * `Position end`
- 
-###### Methods
- * `isInside(Position innerStart, Position innerEnd):boolean`
- 
-##### Class `Position`
-
-###### Properties
-
- * `number line`
- * `number character`
- 
-###### Methods
- * `lessThan(Position pos): boolean`
- * `lessOrEqual(Position pos): boolean`
- * `greaterThan(Position pos): boolean`
- * `greaterOrEqual(Position pos): boolean`
- * `copy(): boolean`
- 
-##### Class `CompletionItem`
-###### Properties
- * `String[] commitCharacters`
- * `String[] additionalTextEdits`
- * `number start`
- * `number length`
- 
-##### Class `CommandResult`
-
-###### Properties
- * `VariableChanges changes`
- * `String error`
-
-##### Class `VariableChanges`
- * `VariableDefinition created`
- * `VariableDefinition updated`
- * `VariableDefinition removed`
-
-##### Class `HeapInfo`
- * `Number maximumHeapSize` - Maximum heap size of this worker.
- * `Number freeMemory` - Free memory of this worker.
- * `Number totalHeapSize` - Total heap size available for this worker.
--->
-
-#### The `dh.plot` namespace:
-
-##### Class `Figure`
-Provides the details for a figure.
-
-The Deephaven JS API supports automatic lossless downsampling of time-series data, when that data is plotted in one or
-more line series. Using a scatter plot or a X-axis of some type other than DateTime will prevent this feature
-from being applied to a series. To enable this feature, invoke `Axis.range(...)` to specify the length in pixels of the
-axis on the screen, and the range of values that are visible, and the server will use that width (and range, if any) to
-reduce the number of points sent to the client.
-
-Downsampling can also be controlled when calling either `Figure.subscribe()` or `Series.subscribe()` - both can be given
-an optional `dh.plot.DownsampleOptions` argument. Presently only two valid values exist, `DEFAULT`, and `DISABLE`, 
-and if no argument is specified, `DEFAULT` is assumed. If there are more than 30,000 rows in a table, downsampling will
-be encouraged - data will not load without calling `subscribe(DISABLE)` or enabling downsampling via `Axis.range(...)`.
-If there are more than 200,000 rows, data will refuse to load without downsampling and `subscribe(DISABLE)` would have
-no effect.
-
-Downsampled data looks like normal data, except that select items have been removed if they would be redundant in the UI
-given the current configuration. Individual rows are intact, so that a tooltip or some other UI item is sure to be 
-accurate and consistent, and at least the highest and lowest value for each axis will be retained as well, to ensure that
-the "important" values are visible.
-
-Four events exist to help with interacting with downsampled data, all fired from the `Figure` instance itself. First,
-`downsampleneeded` indicates that more than 30,000 rows would be fetched, and so specifying downsampling is no longer
-optional - it must either be enabled (calling `axis.range(...)`), or disabled. If the figure is configured for downsampling,
-when a change takes place that requires that the server perform some downsampling work, the `downsamplestarted` event
-will first be fired, which can be used to present a brief loading message, indicating to the user why data is not ready
-yet - when the server side process is complete, `downsamplefinished` will be fired. These events will repeat when the
-range changes, such as when zooming, panning, or resizing the figure. Finally, `downsamplefailed` indicates that something
-when wrong when downsampling, or possibly that downsampling cannot be disabled due to the number of rows in the table.
-
-###### Properties
- * `String title` - Read-only. The title of the figure.
- * `Chart[] charts` - Read-only. The charts to draw.
- <!-- **Not for MVP:**
- * `String titleFont` - Read-only. The font for the title of this figure.
- * `boolean isResizable` - Read-only. True if this figure is resizable.
- * `boolean isDefaultTheme` - Read-only. True if this figure is using the default theme.
- * `Number updateInterval` - Read-only. The update interval for this figure in ms.
- * `Number cols` - Read-only. Number of columns used to arrange charts in this figure. See `Chart#colspan`.
- * `Number rows` - Read-only. Number of rows used to arrange charts in this figure. See `Chart#rowspan`. -->
- 
-###### Methods
- * `close()` - Close the figure, and clean up subscriptions.
- * `addEventListener(String type, function listener):Function` - listen for events on this figure. Returns a cleanup function
- * `removeEventListener(String type, function listener)` - Remove event listener. Alternative to cleanup function returned from addEventListener
- * `subscribe()` - Enable updates for all series in this figure.
- * `unsubscribe()` - Disable updates for all series in this figure.
-
-###### Events
- * `updated` - The data within this figure was updated. `event.detail` is `FigureUpdateEventData`
- * `downsamplestarted` - The API is updating how downsampling works on this Figure, probably in response to a call to 
- `Axis.range()` or subscribe(). The `event.detail` value is an array of `Series` instances which are affected by this.
- * `downsamplefinished` - Downsampling has finished on the given `Series` instances, and data will arrive shortly. The
- `event.detail` value is the array of `Series` instances.
- * `downsamplefailed` - Downsampling failed for some reason on one or more series. The `event.detail` object has three
- properties, the `message` string describing what went wrong, the `size` number showing the full size of the table, and 
- the `series` property, an array of `Series` instances affected.
- * `downsampleneeded` - There are too many points to be drawn in the table which backs these series, and downsampling should
- be enabled. As an alternative, downsampling can be explicitly disabled, provided there are less than 200,000 rows in 
- the table.
- * `seriesadded` - A series used within this figure was added as part of a multi-series in a chart. The series instance is
- the detail for this event.
-
-##### Class `FigureUpdateEventData`
-Indicates that an update has happened to one of the tables which back this figure. To use this data, iterate
-through the `Series` instances and check the `sources` attribute of each to get the specific data to draw.
-
-###### Properties
- * `Series[] series` - the series objects affected by this update. 
- 
-###### Methods
- * `getArray(Series, String):Any[]` - returns the entire array of contents for the given series and the
- specific data source in that series.
-
-##### Class `Chart`
-Provide the details for a chart.
-
-###### Properties
- * `String title` - Read-only. The title of the chart.
- * `ChartType chartType` - Read-only. The type of this chart, see `ChartType` enum for more details.
- * `Series[] series` - Read-only. The series data for display in this chart.
- * `MultiSeries[] multiSeries` - Read-only. The multi-series data for display in this chart
- * `Axis[] axes` - Read-only. The axes used in this chart.
- <!-- **Not for MVP:**
- * `Number colspan` - Read-only. The number of columns in the figure this chart should occupy.
- * `Number rowspan` - Read-only. The number of rows in the figure this chart should occupy.
- * `String chartType` - Read-only. The type of chart this is.
- * `String title` - Read-only. The title for this chart.
- * `String titleFont` - Read-only. The font to use for the title of this chart.
- * `String titleColor` - Read-only. The color to use for the title of this chart. Null for default client color.
- * `boolean isShownLegend` - Read-only. True to show the legend.
- * `String legendFont` - Read-only. The font to use for the legend.
- * `String legendColor` - Read-only. The color to use for the legend.
- * `boolean is3d` - Read-only. True if this chart is 3D. -->
- 
-###### Events
- * `seriesadded` - a new series was added to this chart as part of a multi-series. The series instance is the detail for 
- this event.
-
-##### Class `Series`
-Provides access to the data for displaying in a figure.
-
-###### Properties
- * `String name` - Read-only. The name for this series.
- * `SeriesPlotStyle plotStyle` - Read-only. The plotting style to use for this series. See `SeriesPlotStyle` enum for more details.
- * `Axis[] axes` - Read-only. The axes used in this series.
- * `SeriesDataSource[] sources` - Read-only. Contains details on how to access data within the chart for this series.
- keyed with the way that this series uses the axis.
- * `MultiSeries multiSeries` - indicates that this series belongs to a MultiSeries, null otherwise
- <!-- **Not for MVP:**
- * `String color` - Read-only. The color to use for this series, or null to use default palette.
- * `boolean linesVisible` - Read-only. True if lines are visible for this series.
- * `boolean shapesVisible` - Read-only. True if shapes are visible for this series.
- * `boolean isGradientVisible` - Read-only. True if gradient is visible for this series.
- * `String lineColor` - Read-only. The color to use for the line of this series. Null to use client default.
- * `String lineStyle` - Read-only. The style of line to use for this series. Null to use client default.
- * `String pointLabelFormat` - Read-only. The format to use for the point labels in this series.
- * `String xTooltipPattern` - Read-only. The format pattern for the x tooltip.
- * `String yTooltipPattern` - Read-only. The format pattern for the y tooltip.
- * `String shapeLabel` - Read-only. The label for the shape of this Series. Null for client default.
- * `Number shapeSize` - Read-only. The size of the shape for this series. Null for client default.
- * `String shapeColor` - Read-only. The color for the shape of this series. Null for client default.
- * `String shape` - Read-only. The shape to use for this series. Null for client default. -->
- 
-###### Methods
- * `subscribe()` - Enable updates for this Series.
- * `unsubscribe()` - Disable updates for this Series.
- 
-###### Plot Styles
- * `bar`, `stacked_bar`, `line`, `area`, `stacked_area`, `pie`, `histogram`, `ohlc`, `scatter`, `step`, `error_bar`
-
-##### Class `MultiSeries`
-Describes a template that will be used to make new series instances when a new table added to a plotBy.
-
-###### Properties
- * `SeriesPlotStyle plotStyle` - Read-only. The plotting style to use for the series that will be created. See `SeriesPlotStyle` enum for more details.
- * `String name` - Read-only. The name for this multi-series.
-
-##### Class `Axis`
-Defines one axis used with by series. These instances will be found both on the Chart and the Series instances, and
-may be shared between Series instances.
-
-###### Properties
- * `String id` - Read-only. The unique id for this axis.
- * `String label` - Read-only. The label for this axis.
- * `AxisType type` - Read-only. The type for this axis, indicating how it will be drawn. See `AxisType` enum for more details.
- * `AxisPosition position` - Read-only. The position for this axis. See `AxisPosition` enum for more details.
- * `AxisFormatType formatType` - Read-only. The type for this axis. See `AxisFormatType` enum for more details.
- * `String formatPattern` - Read-only. The format pattern to use with this axis. Use the type to determine which type of formatter to use.
-  * `BusinessCalendar businessCalendar` - The calendar with the business hours and holidays to transform plot data against. Defaults to null, or no transform.
- <!-- **Non-MVP:** 
- * `String format` - TODO: Review this prop with colin, doesn't make sense currently. Do we need way to get formatter or just `NumberFormat.getFormat(formatPattern)`?
- * `boolean isLog` - Read-only. True if this axis is logarithmic.
- * `String labelFont` - Read-only. The font to use for the axis label.
- * `String ticksFont` - Read-only. The font to use for the axis ticks.
- * `String color` - Read-only. The color to use for this axis, null to use client's default theme.
- * `Number minRange` - Read-only. The minimum range to display on this axis. Null to fit to data.
- * `Number maxRange` - Read-only. The maximum range to display on this axis. Null to fit to data.
- * `boolean isMinorTicksVisible` - Read-only.  True to display the minor ticks on this axis.
- * `Number gapBetweenMajorTicks` - Read-only. The gap between major ticks on this axis. Null for client to use default.
- * `Number[] getMajorTickLocations` - Read-only. The locations of the major ticks. Null for client to use default.
- * `String axisTransform` - Read-only. The transformation to perform on this axis.
- * `Number tickLabelAngle` - Read-only. The angle to display the tick labels. Null for client to use default.
- * `boolean isInvert` - Read-only. True if this axis is inverted.
- * `boolean isTimeAxis` - Read-only. True if this axis -->
- 
-##### Methods
- * `range(number= widthInPixels, DateWrapper= optionalMinDate, DateWrapper= optionalMaxDate)` - Indicates that this axis
- is only `widthInPixels` wide, so any extra data can be downsampled out, if this can be done losslessly. The second two
- arguments represent the current zoom range of this axis, and if provided, most of the data outside of this range will
- be filtered out automatically and the visible width mapped to that range. When the UI zooms, pans, or resizes, this method
- should be called again to update these three values to ensure that data is correct and current.
- 
-##### Class `SeriesDataSource`
-Describes how to access and display data required within a series.
-
-###### Properties
- * `Axis axis` - the axis that this source should be drawn on.
- * `SourceType type` - the feature of this series represented by this source. See the `SourceType` enum for more details.
- * `String columnType` - the type of data stored in the underlying table's Column.
- 
-##### Enum `ChartType`
-This enum describes what kind of chart is being drawn. This may limit what kinds of series can be found on it, or how
-those series should be rendered.
- * `XY` - The chart will be drawn on a cartesian plane, with series items being plotting with X and Y positions, as lines,
- scattered points, areas, error bars, etc.
- * `PIE` - The chart will be a pie chart, with only pie series rendered on it.
- * `OHLC` - Similar to an XY plot, except that this will be TIME instead of X, and OPEN/HIGH/LOW/CLOSE instead of Y.
- * `CATEGORY` - Similar to a XY chart, except one of the axis will be based on a category instead of being numeric.
- * `XYZ` - Similar to XY, this chart will have three numeric dimensions, plotting each with an X, Y, and Z value.
- * `CATEGORY_3D` - Similar to a CATEGORY chart, this will have two category axes, and one numeric axis.
- 
-##### Enum `AxisFormatType`
- * `CATEGORY` - Indicates that this axis will have discrete values rather than be on a continuous numeric axis.
- * `NUMBER` - Indicates that the values are numeric, and should be plotted on a continuous axis.
- 
-##### Enum `AxisPosition`
- * `TOP` - The axis should be drawn at the top of the chart.
- * `BOTTOM` - The axis should be drawn at the bottom of the chart.
- * `LEFT` - The axis should be drawn at the left side of the chart.
- * `RIGHT` - The axis should be drawn at the right side of the chart.
- * `NONE` - No position makes sense for this axis, or the position is apparent from the axis type.
- 
-##### Enum `AxisType`
- * `X` - Indicates that this is an X-axis, typically drawn on the bottom or top of the chart, depending on position attribute
- * `Y` - Indicates that this is a Y-Axis, typically drawn on the left or right of the chart, depending on position attribute
- * `Z` - Indicates that this is a Z-Axis, typically used as a "third" axis on a projection that makes it appear to be set at
- a right angle to both X and Y.
- * `SHAPE` - Indicates that this axis is used to represent that items when drawn as a point may have a specialized shape
- * `SIZE` - Indicates that this axis is used to represent that items when drawn as a point may have a specific size
- * `LABEL` - Indicates that this axis is used to represent that items when drawn as a point may have label specified from
- the underlying data
- * `COLOR` - Indicates that this axis is used to represent that items when drawn as a point may have a specific color
-
-##### Enum `SeriesPlotStyle`
- * `BAR` - Series items should each be draw as bars. Each item will have a unique category value to be drawn on the CATEGORY
- axis, and a numeric value drawn on the NUMBER axis.
- * `STACKED_BAR` - Like BAR, except there may be more than one such series, and they will share axes, and each subsequent
- series should have its items drawn on top of the previous one.
- * `LINE` - Series items will be drawn as points connected by a line, with two NUMBER axes.
- * `AREA` - Series items will be drawn as points connected by a line with a filled area under the line.
- * `STACKED_AREA` - Like AREA
- * `PIE`- Series items should each be draw as pie slices. Each item will have a unique category value to be drawn on the
- CATEGORY axis, and a numeric value drawn on the NUMBER axis.
- * `HISTOGRAM` - Series items with 6 data sources, three on X and three on Y, to represent the start/end/mid of each item. 
- * `OHLC` - Stands for "Open/High/Low/Close" series. Five numeric data sources exist, four on one axis (OPEN, HIGH, LOW, CLOSE),
- and TIME on the other axis.
- * `SCATTER` - Series items will be individually drawn as points, one two or three NUMBER axes
- <!-- not for MVP * `STEP` - like LINE, except the connecting lines are only parallel to the two axes - after each point a horizontal line is
- drawn until the line is directly below the subsequent point, then a vertical line is drawn up to that point. -->
- * `ERROR_BAR` - Series items with 6 data sources, three on X and three on Y, to represent the low/mid/high of each item.
- 
-##### SourceType
-This enum describes the source it is in, and how this aspect of the data in the series should be used to render the item.
-For example, a point in a error-bar plot might have a X value, three Y values (Y, Y_LOW, Y_HIGH), and some COLOR per item - 
-the three SeriesDataSources all would share the same Axis instance, but would have different SourceType enums set. The
-exact meaning of each source type will depend on the series that they are in. 
- * `X` - LINE, AREA, STACKED_LINE, STACKED_AREA, ERROR_BAR, HISTOGRAM, SCATTER, STEP. Also used in PIE, but only to 
- identify the correct axis.
- * `Y` - LINE, AREA, STACKED_LINE, STACKED_AREA, ERROR_BAR, HISTOGRAM, SCATTER, STEP. Also used in PIE, but only to
-  identify the correct axis.
- * `Z` - STACKED_AREA, SCATTER
- * `X_LOW` - ERROR_BAR, HISTOGRAM
- * `X_HIGH` - ERROR_BAR, HISTOGRAM
- * `Y_LOW` - ERROR_BAR, HISTOGRAM
- * `Y_HIGH` - ERROR_BAR, HISTOGRAM
- * `TIME` - OHLC
- * `OPEN` - OHLC
- * `HIGH` - OHLC
- * `LOW` - OHLC
- * `CLOSE` - OHLC
- * `SHAPE` - can be used in any series
- * `SIZE` - can be used in any series
- * `LABEL` - can be used in any series
- * `COLOR` - can be used in any series
- 
-#### The `dh.i18n` namespace:
- 
-##### Class `NumberFormat`
-Utility class to parse and format numbers, using the same format patterns as are supported by the standard Java
-implementation used in the Deephaven server and swing client.
-
-###### Constructor
- * `new dh.i18n.NumberFormat(pattern)` - Creates a new number format instance. This generally should be avoided in favor
- of the static `getFormat` function, which will create and cache an instance so that later calls share the same
- instance.
-  
-###### Methods
- * `parse(String text):Number` - Parses the given text using this instance's pattern into a JS Number.
- * `format(Object number):String` - Formats the specified number (or Java `long` value) using this instance's pattern.
-
-###### Static functions
- * `getFormat(String pattern):NumberFormat` - Returns a number format instance matching the specified format. If this
- format has not been specified before, a new instance will be created and stored for later reuse.
- * `parse(String pattern, String text):Number` - Parses the given text using the cached format matching the given
- pattern.
- * `format(String pattern, Object number):String` - Formats the specified number (or Java `long` value) using the 
- cached format matching the given pattern string.
-
-##### Class `DateTimeFormat`
-Utility class to parse and format various date/time values, using the same format patterns as are supported by the 
-standard Java implementation used in the Deephaven server and swing client.
-
-As Deephaven internally uses nanosecond precision to record dates, this API expects nanoseconds in most use cases, with
-the one exception of the JS `Date` type, which is not capable of more precision than milliseconds. Note, however, that
-when passing nanoseconds as a JS `Number` there is likely to be some loss of precision, though this is still supported
-for easier interoperability with other JS code. The values returned by `parse()` will be an opaque object wrapping
-the full precision of the specified date, However, this object supports `toString()` and `valueOf()` to return a string
-representation of that value, as well as a `asNumber()` to return a JS `Number` value and a `asDate()` to return a JS
-`Date` value. 
-
-Caveats: 
- * The `D` format (for "day of year") is not supported by this implementation at this time.
- * The `%t` format for short timezone code is not supported by this implementation at this time, though `z` will work
- as expected in the browser to emit the user's own timezone. 
-
-###### Constructor
- * `new dh.i18n.DateTimeFormat(String pattern)` - Creates a new date/time format instance. This generally should be avoided in favor
- of the static `getFormat` function, which will create and cache an instance so that later calls share the same
- instance.
-
-###### Methods
- * `format(Object date, TimeZone tz):String` - Takes a variety of objects to interpret as a date, and formats them using this
- instance's pattern. Inputs can include a `String` value of a number expressed in nanoseconds, a `Number` value expressed
- in nanoseconds, a JS `Date` object (necessarily in milliseconds), or a wrapped Java `long` value, expressed in 
- nanoseconds. A `TimeZone` object can optionally be provided to format this date as the current date/time in that timezone.
- * `parse(String text, TimeZone tz):Object` - Parses the given string using this instance's pattern, and returns a wrapped Java
- `long` value in nanoseconds. A `TimeZone` object can optionally be provided to parse to a desired timezone.
- * `parseAsDate(String text):Date` - Parses the given string using this instance's pattern, and returns a JS `Date`
- object in milliseconds.
-
-###### Static functions
- * `getFormat(String pattern):DateTimeFormat` - Returns a date format instance matching the specified format. If this
- format has not been specified before, a new instance will be created and stored for later reuse.
- * `format(String pattern, Object date, TimeZone tz):String` - Accepts a variety of input objects to interpret as a date, 
- and formats them using the specified pattern. A `TimeZone` object can optionally be provided to format this date as the 
- current date/time in that timezone.See the instance method for more details on input objects. 
- * `parse(String pattern, String text, TimeZone tz):Object` - Parses the given input string using the provided pattern, and returns
- a wrapped Java `long` value in nanoseconds. A `TimeZone` object can optionally be provided to parse to a desired timezone.
- * `parseAsDate(String pattern, String text):Date` - Parses the given input string using the provided pattern, and
- returns a JS `Date` object in milliseconds.
-
-##### Class `TimeZone`
-Represents the timezones supported by Deephaven. Can be used to format dates, taking into account the offset changing
-throughout the year (potentially changing each year). These instances mostly are useful at this time to pass to 
-the `DateTimeFormat.format()` methods, though also support a few properties at this time to see details about each instance.
-
-The following timezone codes are supported when getting a timezone object - instances appearing in the same line will
-return the same details:
-
- * `GMT`/`UTC`
- * `Asia/Tokyo`
- * `Asia/Seoul`
- * `Asia/Hong_Kong`
- * `Asia/Singapore`
- * `Asia/Calcutta`/`Asia/Kolkata`
- * `Europe/Berlin`
- * `Europe/London`
- * `America/Sao_Paulo`
- * `America/St_Johns`
- * `America/Halifax`
- * `America/New_York`
- * `America/Chicago`
- * `America/Denver`
- * `America/Los_Angeles`
- * `America/Anchorage`
- * `Pacific/Honolulu`
- 
- A Timezone object can also be created from an abbreviation.  The following abbreviations are supported:
- 
-  * `UTC`
-  * `GMT`
-  * `Z`
-  * `NY`
-  * `ET`
-  * `EST`
-  * `EDT`
-  * `MN`
-  * `CT`
-  * `CST`
-  * `CDT`
-  * `MT`
-  * `MST`
-  * `MDT`
-  * `PT`
-  * `PST`
-  * `PDT`
-  * `HI`
-  * `HST`
-  * `HDT`
-  * `BT`
-  * `BRST`
-  * `BRT`
-  * `KR`
-  * `KST`
-  * `HK`
-  * `HKT`
-  * `JP`
-  * `JST`
-  * `AT`
-  * `AST`
-  * `ADT`
-  * `NF`
-  * `NST`
-  * `NDT`
-  * `AL`
-  * `AKST`
-  * `AKDT`
-  * `IN`
-  * `IST`
-  * `CE`
-  * `CET`
-  * `CEST`
-  * `SG`
-  * `SGT`
-  * `LON`
-  * `BST`
-  * `MOS`
-  * `SHG`
-  * `CH`
-  * `NL`
-  * `TW`
-  * `SYD`
-  * `AEST`
-  * `AEDT`
- 
-###### Static functions:
- * `getTimeZone(String):TimeZone` - Factory method which creates timezone instances from one of the supported keys.
-
-###### Properties:
- * `String id` - the timezone code that represents this `TimeZone`, usually the same key as was use to create this instance.
- * `Number standardOffset` - returns the standard offset of this timezone, in minutes.
- 
-#### The `dh.calendar` namespace:
- 
-##### Class `BusinessCalendar`
-Defines a calendar with business hours and holidays.
-
-###### Properties
-  * `String name` - Read-only. The name of the calendar.
-  * `TimeZone timeZone` - Read-only. The time zone of this calendar.
-  * `DayOfWeek[] businessDays` - Read-only. The days of the week that are business days.
-  * `BusinessPeriod[] businessPeriods` - Read-only. The business periods that are open on a business day.
-  * `Holiday[] holidays` - Read-only. All holidays defined for this calendar.
-
-##### Enum `DayOfWeek`
-  * `SUNDAY`, `MONDAY`, `TUESDAY`, `WEDNESDAY`, `THURSDAY`, `FRIDAY`, `SATURDAY`
-
-##### Class `BusinessPeriod`
-  * `String open` - Read-only. Time in "HH:mm" format of when the business opens on a business day.
-  * `String close` - Read-only. Time in "HH:mm" format of when the business closes on a business day.
-
-##### Class `Holiday`
-  * `Date date` - Read-only. The date of the Holiday.
-  * `BusinessPeriod[] businessPeriods` - Read-only. The business periods that are open on the holiday.
diff --git a/web/client-api/client-api.gradle b/web/client-api/client-api.gradle
index 1a43cc08a7a..93f8930f32f 100644
--- a/web/client-api/client-api.gradle
+++ b/web/client-api/client-api.gradle
@@ -14,26 +14,45 @@ configurations {
     js
     dts
     typescriptDoclet
-    testImplementation.extendsFrom junit
 }
-
 dependencies {
+    implementation platform(libs.grpc.bom)
+    implementation variantOf(libs.grpc.api) { classifier('sources') }
+
+    implementation project(':engine-chunk')
+    implementation project(':extensions-barrage')
+    implementation project(':DataStructures')
     implementation project(':web-shared-beans')
     implementation project(':web-client-backplane')
+    implementation libs.jetbrains.annotations
+    implementation variantOf(libs.jetbrains.annotations) { classifier("sources") }
+    implementation libs.immutables.value.annotations
+    implementation variantOf(libs.immutables.value.annotations) { classifier("sources") }
+
+    implementation libs.flatbuffers.java
+    implementation variantOf(libs.flatbuffers.java) { classifier("sources") }
+    implementation libs.arrow.format
+    implementation variantOf(libs.arrow.format) { classifier('sources') }
+    implementation libs.deephaven.barrage.format
+    implementation variantOf(libs.deephaven.barrage.format) { classifier('sources') }
 
-    implementation 'com.vertispan.tsdefs:jsinterop-ts-defs-annotations:1.0.0-RC4'
-    typescriptDoclet 'com.vertispan.tsdefs:jsinterop-ts-defs-doclet:1.0.0-RC4'
+    implementation libs.vertispan.ts.defs.annotations
+    typescriptDoclet libs.vertispan.ts.defs.doclet
 
-    implementation 'com.vertispan.nio:gwt-nio:1.0-alpha-1'
+    implementation libs.vertispan.nio.gwt
+    implementation libs.vertispan.flatbuffers.gwt
 
     js project(path: ':proto:raw-js-openapi', configuration: 'js')
 
-    testImplementation 'org.seleniumhq.selenium:selenium-remote-driver:4.16.1'
+    testImplementation libs.junit4
+    testImplementation libs.selenium.remote.driver
+
+    implementation libs.elemental.core
+    implementation libs.elemental.promise
+    implementation libs.elemental.dom
+
+    testImplementation libs.gwt.user
 }
-Classpaths.inheritElemental(project, 'elemental2-core', 'implementation')
-Classpaths.inheritElemental(project, 'elemental2-promise', 'implementation')
-Classpaths.inheritElemental(project, 'elemental2-dom', 'implementation')
-Classpaths.inheritGwt(project, 'gwt-user', 'testImplementation')
 
 GwtTools.gwtCompile project, 'io.deephaven.web.DeephavenApi', 'Create a jar of client JS API'
 
@@ -68,14 +87,20 @@ artifacts {
 }
 
 def gwtUnitTest = tasks.register('gwtUnitTest', Test) { t ->
+    t.group = 'verification'
     t.systemProperties = [
-            'gwt.args': ['-runStyle HtmlUnit',
+            'gwt.args': ['-sourceLevel auto',
+                         '-runStyle HtmlUnit',
                          '-ea',
                          '-style PRETTY',
+                         '-generateJsInteropExports',
+                         '-includeJsInteropExports io.deephaven.*',
+                         '-excludeJsInteropExports io.deephaven.web.client.api.widget.plot.*',
                          "-war ${layout.buildDirectory.dir('unitTest-war').get().asFile.absolutePath}"
             ].join(' '),
             'gwt.persistentunitcachedir': layout.buildDirectory.dir('unitTest-unitCache').get().asFile.absolutePath,
     ]
+    t.classpath += tasks.getByName('gwtCompile').src
     t.include '**/ClientUnitTestSuite.class'
     t.useJUnit()
     t.scanForTestClasses = false
@@ -135,19 +160,23 @@ def stopSelenium = project.tasks.register('stopSelenium', DockerRemoveContainer)
 }
 
 def gwtIntegrationTest = tasks.register('gwtIntegrationTest', Test) { t ->
+    t.group = 'verification'
     t.dependsOn(deephavenDocker.portTask, seleniumHealthy)
     t.finalizedBy(deephavenDocker.endTask, stopSelenium)
-    doFirst {
+    t.doFirst {
         def webdriverUrl = "http://localhost:${seleniumPort}/"
-        t.systemProperty('gwt.args', ["-runStyle io.deephaven.web.junit.RunStyleRemoteWebDriver:${webdriverUrl}?firefox",
+        t.systemProperty('gwt.args', ['-sourceLevel auto',
+                                      "-runStyle io.deephaven.web.junit.RunStyleRemoteWebDriver:${webdriverUrl}?firefox",
                                       '-ea',
                                       '-style PRETTY',
+                                      '-generateJsInteropExports',
+                                      '-includeJsInteropExports io.deephaven.*',
+                                      '-excludeJsInteropExports io.deephaven.web.client.api.widget.plot.*',
                                       "-setProperty dh.server=http://${deephavenDocker.containerName.get()}:10000",
                                       "-war ${layout.buildDirectory.dir('integrationTest-war').get().asFile.absolutePath}"
         ].join(' '))
         t.classpath += tasks.getByName('gwtCompile').src
     }
-    t.finalizedBy(deephavenDocker.endTask)
     t.systemProperties = [
             'gwt.persistentunitcachedir':layout.buildDirectory.dir('integrationTest-unitCache').get().asFile.absolutePath,
             'webdriver.test.host':'host.docker.internal',
@@ -157,6 +186,41 @@ def gwtIntegrationTest = tasks.register('gwtIntegrationTest', Test) { t ->
     t.scanForTestClasses = false
 }
 
+tasks.register('manualGwtTest', Test) {t ->
+    t.group = 'verification'
+    t.description = '''Test wiring to run either unit or integration tests with a manual browser and an already-running server.
+This makes it easier to run a tests repeatedly, either one at a time or as a class/suite, without
+paying to start/stop selenium and deephaven each time. The port will remain constant at 8888 each
+run to let breakpoints continue to work across repeated runs.
+
+To use this, first start a server on port 10000 with anonymous access enabled. Then, either select
+a test in IntelliJ to run using the manualGwtTest task, or invoke from the command line with info
+logging enabled and a specific test selected, e.g.:
+./gradlew :web-client-api:manualGwtTest --info --tests io.deephaven.web.client.api.NullValueTestGwt
+
+Click the URL that is printed out to run the test in your browser, or refresh an existing browser window.'''
+    t.doFirst {
+        t.systemProperty 'gwt.args', ['-port 8888',
+                                      '-sourceLevel auto',
+                                      '-runStyle Manual:1',
+                                      '-ea',
+                                      '-style PRETTY',
+                                      '-generateJsInteropExports',
+                                      '-includeJsInteropExports io.deephaven.*',
+                                      '-excludeJsInteropExports io.deephaven.web.client.api.widget.plot.*',
+                                      '-setProperty dh.server=http://localhost:10000',
+                                      '-setProperty compiler.useSourceMaps=true',
+                                      "-war ${layout.buildDirectory.dir('manualTest-war').get().asFile.absolutePath}"
+        ].join(' ')
+        t.classpath += tasks.getByName('gwtCompile').src
+    }
+    t.systemProperties = [
+            'gwt.persistentunitcachedir':layout.buildDirectory.dir('integrationTest-unitCache').get().asFile.absolutePath,
+    ]
+    t.useJUnit()
+    t.scanForTestClasses = false
+}
+
 tasks.named('check').configure {
     dependsOn(gwtUnitTest, gwtIntegrationTest)
 }
diff --git a/web/client-api/src/main/java/io/deephaven/web/DeephavenApi.gwt.xml b/web/client-api/src/main/java/io/deephaven/web/DeephavenApi.gwt.xml
index 4f6177621b8..9649d1d487c 100644
--- a/web/client-api/src/main/java/io/deephaven/web/DeephavenApi.gwt.xml
+++ b/web/client-api/src/main/java/io/deephaven/web/DeephavenApi.gwt.xml
@@ -2,8 +2,20 @@
 <!DOCTYPE module PUBLIC "-//Google Inc.//DTD Google Web Toolkit 2.8.2//EN" "http://gwtproject.org/doctype/2.8.2/gwt-module.dtd">
 <module rename-to="dhapi">
   <inherits name="elemental2.dom.Dom"/>
+  <inherits name="com.google.flatbuffers.FlatBuffers"/>
+  <inherits name="org.apache.arrow.flatbuf.FlightFlatbufFormat"/>
+  <inherits name="io.deephaven.barrage.flatbuf.BarrageFlatbufFormat"/>
+
+  <inherits name="io.deephaven.base.Base" />
+  <inherits name="io.deephaven.Util" />
+  <inherits name="io.deephaven.io.IO" />
+  <inherits name="io.deephaven.chunk.Chunk" />
+  <inherits name="io.deephaven.extensions.barrage.Barrage" />
 
   <define-property name="dh.dev" values="true, false" />
+  <source path="client" />
+  <source path="shared" />
+  <super-source path="super" />
   <set-property name="dh.dev" value="false" />
 
   <inherits name="io.deephaven.javascript.proto.dhinternal.DeephavenInternal" />
diff --git a/web/client-api/src/main/java/io/deephaven/web/DeephavenJsApiLinkerTemplate.js b/web/client-api/src/main/java/io/deephaven/web/DeephavenJsApiLinkerTemplate.js
index 6a7ed749806..708227464ac 100644
--- a/web/client-api/src/main/java/io/deephaven/web/DeephavenJsApiLinkerTemplate.js
+++ b/web/client-api/src/main/java/io/deephaven/web/DeephavenJsApiLinkerTemplate.js
@@ -15,11 +15,12 @@ function bindTo(target, source) {
 
 var Scope = function () {
 };
-Scope.prototype = self;
+Scope.prototype = globalThis;
 var $doc, $entry, $moduleName, $moduleBase;
 var $wnd = new Scope();
-bindTo($wnd, self);
-var dh = {}
+bindTo($wnd, globalThis);
+var window = $wnd;
+var dh = {};
 $wnd.dh = dh;
 import {dhinternal} from './dh-internal.js';
 $wnd.dhinternal = dhinternal;
diff --git a/web/client-api/src/main/java/io/deephaven/web/client/api/Callbacks.java b/web/client-api/src/main/java/io/deephaven/web/client/api/Callbacks.java
index 7a32670c3e8..c3568e8fac3 100644
--- a/web/client-api/src/main/java/io/deephaven/web/client/api/Callbacks.java
+++ b/web/client-api/src/main/java/io/deephaven/web/client/api/Callbacks.java
@@ -6,6 +6,7 @@
 import elemental2.dom.DomGlobal;
 import elemental2.promise.Promise;
 import elemental2.promise.Promise.PromiseExecutorCallbackFn.RejectCallbackFn;
+import io.deephaven.web.client.api.event.HasEventHandling;
 import io.deephaven.web.shared.fu.JsBiConsumer;
 
 import javax.annotation.Nullable;
diff --git a/web/client-api/src/main/java/io/deephaven/web/client/api/Column.java b/web/client-api/src/main/java/io/deephaven/web/client/api/Column.java
index 4e4840754dd..9e390ef5790 100644
--- a/web/client-api/src/main/java/io/deephaven/web/client/api/Column.java
+++ b/web/client-api/src/main/java/io/deephaven/web/client/api/Column.java
@@ -10,6 +10,7 @@
 import jsinterop.annotations.JsProperty;
 import jsinterop.base.Any;
 
+import java.util.Objects;
 import java.util.stream.IntStream;
 import java.util.stream.IntStream.Builder;
 
@@ -21,7 +22,6 @@
 public class Column {
     private final int index;
 
-    private final Integer formatColumnIndex;
     private final Integer styleColumnIndex;
     private final Integer formatStringColumnIndex;
 
@@ -75,7 +75,7 @@ public Column(int jsIndex, int index, Integer formatColumnIndex, Integer styleCo
             boolean inputTableKeyColumn, boolean isSortable) {
         this.jsIndex = jsIndex;
         this.index = index;
-        this.formatColumnIndex = formatColumnIndex;
+        assert Objects.equals(formatColumnIndex, styleColumnIndex);
         this.styleColumnIndex = styleColumnIndex;
         this.type = type;
         this.name = name;
@@ -170,14 +170,6 @@ public void setConstituentType(final String constituentType) {
         this.constituentType = constituentType;
     }
 
-    /**
-     * @deprecated Prefer {@link #getFormatStringColumnIndex()}.
-     */
-    @Deprecated
-    public Integer getFormatColumnIndex() {
-        return formatColumnIndex;
-    }
-
     public Integer getFormatStringColumnIndex() {
         return formatStringColumnIndex;
     }
@@ -187,11 +179,10 @@ public Integer getStyleColumnIndex() {
     }
 
     /**
-     * True if this column is a partition column. Partition columns are used for filtering uncoalesced tables (see
-     * <b>isUncoalesced</b> property on <b>Table</b>)
-     *
-     * @return boolean
+     * True if this column is a partition column. Partition columns are used for filtering uncoalesced tables - see
+     * {@link JsTable#isUncoalesced()}.
      *
+     * @return true if the column is a partition column
      */
     @JsProperty
     public boolean getIsPartitionColumn() {
@@ -266,7 +257,6 @@ public CustomColumn formatDate(String expression) {
     public String toString() {
         return "Column{" +
                 "index=" + index +
-                ", formatColumnIndex=" + formatColumnIndex +
                 ", styleColumnIndex=" + styleColumnIndex +
                 ", formatStringColumnIndex=" + formatStringColumnIndex +
                 ", type='" + type + '\'' +
@@ -285,9 +275,6 @@ public boolean equals(Object o) {
 
         if (index != column.index)
             return false;
-        if (formatColumnIndex != null ? !formatColumnIndex.equals(column.formatColumnIndex)
-                : column.formatColumnIndex != null)
-            return false;
         if (styleColumnIndex != null ? !styleColumnIndex.equals(column.styleColumnIndex)
                 : column.styleColumnIndex != null)
             return false;
@@ -302,7 +289,6 @@ public boolean equals(Object o) {
     @Override
     public int hashCode() {
         int result = index;
-        result = 31 * result + (formatColumnIndex != null ? formatColumnIndex.hashCode() : 0);
         result = 31 * result + (styleColumnIndex != null ? styleColumnIndex.hashCode() : 0);
         result = 31 * result + (formatStringColumnIndex != null ? formatStringColumnIndex.hashCode() : 0);
         result = 31 * result + type.hashCode();
@@ -311,12 +297,12 @@ public int hashCode() {
     }
 
     public Column withFormatStringColumnIndex(int formatStringColumnIndex) {
-        return new Column(jsIndex, index, formatColumnIndex, styleColumnIndex, type, name, isPartitionColumn,
+        return new Column(jsIndex, index, styleColumnIndex, styleColumnIndex, type, name, isPartitionColumn,
                 formatStringColumnIndex, description, isInputTableKeyColumn, isSortable);
     }
 
     public Column withStyleColumnIndex(int styleColumnIndex) {
-        return new Column(jsIndex, index, formatColumnIndex, styleColumnIndex, type, name, isPartitionColumn,
+        return new Column(jsIndex, index, styleColumnIndex, styleColumnIndex, type, name, isPartitionColumn,
                 formatStringColumnIndex, description, isInputTableKeyColumn, isSortable);
     }
 }
diff --git a/web/client-api/src/main/java/io/deephaven/web/client/api/ConnectOptions.java b/web/client-api/src/main/java/io/deephaven/web/client/api/ConnectOptions.java
index 82bf5d8bfc4..16a3711974d 100644
--- a/web/client-api/src/main/java/io/deephaven/web/client/api/ConnectOptions.java
+++ b/web/client-api/src/main/java/io/deephaven/web/client/api/ConnectOptions.java
@@ -3,19 +3,50 @@
 //
 package io.deephaven.web.client.api;
 
+import io.deephaven.web.client.api.grpc.GrpcTransportFactory;
 import jsinterop.annotations.JsIgnore;
+import jsinterop.annotations.JsNullable;
 import jsinterop.annotations.JsType;
 import jsinterop.base.Js;
 import jsinterop.base.JsPropertyMap;
 
 /**
- * Presently optional and not used by the server, this allows the client to specify some authentication details. String
- * authToken <i>- base 64 encoded auth token. String serviceId -</i> The service ID to use for the connection.
+ * Addition optional configuration that can be passed to the {@link CoreClient} constructor.
  */
 @JsType(namespace = "dh")
 public class ConnectOptions {
+    /**
+     * Optional map of http header names and values to send to the server with each request.
+     */
+    @JsNullable
     public JsPropertyMap<String> headers = Js.uncheckedCast(JsPropertyMap.of());
 
+    /**
+     * True to enable debug logging. At this time, only enables logging for gRPC calls.
+     */
+    @JsNullable
+    public boolean debug = false;
+
+    /**
+     * Set this to true to force the use of websockets when connecting to the deephaven instance, false to force the use
+     * of {@code fetch}. Ignored if {@link #transportFactory} is set.
+     * <p>
+     * Defaults to null, indicating that the server URL should be checked to see if we connect with fetch or websockets.
+     */
+    @JsNullable
+    public Boolean useWebsockets;
+
+    /**
+     * The transport factory to use for creating gRPC streams. If specified, the JS API will ignore
+     * {@link #useWebsockets} and its own internal logic for determining the appropriate transport to use.
+     * <p>
+     * Defaults to null, indicating that the JS API should determine the appropriate transport to use. If
+     * {@code useWebsockets} is set to true, the JS API will use websockets, otherwise if the server url begins with
+     * https, it will use fetch, otherwise it will use websockets.
+     */
+    @JsNullable
+    public GrpcTransportFactory transportFactory;
+
     public ConnectOptions() {
 
     }
@@ -24,6 +55,21 @@ public ConnectOptions() {
     public ConnectOptions(Object connectOptions) {
         this();
         JsPropertyMap<Object> map = Js.asPropertyMap(connectOptions);
-        headers = Js.uncheckedCast(map.getAsAny("headers").asPropertyMap());
+        if (map.has("headers")) {
+            headers = Js.uncheckedCast(map.getAsAny("headers").asPropertyMap());
+        }
+        if (map.has("debug")) {
+            debug = map.getAsAny("debug").asBoolean();
+        }
+        if (map.has("useWebsockets")) {
+            useWebsockets = map.getAsAny("useWebsockets").asBoolean();
+        }
+        // TODO (deephaven-core#6214) provide our own grpc-web library that can replace fetch
+        // if (map.has("fetch")) {
+        // fetch = map.getAsAny("fetch").uncheckedCast();
+        // }
+        if (map.has("transportFactory")) {
+            transportFactory = map.getAsAny("transportFactory").uncheckedCast();
+        }
     }
 }
diff --git a/web/client-api/src/main/java/io/deephaven/web/client/api/CoreClient.java b/web/client-api/src/main/java/io/deephaven/web/client/api/CoreClient.java
index 8687dedcd18..f70eebe404d 100644
--- a/web/client-api/src/main/java/io/deephaven/web/client/api/CoreClient.java
+++ b/web/client-api/src/main/java/io/deephaven/web/client/api/CoreClient.java
@@ -14,6 +14,7 @@
 import io.deephaven.javascript.proto.dhinternal.io.deephaven.proto.config_pb.ConfigurationConstantsResponse;
 import io.deephaven.javascript.proto.dhinternal.io.deephaven.proto.config_pb_service.ConfigServiceClient;
 import io.deephaven.javascript.proto.dhinternal.jspb.Map;
+import io.deephaven.web.client.api.event.HasEventHandling;
 import io.deephaven.web.client.api.storage.JsStorageService;
 import io.deephaven.web.client.fu.JsLog;
 import io.deephaven.web.client.fu.LazyPromise;
@@ -29,32 +30,25 @@
 import java.util.Objects;
 import java.util.function.Consumer;
 
-import static io.deephaven.web.client.api.barrage.WebGrpcUtils.CLIENT_OPTIONS;
-
 @JsType(namespace = "dh")
 public class CoreClient extends HasEventHandling {
     public static final String EVENT_CONNECT = "connect",
             EVENT_DISCONNECT = "disconnect",
             EVENT_RECONNECT = "reconnect",
             EVENT_RECONNECT_AUTH_FAILED = "reconnectauthfailed",
-            EVENT_REFRESH_TOKEN_UPDATED = "refreshtokenupdated",
             EVENT_REQUEST_FAILED = "requestfailed",
             EVENT_REQUEST_STARTED = "requeststarted",
             EVENT_REQUEST_SUCCEEDED = "requestsucceeded";
 
+    @Deprecated
+    public static final String EVENT_REFRESH_TOKEN_UPDATED = "refreshtokenupdated";
     public static final String LOGIN_TYPE_PASSWORD = "password",
             LOGIN_TYPE_ANONYMOUS = "anonymous";
 
     private final IdeConnection ideConnection;
 
     public CoreClient(String serverUrl, @TsTypeRef(ConnectOptions.class) @JsOptional Object connectOptions) {
-        ideConnection = new IdeConnection(serverUrl, connectOptions, true);
-
-        // For now the only real connection is the IdeConnection, so we re-fire the auth token refresh
-        // event here for the UI to listen to
-        ideConnection.addEventListener(EVENT_REFRESH_TOKEN_UPDATED, event -> {
-            fireEvent(EVENT_REFRESH_TOKEN_UPDATED, event);
-        });
+        ideConnection = new IdeConnection(serverUrl, connectOptions);
     }
 
     private <R> Promise<String[][]> getConfigs(Consumer<JsBiConsumer<Object, R>> rpcCall,
@@ -82,20 +76,20 @@ public String getServerUrl() {
     }
 
     public Promise<String[][]> getAuthConfigValues() {
-        return ideConnection.getConnectOptions().then(options -> {
-            BrowserHeaders metadata = new BrowserHeaders();
-            JsObject.keys(options.headers).forEach((key, index) -> {
-                metadata.set(key, options.headers.get(key));
-                return null;
-            });
-            return getConfigs(
-                    // Explicitly creating a new client, and not passing auth details, so this works pre-connection
-                    c -> new ConfigServiceClient(getServerUrl(), CLIENT_OPTIONS).getAuthenticationConstants(
-                            new AuthenticationConstantsRequest(),
-                            metadata,
-                            c::apply),
-                    AuthenticationConstantsResponse::getConfigValuesMap);
+        BrowserHeaders metadata = new BrowserHeaders();
+        JsPropertyMap<String> headers = ideConnection.getOptions().headers;
+        JsObject.keys(headers).forEach((key, index) -> {
+            metadata.set(key, headers.get(key));
+            return null;
         });
+        ConfigServiceClient configService = ideConnection.createClient(ConfigServiceClient::new);
+        return getConfigs(
+                // Explicitly creating a new client, and not passing auth details, so this works pre-connection
+                c -> configService.getAuthenticationConstants(
+                        new AuthenticationConstantsRequest(),
+                        metadata,
+                        c::apply),
+                AuthenticationConstantsResponse::getConfigValuesMap);
     }
 
     public Promise<Void> login(@TsTypeRef(LoginCredentials.class) JsPropertyMap<Object> credentials) {
@@ -131,19 +125,6 @@ public Promise<Void> login(@TsTypeRef(LoginCredentials.class) JsPropertyMap<Obje
                 EventPair.of(CoreClient.EVENT_RECONNECT_AUTH_FAILED, loginPromise::fail));
         Promise<Void> login = loginPromise.asPromise();
 
-        // fetch configs and check session timeout
-        login.then(ignore -> getServerConfigValues()).then(configs -> {
-            for (String[] config : configs) {
-                if (config[0].equals("http.session.durationMs")) {
-                    workerConnection.setSessionTimeoutMs(Double.parseDouble(config[1]));
-                }
-            }
-            return null;
-        }).catch_(ignore -> {
-            // Ignore this failure and suppress browser logging, we have a safe fallback
-            return Promise.resolve((Object) null);
-        });
-
         if (alreadyRunning) {
             ideConnection.connection.get().forceReconnect();
         }
diff --git a/web/client-api/src/main/java/io/deephaven/web/client/api/DateWrapper.java b/web/client-api/src/main/java/io/deephaven/web/client/api/DateWrapper.java
index 4e6580b57c0..f53d2a35928 100644
--- a/web/client-api/src/main/java/io/deephaven/web/client/api/DateWrapper.java
+++ b/web/client-api/src/main/java/io/deephaven/web/client/api/DateWrapper.java
@@ -4,6 +4,7 @@
 package io.deephaven.web.client.api;
 
 import elemental2.core.JsDate;
+import io.deephaven.util.QueryConstants;
 import io.deephaven.web.client.api.i18n.JsDateTimeFormat;
 import jsinterop.annotations.JsIgnore;
 import jsinterop.annotations.JsType;
@@ -17,6 +18,9 @@ public DateWrapper(long valueInNanos) {
 
     @JsIgnore
     public static DateWrapper of(long dateInNanos) {
+        if (dateInNanos == QueryConstants.NULL_LONG) {
+            return null;
+        }
         return new DateWrapper(dateInNanos);
     }
 
diff --git a/web/client-api/src/main/java/io/deephaven/web/client/api/EventFn.java b/web/client-api/src/main/java/io/deephaven/web/client/api/EventFn.java
deleted file mode 100644
index a220cc4e7df..00000000000
--- a/web/client-api/src/main/java/io/deephaven/web/client/api/EventFn.java
+++ /dev/null
@@ -1,15 +0,0 @@
-//
-// Copyright (c) 2016-2024 Deephaven Data Labs and Patent Pending
-//
-package io.deephaven.web.client.api;
-
-import elemental2.dom.CustomEvent;
-import elemental2.dom.Event;
-import jsinterop.annotations.JsFunction;
-
-/**
- */
-@JsFunction
-public interface EventFn<T> {
-    void onEvent(CustomEvent<T> e);
-}
diff --git a/web/client-api/src/main/java/io/deephaven/web/client/api/Format.java b/web/client-api/src/main/java/io/deephaven/web/client/api/Format.java
index 747a3402b39..2aea9065a9c 100644
--- a/web/client-api/src/main/java/io/deephaven/web/client/api/Format.java
+++ b/web/client-api/src/main/java/io/deephaven/web/client/api/Format.java
@@ -10,12 +10,16 @@
 import jsinterop.annotations.JsNullable;
 import jsinterop.annotations.JsProperty;
 
+import java.util.Objects;
+
 /**
  * This object may be pooled internally or discarded and not updated. Do not retain references to it.
  */
 @TsInterface
 @TsName(namespace = "dh")
-public class Format {
+public final class Format {
+    public static final Format EMPTY = new Format(0, 0, null, null);
+
     private final long cellColors;
     private final long rowColors;
 
@@ -23,8 +27,8 @@ public class Format {
     private final String formatString;
 
     public Format(long cellColors, long rowColors, String numberFormat, String formatString) {
-        this.cellColors = cellColors;
-        this.rowColors = rowColors;
+        this.cellColors = cellColors == Long.MIN_VALUE ? 0 : cellColors;
+        this.rowColors = rowColors == Long.MIN_VALUE ? 0 : rowColors;
         this.numberFormat = numberFormat;
         this.formatString = formatString;
     }
@@ -103,4 +107,30 @@ public String getFormatString() {
         return formatString;
     }
 
+    @Override
+    public boolean equals(Object o) {
+        if (this == o)
+            return true;
+        if (o == null || getClass() != o.getClass())
+            return false;
+        Format format = (Format) o;
+        return cellColors == format.cellColors && rowColors == format.rowColors
+                && Objects.equals(numberFormat, format.numberFormat)
+                && Objects.equals(formatString, format.formatString);
+    }
+
+    @Override
+    public int hashCode() {
+        return Objects.hash(cellColors, rowColors, numberFormat, formatString);
+    }
+
+    @Override
+    public String toString() {
+        return "Format{" +
+                "cellColors=" + cellColors +
+                ", rowColors=" + rowColors +
+                ", numberFormat='" + numberFormat + '\'' +
+                ", formatString='" + formatString + '\'' +
+                '}';
+    }
 }
diff --git a/web/client-api/src/main/java/io/deephaven/web/client/api/JsColumnStatistics.java b/web/client-api/src/main/java/io/deephaven/web/client/api/JsColumnStatistics.java
index 7b117047e80..05f1a4f6b15 100644
--- a/web/client-api/src/main/java/io/deephaven/web/client/api/JsColumnStatistics.java
+++ b/web/client-api/src/main/java/io/deephaven/web/client/api/JsColumnStatistics.java
@@ -8,7 +8,6 @@
 import com.vertispan.tsdefs.annotations.TsName;
 import elemental2.core.JsArray;
 import elemental2.core.JsMap;
-import io.deephaven.web.shared.data.ColumnStatistics;
 import jsinterop.annotations.JsIgnore;
 import jsinterop.annotations.JsMethod;
 import jsinterop.annotations.JsProperty;
@@ -18,8 +17,7 @@
 import java.util.Map;
 
 /**
- * Javascript wrapper for {@link ColumnStatistics} This class holds the results of a call to generate statistics on a
- * table column.
+ * Represents statistics for a given table column.
  */
 @TsInterface
 @TsName(name = "ColumnStatistics", namespace = "dh")
@@ -38,7 +36,7 @@ public enum StatType {
         /**
          * The number of unique values in the column.
          */
-        UNIQUE_VALUES("UNIQUE VALUES", "long"),
+        UNIQUE_VALUES("UNIQUE VALUES", "int"),
         /**
          * The sum of all data in the column.
          */
diff --git a/web/client-api/src/main/java/io/deephaven/web/client/api/JsPartitionedTable.java b/web/client-api/src/main/java/io/deephaven/web/client/api/JsPartitionedTable.java
index 38a184716a6..a46a8152802 100644
--- a/web/client-api/src/main/java/io/deephaven/web/client/api/JsPartitionedTable.java
+++ b/web/client-api/src/main/java/io/deephaven/web/client/api/JsPartitionedTable.java
@@ -6,18 +6,16 @@
 import elemental2.core.JsArray;
 import elemental2.core.JsObject;
 import elemental2.core.JsSet;
-import elemental2.dom.CustomEvent;
-import elemental2.dom.CustomEventInit;
-import elemental2.dom.Event;
 import elemental2.promise.Promise;
 import io.deephaven.javascript.proto.dhinternal.io.deephaven.proto.partitionedtable_pb.GetTableRequest;
 import io.deephaven.javascript.proto.dhinternal.io.deephaven.proto.partitionedtable_pb.MergeRequest;
 import io.deephaven.javascript.proto.dhinternal.io.deephaven.proto.partitionedtable_pb.PartitionedTableDescriptor;
-import io.deephaven.javascript.proto.dhinternal.io.deephaven.proto.table_pb.DropColumnsRequest;
+import io.deephaven.javascript.proto.dhinternal.io.deephaven.proto.table_pb.SelectOrUpdateRequest;
 import io.deephaven.javascript.proto.dhinternal.io.deephaven.proto.ticket_pb.TypedTicket;
 import io.deephaven.web.client.api.barrage.WebBarrageUtils;
 import io.deephaven.web.client.api.barrage.def.ColumnDefinition;
 import io.deephaven.web.client.api.barrage.def.InitialTableDefinition;
+import io.deephaven.web.client.api.event.Event;
 import io.deephaven.web.client.api.lifecycle.HasLifecycle;
 import io.deephaven.web.client.api.subscription.SubscriptionTableData;
 import io.deephaven.web.client.api.subscription.TableSubscription;
@@ -26,7 +24,6 @@
 import io.deephaven.web.client.state.ClientTableState;
 import io.deephaven.web.shared.data.RangeSet;
 import jsinterop.annotations.JsIgnore;
-import jsinterop.annotations.JsMethod;
 import jsinterop.annotations.JsNullable;
 import jsinterop.annotations.JsProperty;
 import jsinterop.annotations.JsType;
@@ -56,7 +53,8 @@ public class JsPartitionedTable extends HasLifecycle implements ServerObject {
     private final JsWidget widget;
     private List<String> keyColumnTypes;
     private PartitionedTableDescriptor descriptor;
-    private JsTable keys;
+    private Promise<JsTable> keys;
+    private JsTable baseTable;
     private TableSubscription subscription;
 
     private final Set<List<Object>> knownKeys = new HashSet<>();
@@ -80,94 +78,75 @@ public Promise<JsPartitionedTable> refetch() {
             descriptor = PartitionedTableDescriptor.deserializeBinary(w.getDataAsU8());
 
             return w.getExportedObjects()[0].fetch();
-        }).then(result -> connection.newState((c, state, metadata) -> {
-            JsTable keyTable = (JsTable) result;
-            DropColumnsRequest drop = new DropColumnsRequest();
-            drop.setColumnNamesList(new String[] {descriptor.getConstituentColumnName()});
-            drop.setSourceId(keyTable.state().getHandle().makeTableReference());
-            drop.setResultId(state.getHandle().makeTicket());
-            connection.tableServiceClient().dropColumns(drop, metadata, (fail, success) -> {
-                keyTable.close();
-                c.apply(fail, success);
-            });
-        }, "drop constituent column")
-                .refetch(this, connection.metadata())
-                .then(state -> Promise.resolve(new JsTable(connection, state)))).then(result -> {
-                    keys = result;
-
-                    keyColumnTypes = new ArrayList<>();
-                    InitialTableDefinition tableDefinition = WebBarrageUtils.readTableDefinition(
-                            WebBarrageUtils.readSchemaMessage(descriptor.getConstituentDefinitionSchema_asU8()));
-                    ColumnDefinition[] columnDefinitions = tableDefinition.getColumns();
-                    Column[] columns = new Column[0];
-                    for (int i = 0; i < columnDefinitions.length; i++) {
-                        ColumnDefinition columnDefinition = columnDefinitions[i];
-                        Column column =
-                                columnDefinition.makeJsColumn(columns.length, tableDefinition.getColumnsByName());
-                        columns[columns.length] = column;
-                    }
-                    Column[] keyColumns = new Column[0];
-                    JsArray<String> keyColumnNames = descriptor.getKeyColumnNamesList();
-                    for (int i = 0; i < keyColumnNames.length; i++) {
-                        String name = keyColumnNames.getAt(i);
-                        Column keyColumn = keys.findColumn(name);
-                        keyColumnTypes.add(keyColumn.getType());
-                        keyColumns[keyColumns.length] = keyColumn;
-                    }
-                    this.columns = JsObject.freeze(columns);
-                    this.keyColumns = JsObject.freeze(keyColumns);
-
-                    // TODO(deephaven-core#3604) in case of a new session, we should do a full refetch
-                    keys.addEventListener(JsTable.EVENT_DISCONNECT, event -> fireEvent(EVENT_DISCONNECT));
-                    keys.addEventListener(JsTable.EVENT_RECONNECT, event -> {
-                        subscribeToKeys().then(ignore -> {
-                            unsuppressEvents();
-                            fireEvent(EVENT_RECONNECT);
-                            return null;
-                        }, failure -> {
-                            CustomEventInit<Object> init = CustomEventInit.create();
-                            init.setDetail(failure);
-                            unsuppressEvents();
-                            fireEvent(EVENT_RECONNECTFAILED, init);
-                            suppressEvents();
-                            return null;
-                        });
-                    });
-                    return subscribeToKeys();
+        }).then(result -> {
+            baseTable = (JsTable) result;
+            keyColumnTypes = new ArrayList<>();
+            InitialTableDefinition tableDefinition = WebBarrageUtils.readTableDefinition(
+                    WebBarrageUtils.readSchemaMessage(descriptor.getConstituentDefinitionSchema_asU8()));
+            ColumnDefinition[] columnDefinitions = tableDefinition.getColumns();
+            Column[] columns = new Column[0];
+            for (int i = 0; i < columnDefinitions.length; i++) {
+                ColumnDefinition columnDefinition = columnDefinitions[i];
+                Column column =
+                        columnDefinition.makeJsColumn(columns.length, tableDefinition.getColumnsByName());
+                columns[columns.length] = column;
+            }
+            Column[] keyColumns = new Column[0];
+            JsArray<String> keyColumnNames = descriptor.getKeyColumnNamesList();
+            for (int i = 0; i < keyColumnNames.length; i++) {
+                String name = keyColumnNames.getAt(i);
+                Column keyColumn = baseTable.findColumn(name);
+                keyColumnTypes.add(keyColumn.getType());
+                keyColumns[keyColumns.length] = keyColumn;
+            }
+            this.columns = JsObject.freeze(columns);
+            this.keyColumns = JsObject.freeze(keyColumns);
+
+            // TODO(deephaven-core#3604) in case of a new session, we should do a full refetch
+            baseTable.addEventListener(JsTable.EVENT_DISCONNECT, event -> fireEvent(EVENT_DISCONNECT));
+            baseTable.addEventListener(JsTable.EVENT_RECONNECT, event -> {
+                subscribeToBaseTable().then(ignore -> {
+                    unsuppressEvents();
+                    fireEvent(EVENT_RECONNECT);
+                    return null;
+                }, failure -> {
+                    unsuppressEvents();
+                    fireEvent(EVENT_RECONNECTFAILED, failure);
+                    suppressEvents();
+                    return null;
                 });
+            });
+            return subscribeToBaseTable();
+        });
     }
 
+    @JsIgnore
     @Override
     public TypedTicket typedTicket() {
         return widget.typedTicket();
     }
 
-    private Promise<JsPartitionedTable> subscribeToKeys() {
-        subscription = keys.subscribe(
-                JsArray.asJsArray(keys.findColumns(descriptor.getKeyColumnNamesList().asArray(new String[0]))));
+    private Promise<JsPartitionedTable> subscribeToBaseTable() {
+        subscription = baseTable.subscribe(
+                JsArray.asJsArray(baseTable.findColumns(descriptor.getKeyColumnNamesList().asArray(new String[0]))));
         subscription.addEventListener(TableSubscription.EVENT_UPDATED, this::handleKeys);
 
         LazyPromise<JsPartitionedTable> promise = new LazyPromise<>();
         subscription.addEventListenerOneShot(TableSubscription.EVENT_UPDATED, data -> promise.succeed(this));
-        keys.addEventListener(JsTable.EVENT_DISCONNECT, e -> promise.fail("Underlying table disconnected"));
+        baseTable.addEventListener(JsTable.EVENT_DISCONNECT, e -> promise.fail("Underlying table disconnected"));
         return promise.asPromise();
     }
 
-    private void handleKeys(Event update) {
-        // noinspection unchecked
-        CustomEvent<SubscriptionTableData.UpdateEventData> event =
-                (CustomEvent<SubscriptionTableData.UpdateEventData>) update;
+    private void handleKeys(Event<SubscriptionTableData> update) {
 
         // We're only interested in added rows, send an event indicating the new keys that are available
-        SubscriptionTableData.UpdateEventData eventData = event.detail;
+        SubscriptionTableData eventData = update.getDetail();
         RangeSet added = eventData.getAdded().getRange();
         added.indexIterator().forEachRemaining((long index) -> {
             // extract the key to use
             JsArray<Object> key = eventData.getColumns().map((c, p1) -> eventData.getData(index, c));
             knownKeys.add(key.asList());
-            CustomEventInit<JsArray<Object>> init = CustomEventInit.create();
-            init.setDetail(key);
-            fireEvent(EVENT_KEYADDED, init);
+            fireEvent(EVENT_KEYADDED, key);
         });
     }
 
@@ -283,15 +262,41 @@ public Column[] getColumns() {
      *
      * @return Promise of a Table
      */
-    @JsMethod
+    @Deprecated
     public Promise<JsTable> getKeyTable() {
-        return keys.copy();
+        if (keys == null) {
+            keys = connection.newState((c, state, metadata) -> {
+                SelectOrUpdateRequest view = new SelectOrUpdateRequest();
+                view.setSourceId(baseTable.state().getHandle().makeTableReference());
+                view.setResultId(state.getHandle().makeTicket());
+                view.setColumnSpecsList(descriptor.getKeyColumnNamesList());
+                connection.tableServiceClient().view(view, metadata, c::apply);
+            }, "view only key columns")
+                    .refetch(this, connection.metadata())
+                    .then(state -> Promise.resolve(new JsTable(state.getConnection(), state)));
+        }
+        return keys.then(JsTable::copy);
+    }
+
+    /**
+     * Fetch the underlying base table of the partitioned table.
+     *
+     * @return Promise of a Table
+     */
+    public Promise<JsTable> getBaseTable() {
+        return baseTable.copy();
     }
 
     /** Close any subscriptions to underlying tables or key tables */
     private void closeSubscriptions() {
+        if (baseTable != null) {
+            baseTable.close();
+        }
         if (keys != null) {
-            keys.close();
+            keys.then(table -> {
+                table.close();
+                return Promise.resolve(table);
+            });
         }
         if (subscription != null) {
             subscription.close();
diff --git a/web/client-api/src/main/java/io/deephaven/web/client/api/JsRangeSet.java b/web/client-api/src/main/java/io/deephaven/web/client/api/JsRangeSet.java
index 50e09604c73..85872589483 100644
--- a/web/client-api/src/main/java/io/deephaven/web/client/api/JsRangeSet.java
+++ b/web/client-api/src/main/java/io/deephaven/web/client/api/JsRangeSet.java
@@ -24,6 +24,9 @@ public class JsRangeSet {
     private final RangeSet range;
 
     public static JsRangeSet ofRange(double first, double last) {
+        if (first > last) {
+            throw new IllegalStateException(first + " > " + last);
+        }
         return new JsRangeSet(RangeSet.ofRange((long) first, (long) last));
     }
 
diff --git a/web/client-api/src/main/java/io/deephaven/web/client/api/JsTable.java b/web/client-api/src/main/java/io/deephaven/web/client/api/JsTable.java
index 4e380631ad7..9fb9e1c6c30 100644
--- a/web/client-api/src/main/java/io/deephaven/web/client/api/JsTable.java
+++ b/web/client-api/src/main/java/io/deephaven/web/client/api/JsTable.java
@@ -8,8 +8,6 @@
 import com.vertispan.tsdefs.annotations.TsUnion;
 import com.vertispan.tsdefs.annotations.TsUnionMember;
 import elemental2.core.JsArray;
-import elemental2.dom.CustomEventInit;
-import elemental2.dom.DomGlobal;
 import elemental2.promise.IThenable.ThenOnFulfilledCallbackFn;
 import elemental2.promise.Promise;
 import io.deephaven.javascript.proto.dhinternal.io.deephaven.proto.hierarchicaltable_pb.RollupRequest;
@@ -38,27 +36,22 @@
 import io.deephaven.javascript.proto.dhinternal.io.deephaven.proto.table_pb.runchartdownsamplerequest.ZoomRange;
 import io.deephaven.javascript.proto.dhinternal.io.deephaven.proto.ticket_pb.Ticket;
 import io.deephaven.javascript.proto.dhinternal.io.deephaven.proto.ticket_pb.TypedTicket;
-import io.deephaven.web.client.api.barrage.def.ColumnDefinition;
 import io.deephaven.web.client.api.barrage.def.TableAttributesDefinition;
 import io.deephaven.web.client.api.barrage.stream.ResponseStreamWrapper;
 import io.deephaven.web.client.api.batch.RequestBatcher;
-import io.deephaven.web.client.api.batch.TableConfig;
 import io.deephaven.web.client.api.console.JsVariableType;
 import io.deephaven.web.client.api.filter.FilterCondition;
-import io.deephaven.web.client.api.filter.FilterValue;
 import io.deephaven.web.client.api.input.JsInputTable;
 import io.deephaven.web.client.api.lifecycle.HasLifecycle;
 import io.deephaven.web.client.api.state.StateCache;
+import io.deephaven.web.client.api.subscription.AbstractTableSubscription;
 import io.deephaven.web.client.api.subscription.TableSubscription;
 import io.deephaven.web.client.api.subscription.TableViewportSubscription;
 import io.deephaven.web.client.api.subscription.ViewportData;
-import io.deephaven.web.client.api.subscription.ViewportData.MergeResults;
-import io.deephaven.web.client.api.subscription.ViewportRow;
 import io.deephaven.web.client.api.tree.JsRollupConfig;
 import io.deephaven.web.client.api.tree.JsTreeTable;
 import io.deephaven.web.client.api.tree.JsTreeTableConfig;
 import io.deephaven.web.client.api.widget.JsWidget;
-import io.deephaven.web.client.fu.JsData;
 import io.deephaven.web.client.fu.JsItr;
 import io.deephaven.web.client.fu.JsLog;
 import io.deephaven.web.client.fu.LazyPromise;
@@ -66,14 +59,11 @@
 import io.deephaven.web.client.state.ClientTableState;
 import io.deephaven.web.client.state.HasTableBinding;
 import io.deephaven.web.shared.data.*;
-import io.deephaven.web.shared.data.TableSnapshot.SnapshotType;
-import io.deephaven.web.shared.data.columns.ColumnData;
 import io.deephaven.web.shared.fu.JsConsumer;
 import io.deephaven.web.shared.fu.JsProvider;
 import io.deephaven.web.shared.fu.JsRunnable;
 import io.deephaven.web.shared.fu.RemoverFn;
 import javaemul.internal.annotations.DoNotAutobox;
-import jsinterop.annotations.JsIgnore;
 import jsinterop.annotations.JsMethod;
 import jsinterop.annotations.JsNullable;
 import jsinterop.annotations.JsOptional;
@@ -88,7 +78,6 @@
 import java.util.*;
 import java.util.stream.Stream;
 
-import static io.deephaven.web.client.api.subscription.ViewportData.NO_ROW_FORMAT_COLUMN;
 import static io.deephaven.web.client.fu.LazyPromise.logError;
 
 /**
@@ -98,10 +87,10 @@
  */
 @TsName(namespace = "dh", name = "Table")
 public class JsTable extends HasLifecycle implements HasTableBinding, JoinableTable, ServerObject {
-    @JsProperty(namespace = "dh.Table")
     /**
      * The table size has updated, so live scrollbars and the like can be updated accordingly.
      */
+    @JsProperty(namespace = "dh.Table")
     public static final String EVENT_SIZECHANGED = "sizechanged",
             /**
              * event.detail is the currently visible window, the same as if getViewportData() was called and resolved.
@@ -146,6 +135,9 @@ public class JsTable extends HasLifecycle implements HasTableBinding, JoinableTa
             EVENT_REQUEST_FAILED = "requestfailed",
             EVENT_REQUEST_SUCCEEDED = "requestsucceeded";
 
+    /**
+     * The size the table will have if it is uncoalesced.
+     */
     @JsProperty(namespace = "dh.Table")
     public static final double SIZE_UNCOALESCED = -2;
 
@@ -155,15 +147,11 @@ public class JsTable extends HasLifecycle implements HasTableBinding, JoinableTa
             // change in some table data
             INTERNAL_EVENT_SIZELISTENER = "sizelistener-internal";
 
-    // Amount of debounce to use when eating snapshot events.
-    public static final int DEBOUNCE_TIME = 20;
     public static final int MAX_BATCH_TIME = 600_000;
 
     private final WorkerConnection workerConnection;
 
-    private Map<TableTicket, TableViewportSubscription> subscriptions = new HashMap<>();
-    @Deprecated // TODO refactor this inside of the viewportSubscription type
-    private ViewportData currentViewportData;
+    private final Map<TableTicket, TableViewportSubscription> subscriptions = new HashMap<>();
 
     private ClientTableState lastVisibleState;
 
@@ -181,7 +169,6 @@ public class JsTable extends HasLifecycle implements HasTableBinding, JoinableTa
 
     private final int subscriptionId;
     private static int nextSubscriptionId;
-    private TableSubscription nonViewportSub;
 
     /**
      * Creates a new Table directly from an existing ClientTableState. The CTS manages all fetch operations, so this is
@@ -312,7 +299,9 @@ public boolean isAlive() {
 
     @Override
     public ClientTableState state() {
-        assert currentState != null : "Table already closed, cannot be used again";
+        if (currentState == null) {
+            throw new IllegalStateException("Table already closed, cannot be used again");
+        }
         return currentState;
     }
 
@@ -451,22 +440,26 @@ public JsLayoutHints getLayoutHints() {
     }
 
     /**
-     * The total count of rows in the table. The size can and will change; see the <b>sizechanged</b> event for details.
-     * Size will be negative in exceptional cases (e.g., the table is uncoalesced; see the <b>isUncoalesced</b>
-     * property). for details).
-     * 
-     * @return double
+     * The total count of rows in the table. If there is a viewport subscription active, this size will be updated when
+     * the subscription updates. If not, and {@link #isUncoalesced()} is true, the size will be
+     * {@link #SIZE_UNCOALESCED}. Otherwise, the size will be updated when the server's update graph processes changes.
+     * <p>
+     * When the size changes, the {@link #EVENT_SIZECHANGED} event will be fired.
+     *
+     * @return the size of the table, or {@link #SIZE_UNCOALESCED} if there is no subscription and the table is
+     *         uncoalesced.
      */
     @JsProperty
     public double getSize() {
         TableViewportSubscription subscription = subscriptions.get(getHandle());
-        if (subscription != null && subscription.getStatus() == TableViewportSubscription.Status.ACTIVE) {
+        if (subscription != null && subscription.hasValidSize()) {
             // only ask the viewport for the size if it is alive and ticking
             return subscription.size();
         }
         if (isUncoalesced()) {
             return JsTable.SIZE_UNCOALESCED;
         }
+        // Only return the size from ETUM if we have no other choice
         return size;
     }
 
@@ -477,19 +470,17 @@ public String getDescription() {
     }
 
     /**
-     * The total count of the rows in the table, excluding any filters. Unlike <b>size</b>, changes to this value will
-     * not result in any event. <b>Sort[] sort</b> an ordered list of Sorts to apply to the table. To update, call
-     * applySort(). Note that this getter will return the new value immediately, even though it may take a little time
-     * to update on the server. You may listen for the <b>sortchanged</b> event to know when to update the UI.
+     * The total count of the rows in the table, excluding any filters. Unlike {@link #getSize()}, changes to this value
+     * will not result in any event. If the table is unfiltered, this will return the same size as {@link #getSize()}.
+     * If this table was uncoalesced before it was filtered, this will return {@link #SIZE_UNCOALESCED}.
      * 
-     * @return double
+     * @return the size of the table before filters, or {@link #SIZE_UNCOALESCED}
      */
     @JsProperty
     public double getTotalSize() {
-        TableViewportSubscription subscription = subscriptions.get(getHandle());
-        if (subscription != null && subscription.getStatus() == TableViewportSubscription.Status.ACTIVE) {
-            // only ask the viewport for the size if it is alive and ticking
-            return subscription.totalSize();
+        if (state().getFilters().isEmpty()) {
+            // If there are no filters, use the subscription size (if any)
+            return getSize();
         }
         return getHeadState().getSize();
     }
@@ -683,14 +674,14 @@ public JsArray<CustomColumn> getCustomColumns() {
      * Overload for Java (since JS just omits the optional params)
      */
     public TableViewportSubscription setViewport(double firstRow, double lastRow) {
-        return setViewport(firstRow, lastRow, null, null);
+        return setViewport(firstRow, lastRow, null, null, null);
     }
 
     /**
      * Overload for Java (since JS just omits the optional param)
      */
     public TableViewportSubscription setViewport(double firstRow, double lastRow, JsArray<Column> columns) {
-        return setViewport(firstRow, lastRow, columns, null);
+        return setViewport(firstRow, lastRow, columns, null, null);
     }
 
     /**
@@ -709,13 +700,14 @@ public TableViewportSubscription setViewport(double firstRow, double lastRow, Js
     @JsMethod
     public TableViewportSubscription setViewport(double firstRow, double lastRow,
             @JsOptional @JsNullable JsArray<Column> columns,
-            @JsOptional @JsNullable Double updateIntervalMs) {
-        Column[] columnsCopy = columns != null ? Js.uncheckedCast(columns.slice()) : null;
+            @JsOptional @JsNullable Double updateIntervalMs,
+            @JsOptional @JsNullable Boolean isReverseViewport) {
+        Column[] columnsCopy = columns != null ? Js.uncheckedCast(columns.slice()) : state().getColumns();
         ClientTableState currentState = state();
         TableViewportSubscription activeSubscription = subscriptions.get(getHandle());
-        if (activeSubscription != null && activeSubscription.getStatus() != TableViewportSubscription.Status.DONE) {
+        if (activeSubscription != null && !activeSubscription.isClosed()) {
             // hasn't finished, lets reuse it
-            activeSubscription.setInternalViewport(firstRow, lastRow, columnsCopy, updateIntervalMs);
+            activeSubscription.setInternalViewport(firstRow, lastRow, columnsCopy, updateIntervalMs, isReverseViewport);
             return activeSubscription;
         } else {
             // In the past, we left the old sub going until the new one was ready, then started the new one. But now,
@@ -727,35 +719,23 @@ public TableViewportSubscription setViewport(double firstRow, double lastRow,
 
             // rewrap current state in a new one, when ready the viewport will be applied
             TableViewportSubscription replacement =
-                    new TableViewportSubscription(firstRow, lastRow, columnsCopy, updateIntervalMs, this);
+                    TableViewportSubscription.make(firstRow, lastRow, columnsCopy, updateIntervalMs, this);
 
             subscriptions.put(currentState.getHandle(), replacement);
             return replacement;
         }
     }
 
-    public void setInternalViewport(double firstRow, double lastRow, Column[] columns) {
-        if (firstRow > lastRow) {
-            throw new IllegalArgumentException(firstRow + " > " + lastRow);
-        }
-        if (firstRow < 0) {
-            throw new IllegalArgumentException(firstRow + " < " + 0);
-        }
-        currentViewportData = null;
-        // we must wait for the latest stack entry that can add columns (so we get an appropriate BitSet)
-        state().setDesiredViewport(this, (long) firstRow, (long) lastRow, columns);
-    }
-
     /**
      * Gets the currently visible viewport. If the current set of operations has not yet resulted in data, it will not
      * resolve until that data is ready. If this table is closed before the promise resolves, it will be rejected - to
      * separate the lifespan of this promise from the table itself, call
      * {@link TableViewportSubscription#getViewportData()} on the result from {@link #setViewport(double, double)}.
-     * 
+     *
      * @return Promise of {@link TableData}
      */
     @JsMethod
-    public Promise<TableData> getViewportData() {
+    public Promise<AbstractTableSubscription.@TsTypeRef(ViewportData.class) UpdateEventData> getViewportData() {
         TableViewportSubscription subscription = subscriptions.get(getHandle());
         if (subscription == null) {
             return Promise.reject("No viewport currently set");
@@ -763,20 +743,6 @@ public Promise<TableData> getViewportData() {
         return subscription.getInternalViewportData();
     }
 
-    public Promise<TableData> getInternalViewportData() {
-        final LazyPromise<TableData> promise = new LazyPromise<>();
-        final ClientTableState active = state();
-        active.onRunning(state -> {
-            if (currentViewportData == null) {
-                // no viewport data received yet; let's set up a one-shot UPDATED event listener
-                addEventListenerOneShot(EVENT_UPDATED, ignored -> promise.succeed(currentViewportData));
-            } else {
-                promise.succeed(currentViewportData);
-            }
-        }, promise::fail, () -> promise.fail("Table closed before viewport data was read"));
-        return promise.asPromise(MAX_BATCH_TIME);
-    }
-
     /**
      * Overload for java (since js just omits the optional var)
      */
@@ -798,20 +764,9 @@ public TableSubscription subscribe(JsArray<Column> columns) {
      */
     @JsMethod
     public TableSubscription subscribe(JsArray<Column> columns, @JsOptional Double updateIntervalMs) {
-        assert nonViewportSub == null : "Can't directly subscribe to the 'private' table instance";
-        // make a new table with a pUT call, listen to the subscription there
         return new TableSubscription(columns, this, updateIntervalMs);
     }
 
-    public void internalSubscribe(JsArray<Column> columns, TableSubscription sub) {
-        if (columns == null) {
-            columns = getColumns();
-        }
-        this.nonViewportSub = sub;
-
-        state().subscribe(this, Js.uncheckedCast(columns));
-    }
-
     /**
      * a new table containing the distinct tuples of values from the given columns that are present in the original
      * table. This table can be manipulated as any other table. Sorting is often desired as the default sort is the
@@ -1389,32 +1344,6 @@ public Promise<JsColumnStatistics> getColumnStatistics(Column column) {
         }, "get column statistics")
                 .refetch(this, workerConnection.metadata())
                 .then(state -> {
-                    // TODO (deephaven-core#188) don't drop these columns once we can decode them
-                    JsArray<String> dropCols = new JsArray<>();
-                    if (Arrays.stream(state.getColumns()).anyMatch(c -> c.getName().equals("UNIQUE_KEYS"))) {
-                        dropCols.push("UNIQUE_KEYS");
-                    }
-                    if (Arrays.stream(state.getColumns()).anyMatch(c -> c.getName().equals("UNIQUE_COUNTS"))) {
-                        dropCols.push("UNIQUE_COUNTS");
-                    }
-
-                    if (dropCols.length > 0) {
-                        toRelease.add(() -> workerConnection.releaseHandle(state.getHandle()));
-                        return workerConnection.newState((c2, state2, metadata2) -> {
-                            DropColumnsRequest drop = new DropColumnsRequest();
-                            drop.setColumnNamesList(dropCols);
-                            drop.setSourceId(state.getHandle().makeTableReference());
-                            drop.setResultId(state2.getHandle().makeTicket());
-                            workerConnection.tableServiceClient().dropColumns(drop, metadata2, c2::apply);
-                        }, "drop unreadable stats columns")
-                                .refetch(this, workerConnection.metadata())
-                                .then(state2 -> {
-                                    JsTable table = new JsTable(workerConnection, state2);
-                                    toRelease.add(table::close);
-                                    table.setViewport(0, 0);
-                                    return table.getViewportData();
-                                });
-                    }
                     JsTable table = new JsTable(workerConnection, state);
                     toRelease.add(table::close);
                     table.setViewport(0, 0);
@@ -1512,7 +1441,6 @@ public void revive(ClientTableState state) {
             unsuppressEvents();
             LazyPromise.runLater(() -> {
                 fireEvent(EVENT_RECONNECT);
-                getBinding().maybeReviveSubscription();
             });
         }
     }
@@ -1550,205 +1478,6 @@ public Promise<JsTable> downsample(LongWrapper[] zoomRange, int pixelCount, Stri
                 .then(state -> Promise.resolve(new JsTable(workerConnection, state)));
     }
 
-    private final class Debounce {
-        private final ClientTableState state;
-        private final TableTicket handle;
-        private final SnapshotType type;
-        private final RangeSet includedRows;
-        private final BitSet columns;
-        private final Object[] dataColumns;
-        private final double timestamp;
-        private final long maxRows;
-
-        public Debounce(
-                TableTicket table,
-                SnapshotType snapshotType,
-                RangeSet includedRows,
-                BitSet columns,
-                Object[] dataColumns,
-                long maxRows) {
-            this.handle = table;
-            this.type = snapshotType;
-            this.includedRows = includedRows;
-            this.columns = columns;
-            this.dataColumns = dataColumns;
-            this.state = currentState;
-            this.maxRows = maxRows;
-            timestamp = System.currentTimeMillis();
-        }
-
-        public boolean isEqual(Debounce o) {
-            if (type == o.type) {
-                // this is intentionally weird. We only want to debounce when one instance is column snapshot and the
-                // other is row snapshot,
-                // so we consider two events of the same type to be incompatible with debouncing.
-                return false;
-            }
-            if (handle != o.handle) {
-                assert !handle.equals(o.handle);
-                return false;
-            }
-            if (state != o.state) {
-                assert state.getHandle() != o.state.getHandle();
-                return false;
-            }
-            if (!includedRows.equals(o.includedRows)) {
-                return false;
-            }
-            if (!columns.equals(o.columns)) {
-                return false;
-            }
-            if (maxRows != o.maxRows) {
-                return false;
-            }
-            assert Arrays.deepEquals(dataColumns, o.dataColumns) : "Debounce is broken, remove it.";
-            return true;
-        }
-    }
-
-    private Debounce debounce;
-
-    private void handleSnapshot(TableTicket table, SnapshotType snapshotType, RangeSet includedRows,
-            Object[] dataColumns, BitSet columns, long maxRows) {
-        assert table.equals(state().getHandle()) : "Table received incorrect snapshot";
-        // if the type is initial_snapshot, we've already recorded the size, so only watch for the other two updates.
-        // note that this will sometimes result in multiple updates on startup, so we do this ugly debounce-dance.
-        // When IDS-2113 is fixed, we can likely remove this code.
-        JsLog.debug("Received snapshot for ", table, snapshotType, includedRows, dataColumns, columns);
-        Debounce operation = new Debounce(table, snapshotType, includedRows, columns, dataColumns, maxRows);
-        if (debounce == null) {
-            debounce = operation;
-            DomGlobal.setTimeout(ignored -> processSnapshot(), DEBOUNCE_TIME);
-        } else if (debounce.isEqual(operation)) {
-            // If we think the problem is fixed, we can put `assert false` here for a while before deleting Debounce
-            // class
-            JsLog.debug("Eating duplicated operation", debounce, operation);
-        } else {
-            processSnapshot();
-            debounce = operation;
-            DomGlobal.setTimeout(ignored -> processSnapshot(), DEBOUNCE_TIME);
-        }
-    }
-
-    public void handleSnapshot(TableTicket handle, TableSnapshot snapshot) {
-        if (!handle.equals(state().getHandle())) {
-            return;
-        }
-        Viewport viewport = getBinding().getSubscription();
-        if (viewport == null || viewport.getRows() == null || viewport.getRows().size() == 0) {
-            // check out if we have a non-viewport sub attached
-            if (nonViewportSub != null) {
-                nonViewportSub.handleSnapshot(snapshot);
-            }
-            return;
-        }
-
-        RangeSet viewportRows = viewport.getRows();
-        JsLog.debug("handleSnapshot on " + viewportRows, handle, snapshot, viewport);
-
-        RangeSet includedRows = snapshot.getIncludedRows();
-        ColumnData[] dataColumns = snapshot.getDataColumns();
-        JsArray[] remappedData = new JsArray[dataColumns.length];
-        // remap dataColumns to the expected range for that table's viewport
-        long lastRow = -1;
-        for (int col = viewport.getColumns().nextSetBit(0); col >= 0; col = viewport.getColumns().nextSetBit(col + 1)) {
-            ColumnData dataColumn = dataColumns[col];
-            if (dataColumn == null) {
-                // skip this, at least one column requested by that table isn't present, waiting on a later update
-                // TODO when IDS-2138 is fixed stop throwing this data away
-                return;
-            }
-            Object columnData = dataColumn.getData();
-
-            final ColumnDefinition def = state().getTableDef().getColumns()[col];
-            remappedData[col] = JsData.newArray(def.getType());
-
-            PrimitiveIterator.OfLong viewportIterator = viewportRows.indexIterator();
-            PrimitiveIterator.OfLong includedRowsIterator = includedRows.indexIterator();
-            int dataIndex = 0;
-            while (viewportIterator.hasNext()) {
-                long viewportIndex = viewportIterator.nextLong();
-                if (viewportIndex >= snapshot.getTableSize()) {
-                    // reached or passed the end of the table, we'll still make a snapshot
-                    break;
-                }
-                if (!includedRowsIterator.hasNext()) {
-                    // we've reached the end, the viewport apparently goes past the end of what the server sent,
-                    // so there is another snapshot on its way
-                    // TODO when IDS-2138 is fixed stop throwing this data away
-                    return;
-                }
-
-                long possibleMatch = includedRowsIterator.nextLong();
-                while (includedRowsIterator.hasNext() && possibleMatch < viewportIndex) {
-                    dataIndex++;// skip, still seeking to the next item
-
-                    possibleMatch = includedRowsIterator.nextLong();
-                }
-                if (!includedRowsIterator.hasNext() && possibleMatch < viewportIndex) {
-                    // we didn't find any items which match, just give up
-                    return;
-                }
-
-                if (possibleMatch > viewportIndex) {
-                    // if we hit a gap (more data coming, doesn't match viewport), skip the
-                    // rest of this table entirely, a later update will get us caught up
-                    return;
-                }
-                Object data = Js.<JsArray<Object>>uncheckedCast(columnData).getAt(dataIndex);
-                remappedData[col].push(data);
-                dataIndex++;// increment for the next row
-
-                // Track how many rows were actually present, allowing the snapshot to stop before the viewport's end
-                lastRow = Math.max(lastRow, possibleMatch);
-            }
-        }
-
-        // TODO correct this - assumes max one range per table viewport, and nothing skipped
-        RangeSet actualViewport =
-                lastRow == -1 ? RangeSet.empty() : RangeSet.ofRange(viewportRows.indexIterator().nextLong(), lastRow);
-
-        handleSnapshot(handle, snapshot.getSnapshotType(), actualViewport, remappedData, viewport.getColumns(),
-                viewportRows.size());
-    }
-
-    @JsIgnore
-    public void processSnapshot() {
-        try {
-            if (debounce == null) {
-                JsLog.debug("Skipping snapshot b/c debounce is null");
-                return;
-            }
-            if (debounce.state != currentState) {
-                JsLog.debug("Skipping snapshot because state has changed ", debounce.state, " != ", currentState);
-                return;
-            }
-            if (isClosed()) {
-                JsLog.debug("Skipping snapshot because table is closed", this);
-                return;
-            }
-            JsArray<Column> viewportColumns =
-                    getColumns().filter((item, index) -> debounce.columns.get(item.getIndex()));
-            ViewportData data = new ViewportData(debounce.includedRows, debounce.dataColumns, viewportColumns,
-                    currentState.getRowFormatColumn() == null ? NO_ROW_FORMAT_COLUMN
-                            : currentState.getRowFormatColumn().getIndex(),
-                    debounce.maxRows);
-            this.currentViewportData = data;
-            CustomEventInit updatedEvent = CustomEventInit.create();
-            updatedEvent.setDetail(data);
-            fireEvent(EVENT_UPDATED, updatedEvent);
-
-            // also fire rowadded events - TODO also fire some kind of remove event for now-missing rows?
-            for (int i = 0; i < data.getRows().length; i++) {
-                CustomEventInit addedEvent = CustomEventInit.create();
-                addedEvent.setDetail(wrap(data.getRows().getAt(i), i));
-                fireEvent(EVENT_ROWADDED, addedEvent);
-            }
-        } finally {
-            debounce = null;
-        }
-    }
-
     /**
      * True if this table has been closed.
      * 
@@ -1771,11 +1500,15 @@ public boolean isRefreshing() {
     }
 
     /**
-     * Read-only. True if this table is uncoalesced. Set a viewport or filter on the partition columns to coalesce the
-     * table. Check the <b>isPartitionColumn</b> property on the table columns to retrieve the partition columns. Size
-     * will be unavailable until table is coalesced.
-     * 
-     * @return boolean
+     * Read-only. True if this table is uncoalesced, indicating that work must be done before the table can be used.
+     * <p>
+     * Uncoalesced tables are expensive to operate on - filter to a single partition or range of partitions before
+     * subscribing to access only the desired data efficiently. A subscription can be specified without a filter, but
+     * this can be very expensive. To see which partitions are available, check each column on the table to see which
+     * have {@link Column#getIsPartitionColumn()} as {@code true}, and filter those columns. To read the possible values
+     * for those columns, use {@link #selectDistinct(Column[])}.
+     *
+     * @return True if the table is uncoaleced and should be filtered before operating on it, otherwise false.
      */
     @JsProperty(name = "isUncoalesced")
     public boolean isUncoalesced() {
@@ -1788,59 +1521,6 @@ public String getPluginName() {
         return lastVisibleState().getTableDef().getAttributes().getPluginName();
     }
 
-    // Factored out so that we always apply the same format
-    private Object wrap(ViewportRow at, int index) {
-        return JsPropertyMap.of("row", at, "index", (double) index);
-    }
-
-    public void handleDelta(ClientTableState current, DeltaUpdates updates) {
-        current.onRunning(s -> {
-            if (current != state()) {
-                return;
-            }
-            if (nonViewportSub != null) {
-                nonViewportSub.handleDelta(updates);
-                return;
-            }
-            final ViewportData vpd = currentViewportData;
-            if (vpd == null) {
-                // if the current viewport data is null, we're waiting on an initial snapshot to arrive for a different
-                // part of the viewport
-                JsLog.debug("Received delta while waiting for reinitialization");
-                return;
-            }
-            MergeResults mergeResults = vpd.merge(updates);
-            if (mergeResults.added.size() == 0 && mergeResults.modified.size() == 0
-                    && mergeResults.removed.size() == 0) {
-                return;
-            }
-            CustomEventInit event = CustomEventInit.create();
-            event.setDetail(vpd);
-            // user might call setViewport, and wind up nulling our currentViewportData
-            fireEvent(EVENT_UPDATED, event);
-
-            // fire rowadded/rowupdated/rowremoved
-            // TODO when we keep more rows loaded than the user is aware of, check if a given row is actually in the
-            // viewport
-            // here
-            for (Integer index : mergeResults.added) {
-                CustomEventInit addedEvent = CustomEventInit.create();
-                addedEvent.setDetail(wrap(vpd.getRows().getAt(index), index));
-                fireEvent(EVENT_ROWADDED, addedEvent);
-            }
-            for (Integer index : mergeResults.modified) {
-                CustomEventInit addedEvent = CustomEventInit.create();
-                addedEvent.setDetail(wrap(vpd.getRows().getAt(index), index));
-                fireEvent(EVENT_ROWUPDATED, addedEvent);
-            }
-            for (Integer index : mergeResults.removed) {
-                CustomEventInit addedEvent = CustomEventInit.create();
-                addedEvent.setDetail(wrap(vpd.getRows().getAt(index), index));
-                fireEvent(EVENT_ROWREMOVED, addedEvent);
-            }
-        }, JsRunnable.doNothing());
-    }
-
     @Override
     public TableTicket getHandle() {
         return state().getHandle();
@@ -1875,62 +1555,6 @@ public WorkerConnection getConnection() {
         return workerConnection;
     }
 
-    public void refreshViewport(ClientTableState state, Viewport vp) {
-        assert state() == state : "Called refreshViewport with wrong state (" + state + " instead of " + state() + ")";
-        assert state.getResolution() == ClientTableState.ResolutionState.RUNNING
-                : "Do not call refreshViewport for a state that is not running! (" + state + ")";
-
-        currentViewportData = null; // ignore any deltas for past viewports
-        workerConnection.scheduleCheck(state);
-        // now that we've made sure the server knows, if we already know that the viewport is beyond what exists, we
-        // can go ahead and fire an update event. We're in the onResolved call, so we know the handle has resolved
-        // and if size is not -1, then we've already at least gotten the initial snapshot (otherwise, that snapshot
-        // will be here soon, and will fire its own event)
-        if (state.getSize() != ClientTableState.SIZE_UNINITIALIZED && state.getSize() <= vp.getRows().getFirstRow()) {
-            JsLog.debug("Preparing to send a 'fake' update event since " + state.getSize() + "<="
-                    + vp.getRows().getFirstRow(), state);
-            LazyPromise.runLater(() -> {
-                if (state != state()) {
-                    return;
-                }
-
-                // get the column expected to be in the snapshot
-                JsArray<Column> columns = Js.uncheckedCast(getBinding().getColumns());
-                Column[] allColumns = state.getColumns();
-                if (columns == null) {
-                    columns = Js.uncheckedCast(allColumns);
-                }
-                // build an array of empty column data for this snapshot
-                Object[] dataColumns = new Object[allColumns.length];
-
-                for (int i = 0; i < columns.length; i++) {
-                    Column c = columns.getAt(i);
-                    dataColumns[c.getIndex()] = JsData.newArray(c.getType());
-                    if (c.getFormatStringColumnIndex() != null) {
-                        dataColumns[c.getFormatStringColumnIndex()] = JsData.newArray("java.lang.String");
-                    }
-                    if (c.getStyleColumnIndex() != null) {
-                        dataColumns[c.getStyleColumnIndex()] = JsData.newArray("long");
-                    }
-                }
-                if (currentState.getRowFormatColumn() != null) {
-                    dataColumns[currentState.getRowFormatColumn().getIndex()] = JsData.newArray("long");
-                }
-
-                ViewportData data = new ViewportData(RangeSet.empty(), dataColumns, columns,
-                        currentState.getRowFormatColumn() == null ? NO_ROW_FORMAT_COLUMN
-                                : currentState.getRowFormatColumn().getIndex(),
-                        0);
-                this.currentViewportData = data;
-                CustomEventInit updatedEvent = CustomEventInit.create();
-                updatedEvent.setDetail(data);
-                JsLog.debug("Sending 'fake' update event since " + state.getSize() + "<=" + vp.getRows().getFirstRow(),
-                        vp, state);
-                fireEvent(EVENT_UPDATED, updatedEvent);
-            });
-        }
-    }
-
     public boolean isActive(ClientTableState state) {
         return currentState == state;
     }
@@ -1959,8 +1583,7 @@ public void setState(final ClientTableState state) {
                 if (!isClosed() && was != null && was != state()) {
                     // if we held a subscription
                     TableViewportSubscription existingSubscription = subscriptions.remove(was.getHandle());
-                    if (existingSubscription != null
-                            && existingSubscription.getStatus() != TableViewportSubscription.Status.DONE) {
+                    if (existingSubscription != null && !existingSubscription.isClosed()) {
                         JsLog.debug("closing old viewport", state(), existingSubscription.state());
                         // with the replacement state successfully running, we can shut down the old viewport (unless
                         // something external retained it)
@@ -2026,9 +1649,7 @@ public void setState(final ClientTableState state) {
                     });
                 });
             }
-            final CustomEventInit init = CustomEventInit.create();
-            init.setDetail(state);
-            fireEvent(INTERNAL_EVENT_STATECHANGED, init);
+            fireEvent(INTERNAL_EVENT_STATECHANGED, state);
         }
     }
 
@@ -2093,13 +1714,11 @@ public void setSize(double s) {
         this.size = s;
 
         TableViewportSubscription subscription = subscriptions.get(getHandle());
-        if (changed && (subscription == null || subscription.getStatus() == TableViewportSubscription.Status.DONE)) {
+        if (changed && (subscription == null || !subscription.hasValidSize())) {
             // If the size changed, and we have no subscription active, fire. Otherwise, we want to let the
             // subscription itself manage this, so that the size changes are synchronized with data changes,
             // and consumers won't be confused by the table size not matching data.
-            CustomEventInit event = CustomEventInit.create();
-            event.setDetail(s);
-            fireEvent(JsTable.EVENT_SIZECHANGED, event);
+            fireEvent(JsTable.EVENT_SIZECHANGED, s);
         }
         fireEvent(JsTable.INTERNAL_EVENT_SIZELISTENER);
     }
@@ -2110,7 +1729,10 @@ public int getSubscriptionId() {
 
     @Override
     public void maybeReviveSubscription() {
-        getBinding().maybeReviveSubscription();
+        TableViewportSubscription viewportSubscription = subscriptions.get(getHandle());
+        if (viewportSubscription != null) {
+            viewportSubscription.revive();
+        }
     }
 
 }
diff --git a/web/client-api/src/main/java/io/deephaven/web/client/api/JsTotalsTable.java b/web/client-api/src/main/java/io/deephaven/web/client/api/JsTotalsTable.java
index 652bfd4f55f..6801739b1fe 100644
--- a/web/client-api/src/main/java/io/deephaven/web/client/api/JsTotalsTable.java
+++ b/web/client-api/src/main/java/io/deephaven/web/client/api/JsTotalsTable.java
@@ -5,14 +5,17 @@
 
 import com.vertispan.tsdefs.annotations.TsInterface;
 import com.vertispan.tsdefs.annotations.TsName;
+import com.vertispan.tsdefs.annotations.TsTypeRef;
 import elemental2.core.JsArray;
 import elemental2.core.JsString;
-import elemental2.dom.CustomEvent;
-import elemental2.dom.Event;
 import elemental2.promise.Promise;
 import io.deephaven.javascript.proto.dhinternal.io.deephaven.proto.ticket_pb.TypedTicket;
 import io.deephaven.web.client.api.console.JsVariableType;
+import io.deephaven.web.client.api.event.Event;
+import io.deephaven.web.client.api.event.EventFn;
 import io.deephaven.web.client.api.filter.FilterCondition;
+import io.deephaven.web.client.api.subscription.AbstractTableSubscription;
+import io.deephaven.web.client.api.subscription.ViewportData;
 import io.deephaven.web.client.state.ClientTableState;
 import io.deephaven.web.shared.fu.RemoverFn;
 import jsinterop.annotations.JsIgnore;
@@ -66,7 +69,7 @@ public JsTotalsTable(JsTable wrappedTable, String directive, JsArray<String> gro
 
     public void refreshViewport() {
         if (firstRow != null && lastRow != null) {
-            setViewport(firstRow, lastRow, Js.uncheckedCast(columns), updateIntervalMs);
+            setViewport(firstRow, lastRow, Js.uncheckedCast(columns), updateIntervalMs, null);
         }
     }
 
@@ -109,12 +112,12 @@ public JsTotalsTableConfig getTotalsTableConfig() {
      */
     @JsMethod
     public void setViewport(double firstRow, double lastRow, @JsOptional JsArray<Column> columns,
-            @JsOptional Double updateIntervalMs) {
+            @JsOptional Double updateIntervalMs, @JsOptional @JsNullable Boolean isReverseViewport) {
         this.firstRow = firstRow;
         this.lastRow = lastRow;
         this.columns = columns != null ? Js.uncheckedCast(columns.slice()) : null;
         this.updateIntervalMs = updateIntervalMs;
-        wrappedTable.setViewport(firstRow, lastRow, columns, updateIntervalMs);
+        wrappedTable.setViewport(firstRow, lastRow, columns, updateIntervalMs, isReverseViewport);
     }
 
     /**
@@ -124,7 +127,7 @@ public void setViewport(double firstRow, double lastRow, @JsOptional JsArray<Col
      * @return Promise of {@link TableData}
      */
     @JsMethod
-    public Promise<TableData> getViewportData() {
+    public Promise<AbstractTableSubscription.@TsTypeRef(ViewportData.class) UpdateEventData> getViewportData() {
         return wrappedTable.getViewportData();
     }
 
@@ -221,7 +224,7 @@ public <T> boolean removeEventListener(String name, EventFn<T> callback) {
     }
 
     @JsMethod
-    public <T> Promise<CustomEvent<T>> nextEvent(String eventName, Double timeoutInMillis) {
+    public <T> Promise<Event<T>> nextEvent(String eventName, Double timeoutInMillis) {
         return wrappedTable.nextEvent(eventName, timeoutInMillis);
     }
 
diff --git a/web/client-api/src/main/java/io/deephaven/web/client/api/LocalDateWrapper.java b/web/client-api/src/main/java/io/deephaven/web/client/api/LocalDateWrapper.java
index a750b0f0310..5e3bb30eca8 100644
--- a/web/client-api/src/main/java/io/deephaven/web/client/api/LocalDateWrapper.java
+++ b/web/client-api/src/main/java/io/deephaven/web/client/api/LocalDateWrapper.java
@@ -6,29 +6,20 @@
 import com.google.gwt.i18n.client.NumberFormat;
 import com.vertispan.tsdefs.annotations.TsInterface;
 import com.vertispan.tsdefs.annotations.TsName;
-import io.deephaven.web.shared.data.LocalDate;
 import jsinterop.annotations.JsMethod;
 
-import javax.annotation.Nonnull;
-
 /**
  * Wrap LocalDate values for use in JS. Provides text formatting for display and access to the underlying value.
  */
 @TsInterface
 @TsName(namespace = "dh")
 public class LocalDateWrapper {
-    private final static NumberFormat YEAR_FORMAT = NumberFormat.getFormat("0000");
-    private final static NumberFormat MONTH_DAY_FORMAT = NumberFormat.getFormat("00");
+    private static final NumberFormat YEAR_FORMAT = NumberFormat.getFormat("0000");
+    private static final NumberFormat MONTH_DAY_FORMAT = NumberFormat.getFormat("00");
 
     private final int year;
     private final int monthValue, dayOfMonth;
 
-    public LocalDateWrapper(@Nonnull LocalDate localDate) {
-        year = localDate.getYear();
-        monthValue = localDate.getMonthValue();
-        dayOfMonth = localDate.getDayOfMonth();
-    }
-
     public LocalDateWrapper(int year, int monthValue, int dayOfMonth) {
         this.year = year;
         this.monthValue = monthValue;
@@ -55,15 +46,6 @@ public int getDayOfMonth() {
         return dayOfMonth;
     }
 
-    @Deprecated
-    public LocalDate getWrapped() {
-        LocalDate localDate = new LocalDate();
-        localDate.setYear(year);
-        localDate.setMonthValue((byte) monthValue);
-        localDate.setDayOfMonth((byte) dayOfMonth);
-        return localDate;
-    }
-
     @JsMethod
     @Override
     public String toString() {
diff --git a/web/client-api/src/main/java/io/deephaven/web/client/api/LocalTimeWrapper.java b/web/client-api/src/main/java/io/deephaven/web/client/api/LocalTimeWrapper.java
index 10d64798f0d..078884e88fb 100644
--- a/web/client-api/src/main/java/io/deephaven/web/client/api/LocalTimeWrapper.java
+++ b/web/client-api/src/main/java/io/deephaven/web/client/api/LocalTimeWrapper.java
@@ -6,10 +6,11 @@
 import com.google.gwt.i18n.client.NumberFormat;
 import com.vertispan.tsdefs.annotations.TsInterface;
 import com.vertispan.tsdefs.annotations.TsName;
-import io.deephaven.web.shared.data.LocalTime;
+import io.deephaven.util.QueryConstants;
 import jsinterop.annotations.JsMethod;
 
-import javax.annotation.Nonnull;
+import java.util.function.IntFunction;
+import java.util.function.LongFunction;
 
 /**
  * Wrap LocalTime values for use in JS. Provides text formatting for display and access to the underlying value.
@@ -17,13 +18,51 @@
 @TsInterface
 @TsName(namespace = "dh")
 public class LocalTimeWrapper {
-    private final static NumberFormat TWO_DIGIT_FORMAT = NumberFormat.getFormat("00");
-    private final static NumberFormat NANOS_FORMAT = NumberFormat.getFormat("000000000");
+    private static final NumberFormat TWO_DIGIT_FORMAT = NumberFormat.getFormat("00");
+    private static final NumberFormat NANOS_FORMAT = NumberFormat.getFormat("000000000");
 
-    private final LocalTime localTime;
+    private final int hour;
+    private final int minute;
+    private final int second;
+    private final int nano;
 
-    public LocalTimeWrapper(@Nonnull LocalTime localTime) {
-        this.localTime = localTime;
+    public static IntFunction<LocalTimeWrapper> intCreator(int unitPerMicro) {
+        int nanoPerUnit = 1_000_000_000 / unitPerMicro;
+        return val -> {
+            if (val == QueryConstants.NULL_INT) {
+                return null;
+            }
+            int nano = (val % unitPerMicro) * nanoPerUnit;
+            int secVal = val / unitPerMicro;
+            int second = (secVal % 60);
+            secVal /= 60;
+            int minute = (secVal % 60);
+            int hour = (secVal / 60);
+            return new LocalTimeWrapper(hour, minute, second, nano);
+        };
+    }
+
+    public static LongFunction<LocalTimeWrapper> longCreator(int unitPerMicro) {
+        int nanoPerUnit = 1_000_000_000 / unitPerMicro;
+        return val -> {
+            if (val == QueryConstants.NULL_LONG) {
+                return null;
+            }
+            int nano = (int) (val % unitPerMicro) * nanoPerUnit;
+            int secVal = (int) (val / unitPerMicro);
+            byte second = (byte) (secVal % 60);
+            secVal /= 60;
+            byte minute = (byte) (secVal % 60);
+            byte hour = (byte) (secVal / 60);
+            return new LocalTimeWrapper(hour, minute, second, nano);
+        };
+    }
+
+    public LocalTimeWrapper(int hour, int minute, int second, int nano) {
+        this.hour = hour;
+        this.minute = minute;
+        this.second = second;
+        this.nano = nano;
     }
 
     @JsMethod
@@ -33,34 +72,30 @@ public String valueOf() {
 
     @JsMethod
     public int getHour() {
-        return localTime.getHour();
+        return hour;
     }
 
     @JsMethod
     public int getMinute() {
-        return localTime.getMinute();
+        return minute;
     }
 
     @JsMethod
     public int getSecond() {
-        return localTime.getSecond();
+        return second;
     }
 
     @JsMethod
     public int getNano() {
-        return localTime.getNano();
-    }
-
-    public LocalTime getWrapped() {
-        return localTime;
+        return nano;
     }
 
     @JsMethod
     @Override
     public String toString() {
-        return TWO_DIGIT_FORMAT.format(localTime.getHour())
-                + ":" + TWO_DIGIT_FORMAT.format(localTime.getMinute())
-                + ":" + TWO_DIGIT_FORMAT.format(localTime.getSecond())
-                + "." + NANOS_FORMAT.format(localTime.getNano());
+        return TWO_DIGIT_FORMAT.format(hour)
+                + ":" + TWO_DIGIT_FORMAT.format(minute)
+                + ":" + TWO_DIGIT_FORMAT.format(second)
+                + "." + NANOS_FORMAT.format(nano);
     }
 }
diff --git a/web/client-api/src/main/java/io/deephaven/web/client/api/LongWrapper.java b/web/client-api/src/main/java/io/deephaven/web/client/api/LongWrapper.java
index ec679c0442a..ea2647184b0 100644
--- a/web/client-api/src/main/java/io/deephaven/web/client/api/LongWrapper.java
+++ b/web/client-api/src/main/java/io/deephaven/web/client/api/LongWrapper.java
@@ -3,6 +3,7 @@
 //
 package io.deephaven.web.client.api;
 
+import io.deephaven.util.QueryConstants;
 import jsinterop.annotations.JsIgnore;
 import jsinterop.annotations.JsType;
 
@@ -12,6 +13,9 @@ public class LongWrapper {
 
     @JsIgnore
     public static LongWrapper of(long value) {
+        if (value == QueryConstants.NULL_LONG) {
+            return null;
+        }
         return new LongWrapper(value);
     }
 
diff --git a/web/client-api/src/main/java/io/deephaven/web/client/api/QueryConnectable.java b/web/client-api/src/main/java/io/deephaven/web/client/api/QueryConnectable.java
index d936024ab05..a05fc06cc0d 100644
--- a/web/client-api/src/main/java/io/deephaven/web/client/api/QueryConnectable.java
+++ b/web/client-api/src/main/java/io/deephaven/web/client/api/QueryConnectable.java
@@ -6,10 +6,11 @@
 import com.vertispan.tsdefs.annotations.TsIgnore;
 import elemental2.core.JsArray;
 import elemental2.core.JsSet;
-import elemental2.dom.CustomEventInit;
-import elemental2.dom.DomGlobal;
 import elemental2.promise.Promise;
+import io.deephaven.javascript.proto.dhinternal.grpcweb.client.RpcOptions;
 import io.deephaven.javascript.proto.dhinternal.io.deephaven.proto.session_pb.TerminationNotificationResponse;
+import io.deephaven.web.client.api.event.HasEventHandling;
+import io.deephaven.web.client.api.grpc.GrpcTransportFactory;
 import io.deephaven.web.client.ide.IdeSession;
 import io.deephaven.javascript.proto.dhinternal.io.deephaven.proto.console_pb.*;
 import io.deephaven.javascript.proto.dhinternal.io.deephaven.proto.ticket_pb.Ticket;
@@ -26,6 +27,7 @@
 
 import java.util.ArrayList;
 import java.util.List;
+import java.util.function.BiFunction;
 
 import static io.deephaven.web.client.ide.IdeConnection.HACK_CONNECTION_FAILURE;
 import static io.deephaven.web.shared.fu.PromiseLike.CANCELLATION_MESSAGE;
@@ -51,9 +53,9 @@ public QueryConnectable() {
         this.connection = JsLazy.of(() -> new WorkerConnection(this));
     }
 
-    public abstract Promise<ConnectToken> getConnectToken();
+    public abstract ConnectToken getToken();
 
-    public abstract Promise<ConnectOptions> getConnectOptions();
+    public abstract ConnectOptions getOptions();
 
     @Deprecated
     public void notifyConnectionError(ResponseStreamWrapper.Status status) {
@@ -62,12 +64,10 @@ public void notifyConnectionError(ResponseStreamWrapper.Status status) {
         }
         notifiedConnectionError = true;
 
-        CustomEventInit<JsPropertyMap<Object>> event = CustomEventInit.create();
-        event.setDetail(JsPropertyMap.of(
+        fireEvent(HACK_CONNECTION_FAILURE, JsPropertyMap.of(
                 "status", status.getCode(),
                 "details", status.getDetails(),
                 "metadata", status.getMetadata()));
-        fireEvent(HACK_CONNECTION_FAILURE, event);
         JsLog.warn(
                 "The event dh.IdeConnection.HACK_CONNECTION_FAILURE is deprecated and will be removed in a later release");
     }
@@ -216,12 +216,7 @@ public void connected() {
         fireEvent(QueryInfoConstants.EVENT_CONNECT);
 
         if (hasDisconnected) {
-            if (hasListeners(QueryInfoConstants.EVENT_RECONNECT)) {
-                fireEvent(QueryInfoConstants.EVENT_RECONNECT);
-            } else {
-                DomGlobal.console.log(logPrefix()
-                        + "Query reconnected (to prevent this log message, handle the EVENT_RECONNECT event)");
-            }
+            fireCriticalEvent(QueryInfoConstants.EVENT_RECONNECT);
         }
     }
 
@@ -245,13 +240,23 @@ public void disconnected() {
 
         hasDisconnected = true;
 
-        if (hasListeners(QueryInfoConstants.EVENT_DISCONNECT)) {
-            this.fireEvent(QueryInfoConstants.EVENT_DISCONNECT);
-        } else {
-            DomGlobal.console.log(logPrefix()
-                    + "Query disconnected (to prevent this log message, handle the EVENT_DISCONNECT event)");
-        }
+        fireCriticalEvent(QueryInfoConstants.EVENT_DISCONNECT);
     }
 
     public abstract void notifyServerShutdown(TerminationNotificationResponse success);
+
+    public boolean supportsClientStreaming() {
+        return getOptions().transportFactory.getSupportsClientStreaming();
+    }
+
+    public <T> T createClient(BiFunction<String, Object, T> constructor) {
+        return constructor.apply(getServerUrl(), makeRpcOptions());
+    }
+
+    public RpcOptions makeRpcOptions() {
+        RpcOptions options = RpcOptions.create();
+        options.setDebug(getOptions().debug);
+        options.setTransport(GrpcTransportFactory.adapt(getOptions().transportFactory));
+        return options;
+    }
 }
diff --git a/web/client-api/src/main/java/io/deephaven/web/client/api/TableData.java b/web/client-api/src/main/java/io/deephaven/web/client/api/TableData.java
index 5018db59ab7..19df98c4221 100644
--- a/web/client-api/src/main/java/io/deephaven/web/client/api/TableData.java
+++ b/web/client-api/src/main/java/io/deephaven/web/client/api/TableData.java
@@ -3,11 +3,11 @@
 //
 package io.deephaven.web.client.api;
 
-import com.vertispan.tsdefs.annotations.TsName;
 import com.vertispan.tsdefs.annotations.TsTypeRef;
 import com.vertispan.tsdefs.annotations.TsUnion;
 import com.vertispan.tsdefs.annotations.TsUnionMember;
 import elemental2.core.JsArray;
+import jsinterop.annotations.JsIgnore;
 import jsinterop.annotations.JsMethod;
 import jsinterop.annotations.JsOverlay;
 import jsinterop.annotations.JsPackage;
@@ -17,13 +17,25 @@
 import jsinterop.base.Js;
 
 /**
- * Common interface for various ways of accessing table data and formatting.
- *
+ * Common interface for various ways of accessing table data and formatting for viewport or non-viewport subscriptions
+ * on tables, data in trees, and snapshots.
+ * <p>
+ * Generally speaking, it is more efficient to access data in column-major order, rather than iterating through each Row
+ * and accessing all columns that it holds. The {@link #getRows()} accessor can be useful to read row data, but may
+ * incur other costs - it is likely faster to access data by columns using {@link #getData(RowPositionUnion, Column)}.
+ */
+/*
  * Java note: this interface contains some extra overloads that aren't available in JS. Implementations are expected to
  * implement only abstract methods, and default methods present in this interface will dispatch accordingly.
  */
-@TsName(namespace = "dh")
+@JsType(namespace = "dh")
 public interface TableData {
+    @JsIgnore
+    int NO_ROW_FORMAT_COLUMN = -1;
+
+    /**
+     * TS type union to allow either "int" or "LongWrapper" to be passed as an argument for various methods.
+     */
     @TsUnion
     @JsType(name = "?", namespace = JsPackage.GLOBAL, isNative = true)
     interface RowPositionUnion {
@@ -53,9 +65,18 @@ default int asInt() {
     @JsProperty
     JsArray<Column> getColumns();
 
+    /**
+     * A lazily computed array of all rows available on the client.
+     */
     @JsProperty
     JsArray<@TsTypeRef(Row.class) ? extends Row> getRows();
 
+    /**
+     * Reads a row object from the table, from which any subscribed column can be read.
+     *
+     * @param index the position or key to access
+     * @return the row at the given location
+     */
     @JsMethod
     default Row get(RowPositionUnion index) {
         if (index.isLongWrapper()) {
@@ -64,10 +85,20 @@ default Row get(RowPositionUnion index) {
         return get(Js.coerceToInt(index));
     }
 
+    @JsIgnore
     Row get(long index);
 
+    @JsIgnore
     Row get(int index);
 
+    /**
+     * Reads a specific cell from the table, by row key and column.
+     *
+     * @param index the row in the table to get data from
+     * @param column the column to read
+     * @return the value in the table
+     */
+    // TODO (deephaven-core#5927) Consider a get/fillChunk API as an efficient alternative
     @JsMethod
     default Any getData(RowPositionUnion index, Column column) {
         if (index.isLongWrapper()) {
@@ -76,10 +107,19 @@ default Any getData(RowPositionUnion index, Column column) {
         return getData(index.asInt(), column);
     }
 
+    @JsIgnore
     Any getData(int index, Column column);
 
+    @JsIgnore
     Any getData(long index, Column column);
 
+    /**
+     * The server-specified Format to use for the cell at the given position.
+     * 
+     * @param index the row to read
+     * @param column the column to read
+     * @return a Format instance with any server-specified details
+     */
     @JsMethod
     default Format getFormat(RowPositionUnion index, Column column) {
         if (index.isLongWrapper()) {
@@ -88,12 +128,19 @@ default Format getFormat(RowPositionUnion index, Column column) {
         return getFormat(index.asInt(), column);
     }
 
+    @JsIgnore
     Format getFormat(int index, Column column);
 
+    @JsIgnore
     Format getFormat(long index, Column column);
 
-    @TsName(namespace = "dh")
-    public interface Row {
+    /**
+     * Represents a row available in a subscription/snapshot on the client. Do not retain references to rows - they will
+     * not function properly when the event isn't actively going off (or promise resolving). Instead, wait for the next
+     * event, or re-request the viewport data.
+     */
+    @JsType(namespace = "dh")
+    interface Row {
         @JsProperty
         LongWrapper getIndex();
 
diff --git a/web/client-api/src/main/java/io/deephaven/web/client/api/WorkerConnection.java b/web/client-api/src/main/java/io/deephaven/web/client/api/WorkerConnection.java
index 625b80443df..4ea02498a51 100644
--- a/web/client-api/src/main/java/io/deephaven/web/client/api/WorkerConnection.java
+++ b/web/client-api/src/main/java/io/deephaven/web/client/api/WorkerConnection.java
@@ -3,43 +3,30 @@
 //
 package io.deephaven.web.client.api;
 
+import com.google.flatbuffers.FlatBufferBuilder;
 import com.vertispan.tsdefs.annotations.TsIgnore;
 import elemental2.core.JsArray;
 import elemental2.core.JsObject;
 import elemental2.core.JsSet;
 import elemental2.core.JsWeakMap;
 import elemental2.core.Uint8Array;
-import elemental2.dom.CustomEventInit;
 import elemental2.dom.DomGlobal;
 import elemental2.promise.Promise;
-import io.deephaven.javascript.proto.dhinternal.arrow.flight.flatbuf.message_generated.org.apache.arrow.flatbuf.FieldNode;
-import io.deephaven.javascript.proto.dhinternal.arrow.flight.flatbuf.message_generated.org.apache.arrow.flatbuf.Message;
-import io.deephaven.javascript.proto.dhinternal.arrow.flight.flatbuf.message_generated.org.apache.arrow.flatbuf.MessageHeader;
-import io.deephaven.javascript.proto.dhinternal.arrow.flight.flatbuf.message_generated.org.apache.arrow.flatbuf.RecordBatch;
-import io.deephaven.javascript.proto.dhinternal.arrow.flight.flatbuf.schema_generated.org.apache.arrow.flatbuf.Buffer;
-import io.deephaven.javascript.proto.dhinternal.arrow.flight.flatbuf.schema_generated.org.apache.arrow.flatbuf.Field;
-import io.deephaven.javascript.proto.dhinternal.arrow.flight.flatbuf.schema_generated.org.apache.arrow.flatbuf.KeyValue;
-import io.deephaven.javascript.proto.dhinternal.arrow.flight.flatbuf.schema_generated.org.apache.arrow.flatbuf.MetadataVersion;
-import io.deephaven.javascript.proto.dhinternal.arrow.flight.flatbuf.schema_generated.org.apache.arrow.flatbuf.Schema;
 import io.deephaven.javascript.proto.dhinternal.arrow.flight.protocol.browserflight_pb_service.BrowserFlightServiceClient;
 import io.deephaven.javascript.proto.dhinternal.arrow.flight.protocol.flight_pb.FlightData;
-import io.deephaven.javascript.proto.dhinternal.arrow.flight.protocol.flight_pb.HandshakeRequest;
-import io.deephaven.javascript.proto.dhinternal.arrow.flight.protocol.flight_pb.HandshakeResponse;
 import io.deephaven.javascript.proto.dhinternal.arrow.flight.protocol.flight_pb_service.FlightServiceClient;
 import io.deephaven.javascript.proto.dhinternal.browserheaders.BrowserHeaders;
-import io.deephaven.javascript.proto.dhinternal.flatbuffers.Builder;
-import io.deephaven.javascript.proto.dhinternal.flatbuffers.Long;
+import io.deephaven.javascript.proto.dhinternal.grpcweb.client.ClientRpcOptions;
 import io.deephaven.javascript.proto.dhinternal.grpcweb.grpc.Code;
-import io.deephaven.javascript.proto.dhinternal.io.deephaven.barrage.flatbuf.barrage_generated.io.deephaven.barrage.flatbuf.BarrageMessageType;
-import io.deephaven.javascript.proto.dhinternal.io.deephaven.barrage.flatbuf.barrage_generated.io.deephaven.barrage.flatbuf.BarrageMessageWrapper;
-import io.deephaven.javascript.proto.dhinternal.io.deephaven.barrage.flatbuf.barrage_generated.io.deephaven.barrage.flatbuf.BarrageSubscriptionOptions;
-import io.deephaven.javascript.proto.dhinternal.io.deephaven.barrage.flatbuf.barrage_generated.io.deephaven.barrage.flatbuf.BarrageSubscriptionRequest;
-import io.deephaven.javascript.proto.dhinternal.io.deephaven.barrage.flatbuf.barrage_generated.io.deephaven.barrage.flatbuf.BarrageUpdateMetadata;
-import io.deephaven.javascript.proto.dhinternal.io.deephaven.barrage.flatbuf.barrage_generated.io.deephaven.barrage.flatbuf.ColumnConversionMode;
+import io.deephaven.javascript.proto.dhinternal.grpcweb.grpc.UnaryOutput;
 import io.deephaven.javascript.proto.dhinternal.io.deephaven.proto.application_pb.FieldInfo;
 import io.deephaven.javascript.proto.dhinternal.io.deephaven.proto.application_pb.FieldsChangeUpdate;
 import io.deephaven.javascript.proto.dhinternal.io.deephaven.proto.application_pb.ListFieldsRequest;
 import io.deephaven.javascript.proto.dhinternal.io.deephaven.proto.application_pb_service.ApplicationServiceClient;
+import io.deephaven.javascript.proto.dhinternal.io.deephaven.proto.config_pb.ConfigValue;
+import io.deephaven.javascript.proto.dhinternal.io.deephaven.proto.config_pb.ConfigurationConstantsRequest;
+import io.deephaven.javascript.proto.dhinternal.io.deephaven.proto.config_pb.ConfigurationConstantsResponse;
+import io.deephaven.javascript.proto.dhinternal.io.deephaven.proto.config_pb_service.ConfigService;
 import io.deephaven.javascript.proto.dhinternal.io.deephaven.proto.config_pb_service.ConfigServiceClient;
 import io.deephaven.javascript.proto.dhinternal.io.deephaven.proto.console_pb.LogSubscriptionData;
 import io.deephaven.javascript.proto.dhinternal.io.deephaven.proto.console_pb.LogSubscriptionRequest;
@@ -69,16 +56,16 @@
 import io.deephaven.javascript.proto.dhinternal.io.deephaven.proto.ticket_pb.Ticket;
 import io.deephaven.javascript.proto.dhinternal.io.deephaven.proto.ticket_pb.TypedTicket;
 import io.deephaven.web.client.api.barrage.WebBarrageUtils;
-import io.deephaven.web.client.api.barrage.def.ColumnDefinition;
 import io.deephaven.web.client.api.barrage.def.InitialTableDefinition;
 import io.deephaven.web.client.api.barrage.stream.BiDiStream;
-import io.deephaven.web.client.api.barrage.stream.HandshakeStreamFactory;
 import io.deephaven.web.client.api.barrage.stream.ResponseStreamWrapper;
 import io.deephaven.web.client.api.batch.RequestBatcher;
 import io.deephaven.web.client.api.batch.TableConfig;
 import io.deephaven.web.client.api.console.JsVariableChanges;
 import io.deephaven.web.client.api.console.JsVariableDefinition;
 import io.deephaven.web.client.api.console.JsVariableType;
+import io.deephaven.web.client.api.event.HasEventHandling;
+import io.deephaven.web.client.api.grpc.UnaryWithHeaders;
 import io.deephaven.web.client.api.i18n.JsTimeZone;
 import io.deephaven.web.client.api.impl.TicketAndPromise;
 import io.deephaven.web.client.api.lifecycle.HasLifecycle;
@@ -94,22 +81,25 @@
 import io.deephaven.web.client.state.ClientTableState;
 import io.deephaven.web.client.state.HasTableBinding;
 import io.deephaven.web.client.state.TableReviver;
-import io.deephaven.web.shared.data.DeltaUpdates;
-import io.deephaven.web.shared.data.RangeSet;
-import io.deephaven.web.shared.data.TableSnapshot;
-import io.deephaven.web.shared.data.TableSubscriptionRequest;
 import io.deephaven.web.shared.fu.JsConsumer;
 import io.deephaven.web.shared.fu.JsRunnable;
 import jsinterop.annotations.JsMethod;
 import jsinterop.annotations.JsOptional;
 import jsinterop.base.Js;
 import jsinterop.base.JsPropertyMap;
+import org.apache.arrow.flatbuf.Buffer;
+import org.apache.arrow.flatbuf.Field;
+import org.apache.arrow.flatbuf.FieldNode;
+import org.apache.arrow.flatbuf.KeyValue;
+import org.apache.arrow.flatbuf.Message;
+import org.apache.arrow.flatbuf.MessageHeader;
+import org.apache.arrow.flatbuf.MetadataVersion;
+import org.apache.arrow.flatbuf.RecordBatch;
+import org.apache.arrow.flatbuf.Schema;
 
 import javax.annotation.Nullable;
-import java.nio.ByteBuffer;
 import java.util.ArrayList;
 import java.util.Arrays;
-import java.util.BitSet;
 import java.util.HashMap;
 import java.util.HashSet;
 import java.util.List;
@@ -120,15 +110,6 @@
 import java.util.function.Consumer;
 import java.util.stream.Collectors;
 
-import static io.deephaven.web.client.api.CoreClient.EVENT_REFRESH_TOKEN_UPDATED;
-import static io.deephaven.web.client.api.barrage.WebBarrageUtils.DeltaUpdatesBuilder;
-import static io.deephaven.web.client.api.barrage.WebBarrageUtils.createSnapshot;
-import static io.deephaven.web.client.api.barrage.WebBarrageUtils.deltaUpdates;
-import static io.deephaven.web.client.api.barrage.WebBarrageUtils.makeUint8ArrayFromBitset;
-import static io.deephaven.web.client.api.barrage.WebBarrageUtils.serializeRanges;
-import static io.deephaven.web.client.api.barrage.WebBarrageUtils.typedArrayToLittleEndianByteBuffer;
-import static io.deephaven.web.client.api.barrage.WebGrpcUtils.CLIENT_OPTIONS;
-
 /**
  * Non-exported class, manages the connection to a given worker server. Exported types like QueryInfo and Table will
  * refer to this, and allow us to try to keep track of how many open tables there are, so we can close the connection if
@@ -176,6 +157,7 @@ private enum State {
     }
 
     private final QueryConnectable<?> info;
+    private final ClientRpcOptions options = ClientRpcOptions.create();
     private final ClientConfiguration config;
     private final ReconnectState newSessionReconnect;
     private final TableReviver reviver;
@@ -203,7 +185,6 @@ private enum State {
     private final Set<ClientTableState> flushable = new HashSet<>();
     private final JsSet<JsConsumer<LogItem>> logCallbacks = new JsSet<>();
 
-    private final Map<ClientTableState, BiDiStream<FlightData, FlightData>> subscriptionStreams = new HashMap<>();
     private ResponseStreamWrapper<ExportedTableUpdateMessage> exportNotifications;
 
     private JsSet<HasLifecycle> simpleReconnectableInstances = new JsSet<>();
@@ -218,30 +199,26 @@ private enum State {
     private Map<String, JsVariableDefinition> knownFields = new HashMap<>();
     private ResponseStreamWrapper<FieldsChangeUpdate> fieldsChangeUpdateStream;
 
+    private ConfigurationConstantsResponse constants;
+
     public WorkerConnection(QueryConnectable<?> info) {
         this.info = info;
+
         this.config = new ClientConfiguration();
         state = State.Connecting;
         this.reviver = new TableReviver(this);
-        sessionServiceClient = new SessionServiceClient(info.getServerUrl(), CLIENT_OPTIONS);
-        tableServiceClient = new TableServiceClient(info.getServerUrl(), CLIENT_OPTIONS);
-        consoleServiceClient = new ConsoleServiceClient(info.getServerUrl(), CLIENT_OPTIONS);
-        flightServiceClient = new FlightServiceClient(info.getServerUrl(), CLIENT_OPTIONS);
-        applicationServiceClient =
-                new ApplicationServiceClient(info.getServerUrl(), CLIENT_OPTIONS);
-        browserFlightServiceClient =
-                new BrowserFlightServiceClient(info.getServerUrl(), CLIENT_OPTIONS);
-        inputTableServiceClient =
-                new InputTableServiceClient(info.getServerUrl(), CLIENT_OPTIONS);
-        objectServiceClient = new ObjectServiceClient(info.getServerUrl(), CLIENT_OPTIONS);
-        partitionedTableServiceClient =
-                new PartitionedTableServiceClient(info.getServerUrl(), CLIENT_OPTIONS);
-        storageServiceClient = new StorageServiceClient(info.getServerUrl(), CLIENT_OPTIONS);
-        configServiceClient = new ConfigServiceClient(info.getServerUrl(), CLIENT_OPTIONS);
-        hierarchicalTableServiceClient =
-                new HierarchicalTableServiceClient(info.getServerUrl(), CLIENT_OPTIONS);
-
-        // builder.setConnectionErrorHandler(msg -> info.failureHandled(String.valueOf(msg)));
+        sessionServiceClient = info.createClient(SessionServiceClient::new);
+        tableServiceClient = info.createClient(TableServiceClient::new);
+        consoleServiceClient = info.createClient(ConsoleServiceClient::new);
+        flightServiceClient = info.createClient(FlightServiceClient::new);
+        applicationServiceClient = info.createClient(ApplicationServiceClient::new);
+        browserFlightServiceClient = info.createClient(BrowserFlightServiceClient::new);
+        inputTableServiceClient = info.createClient(InputTableServiceClient::new);
+        objectServiceClient = info.createClient(ObjectServiceClient::new);
+        partitionedTableServiceClient = info.createClient(PartitionedTableServiceClient::new);
+        storageServiceClient = info.createClient(StorageServiceClient::new);
+        configServiceClient = info.createClient(ConfigServiceClient::new);
+        hierarchicalTableServiceClient = info.createClient(HierarchicalTableServiceClient::new);
 
         newSessionReconnect = new ReconnectState(this::connectToWorker);
 
@@ -269,21 +246,13 @@ private void connectToWorker() {
                     if (metadata().has(FLIGHT_AUTH_HEADER_NAME)) {
                         return authUpdate().then(ignore -> Promise.resolve(Boolean.FALSE));
                     }
-                    return Promise.all(
-                            info.getConnectToken().then(authToken -> {
-                                // set the proposed initial token and make the first call
-                                metadata.set(FLIGHT_AUTH_HEADER_NAME,
-                                        (authToken.getType() + " " + authToken.getValue()).trim());
-                                return Promise.resolve(authToken);
-                            }),
-                            info.getConnectOptions().then(options -> {
-                                // set other specified headers, if any
-                                JsObject.keys(options.headers).forEach((key, index) -> {
-                                    metadata.set(key, options.headers.get(key));
-                                    return null;
-                                });
-                                return Promise.resolve(options);
-                            })).then(ignore -> authUpdate()).then(ignore -> Promise.resolve(Boolean.TRUE));
+                    metadata.set(FLIGHT_AUTH_HEADER_NAME,
+                            (info.getToken().getType() + " " + info.getToken().getValue()).trim());
+                    JsObject.keys(info.getOptions().headers).forEach((key, index) -> {
+                        metadata.set(key, info.getOptions().headers.get(key));
+                        return null;
+                    });
+                    return authUpdate().then(ignore -> Promise.resolve(Boolean.TRUE));
                 }).then(newSession -> {
                     // subscribe to fatal errors
                     subscribeToTerminationNotification();
@@ -304,7 +273,6 @@ private void connectToWorker() {
                         ClientTableState[] hasActiveSubs = cache.getAllStates().stream()
                                 .peek(cts -> {
                                     cts.getHandle().setConnected(false);
-                                    cts.setSubscribed(false);
                                     cts.forActiveLifecycles(item -> {
                                         assert !(item instanceof JsTable) ||
                                                 ((JsTable) item).state() == cts
@@ -365,7 +333,7 @@ private void connectToWorker() {
                     state = State.Failed;
                     JsLog.debug("Failed to connect to worker.");
 
-                    final String failure = fail.toString();
+                    final String failure = String.valueOf(fail);
 
                     // notify all pending fetches that they failed
                     onOpen.forEach(c -> c.onFailure(failure));
@@ -403,7 +371,7 @@ public boolean checkStatus(ResponseStreamWrapper.Status status) {
 
             // signal that the user needs to re-authenticate, make a new session
             // TODO (deephaven-core#3501) in theory we could make a new session for some auth types
-            info.fireEvent(CoreClient.EVENT_RECONNECT_AUTH_FAILED);
+            info.fireCriticalEvent(CoreClient.EVENT_RECONNECT_AUTH_FAILED);
         } else if (status.isTransportError()) {
             // fire deprecated event for now
             info.notifyConnectionError(status);
@@ -479,54 +447,57 @@ private Promise<Void> authUpdate() {
             DomGlobal.clearTimeout(scheduledAuthUpdate);
             scheduledAuthUpdate = null;
         }
-        return new Promise<>((resolve, reject) -> {
-            // the streamfactory will automatically reference our existing metadata, but we can listen to update it
-            BiDiStream<HandshakeRequest, HandshakeResponse> handshake = HandshakeStreamFactory.create(this);
-            handshake.onHeaders(headers -> {
-                // unchecked cast is required here due to "aliasing" in ts/webpack resulting in BrowserHeaders !=
-                // Metadata
-                JsArray<String> authorization = Js.<BrowserHeaders>uncheckedCast(headers).get(FLIGHT_AUTH_HEADER_NAME);
-                if (authorization.length > 0) {
-                    JsArray<String> existing = metadata().get(FLIGHT_AUTH_HEADER_NAME);
-                    if (!existing.getAt(0).equals(authorization.getAt(0))) {
-                        // use this new token
-                        metadata().set(FLIGHT_AUTH_HEADER_NAME, authorization);
-                        CustomEventInit<JsRefreshToken> init = CustomEventInit.create();
-                        init.setDetail(new JsRefreshToken(authorization.getAt(0), sessionTimeoutMs));
-                        info.fireEvent(EVENT_REFRESH_TOKEN_UPDATED, init);
+        return UnaryWithHeaders.<ConfigurationConstantsRequest, ConfigurationConstantsResponse>call(
+                info.getServerUrl(),
+                metadata(), info.makeRpcOptions(), ConfigService.GetConfigurationConstants,
+                new ConfigurationConstantsRequest())
+                .then(result -> {
+                    BrowserHeaders headers = result.getHeaders();
+                    // unchecked cast is required here due to "aliasing" in ts/webpack resulting in BrowserHeaders !=
+                    // Metadata
+                    JsArray<String> authorization =
+                            Js.<BrowserHeaders>uncheckedCast(headers).get(FLIGHT_AUTH_HEADER_NAME);
+                    if (authorization.length > 0) {
+                        JsArray<String> existing = metadata().get(FLIGHT_AUTH_HEADER_NAME);
+                        if (!existing.getAt(0).equals(authorization.getAt(0))) {
+                            // use this new token
+                            metadata().set(FLIGHT_AUTH_HEADER_NAME, authorization);
+                        }
                     }
-                }
-                handshake.end();
-            });
-            handshake.onStatus(status -> {
-                if (status.isOk()) {
+
+                    // Read the timeout from the server, we'll refresh at less than that
+                    constants = result.getMessage();
+                    ConfigValue sessionDuration = constants.getConfigValuesMap().get("http.session.durationMs");
+                    if (sessionDuration != null && sessionDuration.hasStringValue()) {
+                        sessionTimeoutMs = Double.parseDouble(sessionDuration.getStringValue());
+                    }
+
                     // schedule an update based on our currently configured delay
                     scheduledAuthUpdate = DomGlobal.setTimeout(ignore -> {
                         authUpdate();
                     }, sessionTimeoutMs / 2);
 
-                    resolve.onInvoke((Void) null);
-                } else {
-                    if (status.getCode() == Code.Unauthenticated) {
+                    return Promise.resolve((Void) null);
+                }).catch_(err -> {
+                    UnaryOutput<?> result = (UnaryOutput<?>) err;
+                    if (result.getStatus() == Code.Unauthenticated) {
                         // explicitly clear out any metadata for authentication, and signal that auth failed
                         metadata.delete(FLIGHT_AUTH_HEADER_NAME);
 
                         // Fire an event for the UI to attempt to re-auth
-                        info.fireEvent(CoreClient.EVENT_RECONNECT_AUTH_FAILED);
-                        return;
+                        info.fireCriticalEvent(CoreClient.EVENT_RECONNECT_AUTH_FAILED);
+
+                        // We return here rather than continue and call checkStatus()
+                        return Promise.reject("Authentication failed, please reconnect");
                     }
-                    // TODO deephaven-core#2564 fire an event for the UI to re-auth
-                    checkStatus(status);
-                    if (status.getDetails() == null || status.getDetails().isEmpty()) {
-                        reject.onInvoke("Error occurred while authenticating, gRPC status " + status.getCode());
+                    checkStatus(ResponseStreamWrapper.Status.of(result.getStatus(), result.getStatusMessage(),
+                            result.getTrailers()));
+                    if (result.getStatusMessage() != null && !result.getStatusMessage().isEmpty()) {
+                        return Promise.reject(result.getStatusMessage());
                     } else {
-                        reject.onInvoke(status.getDetails());
+                        return Promise.reject("Error occurred while authenticating, gRPC status " + result.getStatus());
                     }
-                }
-            });
-
-            handshake.send(new HandshakeRequest());
-        });
+                });
     }
 
     private void subscribeToTerminationNotification() {
@@ -557,52 +528,10 @@ private void subscribeToTerminationNotification() {
                         });
     }
 
-    // @Override
-    public void initialSnapshot(TableTicket handle, TableSnapshot snapshot) {
-        LazyPromise.runLater(() -> {
-            // notify table that it has a snapshot available to replace viewport rows
-            // TODO looping in this way is not ideal, means that we're roughly O(n*m), where
-            // n is the number of rows, and m the number of tables with viewports.
-            // Instead, we should track all rows here in WorkerConnection, and then
-            // tell every table who might be interested about the rows it is interested in.
-            if (!cache.get(handle).isPresent()) {
-                JsLog.debug("Discarding snapshot for ", handle, " : ", snapshot);
-            }
-            cache.get(handle).ifPresent(s -> {
-                s.setSize(snapshot.getTableSize());
-                s.forActiveTables(table -> {
-                    table.handleSnapshot(handle, snapshot);
-                });
-            });
-        });
-    }
-
-    // @Override
-    public void incrementalUpdates(TableTicket tableHandle, DeltaUpdates updates) {
-        LazyPromise.runLater(() -> {
-            // notify table that it has individual row updates
-            final Optional<ClientTableState> cts = cache.get(tableHandle);
-            if (!cts.isPresent()) {
-                JsLog.debug("Discarding delta for disconnected state ", tableHandle, " : ", updates);
-            }
-            JsLog.debug("Delta received", tableHandle, updates);
-            cts.ifPresent(s -> {
-                if (!s.isSubscribed()) {
-                    JsLog.debug("Discarding delta for unsubscribed table", tableHandle, updates);
-                    return;
-                }
-                s.handleDelta(updates);
-            });
-        });
-    }
-
     // @Override
     public void exportedTableUpdateMessage(TableTicket clientId, long size) {
         cache.get(clientId).ifPresent(state -> {
-            if (!state.isSubscribed()) {
-                // not presently subscribed so this is the only way to be informed of size changes
-                state.setSize(size);
-            }
+            state.setSize(size);
         });
     }
 
@@ -1057,7 +986,7 @@ public BrowserHeaders metadata() {
     }
 
     public <ReqT, RespT> BiDiStream.Factory<ReqT, RespT> streamFactory() {
-        return new BiDiStream.Factory<>(this::metadata, config::newTicketInt);
+        return new BiDiStream.Factory<>(info.supportsClientStreaming(), this::metadata, config::newTicketInt);
     }
 
     public Promise<JsTable> newTable(String[] columnNames, String[] types, Object[][] data, String userTimeZone,
@@ -1074,12 +1003,12 @@ public Promise<JsTable> newTable(String[] columnNames, String[] types, Object[][
             dataRef[0] = null;
 
             // make a schema that we can embed in the first DoPut message
-            Builder schema = new Builder(1024);
+            FlatBufferBuilder schema = new FlatBufferBuilder(1024);
 
             // while we're examining columns, build the copiers for data
             List<JsDataHandler> columns = new ArrayList<>();
 
-            double[] fields = new double[columnNames.length];
+            int[] fields = new int[columnNames.length];
             for (int i = 0; i < columnNames.length; i++) {
                 String columnName = columnNames[i];
                 String columnType = types[i];
@@ -1087,9 +1016,9 @@ public Promise<JsTable> newTable(String[] columnNames, String[] types, Object[][
                 JsDataHandler writer = JsDataHandler.getHandler(columnType);
                 columns.add(writer);
 
-                double nameOffset = schema.createString(columnName);
-                double typeOffset = writer.writeType(schema);
-                double metadataOffset = Field.createCustomMetadataVector(schema, new double[] {
+                int nameOffset = schema.createString(columnName);
+                int typeOffset = writer.writeType(schema);
+                int metadataOffset = Field.createCustomMetadataVector(schema, new int[] {
                         KeyValue.createKeyValue(schema, schema.createString("deephaven:type"),
                                 schema.createString(writer.deephavenType()))
                 });
@@ -1104,7 +1033,7 @@ public Promise<JsTable> newTable(String[] columnNames, String[] types, Object[][
 
                 fields[i] = Field.endField(schema);
             }
-            double fieldsOffset = Schema.createFieldsVector(schema, fields);
+            int fieldsOffset = Schema.createFieldsVector(schema, fields);
 
             Schema.startSchema(schema);
             Schema.addFields(schema, fieldsOffset);
@@ -1146,7 +1075,7 @@ public Promise<JsTable> newTable(String[] columnNames, String[] types, Object[][
             FlightData bodyMessage = new FlightData();
             bodyMessage.setAppMetadata(WebBarrageUtils.emptyMessage());
 
-            Builder bodyData = new Builder(1024);
+            FlatBufferBuilder bodyData = new FlatBufferBuilder(1024);
 
             // iterate each column, building buffers and fieldnodes, as well as building the actual payload
             List<Uint8Array> buffers = new ArrayList<>();
@@ -1170,25 +1099,25 @@ public Promise<JsTable> newTable(String[] columnNames, String[] types, Object[][
             for (int i = buffers.size() - 1; i >= 0; i--) {
                 Uint8Array buffer = buffers.get(i);
                 cumulativeOffset -= buffer.byteLength;
-                Buffer.createBuffer(bodyData, Long.create(cumulativeOffset, 0), Long.create(buffer.byteLength, 0));
+                Buffer.createBuffer(bodyData, cumulativeOffset, buffer.byteLength);
             }
             assert cumulativeOffset == 0;
-            double buffersOffset = bodyData.endVector();
+            int buffersOffset = bodyData.endVector();
 
             RecordBatch.startNodesVector(bodyData, nodes.size());
             for (int i = nodes.size() - 1; i >= 0; i--) {
                 JsDataHandler.Node node = nodes.get(i);
-                FieldNode.createFieldNode(bodyData, Long.create(node.length(), 0), Long.create(node.nullCount(), 0));
+                FieldNode.createFieldNode(bodyData, node.length(), node.nullCount());
             }
-            double nodesOffset = bodyData.endVector();
+            int nodesOffset = bodyData.endVector();
 
             RecordBatch.startRecordBatch(bodyData);
 
             RecordBatch.addBuffers(bodyData, buffersOffset);
             RecordBatch.addNodes(bodyData, nodesOffset);
-            RecordBatch.addLength(bodyData, Long.create(data[0].length, 0));
+            RecordBatch.addLength(bodyData, data[0].length);
 
-            double recordBatchOffset = RecordBatch.endRecordBatch(bodyData);
+            int recordBatchOffset = RecordBatch.endRecordBatch(bodyData);
             bodyMessage.setDataHeader(createMessage(bodyData, MessageHeader.RecordBatch, recordBatchOffset, length, 0));
             bodyMessage.setDataBody(padAndConcat(buffers, length));
 
@@ -1209,11 +1138,11 @@ private Uint8Array padAndConcat(List<Uint8Array> buffers, int length) {
         return all;
     }
 
-    private static Uint8Array createMessage(Builder payload, int messageHeaderType, double messageHeaderOffset,
-            int bodyLength, double customMetadataOffset) {
+    private static Uint8Array createMessage(FlatBufferBuilder payload, byte messageHeaderType, int messageHeaderOffset,
+            int bodyLength, int customMetadataOffset) {
         payload.finish(Message.createMessage(payload, MetadataVersion.V5, messageHeaderType, messageHeaderOffset,
-                Long.create(bodyLength, 0), customMetadataOffset));
-        return payload.asUint8Array();
+                bodyLength, customMetadataOffset));
+        return WebBarrageUtils.bbToUint8ArrayView(payload.dataBuffer());
     }
 
     public Promise<JsTable> mergeTables(JsTable[] tables, HasEventHandling failHandler) {
@@ -1317,7 +1246,7 @@ public StateCache getCache() {
     }
 
     /**
-     * Schedules a deferred command to check the given state for active tables and adjust viewports accordingly.
+     * Schedules a deferred command to check the given state for active tables.
      */
     public void scheduleCheck(ClientTableState state) {
         if (flushable.isEmpty()) {
@@ -1342,210 +1271,24 @@ public void releaseTicket(Ticket ticket) {
         sessionServiceClient.release(releaseRequest, metadata, null);
     }
 
-
-    /**
-     * For those calls where we don't really care what happens
-     */
-    private static final Callback<Void, String> DONOTHING_CALLBACK = new Callback<Void, String>() {
-        @Override
-        public void onSuccess(Void value) {
-            // Do nothing.
-        }
-
-        @Override
-        public void onFailure(String error) {
-            JsLog.error("Callback failed: " + error);
-        }
-    };
-
     private void flush() {
-        // LATER: instead of running a bunch of serial operations,
-        // condense these all into a single batch operation.
-        // All three server calls made by this method are _only_ called by this method,
-        // so we can reasonably merge all three into a single batched operation.
         ArrayList<ClientTableState> statesToFlush = new ArrayList<>(flushable);
         flushable.clear();
 
-
         for (ClientTableState state : statesToFlush) {
-            if (state.hasNoSubscriptions()) {
-                // state may be retained if it is held by at least one paused binding;
-                // it is either an unsubscribed active table, an interim state for an
-                // active table, or a pending rollback for an operation that has not
-                // yet completed (we leave orphaned nodes paused until a request completes).
-                if (state.isSubscribed()) {
-                    state.setSubscribed(false);
+            if (state.isEmpty()) {
+                // completely empty; perform release
+                final ClientTableState.ResolutionState previousState = state.getResolution();
+                state.setResolution(ClientTableState.ResolutionState.RELEASED);
+                if (previousState != ClientTableState.ResolutionState.RELEASED) {
+                    cache.release(state);
+
+                    JsLog.debug("Releasing state", state, LazyString.of(state.getHandle()));
+                    // don't send a release message to the server if the table isn't really there
                     if (state.getHandle().isConnected()) {
-                        BiDiStream<FlightData, FlightData> stream = subscriptionStreams.remove(state);
-                        if (stream != null) {
-                            stream.end();
-                            stream.cancel();
-                        }
+                        releaseHandle(state.getHandle());
                     }
                 }
-
-                if (state.isEmpty()) {
-                    // completely empty; perform release
-                    final ClientTableState.ResolutionState previousState = state.getResolution();
-                    state.setResolution(ClientTableState.ResolutionState.RELEASED);
-                    state.setSubscribed(false);
-                    if (previousState != ClientTableState.ResolutionState.RELEASED) {
-                        cache.release(state);
-
-                        JsLog.debug("Releasing state", state, LazyString.of(state.getHandle()));
-                        // don't send a release message to the server if the table isn't really there
-                        if (state.getHandle().isConnected()) {
-                            releaseHandle(state.getHandle());
-                        }
-                    }
-                }
-            } else if (state.isRunning()) {
-                List<TableSubscriptionRequest> vps = new ArrayList<>();
-                state.forActiveSubscriptions((table, subscription) -> {
-                    assert table.isActive(state) : "Inactive table has a viewport still attached";
-                    vps.add(new TableSubscriptionRequest(table.getSubscriptionId(), subscription.getRows(),
-                            subscription.getColumns()));
-                });
-
-                boolean isViewport = vps.stream().allMatch(req -> req.getRows() != null);
-                assert isViewport || vps.stream().noneMatch(req -> req.getRows() != null)
-                        : "All subscriptions to a given handle must be consistently viewport or non-viewport";
-
-
-                BitSet includedColumns = vps.stream().map(TableSubscriptionRequest::getColumns).reduce((bs1, bs2) -> {
-                    BitSet result = new BitSet();
-                    result.or(bs1);
-                    result.or(bs2);
-                    return result;
-                }).orElseThrow(() -> new IllegalStateException("Cannot call subscribe with zero subscriptions"));
-                String[] columnTypes = Arrays.stream(state.getTableDef().getColumns())
-                        .map(ColumnDefinition::getType)
-                        .toArray(String[]::new);
-
-                state.setSubscribed(true);
-
-                Builder subscriptionReq = new Builder(1024);
-
-                double columnsOffset = BarrageSubscriptionRequest.createColumnsVector(subscriptionReq,
-                        makeUint8ArrayFromBitset(includedColumns));
-                double viewportOffset = 0;
-                if (isViewport) {
-                    viewportOffset = BarrageSubscriptionRequest.createViewportVector(subscriptionReq, serializeRanges(
-                            vps.stream().map(TableSubscriptionRequest::getRows).collect(Collectors.toSet())));
-                }
-                // TODO #188 support minUpdateIntervalMs
-                double serializationOptionsOffset = BarrageSubscriptionOptions
-                        .createBarrageSubscriptionOptions(subscriptionReq, ColumnConversionMode.Stringify, true, 1000,
-                                0, 0);
-                double tableTicketOffset =
-                        BarrageSubscriptionRequest.createTicketVector(subscriptionReq, state.getHandle().getTicket());
-                BarrageSubscriptionRequest.startBarrageSubscriptionRequest(subscriptionReq);
-                BarrageSubscriptionRequest.addColumns(subscriptionReq, columnsOffset);
-                BarrageSubscriptionRequest.addSubscriptionOptions(subscriptionReq, serializationOptionsOffset);
-                BarrageSubscriptionRequest.addViewport(subscriptionReq, viewportOffset);
-                BarrageSubscriptionRequest.addTicket(subscriptionReq, tableTicketOffset);
-                subscriptionReq.finish(BarrageSubscriptionRequest.endBarrageSubscriptionRequest(subscriptionReq));
-
-                FlightData request = new FlightData();
-                request.setAppMetadata(
-                        WebBarrageUtils.wrapMessage(subscriptionReq, BarrageMessageType.BarrageSubscriptionRequest));
-
-                BiDiStream<FlightData, FlightData> stream = this.<FlightData, FlightData>streamFactory().create(
-                        headers -> flightServiceClient.doExchange(headers),
-                        (first, headers) -> browserFlightServiceClient.openDoExchange(first, headers),
-                        (next, headers, c) -> browserFlightServiceClient.nextDoExchange(next, headers, c::apply),
-                        new FlightData());
-
-                stream.send(request);
-                stream.onData(new JsConsumer<FlightData>() {
-                    @Override
-                    public void apply(FlightData data) {
-                        ByteBuffer body = typedArrayToLittleEndianByteBuffer(data.getDataBody_asU8());
-                        Message headerMessage = Message
-                                .getRootAsMessage(new io.deephaven.javascript.proto.dhinternal.flatbuffers.ByteBuffer(
-                                        data.getDataHeader_asU8()));
-                        if (body.limit() == 0 && headerMessage.headerType() != MessageHeader.RecordBatch) {
-                            // a subscription stream presently ignores schemas and other message types
-                            // TODO hang on to the schema to better handle the now-Utf8 columns
-                            return;
-                        }
-                        RecordBatch header = headerMessage.header(new RecordBatch());
-                        BarrageMessageWrapper barrageMessageWrapper =
-                                BarrageMessageWrapper.getRootAsBarrageMessageWrapper(
-                                        new io.deephaven.javascript.proto.dhinternal.flatbuffers.ByteBuffer(
-                                                data.getAppMetadata_asU8()));
-                        if (barrageMessageWrapper.msgType() == BarrageMessageType.None) {
-                            // continue previous message, just read RecordBatch
-                            appendAndMaybeFlush(header, body);
-                        } else {
-                            assert barrageMessageWrapper.msgType() == BarrageMessageType.BarrageUpdateMetadata;
-                            BarrageUpdateMetadata barrageUpdate = BarrageUpdateMetadata.getRootAsBarrageUpdateMetadata(
-                                    new io.deephaven.javascript.proto.dhinternal.flatbuffers.ByteBuffer(
-                                            new Uint8Array(barrageMessageWrapper.msgPayloadArray())));
-                            startAndMaybeFlush(barrageUpdate.isSnapshot(), header, body, barrageUpdate, isViewport,
-                                    columnTypes);
-                        }
-                    }
-
-                    private DeltaUpdatesBuilder nextDeltaUpdates;
-                    private DeltaUpdates deferredDeltaUpdates;
-
-                    private void appendAndMaybeFlush(RecordBatch header, ByteBuffer body) {
-                        // using existing barrageUpdate, append to the current snapshot/delta
-                        assert nextDeltaUpdates != null;
-                        boolean shouldFlush = nextDeltaUpdates.appendRecordBatch(header, body);
-                        if (shouldFlush) {
-                            DeltaUpdates updates = nextDeltaUpdates.build();
-                            nextDeltaUpdates = null;
-
-                            if (state.getTableDef().getAttributes().isBlinkTable()) {
-                                // blink tables remove all rows from the previous step, if there are no adds this step
-                                // then defer removal until new data arrives -- this makes blink tables GUI friendly
-                                if (updates.getAdded().isEmpty()) {
-                                    if (deferredDeltaUpdates != null) {
-                                        final RangeSet removed = deferredDeltaUpdates.getRemoved();
-                                        updates.getRemoved().rangeIterator().forEachRemaining(removed::addRange);
-                                    } else {
-                                        deferredDeltaUpdates = updates;
-                                    }
-                                    return;
-                                } else if (deferredDeltaUpdates != null) {
-                                    assert updates.getRemoved().isEmpty()
-                                            : "Blink table received two consecutive remove rowsets";
-                                    updates.setRemoved(deferredDeltaUpdates.getRemoved());
-                                    deferredDeltaUpdates = null;
-                                }
-                            }
-                            incrementalUpdates(state.getHandle(), updates);
-                        }
-                    }
-
-                    private void startAndMaybeFlush(boolean isSnapshot, RecordBatch header, ByteBuffer body,
-                            BarrageUpdateMetadata barrageUpdate, boolean isViewport, String[] columnTypes) {
-                        if (isSnapshot) {
-                            TableSnapshot snapshot =
-                                    createSnapshot(header, body, barrageUpdate, isViewport, columnTypes);
-
-                            // for now we always expect snapshots to arrive in a single payload
-                            initialSnapshot(state.getHandle(), snapshot);
-                        } else {
-                            nextDeltaUpdates = deltaUpdates(barrageUpdate, isViewport, columnTypes);
-                            appendAndMaybeFlush(header, body);
-                        }
-                    }
-                });
-                stream.onStatus(err -> {
-                    checkStatus(err);
-                    if (!err.isOk() && !err.isTransportError()) {
-                        state.setResolution(ClientTableState.ResolutionState.FAILED, err.getDetails());
-                    }
-                });
-                BiDiStream<FlightData, FlightData> oldStream = subscriptionStreams.put(state, stream);
-                if (oldStream != null) {
-                    // cancel any old stream, we presently expect a fresh instance
-                    oldStream.end();
-                    oldStream.cancel();
-                }
             }
         }
     }
@@ -1570,6 +1313,10 @@ public ClientConfiguration getConfig() {
         return config;
     }
 
+    public ConfigValue getServerConfigValue(String key) {
+        return constants.getConfigValuesMap().get(key);
+    }
+
     public void onOpen(BiConsumer<Void, String> callback) {
         switch (state) {
             case Connected:
diff --git a/web/client-api/src/main/java/io/deephaven/web/client/api/barrage/CompressedRangeSetReader.java b/web/client-api/src/main/java/io/deephaven/web/client/api/barrage/CompressedRangeSetReader.java
index 6a069c279bc..1ee0c147621 100644
--- a/web/client-api/src/main/java/io/deephaven/web/client/api/barrage/CompressedRangeSetReader.java
+++ b/web/client-api/src/main/java/io/deephaven/web/client/api/barrage/CompressedRangeSetReader.java
@@ -14,27 +14,28 @@
 import java.util.List;
 
 public class CompressedRangeSetReader {
-    private static final byte SHORT_VALUE = 1;
-    private static final byte INT_VALUE = 2;
-    private static final byte LONG_VALUE = 3;
-    private static final byte BYTE_VALUE = 4;
 
-    private static final byte VALUE_MASK = 7;
+    // @formatter:off
+    private static final byte SHORT_VALUE = 0b00000001;
+    private static final byte INT_VALUE   = 0b00000010;
+    private static final byte LONG_VALUE  = 0b00000011;
+    private static final byte BYTE_VALUE  = 0b00000100;
 
-    private static final byte OFFSET = 8;
-    private static final byte SHORT_ARRAY = 16;
-    private static final byte BYTE_ARRAY = 24;
-    private static final byte END = 32;
+    private static final byte VALUE_MASK  = 0b00000111;
 
-    private static final byte CMD_MASK = 0x78;
+    private static final byte OFFSET      = 0b00001000;
+    private static final byte SHORT_ARRAY = 0b00010000;
+    private static final byte BYTE_ARRAY  = 0b00011000;
+    private static final byte END         = 0b00100000;
 
+    private static final byte CMD_MASK    = 0b00111000;
+    // @formatter:on
 
     private long pending = -1;
     private long offset = 0;
-    private List<Range> sortedRanges = new ArrayList<>();
+    private final List<Range> sortedRanges = new ArrayList<>();
 
-
-    public static ByteBuffer writeRange(RangeSet s) {
+    public static ByteBuffer writeRange(final RangeSet s) {
         long offset = 0;
         ByteBuffer payload = ByteBuffer.allocate(s.rangeCount() * 2 * (8 + 1) + 1);// max size it would need to be
         payload.order(ByteOrder.LITTLE_ENDIAN);
@@ -58,77 +59,74 @@ public static ByteBuffer writeRange(RangeSet s) {
         return sliced;
     }
 
-    private static long appendWithDeltaOffset(ByteBuffer payload, ShortBuffer shorts, long offset, long value,
-            boolean negate) {
-        if (value >= offset + Short.MAX_VALUE) {
+    private static long appendWithDeltaOffset(final ByteBuffer payload, final ShortBuffer shorts,
+            final long offset, final long value, final boolean negate) {
+        final long delta = value - offset;
+        if (delta >= Short.MAX_VALUE) {
             flushShorts(payload, shorts);
-
-            long newValue = value - offset;
-            writeValue(payload, OFFSET, negate ? -newValue : newValue);
-        } else if (negate) {
-            shorts.put((short) -(value - offset));
+            writeValue(payload, OFFSET, negate ? -delta : delta);
+            return value;
+        }
+        if (negate) {
+            shorts.put((short) -delta);
         } else {
-            shorts.put((short) (value - offset));
+            shorts.put((short) delta);
         }
         return value;
     }
 
-    private static void flushShorts(ByteBuffer payload, ShortBuffer shorts) {
-        for (int offset = 0; offset < shorts.position();) {
-            int byteCount = 0;
-            while (offset + byteCount < shorts.position() && (shorts.get(offset + byteCount) < Byte.MAX_VALUE
-                    && shorts.get(offset + byteCount) > Byte.MIN_VALUE)) {
-                byteCount++;
+    private static void flushShorts(final ByteBuffer payload, final ShortBuffer shorts) {
+        final int size = shorts.position();
+        int writtenCount = 0;
+        int consecutiveTrailingBytes = 0;
+        for (int nextShortIndex = 0; nextShortIndex < size; ++nextShortIndex) {
+            final short nextShort = shorts.get(nextShortIndex);
+            if (nextShort <= Byte.MAX_VALUE && nextShort >= Byte.MIN_VALUE) {
+                // nextShort can fit into a byte
+                ++consecutiveTrailingBytes;
+                continue;
             }
-            if (byteCount > 3 || byteCount + offset == shorts.position()) {
-                if (byteCount == 1) {
-                    writeValue(payload, OFFSET, shorts.get(offset));
-                } else {
-                    writeValue(payload, BYTE_ARRAY, byteCount);
-                    for (int ii = offset; ii < offset + byteCount; ++ii) {
-                        payload.put((byte) shorts.get(ii));
-                    }
-                }
-
-                offset += byteCount;
-            } else {
-                int shortCount = byteCount;
-                int consecutiveBytes = 0;
-                while (shortCount + consecutiveBytes + offset < shorts.position()) {
-                    final short shortValue = shorts.get(offset + shortCount + consecutiveBytes);
-                    final boolean requiresShort = (shortValue >= Byte.MAX_VALUE || shortValue <= Byte.MIN_VALUE);
-                    if (!requiresShort) {
-                        consecutiveBytes++;
-                    } else {
-                        consecutiveBytes = 0;
-                        shortCount += consecutiveBytes;
-                        shortCount++;
-                    }
-                    if (consecutiveBytes > 3) {
-                        // switch to byte mode
-                        break;
-                    }
-                }
-                // if we have a small number of trailing bytes, tack them onto the end
-                if (consecutiveBytes > 0 && consecutiveBytes <= 3
-                        && (offset + shortCount + consecutiveBytes == shorts.position())) {
-                    shortCount += consecutiveBytes;
-                }
-                if (shortCount >= 2) {
-                    writeValue(payload, SHORT_ARRAY, shortCount);
-                    for (int ii = offset; ii < offset + shortCount; ++ii) {
-                        payload.putShort(shorts.get(ii));
-                    }
-                } else if (shortCount == 1) {
-                    writeValue(payload, OFFSET, shorts.get(offset));
-                }
-                offset += shortCount;
+            // nextShort doesn't fit into a byte, so we've found the end of a (possibly-empty) sequence of bytes
+            if (consecutiveTrailingBytes >= 4) { // See ExternalizableRowSetUtils.shouldWriteBytes for explanation
+                // Write a possibly-empty prefix of shorts, followed by the consecutive bytes we found. Note that we're
+                // not writing the short that triggered the end of the byte sequence; it will join the next sequence.
+                final int shortCount = nextShortIndex - writtenCount - consecutiveTrailingBytes;
+                writeShortsThenBytes(payload, shorts, writtenCount, shortCount, consecutiveTrailingBytes);
+                writtenCount = nextShortIndex;
             }
+            // Now we have at least one short, and no trailing bytes
+            consecutiveTrailingBytes = 0;
         }
+
+        // Write the remaining possibly-empty sequence of shorts, followed by any trailing consecutive bytes
+        final int shortCount = size - writtenCount - consecutiveTrailingBytes;
+        writeShortsThenBytes(payload, shorts, writtenCount, shortCount, consecutiveTrailingBytes);
         shorts.position(0);
     }
 
-    private static void writeValue(ByteBuffer out, byte command, long value) {
+    private static void writeShortsThenBytes(final ByteBuffer payload, final ShortBuffer shorts,
+            int index, final int shortCount, final int byteCount) {
+        if (shortCount == 1) {
+            writeValue(payload, OFFSET, shorts.get(index++));
+        } else if (shortCount > 1) {
+            writeValue(payload, SHORT_ARRAY, shortCount);
+            final int shortLimit = index + shortCount;
+            do {
+                payload.putShort(shorts.get(index++));
+            } while (index < shortLimit);
+        }
+        if (byteCount == 1) {
+            writeValue(payload, OFFSET, shorts.get(index)); // Note, no increment, to avoid unused assignment
+        } else if (byteCount > 1) {
+            writeValue(payload, BYTE_ARRAY, byteCount);
+            final int byteLimit = index + byteCount;
+            do {
+                payload.put((byte) shorts.get(index++));
+            } while (index < byteLimit);
+        }
+    }
+
+    private static void writeValue(final ByteBuffer out, final byte command, final long value) {
         if (value > Integer.MAX_VALUE || value < Integer.MIN_VALUE) {
             out.put((byte) (command | LONG_VALUE));
             out.putLong(value);
@@ -177,7 +175,7 @@ public RangeSet read(ByteBuffer data) {
                     if (pending >= 0) {
                         append(pending);
                     }
-                    return RangeSet.fromSortedRanges(sortedRanges.toArray(new Range[0]));
+                    return RangeSet.fromSortedRanges(sortedRanges);
                 default:
                     throw new IllegalStateException("Bad command: " + command + " at position " + data.position());
             }
diff --git a/web/client-api/src/main/java/io/deephaven/web/client/api/barrage/ShiftedRangeReader.java b/web/client-api/src/main/java/io/deephaven/web/client/api/barrage/ShiftedRangeReader.java
index ac2b7524e6b..3c1c68fc3bb 100644
--- a/web/client-api/src/main/java/io/deephaven/web/client/api/barrage/ShiftedRangeReader.java
+++ b/web/client-api/src/main/java/io/deephaven/web/client/api/barrage/ShiftedRangeReader.java
@@ -12,7 +12,7 @@
 
 public class ShiftedRangeReader {
 
-    public ShiftedRange[] read(ByteBuffer data) {
+    public static ShiftedRange[] read(ByteBuffer data) {
         RangeSet start = new CompressedRangeSetReader().read(data);
         RangeSet end = new CompressedRangeSetReader().read(data);
         RangeSet postShiftStart = new CompressedRangeSetReader().read(data);
@@ -30,4 +30,29 @@ public ShiftedRange[] read(ByteBuffer data) {
 
         return ranges;
     }
+
+    public static ByteBuffer write(ShiftedRange[] shiftedRanges) {
+        RangeSet start = new RangeSet();
+        RangeSet end = new RangeSet();
+        RangeSet postShiftStart = new RangeSet();
+
+        for (int i = 0; i < shiftedRanges.length; i++) {
+            ShiftedRange range = shiftedRanges[i];
+            long first = range.getRange().getFirst();
+            long last = range.getRange().getLast();
+            long delta = range.getDelta() + first;
+            start.addRange(new Range(first, first));
+            end.addRange(new Range(last, last));
+            postShiftStart.addRange(new Range(delta, delta));
+        }
+
+        ByteBuffer startBuf = CompressedRangeSetReader.writeRange(start);
+        ByteBuffer endBuf = CompressedRangeSetReader.writeRange(end);
+        ByteBuffer shiftBuf = CompressedRangeSetReader.writeRange(postShiftStart);
+        ByteBuffer all = ByteBuffer.allocateDirect(startBuf.remaining() + endBuf.remaining() + shiftBuf.remaining());
+        all.put(startBuf);
+        all.put(endBuf);
+        all.put(shiftBuf);
+        return all;
+    }
 }
diff --git a/web/client-api/src/main/java/io/deephaven/web/client/api/barrage/WebBarrageMessage.java b/web/client-api/src/main/java/io/deephaven/web/client/api/barrage/WebBarrageMessage.java
new file mode 100644
index 00000000000..d0e7b87ccda
--- /dev/null
+++ b/web/client-api/src/main/java/io/deephaven/web/client/api/barrage/WebBarrageMessage.java
@@ -0,0 +1,50 @@
+//
+// Copyright (c) 2016-2024 Deephaven Data Labs and Patent Pending
+//
+package io.deephaven.web.client.api.barrage;
+
+import io.deephaven.chunk.Chunk;
+import io.deephaven.chunk.ChunkType;
+import io.deephaven.chunk.attributes.Values;
+import io.deephaven.web.shared.data.RangeSet;
+import io.deephaven.web.shared.data.ShiftedRange;
+
+import java.util.ArrayList;
+import java.util.BitSet;
+
+public class WebBarrageMessage {
+    public static class ModColumnData {
+        public RangeSet rowsModified;
+        public Class<?> type;
+        public Class<?> componentType;
+        public ArrayList<Chunk<Values>> data;
+        public ChunkType chunkType;
+    }
+    public static class AddColumnData {
+        public Class<?> type;
+        public Class<?> componentType;
+        public ArrayList<Chunk<Values>> data;
+        public ChunkType chunkType;
+    }
+
+    public long firstSeq = -1;
+    public long lastSeq = -1;
+    public long step = -1;
+    public long tableSize = -1;
+
+    public boolean isSnapshot;
+    public RangeSet snapshotRowSet;
+    public boolean snapshotRowSetIsReversed;
+    public BitSet snapshotColumns;
+
+    public RangeSet rowsAdded;
+    public RangeSet rowsIncluded;
+    public RangeSet rowsRemoved;
+    public ShiftedRange[] shifted;
+
+    public AddColumnData[] addColumnData;
+    public ModColumnData[] modColumnData;
+
+    // Underlying RecordBatch.length, visible for reading snapshots
+    public long length;
+}
diff --git a/web/client-api/src/main/java/io/deephaven/web/client/api/barrage/WebBarrageStreamReader.java b/web/client-api/src/main/java/io/deephaven/web/client/api/barrage/WebBarrageStreamReader.java
new file mode 100644
index 00000000000..21730296f13
--- /dev/null
+++ b/web/client-api/src/main/java/io/deephaven/web/client/api/barrage/WebBarrageStreamReader.java
@@ -0,0 +1,294 @@
+//
+// Copyright (c) 2016-2024 Deephaven Data Labs and Patent Pending
+//
+package io.deephaven.web.client.api.barrage;
+
+import com.google.common.io.LittleEndianDataInputStream;
+import io.deephaven.barrage.flatbuf.BarrageMessageType;
+import io.deephaven.barrage.flatbuf.BarrageMessageWrapper;
+import io.deephaven.barrage.flatbuf.BarrageModColumnMetadata;
+import io.deephaven.barrage.flatbuf.BarrageUpdateMetadata;
+import io.deephaven.chunk.ChunkType;
+import io.deephaven.chunk.WritableChunk;
+import io.deephaven.chunk.attributes.Values;
+import io.deephaven.engine.rowset.RowSetShiftData;
+import io.deephaven.extensions.barrage.chunk.ChunkInputStreamGenerator;
+import io.deephaven.extensions.barrage.chunk.ChunkReader;
+import io.deephaven.extensions.barrage.util.FlatBufferIteratorAdapter;
+import io.deephaven.extensions.barrage.util.StreamReaderOptions;
+import io.deephaven.io.streams.ByteBufferInputStream;
+import io.deephaven.javascript.proto.dhinternal.arrow.flight.protocol.flight_pb.FlightData;
+import io.deephaven.util.datastructures.LongSizedDataStructure;
+import io.deephaven.web.client.fu.JsLog;
+import io.deephaven.web.shared.data.RangeSet;
+import io.deephaven.web.shared.data.ShiftedRange;
+import org.apache.arrow.flatbuf.Field;
+import org.apache.arrow.flatbuf.Message;
+import org.apache.arrow.flatbuf.MessageHeader;
+import org.apache.arrow.flatbuf.RecordBatch;
+import org.apache.arrow.flatbuf.Schema;
+import org.gwtproject.nio.TypedArrayHelper;
+
+import java.io.IOException;
+import java.nio.ByteBuffer;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.BitSet;
+import java.util.Iterator;
+import java.util.List;
+import java.util.PrimitiveIterator;
+
+/**
+ * Consumes FlightData fields from Flight/Barrage producers and builds browser-compatible WebBarrageMessage payloads
+ * that can be used to maintain table data.
+ */
+public class WebBarrageStreamReader {
+    private static final int MAX_CHUNK_SIZE = Integer.MAX_VALUE - 8;
+
+    // record progress in reading
+    private long numAddRowsRead = 0;
+    private long numAddRowsTotal = 0;
+    private long numModRowsRead = 0;
+    private long numModRowsTotal = 0;
+
+    // hold in-progress messages that aren't finished being built
+    private WebBarrageMessage msg;
+
+    private final WebChunkReaderFactory chunkReaderFactory = new WebChunkReaderFactory();
+    private final List<ChunkReader> readers = new ArrayList<>();
+
+    public WebBarrageMessage parseFrom(
+            final StreamReaderOptions options,
+            ChunkType[] columnChunkTypes,
+            Class<?>[] columnTypes,
+            Class<?>[] componentTypes,
+            FlightData flightData) throws IOException {
+        ByteBuffer headerAsBB = TypedArrayHelper.wrap(flightData.getDataHeader_asU8());
+        Message header = headerAsBB.hasRemaining() ? Message.getRootAsMessage(headerAsBB) : null;
+
+        ByteBuffer msgAsBB = TypedArrayHelper.wrap(flightData.getAppMetadata_asU8());
+        if (msgAsBB.hasRemaining()) {
+            BarrageMessageWrapper wrapper =
+                    BarrageMessageWrapper.getRootAsBarrageMessageWrapper(msgAsBB);
+            if (wrapper.magic() != WebBarrageUtils.FLATBUFFER_MAGIC) {
+                JsLog.warn(
+                        "WebBarrageStreamReader: skipping app_metadata that does not look like BarrageMessageWrapper");
+            } else if (wrapper.msgType() == BarrageMessageType.BarrageUpdateMetadata) {
+                if (msg != null) {
+                    throw new IllegalStateException(
+                            "Previous message was not complete; pending " + (numAddRowsTotal - numAddRowsRead)
+                                    + " add rows and " + (numModRowsTotal - numModRowsRead) + " mod rows");
+                }
+
+                final BarrageUpdateMetadata metadata =
+                        BarrageUpdateMetadata.getRootAsBarrageUpdateMetadata(wrapper.msgPayloadAsByteBuffer());
+
+                msg = new WebBarrageMessage();
+
+                msg.isSnapshot = metadata.isSnapshot();
+                msg.snapshotRowSetIsReversed = metadata.effectiveReverseViewport();
+
+                numAddRowsRead = 0;
+                numModRowsRead = 0;
+
+                if (msg.isSnapshot) {
+                    final ByteBuffer effectiveViewport = metadata.effectiveViewportAsByteBuffer();
+                    if (effectiveViewport != null) {
+                        msg.snapshotRowSet = extractIndex(effectiveViewport);
+                    }
+                    final ByteBuffer effectiveSnapshotColumns = metadata.effectiveColumnSetAsByteBuffer();
+                    if (effectiveSnapshotColumns != null) {
+                        msg.snapshotColumns = extractBitSet(effectiveSnapshotColumns);
+                    }
+                }
+
+                msg.firstSeq = metadata.firstSeq();
+                msg.lastSeq = metadata.lastSeq();
+                msg.tableSize = metadata.tableSize();
+                msg.rowsAdded = extractIndex(metadata.addedRowsAsByteBuffer());
+                msg.rowsRemoved = extractIndex(metadata.removedRowsAsByteBuffer());
+                final ByteBuffer shiftData = metadata.shiftDataAsByteBuffer();
+                msg.shifted = shiftData != null ? extractIndexShiftData(shiftData) : new ShiftedRange[0];
+
+                final ByteBuffer rowsIncluded = metadata.addedRowsIncludedAsByteBuffer();
+                msg.rowsIncluded = rowsIncluded != null ? extractIndex(rowsIncluded) : msg.rowsAdded;
+                msg.addColumnData = new WebBarrageMessage.AddColumnData[columnTypes.length];
+                for (int ci = 0; ci < msg.addColumnData.length; ++ci) {
+                    msg.addColumnData[ci] = new WebBarrageMessage.AddColumnData();
+                    // msg.addColumnData[ci].type = columnTypes[ci];
+                    // msg.addColumnData[ci].componentType = componentTypes[ci];
+                    msg.addColumnData[ci].data = new ArrayList<>();
+
+                    // create an initial chunk of the correct size
+                    final int chunkSize = (int) (Math.min(msg.rowsIncluded.size(), MAX_CHUNK_SIZE));
+                    final WritableChunk<Values> chunk = columnChunkTypes[ci].makeWritableChunk(chunkSize);
+                    chunk.setSize(0);
+                    msg.addColumnData[ci].data.add(chunk);
+                }
+                numAddRowsTotal = msg.rowsIncluded.size();
+
+                // if this message is a snapshot response (vs. subscription) then mod columns may be empty
+                numModRowsTotal = 0;
+                msg.modColumnData = new WebBarrageMessage.ModColumnData[metadata.modColumnNodesLength()];
+                for (int ci = 0; ci < msg.modColumnData.length; ++ci) {
+                    msg.modColumnData[ci] = new WebBarrageMessage.ModColumnData();
+                    // msg.modColumnData[ci].type = columnTypes[ci];
+                    // msg.modColumnData[ci].componentType = componentTypes[ci];
+                    msg.modColumnData[ci].data = new ArrayList<>();
+
+                    final BarrageModColumnMetadata mcd = metadata.modColumnNodes(ci);
+                    msg.modColumnData[ci].rowsModified = extractIndex(mcd.modifiedRowsAsByteBuffer());
+
+                    // create an initial chunk of the correct size
+                    final int chunkSize = (int) (Math.min(msg.modColumnData[ci].rowsModified.size(),
+                            MAX_CHUNK_SIZE));
+                    final WritableChunk<Values> chunk = columnChunkTypes[ci].makeWritableChunk(chunkSize);
+                    chunk.setSize(0);
+                    msg.modColumnData[ci].data.add(chunk);
+
+                    numModRowsTotal = Math.max(numModRowsTotal, msg.modColumnData[ci].rowsModified.size());
+                }
+            }
+        }
+
+        byte headerType = header.headerType();
+        if (headerType == MessageHeader.Schema) {
+            // there is no body and our clients do not want to see schema messages
+            Schema schema = new Schema();
+            header.header(schema);
+            for (int i = 0; i < schema.fieldsLength(); i++) {
+                Field field = schema.fields(i);
+                ChunkReader chunkReader = chunkReaderFactory.getReader(options,
+                        ChunkReader.typeInfo(columnChunkTypes[i], columnTypes[i],
+                                componentTypes[i], field));
+                readers.add(chunkReader);
+            }
+            return null;
+        }
+        if (headerType != MessageHeader.RecordBatch) {
+            throw new IllegalStateException("Only know how to decode Schema/RecordBatch messages");
+        }
+
+
+        // throw an error when no app metadata (snapshots now provide by default)
+        if (msg == null) {
+            throw new IllegalStateException(
+                    "Missing app metadata tag; cannot decode using BarrageStreamReader");
+        }
+
+        final RecordBatch batch = (RecordBatch) header.header(new RecordBatch());
+        msg.length = batch.length();
+        ByteBuffer body = TypedArrayHelper.wrap(flightData.getDataBody_asU8());
+        final LittleEndianDataInputStream ois =
+                new LittleEndianDataInputStream(new ByteBufferInputStream(body));
+        final Iterator<ChunkInputStreamGenerator.FieldNodeInfo> fieldNodeIter =
+                new FlatBufferIteratorAdapter<>(batch.nodesLength(),
+                        i -> new ChunkInputStreamGenerator.FieldNodeInfo(batch.nodes(i)));
+
+        final long[] bufferInfo = new long[batch.buffersLength()];
+        for (int bi = 0; bi < batch.buffersLength(); ++bi) {
+            int offset = LongSizedDataStructure.intSize("BufferInfo", batch.buffers(bi).offset());
+            int length = LongSizedDataStructure.intSize("BufferInfo", batch.buffers(bi).length());
+            if (bi < batch.buffersLength() - 1) {
+                final int nextOffset =
+                        LongSizedDataStructure.intSize("BufferInfo", batch.buffers(bi + 1).offset());
+                // our parsers handle overhanging buffers
+                length += Math.max(0, nextOffset - offset - length);
+            }
+            bufferInfo[bi] = length;
+        }
+        final PrimitiveIterator.OfLong bufferInfoIter = Arrays.stream(bufferInfo).iterator();
+
+
+        // add and mod rows are never combined in a batch. all added rows must be received before the first
+        // mod rows will be received.
+        if (numAddRowsRead < numAddRowsTotal) {
+            for (int ci = 0; ci < msg.addColumnData.length; ++ci) {
+                final WebBarrageMessage.AddColumnData acd = msg.addColumnData[ci];
+
+                final long remaining = numAddRowsTotal - numAddRowsRead;
+                if (batch.length() > remaining) {
+                    throw new IllegalStateException(
+                            "Batch length exceeded the expected number of rows from app metadata");
+                }
+
+                // select the current chunk size and read the size
+                int lastChunkIndex = acd.data.size() - 1;
+                WritableChunk<Values> chunk = (WritableChunk<Values>) acd.data.get(lastChunkIndex);
+
+                if (batch.length() > chunk.capacity() - chunk.size()) {
+                    // reading the rows from this batch will overflow the existing chunk; create a new one
+                    final int chunkSize = (int) (Math.min(remaining, MAX_CHUNK_SIZE));
+                    chunk = columnChunkTypes[ci].makeWritableChunk(chunkSize);
+                    acd.data.add(chunk);
+
+                    chunk.setSize(0);
+                    ++lastChunkIndex;
+                }
+
+                // fill the chunk with data and assign back into the array
+                acd.data.set(lastChunkIndex,
+                        readers.get(ci).readChunk(fieldNodeIter, bufferInfoIter, ois, chunk, chunk.size(),
+                                (int) batch.length()));
+                chunk.setSize(chunk.size() + (int) batch.length());
+            }
+            numAddRowsRead += batch.length();
+        } else {
+            for (int ci = 0; ci < msg.modColumnData.length; ++ci) {
+                final WebBarrageMessage.ModColumnData mcd = msg.modColumnData[ci];
+
+                // another column may be larger than this column
+                long remaining = Math.max(0, mcd.rowsModified.size() - numModRowsRead);
+
+                // need to add the batch row data to the column chunks
+                int lastChunkIndex = mcd.data.size() - 1;
+                WritableChunk<Values> chunk = (WritableChunk<Values>) mcd.data.get(lastChunkIndex);
+
+                final int numRowsToRead = LongSizedDataStructure.intSize("BarrageStreamReader",
+                        Math.min(remaining, batch.length()));
+                if (numRowsToRead > chunk.capacity() - chunk.size()) {
+                    // reading the rows from this batch will overflow the existing chunk; create a new one
+                    final int chunkSize = (int) (Math.min(remaining, MAX_CHUNK_SIZE));
+                    chunk = columnChunkTypes[ci].makeWritableChunk(chunkSize);
+                    mcd.data.add(chunk);
+
+                    chunk.setSize(0);
+                    ++lastChunkIndex;
+                }
+
+                // fill the chunk with data and assign back into the array
+                mcd.data.set(lastChunkIndex,
+                        readers.get(ci).readChunk(fieldNodeIter, bufferInfoIter, ois, chunk, chunk.size(),
+                                numRowsToRead));
+                chunk.setSize(chunk.size() + numRowsToRead);
+            }
+            numModRowsRead += batch.length();
+        }
+
+        if (numAddRowsRead == numAddRowsTotal && numModRowsRead == numModRowsTotal) {
+            final WebBarrageMessage retval = msg;
+            msg = null;
+            return retval;
+        }
+
+        // otherwise, must wait for more data
+        return null;
+    }
+
+    private static RangeSet extractIndex(final ByteBuffer bb) {
+        if (bb == null) {
+            return RangeSet.empty();
+        }
+        return new CompressedRangeSetReader().read(bb);
+    }
+
+    private static BitSet extractBitSet(final ByteBuffer bb) {
+        byte[] array = new byte[bb.remaining()];
+        bb.get(array);
+        return BitSet.valueOf(array);
+    }
+
+    private static ShiftedRange[] extractIndexShiftData(final ByteBuffer bb) {
+        return ShiftedRangeReader.read(bb);
+    }
+}
diff --git a/web/client-api/src/main/java/io/deephaven/web/client/api/barrage/WebBarrageUtils.java b/web/client-api/src/main/java/io/deephaven/web/client/api/barrage/WebBarrageUtils.java
index 8f11e5ebe27..648025723a5 100644
--- a/web/client-api/src/main/java/io/deephaven/web/client/api/barrage/WebBarrageUtils.java
+++ b/web/client-api/src/main/java/io/deephaven/web/client/api/barrage/WebBarrageUtils.java
@@ -3,64 +3,58 @@
 //
 package io.deephaven.web.client.api.barrage;
 
+import com.google.flatbuffers.FlatBufferBuilder;
 import elemental2.core.*;
-import io.deephaven.javascript.proto.dhinternal.arrow.flight.flatbuf.message_generated.org.apache.arrow.flatbuf.FieldNode;
-import io.deephaven.javascript.proto.dhinternal.arrow.flight.flatbuf.message_generated.org.apache.arrow.flatbuf.Message;
-import io.deephaven.javascript.proto.dhinternal.arrow.flight.flatbuf.message_generated.org.apache.arrow.flatbuf.MessageHeader;
-import io.deephaven.javascript.proto.dhinternal.arrow.flight.flatbuf.message_generated.org.apache.arrow.flatbuf.RecordBatch;
-import io.deephaven.javascript.proto.dhinternal.arrow.flight.flatbuf.schema_generated.org.apache.arrow.flatbuf.Buffer;
-import io.deephaven.javascript.proto.dhinternal.arrow.flight.flatbuf.schema_generated.org.apache.arrow.flatbuf.Field;
-import io.deephaven.javascript.proto.dhinternal.arrow.flight.flatbuf.schema_generated.org.apache.arrow.flatbuf.KeyValue;
-import io.deephaven.javascript.proto.dhinternal.arrow.flight.flatbuf.schema_generated.org.apache.arrow.flatbuf.Schema;
-import io.deephaven.javascript.proto.dhinternal.flatbuffers.Builder;
-import io.deephaven.javascript.proto.dhinternal.io.deephaven.barrage.flatbuf.barrage_generated.io.deephaven.barrage.flatbuf.BarrageMessageType;
-import io.deephaven.javascript.proto.dhinternal.io.deephaven.barrage.flatbuf.barrage_generated.io.deephaven.barrage.flatbuf.BarrageMessageWrapper;
-import io.deephaven.javascript.proto.dhinternal.io.deephaven.barrage.flatbuf.barrage_generated.io.deephaven.barrage.flatbuf.BarrageModColumnMetadata;
-import io.deephaven.javascript.proto.dhinternal.io.deephaven.barrage.flatbuf.barrage_generated.io.deephaven.barrage.flatbuf.BarrageUpdateMetadata;
+import io.deephaven.barrage.flatbuf.BarrageMessageType;
+import io.deephaven.barrage.flatbuf.BarrageMessageWrapper;
 import io.deephaven.web.client.api.barrage.def.ColumnDefinition;
 import io.deephaven.web.client.api.barrage.def.InitialTableDefinition;
 import io.deephaven.web.client.api.barrage.def.TableAttributesDefinition;
 import io.deephaven.web.shared.data.*;
-import io.deephaven.web.shared.data.columns.*;
-import jsinterop.base.Js;
+import org.apache.arrow.flatbuf.KeyValue;
+import org.apache.arrow.flatbuf.Message;
+import org.apache.arrow.flatbuf.MessageHeader;
+import org.apache.arrow.flatbuf.Schema;
 import org.gwtproject.nio.TypedArrayHelper;
 
-import java.math.BigDecimal;
-import java.math.BigInteger;
 import java.nio.ByteBuffer;
-import java.nio.ByteOrder;
-import java.nio.IntBuffer;
-import java.nio.charset.StandardCharsets;
-import java.util.BitSet;
 import java.util.HashMap;
-import java.util.Iterator;
 import java.util.Map;
 import java.util.Set;
-import java.util.function.DoubleFunction;
-import java.util.stream.IntStream;
+import java.util.function.IntFunction;
 
 /**
  * Utility to read barrage record batches.
  */
 public class WebBarrageUtils {
-    private static final int MAGIC = 0x6E687064;
-
-    public static Uint8Array wrapMessage(Builder innerBuilder, int messageType) {
-        Builder outerBuilder = new Builder(1024);
-        // This deprecation is incorrect, tsickle didn't understand that only one overload is deprecated
-        // noinspection deprecation
-        double messageOffset = BarrageMessageWrapper.createMsgPayloadVector(outerBuilder, innerBuilder.asUint8Array());
-        double offset =
-                BarrageMessageWrapper.createBarrageMessageWrapper(outerBuilder, MAGIC, messageType, messageOffset);
+    public static final int FLATBUFFER_MAGIC = 0x6E687064;
+
+    public static Uint8Array wrapMessage(FlatBufferBuilder innerBuilder, byte messageType) {
+        FlatBufferBuilder outerBuilder = new FlatBufferBuilder(1024);
+        int messageOffset = BarrageMessageWrapper.createMsgPayloadVector(outerBuilder, innerBuilder.dataBuffer());
+        int offset =
+                BarrageMessageWrapper.createBarrageMessageWrapper(outerBuilder, FLATBUFFER_MAGIC, messageType,
+                        messageOffset);
         outerBuilder.finish(offset);
-        return outerBuilder.asUint8Array();
+        ByteBuffer byteBuffer = outerBuilder.dataBuffer();
+        return bbToUint8ArrayView(byteBuffer);
+    }
+
+    public static Uint8Array bbToUint8ArrayView(ByteBuffer byteBuffer) {
+        ArrayBufferView view = TypedArrayHelper.unwrap(byteBuffer);
+        return new Uint8Array(view.buffer, byteBuffer.position() + view.byteOffset, byteBuffer.remaining());
     }
 
     public static Uint8Array emptyMessage() {
-        Builder builder = new Builder(1024);
-        double offset = BarrageMessageWrapper.createBarrageMessageWrapper(builder, MAGIC, BarrageMessageType.None, 0);
+        FlatBufferBuilder builder = new FlatBufferBuilder(1024);
+        int offset = BarrageMessageWrapper.createBarrageMessageWrapper(builder, FLATBUFFER_MAGIC,
+                BarrageMessageType.None, 0);
         builder.finish(offset);
-        return builder.asUint8Array();
+        return bbToUint8ArrayView(builder.dataBuffer());
+    }
+
+    public static InitialTableDefinition readTableDefinition(Uint8Array flightSchemaMessage) {
+        return readTableDefinition(readSchemaMessage(flightSchemaMessage));
     }
 
     public static InitialTableDefinition readTableDefinition(Schema schema) {
@@ -76,50 +70,10 @@ public static InitialTableDefinition readTableDefinition(Schema schema) {
                 .setColumns(cols);
     }
 
-    public static ColumnDefinition[] readColumnDefinitions(Schema schema) {
+    private static ColumnDefinition[] readColumnDefinitions(Schema schema) {
         ColumnDefinition[] cols = new ColumnDefinition[(int) schema.fieldsLength()];
         for (int i = 0; i < schema.fieldsLength(); i++) {
-            cols[i] = new ColumnDefinition();
-            Field f = schema.fields(i);
-            Map<String, String> fieldMetadata =
-                    keyValuePairs("deephaven:", f.customMetadataLength(), f::customMetadata);
-            cols[i].setName(f.name().asString());
-            cols[i].setColumnIndex(i);
-            cols[i].setType(fieldMetadata.get("type"));
-            cols[i].setIsSortable("true".equals(fieldMetadata.get("isSortable")));
-            cols[i].setStyleColumn("true".equals(fieldMetadata.get("isStyle")));
-            cols[i].setFormatColumn("true".equals(fieldMetadata.get("isDateFormat"))
-                    || "true".equals(fieldMetadata.get("isNumberFormat")));
-            cols[i].setForRow("true".equals(fieldMetadata.get("isRowStyle")));
-
-            String formatColumnName = fieldMetadata.get("dateFormatColumn");
-            if (formatColumnName == null) {
-                formatColumnName = fieldMetadata.get("numberFormatColumn");
-            }
-            cols[i].setFormatColumnName(formatColumnName);
-
-            cols[i].setStyleColumnName(fieldMetadata.get("styleColumn"));
-
-            if (fieldMetadata.containsKey("inputtable.isKey")) {
-                cols[i].setInputTableKeyColumn("true".equals(fieldMetadata.get("inputtable.isKey")));
-            }
-
-            cols[i].setDescription(fieldMetadata.get("description"));
-
-            cols[i].setPartitionColumn("true".equals(fieldMetadata.get("isPartitioning")));
-
-            cols[i].setHierarchicalExpandByColumn(
-                    "true".equals(fieldMetadata.get("hierarchicalTable.isExpandByColumn")));
-            cols[i].setHierarchicalRowDepthColumn(
-                    "true".equals(fieldMetadata.get("hierarchicalTable.isRowDepthColumn")));
-            cols[i].setHierarchicalRowExpandedColumn(
-                    "true".equals(fieldMetadata.get("hierarchicalTable.isRowExpandedColumn")));
-            cols[i].setRollupAggregatedNodeColumn(
-                    "true".equals(fieldMetadata.get("rollupTable.isAggregatedNodeColumn")));
-            cols[i].setRollupConstituentNodeColumn(
-                    "true".equals(fieldMetadata.get("rollupTable.isConstituentNodeColumn")));
-            cols[i].setRollupGroupByColumn("true".equals(fieldMetadata.get("rollupTable.isGroupByColumn")));
-            cols[i].setRollupAggregationInputColumn(fieldMetadata.get("rollupTable.aggregationInputColumnName"));
+            cols[i] = new ColumnDefinition(i, schema.fields(i));
         }
         return cols;
     }
@@ -129,505 +83,42 @@ public static Schema readSchemaMessage(Uint8Array flightSchemaMessage) {
         // - IPC_CONTINUATION_TOKEN (4-byte int of -1)
         // - message size (4-byte int)
         // - a Message wrapping the schema
-        io.deephaven.javascript.proto.dhinternal.flatbuffers.ByteBuffer bb =
-                new io.deephaven.javascript.proto.dhinternal.flatbuffers.ByteBuffer(flightSchemaMessage);
-        bb.setPosition(bb.position() + 8);
+        ByteBuffer bb = TypedArrayHelper.wrap(flightSchemaMessage);
+        bb.position(bb.position() + 8);
         Message headerMessage = Message.getRootAsMessage(bb);
 
         assert headerMessage.headerType() == MessageHeader.Schema;
-        return headerMessage.header(new Schema());
+        return (Schema) headerMessage.header(new Schema());
     }
 
     public static Map<String, String> keyValuePairs(String filterPrefix, double count,
-            DoubleFunction<KeyValue> accessor) {
+            IntFunction<KeyValue> accessor) {
         Map<String, String> map = new HashMap<>();
         for (int i = 0; i < count; i++) {
             KeyValue pair = accessor.apply(i);
-            String key = pair.key().asString();
+            String key = pair.key();
             if (key.startsWith(filterPrefix)) {
                 key = key.substring(filterPrefix.length());
-                String oldValue = map.put(key, pair.value().asString());
+                String oldValue = map.put(key, pair.value());
                 assert oldValue == null : key + " had " + oldValue + ", replaced with " + pair.value();
             }
         }
         return map;
     }
 
-    /**
-     * Iterator wrapper that allows peeking at the next item, if any.
-     */
-    private static class Iter<T> implements Iterator<T> {
-        private final Iterator<T> wrapped;
-        private T next;
-
-        private Iter(Iterator<T> wrapped) {
-            this.wrapped = wrapped;
-        }
-
-        public T peek() {
-            if (next != null) {
-                return next;
-            }
-            return next = next();
-        }
-
-        @Override
-        public boolean hasNext() {
-            return next != null || wrapped.hasNext();
-        }
-
-        @Override
-        public T next() {
-            if (next == null) {
-                return wrapped.next();
-            }
-            T val = next;
-            next = null;
-            return val;
-        }
-    }
-
-    public static Uint8Array makeUint8ArrayFromBitset(BitSet bitset) {
-        int length = (bitset.previousSetBit(Integer.MAX_VALUE - 1) + 8) / 8;
-        Uint8Array array = new Uint8Array(length);
-        byte[] bytes = bitset.toByteArray();
-        for (int i = 0; i < bytes.length; i++) {
-            array.setAt(i, (double) bytes[i]);
-        }
-
-        return array;
-    }
-
-    public static Uint8Array serializeRanges(Set<RangeSet> rangeSets) {
+    public static ByteBuffer serializeRanges(Set<RangeSet> rangeSets) {
         final RangeSet s;
-        if (rangeSets.size() == 0) {
-            return new Uint8Array(0);
+        if (rangeSets.isEmpty()) {
+            return ByteBuffer.allocate(0);
         } else if (rangeSets.size() == 1) {
             s = rangeSets.iterator().next();
         } else {
             s = new RangeSet();
             for (RangeSet rangeSet : rangeSets) {
-                rangeSet.rangeIterator().forEachRemaining(s::addRange);
-            }
-        }
-
-        ByteBuffer payload = CompressedRangeSetReader.writeRange(s);
-        ArrayBufferView buffer = TypedArrayHelper.unwrap(payload);
-        return new Uint8Array(buffer);
-    }
-
-    public static ByteBuffer typedArrayToLittleEndianByteBuffer(Uint8Array data) {
-        ArrayBuffer slicedBuffer = data.<Uint8Array>slice().buffer;
-        ByteBuffer bb = TypedArrayHelper.wrap(slicedBuffer);
-        bb.order(ByteOrder.LITTLE_ENDIAN);
-        return bb;
-    }
-
-    public static ByteBuffer typedArrayToLittleEndianByteBuffer(Int8Array data) {
-        ArrayBuffer slicedBuffer = data.<Int8Array>slice().buffer;
-        ByteBuffer bb = TypedArrayHelper.wrap(slicedBuffer);
-        bb.order(ByteOrder.LITTLE_ENDIAN);
-        return bb;
-    }
-
-    public static TableSnapshot createSnapshot(RecordBatch header, ByteBuffer body, BarrageUpdateMetadata barrageUpdate,
-            boolean isViewport, String[] columnTypes) {
-        RangeSet added;
-
-        final RangeSet includedAdditions;
-        if (barrageUpdate == null) {
-            includedAdditions = added = RangeSet.ofRange(0, (long) (header.length().toFloat64() - 1));
-        } else {
-            added = new CompressedRangeSetReader()
-                    .read(typedArrayToLittleEndianByteBuffer(barrageUpdate.addedRowsArray()));
-
-            Int8Array addedRowsIncluded = barrageUpdate.addedRowsIncludedArray();
-            if (isViewport && addedRowsIncluded != null) {
-                includedAdditions = new CompressedRangeSetReader()
-                        .read(typedArrayToLittleEndianByteBuffer(addedRowsIncluded));
-            } else {
-                // if this isn't a viewport, then a second index isn't sent, because all rows are included
-                includedAdditions = added;
-            }
-        }
-
-        // read the nodes and buffers into iterators so that we can descend into the data columns as necessary
-        Iter<FieldNode> nodes =
-                new Iter<>(IntStream.range(0, (int) header.nodesLength()).mapToObj(header::nodes).iterator());
-        Iter<Buffer> buffers =
-                new Iter<>(IntStream.range(0, (int) header.buffersLength()).mapToObj(header::buffers).iterator());
-        ColumnData[] columnData = new ColumnData[columnTypes.length];
-        for (int columnIndex = 0; columnIndex < columnTypes.length; ++columnIndex) {
-            columnData[columnIndex] =
-                    readArrowBuffer(body, nodes, buffers, (int) includedAdditions.size(), columnTypes[columnIndex]);
-        }
-
-        return new TableSnapshot(includedAdditions, columnData, added.size());
-    }
-
-    public static DeltaUpdatesBuilder deltaUpdates(BarrageUpdateMetadata barrageUpdate, boolean isViewport,
-            String[] columnTypes) {
-        return new DeltaUpdatesBuilder(barrageUpdate, isViewport, columnTypes);
-    }
-
-    public static class DeltaUpdatesBuilder {
-        private final DeltaUpdates deltaUpdates = new DeltaUpdates();
-        private final BarrageUpdateMetadata barrageUpdate;
-        private final String[] columnTypes;
-        private long numAddRowsRemaining = 0;
-        private long numModRowsRemaining = 0;
-
-        public DeltaUpdatesBuilder(BarrageUpdateMetadata barrageUpdate, boolean isViewport, String[] columnTypes) {
-            this.barrageUpdate = barrageUpdate;
-            this.columnTypes = columnTypes;
-
-            deltaUpdates.setAdded(new CompressedRangeSetReader()
-                    .read(typedArrayToLittleEndianByteBuffer(barrageUpdate.addedRowsArray())));
-            deltaUpdates.setRemoved(new CompressedRangeSetReader()
-                    .read(typedArrayToLittleEndianByteBuffer(barrageUpdate.removedRowsArray())));
-
-            deltaUpdates.setShiftedRanges(
-                    new ShiftedRangeReader().read(typedArrayToLittleEndianByteBuffer(barrageUpdate.shiftDataArray())));
-
-            RangeSet includedAdditions;
-
-            Int8Array addedRowsIncluded = barrageUpdate.addedRowsIncludedArray();
-            if (isViewport && addedRowsIncluded != null) {
-                includedAdditions = new CompressedRangeSetReader()
-                        .read(typedArrayToLittleEndianByteBuffer(addedRowsIncluded));
-            } else {
-                // if this isn't a viewport, then a second index isn't sent, because all rows are included
-                includedAdditions = deltaUpdates.getAdded();
+                s.addRangeSet(rangeSet);
             }
-            numAddRowsRemaining = includedAdditions.size();
-            deltaUpdates.setIncludedAdditions(includedAdditions);
-            deltaUpdates.setSerializedAdditions(new DeltaUpdates.ColumnAdditions[0]);
-            deltaUpdates.setSerializedModifications(new DeltaUpdates.ColumnModifications[0]);
-
-            for (int columnIndex = 0; columnIndex < columnTypes.length; ++columnIndex) {
-                BarrageModColumnMetadata columnMetadata = barrageUpdate.modColumnNodes(columnIndex);
-                RangeSet modifiedRows = new CompressedRangeSetReader()
-                        .read(typedArrayToLittleEndianByteBuffer(columnMetadata.modifiedRowsArray()));
-                numModRowsRemaining = Math.max(numModRowsRemaining, modifiedRows.size());
-            }
-        }
-
-        /**
-         * Appends a new record batch and payload. Returns true if this was the final record batch that was expected.
-         */
-        public boolean appendRecordBatch(RecordBatch recordBatch, ByteBuffer body) {
-            if (numAddRowsRemaining > 0) {
-                handleAddBatch(recordBatch, body);
-            } else if (numModRowsRemaining > 0) {
-                handleModBatch(recordBatch, body);
-            }
-            // return true when complete
-            return numAddRowsRemaining == 0 && numModRowsRemaining == 0;
         }
 
-        private void handleAddBatch(RecordBatch recordBatch, ByteBuffer body) {
-            Iter<FieldNode> nodes = new Iter<>(
-                    IntStream.range(0, (int) recordBatch.nodesLength()).mapToObj(recordBatch::nodes).iterator());
-            Iter<Buffer> buffers = new Iter<>(
-                    IntStream.range(0, (int) recordBatch.buffersLength()).mapToObj(recordBatch::buffers).iterator());
-
-            DeltaUpdates.ColumnAdditions[] addedColumnData = new DeltaUpdates.ColumnAdditions[columnTypes.length];
-            for (int columnIndex = 0; columnIndex < columnTypes.length; ++columnIndex) {
-                assert nodes.hasNext() && buffers.hasNext();
-                ColumnData columnData = readArrowBuffer(body, nodes, buffers, (int) nodes.peek().length().toFloat64(),
-                        columnTypes[columnIndex]);
-
-                addedColumnData[columnIndex] = new DeltaUpdates.ColumnAdditions(columnIndex, columnData);
-            }
-            deltaUpdates.setSerializedAdditions(addedColumnData);
-            numAddRowsRemaining -= (long) recordBatch.length().toFloat64();
-        }
-
-        private void handleModBatch(RecordBatch recordBatch, ByteBuffer body) {
-            Iter<FieldNode> nodes = new Iter<>(
-                    IntStream.range(0, (int) recordBatch.nodesLength()).mapToObj(recordBatch::nodes).iterator());
-            Iter<Buffer> buffers = new Iter<>(
-                    IntStream.range(0, (int) recordBatch.buffersLength()).mapToObj(recordBatch::buffers).iterator());
-
-            DeltaUpdates.ColumnModifications[] modifiedColumnData =
-                    new DeltaUpdates.ColumnModifications[columnTypes.length];
-            for (int columnIndex = 0; columnIndex < columnTypes.length; ++columnIndex) {
-                assert nodes.hasNext() && buffers.hasNext();
-
-                BarrageModColumnMetadata columnMetadata = barrageUpdate.modColumnNodes(columnIndex);
-                RangeSet modifiedRows = new CompressedRangeSetReader()
-                        .read(typedArrayToLittleEndianByteBuffer(columnMetadata.modifiedRowsArray()));
-
-                ColumnData columnData = readArrowBuffer(body, nodes, buffers, (int) nodes.peek().length().toFloat64(),
-                        columnTypes[columnIndex]);
-                modifiedColumnData[columnIndex] =
-                        new DeltaUpdates.ColumnModifications(columnIndex, modifiedRows, columnData);
-            }
-            deltaUpdates.setSerializedModifications(modifiedColumnData);
-            numModRowsRemaining -= (long) recordBatch.length().toFloat64();
-        }
-
-        public DeltaUpdates build() {
-            return deltaUpdates;
-        }
+        return CompressedRangeSetReader.writeRange(s);
     }
-
-    private static ColumnData readArrowBuffer(ByteBuffer data, Iter<FieldNode> nodes, Iter<Buffer> buffers, int size,
-            String columnType) {
-        // explicit cast to be clear that we're rounding down
-        BitSet valid = readValidityBufferAsBitset(data, size, buffers.next());
-        FieldNode thisNode = nodes.next();
-        boolean hasNulls = thisNode.nullCount().toFloat64() != 0;
-        size = Math.min(size, (int) thisNode.length().toFloat64());
-
-        Buffer positions = buffers.next();
-        switch (columnType) {
-            // for simple well-supported typedarray types, wrap and return
-            case "int":
-                assert positions.length().toFloat64() >= size * 4;
-                Int32Array intArray = new Int32Array(TypedArrayHelper.unwrap(data).buffer,
-                        (int) positions.offset().toFloat64(), size);
-                return new IntArrayColumnData(Js.uncheckedCast(intArray));
-            case "short":
-                assert positions.length().toFloat64() >= size * 2;
-                Int16Array shortArray = new Int16Array(TypedArrayHelper.unwrap(data).buffer,
-                        (int) positions.offset().toFloat64(), size);
-                return new ShortArrayColumnData(Js.uncheckedCast(shortArray));
-            case "boolean":
-            case "java.lang.Boolean":
-                // noinspection IntegerDivisionInFloatingPointContext
-                assert positions.length().toFloat64() >= ((size + 63) / 64);
-                // booleans are stored as a bitset, but internally we represent booleans as bytes
-                data.position((int) positions.offset().toFloat64());
-                BitSet wireValues = readBitSetWithLength(data, (int) (positions.length().toFloat64()));
-                Boolean[] boolArray = new Boolean[size];
-                for (int i = 0; i < size; ++i) {
-                    if (!hasNulls || valid.get(i)) {
-                        boolArray[i] = wireValues.get(i);
-                    } else {
-                        boolArray[i] = null;
-                    }
-                }
-                return new BooleanArrayColumnData(boolArray);
-            case "byte":
-                assert positions.length().toFloat64() >= size;
-                Int8Array byteArray =
-                        new Int8Array(TypedArrayHelper.unwrap(data).buffer, (int) positions.offset().toFloat64(), size);
-                return new ByteArrayColumnData(Js.uncheckedCast(byteArray));
-            case "double":
-                assert positions.length().toFloat64() >= size * 8;
-                Float64Array doubleArray = new Float64Array(TypedArrayHelper.unwrap(data).buffer,
-                        (int) positions.offset().toFloat64(), size);
-                return new DoubleArrayColumnData(Js.uncheckedCast(doubleArray));
-            case "float":
-                assert positions.length().toFloat64() >= size * 4;
-                Float32Array floatArray = new Float32Array(TypedArrayHelper.unwrap(data).buffer,
-                        (int) positions.offset().toFloat64(), size);
-                return new FloatArrayColumnData(Js.uncheckedCast(floatArray));
-            case "char":
-                assert positions.length().toFloat64() >= size * 2;
-                Uint16Array charArray = new Uint16Array(TypedArrayHelper.unwrap(data).buffer,
-                        (int) positions.offset().toFloat64(), size);
-                return new CharArrayColumnData(Js.uncheckedCast(charArray));
-            // longs are a special case despite being java primitives
-            case "long":
-            case "java.time.Instant":
-            case "java.time.ZonedDateTime":
-                assert positions.length().toFloat64() >= size * 8;
-                long[] longArray = new long[size];
-
-                data.position((int) positions.offset().toFloat64());
-                for (int i = 0; i < size; i++) {
-                    longArray[i] = data.getLong();
-                }
-                return new LongArrayColumnData(longArray);
-            // all other types are read out in some custom way
-            case "java.time.LocalTime":// LocalDateArrayColumnData
-                assert positions.length().toFloat64() >= size * 6;
-                data.position((int) positions.offset().toFloat64());
-                LocalDate[] localDateArray = new LocalDate[size];
-                for (int i = 0; i < size; i++) {
-                    int year = data.getInt();
-                    byte month = data.get();
-                    byte day = data.get();
-                    localDateArray[i] = new LocalDate(year, month, day);
-                }
-                return new LocalDateArrayColumnData(localDateArray);
-            case "java.time.LocalDate":// LocalTimeArrayColumnData
-                assert positions.length().toFloat64() == size * 7;
-                LocalTime[] localTimeArray = new LocalTime[size];
-
-                data.position((int) positions.offset().toFloat64());
-                for (int i = 0; i < size; i++) {
-                    int nano = data.getInt();
-                    byte hour = data.get();
-                    byte minute = data.get();
-                    byte second = data.get();
-                    data.position(data.position() + 1);// aligned for next read
-                    localTimeArray[i] = new LocalTime(hour, minute, second, nano);
-                }
-                return new LocalTimeArrayColumnData(localTimeArray);
-            default:
-                // remaining types have an offset buffer to read first
-                IntBuffer offsets = readOffsets(data, size, positions);
-
-                if (columnType.endsWith("[]")) {
-                    FieldNode arrayNode = nodes.next();
-                    int innerSize = (int) arrayNode.length().toFloat64();
-                    boolean innerHasNulls = arrayNode.nullCount().toFloat64() != 0;
-
-                    // array type, also read the inner valid buffer and inner offset buffer
-                    BitSet innerValid = readValidityBufferAsBitset(data, innerSize, buffers.next());
-                    IntBuffer innerOffsets = readOffsets(data, innerSize, buffers.next());
-
-                    Buffer payload = buffers.next();
-
-                    switch (columnType) {
-                        case "java.lang.String[]":
-                            String[][] strArrArr = new String[size][];
-
-                            for (int i = 0; i < size; i++) {
-                                if (hasNulls && !valid.get(i)) {
-                                    strArrArr[i] = null;
-                                    continue;
-                                }
-                                int arrayStart = offsets.get(i);
-                                int instanceSize = offsets.get(i + 1) - arrayStart;
-                                String[] strArr = new String[instanceSize];
-                                for (int j = 0; j < instanceSize; j++) {
-                                    int inner = j + arrayStart;
-                                    assert innerOffsets != null;
-                                    if (innerHasNulls && !innerValid.get(inner)) {
-                                        assert innerOffsets.get(inner) == innerOffsets.get(inner + 1)
-                                                : innerOffsets.get(inner) + " == " + innerOffsets.get(inner + 1);
-                                        strArr[j] = null;
-                                        continue;
-                                    }
-                                    // might be cheaper to do views on the underlying bb (which will be copied anyway
-                                    // into the String)
-                                    data.position((int) (payload.offset().toFloat64()) + innerOffsets.get(inner));
-                                    int stringSize = innerOffsets.get(inner + 1) - innerOffsets.get(inner);
-                                    byte[] stringBytes = new byte[stringSize];
-                                    data.get(stringBytes);
-                                    strArr[j] = new String(stringBytes, StandardCharsets.UTF_8);
-                                }
-                                strArrArr[i] = strArr;
-                            }
-
-                            return new StringArrayArrayColumnData(strArrArr);
-                        default:
-                            throw new IllegalStateException("Can't decode column of type " + columnType);
-                    }
-
-                } else {
-                    // non-array, variable length stuff, just grab the buffer and read ranges specified by offsets
-                    Buffer payload = buffers.next();
-
-                    switch (columnType) {
-                        case "java.lang.String": {
-                            String[] stringArray = new String[size];
-                            byte[] buf = new byte[32];
-                            for (int i = 0; i < size; i++) {
-                                if (hasNulls && !valid.get(i)) {
-                                    stringArray[i] = null;
-                                    continue;
-                                }
-                                int ioff = offsets.get(i);
-                                int len = offsets.get(i + 1) - ioff;
-                                data.position((int) (payload.offset().toFloat64()) + ioff);
-                                if (buf.length < len) {
-                                    buf = new byte[len];
-                                }
-                                data.get(buf, 0, len);
-                                stringArray[i] = new String(buf, 0, len, StandardCharsets.UTF_8);// new
-                                // String(Js.<char[]>uncheckedCast(stringBytes));
-                            }
-                            return new StringArrayColumnData(stringArray);
-                        }
-                        case "java.math.BigDecimal": {
-                            BigDecimal[] bigDecArray = new BigDecimal[size];
-                            byte[] buf = null;
-                            for (int i = 0; i < size; i++) {
-                                if (hasNulls && !valid.get(i)) {
-                                    bigDecArray[i] = null;
-                                    continue;
-                                }
-                                int ioff = offsets.get(i);
-                                int len = offsets.get(i + 1) - ioff;
-                                data.position((int) (payload.offset().toFloat64()) + ioff);
-                                int scale = data.getInt();
-                                len -= 4;
-                                if (buf == null || buf.length != len) {
-                                    buf = new byte[len];
-                                }
-                                bigDecArray[i] = new BigDecimal(readBigInt(data, buf), scale);
-                            }
-                            return new BigDecimalArrayColumnData(bigDecArray);
-                        }
-                        case "java.math.BigInteger": {
-                            BigInteger[] bigIntArray = new BigInteger[size];
-                            byte[] buf = null;
-                            for (int i = 0; i < size; i++) {
-                                if (hasNulls && !valid.get(i)) {
-                                    bigIntArray[i] = null;
-                                    continue;
-                                }
-                                int ioff = offsets.get(i);
-                                int len = offsets.get(i + 1) - ioff;
-                                if (buf == null || buf.length != len) {
-                                    buf = new byte[len];
-                                }
-                                data.position((int) (payload.offset().toFloat64()) + ioff);
-                                bigIntArray[i] = readBigInt(data, buf);
-                            }
-                            return new BigIntegerArrayColumnData(bigIntArray);
-                        }
-                        default:
-                            throw new IllegalStateException("Can't decode column of type " + columnType);
-                    }
-                }
-        }
-    }
-
-    private static BigInteger readBigInt(ByteBuffer data, byte[] buf) {
-        // TODO: Change to the code below when the Java 9 BigInteger(byte[], int, int) constructor is available.
-        // https://github.com/deephaven/deephaven-core/issues/1626
-        // Make the call take an additional len parameter, and make the calling logic reallocate only when
-        // there is a need to grow, instead of the current need for an exact match.
-        //
-        // data.get(buf, 0, len);
-        // return new BigInteger(buf, 0, len);
-        data.get(buf);
-        return new BigInteger(buf);
-    }
-
-    private static BitSet readValidityBufferAsBitset(ByteBuffer data, int size, Buffer buffer) {
-        if (size == 0 || buffer.length().toFloat64() == 0) {
-            // these buffers are optional (and empty) if the column is empty, or if it has primitives and we've allowed
-            // DH nulls
-            return new BitSet(0);
-        }
-        data.position((int) buffer.offset().toFloat64());
-        BitSet valid = readBitSetWithLength(data, (int) (buffer.length().toFloat64()));
-        return valid;
-    }
-
-    private static BitSet readBitSetWithLength(ByteBuffer data, int lenInBytes) {
-        byte[] array = new byte[lenInBytes];
-        data.get(array);
-
-        return BitSet.valueOf(array);
-    }
-
-    private static IntBuffer readOffsets(ByteBuffer data, int size, Buffer buffer) {
-        if (size == 0) {
-            IntBuffer emptyOffsets = IntBuffer.allocate(1);
-            return emptyOffsets;
-        }
-        data.position((int) buffer.offset().toFloat64());
-        IntBuffer offsets = data.slice().asIntBuffer();
-        offsets.limit(size + 1);
-        return offsets;
-    }
-
 }
diff --git a/web/client-api/src/main/java/io/deephaven/web/client/api/barrage/WebChunkReaderFactory.java b/web/client-api/src/main/java/io/deephaven/web/client/api/barrage/WebChunkReaderFactory.java
new file mode 100644
index 00000000000..475adf7d686
--- /dev/null
+++ b/web/client-api/src/main/java/io/deephaven/web/client/api/barrage/WebChunkReaderFactory.java
@@ -0,0 +1,372 @@
+//
+// Copyright (c) 2016-2024 Deephaven Data Labs and Patent Pending
+//
+package io.deephaven.web.client.api.barrage;
+
+import elemental2.core.JsDate;
+import io.deephaven.base.verify.Assert;
+import io.deephaven.chunk.WritableByteChunk;
+import io.deephaven.chunk.WritableChunk;
+import io.deephaven.chunk.WritableIntChunk;
+import io.deephaven.chunk.WritableLongChunk;
+import io.deephaven.chunk.WritableObjectChunk;
+import io.deephaven.chunk.attributes.Values;
+import io.deephaven.extensions.barrage.chunk.BooleanChunkReader;
+import io.deephaven.extensions.barrage.chunk.ByteChunkReader;
+import io.deephaven.extensions.barrage.chunk.CharChunkReader;
+import io.deephaven.extensions.barrage.chunk.ChunkInputStreamGenerator;
+import io.deephaven.extensions.barrage.chunk.ChunkReader;
+import io.deephaven.extensions.barrage.chunk.DoubleChunkReader;
+import io.deephaven.extensions.barrage.chunk.FloatChunkReader;
+import io.deephaven.extensions.barrage.chunk.IntChunkReader;
+import io.deephaven.extensions.barrage.chunk.LongChunkReader;
+import io.deephaven.extensions.barrage.chunk.ShortChunkReader;
+import io.deephaven.extensions.barrage.chunk.VarListChunkReader;
+import io.deephaven.extensions.barrage.util.StreamReaderOptions;
+import io.deephaven.util.BooleanUtils;
+import io.deephaven.util.QueryConstants;
+import io.deephaven.util.datastructures.LongSizedDataStructure;
+import io.deephaven.web.client.api.BigDecimalWrapper;
+import io.deephaven.web.client.api.BigIntegerWrapper;
+import io.deephaven.web.client.api.DateWrapper;
+import io.deephaven.web.client.api.LocalDateWrapper;
+import io.deephaven.web.client.api.LocalTimeWrapper;
+import io.deephaven.web.client.api.LongWrapper;
+import org.apache.arrow.flatbuf.Date;
+import org.apache.arrow.flatbuf.DateUnit;
+import org.apache.arrow.flatbuf.FloatingPoint;
+import org.apache.arrow.flatbuf.Int;
+import org.apache.arrow.flatbuf.Precision;
+import org.apache.arrow.flatbuf.Time;
+import org.apache.arrow.flatbuf.TimeUnit;
+import org.apache.arrow.flatbuf.Timestamp;
+import org.apache.arrow.flatbuf.Type;
+
+import java.io.DataInput;
+import java.io.IOException;
+import java.math.BigDecimal;
+import java.math.BigInteger;
+import java.nio.charset.StandardCharsets;
+import java.util.Arrays;
+import java.util.Iterator;
+import java.util.PrimitiveIterator;
+
+/**
+ * Browser-compatible implementation of the ChunkReaderFactory, with a focus on reading from arrow types rather than
+ * successfully round-tripping to the Java server.
+ * <p>
+ * Includes some specific workarounds to handle nullability that will make more sense for the browser.
+ */
+public class WebChunkReaderFactory implements ChunkReader.Factory {
+    @Override
+    public ChunkReader getReader(StreamReaderOptions options, int factor, ChunkReader.TypeInfo typeInfo) {
+        switch (typeInfo.arrowField().typeType()) {
+            case Type.Int: {
+                Int t = new Int();
+                typeInfo.arrowField().type(t);
+                switch (t.bitWidth()) {
+                    case 8: {
+                        return new ByteChunkReader(options);
+                    }
+                    case 16: {
+                        if (t.isSigned()) {
+                            return new ShortChunkReader(options);
+                        }
+                        return new CharChunkReader(options);
+                    }
+                    case 32: {
+                        return new IntChunkReader(options);
+                    }
+                    case 64: {
+                        if (t.isSigned()) {
+                            return new LongChunkReader(options).transform(LongWrapper::of);
+                        }
+                        throw new IllegalArgumentException("Unsigned 64bit integers not supported");
+                    }
+                    default:
+                        throw new IllegalArgumentException("Unsupported Int bitwidth: " + t.bitWidth());
+                }
+            }
+            case Type.FloatingPoint: {
+                FloatingPoint t = new FloatingPoint();
+                typeInfo.arrowField().type(t);
+                switch (t.precision()) {
+                    case Precision.SINGLE: {
+                        return new FloatChunkReader(options);
+                    }
+                    case Precision.DOUBLE: {
+                        return new DoubleChunkReader(options);
+                    }
+                    default:
+                        throw new IllegalArgumentException(
+                                "Unsupported FloatingPoint precision " + Precision.name(t.precision()));
+                }
+            }
+            case Type.Binary: {
+                if (typeInfo.type() == BigIntegerWrapper.class) {
+                    return (fieldNodeIter, bufferInfoIter, is, outChunk, outOffset,
+                            totalRows) -> extractChunkFromInputStream(
+                                    is,
+                                    fieldNodeIter,
+                                    bufferInfoIter,
+                                    (val, off, len) -> new BigIntegerWrapper(new BigInteger(val, off, len)),
+                                    outChunk, outOffset, totalRows);
+                }
+                if (typeInfo.type() == BigDecimalWrapper.class) {
+                    return (fieldNodeIter, bufferInfoIter, is, outChunk, outOffset,
+                            totalRows) -> extractChunkFromInputStream(
+                                    is,
+                                    fieldNodeIter,
+                                    bufferInfoIter,
+                                    (final byte[] buf, final int offset, final int length) -> {
+                                        // read the int scale value as little endian, arrow's endianness.
+                                        final byte b1 = buf[offset];
+                                        final byte b2 = buf[offset + 1];
+                                        final byte b3 = buf[offset + 2];
+                                        final byte b4 = buf[offset + 3];
+                                        final int scale = b4 << 24 | (b3 & 0xFF) << 16 | (b2 & 0xFF) << 8 | (b1 & 0xFF);
+                                        BigDecimal bigDecimal =
+                                                new BigDecimal(new BigInteger(buf, offset + 4, length - 4), scale);
+                                        return new BigDecimalWrapper(bigDecimal);
+                                    },
+                                    outChunk, outOffset, totalRows);
+                }
+                throw new IllegalArgumentException("Unsupported Binary type " + typeInfo.type());
+            }
+            case Type.Utf8: {
+                return (fieldNodeIter, bufferInfoIter, is, outChunk, outOffset,
+                        totalRows) -> extractChunkFromInputStream(is, fieldNodeIter,
+                                bufferInfoIter, (buf, off, len) -> new String(buf, off, len, StandardCharsets.UTF_8),
+                                outChunk, outOffset, totalRows);
+            }
+            case Type.Bool: {
+                BooleanChunkReader subReader = new BooleanChunkReader();
+                return (fieldNodeIter, bufferInfoIter, is, outChunk, outOffset, totalRows) -> {
+                    try (final WritableByteChunk<Values> inner = (WritableByteChunk<Values>) subReader.readChunk(
+                            fieldNodeIter, bufferInfoIter, is, null, 0, 0)) {
+
+                        final WritableObjectChunk<Boolean, Values> chunk;
+                        if (outChunk != null) {
+                            chunk = outChunk.asWritableObjectChunk();
+                        } else {
+                            int numRows = Math.max(totalRows, inner.size());
+                            chunk = WritableObjectChunk.makeWritableChunk(numRows);
+                            chunk.setSize(numRows);
+                        }
+
+                        if (outChunk == null) {
+                            // if we're not given an output chunk then we better be writing at the front of the new one
+                            Assert.eqZero(outOffset, "outOffset");
+                        }
+
+                        for (int ii = 0; ii < inner.size(); ++ii) {
+                            byte value = inner.get(ii);
+                            chunk.set(outOffset + ii, BooleanUtils.byteAsBoolean(value));
+                        }
+
+                        return chunk;
+                    }
+
+                };
+            }
+            case Type.Date: {
+                Date t = new Date();
+                typeInfo.arrowField().type(t);
+                switch (t.unit()) {
+                    case DateUnit.MILLISECOND:
+                        return new LongChunkReader(options).transform(millis -> {
+                            if (millis == QueryConstants.NULL_LONG) {
+                                return null;
+                            }
+                            JsDate jsDate = new JsDate((double) (long) millis);
+                            return new LocalDateWrapper(jsDate.getUTCFullYear(), 1 + jsDate.getUTCMonth(),
+                                    jsDate.getUTCDate());
+                        });
+                    case DateUnit.DAY:
+                        return new IntChunkReader(options).transform(days -> {
+                            if (days == QueryConstants.NULL_INT) {
+                                return null;
+                            }
+                            JsDate jsDate = new JsDate(((double) (int) days) * 86400000);
+                            return new LocalDateWrapper(jsDate.getUTCFullYear(), 1 + jsDate.getUTCMonth(),
+                                    jsDate.getUTCDate());
+                        });
+                    default:
+                        throw new IllegalArgumentException("Unsupported Date unit: " + DateUnit.name(t.unit()));
+                }
+            }
+            case Type.Time: {
+                Time t = new Time();
+                typeInfo.arrowField().type(t);
+                switch (t.bitWidth()) {
+                    case 32: {
+                        switch (t.unit()) {
+                            case TimeUnit.SECOND: {
+                                return new IntChunkReader(options)
+                                        .transform(LocalTimeWrapper.intCreator(1)::apply);
+                            }
+                            case TimeUnit.MILLISECOND: {
+                                return new IntChunkReader(options)
+                                        .transform(LocalTimeWrapper.intCreator(1_000)::apply);
+                            }
+                            default:
+                                throw new IllegalArgumentException("Unsupported Time unit: " + TimeUnit.name(t.unit()));
+                        }
+                    }
+                    case 64: {
+                        switch (t.unit()) {
+                            case TimeUnit.NANOSECOND: {
+                                return new LongChunkReader(options)
+                                        .transform(LocalTimeWrapper.longCreator(1_000_000_000)::apply);
+                            }
+                            case TimeUnit.MICROSECOND: {
+                                return new LongChunkReader(options)
+                                        .transform(LocalTimeWrapper.longCreator(1_000_000)::apply);
+                            }
+                            default:
+                                throw new IllegalArgumentException("Unsupported Time unit: " + TimeUnit.name(t.unit()));
+                        }
+                    }
+                    default:
+                        throw new IllegalArgumentException("Unsupported Time bitWidth: " + t.bitWidth());
+                }
+            }
+            case Type.Timestamp: {
+                Timestamp t = new Timestamp();
+                typeInfo.arrowField().type(t);
+                switch (t.unit()) {
+                    case TimeUnit.NANOSECOND: {
+                        if (!t.timezone().equals("UTC")) {
+                            throw new IllegalArgumentException("Unsupported tz " + t.timezone());
+                        }
+                        return new LongChunkReader(options).transform(DateWrapper::of);
+                    }
+                    default:
+                        throw new IllegalArgumentException("Unsupported Timestamp unit: " + TimeUnit.name(t.unit()));
+                }
+            }
+            case Type.List: {
+                if (typeInfo.componentType() == byte.class) {
+                    return (fieldNodeIter, bufferInfoIter, is, outChunk, outOffset,
+                            totalRows) -> extractChunkFromInputStream(
+                                    is,
+                                    fieldNodeIter,
+                                    bufferInfoIter,
+                                    (buf, off, len) -> Arrays.copyOfRange(buf, off, off + len),
+                                    outChunk, outOffset, totalRows);
+                }
+                return new VarListChunkReader<>(options, typeInfo, this);
+            }
+            default:
+                throw new IllegalArgumentException("Unsupported type: " + Type.name(typeInfo.arrowField().typeType()));
+        }
+    }
+
+    public interface Mapper<T> {
+        T constructFrom(byte[] buf, int offset, int length) throws IOException;
+    }
+
+    public static <T> WritableObjectChunk<T, Values> extractChunkFromInputStream(
+            final DataInput is,
+            final Iterator<ChunkInputStreamGenerator.FieldNodeInfo> fieldNodeIter,
+            final PrimitiveIterator.OfLong bufferInfoIter,
+            final Mapper<T> mapper,
+            final WritableChunk<Values> outChunk,
+            final int outOffset,
+            final int totalRows) throws IOException {
+        final ChunkInputStreamGenerator.FieldNodeInfo nodeInfo = fieldNodeIter.next();
+        final long validityBuffer = bufferInfoIter.nextLong();
+        final long offsetsBuffer = bufferInfoIter.nextLong();
+        final long payloadBuffer = bufferInfoIter.nextLong();
+
+        final int numElements = nodeInfo.numElements;
+        final WritableObjectChunk<T, Values> chunk;
+        if (outChunk != null) {
+            chunk = outChunk.asWritableObjectChunk();
+        } else {
+            final int numRows = Math.max(totalRows, numElements);
+            chunk = WritableObjectChunk.makeWritableChunk(numRows);
+            chunk.setSize(numRows);
+        }
+
+        if (numElements == 0) {
+            return chunk;
+        }
+
+        final int numValidityWords = (numElements + 63) / 64;
+        try (final WritableLongChunk<Values> isValid = WritableLongChunk.makeWritableChunk(numValidityWords);
+                final WritableIntChunk<Values> offsets = WritableIntChunk.makeWritableChunk(numElements + 1)) {
+            // Read validity buffer:
+            int jj = 0;
+            for (; jj < Math.min(numValidityWords, validityBuffer / 8); ++jj) {
+                isValid.set(jj, is.readLong());
+            }
+            final long valBufRead = jj * 8L;
+            if (valBufRead < validityBuffer) {
+                is.skipBytes(LongSizedDataStructure.intSize("VBCISG", validityBuffer - valBufRead));
+            }
+            // we support short validity buffers
+            for (; jj < numValidityWords; ++jj) {
+                isValid.set(jj, -1); // -1 is bit-wise representation of all ones
+            }
+
+            // Read offsets:
+            final long offBufRead = (numElements + 1L) * Integer.BYTES;
+            if (offsetsBuffer < offBufRead) {
+                throw new IllegalStateException("offset buffer is too short for the expected number of elements");
+            }
+            for (int i = 0; i < numElements + 1; ++i) {
+                offsets.set(i, is.readInt());
+            }
+            if (offBufRead < offsetsBuffer) {
+                is.skipBytes(LongSizedDataStructure.intSize("VBCISG", offsetsBuffer - offBufRead));
+            }
+
+            // Read data:
+            final int bytesRead = LongSizedDataStructure.intSize("VBCISG", payloadBuffer);
+            final byte[] serializedData = new byte[bytesRead];
+            is.readFully(serializedData);
+
+            // Deserialize:
+            int ei = 0;
+            int pendingSkips = 0;
+
+            for (int vi = 0; vi < numValidityWords; ++vi) {
+                int bitsLeftInThisWord = Math.min(64, numElements - vi * 64);
+                long validityWord = isValid.get(vi);
+                do {
+                    if ((validityWord & 1) == 1) {
+                        if (pendingSkips > 0) {
+                            chunk.fillWithNullValue(outOffset + ei, pendingSkips);
+                            ei += pendingSkips;
+                            pendingSkips = 0;
+                        }
+                        final int offset = offsets.get(ei);
+                        final int length = offsets.get(ei + 1) - offset;
+                        Assert.geq(length, "length", 0);
+                        if (offset + length > serializedData.length) {
+                            throw new IllegalStateException("not enough data was serialized to parse this element: " +
+                                    "elementIndex=" + ei + " offset=" + offset + " length=" + length +
+                                    " serializedLen=" + serializedData.length);
+                        }
+                        chunk.set(outOffset + ei++, mapper.constructFrom(serializedData, offset, length));
+                        validityWord >>= 1;
+                        bitsLeftInThisWord--;
+                    } else {
+                        final int skips = Math.min(Long.numberOfTrailingZeros(validityWord), bitsLeftInThisWord);
+                        pendingSkips += skips;
+                        validityWord >>= skips;
+                        bitsLeftInThisWord -= skips;
+                    }
+                } while (bitsLeftInThisWord > 0);
+            }
+
+            if (pendingSkips > 0) {
+                chunk.fillWithNullValue(outOffset + ei, pendingSkips);
+            }
+        }
+
+        return chunk;
+    }
+
+}
diff --git a/web/client-api/src/main/java/io/deephaven/web/client/api/barrage/WebGrpcUtils.java b/web/client-api/src/main/java/io/deephaven/web/client/api/barrage/WebGrpcUtils.java
deleted file mode 100644
index 5d6ea33527e..00000000000
--- a/web/client-api/src/main/java/io/deephaven/web/client/api/barrage/WebGrpcUtils.java
+++ /dev/null
@@ -1,38 +0,0 @@
-//
-// Copyright (c) 2016-2024 Deephaven Data Labs and Patent Pending
-//
-package io.deephaven.web.client.api.barrage;
-
-import elemental2.dom.DomGlobal;
-import io.deephaven.javascript.proto.dhinternal.grpcweb.Grpc;
-import io.deephaven.web.client.api.grpc.MultiplexedWebsocketTransport;
-import jsinterop.base.JsPropertyMap;
-
-/**
- * Holds some static details, must be initialized before any calls can be made. When our gRPC-web client is redone to
- * support interceptors/etc, this will likely no longer need to exist
- */
-public class WebGrpcUtils {
-    /**
-     * One place to change all debug flags in the app.
-     */
-    public static final Object CLIENT_OPTIONS = JsPropertyMap.of(
-            "debug", false);
-
-    /**
-     * True if https isn't available (as a proxy for h2).
-     */
-    public static final boolean USE_WEBSOCKETS;
-
-    static {
-        // TODO configurable, let us support this even when ssl?
-        if (DomGlobal.window.location.protocol.equals("http:")) {
-            USE_WEBSOCKETS = true;
-            Grpc.setDefaultTransport.onInvoke(options -> new MultiplexedWebsocketTransport(options, () -> {
-                Grpc.setDefaultTransport.onInvoke(Grpc.WebsocketTransport.onInvoke());
-            }));
-        } else {
-            USE_WEBSOCKETS = false;
-        }
-    }
-}
diff --git a/web/client-api/src/main/java/io/deephaven/web/client/api/barrage/data/WebBarrageSubscription.java b/web/client-api/src/main/java/io/deephaven/web/client/api/barrage/data/WebBarrageSubscription.java
new file mode 100644
index 00000000000..03e20646d68
--- /dev/null
+++ b/web/client-api/src/main/java/io/deephaven/web/client/api/barrage/data/WebBarrageSubscription.java
@@ -0,0 +1,649 @@
+//
+// Copyright (c) 2016-2024 Deephaven Data Labs and Patent Pending
+//
+package io.deephaven.web.client.api.barrage.data;
+
+import io.deephaven.chunk.Chunk;
+import io.deephaven.chunk.ChunkType;
+import io.deephaven.chunk.attributes.Values;
+import io.deephaven.web.client.api.barrage.WebBarrageMessage;
+import io.deephaven.web.client.api.barrage.def.InitialTableDefinition;
+import io.deephaven.web.client.api.subscription.SubscriptionType;
+import io.deephaven.web.client.state.ClientTableState;
+import io.deephaven.web.shared.data.Range;
+import io.deephaven.web.shared.data.RangeSet;
+import io.deephaven.web.shared.data.ShiftedRange;
+import jsinterop.base.Any;
+
+import java.util.Arrays;
+import java.util.BitSet;
+import java.util.NavigableSet;
+import java.util.NoSuchElementException;
+import java.util.PrimitiveIterator;
+import java.util.TreeMap;
+
+/**
+ * In contrast to the server implementation, the JS API holds the "table" as distinct from the "subscription", so that
+ * developers are acutely aware of extra async costs in requesting data, and can clearly indicate how much data is
+ * requested. This class represents a barrage subscription for the JS API, and exposes access to the data presently
+ * available on the client.
+ * <p>
+ * This is a rough analog to {@link io.deephaven.extensions.barrage.table.BarrageTable} and its subtypes, but isn't
+ * directly exposed to API consumers. Instead, the subscription types wrap this, and delegate their data storage and
+ * snapshot/delta handling here.
+ */
+public abstract class WebBarrageSubscription {
+
+    public static final boolean COLUMNS_AS_LIST = false;
+    public static final int MAX_MESSAGE_SIZE = 10_000_000;
+    public static final int BATCH_SIZE = 100_000;
+
+    public static WebBarrageSubscription subscribe(
+            final SubscriptionType subscriptionType,
+            final ClientTableState cts,
+            final ViewportChangedHandler viewportChangedHandler,
+            final DataChangedHandler dataChangedHandler) {
+
+        WebColumnData[] dataSinks = new WebColumnData[cts.columnTypes().length];
+        ChunkType[] chunkTypes = cts.chunkTypes();
+        for (int i = 0; i < dataSinks.length; i++) {
+            switch (chunkTypes[i]) {
+                case Boolean:
+                    throw new IllegalStateException("Boolean unsupported here");
+                case Char:
+                    dataSinks[i] = new WebCharColumnData();
+                    break;
+                case Byte:
+                    dataSinks[i] = new WebByteColumnData();
+                    break;
+                case Short:
+                    dataSinks[i] = new WebShortColumnData();
+                    break;
+                case Int:
+                    dataSinks[i] = new WebIntColumnData();
+                    break;
+                case Long:
+                    dataSinks[i] = new WebLongColumnData();
+                    break;
+                case Float:
+                    dataSinks[i] = new WebFloatColumnData();
+                    break;
+                case Double:
+                    dataSinks[i] = new WebDoubleColumnData();
+                    break;
+                case Object:
+                    dataSinks[i] = new WebObjectColumnData();
+                    break;
+            }
+        }
+
+        if (cts.getTableDef().getAttributes().isBlinkTable()) {
+            return new BlinkImpl(cts, viewportChangedHandler, dataChangedHandler, dataSinks);
+        } else if (subscriptionType == SubscriptionType.VIEWPORT_SUBSCRIPTION) {
+            return new ViewportImpl(cts, viewportChangedHandler, dataChangedHandler, dataSinks);
+        } else {
+            return new RedirectedImpl(cts, viewportChangedHandler, dataChangedHandler, dataSinks);
+        }
+    }
+
+    public interface ViewportChangedHandler {
+        void onServerViewportChanged(RangeSet serverViewport, BitSet serverColumns, boolean serverReverseViewport);
+    }
+    public interface DataChangedHandler {
+        void onDataChanged(RangeSet rowsAdded, RangeSet rowsRemoved, RangeSet totalMods, ShiftedRange[] shifted,
+                BitSet modifiedColumnSet);
+    }
+
+    protected final ClientTableState state;
+    protected final ViewportChangedHandler viewportChangedHandler;
+    protected final DataChangedHandler dataChangedHandler;
+    protected final RangeSet currentRowSet = RangeSet.empty();
+
+    protected long capacity = 0;
+    protected WebColumnData[] destSources;
+
+    protected RangeSet serverViewport;
+    protected BitSet serverColumns;
+    protected boolean serverReverseViewport;
+
+    protected WebBarrageSubscription(ClientTableState state, ViewportChangedHandler viewportChangedHandler,
+            DataChangedHandler dataChangedHandler, WebColumnData[] dataSinks) {
+        this.state = state;
+        destSources = dataSinks;
+        this.viewportChangedHandler = viewportChangedHandler;
+        this.dataChangedHandler = dataChangedHandler;
+    }
+
+    public abstract void applyUpdates(WebBarrageMessage message);
+
+    /**
+     * @return the current size of the table
+     */
+    public long getCurrentSize() {
+        return currentRowSet.size();
+    }
+
+    protected void updateServerViewport(RangeSet viewport, BitSet columns, boolean reverseViewport) {
+        serverViewport = viewport;
+        serverColumns = columns == null || columns.cardinality() == numColumns() ? null : columns;
+        serverReverseViewport = reverseViewport;
+    }
+
+    protected int numColumns() {
+        return getDefinition().getColumns().length;
+    }
+
+    private InitialTableDefinition getDefinition() {
+        return state.getTableDef();
+    }
+
+    public RangeSet getCurrentRowSet() {
+        return currentRowSet;
+    }
+
+    public RangeSet getServerViewport() {
+        return serverViewport;
+    }
+
+    public boolean isReversed() {
+        return serverReverseViewport;
+    }
+
+    /**
+     * Reads a value from the table subscription.
+     *
+     * @param key the row to read in key-space
+     * @param col the index of the column to read
+     * @return the value read from the table
+     */
+    public abstract Any getData(long key, int col);
+
+    protected boolean isSubscribedColumn(int ii) {
+        return serverColumns == null || serverColumns.get(ii);
+    }
+
+    public static class BlinkImpl extends WebBarrageSubscription {
+        enum Mode {
+            BLINK, APPEND
+        }
+
+        private final Mode mode;
+
+        public BlinkImpl(ClientTableState state, ViewportChangedHandler viewportChangedHandler,
+                DataChangedHandler dataChangedHandler, WebColumnData[] dataSinks) {
+            super(state, viewportChangedHandler, dataChangedHandler, dataSinks);
+            mode = Mode.BLINK;
+        }
+
+        @Override
+        public void applyUpdates(WebBarrageMessage message) {
+            if (message.isSnapshot) {
+                updateServerViewport(message.snapshotRowSet, message.snapshotColumns, message.snapshotRowSetIsReversed);
+                viewportChangedHandler.onServerViewportChanged(serverViewport, serverColumns, serverReverseViewport);
+            }
+
+            assert message.shifted.length == 0;
+            for (int i = 0; i < message.modColumnData.length; i++) {
+                assert message.modColumnData[i].rowsModified.isEmpty();
+            }
+
+            if (message.rowsIncluded.isEmpty()) {
+                return;
+            }
+
+            long addedRows = message.rowsIncluded.size();
+            RangeSet destinationRowSet;
+            if (mode == Mode.APPEND) {
+                destinationRowSet = RangeSet.ofRange(capacity, capacity + addedRows - 1);
+                capacity += addedRows;
+            } else {
+                destinationRowSet = RangeSet.ofRange(0, addedRows - 1);
+                capacity = addedRows;
+            }
+            Arrays.stream(destSources).forEach(s -> s.ensureCapacity(capacity));
+            for (int ii = 0; ii < message.addColumnData.length; ii++) {
+                if (isSubscribedColumn(ii)) {
+                    WebBarrageMessage.AddColumnData column = message.addColumnData[ii];
+                    PrimitiveIterator.OfLong destIterator = destinationRowSet.indexIterator();
+                    for (int j = 0; j < column.data.size(); j++) {
+                        Chunk<Values> chunk = column.data.get(j);
+                        destSources[ii].fillChunk(chunk, destIterator);
+                    }
+                    assert !destIterator.hasNext();
+                }
+            }
+
+            currentRowSet.clear();
+
+            currentRowSet.addRangeSet(message.rowsAdded);
+            state.setSize(message.rowsAdded.size());
+            dataChangedHandler.onDataChanged(message.rowsAdded, message.rowsRemoved, RangeSet.empty(), message.shifted,
+                    new BitSet(0));
+        }
+
+        @Override
+        public Any getData(long key, int col) {
+            if (!isSubscribedColumn(col)) {
+                throw new NoSuchElementException("No column at index " + col);
+            }
+            return destSources[col].get(key);
+        }
+    }
+
+    public static class RedirectedImpl extends WebBarrageSubscription {
+        private RangeSet freeset = new RangeSet();
+        private final TreeMap<Long, Long> redirectedIndexes = new TreeMap<>();
+
+        public RedirectedImpl(ClientTableState state, ViewportChangedHandler viewportChangedHandler,
+                DataChangedHandler dataChangedHandler, WebColumnData[] dataSinks) {
+            super(state, viewportChangedHandler, dataChangedHandler, dataSinks);
+        }
+
+        @Override
+        public void applyUpdates(WebBarrageMessage message) {
+            RangeSet populatedRows = serverViewport != null
+                    ? currentRowSet.subsetForPositions(serverViewport, serverReverseViewport)
+                    : null;
+
+            if (message.isSnapshot) {
+                updateServerViewport(message.snapshotRowSet, message.snapshotColumns, message.snapshotRowSetIsReversed);
+                viewportChangedHandler.onServerViewportChanged(serverViewport, serverColumns, serverReverseViewport);
+            }
+
+            final boolean mightBeInitialSnapshot = getCurrentRowSet().isEmpty() && message.isSnapshot;
+
+            // Apply removes to our local rowset
+            currentRowSet.removeRangeSet(message.rowsRemoved);
+
+            RangeSet removed = message.rowsRemoved;
+            if (populatedRows != null) {
+                // limit the removed rows to what intersect the viewport
+                removed = populatedRows.extract(message.rowsRemoved);
+            }
+            // free rows that are no longer needed
+            freeRows(removed);
+
+            // Apply shifts
+
+            // Shift moved rows in the redir index
+            boolean hasReverseShift = false;
+            final ShiftedRange[] shiftedRanges = message.shifted;
+            currentRowSet.applyShifts(shiftedRanges);
+            RangeSetBulkHelper populatedRowsetShifter = populatedRows == null ? null
+                    : new RangeSetBulkHelper(populatedRows, RangeSetBulkHelper.Operation.APPEND);
+            for (int i = shiftedRanges.length - 1; i >= 0; --i) {
+                final ShiftedRange shiftedRange = shiftedRanges[i];
+                final long offset = shiftedRange.getDelta();
+                if (offset < 0) {
+                    hasReverseShift = true;
+                    continue;
+                }
+
+                // test if shift is in populatedRows before continuing
+                if (populatedRows != null) {
+                    if (!populatedRows.includesAnyOf(shiftedRange.getRange())) {
+                        // no rows were included, we can skip updating populatedRows and redirectedIndexes
+                        continue;
+                    }
+                    populatedRows.removeRange(shiftedRange.getRange());
+                }
+                final NavigableSet<Long> toMove = redirectedIndexes.navigableKeySet()
+                        .subSet(shiftedRange.getRange().getFirst(), true, shiftedRange.getRange().getLast(), true);
+                // iterate backward and move them forward
+                for (Long key : toMove.descendingSet()) {
+                    long shiftedKey = key + offset;
+                    Long oldValue = redirectedIndexes.put(shiftedKey, redirectedIndexes.remove(key));
+                    assert oldValue == null : shiftedKey + " already has a value, " + oldValue;
+                    if (populatedRowsetShifter != null) {
+                        populatedRowsetShifter.append(shiftedKey);
+                    }
+                }
+            }
+
+            if (hasReverseShift) {
+                for (int i = 0; i < shiftedRanges.length; ++i) {
+                    final ShiftedRange shiftedRange = shiftedRanges[i];
+                    final long offset = shiftedRange.getDelta();
+                    if (offset > 0) {
+                        continue;
+                    }
+
+                    if (populatedRows != null) {
+                        if (!populatedRows.includesAnyOf(shiftedRange.getRange())) {
+                            // no rows were included, we can skip updating populatedRows and redirectedIndexes
+                            continue;
+                        }
+                        populatedRows.removeRange(shiftedRange.getRange());
+                    }
+                    final NavigableSet<Long> toMove = redirectedIndexes.navigableKeySet()
+                            .subSet(shiftedRange.getRange().getFirst(), true, shiftedRange.getRange().getLast(), true);
+                    // iterate forward and move them backward
+                    for (Long key : toMove) {
+                        long shiftedKey = key + offset;
+                        Long oldValue = redirectedIndexes.put(shiftedKey, redirectedIndexes.remove(key));
+                        assert oldValue == null : shiftedKey + " already has a value, " + oldValue;
+                        if (populatedRowsetShifter != null) {
+                            populatedRowsetShifter.append(shiftedKey);
+                        }
+                    }
+                }
+            }
+            if (populatedRowsetShifter != null) {
+                populatedRowsetShifter.flush();
+            }
+
+            currentRowSet.addRangeSet(message.rowsAdded);
+
+            RangeSet totalMods = new RangeSet();
+            for (int i = 0; i < message.modColumnData.length; i++) {
+                WebBarrageMessage.ModColumnData column = message.modColumnData[i];
+                totalMods.addRangeSet(column.rowsModified);
+            }
+
+            if (!message.rowsIncluded.isEmpty()) {
+                if (mightBeInitialSnapshot) {
+                    capacity = message.rowsIncluded.size();
+                    Arrays.stream(destSources).forEach(s -> s.ensureCapacity(capacity));
+                    freeset.addRange(new Range(0, capacity - 1));
+                }
+
+                RangeSet destinationRowSet = getFreeRows(message.rowsIncluded.size());
+
+                for (int ii = 0; ii < message.addColumnData.length; ii++) {
+                    if (isSubscribedColumn(ii)) {
+                        WebBarrageMessage.AddColumnData column = message.addColumnData[ii];
+                        PrimitiveIterator.OfLong destIterator = destinationRowSet.indexIterator();
+
+                        for (int j = 0; j < column.data.size(); j++) {
+                            Chunk<Values> chunk = column.data.get(j);
+                            destSources[ii].fillChunk(chunk, destIterator);
+                        }
+                        assert !destIterator.hasNext();
+                    }
+                }
+                // Add redirection mappings
+                PrimitiveIterator.OfLong srcIter = message.rowsIncluded.indexIterator();
+                PrimitiveIterator.OfLong destIter = destinationRowSet.indexIterator();
+                while (srcIter.hasNext()) {
+                    assert destIter.hasNext();
+                    redirectedIndexes.put(srcIter.next(), destIter.next());
+                }
+                assert !destIter.hasNext();
+            }
+
+            BitSet modifiedColumnSet = new BitSet(numColumns());
+            for (int ii = 0; ii < message.modColumnData.length; ii++) {
+                WebBarrageMessage.ModColumnData column = message.modColumnData[ii];
+                if (column.rowsModified.isEmpty()) {
+                    continue;
+                }
+
+                modifiedColumnSet.set(ii);
+
+                PrimitiveIterator.OfLong destIterator = new PrimitiveIterator.OfLong() {
+                    private final PrimitiveIterator.OfLong wrapped = column.rowsModified.indexIterator();
+
+                    @Override
+                    public long nextLong() {
+                        return redirectedIndexes.get(wrapped.next());
+                    }
+
+                    @Override
+                    public boolean hasNext() {
+                        return wrapped.hasNext();
+                    }
+                };
+                for (int j = 0; j < column.data.size(); j++) {
+                    Chunk<Values> chunk = column.data.get(j);
+                    destSources[ii].fillChunk(chunk, destIterator);
+                }
+                assert !destIterator.hasNext();
+            }
+            if (serverViewport != null && populatedRows != null) {
+                RangeSet newPopulated = currentRowSet.subsetForPositions(serverViewport, serverReverseViewport);
+                populatedRows.removeRangeSet(newPopulated);
+                freeRows(populatedRows);
+            }
+
+            state.setSize(currentRowSet.size());
+            dataChangedHandler.onDataChanged(message.rowsAdded, removed, totalMods, message.shifted,
+                    modifiedColumnSet);
+        }
+
+        @Override
+        public Any getData(long key, int col) {
+            if (!isSubscribedColumn(col)) {
+                throw new NoSuchElementException("No column at index " + col);
+            }
+            return this.destSources[col].get(redirectedIndexes.get(key));
+        }
+
+        private RangeSet getFreeRows(long size) {
+            if (size <= 0) {
+                return RangeSet.empty();
+            }
+            boolean needsResizing = false;
+            final RangeSet result;
+            if (capacity == 0) {
+                capacity = Long.highestOneBit(Math.max(size * 2, 8));
+                freeset.addRange(new Range(0, capacity - 1));
+                needsResizing = true;
+            } else {
+                if (freeset.size() < size) {
+                    long usedSlots = capacity - freeset.size();
+                    long prevCapacity = capacity;
+
+                    do {
+                        capacity *= 2;
+                    } while ((capacity - usedSlots) < size);
+                    freeset.addRange(new Range(prevCapacity, capacity - 1));
+                    needsResizing = true;
+                }
+            }
+            if (needsResizing) {
+                Arrays.stream(destSources).forEach(s -> s.ensureCapacity(capacity));
+            }
+            result = freeset.subsetForPositions(RangeSet.ofRange(0, size - 1), false);
+            freeset.removeRange(new Range(0, result.getLastRow()));
+            assert result.size() == size : result.size() + " == " + size;
+            return result;
+        }
+
+        private void freeRows(RangeSet removed) {
+            RangeSetBulkHelper reusableHelper = new RangeSetBulkHelper(freeset, RangeSetBulkHelper.Operation.APPEND);
+            removed.indexIterator().forEachRemaining((long index) -> {
+                Long dest = redirectedIndexes.remove(index);
+                if (dest != null) {
+                    reusableHelper.append(dest);
+                }
+            });
+            reusableHelper.flush();
+        }
+    }
+
+    public static class ViewportImpl extends WebBarrageSubscription {
+        private long tableSize = 0;
+
+        public ViewportImpl(ClientTableState state, ViewportChangedHandler viewportChangedHandler,
+                DataChangedHandler dataChangedHandler, WebColumnData[] dataSinks) {
+            super(state, viewportChangedHandler, dataChangedHandler, dataSinks);
+            serverViewport = RangeSet.empty();
+        }
+
+        @Override
+        public long getCurrentSize() {
+            return tableSize;
+        }
+
+        @Override
+        public RangeSet getCurrentRowSet() {
+            if (tableSize <= 0) {
+                return RangeSet.empty();
+            }
+            return RangeSet.ofRange(0, tableSize - 1);
+        }
+
+        @Override
+        public void applyUpdates(WebBarrageMessage message) {
+            final BitSet prevServerColumns = serverColumns == null ? null : (BitSet) serverColumns.clone();
+            assert message.tableSize >= 0;
+            final long prevTableSize = tableSize;
+            tableSize = message.tableSize;
+
+            final RangeSet prevServerViewport = serverViewport.copy();
+            if (message.isSnapshot) {
+                updateServerViewport(message.snapshotRowSet, message.snapshotColumns, message.snapshotRowSetIsReversed);
+                viewportChangedHandler.onServerViewportChanged(serverViewport, serverColumns, serverReverseViewport);
+            }
+
+            // Update the currentRowSet; we're guaranteed to be flat
+            assert currentRowSet.isFlat();
+            final long prevSize = currentRowSet.size();
+            final long newSize = prevSize - message.rowsRemoved.size() + message.rowsAdded.size();
+            if (prevSize < newSize) {
+                currentRowSet.addRange(new Range(prevSize, newSize - 1));
+            } else if (prevSize > newSize) {
+                currentRowSet.removeRange(new Range(newSize, prevSize - 1));
+            }
+            assert currentRowSet.isFlat();
+
+            for (int ii = 0; ii < message.addColumnData.length; ii++) {
+                final WebBarrageMessage.AddColumnData column = message.addColumnData[ii];
+                final boolean prevSubscribed = prevServerColumns == null || prevServerColumns.get(ii);
+                final boolean currSubscribed = serverColumns == null || serverColumns.get(ii);
+
+                if (!currSubscribed && prevSubscribed && prevSize > 0) {
+                    destSources[ii].applyUpdate(column.data, RangeSet.empty(), RangeSet.ofRange(0, prevSize - 1));
+                    continue;
+                }
+
+                if (!message.rowsAdded.isEmpty() || !message.rowsRemoved.isEmpty()) {
+                    if (prevSubscribed && currSubscribed) {
+                        destSources[ii].applyUpdate(column.data, message.rowsAdded, message.rowsRemoved);
+                    } else if (currSubscribed) {
+                        // this column is a new subscription
+                        destSources[ii].applyUpdate(column.data, message.rowsAdded, RangeSet.empty());
+                    }
+                }
+            }
+
+            final BitSet modifiedColumnSet = new BitSet(numColumns());
+            for (int ii = 0; ii < message.modColumnData.length; ii++) {
+                WebBarrageMessage.ModColumnData column = message.modColumnData[ii];
+                if (!isSubscribedColumn(ii) || column.rowsModified.isEmpty()) {
+                    continue;
+                }
+
+                modifiedColumnSet.set(ii);
+
+                for (int j = 0; j < column.data.size(); j++) {
+                    Chunk<Values> chunk = column.data.get(j);
+                    destSources[ii].fillChunk(chunk, column.rowsModified.indexIterator());
+                }
+            }
+
+            state.setSize(message.tableSize);
+            final RangeSet rowsAdded = serverViewport == null ? RangeSet.empty() : serverViewport.copy();
+            if (!rowsAdded.isEmpty() && rowsAdded.getLastRow() >= tableSize) {
+                rowsAdded.removeRange(new Range(tableSize, rowsAdded.getLastRow()));
+            }
+            final RangeSet rowsRemoved = prevServerViewport == null ? RangeSet.empty() : prevServerViewport.copy();
+            if (!rowsRemoved.isEmpty() && rowsRemoved.getLastRow() >= prevTableSize) {
+                rowsRemoved.removeRange(new Range(prevTableSize, rowsRemoved.getLastRow()));
+            }
+            dataChangedHandler.onDataChanged(
+                    rowsAdded, rowsRemoved, RangeSet.empty(), new ShiftedRange[0],
+                    serverColumns == null ? null : (BitSet) serverColumns.clone());
+        }
+
+        @Override
+        public Any getData(long key, int col) {
+            if (!isSubscribedColumn(col)) {
+                throw new NoSuchElementException("No column at index " + col);
+            }
+            long pos = serverViewport.find(key);
+            if (pos < 0) {
+                return null;
+            }
+            return this.destSources[col].get(pos);
+        }
+    }
+
+    /**
+     * Helper to avoid appending many times when modifying indexes. The append() method should be called for each key
+     * <i>in order</i> to ensure that addRange/removeRange isn't called excessively. When no more items will be added,
+     * flush() must be called.
+     */
+    private static class RangeSetBulkHelper {
+        enum Operation {
+            APPEND, REMOVE
+        }
+
+        private final RangeSet rangeSet;
+        private final Operation operation;
+
+        private long currentFirst = -1;
+        private long currentLast;
+
+        public RangeSetBulkHelper(final RangeSet rangeSet, Operation operation) {
+            this.rangeSet = rangeSet;
+            this.operation = operation;
+        }
+
+        public void append(long key) {
+            assert key >= 0;
+
+            if (currentFirst == -1) {
+                // first key to be added, move both first and last
+                currentFirst = key;
+                currentLast = key;
+            } else if (key == currentLast + 1) {
+                // key appends to our current range
+                currentLast = key;
+            } else if (key == currentFirst - 1) {
+                // key appends to our current range
+                currentFirst = key;
+            } else {
+                // existing range doesn't match the new item, finish the old range and start a new one
+                if (operation == Operation.APPEND) {
+                    rangeSet.addRange(new Range(currentFirst, currentLast));
+                } else {
+                    rangeSet.removeRange(new Range(currentFirst, currentLast));
+                }
+                currentFirst = key;
+                currentLast = key;
+            }
+        }
+
+        public void appendRange(Range range) {
+            if (currentFirst == -1) {
+                currentFirst = range.getFirst();
+                currentLast = range.getLast();
+            } else if (range.getFirst() == currentLast + 1) {
+                currentLast = range.getLast();
+            } else if (range.getLast() == currentFirst - 1) {
+                currentFirst = range.getFirst();
+            } else {
+                if (operation == Operation.APPEND) {
+                    rangeSet.addRange(new Range(currentFirst, currentLast));
+                } else {
+                    rangeSet.removeRange(new Range(currentFirst, currentLast));
+                }
+                currentFirst = range.getFirst();
+                currentLast = range.getLast();
+            }
+        }
+
+        public void flush() {
+            if (currentFirst != -1) {
+                if (operation == Operation.APPEND) {
+                    rangeSet.addRange(new Range(currentFirst, currentLast));
+                } else {
+                    rangeSet.removeRange(new Range(currentFirst, currentLast));
+                }
+                currentFirst = -1;
+            }
+        }
+    }
+
+}
diff --git a/web/client-api/src/main/java/io/deephaven/web/client/api/barrage/data/WebByteColumnData.java b/web/client-api/src/main/java/io/deephaven/web/client/api/barrage/data/WebByteColumnData.java
new file mode 100644
index 00000000000..5a9dd8aaa94
--- /dev/null
+++ b/web/client-api/src/main/java/io/deephaven/web/client/api/barrage/data/WebByteColumnData.java
@@ -0,0 +1,94 @@
+//
+// Copyright (c) 2016-2024 Deephaven Data Labs and Patent Pending
+//
+// ****** AUTO-GENERATED CLASS - DO NOT EDIT MANUALLY
+// ****** Edit WebCharColumnData and run "./gradlew replicateBarrageUtils" to regenerate
+//
+// @formatter:off
+package io.deephaven.web.client.api.barrage.data;
+
+import elemental2.core.JsArray;
+import io.deephaven.chunk.ByteChunk;
+import io.deephaven.chunk.Chunk;
+import io.deephaven.chunk.attributes.Values;
+import io.deephaven.util.QueryConstants;
+import io.deephaven.web.shared.data.Range;
+import io.deephaven.web.shared.data.RangeSet;
+import jsinterop.base.Any;
+import jsinterop.base.Js;
+
+import java.util.Iterator;
+import java.util.List;
+import java.util.PrimitiveIterator;
+
+public class WebByteColumnData extends WebColumnData {
+    private JsArray<Any> tmpStorage;
+
+    @Override
+    public void fillChunk(Chunk<?> data, PrimitiveIterator.OfLong destIterator) {
+        ByteChunk<?> byteChunk = data.asByteChunk();
+        int i = 0;
+        while (destIterator.hasNext()) {
+            byte value = byteChunk.get(i++);
+            arr.setAt((int) destIterator.nextLong(), value == QueryConstants.NULL_BYTE ? null : Js.asAny(value));
+        }
+    }
+
+    @Override
+    public void applyUpdate(
+            final List<Chunk<Values>> data,
+            final RangeSet added,
+            final RangeSet removed) {
+        // ensure tmpStorage exists
+        if (tmpStorage == null) {
+            tmpStorage = new JsArray<>();
+        }
+        final int newLength = (int) (length - removed.size() + added.size());
+
+        int destOffset = 0;
+        int retainSourceOffset = 0;
+        int chunkSourceOffset = 0;
+        final Iterator<Range> addIter = added.rangeIterator();
+        final Iterator<Range> removeIter = removed.rangeIterator();
+        final Iterator<Chunk<Values>> dataIter = data.iterator();
+
+        Range nextAdd = addIter.hasNext() ? addIter.next() : null;
+        Range nextRemove = removeIter.hasNext() ? removeIter.next() : null;
+        ByteChunk<Values> byteChunk = dataIter.hasNext() ? dataIter.next().asByteChunk() : null;
+        while (destOffset < newLength) {
+            if (nextRemove != null && nextRemove.getFirst() == retainSourceOffset) {
+                // skip the range from the source chunk
+                retainSourceOffset += (int) nextRemove.size();
+                nextRemove = removeIter.hasNext() ? removeIter.next() : null;
+            } else if (nextAdd != null && nextAdd.getFirst() == destOffset) {
+                // copy the range from the source chunk
+                long size = nextAdd.size();
+                for (long ii = 0; ii < size; ++ii) {
+                    while (byteChunk != null && chunkSourceOffset == byteChunk.size()) {
+                        byteChunk = dataIter.hasNext() ? dataIter.next().asByteChunk() : null;
+                        chunkSourceOffset = 0;
+                    }
+                    assert byteChunk != null;
+                    byte value = byteChunk.get(chunkSourceOffset++);
+                    tmpStorage.setAt(destOffset++, value == QueryConstants.NULL_BYTE ? null : Js.asAny(value));
+                }
+                nextAdd = addIter.hasNext() ? addIter.next() : null;
+            } else {
+                // copy the range from the source chunk
+                long size = (nextRemove == null ? length : nextRemove.getFirst()) - retainSourceOffset;
+                if (nextAdd != null) {
+                    size = Math.min(size, nextAdd.getFirst() - destOffset);
+                }
+                for (long ii = 0; ii < size; ++ii) {
+                    tmpStorage.setAt(destOffset++, arr.getAt(retainSourceOffset++));
+                }
+            }
+        }
+
+        // swap arrays to avoid copying and garbage collection
+        JsArray<Any> tmp = arr;
+        arr = tmpStorage;
+        tmpStorage = tmp;
+        length = newLength;
+    }
+}
diff --git a/web/client-api/src/main/java/io/deephaven/web/client/api/barrage/data/WebCharColumnData.java b/web/client-api/src/main/java/io/deephaven/web/client/api/barrage/data/WebCharColumnData.java
new file mode 100644
index 00000000000..5228b45dee9
--- /dev/null
+++ b/web/client-api/src/main/java/io/deephaven/web/client/api/barrage/data/WebCharColumnData.java
@@ -0,0 +1,90 @@
+//
+// Copyright (c) 2016-2024 Deephaven Data Labs and Patent Pending
+//
+package io.deephaven.web.client.api.barrage.data;
+
+import elemental2.core.JsArray;
+import io.deephaven.chunk.CharChunk;
+import io.deephaven.chunk.Chunk;
+import io.deephaven.chunk.attributes.Values;
+import io.deephaven.util.QueryConstants;
+import io.deephaven.web.shared.data.Range;
+import io.deephaven.web.shared.data.RangeSet;
+import jsinterop.base.Any;
+import jsinterop.base.Js;
+
+import java.util.Iterator;
+import java.util.List;
+import java.util.PrimitiveIterator;
+
+public class WebCharColumnData extends WebColumnData {
+    private JsArray<Any> tmpStorage;
+
+    @Override
+    public void fillChunk(Chunk<?> data, PrimitiveIterator.OfLong destIterator) {
+        CharChunk<?> charChunk = data.asCharChunk();
+        int i = 0;
+        while (destIterator.hasNext()) {
+            char value = charChunk.get(i++);
+            arr.setAt((int) destIterator.nextLong(), value == QueryConstants.NULL_CHAR ? null : Js.asAny(value));
+        }
+    }
+
+    @Override
+    public void applyUpdate(
+            final List<Chunk<Values>> data,
+            final RangeSet added,
+            final RangeSet removed) {
+        // ensure tmpStorage exists
+        if (tmpStorage == null) {
+            tmpStorage = new JsArray<>();
+        }
+        final int newLength = (int) (length - removed.size() + added.size());
+
+        int destOffset = 0;
+        int retainSourceOffset = 0;
+        int chunkSourceOffset = 0;
+        final Iterator<Range> addIter = added.rangeIterator();
+        final Iterator<Range> removeIter = removed.rangeIterator();
+        final Iterator<Chunk<Values>> dataIter = data.iterator();
+
+        Range nextAdd = addIter.hasNext() ? addIter.next() : null;
+        Range nextRemove = removeIter.hasNext() ? removeIter.next() : null;
+        CharChunk<Values> charChunk = dataIter.hasNext() ? dataIter.next().asCharChunk() : null;
+        while (destOffset < newLength) {
+            if (nextRemove != null && nextRemove.getFirst() == retainSourceOffset) {
+                // skip the range from the source chunk
+                retainSourceOffset += (int) nextRemove.size();
+                nextRemove = removeIter.hasNext() ? removeIter.next() : null;
+            } else if (nextAdd != null && nextAdd.getFirst() == destOffset) {
+                // copy the range from the source chunk
+                long size = nextAdd.size();
+                for (long ii = 0; ii < size; ++ii) {
+                    while (charChunk != null && chunkSourceOffset == charChunk.size()) {
+                        charChunk = dataIter.hasNext() ? dataIter.next().asCharChunk() : null;
+                        chunkSourceOffset = 0;
+                    }
+                    assert charChunk != null;
+                    char value = charChunk.get(chunkSourceOffset++);
+                    tmpStorage.setAt(destOffset++, value == QueryConstants.NULL_CHAR ? null : Js.asAny(value));
+                }
+                nextAdd = addIter.hasNext() ? addIter.next() : null;
+            } else {
+                // copy the range from the source chunk
+                long size = (nextRemove == null ? length : nextRemove.getFirst()) - retainSourceOffset;
+                if (nextAdd != null) {
+                    size = Math.min(size, nextAdd.getFirst() - destOffset);
+                }
+                for (long ii = 0; ii < size; ++ii) {
+                    tmpStorage.setAt(destOffset++, arr.getAt(retainSourceOffset++));
+                }
+            }
+        }
+
+        // swap arrays to avoid copying and garbage collection
+        JsArray<Any> tmp = arr;
+        arr = tmpStorage;
+        tmpStorage = tmp;
+        length = newLength;
+    }
+}
diff --git a/web/client-api/src/main/java/io/deephaven/web/client/api/barrage/data/WebColumnData.java b/web/client-api/src/main/java/io/deephaven/web/client/api/barrage/data/WebColumnData.java
new file mode 100644
index 00000000000..3a0a0190c7f
--- /dev/null
+++ b/web/client-api/src/main/java/io/deephaven/web/client/api/barrage/data/WebColumnData.java
@@ -0,0 +1,40 @@
+//
+// Copyright (c) 2016-2024 Deephaven Data Labs and Patent Pending
+//
+package io.deephaven.web.client.api.barrage.data;
+
+import elemental2.core.JsArray;
+import io.deephaven.chunk.Chunk;
+import io.deephaven.chunk.attributes.Values;
+import io.deephaven.web.shared.data.RangeSet;
+import jsinterop.base.Any;
+
+import java.util.List;
+import java.util.PrimitiveIterator;
+
+/**
+ * Holds data from or intended for web clients, normalizing over nulls, with helpers to handle typed chunks.
+ */
+public abstract class WebColumnData {
+    protected int length = 0;
+    protected JsArray<Any> arr = new JsArray<>();
+
+    public abstract void fillChunk(Chunk<?> data, PrimitiveIterator.OfLong destIterator);
+
+    /**
+     * Apply a viewport update directly to this column data.
+     *
+     * @param data the data source for added rows
+     * @param added rows that are new in a post-update position-space
+     * @param removed rows that no longer exist in a pre-update position-space
+     */
+    public abstract void applyUpdate(List<Chunk<Values>> data, RangeSet added, RangeSet removed);
+
+    public void ensureCapacity(long size) {
+        // Current impl does nothing, js arrays don't behave better when told the size up front
+    }
+
+    public Any get(long position) {
+        return arr.getAt((int) position);
+    }
+}
diff --git a/web/client-api/src/main/java/io/deephaven/web/client/api/barrage/data/WebDoubleColumnData.java b/web/client-api/src/main/java/io/deephaven/web/client/api/barrage/data/WebDoubleColumnData.java
new file mode 100644
index 00000000000..01239a70d4c
--- /dev/null
+++ b/web/client-api/src/main/java/io/deephaven/web/client/api/barrage/data/WebDoubleColumnData.java
@@ -0,0 +1,94 @@
+//
+// Copyright (c) 2016-2024 Deephaven Data Labs and Patent Pending
+//
+// ****** AUTO-GENERATED CLASS - DO NOT EDIT MANUALLY
+// ****** Edit WebCharColumnData and run "./gradlew replicateBarrageUtils" to regenerate
+//
+// @formatter:off
+package io.deephaven.web.client.api.barrage.data;
+
+import elemental2.core.JsArray;
+import io.deephaven.chunk.DoubleChunk;
+import io.deephaven.chunk.Chunk;
+import io.deephaven.chunk.attributes.Values;
+import io.deephaven.util.QueryConstants;
+import io.deephaven.web.shared.data.Range;
+import io.deephaven.web.shared.data.RangeSet;
+import jsinterop.base.Any;
+import jsinterop.base.Js;
+
+import java.util.Iterator;
+import java.util.List;
+import java.util.PrimitiveIterator;
+
+public class WebDoubleColumnData extends WebColumnData {
+    private JsArray<Any> tmpStorage;
+
+    @Override
+    public void fillChunk(Chunk<?> data, PrimitiveIterator.OfLong destIterator) {
+        DoubleChunk<?> doubleChunk = data.asDoubleChunk();
+        int i = 0;
+        while (destIterator.hasNext()) {
+            double value = doubleChunk.get(i++);
+            arr.setAt((int) destIterator.nextLong(), value == QueryConstants.NULL_DOUBLE ? null : Js.asAny(value));
+        }
+    }
+
+    @Override
+    public void applyUpdate(
+            final List<Chunk<Values>> data,
+            final RangeSet added,
+            final RangeSet removed) {
+        // ensure tmpStorage exists
+        if (tmpStorage == null) {
+            tmpStorage = new JsArray<>();
+        }
+        final int newLength = (int) (length - removed.size() + added.size());
+
+        int destOffset = 0;
+        int retainSourceOffset = 0;
+        int chunkSourceOffset = 0;
+        final Iterator<Range> addIter = added.rangeIterator();
+        final Iterator<Range> removeIter = removed.rangeIterator();
+        final Iterator<Chunk<Values>> dataIter = data.iterator();
+
+        Range nextAdd = addIter.hasNext() ? addIter.next() : null;
+        Range nextRemove = removeIter.hasNext() ? removeIter.next() : null;
+        DoubleChunk<Values> doubleChunk = dataIter.hasNext() ? dataIter.next().asDoubleChunk() : null;
+        while (destOffset < newLength) {
+            if (nextRemove != null && nextRemove.getFirst() == retainSourceOffset) {
+                // skip the range from the source chunk
+                retainSourceOffset += (int) nextRemove.size();
+                nextRemove = removeIter.hasNext() ? removeIter.next() : null;
+            } else if (nextAdd != null && nextAdd.getFirst() == destOffset) {
+                // copy the range from the source chunk
+                long size = nextAdd.size();
+                for (long ii = 0; ii < size; ++ii) {
+                    while (doubleChunk != null && chunkSourceOffset == doubleChunk.size()) {
+                        doubleChunk = dataIter.hasNext() ? dataIter.next().asDoubleChunk() : null;
+                        chunkSourceOffset = 0;
+                    }
+                    assert doubleChunk != null;
+                    double value = doubleChunk.get(chunkSourceOffset++);
+                    tmpStorage.setAt(destOffset++, value == QueryConstants.NULL_DOUBLE ? null : Js.asAny(value));
+                }
+                nextAdd = addIter.hasNext() ? addIter.next() : null;
+            } else {
+                // copy the range from the source chunk
+                long size = (nextRemove == null ? length : nextRemove.getFirst()) - retainSourceOffset;
+                if (nextAdd != null) {
+                    size = Math.min(size, nextAdd.getFirst() - destOffset);
+                }
+                for (long ii = 0; ii < size; ++ii) {
+                    tmpStorage.setAt(destOffset++, arr.getAt(retainSourceOffset++));
+                }
+            }
+        }
+
+        // swap arrays to avoid copying and garbage collection
+        JsArray<Any> tmp = arr;
+        arr = tmpStorage;
+        tmpStorage = tmp;
+        length = newLength;
+    }
+}
diff --git a/web/client-api/src/main/java/io/deephaven/web/client/api/barrage/data/WebFloatColumnData.java b/web/client-api/src/main/java/io/deephaven/web/client/api/barrage/data/WebFloatColumnData.java
new file mode 100644
index 00000000000..708e39f3f26
--- /dev/null
+++ b/web/client-api/src/main/java/io/deephaven/web/client/api/barrage/data/WebFloatColumnData.java
@@ -0,0 +1,94 @@
+//
+// Copyright (c) 2016-2024 Deephaven Data Labs and Patent Pending
+//
+// ****** AUTO-GENERATED CLASS - DO NOT EDIT MANUALLY
+// ****** Edit WebCharColumnData and run "./gradlew replicateBarrageUtils" to regenerate
+//
+// @formatter:off
+package io.deephaven.web.client.api.barrage.data;
+
+import elemental2.core.JsArray;
+import io.deephaven.chunk.FloatChunk;
+import io.deephaven.chunk.Chunk;
+import io.deephaven.chunk.attributes.Values;
+import io.deephaven.util.QueryConstants;
+import io.deephaven.web.shared.data.Range;
+import io.deephaven.web.shared.data.RangeSet;
+import jsinterop.base.Any;
+import jsinterop.base.Js;
+
+import java.util.Iterator;
+import java.util.List;
+import java.util.PrimitiveIterator;
+
+public class WebFloatColumnData extends WebColumnData {
+    private JsArray<Any> tmpStorage;
+
+    @Override
+    public void fillChunk(Chunk<?> data, PrimitiveIterator.OfLong destIterator) {
+        FloatChunk<?> floatChunk = data.asFloatChunk();
+        int i = 0;
+        while (destIterator.hasNext()) {
+            float value = floatChunk.get(i++);
+            arr.setAt((int) destIterator.nextLong(), value == QueryConstants.NULL_FLOAT ? null : Js.asAny(value));
+        }
+    }
+
+    @Override
+    public void applyUpdate(
+            final List<Chunk<Values>> data,
+            final RangeSet added,
+            final RangeSet removed) {
+        // ensure tmpStorage exists
+        if (tmpStorage == null) {
+            tmpStorage = new JsArray<>();
+        }
+        final int newLength = (int) (length - removed.size() + added.size());
+
+        int destOffset = 0;
+        int retainSourceOffset = 0;
+        int chunkSourceOffset = 0;
+        final Iterator<Range> addIter = added.rangeIterator();
+        final Iterator<Range> removeIter = removed.rangeIterator();
+        final Iterator<Chunk<Values>> dataIter = data.iterator();
+
+        Range nextAdd = addIter.hasNext() ? addIter.next() : null;
+        Range nextRemove = removeIter.hasNext() ? removeIter.next() : null;
+        FloatChunk<Values> floatChunk = dataIter.hasNext() ? dataIter.next().asFloatChunk() : null;
+        while (destOffset < newLength) {
+            if (nextRemove != null && nextRemove.getFirst() == retainSourceOffset) {
+                // skip the range from the source chunk
+                retainSourceOffset += (int) nextRemove.size();
+                nextRemove = removeIter.hasNext() ? removeIter.next() : null;
+            } else if (nextAdd != null && nextAdd.getFirst() == destOffset) {
+                // copy the range from the source chunk
+                long size = nextAdd.size();
+                for (long ii = 0; ii < size; ++ii) {
+                    while (floatChunk != null && chunkSourceOffset == floatChunk.size()) {
+                        floatChunk = dataIter.hasNext() ? dataIter.next().asFloatChunk() : null;
+                        chunkSourceOffset = 0;
+                    }
+                    assert floatChunk != null;
+                    float value = floatChunk.get(chunkSourceOffset++);
+                    tmpStorage.setAt(destOffset++, value == QueryConstants.NULL_FLOAT ? null : Js.asAny(value));
+                }
+                nextAdd = addIter.hasNext() ? addIter.next() : null;
+            } else {
+                // copy the range from the source chunk
+                long size = (nextRemove == null ? length : nextRemove.getFirst()) - retainSourceOffset;
+                if (nextAdd != null) {
+                    size = Math.min(size, nextAdd.getFirst() - destOffset);
+                }
+                for (long ii = 0; ii < size; ++ii) {
+                    tmpStorage.setAt(destOffset++, arr.getAt(retainSourceOffset++));
+                }
+            }
+        }
+
+        // swap arrays to avoid copying and garbage collection
+        JsArray<Any> tmp = arr;
+        arr = tmpStorage;
+        tmpStorage = tmp;
+        length = newLength;
+    }
+}
diff --git a/web/client-api/src/main/java/io/deephaven/web/client/api/barrage/data/WebIntColumnData.java b/web/client-api/src/main/java/io/deephaven/web/client/api/barrage/data/WebIntColumnData.java
new file mode 100644
index 00000000000..2606b6f25de
--- /dev/null
+++ b/web/client-api/src/main/java/io/deephaven/web/client/api/barrage/data/WebIntColumnData.java
@@ -0,0 +1,94 @@
+//
+// Copyright (c) 2016-2024 Deephaven Data Labs and Patent Pending
+//
+// ****** AUTO-GENERATED CLASS - DO NOT EDIT MANUALLY
+// ****** Edit WebCharColumnData and run "./gradlew replicateBarrageUtils" to regenerate
+//
+// @formatter:off
+package io.deephaven.web.client.api.barrage.data;
+
+import elemental2.core.JsArray;
+import io.deephaven.chunk.IntChunk;
+import io.deephaven.chunk.Chunk;
+import io.deephaven.chunk.attributes.Values;
+import io.deephaven.util.QueryConstants;
+import io.deephaven.web.shared.data.Range;
+import io.deephaven.web.shared.data.RangeSet;
+import jsinterop.base.Any;
+import jsinterop.base.Js;
+
+import java.util.Iterator;
+import java.util.List;
+import java.util.PrimitiveIterator;
+
+public class WebIntColumnData extends WebColumnData {
+    private JsArray<Any> tmpStorage;
+
+    @Override
+    public void fillChunk(Chunk<?> data, PrimitiveIterator.OfLong destIterator) {
+        IntChunk<?> intChunk = data.asIntChunk();
+        int i = 0;
+        while (destIterator.hasNext()) {
+            int value = intChunk.get(i++);
+            arr.setAt((int) destIterator.nextLong(), value == QueryConstants.NULL_INT ? null : Js.asAny(value));
+        }
+    }
+
+    @Override
+    public void applyUpdate(
+            final List<Chunk<Values>> data,
+            final RangeSet added,
+            final RangeSet removed) {
+        // ensure tmpStorage exists
+        if (tmpStorage == null) {
+            tmpStorage = new JsArray<>();
+        }
+        final int newLength = (int) (length - removed.size() + added.size());
+
+        int destOffset = 0;
+        int retainSourceOffset = 0;
+        int chunkSourceOffset = 0;
+        final Iterator<Range> addIter = added.rangeIterator();
+        final Iterator<Range> removeIter = removed.rangeIterator();
+        final Iterator<Chunk<Values>> dataIter = data.iterator();
+
+        Range nextAdd = addIter.hasNext() ? addIter.next() : null;
+        Range nextRemove = removeIter.hasNext() ? removeIter.next() : null;
+        IntChunk<Values> intChunk = dataIter.hasNext() ? dataIter.next().asIntChunk() : null;
+        while (destOffset < newLength) {
+            if (nextRemove != null && nextRemove.getFirst() == retainSourceOffset) {
+                // skip the range from the source chunk
+                retainSourceOffset += (int) nextRemove.size();
+                nextRemove = removeIter.hasNext() ? removeIter.next() : null;
+            } else if (nextAdd != null && nextAdd.getFirst() == destOffset) {
+                // copy the range from the source chunk
+                long size = nextAdd.size();
+                for (long ii = 0; ii < size; ++ii) {
+                    while (intChunk != null && chunkSourceOffset == intChunk.size()) {
+                        intChunk = dataIter.hasNext() ? dataIter.next().asIntChunk() : null;
+                        chunkSourceOffset = 0;
+                    }
+                    assert intChunk != null;
+                    int value = intChunk.get(chunkSourceOffset++);
+                    tmpStorage.setAt(destOffset++, value == QueryConstants.NULL_INT ? null : Js.asAny(value));
+                }
+                nextAdd = addIter.hasNext() ? addIter.next() : null;
+            } else {
+                // copy the range from the source chunk
+                long size = (nextRemove == null ? length : nextRemove.getFirst()) - retainSourceOffset;
+                if (nextAdd != null) {
+                    size = Math.min(size, nextAdd.getFirst() - destOffset);
+                }
+                for (long ii = 0; ii < size; ++ii) {
+                    tmpStorage.setAt(destOffset++, arr.getAt(retainSourceOffset++));
+                }
+            }
+        }
+
+        // swap arrays to avoid copying and garbage collection
+        JsArray<Any> tmp = arr;
+        arr = tmpStorage;
+        tmpStorage = tmp;
+        length = newLength;
+    }
+}
diff --git a/web/client-api/src/main/java/io/deephaven/web/client/api/barrage/data/WebLongColumnData.java b/web/client-api/src/main/java/io/deephaven/web/client/api/barrage/data/WebLongColumnData.java
new file mode 100644
index 00000000000..779fe7d208b
--- /dev/null
+++ b/web/client-api/src/main/java/io/deephaven/web/client/api/barrage/data/WebLongColumnData.java
@@ -0,0 +1,94 @@
+//
+// Copyright (c) 2016-2024 Deephaven Data Labs and Patent Pending
+//
+// ****** AUTO-GENERATED CLASS - DO NOT EDIT MANUALLY
+// ****** Edit WebCharColumnData and run "./gradlew replicateBarrageUtils" to regenerate
+//
+// @formatter:off
+package io.deephaven.web.client.api.barrage.data;
+
+import elemental2.core.JsArray;
+import io.deephaven.chunk.LongChunk;
+import io.deephaven.chunk.Chunk;
+import io.deephaven.chunk.attributes.Values;
+import io.deephaven.util.QueryConstants;
+import io.deephaven.web.shared.data.Range;
+import io.deephaven.web.shared.data.RangeSet;
+import jsinterop.base.Any;
+import jsinterop.base.Js;
+
+import java.util.Iterator;
+import java.util.List;
+import java.util.PrimitiveIterator;
+
+public class WebLongColumnData extends WebColumnData {
+    private JsArray<Any> tmpStorage;
+
+    @Override
+    public void fillChunk(Chunk<?> data, PrimitiveIterator.OfLong destIterator) {
+        LongChunk<?> longChunk = data.asLongChunk();
+        int i = 0;
+        while (destIterator.hasNext()) {
+            long value = longChunk.get(i++);
+            arr.setAt((int) destIterator.nextLong(), value == QueryConstants.NULL_LONG ? null : Js.asAny(value));
+        }
+    }
+
+    @Override
+    public void applyUpdate(
+            final List<Chunk<Values>> data,
+            final RangeSet added,
+            final RangeSet removed) {
+        // ensure tmpStorage exists
+        if (tmpStorage == null) {
+            tmpStorage = new JsArray<>();
+        }
+        final int newLength = (int) (length - removed.size() + added.size());
+
+        int destOffset = 0;
+        int retainSourceOffset = 0;
+        int chunkSourceOffset = 0;
+        final Iterator<Range> addIter = added.rangeIterator();
+        final Iterator<Range> removeIter = removed.rangeIterator();
+        final Iterator<Chunk<Values>> dataIter = data.iterator();
+
+        Range nextAdd = addIter.hasNext() ? addIter.next() : null;
+        Range nextRemove = removeIter.hasNext() ? removeIter.next() : null;
+        LongChunk<Values> longChunk = dataIter.hasNext() ? dataIter.next().asLongChunk() : null;
+        while (destOffset < newLength) {
+            if (nextRemove != null && nextRemove.getFirst() == retainSourceOffset) {
+                // skip the range from the source chunk
+                retainSourceOffset += (int) nextRemove.size();
+                nextRemove = removeIter.hasNext() ? removeIter.next() : null;
+            } else if (nextAdd != null && nextAdd.getFirst() == destOffset) {
+                // copy the range from the source chunk
+                long size = nextAdd.size();
+                for (long ii = 0; ii < size; ++ii) {
+                    while (longChunk != null && chunkSourceOffset == longChunk.size()) {
+                        longChunk = dataIter.hasNext() ? dataIter.next().asLongChunk() : null;
+                        chunkSourceOffset = 0;
+                    }
+                    assert longChunk != null;
+                    long value = longChunk.get(chunkSourceOffset++);
+                    tmpStorage.setAt(destOffset++, value == QueryConstants.NULL_LONG ? null : Js.asAny(value));
+                }
+                nextAdd = addIter.hasNext() ? addIter.next() : null;
+            } else {
+                // copy the range from the source chunk
+                long size = (nextRemove == null ? length : nextRemove.getFirst()) - retainSourceOffset;
+                if (nextAdd != null) {
+                    size = Math.min(size, nextAdd.getFirst() - destOffset);
+                }
+                for (long ii = 0; ii < size; ++ii) {
+                    tmpStorage.setAt(destOffset++, arr.getAt(retainSourceOffset++));
+                }
+            }
+        }
+
+        // swap arrays to avoid copying and garbage collection
+        JsArray<Any> tmp = arr;
+        arr = tmpStorage;
+        tmpStorage = tmp;
+        length = newLength;
+    }
+}
diff --git a/web/client-api/src/main/java/io/deephaven/web/client/api/barrage/data/WebObjectColumnData.java b/web/client-api/src/main/java/io/deephaven/web/client/api/barrage/data/WebObjectColumnData.java
new file mode 100644
index 00000000000..33c4817a857
--- /dev/null
+++ b/web/client-api/src/main/java/io/deephaven/web/client/api/barrage/data/WebObjectColumnData.java
@@ -0,0 +1,90 @@
+//
+// Copyright (c) 2016-2024 Deephaven Data Labs and Patent Pending
+//
+package io.deephaven.web.client.api.barrage.data;
+
+import elemental2.core.JsArray;
+import io.deephaven.chunk.Chunk;
+import io.deephaven.chunk.ObjectChunk;
+import io.deephaven.chunk.attributes.Values;
+import io.deephaven.web.shared.data.Range;
+import io.deephaven.web.shared.data.RangeSet;
+import jsinterop.base.Any;
+import jsinterop.base.Js;
+
+import java.util.Iterator;
+import java.util.List;
+import java.util.PrimitiveIterator;
+
+public class WebObjectColumnData extends WebColumnData {
+    private JsArray<Any> tmpStorage;
+
+    @Override
+    public void fillChunk(Chunk<?> data, PrimitiveIterator.OfLong destIterator) {
+        ObjectChunk<?, ?> objectChunk = data.asObjectChunk();
+        int i = 0;
+        while (destIterator.hasNext()) {
+            Object value = objectChunk.get(i++);
+            arr.setAt((int) destIterator.nextLong(), Js.asAny(value));
+        }
+    }
+
+
+    @Override
+    public void applyUpdate(
+            final List<Chunk<Values>> data,
+            final RangeSet added,
+            final RangeSet removed) {
+        // ensure tmpStorage exists
+        if (tmpStorage == null) {
+            tmpStorage = new JsArray<>();
+        }
+        final int newLength = (int) (length - removed.size() + added.size());
+
+        int destOffset = 0;
+        int retainSourceOffset = 0;
+        int chunkSourceOffset = 0;
+        final Iterator<Range> addIter = added.rangeIterator();
+        final Iterator<Range> removeIter = removed.rangeIterator();
+        final Iterator<Chunk<Values>> dataIter = data.iterator();
+
+        Range nextAdd = addIter.hasNext() ? addIter.next() : null;
+        Range nextRemove = removeIter.hasNext() ? removeIter.next() : null;
+        ObjectChunk<?, Values> objectChunk = dataIter.hasNext() ? dataIter.next().asObjectChunk() : null;
+        while (destOffset < newLength) {
+            if (nextRemove != null && nextRemove.getFirst() == retainSourceOffset) {
+                // skip the range from the source chunk
+                retainSourceOffset += (int) nextRemove.size();
+                nextRemove = removeIter.hasNext() ? removeIter.next() : null;
+            } else if (nextAdd != null && nextAdd.getFirst() == destOffset) {
+                // copy the range from the source chunk
+                long size = nextAdd.size();
+                for (long ii = 0; ii < size; ++ii) {
+                    while (objectChunk != null && chunkSourceOffset == objectChunk.size()) {
+                        objectChunk = dataIter.hasNext() ? dataIter.next().asObjectChunk() : null;
+                        chunkSourceOffset = 0;
+                    }
+                    assert objectChunk != null;
+                    Object value = objectChunk.get(chunkSourceOffset++);
+                    tmpStorage.setAt(destOffset++, Js.asAny(value));
+                }
+                nextAdd = addIter.hasNext() ? addIter.next() : null;
+            } else {
+                // copy the range from the source chunk
+                long size = (nextRemove == null ? length : nextRemove.getFirst()) - retainSourceOffset;
+                if (nextAdd != null) {
+                    size = Math.min(size, nextAdd.getFirst() - destOffset);
+                }
+                for (long ii = 0; ii < size; ++ii) {
+                    tmpStorage.setAt(destOffset++, arr.getAt(retainSourceOffset++));
+                }
+            }
+        }
+
+        // swap arrays to avoid copying and garbage collection
+        JsArray<Any> tmp = arr;
+        arr = tmpStorage;
+        tmpStorage = tmp;
+        length = newLength;
+    }
+}
diff --git a/web/client-api/src/main/java/io/deephaven/web/client/api/barrage/data/WebShortColumnData.java b/web/client-api/src/main/java/io/deephaven/web/client/api/barrage/data/WebShortColumnData.java
new file mode 100644
index 00000000000..31e6fda181c
--- /dev/null
+++ b/web/client-api/src/main/java/io/deephaven/web/client/api/barrage/data/WebShortColumnData.java
@@ -0,0 +1,94 @@
+//
+// Copyright (c) 2016-2024 Deephaven Data Labs and Patent Pending
+//
+// ****** AUTO-GENERATED CLASS - DO NOT EDIT MANUALLY
+// ****** Edit WebCharColumnData and run "./gradlew replicateBarrageUtils" to regenerate
+//
+// @formatter:off
+package io.deephaven.web.client.api.barrage.data;
+
+import elemental2.core.JsArray;
+import io.deephaven.chunk.ShortChunk;
+import io.deephaven.chunk.Chunk;
+import io.deephaven.chunk.attributes.Values;
+import io.deephaven.util.QueryConstants;
+import io.deephaven.web.shared.data.Range;
+import io.deephaven.web.shared.data.RangeSet;
+import jsinterop.base.Any;
+import jsinterop.base.Js;
+
+import java.util.Iterator;
+import java.util.List;
+import java.util.PrimitiveIterator;
+
+public class WebShortColumnData extends WebColumnData {
+    private JsArray<Any> tmpStorage;
+
+    @Override
+    public void fillChunk(Chunk<?> data, PrimitiveIterator.OfLong destIterator) {
+        ShortChunk<?> shortChunk = data.asShortChunk();
+        int i = 0;
+        while (destIterator.hasNext()) {
+            short value = shortChunk.get(i++);
+            arr.setAt((int) destIterator.nextLong(), value == QueryConstants.NULL_SHORT ? null : Js.asAny(value));
+        }
+    }
+
+    @Override
+    public void applyUpdate(
+            final List<Chunk<Values>> data,
+            final RangeSet added,
+            final RangeSet removed) {
+        // ensure tmpStorage exists
+        if (tmpStorage == null) {
+            tmpStorage = new JsArray<>();
+        }
+        final int newLength = (int) (length - removed.size() + added.size());
+
+        int destOffset = 0;
+        int retainSourceOffset = 0;
+        int chunkSourceOffset = 0;
+        final Iterator<Range> addIter = added.rangeIterator();
+        final Iterator<Range> removeIter = removed.rangeIterator();
+        final Iterator<Chunk<Values>> dataIter = data.iterator();
+
+        Range nextAdd = addIter.hasNext() ? addIter.next() : null;
+        Range nextRemove = removeIter.hasNext() ? removeIter.next() : null;
+        ShortChunk<Values> shortChunk = dataIter.hasNext() ? dataIter.next().asShortChunk() : null;
+        while (destOffset < newLength) {
+            if (nextRemove != null && nextRemove.getFirst() == retainSourceOffset) {
+                // skip the range from the source chunk
+                retainSourceOffset += (int) nextRemove.size();
+                nextRemove = removeIter.hasNext() ? removeIter.next() : null;
+            } else if (nextAdd != null && nextAdd.getFirst() == destOffset) {
+                // copy the range from the source chunk
+                long size = nextAdd.size();
+                for (long ii = 0; ii < size; ++ii) {
+                    while (shortChunk != null && chunkSourceOffset == shortChunk.size()) {
+                        shortChunk = dataIter.hasNext() ? dataIter.next().asShortChunk() : null;
+                        chunkSourceOffset = 0;
+                    }
+                    assert shortChunk != null;
+                    short value = shortChunk.get(chunkSourceOffset++);
+                    tmpStorage.setAt(destOffset++, value == QueryConstants.NULL_SHORT ? null : Js.asAny(value));
+                }
+                nextAdd = addIter.hasNext() ? addIter.next() : null;
+            } else {
+                // copy the range from the source chunk
+                long size = (nextRemove == null ? length : nextRemove.getFirst()) - retainSourceOffset;
+                if (nextAdd != null) {
+                    size = Math.min(size, nextAdd.getFirst() - destOffset);
+                }
+                for (long ii = 0; ii < size; ++ii) {
+                    tmpStorage.setAt(destOffset++, arr.getAt(retainSourceOffset++));
+                }
+            }
+        }
+
+        // swap arrays to avoid copying and garbage collection
+        JsArray<Any> tmp = arr;
+        arr = tmpStorage;
+        tmpStorage = tmp;
+        length = newLength;
+    }
+}
diff --git a/web/client-api/src/main/java/io/deephaven/web/client/api/barrage/def/ColumnDefinition.java b/web/client-api/src/main/java/io/deephaven/web/client/api/barrage/def/ColumnDefinition.java
index 604f80fcd77..049d1db1eaf 100644
--- a/web/client-api/src/main/java/io/deephaven/web/client/api/barrage/def/ColumnDefinition.java
+++ b/web/client-api/src/main/java/io/deephaven/web/client/api/barrage/def/ColumnDefinition.java
@@ -4,108 +4,101 @@
 package io.deephaven.web.client.api.barrage.def;
 
 import io.deephaven.web.client.api.Column;
+import org.apache.arrow.flatbuf.Field;
 
 import java.util.Map;
 
+import static io.deephaven.web.client.api.barrage.WebBarrageUtils.keyValuePairs;
+
 public class ColumnDefinition {
-    private int columnIndex;
-    private String name;
-    private String type;
-
-    private boolean isSortable;
-
-    private String styleColumn;
-    private String formatColumn;
-
-    private boolean isStyleColumn;
-    private boolean isFormatColumn;
-    private boolean isNumberFormatColumn;
-    private boolean isPartitionColumn;
-    private boolean isHierarchicalExpandByColumn;
-    private boolean isHierarchicalRowDepthColumn;
-    private boolean isHierarchicalRowExpandedColumn;
-    private boolean isRollupAggregatedNodeColumn;
-    private boolean isRollupConstituentNodeColumn;
-    private boolean isRollupGroupByColumn;
-    private String rollupAggregationInputColumn;
-
-    // Indicates that this is a style column for the row
-    private boolean forRow;
-    private boolean isInputTableKeyColumn;
-    private String description;
+    private final Field field;
+    private final int columnIndex;
+    private final String type;
+
+    private final boolean isSortable;
+
+    private final String styleColumn;
+    private final String formatColumn;
+
+    private final boolean isStyleColumn;
+    private final boolean isFormatColumn;
+    private final boolean isPartitionColumn;
+    private final boolean isHierarchicalExpandByColumn;
+    private final boolean isHierarchicalRowDepthColumn;
+    private final boolean isHierarchicalRowExpandedColumn;
+    private final boolean isRollupAggregatedNodeColumn;
+    private final boolean isRollupConstituentNodeColumn;
+    private final boolean isRollupGroupByColumn;
+    private final String rollupAggregationInputColumn;
+
+    // Indicates that this is a style column for the whole row
+    private final boolean forRow;
+    private final boolean isInputTableKeyColumn;
+    private final String description;
+
+    public ColumnDefinition(int index, Field field) {
+        Map<String, String> fieldMetadata =
+                keyValuePairs("deephaven:", field.customMetadataLength(), field::customMetadata);
+        this.field = field;
+        columnIndex = index;
+        type = fieldMetadata.get("type");
+        isSortable = "true".equals(fieldMetadata.get("isSortable"));
+        isStyleColumn = "true".equals(fieldMetadata.get("isStyle"));
+        isFormatColumn = "true".equals(fieldMetadata.get("isDateFormat"))
+                || "true".equals(fieldMetadata.get("isNumberFormat"));
+        forRow = "true".equals(fieldMetadata.get("isRowStyle"));
+
+        String formatColumnName = fieldMetadata.get("dateFormatColumn");
+        if (formatColumnName == null) {
+            formatColumnName = fieldMetadata.get("numberFormatColumn");
+        }
+        formatColumn = formatColumnName;
 
-    public String getName() {
-        return name;
-    }
+        styleColumn = fieldMetadata.get("styleColumn");
 
-    public int getColumnIndex() {
-        return columnIndex;
+        isInputTableKeyColumn = "true".equals(fieldMetadata.get("inputtable.isKey"));
+
+        this.description = fieldMetadata.get("description");
+
+        isPartitionColumn = "true".equals(fieldMetadata.get("isPartitioning"));
+
+        isHierarchicalExpandByColumn = "true".equals(fieldMetadata.get("hierarchicalTable.isExpandByColumn"));
+        isHierarchicalRowDepthColumn = "true".equals(fieldMetadata.get("hierarchicalTable.isRowDepthColumn"));
+        isHierarchicalRowExpandedColumn = "true".equals(fieldMetadata.get("hierarchicalTable.isRowExpandedColumn"));
+        isRollupAggregatedNodeColumn = "true".equals(fieldMetadata.get("rollupTable.isAggregatedNodeColumn"));
+        isRollupConstituentNodeColumn = "true".equals(fieldMetadata.get("rollupTable.isConstituentNodeColumn"));
+        isRollupGroupByColumn = "true".equals(fieldMetadata.get("rollupTable.isGroupByColumn"));
+        rollupAggregationInputColumn = fieldMetadata.get("rollupTable.aggregationInputColumnName");
     }
 
-    public void setColumnIndex(int columnIndex) {
-        this.columnIndex = columnIndex;
+    public String getName() {
+        return field.name();
     }
 
-    public void setName(String name) {
-        this.name = name;
+    public int getColumnIndex() {
+        return columnIndex;
     }
 
     public String getType() {
         return type;
     }
 
-    public void setType(String type) {
-        this.type = type;
-    }
-
     public boolean isSortable() {
         return isSortable;
     }
 
-    public void setIsSortable(boolean sortable) {
-        isSortable = sortable;
-    }
-
     public boolean isStyleColumn() {
         return isStyleColumn;
     }
 
-    public void setStyleColumn(boolean styleColumn) {
-        isStyleColumn = styleColumn;
-    }
-
     public boolean isFormatColumn() {
         return isFormatColumn;
     }
 
-    public void setFormatColumn(boolean formatColumn) {
-        isFormatColumn = formatColumn;
-    }
-
-    /**
-     * @deprecated Use {@link #isFormatColumn()}
-     */
-    @Deprecated
-    public boolean isNumberFormatColumn() {
-        return isNumberFormatColumn;
-    }
-
-    /**
-     * @deprecated Use {@link #setFormatColumn(boolean)}
-     */
-    @Deprecated
-    public void setNumberFormatColumn(boolean numberFormatColumn) {
-        isNumberFormatColumn = numberFormatColumn;
-    }
-
     public boolean isPartitionColumn() {
         return isPartitionColumn;
     }
 
-    public void setPartitionColumn(boolean partitionColumn) {
-        isPartitionColumn = partitionColumn;
-    }
-
     public boolean isVisible() {
         return !isStyleColumn() && !isFormatColumn() && !isRollupConstituentNodeColumn()
                 && !isHierarchicalRowDepthColumn() && !isHierarchicalRowExpandedColumn();
@@ -115,38 +108,18 @@ public boolean isForRow() {
         return forRow;
     }
 
-    public void setForRow(boolean forRow) {
-        this.forRow = forRow;
-    }
-
     public String getFormatColumnName() {
         return formatColumn;
     }
 
-    public void setFormatColumnName(String formatColumn) {
-        this.formatColumn = formatColumn;
-    }
-
     public String getStyleColumnName() {
         return styleColumn;
     }
 
-    public void setStyleColumnName(String styleColumn) {
-        this.styleColumn = styleColumn;
-    }
-
-    public void setInputTableKeyColumn(boolean inputTableKeyColumn) {
-        this.isInputTableKeyColumn = inputTableKeyColumn;
-    }
-
     public boolean isInputTableKeyColumn() {
         return isInputTableKeyColumn;
     }
 
-    public void setDescription(String description) {
-        this.description = description;
-    }
-
     public String getDescription() {
         return description;
     }
@@ -161,10 +134,10 @@ public Column makeJsColumn(int index, Map<Boolean, Map<String, ColumnDefinition>
 
         return makeColumn(index,
                 this,
-                format == null || !format.isNumberFormatColumn() ? null : format.getColumnIndex(),
+                style == null ? null : style.getColumnIndex(),
                 style == null ? null : style.getColumnIndex(),
                 isPartitionColumn(),
-                format == null || format.isNumberFormatColumn() ? null : format.getColumnIndex(),
+                format == null ? null : format.getColumnIndex(),
                 getDescription(),
                 isInputTableKeyColumn());
     }
@@ -181,55 +154,28 @@ public boolean isHierarchicalExpandByColumn() {
         return isHierarchicalExpandByColumn;
     }
 
-    public void setHierarchicalExpandByColumn(boolean hierarchicalExpandByColumn) {
-        isHierarchicalExpandByColumn = hierarchicalExpandByColumn;
-    }
-
     public boolean isHierarchicalRowDepthColumn() {
         return isHierarchicalRowDepthColumn;
     }
 
-    public void setHierarchicalRowDepthColumn(boolean hierarchicalRowDepthColumn) {
-        isHierarchicalRowDepthColumn = hierarchicalRowDepthColumn;
-    }
-
     public boolean isHierarchicalRowExpandedColumn() {
         return isHierarchicalRowExpandedColumn;
     }
 
-    public void setHierarchicalRowExpandedColumn(boolean hierarchicalRowExpandedColumn) {
-        isHierarchicalRowExpandedColumn = hierarchicalRowExpandedColumn;
-    }
-
     public boolean isRollupAggregatedNodeColumn() {
         return isRollupAggregatedNodeColumn;
     }
 
-    public void setRollupAggregatedNodeColumn(boolean rollupAggregatedNodeColumn) {
-        isRollupAggregatedNodeColumn = rollupAggregatedNodeColumn;
-    }
-
     public boolean isRollupConstituentNodeColumn() {
         return isRollupConstituentNodeColumn;
     }
 
-    public void setRollupConstituentNodeColumn(boolean rollupConstituentNodeColumn) {
-        isRollupConstituentNodeColumn = rollupConstituentNodeColumn;
-    }
-
     public boolean isRollupGroupByColumn() {
         return isRollupGroupByColumn;
     }
 
-    public void setRollupGroupByColumn(boolean rollupGroupByColumn) {
-        isRollupGroupByColumn = rollupGroupByColumn;
-    }
-
     public String getRollupAggregationInputColumn() {
         return rollupAggregationInputColumn;
     }
 
-    public void setRollupAggregationInputColumn(String rollupAggregationInputColumn) {
-        this.rollupAggregationInputColumn = rollupAggregationInputColumn;
-    }
 }
diff --git a/web/client-api/src/main/java/io/deephaven/web/client/api/barrage/stream/BiDiStream.java b/web/client-api/src/main/java/io/deephaven/web/client/api/barrage/stream/BiDiStream.java
index 758fe62f20c..4fc65739780 100644
--- a/web/client-api/src/main/java/io/deephaven/web/client/api/barrage/stream/BiDiStream.java
+++ b/web/client-api/src/main/java/io/deephaven/web/client/api/barrage/stream/BiDiStream.java
@@ -16,8 +16,6 @@
 import java.util.function.IntSupplier;
 import java.util.function.Supplier;
 
-import static io.deephaven.web.client.api.barrage.WebGrpcUtils.USE_WEBSOCKETS;
-
 public abstract class BiDiStream<Req, Resp> {
     public interface BiDiStreamFactory {
         /**
@@ -38,10 +36,12 @@ public interface NextStreamMessageFactory<Req> {
         void nextStreamMessage(Req nextPayload, BrowserHeaders headers, JsBiConsumer<Object, Object> callback);
     }
     public static class Factory<ReqT, RespT> {
+        private final boolean supportsClientStreaming;
         private final Supplier<BrowserHeaders> headers;
         private final IntSupplier nextIntTicket;
 
-        public Factory(Supplier<BrowserHeaders> headers, IntSupplier nextIntTicket) {
+        public Factory(boolean supportsClientStreaming, Supplier<BrowserHeaders> headers, IntSupplier nextIntTicket) {
+            this.supportsClientStreaming = supportsClientStreaming;
             this.headers = headers;
             this.nextIntTicket = nextIntTicket;
         }
@@ -51,8 +51,8 @@ public BiDiStream<ReqT, RespT> create(
                 OpenStreamFactory<ReqT> openEmulatedStream,
                 NextStreamMessageFactory<ReqT> nextEmulatedStream,
                 ReqT emptyReq) {
-            if (USE_WEBSOCKETS) {
-                return websocket(bidirectionalStream.openBiDiStream(headers.get()));
+            if (supportsClientStreaming) {
+                return bidi(bidirectionalStream.openBiDiStream(headers.get()));
             } else {
                 return new EmulatedBiDiStream<>(
                         openEmulatedStream,
@@ -73,7 +73,7 @@ public static <Req, Resp> BiDiStream<Req, Resp> of(
             IntSupplier nextIntTicket,
             boolean useWebsocket) {
         if (useWebsocket) {
-            return websocket(bidirectionalStream.openBiDiStream(headers.get()));
+            return bidi(bidirectionalStream.openBiDiStream(headers.get()));
         } else {
             return new EmulatedBiDiStream<>(
                     openEmulatedStream,
@@ -84,7 +84,7 @@ public static <Req, Resp> BiDiStream<Req, Resp> of(
         }
     }
 
-    public static <Req, Resp> BiDiStream<Req, Resp> websocket(Object bidirectionalStream) {
+    public static <Req, Resp> BiDiStream<Req, Resp> bidi(Object bidirectionalStream) {
         return new WebsocketBiDiStream<>(Js.cast(bidirectionalStream));
     }
 
diff --git a/web/client-api/src/main/java/io/deephaven/web/client/api/barrage/stream/HandshakeStreamFactory.java b/web/client-api/src/main/java/io/deephaven/web/client/api/barrage/stream/HandshakeStreamFactory.java
deleted file mode 100644
index bae2d3c41fd..00000000000
--- a/web/client-api/src/main/java/io/deephaven/web/client/api/barrage/stream/HandshakeStreamFactory.java
+++ /dev/null
@@ -1,150 +0,0 @@
-//
-// Copyright (c) 2016-2024 Deephaven Data Labs and Patent Pending
-//
-package io.deephaven.web.client.api.barrage.stream;
-
-import elemental2.core.Function;
-import elemental2.core.JsArray;
-import io.deephaven.javascript.proto.dhinternal.arrow.flight.protocol.browserflight_pb_service.BrowserFlightService;
-import io.deephaven.javascript.proto.dhinternal.arrow.flight.protocol.browserflight_pb_service.ResponseStream;
-import io.deephaven.javascript.proto.dhinternal.arrow.flight.protocol.flight_pb.HandshakeRequest;
-import io.deephaven.javascript.proto.dhinternal.arrow.flight.protocol.flight_pb.HandshakeResponse;
-import io.deephaven.javascript.proto.dhinternal.arrow.flight.protocol.flight_pb_service.BidirectionalStream;
-import io.deephaven.javascript.proto.dhinternal.arrow.flight.protocol.flight_pb_service.FlightService;
-import io.deephaven.javascript.proto.dhinternal.grpcweb.Grpc;
-import io.deephaven.javascript.proto.dhinternal.grpcweb.client.ClientRpcOptions;
-import io.deephaven.javascript.proto.dhinternal.grpcweb.grpc.Client;
-import io.deephaven.javascript.proto.dhinternal.grpcweb.invoke.InvokeRpcOptions;
-import io.deephaven.javascript.proto.dhinternal.grpcweb.invoke.Request;
-import io.deephaven.web.client.api.WorkerConnection;
-import jsinterop.base.Js;
-
-import java.util.HashMap;
-import java.util.Map;
-
-/**
- * Improbable-eng's grpc-web implementation doesn't pass headers to api callers, only trailers (which sometimes includes
- * headers) are included when calls fail, but never when successful. The current Flight auth v2 setup requires reading
- * headers from responses, but strictly speaking doesn't require reading them from all calls - we can make extra
- * FlightService/Handshake calls as long as we can read the response headers with them.
- * <p>
- * </p>
- * This class includes a custom implementation of the Handshake method that is able to notify callers about headers that
- * are received.
- */
-public class HandshakeStreamFactory {
-
-    private static final String DATA_EVENT_LISTENER_NAME = "data";
-    private static final String END_EVENT_LISTENER_NAME = "end";
-    private static final String STATUS_EVENT_LISTENER_NAME = "status";
-    private static final String HEADERS_EVENT_LISTENER_NAME = "headers";
-
-    public static BiDiStream<HandshakeRequest, HandshakeResponse> create(WorkerConnection connection) {
-        return connection.<HandshakeRequest, HandshakeResponse>streamFactory().create(
-                metadata -> {
-                    Map<String, JsArray<Function>> listeners = listenerMap();
-                    ClientRpcOptions options = ClientRpcOptions.create();
-                    options.setHost(connection.flightServiceClient().serviceHost);
-                    options.setTransport(null);// ts doesn't expose these two, stick with defaults for now
-                    options.setDebug(false);
-                    Client<HandshakeRequest, HandshakeResponse> client = Grpc.client(FlightService.Handshake,
-                            (io.deephaven.javascript.proto.dhinternal.grpcweb.grpc.ClientRpcOptions) options);
-                    client.onEnd((status, statusMessage, trailers) -> {
-                        listeners.get(STATUS_EVENT_LISTENER_NAME).forEach((item, index) -> item.call(null,
-                                ResponseStreamWrapper.Status.of(status, statusMessage, metadata)));
-                        listeners.get(END_EVENT_LISTENER_NAME).forEach((item, index) -> item.call(null,
-                                ResponseStreamWrapper.Status.of(status, statusMessage, metadata)));
-                        listeners.clear();
-                    });
-                    client.onMessage(message -> {
-                        listeners.get(DATA_EVENT_LISTENER_NAME).forEach((item, index) -> item.call(null, message));
-                    });
-                    client.onHeaders(headers -> {
-                        listeners.get(HEADERS_EVENT_LISTENER_NAME)
-                                .forEach((item, index) -> item.call(null, headers));
-                    });
-                    client.start(metadata);
-
-                    return new BidirectionalStream<HandshakeRequest, HandshakeResponse>() {
-                        @Override
-                        public void cancel() {
-                            listeners.clear();
-                            client.close();
-                        }
-
-                        @Override
-                        public void end() {
-                            client.finishSend();
-                        }
-
-                        @Override
-                        public BidirectionalStream<HandshakeRequest, HandshakeResponse> on(String type,
-                                Function handler) {
-                            listeners.get(type).push(handler);
-                            return this;
-                        }
-
-                        @Override
-                        public BidirectionalStream<HandshakeRequest, HandshakeResponse> write(
-                                HandshakeRequest message) {
-                            client.send(message);
-                            return this;
-                        }
-                    };
-                },
-                (first, metadata) -> {
-                    Map<String, JsArray<Function>> listeners = listenerMap();
-                    io.deephaven.javascript.proto.dhinternal.grpcweb.grpc.InvokeRpcOptions<HandshakeRequest, HandshakeResponse> props =
-                            Js.cast(InvokeRpcOptions.create());
-                    props.setRequest(first);
-                    props.setHost(connection.browserFlightServiceClient().serviceHost);
-                    props.setMetadata(metadata);
-                    props.setTransport(null);// ts doesnt expose these two, stick with defaults for now
-                    props.setDebug(false);
-                    props.setOnMessage(responseMessage -> {
-                        listeners.get(DATA_EVENT_LISTENER_NAME)
-                                .forEach((item, index) -> item.call(null, responseMessage));
-                    });
-                    props.setOnEnd((status, statusMessage, trailers) -> {
-                        listeners.get(STATUS_EVENT_LISTENER_NAME).forEach(
-                                (item, index) -> item.call(null,
-                                        ResponseStreamWrapper.Status.of(status, statusMessage, metadata)));
-                        listeners.get(END_EVENT_LISTENER_NAME).forEach(
-                                (item, index) -> item.call(null,
-                                        ResponseStreamWrapper.Status.of(status, statusMessage, metadata)));
-                        listeners.clear();
-                    });
-                    props.setOnHeaders(headers -> {
-                        listeners.get(HEADERS_EVENT_LISTENER_NAME)
-                                .forEach((item, index) -> item.call(null, headers));
-                    });
-                    Request client = Grpc.invoke.onInvoke(BrowserFlightService.OpenHandshake, props);
-
-                    return new ResponseStream<HandshakeResponse>() {
-                        @Override
-                        public void cancel() {
-                            listeners.clear();
-                            client.getClose().onInvoke();
-                        }
-
-                        @Override
-                        public ResponseStream<HandshakeResponse> on(String type, Function handler) {
-                            listeners.get(type).push(handler);
-                            return this;
-                        }
-                    };
-                },
-                (next, headers, callback) -> connection.browserFlightServiceClient().nextHandshake(next, headers,
-                        callback::apply),
-                new HandshakeRequest());
-    }
-
-    private static Map<String, JsArray<Function>> listenerMap() {
-        Map<String, JsArray<Function>> listeners = new HashMap<>();
-        listeners.put(DATA_EVENT_LISTENER_NAME, new JsArray<>());
-        listeners.put(END_EVENT_LISTENER_NAME, new JsArray<>());
-        listeners.put(STATUS_EVENT_LISTENER_NAME, new JsArray<>());
-        listeners.put(HEADERS_EVENT_LISTENER_NAME, new JsArray<>());
-        return listeners;
-    }
-}
diff --git a/web/client-api/src/main/java/io/deephaven/web/client/api/batch/RequestBatcher.java b/web/client-api/src/main/java/io/deephaven/web/client/api/batch/RequestBatcher.java
index 9d10b006c81..10631549a4c 100644
--- a/web/client-api/src/main/java/io/deephaven/web/client/api/batch/RequestBatcher.java
+++ b/web/client-api/src/main/java/io/deephaven/web/client/api/batch/RequestBatcher.java
@@ -3,7 +3,6 @@
 //
 package io.deephaven.web.client.api.batch;
 
-import elemental2.dom.CustomEventInit;
 import elemental2.promise.Promise;
 import elemental2.promise.Promise.PromiseExecutorCallbackFn.RejectCallbackFn;
 import io.deephaven.javascript.proto.dhinternal.io.deephaven.proto.ticket_pb.Ticket;
@@ -341,7 +340,6 @@ public Promise<Void> sendRequest() {
     }
 
     private void failTable(JsTable t, String failureMessage) {
-        final CustomEventInit event = CustomEventInit.create();
         ClientTableState best = t.state();
         for (ClientTableState state : best.reversed()) {
             if (allStates().anyMatch(state::equals)) {
@@ -350,9 +348,6 @@ private void failTable(JsTable t, String failureMessage) {
             }
         }
 
-        event.setDetail(JsPropertyMap.of(
-                "errorMessage", failureMessage,
-                "configuration", best.toJs()));
         try {
             t.rollback();
         } catch (Exception e) {
@@ -360,7 +355,9 @@ private void failTable(JsTable t, String failureMessage) {
                     "An exception occurred trying to rollback the table. This means that there will be no ticking data until the table configuration is applied again in a way that makes sense. See IDS-5199 for more detail.",
                     e);
         }
-        t.fireEvent(CoreClient.EVENT_REQUEST_FAILED, event);
+        t.fireEvent(CoreClient.EVENT_REQUEST_FAILED, JsPropertyMap.of(
+                "errorMessage", failureMessage,
+                "configuration", best.toJs()));
     }
 
     private void failed(RejectCallbackFn reject, String fail) {
diff --git a/web/client-api/src/main/java/io/deephaven/web/client/api/event/Event.java b/web/client-api/src/main/java/io/deephaven/web/client/api/event/Event.java
new file mode 100644
index 00000000000..8ac021545fe
--- /dev/null
+++ b/web/client-api/src/main/java/io/deephaven/web/client/api/event/Event.java
@@ -0,0 +1,36 @@
+//
+// Copyright (c) 2016-2024 Deephaven Data Labs and Patent Pending
+//
+package io.deephaven.web.client.api.event;
+
+import com.vertispan.tsdefs.annotations.TsInterface;
+import com.vertispan.tsdefs.annotations.TsName;
+import jsinterop.annotations.JsProperty;
+
+/**
+ * Similar to the browser {@code CustomEvent} type, this class holds only the type of the event, and optionally some
+ * details about the event.
+ *
+ * @param <T> the type of the event detail
+ */
+@TsInterface
+@TsName(namespace = "dh")
+public class Event<T> {
+    private final String type;
+    private final T detail;
+
+    public Event(String type, T detail) {
+        this.type = type;
+        this.detail = detail;
+    }
+
+    @JsProperty
+    public String getType() {
+        return type;
+    }
+
+    @JsProperty
+    public T getDetail() {
+        return detail;
+    }
+}
diff --git a/web/client-api/src/main/java/io/deephaven/web/client/api/event/EventFn.java b/web/client-api/src/main/java/io/deephaven/web/client/api/event/EventFn.java
new file mode 100644
index 00000000000..314c1d26795
--- /dev/null
+++ b/web/client-api/src/main/java/io/deephaven/web/client/api/event/EventFn.java
@@ -0,0 +1,15 @@
+//
+// Copyright (c) 2016-2024 Deephaven Data Labs and Patent Pending
+//
+package io.deephaven.web.client.api.event;
+
+import jsinterop.annotations.JsFunction;
+
+/**
+ * Event handler function. In JS/TS, this will only show up as a function type when used, but these docs will never be
+ * visible.
+ */
+@JsFunction
+public interface EventFn<T> {
+    void onEvent(Event<T> e);
+}
diff --git a/web/client-api/src/main/java/io/deephaven/web/client/api/HasEventHandling.java b/web/client-api/src/main/java/io/deephaven/web/client/api/event/HasEventHandling.java
similarity index 78%
rename from web/client-api/src/main/java/io/deephaven/web/client/api/HasEventHandling.java
rename to web/client-api/src/main/java/io/deephaven/web/client/api/event/HasEventHandling.java
index 1f39d076dcd..c4fc78234d9 100644
--- a/web/client-api/src/main/java/io/deephaven/web/client/api/HasEventHandling.java
+++ b/web/client-api/src/main/java/io/deephaven/web/client/api/event/HasEventHandling.java
@@ -1,16 +1,15 @@
 //
 // Copyright (c) 2016-2024 Deephaven Data Labs and Patent Pending
 //
-package io.deephaven.web.client.api;
+package io.deephaven.web.client.api.event;
 
 import com.vertispan.tsdefs.annotations.TsInterface;
 import com.vertispan.tsdefs.annotations.TsName;
 import elemental2.core.JsArray;
 import elemental2.core.JsObject;
-import elemental2.dom.CustomEvent;
-import elemental2.dom.CustomEventInit;
 import elemental2.dom.DomGlobal;
 import elemental2.promise.Promise;
+import io.deephaven.web.client.api.CoreClient;
 import io.deephaven.web.client.fu.JsLog;
 import io.deephaven.web.client.fu.LazyPromise;
 import io.deephaven.web.shared.fu.RemoverFn;
@@ -70,7 +69,7 @@ final class WrappedCallback implements EventFn<T> {
             private EventFn<T> self;
 
             @Override
-            public void onEvent(CustomEvent<T> e) {
+            public void onEvent(Event<T> e) {
                 removeEventListener(name, self);
                 callback.onEvent(e);
             }
@@ -100,14 +99,14 @@ public void addEventListenerOneShot(EventPair<?>... pairs) {
                     return;
                 }
                 seen[0] = true;
-                pair.callback.onEvent((CustomEvent) e);
+                pair.callback.onEvent((Event) e);
             });
         }
     }
 
     @JsMethod
-    public <T> Promise<CustomEvent<T>> nextEvent(String eventName, @JsOptional Double timeoutInMillis) {
-        LazyPromise<CustomEvent<T>> promise = new LazyPromise<>();
+    public <T> Promise<Event<T>> nextEvent(String eventName, @JsOptional Double timeoutInMillis) {
+        LazyPromise<Event<T>> promise = new LazyPromise<>();
 
         addEventListenerOneShot(eventName, promise::succeed);
 
@@ -158,31 +157,26 @@ public <T> boolean removeEventListener(String name, EventFn<T> callback) {
     }
 
     public void fireEvent(String type) {
-        fireEvent(type, CustomEventInit.create());
+        fireEvent(new Event<>(type, null));
     }
 
-    public <T> void fireEventWithDetail(String type, @DoNotAutobox T detail) {
-        final CustomEventInit<T> evt = CustomEventInit.create();
-        evt.setDetail(detail);
-        fireEvent(type, evt);
+    public <T> void fireEvent(String type, @DoNotAutobox T detail) {
+        fireEvent(new Event<>(type, detail));
     }
 
-    public <T> void fireEvent(String type, CustomEventInit<T> init) {
-        fireEvent(type, new CustomEvent<>(type, init));
-    }
-
-    public <T> void fireEvent(String type, CustomEvent<T> e) {
+    public <T> void fireEvent(Event<T> e) {
         if (suppress) {
-            JsLog.debug("Event suppressed", type, e);
+            JsLog.debug("Event suppressed", e.getType(), e);
             return;
         }
-        if (map.has(e.type)) {
-            final JsArray<EventFn<T>> callbacks = Js.cast(JsArray.from((JsArrayLike<EventFn<?>>) map.get(e.type)));
+        if (map.has(e.getType())) {
+            final JsArray<EventFn<T>> callbacks = Js.cast(JsArray.from((JsArrayLike<EventFn<?>>) map.get(e.getType())));
             callbacks.forEach((item, ind) -> {
                 try {
                     item.onEvent(e);
                 } catch (Throwable t) {
-                    DomGlobal.console.error(logPrefix() + "User callback (", item, ") of type ", type, " failed: ", t);
+                    DomGlobal.console.error(logPrefix() + "User callback (", item, ") of type ", e.getType(),
+                            " failed: ", t);
                     t.printStackTrace();
                 }
                 return true;
@@ -190,18 +184,28 @@ public <T> void fireEvent(String type, CustomEvent<T> e) {
         }
     }
 
-    public boolean failureHandled(String failure) {
-        if (failure != null) {
-            if (hasListeners(CoreClient.EVENT_REQUEST_FAILED)) {
-                final CustomEventInit<String> event = CustomEventInit.create();
-                event.setDetail(failure);
-                fireEvent(CoreClient.EVENT_REQUEST_FAILED, event);
-            } else {
-                DomGlobal.console.error(logPrefix() + failure);
-            }
-            return true;
+    public <T> void fireCriticalEvent(String type) {
+        if (hasListeners(type)) {
+            fireEvent(type);
+        } else {
+            DomGlobal.console.error(logPrefix() + type, "(to prevent this log message, handle the " + type + " event)");
+        }
+    }
+
+    public <T> void fireCriticalEvent(String type, T detail) {
+        if (hasListeners(type)) {
+            fireEvent(type, detail);
+        } else {
+            DomGlobal.console.error(logPrefix(), detail,
+                    "(to prevent this log message, handle the " + type + " event)");
+        }
+    }
+
+    public void failureHandled(String failure) {
+        if (failure == null) {
+            return;
         }
-        return false;
+        fireCriticalEvent(CoreClient.EVENT_REQUEST_FAILED, failure);
     }
 
     public void suppressEvents() {
diff --git a/web/client-api/src/main/java/io/deephaven/web/client/api/grpc/GrpcTransport.java b/web/client-api/src/main/java/io/deephaven/web/client/api/grpc/GrpcTransport.java
new file mode 100644
index 00000000000..d51bfcb33d3
--- /dev/null
+++ b/web/client-api/src/main/java/io/deephaven/web/client/api/grpc/GrpcTransport.java
@@ -0,0 +1,74 @@
+//
+// Copyright (c) 2016-2024 Deephaven Data Labs and Patent Pending
+//
+package io.deephaven.web.client.api.grpc;
+
+import com.vertispan.tsdefs.annotations.TsInterface;
+import elemental2.core.Uint8Array;
+import io.deephaven.javascript.proto.dhinternal.browserheaders.BrowserHeaders;
+import io.deephaven.javascript.proto.dhinternal.grpcweb.grpc.Transport;
+import jsinterop.annotations.JsIgnore;
+import jsinterop.annotations.JsType;
+import jsinterop.base.JsPropertyMap;
+
+/**
+ * gRPC transport implementation.
+ *
+ */
+@JsType(namespace = "dh.grpc")
+@TsInterface
+public interface GrpcTransport {
+    /**
+     * Starts the stream, sending metadata to the server.
+     * 
+     * @param metadata the headers to send the server when opening the connection
+     */
+    void start(JsPropertyMap<HeaderValueUnion> metadata);
+
+    /**
+     * Sends a message to the server.
+     * 
+     * @param msgBytes bytes to send to the server
+     */
+    void sendMessage(Uint8Array msgBytes);
+
+    /**
+     * "Half close" the stream, signaling to the server that no more messages will be sent, but that the client is still
+     * open to receiving messages.
+     */
+    void finishSend();
+
+    /**
+     * End the stream, both notifying the server that no more messages will be sent nor received, and preventing the
+     * client from receiving any more events.
+     */
+    void cancel();
+
+    /**
+     * Helper to transform ts implementations to our own api.
+     */
+    @JsIgnore
+    static GrpcTransport from(Transport tsTransport) {
+        return new GrpcTransport() {
+            @Override
+            public void start(JsPropertyMap<HeaderValueUnion> metadata) {
+                tsTransport.start(new BrowserHeaders(metadata));
+            }
+
+            @Override
+            public void sendMessage(Uint8Array msgBytes) {
+                tsTransport.sendMessage(msgBytes);
+            }
+
+            @Override
+            public void finishSend() {
+                tsTransport.finishSend();
+            }
+
+            @Override
+            public void cancel() {
+                tsTransport.cancel();
+            }
+        };
+    }
+}
diff --git a/web/client-api/src/main/java/io/deephaven/web/client/api/grpc/GrpcTransportFactory.java b/web/client-api/src/main/java/io/deephaven/web/client/api/grpc/GrpcTransportFactory.java
new file mode 100644
index 00000000000..e0430809b05
--- /dev/null
+++ b/web/client-api/src/main/java/io/deephaven/web/client/api/grpc/GrpcTransportFactory.java
@@ -0,0 +1,71 @@
+//
+// Copyright (c) 2016-2024 Deephaven Data Labs and Patent Pending
+//
+package io.deephaven.web.client.api.grpc;
+
+import com.vertispan.tsdefs.annotations.TsInterface;
+import elemental2.core.Uint8Array;
+import io.deephaven.javascript.proto.dhinternal.browserheaders.BrowserHeaders;
+import io.deephaven.javascript.proto.dhinternal.grpcweb.transports.transport.Transport;
+import io.deephaven.javascript.proto.dhinternal.grpcweb.transports.transport.TransportFactory;
+import jsinterop.annotations.JsIgnore;
+import jsinterop.annotations.JsOverlay;
+import jsinterop.annotations.JsProperty;
+import jsinterop.annotations.JsType;
+import jsinterop.base.Js;
+
+/**
+ * Factory for creating gRPC transports.
+ */
+@TsInterface
+@JsType(namespace = "dh.grpc")
+public interface GrpcTransportFactory {
+    /**
+     * Create a new transport instance.
+     * 
+     * @param options options for creating the transport
+     * @return a transport instance to use for gRPC communication
+     */
+    GrpcTransport create(GrpcTransportOptions options);
+
+    /**
+     * Return true to signal that created transports may have {@link GrpcTransport#sendMessage(Uint8Array)} called on it
+     * more than once before {@link GrpcTransport#finishSend()} should be called.
+     * 
+     * @return true to signal that the implementation can stream multiple messages, false otherwise indicating that
+     *         Open/Next gRPC calls should be used
+     */
+    @JsProperty
+    boolean getSupportsClientStreaming();
+
+    /**
+     * Adapt this factory to the transport factory used by the gRPC-web library.
+     */
+    @JsIgnore
+    static TransportFactory adapt(GrpcTransportFactory instance) {
+        return options -> {
+            GrpcTransport impl = instance.create(GrpcTransportOptions.from(options));
+            return new Transport() {
+                @Override
+                public void cancel() {
+                    impl.cancel();
+                }
+
+                @Override
+                public void finishSend() {
+                    impl.finishSend();
+                }
+
+                @Override
+                public void sendMessage(Uint8Array msgBytes) {
+                    impl.sendMessage(msgBytes);
+                }
+
+                @Override
+                public void start(BrowserHeaders metadata) {
+                    impl.start(Js.cast(metadata.headersMap));
+                }
+            };
+        };
+    }
+}
diff --git a/web/client-api/src/main/java/io/deephaven/web/client/api/grpc/GrpcTransportOptions.java b/web/client-api/src/main/java/io/deephaven/web/client/api/grpc/GrpcTransportOptions.java
new file mode 100644
index 00000000000..8853471a98e
--- /dev/null
+++ b/web/client-api/src/main/java/io/deephaven/web/client/api/grpc/GrpcTransportOptions.java
@@ -0,0 +1,92 @@
+//
+// Copyright (c) 2016-2024 Deephaven Data Labs and Patent Pending
+//
+package io.deephaven.web.client.api.grpc;
+
+import com.vertispan.tsdefs.annotations.TsInterface;
+import elemental2.core.JsError;
+import elemental2.core.Uint8Array;
+import elemental2.dom.URL;
+import io.deephaven.javascript.proto.dhinternal.browserheaders.BrowserHeaders;
+import io.deephaven.javascript.proto.dhinternal.grpcweb.transports.transport.TransportOptions;
+import jsinterop.annotations.JsFunction;
+import jsinterop.annotations.JsIgnore;
+import jsinterop.annotations.JsNullable;
+import jsinterop.annotations.JsOptional;
+import jsinterop.annotations.JsType;
+import jsinterop.base.JsPropertyMap;
+
+/**
+ * Options for creating a gRPC stream transport instance.
+ */
+@TsInterface
+@JsType(namespace = "dh.grpc")
+public class GrpcTransportOptions {
+    @JsFunction
+    @FunctionalInterface
+    public interface OnHeadersCallback {
+        void onHeaders(JsPropertyMap<HeaderValueUnion> headers, int status);
+    }
+
+    @JsFunction
+    @FunctionalInterface
+    public interface OnChunkCallback {
+        void onChunk(Uint8Array chunk);
+    }
+
+    @JsFunction
+    @FunctionalInterface
+    public interface OnEndCallback {
+        void onEnd(@JsOptional @JsNullable JsError error);
+    }
+
+    /**
+     * The gRPC method URL.
+     */
+    public URL url;
+
+    /**
+     * True to enable debug logging for this stream.
+     */
+    public boolean debug;
+
+    /**
+     * Callback for when headers and status are received. The headers are a map of header names to values, and the
+     * status is the HTTP status code. If the connection could not be made, the status should be 0.
+     */
+    public OnHeadersCallback onHeaders;
+
+    /**
+     * Callback for when a chunk of data is received.
+     */
+    public OnChunkCallback onChunk;
+
+    /**
+     * Callback for when the stream ends, with an error instance if it can be provided. Note that the present
+     * implementation does not consume errors, even if provided.
+     */
+    public OnEndCallback onEnd;
+
+    /**
+     * Internal copy of options, to be used for fallback.
+     */
+    @JsIgnore
+    public TransportOptions originalOptions;
+
+    /**
+     * Convert a {@link TransportOptions} instance to a {@link GrpcTransportOptions} instance.
+     */
+    @JsIgnore
+    public static GrpcTransportOptions from(TransportOptions options) {
+        GrpcTransportOptions impl = new GrpcTransportOptions();
+        impl.url = new URL(options.getUrl());
+        impl.debug = options.isDebug();
+        impl.onHeaders = (headers, status) -> options.getOnHeaders().onInvoke(new BrowserHeaders(headers), status);
+        impl.onChunk = p0 -> {
+            // "false" because the underlying implementation doesn't rely on this anyway.
+            options.getOnChunk().onInvoke(p0, false);
+        };
+        impl.onEnd = options.getOnEnd()::onInvoke;
+        return impl;
+    }
+}
diff --git a/web/client-api/src/main/java/io/deephaven/web/client/api/grpc/HeaderValueUnion.java b/web/client-api/src/main/java/io/deephaven/web/client/api/grpc/HeaderValueUnion.java
new file mode 100644
index 00000000000..9d64a7c0402
--- /dev/null
+++ b/web/client-api/src/main/java/io/deephaven/web/client/api/grpc/HeaderValueUnion.java
@@ -0,0 +1,42 @@
+//
+// Copyright (c) 2016-2024 Deephaven Data Labs and Patent Pending
+//
+package io.deephaven.web.client.api.grpc;
+
+import com.vertispan.tsdefs.annotations.TsUnion;
+import com.vertispan.tsdefs.annotations.TsUnionMember;
+import elemental2.core.JsArray;
+import javaemul.internal.annotations.DoNotAutobox;
+import jsinterop.annotations.JsOverlay;
+import jsinterop.annotations.JsPackage;
+import jsinterop.annotations.JsType;
+import jsinterop.base.Js;
+
+/**
+ * Union of string and array of string, as node/browser APIs tend to accept either for http headers.
+ */
+@TsUnion
+@JsType(name = "?", namespace = JsPackage.GLOBAL, isNative = true)
+public interface HeaderValueUnion {
+    @JsOverlay
+    static HeaderValueUnion of(@DoNotAutobox Object value) {
+        return Js.cast(value);
+    }
+
+    @JsOverlay
+    default boolean isArray() {
+        return JsArray.isArray(this);
+    }
+
+    @TsUnionMember
+    @JsOverlay
+    default String asString() {
+        return Js.cast(this);
+    }
+
+    @TsUnionMember
+    @JsOverlay
+    default JsArray<String> asArray() {
+        return Js.cast(this);
+    }
+}
diff --git a/web/client-api/src/main/java/io/deephaven/web/client/api/grpc/MultiplexedWebsocketTransport.java b/web/client-api/src/main/java/io/deephaven/web/client/api/grpc/MultiplexedWebsocketTransport.java
index dfb0fd7cea4..a40cf532e1b 100644
--- a/web/client-api/src/main/java/io/deephaven/web/client/api/grpc/MultiplexedWebsocketTransport.java
+++ b/web/client-api/src/main/java/io/deephaven/web/client/api/grpc/MultiplexedWebsocketTransport.java
@@ -17,10 +17,10 @@
 import io.deephaven.javascript.proto.dhinternal.browserheaders.BrowserHeaders;
 import io.deephaven.javascript.proto.dhinternal.grpcweb.Grpc;
 import io.deephaven.javascript.proto.dhinternal.grpcweb.transports.transport.Transport;
-import io.deephaven.javascript.proto.dhinternal.grpcweb.transports.transport.TransportOptions;
 import io.deephaven.web.client.api.JsLazy;
 import io.deephaven.web.shared.fu.JsRunnable;
 import jsinterop.base.Js;
+import jsinterop.base.JsPropertyMap;
 
 import java.util.ArrayList;
 import java.util.HashMap;
@@ -32,11 +32,23 @@
  * equal, this transport should be preferred to the default grpc-websockets transport, and in turn the fetch based
  * transport is usually superior to this.
  */
-public class MultiplexedWebsocketTransport implements Transport {
+public class MultiplexedWebsocketTransport implements GrpcTransport {
 
     public static final String MULTIPLEX_PROTOCOL = "grpc-websockets-multiplex";
     public static final String SOCKET_PER_STREAM_PROTOCOL = "grpc-websockets";
 
+    public static class Factory implements GrpcTransportFactory {
+        @Override
+        public GrpcTransport create(GrpcTransportOptions options) {
+            return new MultiplexedWebsocketTransport(options);
+        }
+
+        @Override
+        public boolean getSupportsClientStreaming() {
+            return true;
+        }
+    }
+
     private static Uint8Array encodeASCII(String str) {
         Uint8Array encoded = new Uint8Array(str.length());
         for (int i = 0; i < str.length(); i++) {
@@ -55,9 +67,9 @@ private interface QueuedEntry {
 
     public static class HeaderFrame implements QueuedEntry {
         private final String path;
-        private final BrowserHeaders metadata;
+        private final JsPropertyMap<HeaderValueUnion> metadata;
 
-        public HeaderFrame(String path, BrowserHeaders metadata) {
+        public HeaderFrame(String path, JsPropertyMap<HeaderValueUnion> metadata) {
             this.path = path;
             this.metadata = metadata;
         }
@@ -66,9 +78,14 @@ public HeaderFrame(String path, BrowserHeaders metadata) {
         public void send(WebSocket webSocket, int streamId) {
             final Uint8Array headerBytes;
             final StringBuilder str = new StringBuilder();
-            metadata.append("grpc-websockets-path", path);
-            metadata.forEach((key, value) -> {
-                str.append(key).append(": ").append(value.join(", ")).append("\r\n");
+            metadata.set("grpc-websockets-path", HeaderValueUnion.of(path));
+            metadata.forEach((key) -> {
+                HeaderValueUnion value = metadata.get(key);
+                if (value.isArray()) {
+                    str.append(key).append(": ").append(value.asArray().join(", ")).append("\r\n");
+                } else {
+                    str.append(key).append(": ").append(value.asString()).append("\r\n");
+                }
             });
             headerBytes = encodeASCII(str.toString());
             Int8Array payload = new Int8Array(headerBytes.byteLength + 4);
@@ -79,7 +96,7 @@ public void send(WebSocket webSocket, int streamId) {
 
         @Override
         public void sendFallback(Transport transport) {
-            transport.start(metadata);
+            transport.start(new BrowserHeaders(metadata));
         }
     }
 
@@ -201,16 +218,16 @@ private void release() {
     private ActiveTransport transport;
     private final int streamId = nextStreamId++;
     private final List<QueuedEntry> sendQueue = new ArrayList<>();
-    private final TransportOptions options;
+    private final GrpcTransportOptions options;
     private final String path;
 
     private final JsLazy<Transport> alternativeTransport;
 
     private JsRunnable cleanup = JsRunnable.doNothing();
 
-    public MultiplexedWebsocketTransport(TransportOptions options, JsRunnable avoidMultiplexCallback) {
+    public MultiplexedWebsocketTransport(GrpcTransportOptions options) {
         this.options = options;
-        String url = options.getUrl();
+        String url = options.url.toString();
         URL urlWrapper = new URL(url);
         // preserve the path to send as metadata, but still talk to the server with that path
         path = urlWrapper.pathname.substring(1);
@@ -220,16 +237,13 @@ public MultiplexedWebsocketTransport(TransportOptions options, JsRunnable avoidM
         transport = ActiveTransport.get(url);
 
         // prepare a fallback
-        alternativeTransport = new JsLazy<>(() -> {
-            avoidMultiplexCallback.run();
-            return Grpc.WebsocketTransport.onInvoke().onInvoke(options);
-        });
+        alternativeTransport = new JsLazy<>(() -> Grpc.WebsocketTransport.onInvoke().onInvoke(options.originalOptions));
     }
 
     @Override
-    public void start(BrowserHeaders metadata) {
+    public void start(JsPropertyMap<HeaderValueUnion> metadata) {
         if (alternativeTransport.isAvailable()) {
-            alternativeTransport.get().start(metadata);
+            alternativeTransport.get().start(new BrowserHeaders(metadata));
             return;
         }
         this.transport.retain();
@@ -325,7 +339,7 @@ private void onClose(Event event) {
             return;
         }
         // each grpc transport will handle this as an error
-        options.getOnEnd().onInvoke(new JsError("Unexpectedly closed " + Js.<CloseEvent>uncheckedCast(event).reason));
+        options.onEnd.onEnd(new JsError("Unexpectedly closed " + Js.<CloseEvent>uncheckedCast(event).reason));
         removeHandlers();
     }
 
@@ -345,9 +359,9 @@ private void onMessage(Event event) {
             closed = false;
         }
         if (streamId == this.streamId) {
-            options.getOnChunk().onInvoke(new Uint8Array(messageEvent.data, 4), false);
+            options.onChunk.onChunk(new Uint8Array(messageEvent.data, 4));
             if (closed) {
-                options.getOnEnd().onInvoke(null);
+                options.onEnd.onEnd(null);
                 removeHandlers();
             }
         }
diff --git a/web/client-api/src/main/java/io/deephaven/web/client/api/grpc/UnaryWithHeaders.java b/web/client-api/src/main/java/io/deephaven/web/client/api/grpc/UnaryWithHeaders.java
new file mode 100644
index 00000000000..4b6316631b5
--- /dev/null
+++ b/web/client-api/src/main/java/io/deephaven/web/client/api/grpc/UnaryWithHeaders.java
@@ -0,0 +1,48 @@
+//
+// Copyright (c) 2016-2024 Deephaven Data Labs and Patent Pending
+//
+package io.deephaven.web.client.api.grpc;
+
+import elemental2.promise.IThenable;
+import elemental2.promise.Promise;
+import io.deephaven.javascript.proto.dhinternal.browserheaders.BrowserHeaders;
+import io.deephaven.javascript.proto.dhinternal.grpcweb.Grpc;
+import io.deephaven.javascript.proto.dhinternal.grpcweb.client.RpcOptions;
+import io.deephaven.javascript.proto.dhinternal.grpcweb.grpc.Code;
+import io.deephaven.javascript.proto.dhinternal.grpcweb.unary.UnaryOutput;
+import io.deephaven.javascript.proto.dhinternal.grpcweb.unary.UnaryRpcOptions;
+
+public class UnaryWithHeaders {
+
+    /**
+     * Improbable-eng's grpc-web implementation doesn't pass headers to api callers - this changes the contract a bit so
+     * that we can get a typed UnaryOutput with the headers/trailers intact.
+     *
+     * @param host the server to connect to
+     * @param metadata gRPC metadata to set on the request
+     * @param options options to use when sending the request
+     * @param methodDescriptor the service method to invoke
+     * @return a promise that will resolve to the response plus headers/trailers, or reject with the headers/trailers
+     * @param <Res> type of the message object
+     */
+    public static <Req, Res> Promise<UnaryOutput<Res>> call(String host, BrowserHeaders metadata, RpcOptions options,
+            Object methodDescriptor,
+            Req request) {
+        return new Promise<>((resolve, reject) -> {
+            UnaryRpcOptions<Object, Object> props = UnaryRpcOptions.create();
+            props.setRequest(request);
+            props.setHost(host);
+            props.setMetadata(metadata);
+            props.setTransport(options.getTransport());
+            props.setDebug(options.isDebug());
+            props.setOnEnd(response -> {
+                if (response.getStatus() != Code.OK) {
+                    reject.onInvoke(response);
+                } else {
+                    resolve.onInvoke((IThenable<UnaryOutput<Res>>) response);
+                }
+            });
+            Grpc.unary.onInvoke(methodDescriptor, props);
+        });
+    }
+}
diff --git a/web/client-api/src/main/java/io/deephaven/web/client/api/lifecycle/HasLifecycle.java b/web/client-api/src/main/java/io/deephaven/web/client/api/lifecycle/HasLifecycle.java
index 3fd9f2c4923..84e54e63bca 100644
--- a/web/client-api/src/main/java/io/deephaven/web/client/api/lifecycle/HasLifecycle.java
+++ b/web/client-api/src/main/java/io/deephaven/web/client/api/lifecycle/HasLifecycle.java
@@ -3,11 +3,9 @@
 //
 package io.deephaven.web.client.api.lifecycle;
 
-import elemental2.dom.CustomEvent;
-import elemental2.dom.CustomEventInit;
 import elemental2.promise.Promise;
-import io.deephaven.web.client.api.HasEventHandling;
 import io.deephaven.web.client.api.JsTable;
+import io.deephaven.web.client.api.event.HasEventHandling;
 import io.deephaven.web.client.fu.JsLog;
 
 import static io.deephaven.web.client.api.JsTable.EVENT_RECONNECTFAILED;
@@ -28,10 +26,8 @@ public abstract class HasLifecycle extends HasEventHandling {
      */
     public void die(Object error) {
         JsLog.debug("Die!", this, error);
-        final CustomEventInit init = CustomEventInit.create();
-        init.setDetail(error);
         unsuppressEvents();
-        fireEvent(EVENT_RECONNECTFAILED, init);
+        fireEvent(EVENT_RECONNECTFAILED, error);
         suppressEvents();
     }
 
@@ -78,9 +74,9 @@ public Promise<Void> nextReconnect() {
             addEventListenerOneShot(
                     HasEventHandling.EventPair.of(JsTable.EVENT_RECONNECT, event -> resolve.onInvoke((Void) null)),
                     HasEventHandling.EventPair.of(JsTable.EVENT_DISCONNECT,
-                            event -> reject.onInvoke(((CustomEvent<Object>) event).detail)),
+                            event -> reject.onInvoke(event.getDetail())),
                     HasEventHandling.EventPair.of(EVENT_RECONNECTFAILED,
-                            event -> reject.onInvoke(((CustomEvent<Object>) event).detail)));
+                            event -> reject.onInvoke(event.getDetail())));
         });
     }
 }
diff --git a/web/client-api/src/main/java/io/deephaven/web/client/api/parse/JsDataHandler.java b/web/client-api/src/main/java/io/deephaven/web/client/api/parse/JsDataHandler.java
index d3edf0e03f4..4bb583cd86f 100644
--- a/web/client-api/src/main/java/io/deephaven/web/client/api/parse/JsDataHandler.java
+++ b/web/client-api/src/main/java/io/deephaven/web/client/api/parse/JsDataHandler.java
@@ -3,6 +3,7 @@
 //
 package io.deephaven.web.client.api.parse;
 
+import com.google.flatbuffers.FlatBufferBuilder;
 import com.google.gwt.i18n.client.TimeZone;
 import elemental2.core.ArrayBuffer;
 import elemental2.core.Float32Array;
@@ -14,14 +15,6 @@
 import elemental2.core.TypedArray;
 import elemental2.core.Uint16Array;
 import elemental2.core.Uint8Array;
-import io.deephaven.javascript.proto.dhinternal.arrow.flight.flatbuf.schema_generated.org.apache.arrow.flatbuf.Binary;
-import io.deephaven.javascript.proto.dhinternal.arrow.flight.flatbuf.schema_generated.org.apache.arrow.flatbuf.FixedSizeBinary;
-import io.deephaven.javascript.proto.dhinternal.arrow.flight.flatbuf.schema_generated.org.apache.arrow.flatbuf.FloatingPoint;
-import io.deephaven.javascript.proto.dhinternal.arrow.flight.flatbuf.schema_generated.org.apache.arrow.flatbuf.Int;
-import io.deephaven.javascript.proto.dhinternal.arrow.flight.flatbuf.schema_generated.org.apache.arrow.flatbuf.Precision;
-import io.deephaven.javascript.proto.dhinternal.arrow.flight.flatbuf.schema_generated.org.apache.arrow.flatbuf.Type;
-import io.deephaven.javascript.proto.dhinternal.arrow.flight.flatbuf.schema_generated.org.apache.arrow.flatbuf.Utf8;
-import io.deephaven.javascript.proto.dhinternal.flatbuffers.Builder;
 import io.deephaven.web.client.api.LongWrapper;
 import io.deephaven.web.client.api.i18n.JsDateTimeFormat;
 import io.deephaven.web.client.api.i18n.JsTimeZone;
@@ -29,6 +22,13 @@
 import io.deephaven.web.shared.fu.JsFunction;
 import jsinterop.base.Js;
 import jsinterop.base.JsArrayLike;
+import org.apache.arrow.flatbuf.Binary;
+import org.apache.arrow.flatbuf.FixedSizeBinary;
+import org.apache.arrow.flatbuf.FloatingPoint;
+import org.apache.arrow.flatbuf.Int;
+import org.apache.arrow.flatbuf.Precision;
+import org.apache.arrow.flatbuf.Type;
+import org.apache.arrow.flatbuf.Utf8;
 import org.gwtproject.nio.TypedArrayHelper;
 
 import java.nio.ByteBuffer;
@@ -40,16 +40,16 @@
 import java.util.List;
 import java.util.Map;
 
-import static io.deephaven.web.client.api.subscription.QueryConstants.FALSE_BOOLEAN_AS_BYTE;
-import static io.deephaven.web.client.api.subscription.QueryConstants.NULL_BOOLEAN_AS_BYTE;
-import static io.deephaven.web.client.api.subscription.QueryConstants.NULL_BYTE;
-import static io.deephaven.web.client.api.subscription.QueryConstants.NULL_CHAR;
-import static io.deephaven.web.client.api.subscription.QueryConstants.NULL_DOUBLE;
-import static io.deephaven.web.client.api.subscription.QueryConstants.NULL_FLOAT;
-import static io.deephaven.web.client.api.subscription.QueryConstants.NULL_INT;
-import static io.deephaven.web.client.api.subscription.QueryConstants.NULL_LONG;
-import static io.deephaven.web.client.api.subscription.QueryConstants.NULL_SHORT;
-import static io.deephaven.web.client.api.subscription.QueryConstants.TRUE_BOOLEAN_AS_BYTE;
+import static io.deephaven.util.BooleanUtils.FALSE_BOOLEAN_AS_BYTE;
+import static io.deephaven.util.BooleanUtils.NULL_BOOLEAN_AS_BYTE;
+import static io.deephaven.util.BooleanUtils.TRUE_BOOLEAN_AS_BYTE;
+import static io.deephaven.util.QueryConstants.NULL_BYTE;
+import static io.deephaven.util.QueryConstants.NULL_CHAR;
+import static io.deephaven.util.QueryConstants.NULL_DOUBLE;
+import static io.deephaven.util.QueryConstants.NULL_FLOAT;
+import static io.deephaven.util.QueryConstants.NULL_INT;
+import static io.deephaven.util.QueryConstants.NULL_LONG;
+import static io.deephaven.util.QueryConstants.NULL_SHORT;
 
 /**
  * Given the expected type of a column, pick one of the enum entries and use that to read the data into arrow buffers.
@@ -101,8 +101,9 @@ public Uint8Array build() {
         }
 
         @Override
-        public double writeType(Builder builder) {
-            return Utf8.createUtf8(builder);
+        public int writeType(FlatBufferBuilder builder) {
+            Utf8.startUtf8(builder);
+            return Utf8.endUtf8(builder);
         }
 
         @Override
@@ -201,7 +202,7 @@ private long parseDateString(String str, ParseContext context) {
         }
 
         @Override
-        public double writeType(Builder builder) {
+        public int writeType(FlatBufferBuilder builder) {
             return Int.createInt(builder, 64, true);
         }
 
@@ -249,7 +250,7 @@ public void write(Object[] data, ParseContext context, JsConsumer<Node> addNode,
     },
     INTEGER(Type.Int, "int") {
         @Override
-        public double writeType(Builder builder) {
+        public int writeType(FlatBufferBuilder builder) {
             return Int.createInt(builder, 32, true);
         }
 
@@ -261,7 +262,7 @@ public void write(Object[] data, ParseContext context, JsConsumer<Node> addNode,
     },
     SHORT(Type.Int, "short") {
         @Override
-        public double writeType(Builder builder) {
+        public int writeType(FlatBufferBuilder builder) {
             return Int.createInt(builder, 16, true);
         }
 
@@ -273,7 +274,7 @@ public void write(Object[] data, ParseContext context, JsConsumer<Node> addNode,
     },
     LONG(Type.Int, "long") {
         @Override
-        public double writeType(Builder builder) {
+        public int writeType(FlatBufferBuilder builder) {
             return Int.createInt(builder, 64, true);
         }
 
@@ -319,7 +320,7 @@ public void write(Object[] data, ParseContext context, JsConsumer<Node> addNode,
     },
     BYTE(Type.Int, "byte") {
         @Override
-        public double writeType(Builder builder) {
+        public int writeType(FlatBufferBuilder builder) {
             return Int.createInt(builder, 8, true);
         }
 
@@ -331,7 +332,7 @@ public void write(Object[] data, ParseContext context, JsConsumer<Node> addNode,
     },
     CHAR(Type.Int, "char") {
         @Override
-        public double writeType(Builder builder) {
+        public int writeType(FlatBufferBuilder builder) {
             return Int.createInt(builder, 16, false);
         }
 
@@ -343,7 +344,7 @@ public void write(Object[] data, ParseContext context, JsConsumer<Node> addNode,
     },
     FLOAT(Type.FloatingPoint, "float") {
         @Override
-        public double writeType(Builder builder) {
+        public int writeType(FlatBufferBuilder builder) {
             return FloatingPoint.createFloatingPoint(builder, Precision.SINGLE);
         }
 
@@ -355,7 +356,7 @@ public void write(Object[] data, ParseContext context, JsConsumer<Node> addNode,
     },
     DOUBLE(Type.FloatingPoint, "double") {
         @Override
-        public double writeType(Builder builder) {
+        public int writeType(FlatBufferBuilder builder) {
             return FloatingPoint.createFloatingPoint(builder, Precision.DOUBLE);
         }
 
@@ -368,7 +369,7 @@ public void write(Object[] data, ParseContext context, JsConsumer<Node> addNode,
     },
     BOOLEAN(Type.Bool, "boolean", "bool", "java.lang.Boolean") {
         @Override
-        public double writeType(Builder builder) {
+        public int writeType(FlatBufferBuilder builder) {
             return Int.createInt(builder, 8, true);
         }
 
@@ -440,25 +441,27 @@ public void write(Object[] data, ParseContext context, JsConsumer<Node> addNode,
     },
     BIG_DECIMAL(Type.Binary, "java.util.BigDecimal") {
         @Override
-        public double writeType(Builder builder) {
-            return Binary.createBinary(builder);
+        public int writeType(FlatBufferBuilder builder) {
+            Binary.startBinary(builder);
+            return Binary.endBinary(builder);
         }
     },
     BIG_INTEGER(Type.Binary, "java.util.BigInteger") {
         @Override
-        public double writeType(Builder builder) {
-            return Binary.createBinary(builder);
+        public int writeType(FlatBufferBuilder builder) {
+            Binary.startBinary(builder);
+            return Binary.endBinary(builder);
         }
     },
     LOCAL_DATE(Type.FixedSizeBinary, "java.time.LocalDate", "localdate") {
         @Override
-        public double writeType(Builder builder) {
+        public int writeType(FlatBufferBuilder builder) {
             return FixedSizeBinary.createFixedSizeBinary(builder, 6);
         }
     },
     LOCAL_TIME(Type.FixedSizeBinary, "java.time.LocalTime", "localtime") {
         @Override
-        public double writeType(Builder builder) {
+        public int writeType(FlatBufferBuilder builder) {
             return FixedSizeBinary.createFixedSizeBinary(builder, 7);
         }
     },
@@ -540,10 +543,10 @@ private static class HandlersHolder {
 
     private static final int SEPARATOR_INDEX = DEFAULT_DATE_TIME_PATTERN.indexOf('T');
 
-    private final int arrowTypeType;
+    private final byte arrowTypeType;
     private final String deephavenType;
 
-    JsDataHandler(int arrowTypeType, String... typeNames) {
+    JsDataHandler(byte arrowTypeType, String... typeNames) {
         this.arrowTypeType = arrowTypeType;
         assert typeNames.length > 0 : "Must have at least one name";
         this.deephavenType = typeNames[0];
@@ -553,7 +556,7 @@ private static class HandlersHolder {
         }
     }
 
-    public int typeType() {
+    public byte typeType() {
         return arrowTypeType;
     }
 
@@ -561,7 +564,7 @@ public String deephavenType() {
         return deephavenType;
     }
 
-    public abstract double writeType(Builder builder);
+    public abstract int writeType(FlatBufferBuilder builder);
 
     public void write(Object[] data, ParseContext context, JsConsumer<Node> addNode, JsConsumer<Uint8Array> addBuffer) {
         throw new UnsupportedOperationException("Can't parse " + name());
diff --git a/web/client-api/src/main/java/io/deephaven/web/client/api/subscription/AbstractTableSubscription.java b/web/client-api/src/main/java/io/deephaven/web/client/api/subscription/AbstractTableSubscription.java
new file mode 100644
index 00000000000..7b27ad75b0f
--- /dev/null
+++ b/web/client-api/src/main/java/io/deephaven/web/client/api/subscription/AbstractTableSubscription.java
@@ -0,0 +1,577 @@
+//
+// Copyright (c) 2016-2024 Deephaven Data Labs and Patent Pending
+//
+package io.deephaven.web.client.api.subscription;
+
+import com.google.flatbuffers.FlatBufferBuilder;
+import com.vertispan.tsdefs.annotations.TsIgnore;
+import elemental2.core.JsArray;
+import io.deephaven.barrage.flatbuf.BarrageMessageType;
+import io.deephaven.barrage.flatbuf.BarrageSubscriptionRequest;
+import io.deephaven.extensions.barrage.BarrageSubscriptionOptions;
+import io.deephaven.javascript.proto.dhinternal.arrow.flight.protocol.flight_pb.FlightData;
+import io.deephaven.web.client.api.Column;
+import io.deephaven.web.client.api.Format;
+import io.deephaven.web.client.api.JsRangeSet;
+import io.deephaven.web.client.api.LongWrapper;
+import io.deephaven.web.client.api.TableData;
+import io.deephaven.web.client.api.WorkerConnection;
+import io.deephaven.web.client.api.barrage.CompressedRangeSetReader;
+import io.deephaven.web.client.api.barrage.WebBarrageMessage;
+import io.deephaven.web.client.api.barrage.WebBarrageStreamReader;
+import io.deephaven.web.client.api.barrage.WebBarrageUtils;
+import io.deephaven.web.client.api.barrage.data.WebBarrageSubscription;
+import io.deephaven.web.client.api.barrage.stream.BiDiStream;
+import io.deephaven.web.client.api.barrage.stream.ResponseStreamWrapper;
+import io.deephaven.web.client.api.event.HasEventHandling;
+import io.deephaven.web.client.fu.JsSettings;
+import io.deephaven.web.client.state.ClientTableState;
+import io.deephaven.web.shared.data.RangeSet;
+import io.deephaven.web.shared.data.ShiftedRange;
+import io.deephaven.web.shared.fu.JsRunnable;
+import jsinterop.annotations.JsMethod;
+import jsinterop.annotations.JsProperty;
+import jsinterop.base.Any;
+import jsinterop.base.Js;
+import org.jetbrains.annotations.Nullable;
+
+import java.io.IOException;
+import java.util.BitSet;
+
+/**
+ * Superclass of various subscription types, allowing specific implementations to customize behavior for their needs.
+ * <p>
+ * Instances are not ready to use right away, owing to the fact that we need to wait both for the provided state to
+ * resolve (so that we have the table schema, know what kind of subscription we will make, and know what column types
+ * will be resolves), and because until the subscription has finished being set up, we will not have received the size
+ * of the table. When closed, it cannot be reused again.
+ * <p>
+ * This is also a base class for types exposed to JS.
+ * <p>
+ * This is a rough analog of the JVM's {@code BarrageSubscriptionImpl} class. In contrast to the JVM code, this is
+ * exposed to api consumers, rather than wrapping in a Table type, as it handles the barrage stream and provides events
+ * that client code can listen to.
+ */
+@TsIgnore
+public abstract class AbstractTableSubscription extends HasEventHandling {
+    /**
+     * Indicates that some new data is available on the client, either an initial snapshot or a delta update. The
+     * <b>detail</b> field of the event will contain a TableSubscriptionEventData detailing what has changed, or
+     * allowing access to the entire range of items currently in the subscribed columns.
+     */
+    public static final String EVENT_UPDATED = "updated";
+
+    protected enum Status {
+        /** Waiting for some prerequisite before we can use it for the first time. */
+        STARTING,
+        /** All prerequisites are met, waiting for the first snapshot to be returned. */
+        SUBSCRIPTION_REQUESTED,
+        /** Successfully created, not waiting for any messages to be accurate. */
+        ACTIVE,
+        /** Waiting for an update to return from being active to being active again. */
+        PENDING_UPDATE,
+        /** Closed or otherwise stopped, cannot be used again. */
+        DONE;
+    }
+
+    private final SubscriptionType subscriptionType;
+    private final ClientTableState state;
+    private final WorkerConnection connection;
+    protected final int rowStyleColumn;
+    private JsArray<Column> columns;
+    private BitSet columnBitSet;
+    protected RangeSet viewportRowSet;
+    private boolean isReverseViewport;
+    private BarrageSubscriptionOptions options;
+
+    private BiDiStream<FlightData, FlightData> doExchange;
+    protected WebBarrageSubscription barrageSubscription;
+
+    protected Status status = Status.STARTING;
+
+    private String failMsg;
+
+    protected AbstractTableSubscription(
+            SubscriptionType subscriptionType,
+            ClientTableState state,
+            WorkerConnection connection) {
+        state.retain(this);
+        this.subscriptionType = subscriptionType;
+        this.state = state;
+        this.connection = connection;
+        rowStyleColumn = state.getRowFormatColumn() == null ? TableData.NO_ROW_FORMAT_COLUMN
+                : state.getRowFormatColumn().getIndex();
+
+        revive();
+    }
+
+    /**
+     * Creates the connection to the server. Used on initial connection, and for viewport reconnects.
+     */
+    protected void revive() {
+        // Once the state is running, set up the actual subscription
+        // Don't let subscription be used again, table failed and user will have already gotten an error elsewhere
+        state.onRunning(s -> {
+            if (status != Status.STARTING) {
+                // already closed
+                return;
+            }
+            WebBarrageSubscription.ViewportChangedHandler viewportChangedHandler = this::onViewportChange;
+            WebBarrageSubscription.DataChangedHandler dataChangedHandler = this::onDataChanged;
+
+            status = Status.SUBSCRIPTION_REQUESTED;
+
+            // In order to create the subscription, we need to already have the table resolved, so we know if it
+            // is a blink table or not. In turn, we can't be prepared to handle any messages from the server until
+            // we know this, so we can't race messages with this design.
+            this.barrageSubscription = WebBarrageSubscription.subscribe(
+                    subscriptionType, state, viewportChangedHandler, dataChangedHandler);
+
+            doExchange = connection.<FlightData, FlightData>streamFactory().create(
+                    headers -> connection.flightServiceClient().doExchange(headers),
+                    (first, headers) -> connection.browserFlightServiceClient().openDoExchange(first, headers),
+                    (next, headers, c) -> connection.browserFlightServiceClient().nextDoExchange(next, headers,
+                            c::apply),
+                    new FlightData());
+
+            doExchange.onData(this::onFlightData);
+            doExchange.onEnd(this::onStreamEnd);
+
+            sendFirstSubscriptionRequest();
+        },
+                // If the upstream table fails, kill the subscription
+                this::fail,
+                // If the upstream table is closed, its because this subscription released it, do nothing
+                JsRunnable.doNothing());
+    }
+
+    protected static FlatBufferBuilder subscriptionRequest(byte[] tableTicket, BitSet columns,
+            @Nullable RangeSet viewport,
+            BarrageSubscriptionOptions options, boolean isReverseViewport) {
+        FlatBufferBuilder sub = new FlatBufferBuilder(1024);
+        int colOffset = BarrageSubscriptionRequest.createColumnsVector(sub, columns.toByteArray());
+        int viewportOffset = 0;
+        if (viewport != null) {
+            viewportOffset =
+                    BarrageSubscriptionRequest.createViewportVector(sub, CompressedRangeSetReader.writeRange(viewport));
+        }
+        int optionsOffset = options.appendTo(sub);
+        int tableTicketOffset = BarrageSubscriptionRequest.createTicketVector(sub, tableTicket);
+        BarrageSubscriptionRequest.startBarrageSubscriptionRequest(sub);
+        BarrageSubscriptionRequest.addColumns(sub, colOffset);
+        BarrageSubscriptionRequest.addViewport(sub, viewportOffset);
+        BarrageSubscriptionRequest.addSubscriptionOptions(sub, optionsOffset);
+        BarrageSubscriptionRequest.addTicket(sub, tableTicketOffset);
+        BarrageSubscriptionRequest.addReverseViewport(sub, isReverseViewport);
+        sub.finish(BarrageSubscriptionRequest.endBarrageSubscriptionRequest(sub));
+
+        return sub;
+    }
+
+    protected abstract void sendFirstSubscriptionRequest();
+
+    protected void sendBarrageSubscriptionRequest(@Nullable RangeSet viewport, JsArray<Column> columns,
+            Double updateIntervalMs,
+            boolean isReverseViewport) {
+        if (isClosed()) {
+            if (failMsg == null) {
+                throw new IllegalStateException("Can't change subscription, already closed");
+            } else {
+                throw new IllegalStateException("Can't change subscription, already failed: " + failMsg);
+            }
+        }
+        if (status == Status.ACTIVE) {
+            status = Status.PENDING_UPDATE;
+        }
+        this.columns = columns;
+        this.viewportRowSet = viewport;
+        this.columnBitSet = makeColumnBitset(columns);
+        this.isReverseViewport = isReverseViewport;
+        this.options = BarrageSubscriptionOptions.builder()
+                .batchSize(WebBarrageSubscription.BATCH_SIZE)
+                .maxMessageSize(WebBarrageSubscription.MAX_MESSAGE_SIZE)
+                .minUpdateIntervalMs(updateIntervalMs == null ? 0 : (int) (double) updateIntervalMs)
+                .columnsAsList(false)// TODO(deephaven-core#5927) flip this to true
+                .useDeephavenNulls(true)
+                .previewListLengthLimit(0)
+                .build();
+        FlatBufferBuilder request = subscriptionRequest(
+                Js.uncheckedCast(state.getHandle().getTicket()),
+                columnBitSet,
+                viewport,
+                options,
+                isReverseViewport);
+        FlightData subscriptionRequest = new FlightData();
+        subscriptionRequest
+                .setAppMetadata(WebBarrageUtils.wrapMessage(request, BarrageMessageType.BarrageSubscriptionRequest));
+        doExchange.send(subscriptionRequest);
+    }
+
+    protected BitSet makeColumnBitset(JsArray<Column> columns) {
+        return state.makeBitset(Js.uncheckedCast(columns));
+    }
+
+    public ClientTableState state() {
+        return state;
+    }
+
+    protected WorkerConnection connection() {
+        return connection;
+    }
+
+    /**
+     * True if the subscription is in the ACTIVE state, meaning that the server and client are in sync with the state of
+     * the subscription.
+     */
+    protected boolean isSubscriptionReady() {
+        return status == Status.ACTIVE;
+    }
+
+    /**
+     * Returns true if the subscription is closed and cannot be used again, false if it is actively listening for more
+     * data.
+     */
+    public boolean isClosed() {
+        return status == Status.DONE;
+    }
+
+    /**
+     * Returns true if the subscription is in a state where it can be used to read data, false if still waiting for the
+     * server to send the first snapshot or if the subscription has been closed.
+     * 
+     * @return true if the {@link #size()} method will return data based on the subscription, false if some other source
+     *         of the table's size will be used.
+     */
+    public boolean hasValidSize() {
+        return status == Status.ACTIVE || status == Status.PENDING_UPDATE;
+    }
+
+
+    public double size() {
+        if (hasValidSize()) {
+            return barrageSubscription.getCurrentSize();
+        }
+        if (isClosed()) {
+            throw new IllegalStateException("Can't read size when already closed");
+        }
+        return state.getSize();
+    }
+
+    private void onDataChanged(RangeSet rowsAdded, RangeSet rowsRemoved, RangeSet totalMods, ShiftedRange[] shifted,
+            BitSet modifiedColumnSet) {
+        if (!isSubscriptionReady()) {
+            return;
+        }
+
+        notifyUpdate(rowsAdded, rowsRemoved, totalMods, shifted);
+    }
+
+    protected void notifyUpdate(RangeSet rowsAdded, RangeSet rowsRemoved, RangeSet totalMods, ShiftedRange[] shifted) {
+        // TODO (deephaven-core#2435) Rewrite shifts as adds/removed/modifies
+        UpdateEventData detail = new SubscriptionEventData(
+                barrageSubscription,
+                rowStyleColumn,
+                columns,
+                rowsAdded,
+                rowsRemoved,
+                totalMods,
+                shifted);
+        fireEvent(TableSubscription.EVENT_UPDATED, detail);
+    }
+
+    public static class SubscriptionRow implements TableData.Row {
+        private final WebBarrageSubscription subscription;
+        private final int rowStyleColumn;
+        protected final long index;
+        public LongWrapper indexCached;
+
+        public SubscriptionRow(WebBarrageSubscription subscription, int rowStyleColumn, long index) {
+            this.subscription = subscription;
+            this.rowStyleColumn = rowStyleColumn;
+            this.index = index;
+        }
+
+        @Override
+        public LongWrapper getIndex() {
+            if (indexCached == null) {
+                indexCached = LongWrapper.of(index);
+            }
+            return indexCached;
+        }
+
+        @Override
+        public Any get(Column column) {
+            return subscription.getData(index, column.getIndex());
+        }
+
+        @Override
+        public Format getFormat(Column column) {
+            long cellColors = 0;
+            long rowColors = 0;
+            String numberFormat = null;
+            String formatString = null;
+            if (column.getStyleColumnIndex() != null) {
+                LongWrapper wrapper = subscription.getData(index, column.getStyleColumnIndex()).uncheckedCast();
+                cellColors = wrapper == null ? 0 : wrapper.getWrapped();
+            }
+            if (rowStyleColumn != TableData.NO_ROW_FORMAT_COLUMN) {
+                LongWrapper wrapper = subscription.getData(index, rowStyleColumn).uncheckedCast();
+                rowColors = wrapper == null ? 0 : wrapper.getWrapped();
+            }
+            if (column.getFormatStringColumnIndex() != null) {
+                numberFormat = subscription.getData(index, column.getFormatStringColumnIndex()).uncheckedCast();
+            }
+            if (column.getFormatStringColumnIndex() != null) {
+                formatString = subscription.getData(index, column.getFormatStringColumnIndex()).uncheckedCast();
+            }
+            return new Format(cellColors, rowColors, numberFormat, formatString);
+        }
+    }
+
+    /**
+     * TableData type for full table subscriptions.
+     */
+    @TsIgnore
+    public static class SubscriptionEventData extends UpdateEventData implements ViewportData, SubscriptionTableData {
+        public SubscriptionEventData(WebBarrageSubscription subscription, int rowStyleColumn, JsArray<Column> columns,
+                RangeSet added, RangeSet removed, RangeSet modified, ShiftedRange[] shifted) {
+            super(subscription, rowStyleColumn, columns, added, removed, modified, shifted);
+        }
+
+        @Override
+        public JsRangeSet getAdded() {
+            return added;
+        }
+
+        @Override
+        public JsRangeSet getRemoved() {
+            return removed;
+        }
+
+        @Override
+        public JsRangeSet getModified() {
+            return modified;
+        }
+
+        @Override
+        public JsRangeSet getFullIndex() {
+            return fullRowSet;
+        }
+    }
+
+    /**
+     * TableData type for viewport subscriptions.
+     */
+    @TsIgnore
+    public static class ViewportEventData extends SubscriptionEventData {
+        public ViewportEventData(WebBarrageSubscription subscription, int rowStyleColumn, JsArray<Column> columns,
+                RangeSet added, RangeSet removed, RangeSet modified, ShiftedRange[] shifted) {
+            super(subscription, rowStyleColumn, columns, added, removed, modified, shifted);
+        }
+
+        @Override
+        public Any getData(long key, Column column) {
+            return super.getData(fullRowSet.getRange().get(key), column);
+        }
+
+        @Override
+        public Format getFormat(long index, Column column) {
+            return super.getFormat(fullRowSet.getRange().get(index), column);
+        }
+    }
+
+
+    /**
+     * Base type to allow trees to extend from here separately from tables.
+     */
+    @TsIgnore
+    public abstract static class UpdateEventData implements TableData {
+        protected final WebBarrageSubscription subscription;
+        private final int rowStyleColumn;
+        private final JsArray<Column> columns;
+        protected final JsRangeSet added;
+        protected final JsRangeSet removed;
+        protected final JsRangeSet modified;
+        protected final JsRangeSet fullRowSet;
+
+        // cached copy in case it was requested, could be requested again
+        private JsArray<SubscriptionRow> allRows;
+
+        private double offset;
+
+        public UpdateEventData(WebBarrageSubscription subscription, int rowStyleColumn, JsArray<Column> columns,
+                RangeSet added, RangeSet removed, RangeSet modified, ShiftedRange[] shifted) {
+            this.subscription = subscription;
+            this.rowStyleColumn = rowStyleColumn;
+            this.columns = columns;
+            this.added = new JsRangeSet(added);
+            this.removed = new JsRangeSet(removed);
+            this.modified = new JsRangeSet(modified);
+            this.fullRowSet = new JsRangeSet(transformRowsetForConsumer(subscription.getCurrentRowSet(),
+                    subscription.getServerViewport(), subscription.isReversed()));
+        }
+
+        // for ViewportData
+        @JsProperty
+        public Double getOffset() {
+            return offset;
+        }
+
+        public void setOffset(double offset) {
+            this.offset = offset;
+        }
+
+        @Override
+        public JsArray<TableData.Row> getRows() {
+            if (allRows == null) {
+                allRows = new JsArray<>();
+                fullRowSet.getRange().indexIterator().forEachRemaining((long index) -> {
+                    allRows.push(makeRow(index));
+                });
+                if (JsSettings.isDevMode()) {
+                    assert allRows.length == fullRowSet.getSize();
+                }
+            }
+            return (JsArray<Row>) (JsArray) allRows;
+        }
+
+        protected SubscriptionRow makeRow(long index) {
+            return new SubscriptionRow(subscription, rowStyleColumn, index);
+        }
+
+        @Override
+        public Row get(int index) {
+            return this.get((long) index);
+        }
+
+        @Override
+        public Row get(long index) {
+            return makeRow(index);
+        }
+
+        @Override
+        public Any getData(int index, Column column) {
+            return getData((long) index, column);
+        }
+
+        @Override
+        public Any getData(long key, Column column) {
+            return subscription.getData(key, column.getIndex());
+        }
+
+        @Override
+        public Format getFormat(int index, Column column) {
+            return getFormat((long) index, column);
+        }
+
+        @Override
+        public Format getFormat(long index, Column column) {
+            long cellColors = 0;
+            long rowColors = 0;
+            String numberFormat = null;
+            String formatString = null;
+            if (column.getStyleColumnIndex() != null) {
+                LongWrapper wrapper = subscription.getData(index, column.getStyleColumnIndex()).uncheckedCast();
+                cellColors = wrapper == null ? 0 : wrapper.getWrapped();
+            }
+            if (rowStyleColumn != NO_ROW_FORMAT_COLUMN) {
+                LongWrapper wrapper = subscription.getData(index, column.getStyleColumnIndex()).uncheckedCast();
+                rowColors = wrapper == null ? 0 : wrapper.getWrapped();
+            }
+            if (column.getFormatStringColumnIndex() != null) {
+                numberFormat = subscription.getData(index, column.getFormatStringColumnIndex()).uncheckedCast();
+            }
+            if (column.getFormatStringColumnIndex() != null) {
+                formatString = subscription.getData(index, column.getFormatStringColumnIndex()).uncheckedCast();
+            }
+            return new Format(cellColors, rowColors, numberFormat, formatString);
+        }
+
+        @Override
+        public JsArray<Column> getColumns() {
+            return columns;
+        }
+    }
+
+    /**
+     * If a viewport is in use, transforms the given rowset to position space based on that viewport.
+     * 
+     * @param rowSet the rowset to possibly transform
+     * @return a transformed rowset
+     */
+    private static RangeSet transformRowsetForConsumer(RangeSet rowSet, @Nullable RangeSet viewport, boolean reversed) {
+        if (viewport != null) {
+            return rowSet.subsetForPositions(viewport, reversed);
+        }
+        return rowSet;
+    }
+
+    private void onViewportChange(RangeSet serverViewport, BitSet serverColumns, boolean serverReverseViewport) {
+        boolean subscriptionReady = ((serverColumns == null && columnBitSet == null)
+                || (serverColumns == null && columnBitSet.cardinality() == state.getTableDef().getColumns().length)
+                || (serverColumns != null && serverColumns.equals(this.columnBitSet)))
+                && (serverViewport == null && this.viewportRowSet == null
+                        || (serverViewport != null && serverViewport.equals(this.viewportRowSet)))
+                && serverReverseViewport == isReverseViewport;
+        if (subscriptionReady) {
+            status = Status.ACTIVE;
+        }
+    }
+
+    private final WebBarrageStreamReader reader = new WebBarrageStreamReader();
+
+    private void onFlightData(FlightData data) {
+        WebBarrageMessage message;
+        try {
+            message = reader.parseFrom(options, state.chunkTypes(), state.columnTypes(), state.componentTypes(), data);
+        } catch (IOException e) {
+            throw new RuntimeException(e);
+        }
+        if (message != null) {
+            // This payload resulted in an update to the table's contents, inform the subscription
+            barrageSubscription.applyUpdates(message);
+        }
+    }
+
+    protected void onStreamEnd(ResponseStreamWrapper.Status status) {
+        if (isClosed()) {
+            return;
+        }
+        if (status.isTransportError()) {
+            // If the subscription isn't closed and we hit a transport error, allow it to restart
+            this.status = Status.STARTING;
+        } else {
+            // Subscription failed somehow, fire an event
+            fail(status.getDetails());
+        }
+    }
+
+    private void fail(String message) {
+        failureHandled(message);
+        this.status = Status.DONE;
+        doExchange = null;
+        failMsg = message;
+    }
+
+    /**
+     * The columns that were subscribed to when this subscription was created
+     *
+     * @return {@link Column}
+     */
+    public JsArray<Column> getColumns() {
+        return columns;
+    }
+
+    /**
+     * Stops the subscription on the server.
+     */
+    @JsMethod
+    public void close() {
+        state.unretain(this);
+        if (doExchange != null) {
+            doExchange.end();
+            doExchange.cancel();
+        }
+        status = Status.DONE;
+    }
+}
diff --git a/web/client-api/src/main/java/io/deephaven/web/client/api/subscription/QueryConstants.java b/web/client-api/src/main/java/io/deephaven/web/client/api/subscription/QueryConstants.java
deleted file mode 100644
index e49eb7c2846..00000000000
--- a/web/client-api/src/main/java/io/deephaven/web/client/api/subscription/QueryConstants.java
+++ /dev/null
@@ -1,21 +0,0 @@
-//
-// Copyright (c) 2016-2024 Deephaven Data Labs and Patent Pending
-//
-package io.deephaven.web.client.api.subscription;
-
-
-/**
- * Constants for null values within the Deephaven engine From io.deephaven.util.QueryConstants
- */
-public interface QueryConstants {
-    char NULL_CHAR = Character.MAX_VALUE;
-    byte NULL_BYTE = Byte.MIN_VALUE;
-    short NULL_SHORT = Short.MIN_VALUE;
-    int NULL_INT = Integer.MIN_VALUE;
-    long NULL_LONG = Long.MIN_VALUE;
-    float NULL_FLOAT = -Float.MAX_VALUE;
-    double NULL_DOUBLE = -Double.MAX_VALUE;
-    byte NULL_BOOLEAN_AS_BYTE = NULL_BYTE;
-    byte TRUE_BOOLEAN_AS_BYTE = (byte) 1;
-    byte FALSE_BOOLEAN_AS_BYTE = (byte) 0;
-}
diff --git a/web/client-api/src/main/java/io/deephaven/web/client/api/subscription/SubscriptionTableData.java b/web/client-api/src/main/java/io/deephaven/web/client/api/subscription/SubscriptionTableData.java
index 84e4dc1c758..2067e9068db 100644
--- a/web/client-api/src/main/java/io/deephaven/web/client/api/subscription/SubscriptionTableData.java
+++ b/web/client-api/src/main/java/io/deephaven/web/client/api/subscription/SubscriptionTableData.java
@@ -5,667 +5,53 @@
 
 import com.vertispan.tsdefs.annotations.TsInterface;
 import com.vertispan.tsdefs.annotations.TsName;
-import elemental2.core.JsArray;
-import elemental2.dom.CustomEventInit;
-import io.deephaven.web.client.api.*;
-import io.deephaven.web.client.fu.JsSettings;
-import io.deephaven.web.shared.data.*;
-import io.deephaven.web.shared.data.columns.ColumnData;
-import jsinterop.annotations.JsFunction;
-import jsinterop.annotations.JsIgnore;
-import jsinterop.annotations.JsMethod;
+import io.deephaven.web.client.api.JsRangeSet;
+import io.deephaven.web.client.api.TableData;
 import jsinterop.annotations.JsProperty;
-import jsinterop.annotations.JsType;
-import jsinterop.base.Any;
-import jsinterop.base.Js;
-import jsinterop.base.JsArrayLike;
 
-import javax.annotation.Nullable;
-import java.math.BigDecimal;
-import java.math.BigInteger;
-import java.util.NavigableSet;
-import java.util.PrimitiveIterator;
-import java.util.TreeMap;
-import static io.deephaven.web.client.api.subscription.ViewportData.NO_ROW_FORMAT_COLUMN;
-
-public class SubscriptionTableData {
-    @JsFunction
-    private interface ArrayCopy {
-        @SuppressWarnings("unusable-by-js")
-        void copyTo(Object destArray, long destPos, Object srcArray, int srcPos);
-    }
-
-    private final JsArray<Column> columns;
-    private final int rowStyleColumn;
-    private final HasEventHandling evented;
-
-    // the actual rows present on the client, in their correct order
-    private RangeSet index;
-
-    // mappings from the index to the position of a row in the data array
-    private TreeMap<Long, Long> redirectedIndexes;
-
-    // rows in the data columns that no longer contain data and can be reused
-    private RangeSet reusableDestinations;
-
-    // array of data columns, cast each to a jsarray to read rows
-    private Object[] data;
-
-    public SubscriptionTableData(JsArray<Column> columns, int rowStyleColumn, HasEventHandling evented) {
-        this.columns = columns;
-        this.rowStyleColumn = rowStyleColumn;
-        this.evented = evented;
-    }
-
-    // TODO support this being called multiple times so we can keep viewports going without clearing the data
-    public TableData handleSnapshot(TableSnapshot snapshot) {
-        // when changing snapshots we should actually rewrite the columns, possibly emulate ViewportData more?
-        ColumnData[] dataColumns = snapshot.getDataColumns();
-        data = new Object[dataColumns.length];
-        reusableDestinations = RangeSet.empty();
-        redirectedIndexes = new TreeMap<>();
-        index = snapshot.getIncludedRows();
-
-        long includedRowCount = snapshot.getIncludedRows().size();
-        RangeSet destination = freeRows(includedRowCount);
-
-        for (int index = 0; index < dataColumns.length; index++) {
-            ColumnData dataColumn = dataColumns[index];
-            if (dataColumn == null) {
-                // no data in this column, wasn't requested
-                continue;
-            }
-
-            final int i = index;
-            Column column = columns.find((c, i1, i2) -> c.getIndex() == i);
-
-            ArrayCopy arrayCopy = arrayCopyFuncForColumn(column);
-
-            Object[] localCopy = new Object[(int) includedRowCount];
-            data[index] = localCopy;
-            PrimitiveIterator.OfLong destIter = destination.indexIterator();
-            PrimitiveIterator.OfLong indexIter = snapshot.getIncludedRows().indexIterator();
-            int j = 0;
-            while (indexIter.hasNext()) {
-                assert destIter.hasNext();
-                long dest = destIter.nextLong();
-                redirectedIndexes.put(indexIter.nextLong(), dest);
-                arrayCopy.copyTo(localCopy, dest, dataColumn.getData(), j++);
-            }
-            assert !destIter.hasNext();
-        }
-
-        return notifyUpdates(index, RangeSet.empty(), RangeSet.empty());
-    }
+/**
+ * Event data, describing the indexes that were added/removed/updated, and providing access to Rows (and thus data in
+ * columns) either by index, or scanning the complete present index.
+ * <p>
+ * This class supports two ways of reading the table - checking the changes made since the last update, and reading all
+ * data currently in the table. While it is more expensive to always iterate over every single row in the table, it may
+ * in some cases actually be cheaper than maintaining state separately and updating only the changes, though both
+ * options should be considered.
+ * <p>
+ * The RangeSet objects allow iterating over the LongWrapper indexes in the table. Note that these "indexes" are not
+ * necessarily contiguous and may be negative, and represent some internal state on the server, allowing it to keep
+ * track of data efficiently. Those LongWrapper objects can be passed to the various methods on this instance to read
+ * specific rows or cells out of the table.
+ */
+@TsInterface
+@TsName(name = "SubscriptionTableData", namespace = "dh")
+public interface SubscriptionTableData extends TableData {
+
+
+    @JsProperty
+    JsRangeSet getFullIndex();
 
     /**
-     * Helper to avoid appending many times when modifying indexes. The append() method should be called for each key
-     * _in order_ to ensure that RangeSet.addRange isn't called excessively. When no more items will be added, flush()
-     * must be called.
+     * The ordered set of row indexes added since the last update.
+     *
+     * @return the rangeset of rows added
      */
-    private static class RangeSetAppendHelper {
-        private final RangeSet rangeSet;
-
-        private long currentFirst = -1;
-        private long currentLast;
-
-        public RangeSetAppendHelper(final RangeSet rangeSet) {
-            this.rangeSet = rangeSet;
-        }
-
-        public void append(long key) {
-            assert key >= 0;
-
-            if (currentFirst == -1) {
-                // first key to be added, move both first and last
-                currentFirst = key;
-                currentLast = key;
-
-                return;
-            }
-
-            if (key == currentLast + 1) {
-                // key appends to our current range
-                currentLast = key;
-            } else if (key == currentFirst - 1) {
-                // key appends to our current range
-                currentFirst = key;
-            } else {
-                // existing range doesn't match the new item, finish the old range and start a new one
-                rangeSet.addRange(new Range(currentFirst, currentLast));
-                currentFirst = key;
-                currentLast = key;
-            }
-        }
-
-        public void flush() {
-            if (currentFirst != -1) {
-                rangeSet.addRange(new Range(currentFirst, currentLast));
-                currentFirst = -1;
-            }
-        }
-    }
-
-    public TableData handleDelta(DeltaUpdates delta) {
-        // delete old data, track slots freed up. we do this by row since they might be non-contiguous or out of order
-        RangeSetAppendHelper reusableHelper = new RangeSetAppendHelper(reusableDestinations);
-        delta.getRemoved().indexIterator().forEachRemaining((long index) -> {
-            long dest = redirectedIndexes.remove(index);
-            reusableHelper.append(dest);
-            // TODO consider trimming the columns down too, and truncating the reusable slots at the end
-        });
-        reusableHelper.flush();
-        // clean up index by ranges, not by row
-        delta.getRemoved().rangeIterator().forEachRemaining(index::removeRange);
-
-        // Shift moved rows in the redir index
-        boolean hasReverseShift = false;
-        final ShiftedRange[] shiftedRanges = delta.getShiftedRanges();
-        RangeSetAppendHelper shifter = new RangeSetAppendHelper(index);
-        for (int i = shiftedRanges.length - 1; i >= 0; --i) {
-            final ShiftedRange shiftedRange = shiftedRanges[i];
-            final long offset = shiftedRange.getDelta();
-            if (offset < 0) {
-                hasReverseShift = true;
-                continue;
-            }
-            index.removeRange(shiftedRange.getRange());
-            final NavigableSet<Long> toMove = redirectedIndexes.navigableKeySet()
-                    .subSet(shiftedRange.getRange().getFirst(), true, shiftedRange.getRange().getLast(), true);
-            // iterate backward and move them forward
-            for (Long key : toMove.descendingSet()) {
-                long shiftedKey = key + offset;
-                Long oldValue = redirectedIndexes.put(shiftedKey, redirectedIndexes.remove(key));
-                assert oldValue == null : shiftedKey + " already has a value, " + oldValue;
-                shifter.append(shiftedKey);
-            }
-        }
-        if (hasReverseShift) {
-            for (int i = 0; i < shiftedRanges.length; ++i) {
-                final ShiftedRange shiftedRange = shiftedRanges[i];
-                final long offset = shiftedRange.getDelta();
-                if (offset > 0) {
-                    continue;
-                }
-                index.removeRange(shiftedRange.getRange());
-                final NavigableSet<Long> toMove = redirectedIndexes.navigableKeySet()
-                        .subSet(shiftedRange.getRange().getFirst(), true, shiftedRange.getRange().getLast(), true);
-                // iterate forward and move them backward
-                for (Long key : toMove) {
-                    long shiftedKey = key + offset;
-                    Long oldValue = redirectedIndexes.put(shiftedKey, redirectedIndexes.remove(key));
-                    assert oldValue == null : shiftedKey + " already has a value, " + oldValue;
-                    shifter.append(shiftedKey);
-                }
-            }
-        }
-        shifter.flush();
-
-        // Find space for the rows we're about to add. We must not adjust the index until this is done, it is used
-        // to see where the end of the data is
-        RangeSet addedDestination = freeRows(delta.getAdded().size());
-        // Within each column, append additions
-        DeltaUpdates.ColumnAdditions[] additions = delta.getSerializedAdditions();
-        for (int i = 0; i < additions.length; i++) {
-            DeltaUpdates.ColumnAdditions addedColumn = delta.getSerializedAdditions()[i];
-            Column column = columns.find((c, i1, i2) -> c.getIndex() == addedColumn.getColumnIndex());
-
-            ArrayCopy arrayCopy = arrayCopyFuncForColumn(column);
-
-            PrimitiveIterator.OfLong addedIndexes = delta.getAdded().indexIterator();
-            PrimitiveIterator.OfLong destIter = addedDestination.indexIterator();
-            int j = 0;
-            while (addedIndexes.hasNext()) {
-                long origIndex = addedIndexes.nextLong();
-                assert delta.getIncludedAdditions().contains(origIndex);
-                assert destIter.hasNext();
-                long dest = destIter.nextLong();
-                Long old = redirectedIndexes.put(origIndex, dest);
-                assert old == null || old == dest;
-                arrayCopy.copyTo(data[addedColumn.getColumnIndex()], dest, addedColumn.getValues().getData(), j++);
-            }
-        }
-
-        // Update the index to reflect the added items
-        delta.getAdded().rangeIterator().forEachRemaining(index::addRange);
-
-        // Within each column, apply modifications
-        DeltaUpdates.ColumnModifications[] modifications = delta.getSerializedModifications();
-        RangeSet allModified = new RangeSet();
-        for (int i = 0; i < modifications.length; ++i) {
-            final DeltaUpdates.ColumnModifications modifiedColumn = modifications[i];
-            if (modifiedColumn == null) {
-                continue;
-            }
-
-            modifiedColumn.getRowsIncluded().rangeIterator().forEachRemaining(allModified::addRange);
-            Column column = columns.find((c, i1, i2) -> c.getIndex() == modifiedColumn.getColumnIndex());
-
-            ArrayCopy arrayCopy = arrayCopyFuncForColumn(column);
-
-            PrimitiveIterator.OfLong modifiedIndexes = modifiedColumn.getRowsIncluded().indexIterator();
-            int j = 0;
-            while (modifiedIndexes.hasNext()) {
-                long origIndex = modifiedIndexes.nextLong();
-                arrayCopy.copyTo(data[modifiedColumn.getColumnIndex()], redirectedIndexes.get(origIndex),
-                        modifiedColumn.getValues().getData(), j++);
-            }
-        }
-
-        // Check that the index sizes make sense
-        assert redirectedIndexes.size() == index.size();
-        // Note that we can't do this assert, since we don't truncate arrays, we just leave nulls at the end
-        // assert Js.asArrayLike(data[0]).getLength() == redirectedIndexes.size();
-
-        return notifyUpdates(delta.getAdded(), delta.getRemoved(), allModified);
-    }
-
-    private TableData notifyUpdates(RangeSet added, RangeSet removed, RangeSet modified) {
-        UpdateEventData detail = new UpdateEventData(added, removed, modified);
-        if (evented != null) {
-            CustomEventInit event = CustomEventInit.create();
-            event.setDetail(detail);
-            evented.fireEvent(TableSubscription.EVENT_UPDATED, event);
-        }
-        return detail;
-    }
-
-    private ArrayCopy arrayCopyFuncForColumn(@Nullable Column column) {
-        final String type = column != null ? column.getType() : "";
-        switch (type) {
-            case "long":
-                return (destArray, destPos, srcArray, srcPos) -> {
-                    final long value = Js.asArrayLike(srcArray).getAtAsAny(srcPos).asLong();
-                    if (value == QueryConstants.NULL_LONG) {
-                        Js.asArrayLike(destArray).setAt((int) destPos, null);
-                    } else {
-                        Js.asArrayLike(destArray).setAt((int) destPos, LongWrapper.of(value));
-                    }
-                };
-            case "java.time.Instant":
-            case "java.time.ZonedDateTime":
-                return (destArray, destPos, srcArray, srcPos) -> {
-                    long value = Js.asArrayLike(srcArray).getAtAsAny(srcPos).asLong();
-                    if (value == QueryConstants.NULL_LONG) {
-                        Js.asArrayLike(destArray).setAt((int) destPos, null);
-                    } else {
-                        Js.asArrayLike(destArray).setAt((int) destPos, new DateWrapper(value));
-                    }
-                };
-            case "java.math.BigDecimal":
-                return (destArray, destPos, srcArray, srcPos) -> {
-                    final BigDecimal value = Js.cast(Js.asArrayLike(srcArray).getAt(srcPos));
-                    if (value == null) {
-                        Js.asArrayLike(destArray).setAt((int) destPos, null);
-                    } else {
-                        Js.asArrayLike(destArray).setAt((int) destPos, new BigDecimalWrapper(value));
-                    }
-                };
-            case "java.math.BigInteger":
-                return (destArray, destPos, srcArray, srcPos) -> {
-                    final BigInteger value = Js.cast(Js.asArrayLike(srcArray).getAt(srcPos));
-                    if (value == null) {
-                        Js.asArrayLike(destArray).setAt((int) destPos, null);
-                    } else {
-                        Js.asArrayLike(destArray).setAt((int) destPos, new BigIntegerWrapper(value));
-                    }
-                };
-            case "java.time.LocalDate":
-                return (destArray, destPos, srcArray, srcPos) -> {
-                    final LocalDate value = Js.cast(Js.asArrayLike(srcArray).getAt(srcPos));
-                    if (value == null) {
-                        Js.asArrayLike(destArray).setAt((int) destPos, null);
-                    } else {
-                        Js.asArrayLike(destArray).setAt((int) destPos, new LocalDateWrapper(value));
-                    }
-                };
-            case "java.time.LocalTime":
-                return (destArray, destPos, srcArray, srcPos) -> {
-                    final LocalTime value = Js.cast(Js.asArrayLike(srcArray).getAt(srcPos));
-                    if (value == null) {
-                        Js.asArrayLike(destArray).setAt((int) destPos, null);
-                    } else {
-                        Js.asArrayLike(destArray).setAt((int) destPos, new LocalTimeWrapper(value));
-                    }
-                };
-            case "java.lang.Boolean":
-                return (destArray, destPos, srcArray, srcPos) -> {
-                    final Any value = Js.asArrayLike(srcArray).getAtAsAny(srcPos);
-
-                    if (value == null) {
-                        Js.asArrayLike(destArray).setAt((int) destPos, null);
-                    } else if (value.asBoolean()) {
-                        Js.asArrayLike(destArray).setAt((int) destPos, true);
-                    } else {
-                        Js.asArrayLike(destArray).setAt((int) destPos, false);
-                    }
-                };
-            case "int":
-                return (destArray, destPos, srcArray, srcPos) -> {
-                    final int value = Js.asArrayLike(srcArray).getAtAsAny(srcPos).asInt();
-                    if (value == QueryConstants.NULL_INT) {
-                        Js.asArrayLike(destArray).setAt((int) destPos, null);
-                    } else {
-                        Js.asArrayLike(destArray).setAt((int) destPos, value);
-                    }
-                };
-            case "byte":
-                return (destArray, destPos, srcArray, srcPos) -> {
-                    final byte value = Js.asArrayLike(srcArray).getAtAsAny(srcPos).asByte();
-                    if (value == QueryConstants.NULL_BYTE) {
-                        Js.asArrayLike(destArray).setAt((int) destPos, null);
-                    } else {
-                        Js.asArrayLike(destArray).setAt((int) destPos, value);
-                    }
-                };
-            case "short":
-                return (destArray, destPos, srcArray, srcPos) -> {
-                    final short value = Js.asArrayLike(srcArray).getAtAsAny(srcPos).asShort();
-                    if (value == QueryConstants.NULL_SHORT) {
-                        Js.asArrayLike(destArray).setAt((int) destPos, null);
-                    } else {
-                        Js.asArrayLike(destArray).setAt((int) destPos, value);
-                    }
-                };
-            case "double":
-                return (destArray, destPos, srcArray, srcPos) -> {
-                    final double value = Js.asArrayLike(srcArray).getAtAsAny(srcPos).asDouble();
-                    if (value == QueryConstants.NULL_DOUBLE) {
-                        Js.asArrayLike(destArray).setAt((int) destPos, null);
-                    } else {
-                        Js.asArrayLike(destArray).setAt((int) destPos, value);
-                    }
-                };
-            case "float":
-                return (destArray, destPos, srcArray, srcPos) -> {
-                    final float value = Js.asArrayLike(srcArray).getAtAsAny(srcPos).asFloat();
-                    if (value == QueryConstants.NULL_FLOAT) {
-                        Js.asArrayLike(destArray).setAt((int) destPos, null);
-                    } else {
-                        Js.asArrayLike(destArray).setAt((int) destPos, value);
-                    }
-                };
-            case "char":
-                return (destArray, destPos, srcArray, srcPos) -> {
-                    final char value = Js.asArrayLike(srcArray).getAtAsAny(srcPos).asChar();
-                    if (value == QueryConstants.NULL_CHAR) {
-                        Js.asArrayLike(destArray).setAt((int) destPos, null);
-                    } else {
-                        Js.asArrayLike(destArray).setAt((int) destPos, value);
-                    }
-                };
-            default:
-                // exit so we can handle null also in the method's final return
-        }
-        return (destArray, destPos, srcArray, srcPos) -> {
-            // boring column or format data, just copy it
-            Js.asArrayLike(destArray).setAt((int) destPos, Js.asArrayLike(srcArray).getAt(srcPos));
-        };
-    }
-
-    private RangeSet freeRows(long required) {
-        if (required == 0) {
-            return RangeSet.empty();
-        }
-        long existingSlotsToReuse = reusableDestinations.size();
-        if (existingSlotsToReuse > required) {
-            // only take some of the ranges from the reusable list
-            RangeSet reused = RangeSet.empty();
-            long taken = 0;
-            RangeSet stillUnused = RangeSet.empty();
-            // TODO this could be more efficient, iterating entire ranges until we only need a partial range
-            PrimitiveIterator.OfLong iterator = reusableDestinations.indexIterator();
-            while (taken < required) {
-                assert iterator.hasNext();
-                long value = iterator.nextLong();
-                reused.addRange(new Range(value, value));
-                taken++;
-            }
-            assert taken == required;
-            while (iterator.hasNext()) {
-                long value = iterator.nextLong();
-                stillUnused.addRange(new Range(value, value));
-            }
-            reusableDestinations = stillUnused;
-            assert required == reused.size();
-            return reused;
-        }
-        // take all ranges from the reusable list (plus make more if needed)
-        RangeSet created = reusableDestinations;
-        if (existingSlotsToReuse < required) {
-            long nextIndex;
-            if (created.isEmpty()) {
-                if (index.isEmpty()) {
-                    nextIndex = 0;
-                } else {
-                    nextIndex = redirectedIndexes.size();
-                }
-            } else if (index.isEmpty()) {
-                nextIndex = created.getLastRow() + 1;
-            } else {
-                nextIndex = Math.max(created.getLastRow(), index.getLastRow()) + 1;
-            }
-            created.addRange(new Range(nextIndex, nextIndex + required - existingSlotsToReuse - 1));
-        }
-
-        reusableDestinations = RangeSet.empty();
-        assert required == created.size();
-        return created;
-    }
-
-    @TsInterface
-    @TsName(namespace = "dh")
-    public class SubscriptionRow implements TableData.Row {
-        private final long index;
-        public LongWrapper indexCached;
-
-        public SubscriptionRow(long index) {
-            this.index = index;
-        }
-
-        @Override
-        public LongWrapper getIndex() {
-            if (indexCached == null) {
-                indexCached = LongWrapper.of(index);
-            }
-            return indexCached;
-        }
-
-        @Override
-        public Any get(Column column) {
-            int redirectedIndex = (int) (long) redirectedIndexes.get(this.index);
-            JsArrayLike<Object> columnData = Js.asArrayLike(data[column.getIndex()]);
-            return columnData.getAtAsAny(redirectedIndex);
-        }
-
-        @Override
-        public Format getFormat(Column column) {
-            long cellColors = 0;
-            long rowColors = 0;
-            String numberFormat = null;
-            String formatString = null;
-            int redirectedIndex = (int) (long) redirectedIndexes.get(this.index);
-            if (column.getStyleColumnIndex() != null) {
-                JsArray<Any> colors = Js.uncheckedCast(data[column.getStyleColumnIndex()]);
-                cellColors = colors.getAtAsAny(redirectedIndex).asLong();
-            }
-            if (rowStyleColumn != NO_ROW_FORMAT_COLUMN) {
-                JsArray<Any> rowStyle = Js.uncheckedCast(data[rowStyleColumn]);
-                rowColors = rowStyle.getAtAsAny(redirectedIndex).asLong();
-            }
-            if (column.getFormatColumnIndex() != null) {
-                JsArray<Any> formatStrings = Js.uncheckedCast(data[column.getFormatColumnIndex()]);
-                numberFormat = formatStrings.getAtAsAny(redirectedIndex).asString();
-            }
-            if (column.getFormatStringColumnIndex() != null) {
-                JsArray<Any> formatStrings = Js.uncheckedCast(data[column.getFormatStringColumnIndex()]);
-                formatString = formatStrings.getAtAsAny(redirectedIndex).asString();
-            }
-            return new Format(cellColors, rowColors, numberFormat, formatString);
-        }
-    }
-
+    @JsProperty
+    JsRangeSet getAdded();
 
     /**
-     * Event data, describing the indexes that were added/removed/updated, and providing access to Rows (and thus data
-     * in columns) either by index, or scanning the complete present index.
+     * The ordered set of row indexes removed since the last update
      *
-     * This class supports two ways of reading the table - checking the changes made since the last update, and reading
-     * all data currently in the table. While it is more expensive to always iterate over every single row in the table,
-     * it may in some cases actually be cheaper than maintaining state separately and updating only the changes, though
-     * both options should be considered.
-     *
-     * The RangeSet objects allow iterating over the LongWrapper indexes in the table. Note that these "indexes" are not
-     * necessarily contiguous and may be negative, and represent some internal state on the server, allowing it to keep
-     * track of data efficiently. Those LongWrapper objects can be passed to the various methods on this instance to
-     * read specific rows or cells out of the table.
+     * @return the rangeset of removed rows
      */
-    @TsInterface
-    @TsName(name = "SubscriptionTableData", namespace = "dh")
-    public class UpdateEventData implements TableData {
-        private JsRangeSet added;
-        private JsRangeSet removed;
-        private JsRangeSet modified;
-
-        // cached copy in case it was requested, could be requested again
-        private JsArray<SubscriptionRow> allRows;
+    @JsProperty
+    JsRangeSet getRemoved();
 
-        public UpdateEventData(RangeSet added, RangeSet removed, RangeSet modified) {
-            this.added = new JsRangeSet(added);
-            this.removed = new JsRangeSet(removed);
-            this.modified = new JsRangeSet(modified);
-        }
-
-        /**
-         * A lazily computed array of all rows in the entire table
-         * 
-         * @return {@link SubscriptionRow} array.
-         */
-        @Override
-        public JsArray<SubscriptionRow> getRows() {
-            if (allRows == null) {
-                allRows = new JsArray<>();
-                index.indexIterator().forEachRemaining((long index) -> {
-                    allRows.push(new SubscriptionRow(index));
-                });
-                if (JsSettings.isDevMode()) {
-                    assert allRows.length == index.size();
-                }
-            }
-            return allRows;
-        }
-
-        @Override
-        public Row get(int index) {
-            return this.get((long) index);
-        }
-
-        /**
-         * Reads a row object from the table, from which any subscribed column can be read
-         * 
-         * @param index
-         * @return {@link SubscriptionRow}
-         */
-        @Override
-        public SubscriptionRow get(long index) {
-            return new SubscriptionRow(index);
-        }
-
-        @Override
-        public Any getData(int index, Column column) {
-            return getData((long) index, column);
-        }
-
-        /**
-         * a specific cell from the table, from the specified row and column
-         * 
-         * @param index
-         * @param column
-         * @return Any
-         */
-        @Override
-        public Any getData(long index, Column column) {
-            int redirectedIndex = (int) (long) redirectedIndexes.get(index);
-            JsArrayLike<Object> columnData = Js.asArrayLike(data[column.getIndex()]);
-            return columnData.getAtAsAny(redirectedIndex);
-        }
-
-        /**
-         * the Format to use for a cell from the specified row and column
-         * 
-         * @param index
-         * @param column
-         * @return {@link Format}
-         */
-        @Override
-        public Format getFormat(int index, Column column) {
-            return getFormat((long) index, column);
-        }
-
-        @Override
-        public Format getFormat(long index, Column column) {
-            long cellColors = 0;
-            long rowColors = 0;
-            String numberFormat = null;
-            String formatString = null;
-            int redirectedIndex = (int) (long) redirectedIndexes.get(index);
-            if (column.getStyleColumnIndex() != null) {
-                JsArray<Any> colors = Js.uncheckedCast(data[column.getStyleColumnIndex()]);
-                cellColors = colors.getAtAsAny(redirectedIndex).asLong();
-            }
-            if (rowStyleColumn != NO_ROW_FORMAT_COLUMN) {
-                JsArray<Any> rowStyle = Js.uncheckedCast(data[rowStyleColumn]);
-                rowColors = rowStyle.getAtAsAny(redirectedIndex).asLong();
-            }
-            if (column.getFormatColumnIndex() != null) {
-                JsArray<Any> formatStrings = Js.uncheckedCast(data[column.getFormatColumnIndex()]);
-                numberFormat = formatStrings.getAtAsAny(redirectedIndex).asString();
-            }
-            if (column.getFormatStringColumnIndex() != null) {
-                JsArray<Any> formatStrings = Js.uncheckedCast(data[column.getFormatStringColumnIndex()]);
-                formatString = formatStrings.getAtAsAny(redirectedIndex).asString();
-            }
-            return new Format(cellColors, rowColors, numberFormat, formatString);
-        }
-
-        @Override
-        public JsArray<Column> getColumns() {
-            return columns;
-        }
-
-        /**
-         * The ordered set of row indexes added since the last update
-         * 
-         * @return dh.RangeSet
-         */
-        @JsProperty
-        public JsRangeSet getAdded() {
-            return added;
-        }
-
-        /**
-         * The ordered set of row indexes removed since the last update
-         * 
-         * @return dh.RangeSet
-         */
-        @JsProperty
-        public JsRangeSet getRemoved() {
-            return removed;
-        }
-
-        /**
-         * The ordered set of row indexes updated since the last update
-         * 
-         * @return dh.RangeSet
-         */
-        @JsProperty
-        public JsRangeSet getModified() {
-            return modified;
-        }
-
-        @JsProperty
-        public JsRangeSet getFullIndex() {
-            return new JsRangeSet(index);
-        }
-    }
+    /**
+     * The ordered set of row indexes updated since the last update
+     *
+     * @return the rnageset of modified rows
+     */
+    @JsProperty
+    JsRangeSet getModified();
 }
diff --git a/web/client-api/src/main/java/io/deephaven/web/client/api/subscription/SubscriptionType.java b/web/client-api/src/main/java/io/deephaven/web/client/api/subscription/SubscriptionType.java
new file mode 100644
index 00000000000..64390243711
--- /dev/null
+++ b/web/client-api/src/main/java/io/deephaven/web/client/api/subscription/SubscriptionType.java
@@ -0,0 +1,13 @@
+//
+// Copyright (c) 2016-2024 Deephaven Data Labs and Patent Pending
+//
+package io.deephaven.web.client.api.subscription;
+
+public enum SubscriptionType {
+    /** a subscription that will receive all updates to the table */
+    FULL_SUBSCRIPTION,
+    /** a subscription that will receive updates only for the current viewport */
+    VIEWPORT_SUBSCRIPTION,
+    /** a non-refreshing subscription that receives data once and then stops */
+    SNAPSHOT
+}
diff --git a/web/client-api/src/main/java/io/deephaven/web/client/api/subscription/TableSubscription.java b/web/client-api/src/main/java/io/deephaven/web/client/api/subscription/TableSubscription.java
index f94aa9a5775..1decd7c5713 100644
--- a/web/client-api/src/main/java/io/deephaven/web/client/api/subscription/TableSubscription.java
+++ b/web/client-api/src/main/java/io/deephaven/web/client/api/subscription/TableSubscription.java
@@ -3,21 +3,14 @@
 //
 package io.deephaven.web.client.api.subscription;
 
-import com.vertispan.tsdefs.annotations.TsName;
 import elemental2.core.JsArray;
-import elemental2.promise.Promise;
 import io.deephaven.web.client.api.Column;
-import io.deephaven.web.client.api.HasEventHandling;
 import io.deephaven.web.client.api.JsTable;
-import io.deephaven.web.shared.data.DeltaUpdates;
-import io.deephaven.web.shared.data.TableSnapshot;
 import jsinterop.annotations.JsIgnore;
-import jsinterop.annotations.JsMethod;
+import jsinterop.annotations.JsNullable;
 import jsinterop.annotations.JsProperty;
 import jsinterop.annotations.JsType;
 
-import static io.deephaven.web.client.api.subscription.ViewportData.NO_ROW_FORMAT_COLUMN;
-
 /**
  * Represents a non-viewport subscription to a table, and all data currently known to be present in the subscribed
  * columns. This class handles incoming snapshots and deltas, and fires events to consumers to notify of data changes.
@@ -31,80 +24,40 @@
  * viewports to make it less expensive to compute for large tables.
  */
 @JsType(namespace = "dh")
-public class TableSubscription extends HasEventHandling {
-
-    /**
-     * Indicates that some new data is available on the client, either an initial snapshot or a delta update. The
-     * <b>detail</b> field of the event will contain a TableSubscriptionEventData detailing what has changed, or
-     * allowing access to the entire range of items currently in the subscribed columns.
-     */
-    public static final String EVENT_UPDATED = "updated";
-
-
-    // column defs in this subscription
-    private JsArray<Column> columns;
-    // holder for data
-    private SubscriptionTableData data;
+public final class TableSubscription extends AbstractTableSubscription {
 
-    // table created for this subscription
-    private Promise<JsTable> copy;
+    private final JsArray<Column> columns;
+    private final Double updateIntervalMs;
 
-    // copy from the initially given table so we don't need to way
     @JsIgnore
     public TableSubscription(JsArray<Column> columns, JsTable existingTable, Double updateIntervalMs) {
-
-        copy = existingTable.copy(false).then(table -> new Promise<>((resolve, reject) -> {
-            table.state().onRunning(newState -> {
-                // TODO handle updateInterval core#188
-                table.internalSubscribe(columns, this);
-
-                resolve.onInvoke(table);
-            }, table::close);
-        }));
-
+        super(SubscriptionType.FULL_SUBSCRIPTION, existingTable.state(), existingTable.getConnection());
         this.columns = columns;
-        Integer rowStyleColumn = existingTable.state().getRowFormatColumn() == null ? NO_ROW_FORMAT_COLUMN
-                : existingTable.state().getRowFormatColumn().getIndex();
-        this.data = new SubscriptionTableData(columns, rowStyleColumn, this);
-
-    }
-
-    // public void changeSubscription(JsArray<Column> columns) {
-    // copy.then(t ->{
-    // t.internalSubscribe(columns, this);
-    // return Promise.resolve(t);
-    // });
-    // this.columns = columns;
-    // }
-
-
-    @JsIgnore
-    public void handleSnapshot(TableSnapshot snapshot) {
-        data.handleSnapshot(snapshot);
+        this.updateIntervalMs = updateIntervalMs;
     }
 
-    @JsIgnore
-    public void handleDelta(DeltaUpdates delta) {
-        data.handleDelta(delta);
+    @Override
+    protected void sendFirstSubscriptionRequest() {
+        changeSubscription(columns, updateIntervalMs);
     }
 
     /**
-     * The columns that were subscribed to when this subscription was created
+     * Updates the subscription to use the given columns and update interval.
      * 
-     * @return {@link Column}
+     * @param columns the new columns to subscribe to
+     * @param updateIntervalMs the new update interval, or null/omit to use the default of one second
      */
-    @JsProperty
-    public JsArray<Column> getColumns() {
-        return columns;
+    public void changeSubscription(JsArray<Column> columns, @JsNullable Double updateIntervalMs) {
+        if (updateIntervalMs != null && !updateIntervalMs.equals(this.updateIntervalMs)) {
+            throw new IllegalArgumentException(
+                    "Can't change refreshIntervalMs on a later call to setViewport, it must be consistent or omitted");
+        }
+        sendBarrageSubscriptionRequest(null, columns, updateIntervalMs, false);
     }
 
-    /**
-     * Stops the subscription on the server.
-     */
-    public void close() {
-        copy.then(table -> {
-            table.close();
-            return Promise.resolve(table);
-        });
+    @JsProperty
+    @Override
+    public JsArray<Column> getColumns() {
+        return super.getColumns();
     }
 }
diff --git a/web/client-api/src/main/java/io/deephaven/web/client/api/subscription/TableViewportSubscription.java b/web/client-api/src/main/java/io/deephaven/web/client/api/subscription/TableViewportSubscription.java
index d567fbd3094..e9f1bd53233 100644
--- a/web/client-api/src/main/java/io/deephaven/web/client/api/subscription/TableViewportSubscription.java
+++ b/web/client-api/src/main/java/io/deephaven/web/client/api/subscription/TableViewportSubscription.java
@@ -3,189 +3,226 @@
 //
 package io.deephaven.web.client.api.subscription;
 
-import com.vertispan.tsdefs.annotations.TsInterface;
+import com.google.flatbuffers.FlatBufferBuilder;
 import com.vertispan.tsdefs.annotations.TsName;
-import elemental2.core.Uint8Array;
-import elemental2.dom.CustomEvent;
-import elemental2.dom.CustomEventInit;
-import elemental2.dom.DomGlobal;
-import elemental2.promise.IThenable;
+import com.vertispan.tsdefs.annotations.TsTypeRef;
+import elemental2.core.JsArray;
 import elemental2.promise.Promise;
-import io.deephaven.javascript.proto.dhinternal.arrow.flight.flatbuf.message_generated.org.apache.arrow.flatbuf.Message;
-import io.deephaven.javascript.proto.dhinternal.arrow.flight.flatbuf.message_generated.org.apache.arrow.flatbuf.MessageHeader;
-import io.deephaven.javascript.proto.dhinternal.arrow.flight.flatbuf.message_generated.org.apache.arrow.flatbuf.RecordBatch;
+import io.deephaven.barrage.flatbuf.BarrageMessageType;
+import io.deephaven.barrage.flatbuf.BarrageSnapshotRequest;
+import io.deephaven.extensions.barrage.BarrageSnapshotOptions;
 import io.deephaven.javascript.proto.dhinternal.arrow.flight.protocol.flight_pb.FlightData;
-import io.deephaven.javascript.proto.dhinternal.flatbuffers.Builder;
-import io.deephaven.javascript.proto.dhinternal.flatbuffers.ByteBuffer;
-import io.deephaven.javascript.proto.dhinternal.io.deephaven.barrage.flatbuf.barrage_generated.io.deephaven.barrage.flatbuf.BarrageMessageType;
-import io.deephaven.javascript.proto.dhinternal.io.deephaven.barrage.flatbuf.barrage_generated.io.deephaven.barrage.flatbuf.BarrageMessageWrapper;
-import io.deephaven.javascript.proto.dhinternal.io.deephaven.barrage.flatbuf.barrage_generated.io.deephaven.barrage.flatbuf.BarrageSnapshotOptions;
-import io.deephaven.javascript.proto.dhinternal.io.deephaven.barrage.flatbuf.barrage_generated.io.deephaven.barrage.flatbuf.BarrageSnapshotRequest;
-import io.deephaven.javascript.proto.dhinternal.io.deephaven.barrage.flatbuf.barrage_generated.io.deephaven.barrage.flatbuf.BarrageUpdateMetadata;
-import io.deephaven.javascript.proto.dhinternal.io.deephaven.barrage.flatbuf.barrage_generated.io.deephaven.barrage.flatbuf.ColumnConversionMode;
-import io.deephaven.web.client.api.Callbacks;
+import io.deephaven.javascript.proto.dhinternal.io.deephaven.proto.config_pb.ConfigValue;
+import io.deephaven.javascript.proto.dhinternal.io.deephaven.proto.table_pb.FlattenRequest;
+import io.deephaven.util.mutable.MutableLong;
 import io.deephaven.web.client.api.Column;
-import io.deephaven.web.client.api.HasEventHandling;
 import io.deephaven.web.client.api.JsRangeSet;
 import io.deephaven.web.client.api.JsTable;
 import io.deephaven.web.client.api.TableData;
 import io.deephaven.web.client.api.WorkerConnection;
+import io.deephaven.web.client.api.barrage.WebBarrageMessage;
+import io.deephaven.web.client.api.barrage.WebBarrageStreamReader;
 import io.deephaven.web.client.api.barrage.WebBarrageUtils;
-import io.deephaven.web.client.api.barrage.def.ColumnDefinition;
+import io.deephaven.web.client.api.barrage.data.WebBarrageSubscription;
 import io.deephaven.web.client.api.barrage.stream.BiDiStream;
+import io.deephaven.web.client.api.event.Event;
 import io.deephaven.web.client.fu.JsLog;
+import io.deephaven.web.client.fu.LazyPromise;
 import io.deephaven.web.client.state.ClientTableState;
 import io.deephaven.web.shared.data.Range;
-import io.deephaven.web.shared.data.TableSnapshot;
+import io.deephaven.web.shared.data.RangeSet;
+import io.deephaven.web.shared.data.ShiftedRange;
+import io.deephaven.web.shared.fu.RemoverFn;
 import jsinterop.annotations.JsMethod;
 import jsinterop.annotations.JsNullable;
 import jsinterop.annotations.JsOptional;
 import jsinterop.base.Js;
+import jsinterop.base.JsPropertyMap;
 
+import java.io.IOException;
 import java.util.Arrays;
-import java.util.BitSet;
 import java.util.Collections;
-import java.util.Iterator;
+import java.util.Comparator;
+import java.util.PrimitiveIterator;
 
-import static io.deephaven.web.client.api.barrage.WebBarrageUtils.makeUint8ArrayFromBitset;
+import static io.deephaven.web.client.api.JsTable.EVENT_ROWADDED;
+import static io.deephaven.web.client.api.JsTable.EVENT_ROWREMOVED;
+import static io.deephaven.web.client.api.JsTable.EVENT_ROWUPDATED;
 import static io.deephaven.web.client.api.barrage.WebBarrageUtils.serializeRanges;
-import static io.deephaven.web.client.api.subscription.ViewportData.NO_ROW_FORMAT_COLUMN;
 
 /**
- * Encapsulates event handling around table subscriptions by "cheating" and wrapping up a JsTable instance to do the
- * real dirty work. This allows a viewport to stay open on the old table if desired, while this one remains open.
- * <p>
- * As this just wraps a JsTable (and thus a CTS), it holds its own flattened, pUT'd handle to get deltas from the
- * server. The setViewport method can be used to adjust this table instead of creating a new one.
- * <p>
- * Existing methods on JsTable like setViewport and getViewportData are intended to proxy to this, which then will talk
- * to the underlying handle and accumulated data.
- * <p>
- * As long as we keep the existing methods/events on JsTable, close() is not required if no other method is called, with
- * the idea then that the caller did not actually use this type. This means that for every exported method (which then
- * will mark the instance of "actually being used, please don't automatically close me"), there must be an internal
- * version called by those existing JsTable method, which will allow this instance to be cleaned up once the JsTable
- * deems it no longer in use.
- * <p>
- * Note that if the caller does close an instance, this shuts down the JsTable's use of this (while the converse is not
- * true), providing a way to stop the server from streaming updates to the client.
- *
  * This object serves as a "handle" to a subscription, allowing it to be acted on directly or canceled outright. If you
  * retain an instance of this, you have two choices - either only use it to call `close()` on it to stop the table's
  * viewport without creating a new one, or listen directly to this object instead of the table for data events, and
  * always call `close()` when finished. Calling any method on this object other than close() will result in it
  * continuing to live on after `setViewport` is called on the original table, or after the table is modified.
  */
-@TsInterface
 @TsName(namespace = "dh")
-public class TableViewportSubscription extends HasEventHandling {
-    /**
-     * Describes the possible lifecycle of the viewport as far as anything external cares about it
-     */
-    public enum Status {
-        /**
-         * Waiting for some prerequisite before we can begin, usually waiting to make sure the original table is ready
-         * to be subscribed to. Once the original table is ready, we will enter the ACTIVE state, even if the first
-         * update hasn't yet arrived.
-         */
-        STARTING,
-        /**
-         * Successfully created, viewport is at least begun on the server, updates are subscribed and if changes happen
-         * on the server, we will be notified.
-         */
-        ACTIVE,
-        /**
-         * Closed or otherwise dead, can not be used again.
-         */
-        DONE
-    }
+public class TableViewportSubscription extends AbstractTableSubscription {
 
-    private final double refresh;
+    private double firstRow;
+    private double lastRow;
+    private Column[] columns;
+    private double refresh;
 
     private final JsTable original;
-    private final ClientTableState originalState;
-    private final Promise<JsTable> copy;
-    private JsTable realized;
+    private final RemoverFn reconnectSubscription;
 
-    private boolean retained;// if the sub is set up to not close the underlying table once the original table is done
-                             // with it
+    /** The initial state of the provided table, before flattening. */
+    private final ClientTableState initialState;
+
+    /**
+     * true if the sub is set up to not close the underlying table once the original table is done with it, otherwise
+     * false.
+     */
     private boolean originalActive = true;
+    /**
+     * true if the developer has called methods directly on the subscription, otherwise false.
+     */
+    private boolean retained;
+
+    private UpdateEventData viewportData;
+
+    public static TableViewportSubscription make(double firstRow, double lastRow, Column[] columns,
+            Double updateIntervalMs, JsTable existingTable) {
+        ClientTableState tableState = existingTable.state();
+        WorkerConnection connection = existingTable.getConnection();
+
+        final ClientTableState stateToSubscribe;
+        ConfigValue flattenViewport = connection.getServerConfigValue("web.flattenViewports");
+        if (flattenViewport != null && flattenViewport.hasStringValue()
+                && "true".equalsIgnoreCase(flattenViewport.getStringValue())) {
+            stateToSubscribe = connection.newState((callback, newState, metadata) -> {
+                FlattenRequest flatten = new FlattenRequest();
+                flatten.setSourceId(tableState.getHandle().makeTableReference());
+                flatten.setResultId(newState.getHandle().makeTicket());
+                connection.tableServiceClient().flatten(flatten, metadata, callback::apply);
+            }, "flatten");
+            stateToSubscribe.refetch(null, connection.metadata()).then(result -> null, err -> null);
+        } else {
+            stateToSubscribe = tableState;
+        }
 
-    private Status status = Status.STARTING;
+        TableViewportSubscription sub = new TableViewportSubscription(stateToSubscribe, connection, existingTable);
+        sub.setInternalViewport(firstRow, lastRow, columns, updateIntervalMs, false);
+        return sub;
+    }
 
-    public TableViewportSubscription(double firstRow, double lastRow, Column[] columns, Double updateIntervalMs,
-            JsTable existingTable) {
-        refresh = updateIntervalMs == null ? 1000.0 : updateIntervalMs;
-        // first off, copy the table, and flatten/pUT it, then apply the new viewport to that
+    public TableViewportSubscription(ClientTableState state, WorkerConnection connection, JsTable existingTable) {
+        super(SubscriptionType.VIEWPORT_SUBSCRIPTION, state, connection);
         this.original = existingTable;
-        this.originalState = original.state();
-        copy = existingTable.copy(false).then(table -> new Promise<>((resolve, reject) -> {
-            // Wait until the state is running to copy it
-            originalState.onRunning(newState -> {
-                if (this.status == Status.DONE) {
-                    JsLog.debug("TableViewportSubscription closed before originalState.onRunning completed, ignoring");
-                    table.close();
-                    return;
-                }
-                table.batch(batcher -> {
-                    batcher.customColumns(newState.getCustomColumns());
-                    batcher.filter(newState.getFilters());
-                    batcher.sort(newState.getSorts());
 
-                    batcher.setFlat(true);
-                });
-                // TODO handle updateInterval core#188
-                Column[] columnsToSub = table.isBlinkTable() ? Js.uncheckedCast(table.getColumns()) : columns;
-                table.setInternalViewport(firstRow, lastRow, columnsToSub);
-
-                // Listen for events and refire them on ourselves, optionally on the original table
-                table.addEventListener(JsTable.EVENT_UPDATED, this::refire);
-                table.addEventListener(JsTable.EVENT_ROWADDED, this::refire);
-                table.addEventListener(JsTable.EVENT_ROWREMOVED, this::refire);
-                table.addEventListener(JsTable.EVENT_ROWUPDATED, this::refire);
-                table.addEventListener(JsTable.EVENT_SIZECHANGED, this::refire);
-                // TODO (core#1181): fix this hack that enables barrage errors to propagate to the UI widget
-                table.addEventListener(JsTable.EVENT_REQUEST_FAILED, this::refire);
-
-                // Take over for the "parent" table
-                // Cache original table size so we can tell if we need to notify about a change
-                double originalSize = newState.getSize();
-                realized = table;
-                status = Status.ACTIVE;
-                // At this point we're now responsible for notifying of size changes, since we will shortly have a
-                // viewport,
-                // a more precise way to track the table size (at least w.r.t. the range of the viewport), so if there
-                // is any difference in size between "realized" and "original", notify now to finish the transition.
-                if (realized.getSize() != originalSize) {
-                    JsLog.debug(
-                            "firing size changed to transition between table managing its own size changes and viewport sub taking over",
-                            realized.getSize());
-                    CustomEventInit init = CustomEventInit.create();
-                    init.setDetail(realized.getSize());
-                    refire(new CustomEvent(JsTable.EVENT_SIZECHANGED, init));
+        initialState = existingTable.state();
+        this.reconnectSubscription = existingTable.addEventListener(JsTable.EVENT_RECONNECT, e -> {
+            if (existingTable.state() == initialState) {
+                revive();
+            }
+        });
+    }
+
+    // Expose this as public
+    @Override
+    public void revive() {
+        super.revive();
+    }
+
+    @Override
+    protected void sendFirstSubscriptionRequest() {
+        setInternalViewport(firstRow, lastRow, columns, refresh, null);
+    }
+
+    @Override
+    protected void notifyUpdate(RangeSet rowsAdded, RangeSet rowsRemoved, RangeSet totalMods, ShiftedRange[] shifted) {
+        // viewport subscriptions are sometimes required to notify of size change events
+        if (rowsAdded.size() != rowsRemoved.size() && originalActive) {
+            fireEvent(JsTable.EVENT_SIZECHANGED, size());
+        }
+        UpdateEventData detail = new ViewportEventData(barrageSubscription, rowStyleColumn, getColumns(), rowsAdded,
+                rowsRemoved, totalMods, shifted);
+
+        detail.setOffset(this.viewportRowSet.getFirstRow());
+        this.viewportData = detail;
+        refire(new Event<>(EVENT_UPDATED, detail));
+
+        if (hasListeners(EVENT_ROWADDED) || hasListeners(EVENT_ROWREMOVED) || hasListeners(EVENT_ROWUPDATED)) {
+            RangeSet modifiedCopy = totalMods.copy();
+            // exclude added items from being marked as modified, since we're hiding shifts from api consumers
+            modifiedCopy.removeRangeSet(rowsAdded);
+            RangeSet removedCopy = rowsRemoved.copy();
+            RangeSet addedCopy = rowsAdded.copy();
+
+            // Any position which was both added and removed should instead be marked as modified, this cleans
+            // up anything excluded above that didn't otherwise make sense
+            for (PrimitiveIterator.OfLong it = removedCopy.indexIterator(); it.hasNext();) {
+                long index = it.nextLong();
+                if (addedCopy.contains(index)) {
+                    addedCopy.removeRange(new Range(index, index));
+                    it.remove();
+                    modifiedCopy.addRange(new Range(index, index));
                 }
+            }
 
-                resolve.onInvoke(table);
-            }, table::close);
-        }));
+            fireLegacyEventOnRowsetEntries(EVENT_ROWADDED, detail, rowsAdded);
+            fireLegacyEventOnRowsetEntries(EVENT_ROWUPDATED, detail, totalMods);
+            fireLegacyEventOnRowsetEntries(EVENT_ROWREMOVED, detail, rowsRemoved);
+        }
     }
 
-    /**
-     * Reflects the state of the original table, before being flattened.
-     */
-    public ClientTableState state() {
-        return originalState;
+    private void fireLegacyEventOnRowsetEntries(String eventName, UpdateEventData updateEventData, RangeSet rowset) {
+        if (hasListeners(eventName)) {
+            rowset.indexIterator().forEachRemaining((long row) -> {
+                JsPropertyMap<?> detail = wrap((SubscriptionRow) updateEventData.getRows().getAt((int) row), (int) row);
+                fireEvent(eventName, detail);
+            });
+        }
+    }
+
+    private static JsPropertyMap<?> wrap(SubscriptionRow rowObj, int row) {
+        return JsPropertyMap.of("row", rowObj, "index", (double) row);
+    }
+
+    @Override
+    public void fireEvent(String type) {
+        refire(new Event<>(type, null));
     }
 
-    private <T> void refire(CustomEvent<T> e) {
-        this.fireEvent(e.type, e);
-        if (originalActive && state() == original.state()) {
+    @Override
+    public <T> void fireEvent(String type, T detail) {
+        refire(new Event<T>(type, detail));
+    }
+
+    @Override
+    public <T> void fireEvent(Event<T> e) {
+        refire(e);
+    }
+
+    @Override
+    public boolean hasListeners(String name) {
+        if (originalActive && initialState == original.state()) {
+            if (original.hasListeners(name)) {
+                return true;
+            }
+        }
+        return super.hasListeners(name);
+    }
+
+    /**
+     * Utility to fire an event on this object and also optionally on the parent if still active. All {@code fireEvent}
+     * overloads dispatch to this.
+     *
+     * @param e the event to fire
+     * @param <T> the type of the custom event data
+     */
+    private <T> void refire(Event<T> e) {
+        // explicitly calling super.fireEvent to avoid calling ourselves recursively
+        super.fireEvent(e);
+        if (originalActive && initialState == original.state()) {
             // When these fail to match, it probably means that the original's state was paused, but we're still
             // holding on to it. Since we haven't been internalClose()d yet, that means we're still waiting for
             // the new state to resolve or fail, so we can be restored, or stopped. In theory, we should put this
             // assert back, and make the pause code also tell us to pause.
-            // assert state() == original.state() : "Table owning this viewport subscription forgot to release it";
-            original.fireEvent(e.type, e);
+            // assert initialState == original.state() : "Table owning this viewport subscription forgot to release it";
+            original.fireEvent(e);
         }
     }
 
@@ -203,23 +240,41 @@ private void retainForExternalUse() {
      */
     @JsMethod
     public void setViewport(double firstRow, double lastRow, @JsOptional @JsNullable Column[] columns,
-            @JsOptional @JsNullable Double updateIntervalMs) {
+            @JsOptional @JsNullable Double updateIntervalMs,
+            @JsOptional @JsNullable Boolean isReverseViewport) {
         retainForExternalUse();
-        setInternalViewport(firstRow, lastRow, columns, updateIntervalMs);
+        setInternalViewport(firstRow, lastRow, columns, updateIntervalMs, isReverseViewport);
     }
 
-    public void setInternalViewport(double firstRow, double lastRow, Column[] columns, Double updateIntervalMs) {
+    public void setInternalViewport(double firstRow, double lastRow, Column[] columns, Double updateIntervalMs,
+            Boolean isReverseViewport) {
+        // Until we've created the stream, we just cache the requested viewport
+        if (status == Status.STARTING) {
+            this.firstRow = firstRow;
+            this.lastRow = lastRow;
+            this.columns = columns;
+            this.refresh = updateIntervalMs == null ? 1000.0 : updateIntervalMs;
+            return;
+        }
+        if (columns == null) {
+            // Null columns means the user wants all columns, only supported on viewports. This can't be done until the
+            // CTS has resolved
+            columns = state().getColumns();
+        } else {
+            // If columns were provided, sort a copy so that we have them in the expected order
+            columns = Js.<JsArray<Column>>uncheckedCast(columns).slice().asArray(new Column[0]);
+            Arrays.sort(columns, Comparator.comparing(Column::getIndex));
+        }
         if (updateIntervalMs != null && refresh != updateIntervalMs) {
             throw new IllegalArgumentException(
                     "Can't change refreshIntervalMs on a later call to setViewport, it must be consistent or omitted");
         }
-        copy.then(table -> {
-            if (!table.isBlinkTable()) {
-                // we only set blink table viewports once; and that's in the constructor
-                table.setInternalViewport(firstRow, lastRow, columns);
-            }
-            return Promise.resolve(table);
-        });
+        if (isReverseViewport == null) {
+            isReverseViewport = false;
+        }
+        RangeSet viewport = RangeSet.ofRange((long) firstRow, (long) lastRow);
+        this.sendBarrageSubscriptionRequest(viewport, Js.uncheckedCast(columns), updateIntervalMs,
+                isReverseViewport);
     }
 
     /**
@@ -227,10 +282,12 @@ public void setInternalViewport(double firstRow, double lastRow, Column[] column
      */
     @JsMethod
     public void close() {
-        if (status == Status.DONE) {
+        if (isClosed()) {
             JsLog.warn("TableViewportSubscription.close called on subscription that's already done.");
         }
         retained = false;
+
+        // Instead of calling super.close(), we delegate to internalClose()
         internalClose();
     }
 
@@ -242,21 +299,15 @@ public void internalClose() {
         // indicate that the base table shouldn't get events anymore, even if it is still retained elsewhere
         originalActive = false;
 
-        if (retained || status == Status.DONE) {
+        reconnectSubscription.remove();
+
+        if (retained || isClosed()) {
             // the JsTable has indicated it is no longer interested in this viewport, but other calling
             // code has retained it, keep it open for now.
             return;
         }
 
-        status = Status.DONE;
-
-        // not retained externally, and the original is inactive, mark as "not realized"
-        realized = null;
-
-        copy.then(table -> {
-            table.close();
-            return Promise.resolve(table);
-        });
+        super.close();
     }
 
     /**
@@ -265,149 +316,117 @@ public void internalClose() {
      * @return Promise of {@link TableData}.
      */
     @JsMethod
-    public Promise<TableData> getViewportData() {
+    public Promise<@TsTypeRef(ViewportData.class) UpdateEventData> getViewportData() {
         retainForExternalUse();
         return getInternalViewportData();
     }
 
-    public Promise<TableData> getInternalViewportData() {
-        return copy.then(JsTable::getInternalViewportData);
-    }
-
-    public Status getStatus() {
-        if (realized == null) {
-            assert status != Status.ACTIVE
-                    : "when the realized table is null, status should only be DONE or STARTING, instead is " + status;
-        } else {
-            if (realized.isAlive()) {
-                assert status == Status.ACTIVE
-                        : "realized table is alive, expected status ACTIVE, instead is " + status;
-            } else {
-                assert status == Status.DONE : "realized table is closed, expected status DONE, instead is " + status;
-            }
+    public Promise<@TsTypeRef(ViewportData.class) UpdateEventData> getInternalViewportData() {
+        if (isSubscriptionReady()) {
+            return Promise.resolve(viewportData);
         }
-
-        return status;
-    }
-
-    public double size() {
-        assert getStatus() == Status.ACTIVE;
-        return realized.getSize();
-    }
-
-    public double totalSize() {
-        assert getStatus() == Status.ACTIVE;
-        return realized.getTotalSize();
+        final LazyPromise<UpdateEventData> promise = new LazyPromise<>();
+        addEventListenerOneShot(EVENT_UPDATED, ignored -> promise.succeed(viewportData));
+        return promise.asPromise();
     }
 
     @JsMethod
     public Promise<TableData> snapshot(JsRangeSet rows, Column[] columns) {
         retainForExternalUse();
         // TODO #1039 slice rows and drop columns
-        return copy.then(table -> {
-            final ClientTableState state = table.lastVisibleState();
-            String[] columnTypes = Arrays.stream(state.getTableDef().getColumns())
-                    .map(ColumnDefinition::getType)
-                    .toArray(String[]::new);
-
-            final BitSet columnBitset = table.lastVisibleState().makeBitset(columns);
-            return Callbacks.<TableSnapshot, String>promise(this, callback -> {
-                WorkerConnection connection = table.getConnection();
-                BiDiStream<FlightData, FlightData> stream = connection.<FlightData, FlightData>streamFactory().create(
-                        headers -> connection.flightServiceClient().doExchange(headers),
-                        (first, headers) -> connection.browserFlightServiceClient().openDoExchange(first, headers),
-                        (next, headers, c) -> connection.browserFlightServiceClient().nextDoExchange(next, headers,
-                                c::apply),
-                        new FlightData());
-
-                Builder doGetRequest = new Builder(1024);
-                double columnsOffset = BarrageSnapshotRequest.createColumnsVector(doGetRequest,
-                        makeUint8ArrayFromBitset(columnBitset));
-                double viewportOffset = BarrageSnapshotRequest.createViewportVector(doGetRequest, serializeRanges(
-                        Collections.singleton(rows.getRange())));
-                double serializationOptionsOffset = BarrageSnapshotOptions
-                        .createBarrageSnapshotOptions(doGetRequest, ColumnConversionMode.Stringify, true, 0, 0);
-                double tableTicketOffset =
-                        BarrageSnapshotRequest.createTicketVector(doGetRequest, state.getHandle().getTicket());
-                BarrageSnapshotRequest.startBarrageSnapshotRequest(doGetRequest);
-                BarrageSnapshotRequest.addTicket(doGetRequest, tableTicketOffset);
-                BarrageSnapshotRequest.addColumns(doGetRequest, columnsOffset);
-                BarrageSnapshotRequest.addSnapshotOptions(doGetRequest, serializationOptionsOffset);
-                BarrageSnapshotRequest.addViewport(doGetRequest, viewportOffset);
-                doGetRequest.finish(BarrageSnapshotRequest.endBarrageSnapshotRequest(doGetRequest));
-
-                FlightData request = new FlightData();
-                request.setAppMetadata(
-                        WebBarrageUtils.wrapMessage(doGetRequest, BarrageMessageType.BarrageSnapshotRequest));
-                stream.send(request);
-                stream.end();
-                stream.onData(flightData -> {
-
-                    Message message = Message.getRootAsMessage(new ByteBuffer(flightData.getDataHeader_asU8()));
-                    if (message.headerType() == MessageHeader.Schema) {
-                        // ignore for now, we'll handle this later
-                        return;
-                    }
-                    assert message.headerType() == MessageHeader.RecordBatch;
-                    RecordBatch header = message.header(new RecordBatch());
-                    Uint8Array appMetadataBytes = flightData.getAppMetadata_asU8();
-                    BarrageUpdateMetadata update = null;
-                    if (appMetadataBytes.length != 0) {
-                        BarrageMessageWrapper barrageMessageWrapper =
-                                BarrageMessageWrapper.getRootAsBarrageMessageWrapper(
-                                        new io.deephaven.javascript.proto.dhinternal.flatbuffers.ByteBuffer(
-                                                appMetadataBytes));
-
-                        update = BarrageUpdateMetadata.getRootAsBarrageUpdateMetadata(
-                                new ByteBuffer(
-                                        new Uint8Array(barrageMessageWrapper.msgPayloadArray())));
-                    }
-                    TableSnapshot snapshot = WebBarrageUtils.createSnapshot(header,
-                            WebBarrageUtils.typedArrayToLittleEndianByteBuffer(flightData.getDataBody_asU8()), update,
-                            true,
-                            columnTypes);
-
-                    // TODO deephaven-core(#188) this check no longer makes sense
-                    Iterator<Range> rangeIterator = rows.getRange().rangeIterator();
-                    long expectedCount = 0;
-                    while (rangeIterator.hasNext()) {
-                        Range range = rangeIterator.next();
-                        if (range.getFirst() >= snapshot.getTableSize()) {
-                            break;
-                        }
-                        long end = Math.min(range.getLast(), snapshot.getTableSize());
-                        expectedCount += end - range.getFirst() + 1;
+        BarrageSnapshotOptions options = BarrageSnapshotOptions.builder()
+                .batchSize(WebBarrageSubscription.BATCH_SIZE)
+                .maxMessageSize(WebBarrageSubscription.MAX_MESSAGE_SIZE)
+                .useDeephavenNulls(true)
+                .build();
+
+        WebBarrageSubscription snapshot = WebBarrageSubscription.subscribe(
+                SubscriptionType.SNAPSHOT, state(),
+                (serverViewport1, serverColumns, serverReverseViewport) -> {
+                },
+                (rowsAdded, rowsRemoved, totalMods, shifted, modifiedColumnSet) -> {
+                });
+
+        WebBarrageStreamReader reader = new WebBarrageStreamReader();
+        return new Promise<>((resolve, reject) -> {
+
+            BiDiStream<FlightData, FlightData> doExchange = connection().<FlightData, FlightData>streamFactory().create(
+                    headers -> connection().flightServiceClient().doExchange(headers),
+                    (first, headers) -> connection().browserFlightServiceClient().openDoExchange(first, headers),
+                    (next, headers, c) -> connection().browserFlightServiceClient().nextDoExchange(next, headers,
+                            c::apply),
+                    new FlightData());
+            MutableLong rowsReceived = new MutableLong(0);
+            doExchange.onData(data -> {
+                WebBarrageMessage message;
+                try {
+                    message = reader.parseFrom(options, state().chunkTypes(), state().columnTypes(),
+                            state().componentTypes(), data);
+                } catch (IOException e) {
+                    throw new RuntimeException(e);
+                }
+                if (message != null) {
+                    // Replace rowsets with flat versions
+                    long resultSize = message.rowsIncluded.size();
+                    if (resultSize != 0) {
+                        message.rowsAdded = RangeSet.ofRange(rowsReceived.get(), rowsReceived.get() + resultSize - 1);
+                        message.rowsIncluded = message.rowsAdded;
+                        message.snapshotRowSet = null;
+                        rowsReceived.add(resultSize);
                     }
-                    if (expectedCount != snapshot.getIncludedRows().size()) {
-                        callback.onFailure("Server did not send expected number of rows, expected " + expectedCount
-                                + ", actual " + snapshot.getIncludedRows().size());
+
+                    // Update our table data with the complete message
+                    snapshot.applyUpdates(message);
+                }
+            });
+            FlightData payload = new FlightData();
+            final FlatBufferBuilder metadata = new FlatBufferBuilder();
+
+            int colOffset = 0;
+            if (columns != null) {
+                colOffset =
+                        BarrageSnapshotRequest.createColumnsVector(metadata, state().makeBitset(columns).toByteArray());
+            }
+            int vpOffset = BarrageSnapshotRequest.createViewportVector(metadata,
+                    serializeRanges(Collections.singleton(rows.getRange())));
+            int optOffset = 0;
+            if (options != null) {
+                optOffset = options.appendTo(metadata);
+            }
+
+            final int ticOffset = BarrageSnapshotRequest.createTicketVector(metadata,
+                    Js.<byte[]>uncheckedCast(state().getHandle().getTicket()));
+            BarrageSnapshotRequest.startBarrageSnapshotRequest(metadata);
+            BarrageSnapshotRequest.addColumns(metadata, colOffset);
+            BarrageSnapshotRequest.addViewport(metadata, vpOffset);
+            BarrageSnapshotRequest.addSnapshotOptions(metadata, optOffset);
+            BarrageSnapshotRequest.addTicket(metadata, ticOffset);
+            BarrageSnapshotRequest.addReverseViewport(metadata, false);
+            metadata.finish(BarrageSnapshotRequest.endBarrageSnapshotRequest(metadata));
+
+            payload.setAppMetadata(WebBarrageUtils.wrapMessage(metadata, BarrageMessageType.BarrageSnapshotRequest));
+            doExchange.onEnd(status -> {
+                if (status.isOk()) {
+                    // notify the caller that the snapshot is finished
+                    RangeSet result;
+                    if (rowsReceived.get() != 0) {
+                        result = RangeSet.ofRange(0, rowsReceived.get() - 1);
                     } else {
-                        callback.onSuccess(snapshot);
-                    }
-                });
-                stream.onStatus(status -> {
-                    if (!status.isOk()) {
-                        callback.onFailure(status.getDetails());
+                        result = RangeSet.empty();
                     }
-                });
-            }).then(defer()).then(snapshot -> {
-                SubscriptionTableData pretendSubscription = new SubscriptionTableData(Js.uncheckedCast(columns),
-                        state.getRowFormatColumn() == null ? NO_ROW_FORMAT_COLUMN
-                                : state.getRowFormatColumn().getIndex(),
-                        null);
-                TableData data = pretendSubscription.handleSnapshot(snapshot);
-                return Promise.resolve(data);
-            }).then(defer());
-        });
-    }
+                    resolve.onInvoke(new SubscriptionEventData(snapshot, rowStyleColumn, Js.uncheckedCast(columns),
+                            result,
+                            RangeSet.empty(),
+                            RangeSet.empty(),
+                            null));
+                } else {
+                    reject.onInvoke(status);
+                }
+            });
+
+            doExchange.send(payload);
+            doExchange.end();
 
-    /**
-     * Instead of a micro-task between chained promises, insert a regular task so that control is returned to the
-     * browser long enough to prevent the UI hanging.
-     */
-    private <T> IThenable.ThenOnFulfilledCallbackFn<T, T> defer() {
-        return val -> new Promise<>((resolve, reject) -> {
-            DomGlobal.setTimeout(ignoreArgs -> resolve.onInvoke(val), 0);
         });
     }
 }
diff --git a/web/client-api/src/main/java/io/deephaven/web/client/api/subscription/ViewportData.java b/web/client-api/src/main/java/io/deephaven/web/client/api/subscription/ViewportData.java
index 3ca96d1ed2e..04831819539 100644
--- a/web/client-api/src/main/java/io/deephaven/web/client/api/subscription/ViewportData.java
+++ b/web/client-api/src/main/java/io/deephaven/web/client/api/subscription/ViewportData.java
@@ -3,558 +3,48 @@
 //
 package io.deephaven.web.client.api.subscription;
 
-import com.vertispan.tsdefs.annotations.TsInterface;
-import com.vertispan.tsdefs.annotations.TsName;
+import com.vertispan.tsdefs.annotations.TsTypeRef;
 import elemental2.core.JsArray;
-import elemental2.core.JsObject;
-import io.deephaven.web.client.api.*;
-import io.deephaven.web.shared.data.*;
-import jsinterop.annotations.JsFunction;
+import io.deephaven.web.client.api.TableData;
 import jsinterop.annotations.JsProperty;
-import jsinterop.base.Any;
-import jsinterop.base.Js;
-import jsinterop.base.JsArrayLike;
-
-import java.math.BigDecimal;
-import java.math.BigInteger;
-import java.util.HashSet;
-import java.util.Iterator;
-import java.util.PrimitiveIterator.OfLong;
-import java.util.Set;
+import jsinterop.annotations.JsType;
 
 /**
- * Contains data in the current viewport. Also contains the offset to this data, so that the actual row number may be
- * determined. Do not assume that the first row in `rows` is the first visible row, because extra rows may be provided
- * for easier scrolling without going to the server.
+ * Extends {@link TableData}, but only contains data in the current viewport. The only API change from TableData is that
+ * ViewportData also contains the offset to this data, so that the actual row number may be determined.
+ * <p>
+ * For viewport subscriptions, it is not necessary to read with the key, only with the position.
+ * <p>
+ * Do not assume that the first row in `rows` is the first visible row, because extra rows may be provided for easier
+ * scrolling without going to the server.
  */
-@TsInterface
-@TsName(namespace = "dh")
-public class ViewportData implements TableData {
-    private static final Any NULL_SENTINEL = Js.asAny(new JsObject());
+@JsType(namespace = "dh")
+public interface ViewportData extends TableData {
 
     /**
-     * Clean the data at the provided index
-     */
-    @JsFunction
-    private interface DataCleaner {
-        void clean(JsArray<Any> data, int index);
-    }
-
-    public static final int NO_ROW_FORMAT_COLUMN = -1;
-
-    public class MergeResults {
-        public Set<Integer> added = new HashSet<>();
-        public Set<Integer> modified = new HashSet<>();
-        public Set<Integer> removed = new HashSet<>();
-    }
-
-    private long offset;
-    private int length;
-    private final int maxLength;
-    private JsArray<ViewportRow> rows;
-    private final JsArray<Column> columns;
-
-    private final Object[] data;
-
-    private final int rowFormatColumn;
-
-    public ViewportData(RangeSet includedRows, Object[] dataColumns, JsArray<Column> columns, int rowFormatColumn,
-            long maxLength) {
-        assert maxLength <= Integer.MAX_VALUE;
-        this.maxLength = (int) maxLength;
-
-        Iterator<Range> rangeIterator = includedRows.rangeIterator();
-        data = new Object[dataColumns.length];
-        if (rangeIterator.hasNext()) {
-            Range range = rangeIterator.next();
-            assert !rangeIterator.hasNext() : "Snapshot only supports one range";
-
-            offset = range.getFirst();
-            length = (int) (range.getLast() - range.getFirst() + 1);
-            assert length == range.size();
-        } else {
-            offset = -1;
-        }
-
-        // Clean data for requested columns, and provide format column data as well, if any
-        for (int i = 0; i < columns.length; i++) {
-            Column c = columns.getAt(i);
-            int index = c.getIndex();
-            if (dataColumns[index] == null) {
-                // no data for this column, not requested in viewport
-                continue;
-            }
-            data[index] = cleanData(dataColumns[index], c);
-            if (c.getStyleColumnIndex() != null) {
-                data[c.getStyleColumnIndex()] = dataColumns[c.getStyleColumnIndex()];
-            }
-            if (c.getFormatStringColumnIndex() != null) {
-                data[c.getFormatStringColumnIndex()] = dataColumns[c.getFormatStringColumnIndex()];
-            }
-        }
-
-        // Handle row format column, if any
-        this.rowFormatColumn = rowFormatColumn;
-        if (rowFormatColumn != NO_ROW_FORMAT_COLUMN) {
-            data[rowFormatColumn] = dataColumns[rowFormatColumn];
-        }
-
-        // Grow all columns to match the size of the viewport, if necessary
-        if (length < maxLength) {
-            for (int i = 0; i < data.length; i++) {
-                if (data[i] != null) {
-                    JsArray<Any> existingColumnData = Js.uncheckedCast(data[i]);
-                    existingColumnData.length = this.maxLength;
-                    existingColumnData.fill(NULL_SENTINEL, length, this.maxLength);
-                }
-            }
-        }
-
-        rows = new JsArray<>();
-        for (int i = 0; i < length; i++) {
-            rows.push(new ViewportRow(i, data, data[rowFormatColumn]));
-        }
-        this.columns = JsObject.freeze(Js.uncheckedCast(columns.slice()));
-    }
-
-    private static DataCleaner getDataCleanerForColumnType(String columnType) {
-        switch (columnType) {
-            case "int":
-                return (data, i) -> {
-                    int value = data.getAtAsAny(i).asInt();
-                    if (value == QueryConstants.NULL_INT) {
-                        data.setAt(i, null);
-                    }
-                };
-            case "byte":
-                return (data, i) -> {
-                    byte value = data.getAtAsAny(i).asByte();
-                    if (value == QueryConstants.NULL_BYTE) {
-                        data.setAt(i, null);
-                    }
-                };
-            case "short":
-                return (data, i) -> {
-                    short value = data.getAtAsAny(i).asShort();
-                    if (value == QueryConstants.NULL_SHORT) {
-                        data.setAt(i, null);
-                    }
-                };
-            case "double":
-                return (data, i) -> {
-                    double value = data.getAtAsAny(i).asDouble();
-                    if (value == QueryConstants.NULL_DOUBLE) {
-                        data.setAt(i, null);
-                    }
-                };
-            case "float":
-                return (data, i) -> {
-                    float value = data.getAtAsAny(i).asFloat();
-                    if (value == QueryConstants.NULL_FLOAT) {
-                        data.setAt(i, null);
-                    }
-                };
-            case "char":
-                return (data, i) -> {
-                    char value = data.getAtAsAny(i).asChar();
-                    if (value == QueryConstants.NULL_CHAR) {
-                        data.setAt(i, null);
-                    }
-                };
-            default:
-                return null;
-        }
-    }
-
-    public static Object cleanData(Object dataColumn, Column column) {
-        if (dataColumn == null) {
-            return null;
-        }
-        if (column == null) {
-            return dataColumn;
-        }
-
-        switch (column.getType()) {
-            case "long": {
-                JsArray<Any> values = Js.uncheckedCast(dataColumn);
-                LongWrapper[] cleanData = new LongWrapper[values.length];
-                for (int i = 0; i < values.length; i++) {
-                    long value = values.getAtAsAny(i).asLong();
-                    if (value == QueryConstants.NULL_LONG) {
-                        cleanData[i] = null;
-                    } else {
-                        cleanData[i] = LongWrapper.of(value);
-                    }
-                }
-                return cleanData;
-            }
-            case "java.time.Instant":
-            case "java.time.ZonedDateTime": {
-                JsArray<Any> values = Js.uncheckedCast(dataColumn);
-                DateWrapper[] cleanData = new DateWrapper[values.length];
-                for (int i = 0; i < values.length; i++) {
-                    long value = values.getAtAsAny(i).asLong();
-                    if (value == QueryConstants.NULL_LONG) {
-                        cleanData[i] = null;
-                    } else {
-                        cleanData[i] = new DateWrapper(value);
-                    }
-                }
-                return cleanData;
-            }
-            case "java.math.BigDecimal": {
-                final JsArray<Any> values = Js.uncheckedCast(dataColumn);
-                final BigDecimalWrapper[] cleanData = new BigDecimalWrapper[values.length];
-                for (int i = 0; i < values.length; i++) {
-                    final BigDecimal value = Js.cast(values.getAt(i));
-                    if (value == null) {
-                        cleanData[i] = null;
-                    } else {
-                        cleanData[i] = new BigDecimalWrapper(value);
-                    }
-                }
-                return cleanData;
-            }
-            case "java.math.BigInteger": {
-                final JsArray<Any> values = Js.uncheckedCast(dataColumn);
-                final BigIntegerWrapper[] cleanData = new BigIntegerWrapper[values.length];
-                for (int i = 0; i < values.length; i++) {
-                    final BigInteger value = Js.cast(values.getAt(i));
-                    if (value == null) {
-                        cleanData[i] = null;
-                    } else {
-                        cleanData[i] = new BigIntegerWrapper(value);
-                    }
-                }
-                return cleanData;
-            }
-            case "java.time.LocalDate": {
-                final JsArray<Any> values = Js.uncheckedCast(dataColumn);
-                final LocalDateWrapper[] cleanData = new LocalDateWrapper[values.length];
-                for (int i = 0; i < values.length; i++) {
-                    final LocalDate value = Js.cast(values.getAt(i));
-                    if (value == null) {
-                        cleanData[i] = null;
-                    } else {
-                        cleanData[i] = new LocalDateWrapper(value);
-                    }
-                }
-                return cleanData;
-            }
-            case "java.time.LocalTime": {
-                final JsArray<Any> values = Js.uncheckedCast(dataColumn);
-                final LocalTimeWrapper[] cleanData = new LocalTimeWrapper[values.length];
-                for (int i = 0; i < values.length; i++) {
-                    final LocalTime value = Js.cast(values.getAt(i));
-                    if (value == null) {
-                        cleanData[i] = null;
-                    } else {
-                        cleanData[i] = new LocalTimeWrapper(value);
-                    }
-                }
-                return cleanData;
-            }
-            default:
-                DataCleaner dataCleaner = getDataCleanerForColumnType(column.getType());
-                if (dataCleaner != null) {
-                    JsArray<Any> values = Js.uncheckedCast(dataColumn);
-                    JsArray<Any> cleanData = Js.uncheckedCast(JsArray.from((JsArrayLike<Any>) values));
-
-                    for (int i = 0; i < values.length; i++) {
-                        dataCleaner.clean(cleanData, i);
-                    }
-
-                    return cleanData;
-                } else {
-                    return dataColumn;
-                }
-        }
-    }
-
-    /**
-     * The index of the first returned row
-     * 
-     * @return double
+     * The position of the first returned row, null if this data is not for a viewport.
      */
     @JsProperty
-    public double getOffset() {
-        return offset;
-
-    }
-
-    @Override
-    public Row get(long index) {
-        return getRows().getAt((int) index);
-    }
-
-    @Override
-    public Row get(int index) {
-        return getRows().getAt(index);
-    }
-
-    @Override
-    public Any getData(int index, Column column) {
-        return getRows().getAt(index).get(column);
-    }
-
-    @Override
-    public Any getData(long index, Column column) {
-        return getRows().getAt((int) index).get(column);
-    }
-
-    @Override
-    public Format getFormat(int index, Column column) {
-        return getRows().getAt(index).getFormat(column);
-    }
+    Double getOffset();
 
+    @JsProperty
     @Override
-    public Format getFormat(long index, Column column) {
-        return getRows().getAt((int) index).getFormat(column);
-    }
+    JsArray<TableData.@TsTypeRef(ViewportRow.class) Row> getRows();
 
     /**
-     * An array of rows of data
-     * 
-     * @return {@link ViewportRow} array.
+     * Reads a row object from the viewport, based on its position in the table.
      */
     @Override
-    @JsProperty
-    public JsArray<ViewportRow> getRows() {
-        if (rows.length != length) {
-            rows = new JsArray<>();
-            for (int i = 0; i < length; i++) {
-                rows.push(new ViewportRow(i, data, data[rowFormatColumn]));
-            }
-            JsObject.freeze(rows);
-        }
-        return rows;
+    @TsTypeRef(ViewportRow.class)
+    default TableData.Row get(RowPositionUnion index) {
+        return TableData.super.get(index);
     }
 
     /**
-     * A list of columns describing the data types in each row
-     * 
-     * @return {@link Column} array.
+     * This object may be pooled internally or discarded and not updated. Do not retain references to it. Instead,
+     * request the viewport again.
      */
-    @Override
-    @JsProperty
-    public JsArray<Column> getColumns() {
-        return columns;
-    }
-
-    public MergeResults merge(DeltaUpdates updates) {
-        if (offset == -1 && updates.getIncludedAdditions().size() > 0) {
-            offset = updates.getIncludedAdditions().getFirstRow();
-        }
-        final MergeResults updated = new MergeResults();
-
-        // First we remove rows by nulling them out.
-        updates.getRemoved().indexIterator().forEachRemaining((long removedIndex) -> {
-            int internalOffset = (int) (removedIndex - offset);
-            if (internalOffset < 0 || internalOffset >= length) {
-                return;
-            }
-            for (int i = 0; i < data.length; i++) {
-                JsArray<Any> existingColumnData = Js.uncheckedCast(data[i]);
-                if (existingColumnData == null) {
-                    continue;
-                }
-                existingColumnData.setAt(internalOffset, NULL_SENTINEL);
-            }
-            updated.removed.add(internalOffset);
-        });
-
-        // Now we shift data around.
-        boolean hasReverseShift = false;
-        final ShiftedRange[] shiftedRanges = updates.getShiftedRanges();
-
-        // must apply shifts in mem-move semantics; so we shift forward from right to left first
-        for (int si = shiftedRanges.length - 1; si >= 0; --si) {
-            final ShiftedRange shiftedRange = shiftedRanges[si];
-            final long shiftDelta = shiftedRange.getDelta();
-            if (shiftDelta < 0) {
-                hasReverseShift = true;
-                continue;
-            }
-
-            final long beginAsLong = Math.max(shiftedRange.getRange().getFirst() - offset, 0);
-            final int end = (int) Math.min(shiftedRange.getRange().getLast() - offset, length - 1);
-            if (end < beginAsLong) {
-                // this range is out of our viewport
-                continue;
-            }
-
-            // long math is expensive; so convert to int early/once
-            final int begin = (int) beginAsLong;
-
-            // iterate backward and move them forward
-            for (int j = end; j >= begin; --j) {
-                for (int i = 0; i < data.length; ++i) {
-                    final JsArray<Any> existingColumnData = Js.uncheckedCast(data[i]);
-                    if (existingColumnData == null) {
-                        continue;
-                    }
-
-                    final long internalOffsetAsLong = (j + shiftDelta);
-                    if (internalOffsetAsLong >= 0 && internalOffsetAsLong < maxLength) {
-                        // because internalOffsetAsLong is less than maxLen; we know it must be fit in an int
-                        final int internalOffset = (int) internalOffsetAsLong;
-                        updated.added.add(internalOffset);
-                        Any toMove = existingColumnData.getAt(j);
-                        existingColumnData.setAt(internalOffset, toMove);
-                    }
-
-                    updated.removed.add(j);
-                    existingColumnData.setAt(j, NULL_SENTINEL);
-                }
-            }
-        }
-        if (hasReverseShift) {
-            // then we shift in reverse from left to right
-            for (int si = 0; si < shiftedRanges.length; ++si) {
-                final ShiftedRange shiftedRange = shiftedRanges[si];
-                final long shiftDelta = shiftedRange.getDelta();
-                if (shiftDelta > 0) {
-                    continue;
-                }
-
-                final long begin = Math.max(shiftedRange.getRange().getFirst() - offset, 0);
-                final int end = (int) Math.min(shiftedRange.getRange().getLast() - offset, length - 1);
-                if (end < begin) {
-                    // this range is out of our viewport
-                    continue;
-                }
-
-                // iterate forward and move them backward (note: since begin is <= end, we now know it fits in an int)
-                for (int j = (int) begin; j <= end; ++j) {
-                    for (int i = 0; i < data.length; ++i) {
-                        final JsArray<Any> existingColumnData = Js.uncheckedCast(data[i]);
-                        if (existingColumnData == null) {
-                            continue;
-                        }
-
-                        final long internalOffsetAsLong = j + shiftDelta;
-                        if (internalOffsetAsLong >= 0 && internalOffsetAsLong < maxLength) {
-                            // because internalOffsetAsLong is less than maxLen; we know it must be fit in an int
-                            final int internalOffset = (int) internalOffsetAsLong;
-                            updated.added.add(internalOffset);
-                            existingColumnData.setAt(internalOffset, existingColumnData.getAt(j));
-                        }
-
-                        updated.removed.add(j);
-                        existingColumnData.setAt(j, NULL_SENTINEL);
-                    }
-                }
-            }
-        }
-
-        DeltaUpdates.ColumnModifications[] serializedModifications = updates.getSerializedModifications();
-        for (int modifiedColIndex = 0; modifiedColIndex < serializedModifications.length; modifiedColIndex++) {
-            final DeltaUpdates.ColumnModifications modifiedColumn = serializedModifications[modifiedColIndex];
-            final OfLong it = modifiedColumn == null ? null : modifiedColumn.getRowsIncluded().indexIterator();
-
-            if (it == null || !it.hasNext()) {
-                continue;
-            }
-
-            // look for a local Column which matches this index so we know how to clean it
-            final Column column = columns.find((c, i1, i2) -> c.getIndex() == modifiedColumn.getColumnIndex());
-            final JsArray<Any> updatedColumnData =
-                    Js.uncheckedCast(cleanData(modifiedColumn.getValues().getData(), column));
-            final JsArray<Any> existingColumnData = Js.uncheckedCast(data[modifiedColumn.getColumnIndex()]);
-            if (updatedColumnData.length == 0) {
-                continue;
-            }
-
-            // for each change provided for this column, replace the values in our store
-            int i = 0;
-            while (it.hasNext()) {
-                long modifiedOffset = it.nextLong();
-                int internalOffset = (int) (modifiedOffset - offset);
-                if (internalOffset < 0 || internalOffset >= maxLength) {
-                    i++;
-                    continue;// data we don't need to see, either meant for another table, or we just sent a viewport
-                             // update
-                }
-                existingColumnData.setAt(internalOffset, updatedColumnData.getAtAsAny(i));
-                updated.modified.add(internalOffset);
-                i++;
-            }
-        }
-
-        if (!updates.getIncludedAdditions().isEmpty()) {
-            DeltaUpdates.ColumnAdditions[] serializedAdditions = updates.getSerializedAdditions();
-            for (int addedColIndex = 0; addedColIndex < serializedAdditions.length; addedColIndex++) {
-                DeltaUpdates.ColumnAdditions addedColumn = serializedAdditions[addedColIndex];
-
-                Column column = columns.find((c, i1, i2) -> c.getIndex() == addedColumn.getColumnIndex());
-                final JsArray<Any> addedColumnData =
-                        Js.uncheckedCast(cleanData(addedColumn.getValues().getData(), column));
-                final JsArray<Any> existingColumnData = Js.uncheckedCast(data[addedColumn.getColumnIndex()]);
-                if (addedColumnData.length == 0) {
-                    continue;
-                }
-
-                int i = 0;
-                OfLong it = updates.getIncludedAdditions().indexIterator();
-                while (it.hasNext()) {
-                    long addedOffset = it.nextLong();
-                    int internalOffset = (int) (addedOffset - offset);
-                    if (internalOffset < 0 || internalOffset >= maxLength) {
-                        i++;
-                        continue;// data we don't need to see, either meant for another table, or we just sent a
-                                 // viewport update
-                    }
-                    assert internalOffset < existingColumnData.length;
-
-                    Any existing = existingColumnData.getAt(internalOffset);
-                    if (existing == NULL_SENTINEL || internalOffset >= length) {
-                        // space was set aside or was left at the end of the array for this value, it is a new addition
-                        updated.added.add(internalOffset);
-                    } else {
-                        // we're overwriting some existing value
-                        updated.modified.add(internalOffset);
-                    }
-                    existingColumnData.setAt(internalOffset, addedColumnData.getAtAsAny(i));
-                    i++;
-                }
-            }
-        }
-
-        // exclude added items from being marked as modified, since we're hiding shifts from api consumers
-        updated.modified.removeAll(updated.added);
-
-        // Any position which was both added and removed should instead be marked as modified, this cleans
-        // up anything excluded above that didn't otherwise make sense
-        for (Iterator<Integer> it = updated.removed.iterator(); it.hasNext();) {
-            int ii = it.next();
-            if (updated.added.remove(ii)) {
-                it.remove();
-                updated.modified.add(ii);
-            }
-        }
-
-        length = length + updated.added.size() - updated.removed.size();
-        assert 0 <= length && length <= maxLength;
-
-        // Viewport footprint should be small enough that we can afford to see if this update corrupted our view of the
-        // world:
-        assert !dataContainsNullSentinels();
-
-        return updated;
-    }
-
-    private boolean dataContainsNullSentinels() {
-        for (int i = 0; i < data.length; i++) {
-            JsArray<Any> existingColumnData = Js.uncheckedCast(data[i]);
-            if (existingColumnData == null) {
-                continue;
-            }
-            for (int j = 0; j < length; ++j) {
-                if (existingColumnData.getAt(j) == NULL_SENTINEL) {
-                    return true;
-                }
-            }
-        }
-        return false;
+    @JsType(namespace = "dh")
+    interface ViewportRow extends TableData.Row {
     }
 }
diff --git a/web/client-api/src/main/java/io/deephaven/web/client/api/subscription/ViewportRow.java b/web/client-api/src/main/java/io/deephaven/web/client/api/subscription/ViewportRow.java
deleted file mode 100644
index ade086f4503..00000000000
--- a/web/client-api/src/main/java/io/deephaven/web/client/api/subscription/ViewportRow.java
+++ /dev/null
@@ -1,86 +0,0 @@
-//
-// Copyright (c) 2016-2024 Deephaven Data Labs and Patent Pending
-//
-package io.deephaven.web.client.api.subscription;
-
-import com.vertispan.tsdefs.annotations.TsInterface;
-import com.vertispan.tsdefs.annotations.TsName;
-import elemental2.core.JsArray;
-import io.deephaven.web.client.api.Column;
-import io.deephaven.web.client.api.Format;
-import io.deephaven.web.client.api.LongWrapper;
-import io.deephaven.web.client.api.TableData;
-import jsinterop.annotations.JsMethod;
-import jsinterop.base.Any;
-import jsinterop.base.Js;
-
-/**
- * This object may be pooled internally or discarded and not updated. Do not retain references to it. Instead, request
- * the viewport again.
- */
-@TsInterface
-@TsName(namespace = "dh")
-public class ViewportRow implements TableData.Row {
-    protected final int offsetInSnapshot;
-    private final Object[] dataColumns;
-    private final JsArray<Any> rowStyleColumn;
-
-    public ViewportRow(int offsetInSnapshot, Object[] dataColumns, Object rowStyleColumn) {
-        this.offsetInSnapshot = offsetInSnapshot;
-        this.dataColumns = dataColumns;
-        this.rowStyleColumn = Js.uncheckedCast(rowStyleColumn);
-    }
-
-    @Override
-    public LongWrapper getIndex() {
-        throw new UnsupportedOperationException("Viewports don't currently represent their position with an index");
-    }
-
-    /**
-     * the data for the given column's cell
-     * 
-     * @param column
-     * @return Any
-     */
-    @Override
-    @JsMethod
-    public Any get(Column column) {
-        JsArray<Any> uncheckedData = Js.uncheckedCast(dataColumns[column.getIndex()]);
-        if (uncheckedData == null) {
-            throw new java.util.NoSuchElementException(
-                    "Column " + column.getName() + " not found in row, was it specified in the viewport?");
-        }
-        return uncheckedData.getAtAsAny(offsetInSnapshot);
-    }
-
-    /**
-     * the format object for the given columns' cell
-     * 
-     * @param column
-     * @return {@link Format}.
-     */
-    @Override
-    @JsMethod
-    public Format getFormat(Column column) {
-        long cellColors = 0;
-        long rowColors = 0;
-        String numberFormat = null;
-        String formatString = null;
-        if (column.getStyleColumnIndex() != null) {
-            JsArray<Any> colors = Js.uncheckedCast(dataColumns[column.getStyleColumnIndex()]);
-            cellColors = colors.getAtAsAny(offsetInSnapshot).asLong();
-        }
-        if (rowStyleColumn != null) {
-            rowColors = rowStyleColumn.getAtAsAny(offsetInSnapshot).asLong();
-        }
-        if (column.getFormatColumnIndex() != null) {
-            JsArray<Any> formatStrings = Js.uncheckedCast(dataColumns[column.getFormatColumnIndex()]);
-            numberFormat = formatStrings.getAtAsAny(offsetInSnapshot).asString();
-        }
-        if (column.getFormatStringColumnIndex() != null) {
-            JsArray<Any> formatStrings = Js.uncheckedCast(dataColumns[column.getFormatStringColumnIndex()]);
-            formatString = formatStrings.getAtAsAny(offsetInSnapshot).asString();
-        }
-        return new Format(cellColors, rowColors, numberFormat, formatString);
-    }
-}
diff --git a/web/client-api/src/main/java/io/deephaven/web/client/api/tree/JsRollupConfig.java b/web/client-api/src/main/java/io/deephaven/web/client/api/tree/JsRollupConfig.java
index 1a0e966abc3..f3ec9423e6f 100644
--- a/web/client-api/src/main/java/io/deephaven/web/client/api/tree/JsRollupConfig.java
+++ b/web/client-api/src/main/java/io/deephaven/web/client/api/tree/JsRollupConfig.java
@@ -7,6 +7,7 @@
 import elemental2.core.JsArray;
 import elemental2.core.JsObject;
 import elemental2.core.JsString;
+import io.deephaven.javascript.proto.dhinternal.io.deephaven.proto.Table_pb;
 import io.deephaven.javascript.proto.dhinternal.io.deephaven.proto.hierarchicaltable_pb.RollupRequest;
 import io.deephaven.javascript.proto.dhinternal.io.deephaven.proto.table_pb.AggSpec;
 import io.deephaven.javascript.proto.dhinternal.io.deephaven.proto.table_pb.Aggregation;
@@ -20,6 +21,7 @@
 import io.deephaven.javascript.proto.dhinternal.io.deephaven.proto.table_pb.aggspec.AggSpecLast;
 import io.deephaven.javascript.proto.dhinternal.io.deephaven.proto.table_pb.aggspec.AggSpecMax;
 import io.deephaven.javascript.proto.dhinternal.io.deephaven.proto.table_pb.aggspec.AggSpecMin;
+import io.deephaven.javascript.proto.dhinternal.io.deephaven.proto.table_pb.aggspec.AggSpecNonUniqueSentinel;
 import io.deephaven.javascript.proto.dhinternal.io.deephaven.proto.table_pb.aggspec.AggSpecStd;
 import io.deephaven.javascript.proto.dhinternal.io.deephaven.proto.table_pb.aggspec.AggSpecSum;
 import io.deephaven.javascript.proto.dhinternal.io.deephaven.proto.table_pb.aggspec.AggSpecUnique;
@@ -58,7 +60,7 @@ public class JsRollupConfig {
      * Mapping from each aggregation name to the ordered list of columns it should be applied to in the resulting
      * roll-up table.
      */
-    public JsPropertyMap<JsArray<@TsTypeRef(JsAggregationOperation.class) String>> aggregations =
+    public JsPropertyMap<JsArray<String>> aggregations =
             Js.cast(JsObject.create(null));
     /**
      * Optional parameter indicating if an extra leaf node should be added at the bottom of the hierarchy, showing the
@@ -245,7 +247,11 @@ public RollupRequest buildRequest(JsArray<Column> tableColumns) {
                 }
                 case JsAggregationOperation.UNIQUE: {
                     AggSpec spec = new AggSpec();
-                    spec.setUnique(new AggSpecUnique());
+                    AggSpecUnique unique = new AggSpecUnique();
+                    AggSpecNonUniqueSentinel sentinel = new AggSpecNonUniqueSentinel();
+                    sentinel.setNullValue(Table_pb.NullValue.getNULL_VALUE());
+                    unique.setNonUniqueSentinel(sentinel);
+                    spec.setUnique(unique);
                     columns = new AggregationColumns();
                     columns.setSpec(spec);
                     agg.setColumns(columns);
diff --git a/web/client-api/src/main/java/io/deephaven/web/client/api/tree/JsTreeTable.java b/web/client-api/src/main/java/io/deephaven/web/client/api/tree/JsTreeTable.java
index 50808f9776d..286a6c4213a 100644
--- a/web/client-api/src/main/java/io/deephaven/web/client/api/tree/JsTreeTable.java
+++ b/web/client-api/src/main/java/io/deephaven/web/client/api/tree/JsTreeTable.java
@@ -3,55 +3,44 @@
 //
 package io.deephaven.web.client.api.tree;
 
-import com.vertispan.tsdefs.annotations.TsInterface;
-import com.vertispan.tsdefs.annotations.TsName;
+import com.vertispan.tsdefs.annotations.TsIgnore;
+import com.vertispan.tsdefs.annotations.TsTypeRef;
 import com.vertispan.tsdefs.annotations.TsUnion;
 import com.vertispan.tsdefs.annotations.TsUnionMember;
 import elemental2.core.JsArray;
 import elemental2.core.JsObject;
 import elemental2.core.Uint8Array;
-import elemental2.dom.CustomEventInit;
 import elemental2.dom.DomGlobal;
 import elemental2.promise.IThenable;
 import elemental2.promise.Promise;
-import io.deephaven.javascript.proto.dhinternal.arrow.flight.flatbuf.message_generated.org.apache.arrow.flatbuf.Message;
-import io.deephaven.javascript.proto.dhinternal.arrow.flight.flatbuf.message_generated.org.apache.arrow.flatbuf.MessageHeader;
-import io.deephaven.javascript.proto.dhinternal.arrow.flight.flatbuf.message_generated.org.apache.arrow.flatbuf.RecordBatch;
-import io.deephaven.javascript.proto.dhinternal.arrow.flight.flatbuf.schema_generated.org.apache.arrow.flatbuf.Schema;
-import io.deephaven.javascript.proto.dhinternal.arrow.flight.protocol.flight_pb.FlightData;
-import io.deephaven.javascript.proto.dhinternal.flatbuffers.Builder;
-import io.deephaven.javascript.proto.dhinternal.flatbuffers.ByteBuffer;
-import io.deephaven.javascript.proto.dhinternal.io.deephaven.barrage.flatbuf.barrage_generated.io.deephaven.barrage.flatbuf.BarrageMessageType;
-import io.deephaven.javascript.proto.dhinternal.io.deephaven.barrage.flatbuf.barrage_generated.io.deephaven.barrage.flatbuf.BarrageMessageWrapper;
-import io.deephaven.javascript.proto.dhinternal.io.deephaven.barrage.flatbuf.barrage_generated.io.deephaven.barrage.flatbuf.BarrageSubscriptionOptions;
-import io.deephaven.javascript.proto.dhinternal.io.deephaven.barrage.flatbuf.barrage_generated.io.deephaven.barrage.flatbuf.BarrageSubscriptionRequest;
-import io.deephaven.javascript.proto.dhinternal.io.deephaven.barrage.flatbuf.barrage_generated.io.deephaven.barrage.flatbuf.BarrageUpdateMetadata;
-import io.deephaven.javascript.proto.dhinternal.io.deephaven.barrage.flatbuf.barrage_generated.io.deephaven.barrage.flatbuf.ColumnConversionMode;
 import io.deephaven.javascript.proto.dhinternal.io.deephaven.proto.hierarchicaltable_pb.HierarchicalTableApplyRequest;
 import io.deephaven.javascript.proto.dhinternal.io.deephaven.proto.hierarchicaltable_pb.HierarchicalTableDescriptor;
 import io.deephaven.javascript.proto.dhinternal.io.deephaven.proto.hierarchicaltable_pb.HierarchicalTableSourceExportRequest;
 import io.deephaven.javascript.proto.dhinternal.io.deephaven.proto.hierarchicaltable_pb.HierarchicalTableViewKeyTableDescriptor;
 import io.deephaven.javascript.proto.dhinternal.io.deephaven.proto.hierarchicaltable_pb.HierarchicalTableViewRequest;
 import io.deephaven.javascript.proto.dhinternal.io.deephaven.proto.table_pb.Condition;
+import io.deephaven.javascript.proto.dhinternal.io.deephaven.proto.table_pb.ExportedTableCreationResponse;
+import io.deephaven.javascript.proto.dhinternal.io.deephaven.proto.table_pb.TableReference;
 import io.deephaven.javascript.proto.dhinternal.io.deephaven.proto.ticket_pb.Ticket;
 import io.deephaven.javascript.proto.dhinternal.io.deephaven.proto.ticket_pb.TypedTicket;
 import io.deephaven.web.client.api.*;
 import io.deephaven.web.client.api.barrage.WebBarrageUtils;
+import io.deephaven.web.client.api.barrage.data.WebBarrageSubscription;
 import io.deephaven.web.client.api.barrage.def.ColumnDefinition;
 import io.deephaven.web.client.api.barrage.def.InitialTableDefinition;
-import io.deephaven.web.client.api.barrage.stream.BiDiStream;
+import io.deephaven.web.client.api.barrage.stream.ResponseStreamWrapper;
+import io.deephaven.web.client.api.event.Event;
 import io.deephaven.web.client.api.filter.FilterCondition;
 import io.deephaven.web.client.api.impl.TicketAndPromise;
 import io.deephaven.web.client.api.lifecycle.HasLifecycle;
-import io.deephaven.web.client.api.subscription.ViewportData;
-import io.deephaven.web.client.api.subscription.ViewportRow;
-import io.deephaven.web.client.api.tree.JsTreeTable.TreeViewportData.TreeRow;
+import io.deephaven.web.client.api.subscription.AbstractTableSubscription;
+import io.deephaven.web.client.api.subscription.SubscriptionType;
 import io.deephaven.web.client.api.widget.JsWidget;
 import io.deephaven.web.client.fu.JsItr;
 import io.deephaven.web.client.fu.JsLog;
 import io.deephaven.web.client.fu.LazyPromise;
+import io.deephaven.web.client.state.ClientTableState;
 import io.deephaven.web.shared.data.*;
-import io.deephaven.web.shared.data.columns.ColumnData;
 import javaemul.internal.annotations.DoNotAutobox;
 import jsinterop.annotations.JsIgnore;
 import jsinterop.annotations.JsNullable;
@@ -67,10 +56,6 @@
 import java.util.function.Function;
 import java.util.stream.Collectors;
 
-import static io.deephaven.web.client.api.barrage.WebBarrageUtils.makeUint8ArrayFromBitset;
-import static io.deephaven.web.client.api.barrage.WebBarrageUtils.serializeRanges;
-import static io.deephaven.web.client.api.subscription.ViewportData.NO_ROW_FORMAT_COLUMN;
-
 /**
  * Behaves like a {@link JsTable} externally, but data, state, and viewports are managed by an entirely different
  * mechanism, and so reimplemented here.
@@ -108,7 +93,7 @@
  * roll-up table, the totals only include leaf nodes (as non-leaf nodes are generated through grouping the contents of
  * the original table). Roll-ups also have the {@link JsRollupConfig#includeConstituents} property, indicating that a
  * {@link Column} in the tree may have a {@link Column#getConstituentType()} property reflecting that the type of cells
- * where {@link TreeRow#hasChildren()} is false will be different from usual.</li>
+ * where {@link TreeSubscription.TreeRowImpl#hasChildren()} is false will be different from usual.</li>
  * </ul>
  */
 @JsType(namespace = "dh", name = "TreeTable")
@@ -126,216 +111,6 @@ public class JsTreeTable extends HasLifecycle implements ServerObject {
     private static final double ACTION_EXPAND_WITH_DESCENDENTS = 0b011;
     private static final double ACTION_COLLAPSE = 0b100;
 
-    @TsInterface
-    @TsName(namespace = "dh")
-    public class TreeViewportData implements TableData {
-        private final Boolean[] expandedColumn;
-        private final int[] depthColumn;
-        private final double offset;
-        private final double treeSize;
-
-        private final JsArray<Column> columns;
-        private final JsArray<TreeRow> rows;
-
-        private TreeViewportData(double offset, long viewportSize, double treeSize, ColumnData[] dataColumns,
-                Column[] columns) {
-            this.offset = offset;
-            this.treeSize = treeSize;
-            this.columns = JsObject.freeze(Js.cast(Js.<JsArray<Column>>uncheckedCast(columns).slice()));
-
-            // Unlike ViewportData, assume that we own this copy of the data and can mutate at will. As such,
-            // we'll just clean the data that the requested columns know about for now.
-            // TODO to improve this, we can have synthetic columns to handle data that wasn't requested/expected,
-            // and then can share code with ViewportData
-            Object[] data = new Object[dataColumns.length];
-
-            expandedColumn = Js.uncheckedCast(
-                    ViewportData.cleanData(dataColumns[rowExpandedCol.getIndex()].getData(), rowExpandedCol));
-            depthColumn = Js.uncheckedCast(
-                    ViewportData.cleanData(dataColumns[rowDepthCol.getIndex()].getData(), rowDepthCol));
-
-            int constituentDepth = keyColumns.length + 2;
-
-            // Without modifying this.columns (copied and frozen), make sure our key columns are present
-            // in the list of columns that we will copy data for the viewport
-            keyColumns.forEach((col, p1) -> {
-                if (this.columns.indexOf(col) == -1) {
-                    columns[columns.length] = col;
-                }
-                return null;
-            });
-
-            for (int i = 0; i < columns.length; i++) {
-                Column c = columns[i];
-                int index = c.getIndex();
-
-                // clean the data, since it will be exposed to the client
-                data[index] = ViewportData.cleanData(dataColumns[index].getData(), c);
-                if (c.getStyleColumnIndex() != null) {
-                    data[c.getStyleColumnIndex()] = dataColumns[c.getStyleColumnIndex()].getData();
-                }
-                if (c.getFormatStringColumnIndex() != null) {
-                    data[c.getFormatStringColumnIndex()] = dataColumns[c.getFormatStringColumnIndex()].getData();
-                }
-
-                // if there is a matching constituent column array, clean it and copy from it
-                Column sourceColumn = sourceColumns.get(c.getName());
-                if (sourceColumn != null) {
-                    ColumnData constituentColumn = dataColumns[sourceColumn.getIndex()];
-                    if (constituentColumn != null) {
-                        JsArray<Any> cleanConstituentColumn =
-                                Js.uncheckedCast(ViewportData.cleanData(constituentColumn.getData(), sourceColumn));
-                        // Overwrite the data with constituent values, if any
-                        // We use cleanConstituentColumn to find max item rather than data[index], since we
-                        // are okay stopping at the last constituent value, in case the server sends shorter
-                        // arrays.
-                        for (int rowIndex = 0; rowIndex < cleanConstituentColumn.length; rowIndex++) {
-                            if (depthColumn[rowIndex] == constituentDepth)
-                                Js.asArrayLike(data[index]).setAt(rowIndex, cleanConstituentColumn.getAt(rowIndex));
-                        }
-
-                        if (sourceColumn.getStyleColumnIndex() != null) {
-                            assert c.getStyleColumnIndex() != null;
-                            ColumnData styleData = dataColumns[sourceColumn.getStyleColumnIndex()];
-                            if (styleData != null) {
-                                JsArray<Any> styleArray = Js.cast(styleData.getData());
-                                for (int rowIndex = 0; rowIndex < styleArray.length; rowIndex++) {
-                                    if (depthColumn[rowIndex] == constituentDepth)
-                                        Js.asArrayLike(data[c.getStyleColumnIndex()]).setAt(rowIndex,
-                                                styleArray.getAt(rowIndex));
-                                }
-                            }
-                        }
-                        if (sourceColumn.getFormatStringColumnIndex() != null) {
-                            assert c.getFormatStringColumnIndex() != null;
-                            ColumnData formatData = dataColumns[sourceColumn.getFormatStringColumnIndex()];
-                            if (formatData != null) {
-                                JsArray<Any> formatArray = Js.cast(formatData.getData());
-                                for (int rowIndex = 0; rowIndex < formatArray.length; rowIndex++) {
-                                    if (depthColumn[rowIndex] == constituentDepth) {
-                                        Js.asArrayLike(data[c.getFormatStringColumnIndex()]).setAt(rowIndex,
-                                                formatArray.getAt(rowIndex));
-                                    }
-                                }
-                            }
-                        }
-                    }
-                }
-            }
-            if (rowFormatColumn != NO_ROW_FORMAT_COLUMN) {
-                data[rowFormatColumn] = dataColumns[rowFormatColumn].getData();
-            }
-
-            rows = new JsArray<>();
-            for (int i = 0; i < viewportSize; i++) {
-                rows.push(new TreeRow(i, data, data[rowFormatColumn]));
-            }
-        }
-
-        @Override
-        public Row get(long index) {
-            return getRows().getAt((int) index);
-        }
-
-        @Override
-        public Row get(int index) {
-            return getRows().getAt((int) index);
-        }
-
-        @Override
-        public Any getData(int index, Column column) {
-            return getRows().getAt(index).get(column);
-        }
-
-        @Override
-        public Any getData(long index, Column column) {
-            return getRows().getAt((int) index).get(column);
-        }
-
-        @Override
-        public Format getFormat(int index, Column column) {
-            return getRows().getAt(index).getFormat(column);
-        }
-
-        @Override
-        public Format getFormat(long index, Column column) {
-            return getRows().getAt((int) index).getFormat(column);
-        }
-
-        @JsProperty
-        public double getOffset() {
-            return offset;
-        }
-
-        @JsProperty
-        public JsArray<Column> getColumns() {
-            return columns;
-        }
-
-        @JsProperty
-        public JsArray<TreeRow> getRows() {
-            return rows;
-        }
-
-        public double getTreeSize() {
-            return treeSize;
-        }
-
-        /**
-         * Row implementation that also provides additional read-only properties. represents visible rows in the table,
-         * but with additional properties to reflect the tree structure.
-         */
-        @TsInterface
-        @TsName(namespace = "dh")
-        public class TreeRow extends ViewportRow {
-            public TreeRow(int offsetInSnapshot, Object[] dataColumns, Object rowStyleColumn) {
-                super(offsetInSnapshot, dataColumns, rowStyleColumn);
-            }
-
-            /**
-             * True if this node is currently expanded to show its children; false otherwise. Those children will be the
-             * rows below this one with a greater depth than this one
-             * 
-             * @return boolean
-             */
-            @JsProperty(name = "isExpanded")
-            public boolean isExpanded() {
-                return expandedColumn[offsetInSnapshot] == Boolean.TRUE;
-            }
-
-            /**
-             * True if this node has children and can be expanded; false otherwise. Note that this value may change when
-             * the table updates, depending on the table's configuration
-             * 
-             * @return boolean
-             */
-            @JsProperty(name = "hasChildren")
-            public boolean hasChildren() {
-                return expandedColumn[offsetInSnapshot] != null;
-            }
-
-            /**
-             * The number of levels above this node; zero for top level nodes. Generally used by the UI to indent the
-             * row and its expand/collapse icon
-             * 
-             * @return int
-             */
-            @JsProperty(name = "depth")
-            public int depth() {
-                return depthColumn[offsetInSnapshot];
-            }
-
-            public void appendKeyData(Object[][] keyTableData, double action) {
-                int i;
-                for (i = 0; i < keyColumns.length; i++) {
-                    Js.<JsArray<Any>>cast(keyTableData[i]).push(keyColumns.getAt(i).get(this));
-                }
-                Js.<JsArray<Double>>cast(keyTableData[i++]).push((double) depth());
-                Js.<JsArray<Double>>cast(keyTableData[i++]).push(action);
-            }
-        }
-    }
-
     /**
      * Ordered series of steps that must be performed when changes are made to the table. When any change is applied,
      * all subsequent steps must be performed as well.
@@ -352,7 +127,6 @@ private enum RebuildStep {
     private final InitialTableDefinition tableDefinition;
     private final Column[] visibleColumns;
     private final Map<String, Column> columnsByName = new HashMap<>();
-    private final int rowFormatColumn;
     private final Map<String, Column> sourceColumns;
     private final JsArray<Column> keyColumns = new JsArray<>();
     private Column rowDepthCol;
@@ -376,7 +150,7 @@ private enum RebuildStep {
     private Promise<JsTable> keyTable;
 
     private TicketAndPromise<?> viewTicket;
-    private Promise<BiDiStream<?, ?>> stream;
+    private Promise<TreeSubscription> stream;
 
     // the "next" set of filters/sorts that we'll use. these either are "==" to the above fields, or are scheduled
     // to replace them soon.
@@ -389,7 +163,7 @@ private enum RebuildStep {
     private Column[] columns;
     private int updateInterval = 1000;
 
-    private TreeViewportData currentViewportData;
+    private TreeSubscription.TreeViewportDataImpl currentViewportData;
 
     private boolean alwaysFireNextEvent = false;
 
@@ -408,10 +182,9 @@ public JsTreeTable(WorkerConnection workerConnection, JsWidget widget) {
                 HierarchicalTableDescriptor.deserializeBinary(widget.getDataAsU8());
 
         Uint8Array flightSchemaMessage = treeDescriptor.getSnapshotSchema_asU8();
-        Schema schema = WebBarrageUtils.readSchemaMessage(flightSchemaMessage);
 
         this.isRefreshing = !treeDescriptor.getIsStatic();
-        this.tableDefinition = WebBarrageUtils.readTableDefinition(schema);
+        this.tableDefinition = WebBarrageUtils.readTableDefinition(flightSchemaMessage);
         Column[] columns = new Column[0];
         Map<Boolean, Map<String, ColumnDefinition>> columnDefsByName = tableDefinition.getColumnsByName();
         int rowFormatColumn = -1;
@@ -457,7 +230,6 @@ public JsTreeTable(WorkerConnection workerConnection, JsWidget widget) {
                         columnDefsByName.get(true).get(definition.getRollupAggregationInputColumn()).getType());
             }
         }
-        this.rowFormatColumn = rowFormatColumn;
         this.groupedColumns = JsObject.freeze(groupedColumns);
 
         sourceColumns = columnDefsByName.get(false).values().stream()
@@ -602,6 +374,210 @@ private TicketAndPromise<?> makeView(TicketAndPromise<?> prevTicket) {
         return viewTicket;
     }
 
+    private int constituentDepth() {
+        return keyColumns.length + 2;
+    }
+
+    public class TreeSubscription extends AbstractTableSubscription {
+        @TsIgnore
+        public class TreeViewportDataImpl extends AbstractTableSubscription.UpdateEventData
+                implements TreeViewportData {
+            private final double treeSize;
+
+            private final JsArray<Column> columns;
+
+            private TreeViewportDataImpl(WebBarrageSubscription subscription, int rowStyleColumn,
+                    JsArray<Column> columns,
+                    RangeSet added, RangeSet removed, RangeSet modified, ShiftedRange[] shifted) {
+                super(subscription, rowStyleColumn, columns, added, removed, modified, shifted);
+
+                this.treeSize = barrageSubscription.getCurrentRowSet().size();
+                this.columns = JsObject.freeze(Js.cast(Js.<JsArray<Column>>uncheckedCast(columns).slice()));
+            }
+
+            @Override
+            public Any getData(int index, Column column) {
+                Column sourceColumn = sourceColumns.get(column.getName());
+                if (sourceColumn == null) {
+                    // no constituent column, call super
+                    return super.getData(index, column);
+                }
+                if (barrageSubscription.getData(index, rowDepthCol.getIndex()).asInt() != constituentDepth()) {
+                    // not at constituent depth, call super
+                    return super.getData(index, column);
+                }
+                // read source col instead
+                return super.getData(index, sourceColumn);
+            }
+
+            @Override
+            public Any getData(long index, Column column) {
+                Column sourceColumn = sourceColumns.get(column.getName());
+                if (sourceColumn == null) {
+                    // no constituent column, call super
+                    return super.getData(index, column);
+                }
+                if (barrageSubscription.getData(index, rowDepthCol.getIndex()).asInt() != constituentDepth()) {
+                    // not at constituent depth, call super
+                    return super.getData(index, column);
+                }
+                // read source col instead
+                return super.getData(index, sourceColumn);
+            }
+
+            @Override
+            public Format getFormat(int index, Column column) {
+                Column sourceColumn = sourceColumns.get(column.getName());
+                if (sourceColumn == null) {
+                    // no constituent column, call super
+                    return super.getFormat(index, column);
+                }
+                if (barrageSubscription.getData(index, rowDepthCol.getIndex()).asInt() != constituentDepth()) {
+                    // not at constituent depth, call super
+                    return super.getFormat(index, column);
+                }
+                // read source col instead
+                return super.getFormat(index, sourceColumn);
+            }
+
+            @Override
+            public Format getFormat(long index, Column column) {
+                Column sourceColumn = sourceColumns.get(column.getName());
+                if (sourceColumn == null) {
+                    // no constituent column, call super
+                    return super.getFormat(index, column);
+                }
+                if (barrageSubscription.getData(index, rowDepthCol.getIndex()).asInt() != constituentDepth()) {
+                    // not at constituent depth, call super
+                    return super.getFormat(index, column);
+                }
+                // read source col instead
+                return super.getFormat(index, sourceColumn);
+            }
+
+            @Override
+            public JsArray<Column> getColumns() {
+                // This looks like its superclass, but we're actually returning a different field
+                return columns;
+            }
+
+            @Override
+            protected SubscriptionRow makeRow(long index) {
+                return new TreeRowImpl(subscription, index);
+            }
+
+            @JsProperty
+            public double getTreeSize() {
+                return treeSize;
+            }
+        }
+
+        public class TreeRowImpl extends SubscriptionRow implements TreeViewportData.TreeRow {
+
+            public TreeRowImpl(WebBarrageSubscription subscription, long index) {
+                super(subscription, rowStyleColumn, index);
+            }
+
+            @Override
+            public boolean isExpanded() {
+                return barrageSubscription.getData(index, rowExpandedCol.getIndex()).uncheckedCast() == Boolean.TRUE;
+            }
+
+            @Override
+            public boolean hasChildren() {
+                return barrageSubscription.getData(index, rowExpandedCol.getIndex()).uncheckedCast() != null;
+            }
+
+            @Override
+            public int depth() {
+                return Js.coerceToInt(barrageSubscription.getData(index, rowDepthCol.getIndex()));
+            }
+
+            public void appendKeyData(Object[][] keyTableData, double action) {
+                int i;
+                for (i = 0; i < keyColumns.length; i++) {
+                    Js.<JsArray<Any>>cast(keyTableData[i]).push(keyColumns.getAt(i).get(this));
+                }
+                Js.<JsArray<Double>>cast(keyTableData[i++]).push((double) depth());
+                Js.<JsArray<Double>>cast(keyTableData[i++]).push(action);
+            }
+
+            @Override
+            public Any get(Column column) {
+                Column sourceColumn = sourceColumns.get(column.getName());
+                if (sourceColumn == null) {
+                    // no constituent column, call super
+                    return super.get(column);
+                }
+                if (barrageSubscription.getData(index, rowDepthCol.getIndex()).asInt() != constituentDepth()) {
+                    // not at constituent depth, call super
+                    return super.get(column);
+                }
+                // read source col instead
+                return super.get(sourceColumn);
+            }
+
+            @Override
+            public Format getFormat(Column column) {
+                Column sourceColumn = sourceColumns.get(column.getName());
+                if (sourceColumn == null) {
+                    // no constituent column, call super
+                    return super.getFormat(column);
+                }
+                if (barrageSubscription.getData(index, rowDepthCol.getIndex()).asInt() != constituentDepth()) {
+                    // not at constituent depth, call super
+                    return super.getFormat(column);
+                }
+                // read source col instead
+                return super.getFormat(sourceColumn);
+            }
+        }
+
+        private RangeSet serverViewport;
+
+        public TreeSubscription(ClientTableState state, WorkerConnection connection) {
+            super(SubscriptionType.VIEWPORT_SUBSCRIPTION, state, connection);
+        }
+
+        @Override
+        protected void sendFirstSubscriptionRequest() {
+            setViewport(firstRow, lastRow, Js.uncheckedCast(columns), (double) updateInterval);
+        }
+
+        @Override
+        protected BitSet makeColumnBitset(JsArray<Column> columns) {
+            BitSet requested = super.makeColumnBitset(columns);
+            requested.or(makeColumnSubscriptionBitset());
+            return requested;
+        }
+
+        @Override
+        protected void onStreamEnd(ResponseStreamWrapper.Status status) {
+            super.onStreamEnd(status);
+            JsTreeTable.this.stream = null;
+            if (!status.isOk()) {
+                failureHandled(status.getDetails());
+            }
+        }
+
+        public void setViewport(double firstRow, double lastRow, JsArray<Column> columns, Double updateInterval) {
+            serverViewport = RangeSet.ofRange((long) firstRow, (long) lastRow);
+
+            sendBarrageSubscriptionRequest(RangeSet.ofRange((long) firstRow, (long) lastRow), Js.uncheckedCast(columns),
+                    updateInterval, false);
+        }
+
+        @Override
+        protected void notifyUpdate(RangeSet rowsAdded, RangeSet rowsRemoved, RangeSet totalMods,
+                ShiftedRange[] shifted) {
+            TreeViewportDataImpl detail =
+                    new TreeViewportDataImpl(barrageSubscription, rowStyleColumn, getColumns(), rowsAdded,
+                            rowsRemoved, totalMods, shifted);
+            detail.setOffset(this.serverViewport.getFirstRow());
+            fireEvent(EVENT_UPDATED, detail);
+        }
+    }
+
     private void replaceSubscription(RebuildStep step) {
         // Perform steps required to remove the existing intermediate tickets.
         // Fall-through between steps is deliberate.
@@ -621,18 +597,28 @@ private void replaceSubscription(RebuildStep step) {
                     viewTicket.release();
                     viewTicket = null;
                 }
-            case SUBSCRIPTION:
+
+                // In all of the above cases, we replace the subscription
                 if (stream != null) {
                     stream.then(stream -> {
-                        stream.end();
-                        stream.cancel();
+                        stream.close();
                         return null;
                     });
                     stream = null;
                 }
+                break;
+            case SUBSCRIPTION:
+                // If it exists, adjust the existing subscription, otherwise create a new one
+                if (stream != null) {
+                    stream.then(subscription -> {
+                        subscription.setViewport(firstRow, lastRow, Js.uncheckedCast(columns), (double) updateInterval);
+                        return null;
+                    });
+                    return;
+                }
         }
 
-        Promise<BiDiStream<?, ?>> stream = Promise.resolve(defer())
+        Promise<TreeSubscription> stream = Promise.resolve(defer())
                 .then(ignore -> {
                     makeKeyTable();
                     TicketAndPromise filter = prepareFilter();
@@ -648,8 +634,6 @@ private void replaceSubscription(RebuildStep step) {
                     BitSet columnsBitset = makeColumnSubscriptionBitset();
                     RangeSet range = RangeSet.ofRange((long) (double) firstRow, (long) (double) lastRow);
 
-                    Column[] queryColumns = this.columns;
-
                     boolean alwaysFireEvent = this.alwaysFireNextEvent;
                     this.alwaysFireNextEvent = false;
 
@@ -658,91 +642,29 @@ private void replaceSubscription(RebuildStep step) {
                             columnsBitset,
                             range,
                             alwaysFireEvent);
-                    BiDiStream<FlightData, FlightData> doExchange =
-                            connection.<FlightData, FlightData>streamFactory().create(
-                                    headers -> connection.flightServiceClient().doExchange(headers),
-                                    (first, headers) -> connection.browserFlightServiceClient().openDoExchange(first,
-                                            headers),
-                                    (next, headers, c) -> connection.browserFlightServiceClient().nextDoExchange(next,
-                                            headers,
-                                            c::apply),
-                                    new FlightData());
-
-                    FlightData subscriptionRequestWrapper = new FlightData();
-                    Builder doGetRequest = new Builder(1024);
-                    double columnsOffset = BarrageSubscriptionRequest.createColumnsVector(doGetRequest,
-                            makeUint8ArrayFromBitset(columnsBitset));
-                    double viewportOffset = BarrageSubscriptionRequest.createViewportVector(doGetRequest,
-                            serializeRanges(
-                                    Collections.singleton(
-                                            range)));
-                    double serializationOptionsOffset = BarrageSubscriptionOptions
-                            .createBarrageSubscriptionOptions(doGetRequest, ColumnConversionMode.Stringify, true,
-                                    updateInterval, 0, 0);
-                    double tableTicketOffset =
-                            BarrageSubscriptionRequest.createTicketVector(doGetRequest,
-                                    viewTicket.ticket().getTicket_asU8());
-                    BarrageSubscriptionRequest.startBarrageSubscriptionRequest(doGetRequest);
-                    BarrageSubscriptionRequest.addTicket(doGetRequest, tableTicketOffset);
-                    BarrageSubscriptionRequest.addColumns(doGetRequest, columnsOffset);
-                    BarrageSubscriptionRequest.addSubscriptionOptions(doGetRequest, serializationOptionsOffset);
-                    BarrageSubscriptionRequest.addViewport(doGetRequest, viewportOffset);
-                    doGetRequest.finish(BarrageSubscriptionRequest.endBarrageSubscriptionRequest(doGetRequest));
-
-                    subscriptionRequestWrapper.setAppMetadata(
-                            WebBarrageUtils.wrapMessage(doGetRequest, BarrageMessageType.BarrageSubscriptionRequest));
-                    doExchange.send(subscriptionRequestWrapper);
-
-                    String[] columnTypes = Arrays.stream(tableDefinition.getColumns())
-                            .map(ColumnDefinition::getType)
-                            .toArray(String[]::new);
-                    doExchange.onStatus(status -> {
-                        if (!status.isOk()) {
-                            failureHandled(status.getDetails());
-                        }
-                    });
-                    doExchange.onEnd(status -> {
-                        this.stream = null;
-                    });
-                    doExchange.onData(flightData -> {
-                        Message message = Message.getRootAsMessage(new ByteBuffer(flightData.getDataHeader_asU8()));
-                        if (message.headerType() == MessageHeader.Schema) {
-                            // ignore for now, we'll handle this later
-                            return;
-                        }
-                        assert message.headerType() == MessageHeader.RecordBatch;
-                        RecordBatch header = message.header(new RecordBatch());
-                        Uint8Array appMetadataBytes = flightData.getAppMetadata_asU8();
-                        BarrageUpdateMetadata update = null;
-                        if (appMetadataBytes.length != 0) {
-                            BarrageMessageWrapper barrageMessageWrapper =
-                                    BarrageMessageWrapper.getRootAsBarrageMessageWrapper(
-                                            new ByteBuffer(
-                                                    appMetadataBytes));
-
-                            update = BarrageUpdateMetadata.getRootAsBarrageUpdateMetadata(
-                                    new ByteBuffer(
-                                            new Uint8Array(barrageMessageWrapper.msgPayloadArray())));
-                        }
-                        TableSnapshot snapshot = WebBarrageUtils.createSnapshot(header,
-                                WebBarrageUtils.typedArrayToLittleEndianByteBuffer(flightData.getDataBody_asU8()),
-                                update,
-                                true,
-                                columnTypes);
-
-                        final RangeSet includedRows = snapshot.getIncludedRows();
-                        double offset = firstRow;
-                        assert includedRows.isEmpty() || Js.asInt(offset) == includedRows.getFirstRow();
-                        TreeViewportData vd = new TreeViewportData(
-                                offset,
-                                includedRows.isEmpty() ? 0 : includedRows.size(),
-                                snapshot.getTableSize(),
-                                snapshot.getDataColumns(),
-                                queryColumns);
-
-                        handleUpdate(nextSort, nextFilters, vd, alwaysFireEvent);
-                    });
-                    return Promise.resolve(doExchange);
+
+                    ClientTableState state = new ClientTableState(connection,
+                            new TableTicket(viewTicket.ticket().getTicket_asU8()), (callback, newState, metadata) -> {
+                                callback.apply("fail, trees dont reconnect like this", null);
+                            }, "");
+                    ExportedTableCreationResponse def = new ExportedTableCreationResponse();
+                    HierarchicalTableDescriptor treeDescriptor =
+                            HierarchicalTableDescriptor.deserializeBinary(widget.getDataAsU8());
+                    def.setSchemaHeader(treeDescriptor.getSnapshotSchema_asU8());
+                    def.setResultId(new TableReference());
+                    def.getResultId().setTicket(viewTicket.ticket());
+                    state.applyTableCreationResponse(def);
+
+                    TreeSubscription subscription = new TreeSubscription(state, connection);
+
+                    subscription.addEventListener(TreeSubscription.EVENT_UPDATED,
+                            (Event<AbstractTableSubscription.UpdateEventData> data) -> {
+                                TreeSubscription.TreeViewportDataImpl detail =
+                                        (TreeSubscription.TreeViewportDataImpl) data.getDetail();
+
+                                handleUpdate(nextSort, nextFilters, detail, alwaysFireEvent);
+                            });
+                    return Promise.resolve(subscription);
                 });
         stream.catch_(err -> {
             // if this is the active attempt at a subscription, report the error
@@ -765,7 +687,7 @@ private <T> IThenable.ThenOnFulfilledCallbackFn<T, T> defer() {
     }
 
     private void handleUpdate(List<Sort> nextSort, List<FilterCondition> nextFilters,
-            TreeViewportData viewportData, boolean alwaysFireEvent) {
+            TreeSubscription.TreeViewportDataImpl viewportData, boolean alwaysFireEvent) {
         JsLog.debug("tree table response arrived", viewportData);
         if (closed) {
             // ignore
@@ -781,9 +703,7 @@ private void handleUpdate(List<Sort> nextSort, List<FilterCondition> nextFilters
         this.filters = nextFilters;
 
         if (fireEvent) {
-            CustomEventInit<TreeViewportData> updatedEvent = CustomEventInit.create();
-            updatedEvent.setDetail(viewportData);
-            fireEvent(EVENT_UPDATED, updatedEvent);
+            fireEvent(EVENT_UPDATED, viewportData);
         }
     }
 
@@ -863,7 +783,7 @@ static RowReferenceUnion of(@DoNotAutobox Object o) {
 
         @JsOverlay
         default boolean isTreeRow() {
-            return this instanceof TreeRow;
+            return this instanceof TreeSubscription.TreeRowImpl;
         }
 
         @JsOverlay
@@ -873,7 +793,7 @@ default boolean isNumber() {
 
         @JsOverlay
         @TsUnionMember
-        default TreeRow asTreeRow() {
+        default TreeViewportData.TreeRow asTreeRow() {
             return Js.cast(this);
         }
 
@@ -889,9 +809,10 @@ default double asNumber() {
      * the size of the table will change. If node is to be expanded and the third parameter, <b>expandDescendants</b>,
      * is true, then its children will also be expanded.
      *
-     * @param row
-     * @param isExpanded
-     * @param expandDescendants
+     * @param row the row to expand or collapse, either the absolute row index or the row object
+     * @param isExpanded true to expand the row, false to collapse
+     * @param expandDescendants true to expand the row and all descendants, false to expand only the row, defaults to
+     *        false
      */
     public void setExpanded(RowReferenceUnion row, boolean isExpanded, @JsOptional Boolean expandDescendants) {
         // TODO check row number is within bounds
@@ -904,11 +825,12 @@ public void setExpanded(RowReferenceUnion row, boolean isExpanded, @JsOptional B
             action = ACTION_EXPAND;
         }
 
-        final TreeRow r;
+        final TreeSubscription.TreeRowImpl r;
         if (row.isNumber()) {
-            r = currentViewportData.rows.getAt((int) (row.asNumber() - currentViewportData.offset));
+            r = (TreeSubscription.TreeRowImpl) currentViewportData.getRows()
+                    .getAt((int) (row.asNumber() - currentViewportData.getOffset()));
         } else if (row.isTreeRow()) {
-            r = row.asTreeRow();
+            r = (TreeSubscription.TreeRowImpl) row.asTreeRow();
         } else {
             throw new IllegalArgumentException("row parameter must be an index or a row");
         }
@@ -926,18 +848,18 @@ public void collapseAll() {
     }
 
     /**
-     * true if the given row is expanded, false otherwise. Equivalent to `TreeRow.isExpanded`, if an instance of the row
-     * is available
+     * Tests if the specified row is expanded.
      * 
-     * @param row
-     * @return boolean
+     * @param row the row to test, either the absolute row index or the row object
+     * @return boolean true if the row is expanded, false otherwise
      */
     public boolean isExpanded(RowReferenceUnion row) {
-        final TreeRow r;
+        final TreeSubscription.TreeRowImpl r;
         if (row.isNumber()) {
-            r = currentViewportData.rows.getAt((int) (row.asNumber() - currentViewportData.offset));
+            r = (TreeSubscription.TreeRowImpl) currentViewportData.getRows()
+                    .getAt((int) (row.asNumber() - currentViewportData.getOffset()));
         } else if (row.isTreeRow()) {
-            r = row.asTreeRow();
+            r = (TreeSubscription.TreeRowImpl) row.asTreeRow();
         } else {
             throw new IllegalArgumentException("row parameter must be an index or a row");
         }
@@ -956,8 +878,8 @@ public void setViewport(double firstRow, double lastRow, @JsOptional @JsNullable
         replaceSubscription(RebuildStep.SUBSCRIPTION);
     }
 
-    public Promise<TreeViewportData> getViewportData() {
-        LazyPromise<TreeViewportData> promise = new LazyPromise<>();
+    public Promise<@TsTypeRef(TreeViewportData.class) Object> getViewportData() {
+        LazyPromise<Object> promise = new LazyPromise<>();
 
         if (currentViewportData == null) {
             // only one of these two will fire, and when they do, they'll remove both handlers.
@@ -1020,8 +942,7 @@ public void close() {
         }
         if (stream != null) {
             stream.then(stream -> {
-                stream.end();
-                stream.cancel();
+                stream.close();
                 return null;
             });
             stream = null;
@@ -1036,6 +957,7 @@ public void close() {
     }
 
     @Override
+    @JsIgnore
     public TypedTicket typedTicket() {
         return widget.typedTicket();
     }
diff --git a/web/client-api/src/main/java/io/deephaven/web/client/api/tree/TreeViewportData.java b/web/client-api/src/main/java/io/deephaven/web/client/api/tree/TreeViewportData.java
new file mode 100644
index 00000000000..6e00b17bf39
--- /dev/null
+++ b/web/client-api/src/main/java/io/deephaven/web/client/api/tree/TreeViewportData.java
@@ -0,0 +1,60 @@
+//
+// Copyright (c) 2016-2024 Deephaven Data Labs and Patent Pending
+//
+package io.deephaven.web.client.api.tree;
+
+import com.vertispan.tsdefs.annotations.TsTypeRef;
+import elemental2.core.JsArray;
+import io.deephaven.web.client.api.TableData;
+import jsinterop.annotations.JsProperty;
+import jsinterop.annotations.JsType;
+
+@JsType(namespace = "dh")
+public interface TreeViewportData extends TableData {
+    @JsProperty
+    double getTreeSize();
+
+    @Override
+    @TsTypeRef(TreeRow.class)
+    default TableData.Row get(RowPositionUnion index) {
+        return TableData.super.get(index);
+    }
+
+    @JsProperty
+    @Override
+    JsArray<TableData.@TsTypeRef(TreeRow.class) Row> getRows();
+
+    /**
+     * Row implementation that also provides additional read-only properties. represents visible rows in the table, but
+     * with additional properties to reflect the tree structure.
+     */
+    @JsType
+    interface TreeRow extends TableData.Row {
+        /**
+         * True if this node is currently expanded to show its children; false otherwise. Those children will be the
+         * rows below this one with a greater depth than this one.
+         *
+         * @return boolean
+         */
+        @JsProperty(name = "isExpanded")
+        boolean isExpanded();
+
+        /**
+         * True if this node has children and can be expanded; false otherwise. Note that this value may change when the
+         * table updates, depending on the table's configuration.
+         *
+         * @return boolean
+         */
+        @JsProperty(name = "hasChildren")
+        boolean hasChildren();
+
+        /**
+         * The number of levels above this node; zero for top level nodes. Generally used by the UI to indent the row
+         * and its expand/collapse icon.
+         *
+         * @return int
+         */
+        @JsProperty(name = "depth")
+        int depth();
+    }
+}
diff --git a/web/client-api/src/main/java/io/deephaven/web/client/api/widget/JsWidget.java b/web/client-api/src/main/java/io/deephaven/web/client/api/widget/JsWidget.java
index e0a35c53791..68d55d86c34 100644
--- a/web/client-api/src/main/java/io/deephaven/web/client/api/widget/JsWidget.java
+++ b/web/client-api/src/main/java/io/deephaven/web/client/api/widget/JsWidget.java
@@ -10,15 +10,14 @@
 import elemental2.core.ArrayBufferView;
 import elemental2.core.JsArray;
 import elemental2.core.Uint8Array;
-import elemental2.dom.CustomEventInit;
 import elemental2.promise.Promise;
 import io.deephaven.javascript.proto.dhinternal.io.deephaven.proto.object_pb.*;
 import io.deephaven.javascript.proto.dhinternal.io.deephaven.proto.ticket_pb.Ticket;
 import io.deephaven.javascript.proto.dhinternal.io.deephaven.proto.ticket_pb.TypedTicket;
-import io.deephaven.web.client.api.HasEventHandling;
 import io.deephaven.web.client.api.ServerObject;
 import io.deephaven.web.client.api.WorkerConnection;
 import io.deephaven.web.client.api.barrage.stream.BiDiStream;
+import io.deephaven.web.client.api.event.HasEventHandling;
 import jsinterop.annotations.JsMethod;
 import jsinterop.annotations.JsOptional;
 import jsinterop.annotations.JsOverlay;
@@ -153,9 +152,7 @@ public Promise<JsWidget> refetch() {
                     hasFetched = true;
                     resolve.onInvoke(this);
                 } else {
-                    CustomEventInit<EventDetails> messageEvent = CustomEventInit.create();
-                    messageEvent.setDetail(new EventDetails(res.getData(), responseObjects));
-                    fireEvent(EVENT_MESSAGE, messageEvent);
+                    fireEvent(EVENT_MESSAGE, new EventDetails(res.getData(), responseObjects));
                 }
             });
             messageStream.onStatus(status -> {
diff --git a/web/client-api/src/main/java/io/deephaven/web/client/api/widget/plot/ChartData.java b/web/client-api/src/main/java/io/deephaven/web/client/api/widget/plot/ChartData.java
index 8a30411fd33..bd08d045bf2 100644
--- a/web/client-api/src/main/java/io/deephaven/web/client/api/widget/plot/ChartData.java
+++ b/web/client-api/src/main/java/io/deephaven/web/client/api/widget/plot/ChartData.java
@@ -5,12 +5,12 @@
 
 import elemental2.core.JsArray;
 import io.deephaven.web.client.api.Column;
-import io.deephaven.web.client.api.JsRangeSet;
 import io.deephaven.web.client.api.JsTable;
 import io.deephaven.web.client.api.TableData;
-import io.deephaven.web.client.api.subscription.SubscriptionTableData.UpdateEventData;
-import io.deephaven.web.client.fu.JsSettings;
+import io.deephaven.web.client.api.subscription.AbstractTableSubscription;
+import io.deephaven.web.client.api.subscription.SubscriptionTableData;
 import io.deephaven.web.shared.data.Range;
+import io.deephaven.web.shared.data.RangeSet;
 import io.deephaven.web.shared.fu.JsFunction;
 import jsinterop.annotations.JsType;
 import jsinterop.base.Any;
@@ -28,117 +28,51 @@
 public class ChartData {
     private final JsTable table;
 
-    private final long[] indexes = new long[0];// in the browser, this array can grow
+    private RangeSet prevRanges;
     private final Map<String, Map<JsFunction<Any, Any>, JsArray<Any>>> cachedData = new HashMap<>();
 
     public ChartData(JsTable table) {
         this.table = table;
     }
 
-    public void update(UpdateEventData tableData) {
-        Iterator<Range> addedIterator = tableData.getAdded().getRange().rangeIterator();
-        Iterator<Range> removedIterator = tableData.getRemoved().getRange().rangeIterator();
-        Iterator<Range> modifiedIterator = tableData.getModified().getRange().rangeIterator();
-
-        Range nextAdded = addedIterator.hasNext() ? addedIterator.next() : null;
-        Range nextRemoved = removedIterator.hasNext() ? removedIterator.next() : null;
-        Range nextModified = modifiedIterator.hasNext() ? modifiedIterator.next() : null;
-        int i = 0;
-
-        // not useful for adding/modifying data, but fast and easy to use when removing rows
-        JsArray<Any>[] allColumns;
-        if (nextRemoved != null) {
+    public void update(AbstractTableSubscription.SubscriptionEventData tableData) {
+        RangeSet positionsForAddedKeys = tableData.getFullIndex().getRange().invert(tableData.getAdded().getRange());
+        RangeSet positionsForRemovedKeys = prevRanges.invert(tableData.getRemoved().getRange());
+        RangeSet positionsForModifiedKeys =
+                tableData.getFullIndex().getRange().invert(tableData.getModified().getRange());
+        prevRanges = tableData.getFullIndex().getRange().copy();
+        // removes first from the previous set of ranges
+        Iterator<Range> removedPositions = positionsForRemovedKeys.reverseRangeIterator();
+        JsArray<Any>[] allColumns = null;
+        if (removedPositions.hasNext()) {
             // noinspection unchecked
             allColumns = cachedData.values().stream().flatMap(m -> m.values().stream()).toArray(JsArray[]::new);
-        } else {
-            allColumns = null;
         }
 
-        while (nextAdded != null || nextRemoved != null || nextModified != null) {
-            if (i >= indexes.length) {
-                // We're past the end, nothing possibly left to remove, just append all the new items
-                // Note that this is the first case we'll hit on initial snapshot
-                assert nextRemoved == null;
-                assert nextModified == null;
-                while (nextAdded != null) {
-                    insertDataRange(tableData, nextAdded, i);
-
-                    // increment i past these new items so our offset is correct if there is a next block
-                    i += nextAdded.size();
-
-                    // not bothering with i or lastIndexSeen since we will break after this while loop
-                    nextAdded = addedIterator.hasNext() ? addedIterator.next() : null;
-                }
-                break;
-            }
-
-            long nextIndex = indexes[i];
-
-            // check for added items first, since we will insert items just before the current
-            // index, while the other two start at the current index
-            if (nextAdded != null && nextAdded.getFirst() < nextIndex) {
-                assert nextAdded.getLast() < nextIndex;// the whole range should be there if any is
-
-                // update the index array and insert the actual data into our mapped columns
-                insertDataRange(tableData, nextAdded, i);
-
-                // increment i past these new items, so that our "next" is actually next
-                i += nextAdded.size();
-
-                nextAdded = addedIterator.hasNext() ? addedIterator.next() : null;
-            } else if (nextModified != null && nextModified.getFirst() == nextIndex) {
-                assert nextModified.getLast() >= nextIndex; // somehow being asked to update an item which wasn't
-                                                            // present
-
-                // the updated block is contiguous, make sure there are at least that many items to tweak
-                assert indexes.length - i >= nextModified.size();
-
-                replaceDataRange(tableData, nextModified, i);
-
-                // advance i past this section, since no other change can happen to these rows
-                i += nextModified.size();
-
-                nextModified = modifiedIterator.hasNext() ? modifiedIterator.next() : null;
-            } else if (nextRemoved != null && nextRemoved.getFirst() == nextIndex) {
-                assert nextRemoved.getLast() >= nextIndex; // somehow being asked to remove an item which wasn't present
-
-                // the block being removed is contiguous, so make sure there are at least that many and splice them out
-                assert indexes.length - i >= nextRemoved.size();
-
-                // splice out the indexes
-                asArray(indexes).splice(i, (int) nextRemoved.size());
-
-                // splice out the data itself
-                assert allColumns != null;
-                for (JsArray<Any> column : allColumns) {
-                    column.splice(i, (int) nextRemoved.size());
-                }
-
-                // don't in/decrement i, we'll just keep going
-                nextRemoved = removedIterator.hasNext() ? removedIterator.next() : null;
-            } else {
-
-                // no match, keep reading
-                i++;
+        while (removedPositions.hasNext()) {
+            Range nextRemoved = removedPositions.next();
+            for (JsArray<Any> column : allColumns) {
+                column.splice((int) nextRemoved.getFirst(), (int) nextRemoved.size());
             }
         }
 
-        if (JsSettings.isDevMode()) {
-            assert tableData.getRows().length == indexes.length;
-            assert cachedData.values().stream().flatMap(m -> m.values().stream())
-                    .allMatch(arr -> arr.length == indexes.length);
-            assert cachedData.values().stream().flatMap(m -> m.values().stream()).allMatch(arr -> arr
-                    .reduce((Object val, Any p1, int p2) -> ((Integer) val) + 1, 0) == indexes.length);
+        // then adds
+        Iterator<Range> addedPositions = positionsForAddedKeys.rangeIterator();
+        while (addedPositions.hasNext()) {
+            Range nextAdded = addedPositions.next();
+            insertDataRange(tableData, nextAdded);
+        }
 
-            JsRangeSet fullIndex = tableData.getFullIndex();
-            PrimitiveIterator.OfLong iter = fullIndex.getRange().indexIterator();
-            for (int j = 0; j < indexes.length; j++) {
-                assert indexes[j] == iter.nextLong();
-            }
+        Iterator<Range> modifiedPositions = positionsForModifiedKeys.rangeIterator();
+        while (modifiedPositions.hasNext()) {
+            Range nextModified = modifiedPositions.next();
+            replaceDataRange(tableData, nextModified);
         }
     }
 
-    private void replaceDataRange(UpdateEventData tableData, Range range, int offset) {
+    private void replaceDataRange(SubscriptionTableData tableData, Range positions) {
+        RangeSet keys = tableData.getFullIndex().getRange()
+                .subsetForPositions(RangeSet.ofRange(positions.getFirst(), positions.getLast()), true);
         // we don't touch the indexes at all, only need to walk each column and replace values in this range
         for (Entry<String, Map<JsFunction<Any, Any>, JsArray<Any>>> columnMap : cachedData.entrySet()) {
             Column col = table.findColumn(columnMap.getKey());
@@ -147,23 +81,27 @@ private void replaceDataRange(UpdateEventData tableData, Range range, int offset
                 JsArray<Any> arr = mapFuncAndArray.getValue();
 
                 // rather than getting a slice and splicing it in, just update each value
+                PrimitiveIterator.OfLong iter = keys.indexIterator();
+                int i = 0;
                 if (func == null) {
-                    for (int i = 0; i < range.size(); i++) {
-                        arr.setAt(offset + i, tableData.getData(range.getFirst() + i, col));
+                    while (iter.hasNext()) {
+                        arr.setAt(i++, tableData.getData(iter.next(), col));
                     }
                 } else {
-                    for (int i = 0; i < range.size(); i++) {
-                        arr.setAt(offset + i, func.apply(tableData.getData(range.getFirst() + i, col)));
+                    while (iter.hasNext()) {
+                        arr.setAt(i++, tableData.getData(iter.next(), col));
                     }
                 }
             }
         }
     }
 
-    private void insertDataRange(UpdateEventData tableData, Range range, int offset) {
-        // splice in the new indexes
-        batchSplice(offset, asArray(indexes), longs(range));
-
+    /**
+     * From the event data, insert a contiguous range of rows to each column.
+     */
+    private void insertDataRange(SubscriptionTableData tableData, Range positions) {
+        RangeSet keys = tableData.getFullIndex().getRange()
+                .subsetForPositions(RangeSet.ofRange(positions.getFirst(), positions.getLast()), false);
         // splice in data to each column
         for (Entry<String, Map<JsFunction<Any, Any>, JsArray<Any>>> columnMap : cachedData.entrySet()) {
             String columnName = columnMap.getKey();
@@ -174,13 +112,13 @@ private void insertDataRange(UpdateEventData tableData, Range range, int offset)
 
                 // here we create a new array and splice it in, to avoid slowly growing the data array in the case
                 // of many rows being added
-                Any[] values = values(tableData, func, col, range);
-                batchSplice(offset, arr, values);
+                Any[] values = values(tableData, func, col, keys);
+                batchSplice((int) positions.getFirst(), arr, values);
             }
         }
     }
 
-    private Any[] batchSplice(int offset, JsArray<Any> existingData, Any[] dataToInsert) {
+    private void batchSplice(int offset, JsArray<Any> existingData, Any[] dataToInsert) {
         int lengthToInsert = dataToInsert.length;
         JsArray<Any> jsArrayToInsert = Js.uncheckedCast(dataToInsert);
 
@@ -191,39 +129,24 @@ private Any[] batchSplice(int offset, JsArray<Any> existingData, Any[] dataToIns
             existingData.splice(offset + i, 0,
                     jsArrayToInsert.slice(i, Math.min(i + batchSize, lengthToInsert)).asArray(new Any[0]));
         }
-
-        return Js.uncheckedCast(existingData);
     }
 
-    private Any[] values(UpdateEventData tableData, JsFunction<Any, Any> mapFunc, Column col, Range insertedRange) {
+    private Any[] values(SubscriptionTableData tableData, JsFunction<Any, Any> mapFunc, Column col,
+            RangeSet keys) {
         JsArray<Any> result = new JsArray<>();
 
+        PrimitiveIterator.OfLong iter = keys.indexIterator();
         if (mapFunc == null) {
-            for (int i = 0; i < insertedRange.size(); i++) {
-                result.push(tableData.getData(insertedRange.getFirst() + i, col));
+            while (iter.hasNext()) {
+                result.push(tableData.getData(iter.next(), col));
             }
         } else {
-            for (int i = 0; i < insertedRange.size(); i++) {
-                result.push(mapFunc.apply(tableData.getData(insertedRange.getFirst() + i, col)));
+            while (iter.hasNext()) {
+                result.push(mapFunc.apply(tableData.getData(iter.next(), col)));
             }
         }
 
         return Js.uncheckedCast(result);
-
-    }
-
-    private static JsArray<Any> asArray(Object obj) {
-        return Js.uncheckedCast(obj);
-    }
-
-    private static Any[] longs(Range range) {
-        long[] longs = new long[(int) range.size()];
-
-        for (int i = 0; i < longs.length; i++) {
-            longs[i] = range.getFirst() + i;
-        }
-
-        return Js.uncheckedCast(longs);
     }
 
     public JsArray<Any> getColumn(String columnName, JsFunction<Any, Any> mappingFunc, TableData currentUpdate) {
diff --git a/web/client-api/src/main/java/io/deephaven/web/client/api/widget/plot/FigureSubscription.java b/web/client-api/src/main/java/io/deephaven/web/client/api/widget/plot/FigureSubscription.java
index 2b1ed636861..166d133aecf 100644
--- a/web/client-api/src/main/java/io/deephaven/web/client/api/widget/plot/FigureSubscription.java
+++ b/web/client-api/src/main/java/io/deephaven/web/client/api/widget/plot/FigureSubscription.java
@@ -3,13 +3,11 @@
 //
 package io.deephaven.web.client.api.widget.plot;
 
-import elemental2.dom.CustomEvent;
-import elemental2.dom.CustomEventInit;
 import elemental2.promise.Promise;
 import io.deephaven.web.client.api.DateWrapper;
 import io.deephaven.web.client.api.JsTable;
 import io.deephaven.web.client.api.LongWrapper;
-import io.deephaven.web.client.api.subscription.SubscriptionTableData;
+import io.deephaven.web.client.api.subscription.AbstractTableSubscription;
 import io.deephaven.web.client.api.subscription.TableSubscription;
 import io.deephaven.web.client.fu.JsLog;
 
@@ -83,25 +81,20 @@ public Set<JsSeries> replaceSeries(final Set<JsSeries> replacements) {
 
         // For each of the series in copy, if this subscription is downsampled we need to notify of this fact.
         if (downsampleAxisRange != null) {
-            CustomEventInit init = CustomEventInit.create();
-            init.setDetail(replacements.toArray());
-            figure.fireEvent(JsFigure.EVENT_DOWNSAMPLESTARTED, init);
+            figure.fireEvent(JsFigure.EVENT_DOWNSAMPLESTARTED, replacements.toArray());
         }
 
         if (firstEventFired) {
             // Next, if any data has loaded, regardless of downsample state, we need to fire an update event for those
             // series
-            CustomEventInit event = CustomEventInit.create();
-            event.setDetail(new DataUpdateEvent(replacements.toArray(new JsSeries[0]), currentData, null));
-            figure.fireEvent(JsFigure.EVENT_UPDATED, event);
+            figure.fireEvent(JsFigure.EVENT_UPDATED,
+                    new DataUpdateEvent(replacements.toArray(new JsSeries[0]), currentData, null));
 
             // Finally, if data was loaded and also the subscription is downsampled, we need to notify that the
             // downsample
             // is complete
             if (downsampleAxisRange != null) {
-                CustomEventInit successInit = CustomEventInit.create();
-                successInit.setDetail(replacements.toArray());
-                figure.fireEvent(JsFigure.EVENT_DOWNSAMPLEFINISHED, successInit);
+                figure.fireEvent(JsFigure.EVENT_DOWNSAMPLEFINISHED, replacements.toArray());
             }
         }
 
@@ -212,9 +205,7 @@ public void subscribe() {
                 } else {
                     zoomRange = null;
                 }
-                CustomEventInit init = CustomEventInit.create();
-                init.setDetail(includedSeries.toArray());
-                figure.fireEvent(JsFigure.EVENT_DOWNSAMPLESTARTED, init);
+                figure.fireEvent(JsFigure.EVENT_DOWNSAMPLESTARTED, includedSeries.toArray());
                 Promise<JsTable> downsampled =
                         tablePromise.then(t -> t
                                 .downsample(zoomRange, downsampleParams.getPixelCount(), downsampleAxisRange.getxCol(),
@@ -259,22 +250,19 @@ private Promise<TableSubscription> subscribe(final Promise<JsTable> tablePromise
             this.currentData = new ChartData(table);
             sub.addEventListener(TableSubscription.EVENT_UPDATED, e -> {
                 // refire with specifics for the columns that we're watching here, after updating data arrays
-                SubscriptionTableData.UpdateEventData subscriptionUpdateData =
-                        (SubscriptionTableData.UpdateEventData) ((CustomEvent) e).detail;
+                AbstractTableSubscription.SubscriptionEventData subscriptionUpdateData =
+                        (AbstractTableSubscription.SubscriptionEventData) e.getDetail();
                 currentData.update(subscriptionUpdateData);
 
-                CustomEventInit event = CustomEventInit.create();
-                event.setDetail(new DataUpdateEvent(includedSeries.toArray(new JsSeries[0]), currentData,
-                        subscriptionUpdateData));
-                figure.fireEvent(JsFigure.EVENT_UPDATED, event);
+                figure.fireEvent(JsFigure.EVENT_UPDATED,
+                        new DataUpdateEvent(includedSeries.toArray(new JsSeries[0]), currentData,
+                                subscriptionUpdateData));
 
                 if (!firstEventFired) {
                     firstEventFired = true;
 
                     if (downsampleAxisRange != null) {
-                        CustomEventInit successInit = CustomEventInit.create();
-                        successInit.setDetail(includedSeries.toArray());
-                        figure.fireEvent(JsFigure.EVENT_DOWNSAMPLEFINISHED, successInit);
+                        figure.fireEvent(JsFigure.EVENT_DOWNSAMPLEFINISHED, includedSeries.toArray());
                     }
                 }
             });
diff --git a/web/client-api/src/main/java/io/deephaven/web/client/api/widget/plot/JsChart.java b/web/client-api/src/main/java/io/deephaven/web/client/api/widget/plot/JsChart.java
index 989ecd8982d..51649f4d39b 100644
--- a/web/client-api/src/main/java/io/deephaven/web/client/api/widget/plot/JsChart.java
+++ b/web/client-api/src/main/java/io/deephaven/web/client/api/widget/plot/JsChart.java
@@ -7,7 +7,7 @@
 import elemental2.core.JsArray;
 import elemental2.core.JsObject;
 import io.deephaven.javascript.proto.dhinternal.io.deephaven.proto.console_pb.figuredescriptor.ChartDescriptor;
-import io.deephaven.web.client.api.HasEventHandling;
+import io.deephaven.web.client.api.event.HasEventHandling;
 import io.deephaven.web.client.api.widget.plot.enums.JsChartType;
 import jsinterop.annotations.JsIgnore;
 import jsinterop.annotations.JsNullable;
diff --git a/web/client-api/src/main/java/io/deephaven/web/client/api/widget/plot/JsFigure.java b/web/client-api/src/main/java/io/deephaven/web/client/api/widget/plot/JsFigure.java
index f16ea87f6fd..c3cd507f37c 100644
--- a/web/client-api/src/main/java/io/deephaven/web/client/api/widget/plot/JsFigure.java
+++ b/web/client-api/src/main/java/io/deephaven/web/client/api/widget/plot/JsFigure.java
@@ -5,7 +5,6 @@
 
 import elemental2.core.JsArray;
 import elemental2.core.JsObject;
-import elemental2.dom.CustomEventInit;
 import elemental2.promise.Promise;
 import io.deephaven.javascript.proto.dhinternal.io.deephaven.proto.console_pb.FigureDescriptor;
 import io.deephaven.javascript.proto.dhinternal.io.deephaven.proto.console_pb.figuredescriptor.AxisDescriptor;
@@ -236,10 +235,8 @@ public Promise<JsFigure> refetch() {
             final FigureFetchError fetchError = new FigureFetchError(LazyPromise.ofObject(err),
                     this.descriptor != null ? this.descriptor.getErrorsList() : new JsArray<>());
             // noinspection unchecked
-            final CustomEventInit<FigureFetchError> init = CustomEventInit.create();
-            init.setDetail(fetchError);
             unsuppressEvents();
-            fireEvent(EVENT_RECONNECTFAILED, init);
+            fireEvent(EVENT_RECONNECTFAILED, fetchError);
             suppressEvents();
 
             // noinspection unchecked,rawtypes
@@ -269,10 +266,8 @@ public void reconnect() {
                     enqueueSubscriptionCheck();
                     return null;
                 }, failure -> {
-                    CustomEventInit<Object> init = CustomEventInit.create();
-                    init.setDetail(failure);
                     unsuppressEvents();
-                    fireEvent(EVENT_RECONNECTFAILED, init);
+                    fireEvent(EVENT_RECONNECTFAILED, failure);
                     suppressEvents();
                     return null;
                 });
@@ -362,16 +357,14 @@ public void unsubscribe() {
 
     @JsIgnore
     public void downsampleNeeded(String message, Set<JsSeries> series, double tableSize) {
-        CustomEventInit failInit = CustomEventInit.create();
-        failInit.setDetail(JsPropertyMap.of("series", series, "message", message, "size", tableSize));
-        fireEvent(EVENT_DOWNSAMPLENEEDED, failInit);
+        fireEvent(EVENT_DOWNSAMPLENEEDED,
+                JsPropertyMap.of("series", series, "message", message, "size", tableSize));
     }
 
     @JsIgnore
     public void downsampleFailed(String message, Set<JsSeries> series, double tableSize) {
-        CustomEventInit failInit = CustomEventInit.create();
-        failInit.setDetail(JsPropertyMap.of("series", series, "message", message, "size", tableSize));
-        fireEvent(EVENT_DOWNSAMPLEFAILED, failInit);
+        fireEvent(EVENT_DOWNSAMPLEFAILED,
+                JsPropertyMap.of("series", series, "message", message, "size", tableSize));
     }
 
     private void updateSubscriptions() {
diff --git a/web/client-api/src/main/java/io/deephaven/web/client/api/widget/plot/JsFigureFactory.java b/web/client-api/src/main/java/io/deephaven/web/client/api/widget/plot/JsFigureFactory.java
index 0b2dd4109ca..83360061f78 100644
--- a/web/client-api/src/main/java/io/deephaven/web/client/api/widget/plot/JsFigureFactory.java
+++ b/web/client-api/src/main/java/io/deephaven/web/client/api/widget/plot/JsFigureFactory.java
@@ -5,7 +5,6 @@
 
 import com.vertispan.tsdefs.annotations.TsTypeRef;
 import elemental2.core.JsArray;
-import elemental2.dom.CustomEventInit;
 import elemental2.promise.Promise;
 import io.deephaven.javascript.proto.dhinternal.io.deephaven.proto.console_pb.FigureDescriptor;
 import io.deephaven.javascript.proto.dhinternal.io.deephaven.proto.console_pb.figuredescriptor.*;
@@ -82,9 +81,7 @@ private static Promise<JsFigure> create(JsFigureDescriptor descriptor) {
                                             figure.fireEvent(JsFigure.EVENT_RECONNECT);
                                             figure.enqueueSubscriptionCheck();
                                         } catch (JsFigure.FigureSourceException e) {
-                                            final CustomEventInit init = CustomEventInit.create();
-                                            init.setDetail(e);
-                                            figure.fireEvent(JsFigure.EVENT_RECONNECTFAILED, init);
+                                            figure.fireEvent(JsFigure.EVENT_RECONNECTFAILED, e);
                                         }
                                     }));
                                     removerFns
@@ -94,9 +91,7 @@ private static Promise<JsFigure> create(JsFigureDescriptor descriptor) {
                                                 }
                                                 figure.unsubscribe();
 
-                                                final CustomEventInit init = CustomEventInit.create();
-                                                init.setDetail(err);
-                                                figure.fireEvent(JsFigure.EVENT_RECONNECTFAILED, init);
+                                                figure.fireEvent(JsFigure.EVENT_RECONNECTFAILED, err);
                                             }));
                                 }
 
diff --git a/web/client-api/src/main/java/io/deephaven/web/client/api/widget/plot/JsMultiSeries.java b/web/client-api/src/main/java/io/deephaven/web/client/api/widget/plot/JsMultiSeries.java
index 482bb9e281f..f377dc99e0c 100644
--- a/web/client-api/src/main/java/io/deephaven/web/client/api/widget/plot/JsMultiSeries.java
+++ b/web/client-api/src/main/java/io/deephaven/web/client/api/widget/plot/JsMultiSeries.java
@@ -6,12 +6,9 @@
 import com.vertispan.tsdefs.annotations.TsInterface;
 import com.vertispan.tsdefs.annotations.TsName;
 import com.vertispan.tsdefs.annotations.TsTypeRef;
-import elemental2.dom.CustomEvent;
-import elemental2.dom.CustomEventInit;
 import io.deephaven.javascript.proto.dhinternal.io.deephaven.proto.console_pb.figuredescriptor.*;
 import io.deephaven.web.client.api.JsPartitionedTable;
 import io.deephaven.web.client.api.widget.plot.enums.JsSeriesPlotStyle;
-import jsinterop.annotations.JsIgnore;
 import jsinterop.annotations.JsProperty;
 
 import java.util.Collections;
@@ -47,7 +44,7 @@ public void initSources(Map<Integer, JsPartitionedTable> plotHandlesToPartitione
                         return null;
                     });
                     partitionedTable.addEventListener(JsPartitionedTable.EVENT_KEYADDED, event -> {
-                        requestTable(partitionedTable, ((CustomEvent) event).detail);
+                        requestTable(partitionedTable, event.getDetail());
                     });
 
                 });
@@ -99,13 +96,10 @@ private void requestTable(JsPartitionedTable partitionedTable, Object key) {
             series.setMultiSeries(this);
             series.initSources(Collections.singletonMap(tableId, table), Collections.emptyMap());
 
-            CustomEventInit init = CustomEventInit.create();
-            init.setDetail(series);
-
             parent.addSeriesFromMultiSeries(series);
 
-            figure.fireEvent(JsFigure.EVENT_SERIES_ADDED, init);
-            parent.fireEvent(JsChart.EVENT_SERIES_ADDED, init);
+            figure.fireEvent(JsFigure.EVENT_SERIES_ADDED, series);
+            parent.fireEvent(JsChart.EVENT_SERIES_ADDED, series);
             return null;
         });
     }
diff --git a/web/client-api/src/main/java/io/deephaven/web/client/api/widget/plot/OneClick.java b/web/client-api/src/main/java/io/deephaven/web/client/api/widget/plot/OneClick.java
index d95fa11614b..d1845fe88ce 100644
--- a/web/client-api/src/main/java/io/deephaven/web/client/api/widget/plot/OneClick.java
+++ b/web/client-api/src/main/java/io/deephaven/web/client/api/widget/plot/OneClick.java
@@ -5,10 +5,8 @@
 
 import com.vertispan.tsdefs.annotations.TsInterface;
 import com.vertispan.tsdefs.annotations.TsName;
-import com.vertispan.tsdefs.annotations.TsTypeRef;
 import elemental2.core.JsArray;
 import elemental2.core.JsMap;
-import elemental2.dom.CustomEventInit;
 import elemental2.promise.Promise;
 import io.deephaven.javascript.proto.dhinternal.io.deephaven.proto.console_pb.figuredescriptor.OneClickDescriptor;
 import io.deephaven.web.client.api.Column;
@@ -193,9 +191,7 @@ private void fetchTable() {
                 if (table == null) {
                     // No table, no need to change the figure subscription, just trigger a
                     // synthetic event indicating no items
-                    CustomEventInit event = CustomEventInit.create();
-                    event.setDetail(DataUpdateEvent.empty(jsSeries));
-                    jsFigure.fireEvent(JsFigure.EVENT_UPDATED, event);
+                    jsFigure.fireEvent(JsFigure.EVENT_UPDATED, DataUpdateEvent.empty(jsSeries));
                 } else {
                     // Subscribe to this key and wait for it...
                     currentTable = table;
diff --git a/web/client-api/src/main/java/io/deephaven/web/client/fu/JsWeakRef.java b/web/client-api/src/main/java/io/deephaven/web/client/fu/JsWeakRef.java
new file mode 100644
index 00000000000..35de0ed3e11
--- /dev/null
+++ b/web/client-api/src/main/java/io/deephaven/web/client/fu/JsWeakRef.java
@@ -0,0 +1,16 @@
+//
+// Copyright (c) 2016-2024 Deephaven Data Labs and Patent Pending
+//
+package io.deephaven.web.client.fu;
+
+import jsinterop.annotations.JsPackage;
+import jsinterop.annotations.JsType;
+
+@JsType(namespace = JsPackage.GLOBAL, name = "WeakRef", isNative = true)
+public class JsWeakRef<T> {
+    public JsWeakRef(T target) {
+
+    }
+
+    public native T deref();
+}
diff --git a/web/client-api/src/main/java/io/deephaven/web/client/ide/IdeClient.java b/web/client-api/src/main/java/io/deephaven/web/client/ide/IdeClient.java
deleted file mode 100644
index ce6a4f785f5..00000000000
--- a/web/client-api/src/main/java/io/deephaven/web/client/ide/IdeClient.java
+++ /dev/null
@@ -1,28 +0,0 @@
-//
-// Copyright (c) 2016-2024 Deephaven Data Labs and Patent Pending
-//
-package io.deephaven.web.client.ide;
-
-import elemental2.promise.Promise;
-import io.deephaven.web.client.fu.CancellablePromise;
-import jsinterop.annotations.JsMethod;
-import jsinterop.annotations.JsType;
-
-/**
- */
-@JsType(name = "Ide", namespace = "dh")
-public class IdeClient {
-    @Deprecated
-    @JsMethod(name = "getExistingSession")
-    public Promise<IdeSession> getExistingSession_old(String websocketUrl, String authToken, String serviceId,
-            String language) {
-        return IdeClient.getExistingSession(websocketUrl, authToken, serviceId, language);
-    }
-
-    @Deprecated
-    public static CancellablePromise<IdeSession> getExistingSession(String websocketUrl, String authToken,
-            String serviceId, String language) {
-        IdeConnection ideConnection = new IdeConnection(websocketUrl, null, true);
-        return ideConnection.startSession(language);
-    }
-}
diff --git a/web/client-api/src/main/java/io/deephaven/web/client/ide/IdeConnection.java b/web/client-api/src/main/java/io/deephaven/web/client/ide/IdeConnection.java
index 7ea7d8a8ed1..1ea9412d769 100644
--- a/web/client-api/src/main/java/io/deephaven/web/client/ide/IdeConnection.java
+++ b/web/client-api/src/main/java/io/deephaven/web/client/ide/IdeConnection.java
@@ -5,10 +5,12 @@
 
 import com.vertispan.tsdefs.annotations.TsTypeRef;
 import elemental2.core.JsArray;
-import elemental2.dom.CustomEventInit;
 import elemental2.promise.Promise;
 import io.deephaven.javascript.proto.dhinternal.browserheaders.BrowserHeaders;
+import io.deephaven.javascript.proto.dhinternal.grpcweb.Grpc;
 import io.deephaven.javascript.proto.dhinternal.grpcweb.grpc.Code;
+import io.deephaven.javascript.proto.dhinternal.grpcweb.grpc.Transport;
+import io.deephaven.javascript.proto.dhinternal.grpcweb.transports.transport.TransportOptions;
 import io.deephaven.javascript.proto.dhinternal.io.deephaven.proto.session_pb.TerminationNotificationResponse;
 import io.deephaven.javascript.proto.dhinternal.io.deephaven.proto.session_pb.terminationnotificationresponse.StackTrace;
 import io.deephaven.web.client.api.ConnectOptions;
@@ -17,13 +19,14 @@
 import io.deephaven.web.client.api.barrage.stream.ResponseStreamWrapper;
 import io.deephaven.web.client.api.console.JsVariableChanges;
 import io.deephaven.web.client.api.console.JsVariableDescriptor;
-import io.deephaven.web.client.fu.JsLog;
+import io.deephaven.web.client.api.grpc.GrpcTransport;
+import io.deephaven.web.client.api.grpc.GrpcTransportFactory;
+import io.deephaven.web.client.api.grpc.GrpcTransportOptions;
+import io.deephaven.web.client.api.grpc.MultiplexedWebsocketTransport;
 import io.deephaven.web.shared.data.ConnectToken;
 import io.deephaven.web.shared.fu.JsConsumer;
 import io.deephaven.web.shared.fu.JsRunnable;
-import jsinterop.annotations.JsConstructor;
 import jsinterop.annotations.JsIgnore;
-import jsinterop.annotations.JsOptional;
 import jsinterop.annotations.JsType;
 import jsinterop.base.JsPropertyMap;
 
@@ -40,38 +43,46 @@ public class IdeConnection extends QueryConnectable<IdeConnection> {
 
     public static final String EVENT_SHUTDOWN = "shutdown";
 
-    private final JsRunnable deathListenerCleanup;
     private final String serverUrl;
 
     private final ConnectToken token = new ConnectToken();
     private final ConnectOptions options;
 
     /**
-     * creates a new instance, from which console sessions can be made. <b>options</b> are optional.
+     * Creates a new instance, from which console sessions can be made.
      * 
      * @param serverUrl The url used when connecting to the server. Read-only.
      * @param connectOptions Optional Object
-     * @param fromJava Optional boolean
      */
-    @Deprecated
-    @JsConstructor
-    public IdeConnection(String serverUrl, @TsTypeRef(ConnectOptions.class) @JsOptional Object connectOptions,
-            @JsOptional Boolean fromJava) {
+    @JsIgnore
+    public IdeConnection(String serverUrl, Object connectOptions) {
+        // Remove trailing slashes from the url
         this.serverUrl = serverUrl.replaceAll("/+$", "");
-        deathListenerCleanup = JsRunnable.doNothing();
 
         if (connectOptions != null) {
             options = new ConnectOptions(connectOptions);
         } else {
             options = new ConnectOptions();
         }
-
-        if (fromJava != Boolean.TRUE) {
-            JsLog.warn(
-                    "dh.IdeConnection constructor is deprecated, please create a dh.CoreClient, call login(), then call getAsIdeConnection()");
-            token.setType("Anonymous");
-            token.setValue("");
-            connection.get().whenServerReady("login").then(ignore -> Promise.resolve((Void) null));
+        if (options.transportFactory == null) {
+            // assign a default transport factory
+            if (options.useWebsockets == Boolean.TRUE || !serverUrl.startsWith("https:")) {
+                options.transportFactory = new MultiplexedWebsocketTransport.Factory();
+            } else {
+                options.transportFactory = new GrpcTransportFactory() {
+                    @Override
+                    public GrpcTransport create(GrpcTransportOptions options) {
+                        return GrpcTransport
+                                .from((Transport) Grpc.FetchReadableStreamTransport.onInvoke(new Object())
+                                        .onInvoke((TransportOptions) options));
+                    }
+
+                    @Override
+                    public boolean getSupportsClientStreaming() {
+                        return false;
+                    }
+                };
+            }
         }
     }
 
@@ -80,33 +91,24 @@ protected String logPrefix() {
         return "IdeConnection on " + getServerUrl() + ": ";
     }
 
-    /**
-     * Temporary method to split logic between IdeConnection and CoreClient
-     */
     @JsIgnore
+    @Override
     public ConnectToken getToken() {
         return token;
     }
 
     @JsIgnore
     @Override
-    public Promise<ConnectToken> getConnectToken() {
-        return Promise.resolve(token);
-    }
-
-    @JsIgnore
-    @Override
-    public Promise<ConnectOptions> getConnectOptions() {
-        return Promise.resolve(options);
+    public ConnectOptions getOptions() {
+        return options;
     }
 
     /**
-     * closes the current connection, releasing any resources on the server or client.
+     * Closes the current connection, releasing any resources on the server or client.
      */
+    // Made public to expose to JS
     public void close() {
         super.close();
-
-        deathListenerCleanup.run();
     }
 
     /**
@@ -182,9 +184,7 @@ public void notifyServerShutdown(TerminationNotificationResponse success) {
         }
 
         // fire shutdown advice event
-        CustomEventInit<String> eventDetails = CustomEventInit.create();
-        eventDetails.setDetail(details);
-        fireEvent(EVENT_SHUTDOWN, eventDetails);
+        fireEvent(EVENT_SHUTDOWN, details);
 
         // fire deprecated event
         notifyConnectionError(new ResponseStreamWrapper.Status() {
diff --git a/web/client-api/src/main/java/io/deephaven/web/client/ide/IdeSession.java b/web/client-api/src/main/java/io/deephaven/web/client/ide/IdeSession.java
index 438c5c857e4..2b7bf6b3a65 100644
--- a/web/client-api/src/main/java/io/deephaven/web/client/ide/IdeSession.java
+++ b/web/client-api/src/main/java/io/deephaven/web/client/ide/IdeSession.java
@@ -7,7 +7,6 @@
 import com.vertispan.tsdefs.annotations.TsTypeRef;
 import elemental2.core.JsArray;
 import elemental2.core.JsSet;
-import elemental2.dom.CustomEventInit;
 import elemental2.promise.Promise;
 import io.deephaven.javascript.proto.dhinternal.io.deephaven.proto.ticket_pb.Ticket;
 import io.deephaven.javascript.proto.dhinternal.io.deephaven.proto.console_pb.*;
@@ -18,6 +17,7 @@
 import io.deephaven.web.client.api.console.JsVariableChanges;
 import io.deephaven.web.client.api.console.JsVariableDescriptor;
 import io.deephaven.web.client.api.console.JsVariableType;
+import io.deephaven.web.client.api.event.HasEventHandling;
 import io.deephaven.web.client.api.tree.JsTreeTable;
 import io.deephaven.web.client.api.widget.plot.JsFigure;
 import io.deephaven.web.client.fu.CancellablePromise;
@@ -104,9 +104,7 @@ public IdeSession(
     public Promise<JsTable> getTable(String name, @JsOptional Boolean applyPreviewColumns) {
         return connection.getVariableDefinition(name, JsVariableType.TABLE).then(varDef -> {
             final Promise<JsTable> table = connection.getTable(varDef, applyPreviewColumns);
-            final CustomEventInit event = CustomEventInit.create();
-            event.setDetail(table);
-            fireEvent(EVENT_TABLE_OPENED, event);
+            fireEvent(EVENT_TABLE_OPENED, table);
             return table;
         });
     }
@@ -149,9 +147,7 @@ public Promise<?> getObject(@TsTypeRef(JsVariableDescriptor.class) JsPropertyMap
 
     public Promise<JsTable> newTable(String[] columnNames, String[] types, String[][] data, String userTimeZone) {
         return connection.newTable(columnNames, types, data, userTimeZone, this).then(table -> {
-            final CustomEventInit event = CustomEventInit.create();
-            event.setDetail(table);
-            fireEvent(EVENT_TABLE_OPENED, event);
+            fireEvent(EVENT_TABLE_OPENED, table);
 
             return Promise.resolve(table);
         });
@@ -165,9 +161,7 @@ public Promise<JsTable> newTable(String[] columnNames, String[] types, String[][
      */
     public Promise<JsTable> mergeTables(JsTable[] tables) {
         return connection.mergeTables(tables, this).then(table -> {
-            final CustomEventInit event = CustomEventInit.create();
-            event.setDetail(table);
-            fireEvent(EVENT_TABLE_OPENED, event);
+            fireEvent(EVENT_TABLE_OPENED, table);
 
             return Promise.resolve(table);
         });
@@ -223,9 +217,7 @@ public CancellablePromise<JsCommandResult> runCode(String code) {
                 });
 
         CommandInfo commandInfo = new CommandInfo(code, result);
-        final CustomEventInit event = CustomEventInit.create();
-        event.setDetail(commandInfo);
-        fireEvent(IdeSession.EVENT_COMMANDSTARTED, event);
+        fireEvent(IdeSession.EVENT_COMMANDSTARTED, commandInfo);
 
         return result;
     }
@@ -251,9 +243,7 @@ private BiDiStream<AutoCompleteRequest, AutoCompleteResponse> ensureStream() {
         });
         currentStream.onStatus(status -> {
             if (!status.isOk()) {
-                CustomEventInit init = CustomEventInit.create();
-                init.setDetail(status.getDetails());
-                fireEvent(EVENT_REQUEST_FAILED, init);
+                fireEvent(EVENT_REQUEST_FAILED, status.getDetails());
                 pendingAutocompleteCalls.values().forEach(p -> {
                     p.fail("Connection error" + status.getDetails());
                 });
diff --git a/web/client-api/src/main/java/io/deephaven/web/client/state/ActiveTableBinding.java b/web/client-api/src/main/java/io/deephaven/web/client/state/ActiveTableBinding.java
index 5aed4d5c121..722daed1b95 100644
--- a/web/client-api/src/main/java/io/deephaven/web/client/state/ActiveTableBinding.java
+++ b/web/client-api/src/main/java/io/deephaven/web/client/state/ActiveTableBinding.java
@@ -3,11 +3,8 @@
 //
 package io.deephaven.web.client.state;
 
-import io.deephaven.web.client.api.Column;
 import io.deephaven.web.client.api.JsTable;
 import io.deephaven.web.client.api.state.HasTableState;
-import io.deephaven.web.shared.data.RangeSet;
-import io.deephaven.web.shared.data.Viewport;
 
 /**
  * An active binding describes the link between a {@link JsTable} and the {@link ClientTableState} it is currently
@@ -60,10 +57,6 @@ public class ActiveTableBinding implements HasTableState<ClientTableState> {
      * new table must copy all bindings to the new table.
      */
     private PausedTableBinding rollback;
-    private Viewport viewport;
-    private RangeSet rows;
-    private Column[] columns;
-    private boolean subscriptionPending;
 
     private ActiveTableBinding(
             JsTable table,
@@ -234,51 +227,4 @@ private void copyRollbacks(ActiveTableBinding sub) {
     public PausedTableBinding getPaused() {
         return paused;
     }
-
-    public Viewport getSubscription() {
-        return viewport;
-    }
-
-    public void setViewport(Viewport viewport) {
-        this.viewport = viewport;
-    }
-
-    public RangeSet setDesiredViewport(long firstRow, long lastRow, Column[] columns) {
-        this.rows = RangeSet.ofRange(firstRow, lastRow);
-        this.columns = columns;
-        subscriptionPending = true;
-        return rows;
-    }
-
-    public void setDesiredSubscription(Column[] columns) {
-        assert this.rows == null;
-        this.columns = columns;
-        subscriptionPending = true;
-    }
-
-    public RangeSet getRows() {
-        return rows;
-    }
-
-    public Column[] getColumns() {
-        return columns;
-    }
-
-    public void setSubscriptionPending(boolean subscriptionPending) {
-        this.subscriptionPending = subscriptionPending;
-    }
-
-    public boolean isSubscriptionPending() {
-        return subscriptionPending;
-    }
-
-    public void maybeReviveSubscription() {
-        if (subscriptionPending || viewport != null) {
-            if (rows != null) {
-                state.setDesiredViewport(table, rows.getFirstRow(), rows.getLastRow(), columns);
-            } else {
-                state.subscribe(table, columns);
-            }
-        }
-    }
 }
diff --git a/web/client-api/src/main/java/io/deephaven/web/client/state/ClientTableState.java b/web/client-api/src/main/java/io/deephaven/web/client/state/ClientTableState.java
index 8a8be5f1dfc..9fd784043f3 100644
--- a/web/client-api/src/main/java/io/deephaven/web/client/state/ClientTableState.java
+++ b/web/client-api/src/main/java/io/deephaven/web/client/state/ClientTableState.java
@@ -8,7 +8,7 @@
 import elemental2.core.JsSet;
 import elemental2.core.Uint8Array;
 import elemental2.promise.Promise;
-import io.deephaven.javascript.proto.dhinternal.arrow.flight.flatbuf.schema_generated.org.apache.arrow.flatbuf.Schema;
+import io.deephaven.chunk.ChunkType;
 import io.deephaven.javascript.proto.dhinternal.browserheaders.BrowserHeaders;
 import io.deephaven.javascript.proto.dhinternal.io.deephaven.proto.table_pb.ExportedTableCreationResponse;
 import io.deephaven.web.client.api.*;
@@ -16,6 +16,7 @@
 import io.deephaven.web.client.api.barrage.def.ColumnDefinition;
 import io.deephaven.web.client.api.barrage.def.InitialTableDefinition;
 import io.deephaven.web.client.api.batch.TableConfig;
+import io.deephaven.web.client.api.event.HasEventHandling;
 import io.deephaven.web.client.api.filter.FilterCondition;
 import io.deephaven.web.client.api.lifecycle.HasLifecycle;
 import io.deephaven.web.client.api.state.HasTableState;
@@ -57,6 +58,7 @@
  * Consider making this a js type with restricted, read-only property access.
  */
 public final class ClientTableState extends TableConfig {
+
     public enum ResolutionState {
         /**
          * Table has been created on the client, but client does not yet have a handle ID referring to the table on the
@@ -121,7 +123,6 @@ public enum ResolutionState {
 
     // A bit of state management
     private String failMsg;
-    private boolean subscribed;
     private Double queuedSize;
 
     // Leftovers from Table.StackEntry
@@ -233,6 +234,89 @@ public TableTicket getHandle() {
         return handle;
     }
 
+    /**
+     * Returns the ChunkType to use for each column in the table. This is roughly
+     * {@link io.deephaven.engine.table.impl.sources.ReinterpretUtils#maybeConvertToWritablePrimitiveChunkType(Class)}
+     * but without the trip through Class. Note also that effectively all types are stored as Objects except non-long
+     * primitives, so that they can be appropriately wrapped before storing (though the storage process will handle DH
+     * nulls).
+     */
+    public ChunkType[] chunkTypes() {
+        return Arrays.stream(columnTypes()).map(dataType -> {
+            if (dataType == Boolean.class || dataType == boolean.class) {
+                return ChunkType.Object;
+            }
+            if (dataType == Long.class || dataType == long.class) {
+                // JS client holds longs as LongWrappers
+                return ChunkType.Object;
+            }
+            return ChunkType.fromElementType(dataType);
+        }).toArray(ChunkType[]::new);
+    }
+
+    /**
+     * Returns the Java Class to represent each column in the table. This lets the client replace certain JVM-only
+     * classes with alternative implementations, but still use the simple
+     * {@link io.deephaven.extensions.barrage.chunk.ChunkReader.TypeInfo} wrapper.
+     */
+    public Class<?>[] columnTypes() {
+        return Arrays.stream(tableDef.getColumns())
+                .map(ColumnDefinition::getType)
+                .map(t -> {
+                    switch (t) {
+                        case "boolean":
+                        case "java.lang.Boolean":
+                            return boolean.class;
+                        case "char":
+                        case "java.lang.Character":
+                            return char.class;
+                        case "byte":
+                        case "java.lang.Byte":
+                            return byte.class;
+                        case "int":
+                        case "java.lang.Integer":
+                            return int.class;
+                        case "short":
+                        case "java.lang.Short":
+                            return short.class;
+                        case "long":
+                        case "java.lang.Long":
+                            return long.class;
+                        case "java.lang.Float":
+                        case "float":
+                            return float.class;
+                        case "java.lang.Double":
+                        case "double":
+                            return double.class;
+                        case "java.time.Instant":
+                            return DateWrapper.class;
+                        case "java.math.BigInteger":
+                            return BigIntegerWrapper.class;
+                        case "java.math.BigDecimal":
+                            return BigDecimalWrapper.class;
+                        default:
+                            return Object.class;
+                    }
+                })
+                .toArray(Class<?>[]::new);
+    }
+
+    /**
+     * Returns the Java Class to represent the component type in any list/array type. At this time, this value is not
+     * used by the chunk reading implementation.
+     */
+    public Class<?>[] componentTypes() {
+        return Arrays.stream(tableDef.getColumns()).map(ColumnDefinition::getType).map(t -> {
+            // All arrays and vectors will be handled as objects for now.
+            // TODO (deephaven-core#2102) clarify if we need to handle these cases at all
+            if (t.endsWith("[]") || t.endsWith("Vector")) {
+                return Object.class;
+            }
+            // Non-arrays or vectors should return null
+            return null;
+        }).toArray(Class[]::new);
+    }
+
     public ClientTableState newState(TableTicket newHandle, TableConfig config) {
         if (config == null) {
             config = this;
@@ -343,33 +427,28 @@ public long getSize() {
     }
 
     public void setSize(long size) {
+        if (this.size == Long.MIN_VALUE) {
+            // Table is uncoalesced, ignore size change
+            return;
+        }
         boolean log = this.size != size;
         if (log) {
             JsLog.debug("CTS", this, " set size; was ", this.size, " is now ", size);
         }
         this.size = size;
 
-        JsConsumer<JsTable> doSetSize = table -> {
-            long localSize = size;
-            final ActiveTableBinding binding = getActiveBinding(table);
-            if (binding != null && table.isBlinkTable() && binding.getRows() != null) {
-                localSize = Math.min(size, binding.getRows().size());
-            }
-            table.setSize(localSize);
-        };
-
         if (isRunning()) {
             if (log) {
                 JsLog.debug("CTS immediate size update ", this.size, " actives: ", active);
             }
-            forActiveTables(doSetSize);
+            forActiveTables(t -> t.setSize(size));
         } else {
             if (queuedSize == null) {
                 JsLog.debug("Queuing size changed until RUNNING STATE; ", size);
                 onRunning(self -> {
                     JsLog.debug("Firing queued size change event (", queuedSize, ")");
                     forActiveTables(table -> {
-                        doSetSize.apply(table);
+                        table.setSize(size);
                         queuedSize = null;
                     });
                 }, JsRunnable.doNothing());
@@ -390,7 +469,6 @@ private void setTableDef(InitialTableDefinition tableDef) {
 
             // iterate through the columns, combine format columns into the normal model
             Map<Boolean, Map<String, ColumnDefinition>> byNameMap = tableDef.getColumnsByName();
-            assert byNameMap.get(true).isEmpty() : "Unexpected constituent columns in table " + byNameMap.get(true);
             Column[] columns = new Column[0];
             allColumns = new Column[0];
             for (ColumnDefinition definition : columnDefinitions) {
@@ -630,12 +708,10 @@ public Column findColumn(String key) {
     }
 
     /**
-     * @return true if there are no tables bound to this state.
-     *
-     *         If a table that had a subscription for this state was orphaned by a pending request, we want to clear the
-     *         subscription immediately so it becomes inert (immediately remove the subscription), but we may need to
-     *         rollback the request, and we don't want to release the handle until the pending request is finished
-     *         (whereupon we will remove the binding).
+     * @return true if there are no tables bound to this state. If a table that had a subscription for this state was
+     *         orphaned by a pending request, we want to clear the subscription immediately so it becomes inert
+     *         (immediately remove the subscription), but we may need to rollback the request, and we don't want to
+     *         release the handle until the pending request is finished (whereupon we will remove the binding).
      */
     public boolean isEmpty() {
         return active.size == 0 && paused.size == 0 && retainers.size == 0;
@@ -658,14 +734,6 @@ public void unretain(Object retainer) {
         connection.scheduleCheck(this);
     }
 
-    public boolean isActiveEmpty() {
-        return active.size == 0;
-    }
-
-    public boolean hasNoSubscriptions() {
-        return JsItr.iterate(active.values()).allMatch(binding -> binding.getSubscription() == null);
-    }
-
     public boolean hasSort(Sort candidate) {
         return getSorts().contains(candidate);
     }
@@ -715,59 +783,6 @@ public boolean releaseTable(JsTable table) {
         return had;
     }
 
-    public void setDesiredViewport(JsTable table, long firstRow, long lastRow, Column[] columns) {
-        touch();
-        final ActiveTableBinding sub = active.get(table);
-        assert sub != null : "You cannot set the desired viewport on a non-active state + table combination";
-        final RangeSet rows = sub.setDesiredViewport(firstRow, lastRow, columns);
-        // let event loop eat multiple viewport sets and only apply the last one (winner of who gets spot in map)
-        LazyPromise.runLater(() -> {
-            if (sub.getRows() == rows) {
-                // winner! now, on to the next hurdle... ensuring we have columns.
-                // TODO: have an onColumnsReady callback, for cases when we know we're only waiting on
-                // non-column-modifying operations
-                onRunning(self -> {
-                    if (sub.getRows() == rows) {
-                        // winner again!
-                        applyViewport(sub);
-                    }
-                }, JsRunnable.doNothing());
-            }
-        });
-    }
-
-    public void subscribe(JsTable table, Column[] columns) {
-        touch();
-        ActiveTableBinding binding = active.get(table);
-        assert binding != null : "No active binding found for table " + table;
-
-        onRunning(self -> {
-            binding.setSubscriptionPending(true);
-
-            if (getHandle().equals(table.getHandle())) {
-                binding.setViewport(new Viewport(null, makeBitset(columns)));
-                table.getConnection().scheduleCheck(this);
-            }
-        }, JsRunnable.doNothing());
-    }
-
-    private void applyViewport(ActiveTableBinding sub) {
-        sub.setSubscriptionPending(false);
-        final JsTable table = sub.getTable();
-        // make sure we're still the tail entry before trying to apply viewport
-        assert isRunning() : "Do not call this method unless you are in a running state! " + this;
-        if (getHandle().equals(table.getHandle())) {
-            final RangeSet rows = sub.getRows();
-            Column[] desired = sub.getColumns();
-            if (Js.isFalsy(desired)) {
-                desired = getColumns();
-            }
-            Viewport vp = new Viewport(rows, makeBitset(desired));
-            sub.setViewport(vp);
-            table.refreshViewport(this, vp);
-        }
-    }
-
     public BitSet makeBitset(Column[] columns) {
         BitSet bitSet = new BitSet(getTableDef().getColumns().length);
         Arrays.stream(columns).flatMapToInt(Column::getRequiredColumns).forEach(bitSet::set);
@@ -784,16 +799,6 @@ public MappedIterable<JsTable> getBoundTables() {
         return iterate(active.keys()).plus(iterate(paused.keys()));
     }
 
-    public void forActiveSubscriptions(JsBiConsumer<JsTable, Viewport> callback) {
-        JsItr.forEach(active, (table, binding) -> {
-            if (binding.getSubscription() != null) {
-                assert binding.getTable() == table
-                        : "Corrupt binding between " + table + " and " + binding + " in " + active;
-                callback.apply((JsTable) table, binding.getSubscription());
-            }
-        });
-    }
-
     public void forActiveTables(JsConsumer<JsTable> callback) {
         JsItr.forEach(active, (table, sub) -> {
             callback.apply(table);
@@ -818,24 +823,6 @@ public void forActiveLifecycles(JsConsumer<HasLifecycle> callback) {
         }
     }
 
-    public void handleDelta(DeltaUpdates updates) {
-        assert size != SIZE_UNINITIALIZED : "Received delta before receiving initial size";
-        setSize(size + updates.getAdded().size() - updates.getRemoved().size());
-        forActiveSubscriptions((table, subscription) -> {
-            assert table.getHandle().equals(handle);
-            // we are the active state of this table, so forward along the delta.
-            table.handleDelta(this, updates);
-        });
-    }
-
-    public void setSubscribed(boolean subscribed) {
-        this.subscribed = subscribed;
-    }
-
-    public boolean isSubscribed() {
-        return subscribed;
-    }
-
     @Override
     public String toString() {
         return "ClientTableState{" +
@@ -905,15 +892,9 @@ public void unpause(JsTable table) {
         assert was != null : "Cannot unpause a table that is not paused " + this;
         paused.delete(table);
         active.set(table, was.getActiveBinding());
-        // Now, we want to put back the viewport, if any.
-        refreshSubscription(was.getActiveBinding());
-    }
-
-    private void refreshSubscription(ActiveTableBinding sub) {
-        assert active.get(sub.getTable()) == sub;
-        if (!sub.isSubscriptionPending()) {
-            sub.maybeReviveSubscription();
-        }
+        // Now, we want to put back the viewport, if any, since those may be still used by the original table
+        ActiveTableBinding sub = was.getActiveBinding();
+        table.maybeReviveSubscription();
     }
 
     public MappedIterable<ClientTableState> ancestors() {
@@ -925,7 +906,7 @@ public MappedIterable<ClientTableState> reversed() {
     }
 
     /**
-     * Look through paused tables to see if any of them have been
+     * Look through paused tables to see if any of them have been closed.
      */
     public void cleanup() {
         assert JsItr.iterate(active.keys()).allMatch(t -> !t.isAlive() || t.state() == this)
@@ -938,7 +919,7 @@ public void cleanup() {
             // notify any retainers who have events that we've been released.
             for (Object retainer : JsItr.iterate(retainers.values())) {
                 if (retainer instanceof HasEventHandling) {
-                    ((HasEventHandling) retainer).fireEventWithDetail(HasEventHandling.INTERNAL_EVENT_RELEASED, this);
+                    ((HasEventHandling) retainer).fireEvent(HasEventHandling.INTERNAL_EVENT_RELEASED, this);
                 }
             }
 
@@ -1011,9 +992,7 @@ public void applyTableCreationResponse(ExportedTableCreationResponse def) {
         Uint8Array flightSchemaMessage = def.getSchemaHeader_asU8();
         isStatic = def.getIsStatic();
 
-        Schema schema = WebBarrageUtils.readSchemaMessage(flightSchemaMessage);
-
-        setTableDef(WebBarrageUtils.readTableDefinition(schema));
+        setTableDef(WebBarrageUtils.readTableDefinition(WebBarrageUtils.readSchemaMessage(flightSchemaMessage)));
 
         setResolution(ResolutionState.RUNNING);
         setSize(Long.parseLong(def.getSize()));
diff --git a/web/client-api/src/main/java/io/deephaven/web/client/state/HasTableBinding.java b/web/client-api/src/main/java/io/deephaven/web/client/state/HasTableBinding.java
index ba897fc54e9..0cc0a4e142c 100644
--- a/web/client-api/src/main/java/io/deephaven/web/client/state/HasTableBinding.java
+++ b/web/client-api/src/main/java/io/deephaven/web/client/state/HasTableBinding.java
@@ -3,7 +3,6 @@
 //
 package io.deephaven.web.client.state;
 
-import elemental2.dom.CustomEventInit;
 import io.deephaven.web.client.api.TableTicket;
 
 /**
@@ -26,7 +25,7 @@ public interface HasTableBinding {
 
     void fireEvent(String name);
 
-    <T> void fireEvent(String name, CustomEventInit<T> eventInit);
+    <T> void fireEvent(String name, T detail);
 
     void setState(ClientTableState appendTo);
 
diff --git a/web/client-api/src/main/java/io/deephaven/web/client/state/TableReviver.java b/web/client-api/src/main/java/io/deephaven/web/client/state/TableReviver.java
index 2f3220b476a..c6429ffff6c 100644
--- a/web/client-api/src/main/java/io/deephaven/web/client/state/TableReviver.java
+++ b/web/client-api/src/main/java/io/deephaven/web/client/state/TableReviver.java
@@ -5,7 +5,6 @@
 
 import elemental2.core.JsArray;
 import elemental2.core.JsMap;
-import elemental2.dom.CustomEventInit;
 import io.deephaven.javascript.proto.dhinternal.io.deephaven.proto.ticket_pb.Ticket;
 import io.deephaven.javascript.proto.dhinternal.browserheaders.BrowserHeaders;
 import io.deephaven.javascript.proto.dhinternal.io.deephaven.proto.table_pb.BatchTableRequest;
@@ -175,15 +174,15 @@ public void fireEvent(String name) {
     }
 
     @Override
-    public void fireEvent(String name, CustomEventInit e) {
+    public <T> void fireEvent(String name, T detail) {
         switch (name) {
             case JsTable.EVENT_REQUEST_FAILED:
                 // log this failure
-                JsLog.debug("Revivification failed", e.getDetail());
+                JsLog.debug("Revivification failed", detail);
                 //
                 return;
             default:
-                JsLog.debug("The table reviver does not accept event", name, e);
+                JsLog.debug("The table reviver does not accept event", name, detail);
         }
     }
 
diff --git a/web/client-api/src/main/java/io/deephaven/web/public/linked/index.html b/web/client-api/src/main/java/io/deephaven/web/public/linked/index.html
index 70ac5a0b931..650e61a91ab 100644
--- a/web/client-api/src/main/java/io/deephaven/web/public/linked/index.html
+++ b/web/client-api/src/main/java/io/deephaven/web/public/linked/index.html
@@ -181,4 +181,5 @@ <h3>Persistent Query Configurations</h3>
 
 
 </body>
-</html>
\ No newline at end of file
+</html>
+
diff --git a/web/client-api/src/main/java/io/deephaven/web/public/rollup.html b/web/client-api/src/main/java/io/deephaven/web/public/rollup.html
index 7256a080b92..cb531f3c197 100644
--- a/web/client-api/src/main/java/io/deephaven/web/public/rollup.html
+++ b/web/client-api/src/main/java/io/deephaven/web/public/rollup.html
@@ -55,14 +55,18 @@ <h3>Rollup Table Configuration</h3>
         <label for="operation">Aggregation Operation</label>
         <select id="operation">
             <option value="Count">Count</option>
+            <option value="CountDistinct">Count Distinct</option>
+            <option value="Distinct">Distinct</option>
             <option value="Min">Min</option>
             <option value="Max">Max</option>
             <option value="Sum" selected>Sum</option>
+            <option value="AbsSum" selected>Absolute Sum</option>
             <option value="Var">Var</option>
             <option value="Avg">Avg</option>
             <option value="Std">Std</option>
             <option value="First">First</option>
             <option value="Last">Last</option>
+            <option value="Unique">Unique</option>
         </select>
     </div>
 </div>
diff --git a/web/client-api/src/main/resources/io/deephaven/barrage/flatbuf/BarrageFlatbufFormat.gwt.xml b/web/client-api/src/main/resources/io/deephaven/barrage/flatbuf/BarrageFlatbufFormat.gwt.xml
new file mode 100644
index 00000000000..9fd0a379083
--- /dev/null
+++ b/web/client-api/src/main/resources/io/deephaven/barrage/flatbuf/BarrageFlatbufFormat.gwt.xml
@@ -0,0 +1,4 @@
+<module>
+    <inherits name="com.google.flatbuffers.FlatBuffers" />
+    <source path="" />
+</module>
diff --git a/web/client-api/src/main/resources/io/deephaven/web/super/com/google/common/io/LittleEndianDataInputStream.java b/web/client-api/src/main/resources/io/deephaven/web/super/com/google/common/io/LittleEndianDataInputStream.java
new file mode 100644
index 00000000000..e1f587ac72e
--- /dev/null
+++ b/web/client-api/src/main/resources/io/deephaven/web/super/com/google/common/io/LittleEndianDataInputStream.java
@@ -0,0 +1,198 @@
+/*
+ * Copyright (C) 2007 The Guava Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except
+ * in compliance with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License
+ * is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express
+ * or implied. See the License for the specific language governing permissions and limitations under
+ * the License.
+ */
+
+package com.google.common.io;
+
+import org.gwtproject.nio.Numbers;
+
+import java.io.DataInput;
+import java.io.DataInputStream;
+import java.io.EOFException;
+import java.io.FilterInputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.util.Objects;
+
+/**
+ * An implementation of {@link DataInput} that uses little-endian byte ordering for reading {@code
+ * short}, {@code int}, {@code float}, {@code double}, and {@code long} values.
+ *
+ * <p><b>Note:</b> This class intentionally violates the specification of its supertype {@code
+ * DataInput}, which explicitly requires big-endian byte order.
+ *
+ * @author Chris Nokleberg
+ * @author Keith Bottner
+ * @since 8.0
+ */
+public final class LittleEndianDataInputStream extends FilterInputStream implements DataInput {
+
+    public LittleEndianDataInputStream(InputStream in) {
+        super(Objects.requireNonNull(in));
+    }
+
+    /** This method will throw an {@link UnsupportedOperationException}. */
+    @Override
+    public String readLine() {
+        throw new UnsupportedOperationException("readLine is not supported");
+    }
+
+    @Override
+    public void readFully(byte[] b) throws IOException {
+        int total = 0;
+        while (total < b.length) {
+            int result = read(b, total, b.length - total);
+            if (result == -1) {
+                break;
+            }
+            total += result;
+        }
+    }
+
+    @Override
+    public void readFully(byte[] b, int off, int len) throws IOException {
+        int total = 0;
+        while (total < len) {
+            int result = read(b, off + total, len - total);
+            if (result == -1) {
+                break;
+            }
+            total += result;
+        }
+    }
+
+    @Override
+    public int skipBytes(int n) throws IOException {
+        return (int) in.skip(n);
+    }
+
+    @Override
+    public int readUnsignedByte() throws IOException {
+        int b1 = in.read();
+        if (0 > b1) {
+            throw new EOFException();
+        }
+
+        return b1;
+    }
+
+    @Override
+    public int readUnsignedShort() throws IOException {
+        byte b1 = readAndCheckByte();
+        byte b2 = readAndCheckByte();
+
+        int result = b2;
+        result = (result << 8) | (b1 & 0xFF);
+
+        return result;
+    }
+
+    @Override
+    public int readInt() throws IOException {
+        byte b1 = readAndCheckByte();
+        byte b2 = readAndCheckByte();
+        byte b3 = readAndCheckByte();
+        byte b4 = readAndCheckByte();
+
+        int result = b4;
+        result = (result << 8) | (b3 & 0xFF);
+        result = (result << 8) | (b2 & 0xFF);
+        result = (result << 8) | (b1 & 0xFF);
+
+        return result;
+    }
+
+    @Override
+    public long readLong() throws IOException {
+        byte b1 = readAndCheckByte();
+        byte b2 = readAndCheckByte();
+        byte b3 = readAndCheckByte();
+        byte b4 = readAndCheckByte();
+        byte b5 = readAndCheckByte();
+        byte b6 = readAndCheckByte();
+        byte b7 = readAndCheckByte();
+        byte b8 = readAndCheckByte();
+
+        long result = b8;
+        result = (result << 8) | (b7 & 0xFF);
+        result = (result << 8) | (b6 & 0xFF);
+        result = (result << 8) | (b5 & 0xFF);
+        result = (result << 8) | (b4 & 0xFF);
+        result = (result << 8) | (b3 & 0xFF);
+        result = (result << 8) | (b2 & 0xFF);
+        result = (result << 8) | (b1 & 0xFF);
+
+        return result;
+    }
+
+    /**
+     * Reads a {@code float} as specified by {@link DataInputStream#readFloat()}, except using
+     * little-endian byte order.
+     *
+     * @return the next four bytes of the input stream, interpreted as a {@code float} in
+     *     little-endian byte order
+     * @throws IOException if an I/O error occurs
+     */
+    @Override
+    public float readFloat() throws IOException {
+        return Numbers.intBitsToFloat(readInt());
+    }
+
+    /**
+     * Reads a {@code double} as specified by {@link DataInputStream#readDouble()}, except using
+     * little-endian byte order.
+     *
+     * @return the next eight bytes of the input stream, interpreted as a {@code double} in
+     *     little-endian byte order
+     * @throws IOException if an I/O error occurs
+     */
+    @Override
+    public double readDouble() throws IOException {
+        return Numbers.longBitsToDouble(readLong());
+    }
+
+    @Override
+    public String readUTF() throws IOException {
+        throw new UnsupportedOperationException("readUTF");
+    }
+
+    @Override
+    public short readShort() throws IOException {
+        return (short) readUnsignedShort();
+    }
+
+    @Override
+    public char readChar() throws IOException {
+        return (char) readUnsignedShort();
+    }
+
+    @Override
+    public byte readByte() throws IOException {
+        return (byte) readUnsignedByte();
+    }
+
+    @Override
+    public boolean readBoolean() throws IOException {
+        return readUnsignedByte() != 0;
+    }
+
+    private byte readAndCheckByte() throws IOException, EOFException {
+        int b1 = in.read();
+
+        if (-1 == b1) {
+            throw new EOFException();
+        }
+
+        return (byte) b1;
+    }
+}
diff --git a/web/client-api/src/main/resources/io/deephaven/web/super/com/google/common/io/LittleEndianDataOutputStream.java b/web/client-api/src/main/resources/io/deephaven/web/super/com/google/common/io/LittleEndianDataOutputStream.java
new file mode 100644
index 00000000000..12651d83ddf
--- /dev/null
+++ b/web/client-api/src/main/resources/io/deephaven/web/super/com/google/common/io/LittleEndianDataOutputStream.java
@@ -0,0 +1,167 @@
+/*
+ * Copyright (C) 2007 The Guava Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except
+ * in compliance with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License
+ * is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express
+ * or implied. See the License for the specific language governing permissions and limitations under
+ * the License.
+ */
+package com.google.common.io;
+
+import org.gwtproject.nio.Numbers;
+
+import java.io.DataOutput;
+import java.io.DataOutputStream;
+import java.io.FilterOutputStream;
+import java.io.IOException;
+import java.io.OutputStream;
+import java.util.Objects;
+
+/**
+ * An implementation of {@link DataOutput} that uses little-endian byte ordering for writing {@code
+ * char}, {@code short}, {@code int}, {@code float}, {@code double}, and {@code long} values.
+ *
+ * <p><b>Note:</b> This class intentionally violates the specification of its supertype {@code
+ * DataOutput}, which explicitly requires big-endian byte order.
+ *
+ * @author Chris Nokleberg
+ * @author Keith Bottner
+ * @since 8.0
+ */
+public final class LittleEndianDataOutputStream extends FilterOutputStream implements DataOutput {
+
+    /**
+     * Creates a {@code LittleEndianDataOutputStream} that wraps the given stream.
+     *
+     * @param out the stream to delegate to
+     */
+    public LittleEndianDataOutputStream(OutputStream out) {
+        super(new DataOutputStream(Objects.requireNonNull(out)));
+    }
+
+    @Override
+    public void write(byte[] b, int off, int len) throws IOException {
+        // Override slow FilterOutputStream impl
+        out.write(b, off, len);
+    }
+
+    @Override
+    public void writeBoolean(boolean v) throws IOException {
+        ((DataOutputStream) out).writeBoolean(v);
+    }
+
+    @Override
+    public void writeByte(int v) throws IOException {
+        ((DataOutputStream) out).writeByte(v);
+    }
+
+    /**
+     * @deprecated The semantics of {@code writeBytes(String s)} are considered dangerous. Please use
+     *     {@link #writeUTF(String s)}, {@link #writeChars(String s)} or another write method instead.
+     */
+    @Deprecated
+    @Override
+    public void writeBytes(String s) throws IOException {
+        ((DataOutputStream) out).writeBytes(s);
+    }
+
+    /**
+     * Writes a char as specified by {@link DataOutputStream#writeChar(int)}, except using
+     * little-endian byte order.
+     *
+     * @throws IOException if an I/O error occurs
+     */
+    @Override
+    public void writeChar(int v) throws IOException {
+        writeShort(v);
+    }
+
+    /**
+     * Writes a {@code String} as specified by {@link DataOutputStream#writeChars(String)}, except
+     * each character is written using little-endian byte order.
+     *
+     * @throws IOException if an I/O error occurs
+     */
+    @Override
+    public void writeChars(String s) throws IOException {
+        for (int i = 0; i < s.length(); i++) {
+            writeChar(s.charAt(i));
+        }
+    }
+
+    /**
+     * Writes a {@code double} as specified by {@link DataOutputStream#writeDouble(double)}, except
+     * using little-endian byte order.
+     *
+     * @throws IOException if an I/O error occurs
+     */
+    @Override
+    public void writeDouble(double v) throws IOException {
+        writeLong(Double.doubleToLongBits(v));
+    }
+
+    /**
+     * Writes a {@code float} as specified by {@link DataOutputStream#writeFloat(float)}, except using
+     * little-endian byte order.
+     *
+     * @throws IOException if an I/O error occurs
+     */
+    @Override
+    public void writeFloat(float v) throws IOException {
+        writeInt(Numbers.floatToIntBits(v));
+    }
+
+    /**
+     * Writes an {@code int} as specified by {@link DataOutputStream#writeInt(int)}, except using
+     * little-endian byte order.
+     *
+     * @throws IOException if an I/O error occurs
+     */
+    @Override
+    public void writeInt(int v) throws IOException {
+        out.write(0xFF & v);
+        out.write(0xFF & (v >> 8));
+        out.write(0xFF & (v >> 16));
+        out.write(0xFF & (v >> 24));
+    }
+
+    /**
+     * Writes a {@code long} as specified by {@link DataOutputStream#writeLong(long)}, except using
+     * little-endian byte order.
+     *
+     * @throws IOException if an I/O error occurs
+     */
+    @Override
+    public void writeLong(long v) throws IOException {
+        out.write(0xFF & (int) v);
+        out.write(0xFF & (int) (v >> 8));
+        out.write(0xFF & (int) (v >> 16));
+        out.write(0xFF & (int) (v >> 24));
+        out.write(0xFF & (int) (v >> 32));
+        out.write(0xFF & (int) (v >> 40));
+        out.write(0xFF & (int) (v >> 48));
+        out.write(0xFF & (int) (v >> 56));
+    }
+
+    /**
+     * Writes a {@code short} as specified by {@link DataOutputStream#writeShort(int)}, except using
+     * little-endian byte order.
+     *
+     * @throws IOException if an I/O error occurs
+     */
+    @Override
+    public void writeShort(int v) throws IOException {
+        out.write(0xFF & v);
+        out.write(0xFF & (v >> 8));
+    }
+
+    @Override
+    public void writeUTF(String s) throws IOException {
+        throw new UnsupportedOperationException("modified utf-8");
+    }
+}
diff --git a/web/client-api/src/main/resources/io/deephaven/web/super/io/deephaven/chunk/util/pools/ChunkPoolReleaseTracking.java b/web/client-api/src/main/resources/io/deephaven/web/super/io/deephaven/chunk/util/pools/ChunkPoolReleaseTracking.java
new file mode 100644
index 00000000000..c6e26966d4e
--- /dev/null
+++ b/web/client-api/src/main/resources/io/deephaven/web/super/io/deephaven/chunk/util/pools/ChunkPoolReleaseTracking.java
@@ -0,0 +1,41 @@
+//
+// Copyright (c) 2016-2024 Deephaven Data Labs and Patent Pending
+//
+package io.deephaven.chunk.util.pools;
+
+/**
+ * Support for release tracking, in order to detect chunk release errors.
+ */
+public final class ChunkPoolReleaseTracking {
+
+    public static void enableStrict() {
+    }
+
+    public static void enable() {
+    }
+
+    private static void enable(final Object factory, boolean preCheck) {
+
+    }
+
+    public static void disable() {
+    }
+
+    static <CHUNK_TYPE extends PoolableChunk> CHUNK_TYPE onTake(CHUNK_TYPE chunk) {
+        return chunk;
+    }
+
+    static <CHUNK_TYPE extends PoolableChunk> CHUNK_TYPE onGive(CHUNK_TYPE chunk) {
+        return chunk;
+    }
+
+    public static void check() {
+
+    }
+
+    public static void checkAndDisable() {
+
+    }
+
+    private ChunkPoolReleaseTracking() {}
+}
diff --git a/web/client-api/src/main/resources/io/deephaven/web/super/io/deephaven/engine/rowset/RowSequence.java b/web/client-api/src/main/resources/io/deephaven/web/super/io/deephaven/engine/rowset/RowSequence.java
new file mode 100644
index 00000000000..1ba218f9a73
--- /dev/null
+++ b/web/client-api/src/main/resources/io/deephaven/web/super/io/deephaven/engine/rowset/RowSequence.java
@@ -0,0 +1,24 @@
+//
+// Copyright (c) 2016-2024 Deephaven Data Labs and Patent Pending
+//
+package io.deephaven.engine.rowset;
+
+import io.deephaven.util.SafeCloseable;
+import io.deephaven.util.datastructures.LongAbortableConsumer;
+import io.deephaven.util.datastructures.LongRangeConsumer;
+import io.deephaven.util.datastructures.LongSizedDataStructure;
+
+public interface RowSequence extends SafeCloseable, LongSizedDataStructure {
+    long NULL_ROW_KEY = -1L;
+    boolean isEmpty();
+    long lastRowKey();
+    boolean forEachRowKey(LongAbortableConsumer lac);
+    default void forAllRowKeys(java.util.function.LongConsumer lc) {
+        forEachRowKey((final long v) -> {
+            lc.accept(v);
+            return true;
+        });
+    }
+
+    void forAllRowKeyRanges(LongRangeConsumer lrc);
+}
diff --git a/web/client-api/src/main/resources/io/deephaven/web/super/io/deephaven/engine/rowset/RowSequenceFactory.java b/web/client-api/src/main/resources/io/deephaven/web/super/io/deephaven/engine/rowset/RowSequenceFactory.java
new file mode 100644
index 00000000000..9175bd144c4
--- /dev/null
+++ b/web/client-api/src/main/resources/io/deephaven/web/super/io/deephaven/engine/rowset/RowSequenceFactory.java
@@ -0,0 +1,14 @@
+//
+// Copyright (c) 2016-2024 Deephaven Data Labs and Patent Pending
+//
+package io.deephaven.engine.rowset;
+
+import io.deephaven.engine.rowset.impl.WritableRowSetImpl;
+import io.deephaven.web.shared.data.RangeSet;
+
+public class RowSequenceFactory {
+    public static final RowSequence EMPTY = new WebRowSetImpl(RangeSet.empty());
+    public static RowSequence forRange(final long firstRowKey, final long lastRowKey) {
+        return new WebRowSetImpl(RangeSet.ofRange(firstRowKey, lastRowKey));
+    }
+}
diff --git a/web/client-api/src/main/resources/io/deephaven/web/super/io/deephaven/engine/rowset/RowSet.java b/web/client-api/src/main/resources/io/deephaven/web/super/io/deephaven/engine/rowset/RowSet.java
new file mode 100644
index 00000000000..a86d285d230
--- /dev/null
+++ b/web/client-api/src/main/resources/io/deephaven/web/super/io/deephaven/engine/rowset/RowSet.java
@@ -0,0 +1,14 @@
+//
+// Copyright (c) 2016-2024 Deephaven Data Labs and Patent Pending
+//
+package io.deephaven.engine.rowset;
+
+import io.deephaven.util.SafeCloseable;
+import io.deephaven.util.datastructures.LongSizedDataStructure;
+
+public interface RowSet extends RowSequence, LongSizedDataStructure, SafeCloseable {
+    RowSet copy();
+    long get(long rowPosition);
+
+    WritableRowSet intersect(RowSet rowSet);
+}
diff --git a/web/client-api/src/main/resources/io/deephaven/web/super/io/deephaven/engine/rowset/RowSetBuilderSequential.java b/web/client-api/src/main/resources/io/deephaven/web/super/io/deephaven/engine/rowset/RowSetBuilderSequential.java
new file mode 100644
index 00000000000..e14ffa21d9f
--- /dev/null
+++ b/web/client-api/src/main/resources/io/deephaven/web/super/io/deephaven/engine/rowset/RowSetBuilderSequential.java
@@ -0,0 +1,11 @@
+//
+// Copyright (c) 2016-2024 Deephaven Data Labs and Patent Pending
+//
+package io.deephaven.engine.rowset;
+
+import io.deephaven.util.datastructures.LongRangeConsumer;
+
+public interface RowSetBuilderSequential extends LongRangeConsumer {
+    void appendRange(long rangeFirstRowKey, long rangeLastRowKey);
+    RowSet build();
+}
diff --git a/web/client-api/src/main/resources/io/deephaven/web/super/io/deephaven/engine/rowset/RowSetFactory.java b/web/client-api/src/main/resources/io/deephaven/web/super/io/deephaven/engine/rowset/RowSetFactory.java
new file mode 100644
index 00000000000..4dfe25e44e6
--- /dev/null
+++ b/web/client-api/src/main/resources/io/deephaven/web/super/io/deephaven/engine/rowset/RowSetFactory.java
@@ -0,0 +1,23 @@
+//
+// Copyright (c) 2016-2024 Deephaven Data Labs and Patent Pending
+//
+package io.deephaven.engine.rowset;
+
+import io.deephaven.engine.rowset.RowSetBuilderSequential;
+import io.deephaven.web.shared.data.RangeSet;
+
+public class RowSetFactory {
+
+    public static RowSet empty() {
+        return new WebRowSetImpl(RangeSet.empty());
+    }
+    public static RowSetBuilderSequential builderSequential() {
+        return new WebRowSetBuilderSequentialImpl();
+    }
+    public static RowSet fromRange(long first, long last) {
+        return new WebRowSetImpl(RangeSet.ofRange(first, last));
+    }
+    public static RowSet flat(long size) {
+        return size <= 0 ? empty() : new WebRowSetImpl(RangeSet.ofRange(0, size - 1));
+    }
+}
diff --git a/web/client-api/src/main/resources/io/deephaven/web/super/io/deephaven/engine/rowset/WebRowSetBuilderSequentialImpl.java b/web/client-api/src/main/resources/io/deephaven/web/super/io/deephaven/engine/rowset/WebRowSetBuilderSequentialImpl.java
new file mode 100644
index 00000000000..7b2673269d0
--- /dev/null
+++ b/web/client-api/src/main/resources/io/deephaven/web/super/io/deephaven/engine/rowset/WebRowSetBuilderSequentialImpl.java
@@ -0,0 +1,21 @@
+package io.deephaven.engine.rowset;
+
+import io.deephaven.web.shared.data.Range;
+import io.deephaven.web.shared.data.RangeSet;
+
+final class WebRowSetBuilderSequentialImpl implements RowSetBuilderSequential {
+    private final RangeSet rangeSet = new RangeSet();
+    @Override
+    public void appendRange(long rangeFirstRowKey, long rangeLastRowKey) {
+        rangeSet.addRange(new Range(rangeFirstRowKey, rangeLastRowKey));
+    }
+
+    @Override
+    public void accept(long first, long last) {
+        appendRange(first, last);
+    }
+    @Override
+    public RowSet build() {
+        return new WebRowSetImpl(rangeSet);
+    }
+}
diff --git a/web/client-api/src/main/resources/io/deephaven/web/super/io/deephaven/engine/rowset/WebRowSetImpl.java b/web/client-api/src/main/resources/io/deephaven/web/super/io/deephaven/engine/rowset/WebRowSetImpl.java
new file mode 100644
index 00000000000..abd578086a6
--- /dev/null
+++ b/web/client-api/src/main/resources/io/deephaven/web/super/io/deephaven/engine/rowset/WebRowSetImpl.java
@@ -0,0 +1,89 @@
+package io.deephaven.engine.rowset;
+
+import io.deephaven.util.datastructures.LongAbortableConsumer;
+import io.deephaven.util.datastructures.LongRangeConsumer;
+import io.deephaven.web.shared.data.RangeSet;
+
+import java.util.PrimitiveIterator;
+
+final class WebRowSetImpl implements RowSet, WritableRowSet {
+    private final RangeSet rangeSet;
+
+    WebRowSetImpl(RangeSet rangeSet) {
+        this.rangeSet = rangeSet;
+    }
+
+    @Override
+    public boolean isEmpty() {
+        return rangeSet.isEmpty();
+    }
+
+    @Override
+    public long lastRowKey() {
+        return rangeSet.getLastRow();
+    }
+
+    @Override
+    public boolean forEachRowKey(LongAbortableConsumer lac) {
+        PrimitiveIterator.OfLong iter = rangeSet.indexIterator();
+        while (iter.hasNext()) {
+            long key = iter.nextLong();
+            if (!lac.accept(key)) {
+                return false;
+            }
+        }
+        return true;
+    }
+
+    @Override
+    public void forAllRowKeyRanges(LongRangeConsumer lrc) {
+        rangeSet.rangeIterator().forEachRemaining(r -> {
+            lrc.accept(r.getFirst(), r.getLast());
+        });
+    }
+
+    @Override
+    public long get(long position) {
+        return rangeSet.get(position);
+    }
+    @Override
+    public WritableRowSet intersect(RowSet rowSet) {
+        throw new UnsupportedOperationException("intersect");
+    }
+    @Override
+    public WritableRowSet shift(long shiftAmount) {
+        throw new UnsupportedOperationException("shift");
+    }
+
+
+    @Override
+    public long size() {
+        return rangeSet.size();
+    }
+
+    @Override
+    public void close() {
+
+    }
+
+    @Override
+    public RowSet copy() {
+        return new WebRowSetImpl(rangeSet.copy());
+    }
+
+    @Override
+    public boolean equals(Object obj) {
+        if (obj == this) {
+            return true;
+        }
+        if (!(obj instanceof WebRowSetImpl)) {
+            return false;
+        }
+        return rangeSet.equals(((WebRowSetImpl) obj).rangeSet);
+    }
+
+    @Override
+    public int hashCode() {
+        return rangeSet.hashCode();
+    }
+}
diff --git a/web/client-api/src/main/resources/io/deephaven/web/super/io/deephaven/engine/rowset/WritableRowSet.java b/web/client-api/src/main/resources/io/deephaven/web/super/io/deephaven/engine/rowset/WritableRowSet.java
new file mode 100644
index 00000000000..85572b5939c
--- /dev/null
+++ b/web/client-api/src/main/resources/io/deephaven/web/super/io/deephaven/engine/rowset/WritableRowSet.java
@@ -0,0 +1,8 @@
+//
+// Copyright (c) 2016-2024 Deephaven Data Labs and Patent Pending
+//
+package io.deephaven.engine.rowset;
+
+public interface WritableRowSet extends RowSet {
+    WritableRowSet shift(long shiftAmount);
+}
diff --git a/web/client-api/src/main/resources/io/deephaven/web/super/io/deephaven/extensions/barrage/chunk/array/ArrayReflectUtil.java b/web/client-api/src/main/resources/io/deephaven/web/super/io/deephaven/extensions/barrage/chunk/array/ArrayReflectUtil.java
new file mode 100644
index 00000000000..4b0dd298944
--- /dev/null
+++ b/web/client-api/src/main/resources/io/deephaven/web/super/io/deephaven/extensions/barrage/chunk/array/ArrayReflectUtil.java
@@ -0,0 +1,18 @@
+//
+// Copyright (c) 2016-2024 Deephaven Data Labs and Patent Pending
+//
+package io.deephaven.extensions.barrage.chunk.array;
+
+import java.lang.reflect.Array;
+
+/**
+ * Browser impl, that only returns a plain Object[].
+ */
+class ArrayReflectUtil {
+    /**
+     * Always returns a plain Object[].
+     */
+    static Object newInstance(Class<?> componentType, int length) {
+        return new Object[length];
+    }
+}
diff --git a/web/client-api/src/main/resources/io/deephaven/web/super/io/deephaven/util/MultiException.java b/web/client-api/src/main/resources/io/deephaven/web/super/io/deephaven/util/MultiException.java
new file mode 100644
index 00000000000..25c80ae422b
--- /dev/null
+++ b/web/client-api/src/main/resources/io/deephaven/web/super/io/deephaven/util/MultiException.java
@@ -0,0 +1,74 @@
+//
+// Copyright (c) 2016-2024 Deephaven Data Labs and Patent Pending
+//
+package io.deephaven.util;
+
+import java.util.List;
+
+/**
+ * Simplified version of MultiException, which doesn't require PrintWriter.
+ */
+public class MultiException extends Exception {
+
+    public static final Throwable[] ZERO_LENGTH_THROWABLE_ARRAY = new Throwable[0];
+    private final Throwable[] causes;
+
+    /**
+     * Create a MultiException from an array of Throwable causes.
+     *
+     * @param description the message to use
+     * @param causes a list of causes
+     */
+    public MultiException(String description, Throwable... causes) {
+        super(description, getFirstCause(causes));
+        this.causes = causes == null ? ZERO_LENGTH_THROWABLE_ARRAY : causes;
+    }
+
+
+    /**
+     * If there is a single exception, return that exception; otherwise wrap the causes into a MultiException.
+     *
+     * @param description the description for the MultiException
+     * @param causes the list of causes
+     * @return a MultiException or the single Throwable
+     */
+    public static Throwable maybeWrapInMultiException(String description, List<? extends Throwable> causes) {
+        if (causes.size() == 1) {
+            return causes.get(0);
+        }
+        return new MultiException(description, causes.toArray(ZERO_LENGTH_THROWABLE_ARRAY));
+    }
+
+    private static Throwable getFirstCause(Throwable[] causes) {
+        if (causes == null || causes.length == 0) {
+            return null;
+        }
+
+        return causes[0];
+    }
+
+    /**
+     * @return all of the exceptions that resulted in this one.
+     */
+    public Throwable[] getCauses() {
+        return causes;
+    }
+
+    @Override
+    public String getMessage() {
+        StringBuilder sb = new StringBuilder();
+        sb.append(super.getMessage()).append(":\n");
+        for (int i = 0; i < causes.length; i++) {
+            sb.append("Cause ").append(i).append(": ");
+            sb.append(causes[i].toString());
+            sb.append('\n');
+        }
+
+        return sb.toString();
+    }
+
+    @Override
+    public String toString() {
+        return getMessage();
+    }
+}
diff --git a/web/client-api/src/main/resources/io/deephaven/web/super/io/deephaven/util/referencecounting/ReferenceCounted.java b/web/client-api/src/main/resources/io/deephaven/web/super/io/deephaven/util/referencecounting/ReferenceCounted.java
new file mode 100644
index 00000000000..f33bd8c6483
--- /dev/null
+++ b/web/client-api/src/main/resources/io/deephaven/web/super/io/deephaven/util/referencecounting/ReferenceCounted.java
@@ -0,0 +1,193 @@
+//
+// Copyright (c) 2016-2024 Deephaven Data Labs and Patent Pending
+//
+package io.deephaven.util.referencecounting;
+
+import org.jetbrains.annotations.NotNull;
+
+/**
+ * Implements a recurring reference counting pattern - a concurrent reference count that should refuse to go below zero,
+ * and invokes {@link #onReferenceCountAtZero()} exactly once when the count returns to zero.
+ */
+public abstract class ReferenceCounted {
+    /**
+     * This constant represents a "zero" reference count value that doesn't prevent increasing the reference count.
+     */
+    private static final int INITIAL_ZERO_VALUE = -1;
+
+    /**
+     * Since we've reserved -1 as our initial reference count value, our maximum is really one less.
+     */
+    private static final int MAXIMUM_VALUE = -3;
+
+    /**
+     * This is our "one" reference count value.
+     */
+    private static final int ONE_VALUE = 1;
+
+    /**
+     * This is our normal "zero" reference count value (terminal state).
+     */
+    private static final int NORMAL_TERMINAL_ZERO_VALUE = 0;
+
+    /**
+     * This is a marker "zero" reference count value (terminal state), signifying that a reference count was set to zero
+     * under exceptional circumstances, and additional attempts to drop the reference count should be treated as
+     * successful so as not to violate constraints.
+     */
+    private static final int FORCED_TERMINAL_ZERO_VALUE = -2;
+
+    /**
+     * The actual value of our reference count.
+     */
+    private int referenceCount;
+
+    protected ReferenceCounted() {
+        this(0);
+    }
+
+    /**
+     * @param initialValue The initial value for the reference count, taken as an unsigned integer. Must not be one of
+     *        the reserved values {@value #INITIAL_ZERO_VALUE} or {@value #FORCED_TERMINAL_ZERO_VALUE}.
+     */
+    @SuppressWarnings("WeakerAccess")
+    protected ReferenceCounted(final int initialValue) {
+        initializeReferenceCount(initialValue);
+    }
+
+    private void initializeReferenceCount(final int initialValue) {
+        if (initialValue == INITIAL_ZERO_VALUE || initialValue == FORCED_TERMINAL_ZERO_VALUE) {
+            throw new IllegalArgumentException("Invalid initial reference count " + initialValue);
+        }
+        referenceCount = initialValue == 0 ? INITIAL_ZERO_VALUE : initialValue;
+    }
+
+    public static String getReferenceCountDebug(Object maybeReferenceCounted) {
+        return maybeReferenceCounted instanceof ReferenceCounted
+                ? Integer.toString(((ReferenceCounted) maybeReferenceCounted).getCurrentReferenceCount())
+                : "not reference counted";
+    }
+
+    private int getCurrentReferenceCount() {
+        return referenceCount;
+    }
+
+    private boolean tryUpdateReferenceCount(final int expected, final int update) {
+        if (referenceCount != expected) {
+            return false;
+        }
+        referenceCount = update;
+        return true;
+    }
+
+    /**
+     * Reset this reference count to its initial state for reuse.
+     */
+    public final void resetReferenceCount() {
+        if (!tryUpdateReferenceCount(NORMAL_TERMINAL_ZERO_VALUE, INITIAL_ZERO_VALUE)
+                && !tryUpdateReferenceCount(FORCED_TERMINAL_ZERO_VALUE, INITIAL_ZERO_VALUE)) {
+            throw new IllegalStateException("reference count is non-zero and cannot be reset");
+        }
+    }
+
+    private static boolean isInitialZero(final int countValue) {
+        return countValue == INITIAL_ZERO_VALUE;
+    }
+
+    private static boolean isTerminalZero(final int countValue) {
+        return countValue == NORMAL_TERMINAL_ZERO_VALUE || countValue == FORCED_TERMINAL_ZERO_VALUE;
+    }
+
+    private static boolean isZero(final int countValue) {
+        return isInitialZero(countValue) || isTerminalZero(countValue);
+    }
+
+    /**
+     * Increment the reference count by 1, if it has not already been decreased to 0.
+     *
+     * @return Whether the reference count was successfully incremented
+     * @throws IllegalStateException If the reference count is already at its maximum referenceCount
+     */
+    public final boolean tryIncrementReferenceCount() {
+        int currentReferenceCount;
+        while (!isTerminalZero(currentReferenceCount = getCurrentReferenceCount())) {
+            if (currentReferenceCount == MAXIMUM_VALUE) {
+                throw new IllegalStateException("reference count cannot exceed maximum value");
+            }
+            if (tryUpdateReferenceCount(currentReferenceCount,
+                    isInitialZero(currentReferenceCount) ? ONE_VALUE : currentReferenceCount + 1)) {
+                return true;
+            }
+        }
+        return false;
+    }
+
+    /**
+     * Increment the reference count by one, if it has not already been decreased to zero.
+     *
+     * @throws IllegalStateException If the reference count was not successfully incremented
+     */
+    public final void incrementReferenceCount() {
+        if (!tryIncrementReferenceCount()) {
+            throw new IllegalStateException("reference count has already reached zero");
+        }
+    }
+
+    /**
+     * Decrement the reference count by one, if it has ever been increased and has not already been decreased to zero.
+     * Invokes the implementation's {@link #onReferenceCountAtZero()} method if decrementing to zero.
+     *
+     * @return Whether the reference count was successfully decremented
+     */
+    @SuppressWarnings({"WeakerAccess", "BooleanMethodIsAlwaysInverted"})
+    public final boolean tryDecrementReferenceCount() {
+        int currentReferenceCount;
+        while (!isZero(currentReferenceCount = getCurrentReferenceCount())) {
+            if (tryUpdateReferenceCount(currentReferenceCount, currentReferenceCount - 1)) {
+                if (currentReferenceCount == ONE_VALUE) { // Did we just CAS from 1 to 0?
+                    onReferenceCountAtZero();
+                }
+                return true;
+            }
+        }
+        return currentReferenceCount == FORCED_TERMINAL_ZERO_VALUE;
+    }
+
+    /**
+     * Force the reference count to zero. If it was non-zero, this will have the same side effects as returning to zero
+     * normally, but subsequent invocations of {@link #decrementReferenceCount()} and
+     * {@link #tryDecrementReferenceCount()} will act as if the reference count was successfully decremented until
+     * {@link #resetReferenceCount()} is invoked.
+     *
+     * @return Whether this invocation actually forced the reference count to zero (and invoked
+     *         {@link #onReferenceCountAtZero()}. {@code false} means that this ReferenceCounted reached a zero through
+     *         other means.
+     */
+    public final boolean forceReferenceCountToZero() {
+        int currentReferenceCount;
+        while (!isZero(currentReferenceCount = getCurrentReferenceCount())) {
+            if (tryUpdateReferenceCount(currentReferenceCount, FORCED_TERMINAL_ZERO_VALUE)) {
+                onReferenceCountAtZero();
+                return true;
+            }
+        }
+        return false;
+    }
+
+    /**
+     * Decrement the reference count by one, if it has ever been increased and has not already been decreased to zero.
+     * Invokes the implementation's {@link #onReferenceCountAtZero()} method if decrementing to zero.
+     *
+     * @throws IllegalStateException If the reference count was not successfully decremented
+     */
+    public final void decrementReferenceCount() {
+        if (!tryDecrementReferenceCount()) {
+            throw new IllegalStateException("reference count has been decreased more than increased");
+        }
+    }
+
+    /**
+     * Callback method that will be invoked when the reference count returns to zero.
+     */
+    protected abstract void onReferenceCountAtZero();
+}
diff --git a/web/client-api/src/main/resources/io/deephaven/web/super/java/io/DataInput.java b/web/client-api/src/main/resources/io/deephaven/web/super/java/io/DataInput.java
new file mode 100644
index 00000000000..8b8eb52520e
--- /dev/null
+++ b/web/client-api/src/main/resources/io/deephaven/web/super/java/io/DataInput.java
@@ -0,0 +1,19 @@
+package java.io;
+
+public interface DataInput {
+    boolean readBoolean() throws IOException;
+    byte readByte() throws IOException;
+    char readChar() throws IOException;
+    double readDouble() throws IOException;
+    float readFloat() throws IOException;
+    void readFully(byte[] b) throws IOException;
+    void readFully(byte[] b, int off, int len) throws IOException;
+    int readInt() throws IOException;
+    String readLine() throws IOException;
+    long readLong() throws IOException;
+    short readShort() throws IOException;
+    int readUnsignedByte() throws IOException;
+    int readUnsignedShort() throws IOException;
+    String readUTF() throws IOException;
+    int skipBytes(int n) throws IOException;
+}
diff --git a/web/client-api/src/main/resources/io/deephaven/web/super/java/io/DataOutput.java b/web/client-api/src/main/resources/io/deephaven/web/super/java/io/DataOutput.java
new file mode 100644
index 00000000000..0534189f69a
--- /dev/null
+++ b/web/client-api/src/main/resources/io/deephaven/web/super/java/io/DataOutput.java
@@ -0,0 +1,18 @@
+package java.io;
+
+public interface DataOutput {
+    void write(byte[] b) throws IOException;
+    void write(byte[] b, int off, int len) throws IOException;
+    void write(int b) throws IOException;
+    void writeBoolean(boolean v) throws IOException;
+    void writeByte(int v) throws IOException;
+    void writeBytes(String s) throws IOException;
+    void writeChar(int v) throws IOException;
+    void writeChars(String s) throws IOException;
+    void writeDouble(double v) throws IOException;
+    void writeFloat(float v) throws IOException;
+    void writeInt(int v) throws IOException;
+    void writeLong(long v) throws IOException;
+    void writeShort(int v) throws IOException;
+    void writeUTF(String s) throws IOException;
+}
diff --git a/web/client-api/src/main/resources/io/deephaven/web/super/java/io/DataOutputStream.java b/web/client-api/src/main/resources/io/deephaven/web/super/java/io/DataOutputStream.java
new file mode 100644
index 00000000000..29f380a4a12
--- /dev/null
+++ b/web/client-api/src/main/resources/io/deephaven/web/super/java/io/DataOutputStream.java
@@ -0,0 +1,104 @@
+package java.io;
+
+import org.gwtproject.nio.Numbers;
+
+import java.nio.charset.StandardCharsets;
+
+public class DataOutputStream extends FilterOutputStream implements DataOutput {
+    protected int written;
+
+    public DataOutputStream(OutputStream out) {
+        super(out);
+    }
+
+    @Override
+    public void write(int b) throws IOException {
+        super.write(b);
+        written++;
+    }
+
+    @Override
+    public void write(byte[] b, int off, int len) throws IOException {
+        super.write(b, off, len);
+        written += len;
+    }
+
+    @Override
+    public void writeBoolean(boolean b) throws IOException {
+        write(b ? 1 : 0);
+    }
+
+    @Override
+    public void writeByte(int i) throws IOException {
+        write(i);
+    }
+
+    @Override
+    public void writeShort(int i) throws IOException {
+        super.write((i >> 8) & 0xFF);
+        super.write((i >> 0) & 0xFF);
+        written += 2;
+    }
+
+    @Override
+    public void writeChar(int i) throws IOException {
+        super.write((i >> 8) & 0xFF);
+        super.write((i >> 0) & 0xFF);
+        written += 2;
+    }
+
+    @Override
+    public void writeInt(int i) throws IOException {
+        super.write((i >> 24) & 0xFF);
+        super.write((i >> 16) & 0xFF);
+        super.write((i >> 8) & 0xFF);
+        super.write((i >> 0) & 0xFF);
+        written += 4;
+    }
+
+    @Override
+    public void writeLong(long l) throws IOException {
+        super.write((int) (l >> 56) & 0xFF);
+        super.write((int) (l >> 48) & 0xFF);
+        super.write((int) (l >> 40) & 0xFF);
+        super.write((int) (l >> 32) & 0xFF);
+        super.write((int) (l >> 24) & 0xFF);
+        super.write((int) (l >> 16) & 0xFF);
+        super.write((int) (l >> 8) & 0xFF);
+        super.write((int) (l >> 0) & 0xFF);
+        written += 8;
+    }
+
+    @Override
+    public void writeFloat(float v) throws IOException {
+        writeInt(Numbers.floatToIntBits(v));
+    }
+
+    @Override
+    public void writeDouble(double v) throws IOException {
+        writeLong(Numbers.doubleToRawLongBits(v));
+    }
+
+    @Override
+    public void writeBytes(String s) throws IOException {
+        for (int i = 0; i < s.length(); i++) {
+            super.write(s.charAt(i) & 0xFF);
+        }
+        written += s.length();
+    }
+
+    @Override
+    public void writeChars(String s) throws IOException {
+        for (int i = 0; i < s.length(); i++) {
+            char c = s.charAt(i);
+            super.write((c >> 8) & 0xFF);
+            super.write(c & 0xFF);
+        }
+        written += s.length() * 2;
+    }
+
+    @Override
+    public void writeUTF(String s) throws IOException {
+        throw new UnsupportedOperationException("modified utf-8");
+    }
+}
diff --git a/web/client-api/src/main/resources/io/deephaven/web/super/java/io/EOFException.java b/web/client-api/src/main/resources/io/deephaven/web/super/java/io/EOFException.java
new file mode 100644
index 00000000000..ac8a7959205
--- /dev/null
+++ b/web/client-api/src/main/resources/io/deephaven/web/super/java/io/EOFException.java
@@ -0,0 +1,10 @@
+package java.io;
+
+public class EOFException extends IOException {
+    public EOFException() {
+    }
+
+    public EOFException(String s) {
+        super(s);
+    }
+}
diff --git a/web/client-api/src/main/resources/io/deephaven/web/super/java/io/UTFDataFormatException.java b/web/client-api/src/main/resources/io/deephaven/web/super/java/io/UTFDataFormatException.java
new file mode 100644
index 00000000000..e2c6a3d3bd8
--- /dev/null
+++ b/web/client-api/src/main/resources/io/deephaven/web/super/java/io/UTFDataFormatException.java
@@ -0,0 +1,11 @@
+package java.io;
+
+public class UTFDataFormatException extends IOException {
+    public UTFDataFormatException() {
+        super();
+    }
+
+    public UTFDataFormatException(String message) {
+        super(message);
+    }
+}
diff --git a/web/client-api/src/main/resources/io/deephaven/web/super/java/lang/ref/Reference.java b/web/client-api/src/main/resources/io/deephaven/web/super/java/lang/ref/Reference.java
new file mode 100644
index 00000000000..2f9dc276b00
--- /dev/null
+++ b/web/client-api/src/main/resources/io/deephaven/web/super/java/lang/ref/Reference.java
@@ -0,0 +1,44 @@
+package java.lang.ref;
+
+import io.deephaven.web.client.fu.JsWeakRef;
+
+public abstract class Reference<T> {
+
+    private JsWeakRef<T> jsWeakRef;
+
+    Reference(T referent) {
+        this(referent, (ReferenceQueue) null);
+    }
+
+    Reference(T referent, ReferenceQueue<? super T> queue) {
+        if (referent != null) {
+            jsWeakRef = new JsWeakRef<>(referent);
+        }
+    }
+
+    public T get() {
+        if (jsWeakRef == null) {
+            return null;
+        }
+        return jsWeakRef.deref();
+    }
+
+    public void clear() {
+        if (jsWeakRef != null) {
+            jsWeakRef = null;
+        }
+    }
+
+    public boolean isEnqueued() {
+        return false;
+    }
+
+    public boolean enqueue() {
+        throw new IllegalStateException("never called when emulated");
+    }
+
+    protected Object clone() throws CloneNotSupportedException {
+        throw new CloneNotSupportedException();
+    }
+
+}
diff --git a/web/client-api/src/main/resources/io/deephaven/web/super/java/lang/ref/ReferenceQueue.java b/web/client-api/src/main/resources/io/deephaven/web/super/java/lang/ref/ReferenceQueue.java
new file mode 100644
index 00000000000..1e2dfd25483
--- /dev/null
+++ b/web/client-api/src/main/resources/io/deephaven/web/super/java/lang/ref/ReferenceQueue.java
@@ -0,0 +1,5 @@
+package java.lang.ref;
+
+public class ReferenceQueue<T> {
+
+}
diff --git a/web/client-api/src/main/resources/io/deephaven/web/super/java/lang/ref/SoftReference.java b/web/client-api/src/main/resources/io/deephaven/web/super/java/lang/ref/SoftReference.java
new file mode 100644
index 00000000000..f18650366ea
--- /dev/null
+++ b/web/client-api/src/main/resources/io/deephaven/web/super/java/lang/ref/SoftReference.java
@@ -0,0 +1,10 @@
+package java.lang.ref;
+
+public class SoftReference<T> extends Reference<T> {
+    public SoftReference(T referent) {
+        super(referent);
+    }
+    public SoftReference(T referent, ReferenceQueue<? super T> q) {
+        super(referent, q);
+    }
+}
diff --git a/web/client-api/src/main/resources/io/grpc/Grpc.gwt.xml b/web/client-api/src/main/resources/io/grpc/Grpc.gwt.xml
new file mode 100644
index 00000000000..187ac264524
--- /dev/null
+++ b/web/client-api/src/main/resources/io/grpc/Grpc.gwt.xml
@@ -0,0 +1,3 @@
+<module>
+    <source path="" includes="Drainable.java" />
+</module>
diff --git a/web/client-api/src/main/resources/org/apache/arrow/flatbuf/FlightFlatbufFormat.gwt.xml b/web/client-api/src/main/resources/org/apache/arrow/flatbuf/FlightFlatbufFormat.gwt.xml
new file mode 100644
index 00000000000..9fd0a379083
--- /dev/null
+++ b/web/client-api/src/main/resources/org/apache/arrow/flatbuf/FlightFlatbufFormat.gwt.xml
@@ -0,0 +1,4 @@
+<module>
+    <inherits name="com.google.flatbuffers.FlatBuffers" />
+    <source path="" />
+</module>
diff --git a/web/client-api/src/main/resources/org/immutables/value/Immutables.gwt.xml b/web/client-api/src/main/resources/org/immutables/value/Immutables.gwt.xml
new file mode 100644
index 00000000000..c78151ef021
--- /dev/null
+++ b/web/client-api/src/main/resources/org/immutables/value/Immutables.gwt.xml
@@ -0,0 +1,3 @@
+<module>
+    <source path="" />
+</module>
diff --git a/web/client-api/src/test/java/io/deephaven/web/ClientIntegrationTestSuite.java b/web/client-api/src/test/java/io/deephaven/web/ClientIntegrationTestSuite.java
index e76783234d2..3c3aa8791ca 100644
--- a/web/client-api/src/test/java/io/deephaven/web/ClientIntegrationTestSuite.java
+++ b/web/client-api/src/test/java/io/deephaven/web/ClientIntegrationTestSuite.java
@@ -5,6 +5,7 @@
 
 import com.google.gwt.junit.tools.GWTTestSuite;
 import io.deephaven.web.client.api.*;
+import io.deephaven.web.client.api.grpc.GrpcTransportTestGwt;
 import io.deephaven.web.client.api.storage.JsStorageServiceTestGwt;
 import io.deephaven.web.client.api.subscription.ConcurrentTableTestGwt;
 import io.deephaven.web.client.api.subscription.ViewportTestGwt;
@@ -29,6 +30,8 @@ public static Test suite() {
         suite.addTestSuite(PartitionedTableTestGwt.class);
         suite.addTestSuite(JsStorageServiceTestGwt.class);
         suite.addTestSuite(InputTableTestGwt.class);
+        suite.addTestSuite(ColumnStatisticsTestGwt.class);
+        suite.addTestSuite(GrpcTransportTestGwt.class);
 
         // This should be a unit test, but it requires a browser environment to run on GWT 2.9
         // GWT 2.9 doesn't have proper bindings for Promises in HtmlUnit, so we need to use the IntegrationTest suite
diff --git a/web/client-api/src/test/java/io/deephaven/web/client/api/AbstractAsyncGwtTestCase.java b/web/client-api/src/test/java/io/deephaven/web/client/api/AbstractAsyncGwtTestCase.java
index 557f0ec2952..c674de47a4f 100644
--- a/web/client-api/src/test/java/io/deephaven/web/client/api/AbstractAsyncGwtTestCase.java
+++ b/web/client-api/src/test/java/io/deephaven/web/client/api/AbstractAsyncGwtTestCase.java
@@ -8,10 +8,11 @@
 import elemental2.core.JsArray;
 import elemental2.core.JsError;
 import elemental2.core.JsString;
-import elemental2.dom.CustomEvent;
 import elemental2.dom.DomGlobal;
 import elemental2.promise.IThenable;
 import elemental2.promise.Promise;
+import io.deephaven.web.client.api.event.Event;
+import io.deephaven.web.client.api.event.HasEventHandling;
 import io.deephaven.web.client.api.subscription.ViewportData;
 import io.deephaven.web.client.api.tree.JsTreeTable;
 import io.deephaven.web.client.fu.CancellablePromise;
@@ -106,7 +107,7 @@ JsRunnable assertEventNotCalled(
             final String ev = events[i];
             undos[i] = handling.addEventListener(ev, e -> {
                 log("Did not expect", ev, "but fired event", e);
-                report("Expected " + ev + " to not be called; detail: " + (e.detail));
+                report("Expected " + ev + " to not be called; detail: " + (e.getDetail()));
             });
         }
         return () -> {
@@ -242,7 +243,7 @@ protected Promise<JsTable> assertUpdateReceived(JsTable table, int count, int ti
 
     protected Promise<JsTable> assertUpdateReceived(JsTable table, Consumer<ViewportData> check, int timeoutInMillis) {
         return Promise.race(this.<JsTable, ViewportData>waitForEvent(table, JsTable.EVENT_UPDATED, e -> {
-            ViewportData viewportData = e.detail;
+            ViewportData viewportData = e.getDetail();
             check.accept(viewportData);
         }, timeoutInMillis),
                 table.nextEvent(JsTable.EVENT_REQUEST_FAILED, (double) timeoutInMillis).then(Promise::reject))
@@ -274,7 +275,7 @@ protected IThenable.ThenOnFulfilledCallbackFn<JsTable, JsTable> waitForTickTwice
     }
 
     protected <V extends HasEventHandling, T> Promise<V> waitForEventWhere(V evented, String eventName,
-            Predicate<CustomEvent<T>> check, int timeout) {
+            Predicate<Event<T>> check, int timeout) {
         // note that this roughly reimplements the 'kill timer' so this can be run in parallel with itself or other
         // similar steps
         return new Promise<>((resolve, reject) -> {
@@ -309,7 +310,7 @@ protected <V extends HasEventHandling, T> Promise<V> waitForEventWhere(V evented
     }
 
     protected <V extends HasEventHandling, T> Promise<V> waitForEvent(V evented, String eventName,
-            Consumer<CustomEvent<T>> check, int timeout) {
+            Consumer<Event<T>> check, int timeout) {
         return this.<V, T>waitForEventWhere(evented, eventName, e -> {
             check.accept(e);
             return true;
diff --git a/web/client-api/src/test/java/io/deephaven/web/client/api/ColumnStatisticsTestGwt.java b/web/client-api/src/test/java/io/deephaven/web/client/api/ColumnStatisticsTestGwt.java
new file mode 100644
index 00000000000..dff62ea6f7b
--- /dev/null
+++ b/web/client-api/src/test/java/io/deephaven/web/client/api/ColumnStatisticsTestGwt.java
@@ -0,0 +1,99 @@
+//
+// Copyright (c) 2016-2024 Deephaven Data Labs and Patent Pending
+//
+package io.deephaven.web.client.api;
+
+import elemental2.core.JsMap;
+import elemental2.promise.Promise;
+
+public class ColumnStatisticsTestGwt extends AbstractAsyncGwtTestCase {
+    private final TableSourceBuilder tables = new TableSourceBuilder()
+            .script("from deephaven import empty_table")
+            .script("staticTable", "empty_table(3).update([\"A = i % 2\", \"B = `` + A\"])");
+
+    public void testStatsWithUniqueCounts() {
+        connect(tables)
+                .then(table("staticTable"))
+                .then(table -> Promise.all(
+                        table.getColumnStatistics(table.findColumn("A"))
+                                .then(stats -> {
+                                    JsMap<String, Double> uniqueValues = stats.getUniqueValues();
+                                    assertEquals(0, uniqueValues.size);
+
+                                    return null;
+                                }),
+                        table.getColumnStatistics(table.findColumn("B"))
+                                .then(stats -> {
+                                    JsMap<String, Double> uniqueValues = stats.getUniqueValues();
+                                    assertEquals(2, uniqueValues.size);
+                                    assertEquals(2.0, uniqueValues.get("0"));
+                                    assertEquals(1.0, uniqueValues.get("1"));
+
+                                    return null;
+                                })))
+                .then(this::finish).catch_(this::report);
+    }
+
+    public void testStats() {
+        connect(tables)
+                .then(table("staticTable"))
+                .then(table -> Promise.all(
+                        table.getColumnStatistics(table.findColumn("A"))
+                                .then(stats -> {
+                                    JsMap<String, Object> values = stats.getStatisticsMap();
+                                    assertEquals(LongWrapper.of(3),
+                                            values.get(JsColumnStatistics.StatType.COUNT.getDisplayName()));
+                                    assertEquals(LongWrapper.of(3),
+                                            values.get(JsColumnStatistics.StatType.SIZE.getDisplayName()));
+                                    assertEquals(null,
+                                            values.get(JsColumnStatistics.StatType.UNIQUE_VALUES.getDisplayName()));
+                                    assertEquals(LongWrapper.of(1),
+                                            values.get(JsColumnStatistics.StatType.SUM.getDisplayName()));
+                                    assertEquals(LongWrapper.of(1),
+                                            values.get(JsColumnStatistics.StatType.SUM_ABS.getDisplayName()));
+                                    assertEquals(1. / 3., values.get(JsColumnStatistics.StatType.AVG.getDisplayName()));
+                                    assertEquals(1. / 3.,
+                                            values.get(JsColumnStatistics.StatType.AVG_ABS.getDisplayName()));
+                                    assertEquals(0.0, values.get(JsColumnStatistics.StatType.MIN.getDisplayName()));
+                                    assertEquals(0.0, values.get(JsColumnStatistics.StatType.MIN_ABS.getDisplayName()));
+                                    assertEquals(1.0, values.get(JsColumnStatistics.StatType.MAX.getDisplayName()));
+                                    assertEquals(1.0, values.get(JsColumnStatistics.StatType.MAX_ABS.getDisplayName()));
+                                    assertEquals(0.5774,
+                                            (Double) values.get(JsColumnStatistics.StatType.STD_DEV.getDisplayName()),
+                                            0.0001);
+                                    assertEquals(LongWrapper.of(1),
+                                            values.get(JsColumnStatistics.StatType.SUM_SQRD.getDisplayName()));
+
+                                    return null;
+                                }),
+                        table.getColumnStatistics(table.findColumn("B"))
+                                .then(stats -> {
+                                    JsMap<String, Object> values = stats.getStatisticsMap();
+                                    assertEquals(LongWrapper.of(3),
+                                            values.get(JsColumnStatistics.StatType.COUNT.getDisplayName()));
+                                    assertEquals(LongWrapper.of(3),
+                                            values.get(JsColumnStatistics.StatType.SIZE.getDisplayName()));
+                                    assertEquals(2.0,
+                                            values.get(JsColumnStatistics.StatType.UNIQUE_VALUES.getDisplayName()));
+
+                                    assertEquals(null, values.get(JsColumnStatistics.StatType.SUM.name()));
+                                    assertEquals(null, values.get(JsColumnStatistics.StatType.SUM_ABS.name()));
+                                    assertEquals(null, values.get(JsColumnStatistics.StatType.AVG.name()));
+                                    assertEquals(null, values.get(JsColumnStatistics.StatType.AVG_ABS.name()));
+                                    assertEquals(null, values.get(JsColumnStatistics.StatType.MIN.name()));
+                                    assertEquals(null, values.get(JsColumnStatistics.StatType.MIN_ABS.name()));
+                                    assertEquals(null, values.get(JsColumnStatistics.StatType.MAX.name()));
+                                    assertEquals(null, values.get(JsColumnStatistics.StatType.MAX_ABS.name()));
+                                    assertEquals(null, values.get(JsColumnStatistics.StatType.STD_DEV.name()));
+                                    assertEquals(null, values.get(JsColumnStatistics.StatType.SUM_SQRD.name()));
+                                    return null;
+                                })))
+                .then(this::finish).catch_(this::report);
+    }
+
+    @Override
+    public String getModuleName() {
+        return "io.deephaven.web.DeephavenIntegrationTest";
+    }
+
+}
diff --git a/web/client-api/src/test/java/io/deephaven/web/client/api/HierarchicalTableTestGwt.java b/web/client-api/src/test/java/io/deephaven/web/client/api/HierarchicalTableTestGwt.java
index 3e244ba9cd8..97d977fb029 100644
--- a/web/client-api/src/test/java/io/deephaven/web/client/api/HierarchicalTableTestGwt.java
+++ b/web/client-api/src/test/java/io/deephaven/web/client/api/HierarchicalTableTestGwt.java
@@ -3,21 +3,39 @@
 //
 package io.deephaven.web.client.api;
 
-import elemental2.dom.CustomEvent;
+import elemental2.core.JsArray;
+import elemental2.promise.Promise;
+import io.deephaven.web.client.api.tree.JsRollupConfig;
+import io.deephaven.web.client.api.event.Event;
 import io.deephaven.web.client.api.tree.JsTreeTable;
+import io.deephaven.web.client.api.tree.TreeViewportData;
+import io.deephaven.web.client.api.tree.enums.JsAggregationOperation;
+import jsinterop.base.Js;
+import jsinterop.base.JsPropertyMap;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.function.Supplier;
 
 public class HierarchicalTableTestGwt extends AbstractAsyncGwtTestCase {
+    private static final Format red = new Format(0x1ff000001e0e0e0L, 0, null, null);
+    private static final Format green = new Format(0x100800001e0e0e0L, 0, null, null);
+
     @Override
     public String getModuleName() {
         return "io.deephaven.web.DeephavenIntegrationTest";
     }
 
     private final TableSourceBuilder tables = new TableSourceBuilder()
-            .script("from deephaven import empty_table, time_table")
+            .script("from deephaven import empty_table, time_table, agg")
             .script("static_tree",
-                    "empty_table(1000).update(['ID=i', 'Parent=i == 0 ? null : (int)(i/10)']).tree('ID', 'Parent')")
+                    "empty_table(1000).update(['ID=i', 'Parent=i == 0 ? null : (int)(i/10)']).format_columns(['ID=ID>0 ? GREEN : RED']).tree('ID', 'Parent')")
             .script("ticking_tree",
-                    "time_table('PT0.1s').update(['ID=i', 'Parent=i == 0 ? null : (int)(i/10)']).tree('ID', 'Parent')");
+                    "time_table('PT0.1s').update(['ID=i', 'Parent=i == 0 ? null : (int)(i/10)']).format_columns(['ID=ID>0 ? GREEN : RED']).tree('ID', 'Parent')")
+            .script("table_to_rollup",
+                    "time_table('PT0.1s').update(['Y=Math.sin(i/3)', 'X=i%3']).format_columns(['Y=Y>0 ? GREEN : RED'])")
+            .script("ticking_rollup",
+                    "table_to_rollup.rollup(aggs=[agg.first('Y')],by=['X'],include_constituents=True)");
 
     public void testStaticTreeTable() {
         connect(tables)
@@ -33,19 +51,112 @@ public void testStaticTreeTable() {
                     assertEquals("Parent", treeTable.getColumns().getAt(1).getName());
 
                     treeTable.setViewport(0, 99, treeTable.getColumns(), null);
-                    return treeTable.getViewportData().then(data -> {
-                        assertEquals(1d, data.getTreeSize());
+                    return treeTable.getViewportData()
+                            .then(data -> Promise.resolve((TreeViewportData) data))
+                            .then(data -> {
+                                assertEquals(1d, data.getTreeSize());
+
+                                TreeViewportData.TreeRow row0 = (TreeViewportData.TreeRow) data.getRows().getAt(0);
+                                assertFalse(row0.isExpanded());
+                                assertFalse(treeTable.isExpanded(JsTreeTable.RowReferenceUnion.of(0)));
+                                assertFalse(treeTable.isExpanded(JsTreeTable.RowReferenceUnion.of(row0)));
+                                assertTrue(row0.hasChildren());
+                                assertEquals(1, row0.depth());
+
+                                treeTable.expand(JsTreeTable.RowReferenceUnion.of(0), null);
+                                return treeTable.<TreeViewportData>nextEvent(
+                                        JsTreeTable.EVENT_UPDATED, 2001d);
+                            }).then(event -> {
+                                assertEquals(10d, event.getDetail().getTreeSize());
+                                JsArray<TableData.Row> rows = event.getDetail().getRows();
+                                assertEquals(10, rows.length);
+                                TreeViewportData.TreeRow row0 = (TreeViewportData.TreeRow) rows.getAt(0);
+                                assertTrue(row0.isExpanded());
+                                assertTrue(treeTable.isExpanded(JsTreeTable.RowReferenceUnion.of(0)));
+                                assertTrue(treeTable.isExpanded(JsTreeTable.RowReferenceUnion.of(row0)));
+                                assertTrue(row0.hasChildren());
+                                assertEquals(1, row0.depth());
+
+                                // Next 9 are collapsed, have children, are children of row0
+                                for (int i = 1; i < 10; i++) {
+                                    TreeViewportData.TreeRow row = (TreeViewportData.TreeRow) rows.getAt(i);
+                                    assertFalse(row.isExpanded());
+                                    assertFalse(treeTable.isExpanded(JsTreeTable.RowReferenceUnion.of(i)));
+                                    assertTrue(row.hasChildren());
+                                    assertEquals(2, row.depth());
+                                }
+
+                                // move the viewport and try again
+                                treeTable.setViewport(5, 50, treeTable.getColumns(), null);
+                                return treeTable.<TreeViewportData>nextEvent(JsTreeTable.EVENT_UPDATED, 2002d);
+                            }).then(event -> {
+                                assertEquals(10d, event.getDetail().getTreeSize());
+                                JsArray<TableData.Row> rows = event.getDetail().getRows();
+                                assertEquals(5, rows.length);
 
-                        treeTable.expand(JsTreeTable.RowReferenceUnion.of(0), null);
-                        return treeTable.<JsTreeTable.TreeViewportData>nextEvent(JsTreeTable.EVENT_UPDATED, 2001d);
-                    }).then(event -> {
-                        assertEquals(10d, event.detail.getTreeSize());
+                                // Row 0 is already expanded and is the parent of rows 1-9, so expand row 5
+                                treeTable.expand(JsTreeTable.RowReferenceUnion.of(5), null);
 
-                        treeTable.close();
+                                return treeTable.<TreeViewportData>nextEvent(JsTreeTable.EVENT_UPDATED, 2003d);
+                            }).then(event -> {
+                                assertEquals(20d, event.getDetail().getTreeSize());
+                                JsArray<TableData.Row> rows = event.getDetail().getRows();
+                                assertEquals(15, rows.length);
+                                TreeViewportData.TreeRow row5 = (TreeViewportData.TreeRow) rows.getAt(0);
+                                assertTrue(row5.isExpanded());
+                                assertTrue(treeTable.isExpanded(JsTreeTable.RowReferenceUnion.of(5)));
+                                assertTrue(treeTable.isExpanded(JsTreeTable.RowReferenceUnion.of(row5)));
+                                assertTrue(row5.hasChildren());
+                                assertEquals(2, row5.depth());
+
+                                // Next 10 are collapsed, have children, are children of row5
+                                for (int i = 1; i < 11; i++) {
+                                    TreeViewportData.TreeRow row = (TreeViewportData.TreeRow) rows.getAt(i);
+                                    assertFalse(row.isExpanded());
+                                    assertFalse(treeTable.isExpanded(JsTreeTable.RowReferenceUnion.of(i + 5)));
+                                    assertTrue(row.hasChildren());
+                                    assertEquals(3, row.depth());
+                                }
+                                TreeViewportData.TreeRow row16 = (TreeViewportData.TreeRow) rows.getAt(11);
+                                assertFalse(row16.isExpanded());
+                                assertFalse(treeTable.isExpanded(JsTreeTable.RowReferenceUnion.of(16)));
+                                assertTrue(row16.hasChildren());
+                                assertEquals(2, row16.depth());
+
+                                // Expand row 6 by row reference
+                                treeTable.expand((JsTreeTable.RowReferenceUnion) rows.getAt(1), null);
+
+                                return treeTable.<TreeViewportData>nextEvent(JsTreeTable.EVENT_UPDATED, 2004d);
+                            }).then(event -> {
+                                assertEquals(30d, event.getDetail().getTreeSize());
+                                JsArray<TableData.Row> rows = event.getDetail().getRows();
+                                assertEquals(25, rows.length);
+                                TreeViewportData.TreeRow row6 = (TreeViewportData.TreeRow) rows.getAt(1);
+                                assertTrue(row6.isExpanded());
+                                assertTrue(treeTable.isExpanded(JsTreeTable.RowReferenceUnion.of(5)));
+                                assertTrue(treeTable.isExpanded(JsTreeTable.RowReferenceUnion.of(row6)));
+                                assertTrue(row6.hasChildren());
+                                assertEquals(3, row6.depth());
+
+                                // Next 10 are collapsed, are leaf nodes, are children of row5
+                                for (int i = 2; i < 12; i++) {
+                                    TreeViewportData.TreeRow row = (TreeViewportData.TreeRow) rows.getAt(i);
+                                    assertFalse(row.isExpanded());
+                                    assertFalse(treeTable.isExpanded(JsTreeTable.RowReferenceUnion.of(i + 5)));
+                                    assertFalse(row.hasChildren());
+                                    assertEquals(4, row.depth());
+                                }
+                                TreeViewportData.TreeRow row17 = (TreeViewportData.TreeRow) rows.getAt(12);
+                                assertFalse(row17.isExpanded());
+                                assertFalse(treeTable.isExpanded(JsTreeTable.RowReferenceUnion.of(17)));
+                                assertTrue(row17.hasChildren());
+                                assertEquals(3, row17.depth());
+
+                                treeTable.close();
 
-                        assertTrue(treeTable.isClosed());
-                        return null;
-                    });
+                                assertTrue(treeTable.isClosed());
+                                return null;
+                            });
                 })
                 .then(this::finish).catch_(this::report);
     }
@@ -68,17 +179,73 @@ public void testRefreshingTreeTable() {
                     treeTable.setViewport(0, 99, treeTable.getColumns(), null);
 
                     // Wait for the table to tick such that the first row has children
+                    // Read values from the one returned row
                     return waitForEventWhere(treeTable, JsTreeTable.EVENT_UPDATED,
-                            (CustomEvent<JsTreeTable.TreeViewportData> d) -> d.detail.getTreeSize() == 1
-                                    && d.detail.getRows().getAt(0).hasChildren(),
-                            10001).then(data -> {
+                            (Event<TreeViewportData> d) -> d.getDetail()
+                                    .getTreeSize() == 1
+                                    && d.getDetail().getRows().getAtAsAny(0).<TreeViewportData.TreeRow>cast()
+                                            .hasChildren(),
+                            10001)
+                            .then(JsTreeTable::getViewportData)
+                            .then(data -> Promise.resolve((TreeViewportData) data))
+                            .then(data -> {
+                                assertEquals(1.0, data.getTreeSize());
+                                TreeViewportData.TreeRow row1 = (TreeViewportData.TreeRow) data.getRows().getAt(0);
+                                Column timestampCol = treeTable.findColumn("Timestamp");
+                                assertEquals(Format.EMPTY, data.getFormat(0, timestampCol));
+                                assertEquals(Format.EMPTY, row1.getFormat(timestampCol));
+                                assertEquals(Format.EMPTY, timestampCol.getFormat(row1));
+
+                                Column idCol = treeTable.findColumn("ID");
+                                assertEquals(0, data.getData(0, idCol).asInt());
+                                assertEquals(0, row1.get(idCol).asInt());
+                                assertEquals(0, idCol.get(row1).asInt());
+
+                                assertEquals(red, data.getFormat(0, idCol));
+                                assertEquals(red, row1.getFormat(idCol));
+                                assertEquals(red, idCol.getFormat(row1));
+
+                                assertNotNull(data.getData(0, timestampCol));
+                                assertNotNull(row1.get(timestampCol));
+                                assertNotNull(timestampCol.get(row1));
+
                                 treeTable.expand(JsTreeTable.RowReferenceUnion.of(0), null);
 
                                 // Wait for the expand to occur and table to show all 10 rows
                                 return waitForEventWhere(treeTable, JsTreeTable.EVENT_UPDATED,
-                                        (CustomEvent<JsTreeTable.TreeViewportData> d) -> d.detail.getTreeSize() == 10,
+                                        (Event<TreeViewportData> d) -> d.getDetail().getTreeSize() == 10,
                                         14004);
+                            })
+                            .then(JsTreeTable::getViewportData)
+                            .then(data -> Promise.resolve((TreeViewportData) data))
+                            .then(data -> {
+                                TreeViewportData.TreeRow row2 = (TreeViewportData.TreeRow) data.getRows().getAt(1);
+
+                                Column timestampCol = treeTable.findColumn("Timestamp");
+                                assertEquals(Format.EMPTY, data.getFormat(1, timestampCol));
+                                assertEquals(Format.EMPTY, row2.getFormat(timestampCol));
+                                assertEquals(Format.EMPTY, timestampCol.getFormat(row2));
+
+                                Column idCol = treeTable.findColumn("ID");
+                                assertEquals(1, data.getData(1, idCol).asInt());
+                                assertEquals(1, row2.get(idCol).asInt());
+                                assertEquals(1, idCol.get(row2).asInt());
+
+                                assertEquals(green, data.getFormat(1, idCol));
+                                assertEquals(green, row2.getFormat(idCol));
+                                assertEquals(green, idCol.getFormat(row2));
+
+                                // Move the viewport and make sure we get the correct data
+                                treeTable.setViewport(5, 49, treeTable.getColumns(), null);
+                                return treeTable.<TreeViewportData>nextEvent(
+                                        JsTreeTable.EVENT_UPDATED, 2002d);
                             }).then(event -> {
+                                assertEquals(10d, event.getDetail().getTreeSize());
+                                assertEquals(5, event.getDetail().getRows().length);
+
+                                return Promise.resolve(treeTable);
+                            })
+                            .then(event -> {
                                 treeTable.close();
                                 assertTrue(treeTable.isClosed());
                                 return null;
@@ -86,4 +253,154 @@ public void testRefreshingTreeTable() {
                 })
                 .then(this::finish).catch_(this::report);
     }
+
+    public void testTickingRollup() {
+        connect(tables)
+                .then(treeTable("ticking_rollup"))
+                .then(rollup -> {
+                    // Very large timeout, 3.5s is enough that we see failures on this regularly
+                    delayTestFinish(20_001);
+                    assertTrue(rollup.isRefreshing());
+                    assertFalse(rollup.isClosed());
+                    assertTrue(rollup.isIncludeConstituents());
+
+                    assertEquals(2, rollup.getColumns().length);
+                    assertEquals("X", rollup.getColumns().getAt(0).getName());
+                    assertEquals("Y", rollup.getColumns().getAt(1).getName());
+
+                    rollup.setViewport(0, 99, rollup.getColumns(), null);
+
+                    Column xCol = rollup.findColumn("X");
+                    Column yCol = rollup.findColumn("Y");
+
+                    // Wait for the table to tick such that we have at least 4 rows (root, three children)
+                    return waitForEventWhere(rollup, JsTreeTable.EVENT_UPDATED,
+                            (Event<TreeViewportData> d) -> d.getDetail().getTreeSize() == 4,
+                            10002)
+                            .then(JsTreeTable::getViewportData)
+                            .then(data -> Promise.resolve((TreeViewportData) data))
+                            .then(data -> {
+                                TreeViewportData.TreeRow row1 = (TreeViewportData.TreeRow) data.getRows().getAt(0);
+
+                                assertEquals(Format.EMPTY, data.getFormat(0, xCol));
+                                assertEquals(Format.EMPTY, row1.getFormat(xCol));
+                                assertEquals(Format.EMPTY, xCol.getFormat(row1));
+
+                                assertNull(data.getData(0, xCol));
+                                assertNull(row1.get(xCol));
+                                assertNull(xCol.get(row1));
+
+                                assertEquals(Format.EMPTY, data.getFormat(0, yCol));
+                                assertEquals(Format.EMPTY, row1.getFormat(yCol));
+                                assertEquals(Format.EMPTY, yCol.getFormat(row1));
+
+                                assertEquals(0d, data.getData(0, yCol).asDouble());
+                                assertEquals(0d, row1.get(yCol).asDouble());
+                                assertEquals(0d, yCol.get(row1).asDouble());
+
+                                TreeViewportData.TreeRow row2 = (TreeViewportData.TreeRow) data.getRows().getAt(1);
+                                assertEquals(Format.EMPTY, data.getFormat(1, xCol));
+                                assertEquals(Format.EMPTY, row2.getFormat(xCol));
+                                assertEquals(Format.EMPTY, xCol.getFormat(row2));
+
+                                assertEquals(0d, data.getData(1, xCol).asDouble());
+                                assertEquals(0d, row2.get(xCol).asDouble());
+                                assertEquals(0d, xCol.get(row2).asDouble());
+
+                                assertEquals(Format.EMPTY, data.getFormat(1, yCol));
+                                assertEquals(Format.EMPTY, row2.getFormat(yCol));
+                                assertEquals(Format.EMPTY, yCol.getFormat(row2));
+
+                                assertEquals(0d, data.getData(1, yCol).asDouble());
+                                assertEquals(0d, row2.get(yCol).asDouble());
+                                assertEquals(0d, yCol.get(row2).asDouble());
+
+                                // Expand row 2
+                                rollup.expand(JsTreeTable.RowReferenceUnion.of(1), null);
+
+                                // Wait for the expand to occur and table to show all 10 rows
+                                return waitForEventWhere(rollup, JsTreeTable.EVENT_UPDATED,
+                                        (Event<TreeViewportData> d) -> d.getDetail().getTreeSize() > 4,
+                                        14008);
+                            })
+                            .then(JsTreeTable::getViewportData)
+                            .then(data -> Promise.resolve((TreeViewportData) data))
+                            .then(data -> {
+                                TreeViewportData.TreeRow row3 = (TreeViewportData.TreeRow) data.getRows().getAt(2);
+
+                                assertEquals(Format.EMPTY, data.getFormat(2, xCol));
+                                assertEquals(Format.EMPTY, row3.getFormat(xCol));
+                                assertEquals(Format.EMPTY, xCol.getFormat(row3));
+
+                                assertEquals(0d, data.getData(2, yCol).asDouble());
+                                assertEquals(0d, row3.get(yCol).asDouble());
+                                assertEquals(0d, yCol.get(row3).asDouble());
+
+                                assertEquals(red, data.getFormat(2, yCol));
+                                assertEquals(red, row3.getFormat(yCol));
+                                assertEquals(red, yCol.getFormat(row3));
+
+                                assertEquals(0d, data.getData(2, yCol).asDouble());
+                                assertEquals(0d, row3.get(yCol).asDouble());
+                                assertEquals(0d, yCol.get(row3).asDouble());
+
+                                // Collapse row 2, wait until back to 4 rows
+                                rollup.collapse(JsTreeTable.RowReferenceUnion.of(1));
+                                return waitForEventWhere(rollup, JsTreeTable.EVENT_UPDATED,
+                                        (Event<TreeViewportData> d) -> d.getDetail().getTreeSize() == 4,
+                                        14009);
+                            })
+                            .then(event -> {
+                                rollup.close();
+                                assertTrue(rollup.isClosed());
+                                return null;
+                            });
+                })
+                .then(this::finish).catch_(this::report);
+    }
+
+    public void testCreateRollup() {
+        connect(tables)
+                .then(table("table_to_rollup"))
+                .then(table -> {
+                    List<Supplier<Promise<JsTreeTable>>> tests = new ArrayList<>();
+                    // For each supported operation, apply it to the numeric column
+                    // Then expand to verify data can load
+                    List<String> count = List.of(
+                            JsAggregationOperation.COUNT,
+                            JsAggregationOperation.COUNT_DISTINCT,
+                            // TODO(deephaven-core#6201) re-enable this line when fixed
+                            // JsAggregationOperation.DISTINCT,
+                            JsAggregationOperation.MIN,
+                            JsAggregationOperation.MAX,
+                            JsAggregationOperation.SUM,
+                            JsAggregationOperation.ABS_SUM,
+                            JsAggregationOperation.VAR,
+                            JsAggregationOperation.AVG,
+                            JsAggregationOperation.STD,
+                            JsAggregationOperation.FIRST,
+                            JsAggregationOperation.LAST,
+                            JsAggregationOperation.UNIQUE);
+                    for (int i = 0; i < count.size(); i++) {
+                        final int step = i;
+                        String operation = count.get(i);
+                        JsRollupConfig cfg = new JsRollupConfig();
+                        cfg.groupingColumns = Js.uncheckedCast(JsArray.of("X"));
+                        cfg.includeConstituents = true;
+                        cfg.aggregations = JsPropertyMap.of(operation, JsArray.of("Y"));
+                        tests.add(() -> table.rollup(cfg).then(r -> {
+                            r.setViewport(0, 99, null, null);
+                            delayTestFinish(15000 + step);
+
+                            return waitForEventWhere(r, JsTreeTable.EVENT_UPDATED,
+                                    (Event<TreeViewportData> d) -> r.getSize() == 4, 13000 + step)
+                                    .then(event -> Promise.resolve(r));
+                        }));
+                    }
+
+                    return tests.stream().reduce((p1, p2) -> () -> p1.get().then(result -> p2.get())).get().get();
+                })
+                .then(this::finish).catch_(this::report);
+    }
+
 }
diff --git a/web/client-api/src/test/java/io/deephaven/web/client/api/NullValueTestGwt.java b/web/client-api/src/test/java/io/deephaven/web/client/api/NullValueTestGwt.java
index 4699a9f3de5..03ec2a2382b 100644
--- a/web/client-api/src/test/java/io/deephaven/web/client/api/NullValueTestGwt.java
+++ b/web/client-api/src/test/java/io/deephaven/web/client/api/NullValueTestGwt.java
@@ -7,7 +7,6 @@
 import com.google.gwt.junit.Platform;
 import elemental2.core.JsArray;
 import elemental2.promise.Promise;
-import io.deephaven.web.client.api.subscription.ViewportRow;
 import jsinterop.base.Js;
 
 import java.math.BigDecimal;
@@ -86,8 +85,8 @@ public void testTableWithSomeNulls() {
                 .then(table -> {
                     table.setViewport(0, 1, null);
                     return assertUpdateReceived(table, viewport -> {
-                        JsArray<ViewportRow> rows = viewport.getRows();
-                        ViewportRow nullRow = rows.getAt(0);
+                        JsArray<? extends TableData.Row> rows = viewport.getRows();
+                        TableData.Row nullRow = rows.getAt(0);
 
                         JsArray<Column> columns = table.getColumns();
                         for (int i = 0; i < columns.length; i++) {
@@ -95,7 +94,7 @@ public void testTableWithSomeNulls() {
                             assertNull(nullRow.get(columns.getAt(i)));
                         }
 
-                        ViewportRow valueRow = rows.getAt(1);
+                        TableData.Row valueRow = rows.getAt(1);
                         assertEquals(1, valueRow.get(table.findColumn("MyInt")).asInt());
                         assertEquals((long) 1,
                                 valueRow.get(table.findColumn("MyLong")).<LongWrapper>cast().getWrapped());
@@ -157,12 +156,12 @@ public void testTableWithAllNulls() {
                 .then(table -> {
                     table.setViewport(0, 1, null);
                     return assertUpdateReceived(table, viewport -> {
-                        JsArray<ViewportRow> rows = viewport.getRows();
+                        JsArray<? extends TableData.Row> rows = viewport.getRows();
 
                         JsArray<Column> columns = table.getColumns();
                         for (int i = 0; i < columns.length; i++) {
                             for (int j = 0; j < rows.length; j++) {
-                                ViewportRow row = rows.getAt(j);
+                                TableData.Row row = rows.getAt(j);
                                 assertFalse(Js.isTripleEqual(Js.undefined(), row.get(columns.getAt(i))));
                                 assertNull(columns.getAt(i).getName(), row.get(columns.getAt(i)));
                             }
diff --git a/web/client-api/src/test/java/io/deephaven/web/client/api/PartitionedTableTestGwt.java b/web/client-api/src/test/java/io/deephaven/web/client/api/PartitionedTableTestGwt.java
index 4cfa8e9e56a..9bd0b9446a2 100644
--- a/web/client-api/src/test/java/io/deephaven/web/client/api/PartitionedTableTestGwt.java
+++ b/web/client-api/src/test/java/io/deephaven/web/client/api/PartitionedTableTestGwt.java
@@ -4,9 +4,7 @@
 package io.deephaven.web.client.api;
 
 import elemental2.core.JsArray;
-import elemental2.dom.CustomEvent;
-import io.deephaven.web.client.api.subscription.ViewportData;
-import io.deephaven.web.client.api.tree.JsTreeTable;
+import io.deephaven.web.client.api.event.Event;
 
 public class PartitionedTableTestGwt extends AbstractAsyncGwtTestCase {
     @Override
@@ -42,8 +40,7 @@ public void testPartitionedTable() {
                     assertEquals("MyKey", columns[0].getName());
                     assertEquals("x", columns[1].getName());
 
-                    return partitionedTable.getKeyTable().then(keyTable -> {
-                        System.out.println("KeyTable size: " + keyTable.getSize());
+                    return partitionedTable.getBaseTable().then(keyTable -> {
                         assertEquals(5d, keyTable.getSize());
 
                         return partitionedTable.getTable("2");
@@ -70,7 +67,7 @@ public void testTransformedPartitionedTable() {
                     assertEquals(1, columns.length);
                     assertEquals("x", columns[0].getName());
 
-                    return partitionedTable.getKeyTable().then(keyTable -> {
+                    return partitionedTable.getBaseTable().then(keyTable -> {
                         assertEquals(5d, keyTable.getSize());
 
                         return partitionedTable.getTable("2");
@@ -114,19 +111,17 @@ public void testTickingPartitionedTable() {
                     assertEquals("MyKey", columns[1].getName());
                     assertEquals("x", columns[2].getName());
 
-                    return partitionedTable.getKeyTable().then(keyTable -> {
-                        keyTable.setViewport(0, 99, keyTable.getColumns(), null);
-                        return waitForEventWhere(keyTable, JsTable.EVENT_UPDATED,
-                                (CustomEvent<ViewportData> d) -> d.detail.getRows().length >= 5, 14004);
-                    }).then(event -> partitionedTable.getTable("2")).then(constituentTable -> {
-                        assertEquals(3, constituentTable.getColumns().length);
-                        assertTrue(constituentTable.getSize() >= 2);
+                    return waitForEventWhere(partitionedTable, JsPartitionedTable.EVENT_KEYADDED,
+                            (Event<JsArray<Object>> e) -> e.getDetail().getAt(0).equals("2"), 14004)
+                            .then(event -> partitionedTable.getTable("2")).then(constituentTable -> {
+                                assertEquals(3, constituentTable.getColumns().length);
+                                assertTrue(constituentTable.getSize() >= 2);
 
-                        constituentTable.close();
-                        partitionedTable.close();
+                                constituentTable.close();
+                                partitionedTable.close();
 
-                        return null;
-                    });
+                                return null;
+                            });
                 })
                 .then(this::finish).catch_(this::report);
     }
@@ -145,21 +140,17 @@ public void testTickingTransformedPartitionedTable() {
                     assertEquals("Timestamp", columns[0].getName());
                     assertEquals("x", columns[1].getName());
 
-                    return partitionedTable.getKeyTable().then(keyTable -> {
-                        keyTable.setViewport(0, 99, keyTable.getColumns(), null);
-                        return waitForEventWhere(keyTable, JsTable.EVENT_UPDATED,
-                                (CustomEvent<ViewportData> d) -> d.detail.getRows().length >= 5, 14004)
-                                .then(event -> partitionedTable.getTable("2")).then(constituentTable -> {
-                                    assertEquals(2, constituentTable.getColumns().length);
-                                    assertTrue(constituentTable.getSize() >= 1);
+                    return waitForEventWhere(partitionedTable, JsPartitionedTable.EVENT_KEYADDED,
+                            (Event<JsArray<Object>> e) -> e.getDetail().getAt(0).equals("2"), 14005)
+                            .then(event -> partitionedTable.getTable("2")).then(constituentTable -> {
+                                assertEquals(2, constituentTable.getColumns().length);
+                                assertTrue(constituentTable.getSize() >= 1);
 
-                                    keyTable.close();
-                                    constituentTable.close();
-                                    partitionedTable.close();
+                                constituentTable.close();
+                                partitionedTable.close();
 
-                                    return null;
-                                });
-                    });
+                                return null;
+                            });
                 })
                 .then(this::finish).catch_(this::report);
     }
diff --git a/web/client-api/src/test/java/io/deephaven/web/client/api/TotalsTableTestGwt.java b/web/client-api/src/test/java/io/deephaven/web/client/api/TotalsTableTestGwt.java
index 6a6c2d3e706..baeaf723cfb 100644
--- a/web/client-api/src/test/java/io/deephaven/web/client/api/TotalsTableTestGwt.java
+++ b/web/client-api/src/test/java/io/deephaven/web/client/api/TotalsTableTestGwt.java
@@ -5,9 +5,9 @@
 
 import elemental2.core.JsArray;
 import elemental2.core.JsString;
-import elemental2.dom.CustomEvent;
 import elemental2.promise.IThenable;
 import elemental2.promise.Promise;
+import io.deephaven.web.client.api.event.Event;
 import io.deephaven.web.client.api.filter.FilterCondition;
 import io.deephaven.web.client.api.filter.FilterValue;
 import io.deephaven.web.client.api.subscription.ViewportData;
@@ -72,7 +72,7 @@ public void testQueryDefinedConfigs() {
                                     .then(totals -> {
                                         assertEquals(3, totals.getColumns().length);
                                         assertEquals(1, totals.getSize(), DELTA);
-                                        totals.setViewport(0, 100, null, null);
+                                        totals.setViewport(0, 100, null, null, null);
 
                                         return waitForEvent(totals, JsTable.EVENT_UPDATED,
                                                 checkTotals(totals, 5, 6., 0, "a1"), 2508);
@@ -81,7 +81,7 @@ public void testQueryDefinedConfigs() {
                                     .then(totals -> {
                                         assertEquals(3, totals.getColumns().length);
                                         assertEquals(1, totals.getSize(), DELTA);
-                                        totals.setViewport(0, 100, null, null);
+                                        totals.setViewport(0, 100, null, null, null);
 
                                         return waitForEvent(totals, JsTable.EVENT_UPDATED,
                                                 checkTotals(totals, 5, 6.0, 0., "a2"), 2509);
@@ -112,7 +112,7 @@ public void ignore_testTotalsOnFilteredTable() {
                                     totalTables[0] = totals;
                                     assertEquals(3, totals.getColumns().length);
                                     assertEquals(1, totals.getSize(), DELTA);
-                                    totals.setViewport(0, 100, null, null);
+                                    totals.setViewport(0, 100, null, null, null);
 
                                     // confirm the normal totals match the filtered data
                                     return waitForEvent(totals, JsTable.EVENT_UPDATED,
@@ -123,7 +123,7 @@ public void ignore_testTotalsOnFilteredTable() {
                                     totalTables[1] = totals;
                                     assertEquals(3, totals.getColumns().length);
                                     assertEquals(1, totals.getSize(), DELTA);
-                                    totals.setViewport(0, 100, null, null);
+                                    totals.setViewport(0, 100, null, null, null);
 
                                     // confirm the grand totals are unchanged
                                     return waitForEvent(totals, JsTable.EVENT_UPDATED,
@@ -238,7 +238,7 @@ public void ignore_testFilteringTotalsTable() {
                                         totalTables[0] = totals;
                                         assertEquals(4, totals.getColumns().length);
                                         assertEquals(2, totals.getSize(), DELTA);
-                                        totals.setViewport(0, 100, null, null);
+                                        totals.setViewport(0, 100, null, null, null);
 
                                         // confirm the normal totals match the filtered data
                                         return waitForEvent(totals, JsTable.EVENT_UPDATED, checkTotals(totals, "a1",
@@ -250,7 +250,7 @@ public void ignore_testFilteringTotalsTable() {
                                         totalTables[1] = totals;
                                         assertEquals(4, totals.getColumns().length);
                                         assertEquals(2, totals.getSize(), DELTA);
-                                        totals.setViewport(0, 100, null, null);
+                                        totals.setViewport(0, 100, null, null, null);
 
                                         // confirm the grand totals include the missing row...
                                         return waitForEvent(totals, JsTable.EVENT_UPDATED, checkTotals(totals, "a2",
@@ -269,8 +269,8 @@ public void ignore_testFilteringTotalsTable() {
                     totalTables[1].applyFilter(new FilterCondition[] {
                             totalTables[1].findColumn("J__Avg").filter().eq(FilterValue.ofNumber(5.0))
                     });
-                    totalTables[0].setViewport(0, 100, null, null);
-                    totalTables[1].setViewport(0, 100, null, null);
+                    totalTables[0].setViewport(0, 100, null, null, null);
+                    totalTables[1].setViewport(0, 100, null, null, null);
 
                     return promiseAllThen(table,
                             totalPromises[0] = waitForEvent(totalTables[0], JsTable.EVENT_UPDATED,
@@ -327,11 +327,11 @@ public void testGroupedTotals() {
                             (JsTotalsTable totals) -> {
                                 assertEquals(4, totals.getColumns().length);
                                 assertEquals(2, totals.getSize(), DELTA);
-                                totals.setViewport(0, 100, null, null);
+                                totals.setViewport(0, 100, null, null, null);
 
                                 // confirm the grand totals are unchanged
                                 return waitForEvent(totals, JsTable.EVENT_UPDATED, update -> {
-                                    ViewportData viewportData = (ViewportData) update.detail;
+                                    ViewportData viewportData = (ViewportData) update.getDetail();
 
                                     // 2 rows (one for k=0, one for k=1)
                                     assertEquals(2, viewportData.getRows().length);
@@ -389,7 +389,7 @@ static TotalsResults of(int k, long i, double avg, double min) {
         }
     }
 
-    private Consumer<CustomEvent> checkTotals(
+    private Consumer<Event<ViewportData>> checkTotals(
             JsTotalsTable totals,
             long i,
             double avg,
@@ -397,7 +397,7 @@ private Consumer<CustomEvent> checkTotals(
             String messages) {
         String ext = messages;
         return update -> {
-            ViewportData viewportData = (ViewportData) update.detail;
+            ViewportData viewportData = update.getDetail();
 
             assertEquals(1, viewportData.getRows().length);
             assertEquals(3, viewportData.getColumns().length);
@@ -412,13 +412,13 @@ private Consumer<CustomEvent> checkTotals(
         };
     }
 
-    private Consumer<CustomEvent> checkTotals(
+    private Consumer<Event<ViewportData>> checkTotals(
             JsTotalsTable totals,
             String messages,
             TotalsResults... expected) {
         String ext = messages;
         return update -> {
-            ViewportData viewportData = (ViewportData) update.detail;
+            ViewportData viewportData = update.getDetail();
 
             assertEquals("Viewport data rows", expected.length, viewportData.getRows().length);
             assertEquals("Viewport columns", 4, viewportData.getColumns().length);
@@ -442,9 +442,9 @@ private Consumer<CustomEvent> checkTotals(
      * Specialized waitForEvent since JsTotalsTable isn't a HasEventHandling subtype, and doesnt make sense to shoehorn
      * it in just for tests.
      */
-    private <T> Promise<JsTotalsTable> waitForEvent(JsTotalsTable table, String eventName, Consumer<CustomEvent> check,
+    private <T> Promise<JsTotalsTable> waitForEvent(JsTotalsTable table, String eventName, Consumer<Event<T>> check,
             int timeout) {
-        return waitForEvent(table.getWrappedTable(), eventName, check::accept, timeout)
+        return waitForEvent(table.getWrappedTable(), eventName, check, timeout)
                 .then(t -> Promise.resolve(table));
     }
 
diff --git a/web/client-api/src/test/java/io/deephaven/web/client/api/grpc/GrpcTransportTestGwt.java b/web/client-api/src/test/java/io/deephaven/web/client/api/grpc/GrpcTransportTestGwt.java
new file mode 100644
index 00000000000..020c65b771a
--- /dev/null
+++ b/web/client-api/src/test/java/io/deephaven/web/client/api/grpc/GrpcTransportTestGwt.java
@@ -0,0 +1,143 @@
+//
+// Copyright (c) 2016-2024 Deephaven Data Labs and Patent Pending
+//
+package io.deephaven.web.client.api.grpc;
+
+import elemental2.promise.Promise;
+import io.deephaven.web.client.api.AbstractAsyncGwtTestCase;
+import io.deephaven.web.client.api.ConnectOptions;
+import io.deephaven.web.client.api.CoreClient;
+import jsinterop.base.JsPropertyMap;
+
+/**
+ * Simple test to verify we can produce custom transports in JS. Only works with https, which means it can only be run
+ * manually at this time, or it will trivially succeed.
+ */
+public class GrpcTransportTestGwt extends AbstractAsyncGwtTestCase {
+    @Override
+    public String getModuleName() {
+        return "io.deephaven.web.DeephavenIntegrationTest";
+    }
+
+    /**
+     * Simple fetch impl, with no cancelation handling.
+     */
+    public native GrpcTransportFactory makeFetchTransportFactory() /*-{
+        return {
+            create: function(options) {
+                function pump(reader, res) {
+                    reader.read().then(function(result) {
+                        if (result.done) {
+                            options.onEnd();
+                        } else {
+                            options.onChunk(result.value);
+                            pump(reader, res);
+                        }
+                    })['catch'](function(e) {
+                        options.onEnd(e);
+                    });
+                }
+                return {
+                    start: function(metadata) {
+                        this.metadata = metadata;
+                    },
+                    sendMessage: function(msgBytes) {
+                        var fetchInit = {
+                            headers: new Headers(this.metadata),
+                            method: "POST",
+                            body: msgBytes,
+                        };
+                        $wnd.fetch(options.url.href, fetchInit).then(function(response) {
+                            var m = {};
+                            response.headers.forEach(function(value, key) {
+                                m[key] = value;
+                            });
+                            options.onHeaders(m, response.status);
+                            if (response.body) {
+                                pump(response.body.getReader(), response);
+                            }
+                            return response;
+                        })['catch'](function(e) {
+                            options.onEnd(e);
+                        });
+                    },
+                    finishSend: function() {
+                        // no-op
+                    },
+                    cancel: function() {
+                        // no-op
+                    }
+                };
+            },
+            supportsClientStreaming: false
+        };
+    }-*/;
+
+    public void testFetchGrpcTransport() {
+        if (!localServer.startsWith("https:")) {
+            // We're using h2, so we need to be on https for our current implementation
+            return;
+        }
+        setupDhInternal().then(ignore -> {
+            delayTestFinish(7101);
+            ConnectOptions connectOptions = new ConnectOptions();
+            connectOptions.transportFactory = makeFetchTransportFactory();
+            CoreClient coreClient = new CoreClient(localServer, connectOptions);
+            return coreClient.login(JsPropertyMap.of("type", CoreClient.LOGIN_TYPE_ANONYMOUS))
+                    .then(ignore2 -> Promise.resolve(coreClient));
+        }).then(this::finish).catch_(this::report);
+    }
+
+    /**
+     * Dummy transport that just sends a single message and receives a single message. Doesn't actually talk to the
+     * server, headers are empty, and the message is always 5 byte proto payload "no data", followed by trailers
+     * signifying success.
+     */
+    private native GrpcTransportFactory makeDummyTransportFactory() /*-{
+        return {
+            create: function(options) {
+                return {
+                    start: function(metadata) {
+                        // empty headers
+                        $wnd.setTimeout(function() {options.onHeaders({}, 200);}, 0);
+                    },
+                    sendMessage: function(msgBytes) {
+                        // empty payload
+                        var empty = new $wnd.Uint8Array(5);
+                        // successful trailer payload
+                        var trailersString = 'grpc-status:0';
+                        var successTrailers = new $wnd.Uint8Array(5 + trailersString.length);
+                        successTrailers[0] = 128;
+                        successTrailers[4] = trailersString.length;
+                        new $wnd.TextEncoder('utf-8').encodeInto(trailersString, successTrailers.subarray(5));
+                        $wnd.setTimeout(function() {
+                            // delay a bit, then send the empty messages and end the stream
+                            options.onChunk(empty);
+                            options.onChunk(successTrailers);
+                            options.onEnd();
+                        }, 0);
+                    },
+                    finishSend: function() {
+                        // no-op
+                    },
+                    cancel: function() {
+                        // no-op
+                    }
+                };
+            },
+            supportsClientStreaming: true
+        };
+    }-*/;
+
+    public void testDummyGrpcTransport() {
+        setupDhInternal().then(ignore -> {
+            delayTestFinish(7102);
+            ConnectOptions connectOptions = new ConnectOptions();
+            connectOptions.transportFactory = makeDummyTransportFactory();
+            connectOptions.debug = true;
+            CoreClient coreClient = new CoreClient(localServer, connectOptions);
+            return coreClient.login(JsPropertyMap.of("type", CoreClient.LOGIN_TYPE_ANONYMOUS))
+                    .then(ignore2 -> Promise.resolve(coreClient));
+        }).then(this::finish).catch_(this::report);
+    }
+}
diff --git a/web/client-api/src/test/java/io/deephaven/web/client/api/subscription/ViewportTestGwt.java b/web/client-api/src/test/java/io/deephaven/web/client/api/subscription/ViewportTestGwt.java
index 19e1a1ddf4f..1b13e3e5052 100644
--- a/web/client-api/src/test/java/io/deephaven/web/client/api/subscription/ViewportTestGwt.java
+++ b/web/client-api/src/test/java/io/deephaven/web/client/api/subscription/ViewportTestGwt.java
@@ -4,33 +4,35 @@
 package io.deephaven.web.client.api.subscription;
 
 import elemental2.core.JsArray;
-import elemental2.dom.CustomEvent;
 import elemental2.dom.DomGlobal;
 import elemental2.promise.IThenable;
 import elemental2.promise.Promise;
 import io.deephaven.web.client.api.AbstractAsyncGwtTestCase;
 import io.deephaven.web.client.api.Column;
-import io.deephaven.web.client.api.HasEventHandling;
+import io.deephaven.web.client.api.DateWrapper;
+import io.deephaven.web.client.api.Format;
+import io.deephaven.web.client.api.JsRangeSet;
 import io.deephaven.web.client.api.JsTable;
+import io.deephaven.web.client.api.TableData;
+import io.deephaven.web.client.api.event.Event;
+import io.deephaven.web.client.api.event.HasEventHandling;
 import io.deephaven.web.client.api.filter.FilterCondition;
 import io.deephaven.web.client.api.filter.FilterValue;
 import io.deephaven.web.shared.fu.RemoverFn;
+import jsinterop.base.Any;
 import jsinterop.base.Js;
 
+import java.util.ArrayList;
+import java.util.List;
 import java.util.Objects;
+import java.util.function.Supplier;
+import java.util.stream.Collectors;
+import java.util.stream.IntStream;
 
 import static elemental2.dom.DomGlobal.console;
 
 /**
- * Assumes two tables, ticking every 2 seconds:
- *
- * growingForward = db.timeTable("00:00:01").update("I=i", "J=i*i", "K=0") growingBackward =
- * growingForward.sortDescending("Timestamp") blinkOne = db.timeTable("00:00:01").update("I=i",
- * "J=1").lastBy("J").where("I%2 != 0")
- *
- * And another static one:
- *
- * staticTable = emptyTable(100).update("I=i")
+ * Verifies behavior of viewport subscriptions.
  */
 public class ViewportTestGwt extends AbstractAsyncGwtTestCase {
 
@@ -39,10 +41,14 @@ public class ViewportTestGwt extends AbstractAsyncGwtTestCase {
             .script("staticTable", "empty_table(100).update(\"I=i\")")
             .script("from datetime import datetime, timedelta")
             .script("growingForward",
-                    "time_table(period=\"PT00:00:01\", start_time=datetime.now() - timedelta(minutes=1)).update([\"I=i\", \"J=i*i\", \"K=0\"])")
-            .script("growingBackward", "growingForward.sort_descending(\"Timestamp\")")
+                    "time_table(period=\"PT00:00:01\", start_time=datetime.now() - timedelta(minutes=1))" +
+                            ".update([\"I=i\", \"J=i*i\", \"K=0\"])")
+            .script("growingBackward",
+                    "growingForward.sort_descending(\"Timestamp\")" +
+                            ".format_columns(['I=I>2 ? GREEN : RED', 'I = Decimal(`0.00%`)', 'Timestamp = Date(`yyyy_MM_dd`)'])")
             .script("blinkOne",
-                    "time_table(\"PT00:00:01\").update([\"I=i\", \"J=1\"]).last_by(by=\"J\").where(\"I%2 != 0\")");
+                    "time_table(\"PT00:00:01\").update([\"I=i\", \"J=1\"]).last_by(by=\"J\").where(\"I%2 != 0\")")
+            .script("big", "empty_table(1_000_000).update_view(['I=i', 'Str=``+I']).where('I % 2 == 0')");
 
     public void testViewportOnStaticTable() {
         connect(tables)
@@ -59,34 +65,63 @@ public void testViewportOnStaticTable() {
                     // table has 100 rows, go through each page of 25, make sure the offset and length is sane
                     table.setViewport(0, 24, null);
                     return assertUpdateReceived(table, viewport -> {
-                        assertEquals(0, (long) viewport.getOffset());
+                        assertEquals(0d, viewport.getOffset());
                         assertEquals(25, viewport.getRows().length);
                     }, 2100);
                 })
                 .then(table -> {
                     table.setViewport(25, 49, null);
                     return assertUpdateReceived(table, viewport -> {
-                        assertEquals(25, (long) viewport.getOffset());
+                        assertEquals(25d, viewport.getOffset());
                         assertEquals(25, viewport.getRows().length);
                     }, 2101);
                 })
                 .then(table -> {
                     table.setViewport(50, 74, null);
                     return assertUpdateReceived(table, viewport -> {
-                        assertEquals(50, (long) viewport.getOffset());
+                        assertEquals(50d, viewport.getOffset());
                         assertEquals(25, viewport.getRows().length);
                     }, 2102);
                 })
                 .then(table -> {
                     table.setViewport(75, 99, null);
                     return assertUpdateReceived(table, viewport -> {
-                        assertEquals(75, (long) viewport.getOffset());
+                        assertEquals(75d, viewport.getOffset());
                         assertEquals(25, viewport.getRows().length);
                     }, 2103);
                 })
                 .then(this::finish).catch_(this::report);
     }
 
+    public void testChangePendingViewport() {
+        connect(tables)
+                .then(table("staticTable"))
+                .then(table -> {
+                    delayTestFinish(5001);
+
+                    table.setViewport(0, 25, null);
+                    assertEquals(100.0, table.getSize());
+                    return Promise.resolve(table);
+                })
+                .then(table -> {
+                    assertEquals(100.0, table.getSize());
+                    table.setViewport(5, 30, null);
+                    assertEquals(100.0, table.getSize());
+                    return assertUpdateReceived(table, viewport -> {
+                        assertEquals(100.0, table.getSize());
+
+                        assertEquals(5d, viewport.getOffset());
+                        assertEquals(26, viewport.getRows().length);
+                    }, 2500);
+                })
+                .then(table -> {
+                    assertEquals(100.0, table.getSize());
+                    table.close();
+                    return null;
+                })
+                .then(this::finish).catch_(this::report);
+    }
+
     // TODO: https://deephaven.atlassian.net/browse/DH-11196
     public void ignore_testViewportOnGrowingTable() {
         connect(tables)
@@ -172,24 +207,66 @@ public void testViewportSubsetOfColumns() {
                 .then(table("growingBackward"))
                 .then(table -> {
                     delayTestFinish(8000);
-                    table.setViewport(0, 0, Js.uncheckedCast(new Column[] {table.findColumn("I")}));
+                    table.setViewport(0, 0, Js.uncheckedCast(table.findColumns(new String[] {"I", "Timestamp"})));
 
                     return assertUpdateReceived(table, viewport -> {
-                        assertEquals(1, viewport.getColumns().length);
-                        assertEquals(0, indexOf(viewport.getColumns(), table.findColumn("I")));
+                        assertEquals(2, viewport.getColumns().length);
+                        assertEquals(1, indexOf(viewport.getColumns(), table.findColumn("I")));
+                        assertEquals(0, indexOf(viewport.getColumns(), table.findColumn("Timestamp")));
 
                         assertEquals(1, viewport.getRows().length);
-                        assertNotNull(viewport.getRows().getAt(0).get(table.findColumn("I")));
-                        assertThrowsException(() -> viewport.getRows().getAt(0).get(table.findColumn("J")));
-                        assertThrowsException(() -> viewport.getRows().getAt(0).get(table.findColumn("K")));
+                        TableData.Row row1 = viewport.getRows().getAt(0);
+                        {
+                            Any d1 = viewport.getData(0, table.findColumn("I"));
+                            Any d2 = row1.get(table.findColumn("I"));
+                            Any d3 = table.findColumn("I").get(row1);
+                            assertNotNull(d1);
+                            assertEquals("number", Js.typeof(d1));
+                            assertEquals(d1, d2);
+                            assertEquals(d2, d3);
+                            Format f1 = row1.getFormat(table.findColumn("I"));
+                            Format f2 = table.findColumn("I").getFormat(row1);
+                            Format f3 = viewport.getFormat(0, table.findColumn("I"));
+                            assertNotNull(f1);
+                            assertEquals(f1, f2);
+                            assertEquals(f2, f3);
+
+                            assertNotNull(f1.getBackgroundColor());
+                            assertNotNull(f1.getColor());
+                            assertEquals("0.00%", f1.getFormatString());
+                        }
+
+                        {
+                            Any d1 = viewport.getData(0, table.findColumn("Timestamp"));
+                            Any d2 = row1.get(table.findColumn("Timestamp"));
+                            Any d3 = table.findColumn("Timestamp").get(row1);
+                            assertNotNull(d1);
+                            assertTrue(d1 instanceof DateWrapper);
+                            assertEquals(d1, d2);
+                            assertEquals(d2, d3);
+                            Format f1 = row1.getFormat(table.findColumn("Timestamp"));
+                            Format f2 = table.findColumn("Timestamp").getFormat(row1);
+                            Format f3 = viewport.getFormat(0, table.findColumn("Timestamp"));
+                            assertNotNull(f1);
+                            assertEquals(f1, f2);
+                            assertEquals(f2, f3);
+
+                            assertNull(f1.getBackgroundColor());
+                            assertNull(f1.getColor());
+                            assertEquals("yyyy_MM_dd", f1.getFormatString());
+                        }
+
 
+                        assertThrowsException(() -> row1.get(table.findColumn("J")));
+                        assertThrowsException(() -> row1.get(table.findColumn("K")));
                     }, 2501);
                 })
                 .then(table -> {
                     // don't change viewport, test the same thing again, make sure deltas behave too
                     return assertUpdateReceived(table, viewport -> {
-                        assertEquals(1, viewport.getColumns().length);
-                        assertEquals(0, indexOf(viewport.getColumns(), table.findColumn("I")));
+                        assertEquals(2, viewport.getColumns().length);
+                        assertEquals(1, indexOf(viewport.getColumns(), table.findColumn("I")));
+                        assertEquals(0, indexOf(viewport.getColumns(), table.findColumn("Timestamp")));
 
                         assertEquals(1, viewport.getRows().length);
                         assertNotNull(viewport.getRows().getAt(0).get(table.findColumn("I")));
@@ -361,7 +438,7 @@ public void testRapidChangingViewport() {
                     table.setViewport(0, 10, null);
                     table.setViewport(5, 14, null);
                     return assertUpdateReceived(table, viewport -> {
-                        assertEquals(5, (int) viewport.getOffset());
+                        assertEquals(5d, viewport.getOffset());
                         assertEquals(10, (int) viewport.getRows().length);
                     }, 1008);
                 })
@@ -373,8 +450,8 @@ public void testRapidChangingViewport() {
                 .then(table -> {
                     table.setViewport(6, 14, null);
                     return assertUpdateReceived(table, viewport -> {
-                        assertEquals(6, (int) viewport.getOffset());
-                        assertEquals(9, (int) viewport.getRows().length);
+                        assertEquals(6d, viewport.getOffset());
+                        assertEquals(9, viewport.getRows().length);
                     }, 1009);
                 })
                 .then(table -> {
@@ -387,12 +464,9 @@ public void testRapidChangingViewport() {
                     table.setViewport(7, 17, null);
                     return assertUpdateReceived(table, ignored -> {
                     }, 1010)
-                            .then(waitFor(JsTable.DEBOUNCE_TIME * 2))
                             .then(t -> {
-                                // force the debounce to be processed
-                                t.processSnapshot();
                                 t.getViewportData().then(vp -> {
-                                    // assertEquals(7, (int) vp.getOffset());
+                                    assertEquals(7d, vp.getOffset());
                                     assertEquals(11, (int) vp.getRows().length);
                                     return Promise.resolve(vp);
                                 });
@@ -421,6 +495,61 @@ public void testViewportWithNoInitialItems() {
                 .then(this::finish).catch_(this::report);
     }
 
+    public void testSnapshotFromViewport() {
+        connect(tables)
+                .then(table("big"))
+                .<Object>then(table -> {
+                    delayTestFinish(20_001);
+
+                    Column[] all = Js.uncheckedCast(table.getColumns());
+                    // This table is static and non-flat, to make sure our calls will make sense to get data.
+                    // Subscribe to a viewport, and grab some rows in a snapshot
+                    TableViewportSubscription tableViewportSubscription = table.setViewport(100, 109);
+
+                    List<Supplier<Promise<Object>>> tests = new ArrayList<>();
+                    // Data within the viewport
+                    JsRangeSet r = JsRangeSet.ofRange(101, 108);
+                    tests.add(() -> tableViewportSubscription.snapshot(r, all)
+                            .then(snapshot -> checkSnapshot(snapshot, r.getRange().size())));
+
+                    // Each row within the viewport
+                    tests.addAll(
+                            IntStream.range(100, 110)
+                                    .<Supplier<Promise<Object>>>mapToObj(row -> () -> tableViewportSubscription
+                                            .snapshot(JsRangeSet.ofRange(row, row), all)
+                                            .then(data -> checkSnapshot(data, 1)))
+                                    .collect(Collectors.toList()));
+
+                    // Data overlapping the viewport
+                    JsRangeSet r1 = JsRangeSet.ofRange(0, 120);
+                    tests.add(() -> tableViewportSubscription.snapshot(r1, all)
+                            .then(snapshot -> checkSnapshot(snapshot, r1.getRange().size())));
+
+                    // Empty snapshot
+                    tests.add(() -> tableViewportSubscription.snapshot(JsRangeSet.ofItems(new double[0]), all)
+                            .then(snapshot -> checkSnapshot(snapshot, 0)));
+
+
+                    // Run the tests serially
+                    return tests.stream().reduce((p1, p2) -> () -> p1.get().then(result -> p2.get())).get().get();
+                })
+                .then(this::finish).catch_(this::report);
+    }
+
+    private Promise<Object> checkSnapshot(TableData data, long expectedSize) {
+        Column intCol = data.getColumns().at(0);
+        Column strCol = data.getColumns().at(1);
+        assertEquals(expectedSize, data.getRows().length);
+        for (int i = 0; i < data.getRows().length; i++) {
+            Any intVal = data.getData(i, intCol);
+            assertNotNull(intVal);
+            Any strVal = data.getData(i, strCol);
+            assertNotNull(strVal);
+            assertEquals(intVal.toString(), strVal.asString());
+        }
+        return Promise.resolve(data);
+    }
+
     private IThenable<JsTable> helperForViewportWithNoInitialItems(JsTable t, Column[] requestColumns,
             JsArray<Column> expectedColumns) {
         // wait until zero rows are present, so we can set the viewport and get a zero-row "snapshot"
@@ -438,8 +567,8 @@ private IThenable<JsTable> helperForViewportWithNoInitialItems(JsTable t, Column
                 .then(table -> {
                     // wait for the next tick, where we get the "first" row added, confirm that the viewport
                     // data is sane
-                    return waitForEventWhere(table, "updated", (CustomEvent<ViewportData> e) -> {
-                        ViewportData viewport = e.detail;
+                    return waitForEventWhere(table, "updated", (Event<ViewportData> e) -> {
+                        ViewportData viewport = e.getDetail();
                         if (viewport.getRows().length != 1) {
                             return false; // wrong data, wait for another event
                         }
@@ -453,8 +582,8 @@ private IThenable<JsTable> helperForViewportWithNoInitialItems(JsTable t, Column
                 })
                 .then(table -> {
                     // again wait for the table to go back to zero items, make sure it makes sense
-                    return waitForEventWhere(table, "updated", (CustomEvent<ViewportData> e) -> {
-                        ViewportData emptyViewport = (ViewportData) e.detail;
+                    return waitForEventWhere(table, "updated", (Event<ViewportData> e) -> {
+                        ViewportData emptyViewport = e.getDetail();
                         if (emptyViewport.getRows().length != 0) {
                             return false; // wrong data, wait for another event
                         }
@@ -464,8 +593,8 @@ private IThenable<JsTable> helperForViewportWithNoInitialItems(JsTable t, Column
                 })
                 .then(table -> {
                     // one more tick later, we'll see the item back again
-                    return waitForEventWhere(table, "updated", (CustomEvent<ViewportData> e) -> {
-                        ViewportData viewport = (ViewportData) e.detail;
+                    return waitForEventWhere(table, "updated", (Event<ViewportData> e) -> {
+                        ViewportData viewport = e.getDetail();
                         if (viewport.getRows().length != 1) {
                             return false; // wrong data, wait for another event
                         }
diff --git a/web/client-api/types/build.gradle b/web/client-api/types/build.gradle
index 71d70988a7f..7d08554d0a3 100644
--- a/web/client-api/types/build.gradle
+++ b/web/client-api/types/build.gradle
@@ -50,7 +50,6 @@ def typedocAndTarball = Docker.registerDockerTask(project, 'typedoc') {
                       mv deephaven-jsapi-types*.tgz /out/; \\
                       node_modules/.bin/typedoc dist/index.d.ts \\
                            --out /out/documentation \\
-                           --skipErrorChecking \\
                            --hideGenerator \\
                            --disableSources \\
                            --customCss theme.css; \\
diff --git a/web/client-backplane/client-backplane.gradle b/web/client-backplane/client-backplane.gradle
index 0a9fcab9750..29f81ed0f2c 100644
--- a/web/client-backplane/client-backplane.gradle
+++ b/web/client-backplane/client-backplane.gradle
@@ -3,7 +3,11 @@ plugins {
 }
 
 GwtTools.gwtLib project
-Classpaths.inheritJsInterop(project, 'base', 'implementation')
-Classpaths.inheritJsInterop(project, 'jsinterop-annotations', 'compileOnly')
-Classpaths.inheritElemental(project, 'elemental2-core', 'implementation')
-Classpaths.inheritElemental(project, 'elemental2-promise', 'implementation')
+
+dependencies {
+    implementation libs.jsinterop.base
+    compileOnly libs.jsinterop.annotations
+
+    implementation libs.elemental.core
+    implementation libs.elemental.promise
+}
diff --git a/web/client-backplane/src/main/java/io/deephaven/javascript/proto/dhinternal/arrow/flight/flatbuf/message_generated/org/apache/arrow/Flatbuf.java b/web/client-backplane/src/main/java/io/deephaven/javascript/proto/dhinternal/arrow/flight/flatbuf/message_generated/org/apache/arrow/Flatbuf.java
deleted file mode 100644
index d32b397e89b..00000000000
--- a/web/client-backplane/src/main/java/io/deephaven/javascript/proto/dhinternal/arrow/flight/flatbuf/message_generated/org/apache/arrow/Flatbuf.java
+++ /dev/null
@@ -1,300 +0,0 @@
-//
-// Copyright (c) 2016-2024 Deephaven Data Labs and Patent Pending
-//
-package io.deephaven.javascript.proto.dhinternal.arrow.flight.flatbuf.message_generated.org.apache.arrow;
-
-import io.deephaven.javascript.proto.dhinternal.arrow.flight.flatbuf.message_generated.org.apache.arrow.flatbuf.DictionaryBatch;
-import io.deephaven.javascript.proto.dhinternal.arrow.flight.flatbuf.message_generated.org.apache.arrow.flatbuf.RecordBatch;
-import io.deephaven.javascript.proto.dhinternal.arrow.flight.flatbuf.schema_generated.org.apache.arrow.flatbuf.Schema;
-import jsinterop.annotations.JsFunction;
-import jsinterop.annotations.JsOverlay;
-import jsinterop.annotations.JsPackage;
-import jsinterop.annotations.JsType;
-import jsinterop.base.Js;
-
-@JsType(
-        isNative = true,
-        name = "dhinternal.arrow.flight.flatbuf.Message_generated.org.apache.arrow.flatbuf",
-        namespace = JsPackage.GLOBAL)
-public class Flatbuf {
-    @JsFunction
-    public interface UnionListToMessageHeaderAccessorFn {
-        @JsType(isNative = true, name = "?", namespace = JsPackage.GLOBAL)
-        public interface P1UnionType {
-            @JsOverlay
-            static Flatbuf.UnionListToMessageHeaderAccessorFn.P1UnionType of(Object o) {
-                return Js.cast(o);
-            }
-
-            @JsOverlay
-            default DictionaryBatch asDictionaryBatch() {
-                return Js.cast(this);
-            }
-
-            @JsOverlay
-            default RecordBatch asRecordBatch() {
-                return Js.cast(this);
-            }
-
-            @JsOverlay
-            default Schema asSchema() {
-                return Js.cast(this);
-            }
-
-            @JsOverlay
-            default boolean isDictionaryBatch() {
-                return (Object) this instanceof DictionaryBatch;
-            }
-
-            @JsOverlay
-            default boolean isRecordBatch() {
-                return (Object) this instanceof RecordBatch;
-            }
-
-            @JsOverlay
-            default boolean isSchema() {
-                return (Object) this instanceof Schema;
-            }
-        }
-
-        @JsType(isNative = true, name = "?", namespace = JsPackage.GLOBAL)
-        public interface UnionType {
-            @JsOverlay
-            static Flatbuf.UnionListToMessageHeaderAccessorFn.UnionType of(Object o) {
-                return Js.cast(o);
-            }
-
-            @JsOverlay
-            default DictionaryBatch asDictionaryBatch() {
-                return Js.cast(this);
-            }
-
-            @JsOverlay
-            default RecordBatch asRecordBatch() {
-                return Js.cast(this);
-            }
-
-            @JsOverlay
-            default Schema asSchema() {
-                return Js.cast(this);
-            }
-
-            @JsOverlay
-            default boolean isDictionaryBatch() {
-                return (Object) this instanceof DictionaryBatch;
-            }
-
-            @JsOverlay
-            default boolean isRecordBatch() {
-                return (Object) this instanceof RecordBatch;
-            }
-
-            @JsOverlay
-            default boolean isSchema() {
-                return (Object) this instanceof Schema;
-            }
-        }
-
-        @JsOverlay
-        default Flatbuf.UnionListToMessageHeaderAccessorFn.UnionType onInvoke(
-                double p0, DictionaryBatch p1) {
-            return onInvoke(
-                    p0, Js.<Flatbuf.UnionListToMessageHeaderAccessorFn.P1UnionType>uncheckedCast(p1));
-        }
-
-        Flatbuf.UnionListToMessageHeaderAccessorFn.UnionType onInvoke(
-                double p0, Flatbuf.UnionListToMessageHeaderAccessorFn.P1UnionType p1);
-
-        @JsOverlay
-        default Flatbuf.UnionListToMessageHeaderAccessorFn.UnionType onInvoke(
-                double p0, RecordBatch p1) {
-            return onInvoke(
-                    p0, Js.<Flatbuf.UnionListToMessageHeaderAccessorFn.P1UnionType>uncheckedCast(p1));
-        }
-
-        @JsOverlay
-        default Flatbuf.UnionListToMessageHeaderAccessorFn.UnionType onInvoke(double p0, Schema p1) {
-            return onInvoke(
-                    p0, Js.<Flatbuf.UnionListToMessageHeaderAccessorFn.P1UnionType>uncheckedCast(p1));
-        }
-    }
-
-    @JsType(isNative = true, name = "?", namespace = JsPackage.GLOBAL)
-    public interface UnionListToMessageHeaderUnionType {
-        @JsOverlay
-        static Flatbuf.UnionListToMessageHeaderUnionType of(Object o) {
-            return Js.cast(o);
-        }
-
-        @JsOverlay
-        default DictionaryBatch asDictionaryBatch() {
-            return Js.cast(this);
-        }
-
-        @JsOverlay
-        default RecordBatch asRecordBatch() {
-            return Js.cast(this);
-        }
-
-        @JsOverlay
-        default Schema asSchema() {
-            return Js.cast(this);
-        }
-
-        @JsOverlay
-        default boolean isDictionaryBatch() {
-            return (Object) this instanceof DictionaryBatch;
-        }
-
-        @JsOverlay
-        default boolean isRecordBatch() {
-            return (Object) this instanceof RecordBatch;
-        }
-
-        @JsOverlay
-        default boolean isSchema() {
-            return (Object) this instanceof Schema;
-        }
-    }
-
-    @JsFunction
-    public interface UnionToMessageHeaderAccessorFn {
-        @JsType(isNative = true, name = "?", namespace = JsPackage.GLOBAL)
-        public interface P0UnionType {
-            @JsOverlay
-            static Flatbuf.UnionToMessageHeaderAccessorFn.P0UnionType of(Object o) {
-                return Js.cast(o);
-            }
-
-            @JsOverlay
-            default DictionaryBatch asDictionaryBatch() {
-                return Js.cast(this);
-            }
-
-            @JsOverlay
-            default RecordBatch asRecordBatch() {
-                return Js.cast(this);
-            }
-
-            @JsOverlay
-            default Schema asSchema() {
-                return Js.cast(this);
-            }
-
-            @JsOverlay
-            default boolean isDictionaryBatch() {
-                return (Object) this instanceof DictionaryBatch;
-            }
-
-            @JsOverlay
-            default boolean isRecordBatch() {
-                return (Object) this instanceof RecordBatch;
-            }
-
-            @JsOverlay
-            default boolean isSchema() {
-                return (Object) this instanceof Schema;
-            }
-        }
-
-        @JsType(isNative = true, name = "?", namespace = JsPackage.GLOBAL)
-        public interface UnionType {
-            @JsOverlay
-            static Flatbuf.UnionToMessageHeaderAccessorFn.UnionType of(Object o) {
-                return Js.cast(o);
-            }
-
-            @JsOverlay
-            default DictionaryBatch asDictionaryBatch() {
-                return Js.cast(this);
-            }
-
-            @JsOverlay
-            default RecordBatch asRecordBatch() {
-                return Js.cast(this);
-            }
-
-            @JsOverlay
-            default Schema asSchema() {
-                return Js.cast(this);
-            }
-
-            @JsOverlay
-            default boolean isDictionaryBatch() {
-                return (Object) this instanceof DictionaryBatch;
-            }
-
-            @JsOverlay
-            default boolean isRecordBatch() {
-                return (Object) this instanceof RecordBatch;
-            }
-
-            @JsOverlay
-            default boolean isSchema() {
-                return (Object) this instanceof Schema;
-            }
-        }
-
-        @JsOverlay
-        default Flatbuf.UnionToMessageHeaderAccessorFn.UnionType onInvoke(DictionaryBatch p0) {
-            return onInvoke(Js.<Flatbuf.UnionToMessageHeaderAccessorFn.P0UnionType>uncheckedCast(p0));
-        }
-
-        Flatbuf.UnionToMessageHeaderAccessorFn.UnionType onInvoke(
-                Flatbuf.UnionToMessageHeaderAccessorFn.P0UnionType p0);
-
-        @JsOverlay
-        default Flatbuf.UnionToMessageHeaderAccessorFn.UnionType onInvoke(RecordBatch p0) {
-            return onInvoke(Js.<Flatbuf.UnionToMessageHeaderAccessorFn.P0UnionType>uncheckedCast(p0));
-        }
-
-        @JsOverlay
-        default Flatbuf.UnionToMessageHeaderAccessorFn.UnionType onInvoke(Schema p0) {
-            return onInvoke(Js.<Flatbuf.UnionToMessageHeaderAccessorFn.P0UnionType>uncheckedCast(p0));
-        }
-    }
-
-    @JsType(isNative = true, name = "?", namespace = JsPackage.GLOBAL)
-    public interface UnionToMessageHeaderUnionType {
-        @JsOverlay
-        static Flatbuf.UnionToMessageHeaderUnionType of(Object o) {
-            return Js.cast(o);
-        }
-
-        @JsOverlay
-        default DictionaryBatch asDictionaryBatch() {
-            return Js.cast(this);
-        }
-
-        @JsOverlay
-        default RecordBatch asRecordBatch() {
-            return Js.cast(this);
-        }
-
-        @JsOverlay
-        default Schema asSchema() {
-            return Js.cast(this);
-        }
-
-        @JsOverlay
-        default boolean isDictionaryBatch() {
-            return (Object) this instanceof DictionaryBatch;
-        }
-
-        @JsOverlay
-        default boolean isRecordBatch() {
-            return (Object) this instanceof RecordBatch;
-        }
-
-        @JsOverlay
-        default boolean isSchema() {
-            return (Object) this instanceof Schema;
-        }
-    }
-
-    public static native Flatbuf.UnionListToMessageHeaderUnionType unionListToMessageHeader(
-            int type, Flatbuf.UnionListToMessageHeaderAccessorFn accessor, double index);
-
-    public static native Flatbuf.UnionToMessageHeaderUnionType unionToMessageHeader(
-            int type, Flatbuf.UnionToMessageHeaderAccessorFn accessor);
-}
diff --git a/web/client-backplane/src/main/java/io/deephaven/javascript/proto/dhinternal/arrow/flight/flatbuf/message_generated/org/apache/arrow/flatbuf/BodyCompression.java b/web/client-backplane/src/main/java/io/deephaven/javascript/proto/dhinternal/arrow/flight/flatbuf/message_generated/org/apache/arrow/flatbuf/BodyCompression.java
deleted file mode 100644
index 77a91516d9c..00000000000
--- a/web/client-backplane/src/main/java/io/deephaven/javascript/proto/dhinternal/arrow/flight/flatbuf/message_generated/org/apache/arrow/flatbuf/BodyCompression.java
+++ /dev/null
@@ -1,44 +0,0 @@
-//
-// Copyright (c) 2016-2024 Deephaven Data Labs and Patent Pending
-//
-package io.deephaven.javascript.proto.dhinternal.arrow.flight.flatbuf.message_generated.org.apache.arrow.flatbuf;
-
-import io.deephaven.javascript.proto.dhinternal.flatbuffers.Builder;
-import io.deephaven.javascript.proto.dhinternal.flatbuffers.ByteBuffer;
-import jsinterop.annotations.JsPackage;
-import jsinterop.annotations.JsType;
-
-@JsType(
-        isNative = true,
-        name = "dhinternal.arrow.flight.flatbuf.Message_generated.org.apache.arrow.flatbuf.BodyCompression",
-        namespace = JsPackage.GLOBAL)
-public class BodyCompression {
-    public static native void addCodec(Builder builder, int codec);
-
-    public static native void addMethod(Builder builder, int method);
-
-    public static native double createBodyCompression(
-            Builder builder, int codec, int method);
-
-    public static native double endBodyCompression(Builder builder);
-
-    public static native BodyCompression getRootAsBodyCompression(ByteBuffer bb, BodyCompression obj);
-
-    public static native BodyCompression getRootAsBodyCompression(ByteBuffer bb);
-
-    public static native BodyCompression getSizePrefixedRootAsBodyCompression(
-            ByteBuffer bb, BodyCompression obj);
-
-    public static native BodyCompression getSizePrefixedRootAsBodyCompression(ByteBuffer bb);
-
-    public static native void startBodyCompression(Builder builder);
-
-    public ByteBuffer bb;
-    public double bb_pos;
-
-    public native BodyCompression __init(double i, ByteBuffer bb);
-
-    public native int codec();
-
-    public native int method();
-}
diff --git a/web/client-backplane/src/main/java/io/deephaven/javascript/proto/dhinternal/arrow/flight/flatbuf/message_generated/org/apache/arrow/flatbuf/BodyCompressionMethod.java b/web/client-backplane/src/main/java/io/deephaven/javascript/proto/dhinternal/arrow/flight/flatbuf/message_generated/org/apache/arrow/flatbuf/BodyCompressionMethod.java
deleted file mode 100644
index 0fa3c6919e4..00000000000
--- a/web/client-backplane/src/main/java/io/deephaven/javascript/proto/dhinternal/arrow/flight/flatbuf/message_generated/org/apache/arrow/flatbuf/BodyCompressionMethod.java
+++ /dev/null
@@ -1,15 +0,0 @@
-//
-// Copyright (c) 2016-2024 Deephaven Data Labs and Patent Pending
-//
-package io.deephaven.javascript.proto.dhinternal.arrow.flight.flatbuf.message_generated.org.apache.arrow.flatbuf;
-
-import jsinterop.annotations.JsPackage;
-import jsinterop.annotations.JsType;
-
-@JsType(
-        isNative = true,
-        name = "dhinternal.arrow.flight.flatbuf.Message_generated.org.apache.arrow.flatbuf.BodyCompressionMethod",
-        namespace = JsPackage.GLOBAL)
-public class BodyCompressionMethod {
-    public static int BUFFER;
-}
diff --git a/web/client-backplane/src/main/java/io/deephaven/javascript/proto/dhinternal/arrow/flight/flatbuf/message_generated/org/apache/arrow/flatbuf/CompressionType.java b/web/client-backplane/src/main/java/io/deephaven/javascript/proto/dhinternal/arrow/flight/flatbuf/message_generated/org/apache/arrow/flatbuf/CompressionType.java
deleted file mode 100644
index a395a0317e3..00000000000
--- a/web/client-backplane/src/main/java/io/deephaven/javascript/proto/dhinternal/arrow/flight/flatbuf/message_generated/org/apache/arrow/flatbuf/CompressionType.java
+++ /dev/null
@@ -1,16 +0,0 @@
-//
-// Copyright (c) 2016-2024 Deephaven Data Labs and Patent Pending
-//
-package io.deephaven.javascript.proto.dhinternal.arrow.flight.flatbuf.message_generated.org.apache.arrow.flatbuf;
-
-import jsinterop.annotations.JsPackage;
-import jsinterop.annotations.JsType;
-
-@JsType(
-        isNative = true,
-        name = "dhinternal.arrow.flight.flatbuf.Message_generated.org.apache.arrow.flatbuf.CompressionType",
-        namespace = JsPackage.GLOBAL)
-public class CompressionType {
-    public static int LZ4_FRAME,
-            ZSTD;
-}
diff --git a/web/client-backplane/src/main/java/io/deephaven/javascript/proto/dhinternal/arrow/flight/flatbuf/message_generated/org/apache/arrow/flatbuf/DictionaryBatch.java b/web/client-backplane/src/main/java/io/deephaven/javascript/proto/dhinternal/arrow/flight/flatbuf/message_generated/org/apache/arrow/flatbuf/DictionaryBatch.java
deleted file mode 100644
index b063716b3c4..00000000000
--- a/web/client-backplane/src/main/java/io/deephaven/javascript/proto/dhinternal/arrow/flight/flatbuf/message_generated/org/apache/arrow/flatbuf/DictionaryBatch.java
+++ /dev/null
@@ -1,48 +0,0 @@
-//
-// Copyright (c) 2016-2024 Deephaven Data Labs and Patent Pending
-//
-package io.deephaven.javascript.proto.dhinternal.arrow.flight.flatbuf.message_generated.org.apache.arrow.flatbuf;
-
-import io.deephaven.javascript.proto.dhinternal.flatbuffers.Builder;
-import io.deephaven.javascript.proto.dhinternal.flatbuffers.ByteBuffer;
-import io.deephaven.javascript.proto.dhinternal.flatbuffers.Long;
-import jsinterop.annotations.JsPackage;
-import jsinterop.annotations.JsType;
-
-@JsType(
-        isNative = true,
-        name = "dhinternal.arrow.flight.flatbuf.Message_generated.org.apache.arrow.flatbuf.DictionaryBatch",
-        namespace = JsPackage.GLOBAL)
-public class DictionaryBatch {
-    public static native void addData(Builder builder, double dataOffset);
-
-    public static native void addId(Builder builder, Long id);
-
-    public static native void addIsDelta(Builder builder, boolean isDelta);
-
-    public static native double endDictionaryBatch(Builder builder);
-
-    public static native DictionaryBatch getRootAsDictionaryBatch(ByteBuffer bb, DictionaryBatch obj);
-
-    public static native DictionaryBatch getRootAsDictionaryBatch(ByteBuffer bb);
-
-    public static native DictionaryBatch getSizePrefixedRootAsDictionaryBatch(
-            ByteBuffer bb, DictionaryBatch obj);
-
-    public static native DictionaryBatch getSizePrefixedRootAsDictionaryBatch(ByteBuffer bb);
-
-    public static native void startDictionaryBatch(Builder builder);
-
-    public ByteBuffer bb;
-    public double bb_pos;
-
-    public native DictionaryBatch __init(double i, ByteBuffer bb);
-
-    public native RecordBatch data();
-
-    public native RecordBatch data(RecordBatch obj);
-
-    public native Long id();
-
-    public native boolean isDelta();
-}
diff --git a/web/client-backplane/src/main/java/io/deephaven/javascript/proto/dhinternal/arrow/flight/flatbuf/message_generated/org/apache/arrow/flatbuf/FieldNode.java b/web/client-backplane/src/main/java/io/deephaven/javascript/proto/dhinternal/arrow/flight/flatbuf/message_generated/org/apache/arrow/flatbuf/FieldNode.java
deleted file mode 100644
index e3751057417..00000000000
--- a/web/client-backplane/src/main/java/io/deephaven/javascript/proto/dhinternal/arrow/flight/flatbuf/message_generated/org/apache/arrow/flatbuf/FieldNode.java
+++ /dev/null
@@ -1,29 +0,0 @@
-//
-// Copyright (c) 2016-2024 Deephaven Data Labs and Patent Pending
-//
-package io.deephaven.javascript.proto.dhinternal.arrow.flight.flatbuf.message_generated.org.apache.arrow.flatbuf;
-
-import io.deephaven.javascript.proto.dhinternal.flatbuffers.Builder;
-import io.deephaven.javascript.proto.dhinternal.flatbuffers.ByteBuffer;
-import io.deephaven.javascript.proto.dhinternal.flatbuffers.Long;
-import jsinterop.annotations.JsPackage;
-import jsinterop.annotations.JsType;
-
-@JsType(
-        isNative = true,
-        name = "dhinternal.arrow.flight.flatbuf.Message_generated.org.apache.arrow.flatbuf.FieldNode",
-        namespace = JsPackage.GLOBAL)
-public class FieldNode {
-    public static native double createFieldNode(Builder builder, Long length, Long null_count);
-
-    public static native double sizeOf();
-
-    public ByteBuffer bb;
-    public double bb_pos;
-
-    public native FieldNode __init(double i, ByteBuffer bb);
-
-    public native Long length();
-
-    public native Long nullCount();
-}
diff --git a/web/client-backplane/src/main/java/io/deephaven/javascript/proto/dhinternal/arrow/flight/flatbuf/message_generated/org/apache/arrow/flatbuf/Message.java b/web/client-backplane/src/main/java/io/deephaven/javascript/proto/dhinternal/arrow/flight/flatbuf/message_generated/org/apache/arrow/flatbuf/Message.java
deleted file mode 100644
index 691e7947369..00000000000
--- a/web/client-backplane/src/main/java/io/deephaven/javascript/proto/dhinternal/arrow/flight/flatbuf/message_generated/org/apache/arrow/flatbuf/Message.java
+++ /dev/null
@@ -1,82 +0,0 @@
-//
-// Copyright (c) 2016-2024 Deephaven Data Labs and Patent Pending
-//
-package io.deephaven.javascript.proto.dhinternal.arrow.flight.flatbuf.message_generated.org.apache.arrow.flatbuf;
-
-import elemental2.core.JsArray;
-import io.deephaven.javascript.proto.dhinternal.arrow.flight.flatbuf.schema_generated.org.apache.arrow.flatbuf.KeyValue;
-import io.deephaven.javascript.proto.dhinternal.flatbuffers.Builder;
-import io.deephaven.javascript.proto.dhinternal.flatbuffers.ByteBuffer;
-import io.deephaven.javascript.proto.dhinternal.flatbuffers.Long;
-import jsinterop.annotations.JsOverlay;
-import jsinterop.annotations.JsPackage;
-import jsinterop.annotations.JsType;
-import jsinterop.base.Js;
-
-@JsType(
-        isNative = true,
-        name = "dhinternal.arrow.flight.flatbuf.Message_generated.org.apache.arrow.flatbuf.Message",
-        namespace = JsPackage.GLOBAL)
-public class Message {
-    public static native void addBodyLength(Builder builder, Long bodyLength);
-
-    public static native void addCustomMetadata(Builder builder, double customMetadataOffset);
-
-    public static native void addHeader(Builder builder, double headerOffset);
-
-    public static native void addHeaderType(Builder builder, int headerType);
-
-    public static native void addVersion(Builder builder, int version);
-
-    public static native double createCustomMetadataVector(Builder builder, JsArray<Double> data);
-
-    @JsOverlay
-    public static final double createCustomMetadataVector(Builder builder, double[] data) {
-        return createCustomMetadataVector(builder, Js.<JsArray<Double>>uncheckedCast(data));
-    }
-
-    public static native double createMessage(
-            Builder builder,
-            int version,
-            int headerType,
-            double headerOffset,
-            Long bodyLength,
-            double customMetadataOffset);
-
-    public static native double endMessage(Builder builder);
-
-    public static native void finishMessageBuffer(Builder builder, double offset);
-
-    public static native void finishSizePrefixedMessageBuffer(Builder builder, double offset);
-
-    public static native Message getRootAsMessage(ByteBuffer bb, Message obj);
-
-    public static native Message getRootAsMessage(ByteBuffer bb);
-
-    public static native Message getSizePrefixedRootAsMessage(ByteBuffer bb, Message obj);
-
-    public static native Message getSizePrefixedRootAsMessage(ByteBuffer bb);
-
-    public static native void startCustomMetadataVector(Builder builder, double numElems);
-
-    public static native void startMessage(Builder builder);
-
-    public ByteBuffer bb;
-    public double bb_pos;
-
-    public native Message __init(double i, ByteBuffer bb);
-
-    public native Long bodyLength();
-
-    public native KeyValue customMetadata(double index, KeyValue obj);
-
-    public native KeyValue customMetadata(double index);
-
-    public native double customMetadataLength();
-
-    public native <T> T header(T obj);
-
-    public native int headerType();
-
-    public native int version();
-}
diff --git a/web/client-backplane/src/main/java/io/deephaven/javascript/proto/dhinternal/arrow/flight/flatbuf/message_generated/org/apache/arrow/flatbuf/MessageHeader.java b/web/client-backplane/src/main/java/io/deephaven/javascript/proto/dhinternal/arrow/flight/flatbuf/message_generated/org/apache/arrow/flatbuf/MessageHeader.java
deleted file mode 100644
index 48bae3c723d..00000000000
--- a/web/client-backplane/src/main/java/io/deephaven/javascript/proto/dhinternal/arrow/flight/flatbuf/message_generated/org/apache/arrow/flatbuf/MessageHeader.java
+++ /dev/null
@@ -1,18 +0,0 @@
-//
-// Copyright (c) 2016-2024 Deephaven Data Labs and Patent Pending
-//
-package io.deephaven.javascript.proto.dhinternal.arrow.flight.flatbuf.message_generated.org.apache.arrow.flatbuf;
-
-import jsinterop.annotations.JsPackage;
-import jsinterop.annotations.JsType;
-
-@JsType(
-        isNative = true,
-        name = "dhinternal.arrow.flight.flatbuf.Message_generated.org.apache.arrow.flatbuf.MessageHeader",
-        namespace = JsPackage.GLOBAL)
-public class MessageHeader {
-    public static int DictionaryBatch,
-            NONE,
-            RecordBatch,
-            Schema;
-}
diff --git a/web/client-backplane/src/main/java/io/deephaven/javascript/proto/dhinternal/arrow/flight/flatbuf/message_generated/org/apache/arrow/flatbuf/RecordBatch.java b/web/client-backplane/src/main/java/io/deephaven/javascript/proto/dhinternal/arrow/flight/flatbuf/message_generated/org/apache/arrow/flatbuf/RecordBatch.java
deleted file mode 100644
index 619fbee84cb..00000000000
--- a/web/client-backplane/src/main/java/io/deephaven/javascript/proto/dhinternal/arrow/flight/flatbuf/message_generated/org/apache/arrow/flatbuf/RecordBatch.java
+++ /dev/null
@@ -1,64 +0,0 @@
-//
-// Copyright (c) 2016-2024 Deephaven Data Labs and Patent Pending
-//
-package io.deephaven.javascript.proto.dhinternal.arrow.flight.flatbuf.message_generated.org.apache.arrow.flatbuf;
-
-import io.deephaven.javascript.proto.dhinternal.arrow.flight.flatbuf.schema_generated.org.apache.arrow.flatbuf.Buffer;
-import io.deephaven.javascript.proto.dhinternal.flatbuffers.Builder;
-import io.deephaven.javascript.proto.dhinternal.flatbuffers.ByteBuffer;
-import io.deephaven.javascript.proto.dhinternal.flatbuffers.Long;
-import jsinterop.annotations.JsPackage;
-import jsinterop.annotations.JsType;
-
-@JsType(
-        isNative = true,
-        name = "dhinternal.arrow.flight.flatbuf.Message_generated.org.apache.arrow.flatbuf.RecordBatch",
-        namespace = JsPackage.GLOBAL)
-public class RecordBatch {
-    public static native void addBuffers(Builder builder, double buffersOffset);
-
-    public static native void addCompression(Builder builder, double compressionOffset);
-
-    public static native void addLength(Builder builder, Long length);
-
-    public static native void addNodes(Builder builder, double nodesOffset);
-
-    public static native double endRecordBatch(Builder builder);
-
-    public static native RecordBatch getRootAsRecordBatch(ByteBuffer bb, RecordBatch obj);
-
-    public static native RecordBatch getRootAsRecordBatch(ByteBuffer bb);
-
-    public static native RecordBatch getSizePrefixedRootAsRecordBatch(ByteBuffer bb, RecordBatch obj);
-
-    public static native RecordBatch getSizePrefixedRootAsRecordBatch(ByteBuffer bb);
-
-    public static native void startBuffersVector(Builder builder, double numElems);
-
-    public static native void startNodesVector(Builder builder, double numElems);
-
-    public static native void startRecordBatch(Builder builder);
-
-    public ByteBuffer bb;
-    public double bb_pos;
-
-    public native RecordBatch __init(double i, ByteBuffer bb);
-
-    public native Buffer buffers(double index, Buffer obj);
-
-    public native Buffer buffers(double index);
-
-    public native double buffersLength();
-
-    public native BodyCompression compression();
-
-    public native BodyCompression compression(BodyCompression obj);
-
-    public native Long length();
-
-    public native FieldNode nodes(double index, FieldNode obj);
-
-    public native FieldNode nodes(double index);
-
-    public native double nodesLength();
-}
diff --git a/web/client-backplane/src/main/java/io/deephaven/javascript/proto/dhinternal/arrow/flight/flatbuf/schema_generated/org/apache/arrow/Flatbuf.java b/web/client-backplane/src/main/java/io/deephaven/javascript/proto/dhinternal/arrow/flight/flatbuf/schema_generated/org/apache/arrow/Flatbuf.java
deleted file mode 100644
index c74661f7d31..00000000000
--- a/web/client-backplane/src/main/java/io/deephaven/javascript/proto/dhinternal/arrow/flight/flatbuf/schema_generated/org/apache/arrow/Flatbuf.java
+++ /dev/null
@@ -1,1572 +0,0 @@
-//
-// Copyright (c) 2016-2024 Deephaven Data Labs and Patent Pending
-//
-package io.deephaven.javascript.proto.dhinternal.arrow.flight.flatbuf.schema_generated.org.apache.arrow;
-
-import io.deephaven.javascript.proto.dhinternal.arrow.flight.flatbuf.schema_generated.org.apache.arrow.flatbuf.Binary;
-import io.deephaven.javascript.proto.dhinternal.arrow.flight.flatbuf.schema_generated.org.apache.arrow.flatbuf.Bool;
-import io.deephaven.javascript.proto.dhinternal.arrow.flight.flatbuf.schema_generated.org.apache.arrow.flatbuf.Date;
-import io.deephaven.javascript.proto.dhinternal.arrow.flight.flatbuf.schema_generated.org.apache.arrow.flatbuf.Decimal;
-import io.deephaven.javascript.proto.dhinternal.arrow.flight.flatbuf.schema_generated.org.apache.arrow.flatbuf.Duration;
-import io.deephaven.javascript.proto.dhinternal.arrow.flight.flatbuf.schema_generated.org.apache.arrow.flatbuf.FixedSizeBinary;
-import io.deephaven.javascript.proto.dhinternal.arrow.flight.flatbuf.schema_generated.org.apache.arrow.flatbuf.FixedSizeList;
-import io.deephaven.javascript.proto.dhinternal.arrow.flight.flatbuf.schema_generated.org.apache.arrow.flatbuf.FloatingPoint;
-import io.deephaven.javascript.proto.dhinternal.arrow.flight.flatbuf.schema_generated.org.apache.arrow.flatbuf.Int;
-import io.deephaven.javascript.proto.dhinternal.arrow.flight.flatbuf.schema_generated.org.apache.arrow.flatbuf.Interval;
-import io.deephaven.javascript.proto.dhinternal.arrow.flight.flatbuf.schema_generated.org.apache.arrow.flatbuf.LargeBinary;
-import io.deephaven.javascript.proto.dhinternal.arrow.flight.flatbuf.schema_generated.org.apache.arrow.flatbuf.LargeList;
-import io.deephaven.javascript.proto.dhinternal.arrow.flight.flatbuf.schema_generated.org.apache.arrow.flatbuf.LargeUtf8;
-import io.deephaven.javascript.proto.dhinternal.arrow.flight.flatbuf.schema_generated.org.apache.arrow.flatbuf.List;
-import io.deephaven.javascript.proto.dhinternal.arrow.flight.flatbuf.schema_generated.org.apache.arrow.flatbuf.Map;
-import io.deephaven.javascript.proto.dhinternal.arrow.flight.flatbuf.schema_generated.org.apache.arrow.flatbuf.Null;
-import io.deephaven.javascript.proto.dhinternal.arrow.flight.flatbuf.schema_generated.org.apache.arrow.flatbuf.Struct_;
-import io.deephaven.javascript.proto.dhinternal.arrow.flight.flatbuf.schema_generated.org.apache.arrow.flatbuf.Time;
-import io.deephaven.javascript.proto.dhinternal.arrow.flight.flatbuf.schema_generated.org.apache.arrow.flatbuf.Timestamp;
-import io.deephaven.javascript.proto.dhinternal.arrow.flight.flatbuf.schema_generated.org.apache.arrow.flatbuf.Union;
-import io.deephaven.javascript.proto.dhinternal.arrow.flight.flatbuf.schema_generated.org.apache.arrow.flatbuf.Utf8;
-import jsinterop.annotations.JsFunction;
-import jsinterop.annotations.JsOverlay;
-import jsinterop.annotations.JsPackage;
-import jsinterop.annotations.JsType;
-import jsinterop.base.Js;
-
-@JsType(
-        isNative = true,
-        name = "dhinternal.arrow.flight.flatbuf.Schema_generated.org.apache.arrow.flatbuf",
-        namespace = JsPackage.GLOBAL)
-public class Flatbuf {
-    @JsFunction
-    public interface UnionListToTypeAccessorFn {
-        @JsType(isNative = true, name = "?", namespace = JsPackage.GLOBAL)
-        public interface P1UnionType {
-            @JsOverlay
-            static Flatbuf.UnionListToTypeAccessorFn.P1UnionType of(Object o) {
-                return Js.cast(o);
-            }
-
-            @JsOverlay
-            default Binary asBinary() {
-                return Js.cast(this);
-            }
-
-            @JsOverlay
-            default Bool asBool() {
-                return Js.cast(this);
-            }
-
-            @JsOverlay
-            default Date asDate() {
-                return Js.cast(this);
-            }
-
-            @JsOverlay
-            default Decimal asDecimal() {
-                return Js.cast(this);
-            }
-
-            @JsOverlay
-            default Duration asDuration() {
-                return Js.cast(this);
-            }
-
-            @JsOverlay
-            default FixedSizeBinary asFixedSizeBinary() {
-                return Js.cast(this);
-            }
-
-            @JsOverlay
-            default FixedSizeList asFixedSizeList() {
-                return Js.cast(this);
-            }
-
-            @JsOverlay
-            default FloatingPoint asFloatingPoint() {
-                return Js.cast(this);
-            }
-
-            @JsOverlay
-            default Int asInt() {
-                return Js.cast(this);
-            }
-
-            @JsOverlay
-            default Interval asInterval() {
-                return Js.cast(this);
-            }
-
-            @JsOverlay
-            default LargeBinary asLargeBinary() {
-                return Js.cast(this);
-            }
-
-            @JsOverlay
-            default LargeList asLargeList() {
-                return Js.cast(this);
-            }
-
-            @JsOverlay
-            default LargeUtf8 asLargeUtf8() {
-                return Js.cast(this);
-            }
-
-            @JsOverlay
-            default List asList() {
-                return Js.cast(this);
-            }
-
-            @JsOverlay
-            default Map asMap() {
-                return Js.cast(this);
-            }
-
-            @JsOverlay
-            default Null asNull() {
-                return Js.cast(this);
-            }
-
-            @JsOverlay
-            default Struct_ asStruct_() {
-                return Js.cast(this);
-            }
-
-            @JsOverlay
-            default Time asTime() {
-                return Js.cast(this);
-            }
-
-            @JsOverlay
-            default Timestamp asTimestamp() {
-                return Js.cast(this);
-            }
-
-            @JsOverlay
-            default Union asUnion() {
-                return Js.cast(this);
-            }
-
-            @JsOverlay
-            default Utf8 asUtf8() {
-                return Js.cast(this);
-            }
-
-            @JsOverlay
-            default boolean isBinary() {
-                return (Object) this instanceof Binary;
-            }
-
-            @JsOverlay
-            default boolean isBool() {
-                return (Object) this instanceof Bool;
-            }
-
-            @JsOverlay
-            default boolean isDate() {
-                return (Object) this instanceof Date;
-            }
-
-            @JsOverlay
-            default boolean isDecimal() {
-                return (Object) this instanceof Decimal;
-            }
-
-            @JsOverlay
-            default boolean isDuration() {
-                return (Object) this instanceof Duration;
-            }
-
-            @JsOverlay
-            default boolean isFixedSizeBinary() {
-                return (Object) this instanceof FixedSizeBinary;
-            }
-
-            @JsOverlay
-            default boolean isFixedSizeList() {
-                return (Object) this instanceof FixedSizeList;
-            }
-
-            @JsOverlay
-            default boolean isFloatingPoint() {
-                return (Object) this instanceof FloatingPoint;
-            }
-
-            @JsOverlay
-            default boolean isInt() {
-                return (Object) this instanceof Int;
-            }
-
-            @JsOverlay
-            default boolean isInterval() {
-                return (Object) this instanceof Interval;
-            }
-
-            @JsOverlay
-            default boolean isLargeBinary() {
-                return (Object) this instanceof LargeBinary;
-            }
-
-            @JsOverlay
-            default boolean isLargeList() {
-                return (Object) this instanceof LargeList;
-            }
-
-            @JsOverlay
-            default boolean isLargeUtf8() {
-                return (Object) this instanceof LargeUtf8;
-            }
-
-            @JsOverlay
-            default boolean isList() {
-                return (Object) this instanceof List;
-            }
-
-            @JsOverlay
-            default boolean isMap() {
-                return (Object) this instanceof Map;
-            }
-
-            @JsOverlay
-            default boolean isNull() {
-                return (Object) this instanceof Null;
-            }
-
-            @JsOverlay
-            default boolean isStruct_() {
-                return (Object) this instanceof Struct_;
-            }
-
-            @JsOverlay
-            default boolean isTime() {
-                return (Object) this instanceof Time;
-            }
-
-            @JsOverlay
-            default boolean isTimestamp() {
-                return (Object) this instanceof Timestamp;
-            }
-
-            @JsOverlay
-            default boolean isUnion() {
-                return (Object) this instanceof Union;
-            }
-
-            @JsOverlay
-            default boolean isUtf8() {
-                return (Object) this instanceof Utf8;
-            }
-        }
-
-        @JsType(isNative = true, name = "?", namespace = JsPackage.GLOBAL)
-        public interface UnionType {
-            @JsOverlay
-            static Flatbuf.UnionListToTypeAccessorFn.UnionType of(Object o) {
-                return Js.cast(o);
-            }
-
-            @JsOverlay
-            default Binary asBinary() {
-                return Js.cast(this);
-            }
-
-            @JsOverlay
-            default Bool asBool() {
-                return Js.cast(this);
-            }
-
-            @JsOverlay
-            default Date asDate() {
-                return Js.cast(this);
-            }
-
-            @JsOverlay
-            default Decimal asDecimal() {
-                return Js.cast(this);
-            }
-
-            @JsOverlay
-            default Duration asDuration() {
-                return Js.cast(this);
-            }
-
-            @JsOverlay
-            default FixedSizeBinary asFixedSizeBinary() {
-                return Js.cast(this);
-            }
-
-            @JsOverlay
-            default FixedSizeList asFixedSizeList() {
-                return Js.cast(this);
-            }
-
-            @JsOverlay
-            default FloatingPoint asFloatingPoint() {
-                return Js.cast(this);
-            }
-
-            @JsOverlay
-            default Int asInt() {
-                return Js.cast(this);
-            }
-
-            @JsOverlay
-            default Interval asInterval() {
-                return Js.cast(this);
-            }
-
-            @JsOverlay
-            default LargeBinary asLargeBinary() {
-                return Js.cast(this);
-            }
-
-            @JsOverlay
-            default LargeList asLargeList() {
-                return Js.cast(this);
-            }
-
-            @JsOverlay
-            default LargeUtf8 asLargeUtf8() {
-                return Js.cast(this);
-            }
-
-            @JsOverlay
-            default List asList() {
-                return Js.cast(this);
-            }
-
-            @JsOverlay
-            default Map asMap() {
-                return Js.cast(this);
-            }
-
-            @JsOverlay
-            default Null asNull() {
-                return Js.cast(this);
-            }
-
-            @JsOverlay
-            default Struct_ asStruct_() {
-                return Js.cast(this);
-            }
-
-            @JsOverlay
-            default Time asTime() {
-                return Js.cast(this);
-            }
-
-            @JsOverlay
-            default Timestamp asTimestamp() {
-                return Js.cast(this);
-            }
-
-            @JsOverlay
-            default Union asUnion() {
-                return Js.cast(this);
-            }
-
-            @JsOverlay
-            default Utf8 asUtf8() {
-                return Js.cast(this);
-            }
-
-            @JsOverlay
-            default boolean isBinary() {
-                return (Object) this instanceof Binary;
-            }
-
-            @JsOverlay
-            default boolean isBool() {
-                return (Object) this instanceof Bool;
-            }
-
-            @JsOverlay
-            default boolean isDate() {
-                return (Object) this instanceof Date;
-            }
-
-            @JsOverlay
-            default boolean isDecimal() {
-                return (Object) this instanceof Decimal;
-            }
-
-            @JsOverlay
-            default boolean isDuration() {
-                return (Object) this instanceof Duration;
-            }
-
-            @JsOverlay
-            default boolean isFixedSizeBinary() {
-                return (Object) this instanceof FixedSizeBinary;
-            }
-
-            @JsOverlay
-            default boolean isFixedSizeList() {
-                return (Object) this instanceof FixedSizeList;
-            }
-
-            @JsOverlay
-            default boolean isFloatingPoint() {
-                return (Object) this instanceof FloatingPoint;
-            }
-
-            @JsOverlay
-            default boolean isInt() {
-                return (Object) this instanceof Int;
-            }
-
-            @JsOverlay
-            default boolean isInterval() {
-                return (Object) this instanceof Interval;
-            }
-
-            @JsOverlay
-            default boolean isLargeBinary() {
-                return (Object) this instanceof LargeBinary;
-            }
-
-            @JsOverlay
-            default boolean isLargeList() {
-                return (Object) this instanceof LargeList;
-            }
-
-            @JsOverlay
-            default boolean isLargeUtf8() {
-                return (Object) this instanceof LargeUtf8;
-            }
-
-            @JsOverlay
-            default boolean isList() {
-                return (Object) this instanceof List;
-            }
-
-            @JsOverlay
-            default boolean isMap() {
-                return (Object) this instanceof Map;
-            }
-
-            @JsOverlay
-            default boolean isNull() {
-                return (Object) this instanceof Null;
-            }
-
-            @JsOverlay
-            default boolean isStruct_() {
-                return (Object) this instanceof Struct_;
-            }
-
-            @JsOverlay
-            default boolean isTime() {
-                return (Object) this instanceof Time;
-            }
-
-            @JsOverlay
-            default boolean isTimestamp() {
-                return (Object) this instanceof Timestamp;
-            }
-
-            @JsOverlay
-            default boolean isUnion() {
-                return (Object) this instanceof Union;
-            }
-
-            @JsOverlay
-            default boolean isUtf8() {
-                return (Object) this instanceof Utf8;
-            }
-        }
-
-        @JsOverlay
-        default Flatbuf.UnionListToTypeAccessorFn.UnionType onInvoke(double p0, Binary p1) {
-            return onInvoke(p0, Js.<Flatbuf.UnionListToTypeAccessorFn.P1UnionType>uncheckedCast(p1));
-        }
-
-        @JsOverlay
-        default Flatbuf.UnionListToTypeAccessorFn.UnionType onInvoke(double p0, Bool p1) {
-            return onInvoke(p0, Js.<Flatbuf.UnionListToTypeAccessorFn.P1UnionType>uncheckedCast(p1));
-        }
-
-        @JsOverlay
-        default Flatbuf.UnionListToTypeAccessorFn.UnionType onInvoke(double p0, Date p1) {
-            return onInvoke(p0, Js.<Flatbuf.UnionListToTypeAccessorFn.P1UnionType>uncheckedCast(p1));
-        }
-
-        @JsOverlay
-        default Flatbuf.UnionListToTypeAccessorFn.UnionType onInvoke(double p0, Decimal p1) {
-            return onInvoke(p0, Js.<Flatbuf.UnionListToTypeAccessorFn.P1UnionType>uncheckedCast(p1));
-        }
-
-        @JsOverlay
-        default Flatbuf.UnionListToTypeAccessorFn.UnionType onInvoke(double p0, Duration p1) {
-            return onInvoke(p0, Js.<Flatbuf.UnionListToTypeAccessorFn.P1UnionType>uncheckedCast(p1));
-        }
-
-        @JsOverlay
-        default Flatbuf.UnionListToTypeAccessorFn.UnionType onInvoke(double p0, FixedSizeBinary p1) {
-            return onInvoke(p0, Js.<Flatbuf.UnionListToTypeAccessorFn.P1UnionType>uncheckedCast(p1));
-        }
-
-        @JsOverlay
-        default Flatbuf.UnionListToTypeAccessorFn.UnionType onInvoke(double p0, FixedSizeList p1) {
-            return onInvoke(p0, Js.<Flatbuf.UnionListToTypeAccessorFn.P1UnionType>uncheckedCast(p1));
-        }
-
-        @JsOverlay
-        default Flatbuf.UnionListToTypeAccessorFn.UnionType onInvoke(double p0, FloatingPoint p1) {
-            return onInvoke(p0, Js.<Flatbuf.UnionListToTypeAccessorFn.P1UnionType>uncheckedCast(p1));
-        }
-
-        @JsOverlay
-        default Flatbuf.UnionListToTypeAccessorFn.UnionType onInvoke(double p0, Int p1) {
-            return onInvoke(p0, Js.<Flatbuf.UnionListToTypeAccessorFn.P1UnionType>uncheckedCast(p1));
-        }
-
-        @JsOverlay
-        default Flatbuf.UnionListToTypeAccessorFn.UnionType onInvoke(double p0, Interval p1) {
-            return onInvoke(p0, Js.<Flatbuf.UnionListToTypeAccessorFn.P1UnionType>uncheckedCast(p1));
-        }
-
-        @JsOverlay
-        default Flatbuf.UnionListToTypeAccessorFn.UnionType onInvoke(double p0, LargeBinary p1) {
-            return onInvoke(p0, Js.<Flatbuf.UnionListToTypeAccessorFn.P1UnionType>uncheckedCast(p1));
-        }
-
-        @JsOverlay
-        default Flatbuf.UnionListToTypeAccessorFn.UnionType onInvoke(double p0, LargeList p1) {
-            return onInvoke(p0, Js.<Flatbuf.UnionListToTypeAccessorFn.P1UnionType>uncheckedCast(p1));
-        }
-
-        @JsOverlay
-        default Flatbuf.UnionListToTypeAccessorFn.UnionType onInvoke(double p0, LargeUtf8 p1) {
-            return onInvoke(p0, Js.<Flatbuf.UnionListToTypeAccessorFn.P1UnionType>uncheckedCast(p1));
-        }
-
-        @JsOverlay
-        default Flatbuf.UnionListToTypeAccessorFn.UnionType onInvoke(double p0, List p1) {
-            return onInvoke(p0, Js.<Flatbuf.UnionListToTypeAccessorFn.P1UnionType>uncheckedCast(p1));
-        }
-
-        @JsOverlay
-        default Flatbuf.UnionListToTypeAccessorFn.UnionType onInvoke(double p0, Map p1) {
-            return onInvoke(p0, Js.<Flatbuf.UnionListToTypeAccessorFn.P1UnionType>uncheckedCast(p1));
-        }
-
-        @JsOverlay
-        default Flatbuf.UnionListToTypeAccessorFn.UnionType onInvoke(double p0, Null p1) {
-            return onInvoke(p0, Js.<Flatbuf.UnionListToTypeAccessorFn.P1UnionType>uncheckedCast(p1));
-        }
-
-        Flatbuf.UnionListToTypeAccessorFn.UnionType onInvoke(
-                double p0, Flatbuf.UnionListToTypeAccessorFn.P1UnionType p1);
-
-        @JsOverlay
-        default Flatbuf.UnionListToTypeAccessorFn.UnionType onInvoke(double p0, Struct_ p1) {
-            return onInvoke(p0, Js.<Flatbuf.UnionListToTypeAccessorFn.P1UnionType>uncheckedCast(p1));
-        }
-
-        @JsOverlay
-        default Flatbuf.UnionListToTypeAccessorFn.UnionType onInvoke(double p0, Time p1) {
-            return onInvoke(p0, Js.<Flatbuf.UnionListToTypeAccessorFn.P1UnionType>uncheckedCast(p1));
-        }
-
-        @JsOverlay
-        default Flatbuf.UnionListToTypeAccessorFn.UnionType onInvoke(double p0, Timestamp p1) {
-            return onInvoke(p0, Js.<Flatbuf.UnionListToTypeAccessorFn.P1UnionType>uncheckedCast(p1));
-        }
-
-        @JsOverlay
-        default Flatbuf.UnionListToTypeAccessorFn.UnionType onInvoke(double p0, Union p1) {
-            return onInvoke(p0, Js.<Flatbuf.UnionListToTypeAccessorFn.P1UnionType>uncheckedCast(p1));
-        }
-
-        @JsOverlay
-        default Flatbuf.UnionListToTypeAccessorFn.UnionType onInvoke(double p0, Utf8 p1) {
-            return onInvoke(p0, Js.<Flatbuf.UnionListToTypeAccessorFn.P1UnionType>uncheckedCast(p1));
-        }
-    }
-
-    @JsType(isNative = true, name = "?", namespace = JsPackage.GLOBAL)
-    public interface UnionListToTypeUnionType {
-        @JsOverlay
-        static Flatbuf.UnionListToTypeUnionType of(Object o) {
-            return Js.cast(o);
-        }
-
-        @JsOverlay
-        default Binary asBinary() {
-            return Js.cast(this);
-        }
-
-        @JsOverlay
-        default Bool asBool() {
-            return Js.cast(this);
-        }
-
-        @JsOverlay
-        default Date asDate() {
-            return Js.cast(this);
-        }
-
-        @JsOverlay
-        default Decimal asDecimal() {
-            return Js.cast(this);
-        }
-
-        @JsOverlay
-        default Duration asDuration() {
-            return Js.cast(this);
-        }
-
-        @JsOverlay
-        default FixedSizeBinary asFixedSizeBinary() {
-            return Js.cast(this);
-        }
-
-        @JsOverlay
-        default FixedSizeList asFixedSizeList() {
-            return Js.cast(this);
-        }
-
-        @JsOverlay
-        default FloatingPoint asFloatingPoint() {
-            return Js.cast(this);
-        }
-
-        @JsOverlay
-        default Int asInt() {
-            return Js.cast(this);
-        }
-
-        @JsOverlay
-        default Interval asInterval() {
-            return Js.cast(this);
-        }
-
-        @JsOverlay
-        default LargeBinary asLargeBinary() {
-            return Js.cast(this);
-        }
-
-        @JsOverlay
-        default LargeList asLargeList() {
-            return Js.cast(this);
-        }
-
-        @JsOverlay
-        default LargeUtf8 asLargeUtf8() {
-            return Js.cast(this);
-        }
-
-        @JsOverlay
-        default List asList() {
-            return Js.cast(this);
-        }
-
-        @JsOverlay
-        default Map asMap() {
-            return Js.cast(this);
-        }
-
-        @JsOverlay
-        default Null asNull() {
-            return Js.cast(this);
-        }
-
-        @JsOverlay
-        default Struct_ asStruct_() {
-            return Js.cast(this);
-        }
-
-        @JsOverlay
-        default Time asTime() {
-            return Js.cast(this);
-        }
-
-        @JsOverlay
-        default Timestamp asTimestamp() {
-            return Js.cast(this);
-        }
-
-        @JsOverlay
-        default Union asUnion() {
-            return Js.cast(this);
-        }
-
-        @JsOverlay
-        default Utf8 asUtf8() {
-            return Js.cast(this);
-        }
-
-        @JsOverlay
-        default boolean isBinary() {
-            return (Object) this instanceof Binary;
-        }
-
-        @JsOverlay
-        default boolean isBool() {
-            return (Object) this instanceof Bool;
-        }
-
-        @JsOverlay
-        default boolean isDate() {
-            return (Object) this instanceof Date;
-        }
-
-        @JsOverlay
-        default boolean isDecimal() {
-            return (Object) this instanceof Decimal;
-        }
-
-        @JsOverlay
-        default boolean isDuration() {
-            return (Object) this instanceof Duration;
-        }
-
-        @JsOverlay
-        default boolean isFixedSizeBinary() {
-            return (Object) this instanceof FixedSizeBinary;
-        }
-
-        @JsOverlay
-        default boolean isFixedSizeList() {
-            return (Object) this instanceof FixedSizeList;
-        }
-
-        @JsOverlay
-        default boolean isFloatingPoint() {
-            return (Object) this instanceof FloatingPoint;
-        }
-
-        @JsOverlay
-        default boolean isInt() {
-            return (Object) this instanceof Int;
-        }
-
-        @JsOverlay
-        default boolean isInterval() {
-            return (Object) this instanceof Interval;
-        }
-
-        @JsOverlay
-        default boolean isLargeBinary() {
-            return (Object) this instanceof LargeBinary;
-        }
-
-        @JsOverlay
-        default boolean isLargeList() {
-            return (Object) this instanceof LargeList;
-        }
-
-        @JsOverlay
-        default boolean isLargeUtf8() {
-            return (Object) this instanceof LargeUtf8;
-        }
-
-        @JsOverlay
-        default boolean isList() {
-            return (Object) this instanceof List;
-        }
-
-        @JsOverlay
-        default boolean isMap() {
-            return (Object) this instanceof Map;
-        }
-
-        @JsOverlay
-        default boolean isNull() {
-            return (Object) this instanceof Null;
-        }
-
-        @JsOverlay
-        default boolean isStruct_() {
-            return (Object) this instanceof Struct_;
-        }
-
-        @JsOverlay
-        default boolean isTime() {
-            return (Object) this instanceof Time;
-        }
-
-        @JsOverlay
-        default boolean isTimestamp() {
-            return (Object) this instanceof Timestamp;
-        }
-
-        @JsOverlay
-        default boolean isUnion() {
-            return (Object) this instanceof Union;
-        }
-
-        @JsOverlay
-        default boolean isUtf8() {
-            return (Object) this instanceof Utf8;
-        }
-    }
-
-    @JsFunction
-    public interface UnionToTypeAccessorFn {
-        @JsType(isNative = true, name = "?", namespace = JsPackage.GLOBAL)
-        public interface P0UnionType {
-            @JsOverlay
-            static Flatbuf.UnionToTypeAccessorFn.P0UnionType of(Object o) {
-                return Js.cast(o);
-            }
-
-            @JsOverlay
-            default Binary asBinary() {
-                return Js.cast(this);
-            }
-
-            @JsOverlay
-            default Bool asBool() {
-                return Js.cast(this);
-            }
-
-            @JsOverlay
-            default Date asDate() {
-                return Js.cast(this);
-            }
-
-            @JsOverlay
-            default Decimal asDecimal() {
-                return Js.cast(this);
-            }
-
-            @JsOverlay
-            default Duration asDuration() {
-                return Js.cast(this);
-            }
-
-            @JsOverlay
-            default FixedSizeBinary asFixedSizeBinary() {
-                return Js.cast(this);
-            }
-
-            @JsOverlay
-            default FixedSizeList asFixedSizeList() {
-                return Js.cast(this);
-            }
-
-            @JsOverlay
-            default FloatingPoint asFloatingPoint() {
-                return Js.cast(this);
-            }
-
-            @JsOverlay
-            default Int asInt() {
-                return Js.cast(this);
-            }
-
-            @JsOverlay
-            default Interval asInterval() {
-                return Js.cast(this);
-            }
-
-            @JsOverlay
-            default LargeBinary asLargeBinary() {
-                return Js.cast(this);
-            }
-
-            @JsOverlay
-            default LargeList asLargeList() {
-                return Js.cast(this);
-            }
-
-            @JsOverlay
-            default LargeUtf8 asLargeUtf8() {
-                return Js.cast(this);
-            }
-
-            @JsOverlay
-            default List asList() {
-                return Js.cast(this);
-            }
-
-            @JsOverlay
-            default Map asMap() {
-                return Js.cast(this);
-            }
-
-            @JsOverlay
-            default Null asNull() {
-                return Js.cast(this);
-            }
-
-            @JsOverlay
-            default Struct_ asStruct_() {
-                return Js.cast(this);
-            }
-
-            @JsOverlay
-            default Time asTime() {
-                return Js.cast(this);
-            }
-
-            @JsOverlay
-            default Timestamp asTimestamp() {
-                return Js.cast(this);
-            }
-
-            @JsOverlay
-            default Union asUnion() {
-                return Js.cast(this);
-            }
-
-            @JsOverlay
-            default Utf8 asUtf8() {
-                return Js.cast(this);
-            }
-
-            @JsOverlay
-            default boolean isBinary() {
-                return (Object) this instanceof Binary;
-            }
-
-            @JsOverlay
-            default boolean isBool() {
-                return (Object) this instanceof Bool;
-            }
-
-            @JsOverlay
-            default boolean isDate() {
-                return (Object) this instanceof Date;
-            }
-
-            @JsOverlay
-            default boolean isDecimal() {
-                return (Object) this instanceof Decimal;
-            }
-
-            @JsOverlay
-            default boolean isDuration() {
-                return (Object) this instanceof Duration;
-            }
-
-            @JsOverlay
-            default boolean isFixedSizeBinary() {
-                return (Object) this instanceof FixedSizeBinary;
-            }
-
-            @JsOverlay
-            default boolean isFixedSizeList() {
-                return (Object) this instanceof FixedSizeList;
-            }
-
-            @JsOverlay
-            default boolean isFloatingPoint() {
-                return (Object) this instanceof FloatingPoint;
-            }
-
-            @JsOverlay
-            default boolean isInt() {
-                return (Object) this instanceof Int;
-            }
-
-            @JsOverlay
-            default boolean isInterval() {
-                return (Object) this instanceof Interval;
-            }
-
-            @JsOverlay
-            default boolean isLargeBinary() {
-                return (Object) this instanceof LargeBinary;
-            }
-
-            @JsOverlay
-            default boolean isLargeList() {
-                return (Object) this instanceof LargeList;
-            }
-
-            @JsOverlay
-            default boolean isLargeUtf8() {
-                return (Object) this instanceof LargeUtf8;
-            }
-
-            @JsOverlay
-            default boolean isList() {
-                return (Object) this instanceof List;
-            }
-
-            @JsOverlay
-            default boolean isMap() {
-                return (Object) this instanceof Map;
-            }
-
-            @JsOverlay
-            default boolean isNull() {
-                return (Object) this instanceof Null;
-            }
-
-            @JsOverlay
-            default boolean isStruct_() {
-                return (Object) this instanceof Struct_;
-            }
-
-            @JsOverlay
-            default boolean isTime() {
-                return (Object) this instanceof Time;
-            }
-
-            @JsOverlay
-            default boolean isTimestamp() {
-                return (Object) this instanceof Timestamp;
-            }
-
-            @JsOverlay
-            default boolean isUnion() {
-                return (Object) this instanceof Union;
-            }
-
-            @JsOverlay
-            default boolean isUtf8() {
-                return (Object) this instanceof Utf8;
-            }
-        }
-
-        @JsType(isNative = true, name = "?", namespace = JsPackage.GLOBAL)
-        public interface UnionType {
-            @JsOverlay
-            static Flatbuf.UnionToTypeAccessorFn.UnionType of(Object o) {
-                return Js.cast(o);
-            }
-
-            @JsOverlay
-            default Binary asBinary() {
-                return Js.cast(this);
-            }
-
-            @JsOverlay
-            default Bool asBool() {
-                return Js.cast(this);
-            }
-
-            @JsOverlay
-            default Date asDate() {
-                return Js.cast(this);
-            }
-
-            @JsOverlay
-            default Decimal asDecimal() {
-                return Js.cast(this);
-            }
-
-            @JsOverlay
-            default Duration asDuration() {
-                return Js.cast(this);
-            }
-
-            @JsOverlay
-            default FixedSizeBinary asFixedSizeBinary() {
-                return Js.cast(this);
-            }
-
-            @JsOverlay
-            default FixedSizeList asFixedSizeList() {
-                return Js.cast(this);
-            }
-
-            @JsOverlay
-            default FloatingPoint asFloatingPoint() {
-                return Js.cast(this);
-            }
-
-            @JsOverlay
-            default Int asInt() {
-                return Js.cast(this);
-            }
-
-            @JsOverlay
-            default Interval asInterval() {
-                return Js.cast(this);
-            }
-
-            @JsOverlay
-            default LargeBinary asLargeBinary() {
-                return Js.cast(this);
-            }
-
-            @JsOverlay
-            default LargeList asLargeList() {
-                return Js.cast(this);
-            }
-
-            @JsOverlay
-            default LargeUtf8 asLargeUtf8() {
-                return Js.cast(this);
-            }
-
-            @JsOverlay
-            default List asList() {
-                return Js.cast(this);
-            }
-
-            @JsOverlay
-            default Map asMap() {
-                return Js.cast(this);
-            }
-
-            @JsOverlay
-            default Null asNull() {
-                return Js.cast(this);
-            }
-
-            @JsOverlay
-            default Struct_ asStruct_() {
-                return Js.cast(this);
-            }
-
-            @JsOverlay
-            default Time asTime() {
-                return Js.cast(this);
-            }
-
-            @JsOverlay
-            default Timestamp asTimestamp() {
-                return Js.cast(this);
-            }
-
-            @JsOverlay
-            default Union asUnion() {
-                return Js.cast(this);
-            }
-
-            @JsOverlay
-            default Utf8 asUtf8() {
-                return Js.cast(this);
-            }
-
-            @JsOverlay
-            default boolean isBinary() {
-                return (Object) this instanceof Binary;
-            }
-
-            @JsOverlay
-            default boolean isBool() {
-                return (Object) this instanceof Bool;
-            }
-
-            @JsOverlay
-            default boolean isDate() {
-                return (Object) this instanceof Date;
-            }
-
-            @JsOverlay
-            default boolean isDecimal() {
-                return (Object) this instanceof Decimal;
-            }
-
-            @JsOverlay
-            default boolean isDuration() {
-                return (Object) this instanceof Duration;
-            }
-
-            @JsOverlay
-            default boolean isFixedSizeBinary() {
-                return (Object) this instanceof FixedSizeBinary;
-            }
-
-            @JsOverlay
-            default boolean isFixedSizeList() {
-                return (Object) this instanceof FixedSizeList;
-            }
-
-            @JsOverlay
-            default boolean isFloatingPoint() {
-                return (Object) this instanceof FloatingPoint;
-            }
-
-            @JsOverlay
-            default boolean isInt() {
-                return (Object) this instanceof Int;
-            }
-
-            @JsOverlay
-            default boolean isInterval() {
-                return (Object) this instanceof Interval;
-            }
-
-            @JsOverlay
-            default boolean isLargeBinary() {
-                return (Object) this instanceof LargeBinary;
-            }
-
-            @JsOverlay
-            default boolean isLargeList() {
-                return (Object) this instanceof LargeList;
-            }
-
-            @JsOverlay
-            default boolean isLargeUtf8() {
-                return (Object) this instanceof LargeUtf8;
-            }
-
-            @JsOverlay
-            default boolean isList() {
-                return (Object) this instanceof List;
-            }
-
-            @JsOverlay
-            default boolean isMap() {
-                return (Object) this instanceof Map;
-            }
-
-            @JsOverlay
-            default boolean isNull() {
-                return (Object) this instanceof Null;
-            }
-
-            @JsOverlay
-            default boolean isStruct_() {
-                return (Object) this instanceof Struct_;
-            }
-
-            @JsOverlay
-            default boolean isTime() {
-                return (Object) this instanceof Time;
-            }
-
-            @JsOverlay
-            default boolean isTimestamp() {
-                return (Object) this instanceof Timestamp;
-            }
-
-            @JsOverlay
-            default boolean isUnion() {
-                return (Object) this instanceof Union;
-            }
-
-            @JsOverlay
-            default boolean isUtf8() {
-                return (Object) this instanceof Utf8;
-            }
-        }
-
-        @JsOverlay
-        default Flatbuf.UnionToTypeAccessorFn.UnionType onInvoke(Binary p0) {
-            return onInvoke(Js.<Flatbuf.UnionToTypeAccessorFn.P0UnionType>uncheckedCast(p0));
-        }
-
-        @JsOverlay
-        default Flatbuf.UnionToTypeAccessorFn.UnionType onInvoke(Bool p0) {
-            return onInvoke(Js.<Flatbuf.UnionToTypeAccessorFn.P0UnionType>uncheckedCast(p0));
-        }
-
-        @JsOverlay
-        default Flatbuf.UnionToTypeAccessorFn.UnionType onInvoke(Date p0) {
-            return onInvoke(Js.<Flatbuf.UnionToTypeAccessorFn.P0UnionType>uncheckedCast(p0));
-        }
-
-        @JsOverlay
-        default Flatbuf.UnionToTypeAccessorFn.UnionType onInvoke(Decimal p0) {
-            return onInvoke(Js.<Flatbuf.UnionToTypeAccessorFn.P0UnionType>uncheckedCast(p0));
-        }
-
-        @JsOverlay
-        default Flatbuf.UnionToTypeAccessorFn.UnionType onInvoke(Duration p0) {
-            return onInvoke(Js.<Flatbuf.UnionToTypeAccessorFn.P0UnionType>uncheckedCast(p0));
-        }
-
-        @JsOverlay
-        default Flatbuf.UnionToTypeAccessorFn.UnionType onInvoke(FixedSizeBinary p0) {
-            return onInvoke(Js.<Flatbuf.UnionToTypeAccessorFn.P0UnionType>uncheckedCast(p0));
-        }
-
-        @JsOverlay
-        default Flatbuf.UnionToTypeAccessorFn.UnionType onInvoke(FixedSizeList p0) {
-            return onInvoke(Js.<Flatbuf.UnionToTypeAccessorFn.P0UnionType>uncheckedCast(p0));
-        }
-
-        @JsOverlay
-        default Flatbuf.UnionToTypeAccessorFn.UnionType onInvoke(FloatingPoint p0) {
-            return onInvoke(Js.<Flatbuf.UnionToTypeAccessorFn.P0UnionType>uncheckedCast(p0));
-        }
-
-        @JsOverlay
-        default Flatbuf.UnionToTypeAccessorFn.UnionType onInvoke(Int p0) {
-            return onInvoke(Js.<Flatbuf.UnionToTypeAccessorFn.P0UnionType>uncheckedCast(p0));
-        }
-
-        @JsOverlay
-        default Flatbuf.UnionToTypeAccessorFn.UnionType onInvoke(Interval p0) {
-            return onInvoke(Js.<Flatbuf.UnionToTypeAccessorFn.P0UnionType>uncheckedCast(p0));
-        }
-
-        @JsOverlay
-        default Flatbuf.UnionToTypeAccessorFn.UnionType onInvoke(LargeBinary p0) {
-            return onInvoke(Js.<Flatbuf.UnionToTypeAccessorFn.P0UnionType>uncheckedCast(p0));
-        }
-
-        @JsOverlay
-        default Flatbuf.UnionToTypeAccessorFn.UnionType onInvoke(LargeList p0) {
-            return onInvoke(Js.<Flatbuf.UnionToTypeAccessorFn.P0UnionType>uncheckedCast(p0));
-        }
-
-        @JsOverlay
-        default Flatbuf.UnionToTypeAccessorFn.UnionType onInvoke(LargeUtf8 p0) {
-            return onInvoke(Js.<Flatbuf.UnionToTypeAccessorFn.P0UnionType>uncheckedCast(p0));
-        }
-
-        @JsOverlay
-        default Flatbuf.UnionToTypeAccessorFn.UnionType onInvoke(List p0) {
-            return onInvoke(Js.<Flatbuf.UnionToTypeAccessorFn.P0UnionType>uncheckedCast(p0));
-        }
-
-        @JsOverlay
-        default Flatbuf.UnionToTypeAccessorFn.UnionType onInvoke(Map p0) {
-            return onInvoke(Js.<Flatbuf.UnionToTypeAccessorFn.P0UnionType>uncheckedCast(p0));
-        }
-
-        @JsOverlay
-        default Flatbuf.UnionToTypeAccessorFn.UnionType onInvoke(Null p0) {
-            return onInvoke(Js.<Flatbuf.UnionToTypeAccessorFn.P0UnionType>uncheckedCast(p0));
-        }
-
-        Flatbuf.UnionToTypeAccessorFn.UnionType onInvoke(Flatbuf.UnionToTypeAccessorFn.P0UnionType p0);
-
-        @JsOverlay
-        default Flatbuf.UnionToTypeAccessorFn.UnionType onInvoke(Struct_ p0) {
-            return onInvoke(Js.<Flatbuf.UnionToTypeAccessorFn.P0UnionType>uncheckedCast(p0));
-        }
-
-        @JsOverlay
-        default Flatbuf.UnionToTypeAccessorFn.UnionType onInvoke(Time p0) {
-            return onInvoke(Js.<Flatbuf.UnionToTypeAccessorFn.P0UnionType>uncheckedCast(p0));
-        }
-
-        @JsOverlay
-        default Flatbuf.UnionToTypeAccessorFn.UnionType onInvoke(Timestamp p0) {
-            return onInvoke(Js.<Flatbuf.UnionToTypeAccessorFn.P0UnionType>uncheckedCast(p0));
-        }
-
-        @JsOverlay
-        default Flatbuf.UnionToTypeAccessorFn.UnionType onInvoke(Union p0) {
-            return onInvoke(Js.<Flatbuf.UnionToTypeAccessorFn.P0UnionType>uncheckedCast(p0));
-        }
-
-        @JsOverlay
-        default Flatbuf.UnionToTypeAccessorFn.UnionType onInvoke(Utf8 p0) {
-            return onInvoke(Js.<Flatbuf.UnionToTypeAccessorFn.P0UnionType>uncheckedCast(p0));
-        }
-    }
-
-    @JsType(isNative = true, name = "?", namespace = JsPackage.GLOBAL)
-    public interface UnionToTypeUnionType {
-        @JsOverlay
-        static Flatbuf.UnionToTypeUnionType of(Object o) {
-            return Js.cast(o);
-        }
-
-        @JsOverlay
-        default Binary asBinary() {
-            return Js.cast(this);
-        }
-
-        @JsOverlay
-        default Bool asBool() {
-            return Js.cast(this);
-        }
-
-        @JsOverlay
-        default Date asDate() {
-            return Js.cast(this);
-        }
-
-        @JsOverlay
-        default Decimal asDecimal() {
-            return Js.cast(this);
-        }
-
-        @JsOverlay
-        default Duration asDuration() {
-            return Js.cast(this);
-        }
-
-        @JsOverlay
-        default FixedSizeBinary asFixedSizeBinary() {
-            return Js.cast(this);
-        }
-
-        @JsOverlay
-        default FixedSizeList asFixedSizeList() {
-            return Js.cast(this);
-        }
-
-        @JsOverlay
-        default FloatingPoint asFloatingPoint() {
-            return Js.cast(this);
-        }
-
-        @JsOverlay
-        default Int asInt() {
-            return Js.cast(this);
-        }
-
-        @JsOverlay
-        default Interval asInterval() {
-            return Js.cast(this);
-        }
-
-        @JsOverlay
-        default LargeBinary asLargeBinary() {
-            return Js.cast(this);
-        }
-
-        @JsOverlay
-        default LargeList asLargeList() {
-            return Js.cast(this);
-        }
-
-        @JsOverlay
-        default LargeUtf8 asLargeUtf8() {
-            return Js.cast(this);
-        }
-
-        @JsOverlay
-        default List asList() {
-            return Js.cast(this);
-        }
-
-        @JsOverlay
-        default Map asMap() {
-            return Js.cast(this);
-        }
-
-        @JsOverlay
-        default Null asNull() {
-            return Js.cast(this);
-        }
-
-        @JsOverlay
-        default Struct_ asStruct_() {
-            return Js.cast(this);
-        }
-
-        @JsOverlay
-        default Time asTime() {
-            return Js.cast(this);
-        }
-
-        @JsOverlay
-        default Timestamp asTimestamp() {
-            return Js.cast(this);
-        }
-
-        @JsOverlay
-        default Union asUnion() {
-            return Js.cast(this);
-        }
-
-        @JsOverlay
-        default Utf8 asUtf8() {
-            return Js.cast(this);
-        }
-
-        @JsOverlay
-        default boolean isBinary() {
-            return (Object) this instanceof Binary;
-        }
-
-        @JsOverlay
-        default boolean isBool() {
-            return (Object) this instanceof Bool;
-        }
-
-        @JsOverlay
-        default boolean isDate() {
-            return (Object) this instanceof Date;
-        }
-
-        @JsOverlay
-        default boolean isDecimal() {
-            return (Object) this instanceof Decimal;
-        }
-
-        @JsOverlay
-        default boolean isDuration() {
-            return (Object) this instanceof Duration;
-        }
-
-        @JsOverlay
-        default boolean isFixedSizeBinary() {
-            return (Object) this instanceof FixedSizeBinary;
-        }
-
-        @JsOverlay
-        default boolean isFixedSizeList() {
-            return (Object) this instanceof FixedSizeList;
-        }
-
-        @JsOverlay
-        default boolean isFloatingPoint() {
-            return (Object) this instanceof FloatingPoint;
-        }
-
-        @JsOverlay
-        default boolean isInt() {
-            return (Object) this instanceof Int;
-        }
-
-        @JsOverlay
-        default boolean isInterval() {
-            return (Object) this instanceof Interval;
-        }
-
-        @JsOverlay
-        default boolean isLargeBinary() {
-            return (Object) this instanceof LargeBinary;
-        }
-
-        @JsOverlay
-        default boolean isLargeList() {
-            return (Object) this instanceof LargeList;
-        }
-
-        @JsOverlay
-        default boolean isLargeUtf8() {
-            return (Object) this instanceof LargeUtf8;
-        }
-
-        @JsOverlay
-        default boolean isList() {
-            return (Object) this instanceof List;
-        }
-
-        @JsOverlay
-        default boolean isMap() {
-            return (Object) this instanceof Map;
-        }
-
-        @JsOverlay
-        default boolean isNull() {
-            return (Object) this instanceof Null;
-        }
-
-        @JsOverlay
-        default boolean isStruct_() {
-            return (Object) this instanceof Struct_;
-        }
-
-        @JsOverlay
-        default boolean isTime() {
-            return (Object) this instanceof Time;
-        }
-
-        @JsOverlay
-        default boolean isTimestamp() {
-            return (Object) this instanceof Timestamp;
-        }
-
-        @JsOverlay
-        default boolean isUnion() {
-            return (Object) this instanceof Union;
-        }
-
-        @JsOverlay
-        default boolean isUtf8() {
-            return (Object) this instanceof Utf8;
-        }
-    }
-
-    public static native Flatbuf.UnionListToTypeUnionType unionListToType(
-            int type, Flatbuf.UnionListToTypeAccessorFn accessor, double index);
-
-    public static native Flatbuf.UnionToTypeUnionType unionToType(
-            int type, Flatbuf.UnionToTypeAccessorFn accessor);
-}
diff --git a/web/client-backplane/src/main/java/io/deephaven/javascript/proto/dhinternal/arrow/flight/flatbuf/schema_generated/org/apache/arrow/flatbuf/Binary.java b/web/client-backplane/src/main/java/io/deephaven/javascript/proto/dhinternal/arrow/flight/flatbuf/schema_generated/org/apache/arrow/flatbuf/Binary.java
deleted file mode 100644
index 9174b46ad62..00000000000
--- a/web/client-backplane/src/main/java/io/deephaven/javascript/proto/dhinternal/arrow/flight/flatbuf/schema_generated/org/apache/arrow/flatbuf/Binary.java
+++ /dev/null
@@ -1,34 +0,0 @@
-//
-// Copyright (c) 2016-2024 Deephaven Data Labs and Patent Pending
-//
-package io.deephaven.javascript.proto.dhinternal.arrow.flight.flatbuf.schema_generated.org.apache.arrow.flatbuf;
-
-import io.deephaven.javascript.proto.dhinternal.flatbuffers.Builder;
-import io.deephaven.javascript.proto.dhinternal.flatbuffers.ByteBuffer;
-import jsinterop.annotations.JsPackage;
-import jsinterop.annotations.JsType;
-
-@JsType(
-        isNative = true,
-        name = "dhinternal.arrow.flight.flatbuf.Schema_generated.org.apache.arrow.flatbuf.Binary",
-        namespace = JsPackage.GLOBAL)
-public class Binary {
-    public static native double createBinary(Builder builder);
-
-    public static native double endBinary(Builder builder);
-
-    public static native Binary getRootAsBinary(ByteBuffer bb, Binary obj);
-
-    public static native Binary getRootAsBinary(ByteBuffer bb);
-
-    public static native Binary getSizePrefixedRootAsBinary(ByteBuffer bb, Binary obj);
-
-    public static native Binary getSizePrefixedRootAsBinary(ByteBuffer bb);
-
-    public static native void startBinary(Builder builder);
-
-    public ByteBuffer bb;
-    public double bb_pos;
-
-    public native Binary __init(double i, ByteBuffer bb);
-}
diff --git a/web/client-backplane/src/main/java/io/deephaven/javascript/proto/dhinternal/arrow/flight/flatbuf/schema_generated/org/apache/arrow/flatbuf/Bool.java b/web/client-backplane/src/main/java/io/deephaven/javascript/proto/dhinternal/arrow/flight/flatbuf/schema_generated/org/apache/arrow/flatbuf/Bool.java
deleted file mode 100644
index a995e0e6a1d..00000000000
--- a/web/client-backplane/src/main/java/io/deephaven/javascript/proto/dhinternal/arrow/flight/flatbuf/schema_generated/org/apache/arrow/flatbuf/Bool.java
+++ /dev/null
@@ -1,34 +0,0 @@
-//
-// Copyright (c) 2016-2024 Deephaven Data Labs and Patent Pending
-//
-package io.deephaven.javascript.proto.dhinternal.arrow.flight.flatbuf.schema_generated.org.apache.arrow.flatbuf;
-
-import io.deephaven.javascript.proto.dhinternal.flatbuffers.Builder;
-import io.deephaven.javascript.proto.dhinternal.flatbuffers.ByteBuffer;
-import jsinterop.annotations.JsPackage;
-import jsinterop.annotations.JsType;
-
-@JsType(
-        isNative = true,
-        name = "dhinternal.arrow.flight.flatbuf.Schema_generated.org.apache.arrow.flatbuf.Bool",
-        namespace = JsPackage.GLOBAL)
-public class Bool {
-    public static native double createBool(Builder builder);
-
-    public static native double endBool(Builder builder);
-
-    public static native Bool getRootAsBool(ByteBuffer bb, Bool obj);
-
-    public static native Bool getRootAsBool(ByteBuffer bb);
-
-    public static native Bool getSizePrefixedRootAsBool(ByteBuffer bb, Bool obj);
-
-    public static native Bool getSizePrefixedRootAsBool(ByteBuffer bb);
-
-    public static native void startBool(Builder builder);
-
-    public ByteBuffer bb;
-    public double bb_pos;
-
-    public native Bool __init(double i, ByteBuffer bb);
-}
diff --git a/web/client-backplane/src/main/java/io/deephaven/javascript/proto/dhinternal/arrow/flight/flatbuf/schema_generated/org/apache/arrow/flatbuf/Buffer.java b/web/client-backplane/src/main/java/io/deephaven/javascript/proto/dhinternal/arrow/flight/flatbuf/schema_generated/org/apache/arrow/flatbuf/Buffer.java
deleted file mode 100644
index 9cb4e6bc3c6..00000000000
--- a/web/client-backplane/src/main/java/io/deephaven/javascript/proto/dhinternal/arrow/flight/flatbuf/schema_generated/org/apache/arrow/flatbuf/Buffer.java
+++ /dev/null
@@ -1,29 +0,0 @@
-//
-// Copyright (c) 2016-2024 Deephaven Data Labs and Patent Pending
-//
-package io.deephaven.javascript.proto.dhinternal.arrow.flight.flatbuf.schema_generated.org.apache.arrow.flatbuf;
-
-import io.deephaven.javascript.proto.dhinternal.flatbuffers.Builder;
-import io.deephaven.javascript.proto.dhinternal.flatbuffers.ByteBuffer;
-import io.deephaven.javascript.proto.dhinternal.flatbuffers.Long;
-import jsinterop.annotations.JsPackage;
-import jsinterop.annotations.JsType;
-
-@JsType(
-        isNative = true,
-        name = "dhinternal.arrow.flight.flatbuf.Schema_generated.org.apache.arrow.flatbuf.Buffer",
-        namespace = JsPackage.GLOBAL)
-public class Buffer {
-    public static native double createBuffer(Builder builder, Long offset, Long length);
-
-    public static native double sizeOf();
-
-    public ByteBuffer bb;
-    public double bb_pos;
-
-    public native Buffer __init(double i, ByteBuffer bb);
-
-    public native Long length();
-
-    public native Long offset();
-}
diff --git a/web/client-backplane/src/main/java/io/deephaven/javascript/proto/dhinternal/arrow/flight/flatbuf/schema_generated/org/apache/arrow/flatbuf/Date.java b/web/client-backplane/src/main/java/io/deephaven/javascript/proto/dhinternal/arrow/flight/flatbuf/schema_generated/org/apache/arrow/flatbuf/Date.java
deleted file mode 100644
index 37483e70bcc..00000000000
--- a/web/client-backplane/src/main/java/io/deephaven/javascript/proto/dhinternal/arrow/flight/flatbuf/schema_generated/org/apache/arrow/flatbuf/Date.java
+++ /dev/null
@@ -1,38 +0,0 @@
-//
-// Copyright (c) 2016-2024 Deephaven Data Labs and Patent Pending
-//
-package io.deephaven.javascript.proto.dhinternal.arrow.flight.flatbuf.schema_generated.org.apache.arrow.flatbuf;
-
-import io.deephaven.javascript.proto.dhinternal.flatbuffers.Builder;
-import io.deephaven.javascript.proto.dhinternal.flatbuffers.ByteBuffer;
-import jsinterop.annotations.JsPackage;
-import jsinterop.annotations.JsType;
-
-@JsType(
-        isNative = true,
-        name = "dhinternal.arrow.flight.flatbuf.Schema_generated.org.apache.arrow.flatbuf.Date",
-        namespace = JsPackage.GLOBAL)
-public class Date {
-    public static native void addUnit(Builder builder, int unit);
-
-    public static native double createDate(Builder builder, int unit);
-
-    public static native double endDate(Builder builder);
-
-    public static native Date getRootAsDate(ByteBuffer bb, Date obj);
-
-    public static native Date getRootAsDate(ByteBuffer bb);
-
-    public static native Date getSizePrefixedRootAsDate(ByteBuffer bb, Date obj);
-
-    public static native Date getSizePrefixedRootAsDate(ByteBuffer bb);
-
-    public static native void startDate(Builder builder);
-
-    public ByteBuffer bb;
-    public double bb_pos;
-
-    public native Date __init(double i, ByteBuffer bb);
-
-    public native int unit();
-}
diff --git a/web/client-backplane/src/main/java/io/deephaven/javascript/proto/dhinternal/arrow/flight/flatbuf/schema_generated/org/apache/arrow/flatbuf/DateUnit.java b/web/client-backplane/src/main/java/io/deephaven/javascript/proto/dhinternal/arrow/flight/flatbuf/schema_generated/org/apache/arrow/flatbuf/DateUnit.java
deleted file mode 100644
index b5edb152cb7..00000000000
--- a/web/client-backplane/src/main/java/io/deephaven/javascript/proto/dhinternal/arrow/flight/flatbuf/schema_generated/org/apache/arrow/flatbuf/DateUnit.java
+++ /dev/null
@@ -1,16 +0,0 @@
-//
-// Copyright (c) 2016-2024 Deephaven Data Labs and Patent Pending
-//
-package io.deephaven.javascript.proto.dhinternal.arrow.flight.flatbuf.schema_generated.org.apache.arrow.flatbuf;
-
-import jsinterop.annotations.JsPackage;
-import jsinterop.annotations.JsType;
-
-@JsType(
-        isNative = true,
-        name = "dhinternal.arrow.flight.flatbuf.Schema_generated.org.apache.arrow.flatbuf.DateUnit",
-        namespace = JsPackage.GLOBAL)
-public class DateUnit {
-    public static int DAY,
-            MILLISECOND;
-}
diff --git a/web/client-backplane/src/main/java/io/deephaven/javascript/proto/dhinternal/arrow/flight/flatbuf/schema_generated/org/apache/arrow/flatbuf/Decimal.java b/web/client-backplane/src/main/java/io/deephaven/javascript/proto/dhinternal/arrow/flight/flatbuf/schema_generated/org/apache/arrow/flatbuf/Decimal.java
deleted file mode 100644
index fa3ee35026b..00000000000
--- a/web/client-backplane/src/main/java/io/deephaven/javascript/proto/dhinternal/arrow/flight/flatbuf/schema_generated/org/apache/arrow/flatbuf/Decimal.java
+++ /dev/null
@@ -1,47 +0,0 @@
-//
-// Copyright (c) 2016-2024 Deephaven Data Labs and Patent Pending
-//
-package io.deephaven.javascript.proto.dhinternal.arrow.flight.flatbuf.schema_generated.org.apache.arrow.flatbuf;
-
-import io.deephaven.javascript.proto.dhinternal.flatbuffers.Builder;
-import io.deephaven.javascript.proto.dhinternal.flatbuffers.ByteBuffer;
-import jsinterop.annotations.JsPackage;
-import jsinterop.annotations.JsType;
-
-@JsType(
-        isNative = true,
-        name = "dhinternal.arrow.flight.flatbuf.Schema_generated.org.apache.arrow.flatbuf.Decimal",
-        namespace = JsPackage.GLOBAL)
-public class Decimal {
-    public static native void addBitWidth(Builder builder, double bitWidth);
-
-    public static native void addPrecision(Builder builder, double precision);
-
-    public static native void addScale(Builder builder, double scale);
-
-    public static native double createDecimal(
-            Builder builder, double precision, double scale, double bitWidth);
-
-    public static native double endDecimal(Builder builder);
-
-    public static native Decimal getRootAsDecimal(ByteBuffer bb, Decimal obj);
-
-    public static native Decimal getRootAsDecimal(ByteBuffer bb);
-
-    public static native Decimal getSizePrefixedRootAsDecimal(ByteBuffer bb, Decimal obj);
-
-    public static native Decimal getSizePrefixedRootAsDecimal(ByteBuffer bb);
-
-    public static native void startDecimal(Builder builder);
-
-    public ByteBuffer bb;
-    public double bb_pos;
-
-    public native Decimal __init(double i, ByteBuffer bb);
-
-    public native double bitWidth();
-
-    public native double precision();
-
-    public native double scale();
-}
diff --git a/web/client-backplane/src/main/java/io/deephaven/javascript/proto/dhinternal/arrow/flight/flatbuf/schema_generated/org/apache/arrow/flatbuf/DictionaryEncoding.java b/web/client-backplane/src/main/java/io/deephaven/javascript/proto/dhinternal/arrow/flight/flatbuf/schema_generated/org/apache/arrow/flatbuf/DictionaryEncoding.java
deleted file mode 100644
index 9be0497b0ec..00000000000
--- a/web/client-backplane/src/main/java/io/deephaven/javascript/proto/dhinternal/arrow/flight/flatbuf/schema_generated/org/apache/arrow/flatbuf/DictionaryEncoding.java
+++ /dev/null
@@ -1,53 +0,0 @@
-//
-// Copyright (c) 2016-2024 Deephaven Data Labs and Patent Pending
-//
-package io.deephaven.javascript.proto.dhinternal.arrow.flight.flatbuf.schema_generated.org.apache.arrow.flatbuf;
-
-import io.deephaven.javascript.proto.dhinternal.flatbuffers.Builder;
-import io.deephaven.javascript.proto.dhinternal.flatbuffers.ByteBuffer;
-import io.deephaven.javascript.proto.dhinternal.flatbuffers.Long;
-import jsinterop.annotations.JsPackage;
-import jsinterop.annotations.JsType;
-
-@JsType(
-        isNative = true,
-        name = "dhinternal.arrow.flight.flatbuf.Schema_generated.org.apache.arrow.flatbuf.DictionaryEncoding",
-        namespace = JsPackage.GLOBAL)
-public class DictionaryEncoding {
-    public static native void addDictionaryKind(Builder builder, int dictionaryKind);
-
-    public static native void addId(Builder builder, Long id);
-
-    public static native void addIndexType(Builder builder, double indexTypeOffset);
-
-    public static native void addIsOrdered(Builder builder, boolean isOrdered);
-
-    public static native double endDictionaryEncoding(Builder builder);
-
-    public static native DictionaryEncoding getRootAsDictionaryEncoding(
-            ByteBuffer bb, DictionaryEncoding obj);
-
-    public static native DictionaryEncoding getRootAsDictionaryEncoding(ByteBuffer bb);
-
-    public static native DictionaryEncoding getSizePrefixedRootAsDictionaryEncoding(
-            ByteBuffer bb, DictionaryEncoding obj);
-
-    public static native DictionaryEncoding getSizePrefixedRootAsDictionaryEncoding(ByteBuffer bb);
-
-    public static native void startDictionaryEncoding(Builder builder);
-
-    public ByteBuffer bb;
-    public double bb_pos;
-
-    public native DictionaryEncoding __init(double i, ByteBuffer bb);
-
-    public native int dictionaryKind();
-
-    public native Long id();
-
-    public native Int indexType();
-
-    public native Int indexType(Int obj);
-
-    public native boolean isOrdered();
-}
diff --git a/web/client-backplane/src/main/java/io/deephaven/javascript/proto/dhinternal/arrow/flight/flatbuf/schema_generated/org/apache/arrow/flatbuf/DictionaryKind.java b/web/client-backplane/src/main/java/io/deephaven/javascript/proto/dhinternal/arrow/flight/flatbuf/schema_generated/org/apache/arrow/flatbuf/DictionaryKind.java
deleted file mode 100644
index 0a78b7f3036..00000000000
--- a/web/client-backplane/src/main/java/io/deephaven/javascript/proto/dhinternal/arrow/flight/flatbuf/schema_generated/org/apache/arrow/flatbuf/DictionaryKind.java
+++ /dev/null
@@ -1,15 +0,0 @@
-//
-// Copyright (c) 2016-2024 Deephaven Data Labs and Patent Pending
-//
-package io.deephaven.javascript.proto.dhinternal.arrow.flight.flatbuf.schema_generated.org.apache.arrow.flatbuf;
-
-import jsinterop.annotations.JsPackage;
-import jsinterop.annotations.JsType;
-
-@JsType(
-        isNative = true,
-        name = "dhinternal.arrow.flight.flatbuf.Schema_generated.org.apache.arrow.flatbuf.DictionaryKind",
-        namespace = JsPackage.GLOBAL)
-public class DictionaryKind {
-    public static int DenseArray;
-}
diff --git a/web/client-backplane/src/main/java/io/deephaven/javascript/proto/dhinternal/arrow/flight/flatbuf/schema_generated/org/apache/arrow/flatbuf/Duration.java b/web/client-backplane/src/main/java/io/deephaven/javascript/proto/dhinternal/arrow/flight/flatbuf/schema_generated/org/apache/arrow/flatbuf/Duration.java
deleted file mode 100644
index ae2bc2aee9d..00000000000
--- a/web/client-backplane/src/main/java/io/deephaven/javascript/proto/dhinternal/arrow/flight/flatbuf/schema_generated/org/apache/arrow/flatbuf/Duration.java
+++ /dev/null
@@ -1,38 +0,0 @@
-//
-// Copyright (c) 2016-2024 Deephaven Data Labs and Patent Pending
-//
-package io.deephaven.javascript.proto.dhinternal.arrow.flight.flatbuf.schema_generated.org.apache.arrow.flatbuf;
-
-import io.deephaven.javascript.proto.dhinternal.flatbuffers.Builder;
-import io.deephaven.javascript.proto.dhinternal.flatbuffers.ByteBuffer;
-import jsinterop.annotations.JsPackage;
-import jsinterop.annotations.JsType;
-
-@JsType(
-        isNative = true,
-        name = "dhinternal.arrow.flight.flatbuf.Schema_generated.org.apache.arrow.flatbuf.Duration",
-        namespace = JsPackage.GLOBAL)
-public class Duration {
-    public static native void addUnit(Builder builder, int unit);
-
-    public static native double createDuration(Builder builder, int unit);
-
-    public static native double endDuration(Builder builder);
-
-    public static native Duration getRootAsDuration(ByteBuffer bb, Duration obj);
-
-    public static native Duration getRootAsDuration(ByteBuffer bb);
-
-    public static native Duration getSizePrefixedRootAsDuration(ByteBuffer bb, Duration obj);
-
-    public static native Duration getSizePrefixedRootAsDuration(ByteBuffer bb);
-
-    public static native void startDuration(Builder builder);
-
-    public ByteBuffer bb;
-    public double bb_pos;
-
-    public native Duration __init(double i, ByteBuffer bb);
-
-    public native int unit();
-}
diff --git a/web/client-backplane/src/main/java/io/deephaven/javascript/proto/dhinternal/arrow/flight/flatbuf/schema_generated/org/apache/arrow/flatbuf/Endianness.java b/web/client-backplane/src/main/java/io/deephaven/javascript/proto/dhinternal/arrow/flight/flatbuf/schema_generated/org/apache/arrow/flatbuf/Endianness.java
deleted file mode 100644
index e29338b855b..00000000000
--- a/web/client-backplane/src/main/java/io/deephaven/javascript/proto/dhinternal/arrow/flight/flatbuf/schema_generated/org/apache/arrow/flatbuf/Endianness.java
+++ /dev/null
@@ -1,16 +0,0 @@
-//
-// Copyright (c) 2016-2024 Deephaven Data Labs and Patent Pending
-//
-package io.deephaven.javascript.proto.dhinternal.arrow.flight.flatbuf.schema_generated.org.apache.arrow.flatbuf;
-
-import jsinterop.annotations.JsPackage;
-import jsinterop.annotations.JsType;
-
-@JsType(
-        isNative = true,
-        name = "dhinternal.arrow.flight.flatbuf.Schema_generated.org.apache.arrow.flatbuf.Endianness",
-        namespace = JsPackage.GLOBAL)
-public class Endianness {
-    public static int Big,
-            Little;
-}
diff --git a/web/client-backplane/src/main/java/io/deephaven/javascript/proto/dhinternal/arrow/flight/flatbuf/schema_generated/org/apache/arrow/flatbuf/Feature.java b/web/client-backplane/src/main/java/io/deephaven/javascript/proto/dhinternal/arrow/flight/flatbuf/schema_generated/org/apache/arrow/flatbuf/Feature.java
deleted file mode 100644
index 5b81178a43e..00000000000
--- a/web/client-backplane/src/main/java/io/deephaven/javascript/proto/dhinternal/arrow/flight/flatbuf/schema_generated/org/apache/arrow/flatbuf/Feature.java
+++ /dev/null
@@ -1,17 +0,0 @@
-//
-// Copyright (c) 2016-2024 Deephaven Data Labs and Patent Pending
-//
-package io.deephaven.javascript.proto.dhinternal.arrow.flight.flatbuf.schema_generated.org.apache.arrow.flatbuf;
-
-import jsinterop.annotations.JsPackage;
-import jsinterop.annotations.JsType;
-
-@JsType(
-        isNative = true,
-        name = "dhinternal.arrow.flight.flatbuf.Schema_generated.org.apache.arrow.flatbuf.Feature",
-        namespace = JsPackage.GLOBAL)
-public class Feature {
-    public static int COMPRESSED_BODY,
-            DICTIONARY_REPLACEMENT,
-            UNUSED;
-}
diff --git a/web/client-backplane/src/main/java/io/deephaven/javascript/proto/dhinternal/arrow/flight/flatbuf/schema_generated/org/apache/arrow/flatbuf/Field.java b/web/client-backplane/src/main/java/io/deephaven/javascript/proto/dhinternal/arrow/flight/flatbuf/schema_generated/org/apache/arrow/flatbuf/Field.java
deleted file mode 100644
index 6cdc1706df3..00000000000
--- a/web/client-backplane/src/main/java/io/deephaven/javascript/proto/dhinternal/arrow/flight/flatbuf/schema_generated/org/apache/arrow/flatbuf/Field.java
+++ /dev/null
@@ -1,123 +0,0 @@
-//
-// Copyright (c) 2016-2024 Deephaven Data Labs and Patent Pending
-//
-package io.deephaven.javascript.proto.dhinternal.arrow.flight.flatbuf.schema_generated.org.apache.arrow.flatbuf;
-
-import elemental2.core.JsArray;
-import elemental2.core.Uint8Array;
-import io.deephaven.javascript.proto.dhinternal.flatbuffers.Builder;
-import io.deephaven.javascript.proto.dhinternal.flatbuffers.ByteBuffer;
-import io.deephaven.javascript.proto.dhinternal.flatbuffers.Encoding;
-import jsinterop.annotations.JsOverlay;
-import jsinterop.annotations.JsPackage;
-import jsinterop.annotations.JsType;
-import jsinterop.base.Js;
-
-@JsType(
-        isNative = true,
-        name = "dhinternal.arrow.flight.flatbuf.Schema_generated.org.apache.arrow.flatbuf.Field",
-        namespace = JsPackage.GLOBAL)
-public class Field {
-    @JsType(isNative = true, name = "?", namespace = JsPackage.GLOBAL)
-    public interface NameUnionType {
-        @JsOverlay
-        static Field.NameUnionType of(Object o) {
-            return Js.cast(o);
-        }
-
-        @JsOverlay
-        default String asString() {
-            return Js.asString(this);
-        }
-
-        @JsOverlay
-        default Uint8Array asUint8Array() {
-            return Js.cast(this);
-        }
-
-        @JsOverlay
-        default boolean isString() {
-            return (Object) this instanceof String;
-        }
-
-        @JsOverlay
-        default boolean isUint8Array() {
-            return (Object) this instanceof Uint8Array;
-        }
-    }
-
-    public static native void addChildren(Builder builder, double childrenOffset);
-
-    public static native void addCustomMetadata(Builder builder, double customMetadataOffset);
-
-    public static native void addDictionary(Builder builder, double dictionaryOffset);
-
-    public static native void addName(Builder builder, double nameOffset);
-
-    public static native void addNullable(Builder builder, boolean nullable);
-
-    public static native void addType(Builder builder, double typeOffset);
-
-    public static native void addTypeType(Builder builder, int typeType);
-
-    public static native double createChildrenVector(Builder builder, JsArray<Double> data);
-
-    @JsOverlay
-    public static final double createChildrenVector(Builder builder, double[] data) {
-        return createChildrenVector(builder, Js.<JsArray<Double>>uncheckedCast(data));
-    }
-
-    public static native double createCustomMetadataVector(Builder builder, JsArray<Double> data);
-
-    @JsOverlay
-    public static final double createCustomMetadataVector(Builder builder, double[] data) {
-        return createCustomMetadataVector(builder, Js.<JsArray<Double>>uncheckedCast(data));
-    }
-
-    public static native double endField(Builder builder);
-
-    public static native Field getRootAsField(ByteBuffer bb, Field obj);
-
-    public static native Field getRootAsField(ByteBuffer bb);
-
-    public static native Field getSizePrefixedRootAsField(ByteBuffer bb, Field obj);
-
-    public static native Field getSizePrefixedRootAsField(ByteBuffer bb);
-
-    public static native void startChildrenVector(Builder builder, double numElems);
-
-    public static native void startCustomMetadataVector(Builder builder, double numElems);
-
-    public static native void startField(Builder builder);
-
-    public ByteBuffer bb;
-    public double bb_pos;
-
-    public native Field __init(double i, ByteBuffer bb);
-
-    public native Field children(double index, Field obj);
-
-    public native Field children(double index);
-
-    public native double childrenLength();
-
-    public native KeyValue customMetadata(double index, KeyValue obj);
-
-    public native KeyValue customMetadata(double index);
-
-    public native double customMetadataLength();
-
-    public native DictionaryEncoding dictionary();
-
-    public native DictionaryEncoding dictionary(DictionaryEncoding obj);
-
-    public native Field.NameUnionType name();
-
-    public native Field.NameUnionType name(Encoding optionalEncoding);
-
-    public native boolean nullable();
-
-    public native <T> T type(T obj);
-
-    public native int typeType();
-}
diff --git a/web/client-backplane/src/main/java/io/deephaven/javascript/proto/dhinternal/arrow/flight/flatbuf/schema_generated/org/apache/arrow/flatbuf/FixedSizeBinary.java b/web/client-backplane/src/main/java/io/deephaven/javascript/proto/dhinternal/arrow/flight/flatbuf/schema_generated/org/apache/arrow/flatbuf/FixedSizeBinary.java
deleted file mode 100644
index 701078f258f..00000000000
--- a/web/client-backplane/src/main/java/io/deephaven/javascript/proto/dhinternal/arrow/flight/flatbuf/schema_generated/org/apache/arrow/flatbuf/FixedSizeBinary.java
+++ /dev/null
@@ -1,39 +0,0 @@
-//
-// Copyright (c) 2016-2024 Deephaven Data Labs and Patent Pending
-//
-package io.deephaven.javascript.proto.dhinternal.arrow.flight.flatbuf.schema_generated.org.apache.arrow.flatbuf;
-
-import io.deephaven.javascript.proto.dhinternal.flatbuffers.Builder;
-import io.deephaven.javascript.proto.dhinternal.flatbuffers.ByteBuffer;
-import jsinterop.annotations.JsPackage;
-import jsinterop.annotations.JsType;
-
-@JsType(
-        isNative = true,
-        name = "dhinternal.arrow.flight.flatbuf.Schema_generated.org.apache.arrow.flatbuf.FixedSizeBinary",
-        namespace = JsPackage.GLOBAL)
-public class FixedSizeBinary {
-    public static native void addByteWidth(Builder builder, double byteWidth);
-
-    public static native double createFixedSizeBinary(Builder builder, double byteWidth);
-
-    public static native double endFixedSizeBinary(Builder builder);
-
-    public static native FixedSizeBinary getRootAsFixedSizeBinary(ByteBuffer bb, FixedSizeBinary obj);
-
-    public static native FixedSizeBinary getRootAsFixedSizeBinary(ByteBuffer bb);
-
-    public static native FixedSizeBinary getSizePrefixedRootAsFixedSizeBinary(
-            ByteBuffer bb, FixedSizeBinary obj);
-
-    public static native FixedSizeBinary getSizePrefixedRootAsFixedSizeBinary(ByteBuffer bb);
-
-    public static native void startFixedSizeBinary(Builder builder);
-
-    public ByteBuffer bb;
-    public double bb_pos;
-
-    public native FixedSizeBinary __init(double i, ByteBuffer bb);
-
-    public native double byteWidth();
-}
diff --git a/web/client-backplane/src/main/java/io/deephaven/javascript/proto/dhinternal/arrow/flight/flatbuf/schema_generated/org/apache/arrow/flatbuf/FixedSizeList.java b/web/client-backplane/src/main/java/io/deephaven/javascript/proto/dhinternal/arrow/flight/flatbuf/schema_generated/org/apache/arrow/flatbuf/FixedSizeList.java
deleted file mode 100644
index 6e7f302b85d..00000000000
--- a/web/client-backplane/src/main/java/io/deephaven/javascript/proto/dhinternal/arrow/flight/flatbuf/schema_generated/org/apache/arrow/flatbuf/FixedSizeList.java
+++ /dev/null
@@ -1,39 +0,0 @@
-//
-// Copyright (c) 2016-2024 Deephaven Data Labs and Patent Pending
-//
-package io.deephaven.javascript.proto.dhinternal.arrow.flight.flatbuf.schema_generated.org.apache.arrow.flatbuf;
-
-import io.deephaven.javascript.proto.dhinternal.flatbuffers.Builder;
-import io.deephaven.javascript.proto.dhinternal.flatbuffers.ByteBuffer;
-import jsinterop.annotations.JsPackage;
-import jsinterop.annotations.JsType;
-
-@JsType(
-        isNative = true,
-        name = "dhinternal.arrow.flight.flatbuf.Schema_generated.org.apache.arrow.flatbuf.FixedSizeList",
-        namespace = JsPackage.GLOBAL)
-public class FixedSizeList {
-    public static native void addListSize(Builder builder, double listSize);
-
-    public static native double createFixedSizeList(Builder builder, double listSize);
-
-    public static native double endFixedSizeList(Builder builder);
-
-    public static native FixedSizeList getRootAsFixedSizeList(ByteBuffer bb, FixedSizeList obj);
-
-    public static native FixedSizeList getRootAsFixedSizeList(ByteBuffer bb);
-
-    public static native FixedSizeList getSizePrefixedRootAsFixedSizeList(
-            ByteBuffer bb, FixedSizeList obj);
-
-    public static native FixedSizeList getSizePrefixedRootAsFixedSizeList(ByteBuffer bb);
-
-    public static native void startFixedSizeList(Builder builder);
-
-    public ByteBuffer bb;
-    public double bb_pos;
-
-    public native FixedSizeList __init(double i, ByteBuffer bb);
-
-    public native double listSize();
-}
diff --git a/web/client-backplane/src/main/java/io/deephaven/javascript/proto/dhinternal/arrow/flight/flatbuf/schema_generated/org/apache/arrow/flatbuf/FloatingPoint.java b/web/client-backplane/src/main/java/io/deephaven/javascript/proto/dhinternal/arrow/flight/flatbuf/schema_generated/org/apache/arrow/flatbuf/FloatingPoint.java
deleted file mode 100644
index 739c3f455d6..00000000000
--- a/web/client-backplane/src/main/java/io/deephaven/javascript/proto/dhinternal/arrow/flight/flatbuf/schema_generated/org/apache/arrow/flatbuf/FloatingPoint.java
+++ /dev/null
@@ -1,39 +0,0 @@
-//
-// Copyright (c) 2016-2024 Deephaven Data Labs and Patent Pending
-//
-package io.deephaven.javascript.proto.dhinternal.arrow.flight.flatbuf.schema_generated.org.apache.arrow.flatbuf;
-
-import io.deephaven.javascript.proto.dhinternal.flatbuffers.Builder;
-import io.deephaven.javascript.proto.dhinternal.flatbuffers.ByteBuffer;
-import jsinterop.annotations.JsPackage;
-import jsinterop.annotations.JsType;
-
-@JsType(
-        isNative = true,
-        name = "dhinternal.arrow.flight.flatbuf.Schema_generated.org.apache.arrow.flatbuf.FloatingPoint",
-        namespace = JsPackage.GLOBAL)
-public class FloatingPoint {
-    public static native void addPrecision(Builder builder, int precision);
-
-    public static native double createFloatingPoint(Builder builder, int precision);
-
-    public static native double endFloatingPoint(Builder builder);
-
-    public static native FloatingPoint getRootAsFloatingPoint(ByteBuffer bb, FloatingPoint obj);
-
-    public static native FloatingPoint getRootAsFloatingPoint(ByteBuffer bb);
-
-    public static native FloatingPoint getSizePrefixedRootAsFloatingPoint(
-            ByteBuffer bb, FloatingPoint obj);
-
-    public static native FloatingPoint getSizePrefixedRootAsFloatingPoint(ByteBuffer bb);
-
-    public static native void startFloatingPoint(Builder builder);
-
-    public ByteBuffer bb;
-    public double bb_pos;
-
-    public native FloatingPoint __init(double i, ByteBuffer bb);
-
-    public native int precision();
-}
diff --git a/web/client-backplane/src/main/java/io/deephaven/javascript/proto/dhinternal/arrow/flight/flatbuf/schema_generated/org/apache/arrow/flatbuf/Int.java b/web/client-backplane/src/main/java/io/deephaven/javascript/proto/dhinternal/arrow/flight/flatbuf/schema_generated/org/apache/arrow/flatbuf/Int.java
deleted file mode 100644
index c1441852b02..00000000000
--- a/web/client-backplane/src/main/java/io/deephaven/javascript/proto/dhinternal/arrow/flight/flatbuf/schema_generated/org/apache/arrow/flatbuf/Int.java
+++ /dev/null
@@ -1,42 +0,0 @@
-//
-// Copyright (c) 2016-2024 Deephaven Data Labs and Patent Pending
-//
-package io.deephaven.javascript.proto.dhinternal.arrow.flight.flatbuf.schema_generated.org.apache.arrow.flatbuf;
-
-import io.deephaven.javascript.proto.dhinternal.flatbuffers.Builder;
-import io.deephaven.javascript.proto.dhinternal.flatbuffers.ByteBuffer;
-import jsinterop.annotations.JsPackage;
-import jsinterop.annotations.JsType;
-
-@JsType(
-        isNative = true,
-        name = "dhinternal.arrow.flight.flatbuf.Schema_generated.org.apache.arrow.flatbuf.Int",
-        namespace = JsPackage.GLOBAL)
-public class Int {
-    public static native void addBitWidth(Builder builder, double bitWidth);
-
-    public static native void addIsSigned(Builder builder, boolean isSigned);
-
-    public static native double createInt(Builder builder, double bitWidth, boolean isSigned);
-
-    public static native double endInt(Builder builder);
-
-    public static native Int getRootAsInt(ByteBuffer bb, Int obj);
-
-    public static native Int getRootAsInt(ByteBuffer bb);
-
-    public static native Int getSizePrefixedRootAsInt(ByteBuffer bb, Int obj);
-
-    public static native Int getSizePrefixedRootAsInt(ByteBuffer bb);
-
-    public static native void startInt(Builder builder);
-
-    public ByteBuffer bb;
-    public double bb_pos;
-
-    public native Int __init(double i, ByteBuffer bb);
-
-    public native double bitWidth();
-
-    public native boolean isSigned();
-}
diff --git a/web/client-backplane/src/main/java/io/deephaven/javascript/proto/dhinternal/arrow/flight/flatbuf/schema_generated/org/apache/arrow/flatbuf/Interval.java b/web/client-backplane/src/main/java/io/deephaven/javascript/proto/dhinternal/arrow/flight/flatbuf/schema_generated/org/apache/arrow/flatbuf/Interval.java
deleted file mode 100644
index c844a0f89d2..00000000000
--- a/web/client-backplane/src/main/java/io/deephaven/javascript/proto/dhinternal/arrow/flight/flatbuf/schema_generated/org/apache/arrow/flatbuf/Interval.java
+++ /dev/null
@@ -1,38 +0,0 @@
-//
-// Copyright (c) 2016-2024 Deephaven Data Labs and Patent Pending
-//
-package io.deephaven.javascript.proto.dhinternal.arrow.flight.flatbuf.schema_generated.org.apache.arrow.flatbuf;
-
-import io.deephaven.javascript.proto.dhinternal.flatbuffers.Builder;
-import io.deephaven.javascript.proto.dhinternal.flatbuffers.ByteBuffer;
-import jsinterop.annotations.JsPackage;
-import jsinterop.annotations.JsType;
-
-@JsType(
-        isNative = true,
-        name = "dhinternal.arrow.flight.flatbuf.Schema_generated.org.apache.arrow.flatbuf.Interval",
-        namespace = JsPackage.GLOBAL)
-public class Interval {
-    public static native void addUnit(Builder builder, int unit);
-
-    public static native double createInterval(Builder builder, int unit);
-
-    public static native double endInterval(Builder builder);
-
-    public static native Interval getRootAsInterval(ByteBuffer bb, Interval obj);
-
-    public static native Interval getRootAsInterval(ByteBuffer bb);
-
-    public static native Interval getSizePrefixedRootAsInterval(ByteBuffer bb, Interval obj);
-
-    public static native Interval getSizePrefixedRootAsInterval(ByteBuffer bb);
-
-    public static native void startInterval(Builder builder);
-
-    public ByteBuffer bb;
-    public double bb_pos;
-
-    public native Interval __init(double i, ByteBuffer bb);
-
-    public native int unit();
-}
diff --git a/web/client-backplane/src/main/java/io/deephaven/javascript/proto/dhinternal/arrow/flight/flatbuf/schema_generated/org/apache/arrow/flatbuf/IntervalUnit.java b/web/client-backplane/src/main/java/io/deephaven/javascript/proto/dhinternal/arrow/flight/flatbuf/schema_generated/org/apache/arrow/flatbuf/IntervalUnit.java
deleted file mode 100644
index aee19255211..00000000000
--- a/web/client-backplane/src/main/java/io/deephaven/javascript/proto/dhinternal/arrow/flight/flatbuf/schema_generated/org/apache/arrow/flatbuf/IntervalUnit.java
+++ /dev/null
@@ -1,16 +0,0 @@
-//
-// Copyright (c) 2016-2024 Deephaven Data Labs and Patent Pending
-//
-package io.deephaven.javascript.proto.dhinternal.arrow.flight.flatbuf.schema_generated.org.apache.arrow.flatbuf;
-
-import jsinterop.annotations.JsPackage;
-import jsinterop.annotations.JsType;
-
-@JsType(
-        isNative = true,
-        name = "dhinternal.arrow.flight.flatbuf.Schema_generated.org.apache.arrow.flatbuf.IntervalUnit",
-        namespace = JsPackage.GLOBAL)
-public class IntervalUnit {
-    public static int DAY_TIME,
-            YEAR_MONTH;
-}
diff --git a/web/client-backplane/src/main/java/io/deephaven/javascript/proto/dhinternal/arrow/flight/flatbuf/schema_generated/org/apache/arrow/flatbuf/KeyValue.java b/web/client-backplane/src/main/java/io/deephaven/javascript/proto/dhinternal/arrow/flight/flatbuf/schema_generated/org/apache/arrow/flatbuf/KeyValue.java
deleted file mode 100644
index 3a7511d91eb..00000000000
--- a/web/client-backplane/src/main/java/io/deephaven/javascript/proto/dhinternal/arrow/flight/flatbuf/schema_generated/org/apache/arrow/flatbuf/KeyValue.java
+++ /dev/null
@@ -1,106 +0,0 @@
-//
-// Copyright (c) 2016-2024 Deephaven Data Labs and Patent Pending
-//
-package io.deephaven.javascript.proto.dhinternal.arrow.flight.flatbuf.schema_generated.org.apache.arrow.flatbuf;
-
-import elemental2.core.Uint8Array;
-import io.deephaven.javascript.proto.dhinternal.flatbuffers.Builder;
-import io.deephaven.javascript.proto.dhinternal.flatbuffers.ByteBuffer;
-import io.deephaven.javascript.proto.dhinternal.flatbuffers.Encoding;
-import jsinterop.annotations.JsOverlay;
-import jsinterop.annotations.JsPackage;
-import jsinterop.annotations.JsType;
-import jsinterop.base.Js;
-
-@JsType(
-        isNative = true,
-        name = "dhinternal.arrow.flight.flatbuf.Schema_generated.org.apache.arrow.flatbuf.KeyValue",
-        namespace = JsPackage.GLOBAL)
-public class KeyValue {
-    @JsType(isNative = true, name = "?", namespace = JsPackage.GLOBAL)
-    public interface KeyUnionType {
-        @JsOverlay
-        static KeyValue.KeyUnionType of(Object o) {
-            return Js.cast(o);
-        }
-
-        @JsOverlay
-        default String asString() {
-            return Js.asString(this);
-        }
-
-        @JsOverlay
-        default Uint8Array asUint8Array() {
-            return Js.cast(this);
-        }
-
-        @JsOverlay
-        default boolean isString() {
-            return (Object) this instanceof String;
-        }
-
-        @JsOverlay
-        default boolean isUint8Array() {
-            return (Object) this instanceof Uint8Array;
-        }
-    }
-
-    @JsType(isNative = true, name = "?", namespace = JsPackage.GLOBAL)
-    public interface ValueUnionType {
-        @JsOverlay
-        static KeyValue.ValueUnionType of(Object o) {
-            return Js.cast(o);
-        }
-
-        @JsOverlay
-        default String asString() {
-            return Js.asString(this);
-        }
-
-        @JsOverlay
-        default Uint8Array asUint8Array() {
-            return Js.cast(this);
-        }
-
-        @JsOverlay
-        default boolean isString() {
-            return (Object) this instanceof String;
-        }
-
-        @JsOverlay
-        default boolean isUint8Array() {
-            return (Object) this instanceof Uint8Array;
-        }
-    }
-
-    public static native void addKey(Builder builder, double keyOffset);
-
-    public static native void addValue(Builder builder, double valueOffset);
-
-    public static native double createKeyValue(Builder builder, double keyOffset, double valueOffset);
-
-    public static native double endKeyValue(Builder builder);
-
-    public static native KeyValue getRootAsKeyValue(ByteBuffer bb, KeyValue obj);
-
-    public static native KeyValue getRootAsKeyValue(ByteBuffer bb);
-
-    public static native KeyValue getSizePrefixedRootAsKeyValue(ByteBuffer bb, KeyValue obj);
-
-    public static native KeyValue getSizePrefixedRootAsKeyValue(ByteBuffer bb);
-
-    public static native void startKeyValue(Builder builder);
-
-    public ByteBuffer bb;
-    public double bb_pos;
-
-    public native KeyValue __init(double i, ByteBuffer bb);
-
-    public native KeyValue.KeyUnionType key();
-
-    public native KeyValue.KeyUnionType key(Encoding optionalEncoding);
-
-    public native KeyValue.ValueUnionType value();
-
-    public native KeyValue.ValueUnionType value(Encoding optionalEncoding);
-}
diff --git a/web/client-backplane/src/main/java/io/deephaven/javascript/proto/dhinternal/arrow/flight/flatbuf/schema_generated/org/apache/arrow/flatbuf/LargeBinary.java b/web/client-backplane/src/main/java/io/deephaven/javascript/proto/dhinternal/arrow/flight/flatbuf/schema_generated/org/apache/arrow/flatbuf/LargeBinary.java
deleted file mode 100644
index 98b3ca5480b..00000000000
--- a/web/client-backplane/src/main/java/io/deephaven/javascript/proto/dhinternal/arrow/flight/flatbuf/schema_generated/org/apache/arrow/flatbuf/LargeBinary.java
+++ /dev/null
@@ -1,34 +0,0 @@
-//
-// Copyright (c) 2016-2024 Deephaven Data Labs and Patent Pending
-//
-package io.deephaven.javascript.proto.dhinternal.arrow.flight.flatbuf.schema_generated.org.apache.arrow.flatbuf;
-
-import io.deephaven.javascript.proto.dhinternal.flatbuffers.Builder;
-import io.deephaven.javascript.proto.dhinternal.flatbuffers.ByteBuffer;
-import jsinterop.annotations.JsPackage;
-import jsinterop.annotations.JsType;
-
-@JsType(
-        isNative = true,
-        name = "dhinternal.arrow.flight.flatbuf.Schema_generated.org.apache.arrow.flatbuf.LargeBinary",
-        namespace = JsPackage.GLOBAL)
-public class LargeBinary {
-    public static native double createLargeBinary(Builder builder);
-
-    public static native double endLargeBinary(Builder builder);
-
-    public static native LargeBinary getRootAsLargeBinary(ByteBuffer bb, LargeBinary obj);
-
-    public static native LargeBinary getRootAsLargeBinary(ByteBuffer bb);
-
-    public static native LargeBinary getSizePrefixedRootAsLargeBinary(ByteBuffer bb, LargeBinary obj);
-
-    public static native LargeBinary getSizePrefixedRootAsLargeBinary(ByteBuffer bb);
-
-    public static native void startLargeBinary(Builder builder);
-
-    public ByteBuffer bb;
-    public double bb_pos;
-
-    public native LargeBinary __init(double i, ByteBuffer bb);
-}
diff --git a/web/client-backplane/src/main/java/io/deephaven/javascript/proto/dhinternal/arrow/flight/flatbuf/schema_generated/org/apache/arrow/flatbuf/LargeList.java b/web/client-backplane/src/main/java/io/deephaven/javascript/proto/dhinternal/arrow/flight/flatbuf/schema_generated/org/apache/arrow/flatbuf/LargeList.java
deleted file mode 100644
index c7581db121c..00000000000
--- a/web/client-backplane/src/main/java/io/deephaven/javascript/proto/dhinternal/arrow/flight/flatbuf/schema_generated/org/apache/arrow/flatbuf/LargeList.java
+++ /dev/null
@@ -1,34 +0,0 @@
-//
-// Copyright (c) 2016-2024 Deephaven Data Labs and Patent Pending
-//
-package io.deephaven.javascript.proto.dhinternal.arrow.flight.flatbuf.schema_generated.org.apache.arrow.flatbuf;
-
-import io.deephaven.javascript.proto.dhinternal.flatbuffers.Builder;
-import io.deephaven.javascript.proto.dhinternal.flatbuffers.ByteBuffer;
-import jsinterop.annotations.JsPackage;
-import jsinterop.annotations.JsType;
-
-@JsType(
-        isNative = true,
-        name = "dhinternal.arrow.flight.flatbuf.Schema_generated.org.apache.arrow.flatbuf.LargeList",
-        namespace = JsPackage.GLOBAL)
-public class LargeList {
-    public static native double createLargeList(Builder builder);
-
-    public static native double endLargeList(Builder builder);
-
-    public static native LargeList getRootAsLargeList(ByteBuffer bb, LargeList obj);
-
-    public static native LargeList getRootAsLargeList(ByteBuffer bb);
-
-    public static native LargeList getSizePrefixedRootAsLargeList(ByteBuffer bb, LargeList obj);
-
-    public static native LargeList getSizePrefixedRootAsLargeList(ByteBuffer bb);
-
-    public static native void startLargeList(Builder builder);
-
-    public ByteBuffer bb;
-    public double bb_pos;
-
-    public native LargeList __init(double i, ByteBuffer bb);
-}
diff --git a/web/client-backplane/src/main/java/io/deephaven/javascript/proto/dhinternal/arrow/flight/flatbuf/schema_generated/org/apache/arrow/flatbuf/LargeUtf8.java b/web/client-backplane/src/main/java/io/deephaven/javascript/proto/dhinternal/arrow/flight/flatbuf/schema_generated/org/apache/arrow/flatbuf/LargeUtf8.java
deleted file mode 100644
index 55031aa3e29..00000000000
--- a/web/client-backplane/src/main/java/io/deephaven/javascript/proto/dhinternal/arrow/flight/flatbuf/schema_generated/org/apache/arrow/flatbuf/LargeUtf8.java
+++ /dev/null
@@ -1,34 +0,0 @@
-//
-// Copyright (c) 2016-2024 Deephaven Data Labs and Patent Pending
-//
-package io.deephaven.javascript.proto.dhinternal.arrow.flight.flatbuf.schema_generated.org.apache.arrow.flatbuf;
-
-import io.deephaven.javascript.proto.dhinternal.flatbuffers.Builder;
-import io.deephaven.javascript.proto.dhinternal.flatbuffers.ByteBuffer;
-import jsinterop.annotations.JsPackage;
-import jsinterop.annotations.JsType;
-
-@JsType(
-        isNative = true,
-        name = "dhinternal.arrow.flight.flatbuf.Schema_generated.org.apache.arrow.flatbuf.LargeUtf8",
-        namespace = JsPackage.GLOBAL)
-public class LargeUtf8 {
-    public static native double createLargeUtf8(Builder builder);
-
-    public static native double endLargeUtf8(Builder builder);
-
-    public static native LargeUtf8 getRootAsLargeUtf8(ByteBuffer bb, LargeUtf8 obj);
-
-    public static native LargeUtf8 getRootAsLargeUtf8(ByteBuffer bb);
-
-    public static native LargeUtf8 getSizePrefixedRootAsLargeUtf8(ByteBuffer bb, LargeUtf8 obj);
-
-    public static native LargeUtf8 getSizePrefixedRootAsLargeUtf8(ByteBuffer bb);
-
-    public static native void startLargeUtf8(Builder builder);
-
-    public ByteBuffer bb;
-    public double bb_pos;
-
-    public native LargeUtf8 __init(double i, ByteBuffer bb);
-}
diff --git a/web/client-backplane/src/main/java/io/deephaven/javascript/proto/dhinternal/arrow/flight/flatbuf/schema_generated/org/apache/arrow/flatbuf/List.java b/web/client-backplane/src/main/java/io/deephaven/javascript/proto/dhinternal/arrow/flight/flatbuf/schema_generated/org/apache/arrow/flatbuf/List.java
deleted file mode 100644
index f4a0f64ba0e..00000000000
--- a/web/client-backplane/src/main/java/io/deephaven/javascript/proto/dhinternal/arrow/flight/flatbuf/schema_generated/org/apache/arrow/flatbuf/List.java
+++ /dev/null
@@ -1,34 +0,0 @@
-//
-// Copyright (c) 2016-2024 Deephaven Data Labs and Patent Pending
-//
-package io.deephaven.javascript.proto.dhinternal.arrow.flight.flatbuf.schema_generated.org.apache.arrow.flatbuf;
-
-import io.deephaven.javascript.proto.dhinternal.flatbuffers.Builder;
-import io.deephaven.javascript.proto.dhinternal.flatbuffers.ByteBuffer;
-import jsinterop.annotations.JsPackage;
-import jsinterop.annotations.JsType;
-
-@JsType(
-        isNative = true,
-        name = "dhinternal.arrow.flight.flatbuf.Schema_generated.org.apache.arrow.flatbuf.List",
-        namespace = JsPackage.GLOBAL)
-public class List {
-    public static native double createList(Builder builder);
-
-    public static native double endList(Builder builder);
-
-    public static native List getRootAsList(ByteBuffer bb, List obj);
-
-    public static native List getRootAsList(ByteBuffer bb);
-
-    public static native List getSizePrefixedRootAsList(ByteBuffer bb, List obj);
-
-    public static native List getSizePrefixedRootAsList(ByteBuffer bb);
-
-    public static native void startList(Builder builder);
-
-    public ByteBuffer bb;
-    public double bb_pos;
-
-    public native List __init(double i, ByteBuffer bb);
-}
diff --git a/web/client-backplane/src/main/java/io/deephaven/javascript/proto/dhinternal/arrow/flight/flatbuf/schema_generated/org/apache/arrow/flatbuf/Map.java b/web/client-backplane/src/main/java/io/deephaven/javascript/proto/dhinternal/arrow/flight/flatbuf/schema_generated/org/apache/arrow/flatbuf/Map.java
deleted file mode 100644
index 1a2e54e0fc6..00000000000
--- a/web/client-backplane/src/main/java/io/deephaven/javascript/proto/dhinternal/arrow/flight/flatbuf/schema_generated/org/apache/arrow/flatbuf/Map.java
+++ /dev/null
@@ -1,38 +0,0 @@
-//
-// Copyright (c) 2016-2024 Deephaven Data Labs and Patent Pending
-//
-package io.deephaven.javascript.proto.dhinternal.arrow.flight.flatbuf.schema_generated.org.apache.arrow.flatbuf;
-
-import io.deephaven.javascript.proto.dhinternal.flatbuffers.Builder;
-import io.deephaven.javascript.proto.dhinternal.flatbuffers.ByteBuffer;
-import jsinterop.annotations.JsPackage;
-import jsinterop.annotations.JsType;
-
-@JsType(
-        isNative = true,
-        name = "dhinternal.arrow.flight.flatbuf.Schema_generated.org.apache.arrow.flatbuf.Map",
-        namespace = JsPackage.GLOBAL)
-public class Map {
-    public static native void addKeysSorted(Builder builder, boolean keysSorted);
-
-    public static native double createMap(Builder builder, boolean keysSorted);
-
-    public static native double endMap(Builder builder);
-
-    public static native Map getRootAsMap(ByteBuffer bb, Map obj);
-
-    public static native Map getRootAsMap(ByteBuffer bb);
-
-    public static native Map getSizePrefixedRootAsMap(ByteBuffer bb, Map obj);
-
-    public static native Map getSizePrefixedRootAsMap(ByteBuffer bb);
-
-    public static native void startMap(Builder builder);
-
-    public ByteBuffer bb;
-    public double bb_pos;
-
-    public native Map __init(double i, ByteBuffer bb);
-
-    public native boolean keysSorted();
-}
diff --git a/web/client-backplane/src/main/java/io/deephaven/javascript/proto/dhinternal/arrow/flight/flatbuf/schema_generated/org/apache/arrow/flatbuf/MetadataVersion.java b/web/client-backplane/src/main/java/io/deephaven/javascript/proto/dhinternal/arrow/flight/flatbuf/schema_generated/org/apache/arrow/flatbuf/MetadataVersion.java
deleted file mode 100644
index 6e26ef3e21b..00000000000
--- a/web/client-backplane/src/main/java/io/deephaven/javascript/proto/dhinternal/arrow/flight/flatbuf/schema_generated/org/apache/arrow/flatbuf/MetadataVersion.java
+++ /dev/null
@@ -1,19 +0,0 @@
-//
-// Copyright (c) 2016-2024 Deephaven Data Labs and Patent Pending
-//
-package io.deephaven.javascript.proto.dhinternal.arrow.flight.flatbuf.schema_generated.org.apache.arrow.flatbuf;
-
-import jsinterop.annotations.JsPackage;
-import jsinterop.annotations.JsType;
-
-@JsType(
-        isNative = true,
-        name = "dhinternal.arrow.flight.flatbuf.Schema_generated.org.apache.arrow.flatbuf.MetadataVersion",
-        namespace = JsPackage.GLOBAL)
-public class MetadataVersion {
-    public static int V1,
-            V2,
-            V3,
-            V4,
-            V5;
-}
diff --git a/web/client-backplane/src/main/java/io/deephaven/javascript/proto/dhinternal/arrow/flight/flatbuf/schema_generated/org/apache/arrow/flatbuf/Null.java b/web/client-backplane/src/main/java/io/deephaven/javascript/proto/dhinternal/arrow/flight/flatbuf/schema_generated/org/apache/arrow/flatbuf/Null.java
deleted file mode 100644
index a4c761da693..00000000000
--- a/web/client-backplane/src/main/java/io/deephaven/javascript/proto/dhinternal/arrow/flight/flatbuf/schema_generated/org/apache/arrow/flatbuf/Null.java
+++ /dev/null
@@ -1,34 +0,0 @@
-//
-// Copyright (c) 2016-2024 Deephaven Data Labs and Patent Pending
-//
-package io.deephaven.javascript.proto.dhinternal.arrow.flight.flatbuf.schema_generated.org.apache.arrow.flatbuf;
-
-import io.deephaven.javascript.proto.dhinternal.flatbuffers.Builder;
-import io.deephaven.javascript.proto.dhinternal.flatbuffers.ByteBuffer;
-import jsinterop.annotations.JsPackage;
-import jsinterop.annotations.JsType;
-
-@JsType(
-        isNative = true,
-        name = "dhinternal.arrow.flight.flatbuf.Schema_generated.org.apache.arrow.flatbuf.Null",
-        namespace = JsPackage.GLOBAL)
-public class Null {
-    public static native double createNull(Builder builder);
-
-    public static native double endNull(Builder builder);
-
-    public static native Null getRootAsNull(ByteBuffer bb, Null obj);
-
-    public static native Null getRootAsNull(ByteBuffer bb);
-
-    public static native Null getSizePrefixedRootAsNull(ByteBuffer bb, Null obj);
-
-    public static native Null getSizePrefixedRootAsNull(ByteBuffer bb);
-
-    public static native void startNull(Builder builder);
-
-    public ByteBuffer bb;
-    public double bb_pos;
-
-    public native Null __init(double i, ByteBuffer bb);
-}
diff --git a/web/client-backplane/src/main/java/io/deephaven/javascript/proto/dhinternal/arrow/flight/flatbuf/schema_generated/org/apache/arrow/flatbuf/Precision.java b/web/client-backplane/src/main/java/io/deephaven/javascript/proto/dhinternal/arrow/flight/flatbuf/schema_generated/org/apache/arrow/flatbuf/Precision.java
deleted file mode 100644
index 0c7f6cad0e3..00000000000
--- a/web/client-backplane/src/main/java/io/deephaven/javascript/proto/dhinternal/arrow/flight/flatbuf/schema_generated/org/apache/arrow/flatbuf/Precision.java
+++ /dev/null
@@ -1,17 +0,0 @@
-//
-// Copyright (c) 2016-2024 Deephaven Data Labs and Patent Pending
-//
-package io.deephaven.javascript.proto.dhinternal.arrow.flight.flatbuf.schema_generated.org.apache.arrow.flatbuf;
-
-import jsinterop.annotations.JsPackage;
-import jsinterop.annotations.JsType;
-
-@JsType(
-        isNative = true,
-        name = "dhinternal.arrow.flight.flatbuf.Schema_generated.org.apache.arrow.flatbuf.Precision",
-        namespace = JsPackage.GLOBAL)
-public class Precision {
-    public static int DOUBLE,
-            HALF,
-            SINGLE;
-}
diff --git a/web/client-backplane/src/main/java/io/deephaven/javascript/proto/dhinternal/arrow/flight/flatbuf/schema_generated/org/apache/arrow/flatbuf/Schema.java b/web/client-backplane/src/main/java/io/deephaven/javascript/proto/dhinternal/arrow/flight/flatbuf/schema_generated/org/apache/arrow/flatbuf/Schema.java
deleted file mode 100644
index 23ddc811ef7..00000000000
--- a/web/client-backplane/src/main/java/io/deephaven/javascript/proto/dhinternal/arrow/flight/flatbuf/schema_generated/org/apache/arrow/flatbuf/Schema.java
+++ /dev/null
@@ -1,100 +0,0 @@
-//
-// Copyright (c) 2016-2024 Deephaven Data Labs and Patent Pending
-//
-package io.deephaven.javascript.proto.dhinternal.arrow.flight.flatbuf.schema_generated.org.apache.arrow.flatbuf;
-
-import elemental2.core.JsArray;
-import io.deephaven.javascript.proto.dhinternal.flatbuffers.Builder;
-import io.deephaven.javascript.proto.dhinternal.flatbuffers.ByteBuffer;
-import io.deephaven.javascript.proto.dhinternal.flatbuffers.Long;
-import jsinterop.annotations.JsOverlay;
-import jsinterop.annotations.JsPackage;
-import jsinterop.annotations.JsType;
-import jsinterop.base.Js;
-
-@JsType(
-        isNative = true,
-        name = "dhinternal.arrow.flight.flatbuf.Schema_generated.org.apache.arrow.flatbuf.Schema",
-        namespace = JsPackage.GLOBAL)
-public class Schema {
-    public static native void addCustomMetadata(Builder builder, double customMetadataOffset);
-
-    public static native void addEndianness(Builder builder, int endianness);
-
-    public static native void addFeatures(Builder builder, double featuresOffset);
-
-    public static native void addFields(Builder builder, double fieldsOffset);
-
-    public static native double createCustomMetadataVector(Builder builder, JsArray<Double> data);
-
-    @JsOverlay
-    public static final double createCustomMetadataVector(Builder builder, double[] data) {
-        return createCustomMetadataVector(builder, Js.<JsArray<Double>>uncheckedCast(data));
-    }
-
-    public static native double createFeaturesVector(Builder builder, JsArray<Object> data);
-
-    @JsOverlay
-    public static final double createFeaturesVector(Builder builder, Object[] data) {
-        return createFeaturesVector(builder, Js.<JsArray<Object>>uncheckedCast(data));
-    }
-
-    public static native double createFieldsVector(Builder builder, JsArray<Double> data);
-
-    @JsOverlay
-    public static final double createFieldsVector(Builder builder, double[] data) {
-        return createFieldsVector(builder, Js.<JsArray<Double>>uncheckedCast(data));
-    }
-
-    public static native double createSchema(
-            Builder builder,
-            int endianness,
-            double fieldsOffset,
-            double customMetadataOffset,
-            double featuresOffset);
-
-    public static native double endSchema(Builder builder);
-
-    public static native void finishSchemaBuffer(Builder builder, double offset);
-
-    public static native void finishSizePrefixedSchemaBuffer(Builder builder, double offset);
-
-    public static native Schema getRootAsSchema(ByteBuffer bb, Schema obj);
-
-    public static native Schema getRootAsSchema(ByteBuffer bb);
-
-    public static native Schema getSizePrefixedRootAsSchema(ByteBuffer bb, Schema obj);
-
-    public static native Schema getSizePrefixedRootAsSchema(ByteBuffer bb);
-
-    public static native void startCustomMetadataVector(Builder builder, double numElems);
-
-    public static native void startFeaturesVector(Builder builder, double numElems);
-
-    public static native void startFieldsVector(Builder builder, double numElems);
-
-    public static native void startSchema(Builder builder);
-
-    public ByteBuffer bb;
-    public double bb_pos;
-
-    public native Schema __init(double i, ByteBuffer bb);
-
-    public native KeyValue customMetadata(double index, KeyValue obj);
-
-    public native KeyValue customMetadata(double index);
-
-    public native double customMetadataLength();
-
-    public native int endianness();
-
-    public native Long features(double index);
-
-    public native double featuresLength();
-
-    public native Field fields(double index, Field obj);
-
-    public native Field fields(double index);
-
-    public native double fieldsLength();
-}
diff --git a/web/client-backplane/src/main/java/io/deephaven/javascript/proto/dhinternal/arrow/flight/flatbuf/schema_generated/org/apache/arrow/flatbuf/Struct_.java b/web/client-backplane/src/main/java/io/deephaven/javascript/proto/dhinternal/arrow/flight/flatbuf/schema_generated/org/apache/arrow/flatbuf/Struct_.java
deleted file mode 100644
index 62c88e3f8ae..00000000000
--- a/web/client-backplane/src/main/java/io/deephaven/javascript/proto/dhinternal/arrow/flight/flatbuf/schema_generated/org/apache/arrow/flatbuf/Struct_.java
+++ /dev/null
@@ -1,34 +0,0 @@
-//
-// Copyright (c) 2016-2024 Deephaven Data Labs and Patent Pending
-//
-package io.deephaven.javascript.proto.dhinternal.arrow.flight.flatbuf.schema_generated.org.apache.arrow.flatbuf;
-
-import io.deephaven.javascript.proto.dhinternal.flatbuffers.Builder;
-import io.deephaven.javascript.proto.dhinternal.flatbuffers.ByteBuffer;
-import jsinterop.annotations.JsPackage;
-import jsinterop.annotations.JsType;
-
-@JsType(
-        isNative = true,
-        name = "dhinternal.arrow.flight.flatbuf.Schema_generated.org.apache.arrow.flatbuf.Struct_",
-        namespace = JsPackage.GLOBAL)
-public class Struct_ {
-    public static native double createStruct_(Builder builder);
-
-    public static native double endStruct_(Builder builder);
-
-    public static native Struct_ getRootAsStruct_(ByteBuffer bb, Struct_ obj);
-
-    public static native Struct_ getRootAsStruct_(ByteBuffer bb);
-
-    public static native Struct_ getSizePrefixedRootAsStruct_(ByteBuffer bb, Struct_ obj);
-
-    public static native Struct_ getSizePrefixedRootAsStruct_(ByteBuffer bb);
-
-    public static native void startStruct_(Builder builder);
-
-    public ByteBuffer bb;
-    public double bb_pos;
-
-    public native Struct_ __init(double i, ByteBuffer bb);
-}
diff --git a/web/client-backplane/src/main/java/io/deephaven/javascript/proto/dhinternal/arrow/flight/flatbuf/schema_generated/org/apache/arrow/flatbuf/Time.java b/web/client-backplane/src/main/java/io/deephaven/javascript/proto/dhinternal/arrow/flight/flatbuf/schema_generated/org/apache/arrow/flatbuf/Time.java
deleted file mode 100644
index 0f40072c5dd..00000000000
--- a/web/client-backplane/src/main/java/io/deephaven/javascript/proto/dhinternal/arrow/flight/flatbuf/schema_generated/org/apache/arrow/flatbuf/Time.java
+++ /dev/null
@@ -1,42 +0,0 @@
-//
-// Copyright (c) 2016-2024 Deephaven Data Labs and Patent Pending
-//
-package io.deephaven.javascript.proto.dhinternal.arrow.flight.flatbuf.schema_generated.org.apache.arrow.flatbuf;
-
-import io.deephaven.javascript.proto.dhinternal.flatbuffers.Builder;
-import io.deephaven.javascript.proto.dhinternal.flatbuffers.ByteBuffer;
-import jsinterop.annotations.JsPackage;
-import jsinterop.annotations.JsType;
-
-@JsType(
-        isNative = true,
-        name = "dhinternal.arrow.flight.flatbuf.Schema_generated.org.apache.arrow.flatbuf.Time",
-        namespace = JsPackage.GLOBAL)
-public class Time {
-    public static native void addBitWidth(Builder builder, double bitWidth);
-
-    public static native void addUnit(Builder builder, int unit);
-
-    public static native double createTime(Builder builder, int unit, double bitWidth);
-
-    public static native double endTime(Builder builder);
-
-    public static native Time getRootAsTime(ByteBuffer bb, Time obj);
-
-    public static native Time getRootAsTime(ByteBuffer bb);
-
-    public static native Time getSizePrefixedRootAsTime(ByteBuffer bb, Time obj);
-
-    public static native Time getSizePrefixedRootAsTime(ByteBuffer bb);
-
-    public static native void startTime(Builder builder);
-
-    public ByteBuffer bb;
-    public double bb_pos;
-
-    public native Time __init(double i, ByteBuffer bb);
-
-    public native double bitWidth();
-
-    public native int unit();
-}
diff --git a/web/client-backplane/src/main/java/io/deephaven/javascript/proto/dhinternal/arrow/flight/flatbuf/schema_generated/org/apache/arrow/flatbuf/TimeUnit.java b/web/client-backplane/src/main/java/io/deephaven/javascript/proto/dhinternal/arrow/flight/flatbuf/schema_generated/org/apache/arrow/flatbuf/TimeUnit.java
deleted file mode 100644
index 780d7cc9e08..00000000000
--- a/web/client-backplane/src/main/java/io/deephaven/javascript/proto/dhinternal/arrow/flight/flatbuf/schema_generated/org/apache/arrow/flatbuf/TimeUnit.java
+++ /dev/null
@@ -1,18 +0,0 @@
-//
-// Copyright (c) 2016-2024 Deephaven Data Labs and Patent Pending
-//
-package io.deephaven.javascript.proto.dhinternal.arrow.flight.flatbuf.schema_generated.org.apache.arrow.flatbuf;
-
-import jsinterop.annotations.JsPackage;
-import jsinterop.annotations.JsType;
-
-@JsType(
-        isNative = true,
-        name = "dhinternal.arrow.flight.flatbuf.Schema_generated.org.apache.arrow.flatbuf.TimeUnit",
-        namespace = JsPackage.GLOBAL)
-public class TimeUnit {
-    public static int MICROSECOND,
-            MILLISECOND,
-            NANOSECOND,
-            SECOND;
-}
diff --git a/web/client-backplane/src/main/java/io/deephaven/javascript/proto/dhinternal/arrow/flight/flatbuf/schema_generated/org/apache/arrow/flatbuf/Timestamp.java b/web/client-backplane/src/main/java/io/deephaven/javascript/proto/dhinternal/arrow/flight/flatbuf/schema_generated/org/apache/arrow/flatbuf/Timestamp.java
deleted file mode 100644
index fa1ef0923ed..00000000000
--- a/web/client-backplane/src/main/java/io/deephaven/javascript/proto/dhinternal/arrow/flight/flatbuf/schema_generated/org/apache/arrow/flatbuf/Timestamp.java
+++ /dev/null
@@ -1,77 +0,0 @@
-//
-// Copyright (c) 2016-2024 Deephaven Data Labs and Patent Pending
-//
-package io.deephaven.javascript.proto.dhinternal.arrow.flight.flatbuf.schema_generated.org.apache.arrow.flatbuf;
-
-import elemental2.core.Uint8Array;
-import io.deephaven.javascript.proto.dhinternal.flatbuffers.Builder;
-import io.deephaven.javascript.proto.dhinternal.flatbuffers.ByteBuffer;
-import io.deephaven.javascript.proto.dhinternal.flatbuffers.Encoding;
-import jsinterop.annotations.JsOverlay;
-import jsinterop.annotations.JsPackage;
-import jsinterop.annotations.JsType;
-import jsinterop.base.Js;
-
-@JsType(
-        isNative = true,
-        name = "dhinternal.arrow.flight.flatbuf.Schema_generated.org.apache.arrow.flatbuf.Timestamp",
-        namespace = JsPackage.GLOBAL)
-public class Timestamp {
-    @JsType(isNative = true, name = "?", namespace = JsPackage.GLOBAL)
-    public interface TimezoneUnionType {
-        @JsOverlay
-        static Timestamp.TimezoneUnionType of(Object o) {
-            return Js.cast(o);
-        }
-
-        @JsOverlay
-        default String asString() {
-            return Js.asString(this);
-        }
-
-        @JsOverlay
-        default Uint8Array asUint8Array() {
-            return Js.cast(this);
-        }
-
-        @JsOverlay
-        default boolean isString() {
-            return (Object) this instanceof String;
-        }
-
-        @JsOverlay
-        default boolean isUint8Array() {
-            return (Object) this instanceof Uint8Array;
-        }
-    }
-
-    public static native void addTimezone(Builder builder, double timezoneOffset);
-
-    public static native void addUnit(Builder builder, int unit);
-
-    public static native double createTimestamp(
-            Builder builder, int unit, double timezoneOffset);
-
-    public static native double endTimestamp(Builder builder);
-
-    public static native Timestamp getRootAsTimestamp(ByteBuffer bb, Timestamp obj);
-
-    public static native Timestamp getRootAsTimestamp(ByteBuffer bb);
-
-    public static native Timestamp getSizePrefixedRootAsTimestamp(ByteBuffer bb, Timestamp obj);
-
-    public static native Timestamp getSizePrefixedRootAsTimestamp(ByteBuffer bb);
-
-    public static native void startTimestamp(Builder builder);
-
-    public ByteBuffer bb;
-    public double bb_pos;
-
-    public native Timestamp __init(double i, ByteBuffer bb);
-
-    public native Timestamp.TimezoneUnionType timezone();
-
-    public native Timestamp.TimezoneUnionType timezone(Encoding optionalEncoding);
-
-    public native int unit();
-}
diff --git a/web/client-backplane/src/main/java/io/deephaven/javascript/proto/dhinternal/arrow/flight/flatbuf/schema_generated/org/apache/arrow/flatbuf/Type.java b/web/client-backplane/src/main/java/io/deephaven/javascript/proto/dhinternal/arrow/flight/flatbuf/schema_generated/org/apache/arrow/flatbuf/Type.java
deleted file mode 100644
index 6336d2a547f..00000000000
--- a/web/client-backplane/src/main/java/io/deephaven/javascript/proto/dhinternal/arrow/flight/flatbuf/schema_generated/org/apache/arrow/flatbuf/Type.java
+++ /dev/null
@@ -1,36 +0,0 @@
-//
-// Copyright (c) 2016-2024 Deephaven Data Labs and Patent Pending
-//
-package io.deephaven.javascript.proto.dhinternal.arrow.flight.flatbuf.schema_generated.org.apache.arrow.flatbuf;
-
-import jsinterop.annotations.JsPackage;
-import jsinterop.annotations.JsType;
-
-@JsType(
-        isNative = true,
-        name = "dhinternal.arrow.flight.flatbuf.Schema_generated.org.apache.arrow.flatbuf.Type",
-        namespace = JsPackage.GLOBAL)
-public class Type {
-    public static int Binary,
-            Bool,
-            Date,
-            Decimal,
-            Duration,
-            FixedSizeBinary,
-            FixedSizeList,
-            FloatingPoint,
-            Int,
-            Interval,
-            LargeBinary,
-            LargeList,
-            LargeUtf8,
-            List,
-            Map,
-            NONE,
-            Null,
-            Struct_,
-            Time,
-            Timestamp,
-            Union,
-            Utf8;
-}
diff --git a/web/client-backplane/src/main/java/io/deephaven/javascript/proto/dhinternal/arrow/flight/flatbuf/schema_generated/org/apache/arrow/flatbuf/Union.java b/web/client-backplane/src/main/java/io/deephaven/javascript/proto/dhinternal/arrow/flight/flatbuf/schema_generated/org/apache/arrow/flatbuf/Union.java
deleted file mode 100644
index a3ff98e8975..00000000000
--- a/web/client-backplane/src/main/java/io/deephaven/javascript/proto/dhinternal/arrow/flight/flatbuf/schema_generated/org/apache/arrow/flatbuf/Union.java
+++ /dev/null
@@ -1,122 +0,0 @@
-//
-// Copyright (c) 2016-2024 Deephaven Data Labs and Patent Pending
-//
-package io.deephaven.javascript.proto.dhinternal.arrow.flight.flatbuf.schema_generated.org.apache.arrow.flatbuf;
-
-import elemental2.core.Int32Array;
-import elemental2.core.JsArray;
-import elemental2.core.Uint8Array;
-import io.deephaven.javascript.proto.dhinternal.flatbuffers.Builder;
-import io.deephaven.javascript.proto.dhinternal.flatbuffers.ByteBuffer;
-import jsinterop.annotations.JsOverlay;
-import jsinterop.annotations.JsPackage;
-import jsinterop.annotations.JsType;
-import jsinterop.base.Js;
-
-@JsType(
-        isNative = true,
-        name = "dhinternal.arrow.flight.flatbuf.Schema_generated.org.apache.arrow.flatbuf.Union",
-        namespace = JsPackage.GLOBAL)
-public class Union {
-    @JsType(isNative = true, name = "?", namespace = JsPackage.GLOBAL)
-    public interface CreateTypeIdsVectorDataUnionType {
-        @JsOverlay
-        static Union.CreateTypeIdsVectorDataUnionType of(Object o) {
-            return Js.cast(o);
-        }
-
-        @JsOverlay
-        default Int32Array asInt32Array() {
-            return Js.cast(this);
-        }
-
-        @JsOverlay
-        default JsArray<Double> asJsArray() {
-            return Js.cast(this);
-        }
-
-        @JsOverlay
-        default Uint8Array asUint8Array() {
-            return Js.cast(this);
-        }
-
-        @JsOverlay
-        default boolean isInt32Array() {
-            return (Object) this instanceof Int32Array;
-        }
-
-        @JsOverlay
-        default boolean isJsArray() {
-            return (Object) this instanceof JsArray;
-        }
-
-        @JsOverlay
-        default boolean isUint8Array() {
-            return (Object) this instanceof Uint8Array;
-        }
-    }
-
-    public static native void addMode(Builder builder, int mode);
-
-    public static native void addTypeIds(Builder builder, double typeIdsOffset);
-
-    @Deprecated
-    public static native double createTypeIdsVector(
-            Builder builder, Union.CreateTypeIdsVectorDataUnionType data);
-
-    @JsOverlay
-    @Deprecated
-    public static final double createTypeIdsVector(Builder builder, Int32Array data) {
-        return createTypeIdsVector(
-                builder, Js.<Union.CreateTypeIdsVectorDataUnionType>uncheckedCast(data));
-    }
-
-    @JsOverlay
-    @Deprecated
-    public static final double createTypeIdsVector(Builder builder, JsArray<Double> data) {
-        return createTypeIdsVector(
-                builder, Js.<Union.CreateTypeIdsVectorDataUnionType>uncheckedCast(data));
-    }
-
-    @JsOverlay
-    @Deprecated
-    public static final double createTypeIdsVector(Builder builder, Uint8Array data) {
-        return createTypeIdsVector(
-                builder, Js.<Union.CreateTypeIdsVectorDataUnionType>uncheckedCast(data));
-    }
-
-    @JsOverlay
-    @Deprecated
-    public static final double createTypeIdsVector(Builder builder, double[] data) {
-        return createTypeIdsVector(builder, Js.<JsArray<Double>>uncheckedCast(data));
-    }
-
-    public static native double createUnion(Builder builder, int mode, double typeIdsOffset);
-
-    public static native double endUnion(Builder builder);
-
-    public static native Union getRootAsUnion(ByteBuffer bb, Union obj);
-
-    public static native Union getRootAsUnion(ByteBuffer bb);
-
-    public static native Union getSizePrefixedRootAsUnion(ByteBuffer bb, Union obj);
-
-    public static native Union getSizePrefixedRootAsUnion(ByteBuffer bb);
-
-    public static native void startTypeIdsVector(Builder builder, double numElems);
-
-    public static native void startUnion(Builder builder);
-
-    public ByteBuffer bb;
-    public double bb_pos;
-
-    public native Union __init(double i, ByteBuffer bb);
-
-    public native int mode();
-
-    public native double typeIds(double index);
-
-    public native Int32Array typeIdsArray();
-
-    public native double typeIdsLength();
-}
diff --git a/web/client-backplane/src/main/java/io/deephaven/javascript/proto/dhinternal/arrow/flight/flatbuf/schema_generated/org/apache/arrow/flatbuf/UnionMode.java b/web/client-backplane/src/main/java/io/deephaven/javascript/proto/dhinternal/arrow/flight/flatbuf/schema_generated/org/apache/arrow/flatbuf/UnionMode.java
deleted file mode 100644
index 30553887de2..00000000000
--- a/web/client-backplane/src/main/java/io/deephaven/javascript/proto/dhinternal/arrow/flight/flatbuf/schema_generated/org/apache/arrow/flatbuf/UnionMode.java
+++ /dev/null
@@ -1,16 +0,0 @@
-//
-// Copyright (c) 2016-2024 Deephaven Data Labs and Patent Pending
-//
-package io.deephaven.javascript.proto.dhinternal.arrow.flight.flatbuf.schema_generated.org.apache.arrow.flatbuf;
-
-import jsinterop.annotations.JsPackage;
-import jsinterop.annotations.JsType;
-
-@JsType(
-        isNative = true,
-        name = "dhinternal.arrow.flight.flatbuf.Schema_generated.org.apache.arrow.flatbuf.UnionMode",
-        namespace = JsPackage.GLOBAL)
-public class UnionMode {
-    public static int Dense,
-            Sparse;
-}
diff --git a/web/client-backplane/src/main/java/io/deephaven/javascript/proto/dhinternal/arrow/flight/flatbuf/schema_generated/org/apache/arrow/flatbuf/Utf8.java b/web/client-backplane/src/main/java/io/deephaven/javascript/proto/dhinternal/arrow/flight/flatbuf/schema_generated/org/apache/arrow/flatbuf/Utf8.java
deleted file mode 100644
index 1149f1f8977..00000000000
--- a/web/client-backplane/src/main/java/io/deephaven/javascript/proto/dhinternal/arrow/flight/flatbuf/schema_generated/org/apache/arrow/flatbuf/Utf8.java
+++ /dev/null
@@ -1,34 +0,0 @@
-//
-// Copyright (c) 2016-2024 Deephaven Data Labs and Patent Pending
-//
-package io.deephaven.javascript.proto.dhinternal.arrow.flight.flatbuf.schema_generated.org.apache.arrow.flatbuf;
-
-import io.deephaven.javascript.proto.dhinternal.flatbuffers.Builder;
-import io.deephaven.javascript.proto.dhinternal.flatbuffers.ByteBuffer;
-import jsinterop.annotations.JsPackage;
-import jsinterop.annotations.JsType;
-
-@JsType(
-        isNative = true,
-        name = "dhinternal.arrow.flight.flatbuf.Schema_generated.org.apache.arrow.flatbuf.Utf8",
-        namespace = JsPackage.GLOBAL)
-public class Utf8 {
-    public static native double createUtf8(Builder builder);
-
-    public static native double endUtf8(Builder builder);
-
-    public static native Utf8 getRootAsUtf8(ByteBuffer bb, Utf8 obj);
-
-    public static native Utf8 getRootAsUtf8(ByteBuffer bb);
-
-    public static native Utf8 getSizePrefixedRootAsUtf8(ByteBuffer bb, Utf8 obj);
-
-    public static native Utf8 getSizePrefixedRootAsUtf8(ByteBuffer bb);
-
-    public static native void startUtf8(Builder builder);
-
-    public ByteBuffer bb;
-    public double bb_pos;
-
-    public native Utf8 __init(double i, ByteBuffer bb);
-}
diff --git a/web/client-backplane/src/main/java/io/deephaven/javascript/proto/dhinternal/flatbuffers/Builder.java b/web/client-backplane/src/main/java/io/deephaven/javascript/proto/dhinternal/flatbuffers/Builder.java
deleted file mode 100644
index 0c9118583d8..00000000000
--- a/web/client-backplane/src/main/java/io/deephaven/javascript/proto/dhinternal/flatbuffers/Builder.java
+++ /dev/null
@@ -1,143 +0,0 @@
-//
-// Copyright (c) 2016-2024 Deephaven Data Labs and Patent Pending
-//
-package io.deephaven.javascript.proto.dhinternal.flatbuffers;
-
-import elemental2.core.Uint8Array;
-import jsinterop.annotations.JsOverlay;
-import jsinterop.annotations.JsPackage;
-import jsinterop.annotations.JsType;
-import jsinterop.base.Js;
-
-@JsType(isNative = true, name = "dhinternal.flatbuffers.Builder", namespace = JsPackage.GLOBAL)
-public class Builder {
-    @JsType(isNative = true, name = "?", namespace = JsPackage.GLOBAL)
-    public interface CreateStringSUnionType {
-        @JsOverlay
-        static Builder.CreateStringSUnionType of(Object o) {
-            return Js.cast(o);
-        }
-
-        @JsOverlay
-        default String asString() {
-            return Js.asString(this);
-        }
-
-        @JsOverlay
-        default Uint8Array asUint8Array() {
-            return Js.cast(this);
-        }
-
-        @JsOverlay
-        default boolean isString() {
-            return (Object) this instanceof String;
-        }
-
-        @JsOverlay
-        default boolean isUint8Array() {
-            return (Object) this instanceof Uint8Array;
-        }
-    }
-
-    public static native ByteBuffer growByteBuffer(ByteBuffer bb);
-
-    public Builder() {}
-
-    public Builder(double initial_size) {}
-
-    public native void addFieldFloat32(double voffset, double value, double defaultValue);
-
-    public native void addFieldFloat64(double voffset, double value, double defaultValue);
-
-    public native void addFieldInt16(double voffset, double value, double defaultValue);
-
-    public native void addFieldInt32(double voffset, double value, double defaultValue);
-
-    public native void addFieldInt64(double voffset, Long value, Long defaultValue);
-
-    public native void addFieldInt8(double voffset, double value, double defaultValue);
-
-    public native void addFieldOffset(double voffset, double value, double defaultValue);
-
-    public native void addFieldStruct(double voffset, double value, double defaultValue);
-
-    public native void addFloat32(double value);
-
-    public native void addFloat64(double value);
-
-    public native void addInt16(double value);
-
-    public native void addInt32(double value);
-
-    public native void addInt64(Long value);
-
-    public native void addInt8(double value);
-
-    public native void addOffset(double offset);
-
-    public native Uint8Array asUint8Array();
-
-    public native void clear();
-
-    public native Long createLong(double low, double high);
-
-    public native double createString(Builder.CreateStringSUnionType s);
-
-    @JsOverlay
-    public final double createString(String s) {
-        return createString(Js.<Builder.CreateStringSUnionType>uncheckedCast(s));
-    }
-
-    @JsOverlay
-    public final double createString(Uint8Array s) {
-        return createString(Js.<Builder.CreateStringSUnionType>uncheckedCast(s));
-    }
-
-    public native ByteBuffer dataBuffer();
-
-    public native double endObject();
-
-    public native double endVector();
-
-    public native void finish(double root_table, String file_identifier, boolean size_prefix);
-
-    public native void finish(double root_table, String file_identifier);
-
-    public native void finish(double root_table);
-
-    public native void finishSizePrefixed(double root_table, String file_identifier);
-
-    public native void finishSizePrefixed(double root_table);
-
-    public native void forceDefaults(boolean forceDefaults);
-
-    public native void nested(double obj);
-
-    public native void notNested();
-
-    public native double offset();
-
-    public native void pad(double byte_size);
-
-    public native void prep(double size, double additional_bytes);
-
-    public native void requiredField(double table, double field);
-
-    public native void slot(double voffset);
-
-    public native void startObject(double numfields);
-
-    public native void startVector(double elem_size, double num_elems, double alignment);
-
-    public native void writeFloat32(double value);
-
-    public native void writeFloat64(double value);
-
-    public native void writeInt16(double value);
-
-    public native void writeInt32(double value);
-
-    public native void writeInt64(Long value);
-
-    public native void writeInt8(double value);
-}
diff --git a/web/client-backplane/src/main/java/io/deephaven/javascript/proto/dhinternal/flatbuffers/ByteBuffer.java b/web/client-backplane/src/main/java/io/deephaven/javascript/proto/dhinternal/flatbuffers/ByteBuffer.java
deleted file mode 100644
index 85a71935d92..00000000000
--- a/web/client-backplane/src/main/java/io/deephaven/javascript/proto/dhinternal/flatbuffers/ByteBuffer.java
+++ /dev/null
@@ -1,115 +0,0 @@
-//
-// Copyright (c) 2016-2024 Deephaven Data Labs and Patent Pending
-//
-package io.deephaven.javascript.proto.dhinternal.flatbuffers;
-
-import elemental2.core.Uint8Array;
-import jsinterop.annotations.JsOverlay;
-import jsinterop.annotations.JsPackage;
-import jsinterop.annotations.JsType;
-import jsinterop.base.Js;
-
-@JsType(isNative = true, name = "dhinternal.flatbuffers.ByteBuffer", namespace = JsPackage.GLOBAL)
-public class ByteBuffer {
-    @JsType(isNative = true, name = "?", namespace = JsPackage.GLOBAL)
-    public interface __stringUnionType {
-        @JsOverlay
-        static ByteBuffer.__stringUnionType of(Object o) {
-            return Js.cast(o);
-        }
-
-        @JsOverlay
-        default String asString() {
-            return Js.asString(this);
-        }
-
-        @JsOverlay
-        default Uint8Array asUint8Array() {
-            return Js.cast(this);
-        }
-
-        @JsOverlay
-        default boolean isString() {
-            return (Object) this instanceof String;
-        }
-
-        @JsOverlay
-        default boolean isUint8Array() {
-            return (Object) this instanceof Uint8Array;
-        }
-    }
-
-    public static native ByteBuffer allocate(double byte_size);
-
-    public ByteBuffer(Uint8Array bytes) {}
-
-    public native boolean __has_identifier(String ident);
-
-    public native double __indirect(double offset);
-
-    public native double __offset(double bb_pos, double vtable_offset);
-
-    public native ByteBuffer.__stringUnionType __string(double offset, int optionalEncoding);
-
-    public native ByteBuffer.__stringUnionType __string(double offset);
-
-    public native <T> T __union(T t, double offset);
-
-    public native double __vector(double offset);
-
-    public native double __vector_len(double offset);
-
-    public native Uint8Array bytes();
-
-    public native double capacity();
-
-    public native void clear();
-
-    public native Long createLong(double low, double high);
-
-    public native String getBufferIdentifier();
-
-    public native double position();
-
-    public native double readFloat32(double offset);
-
-    public native double readFloat64(double offset);
-
-    public native double readInt16(double offset);
-
-    public native double readInt32(double offset);
-
-    public native Long readInt64(double offset);
-
-    public native double readInt8(double offset);
-
-    public native double readUint16(double offset);
-
-    public native double readUint32(double offset);
-
-    public native Long readUint64(double offset);
-
-    public native double readUint8(double offset);
-
-    public native void setPosition(double position);
-
-    public native void writeFloat32(double offset, double value);
-
-    public native void writeFloat64(double offset, double value);
-
-    public native void writeInt16(double offset, double value);
-
-    public native void writeInt32(double offset, double value);
-
-    public native void writeInt64(double offset, Long value);
-
-    public native void writeInt8(double offset, double value);
-
-    public native void writeUint16(double offset, double value);
-
-    public native void writeUint32(double offset, double value);
-
-    public native void writeUint64(double offset, Long value);
-
-    public native void writeUint8(double offset, double value);
-}
diff --git a/web/client-backplane/src/main/java/io/deephaven/javascript/proto/dhinternal/flatbuffers/Encoding.java b/web/client-backplane/src/main/java/io/deephaven/javascript/proto/dhinternal/flatbuffers/Encoding.java
deleted file mode 100644
index be269d6968a..00000000000
--- a/web/client-backplane/src/main/java/io/deephaven/javascript/proto/dhinternal/flatbuffers/Encoding.java
+++ /dev/null
@@ -1,13 +0,0 @@
-//
-// Copyright (c) 2016-2024 Deephaven Data Labs and Patent Pending
-//
-package io.deephaven.javascript.proto.dhinternal.flatbuffers;
-
-import jsinterop.annotations.JsPackage;
-import jsinterop.annotations.JsType;
-
-@JsType(isNative = true, name = "dhinternal.flatbuffers.Encoding", namespace = JsPackage.GLOBAL)
-public class Encoding {
-    public static int UTF16_STRING,
-            UTF8_BYTES;
-}
diff --git a/web/client-backplane/src/main/java/io/deephaven/javascript/proto/dhinternal/flatbuffers/Long.java b/web/client-backplane/src/main/java/io/deephaven/javascript/proto/dhinternal/flatbuffers/Long.java
deleted file mode 100644
index e7551a82d7d..00000000000
--- a/web/client-backplane/src/main/java/io/deephaven/javascript/proto/dhinternal/flatbuffers/Long.java
+++ /dev/null
@@ -1,25 +0,0 @@
-//
-// Copyright (c) 2016-2024 Deephaven Data Labs and Patent Pending
-//
-package io.deephaven.javascript.proto.dhinternal.flatbuffers;
-
-import jsinterop.annotations.JsMethod;
-import jsinterop.annotations.JsPackage;
-import jsinterop.annotations.JsType;
-
-@JsType(isNative = true, name = "dhinternal.flatbuffers.Long", namespace = JsPackage.GLOBAL)
-public class Long {
-    public static Long ZERO;
-
-    public static native Long create(double low, double high);
-
-    public double high;
-    public double low;
-
-    public Long(double low, double high) {}
-
-    @JsMethod(name = "equals")
-    public native boolean equals_(Object other);
-
-    public native double toFloat64();
-}
diff --git a/web/client-backplane/src/main/java/io/deephaven/javascript/proto/dhinternal/flatbuffers/Table.java b/web/client-backplane/src/main/java/io/deephaven/javascript/proto/dhinternal/flatbuffers/Table.java
deleted file mode 100644
index e2dcada04fb..00000000000
--- a/web/client-backplane/src/main/java/io/deephaven/javascript/proto/dhinternal/flatbuffers/Table.java
+++ /dev/null
@@ -1,31 +0,0 @@
-//
-// Copyright (c) 2016-2024 Deephaven Data Labs and Patent Pending
-//
-package io.deephaven.javascript.proto.dhinternal.flatbuffers;
-
-import jsinterop.annotations.JsOverlay;
-import jsinterop.annotations.JsPackage;
-import jsinterop.annotations.JsProperty;
-import jsinterop.annotations.JsType;
-import jsinterop.base.Js;
-import jsinterop.base.JsPropertyMap;
-
-@JsType(isNative = true, name = "dhinternal.flatbuffers.Table", namespace = JsPackage.GLOBAL)
-public interface Table {
-    @JsOverlay
-    static Table create() {
-        return Js.uncheckedCast(JsPropertyMap.of());
-    }
-
-    @JsProperty
-    ByteBuffer getBb();
-
-    @JsProperty
-    double getBb_pos();
-
-    @JsProperty
-    void setBb(ByteBuffer bb);
-
-    @JsProperty
-    void setBb_pos(double bb_pos);
-}
diff --git a/web/client-backplane/src/main/java/io/deephaven/javascript/proto/dhinternal/grpcweb/transports/transport/TransportOptions.java b/web/client-backplane/src/main/java/io/deephaven/javascript/proto/dhinternal/grpcweb/transports/transport/TransportOptions.java
index 7bb39eda843..d9162713094 100644
--- a/web/client-backplane/src/main/java/io/deephaven/javascript/proto/dhinternal/grpcweb/transports/transport/TransportOptions.java
+++ b/web/client-backplane/src/main/java/io/deephaven/javascript/proto/dhinternal/grpcweb/transports/transport/TransportOptions.java
@@ -33,7 +33,7 @@ public interface OnEndFn {
 
     @JsFunction
     public interface OnHeadersFn {
-        void onInvoke(BrowserHeaders p0, double p1);
+        void onInvoke(BrowserHeaders p0, int p1);
     }
 
     @JsOverlay
diff --git a/web/client-backplane/src/main/java/io/deephaven/javascript/proto/dhinternal/io/deephaven/barrage/flatbuf/barrage_generated/io/deephaven/barrage/flatbuf/BarrageMessageType.java b/web/client-backplane/src/main/java/io/deephaven/javascript/proto/dhinternal/io/deephaven/barrage/flatbuf/barrage_generated/io/deephaven/barrage/flatbuf/BarrageMessageType.java
deleted file mode 100644
index 9dc50f672a7..00000000000
--- a/web/client-backplane/src/main/java/io/deephaven/javascript/proto/dhinternal/io/deephaven/barrage/flatbuf/barrage_generated/io/deephaven/barrage/flatbuf/BarrageMessageType.java
+++ /dev/null
@@ -1,23 +0,0 @@
-//
-// Copyright (c) 2016-2024 Deephaven Data Labs and Patent Pending
-//
-package io.deephaven.javascript.proto.dhinternal.io.deephaven.barrage.flatbuf.barrage_generated.io.deephaven.barrage.flatbuf;
-
-import jsinterop.annotations.JsPackage;
-import jsinterop.annotations.JsType;
-
-@JsType(
-        isNative = true,
-        name = "dhinternal.io.deephaven.barrage.flatbuf.Barrage_generated.io.deephaven.barrage.flatbuf.BarrageMessageType",
-        namespace = JsPackage.GLOBAL)
-public class BarrageMessageType {
-    public static int BarragePublicationRequest,
-            BarrageSerializationOptions,
-            BarrageSnapshotRequest,
-            BarrageSubscriptionRequest,
-            BarrageUpdateMetadata,
-            NewSessionRequest,
-            None,
-            RefreshSessionRequest,
-            SessionInfoResponse;
-}
diff --git a/web/client-backplane/src/main/java/io/deephaven/javascript/proto/dhinternal/io/deephaven/barrage/flatbuf/barrage_generated/io/deephaven/barrage/flatbuf/BarrageMessageWrapper.java b/web/client-backplane/src/main/java/io/deephaven/javascript/proto/dhinternal/io/deephaven/barrage/flatbuf/barrage_generated/io/deephaven/barrage/flatbuf/BarrageMessageWrapper.java
deleted file mode 100644
index 7de97b929cd..00000000000
--- a/web/client-backplane/src/main/java/io/deephaven/javascript/proto/dhinternal/io/deephaven/barrage/flatbuf/barrage_generated/io/deephaven/barrage/flatbuf/BarrageMessageWrapper.java
+++ /dev/null
@@ -1,130 +0,0 @@
-//
-// Copyright (c) 2016-2024 Deephaven Data Labs and Patent Pending
-//
-package io.deephaven.javascript.proto.dhinternal.io.deephaven.barrage.flatbuf.barrage_generated.io.deephaven.barrage.flatbuf;
-
-import elemental2.core.Int8Array;
-import elemental2.core.JsArray;
-import elemental2.core.Uint8Array;
-import io.deephaven.javascript.proto.dhinternal.flatbuffers.Builder;
-import io.deephaven.javascript.proto.dhinternal.flatbuffers.ByteBuffer;
-import jsinterop.annotations.JsOverlay;
-import jsinterop.annotations.JsPackage;
-import jsinterop.annotations.JsType;
-import jsinterop.base.Js;
-
-@JsType(
-        isNative = true,
-        name = "dhinternal.io.deephaven.barrage.flatbuf.Barrage_generated.io.deephaven.barrage.flatbuf.BarrageMessageWrapper",
-        namespace = JsPackage.GLOBAL)
-public class BarrageMessageWrapper {
-    @JsType(isNative = true, name = "?", namespace = JsPackage.GLOBAL)
-    public interface CreateMsgPayloadVectorDataUnionType {
-        @JsOverlay
-        static BarrageMessageWrapper.CreateMsgPayloadVectorDataUnionType of(Object o) {
-            return Js.cast(o);
-        }
-
-        @JsOverlay
-        default Int8Array asInt8Array() {
-            return Js.cast(this);
-        }
-
-        @JsOverlay
-        default JsArray<Double> asJsArray() {
-            return Js.cast(this);
-        }
-
-        @JsOverlay
-        default Uint8Array asUint8Array() {
-            return Js.cast(this);
-        }
-
-        @JsOverlay
-        default boolean isInt8Array() {
-            return (Object) this instanceof Int8Array;
-        }
-
-        @JsOverlay
-        default boolean isJsArray() {
-            return (Object) this instanceof JsArray;
-        }
-
-        @JsOverlay
-        default boolean isUint8Array() {
-            return (Object) this instanceof Uint8Array;
-        }
-    }
-
-    public static native void addMagic(Builder builder, double magic);
-
-    public static native void addMsgPayload(Builder builder, double msgPayloadOffset);
-
-    public static native void addMsgType(Builder builder, int msgType);
-
-    public static native double createBarrageMessageWrapper(
-            Builder builder, double magic, int msgType, double msgPayloadOffset);
-
-    @Deprecated
-    public static native double createMsgPayloadVector(
-            Builder builder, BarrageMessageWrapper.CreateMsgPayloadVectorDataUnionType data);
-
-    @JsOverlay
-    @Deprecated
-    public static final double createMsgPayloadVector(Builder builder, Int8Array data) {
-        return createMsgPayloadVector(
-                builder, Js.<BarrageMessageWrapper.CreateMsgPayloadVectorDataUnionType>uncheckedCast(data));
-    }
-
-    @JsOverlay
-    @Deprecated
-    public static final double createMsgPayloadVector(Builder builder, JsArray<Double> data) {
-        return createMsgPayloadVector(
-                builder, Js.<BarrageMessageWrapper.CreateMsgPayloadVectorDataUnionType>uncheckedCast(data));
-    }
-
-    @JsOverlay
-    @Deprecated
-    public static final double createMsgPayloadVector(Builder builder, Uint8Array data) {
-        return createMsgPayloadVector(
-                builder, Js.<BarrageMessageWrapper.CreateMsgPayloadVectorDataUnionType>uncheckedCast(data));
-    }
-
-    @JsOverlay
-    @Deprecated
-    public static final double createMsgPayloadVector(Builder builder, double[] data) {
-        return createMsgPayloadVector(builder, Js.<JsArray<Double>>uncheckedCast(data));
-    }
-
-    public static native double endBarrageMessageWrapper(Builder builder);
-
-    public static native BarrageMessageWrapper getRootAsBarrageMessageWrapper(
-            ByteBuffer bb, BarrageMessageWrapper obj);
-
-    public static native BarrageMessageWrapper getRootAsBarrageMessageWrapper(ByteBuffer bb);
-
-    public static native BarrageMessageWrapper getSizePrefixedRootAsBarrageMessageWrapper(
-            ByteBuffer bb, BarrageMessageWrapper obj);
-
-    public static native BarrageMessageWrapper getSizePrefixedRootAsBarrageMessageWrapper(
-            ByteBuffer bb);
-
-    public static native void startBarrageMessageWrapper(Builder builder);
-
-    public static native void startMsgPayloadVector(Builder builder, double numElems);
-
-    public ByteBuffer bb;
-    public double bb_pos;
-
-    public native BarrageMessageWrapper __init(double i, ByteBuffer bb);
-
-    public native double magic();
-
-    public native double msgPayload(double index);
-
-    public native Int8Array msgPayloadArray();
-
-    public native double msgPayloadLength();
-
-    public native int msgType();
-}
diff --git a/web/client-backplane/src/main/java/io/deephaven/javascript/proto/dhinternal/io/deephaven/barrage/flatbuf/barrage_generated/io/deephaven/barrage/flatbuf/BarrageModColumnMetadata.java b/web/client-backplane/src/main/java/io/deephaven/javascript/proto/dhinternal/io/deephaven/barrage/flatbuf/barrage_generated/io/deephaven/barrage/flatbuf/BarrageModColumnMetadata.java
deleted file mode 100644
index 076793a4be2..00000000000
--- a/web/client-backplane/src/main/java/io/deephaven/javascript/proto/dhinternal/io/deephaven/barrage/flatbuf/barrage_generated/io/deephaven/barrage/flatbuf/BarrageModColumnMetadata.java
+++ /dev/null
@@ -1,125 +0,0 @@
-//
-// Copyright (c) 2016-2024 Deephaven Data Labs and Patent Pending
-//
-package io.deephaven.javascript.proto.dhinternal.io.deephaven.barrage.flatbuf.barrage_generated.io.deephaven.barrage.flatbuf;
-
-import elemental2.core.Int8Array;
-import elemental2.core.JsArray;
-import elemental2.core.Uint8Array;
-import io.deephaven.javascript.proto.dhinternal.flatbuffers.Builder;
-import io.deephaven.javascript.proto.dhinternal.flatbuffers.ByteBuffer;
-import jsinterop.annotations.JsOverlay;
-import jsinterop.annotations.JsPackage;
-import jsinterop.annotations.JsType;
-import jsinterop.base.Js;
-
-@JsType(
-        isNative = true,
-        name = "dhinternal.io.deephaven.barrage.flatbuf.Barrage_generated.io.deephaven.barrage.flatbuf.BarrageModColumnMetadata",
-        namespace = JsPackage.GLOBAL)
-public class BarrageModColumnMetadata {
-    @JsType(isNative = true, name = "?", namespace = JsPackage.GLOBAL)
-    public interface CreateModifiedRowsVectorDataUnionType {
-        @JsOverlay
-        static BarrageModColumnMetadata.CreateModifiedRowsVectorDataUnionType of(Object o) {
-            return Js.cast(o);
-        }
-
-        @JsOverlay
-        default Int8Array asInt8Array() {
-            return Js.cast(this);
-        }
-
-        @JsOverlay
-        default JsArray<Double> asJsArray() {
-            return Js.cast(this);
-        }
-
-        @JsOverlay
-        default Uint8Array asUint8Array() {
-            return Js.cast(this);
-        }
-
-        @JsOverlay
-        default boolean isInt8Array() {
-            return (Object) this instanceof Int8Array;
-        }
-
-        @JsOverlay
-        default boolean isJsArray() {
-            return (Object) this instanceof JsArray;
-        }
-
-        @JsOverlay
-        default boolean isUint8Array() {
-            return (Object) this instanceof Uint8Array;
-        }
-    }
-
-    public static native void addModifiedRows(Builder builder, double modifiedRowsOffset);
-
-    public static native double createBarrageModColumnMetadata(
-            Builder builder, double modifiedRowsOffset);
-
-    @Deprecated
-    public static native double createModifiedRowsVector(
-            Builder builder, BarrageModColumnMetadata.CreateModifiedRowsVectorDataUnionType data);
-
-    @JsOverlay
-    @Deprecated
-    public static final double createModifiedRowsVector(Builder builder, Int8Array data) {
-        return createModifiedRowsVector(
-                builder,
-                Js.<BarrageModColumnMetadata.CreateModifiedRowsVectorDataUnionType>uncheckedCast(data));
-    }
-
-    @JsOverlay
-    @Deprecated
-    public static final double createModifiedRowsVector(Builder builder, JsArray<Double> data) {
-        return createModifiedRowsVector(
-                builder,
-                Js.<BarrageModColumnMetadata.CreateModifiedRowsVectorDataUnionType>uncheckedCast(data));
-    }
-
-    @JsOverlay
-    @Deprecated
-    public static final double createModifiedRowsVector(Builder builder, Uint8Array data) {
-        return createModifiedRowsVector(
-                builder,
-                Js.<BarrageModColumnMetadata.CreateModifiedRowsVectorDataUnionType>uncheckedCast(data));
-    }
-
-    @JsOverlay
-    @Deprecated
-    public static final double createModifiedRowsVector(Builder builder, double[] data) {
-        return createModifiedRowsVector(builder, Js.<JsArray<Double>>uncheckedCast(data));
-    }
-
-    public static native double endBarrageModColumnMetadata(Builder builder);
-
-    public static native BarrageModColumnMetadata getRootAsBarrageModColumnMetadata(
-            ByteBuffer bb, BarrageModColumnMetadata obj);
-
-    public static native BarrageModColumnMetadata getRootAsBarrageModColumnMetadata(ByteBuffer bb);
-
-    public static native BarrageModColumnMetadata getSizePrefixedRootAsBarrageModColumnMetadata(
-            ByteBuffer bb, BarrageModColumnMetadata obj);
-
-    public static native BarrageModColumnMetadata getSizePrefixedRootAsBarrageModColumnMetadata(
-            ByteBuffer bb);
-
-    public static native void startBarrageModColumnMetadata(Builder builder);
-
-    public static native void startModifiedRowsVector(Builder builder, double numElems);
-
-    public ByteBuffer bb;
-    public double bb_pos;
-
-    public native BarrageModColumnMetadata __init(double i, ByteBuffer bb);
-
-    public native double modifiedRows(double index);
-
-    public native Int8Array modifiedRowsArray();
-
-    public native double modifiedRowsLength();
-}
diff --git a/web/client-backplane/src/main/java/io/deephaven/javascript/proto/dhinternal/io/deephaven/barrage/flatbuf/barrage_generated/io/deephaven/barrage/flatbuf/BarragePublicationOptions.java b/web/client-backplane/src/main/java/io/deephaven/javascript/proto/dhinternal/io/deephaven/barrage/flatbuf/barrage_generated/io/deephaven/barrage/flatbuf/BarragePublicationOptions.java
deleted file mode 100644
index 0726110f013..00000000000
--- a/web/client-backplane/src/main/java/io/deephaven/javascript/proto/dhinternal/io/deephaven/barrage/flatbuf/barrage_generated/io/deephaven/barrage/flatbuf/BarragePublicationOptions.java
+++ /dev/null
@@ -1,42 +0,0 @@
-//
-// Copyright (c) 2016-2024 Deephaven Data Labs and Patent Pending
-//
-package io.deephaven.javascript.proto.dhinternal.io.deephaven.barrage.flatbuf.barrage_generated.io.deephaven.barrage.flatbuf;
-
-import io.deephaven.javascript.proto.dhinternal.flatbuffers.Builder;
-import io.deephaven.javascript.proto.dhinternal.flatbuffers.ByteBuffer;
-import jsinterop.annotations.JsPackage;
-import jsinterop.annotations.JsType;
-
-@JsType(
-        isNative = true,
-        name = "dhinternal.io.deephaven.barrage.flatbuf.Barrage_generated.io.deephaven.barrage.flatbuf.BarragePublicationOptions",
-        namespace = JsPackage.GLOBAL)
-public class BarragePublicationOptions {
-    public static native void addUseDeephavenNulls(Builder builder, boolean useDeephavenNulls);
-
-    public static native double createBarragePublicationOptions(
-            Builder builder, boolean useDeephavenNulls);
-
-    public static native double endBarragePublicationOptions(Builder builder);
-
-    public static native BarragePublicationOptions getRootAsBarragePublicationOptions(
-            ByteBuffer bb, BarragePublicationOptions obj);
-
-    public static native BarragePublicationOptions getRootAsBarragePublicationOptions(ByteBuffer bb);
-
-    public static native BarragePublicationOptions getSizePrefixedRootAsBarragePublicationOptions(
-            ByteBuffer bb, BarragePublicationOptions obj);
-
-    public static native BarragePublicationOptions getSizePrefixedRootAsBarragePublicationOptions(
-            ByteBuffer bb);
-
-    public static native void startBarragePublicationOptions(Builder builder);
-
-    public ByteBuffer bb;
-    public double bb_pos;
-
-    public native BarragePublicationOptions __init(double i, ByteBuffer bb);
-
-    public native boolean useDeephavenNulls();
-}
diff --git a/web/client-backplane/src/main/java/io/deephaven/javascript/proto/dhinternal/io/deephaven/barrage/flatbuf/barrage_generated/io/deephaven/barrage/flatbuf/BarragePublicationRequest.java b/web/client-backplane/src/main/java/io/deephaven/javascript/proto/dhinternal/io/deephaven/barrage/flatbuf/barrage_generated/io/deephaven/barrage/flatbuf/BarragePublicationRequest.java
deleted file mode 100644
index ee5fbe08fcc..00000000000
--- a/web/client-backplane/src/main/java/io/deephaven/javascript/proto/dhinternal/io/deephaven/barrage/flatbuf/barrage_generated/io/deephaven/barrage/flatbuf/BarragePublicationRequest.java
+++ /dev/null
@@ -1,125 +0,0 @@
-//
-// Copyright (c) 2016-2024 Deephaven Data Labs and Patent Pending
-//
-package io.deephaven.javascript.proto.dhinternal.io.deephaven.barrage.flatbuf.barrage_generated.io.deephaven.barrage.flatbuf;
-
-import elemental2.core.Int8Array;
-import elemental2.core.JsArray;
-import elemental2.core.Uint8Array;
-import io.deephaven.javascript.proto.dhinternal.flatbuffers.Builder;
-import io.deephaven.javascript.proto.dhinternal.flatbuffers.ByteBuffer;
-import jsinterop.annotations.JsOverlay;
-import jsinterop.annotations.JsPackage;
-import jsinterop.annotations.JsType;
-import jsinterop.base.Js;
-
-@JsType(
-        isNative = true,
-        name = "dhinternal.io.deephaven.barrage.flatbuf.Barrage_generated.io.deephaven.barrage.flatbuf.BarragePublicationRequest",
-        namespace = JsPackage.GLOBAL)
-public class BarragePublicationRequest {
-    @JsType(isNative = true, name = "?", namespace = JsPackage.GLOBAL)
-    public interface CreateTicketVectorDataUnionType {
-        @JsOverlay
-        static BarragePublicationRequest.CreateTicketVectorDataUnionType of(Object o) {
-            return Js.cast(o);
-        }
-
-        @JsOverlay
-        default Int8Array asInt8Array() {
-            return Js.cast(this);
-        }
-
-        @JsOverlay
-        default JsArray<Double> asJsArray() {
-            return Js.cast(this);
-        }
-
-        @JsOverlay
-        default Uint8Array asUint8Array() {
-            return Js.cast(this);
-        }
-
-        @JsOverlay
-        default boolean isInt8Array() {
-            return (Object) this instanceof Int8Array;
-        }
-
-        @JsOverlay
-        default boolean isJsArray() {
-            return (Object) this instanceof JsArray;
-        }
-
-        @JsOverlay
-        default boolean isUint8Array() {
-            return (Object) this instanceof Uint8Array;
-        }
-    }
-
-    public static native void addPublishOptions(Builder builder, double publishOptionsOffset);
-
-    public static native void addTicket(Builder builder, double ticketOffset);
-
-    @Deprecated
-    public static native double createTicketVector(
-            Builder builder, BarragePublicationRequest.CreateTicketVectorDataUnionType data);
-
-    @JsOverlay
-    @Deprecated
-    public static final double createTicketVector(Builder builder, Int8Array data) {
-        return createTicketVector(
-                builder, Js.<BarragePublicationRequest.CreateTicketVectorDataUnionType>uncheckedCast(data));
-    }
-
-    @JsOverlay
-    @Deprecated
-    public static final double createTicketVector(Builder builder, JsArray<Double> data) {
-        return createTicketVector(
-                builder, Js.<BarragePublicationRequest.CreateTicketVectorDataUnionType>uncheckedCast(data));
-    }
-
-    @JsOverlay
-    @Deprecated
-    public static final double createTicketVector(Builder builder, Uint8Array data) {
-        return createTicketVector(
-                builder, Js.<BarragePublicationRequest.CreateTicketVectorDataUnionType>uncheckedCast(data));
-    }
-
-    @JsOverlay
-    @Deprecated
-    public static final double createTicketVector(Builder builder, double[] data) {
-        return createTicketVector(builder, Js.<JsArray<Double>>uncheckedCast(data));
-    }
-
-    public static native double endBarragePublicationRequest(Builder builder);
-
-    public static native BarragePublicationRequest getRootAsBarragePublicationRequest(
-            ByteBuffer bb, BarragePublicationRequest obj);
-
-    public static native BarragePublicationRequest getRootAsBarragePublicationRequest(ByteBuffer bb);
-
-    public static native BarragePublicationRequest getSizePrefixedRootAsBarragePublicationRequest(
-            ByteBuffer bb, BarragePublicationRequest obj);
-
-    public static native BarragePublicationRequest getSizePrefixedRootAsBarragePublicationRequest(
-            ByteBuffer bb);
-
-    public static native void startBarragePublicationRequest(Builder builder);
-
-    public static native void startTicketVector(Builder builder, double numElems);
-
-    public ByteBuffer bb;
-    public double bb_pos;
-
-    public native BarragePublicationRequest __init(double i, ByteBuffer bb);
-
-    public native BarragePublicationOptions publishOptions();
-
-    public native BarragePublicationOptions publishOptions(BarragePublicationOptions obj);
-
-    public native double ticket(double index);
-
-    public native Int8Array ticketArray();
-
-    public native double ticketLength();
-}
diff --git a/web/client-backplane/src/main/java/io/deephaven/javascript/proto/dhinternal/io/deephaven/barrage/flatbuf/barrage_generated/io/deephaven/barrage/flatbuf/BarrageSnapshotOptions.java b/web/client-backplane/src/main/java/io/deephaven/javascript/proto/dhinternal/io/deephaven/barrage/flatbuf/barrage_generated/io/deephaven/barrage/flatbuf/BarrageSnapshotOptions.java
deleted file mode 100644
index efedac5d190..00000000000
--- a/web/client-backplane/src/main/java/io/deephaven/javascript/proto/dhinternal/io/deephaven/barrage/flatbuf/barrage_generated/io/deephaven/barrage/flatbuf/BarrageSnapshotOptions.java
+++ /dev/null
@@ -1,59 +0,0 @@
-//
-// Copyright (c) 2016-2024 Deephaven Data Labs and Patent Pending
-//
-package io.deephaven.javascript.proto.dhinternal.io.deephaven.barrage.flatbuf.barrage_generated.io.deephaven.barrage.flatbuf;
-
-import io.deephaven.javascript.proto.dhinternal.flatbuffers.Builder;
-import io.deephaven.javascript.proto.dhinternal.flatbuffers.ByteBuffer;
-import jsinterop.annotations.JsPackage;
-import jsinterop.annotations.JsType;
-
-@JsType(
-        isNative = true,
-        name = "dhinternal.io.deephaven.barrage.flatbuf.Barrage_generated.io.deephaven.barrage.flatbuf.BarrageSnapshotOptions",
-        namespace = JsPackage.GLOBAL)
-public class BarrageSnapshotOptions {
-    public static native void addBatchSize(Builder builder, double batchSize);
-
-    public static native void addColumnConversionMode(
-            Builder builder, int columnConversionMode);
-
-    public static native void addMaxMessageSize(Builder builder, double maxMessageSize);
-
-    public static native void addUseDeephavenNulls(Builder builder, boolean useDeephavenNulls);
-
-    public static native double createBarrageSnapshotOptions(
-            Builder builder,
-            int columnConversionMode,
-            boolean useDeephavenNulls,
-            double batchSize,
-            double maxMessageSize);
-
-    public static native double endBarrageSnapshotOptions(Builder builder);
-
-    public static native BarrageSnapshotOptions getRootAsBarrageSnapshotOptions(
-            ByteBuffer bb, BarrageSnapshotOptions obj);
-
-    public static native BarrageSnapshotOptions getRootAsBarrageSnapshotOptions(ByteBuffer bb);
-
-    public static native BarrageSnapshotOptions getSizePrefixedRootAsBarrageSnapshotOptions(
-            ByteBuffer bb, BarrageSnapshotOptions obj);
-
-    public static native BarrageSnapshotOptions getSizePrefixedRootAsBarrageSnapshotOptions(
-            ByteBuffer bb);
-
-    public static native void startBarrageSnapshotOptions(Builder builder);
-
-    public ByteBuffer bb;
-    public double bb_pos;
-
-    public native BarrageSnapshotOptions __init(double i, ByteBuffer bb);
-
-    public native double batchSize();
-
-    public native int columnConversionMode();
-
-    public native double maxMessageSize();
-
-    public native boolean useDeephavenNulls();
-}
diff --git a/web/client-backplane/src/main/java/io/deephaven/javascript/proto/dhinternal/io/deephaven/barrage/flatbuf/barrage_generated/io/deephaven/barrage/flatbuf/BarrageSnapshotRequest.java b/web/client-backplane/src/main/java/io/deephaven/javascript/proto/dhinternal/io/deephaven/barrage/flatbuf/barrage_generated/io/deephaven/barrage/flatbuf/BarrageSnapshotRequest.java
deleted file mode 100644
index 8e8d43e6c58..00000000000
--- a/web/client-backplane/src/main/java/io/deephaven/javascript/proto/dhinternal/io/deephaven/barrage/flatbuf/barrage_generated/io/deephaven/barrage/flatbuf/BarrageSnapshotRequest.java
+++ /dev/null
@@ -1,287 +0,0 @@
-//
-// Copyright (c) 2016-2024 Deephaven Data Labs and Patent Pending
-//
-package io.deephaven.javascript.proto.dhinternal.io.deephaven.barrage.flatbuf.barrage_generated.io.deephaven.barrage.flatbuf;
-
-import elemental2.core.Int8Array;
-import elemental2.core.JsArray;
-import elemental2.core.Uint8Array;
-import io.deephaven.javascript.proto.dhinternal.flatbuffers.Builder;
-import io.deephaven.javascript.proto.dhinternal.flatbuffers.ByteBuffer;
-import jsinterop.annotations.JsOverlay;
-import jsinterop.annotations.JsPackage;
-import jsinterop.annotations.JsType;
-import jsinterop.base.Js;
-
-@JsType(
-        isNative = true,
-        name = "dhinternal.io.deephaven.barrage.flatbuf.Barrage_generated.io.deephaven.barrage.flatbuf.BarrageSnapshotRequest",
-        namespace = JsPackage.GLOBAL)
-public class BarrageSnapshotRequest {
-    @JsType(isNative = true, name = "?", namespace = JsPackage.GLOBAL)
-    public interface CreateColumnsVectorDataUnionType {
-        @JsOverlay
-        static BarrageSnapshotRequest.CreateColumnsVectorDataUnionType of(Object o) {
-            return Js.cast(o);
-        }
-
-        @JsOverlay
-        default Int8Array asInt8Array() {
-            return Js.cast(this);
-        }
-
-        @JsOverlay
-        default JsArray<Double> asJsArray() {
-            return Js.cast(this);
-        }
-
-        @JsOverlay
-        default Uint8Array asUint8Array() {
-            return Js.cast(this);
-        }
-
-        @JsOverlay
-        default boolean isInt8Array() {
-            return (Object) this instanceof Int8Array;
-        }
-
-        @JsOverlay
-        default boolean isJsArray() {
-            return (Object) this instanceof JsArray;
-        }
-
-        @JsOverlay
-        default boolean isUint8Array() {
-            return (Object) this instanceof Uint8Array;
-        }
-    }
-
-    @JsType(isNative = true, name = "?", namespace = JsPackage.GLOBAL)
-    public interface CreateTicketVectorDataUnionType {
-        @JsOverlay
-        static BarrageSnapshotRequest.CreateTicketVectorDataUnionType of(Object o) {
-            return Js.cast(o);
-        }
-
-        @JsOverlay
-        default Int8Array asInt8Array() {
-            return Js.cast(this);
-        }
-
-        @JsOverlay
-        default JsArray<Double> asJsArray() {
-            return Js.cast(this);
-        }
-
-        @JsOverlay
-        default Uint8Array asUint8Array() {
-            return Js.cast(this);
-        }
-
-        @JsOverlay
-        default boolean isInt8Array() {
-            return (Object) this instanceof Int8Array;
-        }
-
-        @JsOverlay
-        default boolean isJsArray() {
-            return (Object) this instanceof JsArray;
-        }
-
-        @JsOverlay
-        default boolean isUint8Array() {
-            return (Object) this instanceof Uint8Array;
-        }
-    }
-
-    @JsType(isNative = true, name = "?", namespace = JsPackage.GLOBAL)
-    public interface CreateViewportVectorDataUnionType {
-        @JsOverlay
-        static BarrageSnapshotRequest.CreateViewportVectorDataUnionType of(Object o) {
-            return Js.cast(o);
-        }
-
-        @JsOverlay
-        default Int8Array asInt8Array() {
-            return Js.cast(this);
-        }
-
-        @JsOverlay
-        default JsArray<Double> asJsArray() {
-            return Js.cast(this);
-        }
-
-        @JsOverlay
-        default Uint8Array asUint8Array() {
-            return Js.cast(this);
-        }
-
-        @JsOverlay
-        default boolean isInt8Array() {
-            return (Object) this instanceof Int8Array;
-        }
-
-        @JsOverlay
-        default boolean isJsArray() {
-            return (Object) this instanceof JsArray;
-        }
-
-        @JsOverlay
-        default boolean isUint8Array() {
-            return (Object) this instanceof Uint8Array;
-        }
-    }
-
-    public static native void addColumns(Builder builder, double columnsOffset);
-
-    public static native void addReverseViewport(Builder builder, boolean reverseViewport);
-
-    public static native void addSnapshotOptions(Builder builder, double snapshotOptionsOffset);
-
-    public static native void addTicket(Builder builder, double ticketOffset);
-
-    public static native void addViewport(Builder builder, double viewportOffset);
-
-    @Deprecated
-    public static native double createColumnsVector(
-            Builder builder, BarrageSnapshotRequest.CreateColumnsVectorDataUnionType data);
-
-    @JsOverlay
-    @Deprecated
-    public static final double createColumnsVector(Builder builder, Int8Array data) {
-        return createColumnsVector(
-                builder, Js.<BarrageSnapshotRequest.CreateColumnsVectorDataUnionType>uncheckedCast(data));
-    }
-
-    @JsOverlay
-    @Deprecated
-    public static final double createColumnsVector(Builder builder, JsArray<Double> data) {
-        return createColumnsVector(
-                builder, Js.<BarrageSnapshotRequest.CreateColumnsVectorDataUnionType>uncheckedCast(data));
-    }
-
-    @JsOverlay
-    @Deprecated
-    public static final double createColumnsVector(Builder builder, Uint8Array data) {
-        return createColumnsVector(
-                builder, Js.<BarrageSnapshotRequest.CreateColumnsVectorDataUnionType>uncheckedCast(data));
-    }
-
-    @JsOverlay
-    @Deprecated
-    public static final double createColumnsVector(Builder builder, double[] data) {
-        return createColumnsVector(builder, Js.<JsArray<Double>>uncheckedCast(data));
-    }
-
-    @Deprecated
-    public static native double createTicketVector(
-            Builder builder, BarrageSnapshotRequest.CreateTicketVectorDataUnionType data);
-
-    @JsOverlay
-    @Deprecated
-    public static final double createTicketVector(Builder builder, Int8Array data) {
-        return createTicketVector(
-                builder, Js.<BarrageSnapshotRequest.CreateTicketVectorDataUnionType>uncheckedCast(data));
-    }
-
-    @JsOverlay
-    @Deprecated
-    public static final double createTicketVector(Builder builder, JsArray<Double> data) {
-        return createTicketVector(
-                builder, Js.<BarrageSnapshotRequest.CreateTicketVectorDataUnionType>uncheckedCast(data));
-    }
-
-    @JsOverlay
-    @Deprecated
-    public static final double createTicketVector(Builder builder, Uint8Array data) {
-        return createTicketVector(
-                builder, Js.<BarrageSnapshotRequest.CreateTicketVectorDataUnionType>uncheckedCast(data));
-    }
-
-    @JsOverlay
-    @Deprecated
-    public static final double createTicketVector(Builder builder, double[] data) {
-        return createTicketVector(builder, Js.<JsArray<Double>>uncheckedCast(data));
-    }
-
-    @Deprecated
-    public static native double createViewportVector(
-            Builder builder, BarrageSnapshotRequest.CreateViewportVectorDataUnionType data);
-
-    @JsOverlay
-    @Deprecated
-    public static final double createViewportVector(Builder builder, Int8Array data) {
-        return createViewportVector(
-                builder, Js.<BarrageSnapshotRequest.CreateViewportVectorDataUnionType>uncheckedCast(data));
-    }
-
-    @JsOverlay
-    @Deprecated
-    public static final double createViewportVector(Builder builder, JsArray<Double> data) {
-        return createViewportVector(
-                builder, Js.<BarrageSnapshotRequest.CreateViewportVectorDataUnionType>uncheckedCast(data));
-    }
-
-    @JsOverlay
-    @Deprecated
-    public static final double createViewportVector(Builder builder, Uint8Array data) {
-        return createViewportVector(
-                builder, Js.<BarrageSnapshotRequest.CreateViewportVectorDataUnionType>uncheckedCast(data));
-    }
-
-    @JsOverlay
-    @Deprecated
-    public static final double createViewportVector(Builder builder, double[] data) {
-        return createViewportVector(builder, Js.<JsArray<Double>>uncheckedCast(data));
-    }
-
-    public static native double endBarrageSnapshotRequest(Builder builder);
-
-    public static native BarrageSnapshotRequest getRootAsBarrageSnapshotRequest(
-            ByteBuffer bb, BarrageSnapshotRequest obj);
-
-    public static native BarrageSnapshotRequest getRootAsBarrageSnapshotRequest(ByteBuffer bb);
-
-    public static native BarrageSnapshotRequest getSizePrefixedRootAsBarrageSnapshotRequest(
-            ByteBuffer bb, BarrageSnapshotRequest obj);
-
-    public static native BarrageSnapshotRequest getSizePrefixedRootAsBarrageSnapshotRequest(
-            ByteBuffer bb);
-
-    public static native void startBarrageSnapshotRequest(Builder builder);
-
-    public static native void startColumnsVector(Builder builder, double numElems);
-
-    public static native void startTicketVector(Builder builder, double numElems);
-
-    public static native void startViewportVector(Builder builder, double numElems);
-
-    public ByteBuffer bb;
-    public double bb_pos;
-
-    public native BarrageSnapshotRequest __init(double i, ByteBuffer bb);
-
-    public native double columns(double index);
-
-    public native Int8Array columnsArray();
-
-    public native double columnsLength();
-
-    public native boolean reverseViewport();
-
-    public native BarrageSnapshotOptions snapshotOptions();
-
-    public native BarrageSnapshotOptions snapshotOptions(BarrageSnapshotOptions obj);
-
-    public native double ticket(double index);
-
-    public native Int8Array ticketArray();
-
-    public native double ticketLength();
-
-    public native double viewport(double index);
-
-    public native Int8Array viewportArray();
-
-    public native double viewportLength();
-}
diff --git a/web/client-backplane/src/main/java/io/deephaven/javascript/proto/dhinternal/io/deephaven/barrage/flatbuf/barrage_generated/io/deephaven/barrage/flatbuf/BarrageSubscriptionOptions.java b/web/client-backplane/src/main/java/io/deephaven/javascript/proto/dhinternal/io/deephaven/barrage/flatbuf/barrage_generated/io/deephaven/barrage/flatbuf/BarrageSubscriptionOptions.java
deleted file mode 100644
index 9b6d39b53ec..00000000000
--- a/web/client-backplane/src/main/java/io/deephaven/javascript/proto/dhinternal/io/deephaven/barrage/flatbuf/barrage_generated/io/deephaven/barrage/flatbuf/BarrageSubscriptionOptions.java
+++ /dev/null
@@ -1,65 +0,0 @@
-//
-// Copyright (c) 2016-2024 Deephaven Data Labs and Patent Pending
-//
-package io.deephaven.javascript.proto.dhinternal.io.deephaven.barrage.flatbuf.barrage_generated.io.deephaven.barrage.flatbuf;
-
-import io.deephaven.javascript.proto.dhinternal.flatbuffers.Builder;
-import io.deephaven.javascript.proto.dhinternal.flatbuffers.ByteBuffer;
-import jsinterop.annotations.JsPackage;
-import jsinterop.annotations.JsType;
-
-@JsType(
-        isNative = true,
-        name = "dhinternal.io.deephaven.barrage.flatbuf.Barrage_generated.io.deephaven.barrage.flatbuf.BarrageSubscriptionOptions",
-        namespace = JsPackage.GLOBAL)
-public class BarrageSubscriptionOptions {
-    public static native void addBatchSize(Builder builder, double batchSize);
-
-    public static native void addColumnConversionMode(
-            Builder builder, int columnConversionMode);
-
-    public static native void addMaxMessageSize(Builder builder, double maxMessageSize);
-
-    public static native void addMinUpdateIntervalMs(Builder builder, double minUpdateIntervalMs);
-
-    public static native void addUseDeephavenNulls(Builder builder, boolean useDeephavenNulls);
-
-    public static native double createBarrageSubscriptionOptions(
-            Builder builder,
-            int columnConversionMode,
-            boolean useDeephavenNulls,
-            double minUpdateIntervalMs,
-            double batchSize,
-            double maxMessageSize);
-
-    public static native double endBarrageSubscriptionOptions(Builder builder);
-
-    public static native BarrageSubscriptionOptions getRootAsBarrageSubscriptionOptions(
-            ByteBuffer bb, BarrageSubscriptionOptions obj);
-
-    public static native BarrageSubscriptionOptions getRootAsBarrageSubscriptionOptions(
-            ByteBuffer bb);
-
-    public static native BarrageSubscriptionOptions getSizePrefixedRootAsBarrageSubscriptionOptions(
-            ByteBuffer bb, BarrageSubscriptionOptions obj);
-
-    public static native BarrageSubscriptionOptions getSizePrefixedRootAsBarrageSubscriptionOptions(
-            ByteBuffer bb);
-
-    public static native void startBarrageSubscriptionOptions(Builder builder);
-
-    public ByteBuffer bb;
-    public double bb_pos;
-
-    public native BarrageSubscriptionOptions __init(double i, ByteBuffer bb);
-
-    public native double batchSize();
-
-    public native int columnConversionMode();
-
-    public native double maxMessageSize();
-
-    public native double minUpdateIntervalMs();
-
-    public native boolean useDeephavenNulls();
-}
diff --git a/web/client-backplane/src/main/java/io/deephaven/javascript/proto/dhinternal/io/deephaven/barrage/flatbuf/barrage_generated/io/deephaven/barrage/flatbuf/BarrageSubscriptionRequest.java b/web/client-backplane/src/main/java/io/deephaven/javascript/proto/dhinternal/io/deephaven/barrage/flatbuf/barrage_generated/io/deephaven/barrage/flatbuf/BarrageSubscriptionRequest.java
deleted file mode 100644
index 807184ee34c..00000000000
--- a/web/client-backplane/src/main/java/io/deephaven/javascript/proto/dhinternal/io/deephaven/barrage/flatbuf/barrage_generated/io/deephaven/barrage/flatbuf/BarrageSubscriptionRequest.java
+++ /dev/null
@@ -1,298 +0,0 @@
-//
-// Copyright (c) 2016-2024 Deephaven Data Labs and Patent Pending
-//
-package io.deephaven.javascript.proto.dhinternal.io.deephaven.barrage.flatbuf.barrage_generated.io.deephaven.barrage.flatbuf;
-
-import elemental2.core.Int8Array;
-import elemental2.core.JsArray;
-import elemental2.core.Uint8Array;
-import io.deephaven.javascript.proto.dhinternal.flatbuffers.Builder;
-import io.deephaven.javascript.proto.dhinternal.flatbuffers.ByteBuffer;
-import jsinterop.annotations.JsOverlay;
-import jsinterop.annotations.JsPackage;
-import jsinterop.annotations.JsType;
-import jsinterop.base.Js;
-
-@JsType(
-        isNative = true,
-        name = "dhinternal.io.deephaven.barrage.flatbuf.Barrage_generated.io.deephaven.barrage.flatbuf.BarrageSubscriptionRequest",
-        namespace = JsPackage.GLOBAL)
-public class BarrageSubscriptionRequest {
-    @JsType(isNative = true, name = "?", namespace = JsPackage.GLOBAL)
-    public interface CreateColumnsVectorDataUnionType {
-        @JsOverlay
-        static BarrageSubscriptionRequest.CreateColumnsVectorDataUnionType of(Object o) {
-            return Js.cast(o);
-        }
-
-        @JsOverlay
-        default Int8Array asInt8Array() {
-            return Js.cast(this);
-        }
-
-        @JsOverlay
-        default JsArray<Double> asJsArray() {
-            return Js.cast(this);
-        }
-
-        @JsOverlay
-        default Uint8Array asUint8Array() {
-            return Js.cast(this);
-        }
-
-        @JsOverlay
-        default boolean isInt8Array() {
-            return (Object) this instanceof Int8Array;
-        }
-
-        @JsOverlay
-        default boolean isJsArray() {
-            return (Object) this instanceof JsArray;
-        }
-
-        @JsOverlay
-        default boolean isUint8Array() {
-            return (Object) this instanceof Uint8Array;
-        }
-    }
-
-    @JsType(isNative = true, name = "?", namespace = JsPackage.GLOBAL)
-    public interface CreateTicketVectorDataUnionType {
-        @JsOverlay
-        static BarrageSubscriptionRequest.CreateTicketVectorDataUnionType of(Object o) {
-            return Js.cast(o);
-        }
-
-        @JsOverlay
-        default Int8Array asInt8Array() {
-            return Js.cast(this);
-        }
-
-        @JsOverlay
-        default JsArray<Double> asJsArray() {
-            return Js.cast(this);
-        }
-
-        @JsOverlay
-        default Uint8Array asUint8Array() {
-            return Js.cast(this);
-        }
-
-        @JsOverlay
-        default boolean isInt8Array() {
-            return (Object) this instanceof Int8Array;
-        }
-
-        @JsOverlay
-        default boolean isJsArray() {
-            return (Object) this instanceof JsArray;
-        }
-
-        @JsOverlay
-        default boolean isUint8Array() {
-            return (Object) this instanceof Uint8Array;
-        }
-    }
-
-    @JsType(isNative = true, name = "?", namespace = JsPackage.GLOBAL)
-    public interface CreateViewportVectorDataUnionType {
-        @JsOverlay
-        static BarrageSubscriptionRequest.CreateViewportVectorDataUnionType of(Object o) {
-            return Js.cast(o);
-        }
-
-        @JsOverlay
-        default Int8Array asInt8Array() {
-            return Js.cast(this);
-        }
-
-        @JsOverlay
-        default JsArray<Double> asJsArray() {
-            return Js.cast(this);
-        }
-
-        @JsOverlay
-        default Uint8Array asUint8Array() {
-            return Js.cast(this);
-        }
-
-        @JsOverlay
-        default boolean isInt8Array() {
-            return (Object) this instanceof Int8Array;
-        }
-
-        @JsOverlay
-        default boolean isJsArray() {
-            return (Object) this instanceof JsArray;
-        }
-
-        @JsOverlay
-        default boolean isUint8Array() {
-            return (Object) this instanceof Uint8Array;
-        }
-    }
-
-    public static native void addColumns(Builder builder, double columnsOffset);
-
-    public static native void addReverseViewport(Builder builder, boolean reverseViewport);
-
-    public static native void addSubscriptionOptions(
-            Builder builder, double subscriptionOptionsOffset);
-
-    public static native void addTicket(Builder builder, double ticketOffset);
-
-    public static native void addViewport(Builder builder, double viewportOffset);
-
-    @Deprecated
-    public static native double createColumnsVector(
-            Builder builder, BarrageSubscriptionRequest.CreateColumnsVectorDataUnionType data);
-
-    @JsOverlay
-    @Deprecated
-    public static final double createColumnsVector(Builder builder, Int8Array data) {
-        return createColumnsVector(
-                builder,
-                Js.<BarrageSubscriptionRequest.CreateColumnsVectorDataUnionType>uncheckedCast(data));
-    }
-
-    @JsOverlay
-    @Deprecated
-    public static final double createColumnsVector(Builder builder, JsArray<Double> data) {
-        return createColumnsVector(
-                builder,
-                Js.<BarrageSubscriptionRequest.CreateColumnsVectorDataUnionType>uncheckedCast(data));
-    }
-
-    @JsOverlay
-    @Deprecated
-    public static final double createColumnsVector(Builder builder, Uint8Array data) {
-        return createColumnsVector(
-                builder,
-                Js.<BarrageSubscriptionRequest.CreateColumnsVectorDataUnionType>uncheckedCast(data));
-    }
-
-    @JsOverlay
-    @Deprecated
-    public static final double createColumnsVector(Builder builder, double[] data) {
-        return createColumnsVector(builder, Js.<JsArray<Double>>uncheckedCast(data));
-    }
-
-    @Deprecated
-    public static native double createTicketVector(
-            Builder builder, BarrageSubscriptionRequest.CreateTicketVectorDataUnionType data);
-
-    @JsOverlay
-    @Deprecated
-    public static final double createTicketVector(Builder builder, Int8Array data) {
-        return createTicketVector(
-                builder,
-                Js.<BarrageSubscriptionRequest.CreateTicketVectorDataUnionType>uncheckedCast(data));
-    }
-
-    @JsOverlay
-    @Deprecated
-    public static final double createTicketVector(Builder builder, JsArray<Double> data) {
-        return createTicketVector(
-                builder,
-                Js.<BarrageSubscriptionRequest.CreateTicketVectorDataUnionType>uncheckedCast(data));
-    }
-
-    @JsOverlay
-    @Deprecated
-    public static final double createTicketVector(Builder builder, Uint8Array data) {
-        return createTicketVector(
-                builder,
-                Js.<BarrageSubscriptionRequest.CreateTicketVectorDataUnionType>uncheckedCast(data));
-    }
-
-    @JsOverlay
-    @Deprecated
-    public static final double createTicketVector(Builder builder, double[] data) {
-        return createTicketVector(builder, Js.<JsArray<Double>>uncheckedCast(data));
-    }
-
-    @Deprecated
-    public static native double createViewportVector(
-            Builder builder, BarrageSubscriptionRequest.CreateViewportVectorDataUnionType data);
-
-    @JsOverlay
-    @Deprecated
-    public static final double createViewportVector(Builder builder, Int8Array data) {
-        return createViewportVector(
-                builder,
-                Js.<BarrageSubscriptionRequest.CreateViewportVectorDataUnionType>uncheckedCast(data));
-    }
-
-    @JsOverlay
-    @Deprecated
-    public static final double createViewportVector(Builder builder, JsArray<Double> data) {
-        return createViewportVector(
-                builder,
-                Js.<BarrageSubscriptionRequest.CreateViewportVectorDataUnionType>uncheckedCast(data));
-    }
-
-    @JsOverlay
-    @Deprecated
-    public static final double createViewportVector(Builder builder, Uint8Array data) {
-        return createViewportVector(
-                builder,
-                Js.<BarrageSubscriptionRequest.CreateViewportVectorDataUnionType>uncheckedCast(data));
-    }
-
-    @JsOverlay
-    @Deprecated
-    public static final double createViewportVector(Builder builder, double[] data) {
-        return createViewportVector(builder, Js.<JsArray<Double>>uncheckedCast(data));
-    }
-
-    public static native double endBarrageSubscriptionRequest(Builder builder);
-
-    public static native BarrageSubscriptionRequest getRootAsBarrageSubscriptionRequest(
-            ByteBuffer bb, BarrageSubscriptionRequest obj);
-
-    public static native BarrageSubscriptionRequest getRootAsBarrageSubscriptionRequest(
-            ByteBuffer bb);
-
-    public static native BarrageSubscriptionRequest getSizePrefixedRootAsBarrageSubscriptionRequest(
-            ByteBuffer bb, BarrageSubscriptionRequest obj);
-
-    public static native BarrageSubscriptionRequest getSizePrefixedRootAsBarrageSubscriptionRequest(
-            ByteBuffer bb);
-
-    public static native void startBarrageSubscriptionRequest(Builder builder);
-
-    public static native void startColumnsVector(Builder builder, double numElems);
-
-    public static native void startTicketVector(Builder builder, double numElems);
-
-    public static native void startViewportVector(Builder builder, double numElems);
-
-    public ByteBuffer bb;
-    public double bb_pos;
-
-    public native BarrageSubscriptionRequest __init(double i, ByteBuffer bb);
-
-    public native double columns(double index);
-
-    public native Int8Array columnsArray();
-
-    public native double columnsLength();
-
-    public native boolean reverseViewport();
-
-    public native BarrageSubscriptionOptions subscriptionOptions();
-
-    public native BarrageSubscriptionOptions subscriptionOptions(BarrageSubscriptionOptions obj);
-
-    public native double ticket(double index);
-
-    public native Int8Array ticketArray();
-
-    public native double ticketLength();
-
-    public native double viewport(double index);
-
-    public native Int8Array viewportArray();
-
-    public native double viewportLength();
-}
diff --git a/web/client-backplane/src/main/java/io/deephaven/javascript/proto/dhinternal/io/deephaven/barrage/flatbuf/barrage_generated/io/deephaven/barrage/flatbuf/BarrageUpdateMetadata.java b/web/client-backplane/src/main/java/io/deephaven/javascript/proto/dhinternal/io/deephaven/barrage/flatbuf/barrage_generated/io/deephaven/barrage/flatbuf/BarrageUpdateMetadata.java
deleted file mode 100644
index 3d9f4bd51df..00000000000
--- a/web/client-backplane/src/main/java/io/deephaven/javascript/proto/dhinternal/io/deephaven/barrage/flatbuf/barrage_generated/io/deephaven/barrage/flatbuf/BarrageUpdateMetadata.java
+++ /dev/null
@@ -1,575 +0,0 @@
-//
-// Copyright (c) 2016-2024 Deephaven Data Labs and Patent Pending
-//
-package io.deephaven.javascript.proto.dhinternal.io.deephaven.barrage.flatbuf.barrage_generated.io.deephaven.barrage.flatbuf;
-
-import elemental2.core.Int8Array;
-import elemental2.core.JsArray;
-import elemental2.core.Uint8Array;
-import io.deephaven.javascript.proto.dhinternal.flatbuffers.Builder;
-import io.deephaven.javascript.proto.dhinternal.flatbuffers.ByteBuffer;
-import io.deephaven.javascript.proto.dhinternal.flatbuffers.Long;
-import jsinterop.annotations.JsOverlay;
-import jsinterop.annotations.JsPackage;
-import jsinterop.annotations.JsType;
-import jsinterop.base.Js;
-
-@JsType(
-        isNative = true,
-        name = "dhinternal.io.deephaven.barrage.flatbuf.Barrage_generated.io.deephaven.barrage.flatbuf.BarrageUpdateMetadata",
-        namespace = JsPackage.GLOBAL)
-public class BarrageUpdateMetadata {
-    @JsType(isNative = true, name = "?", namespace = JsPackage.GLOBAL)
-    public interface CreateAddedRowsIncludedVectorDataUnionType {
-        @JsOverlay
-        static BarrageUpdateMetadata.CreateAddedRowsIncludedVectorDataUnionType of(Object o) {
-            return Js.cast(o);
-        }
-
-        @JsOverlay
-        default Int8Array asInt8Array() {
-            return Js.cast(this);
-        }
-
-        @JsOverlay
-        default JsArray<Double> asJsArray() {
-            return Js.cast(this);
-        }
-
-        @JsOverlay
-        default Uint8Array asUint8Array() {
-            return Js.cast(this);
-        }
-
-        @JsOverlay
-        default boolean isInt8Array() {
-            return (Object) this instanceof Int8Array;
-        }
-
-        @JsOverlay
-        default boolean isJsArray() {
-            return (Object) this instanceof JsArray;
-        }
-
-        @JsOverlay
-        default boolean isUint8Array() {
-            return (Object) this instanceof Uint8Array;
-        }
-    }
-
-    @JsType(isNative = true, name = "?", namespace = JsPackage.GLOBAL)
-    public interface CreateAddedRowsVectorDataUnionType {
-        @JsOverlay
-        static BarrageUpdateMetadata.CreateAddedRowsVectorDataUnionType of(Object o) {
-            return Js.cast(o);
-        }
-
-        @JsOverlay
-        default Int8Array asInt8Array() {
-            return Js.cast(this);
-        }
-
-        @JsOverlay
-        default JsArray<Double> asJsArray() {
-            return Js.cast(this);
-        }
-
-        @JsOverlay
-        default Uint8Array asUint8Array() {
-            return Js.cast(this);
-        }
-
-        @JsOverlay
-        default boolean isInt8Array() {
-            return (Object) this instanceof Int8Array;
-        }
-
-        @JsOverlay
-        default boolean isJsArray() {
-            return (Object) this instanceof JsArray;
-        }
-
-        @JsOverlay
-        default boolean isUint8Array() {
-            return (Object) this instanceof Uint8Array;
-        }
-    }
-
-    @JsType(isNative = true, name = "?", namespace = JsPackage.GLOBAL)
-    public interface CreateEffectiveColumnSetVectorDataUnionType {
-        @JsOverlay
-        static BarrageUpdateMetadata.CreateEffectiveColumnSetVectorDataUnionType of(Object o) {
-            return Js.cast(o);
-        }
-
-        @JsOverlay
-        default Int8Array asInt8Array() {
-            return Js.cast(this);
-        }
-
-        @JsOverlay
-        default JsArray<Double> asJsArray() {
-            return Js.cast(this);
-        }
-
-        @JsOverlay
-        default Uint8Array asUint8Array() {
-            return Js.cast(this);
-        }
-
-        @JsOverlay
-        default boolean isInt8Array() {
-            return (Object) this instanceof Int8Array;
-        }
-
-        @JsOverlay
-        default boolean isJsArray() {
-            return (Object) this instanceof JsArray;
-        }
-
-        @JsOverlay
-        default boolean isUint8Array() {
-            return (Object) this instanceof Uint8Array;
-        }
-    }
-
-    @JsType(isNative = true, name = "?", namespace = JsPackage.GLOBAL)
-    public interface CreateEffectiveViewportVectorDataUnionType {
-        @JsOverlay
-        static BarrageUpdateMetadata.CreateEffectiveViewportVectorDataUnionType of(Object o) {
-            return Js.cast(o);
-        }
-
-        @JsOverlay
-        default Int8Array asInt8Array() {
-            return Js.cast(this);
-        }
-
-        @JsOverlay
-        default JsArray<Double> asJsArray() {
-            return Js.cast(this);
-        }
-
-        @JsOverlay
-        default Uint8Array asUint8Array() {
-            return Js.cast(this);
-        }
-
-        @JsOverlay
-        default boolean isInt8Array() {
-            return (Object) this instanceof Int8Array;
-        }
-
-        @JsOverlay
-        default boolean isJsArray() {
-            return (Object) this instanceof JsArray;
-        }
-
-        @JsOverlay
-        default boolean isUint8Array() {
-            return (Object) this instanceof Uint8Array;
-        }
-    }
-
-    @JsType(isNative = true, name = "?", namespace = JsPackage.GLOBAL)
-    public interface CreateRemovedRowsVectorDataUnionType {
-        @JsOverlay
-        static BarrageUpdateMetadata.CreateRemovedRowsVectorDataUnionType of(Object o) {
-            return Js.cast(o);
-        }
-
-        @JsOverlay
-        default Int8Array asInt8Array() {
-            return Js.cast(this);
-        }
-
-        @JsOverlay
-        default JsArray<Double> asJsArray() {
-            return Js.cast(this);
-        }
-
-        @JsOverlay
-        default Uint8Array asUint8Array() {
-            return Js.cast(this);
-        }
-
-        @JsOverlay
-        default boolean isInt8Array() {
-            return (Object) this instanceof Int8Array;
-        }
-
-        @JsOverlay
-        default boolean isJsArray() {
-            return (Object) this instanceof JsArray;
-        }
-
-        @JsOverlay
-        default boolean isUint8Array() {
-            return (Object) this instanceof Uint8Array;
-        }
-    }
-
-    @JsType(isNative = true, name = "?", namespace = JsPackage.GLOBAL)
-    public interface CreateShiftDataVectorDataUnionType {
-        @JsOverlay
-        static BarrageUpdateMetadata.CreateShiftDataVectorDataUnionType of(Object o) {
-            return Js.cast(o);
-        }
-
-        @JsOverlay
-        default Int8Array asInt8Array() {
-            return Js.cast(this);
-        }
-
-        @JsOverlay
-        default JsArray<Double> asJsArray() {
-            return Js.cast(this);
-        }
-
-        @JsOverlay
-        default Uint8Array asUint8Array() {
-            return Js.cast(this);
-        }
-
-        @JsOverlay
-        default boolean isInt8Array() {
-            return (Object) this instanceof Int8Array;
-        }
-
-        @JsOverlay
-        default boolean isJsArray() {
-            return (Object) this instanceof JsArray;
-        }
-
-        @JsOverlay
-        default boolean isUint8Array() {
-            return (Object) this instanceof Uint8Array;
-        }
-    }
-
-    public static native void addAddedRows(Builder builder, double addedRowsOffset);
-
-    public static native void addAddedRowsIncluded(Builder builder, double addedRowsIncludedOffset);
-
-    public static native void addEffectiveColumnSet(Builder builder, double effectiveColumnSetOffset);
-
-    public static native void addEffectiveReverseViewport(
-            Builder builder, boolean effectiveReverseViewport);
-
-    public static native void addEffectiveViewport(Builder builder, double effectiveViewportOffset);
-
-    public static native void addFirstSeq(Builder builder, Long firstSeq);
-
-    public static native void addIsSnapshot(Builder builder, boolean isSnapshot);
-
-    public static native void addLastSeq(Builder builder, Long lastSeq);
-
-    public static native void addModColumnNodes(Builder builder, double modColumnNodesOffset);
-
-    public static native void addRemovedRows(Builder builder, double removedRowsOffset);
-
-    public static native void addShiftData(Builder builder, double shiftDataOffset);
-
-    @Deprecated
-    public static native double createAddedRowsIncludedVector(
-            Builder builder, BarrageUpdateMetadata.CreateAddedRowsIncludedVectorDataUnionType data);
-
-    @JsOverlay
-    @Deprecated
-    public static final double createAddedRowsIncludedVector(Builder builder, Int8Array data) {
-        return createAddedRowsIncludedVector(
-                builder,
-                Js.<BarrageUpdateMetadata.CreateAddedRowsIncludedVectorDataUnionType>uncheckedCast(data));
-    }
-
-    @JsOverlay
-    @Deprecated
-    public static final double createAddedRowsIncludedVector(Builder builder, JsArray<Double> data) {
-        return createAddedRowsIncludedVector(
-                builder,
-                Js.<BarrageUpdateMetadata.CreateAddedRowsIncludedVectorDataUnionType>uncheckedCast(data));
-    }
-
-    @JsOverlay
-    @Deprecated
-    public static final double createAddedRowsIncludedVector(Builder builder, Uint8Array data) {
-        return createAddedRowsIncludedVector(
-                builder,
-                Js.<BarrageUpdateMetadata.CreateAddedRowsIncludedVectorDataUnionType>uncheckedCast(data));
-    }
-
-    @JsOverlay
-    @Deprecated
-    public static final double createAddedRowsIncludedVector(Builder builder, double[] data) {
-        return createAddedRowsIncludedVector(builder, Js.<JsArray<Double>>uncheckedCast(data));
-    }
-
-    @Deprecated
-    public static native double createAddedRowsVector(
-            Builder builder, BarrageUpdateMetadata.CreateAddedRowsVectorDataUnionType data);
-
-    @JsOverlay
-    @Deprecated
-    public static final double createAddedRowsVector(Builder builder, Int8Array data) {
-        return createAddedRowsVector(
-                builder, Js.<BarrageUpdateMetadata.CreateAddedRowsVectorDataUnionType>uncheckedCast(data));
-    }
-
-    @JsOverlay
-    @Deprecated
-    public static final double createAddedRowsVector(Builder builder, JsArray<Double> data) {
-        return createAddedRowsVector(
-                builder, Js.<BarrageUpdateMetadata.CreateAddedRowsVectorDataUnionType>uncheckedCast(data));
-    }
-
-    @JsOverlay
-    @Deprecated
-    public static final double createAddedRowsVector(Builder builder, Uint8Array data) {
-        return createAddedRowsVector(
-                builder, Js.<BarrageUpdateMetadata.CreateAddedRowsVectorDataUnionType>uncheckedCast(data));
-    }
-
-    @JsOverlay
-    @Deprecated
-    public static final double createAddedRowsVector(Builder builder, double[] data) {
-        return createAddedRowsVector(builder, Js.<JsArray<Double>>uncheckedCast(data));
-    }
-
-    public static native double createBarrageUpdateMetadata(
-            Builder builder,
-            Long firstSeq,
-            Long lastSeq,
-            boolean isSnapshot,
-            double effectiveViewportOffset,
-            boolean effectiveReverseViewport,
-            double effectiveColumnSetOffset,
-            double addedRowsOffset,
-            double removedRowsOffset,
-            double shiftDataOffset,
-            double addedRowsIncludedOffset,
-            double modColumnNodesOffset);
-
-    @Deprecated
-    public static native double createEffectiveColumnSetVector(
-            Builder builder, BarrageUpdateMetadata.CreateEffectiveColumnSetVectorDataUnionType data);
-
-    @JsOverlay
-    @Deprecated
-    public static final double createEffectiveColumnSetVector(Builder builder, Int8Array data) {
-        return createEffectiveColumnSetVector(
-                builder,
-                Js.<BarrageUpdateMetadata.CreateEffectiveColumnSetVectorDataUnionType>uncheckedCast(data));
-    }
-
-    @JsOverlay
-    @Deprecated
-    public static final double createEffectiveColumnSetVector(Builder builder, JsArray<Double> data) {
-        return createEffectiveColumnSetVector(
-                builder,
-                Js.<BarrageUpdateMetadata.CreateEffectiveColumnSetVectorDataUnionType>uncheckedCast(data));
-    }
-
-    @JsOverlay
-    @Deprecated
-    public static final double createEffectiveColumnSetVector(Builder builder, Uint8Array data) {
-        return createEffectiveColumnSetVector(
-                builder,
-                Js.<BarrageUpdateMetadata.CreateEffectiveColumnSetVectorDataUnionType>uncheckedCast(data));
-    }
-
-    @JsOverlay
-    @Deprecated
-    public static final double createEffectiveColumnSetVector(Builder builder, double[] data) {
-        return createEffectiveColumnSetVector(builder, Js.<JsArray<Double>>uncheckedCast(data));
-    }
-
-    @Deprecated
-    public static native double createEffectiveViewportVector(
-            Builder builder, BarrageUpdateMetadata.CreateEffectiveViewportVectorDataUnionType data);
-
-    @JsOverlay
-    @Deprecated
-    public static final double createEffectiveViewportVector(Builder builder, Int8Array data) {
-        return createEffectiveViewportVector(
-                builder,
-                Js.<BarrageUpdateMetadata.CreateEffectiveViewportVectorDataUnionType>uncheckedCast(data));
-    }
-
-    @JsOverlay
-    @Deprecated
-    public static final double createEffectiveViewportVector(Builder builder, JsArray<Double> data) {
-        return createEffectiveViewportVector(
-                builder,
-                Js.<BarrageUpdateMetadata.CreateEffectiveViewportVectorDataUnionType>uncheckedCast(data));
-    }
-
-    @JsOverlay
-    @Deprecated
-    public static final double createEffectiveViewportVector(Builder builder, Uint8Array data) {
-        return createEffectiveViewportVector(
-                builder,
-                Js.<BarrageUpdateMetadata.CreateEffectiveViewportVectorDataUnionType>uncheckedCast(data));
-    }
-
-    @JsOverlay
-    @Deprecated
-    public static final double createEffectiveViewportVector(Builder builder, double[] data) {
-        return createEffectiveViewportVector(builder, Js.<JsArray<Double>>uncheckedCast(data));
-    }
-
-    public static native double createModColumnNodesVector(Builder builder, JsArray<Double> data);
-
-    @JsOverlay
-    public static final double createModColumnNodesVector(Builder builder, double[] data) {
-        return createModColumnNodesVector(builder, Js.<JsArray<Double>>uncheckedCast(data));
-    }
-
-    @Deprecated
-    public static native double createRemovedRowsVector(
-            Builder builder, BarrageUpdateMetadata.CreateRemovedRowsVectorDataUnionType data);
-
-    @JsOverlay
-    @Deprecated
-    public static final double createRemovedRowsVector(Builder builder, Int8Array data) {
-        return createRemovedRowsVector(
-                builder,
-                Js.<BarrageUpdateMetadata.CreateRemovedRowsVectorDataUnionType>uncheckedCast(data));
-    }
-
-    @JsOverlay
-    @Deprecated
-    public static final double createRemovedRowsVector(Builder builder, JsArray<Double> data) {
-        return createRemovedRowsVector(
-                builder,
-                Js.<BarrageUpdateMetadata.CreateRemovedRowsVectorDataUnionType>uncheckedCast(data));
-    }
-
-    @JsOverlay
-    @Deprecated
-    public static final double createRemovedRowsVector(Builder builder, Uint8Array data) {
-        return createRemovedRowsVector(
-                builder,
-                Js.<BarrageUpdateMetadata.CreateRemovedRowsVectorDataUnionType>uncheckedCast(data));
-    }
-
-    @JsOverlay
-    @Deprecated
-    public static final double createRemovedRowsVector(Builder builder, double[] data) {
-        return createRemovedRowsVector(builder, Js.<JsArray<Double>>uncheckedCast(data));
-    }
-
-    @Deprecated
-    public static native double createShiftDataVector(
-            Builder builder, BarrageUpdateMetadata.CreateShiftDataVectorDataUnionType data);
-
-    @JsOverlay
-    @Deprecated
-    public static final double createShiftDataVector(Builder builder, Int8Array data) {
-        return createShiftDataVector(
-                builder, Js.<BarrageUpdateMetadata.CreateShiftDataVectorDataUnionType>uncheckedCast(data));
-    }
-
-    @JsOverlay
-    @Deprecated
-    public static final double createShiftDataVector(Builder builder, JsArray<Double> data) {
-        return createShiftDataVector(
-                builder, Js.<BarrageUpdateMetadata.CreateShiftDataVectorDataUnionType>uncheckedCast(data));
-    }
-
-    @JsOverlay
-    @Deprecated
-    public static final double createShiftDataVector(Builder builder, Uint8Array data) {
-        return createShiftDataVector(
-                builder, Js.<BarrageUpdateMetadata.CreateShiftDataVectorDataUnionType>uncheckedCast(data));
-    }
-
-    @JsOverlay
-    @Deprecated
-    public static final double createShiftDataVector(Builder builder, double[] data) {
-        return createShiftDataVector(builder, Js.<JsArray<Double>>uncheckedCast(data));
-    }
-
-    public static native double endBarrageUpdateMetadata(Builder builder);
-
-    public static native BarrageUpdateMetadata getRootAsBarrageUpdateMetadata(
-            ByteBuffer bb, BarrageUpdateMetadata obj);
-
-    public static native BarrageUpdateMetadata getRootAsBarrageUpdateMetadata(ByteBuffer bb);
-
-    public static native BarrageUpdateMetadata getSizePrefixedRootAsBarrageUpdateMetadata(
-            ByteBuffer bb, BarrageUpdateMetadata obj);
-
-    public static native BarrageUpdateMetadata getSizePrefixedRootAsBarrageUpdateMetadata(
-            ByteBuffer bb);
-
-    public static native void startAddedRowsIncludedVector(Builder builder, double numElems);
-
-    public static native void startAddedRowsVector(Builder builder, double numElems);
-
-    public static native void startBarrageUpdateMetadata(Builder builder);
-
-    public static native void startEffectiveColumnSetVector(Builder builder, double numElems);
-
-    public static native void startEffectiveViewportVector(Builder builder, double numElems);
-
-    public static native void startModColumnNodesVector(Builder builder, double numElems);
-
-    public static native void startRemovedRowsVector(Builder builder, double numElems);
-
-    public static native void startShiftDataVector(Builder builder, double numElems);
-
-    public ByteBuffer bb;
-    public double bb_pos;
-
-    public native BarrageUpdateMetadata __init(double i, ByteBuffer bb);
-
-    public native double addedRows(double index);
-
-    public native Int8Array addedRowsArray();
-
-    public native double addedRowsIncluded(double index);
-
-    public native Int8Array addedRowsIncludedArray();
-
-    public native double addedRowsIncludedLength();
-
-    public native double addedRowsLength();
-
-    public native double effectiveColumnSet(double index);
-
-    public native Int8Array effectiveColumnSetArray();
-
-    public native double effectiveColumnSetLength();
-
-    public native boolean effectiveReverseViewport();
-
-    public native double effectiveViewport(double index);
-
-    public native Int8Array effectiveViewportArray();
-
-    public native double effectiveViewportLength();
-
-    public native Long firstSeq();
-
-    public native boolean isSnapshot();
-
-    public native Long lastSeq();
-
-    public native BarrageModColumnMetadata modColumnNodes(double index, BarrageModColumnMetadata obj);
-
-    public native BarrageModColumnMetadata modColumnNodes(double index);
-
-    public native double modColumnNodesLength();
-
-    public native double removedRows(double index);
-
-    public native Int8Array removedRowsArray();
-
-    public native double removedRowsLength();
-
-    public native double shiftData(double index);
-
-    public native Int8Array shiftDataArray();
-
-    public native double shiftDataLength();
-}
diff --git a/web/client-backplane/src/main/java/io/deephaven/javascript/proto/dhinternal/io/deephaven/barrage/flatbuf/barrage_generated/io/deephaven/barrage/flatbuf/ColumnConversionMode.java b/web/client-backplane/src/main/java/io/deephaven/javascript/proto/dhinternal/io/deephaven/barrage/flatbuf/barrage_generated/io/deephaven/barrage/flatbuf/ColumnConversionMode.java
deleted file mode 100644
index 30a750f44a6..00000000000
--- a/web/client-backplane/src/main/java/io/deephaven/javascript/proto/dhinternal/io/deephaven/barrage/flatbuf/barrage_generated/io/deephaven/barrage/flatbuf/ColumnConversionMode.java
+++ /dev/null
@@ -1,17 +0,0 @@
-//
-// Copyright (c) 2016-2024 Deephaven Data Labs and Patent Pending
-//
-package io.deephaven.javascript.proto.dhinternal.io.deephaven.barrage.flatbuf.barrage_generated.io.deephaven.barrage.flatbuf;
-
-import jsinterop.annotations.JsPackage;
-import jsinterop.annotations.JsType;
-
-@JsType(
-        isNative = true,
-        name = "dhinternal.io.deephaven.barrage.flatbuf.Barrage_generated.io.deephaven.barrage.flatbuf.ColumnConversionMode",
-        namespace = JsPackage.GLOBAL)
-public class ColumnConversionMode {
-    public static int JavaSerialization,
-            Stringify,
-            ThrowError;
-}
diff --git a/web/client-backplane/src/main/java/io/deephaven/javascript/proto/dhinternal/io/deephaven/barrage/flatbuf/barrage_generated/io/deephaven/barrage/flatbuf/NewSessionRequest.java b/web/client-backplane/src/main/java/io/deephaven/javascript/proto/dhinternal/io/deephaven/barrage/flatbuf/barrage_generated/io/deephaven/barrage/flatbuf/NewSessionRequest.java
deleted file mode 100644
index a1f002c434a..00000000000
--- a/web/client-backplane/src/main/java/io/deephaven/javascript/proto/dhinternal/io/deephaven/barrage/flatbuf/barrage_generated/io/deephaven/barrage/flatbuf/NewSessionRequest.java
+++ /dev/null
@@ -1,125 +0,0 @@
-//
-// Copyright (c) 2016-2024 Deephaven Data Labs and Patent Pending
-//
-package io.deephaven.javascript.proto.dhinternal.io.deephaven.barrage.flatbuf.barrage_generated.io.deephaven.barrage.flatbuf;
-
-import elemental2.core.Int8Array;
-import elemental2.core.JsArray;
-import elemental2.core.Uint8Array;
-import io.deephaven.javascript.proto.dhinternal.flatbuffers.Builder;
-import io.deephaven.javascript.proto.dhinternal.flatbuffers.ByteBuffer;
-import jsinterop.annotations.JsOverlay;
-import jsinterop.annotations.JsPackage;
-import jsinterop.annotations.JsType;
-import jsinterop.base.Js;
-
-@JsType(
-        isNative = true,
-        name = "dhinternal.io.deephaven.barrage.flatbuf.Barrage_generated.io.deephaven.barrage.flatbuf.NewSessionRequest",
-        namespace = JsPackage.GLOBAL)
-public class NewSessionRequest {
-    @JsType(isNative = true, name = "?", namespace = JsPackage.GLOBAL)
-    public interface CreatePayloadVectorDataUnionType {
-        @JsOverlay
-        static NewSessionRequest.CreatePayloadVectorDataUnionType of(Object o) {
-            return Js.cast(o);
-        }
-
-        @JsOverlay
-        default Int8Array asInt8Array() {
-            return Js.cast(this);
-        }
-
-        @JsOverlay
-        default JsArray<Double> asJsArray() {
-            return Js.cast(this);
-        }
-
-        @JsOverlay
-        default Uint8Array asUint8Array() {
-            return Js.cast(this);
-        }
-
-        @JsOverlay
-        default boolean isInt8Array() {
-            return (Object) this instanceof Int8Array;
-        }
-
-        @JsOverlay
-        default boolean isJsArray() {
-            return (Object) this instanceof JsArray;
-        }
-
-        @JsOverlay
-        default boolean isUint8Array() {
-            return (Object) this instanceof Uint8Array;
-        }
-    }
-
-    public static native void addPayload(Builder builder, double payloadOffset);
-
-    public static native void addProtocolVersion(Builder builder, double protocolVersion);
-
-    public static native double createNewSessionRequest(
-            Builder builder, double protocolVersion, double payloadOffset);
-
-    @Deprecated
-    public static native double createPayloadVector(
-            Builder builder, NewSessionRequest.CreatePayloadVectorDataUnionType data);
-
-    @JsOverlay
-    @Deprecated
-    public static final double createPayloadVector(Builder builder, Int8Array data) {
-        return createPayloadVector(
-                builder, Js.<NewSessionRequest.CreatePayloadVectorDataUnionType>uncheckedCast(data));
-    }
-
-    @JsOverlay
-    @Deprecated
-    public static final double createPayloadVector(Builder builder, JsArray<Double> data) {
-        return createPayloadVector(
-                builder, Js.<NewSessionRequest.CreatePayloadVectorDataUnionType>uncheckedCast(data));
-    }
-
-    @JsOverlay
-    @Deprecated
-    public static final double createPayloadVector(Builder builder, Uint8Array data) {
-        return createPayloadVector(
-                builder, Js.<NewSessionRequest.CreatePayloadVectorDataUnionType>uncheckedCast(data));
-    }
-
-    @JsOverlay
-    @Deprecated
-    public static final double createPayloadVector(Builder builder, double[] data) {
-        return createPayloadVector(builder, Js.<JsArray<Double>>uncheckedCast(data));
-    }
-
-    public static native double endNewSessionRequest(Builder builder);
-
-    public static native NewSessionRequest getRootAsNewSessionRequest(
-            ByteBuffer bb, NewSessionRequest obj);
-
-    public static native NewSessionRequest getRootAsNewSessionRequest(ByteBuffer bb);
-
-    public static native NewSessionRequest getSizePrefixedRootAsNewSessionRequest(
-            ByteBuffer bb, NewSessionRequest obj);
-
-    public static native NewSessionRequest getSizePrefixedRootAsNewSessionRequest(ByteBuffer bb);
-
-    public static native void startNewSessionRequest(Builder builder);
-
-    public static native void startPayloadVector(Builder builder, double numElems);
-
-    public ByteBuffer bb;
-    public double bb_pos;
-
-    public native NewSessionRequest __init(double i, ByteBuffer bb);
-
-    public native double payload(double index);
-
-    public native Int8Array payloadArray();
-
-    public native double payloadLength();
-
-    public native double protocolVersion();
-}
diff --git a/web/client-backplane/src/main/java/io/deephaven/javascript/proto/dhinternal/io/deephaven/barrage/flatbuf/barrage_generated/io/deephaven/barrage/flatbuf/RefreshSessionRequest.java b/web/client-backplane/src/main/java/io/deephaven/javascript/proto/dhinternal/io/deephaven/barrage/flatbuf/barrage_generated/io/deephaven/barrage/flatbuf/RefreshSessionRequest.java
deleted file mode 100644
index 3fcc2501206..00000000000
--- a/web/client-backplane/src/main/java/io/deephaven/javascript/proto/dhinternal/io/deephaven/barrage/flatbuf/barrage_generated/io/deephaven/barrage/flatbuf/RefreshSessionRequest.java
+++ /dev/null
@@ -1,121 +0,0 @@
-//
-// Copyright (c) 2016-2024 Deephaven Data Labs and Patent Pending
-//
-package io.deephaven.javascript.proto.dhinternal.io.deephaven.barrage.flatbuf.barrage_generated.io.deephaven.barrage.flatbuf;
-
-import elemental2.core.Int8Array;
-import elemental2.core.JsArray;
-import elemental2.core.Uint8Array;
-import io.deephaven.javascript.proto.dhinternal.flatbuffers.Builder;
-import io.deephaven.javascript.proto.dhinternal.flatbuffers.ByteBuffer;
-import jsinterop.annotations.JsOverlay;
-import jsinterop.annotations.JsPackage;
-import jsinterop.annotations.JsType;
-import jsinterop.base.Js;
-
-@JsType(
-        isNative = true,
-        name = "dhinternal.io.deephaven.barrage.flatbuf.Barrage_generated.io.deephaven.barrage.flatbuf.RefreshSessionRequest",
-        namespace = JsPackage.GLOBAL)
-public class RefreshSessionRequest {
-    @JsType(isNative = true, name = "?", namespace = JsPackage.GLOBAL)
-    public interface CreateSessionVectorDataUnionType {
-        @JsOverlay
-        static RefreshSessionRequest.CreateSessionVectorDataUnionType of(Object o) {
-            return Js.cast(o);
-        }
-
-        @JsOverlay
-        default Int8Array asInt8Array() {
-            return Js.cast(this);
-        }
-
-        @JsOverlay
-        default JsArray<Double> asJsArray() {
-            return Js.cast(this);
-        }
-
-        @JsOverlay
-        default Uint8Array asUint8Array() {
-            return Js.cast(this);
-        }
-
-        @JsOverlay
-        default boolean isInt8Array() {
-            return (Object) this instanceof Int8Array;
-        }
-
-        @JsOverlay
-        default boolean isJsArray() {
-            return (Object) this instanceof JsArray;
-        }
-
-        @JsOverlay
-        default boolean isUint8Array() {
-            return (Object) this instanceof Uint8Array;
-        }
-    }
-
-    public static native void addSession(Builder builder, double sessionOffset);
-
-    public static native double createRefreshSessionRequest(Builder builder, double sessionOffset);
-
-    @Deprecated
-    public static native double createSessionVector(
-            Builder builder, RefreshSessionRequest.CreateSessionVectorDataUnionType data);
-
-    @JsOverlay
-    @Deprecated
-    public static final double createSessionVector(Builder builder, Int8Array data) {
-        return createSessionVector(
-                builder, Js.<RefreshSessionRequest.CreateSessionVectorDataUnionType>uncheckedCast(data));
-    }
-
-    @JsOverlay
-    @Deprecated
-    public static final double createSessionVector(Builder builder, JsArray<Double> data) {
-        return createSessionVector(
-                builder, Js.<RefreshSessionRequest.CreateSessionVectorDataUnionType>uncheckedCast(data));
-    }
-
-    @JsOverlay
-    @Deprecated
-    public static final double createSessionVector(Builder builder, Uint8Array data) {
-        return createSessionVector(
-                builder, Js.<RefreshSessionRequest.CreateSessionVectorDataUnionType>uncheckedCast(data));
-    }
-
-    @JsOverlay
-    @Deprecated
-    public static final double createSessionVector(Builder builder, double[] data) {
-        return createSessionVector(builder, Js.<JsArray<Double>>uncheckedCast(data));
-    }
-
-    public static native double endRefreshSessionRequest(Builder builder);
-
-    public static native RefreshSessionRequest getRootAsRefreshSessionRequest(
-            ByteBuffer bb, RefreshSessionRequest obj);
-
-    public static native RefreshSessionRequest getRootAsRefreshSessionRequest(ByteBuffer bb);
-
-    public static native RefreshSessionRequest getSizePrefixedRootAsRefreshSessionRequest(
-            ByteBuffer bb, RefreshSessionRequest obj);
-
-    public static native RefreshSessionRequest getSizePrefixedRootAsRefreshSessionRequest(
-            ByteBuffer bb);
-
-    public static native void startRefreshSessionRequest(Builder builder);
-
-    public static native void startSessionVector(Builder builder, double numElems);
-
-    public ByteBuffer bb;
-    public double bb_pos;
-
-    public native RefreshSessionRequest __init(double i, ByteBuffer bb);
-
-    public native double session(double index);
-
-    public native Int8Array sessionArray();
-
-    public native double sessionLength();
-}
diff --git a/web/client-backplane/src/main/java/io/deephaven/javascript/proto/dhinternal/io/deephaven/barrage/flatbuf/barrage_generated/io/deephaven/barrage/flatbuf/SessionInfoResponse.java b/web/client-backplane/src/main/java/io/deephaven/javascript/proto/dhinternal/io/deephaven/barrage/flatbuf/barrage_generated/io/deephaven/barrage/flatbuf/SessionInfoResponse.java
deleted file mode 100644
index 39658a0f27b..00000000000
--- a/web/client-backplane/src/main/java/io/deephaven/javascript/proto/dhinternal/io/deephaven/barrage/flatbuf/barrage_generated/io/deephaven/barrage/flatbuf/SessionInfoResponse.java
+++ /dev/null
@@ -1,211 +0,0 @@
-//
-// Copyright (c) 2016-2024 Deephaven Data Labs and Patent Pending
-//
-package io.deephaven.javascript.proto.dhinternal.io.deephaven.barrage.flatbuf.barrage_generated.io.deephaven.barrage.flatbuf;
-
-import elemental2.core.Int8Array;
-import elemental2.core.JsArray;
-import elemental2.core.Uint8Array;
-import io.deephaven.javascript.proto.dhinternal.flatbuffers.Builder;
-import io.deephaven.javascript.proto.dhinternal.flatbuffers.ByteBuffer;
-import io.deephaven.javascript.proto.dhinternal.flatbuffers.Long;
-import jsinterop.annotations.JsOverlay;
-import jsinterop.annotations.JsPackage;
-import jsinterop.annotations.JsType;
-import jsinterop.base.Js;
-
-@JsType(
-        isNative = true,
-        name = "dhinternal.io.deephaven.barrage.flatbuf.Barrage_generated.io.deephaven.barrage.flatbuf.SessionInfoResponse",
-        namespace = JsPackage.GLOBAL)
-public class SessionInfoResponse {
-    @JsType(isNative = true, name = "?", namespace = JsPackage.GLOBAL)
-    public interface CreateMetadataHeaderVectorDataUnionType {
-        @JsOverlay
-        static SessionInfoResponse.CreateMetadataHeaderVectorDataUnionType of(Object o) {
-            return Js.cast(o);
-        }
-
-        @JsOverlay
-        default Int8Array asInt8Array() {
-            return Js.cast(this);
-        }
-
-        @JsOverlay
-        default JsArray<Double> asJsArray() {
-            return Js.cast(this);
-        }
-
-        @JsOverlay
-        default Uint8Array asUint8Array() {
-            return Js.cast(this);
-        }
-
-        @JsOverlay
-        default boolean isInt8Array() {
-            return (Object) this instanceof Int8Array;
-        }
-
-        @JsOverlay
-        default boolean isJsArray() {
-            return (Object) this instanceof JsArray;
-        }
-
-        @JsOverlay
-        default boolean isUint8Array() {
-            return (Object) this instanceof Uint8Array;
-        }
-    }
-
-    @JsType(isNative = true, name = "?", namespace = JsPackage.GLOBAL)
-    public interface CreateSessionTokenVectorDataUnionType {
-        @JsOverlay
-        static SessionInfoResponse.CreateSessionTokenVectorDataUnionType of(Object o) {
-            return Js.cast(o);
-        }
-
-        @JsOverlay
-        default Int8Array asInt8Array() {
-            return Js.cast(this);
-        }
-
-        @JsOverlay
-        default JsArray<Double> asJsArray() {
-            return Js.cast(this);
-        }
-
-        @JsOverlay
-        default Uint8Array asUint8Array() {
-            return Js.cast(this);
-        }
-
-        @JsOverlay
-        default boolean isInt8Array() {
-            return (Object) this instanceof Int8Array;
-        }
-
-        @JsOverlay
-        default boolean isJsArray() {
-            return (Object) this instanceof JsArray;
-        }
-
-        @JsOverlay
-        default boolean isUint8Array() {
-            return (Object) this instanceof Uint8Array;
-        }
-    }
-
-    public static native void addMetadataHeader(Builder builder, double metadataHeaderOffset);
-
-    public static native void addSessionToken(Builder builder, double sessionTokenOffset);
-
-    public static native void addTokenRefreshDeadlineMs(Builder builder, Long tokenRefreshDeadlineMs);
-
-    @Deprecated
-    public static native double createMetadataHeaderVector(
-            Builder builder, SessionInfoResponse.CreateMetadataHeaderVectorDataUnionType data);
-
-    @JsOverlay
-    @Deprecated
-    public static final double createMetadataHeaderVector(Builder builder, Int8Array data) {
-        return createMetadataHeaderVector(
-                builder,
-                Js.<SessionInfoResponse.CreateMetadataHeaderVectorDataUnionType>uncheckedCast(data));
-    }
-
-    @JsOverlay
-    @Deprecated
-    public static final double createMetadataHeaderVector(Builder builder, JsArray<Double> data) {
-        return createMetadataHeaderVector(
-                builder,
-                Js.<SessionInfoResponse.CreateMetadataHeaderVectorDataUnionType>uncheckedCast(data));
-    }
-
-    @JsOverlay
-    @Deprecated
-    public static final double createMetadataHeaderVector(Builder builder, Uint8Array data) {
-        return createMetadataHeaderVector(
-                builder,
-                Js.<SessionInfoResponse.CreateMetadataHeaderVectorDataUnionType>uncheckedCast(data));
-    }
-
-    @JsOverlay
-    @Deprecated
-    public static final double createMetadataHeaderVector(Builder builder, double[] data) {
-        return createMetadataHeaderVector(builder, Js.<JsArray<Double>>uncheckedCast(data));
-    }
-
-    public static native double createSessionInfoResponse(
-            Builder builder,
-            double metadataHeaderOffset,
-            double sessionTokenOffset,
-            Long tokenRefreshDeadlineMs);
-
-    @Deprecated
-    public static native double createSessionTokenVector(
-            Builder builder, SessionInfoResponse.CreateSessionTokenVectorDataUnionType data);
-
-    @JsOverlay
-    @Deprecated
-    public static final double createSessionTokenVector(Builder builder, Int8Array data) {
-        return createSessionTokenVector(
-                builder, Js.<SessionInfoResponse.CreateSessionTokenVectorDataUnionType>uncheckedCast(data));
-    }
-
-    @JsOverlay
-    @Deprecated
-    public static final double createSessionTokenVector(Builder builder, JsArray<Double> data) {
-        return createSessionTokenVector(
-                builder, Js.<SessionInfoResponse.CreateSessionTokenVectorDataUnionType>uncheckedCast(data));
-    }
-
-    @JsOverlay
-    @Deprecated
-    public static final double createSessionTokenVector(Builder builder, Uint8Array data) {
-        return createSessionTokenVector(
-                builder, Js.<SessionInfoResponse.CreateSessionTokenVectorDataUnionType>uncheckedCast(data));
-    }
-
-    @JsOverlay
-    @Deprecated
-    public static final double createSessionTokenVector(Builder builder, double[] data) {
-        return createSessionTokenVector(builder, Js.<JsArray<Double>>uncheckedCast(data));
-    }
-
-    public static native double endSessionInfoResponse(Builder builder);
-
-    public static native SessionInfoResponse getRootAsSessionInfoResponse(
-            ByteBuffer bb, SessionInfoResponse obj);
-
-    public static native SessionInfoResponse getRootAsSessionInfoResponse(ByteBuffer bb);
-
-    public static native SessionInfoResponse getSizePrefixedRootAsSessionInfoResponse(
-            ByteBuffer bb, SessionInfoResponse obj);
-
-    public static native SessionInfoResponse getSizePrefixedRootAsSessionInfoResponse(ByteBuffer bb);
-
-    public static native void startMetadataHeaderVector(Builder builder, double numElems);
-
-    public static native void startSessionInfoResponse(Builder builder);
-
-    public static native void startSessionTokenVector(Builder builder, double numElems);
-
-    public ByteBuffer bb;
-    public double bb_pos;
-
-    public native SessionInfoResponse __init(double i, ByteBuffer bb);
-
-    public native double metadataHeader(double index);
-
-    public native Int8Array metadataHeaderArray();
-
-    public native double metadataHeaderLength();
-
-    public native double sessionToken(double index);
-
-    public native Int8Array sessionTokenArray();
-
-    public native double sessionTokenLength();
-
-    public native Long tokenRefreshDeadlineMs();
-}
diff --git a/web/client-ui/Dockerfile b/web/client-ui/Dockerfile
index 9ff23c93094..b51541e04db 100644
--- a/web/client-ui/Dockerfile
+++ b/web/client-ui/Dockerfile
@@ -2,10 +2,10 @@ FROM deephaven/node:local-build
 WORKDIR /usr/src/app
 
 # Most of the time, these versions are the same, except in cases where a patch only affects one of the packages
-ARG WEB_VERSION=0.82.0
-ARG GRID_VERSION=0.82.0
-ARG CHART_VERSION=0.82.0
-ARG WIDGET_VERSION=0.82.0
+ARG WEB_VERSION=0.102.0
+ARG GRID_VERSION=0.102.0
+ARG CHART_VERSION=0.102.0
+ARG WIDGET_VERSION=0.102.0
 
 # Pull in the published code-studio package from npmjs and extract is
 RUN set -eux; \
diff --git a/web/shared-beans/shared-beans.gradle b/web/shared-beans/shared-beans.gradle
index 8cbca1fba04..208f0c86e47 100644
--- a/web/shared-beans/shared-beans.gradle
+++ b/web/shared-beans/shared-beans.gradle
@@ -5,20 +5,18 @@ plugins {
 
 GwtTools.gwtLib project
 
-configurations {
-    testImplementation.extendsFrom junit
-}
-
 dependencies {
     api project(':open-api-shared-fu')
 
-    Classpaths.inheritGuava(project, 'testImplementation')
-}
+    testImplementation libs.junit4
+    testImplementation libs.guava
 
-// non-transitive dependency
-Classpaths.inheritGwt project, 'gwt-user', 'compileOnly'
+    implementation libs.elemental.core
+    compileOnly libs.javax.validation.api
 
-// upgrade inherited dependencies to become transitive
-Classpaths.inheritJsInterop(project, 'jsinterop-annotations', 'compileOnly')
-Classpaths.inheritJavaxAnnotations(project, 'compileOnly')
-Classpaths.inheritElemental(project, 'elemental2-core', 'implementation')
+    // upgrade inherited dependencies to become transitive
+    compileOnly libs.jsinterop.annotations
+
+    // non-transitive dependency
+    compileOnly libs.gwt.user
+}
diff --git a/web/shared-beans/src/main/java/io/deephaven/web/shared/data/ColumnStatistics.java b/web/shared-beans/src/main/java/io/deephaven/web/shared/data/ColumnStatistics.java
deleted file mode 100644
index 7a72d3806d5..00000000000
--- a/web/shared-beans/src/main/java/io/deephaven/web/shared/data/ColumnStatistics.java
+++ /dev/null
@@ -1,169 +0,0 @@
-//
-// Copyright (c) 2016-2024 Deephaven Data Labs and Patent Pending
-//
-package io.deephaven.web.shared.data;
-
-import java.io.Serializable;
-import java.util.Arrays;
-
-/**
- * A DTO containing the result data from a call to GenerateComparableStatsFunction or GenerateNumericalStatsFunction
- */
-public class ColumnStatistics implements Serializable {
-    public enum ColumnType {
-        NUMERIC, COMPARABLE, DATETIME, NON_COMPARABLE,
-    }
-
-    private ColumnType type;
-    private long size;
-    private long count;
-
-    // Data from a GenerateComparableStatsFunction
-    private int numUnique;
-    private String[] uniqueKeys;
-    private long[] uniqueValues;
-
-    // Data from a GenerateNumericalStatsFunction
-    private double sum;
-    private double absSum;
-    private double min;
-    private double max;
-    private double absMin;
-    private double absMax;
-
-    // Data from a GenerateDateTimeStatsFunction
-    private long minDateTime;
-    private long maxDateTime;
-
-    public ColumnType getType() {
-        return type;
-    }
-
-    public void setType(ColumnType type) {
-        this.type = type;
-    }
-
-    public long getSize() {
-        return size;
-    }
-
-    public void setSize(final long size) {
-        this.size = size;
-    }
-
-    public long getCount() {
-        return count;
-    }
-
-    public void setCount(long count) {
-        this.count = count;
-    }
-
-    public int getNumUnique() {
-        return numUnique;
-    }
-
-    public void setNumUnique(int numUnique) {
-        this.numUnique = numUnique;
-    }
-
-    public String[] getUniqueKeys() {
-        return uniqueKeys;
-    }
-
-    public void setUniqueKeys(String[] uniqueKeys) {
-        this.uniqueKeys = uniqueKeys;
-    }
-
-    public long[] getUniqueValues() {
-        return uniqueValues;
-    }
-
-    public void setUniqueValues(long[] uniqueValues) {
-        this.uniqueValues = uniqueValues;
-    }
-
-    public double getSum() {
-        return sum;
-    }
-
-    public void setSum(double sum) {
-        this.sum = sum;
-    }
-
-    public double getAbsSum() {
-        return absSum;
-    }
-
-    public void setAbsSum(double absSum) {
-        this.absSum = absSum;
-    }
-
-    public double getMin() {
-        return min;
-    }
-
-    public void setMin(double min) {
-        this.min = min;
-    }
-
-    public double getMax() {
-        return max;
-    }
-
-    public void setMax(double max) {
-        this.max = max;
-    }
-
-    public double getAbsMin() {
-        return absMin;
-    }
-
-    public void setAbsMin(double absMin) {
-        this.absMin = absMin;
-    }
-
-    public double getAbsMax() {
-        return absMax;
-    }
-
-    public void setAbsMax(double absMax) {
-        this.absMax = absMax;
-    }
-
-    public long getMinDateTime() {
-        return minDateTime;
-    }
-
-    public void setMinDateTime(final long minDateTime) {
-        this.minDateTime = minDateTime;
-    }
-
-    public long getMaxDateTime() {
-        return maxDateTime;
-    }
-
-    public void setMaxDateTime(final long maxDateTime) {
-        this.maxDateTime = maxDateTime;
-    }
-
-    @Override
-    public String toString() {
-        return "ColumnStatistics{" +
-                "type=" + type +
-                ", size=" + size +
-                ", count=" + count +
-                ", numUnique=" + numUnique +
-                ", uniqueKeys=" + Arrays.toString(uniqueKeys) +
-                ", uniqueValues=" + Arrays.toString(uniqueValues) +
-                ", sum=" + sum +
-                ", absSum=" + absSum +
-                ", min=" + min +
-                ", max=" + max +
-                ", absMin=" + absMin +
-                ", absMax=" + absMax +
-                ", minDateTime=" + minDateTime +
-                ", maxDateTime=" + maxDateTime +
-                '}';
-    }
-}
diff --git a/web/shared-beans/src/main/java/io/deephaven/web/shared/data/DeltaUpdates.java b/web/shared-beans/src/main/java/io/deephaven/web/shared/data/DeltaUpdates.java
deleted file mode 100644
index f6e3e59a753..00000000000
--- a/web/shared-beans/src/main/java/io/deephaven/web/shared/data/DeltaUpdates.java
+++ /dev/null
@@ -1,174 +0,0 @@
-//
-// Copyright (c) 2016-2024 Deephaven Data Labs and Patent Pending
-//
-package io.deephaven.web.shared.data;
-
-import io.deephaven.web.shared.data.columns.ColumnData;
-
-import java.io.Serializable;
-
-public class DeltaUpdates implements Serializable {
-    public static class ColumnAdditions implements Serializable {
-        private int columnIndex;
-        private ColumnData values;
-
-        public ColumnAdditions() {}
-
-        public ColumnAdditions(int colIndex, ColumnData values) {
-            setColumnIndex(colIndex);
-            setValues(values);
-        }
-
-        public int getColumnIndex() {
-            return columnIndex;
-        }
-
-        public void setColumnIndex(final int columnIndex) {
-            this.columnIndex = columnIndex;
-        }
-
-        public ColumnData getValues() {
-            return values;
-        }
-
-        public void setValues(final ColumnData values) {
-            this.values = values;
-        }
-    }
-    public static class ColumnModifications implements Serializable {
-        private int columnIndex;
-        private RangeSet rowsIncluded;
-        public ColumnData values;
-
-        public ColumnModifications() {}
-
-        public ColumnModifications(int columnIndex, RangeSet includedModifications, ColumnData columnData) {
-            setColumnIndex(columnIndex);
-            setRowsIncluded(includedModifications);
-            setValues(columnData);
-        }
-
-        public int getColumnIndex() {
-            return columnIndex;
-        }
-
-        public void setColumnIndex(final int columnIndex) {
-            this.columnIndex = columnIndex;
-        }
-
-        public RangeSet getRowsIncluded() {
-            return rowsIncluded;
-        }
-
-        public void setRowsIncluded(final RangeSet rowsIncluded) {
-            this.rowsIncluded = rowsIncluded;
-        }
-
-        public ColumnData getValues() {
-            return values;
-        }
-
-        public void setValues(final ColumnData values) {
-            this.values = values;
-        }
-    }
-
-    private long deltaSequence;
-    private long firstStep;
-    private long lastStep;
-
-    private RangeSet added;
-    private RangeSet removed;
-
-    private ShiftedRange[] shiftedRanges;
-
-    private RangeSet includedAdditions;
-
-    private ColumnAdditions[] serializedAdditions;
-    private ColumnModifications[] serializedModifications;
-
-    public DeltaUpdates() {}
-
-    public DeltaUpdates(RangeSet added, RangeSet removed, ShiftedRange[] shifted, RangeSet includedAdditions,
-            ColumnAdditions[] addedColumnData, ColumnModifications[] modifiedColumnData) {
-        setAdded(added);
-        setRemoved(removed);
-        setShiftedRanges(shifted);
-        setIncludedAdditions(includedAdditions);
-        setSerializedAdditions(addedColumnData);
-        setSerializedModifications(modifiedColumnData);
-    }
-
-
-    public long getDeltaSequence() {
-        return deltaSequence;
-    }
-
-    public void setDeltaSequence(final long deltaSequence) {
-        this.deltaSequence = deltaSequence;
-    }
-
-    public long getFirstStep() {
-        return firstStep;
-    }
-
-    public void setFirstStep(final long firstStep) {
-        this.firstStep = firstStep;
-    }
-
-    public long getLastStep() {
-        return lastStep;
-    }
-
-    public void setLastStep(final long lastStep) {
-        this.lastStep = lastStep;
-    }
-
-    public RangeSet getAdded() {
-        return added;
-    }
-
-    public void setAdded(final RangeSet added) {
-        this.added = added;
-    }
-
-    public RangeSet getRemoved() {
-        return removed;
-    }
-
-    public void setRemoved(final RangeSet removed) {
-        this.removed = removed;
-    }
-
-    public ShiftedRange[] getShiftedRanges() {
-        return shiftedRanges;
-    }
-
-    public void setShiftedRanges(final ShiftedRange[] shiftedRanges) {
-        this.shiftedRanges = shiftedRanges;
-    }
-
-    public RangeSet getIncludedAdditions() {
-        return includedAdditions;
-    }
-
-    public void setIncludedAdditions(final RangeSet includedAdditions) {
-        this.includedAdditions = includedAdditions;
-    }
-
-    public ColumnAdditions[] getSerializedAdditions() {
-        return serializedAdditions;
-    }
-
-    public void setSerializedAdditions(final ColumnAdditions[] serializedAdditions) {
-        this.serializedAdditions = serializedAdditions;
-    }
-
-    public ColumnModifications[] getSerializedModifications() {
-        return serializedModifications;
-    }
-
-    public void setSerializedModifications(final ColumnModifications[] serializedModifications) {
-        this.serializedModifications = serializedModifications;
-    }
-}
diff --git a/web/shared-beans/src/main/java/io/deephaven/web/shared/data/LocalDate.java b/web/shared-beans/src/main/java/io/deephaven/web/shared/data/LocalDate.java
deleted file mode 100644
index 69a0cc8cc71..00000000000
--- a/web/shared-beans/src/main/java/io/deephaven/web/shared/data/LocalDate.java
+++ /dev/null
@@ -1,47 +0,0 @@
-//
-// Copyright (c) 2016-2024 Deephaven Data Labs and Patent Pending
-//
-package io.deephaven.web.shared.data;
-
-import java.io.Serializable;
-
-/**
- * A simple container for serializing LocalDate values. This should be better for serialization than java.time.LocalDate
- * since we use bytes for month and day, and is compatible with GWT (java.time is not available in GWT).
- */
-public class LocalDate implements Serializable {
-    private int year;
-    private byte monthValue, dayOfMonth;
-
-    public LocalDate(int year, byte monthValue, byte dayOfMonth) {
-        this.year = year;
-        this.monthValue = monthValue;
-        this.dayOfMonth = dayOfMonth;
-    }
-
-    public LocalDate() {}
-
-    public int getYear() {
-        return year;
-    }
-
-    public void setYear(int year) {
-        this.year = year;
-    }
-
-    public byte getMonthValue() {
-        return monthValue;
-    }
-
-    public void setMonthValue(byte monthValue) {
-        this.monthValue = monthValue;
-    }
-
-    public byte getDayOfMonth() {
-        return dayOfMonth;
-    }
-
-    public void setDayOfMonth(byte dayOfMonth) {
-        this.dayOfMonth = dayOfMonth;
-    }
-}
diff --git a/web/shared-beans/src/main/java/io/deephaven/web/shared/data/LocalTime.java b/web/shared-beans/src/main/java/io/deephaven/web/shared/data/LocalTime.java
deleted file mode 100644
index 74ea3b1cfb3..00000000000
--- a/web/shared-beans/src/main/java/io/deephaven/web/shared/data/LocalTime.java
+++ /dev/null
@@ -1,57 +0,0 @@
-//
-// Copyright (c) 2016-2024 Deephaven Data Labs and Patent Pending
-//
-package io.deephaven.web.shared.data;
-
-import java.io.Serializable;
-
-/**
- * A simple container for serializing local time values. This should be better for serialization than
- * java.time.LocalTime since we use bytes for hour, minute and second, and is compatible with GWT (java.time is not
- * available in GWT).
- */
-public class LocalTime implements Serializable {
-    private byte hour, minute, second;
-    private int nano;
-
-    public LocalTime(byte hour, byte minute, byte second, int nano) {
-        this.hour = hour;
-        this.minute = minute;
-        this.second = second;
-        this.nano = nano;
-    }
-
-    public LocalTime() {}
-
-    public byte getHour() {
-        return hour;
-    }
-
-    public void setHour(byte hour) {
-        this.hour = hour;
-    }
-
-    public byte getMinute() {
-        return minute;
-    }
-
-    public void setMinute(byte minute) {
-        this.minute = minute;
-    }
-
-    public byte getSecond() {
-        return second;
-    }
-
-    public void setSecond(byte second) {
-        this.second = second;
-    }
-
-    public int getNano() {
-        return nano;
-    }
-
-    public void setNano(int nano) {
-        this.nano = nano;
-    }
-}
diff --git a/web/shared-beans/src/main/java/io/deephaven/web/shared/data/Range.java b/web/shared-beans/src/main/java/io/deephaven/web/shared/data/Range.java
index 16ef88a4e60..87144a989f1 100644
--- a/web/shared-beans/src/main/java/io/deephaven/web/shared/data/Range.java
+++ b/web/shared-beans/src/main/java/io/deephaven/web/shared/data/Range.java
@@ -4,26 +4,17 @@
 package io.deephaven.web.shared.data;
 
 import javax.annotation.Nonnull;
-import java.io.Serializable;
 
 /**
  * Describes a contiguous range of at least one item. Equals/hashcode compare both start and end, but comparing Range
  * instances will compare only by start - the overlap(Range) method should be used to see if two ranges share at least
  * one item.
  */
-public class Range implements Serializable, Comparable<Range> {
-    private long first;
-    private long last;
-
-    // serialization
-    Range() {
-        this(0, 0);
-    }
+public class Range implements Comparable<Range> {
+    private final long first;
+    private final long last;
 
     public Range(long first, long last) {
-        if (first > last) {
-            throw new IllegalStateException(first + " > " + last);
-        }
         this.first = first;
         this.last = last;
     }
@@ -36,14 +27,6 @@ public long getLast() {
         return last;
     }
 
-    void setFirst(long first) {
-        this.first = first;
-    }
-
-    void setLast(long last) {
-        this.last = last;
-    }
-
     @Override
     public int compareTo(@Nonnull Range o) {
         return Long.compare(first, o.first);
@@ -78,13 +61,10 @@ public Range[] minus(Range range) {
         // otherwise either the subtracted section's start is within our range _or_ its end is within our range,
         // and we can use that to only produce the one range we need to return
         if (range.first <= first) {
-            assert range.last >= first : "removed range expected to not end before existing range";
             return new Range[] {
                     new Range(range.last + 1, last)
             };
         } else {
-            assert range.last >= last : "removed range expected to end by the end of the existing range";
-            assert range.first <= last : "removed range expected to start before existing range";
             return new Range[] {
                     new Range(first, range.first - 1)
             };
@@ -123,4 +103,8 @@ public String toString() {
                 ", last=" + last +
                 '}';
     }
+
+    public Range shift(long delta) {
+        return new Range(first + delta, last + delta);
+    }
 }
diff --git a/web/shared-beans/src/main/java/io/deephaven/web/shared/data/RangeSet.java b/web/shared-beans/src/main/java/io/deephaven/web/shared/data/RangeSet.java
index c782582a425..f1a79e21602 100644
--- a/web/shared-beans/src/main/java/io/deephaven/web/shared/data/RangeSet.java
+++ b/web/shared-beans/src/main/java/io/deephaven/web/shared/data/RangeSet.java
@@ -3,9 +3,11 @@
 //
 package io.deephaven.web.shared.data;
 
-import java.io.Serializable;
+import java.util.ArrayList;
 import java.util.Arrays;
+import java.util.Collections;
 import java.util.Iterator;
+import java.util.List;
 import java.util.PrimitiveIterator;
 import java.util.stream.LongStream;
 
@@ -14,7 +16,7 @@
  * Iteration protocol, but for now has one method which returns an iterator, and also supports querying the size.
  * Additionally, we may add support for creating RangeSet objects to better serve some use cases.
  */
-public class RangeSet implements Serializable {
+public class RangeSet {
 
     public static RangeSet empty() {
         return new RangeSet();
@@ -37,210 +39,356 @@ public static RangeSet ofItems(long... items) {
         return rangeSet;
     }
 
-    public static RangeSet fromSortedRanges(Range[] sortedRanges) {
-        assert orderedAndNonOverlapping(sortedRanges) : Arrays.toString(sortedRanges);
+    public static RangeSet fromSortedRanges(List<Range> sortedRanges) {
+        assertOrderedAndNonOverlapping(sortedRanges.toArray(new Range[0]));
         RangeSet rangeSet = new RangeSet();
         rangeSet.sortedRanges = sortedRanges;
         return rangeSet;
     }
 
-    private static boolean orderedAndNonOverlapping(Range[] sortedRanges) {
+    public static RangeSet fromSortedRanges(Range[] sortedRanges) {
+        assertOrderedAndNonOverlapping(sortedRanges);
+        RangeSet rangeSet = new RangeSet();
+        rangeSet.sortedRanges.addAll(Arrays.asList(sortedRanges));
+        return rangeSet;
+    }
+
+    private static void assertOrderedAndNonOverlapping(Range[] sortedRanges) {
         long lastSeen = -1;
         for (int i = 0; i < sortedRanges.length; i++) {
-            if (lastSeen >= sortedRanges[i].getFirst()) {
-                return false;
-            }
+            assert lastSeen < sortedRanges[i].getFirst() || lastSeen == -1
+                    : sortedRanges[i - 1] + " came before " + sortedRanges[i] + " (index=" + i + ")";
             lastSeen = sortedRanges[i].getLast();
         }
-        return true;
     }
 
-    private Range[] sortedRanges = new Range[0];
+    private List<Range> sortedRanges = new ArrayList<>();
+
+    private int firstWrongCacheEntry = 0;
+    private long[] cardinality = new long[0];
+
+    public void addRangeSet(RangeSet rangeSet) {
+        if (isEmpty() && !rangeSet.isEmpty()) {
+            sortedRanges = new ArrayList<>(rangeSet.sortedRanges);
+            poisonCache(0);
+        } else if (!rangeSet.isEmpty()) {
+            RangeAccumulator newRanges = new RangeAccumulator();
+            Iterator<Range> rangeIterator = sortedRanges.iterator();
+            Iterator<Range> addIterator = rangeSet.sortedRanges.iterator();
+
+            Range toCheck = rangeIterator.next();
+            Range toAdd = addIterator.next();
+            while (true) {
+                if (toCheck.getLast() < toAdd.getFirst()) {
+                    newRanges.appendRange(toCheck);
+                    if (!rangeIterator.hasNext()) {
+                        toCheck = null;
+                        break;
+                    }
+                    toCheck = rangeIterator.next();
+                } else if (toCheck.getFirst() > toAdd.getLast()) {
+                    newRanges.appendRange(toAdd);
+
+                    if (!addIterator.hasNext()) {
+                        toAdd = null;
+                        break;
+                    }
+                    toAdd = addIterator.next();
+                } else {
+                    Range overlap = toCheck.overlap(toAdd);
+                    assert overlap != null;
+                    newRanges.appendRange(overlap);
+
+                    if (!rangeIterator.hasNext()) {
+                        toCheck = null;
+                        break;
+                    }
+                    toCheck = rangeIterator.next();
+
+                    if (!addIterator.hasNext()) {
+                        toAdd = null;
+                        break;
+                    }
+                    toAdd = addIterator.next();
+                }
+            }
 
-    public void addRange(Range range) {
-        // if empty, add as the only entry
-        if (sortedRanges.length == 0) {
-            sortedRanges = new Range[] {range};
-            return;
-        }
-        // if one other entry, test if before, after, or overlapping
-        if (sortedRanges.length == 1) {
-            Range existing = sortedRanges[0];
-            Range overlap = range.overlap(existing);
-            if (overlap != null) {
-                sortedRanges = new Range[] {overlap};
-            } else if (existing.compareTo(range) < 0) {
-                sortedRanges = new Range[] {existing, range};
+            // Grab remaining ranges
+            if (toCheck != null) {
+                assert toAdd == null;
+                newRanges.appendRange(toCheck);
+                while (rangeIterator.hasNext()) {
+                    newRanges.appendRange(rangeIterator.next());
+                }
             } else {
-                assert existing.compareTo(range) > 0;
-                sortedRanges = new Range[] {range, existing};
+                assert toAdd != null;
+                newRanges.appendRange(toAdd);
+                while (addIterator.hasNext()) {
+                    newRanges.appendRange(addIterator.next());
+                }
             }
-            return;
+
+            this.sortedRanges = newRanges.build();
+            poisonCache(0);
         }
+    }
 
-        // if more than one other entry, binarySearch to find before and after entry, and test both for overlapping
-        int index = Arrays.binarySearch(sortedRanges, range);
-        if (index >= 0) {
+    public void addRange(Range range) {
+        addRangeSet(RangeSet.fromSortedRanges(Collections.singletonList(range)));
+    }
 
-            // starting with that item, check to see if each following item is part of the existing range
-            // we know that no range before it will need to be considered, since the set should previously
-            // have been broken into non-contiguous ranges
-            Range merged = range;
-            int end = sortedRanges.length - 1;
-            for (int i = index; i < sortedRanges.length; i++) {
-                Range existing = sortedRanges[i];
-                // there is an item with the same start, either new item falls within it, or should replace it
-                Range overlap = existing.overlap(merged);
-
-                if (overlap == null) {
-                    // index before this one is the last item to be replaced
-                    end = i - 1;
+    public void removeRangeSet(RangeSet rangeSet) {
+        if (isEmpty() || rangeSet.isEmpty()) {
+            return;
+        }
+
+        RangeAccumulator newRanges = new RangeAccumulator();
+        RangeIterator rangeIterator = new RangeIterator(sortedRanges);
+        Iterator<Range> removeIterator = rangeSet.sortedRanges.iterator();
+
+        Range toCheck = rangeIterator.next();
+        Range toRemove = removeIterator.next();
+        while (true) {
+            if (toCheck.getLast() < toRemove.getFirst()) {
+                newRanges.appendRange(toCheck);
+                if (!rangeIterator.hasNext()) {
+                    toCheck = null;
                     break;
                 }
-                if (overlap.equals(existing)) {
-                    // the entire range to be added existed within an existing range, we're done
-                    return;
+                toCheck = rangeIterator.next();
+            } else if (toCheck.getFirst() > toRemove.getLast()) {
+                if (!removeIterator.hasNext()) {
+                    break;
+                }
+                toRemove = removeIterator.next();
+            } else {
+                Range[] remaining = toCheck.minus(toRemove);
+                if (remaining.length == 0) {
+                    // entire range removed, advance to the next range to check
+                    if (!rangeIterator.hasNext()) {
+                        toCheck = null;
+                        break;
+                    }
+                    toCheck = rangeIterator.next();
+                } else if (remaining.length == 1) {
+                    Range remainingRange = remaining[0];
+                    if (remainingRange.compareTo(toCheck) > 0) {
+                        // unremoved range still needs to be checked
+                        rangeIterator.advanceInCurrentRangeToKey(remainingRange.getFirst());
+                        toCheck = rangeIterator.next();
+
+                        if (!removeIterator.hasNext()) {
+                            break;
+                        }
+                        toRemove = removeIterator.next();
+                    } else {
+                        // keep the leading, remaining section
+                        newRanges.appendRange(remainingRange);
+
+                        // look at the next range
+                        if (!rangeIterator.hasNext()) {
+                            toCheck = null;
+                            break;
+                        }
+                        toCheck = rangeIterator.next();
+                    }
+                } else {
+                    assert remaining.length == 2;
+                    newRanges.appendRange(remaining[0]);
+
+                    rangeIterator.advanceInCurrentRangeToKey(remaining[1].getFirst());
+                    toCheck = rangeIterator.next();
+
+                    if (!removeIterator.hasNext()) {
+                        break;
+                    }
+                    toRemove = removeIterator.next();
                 }
-
-                // grow the region used for replacing
-                merged = overlap;
-            }
-            // splice out [index, end] items, replacing with the newly grown overlap object (may be the same
-            // size, and only replacing one item)
-            int newLength = sortedRanges.length - (end - index);
-            Range[] newArray = new Range[newLength];
-            if (index > 0) {
-                System.arraycopy(sortedRanges, 0, newArray, 0, index);
             }
-            newArray[index] = merged;
-            if (end < sortedRanges.length - 1) {
-                System.arraycopy(sortedRanges, end + 1, newArray, index + 1, sortedRanges.length - 1 - end);
+        }
+
+        // Grab remaining ranges
+        if (toCheck != null) {
+            newRanges.appendRange(toCheck);
+            while (rangeIterator.hasNext()) {
+                newRanges.appendRange(rangeIterator.next());
             }
-            sortedRanges = newArray;
-        } else {
-            int proposedIndex = -(index) - 1;
-            Range merged = range;
-            // test the item before the proposed location (if any), try to merge it
-            if (proposedIndex > 0) {
-                Range before = sortedRanges[proposedIndex - 1];
-                Range overlap = before.overlap(merged);
+        }
+
+        this.sortedRanges = newRanges.build();
+        poisonCache(0);
+    }
+
+    public void removeRange(Range range) {
+        removeRangeSet(RangeSet.fromSortedRanges(Collections.singletonList(range)));
+    }
+
+    public void clear() {
+        sortedRanges.clear();
+        poisonCache(0);
+    }
+
+    private static class RangeAccumulator {
+        private final List<Range> replacement = new ArrayList<>();
+
+        public void appendRange(Range range) {
+            if (!replacement.isEmpty()) {
+                Range lastSeen = replacement.get(replacement.size() - 1);
+                Range overlap = lastSeen.overlap(range);
                 if (overlap != null) {
-                    // replace the range that we are merging, and start the slice here instead
-                    merged = overlap;
-                    proposedIndex--;
-                    // TODO this will make the loop start here, considering this item twice. not ideal, but not a big
-                    // deal either
+                    replacement.set(replacement.size() - 1, overlap);
+                } else {
+                    replacement.add(range);
                 }
+            } else {
+                replacement.add(range);
             }
-            // "end" represents the last item that needs to be merged in to the newly added item. if no items are to be
-            // merged in, then end will be proposedIndex-1, meaning nothing gets merged in, and the array will grow
-            // instead of shrinking.
-            // if we never find an item we cannot merge with, the end of the replaced range is the last item of the old
-            // array, which could result in the new array having as little as only 1 item
-            int end = sortedRanges.length - 1;
-            // until we quit finding matches, test subsequent items
-            for (int i = proposedIndex; i < sortedRanges.length; i++) {
-                Range existing = sortedRanges[i];
-                Range overlap = existing.overlap(merged);
-                if (overlap == null) {
-                    // stop at the item before this one
-                    end = i - 1;
-                    break;
-                }
-                merged = overlap;
-            }
-            int newLength = sortedRanges.length - (end - proposedIndex);
-            assert newLength > 0 && newLength <= sortedRanges.length + 1;
-            Range[] newArray = new Range[newLength];
-            if (proposedIndex > 0) {
-                System.arraycopy(sortedRanges, 0, newArray, 0, proposedIndex);
-            }
-            newArray[proposedIndex] = merged;
-            if (end < sortedRanges.length - 1) {
-                System.arraycopy(sortedRanges, end + 1, newArray, proposedIndex + 1, sortedRanges.length - (end + 1));
-            }
-            sortedRanges = newArray;
+        }
+
+        public void appendRanges(List<Range> ranges) {
+            appendRange(ranges.get(0));
+            replacement.addAll(ranges.subList(0, ranges.size() - 1));
+        }
+
+        public void appendRanges(List<Range> ranges, long firstItemSubindex) {
+            Range first = ranges.get(0);
+            appendRange(new Range(first.getFirst() + firstItemSubindex, first.getLast()));
+            replacement.addAll(ranges.subList(0, ranges.size() - 1));
+        }
+
+        public List<Range> build() {
+            return replacement;
         }
     }
 
-    public void removeRange(Range range) {
-        // if empty, nothing to do
-        if (sortedRanges.length == 0) {
-            return;
+    private static class RangeIterator {
+        private int index = -1;
+        private final List<Range> ranges;
+        private long key = 0;
+
+        private RangeIterator(List<Range> ranges) {
+            this.ranges = ranges;
         }
 
-        // search the sorted list of ranges and find where the current range starts. two case here when using
-        // binarySearch, either the removed range starts in the same place as an existing range starts, or
-        // it starts before an item (and so we check the item before and the item after)
-        int index = Arrays.binarySearch(sortedRanges, range);
-        if (index < 0) {
-            // adjusted index notes where the item would be if it were added, minus _one more_ to see if
-            // it overlaps the item before it. To compute "the position where the new item belongs", we
-            // would do (-index - 1), so to examine one item prior to that we'll subtract one more. Then,
-            // to confirm that we are inserting in a valid position, take the max of that value and zero.
-            index = Math.max(0, -index - 2);
-        }
-
-        int beforeCount = -1;
-        int toRemove = 0;
-        for (; index < sortedRanges.length; index++) {
-            Range toCheck = sortedRanges[index];
-            if (toCheck.getFirst() > range.getLast()) {
-                break;// done, this is entirely after the range we're removing
-            }
-            if (toCheck.getLast() < range.getFirst()) {
-                continue;// skip, we don't overlap at all yet
-            }
-            Range[] remaining = toCheck.minus(range);
-            assert remaining != null : "Only early ranges are allowed to not match at all";
-
-            if (remaining.length == 2) {
-                // Removed region is entirely within the range we are checking:
-                // Splice in the one extra item and we're done - this entry
-                // both started before and ended after the removed section,
-                // so we don't even "break", we just return
-                assert toCheck.getFirst() < range.getFirst() : "Expected " + range + " to start after " + toCheck;
-                assert toCheck.getLast() > range.getLast() : "Expected " + range + " to end after " + toCheck;
-                assert toRemove == 0 && beforeCount == -1
-                        : "Expected that no previous items in the RangeSet had been removed toRemove=" + toRemove
-                                + ", beforeCount=" + beforeCount;
-
-                Range[] replacement = new Range[sortedRanges.length + 1];
-                if (index > 0) {
-                    System.arraycopy(sortedRanges, 0, replacement, 0, index);
-                }
-                replacement[index] = remaining[0];
-                replacement[index + 1] = remaining[1];
-                System.arraycopy(sortedRanges, index + 1, replacement, index + 2, sortedRanges.length - (index + 1));
+        public void advanceInCurrentRangeToKey(long key) {
+            assert key != 0;
+            this.key = key;
+        }
+
+        public boolean hasNext() {
+            return key == -1 || index < ranges.size() - 1;
+        }
 
-                sortedRanges = replacement;
+        public Range next() {
+            if (key != 0) {
+                Range r = ranges.get(index);
+                assert key > r.getFirst() && key <= r.getLast();
+                r = new Range(key, r.getLast());
+                key = 0;
 
-                return;
+                return r;
             }
-            if (remaining.length == 1) {
-                // swap shortened item and move on
-                sortedRanges[index] = remaining[0];
-            } else {
-                assert remaining.length == 0 : "Array contains a surprising number of items: " + remaining.length;
+            return ranges.get(++index);
+        }
 
-                // splice out this item as nothing exists here any more and move on
-                if (toRemove == 0) {
-                    beforeCount = index;
+    }
+
+    public void applyShifts(ShiftedRange[] shiftedRanges) {
+        if (shiftedRanges.length == 0 || isEmpty()) {
+            return;
+        }
+        RangeAccumulator newRanges = new RangeAccumulator();
+        RangeIterator rangeIterator = new RangeIterator(sortedRanges);
+        Iterator<ShiftedRange> shiftIterator = Arrays.asList(shiftedRanges).iterator();
+        Range toCheck = rangeIterator.next();
+        ShiftedRange shiftedRange = shiftIterator.next();
+        do {
+            if (toCheck.getLast() < shiftedRange.getRange().getFirst()) {
+                // leave this range alone, the range to shift is after it
+                newRanges.appendRange(toCheck);
+                if (!rangeIterator.hasNext()) {
+                    toCheck = null;
+                    break;
+                }
+                toCheck = rangeIterator.next();
+            } else if (toCheck.getFirst() > shiftedRange.getRange().getLast()) {
+                // skip the rest of this shift, the next range is after it
+                if (!shiftIterator.hasNext()) {
+                    break;
+                }
+                shiftedRange = shiftIterator.next();
+            } else {
+                Range[] remaining = toCheck.minus(shiftedRange.getRange());
+                if (remaining.length == 0) {
+                    // entire range shifted
+                    newRanges.appendRange(toCheck.shift(shiftedRange.getDelta()));
+                    if (!rangeIterator.hasNext()) {
+                        toCheck = null;
+                        break;
+                    }
+                    toCheck = rangeIterator.next();
+                } else if (remaining.length == 1) {
+                    Range remainingRange = remaining[0];
+
+                    Range[] complimentArr = toCheck.minus(remainingRange);
+                    assert complimentArr.length == 1;
+                    Range compliment = complimentArr[0];
+                    if (remainingRange.compareTo(toCheck) > 0) {
+                        // shift the compliment
+                        newRanges.appendRange(compliment.shift(shiftedRange.getDelta()));
+
+                        // rest of the range still needs to be checked
+                        rangeIterator.advanceInCurrentRangeToKey(remainingRange.getFirst());
+                        toCheck = rangeIterator.next();
+
+                        // shift is consumed, move to the next one
+                        if (!shiftIterator.hasNext()) {
+                            break;
+                        }
+                        shiftedRange = shiftIterator.next();
+                    } else {
+                        // keep the remaining section
+                        newRanges.appendRange(remainingRange);
+                        // leftovers after, shift the compliment
+                        newRanges.appendRange(compliment.shift(shiftedRange.getDelta()));
+
+                        // look at the next range
+                        if (!rangeIterator.hasNext()) {
+                            toCheck = null;
+                            break;
+                        }
+                        toCheck = rangeIterator.next();
+                    }
+                } else {
+                    assert remaining.length == 2;
+                    // We matched the entire shift range, plus a prefix and suffix
+                    // First append the before section
+                    newRanges.appendRange(remaining[0]);
+                    // Then the entire shift range
+                    newRanges.appendRange(shiftedRange.getResultRange());
+
+                    // Visit the rest of the range next
+                    rangeIterator.advanceInCurrentRangeToKey(remaining[1].getFirst());
+                    toCheck = rangeIterator.next();
+
+                    if (!shiftIterator.hasNext()) {
+                        break;
+                    }
+                    shiftedRange = shiftIterator.next();
                 }
-                toRemove++;
             }
+        } while (true);
 
+        // Grab remaining ranges
+        if (toCheck != null) {
+            newRanges.appendRange(toCheck);
+            while (rangeIterator.hasNext()) {
+                newRanges.appendRange(rangeIterator.next());
+            }
         }
-        if (toRemove > 0) {
-            Range[] replacement = new Range[sortedRanges.length - toRemove];
-            System.arraycopy(sortedRanges, 0, replacement, 0, beforeCount);
-            System.arraycopy(sortedRanges, beforeCount + toRemove, replacement, beforeCount,
-                    sortedRanges.length - beforeCount - toRemove);
 
-            sortedRanges = replacement;
-        } else {
-            assert beforeCount == -1 : "No items to remove, but beforeCount set?";
-        }
+        sortedRanges = newRanges.build();
+        poisonCache(0);
     }
 
     /**
@@ -249,17 +397,62 @@ public void removeRange(Range range) {
      * @return Iterator of {@link Range}
      */
     public Iterator<Range> rangeIterator() {
-        return Arrays.asList(sortedRanges).iterator();
+        return sortedRanges.iterator();
+    }
+
+    public Iterator<Range> reverseRangeIterator() {
+        return new Iterator<>() {
+            int i = sortedRanges.size();
+
+            @Override
+            public boolean hasNext() {
+                return i > 0;
+            }
+
+            @Override
+            public Range next() {
+                return sortedRanges.get(--i);
+            }
+        };
     }
 
     public PrimitiveIterator.OfLong indexIterator() {
-        return Arrays.stream(sortedRanges)
-                .flatMapToLong(range -> LongStream.rangeClosed(range.getFirst(), range.getLast()))
-                .iterator();
+        if (isEmpty()) {
+            return LongStream.empty().iterator();
+        }
+        return new PrimitiveIterator.OfLong() {
+            private int rangeIndex = 0;
+            private Range current = sortedRanges.get(0);
+            private long offsetInRange = 0;
+
+            @Override
+            public long nextLong() {
+                long value = current.getFirst() + offsetInRange;
+                if (++offsetInRange >= current.size()) {
+                    rangeIndex++;
+                    offsetInRange = 0;
+                    if (rangeIndex < rangeCount()) {
+                        current = sortedRanges.get(rangeIndex);
+                    } else {
+                        current = null;
+                    }
+                }
+                return value;
+            }
+
+            @Override
+            public boolean hasNext() {
+                return rangeIndex < rangeCount();
+            }
+        };
     }
 
     public int rangeCount() {
-        return sortedRanges.length;
+        return sortedRanges.size();
+    }
+
+    public boolean isFlat() {
+        return sortedRanges.isEmpty() || sortedRanges.size() == 1 && getFirstRow() == 0;
     }
 
     /**
@@ -270,11 +463,15 @@ public int rangeCount() {
      * @return long
      */
     public long size() {
-        return Arrays.stream(sortedRanges).mapToLong(Range::size).sum();
+        if (rangeCount() == 0) {
+            return 0;
+        }
+        ensureCardinalityCache();
+        return cardinality[sortedRanges.size() - 1];
     }
 
     public boolean isEmpty() {
-        return sortedRanges.length == 0;
+        return rangeCount() == 0;
     }
 
     public boolean contains(long value) {
@@ -319,19 +516,83 @@ public boolean includesAllOf(RangeSet other) {
         return true;
     }
 
+    public boolean includesAnyOf(Range range) {
+        if (isEmpty()) {
+            return false;
+        }
+        // search the sorted list of ranges and find where the current range starts. two case here when using
+        // binarySearch, either the removed range starts in the same place as an existing range starts, or
+        // it starts before an item (and so we check the item before and the item after)
+        int index = Collections.binarySearch(sortedRanges, range);
+        if (index >= 0) {
+            // matching start position
+            return true;
+        }
+        // adjusted index notes where the item would be if it were added, minus _one more_ to see if
+        // it overlaps the item before it. To compute "the position where the new item belongs", we
+        // would do (-index - 1), so to examine one item prior to that we'll subtract one more. Then,
+        // to confirm that we are inserting in a valid position, take the max of that value and zero.
+        index = Math.max(0, -index - 2);
+
+        // Check if there is any overlap with the prev item
+        Range target = sortedRanges.get(index);
+        if (range.getFirst() <= target.getLast() && range.getLast() >= target.getFirst()) {
+            return true;
+        }
+
+        // Check if there is a later item, and if there is an overlap with it
+        index++;
+        if (index >= rangeCount()) {
+            return false;
+        }
+        target = sortedRanges.get(index);
+        return range.getFirst() <= target.getLast() && range.getLast() >= target.getFirst();
+    }
+
+    public long find(long key) {
+        long cnt = 0;
+        Iterator<Range> seenIterator = rangeIterator();
+
+        while (seenIterator.hasNext()) {
+            Range current = seenIterator.next();
+
+            if (key < current.getFirst()) {
+                // can't match at all, starts too early
+                return -cnt - 1;
+            }
+
+            if (key > current.getLast()) {
+                // doesn't start until after the current range, so keep moving forward
+                cnt += current.size();
+                continue;
+            }
+            if (key <= current.getLast()) {
+                // this is a match
+                return cnt + key - current.getFirst();
+            }
+        }
+        return -cnt - 1;
+    }
+
     @Override
     public String toString() {
         return "RangeSet{" +
-                "sortedRanges=" + Arrays.toString(sortedRanges) +
+                "sortedRanges=" + sortedRanges +
                 '}';
     }
 
     public long getFirstRow() {
-        return sortedRanges[0].getFirst();
+        return sortedRanges.get(0).getFirst();
     }
 
     public long getLastRow() {
-        return sortedRanges[sortedRanges.length - 1].getLast();
+        return sortedRanges.get(rangeCount() - 1).getLast();
+    }
+
+    public RangeSet copy() {
+        RangeSet copy = new RangeSet();
+        copy.sortedRanges = new ArrayList<>(sortedRanges);
+        return copy;
     }
 
     @Override
@@ -342,20 +603,206 @@ public boolean equals(Object o) {
             return false;
 
         final RangeSet rangeSet = (RangeSet) o;
-        return Arrays.equals(sortedRanges, rangeSet.sortedRanges);
+        return sortedRanges.equals(rangeSet.sortedRanges);
     }
 
     @Override
     public int hashCode() {
-        return Arrays.hashCode(sortedRanges);
+        return sortedRanges.hashCode();
+    }
+
+    /**
+     * Indicates that this item has been changed, and should be recomputed. Stores the earliest offset that should be
+     * recomputed.
+     */
+    private void poisonCache(int rangeIndex) {
+        firstWrongCacheEntry = Math.min(rangeIndex, firstWrongCacheEntry);
+    }
+
+    /**
+     * Ensures that the cardinality cache is correct, by correcting any values after the first wrong entry.
+     */
+    private void ensureCardinalityCache() {
+        if (firstWrongCacheEntry == rangeCount()) {
+            return;
+        }
+        if (cardinality.length < rangeCount()) {
+            long[] replacement = new long[rangeCount()];
+            System.arraycopy(cardinality, 0, replacement, 0, cardinality.length);
+            cardinality = replacement;
+        }
+        assert firstWrongCacheEntry >= 0 : this;
+        long cumulative = firstWrongCacheEntry == 0 ? 0 : cardinality[firstWrongCacheEntry - 1];
+        for (int i = firstWrongCacheEntry; i < rangeCount(); i++) {
+            cumulative += sortedRanges.get(i).size();
+            this.cardinality[i] = cumulative;
+        }
+        firstWrongCacheEntry = rangeCount();
+        assert cardinality.length >= rangeCount() : this;
+    }
+
+    public RangeSet subsetForPositions(RangeSet positions, boolean reversed) {
+        if (reversed) {
+            throw new UnsupportedOperationException("reversed=true");
+        }
+        if (positions.isEmpty() || isEmpty()) {
+            return empty();
+        }
+        ensureCardinalityCache();
+
+        List<Range> ranges = new ArrayList<>();
+
+        Iterator<Range> positionsIter = positions.rangeIterator();
+
+        int from = 0;
+        while (positionsIter.hasNext()) {
+            Range nextPosRange = positionsIter.next();
+            if (nextPosRange.getFirst() > size()) {
+                // Entire range is past the end - since ranges are sorted, we're done
+                break;
+            } else if (nextPosRange.getFirst() == size()) {
+                ranges.add(new Range(getLastRow(), getLastRow()));
+                break;
+            }
+            long rangeToTake = nextPosRange.size();
+
+            int pos = Arrays.binarySearch(cardinality, from, rangeCount(), nextPosRange.getFirst() + 1);
+
+            long first;
+            Range target;
+            long offset;
+            if (pos >= 0) {
+                // Position matches the last item in the current range
+                target = sortedRanges.get(pos);
+                offset = 1;
+            } else {
+                // Position matches an earlier item in
+                pos = -pos - 1;
+                target = sortedRanges.get(pos);
+                long c = cardinality[pos];
+                offset = c - nextPosRange.getFirst();// positive value to offset backwards from the end of target
+            }
+            assert target != null : this + ".subsetForPositions(" + positions + ")";
+            assert offset >= 0 && offset <= target.size() : offset;
+            first = target.getLast() - offset + 1;
+
+            while (rangeToTake > 0) {
+                long count = Math.min(offset, rangeToTake);
+                Range res = new Range(first, first + count - 1);
+                assert count == res.size();
+                ranges.add(res);
+
+                rangeToTake -= count;
+                pos++;
+                if (pos >= rangeCount()) {
+                    break;
+                }
+                target = sortedRanges.get(pos);
+                first = target.getFirst();
+                offset = target.size();
+            }
+
+            from = pos - 1;
+        }
+        RangeSet result = RangeSet.fromSortedRanges(ranges.toArray(new Range[0]));
+        assert result.size() <= positions.size();
+        return result;
+    }
+
+    /**
+     *
+     * @param keys
+     * @return
+     */
+    public RangeSet invert(RangeSet keys) {
+        if (keys.isEmpty()) {
+            return empty();
+        }
+        if (isEmpty()) {
+            throw new IllegalArgumentException("Keys not found: " + keys);
+        }
+        ensureCardinalityCache();
+
+        List<Range> positions = new ArrayList<>();
+
+        int from = 0;
+
+        Iterator<Range> keysIter = keys.rangeIterator();
+        long startPos = -1;
+        long endPos = Long.MIN_VALUE;
+        while (keysIter.hasNext()) {
+            Range nextKeyRange = keysIter.next();
+
+            int index = Collections.binarySearch(sortedRanges.subList(from, sortedRanges.size()), nextKeyRange);
+            if (index < 0) {
+                index = -index - 2;// examine the previous element
+            }
+            index += from;
+            if (index < 0) {
+                throw new IllegalArgumentException("Key " + nextKeyRange.getFirst() + " not found");
+            }
+            Range target = sortedRanges.get(index);
+
+            long newStartPos =
+                    (index == 0 ? 0 : this.cardinality[index - 1]) + (nextKeyRange.getFirst() - target.getFirst());
+            if (newStartPos - 1 == endPos) {
+                // nothing to do, only grow the existing range
+                // endPos = newStartPos + (nextKeyRange.size() - 1);
+            } else {
+                // append the existing range and start a new one
+                if (endPos != Long.MIN_VALUE) {
+                    positions.add(new Range(startPos, endPos));
+                }
+
+                startPos = newStartPos;
+                // endPos = startPos + (nextKeyRange.size() - 1);
+            }
+            endPos = newStartPos + (nextKeyRange.size() - 1);
+
+            from = index;
+        }
+        assert endPos != Long.MIN_VALUE;
+        positions.add(new Range(startPos, endPos));
+
+        RangeSet result = RangeSet.fromSortedRanges(positions.toArray(new Range[0]));
+        assert result.size() == keys.size();
+        return result;
     }
 
 
-    Range[] getSortedRanges() {
-        return sortedRanges;
+    public long get(long key) {
+        if (key == 0) {
+            return getFirstRow();
+        }
+        if (key >= size()) {
+            return -1;
+        }
+        ensureCardinalityCache();
+
+        int pos = Arrays.binarySearch(cardinality, 0, sortedRanges.size(), key);
+
+        if (pos >= 0) {
+            return sortedRanges.get(pos + 1).getFirst();
+        }
+        Range target = sortedRanges.get(-pos - 1);
+        long c = cardinality[-pos - 1];
+        long offset = c - key;// positive value to offset backwards from the end of target
+        assert offset >= 0;
+        return target.getLast() - offset + 1;
     }
 
-    void setSortedRanges(Range[] sortedRanges) {
-        this.sortedRanges = sortedRanges;
+    /**
+     * Removes all keys in the provided rangeset that are present in this.
+     *
+     * @param other the rows to remove
+     * @return any removed keys
+     */
+    public RangeSet extract(RangeSet other) {
+        RangeSet populatedCopy = copy();
+        populatedCopy.removeRangeSet(other);
+        RangeSet removed = copy();
+        removed.removeRangeSet(populatedCopy);
+        removeRangeSet(removed);
+        return removed;
     }
 }
diff --git a/web/shared-beans/src/main/java/io/deephaven/web/shared/data/ShiftedRange.java b/web/shared-beans/src/main/java/io/deephaven/web/shared/data/ShiftedRange.java
index 4b1b587be97..f1d9e4848d6 100644
--- a/web/shared-beans/src/main/java/io/deephaven/web/shared/data/ShiftedRange.java
+++ b/web/shared-beans/src/main/java/io/deephaven/web/shared/data/ShiftedRange.java
@@ -31,4 +31,16 @@ public long getDelta() {
     public void setDelta(final long delta) {
         this.delta = delta;
     }
+
+    public Range getResultRange() {
+        return range.shift(delta);
+    }
+
+    @Override
+    public String toString() {
+        return "ShiftedRange{" +
+                "range=" + range +
+                ", delta=" + delta +
+                '}';
+    }
 }
diff --git a/web/shared-beans/src/main/java/io/deephaven/web/shared/data/TableSnapshot.java b/web/shared-beans/src/main/java/io/deephaven/web/shared/data/TableSnapshot.java
deleted file mode 100644
index ae5f8870184..00000000000
--- a/web/shared-beans/src/main/java/io/deephaven/web/shared/data/TableSnapshot.java
+++ /dev/null
@@ -1,60 +0,0 @@
-//
-// Copyright (c) 2016-2024 Deephaven Data Labs and Patent Pending
-//
-package io.deephaven.web.shared.data;
-
-import io.deephaven.web.shared.data.columns.ColumnData;
-
-import java.io.Serializable;
-
-public class TableSnapshot implements Serializable {
-    public enum SnapshotType {
-        INITIAL_SNAPSHOT, UPDATE_COLUMN_SNAPSHOT, UPDATE_ROW_SNAPSHOT, FORCED_SNAPSHOT,
-    }
-
-    private SnapshotType snapshotType;
-
-    private ColumnData[] dataColumns;
-    private RangeSet includedRows;
-
-    private long tableSize;
-
-    public TableSnapshot() {}
-
-    public TableSnapshot(RangeSet includedAdditions, ColumnData[] dataColumns, long tableSize) {
-        this.snapshotType = SnapshotType.INITIAL_SNAPSHOT;
-
-        this.dataColumns = dataColumns;
-        this.includedRows = includedAdditions;
-
-        this.tableSize = tableSize;
-    }
-
-    public SnapshotType getSnapshotType() {
-        return snapshotType;
-    }
-
-    public ColumnData[] getDataColumns() {
-        return dataColumns;
-    }
-
-    public void setDataColumns(ColumnData[] dataColumns) {
-        this.dataColumns = dataColumns;
-    }
-
-    public RangeSet getIncludedRows() {
-        return includedRows;
-    }
-
-    public void setIncludedRows(RangeSet includedRows) {
-        this.includedRows = includedRows;
-    }
-
-    public void setTableSize(long tableSize) {
-        this.tableSize = tableSize;
-    }
-
-    public long getTableSize() {
-        return tableSize;
-    }
-}
diff --git a/web/shared-beans/src/main/java/io/deephaven/web/shared/data/TableSubscriptionRequest.java b/web/shared-beans/src/main/java/io/deephaven/web/shared/data/TableSubscriptionRequest.java
deleted file mode 100644
index 3dc940db123..00000000000
--- a/web/shared-beans/src/main/java/io/deephaven/web/shared/data/TableSubscriptionRequest.java
+++ /dev/null
@@ -1,76 +0,0 @@
-//
-// Copyright (c) 2016-2024 Deephaven Data Labs and Patent Pending
-//
-package io.deephaven.web.shared.data;
-
-import javax.annotation.Nullable;
-import java.io.Serializable;
-import java.util.BitSet;
-
-/**
- * A class to encapsulate updates to a given table's subscription.
- *
- * Because the server is now managing the creation of a "tail table" to only subscribe to updates after all filters have
- * run, we are giving the server a bit more rights w.r.t. subscription state management.
- *
- * The client will now send an array of ViewportSubscription, each containing a subscriptionId (JsTable id) and a
- * {@link Viewport} object.
- *
- * The server will be responsible for merging ranges and columns to create flattened tables with the desired viewports.
- *
- * For now, we'll likely preserve "bunch them all together" semantics, but we should do performance testing to identify
- * if we'll get better performance from having multiple tables of smaller viewport scope (more messages on the wire, but
- * less work to do before sending messages).
- *
- * The {@link #columns} must be non-null (and almost always non-empty), but {@link #rows} may be null to indicate a
- * non-viewport subscription.
- */
-public class TableSubscriptionRequest implements Serializable {
-
-    private int subscriptionId;
-    private RangeSet rows;
-    private BitSet columns;
-
-    public TableSubscriptionRequest() {
-
-    }
-
-    public TableSubscriptionRequest(int subscriptionId, @Nullable RangeSet rows, BitSet columns) {
-        this.subscriptionId = subscriptionId;
-        this.rows = rows;
-        this.columns = columns;
-    }
-
-    public int getSubscriptionId() {
-        return subscriptionId;
-    }
-
-    public RangeSet getRows() {
-        return rows;
-    }
-
-    public BitSet getColumns() {
-        return columns;
-    }
-
-    void setSubscriptionId(int subscriptionId) {
-        this.subscriptionId = subscriptionId;
-    }
-
-    void setRows(RangeSet rows) {
-        this.rows = rows;
-    }
-
-    void setColumns(BitSet columns) {
-        this.columns = columns;
-    }
-
-    @Override
-    public String toString() {
-        return "TableSubscriptionRequest{" +
-                "subscriptionId=" + subscriptionId +
-                ", rows=" + rows +
-                ", columns=" + columns +
-                '}';
-    }
-}
diff --git a/web/shared-beans/src/main/java/io/deephaven/web/shared/data/Viewport.java b/web/shared-beans/src/main/java/io/deephaven/web/shared/data/Viewport.java
deleted file mode 100644
index bdc19ce9e39..00000000000
--- a/web/shared-beans/src/main/java/io/deephaven/web/shared/data/Viewport.java
+++ /dev/null
@@ -1,75 +0,0 @@
-//
-// Copyright (c) 2016-2024 Deephaven Data Labs and Patent Pending
-//
-package io.deephaven.web.shared.data;
-
-import java.io.Serializable;
-import java.util.BitSet;
-
-public class Viewport implements Serializable {
-
-    private final RangeSet rows;
-    private final BitSet columns;
-
-    public Viewport() {
-        this(new RangeSet(), new BitSet());
-    }
-
-    public Viewport(RangeSet rows, BitSet columns) {
-        this.rows = rows;
-        this.columns = columns;
-    }
-
-    public Viewport merge(Viewport other) {
-        RangeSet mergedRows = new RangeSet();
-        rows.rangeIterator().forEachRemaining(mergedRows::addRange);
-        other.rows.rangeIterator().forEachRemaining(mergedRows::addRange);
-
-        BitSet mergedColumns = new BitSet();
-        mergedColumns.or(columns);
-        mergedColumns.or(other.columns);
-
-        return new Viewport(mergedRows, mergedColumns);
-    }
-
-    public RangeSet getRows() {
-        return rows;
-    }
-
-    public BitSet getColumns() {
-        return columns;
-    }
-
-    @Override
-    public boolean equals(Object o) {
-        if (this == o)
-            return true;
-        if (o == null || getClass() != o.getClass())
-            return false;
-
-        final Viewport viewport = (Viewport) o;
-
-        if (!rows.equals(viewport.rows))
-            return false;
-        return columns.equals(viewport.columns);
-    }
-
-    @Override
-    public int hashCode() {
-        int result = rows.hashCode();
-        result = 31 * result + columns.hashCode();
-        return result;
-    }
-
-    @Override
-    public String toString() {
-        return "Viewport{" +
-                "rows=" + rows +
-                ", columns=" + columns +
-                '}';
-    }
-
-    public boolean isEmpty() {
-        return rows.size() == 0 && columns.isEmpty();
-    }
-}
diff --git a/web/shared-beans/src/main/java/io/deephaven/web/shared/data/columns/BigDecimalArrayColumnData.java b/web/shared-beans/src/main/java/io/deephaven/web/shared/data/columns/BigDecimalArrayColumnData.java
deleted file mode 100644
index 9a6bed67823..00000000000
--- a/web/shared-beans/src/main/java/io/deephaven/web/shared/data/columns/BigDecimalArrayColumnData.java
+++ /dev/null
@@ -1,44 +0,0 @@
-//
-// Copyright (c) 2016-2024 Deephaven Data Labs and Patent Pending
-//
-package io.deephaven.web.shared.data.columns;
-
-import java.math.BigDecimal;
-import java.util.Arrays;
-
-/**
- * Holder for data associated with a column of type java.math.BigDecimal.
- */
-public class BigDecimalArrayColumnData extends ColumnData {
-    private BigDecimal[] data;
-
-    public BigDecimalArrayColumnData() {}
-
-    public BigDecimalArrayColumnData(BigDecimal[] data) {
-        this.data = data;
-    }
-
-    public BigDecimal[] getData() {
-        return data;
-    }
-
-    public void setData(BigDecimal[] data) {
-        this.data = data;
-    }
-
-    @Override
-    public boolean equals(Object o) {
-        if (this == o)
-            return true;
-        if (o == null || getClass() != o.getClass())
-            return false;
-        final BigDecimalArrayColumnData that = (BigDecimalArrayColumnData) o;
-        return Arrays.deepEquals(data, that.data);
-    }
-
-    @Override
-    public int hashCode() {
-        return Arrays.deepHashCode(data);
-    }
-}
-
diff --git a/web/shared-beans/src/main/java/io/deephaven/web/shared/data/columns/BigIntegerArrayColumnData.java b/web/shared-beans/src/main/java/io/deephaven/web/shared/data/columns/BigIntegerArrayColumnData.java
deleted file mode 100644
index b9eb9db11fc..00000000000
--- a/web/shared-beans/src/main/java/io/deephaven/web/shared/data/columns/BigIntegerArrayColumnData.java
+++ /dev/null
@@ -1,44 +0,0 @@
-//
-// Copyright (c) 2016-2024 Deephaven Data Labs and Patent Pending
-//
-package io.deephaven.web.shared.data.columns;
-
-import java.math.BigInteger;
-import java.util.Arrays;
-
-/**
- * Holder for data associated with a column of type java.math.BigInteger.
- */
-public class BigIntegerArrayColumnData extends ColumnData {
-    private BigInteger[] data;
-
-    public BigIntegerArrayColumnData() {}
-
-    public BigIntegerArrayColumnData(BigInteger[] data) {
-        this.data = data;
-    }
-
-    public BigInteger[] getData() {
-        return data;
-    }
-
-    public void setData(BigInteger[] data) {
-        this.data = data;
-    }
-
-    @Override
-    public boolean equals(Object o) {
-        if (this == o)
-            return true;
-        if (o == null || getClass() != o.getClass())
-            return false;
-        final BigIntegerArrayColumnData that = (BigIntegerArrayColumnData) o;
-        return Arrays.deepEquals(data, that.data);
-    }
-
-    @Override
-    public int hashCode() {
-        return Arrays.deepHashCode(data);
-    }
-}
-
diff --git a/web/shared-beans/src/main/java/io/deephaven/web/shared/data/columns/BooleanArrayColumnData.java b/web/shared-beans/src/main/java/io/deephaven/web/shared/data/columns/BooleanArrayColumnData.java
deleted file mode 100644
index 487c6592ca2..00000000000
--- a/web/shared-beans/src/main/java/io/deephaven/web/shared/data/columns/BooleanArrayColumnData.java
+++ /dev/null
@@ -1,41 +0,0 @@
-//
-// Copyright (c) 2016-2024 Deephaven Data Labs and Patent Pending
-//
-package io.deephaven.web.shared.data.columns;
-
-import java.util.Arrays;
-
-public class BooleanArrayColumnData extends ColumnData {
-    private Boolean[] data;
-
-    public BooleanArrayColumnData() {}
-
-    public BooleanArrayColumnData(Boolean[] data) {
-        this.data = data;
-    }
-
-    public Boolean[] getData() {
-        return data;
-    }
-
-    public void setData(Boolean[] data) {
-        this.data = data;
-    }
-
-    @Override
-    public boolean equals(Object o) {
-        if (this == o)
-            return true;
-        if (o == null || getClass() != o.getClass())
-            return false;
-
-        BooleanArrayColumnData that = (BooleanArrayColumnData) o;
-
-        return Arrays.equals(data, that.data);
-    }
-
-    @Override
-    public int hashCode() {
-        return Arrays.hashCode(data);
-    }
-}
diff --git a/web/shared-beans/src/main/java/io/deephaven/web/shared/data/columns/ByteArrayColumnData.java b/web/shared-beans/src/main/java/io/deephaven/web/shared/data/columns/ByteArrayColumnData.java
deleted file mode 100644
index 7bbe9a1b710..00000000000
--- a/web/shared-beans/src/main/java/io/deephaven/web/shared/data/columns/ByteArrayColumnData.java
+++ /dev/null
@@ -1,41 +0,0 @@
-//
-// Copyright (c) 2016-2024 Deephaven Data Labs and Patent Pending
-//
-package io.deephaven.web.shared.data.columns;
-
-import java.util.Arrays;
-
-public class ByteArrayColumnData extends ColumnData {
-    private byte[] data;
-
-    public ByteArrayColumnData() {}
-
-    public ByteArrayColumnData(byte[] data) {
-        this.data = data;
-    }
-
-    public byte[] getData() {
-        return data;
-    }
-
-    public void setData(byte[] data) {
-        this.data = data;
-    }
-
-    @Override
-    public boolean equals(Object o) {
-        if (this == o)
-            return true;
-        if (o == null || getClass() != o.getClass())
-            return false;
-
-        ByteArrayColumnData that = (ByteArrayColumnData) o;
-
-        return Arrays.equals(data, that.data);
-    }
-
-    @Override
-    public int hashCode() {
-        return Arrays.hashCode(data);
-    }
-}
diff --git a/web/shared-beans/src/main/java/io/deephaven/web/shared/data/columns/CharArrayColumnData.java b/web/shared-beans/src/main/java/io/deephaven/web/shared/data/columns/CharArrayColumnData.java
deleted file mode 100644
index 22aae999562..00000000000
--- a/web/shared-beans/src/main/java/io/deephaven/web/shared/data/columns/CharArrayColumnData.java
+++ /dev/null
@@ -1,41 +0,0 @@
-//
-// Copyright (c) 2016-2024 Deephaven Data Labs and Patent Pending
-//
-package io.deephaven.web.shared.data.columns;
-
-import java.util.Arrays;
-
-public class CharArrayColumnData extends ColumnData {
-    private char[] data;
-
-    public CharArrayColumnData() {}
-
-    public CharArrayColumnData(char[] data) {
-        this.data = data;
-    }
-
-    public char[] getData() {
-        return data;
-    }
-
-    public void setData(char[] data) {
-        this.data = data;
-    }
-
-    @Override
-    public boolean equals(Object o) {
-        if (this == o)
-            return true;
-        if (o == null || getClass() != o.getClass())
-            return false;
-
-        CharArrayColumnData that = (CharArrayColumnData) o;
-
-        return Arrays.equals(data, that.data);
-    }
-
-    @Override
-    public int hashCode() {
-        return Arrays.hashCode(data);
-    }
-}
diff --git a/web/shared-beans/src/main/java/io/deephaven/web/shared/data/columns/ColumnData.java b/web/shared-beans/src/main/java/io/deephaven/web/shared/data/columns/ColumnData.java
deleted file mode 100644
index 20817d4672a..00000000000
--- a/web/shared-beans/src/main/java/io/deephaven/web/shared/data/columns/ColumnData.java
+++ /dev/null
@@ -1,11 +0,0 @@
-//
-// Copyright (c) 2016-2024 Deephaven Data Labs and Patent Pending
-//
-package io.deephaven.web.shared.data.columns;
-
-import java.io.Serializable;
-
-public abstract class ColumnData implements Serializable {
-
-    public abstract Object getData();
-}
diff --git a/web/shared-beans/src/main/java/io/deephaven/web/shared/data/columns/DoubleArrayColumnData.java b/web/shared-beans/src/main/java/io/deephaven/web/shared/data/columns/DoubleArrayColumnData.java
deleted file mode 100644
index 6864217cfb4..00000000000
--- a/web/shared-beans/src/main/java/io/deephaven/web/shared/data/columns/DoubleArrayColumnData.java
+++ /dev/null
@@ -1,41 +0,0 @@
-//
-// Copyright (c) 2016-2024 Deephaven Data Labs and Patent Pending
-//
-package io.deephaven.web.shared.data.columns;
-
-import java.util.Arrays;
-
-public class DoubleArrayColumnData extends ColumnData {
-    private double[] data;
-
-    public DoubleArrayColumnData() {}
-
-    public DoubleArrayColumnData(double[] data) {
-        this.data = data;
-    }
-
-    public double[] getData() {
-        return data;
-    }
-
-    public void setData(double[] data) {
-        this.data = data;
-    }
-
-    @Override
-    public boolean equals(Object o) {
-        if (this == o)
-            return true;
-        if (o == null || getClass() != o.getClass())
-            return false;
-
-        DoubleArrayColumnData that = (DoubleArrayColumnData) o;
-
-        return Arrays.equals(data, that.data);
-    }
-
-    @Override
-    public int hashCode() {
-        return Arrays.hashCode(data);
-    }
-}
diff --git a/web/shared-beans/src/main/java/io/deephaven/web/shared/data/columns/FloatArrayColumnData.java b/web/shared-beans/src/main/java/io/deephaven/web/shared/data/columns/FloatArrayColumnData.java
deleted file mode 100644
index 8fd13a5962f..00000000000
--- a/web/shared-beans/src/main/java/io/deephaven/web/shared/data/columns/FloatArrayColumnData.java
+++ /dev/null
@@ -1,41 +0,0 @@
-//
-// Copyright (c) 2016-2024 Deephaven Data Labs and Patent Pending
-//
-package io.deephaven.web.shared.data.columns;
-
-import java.util.Arrays;
-
-public class FloatArrayColumnData extends ColumnData {
-    private float[] data;
-
-    public FloatArrayColumnData() {}
-
-    public FloatArrayColumnData(float[] data) {
-        this.data = data;
-    }
-
-    public float[] getData() {
-        return data;
-    }
-
-    public void setData(float[] data) {
-        this.data = data;
-    }
-
-    @Override
-    public boolean equals(Object o) {
-        if (this == o)
-            return true;
-        if (o == null || getClass() != o.getClass())
-            return false;
-
-        FloatArrayColumnData that = (FloatArrayColumnData) o;
-
-        return Arrays.equals(data, that.data);
-    }
-
-    @Override
-    public int hashCode() {
-        return Arrays.hashCode(data);
-    }
-}
diff --git a/web/shared-beans/src/main/java/io/deephaven/web/shared/data/columns/IntArrayColumnData.java b/web/shared-beans/src/main/java/io/deephaven/web/shared/data/columns/IntArrayColumnData.java
deleted file mode 100644
index 49b1b2e4d86..00000000000
--- a/web/shared-beans/src/main/java/io/deephaven/web/shared/data/columns/IntArrayColumnData.java
+++ /dev/null
@@ -1,41 +0,0 @@
-//
-// Copyright (c) 2016-2024 Deephaven Data Labs and Patent Pending
-//
-package io.deephaven.web.shared.data.columns;
-
-import java.util.Arrays;
-
-public class IntArrayColumnData extends ColumnData {
-    private int[] data;
-
-    public IntArrayColumnData() {}
-
-    public IntArrayColumnData(int[] data) {
-        this.data = data;
-    }
-
-    public int[] getData() {
-        return data;
-    }
-
-    public void setData(int[] data) {
-        this.data = data;
-    }
-
-    @Override
-    public boolean equals(Object o) {
-        if (this == o)
-            return true;
-        if (o == null || getClass() != o.getClass())
-            return false;
-
-        IntArrayColumnData that = (IntArrayColumnData) o;
-
-        return Arrays.equals(data, that.data);
-    }
-
-    @Override
-    public int hashCode() {
-        return Arrays.hashCode(data);
-    }
-}
diff --git a/web/shared-beans/src/main/java/io/deephaven/web/shared/data/columns/LocalDateArrayColumnData.java b/web/shared-beans/src/main/java/io/deephaven/web/shared/data/columns/LocalDateArrayColumnData.java
deleted file mode 100644
index 4fd4226279e..00000000000
--- a/web/shared-beans/src/main/java/io/deephaven/web/shared/data/columns/LocalDateArrayColumnData.java
+++ /dev/null
@@ -1,46 +0,0 @@
-//
-// Copyright (c) 2016-2024 Deephaven Data Labs and Patent Pending
-//
-package io.deephaven.web.shared.data.columns;
-
-import io.deephaven.web.shared.data.LocalDate;
-
-import java.util.Arrays;
-
-/**
- * Holder for data associated with a column of type java.time.LocalDate. This type is serialized with a custom LocalDate
- * type for efficiency and GWT compatibility.
- */
-public class LocalDateArrayColumnData extends ColumnData {
-    private LocalDate[] data;
-
-    public LocalDateArrayColumnData() {}
-
-    public LocalDateArrayColumnData(LocalDate[] data) {
-        this.data = data;
-    }
-
-    public LocalDate[] getData() {
-        return data;
-    }
-
-    public void setData(LocalDate[] data) {
-        this.data = data;
-    }
-
-    @Override
-    public boolean equals(Object o) {
-        if (this == o)
-            return true;
-        if (o == null || getClass() != o.getClass())
-            return false;
-        final LocalDateArrayColumnData that = (LocalDateArrayColumnData) o;
-        return Arrays.deepEquals(data, that.data);
-    }
-
-    @Override
-    public int hashCode() {
-        return Arrays.deepHashCode(data);
-    }
-}
-
diff --git a/web/shared-beans/src/main/java/io/deephaven/web/shared/data/columns/LocalTimeArrayColumnData.java b/web/shared-beans/src/main/java/io/deephaven/web/shared/data/columns/LocalTimeArrayColumnData.java
deleted file mode 100644
index 2e8ddc291c3..00000000000
--- a/web/shared-beans/src/main/java/io/deephaven/web/shared/data/columns/LocalTimeArrayColumnData.java
+++ /dev/null
@@ -1,45 +0,0 @@
-//
-// Copyright (c) 2016-2024 Deephaven Data Labs and Patent Pending
-//
-package io.deephaven.web.shared.data.columns;
-
-import io.deephaven.web.shared.data.LocalTime;
-
-import java.util.Arrays;
-
-/**
- * Holder for data associated with a column of type java.time.LocalTime. This type is serialized with a custom LocalTime
- * type for efficiency and GWT compatibility.
- */
-public class LocalTimeArrayColumnData extends ColumnData {
-    private LocalTime[] data;
-
-    public LocalTimeArrayColumnData() {}
-
-    public LocalTimeArrayColumnData(LocalTime[] data) {
-        this.data = data;
-    }
-
-    public LocalTime[] getData() {
-        return data;
-    }
-
-    public void setData(LocalTime[] data) {
-        this.data = data;
-    }
-
-    @Override
-    public boolean equals(Object o) {
-        if (this == o)
-            return true;
-        if (o == null || getClass() != o.getClass())
-            return false;
-        final LocalTimeArrayColumnData that = (LocalTimeArrayColumnData) o;
-        return Arrays.deepEquals(data, that.data);
-    }
-
-    @Override
-    public int hashCode() {
-        return Arrays.deepHashCode(data);
-    }
-}
diff --git a/web/shared-beans/src/main/java/io/deephaven/web/shared/data/columns/LongArrayColumnData.java b/web/shared-beans/src/main/java/io/deephaven/web/shared/data/columns/LongArrayColumnData.java
deleted file mode 100644
index a9e252568b1..00000000000
--- a/web/shared-beans/src/main/java/io/deephaven/web/shared/data/columns/LongArrayColumnData.java
+++ /dev/null
@@ -1,41 +0,0 @@
-//
-// Copyright (c) 2016-2024 Deephaven Data Labs and Patent Pending
-//
-package io.deephaven.web.shared.data.columns;
-
-import java.util.Arrays;
-
-public class LongArrayColumnData extends ColumnData {
-    private long[] data;
-
-    public LongArrayColumnData() {}
-
-    public LongArrayColumnData(long[] data) {
-        this.data = data;
-    }
-
-    public long[] getData() {
-        return data;
-    }
-
-    public void setData(long[] data) {
-        this.data = data;
-    }
-
-    @Override
-    public boolean equals(Object o) {
-        if (this == o)
-            return true;
-        if (o == null || getClass() != o.getClass())
-            return false;
-
-        LongArrayColumnData that = (LongArrayColumnData) o;
-
-        return Arrays.equals(data, that.data);
-    }
-
-    @Override
-    public int hashCode() {
-        return Arrays.hashCode(data);
-    }
-}
diff --git a/web/shared-beans/src/main/java/io/deephaven/web/shared/data/columns/ShortArrayColumnData.java b/web/shared-beans/src/main/java/io/deephaven/web/shared/data/columns/ShortArrayColumnData.java
deleted file mode 100644
index d8c0540ce96..00000000000
--- a/web/shared-beans/src/main/java/io/deephaven/web/shared/data/columns/ShortArrayColumnData.java
+++ /dev/null
@@ -1,41 +0,0 @@
-//
-// Copyright (c) 2016-2024 Deephaven Data Labs and Patent Pending
-//
-package io.deephaven.web.shared.data.columns;
-
-import java.util.Arrays;
-
-public class ShortArrayColumnData extends ColumnData {
-    private short[] data;
-
-    public ShortArrayColumnData() {}
-
-    public ShortArrayColumnData(short[] data) {
-        this.data = data;
-    }
-
-    public short[] getData() {
-        return data;
-    }
-
-    public void setData(short[] data) {
-        this.data = data;
-    }
-
-    @Override
-    public boolean equals(Object o) {
-        if (this == o)
-            return true;
-        if (o == null || getClass() != o.getClass())
-            return false;
-
-        ShortArrayColumnData that = (ShortArrayColumnData) o;
-
-        return Arrays.equals(data, that.data);
-    }
-
-    @Override
-    public int hashCode() {
-        return Arrays.hashCode(data);
-    }
-}
diff --git a/web/shared-beans/src/main/java/io/deephaven/web/shared/data/columns/StringArrayArrayColumnData.java b/web/shared-beans/src/main/java/io/deephaven/web/shared/data/columns/StringArrayArrayColumnData.java
deleted file mode 100644
index 721e0aabd72..00000000000
--- a/web/shared-beans/src/main/java/io/deephaven/web/shared/data/columns/StringArrayArrayColumnData.java
+++ /dev/null
@@ -1,41 +0,0 @@
-//
-// Copyright (c) 2016-2024 Deephaven Data Labs and Patent Pending
-//
-package io.deephaven.web.shared.data.columns;
-
-import java.util.Arrays;
-
-public class StringArrayArrayColumnData extends ColumnData {
-    private String[][] data;
-
-    public StringArrayArrayColumnData() {}
-
-    public StringArrayArrayColumnData(String[][] data) {
-        this.data = data;
-    }
-
-    public String[][] getData() {
-        return data;
-    }
-
-    public void setData(String[][] data) {
-        this.data = data;
-    }
-
-    @Override
-    public boolean equals(Object o) {
-        if (this == o)
-            return true;
-        if (o == null || getClass() != o.getClass())
-            return false;
-
-        StringArrayArrayColumnData that = (StringArrayArrayColumnData) o;
-
-        return Arrays.deepEquals(data, that.data);
-    }
-
-    @Override
-    public int hashCode() {
-        return Arrays.deepHashCode(data);
-    }
-}
diff --git a/web/shared-beans/src/main/java/io/deephaven/web/shared/data/columns/StringArrayColumnData.java b/web/shared-beans/src/main/java/io/deephaven/web/shared/data/columns/StringArrayColumnData.java
deleted file mode 100644
index 338402855bf..00000000000
--- a/web/shared-beans/src/main/java/io/deephaven/web/shared/data/columns/StringArrayColumnData.java
+++ /dev/null
@@ -1,41 +0,0 @@
-//
-// Copyright (c) 2016-2024 Deephaven Data Labs and Patent Pending
-//
-package io.deephaven.web.shared.data.columns;
-
-import java.util.Arrays;
-
-public class StringArrayColumnData extends ColumnData {
-    private String[] data;
-
-    public StringArrayColumnData() {}
-
-    public StringArrayColumnData(String[] data) {
-        this.data = data;
-    }
-
-    public String[] getData() {
-        return data;
-    }
-
-    public void setData(String[] data) {
-        this.data = data;
-    }
-
-    @Override
-    public boolean equals(Object o) {
-        if (this == o)
-            return true;
-        if (o == null || getClass() != o.getClass())
-            return false;
-
-        StringArrayColumnData that = (StringArrayColumnData) o;
-
-        return Arrays.equals(data, that.data);
-    }
-
-    @Override
-    public int hashCode() {
-        return Arrays.hashCode(data);
-    }
-}
diff --git a/web/shared-beans/src/test/java/io/deephaven/web/shared/data/RangeSetTest.java b/web/shared-beans/src/test/java/io/deephaven/web/shared/data/RangeSetTest.java
index d28a702bbbb..1bf1f23bff8 100644
--- a/web/shared-beans/src/test/java/io/deephaven/web/shared/data/RangeSetTest.java
+++ b/web/shared-beans/src/test/java/io/deephaven/web/shared/data/RangeSetTest.java
@@ -10,6 +10,7 @@
 import java.util.Arrays;
 import java.util.Collections;
 import java.util.List;
+import java.util.PrimitiveIterator;
 import java.util.function.LongConsumer;
 import java.util.function.Supplier;
 
@@ -128,21 +129,24 @@ public void testAddExistingRange() {
     @Test
     public void testOverlappingRangesInDifferentOrder() {
 
-        // add three items in each possible order to a rangeset, ensure results are always the same
+        // add five ranges, where some overlap others, in each possible order to a rangeset, ensure results are always
+        // the same
         Range rangeA = new Range(100, 108);
         Range rangeB = new Range(105, 112);
         Range rangeC = new Range(110, 115);
-        Collections2.permutations(Arrays.asList(rangeA, rangeB, rangeC)).forEach(list -> {
+        Range rangeD = new Range(100, 113);
+        Range rangeE = new Range(101, 115);
+        Collections2.permutations(Arrays.asList(rangeA, rangeB, rangeC, rangeD, rangeE)).forEach(list -> {
             RangeSet rangeSet = new RangeSet();
             list.forEach(rangeSet::addRange);
 
-            assertEquals(16, rangeSet.size());
+            assertEquals(list.toString(), 16, rangeSet.size());
             assertEquals(list.toString(), Collections.singletonList(new Range(100, 115)), asList(rangeSet));
         });
 
-        // same three items, but with another before that will not overlap with them
+        // same five items, but with another before that will not overlap with them
         Range before = new Range(0, 4);
-        Collections2.permutations(Arrays.asList(before, rangeA, rangeB, rangeC)).forEach(list -> {
+        Collections2.permutations(Arrays.asList(before, rangeA, rangeB, rangeC, rangeD, rangeE)).forEach(list -> {
             RangeSet rangeSet = new RangeSet();
             list.forEach(rangeSet::addRange);
 
@@ -150,9 +154,9 @@ public void testOverlappingRangesInDifferentOrder() {
             assertEquals(list.toString(), Arrays.asList(new Range(0, 4), new Range(100, 115)), asList(rangeSet));
         });
 
-        // same three items, but with another following that will not overlap with them
+        // same five items, but with another following that will not overlap with them
         Range after = new Range(200, 204);
-        Collections2.permutations(Arrays.asList(after, rangeA, rangeB, rangeC)).forEach(list -> {
+        Collections2.permutations(Arrays.asList(after, rangeA, rangeB, rangeC, rangeD, rangeE)).forEach(list -> {
             RangeSet rangeSet = new RangeSet();
             list.forEach(rangeSet::addRange);
 
@@ -212,6 +216,41 @@ public void testIncludesAllOf() {
         assertFalse(rangeSet.includesAllOf(RangeSet.ofRange(54, 60)));
     }
 
+    @Test
+    public void testIncludesAnyOf() {
+        RangeSet rangeSet = new RangeSet();
+        rangeSet.addRange(new Range(0, 19));
+        rangeSet.addRange(new Range(50, 54));
+
+        assertTrue(rangeSet.includesAnyOf(new Range(0, 19)));
+        assertTrue(rangeSet.includesAnyOf(new Range(50, 54)));
+
+        rangeSet.indexIterator().forEachRemaining((LongConsumer) l -> {
+            assertTrue(rangeSet.includesAnyOf(new Range(l, l)));
+        });
+
+        assertTrue(rangeSet.includesAnyOf(new Range(0, 20)));
+        assertTrue(rangeSet.includesAnyOf(new Range(10, 20)));
+        assertTrue(rangeSet.includesAnyOf(new Range(19, 20)));
+
+        assertTrue(rangeSet.includesAnyOf(new Range(19, 30)));
+        assertFalse(rangeSet.includesAnyOf(new Range(20, 30)));
+        assertFalse(rangeSet.includesAnyOf(new Range(21, 30)));
+
+        assertFalse(rangeSet.includesAnyOf(new Range(30, 40)));
+
+        assertFalse(rangeSet.includesAnyOf(new Range(40, 49)));
+        assertTrue(rangeSet.includesAnyOf(new Range(40, 50)));
+        assertFalse(rangeSet.includesAnyOf(new Range(40, 41)));
+        assertTrue(rangeSet.includesAnyOf(new Range(40, 54)));
+
+        assertTrue(rangeSet.includesAnyOf(new Range(49, 54)));
+        assertTrue(rangeSet.includesAnyOf(new Range(50, 55)));
+        assertTrue(rangeSet.includesAnyOf(new Range(50, 60)));
+
+        assertTrue(rangeSet.includesAnyOf(new Range(54, 60)));
+        assertFalse(rangeSet.includesAnyOf(new Range(55, 60)));
+    }
 
     @Test
     public void testRemove() {
@@ -475,4 +514,163 @@ public void testLarge() {
         assertEquals(RangeSet.ofItems(largeA, largeB), rangeSet);
     }
 
+    @Test
+    public void testSubsetForPostions() {
+        RangeSet initialRange = RangeSet.ofItems(2, 4, 6, 8);
+        assertEquals(RangeSet.ofItems(4, 8), initialRange.subsetForPositions(RangeSet.ofItems(1, 3), false));
+        assertEquals(RangeSet.ofItems(4, 8), initialRange.subsetForPositions(RangeSet.ofItems(1, 3, 4), false));
+        assertEquals(RangeSet.ofItems(4, 8), initialRange.subsetForPositions(RangeSet.ofItems(1, 3, 5), false));
+        assertEquals(initialRange, initialRange.subsetForPositions(RangeSet.ofItems(0, 1, 2, 3, 4, 5, 100), false));
+        assertEquals(initialRange, initialRange.subsetForPositions(RangeSet.ofItems(0, 1, 2, 3, 100), false));
+
+        assertEquals(RangeSet.ofItems(4, 6, 8), initialRange.subsetForPositions(RangeSet.ofRange(1, 3), false));
+        assertEquals(RangeSet.ofItems(2, 4, 6), initialRange.subsetForPositions(RangeSet.ofRange(0, 2), false));
+        assertEquals(initialRange, initialRange.subsetForPositions(RangeSet.ofRange(0, 3), false));
+        assertEquals(initialRange, initialRange.subsetForPositions(RangeSet.ofRange(0, 9), false));
+
+        initialRange = RangeSet.ofRange(10, 109);
+        assertEquals(RangeSet.ofItems(12, 14), initialRange.subsetForPositions(RangeSet.ofItems(2, 4), false));
+        assertEquals(RangeSet.ofItems(12, 14), initialRange.subsetForPositions(RangeSet.ofItems(2, 4, 101), false));
+
+        assertEquals(RangeSet.empty(), RangeSet.empty().subsetForPositions(RangeSet.ofItems(0), false));
+        assertEquals(RangeSet.ofItems(99),
+                RangeSet.ofRange(0, 99).subsetForPositions(RangeSet.ofRange(100, 104), false));
+
+        initialRange = RangeSet.empty();
+        assertEquals(0, initialRange.size());
+        initialRange.addRange(new Range(0, 1));
+        assertEquals(2, initialRange.size());
+        initialRange.addRange(new Range(2, 3));
+        assertEquals(4, initialRange.size());
+        initialRange.removeRange(new Range(0, 3));
+        assertEquals(0, initialRange.size());
+        initialRange.addRange(new Range(0, 1));
+        assertEquals(2, initialRange.size());
+
+        initialRange = RangeSet.ofItems(1, 4, 5, 6);
+        assertEquals(RangeSet.ofItems(1, 4, 5, 6), initialRange.subsetForPositions(RangeSet.ofRange(0, 3), false));
+        assertEquals(RangeSet.ofItems(1, 5, 6), initialRange.subsetForPositions(RangeSet.ofItems(0, 2, 3), false));
+        assertEquals(RangeSet.ofItems(1, 4, 6), initialRange.subsetForPositions(RangeSet.ofItems(0, 1, 3), false));
+        assertEquals(RangeSet.ofItems(1, 4, 5), initialRange.subsetForPositions(RangeSet.ofItems(0, 1, 2), false));
+        assertEquals(RangeSet.ofItems(1, 5), initialRange.subsetForPositions(RangeSet.ofItems(0, 2), false));
+        assertEquals(RangeSet.ofItems(4, 5), initialRange.subsetForPositions(RangeSet.ofRange(1, 2), false));
+        assertEquals(RangeSet.ofItems(4, 5, 6), initialRange.subsetForPositions(RangeSet.ofRange(1, 3), false));
+        assertEquals(RangeSet.ofItems(5, 6), initialRange.subsetForPositions(RangeSet.ofRange(2, 3), false));
+    }
+
+    @Test
+    public void testGet() {
+        long[] rows = {0, 1, 4, 5, 7, 9};
+        RangeSet initialRange = RangeSet.ofItems(rows);
+
+        for (int i = 0; i < rows.length; i++) {
+            assertEquals("i=" + i, rows[i], initialRange.get(i));
+        }
+        assertEquals(-1, initialRange.get(rows.length));
+        assertEquals(-1, initialRange.get(rows.length + 1));
+        assertEquals(-1, initialRange.get(rows.length + 100));
+
+        initialRange.removeRange(new Range(0, 1));
+    }
+
+    @Test
+    public void testShift() {
+        RangeSet r = RangeSet.ofRange(0, 2);
+        r.applyShifts(new ShiftedRange[] {
+                new ShiftedRange(new Range(0, 2), 2)
+        });
+        assertEquals(RangeSet.ofRange(2, 4), r);
+        r.applyShifts(new ShiftedRange[] {
+                new ShiftedRange(new Range(2, 6), -2)
+        });
+        assertEquals(RangeSet.ofRange(0, 2), r);
+        r.applyShifts(new ShiftedRange[] {
+                new ShiftedRange(new Range(1, 2), 3)
+        });
+        assertEquals(RangeSet.ofItems(0, 4, 5), r);
+        r.applyShifts(new ShiftedRange[] {
+                new ShiftedRange(new Range(4, 4), -1)
+        });
+        assertEquals(RangeSet.ofItems(0, 3, 5), r);
+
+        r = RangeSet.ofItems(0, 3, 4, 5, 6, 10);
+        r.applyShifts(new ShiftedRange[] {
+                new ShiftedRange(new Range(4, 4), 2),
+                new ShiftedRange(new Range(5, 6), 3),
+        });
+        assertEquals(RangeSet.ofItems(0, 3, 6, 8, 9, 10), r);
+
+
+        r = RangeSet.fromSortedRanges(new Range[] {
+                new Range(0, 1),
+                new Range(3, 5),
+                new Range(7, 13),
+                new Range(15, 19),
+        });
+        r.applyShifts(new ShiftedRange[] {
+                new ShiftedRange(new Range(3, 4), -1),
+                new ShiftedRange(new Range(7, 13), -1),
+                new ShiftedRange(new Range(15, 17), -2),
+        });
+        assertEquals(RangeSet.fromSortedRanges(new Range[] {
+                new Range(0, 3),
+                new Range(5, 15),
+                new Range(18, 19),
+        }), r);
+
+
+        r = RangeSet.fromSortedRanges(new Range[] {
+                new Range(28972, 28987),
+                new Range(28989, 29003),
+                new Range(29005, 29011),
+                new Range(29013, 29013),
+                new Range(29015, 29018),
+                new Range(29020, 29020),
+                new Range(29022, 29024),
+                new Range(29026, 29039),
+        });
+        r.applyShifts(new ShiftedRange[] {
+                new ShiftedRange(new Range(28989, 29011), 2),
+                new ShiftedRange(new Range(29013, 29013), 1),
+                new ShiftedRange(new Range(29022, 29024), -1),
+                new ShiftedRange(new Range(29026, 29026), -2),
+        });
+    }
+
+    @Test
+    public void testInvert() {
+        RangeSet r = RangeSet.ofItems(4, 5, 7, 9, 10);
+
+        assertEquals(RangeSet.ofRange(0, 4), r.invert(r));
+        assertEquals(RangeSet.empty(), r.invert(RangeSet.empty()));
+        assertEquals(RangeSet.ofItems(0, 2, 4), r.invert(RangeSet.ofItems(4, 7, 10)));
+        assertEquals(RangeSet.ofItems(1, 2, 3), r.invert(RangeSet.ofItems(5, 7, 9)));
+
+        RangeSet positions = RangeSet.ofItems(18, 37, 83, 88);
+        RangeSet keys = RangeSet.fromSortedRanges(new Range[] {
+                new Range(1073739467, 1073739511), new Range(1073739568, 1073739639), new Range(1073739700, 1073739767),
+                new Range(1073739828, 1073739895), new Range(1073739956, 1073740023), new Range(1073740083, 1073740151),
+                new Range(1073740214, 1073740279), new Range(1073740342, 1073740407), new Range(1073740464, 1073740535),
+                new Range(1073740597, 1073740663), new Range(1073740725, 1073740791), new Range(1073740851, 1073740924),
+                new Range(1073740937, 1073741052), new Range(1073741063, 1073741180), new Range(1073741189, 1073741308),
+                new Range(1073741310, 1073741436), new Range(1073741440, 1073741564), new Range(1073741569, 1073741692),
+                new Range(1073741696, 1073741948), new Range(1073741968, 1073742065), new Range(1073742096, 1073742184),
+                new Range(1073742224, 1073742325), new Range(1073742352, 1073742454), new Range(1073742480, 1073742579),
+                new Range(1073742608, 1073742702), new Range(1073742736, 1073742840), new Range(1073742864, 1073742967),
+                new Range(1073742992, 1073743084), new Range(1073743120, 1073743218), new Range(1073743248, 1073743348),
+                new Range(1073743376, 1073743465), new Range(1073743504, 1073743597), new Range(1073743632, 1073743741),
+                new Range(1073743760, 1073743869), new Range(1073743888, 1073743912)
+        });
+        RangeSet selected = RangeSet.ofItems(1073739485, 1073739504, 1073739606, 1073739611);
+        PrimitiveIterator.OfLong selectedIter = selected.indexIterator();
+        PrimitiveIterator.OfLong positionsIter = positions.indexIterator();
+        while (selectedIter.hasNext()) {
+            assert positionsIter.hasNext();
+            long s = selectedIter.nextLong();
+            long p = positionsIter.nextLong();
+            assertEquals(s, keys.get(p));
+        }
+        assert !positionsIter.hasNext();
+        assertEquals(positions, keys.invert(selected));
+    }
 }